From timn at fedoraproject.org  Mon Sep  1 00:07:28 2008
From: timn at fedoraproject.org (Tim Niemueller)
Date: Mon,  1 Sep 2008 00:07:28 +0000 (UTC)
Subject: rpms/player/F-8 player.spec,1.2,1.3
Message-ID: <20080901000728.286487011A@cvs1.fedora.phx.redhat.com>

Author: timn

Update of /cvs/pkgs/rpms/player/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7330

Modified Files:
	player.spec 
Log Message:
+ Added libtool BR

Tim



Index: player.spec
===================================================================
RCS file: /cvs/pkgs/rpms/player/F-8/player.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- player.spec	31 Aug 2008 23:17:35 -0000	1.2
+++ player.spec	1 Sep 2008 00:06:57 -0000	1.3
@@ -17,6 +17,7 @@
 Patch2:         %{name}-2.1.0rc2-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  libtool
 BuildRequires:  libtool-ltdl-devel
 %if 0%{?fedora} <= 9
 BuildRequires:  geos-devel
@@ -186,6 +187,7 @@
 %changelog
 * Fri Aug 15 2008 Tim Niemueller <tim at niemueller.de> - 2.1.1-4
 - Changed norpath patch, fixes build problem on Fedora 8
+- Added libtool BR
 
 * Mon Aug 08 2008 Jef Spaleta <jspaleta at fedoraproject dot org> - 2.1.1-3
 - Review clean-ups



From phuang at fedoraproject.org  Mon Sep  1 00:14:52 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon,  1 Sep 2008 00:14:52 +0000 (UTC)
Subject: rpms/ibus-anthy/devel .cvsignore, 1.8, 1.9 ibus-anthy.spec, 1.7,
	1.8 sources, 1.8, 1.9
Message-ID: <20080901001452.7DEEF7011A@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-anthy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8351

Modified Files:
	.cvsignore ibus-anthy.spec sources 
Log Message:
Update to 0.1.1.20080901


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Aug 2008 09:13:43 -0000	1.8
+++ .cvsignore	1 Sep 2008 00:14:22 -0000	1.9
@@ -1 +1 @@
-ibus-anthy-0.1.1.20080828.tar.gz
+ibus-anthy-0.1.1.20080901.tar.gz


Index: ibus-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/ibus-anthy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ibus-anthy.spec	28 Aug 2008 09:13:43 -0000	1.7
+++ ibus-anthy.spec	1 Sep 2008 00:14:22 -0000	1.8
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define mod_path ibus-0.1
 Name:       ibus-anthy
-Version:    0.1.1.20080828
+Version:    0.1.1.20080901
 Release:    1%{?dist}
 Summary:    The Anthy engine for IBus input platform
 License:    GPLv2+
@@ -55,6 +55,9 @@
 %{_datadir}/ibus/engine/anthy.engine
 
 %changelog
+* Mon Sep 01 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
+- Update to 0.1.1.20080901.
+
 * Thu Aug 28 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080828-1
 - Update to 0.1.1.20080828.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Aug 2008 09:13:43 -0000	1.8
+++ sources	1 Sep 2008 00:14:22 -0000	1.9
@@ -1 +1 @@
-979295c1610dd182d5cb5a50d2103383  ibus-anthy-0.1.1.20080828.tar.gz
+6e4273996b500ead4ed539d180a6c7af  ibus-anthy-0.1.1.20080901.tar.gz



From phuang at fedoraproject.org  Mon Sep  1 00:26:16 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon,  1 Sep 2008 00:26:16 +0000 (UTC)
Subject: rpms/ibus-anthy/F-9 .cvsignore, 1.6, 1.7 ibus-anthy.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <20080901002616.BA0087011A@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-anthy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9385

Modified Files:
	.cvsignore ibus-anthy.spec sources 
Log Message:
Update to 0.1.1.20080901


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Aug 2008 09:14:49 -0000	1.6
+++ .cvsignore	1 Sep 2008 00:25:46 -0000	1.7
@@ -1 +1 @@
-ibus-anthy-0.1.1.20080828.tar.gz
+ibus-anthy-0.1.1.20080901.tar.gz


Index: ibus-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/F-9/ibus-anthy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ibus-anthy.spec	28 Aug 2008 09:14:49 -0000	1.6
+++ ibus-anthy.spec	1 Sep 2008 00:25:46 -0000	1.7
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define mod_path ibus-0.1
 Name:       ibus-anthy
-Version:    0.1.1.20080828
+Version:    0.1.1.20080901
 Release:    1%{?dist}
 Summary:    The Anthy engine for IBus input platform
 License:    GPLv2+
@@ -55,6 +55,9 @@
 %{_datadir}/ibus/engine/anthy.engine
 
 %changelog
+* Mon Sep 01 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
+- Update to 0.1.1.20080901.
+
 * Thu Aug 28 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080828-1
 - Update to 0.1.1.20080828.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Aug 2008 09:14:49 -0000	1.7
+++ sources	1 Sep 2008 00:25:46 -0000	1.8
@@ -1 +1 @@
-979295c1610dd182d5cb5a50d2103383  ibus-anthy-0.1.1.20080828.tar.gz
+6e4273996b500ead4ed539d180a6c7af  ibus-anthy-0.1.1.20080901.tar.gz



From phuang at fedoraproject.org  Mon Sep  1 00:33:39 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon,  1 Sep 2008 00:33:39 +0000 (UTC)
Subject: rpms/ibus-chewing/devel .cvsignore, 1.2, 1.3 ibus-chewing.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080901003339.53D107011A@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-chewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10442

Modified Files:
	.cvsignore ibus-chewing.spec sources 
Log Message:
Update to 0.1.1.20080901


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Aug 2008 22:30:32 -0000	1.2
+++ .cvsignore	1 Sep 2008 00:33:08 -0000	1.3
@@ -1 +1 @@
-ibus-chewing-0.1.1.20080823.tar.gz
+ibus-chewing-0.1.1.20080901.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/ibus-chewing.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ibus-chewing.spec	24 Aug 2008 22:30:32 -0000	1.1
+++ ibus-chewing.spec	1 Sep 2008 00:33:08 -0000	1.2
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define mod_path ibus-0.1
 Name:       ibus-chewing
-Version:    0.1.1.20080823
+Version:    0.1.1.20080901
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -54,5 +54,8 @@
 %{_datadir}/ibus/engine/chewing.engine
 
 %changelog
+* Mon Sep 09 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
+- Update to 0.1.1.20080901.
+
 * Fri Aug 15 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
 - The first version.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Aug 2008 22:30:32 -0000	1.2
+++ sources	1 Sep 2008 00:33:08 -0000	1.3
@@ -1 +1 @@
-ab165d70a96481649c0139d0c7f4cc75  ibus-chewing-0.1.1.20080823.tar.gz
+db4a63fc84b82386a44a4210df05c20e  ibus-chewing-0.1.1.20080901.tar.gz



From phuang at fedoraproject.org  Mon Sep  1 00:35:38 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon,  1 Sep 2008 00:35:38 +0000 (UTC)
Subject: rpms/ibus-hangul/devel .cvsignore, 1.2, 1.3 ibus-hangul.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20080901003539.02EDE7011A@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-hangul/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10783

Modified Files:
	.cvsignore ibus-hangul.spec sources 
Log Message:
Update to 0.1.1.20080901


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-hangul/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Aug 2008 22:33:00 -0000	1.2
+++ .cvsignore	1 Sep 2008 00:35:08 -0000	1.3
@@ -1 +1 @@
-ibus-hangul-0.1.1.20080823.tar.gz
+ibus-hangul-0.1.1.20080901.tar.gz


Index: ibus-hangul.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-hangul/devel/ibus-hangul.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ibus-hangul.spec	24 Aug 2008 22:33:00 -0000	1.1
+++ ibus-hangul.spec	1 Sep 2008 00:35:08 -0000	1.2
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define mod_path ibus-0.1
 Name:       ibus-hangul
-Version:    0.1.1.20080823
+Version:    0.1.1.20080901
 Release:    1%{?dist}
 Summary:    The Hangul engine for IBus input platform
 License:    GPLv2+
@@ -54,5 +54,8 @@
 %{_datadir}/ibus/engine/hangul.engine
 
 %changelog
+* Mon Sep 09 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
+- Update to 0.1.1.20080901.
+
 * Fri Aug 08 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
 - The first version.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-hangul/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Aug 2008 22:33:00 -0000	1.2
+++ sources	1 Sep 2008 00:35:08 -0000	1.3
@@ -1 +1 @@
-d22333edd00a9ff9bc19be6c0a65343e  ibus-hangul-0.1.1.20080823.tar.gz
+d05d7c9d127750348df2aa95d40df153  ibus-hangul-0.1.1.20080901.tar.gz



From phuang at fedoraproject.org  Mon Sep  1 00:40:40 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon,  1 Sep 2008 00:40:40 +0000 (UTC)
Subject: rpms/ibus-chewing/F-9 .cvsignore, 1.2, 1.3 ibus-chewing.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20080901004040.A0BA87011A@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-chewing/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11384

Modified Files:
	.cvsignore ibus-chewing.spec sources 
Log Message:
Update to 0.1.1.20080901


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Aug 2008 22:37:48 -0000	1.2
+++ .cvsignore	1 Sep 2008 00:40:10 -0000	1.3
@@ -1 +1 @@
-ibus-chewing-0.1.1.20080823.tar.gz
+ibus-chewing-0.1.1.20080901.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-9/ibus-chewing.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ibus-chewing.spec	24 Aug 2008 22:38:25 -0000	1.1
+++ ibus-chewing.spec	1 Sep 2008 00:40:10 -0000	1.2
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define mod_path ibus-0.1
 Name:       ibus-chewing
-Version:    0.1.1.20080823
+Version:    0.1.1.20080901
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -54,5 +54,8 @@
 %{_datadir}/ibus/engine/chewing.engine
 
 %changelog
+* Mon Sep 09 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
+- Update to 0.1.1.20080901.
+
 * Fri Aug 15 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
 - The first version.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Aug 2008 22:37:48 -0000	1.2
+++ sources	1 Sep 2008 00:40:10 -0000	1.3
@@ -1 +1 @@
-ab165d70a96481649c0139d0c7f4cc75  ibus-chewing-0.1.1.20080823.tar.gz
+db4a63fc84b82386a44a4210df05c20e  ibus-chewing-0.1.1.20080901.tar.gz



From mbarnes at fedoraproject.org  Mon Sep  1 00:41:43 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon,  1 Sep 2008 00:41:43 +0000 (UTC)
Subject: rpms/pygobject2/devel .cvsignore, 1.16,
	1.17 pygobject-2.15.2-threads-init.patch, 1.2,
	1.3 pygobject2.spec, 1.39, 1.40 sources, 1.16, 1.17
Message-ID: <20080901004143.0F2D97011A@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore pygobject-2.15.2-threads-init.patch pygobject2.spec 
	sources 
Log Message:

* Sun Aug 31 2008 Matthew Barnes <mbarnes at redhat.com> - 2.15.3-1.fc10
- Update to 2.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	26 Jul 2008 12:32:00 -0000	1.16
+++ .cvsignore	1 Sep 2008 00:41:12 -0000	1.17
@@ -1 +1 @@
-pygobject-2.15.2.tar.bz2
+pygobject-2.15.3.tar.bz2

pygobject-2.15.2-threads-init.patch:

Index: pygobject-2.15.2-threads-init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/pygobject-2.15.2-threads-init.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pygobject-2.15.2-threads-init.patch	12 Aug 2008 20:43:49 -0000	1.2
+++ pygobject-2.15.2-threads-init.patch	1 Sep 2008 00:41:12 -0000	1.3
@@ -1,32 +1,13 @@
-diff -up pygobject-2.15.2/glib/pyglib.c.thread-init pygobject-2.15.2/glib/pyglib.c
-diff -up pygobject-2.15.2/gobject/gobjectmodule.c.thread-init pygobject-2.15.2/gobject/gobjectmodule.c
---- pygobject-2.15.2/gobject/gobjectmodule.c.thread-init	2008-07-26 06:21:44.000000000 -0400
-+++ pygobject-2.15.2/gobject/gobjectmodule.c	2008-08-07 15:06:01.000000000 -0400
-@@ -1944,6 +1944,18 @@ pyg_threads_init (PyObject *unused, PyOb
-     return Py_None;
- }
- 
-+/* Only for backwards compatibility */
-+int
-+pygobject_enable_threads(void)
-+{
-+    if (!pyglib_enable_threads())
-+      return -1;
+diff -up pygobject-2.15.3/gobject/gobjectmodule.c.threads-init pygobject-2.15.3/gobject/gobjectmodule.c
+--- pygobject-2.15.3/gobject/gobjectmodule.c.threads-init	2008-08-31 17:11:51.000000000 -0400
++++ pygobject-2.15.3/gobject/gobjectmodule.c	2008-08-31 20:33:54.000000000 -0400
+@@ -1809,6 +1809,9 @@ pygobject_enable_threads(void)
+ {
+     if (!pyglib_enable_threads())
+ 	return -1;
 +
 +    pygobject_api_functions.threads_enabled = TRUE;
 +
-+    return 0;
-+}
-+
- static PyObject *
- pyg_signal_accumulator_true_handled(PyObject *unused, PyObject *args)
- {
-@@ -2639,7 +2648,7 @@ struct _PyGObject_Functions pygobject_ap
-   pyg_flags_from_gtype,
+     return 0;
+ }
  
-   FALSE, /* threads_enabled */
--  pyglib_enable_threads,
-+  pygobject_enable_threads,
-   pygobject_gil_state_ensure,
-   pygobject_gil_state_release,
-   pyg_register_class_init,


Index: pygobject2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- pygobject2.spec	12 Aug 2008 20:43:49 -0000	1.39
+++ pygobject2.spec	1 Sep 2008 00:41:12 -0000	1.40
@@ -7,8 +7,8 @@
 ### Abstract ###
 
 Name: pygobject2
-Version: 2.15.2
-Release: 3%{?dist}
+Version: 2.15.3
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: Python bindings for GObject
@@ -116,6 +116,9 @@
 %{_datadir}/pygobject/xsl
 
 %changelog
+* Sun Aug 31 2008 Matthew Barnes <mbarnes at redhat.com> - 2.15.3-1.fc10
+- Update to 2.15.3
+
 * Tue Aug 12 2008 Matthew Barnes <mbarnes at redhat.com> - 2.15.2-3.fc10
 - Modify thread initialization patch to fix RH bug #458522.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	26 Jul 2008 12:32:00 -0000	1.16
+++ sources	1 Sep 2008 00:41:12 -0000	1.17
@@ -1 +1 @@
-60bfabf036cbafb3a584b3c7beee05d1  pygobject-2.15.2.tar.bz2
+277e654c45746506455627a506dbb65c  pygobject-2.15.3.tar.bz2



From phuang at fedoraproject.org  Mon Sep  1 00:41:48 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon,  1 Sep 2008 00:41:48 +0000 (UTC)
Subject: rpms/ibus-hangul/F-9 .cvsignore, 1.2, 1.3 ibus-hangul.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080901004148.1CCEB7011A@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-hangul/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11670

Modified Files:
	.cvsignore ibus-hangul.spec sources 
Log Message:
Update to 0.1.1.20080901


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-hangul/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Aug 2008 22:39:51 -0000	1.2
+++ .cvsignore	1 Sep 2008 00:41:17 -0000	1.3
@@ -1 +1 @@
-ibus-hangul-0.1.1.20080823.tar.gz
+ibus-hangul-0.1.1.20080901.tar.gz


Index: ibus-hangul.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-hangul/F-9/ibus-hangul.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ibus-hangul.spec	24 Aug 2008 22:39:51 -0000	1.1
+++ ibus-hangul.spec	1 Sep 2008 00:41:17 -0000	1.2
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define mod_path ibus-0.1
 Name:       ibus-hangul
-Version:    0.1.1.20080823
+Version:    0.1.1.20080901
 Release:    1%{?dist}
 Summary:    The Hangul engine for IBus input platform
 License:    GPLv2+
@@ -54,5 +54,8 @@
 %{_datadir}/ibus/engine/hangul.engine
 
 %changelog
+* Mon Sep 09 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
+- Update to 0.1.1.20080901.
+
 * Fri Aug 08 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
 - The first version.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-hangul/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Aug 2008 22:39:51 -0000	1.2
+++ sources	1 Sep 2008 00:41:17 -0000	1.3
@@ -1 +1 @@
-d22333edd00a9ff9bc19be6c0a65343e  ibus-hangul-0.1.1.20080823.tar.gz
+d05d7c9d127750348df2aa95d40df153  ibus-hangul-0.1.1.20080901.tar.gz



From phuang at fedoraproject.org  Mon Sep  1 00:43:09 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon,  1 Sep 2008 00:43:09 +0000 (UTC)
Subject: rpms/ibus-m17n/devel .cvsignore, 1.5, 1.6 ibus-m17n.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20080901004309.C6BB27011A@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-m17n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12012

Modified Files:
	.cvsignore ibus-m17n.spec sources 
Log Message:
Update to 0.1.1.20080901


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Aug 2008 01:34:37 -0000	1.5
+++ .cvsignore	1 Sep 2008 00:42:39 -0000	1.6
@@ -1 +1 @@
-ibus-m17n-0.1.1.20080823.tar.gz
+ibus-m17n-0.1.1.20080901.tar.gz


Index: ibus-m17n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/devel/ibus-m17n.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ibus-m17n.spec	23 Aug 2008 01:34:37 -0000	1.4
+++ ibus-m17n.spec	1 Sep 2008 00:42:39 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define mod_path ibus-0.1
 Name:       ibus-m17n
-Version:    0.1.1.20080823
+Version:    0.1.1.20080901
 Release:    1%{?dist}
 Summary:    The M17N engine for IBus platform
 License:    GPLv2+
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Mon Sep 01 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
+- Update to 0.1.1.20080901.
+
 * Sat Aug 23 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
 - Update to 0.1.1.20080823.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Aug 2008 01:34:37 -0000	1.5
+++ sources	1 Sep 2008 00:42:39 -0000	1.6
@@ -1 +1 @@
-f1d39b804e2f34d08032868dc93eea95  ibus-m17n-0.1.1.20080823.tar.gz
+6cc90f85622acd514e52a1d327d3c073  ibus-m17n-0.1.1.20080901.tar.gz



From alexlan at fedoraproject.org  Mon Sep  1 00:49:16 2008
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Mon,  1 Sep 2008 00:49:16 +0000 (UTC)
Subject: rpms/picard/F-9 picard-0.10-setup.patch, NONE, 1.1 .cvsignore, 1.5, 
	1.6 picard.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <20080901004916.9EB9F7011A@cvs1.fedora.phx.redhat.com>

Author: alexlan

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

Modified Files:
	.cvsignore picard.spec sources 
Added Files:
	picard-0.10-setup.patch 
Log Message:
* Sun Aug 31 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.10-1
- Update to latest upstream (0.10).
- Add patch to work around broken setup.py.
- Fixed some spec file errors: duplicate sources.


picard-0.10-setup.patch:

--- NEW FILE picard-0.10-setup.patch ---
--- setup.py.orig	2008-08-31 04:47:07.000000000 -0700
+++ setup.py	2008-08-31 04:47:17.000000000 -0700
@@ -507,7 +507,7 @@
     args['cmdclass'] = { 'py2app' : BuildAPP }
 
 # FIXME: this should check for the actual command ('install' vs. 'bdist_nsis', 'py2app', ...), not installed libraries
-if py2exe is None and do_py2app is None:
+if py2exe is None and do_py2app is False:
     args['data_files'].append(('share/icons', ('picard-16.png', 'picard-32.png')))
     args['data_files'].append(('share/applications', ('picard.desktop',)))
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/picard/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Dec 2007 13:02:07 -0000	1.5
+++ .cvsignore	1 Sep 2008 00:48:46 -0000	1.6
@@ -1,4 +1,4 @@
-picard-0.9.0.tar.gz
+picard-0.10.tar.gz
 bonusdisc.py
 coverart.py
 discnumber.py


Index: picard.spec
===================================================================
RCS file: /cvs/extras/rpms/picard/F-9/picard.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- picard.spec	10 Feb 2008 04:54:26 -0000	1.10
+++ picard.spec	1 Sep 2008 00:48:46 -0000	1.11
@@ -1,11 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define prerelease beta1
-
 Name:             picard
-Version:          0.9.0
-Release:          6%{?dist}
+Version:          0.10
+Release:          1%{?dist}
 Summary:          MusicBrainz-based audio tagger
 Group:            Applications/Multimedia
 
@@ -26,12 +24,16 @@
 Source11:         http://users.musicbrainz.org/~brianfreud/SearchAmazon3.py
 Source12:         http://users.musicbrainz.org/~brianfreud/SearchCastAlbums3.py
 Source13:         http://users.musicbrainz.org/~brianfreud/SearchDiscogs3.py
-Source13:         http://users.musicbrainz.org/~brianfreud/SearchFilmMusziek3.py
-Source14:         http://users.musicbrainz.org/~brianfreud/SearchGMR.py
-Source15:         http://users.musicbrainz.org/~brianfreud/SearchGoogle3.py
-Source16:         http://users.musicbrainz.org/~brianfreud/SearchLortelArchives3.py
-Source17:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackCollector3.py
-Source18:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackINFO3.py
+Source14:         http://users.musicbrainz.org/~brianfreud/SearchFilmMusziek3.py
+Source15:         http://users.musicbrainz.org/~brianfreud/SearchGMR.py
+Source16:         http://users.musicbrainz.org/~brianfreud/SearchGoogle3.py
+Source17:         http://users.musicbrainz.org/~brianfreud/SearchLortelArchives3.py
+Source18:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackCollector3.py
+Source19:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackINFO3.py
+
+# setup.py doesn't run installation of datadir properly without this patch
+# filed upstream at: http://bugs.musicbrainz.org/ticket/3934
+Patch0:		  %{name}-0.10-setup.patch
 
 License:          GPLv2+
 Url:              http://musicbrainz.org/doc/PicardTagger
@@ -54,6 +56,7 @@
 
 %prep
 %setup -q -n picard-%{version}
+%patch0 -p0
 
 %build
 env %{__python} setup.py config
@@ -63,7 +66,7 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
 # strip out png extension from .desktop file
-sed -e 's/picard-32.png/picard-32/' picard.desktop > $RPM_BUILD_ROOT/%{_datadir}/applications/picard.desktop
+sed -e 's/picard-32.png/picard-32/' picard.desktop > $RPM_BUILD_ROOT%{_datadir}/applications/picard.desktop
 
 %find_lang %{name}
 desktop-file-install --vendor="fedora"                \
@@ -95,6 +98,7 @@
 install -pm 0644 %{SOURCE16} ${PLUGINDIR}
 install -pm 0644 %{SOURCE17} ${PLUGINDIR}
 install -pm 0644 %{SOURCE18} ${PLUGINDIR}
+install -pm 0644 %{SOURCE19} ${PLUGINDIR}
 
 ## disable tests for the moment
 %check
@@ -116,6 +120,11 @@
 %{python_sitearch}/picard/*
 
 %changelog
+* Sun Aug 31 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.10-1
+- Update to latest upstream (0.10).
+- Add patch to work around broken setup.py.
+- Fixed some spec file errors: duplicate sources.
+
 * Sat Feb  9 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.9.0-6
 - rebuilt for GCC 4.3 as requested by Fedora Release Engineering
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/picard/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Dec 2007 13:02:07 -0000	1.5
+++ sources	1 Sep 2008 00:48:46 -0000	1.6
@@ -1,4 +1,4 @@
-51c6f1d512b5a4e95d385e1dfe2b8aab  picard-0.9.0.tar.gz
+6d4e31446d3a65cbc6ff880947bb500e  picard-0.10.tar.gz
 ba58f55711c22ffcf6aa229f008caaa1  bonusdisc.py
 47a9a85385462134c35ab1a2e00844a6  coverart.py
 3614f4157edb858505d387ec0891d6f3  discnumber.py



From phuang at fedoraproject.org  Mon Sep  1 00:49:38 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon,  1 Sep 2008 00:49:38 +0000 (UTC)
Subject: rpms/ibus-pinyin/devel .cvsignore, 1.5, 1.6 ibus-pinyin.spec, 1.4, 
	1.5 sources, 1.5, 1.6
Message-ID: <20080901004938.83C617011A@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-pinyin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12790

Modified Files:
	.cvsignore ibus-pinyin.spec sources 
Log Message:
Update to 0.1.1.20080901


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Aug 2008 01:21:05 -0000	1.5
+++ .cvsignore	1 Sep 2008 00:49:08 -0000	1.6
@@ -1,2 +1,2 @@
-ibus-pinyin-0.1.1.20080823.tar.gz
+ibus-pinyin-0.1.1.20080901.tar.gz
 pinyin-database-0.1.10.5.tar.bz2


Index: ibus-pinyin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/devel/ibus-pinyin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ibus-pinyin.spec	23 Aug 2008 01:21:05 -0000	1.4
+++ ibus-pinyin.spec	1 Sep 2008 00:49:08 -0000	1.5
@@ -1,5 +1,5 @@
 Name:       ibus-pinyin
-Version:    0.1.1.20080823
+Version:    0.1.1.20080901
 Release:    1%{?dist}
 Summary:    The PinYin engine for IBus platform
 License:    GPLv2+
@@ -50,6 +50,9 @@
 %{_bindir}/ibus-setup-pinyin
 
 %changelog
+* Mon Sep 01 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
+- Update version to 0.1.1.20080901.
+
 * Sat Aug 23 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
 - Update version to 0.1.1.20080823.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Aug 2008 01:21:05 -0000	1.5
+++ sources	1 Sep 2008 00:49:08 -0000	1.6
@@ -1,2 +1,2 @@
-cb250ad3ccf474bec1664eabe0d2e5b9  ibus-pinyin-0.1.1.20080823.tar.gz
+d21838d22023b41aeab75bb84e5f870f  ibus-pinyin-0.1.1.20080901.tar.gz
 140a7dd821e8e74299bfb2089993838b  pinyin-database-0.1.10.5.tar.bz2



From alexlan at fedoraproject.org  Mon Sep  1 00:55:11 2008
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Mon,  1 Sep 2008 00:55:11 +0000 (UTC)
Subject: rpms/picard/F-8 picard-0.10-setup.patch, NONE, 1.1 .cvsignore, 1.4, 
	1.5 picard.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20080901005511.86A467011A@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/picard/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13431

Modified Files:
	.cvsignore picard.spec sources 
Added Files:
	picard-0.10-setup.patch 
Log Message:
* Sun Aug 31 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.10-1
- Update to latest upstream (0.10).
- Add patch to work around broken setup.py.
- Fixed some spec file errors: duplicate sources.


picard-0.10-setup.patch:

--- NEW FILE picard-0.10-setup.patch ---
--- setup.py.orig	2008-08-31 04:47:07.000000000 -0700
+++ setup.py	2008-08-31 04:47:17.000000000 -0700
@@ -507,7 +507,7 @@
     args['cmdclass'] = { 'py2app' : BuildAPP }
 
 # FIXME: this should check for the actual command ('install' vs. 'bdist_nsis', 'py2app', ...), not installed libraries
-if py2exe is None and do_py2app is None:
+if py2exe is None and do_py2app is False:
     args['data_files'].append(('share/icons', ('picard-16.png', 'picard-32.png')))
     args['data_files'].append(('share/applications', ('picard.desktop',)))
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/picard/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Dec 2007 08:47:09 -0000	1.4
+++ .cvsignore	1 Sep 2008 00:54:41 -0000	1.5
@@ -1 +1,17 @@
-picard-0.9.0.tar.gz
+picard-0.10.tar.gz
+bonusdisc.py
+coverart.py
+discnumber.py
+featartist.py
+__init__.py
+SearchAmazon3.py
+SearchAMG.py
+SearchCastAlbums3.py
+SearchDiscogs3.py
+SearchFilmMusziek3.py
+SearchGMR.py
+SearchGoogle3.py
+SearchLortelArchives3.py
+SearchSoundtrackCollector3.py
+SearchSoundtrackINFO3.py
+ui_options_lastfm.py


Index: picard.spec
===================================================================
RCS file: /cvs/extras/rpms/picard/F-8/picard.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- picard.spec	23 Dec 2007 08:47:09 -0000	1.3
+++ picard.spec	1 Sep 2008 00:54:41 -0000	1.4
@@ -1,11 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define prerelease beta1
-
 Name:             picard
-Version:          0.9.0
-Release:          5%{?dist}
+Version:          0.10
+Release:          1%{?dist}
 Summary:          MusicBrainz-based audio tagger
 Group:            Applications/Multimedia
 
@@ -26,12 +24,16 @@
 Source11:         http://users.musicbrainz.org/~brianfreud/SearchAmazon3.py
 Source12:         http://users.musicbrainz.org/~brianfreud/SearchCastAlbums3.py
 Source13:         http://users.musicbrainz.org/~brianfreud/SearchDiscogs3.py
-Source13:         http://users.musicbrainz.org/~brianfreud/SearchFilmMusziek3.py
-Source14:         http://users.musicbrainz.org/~brianfreud/SearchGMR.py
-Source15:         http://users.musicbrainz.org/~brianfreud/SearchGoogle3.py
-Source16:         http://users.musicbrainz.org/~brianfreud/SearchLortelArchives3.py
-Source17:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackCollector3.py
-Source18:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackINFO3.py
+Source14:         http://users.musicbrainz.org/~brianfreud/SearchFilmMusziek3.py
+Source15:         http://users.musicbrainz.org/~brianfreud/SearchGMR.py
+Source16:         http://users.musicbrainz.org/~brianfreud/SearchGoogle3.py
+Source17:         http://users.musicbrainz.org/~brianfreud/SearchLortelArchives3.py
+Source18:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackCollector3.py
+Source19:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackINFO3.py
+
+# setup.py doesn't run installation of datadir properly without this patch
+# filed upstream at: http://bugs.musicbrainz.org/ticket/3934
+Patch0:		  %{name}-0.10-setup.patch
 
 License:          GPLv2+
 Url:              http://musicbrainz.org/doc/PicardTagger
@@ -54,6 +56,7 @@
 
 %prep
 %setup -q -n picard-%{version}
+%patch0 -p0
 
 %build
 env %{__python} setup.py config
@@ -63,7 +66,7 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
 # strip out png extension from .desktop file
-sed -e 's/picard-32.png/picard-32/' picard.desktop > $RPM_BUILD_ROOT/%{_datadir}/applications/picard.desktop
+sed -e 's/picard-32.png/picard-32/' picard.desktop > $RPM_BUILD_ROOT%{_datadir}/applications/picard.desktop
 
 %find_lang %{name}
 desktop-file-install --vendor="fedora"                \
@@ -95,6 +98,7 @@
 install -pm 0644 %{SOURCE16} ${PLUGINDIR}
 install -pm 0644 %{SOURCE17} ${PLUGINDIR}
 install -pm 0644 %{SOURCE18} ${PLUGINDIR}
+install -pm 0644 %{SOURCE19} ${PLUGINDIR}
 
 ## disable tests for the moment
 %check
@@ -116,6 +120,14 @@
 %{python_sitearch}/picard/*
 
 %changelog
+* Sun Aug 31 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.10-1
+- Update to latest upstream (0.10).
+- Add patch to work around broken setup.py.
+- Fixed some spec file errors: duplicate sources.
+
+* Sat Feb  9 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.9.0-6
+- rebuilt for GCC 4.3 as requested by Fedora Release Engineering
+
 * Wed Dec 19 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.0-5
 - Add support for python eggs for F9+
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/picard/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Dec 2007 08:47:09 -0000	1.4
+++ sources	1 Sep 2008 00:54:41 -0000	1.5
@@ -1,4 +1,4 @@
-51c6f1d512b5a4e95d385e1dfe2b8aab  picard-0.9.0.tar.gz
+6d4e31446d3a65cbc6ff880947bb500e  picard-0.10.tar.gz
 ba58f55711c22ffcf6aa229f008caaa1  bonusdisc.py
 47a9a85385462134c35ab1a2e00844a6  coverart.py
 3614f4157edb858505d387ec0891d6f3  discnumber.py



From phuang at fedoraproject.org  Mon Sep  1 00:55:29 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon,  1 Sep 2008 00:55:29 +0000 (UTC)
Subject: rpms/ibus-m17n/F-9 .cvsignore, 1.3, 1.4 ibus-m17n.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20080901005529.BBCED7011A@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-m17n/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13490

Modified Files:
	.cvsignore ibus-m17n.spec sources 
Log Message:
Update to 0.1.1.20080901


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Aug 2008 06:54:16 -0000	1.3
+++ .cvsignore	1 Sep 2008 00:54:59 -0000	1.4
@@ -1 +1 @@
-ibus-m17n-0.1.1.20080823.tar.gz
+ibus-m17n-0.1.1.20080901.tar.gz


Index: ibus-m17n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-9/ibus-m17n.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ibus-m17n.spec	23 Aug 2008 06:54:16 -0000	1.3
+++ ibus-m17n.spec	1 Sep 2008 00:54:59 -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)")}
 %define mod_path ibus-0.1
 Name:       ibus-m17n
-Version:    0.1.1.20080823
+Version:    0.1.1.20080901
 Release:    1%{?dist}
 Summary:    The M17N engine for IBus platform
 License:    GPLv2+
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Mon Sep 01 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
+- Update to 0.1.1.20080901.
+
 * Sat Aug 23 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
 - Update to 0.1.1.20080823.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Aug 2008 06:54:16 -0000	1.4
+++ sources	1 Sep 2008 00:54:59 -0000	1.5
@@ -1 +1 @@
-f1d39b804e2f34d08032868dc93eea95  ibus-m17n-0.1.1.20080823.tar.gz
+6cc90f85622acd514e52a1d327d3c073  ibus-m17n-0.1.1.20080901.tar.gz



From phuang at fedoraproject.org  Mon Sep  1 00:58:35 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon,  1 Sep 2008 00:58:35 +0000 (UTC)
Subject: rpms/ibus-pinyin/F-9 .cvsignore, 1.3, 1.4 ibus-pinyin.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20080901005835.47F287011A@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-pinyin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13891

Modified Files:
	.cvsignore ibus-pinyin.spec sources 
Log Message:
Update to 0.1.1.20080901


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Aug 2008 06:55:00 -0000	1.3
+++ .cvsignore	1 Sep 2008 00:58:04 -0000	1.4
@@ -1,2 +1,2 @@
-ibus-pinyin-0.1.1.20080823.tar.gz
+ibus-pinyin-0.1.1.20080901.tar.gz
 pinyin-database-0.1.10.5.tar.bz2


Index: ibus-pinyin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/F-9/ibus-pinyin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ibus-pinyin.spec	23 Aug 2008 06:55:00 -0000	1.3
+++ ibus-pinyin.spec	1 Sep 2008 00:58:04 -0000	1.4
@@ -1,5 +1,5 @@
 Name:       ibus-pinyin
-Version:    0.1.1.20080823
+Version:    0.1.1.20080901
 Release:    1%{?dist}
 Summary:    The PinYin engine for IBus platform
 License:    GPLv2+
@@ -50,6 +50,9 @@
 %{_bindir}/ibus-setup-pinyin
 
 %changelog
+* Mon Sep 01 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
+- Update version to 0.1.1.20080901.
+
 * Sat Aug 23 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
 - Update version to 0.1.1.20080823.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Aug 2008 06:55:00 -0000	1.4
+++ sources	1 Sep 2008 00:58:04 -0000	1.5
@@ -1,2 +1,2 @@
-cb250ad3ccf474bec1664eabe0d2e5b9  ibus-pinyin-0.1.1.20080823.tar.gz
+d21838d22023b41aeab75bb84e5f870f  ibus-pinyin-0.1.1.20080901.tar.gz
 140a7dd821e8e74299bfb2089993838b  pinyin-database-0.1.10.5.tar.bz2



From mbarnes at fedoraproject.org  Mon Sep  1 01:04:24 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon,  1 Sep 2008 01:04:24 +0000 (UTC)
Subject: rpms/gnome-python2-desktop/devel .cvsignore, 1.21,
	1.22 gnome-python2-desktop.spec, 1.36, 1.37 sources, 1.21, 1.22
Message-ID: <20080901010424.C38367011A@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-serv14677

Modified Files:
	.cvsignore gnome-python2-desktop.spec sources 
Log Message:

* Sun Aug 31 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.1-1.fc10
- Update to 2.23.1
- Update version requirements.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	16 Jun 2008 17:52:04 -0000	1.21
+++ .cvsignore	1 Sep 2008 01:03:53 -0000	1.22
@@ -1 +1 @@
-gnome-python-desktop-2.23.0.tar.bz2
+gnome-python-desktop-2.23.1.tar.bz2


Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnome-python2-desktop.spec	16 Jun 2008 17:41:57 -0000	1.36
+++ gnome-python2-desktop.spec	1 Sep 2008 01:03:54 -0000	1.37
@@ -1,6 +1,6 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-# Last updated for version 2.22.0
+# Last updated for version 2.23.1
 # The order here corresponds to that in configure.ac,
 # for easier comparison.  Please do not alphabetize.
 %define pygtk_version                   2.10.3
@@ -14,7 +14,7 @@
 %define nautilus_cd_burner_version      2.15.3
 %define gnome_media_version             2.10.0
 %define gconf2_version			2.10.0
-%define metacity_version                2.19.8
+%define metacity_version                2.21.5
 %define librsvg2_version                2.13.93
 %define gnome_keyring_version           0.5.0
 %define gnome_desktop_version           2.10.0
@@ -25,7 +25,7 @@
 ### Abstract ###
 
 Name: gnome-python2-desktop
-Version: 2.23.0
+Version: 2.23.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Languages
@@ -302,8 +302,12 @@
 %{python_sitearch}/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Sun Aug 31 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.1-1.fc10
+- Update to 2.23.1
+- Update version requirements.
+
 * Mon Jun 16 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.0-1.fc10
-- Update to 2.23.0.
+- Update to 2.23.0
 
 * Wed Jun 11 2008 Matthew Barnes <mbarnes at redhat.com> - 2.22.0-6.fc10
 - Don't drag in devel packages when installing gnome-python2-evolution


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	16 Jun 2008 17:52:04 -0000	1.21
+++ sources	1 Sep 2008 01:03:54 -0000	1.22
@@ -1 +1 @@
-d8f8e61d99402e8b0a82d3c8d6e873be  gnome-python-desktop-2.23.0.tar.bz2
+815174cde8eb1be3d0924f7b8a04c7ee  gnome-python-desktop-2.23.1.tar.bz2



From vlg at fedoraproject.org  Mon Sep  1 02:29:03 2008
From: vlg at fedoraproject.org (Vladislav Grinchenko)
Date: Mon,  1 Sep 2008 02:29:03 +0000 (UTC)
Subject: rpms/granule/F-9 .cvsignore,1.4,1.5 sources,1.6,1.7
Message-ID: <20080901022903.D98307011A@cvs1.fedora.phx.redhat.com>

Author: vlg

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

Modified Files:
	.cvsignore sources 
Log Message:
F-9: granule 1.4.0 build 6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/granule/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Feb 2008 20:43:06 -0000	1.4
+++ .cvsignore	1 Sep 2008 02:28:32 -0000	1.5
@@ -1 +1 @@
-granule-1.3.0.tar.gz
+granule-1.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/granule/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Mar 2008 03:42:08 -0000	1.6
+++ sources	1 Sep 2008 02:28:32 -0000	1.7
@@ -1 +1 @@
-7d19feaee6d6702bde84441b1b9c5fb3  granule-1.3.0.tar.gz
+5e5a719f926a87cf759445baf7b4154f  granule-1.4.0.tar.gz



From phuang at fedoraproject.org  Mon Sep  1 03:00:23 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon,  1 Sep 2008 03:00:23 +0000 (UTC)
Subject: rpms/ibus-table/devel .cvsignore, 1.3, 1.4 ibus-table.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20080901030023.528057011A@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-table/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25349

Modified Files:
	.cvsignore ibus-table.spec sources 
Log Message:
Update to 0.1.1.20080901


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Aug 2008 09:10:13 -0000	1.3
+++ .cvsignore	1 Sep 2008 02:59:52 -0000	1.4
@@ -1 +1 @@
-ibus-table-0.1.1.20080829.tar.gz
+ibus-table-0.1.1.20080901.tar.gz


Index: ibus-table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/ibus-table.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ibus-table.spec	29 Aug 2008 09:10:13 -0000	1.2
+++ ibus-table.spec	1 Sep 2008 02:59:52 -0000	1.3
@@ -1,5 +1,5 @@
 Name:       ibus-table
-Version:    0.1.1.20080829
+Version:    0.1.1.20080901
 Release:    1%{?dist}
 Summary:    The Table engine for IBus platform
 License:    GPLv2+
@@ -45,6 +45,7 @@
 	--enable-cangjie5 \
 	--enable-erbi-qs \
 	--enable-additional
+#	--enable-extra-phrases
 
 make %{?_smp_mflags}
 
@@ -61,7 +62,7 @@
 ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/wubi86.db
 ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/wubi98.db
 ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/cangjie5.db
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/erbi-qs.db
+ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/erbi_qs.db
 ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/zhengma.db
 
 %post additional
@@ -71,17 +72,28 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%dir %{_datadir}/ibus-table
-%{_datadir}/ibus-table/*
+%{_datadir}/ibus-table/engine/*
+%{_datadir}/ibus-table/tables/template.txt
+%{_datadir}/ibus-table/icons/ibus-table.svg
+%{_datadir}/ibus-table/icons/full-letter.svg
+%{_datadir}/ibus-table/icons/full-punct.svg
+%{_datadir}/ibus-table/icons/half-letter.svg
+%{_datadir}/ibus-table/icons/half-punct.svg
+%{_datadir}/ibus-table/icons/onechar.svg
+%{_datadir}/ibus-table/icons/phrase.svg
+%{_datadir}/ibus-table/icons/py-mode.svg
+%{_datadir}/ibus-table/icons/tab-mode.svg 
 %{_bindir}/ibus-engine-table
 %{_bindir}/ibus-table-createdb
 
 %files chinese
 %defattr(-,root,root,-)
+%{_datadir}/ibus-table/data/pinyin_table.txt.bz2
+%{_datadir}/ibus-table/tables/extra_phrase.txt
 %{_datadir}/ibus-table/tables/wubi86.db
 %{_datadir}/ibus-table/tables/wubi98.db
 %{_datadir}/ibus-table/tables/cangjie5.db
-%{_datadir}/ibus-table/tables/erbi-qs.db
+%{_datadir}/ibus-table/tables/erbi_qs.db
 %{_datadir}/ibus-table/tables/zhengma.db
 %{_datadir}/ibus-table/icons/wubi86.svg
 %{_datadir}/ibus-table/icons/wubi98.svg
@@ -91,7 +103,7 @@
 %{_datadir}/ibus/engine/wubi86.engine
 %{_datadir}/ibus/engine/wubi98.engine
 %{_datadir}/ibus/engine/cangjie5.engine
-%{_datadir}/ibus/engine/erbi-qs.engine
+%{_datadir}/ibus/engine/erbi_qs.engine
 %{_datadir}/ibus/engine/zhengma.engine
 
 %files additional
@@ -104,5 +116,8 @@
 %{_datadir}/ibus/engine/latex.engine
 
 %changelog
+* Mon Sep 01 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
+- Update to 0.1.1.20080901.
+
 * Wed Aug 19 2008 Yu Yuwei <acevery at gmail.com> - 0.1.1.20080829-1
 - The first version.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Aug 2008 09:10:13 -0000	1.3
+++ sources	1 Sep 2008 02:59:52 -0000	1.4
@@ -1 +1 @@
-e001c13c90e21927d5d67ee41577ae48  ibus-table-0.1.1.20080829.tar.gz
+eec6366cc9499d9e73d35d619a94bc0c  ibus-table-0.1.1.20080901.tar.gz



From phuang at fedoraproject.org  Mon Sep  1 03:08:31 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon,  1 Sep 2008 03:08:31 +0000 (UTC)
Subject: rpms/ibus-table/F-9 .cvsignore, 1.3, 1.4 ibus-table.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20080901030831.E3A447011A@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-table/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26397

Modified Files:
	.cvsignore ibus-table.spec sources 
Log Message:
Update to 0.1.1.20080901


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Aug 2008 09:32:00 -0000	1.3
+++ .cvsignore	1 Sep 2008 03:08:01 -0000	1.4
@@ -1 +1 @@
-ibus-table-0.1.1.20080829.tar.gz
+ibus-table-0.1.1.20080901.tar.gz


Index: ibus-table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-9/ibus-table.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ibus-table.spec	29 Aug 2008 09:32:00 -0000	1.2
+++ ibus-table.spec	1 Sep 2008 03:08:01 -0000	1.3
@@ -1,5 +1,5 @@
 Name:       ibus-table
-Version:    0.1.1.20080829
+Version:    0.1.1.20080901
 Release:    1%{?dist}
 Summary:    The Table engine for IBus platform
 License:    GPLv2+
@@ -45,6 +45,7 @@
 	--enable-cangjie5 \
 	--enable-erbi-qs \
 	--enable-additional
+#	--enable-extra-phrases
 
 make %{?_smp_mflags}
 
@@ -61,7 +62,7 @@
 ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/wubi86.db
 ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/wubi98.db
 ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/cangjie5.db
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/erbi-qs.db
+ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/erbi_qs.db
 ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/zhengma.db
 
 %post additional
@@ -71,17 +72,28 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%dir %{_datadir}/ibus-table
-%{_datadir}/ibus-table/*
+%{_datadir}/ibus-table/engine/*
+%{_datadir}/ibus-table/tables/template.txt
+%{_datadir}/ibus-table/icons/ibus-table.svg
+%{_datadir}/ibus-table/icons/full-letter.svg
+%{_datadir}/ibus-table/icons/full-punct.svg
+%{_datadir}/ibus-table/icons/half-letter.svg
+%{_datadir}/ibus-table/icons/half-punct.svg
+%{_datadir}/ibus-table/icons/onechar.svg
+%{_datadir}/ibus-table/icons/phrase.svg
+%{_datadir}/ibus-table/icons/py-mode.svg
+%{_datadir}/ibus-table/icons/tab-mode.svg 
 %{_bindir}/ibus-engine-table
 %{_bindir}/ibus-table-createdb
 
 %files chinese
 %defattr(-,root,root,-)
+%{_datadir}/ibus-table/data/pinyin_table.txt.bz2
+%{_datadir}/ibus-table/tables/extra_phrase.txt
 %{_datadir}/ibus-table/tables/wubi86.db
 %{_datadir}/ibus-table/tables/wubi98.db
 %{_datadir}/ibus-table/tables/cangjie5.db
-%{_datadir}/ibus-table/tables/erbi-qs.db
+%{_datadir}/ibus-table/tables/erbi_qs.db
 %{_datadir}/ibus-table/tables/zhengma.db
 %{_datadir}/ibus-table/icons/wubi86.svg
 %{_datadir}/ibus-table/icons/wubi98.svg
@@ -91,7 +103,7 @@
 %{_datadir}/ibus/engine/wubi86.engine
 %{_datadir}/ibus/engine/wubi98.engine
 %{_datadir}/ibus/engine/cangjie5.engine
-%{_datadir}/ibus/engine/erbi-qs.engine
+%{_datadir}/ibus/engine/erbi_qs.engine
 %{_datadir}/ibus/engine/zhengma.engine
 
 %files additional
@@ -104,5 +116,8 @@
 %{_datadir}/ibus/engine/latex.engine
 
 %changelog
+* Mon Sep 01 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
+- Update to 0.1.1.20080901.
+
 * Wed Aug 19 2008 Yu Yuwei <acevery at gmail.com> - 0.1.1.20080829-1
 - The first version.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Aug 2008 09:32:00 -0000	1.3
+++ sources	1 Sep 2008 03:08:01 -0000	1.4
@@ -1 +1 @@
-e001c13c90e21927d5d67ee41577ae48  ibus-table-0.1.1.20080829.tar.gz
+eec6366cc9499d9e73d35d619a94bc0c  ibus-table-0.1.1.20080901.tar.gz



From dchen at fedoraproject.org  Mon Sep  1 05:21:40 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon,  1 Sep 2008 05:21:40 +0000 (UTC)
Subject: rpms/libUnihan/devel import.log, NONE, 1.1 libUnihan.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080901052141.0B7797011A@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libUnihan.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
libUnihan-0_4_1-1_fc9:HEAD:libUnihan-0.4.1-1.fc9.src.rpm:1220245157


--- NEW FILE libUnihan.spec ---
Name:           libUnihan
%define         libUnihan_ver_major 0
%define         libUnihan_ver_minor 4
Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.1
Release:        1%{?dist}
Group:          System Environment/Libraries
License:        LGPLv2+
Summary:        C library for Unihan character database in fifth normal form 
Summary(zh_CN): ???????????????????????????????????????(Unihan)???????????? C ?????????
Summary(zh_TW): ???????????????????????????????????????(Unihan)???????????? C ?????????

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  glib2-devel  sqlite-devel  cmake >= 2.4
#Requires:       glib2  sqlite

URL:            http://sourceforge.net/projects/libunihan
Source0:        http://downloads.sourceforge.net/libunihan/%{name}-%{version}-Source.tar.gz


%description
libUnihan provides a C library for Unihan character database in fifth
normal form (5NF).



%package devel
Summary:    Development files of libUnihan
Group:      Development/Libraries
License:        LGPLv2+
Requires:       %{name} = %{version}-%{release}
Requires:       glib2-devel  sqlite-devel

%description devel
Development files of libUnihan such as header files.

%package doc
Summary:    The libUnihan C API documents in Doxygen style
Group:      Documentation
License:        LGPLv2+
BuildRequires:  doxygen
Requires:       %{name} = %{version}-%{release}

%description doc
The libUnihan C API documents in Doxygen style.


%prep
%setup -q -n %{name}-%{version}-Source

%build
%cmake .
cmake .
make VERBOSE=1 C_DEFINES="$RPM_OPT_FLAGS" %{?_smp_mflags}
make doxygen


%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 AUTHORS NEWS README COPYING COPYING.LESSER
%{_bindir}/unihan_query
%{_libdir}/%{name}.so.%{libUnihan_ver_major}
%{_libdir}/%{name}.so.%{libUnihan_ver_major}.%{libUnihan_ver_minor}

%files devel
%defattr(-,root,root,-)
%doc ChangeLog
%{_includedir}/%{name}/
%{_libdir}/%{name}.so
%{_bindir}/unihan_converter
%{_bindir}/unihan_field_validation

%files doc
%defattr(-,root,root,-)
%doc doc/html


%changelog
* Mon Aug 11 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.4.1-1
- [Bug 453520] C#10 addressed.

* Fri Aug 08 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.4.1-0
- Shows support fields and tables for unihan_query.
- Header files have moved to {include}/libUnihan.
- Completed the description of UnihanTable enumeration.
- Completed the description of str_functions.h
- In str_functions.h: unsignedStr_to_signedStr and signedStr_to_unsignedStr
clones the inputs now, while _buffer postfix for the circumstances that the buffer is given.
Addressing C#6 [Bug 453520] Review Request: libUnihan 
- rpmlint undefined-non-weak-symbol problems solved.
- Moved the include statement of private header files to Unihan_SQL_gen.c files.
- Move the doc/{name} files  to doc/{name}-{version}.
- Uhihan_enum.h and str_functions.h are now in API.

* Mon Aug 04 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.4.0-0
- unihan_test now became unihan_field_vaildation
- Split the enumeration definition of Unihan.h to Unihan_enum.h
- Add unihanDb_get_tableNames() and  unihanTable_get_db_fields()
- Parameter arraySize in unihanField_array_index() is discarded.

* Fri Jul 04 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.1-0
- Add kMandarin frequency rank support.

* Tue Jul 01 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.0-0
- Initial public release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Aug 2008 17:36:57 -0000	1.1
+++ .cvsignore	1 Sep 2008 05:21:10 -0000	1.2
@@ -0,0 +1 @@
+libUnihan-0.4.1-Source.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Aug 2008 17:36:57 -0000	1.1
+++ sources	1 Sep 2008 05:21:10 -0000	1.2
@@ -0,0 +1 @@
+315d731a5fed989853d6aaf324729149  libUnihan-0.4.1-Source.tar.gz



From konradm at fedoraproject.org  Mon Sep  1 05:26:33 2008
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Mon,  1 Sep 2008 05:26:33 +0000 (UTC)
Subject: rpms/joni/devel joni.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <20080901052633.866427011A@cvs1.fedora.phx.redhat.com>

Author: konradm

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

Modified Files:
	joni.spec sources 
Log Message:
* Sun Aug 31 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.3-1
- Official 1.0.3 release.


Index: joni.spec
===================================================================
RCS file: /cvs/pkgs/rpms/joni/devel/joni.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- joni.spec	19 Jul 2008 21:11:17 -0000	1.6
+++ joni.spec	1 Sep 2008 05:26:03 -0000	1.7
@@ -1,13 +1,13 @@
 Name:             joni
 Version:          1.0.3
-Release:          0.3.svn7235%{?dist}
+Release:          1%{?dist}
 Summary:          Java regular expression library
 Group:            Development/Libraries
 License:          MIT
 URL:              http://jruby.codehaus.org/
 # The source for this package was pulled from upstream's vcs. Use the
 # following commands to generate the tarball:
-#   svn export -r 7235 http://svn.codehaus.org/jruby/joni/trunk/ joni-1.0.3
+#   svn export http://svn.codehaus.org/jruby/joni/tags/1.0.3/ joni-1.0.3
 #   tar -cjf joni-1.0.3.tar.bz2 joni-1.0.3
 Source0:          %{name}-%{version}.tar.bz2
 Patch0:           joni-set-java-5_0-target-and-source.patch
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Sun Aug 31 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.3-1
+- Official 1.0.3 release.
+
 * Sat Jul 19 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.3-0.3.svn7235
 - Build AOT bits.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/joni/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Jul 2008 10:24:44 -0000	1.3
+++ sources	1 Sep 2008 05:26:03 -0000	1.4
@@ -1 +1 @@
-80642979735e3b98f05f8377f6734ed9  joni-1.0.3.tar.bz2
+ae4a27000393bdac2f07b21adf46275d  joni-1.0.3.tar.bz2



From konradm at fedoraproject.org  Mon Sep  1 05:27:19 2008
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Mon,  1 Sep 2008 05:27:19 +0000 (UTC)
Subject: rpms/joni/F-9 joni.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20080901052719.8E7FA7011A@cvs1.fedora.phx.redhat.com>

Author: konradm

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

Modified Files:
	joni.spec sources 
Log Message:
* Sun Aug 31 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.3-1
- Official 1.0.3 release.


Index: joni.spec
===================================================================
RCS file: /cvs/pkgs/rpms/joni/F-9/joni.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- joni.spec	19 Jul 2008 11:05:07 -0000	1.2
+++ joni.spec	1 Sep 2008 05:26:49 -0000	1.3
@@ -1,13 +1,13 @@
 Name:             joni
 Version:          1.0.3
-Release:          0.2.svn7235%{?dist}
+Release:          1%{?dist}
 Summary:          Java regular expression library
 Group:            Development/Libraries
 License:          MIT
 URL:              http://jruby.codehaus.org/
 # The source for this package was pulled from upstream's vcs. Use the
 # following commands to generate the tarball:
-#   svn export -r 7235 http://svn.codehaus.org/jruby/joni/trunk/ joni-1.0.3
+#   svn export http://svn.codehaus.org/jruby/joni/tags/1.0.3/ joni-1.0.3
 #   tar -cjf joni-1.0.3.tar.bz2 joni-1.0.3
 Source0:          %{name}-%{version}.tar.bz2
 Patch0:           joni-set-java-5_0-target-and-source.patch
@@ -19,13 +19,13 @@
 Requires:         java >= 1.5
 Requires:         jpackage-utils
 
-%if 0%{?fedora} > 9
-BuildArch:        noarch
-%else
+#%if 0%{?fedora} > 9
+#BuildArch:        noarch
+#%else
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
 Requires(post):   java-gcj-compat >= 1.0.31
 Requires(postun): java-gcj-compat >= 1.0.31
-%endif
+#%endif
 
 
 %description
@@ -50,25 +50,27 @@
 # install unversioned jar as per Java Packaging Guidelines
 install -m 644 target/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
 
+#%if 0%{?fedora} <= 9
 %{_bindir}/aot-compile-rpm
+#%endif
 
 
-%if 0%{?fedora} <= 9
+#%if 0%{?fedora} <= 9
 %post
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
-%endif
+#%endif
 
 
-%if 0%{?fedora} <= 9
+#%if 0%{?fedora} <= 9
 %postun
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
-%endif
+#%endif
 
 
 %clean
@@ -80,12 +82,18 @@
 %doc pom.xml
 %{_javadir}/%{name}.jar
 
-%if 0%{?fedora} <= 9
+#%if 0%{?fedora} <= 9
 %{_libdir}/gcj/%{name}
-%endif
+#%endif
 
 
 %changelog
+* Sun Aug 31 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.3-1
+- Official 1.0.3 release.
+
+* Sat Jul 19 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.3-0.3.svn7235
+- Build AOT bits.
+
 * Sat Jul 19 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.3-0.2.svn7235
 - Bump revision because of stupid packager's mistake.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/joni/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Jul 2008 11:05:07 -0000	1.3
+++ sources	1 Sep 2008 05:26:49 -0000	1.4
@@ -1 +1 @@
-80642979735e3b98f05f8377f6734ed9  joni-1.0.3.tar.bz2
+ae4a27000393bdac2f07b21adf46275d  joni-1.0.3.tar.bz2



From konradm at fedoraproject.org  Mon Sep  1 05:27:25 2008
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Mon,  1 Sep 2008 05:27:25 +0000 (UTC)
Subject: rpms/joni/F-8 joni.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20080901052725.2B92B7011A@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/joni/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5992

Modified Files:
	joni.spec sources 
Log Message:
* Sun Aug 31 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.3-1
- Official 1.0.3 release.


Index: joni.spec
===================================================================
RCS file: /cvs/pkgs/rpms/joni/F-8/joni.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- joni.spec	19 Jul 2008 11:05:01 -0000	1.2
+++ joni.spec	1 Sep 2008 05:26:54 -0000	1.3
@@ -1,13 +1,13 @@
 Name:             joni
 Version:          1.0.3
-Release:          0.2.svn7235%{?dist}
+Release:          1%{?dist}
 Summary:          Java regular expression library
 Group:            Development/Libraries
 License:          MIT
 URL:              http://jruby.codehaus.org/
 # The source for this package was pulled from upstream's vcs. Use the
 # following commands to generate the tarball:
-#   svn export -r 7235 http://svn.codehaus.org/jruby/joni/trunk/ joni-1.0.3
+#   svn export http://svn.codehaus.org/jruby/joni/tags/1.0.3/ joni-1.0.3
 #   tar -cjf joni-1.0.3.tar.bz2 joni-1.0.3
 Source0:          %{name}-%{version}.tar.bz2
 Patch0:           joni-set-java-5_0-target-and-source.patch
@@ -19,13 +19,13 @@
 Requires:         java >= 1.5
 Requires:         jpackage-utils
 
-%if 0%{?fedora} > 9
-BuildArch:        noarch
-%else
+#%if 0%{?fedora} > 9
+#BuildArch:        noarch
+#%else
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
 Requires(post):   java-gcj-compat >= 1.0.31
 Requires(postun): java-gcj-compat >= 1.0.31
-%endif
+#%endif
 
 
 %description
@@ -50,25 +50,27 @@
 # install unversioned jar as per Java Packaging Guidelines
 install -m 644 target/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
 
+#%if 0%{?fedora} <= 9
 %{_bindir}/aot-compile-rpm
+#%endif
 
 
-%if 0%{?fedora} <= 9
+#%if 0%{?fedora} <= 9
 %post
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
-%endif
+#%endif
 
 
-%if 0%{?fedora} <= 9
+#%if 0%{?fedora} <= 9
 %postun
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
-%endif
+#%endif
 
 
 %clean
@@ -80,12 +82,18 @@
 %doc pom.xml
 %{_javadir}/%{name}.jar
 
-%if 0%{?fedora} <= 9
+#%if 0%{?fedora} <= 9
 %{_libdir}/gcj/%{name}
-%endif
+#%endif
 
 
 %changelog
+* Sun Aug 31 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.3-1
+- Official 1.0.3 release.
+
+* Sat Jul 19 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.3-0.3.svn7235
+- Build AOT bits.
+
 * Sat Jul 19 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.3-0.2.svn7235
 - Bump revision because of stupid packager's mistake.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/joni/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Jul 2008 11:05:01 -0000	1.3
+++ sources	1 Sep 2008 05:26:54 -0000	1.4
@@ -1 +1 @@
-80642979735e3b98f05f8377f6734ed9  joni-1.0.3.tar.bz2
+ae4a27000393bdac2f07b21adf46275d  joni-1.0.3.tar.bz2



From konradm at fedoraproject.org  Mon Sep  1 05:27:30 2008
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Mon,  1 Sep 2008 05:27:30 +0000 (UTC)
Subject: rpms/joni/EL-5 joni.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <20080901052730.C3DDC7011A@cvs1.fedora.phx.redhat.com>

Author: konradm

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

Modified Files:
	joni.spec sources 
Log Message:
* Sun Aug 31 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.3-1
- Official 1.0.3 release.


Index: joni.spec
===================================================================
RCS file: /cvs/pkgs/rpms/joni/EL-5/joni.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- joni.spec	19 Jul 2008 21:11:17 -0000	1.6
+++ joni.spec	1 Sep 2008 05:27:00 -0000	1.7
@@ -1,13 +1,13 @@
 Name:             joni
 Version:          1.0.3
-Release:          0.3.svn7235%{?dist}
+Release:          1%{?dist}
 Summary:          Java regular expression library
 Group:            Development/Libraries
 License:          MIT
 URL:              http://jruby.codehaus.org/
 # The source for this package was pulled from upstream's vcs. Use the
 # following commands to generate the tarball:
-#   svn export -r 7235 http://svn.codehaus.org/jruby/joni/trunk/ joni-1.0.3
+#   svn export http://svn.codehaus.org/jruby/joni/tags/1.0.3/ joni-1.0.3
 #   tar -cjf joni-1.0.3.tar.bz2 joni-1.0.3
 Source0:          %{name}-%{version}.tar.bz2
 Patch0:           joni-set-java-5_0-target-and-source.patch
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Sun Aug 31 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.3-1
+- Official 1.0.3 release.
+
 * Sat Jul 19 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.3-0.3.svn7235
 - Build AOT bits.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/joni/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Jul 2008 10:24:44 -0000	1.3
+++ sources	1 Sep 2008 05:27:00 -0000	1.4
@@ -1 +1 @@
-80642979735e3b98f05f8377f6734ed9  joni-1.0.3.tar.bz2
+ae4a27000393bdac2f07b21adf46275d  joni-1.0.3.tar.bz2



From petersen at fedoraproject.org  Mon Sep  1 05:27:53 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon,  1 Sep 2008 05:27:53 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.82,1.83
Message-ID: <20080901052753.382C37011A@cvs1.fedora.phx.redhat.com>

Author: petersen

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

Modified Files:
	comps-f10.xml.in 
Log Message:
- add @burmese-support (my)
- ibus-chewing, ibus-hangul, ibus-table
- scim-tables-chinese-extra
fonts update:
- padauk-fonts (my), darkgarden-fonts, monafont (ja), new smc-fonts subpackages, sportrop, thibault-fonts





Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- comps-f10.xml.in	31 Aug 2008 13:17:31 -0000	1.82
+++ comps-f10.xml.in	1 Sep 2008 05:27:22 -0000	1.83
@@ -523,6 +523,17 @@
     </packagelist>
   </group>
   <group>
+    <id>burmese-support</id>
+    <_name>Burmese Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>my</langonly>
+    <packagelist>
+      <packagereq type="default">padauk-fonts</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>catalan-support</id>
     <_name>Catalan Support</_name>
     <_description/>
@@ -571,12 +582,15 @@
       <packagereq type="default">taipeifonts</packagereq>
       <packagereq type="default">wqy-bitmap-fonts</packagereq>
       <packagereq type="optional">gcin</packagereq>
+      <packagereq type="optional">ibus-chewing</packagereq>
       <packagereq type="optional">ibus-pinyin</packagereq>
+      <packagereq type="optional">ibus-table-chinese</packagereq>
       <packagereq type="optional">lv</packagereq>
       <packagereq type="optional">m17n-db-chinese</packagereq>
       <packagereq type="optional">scim-array</packagereq>
       <packagereq type="optional">scim-fcitx</packagereq>
       <packagereq type="optional">scim-pinyin</packagereq>
+      <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">wqy-unibit-fonts</packagereq>
@@ -1356,6 +1370,7 @@
       <packagereq type="default">lohit-fonts-punjabi</packagereq>
       <packagereq type="default">lohit-fonts-tamil</packagereq>
       <packagereq type="default">lohit-fonts-telugu</packagereq>
+      <packagereq type="default">padauk-fonts</packagereq>
       <packagereq type="default">paktype-fonts</packagereq>
       <packagereq type="default">stix-fonts</packagereq>
       <packagereq type="default">thaifonts-scalable</packagereq>
@@ -1369,6 +1384,7 @@
       <packagereq type="optional">brettfont-fonts</packagereq>
       <packagereq type="optional">charis-fonts</packagereq>
       <packagereq type="optional">cjkunifonts-ukai</packagereq>
+      <packagereq type="optional">darkgarden-fonts</packagereq>
       <packagereq type="optional">dejavu-lgc-fonts</packagereq>
       <packagereq type="optional">doulos-fonts</packagereq>
       <packagereq type="optional">ecolier-court-fonts</packagereq>
@@ -1407,6 +1423,8 @@
       <packagereq type="optional">madan-fonts</packagereq>
       <packagereq type="optional">mathml-fonts</packagereq>
       <packagereq type="optional">mgopen-fonts</packagereq>
+      <packagereq type="optional">mona-fonts-sazanami</packagereq>
+      <packagereq type="optional">mona-fonts-VLGothic</packagereq>
       <packagereq type="optional">nafees-web-naskh-fonts</packagereq>
       <packagereq type="optional">roadstencil-fonts</packagereq>
       <packagereq type="optional">samyak-fonts-devanagari</packagereq>
@@ -1418,15 +1436,22 @@
       <packagereq type="optional">sazanami-fonts-gothic</packagereq>
       <packagereq type="optional">sazanami-fonts-mincho</packagereq>
       <packagereq type="optional">silkscreen-fonts</packagereq>
+      <packagereq type="optional">smc-fonts-anjalioldlipi</packagereq>
       <packagereq type="optional">smc-fonts-dyuthi</packagereq>
+      <packagereq type="optional">smc-fonts-kalyani</packagereq>
       <packagereq type="optional">smc-fonts-meera</packagereq>
       <packagereq type="optional">smc-fonts-rachana</packagereq>
       <packagereq type="optional">smc-fonts-raghumalayalam</packagereq>
       <packagereq type="optional">smc-fonts-suruma</packagereq>
+      <packagereq type="optional">sportrop-fonts</packagereq>
       <packagereq type="optional">stix-fonts-integrals</packagereq>
       <packagereq type="optional">stix-fonts-pua</packagereq>
       <packagereq type="optional">stix-fonts-sizes</packagereq>
       <packagereq type="optional">stix-fonts-variants</packagereq>
+      <packagereq type="optional">thibault-fonts-essays1743</packagereq>
+      <packagereq type="optional">thibault-fonts-isabella</packagereq>
+      <packagereq type="optional">thibault-fonts-rockets</packagereq>
+      <packagereq type="optional">thibault-fonts-staypuft</packagereq>
       <packagereq type="optional">tibetan-machine-uni-fonts</packagereq>
       <packagereq type="optional">tiresias-fonts</packagereq>
       <packagereq type="optional">VLGothic-fonts-proportional</packagereq>
@@ -2389,10 +2414,15 @@
       <packagereq type="optional">gok</packagereq>
       <packagereq type="optional">ibus</packagereq>
       <packagereq type="optional">ibus-anthy</packagereq>
+      <packagereq type="optional">ibus-chewing</packagereq>
       <packagereq type="optional">ibus-gtk</packagereq>
+      <packagereq type="optional">ibus-hangul</packagereq>
       <packagereq type="optional">ibus-m17n</packagereq>
       <packagereq type="optional">ibus-pinyin</packagereq>
       <packagereq type="optional">ibus-qt</packagereq>
+      <packagereq type="optional">ibus-table</packagereq>
+      <packagereq type="optional">ibus-table-additional</packagereq>
+      <packagereq type="optional">ibus-table-chinese</packagereq>
       <packagereq type="optional">kinput2</packagereq>
       <packagereq type="optional">m17n-contrib-esperanto</packagereq>
       <packagereq type="optional">m17n-contrib-nepali</packagereq>
@@ -2455,6 +2485,7 @@
       <packagereq type="optional">scim-tables-amharic</packagereq>
       <packagereq type="optional">scim-tables-arabic</packagereq>
       <packagereq type="optional">scim-tables-chinese</packagereq>
+      <packagereq type="optional">scim-tables-chinese-extra</packagereq>
       <packagereq type="optional">scim-tables-nepali</packagereq>
       <packagereq type="optional">scim-tables-russian</packagereq>
       <packagereq type="optional">scim-tables-thai</packagereq>
@@ -2560,6 +2591,9 @@
       <packagereq type="optional">mecab-jumandic</packagereq>
       <packagereq type="optional">mfiler2</packagereq>
       <packagereq type="optional">migemo</packagereq>
+      <packagereq type="optional">mona-fonts-bitmap</packagereq>
+      <packagereq type="optional">mona-fonts-sazanami</packagereq>
+      <packagereq type="optional">mona-fonts-VLGothic</packagereq>
       <packagereq type="optional">nkf</packagereq>
       <packagereq type="optional">oniguruma</packagereq>
       <packagereq type="optional">perl-NKF</packagereq>
@@ -2902,6 +2936,7 @@
       <packagereq type="default">baekmuk-ttf-fonts-batang</packagereq>
       <packagereq type="default">baekmuk-ttf-fonts-dotum</packagereq>
       <packagereq type="default">baekmuk-ttf-fonts-hline</packagereq>
+      <packagereq type="optional">ibus-hangul</packagereq>
       <packagereq type="optional">lv</packagereq>
       <packagereq type="optional">m17n-db-korean</packagereq>
       <packagereq type="optional">nabi</packagereq>
@@ -2964,6 +2999,7 @@
       <packagereq type="optional">jisksp16-1990-fonts</packagereq>
       <packagereq type="optional">knm_new-fonts</packagereq>
       <packagereq type="optional">libdockapp-fonts</packagereq>
+      <packagereq type="optional">mona-fonts-bitmap</packagereq>
       <packagereq type="optional">taipeifonts</packagereq>
       <packagereq type="optional">terminus-font-console</packagereq>
       <packagereq type="optional">terminus-font-x11</packagereq>
@@ -3135,7 +3171,9 @@
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-malayalam</packagereq>
       <packagereq type="default">lohit-fonts-malayalam</packagereq>
       <packagereq type="default">samyak-fonts-malayalam</packagereq>
+      <packagereq type="default">smc-fonts-anjalioldlipi</packagereq>
       <packagereq type="default">smc-fonts-dyuthi</packagereq>
+      <packagereq type="default">smc-fonts-kalyani</packagereq>
       <packagereq type="default">smc-fonts-rachana</packagereq>
       <packagereq type="default">smc-fonts-raghumalayalam</packagereq>
       <packagereq type="default">smc-fonts-suruma</packagereq>



From dchen at fedoraproject.org  Mon Sep  1 05:38:17 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon,  1 Sep 2008 05:38:17 +0000 (UTC)
Subject: rpms/libUnihan/F-9 import.log, NONE, 1.1 libUnihan.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080901053817.B3F537011A@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libUnihan.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
libUnihan-0_4_1-1_fc9:F-9:libUnihan-0.4.1-1.fc9.src.rpm:1220247194


--- NEW FILE libUnihan.spec ---
Name:           libUnihan
%define         libUnihan_ver_major 0
%define         libUnihan_ver_minor 4
Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.1
Release:        1%{?dist}
Group:          System Environment/Libraries
License:        LGPLv2+
Summary:        C library for Unihan character database in fifth normal form 
Summary(zh_CN): ???????????????????????????????????????(Unihan)???????????? C ?????????
Summary(zh_TW): ???????????????????????????????????????(Unihan)???????????? C ?????????

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  glib2-devel  sqlite-devel  cmake >= 2.4
#Requires:       glib2  sqlite

URL:            http://sourceforge.net/projects/libunihan
Source0:        http://downloads.sourceforge.net/libunihan/%{name}-%{version}-Source.tar.gz


%description
libUnihan provides a C library for Unihan character database in fifth
normal form (5NF).



%package devel
Summary:    Development files of libUnihan
Group:      Development/Libraries
License:        LGPLv2+
Requires:       %{name} = %{version}-%{release}
Requires:       glib2-devel  sqlite-devel

%description devel
Development files of libUnihan such as header files.

%package doc
Summary:    The libUnihan C API documents in Doxygen style
Group:      Documentation
License:        LGPLv2+
BuildRequires:  doxygen
Requires:       %{name} = %{version}-%{release}

%description doc
The libUnihan C API documents in Doxygen style.


%prep
%setup -q -n %{name}-%{version}-Source

%build
%cmake .
cmake .
make VERBOSE=1 C_DEFINES="$RPM_OPT_FLAGS" %{?_smp_mflags}
make doxygen


%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 AUTHORS NEWS README COPYING COPYING.LESSER
%{_bindir}/unihan_query
%{_libdir}/%{name}.so.%{libUnihan_ver_major}
%{_libdir}/%{name}.so.%{libUnihan_ver_major}.%{libUnihan_ver_minor}

%files devel
%defattr(-,root,root,-)
%doc ChangeLog
%{_includedir}/%{name}/
%{_libdir}/%{name}.so
%{_bindir}/unihan_converter
%{_bindir}/unihan_field_validation

%files doc
%defattr(-,root,root,-)
%doc doc/html


%changelog
* Mon Aug 11 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.4.1-1
- [Bug 453520] C#10 addressed.

* Fri Aug 08 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.4.1-0
- Shows support fields and tables for unihan_query.
- Header files have moved to {include}/libUnihan.
- Completed the description of UnihanTable enumeration.
- Completed the description of str_functions.h
- In str_functions.h: unsignedStr_to_signedStr and signedStr_to_unsignedStr
clones the inputs now, while _buffer postfix for the circumstances that the buffer is given.
Addressing C#6 [Bug 453520] Review Request: libUnihan 
- rpmlint undefined-non-weak-symbol problems solved.
- Moved the include statement of private header files to Unihan_SQL_gen.c files.
- Move the doc/{name} files  to doc/{name}-{version}.
- Uhihan_enum.h and str_functions.h are now in API.

* Mon Aug 04 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.4.0-0
- unihan_test now became unihan_field_vaildation
- Split the enumeration definition of Unihan.h to Unihan_enum.h
- Add unihanDb_get_tableNames() and  unihanTable_get_db_fields()
- Parameter arraySize in unihanField_array_index() is discarded.

* Fri Jul 04 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.1-0
- Add kMandarin frequency rank support.

* Tue Jul 01 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.0-0
- Initial public release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Aug 2008 17:36:57 -0000	1.1
+++ .cvsignore	1 Sep 2008 05:37:47 -0000	1.2
@@ -0,0 +1 @@
+libUnihan-0.4.1-Source.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Aug 2008 17:36:57 -0000	1.1
+++ sources	1 Sep 2008 05:37:47 -0000	1.2
@@ -0,0 +1 @@
+315d731a5fed989853d6aaf324729149  libUnihan-0.4.1-Source.tar.gz



From remi at fedoraproject.org  Mon Sep  1 05:54:47 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Mon,  1 Sep 2008 05:54:47 +0000 (UTC)
Subject: rpms/php-pear-HTTP/devel .cvsignore, 1.2, 1.3 php-pear-HTTP.spec,
	1.6, 1.7 sources, 1.2, 1.3 xml2changelog, 1.1, 1.2
Message-ID: <20080901055447.804247011A@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8400

Modified Files:
	.cvsignore php-pear-HTTP.spec sources xml2changelog 
Log Message:
update to 1.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jul 2006 20:52:08 -0000	1.2
+++ .cvsignore	1 Sep 2008 05:54:16 -0000	1.3
@@ -1 +1 @@
-HTTP-1.4.0.tgz
+HTTP-1.4.1.tgz


Index: php-pear-HTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP/devel/php-pear-HTTP.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pear-HTTP.spec	22 Aug 2007 18:33:00 -0000	1.6
+++ php-pear-HTTP.spec	1 Sep 2008 05:54:16 -0000	1.7
@@ -4,8 +4,8 @@
 Summary:     Miscellaneous HTTP utilities
 Summary(fr): Divers utilitaires HTTP
 Name:        php-pear-HTTP
-Version:     1.4.0
-Release:     8%{?dist}
+Version:     1.4.1
+Release:     1%{?dist}
 License:     PHP
 Group:       Development/Libraries
 URL:         http://pear.php.net/package/HTTP
@@ -33,13 +33,15 @@
 
 %prep
 %setup -c -q
-%{__pear} convert package.xml package2.xml
-%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+# package.xml is V2
+%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
+mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+
 
 %build
 # Empty build section
 
+
 %install
 rm -rf %{buildroot}
 
@@ -53,30 +55,45 @@
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
 %{__install} -pm 644 %{pear_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;
 
+# Test suite - must be run as root after installation
+# pear run-tests -p HTTP
+# Should return : 10 PASSED TESTS
+
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
 %{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{pear_name}.xml  >/dev/null || :
 
+
 %postun
 # if refcount = 0 then package has been removed (not upgraded)
 if [ "$1" -eq "0" ]; then
     %{__pear} uninstall --nodeps --ignore-errors --register-only %{pear_name}  >/dev/null || :
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG
 %{pear_phpdir}/HTTP.php
 %{pear_xmldir}/HTTP.xml
+%{pear_testdir}/HTTP
+
 
 %changelog
+* Mon Sep  1 2008 Remi Collet <Fedora at FamilleCollet.com> 1.4.1-1
+- update to 1.4.1 
+- add tests
+
 * Wed Aug 22 2007 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-8
 - remove PEAR from sumnary
 - SPEC Cleanups - Fix License


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2006 20:52:08 -0000	1.2
+++ sources	1 Sep 2008 05:54:16 -0000	1.3
@@ -1 +1 @@
-62f3ef8c163e2ac11b8ea0163f2a5d3e  HTTP-1.4.0.tgz
+6fe726d7304f81ac1fe866b7725512fa  HTTP-1.4.1.tgz


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP/devel/xml2changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml2changelog	22 Aug 2007 18:33:00 -0000	1.1
+++ xml2changelog	1 Sep 2008 05:54:16 -0000	1.2
@@ -7,16 +7,22 @@
 if (in_array("--debug", $_SERVER['argv'])) print_r($xml);
 
 if ($xml['version'] >= "2"){ // Package.xml V 2.0
-	printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+	printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
 		$xml->version->release, $xml->stability->release, 
 		$xml->version->api, $xml->stability->api, 
 		$xml->date, $xml->notes);
+	$new=$xml->version->release;
 
-	if (is_array($xml->changelog->release)) foreach($xml->changelog->release as $rel)
-		printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+	if (isset($xml->changelog->release) && count($xml->changelog->release)) 
+	    foreach($xml->changelog->release as $rel) {
+		$old=$rel->version->release;
+		if ("$old" != "$new") {
+		    printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
 			$rel->version->release, $rel->stability->release, 
 			$rel->version->api, $rel->stability->api, 
 			$rel->date, $rel->notes);
+		}
+	    }
 } else { // Package.xml V 1.0
 	printf("* Version %s (%s) - %s\n\n%s\n\n",
 		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);



From dchen at fedoraproject.org  Mon Sep  1 06:10:50 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon,  1 Sep 2008 06:10:50 +0000 (UTC)
Subject: rpms/libUnihan/EL-5 import.log, NONE, 1.1 libUnihan.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080901061050.7E4427011A@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libUnihan.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
libUnihan-0_4_1-1_fc9:EL-5:libUnihan-0.4.1-1.fc9.src.rpm:1220247605


--- NEW FILE libUnihan.spec ---
Name:           libUnihan
%define         libUnihan_ver_major 0
%define         libUnihan_ver_minor 4
Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.1
Release:        1%{?dist}
Group:          System Environment/Libraries
License:        LGPLv2+
Summary:        C library for Unihan character database in fifth normal form 
Summary(zh_CN): ???????????????????????????????????????(Unihan)???????????? C ?????????
Summary(zh_TW): ???????????????????????????????????????(Unihan)???????????? C ?????????

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  glib2-devel  sqlite-devel  cmake >= 2.4
#Requires:       glib2  sqlite

URL:            http://sourceforge.net/projects/libunihan
Source0:        http://downloads.sourceforge.net/libunihan/%{name}-%{version}-Source.tar.gz


%description
libUnihan provides a C library for Unihan character database in fifth
normal form (5NF).



%package devel
Summary:    Development files of libUnihan
Group:      Development/Libraries
License:        LGPLv2+
Requires:       %{name} = %{version}-%{release}
Requires:       glib2-devel  sqlite-devel

%description devel
Development files of libUnihan such as header files.

%package doc
Summary:    The libUnihan C API documents in Doxygen style
Group:      Documentation
License:        LGPLv2+
BuildRequires:  doxygen
Requires:       %{name} = %{version}-%{release}

%description doc
The libUnihan C API documents in Doxygen style.


%prep
%setup -q -n %{name}-%{version}-Source

%build
%cmake .
cmake .
make VERBOSE=1 C_DEFINES="$RPM_OPT_FLAGS" %{?_smp_mflags}
make doxygen


%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 AUTHORS NEWS README COPYING COPYING.LESSER
%{_bindir}/unihan_query
%{_libdir}/%{name}.so.%{libUnihan_ver_major}
%{_libdir}/%{name}.so.%{libUnihan_ver_major}.%{libUnihan_ver_minor}

%files devel
%defattr(-,root,root,-)
%doc ChangeLog
%{_includedir}/%{name}/
%{_libdir}/%{name}.so
%{_bindir}/unihan_converter
%{_bindir}/unihan_field_validation

%files doc
%defattr(-,root,root,-)
%doc doc/html


%changelog
* Mon Aug 11 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.4.1-1
- [Bug 453520] C#10 addressed.

* Fri Aug 08 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.4.1-0
- Shows support fields and tables for unihan_query.
- Header files have moved to {include}/libUnihan.
- Completed the description of UnihanTable enumeration.
- Completed the description of str_functions.h
- In str_functions.h: unsignedStr_to_signedStr and signedStr_to_unsignedStr
clones the inputs now, while _buffer postfix for the circumstances that the buffer is given.
Addressing C#6 [Bug 453520] Review Request: libUnihan 
- rpmlint undefined-non-weak-symbol problems solved.
- Moved the include statement of private header files to Unihan_SQL_gen.c files.
- Move the doc/{name} files  to doc/{name}-{version}.
- Uhihan_enum.h and str_functions.h are now in API.

* Mon Aug 04 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.4.0-0
- unihan_test now became unihan_field_vaildation
- Split the enumeration definition of Unihan.h to Unihan_enum.h
- Add unihanDb_get_tableNames() and  unihanTable_get_db_fields()
- Parameter arraySize in unihanField_array_index() is discarded.

* Fri Jul 04 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.1-0
- Add kMandarin frequency rank support.

* Tue Jul 01 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.0-0
- Initial public release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Aug 2008 17:36:57 -0000	1.1
+++ .cvsignore	1 Sep 2008 06:10:19 -0000	1.2
@@ -0,0 +1 @@
+libUnihan-0.4.1-Source.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Aug 2008 17:36:57 -0000	1.1
+++ sources	1 Sep 2008 06:10:19 -0000	1.2
@@ -0,0 +1 @@
+315d731a5fed989853d6aaf324729149  libUnihan-0.4.1-Source.tar.gz



From tagoh at fedoraproject.org  Mon Sep  1 06:41:12 2008
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Mon,  1 Sep 2008 06:41:12 +0000 (UTC)
Subject: rpms/Canna/devel skk-dictionaries.patch, 1.2, 1.3 Canna.spec, 1.18,
	1.19
Message-ID: <20080901064112.579CF7011A@cvs1.fedora.phx.redhat.com>

Author: tagoh

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

Modified Files:
	Canna.spec 
Added Files:
	skk-dictionaries.patch 
Log Message:
* Mon Sep  1 2008 Akira TAGOH <tagoh at redhat.com> - 3.7p3-25
- skk-dictionaries.patch: Updated.

skk-dictionaries.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 skk-dictionaries.patch
Index: skk-dictionaries.patch
===================================================================
RCS file: skk-dictionaries.patch
diff -N skk-dictionaries.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ skk-dictionaries.patch	1 Sep 2008 06:41:08 -0000	1.3
@@ -0,0 +1,185577 @@
+diff -pruN Canna37p3.orig/dic/ideo/words/Imakefile Canna37p3/dic/ideo/words/Imakefile
+--- Canna37p3.orig/dic/ideo/words/Imakefile	2003-09-27 15:18:39.000000000 +0900
++++ Canna37p3/dic/ideo/words/Imakefile	2008-09-01 13:38:10.000000000 +0900
+@@ -85,6 +85,8 @@ InstallNamedNonExec(necgaiji.t,necgaiji.
+ InstallNamedNonExec(kanasmpl.t,kanasmpl.ctd,$(CANNADICDIR))
+ InstallNamedNonExec(software.t,software.ctd,$(CANNADICDIR))
+ InstallNamedNonExec(chimei.t,chimei.ctd,$(CANNADICDIR))
++InstallNamedNonExec(zipcode.t,zipcode.ctd,$(CANNADICDIR))
++InstallNamedNonExec(geo.t,geo.ctd,$(CANNADICDIR))
+ InstallNamedNonExec(hojomwd.t,hojomwd.ctd,$(CANNADICDIR))
+ InstallNamedNonExec(hojoswd.t,hojoswd.ctd,$(CANNADICDIR))
+ InstallNamedNonExec(suffix.t,suffix.ctd,$(CANNADICDIR))
+@@ -97,6 +99,7 @@ install::
+ 	$(CHOWN) $(cannaOwner) *.ctd ; $(CHGRP) $(cannaGroup) *.ctd
+ #else
+     TEXTDICS = necgaiji.t kanasmpl.t software.t chimei.t \
++			zipcode.t geo.t \
+                hojomwd.t hojoswd.t suffix.t number.t katakana.t keishiki.t
+ InstallMultipleFlags($(TEXTDICS),$(CANNADICDIR),-m 0664 $(cannaOwnerGroup))
+ #endif
+diff -pruN Canna37p3.orig/dic/ideo/words/dics.dir Canna37p3/dic/ideo/words/dics.dir
+--- Canna37p3.orig/dic/ideo/words/dics.dir	2003-09-27 15:18:39.000000000 +0900
++++ Canna37p3/dic/ideo/words/dics.dir	2008-09-01 13:38:10.000000000 +0900
+@@ -39,3 +39,5 @@ chimei.ctd(.mwd)		-chimei---
+ kanasmpl.ctd(.mwd)		-kanasample---
+ necgaiji.ctd(.mwd)		-necgaiji---
+ software.ctd(.mwd)		-software---
++zipcode.ctd(.mwd)		-zipcode---
++geo.ctd(.mwd)		-geo---
+diff -pruN Canna37p3.orig/dic/ideo/words/geo.t Canna37p3/dic/ideo/words/geo.t
+--- Canna37p3.orig/dic/ideo/words/geo.t	1970-01-01 09:00:00.000000000 +0900
++++ Canna37p3/dic/ideo/words/geo.t	2008-09-01 13:38:10.000000000 +0900
+@@ -0,0 +1,68607 @@
++# 
++# This dictionary was generated from /usr/share/skk/SKK-JISYO.geo by ./Geo.rb 
++# Date: Wed Aug 22 07:57:49 JST 2001
++# 
++?????????????? #CN ????????????
++???? #CN ???? ????
++???????? #CN ????
++???????? #CN ????
++???????? #CN ????
++???????? #CN ????
++???????? #CN ????
++?????????? #CNS ??????
++?????????????? #CNS ?????? ??????
++?????????????? #CN ??????
++???????????? #CNS ??????
++???????? #CN ????
++?????????????? #CN ????????
++???????? #CN ????
++???????? #CN ????
++???????????? #CNS ??????
++?????????? #CN ????
++???????? #CN ????
++???????? #CN ???? ???? ????
++???????????? #CN ??????
++?????????????? #CNS ?????? ??????
++???????????? #CNS ?????? ??????
++?????????????????? #CNS ??????????
++???????????? #CNS ??????
++???????????????????? #CN ??????????
++?????????????????? #CN ??????????
++???????????????????? #CN ??????????
++???????????????????????? #CN ????????????
++?????????????????????? #CN ????????????
++?????????????????????? #CN ????????????
++???????????? #CNS ??????
++???????????? #CN ????????
++???????????? #CNS ??????
++???????? #CN ????
++?????????????? #CNS ??????
++???????????????????????? #CNS ????????????
++???????????????????????? #CNS ????????????
++?????????????? #CNS ??????
++?????????????? #CNS ??????
++???????????? #CN ??????
++?????????????? #CN ??????
++?????????? #CN ??????
++???????? #CN ????
++???????? #CN ????
++???????? #CN ????
++?????????????? #CNS ??????
++???????? #CN ????
++???????? #CN ????
++???????? #CN ????
++???????? #CN ????
++???????? #CN ????
++?????????????? #CNS ??????
++???????? #CN ????
++?????????????????? #CNS ????????
++???????? #CN ?????? ????
++???????????????? #CN ????????
++?????? #CN ????
++???????? #CN ????
++?????????????? #CNS ??????
++?????? #CN ????
++???????????????? #CNS ????????
++???????? #CN ????
++???????????????????? #CN ??????????
++?????????????? #CNS ??????
++?????? #CN ???? ????
++???????? #CN ????
++?????????????? #CNS ??????
++???????? #CN ????
++?????? #CN ???? ???? ????
++???????? #CN ????
++?????????????????????? #CNS ????????????
++???????????????????????? #CNS ????????????
++???????????????????????? #CNS ????????????
++?????????????????????????? #CNS ??????????????
++???????????????????????????? #CNS ??????????????
++???????????????????????? #CNS ????????????
++???????????? #CNS ??????
++???????? #CN ????
++?????? #CN ????
++???????????????????????? #CNS ????????????
++???????????????????????? #CNS ??????????????
++???????????? #CNS ??????
++?????? #CN ????
++???????? #CN ????
++???????? #CN ????
++?????????????? #CN ????????
++?????????? #CNS ??????
++?????????????? #CNS ??????
++???????????? #CNS ??????
++?????? #CN ???? ????
++?????????? #CN ????
++???????????? #CNS ??????
++?????? #CN ???? ????
++???????? #CN ???? ????
++?????????????? #CN ??????????
++???????? #CN ????
++?????? #CN ????
++???????? #CN ????
++?????????? #CN ??????
++???????????????? #CNS ??????
++?????????? #CN ??????
++???????? #CN ?????? ????
++???????????? #CN ??????
++???????????????? #CNS ??????????
++???????????? #CNS ??????
++?????????? #CN ????
++?????????? #CN ????
++?????????????? #CN ????????
++?????????????? #CN ????????
++?????????? #CN ??????
++??????????1?????? #CN ????????????
++??????????2?????? #CN ????????????
++??????????3?????? #CN ????????????
++??????????4?????? #CN ????????????
++??????????5?????? #CN ????????????
++?????????? #CN ?????? ??????
++?????????? #CN ???? ?????? ????
++???????? #CN ??????
++?????????? #CN ?????? ????
++???????????? #CNS ??????
++???????????????? #CNS ??????
++???????? #CN ??????
++?????????? #CN ?????? ??????
++?????????? #CNS ??????
++????????????????2???????????? #CN ????????????????
++???????????????????????????????? #CN ??????????????????
++?????????? #CN ??????
++?????????? #CN ????
++???????? #CN ?????? ?????? ??????
++?????????? #CN ??????
++?????????? #CN ??????
++???????????? #CNS ????????
++???????? #CN ????
++???????? #CN ????
++???????? #CN ????
++?????????????? #CN ????????
++?????????????????????? #CN ????????????
++???????????? #CN ??????
++?????????????? #CN ????????
++???????????????? #CN ??????????
++???????????? #CN ??????
++???????????????? #CN ????????
++???????????????? #CN ????????
++?????????????? #CN ????????
++???????????????? #CN ????????
++???????????? #CN ??????
++???????????? #CNS ??????
++?????????????????? #CN ????????
++???????????????? #CN ??????????
++?????????????? #CN ????????
++?????? #CN ???? ????
++?????????? #CN ????
++???????????? #CNS ?????? ??????
++???????????? #CN ??????
++???????? #CN ????
++???????? #CN ???? ????
[...185184 lines suppressed...]
++9997312 #CN ??????????????????????????
++9997313 #CN ??????????????????????????
++9997314 #CN ????????????????????????
++9997315 #CN ????????????????????????
++9997316 #CN ????????????????????????
++9997461 #CN ??????????????????
++9997462 #CN ??????????????????
++9997463 #CN ????????????????
++9997464 #CN ????????????????
++9997541 #CN ????????????????
++9997542 #CN ????????????????
++9997543 #CN ????????????????
++9997544 #CN ????????????????
++9997545 #CN ????????????????
++9997546 #CN ????????????????
++9997547 #CN ????????????????
++9997600 #CN ????????????????????
++9997601 #CN ????????????????????????
++9997602 #CN ??????????????????????????
++9997604 #CN ????????????????????????
++9997611 #CN ??????????????????????????
++9997621 #CN ????????????????????????
++9997622 #CN ????????????????????????
++9997631 #CN ??????????????????????????
++9997632 #CN ??????????????????????????
++9997633 #CN ????????????????????????
++9997634 #CN ????????????????????????
++9997635 #CN ????????????????????????????
++9997636 #CN ??????????????????????????
++9997637 #CN ????????????????????????????
++9997638 #CN ????????????????????????
++9997641 #CN ??????????????????????
++9997642 #CN ????????????????????????
++9997643 #CN ????????????????????????
++9997644 #CN ????????????????????????
++9997645 #CN ????????????????????????
++9997646 #CN ????????????????????????
++9997651 #CN ????????????????????????
++9997652 #CN ????????????????????????
++9997653 #CN ??????????????????????????
++9997661 #CN ??????????????????????????
++9997662 #CN ????????????????????????????
++9997663 #CN ????????????????????????????
++9997664 #CN ????????????????????????????
++9997671 #CN ????????????????????????
++9997672 #CN ??????????????????????????
++9997673 #CN ????????????????????????
++9997674 #CN ????????????????????????????
++9997675 #CN ????????????????????????
++9997676 #CN ??????????????????????????
++9997677 #CN ??????????????????????????
++9997681 #CN ????????????????????????
++9997682 #CN ??????????????????????????
++9997683 #CN ????????????????????????
++9997684 #CN ??????????????????????????
++9997685 #CN ????????????????????????
++9997700 #CN ????????????????????
++9997701 #CN ??????????????????????
++9997702 #CN ????????????????????????
++9997703 #CN ????????????????????????
++9997704 #CN ??????????????????????????
++9997705 #CN ????????????????????????
++9997706 #CN ??????????????????????????
++9997707 #CN ??????????????????????????
++9997711 #CN ????????????????????????
++9997712 #CN ????????????????????????
++9997713 #CN ????????????????????????
++9997714 #CN ????????????????????????????
++9997715 #CN ????????????????????????
++9997721 #CN ??????????????????????????
++9997722 #CN ????????????????????????????
++9997723 #CN ????????????????????????
++9997724 #CN ????????????????????????????
++9997725 #CN ??????????????????????????
++9997726 #CN ????????????????????????
++9997727 #CN ????????????????????????
++9997731 #CN ????????????????????????????
++9997732 #CN ????????????????????????????
++9997733 #CN ??????????????????????????
++9997734 #CN ????????????????????????
++9997735 #CN ????????????????????????????
++9997736 #CN ????????????????????????
++9997737 #CN ??????????????????????????
++9997741 #CN ????????????????????????
++9997742 #CN ????????????????????????
++9997743 #CN ??????????????????????????
++9997744 #CN ????????????????????????????
++9997745 #CN ??????????????????????????
++9997746 #CN ????????????????????????
++9997747 #CN ????????????????????????
++9997748 #CN ????????????????????????
++9997749 #CN ????????????????????????
++9997751 #CN ????????????????????????????
++9997752 #CN ????????????????????????????
++9997753 #CN ????????????????????????
++9997754 #CN ????????????????????????
++9997755 #CN ????????????????????????
++9997756 #CN ??????????????????????????
++9997757 #CN ????????????????????????
++9997761 #CN ??????????????????????????
++9997762 #CN ??????????????????????????
++9997763 #CN ????????????????????????
++9997764 #CN ??????????????????????????
++9997765 #CN ????????????????????????
++9997766 #CN ????????????????????????
++9997767 #CN ????????????????????????
++9997768 #CN ????????????????????????
++9997771 #CN ??????????????
++9997772 #CN ????????????????
++9997773 #CN ????????????????
++9997774 #CN ????????????????
++9997775 #CN ??????????????????
++9997776 #CN ????????????????
++9997777 #CN ????????????????
++9997781 #CN ????????????????????????
++9998131 #CN ???????????????? ????????????????????
++9998132 #CN ????????????????
++9998133 #CN ??????????????????
++9998134 #CN ????????????????
++9998141 #CN ????????????????
++9998142 #CN ????????????????
++9998143 #CN ????????????????
++9998144 #CN ????????????????
++9998145 #CN ????????????????
++9998151 #CN ????????????????
++9998152 #CN ??????????????????
++9998153 #CN ??????????????????
++9998154 #CN ??????????????????
++9998155 #CN ??????????????????
++9998156 #CN ??????????????????
++9998157 #CN ??????????????????
++9998158 #CN ????????????????
++9998161 #CN ????????????????
++9998162 #CN ????????????????????
++9998163 #CN ??????????????????
++9998164 #CN ??????????????????
++9998165 #CN ????????????????????
++9998166 #CN ??????????????????
++9998167 #CN ????????????????????
++9998168 #CN ????????????????
++9998200 #CN ??????????????????
++9998201 #CN ??????????????????????
++9998202 #CN ??????????????????????
++9998203 #CN ??????????????????????
++9998204 #CN ??????????????????????
++9998205 #CN ????????????????????????
++9998206 #CN ????????????????????????
++9998207 #CN ??????????????????????
++9998211 #CN ????????????????????????
++9998212 #CN ????????????????????????
++9998213 #CN ????????????????????????
++9998214 #CN ????????????????????????
++9998215 #CN ??????????????????????
++9998221 #CN ??????????????????????
++9998222 #CN ????????????????????????
++9998223 #CN ????????????????????????
++9998224 #CN ??????????????????????
++9998225 #CN ????????????????????????
++9998226 #CN ??????????????????????
++9998227 #CN ????????????????????????
++9998231 #CN ????????????????????
++9998232 #CN ??????????????????????
++9998233 #CN ????????????????????????
++9998234 #CN ??????????????????????
++9998235 #CN ????????????????????????
++9998241 #CN ??????????????????????
++9998242 #CN ??????????????????????
++9998243 #CN ????????????????????????
++9998244 #CN ????????????????????????
++9998245 #CN ??????????????????????
++9998246 #CN ??????????????????????
++9998300 #CN ??????????????????
++9998301 #CN ????????????????????????
++9998302 #CN ??????????????????????
++9998303 #CN ??????????????????????
++9998304 #CN ??????????????????????????
++9998311 #CN ????????????????????????
++9998312 #CN ????????????????????????
++9998313 #CN ??????????????????????
++9998314 #CN ????????????????????????
++9998315 #CN ????????????????????????
++9998316 #CN ??????????????????????
++9998317 #CN ??????????????????????
++9998421 #CN ????????????????
++9998422 #CN ??????????????????
++9998423 #CN ????????????????
++9998431 #CN ?????????????????????? ????????????????????????????
++9998432 #CN ??????????????????????
++9998433 #CN ??????????????????????
++9998434 #CN ??????????????????????
++9998435 #CN ??????????????????????
++9998436 #CN ??????????????????????
++9998437 #CN ??????????????????????
++9998438 #CN ??????????????????????
++9998521 #CN ??????????????????????
++9998522 #CN ??????????????????????
++9998523 #CN ??????????????????????
++9998524 #CN ??????????????????????
++9998525 #CN ??????????????????????
++9998531 #CN ??????????????????????


Index: Canna.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Canna/devel/Canna.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Canna.spec	8 Apr 2008 10:37:46 -0000	1.18
+++ Canna.spec	1 Sep 2008 06:41:07 -0000	1.19
@@ -10,7 +10,7 @@
 Summary: A Japanese character set input system.
 Name: Canna
 Version: 3.7p3
-Release: 24%{?dist}
+Release: 25%{?dist}
 # lib/RKindep/cksum.c is licensed under 4-clause BSD, otherwise MIT.
 License: MIT and BSD with advertising
 Group: System Environment/Libraries
@@ -32,7 +32,7 @@
 Patch4: Canna-3.6-dont-grab-ctrl-o.patch
 Patch5: Canna-3.6-fix-warnings.patch
 ## some dictionaries were ported from SKK-JISYO.*
-Patch17: skk-dictionaries.patch.bz2
+Patch17: skk-dictionaries.patch
 Patch18: Canna-3.6-cannadic.patch
 Patch19: Canna-3.6-shion.patch
 Patch21: Canna-3.6-bonobo.patch
@@ -332,6 +332,9 @@
 %{_libdir}/libcanna16.so.*
 
 %changelog
+* Mon Sep  1 2008 Akira TAGOH <tagoh at redhat.com> - 3.7p3-25
+- skk-dictionaries.patch: Updated.
+
 * Tue Apr  8 2008 Akira TAGOH <tagoh at redhat.com> - 3.7p3-24
 - Don't start the service by default. (#441276)
 



From tagoh at fedoraproject.org  Mon Sep  1 06:52:05 2008
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Mon,  1 Sep 2008 06:52:05 +0000 (UTC)
Subject: rpms/apel/devel apel.spec,1.5,1.6
Message-ID: <20080901065205.3262C7011A@cvs1.fedora.phx.redhat.com>

Author: tagoh

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

Modified Files:
	apel.spec 
Log Message:
* Mon Sep  1 2008 Akira TAGOH <tagoh at redhat.com> - 10.7-2
- Update the spec file.


Index: apel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apel/devel/apel.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apel.spec	8 Aug 2007 11:13:50 -0000	1.5
+++ apel.spec	1 Sep 2008 06:51:34 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:		apel
 Version:	10.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 URL:		http://cvs.m17n.org/elisp/APEL/index.en.html
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -37,7 +37,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b .cfg
+%patch0 -p1 -b .cfg
 %patch1 -p1 -b .missing
 
 %build
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Mon Sep  1 2008 Akira TAGOH <tagoh at redhat.com> - 10.7-2
+- Update the spec file.
+
 * Wed Aug  8 2007 Akira TAGOH <tagoh at redhat.com> - 10.7-1
 - New upstream release.
 - Update License tag.



From jsafrane at fedoraproject.org  Mon Sep  1 07:04:26 2008
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Mon,  1 Sep 2008 07:04:26 +0000 (UTC)
Subject: rpms/openldap/devel openldap.spec,1.130,1.131
Message-ID: <20080901070426.2E96E7011A@cvs1.fedora.phx.redhat.com>

Author: jsafrane

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

Modified Files:
	openldap.spec 
Log Message:
provide ldif2dbm functionality for migrationtools


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- openldap.spec	25 Jul 2008 11:15:20 -0000	1.130
+++ openldap.spec	1 Sep 2008 07:03:55 -0000	1.131
@@ -11,7 +11,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -50,6 +50,9 @@
 Requires: glibc >= 2.2.3-48, mktemp
 Obsoletes: compat-openldap < 2.4
 
+# provide ldif2ldbm functionality for migrationtools
+Provides: ldif2ldbm
+
 %description
 OpenLDAP is an open source suite of LDAP (Lightweight Directory Access
 Protocol) applications and development tools. LDAP is a set of
@@ -600,6 +603,9 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Mon Sep  1 2008 Jan Safranek <jsafranek at redhat.com> 2.4.11-2
+- provide ldif2ldbm functionality for migrationtools
+
 * Mon Jul 21 2008 Jan Safranek <jsafranek at redhat.com> 2.4.11-1
 - new upstream release
 - apply official bdb-4.6.21 patches



From caolanm at fedoraproject.org  Mon Sep  1 07:18:44 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  1 Sep 2008 07:18:44 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1630,1.1631
Message-ID: <20080901071844.5699E7011B@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16767

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#460755 TryExec oowriter on brwriter.desktop etc


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1630
retrieving revision 1.1631
diff -u -r1.1630 -r1.1631
--- openoffice.org.spec	31 Aug 2008 09:54:55 -0000	1.1630
+++ openoffice.org.spec	1 Sep 2008 07:18:12 -0000	1.1631
@@ -1885,7 +1885,6 @@
 echo "TryExec=oodraw" >> draw.desktop
 # rh#156677# / rh#186515#
 echo "NoDisplay=true" >> math.desktop
-chmod u-w *.desktop
 # relocate the .desktop and icon files
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 cp -p base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-base.desktop
@@ -1947,7 +1946,6 @@
 echo "StartupNotify=true" >> draw.desktop
 # rh#156677# / rh#186515#
 echo "NoDisplay=true" >> math.desktop
-chmod u-w *.desktop
 # relocate the .desktop and icon files
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 cp -p base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/broffice.org-base.desktop
@@ -3647,6 +3645,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Sep 01 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-4.2
+- Resolves: rhbz#460755 TryExec oowriter on brwriter.desktop etc
+
 * Fri Aug 29 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-4.1
 - next milestone
 - writer2latex isn't really core enough to be hard required



From sharkcz at fedoraproject.org  Mon Sep  1 07:26:40 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon,  1 Sep 2008 07:26:40 +0000 (UTC)
Subject: rpms/tinyerp/devel tinyerp-pgsql.patch, NONE, 1.1 tinyerp.spec, 1.35,
	1.36
Message-ID: <20080901072640.C3C567011A@cvs1.fedora.phx.redhat.com>

Author: sharkcz

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

Modified Files:
	tinyerp.spec 
Added Files:
	tinyerp-pgsql.patch 
Log Message:
* Mon Sep  1 2008 Dan Horak <dan[at]danny.cz> 4.2.2-4
- add patch for PostgreSQL 8.3 compatibility (from Pieter. J. Kersten)


tinyerp-pgsql.patch:

--- NEW FILE tinyerp-pgsql.patch ---
diff -Nru tinyerp-server-4.2.2.orig/bin/addons/report_analytic_line/report_analytic_line.py tinyerp-server-4.2.2/bin/addons/report_analytic_line/report_analytic_line.py
--- tinyerp-server-4.2.2.orig/bin/addons/report_analytic_line/report_analytic_line.py	2008-02-06 10:19:25.000000000 +0100
+++ tinyerp-server-4.2.2/bin/addons/report_analytic_line/report_analytic_line.py	2008-09-01 08:57:45.000000000 +0200
@@ -48,7 +48,7 @@
         cr.execute("""
             CREATE OR REPLACE VIEW report_account_analytic_line_to_invoice AS (
                 SELECT
-                    DISTINCT(SUBSTRING(l.date for 7))||'-'||'01' AS name,
+                    DISTINCT(TO_CHAR(l.date, 'YYYY-MM'))||'-'||'01' AS name,
                     MIN(l.id) AS id,
                     l.product_id,
                     l.account_id,
@@ -65,7 +65,7 @@
                 WHERE
                     (invoice_id IS NULL) and (to_invoice IS NOT NULL)
                 GROUP BY
-                    SUBSTRING(date for 7), product_id, product_uom_id, account_id
+                    TO_CHAR(date, 'YYYY-MM'), product_id, product_uom_id, account_id
             )
         """)
 report_account_analytic_line_to_invoice()
diff -Nru tinyerp-server-4.2.2.orig/bin/addons/report_crm/report_crm.py tinyerp-server-4.2.2/bin/addons/report_crm/report_crm.py
--- tinyerp-server-4.2.2.orig/bin/addons/report_crm/report_crm.py	2008-02-06 10:19:25.000000000 +0100
+++ tinyerp-server-4.2.2/bin/addons/report_crm/report_crm.py	2008-09-01 08:57:45.000000000 +0200
@@ -59,7 +59,7 @@
 			create or replace view report_crm_case_user as (
 				select
 					min(c.id) as id,
-					substring(c.create_date for 7)||'-01' as name,
+					to_char(c.create_date, 'YYYY-MM')||'-01' as name,
 					c.state,
 					c.user_id,
 					c.section_id,
@@ -71,7 +71,7 @@
 					to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
 				from
 					crm_case c
-				group by substring(c.create_date for 7), c.state, c.user_id, c.section_id
+				group by to_char(c.create_date, 'YYYY-MM'), c.state, c.user_id, c.section_id
 			)""")
 report_crm_case_user()
 
@@ -97,7 +97,7 @@
 			create or replace view report_crm_case_categ as (
 				select
 					min(c.id) as id,
-					substring(c.create_date for 7)||'-01' as name,
+					to_char(c.create_date, 'YYYY-MM')||'-01' as name,
 					c.state,
 					c.categ_id,
 					c.section_id,
@@ -109,6 +109,6 @@
 					to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
 				from
 					crm_case c
-				group by substring(c.create_date for 7), c.state, c.categ_id, c.section_id
+				group by to_char(c.create_date, 'YYYY-MM'), c.state, c.categ_id, c.section_id
 			)""")
 report_crm_case_categ()
diff -Nru tinyerp-server-4.2.2.orig/bin/addons/report_intrastat/report_intrastat.py tinyerp-server-4.2.2/bin/addons/report_intrastat/report_intrastat.py
--- tinyerp-server-4.2.2.orig/bin/addons/report_intrastat/report_intrastat.py	2008-02-06 10:19:29.000000000 +0100
+++ tinyerp-server-4.2.2/bin/addons/report_intrastat/report_intrastat.py	2008-09-01 08:57:45.000000000 +0200
@@ -74,7 +74,7 @@
 		cr.execute("""
 			create or replace view report_intrastat as (
 				select
-					substring(m.create_date for 7)||'-01' as name,
+					to_char(m.create_date, 'YYYY-MM')||'-01' as name,
 					min(m.id) as id,
 					pt.intrastat_id as intrastat_id,
 					case when l.usage in ('supplier', 'customer') then upper(pc.code) else upper(c.code) end as code,
@@ -122,7 +122,7 @@
 					and ((l.usage in ('supplier', 'customer') and dl.usage not in ('supplier', 'customer'))
 						or (dl.usage in ('supplier', 'customer') and l.usage not in ('supplier', 'customer')))
 					and (c.intrastat is not null or pc.intrastat is not null)
-				group by substring(m.create_date for 7), pt.intrastat_id, c.code, pc.code, l.usage, dl.usage, ppl.currency_id, spl.currency_id
+				group by to_char(m.create_date, 'YYYY-MM'), pt.intrastat_id, c.code, pc.code, l.usage, dl.usage, ppl.currency_id, spl.currency_id
 			)""")
 report_intrastat()
 
diff -Nru tinyerp-server-4.2.2.orig/bin/addons/report_project/report_project.py tinyerp-server-4.2.2/bin/addons/report_project/report_project.py
--- tinyerp-server-4.2.2.orig/bin/addons/report_project/report_project.py	2008-02-06 10:19:29.000000000 +0100
+++ tinyerp-server-4.2.2/bin/addons/report_project/report_project.py	2008-09-01 08:57:45.000000000 +0200
@@ -49,7 +49,7 @@
             create or replace view report_project_task_user as (
                 select
                     min(t.id) as id,
-                    substring(date_close for 7)||'-01' as name,
+                    to_char(date_close, 'YYYY-MM')||'-01' as name,
                     count(distinct t.id) as task_closed,
                     t.user_id,
                     t.project_id,
@@ -62,7 +62,7 @@
                 where
                     t.state='done'
                 group by
-                    substring(date_close for 7),t.user_id,project_id
+                    to_char(date_close, 'YYYY-MM'),t.user_id,project_id
             )
         """)
 report_project_task_user()
@@ -87,7 +87,7 @@
             create or replace view report_project_task as (
                 select
                     min(t.id) as id,
-                    substring(date_close for 7)||'-01' as name,
+                    to_char(date_close, 'YYYY-MM')||'-01' as name,
                     count(distinct t.id) as task_closed,
                     t.project_id,
                     sum(planned_hours) as hours_planned,
@@ -99,7 +99,7 @@
                 where
                     t.state='done'
                 group by
-                    substring(date_close for 7),project_id
+                    to_char(date_close, 'YYYY-MM'),project_id
             )
         """)
 report_project_task()
diff -Nru tinyerp-server-4.2.2.orig/bin/addons/report_purchase/report_purchase.py tinyerp-server-4.2.2/bin/addons/report_purchase/report_purchase.py
--- tinyerp-server-4.2.2.orig/bin/addons/report_purchase/report_purchase.py	2008-02-06 10:19:29.000000000 +0100
+++ tinyerp-server-4.2.2/bin/addons/report_purchase/report_purchase.py	2008-09-01 08:57:45.000000000 +0200
@@ -61,7 +61,7 @@
 			create or replace view report_purchase_order_product as (
 				select
 					min(l.id) as id,
-					substring(s.date_order for 7)||'-'||'01' as name,
+					to_char(s.date_order, 'YYYY-MM')||'-'||'01' as name,
 					s.state,
 					l.product_id,
 					sum(l.product_qty*u.factor) as quantity,
@@ -71,7 +71,7 @@
 				from purchase_order s
 					left join purchase_order_line l on (s.id=l.order_id)
 					left join product_uom u on (u.id=l.product_uom)
-				group by l.product_id, substring(s.date_order for 7),s.state
+				group by l.product_id, to_char(s.date_order, 'YYYY-MM'),s.state
 			)
 		""")
 report_purchase_order_product()
@@ -104,7 +104,7 @@
 			create or replace view report_purchase_order_category as (
 				select
 					min(l.id) as id,
-					substring(s.date_order for 7)||'-'||'01' as name,
+					to_char(s.date_order, 'YYYY-MM')||'-'||'01' as name,
 					s.state,
 					t.categ_id as category_id,
 					sum(l.product_qty*u.factor) as quantity,
@@ -116,7 +116,7 @@
 					left join product_product p on (p.id=l.product_id)
 					left join product_template t on (t.id=p.product_tmpl_id)
 					left join product_uom u on (u.id=l.product_uom)
-				group by t.categ_id, substring(s.date_order for 7),s.state
+				group by t.categ_id, to_char(s.date_order, 'YYYY-MM'),s.state
 			 )
 		""")
 report_purchase_order_category()
diff -Nru tinyerp-server-4.2.2.orig/bin/addons/report_sale/report_sale.py tinyerp-server-4.2.2/bin/addons/report_sale/report_sale.py
--- tinyerp-server-4.2.2.orig/bin/addons/report_sale/report_sale.py	2008-02-06 10:19:22.000000000 +0100
+++ tinyerp-server-4.2.2/bin/addons/report_sale/report_sale.py	2008-09-01 08:57:45.000000000 +0200
@@ -57,7 +57,7 @@
 			create or replace view report_sale_order_product as (
 				select
 					min(l.id) as id,
-					substring(s.date_order for 7)||'-'||'01' as name,
+					to_char(s.date_order, 'YYYY-MM')||'-'||'01' as name,
 					s.state,
 					l.product_id,
 					sum(l.product_uom_qty*u.factor) as quantity,
@@ -67,7 +67,7 @@
 				from sale_order s
 					right join sale_order_line l on (s.id=l.order_id)
 					left join product_uom u on (u.id=l.product_uom)
-				group by l.product_id, substring(s.date_order for 7),s.state
+				group by l.product_id, to_char(s.date_order, 'YYYY-MM'),s.state
 			)
 		""")
 # Done in the _auto_init
@@ -109,7 +109,7 @@
 			create or replace view report_sale_order_category as (
 				select
 					min(l.id) as id,
-					substring(s.date_order for 7)||'-'||'01' as name,
+					to_char(s.date_order, 'YYYY-MM')||'-'||'01' as name,
 					s.state,
 					t.categ_id as category_id,
 					sum(l.product_uom_qty*u.factor) as quantity,
@@ -121,7 +121,7 @@
 					left join product_product p on (p.id=l.product_id)
 					left join product_template t on (t.id=p.product_tmpl_id)
 					left join product_uom u on (u.id=l.product_uom)
-				group by t.categ_id, substring(s.date_order for 7),s.state
+				group by t.categ_id, to_char(s.date_order, 'YYYY-MM'),s.state
 			)
 		""")
 report_sale_order_category()
diff -Nru tinyerp-server-4.2.2.orig/bin/addons/report_timesheet/report_timesheet.py tinyerp-server-4.2.2/bin/addons/report_timesheet/report_timesheet.py
--- tinyerp-server-4.2.2.orig/bin/addons/report_timesheet/report_timesheet.py	2008-02-06 10:19:23.000000000 +0100
+++ tinyerp-server-4.2.2/bin/addons/report_timesheet/report_timesheet.py	2008-09-01 08:57:45.000000000 +0200
@@ -74,14 +74,14 @@
 			create or replace view report_timesheet_account as (
 				select
 					min(id) as id,
-					substring(create_date for 7)||'-01' as name,
+					to_char(create_date, 'YYYY-MM')||'-01' as name,
 					user_id,
 					account_id,
 					sum(unit_amount) as quantity
 				from
 					account_analytic_line
 				group by
-					substring(create_date for 7), user_id, account_id
+					to_char(create_date, 'YYYY-MM'), user_id, account_id
 			)
 		""")
 report_timesheet_account()


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- tinyerp.spec	1 Jul 2008 10:24:11 -0000	1.35
+++ tinyerp.spec	1 Sep 2008 07:26:10 -0000	1.36
@@ -4,7 +4,7 @@
 
 Name:		tinyerp
 Version:	4.2.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -16,6 +16,7 @@
 Source4:	tinyerp-server
 Source5:	tinyerp-server.logrotate
 Source6:	README.Fedora
+Patch0:		tinyerp-pgsql.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
@@ -55,6 +56,7 @@
 
 %prep
 %setup -q -a 1 -c %{name}-%{version}
+%patch0 -p0
 
 # update docs
 rm tinyerp-client-%{version}/doc/License.rtf
@@ -162,6 +164,9 @@
 
 
 %changelog
+* Mon Sep  1 2008 Dan Horak <dan[at]danny.cz> 4.2.2-4
+- add patch for PostgreSQL 8.3 compatibility (from Pieter. J. Kersten)
+
 * Fri May 30 2008 Dan Horak <dan[at]danny.cz> 4.2.2-3
 - add missing R: python-matplotlib (Resolves: #449118)
 



From sharkcz at fedoraproject.org  Mon Sep  1 07:31:25 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon,  1 Sep 2008 07:31:25 +0000 (UTC)
Subject: rpms/tinyerp/F-9 tinyerp-pgsql.patch, NONE, 1.1 tinyerp.spec, 1.35,
	1.36
Message-ID: <20080901073125.175D67011A@cvs1.fedora.phx.redhat.com>

Author: sharkcz

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

Modified Files:
	tinyerp.spec 
Added Files:
	tinyerp-pgsql.patch 
Log Message:
* Mon Sep  1 2008 Dan Horak <dan[at]danny.cz> 4.2.2-4
- add patch for PostgreSQL 8.3 compatibility (from Pieter. J. Kersten)


tinyerp-pgsql.patch:

--- NEW FILE tinyerp-pgsql.patch ---
diff -Nru tinyerp-server-4.2.2.orig/bin/addons/report_analytic_line/report_analytic_line.py tinyerp-server-4.2.2/bin/addons/report_analytic_line/report_analytic_line.py
--- tinyerp-server-4.2.2.orig/bin/addons/report_analytic_line/report_analytic_line.py	2008-02-06 10:19:25.000000000 +0100
+++ tinyerp-server-4.2.2/bin/addons/report_analytic_line/report_analytic_line.py	2008-09-01 08:57:45.000000000 +0200
@@ -48,7 +48,7 @@
         cr.execute("""
             CREATE OR REPLACE VIEW report_account_analytic_line_to_invoice AS (
                 SELECT
-                    DISTINCT(SUBSTRING(l.date for 7))||'-'||'01' AS name,
+                    DISTINCT(TO_CHAR(l.date, 'YYYY-MM'))||'-'||'01' AS name,
                     MIN(l.id) AS id,
                     l.product_id,
                     l.account_id,
@@ -65,7 +65,7 @@
                 WHERE
                     (invoice_id IS NULL) and (to_invoice IS NOT NULL)
                 GROUP BY
-                    SUBSTRING(date for 7), product_id, product_uom_id, account_id
+                    TO_CHAR(date, 'YYYY-MM'), product_id, product_uom_id, account_id
             )
         """)
 report_account_analytic_line_to_invoice()
diff -Nru tinyerp-server-4.2.2.orig/bin/addons/report_crm/report_crm.py tinyerp-server-4.2.2/bin/addons/report_crm/report_crm.py
--- tinyerp-server-4.2.2.orig/bin/addons/report_crm/report_crm.py	2008-02-06 10:19:25.000000000 +0100
+++ tinyerp-server-4.2.2/bin/addons/report_crm/report_crm.py	2008-09-01 08:57:45.000000000 +0200
@@ -59,7 +59,7 @@
 			create or replace view report_crm_case_user as (
 				select
 					min(c.id) as id,
-					substring(c.create_date for 7)||'-01' as name,
+					to_char(c.create_date, 'YYYY-MM')||'-01' as name,
 					c.state,
 					c.user_id,
 					c.section_id,
@@ -71,7 +71,7 @@
 					to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
 				from
 					crm_case c
-				group by substring(c.create_date for 7), c.state, c.user_id, c.section_id
+				group by to_char(c.create_date, 'YYYY-MM'), c.state, c.user_id, c.section_id
 			)""")
 report_crm_case_user()
 
@@ -97,7 +97,7 @@
 			create or replace view report_crm_case_categ as (
 				select
 					min(c.id) as id,
-					substring(c.create_date for 7)||'-01' as name,
+					to_char(c.create_date, 'YYYY-MM')||'-01' as name,
 					c.state,
 					c.categ_id,
 					c.section_id,
@@ -109,6 +109,6 @@
 					to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
 				from
 					crm_case c
-				group by substring(c.create_date for 7), c.state, c.categ_id, c.section_id
+				group by to_char(c.create_date, 'YYYY-MM'), c.state, c.categ_id, c.section_id
 			)""")
 report_crm_case_categ()
diff -Nru tinyerp-server-4.2.2.orig/bin/addons/report_intrastat/report_intrastat.py tinyerp-server-4.2.2/bin/addons/report_intrastat/report_intrastat.py
--- tinyerp-server-4.2.2.orig/bin/addons/report_intrastat/report_intrastat.py	2008-02-06 10:19:29.000000000 +0100
+++ tinyerp-server-4.2.2/bin/addons/report_intrastat/report_intrastat.py	2008-09-01 08:57:45.000000000 +0200
@@ -74,7 +74,7 @@
 		cr.execute("""
 			create or replace view report_intrastat as (
 				select
-					substring(m.create_date for 7)||'-01' as name,
+					to_char(m.create_date, 'YYYY-MM')||'-01' as name,
 					min(m.id) as id,
 					pt.intrastat_id as intrastat_id,
 					case when l.usage in ('supplier', 'customer') then upper(pc.code) else upper(c.code) end as code,
@@ -122,7 +122,7 @@
 					and ((l.usage in ('supplier', 'customer') and dl.usage not in ('supplier', 'customer'))
 						or (dl.usage in ('supplier', 'customer') and l.usage not in ('supplier', 'customer')))
 					and (c.intrastat is not null or pc.intrastat is not null)
-				group by substring(m.create_date for 7), pt.intrastat_id, c.code, pc.code, l.usage, dl.usage, ppl.currency_id, spl.currency_id
+				group by to_char(m.create_date, 'YYYY-MM'), pt.intrastat_id, c.code, pc.code, l.usage, dl.usage, ppl.currency_id, spl.currency_id
 			)""")
 report_intrastat()
 
diff -Nru tinyerp-server-4.2.2.orig/bin/addons/report_project/report_project.py tinyerp-server-4.2.2/bin/addons/report_project/report_project.py
--- tinyerp-server-4.2.2.orig/bin/addons/report_project/report_project.py	2008-02-06 10:19:29.000000000 +0100
+++ tinyerp-server-4.2.2/bin/addons/report_project/report_project.py	2008-09-01 08:57:45.000000000 +0200
@@ -49,7 +49,7 @@
             create or replace view report_project_task_user as (
                 select
                     min(t.id) as id,
-                    substring(date_close for 7)||'-01' as name,
+                    to_char(date_close, 'YYYY-MM')||'-01' as name,
                     count(distinct t.id) as task_closed,
                     t.user_id,
                     t.project_id,
@@ -62,7 +62,7 @@
                 where
                     t.state='done'
                 group by
-                    substring(date_close for 7),t.user_id,project_id
+                    to_char(date_close, 'YYYY-MM'),t.user_id,project_id
             )
         """)
 report_project_task_user()
@@ -87,7 +87,7 @@
             create or replace view report_project_task as (
                 select
                     min(t.id) as id,
-                    substring(date_close for 7)||'-01' as name,
+                    to_char(date_close, 'YYYY-MM')||'-01' as name,
                     count(distinct t.id) as task_closed,
                     t.project_id,
                     sum(planned_hours) as hours_planned,
@@ -99,7 +99,7 @@
                 where
                     t.state='done'
                 group by
-                    substring(date_close for 7),project_id
+                    to_char(date_close, 'YYYY-MM'),project_id
             )
         """)
 report_project_task()
diff -Nru tinyerp-server-4.2.2.orig/bin/addons/report_purchase/report_purchase.py tinyerp-server-4.2.2/bin/addons/report_purchase/report_purchase.py
--- tinyerp-server-4.2.2.orig/bin/addons/report_purchase/report_purchase.py	2008-02-06 10:19:29.000000000 +0100
+++ tinyerp-server-4.2.2/bin/addons/report_purchase/report_purchase.py	2008-09-01 08:57:45.000000000 +0200
@@ -61,7 +61,7 @@
 			create or replace view report_purchase_order_product as (
 				select
 					min(l.id) as id,
-					substring(s.date_order for 7)||'-'||'01' as name,
+					to_char(s.date_order, 'YYYY-MM')||'-'||'01' as name,
 					s.state,
 					l.product_id,
 					sum(l.product_qty*u.factor) as quantity,
@@ -71,7 +71,7 @@
 				from purchase_order s
 					left join purchase_order_line l on (s.id=l.order_id)
 					left join product_uom u on (u.id=l.product_uom)
-				group by l.product_id, substring(s.date_order for 7),s.state
+				group by l.product_id, to_char(s.date_order, 'YYYY-MM'),s.state
 			)
 		""")
 report_purchase_order_product()
@@ -104,7 +104,7 @@
 			create or replace view report_purchase_order_category as (
 				select
 					min(l.id) as id,
-					substring(s.date_order for 7)||'-'||'01' as name,
+					to_char(s.date_order, 'YYYY-MM')||'-'||'01' as name,
 					s.state,
 					t.categ_id as category_id,
 					sum(l.product_qty*u.factor) as quantity,
@@ -116,7 +116,7 @@
 					left join product_product p on (p.id=l.product_id)
 					left join product_template t on (t.id=p.product_tmpl_id)
 					left join product_uom u on (u.id=l.product_uom)
-				group by t.categ_id, substring(s.date_order for 7),s.state
+				group by t.categ_id, to_char(s.date_order, 'YYYY-MM'),s.state
 			 )
 		""")
 report_purchase_order_category()
diff -Nru tinyerp-server-4.2.2.orig/bin/addons/report_sale/report_sale.py tinyerp-server-4.2.2/bin/addons/report_sale/report_sale.py
--- tinyerp-server-4.2.2.orig/bin/addons/report_sale/report_sale.py	2008-02-06 10:19:22.000000000 +0100
+++ tinyerp-server-4.2.2/bin/addons/report_sale/report_sale.py	2008-09-01 08:57:45.000000000 +0200
@@ -57,7 +57,7 @@
 			create or replace view report_sale_order_product as (
 				select
 					min(l.id) as id,
-					substring(s.date_order for 7)||'-'||'01' as name,
+					to_char(s.date_order, 'YYYY-MM')||'-'||'01' as name,
 					s.state,
 					l.product_id,
 					sum(l.product_uom_qty*u.factor) as quantity,
@@ -67,7 +67,7 @@
 				from sale_order s
 					right join sale_order_line l on (s.id=l.order_id)
 					left join product_uom u on (u.id=l.product_uom)
-				group by l.product_id, substring(s.date_order for 7),s.state
+				group by l.product_id, to_char(s.date_order, 'YYYY-MM'),s.state
 			)
 		""")
 # Done in the _auto_init
@@ -109,7 +109,7 @@
 			create or replace view report_sale_order_category as (
 				select
 					min(l.id) as id,
-					substring(s.date_order for 7)||'-'||'01' as name,
+					to_char(s.date_order, 'YYYY-MM')||'-'||'01' as name,
 					s.state,
 					t.categ_id as category_id,
 					sum(l.product_uom_qty*u.factor) as quantity,
@@ -121,7 +121,7 @@
 					left join product_product p on (p.id=l.product_id)
 					left join product_template t on (t.id=p.product_tmpl_id)
 					left join product_uom u on (u.id=l.product_uom)
-				group by t.categ_id, substring(s.date_order for 7),s.state
+				group by t.categ_id, to_char(s.date_order, 'YYYY-MM'),s.state
 			)
 		""")
 report_sale_order_category()
diff -Nru tinyerp-server-4.2.2.orig/bin/addons/report_timesheet/report_timesheet.py tinyerp-server-4.2.2/bin/addons/report_timesheet/report_timesheet.py
--- tinyerp-server-4.2.2.orig/bin/addons/report_timesheet/report_timesheet.py	2008-02-06 10:19:23.000000000 +0100
+++ tinyerp-server-4.2.2/bin/addons/report_timesheet/report_timesheet.py	2008-09-01 08:57:45.000000000 +0200
@@ -74,14 +74,14 @@
 			create or replace view report_timesheet_account as (
 				select
 					min(id) as id,
-					substring(create_date for 7)||'-01' as name,
+					to_char(create_date, 'YYYY-MM')||'-01' as name,
 					user_id,
 					account_id,
 					sum(unit_amount) as quantity
 				from
 					account_analytic_line
 				group by
-					substring(create_date for 7), user_id, account_id
+					to_char(create_date, 'YYYY-MM'), user_id, account_id
 			)
 		""")
 report_timesheet_account()


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/F-9/tinyerp.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- tinyerp.spec	1 Jul 2008 10:22:30 -0000	1.35
+++ tinyerp.spec	1 Sep 2008 07:30:54 -0000	1.36
@@ -4,7 +4,7 @@
 
 Name:		tinyerp
 Version:	4.2.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -16,6 +16,7 @@
 Source4:	tinyerp-server
 Source5:	tinyerp-server.logrotate
 Source6:	README.Fedora
+Patch0:		tinyerp-pgsql.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
@@ -55,6 +56,7 @@
 
 %prep
 %setup -q -a 1 -c %{name}-%{version}
+%patch0 -p0
 
 # update docs
 rm tinyerp-client-%{version}/doc/License.rtf
@@ -162,6 +164,9 @@
 
 
 %changelog
+* Mon Sep  1 2008 Dan Horak <dan[at]danny.cz> 4.2.2-4
+- add patch for PostgreSQL 8.3 compatibility (from Pieter. J. Kersten)
+
 * Fri May 30 2008 Dan Horak <dan[at]danny.cz> 4.2.2-3
 - add missing R: python-matplotlib (Resolves: #449118)
 



From mzazrive at fedoraproject.org  Mon Sep  1 07:46:34 2008
From: mzazrive at fedoraproject.org (Milan Zazrivec)
Date: Mon,  1 Sep 2008 07:46:34 +0000 (UTC)
Subject: rpms/dbxml-perl/devel dbxml-perl.spec,1.6,1.7 import.log,1.1,1.2
Message-ID: <20080901074634.3E8797011A@cvs1.fedora.phx.redhat.com>

Author: mzazrive

Update of /cvs/pkgs/rpms/dbxml-perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20257/devel

Modified Files:
	dbxml-perl.spec import.log 
Log Message:
Rebased to latest dbxml upstream version (ver. 2.4.13)



Index: dbxml-perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbxml-perl/devel/dbxml-perl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dbxml-perl.spec	31 Aug 2008 19:34:10 -0000	1.6
+++ dbxml-perl.spec	1 Sep 2008 07:46:03 -0000	1.7
@@ -32,7 +32,7 @@
 retrieval of data.
 
 %prep
-%setup -q -n dbxml-perl
+%setup -q -n dbxml-perl-%{version}
 
 %build
 sed -i 's!CC = @CXX@!CC = g++!' "config.in"


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dbxml-perl/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Aug 2008 19:28:33 -0000	1.1
+++ import.log	1 Sep 2008 07:46:03 -0000	1.2
@@ -1 +1,2 @@
 dbxml-perl-2_0040013-0_fc8:HEAD:dbxml-perl-2.0040013-0.fc8.src.rpm:1220210821
+dbxml-perl-2_0040013-0_fc8:HEAD:dbxml-perl-2.0040013-0.fc8.src.rpm:1220255073



From caolanm at fedoraproject.org  Mon Sep  1 07:49:48 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  1 Sep 2008 07:49:48 +0000 (UTC)
Subject: rpms/mythes-de/devel mythes-de.spec,1.11,1.12 sources,1.12,1.13
Message-ID: <20080901074948.175DD7011E@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-de/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20891

Modified Files:
	mythes-de.spec sources 
Log Message:
latest version


Index: mythes-de.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-de/devel/mythes-de.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mythes-de.spec	31 Jul 2008 07:18:29 -0000	1.11
+++ mythes-de.spec	1 Sep 2008 07:49:17 -0000	1.12
@@ -1,6 +1,6 @@
 Name: mythes-de
 Summary: German thesarus
-%define upstreamid 20080731
+%define upstreamid 20080901
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://www.openthesaurus.de/download/thes_de_DE_v2.zip
@@ -44,6 +44,8 @@
 %{_datadir}/mythes/*
 
 %changelog
-* Thu Jul 31 2008 Caolan McNamara <caolanm at redhat.com> - 0.20080731-1
+* Mon Sep 01 2008 Caolan McNamara <caolanm at redhat.com> - 0.20080901-1
 - latest version
 
+* Thu Jul 31 2008 Caolan McNamara <caolanm at redhat.com> - 0.20080731-1
+- latest version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-de/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	31 Jul 2008 07:18:29 -0000	1.12
+++ sources	1 Sep 2008 07:49:17 -0000	1.13
@@ -1 +1 @@
-257a57e6c156765d88d0210ce065fd30  thes_de_DE_v2.zip
+ccabc6756e198eb911f73a1546e333b2  thes_de_DE_v2.zip



From dchen at fedoraproject.org  Mon Sep  1 07:52:20 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon,  1 Sep 2008 07:52:20 +0000 (UTC)
Subject: rpms/UnihanDb/devel UnihanDb.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080901075220.88E237011A@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	.cvsignore sources 
Added Files:
	UnihanDb.spec import.log 
Log Message:
Initial import


--- NEW FILE UnihanDb.spec ---
Name:           UnihanDb
%define         UnihanDb_name Unihan.db
%define         rel_num 4
Version:        5.1.0
Release:        %{rel_num}%{?dist}
Group:          System Environment/Libraries
License:        MIT
Summary:        The Unihan character database in fifth normal form
Summary(zh_CN): ?????????????????????????????????(Unihan)?????????
Summary(zh_TW): ?????????????????????????????????(Unihan)?????????

BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
BuildRequires:  libUnihan-devel >= 0.4.1
Requires:	sqlite
URL:            http://www.unicode.org/charts/unihan.html

Source0:        ftp://ftp.unicode.org/Public/UNIDATA/Unihan.zip
Source1:        http://downloads.sourceforge.net/libunihan/%{name}-doc-%{version}.tar.gz

%description
UnihanDb provides a Unihan character database in fifth normal form.
The original Unihan textual data is not normalized, and further parsing 
effort is needed to obtain data from compound values of Unihan "tags".
This database splits those tag value into atom fields, thus in most case
further parsing is not required.

The version number of this package is same as the upstream Unicode
standard it follows.

%prep
%setup -q -a 1 -c -n %{name}-%{version}


%build
unihan_converter Unihan.txt %{UnihanDb_name}.%{version}-%{rel_num}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
cp %{UnihanDb_name}.%{version}-%{rel_num} $RPM_BUILD_ROOT/%{_datadir}/%{name}
ln -sf %{UnihanDb_name}.%{version}-%{rel_num} $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{UnihanDb_name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README-db ChangeLog-db
%{_datadir}/%{name}

%changelog
* Thu Aug 14 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1.0-4
- Change the license to MIT.

* Mon Aug 11 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1.0-3
- Sync with upstream version.
- UnihanDb-doc version has changed from {version}-{rel} to {version}.

* Fri Aug 01 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1-2
- Field kIRGKangXi and kKangXi are split into kangXi_page, kangXi_charNum, and
kangXi_virtrul
- Field kHanyuPinlu are split into pinyin and pinyin_freq

* Fri Jul 04 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1-1
- Add kMandarin frequency rank support.


* Tue Jul 01 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1-0
- Initial public release.



--- NEW FILE import.log ---
UnihanDb-5_1_0-4_fc9:HEAD:UnihanDb-5.1.0-4.fc9.src.rpm:1220254739


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/UnihanDb/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Aug 2008 17:33:21 -0000	1.1
+++ .cvsignore	1 Sep 2008 07:51:49 -0000	1.2
@@ -0,0 +1,2 @@
+Unihan.zip
+UnihanDb-doc-5.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/UnihanDb/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Aug 2008 17:33:21 -0000	1.1
+++ sources	1 Sep 2008 07:51:50 -0000	1.2
@@ -0,0 +1,2 @@
+b6c8116d4a0f4895e4bd7ea48b3d6679  Unihan.zip
+cc2281b6b7baa00eb7c9114176e9a2c5  UnihanDb-doc-5.1.0.tar.gz



From caolanm at fedoraproject.org  Mon Sep  1 07:52:52 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  1 Sep 2008 07:52:52 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1631,1.1632
Message-ID: <20080901075252.6350F7011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21426

Modified Files:
	openoffice.org.spec 
Log Message:
foo


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1631
retrieving revision 1.1632
diff -u -r1.1631 -r1.1632
--- openoffice.org.spec	1 Sep 2008 07:18:12 -0000	1.1631
+++ openoffice.org.spec	1 Sep 2008 07:52:21 -0000	1.1632
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 4
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1



From mzazrive at fedoraproject.org  Mon Sep  1 07:57:19 2008
From: mzazrive at fedoraproject.org (Milan Zazrivec)
Date: Mon,  1 Sep 2008 07:57:19 +0000 (UTC)
Subject: rpms/dbxml-perl/devel import.log,1.2,1.3 sources,1.3,1.4
Message-ID: <20080901075719.8B9D67011A@cvs1.fedora.phx.redhat.com>

Author: mzazrive

Update of /cvs/pkgs/rpms/dbxml-perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22122/devel

Modified Files:
	import.log sources 
Log Message:
re-importing latest upstream again



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dbxml-perl/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	1 Sep 2008 07:46:03 -0000	1.2
+++ import.log	1 Sep 2008 07:56:49 -0000	1.3
@@ -1,2 +1,3 @@
 dbxml-perl-2_0040013-0_fc8:HEAD:dbxml-perl-2.0040013-0.fc8.src.rpm:1220210821
 dbxml-perl-2_0040013-0_fc8:HEAD:dbxml-perl-2.0040013-0.fc8.src.rpm:1220255073
+dbxml-perl-2_0040013-0_fc8:HEAD:dbxml-perl-2.0040013-0.fc8.src.rpm:1220255709


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbxml-perl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Aug 2008 19:28:33 -0000	1.3
+++ sources	1 Sep 2008 07:56:49 -0000	1.4
@@ -1 +1 @@
-cb469a796845b7aedba3c7a554ac0307  dbxml-perl-2.0040013.tar.gz
+15008139f928a2917bce62f373bffcb2  dbxml-perl-2.0040013.tar.gz



From jsafrane at fedoraproject.org  Mon Sep  1 08:10:21 2008
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Mon,  1 Sep 2008 08:10:21 +0000 (UTC)
Subject: rpms/openldap/devel openldap-2.0.11-ldaprc.patch, 1.1,
	1.2 openldap-2.2.13-setugid.patch, 1.1,
	1.2 openldap-2.3.11-toollinks.patch, 1.1,
	1.2 openldap-2.3.19-gethostbyXXXX_r.patch, 1.1,
	1.2 openldap-2.3.37-smbk5pwd.patch, 1.2,
	1.3 openldap-2.4.6-config.patch, 1.1,
	1.2 openldap-2.4.6-multilib.patch, 1.1,
	1.2 openldap-2.4.6-nosql.patch, 1.1,
	1.2 openldap-2.4.6-pie.patch, 1.2, 1.3 openldap.spec, 1.131, 1.132
Message-ID: <20080901081021.EBF8A7011A@cvs1.fedora.phx.redhat.com>

Author: jsafrane

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

Modified Files:
	openldap-2.0.11-ldaprc.patch openldap-2.2.13-setugid.patch 
	openldap-2.3.11-toollinks.patch 
	openldap-2.3.19-gethostbyXXXX_r.patch 
	openldap-2.3.37-smbk5pwd.patch openldap-2.4.6-config.patch 
	openldap-2.4.6-multilib.patch openldap-2.4.6-nosql.patch 
	openldap-2.4.6-pie.patch openldap.spec 
Log Message:
rediff all patches

openldap-2.0.11-ldaprc.patch:

Index: openldap-2.0.11-ldaprc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap-2.0.11-ldaprc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openldap-2.0.11-ldaprc.patch	9 Sep 2004 09:28:57 -0000	1.1
+++ openldap-2.0.11-ldaprc.patch	1 Sep 2008 08:09:50 -0000	1.2
@@ -1,6 +1,7 @@
---- openldap-2.0.11/libraries/libldap/init.c	Tue Jul  3 16:17:14 2001
-+++ openldap-2.0.11/libraries/libldap/init.c	Tue Jul  3 16:17:22 2001
-@@ -278,9 +278,6 @@
+diff -up openldap-2.4.11/libraries/libldap/init.c.patch2 openldap-2.4.11/libraries/libldap/init.c
+--- openldap-2.4.11/libraries/libldap/init.c.patch2	2008-02-12 00:26:41.000000000 +0100
++++ openldap-2.4.11/libraries/libldap/init.c	2008-09-01 09:57:09.000000000 +0200
+@@ -327,9 +327,6 @@ static void openldap_ldap_init_w_usercon
  	if(path != NULL) {
  		LDAP_FREE(path);
  	}

openldap-2.2.13-setugid.patch:

Index: openldap-2.2.13-setugid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap-2.2.13-setugid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openldap-2.2.13-setugid.patch	9 Sep 2004 09:42:43 -0000	1.1
+++ openldap-2.2.13-setugid.patch	1 Sep 2008 08:09:50 -0000	1.2
@@ -1,10 +1,11 @@
 Don't read the user's configuration file if we're running in a setuid
 or setgid application.
---- openldap-2.2.13/libraries/libldap/init.c	2004-06-15 11:51:32.000000000 -0400
-+++ openldap-2.2.13/libraries/libldap/init.c	2004-06-15 13:42:35.000000000 -0400
-@@ -551,10 +551,11 @@
+diff -up openldap-2.4.11/libraries/libldap/init.c.patch3 openldap-2.4.11/libraries/libldap/init.c
+--- openldap-2.4.11/libraries/libldap/init.c.patch3	2008-09-01 09:57:09.000000000 +0200
++++ openldap-2.4.11/libraries/libldap/init.c	2008-09-01 09:57:09.000000000 +0200
+@@ -609,10 +609,11 @@ void ldap_int_initialize( struct ldapopt
  		if( user != NULL ) {
- 			gopts->ldo_def_sasl_authcid = user;
+ 			gopts->ldo_def_sasl_authcid = LDAP_STRDUP( user );
  		}
 -    }
 +	}
@@ -15,7 +16,7 @@
  	openldap_ldap_init_w_userconf(LDAP_USERRC_FILE);
  
  	{
-@@ -608,4 +609,5 @@
+@@ -642,4 +643,5 @@ void ldap_int_initialize( struct ldapopt
  	}
  
  	openldap_ldap_init_w_env(gopts, NULL);

openldap-2.3.11-toollinks.patch:

Index: openldap-2.3.11-toollinks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap-2.3.11-toollinks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openldap-2.3.11-toollinks.patch	11 Nov 2005 03:39:40 -0000	1.1
+++ openldap-2.3.11-toollinks.patch	1 Sep 2008 08:09:50 -0000	1.2
@@ -1,9 +1,10 @@
 If libexecdir and sbindir are the same, avoid making an absolute symlink.
 
  
---- openldap-2.3.11/servers/slapd/Makefile.in.toollinks	2005-10-28 21:09:04.000000000 -0400
-+++ openldap-2.3.11/servers/slapd/Makefile.in	2005-10-28 21:11:18.000000000 -0400
-@@ -270,7 +270,12 @@
+diff -up openldap-2.4.11/servers/slapd/Makefile.in.patch5 openldap-2.4.11/servers/slapd/Makefile.in
+--- openldap-2.4.11/servers/slapd/Makefile.in.patch5	2008-09-01 09:57:09.000000000 +0200
++++ openldap-2.4.11/servers/slapd/Makefile.in	2008-09-01 09:57:09.000000000 +0200
+@@ -270,7 +270,12 @@ slapd: $(SLAPD_DEPENDS) @LIBSLAPI@
  		$(WRAP_LIBS)
  	$(RM) $(SLAPTOOLS)
  	for i in $(SLAPTOOLS); do \

openldap-2.3.19-gethostbyXXXX_r.patch:

Index: openldap-2.3.19-gethostbyXXXX_r.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap-2.3.19-gethostbyXXXX_r.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openldap-2.3.19-gethostbyXXXX_r.patch	24 Feb 2006 01:09:36 -0000	1.1
+++ openldap-2.3.19-gethostbyXXXX_r.patch	1 Sep 2008 08:09:50 -0000	1.2
@@ -4,9 +4,10 @@
 modules can't resolve the local host name), so use the reentrant versions of
 the functions, even if we're not being compiled for use in libldap_r (patch
 from Jeffery Layton, #179730).
---- openldap-2.3.19/libraries/libldap/util-int.c	2006-02-23 15:42:14.000000000 -0500
-+++ openldap-2.3.19/libraries/libldap/util-int.c	2006-02-23 15:42:02.000000000 -0500
-@@ -52,8 +52,8 @@
+diff -up openldap-2.4.11/libraries/libldap/util-int.c.patch7 openldap-2.4.11/libraries/libldap/util-int.c
+--- openldap-2.4.11/libraries/libldap/util-int.c.patch7	2008-02-12 00:26:41.000000000 +0100
++++ openldap-2.4.11/libraries/libldap/util-int.c	2008-09-01 09:57:09.000000000 +0200
+@@ -52,8 +52,8 @@ extern int h_errno;
  #ifndef LDAP_R_COMPILE
  # undef HAVE_REENTRANT_FUNCTIONS
  # undef HAVE_CTIME_R
@@ -17,7 +18,7 @@
  
  #else
  # include <ldap_pvt_thread.h>
-@@ -110,7 +110,7 @@
+@@ -110,7 +110,7 @@ char *ldap_pvt_ctime( const time_t *tp, 
  #define BUFSTART (1024-32)
  #define BUFMAX (32*1024-32)
  

openldap-2.3.37-smbk5pwd.patch:

Index: openldap-2.3.37-smbk5pwd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap-2.3.37-smbk5pwd.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openldap-2.3.37-smbk5pwd.patch	1 Aug 2007 08:00:07 -0000	1.2
+++ openldap-2.3.37-smbk5pwd.patch	1 Sep 2008 08:09:50 -0000	1.3
@@ -1,7 +1,8 @@
 Compile smbk5pwd together with other overlays.
 
---- openldap-2.3.34/contrib/slapd-modules/smbk5pwd/README.smbk5pwd	2005-11-14 19:06:04.000000000 +0100
-+++ openldap-2.3.34/contrib/slapd-modules/smbk5pwd/README	2007-07-09 09:44:43.000000000 +0200
+diff -up openldap-2.4.11/contrib/slapd-modules/smbk5pwd/README.patch8 openldap-2.4.11/contrib/slapd-modules/smbk5pwd/README
+--- openldap-2.4.11/contrib/slapd-modules/smbk5pwd/README.patch8	2005-11-12 16:18:09.000000000 +0100
++++ openldap-2.4.11/contrib/slapd-modules/smbk5pwd/README	2008-09-01 09:57:09.000000000 +0200
 @@ -1,3 +1,8 @@
 +***************************************************************
 +Red Hat note: Kerberos support is NOT compiled into
@@ -11,9 +12,10 @@
  Copyright 2004-2005 Howard Chu, Symas Corp. All rights reserved.
  
  Redistribution and use in source and binary forms, with or without
---- openldap-2.3.37/servers/slapd/overlays/Makefile.in.orig	2007-05-29 23:57:47.000000000 +0200
-+++ openldap-2.3.37/servers/slapd/overlays/Makefile.in	2007-07-31 16:27:08.000000000 +0200
-@@ -28,7 +28,8 @@ SRCS = overlays.c \
+diff -up openldap-2.4.11/servers/slapd/overlays/Makefile.in.patch8 openldap-2.4.11/servers/slapd/overlays/Makefile.in
+--- openldap-2.4.11/servers/slapd/overlays/Makefile.in.patch8	2008-02-12 00:26:48.000000000 +0100
++++ openldap-2.4.11/servers/slapd/overlays/Makefile.in	2008-09-01 09:57:09.000000000 +0200
+@@ -30,7 +30,8 @@ SRCS = overlays.c \
  	syncprov.c \
  	translucent.c \
  	unique.c \
@@ -23,7 +25,7 @@
  OBJS = statover.o \
  	@SLAPD_STATIC_OVERLAYS@ \
  	overlays.o
-@@ -41,14 +42,14 @@ LTONLY_MOD = $(LTONLY_mod)
+@@ -43,14 +44,14 @@ LTONLY_MOD = $(LTONLY_mod)
  LDAP_INCDIR= ../../../include       
  LDAP_LIBDIR= ../../../libraries
  
@@ -40,7 +42,7 @@
  
  XINCPATH = -I.. -I$(srcdir)/..
  XDEFS = $(MODULES_CPPFLAGS)
-@@ -105,6 +106,9 @@ unique.la : unique.lo
+@@ -113,6 +114,9 @@ unique.la : unique.lo
  valsort.la : valsort.lo
  	$(LTLINK_MOD) -module -o $@ valsort.lo version.lo $(LINK_LIBS)
  

openldap-2.4.6-config.patch:

Index: openldap-2.4.6-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap-2.4.6-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openldap-2.4.6-config.patch	21 Nov 2007 12:12:15 -0000	1.1
+++ openldap-2.4.6-config.patch	1 Sep 2008 08:09:50 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up openldap-2.4.6/servers/slapd/slapd.conf.old openldap-2.4.6/servers/slapd/slapd.conf
---- openldap-2.4.6/servers/slapd/slapd.conf.old	2007-11-20 16:02:19.000000000 +0100
-+++ openldap-2.4.6/servers/slapd/slapd.conf	2007-11-20 16:02:26.000000000 +0100
+diff -up openldap-2.4.11/servers/slapd/slapd.conf.patch1 openldap-2.4.11/servers/slapd/slapd.conf
+--- openldap-2.4.11/servers/slapd/slapd.conf.patch1	2007-02-13 21:22:22.000000000 +0100
++++ openldap-2.4.11/servers/slapd/slapd.conf	2008-09-01 09:57:09.000000000 +0200
 @@ -2,22 +2,57 @@
  # See slapd.conf(5) for details on configuration options.
  # This file should NOT be world readable.
@@ -67,7 +67,7 @@
  
  # Sample security restrictions
  #	Require integrity protection (prevent hijacking)
-@@ -47,19 +83,41 @@ argsfile	%LOCALSTATEDIR%/run/slapd.args
+@@ -47,19 +82,41 @@ argsfile	%LOCALSTATEDIR%/run/slapd.args
  # rootdn can always read and write EVERYTHING!
  
  #######################################################################

openldap-2.4.6-multilib.patch:

Index: openldap-2.4.6-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap-2.4.6-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openldap-2.4.6-multilib.patch	21 Nov 2007 12:12:15 -0000	1.1
+++ openldap-2.4.6-multilib.patch	1 Sep 2008 08:09:50 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up openldap-2.3.38/doc/man/man8/slapd.8.orig openldap-2.3.38/doc/man/man8/slapd.8
---- openldap-2.3.38/doc/man/man8/slapd.8.orig	2007-01-02 22:43:46.000000000 +0100
-+++ openldap-2.3.38/doc/man/man8/slapd.8	2007-10-23 15:03:13.000000000 +0200
+diff -up openldap-2.4.11/doc/man/man8/slapd.8.patch9 openldap-2.4.11/doc/man/man8/slapd.8
+--- openldap-2.4.11/doc/man/man8/slapd.8.patch9	2008-02-12 00:26:40.000000000 +0100
++++ openldap-2.4.11/doc/man/man8/slapd.8	2008-09-01 09:57:09.000000000 +0200
 @@ -5,7 +5,7 @@
  .SH NAME
  slapd \- Stand-alone LDAP Daemon
@@ -10,7 +10,7 @@
  .B [\-[4|6]]
  .B [\-T {acl|add|auth|cat|dn|index|passwd|test}]
  .B [\-d debug\-level]
-@@ -234,7 +234,7 @@ the LDAP databases defined in the defaul
+@@ -263,7 +263,7 @@ the LDAP databases defined in the defaul
  .LP
  .nf
  .ft tt
@@ -19,7 +19,7 @@
  .ft
  .fi
  .LP
-@@ -245,7 +245,7 @@ on voluminous debugging which will be pr
+@@ -274,7 +274,7 @@ on voluminous debugging which will be pr
  .LP
  .nf
  .ft tt
@@ -28,7 +28,7 @@
  .ft
  .fi
  .LP
-@@ -253,7 +253,7 @@ To test whether the configuration file i
+@@ -282,7 +282,7 @@ To test whether the configuration file i
  .LP
  .nf
  .ft tt

openldap-2.4.6-nosql.patch:

Index: openldap-2.4.6-nosql.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap-2.4.6-nosql.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openldap-2.4.6-nosql.patch	21 Nov 2007 12:12:15 -0000	1.1
+++ openldap-2.4.6-nosql.patch	1 Sep 2008 08:09:50 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up openldap-2.4.6/build/top.mk.nosql openldap-2.4.6/build/top.mk
---- openldap-2.4.6/build/top.mk.nosql	2007-09-01 01:13:50.000000000 +0200
-+++ openldap-2.4.6/build/top.mk	2007-11-02 14:55:23.000000000 +0100
+diff -up openldap-2.4.11/build/top.mk.patch6 openldap-2.4.11/build/top.mk
+--- openldap-2.4.11/build/top.mk.patch6	2008-02-12 00:26:38.000000000 +0100
++++ openldap-2.4.11/build/top.mk	2008-09-01 09:57:09.000000000 +0200
 @@ -199,7 +199,7 @@ SLAPD_SQL_LDFLAGS = @SLAPD_SQL_LDFLAGS@
  SLAPD_SQL_INCLUDES = @SLAPD_SQL_INCLUDES@
  SLAPD_SQL_LIBS = @SLAPD_SQL_LIBS@

openldap-2.4.6-pie.patch:

Index: openldap-2.4.6-pie.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap-2.4.6-pie.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openldap-2.4.6-pie.patch	25 Jul 2008 11:15:20 -0000	1.2
+++ openldap-2.4.6-pie.patch	1 Sep 2008 08:09:50 -0000	1.3
@@ -2,9 +2,9 @@
 should be threaded into the various autotools, but I guess this is what we have
 until that happens, if it happens.
 
-diff -up openldap-2.4.11/servers/slapd/Makefile.in.backup_patch_3 openldap-2.4.11/servers/slapd/Makefile.in
---- openldap-2.4.11/servers/slapd/Makefile.in.backup_patch_3	2008-02-12 00:26:43.000000000 +0100
-+++ openldap-2.4.11/servers/slapd/Makefile.in	2008-07-25 13:13:37.000000000 +0200
+diff -up openldap-2.4.11/servers/slapd/Makefile.in.patch4 openldap-2.4.11/servers/slapd/Makefile.in
+--- openldap-2.4.11/servers/slapd/Makefile.in.patch4	2008-02-12 00:26:43.000000000 +0100
++++ openldap-2.4.11/servers/slapd/Makefile.in	2008-09-01 09:57:09.000000000 +0200
 @@ -266,7 +266,7 @@ libslapi.a: slapi/.libs/libslapi.a
  	cp slapi/.libs/libslapi.a .
  


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- openldap.spec	1 Sep 2008 07:03:55 -0000	1.131
+++ openldap.spec	1 Sep 2008 08:09:50 -0000	1.132
@@ -605,6 +605,7 @@
 %changelog
 * Mon Sep  1 2008 Jan Safranek <jsafranek at redhat.com> 2.4.11-2
 - provide ldif2ldbm functionality for migrationtools
+- rediff all patches to get rid of patch fuzz
 
 * Mon Jul 21 2008 Jan Safranek <jsafranek at redhat.com> 2.4.11-1
 - new upstream release



From jsafrane at fedoraproject.org  Mon Sep  1 08:21:52 2008
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Mon,  1 Sep 2008 08:21:52 +0000 (UTC)
Subject: rpms/openldap/devel openldap-2.4.6-evolution-ntlm.patch,1.1,1.2
Message-ID: <20080901082152.910807011A@cvs1.fedora.phx.redhat.com>

Author: jsafrane

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

Modified Files:
	openldap-2.4.6-evolution-ntlm.patch 
Log Message:
rediff all patches

openldap-2.4.6-evolution-ntlm.patch:

Index: openldap-2.4.6-evolution-ntlm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap-2.4.6-evolution-ntlm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openldap-2.4.6-evolution-ntlm.patch	21 Nov 2007 12:12:15 -0000	1.1
+++ openldap-2.4.6-evolution-ntlm.patch	1 Sep 2008 08:21:52 -0000	1.2
@@ -1,9 +1,9 @@
-diff -up evo-openldap-2.4.6/include/ldap.h.evolution-ntlm evo-openldap-2.4.6/include/ldap.h
---- evo-openldap-2.4.6/include/ldap.h.evolution-ntlm	2007-09-01 01:13:53.000000000 +0200
-+++ evo-openldap-2.4.6/include/ldap.h	2007-11-02 15:22:49.000000000 +0100
-@@ -2343,5 +2343,26 @@ ldap_parse_session_tracking_control LDAP
- 
- #endif /* LDAP_CONTROL_X_SESSION_TRACKING */
+diff -up openldap-2.4.11/include/ldap.h.patch10 openldap-2.4.11/include/ldap.h
+--- openldap-2.4.11/include/ldap.h.patch10	2008-07-09 02:29:57.000000000 +0200
++++ openldap-2.4.11/include/ldap.h	2008-09-01 10:17:27.000000000 +0200
+@@ -2359,5 +2359,26 @@ ldap_create_assertion_control LDAP_P((
+ 	int		iscritical,
+ 	LDAPControl	**ctrlp ));
  
 +/*
 + * hacks for NTLM
@@ -28,9 +28,9 @@
 +
  LDAP_END_DECL
  #endif /* _LDAP_H */
-diff -up evo-openldap-2.4.6/libraries/libldap/Makefile.in.evolution-ntlm evo-openldap-2.4.6/libraries/libldap/Makefile.in
---- evo-openldap-2.4.6/libraries/libldap/Makefile.in.evolution-ntlm	2007-09-01 01:13:54.000000000 +0200
-+++ evo-openldap-2.4.6/libraries/libldap/Makefile.in	2007-11-02 15:24:24.000000000 +0100
+diff -up openldap-2.4.11/libraries/libldap/Makefile.in.patch10 openldap-2.4.11/libraries/libldap/Makefile.in
+--- openldap-2.4.11/libraries/libldap/Makefile.in.patch10	2008-07-09 02:29:57.000000000 +0200
++++ openldap-2.4.11/libraries/libldap/Makefile.in	2008-09-01 10:17:27.000000000 +0200
 @@ -20,7 +20,7 @@ PROGRAMS = apitest dntest ftest ltest ur
  SRCS	= bind.c open.c result.c error.c compare.c search.c \
  	controls.c messages.c references.c extended.c cyrus.c \
@@ -40,7 +40,7 @@
  	filter.c free.c sort.c passwd.c whoami.c \
  	getdn.c getentry.c getattr.c getvalues.c addentry.c \
  	request.c os-ip.c url.c pagectrl.c sortctrl.c vlvctrl.c \
-@@ -31,7 +31,7 @@ SRCS	= bind.c open.c result.c error.c co
+@@ -32,7 +32,7 @@ SRCS	= bind.c open.c result.c error.c co
  OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
  	controls.lo messages.lo references.lo extended.lo cyrus.lo \
  	modify.lo add.lo modrdn.lo delete.lo abandon.lo \
@@ -49,9 +49,9 @@
  	filter.lo free.lo sort.lo passwd.lo whoami.lo \
  	getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
  	request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \
-diff -up /dev/null evo-openldap-2.4.6/libraries/libldap/ntlm.c
---- /dev/null	2007-11-02 11:28:37.758699524 +0100
-+++ evo-openldap-2.4.6/libraries/libldap/ntlm.c	2007-11-02 15:22:49.000000000 +0100
+diff -up /dev/null openldap-2.4.11/libraries/libldap/ntlm.c
+--- /dev/null	2008-09-01 10:45:28.589004265 +0200
++++ openldap-2.4.11/libraries/libldap/ntlm.c	2008-09-01 10:17:27.000000000 +0200
 @@ -0,0 +1,137 @@
 +/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
 +/*



From kwizart at fedoraproject.org  Mon Sep  1 08:26:02 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon,  1 Sep 2008 08:26:02 +0000 (UTC)
Subject: rpms/afflib/devel afflib.spec, 1.14, 1.15 sources, 1.7,
	1.8 .cvsignore, 1.7, 1.8
Message-ID: <20080901082602.280D17011A@cvs1.fedora.phx.redhat.com>

Author: kwizart

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

Modified Files:
	afflib.spec sources .cvsignore 
Log Message:
Update to 3.3.1



Index: afflib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/afflib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- afflib.spec	29 Jul 2008 11:42:56 -0000	1.14
+++ afflib.spec	1 Sep 2008 08:25:31 -0000	1.15
@@ -1,8 +1,8 @@
 %define _default_patch_fuzz 2
 
 Name:           afflib
-Version:        3.2.5
-Release:        3%{?dist}
+Version:        3.3.1
+Release:        1%{?dist}
 Summary:        Library to support the Advanced Forensic Format
 
 Group:          System Environment/Libraries
@@ -125,6 +125,9 @@
 
 
 %changelog
+* Mon Sep  1 2008 kwizart < kwizart at gmail.com > - 3.3.1-1
+- Update to 3.3.1
+
 * Tue Jul 29 2008 kwizart < kwizart at gmail.com > - 3.2.5-3
 - Patch with fuzz 2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Jul 2008 07:17:55 -0000	1.7
+++ sources	1 Sep 2008 08:25:31 -0000	1.8
@@ -1 +1 @@
-e6012eb6d276ce3ba59e40e7216d6939  afflib-3.2.5.tar.gz
+f2b5150af6d8f52bb0a5c702e975741d  afflib-3.3.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Jul 2008 07:17:55 -0000	1.7
+++ .cvsignore	1 Sep 2008 08:25:31 -0000	1.8
@@ -1 +1 @@
-afflib-3.2.5.tar.gz
+afflib-3.3.1.tar.gz



From dchen at fedoraproject.org  Mon Sep  1 08:26:57 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon,  1 Sep 2008 08:26:57 +0000 (UTC)
Subject: rpms/UnihanDb/F-9 UnihanDb.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080901082657.BB82E7011A@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	.cvsignore sources 
Added Files:
	UnihanDb.spec import.log 
Log Message:
Initial import


--- NEW FILE UnihanDb.spec ---
Name:           UnihanDb
%define         UnihanDb_name Unihan.db
%define         rel_num 4
Version:        5.1.0
Release:        %{rel_num}%{?dist}
Group:          System Environment/Libraries
License:        MIT
Summary:        The Unihan character database in fifth normal form
Summary(zh_CN): ?????????????????????????????????(Unihan)?????????
Summary(zh_TW): ?????????????????????????????????(Unihan)?????????

BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
BuildRequires:  libUnihan-devel >= 0.4.1
Requires:	sqlite
URL:            http://www.unicode.org/charts/unihan.html

Source0:        ftp://ftp.unicode.org/Public/UNIDATA/Unihan.zip
Source1:        http://downloads.sourceforge.net/libunihan/%{name}-doc-%{version}.tar.gz

%description
UnihanDb provides a Unihan character database in fifth normal form.
The original Unihan textual data is not normalized, and further parsing 
effort is needed to obtain data from compound values of Unihan "tags".
This database splits those tag value into atom fields, thus in most case
further parsing is not required.

The version number of this package is same as the upstream Unicode
standard it follows.

%prep
%setup -q -a 1 -c -n %{name}-%{version}


%build
unihan_converter Unihan.txt %{UnihanDb_name}.%{version}-%{rel_num}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
cp %{UnihanDb_name}.%{version}-%{rel_num} $RPM_BUILD_ROOT/%{_datadir}/%{name}
ln -sf %{UnihanDb_name}.%{version}-%{rel_num} $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{UnihanDb_name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README-db ChangeLog-db
%{_datadir}/%{name}

%changelog
* Thu Aug 14 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1.0-4
- Change the license to MIT.

* Mon Aug 11 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1.0-3
- Sync with upstream version.
- UnihanDb-doc version has changed from {version}-{rel} to {version}.

* Fri Aug 01 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1-2
- Field kIRGKangXi and kKangXi are split into kangXi_page, kangXi_charNum, and
kangXi_virtrul
- Field kHanyuPinlu are split into pinyin and pinyin_freq

* Fri Jul 04 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1-1
- Add kMandarin frequency rank support.


* Tue Jul 01 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1-0
- Initial public release.



--- NEW FILE import.log ---
UnihanDb-5_1_0-4_fc9:F-9:UnihanDb-5.1.0-4.fc9.src.rpm:1220257255


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/UnihanDb/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Aug 2008 17:33:21 -0000	1.1
+++ .cvsignore	1 Sep 2008 08:26:27 -0000	1.2
@@ -0,0 +1,2 @@
+Unihan.zip
+UnihanDb-doc-5.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/UnihanDb/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Aug 2008 17:33:21 -0000	1.1
+++ sources	1 Sep 2008 08:26:27 -0000	1.2
@@ -0,0 +1,2 @@
+b6c8116d4a0f4895e4bd7ea48b3d6679  Unihan.zip
+cc2281b6b7baa00eb7c9114176e9a2c5  UnihanDb-doc-5.1.0.tar.gz



From dchen at fedoraproject.org  Mon Sep  1 08:30:51 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon,  1 Sep 2008 08:30:51 +0000 (UTC)
Subject: rpms/UnihanDb/EL-5 UnihanDb.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080901083051.A40D07011A@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	.cvsignore sources 
Added Files:
	UnihanDb.spec import.log 
Log Message:
Initial import


--- NEW FILE UnihanDb.spec ---
Name:           UnihanDb
%define         UnihanDb_name Unihan.db
%define         rel_num 4
Version:        5.1.0
Release:        %{rel_num}%{?dist}
Group:          System Environment/Libraries
License:        MIT
Summary:        The Unihan character database in fifth normal form
Summary(zh_CN): ?????????????????????????????????(Unihan)?????????
Summary(zh_TW): ?????????????????????????????????(Unihan)?????????

BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
BuildRequires:  libUnihan-devel >= 0.4.1
Requires:	sqlite
URL:            http://www.unicode.org/charts/unihan.html

Source0:        ftp://ftp.unicode.org/Public/UNIDATA/Unihan.zip
Source1:        http://downloads.sourceforge.net/libunihan/%{name}-doc-%{version}.tar.gz

%description
UnihanDb provides a Unihan character database in fifth normal form.
The original Unihan textual data is not normalized, and further parsing 
effort is needed to obtain data from compound values of Unihan "tags".
This database splits those tag value into atom fields, thus in most case
further parsing is not required.

The version number of this package is same as the upstream Unicode
standard it follows.

%prep
%setup -q -a 1 -c -n %{name}-%{version}


%build
unihan_converter Unihan.txt %{UnihanDb_name}.%{version}-%{rel_num}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
cp %{UnihanDb_name}.%{version}-%{rel_num} $RPM_BUILD_ROOT/%{_datadir}/%{name}
ln -sf %{UnihanDb_name}.%{version}-%{rel_num} $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{UnihanDb_name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README-db ChangeLog-db
%{_datadir}/%{name}

%changelog
* Thu Aug 14 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1.0-4
- Change the license to MIT.

* Mon Aug 11 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1.0-3
- Sync with upstream version.
- UnihanDb-doc version has changed from {version}-{rel} to {version}.

* Fri Aug 01 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1-2
- Field kIRGKangXi and kKangXi are split into kangXi_page, kangXi_charNum, and
kangXi_virtrul
- Field kHanyuPinlu are split into pinyin and pinyin_freq

* Fri Jul 04 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1-1
- Add kMandarin frequency rank support.


* Tue Jul 01 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1-0
- Initial public release.



--- NEW FILE import.log ---
UnihanDb-5_1_0-4_fc9:EL-5:UnihanDb-5.1.0-4.fc9.src.rpm:1220257826


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/UnihanDb/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Aug 2008 17:33:21 -0000	1.1
+++ .cvsignore	1 Sep 2008 08:30:21 -0000	1.2
@@ -0,0 +1,2 @@
+Unihan.zip
+UnihanDb-doc-5.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/UnihanDb/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Aug 2008 17:33:21 -0000	1.1
+++ sources	1 Sep 2008 08:30:21 -0000	1.2
@@ -0,0 +1,2 @@
+b6c8116d4a0f4895e4bd7ea48b3d6679  Unihan.zip
+cc2281b6b7baa00eb7c9114176e9a2c5  UnihanDb-doc-5.1.0.tar.gz



From rvokal at fedoraproject.org  Mon Sep  1 08:43:36 2008
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Mon,  1 Sep 2008 08:43:36 +0000 (UTC)
Subject: rpms/gjots2/devel .cvsignore, 1.3, 1.4 gjots2.spec, 1.8, 1.9 sources,
	1.3, 1.4
Message-ID: <20080901084336.B2C217011A@cvs1.fedora.phx.redhat.com>

Author: rvokal

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

Modified Files:
	.cvsignore gjots2.spec sources 
Log Message:
Fix requires + update to latest upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gjots2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 May 2006 13:16:18 -0000	1.3
+++ .cvsignore	1 Sep 2008 08:43:05 -0000	1.4
@@ -1,2 +1 @@
-gjots2-2.3.4.tgz
-gjots.png
+gjots2-2.3.7.tgz


Index: gjots2.spec
===================================================================
RCS file: /cvs/extras/rpms/gjots2/devel/gjots2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gjots2.spec	28 Aug 2008 22:22:28 -0000	1.8
+++ gjots2.spec	1 Sep 2008 08:43:05 -0000	1.9
@@ -20,11 +20,10 @@
 
 Summary: A note jotter - Organise your ideas, notes, facts in a hierarchy
 Name: gjots2
-Version: 2.3.4
-Release: 10%{?dist}
+Version: 2.3.7
+Release: 1%{?dist}
 URL: http://bhepple.freeshell.org/gjots
 Source: http://bhepple.freeshell.org/gjots/%{name}-%{version}.tgz
-Source1: gjots.png
 Patch0: gjots2-2.3.4-sitelib.patch
 License: GPLv2+
 Group: Applications/Productivity
@@ -32,7 +31,7 @@
 BuildArch: noarch
 BuildRequires: python desktop-file-utils
 
-Requires: python >= 2.3, pygtk2 >= 2.4.0, gnome-python2 >= 2.0.2
+Requires: python >= 2.3, pygtk2 >= 2.4.0, gnome-python2-gnome
 Requires: libglade2 >= 2.4, gnome-python2-gconf >= 2.6.0
 
 %description
@@ -61,7 +60,7 @@
 %install
 
 # typically:
-#	buildroot=/var/tmp/root-gjots2-2.3.4
+#	buildroot=/var/tmp/root-gjots2-2.3.7
 #	_datadir=/usr/share
 #	_bindir=/usr/bin
 #	_libdir=/usr/lib
@@ -78,13 +77,14 @@
 						%{buildroot}%{_datadir}/locale/fr/LC_MESSAGES \
 						%{buildroot}%{_datadir}/locale/no/LC_MESSAGES \
 						%{buildroot}%{_datadir}/locale/nb/LC_MESSAGES \
-						%{buildroot}%{_datadir}/locale/ru/LC_MESSAGES
+						%{buildroot}%{_datadir}/locale/ru/LC_MESSAGES \
+						%{buildroot}%{_datadir}/locale/cs/LC_MESSAGES
 
-%{__install} -m0755 bin/gjots2 bin/gjots2docbook bin/gjots2html bin/docbook2gjots %{buildroot}%{_bindir}/
-%{__install} -m0644 lib/*.py %{buildroot}%{python_sitelib}/%{name}/
-%{__install} -m0644 gjots.glade2 %{buildroot}%{_datadir}/%{name}
-%{__install} -m0644 %{SOURCE1} %{buildroot}%{_datadir}/%{name}
-%{__install} -m0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/
+%{__install} -m0755 bin/gjots2 bin/gjots2docbook bin/gjots2html bin/gjots2emacs bin/gjots2html.py bin/docbook2gjots bin/gjots2lpr %{buildroot}%{_bindir}/
+%{__install} -m0755 lib/*.py %{buildroot}%{python_sitelib}/%{name}/
+%{__install} -m0644 gjots.glade3 %{buildroot}%{_datadir}/%{name}
+%{__install} -m0644 gjots.png %{buildroot}%{_datadir}/%{name}
+%{__install} -m0644 gjots.png %{buildroot}%{_datadir}/pixmaps/
 %{__install} -m0644 gjots2-hide-all.png %{buildroot}%{_datadir}/%{name}
 %{__install} -m0644 gjots2-merge-items.png %{buildroot}%{_datadir}/%{name}
 %{__install} -m0644 gjots2-new-child.png %{buildroot}%{_datadir}/%{name}
@@ -105,6 +105,7 @@
 %{__install} -m0644 po/no/LC_MESSAGES/gjots2.mo %{buildroot}%{_datadir}/locale/no/LC_MESSAGES
 %{__install} -m0644 po/nb/LC_MESSAGES/gjots2.mo %{buildroot}%{_datadir}/locale/nb/LC_MESSAGES
 %{__install} -m0644 po/ru/LC_MESSAGES/gjots2.mo %{buildroot}%{_datadir}/locale/ru/LC_MESSAGES
+%{__install} -m0644 po/cs/LC_MESSAGES/gjots2.mo %{buildroot}%{_datadir}/locale/cs/LC_MESSAGES
 %find_lang %{name}
 
 %clean
@@ -122,6 +123,9 @@
 %{_bindir}/gjots2html*
 %{_bindir}/gjots2docbook
 %{_bindir}/docbook2gjots
+%{_bindir}/gjots2emacs
+%{_bindir}/gjots2lpr
+      
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_datadir}/pixmaps/gjots.png
@@ -130,6 +134,10 @@
 %{_mandir}/man1/docbook2gjots*
 
 %changelog
+* Mon Sep  1 2008 Radek Vok??l <rvokal at redhat.com> 2.3.7-1
+- fix requires
+- update to 2.3.7
+
 * Fri Aug 29 2008 Michael Schwendt <mschwendt at fedoraproject.org> 2.3.4-10
 - fix python_sitelib install
 - BR python and readd pyc/pyo files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gjots2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 May 2006 13:16:18 -0000	1.3
+++ sources	1 Sep 2008 08:43:05 -0000	1.4
@@ -1,2 +1 @@
-ae05d1ea976de08dd9fc80faa04c558f  gjots2-2.3.4.tgz
-4ae5dfb2ae559470c06739f7e310e233  gjots.png
+08009c78a1680ff1e2aa52f1881ed892  gjots2-2.3.7.tgz



From tagoh at fedoraproject.org  Mon Sep  1 08:50:07 2008
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Mon,  1 Sep 2008 08:50:07 +0000 (UTC)
Subject: rpms/paps/devel paps-exitcode.patch, NONE, 1.1 paps-langinfo.patch, 
	NONE, 1.1 paps.spec, 1.33, 1.34 paps-0.6.6-exitcode.patch, 1.1,
	NONE paps-0.6.6-langinfo.patch, 1.1, NONE
Message-ID: <20080901085007.F2E627011A@cvs1.fedora.phx.redhat.com>

Author: tagoh

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

Modified Files:
	paps.spec 
Added Files:
	paps-exitcode.patch paps-langinfo.patch 
Removed Files:
	paps-0.6.6-exitcode.patch paps-0.6.6-langinfo.patch 
Log Message:
* Mon Sep  1 2008 Akira TAGOH <tagoh at redhat.com> - 0.6.8-7
- paps-langinfo.patch: Updated.
- paps-exitcode.patch: Updated.

paps-exitcode.patch:

--- NEW FILE paps-exitcode.patch ---
diff -pruN paps-0.6.8.orig/src/paps.c paps-0.6.8/src/paps.c
--- paps-0.6.8.orig/src/paps.c	2008-09-01 15:54:11.000000000 +0900
+++ paps-0.6.8/src/paps.c	2008-09-01 15:54:47.000000000 +0900
@@ -365,7 +365,7 @@ int main(int argc, char *argv[])
       if (!IN)
         {
           fprintf(stderr, "Failed to open %s!\n", filename_in);
-          exit(-1);
+          exit(1);
         }
     }
   else
@@ -499,7 +499,7 @@ int main(int argc, char *argv[])
       if (cvh == NULL)
         {
           fprintf(stderr, "%s: Invalid encoding: %s\n", g_get_prgname (), encoding);
-          exit(-1);
+          exit(1);
         }
     }
 
@@ -559,7 +559,7 @@ read_file (FILE   *file,
         {
           fprintf(stderr, "%s: Error reading file.\n", g_get_prgname ());
           g_string_free (inbuf, TRUE);
-          return NULL;
+          exit(1);
         }
       else if (bp == NULL)
         break;
@@ -573,7 +573,7 @@ read_file (FILE   *file,
           if (g_iconv (handle, &ib, &iblen, &ob, &oblen) == -1)
             {
               fprintf (stderr, "%s: Error while converting strings.\n", g_get_prgname ());
-              return NULL;
+              exit(1);
             }
           obuffer[BUFSIZE * 6 - 1 - oblen] = 0;
         }
@@ -637,7 +637,7 @@ split_text_into_paragraphs (PangoContext
 	      if (wtext == NULL)
 	        {
 		  fprintf (stderr, "Failed to convert UTF-8 to UCS-4.\n");
-		  return NULL;
+                  exit(1);
 		}
 
 	      len = g_utf8_strlen (para->text, para->length);
@@ -650,7 +650,7 @@ split_text_into_paragraphs (PangoContext
 		    {
 		      fprintf (stderr, "Failed to allocate a memory.\n");
 		      g_free (wtext);
-		      return NULL;
+                      exit(1);
 		    }
 		  for (i = 0; i < len; i++)
 		    {
@@ -665,7 +665,7 @@ split_text_into_paragraphs (PangoContext
 		  if (newtext == NULL)
 		    {
 		      fprintf (stderr, "Failed to convert UCS-4 to UTF-8.\n");
-		      return NULL;
+                      exit(1);
 		    }
 
 		  pango_layout_set_text (para->layout, newtext, -1);

paps-langinfo.patch:

--- NEW FILE paps-langinfo.patch ---
diff -pruN paps-0.6.8.orig/src/paps.c paps-0.6.8/src/paps.c
--- paps-0.6.8.orig/src/paps.c	2008-09-01 15:07:03.000000000 +0900
+++ paps-0.6.8/src/paps.c	2008-09-01 15:49:10.000000000 +0900
@@ -25,6 +25,7 @@
 #include <pango/pangoft2.h>
 #include "libpaps.h"
 #include <errno.h>
+#include <langinfo.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -331,6 +332,9 @@ int main(int argc, char *argv[])
   GIConv cvh = NULL;
   GOptionGroup *options;
 
+  /* Set locale from environment. */
+  setlocale(LC_ALL, "");
+
   /* Prerequisite when using glib. */
   g_type_init();
 
@@ -480,6 +484,15 @@ int main(int argc, char *argv[])
   page_layout.scale_x = page_layout.scale_y = 1.0;
       
 
+  if (encoding == NULL)
+    {
+      encoding = g_strdup(nl_langinfo(CODESET));
+      if (!strcmp(encoding, "UTF-8"))
+        {
+          g_free(encoding);
+          encoding = NULL;
+        }
+    }
   if (encoding != NULL)
     {
       cvh = g_iconv_open ("UTF-8", encoding);


Index: paps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paps/devel/paps.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- paps.spec	16 May 2008 11:45:01 -0000	1.33
+++ paps.spec	1 Sep 2008 08:49:37 -0000	1.34
@@ -1,6 +1,6 @@
 Name:		paps
 Version:	0.6.8
-Release:	6%{?dist}
+Release:	7%{?dist}
 
 License:	LGPLv2+
 URL:		http://paps.sourceforge.net/
@@ -12,11 +12,11 @@
 ## https://sourceforge.net/tracker/index.php?func=detail&aid=1832924&group_id=153049&atid=786241
 Patch1:		paps-0.6.8-wordwrap.patch
 ## https://sourceforge.net/tracker/index.php?func=detail&aid=1832926&group_id=153049&atid=786241
-Patch2:		paps-0.6.6-langinfo.patch
+Patch2:		paps-langinfo.patch
 ## https://sourceforge.net/tracker/index.php?func=detail&aid=1832929&group_id=153049&atid=786241
 Patch3:		paps-0.6.6-lcnumeric.patch
 ## https://sourceforge.net/tracker/index.php?func=detail&aid=1832935&group_id=153049&atid=786241
-Patch4:		paps-0.6.6-exitcode.patch
+Patch4:		paps-exitcode.patch
 Patch50:	paps-cups.patch
 Patch51:	paps-cpilpi.patch
 Patch52:	paps-dsc-compliant.patch
@@ -98,6 +98,10 @@
 %{_libdir}/libpaps.so
 
 %changelog
+* Mon Sep  1 2008 Akira TAGOH <tagoh at redhat.com> - 0.6.8-7
+- paps-langinfo.patch: Updated.
+- paps-exitcode.patch: Updated.
+
 * Fri May 16 2008 Akira TAGOH <tagoh at redhat.com> - 0.6.8-6
 - paps-cups.patch: Fix printing with -o landscape in CUPS. (#222137)
 - paps-autoconf262.patch: Fix an error on autoreconf.


--- paps-0.6.6-exitcode.patch DELETED ---


--- paps-0.6.6-langinfo.patch DELETED ---



From rvokal at fedoraproject.org  Mon Sep  1 08:53:39 2008
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Mon,  1 Sep 2008 08:53:39 +0000 (UTC)
Subject: rpms/gjots2/devel gjots2-2.3.7-sitelib.patch, NONE, 1.1 gjots2.spec,
	1.9, 1.10 gjots2-2.3.4-sitelib.patch, 1.1, NONE
Message-ID: <20080901085339.C595F7011A@cvs1.fedora.phx.redhat.com>

Author: rvokal

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

Modified Files:
	gjots2.spec 
Added Files:
	gjots2-2.3.7-sitelib.patch 
Removed Files:
	gjots2-2.3.4-sitelib.patch 
Log Message:
update to 2.3.7, fix sitelib patch


gjots2-2.3.7-sitelib.patch:

--- NEW FILE gjots2-2.3.7-sitelib.patch ---
diff -up gjots2-2.3.7/bin/gjots2.lib gjots2-2.3.7/bin/gjots2
--- gjots2-2.3.7/bin/gjots2.lib	2007-07-28 14:11:45.000000000 +0200
+++ gjots2-2.3.7/bin/gjots2	2008-09-01 10:40:21.000000000 +0200
@@ -17,6 +17,7 @@ def traceit(frame, event, arg):
     return traceit
 
 gettext.install('gjots2', '/usr/share/locale')
+from distutils.sysconfig import get_python_lib
 
 def ver2str(ver):
     return ".".join(map(str,ver))
@@ -78,7 +79,7 @@ if __name__ == '__main__':
 	else:
 		# Assumption: we're running from $prefix/bin
 		prefix, bin = os.path.split(dirName)
-		sys.path = [ prefix + '/lib/gjots2' ] + sys.path
+		sys.path = [ get_python_lib() + '/gjots2' ] + sys.path
 
 	from gui import *
 	from version import *


Index: gjots2.spec
===================================================================
RCS file: /cvs/extras/rpms/gjots2/devel/gjots2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gjots2.spec	1 Sep 2008 08:43:05 -0000	1.9
+++ gjots2.spec	1 Sep 2008 08:53:09 -0000	1.10
@@ -24,7 +24,7 @@
 Release: 1%{?dist}
 URL: http://bhepple.freeshell.org/gjots
 Source: http://bhepple.freeshell.org/gjots/%{name}-%{version}.tgz
-Patch0: gjots2-2.3.4-sitelib.patch
+Patch0: gjots2-2.3.7-sitelib.patch
 License: GPLv2+
 Group: Applications/Productivity
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


--- gjots2-2.3.4-sitelib.patch DELETED ---



From varekova at fedoraproject.org  Mon Sep  1 09:14:29 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon,  1 Sep 2008 09:14:29 +0000 (UTC)
Subject: rpms/aspell/devel aspell-0.50.3-gcc33.patch, 1.1, 1.2 aspell.spec, 
	1.43, 1.44
Message-ID: <20080901091429.231C37011A@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	aspell-0.50.3-gcc33.patch aspell.spec 
Log Message:
fix patch format



aspell-0.50.3-gcc33.patch:

Index: aspell-0.50.3-gcc33.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aspell/devel/aspell-0.50.3-gcc33.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-0.50.3-gcc33.patch	9 Sep 2004 03:06:51 -0000	1.1
+++ aspell-0.50.3-gcc33.patch	1 Sep 2008 09:14:27 -0000	1.2
@@ -1,8 +1,9 @@
---- aspell-0.50.3/prog/checker_string.cpp.gcc33	2003-05-22 22:52:59.000000000 -0400
-+++ aspell-0.50.3/prog/checker_string.cpp	2003-05-22 22:53:13.000000000 -0400
-@@ -4,6 +4,7 @@
- // license along with this library if you did not you can find
- // it at http://www.gnu.org/.
+diff -up aspell-0.60.6/prog/checker_string.cpp.gcc33 aspell-0.60.6/prog/checker_string.cpp
+--- aspell-0.60.6/prog/checker_string.cpp.gcc33	2006-11-25 16:07:15.000000000 +0100
++++ aspell-0.60.6/prog/checker_string.cpp	2008-09-01 11:02:59.000000000 +0200
+@@ -6,6 +6,7 @@
+ 
+ #include <assert.h>
  
 +#include <assert.h>
  #include "checker_string.hpp"


Index: aspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell/devel/aspell.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- aspell.spec	29 May 2008 09:07:43 -0000	1.43
+++ aspell.spec	1 Sep 2008 09:14:27 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: A spelling checker
 Name: aspell
 Version: 0.60.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 12
 License: LGPLv2 and MIT
 Group: Applications/Text
@@ -131,6 +131,9 @@
 %{_mandir}/man1/pspell-config.1*
 
 %changelog
+* Mon Sep  1 2008 Ivana Varekova <varekova at redhat.com> - 12:0.60.6-3
+- fix patch format
+
 * Thu May 29 2008 Ivana Varekova <varekova at redhat.com> - 12:0.60.6-2
 - Resolves: #447428
   aspell sigserv on checking file with 0 length



From than at fedoraproject.org  Mon Sep  1 09:23:07 2008
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  1 Sep 2008 09:23:07 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.370,1.371 sources,1.69,1.70
Message-ID: <20080901092307.EC0367011D@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec sources 
Log Message:
respun



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -r1.370 -r1.371
--- kdelibs.spec	29 Aug 2008 14:54:03 -0000	1.370
+++ kdelibs.spec	1 Sep 2008 09:22:37 -0000	1.371
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -367,6 +367,9 @@
 
 
 %changelog
+* Mon Sep 01 2008 Than Ngo <than at redhat.com> 4.1.1-3
+- respun
+
 * Fri Aug 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
 - fix #455130 (kinit crashing in kglobalconfig with no KComponentData) properly
 - drop revert-kinit-regression hack (fixes ioslave translations)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	29 Aug 2008 12:46:19 -0000	1.69
+++ sources	1 Sep 2008 09:22:37 -0000	1.70
@@ -1 +1 @@
-fe3457ff49ed44a2084442a5950417be  kdelibs-4.1.1.tar.bz2
+d75ec557cd864e3f9150059c3e58ed61  kdelibs-4.1.1.tar.bz2



From than at fedoraproject.org  Mon Sep  1 09:24:48 2008
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  1 Sep 2008 09:24:48 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs.spec,1.344,1.345 sources,1.63,1.64
Message-ID: <20080901092448.8EBF77011A@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec sources 
Log Message:
respun



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- kdelibs.spec	29 Aug 2008 19:17:40 -0000	1.344
+++ kdelibs.spec	1 Sep 2008 09:24:18 -0000	1.345
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -367,6 +367,9 @@
 
 
 %changelog
+* Mon Sep 01 2008 Than Ngo <than at redhat.com> 4.1.1-3
+- respun
+
 * Fri Aug 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
 - fix #455130 (kinit crashing in kglobalconfig with no KComponentData) properly
 - drop revert-kinit-regression hack (fixes ioslave translations)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	29 Aug 2008 19:17:40 -0000	1.63
+++ sources	1 Sep 2008 09:24:18 -0000	1.64
@@ -1 +1 @@
-fe3457ff49ed44a2084442a5950417be  kdelibs-4.1.1.tar.bz2
+d75ec557cd864e3f9150059c3e58ed61  kdelibs-4.1.1.tar.bz2



From sharkcz at fedoraproject.org  Mon Sep  1 09:41:02 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon,  1 Sep 2008 09:41:02 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel cyrus-imapd-2.3.1-make_md5_defaults.patch,
	1.1, 1.2 cyrus-imapd.spec, 1.40, 1.41
Message-ID: <20080901094102.6FF197011A@cvs1.fedora.phx.redhat.com>

Author: sharkcz

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

Modified Files:
	cyrus-imapd-2.3.1-make_md5_defaults.patch cyrus-imapd.spec 
Log Message:
* Mon Sep  1 2008 Dan Hor??k <dan[at]danny.cz - 2.3.11-3
- refresh patches


cyrus-imapd-2.3.1-make_md5_defaults.patch:

Index: cyrus-imapd-2.3.1-make_md5_defaults.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd-2.3.1-make_md5_defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cyrus-imapd-2.3.1-make_md5_defaults.patch	28 Feb 2006 20:04:01 -0000	1.1
+++ cyrus-imapd-2.3.1-make_md5_defaults.patch	1 Sep 2008 09:41:02 -0000	1.2
@@ -1,19 +1,19 @@
-diff -Naur cyrus-imapd-2.3.1.orig/imap/make_md5.c cyrus-imapd-2.3.1/imap/make_md5.c
---- cyrus-imapd-2.3.1.orig/imap/make_md5.c	2005-12-13 16:31:08.000000000 +0100
-+++ cyrus-imapd-2.3.1/imap/make_md5.c	2006-01-16 11:27:29.000000000 +0100
-@@ -811,7 +811,7 @@
+diff -Nru -x'*.orig' cyrus-imapd-2.3.11.orig/imap/make_md5.c cyrus-imapd-2.3.11/imap/make_md5.c
+--- cyrus-imapd-2.3.11.orig/imap/make_md5.c	2007-10-01 20:35:59.000000000 +0200
++++ cyrus-imapd-2.3.11/imap/make_md5.c	2008-09-01 11:16:50.000000000 +0200
+@@ -814,7 +814,7 @@
      if (!md5_dir) md5_dir = config_getstring(IMAPOPT_MD5_DIR);
  
      if (!md5_dir)
 -        md5_dir = xstrdup("/var/imap/md5");
 +        md5_dir = xstrdup("/var/lib/imap/md5");
  
-     if (((uid_file = config_getstring(IMAPOPT_MD5_USER_MAP)) != NULL) &&
-         ((uid_fd=open(uid_file, O_RDONLY)) < 0)) {
-diff -Naur cyrus-imapd-2.3.1.orig/lib/imapoptions cyrus-imapd-2.3.1/lib/imapoptions
---- cyrus-imapd-2.3.1.orig/lib/imapoptions	2005-12-13 20:36:11.000000000 +0100
-+++ cyrus-imapd-2.3.1/lib/imapoptions	2006-01-16 11:26:54.000000000 +0100
-@@ -527,10 +527,14 @@
+     if (max_children == 0) {
+         /* Simple case */
+diff -Nru -x'*.orig' cyrus-imapd-2.3.11.orig/lib/imapoptions cyrus-imapd-2.3.11/lib/imapoptions
+--- cyrus-imapd-2.3.11.orig/lib/imapoptions	2007-10-18 20:14:48.000000000 +0200
++++ cyrus-imapd-2.3.11/lib/imapoptions	2008-09-01 11:16:50.000000000 +0200
+@@ -557,10 +557,14 @@
     mailspool, but each have their own "replicated" copy of
     mailboxes.db. */
  


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cyrus-imapd.spec	31 May 2008 15:23:53 -0000	1.40
+++ cyrus-imapd.spec	1 Sep 2008 09:41:02 -0000	1.41
@@ -1,7 +1,7 @@
 %define upstream_ver 2.3.11
 Name: cyrus-imapd
 Version: 2.3.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -807,6 +807,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Sep  1 2008 Dan Hor??k <dan[at]danny.cz - 2.3.11-3
+- refresh patches
+
 * Sat May 31 2008 Dan Hor??k <dan[at]danny.cz - 2.3.11-2
 - call automake to update config.* files and be buildable again on rawhide
 



From adrian at fedoraproject.org  Mon Sep  1 09:42:14 2008
From: adrian at fedoraproject.org (Adrian Reber)
Date: Mon,  1 Sep 2008 09:42:14 +0000 (UTC)
Subject: rpms/bwbar/devel bwbar.daemon.patch,1.2,1.3 bwbar.spec,1.9,1.10
Message-ID: <20080901094214.5AABD7011A@cvs1.fedora.phx.redhat.com>

Author: adrian

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

Modified Files:
	bwbar.daemon.patch bwbar.spec 
Log Message:
* Mon Sep 01 2008 Adrian Reber <adrian at lisas.de> - 1.2.3-3
- recreated bwbar.daemon.patch to apply cleanly


bwbar.daemon.patch:

Index: bwbar.daemon.patch
===================================================================
RCS file: /cvs/extras/rpms/bwbar/devel/bwbar.daemon.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bwbar.daemon.patch	25 Aug 2007 13:59:53 -0000	1.2
+++ bwbar.daemon.patch	1 Sep 2008 09:41:44 -0000	1.3
@@ -1,5 +1,6 @@
---- bwbar.c.orig	2004-07-16 15:05:08.000000000 +0200
-+++ bwbar.c	2004-07-16 15:11:03.000000000 +0200
+diff -u bwbar-1.2.3/bwbar.c bwbar-1.2.3.new/bwbar.c
+--- bwbar-1.2.3/bwbar.c	2006-08-26 18:31:26.000000000 +0200
++++ bwbar-1.2.3.new/bwbar.c	2008-09-01 11:30:41.000000000 +0200
 @@ -156,6 +156,7 @@
    { "kbps",         0, 0, 'k' },
    { "Mbps",         0, 0, 'M' },
@@ -39,19 +40,15 @@
      case 'h':
        usage(0);
        break;
-@@ -278,7 +284,12 @@
- 
+@@ -279,6 +285,11 @@
    first = 1;
    lbin = 0; lbout = 0;
--
-+
+ 
 +  if ( daemon_mode == 1) {
 +    if ( fork() != 0)
 +      return 0;
 +  }
 + 
    gettimeofday(&t_last, NULL);
- 
+   
    while ( 1 ) {
- 
-     /**** Begin code that obtains bandwidth data ****/


Index: bwbar.spec
===================================================================
RCS file: /cvs/extras/rpms/bwbar/devel/bwbar.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bwbar.spec	15 Feb 2008 07:56:19 -0000	1.9
+++ bwbar.spec	1 Sep 2008 09:41:44 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Generate a readout of the current bandwidth use
 Name: bwbar
 Version: 1.2.3
-Release: 2
+Release: 3
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://www.kernel.org/pub/software/web/bwbar/bwbar-1.2.3.tar.bz2
@@ -22,7 +22,7 @@
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 %patch1 -p0
 %patch2 -p0
 
@@ -69,6 +69,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Mon Sep 01 2008 Adrian Reber <adrian at lisas.de> - 1.2.3-3
+- recreated bwbar.daemon.patch to apply cleanly
+
 * Fri Feb 15 2008 Adrian Reber <adrian at lisas.de> - 1.2.3-2
 - rebuilt for gcc43
 



From than at fedoraproject.org  Mon Sep  1 09:45:22 2008
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  1 Sep 2008 09:45:22 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-8 kdebase-runtime.spec, 1.16, 1.17 sources, 
	1.10, 1.11 kdebase-runtime-4.1.0-nepomuk.patch, 1.1, NONE
Message-ID: <20080901094522.A37187011A@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-runtime/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4217

Modified Files:
	kdebase-runtime.spec sources 
Removed Files:
	kdebase-runtime-4.1.0-nepomuk.patch 
Log Message:
4.1.1



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-8/kdebase-runtime.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kdebase-runtime.spec	13 Aug 2008 10:31:02 -0000	1.16
+++ kdebase-runtime.spec	1 Sep 2008 09:44:52 -0000	1.17
@@ -1,3 +1,5 @@
+%define _default_patch_fuzz 2
+
 %if 0%{?fedora} < 9
 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
 %define kde3_desktop 1
@@ -7,8 +9,8 @@
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
-Version:       4.1.0
-Release:       3%{?dist}
+Version:       4.1.1
+Release:       1%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -17,7 +19,6 @@
 Source1:       khelpcenter.desktop
 Patch0:        kdebase-runtime-4.1.0-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
-Patch100:      kdebase-runtime-4.1.0-nepomuk.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %ifarch noarch
@@ -101,7 +102,6 @@
 %patch1 -p1 -b .searchproviders-shortcuts
 
 # upstream patches
-%patch100 -p1 -b .nepomuk-crash
 
 %build
 
@@ -336,6 +336,9 @@
 
 
 %changelog
+* Thu Aug 28 2008 Than Ngo <than at redhat.com> 4.1.1-1
+- 4.1.1
+
 * Wed Aug 13 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-3
 - fix PA not being default in the Xine backend (KCM part, see phonon-4.2.0-4)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-8/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	25 Jul 2008 13:57:47 -0000	1.10
+++ sources	1 Sep 2008 09:44:52 -0000	1.11
@@ -1 +1 @@
-a19999207ad37131a2888b6e32160008  kdebase-runtime-4.1.0.tar.bz2
+f03488d19c3bd95634b797229ac55127  kdebase-runtime-4.1.1.tar.bz2


--- kdebase-runtime-4.1.0-nepomuk.patch DELETED ---



From tsmetana at fedoraproject.org  Mon Sep  1 09:59:00 2008
From: tsmetana at fedoraproject.org (Tomas Smetana)
Date: Mon,  1 Sep 2008 09:59:00 +0000 (UTC)
Subject: rpms/procps/devel procps-3.2.7-FAQ.patch, NONE,
	1.1 procps-3.2.7-libselinux.patch, NONE,
	1.1 procps-3.2.7-misc.patch, NONE, 1.1 procps-3.2.7-noproc.patch,
	NONE, 1.1 procps-3.2.7-ps-man-fmt.patch, NONE,
	1.1 procps-3.2.7-pseudo.patch, NONE,
	1.1 procps-3.2.7-selinux-workaround.patch, NONE,
	1.1 procps-3.2.7-sysctl-writeonly.patch, NONE,
	1.1 procps-3.2.7-top-clrscr.patch, NONE,
	1.1 procps-3.2.7-top-env-cpuloop.patch, NONE,
	1.1 procps-3.2.7-top-env-vmsize.patch, NONE,
	1.1 procps-3.2.7-top-rc.patch, NONE, 1.1 procps.spec, 1.72,
	1.73 procps-3.1.15-misc.patch, 1.3,
	NONE procps-3.2.1-selinux-workaround.patch, 1.2,
	NONE procps-3.2.1-top-vmsize-env.patch, 1.2,
	NONE procps-3.2.3-FAQ.patch, 1.3, NONE procps-3.2.3-noproc.patch,
	1.2, NONE procps-3.2.3-pseudo.patch, 1.2,
	NONE procps-3.2.4-0x9b.patch, 1.1,
	NONE procps-3.2.5-sysctl-writeonly.patch, 1.3,
	NONE procps-3.2.5-top-rc.patch, 1.1,
	NONE procps-3.2.6-libselinux.patch, 1.1,
	NONE procps-3.2.6-top-env-cpuloop.patch, 1.2,
	NONE procps-3.2.6-top-env-vmsize.patch, 1.1, NONE
Message-ID: <20080901095900.852DB7011A@cvs1.fedora.phx.redhat.com>

Author: tsmetana

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

Modified Files:
	procps.spec 
Added Files:
	procps-3.2.7-FAQ.patch procps-3.2.7-libselinux.patch 
	procps-3.2.7-misc.patch procps-3.2.7-noproc.patch 
	procps-3.2.7-ps-man-fmt.patch procps-3.2.7-pseudo.patch 
	procps-3.2.7-selinux-workaround.patch 
	procps-3.2.7-sysctl-writeonly.patch 
	procps-3.2.7-top-clrscr.patch 
	procps-3.2.7-top-env-cpuloop.patch 
	procps-3.2.7-top-env-vmsize.patch procps-3.2.7-top-rc.patch 
Removed Files:
	procps-3.1.15-misc.patch procps-3.2.1-selinux-workaround.patch 
	procps-3.2.1-top-vmsize-env.patch procps-3.2.3-FAQ.patch 
	procps-3.2.3-noproc.patch procps-3.2.3-pseudo.patch 
	procps-3.2.4-0x9b.patch procps-3.2.5-sysctl-writeonly.patch 
	procps-3.2.5-top-rc.patch procps-3.2.6-libselinux.patch 
	procps-3.2.6-top-env-cpuloop.patch 
	procps-3.2.6-top-env-vmsize.patch 
Log Message:
* Mon Sep 01 2008 Tomas Smetana <tsmetana at redhat.com> 3.2.7-21
- rebase patches
- clear screen in top when switching windows
- fix #435453 - errors with man -t formatting of ps man page


procps-3.2.7-FAQ.patch:

--- NEW FILE procps-3.2.7-FAQ.patch ---
diff -up procps-3.2.7/ps/parser.c.p3 procps-3.2.7/ps/parser.c
--- procps-3.2.7/ps/parser.c.p3	2008-09-01 11:11:50.000000000 +0200
+++ procps-3.2.7/ps/parser.c	2008-09-01 11:11:50.000000000 +0200
@@ -1238,7 +1238,7 @@ try_bsd:
   // as SysV options... and you're screwed if you've been patching
   // out the friendly warning. Cut-over is likely to be in 2005.
   if(!(personality & PER_FORCE_BSD))
-    fprintf(stderr, "Warning: bad ps syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html\n");
+    fprintf(stderr, "Warning: bad syntax, perhaps a bogus '-'? See /usr/share/doc/procps-%s/FAQ\n",procps_number_version);
   // Remember: contact albert at users.sf.net or procps-feedback at lists.sf.net
   // if you should feel tempted. Be damn sure you understand all
   // the issues. The same goes for other stuff too, BTW. Please ask.
diff -up procps-3.2.7/proc/version.h.p3 procps-3.2.7/proc/version.h
--- procps-3.2.7/proc/version.h.p3	2002-12-15 01:08:32.000000000 +0100
+++ procps-3.2.7/proc/version.h	2008-09-01 11:11:50.000000000 +0200
@@ -16,6 +16,7 @@ EXTERN_C_BEGIN
 
 extern void display_version(void);	/* display suite version */
 extern const char procps_version[];		/* global buf for suite version */
+extern const char procps_number_version[];	/* global buf for suite number version */
 
 extern int linux_version_code;		/* runtime version of LINUX_VERSION_CODE
 					   in /usr/include/linux/version.h */
diff -up procps-3.2.7/proc/library.map.p3 procps-3.2.7/proc/library.map
--- procps-3.2.7/proc/library.map.p3	2005-03-14 05:32:40.000000000 +0100
+++ procps-3.2.7/proc/library.map	2008-09-01 11:11:50.000000000 +0200
@@ -9,7 +9,7 @@ global:
   escape_str; escape_strlist;
   openproc; closeproc;
   tty_to_dev; dev_to_tty; open_psdb_message; open_psdb; lookup_wchan;
-  display_version; procps_version; linux_version_code;
+  display_version; procps_version; procps_number_version; linux_version_code;
   Hertz; smp_num_cpus; have_privs;
   sprint_uptime; uptime; user_from_uid; print_uptime; loadavg;
   pretty_print_signals; print_given_signals; unix_print_signals; signal_name_to_number; signal_number_to_name;
diff -up procps-3.2.7/proc/version.c.p3 procps-3.2.7/proc/version.c
--- procps-3.2.7/proc/version.c.p3	2003-01-29 02:11:43.000000000 +0100
+++ procps-3.2.7/proc/version.c	2008-09-01 11:11:50.000000000 +0200
@@ -16,8 +16,10 @@
 
 #ifdef MINORVERSION
 const char procps_version[] = "procps version " VERSION "." SUBVERSION "." MINORVERSION;
+const char procps_number_version[] = VERSION "." SUBVERSION "." MINORVERSION;
 #else
 const char procps_version[] = "procps version " VERSION "." SUBVERSION;
+const char procps_number_version[] = VERSION "." SUBVERSION;
 #endif
 
 void display_version(void) {

procps-3.2.7-libselinux.patch:

--- NEW FILE procps-3.2.7-libselinux.patch ---
diff -up procps-3.2.7/ps/output.c.p12 procps-3.2.7/ps/output.c
--- procps-3.2.7/ps/output.c.p12	2006-06-19 01:27:02.000000000 +0200
+++ procps-3.2.7/ps/output.c	2008-09-01 11:35:06.000000000 +0200
@@ -1090,7 +1090,7 @@ static int pr_sgi_p(char *restrict const
   return snprintf(outbuf, COLWID, "*");
 }
 
-
+#ifdef STATICLIB
 /****************** FLASK & seLinux security stuff **********************/
 // move the bulk of this to libproc sometime
 
@@ -1122,7 +1122,7 @@ fail:
   return 1;
 }
 
-#if 0
+#else
 // This needs more study, considering:
 // 1. the static linking option (maybe disable this in that case)
 // 2. the -z and -Z option issue
@@ -1134,7 +1134,7 @@ static int pr_context(char *restrict con
   char *context;
 
   if(!ps_getpidcon && !tried_load){
-    void *handle = dlopen("libselinux.so.1", RTLD_NOW);
+    void *handle = dlopen("libselinux.so", RTLD_NOW);
     if(handle){
       dlerror();
       ps_getpidcon = dlsym(handle, "getpidcon");
diff -up procps-3.2.7/Makefile.p12 procps-3.2.7/Makefile
--- procps-3.2.7/Makefile.p12	2006-06-24 11:02:25.000000000 +0200
+++ procps-3.2.7/Makefile	2008-09-01 11:35:06.000000000 +0200
@@ -73,12 +73,12 @@ CURSES := -lncurses
 # Something like this is probably needed to make the SE Linux
 # library loading not conflict with embedded systems stuff.
 #
-#ifeq ($(SHARED),1)
-#ldl := -ldl
-#LIBTYPE := -DSHAREDLIB
-#else
-#LIBTYPE := -DSTATICLIB
-#endif
+ifeq ($(SHARED),1)
+ldl := -ldl
+LIBTYPE := -DSHAREDLIB
+else
+LIBTYPE := -DSTATICLIB
+endif
 
 # Preprocessor flags.
 PKG_CPPFLAGS := -D_GNU_SOURCE -I proc
@@ -103,7 +103,7 @@ PKG_CFLAGS   := -fno-common -ffast-math 
 # Note that some stuff below is conditional on CFLAGS containing
 # an option that starts with "-g". (-g, -g2, -g3, -ggdb, etc.)
 CFLAGS       := -O2 -s
-ALL_CFLAGS   := $(PKG_CFLAGS) $(CFLAGS)
+ALL_CFLAGS   := $(PKG_CFLAGS) $(CFLAGS) $(LIBTYPE)
 
 PKG_LDFLAGS  := -Wl,-warn-common
 LDFLAGS      :=

procps-3.2.7-misc.patch:

--- NEW FILE procps-3.2.7-misc.patch ---
diff -up procps-3.2.7/watch.c.p2 procps-3.2.7/watch.c
--- procps-3.2.7/watch.c.p2	2006-06-17 11:18:38.000000000 +0200
+++ procps-3.2.7/watch.c	2008-09-01 10:46:17.000000000 +0200
@@ -25,6 +25,9 @@
 #include <termios.h>
 #include <locale.h>
 #include "proc/procps.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 #ifdef FORCE_8BIT
 #undef isprint
@@ -138,6 +141,7 @@ int
 main(int argc, char *argv[])
 {
 	int optc;
+	int fd;
 	int option_differences = 0,
 	    option_differences_cumulative = 0,
 	    option_help = 0, option_version = 0;
@@ -260,7 +264,13 @@ main(int argc, char *argv[])
 			mvaddstr(0, width - tsl + 1, ts);
 			free(header);
 		}
-
+		close(0);
+		fd=open("/dev/null",O_RDWR);
+		if (fd!=0) {
+		  perror("open");
+		  do_exit(2);
+		}
+		
 		if (!(p = popen(command, "r"))) {
 			perror("popen");
 			do_exit(2);

procps-3.2.7-noproc.patch:

--- NEW FILE procps-3.2.7-noproc.patch ---
diff -up procps-3.2.7/top.c.p6 procps-3.2.7/top.c
--- procps-3.2.7/top.c.p6	2006-06-25 08:41:48.000000000 +0200
+++ procps-3.2.7/top.c	2008-09-01 11:28:15.000000000 +0200
@@ -3331,12 +3331,15 @@ static void frame_make (void)
 
 int main (int dont_care_argc, char *argv[])
 {
+   struct stat isproc;
    (void)dont_care_argc;
    before(*argv);
                                         //                 +-------------+
    windows_stage1();                    //                 top (sic) slice
    configs_read();                      //                 > spread etc, <
    parse_args(&argv[1]);                //                 > lean stuff, <
+   if (stat("/proc/self", &isproc)==-1)
+      std_err("/proc is not mounted, required for output data");
    whack_terminal();                    //                 > onions etc. <
    windows_stage2();                    //                 as bottom slice
                                         //                 +-------------+

procps-3.2.7-ps-man-fmt.patch:

--- NEW FILE procps-3.2.7-ps-man-fmt.patch ---
diff -up procps-3.2.7/ps/ps.1.ps-man-fmt procps-3.2.7/ps/ps.1
--- procps-3.2.7/ps/ps.1.ps-man-fmt	2008-09-01 11:43:18.000000000 +0200
+++ procps-3.2.7/ps/ps.1	2008-09-01 11:43:41.000000000 +0200
@@ -30,7 +30,7 @@
 .\" the space needed for the 1st two columns.
 .\" Making it messy: inches, ens, points, scaled points...
 .\"
-.nr ColSize ((\n(.lu-\n(.iu/\n(.Hu-20u)n)
+.nr ColSize ((\n[.l] - \n[.i]) / 1n - 20)
 .\"
 .\" This is for command options
 .nr OptSize (16u)

procps-3.2.7-pseudo.patch:

--- NEW FILE procps-3.2.7-pseudo.patch ---
diff -up procps-3.2.7/top.h.p7 procps-3.2.7/top.h
--- procps-3.2.7/top.h.p7	2006-06-25 08:41:48.000000000 +0200
+++ procps-3.2.7/top.h	2008-09-01 11:29:15.000000000 +0200
@@ -149,8 +149,13 @@ do {                                    
    int _len = 1 + snprintf(_str, sizeof(_str), fmt, ## arg);   \
    if (Batch) _ptr = _str;                                   \
    else {                                                 \
-      _ptr = &Pseudo_scrn[Pseudo_row++ * Pseudo_cols];  \
-      if (memcmp(_ptr, _str, _len)) {                \
+      int _rest;                                         \
+      _ptr = &Pseudo_scrn[Pseudo_row * Pseudo_cols];    \
+      _rest = Pseudo_size-(_ptr-Pseudo_scrn);           \
+      Pseudo_row = (Pseudo_row+1) % Screen_rows;       \
+      if (_rest < _len)                                \
+         _len = _rest;                               \
+      if (memcmp(_ptr, _str, _len)) {               \
          memcpy(_ptr, _str, _len);                \
       } else {                                 \
          _ptr = "\n";                       \

procps-3.2.7-selinux-workaround.patch:

--- NEW FILE procps-3.2.7-selinux-workaround.patch ---
diff -up procps-3.2.7/w.c.p4 procps-3.2.7/w.c
--- procps-3.2.7/w.c.p4	2006-06-17 12:40:47.000000000 +0200
+++ procps-3.2.7/w.c	2008-09-01 11:26:33.000000000 +0200
@@ -163,6 +163,10 @@ static const proc_t *getproc(const utmp_
 	if(best && tmp->start_time <= best->start_time) continue;
     	best = tmp;
     }
+    /* It is there but SELinux wouldn't allow us to know the detail. Really
+       w should just be given rights */
+    if(!kill(u->ut_pid, 0) || errno != ESRCH)
+    	*found_utpid = 1;
     return best ? best : secondbest;
 }
 

procps-3.2.7-sysctl-writeonly.patch:

--- NEW FILE procps-3.2.7-sysctl-writeonly.patch ---
diff -up procps-3.2.7/sysctl.c.p9 procps-3.2.7/sysctl.c
--- procps-3.2.7/sysctl.c.p9	2006-06-25 02:51:51.000000000 +0200
+++ procps-3.2.7/sysctl.c	2008-09-01 11:31:58.000000000 +0200
@@ -127,7 +127,8 @@ static int ReadSetting(const char *restr
    char *restrict tmpname;
    char *restrict outname;
    char inbuf[1025];
-   FILE *restrict fp;
+   FILE *restrict fp = NULL;
+   struct stat st;
 
    if (!name || !*name) {
       fprintf(stderr, ERR_INVALID_KEY, name);
@@ -144,7 +145,13 @@ static int ReadSetting(const char *restr
    outname = strdup(name);
    slashdot(outname,'/','.'); /* change / to . */
 
-   fp = fopen(tmpname, "r");
+   if (stat(tmpname, &st)==0) {
+	if (st.st_mode & (S_IRUSR|S_IROTH|S_IRGRP))	   
+	   	fp = fopen(tmpname, "r");
+	else
+		/* ignore write-only files  */
+		return -1;
+   }
 
    if (!fp) {
       switch(errno) {
@@ -158,12 +165,16 @@ static int ReadSetting(const char *restr
          fprintf(stderr, ERR_PERMISSION_DENIED, outname);
          rc = -1;
          break;
+      case EINVAL:  /* fopen()/stat() invalid argument */
+      case ENOTTY:  /* inappropriate ioctl for device */
+	 break;
       default:
          fprintf(stderr, ERR_UNKNOWN_READING, strerror(errno), outname);
          rc = -1;
          break;
       }
    } else {
+      errno=0;
       if(fgets(inbuf, sizeof inbuf - 1, fp)) {
          // this loop is required, see
          // /sbin/sysctl -a | egrep -6 dev.cdrom.info
@@ -183,7 +194,9 @@ static int ReadSetting(const char *restr
                }
             }
          } while(fgets(inbuf, sizeof inbuf - 1, fp));
-      } else {
+
+      /* fgets() returns NULL and errno without change if the file is empty */
+      } else if (errno) {
          switch(errno) {
          case EACCES:
             fprintf(stderr, ERR_PERMISSION_DENIED, outname);

procps-3.2.7-top-clrscr.patch:

--- NEW FILE procps-3.2.7-top-clrscr.patch ---
diff -up procps-3.2.7/top.c.clrscr procps-3.2.7/top.c
--- procps-3.2.7/top.c.clrscr	2008-04-08 08:49:48.000000000 +0200
+++ procps-3.2.7/top.c	2008-04-08 08:50:07.000000000 +0200
@@ -2109,6 +2109,7 @@ static void fields_sort (void)
       *p = x + 'A';
    Curwin->rc.sortindx = x;
    putp(Cap_curs_norm);
+   putp(Cap_clr_scr);
 }
 
 
@@ -2134,6 +2135,7 @@ static void fields_toggle (void)
          *p = i + 'A';
    }
    putp(Cap_curs_norm);
+   putp(Cap_clr_scr);
 }
 
 /*######  Windows/Field Groups support  #################################*/

procps-3.2.7-top-env-cpuloop.patch:

--- NEW FILE procps-3.2.7-top-env-cpuloop.patch ---
diff -up procps-3.2.7/top.c.p15 procps-3.2.7/top.c
--- procps-3.2.7/top.c.p15	2008-09-01 11:37:51.000000000 +0200
+++ procps-3.2.7/top.c	2008-09-01 11:37:51.000000000 +0200
@@ -121,6 +121,7 @@ static int No_ksyms = -1,       // set t
            Secure_mode = 0;     // set if some functionality restricted
 
 static int VIRT_vmsize = 0;	//use vm_size for VIRT 
+static int CPU_loop = 0;	// wait for reliable CPU data
 
         /* Some cap's stuff to reduce runtime calls --
            to accomodate 'Batch' mode, they begin life as empty strings */
@@ -1679,6 +1680,8 @@ static void before (char *me)
    
    if (( getenv("STATSIZE")) && ( atoi(getenv("STATSIZE")) == 1 )) 
 	   VIRT_vmsize = 1;
+   if (( getenv("CPULOOP")) && ( atoi(getenv("CPULOOP")) == 1 )) 
+	   CPU_loop = 1;
 }
 
 
@@ -2978,6 +2981,7 @@ static proc_t **summary_show (void)
 {
    static proc_t **p_table = NULL;
    static CPU_t  *smpcpu = NULL;
+   static int first = 0;
 
    // whoa first time, gotta' prime the pump...
    if (!p_table) {
@@ -3025,6 +3029,28 @@ static proc_t **summary_show (void)
 
       smpcpu = cpus_refresh(smpcpu);
 
+      if (first==0 && CPU_loop)
+      {
+	 int i;
+	 CPU_t *cpu;
+	 for (i = 0; i < Cpu_tot; i++) {
+           cpu =  &smpcpu[i];
+	   cpu->u_sav = cpu->u;
+	   cpu->s_sav = cpu->s;
+	   cpu->n_sav = cpu->n;
+	   cpu->i_sav = cpu->i;
+	   cpu->w_sav = cpu->w;
+	   cpu->x_sav = cpu->x;
+	   cpu->y_sav = cpu->y;
+	   cpu->z_sav = cpu->z;
+	 }
+         tv.tv_sec = Rc.delay_time;
+         tv.tv_usec = (Rc.delay_time - (int)Rc.delay_time) * 1000000;
+         select(0, NULL, NULL, NULL, &tv);
+
+	 smpcpu = cpus_refresh(smpcpu);
+      }
+
       if (CHKw(Curwin, View_CPUSUM)) {
          // display just the 1st /proc/stat line
          summaryhlp(&smpcpu[Cpu_tot], "Cpu(s):");
@@ -3050,6 +3076,8 @@ static proc_t **summary_show (void)
    }
 
    SETw(Curwin, NEWFRAM_cwo);
+
+   first = 1;
    return p_table;
 }
 
diff -up procps-3.2.7/top.1.p15 procps-3.2.7/top.1
--- procps-3.2.7/top.1.p15	2008-09-01 11:37:51.000000000 +0200
+++ procps-3.2.7/top.1	2008-09-01 11:37:51.000000000 +0200
@@ -1183,6 +1183,13 @@ Then ponder this:
 Send bug reports to:
    Albert D\. Cahalan, <albert at users.sf.net>
 
+The top command calculates Cpu(s) by looking at the change in CPU time values
+between samples. When you first run it, it has no previous sample to compare
+to, so these initial values are the percentages since boot. It means you need
+at least two loops or you have to ignore summary output from the first loop.
+This is problem for example for batch mode. There is a possible workaround if
+you define the CPULOOP=1 environment variable. The top command will be run one
+extra hidden loop for CPU data before standard output.
 
 .\" ----------------------------------------------------------------------
 .SH 8. HISTORY Former top

procps-3.2.7-top-env-vmsize.patch:

--- NEW FILE procps-3.2.7-top-env-vmsize.patch ---
diff -up procps-3.2.7/top.c.p14 procps-3.2.7/top.c
--- procps-3.2.7/top.c.p14	2008-09-01 11:36:55.000000000 +0200
+++ procps-3.2.7/top.c	2008-09-01 11:36:55.000000000 +0200
@@ -120,6 +120,8 @@ static int No_ksyms = -1,       // set t
            Loops = -1,          // number of iterations, -1 loops forever
            Secure_mode = 0;     // set if some functionality restricted
 
+static int VIRT_vmsize = 0;	//use vm_size for VIRT 
+
         /* Some cap's stuff to reduce runtime calls --
            to accomodate 'Batch' mode, they begin life as empty strings */
 static char  Cap_clr_eol    [CAPBUFSIZ],
@@ -1674,6 +1676,9 @@ static void before (char *me)
       Fieldstab[P_PPD].fmts = pid_fmt;
       Fieldstab[P_PPD].head = "       PPID" + 10 - pid_digits;
    }
+   
+   if (( getenv("STATSIZE")) && ( atoi(getenv("STATSIZE")) == 1 )) 
+	   VIRT_vmsize = 1;
 }
 
 
@@ -2207,6 +2212,7 @@ static void reframewins (void)
    }
    if (!Frames_libflags) Frames_libflags = L_DEFAULT;
    if (selection_type=='p') Frames_libflags |= PROC_PID;
+   if (VIRT_vmsize) Frames_libflags |= L_status;
 }
 
 
@@ -3186,7 +3192,10 @@ static void task_show (const WIN_t *q, c
             MKCOL(p->ruser);
             break;
          case P_VRT:
-            MKCOL(scale_num(PAGES_TO_KB(p->size), w, s));
+ 	    if (VIRT_vmsize) 
+		    MKCOL(scale_num(PAGES_TO_KB(p->vm_size), w, s));
+ 	    else
+		    MKCOL(scale_num(PAGES_TO_KB(p->size), w, s));
             break;
          case P_WCH:
             if (No_ksyms) {
diff -up procps-3.2.7/top.1.p14 procps-3.2.7/top.1
--- procps-3.2.7/top.1.p14	2006-06-19 06:33:51.000000000 +0200
+++ procps-3.2.7/top.1	2008-09-01 11:36:55.000000000 +0200
@@ -401,7 +401,8 @@ A task's currently used share of availab
 o:\fB VIRT\fR \*(EM Virtual Image (kb)
 The total amount of \*(MV used by the task.
 It includes all code, data and shared libraries plus pages that have been
-swapped out.
+swapped out. (Note: you can define the STATSIZE=1 environment variable and the VIRT
+will be calculated from the /proc/#/state VmSize field.)
 
 VIRT = SWAP + RES.
 

procps-3.2.7-top-rc.patch:

--- NEW FILE procps-3.2.7-top-rc.patch ---
diff -up procps-3.2.7/top.c.p10 procps-3.2.7/top.c
--- procps-3.2.7/top.c.p10	2008-09-01 11:33:06.000000000 +0200
+++ procps-3.2.7/top.c	2008-09-01 11:33:06.000000000 +0200
@@ -2462,7 +2462,10 @@ static void windows_stage2 (void)
    int i;
 
    for (i = 0; i < GROUPSMAX; i++) {
-      win_names(&Winstk[i], Winstk[i].rc.winname);
+      /* Please, never use something like sprintf(x, "%s", x); ... see win_names() */
+      char buf[WINNAMSIZ];
+      strncpy(buf, Winstk[i].rc.winname, WINNAMSIZ);
+      win_names(&Winstk[i], buf);
       capsmk(&Winstk[i]);
    }
    // rely on this next guy to force a call (eventually) to reframewins


Index: procps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/procps/devel/procps.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- procps.spec	12 Feb 2008 07:50:49 -0000	1.72
+++ procps.spec	1 Sep 2008 09:59:00 -0000	1.73
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities
 Name: procps
 Version: 3.2.7
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/System
 URL: http://procps.sourceforge.net
@@ -13,25 +13,25 @@
 Requires(postun): /sbin/ldconfig
 
 Patch1: procps-3.2.7-selinux.patch
-Patch2: procps-3.1.15-misc.patch
-Patch3: procps-3.2.3-FAQ.patch
-Patch4: procps-3.2.1-selinux-workaround.patch
-Patch6: procps-3.2.3-noproc.patch
-Patch7: procps-3.2.3-pseudo.patch
-Patch8: procps-3.2.4-0x9b.patch
+Patch2: procps-3.2.7-misc.patch
+Patch3: procps-3.2.7-FAQ.patch
+Patch4: procps-3.2.7-selinux-workaround.patch
+Patch6: procps-3.2.7-noproc.patch
+Patch7: procps-3.2.7-pseudo.patch
+Patch8: procps-3.2.7-0x9b.patch
 # 157725 - sysctl -A returns an error
-Patch9: procps-3.2.5-sysctl-writeonly.patch
+Patch9: procps-3.2.7-sysctl-writeonly.patch
 # 161449 - "top" ignores user and system toprc
-Patch10: procps-3.2.5-top-rc.patch
+Patch10: procps-3.2.7-top-rc.patch
 # 161303 - 'top' failed when remove cpus
 # 186017 - Top "Cpu0" line never updates on single processor machine
 Patch11: procps-3.2.7-top-remcpu.patch
 # Selinux
-Patch12: procps-3.2.6-libselinux.patch
+Patch12: procps-3.2.7-libselinux.patch
 # 177453 - for VIRT use proc->vm_size rather then proc->size (workaround)
-Patch14: procps-3.2.6-top-env-vmsize.patch
+Patch14: procps-3.2.7-top-env-vmsize.patch
 # 174619 - workaround for reliable Cpu(s) data in the first loop
-Patch15: procps-3.2.6-top-env-cpuloop.patch
+Patch15: procps-3.2.7-top-env-cpuloop.patch
 # 185299 - cpu steal time support
 Patch16: procps-3.2.7-vmstat-cpusteal.patch
 # 134516 - ps ignores /proc/#/cmdline if contents 2047 bytes
@@ -68,7 +68,10 @@
 Patch32: procps-3.2.7-top-cpuint.patch
 #296471 - update top man page
 Patch33: procps-3.2.7-top-manpage.patch
-
+#440694 - strange text after selecting few field
+Patch34: procps-3.2.7-top-clrscr.patch
+#435453 - errors with man -t formatting of ps man page
+Patch35: procps-3.2.7-ps-man-fmt.patch
 
 BuildRequires: ncurses-devel
 
@@ -127,6 +130,8 @@
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
+%patch34 -p1
+%patch35 -p1
 
 cp %SOURCE1 .
 
@@ -164,6 +169,11 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Mon Sep 01 2008 Tomas Smetana <tsmetana at redhat.com> 3.2.7-21
+- rebase patches
+- clear screen in top when switching windows
+- fix #435453 - errors with man -t formatting of ps man page
+
 * Tue Feb 12 2008 Tomas Smetana <tsmetana at redhat.com> 3.2.7-20
 - rebuild (gcc-4.3)
 


--- procps-3.1.15-misc.patch DELETED ---


--- procps-3.2.1-selinux-workaround.patch DELETED ---


--- procps-3.2.1-top-vmsize-env.patch DELETED ---


--- procps-3.2.3-FAQ.patch DELETED ---


--- procps-3.2.3-noproc.patch DELETED ---


--- procps-3.2.3-pseudo.patch DELETED ---


--- procps-3.2.4-0x9b.patch DELETED ---


--- procps-3.2.5-sysctl-writeonly.patch DELETED ---


--- procps-3.2.5-top-rc.patch DELETED ---


--- procps-3.2.6-libselinux.patch DELETED ---


--- procps-3.2.6-top-env-cpuloop.patch DELETED ---


--- procps-3.2.6-top-env-vmsize.patch DELETED ---



From tsmetana at fedoraproject.org  Mon Sep  1 10:02:12 2008
From: tsmetana at fedoraproject.org (Tomas Smetana)
Date: Mon,  1 Sep 2008 10:02:12 +0000 (UTC)
Subject: rpms/procps/devel procps-3.2.7-0x9b.patch,NONE,1.1
Message-ID: <20080901100212.C8B167011A@cvs1.fedora.phx.redhat.com>

Author: tsmetana

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

Added Files:
	procps-3.2.7-0x9b.patch 
Log Message:
forgotten patch

procps-3.2.7-0x9b.patch:

--- NEW FILE procps-3.2.7-0x9b.patch ---
diff -up procps-3.2.7/proc/escape.c.p8 procps-3.2.7/proc/escape.c
--- procps-3.2.7/proc/escape.c.p8	2005-01-05 21:50:26.000000000 +0100
+++ procps-3.2.7/proc/escape.c	2008-09-01 11:31:15.000000000 +0200
@@ -79,6 +79,7 @@ static int escape_str_utf8(char *restric
         // multibyte - printable
         // Got space?
         if (my_cells+wlen > *maxcells || my_bytes+1+len >= bufsize) break;
+#ifdef OUTPUT_PARANOID
         // 0x9b is control byte for some terminals
         if (memchr(src, 0x9B, len)) {
 	  // unsafe multibyte
@@ -87,13 +88,16 @@ static int escape_str_utf8(char *restric
 	  my_cells++;
 	  my_bytes++;
         } else {
+#endif
 	  // safe multibyte
        	  memcpy(dst, src, len);
 	  my_cells += wlen;
 	  dst += len;
 	  my_bytes += len;
           src += len;
+#ifdef OUTPUT_PARANOID
         }
+#endif
       }
     }
     //fprintf(stdout, "cells: %d\n", my_cells);



From hadess at fedoraproject.org  Mon Sep  1 10:08:58 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  1 Sep 2008 10:08:58 +0000 (UTC)
Subject: rpms/gmyth/devel gmyth-remove-debug.patch, NONE,
	1.1 gmyth-upnp-remove-warning.patch, NONE, 1.1 gmyth.spec, 1.10, 1.11
Message-ID: <20080901100858.2B1FE7011A@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gmyth.spec 
Added Files:
	gmyth-remove-debug.patch gmyth-upnp-remove-warning.patch 
Log Message:
* Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> - 0.7.1-7
- Remove extraneous debug and warnings


gmyth-remove-debug.patch:

--- NEW FILE gmyth-remove-debug.patch ---
Index: gmyth/gmyth_socket.c
===================================================================
--- gmyth/gmyth_socket.c	(revision 956)
+++ gmyth/gmyth_socket.c	(working copy)
@@ -573,11 +573,12 @@
         /*
          * init socket descriptor 
          */
-
+#if 0
         g_debug ("FAMILY: %d, TYPE: %d, PROTOCOL: %d", 
                  addr_info0->ai_family,
                  addr_info0->ai_socktype,
                  addr_info0->ai_protocol);
+#endif
         gmyth_socket->sd =
             socket(addr_info0->ai_family, addr_info0->ai_socktype,
                    addr_info0->ai_protocol);

gmyth-upnp-remove-warning.patch:

--- NEW FILE gmyth-upnp-remove-warning.patch ---
Index: src/gmyth_upnp.c
===================================================================
--- src/gmyth_upnp.c	(revision 956)
+++ src/gmyth_upnp.c	(working copy)
@@ -429,7 +429,6 @@
 
             if (strcmp (d_event->ServiceType, UPNP_SERVICE_FILTER) != 0)
             {
-                g_warning ("invalid device : %s", d_event->DeviceId);
                 break;
             }
 


Index: gmyth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmyth/devel/gmyth.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gmyth.spec	28 Aug 2008 22:27:08 -0000	1.10
+++ gmyth.spec	1 Sep 2008 10:08:27 -0000	1.11
@@ -3,13 +3,15 @@
 Summary: MythTV remote access libraries
 Name: gmyth
 Version: 0.7.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # Upstream is bad at pushing stuff to the sourceforge download
 # Source1: http://downloads.sourceforge.net/%{name}/gmyth-upnp_%{gmyth_upnp_version}.tar.gz
 Source1: http://ftp.debian.org/debian/pool/main/g/gmyth-upnp/gmyth-upnp_%{gmyth_upnp_version}.orig.tar.gz
+Patch1: gmyth-remove-debug.patch
+Patch2: gmyth-upnp-remove-warning.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://gmyth.sf.net
 BuildRequires: mysql-devel curl-devel libxml2-devel glib2-devel libupnp-devel
@@ -33,7 +35,11 @@
 
 %prep
 %setup -q
+%patch1 -p0 -b .debug
 tar xvzf %{SOURCE1}
+pushd gmyth-upnp-%{gmyth_upnp_version}
+%patch2 -p0 -b .warning
+popd
 
 %build
 %configure
@@ -78,6 +84,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> - 0.7.1-7
+- Remove extraneous debug and warnings
+
 * Fri Aug 29 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-6
 - Include /usr/include/gmyth-upnp directory
 



From varekova at fedoraproject.org  Mon Sep  1 10:12:54 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon,  1 Sep 2008 10:12:54 +0000 (UTC)
Subject: rpms/aspell/devel aspell-0.60.3-install_info.patch, 1.1,
	1.2 aspell-0.60.6-zero.patch, 1.1, 1.2
Message-ID: <20080901101254.8F1517011A@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	aspell-0.60.3-install_info.patch aspell-0.60.6-zero.patch 
Log Message:
update patches


aspell-0.60.3-install_info.patch:

Index: aspell-0.60.3-install_info.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aspell/devel/aspell-0.60.3-install_info.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-0.60.3-install_info.patch	15 Jul 2005 11:46:57 -0000	1.1
+++ aspell-0.60.3-install_info.patch	1 Sep 2008 10:12:24 -0000	1.2
@@ -1,6 +1,7 @@
---- aspell-0.60.3/manual/Makefile.in.iinfo	2005-06-27 11:54:58.000000000 +0200
-+++ aspell-0.60.3/manual/Makefile.in	2005-07-15 12:59:23.492024424 +0200
-@@ -517,16 +517,16 @@
+diff -up aspell-0.60.6/manual/Makefile.in.iinfo aspell-0.60.6/manual/Makefile.in
+--- aspell-0.60.6/manual/Makefile.in.iinfo	2008-04-07 06:56:27.000000000 +0200
++++ aspell-0.60.6/manual/Makefile.in	2008-09-01 11:21:26.000000000 +0200
+@@ -593,16 +593,16 @@ install-info-am: $(INFO_DEPS)
  	    else : ; fi; \
  	  done; \
  	done
@@ -26,4 +27,4 @@
 +#	else : ; fi
  install-man: install-man1
  
- installcheck-am:
+ install-pdf: install-pdf-am

aspell-0.60.6-zero.patch:

Index: aspell-0.60.6-zero.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aspell/devel/aspell-0.60.6-zero.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-0.60.6-zero.patch	29 May 2008 09:07:43 -0000	1.1
+++ aspell-0.60.6-zero.patch	1 Sep 2008 10:12:24 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up aspell-0.60.6/common/convert.cpp.zero aspell-0.60.6/common/convert.cpp
 --- aspell-0.60.6/common/convert.cpp.zero	2007-12-03 07:55:45.000000000 +0100
-+++ aspell-0.60.6/common/convert.cpp	2008-05-29 10:51:39.000000000 +0200
++++ aspell-0.60.6/common/convert.cpp	2008-09-01 12:04:39.000000000 +0200
 @@ -813,6 +813,7 @@ namespace acommon {
    {
      ToUniLookup lookup;



From varekova at fedoraproject.org  Mon Sep  1 10:31:11 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon,  1 Sep 2008 10:31:11 +0000 (UTC)
Subject: rpms/bzip2/devel bzip2.spec,1.37,1.38
Message-ID: <20080901103111.EF7CE7011A@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	bzip2.spec 
Log Message:
minor spec file change




Index: bzip2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzip2/devel/bzip2.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- bzip2.spec	10 Apr 2008 07:19:49 -0000	1.37
+++ bzip2.spec	1 Sep 2008 10:30:41 -0000	1.38
@@ -2,7 +2,7 @@
 Summary: A file compression utility
 Name: bzip2
 Version: 1.0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Applications/File
 URL: http://www.bzip.org/
@@ -49,14 +49,14 @@
 
 %build
 
-make -f Makefile-libbz2_so CC=%{__cc} AR=%{__ar} RANLIB=%{__ranlib} \
+make -f Makefile-libbz2_so "CC=%{__cc} AR=%{__ar} RANLIB=%{__ranlib} \
 	CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -fpic -fPIC" \
-	%{?_smp_mflags} all
+	%{?_smp_mflags} all"
 
 rm -f *.o
-make CC=%{__cc} AR=%{__ar} RANLIB=%{__ranlib} \
+make "CC=%{__cc} AR=%{__ar} RANLIB=%{__ranlib} \
 	CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" \
-	%{?_smp_mflags} all
+	%{?_smp_mflags} all"
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -109,6 +109,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Sep  1 2008 Ivana Varekova <varekova at redhat.com> 1.0.5-3
+- minor spec file changew
+
 * Thu Apr 10 2008 Ivana Varekova <varekova at redhat.com> 1.0.5-2
 - Resolves: #441775
   fix libs link



From tagoh at fedoraproject.org  Mon Sep  1 10:33:45 2008
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Mon,  1 Sep 2008 10:33:45 +0000 (UTC)
Subject: rpms/namazu/devel namazu-fixinutf8.patch, 1.3, 1.4 namazu.spec, 1.21,
	1.22
Message-ID: <20080901103345.33B3A7011A@cvs1.fedora.phx.redhat.com>

Author: tagoh

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

Modified Files:
	namazu-fixinutf8.patch namazu.spec 
Log Message:
* Mon Sep  1 2008 Akira TAGOH <tagoh at redhat.com> - 2.0.18-5
- Update patch to fix a fuzz issue.

namazu-fixinutf8.patch:

Index: namazu-fixinutf8.patch
===================================================================
RCS file: /cvs/pkgs/rpms/namazu/devel/namazu-fixinutf8.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- namazu-fixinutf8.patch	2 Mar 2006 07:30:38 -0000	1.3
+++ namazu-fixinutf8.patch	1 Sep 2008 10:33:44 -0000	1.4
@@ -1,7 +1,7 @@
-diff -ruN namazu-2.0.15.orig/filter/Makefile.am namazu-2.0.15/filter/Makefile.am
---- namazu-2.0.15.orig/filter/Makefile.am	2004-09-18 14:03:02.000000000 +0900
-+++ namazu-2.0.15/filter/Makefile.am	2006-03-02 16:25:25.000000000 +0900
-@@ -20,6 +20,8 @@
+diff -pruN namazu-2.0.18.orig/filter/Makefile.am namazu-2.0.18/filter/Makefile.am
+--- namazu-2.0.18.orig/filter/Makefile.am	2007-02-23 14:02:22.000000000 +0900
++++ namazu-2.0.18/filter/Makefile.am	2008-09-01 17:38:16.000000000 +0900
+@@ -20,6 +20,8 @@ filter_DATA = bzip2.pl \
  	      hnf.pl \
  	      html.pl \
  	      mailnews.pl \
@@ -10,10 +10,10 @@
  	      man.pl \
  	      mhonarc.pl \
  	      msword.pl \
-diff -ruN namazu-2.0.15.orig/filter/Makefile.in namazu-2.0.15/filter/Makefile.in
---- namazu-2.0.15.orig/filter/Makefile.in	2006-01-29 22:58:27.000000000 +0900
-+++ namazu-2.0.15/filter/Makefile.in	2006-03-02 16:25:55.000000000 +0900
-@@ -151,6 +151,8 @@
+diff -pruN namazu-2.0.18.orig/filter/Makefile.in namazu-2.0.18/filter/Makefile.in
+--- namazu-2.0.18.orig/filter/Makefile.in	2008-03-12 01:11:59.000000000 +0900
++++ namazu-2.0.18/filter/Makefile.in	2008-09-01 17:38:16.000000000 +0900
+@@ -151,6 +151,8 @@ filter_DATA = bzip2.pl \
  	      hnf.pl \
  	      html.pl \
  	      mailnews.pl \
@@ -22,10 +22,10 @@
  	      man.pl \
  	      mhonarc.pl \
  	      msword.pl \
-diff -ruN namazu-2.0.15.orig/filter/hnf.pl namazu-2.0.15/filter/hnf.pl
---- namazu-2.0.15.orig/filter/hnf.pl	2005-06-06 15:13:35.000000000 +0900
-+++ namazu-2.0.15/filter/hnf.pl	2006-03-02 16:25:25.000000000 +0900
-@@ -72,8 +72,10 @@
+diff -pruN namazu-2.0.18.orig/filter/hnf.pl namazu-2.0.18/filter/hnf.pl
+--- namazu-2.0.18.orig/filter/hnf.pl	2007-05-28 15:46:55.000000000 +0900
++++ namazu-2.0.18/filter/hnf.pl	2008-09-01 17:38:16.000000000 +0900
+@@ -72,8 +72,10 @@ sub filter ($$$$$) {
  
      my $mark = "# ";
      my $end  = "--";
@@ -38,9 +38,9 @@
  
      get_uri($cfile, $fields);
      hnf_filter($contref, $weighted_str, $fields, $headings, $cfile, 
-diff -ruN namazu-2.0.15.orig/filter/langspec.txt namazu-2.0.15/filter/langspec.txt
---- namazu-2.0.15.orig/filter/langspec.txt	1970-01-01 09:00:00.000000000 +0900
-+++ namazu-2.0.15/filter/langspec.txt	2006-03-02 16:25:25.000000000 +0900
+diff -pruN namazu-2.0.18.orig/filter/langspec.txt namazu-2.0.18/filter/langspec.txt
+--- namazu-2.0.18.orig/filter/langspec.txt	1970-01-01 09:00:00.000000000 +0900
++++ namazu-2.0.18/filter/langspec.txt	2008-09-01 17:38:16.000000000 +0900
 @@ -0,0 +1,8 @@
 +mailnews.pl_mailnews_citation_filter_1: (^\s*((([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(??|??|\.|??|,|??|\@|??|??)\s*){0,2}\s*(([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(????|??????????|????????????|??????????)(.{0,2})?\s*$)
 +mailnews.pl_mailnews_citation_filter_2: (^\s*(Date:|Subject:|Message-ID:|From:|????|??????|????))|(^.+(????????|reply\s*????|????|??????|??????????|??????????|????|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>)
@@ -50,9 +50,9 @@
 +hnf.pl_filter_2: ??
 +gfilter.pl_line_adjust_filter: (??|??)$
 +wakati.pl_wakatize_japanese: (.+ )????
-diff -ruN namazu-2.0.15.orig/filter/langspec.txt.utf8 namazu-2.0.15/filter/langspec.txt.utf8
---- namazu-2.0.15.orig/filter/langspec.txt.utf8	1970-01-01 09:00:00.000000000 +0900
-+++ namazu-2.0.15/filter/langspec.txt.utf8	2006-03-02 16:25:25.000000000 +0900
+diff -pruN namazu-2.0.18.orig/filter/langspec.txt.utf8 namazu-2.0.18/filter/langspec.txt.utf8
+--- namazu-2.0.18.orig/filter/langspec.txt.utf8	1970-01-01 09:00:00.000000000 +0900
++++ namazu-2.0.18/filter/langspec.txt.utf8	2008-09-01 17:38:16.000000000 +0900
 @@ -0,0 +1,8 @@
 +mailnews.pl_mailnews_citation_filter_1: (^\s*((([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(???|???|\.|???|,|???|\@|???|???)\s*){0,2}\s*(([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(??????|???????????????|??????????????????|???????????????)(.{0,2})?\s*$)
 +mailnews.pl_mailnews_citation_filter_2: (^\s*(Date:|Subject:|Message-ID:|From:|??????|?????????|??????))|(^.+(????????????|reply\s*??????|??????|?????????|???????????????|???????????????|??????|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>)
@@ -62,10 +62,10 @@
 +hnf.pl_filter_2: ???
 +gfilter.pl_line_adjust_filter: (???|???)$
 +wakati.pl_wakatize_japanese: (.+ )??????
-diff -ruN namazu-2.0.15.orig/filter/mailnews.pl namazu-2.0.15/filter/mailnews.pl
---- namazu-2.0.15.orig/filter/mailnews.pl	2006-01-29 22:26:44.000000000 +0900
-+++ namazu-2.0.15/filter/mailnews.pl	2006-03-02 16:25:25.000000000 +0900
-@@ -246,13 +246,23 @@
+diff -pruN namazu-2.0.18.orig/filter/mailnews.pl namazu-2.0.18/filter/mailnews.pl
+--- namazu-2.0.18.orig/filter/mailnews.pl	2006-04-25 23:14:05.000000000 +0900
++++ namazu-2.0.18/filter/mailnews.pl	2008-09-01 17:38:16.000000000 +0900
+@@ -260,13 +260,23 @@ sub mailnews_citation_filter ($$) {
      $$contref = "";
  
      # Greeting at the beginning (first one or two lines)
@@ -95,7 +95,7 @@
      }
  
      # Isolate citation parts.
-@@ -277,11 +287,22 @@
+@@ -291,11 +301,22 @@ sub mailnews_citation_filter ($$) {
          # Process only first five paragrahs.
  	# And don't handle the paragrah which has five or longer lines.
  	# Hmm, this regex looks very hairly.
@@ -123,10 +123,10 @@
  	}
  	$$contref .= $line. "\n\n";
          $i++;
-diff -ruN namazu-2.0.15.orig/filter/man.pl namazu-2.0.15/filter/man.pl
---- namazu-2.0.15.orig/filter/man.pl	2005-06-06 15:13:35.000000000 +0900
-+++ namazu-2.0.15/filter/man.pl	2006-03-02 16:25:25.000000000 +0900
-@@ -171,17 +171,36 @@
+diff -pruN namazu-2.0.18.orig/filter/man.pl namazu-2.0.18/filter/man.pl
+--- namazu-2.0.18.orig/filter/man.pl	2005-06-06 15:13:35.000000000 +0900
++++ namazu-2.0.18/filter/man.pl	2008-09-01 17:38:16.000000000 +0900
+@@ -171,17 +171,36 @@ sub man_filter ($$$) {
      my $weight = $conf::Weight{'html'}->{'title'};
      $$weighted_str .= "\x7f$weight\x7f$title\x7f/$weight\x7f\n";
  
@@ -172,10 +172,10 @@
      }
  }
  
-diff -ruN namazu-2.0.15.orig/pl/gfilter.pl namazu-2.0.15/pl/gfilter.pl
---- namazu-2.0.15.orig/pl/gfilter.pl	2004-11-01 21:56:44.000000000 +0900
-+++ namazu-2.0.15/pl/gfilter.pl	2006-03-02 16:25:25.000000000 +0900
-@@ -92,13 +92,14 @@
+diff -pruN namazu-2.0.18.orig/pl/gfilter.pl namazu-2.0.18/pl/gfilter.pl
+--- namazu-2.0.18.orig/pl/gfilter.pl	2006-04-16 21:48:49.000000000 +0900
++++ namazu-2.0.18/pl/gfilter.pl	2008-09-01 17:38:16.000000000 +0900
+@@ -93,13 +93,14 @@ sub line_adjust_filter ($) {
      return undef unless defined($$text);
  
      my @tmp = split(/\n/, $$text);
@@ -191,11 +191,11 @@
  	$line =~ s/([a-z])-\n/$1/;  # for hyphenation.
      }
      $$text = join('', @tmp);
-diff -ruN namazu-2.0.15.orig/pl/util.pl namazu-2.0.15/pl/util.pl
---- namazu-2.0.15.orig/pl/util.pl	2006-03-02 16:24:57.000000000 +0900
-+++ namazu-2.0.15/pl/util.pl	2006-03-02 16:25:25.000000000 +0900
-@@ -562,4 +562,36 @@
-     }
+diff -pruN namazu-2.0.18.orig/pl/util.pl namazu-2.0.18/pl/util.pl
+--- namazu-2.0.18.orig/pl/util.pl	2008-09-01 17:37:56.000000000 +0900
++++ namazu-2.0.18/pl/util.pl	2008-09-01 17:38:16.000000000 +0900
+@@ -582,4 +582,36 @@ sub canopen($)
+     return 1;
  }
  
 +sub read_langspec_char_from_file ($$) {
@@ -231,10 +231,10 @@
 +}
 +
  1;
-diff -ruN namazu-2.0.15.orig/pl/wakati.pl namazu-2.0.15/pl/wakati.pl
---- namazu-2.0.15.orig/pl/wakati.pl	2006-01-23 18:18:24.000000000 +0900
-+++ namazu-2.0.15/pl/wakati.pl	2006-03-02 16:25:25.000000000 +0900
-@@ -53,8 +53,10 @@
+diff -pruN namazu-2.0.18.orig/pl/wakati.pl namazu-2.0.18/pl/wakati.pl
+--- namazu-2.0.18.orig/pl/wakati.pl	2006-03-11 01:25:32.000000000 +0900
++++ namazu-2.0.18/pl/wakati.pl	2008-09-01 17:38:16.000000000 +0900
+@@ -53,8 +53,10 @@ sub wakatize_japanese ($) {
      # Collect only noun words when -m option is specified.
      if ($var::Opt{'noun'}) {
  	$$content = "";


Index: namazu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/namazu/devel/namazu.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- namazu.spec	4 Jul 2008 08:33:57 -0000	1.21
+++ namazu.spec	1 Sep 2008 10:33:44 -0000	1.22
@@ -4,7 +4,7 @@
 
 Name:		namazu
 Version:	2.0.18
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPLv2+
 URL:		http://www.namazu.org/
 BuildRequires:	perl >= 5.6.0, perl(NKF) >= 1.70, perl(Text::Kakasi) >= 1.00
@@ -161,6 +161,9 @@
 
 
 %changelog
+* Mon Sep  1 2008 Akira TAGOH <tagoh at redhat.com> - 2.0.18-5
+- Update patch to fix a fuzz issue.
+
 * Fri Jul  4 2008 Akira TAGOH <tagoh at redhat.com> - 2.0.18-4
 - Add nkf, kakasi and mecab to BR. (#449186)
 



From ovasik at fedoraproject.org  Mon Sep  1 10:51:31 2008
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon,  1 Sep 2008 10:51:31 +0000 (UTC)
Subject: rpms/elinks/devel elinks-0.12-bittorrent.patch, NONE,
	1.1 elinks-scroll.patch, NONE, 1.1 elinks.spec, 1.57, 1.58
Message-ID: <20080901105131.EC7567011A@cvs1.fedora.phx.redhat.com>

Author: ovasik

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

Modified Files:
	elinks.spec 
Added Files:
	elinks-0.12-bittorrent.patch elinks-scroll.patch 
Log Message:
upstream fixes for bittorrent and out of screen dialog texts

elinks-0.12-bittorrent.patch:

--- NEW FILE elinks-0.12-bittorrent.patch ---
diff --git a/src/protocol/bittorrent/peerconnect.c b/src/protocol/bittorrent/peerconnect.c
index aeafbf3..7a89523 100644
--- a/src/protocol/bittorrent/peerconnect.c
+++ b/src/protocol/bittorrent/peerconnect.c
@@ -271,9 +271,11 @@ enum bittorrent_state
 make_bittorrent_peer_connection(struct bittorrent_connection *bittorrent,
 				struct bittorrent_peer *peer_info)
 {
-	struct uri uri;
+	struct string uri_string;
+	struct uri *uri;
 	struct bittorrent_peer_connection *peer;
-	unsigned char port[5];
+	unsigned char port[6];
+	int port_length;
 
 	peer = init_bittorrent_peer_connection(-1);
 	if (!peer) return BITTORRENT_STATE_OUT_OF_MEM;
@@ -296,14 +298,27 @@ make_bittorrent_peer_connection(struct bittorrent_connection *bittorrent,
 	/* FIXME: Rather change the make_connection() interface. This is an ugly
 	 * hack. */
 	/* FIXME: Set the ipv6 flag iff ... */
-	memset(&uri, 0, sizeof(uri));
-	uri.protocol = PROTOCOL_BITTORRENT;
-	uri.host     = peer_info->ip;
-	uri.hostlen  = strlen(peer_info->ip);
-	uri.port     = port;
-	uri.portlen  = snprintf(port, sizeof(port), "%u", peer_info->port);
-
-	make_connection(peer->socket, &uri, send_bittorrent_peer_handshake, 1);
+       if (!init_string(&uri_string)) {
+               done_bittorrent_peer_connection(peer);
+               return BITTORRENT_STATE_OUT_OF_MEM;
+       }
+       /* The bittorrent protocol uses free syntax.
+        * It does not set uri->port nor uri->host */
+       add_to_string(&uri_string, "http://");
+       add_to_string(&uri_string, peer_info->ip);
+       add_char_to_string(&uri_string, ':');
+       port_length = snprintf(port, sizeof(port), "%u", peer_info->port);
+       add_bytes_to_string(&uri_string, port, port_length);
+
+       uri = get_uri(uri_string.source, URI_BASE);
+       done_string(&uri_string);
+       if (!uri) {
+               done_bittorrent_peer_connection(peer);
+               return BITTORRENT_STATE_OUT_OF_MEM;
+       }
+       uri->protocol = PROTOCOL_BITTORRENT;
+       make_connection(peer->socket, uri, send_bittorrent_peer_handshake, 1);
+       done_uri(uri);
 
 	return BITTORRENT_STATE_OK;
 }

elinks-scroll.patch:

--- NEW FILE elinks-scroll.patch ---
commit b392a24716905f4b2a1efba45384705d90a1941c
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Sun Aug 31 14:23:28 2008 +0200

    Use real_box in dialog.c.

diff --git a/src/bfu/dialog.c b/src/bfu/dialog.c
index 644f643..5b94be0 100644
--- a/src/bfu/dialog.c
+++ b/src/bfu/dialog.c
@@ -82,20 +82,18 @@ redraw_dialog(struct dialog_data *dlg_data, int layout)
 	}
 
 	if (!dlg_data->dlg->layout.only_widgets) {
-		struct box box;
-
-		set_box(&box,
+		set_box(&dlg_data->real_box,
 			dlg_data->box.x + (DIALOG_LEFT_BORDER + 1),
 			dlg_data->box.y + (DIALOG_TOP_BORDER + 1),
 			dlg_data->box.width - 2 * (DIALOG_LEFT_BORDER + 1),
 			dlg_data->box.height - 2 * (DIALOG_TOP_BORDER + 1));
 
-		draw_border(term, &box, get_bfu_color(term, "dialog.frame"), DIALOG_FRAME);
+		draw_border(term, &dlg_data->real_box, get_bfu_color(term, "dialog.frame"), DIALOG_FRAME);
 
 		assert(dlg_data->dlg->title);
 
 		title_color = get_bfu_color(term, "dialog.title");
-		if (title_color && box.width > 2) {
+		if (title_color && dlg_data->real_box.width > 2) {
 			unsigned char *title = dlg_data->dlg->title;
 			int titlelen = strlen(title);
 			int titlecells = titlelen;
@@ -107,7 +105,7 @@ redraw_dialog(struct dialog_data *dlg_data, int layout)
 							    &title[titlelen]);
 #endif /* CONFIG_UTF8 */
 
-			titlecells = int_min(box.width - 2, titlecells);
+			titlecells = int_min(dlg_data->real_box.width - 2, titlecells);
 
 #ifdef CONFIG_UTF8
 			if (term->utf8_cp)
@@ -115,8 +113,8 @@ redraw_dialog(struct dialog_data *dlg_data, int layout)
 							    NULL);
 #endif /* CONFIG_UTF8 */
 
-			x = (box.width - titlecells) / 2 + box.x;
-			y = box.y - 1;
+			x = (dlg_data->real_box.width - titlecells) / 2 + dlg_data->real_box.x;
+			y = dlg_data->real_box.y - 1;
 
 
 			draw_text(term, x - 1, y, " ", 1, 0, title_color);

commit 0f02ab5501c976c1d9b9f42894f936a403773c58
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Sun Aug 31 18:56:23 2008 +0200

    Added draw_text2 functions and others.
    
    draw2_text checks whether text of dialogs fit on the screen.
    At the start the bottom part of the dialogs is shown.
    Scrolling works with bittorrent. I did not check listbox.

diff --git a/src/bfu/button.c b/src/bfu/button.c
index 0915b81..b5b0c66 100644
--- a/src/bfu/button.c
+++ b/src/bfu/button.c
@@ -212,7 +212,7 @@ display_button(struct dialog_data *dlg_data, struct widget_data *widget_data)
 	}
 
 
-	draw_text(term, pos->x, pos->y, BUTTON_LEFT, BUTTON_LEFT_LEN, 0, color);
+	draw_text2(term, dlg_data, pos->x, pos->y, BUTTON_LEFT, BUTTON_LEFT_LEN, 0, color);
 	if (len > 0) {
 		unsigned char *text = widget_data->widget->text;
 		int hk_pos = widget_data->widget->info.button.hotkey_pos;
@@ -237,15 +237,15 @@ display_button(struct dialog_data *dlg_data, struct widget_data *widget_data)
 								NULL);
 
 				if (hk_pos)
-					draw_text(term, x, pos->y,
+					draw_text2(term, dlg_data, x, pos->y,
 						  text, hk_pos, 0, color);
 
-				draw_text(term, x + cells_to_hk, pos->y,
+				draw_text2(term, dlg_data, x + cells_to_hk, pos->y,
 					  &text[hk_pos + 1], hk_bytes,
 					  attr, shortcut_color);
 
 				if (right > 1)
-					draw_text(term, x+cells_to_hk+hk_cells,
+					draw_text2(term, dlg_data, x+cells_to_hk+hk_cells,
 						  pos->y,
 						  &text[hk_pos + hk_bytes + 1],
 						  right - 1, 0, color);
@@ -258,11 +258,11 @@ display_button(struct dialog_data *dlg_data, struct widget_data *widget_data)
 							 len - hk_width,
 							 NULL);
 
-				draw_text(term, x, pos->y,
+				draw_text2(term, dlg_data, x, pos->y,
 					  text, hk_len,
 					  attr, shortcut_color);
 
-				draw_text(term, x + hk_width, pos->y,
+				draw_text2(term, dlg_data, x + hk_width, pos->y,
 					  &text[hk_len], len_to_display,
 					  0, color);
 			}
@@ -272,18 +272,18 @@ display_button(struct dialog_data *dlg_data, struct widget_data *widget_data)
 			int right = widget_data->widget->info.button.truetextlen - hk_pos - 1;
 
 			if (hk_pos) {
-				draw_text(term, x, pos->y, text, hk_pos, 0, color);
+				draw_text2(term, dlg_data, x, pos->y, text, hk_pos, 0, color);
 			}
-			draw_text(term, x + hk_pos, pos->y,
+			draw_text2(term, dlg_data, x + hk_pos, pos->y,
 				  &text[hk_pos + 1], 1, attr, shortcut_color);
 			if (right > 1) {
-				draw_text(term, x + hk_pos + 1, pos->y,
+				draw_text2(term, dlg_data, x + hk_pos + 1, pos->y,
 					  &text[hk_pos + 2], right - 1, 0, color);
 			}
 
 		} else {
-			draw_text(term, x, pos->y, text, 1, attr, shortcut_color);
-			draw_text(term, x + 1, pos->y, &text[1], len - 1, 0, color);
+			draw_text2(term, dlg_data, x, pos->y, text, 1, attr, shortcut_color);
+			draw_text2(term, dlg_data, x + 1, pos->y, &text[1], len - 1, 0, color);
 		}
 	}
 #ifdef CONFIG_UTF8
@@ -291,15 +291,15 @@ display_button(struct dialog_data *dlg_data, struct widget_data *widget_data)
 		int text_cells = utf8_ptr2cells(widget_data->widget->text, NULL);
 		int hk = (widget_data->widget->info.button.hotkey_pos >= 0);
 
-		draw_text(term, x + text_cells - hk, pos->y,
+		draw_text2(term, dlg_data, x + text_cells - hk, pos->y,
 			  BUTTON_RIGHT, BUTTON_RIGHT_LEN, 0, color);
 	} else
 #endif /* CONFIG_UTF8 */
-		draw_text(term, x + len, pos->y, BUTTON_RIGHT,
+		draw_text2(term, dlg_data, x + len, pos->y, BUTTON_RIGHT,
 			  BUTTON_RIGHT_LEN, 0, color);
 	if (sel) {
-		set_cursor(term, x, pos->y, 1);
-		set_window_ptr(dlg_data->win, pos->x, pos->y);
+		set_cursor2(term, dlg_data, x, pos->y, 1);
+		set_window_ptr2(dlg_data, dlg_data->win, pos->x, pos->y);
 	}
 	return EVENT_PROCESSED;
 }
diff --git a/src/bfu/checkbox.c b/src/bfu/checkbox.c
index b44ce19..d7c974b 100644
--- a/src/bfu/checkbox.c
+++ b/src/bfu/checkbox.c
@@ -78,11 +78,11 @@ display_checkbox(struct dialog_data *dlg_data, struct widget_data *widget_data)
 	else
 		text = widget_data->widget->info.checkbox.gid ? "( )" : "[ ]";
 
-	draw_text(term, pos->x, pos->y, text, CHECKBOX_LEN, 0, color);
+	draw_text2(term, dlg_data, pos->x, pos->y, text, CHECKBOX_LEN, 0, color);
 
 	if (selected) {
-		set_cursor(term, pos->x + 1, pos->y, 1);
-		set_window_ptr(dlg_data->win, pos->x, pos->y);
+		set_cursor2(term, dlg_data, pos->x + 1, pos->y, 1);
+		set_window_ptr2(dlg_data, dlg_data->win, pos->x, pos->y);
 	}
 
 	return EVENT_PROCESSED;
@@ -128,7 +128,6 @@ mouse_checkbox(struct dialog_data *dlg_data, struct widget_data *widget_data)
 static widget_handler_status_T
 select_checkbox(struct dialog_data *dlg_data, struct widget_data *widget_data)
 {
-
 	if (!widget_data->widget->info.checkbox.gid) {
 		/* Checkbox. */
 		int *cdata = (int *) widget_data->cdata;
@@ -159,8 +158,8 @@ select_checkbox(struct dialog_data *dlg_data, struct widget_data *widget_data)
 		}
 		widget_data->info.checkbox.checked = 1;
 	}
-
 	display_widget(dlg_data, widget_data);
+
 	return EVENT_PROCESSED;
 }
 
diff --git a/src/bfu/dialog.c b/src/bfu/dialog.c
index 5b94be0..bb4f901 100644
--- a/src/bfu/dialog.c
+++ b/src/bfu/dialog.c
@@ -117,9 +117,9 @@ redraw_dialog(struct dialog_data *dlg_data, int layout)
 			y = dlg_data->real_box.y - 1;
 
 
-			draw_text(term, x - 1, y, " ", 1, 0, title_color);
-			draw_text(term, x, y, title, titlelen, 0, title_color);
-			draw_text(term, x + titlecells, y, " ", 1, 0,
+			draw_text2(term, dlg_data, x - 1, y, " ", 1, 0, title_color);
+			draw_text2(term, dlg_data, x, y, title, titlelen, 0, title_color);
+			draw_text2(term, dlg_data, x + titlecells, y, " ", 1, 0,
 				  title_color);
 		}
 	}
@@ -179,6 +179,23 @@ init_widget(struct dialog_data *dlg_data, int i)
 	return widget_data;
 }
 
+static int
+check_range(struct dialog_data *dlg_data, struct widget_data *widget_data)
+{
+	if (!dlg_data->dlg->layout.only_widgets) {
+		struct box *box = &widget_data->box;
+		struct box *dlgbox = &dlg_data->real_box;
+		int y = box->y - dlgbox->y;
+
+		if ((y < dlg_data->y) || (y >= dlg_data->y + dlgbox->height)) {
+			dlg_data->y = y / dlgbox->height  * dlgbox->height;
+			redraw_dialog(dlg_data, 0);
+			return 1;
+		}
+	}
+	return 0;
+}
+
 void
 select_widget(struct dialog_data *dlg_data, struct widget_data *widget_data)
 {
@@ -188,6 +205,9 @@ select_widget(struct dialog_data *dlg_data, struct widget_data *widget_data)
 
 	dlg_data->selected_widget_id = widget_data - dlg_data->widgets_data;
 
+	if (check_range(dlg_data, widget_data))
+		return;
+
 	display_widget(dlg_data, previously_selected_widget);
 	display_widget(dlg_data, widget_data);
 }
@@ -226,6 +246,11 @@ cycle_widget_focus(struct dialog_data *dlg_data, int direction)
 	} while (!widget_is_focusable(selected_widget(dlg_data))
 		 && dlg_data->selected_widget_id != prev_selected);
 
+	if (check_range(dlg_data, selected_widget(dlg_data))) {
+		redraw_from_window(dlg_data->win);
+		return;
+	}
+
 	display_widget(dlg_data, previously_selected_widget);
 	display_widget(dlg_data, selected_widget(dlg_data));
 	redraw_from_window(dlg_data->win);
@@ -236,6 +261,7 @@ dialog_ev_init(struct dialog_data *dlg_data)
 {
 	int i;
 
+	dlg_data->y = 0;
 	/* TODO: foreachback_widget() */
 	for (i = dlg_data->number_of_widgets - 1; i >= 0; i--) {
 		struct widget_data *widget_data;
@@ -419,6 +445,7 @@ dialog_ev_abort(struct dialog_data *dlg_data)
 	}
 
 	freeml(dlg_data->ml);
+	dlg_data->y = 0;
 }
 
 /* TODO: use EVENT_PROCESSED/EVENT_NOT_PROCESSED. */
diff --git a/src/bfu/group.c b/src/bfu/group.c
index c3da0d2..15bd827 100644
--- a/src/bfu/group.c
+++ b/src/bfu/group.c
@@ -87,14 +87,14 @@ dlg_format_group(struct terminal *term, struct dialog_data *dlg_data,
 								text,
 								label_length,
 								NULL);
-						draw_text(term, xpos + width
+						draw_text2(term, dlg_data, xpos + width
 								+ label_padding,
 							  *y, text, lb, 0,
 							  color);
 					} else
 #endif /* CONFIG_UTF8 */
 					{
-						draw_text(term, xpos + width
+						draw_text2(term, dlg_data, xpos + width
 								+ label_padding,
 							  *y, text,
 							  label_length, 0,
@@ -113,12 +113,12 @@ dlg_format_group(struct terminal *term, struct dialog_data *dlg_data,
 								text,
 								label_length,
 								NULL);
-						draw_text(term, xpos, *y,
+						draw_text2(term, dlg_data, xpos, *y,
 							  text, lb, 0, color);
 					} else
 #endif /* CONFIG_UTF8 */
 					{
-						draw_text(term, xpos, *y,
+						draw_text2(term, dlg_data, xpos, *y,
 							  text, label_length,
 							  0, color);
 					}
diff --git a/src/bfu/inpfield.c b/src/bfu/inpfield.c
index 0e1ba35..4ba30eb 100644
--- a/src/bfu/inpfield.c
+++ b/src/bfu/inpfield.c
@@ -312,7 +312,7 @@ display_field_do(struct dialog_data *dlg_data, struct widget_data *widget_data,
 			if (term->utf8_cp)
 				w = utf8_cells2bytes(text, w, NULL);
 #endif /* CONFIG_UTF8 */
-			draw_text(term, widget_data->box.x, widget_data->box.y,
+			draw_text2(term, dlg_data, widget_data->box.x, widget_data->box.y,
 				  text, w, 0, color);
 		} else {
 			struct box box;
diff --git a/src/bfu/text.c b/src/bfu/text.c
index c1bfc4c..3d2895e 100644
--- a/src/bfu/text.c
+++ b/src/bfu/text.c
@@ -256,7 +256,7 @@ dlg_format_text_do(struct terminal *term, struct dialog_data *dlg_data,
 
 		assert(cells <= width && shift < width);
 
-		draw_text(term, x + shift, *y, text, line_width, 0, color);
+		draw_text2(term, dlg_data, x + shift, *y, text, line_width, 0, color);
 	}
 }
 
@@ -397,8 +397,8 @@ display_text(struct dialog_data *dlg_data, struct widget_data *widget_data)
 
 	/* Hope this is at least a bit reasonable. Set cursor
 	 * and window pointer to start of the first text line. */
-	set_cursor(win->term, widget_data->box.x, widget_data->box.y, 1);
-	set_window_ptr(win, widget_data->box.x, widget_data->box.y);
+	set_cursor2(win->term, dlg_data, widget_data->box.x, widget_data->box.y, 1);
+	set_window_ptr2(dlg_data, win, widget_data->box.x, widget_data->box.y);
 
 	return EVENT_PROCESSED;
 }
diff --git a/src/terminal/draw.c b/src/terminal/draw.c
index 9189a2d..45deccb 100644
--- a/src/terminal/draw.c
+++ b/src/terminal/draw.c
@@ -7,6 +7,7 @@
 
 #include "elinks.h"
 
+#include "bfu/dialog.h"
 #include "config/options.h"
 #include "intl/charsets.h"
 #include "terminal/color.h"
@@ -559,6 +560,23 @@ draw_text(struct terminal *term, int x, int y,
 }
 
 void
+draw_text2(struct terminal *term, struct dialog_data *dlg_data, int x, int y,
+	  unsigned char *text, int length,
+	  enum screen_char_attr attr, struct color_pair *color)
+{
+	struct box *box = &dlg_data->real_box;
+
+	if (box->height) {
+		int y_max = box->y + box->height;
+
+		y -= dlg_data->y;
+		if (y < box->y || y >= y_max) return;
+	}
+	draw_text(term, x, y, text, length, attr, color);
+}
+
+
+void
 set_cursor(struct terminal *term, int x, int y, int blockable)
 {
 	assert(term && term->screen);
@@ -580,6 +598,24 @@ set_cursor(struct terminal *term, int x, int y, int blockable)
 }
 
 void
+set_cursor2(struct terminal *term, struct dialog_data *dlg_data, int x, int y, int blockable)
+{
+	struct box *box = &dlg_data->real_box;
+
+	assert(term && term->screen);
+	if_assert_failed return;
+
+	if (box->height) {
+		int y_max = box->y + box->height;
+
+		y -= dlg_data->y;
+		if (y < box->y || y >= y_max) return;
+	}
+	set_cursor(term, x, y, blockable);
+}
+
+
+void
 clear_terminal(struct terminal *term)
 {
 	struct box box;
diff --git a/src/terminal/draw.h b/src/terminal/draw.h
index 6dcd31a..20fba4e 100644
--- a/src/terminal/draw.h
+++ b/src/terminal/draw.h
@@ -4,6 +4,7 @@
 #include "intl/charsets.h" /* unicode_val_T */
 
 struct color_pair;
+struct dialog_data;
 struct box;
 struct terminal;
 
@@ -280,6 +281,12 @@ void draw_text(struct terminal *term, int x, int y,
 	       enum screen_char_attr attr,
 	       struct color_pair *color);
 
+/** Draws text for dialogs. */
+void draw_text2(struct terminal *term, struct dialog_data *dlg_data, int x, int y,
+	  unsigned char *text, int length,
+	  enum screen_char_attr attr, struct color_pair *color);
+
+
 /** Draws @a length chars from @a line on the screen.  */
 void draw_line(struct terminal *term, int x, int y, int length,
 	       struct screen_char *line);
@@ -289,6 +296,9 @@ void draw_line(struct terminal *term, int x, int y, int length,
  * bottom right corner of the screen. */
 void set_cursor(struct terminal *term, int x, int y, int blockable);
 
+/* set cursor for dialogs */
+void set_cursor2(struct terminal *term, struct dialog_data *dlg_data, int x, int y, int blockable);
+
 /** Blanks the screen. */
 void clear_terminal(struct terminal *);
 
diff --git a/src/terminal/window.c b/src/terminal/window.c
index d4cd6c1..1d2273b 100644
--- a/src/terminal/window.c
+++ b/src/terminal/window.c
@@ -7,6 +7,7 @@
 
 #include "elinks.h"
 
+#include "bfu/dialog.h"
 #include "bfu/menu.h"
 #include "terminal/event.h"
 #include "terminal/tab.h"
@@ -205,3 +206,17 @@ assert_window_stacking(struct terminal *term)
 	}
 }
 #endif	/* CONFIG_DEBUG */
+
+void
+set_window_ptr2(struct dialog_data *dlg_data, struct window *window, int x, int y)
+{
+	struct box *box = &dlg_data->real_box;
+
+	if (box->height) {
+		int y_max = box->y + box->height;
+
+		y -= dlg_data->y;
+		if (y < box->y || y >= y_max) return;
+	}
+	set_window_ptr(window, x, y);
+}
diff --git a/src/terminal/window.h b/src/terminal/window.h
index e94da64..c9122f1 100644
--- a/src/terminal/window.h
+++ b/src/terminal/window.h
@@ -3,6 +3,7 @@
 
 #include "util/lists.h"
 
+struct dialog_data;
 struct term_event;
 struct terminal;
 struct window;
@@ -73,6 +74,7 @@ void add_window(struct terminal *, window_handler_T, void *);
 void delete_window(struct window *);
 void delete_window_ev(struct window *, struct term_event *ev);
 #define set_window_ptr(window, x_, y_) do { (window)->x = (x_); (window)->y = (y_); } while (0)
+void set_window_ptr2(struct dialog_data *dlg_data, struct window *window, int x, int y);
 void get_parent_ptr(struct window *, int *, int *);
 
 void add_empty_window(struct terminal *, void (*)(void *), void *);

commit 9fd863d024e00e1f907b1581780a195b59bf6f0a
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Sun Aug 31 14:17:45 2008 +0200

    Pass dlg_data to all format functions. It will be used later by
    scrolling.

diff --git a/src/bfu/button.c b/src/bfu/button.c
index b567251..0915b81 100644
--- a/src/bfu/button.c
+++ b/src/bfu/button.c
@@ -115,7 +115,7 @@ buttons_width(struct widget_data *widget_data, int n,
 }
 
 void
-dlg_format_buttons(struct terminal *term,
+dlg_format_buttons(struct terminal *term, struct dialog_data *dlg_data,
 		   struct widget_data *widget_data, int n,
 		   int x, int *y, int w, int *rw, enum format_align align, int format_only)
 {
diff --git a/src/bfu/button.h b/src/bfu/button.h
index ca7b3d6..3f00b26 100644
--- a/src/bfu/button.h
+++ b/src/bfu/button.h
@@ -5,6 +5,7 @@
 #include "util/align.h"
 
 struct dialog;
+struct dialog_data;
 struct terminal;
 struct widget_data;
 
@@ -48,6 +49,6 @@ void add_dlg_button_do(struct dialog *dlg, unsigned char *text, int flags, widge
 #endif
 
 extern const struct widget_ops button_ops;
-void dlg_format_buttons(struct terminal *, struct widget_data *, int, int, int *, int, int *, enum format_align, int);
+void dlg_format_buttons(struct terminal *, struct dialog_data *, struct widget_data *, int, int, int *, int, int *, enum format_align, int);
 
 #endif
diff --git a/src/bfu/checkbox.c b/src/bfu/checkbox.c
index 7ed97e0..b44ce19 100644
--- a/src/bfu/checkbox.c
+++ b/src/bfu/checkbox.c
@@ -36,7 +36,7 @@ add_dlg_radio_do(struct dialog *dlg, unsigned char *text,
 }
 
 void
-dlg_format_checkbox(struct terminal *term,
+dlg_format_checkbox(struct terminal *term, struct dialog_data *dlg_data,
 		    struct widget_data *widget_data,
 		    int x, int *y, int w, int *rw,
 		    enum format_align align, int format_only)
@@ -49,7 +49,7 @@ dlg_format_checkbox(struct terminal *term,
 
 	if (text && *text) {
 		if (rw) *rw -= CHECKBOX_LS;
-		dlg_format_text_do(term, text, x + CHECKBOX_LS, y,
+		dlg_format_text_do(term, dlg_data, text, x + CHECKBOX_LS, y,
 				   w - CHECKBOX_LS, rw,
 				   get_bfu_color(term, "dialog.checkbox-label"),
 				   align, format_only);
diff --git a/src/bfu/checkbox.h b/src/bfu/checkbox.h
index 573f1d2..b4e65ce 100644
--- a/src/bfu/checkbox.h
+++ b/src/bfu/checkbox.h
@@ -2,6 +2,7 @@
 #define EL__BFU_CHECKBOX_H
 
 struct dialog;
+struct dialog_data;
 struct terminal;
 struct widget_data;
 
@@ -30,7 +31,7 @@ void add_dlg_radio_do(struct dialog *dlg, unsigned char *text, int groupid, int
 extern const struct widget_ops checkbox_ops;
 
 void
-dlg_format_checkbox(struct terminal *term,
+dlg_format_checkbox(struct terminal *term, struct dialog_data *dlg_data,
 		    struct widget_data *widget_data,
 		    int x, int *y, int w, int *rw,
 		    enum format_align align, int format_only);
diff --git a/src/bfu/dialog.c b/src/bfu/dialog.c
index f99e781..644f643 100644
--- a/src/bfu/dialog.c
+++ b/src/bfu/dialog.c
@@ -554,17 +554,17 @@ format_widgets(struct terminal *term, struct dialog_data *dlg_data,
 		switch (wdata->widget->type) {
 		case WIDGET_FIELD_PASS:
 		case WIDGET_FIELD:
-			dlg_format_field(term, wdata, x, y, w, rw, ALIGN_LEFT,
+			dlg_format_field(term, dlg_data, wdata, x, y, w, rw, ALIGN_LEFT,
 					 format_only);
 			break;
 
 		case WIDGET_LISTBOX:
-			dlg_format_listbox(term, wdata, x, y, w, h, rw,
+			dlg_format_listbox(term, dlg_data, wdata, x, y, w, h, rw,
 					   ALIGN_LEFT, format_only);
 			break;
 
 		case WIDGET_TEXT:
-			dlg_format_text(term, wdata, x, y, w, rw, h,
+			dlg_format_text(term, dlg_data, wdata, x, y, w, rw, h,
 					format_only);
 			break;
 
@@ -583,7 +583,7 @@ format_widgets(struct terminal *term, struct dialog_data *dlg_data,
 						break;
 				}
 
-				dlg_format_group(term, wdata, size, x, y, w, rw,
+				dlg_format_group(term, dlg_data, wdata, size, x, y, w, rw,
 						 format_only);
 				wdata += size - 1;
 
@@ -591,7 +591,7 @@ format_widgets(struct terminal *term, struct dialog_data *dlg_data,
 
 				/* No horizontal space between checkboxes belonging to
 				 * the same group. */
-				dlg_format_checkbox(term, wdata, x, y, w, rw,
+				dlg_format_checkbox(term, dlg_data, wdata, x, y, w, rw,
 						    ALIGN_LEFT, format_only);
 				if (widgets > 1
 				    && group == widget_has_group(&wdata[1]))
@@ -603,7 +603,7 @@ format_widgets(struct terminal *term, struct dialog_data *dlg_data,
 		/* We assume that the buttons are all stuffed at the very end
 		 * of the dialog. */
 		case WIDGET_BUTTON:
-			dlg_format_buttons(term, wdata, widgets,
+			dlg_format_buttons(term, dlg_data, wdata, widgets,
 					   x, y, w, rw, ALIGN_CENTER, format_only);
 			return;
 		}
diff --git a/src/bfu/dialog.h b/src/bfu/dialog.h
index b0cde3b..bec914c 100644
--- a/src/bfu/dialog.h
+++ b/src/bfu/dialog.h
@@ -100,6 +100,8 @@ struct dialog_data {
 	struct memory_list *ml;
 
 	struct box box;
+	struct box real_box;
+	int y;
 	int number_of_widgets;
 	int selected_widget_id;
 	struct term_event *term_event;
diff --git a/src/bfu/group.c b/src/bfu/group.c
index cc4c6d8..c3da0d2 100644
--- a/src/bfu/group.c
+++ b/src/bfu/group.c
@@ -20,7 +20,7 @@
 #define CHECKBOX_LEN 3  /* "[X]" or "(X)" */
 
 void
-dlg_format_group(struct terminal *term,
+dlg_format_group(struct terminal *term, struct dialog_data *dlg_data,
 		 struct widget_data *widget_data,
 		 int n, int x, int *y, int w, int *rw, int format_only)
 {
@@ -155,11 +155,11 @@ group_layouter(struct dialog_data *dlg_data)
 #endif /* CONFIG_UTF8 */
 		rw = int_min(w, strlen(dlg_data->dlg->title));
 
-	dlg_format_group(term, dlg_data->widgets_data, n,
+	dlg_format_group(term, dlg_data, dlg_data->widgets_data, n,
 			 0, &y, w, &rw, 1);
 
 	y++;
-	dlg_format_buttons(term, dlg_data->widgets_data + n, 2, 0, &y, w,
+	dlg_format_buttons(term, dlg_data, dlg_data->widgets_data + n, 2, 0, &y, w,
 			   &rw, ALIGN_CENTER, 1);
 
 	w = rw;
@@ -167,10 +167,10 @@ group_layouter(struct dialog_data *dlg_data)
 	draw_dialog(dlg_data, w, y);
 
 	y = dlg_data->box.y + DIALOG_TB + 1;
-	dlg_format_group(term, dlg_data->widgets_data, n,
+	dlg_format_group(term, dlg_data, dlg_data->widgets_data, n,
 			 dlg_data->box.x + DIALOG_LB, &y, w, NULL, 0);
 
 	y++;
-	dlg_format_buttons(term, dlg_data->widgets_data + n, 2,
+	dlg_format_buttons(term, dlg_data, dlg_data->widgets_data + n, 2,
 			   dlg_data->box.x + DIALOG_LB, &y, w, &rw, ALIGN_CENTER, 0);
 }
diff --git a/src/bfu/group.h b/src/bfu/group.h
index 0de645d..9b92c2a 100644
--- a/src/bfu/group.h
+++ b/src/bfu/group.h
@@ -5,7 +5,7 @@ struct dialog_data;
 struct terminal;
 struct widget_data;
 
-void dlg_format_group(struct terminal *term,
+void dlg_format_group(struct terminal *term, struct dialog_data *dlg_data,
 		 struct widget_data *widget_data,
 		 int n, int x, int *y, int w, int *rw, int format_only);
 
diff --git a/src/bfu/inpfield.c b/src/bfu/inpfield.c
index f0b8539..0e1ba35 100644
--- a/src/bfu/inpfield.c
+++ b/src/bfu/inpfield.c
@@ -103,7 +103,7 @@ check_nonempty(struct dialog_data *dlg_data, struct widget_data *widget_data)
 }
 
 void
-dlg_format_field(struct terminal *term,
+dlg_format_field(struct terminal *term, struct dialog_data *dlg_data,
 		 struct widget_data *widget_data,
 		 int x, int *y, int w, int *rw, enum format_align align, int format_only)
 {
@@ -132,7 +132,7 @@ dlg_format_field(struct terminal *term,
 	if (label && *label) {
 		if (!format_only) text_color = get_bfu_color(term, "dialog.text");
 
-		dlg_format_text_do(term, label, x, y, w, rw, text_color, ALIGN_LEFT, format_only);
+		dlg_format_text_do(term, dlg_data, label, x, y, w, rw, text_color, ALIGN_LEFT, format_only);
 	}
 
 	/* XXX: We want the field and label on the same line if the terminal
@@ -140,7 +140,7 @@ dlg_format_field(struct terminal *term,
 	if (label && *label && float_label) {
 		if (widget_data->widget->info.field.flags & INPFIELD_FLOAT) {
 			(*y) -= INPUTFIELD_HEIGHT;
-			dlg_format_text_do(term, INPUTFIELD_FLOAT_SEPARATOR,
+			dlg_format_text_do(term, dlg_data, INPUTFIELD_FLOAT_SEPARATOR,
 					   x + label_width, y, w, rw,
 					   text_color, ALIGN_LEFT, format_only);
 			w -= INPUTFIELD_FLOAT_SEPARATOR_LEN + INPUTFIELD_FLOATLABEL_PADDING;
@@ -765,7 +765,7 @@ input_line_layouter(struct dialog_data *dlg_data)
 		- ses->status.show_status_bar
 		- ses->status.show_tabs_bar;
 
-	dlg_format_field(win->term, dlg_data->widgets_data, 0,
+	dlg_format_field(win->term, dlg_data, dlg_data->widgets_data, 0,
 			 &y, win->term->width, NULL, ALIGN_LEFT, 0);
 }
 
diff --git a/src/bfu/inpfield.h b/src/bfu/inpfield.h
index d45a902..fb2270e 100644
--- a/src/bfu/inpfield.h
+++ b/src/bfu/inpfield.h
@@ -62,7 +62,7 @@ extern const struct widget_ops field_pass_ops;
 widget_handler_status_T check_number(struct dialog_data *, struct widget_data *);
 widget_handler_status_T check_nonempty(struct dialog_data *, struct widget_data *);
 
-void dlg_format_field(struct terminal *, struct widget_data *, int, int *, int, int *, enum format_align, int format_only);
+void dlg_format_field(struct terminal *, struct dialog_data *, struct widget_data *, int, int *, int, int *, enum format_align, int format_only);
 
 void input_field(struct terminal *, struct memory_list *, int, unsigned char *,
 		 unsigned char *, unsigned char *, unsigned char *, void *,
diff --git a/src/bfu/listbox.c b/src/bfu/listbox.c
index 2e27aba..c4a4160 100644
--- a/src/bfu/listbox.c
+++ b/src/bfu/listbox.c
@@ -41,7 +41,8 @@ get_listbox_widget_data(struct widget_data *widget_data)
 
 /* Layout for generic boxes */
 void
-dlg_format_listbox(struct terminal *term, struct widget_data *widget_data,
+dlg_format_listbox(struct terminal *term, struct dialog_data *dlg_data,
+		   struct widget_data *widget_data,
 	           int x, int *y, int w, int max_height, int *rw,
 	           enum format_align align, int format_only)
 {
diff --git a/src/bfu/listbox.h b/src/bfu/listbox.h
index c3599e5..63b8be4 100644
--- a/src/bfu/listbox.h
+++ b/src/bfu/listbox.h
@@ -133,7 +133,7 @@ struct listbox_item {
 
 extern const struct widget_ops listbox_ops;
 
-void dlg_format_listbox(struct terminal *, struct widget_data *, int, int *, int, int, int *, enum format_align, int format_only);
+void dlg_format_listbox(struct terminal *, struct dialog_data *, struct widget_data *, int, int *, int, int, int *, enum format_align, int format_only);
 
 struct listbox_item *traverse_listbox_items_list(struct listbox_item *, struct listbox_data *, int, int, int (*)(struct listbox_item *, void *, int *), void *);
 
diff --git a/src/bfu/text.c b/src/bfu/text.c
index e8be019..c1bfc4c 100644
--- a/src/bfu/text.c
+++ b/src/bfu/text.c
@@ -211,7 +211,8 @@ split_lines(struct widget_data *widget_data, int max_width)
 
 /* Format text according to dialog box and alignment. */
 void
-dlg_format_text_do(struct terminal *term, unsigned char *text,
+dlg_format_text_do(struct terminal *term, struct dialog_data *dlg_data,
+		unsigned char *text,
 		int x, int *y, int width, int *real_width,
 		struct color_pair *color, enum format_align align,
 		int format_only)
@@ -260,7 +261,8 @@ dlg_format_text_do(struct terminal *term, unsigned char *text,
 }
 
 void
-dlg_format_text(struct terminal *term, struct widget_data *widget_data,
+dlg_format_text(struct terminal *term, struct dialog_data *dlg_data,
+		struct widget_data *widget_data,
 		int x, int *y, int width, int *real_width, int max_height,
 		int format_only)
 {
@@ -335,7 +337,7 @@ dlg_format_text(struct terminal *term, struct widget_data *widget_data,
 		widget_data->info.text.current = 0;
 	}
 
-	dlg_format_text_do(term, text,
+	dlg_format_text_do(term, dlg_data, text,
 		x, y, width, real_width,
 		get_bfu_color(term, "dialog.text"),
 		widget_data->widget->info.text.align, format_only);
@@ -423,7 +425,7 @@ format_and_display_text(struct widget_data *widget_data,
 	draw_box(term, &widget_data->box, ' ', 0,
 		 get_bfu_color(term, "dialog.generic"));
 
-	dlg_format_text(term, widget_data,
+	dlg_format_text(term, dlg_data, widget_data,
 			widget_data->box.x, &y, widget_data->box.width, NULL,
 			height, 0);
 
diff --git a/src/bfu/text.h b/src/bfu/text.h
index 8dd3365..b181c1a 100644
--- a/src/bfu/text.h
+++ b/src/bfu/text.h
@@ -4,6 +4,7 @@
 #include "util/color.h"
 
 struct dialog;
+struct dialog_data;
 struct terminal;
 
 struct widget_info_text	{
@@ -45,12 +46,12 @@ void add_dlg_text(struct dialog *dlg, unsigned char *text,
 		  enum format_align align, int bottom_pad);
 
 extern const struct widget_ops text_ops;
-void dlg_format_text_do(struct terminal *term,
+void dlg_format_text_do(struct terminal *term, struct dialog_data *dlg_data,
 		    unsigned char *text, int x, int *y, int w, int *rw,
 		    struct color_pair *scolor, enum format_align align, int format_only);
 
 void
-dlg_format_text(struct terminal *term, struct widget_data *widget_data,
+dlg_format_text(struct terminal *term, struct dialog_data *dlg_data, struct widget_data *widget_data,
 		int x, int *y, int dlg_width, int *real_width, int height, int format_only);
 
 #define text_is_scrollable(widget_data) \
diff --git a/src/dialogs/download.c b/src/dialogs/download.c
index 0116578..b90f047 100644
--- a/src/dialogs/download.c
+++ b/src/dialogs/download.c
@@ -157,7 +157,7 @@ download_dialog_layouter(struct dialog_data *dlg_data)
 		int_lower_bound(&w, DOWN_DLG_MIN);
 	}
 
-	dlg_format_text_do(term, url, 0, &y, w, &rw,
+	dlg_format_text_do(term, dlg_data, url, 0, &y, w, &rw,
 			dialog_text_color, ALIGN_LEFT, 1);
 
 	y++;
@@ -166,11 +166,11 @@ download_dialog_layouter(struct dialog_data *dlg_data)
 #if CONFIG_BITTORRENT
 	if (bittorrent) y += 2;
 #endif
-	dlg_format_text_do(term, msg, 0, &y, w, &rw,
+	dlg_format_text_do(term, dlg_data, msg, 0, &y, w, &rw,
 			dialog_text_color, ALIGN_LEFT, 1);
 
 	y++;
-	dlg_format_buttons(term, dlg_data->widgets_data,
+	dlg_format_buttons(term, dlg_data, dlg_data->widgets_data,
 			   dlg_data->number_of_widgets, 0, &y, w,
 			   &rw, ALIGN_CENTER, 1);
 
@@ -190,7 +190,7 @@ download_dialog_layouter(struct dialog_data *dlg_data)
 
 	y = dlg_data->box.y + DIALOG_TB + 1;
 	x = dlg_data->box.x + DIALOG_LB;
-	dlg_format_text_do(term, url, x, &y, w, NULL,
+	dlg_format_text_do(term, dlg_data, url, x, &y, w, NULL,
 			dialog_text_color, ALIGN_LEFT, 0);
 
 	if (show_meter) {
@@ -207,11 +207,11 @@ download_dialog_layouter(struct dialog_data *dlg_data)
 	}
 #endif
 	y++;
-	dlg_format_text_do(term, msg, x, &y, w, NULL,
+	dlg_format_text_do(term, dlg_data, msg, x, &y, w, NULL,
 			dialog_text_color, ALIGN_LEFT, 0);
 
 	y++;
-	dlg_format_buttons(term, dlg_data->widgets_data,
+	dlg_format_buttons(term, dlg_data, dlg_data->widgets_data,
 			   dlg_data->number_of_widgets, x, &y, w,
 			   NULL, ALIGN_CENTER, 0);
 


Index: elinks.spec
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- elinks.spec	15 Jul 2008 12:39:21 -0000	1.57
+++ elinks.spec	1 Sep 2008 10:51:01 -0000	1.58
@@ -1,7 +1,7 @@
 Name:      elinks
 Summary:   A text-mode Web browser
 Version:   0.12
-Release:   0.3.pre1%{?dist}
+Release:   0.4.pre1%{?dist}
 License:   GPLv2
 URL:       http://elinks.or.cz
 Group:     Applications/Internet
@@ -29,6 +29,8 @@
 Patch6: elinks-0.11.0-union.patch
 Patch7: elinks-0.11.3-macropen.patch
 Patch8: elinks-0.12pre1-tabreload.patch
+Patch9: elinks-0.12-bittorrent.patch
+Patch10: elinks-scroll.patch
 
 %description
 Links is a text-based Web browser. Links does not display any images,
@@ -56,6 +58,10 @@
 %patch7 -p1
 # upstream fix for opening tab during reload
 %patch8 -p1
+#upstream fix for bittorrent
+%patch9 -p1
+#upstream fix for out of screen dialogs
+%patch10 -p1
 
 %build
 ./autogen.sh
@@ -86,6 +92,10 @@
 %{_mandir}/man5/*
 
 %changelog
+* Mon Sep  1 2008 Ondrej Vasik <ovasik at redhat.com> 0.12-0.4.pre1
+- upstream fix for bittorrent protocol
+- upstream fix for out of screen bittorrent dialog texts
+
 * Tue Jul 15 2008 Ondrej Vasik <ovasik at redhat.com> 0.12-0.3.pre1
 - get rid off fuzz in patches
 



From varekova at fedoraproject.org  Mon Sep  1 10:54:01 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon,  1 Sep 2008 10:54:01 +0000 (UTC)
Subject: rpms/bzip2/devel bzip2.spec,1.38,1.39
Message-ID: <20080901105401.CDEB27011A@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	bzip2.spec 
Log Message:
minor spec change again



Index: bzip2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzip2/devel/bzip2.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- bzip2.spec	1 Sep 2008 10:30:41 -0000	1.38
+++ bzip2.spec	1 Sep 2008 10:53:31 -0000	1.39
@@ -50,12 +50,12 @@
 %build
 
 make -f Makefile-libbz2_so "CC=%{__cc} AR=%{__ar} RANLIB=%{__ranlib} \
-	CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -fpic -fPIC" \
+	CFLAGS=\"$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -fpic -fPIC\" \
 	%{?_smp_mflags} all"
 
 rm -f *.o
 make "CC=%{__cc} AR=%{__ar} RANLIB=%{__ranlib} \
-	CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" \
+	CFLAGS=\"$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64\" \
 	%{?_smp_mflags} all"
 
 %install



From kwizart at fedoraproject.org  Mon Sep  1 11:00:29 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon,  1 Sep 2008 11:00:29 +0000 (UTC)
Subject: rpms/filezilla/devel filezilla.spec, 1.19, 1.20 .cvsignore, 1.14,
	1.15 sources, 1.18, 1.19
Message-ID: <20080901110029.802207011A@cvs1.fedora.phx.redhat.com>

Author: kwizart

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

Modified Files:
	filezilla.spec .cvsignore sources 
Log Message:
- Update to 3.1.2



Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- filezilla.spec	14 Aug 2008 09:31:34 -0000	1.19
+++ filezilla.spec	1 Sep 2008 10:59:59 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           filezilla
-Version:        3.1.1.1
+Version:        3.1.2
 Release:        1%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
@@ -117,6 +117,9 @@
 
 
 %changelog
+* Mon Sep  1 2008 kwizart < kwizart at gmail.com > - 3.1.2-1
+- Update to 3.1.2
+
 * Thu Aug 14 2008 kwizart < kwizart at gmail.com > - 3.1.1.1-1
 - Update to 3.1.1.1
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	11 Aug 2008 12:44:00 -0000	1.14
+++ .cvsignore	1 Sep 2008 10:59:59 -0000	1.15
@@ -1 +1 @@
-FileZilla_3.1.1_src.tar.bz2
+FileZilla_3.1.2_src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	14 Aug 2008 09:56:55 -0000	1.18
+++ sources	1 Sep 2008 10:59:59 -0000	1.19
@@ -1 +1 @@
-ba453a5007c38c68381814f42e4e834c  FileZilla_3.1.1.1_src.tar.bz2
+3fbd78bf631ebc82ba981e5a75cab481  FileZilla_3.1.2_src.tar.bz2



From varekova at fedoraproject.org  Mon Sep  1 11:25:24 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon,  1 Sep 2008 11:25:24 +0000 (UTC)
Subject: rpms/gmp/devel gmp-4.0.1-s390.patch,1.3,1.4 gmp.spec,1.51,1.52
Message-ID: <20080901112524.4D8F67011A@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	gmp-4.0.1-s390.patch gmp.spec 
Log Message:
update patch


gmp-4.0.1-s390.patch:

Index: gmp-4.0.1-s390.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gmp/devel/gmp-4.0.1-s390.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gmp-4.0.1-s390.patch	9 Sep 2004 05:21:57 -0000	1.3
+++ gmp-4.0.1-s390.patch	1 Sep 2008 11:24:52 -0000	1.4
@@ -1,17 +1,6 @@
---- gmp-4.0.1/mpn/s390/gmp-mparam.h.s390	Wed May 15 21:32:57 2002
-+++ gmp-4.0.1/mpn/s390/gmp-mparam.h	Wed May 15 21:33:21 2002
-@@ -20,7 +20,8 @@
- MA 02111-1307, USA. */
- 
- 
--/* BITS_PER_MP_LIMB etc generated by configure */
-+#define BITS_PER_MP_LIMB 32
-+#define BYTES_PER_MP_LIMB 4
- 
- 
- /* Generated by tuneup.c, 2001-09-26, gcc 2.95 */
---- ./mpn/s390x/gmp-mparam.h
-+++ ./mpn/s390x/gmp-mparam.h
+diff -up /dev/null gmp-4.2.2/mpn/s390x/gmp-mparam.h
+--- /dev/null	2008-09-01 10:12:52.609021969 +0200
++++ gmp-4.2.2/mpn/s390x/gmp-mparam.h	2008-09-01 13:04:05.000000000 +0200
 @@ -0,0 +1,27 @@
 +/* gmp-mparam.h -- Compiler/machine parameter header file.
 +
@@ -40,12 +29,26 @@
 +#define BITS_PER_INT 32
 +#define BITS_PER_SHORTINT 16
 +#define BITS_PER_CHAR 8
---- ./configure.in
-+++ ./configure.in
-@@ -620,6 +620,11 @@
+diff -up gmp-4.2.2/mpn/s390/gmp-mparam.h.s390 gmp-4.2.2/mpn/s390/gmp-mparam.h
+--- gmp-4.2.2/mpn/s390/gmp-mparam.h.s390	2007-08-30 20:31:41.000000000 +0200
++++ gmp-4.2.2/mpn/s390/gmp-mparam.h	2008-09-01 13:04:05.000000000 +0200
+@@ -18,7 +18,8 @@ You should have received a copy of the G
+ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
+ 
+ 
+-/* BITS_PER_MP_LIMB etc generated by configure */
++#define BITS_PER_MP_LIMB 32
++#define BYTES_PER_MP_LIMB 4
+ 
+ 
+ /* Generated by tuneup.c, 2001-12-03, gcc 2.95 */
+diff -up gmp-4.2.2/configure.in.s390 gmp-4.2.2/configure.in
+--- gmp-4.2.2/configure.in.s390	2007-09-09 18:39:14.000000000 +0200
++++ gmp-4.2.2/configure.in	2008-09-01 13:04:05.000000000 +0200
+@@ -1054,6 +1054,11 @@ case $host in
      ;;
-
-
+ 
+ 
 +  s390x-*-*)
 +    gcc_cflags="-g -O2 $fomit_frame_pointer"
 +    path="s390x"
@@ -53,4 +56,4 @@
 +    ;;
    # IBM s/370 and similar
    [s3[6-9]0*-*-*])
-     gcc_cflags="-g -O2 $fomit_frame_pointer"
+     gcc_cflags="-O2 $fomit_frame_pointer"


Index: gmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmp/devel/gmp.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gmp.spec	24 Apr 2008 21:50:18 -0000	1.51
+++ gmp.spec	1 Sep 2008 11:24:53 -0000	1.52
@@ -61,7 +61,7 @@
 
 %prep
 %setup -q 
-%patch0 -p1
+%patch0 -p1 -b .s390
 %patch2 -p1
 %patch3 -p1 -b .std
 



From varekova at fedoraproject.org  Mon Sep  1 11:33:30 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon,  1 Sep 2008 11:33:30 +0000 (UTC)
Subject: rpms/bzip2/devel bzip2.spec,1.39,1.40
Message-ID: <20080901113330.ACFED7011A@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	bzip2.spec 
Log Message:
minor spec change (again)



Index: bzip2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzip2/devel/bzip2.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- bzip2.spec	1 Sep 2008 10:53:31 -0000	1.39
+++ bzip2.spec	1 Sep 2008 11:33:00 -0000	1.40
@@ -49,13 +49,13 @@
 
 %build
 
-make -f Makefile-libbz2_so "CC=%{__cc} AR=%{__ar} RANLIB=%{__ranlib} \
-	CFLAGS=\"$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -fpic -fPIC\" \
+make -f Makefile-libbz2_so CC="%{__cc}" AR="%{__ar}" RANLIB="%{__ranlib}" \
+	CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -fpic -fPIC" \
 	%{?_smp_mflags} all"
 
 rm -f *.o
-make "CC=%{__cc} AR=%{__ar} RANLIB=%{__ranlib} \
-	CFLAGS=\"$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64\" \
+make CC="%{__cc}" AR="%{__ar}" RANLIB="%{__ranlib}" \
+	CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" \
 	%{?_smp_mflags} all"
 
 %install



From kwizart at fedoraproject.org  Mon Sep  1 11:34:47 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon,  1 Sep 2008 11:34:47 +0000 (UTC)
Subject: rpms/PerceptualDiff/devel sources, 1.2, 1.3 .cvsignore, 1.2,
	1.3 PerceptualDiff.spec, 1.4, 1.5
Message-ID: <20080901113447.699D17011A@cvs1.fedora.phx.redhat.com>

Author: kwizart

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

Modified Files:
	sources .cvsignore PerceptualDiff.spec 
Log Message:
Update to 1.0.2



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PerceptualDiff/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Apr 2007 12:07:51 -0000	1.2
+++ sources	1 Sep 2008 11:34:17 -0000	1.3
@@ -1 +1 @@
-2f7d90f478036bb2184663e56e8b1d3b  PerceptualDiff-1.0.1.tar.gz
+c4c20697183414f30b9122bad99c96c7  PerceptualDiff-1.0.2.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PerceptualDiff/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Apr 2007 12:07:51 -0000	1.2
+++ .cvsignore	1 Sep 2008 11:34:17 -0000	1.3
@@ -1 +1 @@
-PerceptualDiff-1.0.1.tar.gz
+PerceptualDiff-1.0.2.tar.gz


Index: PerceptualDiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PerceptualDiff/devel/PerceptualDiff.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PerceptualDiff.spec	9 Feb 2008 14:49:01 -0000	1.4
+++ PerceptualDiff.spec	1 Sep 2008 11:34:17 -0000	1.5
@@ -1,6 +1,6 @@
 Name:			PerceptualDiff          
-Version:		1.0.1
-Release:		8%{?dist}
+Version:		1.0.2
+Release:		1%{?dist}
 Summary:		An image comparison utility
 
 Group:			Applications/Multimedia
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Mon Sep  1 2008 kwizart < kwizart at gmail.com > - 1.0.2-1
+- Update to 1.0.2
+
 * Sat Feb  9 2008 kwizart < kwizart at gmail.com > - 1.0.1-8
 - Rebuild for gcc43
 



From kwizart at fedoraproject.org  Mon Sep  1 11:40:18 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon,  1 Sep 2008 11:40:18 +0000 (UTC)
Subject: rpms/PerceptualDiff/devel PerceptualDiff.spec, 1.5,
	1.6 PerceptualDiff-1.0.1-gcc43.patch, 1.2, NONE
Message-ID: <20080901114018.37A577011A@cvs1.fedora.phx.redhat.com>

Author: kwizart

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

Modified Files:
	PerceptualDiff.spec 
Removed Files:
	PerceptualDiff-1.0.1-gcc43.patch 
Log Message:
- Remove merged gcc43 patch



Index: PerceptualDiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PerceptualDiff/devel/PerceptualDiff.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PerceptualDiff.spec	1 Sep 2008 11:34:17 -0000	1.5
+++ PerceptualDiff.spec	1 Sep 2008 11:39:47 -0000	1.6
@@ -7,7 +7,6 @@
 License:		GPLv2+
 URL:			http://pdiff.sourceforge.net
 Source:			http://downloads.sourceforge.net/pdiff/%{name}-%{version}.tar.gz
-Patch0:                 PerceptualDiff-1.0.1-gcc43.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libtiff-devel, libpng-devel, cmake
@@ -22,12 +21,9 @@
 
 %prep
 %setup -q
-sed -i 's/\r//' gpl.txt
-sed -i 's/\r//' README.txt
 sed -i 's/\r//' LPyramid.cpp
 sed -i 's/\r//' LPyramid.h
 chmod 0644 *
-%patch0 -p1 -b .gcc43
 
 
 %build
@@ -66,6 +62,7 @@
 %changelog
 * Mon Sep  1 2008 kwizart < kwizart at gmail.com > - 1.0.2-1
 - Update to 1.0.2
+- Remove merged gcc43 patch
 
 * Sat Feb  9 2008 kwizart < kwizart at gmail.com > - 1.0.1-8
 - Rebuild for gcc43


--- PerceptualDiff-1.0.1-gcc43.patch DELETED ---



From sharkcz at fedoraproject.org  Mon Sep  1 11:51:14 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon,  1 Sep 2008 11:51:14 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff, 
	NONE, 1.1 cyrus-imapd-2.3.12p2-autosieve-0.6.0.diff, NONE,
	1.1 .cvsignore, 1.11, 1.12 cyrus-imapd.spec, 1.41, 1.42 sources,
	1.13, 1.14 cyrus-imapd-2.2.10-groupcache.patch, 1.1,
	NONE cyrus-imapd-2.3.11-autocreate-0.10-0.diff, 1.1,
	NONE cyrus-imapd-2.3.11-autosieve-0.6.0.diff, 1.1,
	NONE cyrus-imapd-2.3.7.tar.gz.sig, 1.1, NONE
Message-ID: <20080901115114.9DC8F7011A@cvs1.fedora.phx.redhat.com>

Author: sharkcz

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

Modified Files:
	.cvsignore cyrus-imapd.spec sources 
Added Files:
	cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff 
	cyrus-imapd-2.3.12p2-autosieve-0.6.0.diff 
Removed Files:
	cyrus-imapd-2.2.10-groupcache.patch 
	cyrus-imapd-2.3.11-autocreate-0.10-0.diff 
	cyrus-imapd-2.3.11-autosieve-0.6.0.diff 
	cyrus-imapd-2.3.7.tar.gz.sig 
Log Message:
* Mon Sep  1 2008 Dan Hor??k <dan[at]danny.cz - 2.3.12p2-1
- update to new upstream version 2.3.12p2
- update patches


cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff:

--- NEW FILE cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff ---
diff -Naur cyrus-imapd-2.3.12p2/README.autocreate cyrus-imapd-2.3.12p2-autocreate.uncompiled/README.autocreate
--- cyrus-imapd-2.3.12p2/README.autocreate	1970-01-01 02:00:00.000000000 +0200
+++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/README.autocreate	2008-05-06 14:48:41.000000000 +0300
@@ -0,0 +1,211 @@
+Cyrus IMAP autocreate Inbox patch
+----------------------------------
+
+NOTE : This patch has been created at the University of Athens. For more info, as well 
+as more patches on Cyrus IMAPD server, please visit http://email.uoa.gr/ 
+
+The design of Cyrus IMAP server does not predict the automatic creation of users'
+INBOX folders. The creation of a user's INBOX is considered to be an external task,
+that has to be completed as part of the user email account creation procedure. 
+Hence, to create a new email account the site administrator has to:
+
+  a) Include the new account in the user database for the authentication procedure
+     (e.g. sasldb, shadow, mysql, ldap).
+  b) Create the corresponding INBOX folder. 
+
+Alternatively, the user, if succesfully authenticated, may create his own INBOX folder,
+as long as the configuration of the site allows it (see "autocreatequota" in imapd.conf).
+Unlike what not careful readers may think, enabling the "autocreatequota" option, doesn't 
+lead to the automatic INBOX folder creation by Cyrus IMAP server.
+In fact, "autocreate" means that the IMAP clients are allowed to automatically create 
+the user INBOX. 
+
+This patch adds the functionality of automatic creation of the users' INBOX folders into
+the Cyrus IMAP server. It is implemented as two features, namely the  "create on login"
+and "create on post".
+ 
+
+
+Create on login
+===============
+This feauture provides automatic creation of a user's INBOX folder when all of the 
+following requirements are met:
+
+i)  The user has succesfully passed the authentication procedure.
+
+ii) The user's authorisation ID (typically the same as the user's
+authentication ID)  doesn't belong to the imap_admins or admins
+accounts (see imapd.conf).
+
+iii) The "autocreatequota" option in the imap configuration file 
+has been set to a non zero value. 
+
+iv) The corresponding to the user's authorisation ID INBOX folder
+does not exist.
+
+The user's first login is the most typical case when all four requirements are met. 
+Note that if the authenticated ID is allowed to proxy to another account for which 
+all of the above requirements are met, the corresponding INBOX folder for that account 
+will be created.
+
+
+
+Create on post
+==============
+This feauture provides automatic creation of a user's INBOX folder when all of the 
+following requirements are met. 
+
+i) An email message addressed to the user has been received.  
+
+ii) The recipient is not any of the imap_admins or admins accounts. 
+Note that passing emails to admins or imap_admins accounts from 
+the MTA to LMTP should be avoided in any case.
+
+iii) The recipient's INBOX does not exist.
+
+iv) The "autocreatequota" option in the imap configuration file 
+has been set to a non zero value. 
+
+v) The "createonpost" option in the imap configuration file 
+has been switched on. 
+
+
+Besides the automatic creation of INBOX folder, additional functionalities are
+provided:
+
+  (A) Automatic creation of INBOX subfolders controlled by "autocreateinboxfolders"
+configuration option. eg 
+
+autocreateinboxfolders: sent|drafts|spam|templates
+
+  (B) Automatic subscription of INBOX subfolders controlled by "autosubscribeinboxfolders"
+configuration option. eg
+
+autosubscribeinboxfolders: sent|spam
+
+Obviously, only subscription to subfolders included in the "autocreateinboxfolder"
+list is meaningful. 
+
+  (C) Automatic subscription to shared folders (bulletin boards). The user gets
+automatically subscribed to the shared folders declared in the "autosubscribesharedfolders"
+configuration option in imapd.conf.
+eg autosubscribesharedfolders: public_folder | public_folder.subfolder
+
+In order the above action to succeed, the shared folder has to pre-exist the INBOX creation
+and the user must have the appropriate permissions in order to be able to subscribe to the
+shared folder.
+
+* A new config option has been added. 'autosubscribe_all_sharedfolders' is a yes/no
+option. When set to yes, the user is automatically subscribed to all shared folders one 
+has permission to subscribe to. Please, note that when this option is set to yes, then
+'autosubscribesharedfolders' option is overriden.
+
+  (D) Automatic creation of a predefined default sieve script.
+
+This is very useful when a default sieve script is used for every user. Usually, a
+default anti-spam script may me be written in a file and copied to each user
+sieve scripts upon the INBOX creation. The imapd.conf options that have been added
+are 'autocreate_sieve_script', 'autocreate_sieve_compiledscript' and 
+'generate_compiled_sieve_script'. 
+
+autocreate_sieve_script configuration option refers to the full path of the file 
+that contains the sieve script. The default value is null and if no file is defined,
+then no default script is created upon INBOX creation. (The feature is disabled)
+eg autocreate_sieve_script: /etc/default_sieve_script
+
+autocreate_sieve_compiledscript configuration option refers to the full path of the
+file that contains the bytecode compiled sieve script. If this filename is defined
+in imapd.conf and the file exists, then it is automatically copied in the user's sieve
+directory. If it is not defined, then a bytecode sieve script gets on the fly compiled
+by the daemon. 
+eg autocreate_sieve_compiledscript: /etc/default_sieve_script.bc
+
+generate_compiled_sieve_script is a boolean option that triggers the compilation of the 
+source sieve script to bytecode sieve script. The file that the bytecode script will
+be saved is pointed by autocreate_sieve_compiledscript.
+
+Ways of compiling a sieve script : 
+1. Compile a sieve script using the standard sievec utility, distributed by CMU
+2. Compile a sieve script using the compile_sieve utility, released by UoA. This 
+   tool is almost identical to the sievec utility, with the difference that it 
+   reads the input and output file from autocreate_sieve_script and 
+   autocreate_sieve_compiledscript options in imapd.conf
+3. Let cyrus create a compiled sieve script using a source script. Cyrus can be
+   instructed to save the compiled script any time a compiled script does not exist.
+
+NOTES : 
+1. In order this functionality to work, the following requirements must have been met:
+   - 'sieveusehomedir' option must be 'no' in the configuration (default).
+   - 'sievedir' option must have a valid value.
+2. Currently, this patch checks the validity of the source script while generating a 
+   bytecode compiled script, but not the validity of the bytecode sieve script file.
+   The administrator should make sure that the provided files contain a valid sieve
+   script as well as the compiled script is updated every time the source script changes.
+
+
+  (E) The administrator may control for which users and/or groups may the INBOXes 
+automatically be created. The autocreate_users option restricts the groups
+for which the patch will create the mailboxes. 
+
+The default value of autocreate_users is anyone. So, if not set at all, the patch will 
+work for all users. However, one may set:
+
+autocreate_users: user1 user2 group:group1 group:group2
+
+In that case, the INBOX will be created only for user1, user2 and the users that belong 
+to group1 and group2. 
+
+More refined control per service is provided by the options imap_autocreate_users,
+pop3_autocreate_users and lmtp_autocreate_users. These options override the 
+autocreate_users option and offer per service control.
+
+Example: 
+One may want to restrict the create on post functionality only for a specific group
+of users. To achieve this, the following lines must be added in the imapd.conf file:
+
+createonpost: yes
+lmtp_autocreate_users: group:groupname
+
+
+
+Issues to be considered 
+=======================
+
+I) In order to use the create on post feauture one should be absolutely sure that: 
+a) The MTA checks the validity of the email recipient before sending the email to
+LMTP. This is an RFC821 requirement. This usually expands to "the mta should be 
+able to use the account database as user mailbox database". 
+b) Only authorised accounts/services can talk to LMTP.
+
+II) Especially in the case of imap logins, the current patch implementation checks
+for the INBOX folder existence upon login, causing an extra mailbox lookup in most 
+of the cases. 
+A better approach would be to chase the "IMAP_MAILBOX_NONEXISTENT" error code and
+check if the error is associated with an INBOX folder. However, this would mess up
+Cyrus code. The way it was implemented may not have been the most performance
+optimised, but it produces a much cleaner and simple patch.
+
+
+
+Virtual Domains Support
+=======================
+
+Virtual domains are supported by all versions of the patch for cyrus-imapd-2.2.1-BETA and 
+later. However, it is not possible to declare different INBOX subfolders to be created or 
+shared folders to be subscribed to for every domain.
[...1987 lines suppressed...]
+
 #endif
 
 struct auth_mech auth_krb = 
@@ -381,4 +397,5 @@
     &mymemberof,
     &mynewstate,
     &myfreestate,
+    &mycanonuser,
 };
diff -Naur cyrus-imapd-2.3.12p2/lib/auth_krb5.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_krb5.c
--- cyrus-imapd-2.3.12p2/lib/auth_krb5.c	2008-03-24 19:43:08.000000000 +0200
+++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_krb5.c	2008-05-06 14:48:41.000000000 +0300
@@ -199,6 +199,14 @@
     free(auth_state);
 }
 
+static char *mycanonuser(struct auth_state *auth_state)
+{
+    if (auth_state)
+       return auth_state->userid;
+
+    return NULL;
+}
+
 #else /* HAVE_GSSAPI_H */
 
 static int mymemberof(
@@ -230,6 +238,12 @@
 	fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG);
 }
 
+static char *mycanonuser(
+    struct auth_state *auth_state __attribute__((unused)))
+{
+        fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG);
+}
+
 #endif
 
 struct auth_mech auth_krb5 = 
@@ -240,4 +254,5 @@
     &mymemberof,
     &mynewstate,
     &myfreestate,
+    &mycanonuser,
 };
diff -Naur cyrus-imapd-2.3.12p2/lib/auth_pts.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_pts.c
--- cyrus-imapd-2.3.12p2/lib/auth_pts.c	2008-03-24 19:43:08.000000000 +0200
+++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_pts.c	2008-05-06 14:48:41.000000000 +0300
@@ -512,6 +512,14 @@
     free(auth_state);
 }
 
+static char *mycanonuser(struct auth_state *auth_state)
+{
+    if (auth_state)
+       return auth_state->userid.id;
+
+    return NULL;
+}
+
 struct auth_mech auth_pts = 
 {
     "pts",		/* name */
@@ -520,4 +528,5 @@
     &mymemberof,
     &mynewstate,
     &myfreestate,
+    &mycanonuser,
 };
diff -Naur cyrus-imapd-2.3.12p2/lib/auth_unix.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_unix.c
--- cyrus-imapd-2.3.12p2/lib/auth_unix.c	2008-03-24 19:43:08.000000000 +0200
+++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_unix.c	2008-05-06 14:48:41.000000000 +0300
@@ -312,6 +312,16 @@
     free((char *)auth_state);
 }
 
+static char *mycanonuser(auth_state)
+    struct auth_state *auth_state;
+{
+    if (auth_state)
+         return auth_state->userid;
+
+    return NULL;
+}
+
+
 
 struct auth_mech auth_unix = 
 {
@@ -321,4 +331,5 @@
     &mymemberof,
     &mynewstate,
     &myfreestate,
+    &mycanonuser,
 };
diff -Naur cyrus-imapd-2.3.12p2/lib/imapoptions cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/imapoptions
--- cyrus-imapd-2.3.12p2/lib/imapoptions	2008-04-11 23:07:00.000000000 +0300
+++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/imapoptions	2008-05-06 14:48:41.000000000 +0300
@@ -198,6 +198,55 @@
 /* Number of seconds to wait before returning a timeout failure when
    performing a client connection (e.g. in a murder environment) */
 
+{ "createonpost", 0, SWITCH }
+/* If yes, when lmtpd receives an incoming mail for an INBOX that does not exist,
+   then the INBOX is automatically created by lmtpd. */
+
+{ "autocreateinboxfolders", NULL, STRING }
+/* If a user does not have an INBOX created then the INBOX as well as some INBOX 
+   subfolders are created under two conditions.
+     1. The user logins via the IMAP or the POP3 protocol. (autocreatequota option must have a nonzero value)
+     2. A message arrives for the user through the LMTPD protocol.(createonpost option must be yes)
+   autocreateinboxfolders is a list of INBOX's subfolders separated by a "|", that 
+   are automatically created by the server under the previous two situations. */
+
+{ "autosubscribeinboxfolders", NULL, STRING }
+/* A list of folder names, separated by "|", that the users get automatically subscribed to, 
+   when their INBOX is created. These folder names must have been included in the 
+   autocreateinboxfolders option of the imapd.conf. */
+
+{ "autosubscribesharedfolders", NULL, STRING }
+/* A list of shared folders (bulletin boards), separated by "|", that the users get
+   automatically subscribed to, after their INBOX is created. The shared folder must 
+   have been created and the user must have the required permissions to get subscribed 
+   to it. Otherwise, subscribing to the shared folder fails. */
+
+{ "autosubscribe_all_sharedfolders", 0, SWITCH }
+/* If set to yes, the user is automatically subscribed to all shared folders, one has permission
+   to subscribe to. */
+
+{ "autocreate_sieve_script", NULL, STRING }
+/* The full path of a file that contains a sieve script. This script automatically becomes a
+   user's initial default sieve filter script. When this option is not defined, no default 
+   sieve filter is created. The file must be readable by the cyrus daemon. */
+
+{ "autocreate_sieve_compiledscript", NULL, STRING }
+/* The full path of a file that contains a compiled in bytecode sieve script. This script 
+   automatically becomes a user's initial default sieve filter script.  If this option is 
+   not specified, or the filename doesn't exist then the script defined by 
+   autocreate_sieve_script is compiled on the fly and installed as the user's default
+   sieve script */
+
+{ "generate_compiled_sieve_script", 0, SWITCH }
+/* If set to yes and no compiled sieve script file exists, the sieve script which is 
+   compiled on the fly will be saved in the file name that autocreate_sieve_compiledscript 
+   option points to. In order a compiled script to be generated, autocreate_sieve_script and 
+   autocreate_sieve_compiledscript must have valid values */
+
+{ "autocreate_users", "anyone", STRING }
+/* A space separated list of users and/or groups that are allowed their INBOX to be
+   automatically created. */
+
 { "configdirectory", NULL, STRING }
 /* The pathname of the IMAP configuration directory.  This field is
    required. */
diff -Naur cyrus-imapd-2.3.12p2/notifyd/Makefile.in cyrus-imapd-2.3.12p2-autocreate.uncompiled/notifyd/Makefile.in
--- cyrus-imapd-2.3.12p2/notifyd/Makefile.in	2008-03-24 21:59:32.000000000 +0200
+++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/notifyd/Makefile.in	2008-05-06 14:48:41.000000000 +0300
@@ -71,10 +71,11 @@
 SERVICE=../master/service.o
 
 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
+SIEVE_LIBS = @SIEVE_LIBS@
 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
 LIB_WRAP = @LIB_WRAP@
 LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
-DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
+DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
 
 PURIFY=/usr/local/bin/purify
 PUREOPT=-best-effort
diff -Naur cyrus-imapd-2.3.12p2/notifyd/notifyd.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/notifyd/notifyd.c
--- cyrus-imapd-2.3.12p2/notifyd/notifyd.c	2008-03-24 21:59:32.000000000 +0200
+++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/notifyd/notifyd.c	2008-05-06 14:48:41.000000000 +0300
@@ -96,7 +96,7 @@
 
 #define NOTIFY_MAXSIZE 8192
 
-int do_notify()
+static int do_notify()
 {
     struct sockaddr_un sun_data;
     socklen_t sunlen = sizeof(sun_data);
diff -Naur cyrus-imapd-2.3.12p2/ptclient/Makefile.in cyrus-imapd-2.3.12p2-autocreate.uncompiled/ptclient/Makefile.in
--- cyrus-imapd-2.3.12p2/ptclient/Makefile.in	2008-03-24 20:34:22.000000000 +0200
+++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/ptclient/Makefile.in	2008-05-06 14:48:41.000000000 +0300
@@ -57,10 +57,11 @@
 AFS_LDFLAGS = @AFS_LDFLAGS@ @COM_ERR_LDFLAGS@
 AFS_LIBS = @AFS_LIBS@
 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
+SIEVE_LIBS = @SIEVE_LIBS@
 LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@
 LIB_SASL = @LIB_SASL@
 LIB_WRAP = @LIB_WRAP@
-DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
+DEPLIBS = ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ 
 UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o
 
 LDAP_LIBS=@LDAP_LIBS@

cyrus-imapd-2.3.12p2-autosieve-0.6.0.diff:

--- NEW FILE cyrus-imapd-2.3.12p2-autosieve-0.6.0.diff ---
diff -Naur cyrus-imapd-2.3.12p2/README.autosievefolder cyrus-imapd-2.3.12p2-autosieve.uncompiled/README.autosievefolder
--- cyrus-imapd-2.3.12p2/README.autosievefolder	1970-01-01 02:00:00.000000000 +0200
+++ cyrus-imapd-2.3.12p2-autosieve.uncompiled/README.autosievefolder	2008-05-06 15:16:21.000000000 +0300
@@ -0,0 +1,42 @@
+Cyrus IMAP autosievefolder patch
+----------------------------------
+
+NOTE : This patch has been created at the University of Athens. For more info, as well 
+as more patches on Cyrus IMAPD server, please visit http://email.uoa.gr 
+
+
+  When the lmtpd daemon receives an email message prior to delivering it to the 
+INBOX folder of the user, checks if the user has specified sieve filters. If the
+user has specified sieve filters the filters are evaluated. If the message matches
+any of the filters the action that is specified in the filter is executed. If the action 
+is FileInto it is stored in the subfolder specified in the filter. If the 
+subfolder doesn't exist then the message is sent to the INBOX folder of the user.
+
+  With this patch if the folder doesn't exist AND the name of the subfolder is 
+specified in the autosievefolders option, OR the anysievefolder is set to 
+yes in the cyrus-imap configuration file then the subfolder is created and the mail 
+is stored there.
+
+
+Check the following options of the imapd.conf file
+==================================================
+
+* anysievefolder : It must be "yes" in order to permit the autocreation of any 
+INBOX subfolder requested by a sieve filter, through the "fileinto" action. (default = no)
+* autosievefolders : It is a "|" separated list of subfolders of INBOX that will be 
+automatically created, if requested by a sieve filter, through the "fileinto" 
+action. (default = null)
+	i.e. autosievefolders: Junk | Spam
+
+WARNING: anysievefolder, takes precedence over autosievefolders . Which means that if 
+anysievefolder is set to "yes", cyrus will create any INBOX subfolder requested, no-matter what the value of autosievefolders is.
+
+
+Things to be done
+=================
+
+1. Support cyrus wildcards in the autosievefolders option. 
+
+
+For more information and updates please visit http://email.uoa.gr/projects/cyrus/autosievefolder
+
diff -Naur cyrus-imapd-2.3.12p2/imap/lmtp_sieve.c cyrus-imapd-2.3.12p2-autosieve.uncompiled/imap/lmtp_sieve.c
--- cyrus-imapd-2.3.12p2/imap/lmtp_sieve.c	2008-03-24 19:09:17.000000000 +0200
+++ cyrus-imapd-2.3.12p2-autosieve.uncompiled/imap/lmtp_sieve.c	2008-05-06 15:16:21.000000000 +0300
@@ -88,6 +88,9 @@
     struct auth_state *authstate;
 } script_data_t;
 
+static int autosieve_subfolder(char *userid, struct auth_state *auth_state,
+                               char *subfolder, struct namespace *namespace);
+
 static char *make_sieve_db(const char *user)
 {
     static char buf[MAX_MAILBOX_PATH+1];
@@ -484,7 +487,20 @@
 			      sd->username, mdata->notifyheader,
 			      namebuf, quotaoverride, 0);
     }
-
+    
+    if (ret == IMAP_MAILBOX_NONEXISTENT) {
+        /* if "plus" folder under INBOX, then try to create it */
+        ret = autosieve_subfolder((char *) sd->username, sd->authstate, namebuf, mdata->namespace);
+
+	/* Try to deliver the mail again. */
+        if (!ret)
+            ret = deliver_mailbox(md->f, mdata->content, mdata->stage, md->size,
+                                  fc->imapflags->flag, fc->imapflags->nflags,
+                                  (char *) sd->username, sd->authstate, md->id,
+                                  sd->username, mdata->notifyheader,
+                                  namebuf, quotaoverride, 0);
+    }
+    
     if (!ret) {
 	snmp_increment(SIEVE_FILEINTO, 1);
 	return SIEVE_OK;
@@ -935,3 +951,80 @@
        we'll do normal delivery */
     return r;
 }
+
+
+#define SEP '|'
+
+static int autosieve_subfolder(char *userid, struct auth_state *auth_state,
+                               char *subfolder, struct namespace *namespace)
+{
+     char option_name_external[MAX_MAILBOX_NAME + 1];
+     char option_name_internal[MAX_MAILBOX_NAME + 1];
+     const char *subf ;
+     char *p, *q, *next_subf;
+     int len, r = 0;
+     int createsievefolder = 0;
+
+    /* Check if subfolder or userid are NULL */
+    if(userid == NULL || subfolder == NULL)
+         return IMAP_MAILBOX_NONEXISTENT;
+
+    syslog(LOG_DEBUG, "autosievefolder: autosieve_subfolder() was called for user %s, folder %s", 
+		    userid, subfolder);
+
+    if (config_getswitch(IMAPOPT_ANYSIEVEFOLDER)) {
+         createsievefolder = 1;
+    } else if ((subf = config_getstring(IMAPOPT_AUTOSIEVEFOLDERS)) != NULL) {
+         /* Roll through subf */
+         next_subf = (char *) subf;
+         while (*next_subf) {
+              for (p = next_subf ; isspace((int) *p) || *p == SEP ; p++);
+              for (next_subf = p ; *next_subf && *next_subf != SEP ; next_subf++);
+              for (q = next_subf ; q > p && (isspace((int) *q) || *q == SEP || !*q); q--);
+
+              if (!*p) continue;
+                    
+              len = q - p + 1;
+             /*
+              * This is a preliminary length check based on the assumption
+              * that the *final* internal format will be something
+              * like user.userid.subfolder(s).
+              */
+              if (len > sizeof(option_name_external) - strlen(userid) - 5)
+                   return IMAP_MAILBOX_BADNAME;
+
+              strlcpy(option_name_external, namespace->prefix[NAMESPACE_INBOX], sizeof(option_name_external));
+	      strncat(option_name_external, p, len);
+                    
+              /* 
+               * Transform the option folder name to internal namespace and compare it
+	       * with what must be created.
+               */
+              r = namespace->mboxname_tointernal(namespace, option_name_external, userid, option_name_internal);
+              if (r) continue;
+
+              if (!strcmp(option_name_internal, subfolder)) {
+                  createsievefolder = 1;
+                  break;
+              }
+         }
+    }
+
+    if (createsievefolder) {
+        /* Folder is already in internal namespace format */
+        r = mboxlist_createmailbox(subfolder, MAILBOX_FORMAT_NORMAL, NULL,
+                                           1, userid, auth_state, 0, 0, 0);
+        if (!r) {
+            mboxlist_changesub(subfolder, userid, auth_state, 1, 1);
+            syslog(LOG_DEBUG, "autosievefolder: User %s, folder %s creation succeeded",
+                                                   userid, subfolder);
+            return 0;
+        } else {
+            syslog(LOG_ERR, "autosievefolder: User %s, folder %s creation failed. %s",
+                                                  userid, subfolder,error_message(r));
+            return r;
+        }
+    } else
+        return IMAP_MAILBOX_NONEXISTENT;
+}
+
diff -Naur cyrus-imapd-2.3.12p2/lib/imapoptions cyrus-imapd-2.3.12p2-autosieve.uncompiled/lib/imapoptions
--- cyrus-imapd-2.3.12p2/lib/imapoptions	2008-04-11 23:07:00.000000000 +0300
+++ cyrus-imapd-2.3.12p2-autosieve.uncompiled/lib/imapoptions	2008-05-06 15:16:21.000000000 +0300
@@ -942,6 +942,15 @@
 /* If enabled, lmtpd will look for Sieve scripts in user's home
    directories: ~user/.sieve. */
 
+{ "anysievefolder", 0, SWITCH }
+/* It must be "yes" in order to permit the autocreation of any INBOX subfolder 
+   requested by a sieve filter, through the "fileinto" action. (default = no) */
+
+{ "autosievefolders", NULL, STRING }
+/* It is a "|" separated list of subfolders of INBOX that will be automatically created, 
+   if requested by a sieve filter, through the "fileinto" action. (default = null)
+   i.e. autosievefolders: Junk | Spam */
+
 { "singleinstancestore", 1, SWITCH }
 /* If enabled, imapd, lmtpd and nntpd attempt to only write one copy
    of a message per partition and create hard links, resulting in a


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	25 Mar 2008 10:23:56 -0000	1.11
+++ .cvsignore	1 Sep 2008 11:50:44 -0000	1.12
@@ -1,3 +1,3 @@
 cyrus_sharedbackup-0.1.tar.gz
-cyrus-imapd-2.3.11.tar.gz
-cyrus-imapd-2.3.11.tar.gz.sig
+cyrus-imapd-2.3.12p2.tar.gz
+cyrus-imapd-2.3.12p2.tar.gz.sig


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- cyrus-imapd.spec	1 Sep 2008 09:41:02 -0000	1.41
+++ cyrus-imapd.spec	1 Sep 2008 11:50:44 -0000	1.42
@@ -1,7 +1,7 @@
-%define upstream_ver 2.3.11
+%define upstream_ver 2.3.12p2
 Name: cyrus-imapd
-Version: 2.3.11
-Release: 3%{?dist}
+Version: 2.3.12p2
+Release: 1%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -130,8 +130,8 @@
 Source30: cyrus-imapd-README.contrib
 Source33: cyrus-imapd-README.skiplist_recovery
 Patch0: cyrus-imapd-2.2.12-no_transfig.patch
-Patch1: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.9/cyrus-imapd-2.3.11-autocreate-0.10-0.diff
-Patch2: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.9/cyrus-imapd-2.3.11-autosieve-0.6.0.diff
+Patch1: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.12/cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff
+Patch2: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.12/cyrus-imapd-2.3.12p2-autosieve-0.6.0.diff
 #Patch3: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.9/cyrus-imapd-2.3.9-rmquota+deletemailbox-0.2-1.diff
 Patch4: http://servercc.oakton.edu/~jwade/cyrus/cyrus-imapd-2.1.3/cyrus-imapd-2.1.3-flock.patch
 Patch5: cyrus-imapd-2.2.12-munge8bit.patch
@@ -807,6 +807,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Sep  1 2008 Dan Hor??k <dan[at]danny.cz - 2.3.12p2-1
+- update to new upstream version 2.3.12p2
+- update patches
+
 * Mon Sep  1 2008 Dan Hor??k <dan[at]danny.cz - 2.3.11-3
 - refresh patches
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 Mar 2008 10:23:56 -0000	1.13
+++ sources	1 Sep 2008 11:50:44 -0000	1.14
@@ -1,3 +1,3 @@
 8f7a26b0556369827bb5c8084a3e3ea1  cyrus_sharedbackup-0.1.tar.gz
-df632eb2a89e36e6296e4abd687435ed  cyrus-imapd-2.3.11.tar.gz
-ad1350a4e871f2287081de6c8d4aecf9  cyrus-imapd-2.3.11.tar.gz.sig
+ee2c300687994e4982c6af6aa154c742  cyrus-imapd-2.3.12p2.tar.gz
+a04fd37f1e47cfbed3394758ac2e4981  cyrus-imapd-2.3.12p2.tar.gz.sig


--- cyrus-imapd-2.2.10-groupcache.patch DELETED ---


--- cyrus-imapd-2.3.11-autocreate-0.10-0.diff DELETED ---


--- cyrus-imapd-2.3.11-autosieve-0.6.0.diff DELETED ---


--- cyrus-imapd-2.3.7.tar.gz.sig DELETED ---



From caolanm at fedoraproject.org  Mon Sep  1 12:09:40 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  1 Sep 2008 12:09:40 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,
	1.8, 1.9 openoffice.org-1.9.87.rh151357.setlangtolocale.patch,
	1.28, 1.29 openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch, 1.1, 
	1.2 openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch, 1.2,
	1.3 openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch, 
	1.21, 1.22 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,
	1.48,
	1.49 openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch,
	1.3, 1.4 openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,
	1.10, 1.11 openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch,
	1.1, 1.2 openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch,
	1.2, 1.3 openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch, 1.1,
	1.2 openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch, 1.2, 
	1.3 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch, 
	1.1, 1.2 openoffice.org.spec, 1.1632,
	1.1633 workspace.cmcfixes49.patch, 1.4, 1.5
Message-ID: <20080901120940.0D8D97011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16534

Modified Files:
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch 
	openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch 
	openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch 
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch 
	openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 
	openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch 
	openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch 
	openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch 
	openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch 
	openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch 
	openoffice.org.spec workspace.cmcfixes49.patch 
Log Message:
defuzz

openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch:

Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	27 Mar 2008 15:13:50 -0000	1.8
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	1 Sep 2008 12:09:07 -0000	1.9
@@ -1,8 +1,8 @@
 --- SRC680_m123/desktop/scripts/soffice.sh.orig	2005-08-15 20:17:35.000000000 +0100
 +++ SRC680_m123/desktop/scripts/soffice.sh	2005-08-15 20:19:36.000000000 +0100
-@@ -92,23 +92,22 @@
- # uncomment line below to disable anti aliasing of fonts
- # SAL_ANTIALIAS_DISABLE=true; export SAL_ANTIALIAS_DISABLE
+@@ -91,23 +91,22 @@
+ # uncomment line below if you encounter problems starting soffice on your system
+ # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
  
 -# pagein
  for sd_arg in ${1+"$@"} ; do
@@ -28,7 +28,7 @@
          break;
          ;;
      *)
-@@ -121,10 +120,6 @@
+@@ -120,10 +119,6 @@
    . /etc/adabasrc
  fi
  

openoffice.org-1.9.87.rh151357.setlangtolocale.patch:

Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch	21 Jul 2008 13:10:14 -0000	1.28
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch	1 Sep 2008 12:09:07 -0000	1.29
@@ -210,8 +210,8 @@
 diff -u -p -u -r1.68 dbwizres.src
 --- openoffice.org.orig/wizards/source/formwizard/dbwizres.src	3 May 2005 14:24:05 -0000	1.68
 +++ openoffice.org/wizards/source/formwizard/dbwizres.src	13 Jul 2005 11:23:24 -0000
-@@ -2515,6 +2515,17 @@ String RID_LETTERWIZARDLANGUAGE_START + 
- 	Text [ en-US] = "Croatian";
+@@ -2080,6 +2080,17 @@
+ 	Text [ en-US] = "Name and location";
  };
  
 +String RID_LETTERWIZARDLANGUAGE_START + 17
@@ -671,9 +671,9 @@
 diff -u -r1.36.16.1 localedatawrapper.cxx
 --- openoffice.org.orig/unotools/source/i18n/localedatawrapper.cxx	19 Jan 2007 15:30:09 -0000	1.36.16.1
 +++ openoffice.org/unotools/source/i18n/localedatawrapper.cxx	28 Jun 2007 13:55:46 -0000
-@@ -1989,3 +1989,96 @@
-     else
+@@ -2008,3 +2008,96 @@
          OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
+     }
  }
 +
 +#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
@@ -801,15 +801,15 @@
 diff -u -r1.35.34.1 salnativewidgets-gtk.cxx
 --- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	24 Jan 2007 13:35:35 -0000	1.35.34.1
 +++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	28 Jun 2007 14:02:41 -0000
-@@ -57,6 +57,7 @@
- #include <saldisp.hxx>
- #endif
+@@ -59,6 +59,7 @@
+ {
+ }
  
 +#include <unotools/localedatawrapper.hxx>
  
- // initialize statics
- BOOL GtkSalGraphics::bThemeChanged = TRUE;
-@@ -3103,7 +3104,18 @@
+ using namespace rtl;
+ 
+@@ -3267,7 +3268,18 @@
  #endif
  
      // match font to e.g. resolve "Sans"
@@ -828,7 +828,7 @@
 +    psp::PrintFontManager::get().matchFont( aInfo, aLocale );
  
  #if OSL_DEBUG_LEVEL > 1
-     fprintf( stderr, "font match %s, name AFTER: \"%s\"\n",
+     std::fprintf( stderr, "font match %s, name AFTER: \"%s\"\n",
 Index: ./bin/modules/installer/worker.pm
 ===================================================================
 RCS file: /cvs/tools/solenv/bin/modules/installer/worker.pm,v

openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch:

Index: openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch	22 May 2008 19:28:03 -0000	1.1
+++ openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch	1 Sep 2008 12:09:07 -0000	1.2
@@ -5,7 +5,7 @@
 diff -u -p -u -r1.72 javavm.cxx
 --- openoffice.org.orig/stoc/source/javavm/javavm.cxx	3 Jan 2006 12:44:05 -0000	1.72
 +++ openoffice.org/stoc/source/javavm/javavm.cxx	30 Jan 2006 10:12:21 -0000
-@@ -868,6 +868,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
+@@ -860,6 +860,7 @@
          {
          case JFW_E_NONE: bStarted = true; break;
          case JFW_E_NO_SELECT:
@@ -13,15 +13,15 @@
          {
              // No Java configured. We silenty run the java configuration
              // Java.
-@@ -934,6 +935,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
+@@ -923,6 +924,7 @@
+                 return css::uno::Any();
              continue;
-             break;
          }
 +#if 0
          case JFW_E_VM_CREATION_FAILED:
          {
              //Error:
-@@ -950,6 +952,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
+@@ -939,6 +941,7 @@
              askForRetry(css::uno::makeAny(exc));
              return css::uno::Any();
          }

openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch:

Index: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch	11 Jul 2008 11:55:15 -0000	1.2
+++ openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch	1 Sep 2008 12:09:07 -0000	1.3
@@ -1,36 +1,35 @@
 --- openoffice.org/officecfg/registry/data/org/openoffice/Office/Writer.xcu.orig	2005-04-18 20:39:35.000000000 +0530
 +++ openoffice.org/officecfg/registry/data/org/openoffice/Office/Writer.xcu	2005-05-10 17:30:14.000000000 +0530
-@@ -74,6 +74,33 @@
-       <value xml:lang="en-US" oor:separator=";">To whom it may concern,;Dear Friends,;Dear Sir or Madam,;Hello,</value>
-       <value xml:lang="de" oor:separator=";">Sehr geehrte Damen und Herren,;Liebe Freunde,;Liebe Vereinsmitglieder,;Hallo,</value>
+@@ -43,6 +43,32 @@
+     <prop oor:name="IsHideEmptyParagraphs" >
+      <value>true</value>
      </prop>
-+  <node oor:name="DataSource">
-+   <prop oor:name="DataSourceName" oor:type="xs:string">
-+    <value>EvolutionLocal</value>
-+   </prop>
-+   <prop oor:name="DataTableName" oor:type="xs:string">
-+    <value>Personal</value>
-+   </prop>
-+  </node>
++    <node oor:name="DataSource">
++     <prop oor:name="DataSourceName" oor:type="xs:string">
++      <value>EvolutionLocal</value>
++     </prop>
++     <prop oor:name="DataTableName" oor:type="xs:string">
++      <value>Personal</value>
++     </prop>
++    </node>
 +    <node oor:name="AddressDataAssignments">
-+        <node oor:name="_0" oor:op="replace">
-+            <prop oor:name="DBColumnAssignments" oor:type="oor:string-list">
-+                <value oor:separator=",">title,full_name,family_name,org,addr_line1,addr_line2,city,state,zip,country,home_phone,business_phone,email_1,</value>
-+            </prop>
-+            <node oor:name="DataSource">
-+                <prop oor:name="DataCommandType" oor:type="xs:short">
-+                    <value>0</value>
-+                </prop>
-+                <prop oor:name="DataSourceName" oor:type="xs:string">
-+                    <value>EvolutionLocal</value>
-+                </prop>
-+                <prop oor:name="DataTableName" oor:type="xs:string">
-+                    <value>Personal</value>
-+                </prop>
-+            </node>
-+        </node>
-+</node>
-+
++     <node oor:name="_0" oor:op="replace">
++      <prop oor:name="DBColumnAssignments" oor:type="oor:string-list">
++       <value oor:separator=",">title,full_name,family_name,org,addr_line1,addr_line2,city,state,zip,country,home_phone,business_phone,email_1,</value>
++      </prop>
++      <node oor:name="DataSource">
++       <prop oor:name="DataCommandType" oor:type="xs:short">
++        <value>0</value>
++       </prop>
++       <prop oor:name="DataSourceName" oor:type="xs:string">
++        <value>EvolutionLocal</value>
++       </prop>
++       <prop oor:name="DataTableName" oor:type="xs:string">
++        <value>Personal</value>
++       </prop>
++      </node>
++     </node>
++    </node>
      <prop oor:name="EMailSupported" install:module="javamail">
       <value>true</value>
      </prop>

openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:

Index: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	2 Jul 2008 14:25:19 -0000	1.21
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	1 Sep 2008 12:09:07 -0000	1.22
@@ -513,7 +513,7 @@
 diff -u -r1.6 outdev.hxx
 --- openoffice.org.orig/vcl/inc/vcl/outdev.hxx	11 Apr 2008 07:47:31 -0000	1.6
 +++ openoffice.org/vcl/inc/vcl/outdev.hxx	30 May 2008 09:28:33 -0000
-@@ -76,6 +76,8 @@
+@@ -77,6 +77,8 @@
  class FontCharMap;
  class SalLayout;
  class ImplLayoutArgs;
@@ -521,8 +521,8 @@
 +class ImplFontAttributes;
  class VirtualDevice;
  
- namespace basegfx {
-@@ -537,6 +539,7 @@
+ namespace com {
+@@ -549,6 +551,7 @@
  
      SAL_DLLPRIVATE static FontEmphasisMark ImplGetEmphasisMarkStyle( const Font& rFont );
      SAL_DLLPRIVATE static BOOL ImplIsUnderlineAbove( const Font& );

openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:

Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	2 Jul 2008 14:25:19 -0000	1.48
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	1 Sep 2008 12:09:08 -0000	1.49
@@ -353,15 +353,15 @@
 diff -u -r1.9 jobset.cxx
 --- openoffice.org.orig/vcl/source/gdi/jobset.cxx	9 Sep 2005 12:03:24 -0000	1.9
 +++ openoffice.org/vcl/source/gdi/jobset.cxx	19 May 2006 13:17:00 -0000
-@@ -53,6 +53,7 @@
- #include <vcl/jobset.h>
- #endif
+@@ -66,6 +66,7 @@
+ 	SVBT32	nPaperHeight;
+ };
  
 +#include <psprint/printerinfomanager.hxx>
  // =======================================================================
  
- DBG_NAME( JobSetup )
-@@ -246,6 +247,237 @@
+ ImplJobSetup::ImplJobSetup()
+@@ -231,6 +232,237 @@
  	mpData->maValueMap[ rKey ] = rValue;
  }
  
@@ -606,7 +606,7 @@
 diff -u -p -u -r1.12 cupsmgr.cxx
 --- openoffice.org.orig/psprint/source/printer/cupsmgr.cxx	6 Jun 2005 16:07:42 -0000	1.12
 +++ openoffice.org/psprint/source/printer/cupsmgr.cxx	25 Jul 2005 15:02:37 -0000
-@@ -409,10 +409,15 @@
+@@ -407,10 +407,15 @@
          m_pDests( NULL ),
          m_bNewDests( false )
  {
@@ -623,7 +623,7 @@
  {
      if( m_aDestThread )
      {
-@@ -424,6 +429,11 @@
+@@ -422,6 +427,11 @@
  
      if( m_nDests && m_pDests )
          m_pCUPSWrapper->cupsFreeDests( m_nDests, (cups_dest_t*)m_pDests );
@@ -635,7 +635,7 @@
      delete m_pCUPSWrapper;
  }
  
-@@ -477,9 +487,10 @@
+@@ -519,9 +529,10 @@
  
      // clear old stuff
      m_aCUPSDestMap.clear();
@@ -645,9 +645,9 @@
          return;
 +#endif
      
-     // check for CUPS server(?) > 1.2
-     // since there is no API to query, check for options that were
-@@ -487,9 +498,9 @@
+     if( isCUPSDisabled() )
+         return;
+@@ -532,9 +543,9 @@
      // this is needed to check for %%IncludeFeature support
      // (#i65684#, #i65491#)
      cups_dest_t* pDest = ((cups_dest_t*)m_pDests);
@@ -659,7 +659,7 @@
      if( pOpt )
          m_bUseIncludeFeature = true;
  
-@@ -569,6 +580,10 @@
+@@ -614,6 +625,10 @@
  
          if( it->second.m_aInfo.m_aFeatures.getLength() > 0 )
              continue;
@@ -670,7 +670,7 @@
          aRemovePrinters.push_back( it->first );
      }
      while( aRemovePrinters.begin() != aRemovePrinters.end() )
-@@ -579,6 +594,7 @@
+@@ -624,6 +639,7 @@
  
      m_pCUPSWrapper->cupsSetPasswordCB( setPasswordCallback );
  #endif // ENABLE_CUPS
@@ -678,7 +678,7 @@
  }
  
  #ifdef ENABLE_CUPS
-@@ -837,6 +853,13 @@
+@@ -882,6 +898,13 @@
                  rNumOptions = m_pCUPSWrapper->cupsAddOption( aKey.getStr(), aValue.getStr(), rNumOptions, (cups_option_t**)rOptions );
              }
          }
@@ -733,7 +733,7 @@
 diff -u -r1.9 printdlg.hxx
 --- openoffice.org.orig/svtools/inc/svtools/printdlg.hxx	8 Sep 2005 10:06:06 -0000	1.9
 +++ openoffice.org/svtools/inc/svtools/printdlg.hxx	16 Nov 2006 14:14:18 -0000
-@@ -140,6 +140,9 @@
+@@ -154,6 +154,9 @@
  	Link				maOKHdlLink;	  // Link zum OK-Handler
  
      String				maAllFilterStr;
@@ -741,9 +741,9 @@
 +    String				maOrientationStr;
 +    unsigned long			mnNativeHandle;
  
- 	SVT_DLLPRIVATE void				ImplCheckOK();
- 	SVT_DLLPRIVATE void				ImplInitControls();
-@@ -211,6 +214,8 @@
+     SVT_DLLPRIVATE void     ImplCheckOK();
+     SVT_DLLPRIVATE void     ImplInitControls();
+@@ -232,6 +235,8 @@
  	virtual short		Execute();
  
  	void				DisableHelp();
@@ -751,7 +751,7 @@
 +    virtual unsigned long GetNativeHandle() const;
  };
  
- 
+ inline void PrintDialog::EnableRange( PrintDialogRange eRange )
 Index: source/dialogs/printdlg.cxx
 ===================================================================
 RCS file: /cvs/util/svtools/source/dialogs/printdlg.cxx,v
@@ -1528,7 +1528,7 @@
 diff -u -r1.30 salframe.hxx
 --- openoffice.org.orig/vcl/inc/vcl/salframe.hxx	1 Nov 2006 15:28:55 -0000	1.30
 +++ openoffice.org/vcl/inc/vcl/salframe.hxx	1 May 2007 12:21:25 -0000
-@@ -302,6 +302,9 @@
+@@ -284,6 +284,9 @@
      // (e.g. input methods, printer update handlers).
      long						CallCallback( USHORT nEvent, const void* pEvent ) const
      { return m_pProc ? m_pProc( m_pWindow, const_cast<SalFrame*>(this), nEvent, pEvent ) : 0; }
@@ -1537,7 +1537,7 @@
 +    virtual void SetNativeParent(unsigned long ) {}
  };
  
- #endif // __cplusplus
+ 
 Index: inc/window.hxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/inc/Attic/window.hxx,v
@@ -1586,8 +1586,8 @@
 diff -u -r1.59 gtkframe.cxx
 --- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx	21 Dec 2006 12:04:26 -0000	1.59
 +++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx	1 May 2007 12:22:00 -0000
-@@ -759,6 +762,17 @@
-     return pWindow->GetAccessible( bCreate );
+@@ -719,6 +719,17 @@
+ 	return (GtkSalFrame *) g_object_get_data( G_OBJECT( pWindow ), "SalFrame" );
  }
  
 +unsigned long GtkSalFrame::GetNativeHandle() const

openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch:

Index: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch	15 May 2008 13:03:09 -0000	1.3
+++ openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch	1 Sep 2008 12:09:08 -0000	1.4
@@ -5,8 +5,8 @@
 diff -u -r1.62.2.3 globals.pm
 --- openoffice.org.orig/solenv/bin/modules/installer/globals.pm	24 Jan 2007 16:34:05 -0000	1.62.2.3
 +++ openoffice.org/solenv/bin/modules/installer/globals.pm	27 Feb 2007 17:25:53 -0000
-@@ -224,7 +224,7 @@
- 	$nopatchfilecollector = "";
+@@ -305,7 +305,7 @@
+ 	%moduledestination = ();
  	
  	$unomaxservices = 25;
 -	$javamaxservices = 15;

openoffice.org-2.2.0.ooo68717.gstreamer.video.patch:

Index: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch	5 Aug 2008 15:36:14 -0000	1.10
+++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch	1 Sep 2008 12:09:08 -0000	1.11
@@ -260,20 +260,20 @@
  
 --- config_office-orig/set_soenv.in	2006-08-17 10:43:11.000000000 +0200
 +++ config_office/set_soenv.in	2006-08-17 11:05:37.000000000 +0200
-@@ -1495,6 +1495,7 @@
- ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
- ToFile( "ENABLE_CAIRO",      "@ENABLE_CAIRO@",     "e" );
+@@ -1733,6 +1733,7 @@
+ ToFile( "SYSTEM_SERVLETAPI", "@SYSTEM_SERVLETAPI@", "e" );
+ ToFile( "SERVLETAPI_JAR",    "@SERVLETAPI_JAR@",   "e" );
  ToFile( "ENABLE_DBUS",       "@ENABLE_DBUS@",      "e" );
 +ToFile( "ENABLE_GSTREAMER",  "@ENABLE_GSTREAMER@", "e" );
  ToFile( "ENABLE_GNOMEVFS",   "@ENABLE_GNOMEVFS@",  "e" );
+ ToFile( "ENABLE_GIO",        "@ENABLE_GIO@",       "e" );
  ToFile( "ENABLE_KDE",        "@ENABLE_KDE@",       "e" );
- ToFile( "KDE_CFLAGS",        "@KDE_CFLAGS@",       "e" );
 diff -rup scp2-orig/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
 --- scp2-orig/source/ooo/file_library_ooo.scp	2006-08-17 16:08:34.000000000 +0200
 +++ scp2/source/ooo/file_library_ooo.scp	2006-08-17 16:11:26.000000000 +0200
-@@ -2464,6 +2464,9 @@ STD_UNO_LIB_FILE( gid_File_Lib_Mdb2_Impl
+@@ -1587,6 +1587,9 @@
  // AVMedia
- STD_LIB_FILE_PATCH( gid_File_Lib_AVMedia, avmedia )
+ STD_UNO_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
  
 +#ifdef GSTREAMER
 +SPECIAL_UNO_LIB_FILE_PATCH( gid_File_Lib_AVMediaGStreamer, avmediagst )
@@ -281,8 +281,8 @@
  #if defined UNX
  #ifdef SOLAR_JAVA
  UNO_JAR_FILE( gid_File_Jar_AVmedia, avmedia )
-@@ -2473,6 +2476,7 @@ UNO_JAR_FILE( gid_File_Jar_AVmedia, avme
- SPECIAL_UNO_LIB_FILE_PATCH( gid_File_Lib_AVMediaWin, avmediawin )
+@@ -1596,6 +1599,7 @@
+ SPECIAL_UNO_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
  #endif
  #endif
 +#endif
@@ -732,8 +732,8 @@
 diff -rup svtools-orig/source/misc1/mediatyp.src svtools/source/misc1/mediatyp.src
 --- svtools-orig/source/misc1/mediatyp.src	2006-09-21 11:40:26.000000000 +0200
 +++ svtools/source/misc1/mediatyp.src	2006-09-21 11:45:57.000000000 +0200
-@@ -148,6 +148,87 @@ String STR_SVT_MIMETYPE_AUDIO_MIDI
- 	Text [ x-comment ] = " ";
+@@ -113,6 +113,87 @@
+ 	Text [ en-US ] = "Audio file" ;
  };
  
 +String STR_SVT_MIMETYPE_AUDIO_VORBIS
@@ -819,9 +819,9 @@
 +
  String STR_SVT_MIMETYPE_AUDIO_WAV
  {
- 	Text [ de ] = "Audio-Datei" ;
-@@ -211,6 +292,87 @@ String STR_SVT_MIMETYPE_TEXT_VCARD
- 	Text [ x-comment ] = " ";
+ 	Text [ en-US ] = "Audio file" ;
+@@ -158,6 +239,87 @@
+ 	Text [ en-US ] = "vCard file" ;
  };
  
 +String STR_SVT_MIMETYPE_VIDEO_THEORA
@@ -907,7 +907,7 @@
 +
  String STR_SVT_MIMETYPE_VIDEO_VDO
  {
- 	Text [ de ] = "Video-Datei" ;
+ 	Text [ en-US ] = "Video file" ;
 Index: vcl/inc/salobj.hxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/inc/salobj.hxx,v

openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch:

Index: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch	10 Jun 2008 07:48:56 -0000	1.1
+++ openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch	1 Sep 2008 12:09:08 -0000	1.2
@@ -248,7 +248,7 @@
 diff -u -r1.12 makefile.mk
 --- openoffice.org.orig/sw/source/ui/misc/makefile.mk	9 Sep 2005 10:35:47 -0000	1.12
 +++ openoffice.org/sw/source/ui/misc/makefile.mk	10 Jul 2007 13:09:42 -0000
-@@ -60,7 +60,8 @@
+@@ -56,7 +56,8 @@
  	pgfnote.src \
      pggrid.src \
      redlndlg.src \
@@ -256,9 +256,9 @@
 +    srtdlg.src \
 +    titlepage.src
  
- SLOFILES =	\
- 		$(SLO)$/bookmark.obj \
-@@ -72,6 +73,7 @@
+ EXCEPTIONSFILES = \
+ 		$(SLO)$/glossary.obj \
+@@ -76,6 +77,7 @@
  		$(SLO)$/insfnote.obj \
  		$(SLO)$/insrule.obj \
  		$(SLO)$/linenum.obj \

openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch:

Index: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch	27 Mar 2008 15:13:50 -0000	1.2
+++ openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch	1 Sep 2008 12:09:08 -0000	1.3
@@ -55,8 +55,8 @@
 diff -ruN sd.orig/source/ui/app/strings.src sd/source/ui/app/strings.src
 --- openoffice.org.orig/sd/source/ui/app/strings.src	2006-10-06 12:37:22.000000000 +0200
 +++ openoffice.org/sd/source/ui/app/strings.src	2007-07-27 15:12:40.000000000 +0200
-@@ -544,6 +544,10 @@
- 	Text [ de ] = "Nur Titel" ;
+@@ -177,6 +177,10 @@
+ {
  	Text [ en-US ] = "Title Only" ;
  };
 +String STR_AUTOLAYOUT_ONLY_TEXT
@@ -65,7 +65,7 @@
 +};
  String STR_AUTOLAYOUT_TITLE
  {
- 	Text [ de ] = "Titelfolie" ;
+ 	Text [ en-US ] = "Title Slide" ;
 diff -ruN sd.orig/source/ui/inc/res_bmp.hrc sd/source/ui/inc/res_bmp.hrc
 --- openoffice.org.orig/sd/source/ui/inc/res_bmp.hrc	2005-09-09 07:51:35.000000000 +0200
 +++ openoffice.org/sd/source/ui/inc/res_bmp.hrc	2007-07-27 15:15:48.000000000 +0200

openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch:

Index: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch	10 Jan 2008 18:03:23 -0000	1.1
+++ openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch	1 Sep 2008 12:09:08 -0000	1.2
@@ -5,7 +5,7 @@
 diff -u -r1.24 salplug.cxx
 --- openoffice.org.orig/vcl/unx/source/plugadapt/salplug.cxx	15 Oct 2007 13:07:38 -0000	1.24
 +++ openoffice.org.orig/vcl/unx/source/plugadapt/salplug.cxx	10 Jan 2008 18:00:21 -0000
-@@ -429,7 +429,7 @@
+@@ -444,7 +444,7 @@
      else if( desktop == desktop_strings[DESKTOP_KDE] )
          pRet = "kde";
      else
@@ -13,8 +13,8 @@
 +        pRet = "gtk";
          
  #if OSL_DEBUG_LEVEL > 1
-     fprintf( stderr, "plugin autodetection: %s\n", pRet );
-@@ -468,7 +468,7 @@
+     std::fprintf( stderr, "plugin autodetection: %s\n", pRet );
+@@ -496,7 +496,7 @@
  
      // fallback to gen
      if( ! pInst )

openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch:

Index: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch	2 Jul 2008 14:25:19 -0000	1.2
+++ openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch	1 Sep 2008 12:09:08 -0000	1.3
@@ -57,15 +57,15 @@
 diff -ru vcl/source/window/winproc.cxx vcl/source/window/winproc.cxx
 --- openoffice.org.orig/vcl/source/window/winproc.cxx	2008-04-15 08:44:34.000000000 +0100
 +++ openoffice.org/vcl/source/window/winproc.cxx	2008-04-15 16:40:53.000000000 +0100
-@@ -121,6 +121,7 @@
- #ifndef _SV_MENU_HXX
- #include <vcl/menu.hxx>
+@@ -78,6 +78,7 @@
+ extern void MyOutputDebugString( char *s);
+ #endif
  #endif
 +#include <vcl/glyphcache.hxx>
  
- #include <dndlcon.hxx>
  
-@@ -2255,9 +2256,14 @@
+ //#define USE_NEW_RTL_IMPLEMENTATION
+@@ -2225,9 +2226,14 @@
                  nType = DATACHANGED_DISPLAY;
                  break;
              case SALEVENT_FONTCHANGED:

openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch:

Index: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch	23 Jul 2008 09:51:27 -0000	1.1
+++ openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch	1 Sep 2008 12:09:08 -0000	1.2
@@ -5,14 +5,14 @@
 diff -u -r1.2.182.1 ConfigurationController.cxx
 --- openoffice.org.orig/sd/source/ui/framework/configuration/ConfigurationController.cxx	18 Jan 2008 11:26:35 -0000	1.2.182.1
 +++ openoffice.org/sd/source/ui/framework/configuration/ConfigurationController.cxx	23 Jul 2008 09:45:04 -0000
-@@ -259,7 +259,9 @@
-     throw (RuntimeException)
- {
+@@ -289,7 +289,9 @@
+     OSL_ASSERT(mpImplementation->mpConfigurationUpdater.get()!=NULL);
+ 
      ::osl::MutexGuard aGuard (maMutex);
 -    ThrowIfDisposed();
 +
 +    if (rBHelper.bDisposed )	//i.e. allow unlocking if disposing, but not disposed
 +    	ThrowIfDisposed();
  
-     OSL_ASSERT(mnLockCount>0);
-     --mnLockCount;
+     
+     ++mpImplementation->mnLockCount;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1632
retrieving revision 1.1633
diff -u -r1.1632 -r1.1633
--- openoffice.org.spec	1 Sep 2008 07:52:21 -0000	1.1632
+++ openoffice.org.spec	1 Sep 2008 12:09:08 -0000	1.1633
@@ -32,8 +32,6 @@
 
 %define ooo_base_name %{oootag}_m%{ooomilestone}
 
-%define _default_patch_fuzz 2
-
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        3.0.0
@@ -3647,6 +3645,7 @@
 %changelog
 * Mon Sep 01 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-4.2
 - Resolves: rhbz#460755 TryExec oowriter on brwriter.desktop etc
+- defuzz patches
 
 * Fri Aug 29 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-4.1
 - next milestone

workspace.cmcfixes49.patch:

Index: workspace.cmcfixes49.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes49.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- workspace.cmcfixes49.patch	30 Aug 2008 10:57:57 -0000	1.4
+++ workspace.cmcfixes49.patch	1 Sep 2008 12:09:08 -0000	1.5
@@ -56,8 +56,8 @@
     AC_MSG_CHECKING([for sdext module])
 --- config_office/set_soenv.in	31 Jul 2008 13:53:05 -0000	1.196
 +++ config_office/set_soenv.in	19 Aug 2008 13:33:05 -0000
-@@ -1998,6 +1998,9 @@
- ToFile( "SYSTEM_FREETYPE",   "@SYSTEM_FREETYPE@",  "e" );
+@@ -2000,6 +2000,9 @@
+ ToFile( "SYSTEM_JPEG",       "@SYSTEM_JPEG@",      "e" );
  ToFile( "FREETYPE_CFLAGS",   "@FREETYPE_CFLAGS@",  "e" );
  ToFile( "FREETYPE_LIBS",     "@FREETYPE_LIBS@",    "e" );
 +ToFile( "SYSTEM_POPPLER",    "@SYSTEM_POPPLER@",   "e" );
@@ -70,7 +70,7 @@
 +++ sdext/prj/build.lst	19 Aug 2008 15:13:19 -0000
 @@ -7,10 +7,12 @@
  dx	sdext\source\minimizer\registry\data\org\openoffice\Office 		nmake	-	all sdext_minimizer_rdooo NULL
- dx	sdext\source\presenter					nmake	-	all sdext_presenter NULL
+ dx	sdext\source\presenter					nmake	-	all sdext_presenter sdext_inc	NULL
  dx	sdext\inc								nmake	-	all	sdext_inc				NULL
 +dx  sdext\source\pdfimport\xpdfwrapper     nmake   -   all dx_xpdfwrap                        NULL
 +dx  sdext\source\pdfimport\xpdftest        nmake   -   all dx_parsetest               dx_xpdfwrap NULL



From varekova at fedoraproject.org  Mon Sep  1 12:12:27 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon,  1 Sep 2008 12:12:27 +0000 (UTC)
Subject: rpms/bzip2/devel bzip2.spec,1.40,1.41
Message-ID: <20080901121227.6AE5B7011A@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	bzip2.spec 
Log Message:
fix previous misstake



Index: bzip2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzip2/devel/bzip2.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- bzip2.spec	1 Sep 2008 11:33:00 -0000	1.40
+++ bzip2.spec	1 Sep 2008 12:11:57 -0000	1.41
@@ -51,12 +51,12 @@
 
 make -f Makefile-libbz2_so CC="%{__cc}" AR="%{__ar}" RANLIB="%{__ranlib}" \
 	CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -fpic -fPIC" \
-	%{?_smp_mflags} all"
+	%{?_smp_mflags} all
 
 rm -f *.o
 make CC="%{__cc}" AR="%{__ar}" RANLIB="%{__ranlib}" \
 	CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" \
-	%{?_smp_mflags} all"
+	%{?_smp_mflags} all
 
 %install
 rm -rf ${RPM_BUILD_ROOT}



From than at fedoraproject.org  Mon Sep  1 12:13:22 2008
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  1 Sep 2008 12:13:22 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim-4.1.1-strigi.patch, NONE, 1.1 kdepim.spec, 
	1.186, 1.187
Message-ID: <20080901121322.54F967011A@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.1.1-strigi.patch 
Log Message:
enable trigi-analyze


kdepim-4.1.1-strigi.patch:

--- NEW FILE kdepim-4.1.1-strigi.patch ---
diff -up kdepim-4.1.1/CMakeLists.txt.orig kdepim-4.1.1/CMakeLists.txt
--- kdepim-4.1.1/CMakeLists.txt.orig	2008-09-01 13:36:27.000000000 +0200
+++ kdepim-4.1.1/CMakeLists.txt	2008-09-01 13:36:39.000000000 +0200
@@ -179,7 +179,7 @@ else ( ONLY_KLEO )
   endif (Q_WS_X11)
 
   add_subdirectory(kdgantt1)
-  #macro_optional_add_subdirectory(strigi-analyzer)
+  macro_optional_add_subdirectory(strigi-analyzer)
   if(QGPGME_FOUND AND KMAIL_SUPPORTED)
      macro_optional_add_subdirectory(kmailcvt)
      message(STATUS "KMailCVT support enabled.")


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- kdepim.spec	29 Aug 2008 16:05:29 -0000	1.186
+++ kdepim.spec	1 Sep 2008 12:12:52 -0000	1.187
@@ -13,6 +13,8 @@
 Group:   Applications/Productivity
 URL:	 http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+# upstream patches
+Patch100:  kdepim-4.1.1-strigi.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides: kdepim4 = %{version}-%{release}
@@ -88,6 +90,9 @@
 %prep
 %setup -q
 
+# upstream patches
+%patch100 -p1 -b .strigi
+
 %build
 
 mkdir -p %{_target_platform}
@@ -145,6 +150,7 @@
 %doc COPYING
 %{_kde4_bindir}/*
 %{_kde4_libdir}/kde4/*.so
+%{_kde4_libdir}/strigi/*.so
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_appsdir}/*
 %{_datadir}/dbus-1/interfaces/*.xml



From varekova at fedoraproject.org  Mon Sep  1 12:27:52 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon,  1 Sep 2008 12:27:52 +0000 (UTC)
Subject: rpms/gzip/devel gzip-1.3.5-zforce.patch, 1.1, 1.2 gzip.spec, 1.44,
	1.45
Message-ID: <20080901122752.57F677011A@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	gzip-1.3.5-zforce.patch gzip.spec 
Log Message:
update patches


gzip-1.3.5-zforce.patch:

Index: gzip-1.3.5-zforce.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gzip/devel/gzip-1.3.5-zforce.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gzip-1.3.5-zforce.patch	22 Mar 2005 08:59:15 -0000	1.1
+++ gzip-1.3.5-zforce.patch	1 Sep 2008 12:27:52 -0000	1.2
@@ -1,11 +1,12 @@
---- gzip-1.2.4/zforce.in.sopwith	Thu Feb  3 18:06:30 2000
-+++ gzip-1.2.4/zforce.in	Thu Feb  3 18:07:37 2000
-@@ -25,7 +25,7 @@
-   test `expr "$i" : '.*[.-]gz$'` -eq 0 || continue
-   test `expr "$i" : '.*[.]t[ag]z$'` -eq 0 || continue
+diff -up gzip-1.3.12/zforce.in.zforce gzip-1.3.12/zforce.in
+--- gzip-1.3.12/zforce.in.zforce	2007-02-05 21:54:26.000000000 +0100
++++ gzip-1.3.12/zforce.in	2008-09-01 14:17:26.000000000 +0200
+@@ -58,7 +58,7 @@ for i do
+     continue
+   fi
  
 -  if gzip -lv < "$i" 2>/dev/null | grep '^defl' > /dev/null; then
 +  if gzip -l < "$i" 2>/dev/null | grep '^compressed' > /dev/null; then
  
-     if test `expr "$i" : '^............'` -eq 12; then
-       new=`expr "$i" : '\(.*\)...$`.gz
+     new="$i.gz"
+     if mv "$i" "$new"; then


Index: gzip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gzip/devel/gzip.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gzip.spec	20 Feb 2008 06:35:42 -0000	1.44
+++ gzip.spec	1 Sep 2008 12:27:52 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: The GNU data compression program
 Name: gzip
 Version: 1.3.12
-Release: 6%{?dist}
+Release: 7%{?dist}
 # info pages are under GFDL license
 License: GPLv2 and GFDL
 Group: Applications/File
@@ -87,6 +87,9 @@
 %{_infodir}/gzip.info*
 
 %changelog
+* Mon Sep  1 2008 Ivana Varekova <varekova at redhat.com> - 1.3.12-7
+- update patches
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3.12-6
 - Autorebuild for GCC 4.3
 



From nim at fedoraproject.org  Mon Sep  1 12:29:09 2008
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Mon,  1 Sep 2008 12:29:09 +0000 (UTC)
Subject: rpms/argyllcms/devel argyllcms-1.0.2-legal.patch, NONE,
	1.1 .cvsignore, 
	1.3, 1.4 argyllcms.spec, 1.4, 1.5 import.log, 1.1, 1.2 sources,
	1.3, 1.4 V1.0.1_patches.txt, 1.1,
	NONE argyllcms-1.0.1-legal.patch, 1.1,
	NONE argyllcms-1.0.1-printf.patch, 1.1, NONE
Message-ID: <20080901122909.B99417011A@cvs1.fedora.phx.redhat.com>

Author: nim

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

Modified Files:
	.cvsignore argyllcms.spec import.log sources 
Added Files:
	argyllcms-1.0.2-legal.patch 
Removed Files:
	V1.0.1_patches.txt argyllcms-1.0.1-legal.patch 
	argyllcms-1.0.1-printf.patch 
Log Message:
1.0.2 minor update ??? still untested

argyllcms-1.0.2-legal.patch:

--- NEW FILE argyllcms-1.0.2-legal.patch ---
diff -uNr Argyll_V1.0.1.orig/doc/ArgyllDoc.html Argyll_V1.0.1/doc/ArgyllDoc.html
--- Argyll_V1.0.1.orig/doc/ArgyllDoc.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/ArgyllDoc.html	2008-07-27 11:39:29.000000000 +0200
@@ -18,7 +18,7 @@
 Author: Graeme Gill
 <h2><u>Introduction</u></h2>
 Argyll is an open source, ICC compatible color management
-system. It supports accurate ICC profile creation for scanners, CMYK
+system. It supports accurate ICC profile creation for acquisition devices, CMYK
 printers,
 film recorders and calibration and profiling of displays.
 Spectral sample data is supported,
diff -uNr Argyll_V1.0.1.orig/doc/chartread.html Argyll_V1.0.1/doc/chartread.html
--- Argyll_V1.0.1.orig/doc/chartread.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/chartread.html	2008-07-27 11:40:27.000000000 +0200
@@ -206,7 +206,7 @@
 <br>
 <a name="a"></a> Normally the patch locations are not needed in the
 output, but if a chart is being read as an input reference (for use in
-profiling a scanner or a camera), then the patch locations will still
+profiling an acquisition device), then the patch locations will still
 be needed. The <span style="font-weight: bold;">-a</span> flag adds
 the locations to the output .ti3 file.<br>
 <br>
diff -uNr Argyll_V1.0.1.orig/doc/colprof.html Argyll_V1.0.1/doc/colprof.html
--- Argyll_V1.0.1.orig/doc/colprof.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/colprof.html	2008-07-27 11:41:01.000000000 +0200
@@ -617,8 +617,8 @@
 absolute value, and any values whiter than that, will not be clipped by
 the profile. The profile effectively operates in an absolute intent
 mode, &nbsp;irrespective of what intent is selected when it is used.
-This flag can be useful when an input profile is needed for using a
-scanner as a "poor mans" colorimeter, or if the white point of the test
+This flag can be useful when an input profile is needed for using an
+acquisition device as a "poor mans" colorimeter, or if the white point of the test
 chart doesn't represent the white points of media
 that will be used in practice, and that white point adjustment will be
 done individually in some downstream application.<br>
diff -uNr Argyll_V1.0.1.orig/doc/Installing_Linux.html Argyll_V1.0.1/doc/Installing_Linux.html
--- Argyll_V1.0.1.orig/doc/Installing_Linux.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/Installing_Linux.html	2008-07-27 11:42:29.000000000 +0200
@@ -30,7 +30,7 @@
 variable to give access to the executables from your command line
 environment.
 The .tgz file also contains several useful reference files (such as
-scanner
+acquisition device
 chart recognition templates, sample illumination spectrum etc.) in the
 ref sub-directory, as
 well
diff -uNr Argyll_V1.0.1.orig/doc/Installing_MSWindows.html Argyll_V1.0.1/doc/Installing_MSWindows.html
--- Argyll_V1.0.1.orig/doc/Installing_MSWindows.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/Installing_MSWindows.html	2008-07-27 11:42:50.000000000 +0200
@@ -69,7 +69,7 @@
 <br>
 The .zip file also contains several useful reference files
 (such as
-scanner
+acquisition device
 chart recognition templates, sample illumination spectrum etc.) in the
 ref sub-directory, all the current documentation in a doc
 sub-directory, and instrument USB drivers in the libusbw directory.<br>
diff -uNr Argyll_V1.0.1.orig/doc/Installing_OSX.html Argyll_V1.0.1/doc/Installing_OSX.html
--- Argyll_V1.0.1.orig/doc/Installing_OSX.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/Installing_OSX.html	2008-07-27 11:39:58.000000000 +0200
@@ -30,7 +30,7 @@
 with how to do this, consult an appropriate tutorial, e.g. &lt;<a
  href="http://heather.cs.ucdavis.edu/%7Ematloff/UnixAndC/Unix/ShellIntro.html#tth_sEc1">ShellIntro</a>&gt;.
 The .tgz file also contains several useful reference files (such as
-scanner chart recognition templates, sample illumination spectrum
+acquisition device chart recognition templates, sample illumination spectrum
 etc.) in the ref sub-directory, as well as
 all the current documentation in a doc sub-directory.<br>
 <br>
diff -uNr Argyll_V1.0.1.orig/doc/Organisation.html Argyll_V1.0.1/doc/Organisation.html
--- Argyll_V1.0.1.orig/doc/Organisation.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/Organisation.html	2008-07-27 11:36:55.000000000 +0200
@@ -13,7 +13,7 @@
 This directory contains routines that generate calibration test charts,
 based
 on various distribution algorithms suitable for
-reading using an Xrite DTP51 or DTP41 colorimeter, or scanner for print
+reading using an Xrite DTP51 or DTP41 colorimeter, or acquisition device for print
 charts,
 the Gretag Spectrolino for film charts, or the Xrite DTP92 pr DTP94 for
 monitor
diff -uNr Argyll_V1.0.1.orig/doc/printtarg.html Argyll_V1.0.1/doc/printtarg.html
--- Argyll_V1.0.1.orig/doc/printtarg.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/printtarg.html	2008-07-27 11:36:27.000000000 +0200
@@ -167,7 +167,7 @@
 file, and a .ti2 file containing the device test values together with
 the layout information needed to identify the patch location. This
 module can also generate the image recognition templates needed to read
-the print targets in using a scanner.<br>
+the print targets in using an acquisition device.<br>
 <br>
 <a name="v"></a> The <b>-v</b> flag turns on verbose mode. Prints
 information about how many patches there are in a row, how many patches
diff -uNr Argyll_V1.0.1.orig/doc/scanin.html Argyll_V1.0.1/doc/scanin.html
--- Argyll_V1.0.1.orig/doc/scanin.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/scanin.html	2008-07-27 11:34:18.000000000 +0200
@@ -23,7 +23,7 @@
 recogin.cht
 valin.cie [diag.tif]</span><br style="font-family: monospace;">
 <span style="font-family: monospace;">&nbsp;&nbsp; :- inputs
-'input.tif',&nbsp; and outputs scanner
+'input.tif',&nbsp; and outputs device
 'input.ti3', or</span><br style="font-family: monospace;">
 <br style="font-family: monospace;">
 <a style="font-family: monospace;" href="#g"> usage</a><span
@@ -85,7 +85,7 @@
  style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 Replace device values in .ti3</span><br style="font-family: monospace;">
 <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Default is to create a scanner .ti3 file<br>
+Default is to create a device .ti3 file<br>
 </span></small><small><span style="font-family: monospace;">&nbsp;</span><a
  style="font-family: monospace;" href="#F">-F x1,y1,x2,y2,x3,y3,x4,y4</a><span
  style="font-family: monospace;"> <br>
@@ -187,10 +187,10 @@
 of the chart are visible within the image, and if the image is cropped
 to exclude the chart edges, it may well not recognize the chart
 properly. It is designed to cope with a variety of resolutions, and
-will cope with some degree of noise in the scan (due to screening
+will cope with some degree of noise in the acquisition (due to screening
 artefacts on the original, or film grain), but it isn't really designed
 to accept very high resolution input. For anything over 600DPI, you
-should consider down sampling the scan using a filtering downsample,
+should consider down sampling the image using a filtering downsample,
 before submitting the file to scanin.<br>
 <br>
 There are 5 basic modes that <b>scanin</b> operates in.<br>
@@ -199,7 +199,7 @@
 assumed to be parsing an input device characterization chart (ie. an
 IT8.7/2 chart), for the purpose of creating a <a
  href="File_Formats.html#.ti3">.ti3</a> data file containing
-the CIE test values and the corresponding RGB scanner values. The <a
+the CIE test values and the corresponding RGB device values. The <a
  href="File_Formats.html#.ti3">.ti3</a> file can then be used for
 creating
 an input profile using <a href="colprof.html">colprof</a>. The file
@@ -221,7 +221,7 @@
 file in
 this situation, should be a good quality image, perhaps synthetically
 generated
-(rather than being scanned), and perfectly oriented, to make
+(rather than being parsed), and perfectly oriented, to make
 specification
 of the patch locations easier. The file arguments are: <a name="gp1"></a>The
 TIFF file that
@@ -245,7 +245,7 @@
 input devices to be used as a crude replacement for a color measuring
 instrument. The icc profile has
 (presumably) been
-created by scanning an IT8.7/2 chart (or similar) through the RGB input
+created with an image of a IT8.7/2 chart (or similar) through the RGB input
 device,
 and
 then using scanin to create the .ti3 file needed to feed to colprof to
@@ -267,7 +267,7 @@
 The resulting .ti3 file will have the same base name as the input TIFF
 file.
 If there is more than one page in the test chart, then scanin will need
-to be run multiple times, once for each scan file made from each test
+to be run multiple times, once for each image file made from each test
 chart. <a name="ca"></a>The <b>-ca</b> flag combination should be
 used
 for all pages after the first,
@@ -339,7 +339,7 @@
 <br>
 <a name="p"></a>By default the automatic chart recognition copes with
 rotation, scale and stretch in the chart image, making it suitable for
-charts that have been scanned, or shot squarely with a camera. If a
+charts that have been acquired, or shot squarely with a camera. If a
 chart has been shot not exactly facing the camera (perhaps to avoid
 reflection, or to get more even lighting), then it will suffer from
 perspective distortion as well. The <span style="font-weight: bold;"><span
@@ -349,7 +349,7 @@
 <a name="m"></a>Normally scanin computes an average of the pixel values
 within a sample square, using a "robust" mean, that discards pixel
 values that are too far from the average ("outlier" pixel values). This
-is done in an attempt to discard value that are due to scanning
+is done in an attempt to discard value that are due to acquisition
 artefacts such as dust, scratches etc. You can force scanin to return
 the true mean values for the sample squares that includes all the pixel
 values, by using the <span style="font-weight: bold;">-m</span> flag.<br>
@@ -357,9 +357,9 @@
 <a name="G"></a>Normally scanin has reasonably robust feature
 recognition, but the default assumption is that the input chart has an
 approximately even visual distribution of patch values, and has been
-scanned and converted to a typical gamma 2.2 corrected image, meaning
+acquired and converted to a typical gamma 2.2 corrected image, meaning
 that the average patch pixel value is expected to be about 50%. If this
-is not the case (for instance if the input chart has been scanned with
+is not the case (for instance if the input chart has been processed with
 linear light or "raw" encoding), then it may enhance the image
 recognition to provide the approximate gamma encoding of the image. For
 instance, if linear light encoding ("Raw") is used, a <span
diff -uNr Argyll_V1.0.1.orig/doc/Scenarios.html Argyll_V1.0.1/doc/Scenarios.html
--- Argyll_V1.0.1.orig/doc/Scenarios.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/Scenarios.html	2008-07-27 11:52:05.000000000 +0200
@@ -32,17 +32,17 @@
  href="#PM5">Installing a
 display profile</a></h4>
 <h4><br>
-<a href="#PS1">Profiling Scanners</a></h4>
+<a href="#PS1">Profiling Acquisition Devices</a></h4>
 <h4>&nbsp;&nbsp;&nbsp; <a href="#PS2">Types of test charts</a></h4>
-<h4>&nbsp;&nbsp;&nbsp; <a href="#PS3">Taking readings from a scanner</a></h4>
-<h4>&nbsp;&nbsp;&nbsp; <a href="#PS4">Creating a scanner profile</a></h4>
+<h4>&nbsp;&nbsp;&nbsp; <a href="#PS3">Taking readings from an acquisition device</a></h4>
+<h4>&nbsp;&nbsp;&nbsp; <a href="#PS4">Creating an acquisition device profile</a></h4>
 <h4><br>
 <a href="#PP1">Profiling Printers</a></h4>
 <h4> &nbsp;&nbsp;&nbsp; <a href="#PP2">Creating a print test chart</a></h4>
 <h4> &nbsp;&nbsp;&nbsp; <a href="#PP3">Reading a print test chart
 using an instrument</a></h4>
 <h4> &nbsp;&nbsp;&nbsp; <a href="#PP4">Reading a print test chart
-using a scanner</a></h4>
+using an acquisition device</a></h4>
 <h4> </h4>
 <h4>&nbsp;&nbsp;&nbsp; <a href="#PP5">Creating a printer profile<br>
 </a></h4>
@@ -353,14 +353,14 @@
 the connected display.<br>
 <br>
 <hr size="2" width="100%">
-<h3><a name="PS1"></a>Profiling Scanners</h3>
-Because a scanner is an input device, it is necessary to go about
+<h3><a name="PS1"></a>Profiling Acquisition Devices</h3>
+Because a acquisition device is an input device, it is necessary to go about
 profiling it in quite a different way to an output device. To profile
-it, a test chart is needed to exercise the scanner response, to which
+it, a test chart is needed to exercise the device response, to which
 the CIE values for each test patch is known. Generally standard
 reflection or transparency test charts are used for this purpose.<br>
 <h4><a name="PS2"></a>Types of test charts</h4>
-The most common and popular test chart for scanner profiling is the
+The most common and popular test chart for acquisiton device profiling is the
 IT8.7/2 chart. This is a standard format chart generally reproduced on
 photographic film, containing about 264 test patches. The Kodak Q-60
 Color Input Target is a typical example:<br>
@@ -400,18 +400,18 @@
 <img alt="CMP_DT_003" src="CMP_DT_003.jpg"
  style="width: 186px; height: 141px;"><br>
 <br>
-<h4><a name="PS3"></a>Taking readings from a scanner</h4>
-The test chart you are using needs to be placed on the scanner, and the
-scanner needs to be configured to a suitable state, and restored to
+<h4><a name="PS3"></a>Taking readings from an acquisition device</h4>
+The test chart you are using needs to be exposed to the device, and the
+acquisition device needs to be configured to a suitable state, and restored to
 that
 same state when used subsequently with the resulting profile. The chart
 should
 be scanned, and saved to a TIFF format file. I will assume the
 resulting
-file is called scanner.tif. The raster file need only be roughly
+file is called device.tif. The raster file need only be roughly
 cropped so as to contain the test chart (including the charts edges).<br>
 <br>
-The second step is to extract the RGB values from the scanner.tif file,
+The second step is to extract the RGB values from the device.tif file,
 and match then to the reference CIE values.
 To locate the patch values in the scan, the <b>scanin</b> utility
 needs to
@@ -485,32 +485,32 @@
 chart recognition template file will need to be created (this is beyond
 the scope of the current documentation).<br>
 <br>
-To create the scanner .ti3 file, run the <b>scanin</b> utility as
+To create the device .ti3 file, run the <b>scanin</b> utility as
 follows
 (assuming an IT8 chart is being used):<br>
 <br>
-<a href="scanin.html"> scanin</a> -v scanner.tif It8.cht It8ref.txt<br>
+<a href="scanin.html"> scanin</a> -v device.tif It8.cht It8ref.txt<br>
 <br>
 "It8ref.txt" is assumed to be the name of the CIE reference file
-supplied by the chart manufacturer. The resulting file will be named "<b>scanner.ti3</b>".<br>
+supplied by the chart manufacturer. The resulting file will be named "<b>device.ti3</b>".<br>
 <br>
 <span style="font-weight: bold;">scanin</span> will process 16 bit per
-component .tiff files, which (if the scanner is capable of creating
+component .tiff files, which (if the device is capable of creating
 such files),&nbsp; may improve the quality of the profile. <br>
 <br>
 If you have any doubts about the correctness of the chart recognition,
 or the subsequent profile's delta E report is unusual, then use the
 scanin diagnostic flags <a href="scanin.html#d">-dipn</a> and examine
 the <span style="font-weight: bold;">diag.tif</span> diagnostic file.<br>
-<h4><a name="PS4"></a>Creating a scanner profile</h4>
-Similar to a display profile, a scanner profile can be either a
-shaper/matrix or LUT based profile. Well behaved scanners will
+<h4><a name="PS4"></a>Creating an acquisition device profile</h4>
+Similar to a display profile, an acquisition device profile can be either a
+shaper/matrix or LUT based profile. Well behaved devices will
 probably give the best results
 with a shaper/matrix profile, but if the fit is poor, consider using a
 LUT
 type profile.<br>
 <br>
-If the purpose of the scanner profile is to use it as a substitute for
+If the purpose of the device profile is to use it as a substitute for
 a
 colorimeter, then the <b>-u</b> flag should be used to avoid clipping
 values above the white point. Unless the shaper/matrix type profile is
@@ -520,24 +520,24 @@
 To create a matrix/shaper profile, the following suffices:<br>
 <br>
 <a href="colprof.html">colprof</a> <a href="colprof.html#v">-v</a> <a
- href="colprof.html#E">-D"Scanner</a> <a href="colprof.html#E">A"</a> <a
+ href="colprof.html#E">-D"Device</a> <a href="colprof.html#E">A"</a> <a
  href="colprof.html#q">-qm</a> <a href="colprof.html#a">-as</a>
-<a href="colprof.html#p1">scanner</a><br>
+<a href="colprof.html#p1">device</a><br>
 <br>
 For a LUT based profile then the following would be used:<br>
 <br>
 <a href="colprof.html">colprof</a> <a href="colprof.html#v">-v</a> <a
- href="colprof.html#E">-D"Scanner A"</a>
+ href="colprof.html#E">-D"Device A"</a>
 <a href="colprof.html#q">-qm</a>
-<a href="colprof.html#p1">scanner</a><br>
+<a href="colprof.html#p1">device</a><br>
 <br>
 For the purposes of a poor mans colorimeter, the following would
 generally be used:<br>
 <br>
 <a href="colprof.html">colprof</a> <a href="colprof.html#v">-v</a> <a
- href="colprof.html#E">-D"Scanner A"</a>
+ href="colprof.html#E">-D"Device A"</a>
 <a href="colprof.html#q">-qm</a> <a href="colprof.html#u">-u</a>
-<a href="colprof.html#p1">scanner</a><br>
+<a href="colprof.html#p1">device</a><br>
 <br>
 Make sure you check the delta E report at the end of the profile
 creation, to see if the profile is behaving reasonably.<br>
@@ -703,7 +703,7 @@
 <a href="printtarg.html#i">-ii1</a> <a href="printtarg.html#p">-pA4</a>
 <a href="printtarg.html#p1">PrinterA</a><br>
 <br>
-For using with a scanner as a colorimeter, the Gretag Spectroscan
+For using with an acquisition device as a colorimeter, the Gretag Spectroscan
 layout is suitable, but the <a href="printtarg.html#s">-s</a> flag
 should be used so as to generate a layout suitable for scan
 recognition, as well as generating the scan recognition template
@@ -804,28 +804,27 @@
 for each type of instrument. Continue with <a href="Scenarios.html#PP5">Creating
 a printer profile</a>.<br>
 <br>
-<h4><a name="PP4"></a>Reading a print test chart using a scanner or
-camera<br>
+<h4><a name="PP4"></a>Reading a print test chart using an acquisition device<br>
 </h4>
 <br>
-Argyll supports using a scanner or even a camera as a substitute for a
+Argyll supports using any acquisition device as a substitute for a
 colorimeter.
-While a scanner or camera is no replacement for a color measurement
+While most are no replacement for a color measurement
 instrument, it may give acceptable results in some situations, and may
 give better results than a generic profile for a printing device.<br>
 <br>
-The main limitation of the scanner-as-colorimeter approach are:<br>
+The main limitation of the any-device-as-colorimeter approach are:<br>
 <br>
-* The scanner dynamic range and/or precision may not match the printers
+* The acquisition device dynamic range and/or precision may not match the printers
 or what is required for a good profile.<br>
-* The spectral interaction of the scanner test chart and printer test
-chart with the scanner
+* The spectral interaction of the device test chart and printer test
+chart with the device
 spectral response can cause color errors.<br>
 * Spectral differences caused by different black amounts in the print
 test chart can cause
 color errors. <br>
 * The IT8 chart gamut may be so much smaller than the printers that the
-scanner profile is too inaccurate. <br>
+acquisition device profile is too inaccurate. <br>
 <br>
 As well as some of the above, a camera may not be suitable if it
 automatically adjusts exposure or white point when taking a picture,
@@ -834,23 +833,23 @@
 The end result is often a profile that has a slight color cast to,
 compared to a profile created using a colorimeter or spectrometer..<br>
 <br>
-It is assumed that you have created a scanner or camera profile
+It is assumed that you have created an acquisition device profile
 following the <a href="http://www.argyllcms.com/doc/Scenarios.html#PS1">procedure</a>
 outline above. For best possible results it
-is advisable to both profile the scanner or camera, and use it in
+is advisable to both profile the acquisition device, and use it in
 scanning the
 printed test chart, in as "raw" mode as possible (i.e. using 16 bits
-per component images, if the scanner or camera is
+per component images, if the acquisition device is
 capable of doing so; not setting white or black points, using a fixed
 exposure etc.). It is
 generally advisable to create a LUT type input profile, and use the <a
  href="http://www.argyllcms.com/doc/colprof.html#u">-u</a> flag to
 avoid clipping scanned value whiter than the input calibration chart.<br>
 <br>
-Scan or photograph your printer chart (or charts) on the scanner or
-camera previously profiled.
+Scan or photograph your printer chart (or charts) on the acquisition device
+previously profiled.
 <big><span style="font-weight: bold;">The
-scanner or camera must be configured and used exactly the same as it
+acquisition device must be configured and used exactly the same as it
 was when it
 was profiled.</span></big><br>
 <br>
@@ -858,21 +857,21 @@
  style="font-weight: bold;">PrinterB.tif</span> (or <span
  style="font-weight: bold;">PrinterB1.tif</span>, <span
  style="font-weight: bold;">PrinterB2.tif</span> etc. in the case of
-multiple charts). As with profiling the scanner or camera, the raster
+multiple charts). As with profiling the acquisition device, the raster
 file need
 only be roughly cropped so as to contain the test chart.<br>
 <br>
-The scanner recognition files
+The acquisition device recognition files
 created when <span style="font-weight: bold;">printtarg</span> was run
 is assumed to be called <span style="font-weight: bold;">PrinterB.cht</span>.
-Using the scanner profile created previously (assumed to be called <span
- style="font-weight: bold;">scanner.icm</span>), the printer test chart
+Using the device profile created previously (assumed to be called <span
+ style="font-weight: bold;">device.icm</span>), the printer test chart
 scan patches are converted to CIE values using the <span
  style="font-weight: bold;">scanin</span> utility:<br>
 <br>
 <a href="scanin.html">scanin</a> <a href="scanin.html#v">-v</a> <a
  href="scanin.html#c">-c</a> <a href="scanin.html#cp1">PrinterB.tif</a>
-<a href="scanin.html#cp2">PrinterB.cht</a> <a href="scanin.html#cp3">scanner.icm</a>
+<a href="scanin.html#cp2">PrinterB.cht</a> <a href="scanin.html#cp3">device.icm</a>
 <a href="scanin.html#cp4">PrinterB</a><br>
 <br>
 If there were multiple test chart pages, the results would be
@@ -881,15 +880,15 @@
 <br>
 <a href="scanin.html">scanin</a> <a href="scanin.html#v">-v</a> <a
  href="scanin.html#c">-c</a> <a href="scanin.html#cp1">PrinterB1.tif</a>
-<a href="scanin.html#cp2">PrinterB1.cht</a> <a href="scanin.html#cp3">scanner.icm</a>
+<a href="scanin.html#cp2">PrinterB1.cht</a> <a href="scanin.html#cp3">device.icm</a>
 <a href="scanin.html#cp4">PrinterB</a><br>
 <a href="scanin.html">scanin</a> <a href="scanin.html#v">-v</a> <a
  href="scanin.html#ca">-ca</a> <a href="scanin.html#cp1">PrinterB2.tif</a>
-<a href="scanin.html#cp2">PrinterB2.cht</a> <a href="scanin.html#cp3">scanner.icm</a>
+<a href="scanin.html#cp2">PrinterB2.cht</a> <a href="scanin.html#cp3">device.icm</a>
 <a href="scanin.html#cp4">PrinterB</a><br>
 <a href="scanin.html">scanin</a> <a href="scanin.html#v">-v</a> <a
  href="scanin.html#ca">-ca</a> <a href="scanin.html#cp1">PrinterB3.tif</a>
-<a href="scanin.html#cp2">PrinterB3.cht</a> <a href="scanin.html#cp3">scanner.icm</a>
+<a href="scanin.html#cp2">PrinterB3.cht</a> <a href="scanin.html#cp3">device.icm</a>
 <a href="scanin.html#cp4">PrinterB</a><br>
 <br>
 Now that the <span style="font-weight: bold;">PrinterB.ti3</span> data
diff -uNr Argyll_V1.0.1.orig/doc/targen.html Argyll_V1.0.1/doc/targen.html
--- Argyll_V1.0.1.orig/doc/targen.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/targen.html	2008-07-27 11:53:34.000000000 +0200
@@ -615,7 +615,7 @@
 &nbsp; &nbsp;&nbsp; &nbsp;3 x Letter&nbsp;&nbsp; 1386<br>
 &nbsp; &nbsp; &nbsp; 4 x Letter&nbsp;&nbsp; 1848<br>
 <br>
-&nbsp; Scanner (printtarg with -iSS -s options):<br>
+&nbsp; Acquisition device (printtarg with -iSS -s options):<br>
 <br>
 &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; 1 x A4R &nbsp; &nbsp;&nbsp; 1014<br>
 &nbsp; &nbsp; &nbsp; &nbsp;2 x A4R &nbsp; &nbsp;&nbsp; 2028<br>
diff -uNr Argyll_V1.0.1.orig/doc/ti3_format.html Argyll_V1.0.1/doc/ti3_format.html
--- Argyll_V1.0.1.orig/doc/ti3_format.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/ti3_format.html	2008-07-27 11:42:04.000000000 +0200
@@ -173,7 +173,7 @@
 or "<span style="font-weight: bold;">RGB_LAB</span>" for an RGB printer
 or display, "<span style="font-weight: bold;">CMYK_XYZ</span>" for a
 printer, "<span style="font-weight: bold;">XYZ_RGB"</span> for an RGB
-scanner.<br>
+acquisition device.<br>
 <br>
 If spectral values are going to be included in the file, the following
 keywords and values shall be used:<br>
diff -uNr Argyll_V1.0.1.orig/doc/ucmm.html Argyll_V1.0.1/doc/ucmm.html
--- Argyll_V1.0.1.orig/doc/ucmm.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/ucmm.html	2008-07-27 11:41:27.000000000 +0200
@@ -13,7 +13,7 @@
 designed just to handle the necessary configuration needed to track the
 installation and association of ICC profiles with Unix/Linux X11
 displays. It could be expanded at some point to also hold the
-associations for other devices such as scanner and printers.<br>
+associations for other devices such as acquisition devices and printers.<br>
 <br>
 It consists primarily of a small configuration database that associates
 a display monitor (identified by its EDID or the X11 display name if an
diff -uNr Argyll_V1.0.1.orig/log.txt Argyll_V1.0.1/log.txt
--- Argyll_V1.0.1.orig/log.txt	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/log.txt	2008-07-27 11:35:38.000000000 +0200
@@ -1648,7 +1648,7 @@
 	
 *   Added shaper/matrix input profile support.
 	(profile/profin.c, xicc/xmatrix.c)
-    This may be more accurate for scanner profiles,
+    This may be more accurate for device profiles,
     given the poor coverage of test points provided
     by an IT8 chart (but doesn't appear to be in practice).
 
@@ -1659,7 +1659,7 @@
 
 *   Added support in scanin.c and scanrd.c for
     using a scan of a print test chart, plus a
-    profile for the scanner, to be able to measure
+    profile for the device, to be able to measure
     color for printer calibration. This
 	new mode handles multi-page test charts.
 
@@ -1689,13 +1689,13 @@
 	patch spacer contrast determination.
 	Also added an XYZ to sRGB conversion
 	function to support RGB previews of N color
-	devices, as well as scanner recognition template files.
+	devices, as well as device recognition template files.
 
 *	Expanded xicc/xcolorants.c to incorporate
 	an approximate device model for arbitrary
 	colorant combinations. This is used to
 	be able to approximate expected density readings,
-	as well as preview colors and scanner recognition templates.
+	as well as preview colors and device recognition templates.
 
 *   Create a new test point creation module,
     target/simplat.c, to create higher dimentional,
@@ -1793,7 +1793,7 @@
 
 *   Added preliminary support in printtarg for the SpectroScan
     spectrodensitometer. Also added preliminary support for
-    scanner recognisable test charts.
+    device recognisable test charts.
 
 *   Added option to icclink to turn off the use of linearisation
     curves in the output link, since this sometimes seems to
@@ -1960,7 +1960,7 @@
   Cleaned up build automation somewhat.
 
   Added RGB output device profile generation support.
-  Added RGB scanner device profile generation support.
+  Added RGB device profile generation support.
 
   Added a couple of spectrometer conversion utilities for
   raw data files from other CMSs.
diff -uNr Argyll_V1.0.1.orig/profile/profcheck.c Argyll_V1.0.1/profile/profcheck.c
--- Argyll_V1.0.1.orig/profile/profcheck.c	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/profile/profcheck.c	2008-07-27 11:54:01.000000000 +0200
@@ -360,7 +360,7 @@
 			devchan = 3;
 			isLab = 1;
 			isAdditive = 1;
-		/* Scanner .ti3 files: */
+		/* Acquisition Device .ti3 files: */
 		} else if (strcmp(icg->t[0].kdata[ti],"XYZ_RGB") == 0) {
 			devspace = icSigRgbData;
 			devchan = 3;
diff -uNr Argyll_V1.0.1.orig/profile/profin.c Argyll_V1.0.1/profile/profin.c
--- Argyll_V1.0.1.orig/profile/profin.c	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/profile/profin.c	2008-07-27 11:53:08.000000000 +0200
@@ -49,7 +49,7 @@
 /*
    Basic algorithm outline:
 
- Scanner:
+ Acquisition Device:
 
    Figure out the input curves to give
    the flattest grid.
diff -uNr Argyll_V1.0.1.orig/scanin/scanin.c Argyll_V1.0.1/scanin/scanin.c
--- Argyll_V1.0.1.orig/scanin/scanin.c	2008-07-27 11:18:53.000000000 +0200
+++ Argyll_V1.0.1/scanin/scanin.c	2008-07-27 11:26:37.000000000 +0200
@@ -2,7 +2,7 @@
 /* 
  * Argyll Color Correction System
  *
- * Scanin: Input the scan of a test chart, and output cgats data
+ * Scanin: Input the image of a test chart, and output cgats data
  *         Uses scanrd to do the hard work.
  *
  * Author: Graeme W. Gill
@@ -72,7 +72,7 @@
 	fprintf(stderr,"Author: Graeme W. Gill, licensed under the GPL Version 3\n");
 	fprintf(stderr,"\n");
 	fprintf(stderr,"usage: scanin [options] input.tif recogin.cht valin.cie [diag.tif]\n");
-	fprintf(stderr,"   :- inputs 'input.tif' and outputs scanner 'input.ti3', or\n");
+	fprintf(stderr,"   :- inputs 'input.tif' and outputs device 'input.ti3', or\n");
 	fprintf(stderr,"\n");
 	fprintf(stderr,"usage: scanin -g [options] input.tif recogout.cht [diag.tif]\n");
 	fprintf(stderr,"   :- outputs file 'recogout.cht', or\n");
@@ -92,7 +92,7 @@
 	fprintf(stderr," -ca                  Same as -c, but accumulates more values to .ti3\n");
 	fprintf(stderr,"                       from subsequent pages\n");
 	fprintf(stderr," -r                   Replace device values in .ti2/.ti3\n");
-	fprintf(stderr,"                      Default is to create a scanner .ti3 file\n");
+	fprintf(stderr,"                      Default is to create a device .ti3 file\n");
 	fprintf(stderr," -F x1,y1,x2,y2,x3,y3,x4,y4\n");
 	fprintf(stderr,"                      Don't auto recognize, locate using four fiducual marks\n");
 	fprintf(stderr," -p                   Compensate for perspective distortion\n");
@@ -127,12 +127,12 @@
 	static char datin_name[200] = { 0 };	/* Data input name (.cie/.q60) */
 	static char datout_name[200] = { 0 };	/* Data output name (.ti3/.val) */
 	static char recog_name[200] = { 0 };	/* Reference chart name (.cht) */
-	static char prof_name[200] = { 0 };		/* scanner profile name (.cht) */
+	static char prof_name[200] = { 0 };		/* device profile name (.cht) */
 	static char diag_name[200] = { 0 };		/* Diagnostic Output (.tif) name, if used */
 	int verb = 1;
 	int tmean = 0;		/* Return true mean, rather than robust mean */
 	int repl = 0;		/* Replace .ti3 device values from raster file */
-	int outo = 0;		/* Output the values read, rather than creating scanner .ti3 */
+	int outo = 0;		/* Output the values read, rather than creating device .ti3 */
 	int colm = 0;		/* Use inage values to measure color for print profile. > 1 == append */
 	int flags = SI_GENERAL_ROT;	/* Default allow all rotations */
 
@@ -153,7 +153,7 @@
 	scanrd *sr;				/* Scanrd object */
 	int err;	
 	char *errm;
-	int pnotscan = 0;		/* Number of patches that wern't scanned */
+	int pnotscan = 0;		/* Number of patches that weren't processed */
 
 	if (argc <= 1)
 		usage();
diff -uNr Argyll_V1.0.1.orig/target/printtarg.c Argyll_V1.0.1/target/printtarg.c
--- Argyll_V1.0.1.orig/target/printtarg.c	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/target/printtarg.c	2008-07-27 11:37:20.000000000 +0200
@@ -3252,7 +3252,7 @@
 }
 
 /******************************************************************/
-/* Edge tracking support, for generating the scanner image        */
+/* Edge tracking support, for generating the device image        */
 /* recognition reference chart file. */
 
 /* Establish width and height to convert between topleft and */
diff -uNr Argyll_V1.0.1.orig/ttbd.txt Argyll_V1.0.1/ttbd.txt
--- Argyll_V1.0.1.orig/ttbd.txt	2008-07-27 11:18:54.000000000 +0200
+++ Argyll_V1.0.1/ttbd.txt	2008-07-27 11:54:46.000000000 +0200
@@ -123,7 +123,7 @@
 
 * Should create a .ti2 template file for some standard charts,
   such as an IT8.7/3, ECI2002 random and non-random etc.
-  Scanner recognition files too ??
+  Device recognition files too ??
 
 * Add an option to targen, that allows generation of
   test points down the neutral axis (how does this work
@@ -293,7 +293,7 @@
   patch variance is too high (probable faulty read).
 
 * Add spectral fix options to scanin code to allow compensation
-  for scanner and media errors when using a scanned image to
+  for device and media errors when using an acquired image to
   measure color.
   This means figuring out how it will work, as well as creating
   to tools to create the spectral fix data (or just add general


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/argyllcms/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Jul 2008 13:34:18 -0000	1.3
+++ .cvsignore	1 Sep 2008 12:28:39 -0000	1.4
@@ -1,2 +1,2 @@
 Argyll_V1.0.1_autotools.patch.gz
-Argyll_V1.0.1_src.zip
+Argyll_V1.0.2_src.zip


Index: argyllcms.spec
===================================================================
RCS file: /cvs/extras/rpms/argyllcms/devel/argyllcms.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- argyllcms.spec	27 Jul 2008 13:34:18 -0000	1.4
+++ argyllcms.spec	1 Sep 2008 12:28:39 -0000	1.5
@@ -4,7 +4,7 @@
 %define archivename Argyll_V%{version}%{?alphaversion}_src.zip
 
 Name:    argyllcms
-Version: 1.0.1
+Version: 1.0.2
 Release: 1%{?alphatag}%{?dist}
 Summary: ICC compatible color management system
 
@@ -15,14 +15,11 @@
 Source0: %{url}%{archivename}
 Source1: %{name}-1.0.1-19-color.fdi
 Source2: %{name}-0.70-color-device-file.policy
-Patch0:  %{url}V%{version}_patches.txt
 # Many thanks to Alastair M. Robinson!
 Patch1:  http://www.blackfiveservices.co.uk/Argyll_V1.0.1_autotools.patch.gz
 Patch2:  %{name}-1.0.1-remove-libusb-fork-check.patch
-# Patch by Stefan Br??ns, bz421921#c18
-Patch3:  %{name}-1.0.1-printf.patch
 # Patch applied for legal reasons
-Patch4:  %{name}-1.0.1-legal.patch
+Patch4:  %{name}-1.0.2-legal.patch
 
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: libtiff-devel, libusb-devel
@@ -63,14 +60,10 @@
 
 %prep
 %setup -q -n Argyll_V%{version}
-# Post-release fixes
-%patch0 -p1 -b .fix
 # Autotools support
 %patch1 -p1 -b .auto
 # Use the system libusb. If there is a ***REPORTED*** problem the distro will fix it
 %patch2 -p1 -b .sysusb
-# Printf fixes
-%patch3 -p1 -b .printf
 # Legal patch required
 %patch4 -p1 -b .legal
 
@@ -120,6 +113,10 @@
 
 
 %changelog
+* Mon Sep 1 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 1.0.2-1
+??? Bugfix release
+
 * Sun Jul 27 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 1.0.1-1
 ??? Lots of workarounds dropped ??? Argyll continues progressing towards ???normal


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/argyllcms/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Jul 2008 13:34:18 -0000	1.1
+++ import.log	1 Sep 2008 12:28:39 -0000	1.2
@@ -1 +1,2 @@
 argyllcms-1_0_1-1_fc10_nim:HEAD:argyllcms-1.0.1-1.fc10.nim.src.rpm:1217165503
+argyllcms-1_0_2-1_fc10:HEAD:argyllcms-1.0.2-1.fc10.src.rpm:1220272108


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/argyllcms/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Jul 2008 13:34:18 -0000	1.3
+++ sources	1 Sep 2008 12:28:39 -0000	1.4
@@ -1,2 +1,2 @@
 cdb94385421c2fae1cf6fb068069cd9e  Argyll_V1.0.1_autotools.patch.gz
-e9f32b852b49ffcf28b854cecab00e67  Argyll_V1.0.1_src.zip
+fd56b470873cbca980a37836adc41095  Argyll_V1.0.2_src.zip


--- V1.0.1_patches.txt DELETED ---


--- argyllcms-1.0.1-legal.patch DELETED ---


--- argyllcms-1.0.1-printf.patch DELETED ---



From than at fedoraproject.org  Mon Sep  1 12:37:47 2008
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  1 Sep 2008 12:37:47 +0000 (UTC)
Subject: rpms/kdepim/F-9 kdepim-3.5.10-metakit_sparc64.patch, NONE,
	1.1 .cvsignore, 1.42, 1.43 kdepim.spec, 1.170, 1.171 sources,
	1.47, 1.48 kdepim-3.5.9-kde#127696.patch, 1.1,
	NONE kdepim-3.5.9-metakit_64bit.patch, 1.1,
	NONE kdepim-3.5.9-metakit_sparc64.patch, 1.1,
	NONE kdepim-3.5.x-kmail-imap-crash.patch, 1.1,
	NONE kdepim-kde#151150.patch, 1.1, NONE
Message-ID: <20080901123747.E87117011A@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdepim.spec sources 
Added Files:
	kdepim-3.5.10-metakit_sparc64.patch 
Removed Files:
	kdepim-3.5.9-kde#127696.patch kdepim-3.5.9-metakit_64bit.patch 
	kdepim-3.5.9-metakit_sparc64.patch 
	kdepim-3.5.x-kmail-imap-crash.patch kdepim-kde#151150.patch 
Log Message:
3.5.10


kdepim-3.5.10-metakit_sparc64.patch:

--- NEW FILE kdepim-3.5.10-metakit_sparc64.patch ---
diff -up kdepim-3.5.10/akregator/src/mk4storage/metakit/include/mk4.h.metakit_sparc64 kdepim-3.5.10/akregator/src/mk4storage/metakit/include/mk4.h
--- kdepim-3.5.10/akregator/src/mk4storage/metakit/include/mk4.h.metakit_sparc64	2008-08-19 20:15:38.000000000 +0200
+++ kdepim-3.5.10/akregator/src/mk4storage/metakit/include/mk4.h	2008-09-01 14:24:34.000000000 +0200
@@ -101,6 +101,7 @@
     // and here's the other end of the scale...
 #if !defined (_WIN32) && !defined (q4_LONG64)
 #if (defined (_PA_RISC2_0) && defined(__hpux)) || defined (__powerpc64__) || defined(__sparcv9) || \
+    (defined(__linux__) && defined(__sparc__) && defined(__arch64__) ) || \
     defined (__x86_64__) || defined (__s390x__) || defined (__alpha) || defined (__mips64) || \
     (defined (__ia64) && (!defined (__HP_aCC) || defined(__LP64__)))
 #define q4_LONG64 1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-9/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	15 Feb 2008 03:04:32 -0000	1.42
+++ .cvsignore	1 Sep 2008 12:37:17 -0000	1.43
@@ -2,3 +2,4 @@
 cr32-app-kandy.png
 cr48-app-kandy.png
 kdepim-3.5.9.tar.bz2
+kdepim-3.5.10.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-9/kdepim.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- kdepim.spec	6 Jun 2008 19:08:26 -0000	1.170
+++ kdepim.spec	1 Sep 2008 12:37:17 -0000	1.171
@@ -1,9 +1,4 @@
 
-## enterprise branch
-#define etch_ver 3.5.6 
-#define ent_date 20080109 
-#define ent_rev 744693
-
 #define debug 1 
 ## --enable-final requires > 1GB VM, sometimes kills fedora's builders 
 #define final 1 
@@ -21,25 +16,14 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 3.5.9
+Version: 3.5.10
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:	 http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%if 0%{?ent_date} > 0
-# hmm, v3.5.6 eh?  FIXME? -- Rex
-#Source0: http://apt.intevation.de/dists/etch/unstable/source/kdepim_3.5.6.enterprise.0.20071204.744693.orig.tar.gz
-Source0: kdepim-enterprise-svn%{ent_date}.tar.bz2
-# script used to generate svn checkout Source0 above
-Source1: kdepim-enterprise-svn_checkout.sh
-
-Release: 9.%{ent_date}svn.ent%{?dist}.1
-%else
-Release: 9%{?dist}.1
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-%endif
 
 Source10: cr48-app-kandy.png
 Source11: cr32-app-kandy.png
@@ -51,20 +35,12 @@
 # patch by Dirk M??ller from openSUSE to fix gnokii detection
 Patch6: kdepim-3.5.9-gnokii-no-libintl.patch
 # fix sparc64 build
-Patch7: kdepim-3.5.9-metakit_sparc64.patch
+Patch7: kdepim-3.5.10-metakit_sparc64.patch
 
 ## upstream patches
 # LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.9/kdepim/kitchensync at 774532 \
 # svn://anonsvn.kde.org/home/kde/branches/work/kitchensync-OpenSync0.30API at 774532 >kdepim-3.5.9-opensync03.patch
 Patch3: kdepim-3.5.9-opensync03.patch
-# http://websvn.kde.org/?view=rev&revision=775015
-# http://bugs.kde.org/127696
-# Upstream fix for "Unable to complete LIST operation" errors with some servers,
-Patch4: kdepim-3.5.9-kde#127696.patch
-# http://bugs.kde.org/151150
-# http://websvn.kde.org/?view=rev&revision=779994
-Patch5: kdepim-kde#151150.patch
-Patch100: kdepim-3.5.x-kmail-imap-crash.patch
 
 Provides: kdepim3 = %{version}-%{release}
 
@@ -159,19 +135,11 @@
 
 
 %prep
-## Ugh 3 options, switch this by hand
-# stock upstream 
 %setup -q
-# etch upstream sources
-#setup -q %{?etch_ver: -n kdepim-%{etch_ver}.enterprise.0.%{ent_date}.%{ent_rev}}
-# svn snapshot
-#setup -q -n kdepim
 
 install -m644 -p %{SOURCE10} %{SOURCE11} %{SOURCE12} kandy/src/
 %patch1 -p1 -b .kandy-icons
-
 %patch2 -p1 -b .xdg_open
-
 %patch6 -p0 -b .gnokii
 %patch7 -p1 -b .metakit_sparc64
 
@@ -181,11 +149,6 @@
 popd
 %endif
 
-%patch4 -p0 -b .kde127696
-%patch5 -p1 -b .kde151150
-
-%patch100 -p0 -b .kmail-imap-crash
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -317,6 +280,9 @@
 
 
 %changelog
+* Mon Sep 01 2008 Than Ngo <than at redhat.com> 3.5.10-1
+- 3.5.10
+
 * Thu Jun 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-9.1
 - metakit patch to fix build on sparc64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-9/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	15 Feb 2008 03:04:32 -0000	1.47
+++ sources	1 Sep 2008 12:37:17 -0000	1.48
@@ -1,4 +1,4 @@
 024ab01d199f9e93c43df1ef0a03510c  cr16-app-kandy.png
 496c7bfc6247df2cf03aec342094ffd6  cr32-app-kandy.png
 fef385691270bad1e58e6eb5ed0ad6d6  cr48-app-kandy.png
-ba27b06599556c572a26f03608471ee2  kdepim-3.5.9.tar.bz2
+fc93e458a8eec8131ede56cff30c28b2  kdepim-3.5.10.tar.bz2


--- kdepim-3.5.9-kde#127696.patch DELETED ---


--- kdepim-3.5.9-metakit_64bit.patch DELETED ---


--- kdepim-3.5.9-metakit_sparc64.patch DELETED ---


--- kdepim-3.5.x-kmail-imap-crash.patch DELETED ---


--- kdepim-kde#151150.patch DELETED ---



From mbarnes at fedoraproject.org  Mon Sep  1 12:49:54 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon,  1 Sep 2008 12:49:54 +0000 (UTC)
Subject: rpms/gtkhtml3/devel gtkhtml-3.23.91-compiler-warnings.patch, NONE, 
	1.1 .cvsignore, 1.79, 1.80 gtkhtml3.spec, 1.130, 1.131 sources,
	1.79, 1.80
Message-ID: <20080901124954.ACA9F7011A@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Added Files:
	gtkhtml-3.23.91-compiler-warnings.patch 
Log Message:

* Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 3.23.91-1.fc10
- Update to 3.23.91
- Add -Werror to CFLAGS.


gtkhtml-3.23.91-compiler-warnings.patch:

--- NEW FILE gtkhtml-3.23.91-compiler-warnings.patch ---
diff -up gtkhtml-3.23.91/gtkhtml/htmlpainter.c.compiler-warnings gtkhtml-3.23.91/gtkhtml/htmlpainter.c
--- gtkhtml-3.23.91/gtkhtml/htmlpainter.c.compiler-warnings	2008-04-11 07:14:42.000000000 -0400
+++ gtkhtml-3.23.91/gtkhtml/htmlpainter.c	2008-09-01 08:42:45.000000000 -0400
@@ -432,8 +432,8 @@ html_painter_calc_entries_size (HTMLPain
 				HTMLTextPangoInfo *pi, GList *glyphs, gint *line_offset,
 				gint *width, gint *asc, gint *dsc)
 {
-	HTMLFontFace    *font_face;
-	GtkHTMLFontStyle font_style;
+	HTMLFontFace *font_face = NULL;
+	GtkHTMLFontStyle font_style = GTK_HTML_FONT_STYLE_DEFAULT;
 	HTMLFont *font;
 
 	g_return_if_fail (painter != NULL);
diff -up gtkhtml-3.23.91/gtkhtml/testgtkhtml.c.compiler-warnings gtkhtml-3.23.91/gtkhtml/testgtkhtml.c
--- gtkhtml-3.23.91/gtkhtml/testgtkhtml.c.compiler-warnings	2008-06-12 23:05:58.000000000 -0400
+++ gtkhtml-3.23.91/gtkhtml/testgtkhtml.c	2008-09-01 08:44:44.000000000 -0400
@@ -947,29 +947,30 @@ goto_url(const char *url, int back_or_fo
 static void
 bug_cb (GtkWidget *widget, gpointer data)
 {
-	gchar cwd[PATH_MAX], *filename, *url;
+	gchar *cwd, *filename, *url;
 
-	getcwd(cwd, sizeof (cwd));
+	cwd = g_get_current_dir ();
 	filename = g_strdup_printf("%s/bugs.html", cwd);
 	url = g_filename_to_uri(filename, NULL, NULL);
 	goto_url(url, 0);
 	g_free(url);
 	g_free(filename);
+	g_free(cwd);
 }
 
 static void
 test_cb (GtkWidget *widget, gpointer data)
 {
-	gchar cwd[PATH_MAX], *filename, *url;
+	gchar *cwd, *filename, *url;
 
-	getcwd(cwd, sizeof (cwd));
+	cwd = g_get_current_dir ();
 	filename = g_strdup_printf ("%s/tests/test%d.html", cwd,
 				    GPOINTER_TO_INT (data));
 	url = g_filename_to_uri (filename, NULL, NULL);
-
 	goto_url(url, 0);
 	g_free(url);
 	g_free(filename);
+	g_free(cwd);
 }
 
 static void


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- .cvsignore	20 Aug 2008 21:30:35 -0000	1.79
+++ .cvsignore	1 Sep 2008 12:49:24 -0000	1.80
@@ -1 +1 @@
-gtkhtml-3.23.90.tar.bz2
+gtkhtml-3.23.91.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- gtkhtml3.spec	20 Aug 2008 21:30:35 -0000	1.130
+++ gtkhtml3.spec	1 Sep 2008 12:49:24 -0000	1.131
@@ -9,7 +9,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.23.90
+Version: 3.23.91
 Release: 1%{?dist}
 License: LGPLv2+ and GPLv2
 Group: System Environment/Libraries
@@ -22,6 +22,9 @@
 # Remove gnome-common macros from configure.in.
 Patch1: gtkhtml-3.13.1-no-gnome-common.patch
 
+# Get -Werror to work
+Patch2: gtkhtml-3.23.91-compiler-warnings.patch
+
 ### Dependencies ###
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -59,6 +62,7 @@
 %prep
 %setup -q -n gtkhtml-%{version}
 %patch1 -p1 -b .no-gnome-common
+%patch2 -p1 -b .compiler-warnings
 
 %build
 
@@ -77,7 +81,8 @@
 	-DGDK_DISABLE_DEPRECATED=1 \
 	-DGNOME_DISABLE_DEPRECATED=1 \
 	-Wdeclaration-after-statement \
-	-Werror-implicit-function-declaration"
+	-Werror-implicit-function-declaration \
+	-Werror"
 %endif
 
 # Rerun the GNU "autotools" since we patched configure.in.
@@ -122,6 +127,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 3.23.91-1.fc10
+- Update to 3.23.91
+- Add -Werror to CFLAGS.
+
 * Wed Aug 20 2008 Matthew Barnes <mbarnes at redhat.com> - 3.23.90-1.fc10
 - Update to 3.23.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- sources	20 Aug 2008 21:30:36 -0000	1.79
+++ sources	1 Sep 2008 12:49:24 -0000	1.80
@@ -1 +1 @@
-fe4e8e988b6a3e448988bc0d838a97ca  gtkhtml-3.23.90.tar.bz2
+3629ec4287a1778a9640cc3fe98c33cb  gtkhtml-3.23.91.tar.bz2



From mbarnes at fedoraproject.org  Mon Sep  1 12:53:04 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon,  1 Sep 2008 12:53:04 +0000 (UTC)
Subject: rpms/evolution-exchange/devel
	evolution-exchange-2.23.91-compiler-warnings.patch, NONE,
	1.1 .cvsignore, 1.27, 1.28 evolution-exchange.spec, 1.38,
	1.39 sources, 1.27, 1.28
Message-ID: <20080901125304.2D9607011A@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Added Files:
	evolution-exchange-2.23.91-compiler-warnings.patch 
Log Message:

* Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.91-1.fc10
- Update to 2.23.91
- Add -Werror to CFLAGS.


evolution-exchange-2.23.91-compiler-warnings.patch:

--- NEW FILE evolution-exchange-2.23.91-compiler-warnings.patch ---
diff -up evolution-exchange-2.23.91/addressbook/e-book-backend-gal.c.compiler-warnings evolution-exchange-2.23.91/addressbook/e-book-backend-gal.c
--- evolution-exchange-2.23.91/addressbook/e-book-backend-gal.c.compiler-warnings	2008-09-01 08:15:18.000000000 -0400
+++ evolution-exchange-2.23.91/addressbook/e-book-backend-gal.c	2008-09-01 08:17:38.000000000 -0400
@@ -1437,7 +1437,7 @@ build_contact_from_entry (EBookBackendGA
 						}
 						else if (info->prop_type & PROP_TYPE_GROUP) {
 							char *grpattrs[3];
-							int i, view_limit = -1, ldap_error, count;
+							int i, view_limit = -1, ldap_error = LDAP_SUCCESS, count;
 							EDataBookView *book_view;
 							LDAPMessage *result;
 							char **email_values, **cn_values, **member_info;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	20 Aug 2008 21:30:47 -0000	1.27
+++ .cvsignore	1 Sep 2008 12:52:33 -0000	1.28
@@ -1 +1 @@
-evolution-exchange-2.23.90.tar.bz2
+evolution-exchange-2.23.91.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- evolution-exchange.spec	20 Aug 2008 21:30:47 -0000	1.38
+++ evolution-exchange.spec	1 Sep 2008 12:52:33 -0000	1.39
@@ -22,7 +22,7 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.23.90
+Version: 2.23.91
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Productivity
@@ -44,6 +44,9 @@
 # GNOME bug #443022
 Patch13: evolution-exchange-2.11.2-fix-library-order.patch
 
+# Get -Werror to work
+Patch14: evolution-exchange-2.23.91-compiler-warnings.patch
+
 ### Dependencies ###
 
 Requires: gnutls
@@ -75,6 +78,7 @@
 %patch11 -p1 -b .fix-64bit-acinclude.m4
 %patch12 -p1 -b .no_gnome_common
 %patch13 -p1 -b .fix-library-order
+%patch14 -p1 -b .compiler-warnings
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
@@ -103,7 +107,8 @@
 	-DEDS_DISABLE_DEPRECATED=1 \
 	-Wdeclaration-after-statement \
 	-Werror-implicit-function-declaration \
-	-fno-strict-aliasing"
+	-fno-strict-aliasing \
+	-Werror"
 %endif
 
 # Temporarily disabled: # GNOME_DRUID_PAGE_STANDARD uses GTK_CHECK_CAST.
@@ -150,6 +155,10 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.91-1.fc10
+- Update to 2.23.91
+- Add -Werror to CFLAGS.
+
 * Wed Aug 20 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.90-1.fc10
 - Update to 2.23.90
 - Bump eds_version to 2.23.90.1.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	20 Aug 2008 21:30:47 -0000	1.27
+++ sources	1 Sep 2008 12:52:33 -0000	1.28
@@ -1 +1 @@
-d621b5527d2ba8d14a087d218c36de05  evolution-exchange-2.23.90.tar.bz2
+7b5cfd121b84c49ca7a16052c945cd64  evolution-exchange-2.23.91.tar.bz2



From apevec at fedoraproject.org  Mon Sep  1 12:53:46 2008
From: apevec at fedoraproject.org (Alan Pevec)
Date: Mon,  1 Sep 2008 12:53:46 +0000 (UTC)
Subject: rpms/collectd/EL-5 collectd.spec,1.14,1.15
Message-ID: <20080901125346.BAD947011A@cvs1.fedora.phx.redhat.com>

Author: apevec

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

Modified Files:
	collectd.spec 
Log Message:
* Mon Sep 01 2008 Alan Pevec <apevec at redhat.com> 4.4.2-1
- New upstream release 4.4.2.




Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/EL-5/collectd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- collectd.spec	28 Aug 2008 13:42:06 -0000	1.14
+++ collectd.spec	1 Sep 2008 12:53:16 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
-Version: 4.4.1
-Release: 9%{?dist}
+Version: 4.4.2
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://collectd.org/
@@ -367,6 +367,9 @@
 
 
 %changelog
+* Mon Sep 01 2008 Alan Pevec <apevec at redhat.com> 4.4.2-1
+- New upstream release 4.4.2.
+
 * Thu Aug 28 2008 Richard W.M. Jones <rjones at redhat.com> 4.4.1-9
 - Exclude libvirt module, Xen deps, on PPC.
 - Exclude sensors module also on PPC.



From apevec at fedoraproject.org  Mon Sep  1 12:55:13 2008
From: apevec at fedoraproject.org (Alan Pevec)
Date: Mon,  1 Sep 2008 12:55:13 +0000 (UTC)
Subject: rpms/collectd/EL-5 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <20080901125513.5F50C7011A@cvs1.fedora.phx.redhat.com>

Author: apevec

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

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Sep 01 2008 Alan Pevec <apevec at redhat.com> 4.4.2-1
- New upstream release 4.4.2.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Jun 2008 13:39:27 -0000	1.4
+++ .cvsignore	1 Sep 2008 12:54:43 -0000	1.5
@@ -1 +1 @@
-collectd-4.4.1.tar.bz2
+collectd-4.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Jun 2008 13:39:27 -0000	1.4
+++ sources	1 Sep 2008 12:54:43 -0000	1.5
@@ -1 +1 @@
-176880c32a06bee9d5e6e2e7c76751a3  collectd-4.4.1.tar.bz2
+faee2bb6e38da1051fdd31762bdf3ab7  collectd-4.4.2.tar.bz2



From varekova at fedoraproject.org  Mon Sep  1 13:04:10 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon,  1 Sep 2008 13:04:10 +0000 (UTC)
Subject: rpms/gzip/devel gzip-1.3.9-rsync.patch,1.1,1.2
Message-ID: <20080901130410.AE59E7011A@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	gzip-1.3.9-rsync.patch 
Log Message:
update patch


gzip-1.3.9-rsync.patch:

Index: gzip-1.3.9-rsync.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gzip/devel/gzip-1.3.9-rsync.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gzip-1.3.9-rsync.patch	15 Jan 2007 16:42:27 -0000	1.1
+++ gzip-1.3.9-rsync.patch	1 Sep 2008 13:04:10 -0000	1.2
@@ -1,42 +1,7 @@
---- gzip-1.3.9/gzip.c.pom	2007-01-15 14:32:26.000000000 +0100
-+++ gzip-1.3.9/gzip.c	2007-01-15 14:54:08.000000000 +0100
-@@ -238,6 +238,7 @@
- unsigned insize;           /* valid bytes in inbuf */
- unsigned inptr;            /* index of next byte to be processed in inbuf */
- unsigned outcnt;           /* bytes in output buffer */
-+int rsync = 0;             /* make ryncable chunks */
- 
- struct option longopts[] =
- {
-@@ -267,6 +268,7 @@
-     {"best",       0, 0, '9'}, /* compress better */
-     {"lzw",        0, 0, 'Z'}, /* make output compatible with old compress */
-     {"bits",       1, 0, 'b'}, /* max number of bits per code (implies -Z) */
-+    {"rsyncable",  0, 0, 'R'}, /* make rsync-friendly archive */      
-     { 0, 0, 0, 0 }
- };
- 
-@@ -348,6 +350,7 @@
-  "  -Z, --lzw         produce output compatible with old compress",
-  "  -b, --bits=BITS   max number of bits per code (implies -Z)",
- #endif
-+ "    --rsyncable   Make rsync-friendly archive",  
-  "",
-  "With no FILE, or when FILE is -, read standard input.",
-  "",
-@@ -473,6 +476,9 @@
- 	    recursive = 1;
- #endif
- 	    break;
-+
-+        case 'R':
-+	    rsync = 1; break;
- 	case 'S':
- #ifdef NO_MULTIPLE_DOTS
-             if (*optarg == '.') optarg++;
---- gzip-1.3.9/trees.c.pom	2006-11-20 09:40:33.000000000 +0100
-+++ gzip-1.3.9/trees.c	2007-01-15 14:58:42.000000000 +0100
-@@ -860,9 +860,10 @@
+diff -up gzip-1.3.12/trees.c.rsync gzip-1.3.12/trees.c
+--- gzip-1.3.12/trees.c.rsync	2006-11-20 09:40:33.000000000 +0100
++++ gzip-1.3.12/trees.c	2008-09-01 14:35:12.000000000 +0200
+@@ -860,9 +860,10 @@ local void send_all_trees(lcodes, dcodes
   * trees or store, and output the encoded block to the zip file. This function
   * returns the total compressed length for the file so far.
   */
@@ -48,7 +13,7 @@
      int eof;          /* true if this is the last block for a file */
  {
      ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
-@@ -955,6 +956,10 @@
+@@ -955,6 +956,10 @@ off_t flush_block(buf, stored_len, eof)
          Assert (input_len == bytes_in, "bad input size");
          bi_windup();
          compressed_len += 7;  /* align on byte boundary */
@@ -59,9 +24,10 @@
      }
  
      return compressed_len >> 3;
---- gzip-1.3.9/deflate.c.pom	2006-12-08 00:53:00.000000000 +0100
-+++ gzip-1.3.9/deflate.c	2007-01-15 15:25:40.000000000 +0100
-@@ -135,6 +135,14 @@
+diff -up gzip-1.3.12/deflate.c.rsync gzip-1.3.12/deflate.c
+--- gzip-1.3.12/deflate.c.rsync	2006-12-08 00:53:00.000000000 +0100
++++ gzip-1.3.12/deflate.c	2008-09-01 14:35:12.000000000 +0200
+@@ -135,6 +135,14 @@ static char rcsid[] = "$Id: deflate.c,v 
  #endif
  /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
  
@@ -76,7 +42,7 @@
  /* ===========================================================================
   * Local data used by the "longest match" routines.
   */
-@@ -216,6 +224,8 @@
+@@ -216,6 +224,8 @@ local int compr_level;
  unsigned near good_match;
  /* Use a faster search when the previous match is longer than this */
  
@@ -85,7 +51,7 @@
  
  /* Values for max_lazy_match, good_match and max_chain_length, depending on
   * the desired pack level (0..9). The values given below have been tuned to
-@@ -314,6 +324,10 @@
+@@ -314,6 +324,10 @@ void lm_init (pack_level, flags)
  #endif
      /* prev will be initialized on the fly */
  
@@ -96,7 +62,7 @@
      /* Set the default configuration parameters:
       */
      max_lazy_match   = configuration_table[pack_level].max_lazy;
-@@ -550,6 +564,8 @@
+@@ -550,6 +564,8 @@ local void fill_window()
          memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE);
          match_start -= WSIZE;
          strstart    -= WSIZE; /* we now have strstart >= MAX_DIST: */
@@ -105,7 +71,7 @@
  
          block_start -= (long) WSIZE;
  
-@@ -577,13 +593,46 @@
+@@ -577,13 +593,46 @@ local void fill_window()
      }
  }
  
@@ -153,7 +119,7 @@
  
  /* ===========================================================================
   * Processes a new input file and return its compressed length. This
-@@ -594,7 +643,7 @@
+@@ -594,7 +643,7 @@ local void fill_window()
  local off_t deflate_fast()
  {
      IPos hash_head; /* head of the hash chain */
@@ -162,7 +128,7 @@
      unsigned match_length = 0;  /* length of best match */
  
      prev_length = MIN_MATCH-1;
-@@ -624,6 +673,7 @@
+@@ -624,6 +673,7 @@ local off_t deflate_fast()
  
              lookahead -= match_length;
  
@@ -170,7 +136,7 @@
  	    /* Insert new strings in the hash table only if the match length
               * is not too large. This saves time but degrades compression.
               */
-@@ -652,9 +702,14 @@
+@@ -652,9 +702,14 @@ local off_t deflate_fast()
              /* No match, output a literal byte */
              Tracevv((stderr,"%c",window[strstart]));
              flush = ct_tally (0, window[strstart]);
@@ -185,7 +151,7 @@
          if (flush) FLUSH_BLOCK(0), block_start = strstart;
  
          /* Make sure that we always have enough lookahead, except
-@@ -728,6 +783,7 @@
+@@ -728,6 +783,7 @@ off_t deflate()
               */
              lookahead -= prev_length-1;
              prev_length -= 2;
@@ -193,7 +159,7 @@
              do {
                  strstart++;
                  INSERT_STRING(strstart, hash_head);
-@@ -740,24 +796,40 @@
+@@ -740,24 +796,40 @@ off_t deflate()
              match_available = 0;
              match_length = MIN_MATCH-1;
              strstart++;
@@ -237,9 +203,47 @@
              strstart++;
              lookahead--;
          }
---- gzip-1.3.9/gzip.h.pom	2006-12-11 19:54:39.000000000 +0100
-+++ gzip-1.3.9/gzip.h	2007-01-15 14:47:01.000000000 +0100
-@@ -155,6 +155,7 @@
+diff -up gzip-1.3.12/gzip.c.rsync gzip-1.3.12/gzip.c
+--- gzip-1.3.12/gzip.c.rsync	2007-03-20 06:09:51.000000000 +0100
++++ gzip-1.3.12/gzip.c	2008-09-01 14:35:12.000000000 +0200
+@@ -231,6 +231,7 @@ int  ofd;                  /* output fil
+ unsigned insize;           /* valid bytes in inbuf */
+ unsigned inptr;            /* index of next byte to be processed in inbuf */
+ unsigned outcnt;           /* bytes in output buffer */
++int rsync = 0;             /* make ryncable chunks */
+ 
+ struct option longopts[] =
+ {
+@@ -260,6 +261,7 @@ struct option longopts[] =
+     {"best",       0, 0, '9'}, /* compress better */
+     {"lzw",        0, 0, 'Z'}, /* make output compatible with old compress */
+     {"bits",       1, 0, 'b'}, /* max number of bits per code (implies -Z) */
++    {"rsyncable",  0, 0, 'R'}, /* make rsync-friendly archive */      
+     { 0, 0, 0, 0 }
+ };
+ 
+@@ -341,6 +343,7 @@ local void help()
+  "  -Z, --lzw         produce output compatible with old compress",
+  "  -b, --bits=BITS   max number of bits per code (implies -Z)",
+ #endif
++ "    --rsyncable   Make rsync-friendly archive",  
+  "",
+  "With no FILE, or when FILE is -, read standard input.",
+  "",
+@@ -469,6 +472,9 @@ int main (argc, argv)
+ 	    recursive = 1;
+ #endif
+ 	    break;
++
++        case 'R':
++	    rsync = 1; break;
+ 	case 'S':
+ #ifdef NO_MULTIPLE_DOTS
+             if (*optarg == '.') optarg++;
+diff -up gzip-1.3.12/gzip.h.rsync gzip-1.3.12/gzip.h
+--- gzip-1.3.12/gzip.h.rsync	2007-03-20 06:09:51.000000000 +0100
++++ gzip-1.3.12/gzip.h	2008-09-01 14:35:12.000000000 +0200
+@@ -158,6 +158,7 @@ EXTERN(uch, window);         /* Sliding 
  extern unsigned insize; /* valid bytes in inbuf */
  extern unsigned inptr;  /* index of next byte to be processed in inbuf */
  extern unsigned outcnt; /* bytes in output buffer */
@@ -247,7 +251,7 @@
  
  extern off_t bytes_in;   /* number of input bytes */
  extern off_t bytes_out;  /* number of output bytes */
-@@ -303,7 +304,7 @@
+@@ -306,7 +307,7 @@ off_t deflate OF((void));
          /* in trees.c */
  void ct_init     OF((ush *attr, int *method));
  int  ct_tally    OF((int dist, int lc));
@@ -256,11 +260,12 @@
  
          /* in bits.c */
  void     bi_init    OF((file_t zipfile));
---- gzip-1.3.9/doc/gzip.texi.pom	2006-12-08 19:45:37.000000000 +0100
-+++ gzip-1.3.9/doc/gzip.texi	2007-01-15 15:30:00.000000000 +0100
-@@ -334,6 +334,14 @@
+diff -up gzip-1.3.12/doc/gzip.texi.rsync gzip-1.3.12/doc/gzip.texi
+--- gzip-1.3.12/doc/gzip.texi.rsync	2007-02-06 00:29:04.000000000 +0100
++++ gzip-1.3.12/doc/gzip.texi	2008-09-01 14:35:12.000000000 +0200
+@@ -350,6 +350,14 @@ specified on the command line are direct
  into the directory and compress all the files it finds there (or
- decompress them in the case of @code{gunzip}).
+ decompress them in the case of @command{gunzip}).
  
 + at item --rsyncable
 +While compressing, synchronize the output occasionally based on the
@@ -272,4 +277,4 @@
 +
  @item --suffix @var{suf}
  @itemx -S @var{suf}
- Use suffix @samp{@var{suf}} instead of @samp{.gz}. Any suffix can be
+ Use suffix @var{suf} instead of @samp{.gz}.  Any suffix can be



From nim at fedoraproject.org  Mon Sep  1 13:05:19 2008
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Mon,  1 Sep 2008 13:05:19 +0000 (UTC)
Subject: rpms/yanone-kaffeesatz-fonts/devel import.log, 1.1, 1.2 sources, 1.2,
	1.3 yanone-kaffeesatz-fonts.spec, 1.2, 1.3
Message-ID: <20080901130519.6C65D7011A@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/yanone-kaffeesatz-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21715/devel

Modified Files:
	import.log sources yanone-kaffeesatz-fonts.spec 
Log Message:
New upstream version


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/yanone-kaffeesatz-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Jul 2008 20:57:44 -0000	1.1
+++ import.log	1 Sep 2008 13:04:49 -0000	1.2
@@ -1 +1,2 @@
 yanone-kaffeesatz-fonts-20061120-3_fc10:HEAD:yanone-kaffeesatz-fonts-20061120-3.fc10.src.rpm:1215809853
+yanone-kaffeesatz-fonts-20080723-1_fc10:HEAD:yanone-kaffeesatz-fonts-20080723-1.fc10.src.rpm:1220274279


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yanone-kaffeesatz-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Jan 2008 21:54:30 -0000	1.2
+++ sources	1 Sep 2008 13:04:49 -0000	1.3
@@ -1,2 +1,2 @@
 de481a4a60844f8af57346844faac70b  YanoneKaffeesatz.pdf
-9361791c13be2e38d289977166a634ed  YanoneKaffeesatz.zip
+88a4dee6335c39fe30f26da00420444c  YanoneKaffeesatz.zip


Index: yanone-kaffeesatz-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/yanone-kaffeesatz-fonts/devel/yanone-kaffeesatz-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- yanone-kaffeesatz-fonts.spec	11 Jul 2008 20:57:44 -0000	1.2
+++ yanone-kaffeesatz-fonts.spec	1 Sep 2008 13:04:49 -0000	1.3
@@ -5,8 +5,8 @@
 %define archivename YanoneKaffeesatz
 
 Name:    %{fontname}-fonts
-Version: 20061120
-Release: 3%{?dist}
+Version: 20080723
+Release: 1%{?dist}
 Summary: Yanone Kaffeesatz decorative fonts
 
 Group:   User Interface/X
@@ -70,6 +70,10 @@
 
 
 %changelog
+* Mon Sep 1 2008 <nicolas.mailhot at laposte.net>
+- 20080723-1
+??? Upstream stealth update
+
 * Fri Jul 11 2008 <nicolas.mailhot at laposte.net>
 - 20061120-4
 ??? Fedora 10 alpha general package cleanup



From harald at fedoraproject.org  Mon Sep  1 13:06:49 2008
From: harald at fedoraproject.org (Harald Hoyer)
Date: Mon,  1 Sep 2008 13:06:49 +0000 (UTC)
Subject: rpms/pciutils/devel pciutils.spec,1.60,1.61
Message-ID: <20080901130649.CA03D7011A@cvs1.fedora.phx.redhat.com>

Author: harald

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

Modified Files:
	pciutils.spec 
Log Message:
* Mon Sep 01 2008 Harald Hoyer <harald at redhat.com> 3.0.0-2
- rebuild to eliminate fuzz patches



Index: pciutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- pciutils.spec	2 Jun 2008 05:47:56 -0000	1.60
+++ pciutils.spec	1 Sep 2008 13:06:19 -0000	1.61
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	3.0.0
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch1: 	pciutils-2.2.4-buf.patch
 Patch2:		pciutils-2.1.10-scan.patch
@@ -105,6 +105,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Sep 01 2008 Harald Hoyer <harald at redhat.com> 3.0.0-2
+- rebuild to eliminate fuzz patches
+
 * Mon Jun 02 2008 Harald Hoyer <harald at redhat.com> 3.0.0-1
 - version 3.0.0
 



From mbarnes at fedoraproject.org  Mon Sep  1 13:13:24 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon,  1 Sep 2008 13:13:24 +0000 (UTC)
Subject: rpms/evolution-data-server/devel
	evolution-data-server-2.23.91-compiler-warnings.patch, NONE,
	1.1 .cvsignore, 1.91, 1.92 evolution-data-server.spec, 1.232,
	1.233 sources, 1.91, 1.92
Message-ID: <20080901131324.496B47011A@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-serv22359

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Added Files:
	evolution-data-server-2.23.91-compiler-warnings.patch 
Log Message:

* Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.91-1.fc10
- Update to 2.23.91


evolution-data-server-2.23.91-compiler-warnings.patch:

--- NEW FILE evolution-data-server-2.23.91-compiler-warnings.patch ---
diff -up evolution-data-server-2.23.91/configure.in.no-liconv evolution-data-server-2.23.91/configure.in
--- evolution-data-server-2.23.91/configure.in.no-liconv	2008-09-01 08:48:28.000000000 -0400
+++ evolution-data-server-2.23.91/configure.in	2008-09-01 08:51:24.000000000 -0400
@@ -349,8 +349,8 @@ if test $have_iconv = yes; then
 
 int main (int argc, char **argv)
 {
-	const char *from = "Some Text \xA4";
-	const char *utf8 = "Some Text \xC2\xA4";
+	char *from = "Some Text \xA4";
+	char *utf8 = "Some Text \xC2\xA4";
 	char *transbuf = malloc (20), *trans = transbuf;
 	iconv_t cd;
 	size_t from_len = strlen (from), utf8_len = 20;
@@ -417,6 +417,7 @@ dnl Check to see if strftime supports th
 
 AC_MSG_CHECKING(for %l and %k support in strftime)
 AC_TRY_RUN([
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- .cvsignore	20 Aug 2008 21:30:39 -0000	1.91
+++ .cvsignore	1 Sep 2008 13:12:53 -0000	1.92
@@ -1 +1 @@
-evolution-data-server-2.23.90.1.tar.bz2
+evolution-data-server-2.23.91.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- evolution-data-server.spec	20 Aug 2008 21:30:40 -0000	1.232
+++ evolution-data-server.spec	1 Sep 2008 13:12:53 -0000	1.233
@@ -28,7 +28,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.23.90.1
+Version: 2.23.91
 Release: 1%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
@@ -51,6 +51,8 @@
 # RH bug #243296
 Patch13: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
+Patch14: evolution-data-server-2.23.91-compiler-warnings.patch
+
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -129,6 +131,7 @@
 %patch11 -p1 -b .fix-ldap-query
 %patch12 -p1 -b .camel-folder-summary-crash
 %patch13 -p1 -b .fix-64bit-acinclude
+%patch14 -p1 -b .compiler-warnings
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -374,6 +377,9 @@
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.91-1.fc10
+- Update to 2.23.91
+
 * Wed Aug 20 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.90.1-1.fc10
 - Update to 2.23.90.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- sources	20 Aug 2008 21:30:40 -0000	1.91
+++ sources	1 Sep 2008 13:12:53 -0000	1.92
@@ -1 +1 @@
-b196fb22c92fa7e344c957267d2cf3db  evolution-data-server-2.23.90.1.tar.bz2
+c5c7dc31421f33f6665e66661599cae0  evolution-data-server-2.23.91.tar.bz2



From harald at fedoraproject.org  Mon Sep  1 13:18:56 2008
From: harald at fedoraproject.org (Harald Hoyer)
Date: Mon,  1 Sep 2008 13:18:56 +0000 (UTC)
Subject: rpms/pciutils/devel pciutils-2.1.10-scan.patch, 1.1,
	1.2 pciutils-2.1.99-gcc4.patch, 1.1,
	1.2 pciutils-2.2.1-idpath.patch, 1.1,
	1.2 pciutils-2.2.10-sparc-support.patch, 1.1,
	1.2 pciutils-2.2.4-buf.patch, 1.1,
	1.2 pciutils-3.0.0-multilib.patch, 1.1, 1.2 pciutils-dir-d.patch,
	1.3, 1.4 pciutils-havepread.patch, 1.3, 1.4
Message-ID: <20080901131856.7B6F47011A@cvs1.fedora.phx.redhat.com>

Author: harald

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

Modified Files:
	pciutils-2.1.10-scan.patch pciutils-2.1.99-gcc4.patch 
	pciutils-2.2.1-idpath.patch 
	pciutils-2.2.10-sparc-support.patch pciutils-2.2.4-buf.patch 
	pciutils-3.0.0-multilib.patch pciutils-dir-d.patch 
	pciutils-havepread.patch 
Log Message:
* Mon Sep 01 2008 Harald Hoyer <harald at redhat.com> 3.0.0-2
- rebuild to eliminate fuzz patches


pciutils-2.1.10-scan.patch:

Index: pciutils-2.1.10-scan.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pciutils/devel/pciutils-2.1.10-scan.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pciutils-2.1.10-scan.patch	9 Sep 2004 10:00:52 -0000	1.1
+++ pciutils-2.1.10-scan.patch	1 Sep 2008 13:18:55 -0000	1.2
@@ -1,6 +1,7 @@
---- pciutils-2.1.10/lib/access.c.foo	Wed Feb 12 15:44:05 2003
-+++ pciutils-2.1.10/lib/access.c	Wed Feb 12 15:44:33 2003
-@@ -180,7 +180,8 @@
+diff -up pciutils-3.0.0/lib/access.c.scan pciutils-3.0.0/lib/access.c
+--- pciutils-3.0.0/lib/access.c.scan	2008-04-10 21:15:47.000000000 +0200
++++ pciutils-3.0.0/lib/access.c	2008-09-01 15:15:27.000000000 +0200
+@@ -16,7 +16,8 @@
  void
  pci_scan_bus(struct pci_access *a)
  {

pciutils-2.1.99-gcc4.patch:

Index: pciutils-2.1.99-gcc4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pciutils/devel/pciutils-2.1.99-gcc4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pciutils-2.1.99-gcc4.patch	14 Mar 2005 17:36:54 -0000	1.1
+++ pciutils-2.1.99-gcc4.patch	1 Sep 2008 13:18:55 -0000	1.2
@@ -1,9 +1,7 @@
-Patch by Robert Scheck <redhat at linuxnetz.de> for pciutils >= 2.1.99, which make pciutils
-rebuildable using gcc 4.
-
---- pciutils-2.1.99-test8/lib/i386-ports.c		2004-08-13 22:13:11.000000000 +0200
-+++ pciutils-2.1.99-test8/lib/i386-ports.c.gcc4		2005-03-14 09:30:06.000000000 +0100
-@@ -57,9 +57,9 @@
+diff -up pciutils-3.0.0/lib/i386-ports.c.glibcmacros pciutils-3.0.0/lib/i386-ports.c
+--- pciutils-3.0.0/lib/i386-ports.c.glibcmacros	2008-04-10 21:15:47.000000000 +0200
++++ pciutils-3.0.0/lib/i386-ports.c	2008-09-01 15:16:42.000000000 +0200
+@@ -70,9 +70,9 @@ intel_sanity_check(struct pci_access *a,
    for(d.dev = 0; d.dev < 32; d.dev++)
      {
        u16 class, vendor;

pciutils-2.2.1-idpath.patch:

Index: pciutils-2.2.1-idpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pciutils/devel/pciutils-2.2.1-idpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pciutils-2.2.1-idpath.patch	23 Feb 2006 11:40:50 -0000	1.1
+++ pciutils-2.2.1-idpath.patch	1 Sep 2008 13:18:55 -0000	1.2
@@ -1,11 +1,12 @@
---- pciutils-2.2.1/Makefile.idpath	2006-02-23 12:24:12.000000000 +0100
-+++ pciutils-2.2.1/Makefile	2006-02-23 12:24:18.000000000 +0100
-@@ -10,7 +10,7 @@
+diff -up pciutils-3.0.0/Makefile.idpath pciutils-3.0.0/Makefile
+--- pciutils-3.0.0/Makefile.idpath	2008-04-10 21:19:43.000000000 +0200
++++ pciutils-3.0.0/Makefile	2008-09-01 15:16:19.000000000 +0200
+@@ -27,7 +27,7 @@ ABI_VERSION=.3
  PREFIX=/usr/local
  SBINDIR=$(PREFIX)/sbin
  SHAREDIR=$(PREFIX)/share
 -IDSDIR=$(SHAREDIR)
 +IDSDIR=$(SHAREDIR)/hwdata
  MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
- INSTALL=install
- DIRINSTALL=install -d
+ INCDIR=$(PREFIX)/include
+ LIBDIR=$(PREFIX)/lib

pciutils-2.2.10-sparc-support.patch:

Index: pciutils-2.2.10-sparc-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pciutils/devel/pciutils-2.2.10-sparc-support.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pciutils-2.2.10-sparc-support.patch	27 May 2008 00:07:16 -0000	1.1
+++ pciutils-2.2.10-sparc-support.patch	1 Sep 2008 13:18:55 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up pciutils-2.2.10/lib/configure.BAD pciutils-2.2.10/lib/configure
---- pciutils-2.2.10/lib/configure.BAD	2008-05-26 18:28:51.000000000 -0500
-+++ pciutils-2.2.10/lib/configure	2008-05-26 18:30:13.000000000 -0500
-@@ -57,6 +57,10 @@ cat >$c <<EOF
+diff -up pciutils-3.0.0/lib/configure.sparc pciutils-3.0.0/lib/configure
+--- pciutils-3.0.0/lib/configure.sparc	2008-09-01 15:17:44.000000000 +0200
++++ pciutils-3.0.0/lib/configure	2008-09-01 15:17:44.000000000 +0200
+@@ -62,6 +62,10 @@ define PCI_ARCH_S390X
  #define PCI_ARCH_S390
  #elif defined(__alpha__)
  #define PCI_ARCH_ALPHA

pciutils-2.2.4-buf.patch:

Index: pciutils-2.2.4-buf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pciutils/devel/pciutils-2.2.4-buf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pciutils-2.2.4-buf.patch	26 Jan 2007 12:54:59 -0000	1.1
+++ pciutils-2.2.4-buf.patch	1 Sep 2008 13:18:55 -0000	1.2
@@ -1,6 +1,7 @@
---- pciutils-2.2.4/lib/names.c.buf	2006-09-09 12:46:39.000000000 +0200
-+++ pciutils-2.2.4/lib/names.c	2007-01-26 13:47:01.000000000 +0100
-@@ -372,12 +372,27 @@
+diff -up pciutils-3.0.0/lib/names.c.buf pciutils-3.0.0/lib/names.c
+--- pciutils-3.0.0/lib/names.c.buf	2008-04-10 21:15:47.000000000 +0200
++++ pciutils-3.0.0/lib/names.c	2008-09-01 15:14:58.000000000 +0200
+@@ -65,12 +65,27 @@ format_name(char *buf, int size, int fla
      res = snprintf(buf, size, "%s", num);
    else if (!name)
      res = snprintf(buf, size, ((flags & PCI_LOOKUP_MIXED) ? "%s [%s]" : "%s %s"), unknown, num);
@@ -30,9 +31,9 @@
    else
      return buf;
  }
-@@ -408,8 +423,24 @@
+@@ -101,8 +116,24 @@ format_name_pair(char *buf, int size, in
        else /* v && !d */
- 	res = snprintf(buf, size, "%s Unknown device %s", v, num+5);
+ 	res = snprintf(buf, size, "%s Device %s", v, num+5);
      }
 -  if (res < 0 || res >= size)
 +  if (res < 0 || res >= size) {

pciutils-3.0.0-multilib.patch:

Index: pciutils-3.0.0-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pciutils/devel/pciutils-3.0.0-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pciutils-3.0.0-multilib.patch	2 Jun 2008 05:47:56 -0000	1.1
+++ pciutils-3.0.0-multilib.patch	1 Sep 2008 13:18:55 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up pciutils-3.0.0/lib/configure.multilib pciutils-3.0.0/lib/configure
 --- pciutils-3.0.0/lib/configure.multilib	2008-04-10 21:15:47.000000000 +0200
-+++ pciutils-3.0.0/lib/configure	2008-06-02 06:46:35.000000000 +0200
++++ pciutils-3.0.0/lib/configure	2008-09-01 15:17:03.000000000 +0200
 @@ -41,28 +41,61 @@ sys=`echo $host | sed 's/^\([^-]*\)-\([^
  echo " $host $rel"
  

pciutils-dir-d.patch:

Index: pciutils-dir-d.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pciutils/devel/pciutils-dir-d.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pciutils-dir-d.patch	2 Jun 2008 05:47:56 -0000	1.3
+++ pciutils-dir-d.patch	1 Sep 2008 13:18:55 -0000	1.4
@@ -1,6 +1,6 @@
 diff -up pciutils-3.0.0/lib/names-parse.c.dird pciutils-3.0.0/lib/names-parse.c
 --- pciutils-3.0.0/lib/names-parse.c.dird	2008-04-10 21:15:47.000000000 +0200
-+++ pciutils-3.0.0/lib/names-parse.c	2008-06-02 07:39:59.000000000 +0200
++++ pciutils-3.0.0/lib/names-parse.c	2008-09-01 15:17:23.000000000 +0200
 @@ -6,10 +6,13 @@
   *	Can be freely distributed and used under the terms of the GNU GPL.
   */
@@ -101,7 +101,7 @@
 +}   
 diff -up pciutils-3.0.0/lib/pci.h.dird pciutils-3.0.0/lib/pci.h
 --- pciutils-3.0.0/lib/pci.h.dird	2008-04-10 21:23:05.000000000 +0200
-+++ pciutils-3.0.0/lib/pci.h	2008-06-02 07:39:41.000000000 +0200
++++ pciutils-3.0.0/lib/pci.h	2008-09-01 15:17:23.000000000 +0200
 @@ -194,6 +194,7 @@ int pci_load_name_list(struct pci_access
  void pci_free_name_list(struct pci_access *a) PCI_ABI;	/* Called automatically by pci_cleanup() */
  void pci_set_name_list_path(struct pci_access *a, char *name, int to_be_freed) PCI_ABI;

pciutils-havepread.patch:

Index: pciutils-havepread.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pciutils/devel/pciutils-havepread.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pciutils-havepread.patch	9 Sep 2004 10:04:02 -0000	1.3
+++ pciutils-havepread.patch	1 Sep 2008 13:18:55 -0000	1.4
@@ -1,5 +1,6 @@
---- pciutils-2.1.99-test8/lib/pread.h.pread	2004-08-13 16:15:46.000000000 -0400
-+++ pciutils-2.1.99-test8/lib/pread.h	2004-08-31 00:30:03.168157294 -0400
+diff -up pciutils-3.0.0/lib/pread.h.pread pciutils-3.0.0/lib/pread.h
+--- pciutils-3.0.0/lib/pread.h.pread	2006-05-05 14:18:24.000000000 +0200
++++ pciutils-3.0.0/lib/pread.h	2008-09-01 15:15:53.000000000 +0200
 @@ -12,54 +12,6 @@
   *  don't define it.
   */



From mbarnes at fedoraproject.org  Mon Sep  1 13:30:44 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon,  1 Sep 2008 13:30:44 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.96, 1.97 evolution.spec, 1.352, 
	1.353 sources, 1.96, 1.97
Message-ID: <20080901133044.582327011A@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

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

* Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.91-1.fc10
- Update to 2.23.91
- Bump eds_version to 2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- .cvsignore	20 Aug 2008 21:30:43 -0000	1.96
+++ .cvsignore	1 Sep 2008 13:30:13 -0000	1.97
@@ -1 +1 @@
-evolution-2.23.90.tar.bz2
+evolution-2.23.91.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- evolution.spec	26 Aug 2008 02:50:48 -0000	1.352
+++ evolution.spec	1 Sep 2008 13:30:13 -0000	1.353
@@ -1,6 +1,6 @@
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
-%define eds_version 2.23.90.1
+%define eds_version 2.23.91
 %define glib2_version 2.16.0
 %define gnome_doc_utils_version 0.8.0
 %define gnome_icon_theme_version 2.19.91
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.23.90
-Release: 2%{?dist}
+Version: 2.23.91
+Release: 1%{?dist}
 License: GPLv2 and GFDL
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -652,6 +652,10 @@
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
 %changelog
+* Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.91-1.fc10
+- Update to 2.23.91
+- Bump eds_version to 2.23.91
+
 * Mon Aug 25 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.90-2.fc10
 - Bump gtkhtml_version to 3.23.5 (RH bug #460076).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- sources	20 Aug 2008 21:30:43 -0000	1.96
+++ sources	1 Sep 2008 13:30:13 -0000	1.97
@@ -1 +1 @@
-822234b835811a8abdacb1f865a5cb55  evolution-2.23.90.tar.bz2
+016dcb4db0d44ee3ca7ff4238a94ead8  evolution-2.23.91.tar.bz2



From hadess at fedoraproject.org  Mon Sep  1 14:09:49 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  1 Sep 2008 14:09:49 +0000 (UTC)
Subject: rpms/totem/devel totem.spec,1.197,1.198
Message-ID: <20080901140949.663CF7011A@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	totem.spec 
Log Message:
* Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.91-2
- Remove unneeded scrollkeeper BR (#460344)



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- totem.spec	29 Aug 2008 21:28:06 -0000	1.197
+++ totem.spec	1 Sep 2008 14:09:19 -0000	1.198
@@ -10,7 +10,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.23.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 with exception
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/totem/
@@ -34,7 +34,7 @@
 #Requires: %{name}-backend = %{version}-%{release}
 Requires: %{name}-gstreamer
 
-BuildRequires: gcc-c++, pkgconfig, gettext, scrollkeeper
+BuildRequires: gcc-c++, pkgconfig, gettext
 BuildRequires: gnome-desktop-devel >= 2.6.0, libglade2-devel
 BuildRequires: perl(XML::Parser) intltool
 BuildRequires: iso-codes-devel
@@ -412,6 +412,9 @@
 %endif
 
 %changelog
+* Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.91-2
+- Remove unneeded scrollkeeper BR (#460344)
+
 * Fri Aug 29 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 



From theinric at fedoraproject.org  Mon Sep  1 14:16:32 2008
From: theinric at fedoraproject.org (Tomas Heinrich)
Date: Mon,  1 Sep 2008 14:16:32 +0000 (UTC)
Subject: rpms/rsyslog/devel rsyslog-3.21.3-manual.patch, NONE,
	1.1 rsyslog.spec, 1.49, 1.50
Message-ID: <20080901141632.D98547011A@cvs1.fedora.phx.redhat.com>

Author: theinric

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

Modified Files:
	rsyslog.spec 
Added Files:
	rsyslog-3.21.3-manual.patch 
Log Message:
- fix a wrong module name in the rsyslog.conf manual page (#455086)
- expand the rsyslog.conf manual page (#456030)


rsyslog-3.21.3-manual.patch:

--- NEW FILE rsyslog-3.21.3-manual.patch ---
diff -up rsyslog-3.21.3/tools/rsyslog.conf.5.orig rsyslog-3.21.3/tools/rsyslog.conf.5
--- rsyslog-3.21.3/tools/rsyslog.conf.5.orig	2008-09-01 15:21:50.000000000 +0200
+++ rsyslog-3.21.3/tools/rsyslog.conf.5	2008-09-01 15:21:51.000000000 +0200
@@ -91,7 +91,7 @@ $ModLoad imtcp
 $InputTCPServerRun 514
 .TP
 .TP
-.I imtcp
+.I imrelp
 Input plugin for the RELP protocol. RELP can be used instead
 of UDP or plain TCP syslog to provide reliable delivery of
 syslog messages. Please note that plain TCP syslog does NOT
@@ -159,6 +159,54 @@ Every rule line consists of two fields, 
 two fields are separated by one or more spaces or tabs. The selector field specifies 
 a pattern of facilities and priorities belonging to the specified action.
 
+.SH SELECTORS
+
+The selector field itself again consists of two parts, a facility and a
+priority, separated by a period ('.'). Both parts are case insensitive and can
+also be specified as decimal numbers, but don't do that, you have been warned.
+Both facilities and priorities are described in rsyslog(3). The names mentioned
+below correspond to the similar LOG_-values in /usr/include/rsyslog.h.
+
+The facility is one of the following keywords: auth, authpriv, cron, daemon,
+kern, lpr, mail, mark, news, security (same as auth), syslog, user, uucp and
+local0 through local7. The keyword security should not be used anymore and mark
+is only for internal use and therefore should not be used in applications.
+Anyway, you may want to specify and redirect these messages here. The facility
+specifies the subsystem that produced the message, i.e. all mail programs log
+with the mail facility (LOG_MAIL) if they log using syslog.
+
+The priority is one of the following keywords, in ascending order: debug, info,
+notice, warning, warn (same as warning), err, error (same as err), crit, alert,
+emerg, panic (same as emerg). The keywords error, warn and panic are deprecated
+and should not be used anymore. The priority defines the severity of the message.
+
+The behavior of the original BSD syslogd is that all messages of the specified
+priority and higher are logged according to the given action. Rsyslogd behaves
+the same, but has some extensions.
+
+In addition to the above mentioned names the rsyslogd(8) understands the
+following extensions: An asterisk ('*') stands for all facilities or all
+priorities, depending on where it is used (before or after the period). The
+keyword none stands for no priority of the given facility.
+
+You can specify multiple facilities with the same priority pattern in one
+statement using the comma (',') operator. You may specify as much facilities as
+you want. Remember that only the facility part from such a statement is taken, a
+priority part would be skipped.
+
+Multiple selectors may be specified for a single action using the semicolon
+(';') separator. Remember that each selector in the selector field is capable
+to overwrite the preceding ones. Using this behavior you can exclude some
+priorities from the pattern.
+
+Rsyslogd has a syntax extension to the original BSD source, that makes its use
+more intuitively. You may precede every priority with an equation sign ('=') to
+specify only this single priority and not any of the above. You may also (both
+is valid, too) precede the priority with an exclamation mark ('!') to ignore
+all that priorities, either exact this one or this and any higher priority. If
+you use both extensions than the exclamation mark must occur before the equation
+sign, just use it intuitively.
+
 .SH ACTIONS
 The action field of a rule describes what to do with the message. In general, message content 
 is written to a kind of "logfile". But also other actions might be done, like writing to a 


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- rsyslog.spec	28 Aug 2008 09:18:24 -0000	1.49
+++ rsyslog.spec	1 Sep 2008 14:16:02 -0000	1.50
@@ -3,7 +3,7 @@
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
 Version: 3.21.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -13,6 +13,7 @@
 Source3: rsyslog.sysconfig
 Source4: rsyslog.log
 Patch0: rsyslog-3.21.3-clock.patch
+Patch1: rsyslog-3.21.3-manual.patch
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake
 Requires: logrotate >= 3.5.2
@@ -88,7 +89,8 @@
 
 %prep
 %setup -q
-%patch -p1 -b .clock
+%patch0 -p1 -b .clock
+%patch1 -p1 -b .manual
 
 %build
 %configure	--sbindir=%{sbindir} \
@@ -193,6 +195,10 @@
 %{_libdir}/rsyslog/lmnsd_gtls.so
 
 %changelog
+* Mon Sep 01 2008 Tomas Heinrich <theinric at redhat.com> 3.21.3-3
+- fix a wrong module name in the rsyslog.conf manual page (#455086)
+- expand the rsyslog.conf manual page (#456030)
+
 * Thu Aug 28 2008 Tomas Heinrich <theinric at redhat.com> 3.21.3-2
 - fix clock rollback issue (#460230)
 



From kwizart at fedoraproject.org  Mon Sep  1 14:16:51 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon,  1 Sep 2008 14:16:51 +0000 (UTC)
Subject: rpms/PerceptualDiff/devel PerceptualDiff.spec,1.6,1.7
Message-ID: <20080901141651.5CA0C7011A@cvs1.fedora.phx.redhat.com>

Author: kwizart

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

Modified Files:
	PerceptualDiff.spec 
Log Message:
- Add Missing BR freeimage-devel



Index: PerceptualDiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PerceptualDiff/devel/PerceptualDiff.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PerceptualDiff.spec	1 Sep 2008 11:39:47 -0000	1.6
+++ PerceptualDiff.spec	1 Sep 2008 14:16:21 -0000	1.7
@@ -1,6 +1,6 @@
 Name:			PerceptualDiff          
 Version:		1.0.2
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		An image comparison utility
 
 Group:			Applications/Multimedia
@@ -9,7 +9,11 @@
 Source:			http://downloads.sourceforge.net/pdiff/%{name}-%{version}.tar.gz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libtiff-devel, libpng-devel, cmake
+BuildRequires: cmake
+BuildRequires: freeimage-devel
+BuildRequires: libtiff-devel
+BuildRequires: libpng-devel
+
 
 
 
@@ -32,12 +36,10 @@
 export  FFLAGS="$RPM_OPT_FLAGS"
 
 cmake \
-%if %{?_lib} == "lib64"
-	-DLIB_SUFFIX=64 \
-%endif
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
 	-DBUILD_SHARED_LIBS:BOOL=ON \
 	-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} .
+
 make VERBOSE=1 %{?_smp_mflags}
 
 
@@ -60,9 +62,11 @@
 
 
 %changelog
+* Mon Sep  1 2008 kwizart < kwizart at gmail.com > - 1.0.2-2
+- Add Missing BR freeimage-devel
+
 * Mon Sep  1 2008 kwizart < kwizart at gmail.com > - 1.0.2-1
 - Update to 1.0.2
-- Remove merged gcc43 patch
 
 * Sat Feb  9 2008 kwizart < kwizart at gmail.com > - 1.0.1-8
 - Rebuild for gcc43



From rhughes at fedoraproject.org  Mon Sep  1 14:19:01 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  1 Sep 2008 14:19:01 +0000 (UTC)
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.47,
	1.48 gnome-power-manager.spec, 1.124, 1.125 sources, 1.47, 1.48
Message-ID: <20080901141901.8AA4D7011A@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-serv26574

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
* Mon Sep 01 2008 Richard Hughes  <rhughes at redhat.com> - 2.23.91-1
- Update to 2.23.91, which should some translation issues.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	6 Aug 2008 12:18:48 -0000	1.47
+++ .cvsignore	1 Sep 2008 14:18:31 -0000	1.48
@@ -1 +1 @@
-gnome-power-manager-2.23.6.tar.gz
+gnome-power-manager-2.23.91.tar.gz


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- gnome-power-manager.spec	25 Aug 2008 22:29:03 -0000	1.124
+++ gnome-power-manager.spec	1 Sep 2008 14:18:31 -0000	1.125
@@ -4,17 +4,14 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.23.6
-Release: 4%{?dist}
+Version: 2.23.91
+Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.23/gnome-power-manager-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org/projects/gnome-power-manager/
 
-# upstream
-Patch0:    gpm-fix-percentage-types.patch
-
 BuildRequires: libgnomeui-devel
 BuildRequires: libglade2-devel
 BuildRequires: libwnck-devel
@@ -52,7 +49,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 %configure \
@@ -68,16 +64,10 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-desktop-file-install --vendor gnome                                     \
-  --dir $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow            \
-  $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/gnome-power-manager.desktop
 desktop-file-install --vendor gnome --delete-original                   \
   --dir $RPM_BUILD_ROOT%{_datadir}/gnome/autostart         		\
   $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/gnome-power-manager.desktop
 
-# this is provided by gdm now
-rm $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/gnome-power-manager.desktop
-
 %find_lang %name --with-gnome
 
 %clean
@@ -134,6 +124,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Mon Sep 01 2008 Richard Hughes  <rhughes at redhat.com> - 2.23.91-1
+- Update to 2.23.91, which should some translation issues.
+
 * Mon Aug 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.6-4
 - Drop the login session .desktop file, since gdm provides it now
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	6 Aug 2008 12:18:48 -0000	1.47
+++ sources	1 Sep 2008 14:18:31 -0000	1.48
@@ -1 +1 @@
-059780e397585c34c2b7ef514ee648dd  gnome-power-manager-2.23.6.tar.gz
+8f3f07ca7ab091d8fe5d7d27b0b68c49  gnome-power-manager-2.23.91.tar.gz



From hadess at fedoraproject.org  Mon Sep  1 14:27:25 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  1 Sep 2008 14:27:25 +0000 (UTC)
Subject: rpms/gstreamer/F-9 .cvsignore, 1.33, 1.34 gstreamer.spec, 1.78,
	1.79 sources, 1.34, 1.35
Message-ID: <20080901142725.31E5A7011A@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore gstreamer.spec sources 
Log Message:
* Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-1
- Update to 0.10.20



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/F-9/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	4 Apr 2008 10:38:16 -0000	1.33
+++ .cvsignore	1 Sep 2008 14:26:54 -0000	1.34
@@ -1 +1 @@
-gstreamer-0.10.19.tar.bz2
+gstreamer-0.10.20.tar.bz2


Index: gstreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/F-9/gstreamer.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gstreamer.spec	4 Apr 2008 10:38:16 -0000	1.78
+++ gstreamer.spec	1 Sep 2008 14:26:54 -0000	1.79
@@ -5,7 +5,7 @@
 %define 	_libxml2	2.4.0
 
 Name: 		%{gstreamer}
-Version: 	0.10.19
+Version: 	0.10.20
 Release: 	1%{?dist}
 Summary: 	GStreamer streaming media framework runtime
 
@@ -210,6 +210,9 @@
 %{_libdir}/rpm/gstreamer.prov
 
 %changelog
+* Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-1
+- Update to 0.10.20
+
 * Fri Apr 04 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.19-1
 - Update to 0.10.19
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/F-9/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	4 Apr 2008 10:38:16 -0000	1.34
+++ sources	1 Sep 2008 14:26:54 -0000	1.35
@@ -1 +1 @@
-12072a3168420350ea450749a3b63be8  gstreamer-0.10.19.tar.bz2
+d5af70413a65ebf855f788f965685e2b  gstreamer-0.10.20.tar.bz2



From than at fedoraproject.org  Mon Sep  1 14:31:32 2008
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  1 Sep 2008 14:31:32 +0000 (UTC)
Subject: rpms/kdepim/F-8 kdepim-3.5.10-metakit_sparc64.patch, NONE,
	1.1 sources, 1.46, 1.47 kdepim-3.5.9-kde#127696.patch, 1.1,
	NONE kdepim-3.5.x-kmail-imap-crash.patch, 1.1,
	NONE kdepim-kde#151150.patch, 1.1, NONE
Message-ID: <20080901143132.A34747011A@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28082

Modified Files:
	sources 
Added Files:
	kdepim-3.5.10-metakit_sparc64.patch 
Removed Files:
	kdepim-3.5.9-kde#127696.patch 
	kdepim-3.5.x-kmail-imap-crash.patch kdepim-kde#151150.patch 
Log Message:
3.5.10


kdepim-3.5.10-metakit_sparc64.patch:

--- NEW FILE kdepim-3.5.10-metakit_sparc64.patch ---
diff -up kdepim-3.5.10/akregator/src/mk4storage/metakit/include/mk4.h.metakit_sparc64 kdepim-3.5.10/akregator/src/mk4storage/metakit/include/mk4.h
--- kdepim-3.5.10/akregator/src/mk4storage/metakit/include/mk4.h.metakit_sparc64	2008-08-19 20:15:38.000000000 +0200
+++ kdepim-3.5.10/akregator/src/mk4storage/metakit/include/mk4.h	2008-09-01 14:24:34.000000000 +0200
@@ -101,6 +101,7 @@
     // and here's the other end of the scale...
 #if !defined (_WIN32) && !defined (q4_LONG64)
 #if (defined (_PA_RISC2_0) && defined(__hpux)) || defined (__powerpc64__) || defined(__sparcv9) || \
+    (defined(__linux__) && defined(__sparc__) && defined(__arch64__) ) || \
     defined (__x86_64__) || defined (__s390x__) || defined (__alpha) || defined (__mips64) || \
     (defined (__ia64) && (!defined (__HP_aCC) || defined(__LP64__)))
 #define q4_LONG64 1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-8/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	15 Feb 2008 22:16:29 -0000	1.46
+++ sources	1 Sep 2008 14:31:02 -0000	1.47
@@ -1,4 +1,4 @@
 024ab01d199f9e93c43df1ef0a03510c  cr16-app-kandy.png
 496c7bfc6247df2cf03aec342094ffd6  cr32-app-kandy.png
 fef385691270bad1e58e6eb5ed0ad6d6  cr48-app-kandy.png
-ba27b06599556c572a26f03608471ee2  kdepim-3.5.9.tar.bz2
+fc93e458a8eec8131ede56cff30c28b2  kdepim-3.5.10.tar.bz2


--- kdepim-3.5.9-kde#127696.patch DELETED ---


--- kdepim-3.5.x-kmail-imap-crash.patch DELETED ---


--- kdepim-kde#151150.patch DELETED ---



From vlg at fedoraproject.org  Mon Sep  1 14:32:05 2008
From: vlg at fedoraproject.org (Vladislav Grinchenko)
Date: Mon,  1 Sep 2008 14:32:05 +0000 (UTC)
Subject: rpms/granule/devel granule.spec,1.11,1.12 sources,1.7,1.8
Message-ID: <20080901143205.B52787011A@cvs1.fedora.phx.redhat.com>

Author: vlg

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

Modified Files:
	granule.spec sources 
Log Message:
devel : granule 1.4.0 build 7


Index: granule.spec
===================================================================
RCS file: /cvs/extras/rpms/granule/devel/granule.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- granule.spec	31 Aug 2008 20:04:14 -0000	1.11
+++ granule.spec	1 Sep 2008 14:31:35 -0000	1.12
@@ -4,7 +4,7 @@
 Summary:    Flashcards program based on Leitner methodology
 Name:       granule
 Version:    1.4.0
-Release:    6%{?dist}
+Release:    7%{?dist}
 License:    GPLv2+
 Group:      Applications/Multimedia
 URL:        http://granule.sourceforge.net/
@@ -73,7 +73,6 @@
 * Sun Aug 31 2008 Vladislav Grinchenko <vlg[AT]users.sourceforge.net> - 1.4.0-6
 - Fix config files installation.
 
-%changelog
 * Fri Jul 25 2008 Tom Callaway <tcallawa[AT]redhat.com> - 1.3.0-2
 - Fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/granule/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Aug 2008 20:04:15 -0000	1.7
+++ sources	1 Sep 2008 14:31:35 -0000	1.8
@@ -1 +1 @@
-5e5a719f926a87cf759445baf7b4154f  granule-1.4.0.tar.gz
+2382a09e3aa2cc27981f4875f0b13195  granule-1.4.0.tar.gz



From than at fedoraproject.org  Mon Sep  1 14:33:06 2008
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  1 Sep 2008 14:33:06 +0000 (UTC)
Subject: rpms/kdepim/F-8 kdepim.spec,1.148,1.149
Message-ID: <20080901143306.A532B7011A@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28295

Modified Files:
	kdepim.spec 
Log Message:
3.5.10



Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-8/kdepim.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- kdepim.spec	11 Apr 2008 15:04:33 -0000	1.148
+++ kdepim.spec	1 Sep 2008 14:32:36 -0000	1.149
@@ -1,9 +1,4 @@
 
-## enterprise branch
-#define etch_ver 3.5.6 
-#define ent_date 20080109 
-#define ent_rev 744693
-
 #define debug 1 
 ## --enable-final requires > 1GB VM, sometimes kills fedora's builders 
 #define final 1 
@@ -21,25 +16,14 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 3.5.9
+Version: 3.5.10
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:	 http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%if 0%{?ent_date} > 0
-# hmm, v3.5.6 eh?  FIXME? -- Rex
-#Source0: http://apt.intevation.de/dists/etch/unstable/source/kdepim_3.5.6.enterprise.0.20071204.744693.orig.tar.gz
-Source0: kdepim-enterprise-svn%{ent_date}.tar.bz2
-# script used to generate svn checkout Source0 above
-Source1: kdepim-enterprise-svn_checkout.sh
-
-Release: 9.%{ent_date}svn.ent%{?dist}
-%else
-Release: 9%{?dist}
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-%endif
 
 Source10: cr48-app-kandy.png
 Source11: cr32-app-kandy.png
@@ -50,19 +34,13 @@
 Patch2: kdepim-xdg_open.patch
 # patch by Dirk M??ller from openSUSE to fix gnokii detection
 Patch6: kdepim-3.5.9-gnokii-no-libintl.patch
+# fix sparc64 build
+Patch7: kdepim-3.5.10-metakit_sparc64.patch
 
 ## upstream patches
 # LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.9/kdepim/kitchensync at 774532 \
 # svn://anonsvn.kde.org/home/kde/branches/work/kitchensync-OpenSync0.30API at 774532 >kdepim-3.5.9-opensync03.patch
 Patch3: kdepim-3.5.9-opensync03.patch
-# http://websvn.kde.org/?view=rev&revision=775015
-# http://bugs.kde.org/127696
-# Upstream fix for "Unable to complete LIST operation" errors with some servers,
-Patch4: kdepim-3.5.9-kde#127696.patch
-# http://bugs.kde.org/151150
-# http://websvn.kde.org/?view=rev&revision=779994
-Patch5: kdepim-kde#151150.patch
-Patch100: kdepim-3.5.x-kmail-imap-crash.patch
 
 Provides: kdepim3 = %{version}-%{release}
 
@@ -157,20 +135,13 @@
 
 
 %prep
-## Ugh 3 options, switch this by hand
-# stock upstream 
 %setup -q
-# etch upstream sources
-#setup -q %{?etch_ver: -n kdepim-%{etch_ver}.enterprise.0.%{ent_date}.%{ent_rev}}
-# svn snapshot
-#setup -q -n kdepim
 
 install -m644 -p %{SOURCE10} %{SOURCE11} %{SOURCE12} kandy/src/
 %patch1 -p1 -b .kandy-icons
-
 %patch2 -p1 -b .xdg_open
-
 %patch6 -p0 -b .gnokii
+%patch7 -p1 -b .metakit_sparc64
 
 %if 0%{?fedora} > 8
 pushd kitchensync
@@ -178,11 +149,6 @@
 popd
 %endif
 
-%patch4 -p0 -b .kde127696
-%patch5 -p1 -b .kde151150
-
-%patch100 -p0 -b .kmail-imap-crash
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -314,6 +280,12 @@
 
 
 %changelog
+* Mon Sep 01 2008 Than Ngo <than at redhat.com> 3.5.10-1
+- 3.5.10
+
+* Thu Jun 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-9.1
+- metakit patch to fix build on sparc64
+
 * Fri Apr 11 2008 Rex Dieter <rdieter at fedoraproject.org> 6:3.5.9-9
 - omit multilib upgrade hacks (see also #441222)
 



From jnovy at fedoraproject.org  Mon Sep  1 14:39:09 2008
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Mon,  1 Sep 2008 14:39:09 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.5.90-macrofix.patch, NONE, 1.1 rpm.spec, 1.292,
	1.293
Message-ID: <20080901143909.406A87011A@cvs1.fedora.phx.redhat.com>

Author: jnovy

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

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.5.90-macrofix.patch 
Log Message:
* Mon Sep 01 2008 Jindrich Novy <jnovy at redhat.com>
- fix parsing of boolean expressions in spec (#456103)


rpm-4.5.90-macrofix.patch:

--- NEW FILE rpm-4.5.90-macrofix.patch ---
commit 3b9636cd69b81b6e23331bb797c0fdde79e97316
Author: Jindrich Novy <jnovy at redhat.com>
Date:   Thu Aug 14 13:08:09 2008 +0200

    Accept numerical characters in macro expansion (related to rhbz#456103)

diff --git a/build/expression.c b/build/expression.c
index 970ec05..83a4021 100644
--- a/build/expression.c
+++ b/build/expression.c
@@ -272,7 +272,7 @@ static int rdToken(ParseState state)
       char *temp;
       size_t ts;
 
-      for (ts=1; p[ts] && (risalpha(p[ts]) || p[ts] == '_'); ts++);
+      for (ts=1; p[ts] && (risalnum(p[ts]) || p[ts] == '_'); ts++);
       temp = xmalloc(ts+1);
       memcpy(temp, p, ts);
       p += ts-1;


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- rpm.spec	29 Aug 2008 05:25:44 -0000	1.292
+++ rpm.spec	1 Sep 2008 14:38:38 -0000	1.293
@@ -18,7 +18,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.3
+Release: 0.%{snapver}.4
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -35,6 +35,7 @@
 Patch200: rpm-4.5.90-archivesize.patch
 Patch201: rpm-4.5.90-noarch-subpackages.patch
 Patch202: rpm-4.5.90-segfault.patch
+Patch203: rpm-4.5.90-macrofix.patch
 
 # These are not yet upstream
 Patch300: rpm-4.5.90-posttrans.patch
@@ -168,6 +169,7 @@
 %patch200 -p1 -b .archivesize
 %patch201 -p1 -b .noarch-subpackages
 %patch202 -p1 -b .segfault
+%patch203 -p1 -b .macrofix
 
 # needs a bit of upstream love first...
 #%patch300 -p1 -b .posttrans
@@ -346,6 +348,10 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Mon Sep 01 2008 Jindrich Novy <jnovy at redhat.com>
+- fix parsing of boolean expressions in spec (#456103)
+  (unbreaks pam, jpilot and maybe other builds)
+
 * Tue Aug 26 2008 Jindrich Novy <jnovy at redhat.com>
 - add support for noarch subpackages
 - fix segfault in case of insufficient disk space detected (#460146)



From kraxel at fedoraproject.org  Mon Sep  1 14:41:52 2008
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Mon,  1 Sep 2008 14:41:52 +0000 (UTC)
Subject: rpms/xenner/devel .cvsignore, 1.19, 1.20 sources, 1.18,
	1.19 xenner.spec, 1.29, 1.30 xenner-xen_rmb.diff, 1.1, NONE
Message-ID: <20080901144152.A42DA7011A@cvs1.fedora.phx.redhat.com>

Author: kraxel

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

Modified Files:
	.cvsignore sources xenner.spec 
Removed Files:
	xenner-xen_rmb.diff 
Log Message:
- update to version 0.43


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	29 Aug 2008 14:27:39 -0000	1.19
+++ .cvsignore	1 Sep 2008 14:41:22 -0000	1.20
@@ -1 +1 @@
-xenner-0.42.tar.gz
+xenner-0.43.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	29 Aug 2008 14:27:39 -0000	1.18
+++ sources	1 Sep 2008 14:41:22 -0000	1.19
@@ -1 +1 @@
-1c9a4439486f2f34621c9a584a5ba096  xenner-0.42.tar.gz
+bdc9fd4b7b2dcd83c4e0722bc5c19e9a  xenner-0.43.tar.gz


Index: xenner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/devel/xenner.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xenner.spec	29 Aug 2008 14:49:04 -0000	1.29
+++ xenner.spec	1 Sep 2008 14:41:22 -0000	1.30
@@ -1,11 +1,10 @@
 Name:         xenner
 License:      GPLv2+
-Version:      0.42
+Version:      0.43
 Release:      1%{?dist}
 Summary:      Xen emulator for kvm
 Group:        Applications/Emulators
 Source0:      %{name}-%{version}.tar.gz
-Patch0:       %{name}-xen_rmb.diff
 URL:          http://dl.bytesex.org/releases/%{name}/%{name}-%{version}.tar.gz
 Requires:     xen-runtime
 Provides:     xen-hypervisor-abi = 3.2
@@ -24,7 +23,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 export CFLAGS="%{optflags}"
@@ -59,6 +57,8 @@
 rm -rf %{buildroot}
 
 %changelog
+* Mon Sep 1 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.43-1.fc10
+- update to version 0.43
 * Fri Aug 29 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.42-1.fc10
 - update to version 0.42
 * Mon Jul 21 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.41-1.fc10


--- xenner-xen_rmb.diff DELETED ---



From harald at fedoraproject.org  Mon Sep  1 14:41:51 2008
From: harald at fedoraproject.org (Harald Hoyer)
Date: Mon,  1 Sep 2008 14:41:51 +0000 (UTC)
Subject: rpms/readahead/devel readahead-1.4.5-usr.patch, NONE,
	1.1 readahead.spec, 1.46, 1.47
Message-ID: <20080901144151.2EA7B7011A@cvs1.fedora.phx.redhat.com>

Author: harald

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

Modified Files:
	readahead.spec 
Added Files:
	readahead-1.4.5-usr.patch 
Log Message:
* Mon Sep 01 2008 Harald Hoyer <harald at redhat.com> 1.4.5-2
- moved readahead to /sbin (bug #460715)


readahead-1.4.5-usr.patch:

--- NEW FILE readahead-1.4.5-usr.patch ---
diff -up readahead-1.4.5/scripts/readahead.cron.usr readahead-1.4.5/scripts/readahead.cron
--- readahead-1.4.5/scripts/readahead.cron.usr	2008-08-14 08:04:26.000000000 +0200
+++ readahead-1.4.5/scripts/readahead.cron	2008-09-01 16:35:52.000000000 +0200
@@ -11,7 +11,7 @@ renice +19 -p $$ >/dev/null 2>&1
 ionice -c3 -p $$ >/dev/null 2>&1
 
 TYPES="early later"
-READAHEAD_CMD="/usr/sbin/readahead"
+READAHEAD_CMD="/sbin/readahead"
 READAHEAD_BASE="/etc/readahead.d"
 
 for LTYPE in $TYPES; do
diff -up readahead-1.4.5/scripts/readahead.event.usr readahead-1.4.5/scripts/readahead.event
--- readahead-1.4.5/scripts/readahead.event.usr	2008-08-14 08:04:21.000000000 +0200
+++ readahead-1.4.5/scripts/readahead.event	2008-09-01 16:39:22.000000000 +0200
@@ -11,7 +11,16 @@ console output
 script
 	. /etc/sysconfig/readahead
 	[ "$READAHEAD" != "yes" ] && exit 0
-	exec /usr/sbin/readahead --dont-sort /etc/readahead.d/early.sorted
+	try=0
+	while [ $try -lt 10 ]; do
+		if test -d /usr/sbin; then
+			try=10
+		else
+			try=$[$try+1]
+			sleep 1
+		fi
+	done
+	exec /sbin/readahead --dont-sort /etc/readahead.d/early.sorted
 end script
 
 


Index: readahead.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/readahead.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- readahead.spec	28 Aug 2008 10:03:07 -0000	1.46
+++ readahead.spec	1 Sep 2008 14:41:20 -0000	1.47
@@ -1,13 +1,14 @@
 Summary:        Read a preset list of files into memory
 Name:           readahead
 Version:        1.4.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
 Source0:        readahead-%{version}.tar.bz2
 Source1:        default.early
 Source2:        default.later
+Patch: 		readahead-1.4.5-usr.patch
 
 URL:            https://hosted.fedoraproject.org/projects/readahead
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .usr
 cp -f -t ./lists/ %{SOURCE1}
 cp -f -t ./lists/ %{SOURCE2}
 
@@ -40,6 +42,8 @@
 # remove default lists
 rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/readahead.d/default.*
 
+mv ${RPM_BUILD_ROOT}/%{_sbindir}/readahead ${RPM_BUILD_ROOT}//sbin/readahead
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -67,10 +71,13 @@
 %{_sysconfdir}/event.d/readahead-disable-services.event
 %{_sysconfdir}/event.d/readahead.event
 %{_sysconfdir}/sysconfig/readahead
-%{_sbindir}/readahead
+/sbin/readahead
 /sbin/readahead-collector
 
 %changelog
+* Mon Sep 01 2008 Harald Hoyer <harald at redhat.com> 1.4.5-2
+- moved readahead to /sbin (bug #460715)
+
 * Thu Aug 28 2008 Harald Hoyer <harald at redhat.com> 1.4.5-1
 - new adaptive readahead version
 



From jmoskovc at fedoraproject.org  Mon Sep  1 14:42:59 2008
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Mon,  1 Sep 2008 14:42:59 +0000 (UTC)
Subject: rpms/dejagnu/F-9 dejagnu-1.4.4-runtest.patch, NONE, 1.1 dejagnu.spec,
	1.9, 1.10
Message-ID: <20080901144259.CE9357011A@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

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

Modified Files:
	dejagnu.spec 
Added Files:
	dejagnu-1.4.4-runtest.patch 
Log Message:
Fixed rhbz#460153
CVS ----------------------------------------------------------------------


dejagnu-1.4.4-runtest.patch:

--- NEW FILE dejagnu-1.4.4-runtest.patch ---
--- dejagnu-1.4.4/runtest.exp.old	2003-10-15 15:22:52.000000000 +0200
+++ dejagnu-1.4.4/runtest.exp	2008-08-27 16:22:18.000000000 +0200
@@ -1443,8 +1443,7 @@
     global tool
 
     clone_output "Running $test_file_name ..."
-    set prms_id	0
-    set bug_id	0
+    reset_vars
     set test_result ""
 
     if [file exists $test_file_name] {


Index: dejagnu.spec
===================================================================
RCS file: /cvs/extras/rpms/dejagnu/F-9/dejagnu.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dejagnu.spec	7 Apr 2008 13:27:22 -0000	1.9
+++ dejagnu.spec	1 Sep 2008 14:42:29 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A front end for testing other programs
 Name: dejagnu
 Version: 1.4.4
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 License: GPLv2+
 Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-%{version}.tar.gz
@@ -14,6 +14,7 @@
 BuildRequires: expect screen texinfo
 Patch1: dejagnu-1.4.4-smp-1.patch
 Patch3: dejagnu-1.4.4-testsuite.patch
+Patch4: dejagnu-1.4.4-runtest.patch
 
 %description
 DejaGnu is an Expect/Tcl based framework for testing other programs.
@@ -27,6 +28,7 @@
 %setup -q
 %patch1 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %configure -v
@@ -74,6 +76,10 @@
 %{_infodir}/*
 
 %changelog
+* Mon Sep  1 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 1:1.4.4-12
+- fixed runtest (patch from jan.kratochvil at redhat.com)
+- Resolves: #460153
+
 * Mon Nov 12 2007 Petr Machata <pmachata at redhat.com> - 1:1.4.4-11
 - Install info file.
 - Resolves: #230652



From varekova at fedoraproject.org  Mon Sep  1 14:45:29 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon,  1 Sep 2008 14:45:29 +0000 (UTC)
Subject: rpms/man/devel man-1.6f-i18n_makewhatis.patch, 1.1, 1.2 man.spec,
	1.67, 1.68
Message-ID: <20080901144529.C42347011A@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	man-1.6f-i18n_makewhatis.patch man.spec 
Log Message:
update patches


man-1.6f-i18n_makewhatis.patch:

Index: man-1.6f-i18n_makewhatis.patch
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man-1.6f-i18n_makewhatis.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- man-1.6f-i18n_makewhatis.patch	20 Mar 2008 09:50:07 -0000	1.1
+++ man-1.6f-i18n_makewhatis.patch	1 Sep 2008 14:44:59 -0000	1.2
@@ -1,12 +1,13 @@
---- man-1.6e/src/makewhatis.sh.i18n	2006-07-19 06:58:08.000000000 +0200
-+++ man-1.6e/src/makewhatis.sh	2006-12-11 14:50:46.000000000 +0100
+diff -up man-1.6f/src/makewhatis.sh.i18n_makewhatis man-1.6f/src/makewhatis.sh
+--- man-1.6f/src/makewhatis.sh.i18n_makewhatis	2007-09-17 20:35:14.000000000 +0200
++++ man-1.6f/src/makewhatis.sh	2008-09-01 16:06:05.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  # makewhatis: create the whatis database
  # Created: Sun Jun 14 10:49:37 1992
  # Revised: Sat Jan  8 14:12:37 1994 by faith at cs.unc.edu
-@@ -61,32 +61,19 @@
+@@ -61,32 +61,19 @@ do
  done
  DEFCATPATH=$dc
  
@@ -47,7 +48,7 @@
  trap "rm -rf $TMPFILEDIR; exit 255" 1 2 3 15
  
  # default find arg: no directories, no empty files
-@@ -98,15 +85,17 @@
+@@ -98,15 +85,17 @@ defmanpath=$DEFMANPATH
  defcatpath=
  
  if [ -n "$MANSECT" ]; then
@@ -70,7 +71,7 @@
  for name in "$@"
  do
  if [ -n "$setsections" ]; then
-@@ -114,6 +103,11 @@
+@@ -114,6 +103,11 @@ if [ -n "$setsections" ]; then
  	sections=$name
  	continue
  fi
@@ -82,7 +83,7 @@
  case $name in
      --version|-V)
  	echo "$program from @version@"
-@@ -124,6 +118,8 @@
+@@ -124,6 +118,8 @@ case $name in
  	continue;;
      -s) setsections=1
  	continue;;
@@ -91,7 +92,7 @@
      -u) findarg="-ctime 0"
  	update=1
  	continue;;
-@@ -132,12 +128,13 @@
+@@ -132,12 +128,13 @@ case $name in
      -w) manpath=`man --path`
  	catpath=$manpath
  	continue;;
@@ -106,7 +107,7 @@
  	echo "       -w: use manpath obtained from \`man --path\`"
  	echo "       [manpath]: man directories (default: $DEFMANPATH)"
  	echo "       [catpath]: cat directories (default: the first existing"
-@@ -165,14 +162,7 @@
+@@ -165,14 +162,7 @@ catpath=`echo ${catpath} | tr : ' '`
  # first truncate all the whatis files that will be created new,
  # then only update - we might visit the same directory twice
  if [ x$update = x ]; then
@@ -122,10 +123,10 @@
  fi
  
  for pages in man cat
-@@ -184,11 +174,6 @@
-	fi
-     fi
-
+@@ -212,11 +202,6 @@ do
+ 	fi
+      fi
+ 
 -     if [ -s ${mandir}/whatis -a $pages = man -a x$update = x ]; then
 -	if [ x$verbose != x ]; then
 -	   echo skipping $mandir - we did it already > /dev/stderr
@@ -133,8 +134,8 @@
 -     else      
         here=`pwd`
         cd $mandir
-        for i in $sections--- man-1.6f/src/makewhatis.sh	2008-03-14 14:23:27.000000000 +0100
-@@ -212,7 +212,23 @@
+        for i in $sections
+@@ -227,7 +212,23 @@ do
  	    section=$i
  	    curdir=$mandir/${pages}$i
  	    export section verbose curdir
@@ -159,7 +160,7 @@
  
  	    function readline() {
                if (use_zcat || use_bzcat || use_lzcat) {
-@@ -424,18 +440,19 @@
+@@ -439,18 +440,19 @@ do
  
         cd "$here"
  


Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- man.spec	9 Jun 2008 13:24:44 -0000	1.67
+++ man.spec	1 Sep 2008 14:44:59 -0000	1.68
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -263,6 +263,9 @@
 
 
 %changelog
+* Mon Sep  1 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-9
+- update patches
+
 * Mon Jun  9 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-8
 - Resolves: #449272 
   Latest man behaves very strange for non-existing man pages



From vlg at fedoraproject.org  Mon Sep  1 14:46:41 2008
From: vlg at fedoraproject.org (Vladislav Grinchenko)
Date: Mon,  1 Sep 2008 14:46:41 +0000 (UTC)
Subject: rpms/granule/F-8 granule.spec,1.10,1.11
Message-ID: <20080901144641.2FFBB7011A@cvs1.fedora.phx.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30588

Modified Files:
	granule.spec 
Log Message:
F-8 : granule 1.4.0 build 7


Index: granule.spec
===================================================================
RCS file: /cvs/extras/rpms/granule/F-8/granule.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- granule.spec	31 Aug 2008 20:33:06 -0000	1.10
+++ granule.spec	1 Sep 2008 14:46:10 -0000	1.11
@@ -4,7 +4,7 @@
 Summary:    Flashcards program based on Leitner methodology
 Name:       granule
 Version:    1.4.0
-Release:    6%{?dist}
+Release:    7%{?dist}
 License:    GPLv2+
 Group:      Applications/Multimedia
 URL:        http://granule.sourceforge.net/
@@ -73,7 +73,6 @@
 * Sun Aug 31 2008 Vladislav Grinchenko <vlg[AT]users.sourceforge.net> - 1.4.0-6
 - Fix config files installation.
 
-%changelog
 * Fri Jul 25 2008 Tom Callaway <tcallawa[AT]redhat.com> - 1.3.0-2
 - Fix license tag
 



From hadess at fedoraproject.org  Mon Sep  1 14:50:24 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  1 Sep 2008 14:50:24 +0000 (UTC)
Subject: rpms/rhythmbox/devel rhythmbox-iradio-initial.pls, 1.1,
	1.2 rhythmbox.spec, 1.203, 1.204
Message-ID: <20080901145024.7423D7011A@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	rhythmbox-iradio-initial.pls rhythmbox.spec 
Log Message:
* Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> 0.11.6-7
- Add wbur.org to the default playlist (#446791)



Index: rhythmbox-iradio-initial.pls
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox-iradio-initial.pls,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rhythmbox-iradio-initial.pls	11 Apr 2007 15:23:07 -0000	1.1
+++ rhythmbox-iradio-initial.pls	1 Sep 2008 14:49:54 -0000	1.2
@@ -74,3 +74,7 @@
 title17=NRK Stortinget (Norway)
 genre17=
 
+file18=http://www.wbur.org/listen/feed/ogg.m3u
+title18=wbur.org - Boston's NPR news source
+genre18=News
+


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- rhythmbox.spec	22 Aug 2008 23:19:55 -0000	1.203
+++ rhythmbox.spec	1 Sep 2008 14:49:54 -0000	1.204
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -219,6 +219,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> 0.11.6-7
+- Add wbur.org to the default playlist (#446791)
+
 * Sat Aug 23 2008 - Linus Walleij <triad at df.lth.se> 0.11.6-6
 - Rebuild package to pick up libmtp 0.3.0 deps
 



From kraxel at fedoraproject.org  Mon Sep  1 14:51:10 2008
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Mon,  1 Sep 2008 14:51:10 +0000 (UTC)
Subject: rpms/xenner/devel xenner.spec,1.30,1.31
Message-ID: <20080901145110.7C96A7011A@cvs1.fedora.phx.redhat.com>

Author: kraxel

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

Modified Files:
	xenner.spec 
Log Message:
- rm hvm*.elf


Index: xenner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/devel/xenner.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xenner.spec	1 Sep 2008 14:41:22 -0000	1.30
+++ xenner.spec	1 Sep 2008 14:50:40 -0000	1.31
@@ -33,6 +33,7 @@
 rm -rf %{buildroot}
 make prefix="%{_prefix}" DESTDIR=%{buildroot} STRIP="" install
 chmod 644 vivm # make rpmlint happy (this goes to %doc)
+rm -f /usr/lib*/xenner/hvm*.elf
 
 %files
 %defattr(-,root,root)



From hadess at fedoraproject.org  Mon Sep  1 14:54:16 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  1 Sep 2008 14:54:16 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel gnome-settings-daemon.spec, 1.47, 
	1.48 sources, 1.17, 1.18
Message-ID: <20080901145416.277EF7011A@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-serv31832

Modified Files:
	gnome-settings-daemon.spec sources 
Log Message:
* Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.91-1
- Update to 2.23.91



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gnome-settings-daemon.spec	28 Aug 2008 18:30:17 -0000	1.47
+++ gnome-settings-daemon.spec	1 Sep 2008 14:53:45 -0000	1.48
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.23.91
-Release:	0.20080828.2%{?dist}
+Release:	1%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -153,6 +153,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Thu Aug 28 2008 Jon McCann <jmccann at redhat.com> - 2.23.91-0.2008.08.28.2
 - BuildRequires libnotify-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	28 Aug 2008 13:34:23 -0000	1.17
+++ sources	1 Sep 2008 14:53:45 -0000	1.18
@@ -1 +1 @@
-66e09f4c3a1b7919ba51908c12834347  gnome-settings-daemon-2.23.91.tar.bz2
+8acc32ab48b3038461ac1dfddffbaa4d  gnome-settings-daemon-2.23.91.tar.bz2



From erikos at fedoraproject.org  Mon Sep  1 14:57:18 2008
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Mon,  1 Sep 2008 14:57:18 +0000 (UTC)
Subject: rpms/sugar-toolkit/OLPC-3 .cvsignore, 1.11, 1.12 sources, 1.12,
	1.13 sugar-toolkit.spec, 1.16, 1.17
Message-ID: <20080901145718.D9FC97011A@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-toolkit/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32184

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Mon Sep 01 2008 Simon Schampijer <simon at laptop.org> - 0.82.5-1
- Translation updates
- Add plural information for all languages
- Fix plural form equations




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 Aug 2008 21:13:22 -0000	1.11
+++ .cvsignore	1 Sep 2008 14:56:48 -0000	1.12
@@ -1 +1 @@
-sugar-toolkit-0.82.4.tar.bz2
+sugar-toolkit-0.82.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	31 Aug 2008 21:13:23 -0000	1.12
+++ sources	1 Sep 2008 14:56:48 -0000	1.13
@@ -1 +1 @@
-057226a27d1a59492703357dd7fbbd12  sugar-toolkit-0.82.4.tar.bz2
+aa52414fbe020ab2269867e58359803a  sugar-toolkit-0.82.5.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sugar-toolkit.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sugar-toolkit.spec	31 Aug 2008 21:13:23 -0000	1.16
+++ sugar-toolkit.spec	1 Sep 2008 14:56:48 -0000	1.17
@@ -5,7 +5,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.82.4
+Version: 0.82.5
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
@@ -65,6 +65,11 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Mon Sep 01 2008 Simon Schampijer <simon at laptop.org> - 0.82.5-1
+- Translation updates
+- Add plural information for all languages
+- Fix plural form equations
+
 * Thu Aug 31 2008 Simon Schampijer <simon at laptop.org> - 0.82.4-1
 - 8136 Do a more 'standard' system installation for bundlebuilder
 - 7837 Do not try to list the mimetypes directory if it does not exist



From erikos at fedoraproject.org  Mon Sep  1 15:01:30 2008
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Mon,  1 Sep 2008 15:01:30 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.13, 1.14 sources, 1.14,
	1.15 sugar-toolkit.spec, 1.16, 1.17
Message-ID: <20080901150130.663497011A@cvs1.fedora.phx.redhat.com>

Author: erikos

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

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Mon Sep 01 2008 Simon Schampijer <simon at laptop.org> - 0.82.5-1
- Translation updates
- Add plural information for all languages
- Fix plural form equations




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	31 Aug 2008 21:08:17 -0000	1.13
+++ .cvsignore	1 Sep 2008 15:01:00 -0000	1.14
@@ -1 +1 @@
-sugar-toolkit-0.82.4.tar.bz2
+sugar-toolkit-0.82.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	31 Aug 2008 21:08:18 -0000	1.14
+++ sources	1 Sep 2008 15:01:00 -0000	1.15
@@ -1 +1 @@
-057226a27d1a59492703357dd7fbbd12  sugar-toolkit-0.82.4.tar.bz2
+aa52414fbe020ab2269867e58359803a  sugar-toolkit-0.82.5.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sugar-toolkit.spec	31 Aug 2008 21:08:18 -0000	1.16
+++ sugar-toolkit.spec	1 Sep 2008 15:01:00 -0000	1.17
@@ -5,7 +5,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.82.4
+Version: 0.82.5
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
@@ -65,6 +65,11 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Mon Sep 01 2008 Simon Schampijer <simon at laptop.org> - 0.82.5-1
+- Translation updates
+- Add plural information for all languages
+- Fix plural form equations
+
 * Thu Aug 31 2008 Simon Schampijer <simon at laptop.org> - 0.82.4-1
 - 8136 Do a more 'standard' system installation for bundlebuilder
 - 7837 Do not try to list the mimetypes directory if it does not exist



From vlg at fedoraproject.org  Mon Sep  1 15:03:02 2008
From: vlg at fedoraproject.org (Vladislav Grinchenko)
Date: Mon,  1 Sep 2008 15:03:02 +0000 (UTC)
Subject: rpms/granule/F-9 granule.spec,1.10,1.11
Message-ID: <20080901150302.38D1A7011A@cvs1.fedora.phx.redhat.com>

Author: vlg

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

Modified Files:
	granule.spec 
Log Message:
F-9 : granule 1.4.0 build 7


Index: granule.spec
===================================================================
RCS file: /cvs/extras/rpms/granule/F-9/granule.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- granule.spec	31 Aug 2008 20:43:06 -0000	1.10
+++ granule.spec	1 Sep 2008 15:02:32 -0000	1.11
@@ -4,7 +4,7 @@
 Summary:    Flashcards program based on Leitner methodology
 Name:       granule
 Version:    1.4.0
-Release:    6%{?dist}
+Release:    7%{?dist}
 License:    GPLv2+
 Group:      Applications/Multimedia
 URL:        http://granule.sourceforge.net/
@@ -73,7 +73,6 @@
 * Sun Aug 31 2008 Vladislav Grinchenko <vlg[AT]users.sourceforge.net> - 1.4.0-6
 - Fix config files installation.
 
-%changelog
 * Fri Jul 25 2008 Tom Callaway <tcallawa[AT]redhat.com> - 1.3.0-2
 - Fix license tag
 



From pkgdb at fedoraproject.org  Mon Sep  1 15:12:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 15:12:16 +0000
Subject: [pkgdb] trac-monotone-plugin: thm has requested watchbugzilla
Message-ID: <20080901151216.ECDF6208D7E@bastion.fedora.phx.redhat.com>

thm has requested the watchbugzilla acl on trac-monotone-plugin (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Sep  1 15:12:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 15:12:28 +0000
Subject: [pkgdb] trac-monotone-plugin: thm has requested watchcommits
Message-ID: <20080901151228.C9D6C208D86@bastion.fedora.phx.redhat.com>

thm has requested the watchcommits acl on trac-monotone-plugin (Fedora devel)

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



From mtasaka at fedoraproject.org  Mon Sep  1 15:12:35 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  1 Sep 2008 15:12:35 +0000 (UTC)
Subject: rpms/jd/F-8 .cvsignore, 1.279, 1.280 jd.spec, 1.312, 1.313 sources, 
	1.280, 1.281
Message-ID: <20080901151235.6B0CB7011A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.beta080901
- 2.0.1 beta 080901



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- .cvsignore	31 Aug 2008 17:28:46 -0000	1.279
+++ .cvsignore	1 Sep 2008 15:12:05 -0000	1.280
@@ -1 +1 @@
-jd-2.0.1-svn2307_trunk.tgz
+jd-2.0.1-beta080901.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- jd.spec	31 Aug 2008 17:28:46 -0000	1.312
+++ jd.spec	1 Sep 2008 15:12:05 -0000	1.313
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.1
-%define         strtag        svn2307_trunk
-%define         repoid        32215
+%define         strtag        beta080901
+%define         repoid        32731
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -134,8 +134,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Sep  1 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev. 2307
+* Tue Sep  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.beta080901
+- 2.0.1 beta 080901
 
 * Tue Aug  5 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Switch the default fonts to VLGothic-based Mona


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/sources,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- sources	31 Aug 2008 17:28:46 -0000	1.280
+++ sources	1 Sep 2008 15:12:05 -0000	1.281
@@ -1 +1 @@
-0fd953e006e3eb15288efd9afa5b183a  jd-2.0.1-svn2307_trunk.tgz
+62f4aa7c0cf038d867d2948152d72ffb  jd-2.0.1-beta080901.tgz



From mtasaka at fedoraproject.org  Mon Sep  1 15:12:35 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  1 Sep 2008 15:12:35 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.286, 1.287 jd.spec, 1.323, 1.324 sources, 
	1.287, 1.288
Message-ID: <20080901151235.945067011D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.beta080901
- 2.0.1 beta 080901



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- .cvsignore	31 Aug 2008 17:28:46 -0000	1.286
+++ .cvsignore	1 Sep 2008 15:12:05 -0000	1.287
@@ -1 +1 @@
-jd-2.0.1-svn2307_trunk.tgz
+jd-2.0.1-beta080901.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- jd.spec	31 Aug 2008 17:28:46 -0000	1.323
+++ jd.spec	1 Sep 2008 15:12:05 -0000	1.324
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.1
-%define         strtag        svn2307_trunk
-%define         repoid        32215
+%define         strtag        beta080901
+%define         repoid        32731
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -134,8 +134,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Sep  1 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev. 2307
+* Tue Sep  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.beta080901
+- 2.0.1 beta 080901
 
 * Tue Aug  5 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Switch the default fonts to VLGothic-based Mona


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- sources	31 Aug 2008 17:28:46 -0000	1.287
+++ sources	1 Sep 2008 15:12:05 -0000	1.288
@@ -1 +1 @@
-0fd953e006e3eb15288efd9afa5b183a  jd-2.0.1-svn2307_trunk.tgz
+62f4aa7c0cf038d867d2948152d72ffb  jd-2.0.1-beta080901.tgz



From pkgdb at fedoraproject.org  Mon Sep  1 15:12:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 15:12:30 +0000
Subject: [pkgdb] trac-monotone-plugin: thm has requested commit
Message-ID: <20080901151232.555D2208D83@bastion.fedora.phx.redhat.com>

thm has requested the commit acl on trac-monotone-plugin (Fedora devel)

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



From mtasaka at fedoraproject.org  Mon Sep  1 15:12:35 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  1 Sep 2008 15:12:35 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.286, 1.287 jd.spec, 1.331, 1.332 sources,
	1.287, 1.288
Message-ID: <20080901151235.D4C287011A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.beta080901
- 2.0.1 beta 080901



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- .cvsignore	31 Aug 2008 17:28:46 -0000	1.286
+++ .cvsignore	1 Sep 2008 15:12:05 -0000	1.287
@@ -1 +1 @@
-jd-2.0.1-svn2307_trunk.tgz
+jd-2.0.1-beta080901.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -r1.331 -r1.332
--- jd.spec	31 Aug 2008 17:28:46 -0000	1.331
+++ jd.spec	1 Sep 2008 15:12:05 -0000	1.332
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.1
-%define         strtag        svn2307_trunk
-%define         repoid        32215
+%define         strtag        beta080901
+%define         repoid        32731
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -134,8 +134,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Sep  1 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev. 2307
+* Tue Sep  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.beta080901
+- 2.0.1 beta 080901
 
 * Tue Aug  5 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Switch the default fonts to VLGothic-based Mona


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- sources	31 Aug 2008 17:28:47 -0000	1.287
+++ sources	1 Sep 2008 15:12:05 -0000	1.288
@@ -1 +1 @@
-0fd953e006e3eb15288efd9afa5b183a  jd-2.0.1-svn2307_trunk.tgz
+62f4aa7c0cf038d867d2948152d72ffb  jd-2.0.1-beta080901.tgz



From pkgdb at fedoraproject.org  Mon Sep  1 15:12:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 15:12:42 +0000
Subject: [pkgdb] trac-monotone-plugin: thm has requested approveacls
Message-ID: <20080901151250.7176E208D7E@bastion.fedora.phx.redhat.com>

thm has requested the approveacls acl on trac-monotone-plugin (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Sep  1 15:12:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 15:12:49 +0000
Subject: [pkgdb] trac-monotone-plugin: thm has requested watchcommits
Message-ID: <20080901151258.B94AF208D88@bastion.fedora.phx.redhat.com>

thm has requested the watchcommits acl on trac-monotone-plugin (Fedora 8)

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



From pkgdb at fedoraproject.org  Mon Sep  1 15:13:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 15:13:48 +0000
Subject: [pkgdb] trac-monotone-plugin: thm has requested watchbugzilla
Message-ID: <20080901151257.966C4208D90@bastion.fedora.phx.redhat.com>

thm has requested the watchbugzilla acl on trac-monotone-plugin (Fedora 8)

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



From pkgdb at fedoraproject.org  Mon Sep  1 15:12:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 15:12:56 +0000
Subject: [pkgdb] trac-monotone-plugin: thm has requested watchbugzilla
Message-ID: <20080901151312.DA30E208D99@bastion.fedora.phx.redhat.com>

thm has requested the watchbugzilla acl on trac-monotone-plugin (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Mon Sep  1 15:12:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 15:12:50 +0000
Subject: [pkgdb] trac-monotone-plugin: thm has requested commit
Message-ID: <20080901151309.DA534208D8F@bastion.fedora.phx.redhat.com>

thm has requested the commit acl on trac-monotone-plugin (Fedora 8)

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



From pkgdb at fedoraproject.org  Mon Sep  1 15:13:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 15:13:52 +0000
Subject: [pkgdb] trac-monotone-plugin: thm has requested approveacls
Message-ID: <20080901151307.1D8AD208D91@bastion.fedora.phx.redhat.com>

thm has requested the approveacls acl on trac-monotone-plugin (Fedora 8)

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



From pkgdb at fedoraproject.org  Mon Sep  1 15:13:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 15:13:08 +0000
Subject: [pkgdb] trac-monotone-plugin: thm has requested approveacls
Message-ID: <20080901151313.27DD3208D98@bastion.fedora.phx.redhat.com>

thm has requested the approveacls acl on trac-monotone-plugin (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Mon Sep  1 15:13:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 15:13:03 +0000
Subject: [pkgdb] trac-monotone-plugin: thm has requested watchcommits
Message-ID: <20080901151313.40BD3208D9B@bastion.fedora.phx.redhat.com>

thm has requested the watchcommits acl on trac-monotone-plugin (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Mon Sep  1 15:13:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 15:13:07 +0000
Subject: [pkgdb] trac-monotone-plugin: thm has requested commit
Message-ID: <20080901151313.824AA208DA2@bastion.fedora.phx.redhat.com>

thm has requested the commit acl on trac-monotone-plugin (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Mon Sep  1 15:13:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 15:13:26 +0000
Subject: [pkgdb] trac-monotone-plugin: thm has requested watchcommits
Message-ID: <20080901151329.DD633208D9F@bastion.fedora.phx.redhat.com>

thm has requested the watchcommits acl on trac-monotone-plugin (Fedora 9)

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



From pkgdb at fedoraproject.org  Mon Sep  1 15:13:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 15:13:34 +0000
Subject: [pkgdb] trac-monotone-plugin: thm has requested watchbugzilla
Message-ID: <20080901151335.C0B44208D9C@bastion.fedora.phx.redhat.com>

thm has requested the watchbugzilla acl on trac-monotone-plugin (Fedora 9)

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



From pkgdb at fedoraproject.org  Mon Sep  1 15:14:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 15:14:39 +0000
Subject: [pkgdb] trac-monotone-plugin: thm has requested commit
Message-ID: <20080901151339.D5FB5208DA9@bastion.fedora.phx.redhat.com>

thm has requested the commit acl on trac-monotone-plugin (Fedora 9)

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



From pkgdb at fedoraproject.org  Mon Sep  1 15:13:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 15:13:46 +0000
Subject: [pkgdb] trac-monotone-plugin: thm has requested approveacls
Message-ID: <20080901151353.6D964208DAC@bastion.fedora.phx.redhat.com>

thm has requested the approveacls acl on trac-monotone-plugin (Fedora 9)

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



From hadess at fedoraproject.org  Mon Sep  1 15:14:03 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  1 Sep 2008 15:14:03 +0000 (UTC)
Subject: rpms/shared-mime-info/F-9 defaults.list, 1.23,
	1.24 shared-mime-info.spec, 1.66, 1.67 totem-defaults.list, 1.3, 1.4
Message-ID: <20080901151403.0CED37011A@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/shared-mime-info/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1727

Modified Files:
	defaults.list shared-mime-info.spec totem-defaults.list 
Log Message:
* Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> - 0.30-3
- Use Firefox and not redhat-web as the default app for HTML files (#452184)



Index: defaults.list
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/F-9/defaults.list,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- defaults.list	2 May 2008 20:36:58 -0000	1.23
+++ defaults.list	1 Sep 2008 15:13:32 -0000	1.24
@@ -78,7 +78,7 @@
 application/x-dvi=tetex-xdvi.desktop
 application/x-rpm=gpk-install-file.desktop
 text/plain=gnome-gedit.desktop
-text/html=redhat-web.desktop
+text/html=mozilla-firefox.desktop
 inode/directory=gnome-nautilus-folder-handler.desktop
 x-content/blank-cd=nautilus-cd-burner.desktop
 x-content/blank-dvd=nautilus-cd-burner.desktop


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/F-9/shared-mime-info.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- shared-mime-info.spec	14 Jun 2008 21:26:39 -0000	1.66
+++ shared-mime-info.spec	1 Sep 2008 15:13:32 -0000	1.67
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.30
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL+
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -63,6 +63,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> - 0.30-3
+- Use Firefox and not redhat-web as the default app for HTML files (#452184)
+
 * Sat Jun 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.30-2
 - update license tag
 


Index: totem-defaults.list
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/F-9/totem-defaults.list,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- totem-defaults.list	27 Mar 2008 22:05:11 -0000	1.3
+++ totem-defaults.list	1 Sep 2008 15:13:32 -0000	1.4
@@ -2,6 +2,7 @@
 application/ram=totem.desktop;
 application/sdp=totem.desktop;
 application/smil=totem.desktop;
+application/smil+xml=totem.desktop;
 application/x-extension-m4a=totem.desktop;
 application/x-extension-mp4=totem.desktop;
 application/x-flac=totem.desktop;
@@ -19,6 +20,7 @@
 audio/AMR=totem.desktop;
 audio/AMR-WB=totem.desktop;
 audio/basic=totem.desktop;
+audio/midi=totem.desktop;
 audio/mp4=totem.desktop;
 audio/mpeg=totem.desktop;rhythmbox.desktop;
 audio/mpegurl=totem.desktop;
@@ -43,10 +45,12 @@
 audio/x-pn-windows-acm=totem.desktop;
 audio/x-sbc=totem.desktop;
 audio/x-scpls=totem.desktop;rhythmbox.desktop;
+audio/x-speex=totem.desktop;
 audio/x-tta=totem.desktop;
 audio/x-wav=totem.desktop;
 audio/x-wavpack=totem.desktop;
-audio/x-vorbis=totem.desktop;
+audio/x-vorbis=totem.desktop;rhythmbox.desktop;
+audio/x-vorbis+ogg=totem.desktop;rhythmbox.desktop;
 audio/x-xm=totem.desktop;
 image/x-pict=totem.desktop;
 misc/ultravox=totem.desktop;
@@ -60,6 +64,7 @@
 video/mp4v-es=totem.desktop;
 video/mpeg=totem.desktop;
 video/msvideo=totem.desktop;
+video/ogg=totem.desktop;
 video/quicktime=totem.desktop;
 video/vivo=totem.desktop;
 video/vnd.divx=totem.desktop;
@@ -69,6 +74,7 @@
 video/x-flc=totem.desktop;
 video/x-fli=totem.desktop;
 video/x-flic=totem.desktop;
+video/x-flv=totem.desktop;
 video/x-m4v=totem.desktop;
 video/x-matroska=totem.desktop;
 video/x-mpeg=totem.desktop;



From veillard at fedoraproject.org  Mon Sep  1 15:15:28 2008
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon,  1 Sep 2008 15:15:28 +0000 (UTC)
Subject: rpms/libxml2/devel .cvsignore, 1.41, 1.42 libxml2.spec, 1.58,
	1.59 sources, 1.43, 1.44
Message-ID: <20080901151528.7BA3E7011A@cvs1.fedora.phx.redhat.com>

Author: veillard

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

Modified Files:
	.cvsignore libxml2.spec sources 
Log Message:
fix python serialization which was broken in 2.7.0
Resolve: rhbz#460774
Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	30 Aug 2008 15:14:14 -0000	1.41
+++ .cvsignore	1 Sep 2008 15:14:58 -0000	1.42
@@ -19,3 +19,4 @@
 libxml2-2.6.31.tar.gz
 libxml2-2.6.32.tar.gz
 libxml2-2.7.0.tar.gz
+libxml2-2.7.1.tar.gz


Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/devel/libxml2.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- libxml2.spec	30 Aug 2008 15:18:30 -0000	1.58
+++ libxml2.spec	1 Sep 2008 15:14:58 -0000	1.59
@@ -1,6 +1,6 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.7.0
+Version: 2.7.1
 Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
@@ -141,6 +141,10 @@
 %doc doc/python.html
 
 %changelog
+* Mon Sep  1 2008 Daniel Veillard <veillard at redhat.com> 2.7.1-1.fc10
+- fix python serialization which was broken in 2.7.0
+- Resolve: rhbz#460774
+
 * Sat Aug 30 2008 Daniel Veillard <veillard at redhat.com> 2.7.0-1.fc10
 - upstream release of 2.7.0
 - switch to XML 1.0 5th edition


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	30 Aug 2008 15:14:14 -0000	1.43
+++ sources	1 Sep 2008 15:14:58 -0000	1.44
@@ -1 +1 @@
-c5a8150c92e3dd25c45e9de29591b83d  libxml2-2.7.0.tar.gz
+abc093e9ac7ea1aabf37982ae9df6d6c  libxml2-2.7.1.tar.gz



From kraxel at fedoraproject.org  Mon Sep  1 15:16:34 2008
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Mon,  1 Sep 2008 15:16:34 +0000 (UTC)
Subject: rpms/xenner/devel xenner.spec,1.31,1.32
Message-ID: <20080901151634.42B247011A@cvs1.fedora.phx.redhat.com>

Author: kraxel

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

Modified Files:
	xenner.spec 
Log Message:
- rm hvm*.elf, really


Index: xenner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/devel/xenner.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xenner.spec	1 Sep 2008 14:50:40 -0000	1.31
+++ xenner.spec	1 Sep 2008 15:16:04 -0000	1.32
@@ -33,7 +33,7 @@
 rm -rf %{buildroot}
 make prefix="%{_prefix}" DESTDIR=%{buildroot} STRIP="" install
 chmod 644 vivm # make rpmlint happy (this goes to %doc)
-rm -f /usr/lib*/xenner/hvm*.elf
+rm -f %{buildroot}/usr/lib*/xenner/hvm*.elf
 
 %files
 %defattr(-,root,root)



From nim at fedoraproject.org  Mon Sep  1 15:18:36 2008
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Mon,  1 Sep 2008 15:18:36 +0000 (UTC)
Subject: rpms/xgridfit/devel import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4 xgridfit.spec, 1.5, 1.6
Message-ID: <20080901151836.CE7F37011A@cvs1.fedora.phx.redhat.com>

Author: nim

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

Modified Files:
	.cvsignore sources xgridfit.spec 
Added Files:
	import.log 
Log Message:
1.9


--- NEW FILE import.log ---
xgridfit-1_9-1_fc10:HEAD:xgridfit-1.9-1.fc10.src.rpm:1220282275


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xgridfit/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 May 2008 13:58:05 -0000	1.3
+++ .cvsignore	1 Sep 2008 15:18:06 -0000	1.4
@@ -1 +1 @@
-xgridfit-1-6.tar.gz
+xgridfit-1-9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xgridfit/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 May 2008 13:58:05 -0000	1.3
+++ sources	1 Sep 2008 15:18:06 -0000	1.4
@@ -1 +1 @@
-7937d9b05af6192c660757613a89045f  xgridfit-1-6.tar.gz
+bb2bb3caee51758852902525b068b56a  xgridfit-1-9.tar.gz


Index: xgridfit.spec
===================================================================
RCS file: /cvs/extras/rpms/xgridfit/devel/xgridfit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xgridfit.spec	18 May 2008 15:17:11 -0000	1.5
+++ xgridfit.spec	1 Sep 2008 15:18:06 -0000	1.6
@@ -1,8 +1,8 @@
-%define archivever 1-6
+%define archivever 1-9
 
 Name:    xgridfit
-Version: 1.6
-Release: 3%{?dist}
+Version: 1.9
+Release: 1%{?dist}
 Summary: Font hinting tool
 
 # This is where we drop fontforge
@@ -84,6 +84,11 @@
 
 
 %changelog
+* Mon Sep 1 2008 <nicolas.mailhot at laposte.net>
+- 1.9-1
+??? Major update, many changes
+??? Only package xsltproc support for now
+
 * Sun May 18 2008 <nicolas.mailhot at laposte.net>
 - 1.6-3
 ??? Lots of new makefile goodness



From hadess at fedoraproject.org  Mon Sep  1 15:23:01 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  1 Sep 2008 15:23:01 +0000 (UTC)
Subject: rpms/shared-mime-info/devel defaults.list, 1.23,
	1.24 shared-mime-info.spec, 1.71, 1.72 totem-defaults.list, 1.3, 1.4
Message-ID: <20080901152301.193F47011A@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/shared-mime-info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3447

Modified Files:
	defaults.list shared-mime-info.spec totem-defaults.list 
Log Message:
* Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> - 0.51-2
- Use Firefox and not redhat-web as the default app for HTML files (#452184)



Index: defaults.list
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/defaults.list,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- defaults.list	2 May 2008 20:37:56 -0000	1.23
+++ defaults.list	1 Sep 2008 15:22:30 -0000	1.24
@@ -78,7 +78,7 @@
 application/x-dvi=tetex-xdvi.desktop
 application/x-rpm=gpk-install-file.desktop
 text/plain=gnome-gedit.desktop
-text/html=redhat-web.desktop
+text/html=mozilla-firefox.desktop
 inode/directory=gnome-nautilus-folder-handler.desktop
 x-content/blank-cd=nautilus-cd-burner.desktop
 x-content/blank-dvd=nautilus-cd-burner.desktop


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- shared-mime-info.spec	23 Jul 2008 10:51:20 -0000	1.71
+++ shared-mime-info.spec	1 Sep 2008 15:22:30 -0000	1.72
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.51
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL+
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -63,6 +63,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> - 0.51-2
+- Use Firefox and not redhat-web as the default app for HTML files (#452184)
+
 * Wed Jul 23 2008 - Bastien Nocera <bnocera at redhat.com> - 0.51-1
 - Update to 0.51
 


Index: totem-defaults.list
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/totem-defaults.list,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- totem-defaults.list	27 Mar 2008 22:05:11 -0000	1.3
+++ totem-defaults.list	1 Sep 2008 15:22:30 -0000	1.4
@@ -2,6 +2,7 @@
 application/ram=totem.desktop;
 application/sdp=totem.desktop;
 application/smil=totem.desktop;
+application/smil+xml=totem.desktop;
 application/x-extension-m4a=totem.desktop;
 application/x-extension-mp4=totem.desktop;
 application/x-flac=totem.desktop;
@@ -19,6 +20,7 @@
 audio/AMR=totem.desktop;
 audio/AMR-WB=totem.desktop;
 audio/basic=totem.desktop;
+audio/midi=totem.desktop;
 audio/mp4=totem.desktop;
 audio/mpeg=totem.desktop;rhythmbox.desktop;
 audio/mpegurl=totem.desktop;
@@ -43,10 +45,12 @@
 audio/x-pn-windows-acm=totem.desktop;
 audio/x-sbc=totem.desktop;
 audio/x-scpls=totem.desktop;rhythmbox.desktop;
+audio/x-speex=totem.desktop;
 audio/x-tta=totem.desktop;
 audio/x-wav=totem.desktop;
 audio/x-wavpack=totem.desktop;
-audio/x-vorbis=totem.desktop;
+audio/x-vorbis=totem.desktop;rhythmbox.desktop;
+audio/x-vorbis+ogg=totem.desktop;rhythmbox.desktop;
 audio/x-xm=totem.desktop;
 image/x-pict=totem.desktop;
 misc/ultravox=totem.desktop;
@@ -60,6 +64,7 @@
 video/mp4v-es=totem.desktop;
 video/mpeg=totem.desktop;
 video/msvideo=totem.desktop;
+video/ogg=totem.desktop;
 video/quicktime=totem.desktop;
 video/vivo=totem.desktop;
 video/vnd.divx=totem.desktop;
@@ -69,6 +74,7 @@
 video/x-flc=totem.desktop;
 video/x-fli=totem.desktop;
 video/x-flic=totem.desktop;
+video/x-flv=totem.desktop;
 video/x-m4v=totem.desktop;
 video/x-matroska=totem.desktop;
 video/x-mpeg=totem.desktop;



From apevec at fedoraproject.org  Mon Sep  1 15:24:58 2008
From: apevec at fedoraproject.org (Alan Pevec)
Date: Mon,  1 Sep 2008 15:24:58 +0000 (UTC)
Subject: rpms/perl-Config-Augeas/devel
	perl-Config-Augeas-0.301-fix-test.patch, 
	NONE, 1.1 .cvsignore, 1.4, 1.5 perl-Config-Augeas.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20080901152458.75C737011A@cvs1.fedora.phx.redhat.com>

Author: apevec

Update of /cvs/pkgs/rpms/perl-Config-Augeas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3959

Modified Files:
	.cvsignore perl-Config-Augeas.spec sources 
Added Files:
	perl-Config-Augeas-0.301-fix-test.patch 
Log Message:
* Mon Sep 01 2008 Alan Pevec <apevec at redhat.com> 0.301-2
- fix test failure

* Mon Sep 01 2008 Alan Pevec <apevec at redhat.com> 0.301-1
- new upstream release 0.301
  * lib/Config/Augeas.pm (move): New method for Augeas 0.3.0
    aug_mv function. 'move' can also be called with 'mv'



perl-Config-Augeas-0.301-fix-test.patch:

--- NEW FILE perl-Config-Augeas-0.301-fix-test.patch ---
diff -ru Config-Augeas-0.301-orig/t/Config-AugeasC.t Config-Augeas-0.301/t/Config-AugeasC.t
--- Config-Augeas-0.301-orig/t/Config-AugeasC.t	2008-08-29 13:42:44.000000000 +0200
+++ Config-Augeas-0.301/t/Config-AugeasC.t	2008-09-01 17:14:45.000000000 +0200
@@ -104,7 +104,7 @@
 
 ok( -e $wr_file, "$wr_file exists" );
 
-$ENV{AUG_ROOT} = $aug_root;
+$ENV{AUGEAS_ROOT} = $aug_root;
 
 # test may fail with augeas 0.2.0 installed in /usr/local
 my $augc2 = Config::Augeas::init() ;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-Augeas/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Aug 2008 08:06:00 -0000	1.4
+++ .cvsignore	1 Sep 2008 15:24:28 -0000	1.5
@@ -1 +1 @@
-Config-Augeas-0.203.tar.gz
+Config-Augeas-0.301.tar.gz


Index: perl-Config-Augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-Augeas/devel/perl-Config-Augeas.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Config-Augeas.spec	1 Aug 2008 08:06:00 -0000	1.3
+++ perl-Config-Augeas.spec	1 Sep 2008 15:24:28 -0000	1.4
@@ -1,11 +1,12 @@
 Name:           perl-Config-Augeas
-Version:        0.203
-Release:        1%{?dist}
+Version:        0.301
+Release:        2%{?dist}
 Summary:        Edit configuration files through Augeas C library
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Config-Augeas/
 Source0:        http://www.cpan.org/modules/by-module/Config/Config-Augeas-%{version}.tar.gz
+Patch0:         %{name}-%{version}-fix-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Test::More)
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q -n Config-Augeas-%{version}
+%patch0 -p1
 
 %build
 %{__perl} Build.PL installdirs=vendor optimize="$RPM_OPT_FLAGS"
@@ -47,6 +49,14 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 01 2008 Alan Pevec <apevec at redhat.com> 0.301-2
+- fix test failure
+
+* Mon Sep 01 2008 Alan Pevec <apevec at redhat.com> 0.301-1
+- new upstream release 0.301
+  * lib/Config/Augeas.pm (move): New method for Augeas 0.3.0
+    aug_mv function. 'move' can also be called with 'mv'
+
 * Fri Aug 01 2008 Alan Pevec <apevec at redhat.com> 0.203-1
 - new upstream release 0.203
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-Augeas/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Aug 2008 08:06:00 -0000	1.4
+++ sources	1 Sep 2008 15:24:28 -0000	1.5
@@ -1 +1 @@
-f5b44ad0769800af95f840fccf723bdd  Config-Augeas-0.203.tar.gz
+d5f568f87183d6001caa2c243cfe5ee3  Config-Augeas-0.301.tar.gz



From pertusus at fedoraproject.org  Mon Sep  1 15:31:45 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Mon,  1 Sep 2008 15:31:45 +0000 (UTC)
Subject: rpms/kchmviewer/devel kchmviewer.spec,1.16,1.17
Message-ID: <20080901153145.987977011A@cvs1.fedora.phx.redhat.com>

Author: pertusus

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

Modified Files:
	kchmviewer.spec 
Log Message:
add giflib-devel BuildRequires


Index: kchmviewer.spec
===================================================================
RCS file: /cvs/extras/rpms/kchmviewer/devel/kchmviewer.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kchmviewer.spec	14 Aug 2008 16:35:32 -0000	1.16
+++ kchmviewer.spec	1 Sep 2008 15:31:15 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           kchmviewer
 Version:        4.0
-Release:        0.3.beta3%{?dist}
+Release:        0.4.beta3%{?dist}
 Summary:        CHM viewer with Qt support
 
 Group:          Applications/Publishing
@@ -13,7 +13,7 @@
 Patch1:         kchmviewer-4.0-plugin_install.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt4-devel chmlib-devel 
+BuildRequires:  qt4-devel chmlib-devel giflib-devel
 BuildRequires:  desktop-file-utils kdelibs4-devel
 # for the %%cmake_kde4 macro (it is also a kdelibs4 dependency)
 # BuildRequires:  kde-filesystem
@@ -98,7 +98,7 @@
 
 
 %changelog
-* Wed Aug 13 2008 Patrice Dumas <pertusus at free.fr> 4.0-0.3.beta3
+* Wed Aug 13 2008 Patrice Dumas <pertusus at free.fr> 4.0-0.4.beta3
 - update to 4.0beta3
 
 * Thu Feb 14 2008 Patrice Dumas <pertusus at free.fr> 4.0-0.2.beta2



From nim at fedoraproject.org  Mon Sep  1 15:35:56 2008
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Mon,  1 Sep 2008 15:35:56 +0000 (UTC)
Subject: rpms/edrip-fonts/devel .cvsignore, 1.7, 1.8 edrip-fonts.spec, 1.10, 
	1.11 import.log, 1.2, 1.3 sources, 1.7, 1.8
Message-ID: <20080901153556.BB66E7011D@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/edrip-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5640/devel

Modified Files:
	.cvsignore edrip-fonts.spec import.log sources 
Log Message:
20080826


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/edrip-fonts/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jul 2008 08:10:03 -0000	1.7
+++ .cvsignore	1 Sep 2008 15:35:26 -0000	1.8
@@ -1 +1 @@
-edrip-src-20080717.tar.bz2
+edrip-src-20080826.tar.bz2


Index: edrip-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/edrip-fonts/devel/edrip-fonts.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- edrip-fonts.spec	18 Jul 2008 08:10:03 -0000	1.10
+++ edrip-fonts.spec	1 Sep 2008 15:35:26 -0000	1.11
@@ -5,7 +5,7 @@
 %define archivename %{fontname}-src-%{version}
 
 Name:    %{fontname}-fonts
-Version: 20080717
+Version: 20080826
 Release: 1%{?dist}
 Summary: Edrip decorative font
 
@@ -20,7 +20,7 @@
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 
-BuildRequires: xgridfit
+BuildRequires: xgridfit >= 1.9
 BuildRequires: fontforge >= 20080429
 
 %description
@@ -75,6 +75,10 @@
 
 
 %changelog
+* Mon Sep 1 2008 <nicolas.mailhot at laposte.net>
+- 20080826-1
+?? Still more extended cyrillic coverage
+
 * Fri Jul 17 2008 <nicolas.mailhot at laposte.net>
 - 20080717-1
 ???? More cyrillic coverage


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/edrip-fonts/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	18 Jul 2008 08:10:03 -0000	1.2
+++ import.log	1 Sep 2008 15:35:26 -0000	1.3
@@ -1,2 +1,3 @@
 edrip-fonts-20080710-1_fc10:HEAD:edrip-fonts-20080710-1.fc10.src.rpm:1215808287
 edrip-fonts-20080717-1_fc10_nim:HEAD:edrip-fonts-20080717-1.fc10.nim.src.rpm:1216368564
+edrip-fonts-20080826-1_fc10_nim:HEAD:edrip-fonts-20080826-1.fc10.nim.src.rpm:1220283093


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/edrip-fonts/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jul 2008 08:10:03 -0000	1.7
+++ sources	1 Sep 2008 15:35:26 -0000	1.8
@@ -1 +1 @@
-22887d7871edef64ccc67b7e0107050f  edrip-src-20080717.tar.bz2
+c085cb7a1d9b51f58e373caeeace158c  edrip-src-20080826.tar.bz2



From mtasaka at fedoraproject.org  Mon Sep  1 15:41:44 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  1 Sep 2008 15:41:44 +0000 (UTC)
Subject: rpms/jd/F-9 jd-svn2312-set-Fedora-default.patch, NONE, 1.1 jd.spec, 
	1.324, 1.325
Message-ID: <20080901154144.3182C7011A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	jd.spec 
Added Files:
	jd-svn2312-set-Fedora-default.patch 
Log Message:
* Tue Sep  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.beta080901
- 2.0.1 beta 080901
- Change default config in Fedora
  fonts: use Mona-VLGothic
  browser: use xdg-open


jd-svn2312-set-Fedora-default.patch:

--- NEW FILE jd-svn2312-set-Fedora-default.patch ---
Index: src/config/defaultconf.h
===================================================================
--- src/config/defaultconf.h	(revision 2312)
+++ src/config/defaultconf.h	(working copy)
@@ -30,7 +30,7 @@
         CONF_LOADER_TIMEOUT_IMG = 30,  // ???????????????????????????????????????
         CONF_LOADER_TIMEOUT_CHECKUPDATE = 10,  // ??????????????????????????????????????????
         CONF_USE_IPV6 = 1,          // ipv6??????
-        CONF_BROWSER_NO = 2,        // browsers.h ??????????????????
+        CONF_BROWSER_NO = 1,        // browsers.h ??????????????????
         CONF_REFPOPUP_BY_MO = 0,    // ?????????????????????????????????????????????????????????????????????????????????????????????
         CONF_NAMEPOPUP_BY_MO = 0,   // ?????????????????????????????????????????????????????????????????????????????????
         CONF_IDPOPUP_BY_MO = 0,     // ID?????????????????????????????????????????????ID?????????????????????????????????
Index: src/config/configitems.cpp
===================================================================
--- src/config/configitems.cpp	(revision 2312)
+++ src/config/configitems.cpp	(working copy)
@@ -36,6 +36,7 @@
 
     IS_DEFAULT_FONT( "IPA ????????? P????????????" );
     IS_DEFAULT_FONT( "IPAMonaPGothic" );
+    IS_DEFAULT_FONT( "Mona-VLGothic" );
     IS_DEFAULT_FONT( "Mona" );
     IS_DEFAULT_FONT( "VL P????????????" );
     IS_DEFAULT_FONT( "VL PGothic" );


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- jd.spec	1 Sep 2008 15:12:05 -0000	1.324
+++ jd.spec	1 Sep 2008 15:41:13 -0000	1.325
@@ -52,6 +52,7 @@
 URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+Patch0:		jd-svn2312-set-Fedora-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -74,6 +75,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
+%patch0 -p0 -b .default
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %if 0%{?fedora} >= 10
@@ -136,6 +138,9 @@
 %changelog
 * Tue Sep  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.beta080901
 - 2.0.1 beta 080901
+- Change default config in Fedora
+  fonts: use Mona-VLGothic
+  browser: use xdg-open
 
 * Tue Aug  5 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Switch the default fonts to VLGothic-based Mona



From mtasaka at fedoraproject.org  Mon Sep  1 15:41:43 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  1 Sep 2008 15:41:43 +0000 (UTC)
Subject: rpms/jd/F-8 jd-svn2312-set-Fedora-default.patch, NONE, 1.1 jd.spec, 
	1.313, 1.314
Message-ID: <20080901154144.03AF07011A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	jd.spec 
Added Files:
	jd-svn2312-set-Fedora-default.patch 
Log Message:
* Tue Sep  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.beta080901
- 2.0.1 beta 080901
- Change default config in Fedora
  fonts: use Mona-VLGothic
  browser: use xdg-open


jd-svn2312-set-Fedora-default.patch:

--- NEW FILE jd-svn2312-set-Fedora-default.patch ---
Index: src/config/defaultconf.h
===================================================================
--- src/config/defaultconf.h	(revision 2312)
+++ src/config/defaultconf.h	(working copy)
@@ -30,7 +30,7 @@
         CONF_LOADER_TIMEOUT_IMG = 30,  // ???????????????????????????????????????
         CONF_LOADER_TIMEOUT_CHECKUPDATE = 10,  // ??????????????????????????????????????????
         CONF_USE_IPV6 = 1,          // ipv6??????
-        CONF_BROWSER_NO = 2,        // browsers.h ??????????????????
+        CONF_BROWSER_NO = 1,        // browsers.h ??????????????????
         CONF_REFPOPUP_BY_MO = 0,    // ?????????????????????????????????????????????????????????????????????????????????????????????
         CONF_NAMEPOPUP_BY_MO = 0,   // ?????????????????????????????????????????????????????????????????????????????????
         CONF_IDPOPUP_BY_MO = 0,     // ID?????????????????????????????????????????????ID?????????????????????????????????
Index: src/config/configitems.cpp
===================================================================
--- src/config/configitems.cpp	(revision 2312)
+++ src/config/configitems.cpp	(working copy)
@@ -36,6 +36,7 @@
 
     IS_DEFAULT_FONT( "IPA ????????? P????????????" );
     IS_DEFAULT_FONT( "IPAMonaPGothic" );
+    IS_DEFAULT_FONT( "Mona-VLGothic" );
     IS_DEFAULT_FONT( "Mona" );
     IS_DEFAULT_FONT( "VL P????????????" );
     IS_DEFAULT_FONT( "VL PGothic" );


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- jd.spec	1 Sep 2008 15:12:05 -0000	1.313
+++ jd.spec	1 Sep 2008 15:41:13 -0000	1.314
@@ -52,6 +52,7 @@
 URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+Patch0:		jd-svn2312-set-Fedora-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -74,6 +75,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
+%patch0 -p0 -b .default
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %if 0%{?fedora} >= 10
@@ -136,6 +138,9 @@
 %changelog
 * Tue Sep  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.beta080901
 - 2.0.1 beta 080901
+- Change default config in Fedora
+  fonts: use Mona-VLGothic
+  browser: use xdg-open
 
 * Tue Aug  5 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Switch the default fonts to VLGothic-based Mona



From mtasaka at fedoraproject.org  Mon Sep  1 15:41:44 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  1 Sep 2008 15:41:44 +0000 (UTC)
Subject: rpms/jd/devel jd-svn2312-set-Fedora-default.patch, NONE, 1.1 jd.spec,
	1.332, 1.333
Message-ID: <20080901154144.7691C7011A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	jd.spec 
Added Files:
	jd-svn2312-set-Fedora-default.patch 
Log Message:
* Tue Sep  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.beta080901
- 2.0.1 beta 080901
- Change default config in Fedora
  fonts: use Mona-VLGothic
  browser: use xdg-open


jd-svn2312-set-Fedora-default.patch:

--- NEW FILE jd-svn2312-set-Fedora-default.patch ---
Index: src/config/defaultconf.h
===================================================================
--- src/config/defaultconf.h	(revision 2312)
+++ src/config/defaultconf.h	(working copy)
@@ -30,7 +30,7 @@
         CONF_LOADER_TIMEOUT_IMG = 30,  // ???????????????????????????????????????
         CONF_LOADER_TIMEOUT_CHECKUPDATE = 10,  // ??????????????????????????????????????????
         CONF_USE_IPV6 = 1,          // ipv6??????
-        CONF_BROWSER_NO = 2,        // browsers.h ??????????????????
+        CONF_BROWSER_NO = 1,        // browsers.h ??????????????????
         CONF_REFPOPUP_BY_MO = 0,    // ?????????????????????????????????????????????????????????????????????????????????????????????
         CONF_NAMEPOPUP_BY_MO = 0,   // ?????????????????????????????????????????????????????????????????????????????????
         CONF_IDPOPUP_BY_MO = 0,     // ID?????????????????????????????????????????????ID?????????????????????????????????
Index: src/config/configitems.cpp
===================================================================
--- src/config/configitems.cpp	(revision 2312)
+++ src/config/configitems.cpp	(working copy)
@@ -36,6 +36,7 @@
 
     IS_DEFAULT_FONT( "IPA ????????? P????????????" );
     IS_DEFAULT_FONT( "IPAMonaPGothic" );
+    IS_DEFAULT_FONT( "Mona-VLGothic" );
     IS_DEFAULT_FONT( "Mona" );
     IS_DEFAULT_FONT( "VL P????????????" );
     IS_DEFAULT_FONT( "VL PGothic" );


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -r1.332 -r1.333
--- jd.spec	1 Sep 2008 15:12:05 -0000	1.332
+++ jd.spec	1 Sep 2008 15:41:14 -0000	1.333
@@ -52,6 +52,7 @@
 URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+Patch0:		jd-svn2312-set-Fedora-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -74,6 +75,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
+%patch0 -p0 -b .default
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %if 0%{?fedora} >= 10
@@ -136,6 +138,9 @@
 %changelog
 * Tue Sep  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.beta080901
 - 2.0.1 beta 080901
+- Change default config in Fedora
+  fonts: use Mona-VLGothic
+  browser: use xdg-open
 
 * Tue Aug  5 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Switch the default fonts to VLGothic-based Mona



From hadess at fedoraproject.org  Mon Sep  1 15:46:50 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  1 Sep 2008 15:46:50 +0000 (UTC)
Subject: rpms/gnome-media/devel gnome-media.spec,1.135,1.136
Message-ID: <20080901154650.8E9917011A@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gnome-media.spec 
Log Message:
* Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> 2.23.3-4
- Update description (#448399)



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- gnome-media.spec	22 Aug 2008 23:54:25 -0000	1.135
+++ gnome-media.spec	1 Sep 2008 15:46:20 -0000	1.136
@@ -14,7 +14,7 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.23.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.23/gnome-media-%{version}.tar.bz2
@@ -55,7 +55,7 @@
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
 GUI applications and desktop tools to be used in conjunction with a
 window manager for the X Window System. The gnome-media package will
-install media features like the GNOME CD player.
+install media features like the sound recorder, and an audio mixer.
 
 %package devel
 Summary: Libraries/include files for GNOME media programs
@@ -70,7 +70,7 @@
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
 GUI applications and desktop tools to be used in conjunction with a
 window manager for the X Window System. The gnome-media package will
-install media features like the GNOME CD player.
+install media features.
 
 This package contains the libraries and includes files necessary to 
 develop GNOME media applications.
@@ -201,6 +201,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> 2.23.3-4
+- Update description (#448399)
+
 * Sat Aug 23 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.3-3
 - Rebuild to fix directory ownership (#447837)
 



From veillard at fedoraproject.org  Mon Sep  1 15:55:07 2008
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon,  1 Sep 2008 15:55:07 +0000 (UTC)
Subject: rpms/libxml2/F-9 libxml2.spec,1.55,1.56 sources,1.42,1.43
Message-ID: <20080901155507.B9DAE7011A@cvs1.fedora.phx.redhat.com>

Author: veillard

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

Modified Files:
	libxml2.spec sources 
Log Message:
upstream release of 2.7.1, Daniel



Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-9/libxml2.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- libxml2.spec	25 Aug 2008 16:03:41 -0000	1.55
+++ libxml2.spec	1 Sep 2008 15:54:37 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.6.32
-Release: 3%{?dist}%{?extra_release}
+Version: 2.7.1
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
@@ -135,14 +135,26 @@
 %doc doc/python.html
 
 %changelog
-* Mon Aug 25 2008 Daniel Veillard <veillard at redhat.com> 2.6.31-3.fc9
+* Mon Sep  1 2008 Daniel Veillard <veillard at redhat.com> 2.7.1-1.fc9
+- upstream release of 2.7.1
+- fix python serialization which was broken in 2.7.0
+- upstream release of 2.7.0
+- switch to XML 1.0 5th edition
+- switch to RFC 3986 for URI parsing
+- better entity handling
+- option to remove hardcoded limitations in the parser
+- more testing
+- a new API to allocate entity nodes
+- and lot of fixes and cleanups
+
+* Mon Aug 25 2008 Daniel Veillard <veillard at redhat.com> 2.6.32-3.fc9
 - fix for entities recursion problem
 - Resolve: rhbz#459713
 
-* Thu May 15 2008 Daniel Veillard <veillard at redhat.com> 2.6.31-2.fc9
+* Thu May 15 2008 Daniel Veillard <veillard at redhat.com> 2.6.32-2.fc9
 - try to fix multiarch problems like #440206
 
-* Tue Apr  8 2008 Daniel Veillard <veillard at redhat.com> 2.6.31-1.fc9
+* Tue Apr  8 2008 Daniel Veillard <veillard at redhat.com> 2.6.32-1.fc9
 - upstream release 2.6.32 see http://xmlsoft.org/news.html
 - many bug fixed upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-9/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	8 Apr 2008 16:33:43 -0000	1.42
+++ sources	1 Sep 2008 15:54:37 -0000	1.43
@@ -1 +1 @@
-2621d322c16f0257e30f0ff2b13384de  libxml2-2.6.32.tar.gz
+abc093e9ac7ea1aabf37982ae9df6d6c  libxml2-2.7.1.tar.gz



From veillard at fedoraproject.org  Mon Sep  1 16:00:14 2008
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon,  1 Sep 2008 16:00:14 +0000 (UTC)
Subject: rpms/libxml2/F-9 libxml2.spec, 1.56,
	1.57 libxml2-2.6.32.entities.patch, 1.1, NONE
Message-ID: <20080901160014.2AC507011A@cvs1.fedora.phx.redhat.com>

Author: veillard

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

Modified Files:
	libxml2.spec 
Removed Files:
	libxml2-2.6.32.entities.patch 
Log Message:
oops forgot to remove old patch, Daniel



Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-9/libxml2.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- libxml2.spec	1 Sep 2008 15:54:37 -0000	1.56
+++ libxml2.spec	1 Sep 2008 15:59:43 -0000	1.57
@@ -11,7 +11,6 @@
 Prefix: %{_prefix}
 Docdir: %{_docdir}
 Patch0: multilib.patch
-Patch1: libxml2-2.6.32.entities.patch
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -61,7 +60,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
 
 %build
 %configure


--- libxml2-2.6.32.entities.patch DELETED ---



From veillard at fedoraproject.org  Mon Sep  1 16:01:56 2008
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon,  1 Sep 2008 16:01:56 +0000 (UTC)
Subject: rpms/libxml2/F-8 libxml2.spec, 1.51, 1.52 sources, 1.42,
	1.43 libxml2-2.6.32.entities.patch, 1.1, NONE
Message-ID: <20080901160156.B0AC77011A@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9141

Modified Files:
	libxml2.spec sources 
Removed Files:
	libxml2-2.6.32.entities.patch 
Log Message:
upstream release 2.7.1, Daniel



Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-8/libxml2.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- libxml2.spec	25 Aug 2008 16:23:09 -0000	1.51
+++ libxml2.spec	1 Sep 2008 16:01:26 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.6.32
-Release: 2%{?dist}%{?extra_release}
+Version: 2.7.1
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
@@ -11,7 +11,6 @@
 Prefix: %{_prefix}
 Docdir: %{_docdir}
 Patch0: multilib.patch
-Patch1: libxml2-2.6.32.entities.patch
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -61,7 +60,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
 
 %build
 %configure
@@ -132,6 +130,18 @@
 %doc doc/python.html
 
 %changelog
+* Mon Sep  1 2008 Daniel Veillard <veillard at redhat.com> 2.7.1-1.fc8
+- upstream release of 2.7.1
+- fix python serialization which was broken in 2.7.0
+- upstream release of 2.7.0
+- switch to XML 1.0 5th edition
+- switch to RFC 3986 for URI parsing
+- better entity handling
+- option to remove hardcoded limitations in the parser
+- more testing
+- a new API to allocate entity nodes
+- and lot of fixes and cleanups
+
 * Mon Aug 25 2008 Daniel Veillard <veillard at redhat.com> 2.6.31-2.fc8
 - fix for entities recursion problem
 - Resolve: rhbz#459712


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-8/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	11 Apr 2008 09:43:40 -0000	1.42
+++ sources	1 Sep 2008 16:01:26 -0000	1.43
@@ -1 +1 @@
-2621d322c16f0257e30f0ff2b13384de  libxml2-2.6.32.tar.gz
+abc093e9ac7ea1aabf37982ae9df6d6c  libxml2-2.7.1.tar.gz


--- libxml2-2.6.32.entities.patch DELETED ---



From salimma at fedoraproject.org  Mon Sep  1 16:50:31 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon,  1 Sep 2008 16:50:31 +0000 (UTC)
Subject: rpms/ikarus/F-8 ikarus.spec,1.5,1.6
Message-ID: <20080901165031.43D2C7011E@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/ikarus/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14966/F-8

Modified Files:
	ikarus.spec 
Log Message:
* Mon Sep  1 2008 Michel Salim <salimma at fedoraproject.org> - 0.0.3-2
- Own documentation directory



Index: ikarus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikarus/F-8/ikarus.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ikarus.spec	3 Jun 2008 03:09:12 -0000	1.5
+++ ikarus.spec	1 Sep 2008 16:50:01 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ikarus
 Version:        0.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An incremental optimizing compiler for R6RS Scheme
 
 Group:          Development/Languages
@@ -73,12 +73,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{_docdir}/%{name}-%{version}/*
+%doc %{_docdir}/%{name}-%{version}
 %{_bindir}/*
 %{_libdir}/ikarus
 
 
 %changelog
+* Mon Sep  1 2008 Michel Salim <salimma at fedoraproject.org> - 0.0.3-2
+- Own documentation directory
+
 * Mon Jun  2 2008 Michel Salim <salimma at fedoraproject.org> - 0.0.3-1
 - Update to 0.0.3
 



From salimma at fedoraproject.org  Mon Sep  1 16:50:31 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon,  1 Sep 2008 16:50:31 +0000 (UTC)
Subject: rpms/ikarus/EL-5 ikarus.spec,1.5,1.6
Message-ID: <20080901165031.216997011A@cvs1.fedora.phx.redhat.com>

Author: salimma

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

Modified Files:
	ikarus.spec 
Log Message:
* Mon Sep  1 2008 Michel Salim <salimma at fedoraproject.org> - 0.0.3-2
- Own documentation directory



Index: ikarus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikarus/EL-5/ikarus.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ikarus.spec	3 Jun 2008 03:08:28 -0000	1.5
+++ ikarus.spec	1 Sep 2008 16:50:00 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ikarus
 Version:        0.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An incremental optimizing compiler for R6RS Scheme
 
 Group:          Development/Languages
@@ -73,12 +73,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{_docdir}/%{name}-%{version}/*
+%doc %{_docdir}/%{name}-%{version}
 %{_bindir}/*
 %{_libdir}/ikarus
 
 
 %changelog
+* Mon Sep  1 2008 Michel Salim <salimma at fedoraproject.org> - 0.0.3-2
+- Own documentation directory
+
 * Mon Jun  2 2008 Michel Salim <salimma at fedoraproject.org> - 0.0.3-1
 - Update to 0.0.3
 



From salimma at fedoraproject.org  Mon Sep  1 16:50:31 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon,  1 Sep 2008 16:50:31 +0000 (UTC)
Subject: rpms/ikarus/devel ikarus.spec,1.6,1.7
Message-ID: <20080901165031.ACD2E7011A@cvs1.fedora.phx.redhat.com>

Author: salimma

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

Modified Files:
	ikarus.spec 
Log Message:
* Mon Sep  1 2008 Michel Salim <salimma at fedoraproject.org> - 0.0.3-2
- Own documentation directory



Index: ikarus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikarus/devel/ikarus.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ikarus.spec	3 Jun 2008 03:09:45 -0000	1.6
+++ ikarus.spec	1 Sep 2008 16:50:01 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           ikarus
 Version:        0.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An incremental optimizing compiler for R6RS Scheme
 
 Group:          Development/Languages
@@ -73,12 +73,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{_docdir}/%{name}-%{version}/*
+%doc %{_docdir}/%{name}-%{version}
 %{_bindir}/*
 %{_libdir}/ikarus
 
 
 %changelog
+* Mon Sep  1 2008 Michel Salim <salimma at fedoraproject.org> - 0.0.3-2
+- Own documentation directory
+
 * Mon Jun  2 2008 Michel Salim <salimma at fedoraproject.org> - 0.0.3-1
 - Update to 0.0.3
 



From salimma at fedoraproject.org  Mon Sep  1 16:50:31 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon,  1 Sep 2008 16:50:31 +0000 (UTC)
Subject: rpms/ikarus/F-9 ikarus.spec,1.6,1.7
Message-ID: <20080901165031.75A707011A@cvs1.fedora.phx.redhat.com>

Author: salimma

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

Modified Files:
	ikarus.spec 
Log Message:
* Mon Sep  1 2008 Michel Salim <salimma at fedoraproject.org> - 0.0.3-2
- Own documentation directory



Index: ikarus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikarus/F-9/ikarus.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ikarus.spec	3 Jun 2008 03:09:29 -0000	1.6
+++ ikarus.spec	1 Sep 2008 16:50:01 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           ikarus
 Version:        0.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An incremental optimizing compiler for R6RS Scheme
 
 Group:          Development/Languages
@@ -73,12 +73,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{_docdir}/%{name}-%{version}/*
+%doc %{_docdir}/%{name}-%{version}
 %{_bindir}/*
 %{_libdir}/ikarus
 
 
 %changelog
+* Mon Sep  1 2008 Michel Salim <salimma at fedoraproject.org> - 0.0.3-2
+- Own documentation directory
+
 * Mon Jun  2 2008 Michel Salim <salimma at fedoraproject.org> - 0.0.3-1
 - Update to 0.0.3
 



From than at fedoraproject.org  Mon Sep  1 16:56:33 2008
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  1 Sep 2008 16:56:33 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime-4.1.1-knetattach.patch, 
	NONE, 1.1 kdebase-runtime.spec, 1.66, 1.67
Message-ID: <20080901165633.52CA57011A@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.1.1-knetattach.patch 
Log Message:
- fix #460710, knetattach is kio_remote's wizard program, don't show
  it in the menu.


kdebase-runtime-4.1.1-knetattach.patch:

--- NEW FILE kdebase-runtime-4.1.1-knetattach.patch ---
diff -up kdebase-runtime-4.1.1/knetattach/knetattach.desktop.orig kdebase-runtime-4.1.1/knetattach/knetattach.desktop
--- kdebase-runtime-4.1.1/knetattach/knetattach.desktop.orig	2008-09-01 18:50:10.000000000 +0200
+++ kdebase-runtime-4.1.1/knetattach/knetattach.desktop	2008-09-01 18:50:42.000000000 +0200
@@ -91,4 +91,5 @@ Type=Application
 Terminal=false
 X-KDE-StartupNotify=true
 Categories=Qt;KDE;Network;
+NoDisplay=true
 X-DocPath=knetattach/index.html


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- kdebase-runtime.spec	29 Aug 2008 13:34:38 -0000	1.66
+++ kdebase-runtime.spec	1 Sep 2008 16:56:03 -0000	1.67
@@ -10,7 +10,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
 Version:       4.1.1
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -19,6 +19,7 @@
 Source1:       khelpcenter.desktop
 Patch0:        kdebase-runtime-4.1.0-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
+Patch2:        kdebase-runtime-4.1.1-knetattach.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %ifarch noarch
@@ -100,6 +101,7 @@
 
 %patch0 -p1 -b .pulseaudio
 %patch1 -p1 -b .searchproviders-shortcuts
+%patch2 -p1 -b .knetattach
 
 # upstream patches
 
@@ -336,6 +338,10 @@
 
 
 %changelog
+* Mon Sep 01 2008 Than Ngo <than at redhat.com> 4.1.1-2
+- fix #460710, knetattach is kio_remote's wizard program, don't show
+  it in the menu.
+
 * Thu Aug 28 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 



From than at fedoraproject.org  Mon Sep  1 16:58:25 2008
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  1 Sep 2008 16:58:25 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-9 kdebase-runtime-4.1.1-knetattach.patch,
	NONE, 1.1 kdebase-runtime.spec, 1.53, 1.54
Message-ID: <20080901165825.4B3C17011A@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-runtime/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16107

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.1.1-knetattach.patch 
Log Message:
- fix #460710, knetattach is kio_remote's wizard program, don't show
  it in the menu.


kdebase-runtime-4.1.1-knetattach.patch:

--- NEW FILE kdebase-runtime-4.1.1-knetattach.patch ---
diff -up kdebase-runtime-4.1.1/knetattach/knetattach.desktop.orig kdebase-runtime-4.1.1/knetattach/knetattach.desktop
--- kdebase-runtime-4.1.1/knetattach/knetattach.desktop.orig	2008-09-01 18:50:10.000000000 +0200
+++ kdebase-runtime-4.1.1/knetattach/knetattach.desktop	2008-09-01 18:50:42.000000000 +0200
@@ -91,4 +91,5 @@ Type=Application
 Terminal=false
 X-KDE-StartupNotify=true
 Categories=Qt;KDE;Network;
+NoDisplay=true
 X-DocPath=knetattach/index.html


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kdebase-runtime.spec	29 Aug 2008 18:47:11 -0000	1.53
+++ kdebase-runtime.spec	1 Sep 2008 16:57:55 -0000	1.54
@@ -10,7 +10,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
 Version:       4.1.1
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -19,6 +19,7 @@
 Source1:       khelpcenter.desktop
 Patch0:        kdebase-runtime-4.1.0-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
+Patch2:        kdebase-runtime-4.1.1-knetattach.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %ifarch noarch
@@ -100,6 +101,7 @@
 
 %patch0 -p1 -b .pulseaudio
 %patch1 -p1 -b .searchproviders-shortcuts
+%patch2 -p1 -b .knetattach
 
 # upstream patches
 
@@ -336,6 +338,10 @@
 
 
 %changelog
+* Mon Sep 01 2008 Than Ngo <than at redhat.com> 4.1.1-2
+- fix #460710, knetattach is kio_remote's wizard program, don't show
+  it in the menu.
+
 * Thu Aug 28 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 



From than at fedoraproject.org  Mon Sep  1 17:07:30 2008
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  1 Sep 2008 17:07:30 +0000 (UTC)
Subject: rpms/kde-l10n/devel sources,1.12,1.13
Message-ID: <20080901170730.D8E607011A@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	sources 
Log Message:
respun kde-l10n-sr-4.1.1.tar.bz2



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	29 Aug 2008 19:47:56 -0000	1.12
+++ sources	1 Sep 2008 17:07:00 -0000	1.13
@@ -31,7 +31,6 @@
 034491ae5db90a0861a76b704d32fe1c  kde-l10n-pt_BR-4.1.1.tar.bz2
 d5e265a13c772e93b31a6d7c147ccfe9  kde-l10n-ru-4.1.1.tar.bz2
 a37237cea98b434d1f5ac01259b0453f  kde-l10n-sl-4.1.1.tar.bz2
-59032dd22ef0e12274cf99dc46c3d182  kde-l10n-sr-4.1.1.tar.bz2
 0aed3d7ef74f1a6bbf34425dbe229ae5  kde-l10n-sv-4.1.1.tar.bz2
 87bb1c1762964e01a60ef9347b5e0af3  kde-l10n-ta-4.1.1.tar.bz2
 bfe292d8623a25a02501ded7f032d5a7  kde-l10n-th-4.1.1.tar.bz2
@@ -40,3 +39,4 @@
 6bee00ed5512c5c7123cd40e8bc27c9e  kde-l10n-wa-4.1.1.tar.bz2
 134cd3d65db7352e88f05df547af04db  kde-l10n-zh_CN-4.1.1.tar.bz2
 4ec74453141d23c503123e788a491c98  kde-l10n-zh_TW-4.1.1.tar.bz2
+b29bc82068ac7d3443fffe924356a7fd  kde-l10n-sr-4.1.1.tar.bz2



From than at fedoraproject.org  Mon Sep  1 17:09:20 2008
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  1 Sep 2008 17:09:20 +0000 (UTC)
Subject: rpms/kde-l10n/F-9 sources,1.11,1.12
Message-ID: <20080901170920.12A897011D@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17643

Modified Files:
	sources 
Log Message:
respun kde-l10n-sr-4.1.1.tar.bz2



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	29 Aug 2008 19:49:30 -0000	1.11
+++ sources	1 Sep 2008 17:08:49 -0000	1.12
@@ -31,7 +31,6 @@
 034491ae5db90a0861a76b704d32fe1c  kde-l10n-pt_BR-4.1.1.tar.bz2
 d5e265a13c772e93b31a6d7c147ccfe9  kde-l10n-ru-4.1.1.tar.bz2
 a37237cea98b434d1f5ac01259b0453f  kde-l10n-sl-4.1.1.tar.bz2
-59032dd22ef0e12274cf99dc46c3d182  kde-l10n-sr-4.1.1.tar.bz2
 0aed3d7ef74f1a6bbf34425dbe229ae5  kde-l10n-sv-4.1.1.tar.bz2
 87bb1c1762964e01a60ef9347b5e0af3  kde-l10n-ta-4.1.1.tar.bz2
 bfe292d8623a25a02501ded7f032d5a7  kde-l10n-th-4.1.1.tar.bz2
@@ -40,3 +39,4 @@
 6bee00ed5512c5c7123cd40e8bc27c9e  kde-l10n-wa-4.1.1.tar.bz2
 134cd3d65db7352e88f05df547af04db  kde-l10n-zh_CN-4.1.1.tar.bz2
 4ec74453141d23c503123e788a491c98  kde-l10n-zh_TW-4.1.1.tar.bz2
+b29bc82068ac7d3443fffe924356a7fd  kde-l10n-sr-4.1.1.tar.bz2



From kwizart at fedoraproject.org  Mon Sep  1 17:16:23 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon,  1 Sep 2008 17:16:23 +0000 (UTC)
Subject: rpms/PerceptualDiff/devel PerceptualDiff-1.0.2-gcc43.patch, NONE,
	1.1 PerceptualDiff.spec, 1.7, 1.8
Message-ID: <20080901171623.D712B7011A@cvs1.fedora.phx.redhat.com>

Author: kwizart

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

Modified Files:
	PerceptualDiff.spec 
Added Files:
	PerceptualDiff-1.0.2-gcc43.patch 
Log Message:
- Re-introduce gcc43 patch


PerceptualDiff-1.0.2-gcc43.patch:

--- NEW FILE PerceptualDiff-1.0.2-gcc43.patch ---
diff -up PerceptualDiff-1.0.2/RGBAImage.cpp.gcc43 PerceptualDiff-1.0.2/RGBAImage.cpp
--- PerceptualDiff-1.0.2/RGBAImage.cpp.gcc43	2008-07-10 08:13:08.000000000 +0200
+++ PerceptualDiff-1.0.2/RGBAImage.cpp	2008-09-01 17:28:53.000000000 +0200
@@ -18,6 +18,8 @@ if not, write to the Free Software Found
 
 #include "RGBAImage.h"
 #include "FreeImage.h"
+#include <stdio.h>
+#include <cstring>
 
 bool RGBAImage::WriteToFile(const char* filename)
 {
diff -up PerceptualDiff-1.0.2/CompareArgs.cpp.gcc43 PerceptualDiff-1.0.2/CompareArgs.cpp
--- PerceptualDiff-1.0.2/CompareArgs.cpp.gcc43	2008-07-10 08:13:08.000000000 +0200
+++ PerceptualDiff-1.0.2/CompareArgs.cpp	2008-09-01 17:10:08.000000000 +0200
@@ -17,6 +17,9 @@ if not, write to the Free Software Found
 #include "CompareArgs.h"
 #include "RGBAImage.h"
 #include <stdio.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 static const char* copyright = 
 "PerceptualDiff version 1.0.2, Copyright (C) 2006 Yangli Hector Yee\n\


Index: PerceptualDiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PerceptualDiff/devel/PerceptualDiff.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PerceptualDiff.spec	1 Sep 2008 14:16:21 -0000	1.7
+++ PerceptualDiff.spec	1 Sep 2008 17:15:53 -0000	1.8
@@ -1,12 +1,15 @@
-Name:			PerceptualDiff          
+%define _default_patch_fuzz 2
+
+Name:			PerceptualDiff
 Version:		1.0.2
-Release:		2%{?dist}
+Release:		3%{?dist}
 Summary:		An image comparison utility
 
 Group:			Applications/Multimedia
 License:		GPLv2+
 URL:			http://pdiff.sourceforge.net
 Source:			http://downloads.sourceforge.net/pdiff/%{name}-%{version}.tar.gz
+Patch0:			PerceptualDiff-1.0.2-gcc43.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake
@@ -28,6 +31,7 @@
 sed -i 's/\r//' LPyramid.cpp
 sed -i 's/\r//' LPyramid.h
 chmod 0644 *
+%patch0 -p1 -b .gcc43
 
 
 %build
@@ -39,7 +43,6 @@
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
 	-DBUILD_SHARED_LIBS:BOOL=ON \
 	-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} .
-
 make VERBOSE=1 %{?_smp_mflags}
 
 
@@ -62,6 +65,9 @@
 
 
 %changelog
+* Mon Sep  1 2008 kwizart < kwizart at gmail.com > - 1.0.2-3
+- Re-introduce gcc43 patch
+
 * Mon Sep  1 2008 kwizart < kwizart at gmail.com > - 1.0.2-2
 - Add Missing BR freeimage-devel
 



From stingray at fedoraproject.org  Mon Sep  1 17:16:47 2008
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Mon,  1 Sep 2008 17:16:47 +0000 (UTC)
Subject: rpms/libnetfilter_log/devel libnetfilter_log.spec,1.7,1.8
Message-ID: <20080901171647.AF82F7011A@cvs1.fedora.phx.redhat.com>

Author: stingray

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

Modified Files:
	libnetfilter_log.spec 
Log Message:
include /usr/include/libnetfilter_log directory


Index: libnetfilter_log.spec
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_log/devel/libnetfilter_log.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libnetfilter_log.spec	7 Aug 2008 14:27:31 -0000	1.7
+++ libnetfilter_log.spec	1 Sep 2008 17:16:17 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libnetfilter_log
 Version:        0.0.14
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Netfilter logging userspace library
 Group:          System Environment/Libraries
 License:        GPLv2
@@ -66,10 +66,14 @@
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/*.so
+%dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*.h
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Fri Aug 29 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.0.14-3
+- include /usr/include/libnetfilter_log directory
+
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.0.14-2
 - fix license tag
 



From sindrepb at fedoraproject.org  Mon Sep  1 17:35:30 2008
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Mon,  1 Sep 2008 17:35:30 +0000 (UTC)
Subject: rpms/gnome-do/devel .cvsignore, 1.7, 1.8 gnome-do.spec, 1.22,
	1.23 sources, 1.7, 1.8
Message-ID: <20080901173530.E6ADA7011A@cvs1.fedora.phx.redhat.com>

Author: sindrepb

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

Modified Files:
	.cvsignore gnome-do.spec sources 
Log Message:
new release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Jul 2008 13:52:19 -0000	1.7
+++ .cvsignore	1 Sep 2008 17:35:00 -0000	1.8
@@ -1 +1 @@
-gnome-do-0.5.0.1.tar.gz
+gnome-do-0.5.99.0.tar.gz


Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnome-do.spec	2 Aug 2008 15:28:38 -0000	1.22
+++ gnome-do.spec	1 Sep 2008 17:35:00 -0000	1.23
@@ -1,8 +1,8 @@
 %define			debug_package %{nil}
 
 Name:			gnome-do
-Version:		0.5.0.1   
-Release:		4%{?dist}
+Version:		0.5.99
+Release:		1%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
@@ -87,6 +87,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jun 11 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.5.99-1
+- New upstream release
+
 * Wed Jun 11 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.5.0.1-4
 - New upstrean release
 - Add gnome-desktop-sharp dependency


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Jul 2008 13:52:19 -0000	1.7
+++ sources	1 Sep 2008 17:35:00 -0000	1.8
@@ -1 +1 @@
-1bc096b9ac6cd5fa30d5339be6dd6d9d  gnome-do-0.5.0.1.tar.gz
+da866f376d59faf6af6f012004c01c49  gnome-do-0.5.99.0.tar.gz



From davej at fedoraproject.org  Mon Sep  1 17:39:48 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Mon,  1 Sep 2008 17:39:48 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-debug-always-inline-kzalloc.patch, NONE,
	1.1 kernel.spec, 1.917,
	1.918 linux-2.6-debug-list_debug_rcu.patch, 1.1, NONE
Message-ID: <20080901173948.F37777011A@cvs1.fedora.phx.redhat.com>

Author: davej

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-debug-always-inline-kzalloc.patch 
Removed Files:
	linux-2.6-debug-list_debug_rcu.patch 
Log Message:
Always inline kzalloc.  And drop busted rcu debug patch

linux-2.6-debug-always-inline-kzalloc.patch:

--- NEW FILE linux-2.6-debug-always-inline-kzalloc.patch ---
--- linux-2.6.26.noarch/include/linux/slab.h~	2008-09-01 00:33:55.000000000 -0400
+++ linux-2.6.26.noarch/include/linux/slab.h	2008-09-01 00:34:19.000000000 -0400
@@ -272,7 +272,7 @@ static inline void *kmem_cache_zalloc(st
  * @size: how many bytes of memory are required.
  * @flags: the type of memory to allocate (see kmalloc).
  */
-static inline void *kzalloc(size_t size, gfp_t flags)
+static __always_inline void *kzalloc(size_t size, gfp_t flags)
 {
 	return kmalloc(size, flags | __GFP_ZERO);
 }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.917
retrieving revision 1.918
diff -u -r1.917 -r1.918
--- kernel.spec	30 Aug 2008 16:31:22 -0000	1.917
+++ kernel.spec	1 Sep 2008 17:39:18 -0000	1.918
@@ -574,7 +574,7 @@
 Patch270: linux-2.6-debug-taint-vm.patch
 Patch280: linux-2.6-debug-spinlock-taint.patch
 Patch340: linux-2.6-debug-vm-would-have-oomkilled.patch
-Patch350: linux-2.6-debug-list_debug_rcu.patch
+Patch360: linux-2.6-debug-always-inline-kzalloc.patch
 Patch370: linux-2.6-crash-driver.patch
 Patch380: linux-2.6-defaults-pci_no_msi.patch
 Patch390: linux-2.6-defaults-acpi-video.patch
@@ -1062,7 +1062,7 @@
 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-list_debug_rcu.patch
+ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch
 
 #
 # /dev/crash driver for the crashdump analysis tool
@@ -1744,6 +1744,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Sep 01 2008 Dave Jones <davej at redhat.com>
+- Always inline kzalloc.  And drop busted rcu debug patch
+
 * Sat Aug 30 2008 Dave Jones <davej at redhat.com>
 - 2.6.27-rc5-git2
 


--- linux-2.6-debug-list_debug_rcu.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Sep  1 17:53:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:53:51 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175250.B4288208D7B@bastion.fedora.phx.redhat.com>

roland has set the watchbugzilla acl on trac-monotone-plugin (Fedora devel) to Approved for thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:52:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:52:53 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175253.6FA46208D83@bastion.fedora.phx.redhat.com>

roland has set the watchcommits acl on trac-monotone-plugin (Fedora devel) to Approved for thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:53:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:53:56 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175255.6795E208D89@bastion.fedora.phx.redhat.com>

roland has set the commit acl on trac-monotone-plugin (Fedora devel) to Approved for thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:52:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:52:53 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175258.B9156208D8C@bastion.fedora.phx.redhat.com>

roland has set the watchbugzilla acl on trac-monotone-plugin (Fedora devel) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:53:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:53:00 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175300.36333208D8E@bastion.fedora.phx.redhat.com>

roland has set the approveacls acl on trac-monotone-plugin (Fedora devel) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:54:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:54:05 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175304.80A88208D7B@bastion.fedora.phx.redhat.com>

roland has set the watchcommits acl on trac-monotone-plugin (Fedora devel) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:53:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:53:01 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175301.7C630208D91@bastion.fedora.phx.redhat.com>

roland has set the approveacls acl on trac-monotone-plugin (Fedora devel) to Approved for thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:54:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:54:05 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175304.8CF3A208D95@bastion.fedora.phx.redhat.com>

roland has set the commit acl on trac-monotone-plugin (Fedora devel) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:53:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:53:12 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175312.9D577208D9A@bastion.fedora.phx.redhat.com>

roland has set the watchbugzilla acl on trac-monotone-plugin (Fedora 8) to Approved for thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:53:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:53:12 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175312.B40D4208D9C@bastion.fedora.phx.redhat.com>

roland has set the watchbugzilla acl on trac-monotone-plugin (Fedora 8) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:53:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:53:16 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175316.9CB04208D7E@bastion.fedora.phx.redhat.com>

roland has set the watchcommits acl on trac-monotone-plugin (Fedora 8) to Approved for thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:54:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:54:19 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175318.A5E4A208D9E@bastion.fedora.phx.redhat.com>

roland has set the watchcommits acl on trac-monotone-plugin (Fedora 8) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:54:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:54:22 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175321.9E9C7208DA0@bastion.fedora.phx.redhat.com>

roland has set the commit acl on trac-monotone-plugin (Fedora 8) to Approved for thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:53:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:53:21 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175321.C56DB208DA2@bastion.fedora.phx.redhat.com>

roland has set the commit acl on trac-monotone-plugin (Fedora 8) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:53:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:53:23 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175323.AE617208DA5@bastion.fedora.phx.redhat.com>

roland has set the approveacls acl on trac-monotone-plugin (Fedora 8) to Approved for thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:54:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:54:26 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175325.1881E208D89@bastion.fedora.phx.redhat.com>

roland has set the approveacls acl on trac-monotone-plugin (Fedora 8) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:53:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:53:32 +0000
Subject: [pkgdb] trac-monotone-plugin: roland has requested watchbugzilla
Message-ID: <20080901175332.BCCA6208DA8@bastion.fedora.phx.redhat.com>

roland has requested the watchbugzilla acl on trac-monotone-plugin (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:53:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:53:34 +0000
Subject: [pkgdb] trac-monotone-plugin: roland has requested watchcommits
Message-ID: <20080901175334.34F4E208D8B@bastion.fedora.phx.redhat.com>

roland has requested the watchcommits acl on trac-monotone-plugin (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:54:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:54:39 +0000
Subject: [pkgdb] trac-monotone-plugin: roland has requested commit
Message-ID: <20080901175338.A22AA208D8C@bastion.fedora.phx.redhat.com>

roland has requested the commit acl on trac-monotone-plugin (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:53:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:53:43 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175343.5123D208D8F@bastion.fedora.phx.redhat.com>

roland has set the approveacls acl on trac-monotone-plugin (Fedora EPEL 5) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:53:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:53:46 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175346.AB1D7208D91@bastion.fedora.phx.redhat.com>

roland has set the approveacls acl on trac-monotone-plugin (Fedora EPEL 5) to Obsolete for thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:53:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:53:42 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175348.4B111208D7A@bastion.fedora.phx.redhat.com>

roland has set the commit acl on trac-monotone-plugin (Fedora EPEL 5) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:54:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:54:49 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175348.F1598208DB0@bastion.fedora.phx.redhat.com>

roland has set the approveacls acl on trac-monotone-plugin (Fedora EPEL 5) to Approved for thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:54:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:54:52 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175351.4E7B5208D92@bastion.fedora.phx.redhat.com>

roland has set the commit acl on trac-monotone-plugin (Fedora EPEL 5) to Approved for thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:53:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:53:54 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175354.52E74208DB5@bastion.fedora.phx.redhat.com>

roland has set the watchcommits acl on trac-monotone-plugin (Fedora EPEL 5) to Approved for thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:54:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:54:01 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175401.A11F1208D94@bastion.fedora.phx.redhat.com>

roland has set the watchbugzilla acl on trac-monotone-plugin (Fedora EPEL 5) to Approved for thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:54:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:54:57 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175356.4D1A6208DB8@bastion.fedora.phx.redhat.com>

roland has set the watchcommits acl on trac-monotone-plugin (Fedora EPEL 5) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:54:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:54:21 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175422.043B5208D80@bastion.fedora.phx.redhat.com>

roland has set the watchcommits acl on trac-monotone-plugin (Fedora 9) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:54:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:54:25 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175425.62EB0208D84@bastion.fedora.phx.redhat.com>

roland has set the watchbugzilla acl on trac-monotone-plugin (Fedora 9) to Approved for thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:55:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:55:28 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175427.91923208DC4@bastion.fedora.phx.redhat.com>

roland has set the watchcommits acl on trac-monotone-plugin (Fedora 9) to Approved for thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:54:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:54:09 +0000
Subject: [pkgdb] trac-monotone-plugin: roland has requested commit
Message-ID: <20080901175409.8251A208D99@bastion.fedora.phx.redhat.com>

roland has requested the commit acl on trac-monotone-plugin (Fedora 9)

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:54:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:54:03 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175403.5468B208D97@bastion.fedora.phx.redhat.com>

roland has set the watchbugzilla acl on trac-monotone-plugin (Fedora EPEL 5) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:55:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:55:12 +0000
Subject: [pkgdb] trac-monotone-plugin: roland has requested approveacls
Message-ID: <20080901175411.AAAAE208D9A@bastion.fedora.phx.redhat.com>

roland has requested the approveacls acl on trac-monotone-plugin (Fedora 9)

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:55:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:55:08 +0000
Subject: [pkgdb] trac-monotone-plugin: roland has requested watchcommits
Message-ID: <20080901175407.702A0208D98@bastion.fedora.phx.redhat.com>

roland has requested the watchcommits acl on trac-monotone-plugin (Fedora 9)

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:55:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:55:19 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175418.2BE7B208D9D@bastion.fedora.phx.redhat.com>

roland has set the commit acl on trac-monotone-plugin (Fedora 9) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:54:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:54:14 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175413.EEF94208D9C@bastion.fedora.phx.redhat.com>

roland has set the approveacls acl on trac-monotone-plugin (Fedora 9) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:54:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:54:33 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175433.7936B208DA1@bastion.fedora.phx.redhat.com>

roland has set the approveacls acl on trac-monotone-plugin (Fedora 9) to Approved for thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:55:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:55:30 +0000
Subject: [pkgdb] trac-monotone-plugin ownership updated
Message-ID: <20080901175530.26764208DAA@bastion.fedora.phx.redhat.com>

Package trac-monotone-plugin in Fedora devel was orphaned by roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:55:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:55:42 +0000
Subject: [pkgdb] trac-monotone-plugin ownership updated
Message-ID: <20080901175542.8E7EF208DB3@bastion.fedora.phx.redhat.com>

Package trac-monotone-plugin in Fedora 7 was orphaned by roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:56:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:56:36 +0000
Subject: [pkgdb] trac-monotone-plugin ownership updated
Message-ID: <20080901175536.1F40A208DAC@bastion.fedora.phx.redhat.com>

Package trac-monotone-plugin in Fedora 8 was orphaned by roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:55:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:55:43 +0000
Subject: [pkgdb] trac-monotone-plugin ownership updated
Message-ID: <20080901175543.4C70F208DD1@bastion.fedora.phx.redhat.com>

Package trac-monotone-plugin in Fedora EPEL 5 was orphaned by roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:56:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:56:51 +0000
Subject: [pkgdb] trac-monotone-plugin ownership updated
Message-ID: <20080901175550.0E924208DB5@bastion.fedora.phx.redhat.com>

Package trac-monotone-plugin in Fedora 9 was orphaned by roland

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



From sindrepb at fedoraproject.org  Mon Sep  1 18:05:44 2008
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Mon,  1 Sep 2008 18:05:44 +0000 (UTC)
Subject: rpms/vttest/devel import.log, NONE, 1.1 vttest.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080901180544.097727011A@cvs1.fedora.phx.redhat.com>

Author: sindrepb

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vttest.spec 
Log Message:
adding vttest, maintained by me



--- NEW FILE import.log ---
vttest-20071216-3_fc9:HEAD:vttest-20071216-3.fc9.src.rpm:1220291253


--- NEW FILE vttest.spec ---
Name:           vttest
Version:        20071216
Release:        3%{?dist}
Summary:        Test the compatibility of so-called "VT100-compatible" terminals

Group:          Applications/System
License:        MIT
URL:            http://invisible-island.net/vttest/vttest.html
Source0:        ftp://invisible-island.net/vttest/vttest-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

#BuildRequires:  
#Requires:       

%description
vttest is a program to test the compatibility (or to demonstrate the
non-compatibility) of so-called "VT100-compatible" terminals. 

%prep
%setup -q

#fix character encoding
for f in README; do
        iconv -f ISO-8859-15 -t UTF-8 $f > ${f}.tmp && \
                mv -f ${f}.tmp ${f} || \
                rm -f ${f}.tmp
done


%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 BUGS CHANGES COPYING MANIFEST README
%{_bindir}/*
%{_mandir}/man?/*

%changelog
* Mon Aug 11 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 20071216-3
- Updated source url

* Sun Aug 10 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 20071216-2
- Updated prep for consistency
- License changed to MIT

* Mon Aug 04 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 20071216-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vttest/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Aug 2008 18:01:15 -0000	1.1
+++ .cvsignore	1 Sep 2008 18:05:13 -0000	1.2
@@ -0,0 +1 @@
+vttest-20071216.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vttest/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Aug 2008 18:01:15 -0000	1.1
+++ sources	1 Sep 2008 18:05:13 -0000	1.2
@@ -0,0 +1 @@
+490cebc85e531c833dcf14c32790184b  vttest-20071216.tgz



From sindrepb at fedoraproject.org  Mon Sep  1 18:10:49 2008
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Mon,  1 Sep 2008 18:10:49 +0000 (UTC)
Subject: rpms/vttest/F-9 vttest.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20080901181049.D583F7011A@cvs1.fedora.phx.redhat.com>

Author: sindrepb

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

Modified Files:
	sources 
Added Files:
	vttest.spec 
Log Message:
add files to branch


--- NEW FILE vttest.spec ---
Name:           vttest
Version:        20071216
Release:        3%{?dist}
Summary:        Test the compatibility of so-called "VT100-compatible" terminals

Group:          Applications/System
License:        MIT
URL:            http://invisible-island.net/vttest/vttest.html
Source0:        ftp://invisible-island.net/vttest/vttest-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

#BuildRequires:  
#Requires:       

%description
vttest is a program to test the compatibility (or to demonstrate the
non-compatibility) of so-called "VT100-compatible" terminals. 

%prep
%setup -q

#fix character encoding
for f in README; do
        iconv -f ISO-8859-15 -t UTF-8 $f > ${f}.tmp && \
                mv -f ${f}.tmp ${f} || \
                rm -f ${f}.tmp
done


%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 BUGS CHANGES COPYING MANIFEST README
%{_bindir}/*
%{_mandir}/man?/*

%changelog
* Mon Aug 11 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 20071216-3
- Updated source url

* Sun Aug 10 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 20071216-2
- Updated prep for consistency
- License changed to MIT

* Mon Aug 04 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 20071216-1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vttest/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Aug 2008 18:01:15 -0000	1.1
+++ sources	1 Sep 2008 18:10:19 -0000	1.2
@@ -0,0 +1 @@
+490cebc85e531c833dcf14c32790184b  vttest-20071216.tgz



From sindrepb at fedoraproject.org  Mon Sep  1 18:17:02 2008
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Mon,  1 Sep 2008 18:17:02 +0000 (UTC)
Subject: rpms/vttest/F-8 vttest.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20080901181702.2AE0D7011A@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/vttest/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26539

Modified Files:
	sources 
Added Files:
	vttest.spec 
Log Message:
add files to branch


--- NEW FILE vttest.spec ---
Name:           vttest
Version:        20071216
Release:        3%{?dist}
Summary:        Test the compatibility of so-called "VT100-compatible" terminals

Group:          Applications/System
License:        MIT
URL:            http://invisible-island.net/vttest/vttest.html
Source0:        ftp://invisible-island.net/vttest/vttest-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

#BuildRequires:  
#Requires:       

%description
vttest is a program to test the compatibility (or to demonstrate the
non-compatibility) of so-called "VT100-compatible" terminals. 

%prep
%setup -q

#fix character encoding
for f in README; do
        iconv -f ISO-8859-15 -t UTF-8 $f > ${f}.tmp && \
                mv -f ${f}.tmp ${f} || \
                rm -f ${f}.tmp
done


%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 BUGS CHANGES COPYING MANIFEST README
%{_bindir}/*
%{_mandir}/man?/*

%changelog
* Mon Aug 11 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 20071216-3
- Updated source url

* Sun Aug 10 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 20071216-2
- Updated prep for consistency
- License changed to MIT

* Mon Aug 04 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 20071216-1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vttest/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Aug 2008 18:01:15 -0000	1.1
+++ sources	1 Sep 2008 18:16:31 -0000	1.2
@@ -0,0 +1 @@
+490cebc85e531c833dcf14c32790184b  vttest-20071216.tgz



From sindrepb at fedoraproject.org  Mon Sep  1 18:17:30 2008
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Mon,  1 Sep 2008 18:17:30 +0000 (UTC)
Subject: rpms/vttest/EL-4 vttest.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20080901181730.938317011A@cvs1.fedora.phx.redhat.com>

Author: sindrepb

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

Modified Files:
	sources 
Added Files:
	vttest.spec 
Log Message:
add files to branch


--- NEW FILE vttest.spec ---
Name:           vttest
Version:        20071216
Release:        3%{?dist}
Summary:        Test the compatibility of so-called "VT100-compatible" terminals

Group:          Applications/System
License:        MIT
URL:            http://invisible-island.net/vttest/vttest.html
Source0:        ftp://invisible-island.net/vttest/vttest-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

#BuildRequires:  
#Requires:       

%description
vttest is a program to test the compatibility (or to demonstrate the
non-compatibility) of so-called "VT100-compatible" terminals. 

%prep
%setup -q

#fix character encoding
for f in README; do
        iconv -f ISO-8859-15 -t UTF-8 $f > ${f}.tmp && \
                mv -f ${f}.tmp ${f} || \
                rm -f ${f}.tmp
done


%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 BUGS CHANGES COPYING MANIFEST README
%{_bindir}/*
%{_mandir}/man?/*

%changelog
* Mon Aug 11 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 20071216-3
- Updated source url

* Sun Aug 10 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 20071216-2
- Updated prep for consistency
- License changed to MIT

* Mon Aug 04 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 20071216-1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vttest/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Aug 2008 18:01:15 -0000	1.1
+++ sources	1 Sep 2008 18:17:00 -0000	1.2
@@ -0,0 +1 @@
+490cebc85e531c833dcf14c32790184b  vttest-20071216.tgz



From sindrepb at fedoraproject.org  Mon Sep  1 18:17:53 2008
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Mon,  1 Sep 2008 18:17:53 +0000 (UTC)
Subject: rpms/vttest/EL-5 vttest.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20080901181753.817DB7011A@cvs1.fedora.phx.redhat.com>

Author: sindrepb

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

Modified Files:
	sources 
Added Files:
	vttest.spec 
Log Message:
add files to branch


--- NEW FILE vttest.spec ---
Name:           vttest
Version:        20071216
Release:        3%{?dist}
Summary:        Test the compatibility of so-called "VT100-compatible" terminals

Group:          Applications/System
License:        MIT
URL:            http://invisible-island.net/vttest/vttest.html
Source0:        ftp://invisible-island.net/vttest/vttest-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

#BuildRequires:  
#Requires:       

%description
vttest is a program to test the compatibility (or to demonstrate the
non-compatibility) of so-called "VT100-compatible" terminals. 

%prep
%setup -q

#fix character encoding
for f in README; do
        iconv -f ISO-8859-15 -t UTF-8 $f > ${f}.tmp && \
                mv -f ${f}.tmp ${f} || \
                rm -f ${f}.tmp
done


%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 BUGS CHANGES COPYING MANIFEST README
%{_bindir}/*
%{_mandir}/man?/*

%changelog
* Mon Aug 11 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 20071216-3
- Updated source url

* Sun Aug 10 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 20071216-2
- Updated prep for consistency
- License changed to MIT

* Mon Aug 04 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 20071216-1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vttest/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Aug 2008 18:01:15 -0000	1.1
+++ sources	1 Sep 2008 18:17:23 -0000	1.2
@@ -0,0 +1 @@
+490cebc85e531c833dcf14c32790184b  vttest-20071216.tgz



From pkgdb at fedoraproject.org  Mon Sep  1 17:54:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:54:24 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175429.DC9A2208D85@bastion.fedora.phx.redhat.com>

roland has set the watchbugzilla acl on trac-monotone-plugin (Fedora 9) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 17:54:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 17:54:30 +0000
Subject: [pkgdb] trac-monotone-plugin had acl change status
Message-ID: <20080901175430.10692208DC7@bastion.fedora.phx.redhat.com>

roland has set the commit acl on trac-monotone-plugin (Fedora 9) to Approved for thm

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



From ework at fedoraproject.org  Mon Sep  1 18:51:35 2008
From: ework at fedoraproject.org (Eric Work)
Date: Mon,  1 Sep 2008 18:51:35 +0000 (UTC)
Subject: rpms/libsvg/F-9 branch,1.1,NONE
Message-ID: <20080901185135.F1CC67011A@cvs1.fedora.phx.redhat.com>

Author: ework

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

Removed Files:
	branch 
Log Message:
libsvg cvs cleanup



--- branch DELETED ---



From ework at fedoraproject.org  Mon Sep  1 18:52:37 2008
From: ework at fedoraproject.org (Eric Work)
Date: Mon,  1 Sep 2008 18:52:37 +0000 (UTC)
Subject: rpms/libsvg-cairo/F-9 branch,1.1,NONE
Message-ID: <20080901185237.63A517011A@cvs1.fedora.phx.redhat.com>

Author: ework

Update of /cvs/pkgs/rpms/libsvg-cairo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30855/F-9

Removed Files:
	branch 
Log Message:
libsvg-cairo cvs cleanup



--- branch DELETED ---



From scop at fedoraproject.org  Mon Sep  1 18:53:00 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon,  1 Sep 2008 18:53:00 +0000 (UTC)
Subject: rpms/javasqlite/devel javasqlite.spec,1.4,1.5
Message-ID: <20080901185300.193567011A@cvs1.fedora.phx.redhat.com>

Author: scop

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

Modified Files:
	javasqlite.spec 
Log Message:
* Mon Sep  1 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20080420-3
- Include JDBC 3 (Java 1.5.x) drivers.
- Work around build setup issues #460761 and #460783.



Index: javasqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/devel/javasqlite.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- javasqlite.spec	30 Aug 2008 21:24:48 -0000	1.4
+++ javasqlite.spec	1 Sep 2008 18:52:29 -0000	1.5
@@ -1,10 +1,6 @@
-# TODO: build JDBC 3 driver too (not doable with gcj 1.5.0 - it apparently
-#       has java 1.6 (JDBC 4) class libs???)
-
-
 Name:           javasqlite
 Version:        20080420
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        SQLite Java Wrapper/JDBC Driver
 
 Group:          Development/Libraries
@@ -19,7 +15,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sqlite-devel
-BuildRequires:  java-devel
+BuildRequires:  java-devel = 1:1.6.0
+BuildRequires:  java-devel = 1.5.0
 BuildRequires:  java-javadoc
 Requires:       jre
 
@@ -47,11 +44,25 @@
 
 
 %build
+
+origpath="$PATH"
+
+# Pass #1: JDBC 3 driver and common files with 1.5.0
+export PATH="%{_jvmdir}/java-1.5.0/bin:$origpath" # bug 460761
+%configure --with-jdk=%{_jvmdir}/java-1.5.0
+make %{?_smp_mflags} sqlite.jar JAVAC_FLAGS="-source 5"
+
+# Pass #2: JDBC 4 driver and the rest with 1.6.0
+export PATH="%{_jvmdir}/java-1.6.0/bin:$origpath" # bug 460761 (to be sure)
 %configure \
-    --with-jdk=%{_jvmdir}/java \
+    --with-jdk=%{_jvmdir}/java-1.6.0 \
     --with-jardir=%{_libdir}/%{name} \
     --libdir=%{_libdir}/%{name}
-make %{?_smp_mflags} JAVAC_FLAGS="-source 5"
+make %{?_smp_mflags}
+
+# Add JDBC 3 classes
+jar uf sqlite.jar SQLite/JDBC2y/*.class
+
 make javadoc JAVADOCLINK=%{_javadocdir}/java
 
 
@@ -73,8 +84,10 @@
 # loading the just built one fails, see static initializer in SQLite.Database.
 export LD_LIBRARY_PATH="$PWD/.libs:$LD_LIBRARY_PATH"
 
-# test2 is for SQLite 2.x, which we don't support
-make test test3
+for javaver in 1.5.0 1.6.0 ; do
+    # test2 is for SQLite 2.x, which we don't support
+    make JAVA_RUN="%{_jvmdir}/java-$javaver/bin/java" test test3
+done
 
 
 %files
@@ -89,6 +102,10 @@
 
 
 %changelog
+* Mon Sep  1 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20080420-3
+- Include JDBC 3 (Java 1.5.x) drivers.
+- Work around build setup issues #460761 and #460783.
+
 * Sun Aug 31 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20080420-2
 - Patch to output error message if loading the lib from a specified
   SQLite.library.path fails.



From erikos at fedoraproject.org  Mon Sep  1 19:59:23 2008
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Mon,  1 Sep 2008 19:59:23 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel sugar-toolkit.spec,1.17,1.18
Message-ID: <20080901195923.07A547011A@cvs1.fedora.phx.redhat.com>

Author: erikos

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

Modified Files:
	sugar-toolkit.spec 
Log Message:
* Mon Sep 01 2008 Simon Schampijer <simon at laptop.org> - 0.82.5-2
- added the python-json dependency




Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sugar-toolkit.spec	1 Sep 2008 15:01:00 -0000	1.17
+++ sugar-toolkit.spec	1 Sep 2008 19:58:52 -0000	1.18
@@ -6,7 +6,7 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.82.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -34,6 +34,7 @@
 Requires: sugar-base
 Requires: sugar-presence-service
 Requires: python-simplejson
+Requires: python-json
 
 %description
 Sugar is the core of the OLPC Human Interface. The toolkit provides
@@ -65,6 +66,9 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Mon Sep 01 2008 Simon Schampijer <simon at laptop.org> - 0.82.5-2
+- added the python-json dependency
+
 * Mon Sep 01 2008 Simon Schampijer <simon at laptop.org> - 0.82.5-1
 - Translation updates
 - Add plural information for all languages



From ework at fedoraproject.org  Mon Sep  1 20:16:56 2008
From: ework at fedoraproject.org (Eric Work)
Date: Mon,  1 Sep 2008 20:16:56 +0000 (UTC)
Subject: rpms/gtkdatabox/devel gtkdatabox-0.8.2.0-userpmoptflags.patch, NONE,
	1.1 gtkdatabox-0.9.0.0-gcallback.patch, NONE, 1.1 .cvsignore,
	1.8, 1.9 gtkdatabox.spec, 1.14, 1.15 sources, 1.8, 1.9
Message-ID: <20080901201656.095487011D@cvs1.fedora.phx.redhat.com>

Author: ework

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

Modified Files:
	.cvsignore gtkdatabox.spec sources 
Added Files:
	gtkdatabox-0.8.2.0-userpmoptflags.patch 
	gtkdatabox-0.9.0.0-gcallback.patch 
Log Message:
Updated gtkdatabox to 0.9.0.0 with minor fixes


gtkdatabox-0.8.2.0-userpmoptflags.patch:

--- NEW FILE gtkdatabox-0.8.2.0-userpmoptflags.patch ---
diff -urN gtkdatabox-0.8.2.0.orig/examples/Makefile.am gtkdatabox-0.8.2.0/examples/Makefile.am
--- gtkdatabox-0.8.2.0.orig/examples/Makefile.am	2007-12-18 10:36:44.000000000 -0800
+++ gtkdatabox-0.8.2.0/examples/Makefile.am	2007-12-18 10:38:00.000000000 -0800
@@ -41,7 +41,7 @@
 			-I$(top_srcdir)/gtk
 
 AM_CFLAGS			=\
-			-O2\
+			$(RPM_OPT_FLAGS)\
 			-W -Wall -pedantic\
 			-DG_DISABLE_DEPRECATED\
 			-DGDK_DISABLE_DEPRECATED\
diff -urN gtkdatabox-0.8.2.0.orig/examples/Makefile.in gtkdatabox-0.8.2.0/examples/Makefile.in
--- gtkdatabox-0.8.2.0.orig/examples/Makefile.in	2007-12-18 10:36:44.000000000 -0800
+++ gtkdatabox-0.8.2.0/examples/Makefile.in	2007-12-18 10:38:00.000000000 -0800
@@ -264,7 +264,7 @@
 			-I$(top_srcdir)/gtk
 
 AM_CFLAGS = \
-			-O2\
+			$(RPM_OPT_FLAGS)\
 			-W -Wall -pedantic\
 			-DG_DISABLE_DEPRECATED\
 			-DGDK_DISABLE_DEPRECATED\
diff -urN gtkdatabox-0.8.2.0.orig/gtk/Makefile.am gtkdatabox-0.8.2.0/gtk/Makefile.am
--- gtkdatabox-0.8.2.0.orig/gtk/Makefile.am	2007-12-18 10:36:44.000000000 -0800
+++ gtkdatabox-0.8.2.0/gtk/Makefile.am	2007-12-18 10:38:00.000000000 -0800
@@ -48,7 +48,7 @@
 			-I$(top_srcdir)
 
 AM_CFLAGS			=\
-			-O2\
+			$(RPM_OPT_FLAGS)\
 			-W -Wall -pedantic\
 			-DG_DISABLE_DEPRECATED\
 			-DGDK_DISABLE_DEPRECATED\
diff -urN gtkdatabox-0.8.2.0.orig/gtk/Makefile.in gtkdatabox-0.8.2.0/gtk/Makefile.in
--- gtkdatabox-0.8.2.0.orig/gtk/Makefile.in	2007-12-18 10:36:44.000000000 -0800
+++ gtkdatabox-0.8.2.0/gtk/Makefile.in	2007-12-18 10:38:00.000000000 -0800
@@ -246,7 +246,7 @@
 			-I$(top_srcdir)
 
 AM_CFLAGS = \
-			-O2\
+			$(RPM_OPT_FLAGS)\
 			-W -Wall -pedantic\
 			-DG_DISABLE_DEPRECATED\
 			-DGDK_DISABLE_DEPRECATED\

gtkdatabox-0.9.0.0-gcallback.patch:

--- NEW FILE gtkdatabox-0.9.0.0-gcallback.patch ---
diff -urN gtkdatabox-0.9.0.0.orig/examples/grid.c gtkdatabox-0.9.0.0.new/examples/grid.c
--- gtkdatabox-0.9.0.0.orig/examples/grid.c	2007-12-09 12:39:11.000000000 -0800
+++ gtkdatabox-0.9.0.0.new/examples/grid.c	2008-09-01 13:04:12.000000000 -0700
@@ -50,7 +50,7 @@
    gtk_widget_set_size_request (window, 500, 500);
 
    g_signal_connect (GTK_OBJECT (window), "destroy",
-		     GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
+		     G_CALLBACK (gtk_main_quit), NULL);
 
    gtk_window_set_title (GTK_WINDOW (window),
 			 "GtkDatabox: Double Grid Example");
@@ -129,7 +129,7 @@
    gtk_box_pack_end (GTK_BOX (box1), box2, FALSE, TRUE, 0);
    close_button = gtk_button_new_with_label ("close");
    g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked",
-			     GTK_SIGNAL_FUNC (gtk_main_quit),
+			     G_CALLBACK (gtk_main_quit),
 			     GTK_OBJECT (box));
    gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0);
    GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
diff -urN gtkdatabox-0.9.0.0.orig/examples/keycontrol.c gtkdatabox-0.9.0.0.new/examples/keycontrol.c
--- gtkdatabox-0.9.0.0.orig/examples/keycontrol.c	2008-01-14 21:50:42.000000000 -0800
+++ gtkdatabox-0.9.0.0.new/examples/keycontrol.c	2008-09-01 13:04:19.000000000 -0700
@@ -174,7 +174,7 @@
    gtk_databox_graph_add (GTK_DATABOX (box), graph);
 
    g_signal_connect (GTK_OBJECT (box), "key_press_event",
-		     GTK_SIGNAL_FUNC (key_press_cb), graph);
+		     G_CALLBACK (key_press_cb), graph);
 
    gtk_databox_auto_rescale (GTK_DATABOX (box), 0.05);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkdatabox/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Jan 2008 04:58:43 -0000	1.8
+++ .cvsignore	1 Sep 2008 20:16:25 -0000	1.9
@@ -1,2 +1 @@
-gtkdatabox-0.8.2.2.tar.gz
-gtkdatabox-0.8.2.0-userpmoptflags.patch
+gtkdatabox-0.9.0.0.tar.gz


Index: gtkdatabox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkdatabox/devel/gtkdatabox.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gtkdatabox.spec	19 Feb 2008 02:55:24 -0000	1.14
+++ gtkdatabox.spec	1 Sep 2008 20:16:25 -0000	1.15
@@ -1,12 +1,13 @@
 Name:           gtkdatabox
-Version:        0.8.2.2
-Release:        2%{?dist}
+Version:        0.9.0.0
+Release:        1%{?dist}
 Summary:        GTK+ widget for fast data display
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.eudoxos.net/gtk/gtkdatabox
 Source:         http://www.eudoxos.net/gtk/gtkdatabox/download/%{name}-%{version}.tar.gz
 Patch0:         gtkdatabox-0.8.2.0-userpmoptflags.patch
+Patch1:         gtkdatabox-0.9.0.0-gcallback.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel, libglade2-devel, pkgconfig
 
@@ -27,6 +28,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .optflags
+%patch1 -p1 -b .gcallback
 
 %build
 %configure --disable-static --enable-libglade
@@ -55,8 +57,14 @@
 %{_includedir}/gtkdatabox*.h
 %{_libdir}/libgtkdatabox.so
 %{_libdir}/pkgconfig/gtkdatabox.pc
+%{_datadir}/gtk-doc/html/gtkdatabox/
 
 %changelog
+* Mon Sep 01 2008 Eric Work <work.eric at gmail.com> 0.9.0.0-1
+- new upstream version
+- new gtk-doc documentation
+- fix deprecated GTK_SIGNAL_FUNC
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.8.2.2-2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkdatabox/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Jan 2008 04:58:43 -0000	1.8
+++ sources	1 Sep 2008 20:16:25 -0000	1.9
@@ -1,2 +1 @@
-582c1618410fc53c0586c542cca20285  gtkdatabox-0.8.2.2.tar.gz
-c8f60c6796d0bc431a6874992420d894  gtkdatabox-0.8.2.0-userpmoptflags.patch
+a8f88108e46be13f51cd5996c2f3413f  gtkdatabox-0.9.0.0.tar.gz



From terjeros at fedoraproject.org  Mon Sep  1 20:26:15 2008
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Mon,  1 Sep 2008 20:26:15 +0000 (UTC)
Subject: rpms/bpython/devel .cvsignore, 1.3, 1.4 bpython.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20080901202615.E4E667011A@cvs1.fedora.phx.redhat.com>

Author: terjeros

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

Modified Files:
	.cvsignore bpython.spec sources 
Log Message:
* Mon  Sep 1 2008 Terje Rosten <terje.rosten at ntnu.no> - 0.7.0-1
- 0.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bpython/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Aug 2008 17:28:01 -0000	1.3
+++ .cvsignore	1 Sep 2008 20:25:45 -0000	1.4
@@ -1 +1 @@
-bpython-0.6.3.tar.gz
+bpython-0.7.0.tar.gz


Index: bpython.spec
===================================================================
RCS file: /cvs/extras/rpms/bpython/devel/bpython.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bpython.spec	12 Aug 2008 17:28:01 -0000	1.2
+++ bpython.spec	1 Sep 2008 20:25:45 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:          bpython
 Summary:       Fancy curses interface to the Python interactive interpreter
-Version:       0.6.3
+Version:       0.7.0
 Release:       1%{?dist}
 URL:           http://www.noiseforfree.com/bpython/
 Group:         Development/Libraries
@@ -35,8 +35,11 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-#{__install} -D -m 0644 %{SOURCE1} \
-#    %{buildroot}%{_datadir}/applications/%{name}.desktop
+%{__rm} -f %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+#desktop-file-install --delete-original        \
+#  --dir %{buildroot}%{_datadir}/applications  \
+#  %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -46,8 +49,14 @@
 %doc CHANGELOG LICENSE README
 %{_bindir}/%{name}
 %{python_sitelib}/%{name}*
+%{_mandir}/man1/%{name}.1*
+%{_mandir}/man5/bpythonrc.5*
+#{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Mon  Sep 1 2008 Terje Rosten <terje.rosten at ntnu.no> - 0.7.0-1
+- 0.7.0
+
 * Tue Aug 12 2008 Terje Rosten <terje.rosten at ntnu.no> - 0.6.3-1
 - 0.6.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bpython/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Aug 2008 17:28:01 -0000	1.3
+++ sources	1 Sep 2008 20:25:45 -0000	1.4
@@ -1 +1 @@
-90c74b6a5b57a5e9c7ecb78483bc6155  bpython-0.6.3.tar.gz
+5a992ada6f31cbea048d2dee07ec6bfe  bpython-0.7.0.tar.gz



From terjeros at fedoraproject.org  Mon Sep  1 20:10:45 2008
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Mon,  1 Sep 2008 20:10:45 +0000 (UTC)
Subject: rpms/gq/devel gq.spec,1.9,1.10
Message-ID: <20080901201045.245A97011A@cvs1.fedora.phx.redhat.com>

Author: terjeros

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

Modified Files:
	gq.spec 
Log Message:
* Mon Sep  1 2008 Terje R??sten <terje.rosten at ntnu.no> - 1.3.4-2
- adapt to new rpm patch macro policy



Index: gq.spec
===================================================================
RCS file: /cvs/extras/rpms/gq/devel/gq.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gq.spec	17 Feb 2008 19:18:38 -0000	1.9
+++ gq.spec	1 Sep 2008 20:10:14 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Graphical LDAP directory browser and editor
 Name:    gq
 Version: 1.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:   Applications/Internet
 URL:     http://www.gq-project.org/
@@ -23,7 +23,7 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 
 %build
 %configure --with-included-gettext      \
@@ -89,6 +89,9 @@
 %dir %{_datadir}/%{name}
 
 %changelog
+* Mon Sep  1 2008 Terje R??sten <terje.rosten at ntnu.no> - 1.3.4-2
+- adapt to new rpm patch macro policy
+
 * Sun Feb 17 2008 Terje R??sten <terje.rosten at ntnu.no> - 1.3.4-1
 - 1.3.4
 - Drop infinite loop patch



From terjeros at fedoraproject.org  Mon Sep  1 20:40:33 2008
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Mon,  1 Sep 2008 20:40:33 +0000 (UTC)
Subject: rpms/bpython/F-9 .cvsignore, 1.3, 1.4 bpython.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20080901204033.4EF377011A@cvs1.fedora.phx.redhat.com>

Author: terjeros

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

Modified Files:
	.cvsignore bpython.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bpython/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Aug 2008 17:37:26 -0000	1.3
+++ .cvsignore	1 Sep 2008 20:40:03 -0000	1.4
@@ -1 +1 @@
-bpython-0.6.3.tar.gz
+bpython-0.7.0.tar.gz


Index: bpython.spec
===================================================================
RCS file: /cvs/extras/rpms/bpython/F-9/bpython.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bpython.spec	12 Aug 2008 17:37:26 -0000	1.2
+++ bpython.spec	1 Sep 2008 20:40:03 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:          bpython
 Summary:       Fancy curses interface to the Python interactive interpreter
-Version:       0.6.3
+Version:       0.7.0
 Release:       1%{?dist}
 URL:           http://www.noiseforfree.com/bpython/
 Group:         Development/Libraries
@@ -35,8 +35,11 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-#{__install} -D -m 0644 %{SOURCE1} \
-#    %{buildroot}%{_datadir}/applications/%{name}.desktop
+%{__rm} -f %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+#desktop-file-install --delete-original        \
+#  --dir %{buildroot}%{_datadir}/applications  \
+#  %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -46,8 +49,14 @@
 %doc CHANGELOG LICENSE README
 %{_bindir}/%{name}
 %{python_sitelib}/%{name}*
+%{_mandir}/man1/%{name}.1*
+%{_mandir}/man5/bpythonrc.5*
+#{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Mon  Sep 1 2008 Terje Rosten <terje.rosten at ntnu.no> - 0.7.0-1
+- 0.7.0
+
 * Tue Aug 12 2008 Terje Rosten <terje.rosten at ntnu.no> - 0.6.3-1
 - 0.6.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bpython/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Aug 2008 17:37:26 -0000	1.3
+++ sources	1 Sep 2008 20:40:03 -0000	1.4
@@ -1 +1 @@
-90c74b6a5b57a5e9c7ecb78483bc6155  bpython-0.6.3.tar.gz
+5a992ada6f31cbea048d2dee07ec6bfe  bpython-0.7.0.tar.gz



From terjeros at fedoraproject.org  Mon Sep  1 20:40:33 2008
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Mon,  1 Sep 2008 20:40:33 +0000 (UTC)
Subject: rpms/bpython/F-8 .cvsignore, 1.3, 1.4 bpython.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20080901204033.322157011A@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/bpython/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11877/F-8

Modified Files:
	.cvsignore bpython.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bpython/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Aug 2008 17:37:25 -0000	1.3
+++ .cvsignore	1 Sep 2008 20:40:02 -0000	1.4
@@ -1 +1 @@
-bpython-0.6.3.tar.gz
+bpython-0.7.0.tar.gz


Index: bpython.spec
===================================================================
RCS file: /cvs/extras/rpms/bpython/F-8/bpython.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bpython.spec	12 Aug 2008 17:37:25 -0000	1.2
+++ bpython.spec	1 Sep 2008 20:40:02 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:          bpython
 Summary:       Fancy curses interface to the Python interactive interpreter
-Version:       0.6.3
+Version:       0.7.0
 Release:       1%{?dist}
 URL:           http://www.noiseforfree.com/bpython/
 Group:         Development/Libraries
@@ -35,8 +35,11 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-#{__install} -D -m 0644 %{SOURCE1} \
-#    %{buildroot}%{_datadir}/applications/%{name}.desktop
+%{__rm} -f %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+#desktop-file-install --delete-original        \
+#  --dir %{buildroot}%{_datadir}/applications  \
+#  %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -46,8 +49,14 @@
 %doc CHANGELOG LICENSE README
 %{_bindir}/%{name}
 %{python_sitelib}/%{name}*
+%{_mandir}/man1/%{name}.1*
+%{_mandir}/man5/bpythonrc.5*
+#{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Mon  Sep 1 2008 Terje Rosten <terje.rosten at ntnu.no> - 0.7.0-1
+- 0.7.0
+
 * Tue Aug 12 2008 Terje Rosten <terje.rosten at ntnu.no> - 0.6.3-1
 - 0.6.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bpython/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Aug 2008 17:37:25 -0000	1.3
+++ sources	1 Sep 2008 20:40:02 -0000	1.4
@@ -1 +1 @@
-90c74b6a5b57a5e9c7ecb78483bc6155  bpython-0.6.3.tar.gz
+5a992ada6f31cbea048d2dee07ec6bfe  bpython-0.7.0.tar.gz



From kkofler at fedoraproject.org  Mon Sep  1 20:53:56 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon,  1 Sep 2008 20:53:56 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.0.72-rootprivs.patch, 1.2, 1.3
Message-ID: <20080901205356.B32157011A@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	kdebase-workspace-4.0.72-rootprivs.patch 
Log Message:
* Mon Sep 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
- show KCM icon in rootprivs patch (thanks to Harald Sitter "apachelogger")

kdebase-workspace-4.0.72-rootprivs.patch:

Index: kdebase-workspace-4.0.72-rootprivs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace-4.0.72-rootprivs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdebase-workspace-4.0.72-rootprivs.patch	1 Aug 2008 14:54:59 -0000	1.2
+++ kdebase-workspace-4.0.72-rootprivs.patch	1 Sep 2008 20:53:56 -0000	1.3
@@ -71,7 +71,7 @@
 +            cmd = cmd.remove(0,9).trimmed();
 +
 +        QStringList args;
-+        args << "-c" << QString( "%1 %2 --lang %3" ).arg( KStandardDirs::locate("exe", "kcmshell4") ).arg( cmd ).arg( KGlobal::locale()->language() );
++        args << "-i" << QString( mItem->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::execute( kdesu, args );



From pkgdb at fedoraproject.org  Mon Sep  1 21:06:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:06:43 +0000
Subject: [pkgdb] trac-monotone-plugin ownership updated
Message-ID: <20080901210541.AC711208D80@bastion.fedora.phx.redhat.com>

Package trac-monotone-plugin in Fedora devel is now owned by thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:06:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:06:06 +0000
Subject: [pkgdb] trac-monotone-plugin ownership updated
Message-ID: <20080901210606.D92FC208D80@bastion.fedora.phx.redhat.com>

Package trac-monotone-plugin in Fedora 8 is now owned by thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:07:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:07:13 +0000
Subject: [pkgdb] trac-monotone-plugin ownership updated
Message-ID: <20080901210612.278EE208D84@bastion.fedora.phx.redhat.com>

Package trac-monotone-plugin in Fedora EPEL 5 is now owned by thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:06:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:06:18 +0000
Subject: [pkgdb] trac-monotone-plugin ownership updated
Message-ID: <20080901210624.1687E208D85@bastion.fedora.phx.redhat.com>

Package trac-monotone-plugin in Fedora 9 is now owned by thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:10:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:10:58 +0000
Subject: [pkgdb] ratbox-services was added for mmahut
Message-ID: <20080901210957.29502208D80@bastion.fedora.phx.redhat.com>

kevin has added Package ratbox-services with summary Service package for ircd-ratbox
kevin has approved Package ratbox-services
kevin has added a Fedora devel branch for ratbox-services with an owner of mmahut
kevin has approved ratbox-services in Fedora devel
kevin has approved Package ratbox-services
kevin has set commit to Approved for packager on ratbox-services (Fedora devel)
kevin has set build to Approved for packager on ratbox-services (Fedora devel)
kevin has set checkout to Approved for packager on ratbox-services (Fedora devel)
kevin has set commit to Approved for uberpackager on ratbox-services (Fedora devel)
kevin has set build to Approved for uberpackager on ratbox-services (Fedora devel)
kevin has set checkout to Approved for uberpackager on ratbox-services (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:11:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:11:00 +0000
Subject: [pkgdb] ratbox-services (Fedora EPEL, 5) updated by kevin
Message-ID: <20080901210958.DFE9B208D84@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for ratbox-services
kevin has set commit to Approved for uberpackager on ratbox-services (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on ratbox-services (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on ratbox-services (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:11:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:11:00 +0000
Subject: [pkgdb] ratbox-services (Fedora, 9) updated by kevin
Message-ID: <20080901210958.F0891208D87@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for ratbox-services
kevin has set commit to Approved for uberpackager on ratbox-services (Fedora 9)
kevin has set build to Approved for uberpackager on ratbox-services (Fedora 9)
kevin has set checkout to Approved for uberpackager on ratbox-services (Fedora 9)

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



From kevin at fedoraproject.org  Mon Sep  1 21:10:41 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:10:41 +0000 (UTC)
Subject: rpms/ratbox-services - New directory
Message-ID: <20080901211041.2F4677011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ratbox-services
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn15676/rpms/ratbox-services

Log Message:
Directory /cvs/extras/rpms/ratbox-services added to the repository




From kevin at fedoraproject.org  Mon Sep  1 21:10:42 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:10:42 +0000 (UTC)
Subject: rpms/ratbox-services/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080901211042.7088B7011F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ratbox-services/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn15676/rpms/ratbox-services/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ratbox-services


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ratbox-services
# $Id: Makefile,v 1.1 2008/09/01 21:10:42 kevin Exp $
NAME := ratbox-services
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Sep  1 21:10:41 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:10:41 +0000 (UTC)
Subject: rpms/ratbox-services/devel - New directory
Message-ID: <20080901211041.614BA7011F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ratbox-services/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn15676/rpms/ratbox-services/devel

Log Message:
Directory /cvs/extras/rpms/ratbox-services/devel added to the repository




From kevin at fedoraproject.org  Mon Sep  1 21:10:42 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:10:42 +0000 (UTC)
Subject: rpms/ratbox-services Makefile,NONE,1.1
Message-ID: <20080901211042.374297011D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ratbox-services
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn15676/rpms/ratbox-services

Added Files:
	Makefile 
Log Message:
Setup of module ratbox-services


--- NEW FILE Makefile ---
# Top level Makefile for module ratbox-services
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep  1 21:12:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:12:20 +0000
Subject: [pkgdb] echo-artist was added for mso
Message-ID: <20080901211128.24EA8208D7A@bastion.fedora.phx.redhat.com>

kevin has added Package echo-artist with summary Automation tools for echo-icon-theme artists
kevin has approved Package echo-artist
kevin has added a Fedora devel branch for echo-artist with an owner of mso
kevin has approved echo-artist in Fedora devel
kevin has approved Package echo-artist
kevin has set commit to Approved for packager on echo-artist (Fedora devel)
kevin has set build to Approved for packager on echo-artist (Fedora devel)
kevin has set checkout to Approved for packager on echo-artist (Fedora devel)
kevin has set commit to Approved for uberpackager on echo-artist (Fedora devel)
kevin has set build to Approved for uberpackager on echo-artist (Fedora devel)
kevin has set checkout to Approved for uberpackager on echo-artist (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:11:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:11:38 +0000
Subject: [pkgdb] echo-artist (Fedora, 8) updated by kevin
Message-ID: <20080901211145.E7014208D85@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for echo-artist
kevin has set commit to Approved for uberpackager on echo-artist (Fedora 8)
kevin has set build to Approved for uberpackager on echo-artist (Fedora 8)
kevin has set checkout to Approved for uberpackager on echo-artist (Fedora 8)

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:11:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:11:38 +0000
Subject: [pkgdb] echo-artist (Fedora, 9) updated by kevin
Message-ID: <20080901211144.C1996208D7E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for echo-artist
kevin has set commit to Approved for uberpackager on echo-artist (Fedora 9)
kevin has set build to Approved for uberpackager on echo-artist (Fedora 9)
kevin has set checkout to Approved for uberpackager on echo-artist (Fedora 9)

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



From kevin at fedoraproject.org  Mon Sep  1 21:12:22 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:12:22 +0000 (UTC)
Subject: rpms/echo-artist/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080901211222.4F19270121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/echo-artist/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16040/rpms/echo-artist/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module echo-artist


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: echo-artist
# $Id: Makefile,v 1.1 2008/09/01 21:12:22 kevin Exp $
NAME := echo-artist
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Sep  1 21:12:21 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:12:21 +0000 (UTC)
Subject: rpms/echo-artist - New directory
Message-ID: <20080901211221.202F37011D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/echo-artist
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16040/rpms/echo-artist

Log Message:
Directory /cvs/extras/rpms/echo-artist added to the repository




From kevin at fedoraproject.org  Mon Sep  1 21:12:21 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:12:21 +0000 (UTC)
Subject: rpms/echo-artist/devel - New directory
Message-ID: <20080901211221.503BF7011F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/echo-artist/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16040/rpms/echo-artist/devel

Log Message:
Directory /cvs/extras/rpms/echo-artist/devel added to the repository




From kevin at fedoraproject.org  Mon Sep  1 21:12:22 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:12:22 +0000 (UTC)
Subject: rpms/echo-artist Makefile,NONE,1.1
Message-ID: <20080901211222.1DAB570120@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/echo-artist
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16040/rpms/echo-artist

Added Files:
	Makefile 
Log Message:
Setup of module echo-artist


--- NEW FILE Makefile ---
# Top level Makefile for module echo-artist
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep  1 21:12:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:12:58 +0000
Subject: [pkgdb] enlightenment was added for stalwart
Message-ID: <20080901211307.83424208D85@bastion.fedora.phx.redhat.com>

kevin has added Package enlightenment with summary A next generation desktop shell
kevin has approved Package enlightenment
kevin has added a Fedora devel branch for enlightenment with an owner of stalwart
kevin has approved enlightenment in Fedora devel
kevin has approved Package enlightenment
kevin has set commit to Approved for packager on enlightenment (Fedora devel)
kevin has set build to Approved for packager on enlightenment (Fedora devel)
kevin has set checkout to Approved for packager on enlightenment (Fedora devel)
kevin has set commit to Approved for uberpackager on enlightenment (Fedora devel)
kevin has set build to Approved for uberpackager on enlightenment (Fedora devel)
kevin has set checkout to Approved for uberpackager on enlightenment (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:14:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:14:08 +0000
Subject: [pkgdb] enlightenment (Fedora, 9) updated by kevin
Message-ID: <20080901211312.EC67C208D84@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for enlightenment
kevin has set commit to Approved for uberpackager on enlightenment (Fedora 9)
kevin has set build to Approved for uberpackager on enlightenment (Fedora 9)
kevin has set checkout to Approved for uberpackager on enlightenment (Fedora 9)

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:14:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:14:08 +0000
Subject: [pkgdb] enlightenment (Fedora, 8) updated by kevin
Message-ID: <20080901211312.C3F0A208D8E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for enlightenment
kevin has set commit to Approved for uberpackager on enlightenment (Fedora 8)
kevin has set build to Approved for uberpackager on enlightenment (Fedora 8)
kevin has set checkout to Approved for uberpackager on enlightenment (Fedora 8)

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



From kevin at fedoraproject.org  Mon Sep  1 21:13:46 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:13:46 +0000 (UTC)
Subject: rpms/enlightenment - New directory
Message-ID: <20080901211346.1F1057011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/enlightenment
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16309/rpms/enlightenment

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




From kevin at fedoraproject.org  Mon Sep  1 21:13:46 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:13:46 +0000 (UTC)
Subject: rpms/enlightenment/devel - New directory
Message-ID: <20080901211346.4FA5E7011F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/enlightenment/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16309/rpms/enlightenment/devel

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




From kevin at fedoraproject.org  Mon Sep  1 21:13:47 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:13:47 +0000 (UTC)
Subject: rpms/enlightenment/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080901211347.62BA27011D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/enlightenment/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16309/rpms/enlightenment/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: enlightenment
# $Id: Makefile,v 1.1 2008/09/01 21:13:47 kevin Exp $
NAME := enlightenment
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Sep  1 21:13:47 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:13:47 +0000 (UTC)
Subject: rpms/enlightenment Makefile,NONE,1.1
Message-ID: <20080901211347.2E3E57011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/enlightenment
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16309/rpms/enlightenment

Added Files:
	Makefile 
Log Message:
Setup of module enlightenment


--- NEW FILE Makefile ---
# Top level Makefile for module enlightenment
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep  1 21:14:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:14:27 +0000
Subject: [pkgdb] hunspell-id was added for caolanm
Message-ID: <20080901211437.5EBCE208D86@bastion.fedora.phx.redhat.com>

kevin has added Package hunspell-id with summary Indonesian hunspell spell-checking dictionary
kevin has approved Package hunspell-id
kevin has added a Fedora devel branch for hunspell-id with an owner of caolanm
kevin has approved hunspell-id in Fedora devel
kevin has approved Package hunspell-id
kevin has set commit to Approved for packager on hunspell-id (Fedora devel)
kevin has set build to Approved for packager on hunspell-id (Fedora devel)
kevin has set checkout to Approved for packager on hunspell-id (Fedora devel)
kevin has set commit to Approved for uberpackager on hunspell-id (Fedora devel)
kevin has set build to Approved for uberpackager on hunspell-id (Fedora devel)
kevin has set checkout to Approved for uberpackager on hunspell-id (Fedora devel)

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



From kevin at fedoraproject.org  Mon Sep  1 21:15:15 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:15:15 +0000 (UTC)
Subject: rpms/hunspell-id - New directory
Message-ID: <20080901211515.24A867011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-id
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk16611/rpms/hunspell-id

Log Message:
Directory /cvs/extras/rpms/hunspell-id added to the repository




From kevin at fedoraproject.org  Mon Sep  1 21:15:16 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:15:16 +0000 (UTC)
Subject: rpms/hunspell-id Makefile,NONE,1.1
Message-ID: <20080901211516.2BB047011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-id
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk16611/rpms/hunspell-id

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-id


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-id
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  1 21:15:15 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:15:15 +0000 (UTC)
Subject: rpms/hunspell-id/devel - New directory
Message-ID: <20080901211515.5F9057011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-id/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk16611/rpms/hunspell-id/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-id/devel added to the repository




From kevin at fedoraproject.org  Mon Sep  1 21:15:16 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:15:16 +0000 (UTC)
Subject: rpms/hunspell-id/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080901211516.6E7747011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-id/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk16611/rpms/hunspell-id/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-id


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-id
# $Id: Makefile,v 1.1 2008/09/01 21:15:16 kevin Exp $
NAME := hunspell-id
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  1 21:16:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:16:40 +0000
Subject: [pkgdb] tangogps was added for pbrobinson
Message-ID: <20080901211539.02359208D84@bastion.fedora.phx.redhat.com>

kevin has added Package tangogps with summary GTK+ mapping and GPS application
kevin has approved Package tangogps
kevin has added a Fedora devel branch for tangogps with an owner of pbrobinson
kevin has approved tangogps in Fedora devel
kevin has approved Package tangogps
kevin has set commit to Approved for packager on tangogps (Fedora devel)
kevin has set build to Approved for packager on tangogps (Fedora devel)
kevin has set checkout to Approved for packager on tangogps (Fedora devel)
kevin has set commit to Approved for uberpackager on tangogps (Fedora devel)
kevin has set build to Approved for uberpackager on tangogps (Fedora devel)
kevin has set checkout to Approved for uberpackager on tangogps (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:15:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:15:42 +0000
Subject: [pkgdb] tangogps (Fedora, 9) updated by kevin
Message-ID: <20080901211548.BD2CD208D85@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for tangogps
kevin has set commit to Approved for uberpackager on tangogps (Fedora 9)
kevin has set build to Approved for uberpackager on tangogps (Fedora 9)
kevin has set checkout to Approved for uberpackager on tangogps (Fedora 9)

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



From kevin at fedoraproject.org  Mon Sep  1 21:16:03 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:16:03 +0000 (UTC)
Subject: rpms/tangogps - New directory
Message-ID: <20080901211603.2137B7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tangogps
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz16744/rpms/tangogps

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




From kevin at fedoraproject.org  Mon Sep  1 21:16:04 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:16:04 +0000 (UTC)
Subject: rpms/tangogps Makefile,NONE,1.1
Message-ID: <20080901211604.2B0707011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tangogps
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz16744/rpms/tangogps

Added Files:
	Makefile 
Log Message:
Setup of module tangogps


--- NEW FILE Makefile ---
# Top level Makefile for module tangogps
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  1 21:16:03 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:16:03 +0000 (UTC)
Subject: rpms/tangogps/devel - New directory
Message-ID: <20080901211603.55ECC7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tangogps/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz16744/rpms/tangogps/devel

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




From kevin at fedoraproject.org  Mon Sep  1 21:16:04 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  1 Sep 2008 21:16:04 +0000 (UTC)
Subject: rpms/tangogps/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080901211604.61F167011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tangogps/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz16744/rpms/tangogps/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tangogps
# $Id: Makefile,v 1.1 2008/09/01 21:16:04 kevin Exp $
NAME := tangogps
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From claudiotomasoni at fedoraproject.org  Mon Sep  1 21:23:48 2008
From: claudiotomasoni at fedoraproject.org (Claudio Tomasoni)
Date: Mon,  1 Sep 2008 21:23:48 +0000 (UTC)
Subject: rpms/qtoctave/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 qtoctave.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080901212348.A37C47011A@cvs1.fedora.phx.redhat.com>

Author: claudiotomasoni

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

Modified Files:
	.cvsignore import.log qtoctave.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Jun 2008 18:04:41 -0000	1.2
+++ .cvsignore	1 Sep 2008 21:23:18 -0000	1.3
@@ -1,2 +1 @@
-qtoctave-0.7.4.tar.gz
-qtoctave-icon.tar.gz
+qtoctave-0.8.1-20080823.svn165.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Jun 2008 18:04:41 -0000	1.1
+++ import.log	1 Sep 2008 21:23:18 -0000	1.2
@@ -1 +1,2 @@
 qtoctave-0_7_4-3_fc9:HEAD:qtoctave-0.7.4-3.fc9.src.rpm:1212688486
+qtoctave-0_8_1-0_20080823_svn165_fc9:HEAD:qtoctave-0.8.1-0.20080823.svn165.fc9.src.rpm:1220304102


Index: qtoctave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/devel/qtoctave.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtoctave.spec	5 Jun 2008 18:04:41 -0000	1.1
+++ qtoctave.spec	1 Sep 2008 21:23:18 -0000	1.2
@@ -1,13 +1,16 @@
 Name:           qtoctave
-Version:        0.7.4
-Release:        3%{?dist}
+Version:        0.8.1
+Release:        0.20080823.svn165%{?dist}
 Summary:        Frontend for Octave
 
 Group:          Applications/Engineering
 License:        GPLv2
 URL:            http://qtoctave.wordpress.com/
-Source0:        https://forja.rediris.es/frs/download.php/744/qtoctave-0.7.4.tar.gz
-Source1:        %{name}-icon.tar.gz
+# The source for this package was checked out from svn trunk.
+# Use the following command to generate the tarball:
+#  svn checkout https://forja.rediris.es/svn/csl-qtoctave/trunk/qtoctave
+#  tar -czvf qtoctave-0.8.1-20080823.svn165.tar.gz qtoctave
+Source0:        %{name}-%{version}-20080823.svn165.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel, octave-devel
@@ -20,8 +23,11 @@
 QtOctave is a frontend for Octave based on Qt4.
 
 %prep
-%setup -q -a 1
+%setup -q -n %{name}
 dos2unix readme.txt
+for SVNDIR in $(find . -type d -name .svn)
+   do rm -rf $SVNDIR 
+done
 find src/ -type f -exec chmod a-x {} \;
 
 
@@ -30,47 +36,51 @@
        -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DQT_NO_DEBUG" \
        -DCMAKE_SKIP_RPATH:STRING="ON"                   \
        .
-make %{?_smp_mflags}
-
-cat > %{name}.desktop << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Name=QtOctave
-Comment=Frontend for Octave
-Exec=qtoctave
-Icon=qtoctave.png
-Categories=Math;Science;
-Terminal=false
-Type=Application
-EOF
+make VERBOSE=1 %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
                      --vendor "fedora" \
-                     %{name}.desktop
-install -p -m 644 %{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+                     --delete-original \
+                     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %files
 %defattr(-,root,root,-)
-%doc readme.txt news.txt leeme.txt LICENSE_GPL.txt icon/
+%doc readme.txt news.txt leeme.txt LICENSE_GPL.txt
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
 
 %changelog
+* Thu Aug 14 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.8.1-0.20080823.svn165
+- bump to svn version pre 0.8.1
+- fixes on icon and desktop file
+
 * Sat May 24 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.7.4-3
 - fixed SOURCE1 setup
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Jun 2008 18:04:41 -0000	1.2
+++ sources	1 Sep 2008 21:23:18 -0000	1.3
@@ -1,2 +1 @@
-ac6fbfecd1e1ca5b07f1131701d92186  qtoctave-0.7.4.tar.gz
-7718cf0d600d30bce77de341ef314355  qtoctave-icon.tar.gz
+ea7aeeaa1eb180007c9a53fbe566a727  qtoctave-0.8.1-20080823.svn165.tar.gz



From claudiotomasoni at fedoraproject.org  Mon Sep  1 21:28:07 2008
From: claudiotomasoni at fedoraproject.org (Claudio Tomasoni)
Date: Mon,  1 Sep 2008 21:28:07 +0000 (UTC)
Subject: rpms/qtoctave/F-9 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 qtoctave.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080901212807.97D727011A@cvs1.fedora.phx.redhat.com>

Author: claudiotomasoni

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

Modified Files:
	.cvsignore import.log qtoctave.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Jun 2008 20:33:33 -0000	1.2
+++ .cvsignore	1 Sep 2008 21:27:37 -0000	1.3
@@ -1,2 +1 @@
-qtoctave-0.7.4.tar.gz
-qtoctave-icon.tar.gz
+qtoctave-0.8.1-20080823.svn165.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Jun 2008 20:33:33 -0000	1.1
+++ import.log	1 Sep 2008 21:27:37 -0000	1.2
@@ -1 +1,2 @@
 qtoctave-0_7_4-3_fc9:F-9:qtoctave-0.7.4-3.fc9.src.rpm:1212697415
+qtoctave-0_8_1-0_20080823_svn165_fc9:F-9:qtoctave-0.8.1-0.20080823.svn165.fc9.src.rpm:1220304402


Index: qtoctave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/F-9/qtoctave.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtoctave.spec	5 Jun 2008 20:33:33 -0000	1.1
+++ qtoctave.spec	1 Sep 2008 21:27:37 -0000	1.2
@@ -1,13 +1,16 @@
 Name:           qtoctave
-Version:        0.7.4
-Release:        3%{?dist}
+Version:        0.8.1
+Release:        0.20080823.svn165%{?dist}
 Summary:        Frontend for Octave
 
 Group:          Applications/Engineering
 License:        GPLv2
 URL:            http://qtoctave.wordpress.com/
-Source0:        https://forja.rediris.es/frs/download.php/744/qtoctave-0.7.4.tar.gz
-Source1:        %{name}-icon.tar.gz
+# The source for this package was checked out from svn trunk.
+# Use the following command to generate the tarball:
+#  svn checkout https://forja.rediris.es/svn/csl-qtoctave/trunk/qtoctave
+#  tar -czvf qtoctave-0.8.1-20080823.svn165.tar.gz qtoctave
+Source0:        %{name}-%{version}-20080823.svn165.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel, octave-devel
@@ -20,8 +23,11 @@
 QtOctave is a frontend for Octave based on Qt4.
 
 %prep
-%setup -q -a 1
+%setup -q -n %{name}
 dos2unix readme.txt
+for SVNDIR in $(find . -type d -name .svn)
+   do rm -rf $SVNDIR 
+done
 find src/ -type f -exec chmod a-x {} \;
 
 
@@ -30,47 +36,51 @@
        -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DQT_NO_DEBUG" \
        -DCMAKE_SKIP_RPATH:STRING="ON"                   \
        .
-make %{?_smp_mflags}
-
-cat > %{name}.desktop << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Name=QtOctave
-Comment=Frontend for Octave
-Exec=qtoctave
-Icon=qtoctave.png
-Categories=Math;Science;
-Terminal=false
-Type=Application
-EOF
+make VERBOSE=1 %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
                      --vendor "fedora" \
-                     %{name}.desktop
-install -p -m 644 %{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+                     --delete-original \
+                     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %files
 %defattr(-,root,root,-)
-%doc readme.txt news.txt leeme.txt LICENSE_GPL.txt icon/
+%doc readme.txt news.txt leeme.txt LICENSE_GPL.txt
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
 
 %changelog
+* Thu Aug 14 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.8.1-0.20080823.svn165
+- bump to svn version pre 0.8.1
+- fixes on icon and desktop file
+
 * Sat May 24 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.7.4-3
 - fixed SOURCE1 setup
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Jun 2008 20:33:33 -0000	1.2
+++ sources	1 Sep 2008 21:27:37 -0000	1.3
@@ -1,2 +1 @@
-ac6fbfecd1e1ca5b07f1131701d92186  qtoctave-0.7.4.tar.gz
-7718cf0d600d30bce77de341ef314355  qtoctave-icon.tar.gz
+ea7aeeaa1eb180007c9a53fbe566a727  qtoctave-0.8.1-20080823.svn165.tar.gz



From claudiotomasoni at fedoraproject.org  Mon Sep  1 21:30:59 2008
From: claudiotomasoni at fedoraproject.org (Claudio Tomasoni)
Date: Mon,  1 Sep 2008 21:30:59 +0000 (UTC)
Subject: rpms/qtoctave/F-8 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 qtoctave.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080901213059.7FD0D7011A@cvs1.fedora.phx.redhat.com>

Author: claudiotomasoni

Update of /cvs/pkgs/rpms/qtoctave/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19321/F-8

Modified Files:
	.cvsignore import.log qtoctave.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Jun 2008 20:24:42 -0000	1.2
+++ .cvsignore	1 Sep 2008 21:30:59 -0000	1.3
@@ -1,2 +1 @@
-qtoctave-0.7.4.tar.gz
-qtoctave-icon.tar.gz
+qtoctave-0.8.1-20080823.svn165.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/F-8/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Jun 2008 20:24:42 -0000	1.1
+++ import.log	1 Sep 2008 21:30:59 -0000	1.2
@@ -1 +1,2 @@
 qtoctave-0_7_4-3_fc9:F-8:qtoctave-0.7.4-3.fc9.src.rpm:1212696780
+qtoctave-0_8_1-0_20080823_svn165_fc9:F-8:qtoctave-0.8.1-0.20080823.svn165.fc9.src.rpm:1220304571


Index: qtoctave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/F-8/qtoctave.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtoctave.spec	5 Jun 2008 20:24:42 -0000	1.1
+++ qtoctave.spec	1 Sep 2008 21:30:59 -0000	1.2
@@ -1,13 +1,16 @@
 Name:           qtoctave
-Version:        0.7.4
-Release:        3%{?dist}
+Version:        0.8.1
+Release:        0.20080823.svn165%{?dist}
 Summary:        Frontend for Octave
 
 Group:          Applications/Engineering
 License:        GPLv2
 URL:            http://qtoctave.wordpress.com/
-Source0:        https://forja.rediris.es/frs/download.php/744/qtoctave-0.7.4.tar.gz
-Source1:        %{name}-icon.tar.gz
+# The source for this package was checked out from svn trunk.
+# Use the following command to generate the tarball:
+#  svn checkout https://forja.rediris.es/svn/csl-qtoctave/trunk/qtoctave
+#  tar -czvf qtoctave-0.8.1-20080823.svn165.tar.gz qtoctave
+Source0:        %{name}-%{version}-20080823.svn165.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel, octave-devel
@@ -20,8 +23,11 @@
 QtOctave is a frontend for Octave based on Qt4.
 
 %prep
-%setup -q -a 1
+%setup -q -n %{name}
 dos2unix readme.txt
+for SVNDIR in $(find . -type d -name .svn)
+   do rm -rf $SVNDIR 
+done
 find src/ -type f -exec chmod a-x {} \;
 
 
@@ -30,47 +36,51 @@
        -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DQT_NO_DEBUG" \
        -DCMAKE_SKIP_RPATH:STRING="ON"                   \
        .
-make %{?_smp_mflags}
-
-cat > %{name}.desktop << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Name=QtOctave
-Comment=Frontend for Octave
-Exec=qtoctave
-Icon=qtoctave.png
-Categories=Math;Science;
-Terminal=false
-Type=Application
-EOF
+make VERBOSE=1 %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
                      --vendor "fedora" \
-                     %{name}.desktop
-install -p -m 644 %{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+                     --delete-original \
+                     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %files
 %defattr(-,root,root,-)
-%doc readme.txt news.txt leeme.txt LICENSE_GPL.txt icon/
+%doc readme.txt news.txt leeme.txt LICENSE_GPL.txt
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
 
 %changelog
+* Thu Aug 14 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.8.1-0.20080823.svn165
+- bump to svn version pre 0.8.1
+- fixes on icon and desktop file
+
 * Sat May 24 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.7.4-3
 - fixed SOURCE1 setup
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Jun 2008 20:24:42 -0000	1.2
+++ sources	1 Sep 2008 21:30:59 -0000	1.3
@@ -1,2 +1 @@
-ac6fbfecd1e1ca5b07f1131701d92186  qtoctave-0.7.4.tar.gz
-7718cf0d600d30bce77de341ef314355  qtoctave-icon.tar.gz
+ea7aeeaa1eb180007c9a53fbe566a727  qtoctave-0.8.1-20080823.svn165.tar.gz



From pkgdb at fedoraproject.org  Mon Sep  1 21:33:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:33:22 +0000
Subject: [pkgdb] monotone-viz: roland has requested watchbugzilla
Message-ID: <20080901213221.326E2208D7E@bastion.fedora.phx.redhat.com>

roland has requested the watchbugzilla acl on monotone-viz (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:32:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:32:23 +0000
Subject: [pkgdb] monotone-viz: roland has requested commit
Message-ID: <20080901213223.2276B208D83@bastion.fedora.phx.redhat.com>

roland has requested the commit acl on monotone-viz (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:32:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:32:23 +0000
Subject: [pkgdb] monotone-viz: roland has requested watchcommits
Message-ID: <20080901213228.9E496208D86@bastion.fedora.phx.redhat.com>

roland has requested the watchcommits acl on monotone-viz (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:32:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:32:26 +0000
Subject: [pkgdb] monotone-viz: roland has requested approveacls
Message-ID: <20080901213229.4300E208D89@bastion.fedora.phx.redhat.com>

roland has requested the approveacls acl on monotone-viz (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:32:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:32:48 +0000
Subject: [pkgdb] monotone-viz: roland has requested watchbugzilla
Message-ID: <20080901213249.002D2208D81@bastion.fedora.phx.redhat.com>

roland has requested the watchbugzilla acl on monotone-viz (Fedora 9)

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:32:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:32:49 +0000
Subject: [pkgdb] monotone-viz: roland has requested commit
Message-ID: <20080901213249.D8EC5208D84@bastion.fedora.phx.redhat.com>

roland has requested the commit acl on monotone-viz (Fedora 9)

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:32:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:32:50 +0000
Subject: [pkgdb] monotone-viz: roland has requested watchcommits
Message-ID: <20080901213255.8382F208D87@bastion.fedora.phx.redhat.com>

roland has requested the watchcommits acl on monotone-viz (Fedora 9)

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:32:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:32:52 +0000
Subject: [pkgdb] monotone-viz: roland has requested approveacls
Message-ID: <20080901213256.3A071208D88@bastion.fedora.phx.redhat.com>

roland has requested the approveacls acl on monotone-viz (Fedora 9)

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:33:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:33:33 +0000
Subject: [pkgdb] monotone-viz had acl change status
Message-ID: <20080901213333.1379F208D86@bastion.fedora.phx.redhat.com>

roland has set the watchbugzilla acl on monotone-viz (Fedora devel) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:34:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:34:36 +0000
Subject: [pkgdb] monotone-viz had acl change status
Message-ID: <20080901213335.2223F208D8A@bastion.fedora.phx.redhat.com>

roland has set the watchcommits acl on monotone-viz (Fedora devel) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:34:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:34:38 +0000
Subject: [pkgdb] monotone-viz had acl change status
Message-ID: <20080901213337.2C34B208D8D@bastion.fedora.phx.redhat.com>

roland has set the commit acl on monotone-viz (Fedora devel) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:33:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:33:41 +0000
Subject: [pkgdb] monotone-viz had acl change status
Message-ID: <20080901213342.48634208D93@bastion.fedora.phx.redhat.com>

roland has set the approveacls acl on monotone-viz (Fedora devel) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:34:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:34:46 +0000
Subject: [pkgdb] monotone-viz ownership updated
Message-ID: <20080901213344.E1AF4208D85@bastion.fedora.phx.redhat.com>

Package monotone-viz in Fedora devel was orphaned by roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:33:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:33:54 +0000
Subject: [pkgdb] monotone-viz ownership updated
Message-ID: <20080901213354.7A2B0208D86@bastion.fedora.phx.redhat.com>

Package monotone-viz in Fedora 8 was orphaned by roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:33:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:33:58 +0000
Subject: [pkgdb] monotone-viz ownership updated
Message-ID: <20080901213358.3BAD9208D88@bastion.fedora.phx.redhat.com>

Package monotone-viz in Fedora 7 was orphaned by roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:34:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:34:06 +0000
Subject: [pkgdb] monotone-viz ownership updated
Message-ID: <20080901213407.10482208D8B@bastion.fedora.phx.redhat.com>

Package monotone-viz in Fedora EPEL 5 was orphaned by roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:34:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:34:09 +0000
Subject: [pkgdb] monotone-viz had acl change status
Message-ID: <20080901213409.BB123208D8D@bastion.fedora.phx.redhat.com>

roland has set the watchbugzilla acl on monotone-viz (Fedora 9) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:35:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:35:14 +0000
Subject: [pkgdb] monotone-viz had acl change status
Message-ID: <20080901213412.92012208D91@bastion.fedora.phx.redhat.com>

roland has set the watchcommits acl on monotone-viz (Fedora 9) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:35:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:35:15 +0000
Subject: [pkgdb] monotone-viz had acl change status
Message-ID: <20080901213414.2803A208D94@bastion.fedora.phx.redhat.com>

roland has set the commit acl on monotone-viz (Fedora 9) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:34:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:34:15 +0000
Subject: [pkgdb] monotone-viz had acl change status
Message-ID: <20080901213415.965CB208D93@bastion.fedora.phx.redhat.com>

roland has set the approveacls acl on monotone-viz (Fedora 9) to Approved for roland

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



From pkgdb at fedoraproject.org  Mon Sep  1 21:35:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 21:35:19 +0000
Subject: [pkgdb] monotone-viz ownership updated
Message-ID: <20080901213418.4465B208D99@bastion.fedora.phx.redhat.com>

Package monotone-viz in Fedora 9 was orphaned by roland

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



From caolanm at fedoraproject.org  Mon Sep  1 21:50:04 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  1 Sep 2008 21:50:04 +0000 (UTC)
Subject: rpms/hunspell-id/devel hunspell-id.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080901215004.6EA257011D@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-id.spec import.log 
Log Message:



--- NEW FILE hunspell-id.spec ---
Name: hunspell-id
Summary: Indonesian hunspell dictionaries
%define upstreamid 20040410
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/id_ID.zip
Group: Applications/Text
URL: http://wiki.services.openoffice.org/wiki/Dictionaries#Indonesian_.28Indonesia.29
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv2
BuildArch: noarch

Requires: hunspell

%description
Indonesian hunspell dictionaries.

%prep
%setup -q -c -n hunspell-id

%build
chmod -x *

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_id_ID.txt
%{_datadir}/myspell/*

%changelog
* Mon Sep 01 2006 Caolan McNamara <caolanm at redhat.com> - 0.20040410-1
- initial version


--- NEW FILE import.log ---
hunspell-id-0_20040410-1_fc9:HEAD:hunspell-id-0.20040410-1.fc9.src.rpm:1220305855


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-id/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2008 21:15:16 -0000	1.1
+++ .cvsignore	1 Sep 2008 21:49:34 -0000	1.2
@@ -0,0 +1 @@
+id_ID.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-id/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2008 21:15:16 -0000	1.1
+++ sources	1 Sep 2008 21:49:34 -0000	1.2
@@ -0,0 +1 @@
+fe0ac356fd725cf1d5197e040fb507fc  id_ID.zip



From salimma at fedoraproject.org  Mon Sep  1 21:55:13 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon,  1 Sep 2008 21:55:13 +0000 (UTC)
Subject: rpms/python-storm/EL-5 python-storm.spec,1.1,1.2
Message-ID: <20080901215513.C9B577011A@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-serv22633

Modified Files:
	python-storm.spec 
Log Message:
* Mon Sep  1 2008 Michel Salim <salimma at fedoraproject.org> - 0.13-2
- Add build dependency on python-sqlite2, for unit testing



Index: python-storm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/EL-5/python-storm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-storm.spec	31 Aug 2008 03:55:42 -0000	1.1
+++ python-storm.spec	1 Sep 2008 21:54:43 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           python-storm
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An object-relational mapper (ORM) for Python
 
 Group:          Development/Languages
@@ -14,6 +14,8 @@
 # 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
@@ -120,6 +122,9 @@
 
 
 %changelog
+* Mon Sep  1 2008 Michel Salim <salimma at fedoraproject.org> - 0.13-2
+- Add build dependency on python-sqlite2, for unit testing
+
 * Sat Aug 30 2008 Michel Salim <salimma at fedoraproject.org> - 0.13-1
 - Update to 0.13
 



From pkgdb at fedoraproject.org  Mon Sep  1 22:04:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 22:04:46 +0000
Subject: [pkgdb] monotone-viz ownership updated
Message-ID: <20080901220344.DFACC208D83@bastion.fedora.phx.redhat.com>

Package monotone-viz in Fedora devel is now owned by thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 22:03:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 22:03:54 +0000
Subject: [pkgdb] monotone-viz ownership updated
Message-ID: <20080901220354.2BAB0208D85@bastion.fedora.phx.redhat.com>

Package monotone-viz in Fedora EPEL 5 is now owned by thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 22:03:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 22:03:58 +0000
Subject: [pkgdb] monotone-viz ownership updated
Message-ID: <20080901220358.CB13A208D87@bastion.fedora.phx.redhat.com>

Package monotone-viz in Fedora 9 is now owned by thm

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



From pkgdb at fedoraproject.org  Mon Sep  1 22:03:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 01 Sep 2008 22:03:48 +0000
Subject: [pkgdb] monotone-viz ownership updated
Message-ID: <20080901220354.46F07208D86@bastion.fedora.phx.redhat.com>

Package monotone-viz in Fedora 8 is now owned by thm

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



From stalwart at fedoraproject.org  Mon Sep  1 22:13:02 2008
From: stalwart at fedoraproject.org (Pavel Shevchuk)
Date: Mon,  1 Sep 2008 22:13:02 +0000 (UTC)
Subject: rpms/enlightenment/devel enlightenment.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080901221302.217E67011A@cvs1.fedora.phx.redhat.com>

Author: stalwart

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

Modified Files:
	.cvsignore sources 
Added Files:
	enlightenment.spec import.log 
Log Message:
Importing e17



--- NEW FILE enlightenment.spec ---
Name:           enlightenment
Version:        0.16.999.043
Release:        3%{?dist}
Summary:        Enlightenment DR17 - a next generation desktop shell

Group:          User Interface/Desktops
License:        MIT
URL:            http://enlightenment.org/p.php?p=about/e17&l=en
Source0:        http://download.enlightenment.org/snapshots/2008-05-19/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libX11-devel libXext-devel pkgconfig gettext
BuildRequires:  eet-devel embryo-devel evas-devel ecore-devel edje-devel
BuildRequires:  efreet-devel e_dbus-devel pam-devel

%description
Enlightenment 0.17 is the next generation of UNIX graphical environments. It is
not just a window manager, but it is also a desktop shell. A desktop shell
means, a window manager plus a file manager, plus configuration utilitys all in
one. They are not separated as usual.

Enlightenment is fast. No, really. It's fast. It is known to run on very slow
machines (like 100 Mhz CPU, 64 MB of RAM) well. So you really don't need a
modern desktop to see some eye-candy and to use a modern graphical environment.
Even more ??? you can control how fast you want it by using it's Performance
configuration panel to change the cache settings and more.

The high performance does not mean that there is no eye candy. There is eye
candy that you have never seen before. Starting from the animated boot screen,
to continue with the all animations and effects that themes could provide, to
end up with fancy animated backgrounds. But not some huge .GIF files, but
really nice animations. Every virtual desktop (at the moment you can have 24)
can have it's own background (animated or not), so you can put different
wallpapers on the different virtual desktops. There are a number of effects
that can be shown when you switch from the different virtual desktops. The
menus, the borders and all other usual parts of a normal window manager are
animated as well as some of the widgets (the sliders, for example). Remember
that those effects are provided by the theme, so every theme makes E to look
different, with different effects, look and feel and animations.

As we already mentioned, E17 provides a file manager as well. Of the time of
writing, it is not completed and is in active development (as E17 as a whole
itself), but after it is finished it will be a very nice, configurable and eye
candy. Even right now, you can do the basic things with it ??? browse, copy,
move, delete files. It will provide thumbnails for your pictures and will be
able to open your files with the coresponding application of your choice.

E17 is highly configurable. Currently it has a nice configuration panel with
dialogs for all kinds of things. You can change your wallpaper or your theme,
your fonts, your screen resolution, your screen's power settings, your keyboard
and mouse settings, the language that Enlightenment talks to you, and so on.
You can contol almost every apsect of what E is doing and how. It will do what
you want it to do.

As you already know, Enlightenment 0.17 has lots of features, but one of the
most important is, that you can add and remove functionality by using modules.
Modules are small applications that extend E17. There can be modules tho show
you the weather outside, or calendar modules, or modules to control your volume
or whatever you may think. Developing a module is not that hard, so, if you
have programming skills, you are more than welcome to develop and maintain some
modules for the community.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       eet-devel evas-devel ecore-devel edje-devel e_dbus-devel
Requires:       pkgconfig efreet-devel

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
# strip out bundled vera font, it doesn't support national glyphs
rm -r data/fonts
sed -i \
  -e '\|CONFIG_FILES="\$CONFIG_FILES data/fonts/Makefile"|d' \
  -e 's|data/fonts/Makefile||' \
  configure #; chmod +x configure
sed -i -e 's|fonts||' data/Makefile.in
# remove font aliases to make edje fall back to default font (dejavu)
sed -i -e '\|\.ttf|d' data/{init,themes}/default.edc
# backport enlightenment.pc.in fix from trunk
sed -i -e 's|Libs:\ .*$|Libs: -L${libdir}|' enlightenment.pc.in


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
# config.h is used only while building E itself
sed -i -e '\|#include\ "config.h"|d' $RPM_BUILD_ROOT%{_includedir}/%{name}/e.h
find $RPM_BUILD_ROOT -name '*.la' -delete
# remove improperly placed docs
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/AUTHORS
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/COPYING
# remove enlightenment_sys which is broken anyway
rm -rf $RPM_BUILD_ROOT%{_bindir}/%{name}_sys
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sysactions.conf
%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING COPYING-PLAIN README
%{_bindir}/%{name}
%{_bindir}/%{name}_*
%{_libdir}/%{name}
%{_datadir}/%{name}
%{_datadir}/xsessions/%{name}.desktop


%files devel
%defattr(-,root,root,-)
# originally improperly placed docs
%doc doc/*.txt doc/*.html doc/*.png
%{_bindir}/%{name}-config
%{_includedir}/%{name}
%{_libdir}/pkgconfig/%{name}.pc


%changelog
* Sat Aug 30 2008 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.16.999.043-3
- One more directory ownership fix
- Backported enlightenment.pc.in from trunk
- Strip unneeded config.h include from e.h

* Sat Jul 26 2008 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.16.999.043-2
- Added missing efreet-devel require to enlightenment-devel
- Removed broken enlightenment_sys
- Removed more improperly placed docs
- Fixed directory ownership

* Mon May 20 2008 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.16.999.043-1
- Initial specfile for Enlightenment


--- NEW FILE import.log ---
enlightenment-0_16_999_043-3_fc9:HEAD:enlightenment-0.16.999.043-3.fc9.src.rpm:1220307133


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/enlightenment/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2008 21:13:47 -0000	1.1
+++ .cvsignore	1 Sep 2008 22:12:31 -0000	1.2
@@ -0,0 +1 @@
+enlightenment-0.16.999.043.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/enlightenment/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2008 21:13:47 -0000	1.1
+++ sources	1 Sep 2008 22:12:31 -0000	1.2
@@ -0,0 +1 @@
+6f502991ef3059772b290b85aadda108  enlightenment-0.16.999.043.tar.bz2



From stalwart at fedoraproject.org  Mon Sep  1 22:15:00 2008
From: stalwart at fedoraproject.org (Pavel Shevchuk)
Date: Mon,  1 Sep 2008 22:15:00 +0000 (UTC)
Subject: rpms/enlightenment/F-9 enlightenment.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080901221500.586B47011A@cvs1.fedora.phx.redhat.com>

Author: stalwart

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

Modified Files:
	.cvsignore sources 
Added Files:
	enlightenment.spec import.log 
Log Message:
Importing e17



--- NEW FILE enlightenment.spec ---
Name:           enlightenment
Version:        0.16.999.043
Release:        3%{?dist}
Summary:        Enlightenment DR17 - a next generation desktop shell

Group:          User Interface/Desktops
License:        MIT
URL:            http://enlightenment.org/p.php?p=about/e17&l=en
Source0:        http://download.enlightenment.org/snapshots/2008-05-19/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libX11-devel libXext-devel pkgconfig gettext
BuildRequires:  eet-devel embryo-devel evas-devel ecore-devel edje-devel
BuildRequires:  efreet-devel e_dbus-devel pam-devel

%description
Enlightenment 0.17 is the next generation of UNIX graphical environments. It is
not just a window manager, but it is also a desktop shell. A desktop shell
means, a window manager plus a file manager, plus configuration utilitys all in
one. They are not separated as usual.

Enlightenment is fast. No, really. It's fast. It is known to run on very slow
machines (like 100 Mhz CPU, 64 MB of RAM) well. So you really don't need a
modern desktop to see some eye-candy and to use a modern graphical environment.
Even more ??? you can control how fast you want it by using it's Performance
configuration panel to change the cache settings and more.

The high performance does not mean that there is no eye candy. There is eye
candy that you have never seen before. Starting from the animated boot screen,
to continue with the all animations and effects that themes could provide, to
end up with fancy animated backgrounds. But not some huge .GIF files, but
really nice animations. Every virtual desktop (at the moment you can have 24)
can have it's own background (animated or not), so you can put different
wallpapers on the different virtual desktops. There are a number of effects
that can be shown when you switch from the different virtual desktops. The
menus, the borders and all other usual parts of a normal window manager are
animated as well as some of the widgets (the sliders, for example). Remember
that those effects are provided by the theme, so every theme makes E to look
different, with different effects, look and feel and animations.

As we already mentioned, E17 provides a file manager as well. Of the time of
writing, it is not completed and is in active development (as E17 as a whole
itself), but after it is finished it will be a very nice, configurable and eye
candy. Even right now, you can do the basic things with it ??? browse, copy,
move, delete files. It will provide thumbnails for your pictures and will be
able to open your files with the coresponding application of your choice.

E17 is highly configurable. Currently it has a nice configuration panel with
dialogs for all kinds of things. You can change your wallpaper or your theme,
your fonts, your screen resolution, your screen's power settings, your keyboard
and mouse settings, the language that Enlightenment talks to you, and so on.
You can contol almost every apsect of what E is doing and how. It will do what
you want it to do.

As you already know, Enlightenment 0.17 has lots of features, but one of the
most important is, that you can add and remove functionality by using modules.
Modules are small applications that extend E17. There can be modules tho show
you the weather outside, or calendar modules, or modules to control your volume
or whatever you may think. Developing a module is not that hard, so, if you
have programming skills, you are more than welcome to develop and maintain some
modules for the community.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       eet-devel evas-devel ecore-devel edje-devel e_dbus-devel
Requires:       pkgconfig efreet-devel

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
# strip out bundled vera font, it doesn't support national glyphs
rm -r data/fonts
sed -i \
  -e '\|CONFIG_FILES="\$CONFIG_FILES data/fonts/Makefile"|d' \
  -e 's|data/fonts/Makefile||' \
  configure #; chmod +x configure
sed -i -e 's|fonts||' data/Makefile.in
# remove font aliases to make edje fall back to default font (dejavu)
sed -i -e '\|\.ttf|d' data/{init,themes}/default.edc
# backport enlightenment.pc.in fix from trunk
sed -i -e 's|Libs:\ .*$|Libs: -L${libdir}|' enlightenment.pc.in


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
# config.h is used only while building E itself
sed -i -e '\|#include\ "config.h"|d' $RPM_BUILD_ROOT%{_includedir}/%{name}/e.h
find $RPM_BUILD_ROOT -name '*.la' -delete
# remove improperly placed docs
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/AUTHORS
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/COPYING
# remove enlightenment_sys which is broken anyway
rm -rf $RPM_BUILD_ROOT%{_bindir}/%{name}_sys
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sysactions.conf
%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING COPYING-PLAIN README
%{_bindir}/%{name}
%{_bindir}/%{name}_*
%{_libdir}/%{name}
%{_datadir}/%{name}
%{_datadir}/xsessions/%{name}.desktop


%files devel
%defattr(-,root,root,-)
# originally improperly placed docs
%doc doc/*.txt doc/*.html doc/*.png
%{_bindir}/%{name}-config
%{_includedir}/%{name}
%{_libdir}/pkgconfig/%{name}.pc


%changelog
* Sat Aug 30 2008 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.16.999.043-3
- One more directory ownership fix
- Backported enlightenment.pc.in from trunk
- Strip unneeded config.h include from e.h

* Sat Jul 26 2008 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.16.999.043-2
- Added missing efreet-devel require to enlightenment-devel
- Removed broken enlightenment_sys
- Removed more improperly placed docs
- Fixed directory ownership

* Mon May 20 2008 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.16.999.043-1
- Initial specfile for Enlightenment


--- NEW FILE import.log ---
enlightenment-0_16_999_043-3_fc9:F-9:enlightenment-0.16.999.043-3.fc9.src.rpm:1220307250


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/enlightenment/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2008 21:13:47 -0000	1.1
+++ .cvsignore	1 Sep 2008 22:14:30 -0000	1.2
@@ -0,0 +1 @@
+enlightenment-0.16.999.043.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/enlightenment/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2008 21:13:47 -0000	1.1
+++ sources	1 Sep 2008 22:14:30 -0000	1.2
@@ -0,0 +1 @@
+6f502991ef3059772b290b85aadda108  enlightenment-0.16.999.043.tar.bz2



From stalwart at fedoraproject.org  Mon Sep  1 22:18:49 2008
From: stalwart at fedoraproject.org (Pavel Shevchuk)
Date: Mon,  1 Sep 2008 22:18:49 +0000 (UTC)
Subject: rpms/enlightenment/F-8 enlightenment.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080901221849.0FC097011A@cvs1.fedora.phx.redhat.com>

Author: stalwart

Update of /cvs/pkgs/rpms/enlightenment/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25697/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	enlightenment.spec import.log 
Log Message:
Importing e17



--- NEW FILE enlightenment.spec ---
Name:           enlightenment
Version:        0.16.999.043
Release:        3%{?dist}
Summary:        Enlightenment DR17 - a next generation desktop shell

Group:          User Interface/Desktops
License:        MIT
URL:            http://enlightenment.org/p.php?p=about/e17&l=en
Source0:        http://download.enlightenment.org/snapshots/2008-05-19/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libX11-devel libXext-devel pkgconfig gettext
BuildRequires:  eet-devel embryo-devel evas-devel ecore-devel edje-devel
BuildRequires:  efreet-devel e_dbus-devel pam-devel

%description
Enlightenment 0.17 is the next generation of UNIX graphical environments. It is
not just a window manager, but it is also a desktop shell. A desktop shell
means, a window manager plus a file manager, plus configuration utilitys all in
one. They are not separated as usual.

Enlightenment is fast. No, really. It's fast. It is known to run on very slow
machines (like 100 Mhz CPU, 64 MB of RAM) well. So you really don't need a
modern desktop to see some eye-candy and to use a modern graphical environment.
Even more ??? you can control how fast you want it by using it's Performance
configuration panel to change the cache settings and more.

The high performance does not mean that there is no eye candy. There is eye
candy that you have never seen before. Starting from the animated boot screen,
to continue with the all animations and effects that themes could provide, to
end up with fancy animated backgrounds. But not some huge .GIF files, but
really nice animations. Every virtual desktop (at the moment you can have 24)
can have it's own background (animated or not), so you can put different
wallpapers on the different virtual desktops. There are a number of effects
that can be shown when you switch from the different virtual desktops. The
menus, the borders and all other usual parts of a normal window manager are
animated as well as some of the widgets (the sliders, for example). Remember
that those effects are provided by the theme, so every theme makes E to look
different, with different effects, look and feel and animations.

As we already mentioned, E17 provides a file manager as well. Of the time of
writing, it is not completed and is in active development (as E17 as a whole
itself), but after it is finished it will be a very nice, configurable and eye
candy. Even right now, you can do the basic things with it ??? browse, copy,
move, delete files. It will provide thumbnails for your pictures and will be
able to open your files with the coresponding application of your choice.

E17 is highly configurable. Currently it has a nice configuration panel with
dialogs for all kinds of things. You can change your wallpaper or your theme,
your fonts, your screen resolution, your screen's power settings, your keyboard
and mouse settings, the language that Enlightenment talks to you, and so on.
You can contol almost every apsect of what E is doing and how. It will do what
you want it to do.

As you already know, Enlightenment 0.17 has lots of features, but one of the
most important is, that you can add and remove functionality by using modules.
Modules are small applications that extend E17. There can be modules tho show
you the weather outside, or calendar modules, or modules to control your volume
or whatever you may think. Developing a module is not that hard, so, if you
have programming skills, you are more than welcome to develop and maintain some
modules for the community.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       eet-devel evas-devel ecore-devel edje-devel e_dbus-devel
Requires:       pkgconfig efreet-devel

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
# strip out bundled vera font, it doesn't support national glyphs
rm -r data/fonts
sed -i \
  -e '\|CONFIG_FILES="\$CONFIG_FILES data/fonts/Makefile"|d' \
  -e 's|data/fonts/Makefile||' \
  configure #; chmod +x configure
sed -i -e 's|fonts||' data/Makefile.in
# remove font aliases to make edje fall back to default font (dejavu)
sed -i -e '\|\.ttf|d' data/{init,themes}/default.edc
# backport enlightenment.pc.in fix from trunk
sed -i -e 's|Libs:\ .*$|Libs: -L${libdir}|' enlightenment.pc.in


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
# config.h is used only while building E itself
sed -i -e '\|#include\ "config.h"|d' $RPM_BUILD_ROOT%{_includedir}/%{name}/e.h
find $RPM_BUILD_ROOT -name '*.la' -delete
# remove improperly placed docs
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/AUTHORS
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/COPYING
# remove enlightenment_sys which is broken anyway
rm -rf $RPM_BUILD_ROOT%{_bindir}/%{name}_sys
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sysactions.conf
%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING COPYING-PLAIN README
%{_bindir}/%{name}
%{_bindir}/%{name}_*
%{_libdir}/%{name}
%{_datadir}/%{name}
%{_datadir}/xsessions/%{name}.desktop


%files devel
%defattr(-,root,root,-)
# originally improperly placed docs
%doc doc/*.txt doc/*.html doc/*.png
%{_bindir}/%{name}-config
%{_includedir}/%{name}
%{_libdir}/pkgconfig/%{name}.pc


%changelog
* Sat Aug 30 2008 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.16.999.043-3
- One more directory ownership fix
- Backported enlightenment.pc.in from trunk
- Strip unneeded config.h include from e.h

* Sat Jul 26 2008 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.16.999.043-2
- Added missing efreet-devel require to enlightenment-devel
- Removed broken enlightenment_sys
- Removed more improperly placed docs
- Fixed directory ownership

* Mon May 20 2008 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.16.999.043-1
- Initial specfile for Enlightenment


--- NEW FILE import.log ---
enlightenment-0_16_999_043-3_fc9:F-8:enlightenment-0.16.999.043-3.fc9.src.rpm:1220307480


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/enlightenment/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2008 21:13:47 -0000	1.1
+++ .cvsignore	1 Sep 2008 22:18:18 -0000	1.2
@@ -0,0 +1 @@
+enlightenment-0.16.999.043.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/enlightenment/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2008 21:13:47 -0000	1.1
+++ sources	1 Sep 2008 22:18:18 -0000	1.2
@@ -0,0 +1 @@
+6f502991ef3059772b290b85aadda108  enlightenment-0.16.999.043.tar.bz2



From mso at fedoraproject.org  Mon Sep  1 22:22:16 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Mon,  1 Sep 2008 22:22:16 +0000 (UTC)
Subject: rpms/echo-artist/devel echo-artist.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080901222216.84E6C7011A@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/echo-artist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26475/devel

Modified Files:
	.cvsignore sources 
Added Files:
	echo-artist.spec import.log 
Log Message:


Initial import of echo-artist package.




--- NEW FILE echo-artist.spec ---
Name:           echo-artist
Version:        0.1
Release:        2%{?dist}
Summary:        Automation tools for echo-icon-theme artists

Group:          Applications/Productivity
License:        LGPLv2+
URL:            https://fedorahosted.org/echo-icon-theme/
Source0:        https://fedorahosted.org/releases/e/c/echo-icon-theme/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       git
Requires:       icon-naming-utils
Requires:       inkscape
Requires:       ruby

%description
Set of scripts for echo-icon-theme artists useful for setting up and maitaining
their local git repository and creating and adding new icon sets to it.

%prep
%setup -q


%build


%install
rm -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_bindir}
%{__cp} --preserve=timestamps echo-add-icon %{buildroot}%{_bindir}/
%{__cp} --preserve=timestamps echo-new-icon %{buildroot}%{_bindir}/
%{__cp} --preserve=timestamps echo-set-up %{buildroot}%{_bindir}/
%{__cp} --preserve=timestamps echo-update %{buildroot}%{_bindir}/
%{__mkdir} -p %{buildroot}%{_datadir}/%{name}
%{__cp} --preserve=timestamps echo-one-canvas-template.svg %{buildroot}%{_datadir}/%{name}/


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING CREDITS
%{_bindir}/*
%{_datadir}/%{name}

%changelog
* Mon Sep 01 2008 Martin Sourada <mso at fedoraproject.org> - 0.1-2
- Use %%{buildroot} instead of $$RPM_BUILD_ROOT

* Fri Aug 29 2008 Martin Sourada <mso at fedoraproject.org> - 0.1-1
- Initial RPM


--- NEW FILE import.log ---
echo-artist-0_1-2_fc9:HEAD:echo-artist-0.1-2.fc9.src.rpm:1220307643


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/echo-artist/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2008 21:12:22 -0000	1.1
+++ .cvsignore	1 Sep 2008 22:21:46 -0000	1.2
@@ -0,0 +1 @@
+echo-artist-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/echo-artist/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2008 21:12:22 -0000	1.1
+++ sources	1 Sep 2008 22:21:46 -0000	1.2
@@ -0,0 +1 @@
+d690d9ee0efc3a343f8120bd15f8908f  echo-artist-0.1.tar.gz



From mso at fedoraproject.org  Mon Sep  1 22:26:45 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Mon,  1 Sep 2008 22:26:45 +0000 (UTC)
Subject: rpms/echo-artist/F-8 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20080901222645.068167011A@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/echo-artist/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27172/F-8

Modified Files:
	.cvsignore sources 
Log Message:


Initial import of echo-artist package.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/echo-artist/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2008 21:12:22 -0000	1.1
+++ .cvsignore	1 Sep 2008 22:26:14 -0000	1.2
@@ -0,0 +1 @@
+echo-artist-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/echo-artist/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2008 21:12:22 -0000	1.1
+++ sources	1 Sep 2008 22:26:14 -0000	1.2
@@ -0,0 +1 @@
+d690d9ee0efc3a343f8120bd15f8908f  echo-artist-0.1.tar.gz



From mso at fedoraproject.org  Mon Sep  1 22:26:45 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Mon,  1 Sep 2008 22:26:45 +0000 (UTC)
Subject: rpms/echo-artist/F-9 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20080901222645.21B857011A@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/echo-artist/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27172/F-9

Modified Files:
	.cvsignore sources 
Log Message:


Initial import of echo-artist package.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/echo-artist/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2008 21:12:22 -0000	1.1
+++ .cvsignore	1 Sep 2008 22:26:14 -0000	1.2
@@ -0,0 +1 @@
+echo-artist-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/echo-artist/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2008 21:12:22 -0000	1.1
+++ sources	1 Sep 2008 22:26:14 -0000	1.2
@@ -0,0 +1 @@
+d690d9ee0efc3a343f8120bd15f8908f  echo-artist-0.1.tar.gz



From kkofler at fedoraproject.org  Mon Sep  1 22:28:11 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon,  1 Sep 2008 22:28:11 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.122,1.123
Message-ID: <20080901222811.589737011A@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Mon Sep 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
- show KCM icon in rootprivs patch (thanks to Harald Sitter "apachelogger")


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- kdebase-workspace.spec	29 Aug 2008 13:42:05 -0000	1.122
+++ kdebase-workspace.spec	1 Sep 2008 22:27:41 -0000	1.123
@@ -4,7 +4,7 @@
 Name: kdebase-workspace
 Version: 4.1.1
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -309,6 +309,9 @@
 
 
 %changelog
+* Mon Sep 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
+- show KCM icon in rootprivs patch (thanks to Harald Sitter "apachelogger")
+
 * Thu Aug 28 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 



From pbrobinson at fedoraproject.org  Mon Sep  1 22:29:29 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  1 Sep 2008 22:29:29 +0000 (UTC)
Subject: rpms/tangogps/devel import.log, NONE, 1.1 tangogps.desktop, NONE,
	1.1 tangogps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080901222929.44E257011A@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tangogps.desktop tangogps.spec 
Log Message:
- Initial cvs commit



--- NEW FILE import.log ---
tangogps-0_9_3-3_fc9:HEAD:tangogps-0.9.3-3.fc9.src.rpm:1220311653


--- NEW FILE tangogps.desktop ---
[Desktop Entry]
Name=GPS & Map
Comment=Display map and GPS position
Version=1.0
Type=Application
Exec=tangogps
Icon=tangogps
Terminal=false
Categories=Network;
StartupNotify=true


--- NEW FILE tangogps.spec ---
Name:           tangogps
Version:        0.9.3
Release:        3%{?dist}
Summary:        GTK+ mapping and GPS application

Group:          Applications/Productivity
License:        GPLv2
URL:            http://www.tangogps.org/
Source0:        http://www.tangogps.org/downloads/%{name}-%{version}.tar.gz
Source1:        tangogps.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: libcurl-devel
BuildRequires: gtk2-devel
BuildRequires: GConf2-devel
BuildRequires: dbus-devel
BuildRequires: sqlite-devel
BuildRequires: gettext
BuildRequires: desktop-file-utils

Requires: dbus
Requires: gpsd

%description
tangoGPS is a lightweight and fast mapping application. It runs on handheld 
devices like the Openmoko Neo1973 as well as on the eeePC and the Linux 
desktop. By default is uses map data from the OpenStreetMap.org project; 
additionally a variety of other repositories can easily be added.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor="fedora" \
--dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
rm -rf %{buildroot}%{_datadir}/applications/tangogps.desktop

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/tangogps
%{_datadir}/applications/fedora-tangogps.desktop
%{_datadir}/pixmaps/tangogps.png
%{_datadir}/pixmaps/tangogps-*.png

%changelog
* Mon Sep 1 2008 Peter Robinson <pbrobinson at gmail.com> 0.9.3-3
- Cleanups from package review

* Fri Aug 29 2008 Peter Robinson <pbrobinson at gmail.com> 0.9.3-2
- Spec fixes

* Tue Aug 26 2008 Peter Robinson <pbrobinson at gmail.com> 0.9.3-1
- New release

* Mon Jul 7 2008 Peter Robinson <pbrobinson at gmail.com> 0.9.2-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2008 21:16:04 -0000	1.1
+++ .cvsignore	1 Sep 2008 22:28:59 -0000	1.2
@@ -0,0 +1 @@
+tangogps-0.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2008 21:16:04 -0000	1.1
+++ sources	1 Sep 2008 22:28:59 -0000	1.2
@@ -0,0 +1 @@
+4e6e4c1a5c1ee2e6026454083de3d5d5  tangogps-0.9.3.tar.gz



From mso at fedoraproject.org  Mon Sep  1 22:29:33 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Mon,  1 Sep 2008 22:29:33 +0000 (UTC)
Subject: rpms/echo-artist/F-9 echo-artist.spec,NONE,1.1
Message-ID: <20080901222933.DDBA57011A@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/echo-artist/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28043/F-9

Added Files:
	echo-artist.spec 
Log Message:


Don't forget .spec file.




--- NEW FILE echo-artist.spec ---
Name:           echo-artist
Version:        0.1
Release:        2%{?dist}
Summary:        Automation tools for echo-icon-theme artists

Group:          Applications/Productivity
License:        LGPLv2+
URL:            https://fedorahosted.org/echo-icon-theme/
Source0:        https://fedorahosted.org/releases/e/c/echo-icon-theme/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       git
Requires:       icon-naming-utils
Requires:       inkscape
Requires:       ruby

%description
Set of scripts for echo-icon-theme artists useful for setting up and maitaining
their local git repository and creating and adding new icon sets to it.

%prep
%setup -q


%build


%install
rm -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_bindir}
%{__cp} --preserve=timestamps echo-add-icon %{buildroot}%{_bindir}/
%{__cp} --preserve=timestamps echo-new-icon %{buildroot}%{_bindir}/
%{__cp} --preserve=timestamps echo-set-up %{buildroot}%{_bindir}/
%{__cp} --preserve=timestamps echo-update %{buildroot}%{_bindir}/
%{__mkdir} -p %{buildroot}%{_datadir}/%{name}
%{__cp} --preserve=timestamps echo-one-canvas-template.svg %{buildroot}%{_datadir}/%{name}/


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING CREDITS
%{_bindir}/*
%{_datadir}/%{name}

%changelog
* Mon Sep 01 2008 Martin Sourada <mso at fedoraproject.org> - 0.1-2
- Use %%{buildroot} instead of $$RPM_BUILD_ROOT

* Fri Aug 29 2008 Martin Sourada <mso at fedoraproject.org> - 0.1-1
- Initial RPM



From mso at fedoraproject.org  Mon Sep  1 22:29:33 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Mon,  1 Sep 2008 22:29:33 +0000 (UTC)
Subject: rpms/echo-artist/F-8 echo-artist.spec,NONE,1.1
Message-ID: <20080901222933.A93AB7011A@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/echo-artist/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28043/F-8

Added Files:
	echo-artist.spec 
Log Message:


Don't forget .spec file.




--- NEW FILE echo-artist.spec ---
Name:           echo-artist
Version:        0.1
Release:        2%{?dist}
Summary:        Automation tools for echo-icon-theme artists

Group:          Applications/Productivity
License:        LGPLv2+
URL:            https://fedorahosted.org/echo-icon-theme/
Source0:        https://fedorahosted.org/releases/e/c/echo-icon-theme/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       git
Requires:       icon-naming-utils
Requires:       inkscape
Requires:       ruby

%description
Set of scripts for echo-icon-theme artists useful for setting up and maitaining
their local git repository and creating and adding new icon sets to it.

%prep
%setup -q


%build


%install
rm -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_bindir}
%{__cp} --preserve=timestamps echo-add-icon %{buildroot}%{_bindir}/
%{__cp} --preserve=timestamps echo-new-icon %{buildroot}%{_bindir}/
%{__cp} --preserve=timestamps echo-set-up %{buildroot}%{_bindir}/
%{__cp} --preserve=timestamps echo-update %{buildroot}%{_bindir}/
%{__mkdir} -p %{buildroot}%{_datadir}/%{name}
%{__cp} --preserve=timestamps echo-one-canvas-template.svg %{buildroot}%{_datadir}/%{name}/


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING CREDITS
%{_bindir}/*
%{_datadir}/%{name}

%changelog
* Mon Sep 01 2008 Martin Sourada <mso at fedoraproject.org> - 0.1-2
- Use %%{buildroot} instead of $$RPM_BUILD_ROOT

* Fri Aug 29 2008 Martin Sourada <mso at fedoraproject.org> - 0.1-1
- Initial RPM



From pbrobinson at fedoraproject.org  Mon Sep  1 22:36:41 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  1 Sep 2008 22:36:41 +0000 (UTC)
Subject: rpms/tangogps/F-9 import.log, NONE, 1.1 tangogps.desktop, NONE,
	1.1 tangogps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080901223641.557C77011A@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tangogps.desktop tangogps.spec 
Log Message:
- Initial cvs import



--- NEW FILE import.log ---
tangogps-0_9_3-3_fc9:F-9:tangogps-0.9.3-3.fc9.src.rpm:1220308469


--- NEW FILE tangogps.desktop ---
[Desktop Entry]
Name=GPS & Map
Comment=Display map and GPS position
Version=1.0
Type=Application
Exec=tangogps
Icon=tangogps
Terminal=false
Categories=Network;
StartupNotify=true


--- NEW FILE tangogps.spec ---
Name:           tangogps
Version:        0.9.3
Release:        3%{?dist}
Summary:        GTK+ mapping and GPS application

Group:          Applications/Productivity
License:        GPLv2
URL:            http://www.tangogps.org/
Source0:        http://www.tangogps.org/downloads/%{name}-%{version}.tar.gz
Source1:        tangogps.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: libcurl-devel
BuildRequires: gtk2-devel
BuildRequires: GConf2-devel
BuildRequires: dbus-devel
BuildRequires: sqlite-devel
BuildRequires: gettext
BuildRequires: desktop-file-utils

Requires: dbus
Requires: gpsd

%description
tangoGPS is a lightweight and fast mapping application. It runs on handheld 
devices like the Openmoko Neo1973 as well as on the eeePC and the Linux 
desktop. By default is uses map data from the OpenStreetMap.org project; 
additionally a variety of other repositories can easily be added.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor="fedora" \
--dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
rm -rf %{buildroot}%{_datadir}/applications/tangogps.desktop

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/tangogps
%{_datadir}/applications/fedora-tangogps.desktop
%{_datadir}/pixmaps/tangogps.png
%{_datadir}/pixmaps/tangogps-*.png

%changelog
* Mon Sep 1 2008 Peter Robinson <pbrobinson at gmail.com> 0.9.3-3
- Cleanups from package review

* Fri Aug 29 2008 Peter Robinson <pbrobinson at gmail.com> 0.9.3-2
- Spec fixes

* Tue Aug 26 2008 Peter Robinson <pbrobinson at gmail.com> 0.9.3-1
- New release

* Mon Jul 7 2008 Peter Robinson <pbrobinson at gmail.com> 0.9.2-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2008 21:16:04 -0000	1.1
+++ .cvsignore	1 Sep 2008 22:36:09 -0000	1.2
@@ -0,0 +1 @@
+tangogps-0.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2008 21:16:04 -0000	1.1
+++ sources	1 Sep 2008 22:36:11 -0000	1.2
@@ -0,0 +1 @@
+4e6e4c1a5c1ee2e6026454083de3d5d5  tangogps-0.9.3.tar.gz



From salimma at fedoraproject.org  Mon Sep  1 22:39:40 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon,  1 Sep 2008 22:39:40 +0000 (UTC)
Subject: rpms/python-storm/F-8 python-storm.spec,1.1,1.2
Message-ID: <20080901223940.08B777011A@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-storm/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29655/F-8

Modified Files:
	python-storm.spec 
Log Message:
* Mon Sep  1 2008 Michel Salim <salimma at fedoraproject.org> - 0.13-2
- Add build dependency on python-sqlite2, for unit testing



Index: python-storm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/F-8/python-storm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-storm.spec	31 Aug 2008 03:55:42 -0000	1.1
+++ python-storm.spec	1 Sep 2008 22:39:09 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           python-storm
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An object-relational mapper (ORM) for Python
 
 Group:          Development/Languages
@@ -14,6 +14,8 @@
 # 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
@@ -120,6 +122,9 @@
 
 
 %changelog
+* Mon Sep  1 2008 Michel Salim <salimma at fedoraproject.org> - 0.13-2
+- Add build dependency on python-sqlite2, for unit testing
+
 * Sat Aug 30 2008 Michel Salim <salimma at fedoraproject.org> - 0.13-1
 - Update to 0.13
 



From salimma at fedoraproject.org  Mon Sep  1 22:39:40 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon,  1 Sep 2008 22:39:40 +0000 (UTC)
Subject: rpms/python-storm/F-9 python-storm.spec,1.1,1.2
Message-ID: <20080901223940.293927011A@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-storm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29655/F-9

Modified Files:
	python-storm.spec 
Log Message:
* Mon Sep  1 2008 Michel Salim <salimma at fedoraproject.org> - 0.13-2
- Add build dependency on python-sqlite2, for unit testing



Index: python-storm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/F-9/python-storm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-storm.spec	31 Aug 2008 03:55:42 -0000	1.1
+++ python-storm.spec	1 Sep 2008 22:39:09 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           python-storm
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An object-relational mapper (ORM) for Python
 
 Group:          Development/Languages
@@ -14,6 +14,8 @@
 # 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
@@ -120,6 +122,9 @@
 
 
 %changelog
+* Mon Sep  1 2008 Michel Salim <salimma at fedoraproject.org> - 0.13-2
+- Add build dependency on python-sqlite2, for unit testing
+
 * Sat Aug 30 2008 Michel Salim <salimma at fedoraproject.org> - 0.13-1
 - Update to 0.13
 



From salimma at fedoraproject.org  Mon Sep  1 22:39:40 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon,  1 Sep 2008 22:39:40 +0000 (UTC)
Subject: rpms/python-storm/devel python-storm.spec,1.1,1.2
Message-ID: <20080901223940.5ADBD7011A@cvs1.fedora.phx.redhat.com>

Author: salimma

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

Modified Files:
	python-storm.spec 
Log Message:
* Mon Sep  1 2008 Michel Salim <salimma at fedoraproject.org> - 0.13-2
- Add build dependency on python-sqlite2, for unit testing



Index: python-storm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/devel/python-storm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-storm.spec	31 Aug 2008 03:55:42 -0000	1.1
+++ python-storm.spec	1 Sep 2008 22:39:10 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           python-storm
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An object-relational mapper (ORM) for Python
 
 Group:          Development/Languages
@@ -14,6 +14,8 @@
 # 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
@@ -120,6 +122,9 @@
 
 
 %changelog
+* Mon Sep  1 2008 Michel Salim <salimma at fedoraproject.org> - 0.13-2
+- Add build dependency on python-sqlite2, for unit testing
+
 * Sat Aug 30 2008 Michel Salim <salimma at fedoraproject.org> - 0.13-1
 - Update to 0.13
 



From pbrobinson at fedoraproject.org  Mon Sep  1 22:53:31 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  1 Sep 2008 22:53:31 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.83,1.84
Message-ID: <20080901225331.4A9487011A@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	comps-f10.xml.in 
Log Message:
- Add tangoGPS



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- comps-f10.xml.in	1 Sep 2008 05:27:22 -0000	1.83
+++ comps-f10.xml.in	1 Sep 2008 22:53:00 -0000	1.84
@@ -2083,6 +2083,7 @@
       <packagereq type="optional">streamtuner</packagereq>
       <packagereq type="optional">swfdec-mozilla</packagereq>
       <packagereq type="optional">sylpheed</packagereq>
+      <packagereq type="optional">tangogps</packagereq>
       <packagereq type="optional">thunderbird</packagereq>
       <packagereq type="optional">twinkle</packagereq>
       <packagereq type="optional">urlgfe</packagereq>



From toshio at fedoraproject.org  Mon Sep  1 23:00:46 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon,  1 Sep 2008 23:00:46 +0000 (UTC)
Subject: rpms/python-toscawidgets/F-9 .cvsignore, 1.4,
	1.5 python-toscawidgets.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20080901230046.65BA07011A@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-toscawidgets/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32438

Modified Files:
	.cvsignore python-toscawidgets.spec sources 
Log Message:

* Tue Aug 26 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.9.3-1
- New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-toscawidgets/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Jul 2008 16:38:48 -0000	1.4
+++ .cvsignore	1 Sep 2008 23:00:15 -0000	1.5
@@ -1 +1 @@
-ToscaWidgets-0.9.2.tar.gz
+ToscaWidgets-0.9.3.tar.gz


Index: python-toscawidgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-toscawidgets/F-9/python-toscawidgets.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-toscawidgets.spec	27 Jul 2008 21:08:52 -0000	1.4
+++ python-toscawidgets.spec	1 Sep 2008 23:00:16 -0000	1.5
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Tue Aug 26 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.9.3-1
+- New upstream.
+
 * Sun Jul 27 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.9.2-2
 - Require python-webob
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-toscawidgets/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Jul 2008 16:38:48 -0000	1.4
+++ sources	1 Sep 2008 23:00:16 -0000	1.5
@@ -1 +1 @@
-94de025438868267d895dfa84350cc9c  ToscaWidgets-0.9.2.tar.gz
+8b7ab6572e5487cc3609b2e097fadcf3  ToscaWidgets-0.9.3.tar.gz



From timn at fedoraproject.org  Mon Sep  1 23:27:36 2008
From: timn at fedoraproject.org (Tim Niemueller)
Date: Mon,  1 Sep 2008 23:27:36 +0000 (UTC)
Subject: rpms/player/F-8 player.spec,1.3,1.4
Message-ID: <20080901232736.2AB9F7011A@cvs1.fedora.phx.redhat.com>

Author: timn

Update of /cvs/pkgs/rpms/player/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2986

Modified Files:
	player.spec 
Log Message:
Use autotools for preparation, required because of patches for .am files

Tim



Index: player.spec
===================================================================
RCS file: /cvs/pkgs/rpms/player/F-8/player.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- player.spec	1 Sep 2008 00:06:57 -0000	1.3
+++ player.spec	1 Sep 2008 23:27:05 -0000	1.4
@@ -17,8 +17,8 @@
 Patch2:         %{name}-2.1.0rc2-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libtool
-BuildRequires:  libtool-ltdl-devel
+BuildRequires:  autoconf, automake
+BuildRequires:  libtool, libtool-ltdl-devel
 %if 0%{?fedora} <= 9
 BuildRequires:  geos-devel
 %endif
@@ -38,7 +38,7 @@
 BuildRequires:  avahi-compat-howl-devel
 BuildRequires:  zlib-devel
 BuildRequires:  doxygen, graphviz
-BuildRequires: desktop-file-utils
+BuildRequires:  desktop-file-utils
 
 %description
 Player is a network server for robot control. Running on your robot, Player
@@ -103,6 +103,9 @@
 
 
 %build
+# Required because patches modify .am files
+aclocal
+autoreconf
 # Broken: --enable-alsa --enable-sonartoranger --enable-lasertoranger
 find ./ -name '*.c' -exec chmod a-x {} \;
 find ./ -name '*.cc' -exec chmod a-x {} \;
@@ -188,6 +191,7 @@
 * Fri Aug 15 2008 Tim Niemueller <tim at niemueller.de> - 2.1.1-4
 - Changed norpath patch, fixes build problem on Fedora 8
 - Added libtool BR
+- Added autotools BR, needed because for patches of .am files
 
 * Mon Aug 08 2008 Jef Spaleta <jspaleta at fedoraproject dot org> - 2.1.1-3
 - Review clean-ups



From toshio at fedoraproject.org  Mon Sep  1 23:53:38 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon,  1 Sep 2008 23:53:38 +0000 (UTC)
Subject: rpms/python-toscawidgets/F-9 python-toscawidgets.spec,1.5,1.6
Message-ID: <20080901235338.E976B7011F@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-toscawidgets/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6064

Modified Files:
	python-toscawidgets.spec 
Log Message:
And the spec file.



Index: python-toscawidgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-toscawidgets/F-9/python-toscawidgets.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-toscawidgets.spec	1 Sep 2008 23:00:16 -0000	1.5
+++ python-toscawidgets.spec	1 Sep 2008 23:53:08 -0000	1.6
@@ -4,8 +4,8 @@
 %define srcname ToscaWidgets
 
 Name:           python-toscawidgets
-Version:        0.9.2
-Release:        2%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        Toolkit to help create widgets for WSGI web apps
 Group:          Development/Languages
 License:        MIT



From bpepple at fedoraproject.org  Tue Sep  2 00:16:41 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  2 Sep 2008 00:16:41 +0000 (UTC)
Subject: rpms/freeciv/F-9 .cvsignore, 1.18, 1.19 freeciv.spec, 1.39,
	1.40 sources, 1.18, 1.19
Message-ID: <20080902001641.4B6947011D@cvs1.fedora.phx.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore freeciv.spec sources 
Log Message:
* Mon Sep  1 2008 Brian Pepple <bpepple at fedoraproject.org> - 2.1.6-1
- Update to 2.1.6. (#456805)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/F-9/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	20 Jun 2008 00:34:55 -0000	1.18
+++ .cvsignore	2 Sep 2008 00:16:10 -0000	1.19
@@ -1 +1 @@
-freeciv-2.1.5.tar.bz2
+freeciv-2.1.6.tar.bz2


Index: freeciv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/F-9/freeciv.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- freeciv.spec	20 Jun 2008 00:34:55 -0000	1.39
+++ freeciv.spec	2 Sep 2008 00:16:11 -0000	1.40
@@ -4,7 +4,7 @@
 %{!?_ggz_datadir:%define _ggz_datadir %(%{_ggz_config} --datadir >& /dev/null ||:)}
 
 Name:           freeciv
-Version:        2.1.5
+Version:        2.1.6
 Release:        1%{?dist}
 Summary:        The Freeciv multi-player strategy game
 
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Mon Sep  1 2008 Brian Pepple <bpepple at fedoraproject.org> - 2.1.6-1
+- Update to 2.1.6. (#456805)
+
 * Thu Jun 19 2008 Brian Pepple <bpepple at fedoraproject.org> - 2.1.5-1
 - Update to 2.1.5.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	20 Jun 2008 00:34:55 -0000	1.18
+++ sources	2 Sep 2008 00:16:11 -0000	1.19
@@ -1 +1 @@
-1845f51077569e4033a7125910462184  freeciv-2.1.5.tar.bz2
+377a44273cdd0c2cab4e1c0a457fc7c7  freeciv-2.1.6.tar.bz2



From tgl at fedoraproject.org  Tue Sep  2 00:19:37 2008
From: tgl at fedoraproject.org (Tom Lane)
Date: Tue,  2 Sep 2008 00:19:37 +0000 (UTC)
Subject: rpms/libdbi-drivers/devel libdbi-drivers-error-handler.patch, NONE, 
	1.1 libdbi-drivers.spec, 1.14, 1.15
Message-ID: <20080902001938.010977011D@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/libdbi-drivers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9122

Modified Files:
	libdbi-drivers.spec 
Added Files:
	libdbi-drivers-error-handler.patch 
Log Message:
Fix bug #460734.

libdbi-drivers-error-handler.patch:

--- NEW FILE libdbi-drivers-error-handler.patch ---
Fix bug #460734.


diff -Naur libdbi-drivers-0.8.3/drivers/sqlite3/dbd_sqlite3.c libdbi-drivers-0.8.3-1/drivers/sqlite3/dbd_sqlite3.c
--- libdbi-drivers-0.8.3/drivers/sqlite3/dbd_sqlite3.c	2008-01-15 09:07:24.000000000 -0500
+++ libdbi-drivers-0.8.3-1/drivers/sqlite3/dbd_sqlite3.c	2008-03-03 12:32:26.000000000 -0500
@@ -731,7 +731,7 @@
 				      &errmsg);
 
   if (query_res || !table_numrows) {
-    _dbi_internal_error_handler(conn, NULL, DBI_ERROR_BADNAME);
+    _dbd_internal_error_handler(conn, NULL, DBI_ERROR_BADNAME);
     /*       printf("field not found\n"); */
     return 0;
   }


Index: libdbi-drivers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdbi-drivers/devel/libdbi-drivers.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libdbi-drivers.spec	11 Feb 2008 20:56:56 -0000	1.14
+++ libdbi-drivers.spec	2 Sep 2008 00:19:07 -0000	1.15
@@ -1,13 +1,14 @@
 Summary: Database-specific drivers for libdbi
 Name: libdbi-drivers
 Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Libraries
 License: LGPLv2+
 URL: http://libdbi-drivers.sourceforge.net/
 
 Source: http://prdownloads.sourceforge.net/libdbi-drivers/%{name}-%{version}.tar.gz
 Patch1: libdbi-drivers-cflags.patch
+Patch2: libdbi-drivers-error-handler.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: libdbi >= 0.8
@@ -66,6 +67,7 @@
 %setup -q -n %{name}-%{version}
 
 %patch1 -p1
+%patch2 -p1
 
 autoconf
 
@@ -120,6 +122,12 @@
 %{_libdir}/dbd/libdbdsqlite3.*
 
 %changelog
+* Mon Sep  1 2008 Tom Lane <tgl at redhat.com> 0.8.3-2
+- Fix mistaken external reference in libdbdsqlite3.so.  (I'm applying this
+  as a patch, rather than updating to upstream's 0.8.3-1, because that isn't
+  acceptable as an RPM Version tag.)
+Resolves: #460734
+
 * Mon Feb 11 2008 Tom Lane <tgl at redhat.com> 0.8.3-1
 - Update to version 0.8.3.
 - Code is now all licensed LGPLv2+, so adjust License tags.



From jkratoch at fedoraproject.org  Tue Sep  2 00:31:01 2008
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Tue,  2 Sep 2008 00:31:01 +0000 (UTC)
Subject: rpms/gdb/F-9 gdb-6.3-pie-20050110.patch, 1.9, 1.10 gdb.spec, 1.296, 
	1.297
Message-ID: <20080902003101.CD8117011D@cvs1.fedora.phx.redhat.com>

Author: jkratoch

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

Modified Files:
	gdb-6.3-pie-20050110.patch gdb.spec 
Log Message:
* Tue Sep  2 2008 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8-22
- Fix PIE patch regression for loading binaries from valgrind (BZ 460319).


gdb-6.3-pie-20050110.patch:

Index: gdb-6.3-pie-20050110.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-9/gdb-6.3-pie-20050110.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gdb-6.3-pie-20050110.patch	1 Jun 2008 13:15:47 -0000	1.9
+++ gdb-6.3-pie-20050110.patch	2 Sep 2008 00:31:01 -0000	1.10
@@ -22,23 +22,127 @@
 
 	Fix crash on a watchpoint update on an inferior stop.
 
-Index: gdb-6.8/gdb/dwarf2read.c
-===================================================================
---- gdb-6.8.orig/gdb/dwarf2read.c	2008-04-19 21:38:32.000000000 +0200
-+++ gdb-6.8/gdb/dwarf2read.c	2008-04-19 21:38:33.000000000 +0200
-@@ -1221,7 +1221,7 @@ dwarf2_build_psymtabs (struct objfile *o
-   else
-     dwarf2_per_objfile->loc_buffer = NULL;
+2008-09-01  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	Fix scan_dyntag() for binaries provided by valgrind (BZ 460319).
+
+--- ./gdb/Makefile.in	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/Makefile.in	2008-08-30 23:40:33.000000000 +0200
+@@ -1928,7 +1928,7 @@ amd64-tdep.o: amd64-tdep.c $(defs_h) $(a
+ 	$(dummy_frame_h) $(frame_h) $(frame_base_h) $(frame_unwind_h) \
+ 	$(inferior_h) $(gdbcmd_h) $(gdbcore_h) $(objfiles_h) $(regcache_h) \
+ 	$(regset_h) $(symfile_h) $(gdb_assert_h) $(amd64_tdep_h) \
+-	$(i387_tdep_h)
++	$(i387_tdep_h) $(exceptions_h)
+ annotate.o: annotate.c $(defs_h) $(annotate_h) $(value_h) $(target_h) \
+ 	$(gdbtypes_h) $(breakpoint_h)
+ arch-utils.o: arch-utils.c $(defs_h) $(arch_utils_h) $(buildsym_h) \
+--- ./gdb/amd64-tdep.c	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/amd64-tdep.c	2008-08-30 23:40:33.000000000 +0200
+@@ -36,6 +36,7 @@
+ #include "symfile.h"
+ #include "dwarf2-frame.h"
+ #include "gdb_assert.h"
++#include "exceptions.h"
  
--  if (mainline
-+  if ((mainline == 1)
-       || (objfile->global_psymbols.size == 0
- 	  && objfile->static_psymbols.size == 0))
-     {
-Index: gdb-6.8/gdb/auxv.c
-===================================================================
---- gdb-6.8.orig/gdb/auxv.c	2008-01-16 17:27:37.000000000 +0100
-+++ gdb-6.8/gdb/auxv.c	2008-04-19 21:38:33.000000000 +0200
+ #include "amd64-tdep.h"
+ #include "i387-tdep.h"
+@@ -731,16 +732,28 @@ amd64_alloc_frame_cache (void)
+    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,
+-			struct amd64_frame_cache *cache)
++struct amd64_analyze_prologue_data
++  {
++    CORE_ADDR pc, current_pc;
++    struct amd64_frame_cache *cache;
++    CORE_ADDR retval;
++  };
++
++static int
++amd64_analyze_prologue_1 (void *data_pointer)
+ {
++  struct amd64_analyze_prologue_data *data = data_pointer;
++  CORE_ADDR pc = data->pc, current_pc = data->current_pc;
++  struct amd64_frame_cache *cache = data->cache;
+   static gdb_byte proto[3] = { 0x48, 0x89, 0xe5 }; /* movq %rsp, %rbp */
+   gdb_byte buf[3];
+   gdb_byte op;
+ 
+   if (current_pc <= pc)
+-    return current_pc;
++    {
++      data->retval = current_pc;
++      return 1;
++    }
+ 
+   op = read_memory_unsigned_integer (pc, 1);
+ 
+@@ -753,18 +766,57 @@ amd64_analyze_prologue (CORE_ADDR pc, CO
+ 
+       /* If that's all, return now.  */
+       if (current_pc <= pc + 1)
+-        return current_pc;
++        {
++	  data->retval = current_pc;
++	  return 1;
++        }
+ 
+       /* Check for `movq %rsp, %rbp'.  */
+       read_memory (pc + 1, buf, 3);
+       if (memcmp (buf, proto, 3) != 0)
+-	return pc + 1;
++	{
++	  data->retval = pc + 1;
++	  return 1;
++	}
+ 
+       /* OK, we actually have a frame.  */
+       cache->frameless_p = 0;
+-      return pc + 4;
++      data->retval = pc + 4;
++      return 1;
+     }
+ 
++  data->retval = pc;
++  return 1;
++}
++
++/* Catch memory read errors and return just PC in such case.
++   It occurs very early on enable_break->new_symfile_objfile->
++   ->breakpoint_re_set->decode_line_1->decode_variable_1->
++   ->find_function_start_sal  */
++
++static CORE_ADDR
++amd64_analyze_prologue (CORE_ADDR pc, CORE_ADDR current_pc,
++			struct amd64_frame_cache *cache)
++{
++  int status;
++  struct amd64_analyze_prologue_data data;
++  struct ui_file *saved_gdb_stderr;
++
++  /* Suppress error messages.  */
++  saved_gdb_stderr = gdb_stderr;
++  gdb_stderr = ui_file_new ();
++
++  data.pc = pc;
++  data.current_pc = current_pc;
++  data.cache = cache;
++  status = catch_errors (amd64_analyze_prologue_1, &data, "", RETURN_MASK_ALL);
++
++  /* Stop suppressing error messages.  */
++  ui_file_delete (gdb_stderr);
++  gdb_stderr = saved_gdb_stderr;
++
++  if (status)
++    return data.retval;
+   return pc;
+ }
+ 
+--- ./gdb/auxv.c	2008-01-16 17:27:37.000000000 +0100
++++ ./gdb/auxv.c	2008-08-30 23:40:33.000000000 +0200
 @@ -80,7 +80,7 @@ procfs_xfer_auxv (struct target_ops *ops
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  int
@@ -110,10 +214,8 @@
        switch (flavor)
  	{
  	case dec:
-Index: gdb-6.8/gdb/auxv.h
-===================================================================
---- gdb-6.8.orig/gdb/auxv.h	2008-01-01 23:53:09.000000000 +0100
-+++ gdb-6.8/gdb/auxv.h	2008-04-19 21:38:33.000000000 +0200
+--- ./gdb/auxv.h	2008-01-01 23:53:09.000000000 +0100
++++ ./gdb/auxv.h	2008-08-30 23:40:33.000000000 +0200
 @@ -35,14 +35,14 @@ struct target_ops;		/* Forward declarati
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  extern int target_auxv_parse (struct target_ops *ops,
@@ -131,10 +233,83 @@
  
  /* 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/gdb/breakpoint.h
-===================================================================
---- gdb-6.8.orig/gdb/breakpoint.h	2008-04-19 21:38:33.000000000 +0200
-+++ gdb-6.8/gdb/breakpoint.h	2008-04-19 21:38:33.000000000 +0200
+--- ./gdb/breakpoint.c	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/breakpoint.c	2008-08-30 23:40:33.000000000 +0200
+@@ -3971,7 +3971,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)"
+@@ -4623,6 +4624,62 @@ disable_breakpoints_in_unloaded_shlib (s
+   }
+ }
+ 
++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->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,
+ 				    enum bptype bp_kind)
+--- ./gdb/breakpoint.h	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/breakpoint.h	2008-08-30 23:40:33.000000000 +0200
 @@ -144,6 +144,7 @@ enum enable_state
  			   automatically enabled and reset when the call 
  			   "lands" (either completes, or stops at another 
@@ -154,24 +329,31 @@
  /* This function returns TRUE if ep is a catchpoint. */
  extern int ep_is_catchpoint (struct breakpoint *);
  
-Index: gdb-6.8/gdb/symfile-mem.c
-===================================================================
---- gdb-6.8.orig/gdb/symfile-mem.c	2008-04-19 21:38:27.000000000 +0200
-+++ gdb-6.8/gdb/symfile-mem.c	2008-04-19 21:38:33.000000000 +0200
-@@ -116,7 +116,7 @@ symbol_file_add_from_memory (struct bfd 
-       }
- 
-   objf = symbol_file_add_from_bfd (nbfd, from_tty,
--                                   sai, 0, OBJF_SHARED);
-+                                   sai, 2, OBJF_SHARED);
+--- ./gdb/dwarf2read.c	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/dwarf2read.c	2008-08-30 23:40:33.000000000 +0200
+@@ -1222,7 +1222,7 @@ dwarf2_build_psymtabs (struct objfile *o
+   else
+     dwarf2_per_objfile->loc_buffer = NULL;
  
-   /* This might change our ideas about frames already looked at.  */
-   reinit_frame_cache ();
-Index: gdb-6.8/gdb/infrun.c
-===================================================================
---- gdb-6.8.orig/gdb/infrun.c	2008-04-19 21:38:29.000000000 +0200
-+++ gdb-6.8/gdb/infrun.c	2008-04-19 21:38:33.000000000 +0200
-@@ -2277,6 +2277,11 @@ process_event_stop_test:
+-  if (mainline
++  if ((mainline == 1)
+       || (objfile->global_psymbols.size == 0
+ 	  && objfile->static_psymbols.size == 0))
+     {
+--- ./gdb/elfread.c	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/elfread.c	2008-08-30 23:40:33.000000000 +0200
+@@ -673,7 +673,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. */
+-  if (mainline)
++  if (mainline == 1)
+     {
+       init_psymbol_list (objfile, 0);
+       mainline = 0;
+--- ./gdb/infrun.c	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/infrun.c	2008-08-30 23:40:33.000000000 +0200
+@@ -2314,6 +2314,11 @@ process_event_stop_test:
  #endif
  	  target_terminal_inferior ();
  
@@ -183,10 +365,8 @@
  	  /* 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/gdb/objfiles.c
-===================================================================
---- gdb-6.8.orig/gdb/objfiles.c	2008-01-01 23:53:12.000000000 +0100
-+++ gdb-6.8/gdb/objfiles.c	2008-04-19 21:38:33.000000000 +0200
+--- ./gdb/objfiles.c	2008-01-01 23:53:12.000000000 +0100
++++ ./gdb/objfiles.c	2008-08-30 23:40:33.000000000 +0200
 @@ -49,6 +49,9 @@
  #include "source.h"
  #include "addrmap.h"
@@ -218,10 +398,8 @@
  }
  
  /* Create the terminating entry of OBJFILE's minimal symbol table.
-Index: gdb-6.8/gdb/solib-svr4.c
-===================================================================
---- gdb-6.8.orig/gdb/solib-svr4.c	2008-04-19 21:38:30.000000000 +0200
-+++ gdb-6.8/gdb/solib-svr4.c	2008-04-19 21:34:42.000000000 +0200
+--- ./gdb/solib-svr4.c	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/solib-svr4.c	2008-09-01 17:12:31.000000000 +0200
 @@ -31,6 +31,8 @@
  #include "gdbcore.h"
  #include "target.h"
@@ -245,7 +423,7 @@
    int arch_size, step, sect_size;
    long dyn_tag;
    CORE_ADDR dyn_ptr, dyn_addr;
-+  CORE_ADDR entry_addr;
++  CORE_ADDR reloc_addr = 0;
    gdb_byte *bufend, *bufstart, *buf;
    Elf32_External_Dyn *x_dynp_32;
    Elf64_External_Dyn *x_dynp_64;
@@ -254,7 +432,7 @@
  
    if (abfd == NULL)
      return 0;
-@@ -360,19 +366,74 @@ scan_dyntag (int dyntag, bfd *abfd, CORE
+@@ -360,19 +366,81 @@ scan_dyntag (int dyntag, bfd *abfd, CORE
    if (arch_size == -1)
     return 0;
  
@@ -264,6 +442,8 @@
 +
 +  if (ptr != NULL)
 +    {
++      CORE_ADDR entry_addr;
++
 +      /* Find the address of the entry point of the program from the
 +	 auxv vector.  */
 +      ret = target_auxv_search (&current_target, AT_ENTRY, &entry_addr);
@@ -285,6 +465,11 @@
 +				"elf_locate_base: found program entry address 0x%s for %s\n",
 +				paddr_nz (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);
 +    }
 +
    /* Find the start address of the .dynamic section.  */
@@ -331,53 +516,129 @@
  
    /* Iterate over BUF and scan for DYNTAG.  If found, set PTR and return.  */
    step = (arch_size == 32) ? sizeof (Elf32_External_Dyn)
-@@ -405,9 +466,43 @@ scan_dyntag (int dyntag, bfd *abfd, CORE
- 	     CORE_ADDR ptr_addr;
- 
- 	     ptr_addr = dyn_addr + (buf - bufstart) + arch_size / 8;
-+	     if (ptr != NULL)
-+	       {
-+		 if (debug_solib)
-+		   fprintf_unfiltered (gdb_stdlog,
-+				       "elf_locate_base: unrelocated ptr addr 0x%s\n",
-+				       paddr_nz (ptr_addr));
-+		 ptr_addr += entry_addr - bfd_get_start_address (exec_bfd);
-+		 if (debug_solib) 
-+		   fprintf_unfiltered (gdb_stdlog, 
-+				       "elf_locate_base: relocated ptr addr 0x%s"
-+				       " (auxv entry 0x%s, bfd start address 0x%s)"
-+				       " for %s\n",
-+				       paddr_nz (ptr_addr), paddr_nz (entry_addr),
-+				       paddr_nz (bfd_get_start_address (exec_bfd)),
-+				       exec_bfd->filename);
-+	       }
- 	     if (target_read_memory (ptr_addr, ptr_buf, arch_size / 8) == 0)
+@@ -393,25 +461,103 @@ 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);
+       }
+-     if (dyn_tag == DT_NULL)
++
++    /* Verify RELOC_ADDR makes sense - it does not have to for valgrind which
++       supplies us a specially crafted executable in /proc/PID/fd/X while
++       /proc/PID/auxv corresponds to a different executable (.../memcheck).  */
++    if (reloc_addr)
++      {
++	gdb_byte tag_buf[8];
++	CORE_ADDR tag_addr;
++
++	tag_addr = dyn_addr + (buf - bufstart) + reloc_addr;
++	if (target_read_memory (tag_addr, tag_buf, arch_size / 8) == 0)
++	  {
++	    if (memcmp (tag_buf, buf, arch_size / 8) != 0)
++	      {
++		if (debug_solib)
++		  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));
++		reloc_addr = 0;
++	      }
++	  }
++	else
++	  {
++	    if (debug_solib)
++	      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));
++	    reloc_addr = 0;
++	  }
++      }
++
++    if (dyn_tag == DT_NULL)
+        return 0;
+-     if (dyn_tag == dyntag)
+-       {
+-	 /* If requested, try to read the runtime value of this .dynamic
+-	    entry.  */
+-	 if (ptr)
+-	   {
+-	     gdb_byte ptr_buf[8];
+-	     CORE_ADDR ptr_addr;
+-
+-	     ptr_addr = dyn_addr + (buf - bufstart) + arch_size / 8;
+-	     if (target_read_memory (ptr_addr, ptr_buf, arch_size / 8) == 0)
 -	       dyn_ptr = extract_typed_address (ptr_buf,
 -						builtin_type_void_data_ptr);
-+	       {
-+		 dyn_ptr = extract_typed_address (ptr_buf,
-+						  builtin_type_void_data_ptr);
-+		 if (ptr != NULL)
-+		   {
-+		     if (debug_solib)
-+		       fprintf_unfiltered (gdb_stdlog,
-+					   "elf_locate_base: Tag entry has value 0x%s -- return now\n",
-+					   paddr_nz (dyn_ptr));
-+		   }
-+	       }
-+	     else
-+	       {
-+		 if (ptr != NULL)
-+		   {
-+		     if (debug_solib)
-+		       fprintf_unfiltered (gdb_stdlog,
-+					   "elf_locate_base: Couldn't read tag entry value -- return now\n");
-+		   }
-+	       }
- 	     *ptr = dyn_ptr;
- 	   }
- 	 return 1;
-@@ -544,6 +639,10 @@ solib_svr4_r_map (void)
+-	     *ptr = dyn_ptr;
+-	   }
+-	 return 1;
+-       }
++    if (dyn_tag == dyntag)
++      {
++	/* If requested, try to read the runtime value of this .dynamic
++	   entry.  */
++	if (ptr)
++	  {
++	    gdb_byte ptr_buf[8];
++	    CORE_ADDR ptr_addr;
++	    int got;
++
++	    ptr_addr = dyn_addr + (buf - bufstart) + arch_size / 8;
++	    if (ptr != NULL)
++	      {
++		if (debug_solib)
++		  fprintf_unfiltered (gdb_stdlog,
++				      "elf_locate_base: unrelocated ptr addr 0x%s\n",
++				      paddr_nz (ptr_addr));
++		ptr_addr += reloc_addr;
++		if (debug_solib) 
++		  fprintf_unfiltered (gdb_stdlog, 
++				      "elf_locate_base: relocated ptr addr 0x%s"
++				      " (relocation offset %s) for %s\n",
++				      paddr_nz (ptr_addr), paddr_nz (reloc_addr),
++				      exec_bfd->filename);
++	      }
++	    got = target_read_memory (ptr_addr, ptr_buf, arch_size / 8);
++	    if (got != 0 && reloc_addr)
++	      {
++		ptr_addr -= reloc_addr;
++		if (debug_solib) 
++		  fprintf_unfiltered (gdb_stdlog, 
++				      "elf_locate_base: unrelocated back to ptr addr 0x%s"
++				      " as the memory was unreable for %s\n",
++				      paddr_nz (ptr_addr), exec_bfd->filename);
++		got = target_read_memory (ptr_addr, ptr_buf, arch_size / 8);
++	      }
++
++	    if (got == 0)
++	      {
++		dyn_ptr = extract_typed_address (ptr_buf,
++						 builtin_type_void_data_ptr);
++		if (ptr != NULL)
++		  {
++		    if (debug_solib)
++		      fprintf_unfiltered (gdb_stdlog,
++					  "elf_locate_base: Tag entry has value 0x%s -- return now\n",
++					  paddr_nz (dyn_ptr));
++		  }
++	      }
++	    else
++	      {
++		if (ptr != NULL)
++		  {
++		    if (debug_solib)
++		      fprintf_unfiltered (gdb_stdlog,
++					  "elf_locate_base: Couldn't read tag entry value -- return now\n");
++		  }
++	      }
++	    *ptr = dyn_ptr;
++	  }
++	return 1;
++      }
+   }
+ 
+   return 0;
+@@ -544,6 +690,10 @@ solib_svr4_r_map (void)
  {
    struct link_map_offsets *lmo = svr4_fetch_link_map_offsets ();
  
@@ -388,7 +649,7 @@
    return read_memory_typed_address (debug_base + lmo->r_map_offset,
  				    builtin_type_void_data_ptr);
  }
-@@ -713,6 +812,11 @@ svr4_current_sos (void)
+@@ -713,6 +863,11 @@ svr4_current_sos (void)
    struct so_list *head = 0;
    struct so_list **link_ptr = &head;
    CORE_ADDR ldsomap = 0;
@@ -400,7 +661,7 @@
  
    /* Always locate the debug struct, in case it has moved.  */
    debug_base = 0;
-@@ -721,10 +825,19 @@ svr4_current_sos (void)
+@@ -721,10 +876,19 @@ 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)
@@ -421,7 +682,7 @@
    lm = solib_svr4_r_map ();
  
    while (lm)
-@@ -740,23 +853,103 @@ svr4_current_sos (void)
+@@ -740,23 +904,103 @@ svr4_current_sos (void)
        new->lm_info->lm = xzalloc (lmo->link_map_size);
        make_cleanup (xfree, new->lm_info->lm);
  
@@ -527,7 +788,7 @@
  	  target_read_string (LM_NAME (new), &buffer,
  			      SO_NAME_MAX_PATH_SIZE - 1, &errcode);
  	  if (errcode != 0)
-@@ -764,47 +957,60 @@ svr4_current_sos (void)
+@@ -764,47 +1008,60 @@ svr4_current_sos (void)
  		     safe_strerror (errcode));
  	  else
  	    {
@@ -573,15 +834,15 @@
 +			}
 +		      else
 +			debug_print_missing (new->so_name, build_id_filename);
-+
-+		      xfree (build_id_filename);
-+		      xfree (build_id);
-+		    }
  
 -		  /* Missing the build-id matching separate debug info file
 -		     would be handled while SO_NAME gets loaded.  */
 -		  name = build_id_to_filename (build_id, &build_id_filename, 0);
 -		  if (name != NULL)
++		      xfree (build_id_filename);
++		      xfree (build_id);
++		    }
++
 +		  if (debug_solib)
  		    {
 -		      strncpy (new->so_name, name, SO_NAME_MAX_PATH_SIZE - 1);
@@ -621,7 +882,7 @@
  	}
  
        /* On Solaris, the dynamic linker is not in the normal list of
-@@ -820,6 +1026,9 @@ svr4_current_sos (void)
+@@ -820,6 +1077,9 @@ svr4_current_sos (void)
    if (head == NULL)
      return svr4_default_sos ();
  
@@ -631,7 +892,7 @@
    return head;
  }
  
-@@ -921,7 +1130,7 @@ for (resolve = 0; resolve <= 1; resolve+
+@@ -921,7 +1181,7 @@ for (resolve = 0; resolve <= 1; resolve+
  /* 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.  */
@@ -640,7 +901,7 @@
  static int
  match_main (char *soname)
  {
-@@ -935,6 +1144,7 @@ match_main (char *soname)
+@@ -935,6 +1195,7 @@ match_main (char *soname)
  
    return (0);
  }
@@ -648,7 +909,7 @@
  
  /* Return 1 if PC lies in the dynamic symbol resolution code of the
     SVR4 run time loader.  */
-@@ -1086,11 +1296,17 @@ enable_break (void)
+@@ -1086,11 +1347,17 @@ enable_break (void)
    /* Find the .interp section; if not found, warn the user and drop
       into the old breakpoint at symbol code.  */
    interp_sect = bfd_get_section_by_name (exec_bfd, ".interp");
@@ -666,7 +927,7 @@
        int load_addr_found = 0;
        int loader_found_in_list = 0;
        struct so_list *so;
-@@ -1098,6 +1314,14 @@ enable_break (void)
+@@ -1098,6 +1365,14 @@ enable_break (void)
        struct target_ops *tmp_bfd_target;
        int tmp_fd = -1;
        char *tmp_pathname = NULL;
@@ -681,7 +942,7 @@
  
        /* Read the contents of the .interp section into a local buffer;
           the contents specify the dynamic linker this program uses.  */
-@@ -1120,6 +1344,9 @@ enable_break (void)
+@@ -1120,6 +1395,9 @@ enable_break (void)
        if (tmp_fd >= 0)
  	tmp_bfd = bfd_fopen (tmp_pathname, gnutarget, FOPEN_RB, tmp_fd);
  
@@ -691,7 +952,7 @@
        if (tmp_bfd == NULL)
  	goto bkpt_at_symbol;
  
-@@ -1181,16 +1408,16 @@ enable_break (void)
+@@ -1181,16 +1459,16 @@ enable_break (void)
        interp_sect = bfd_get_section_by_name (tmp_bfd, ".text");
        if (interp_sect)
  	{
@@ -712,7 +973,7 @@
  	  interp_plt_sect_high =
  	    interp_plt_sect_low + bfd_section_size (tmp_bfd, interp_sect);
  	}
-@@ -1225,7 +1452,11 @@ enable_break (void)
+@@ -1225,7 +1503,11 @@ enable_break (void)
  
        if (sym_addr != 0)
  	{
@@ -725,7 +986,7 @@
  	  return 1;
  	}
  
-@@ -1486,6 +1717,8 @@ svr4_solib_create_inferior_hook (void)
+@@ -1486,6 +1768,8 @@ svr4_solib_create_inferior_hook (void)
    while (stop_signal != TARGET_SIGNAL_TRAP);
    stop_soon = NO_STOP_QUIETLY;
  #endif /* defined(_SCO_DS) */
@@ -734,7 +995,7 @@
  }
  
  static void
-@@ -1666,6 +1899,75 @@ svr4_lp64_fetch_link_map_offsets (void)
+@@ -1666,6 +1950,75 @@ svr4_lp64_fetch_link_map_offsets (void)
  
    return lmp;
  }
@@ -810,7 +1071,7 @@
  
  
  struct target_so_ops svr4_so_ops;
-@@ -1724,4 +2026,7 @@ _initialize_svr4_solib (void)
+@@ -1724,4 +2077,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;
    svr4_so_ops.same = svr4_same;
@@ -818,293 +1079,9 @@
 +  add_info ("linkmap", info_linkmap_command,
 +	    "Display the inferior's linkmap.");
  }
-Index: gdb-6.8/gdb/varobj.c
-===================================================================
---- gdb-6.8.orig/gdb/varobj.c	2008-04-19 21:38:27.000000000 +0200
-+++ gdb-6.8/gdb/varobj.c	2008-04-19 21:38:33.000000000 +0200
-@@ -1075,6 +1075,62 @@ install_new_value (struct varobj *var, s
-   return changed;
- }
- 
-+void
-+varobj_refresh (void)
-+{
-+  struct varobj *var;
-+  struct varobj_root *croot;
-+  int mycount = rootcount;
-+  char * name;
-+
-+  croot = rootlist;
-+  while ((croot != NULL) && (mycount > 0))
-+    {
-+      var = croot->rootvar;
-+
-+      /* Get rid of the memory for the old expression.  This also
-+         leaves var->root->exp == NULL, which is ok for the parsing
-+         below.  */
-+      free_current_contents (&var->root->exp);
-+
-+      value_free (var->value);
-+      var->type = NULL;
-+
-+      name = xstrdup (var->name);
-+
-+      /* Reparse the expression.  Wrap the call to parse expression,
-+         so we can return a sensible error. */
-+      if (!gdb_parse_exp_1 (&name, var->root->valid_block, 0, &var->root->exp))
-+        {
-+          return;
-+        }
-+
-+      /* We definitively need to catch errors here.
-+         If evaluate_expression succeeds we got the value we wanted.
-+         But if it fails, we still go on with a call to evaluate_type()  */
-+      if (gdb_evaluate_expression (var->root->exp, &var->value))
-+        {
-+          /* no error */
-+          release_value (var->value);
-+          if (value_lazy (var->value))
-+            gdb_value_fetch_lazy (var->value);
-+        }
-+      else
-+        var->value = evaluate_type (var->root->exp);
-+
-+      var->type = value_type (var->value);
-+
-+      mycount--;
-+      croot = croot->next;
-+    }
-+
-+  if (mycount || (croot != NULL))
-+    warning
-+      ("varobj_refresh: assertion failed - wrong tally of root vars (%d:%d)",
-+       rootcount, mycount);
-+}
-+
-+
- /* Update the values for a variable and its children.  This is a
-    two-pronged attack.  First, re-parse the value for the root's
-    expression to see if it's changed.  Then go all the way
-Index: gdb-6.8/gdb/solist.h
-===================================================================
---- gdb-6.8.orig/gdb/solist.h	2008-01-07 16:19:58.000000000 +0100
-+++ gdb-6.8/gdb/solist.h	2008-04-19 21:38:33.000000000 +0200
-@@ -61,6 +61,8 @@ struct so_list
-     bfd *abfd;
-     char symbols_loaded;	/* flag: symbols read in yet? */
-     char from_tty;		/* flag: print msgs? */
-+    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;
-@@ -127,9 +129,15 @@ void free_so (struct so_list *so);
- /* Return address of first so_list entry in master shared object list.  */
- struct so_list *master_so_list (void);
- 
-+/* Return address of first so_list entry in master shared object list.  */
-+struct so_list *master_so_list (void);
-+
- /* Find solib binary file and open it.  */
- extern int solib_open (char *in_pathname, char **found_pathname);
- 
-+/* Add the list of sections in so_list to the target to_sections.  */
-+extern void add_to_target_sections (int, struct target_ops *, struct so_list *);
-+
- /* FIXME: gdbarch needs to control this variable */
- extern struct target_so_ops *current_target_so_ops;
- 
-@@ -140,4 +148,6 @@ struct symbol *solib_global_lookup (cons
- 				    const domain_enum domain,
- 				    struct symtab **symtab);
- 
-+/* Controls the printing of debugging output.  */
-+extern int debug_solib;
- #endif
-Index: gdb-6.8/gdb/varobj.h
-===================================================================
---- gdb-6.8.orig/gdb/varobj.h	2008-01-30 08:17:31.000000000 +0100
-+++ gdb-6.8/gdb/varobj.h	2008-04-19 21:38:33.000000000 +0200
-@@ -122,4 +122,6 @@ extern void varobj_invalidate (void);
- 
- extern int varobj_editable_p (struct varobj *var);
- 
-+extern void varobj_refresh(void);
-+
- #endif /* VAROBJ_H */
-Index: gdb-6.8/gdb/symfile.c
-===================================================================
---- gdb-6.8.orig/gdb/symfile.c	2008-04-19 21:38:32.000000000 +0200
-+++ gdb-6.8/gdb/symfile.c	2008-04-19 21:38:33.000000000 +0200
-@@ -47,6 +47,7 @@
- #include "readline/readline.h"
- #include "gdb_assert.h"
- #include "block.h"
-+#include "varobj.h"
- #include "observer.h"
- #include "exec.h"
- #include "parser-defs.h"
-@@ -815,7 +816,7 @@ syms_from_objfile (struct objfile *objfi
- 
-   /* Now either addrs or offsets is non-zero.  */
- 
--  if (mainline)
-+  if (mainline == 1)
-     {
-       /* We will modify the main symbol table, make sure that all its users
-          will be cleaned up if an error occurs during symbol reading.  */
-@@ -843,7 +844,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.  */
--  if (!mainline && addrs && addrs->other[0].name)
-+  if (/*!mainline &&*/ addrs && addrs->other[0].name)
-     {
-       asection *sect;
-       CORE_ADDR lower_offset = 0;	/* Shut up the GCC warning.  */
-@@ -1002,17 +1003,21 @@ 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)
-     {
-       /* OK, make it the "real" symbol file.  */
-       symfile_objfile = objfile;
- 
-       clear_symtab_users ();
-     }
--  else
-+  else if (mainline == 0)
-     {
-       breakpoint_re_set ();
-     }
-+  else
-+    {
-+      /* Don't reset breakpoints or it will screw up PIE.  */
-+    }
- 
-   /* We're done reading the symbol file; finish off complaints.  */
-   clear_complaints (&symfile_complaints, 0, verbo);
-@@ -1055,7 +1060,7 @@ symbol_file_add_with_addrs_or_offsets (b
-      interactively wiping out any existing symbols.  */
- 
-   if ((have_full_symbols () || have_partial_symbols ())
--      && mainline
-+      && (mainline == 1)
-       && from_tty
-       && !query ("Load new symbol table from \"%s\"? ", name))
-     error (_("Not confirmed."));
-@@ -1241,6 +1246,10 @@ 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
-@@ -3330,6 +3339,8 @@ reread_symbols (void)
- 	      /* Discard cleanups as symbol reading was successful.  */
- 	      discard_cleanups (old_cleanups);
- 
-+	      init_entry_point_info (objfile);
-+
- 	      /* 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.  */
-@@ -3698,6 +3709,7 @@ clear_symtab_users (void)
-   breakpoint_re_set ();
-   set_default_breakpoint (0, 0, 0, 0);
-   clear_pc_function_cache ();
-+  varobj_refresh ();
-   observer_notify_new_objfile (NULL);
- 
-   /* Clear globals which might have pointed into a removed objfile.
-Index: gdb-6.8/gdb/breakpoint.c
-===================================================================
---- gdb-6.8.orig/gdb/breakpoint.c	2008-04-19 21:38:33.000000000 +0200
-+++ gdb-6.8/gdb/breakpoint.c	2008-04-19 21:38:33.000000000 +0200
-@@ -3946,7 +3946,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)"
-@@ -4598,6 +4599,62 @@ disable_breakpoints_in_unloaded_shlib (s
-   }
- }
- 
-+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->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,
- 				    enum bptype bp_kind)
-Index: gdb-6.8/gdb/solib.c
-===================================================================
---- gdb-6.8.orig/gdb/solib.c	2008-01-07 16:19:58.000000000 +0100
-+++ gdb-6.8/gdb/solib.c	2008-04-19 21:38:33.000000000 +0200
-@@ -79,6 +79,8 @@ set_solib_ops (struct gdbarch *gdbarch, 
+--- ./gdb/solib.c	2008-01-07 16:19:58.000000000 +0100
++++ ./gdb/solib.c	2008-09-01 17:16:12.000000000 +0200
+@@ -79,6 +79,8 @@ set_solib_ops (struct gdbarch *gdbarch, 
  
  /* external data declarations */
  
@@ -1278,135 +1255,211 @@
 +			   NULL, NULL,
 +			   &setdebuglist, &showdebuglist);
  }
-Index: gdb-6.8/gdb/elfread.c
-===================================================================
---- gdb-6.8.orig/gdb/elfread.c	2008-01-01 23:53:09.000000000 +0100
-+++ gdb-6.8/gdb/elfread.c	2008-04-19 21:38:33.000000000 +0200
-@@ -644,7 +644,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. */
+--- ./gdb/solist.h	2008-01-07 16:19:58.000000000 +0100
++++ ./gdb/solist.h	2008-08-30 23:40:33.000000000 +0200
+@@ -61,6 +61,8 @@ struct so_list
+     bfd *abfd;
+     char symbols_loaded;	/* flag: symbols read in yet? */
+     char from_tty;		/* flag: print msgs? */
++    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;
+@@ -127,9 +129,15 @@ void free_so (struct so_list *so);
+ /* Return address of first so_list entry in master shared object list.  */
+ struct so_list *master_so_list (void);
+ 
++/* Return address of first so_list entry in master shared object list.  */
++struct so_list *master_so_list (void);
++
+ /* Find solib binary file and open it.  */
+ extern int solib_open (char *in_pathname, char **found_pathname);
+ 
++/* Add the list of sections in so_list to the target to_sections.  */
++extern void add_to_target_sections (int, struct target_ops *, struct so_list *);
++
+ /* FIXME: gdbarch needs to control this variable */
+ extern struct target_so_ops *current_target_so_ops;
+ 
+@@ -140,4 +148,6 @@ struct symbol *solib_global_lookup (cons
+ 				    const domain_enum domain,
+ 				    struct symtab **symtab);
+ 
++/* Controls the printing of debugging output.  */
++extern int debug_solib;
+ #endif
+--- ./gdb/symfile-mem.c	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/symfile-mem.c	2008-08-30 23:40:33.000000000 +0200
+@@ -116,7 +116,7 @@ symbol_file_add_from_memory (struct bfd 
+       }
+ 
+   objf = symbol_file_add_from_bfd (nbfd, from_tty,
+-                                   sai, 0, OBJF_SHARED);
++                                   sai, 2, OBJF_SHARED);
+ 
+   /* This might change our ideas about frames already looked at.  */
+   reinit_frame_cache ();
+--- ./gdb/symfile.c	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/symfile.c	2008-08-30 23:41:48.000000000 +0200
+@@ -47,6 +47,7 @@
+ #include "readline/readline.h"
+ #include "gdb_assert.h"
+ #include "block.h"
++#include "varobj.h"
+ #include "observer.h"
+ #include "exec.h"
+ #include "parser-defs.h"
+@@ -815,7 +816,7 @@ syms_from_objfile (struct objfile *objfi
+ 
+   /* Now either addrs or offsets is non-zero.  */
+ 
 -  if (mainline)
 +  if (mainline == 1)
      {
-       init_psymbol_list (objfile, 0);
-       mainline = 0;
-Index: gdb-6.8/gdb/Makefile.in
-===================================================================
---- gdb-6.8.orig/gdb/Makefile.in	2008-04-19 21:38:32.000000000 +0200
-+++ gdb-6.8/gdb/Makefile.in	2008-04-19 21:38:33.000000000 +0200
-@@ -1920,7 +1920,7 @@ amd64-tdep.o: amd64-tdep.c $(defs_h) $(a
- 	$(dummy_frame_h) $(frame_h) $(frame_base_h) $(frame_unwind_h) \
- 	$(inferior_h) $(gdbcmd_h) $(gdbcore_h) $(objfiles_h) $(regcache_h) \
- 	$(regset_h) $(symfile_h) $(gdb_assert_h) $(amd64_tdep_h) \
--	$(i387_tdep_h)
-+	$(i387_tdep_h) $(exceptions_h)
- annotate.o: annotate.c $(defs_h) $(annotate_h) $(value_h) $(target_h) \
- 	$(gdbtypes_h) $(breakpoint_h)
- arch-utils.o: arch-utils.c $(defs_h) $(arch_utils_h) $(buildsym_h) \
-Index: gdb-6.8/gdb/amd64-tdep.c
-===================================================================
---- gdb-6.8.orig/gdb/amd64-tdep.c	2008-04-19 21:38:28.000000000 +0200
-+++ gdb-6.8/gdb/amd64-tdep.c	2008-04-19 21:38:33.000000000 +0200
-@@ -36,6 +36,7 @@
- #include "symfile.h"
- #include "dwarf2-frame.h"
- #include "gdb_assert.h"
-+#include "exceptions.h"
- 
- #include "amd64-tdep.h"
- #include "i387-tdep.h"
-@@ -731,16 +732,28 @@ amd64_alloc_frame_cache (void)
-    Any function that doesn't start with this sequence will be assumed
-    to have no prologue and thus no valid frame pointer in %rbp.  */
+       /* We will modify the main symbol table, make sure that all its users
+          will be cleaned up if an error occurs during symbol reading.  */
+@@ -843,7 +844,7 @@ syms_from_objfile (struct objfile *objfi
  
--static CORE_ADDR
--amd64_analyze_prologue (CORE_ADDR pc, CORE_ADDR current_pc,
--			struct amd64_frame_cache *cache)
-+struct amd64_analyze_prologue_data
-+  {
-+    CORE_ADDR pc, current_pc;
-+    struct amd64_frame_cache *cache;
-+    CORE_ADDR retval;
-+  };
-+
-+static int
-+amd64_analyze_prologue_1 (void *data_pointer)
- {
-+  struct amd64_analyze_prologue_data *data = data_pointer;
-+  CORE_ADDR pc = data->pc, current_pc = data->current_pc;
-+  struct amd64_frame_cache *cache = data->cache;
-   static gdb_byte proto[3] = { 0x48, 0x89, 0xe5 }; /* movq %rsp, %rbp */
-   gdb_byte buf[3];
-   gdb_byte op;
+      We no longer warn if the lowest section is not a text segment (as
+      happens for the PA64 port.  */
+-  if (!mainline && addrs && addrs->other[0].name)
++  if (/*!mainline &&*/ addrs && addrs->other[0].name)
+     {
+       asection *sect;
+       CORE_ADDR lower_offset = 0;	/* Shut up the GCC warning.  */
+@@ -1002,17 +1003,21 @@ 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)
+     {
+       /* OK, make it the "real" symbol file.  */
+       symfile_objfile = objfile;
  
-   if (current_pc <= pc)
--    return current_pc;
+       clear_symtab_users ();
+     }
+-  else
++  else if (mainline == 0)
+     {
+       breakpoint_re_set ();
+     }
++  else
 +    {
-+      data->retval = current_pc;
-+      return 1;
++      /* Don't reset breakpoints or it will screw up PIE.  */
 +    }
  
-   op = read_memory_unsigned_integer (pc, 1);
+   /* We're done reading the symbol file; finish off complaints.  */
+   clear_complaints (&symfile_complaints, 0, verbo);
+@@ -1055,7 +1060,7 @@ symbol_file_add_with_addrs_or_offsets (b
+      interactively wiping out any existing symbols.  */
  
-@@ -753,18 +766,57 @@ amd64_analyze_prologue (CORE_ADDR pc, CO
+   if ((have_full_symbols () || have_partial_symbols ())
+-      && mainline
++      && (mainline == 1)
+       && from_tty
+       && !query ("Load new symbol table from \"%s\"? ", name))
+     error (_("Not confirmed."));
+@@ -1242,6 +1247,10 @@ 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 ();
  
-       /* If that's all, return now.  */
-       if (current_pc <= pc + 1)
--        return current_pc;
-+        {
-+	  data->retval = current_pc;
-+	  return 1;
-+        }
+     /* solib descriptors may have handles to objfiles.  Since their
+@@ -3335,6 +3344,8 @@ reread_symbols (void)
+ 	      /* Discard cleanups as symbol reading was successful.  */
+ 	      discard_cleanups (old_cleanups);
  
-       /* Check for `movq %rsp, %rbp'.  */
-       read_memory (pc + 1, buf, 3);
-       if (memcmp (buf, proto, 3) != 0)
--	return pc + 1;
-+	{
-+	  data->retval = pc + 1;
-+	  return 1;
-+	}
++	      init_entry_point_info (objfile);
++
+ 	      /* 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.  */
+@@ -3703,6 +3714,7 @@ clear_symtab_users (void)
+   breakpoint_re_set ();
+   set_default_breakpoint (0, 0, 0, 0);
+   clear_pc_function_cache ();
++  varobj_refresh ();
+   observer_notify_new_objfile (NULL);
  
-       /* OK, we actually have a frame.  */
-       cache->frameless_p = 0;
--      return pc + 4;
-+      data->retval = pc + 4;
-+      return 1;
-     }
+   /* Clear globals which might have pointed into a removed objfile.
+--- ./gdb/varobj.c	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/varobj.c	2008-08-30 23:40:33.000000000 +0200
+@@ -1075,6 +1075,62 @@ install_new_value (struct varobj *var, s
+   return changed;
+ }
  
-+  data->retval = pc;
-+  return 1;
-+}
++void
++varobj_refresh (void)
++{
++  struct varobj *var;
++  struct varobj_root *croot;
++  int mycount = rootcount;
++  char * name;
 +
-+/* Catch memory read errors and return just PC in such case.
-+   It occurs very early on enable_break->new_symfile_objfile->
-+   ->breakpoint_re_set->decode_line_1->decode_variable_1->
-+   ->find_function_start_sal  */
++  croot = rootlist;
++  while ((croot != NULL) && (mycount > 0))
++    {
++      var = croot->rootvar;
 +
-+static CORE_ADDR
-+amd64_analyze_prologue (CORE_ADDR pc, CORE_ADDR current_pc,
-+			struct amd64_frame_cache *cache)
-+{
-+  int status;
-+  struct amd64_analyze_prologue_data data;
-+  struct ui_file *saved_gdb_stderr;
++      /* Get rid of the memory for the old expression.  This also
++         leaves var->root->exp == NULL, which is ok for the parsing
++         below.  */
++      free_current_contents (&var->root->exp);
 +
-+  /* Suppress error messages.  */
-+  saved_gdb_stderr = gdb_stderr;
-+  gdb_stderr = ui_file_new ();
++      value_free (var->value);
++      var->type = NULL;
 +
-+  data.pc = pc;
-+  data.current_pc = current_pc;
-+  data.cache = cache;
-+  status = catch_errors (amd64_analyze_prologue_1, &data, "", RETURN_MASK_ALL);
++      name = xstrdup (var->name);
 +
-+  /* Stop suppressing error messages.  */
-+  ui_file_delete (gdb_stderr);
-+  gdb_stderr = saved_gdb_stderr;
++      /* Reparse the expression.  Wrap the call to parse expression,
++         so we can return a sensible error. */
++      if (!gdb_parse_exp_1 (&name, var->root->valid_block, 0, &var->root->exp))
++        {
++          return;
++        }
 +
-+  if (status)
-+    return data.retval;
-   return pc;
- }
++      /* We definitively need to catch errors here.
++         If evaluate_expression succeeds we got the value we wanted.
++         But if it fails, we still go on with a call to evaluate_type()  */
++      if (gdb_evaluate_expression (var->root->exp, &var->value))
++        {
++          /* no error */
++          release_value (var->value);
++          if (value_lazy (var->value))
++            gdb_value_fetch_lazy (var->value);
++        }
++      else
++        var->value = evaluate_type (var->root->exp);
++
++      var->type = value_type (var->value);
++
++      mycount--;
++      croot = croot->next;
++    }
++
++  if (mycount || (croot != NULL))
++    warning
++      ("varobj_refresh: assertion failed - wrong tally of root vars (%d:%d)",
++       rootcount, mycount);
++}
++
++
+ /* Update the values for a variable and its children.  This is a
+    two-pronged attack.  First, re-parse the value for the root's
+    expression to see if it's changed.  Then go all the way
+--- ./gdb/varobj.h	2008-01-30 08:17:31.000000000 +0100
++++ ./gdb/varobj.h	2008-08-30 23:40:33.000000000 +0200
+@@ -122,4 +122,6 @@ extern void varobj_invalidate (void);
+ 
+ extern int varobj_editable_p (struct varobj *var);
  
++extern void varobj_refresh(void);
++
+ #endif /* VAROBJ_H */


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-9/gdb.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- gdb.spec	28 Aug 2008 14:37:01 -0000	1.296
+++ gdb.spec	2 Sep 2008 00:31:01 -0000	1.297
@@ -16,7 +16,7 @@
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 21%{?_with_upstream:.upstream}%{?dist}
+Release: 22%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -838,6 +838,9 @@
 %endif
 
 %changelog
+* Tue Sep  2 2008 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8-22
+- Fix PIE patch regression for loading binaries from valgrind (BZ 460319).
+
 * Thu Aug 28 2008 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8-21
 - Fix attaching to stopped processes, based on the upstream version now.
   - Just kernel-2.6.25 neither upstream nor utrace work with it; 2.6.9 works.



From tgl at fedoraproject.org  Tue Sep  2 00:34:35 2008
From: tgl at fedoraproject.org (Tom Lane)
Date: Tue,  2 Sep 2008 00:34:35 +0000 (UTC)
Subject: rpms/libdbi-drivers/F-9 libdbi-drivers-error-handler.patch, NONE,
	1.1 libdbi-drivers.spec, 1.14, 1.15
Message-ID: <20080902003435.237EB7011D@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/libdbi-drivers/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11404

Modified Files:
	libdbi-drivers.spec 
Added Files:
	libdbi-drivers-error-handler.patch 
Log Message:
Fix bug #460734.

libdbi-drivers-error-handler.patch:

--- NEW FILE libdbi-drivers-error-handler.patch ---
Fix bug #460734.


diff -Naur libdbi-drivers-0.8.3/drivers/sqlite3/dbd_sqlite3.c libdbi-drivers-0.8.3-1/drivers/sqlite3/dbd_sqlite3.c
--- libdbi-drivers-0.8.3/drivers/sqlite3/dbd_sqlite3.c	2008-01-15 09:07:24.000000000 -0500
+++ libdbi-drivers-0.8.3-1/drivers/sqlite3/dbd_sqlite3.c	2008-03-03 12:32:26.000000000 -0500
@@ -731,7 +731,7 @@
 				      &errmsg);
 
   if (query_res || !table_numrows) {
-    _dbi_internal_error_handler(conn, NULL, DBI_ERROR_BADNAME);
+    _dbd_internal_error_handler(conn, NULL, DBI_ERROR_BADNAME);
     /*       printf("field not found\n"); */
     return 0;
   }


Index: libdbi-drivers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdbi-drivers/F-9/libdbi-drivers.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libdbi-drivers.spec	11 Feb 2008 20:56:56 -0000	1.14
+++ libdbi-drivers.spec	2 Sep 2008 00:34:04 -0000	1.15
@@ -1,13 +1,14 @@
 Summary: Database-specific drivers for libdbi
 Name: libdbi-drivers
 Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Libraries
 License: LGPLv2+
 URL: http://libdbi-drivers.sourceforge.net/
 
 Source: http://prdownloads.sourceforge.net/libdbi-drivers/%{name}-%{version}.tar.gz
 Patch1: libdbi-drivers-cflags.patch
+Patch2: libdbi-drivers-error-handler.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: libdbi >= 0.8
@@ -66,6 +67,7 @@
 %setup -q -n %{name}-%{version}
 
 %patch1 -p1
+%patch2 -p1
 
 autoconf
 
@@ -120,6 +122,12 @@
 %{_libdir}/dbd/libdbdsqlite3.*
 
 %changelog
+* Mon Sep  1 2008 Tom Lane <tgl at redhat.com> 0.8.3-2
+- Fix mistaken external reference in libdbdsqlite3.so.  (I'm applying this
+  as a patch, rather than updating to upstream's 0.8.3-1, because that isn't
+  acceptable as an RPM Version tag.)
+Resolves: #460734
+
 * Mon Feb 11 2008 Tom Lane <tgl at redhat.com> 0.8.3-1
 - Update to version 0.8.3.
 - Code is now all licensed LGPLv2+, so adjust License tags.



From jkratoch at fedoraproject.org  Tue Sep  2 00:55:43 2008
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Tue,  2 Sep 2008 00:55:43 +0000 (UTC)
Subject: rpms/gdb/devel gdb-6.3-pie-20050110.patch, 1.9, 1.10 gdb.spec, 1.304,
	1.305
Message-ID: <20080902005543.9853470120@cvs1.fedora.phx.redhat.com>

Author: jkratoch

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

Modified Files:
	gdb-6.3-pie-20050110.patch gdb.spec 
Log Message:
* Tue Sep  2 2008 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8-24
- Fix PIE patch regression for loading binaries from valgrind (BZ 460319).


gdb-6.3-pie-20050110.patch:

Index: gdb-6.3-pie-20050110.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-pie-20050110.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gdb-6.3-pie-20050110.patch	1 Jun 2008 13:14:20 -0000	1.9
+++ gdb-6.3-pie-20050110.patch	2 Sep 2008 00:55:43 -0000	1.10
@@ -22,23 +22,127 @@
 
 	Fix crash on a watchpoint update on an inferior stop.
 
-Index: gdb-6.8/gdb/dwarf2read.c
-===================================================================
---- gdb-6.8.orig/gdb/dwarf2read.c	2008-04-19 21:38:32.000000000 +0200
-+++ gdb-6.8/gdb/dwarf2read.c	2008-04-19 21:38:33.000000000 +0200
-@@ -1221,7 +1221,7 @@ dwarf2_build_psymtabs (struct objfile *o
-   else
-     dwarf2_per_objfile->loc_buffer = NULL;
+2008-09-01  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	Fix scan_dyntag() for binaries provided by valgrind (BZ 460319).
+
+--- ./gdb/Makefile.in	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/Makefile.in	2008-08-30 23:40:33.000000000 +0200
+@@ -1928,7 +1928,7 @@ amd64-tdep.o: amd64-tdep.c $(defs_h) $(a
+ 	$(dummy_frame_h) $(frame_h) $(frame_base_h) $(frame_unwind_h) \
+ 	$(inferior_h) $(gdbcmd_h) $(gdbcore_h) $(objfiles_h) $(regcache_h) \
+ 	$(regset_h) $(symfile_h) $(gdb_assert_h) $(amd64_tdep_h) \
+-	$(i387_tdep_h)
++	$(i387_tdep_h) $(exceptions_h)
+ annotate.o: annotate.c $(defs_h) $(annotate_h) $(value_h) $(target_h) \
+ 	$(gdbtypes_h) $(breakpoint_h)
+ arch-utils.o: arch-utils.c $(defs_h) $(arch_utils_h) $(buildsym_h) \
+--- ./gdb/amd64-tdep.c	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/amd64-tdep.c	2008-08-30 23:40:33.000000000 +0200
+@@ -36,6 +36,7 @@
+ #include "symfile.h"
+ #include "dwarf2-frame.h"
+ #include "gdb_assert.h"
++#include "exceptions.h"
  
--  if (mainline
-+  if ((mainline == 1)
-       || (objfile->global_psymbols.size == 0
- 	  && objfile->static_psymbols.size == 0))
-     {
-Index: gdb-6.8/gdb/auxv.c
-===================================================================
---- gdb-6.8.orig/gdb/auxv.c	2008-01-16 17:27:37.000000000 +0100
-+++ gdb-6.8/gdb/auxv.c	2008-04-19 21:38:33.000000000 +0200
+ #include "amd64-tdep.h"
+ #include "i387-tdep.h"
+@@ -731,16 +732,28 @@ amd64_alloc_frame_cache (void)
+    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,
+-			struct amd64_frame_cache *cache)
++struct amd64_analyze_prologue_data
++  {
++    CORE_ADDR pc, current_pc;
++    struct amd64_frame_cache *cache;
++    CORE_ADDR retval;
++  };
++
++static int
++amd64_analyze_prologue_1 (void *data_pointer)
+ {
++  struct amd64_analyze_prologue_data *data = data_pointer;
++  CORE_ADDR pc = data->pc, current_pc = data->current_pc;
++  struct amd64_frame_cache *cache = data->cache;
+   static gdb_byte proto[3] = { 0x48, 0x89, 0xe5 }; /* movq %rsp, %rbp */
+   gdb_byte buf[3];
+   gdb_byte op;
+ 
+   if (current_pc <= pc)
+-    return current_pc;
++    {
++      data->retval = current_pc;
++      return 1;
++    }
+ 
+   op = read_memory_unsigned_integer (pc, 1);
+ 
+@@ -753,18 +766,57 @@ amd64_analyze_prologue (CORE_ADDR pc, CO
+ 
+       /* If that's all, return now.  */
+       if (current_pc <= pc + 1)
+-        return current_pc;
++        {
++	  data->retval = current_pc;
++	  return 1;
++        }
+ 
+       /* Check for `movq %rsp, %rbp'.  */
+       read_memory (pc + 1, buf, 3);
+       if (memcmp (buf, proto, 3) != 0)
+-	return pc + 1;
++	{
++	  data->retval = pc + 1;
++	  return 1;
++	}
+ 
+       /* OK, we actually have a frame.  */
+       cache->frameless_p = 0;
+-      return pc + 4;
++      data->retval = pc + 4;
++      return 1;
+     }
+ 
++  data->retval = pc;
++  return 1;
++}
++
++/* Catch memory read errors and return just PC in such case.
++   It occurs very early on enable_break->new_symfile_objfile->
++   ->breakpoint_re_set->decode_line_1->decode_variable_1->
++   ->find_function_start_sal  */
++
++static CORE_ADDR
++amd64_analyze_prologue (CORE_ADDR pc, CORE_ADDR current_pc,
++			struct amd64_frame_cache *cache)
++{
++  int status;
++  struct amd64_analyze_prologue_data data;
++  struct ui_file *saved_gdb_stderr;
++
++  /* Suppress error messages.  */
++  saved_gdb_stderr = gdb_stderr;
++  gdb_stderr = ui_file_new ();
++
++  data.pc = pc;
++  data.current_pc = current_pc;
++  data.cache = cache;
++  status = catch_errors (amd64_analyze_prologue_1, &data, "", RETURN_MASK_ALL);
++
++  /* Stop suppressing error messages.  */
++  ui_file_delete (gdb_stderr);
++  gdb_stderr = saved_gdb_stderr;
++
++  if (status)
++    return data.retval;
+   return pc;
+ }
+ 
+--- ./gdb/auxv.c	2008-01-16 17:27:37.000000000 +0100
++++ ./gdb/auxv.c	2008-08-30 23:40:33.000000000 +0200
 @@ -80,7 +80,7 @@ procfs_xfer_auxv (struct target_ops *ops
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  int
@@ -110,10 +214,8 @@
        switch (flavor)
  	{
  	case dec:
-Index: gdb-6.8/gdb/auxv.h
-===================================================================
---- gdb-6.8.orig/gdb/auxv.h	2008-01-01 23:53:09.000000000 +0100
-+++ gdb-6.8/gdb/auxv.h	2008-04-19 21:38:33.000000000 +0200
+--- ./gdb/auxv.h	2008-01-01 23:53:09.000000000 +0100
++++ ./gdb/auxv.h	2008-08-30 23:40:33.000000000 +0200
 @@ -35,14 +35,14 @@ struct target_ops;		/* Forward declarati
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  extern int target_auxv_parse (struct target_ops *ops,
@@ -131,10 +233,83 @@
  
  /* 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/gdb/breakpoint.h
-===================================================================
---- gdb-6.8.orig/gdb/breakpoint.h	2008-04-19 21:38:33.000000000 +0200
-+++ gdb-6.8/gdb/breakpoint.h	2008-04-19 21:38:33.000000000 +0200
+--- ./gdb/breakpoint.c	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/breakpoint.c	2008-08-30 23:40:33.000000000 +0200
+@@ -3971,7 +3971,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)"
+@@ -4623,6 +4624,62 @@ disable_breakpoints_in_unloaded_shlib (s
+   }
+ }
+ 
++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->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,
+ 				    enum bptype bp_kind)
+--- ./gdb/breakpoint.h	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/breakpoint.h	2008-08-30 23:40:33.000000000 +0200
 @@ -144,6 +144,7 @@ enum enable_state
  			   automatically enabled and reset when the call 
  			   "lands" (either completes, or stops at another 
@@ -154,24 +329,31 @@
  /* This function returns TRUE if ep is a catchpoint. */
  extern int ep_is_catchpoint (struct breakpoint *);
  
-Index: gdb-6.8/gdb/symfile-mem.c
-===================================================================
---- gdb-6.8.orig/gdb/symfile-mem.c	2008-04-19 21:38:27.000000000 +0200
-+++ gdb-6.8/gdb/symfile-mem.c	2008-04-19 21:38:33.000000000 +0200
-@@ -116,7 +116,7 @@ symbol_file_add_from_memory (struct bfd 
-       }
- 
-   objf = symbol_file_add_from_bfd (nbfd, from_tty,
--                                   sai, 0, OBJF_SHARED);
-+                                   sai, 2, OBJF_SHARED);
+--- ./gdb/dwarf2read.c	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/dwarf2read.c	2008-08-30 23:40:33.000000000 +0200
+@@ -1222,7 +1222,7 @@ dwarf2_build_psymtabs (struct objfile *o
+   else
+     dwarf2_per_objfile->loc_buffer = NULL;
  
-   /* This might change our ideas about frames already looked at.  */
-   reinit_frame_cache ();
-Index: gdb-6.8/gdb/infrun.c
-===================================================================
---- gdb-6.8.orig/gdb/infrun.c	2008-04-19 21:38:29.000000000 +0200
-+++ gdb-6.8/gdb/infrun.c	2008-04-19 21:38:33.000000000 +0200
-@@ -2277,6 +2277,11 @@ process_event_stop_test:
+-  if (mainline
++  if ((mainline == 1)
+       || (objfile->global_psymbols.size == 0
+ 	  && objfile->static_psymbols.size == 0))
+     {
+--- ./gdb/elfread.c	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/elfread.c	2008-08-30 23:40:33.000000000 +0200
+@@ -673,7 +673,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. */
+-  if (mainline)
++  if (mainline == 1)
+     {
+       init_psymbol_list (objfile, 0);
+       mainline = 0;
+--- ./gdb/infrun.c	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/infrun.c	2008-08-30 23:40:33.000000000 +0200
+@@ -2314,6 +2314,11 @@ process_event_stop_test:
  #endif
  	  target_terminal_inferior ();
  
@@ -183,10 +365,8 @@
  	  /* 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/gdb/objfiles.c
-===================================================================
---- gdb-6.8.orig/gdb/objfiles.c	2008-01-01 23:53:12.000000000 +0100
-+++ gdb-6.8/gdb/objfiles.c	2008-04-19 21:38:33.000000000 +0200
+--- ./gdb/objfiles.c	2008-01-01 23:53:12.000000000 +0100
++++ ./gdb/objfiles.c	2008-08-30 23:40:33.000000000 +0200
 @@ -49,6 +49,9 @@
  #include "source.h"
  #include "addrmap.h"
@@ -218,10 +398,8 @@
  }
  
  /* Create the terminating entry of OBJFILE's minimal symbol table.
-Index: gdb-6.8/gdb/solib-svr4.c
-===================================================================
---- gdb-6.8.orig/gdb/solib-svr4.c	2008-04-19 21:38:30.000000000 +0200
-+++ gdb-6.8/gdb/solib-svr4.c	2008-04-19 21:34:42.000000000 +0200
+--- ./gdb/solib-svr4.c	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/solib-svr4.c	2008-09-01 17:12:31.000000000 +0200
 @@ -31,6 +31,8 @@
  #include "gdbcore.h"
  #include "target.h"
@@ -245,7 +423,7 @@
    int arch_size, step, sect_size;
    long dyn_tag;
    CORE_ADDR dyn_ptr, dyn_addr;
-+  CORE_ADDR entry_addr;
++  CORE_ADDR reloc_addr = 0;
    gdb_byte *bufend, *bufstart, *buf;
    Elf32_External_Dyn *x_dynp_32;
    Elf64_External_Dyn *x_dynp_64;
@@ -254,7 +432,7 @@
  
    if (abfd == NULL)
      return 0;
-@@ -360,19 +366,74 @@ scan_dyntag (int dyntag, bfd *abfd, CORE
+@@ -360,19 +366,81 @@ scan_dyntag (int dyntag, bfd *abfd, CORE
    if (arch_size == -1)
     return 0;
  
@@ -264,6 +442,8 @@
 +
 +  if (ptr != NULL)
 +    {
++      CORE_ADDR entry_addr;
++
 +      /* Find the address of the entry point of the program from the
 +	 auxv vector.  */
 +      ret = target_auxv_search (&current_target, AT_ENTRY, &entry_addr);
@@ -285,6 +465,11 @@
 +				"elf_locate_base: found program entry address 0x%s for %s\n",
 +				paddr_nz (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);
 +    }
 +
    /* Find the start address of the .dynamic section.  */
@@ -331,53 +516,129 @@
  
    /* Iterate over BUF and scan for DYNTAG.  If found, set PTR and return.  */
    step = (arch_size == 32) ? sizeof (Elf32_External_Dyn)
-@@ -405,9 +466,43 @@ scan_dyntag (int dyntag, bfd *abfd, CORE
- 	     CORE_ADDR ptr_addr;
- 
- 	     ptr_addr = dyn_addr + (buf - bufstart) + arch_size / 8;
-+	     if (ptr != NULL)
-+	       {
-+		 if (debug_solib)
-+		   fprintf_unfiltered (gdb_stdlog,
-+				       "elf_locate_base: unrelocated ptr addr 0x%s\n",
-+				       paddr_nz (ptr_addr));
-+		 ptr_addr += entry_addr - bfd_get_start_address (exec_bfd);
-+		 if (debug_solib) 
-+		   fprintf_unfiltered (gdb_stdlog, 
-+				       "elf_locate_base: relocated ptr addr 0x%s"
-+				       " (auxv entry 0x%s, bfd start address 0x%s)"
-+				       " for %s\n",
-+				       paddr_nz (ptr_addr), paddr_nz (entry_addr),
-+				       paddr_nz (bfd_get_start_address (exec_bfd)),
-+				       exec_bfd->filename);
-+	       }
- 	     if (target_read_memory (ptr_addr, ptr_buf, arch_size / 8) == 0)
+@@ -393,25 +461,103 @@ 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);
+       }
+-     if (dyn_tag == DT_NULL)
++
++    /* Verify RELOC_ADDR makes sense - it does not have to for valgrind which
++       supplies us a specially crafted executable in /proc/PID/fd/X while
++       /proc/PID/auxv corresponds to a different executable (.../memcheck).  */
++    if (reloc_addr)
++      {
++	gdb_byte tag_buf[8];
++	CORE_ADDR tag_addr;
++
++	tag_addr = dyn_addr + (buf - bufstart) + reloc_addr;
++	if (target_read_memory (tag_addr, tag_buf, arch_size / 8) == 0)
++	  {
++	    if (memcmp (tag_buf, buf, arch_size / 8) != 0)
++	      {
++		if (debug_solib)
++		  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));
++		reloc_addr = 0;
++	      }
++	  }
++	else
++	  {
++	    if (debug_solib)
++	      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));
++	    reloc_addr = 0;
++	  }
++      }
++
++    if (dyn_tag == DT_NULL)
+        return 0;
+-     if (dyn_tag == dyntag)
+-       {
+-	 /* If requested, try to read the runtime value of this .dynamic
+-	    entry.  */
+-	 if (ptr)
+-	   {
+-	     gdb_byte ptr_buf[8];
+-	     CORE_ADDR ptr_addr;
+-
+-	     ptr_addr = dyn_addr + (buf - bufstart) + arch_size / 8;
+-	     if (target_read_memory (ptr_addr, ptr_buf, arch_size / 8) == 0)
 -	       dyn_ptr = extract_typed_address (ptr_buf,
 -						builtin_type_void_data_ptr);
-+	       {
-+		 dyn_ptr = extract_typed_address (ptr_buf,
-+						  builtin_type_void_data_ptr);
-+		 if (ptr != NULL)
-+		   {
-+		     if (debug_solib)
-+		       fprintf_unfiltered (gdb_stdlog,
-+					   "elf_locate_base: Tag entry has value 0x%s -- return now\n",
-+					   paddr_nz (dyn_ptr));
-+		   }
-+	       }
-+	     else
-+	       {
-+		 if (ptr != NULL)
-+		   {
-+		     if (debug_solib)
-+		       fprintf_unfiltered (gdb_stdlog,
-+					   "elf_locate_base: Couldn't read tag entry value -- return now\n");
-+		   }
-+	       }
- 	     *ptr = dyn_ptr;
- 	   }
- 	 return 1;
-@@ -544,6 +639,10 @@ solib_svr4_r_map (void)
+-	     *ptr = dyn_ptr;
+-	   }
+-	 return 1;
+-       }
++    if (dyn_tag == dyntag)
++      {
++	/* If requested, try to read the runtime value of this .dynamic
++	   entry.  */
++	if (ptr)
++	  {
++	    gdb_byte ptr_buf[8];
++	    CORE_ADDR ptr_addr;
++	    int got;
++
++	    ptr_addr = dyn_addr + (buf - bufstart) + arch_size / 8;
++	    if (ptr != NULL)
++	      {
++		if (debug_solib)
++		  fprintf_unfiltered (gdb_stdlog,
++				      "elf_locate_base: unrelocated ptr addr 0x%s\n",
++				      paddr_nz (ptr_addr));
++		ptr_addr += reloc_addr;
++		if (debug_solib) 
++		  fprintf_unfiltered (gdb_stdlog, 
++				      "elf_locate_base: relocated ptr addr 0x%s"
++				      " (relocation offset %s) for %s\n",
++				      paddr_nz (ptr_addr), paddr_nz (reloc_addr),
++				      exec_bfd->filename);
++	      }
++	    got = target_read_memory (ptr_addr, ptr_buf, arch_size / 8);
++	    if (got != 0 && reloc_addr)
++	      {
++		ptr_addr -= reloc_addr;
++		if (debug_solib) 
++		  fprintf_unfiltered (gdb_stdlog, 
++				      "elf_locate_base: unrelocated back to ptr addr 0x%s"
++				      " as the memory was unreable for %s\n",
++				      paddr_nz (ptr_addr), exec_bfd->filename);
++		got = target_read_memory (ptr_addr, ptr_buf, arch_size / 8);
++	      }
++
++	    if (got == 0)
++	      {
++		dyn_ptr = extract_typed_address (ptr_buf,
++						 builtin_type_void_data_ptr);
++		if (ptr != NULL)
++		  {
++		    if (debug_solib)
++		      fprintf_unfiltered (gdb_stdlog,
++					  "elf_locate_base: Tag entry has value 0x%s -- return now\n",
++					  paddr_nz (dyn_ptr));
++		  }
++	      }
++	    else
++	      {
++		if (ptr != NULL)
++		  {
++		    if (debug_solib)
++		      fprintf_unfiltered (gdb_stdlog,
++					  "elf_locate_base: Couldn't read tag entry value -- return now\n");
++		  }
++	      }
++	    *ptr = dyn_ptr;
++	  }
++	return 1;
++      }
+   }
+ 
+   return 0;
+@@ -544,6 +690,10 @@ solib_svr4_r_map (void)
  {
    struct link_map_offsets *lmo = svr4_fetch_link_map_offsets ();
  
@@ -388,7 +649,7 @@
    return read_memory_typed_address (debug_base + lmo->r_map_offset,
  				    builtin_type_void_data_ptr);
  }
-@@ -713,6 +812,11 @@ svr4_current_sos (void)
+@@ -713,6 +863,11 @@ svr4_current_sos (void)
    struct so_list *head = 0;
    struct so_list **link_ptr = &head;
    CORE_ADDR ldsomap = 0;
@@ -400,7 +661,7 @@
  
    /* Always locate the debug struct, in case it has moved.  */
    debug_base = 0;
-@@ -721,10 +825,19 @@ svr4_current_sos (void)
+@@ -721,10 +876,19 @@ 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)
@@ -421,7 +682,7 @@
    lm = solib_svr4_r_map ();
  
    while (lm)
-@@ -740,23 +853,103 @@ svr4_current_sos (void)
+@@ -740,23 +904,103 @@ svr4_current_sos (void)
        new->lm_info->lm = xzalloc (lmo->link_map_size);
        make_cleanup (xfree, new->lm_info->lm);
  
@@ -527,7 +788,7 @@
  	  target_read_string (LM_NAME (new), &buffer,
  			      SO_NAME_MAX_PATH_SIZE - 1, &errcode);
  	  if (errcode != 0)
-@@ -764,47 +957,60 @@ svr4_current_sos (void)
+@@ -764,47 +1008,60 @@ svr4_current_sos (void)
  		     safe_strerror (errcode));
  	  else
  	    {
@@ -573,15 +834,15 @@
 +			}
 +		      else
 +			debug_print_missing (new->so_name, build_id_filename);
-+
-+		      xfree (build_id_filename);
-+		      xfree (build_id);
-+		    }
  
 -		  /* Missing the build-id matching separate debug info file
 -		     would be handled while SO_NAME gets loaded.  */
 -		  name = build_id_to_filename (build_id, &build_id_filename, 0);
 -		  if (name != NULL)
++		      xfree (build_id_filename);
++		      xfree (build_id);
++		    }
++
 +		  if (debug_solib)
  		    {
 -		      strncpy (new->so_name, name, SO_NAME_MAX_PATH_SIZE - 1);
@@ -621,7 +882,7 @@
  	}
  
        /* On Solaris, the dynamic linker is not in the normal list of
-@@ -820,6 +1026,9 @@ svr4_current_sos (void)
+@@ -820,6 +1077,9 @@ svr4_current_sos (void)
    if (head == NULL)
      return svr4_default_sos ();
  
@@ -631,7 +892,7 @@
    return head;
  }
  
-@@ -921,7 +1130,7 @@ for (resolve = 0; resolve <= 1; resolve+
+@@ -921,7 +1181,7 @@ for (resolve = 0; resolve <= 1; resolve+
  /* 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.  */
@@ -640,7 +901,7 @@
  static int
  match_main (char *soname)
  {
-@@ -935,6 +1144,7 @@ match_main (char *soname)
+@@ -935,6 +1195,7 @@ match_main (char *soname)
  
    return (0);
  }
@@ -648,7 +909,7 @@
  
  /* Return 1 if PC lies in the dynamic symbol resolution code of the
     SVR4 run time loader.  */
-@@ -1086,11 +1296,17 @@ enable_break (void)
+@@ -1086,11 +1347,17 @@ enable_break (void)
    /* Find the .interp section; if not found, warn the user and drop
       into the old breakpoint at symbol code.  */
    interp_sect = bfd_get_section_by_name (exec_bfd, ".interp");
@@ -666,7 +927,7 @@
        int load_addr_found = 0;
        int loader_found_in_list = 0;
        struct so_list *so;
-@@ -1098,6 +1314,14 @@ enable_break (void)
+@@ -1098,6 +1365,14 @@ enable_break (void)
        struct target_ops *tmp_bfd_target;
        int tmp_fd = -1;
        char *tmp_pathname = NULL;
@@ -681,7 +942,7 @@
  
        /* Read the contents of the .interp section into a local buffer;
           the contents specify the dynamic linker this program uses.  */
-@@ -1120,6 +1344,9 @@ enable_break (void)
+@@ -1120,6 +1395,9 @@ enable_break (void)
        if (tmp_fd >= 0)
  	tmp_bfd = bfd_fopen (tmp_pathname, gnutarget, FOPEN_RB, tmp_fd);
  
@@ -691,7 +952,7 @@
        if (tmp_bfd == NULL)
  	goto bkpt_at_symbol;
  
-@@ -1181,16 +1408,16 @@ enable_break (void)
+@@ -1181,16 +1459,16 @@ enable_break (void)
        interp_sect = bfd_get_section_by_name (tmp_bfd, ".text");
        if (interp_sect)
  	{
@@ -712,7 +973,7 @@
  	  interp_plt_sect_high =
  	    interp_plt_sect_low + bfd_section_size (tmp_bfd, interp_sect);
  	}
-@@ -1225,7 +1452,11 @@ enable_break (void)
+@@ -1225,7 +1503,11 @@ enable_break (void)
  
        if (sym_addr != 0)
  	{
@@ -725,7 +986,7 @@
  	  return 1;
  	}
  
-@@ -1486,6 +1717,8 @@ svr4_solib_create_inferior_hook (void)
+@@ -1486,6 +1768,8 @@ svr4_solib_create_inferior_hook (void)
    while (stop_signal != TARGET_SIGNAL_TRAP);
    stop_soon = NO_STOP_QUIETLY;
  #endif /* defined(_SCO_DS) */
@@ -734,7 +995,7 @@
  }
  
  static void
-@@ -1666,6 +1899,75 @@ svr4_lp64_fetch_link_map_offsets (void)
+@@ -1666,6 +1950,75 @@ svr4_lp64_fetch_link_map_offsets (void)
  
    return lmp;
  }
@@ -810,7 +1071,7 @@
  
  
  struct target_so_ops svr4_so_ops;
-@@ -1724,4 +2026,7 @@ _initialize_svr4_solib (void)
+@@ -1724,4 +2077,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;
    svr4_so_ops.same = svr4_same;
@@ -818,293 +1079,9 @@
 +  add_info ("linkmap", info_linkmap_command,
 +	    "Display the inferior's linkmap.");
  }
-Index: gdb-6.8/gdb/varobj.c
-===================================================================
---- gdb-6.8.orig/gdb/varobj.c	2008-04-19 21:38:27.000000000 +0200
-+++ gdb-6.8/gdb/varobj.c	2008-04-19 21:38:33.000000000 +0200
-@@ -1075,6 +1075,62 @@ install_new_value (struct varobj *var, s
-   return changed;
- }
- 
-+void
-+varobj_refresh (void)
-+{
-+  struct varobj *var;
-+  struct varobj_root *croot;
-+  int mycount = rootcount;
-+  char * name;
-+
-+  croot = rootlist;
-+  while ((croot != NULL) && (mycount > 0))
-+    {
-+      var = croot->rootvar;
-+
-+      /* Get rid of the memory for the old expression.  This also
-+         leaves var->root->exp == NULL, which is ok for the parsing
-+         below.  */
-+      free_current_contents (&var->root->exp);
-+
-+      value_free (var->value);
-+      var->type = NULL;
-+
-+      name = xstrdup (var->name);
-+
-+      /* Reparse the expression.  Wrap the call to parse expression,
-+         so we can return a sensible error. */
-+      if (!gdb_parse_exp_1 (&name, var->root->valid_block, 0, &var->root->exp))
-+        {
-+          return;
-+        }
-+
-+      /* We definitively need to catch errors here.
-+         If evaluate_expression succeeds we got the value we wanted.
-+         But if it fails, we still go on with a call to evaluate_type()  */
-+      if (gdb_evaluate_expression (var->root->exp, &var->value))
-+        {
-+          /* no error */
-+          release_value (var->value);
-+          if (value_lazy (var->value))
-+            gdb_value_fetch_lazy (var->value);
-+        }
-+      else
-+        var->value = evaluate_type (var->root->exp);
-+
-+      var->type = value_type (var->value);
-+
-+      mycount--;
-+      croot = croot->next;
-+    }
-+
-+  if (mycount || (croot != NULL))
-+    warning
-+      ("varobj_refresh: assertion failed - wrong tally of root vars (%d:%d)",
-+       rootcount, mycount);
-+}
-+
-+
- /* Update the values for a variable and its children.  This is a
-    two-pronged attack.  First, re-parse the value for the root's
-    expression to see if it's changed.  Then go all the way
-Index: gdb-6.8/gdb/solist.h
-===================================================================
---- gdb-6.8.orig/gdb/solist.h	2008-01-07 16:19:58.000000000 +0100
-+++ gdb-6.8/gdb/solist.h	2008-04-19 21:38:33.000000000 +0200
-@@ -61,6 +61,8 @@ struct so_list
-     bfd *abfd;
-     char symbols_loaded;	/* flag: symbols read in yet? */
-     char from_tty;		/* flag: print msgs? */
-+    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;
-@@ -127,9 +129,15 @@ void free_so (struct so_list *so);
- /* Return address of first so_list entry in master shared object list.  */
- struct so_list *master_so_list (void);
- 
-+/* Return address of first so_list entry in master shared object list.  */
-+struct so_list *master_so_list (void);
-+
- /* Find solib binary file and open it.  */
- extern int solib_open (char *in_pathname, char **found_pathname);
- 
-+/* Add the list of sections in so_list to the target to_sections.  */
-+extern void add_to_target_sections (int, struct target_ops *, struct so_list *);
-+
- /* FIXME: gdbarch needs to control this variable */
- extern struct target_so_ops *current_target_so_ops;
- 
-@@ -140,4 +148,6 @@ struct symbol *solib_global_lookup (cons
- 				    const domain_enum domain,
- 				    struct symtab **symtab);
- 
-+/* Controls the printing of debugging output.  */
-+extern int debug_solib;
- #endif
-Index: gdb-6.8/gdb/varobj.h
-===================================================================
---- gdb-6.8.orig/gdb/varobj.h	2008-01-30 08:17:31.000000000 +0100
-+++ gdb-6.8/gdb/varobj.h	2008-04-19 21:38:33.000000000 +0200
-@@ -122,4 +122,6 @@ extern void varobj_invalidate (void);
- 
- extern int varobj_editable_p (struct varobj *var);
- 
-+extern void varobj_refresh(void);
-+
- #endif /* VAROBJ_H */
-Index: gdb-6.8/gdb/symfile.c
-===================================================================
---- gdb-6.8.orig/gdb/symfile.c	2008-04-19 21:38:32.000000000 +0200
-+++ gdb-6.8/gdb/symfile.c	2008-04-19 21:38:33.000000000 +0200
-@@ -47,6 +47,7 @@
- #include "readline/readline.h"
- #include "gdb_assert.h"
- #include "block.h"
-+#include "varobj.h"
- #include "observer.h"
- #include "exec.h"
- #include "parser-defs.h"
-@@ -815,7 +816,7 @@ syms_from_objfile (struct objfile *objfi
- 
-   /* Now either addrs or offsets is non-zero.  */
- 
--  if (mainline)
-+  if (mainline == 1)
-     {
-       /* We will modify the main symbol table, make sure that all its users
-          will be cleaned up if an error occurs during symbol reading.  */
-@@ -843,7 +844,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.  */
--  if (!mainline && addrs && addrs->other[0].name)
-+  if (/*!mainline &&*/ addrs && addrs->other[0].name)
-     {
-       asection *sect;
-       CORE_ADDR lower_offset = 0;	/* Shut up the GCC warning.  */
-@@ -1002,17 +1003,21 @@ 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)
-     {
-       /* OK, make it the "real" symbol file.  */
-       symfile_objfile = objfile;
- 
-       clear_symtab_users ();
-     }
--  else
-+  else if (mainline == 0)
-     {
-       breakpoint_re_set ();
-     }
-+  else
-+    {
-+      /* Don't reset breakpoints or it will screw up PIE.  */
-+    }
- 
-   /* We're done reading the symbol file; finish off complaints.  */
-   clear_complaints (&symfile_complaints, 0, verbo);
-@@ -1055,7 +1060,7 @@ symbol_file_add_with_addrs_or_offsets (b
-      interactively wiping out any existing symbols.  */
- 
-   if ((have_full_symbols () || have_partial_symbols ())
--      && mainline
-+      && (mainline == 1)
-       && from_tty
-       && !query ("Load new symbol table from \"%s\"? ", name))
-     error (_("Not confirmed."));
-@@ -1241,6 +1246,10 @@ 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
-@@ -3330,6 +3339,8 @@ reread_symbols (void)
- 	      /* Discard cleanups as symbol reading was successful.  */
- 	      discard_cleanups (old_cleanups);
- 
-+	      init_entry_point_info (objfile);
-+
- 	      /* 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.  */
-@@ -3698,6 +3709,7 @@ clear_symtab_users (void)
-   breakpoint_re_set ();
-   set_default_breakpoint (0, 0, 0, 0);
-   clear_pc_function_cache ();
-+  varobj_refresh ();
-   observer_notify_new_objfile (NULL);
- 
-   /* Clear globals which might have pointed into a removed objfile.
-Index: gdb-6.8/gdb/breakpoint.c
-===================================================================
---- gdb-6.8.orig/gdb/breakpoint.c	2008-04-19 21:38:33.000000000 +0200
-+++ gdb-6.8/gdb/breakpoint.c	2008-04-19 21:38:33.000000000 +0200
-@@ -3946,7 +3946,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)"
-@@ -4598,6 +4599,62 @@ disable_breakpoints_in_unloaded_shlib (s
-   }
- }
- 
-+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->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,
- 				    enum bptype bp_kind)
-Index: gdb-6.8/gdb/solib.c
-===================================================================
---- gdb-6.8.orig/gdb/solib.c	2008-01-07 16:19:58.000000000 +0100
-+++ gdb-6.8/gdb/solib.c	2008-04-19 21:38:33.000000000 +0200
-@@ -79,6 +79,8 @@ set_solib_ops (struct gdbarch *gdbarch, 
+--- ./gdb/solib.c	2008-01-07 16:19:58.000000000 +0100
++++ ./gdb/solib.c	2008-09-01 17:16:12.000000000 +0200
+@@ -79,6 +79,8 @@ set_solib_ops (struct gdbarch *gdbarch, 
  
  /* external data declarations */
  
@@ -1278,135 +1255,211 @@
 +			   NULL, NULL,
 +			   &setdebuglist, &showdebuglist);
  }
-Index: gdb-6.8/gdb/elfread.c
-===================================================================
---- gdb-6.8.orig/gdb/elfread.c	2008-01-01 23:53:09.000000000 +0100
-+++ gdb-6.8/gdb/elfread.c	2008-04-19 21:38:33.000000000 +0200
-@@ -644,7 +644,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. */
+--- ./gdb/solist.h	2008-01-07 16:19:58.000000000 +0100
++++ ./gdb/solist.h	2008-08-30 23:40:33.000000000 +0200
+@@ -61,6 +61,8 @@ struct so_list
+     bfd *abfd;
+     char symbols_loaded;	/* flag: symbols read in yet? */
+     char from_tty;		/* flag: print msgs? */
++    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;
+@@ -127,9 +129,15 @@ void free_so (struct so_list *so);
+ /* Return address of first so_list entry in master shared object list.  */
+ struct so_list *master_so_list (void);
+ 
++/* Return address of first so_list entry in master shared object list.  */
++struct so_list *master_so_list (void);
++
+ /* Find solib binary file and open it.  */
+ extern int solib_open (char *in_pathname, char **found_pathname);
+ 
++/* Add the list of sections in so_list to the target to_sections.  */
++extern void add_to_target_sections (int, struct target_ops *, struct so_list *);
++
+ /* FIXME: gdbarch needs to control this variable */
+ extern struct target_so_ops *current_target_so_ops;
+ 
+@@ -140,4 +148,6 @@ struct symbol *solib_global_lookup (cons
+ 				    const domain_enum domain,
+ 				    struct symtab **symtab);
+ 
++/* Controls the printing of debugging output.  */
++extern int debug_solib;
+ #endif
+--- ./gdb/symfile-mem.c	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/symfile-mem.c	2008-08-30 23:40:33.000000000 +0200
+@@ -116,7 +116,7 @@ symbol_file_add_from_memory (struct bfd 
+       }
+ 
+   objf = symbol_file_add_from_bfd (nbfd, from_tty,
+-                                   sai, 0, OBJF_SHARED);
++                                   sai, 2, OBJF_SHARED);
+ 
+   /* This might change our ideas about frames already looked at.  */
+   reinit_frame_cache ();
+--- ./gdb/symfile.c	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/symfile.c	2008-08-30 23:41:48.000000000 +0200
+@@ -47,6 +47,7 @@
+ #include "readline/readline.h"
+ #include "gdb_assert.h"
+ #include "block.h"
++#include "varobj.h"
+ #include "observer.h"
+ #include "exec.h"
+ #include "parser-defs.h"
+@@ -815,7 +816,7 @@ syms_from_objfile (struct objfile *objfi
+ 
+   /* Now either addrs or offsets is non-zero.  */
+ 
 -  if (mainline)
 +  if (mainline == 1)
      {
-       init_psymbol_list (objfile, 0);
-       mainline = 0;
-Index: gdb-6.8/gdb/Makefile.in
-===================================================================
---- gdb-6.8.orig/gdb/Makefile.in	2008-04-19 21:38:32.000000000 +0200
-+++ gdb-6.8/gdb/Makefile.in	2008-04-19 21:38:33.000000000 +0200
-@@ -1920,7 +1920,7 @@ amd64-tdep.o: amd64-tdep.c $(defs_h) $(a
- 	$(dummy_frame_h) $(frame_h) $(frame_base_h) $(frame_unwind_h) \
- 	$(inferior_h) $(gdbcmd_h) $(gdbcore_h) $(objfiles_h) $(regcache_h) \
- 	$(regset_h) $(symfile_h) $(gdb_assert_h) $(amd64_tdep_h) \
--	$(i387_tdep_h)
-+	$(i387_tdep_h) $(exceptions_h)
- annotate.o: annotate.c $(defs_h) $(annotate_h) $(value_h) $(target_h) \
- 	$(gdbtypes_h) $(breakpoint_h)
- arch-utils.o: arch-utils.c $(defs_h) $(arch_utils_h) $(buildsym_h) \
-Index: gdb-6.8/gdb/amd64-tdep.c
-===================================================================
---- gdb-6.8.orig/gdb/amd64-tdep.c	2008-04-19 21:38:28.000000000 +0200
-+++ gdb-6.8/gdb/amd64-tdep.c	2008-04-19 21:38:33.000000000 +0200
-@@ -36,6 +36,7 @@
- #include "symfile.h"
- #include "dwarf2-frame.h"
- #include "gdb_assert.h"
-+#include "exceptions.h"
- 
- #include "amd64-tdep.h"
- #include "i387-tdep.h"
-@@ -731,16 +732,28 @@ amd64_alloc_frame_cache (void)
-    Any function that doesn't start with this sequence will be assumed
-    to have no prologue and thus no valid frame pointer in %rbp.  */
+       /* We will modify the main symbol table, make sure that all its users
+          will be cleaned up if an error occurs during symbol reading.  */
+@@ -843,7 +844,7 @@ syms_from_objfile (struct objfile *objfi
  
--static CORE_ADDR
--amd64_analyze_prologue (CORE_ADDR pc, CORE_ADDR current_pc,
--			struct amd64_frame_cache *cache)
-+struct amd64_analyze_prologue_data
-+  {
-+    CORE_ADDR pc, current_pc;
-+    struct amd64_frame_cache *cache;
-+    CORE_ADDR retval;
-+  };
-+
-+static int
-+amd64_analyze_prologue_1 (void *data_pointer)
- {
-+  struct amd64_analyze_prologue_data *data = data_pointer;
-+  CORE_ADDR pc = data->pc, current_pc = data->current_pc;
-+  struct amd64_frame_cache *cache = data->cache;
-   static gdb_byte proto[3] = { 0x48, 0x89, 0xe5 }; /* movq %rsp, %rbp */
-   gdb_byte buf[3];
-   gdb_byte op;
+      We no longer warn if the lowest section is not a text segment (as
+      happens for the PA64 port.  */
+-  if (!mainline && addrs && addrs->other[0].name)
++  if (/*!mainline &&*/ addrs && addrs->other[0].name)
+     {
+       asection *sect;
+       CORE_ADDR lower_offset = 0;	/* Shut up the GCC warning.  */
+@@ -1002,17 +1003,21 @@ 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)
+     {
+       /* OK, make it the "real" symbol file.  */
+       symfile_objfile = objfile;
  
-   if (current_pc <= pc)
--    return current_pc;
+       clear_symtab_users ();
+     }
+-  else
++  else if (mainline == 0)
+     {
+       breakpoint_re_set ();
+     }
++  else
 +    {
-+      data->retval = current_pc;
-+      return 1;
++      /* Don't reset breakpoints or it will screw up PIE.  */
 +    }
  
-   op = read_memory_unsigned_integer (pc, 1);
+   /* We're done reading the symbol file; finish off complaints.  */
+   clear_complaints (&symfile_complaints, 0, verbo);
+@@ -1055,7 +1060,7 @@ symbol_file_add_with_addrs_or_offsets (b
+      interactively wiping out any existing symbols.  */
  
-@@ -753,18 +766,57 @@ amd64_analyze_prologue (CORE_ADDR pc, CO
+   if ((have_full_symbols () || have_partial_symbols ())
+-      && mainline
++      && (mainline == 1)
+       && from_tty
+       && !query ("Load new symbol table from \"%s\"? ", name))
+     error (_("Not confirmed."));
+@@ -1242,6 +1247,10 @@ 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 ();
  
-       /* If that's all, return now.  */
-       if (current_pc <= pc + 1)
--        return current_pc;
-+        {
-+	  data->retval = current_pc;
-+	  return 1;
-+        }
+     /* solib descriptors may have handles to objfiles.  Since their
+@@ -3335,6 +3344,8 @@ reread_symbols (void)
+ 	      /* Discard cleanups as symbol reading was successful.  */
+ 	      discard_cleanups (old_cleanups);
  
-       /* Check for `movq %rsp, %rbp'.  */
-       read_memory (pc + 1, buf, 3);
-       if (memcmp (buf, proto, 3) != 0)
--	return pc + 1;
-+	{
-+	  data->retval = pc + 1;
-+	  return 1;
-+	}
++	      init_entry_point_info (objfile);
++
+ 	      /* 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.  */
+@@ -3703,6 +3714,7 @@ clear_symtab_users (void)
+   breakpoint_re_set ();
+   set_default_breakpoint (0, 0, 0, 0);
+   clear_pc_function_cache ();
++  varobj_refresh ();
+   observer_notify_new_objfile (NULL);
  
-       /* OK, we actually have a frame.  */
-       cache->frameless_p = 0;
--      return pc + 4;
-+      data->retval = pc + 4;
-+      return 1;
-     }
+   /* Clear globals which might have pointed into a removed objfile.
+--- ./gdb/varobj.c	2008-09-01 17:16:38.000000000 +0200
++++ ./gdb/varobj.c	2008-08-30 23:40:33.000000000 +0200
+@@ -1075,6 +1075,62 @@ install_new_value (struct varobj *var, s
+   return changed;
+ }
  
-+  data->retval = pc;
-+  return 1;
-+}
++void
++varobj_refresh (void)
++{
++  struct varobj *var;
++  struct varobj_root *croot;
++  int mycount = rootcount;
++  char * name;
 +
-+/* Catch memory read errors and return just PC in such case.
-+   It occurs very early on enable_break->new_symfile_objfile->
-+   ->breakpoint_re_set->decode_line_1->decode_variable_1->
-+   ->find_function_start_sal  */
++  croot = rootlist;
++  while ((croot != NULL) && (mycount > 0))
++    {
++      var = croot->rootvar;
 +
-+static CORE_ADDR
-+amd64_analyze_prologue (CORE_ADDR pc, CORE_ADDR current_pc,
-+			struct amd64_frame_cache *cache)
-+{
-+  int status;
-+  struct amd64_analyze_prologue_data data;
-+  struct ui_file *saved_gdb_stderr;
++      /* Get rid of the memory for the old expression.  This also
++         leaves var->root->exp == NULL, which is ok for the parsing
++         below.  */
++      free_current_contents (&var->root->exp);
 +
-+  /* Suppress error messages.  */
-+  saved_gdb_stderr = gdb_stderr;
-+  gdb_stderr = ui_file_new ();
++      value_free (var->value);
++      var->type = NULL;
 +
-+  data.pc = pc;
-+  data.current_pc = current_pc;
-+  data.cache = cache;
-+  status = catch_errors (amd64_analyze_prologue_1, &data, "", RETURN_MASK_ALL);
++      name = xstrdup (var->name);
 +
-+  /* Stop suppressing error messages.  */
-+  ui_file_delete (gdb_stderr);
-+  gdb_stderr = saved_gdb_stderr;
++      /* Reparse the expression.  Wrap the call to parse expression,
++         so we can return a sensible error. */
++      if (!gdb_parse_exp_1 (&name, var->root->valid_block, 0, &var->root->exp))
++        {
++          return;
++        }
 +
-+  if (status)
-+    return data.retval;
-   return pc;
- }
++      /* We definitively need to catch errors here.
++         If evaluate_expression succeeds we got the value we wanted.
++         But if it fails, we still go on with a call to evaluate_type()  */
++      if (gdb_evaluate_expression (var->root->exp, &var->value))
++        {
++          /* no error */
++          release_value (var->value);
++          if (value_lazy (var->value))
++            gdb_value_fetch_lazy (var->value);
++        }
++      else
++        var->value = evaluate_type (var->root->exp);
++
++      var->type = value_type (var->value);
++
++      mycount--;
++      croot = croot->next;
++    }
++
++  if (mycount || (croot != NULL))
++    warning
++      ("varobj_refresh: assertion failed - wrong tally of root vars (%d:%d)",
++       rootcount, mycount);
++}
++
++
+ /* Update the values for a variable and its children.  This is a
+    two-pronged attack.  First, re-parse the value for the root's
+    expression to see if it's changed.  Then go all the way
+--- ./gdb/varobj.h	2008-01-30 08:17:31.000000000 +0100
++++ ./gdb/varobj.h	2008-08-30 23:40:33.000000000 +0200
+@@ -122,4 +122,6 @@ extern void varobj_invalidate (void);
+ 
+ extern int varobj_editable_p (struct varobj *var);
  
++extern void varobj_refresh(void);
++
+ #endif /* VAROBJ_H */


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- gdb.spec	28 Aug 2008 18:48:34 -0000	1.304
+++ gdb.spec	2 Sep 2008 00:55:43 -0000	1.305
@@ -13,7 +13,7 @@
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 23%{?_with_upstream:.upstream}%{?dist}
+Release: 24%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -882,6 +882,9 @@
 %endif
 
 %changelog
+* Tue Sep  2 2008 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8-24
+- Fix PIE patch regression for loading binaries from valgrind (BZ 460319).
+
 * Thu Aug 28 2008 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8-23
 - Fix attaching to stopped processes, based on the upstream version now.
   - Just kernel-2.6.25 neither upstream nor utrace work with it; 2.6.9 works.



From dchen at fedoraproject.org  Tue Sep  2 02:47:57 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue,  2 Sep 2008 02:47:57 +0000 (UTC)
Subject: rpms/UnihanDb/F-9 UnihanDb.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20080902024757.F2BF37011D@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	UnihanDb.spec import.log 
Log Message:
For Koji build


Index: UnihanDb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/UnihanDb/F-9/UnihanDb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnihanDb.spec	1 Sep 2008 08:26:27 -0000	1.1
+++ UnihanDb.spec	2 Sep 2008 02:47:27 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           UnihanDb
 %define         UnihanDb_name Unihan.db
-%define         rel_num 4
+%define         rel_num 5
 Version:        5.1.0
 Release:        %{rel_num}%{?dist}
 Group:          System Environment/Libraries
@@ -11,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-BuildRequires:  libUnihan-devel >= 0.4.1
+BuildRequires:  libUnihan-devel >= 0.4.1, net-tools
 Requires:	sqlite
 URL:            http://www.unicode.org/charts/unihan.html
 
@@ -50,6 +50,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Tue Sep 02 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1.0-5
+- For Koji build .
+
 * Thu Aug 14 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1.0-4
 - Change the license to MIT.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/UnihanDb/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Sep 2008 08:26:27 -0000	1.1
+++ import.log	2 Sep 2008 02:47:27 -0000	1.2
@@ -1 +1,2 @@
 UnihanDb-5_1_0-4_fc9:F-9:UnihanDb-5.1.0-4.fc9.src.rpm:1220257255
+UnihanDb-5_1_0-5_fc9:F-9:UnihanDb-5.1.0-5.fc9.src.rpm:1220323650



From mbarnes at fedoraproject.org  Tue Sep  2 03:17:17 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue,  2 Sep 2008 03:17:17 +0000 (UTC)
Subject: rpms/rarian/devel .cvsignore, 1.8, 1.9 rarian.spec, 1.16,
	1.17 sources, 1.7, 1.8
Message-ID: <20080902031717.894537011D@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

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

* Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 0.8.1-1
- Update to 0.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rarian/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Mar 2008 02:28:50 -0000	1.8
+++ .cvsignore	2 Sep 2008 03:16:47 -0000	1.9
@@ -1 +1 @@
-rarian-0.8.0.tar.bz2
+rarian-0.8.1.tar.bz2


Index: rarian.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rarian/devel/rarian.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rarian.spec	5 May 2008 00:02:55 -0000	1.16
+++ rarian.spec	2 Sep 2008 03:16:47 -0000	1.17
@@ -1,8 +1,8 @@
 ### Abstract ###
 
 Name: rarian
-Version: 0.8.0
-Release: 2%{?dist}
+Version: 0.8.1
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Summary: Rarian is a documentation meta-data library
@@ -122,6 +122,9 @@
 %{_libdir}/pkgconfig/rarian.pc
 
 %changelog
+* Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 0.8.1-1
+- Update to 0.8.1
+
 * Sun May  4 2008 Matthias Clasen <mclasen at redhat.com> - 0.8.0-2
 - Fix source url
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rarian/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Mar 2008 02:28:50 -0000	1.7
+++ sources	2 Sep 2008 03:16:47 -0000	1.8
@@ -1 +1 @@
-67e2d3ab27edcebdae9b85733712805e  rarian-0.8.0.tar.bz2
+75091185e13da67a0ff4279de1757b94  rarian-0.8.1.tar.bz2



From mbarnes at fedoraproject.org  Tue Sep  2 03:21:01 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue,  2 Sep 2008 03:21:01 +0000 (UTC)
Subject: rpms/yelp/devel .cvsignore, 1.45, 1.46 sources, 1.47, 1.48 yelp.spec,
	1.143, 1.144
Message-ID: <20080902032101.BE8DB7011D@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

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

* Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.91-1
- Update to 2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	22 Aug 2008 16:27:45 -0000	1.45
+++ .cvsignore	2 Sep 2008 03:20:31 -0000	1.46
@@ -1 +1 @@
-yelp-2.23.2.tar.bz2
+yelp-2.23.91.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	22 Aug 2008 16:27:45 -0000	1.47
+++ sources	2 Sep 2008 03:20:31 -0000	1.48
@@ -1 +1 @@
-13243b82d4859a395e782442b0ed07ce  yelp-2.23.2.tar.bz2
+32d4edbb5401e0745ecbdc2ac1101082  yelp-2.23.91.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- yelp.spec	22 Aug 2008 16:27:45 -0000	1.143
+++ yelp.spec	2 Sep 2008 03:20:31 -0000	1.144
@@ -19,7 +19,7 @@
 
 Summary: A system documentation reader from the Gnome project
 Name: yelp
-Version: 2.23.2
+Version: 2.23.91
 Release: 1%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.22/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
@@ -157,6 +157,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.2-1
 - Update to 2.23.2
 



From mbarnes at fedoraproject.org  Tue Sep  2 03:35:28 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue,  2 Sep 2008 03:35:28 +0000 (UTC)
Subject: rpms/libsoup/devel .cvsignore, 1.35, 1.36 libsoup.spec, 1.70,
	1.71 sources, 1.35, 1.36
Message-ID: <20080902033528.4A1FB7011D@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

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

* Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.91-1
- Update to 2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	4 Aug 2008 15:41:39 -0000	1.35
+++ .cvsignore	2 Sep 2008 03:34:57 -0000	1.36
@@ -1 +1 @@
-libsoup-2.23.6.tar.bz2
+libsoup-2.23.91.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- libsoup.spec	4 Aug 2008 15:41:39 -0000	1.70
+++ libsoup.spec	2 Sep 2008 03:34:58 -0000	1.71
@@ -3,7 +3,7 @@
 ### Abstract ###
 
 Name: libsoup
-Version: 2.23.6
+Version: 2.23.91
 Release: 1%{?dist}
 License: LGPLv2
 Group: Development/Libraries
@@ -80,6 +80,9 @@
 %{_datadir}/gtk-doc/html/%{name}-2.4
 
 %changelog
+* Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Mon Aug 04 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.6-1
 - Update to 2.23.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	4 Aug 2008 15:41:39 -0000	1.35
+++ sources	2 Sep 2008 03:34:58 -0000	1.36
@@ -1 +1 @@
-ed1f46179367a7057f627c0b21965f36  libsoup-2.23.6.tar.bz2
+6faf7318735540265534ea786b2341dd  libsoup-2.23.91.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep  2 04:29:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 04:29:57 +0000
Subject: [pkgdb] tcsh: panewt has requested watchbugzilla
Message-ID: <20080902042958.01DD8208D83@bastion.fedora.phx.redhat.com>

panewt has requested the watchbugzilla acl on tcsh (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 04:30:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 04:30:03 +0000
Subject: [pkgdb] tcsh: panewt has requested watchcommits
Message-ID: <20080902043009.D8D72208D84@bastion.fedora.phx.redhat.com>

panewt has requested the watchcommits acl on tcsh (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 04:47:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 04:47:00 +0000
Subject: [pkgdb] libgnomedb: huzaifas has requested watchbugzilla
Message-ID: <20080902044700.753C3208D81@bastion.fedora.phx.redhat.com>

huzaifas has requested the watchbugzilla acl on libgnomedb (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 04:48:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 04:48:05 +0000
Subject: [pkgdb] libgnomedb: huzaifas has requested commit
Message-ID: <20080902044702.A509E208D86@bastion.fedora.phx.redhat.com>

huzaifas has requested the commit acl on libgnomedb (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 04:47:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 04:47:02 +0000
Subject: [pkgdb] libgnomedb: huzaifas has requested approveacls
Message-ID: <20080902044708.5FF49208D89@bastion.fedora.phx.redhat.com>

huzaifas has requested the approveacls acl on libgnomedb (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 04:47:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 04:47:05 +0000
Subject: [pkgdb] libgnomedb: huzaifas has requested watchcommits
Message-ID: <20080902044709.03F94208D8C@bastion.fedora.phx.redhat.com>

huzaifas has requested the watchcommits acl on libgnomedb (Fedora devel)

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



From varekova at fedoraproject.org  Tue Sep  2 06:42:58 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue,  2 Sep 2008 06:42:58 +0000 (UTC)
Subject: rpms/man/devel man-1.5m2-posix.patch, 1.1,
	1.2 man-1.6b-man-pages.patch, 1.1, 1.2 man-1.6f-dashes.patch,
	1.1, 1.2 man.spec, 1.68, 1.69
Message-ID: <20080902064258.6348D7011D@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	man-1.5m2-posix.patch man-1.6b-man-pages.patch 
	man-1.6f-dashes.patch man.spec 
Log Message:
update patches



man-1.5m2-posix.patch:

Index: man-1.5m2-posix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man-1.5m2-posix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- man-1.5m2-posix.patch	9 Sep 2004 08:22:28 -0000	1.1
+++ man-1.5m2-posix.patch	2 Sep 2008 06:42:27 -0000	1.2
@@ -1,6 +1,7 @@
---- man-1.5m2/src/man.conf.in.posix	2004-03-24 15:03:53.000000000 -0500
-+++ man-1.5m2/src/man.conf.in	2004-03-24 15:08:27.000000000 -0500
-@@ -119,7 +119,7 @@
+diff -up man-1.6f/src/man.conf.in.posixxx man-1.6f/src/man.conf.in
+--- man-1.6f/src/man.conf.in.posixxx	2007-08-21 06:15:21.000000000 +0200
++++ man-1.6f/src/man.conf.in	2008-09-01 17:06:48.000000000 +0200
+@@ -119,7 +119,7 @@ COMPRESS_EXT	@compress_ext@
  # Default manual sections (and order) to search if -S is not specified
  # and the MANSECT environment variable is not set.
  #
@@ -9,12 +10,12 @@
  #
  # Default options to use when man is invoked without options
  # This is mainly for the benefit of those that think -a should be the default
-@@ -130,7 +130,7 @@
+@@ -130,7 +130,7 @@ MANSECT		@sections@
  # Decompress with given decompressor when input file has given extension
  # The command given must act as a filter.
  #
 -.gz		@gunzip@
 +.gz		/usr/bin/gunzip -c
  .bz2		@bzip2@
+ .lzma		@unlzma@
  .z		@pcat@
- .Z		@zcat@

man-1.6b-man-pages.patch:

Index: man-1.6b-man-pages.patch
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man-1.6b-man-pages.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- man-1.6b-man-pages.patch	10 Nov 2005 10:34:16 -0000	1.1
+++ man-1.6b-man-pages.patch	2 Sep 2008 06:42:27 -0000	1.2
@@ -1,38 +1,7 @@
---- man-1.6b/man/en/man.conf.man.pom	2005-09-19 08:30:42.000000000 +0200
-+++ man-1.6b/man/en/man.conf.man	2005-11-10 11:17:04.079116184 +0100
-@@ -1,7 +1,7 @@
- .\" @(#)man.conf
--.TH MAN.CONF 5 "September 19, 2005"
-+.TH MAN.CONFIG 5 "September 19, 2005"
- .SH NAME
--man.conf \- configuration data for man
-+man.config \- configuration data for man
- .SH DESCRIPTION
- .LP
- This file is read by
-@@ -12,7 +12,7 @@
- An alternative version of this file can be specified with
- .LP
- .RS
--man -C private_man.conf ...
-+man -C private_man.config ...
- .RE
- .LP
- The command names may be provided with options. 
---- man-1.6b/man/en/makewhatis.man.pom	2005-09-19 08:29:48.000000000 +0200
-+++ man-1.6b/man/en/makewhatis.man	2005-11-10 11:17:51.367927192 +0100
-@@ -49,7 +49,7 @@
- .SH OPTIONS
- .TP
- .B -u
--Update database with new pages.
-+Update database with new pages (file's status was last changed 24 hours ago)
- .TP
- .B -v
- Verbose output
---- man-1.6b/man/en/man.man.pom	2005-09-19 08:27:29.000000000 +0200
-+++ man-1.6b/man/en/man.man	2005-11-10 11:19:03.836910232 +0100
-@@ -72,7 +72,7 @@
+diff -up man-1.6f/man/en/man.man.up12346 man-1.6f/man/en/man.man
+--- man-1.6f/man/en/man.man.up12346	2007-12-22 12:38:57.000000000 +0100
++++ man-1.6f/man/en/man.man	2008-09-01 17:27:43.000000000 +0200
+@@ -101,7 +101,7 @@ Distributions customize the manual secti
  Specify the configuration file to use; the default is
  .BR @man_config_file@ .
  (See
@@ -41,7 +10,7 @@
  .TP
  .B \-\^M " path"
  Specify the list of directories to search for man pages.
-@@ -218,7 +218,7 @@
+@@ -247,7 +247,7 @@ can be specified in
  No cat pages are saved when the required cat directory does not exist.
  No cat pages are saved when they are formatted for a line length
  different from 80.
@@ -50,9 +19,43 @@
  .PP
  It is possible to make
  .B man
-@@ -491,4 +491,4 @@
- Zeyd M. Ben-Halim released man 1.2, and Andries Brouwer followed up with versions 1.3 thru 1.5p.
+@@ -521,4 +521,4 @@ Zeyd M. Ben-Halim released man 1.2, and 
+ versions 1.3 thru 1.5p.
  Federico Lucifredi <flucifredi at acm.org> is the current maintainer.
  .SH "SEE ALSO"
 -apropos(1), whatis(1), less(1), groff(1), man.conf(5).
 +apropos(1), whatis(1), less(1), groff(1), man.config(5).
+diff -up man-1.6f/man/en/makewhatis.man.up12346 man-1.6f/man/en/makewhatis.man
+--- man-1.6f/man/en/makewhatis.man.up12346	2006-07-19 06:28:47.000000000 +0200
++++ man-1.6f/man/en/makewhatis.man	2008-09-01 17:27:43.000000000 +0200
+@@ -49,7 +49,7 @@ is assumed by default.
+ .SH OPTIONS
+ .TP
+ .B -u
+-Update database with new pages.
++Update database with new pages (file's status was last changed 24 hours ago)
+ .TP
+ .B -v
+ Verbose output
+diff -up man-1.6f/man/en/man.conf.man.up12346 man-1.6f/man/en/man.conf.man
+--- man-1.6f/man/en/man.conf.man.up12346	2005-09-19 08:30:42.000000000 +0200
++++ man-1.6f/man/en/man.conf.man	2008-09-01 17:27:43.000000000 +0200
+@@ -1,7 +1,7 @@
+ .\" @(#)man.conf
+-.TH MAN.CONF 5 "September 19, 2005"
++.TH MAN.CONFIG 5 "September 19, 2005"
+ .SH NAME
+-man.conf \- configuration data for man
++man.config \- configuration data for man
+ .SH DESCRIPTION
+ .LP
+ This file is read by
+@@ -12,7 +12,7 @@ and (c) a list with uncompressors for fi
+ An alternative version of this file can be specified with
+ .LP
+ .RS
+-man -C private_man.conf ...
++man -C private_man.config ...
+ .RE
+ .LP
+ The command names may be provided with options. 

man-1.6f-dashes.patch:

Index: man-1.6f-dashes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man-1.6f-dashes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- man-1.6f-dashes.patch	20 Mar 2008 09:50:07 -0000	1.1
+++ man-1.6f-dashes.patch	2 Sep 2008 06:42:27 -0000	1.2
@@ -1,11 +1,12 @@
---- man-1.6d/src/makewhatis.sh.dash	2006-10-24 08:56:44.000000000 +0200
-+++ man-1.6d/src/makewhatis.sh	2006-10-24 09:52:24.000000000 +0200
-@@ -353,7 +353,7 @@
- 	      sub(/ $/, "", x);               # Kill trailing spaces (again)          
+diff -up man-1.6f/src/makewhatis.sh.dash man-1.6f/src/makewhatis.sh
+--- man-1.6f/src/makewhatis.sh.dash	2008-09-01 17:37:13.000000000 +0200
++++ man-1.6f/src/makewhatis.sh	2008-09-01 17:37:13.000000000 +0200
+@@ -415,7 +415,7 @@ do
+ 	      sub(/ $/, "", x);               # Kill trailing spaces (again)
  	      sub(/\.$/, "", x);              # Kill trailing period
  
 -	      if (!match(x, / - /))
 +      if (!match(x, / --? /))
-		return;
+ 		return;
  
  	      after_dash = substr(x, RSTART);


Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- man.spec	1 Sep 2008 14:44:59 -0000	1.68
+++ man.spec	2 Sep 2008 06:42:27 -0000	1.69
@@ -63,7 +63,7 @@
 %patch19 -p1 -b .sec
 %patch20 -p1 -b .xorg
 %patch21 -p1 -b .i18n_nroff
-%patch22 -p1 -b .up 
+%patch22 -p1 -b .up
 %patch23 -p1 -b .rpm
 %patch24 -p1 -b .disp
 %patch25 -p1 -b .dash



From peter at fedoraproject.org  Tue Sep  2 06:45:09 2008
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue,  2 Sep 2008 06:45:09 +0000 (UTC)
Subject: rpms/rlog/devel import.log,1.1,1.2 rlog.spec,1.8,1.9
Message-ID: <20080902064509.DBCA97011D@cvs1.fedora.phx.redhat.com>

Author: peter

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

Modified Files:
	import.log rlog.spec 
Log Message:
Fixed build for F-8


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rlog/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Jul 2008 13:49:36 -0000	1.1
+++ import.log	2 Sep 2008 06:44:39 -0000	1.2
@@ -1 +1,2 @@
 rlog-1_4-1_fc9:HEAD:rlog-1.4-1.fc9.src.rpm:1215870506
+rlog-1_4-2_fc9:HEAD:rlog-1.4-2.fc9.src.rpm:1220337766


Index: rlog.spec
===================================================================
RCS file: /cvs/extras/rpms/rlog/devel/rlog.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rlog.spec	12 Jul 2008 13:49:36 -0000	1.8
+++ rlog.spec	2 Sep 2008 06:44:39 -0000	1.9
@@ -1,13 +1,17 @@
 Name:		rlog
 Summary:	Runtime Logging for C++
 Version:	1.4
-Release:	1%{?dist}
-License:	LGPLv21+
+Release:	2%{?dist}
+License:	LGPLv2+
 Group:		Development/Libraries
 Url:		http://arg0.net/wiki/rlog
 Source0:	http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:	http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz.asc
+%if "%{?fedora}" > "8"
 BuildRequires:	valgrind-devel
+%else
+BuildRequires:	valgrind
+%endif
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -59,6 +63,10 @@
 %doc docs/html docs/latex/refman.pdf
 
 %changelog
+* Tue Sep  2 2008 Peter Lemenkov <lemenkov at gmail.com> 1.4-2
+- Fix build for F-8
+- Fixed license header (LGLV21+ -> LGPLv2+)
+
 * Sat Jul 12 2008 Peter Lemenkov <lemenkov at gmail.com> 1.4-1
 - Ver. 1.4
 - Dropped upstreamed patch



From pkgdb at fedoraproject.org  Tue Sep  2 06:46:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:46:44 +0000
Subject: [pkgdb] kdeaddons: jreznik has requested watchbugzilla
Message-ID: <20080902064541.9B42F208D83@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdeaddons (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:46:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:46:48 +0000
Subject: [pkgdb] kdeaddons: jreznik has requested watchcommits
Message-ID: <20080902064545.72F7C208D8B@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdeaddons (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:45:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:45:53 +0000
Subject: [pkgdb] kdeaddons: jreznik has requested commit
Message-ID: <20080902064554.60BF2208D8D@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdeaddons (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:47:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:47:14 +0000
Subject: [pkgdb] kdeaddons: jreznik has requested watchbugzilla
Message-ID: <20080902064611.A0396208D87@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdeaddons (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:46:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:46:14 +0000
Subject: [pkgdb] kdeaddons: jreznik has requested watchcommits
Message-ID: <20080902064615.95C34208D8F@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdeaddons (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:46:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:46:15 +0000
Subject: [pkgdb] kdeaddons: jreznik has requested commit
Message-ID: <20080902064616.0FE5A208D90@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdeaddons (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:47:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:47:25 +0000
Subject: [pkgdb] kdeaddons: jreznik has requested watchbugzilla
Message-ID: <20080902064622.4DB97208D8C@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdeaddons (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:46:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:46:30 +0000
Subject: [pkgdb] kdeaddons: jreznik has requested watchcommits
Message-ID: <20080902064630.D5A41208D84@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdeaddons (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:46:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:46:35 +0000
Subject: [pkgdb] kdeaddons: jreznik has requested commit
Message-ID: <20080902064636.08BE6208D97@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdeaddons (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:46:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:46:37 +0000
Subject: [pkgdb] kdeaddons: jreznik has requested watchbugzilla
Message-ID: <20080902064637.8888E208D9B@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdeaddons (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:47:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:47:42 +0000
Subject: [pkgdb] kdeaddons: jreznik has requested watchcommits
Message-ID: <20080902064639.A4F8C208D8F@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdeaddons (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:46:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:46:44 +0000
Subject: [pkgdb] kdeaddons: jreznik has requested commit
Message-ID: <20080902064645.6733F208D9F@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdeaddons (Fedora 9)

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



From peter at fedoraproject.org  Tue Sep  2 06:47:53 2008
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue,  2 Sep 2008 06:47:53 +0000 (UTC)
Subject: rpms/rlog/F-9 import.log,1.1,1.2 rlog.spec,1.7,1.8
Message-ID: <20080902064753.405E07011D@cvs1.fedora.phx.redhat.com>

Author: peter

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

Modified Files:
	import.log rlog.spec 
Log Message:
Fixed build for F-8


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rlog/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Jul 2008 13:53:16 -0000	1.1
+++ import.log	2 Sep 2008 06:47:22 -0000	1.2
@@ -1 +1,2 @@
 rlog-1_4-1_fc9:F-9:rlog-1.4-1.fc9.src.rpm:1215870680
+rlog-1_4-2_fc9:F-9:rlog-1.4-2.fc9.src.rpm:1220337957


Index: rlog.spec
===================================================================
RCS file: /cvs/extras/rpms/rlog/F-9/rlog.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rlog.spec	12 Jul 2008 13:53:16 -0000	1.7
+++ rlog.spec	2 Sep 2008 06:47:22 -0000	1.8
@@ -1,13 +1,17 @@
 Name:		rlog
 Summary:	Runtime Logging for C++
 Version:	1.4
-Release:	1%{?dist}
-License:	LGPLv21+
+Release:	2%{?dist}
+License:	LGPLv2+
 Group:		Development/Libraries
 Url:		http://arg0.net/wiki/rlog
 Source0:	http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:	http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz.asc
+%if "%{?fedora}" > "8"
 BuildRequires:	valgrind-devel
+%else
+BuildRequires:	valgrind
+%endif
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -59,6 +63,10 @@
 %doc docs/html docs/latex/refman.pdf
 
 %changelog
+* Tue Sep  2 2008 Peter Lemenkov <lemenkov at gmail.com> 1.4-2
+- Fix build for F-8
+- Fixed license header (LGLV21+ -> LGPLv2+)
+
 * Sat Jul 12 2008 Peter Lemenkov <lemenkov at gmail.com> 1.4-1
 - Ver. 1.4
 - Dropped upstreamed patch



From pkgdb at fedoraproject.org  Tue Sep  2 06:47:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:47:58 +0000
Subject: [pkgdb] kdeaccessibility: jreznik has requested watchbugzilla
Message-ID: <20080902064758.7F85C208D87@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdeaccessibility (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:49:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:49:03 +0000
Subject: [pkgdb] kdeaccessibility: jreznik has requested watchcommits
Message-ID: <20080902064800.46537208D8F@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdeaccessibility (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:48:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:48:04 +0000
Subject: [pkgdb] kdeaccessibility: jreznik has requested commit
Message-ID: <20080902064805.D00FE208D8C@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdeaccessibility (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:48:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:48:10 +0000
Subject: [pkgdb] kdeaccessibility: jreznik has requested watchbugzilla
Message-ID: <20080902064810.70885208D96@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdeaccessibility (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:48:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:48:13 +0000
Subject: [pkgdb] kdeaccessibility: jreznik has requested watchcommits
Message-ID: <20080902064813.9519B208D9B@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdeaccessibility (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:49:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:49:18 +0000
Subject: [pkgdb] kdeaccessibility: jreznik has requested commit
Message-ID: <20080902064815.401A7208DA0@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdeaccessibility (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:48:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:48:18 +0000
Subject: [pkgdb] kdeaccessibility: jreznik has requested watchbugzilla
Message-ID: <20080902064818.22B15208DA3@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdeaccessibility (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:48:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:48:21 +0000
Subject: [pkgdb] kdeaccessibility: jreznik has requested watchcommits
Message-ID: <20080902064823.01E87208DA6@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdeaccessibility (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:48:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:48:25 +0000
Subject: [pkgdb] kdeaccessibility: jreznik has requested commit
Message-ID: <20080902064827.904FC208DAA@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdeaccessibility (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:48:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:48:28 +0000
Subject: [pkgdb] kdeaccessibility: jreznik has requested watchbugzilla
Message-ID: <20080902064828.D0FE3208DAD@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdeaccessibility (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:48:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:48:32 +0000
Subject: [pkgdb] kdeaccessibility: jreznik has requested watchcommits
Message-ID: <20080902064834.78E90208DB2@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdeaccessibility (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:48:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:48:35 +0000
Subject: [pkgdb] kdeaccessibility: jreznik has requested commit
Message-ID: <20080902064835.4A52A208DB7@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdeaccessibility (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:50:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:50:20 +0000
Subject: [pkgdb] kdeartwork: jreznik has requested watchbugzilla
Message-ID: <20080902064917.B3329208D92@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdeartwork (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:49:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:49:22 +0000
Subject: [pkgdb] kdeartwork: jreznik has requested watchcommits
Message-ID: <20080902064924.14AE0208D7F@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdeartwork (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:50:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:50:27 +0000
Subject: [pkgdb] kdeartwork: jreznik has requested commit
Message-ID: <20080902064924.9402D208D99@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdeartwork (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:49:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:49:30 +0000
Subject: [pkgdb] kdeartwork: jreznik has requested watchbugzilla
Message-ID: <20080902064930.F33C6208D9E@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdeartwork (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:49:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:49:32 +0000
Subject: [pkgdb] kdeartwork: jreznik has requested watchcommits
Message-ID: <20080902064932.343FF208DB9@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdeartwork (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:50:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:50:38 +0000
Subject: [pkgdb] kdeartwork: jreznik has requested commit
Message-ID: <20080902064935.3FDB4208DA3@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdeartwork (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:49:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:49:44 +0000
Subject: [pkgdb] kdeartwork: jreznik has requested watchbugzilla
Message-ID: <20080902064944.1B6A0208DBC@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdeartwork (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:50:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:50:48 +0000
Subject: [pkgdb] kdeartwork: jreznik has requested watchcommits
Message-ID: <20080902064945.B59AD208DA7@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdeartwork (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:49:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:49:49 +0000
Subject: [pkgdb] kdeartwork: jreznik has requested commit
Message-ID: <20080902064950.995AC208DC1@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdeartwork (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:50:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:50:56 +0000
Subject: [pkgdb] kdeartwork: jreznik has requested watchbugzilla
Message-ID: <20080902064953.53DED208DC6@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdeartwork (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:49:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:49:57 +0000
Subject: [pkgdb] kdeartwork: jreznik has requested watchcommits
Message-ID: <20080902064958.0B560208DAA@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdeartwork (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:51:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:51:02 +0000
Subject: [pkgdb] kdeartwork: jreznik has requested commit
Message-ID: <20080902064958.E3881208DC9@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdeartwork (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:50:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:50:44 +0000
Subject: [pkgdb] kdebase: jreznik has requested watchbugzilla
Message-ID: <20080902065045.02E71208DAD@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdebase (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:51:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:51:49 +0000
Subject: [pkgdb] kdebase: jreznik has requested watchcommits
Message-ID: <20080902065046.A3533208DB1@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdebase (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:50:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:50:50 +0000
Subject: [pkgdb] kdebase: jreznik has requested commit
Message-ID: <20080902065051.5C49C208D93@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdebase (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:50:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:50:52 +0000
Subject: [pkgdb] kdebase: jreznik has requested watchbugzilla
Message-ID: <20080902065053.0C8EA208DB5@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdebase (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:50:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:50:54 +0000
Subject: [pkgdb] kdebase: jreznik has requested watchcommits
Message-ID: <20080902065054.ADBBA208DCB@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdebase (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:51:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:51:59 +0000
Subject: [pkgdb] kdebase: jreznik has requested commit
Message-ID: <20080902065056.72F6B208DCF@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdebase (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:52:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:52:10 +0000
Subject: [pkgdb] kdebase: jreznik has requested commit
Message-ID: <20080902065107.6BDD5208DD7@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdebase (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:51:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:51:03 +0000
Subject: [pkgdb] kdebase: jreznik has requested watchbugzilla
Message-ID: <20080902065104.BA814208DD0@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdebase (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:51:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:51:05 +0000
Subject: [pkgdb] kdebase: jreznik has requested watchcommits
Message-ID: <20080902065105.82221208DD2@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdebase (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:51:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:51:09 +0000
Subject: [pkgdb] kdebase: jreznik has requested watchbugzilla
Message-ID: <20080902065109.23258208DDA@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdebase (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:52:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:52:15 +0000
Subject: [pkgdb] kdebase: jreznik has requested watchcommits
Message-ID: <20080902065112.1A43E208DDE@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdebase (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:51:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:51:14 +0000
Subject: [pkgdb] kdebase: jreznik has requested commit
Message-ID: <20080902065115.9930D208D9B@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdebase (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:53:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:53:23 +0000
Subject: [pkgdb] kdebase3: jreznik has requested watchbugzilla
Message-ID: <20080902065220.6E7C3208DA6@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdebase3 (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:52:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:52:24 +0000
Subject: [pkgdb] kdebase3: jreznik has requested watchcommits
Message-ID: <20080902065224.C30FD208DBD@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdebase3 (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:52:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:52:25 +0000
Subject: [pkgdb] kdebase3: jreznik has requested commit
Message-ID: <20080902065225.B43ED208DC1@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdebase3 (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:52:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:52:33 +0000
Subject: [pkgdb] kdebase3: jreznik has requested watchbugzilla
Message-ID: <20080902065233.43B0C208DAB@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdebase3 (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:52:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:52:34 +0000
Subject: [pkgdb] kdebase3: jreznik has requested watchcommits
Message-ID: <20080902065234.7298D208DE8@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdebase3 (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:52:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:52:35 +0000
Subject: [pkgdb] kdebase3: jreznik has requested commit
Message-ID: <20080902065235.A30E9208DEF@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdebase3 (Fedora 9)

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



From peter at fedoraproject.org  Tue Sep  2 06:52:40 2008
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue,  2 Sep 2008 06:52:40 +0000 (UTC)
Subject: rpms/rlog/F-8 import.log,1.1,1.2 rlog.spec,1.5,1.6
Message-ID: <20080902065240.3DBCA7011D@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/extras/rpms/rlog/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19117/F-8

Modified Files:
	import.log rlog.spec 
Log Message:
Fixed build for F-8


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rlog/F-8/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Jul 2008 13:56:20 -0000	1.1
+++ import.log	2 Sep 2008 06:52:09 -0000	1.2
@@ -1 +1,2 @@
 rlog-1_4-1_fc9:F-8:rlog-1.4-1.fc9.src.rpm:1215870934
+rlog-1_4-2_fc9:F-8:rlog-1.4-2.fc9.src.rpm:1220338219


Index: rlog.spec
===================================================================
RCS file: /cvs/extras/rpms/rlog/F-8/rlog.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rlog.spec	12 Jul 2008 13:56:20 -0000	1.5
+++ rlog.spec	2 Sep 2008 06:52:09 -0000	1.6
@@ -1,13 +1,17 @@
 Name:		rlog
 Summary:	Runtime Logging for C++
 Version:	1.4
-Release:	1%{?dist}
-License:	LGPLv21+
+Release:	2%{?dist}
+License:	LGPLv2+
 Group:		Development/Libraries
 Url:		http://arg0.net/wiki/rlog
 Source0:	http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:	http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz.asc
+%if "%{?fedora}" > "8"
 BuildRequires:	valgrind-devel
+%else
+BuildRequires:	valgrind
+%endif
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -59,6 +63,10 @@
 %doc docs/html docs/latex/refman.pdf
 
 %changelog
+* Tue Sep  2 2008 Peter Lemenkov <lemenkov at gmail.com> 1.4-2
+- Fix build for F-8
+- Fixed license header (LGLV21+ -> LGPLv2+)
+
 * Sat Jul 12 2008 Peter Lemenkov <lemenkov at gmail.com> 1.4-1
 - Ver. 1.4
 - Dropped upstreamed patch



From pkgdb at fedoraproject.org  Tue Sep  2 06:53:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:53:05 +0000
Subject: [pkgdb] kdebase-runtime: jreznik has requested watchbugzilla
Message-ID: <20080902065306.AA95C208D8B@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdebase-runtime (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:53:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:53:07 +0000
Subject: [pkgdb] kdebase-runtime: jreznik has requested watchcommits
Message-ID: <20080902065307.955E1208DAC@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdebase-runtime (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:54:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:54:12 +0000
Subject: [pkgdb] kdebase-runtime: jreznik has requested commit
Message-ID: <20080902065309.26F06208DC9@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdebase-runtime (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:53:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:53:14 +0000
Subject: [pkgdb] kdebase-runtime: jreznik has requested watchbugzilla
Message-ID: <20080902065314.79539208DB1@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdebase-runtime (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:54:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:54:19 +0000
Subject: [pkgdb] kdebase-runtime: jreznik has requested watchcommits
Message-ID: <20080902065315.E3CC3208DF8@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdebase-runtime (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:53:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:53:18 +0000
Subject: [pkgdb] kdebase-runtime: jreznik has requested commit
Message-ID: <20080902065319.71E90208E00@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdebase-runtime (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:53:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:53:22 +0000
Subject: [pkgdb] kdebase-runtime: jreznik has requested watchbugzilla
Message-ID: <20080902065322.8D28B208DB4@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdebase-runtime (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:54:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:54:27 +0000
Subject: [pkgdb] kdebase-runtime: jreznik has requested watchcommits
Message-ID: <20080902065324.42214208E05@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdebase-runtime (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:53:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:53:26 +0000
Subject: [pkgdb] kdebase-runtime: jreznik has requested commit
Message-ID: <20080902065327.C2982208E0A@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdebase-runtime (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:53:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:53:29 +0000
Subject: [pkgdb] kdebase-runtime: jreznik has requested watchbugzilla
Message-ID: <20080902065329.40940208E10@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdebase-runtime (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:54:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:54:33 +0000
Subject: [pkgdb] kdebase-runtime: jreznik has requested watchcommits
Message-ID: <20080902065330.7F501208E15@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdebase-runtime (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:53:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:53:33 +0000
Subject: [pkgdb] kdebase-runtime: jreznik has requested commit
Message-ID: <20080902065334.1FAC4208DB7@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdebase-runtime (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:53:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:53:53 +0000
Subject: [pkgdb] kdebase-workspace: jreznik has requested watchbugzilla
Message-ID: <20080902065353.B00C9208DCE@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdebase-workspace (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:53:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:53:56 +0000
Subject: [pkgdb] kdebase-workspace: jreznik has requested watchcommits
Message-ID: <20080902065356.265C1208D96@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdebase-workspace (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:53:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:53:58 +0000
Subject: [pkgdb] kdebase-workspace: jreznik has requested commit
Message-ID: <20080902065359.11FC8208E20@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdebase-workspace (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:54:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:54:01 +0000
Subject: [pkgdb] kdebase-workspace: jreznik has requested watchbugzilla
Message-ID: <20080902065401.C21EE208E27@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdebase-workspace (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:55:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:55:06 +0000
Subject: [pkgdb] kdebase-workspace: jreznik has requested watchcommits
Message-ID: <20080902065403.29FCB208E2E@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdebase-workspace (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:54:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:54:04 +0000
Subject: [pkgdb] kdebase-workspace: jreznik has requested commit
Message-ID: <20080902065404.8DC2F208E35@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdebase-workspace (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:54:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:54:35 +0000
Subject: [pkgdb] kdebindings: jreznik has requested commit
Message-ID: <20080902065435.6EA40208DDA@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdebindings (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:54:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:54:34 +0000
Subject: [pkgdb] kdebindings: jreznik has requested watchbugzilla
Message-ID: <20080902065435.8F6BA208DD7@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdebindings (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:54:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:54:36 +0000
Subject: [pkgdb] kdebindings: jreznik has requested watchcommits
Message-ID: <20080902065437.8FE03208DE0@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdebindings (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:55:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:55:41 +0000
Subject: [pkgdb] kdebindings: jreznik has requested watchbugzilla
Message-ID: <20080902065438.5E2AC208E3D@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdebindings (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:55:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:55:45 +0000
Subject: [pkgdb] kdebindings: jreznik has requested watchbugzilla
Message-ID: <20080902065442.533D1208D9C@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdebindings (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:54:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:54:42 +0000
Subject: [pkgdb] kdebindings: jreznik has requested watchcommits
Message-ID: <20080902065443.DE010208E40@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdebindings (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:54:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:54:43 +0000
Subject: [pkgdb] kdebindings: jreznik has requested commit
Message-ID: <20080902065445.257C0208E44@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdebindings (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:54:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:54:45 +0000
Subject: [pkgdb] kdebindings: jreznik has requested commit
Message-ID: <20080902065445.72F1D208E48@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdebindings (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:54:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:54:46 +0000
Subject: [pkgdb] kdebindings: jreznik has requested watchcommits
Message-ID: <20080902065446.E594E208E4D@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdebindings (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:54:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:54:47 +0000
Subject: [pkgdb] kdebindings: jreznik has requested watchbugzilla
Message-ID: <20080902065447.D3A41208E53@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdebindings (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:54:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:54:47 +0000
Subject: [pkgdb] kdebindings: jreznik has requested watchcommits
Message-ID: <20080902065448.5E015208E55@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdebindings (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:55:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:55:53 +0000
Subject: [pkgdb] kdebindings: jreznik has requested commit
Message-ID: <20080902065450.74E49208E58@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdebindings (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:56:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:56:35 +0000
Subject: [pkgdb] kdeedu: jreznik has requested watchbugzilla
Message-ID: <20080902065532.67350208D9F@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdeedu (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:55:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:55:32 +0000
Subject: [pkgdb] kdeedu: jreznik has requested commit
Message-ID: <20080902065532.AD763208DA3@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdeedu (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:56:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:56:37 +0000
Subject: [pkgdb] kdeedu: jreznik has requested watchbugzilla
Message-ID: <20080902065534.B2538208DB8@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdeedu (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:55:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:55:35 +0000
Subject: [pkgdb] kdeedu: jreznik has requested watchcommits
Message-ID: <20080902065536.C8CE1208DBB@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdeedu (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:55:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:55:36 +0000
Subject: [pkgdb] kdeedu: jreznik has requested watchcommits
Message-ID: <20080902065537.125CF208DBF@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdeedu (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:55:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:55:38 +0000
Subject: [pkgdb] kdeedu: jreznik has requested commit
Message-ID: <20080902065539.5DC54208E59@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdeedu (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:55:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:55:41 +0000
Subject: [pkgdb] kdeedu: jreznik has requested commit
Message-ID: <20080902065541.36E6C208E5D@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdeedu (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:56:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:56:44 +0000
Subject: [pkgdb] kdeedu: jreznik has requested watchbugzilla
Message-ID: <20080902065541.D651C208E61@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdeedu (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:56:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:56:46 +0000
Subject: [pkgdb] kdeedu: jreznik has requested watchbugzilla
Message-ID: <20080902065543.A77F7208E65@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdeedu (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:55:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:55:45 +0000
Subject: [pkgdb] kdeedu: jreznik has requested commit
Message-ID: <20080902065545.1EF39208E67@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdeedu (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:55:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:55:44 +0000
Subject: [pkgdb] kdeedu: jreznik has requested watchcommits
Message-ID: <20080902065545.82E02208E6C@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdeedu (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:55:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:55:45 +0000
Subject: [pkgdb] kdeedu: jreznik has requested watchcommits
Message-ID: <20080902065546.C29FF208DC6@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdeedu (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:56:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:56:18 +0000
Subject: [pkgdb] kde-filesystem: jreznik has requested watchbugzilla
Message-ID: <20080902065619.92BB1208DE6@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kde-filesystem (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:56:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:56:24 +0000
Subject: [pkgdb] kde-filesystem: jreznik has requested commit
Message-ID: <20080902065624.24627208DE9@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kde-filesystem (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:56:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:56:25 +0000
Subject: [pkgdb] kde-filesystem: jreznik has requested watchcommits
Message-ID: <20080902065626.6721F208E70@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kde-filesystem (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:57:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:57:29 +0000
Subject: [pkgdb] kde-filesystem: jreznik has requested watchbugzilla
Message-ID: <20080902065626.8BA76208E75@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kde-filesystem (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:56:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:56:28 +0000
Subject: [pkgdb] kde-filesystem: jreznik has requested commit
Message-ID: <20080902065629.14D8A208E7A@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kde-filesystem (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:56:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:56:30 +0000
Subject: [pkgdb] kde-filesystem: jreznik has requested watchcommits
Message-ID: <20080902065631.B6E16208DF0@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kde-filesystem (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:57:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:57:37 +0000
Subject: [pkgdb] kde-filesystem: jreznik has requested watchbugzilla
Message-ID: <20080902065634.CC0FB208E7F@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kde-filesystem (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:56:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:56:35 +0000
Subject: [pkgdb] kde-filesystem: jreznik has requested watchcommits
Message-ID: <20080902065635.B9B24208E85@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kde-filesystem (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:56:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:56:35 +0000
Subject: [pkgdb] kde-filesystem: jreznik has requested watchbugzilla
Message-ID: <20080902065635.F3445208E8A@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kde-filesystem (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:56:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:56:37 +0000
Subject: [pkgdb] kde-filesystem: jreznik has requested watchcommits
Message-ID: <20080902065637.2E0F4208E90@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kde-filesystem (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:56:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:56:36 +0000
Subject: [pkgdb] kde-filesystem: jreznik has requested commit
Message-ID: <20080902065638.1DEFC208E99@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kde-filesystem (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:57:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:57:40 +0000
Subject: [pkgdb] kde-filesystem: jreznik has requested commit
Message-ID: <20080902065637.C8710208E97@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kde-filesystem (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:56:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:56:59 +0000
Subject: [pkgdb] kdegames: jreznik has requested watchbugzilla
Message-ID: <20080902065659.20560208D89@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdegames (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:58:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:58:03 +0000
Subject: [pkgdb] kdegames: jreznik has requested watchcommits
Message-ID: <20080902065700.12F75208DF5@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdegames (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:57:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:57:04 +0000
Subject: [pkgdb] kdegames: jreznik has requested watchbugzilla
Message-ID: <20080902065704.74DD4208E9E@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdegames (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:57:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:57:03 +0000
Subject: [pkgdb] kdegames: jreznik has requested commit
Message-ID: <20080902065704.76D5E208EA0@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdegames (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:58:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:58:09 +0000
Subject: [pkgdb] kdegames: jreznik has requested watchcommits
Message-ID: <20080902065706.1DA2C208E9F@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdegames (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:58:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:58:10 +0000
Subject: [pkgdb] kdegames: jreznik has requested commit
Message-ID: <20080902065707.05D94208EA5@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdegames (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:57:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:57:15 +0000
Subject: [pkgdb] kdegames: jreznik has requested watchcommits
Message-ID: <20080902065716.03D4A208DC8@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdegames (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:57:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:57:18 +0000
Subject: [pkgdb] kdegames: jreznik has requested watchbugzilla
Message-ID: <20080902065718.66F91208EA8@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdegames (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:57:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:57:19 +0000
Subject: [pkgdb] kdegames: jreznik has requested watchbugzilla
Message-ID: <20080902065719.E8424208EAC@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdegames (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:57:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:57:20 +0000
Subject: [pkgdb] kdegames: jreznik has requested commit
Message-ID: <20080902065720.B2F06208EB0@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdegames (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:58:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:58:25 +0000
Subject: [pkgdb] kdegames: jreznik has requested commit
Message-ID: <20080902065722.A14BC208EB4@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdegames (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:58:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:58:25 +0000
Subject: [pkgdb] kdegames: jreznik has requested watchcommits
Message-ID: <20080902065722.CB16E208EB8@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdegames (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:57:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:57:55 +0000
Subject: [pkgdb] kdegraphics: jreznik has requested commit
Message-ID: <20080902065755.C42AE208DF6@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdegraphics (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:57:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:57:55 +0000
Subject: [pkgdb] kdegraphics: jreznik has requested watchbugzilla
Message-ID: <20080902065755.B56FD208DB1@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdegraphics (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:57:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:57:56 +0000
Subject: [pkgdb] kdegraphics: jreznik has requested watchcommits
Message-ID: <20080902065757.11113208EBA@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdegraphics (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:59:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:59:01 +0000
Subject: [pkgdb] kdegraphics: jreznik has requested watchbugzilla
Message-ID: <20080902065758.AB4B6208EBD@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdegraphics (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:59:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:59:03 +0000
Subject: [pkgdb] kdegraphics: jreznik has requested commit
Message-ID: <20080902065800.230D8208DB5@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdegraphics (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:58:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:58:00 +0000
Subject: [pkgdb] kdegraphics: jreznik has requested watchcommits
Message-ID: <20080902065800.9DEEA208EC7@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdegraphics (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:58:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:58:03 +0000
Subject: [pkgdb] kdegraphics: jreznik has requested watchbugzilla
Message-ID: <20080902065803.5EEDC208ECD@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdegraphics (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:58:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:58:04 +0000
Subject: [pkgdb] kdegraphics: jreznik has requested watchcommits
Message-ID: <20080902065804.91B71208ED3@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdegraphics (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:58:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:58:07 +0000
Subject: [pkgdb] kdegraphics: jreznik has requested commit
Message-ID: <20080902065807.71641208EDA@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdegraphics (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:58:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:58:26 +0000
Subject: [pkgdb] kdelibs: jreznik has requested watchbugzilla
Message-ID: <20080902065826.B4F82208E04@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdelibs (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:59:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:59:31 +0000
Subject: [pkgdb] kdelibs: jreznik has requested watchcommits
Message-ID: <20080902065828.10493208E08@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdelibs (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:58:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:58:28 +0000
Subject: [pkgdb] kdelibs: jreznik has requested commit
Message-ID: <20080902065828.E5724208EE1@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdelibs (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:58:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:58:35 +0000
Subject: [pkgdb] kdelibs: jreznik has requested commit
Message-ID: <20080902065835.28371208E0E@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdelibs (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:58:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:58:34 +0000
Subject: [pkgdb] kdelibs: jreznik has requested watchbugzilla
Message-ID: <20080902065836.41E3A208EE5@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdelibs (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:58:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:58:36 +0000
Subject: [pkgdb] kdelibs: jreznik has requested watchcommits
Message-ID: <20080902065837.7AF17208EE9@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdelibs (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:59:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:59:42 +0000
Subject: [pkgdb] kdelibs: jreznik has requested watchbugzilla
Message-ID: <20080902065839.958FC208EED@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdelibs (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:59:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:59:44 +0000
Subject: [pkgdb] kdelibs: jreznik has requested commit
Message-ID: <20080902065841.2F479208EF1@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdelibs (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:58:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:58:41 +0000
Subject: [pkgdb] kdelibs: jreznik has requested watchcommits
Message-ID: <20080902065843.1383E208E10@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdelibs (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:00:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:00:03 +0000
Subject: [pkgdb] kdemultimedia: jreznik has requested watchbugzilla
Message-ID: <20080902065900.49F10208E16@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdemultimedia (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:00:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:00:04 +0000
Subject: [pkgdb] kdemultimedia: jreznik has requested watchcommits
Message-ID: <20080902065901.87B4F208EF6@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdemultimedia (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:59:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:59:06 +0000
Subject: [pkgdb] kdemultimedia: jreznik has requested watchcommits
Message-ID: <20080902065906.42F0A208EFA@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdemultimedia (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:59:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:59:04 +0000
Subject: [pkgdb] kdemultimedia: jreznik has requested commit
Message-ID: <20080902065905.357C8208EF9@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdemultimedia (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:59:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:59:07 +0000
Subject: [pkgdb] kdemultimedia: jreznik has requested watchbugzilla
Message-ID: <20080902065909.10A1B208EFD@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdemultimedia (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:59:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:59:10 +0000
Subject: [pkgdb] kdemultimedia: jreznik has requested watchbugzilla
Message-ID: <20080902065910.5B728208F02@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdemultimedia (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:00:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:00:14 +0000
Subject: [pkgdb] kdemultimedia: jreznik has requested watchcommits
Message-ID: <20080902065911.5AC30208F07@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdemultimedia (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:59:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:59:10 +0000
Subject: [pkgdb] kdemultimedia: jreznik has requested commit
Message-ID: <20080902065911.D1D98208F09@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdemultimedia (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:00:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:00:16 +0000
Subject: [pkgdb] kdemultimedia: jreznik has requested commit
Message-ID: <20080902065913.53C60208F0E@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdemultimedia (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:59:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:59:41 +0000
Subject: [pkgdb] kdenetwork: jreznik has requested watchbugzilla
Message-ID: <20080902065941.B2DB5208DCD@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdenetwork (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:00:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:00:46 +0000
Subject: [pkgdb] kdenetwork: jreznik has requested watchcommits
Message-ID: <20080902065943.B649C208DD1@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdenetwork (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:00:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:00:48 +0000
Subject: [pkgdb] kdenetwork: jreznik has requested commit
Message-ID: <20080902065945.3CA48208E1C@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdenetwork (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:00:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:00:52 +0000
Subject: [pkgdb] kdenetwork: jreznik has requested watchbugzilla
Message-ID: <20080902065949.67306208F11@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdenetwork (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:59:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:59:52 +0000
Subject: [pkgdb] kdenetwork: jreznik has requested watchcommits
Message-ID: <20080902065953.4A80D208E21@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdenetwork (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:59:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:59:53 +0000
Subject: [pkgdb] kdenetwork: jreznik has requested commit
Message-ID: <20080902065954.C5C84208F14@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdenetwork (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 06:59:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 06:59:58 +0000
Subject: [pkgdb] kdenetwork: jreznik has requested watchbugzilla
Message-ID: <20080902065959.76E75208F18@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdenetwork (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:00:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:00:04 +0000
Subject: [pkgdb] kdenetwork: jreznik has requested watchcommits
Message-ID: <20080902070004.59B60208E26@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdenetwork (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:01:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:01:08 +0000
Subject: [pkgdb] kdenetwork: jreznik has requested commit
Message-ID: <20080902070005.E141E208F1C@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdenetwork (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:00:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:00:21 +0000
Subject: [pkgdb] kdepim: jreznik has requested watchcommits
Message-ID: <20080902070021.89A84208F1F@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdepim (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:01:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:01:27 +0000
Subject: [pkgdb] kdepim: jreznik has requested commit
Message-ID: <20080902070024.CEE4E208E31@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdepim (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:00:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:00:29 +0000
Subject: [pkgdb] kdepim: jreznik has requested watchbugzilla
Message-ID: <20080902070030.43EE2208F22@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdepim (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:00:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:00:33 +0000
Subject: [pkgdb] kdepim: jreznik has requested watchbugzilla
Message-ID: <20080902070034.EB315208E35@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdepim (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:01:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:01:38 +0000
Subject: [pkgdb] kdepim: jreznik has requested watchcommits
Message-ID: <20080902070035.D6DA2208F25@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdepim (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:01:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:01:40 +0000
Subject: [pkgdb] kdepim: jreznik has requested commit
Message-ID: <20080902070037.2B520208F29@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdepim (Fedora 7)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:00:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:00:43 +0000
Subject: [pkgdb] kdepim: jreznik has requested watchbugzilla
Message-ID: <20080902070044.00E1E208F2E@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdepim (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:00:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:00:44 +0000
Subject: [pkgdb] kdepim: jreznik has requested watchcommits
Message-ID: <20080902070044.A93B4208F32@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdepim (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:01:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:01:49 +0000
Subject: [pkgdb] kdepim: jreznik has requested commit
Message-ID: <20080902070046.1A4D6208E38@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdepim (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:01:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:01:52 +0000
Subject: [pkgdb] kdepim: jreznik has requested watchbugzilla
Message-ID: <20080902070049.D1926208F35@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdepim (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:01:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:01:58 +0000
Subject: [pkgdb] kdepim: jreznik has requested commit
Message-ID: <20080902070055.3BC69208F3A@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdepim (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:00:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:00:53 +0000
Subject: [pkgdb] kdepim: jreznik has requested watchcommits
Message-ID: <20080902070055.258B8208DD3@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdepim (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:02:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:02:37 +0000
Subject: [pkgdb] kdepimlibs: jreznik has requested watchbugzilla
Message-ID: <20080902070134.80760208DD7@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdepimlibs (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:01:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:01:35 +0000
Subject: [pkgdb] kdepimlibs: jreznik has requested watchcommits
Message-ID: <20080902070135.B32F9208DDE@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdepimlibs (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:01:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:01:37 +0000
Subject: [pkgdb] kdepimlibs: jreznik has requested commit
Message-ID: <20080902070138.717B4208E3B@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdepimlibs (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:02:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:02:43 +0000
Subject: [pkgdb] kdepimlibs: jreznik has requested watchbugzilla
Message-ID: <20080902070140.80DBB208F3E@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdepimlibs (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:01:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:01:42 +0000
Subject: [pkgdb] kdepimlibs: jreznik has requested watchcommits
Message-ID: <20080902070143.93B40208F40@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdepimlibs (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:01:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:01:43 +0000
Subject: [pkgdb] kdepimlibs: jreznik has requested watchbugzilla
Message-ID: <20080902070144.000E0208F47@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdepimlibs (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:01:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:01:43 +0000
Subject: [pkgdb] kdepimlibs: jreznik has requested commit
Message-ID: <20080902070144.C6D2B208F4A@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdepimlibs (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:02:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:02:48 +0000
Subject: [pkgdb] kdepimlibs: jreznik has requested watchcommits
Message-ID: <20080902070145.59228208F4F@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdepimlibs (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:02:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:02:50 +0000
Subject: [pkgdb] kdepimlibs: jreznik has requested commit
Message-ID: <20080902070147.67FB1208F55@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdepimlibs (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:02:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:02:27 +0000
Subject: [pkgdb] kdesdk: jreznik has requested watchbugzilla
Message-ID: <20080902070227.745FC208E4B@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdesdk (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:03:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:03:32 +0000
Subject: [pkgdb] kdesdk: jreznik has requested watchcommits
Message-ID: <20080902070229.6C314208E4F@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdesdk (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:02:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:02:31 +0000
Subject: [pkgdb] kdesdk: jreznik has requested commit
Message-ID: <20080902070232.86ED4208E53@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdesdk (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:02:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:02:33 +0000
Subject: [pkgdb] kdesdk: jreznik has requested watchbugzilla
Message-ID: <20080902070233.BBBAF208F59@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdesdk (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:03:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:03:38 +0000
Subject: [pkgdb] kdesdk: jreznik has requested watchcommits
Message-ID: <20080902070235.AC3D0208F5D@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdesdk (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:02:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:02:36 +0000
Subject: [pkgdb] kdesdk: jreznik has requested commit
Message-ID: <20080902070236.B5C5D208F5A@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdesdk (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:03:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:03:42 +0000
Subject: [pkgdb] kdesdk: jreznik has requested watchcommits
Message-ID: <20080902070239.2F415208F61@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdesdk (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:02:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:02:43 +0000
Subject: [pkgdb] kdesdk: jreznik has requested commit
Message-ID: <20080902070244.2E03B208F65@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdesdk (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:03:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:03:50 +0000
Subject: [pkgdb] kdesdk: jreznik has requested watchbugzilla
Message-ID: <20080902070247.77118208E58@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdesdk (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:04:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:04:58 +0000
Subject: [pkgdb] kdeutils: jreznik has requested watchbugzilla
Message-ID: <20080902070355.8E6CC208DB9@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdeutils (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:03:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:03:56 +0000
Subject: [pkgdb] kdeutils: jreznik has requested watchcommits
Message-ID: <20080902070356.A2BB8208DBC@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdeutils (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:05:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:05:00 +0000
Subject: [pkgdb] kdeutils: jreznik has requested commit
Message-ID: <20080902070357.22154208DC0@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdeutils (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:05:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:05:03 +0000
Subject: [pkgdb] kdeutils: jreznik has requested watchbugzilla
Message-ID: <20080902070400.80BC9208E5B@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdeutils (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:04:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:04:03 +0000
Subject: [pkgdb] kdeutils: jreznik has requested watchcommits
Message-ID: <20080902070404.AF4B3208E61@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdeutils (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:04:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:04:04 +0000
Subject: [pkgdb] kdeutils: jreznik has requested commit
Message-ID: <20080902070405.74EC8208E65@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdeutils (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:05:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:05:09 +0000
Subject: [pkgdb] kdeutils: jreznik has requested watchbugzilla
Message-ID: <20080902070406.1885C208F69@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdeutils (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:04:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:04:06 +0000
Subject: [pkgdb] kdeutils: jreznik has requested watchcommits
Message-ID: <20080902070406.8CE7C208F6D@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdeutils (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:04:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:04:08 +0000
Subject: [pkgdb] kdeutils: jreznik has requested commit
Message-ID: <20080902070409.B7887208F71@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdeutils (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:04:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:04:27 +0000
Subject: [pkgdb] kdewebdev: jreznik has requested watchbugzilla
Message-ID: <20080902070427.398D1208E6C@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdewebdev (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:05:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:05:31 +0000
Subject: [pkgdb] kdewebdev: jreznik has requested watchcommits
Message-ID: <20080902070428.85EF5208E6A@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdewebdev (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:04:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:04:32 +0000
Subject: [pkgdb] kdewebdev: jreznik has requested commit
Message-ID: <20080902070433.1538D208F75@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdewebdev (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:04:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:04:34 +0000
Subject: [pkgdb] kdewebdev: jreznik has requested watchbugzilla
Message-ID: <20080902070434.1B6FA208F79@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdewebdev (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:04:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:04:35 +0000
Subject: [pkgdb] kdewebdev: jreznik has requested commit
Message-ID: <20080902070435.9673A208F7E@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdewebdev (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:04:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:04:37 +0000
Subject: [pkgdb] kdewebdev: jreznik has requested watchcommits
Message-ID: <20080902070438.99C6E208DAA@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdewebdev (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:05:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:05:43 +0000
Subject: [pkgdb] kdewebdev: jreznik has requested watchbugzilla
Message-ID: <20080902070440.40D67208F81@bastion.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdewebdev (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:04:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:04:41 +0000
Subject: [pkgdb] kdewebdev: jreznik has requested watchcommits
Message-ID: <20080902070441.C8531208F85@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdewebdev (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:05:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:05:46 +0000
Subject: [pkgdb] kdewebdev: jreznik has requested commit
Message-ID: <20080902070443.25769208F89@bastion.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdewebdev (Fedora 9)

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



From sharkcz at fedoraproject.org  Tue Sep  2 07:06:12 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue,  2 Sep 2008 07:06:12 +0000 (UTC)
Subject: rpms/dovecot/devel .cvsignore, 1.40, 1.41 dovecot.spec, 1.110,
	1.111 sources, 1.43, 1.44
Message-ID: <20080902070612.C87927011D@cvs1.fedora.phx.redhat.com>

Author: sharkcz

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

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
* Tue Sep  2 2008 Dan Horak <dan[at]danny.cz> - 1:1.1.3-1
- update to upstream version 1.1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	29 Jul 2008 14:35:20 -0000	1.40
+++ .cvsignore	2 Sep 2008 07:05:42 -0000	1.41
@@ -1,4 +1,4 @@
 dovecot-sieve-1.1.5.tar.gz
 dovecot-sieve-1.1.5.tar.gz.sig
-dovecot-1.1.2.tar.gz
-dovecot-1.1.2.tar.gz.sig
+dovecot-1.1.3.tar.gz
+dovecot-1.1.3.tar.gz.sig


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- dovecot.spec	29 Jul 2008 19:19:51 -0000	1.110
+++ dovecot.spec	2 Sep 2008 07:05:42 -0000	1.111
@@ -1,8 +1,8 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
 Epoch: 1
-Version: 1.1.2
-Release: 2%{?dist}
+Version: 1.1.3
+Release: 1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -376,6 +376,9 @@
 
 
 %changelog
+* Tue Sep  2 2008 Dan Horak <dan[at]danny.cz> - 1:1.1.3-1
+- update to upstream version 1.1.3
+
 * Tue Jul 29 2008 Dan Horak <dan[at]danny.cz> - 1:1.1.2-2
 - really ask for the password during start-up
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	29 Jul 2008 14:35:20 -0000	1.43
+++ sources	2 Sep 2008 07:05:42 -0000	1.44
@@ -1,4 +1,4 @@
 b4362defe3fc18865db8cf8e1c940b13  dovecot-sieve-1.1.5.tar.gz
 0fdb01f9fd960fbd5a8271584ac62cb8  dovecot-sieve-1.1.5.tar.gz.sig
-fcebb6c099421049632b2f1f019f55cd  dovecot-1.1.2.tar.gz
-52cacb5d0f7b597392532b181d3875f7  dovecot-1.1.2.tar.gz.sig
+103ff0ffb4bcb37f22c27779553e48bc  dovecot-1.1.3.tar.gz
+9e3c8e1de5e51c9710eaef4d56c183dc  dovecot-1.1.3.tar.gz.sig



From pkgdb at fedoraproject.org  Tue Sep  2 07:43:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:43:58 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080902074255.533FF208D80@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on libgnomedb (Fedora devel) to Approved for huzaifas

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:43:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:43:04 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080902074305.74C10208D87@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on libgnomedb (Fedora devel) to Approved for huzaifas

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:42:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:42:55 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080902074255.904B9208D84@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on libgnomedb (Fedora devel) to Approved for huzaifas

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



From pkgdb at fedoraproject.org  Tue Sep  2 07:43:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:43:05 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080902074306.78ED1208D8A@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on libgnomedb (Fedora devel) to Approved for huzaifas

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



From tbzatek at fedoraproject.org  Tue Sep  2 07:59:11 2008
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue,  2 Sep 2008 07:59:11 +0000 (UTC)
Subject: rpms/eel2/devel .cvsignore, 1.65, 1.66 eel2.spec, 1.93, 1.94 sources,
	1.65, 1.66
Message-ID: <20080902075911.2204B7011D@cvs1.fedora.phx.redhat.com>

Author: tbzatek

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

Modified Files:
	.cvsignore eel2.spec sources 
Log Message:
* Tue Sep 02 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.23.91-1
- Update to 2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eel2/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	22 Aug 2008 23:35:47 -0000	1.65
+++ .cvsignore	2 Sep 2008 07:58:40 -0000	1.66
@@ -1 +1 @@
-eel-2.23.90.tar.bz2
+eel-2.23.91.tar.bz2


Index: eel2.spec
===================================================================
RCS file: /cvs/extras/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- eel2.spec	22 Aug 2008 23:35:47 -0000	1.93
+++ eel2.spec	2 Sep 2008 07:58:40 -0000	1.94
@@ -16,7 +16,7 @@
 
 Name:        eel2
 Summary:     Eazel Extensions Library
-Version:     2.23.90
+Version:     2.23.91
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       System Environment/Libraries
@@ -108,6 +108,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Tue Sep 02 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-1
 - Update to 2.23.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eel2/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	22 Aug 2008 23:35:47 -0000	1.65
+++ sources	2 Sep 2008 07:58:40 -0000	1.66
@@ -1 +1 @@
-760ce0b2a5f3cdc2b90c2a06439f25f8  eel-2.23.90.tar.bz2
+b7beb56a8fc09485a47415e2049753cd  eel-2.23.91.tar.bz2



From lucilanga at fedoraproject.org  Tue Sep  2 08:03:27 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue,  2 Sep 2008 08:03:27 +0000 (UTC)
Subject: rpms/scummvm/devel scummvm.spec,1.12,1.13
Message-ID: <20080902080327.8864D7011D@cvs1.fedora.phx.redhat.com>

Author: lucilanga

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

Modified Files:
	scummvm.spec 
Log Message:
* Mon Sep 01 2008 Lucian Langa <cooly at gnome.eu.org> - 0.12.0-1
- new upstream 0.12.0
- drop 0.11.0 patches (fixed upstream)
- drop 0.9.0 patch (fixed upstream)


Index: scummvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scummvm/devel/scummvm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scummvm.spec	8 Mar 2008 20:28:15 -0000	1.12
+++ scummvm.spec	2 Sep 2008 08:02:57 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           scummvm
-Version:        0.11.1
-Release:        2%{?dist}
+Version:        0.12.0
+Release:        1%{?dist}
 Summary:        Interpreter for several adventure games
 Group:          Applications/Emulators
 License:        GPLv2+
@@ -9,10 +9,6 @@
 #######         Icons extracted from icons/scummvm.ico with the gimp
 Source1:        scummvm-icons.tar.gz
 Patch0:         scummvm-0.11.0-nostrip.patch
-Patch1:         scummvm-0.9.1-no-execstack.patch
-Patch2:         scummvm-0.11.1-lure-sound-bug-fixes.patch
-Patch3:         scummvm-0.11.1-lure-volume-fixes.patch
-Patch4:         scummvm-0.11.1-lure-sound-channel-alloc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel libvorbis-devel flac-devel zlib-devel
 BuildRequires:  fluidsynth-devel desktop-file-utils
@@ -35,10 +31,6 @@
 %prep
 %setup -q -a 1
 %patch0 -p1 -b .nostrip
-%patch1 -p1 -b .execstack
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 sed -i 's/%{name}.xpm/%{name}.png/' dists/%{name}.desktop
 sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \
   dists/%{name}.desktop
@@ -110,6 +102,11 @@
 
 
 %changelog
+* Mon Sep 01 2008 Lucian Langa <cooly at gnome.eu.org> - 0.12.0-1
+- new upstream 0.12.0
+- drop 0.11.0 patches (fixed upstream)
+- drop 0.9.0 patch (fixed upstream)
+
 * Sat Mar  8 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.11.1-2
 - Various bugfixes to lure sound support
 - Enable libfluidsynth support 



From lucilanga at fedoraproject.org  Tue Sep  2 08:05:13 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue,  2 Sep 2008 08:05:13 +0000 (UTC)
Subject: rpms/scummvm/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20080902080513.584337011D@cvs1.fedora.phx.redhat.com>

Author: lucilanga

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

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Sep 01 2008 Lucian Langa <cooly at gnome.eu.org> - 0.12.0-1
- new upstream 0.12.0
- drop 0.11.0 patches (fixed upstream)
- drop 0.9.0 patch (fixed upstream)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scummvm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Mar 2008 21:46:21 -0000	1.5
+++ .cvsignore	2 Sep 2008 08:04:43 -0000	1.6
@@ -1,2 +1 @@
-scummvm-0.11.1.tar.bz2
-scummvm-icons.tar.gz
+scummvm-0.12.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scummvm/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Mar 2008 21:46:21 -0000	1.5
+++ sources	2 Sep 2008 08:04:43 -0000	1.6
@@ -1,2 +1 @@
-8dc9eb9d18574a7ecfa6586892e0de4e  scummvm-0.11.1.tar.bz2
-b20d750de2c88e8aefea364afae1776c  scummvm-icons.tar.gz
+cd5620c57645948c8da0d4d9c9fcffb3  scummvm-0.12.0.tar.bz2



From tbzatek at fedoraproject.org  Tue Sep  2 08:12:30 2008
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue,  2 Sep 2008 08:12:30 +0000 (UTC)
Subject: rpms/nautilus/devel .cvsignore, 1.80, 1.81 nautilus.spec, 1.225,
	1.226 sources, 1.84, 1.85 nautilus-2.23.90-schemas-typo.patch,
	1.1, NONE
Message-ID: <20080902081230.27AE17011D@cvs1.fedora.phx.redhat.com>

Author: tbzatek

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

Modified Files:
	.cvsignore nautilus.spec sources 
Removed Files:
	nautilus-2.23.90-schemas-typo.patch 
Log Message:
* Tue Sep 02 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.23.91-1
- Update to 2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- .cvsignore	23 Aug 2008 05:25:38 -0000	1.80
+++ .cvsignore	2 Sep 2008 08:11:59 -0000	1.81
@@ -1 +1 @@
-nautilus-2.23.90.tar.bz2
+nautilus-2.23.91.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- nautilus.spec	31 Aug 2008 03:50:23 -0000	1.225
+++ nautilus.spec	2 Sep 2008 08:11:59 -0000	1.226
@@ -1,9 +1,9 @@
-%define glib2_version 2.16.1
+%define glib2_version 2.17.5
 %define pango_version 1.1.3
 %define gtk2_version 2.11.6
 %define libgnomeui_version 2.6.0
 %define libgnome_version 2.23.0
-%define eel2_version 2.23.2
+%define eel2_version 2.23.91
 %define gnome_icon_theme_version 1.1.5
 %define libxml2_version 2.4.20
 %define gail_version 0.17-2
@@ -18,8 +18,8 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
-Version: 	2.23.90
-Release:	4%{?dist}
+Version: 	2.23.91
+Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.23/%{name}-%{version}.tar.bz2
@@ -99,9 +99,6 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=548740
-Patch18:	nautilus-2.23.90-schemas-typo.patch
-
 # http://bugzilla.gnome.org/show_bug.cgi?id=550009
 Patch20:	small-leaks.patch
 
@@ -143,7 +140,6 @@
 %patch10 -p0 -b .gvfs-desktop-key
 %patch15 -p1 -b .xds
 %patch17 -p0 -b .symlink
-%patch18 -p1 -b .typo
 %patch20 -p0 -b .small-leaks
 
 %build
@@ -263,6 +259,9 @@
 
 
 %changelog
+* Tue Sep 02 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Sat Aug 30 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-4
 - Plug a few small memory leaks
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- sources	23 Aug 2008 05:25:38 -0000	1.84
+++ sources	2 Sep 2008 08:11:59 -0000	1.85
@@ -1 +1 @@
-b0e419946b9adc32e3deb7157096971c  nautilus-2.23.90.tar.bz2
+21a456d9c7fed80a89b294dd5718a61c  nautilus-2.23.91.tar.bz2


--- nautilus-2.23.90-schemas-typo.patch DELETED ---



From tbzatek at fedoraproject.org  Tue Sep  2 08:21:55 2008
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue,  2 Sep 2008 08:21:55 +0000 (UTC)
Subject: rpms/gvfs/devel .cvsignore, 1.22, 1.23 gvfs.spec, 1.66, 1.67 sources,
	1.22, 1.23
Message-ID: <20080902082155.C958E7011D@cvs1.fedora.phx.redhat.com>

Author: tbzatek

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

Modified Files:
	.cvsignore gvfs.spec sources 
Log Message:
* Tue Sep  2 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.99.6-1
- Update to 0.99.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	20 Aug 2008 09:18:25 -0000	1.22
+++ .cvsignore	2 Sep 2008 08:21:25 -0000	1.23
@@ -1 +1 @@
-gvfs-0.99.5.tar.bz2
+gvfs-0.99.6.tar.bz2


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gvfs.spec	29 Aug 2008 00:59:47 -0000	1.66
+++ gvfs.spec	2 Sep 2008 08:21:25 -0000	1.67
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 0.99.5
-Release: 3%{?dist}
+Version: 0.99.6
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -13,7 +13,7 @@
 BuildRequires: /usr/bin/ssh
 BuildRequires: libcdio-devel >= 0.78.2
 BuildRequires: hal-devel >= 0.5.10
-BuildRequires: libsoup-devel >= 2.3.0
+BuildRequires: libsoup-devel >= 2.23.91
 BuildRequires: avahi-glib-devel >= 0.6
 BuildRequires: gnome-keyring-devel
 BuildRequires: intltool
@@ -250,6 +250,9 @@
 
 
 %changelog
+* Tue Sep  2 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.99.6-1
+- Update to 0.99.6
+
 * Thu Aug 28 2008 Matthias Clasen <mclasen at redhat.com> - 0.99.5-3
 - Add a comma
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	20 Aug 2008 09:18:26 -0000	1.22
+++ sources	2 Sep 2008 08:21:25 -0000	1.23
@@ -1 +1 @@
-94d7988c8abc5fc5d99807203170475b  gvfs-0.99.5.tar.bz2
+dc009e9bcd868eb05c37561c56907c23  gvfs-0.99.6.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep  2 07:03:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 07:03:32 +0000
Subject: [pkgdb] kdesdk: jreznik has requested watchcommits
Message-ID: <20080902070229.6C314208E4F@bastion.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdesdk (Fedora devel)

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



From tbzatek at fedoraproject.org  Tue Sep  2 08:29:23 2008
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue,  2 Sep 2008 08:29:23 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs.spec, 1.67, 1.68 missing-comma-of-doom.patch,
	1.1, NONE
Message-ID: <20080902082923.1262B7011D@cvs1.fedora.phx.redhat.com>

Author: tbzatek

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

Modified Files:
	gvfs.spec 
Removed Files:
	missing-comma-of-doom.patch 
Log Message:
Remove upstreamed patch



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gvfs.spec	2 Sep 2008 08:21:25 -0000	1.67
+++ gvfs.spec	2 Sep 2008 08:28:52 -0000	1.68
@@ -29,8 +29,6 @@
 BuildRequires: automake autoconf
 BuildRequires: libtool
 Patch1: gvfs-0.99.2-archive-integration.patch
-# fixed upstream
-Patch2: missing-comma-of-doom.patch
 
 %description
 The gvfs package provides backend implementations for the gio 
@@ -112,7 +110,6 @@
 %prep
 %setup -q
 %patch1 -p0 -b .archive-integration
-%patch2 -p1 -b .missing-comma-of-doom
 
 %build
 


--- missing-comma-of-doom.patch DELETED ---



From caolanm at fedoraproject.org  Tue Sep  2 08:37:48 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  2 Sep 2008 08:37:48 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch, NONE,
	1.1 workspace.i18n45.patch, NONE, 1.1 openoffice.org.spec, 1.1633,
	1.1634 openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch,
	1.1, NONE
Message-ID: <20080902083748.7D57E7011D@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32187

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch 
	workspace.i18n45.patch 
Removed Files:
	openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch 
Log Message:
add openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch

openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch:

--- NEW FILE openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch ---
Index: source/dialog/filedlghelper.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/dialog/filedlghelper.cxx,v
retrieving revision 1.144
diff -u -r1.144 filedlghelper.cxx
--- openoffiec.org.orig/sfx2/source/dialog/filedlghelper.cxx	4 Jun 2008 09:53:08 -0000	1.144
+++ openoffice.org/sfx2/source/dialog/filedlghelper.cxx	2 Sep 2008 08:24:03 -0000
@@ -1325,8 +1325,10 @@
 
 	sal_Int16 nRet = ExecutableDialogResults::CANCEL;
 
-#if !(defined(MACOSX) && defined(QUARTZ))
 //On MacOSX the native file picker has to run in the primordial thread because of drawing issues
+//On Linux the native gtk file picker, when backed by gnome-vfs2, needs to be run in the same
+//primordial thread as the ucb gnome-vfs2 provider was initialized in.
+#ifdef WNT
 	if ( mbSystemPicker )
 	{
 		PickerThread_Impl* pThread = new PickerThread_Impl( mxFileDlg );
diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.cxx fpicker/source/unx/gnome/SalGtkFilePicker.cxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.cxx	2008-09-02 09:16:04.000000000 +0100
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFilePicker.cxx	2008-09-02 09:20:51.000000000 +0100
@@ -999,13 +999,13 @@
     uno::Reference< awt::XExtendedToolkit > xToolkit(
         m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY);
 
-	RunDialog* pRunInMain = new RunDialog(m_pDialog, xToolkit);
-	uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunInMain);
+	RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit);
+	uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog);
 	while( GTK_RESPONSE_NO == btn )
 	{
 		btn = GTK_RESPONSE_YES; // we dont want to repeat unless user clicks NO for file save.
 
-        gint nStatus = pRunInMain->runandwaitforresult();
+        gint nStatus = pRunDialog->run();
 		switch( nStatus )
 		{
 			case GTK_RESPONSE_ACCEPT:
@@ -1032,9 +1032,9 @@
                                 OUStringToOString(aResProvider.getResString(FILE_PICKER_TITLE_SAVE ),
                                 RTL_TEXTENCODING_UTF8 ).getStr() );
                                  
-	                        RunDialog* pAnotherRunInMain = new RunDialog(dlg, xToolkit);
-	                        uno::Reference < awt::XTopWindowListener > xAnotherLifeCycle(pAnotherRunInMain);
-                            btn = pAnotherRunInMain->runandwaitforresult();
+	                        RunDialog* pAnotherDialog = new RunDialog(dlg, xToolkit);
+	                        uno::Reference < awt::XTopWindowListener > xAnotherLifeCycle(pAnotherDialog);
+                            btn = pAnotherDialog->run();
 
 							gtk_widget_destroy( dlg );
 						}
diff -ru fpicker.orig/source/unx/gnome/SalGtkFolderPicker.cxx fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx	2008-09-02 09:16:04.000000000 +0100
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx	2008-09-02 09:20:53.000000000 +0100
@@ -176,9 +176,9 @@
     uno::Reference< awt::XExtendedToolkit > xToolkit(
         m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY);
 
-    RunDialog* pRunInMain = new RunDialog(m_pDialog, xToolkit);
-    uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunInMain);
-    gint nStatus = pRunInMain->runandwaitforresult();
+    RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit);
+    uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog);
+    gint nStatus = pRunDialog->run();
 	switch( nStatus )
 	{
 		case GTK_RESPONSE_ACCEPT:
diff -ru fpicker.orig/source/unx/gnome/SalGtkPicker.cxx fpicker/source/unx/gnome/SalGtkPicker.cxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkPicker.cxx	2008-09-02 09:16:04.000000000 +0100
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkPicker.cxx	2008-09-02 09:20:22.000000000 +0100
@@ -124,7 +124,7 @@
 
 RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference< awt::XExtendedToolkit >& rToolkit ) :
     cppu::WeakComponentImplHelper1< awt::XTopWindowListener >( maLock ),
-    mbFinished(false), mpDialog(pDialog), mpCreatedParent(NULL), mxToolkit(rToolkit)
+    mpDialog(pDialog), mpCreatedParent(NULL), mxToolkit(rToolkit)
 {
     awt::SystemDependentXWindow aWindowHandle;
 
@@ -178,39 +178,20 @@
     gtk_widget_hide( mpDialog );
 }
 
-void RunDialog::run() 
+gint RunDialog::run() 
 { 
     if (mxToolkit.is())
         mxToolkit->addTopWindowListener(this);
 
-    mnStatus = gtk_dialog_run( GTK_DIALOG( mpDialog ) ); 
+    gint nStatus = gtk_dialog_run( GTK_DIALOG( mpDialog ) ); 
 
     if (mxToolkit.is())
         mxToolkit->removeTopWindowListener(this);
 
-
-    if (mnStatus != 1)	//PLAY
+    if (nStatus != 1)	//PLAY
         gtk_widget_hide( mpDialog );
 
-    maLock.acquire();
-    mbFinished = true;
-    maLock.release();
-
-    Application::EndYield();
-}
-
-gint RunDialog::runandwaitforresult() 
-{ 
-    g_timeout_add_full(G_PRIORITY_HIGH_IDLE, 0, (GSourceFunc)rundialog, this, NULL);
-    while (1)
-    {
-	maLock.acquire();
-    	if (mbFinished)
-            break;
-	maLock.release();
-        Application::Yield();
-    }
-    return mnStatus; 
+    return nStatus;
 }
 
 SalGtkPicker::~SalGtkPicker()
diff -ru fpicker.orig/source/unx/gnome/SalGtkPicker.hxx fpicker/source/unx/gnome/SalGtkPicker.hxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkPicker.hxx	2008-09-02 09:16:04.000000000 +0100
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkPicker.hxx	2008-09-02 09:16:49.000000000 +0100
@@ -74,8 +74,7 @@
 		static rtl::OString unicodetouri(const rtl::OUString &rURL);
 };
 
-//Run the Gtk Dialog in the "Main Thread" for us to avoid threading conflict and
-//report back to this thread. Watch for any "new windows" created while we're
+//Run the Gtk Dialog. Watch for any "new windows" created while we're
 //executing and consider that a CANCEL event to avoid e.g. "file cannot be opened"
 //modal dialogs and this one getting locked if some other API call causes this
 //to happen while we're opened waiting for user input, e.g. 
@@ -84,9 +83,7 @@
     public cppu::WeakComponentImplHelper1< ::com::sun::star::awt::XTopWindowListener >
 {
 private:
-    bool mbFinished;
     osl::Mutex maLock;
-    gint mnStatus;
     GtkWidget *mpDialog;
     GdkWindow *mpCreatedParent;
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit>  mxToolkit;
@@ -111,8 +108,7 @@
         throw (::com::sun::star::uno::RuntimeException) {}
 public:
     RunDialog(GtkWidget *pDialog, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit > &rToolkit);
-    gint runandwaitforresult();
-    void run();
+    gint run();
     void cancel();
     ~RunDialog();
 };

workspace.i18n45.patch:

--- NEW FILE workspace.i18n45.patch ---
Index: l10n/i18npool/inc/breakiterator_cjk.hxx
diff -u l10n/i18npool/inc/breakiterator_cjk.hxx:1.6 l10n/i18npool/inc/breakiterator_cjk.hxx:1.6.16.1
--- l10n/i18npool/inc/breakiterator_cjk.hxx:1.6	Thu Apr 10 01:37:18 2008
+++ l10n/i18npool/inc/breakiterator_cjk.hxx	Mon Aug 18 21:23:30 2008
@@ -58,6 +58,7 @@
 
 protected:
 	xdictionary *dict;
+    rtl::OUString hangingCharacters;
 };
 
 #define BREAKITERATOR_CJK( lang ) \
@@ -69,6 +70,7 @@
 
 #ifdef BREAKITERATOR_ALL
 BREAKITERATOR_CJK( zh )
+BREAKITERATOR_CJK( zh_TW )
 BREAKITERATOR_CJK( ja )
 BREAKITERATOR_CJK( ko )
 #endif
Index: l10n/i18npool/inc/breakiterator_hi.hxx
diff -u l10n/i18npool/inc/breakiterator_hi.hxx:1.1 l10n/i18npool/inc/breakiterator_hi.hxx:removed
--- l10n/i18npool/inc/breakiterator_hi.hxx:1.1	Wed Apr 24 10:08:25 2002
+++ l10n/i18npool/inc/breakiterator_hi.hxx	Tue Sep  2 00:59:09 2008
@@ -1,37 +0,0 @@
-/*************************************************************************
-#*
-#*  Copyright (c) 2002 Sun Microsystems Inc.
-#*
-#* Bugs! - Contact Prabhat.Hegde at sun.com
-#*************************************************************************/
-
-#ifndef _I18N_BREAKITERATOR_HI_HXX_
-#define _I18N_BREAKITERATOR_HI_HXX_
-
-#include <breakiterator_ctl.hxx>
-
-namespace com { 
-namespace sun { 
-namespace star { 
-namespace i18n {
-
-//	----------------------------------------------------
-//	class BreakIterator_hi
-//	----------------------------------------------------
-class BreakIterator_hi : public BreakIterator_CTL
-{
-public:
-	BreakIterator_hi();
-	~BreakIterator_hi();
-
-protected:
-	void SAL_CALL makeIndex(const rtl::OUString& text, sal_Int32 pos) 
-    throw(com::sun::star::uno::RuntimeException);
-};
-
-} 
-} 
-} 
-} 
-
-#endif
Index: l10n/i18npool/inc/localedata.hxx
diff -u l10n/i18npool/inc/localedata.hxx:1.20 l10n/i18npool/inc/localedata.hxx:1.20.16.1
--- l10n/i18npool/inc/localedata.hxx:1.20	Thu Apr 10 01:44:09 2008
+++ l10n/i18npool/inc/localedata.hxx	Mon Aug 18 21:23:30 2008
@@ -112,6 +112,7 @@
     virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getFollowPageWords( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL hasPhonetic( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL isPhonetic( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& algorithm ) throw(com::sun::star::uno::RuntimeException);
+    virtual rtl::OUString SAL_CALL getHangingCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
 
 	//XServiceInfo
 	virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
Index: l10n/i18npool/source/breakiterator/breakiteratorImpl.cxx
diff -u l10n/i18npool/source/breakiterator/breakiteratorImpl.cxx:1.28 l10n/i18npool/source/breakiterator/breakiteratorImpl.cxx:1.27.4.2
--- l10n/i18npool/source/breakiterator/breakiteratorImpl.cxx:1.28	Thu Aug 14 09:27:36 2008
+++ l10n/i18npool/source/breakiterator/breakiteratorImpl.cxx	Mon Aug 25 11:31:48 2008
@@ -234,6 +234,7 @@
 {
         if (nStartPos < 0 || nStartPos > Text.getLength())
             return -1;
+        if (Text.getLength() == 0) return 0;
         return LBI->beginOfSentence(Text, nStartPos, rLocale);
 }
 
@@ -242,6 +243,7 @@
 {
         if (nStartPos < 0 || nStartPos > Text.getLength())
             return -1;
+        if (Text.getLength() == 0) return 0;
         return LBI->endOfSentence(Text, nStartPos, rLocale);
 }
 
Index: l10n/i18npool/source/breakiterator/breakiterator_cjk.cxx
diff -u l10n/i18npool/source/breakiterator/breakiterator_cjk.cxx:1.17 l10n/i18npool/source/breakiterator/breakiterator_cjk.cxx:1.17.16.1
--- l10n/i18npool/source/breakiterator/breakiterator_cjk.cxx:1.17	Thu Apr 10 01:52:22 2008
+++ l10n/i18npool/source/breakiterator/breakiterator_cjk.cxx	Mon Aug 18 21:24:50 2008
@@ -33,6 +33,7 @@
 
 #define BREAKITERATOR_ALL
 #include <breakiterator_cjk.hxx>
+#include <localedata.hxx>
 #include <i18nutil/unicode.hxx>
 
 using namespace ::com::sun::star::uno;
@@ -108,7 +109,7 @@
         LineBreakResults lbr;
 
         if (bOptions.allowPunctuationOutsideMargin &&
-                bOptions.forbiddenBeginCharacters.indexOf(Text[nStartPos]) != -1 &&
+                hangingCharacters.indexOf(Text[nStartPos]) != -1 &&
                 ++nStartPos == Text.getLength()) {
             ; // do nothing
         } else if (bOptions.applyForbiddenRules && 0 < nStartPos && nStartPos < Text.getLength()) {
@@ -122,12 +123,15 @@
         lbr.breakType = BreakType::WORDBOUNDARY;
         return lbr;
 }
+
+#define LOCALE(language, country) lang::Locale(OUString::createFromAscii(language), OUString::createFromAscii(country), OUString())
 //      ----------------------------------------------------
 //      class BreakIterator_zh
 //      ----------------------------------------------------;
 BreakIterator_zh::BreakIterator_zh()
 {
         dict = new xdictionary("zh");
+        hangingCharacters = LocaleData().getHangingCharacters(LOCALE("zh", "CN"));
         cBreakIterator = "com.sun.star.i18n.BreakIterator_zh";
 }
 
@@ -137,12 +141,28 @@
 }
 
 //      ----------------------------------------------------
+//      class BreakIterator_zh_TW
+//      ----------------------------------------------------;
+BreakIterator_zh_TW::BreakIterator_zh_TW()
+{
+        dict = new xdictionary("zh");
+        hangingCharacters = LocaleData().getHangingCharacters(LOCALE("zh", "TW"));
+        cBreakIterator = "com.sun.star.i18n.BreakIterator_zh_TW";
+}
+
+BreakIterator_zh_TW::~BreakIterator_zh_TW()
+{
+        delete dict;
+}
+
+//      ----------------------------------------------------
 //      class BreakIterator_ja
 //      ----------------------------------------------------;
 BreakIterator_ja::BreakIterator_ja()
 {
         dict = new xdictionary("ja");
         dict->setJapaneseWordBreak();
+        hangingCharacters = LocaleData().getHangingCharacters(LOCALE("ja", "JP"));
         cBreakIterator = "com.sun.star.i18n.BreakIterator_ja";
 }
 
@@ -156,6 +176,7 @@
 //      ----------------------------------------------------;
 BreakIterator_ko::BreakIterator_ko()
 {
+        hangingCharacters = LocaleData().getHangingCharacters(LOCALE("ko", "KR"));
         cBreakIterator = "com.sun.star.i18n.BreakIterator_ko";
 }
 
Index: l10n/i18npool/source/breakiterator/breakiterator_hi.cxx
diff -u l10n/i18npool/source/breakiterator/breakiterator_hi.cxx:1.3 l10n/i18npool/source/breakiterator/breakiterator_hi.cxx:removed
--- l10n/i18npool/source/breakiterator/breakiterator_hi.cxx:1.3	Sun Sep 17 02:13:49 2006
+++ l10n/i18npool/source/breakiterator/breakiterator_hi.cxx	Tue Sep  2 00:59:11 2008
@@ -1,191 +0,0 @@
-/*************************************************************************
-#*
-#* Copyright (c) 2002 Sun Microsystems Inc.
-#*
-#* Bugs! - Contact Prabhat.Hegde at sun.com
-#************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_i18npool.hxx"
-
-#include <breakiterator_hi.hxx>
-
-#include <string.h>	// for memset
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::rtl;
-
-namespace com { namespace sun { namespace star { namespace i18n {
-
-//	----------------------------------------------------
-//	class Breakiterator_hi
-//	----------------------------------------------------;
-BreakIterator_hi::BreakIterator_hi()
-{
-	cBreakIterator = "com.sun.star.i18n.BreakIterator_hi";
-}
-
-BreakIterator_hi::~BreakIterator_hi()
-{
-}
-
-/*
- * Devanagari character class Definitions
- */
-#define	_NP		 1L
-#define _UP		 (1L<<1)
-#define _IV		 (1L<<2)
-#define _CN		 (1L<<3)
-#define _CK		 (1L<<4)
-#define _RC		 (1L<<5)
-#define _NM		 (1L<<6)
-#define _IM		 (1L<<7)
-#define _HL		 (1L<<8)
-#define _NK		 (1L<<9)
-#define _VD		 (1L<<10)
-#define _HD		 (1L<<11)
-#define	_II_M	 (1L<<12)
-#define	_EY_M	 (1L<<13)
-#define	_AI_M	 (1L<<14)
-#define	_OW1_M (1L<<15)
-#define	_OW2_M (1L<<16)
-#define	_MS		 (1L<<17)
-#define _AYE_M (1L<<18)
-#define _EE_M	 (1L<<19)
-#define _AWE_M (1L<<20)
-#define _O_M	 (1L<<21)
-#define _RM		 (_II_M|_EY_M|_AI_M|_OW1_M|_OW2_M|_AYE_M|_EE_M|_AWE_M|_O_M)
-
-/* Non-Defined Class type */
-#define __ND		0
-
-/*
- * Devanagari character type definitions
- */
-#define __UP  1  // ChandraBindu & Anuswar
-#define	__NP  2  // Visarg
-#define __IV	3  // Independant Vowels
-#define __CN	4  // Consonants except _CK & _RC 
-#define __CK	5  // Consonants that can be followed by Nukta
-#define __RC	6  // Ra
-#define __NM	7  // Matra
-#define __RM	8  // Ra + HAL
-#define __IM	9  // Choti I Matra
-#define __HL	10 // HAL
-#define __NK	11 // Nukta
-#define __VD	12 // Vedic
-#define __HD	13 // Hindu Numerals
-
-/*
- * Devanagari character type table
- */
-static const sal_uInt16 devaCT[128] = {
-/*         0,    1,    2,    3,    4,    5,    6,    7,
-           8,    9,    A,    B,    C,    D,    E,    F, */
-/* 0900 */ __ND, __UP, __UP, __NP, __ND, __IV, __IV, __IV,
-           __IV, __IV, __IV, __IV, __IV, __IV, __IV, __IV,
-/* 0910 */ __IV, __IV, __IV, __IV, __IV, __CK, __CK, __CK,
-           __CN, __CN, __CN, __CN, __CK, __CN, __CN, __CN,
-/* 0920 */ __CN, __CK, __CK, __CN, __CN, __CN, __CN, __CN,
-           __CN, __CN, __CN, __CK, __CN, __CN, __CN, __CN,
-/* 0930 */ __RC, __CN, __CN, __CN, __CN, __CN, __CN, __CN,
-           __CN, __CN, __ND, __ND, __NK, __VD, __NM, __IM,
-/* 0940 */ __RM, __NM, __NM, __NM, __NM, __RM, __RM, __RM,
-           __RM, __RM, __RM, __RM, __RM, __HL, __ND, __ND,
-/* 0950 */ __ND, __VD, __VD, __VD, __VD, __ND, __ND, __ND,
-           __CN, __CN, __CN, __CN, __CN, __CN, __CN, __CN,
-/* 0960 */ __IV, __IV, __NM, __NM, __ND, __ND, __HD, __HD,
-           __HD, __HD, __HD, __HD, __HD, __HD, __HD, __HD,
-/* 0970 */ __ND, __ND, __ND, __ND, __ND, __ND, __ND, __ND,
-           __ND, __ND, __ND, __ND, __ND, __ND, __ND, __ND,
-};
-
-
-#define getCharType(x) \
-	((x >= 0x0900 && x < 0x097f) ? devaCT[x - 0x0900] : __ND)
-
-/*
- * Devanagari character composition table
- */
-static const sal_uInt16 devaCompRel[14][14] = {
-  /*        ND, UP, NP, IV, CN, CK, RC, NM, RM, IM, HL, NK, VD, HD, */
-  /* 0  */ { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }, /* ND */
-  /* 1  */ { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }, /* UP */
-  /* 2  */ { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }, /* NP */
-  /* 3  */ { 0,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }, /* IV */
-  /* 4  */ { 0,  1,  1,  0,  0,  0,  0,  1,  1,  1,  1,  0,  0,  0 }, /* CN */
-  /* 5  */ { 0,  1,  1,  0,  0,  0,  0,  1,  1,  1,  1,  1,  0,  0 }, /* CK */
-  /* 6  */ { 0,  1,  1,  0,  0,  0,  0,  1,  1,  1,  1,  0,  0,  0 }, /* RC */
-  /* 7  */ { 0,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }, /* NM */
-  /* 8  */ { 0,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }, /* RM */
-  /* 9  */ { 0,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }, /* IM */
-  /* 10 */ { 0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0 }, /* HL */
-  /* 11 */ { 0,  1,  1,  0,  0,  0,  0,  1,  1,  1,  1,  0,  0,  0 }, /* NK */
-  /* 12 */ { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }, /* VD */
-  /* 13 */ { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }  /* HD */
-};
-
-static sal_uInt16 SAL_CALL 
-getCombState(const sal_Unicode *text, sal_Int32 pos)
-{
-	sal_uInt16 ch1 = getCharType(text[pos]);
-	sal_uInt16 ch2 = getCharType(text[pos+1]);
-
-	return devaCompRel[ch1][ch2];
-}
-
-static sal_uInt32 SAL_CALL 
-getACell(const sal_Unicode *text, sal_Int32 pos, sal_Int32 len)
-{
-	sal_uInt32 curr = 1;
-	for (; pos + 1 < len && getCombState(text, pos) == 1; curr++, pos++) {}
-	return curr;
-}
-
-#define is_Hindi(x)	((x >= 0x0900 && x < 0x097f) || (x >= 0x0905 && x < 0x0940) || \
-                     (x >= 0x093c && x < 0x094e) || (x >= 0x0950 && x < 0x0954) || \
-                     (x >= 0x0958 && x < 0x0971))
-
-void SAL_CALL 
-i18n::BreakIterator_hi::makeIndex(const OUString& Text, sal_Int32 nStartPos)
-	throw(uno::RuntimeException)
-{
-	if (Text != cachedText) {
-    cachedText = Text;
-    if (cellIndexSize < cachedText.getLength()) {
-      cellIndexSize = cachedText.getLength();
-      free(nextCellIndex);
-      free(previousCellIndex);
-      nextCellIndex = (sal_Int32*) calloc(cellIndexSize, sizeof(sal_Int32));
-      previousCellIndex = (sal_Int32*) calloc(cellIndexSize, sizeof(sal_Int32));
-    }
-    // reset nextCell for new Text
-    memset(nextCellIndex, 0, cellIndexSize * sizeof(sal_Int32));
-	}
-	else if (nextCellIndex[nStartPos] > 0 || ! is_Hindi(Text[nStartPos]))
-    return;
-  
-	const sal_Unicode* str = cachedText.getStr();
-	sal_Int32 len = cachedText.getLength(), startPos, endPos;
-  
-	startPos = nStartPos;
-	while (startPos > 0 && is_Hindi(str[startPos-1])) startPos--;
-	endPos = nStartPos+1;
-	while (endPos < len && is_Hindi(str[endPos])) endPos++;
-  
-	sal_Int32 start, end, pos;
-	pos = start = end = startPos;
-  
-	while (pos < endPos) {
-    end += getACell(str, start, endPos);
-    while (pos < end) {
-      nextCellIndex[pos] = end;
-      previousCellIndex[pos] = start;
-      pos++;
-    }
-    start = end;
-	}
-}
-
-} } } }
Index: l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx
diff -u l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx:1.36 l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx:1.36.2.1
--- l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx:1.36	Wed Jul  2 01:52:07 2008
+++ l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx	Mon Sep  1 17:26:14 2008
@@ -363,11 +363,17 @@
 {
         LineBreakResults lbr;
 
+        if (nStartPos >= Text.getLength()) {
+            lbr.breakIndex = Text.getLength();
+            lbr.breakType = BreakType::WORDBOUNDARY;
+            return lbr;
+        }
+
         loadICUBreakIterator(rLocale, LOAD_LINE_BREAKITERATOR, 0, lineRule, Text);
 
         sal_Bool GlueSpace=sal_True;
         while (GlueSpace) {
-            if (line.aBreakIterator->isBoundary(nStartPos)) { //Line boundary break
+            if (line.aBreakIterator->preceding(nStartPos + 1) == nStartPos) { //Line boundary break
                 lbr.breakIndex = nStartPos;
                 lbr.breakType = BreakType::WORDBOUNDARY;
             } else if (hOptions.rHyphenator.is()) { //Hyphenation break
Index: l10n/i18npool/source/breakiterator/makefile.mk
diff -u l10n/i18npool/source/breakiterator/makefile.mk:1.17 l10n/i18npool/source/breakiterator/makefile.mk:1.17.16.1
--- l10n/i18npool/source/breakiterator/makefile.mk:1.17	Thu Apr 10 01:53:36 2008
+++ l10n/i18npool/source/breakiterator/makefile.mk	Mon Sep  1 11:01:24 2008
@@ -57,7 +57,6 @@
 	    $(SLO)$/breakiterator_cjk.obj \
 	    $(SLO)$/breakiterator_ctl.obj \
 	    $(SLO)$/breakiterator_th.obj \
-	    $(SLO)$/breakiterator_hi.obj \
 	    $(SLO)$/breakiterator_unicode.obj \
 	    $(SLO)$/xdictionary.obj \
         $(subst,$(MISC)$/,$(SLO)$/ $(MY_MISC_CXXFILES:s/.c/.obj/))
Index: l10n/i18npool/source/breakiterator/data/char_in.txt
diff -u /dev/null l10n/i18npool/source/breakiterator/data/char_in.txt:1.1.2.1
--- /dev/null	Tue Sep  2 00:59:11 2008
+++ l10n/i18npool/source/breakiterator/data/char_in.txt	Mon Sep  1 10:56:14 2008
@@ -0,0 +1,48 @@
+#
+#   Copyright (C) 2002-2003, International Business Machines Corporation and others.
+#       All Rights Reserved.
+#
+#   file:  char.txt 
+#
+#   ICU Character Break Rules, also known as Grapheme Cluster Boundaries
+#      See Unicode Standard Annex #29.
+#      These rules are based on TR29 Version 4.0.0
+#
+
+#
+#  Character Class Definitions.
+#    The names are those from TR29.
+#
+$CR = \r;
+$LF = \n;
+$Control    = [[:Zl:] [:Zp:] [:Cc:] [:Cf:]];
+
+# add Japanese Half Width voicing marks to $Extend
+$VoiceMarks = [\uff9e\uff9f];
+$cmcextend = [ \u0903 \u093e-\u0940 \u0949-\u094C \u09bf-\u09c0 \u09c7-\u09c8 \u09cb-\u09cc \u0bc1-\u0bc2 \u0bc6-\u0bc8 \u0bca-\u0bcc \u0c01-\u0c03 \u0c41-\u0c44];
+$Extend     = [[:Grapheme_Extend = TRUE:] $VoiceMarks $cmcextend]; 
+
+#
+# Korean Syllable Definitions
+#
+$L   = [:Hangul_Syllable_Type = L:];
+$V   = [:Hangul_Syllable_Type = V:];
+$T   = [:Hangul_Syllable_Type = T:];
+
+$LV  = [:Hangul_Syllable_Type = LV:];
+$LVT = [:Hangul_Syllable_Type = LVT:];
+
+$HangulSyllable = $L+ | ($L* ($LV? $V+ | $LV | $LVT) $T*) | $T+;
+
+#
+#  Forward Break Rules
+#
+$CR $LF;
+([^$Control] | $HangulSyllable) $Extend*;
+.;
+
+
+#
+#  Reverse Rule, back up to the beginning of some preceding grapheme cluster.
+#
+! ($Extend | $V | $T )*   ($LF $CR | ($LV | $LVT)?$L* | .);
Index: l10n/i18npool/source/breakiterator/data/char_ta.txt
diff -u l10n/i18npool/source/breakiterator/data/char_ta.txt:1.2 l10n/i18npool/source/breakiterator/data/char_ta.txt:removed
--- l10n/i18npool/source/breakiterator/data/char_ta.txt:1.2	Mon Oct 17 08:42:47 2005
+++ l10n/i18npool/source/breakiterator/data/char_ta.txt	Tue Sep  2 00:59:11 2008
@@ -1,46 +0,0 @@
-#
-#   Copyright (C) 2002-2003, International Business Machines Corporation and others.
-#       All Rights Reserved.
-#
-#   file:  char.txt 
-#
-#   ICU Character Break Rules, also known as Grapheme Cluster Boundaries
-#      See Unicode Standard Annex #29.
-#      These rules are based on TR29 Version 4.0.0
-#
-
-#
-#  Character Class Definitions.
-#    The names are those from TR29.
-#
-$CR = \r;
-$LF = \n;
-$Control    = [[:Zl:] [:Zp:] [:Cc:] [:Cf:]];
-
-$TAMIL = [ \u0bc1-\u0bc2 \u0bc6-\u0bc8 \u0bca-\u0bcc ];
-$Extend     = [[:Grapheme_Extend = TRUE:] $TAMIL]; 
-
-#
-# Korean Syllable Definitions
-#
-$L   = [:Hangul_Syllable_Type = L:];
-$V   = [:Hangul_Syllable_Type = V:];
-$T   = [:Hangul_Syllable_Type = T:];
-
-$LV  = [:Hangul_Syllable_Type = LV:];
-$LVT = [:Hangul_Syllable_Type = LVT:];
-
-$HangulSyllable = $L+ | ($L* ($LV? $V+ | $LV | $LVT) $T*) | $T+;
-
-#
-#  Forward Break Rules
-#
-$CR $LF;
-([^$Control] | $HangulSyllable) $Extend*;
-.;
-
-
-#
-#  Reverse Rule, back up to the beginning of some preceding grapheme cluster.
-#
-! ($Extend | $V | $T )*   ($LF $CR | ($LV | $LVT)?$L* | .);
Index: l10n/i18npool/source/localedata/LocaleNode.cxx
diff -u l10n/i18npool/source/localedata/LocaleNode.cxx:1.29 l10n/i18npool/source/localedata/LocaleNode.cxx:1.29.16.1
--- l10n/i18npool/source/localedata/LocaleNode.cxx:1.29	Thu Apr 10 02:04:34 2008
+++ l10n/i18npool/source/localedata/LocaleNode.cxx	Mon Aug 18 21:26:23 2008
@@ -1449,15 +1449,18 @@
     if (forbidNode)    {
      	of.writeParameter( "forbiddenBegin", forbidNode -> getChildAt(0)->getValue());
      	of.writeParameter( "forbiddenEnd", forbidNode -> getChildAt(1)->getValue());
+     	of.writeParameter( "hangingChars", forbidNode -> getChildAt(2)->getValue());
     } else {
      	of.writeParameter( "forbiddenBegin", ::rtl::OUString());
      	of.writeParameter( "forbiddenEnd", ::rtl::OUString());
+     	of.writeParameter( "hangingChars", ::rtl::OUString());
     }
 	of.writeAsciiString("\nstatic const sal_Unicode* LCForbiddenCharactersArray[] = {\n");
 	of.writeAsciiString("\tforbiddenBegin,\n");
-	of.writeAsciiString("\tforbiddenEnd\n");
+	of.writeAsciiString("\tforbiddenEnd,\n");
+	of.writeAsciiString("\thangingChars\n");
 	of.writeAsciiString("};\n\n");
-	of.writeFunction("getForbiddenCharacters_", "2", "LCForbiddenCharactersArray");
+	of.writeFunction("getForbiddenCharacters_", "3", "LCForbiddenCharactersArray");
 
     if (breakNode) {
      	of.writeParameter( "EditMode", breakNode -> getChildAt(0)->getValue());
Index: l10n/i18npool/source/localedata/localedata.cxx
diff -u l10n/i18npool/source/localedata/localedata.cxx:1.59 l10n/i18npool/source/localedata/localedata.cxx:1.59.16.1
--- l10n/i18npool/source/localedata/localedata.cxx:1.59	Thu Apr 10 02:05:23 2008
+++ l10n/i18npool/source/localedata/localedata.cxx	Mon Aug 18 21:26:23 2008
@@ -999,6 +999,21 @@
         }
 }
 
+OUString SAL_CALL
+LocaleData::getHangingCharacters( const Locale& rLocale ) throw(RuntimeException)
+{
+        sal_Int16 LCForbiddenCharactersCount = 0;
+        sal_Unicode **LCForbiddenCharactersArray = NULL;
+
+        MyFunc_Type func = (MyFunc_Type) getFunctionSymbol( rLocale, "getForbiddenCharacters" );
+
+        if ( func ) {
+            LCForbiddenCharactersArray = func(LCForbiddenCharactersCount);
+            return OUString(LCForbiddenCharactersArray[2]);
+        }
+
+        return OUString();
+}
 
 Sequence< OUString > SAL_CALL
 LocaleData::getBreakIteratorRules( const Locale& rLocale  ) throw(RuntimeException)
Index: l10n/i18npool/source/localedata/data/bn_BD.xml
diff -u l10n/i18npool/source/localedata/data/bn_BD.xml:1.3 l10n/i18npool/source/localedata/data/bn_BD.xml:1.3.186.1
--- l10n/i18npool/source/localedata/data/bn_BD.xml:1.3	Thu Apr 20 06:31:30 2006
+++ l10n/i18npool/source/localedata/data/bn_BD.xml	Mon Sep  1 11:05:47 2008
@@ -151,6 +151,13 @@
   </LC_CURRENCY>
   <LC_TRANSLITERATION ref="en_US"/>
   <LC_MISC>
+    <BreakIteratorRules>
+      <EditMode/>
+      <DictionaryMode/>
+      <WordCountMode/>
+      <CharacterMode>char_in</CharacterMode>
+      <LineMode/>
+    </BreakIteratorRules>
     <ReservedWords>
       <trueWord>????????????</trueWord>
       <falseWord>??????????????????</falseWord>
Index: l10n/i18npool/source/localedata/data/bn_IN.xml
diff -u l10n/i18npool/source/localedata/data/bn_IN.xml:1.4 l10n/i18npool/source/localedata/data/bn_IN.xml:1.4.12.1
--- l10n/i18npool/source/localedata/data/bn_IN.xml:1.4	Tue May 13 07:06:42 2008
+++ l10n/i18npool/source/localedata/data/bn_IN.xml	Mon Sep  1 11:05:47 2008
@@ -316,6 +316,13 @@
   </LC_CURRENCY>
   <LC_TRANSLITERATION ref="en_US"/>
   <LC_MISC>
+    <BreakIteratorRules>
+      <EditMode/>
+      <DictionaryMode/>
+      <WordCountMode/>
+      <CharacterMode>char_in</CharacterMode>
+      <LineMode/>
+    </BreakIteratorRules>
     <ReservedWords>
       <trueWord>????????????</trueWord>
       <falseWord>??????????????????</falseWord>
Index: l10n/i18npool/source/localedata/data/gu_IN.xml
diff -u l10n/i18npool/source/localedata/data/gu_IN.xml:1.5 l10n/i18npool/source/localedata/data/gu_IN.xml:1.5.4.1
--- l10n/i18npool/source/localedata/data/gu_IN.xml:1.5	Wed Jul  2 03:07:00 2008
+++ l10n/i18npool/source/localedata/data/gu_IN.xml	Mon Sep  1 17:44:31 2008
@@ -146,6 +146,13 @@
 </LC_CURRENCY>
 <LC_TRANSLITERATION ref="en_US"/>
 <LC_MISC>
+<BreakIteratorRules>
+<EditMode/>
+<DictionaryMode/>
+<WordCountMode/>
+<CharacterMode>char_in</CharacterMode>
+<LineMode/>
+</BreakIteratorRules>
 <ReservedWords>
 <trueWord>?????????</trueWord>
 <falseWord>?????????</falseWord>
Index: l10n/i18npool/source/localedata/data/hi_IN.xml
diff -u l10n/i18npool/source/localedata/data/hi_IN.xml:1.14 l10n/i18npool/source/localedata/data/hi_IN.xml:1.14.4.1
--- l10n/i18npool/source/localedata/data/hi_IN.xml:1.14	Wed Jul  2 03:07:31 2008
+++ l10n/i18npool/source/localedata/data/hi_IN.xml	Mon Sep  1 11:05:47 2008
@@ -358,6 +358,13 @@
 </LC_CURRENCY>
 <LC_TRANSLITERATION ref="en_US"/>
 <LC_MISC>
+<BreakIteratorRules>
+<EditMode/>
+<DictionaryMode/>
+<WordCountMode/>
+<CharacterMode>char_in</CharacterMode>
+<LineMode/>
+</BreakIteratorRules>
 <ReservedWords>
 <trueWord>?????????</trueWord>
 <falseWord>?????????</falseWord>
Index: l10n/i18npool/source/localedata/data/ja_JP.xml
diff -u l10n/i18npool/source/localedata/data/ja_JP.xml:1.17 l10n/i18npool/source/localedata/data/ja_JP.xml:1.17.26.2
--- l10n/i18npool/source/localedata/data/ja_JP.xml:1.17	Mon Jan 28 07:35:35 2008
+++ l10n/i18npool/source/localedata/data/ja_JP.xml	Mon Sep  1 17:38:27 2008
@@ -503,6 +503,7 @@
     <ForbiddenCharacters>
       <ForbiddenLineBeginCharacters>!%),.:;?]}???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????</ForbiddenLineBeginCharacters>
       <ForbiddenLineEndCharacters>$([??{????????????????????????????????????????????????</ForbiddenLineEndCharacters>
+      <LineBreakHangingCharacters>????????????</LineBreakHangingCharacters>
     </ForbiddenCharacters>
     <ReservedWords>
       <trueWord>true</trueWord>
Index: l10n/i18npool/source/localedata/data/kn_IN.xml
diff -u l10n/i18npool/source/localedata/data/kn_IN.xml:1.9 l10n/i18npool/source/localedata/data/kn_IN.xml:1.9.4.1
--- l10n/i18npool/source/localedata/data/kn_IN.xml:1.9	Wed Jul  2 03:09:49 2008
+++ l10n/i18npool/source/localedata/data/kn_IN.xml	Mon Sep  1 17:44:31 2008
@@ -146,6 +146,13 @@
 </LC_CURRENCY>
 <LC_TRANSLITERATION ref="en_US"/>
 <LC_MISC>
+<BreakIteratorRules>
+<EditMode/>
+<DictionaryMode/>
+<WordCountMode/>
+<CharacterMode>char_in</CharacterMode>
+<LineMode/>
+</BreakIteratorRules>
 <ReservedWords>
 <trueWord>?????????</trueWord>
 <falseWord>????????????</falseWord>
Index: l10n/i18npool/source/localedata/data/ko_KR.xml
diff -u l10n/i18npool/source/localedata/data/ko_KR.xml:1.22 l10n/i18npool/source/localedata/data/ko_KR.xml:1.22.186.1
--- l10n/i18npool/source/localedata/data/ko_KR.xml:1.22	Thu Apr 20 06:47:11 2006
+++ l10n/i18npool/source/localedata/data/ko_KR.xml	Mon Aug 18 21:26:23 2008
@@ -580,6 +580,7 @@
     <ForbiddenCharacters>
       <ForbiddenLineBeginCharacters>!%),.:;?]}??????&apos;&quot;?????????&gt;??????????????????????????????????????????????????????????????? ??????</ForbiddenLineBeginCharacters>
       <ForbiddenLineEndCharacters>$(????[\{??????&apos;&quot;&lt;????????????????????????????????????</ForbiddenLineEndCharacters>
+      <LineBreakHangingCharacters>!,.:;?????????????????????????</LineBreakHangingCharacters>
     </ForbiddenCharacters>
     <ReservedWords>
       <trueWord>???</trueWord>
Index: l10n/i18npool/source/localedata/data/locale.dtd
diff -u l10n/i18npool/source/localedata/data/locale.dtd:1.24 l10n/i18npool/source/localedata/data/locale.dtd:1.24.26.1
--- l10n/i18npool/source/localedata/data/locale.dtd:1.24	Mon Jan 28 07:36:04 2008
+++ l10n/i18npool/source/localedata/data/locale.dtd	Mon Aug 18 21:26:23 2008
@@ -403,7 +403,7 @@
 
 <!ELEMENT LC_MISC (ForbiddenCharacters?, BreakIteratorRules?, ReservedWords?)>
 <!ATTLIST LC_MISC %RefLocale;>
-<!ELEMENT ForbiddenCharacters (ForbiddenLineBeginCharacters, ForbiddenLineEndCharacters)>
+<!ELEMENT ForbiddenCharacters (ForbiddenLineBeginCharacters, ForbiddenLineEndCharacters, LineBreakHangingCharacters)>
 <!ELEMENT ForbiddenLineBeginCharacters (#PCDATA)>
 <!ELEMENT ForbiddenLineEndCharacters (#PCDATA)>
 
Index: l10n/i18npool/source/localedata/data/ml_IN.xml
diff -u l10n/i18npool/source/localedata/data/ml_IN.xml:1.2 l10n/i18npool/source/localedata/data/ml_IN.xml:1.2.182.1
--- l10n/i18npool/source/localedata/data/ml_IN.xml:1.2	Thu May  4 02:16:24 2006
+++ l10n/i18npool/source/localedata/data/ml_IN.xml	Mon Sep  1 17:44:31 2008
@@ -314,6 +314,13 @@
   </LC_CURRENCY>
   <LC_TRANSLITERATION ref="en_US"/>
   <LC_MISC>
+    <BreakIteratorRules>
+      <EditMode/>
+      <DictionaryMode/>
+      <WordCountMode/>
+      <CharacterMode>char_in</CharacterMode>
+      <LineMode/>
+    </BreakIteratorRules>
     <ReservedWords>
       <trueWord>?????????</trueWord>
       <falseWord>????????????</falseWord>
Index: l10n/i18npool/source/localedata/data/or_IN.xml
diff -u l10n/i18npool/source/localedata/data/or_IN.xml:1.4 l10n/i18npool/source/localedata/data/or_IN.xml:1.4.4.1
--- l10n/i18npool/source/localedata/data/or_IN.xml:1.4	Wed Jul  2 03:11:42 2008
+++ l10n/i18npool/source/localedata/data/or_IN.xml	Mon Sep  1 17:44:31 2008
@@ -327,6 +327,13 @@
     <Transliteration unoid="IGNORE_CASE"/>
   </LC_TRANSLITERATION>
   <LC_MISC>
+    <BreakIteratorRules>
+      <EditMode/>
+      <DictionaryMode/>
+      <WordCountMode/>
+      <CharacterMode>char_in</CharacterMode>
+      <LineMode/>
+    </BreakIteratorRules>
     <ReservedWords>
       <trueWord>??????</trueWord>
       <falseWord>?????????</falseWord>
Index: l10n/i18npool/source/localedata/data/pa_IN.xml
diff -u l10n/i18npool/source/localedata/data/pa_IN.xml:1.5 l10n/i18npool/source/localedata/data/pa_IN.xml:1.5.186.1
--- l10n/i18npool/source/localedata/data/pa_IN.xml:1.5	Thu Apr 20 06:50:32 2006
+++ l10n/i18npool/source/localedata/data/pa_IN.xml	Mon Sep  1 11:05:47 2008
@@ -168,6 +168,13 @@
   </LC_CURRENCY>
   <LC_TRANSLITERATION ref="en_US"/>
   <LC_MISC>
+    <BreakIteratorRules>
+      <EditMode/>
+      <DictionaryMode/>
+      <WordCountMode/>
+      <CharacterMode>char_in</CharacterMode>
+      <LineMode/>
+    </BreakIteratorRules>
     <ReservedWords>
       <trueWord>?????????</trueWord>
       <falseWord>?????????</falseWord>
Index: l10n/i18npool/source/localedata/data/ta_IN.xml
diff -u l10n/i18npool/source/localedata/data/ta_IN.xml:1.8 l10n/i18npool/source/localedata/data/ta_IN.xml:1.8.4.1
--- l10n/i18npool/source/localedata/data/ta_IN.xml:1.8	Wed Jul  2 03:14:34 2008
+++ l10n/i18npool/source/localedata/data/ta_IN.xml	Mon Sep  1 11:05:48 2008
@@ -146,6 +146,13 @@
 </LC_CURRENCY>
 <LC_TRANSLITERATION ref="en_US"/>
 <LC_MISC>
+<BreakIteratorRules>
+<EditMode/>
+<DictionaryMode/>
+<WordCountMode/>
+<CharacterMode>char_in</CharacterMode>
+<LineMode/>
+</BreakIteratorRules>
 <ReservedWords>
 <trueWord>?????????</trueWord>
 <falseWord>????????????</falseWord>
Index: l10n/i18npool/source/localedata/data/te_IN.xml
diff -u l10n/i18npool/source/localedata/data/te_IN.xml:1.9 l10n/i18npool/source/localedata/data/te_IN.xml:1.9.4.1
--- l10n/i18npool/source/localedata/data/te_IN.xml:1.9	Wed Jul  2 03:14:53 2008
+++ l10n/i18npool/source/localedata/data/te_IN.xml	Mon Sep  1 11:05:48 2008
@@ -145,6 +145,13 @@
 </LC_CURRENCY>
 <LC_TRANSLITERATION ref="en_US"/>
 <LC_MISC>
+<BreakIteratorRules>
+<EditMode/>
+<DictionaryMode/>
+<WordCountMode/>
+<CharacterMode>char_in</CharacterMode>
+<LineMode/>
+</BreakIteratorRules>
 <ReservedWords>
 <trueWord>???????????????</trueWord>
 <falseWord>??????????????????</falseWord>
Index: l10n/i18npool/source/localedata/data/zh_CN.xml
diff -u l10n/i18npool/source/localedata/data/zh_CN.xml:1.21 l10n/i18npool/source/localedata/data/zh_CN.xml:1.21.4.1
--- l10n/i18npool/source/localedata/data/zh_CN.xml:1.21	Wed Jul  2 03:15:57 2008
+++ l10n/i18npool/source/localedata/data/zh_CN.xml	Mon Aug 18 21:26:23 2008
@@ -430,6 +430,7 @@
 <ForbiddenCharacters>
 <ForbiddenLineBeginCharacters>:!),.:;?]}??'"?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????--???</ForbiddenLineBeginCharacters>
 <ForbiddenLineEndCharacters>([{????'"?????????????????????????????????????????????????????????????????????????????????</ForbiddenLineEndCharacters>
+<LineBreakHangingCharacters>!,.:;?????????????????????????</LineBreakHangingCharacters>
 </ForbiddenCharacters>
 <ReservedWords>
 <trueWord>???</trueWord>
Index: l10n/i18npool/source/localedata/data/zh_TW.xml
diff -u l10n/i18npool/source/localedata/data/zh_TW.xml:1.18 l10n/i18npool/source/localedata/data/zh_TW.xml:1.18.20.1
--- l10n/i18npool/source/localedata/data/zh_TW.xml:1.18	Wed Mar  5 10:45:25 2008
+++ l10n/i18npool/source/localedata/data/zh_TW.xml	Mon Aug 18 21:26:23 2008
@@ -359,6 +359,7 @@
 <ForbiddenCharacters>
 <ForbiddenLineBeginCharacters>!),.:;?]}????--'"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????</ForbiddenLineBeginCharacters>
 <ForbiddenLineEndCharacters>([{????'"???????????????????????????????????????????????????????????????</ForbiddenLineEndCharacters>
+<LineBreakHangingCharacters>!,.:;?????????????????????????</LineBreakHangingCharacters>
 </ForbiddenCharacters>
 <ReservedWords>
 <trueWord>???</trueWord>
Index: l10n/i18npool/source/registerservices/registerservices.cxx
diff -u l10n/i18npool/source/registerservices/registerservices.cxx:1.44 l10n/i18npool/source/registerservices/registerservices.cxx:1.44.16.2
--- l10n/i18npool/source/registerservices/registerservices.cxx:1.44	Thu Apr 10 02:08:28 2008
+++ l10n/i18npool/source/registerservices/registerservices.cxx	Mon Sep  1 11:04:41 2008
@@ -65,7 +65,6 @@
 #include <breakiteratorImpl.hxx>
 #include <breakiterator_cjk.hxx>
 #include <breakiterator_th.hxx>
-#include <breakiterator_hi.hxx>
 #include <breakiterator_unicode.hxx>
 
 #include <indexentrysupplier.hxx>
@@ -152,9 +151,9 @@
 IMPL_CREATEINSTANCE( BreakIterator_Unicode )
 IMPL_CREATEINSTANCE( BreakIterator_ja )
 IMPL_CREATEINSTANCE( BreakIterator_zh )
+IMPL_CREATEINSTANCE( BreakIterator_zh_TW )
 IMPL_CREATEINSTANCE( BreakIterator_ko )
 IMPL_CREATEINSTANCE( BreakIterator_th )
-IMPL_CREATEINSTANCE( BreakIterator_hi )
 IMPL_CREATEINSTANCE_MSF( ChapterCollator )
 IMPL_CREATEINSTANCE_MSF( CollatorImpl )
 IMPL_CREATEINSTANCE( Collator_Unicode )
@@ -369,15 +368,15 @@
     {   "com.sun.star.i18n.BreakIterator_zh",
         "com.sun.star.i18n.BreakIterator_zh",
         &BreakIterator_zh_CreateInstance },
+    {   "com.sun.star.i18n.BreakIterator_zh_TW",
+        "com.sun.star.i18n.BreakIterator_zh_TW",
+        &BreakIterator_zh_TW_CreateInstance },
     {   "com.sun.star.i18n.BreakIterator_ko",
         "com.sun.star.i18n.BreakIterator_ko",
         &BreakIterator_ko_CreateInstance },
     {   "com.sun.star.i18n.BreakIterator_th",
         "com.sun.star.i18n.BreakIterator_th",
         &BreakIterator_th_CreateInstance },
-    {   "com.sun.star.i18n.BreakIterator_hi",
-        "com.sun.star.i18n.BreakIterator_hi",
-        &BreakIterator_hi_CreateInstance },
     {   "com.sun.star.i18n.Collator",
         "com.sun.star.i18n.Collator",
         &CollatorImpl_CreateInstance },


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1633
retrieving revision 1.1634
diff -u -r1.1633 -r1.1634
--- openoffice.org.spec	1 Sep 2008 12:09:08 -0000	1.1633
+++ openoffice.org.spec	2 Sep 2008 08:37:17 -0000	1.1634
@@ -78,7 +78,7 @@
 Patch8:  openoffice.org-2.0.2.rh188467.printingdefaults.patch
 Patch9:  openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
 Patch10: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch11: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
+Patch11: workspace.i18n45.patch
 Patch12: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
 Patch13: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
 Patch14: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
@@ -109,6 +109,7 @@
 Patch39: workspace.fpicker8.patch
 Patch40: workspace.cmcfixes49.patch
 Patch41: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
+Patch42: openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1257,7 +1258,7 @@
 %patch8  -p1
 %patch9  -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch10 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch11 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
+%patch11 -p1 -b .workspace.i18n45.patch
 %patch12 -p1 -b .ooo65491.psprint.enablenups.patch
 cat %{PATCH13} >> svtools/source/dialogs/localize.sdf
 %patch14 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
@@ -1288,6 +1289,7 @@
 %patch39 -p1 -b .workspace.fpicker8.patch
 %patch40 -p0 -b .workspace.cmcfixes49.patch
 %patch41 -p1 -b .ooo91924.svx.consistentordering.patch
+%patch42 -p1 -b .ooo93366.fpicker_in_main.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3646,6 +3648,7 @@
 * Mon Sep 01 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-4.2
 - Resolves: rhbz#460755 TryExec oowriter on brwriter.desktop etc
 - defuzz patches
+- add openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch
 
 * Fri Aug 29 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-4.1
 - next milestone


--- openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch DELETED ---



From rjones at fedoraproject.org  Tue Sep  2 08:40:19 2008
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue,  2 Sep 2008 08:40:19 +0000 (UTC)
Subject: rpms/ocaml-cil/devel ocaml-cil.spec,1.3,1.4
Message-ID: <20080902084019.737487011D@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-cil/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32384

Modified Files:
	ocaml-cil.spec 
Log Message:
* Tue Sep  2 2008 Richard W.M. Jones <rjones at redhat.com> - 1.3.6-7
- Prevent unwanted bytecode stripping by RPM and prelink.
- Place *.ml files into the -devel subpackage.



Index: ocaml-cil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cil/devel/ocaml-cil.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocaml-cil.spec	7 Jul 2008 10:51:25 -0000	1.3
+++ ocaml-cil.spec	2 Sep 2008 08:39:49 -0000	1.4
@@ -1,9 +1,12 @@
 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %define debug_package %{nil}
 
+# Prevent unwanted bytecode stripping by RPM.
+%define __strip /bin/true
+
 Name:           ocaml-cil
 Version:        1.3.6
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        CIL - Infrastructure for C Program Analysis and Transformation
 
 Group:          Development/Libraries
@@ -137,6 +140,8 @@
 mkdir -p $DESTDIR%{_libexecdir}/cil/obj/$archos
 install -m 0755 obj/$archos/cilly.*.exe $DESTDIR%{_libexecdir}/cil/obj/$archos
 
+mkdir -p $DESTDIR/etc/prelink.conf.d
+echo -- '-b /usr/libexec/cil' > $DESTDIR/etc/prelink.conf.d/ocaml-cil-cilly.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -152,6 +157,7 @@
 %exclude %{_libdir}/ocaml/cil/*.cmx
 %endif
 %exclude %{_libdir}/ocaml/cil/*.mli
+%exclude %{_libdir}/ocaml/cil/*.ml
 
 
 %files devel
@@ -163,6 +169,7 @@
 %{_libdir}/ocaml/cil/*.cmx
 %endif
 %{_libdir}/ocaml/cil/*.mli
+%{_libdir}/ocaml/cil/*.ml
 
 
 %files doc
@@ -179,9 +186,14 @@
 %{perl_vendorlib}/TempFile.pm
 %{_bindir}/cilly
 %{_libexecdir}/cil
+%config(noreplace) /etc/prelink.conf.d/ocaml-cil-cilly.conf
 
 
 %changelog
+* Tue Sep  2 2008 Richard W.M. Jones <rjones at redhat.com> - 1.3.6-7
+- Prevent unwanted bytecode stripping by RPM and prelink.
+- Place *.ml files into the -devel subpackage.
+
 * Mon Jul  7 2008 Richard W.M. Jones <rjones at redhat.com> - 1.3.6-6
 - Fix Perl paths (rhbz#453759).
 



From pvrabec at fedoraproject.org  Tue Sep  2 08:47:22 2008
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Tue,  2 Sep 2008 08:47:22 +0000 (UTC)
Subject: rpms/shadow-utils/devel shadow-4.1.2-gmSEGV.patch, NONE,
	1.1 shadow-utils.spec, 1.119, 1.120
Message-ID: <20080902084722.5F8DC7011D@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/shadow-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1101

Modified Files:
	shadow-utils.spec 
Added Files:
	shadow-4.1.2-gmSEGV.patch 
Log Message:
fix groupmems issues (#459825)


shadow-4.1.2-gmSEGV.patch:

--- NEW FILE shadow-4.1.2-gmSEGV.patch ---
diff -up shadow-4.1.2/src/groupmems.c.gmSEGV shadow-4.1.2/src/groupmems.c
--- shadow-4.1.2/src/groupmems.c.gmSEGV	2008-04-22 22:05:11.000000000 +0200
+++ shadow-4.1.2/src/groupmems.c	2008-09-02 08:30:52.000000000 +0200
@@ -95,7 +95,7 @@ static char *whoami (void)
 	}
 }
 
-static void addtogroup (char *user, char **members)
+static char **addtogroup (char *user, char **members)
 {
 	int i;
 
@@ -109,6 +109,8 @@ static void addtogroup (char *user, char
 	members = (char **) realloc (members, sizeof (char *) * (i+2));
 	members[i] = user;
 	members[i + 1] = NULL;
+
+	return members;
 }
 
 static void rmfromgroup (char *user, char **members)
@@ -285,7 +287,7 @@ int main (int argc, char **argv) 
 	grp = (struct group *) gr_locate (name);
 
 	if (NULL != adduser) {
-		addtogroup (adduser, grp->gr_mem);
+		grp->gr_mem = addtogroup (adduser, grp->gr_mem);
 		gr_update (grp);
 	} else if (NULL != deluser) {
 		rmfromgroup (deluser, grp->gr_mem);


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- shadow-utils.spec	28 Jul 2008 11:45:33 -0000	1.119
+++ shadow-utils.spec	2 Sep 2008 08:46:52 -0000	1.120
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.1.2
-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
@@ -16,6 +16,7 @@
 Patch1: shadow-4.1.2-goodname.patch
 Patch2: shadow-4.1.2-selinux.patch
 Patch3: shadow-4.1.2-sysAccountDownhill.patch
+Patch4: shadow-4.1.2-gmSEGV.patch
 
 License: BSD
 Group: System Environment/Base
@@ -44,6 +45,7 @@
 %patch1 -p1 -b .goodname
 %patch2 -p1 -b .selinux
 %patch3 -p1 -b .sysAccountDownhill
+%patch4 -p1 -b .gmSEGV
 
 
 rm po/*.gmo
@@ -184,6 +186,9 @@
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Thu Sep 02 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-5
+- fix groupmems issues (#459825)
+
 * Mon Jul 28 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-4
 - fix configure options (#456748)
 



From thias at fedoraproject.org  Tue Sep  2 08:51:36 2008
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  2 Sep 2008 08:51:36 +0000 (UTC)
Subject: rpms/python-nevow/devel .cvsignore, 1.4, 1.5 python-nevow.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20080902085136.D47567011D@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-nevow/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1808

Modified Files:
	.cvsignore python-nevow.spec sources 
Log Message:
Update to 0.9.31.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-nevow/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Feb 2008 10:58:32 -0000	1.4
+++ .cvsignore	2 Sep 2008 08:51:06 -0000	1.5
@@ -1 +1 @@
-Nevow-0.9.29.tar.gz
+Nevow-0.9.31.tar.gz


Index: python-nevow.spec
===================================================================
RCS file: /cvs/extras/rpms/python-nevow/devel/python-nevow.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-nevow.spec	3 Feb 2008 12:00:49 -0000	1.4
+++ python-nevow.spec	2 Sep 2008 08:51:06 -0000	1.5
@@ -2,8 +2,8 @@
 
 Summary: Web application construction kit written in Python
 Name: python-nevow
-Version: 0.9.29
-Release: 2%{?dist}
+Version: 0.9.31
+Release: 1%{?dist}
 License: MIT
 Group: Development/Languages
 URL: http://divmod.org/trac/wiki/DivmodNevow
@@ -52,7 +52,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog LICENSE README doc/txt/* examples/
+%doc LICENSE README doc/txt/* examples/
 %{_bindir}/nevow-xmlgettext
 %{_bindir}/nit
 %if 0%{?fedora} >= 9
@@ -65,6 +65,13 @@
 
 
 %changelog
+* Tue Sep  2 2008 Matthias Saou <http://freshrpms.net/> 0.9.31-1
+- Update to 0.9.31 (seems to fix tracebacks with Twisted 8).
+- Remove no longer included NEWS.txt.
+
+* Sun Feb  3 2008 Matthias Saou <http://freshrpms.net/> 0.9.29-3
+- Include NEWS.txt instead of the untouched ChangeLog.
+
 * Sun Feb  3 2008 Matthias Saou <http://freshrpms.net/> 0.9.29-2
 - Update to 0.9.29.
 - Apparently, egg-info files are only installed on F-9+.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-nevow/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Feb 2008 10:58:32 -0000	1.4
+++ sources	2 Sep 2008 08:51:06 -0000	1.5
@@ -1 +1 @@
-338e9cce9b01410177cb772fc62dce32  Nevow-0.9.29.tar.gz
+ca4c6196a71140122018a1334faa0f06  Nevow-0.9.31.tar.gz



From varekova at fedoraproject.org  Tue Sep  2 08:51:55 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue,  2 Sep 2008 08:51:55 +0000 (UTC)
Subject: rpms/jpilot/devel jpilot-0.99.9-trans.patch, 1.1, 1.2 jpilot.spec, 
	1.46, 1.47
Message-ID: <20080902085155.531317011D@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	jpilot-0.99.9-trans.patch jpilot.spec 
Log Message:
update patches


jpilot-0.99.9-trans.patch:

Index: jpilot-0.99.9-trans.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jpilot/devel/jpilot-0.99.9-trans.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jpilot-0.99.9-trans.patch	28 Nov 2006 07:52:17 -0000	1.1
+++ jpilot-0.99.9-trans.patch	2 Sep 2008 08:51:55 -0000	1.2
@@ -1,11 +1,12 @@
---- jpilot-0.99.9/po/zh_CN.po.pom	2006-11-27 17:02:36.000000000 +0100
-+++ jpilot-0.99.9/po/zh_CN.po	2006-11-27 17:51:41.000000000 +0100
-@@ -1142,7 +1142,7 @@
+diff -up jpilot-1.6.0/po/zh_CN.po.trans jpilot-1.6.0/po/zh_CN.po
+--- jpilot-1.6.0/po/zh_CN.po.trans	2006-09-29 00:12:11.000000000 +0200
++++ jpilot-1.6.0/po/zh_CN.po	2008-09-02 10:17:32.000000000 +0200
+@@ -1256,7 +1256,7 @@ msgstr "/??????(V)/??????????????????"
  
- #: jpilot.c:1424
+ #: ../jpilot.c:1424
  msgid "/View/sep1"
 -msgstr "/??????(F)/sep1"
 +msgstr "/??????(V)/sep1"
  
- #: jpilot.c:1425
+ #: ../jpilot.c:1425
  msgid "/View/Datebook"


Index: jpilot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jpilot/devel/jpilot.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- jpilot.spec	23 Jun 2008 13:25:39 -0000	1.46
+++ jpilot.spec	2 Sep 2008 08:51:55 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: Jpilot pilot desktop software
 Name: jpilot
 Version: 1.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Productivity
 URL: http://jpilot.org
@@ -88,6 +88,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Sep  2 2008 Ivana Varekova <varekova at redhat.com> - 1.6.0-2
+- update patches
+
 * Mon Jun 23 2008 Ivana Varekova <varekova at redhat.com> - 1.6.0-1
 - update to 1.6.0
 



From rjones at fedoraproject.org  Tue Sep  2 09:02:08 2008
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue,  2 Sep 2008 09:02:08 +0000 (UTC)
Subject: rpms/ocaml-ocamlnet/devel ocaml-ocamlnet.spec,1.6,1.7
Message-ID: <20080902090208.9F1DC7011D@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ocamlnet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3578

Modified Files:
	ocaml-ocamlnet.spec 
Log Message:
* Tue Sep  2 2008 Richard W.M. Jones <rjones at redhat.com> - 2.2.9-7
- Prevent RPM & prelink from stripping bytecode.



Index: ocaml-ocamlnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlnet/devel/ocaml-ocamlnet.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocaml-ocamlnet.spec	23 Apr 2008 16:16:57 -0000	1.6
+++ ocaml-ocamlnet.spec	2 Sep 2008 09:01:38 -0000	1.7
@@ -1,9 +1,12 @@
 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %define debug_package %{nil}
 
+# Prevent RPM from stripping the binaries.
+%define __strip /bin/true
+
 Name:           ocaml-ocamlnet
 Version:        2.2.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Network protocols for OCaml
 
 Group:          Development/Libraries
@@ -154,8 +157,12 @@
 
 # Strip libraries.
 strip $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/*.so
-# NB. Do NOT strip the binaries.
+
+# NB. Do NOT strip the binaries and prevent prelink from stripping them too.
 # (https://bugzilla.redhat.com/show_bug.cgi?id=435559)
+mkdir -p $RPM_BUILD_ROOT/etc/prelink.conf.d
+echo -e -- '-b /usr/bin/netplex-admin\n/usr/bin/ocamlrpcgen' \
+  > $RPM_BUILD_ROOT/etc/prelink.conf.d/ocaml-ocamlnet.conf
 
 
 %clean
@@ -194,7 +201,9 @@
 %{_libdir}/ocaml/stublibs/*.so
 %{_libdir}/ocaml/stublibs/*.so.owner
 %{_datadir}/%{name}/
-%{_bindir}/*
+%{_bindir}/netplex-admin
+%{_bindir}/ocamlrpcgen
+%config(noreplace) /etc/prelink.conf.d/ocaml-ocamlnet.conf
 
 
 %files devel
@@ -233,6 +242,9 @@
 
 
 %changelog
+* Tue Sep  2 2008 Richard W.M. Jones <rjones at redhat.com> - 2.2.9-7
+- Prevent RPM & prelink from stripping bytecode.
+
 * Wed Apr 23 2008 Richard W.M. Jones <rjones at redhat.com> - 2.2.9-6
 - Rebuild for OCaml 3.10.2
 



From mmahut at fedoraproject.org  Tue Sep  2 09:23:52 2008
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Tue,  2 Sep 2008 09:23:52 +0000 (UTC)
Subject: rpms/ratbox-services/devel import.log, NONE,
	1.1 ratbox-services-1.2.1-dbpath.patch, NONE,
	1.1 ratbox-services.conf, NONE, 1.1 ratbox-services.init, NONE,
	1.1 ratbox-services.logrotate, NONE, 1.1 ratbox-services.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080902092352.302E77011D@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/ratbox-services/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7160/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ratbox-services-1.2.1-dbpath.patch 
	ratbox-services.conf ratbox-services.init 
	ratbox-services.logrotate ratbox-services.spec 
Log Message:
initial import



--- NEW FILE import.log ---
ratbox-services-1_2_1-1_fc8:HEAD:ratbox-services-1.2.1-1.fc8.src.rpm:1220346866

ratbox-services-1.2.1-dbpath.patch:

--- NEW FILE ratbox-services-1.2.1-dbpath.patch ---
Marek Mahut <mmahut at fedoraproject.org>: fixing DB path

diff -Naur ratbox-services-1.2.1-upstream/include/config.h ratbox-services-1.2.1/include/config.h
--- ratbox-services-1.2.1-upstream/include/config.h	2008-08-29 10:03:39.000000000 +0200
+++ ratbox-services-1.2.1/include/config.h	2008-08-29 10:05:31.000000000 +0200
@@ -9,7 +9,7 @@
 #define PID_PATH	RUNDIR "/ratbox-services.pid"
 #define LOG_PATH	LOGDIR "/ratbox-services.log"
 #define HELP_PATH       HELPDIR
-#define DB_PATH		SYSCONFDIR "/ratbox-services.db"
+#define DB_PATH		"/var/lib/ratbox-services/ratbox-services.db"
 
 /* SMALL_NETWORK
  * If your network is fairly small, enable this to save some memory.


--- NEW FILE ratbox-services.conf ---
serverinfo {
        name = "ratbox.services";
	sid = "66K";
        description = "ratbox services";
	ratbox = yes;
};

admin {
        name = "Administrator";
        description = "Main Server Administrator";
        email = "<root at localhost>";
};

connect "ircd.ratbox" {
        host = "127.0.0.1";
	password = "Modify Me!"; /* this password needs to be changed */
        port = 6667;
};


service "userserv" {
	nick = "USERSERV";
	username = "user";
	host = "services.int";
	realname = "user registration service";
	flags = opered, msg_self;
	loglevel = 5;
};

service "chanserv" {
	nick = "CHANSERV";
	username = "chan";
	host = "services.int";
	realname = "channel registration service";
	flags = opered, login_help;
};

service "nickserv" {
	nick = "NICKSERV";
	username = "nick";
	host = "services.int";
	realname = "nickname services";
	flags = opered, msg_self, disabled;
	warn_string = "This nickname is registered, you may be disconnected if a user regains this nickname.";
};


--- NEW FILE ratbox-services.init ---
#!/bin/sh
#
# ratbox-services     Startup script for the ratbox-services server
#
# chkconfig: - 85 15
# description: ratbox-services 
#
# processname: ratbox-services
# config: /etc/ratbox-services.conf
# pidfile: /var/run/ratbox-services.pid
#
# Note: pidfile is assumed to be created
# by ratbox-services (config: server.pid-file).
# If not, uncomment 'pidof' line.

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

USER=ircd
prog="ratbox-services"
ratbox_services="/usr/sbin/ratbox-services"
RETVAL=0

start() {
	echo -n $"Starting $prog: "
        if [ ! -f /var/run/ratbox-services.pid ] ; then
                touch /var/run/ratbox-services.pid
                chown ircd:ircd /var/run/ratbox-services.pid
        fi
	daemon --user $USER $ratbox_services
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
	return $RETVAL
}

stop() {
	echo -n $"Stopping $prog: "
	killproc $ratbox_services
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
	return $RETVAL
}

reload() {
	echo -n $"Reloading $prog: "
	killproc $ratbox_services -HUP
	RETVAL=$?
	echo
	return $RETVAL
}

case "$1" in
	start)
		start
		;;
	stop)
		stop
		;;
	restart)
		stop
		start
		;;
	condrestart)
		if [ -f /var/lock/subsys/$prog ]; then
			stop
			start
		fi
		;;
	reload)
		reload
		;;
	status)
		status $ratbox_services
		RETVAL=$?
		;;
	*)
		echo $"Usage: $0 {start|stop|restart|condrestart|reload|rehash|status}"
		RETVAL=1
esac

exit $RETVAL


--- NEW FILE ratbox-services.logrotate ---
#
# Rotate ratbox-services log files.
#
/var/log/ratbox-services/*.log {
        create 600 root root
        missingok
        size 5M
        postrotate
                /sbin/service ratbox-services reload 2> /dev/null > /dev/null || true
        endscript
}



--- NEW FILE ratbox-services.spec ---
Name:		ratbox-services
Version:	1.2.1
Release:	1%{?dist}
Summary:	Service package for ircd-ratbox

Group:		System Environment/Daemons
License:	GPLv2
URL:		http://services.ircd-ratbox.org
Source0:	http://services.ircd-ratbox.org/download/%{name}-%{version}.tgz
Source1:	ratbox-services.init
Source2:	ratbox-services.conf
Source3:	ratbox-services.logrotate
Patch0:		ratbox-services-1.2.1-dbpath.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	bison, flex, mysql-devel, sqlite-devel, postgresql-devel
Requires:	MTA, ircd-ratbox

Requires(post):	/sbin/chkconfig
Requires(preun):	/sbin/chkconfig
Requires(preun):	/sbin/service

%description
ratbox-services is a services package written mostly from
scratch for use with ircd-ratbox. It is highly configurable,
with nearly all options being set in a config that can be
rehashed rather than set at compile time. It also uses the
SQLite database backend, which works as a database interface
to a normal file, meaning no seperate database software must be running.

%package devel
Summary:	Devel package for ircd-ratbox service
Group:		System Environment/Daemons
Requires:	%{name} = %{version}-%{release}

%description devel
Headers for ratbox-services, service package for ircd-ratbox.

%prep
%setup -q
%patch0 -p1 -b .dbpath

cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(definetolength.pl)/d'
EOF

%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
chmod +x %{__perl_requires}


%build
sed 's/-Werror//g' -i configure # usage of -Werror in stable version of software is a bug
%configure					\
	--bindir=%{_sbindir}			\
	--with-helpdir=%{_datadir}/%{name}	\
	--with-confdir=%{_sysconfdir}		\
	--sysconfdir=%{_sysconfdir}		\
	--with-logdir=%{_var}/log/%{name}	\
	--with-nicklen=32			\
	--with-topiclen=350			\

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_var}/lib/%{name}/
install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
install -D -m640 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ratbox-services.conf
install -D -m664 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ratbox-services
install -D -m655 tools/base/schema-sqlite.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/schemas/schema-sqlite.txt
install -D -m655 tools/base/schema-mysql.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/schemas/schema-mysql.txt
install -D -m655 tools/base/schema-pgsql.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/schemas/schema-pgsql.txt

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq 0 ]; then
	/sbin/chkconfig --add ratbox-services
fi

if [ ! -e %{_var}/lib/%{name}/%{name}.db ]; then
	/usr/bin/sqlite3 init %{_var}/lib/%{name}/%{name}.db
	/usr/bin/sqlite3 %{_var}/lib/%{name}/%{name}.db < %{_datadir}/%{name}/schemas/schema-sqlite.txt
fi

%preun
if [ $1 -eq 0 ]; then
	/sbin/service ratbox-services stop >/dev/null 2>&1
	/sbin/chkconfig --del ratbox-services
fi

%files
%defattr(-,root,root)
%doc CREDITS DBMOVE INSTALL* LICENSE RELEASE_NOTES SVN-Access README doc/* 
%attr(-,root,ircd) %{_sbindir}/%{name}
%{_sbindir}/*.pl
%{_sysconfdir}/init.d/%{name}
%{_datadir}/%{name}
%config(noreplace) %attr(-,root,ircd) %{_sysconfdir}/ratbox-services.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/ratbox-services
%dir %attr(-,ircd,ircd) %{_var}/lib/%{name}
%dir %attr(750,ircd,ircd) %{_var}/log/%{name}
%exclude %{_sysconfdir}/example.conf

%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h

%changelog
* Wed Aug 28 2008 Marek Mahut <mmahut at fedoraproject.org> - 1.2.1-1
- Initial package build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ratbox-services/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2008 21:10:42 -0000	1.1
+++ .cvsignore	2 Sep 2008 09:23:21 -0000	1.2
@@ -0,0 +1 @@
+ratbox-services-1.2.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ratbox-services/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2008 21:10:42 -0000	1.1
+++ sources	2 Sep 2008 09:23:21 -0000	1.2
@@ -0,0 +1 @@
+2db526a3d42bfdccf150666ffb335283  ratbox-services-1.2.1.tgz



From pvrabec at fedoraproject.org  Tue Sep  2 09:01:26 2008
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Tue,  2 Sep 2008 09:01:26 +0000 (UTC)
Subject: rpms/shadow-utils/F-9 shadow-4.1.2-gmSEGV.patch, NONE,
	1.1 shadow-utils.spec, 1.115, 1.116
Message-ID: <20080902090126.704A97011D@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/shadow-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3413

Modified Files:
	shadow-utils.spec 
Added Files:
	shadow-4.1.2-gmSEGV.patch 
Log Message:
- fix groupmems issues (#459825)


shadow-4.1.2-gmSEGV.patch:

--- NEW FILE shadow-4.1.2-gmSEGV.patch ---
diff -up shadow-4.1.2/src/groupmems.c.gmSEGV shadow-4.1.2/src/groupmems.c
--- shadow-4.1.2/src/groupmems.c.gmSEGV	2008-04-22 22:05:11.000000000 +0200
+++ shadow-4.1.2/src/groupmems.c	2008-09-02 08:30:52.000000000 +0200
@@ -95,7 +95,7 @@ static char *whoami (void)
 	}
 }
 
-static void addtogroup (char *user, char **members)
+static char **addtogroup (char *user, char **members)
 {
 	int i;
 
@@ -109,6 +109,8 @@ static void addtogroup (char *user, char
 	members = (char **) realloc (members, sizeof (char *) * (i+2));
 	members[i] = user;
 	members[i + 1] = NULL;
+
+	return members;
 }
 
 static void rmfromgroup (char *user, char **members)
@@ -285,7 +287,7 @@ int main (int argc, char **argv) 
 	grp = (struct group *) gr_locate (name);
 
 	if (NULL != adduser) {
-		addtogroup (adduser, grp->gr_mem);
+		grp->gr_mem = addtogroup (adduser, grp->gr_mem);
 		gr_update (grp);
 	} else if (NULL != deluser) {
 		rmfromgroup (deluser, grp->gr_mem);


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/F-9/shadow-utils.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- shadow-utils.spec	28 Jul 2008 13:38:15 -0000	1.115
+++ shadow-utils.spec	2 Sep 2008 09:00:56 -0000	1.116
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
 Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2
@@ -18,6 +18,7 @@
 Patch4: shadow-4.1.1-selinux.patch
 Patch5: shadow-4.1.1-sysAccountDownhill.patch
 Patch6: shadow-4.1.1-saltSize.patch
+Patch7: shadow-4.1.2-gmSEGV.patch
 
 License: BSD
 Group: System Environment/Base
@@ -48,6 +49,7 @@
 %patch4 -p1 -b .selinux
 %patch5 -p1 -b .sysAccountDownhill
 %patch6 -p1 -b .saltSize
+%patch7 -p1 -b .gmSEGV
 
 
 rm po/*.gmo
@@ -187,6 +189,9 @@
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Thu Sep 02 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.1-4
+- fix groupmems issues (#459825)
+
 * Mon Jul 28 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.1-3
 - fix configure options (#456748)
 



From mmahut at fedoraproject.org  Tue Sep  2 09:31:36 2008
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Tue,  2 Sep 2008 09:31:36 +0000 (UTC)
Subject: rpms/ratbox-services/F-9 ratbox-services-1.2.1-dbpath.patch, NONE, 
	1.1 ratbox-services.conf, NONE, 1.1 ratbox-services.init, NONE,
	1.1 ratbox-services.logrotate, NONE, 1.1 ratbox-services.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080902093136.332627011D@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/ratbox-services/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8142

Modified Files:
	sources 
Added Files:
	ratbox-services-1.2.1-dbpath.patch ratbox-services.conf 
	ratbox-services.init ratbox-services.logrotate 
	ratbox-services.spec 
Log Message:
initial import


ratbox-services-1.2.1-dbpath.patch:

--- NEW FILE ratbox-services-1.2.1-dbpath.patch ---
Marek Mahut <mmahut at fedoraproject.org>: fixing DB path

diff -Naur ratbox-services-1.2.1-upstream/include/config.h ratbox-services-1.2.1/include/config.h
--- ratbox-services-1.2.1-upstream/include/config.h	2008-08-29 10:03:39.000000000 +0200
+++ ratbox-services-1.2.1/include/config.h	2008-08-29 10:05:31.000000000 +0200
@@ -9,7 +9,7 @@
 #define PID_PATH	RUNDIR "/ratbox-services.pid"
 #define LOG_PATH	LOGDIR "/ratbox-services.log"
 #define HELP_PATH       HELPDIR
-#define DB_PATH		SYSCONFDIR "/ratbox-services.db"
+#define DB_PATH		"/var/lib/ratbox-services/ratbox-services.db"
 
 /* SMALL_NETWORK
  * If your network is fairly small, enable this to save some memory.


--- NEW FILE ratbox-services.conf ---
serverinfo {
        name = "ratbox.services";
	sid = "66K";
        description = "ratbox services";
	ratbox = yes;
};

admin {
        name = "Administrator";
        description = "Main Server Administrator";
        email = "<root at localhost>";
};

connect "ircd.ratbox" {
        host = "127.0.0.1";
	password = "Modify Me!"; /* this password needs to be changed */
        port = 6667;
};


service "userserv" {
	nick = "USERSERV";
	username = "user";
	host = "services.int";
	realname = "user registration service";
	flags = opered, msg_self;
	loglevel = 5;
};

service "chanserv" {
	nick = "CHANSERV";
	username = "chan";
	host = "services.int";
	realname = "channel registration service";
	flags = opered, login_help;
};

service "nickserv" {
	nick = "NICKSERV";
	username = "nick";
	host = "services.int";
	realname = "nickname services";
	flags = opered, msg_self, disabled;
	warn_string = "This nickname is registered, you may be disconnected if a user regains this nickname.";
};


--- NEW FILE ratbox-services.init ---
#!/bin/sh
#
# ratbox-services     Startup script for the ratbox-services server
#
# chkconfig: - 85 15
# description: ratbox-services 
#
# processname: ratbox-services
# config: /etc/ratbox-services.conf
# pidfile: /var/run/ratbox-services.pid
#
# Note: pidfile is assumed to be created
# by ratbox-services (config: server.pid-file).
# If not, uncomment 'pidof' line.

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

USER=ircd
prog="ratbox-services"
ratbox_services="/usr/sbin/ratbox-services"
RETVAL=0

start() {
	echo -n $"Starting $prog: "
        if [ ! -f /var/run/ratbox-services.pid ] ; then
                touch /var/run/ratbox-services.pid
                chown ircd:ircd /var/run/ratbox-services.pid
        fi
	daemon --user $USER $ratbox_services
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
	return $RETVAL
}

stop() {
	echo -n $"Stopping $prog: "
	killproc $ratbox_services
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
	return $RETVAL
}

reload() {
	echo -n $"Reloading $prog: "
	killproc $ratbox_services -HUP
	RETVAL=$?
	echo
	return $RETVAL
}

case "$1" in
	start)
		start
		;;
	stop)
		stop
		;;
	restart)
		stop
		start
		;;
	condrestart)
		if [ -f /var/lock/subsys/$prog ]; then
			stop
			start
		fi
		;;
	reload)
		reload
		;;
	status)
		status $ratbox_services
		RETVAL=$?
		;;
	*)
		echo $"Usage: $0 {start|stop|restart|condrestart|reload|rehash|status}"
		RETVAL=1
esac

exit $RETVAL


--- NEW FILE ratbox-services.logrotate ---
#
# Rotate ratbox-services log files.
#
/var/log/ratbox-services/*.log {
        create 600 root root
        missingok
        size 5M
        postrotate
                /sbin/service ratbox-services reload 2> /dev/null > /dev/null || true
        endscript
}



--- NEW FILE ratbox-services.spec ---
Name:		ratbox-services
Version:	1.2.1
Release:	1%{?dist}
Summary:	Service package for ircd-ratbox

Group:		System Environment/Daemons
License:	GPLv2
URL:		http://services.ircd-ratbox.org
Source0:	http://services.ircd-ratbox.org/download/%{name}-%{version}.tgz
Source1:	ratbox-services.init
Source2:	ratbox-services.conf
Source3:	ratbox-services.logrotate
Patch0:		ratbox-services-1.2.1-dbpath.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	bison, flex, mysql-devel, sqlite-devel, postgresql-devel
Requires:	MTA, ircd-ratbox

Requires(post):	/sbin/chkconfig
Requires(preun):	/sbin/chkconfig
Requires(preun):	/sbin/service

%description
ratbox-services is a services package written mostly from
scratch for use with ircd-ratbox. It is highly configurable,
with nearly all options being set in a config that can be
rehashed rather than set at compile time. It also uses the
SQLite database backend, which works as a database interface
to a normal file, meaning no seperate database software must be running.

%package devel
Summary:	Devel package for ircd-ratbox service
Group:		System Environment/Daemons
Requires:	%{name} = %{version}-%{release}

%description devel
Headers for ratbox-services, service package for ircd-ratbox.

%prep
%setup -q
%patch0 -p1 -b .dbpath

cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(definetolength.pl)/d'
EOF

%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
chmod +x %{__perl_requires}


%build
sed 's/-Werror//g' -i configure # usage of -Werror in stable version of software is a bug
%configure					\
	--bindir=%{_sbindir}			\
	--with-helpdir=%{_datadir}/%{name}	\
	--with-confdir=%{_sysconfdir}		\
	--sysconfdir=%{_sysconfdir}		\
	--with-logdir=%{_var}/log/%{name}	\
	--with-nicklen=32			\
	--with-topiclen=350			\

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_var}/lib/%{name}/
install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
install -D -m640 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ratbox-services.conf
install -D -m664 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ratbox-services
install -D -m655 tools/base/schema-sqlite.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/schemas/schema-sqlite.txt
install -D -m655 tools/base/schema-mysql.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/schemas/schema-mysql.txt
install -D -m655 tools/base/schema-pgsql.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/schemas/schema-pgsql.txt

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq 0 ]; then
	/sbin/chkconfig --add ratbox-services
fi

if [ ! -e %{_var}/lib/%{name}/%{name}.db ]; then
	/usr/bin/sqlite3 init %{_var}/lib/%{name}/%{name}.db
	/usr/bin/sqlite3 %{_var}/lib/%{name}/%{name}.db < %{_datadir}/%{name}/schemas/schema-sqlite.txt
fi

%preun
if [ $1 -eq 0 ]; then
	/sbin/service ratbox-services stop >/dev/null 2>&1
	/sbin/chkconfig --del ratbox-services
fi

%files
%defattr(-,root,root)
%doc CREDITS DBMOVE INSTALL* LICENSE RELEASE_NOTES SVN-Access README doc/* 
%attr(-,root,ircd) %{_sbindir}/%{name}
%{_sbindir}/*.pl
%{_sysconfdir}/init.d/%{name}
%{_datadir}/%{name}
%config(noreplace) %attr(-,root,ircd) %{_sysconfdir}/ratbox-services.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/ratbox-services
%dir %attr(-,ircd,ircd) %{_var}/lib/%{name}
%dir %attr(750,ircd,ircd) %{_var}/log/%{name}
%exclude %{_sysconfdir}/example.conf

%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h

%changelog
* Wed Aug 28 2008 Marek Mahut <mmahut at fedoraproject.org> - 1.2.1-1
- Initial package build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ratbox-services/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2008 21:10:42 -0000	1.1
+++ sources	2 Sep 2008 09:31:05 -0000	1.2
@@ -0,0 +1 @@
+2db526a3d42bfdccf150666ffb335283  ratbox-services-1.2.1.tgz



From mmahut at fedoraproject.org  Tue Sep  2 09:33:46 2008
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Tue,  2 Sep 2008 09:33:46 +0000 (UTC)
Subject: rpms/ratbox-services/EL-5 ratbox-services-1.2.1-dbpath.patch, NONE, 
	1.1 ratbox-services.conf, NONE, 1.1 ratbox-services.init, NONE,
	1.1 ratbox-services.logrotate, NONE, 1.1 ratbox-services.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080902093346.AAF4B7011D@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/ratbox-services/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8514

Modified Files:
	sources 
Added Files:
	ratbox-services-1.2.1-dbpath.patch ratbox-services.conf 
	ratbox-services.init ratbox-services.logrotate 
	ratbox-services.spec 
Log Message:
initial import

ratbox-services-1.2.1-dbpath.patch:

--- NEW FILE ratbox-services-1.2.1-dbpath.patch ---
Marek Mahut <mmahut at fedoraproject.org>: fixing DB path

diff -Naur ratbox-services-1.2.1-upstream/include/config.h ratbox-services-1.2.1/include/config.h
--- ratbox-services-1.2.1-upstream/include/config.h	2008-08-29 10:03:39.000000000 +0200
+++ ratbox-services-1.2.1/include/config.h	2008-08-29 10:05:31.000000000 +0200
@@ -9,7 +9,7 @@
 #define PID_PATH	RUNDIR "/ratbox-services.pid"
 #define LOG_PATH	LOGDIR "/ratbox-services.log"
 #define HELP_PATH       HELPDIR
-#define DB_PATH		SYSCONFDIR "/ratbox-services.db"
+#define DB_PATH		"/var/lib/ratbox-services/ratbox-services.db"
 
 /* SMALL_NETWORK
  * If your network is fairly small, enable this to save some memory.


--- NEW FILE ratbox-services.conf ---
serverinfo {
        name = "ratbox.services";
	sid = "66K";
        description = "ratbox services";
	ratbox = yes;
};

admin {
        name = "Administrator";
        description = "Main Server Administrator";
        email = "<root at localhost>";
};

connect "ircd.ratbox" {
        host = "127.0.0.1";
	password = "Modify Me!"; /* this password needs to be changed */
        port = 6667;
};


service "userserv" {
	nick = "USERSERV";
	username = "user";
	host = "services.int";
	realname = "user registration service";
	flags = opered, msg_self;
	loglevel = 5;
};

service "chanserv" {
	nick = "CHANSERV";
	username = "chan";
	host = "services.int";
	realname = "channel registration service";
	flags = opered, login_help;
};

service "nickserv" {
	nick = "NICKSERV";
	username = "nick";
	host = "services.int";
	realname = "nickname services";
	flags = opered, msg_self, disabled;
	warn_string = "This nickname is registered, you may be disconnected if a user regains this nickname.";
};


--- NEW FILE ratbox-services.init ---
#!/bin/sh
#
# ratbox-services     Startup script for the ratbox-services server
#
# chkconfig: - 85 15
# description: ratbox-services 
#
# processname: ratbox-services
# config: /etc/ratbox-services.conf
# pidfile: /var/run/ratbox-services.pid
#
# Note: pidfile is assumed to be created
# by ratbox-services (config: server.pid-file).
# If not, uncomment 'pidof' line.

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

USER=ircd
prog="ratbox-services"
ratbox_services="/usr/sbin/ratbox-services"
RETVAL=0

start() {
	echo -n $"Starting $prog: "
        if [ ! -f /var/run/ratbox-services.pid ] ; then
                touch /var/run/ratbox-services.pid
                chown ircd:ircd /var/run/ratbox-services.pid
        fi
	daemon --user $USER $ratbox_services
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
	return $RETVAL
}

stop() {
	echo -n $"Stopping $prog: "
	killproc $ratbox_services
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
	return $RETVAL
}

reload() {
	echo -n $"Reloading $prog: "
	killproc $ratbox_services -HUP
	RETVAL=$?
	echo
	return $RETVAL
}

case "$1" in
	start)
		start
		;;
	stop)
		stop
		;;
	restart)
		stop
		start
		;;
	condrestart)
		if [ -f /var/lock/subsys/$prog ]; then
			stop
			start
		fi
		;;
	reload)
		reload
		;;
	status)
		status $ratbox_services
		RETVAL=$?
		;;
	*)
		echo $"Usage: $0 {start|stop|restart|condrestart|reload|rehash|status}"
		RETVAL=1
esac

exit $RETVAL


--- NEW FILE ratbox-services.logrotate ---
#
# Rotate ratbox-services log files.
#
/var/log/ratbox-services/*.log {
        create 600 root root
        missingok
        size 5M
        postrotate
                /sbin/service ratbox-services reload 2> /dev/null > /dev/null || true
        endscript
}



--- NEW FILE ratbox-services.spec ---
Name:		ratbox-services
Version:	1.2.1
Release:	1%{?dist}
Summary:	Service package for ircd-ratbox

Group:		System Environment/Daemons
License:	GPLv2
URL:		http://services.ircd-ratbox.org
Source0:	http://services.ircd-ratbox.org/download/%{name}-%{version}.tgz
Source1:	ratbox-services.init
Source2:	ratbox-services.conf
Source3:	ratbox-services.logrotate
Patch0:		ratbox-services-1.2.1-dbpath.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	bison, flex, mysql-devel, sqlite-devel, postgresql-devel
Requires:	MTA, ircd-ratbox

Requires(post):	/sbin/chkconfig
Requires(preun):	/sbin/chkconfig
Requires(preun):	/sbin/service

%description
ratbox-services is a services package written mostly from
scratch for use with ircd-ratbox. It is highly configurable,
with nearly all options being set in a config that can be
rehashed rather than set at compile time. It also uses the
SQLite database backend, which works as a database interface
to a normal file, meaning no seperate database software must be running.

%package devel
Summary:	Devel package for ircd-ratbox service
Group:		System Environment/Daemons
Requires:	%{name} = %{version}-%{release}

%description devel
Headers for ratbox-services, service package for ircd-ratbox.

%prep
%setup -q
%patch0 -p1 -b .dbpath

cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(definetolength.pl)/d'
EOF

%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
chmod +x %{__perl_requires}


%build
sed 's/-Werror//g' -i configure # usage of -Werror in stable version of software is a bug
%configure					\
	--bindir=%{_sbindir}			\
	--with-helpdir=%{_datadir}/%{name}	\
	--with-confdir=%{_sysconfdir}		\
	--sysconfdir=%{_sysconfdir}		\
	--with-logdir=%{_var}/log/%{name}	\
	--with-nicklen=32			\
	--with-topiclen=350			\

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_var}/lib/%{name}/
install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
install -D -m640 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ratbox-services.conf
install -D -m664 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ratbox-services
install -D -m655 tools/base/schema-sqlite.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/schemas/schema-sqlite.txt
install -D -m655 tools/base/schema-mysql.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/schemas/schema-mysql.txt
install -D -m655 tools/base/schema-pgsql.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/schemas/schema-pgsql.txt

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq 0 ]; then
	/sbin/chkconfig --add ratbox-services
fi

if [ ! -e %{_var}/lib/%{name}/%{name}.db ]; then
	/usr/bin/sqlite3 init %{_var}/lib/%{name}/%{name}.db
	/usr/bin/sqlite3 %{_var}/lib/%{name}/%{name}.db < %{_datadir}/%{name}/schemas/schema-sqlite.txt
fi

%preun
if [ $1 -eq 0 ]; then
	/sbin/service ratbox-services stop >/dev/null 2>&1
	/sbin/chkconfig --del ratbox-services
fi

%files
%defattr(-,root,root)
%doc CREDITS DBMOVE INSTALL* LICENSE RELEASE_NOTES SVN-Access README doc/* 
%attr(-,root,ircd) %{_sbindir}/%{name}
%{_sbindir}/*.pl
%{_sysconfdir}/init.d/%{name}
%{_datadir}/%{name}
%config(noreplace) %attr(-,root,ircd) %{_sysconfdir}/ratbox-services.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/ratbox-services
%dir %attr(-,ircd,ircd) %{_var}/lib/%{name}
%dir %attr(750,ircd,ircd) %{_var}/log/%{name}
%exclude %{_sysconfdir}/example.conf

%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h

%changelog
* Wed Aug 28 2008 Marek Mahut <mmahut at fedoraproject.org> - 1.2.1-1
- Initial package build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ratbox-services/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2008 21:10:42 -0000	1.1
+++ sources	2 Sep 2008 09:33:16 -0000	1.2
@@ -0,0 +1 @@
+2db526a3d42bfdccf150666ffb335283  ratbox-services-1.2.1.tgz



From thias at fedoraproject.org  Tue Sep  2 09:35:02 2008
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  2 Sep 2008 09:35:02 +0000 (UTC)
Subject: rpms/lsdvd/devel lsdvd-0.16-build.patch, 1.1, 1.2 lsdvd.spec, 1.4, 
	1.5 lsdvd-0.16-libdvdread-include.patch, 1.1, NONE
Message-ID: <20080902093502.8489B7011D@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	lsdvd-0.16-build.patch lsdvd.spec 
Removed Files:
	lsdvd-0.16-libdvdread-include.patch 
Log Message:
Update existing patch instead of including new one.


lsdvd-0.16-build.patch:

Index: lsdvd-0.16-build.patch
===================================================================
RCS file: /cvs/extras/rpms/lsdvd/devel/lsdvd-0.16-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lsdvd-0.16-build.patch	22 Aug 2007 17:52:05 -0000	1.1
+++ lsdvd-0.16-build.patch	2 Sep 2008 09:35:02 -0000	1.2
@@ -1,30 +1,34 @@
 diff -Naupr lsdvd-0.16.orig/configure.in lsdvd-0.16/configure.in
 --- lsdvd-0.16.orig/configure.in	2005-12-12 21:11:01.000000000 +0100
-+++ lsdvd-0.16/configure.in	2006-04-19 16:32:33.000000000 +0200
-@@ -10,7 +10,8 @@ fi
++++ lsdvd-0.16/configure.in	2008-09-02 11:27:58.000000000 +0200
+@@ -9,8 +9,9 @@ if eval "test x$GCC = xyes"; then # Enab
+ fi
  
  AC_CHECK_LIB(dvdread, DVDOpen, , AC_MSG_ERROR([libdvdread not found!]))
- AC_MSG_CHECKING([for dvdread/ifo_read.h])
+-AC_MSG_CHECKING([for dvdread/ifo_read.h])
 -AC_TRY_COMPILE([#include <dvdread/ifo_read.h>
++AC_MSG_CHECKING([for libdvdread/ifo_read.h])
 +AC_TRY_COMPILE([#include <inttypes.h>,
-+		#include <dvdread/ifo_read.h>
++		#include <libdvdread/ifo_read.h>
  		#include <stdint.h>], ,
  	AC_MSG_RESULT([yes]), 
  	AC_MSG_RESULT([no]) 
 diff -Naupr lsdvd-0.16.orig/lsdvd.c lsdvd-0.16/lsdvd.c
 --- lsdvd-0.16.orig/lsdvd.c	2006-03-02 14:48:11.000000000 +0100
-+++ lsdvd-0.16/lsdvd.c	2006-04-19 16:32:48.000000000 +0200
-@@ -13,6 +13,7 @@
++++ lsdvd-0.16/lsdvd.c	2008-09-02 11:28:18.000000000 +0200
+@@ -13,7 +13,8 @@
   *  2003-04-19  Cleanups get_title_name, added dvdtime2msec, added helper macros,
   *			  output info structures in form of a Perl module, by Henk Vergonet.
   */
+-#include <dvdread/ifo_read.h>
 +#include <inttypes.h>
- #include <dvdread/ifo_read.h>
++#include <libdvdread/ifo_read.h>
  #include <string.h>
  #include <sys/stat.h>
+ #include <stdio.h>
 diff -Naupr lsdvd-0.16.orig/Makefile.am lsdvd-0.16/Makefile.am
 --- lsdvd-0.16.orig/Makefile.am	2006-03-03 08:26:23.000000000 +0100
-+++ lsdvd-0.16/Makefile.am	2006-04-19 16:33:04.000000000 +0200
++++ lsdvd-0.16/Makefile.am	2008-09-02 11:25:22.000000000 +0200
 @@ -1,4 +1,3 @@
  bin_PROGRAMS = lsdvd
  lsdvd_SOURCES = lsdvd.c ocode.c ohuman.c oxml.c lsdvd.h oxml.h ocode.h lsdvd.1


Index: lsdvd.spec
===================================================================
RCS file: /cvs/extras/rpms/lsdvd/devel/lsdvd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lsdvd.spec	29 Aug 2008 16:41:54 -0000	1.4
+++ lsdvd.spec	2 Sep 2008 09:35:02 -0000	1.5
@@ -1,13 +1,12 @@
 Summary: Small application for listing the contents of DVDs
 Name: lsdvd
 Version: 0.16
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://untrepid.com/lsdvd/
 Source: http://downloads.sf.net/lsdvd/lsdvd-%{version}.tar.gz
 Patch0: lsdvd-0.16-build.patch
-Patch1: lsdvd-0.16-libdvdread-include.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: autoconf, automake
 BuildRequires: libdvdread-devel
@@ -19,7 +18,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .build
-%patch1 -p1 -b .libdvdread-include
 %{__aclocal}
 %{__automake} --add-missing --copy --force --gnu --include-deps Makefile
 %{__autoconf}
@@ -47,8 +45,8 @@
 
 
 %changelog
-* Fri Aug 29 2008 Matthias Saou <http://freshrpms.net/> 0.16-8
-- Include patch for new s/dvdread/libdvdread/ include path.
+* Tue Sep  2 2008 Matthias Saou <http://freshrpms.net/> 0.16-9
+- Update build patch for new s/dvdread/libdvdread/ include path.
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
 - Autorebuild for GCC 4.3


--- lsdvd-0.16-libdvdread-include.patch DELETED ---



From lucilanga at fedoraproject.org  Tue Sep  2 09:51:42 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue,  2 Sep 2008 09:51:42 +0000 (UTC)
Subject: rpms/scummvm/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <20080902095143.042D07011D@cvs1.fedora.phx.redhat.com>

Author: lucilanga

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

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Sep 01 2008 Lucian Langa <cooly at gnome.eu.org> - 0.12.0-1
- new upstream 0.12.0
- drop 0.11.0 patches (fixed upstream)
- drop 0.9.0 patch (fixed upstream)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scummvm/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Sep 2008 08:04:43 -0000	1.6
+++ .cvsignore	2 Sep 2008 09:51:12 -0000	1.7
@@ -1 +1,2 @@
 scummvm-0.12.0.tar.bz2
+scummvm-icons.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scummvm/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Sep 2008 08:04:43 -0000	1.6
+++ sources	2 Sep 2008 09:51:12 -0000	1.7
@@ -1 +1,2 @@
 cd5620c57645948c8da0d4d9c9fcffb3  scummvm-0.12.0.tar.bz2
+b20d750de2c88e8aefea364afae1776c  scummvm-icons.tar.gz



From jnovy at fedoraproject.org  Tue Sep  2 09:52:56 2008
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Tue,  2 Sep 2008 09:52:56 +0000 (UTC)
Subject: rpms/mc/devel mc-shellcwd.patch,NONE,1.1 mc.spec,1.135,1.136
Message-ID: <20080902095256.7E55F7011D@cvs1.fedora.phx.redhat.com>

Author: jnovy

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

Modified Files:
	mc.spec 
Added Files:
	mc-shellcwd.patch 
Log Message:
* Tue Sep  2 2008 Jindrich Novy <jnovy at redhat.com> 4.6.2-6.pre1
- do not change directory in panel to subshell directory
  when switched back from subshell (#460633)


mc-shellcwd.patch:

--- NEW FILE mc-shellcwd.patch ---
diff -up mc-4.6.2-pre1/src/subshell.c.shellcwd mc-4.6.2-pre1/src/subshell.c
--- mc-4.6.2-pre1/src/subshell.c.shellcwd	2008-09-02 11:28:31.000000000 +0200
+++ mc-4.6.2-pre1/src/subshell.c	2008-09-02 11:41:39.000000000 +0200
@@ -562,9 +562,6 @@ int invoke_subshell (const char *command
 
     feed_subshell (how, FALSE);
 
-    if (new_dir && subshell_alive && strcmp (subshell_cwd, current_panel->cwd))
-	*new_dir = subshell_cwd;  /* Make MC change to the subshell's CWD */
-
     /* Restart the subshell if it has died by SIGHUP, SIGQUIT, etc. */
     while (!subshell_alive && !quit && use_subshell)
 	init_subshell ();


Index: mc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/mc.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- mc.spec	5 Aug 2008 13:59:26 -0000	1.135
+++ mc.spec	2 Sep 2008 09:52:26 -0000	1.136
@@ -1,7 +1,7 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.6.2
-Release:	5.pre1%{?dist}
+Release:	6.pre1%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
@@ -33,6 +33,7 @@
 Patch19:	mc-hintchk.patch
 Patch20:	mc-7zip.patch
 Patch21:	mc-oldrpmtags.patch
+Patch22:	mc-shellcwd.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -65,6 +66,7 @@
 %patch19 -p1 -b .hintchk
 %patch20 -p1 -b .7zip
 %patch21 -p1 -b .oldrpmtags
+%patch22 -p1 -b .shellcwd
 
 # convert files in /lib to UTF-8
 pushd lib
@@ -202,6 +204,10 @@
 %dir %{_libexecdir}/mc
 
 %changelog
+* Tue Sep  2 2008 Jindrich Novy <jnovy at redhat.com> 4.6.2-6.pre1
+- do not change directory in panel to subshell directory
+  when switched back from subshell (#460633)
+
 * Tue Aug  5 2008 Jindrich Novy <jnovy at redhat.com> 4.6.2-5.pre1
 - don't try to parse obsolete RPM tags in RPM VFS (#457912),
   thanks to Milan Broz



From than at fedoraproject.org  Tue Sep  2 09:56:46 2008
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  2 Sep 2008 09:56:46 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.1.1-kde#169447-khtml-regression.patch, 
	NONE, 1.1 kdelibs.spec, 1.371, 1.372
Message-ID: <20080902095646.C7B427011D@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.1-kde#169447-khtml-regression.patch 
Log Message:
apply patch to fix regression in khtml


kdelibs-4.1.1-kde#169447-khtml-regression.patch:

--- NEW FILE kdelibs-4.1.1-kde#169447-khtml-regression.patch ---
Index: khtml/rendering/render_layer.cpp
===================================================================
--- khtml/rendering/render_layer.cpp	(Revision 855359)
+++ khtml/rendering/render_layer.cpp	(Revision 855360)
@@ -397,7 +397,7 @@
                     }
                 }
             }
-            count = sc->m_negZOrderList ? sc->m_negZOrderList->count() : 0;
+            count = sc->m_posZOrderList ? sc->m_posZOrderList->count() : 0;
             if ( count > 0 ) {
                 needUpdate = true;
                 for (uint i = 0; i < count; i++) {


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -r1.371 -r1.372
--- kdelibs.spec	1 Sep 2008 09:22:37 -0000	1.371
+++ kdelibs.spec	2 Sep 2008 09:56:16 -0000	1.372
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -81,6 +81,7 @@
 Patch19: kdelibs-4.1.0-#455130.patch
 
 ## upstream patches
+Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -207,6 +208,7 @@
 %patch19 -p1 -b .#455130
 
 ## upstream patches
+%patch100 -p0 -b .kde#169447-khtml-regression
 
 %build
 
@@ -367,6 +369,9 @@
 
 
 %changelog
+* Tue Sep 02 2008 Than Ngo <than at redhat.com> 4.1.1-4
+- apply patch to fix regression in khtml
+
 * Mon Sep 01 2008 Than Ngo <than at redhat.com> 4.1.1-3
 - respun
 



From jmoskovc at fedoraproject.org  Tue Sep  2 10:06:07 2008
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Tue,  2 Sep 2008 10:06:07 +0000 (UTC)
Subject: rpms/dejagnu/F-8 dejagnu-1.4.4-runtest.patch, NONE, 1.1 dejagnu.spec,
	1.8, 1.9
Message-ID: <20080902100607.5C6547011D@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/dejagnu/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13531

Modified Files:
	dejagnu.spec 
Added Files:
	dejagnu-1.4.4-runtest.patch 
Log Message:
Fixed rhbz#460153


dejagnu-1.4.4-runtest.patch:

--- NEW FILE dejagnu-1.4.4-runtest.patch ---
--- dejagnu-1.4.4/runtest.exp.old	2003-10-15 15:22:52.000000000 +0200
+++ dejagnu-1.4.4/runtest.exp	2008-08-27 16:22:18.000000000 +0200
@@ -1443,8 +1443,7 @@
     global tool
 
     clone_output "Running $test_file_name ..."
-    set prms_id	0
-    set bug_id	0
+    reset_vars
     set test_result ""
 
     if [file exists $test_file_name] {


Index: dejagnu.spec
===================================================================
RCS file: /cvs/extras/rpms/dejagnu/F-8/dejagnu.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dejagnu.spec	12 Nov 2007 16:49:40 -0000	1.8
+++ dejagnu.spec	2 Sep 2008 10:05:37 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A front end for testing other programs
 Name: dejagnu
 Version: 1.4.4
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 License: GPLv2+
 Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-%{version}.tar.gz
@@ -14,6 +14,7 @@
 BuildRequires: expect screen texinfo
 Patch1: dejagnu-1.4.4-smp-1.patch
 Patch3: dejagnu-1.4.4-testsuite.patch
+Patch4: dejagnu-1.4.4-runtest.patch
 
 %description
 DejaGnu is an Expect/Tcl based framework for testing other programs.
@@ -27,6 +28,7 @@
 %setup -q
 %patch1 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %configure -v
@@ -74,6 +76,10 @@
 %{_infodir}/*
 
 %changelog
+* Tue Sep  2 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 1:1.4.4-12
+- fixed runtest (patch from jan.kratochvil at redhat.com)
+- Resolves: #460153
+
 * Mon Nov 12 2007 Petr Machata <pmachata at redhat.com> - 1:1.4.4-11
 - Install info file.
 - Related: #230652



From than at fedoraproject.org  Tue Sep  2 10:15:14 2008
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  2 Sep 2008 10:15:14 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.1.1-kde#169447-khtml-regression.patch,
	NONE, 1.1 kdelibs.spec, 1.345, 1.346
Message-ID: <20080902101514.CD4B370120@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.1-kde#169447-khtml-regression.patch 
Log Message:
apply patch to fix regression in khtml


kdelibs-4.1.1-kde#169447-khtml-regression.patch:

--- NEW FILE kdelibs-4.1.1-kde#169447-khtml-regression.patch ---
Index: khtml/rendering/render_layer.cpp
===================================================================
--- khtml/rendering/render_layer.cpp	(Revision 855359)
+++ khtml/rendering/render_layer.cpp	(Revision 855360)
@@ -397,7 +397,7 @@
                     }
                 }
             }
-            count = sc->m_negZOrderList ? sc->m_negZOrderList->count() : 0;
+            count = sc->m_posZOrderList ? sc->m_posZOrderList->count() : 0;
             if ( count > 0 ) {
                 needUpdate = true;
                 for (uint i = 0; i < count; i++) {


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- kdelibs.spec	1 Sep 2008 09:24:18 -0000	1.345
+++ kdelibs.spec	2 Sep 2008 10:14:44 -0000	1.346
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -81,6 +81,7 @@
 Patch19: kdelibs-4.1.0-#455130.patch
 
 ## upstream patches
+Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -207,6 +208,7 @@
 %patch19 -p1 -b .#455130
 
 ## upstream patches
+%patch100 -p0 -b .kde#169447-khtml-regression
 
 %build
 
@@ -367,6 +369,9 @@
 
 
 %changelog
+* Tue Sep 02 2008 Than Ngo <than at redhat.com> 4.1.1-4
+- apply patch to fix regression in khtml
+
 * Mon Sep 01 2008 Than Ngo <than at redhat.com> 4.1.1-3
 - respun
 



From pkgdb at fedoraproject.org  Tue Sep  2 10:24:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:24:03 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080902102300.3D24F208D84@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeaddons (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:23:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:23:07 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080902102308.E004E208D88@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeaddons (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:23:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:23:13 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080902102313.D1EA2208D8F@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeaddons (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:23:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:23:10 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080902102311.522A6208D8D@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeaddons (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:23:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:23:16 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080902102317.05006208D93@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeaddons (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:23:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:23:19 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080902102320.A9DB5208D97@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeaddons (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:23:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:23:21 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080902102321.716FC208D9B@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeaddons (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:24:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:24:25 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080902102321.CF0CB208D9F@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeaddons (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:23:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:23:26 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080902102327.21D50208D87@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeaddons (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:23:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:23:31 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080902102331.807AA208DA3@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeaddons (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:24:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:24:40 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080902102337.533B7208D8B@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeaddons (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:23:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:23:38 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080902102340.11773208DA7@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeaddons (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:24:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:24:39 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20080902102439.4A423208D94@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeaccessibility (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:25:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:25:44 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20080902102440.CC23D208D9B@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeaccessibility (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:24:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:24:44 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20080902102446.99CDA208D9D@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeaccessibility (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:25:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:25:54 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20080902102450.DA76C208DA2@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeaccessibility (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:24:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:24:51 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20080902102451.D970E208DAC@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeaccessibility (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:25:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:25:58 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20080902102454.D16AE208DAD@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeaccessibility (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:24:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:24:57 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20080902102457.54D18208DB2@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeaccessibility (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:26:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:26:04 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20080902102501.06DC4208DB8@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeaccessibility (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:25:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:25:02 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20080902102503.011E6208DBD@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeaccessibility (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:25:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:25:04 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20080902102505.D9BF6208DA7@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeaccessibility (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:26:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:26:10 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20080902102507.482BE208DC3@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeaccessibility (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:25:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:25:13 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20080902102513.6A9DB208DC8@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeaccessibility (Fedora 9) to Approved for jreznik

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



From thias at fedoraproject.org  Tue Sep  2 10:10:21 2008
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  2 Sep 2008 10:10:21 +0000 (UTC)
Subject: rpms/lsdvd/devel lsdvd.spec, 1.5, 1.6 lsdvd-0.16-build.patch, 1.2,
	NONE
Message-ID: <20080902101021.9354D7011D@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	lsdvd.spec 
Removed Files:
	lsdvd-0.16-build.patch 
Log Message:
Remove build patch altogether.



Index: lsdvd.spec
===================================================================
RCS file: /cvs/extras/rpms/lsdvd/devel/lsdvd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lsdvd.spec	2 Sep 2008 09:35:02 -0000	1.5
+++ lsdvd.spec	2 Sep 2008 10:09:51 -0000	1.6
@@ -1,12 +1,11 @@
 Summary: Small application for listing the contents of DVDs
 Name: lsdvd
 Version: 0.16
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://untrepid.com/lsdvd/
 Source: http://downloads.sf.net/lsdvd/lsdvd-%{version}.tar.gz
-Patch0: lsdvd-0.16-build.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: autoconf, automake
 BuildRequires: libdvdread-devel
@@ -17,10 +16,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .build
-%{__aclocal}
-%{__automake} --add-missing --copy --force --gnu --include-deps Makefile
-%{__autoconf}
 
 
 %build
@@ -45,8 +40,10 @@
 
 
 %changelog
-* Tue Sep  2 2008 Matthias Saou <http://freshrpms.net/> 0.16-9
+* Tue Sep  2 2008 Matthias Saou <http://freshrpms.net/> 0.16-10
 - Update build patch for new s/dvdread/libdvdread/ include path.
+- Actually, drop patch entirely as latest libdvdread changes the path back and
+  seems to include a fix for the missing <inttypes.h> include.
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
 - Autorebuild for GCC 4.3


--- lsdvd-0.16-build.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Sep  2 10:30:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:30:41 +0000
Subject: [pkgdb] tcsh had acl change status
Message-ID: <20080902102937.8633E208D86@bastion.fedora.phx.redhat.com>

vcrhonek has set the watchcommits acl on tcsh (Fedora 9) to Approved for panewt

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



From pkgdb at fedoraproject.org  Tue Sep  2 10:30:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 10:30:35 +0000
Subject: [pkgdb] tcsh had acl change status
Message-ID: <20080902102931.87020208D83@bastion.fedora.phx.redhat.com>

vcrhonek has set the watchbugzilla acl on tcsh (Fedora 9) to Approved for panewt

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



From twaugh at fedoraproject.org  Tue Sep  2 10:33:34 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  2 Sep 2008 10:33:34 +0000 (UTC)
Subject: rpms/foomatic/F-8 foomatic-459847.patch, NONE, 1.1 foomatic.spec,
	1.174, 1.175
Message-ID: <20080902103334.4FDD67011D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17185

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-459847.patch 
Log Message:
* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-60
- Fixed PPD generation for HP LaserJet 4345 MFP (bug #459847).


foomatic-459847.patch:

--- NEW FILE foomatic-459847.patch ---
diff -up foomatic-db-20080211/db/source/printer/HP-LaserJet_4345_MFP.xml.459847 foomatic-db-20080211/db/source/printer/HP-LaserJet_4345_MFP.xml
--- foomatic-db-20080211/db/source/printer/HP-LaserJet_4345_MFP.xml.459847	2008-09-02 11:06:58.000000000 +0100
+++ foomatic-db-20080211/db/source/printer/HP-LaserJet_4345_MFP.xml	2008-09-02 11:07:27.000000000 +0100
@@ -1,6 +1,6 @@
 <printer id="printer/HP-LaserJet_4345_MFP">
   <make>HP</make>
-  <model>LaserJet 4345 mfp</model>
+  <model>LaserJet 4345 MFP</model>
   <mechanism>
     <laser/><!--not "color"-->
     <resolution>


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-8/foomatic.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- foomatic.spec	8 May 2008 08:29:39 -0000	1.174
+++ foomatic.spec	2 Sep 2008 10:33:04 -0000	1.175
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    59%{?dist}
+Release:    60%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -46,6 +46,8 @@
 Patch17: foomatic-clean-up-on-cancel.patch
 Patch18: foomatic-sigpipe.patch
 
+Patch19: foomatic-459847.patch
+
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -111,6 +113,7 @@
 %patch7 -p1 -b .ppdload-ppd
 
 %patch16 -p1 -b .ieee1284
+%patch19 -p1 -b .459847
 
 cd db/source
 
@@ -250,6 +253,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-60
+- Fixed PPD generation for HP LaserJet 4345 MFP (bug #459847).
+
 * Thu May  8 2008 Tim Waugh <twaugh at redhat.com>
 - Avoid busy-looping when the CUPS backend stops (bug #445555).
 



From twaugh at fedoraproject.org  Tue Sep  2 10:36:03 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  2 Sep 2008 10:36:03 +0000 (UTC)
Subject: rpms/foomatic/F-9 foomatic-459847.patch, NONE, 1.1 foomatic.spec,
	1.185, 1.186
Message-ID: <20080902103603.4C73C7011D@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-459847.patch 
Log Message:
* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-60
- Fixed PPD generation for HP LaserJet 4345 MFP (bug #459847).


foomatic-459847.patch:

--- NEW FILE foomatic-459847.patch ---
diff -up foomatic-db-20080211/db/source/printer/HP-LaserJet_4345_MFP.xml.459847 foomatic-db-20080211/db/source/printer/HP-LaserJet_4345_MFP.xml
--- foomatic-db-20080211/db/source/printer/HP-LaserJet_4345_MFP.xml.459847	2008-09-02 11:06:58.000000000 +0100
+++ foomatic-db-20080211/db/source/printer/HP-LaserJet_4345_MFP.xml	2008-09-02 11:07:27.000000000 +0100
@@ -1,6 +1,6 @@
 <printer id="printer/HP-LaserJet_4345_MFP">
   <make>HP</make>
-  <model>LaserJet 4345 mfp</model>
+  <model>LaserJet 4345 MFP</model>
   <mechanism>
     <laser/><!--not "color"-->
     <resolution>


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-9/foomatic.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- foomatic.spec	8 May 2008 08:27:11 -0000	1.185
+++ foomatic.spec	2 Sep 2008 10:35:33 -0000	1.186
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    59%{?dist}
+Release:    60%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -46,6 +46,8 @@
 Patch17: foomatic-clean-up-on-cancel.patch
 Patch18: foomatic-sigpipe.patch
 
+Patch19: foomatic-459847.patch
+
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -111,6 +113,7 @@
 %patch7 -p1 -b .ppdload-ppd
 
 %patch16 -p1 -b .ieee1284
+%patch19 -p1 -b .459847
 
 cd db/source
 
@@ -250,6 +253,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-60
+- Fixed PPD generation for HP LaserJet 4345 MFP (bug #459847).
+
 * Thu May  8 2008 Tim Waugh <twaugh at redhat.com>
 - Avoid busy-looping when the CUPS backend stops (bug #445555).
 



From twaugh at fedoraproject.org  Tue Sep  2 10:40:15 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  2 Sep 2008 10:40:15 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic-459847.patch, NONE, 1.1 foomatic.spec, 
	1.193, 1.194
Message-ID: <20080902104015.851E57011D@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-459847.patch 
Log Message:
* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-62
- Fixed PPD generation for HP LaserJet 4345 MFP (bug #459847).


foomatic-459847.patch:

--- NEW FILE foomatic-459847.patch ---
diff -up foomatic-db-20080211/db/source/printer/HP-LaserJet_4345_MFP.xml.459847 foomatic-db-20080211/db/source/printer/HP-LaserJet_4345_MFP.xml
--- foomatic-db-20080211/db/source/printer/HP-LaserJet_4345_MFP.xml.459847	2008-09-02 11:06:58.000000000 +0100
+++ foomatic-db-20080211/db/source/printer/HP-LaserJet_4345_MFP.xml	2008-09-02 11:07:27.000000000 +0100
@@ -1,6 +1,6 @@
 <printer id="printer/HP-LaserJet_4345_MFP">
   <make>HP</make>
-  <model>LaserJet 4345 mfp</model>
+  <model>LaserJet 4345 MFP</model>
   <mechanism>
     <laser/><!--not "color"-->
     <resolution>


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- foomatic.spec	10 Jul 2008 12:54:17 -0000	1.193
+++ foomatic.spec	2 Sep 2008 10:39:45 -0000	1.194
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    61%{?dist}
+Release:    62%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -41,6 +41,7 @@
 Patch15: foomatic-bad-utf8.patch
 
 Patch18: foomatic-sigpipe.patch
+Patch19: foomatic-459847.patch
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
@@ -104,6 +105,7 @@
 
 pushd foomatic-db-%{dbver}
 %patch7 -p1 -b .ppdload-ppd
+%patch19 -p1 -b .459847
 
 cd db/source
 
@@ -246,6 +248,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-62
+- Fixed PPD generation for HP LaserJet 4345 MFP (bug #459847).
+
 * Thu Jul 10 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-61
 - Updated db-hpijs to 20080710.
 - Updated db to 20080710.



From caolanm at fedoraproject.org  Tue Sep  2 10:46:38 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  2 Sep 2008 10:46:38 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1634,1.1635
Message-ID: <20080902104638.8F1D47011E@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19039

Modified Files:
	openoffice.org.spec 
Log Message:
add bengali spell-checking


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1634
retrieving revision 1.1635
diff -u -r1.1634 -r1.1635
--- openoffice.org.spec	2 Sep 2008 08:37:17 -0000	1.1634
+++ openoffice.org.spec	2 Sep 2008 10:46:07 -0000	1.1635
@@ -574,6 +574,7 @@
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: lohit-fonts-bengali
+Requires: hunspell-bn
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-bn_IN
 Obsoletes: openoffice.org2-langpack-bn



From whot at fedoraproject.org  Tue Sep  2 10:59:42 2008
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue,  2 Sep 2008 10:59:42 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/devel
	xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch, NONE,
	1.1 xorg-x11-drv-synaptics.spec, 1.3, 1.4
Message-ID: <20080902105942.B34D27011D@cvs1.fedora.phx.redhat.com>

Author: whot

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

Modified Files:
	xorg-x11-drv-synaptics.spec 
Added Files:
	xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch 
Log Message:
* Tue Sep 2 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.0-4
- xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch: force a click if
  middle button emulation times out during ReadInput cycle. RH #233717.




xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch:

--- NEW FILE xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch ---
>From 8869d14f6169a8e3d94d43c5a0407e8621d9e431 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at redhat.com>
Date: Tue, 2 Sep 2008 19:55:19 +0930
Subject: [PATCH] Don't lose button up event if timeout is cancelled in the same ReadInput cycle

On a left/right button press, middle button emulation springs into action and
changes the reported hw state. It then returns a delay that is supposed to set
a timer. No button event is posted to the server, the timer ensures that it'll
be posted later.

If however - in the same cycle - the button up is reported, but with a
hardware time > middle emulation timeout, the middle button emulation is
canceled. The hw state is reset to button down, and processing continues,
reporting the button down event.
Since this is in the same cycle, the new delay overrides the previous one and
the timer is never set.

Introduce a new state into MB emulation that forces the click event if the
above situation occurs.

Red Hat Bug 233717 <http://bugzilla.redhat.com/show_bug.cgi?id=233717>
---
 src/synaptics.c |   28 ++++++++++++++++++++++++++--
 src/synaptics.h |    4 +++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/synaptics.c b/src/synaptics.c
index 50ebec6..d4b6e4e 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -865,6 +865,8 @@ HandleMidButtonEmulation(SynapticsPrivate *priv, struct SynapticsHwState *hw, in
 
     while (!done) {
 	switch (priv->mid_emu_state) {
+	case MBE_LEFT_CLICK:
+	case MBE_RIGHT_CLICK:
 	case MBE_OFF:
 	    priv->button_delay_millis = hw->millis;
 	    if (hw->left) {
@@ -880,7 +882,12 @@ HandleMidButtonEmulation(SynapticsPrivate *priv, struct SynapticsHwState *hw, in
 				 hw->millis);
 	    if (timeleft > 0)
 		*delay = MIN(*delay, timeleft);
-	    if (!hw->left || (timeleft <= 0)) {
+
+            /* timeout, but within the same ReadInput cycle! */
+            if ((timeleft <= 0) && !hw->left) {
+		priv->mid_emu_state = MBE_LEFT_CLICK;
+		done = TRUE;
+            } else if ((!hw->left) || (timeleft <= 0)) {
 		hw->left = TRUE;
 		priv->mid_emu_state = MBE_TIMEOUT;
 		done = TRUE;
@@ -896,7 +903,12 @@ HandleMidButtonEmulation(SynapticsPrivate *priv, struct SynapticsHwState *hw, in
 				 hw->millis);
 	    if (timeleft > 0)
 		*delay = MIN(*delay, timeleft);
-	    if (!hw->right || (timeleft <= 0)) {
+
+	     /* timeout, but within the same ReadInput cycle! */
+            if ((timeleft <= 0) && !hw->right) {
+		priv->mid_emu_state = MBE_RIGHT_CLICK;
+		done = TRUE;
+            } else if (!hw->right || (timeleft <= 0)) {
 		hw->right = TRUE;
 		priv->mid_emu_state = MBE_TIMEOUT;
 		done = TRUE;
@@ -1889,6 +1901,18 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState *hw)
     if (dx || dy)
 	xf86PostMotionEvent(local->dev, 0, 0, 2, dx, dy);
 
+    if (priv->mid_emu_state == MBE_LEFT_CLICK)
+    {
+	xf86PostButtonEvent(local->dev, FALSE, 1, 1, 0, 0);
+	xf86PostButtonEvent(local->dev, FALSE, 1, 0, 0, 0);
+	priv->mid_emu_state = MBE_OFF;
+    } else if (priv->mid_emu_state == MBE_RIGHT_CLICK)
+    {
+	xf86PostButtonEvent(local->dev, FALSE, 3, 1, 0, 0);
+	xf86PostButtonEvent(local->dev, FALSE, 3, 0, 0, 0);
+	priv->mid_emu_state = MBE_OFF;
+    }
+
     change = buttons ^ priv->lastButtons;
     while (change) {
 	id = ffs(change); /* number of first set bit 1..32 is returned */
diff --git a/src/synaptics.h b/src/synaptics.h
index a24f8b6..afd093a 100644
--- a/src/synaptics.h
+++ b/src/synaptics.h
@@ -187,7 +187,9 @@ enum MidButtonEmulation {
     MBE_RIGHT,			/* Right button pressed, waiting for left button or timeout */
     MBE_MID,			/* Left and right buttons pressed, waiting for both buttons
 				   to be released */
-    MBE_TIMEOUT			/* Waiting for both buttons to be released. */
+    MBE_TIMEOUT,		/* Waiting for both buttons to be released. */
+    MBE_LEFT_CLICK,		/* Emulate left button click. */
+    MBE_RIGHT_CLICK,		/* Emulate right button click. */
 };
 
 /* See docs/tapndrag.dia for a state machine diagram */
-- 
1.5.6.4



Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-drv-synaptics.spec	28 Aug 2008 13:26:26 -0000	1.3
+++ xorg-x11-drv-synaptics.spec	2 Sep 2008 10:59:10 -0000	1.4
@@ -5,7 +5,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 synaptics input driver
 Version:        0.15.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -15,6 +15,7 @@
 Source1:        10-synaptics.fdi
 Patch1:		 xf86-input-synaptics-0.15.0-tap.patch
 Patch2:		 xf86-input-synaptics-0.15.0-edges.patch
+Patch3:		 xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch
 ExcludeArch:    s390 s390x
 
 BuildRequires:  libtool pkgconfig
@@ -61,6 +62,7 @@
 %setup -q -n %{tarball}-%{version}
 %patch1 -p1 -b .tap
 %patch2 -p1 -b .edges
+%patch3 -p1 -b .dont-lose-buttonup
 
 %build
 autoreconf -v --install --force || exit 1
@@ -94,6 +96,10 @@
 %doc COPYING README
 
 %changelog
+* Tue Sep 2 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.0-4
+- xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch: force a click if
+  middle button emulation times out during ReadInput cycle. RH #233717.
+
 * Thu Aug 28 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.0-3
 - xf86-input-synaptics-0.15.0-edges.patch: reserve 5% on each side for edge
   detection.



From airlied at fedoraproject.org  Tue Sep  2 11:13:40 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  2 Sep 2008 11:13:40 +0000 (UTC)
Subject: rpms/kernel/devel drm-nouveau.patch,1.1,1.2
Message-ID: <20080902111340.452AB7011D@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	drm-nouveau.patch 
Log Message:
* Tue Sep 02 2008 Dave Airlie <airlied at redhat.com>
- bring back nouveau yet again


drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drm-nouveau.patch	2 Sep 2008 11:10:16 -0000	1.1
+++ drm-nouveau.patch	2 Sep 2008 11:13:39 -0000	1.2
@@ -15426,6 +15426,15 @@
 +void nv50_mc_takedown(struct drm_device *dev)
 +{
 +}
+diff --git a/include/drm/Kbuild b/include/drm/Kbuild
+index 82b6983..d65553c 100644
+--- a/include/drm/Kbuild
++++ b/include/drm/Kbuild
+@@ -8,3 +8,4 @@ unifdef-y += radeon_drm.h
+ unifdef-y += sis_drm.h
+ unifdef-y += savage_drm.h
+ unifdef-y += via_drm.h
++unifdef-y += nouveau_drm.h
 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
 index 31e2f17..c6ba6a9 100644
 --- a/include/drm/drmP.h



From mschwendt at fedoraproject.org  Tue Sep  2 11:18:47 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  2 Sep 2008 11:18:47 +0000 (UTC)
Subject: rpms/babl/devel babl.spec,1.7,1.8
Message-ID: <20080902111847.EA9B47011F@cvs1.fedora.phx.redhat.com>

Author: mschwendt

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

Modified Files:
	babl.spec 
Log Message:
* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.0.22-2
- Include /usr/include/babl-0.0 directory

No build-job.



Index: babl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/babl/devel/babl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- babl.spec	10 Jul 2008 19:57:22 -0000	1.7
+++ babl.spec	2 Sep 2008 11:18:17 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:	A dynamic, any to any, pixel format conversion library
 Name:		babl
 Version:	0.0.22
-Release:	1%{?dist}
+Release:	2%{?dist}
 # The gggl codes contained in this package are under the GPL, with exceptions allowing their use under libraries covered under the LGPL
 License:	LGPLv3+ and GPLv3+
 Group:		System Environment/Libraries
@@ -62,11 +62,14 @@
 %files devel
 %defattr(-, root, root, -)
 %doc babl_docs/html
-%{_includedir}/babl-0.0/babl/
+%{_includedir}/babl-0.0/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.0.22-2
+- Include /usr/include/babl-0.0 directory
+
 * Thu Jul 10 2008 Deji Akingunola <dakingun at gmail.com> - 0.0.22-1
 - Update to latest release
 



From airlied at fedoraproject.org  Tue Sep  2 11:20:58 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  2 Sep 2008 11:20:58 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.5, 1.6 sources, 1.5, 
	1.6 xorg-x11-drv-nouveau.spec, 1.4, 1.5
Message-ID: <20080902112058.6357F7011D@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-nouveau.spec 
Log Message:
* Tue Sep 02 2008 Dave Airlie <airlied at redhat.com> 0.0.11-1.20080902git6dd8ad4
- update to snapshot with new kernel interface 0.0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 May 2008 01:03:54 -0000	1.5
+++ .cvsignore	2 Sep 2008 11:20:27 -0000	1.6
@@ -1 +1 @@
-xf86-video-nouveau-0.0.10-20080520.tar.bz2
+xf86-video-nouveau-0.0.11-20080902.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 May 2008 01:03:54 -0000	1.5
+++ sources	2 Sep 2008 11:20:27 -0000	1.6
@@ -1 +1 @@
-64c6c0aa4bad77373f9e45362dbb741d  xf86-video-nouveau-0.0.10-20080520.tar.bz2
+6b545a1db161d7c5e4fee80474f8b37f  xf86-video-nouveau-0.0.11-20080902.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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-drv-nouveau.spec	20 May 2008 01:03:54 -0000	1.4
+++ xorg-x11-drv-nouveau.spec	2 Sep 2008 11:20:28 -0000	1.5
@@ -1,14 +1,14 @@
 %define tarball xf86-video-nouveau
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir %{moduledir}/drivers
-%define nouveau_version 0.0.10
+%define nouveau_version 0.0.11
 
 # Tarfile created using git
 # 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 20080520
-%define git_version 9c1d87f
+%define gitdate 20080902
+%define git_version 6dd8ad4
 
 %define tarfile %{tarball}-%{nouveau_version}-%{gitdate}.tar.bz2
 
@@ -19,7 +19,7 @@
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   %{nouveau_version}
-Release:   3.%{snapshot}%{?dist}
+Release:   1.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -33,11 +33,12 @@
 BuildRequires: libtool automake autoconf
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
 BuildRequires: libdrm-devel >= 2.3.0-7
+BuildRequires: kernel-headers >= 2.6.27-0.296
 
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
 
-Requires:  kernel-drm-nouveau = 10
+Requires:  kernel-drm-nouveau = 11
 
 %description 
 X.Org X11 nouveau video driver.
@@ -67,6 +68,9 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Tue Sep 02 2008 Dave Airlie <airlied at redhat.com> 0.0.11-1.20080902git6dd8ad4
+- update to snapshot with new kernel interface 0.0.11
+
 * Tue May 20 2008 Dave Airlie <airlied at redhat.com> 0.0.10-3.20080520git9c1d87f
 - update to latest snapshot - enables randr12
 



From mschwendt at fedoraproject.org  Tue Sep  2 11:23:12 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  2 Sep 2008 11:23:12 +0000 (UTC)
Subject: rpms/ScientificPython/devel ScientificPython.spec,1.9,1.10
Message-ID: <20080902112312.57C7D7011D@cvs1.fedora.phx.redhat.com>

Author: mschwendt

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

Modified Files:
	ScientificPython.spec 
Log Message:
* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.1-2
- Include /usr/include/python%{pyver}/Scientific directory

No build-job.



Index: ScientificPython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ScientificPython/devel/ScientificPython.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ScientificPython.spec	1 Jul 2008 17:30:35 -0000	1.9
+++ ScientificPython.spec	2 Sep 2008 11:22:41 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           ScientificPython
 Version:        2.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A collection of Python modules that are useful for scientific computing
 
 Group:          Development/Languages
@@ -136,6 +136,7 @@
 
 %files devel
 %defattr(-,root,root,-)
+%dir %{_includedir}/python%{pyver}/Scientific
 %{_includedir}/python%{pyver}/Scientific/*.h
 
 
@@ -152,6 +153,9 @@
 %doc Doc/Reference Examples Doc/BSP_Tutorial.pdf
 
 %changelog
+* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.1-2
+- Include /usr/include/python%%{pyver}/Scientific directory
+
 * Tue Jul 1 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.6.1-1
 - Latest Stable release
 



From airlied at fedoraproject.org  Tue Sep  2 11:10:47 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  2 Sep 2008 11:10:47 +0000 (UTC)
Subject: rpms/kernel/devel drm-nouveau.patch, NONE, 1.1 kernel.spec, 1.918, 
	1.919 nouveau-drm-update.patch, 1.2, NONE nouveau-drm.patch,
	1.12, NONE
Message-ID: <20080902111047.B84547011D@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	kernel.spec 
Added Files:
	drm-nouveau.patch 
Removed Files:
	nouveau-drm-update.patch nouveau-drm.patch 
Log Message:
* Tue Sep 02 2008 Dave Airlie <airlied at redhat.com>
- bring back nouveau yet again


drm-nouveau.patch:

--- NEW FILE drm-nouveau.patch ---
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 649757f..014fa6f 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -113,3 +113,9 @@ 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.
+
+config DRM_NOUVEAU
+	tristate "Nouveau (nvidia) cards"
+	depends on DRM
+	help
+	  Choose for nvidia support
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 48567a9..e68042b 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -26,4 +26,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/
 
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 112ba7a..6205d56 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -49,8 +49,8 @@ unsigned long drm_get_resource_len(struct drm_device *dev, unsigned int resource
 
 EXPORT_SYMBOL(drm_get_resource_len);
 
-static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
-					     drm_local_map_t *map)
+struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
+ 					   drm_local_map_t *map)
 {
 	struct drm_map_list *entry;
 	list_for_each_entry(entry, &dev->maplist, head) {
@@ -63,6 +63,7 @@ static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
 
 	return NULL;
 }
+EXPORT_SYMBOL(drm_find_matching_map);
 
 static int drm_map_handle(struct drm_device *dev, struct drm_hash_item *hash,
 			  unsigned long user_token, int hashed_handle)
diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
new file mode 100644
index 0000000..f01f82a
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/Makefile
@@ -0,0 +1,19 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# 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_object.o nouveau_irq.o nouveau_notifier.o nouveau_swmthd.o \
+             nouveau_sgdma.o nouveau_dma.o nouveau_bo.o nouveau_fence.o \
+             nv04_timer.o \
+             nv04_mc.o nv40_mc.o nv50_mc.o \
+             nv04_fb.o nv10_fb.o nv40_fb.o \
+             nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o \
+             nv04_graph.o nv10_graph.o nv20_graph.o \
+             nv40_graph.o nv50_graph.o \
+             nv04_instmem.o nv50_instmem.o
+
+nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
+
+obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
new file mode 100644
index 0000000..ab3b23a
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -0,0 +1,296 @@
+/*
+ * Copyright 2007 Dave Airlied
+ * 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
+ * VA LINUX SYSTEMS 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.
+ */
+/*
+ * Authors: Dave Airlied <airlied at linux.ie>
+ *	    Ben Skeggs   <darktama at iinet.net.au>
+ *	    Jeremy Kolb  <jkolb at brandeis.edu>
+ */
+
+#include "drmP.h"
+#include "nouveau_drm.h"
+#include "nouveau_drv.h"
+#include "nouveau_dma.h"
+
+static struct drm_ttm_backend *
+nouveau_bo_create_ttm_backend_entry(struct drm_device * dev)
+{
+	struct drm_nouveau_private *dev_priv = dev->dev_private;
+
+	switch (dev_priv->gart_info.type) {
+	case NOUVEAU_GART_AGP:
+		return drm_agp_init_ttm(dev);
+	case NOUVEAU_GART_SGDMA:
+		return nouveau_sgdma_init_ttm(dev);
+	default:
+		DRM_ERROR("Unknown GART type %d\n", dev_priv->gart_info.type);
+		break;
+	}
+
+	return NULL;
+}
+
+static int
+nouveau_bo_fence_type(struct drm_buffer_object *bo,
+		      uint32_t *fclass, uint32_t *type)
+{
+	/* When we get called, *fclass is set to the requested fence class */
+
+	if (bo->mem.proposed_flags & (DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE))
+		*type = 3;
+	else
+		*type = 1;
+	return 0;
+
+}
+
+static int
+nouveau_bo_invalidate_caches(struct drm_device *dev, uint64_t buffer_flags)
+{
+	/* We'll do this from user space. */
+	return 0;
+}
+
+static int
+nouveau_bo_init_mem_type(struct drm_device *dev, uint32_t type,
+			 struct drm_mem_type_manager *man)
+{
+	struct drm_nouveau_private *dev_priv = dev->dev_private;
+
+	switch (type) {
+	case DRM_BO_MEM_LOCAL:
+		man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
+			     _DRM_FLAG_MEMTYPE_CACHED;
+		man->drm_bus_maptype = 0;
+		break;
+	case DRM_BO_MEM_VRAM:
+		man->flags = _DRM_FLAG_MEMTYPE_FIXED |
+			     _DRM_FLAG_MEMTYPE_MAPPABLE |
+			     _DRM_FLAG_NEEDS_IOREMAP;
+		man->io_addr = NULL;
+		man->drm_bus_maptype = _DRM_FRAME_BUFFER;
+		man->io_offset = drm_get_resource_start(dev, 1);
+		man->io_size = drm_get_resource_len(dev, 1);
+		if (man->io_size > nouveau_mem_fb_amount(dev))
+			man->io_size = nouveau_mem_fb_amount(dev);
+		break;
+	case DRM_BO_MEM_PRIV0:
+		/* Unmappable VRAM */
+		man->flags = _DRM_FLAG_MEMTYPE_CMA;
+		man->drm_bus_maptype = 0;
+		break;
+	case DRM_BO_MEM_TT:
+		switch (dev_priv->gart_info.type) {
+		case NOUVEAU_GART_AGP:
+			man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
+				     _DRM_FLAG_MEMTYPE_CSELECT |
+				     _DRM_FLAG_NEEDS_IOREMAP;
+			man->drm_bus_maptype = _DRM_AGP;
+			break;
+		case NOUVEAU_GART_SGDMA:
+			man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
+				     _DRM_FLAG_MEMTYPE_CSELECT |
+				     _DRM_FLAG_MEMTYPE_CMA;
+			man->drm_bus_maptype = _DRM_SCATTER_GATHER;
+			break;
+		default:
+			DRM_ERROR("Unknown GART type: %d\n",
+				  dev_priv->gart_info.type);
+			return -EINVAL;
+		}
+
[...15232 lines suppressed...]
+++ b/include/drm/drmP.h
@@ -1136,6 +1136,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) */
+extern struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
+ 					   drm_local_map_t *map);
 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, unsigned int offset,
diff --git a/include/drm/nouveau_drm.h b/include/drm/nouveau_drm.h
new file mode 100644
index 0000000..a99c615
--- /dev/null
+++ b/include/drm/nouveau_drm.h
@@ -0,0 +1,184 @@
+/*
+ * Copyright 2005 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
+ * VA LINUX SYSTEMS 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 __NOUVEAU_DRM_H__
+#define __NOUVEAU_DRM_H__
+
+#define NOUVEAU_DRM_HEADER_PATCHLEVEL 11
+
+struct drm_nouveau_channel_alloc {
+	uint32_t     fb_ctxdma_handle;
+	uint32_t     tt_ctxdma_handle;
+
+	int          channel;
+	uint32_t     put_base;
+	/* FIFO control regs */
+	drm_handle_t ctrl;
+	int          ctrl_size;
+	/* DMA command buffer */
+	drm_handle_t cmdbuf;
+	int          cmdbuf_size;
+	/* Notifier memory */
+	drm_handle_t notifier;
+	int          notifier_size;
+};
+
+struct drm_nouveau_channel_free {
+	int channel;
+};
+
+struct drm_nouveau_grobj_alloc {
+	int      channel;
+	uint32_t handle;
+	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 handle;
+	int      count;
+
+	uint32_t offset;
+};
+
+struct drm_nouveau_gpuobj_free {
+	int      channel;
+	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
+#define NOUVEAU_GETPARAM_BUS_TYPE        5
+#define NOUVEAU_GETPARAM_FB_PHYSICAL     6
+#define NOUVEAU_GETPARAM_AGP_PHYSICAL    7
+#define NOUVEAU_GETPARAM_FB_SIZE         8
+#define NOUVEAU_GETPARAM_AGP_SIZE        9
+#define NOUVEAU_GETPARAM_PCI_PHYSICAL    10
+#define NOUVEAU_GETPARAM_CHIPSET_ID      11
+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;
+};
+
+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,
+};
+
+enum nouveau_bus_type {
+	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
+#define DRM_NOUVEAU_GETPARAM           0x01
+#define DRM_NOUVEAU_SETPARAM           0x02
+#define DRM_NOUVEAU_CHANNEL_ALLOC      0x03
+#define DRM_NOUVEAU_CHANNEL_FREE       0x04
+#define DRM_NOUVEAU_GROBJ_ALLOC        0x05
+#define DRM_NOUVEAU_NOTIFIEROBJ_ALLOC  0x06
+#define DRM_NOUVEAU_GPUOBJ_FREE        0x07
+#define DRM_NOUVEAU_MEM_ALLOC          0x08
+#define DRM_NOUVEAU_MEM_FREE           0x09
+#define DRM_NOUVEAU_MEM_TILE           0x0a
+#define DRM_NOUVEAU_SUSPEND            0x0b
+#define DRM_NOUVEAU_RESUME             0x0c
+
+#endif /* __NOUVEAU_DRM_H__ */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.918
retrieving revision 1.919
diff -u -r1.918 -r1.919
--- kernel.spec	1 Sep 2008 17:39:18 -0000	1.918
+++ kernel.spec	2 Sep 2008 11:10:16 -0000	1.919
@@ -413,7 +413,7 @@
 Provides: kernel = %{rpmversion}-%{pkg_release}\
 Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:.%{1}}\
 Provides: kernel-drm = 4.3.0\
-Provides: kernel-drm-nouveau = 10\
+Provides: kernel-drm-nouveau = 11\
 Provides: kernel-modeset = 1\
 Provides: kernel-uname-r = %{KVERREL}%{?1:.%{1}}\
 Requires(pre): %{kernel_prereq}\
@@ -608,6 +608,7 @@
 # nouveau + drm fixes
 Patch1811: drm-modesetting-radeon.patch
 Patch1812: fixup-dri2-kms-merge.patch
+Patch1813: drm-nouveau.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1152,6 +1153,7 @@
 # Nouveau DRM + drm fixes
 ApplyPatch drm-modesetting-radeon.patch
 ApplyPatch fixup-dri2-kms-merge.patch
+ApplyPatch drm-nouveau.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1744,6 +1746,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Sep 02 2008 Dave Airlie <airlied at redhat.com>
+- bring back nouveau yet again
+
 * Mon Sep 01 2008 Dave Jones <davej at redhat.com>
 - Always inline kzalloc.  And drop busted rcu debug patch
 


--- nouveau-drm-update.patch DELETED ---


--- nouveau-drm.patch DELETED ---



From mschwendt at fedoraproject.org  Tue Sep  2 11:40:27 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  2 Sep 2008 11:40:27 +0000 (UTC)
Subject: rpms/diveintopython/devel diveintopython.spec,1.7,1.8
Message-ID: <20080902114027.2C48E7011D@cvs1.fedora.phx.redhat.com>

Author: mschwendt

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

Modified Files:
	diveintopython.spec 
Log Message:
* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 5.4-13
- Include /usr/share/doc/diveintopython-5.4 directory (in all pkgs)

No build-job.



Index: diveintopython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/diveintopython/devel/diveintopython.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- diveintopython.spec	6 Feb 2008 09:54:07 -0000	1.7
+++ diveintopython.spec	2 Sep 2008 11:39:55 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           diveintopython
 Version:        5.4
-Release:        12%{?dist}
+Release:        13%{?dist}
 
 Summary:        Dive into Python - a python book
 
@@ -98,23 +98,30 @@
 
 %files html
 %defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/html
 
 %files pdf
 %defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/pdf
 %{_datadir}/applications/fedora-diveintopython.desktop
 
 %files single-html
 %defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/htmlflat
 
 %files txt
 %defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/txt
 
 
 %changelog
+* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 5.4-13
+- Include /usr/share/doc/diveintopython-5.4 directory (in all pkgs)
+
 * Tue Feb 5 2008 Marc Wiriadisastra <marc at mwiriadi.id.au> - 5.4-12
 - Removed specific java package's and just use java in BR (overholt)
 - Added build_patch to not use downloaded jars and....



From mschwendt at fedoraproject.org  Tue Sep  2 11:50:48 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  2 Sep 2008 11:50:48 +0000 (UTC)
Subject: rpms/cobbler/devel cobbler.spec,1.51,1.52
Message-ID: <20080902115048.678BE70120@cvs1.fedora.phx.redhat.com>

Author: mschwendt

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

Modified Files:
	cobbler.spec 
Log Message:
* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.2.0-2
- Include lots of unowned directories.

No build-job.



Index: cobbler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- cobbler.spec	29 Aug 2008 20:28:51 -0000	1.51
+++ cobbler.spec	2 Sep 2008 11:50:17 -0000	1.52
@@ -3,7 +3,7 @@
 Name: cobbler
 AutoReq: no
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -92,6 +92,7 @@
 /var/www/cobbler/svc/*.py*
 
 %defattr(755,apache,apache)
+%dir /usr/share/cobbler/
 %dir /usr/share/cobbler/webui_templates
 %defattr(444,apache,apache)
 /usr/share/cobbler/webui_templates/*.tmpl
@@ -133,6 +134,7 @@
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
 %dir %{python_sitelib}/cobbler/modules
+%dir %{python_sitelib}/cobbler/server
 %dir %{python_sitelib}/cobbler/webui
 %{python_sitelib}/cobbler/*.py*
 %{python_sitelib}/cobbler/yaml/*.py*
@@ -155,24 +157,37 @@
 %dir /var/lib/cobbler/config/images.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
+%dir /var/lib/cobbler/triggers/
+%dir /var/lib/cobbler/triggers/add/
+%dir /var/lib/cobbler/triggers/add/distro/
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
+%dir /var/lib/cobbler/triggers/add/profile/
 %dir /var/lib/cobbler/triggers/add/profile/pre
 %dir /var/lib/cobbler/triggers/add/profile/post
+%dir /var/lib/cobbler/triggers/add/system/
 %dir /var/lib/cobbler/triggers/add/system/pre
 %dir /var/lib/cobbler/triggers/add/system/post
+%dir /var/lib/cobbler/triggers/add/repo/
 %dir /var/lib/cobbler/triggers/add/repo/pre
 %dir /var/lib/cobbler/triggers/add/repo/post
+%dir /var/lib/cobbler/triggers/delete/
+%dir /var/lib/cobbler/triggers/delete/distro/
 %dir /var/lib/cobbler/triggers/delete/distro/pre
 %dir /var/lib/cobbler/triggers/delete/distro/post
+%dir /var/lib/cobbler/triggers/delete/profile/
 %dir /var/lib/cobbler/triggers/delete/profile/pre
 %dir /var/lib/cobbler/triggers/delete/profile/post
+%dir /var/lib/cobbler/triggers/delete/system/
 %dir /var/lib/cobbler/triggers/delete/system/pre
 %dir /var/lib/cobbler/triggers/delete/system/post
+%dir /var/lib/cobbler/triggers/delete/repo/
 %dir /var/lib/cobbler/triggers/delete/repo/pre
 %dir /var/lib/cobbler/triggers/delete/repo/post
+%dir /var/lib/cobbler/triggers/sync/
 %dir /var/lib/cobbler/triggers/sync/pre
 %dir /var/lib/cobbler/triggers/sync/post
+%dir /var/lib/cobbler/triggers/install/
 %dir /var/lib/cobbler/triggers/install/pre
 %dir /var/lib/cobbler/triggers/install/post
 %dir /var/lib/cobbler/snippets/
@@ -205,6 +220,8 @@
 
 
 %changelog
+* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.2.0-2
+- Include lots of unowned directories.
 
 * Fri Aug 29 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.0-1
 - Upstream changes (see CHANGELOG)



From mschwendt at fedoraproject.org  Tue Sep  2 11:42:13 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  2 Sep 2008 11:42:13 +0000 (UTC)
Subject: rpms/ctrlproxy/devel ctrlproxy.spec,1.18,1.19
Message-ID: <20080902114213.128E27011D@cvs1.fedora.phx.redhat.com>

Author: mschwendt

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

Modified Files:
	ctrlproxy.spec 
Log Message:
* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 3.0.7-2
- Include /usr/include/ctrlproxy-3.0 directory

No build-job.



Index: ctrlproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctrlproxy/devel/ctrlproxy.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ctrlproxy.spec	10 Jul 2008 08:59:14 -0000	1.18
+++ ctrlproxy.spec	2 Sep 2008 11:41:42 -0000	1.19
@@ -6,7 +6,7 @@
 Summary: ctrlproxy
 Name: ctrlproxy
 Version: 3.0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Source: http://jelmer.vernstok.nl/releases/ctrlproxy-%{version}.tar.gz
@@ -89,10 +89,13 @@
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/ctrlproxy-3.0/*
+%{_includedir}/ctrlproxy-3.0/
 %{_libdir}/pkgconfig/ctrlproxy.pc
 
 %changelog
+* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 3.0.7-2
+- Include /usr/include/ctrlproxy-3.0 directory
+
 * Tue Jul  8 2008 Bernardo Innocenti <bernie at codewiz.org> 3.0.7-1
 - Update to latest upstream
 



From pkgdb at fedoraproject.org  Tue Sep  2 11:56:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 11:56:51 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080902115651.D58C1208D84@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeartwork (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 11:57:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 11:57:00 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080902115700.84C6B208D8C@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeartwork (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 11:57:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 11:57:59 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080902115655.30C67208D88@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeartwork (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 11:56:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 11:56:58 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080902115701.8BA00208D90@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeartwork (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 11:58:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 11:58:09 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080902115705.C54AE208D92@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeartwork (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 11:57:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 11:57:10 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080902115710.8F8C1208D97@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeartwork (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 11:58:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 11:58:14 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080902115710.B9F84208D9B@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeartwork (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 11:58:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 11:58:15 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080902115711.B6BF1208D9F@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeartwork (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 11:57:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 11:57:13 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080902115713.55716208DA3@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeartwork (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 11:57:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 11:57:14 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080902115714.A6AA8208DA6@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeartwork (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 11:58:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 11:58:19 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080902115715.9B198208DA7@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeartwork (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 11:57:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 11:57:19 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080902115720.9D4E3208DAA@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeartwork (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 11:58:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 11:58:51 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080902115851.D61A1208D87@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebase (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 11:59:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 11:59:52 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080902115952.7FF5D208D84@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebase (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 11:59:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 11:59:56 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080902115956.2F7EE208D88@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebase (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:01:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:01:01 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080902115957.93A2F208D8C@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebase (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 11:59:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 11:59:58 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080902115958.B1AF2208D92@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebase (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 11:59:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 11:59:57 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080902115959.41731208D94@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebase (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:01:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:01:05 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080902120001.997AE208D98@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebase (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:00:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:00:04 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080902120004.1AED2208D9C@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebase (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:00:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:00:07 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080902120009.012F7208D9E@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebase (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:00:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:00:09 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080902120009.C3650208DA2@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebase (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:01:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:01:16 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080902120012.4453F208DA9@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebase (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:00:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:00:13 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080902120015.780AF208DB0@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebase (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:07:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:07:24 +0000
Subject: [pkgdb] kdebase3 had acl change status
Message-ID: <20080902120620.ADCE7208D83@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebase3 (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:07:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:07:33 +0000
Subject: [pkgdb] kdebase3 had acl change status
Message-ID: <20080902120630.03752208D8D@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebase3 (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:06:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:06:28 +0000
Subject: [pkgdb] kdebase3 had acl change status
Message-ID: <20080902120629.DE916208D8A@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebase3 (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:08:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:08:15 +0000
Subject: [pkgdb] kdebase3 had acl change status
Message-ID: <20080902120711.76C10208D84@bastion.fedora.phx.redhat.com>

than has set the approveacls acl on kdebase3 (Fedora devel) to Obsolete for svahl

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:07:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:07:13 +0000
Subject: [pkgdb] kdebase3 had acl change status
Message-ID: <20080902120713.D4B5E208D8C@bastion.fedora.phx.redhat.com>

than has set the approveacls acl on kdebase3 (Fedora 9) to Obsolete for svahl

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:07:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:07:22 +0000
Subject: [pkgdb] kdebase3 had acl change status
Message-ID: <20080902120722.7291F208D92@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebase3 (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:07:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:07:21 +0000
Subject: [pkgdb] kdebase3 had acl change status
Message-ID: <20080902120721.DD951208D8F@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebase3 (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:08:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:08:27 +0000
Subject: [pkgdb] kdebase3 had acl change status
Message-ID: <20080902120723.774FD208D9C@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebase3 (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:08:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:08:06 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20080902120806.93D68208D88@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebase-runtime (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:09:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:09:11 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20080902120807.EF3F9208D8D@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebase-runtime (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:08:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:08:08 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20080902120808.EE262208D92@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebase-runtime (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:09:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:09:17 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20080902120814.90499208D95@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebase-runtime (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:08:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:08:19 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20080902120819.0B62D208DA5@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebase-runtime (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:08:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:08:19 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20080902120820.A8441208DAA@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebase-runtime (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:08:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:08:25 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20080902120825.98E81208DAD@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebase-runtime (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:09:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:09:30 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20080902120826.D21B5208DB0@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebase-runtime (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:08:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:08:26 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20080902120827.E9624208DB4@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebase-runtime (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:08:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:08:31 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20080902120831.2F9C4208DBA@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebase-runtime (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:09:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:09:36 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20080902120833.1F9AC208DBC@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebase-runtime (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:08:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:08:38 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20080902120839.D2EDB208DBF@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebase-runtime (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:09:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:09:23 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20080902120923.6672F208D8C@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebase-workspace (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:10:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:10:37 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20080902120933.4EE2C208DC9@bastion.fedora.phx.redhat.com>

than has set the approveacls acl on kdebase-workspace (Fedora 9) to Obsolete for svahl

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:10:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:10:30 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20080902120926.492F1208DC3@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebase-workspace (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:09:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:09:23 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20080902120923.EDA38208D93@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebase-workspace (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:09:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:09:32 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20080902120933.24DB7208DA3@bastion.fedora.phx.redhat.com>

than has set the approveacls acl on kdebase-workspace (Fedora devel) to Obsolete for svahl

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:10:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:10:50 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20080902120947.0119A208DA6@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebase-workspace (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:09:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:09:47 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20080902120947.C6009208DD3@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebase-workspace (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:09:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:09:51 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20080902120951.E5464208DA9@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebase-workspace (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:12:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:12:40 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080902121139.E0534208D9A@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebindings (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:11:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:11:42 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080902121153.3840B208DDF@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebindings (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:11:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:11:51 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080902121153.D2296208DB8@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebindings (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:12:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:12:50 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080902121153.54727208DC0@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebindings (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:12:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:12:00 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080902121227.1679A208E00@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebindings (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:13:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:13:01 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080902121211.DA28F208DF7@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebindings (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:12:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:12:55 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080902121156.66092208DE5@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebindings (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:11:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:11:56 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080902121206.49BF9208DF3@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebindings (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:11:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:11:54 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080902121203.A7105208DBA@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebindings (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:12:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:12:00 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080902121243.C4794208E0A@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebindings (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:13:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:13:08 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080902121237.17F49208D89@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebindings (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:13:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:13:17 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20080902121326.1A647208E13@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeedu (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:15:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:15:28 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20080902121548.144A2208DE2@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeedu (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:13:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:13:18 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20080902121330.35EF9208E15@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeedu (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:14:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:14:09 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20080902121432.64B6E208DE8@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeedu (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:13:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:13:57 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20080902121413.A8384208D8B@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeedu (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:16:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:16:50 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20080902121555.776D3208DD0@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeedu (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:15:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:15:07 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20080902121532.2D162208E32@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeedu (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:12:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:12:06 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080902121301.F2885208E0F@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebindings (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:16:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:16:03 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20080902121517.2E566208DCF@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeedu (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:15:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:15:44 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20080902121458.0E7DB208E22@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeedu (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:17:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:17:14 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20080902121611.061FD208DA5@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeedu (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:16:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:16:09 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20080902121610.EDA77208DF2@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeedu (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:16:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:16:16 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20080902121616.49558208DCA@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeedu (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:16:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:16:44 +0000
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <20080902121644.5450E208DDE@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kde-filesystem (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:17:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:17:49 +0000
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <20080902121645.D870D208E1C@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kde-filesystem (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:16:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:16:47 +0000
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <20080902121647.D89E3208E36@bastion.fedora.phx.redhat.com>

than has set the commit acl on kde-filesystem (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:16:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:16:53 +0000
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <20080902121653.9DDC7208E3A@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kde-filesystem (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:16:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:16:54 +0000
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <20080902121654.B8380208E40@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kde-filesystem (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:17:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:17:59 +0000
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <20080902121655.CB9F3208E47@bastion.fedora.phx.redhat.com>

than has set the commit acl on kde-filesystem (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:17:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:17:01 +0000
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <20080902121701.B3EA4208E43@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kde-filesystem (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:18:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:18:09 +0000
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <20080902121705.CB393208E4D@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kde-filesystem (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:17:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:17:10 +0000
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <20080902121710.C367D208E4F@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kde-filesystem (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:17:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:17:09 +0000
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <20080902121711.06BD1208E50@bastion.fedora.phx.redhat.com>

than has set the commit acl on kde-filesystem (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:18:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:18:15 +0000
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <20080902121711.800CE208E55@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kde-filesystem (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:17:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:17:12 +0000
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <20080902121712.5123C208E59@bastion.fedora.phx.redhat.com>

than has set the commit acl on kde-filesystem (Fedora 9) to Approved for jreznik

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



From twaugh at fedoraproject.org  Tue Sep  2 12:18:16 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  2 Sep 2008 12:18:16 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic-2.0.2-fontpath.patch, 1.3,
	1.4 foomatic-filters-libdir.patch, 1.5, 1.6 foomatic.spec, 1.194,
	1.195
Message-ID: <20080902121816.E86027011D@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	foomatic-2.0.2-fontpath.patch foomatic-filters-libdir.patch 
	foomatic.spec 
Log Message:
* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-62
- Removed patch fuzz.


foomatic-2.0.2-fontpath.patch:

Index: foomatic-2.0.2-fontpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic-2.0.2-fontpath.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- foomatic-2.0.2-fontpath.patch	14 Jun 2007 09:35:27 -0000	1.3
+++ foomatic-2.0.2-fontpath.patch	2 Sep 2008 12:18:15 -0000	1.4
@@ -1,10 +1,11 @@
---- foomatic-filters-3.0-20070614/foomatic-gswrapper.in.fontpath	2007-06-14 08:20:15.000000000 +0100
-+++ foomatic-filters-3.0-20070614/foomatic-gswrapper.in	2007-06-14 10:33:10.000000000 +0100
-@@ -24,6 +24,7 @@
+diff -up foomatic-filters-3.0-20080710/foomatic-gswrapper.in.fontpath foomatic-filters-3.0-20080710/foomatic-gswrapper.in
+--- foomatic-filters-3.0-20080710/foomatic-gswrapper.in.fontpath	2008-07-10 08:20:17.000000000 +0100
++++ foomatic-filters-3.0-20080710/foomatic-gswrapper.in	2008-09-02 13:14:12.000000000 +0100
+@@ -24,6 +24,7 @@ my $execpath = "@EXECPATH@";
  # Get execution path from config file
  $execpath = $conf{execpath} if defined(%conf) and defined $conf{execpath};
  $ENV{'PATH'} = $execpath;
 +$ENV{'GS_FONTPATH'} = '/usr/share/fonts';
  
- # Check whether we have a GhostScript version with redirection of the
+ # Check whether we have a Ghostscript version with redirection of the
  # standard output of the PostScript programs via '-sstdout=%stderr'

foomatic-filters-libdir.patch:

Index: foomatic-filters-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic-filters-libdir.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- foomatic-filters-libdir.patch	14 Jun 2007 09:35:27 -0000	1.5
+++ foomatic-filters-libdir.patch	2 Sep 2008 12:18:15 -0000	1.6
@@ -1,6 +1,7 @@
---- foomatic-filters-3.0-20070614/configure.ac.libdir	2007-06-14 08:20:15.000000000 +0100
-+++ foomatic-filters-3.0-20070614/configure.ac	2007-06-14 10:30:50.000000000 +0100
-@@ -13,7 +13,7 @@
+diff -up foomatic-filters-3.0-20080710/configure.ac.libdir foomatic-filters-3.0-20080710/configure.ac
+--- foomatic-filters-3.0-20080710/configure.ac.libdir	2008-07-10 08:20:16.000000000 +0100
++++ foomatic-filters-3.0-20080710/configure.ac	2008-09-02 13:13:36.000000000 +0100
+@@ -13,7 +13,7 @@ AC_PROG_LN_S
  AC_PROG_MAKE_SET
  
  ETCSEARCHPATH=${prefix}/etc:/usr/etc:/usr/local/etc
@@ -9,7 +10,7 @@
  
  dnl Get the operating system and version number...
  uname=`uname`
-@@ -47,13 +47,13 @@
+@@ -47,13 +47,13 @@ dnl Check for /usr/lib/cups/backend
  AC_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$LIBSEARCHPATH)
  
  dnl Check for /usr/lib/ppr


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- foomatic.spec	2 Sep 2008 10:39:45 -0000	1.194
+++ foomatic.spec	2 Sep 2008 12:18:15 -0000	1.195
@@ -249,6 +249,7 @@
 
 %changelog
 * Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-62
+- Removed patch fuzz.
 - Fixed PPD generation for HP LaserJet 4345 MFP (bug #459847).
 
 * Thu Jul 10 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-61



From twaugh at fedoraproject.org  Tue Sep  2 12:23:00 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  2 Sep 2008 12:23:00 +0000 (UTC)
Subject: rpms/foomatic/F-8 foomatic-busyloop.patch, NONE, 1.1 foomatic.spec, 
	1.175, 1.176
Message-ID: <20080902122300.BF5A17011D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27775

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-busyloop.patch 
Log Message:
* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-61
- Avoid busy-looping when trying to shorten long PPD nicknames.


foomatic-busyloop.patch:

--- NEW FILE foomatic-busyloop.patch ---
diff -U0 foomatic-db-engine-3.0-20080211/ChangeLog.busyloop foomatic-db-engine-3.0-20080211/ChangeLog
diff -up foomatic-db-engine-3.0-20080211/lib/Foomatic/DB.pm.busyloop foomatic-db-engine-3.0-20080211/lib/Foomatic/DB.pm
--- foomatic-db-engine-3.0-20080211/lib/Foomatic/DB.pm.busyloop	2008-02-11 21:14:29.000000000 +0000
+++ foomatic-db-engine-3.0-20080211/lib/Foomatic/DB.pm	2008-09-02 13:19:24.000000000 +0100
@@ -4180,8 +4180,10 @@ EOFPGSZ
 	    # ShortNickName too long? Remove last words from model name.
 	    $parts{'model'} =~
 		s/(?<=[a-zA-Z0-9])[^a-zA-Z0-9]+[a-zA-Z0-9]*$//;
-	    $shortnickname =
+	    my $new =
 		"$parts{'make'} $parts{'model'}, $parts{'driver'}";
+	    last if ($new == $shortnickname);
+	    $shortnickname = $new;
 	}
 	if (length($shortnickname) > 31) {
 	    # If nothing else helps ...


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-8/foomatic.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- foomatic.spec	2 Sep 2008 10:33:04 -0000	1.175
+++ foomatic.spec	2 Sep 2008 12:22:30 -0000	1.176
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    60%{?dist}
+Release:    61%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -47,6 +47,7 @@
 Patch18: foomatic-sigpipe.patch
 
 Patch19: foomatic-459847.patch
+Patch20: foomatic-busyloop.patch
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
@@ -103,6 +104,7 @@
 %patch14 -p1 -b .ampathxml
 %patch10 -p1 -b .xml-cflags
 %patch15 -p1
+%patch20 -p1 -b .busyloop
 ./make_configure
 popd
 
@@ -253,6 +255,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-61
+- Avoid busy-looping when trying to shorten long PPD nicknames.
+
 * Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-60
 - Fixed PPD generation for HP LaserJet 4345 MFP (bug #459847).
 



From pkgdb at fedoraproject.org  Tue Sep  2 12:25:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:25:10 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20080902122510.51802208DC2@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdegames (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:26:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:26:16 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20080902122512.DEBCF208DC6@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdegames (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:25:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:25:18 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20080902122518.8DCE7208DB8@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdegames (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:25:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:25:20 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20080902122520.DC921208DCA@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdegames (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:25:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:25:22 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20080902122523.91CCF208DD3@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdegames (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:25:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:25:25 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20080902122525.2AB4C208DD1@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdegames (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:26:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:26:29 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20080902122525.EA064208DDB@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdegames (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:25:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:25:25 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20080902122525.EE108208DDC@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdegames (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:26:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:26:32 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20080902122528.98A37208DDE@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdegames (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:25:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:25:29 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20080902122529.EECD1208DE4@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdegames (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:26:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:26:35 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20080902122531.D2834208DE7@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdegames (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:25:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:25:33 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20080902122533.C68D6208D86@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdegames (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:26:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:26:34 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20080902122634.CCA2A208D91@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdegraphics (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:27:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:27:39 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20080902122635.C7E19208D97@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdegraphics (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:27:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:27:40 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20080902122636.C4D02208DA1@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdegraphics (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:26:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:26:46 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20080902122646.DFED6208DA6@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdegraphics (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:27:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:27:55 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20080902122651.8A734208DAD@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdegraphics (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:26:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:26:50 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20080902122651.B35F3208D7B@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdegraphics (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:27:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:27:59 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20080902122655.69B85208DEC@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdegraphics (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:26:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:26:59 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20080902122659.9C9DE208DB2@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdegraphics (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:27:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:27:00 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20080902122701.8E5C9208DB3@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdegraphics (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:28:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:28:52 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20080902122748.C6D5B208D9A@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdelibs (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:28:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:28:53 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20080902122749.39143208DB7@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdelibs (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:27:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:27:52 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20080902122753.B8ADF208DBD@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdelibs (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:27:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:27:55 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20080902122755.A764A208DC5@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdelibs (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:27:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:27:56 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20080902122756.C918F208DCA@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdelibs (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:29:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:29:06 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20080902122802.CD428208DD3@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdelibs (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:28:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:28:02 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20080902122804.01CF8208DFB@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdelibs (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:28:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:28:05 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20080902122805.04359208E01@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdelibs (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:28:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:28:08 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20080902122809.28602208DD7@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdelibs (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:29:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:29:54 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20080902122850.72628208DDE@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdemultimedia (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:28:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:28:50 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20080902122850.80EA1208DE4@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdemultimedia (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:28:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:28:53 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20080902122854.A208E208DE8@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdemultimedia (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:30:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:30:00 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20080902122856.C7FE6208E05@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdemultimedia (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:28:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:28:57 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20080902122857.A345B208E09@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdemultimedia (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:29:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:29:01 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20080902122901.EDB4D208E0D@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdemultimedia (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:30:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:30:07 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20080902122903.391E5208E14@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdemultimedia (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:29:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:29:03 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20080902122904.C3B2A208DE0@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdemultimedia (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:29:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:29:05 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20080902122906.820FF208E11@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdemultimedia (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:30:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:30:42 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20080902122938.EE070208D91@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdenetwork (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:30:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:30:43 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20080902122939.55F0E208D95@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdenetwork (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:29:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:29:41 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20080902122942.7E8A6208D9B@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdenetwork (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:29:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:29:44 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20080902122944.145C1208DA2@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdenetwork (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:29:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:29:44 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20080902122944.9CD24208E19@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdenetwork (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:30:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:30:54 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20080902122950.2ED40208DA6@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdenetwork (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:29:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:29:51 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20080902122952.442BC208E1D@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdenetwork (Fedora 9) to Approved for jreznik

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



From mschwendt at fedoraproject.org  Tue Sep  2 12:29:59 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  2 Sep 2008 12:29:59 +0000 (UTC)
Subject: rpms/icecream/devel icecream.spec,1.9,1.10
Message-ID: <20080902122959.7F38C7011D@cvs1.fedora.phx.redhat.com>

Author: mschwendt

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

Modified Files:
	icecream.spec 
Log Message:
* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.0-12.20080117svn
- Include unowned icecc directories.
- Add defattr in devel pkg.

No build-job.



Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- icecream.spec	13 Mar 2008 00:09:06 -0000	1.9
+++ icecream.spec	2 Sep 2008 12:29:29 -0000	1.10
@@ -13,7 +13,7 @@
 
 Name:		icecream
 Version:	0.8.0
-Release:	11.20080117svn%{?dist}
+Release:	12.20080117svn%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -228,6 +228,8 @@
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README BENCH NEWS TODO
 %{_bindir}/icecc
+%dir %{_libdir}/icecc/
+%dir %{_libdir}/icecc/bin/
 %{_libdir}/icecc/bin/cc
 %{_libdir}/icecc/bin/gcc
 %{_libdir}/icecc/bin/c++
@@ -245,11 +247,17 @@
 %{?with_selinux:%{_datadir}/selinux/*/icecream.pp}
 
 %files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/icecc/
 %{_includedir}/icecc/*.h
 %{_libdir}/libicecc.so
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.0-12.20080117svn
+- Include unowned icecc directories.
+- Add defattr in devel pkg.
+
 * Thu Mar 13 2008 Michal Schmidt <mschmidt at redhat.com> - 0.8.0-11.20080117svn
 - Minor SELinux policy fix.
 



From pkgdb at fedoraproject.org  Tue Sep  2 12:30:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:30:57 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20080902122953.1B41B208E24@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdenetwork (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:29:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:29:52 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20080902122953.4CECC208E25@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdenetwork (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:30:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:30:25 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20080902123025.2CD96208DAB@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdepim (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:30:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:30:26 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20080902123027.2B059208DB0@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdepim (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:30:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:30:28 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20080902123029.04DE4208DE3@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdepim (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:31:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:31:33 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20080902123029.36799208E29@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdepim (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:30:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:30:30 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20080902123030.E82C5208E2D@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdepim (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:30:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:30:32 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20080902123033.7140B208E32@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdepim (Fedora 7) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:30:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:30:33 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20080902123033.346A6208E35@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdepim (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:31:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:31:38 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20080902123034.7AD7F208E39@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdepim (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:30:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:30:38 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20080902123038.31B62208E37@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdepim (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:31:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:31:43 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20080902123039.9B63F208E3D@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdepim (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:30:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:30:40 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20080902123040.8D587208E41@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdepim (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:30:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:30:40 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20080902123042.1EBFA208E46@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdepim (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:31:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:31:31 +0000
Subject: [pkgdb] kdepimlibs had acl change status
Message-ID: <20080902123131.31437208DA0@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdepimlibs (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:31:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:31:34 +0000
Subject: [pkgdb] kdepimlibs had acl change status
Message-ID: <20080902123134.9FB4E208DF2@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdepimlibs (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:31:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:31:36 +0000
Subject: [pkgdb] kdepimlibs had acl change status
Message-ID: <20080902123137.ECF5F208DF4@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdepimlibs (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:32:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:32:43 +0000
Subject: [pkgdb] kdepimlibs had acl change status
Message-ID: <20080902123139.9AD5F208DBB@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdepimlibs (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:31:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:31:41 +0000
Subject: [pkgdb] kdepimlibs had acl change status
Message-ID: <20080902123141.3A42A208E00@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdepimlibs (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:31:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:31:46 +0000
Subject: [pkgdb] kdepimlibs had acl change status
Message-ID: <20080902123148.0149B208E48@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdepimlibs (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:31:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:31:49 +0000
Subject: [pkgdb] kdepimlibs had acl change status
Message-ID: <20080902123149.81329208E53@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdepimlibs (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:31:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:31:46 +0000
Subject: [pkgdb] kdepimlibs had acl change status
Message-ID: <20080902123149.68313208E4E@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdepimlibs (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:31:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:31:50 +0000
Subject: [pkgdb] kdepimlibs had acl change status
Message-ID: <20080902123150.9DFA6208E58@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdepimlibs (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:33:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:33:28 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20080902123224.BDD4D208DC7@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdesdk (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:32:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:32:26 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20080902123227.D834D208DCD@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdesdk (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:32:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:32:28 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20080902123229.9A123208DFD@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdesdk (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:32:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:32:30 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20080902123230.5F21C208E5B@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdesdk (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:33:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:33:36 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20080902123232.E04FB208E02@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdesdk (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:33:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:33:37 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20080902123233.632B5208E5F@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdesdk (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:32:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:32:36 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20080902123236.CC21D208E62@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdesdk (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:32:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:32:38 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20080902123238.1806D208E66@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdesdk (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:33:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:33:43 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20080902123239.690A1208E6A@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdesdk (Fedora 9) to Approved for jreznik

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



From twaugh at fedoraproject.org  Tue Sep  2 12:33:29 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  2 Sep 2008 12:33:29 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic-ppdload.patch,1.2,1.3
Message-ID: <20080902123329.86AC97011D@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	foomatic-ppdload.patch 
Log Message:
* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-62
- Removed patch fuzz.


foomatic-ppdload.patch:

Index: foomatic-ppdload.patch
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic-ppdload.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- foomatic-ppdload.patch	17 Jan 2006 13:50:45 -0000	1.2
+++ foomatic-ppdload.patch	2 Sep 2008 12:32:59 -0000	1.3
@@ -1,5 +1,69 @@
---- foomatic-db-engine-3.0-20031217/foomatic-ppdload.in.ppdload	2003-12-19 15:26:40.360620848 +0000
-+++ foomatic-db-engine-3.0-20031217/foomatic-ppdload.in	2003-12-19 15:26:56.289725866 +0000
+diff -up foomatic-db-engine-3.0-20080710/configure.ac.ppdload foomatic-db-engine-3.0-20080710/configure.ac
+--- foomatic-db-engine-3.0-20080710/configure.ac.ppdload	2008-09-02 13:31:19.000000000 +0100
++++ foomatic-db-engine-3.0-20080710/configure.ac	2008-09-02 13:31:19.000000000 +0100
+@@ -295,7 +295,7 @@ AC_OUTPUT(Makefile makeDefaults makeMan
+ foomatic-configure foomatic-printjob foomatic-kitload
+ foomatic-ppdfile foomatic-preferred-driver foomatic-cleanupdrivers
+ foomatic-getpjloptions foomatic-addpjloptions
+-foomatic-compiledb foomatic-fix-xml
++foomatic-compiledb foomatic-fix-xml foomatic-ppdload
+ foomatic-nonumericalids foomatic-replaceoldprinterids
+ foomatic-ppd-options foomatic-printermap-to-gutenprint-xml
+ foomatic-extract-text foomatic-searchprinter
+diff -up /dev/null foomatic-db-engine-3.0-20080710/foomatic-ppdload.8.in
+--- /dev/null	2008-09-02 08:50:58.290000634 +0100
++++ foomatic-db-engine-3.0-20080710/foomatic-ppdload.8.in	2008-09-02 13:31:19.000000000 +0100
+@@ -0,0 +1,47 @@
++.\" This -*- nroff -*- source file is part of foomatic.
++.\"
++.TH FOOMATIC-PPDLOAD 8 "2001-05-07" "Foomatic Project"
++.SH NAME
++foomatic-ppdload \- <put a short description here>
++.SH SYNOPSIS
++.B foomatic-ppdload \-h
++
++.B foomatic-ppdload
++\fIfilename.ppd printer-id\fR
++
++.B foomatic-ppdload \-R
++\fIprinter-id\fR
++
++.SH DESCRIPTION
++.B foomatic-ppdload
++takes a ppd filename and a printer ID as arguments.  It
++parses a PPD file and writes option data into the foomatic database
++for use with the foomatic "ppd" driver and that printer.
++
++With the \fB-R\fR option you can remove a printer from the "ppd"
++driver, and with \fB-h\fR a short help text is shown.
++
++Right now, it will handle Boolean and PickOne options that go in the
++Prolog, DocumentSetup, or PageSetup spots.  Also, PPD interoption
++constraints (not to be confused with foomatic option to printer and
++driver mapping constraints) are not supported by foomatic.  And of
++course, the interesting color and font information from the PPD has
++no place in the current foomatic schema.  All this will change over
++time.
++
++
++.\".SH SEE ALSO
++.\".IR foomatic-XXX (1),
++
++.SH EXIT STATUS
++.B foomatic-ppdload
++returns ...
++
++.SH AUTHOR
++Manfred Wassmann <\fImanolo at NCC-1701.B.Shuttle.de\fR> for the foomatic
++project using output from the associated binary.
++
++.SH BUGS
++There are several limitations, but it's an interesting experiment.
++
++Please send bug reports to foomatic-devel at linuxprinting.org.
+diff -up /dev/null foomatic-db-engine-3.0-20080710/foomatic-ppdload.in
+--- /dev/null	2008-09-02 08:50:58.290000634 +0100
++++ foomatic-db-engine-3.0-20080710/foomatic-ppdload.in	2008-09-02 13:31:19.000000000 +0100
 @@ -0,0 +1,118 @@
 +#!@PERL@
 +
@@ -119,83 +183,23 @@
 +    print "\n";
 +    exit(1);
 +}
---- foomatic-db-engine-3.0-20031217/foomatic-ppdload.8.in.ppdload	2003-12-19 15:26:45.290034426 +0000
-+++ foomatic-db-engine-3.0-20031217/foomatic-ppdload.8.in	2003-12-19 15:26:56.034756198 +0000
-@@ -0,0 +1,47 @@
-+.\" This -*- nroff -*- source file is part of foomatic.
-+.\"
-+.TH FOOMATIC-PPDLOAD 8 "2001-05-07" "Foomatic Project"
-+.SH NAME
-+foomatic-ppdload \- <put a short description here>
-+.SH SYNOPSIS
-+.B foomatic-ppdload \-h
-+
-+.B foomatic-ppdload
-+\fIfilename.ppd printer-id\fR
-+
-+.B foomatic-ppdload \-R
-+\fIprinter-id\fR
-+
-+.SH DESCRIPTION
-+.B foomatic-ppdload
-+takes a ppd filename and a printer ID as arguments.  It
-+parses a PPD file and writes option data into the foomatic database
-+for use with the foomatic "ppd" driver and that printer.
-+
-+With the \fB-R\fR option you can remove a printer from the "ppd"
-+driver, and with \fB-h\fR a short help text is shown.
-+
-+Right now, it will handle Boolean and PickOne options that go in the
-+Prolog, DocumentSetup, or PageSetup spots.  Also, PPD interoption
-+constraints (not to be confused with foomatic option to printer and
-+driver mapping constraints) are not supported by foomatic.  And of
-+course, the interesting color and font information from the PPD has
-+no place in the current foomatic schema.  All this will change over
-+time.
-+
-+
-+.\".SH SEE ALSO
-+.\".IR foomatic-XXX (1),
-+
-+.SH EXIT STATUS
-+.B foomatic-ppdload
-+returns ...
-+
-+.SH AUTHOR
-+Manfred Wassmann <\fImanolo at NCC-1701.B.Shuttle.de\fR> for the foomatic
-+project using output from the associated binary.
-+
-+.SH BUGS
-+There are several limitations, but it's an interesting experiment.
-+
-+Please send bug reports to foomatic-devel at linuxprinting.org.
---- foomatic-db-engine-3.0-20031217/configure.ac.ppdload	2003-12-19 15:27:03.188905120 +0000
-+++ foomatic-db-engine-3.0-20031217/configure.ac	2003-12-19 15:27:21.165766554 +0000
-@@ -280,7 +280,7 @@
- foomatic-configure foomatic-printjob foomatic-kitload
- foomatic-ppdfile foomatic-preferred-driver foomatic-cleanupdrivers
- foomatic-getpjloptions foomatic-addpjloptions
--foomatic-compiledb foomatic-fix-xml
-+foomatic-compiledb foomatic-fix-xml foomatic-ppdload
- foomatic-nonumericalids foomatic-replaceoldprinterids
- foomatic-ppd-options
- )
---- foomatic-db-engine-3.0-20031217/Makefile.in.ppdload	2003-12-19 15:27:25.217284580 +0000
-+++ foomatic-db-engine-3.0-20031217/Makefile.in	2003-12-19 15:28:09.349034667 +0000
-@@ -145,6 +145,7 @@
+diff -up foomatic-db-engine-3.0-20080710/Makefile.in.ppdload foomatic-db-engine-3.0-20080710/Makefile.in
+--- foomatic-db-engine-3.0-20080710/Makefile.in.ppdload	2008-07-10 08:20:10.000000000 +0100
++++ foomatic-db-engine-3.0-20080710/Makefile.in	2008-09-02 13:31:19.000000000 +0100
+@@ -147,6 +147,7 @@ AC_OUTPUT_FILES:=Makefile makeDefaults m
  	foomatic-kitload foomatic-ppdfile foomatic-preferred-driver \
  	foomatic-cleanupdrivers foomatic-getpjloptions \
  	foomatic-addpjloptions foomatic-compiledb foomatic-fix-xml \
 +	foomatic-ppdload \
  	foomatic-nonumericalids foomatic-replaceoldprinterids \
- 	foomatic-ppd-options
- 
-@@ -155,7 +156,7 @@
- 	foomatic-ppd-options
+ 	foomatic-ppd-options foomatic-printermap-to-gutenprint-xml \
+ 	foomatic-extract-text foomatic-searchprinter
+@@ -158,7 +159,7 @@ BINFILES:=foomatic-printjob foomatic-con
+ 	foomatic-ppd-options foomatic-searchprinter
  
  # Administrative commands, only useful for admins
 -SBINFILES:=foomatic-kitload \
 +SBINFILES:=foomatic-kitload foomatic-ppdload \
  	foomatic-getpjloptions foomatic-addpjloptions \
  	foomatic-preferred-driver foomatic-fix-xml \
- 	foomatic-nonumericalids foomatic-replaceoldprinterids
+ 	foomatic-nonumericalids foomatic-replaceoldprinterids \



From pkgdb at fedoraproject.org  Tue Sep  2 12:33:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:33:50 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20080902123350.3C6E2208DDC@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeutils (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:34:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:34:55 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20080902123351.C5492208DE2@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeutils (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:33:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:33:55 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20080902123356.94E00208DE8@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeutils (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:33:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:33:57 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20080902123357.059FB208E05@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeutils (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:35:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:35:02 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20080902123358.4172B208E09@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeutils (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:34:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:34:01 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20080902123402.E409A208E13@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeutils (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:34:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:34:02 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20080902123402.D7906208E12@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeutils (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:35:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:35:07 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20080902123403.8435F208E6F@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeutils (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:34:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:34:11 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20080902123412.DB7B4208DE0@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeutils (Fedora 9) to Approved for jreznik

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



From tmraz at fedoraproject.org  Tue Sep  2 12:35:33 2008
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue,  2 Sep 2008 12:35:33 +0000 (UTC)
Subject: rpms/openct/devel openct-0.6.15-nosleep-287871.patch, NONE,
	1.1 .cvsignore, 1.16, 1.17 openct.spec, 1.31, 1.32 sources, 1.16,
	1.17 openct-0.6.14-nosleep-287871.patch, 1.1, NONE
Message-ID: <20080902123533.43B6C7011D@cvs1.fedora.phx.redhat.com>

Author: tmraz

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

Modified Files:
	.cvsignore openct.spec sources 
Added Files:
	openct-0.6.15-nosleep-287871.patch 
Removed Files:
	openct-0.6.14-nosleep-287871.patch 
Log Message:
* Tue Sep  2 2008 Tomas Mraz <tmraz at redhat.com> - 0.6.15-1
- Update to latest upstream


openct-0.6.15-nosleep-287871.patch:

--- NEW FILE openct-0.6.15-nosleep-287871.patch ---
diff -up openct-0.6.15/etc/openct.udev.in.orig openct-0.6.15/etc/openct.udev.in
--- openct-0.6.15/etc/openct.udev.in.orig	2008-07-27 11:54:37.000000000 +0200
+++ openct-0.6.15/etc/openct.udev.in	2008-09-02 11:13:11.000000000 +0200
@@ -17,7 +17,8 @@ ACTION!="add", GOTO="openct_usb_rules_en
 KERNEL=="[0-9]*:*", WAIT_FOR_SYSFS="bInterfaceProtocol"
 
 # sleep for 100ms - the wait_for_sysfs might not be enough
-PROGRAM="/bin/sleep 0.1"
+# Disabled in this package - see https://bugzilla.redhat.com/287871
+#PROGRAM="/bin/sleep 0.1"
 
 # egate
 SYSFS{idVendor}=="0973", SYSFS{idProduct}=="0001", RUN+="@udevdir@/openct_usb"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openct/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	30 Aug 2007 19:30:25 -0000	1.16
+++ .cvsignore	2 Sep 2008 12:35:02 -0000	1.17
@@ -1 +1 @@
-openct-0.6.14.tar.gz
+openct-0.6.15.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openct/devel/openct.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- openct.spec	13 Feb 2008 21:08:56 -0000	1.31
+++ openct.spec	2 Sep 2008 12:35:02 -0000	1.32
@@ -3,8 +3,8 @@
 %define dropdir %(pkg-config libpcsclite --variable=usbdropdir)
 
 Name:           openct
-Version:        0.6.14
-Release:        4%{?dist}
+Version:        0.6.15
+Release:        1%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -13,12 +13,13 @@
 Source0:        http://www.opensc-project.org/files/openct/%{name}-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
-Patch0:         %{name}-0.6.14-nosleep-287871.patch
+Patch1:         %{name}-0.6.15-nosleep-287871.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.3.0
 BuildRequires:  libusb-devel
 BuildRequires:  libtool-ltdl-devel
+BuildRequires:  doxygen
 Requires:       %{_libdir}/ctapi
 # 098 for some keywords in shipped rules, see etc/openct.udev for more info
 Requires:       udev >= 098
@@ -57,7 +58,7 @@
 
 %prep
 %setup -q
-%patch0 -p0
+%patch1 -p1
 sed -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|' configure # lib64 std rpaths
 sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in
 
@@ -66,9 +67,13 @@
 # openct uses some gnu extensions
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
 %configure \
-    --disable-dependency-tracking \
     --disable-static \
-    --with-bundle-dir=%{dropdir}
+    --enable-usb \
+    --enable-pcsc \
+    --enable-doc \
+    --enable-api-doc \
+    --with-udev=/lib/udev \
+    --with-bundle=%{dropdir}
 make %{?_smp_mflags}
 
 
@@ -100,6 +105,9 @@
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/{*.la,openct-ifd.so}
 
+mkdir apidocdir
+mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/api apidocdir
+mv -T $RPM_BUILD_ROOT%{_datadir}/doc/%{name} docdir
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -132,7 +140,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc LGPL-2.1 NEWS TODO doc/*.html doc/*.css
+%doc LGPL-2.1 TODO
+%doc docdir/*
 %config(noreplace) %{_sysconfdir}/openct.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/openct
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*openct.rules
@@ -152,7 +161,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/api/*
+%doc apidocdir/*
 %{_includedir}/openct/
 %{_libdir}/pkgconfig/libopenct.pc
 %{_libdir}/libopenct.so
@@ -164,6 +173,9 @@
 
 
 %changelog
+* Tue Sep  2 2008 Tomas Mraz <tmraz at redhat.com> - 0.6.15-1
+- Update to latest upstream
+
 * Wed Feb 13 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.14-4
 - Fix building with latest glibc
 - Rebuild for gcc-4.3  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openct/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	30 Aug 2007 19:30:25 -0000	1.16
+++ sources	2 Sep 2008 12:35:02 -0000	1.17
@@ -1 +1 @@
-04a5c0c7dedcb1ca0d550b1970fbf3b7  openct-0.6.14.tar.gz
+70205beac03974e266fc259b6c9feaa8  openct-0.6.15.tar.gz


--- openct-0.6.14-nosleep-287871.patch DELETED ---



From jmoskovc at fedoraproject.org  Tue Sep  2 12:39:06 2008
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Tue,  2 Sep 2008 12:39:06 +0000 (UTC)
Subject: rpms/libbtctl/devel libbtctl.spec,1.51,1.52
Message-ID: <20080902123906.C7CDB7011D@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

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

Modified Files:
	libbtctl.spec 
Log Message:
Move documentation to separate package to avoid conflict on multiarch environment.



Index: libbtctl.spec
===================================================================
RCS file: /cvs/extras/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- libbtctl.spec	11 Feb 2008 11:16:35 -0000	1.51
+++ libbtctl.spec	2 Sep 2008 12:38:36 -0000	1.52
@@ -8,7 +8,7 @@
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.10.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL+
 Group: System Environment/Libraries
 URL: http://live.gnome.org/GnomeBluetooth 
@@ -38,6 +38,12 @@
 This package contains the files needed for developing applications,
 which use libbtctl.
 
+%package doc
+Summary: Documentation files for libbtctl
+Group: Development/Documentation
+
+%description doc
+%{summary}
 
 %prep
 %setup -q
@@ -94,12 +100,19 @@
 %{_libdir}/lib*.a
 %{_libdir}/pkgconfig/libbtctl.pc
 %{_includedir}/libbtctl
-%{_datadir}/gtk-doc/html/libbtctl
 %if %{with_mono}
 %{_libdir}/pkgconfig/libbtctl-sharp.pc
 %endif
 
+%files doc
+%defattr(-, root, root)
+%{_datadir}/gtk-doc/html/libbtctl
+
 %changelog
+* Mon Sep  1 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 0.10.0-3
+- made doc subpackage to avoid conflict on multiarch env.
+- Resolves: #341931
+
 * Mon Feb 11 2008 - Ondrej Vasik <ovasik at redhat.com> - 0.10.0-2
 - gcc43 rebuild
 



From zprikryl at fedoraproject.org  Tue Sep  2 12:39:35 2008
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Tue,  2 Sep 2008 12:39:35 +0000 (UTC)
Subject: rpms/iptraf/devel iptraf-3.0.1-ipv6.patch, NONE,
	1.1 iptraf-3.0.0-ifname.patch, 1.1,
	1.2 iptraf-3.0.1-incltypes.patch, 1.1, 1.2 iptraf.spec, 1.32,
	1.33 iptraf-3.0.0-ipv6.patch, 1.1, NONE
Message-ID: <20080902123935.55BD07011D@cvs1.fedora.phx.redhat.com>

Author: zprikryl

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

Modified Files:
	iptraf-3.0.0-ifname.patch iptraf-3.0.1-incltypes.patch 
	iptraf.spec 
Added Files:
	iptraf-3.0.1-ipv6.patch 
Removed Files:
	iptraf-3.0.0-ipv6.patch 
Log Message:
Minor fixes in patches ipv6, incltypes and ifname


iptraf-3.0.1-ipv6.patch:

--- NEW FILE iptraf-3.0.1-ipv6.patch ---
diff -up iptraf-3.0.1/src/attrs.h.ipv6 iptraf-3.0.1/src/attrs.h
--- iptraf-3.0.1/src/attrs.h.ipv6	2005-09-13 08:42:54.000000000 +0200
+++ iptraf-3.0.1/src/attrs.h	2008-09-02 13:57:02.000000000 +0200
@@ -29,3 +29,5 @@ extern int ARPATTR;
 extern int GREATTR;
 extern int UNKNIPATTR;
 extern int UNKNATTR;
+extern int IPV6ATTR;
+extern int ICMPV6ATTR;
diff -up iptraf-3.0.1/src/deskman.c.ipv6 iptraf-3.0.1/src/deskman.c
--- iptraf-3.0.1/src/deskman.c.ipv6	2005-09-13 08:42:54.000000000 +0200
+++ iptraf-3.0.1/src/deskman.c	2008-09-02 13:57:02.000000000 +0200
@@ -56,7 +56,8 @@ int GREATTR;
 int ARPATTR;
 int UNKNIPATTR;
 int UNKNATTR;
-
+int IPV6ATTR;
+int ICMPV6ATTR;
 
 /*  draw the basic desktop common to my screen-oriented programs */
 
@@ -89,7 +90,8 @@ void about()
     PANEL *panel;
     int ch;
 
-    win = newwin(15, 50, (LINES - 15) / 2, (COLS - 50) / 2);
+    win = newwin(18, 62, (LINES - 17) / 2, (COLS - 62) / 2);
+
     panel = new_panel(win);
 
     tx_stdwinset(win);
@@ -108,9 +110,12 @@ void about()
     mvwprintw(win, 10, 2,
               "Public License Version 2 or any later version.");
     mvwprintw(win, 11, 2, "See the included LICENSE file for details.");
+    mvwprintw(win, 13, 2, "IPv6 support by Markus Ullmann <mail at markus-ullmann.de>");
+    mvwprintw(win, 14, 2, "inspired by 2.7.0 diff by Guy Martin <gmsoft at tuxicoman.be>");
 
     wattrset(win, HIGHATTR);
-    mvwprintw(win, 13, 2, ANYKEY_MSG);
+
+    mvwprintw(win, 16, 2, ANYKEY_MSG);
 
     update_panels();
     doupdate();
@@ -252,6 +257,8 @@ void standardcolors(int color)
         ARPATTR = COLOR_PAIR(5) | A_BOLD;
         GREATTR = COLOR_PAIR(1);
         UNKNIPATTR = COLOR_PAIR(19) | A_BOLD;
+	ICMPV6ATTR = COLOR_PAIR(19) | A_BOLD;
+	IPV6ATTR = COLOR_PAIR(19);
         UNKNATTR = COLOR_PAIR(4) | A_BOLD;
     } else {
         STDATTR = A_REVERSE;
@@ -281,6 +288,7 @@ void standardcolors(int color)
         ARPATTR = A_BOLD;
         GREATTR = A_BOLD;
         UNKNIPATTR = A_BOLD;
+	ICMPV6ATTR = A_REVERSE;
         UNKNATTR = A_BOLD;
     }
 
diff -up iptraf-3.0.1/src/ifstats.c.ipv6 iptraf-3.0.1/src/ifstats.c
--- iptraf-3.0.1/src/ifstats.c.ipv6	2005-09-13 08:42:54.000000000 +0200
+++ iptraf-3.0.1/src/ifstats.c	2008-09-02 13:57:02.000000000 +0200
@@ -1,4 +1,3 @@
-
 /***
 
 ifstats.c	- the interface statistics module
@@ -34,6 +33,7 @@ details.
 #include <linux/if_packet.h>
 #include <net/if.h>
 #include <netinet/ip.h>
+#include <netinet/ip6.h>
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
 #include <linux/if_ether.h>
@@ -252,7 +252,7 @@ void updaterates(struct iftab *table, in
 
     wattrset(table->statwin, HIGHATTR);
     do {
-        wmove(table->statwin, ptmp->index - idx, 52 * COLS / 80);
+	wmove(table->statwin, ptmp->index - idx, 60 * COLS / 80);
         if (unit == KBITS) {
             ptmp->rate =
                 ((float) (ptmp->spanbr * 8 / 1000)) /
@@ -286,13 +286,15 @@ void printifentry(struct iflist *ptmp, W
     wmove(win, target_row, 1);
     wprintw(win, "%s", ptmp->ifname);
     wattrset(win, HIGHATTR);
-    wmove(win, target_row, 12 * COLS / 80);
+    wmove(win, target_row, 9  * COLS / 80);
     printlargenum(ptmp->total, win);
-    wmove(win, target_row, 22 * COLS / 80);
+    wmove(win, target_row, 19 * COLS / 80);
     printlargenum(ptmp->iptotal, win);
-    wmove(win, target_row, 32 * COLS / 80);
+    wmove(win, target_row, 29 * COLS / 80);
+    printlargenum(ptmp->ip6total, win);
+    wmove(win, target_row, 39 * COLS / 80);
     printlargenum(ptmp->noniptotal, win);
-    wmove(win, target_row, 42 * COLS / 80);
+    wmove(win, target_row, 29 * COLS / 80);
     wprintw(win, "%8lu", ptmp->badtotal);
 }
 
@@ -320,15 +322,19 @@ void labelstats(WINDOW * win)
 {
     wmove(win, 0, 1);
     wprintw(win, " Iface ");
-    wmove(win, 0, 16 * COLS / 80);
+    wmove(win, 0, 12 * COLS / 80);
     wprintw(win, " Total ");
-    wmove(win, 0, 29 * COLS / 80);
+    wmove(win, 0, 22 * COLS / 80);
+    wprintw(win, " IPv4 ");
+    wmove(win, 0, 32 * COLS / 80);
+    wprintw(win, " IPv6 ");
+    wmove(win, 0, 42 * COLS / 80);
     wprintw(win, " IP ");
     wmove(win, 0, 36 * COLS / 80);
     wprintw(win, " NonIP ");
-    wmove(win, 0, 45 * COLS / 80);
+    wmove(win, 0, 51 * COLS / 80);
     wprintw(win, " BadIP ");
-    wmove(win, 0, 55 * COLS / 80);
+    wmove(win, 0, 65 * COLS / 80);
     wprintw(win, " Activity ");
 }
 
@@ -422,6 +428,8 @@ void ifstats(const struct OPTIONS *optio
     char *packet;
     int pkt_result = 0;
 
+    unsigned int iphlen;
+
     struct sockaddr_ll fromaddr;
     unsigned short linktype;
 
@@ -590,6 +598,18 @@ void ifstats(const struct OPTIONS *optio
                     && pkt_result != MORE_FRAGMENTS)
                     continue;
 
+		if ((options->v6inv4asv6) && (fromaddr.sll_protocol == ETH_P_IP)
+                    && ((struct iphdr *) packet)->protocol == IPPROTO_IPV6 ) {
+	                iphlen = ((struct iphdr *) packet)->ihl * 4;
+    	                fromaddr.sll_protocol = htons(ETH_P_IPV6);
+        	        memmove(buf, buf + iphlen, MAX_PACKET_SIZE - iphlen);
+            	        // Reprocess the IPv6 packet
+                        pkt_result = processpacket(buf, &packet, &br, NULL, NULL, NULL,
+                                  &fromaddr, &linktype, ofilter, MATCH_OPPOSITE_USECONFIG, ifname, NULL);
+	                if (pkt_result != PACKET_OK
+    	                && pkt_result != MORE_FRAGMENTS)
+        	        continue;
+    	        }
                 positionptr(&table, &ptmp, ifname);
 
                 ptmp->total++;
@@ -604,6 +624,8 @@ void ifstats(const struct OPTIONS *optio
                         (ptmp->badtotal)++;
                         continue;
                     }
+                } else if (fromaddr.sll_protocol == ETH_P_IPV6) {
+                    ptmp->ip6total++;
                 } else {
                     (ptmp->noniptotal)++;
                 }
@@ -654,19 +676,20 @@ void printdetlabels(WINDOW * win, struct
               "Packets      Bytes     Packets      Bytes     Packets      Bytes");
     wattrset(win, STDATTR);
     mvwprintw(win, 4, 2, "Total:");
-    mvwprintw(win, 5, 2, "IP:");
-    mvwprintw(win, 6, 2, "TCP:");
-    mvwprintw(win, 7, 2, "UDP:");
-    mvwprintw(win, 8, 2, "ICMP:");
-    mvwprintw(win, 9, 2, "Other IP:");
-    mvwprintw(win, 10, 2, "Non-IP:");
-    mvwprintw(win, 13, 2, "Total rates:");
-    mvwprintw(win, 16, 2, "Incoming rates:");
-    mvwprintw(win, 19, 2, "Outgoing rates:");
-
-    mvwprintw(win, 13, 45, "Broadcast packets:");
-    mvwprintw(win, 14, 45, "Broadcast bytes:");
-    mvwprintw(win, 18, 45, "IP checksum errors:");
+    mvwprintw(win, 5, 2, "IPv4:");
+    mvwprintw(win, 6, 2, "IPv6:");
+    mvwprintw(win, 7, 2, "TCP:");
+    mvwprintw(win, 8, 2, "UDP:");
+    mvwprintw(win, 9, 2, "ICMP:");
+    mvwprintw(win, 10, 2, "Other IP:");
+    mvwprintw(win, 11, 2, "Non-IP:");
+    mvwprintw(win, 14, 2, "Total rates:");
+    mvwprintw(win, 17, 2, "Incoming rates:");
+    mvwprintw(win, 20, 2, "Outgoing rates:");
+
+    mvwprintw(win, 14, 45, "Broadcast packets:");
+    mvwprintw(win, 15, 45, "Broadcast bytes:");
+    mvwprintw(win, 19, 45, "IP checksum errors:");
 
     update_panels();
     doupdate();
@@ -707,38 +730,41 @@ void printdetails(struct iftotals *total
                  totals->iptotal_in, totals->ipbtotal_in,
                  totals->iptotal_out, totals->ipbtotal_out);
 
-    printstatrow(win, 6, totals->tcptotal, totals->tcpbtotal,
+    printstatrow(win, 6, totals->ip6total, totals->ip6btotal,
+                 totals->ip6total_in, totals->ip6btotal_in,
+                 totals->ip6total_out, totals->ip6btotal_out);  
+  
+    printstatrow(win, 7, totals->tcptotal, totals->tcpbtotal,
                  totals->tcptotal_in, totals->tcpbtotal_in,
-                 totals->tcptotal_out, totals->tcpbtotal_out);
+		 totals->tcptotal_out, totals->tcpbtotal_out);
 
-    printstatrow(win, 7, totals->udptotal, totals->udpbtotal,
+    printstatrow(win, 8, totals->udptotal, totals->udpbtotal,
                  totals->udptotal_in, totals->udpbtotal_in,
                  totals->udptotal_out, totals->udpbtotal_out);
 
-    printstatrow(win, 8, totals->icmptotal, totals->icmpbtotal,
+    printstatrow(win, 9, totals->icmptotal, totals->icmpbtotal,
                  totals->icmptotal_in, totals->icmpbtotal_in,
                  totals->icmptotal_out, totals->icmpbtotal_out);
 
-    printstatrow(win, 9, totals->othtotal, totals->othbtotal,
+    printstatrow(win, 10, totals->othtotal, totals->othbtotal,
                  totals->othtotal_in, totals->othbtotal_in,
                  totals->othtotal_out, totals->othbtotal_out);
 
     /* Print non-IP totals */
 
-    printstatrow(win, 10, totals->noniptotal, totals->nonipbtotal,
+    printstatrow(win, 11, totals->noniptotal, totals->nonipbtotal,
                  totals->noniptotal_in, totals->nonipbtotal_in,
                  totals->noniptotal_out, totals->nonipbtotal_out);
 
     /* Broadcast totals */
-
-    wmove(win, 13, 67);
-    printlargenum(totals->bcast, win);
     wmove(win, 14, 67);
+    printlargenum(totals->bcast, win);
+    wmove(win, 15, 67);
     printlargenum(totals->bcastbytes, win);
 
     /* Bad packet count */
 
-    mvwprintw(win, 18, 68, "%8lu", totals->badtotal);
+    mvwprintw(win, 19, 68, "%8lu", totals->badtotal);
 }
 
 
@@ -757,6 +783,7 @@ void detstats(char *iface, const struct 
     char buf[MAX_PACKET_SIZE];
     char *packet;
     struct iphdr *ipacket = NULL;
+    struct ip6_hdr *ip6packet = NULL;
     char *tpacket;
     unsigned int iphlen;
 
@@ -962,15 +989,15 @@ void detstats(char *iface, const struct 
             starttime = now;
 
             wattrset(statwin, HIGHATTR);
-            mvwprintw(statwin, 13, 19, "%8.1f %s/sec", activity,
+            mvwprintw(statwin, 14, 19, "%8.1f %s/sec", activity,
                       unitstring);
-            mvwprintw(statwin, 14, 19, "%8.1f packets/sec", pps);
-            mvwprintw(statwin, 16, 19, "%8.1f %s/sec", activity_in,
+            mvwprintw(statwin, 15, 19, "%8.1f packets/sec", pps);
+            mvwprintw(statwin, 17, 19, "%8.1f %s/sec", activity_in,
                       unitstring);
-            mvwprintw(statwin, 17, 19, "%8.1f packets/sec", pps_in);
-            mvwprintw(statwin, 19, 19, "%8.1f %s/sec", activity_out,
+            mvwprintw(statwin, 18, 19, "%8.1f packets/sec", pps_in);
+            mvwprintw(statwin, 20, 19, "%8.1f %s/sec", activity_out,
                       unitstring);
-            mvwprintw(statwin, 20, 19, "%8.1f packets/sec", pps_out);
+            mvwprintw(statwin, 21, 19, "%8.1f packets/sec", pps_out);
 
             if (activity > peakactivity)
                 peakactivity = activity;
@@ -1077,6 +1104,18 @@ void detstats(char *iface, const struct 
             if (pkt_result != PACKET_OK && pkt_result != MORE_FRAGMENTS)
                 continue;
 
+            if ((options->v6inv4asv6) && (fromaddr.sll_protocol == ETH_P_IP)
+                && ((struct iphdr *) packet)->protocol == IPPROTO_IPV6 ) {
+                    iphlen = ((struct iphdr *) packet)->ihl * 4;
+                    fromaddr.sll_protocol = htons(ETH_P_IPV6);
+                    memmove(buf, buf + iphlen, MAX_PACKET_SIZE - iphlen);
+                    // Reprocess the IPv6 packet
+                    pkt_result = processpacket(buf, &packet, &br, NULL, NULL, NULL,
+                              &fromaddr, &linktype, ofilter, MATCH_OPPOSITE_USECONFIG, ifname, NULL);
+                    if (pkt_result != PACKET_OK && pkt_result != MORE_FRAGMENTS)
+                        continue;
+            }
+
             totals.total++;
             totals.bytestotal += framelen;
 
@@ -1185,8 +1224,73 @@ void detstats(char *iface, const struct 
                     }
                     break;
                 }
+            } else if (fromaddr.sll_protocol == ETH_P_IPV6) {
+ 
+                ip6packet = (struct ip6_hdr *) packet;
+                iplen = ntohs(ip6packet->ip6_plen);
+ 
+                totals.ip6total++;
+                totals.ip6btotal += iplen;
+ 
+                if (fromaddr.sll_pkttype == PACKET_OUTGOING) {
+                    totals.ip6total_out++;
+                    totals.ip6btotal_out += iplen;
+                } else {
+                    totals.ip6total_in++;
+                    totals.ip6btotal_in += iplen;
+                }
+ 
+                switch (ip6packet->ip6_nxt) {
+                case IPPROTO_TCP:
+                    totals.tcptotal++;
+                    totals.tcpbtotal += iplen;
+ 
+                    if (fromaddr.sll_pkttype == PACKET_OUTGOING) {
+                        totals.tcptotal_out++;
+                        totals.tcpbtotal_out += iplen;
+                    } else {
+                        totals.tcptotal_in++;
+                        totals.tcpbtotal_in += iplen;
+                    }
+                    break;
+                case IPPROTO_UDP:
+                    totals.udptotal++;
+                    totals.udpbtotal += iplen;
+ 
+                    if (fromaddr.sll_pkttype == PACKET_OUTGOING) {
+                        totals.udptotal_out++;
+                        totals.udpbtotal_out += iplen;
+                    } else {
+                        totals.udptotal_in++;
+                        totals.udpbtotal_in += iplen;
+                    }
+                    break;
+                case IPPROTO_ICMPV6:
+                    totals.icmptotal++;
+                    totals.icmpbtotal += iplen;
+                    if (fromaddr.sll_pkttype == PACKET_OUTGOING) {
+                        totals.icmptotal_out++;
+                        totals.icmpbtotal_out += iplen;
+                    } else {
+                        totals.icmptotal_in++;
+                        totals.icmpbtotal_in += iplen;
+                    }
+                    break;
+                default:
+                    totals.othtotal++;
+                    totals.othbtotal += iplen;
+ 
+                    if (fromaddr.sll_pkttype == PACKET_OUTGOING) {
+                        totals.othtotal_out++;
+                        totals.othbtotal_out += iplen;
+                    } else {
+                        totals.othtotal_in++;
+                	totals.othbtotal_in += iplen;
+                    }
+            	    break;
+                }
             } else {
-                totals.noniptotal++;
+		 totals.noniptotal++;
                 totals.nonipbtotal += br;
 
                 if (fromaddr.sll_pkttype == PACKET_OUTGOING) {
diff -up iptraf-3.0.1/src/ifstats.h.ipv6 iptraf-3.0.1/src/ifstats.h
--- iptraf-3.0.1/src/ifstats.h.ipv6	2005-09-13 08:42:54.000000000 +0200
+++ iptraf-3.0.1/src/ifstats.h	2008-09-02 13:57:02.000000000 +0200
@@ -9,6 +9,7 @@ struct iflist {
     char ifname[8];
     unsigned int encap;
     unsigned long long iptotal;
+    unsigned long long ip6total;
     unsigned long badtotal;
     unsigned long long noniptotal;
     unsigned long long total;
@@ -49,6 +50,13 @@ struct iftotals {
     unsigned long long ipbtotal_in;
     unsigned long long ipbtotal_out;
 
+    unsigned long long ip6total;
+    unsigned long long ip6btotal;
+    unsigned long long ip6total_in;
+    unsigned long long ip6total_out;
+    unsigned long long ip6btotal_in;
+    unsigned long long ip6btotal_out;
+
     unsigned long long noniptotal;
     unsigned long long nonipbtotal;
     unsigned long long noniptotal_in;
diff -up iptraf-3.0.1/src/itrafmon.c.ipv6 iptraf-3.0.1/src/itrafmon.c
--- iptraf-3.0.1/src/itrafmon.c.ipv6	2005-09-13 08:42:54.000000000 +0200
+++ iptraf-3.0.1/src/itrafmon.c	2008-09-02 13:57:02.000000000 +0200
@@ -23,6 +23,8 @@ details.
 #include <ctype.h>
 #include <winops.h>
 #include <labels.h>
+#include <netinet/ip6.h>
+#include <netinet/icmp6.h>
 #include "options.h"
 #include "tcptable.h"
 #include "othptab.h"
@@ -578,6 +580,9 @@ void ipmon(struct OPTIONS *options,
     char tpacket[MAX_PACKET_SIZE];      /* raw packet data */
     char *packet = NULL;        /* network packet ptr */
     struct iphdr *ippacket;
+    struct ip6_hdr *ip6packet;
+    unsigned int protocol;
+    unsigned int frag_off;
     struct tcphdr *transpacket; /* IP-encapsulated packet */
     unsigned int sport = 0, dport = 0;  /* TCP/UDP port values */
     char sp_buf[10];
@@ -1046,9 +1051,9 @@ void ipmon(struct OPTIONS *options,
             if (pkt_result != PACKET_OK)
                 continue;
 
-            if (fromaddr.sll_protocol != ETH_P_IP) {
+            if ((fromaddr.sll_protocol != ETH_P_IP) && (fromaddr.sll_protocol != ETH_P_IPV6)) {
                 othpent = add_othp_entry(&othptbl, &table,
-                                         0, 0, NOT_IP,
+                                         0, 0, NULL, NULL, NOT_IP,
                                          fromaddr.sll_protocol,
                                          linktype, (char *) tpacket,
                                          (char *) packet, br, ifname, 0, 0,
@@ -1056,23 +1061,52 @@ void ipmon(struct OPTIONS *options,
                                          options->servnames, 0, &nomem);
                 continue;
             } else {
+                if ((options->v6inv4asv6) && (fromaddr.sll_protocol == ETH_P_IP)
+                    && ((struct iphdr *) packet)->protocol == IPPROTO_IPV6 ) {
+                        iphlen = ((struct iphdr *) packet)->ihl * 4;
+                        fromaddr.sll_protocol = htons(ETH_P_IPV6);
+                        memmove(tpacket, tpacket + iphlen, MAX_PACKET_SIZE - iphlen);
+                        // Reprocess the ipv6 packet
+                        pkt_result = processpacket((char *) tpacket, &packet, &readlen,
+                                        &br, &sport, &dport, &fromaddr,
+                                        &linktype, ofilter, MATCH_OPPOSITE_ALWAYS, ifname, ifptr);
+                        if (pkt_result != PACKET_OK)
+                            continue;
+                }
+                if (fromaddr.sll_protocol == ETH_P_IP) {
                 ippacket = (struct iphdr *) packet;
                 iphlen = ippacket->ihl * 4;
+                    ip6packet = NULL;
+                    protocol = ippacket->protocol;
+                    frag_off = ippacket->frag_off;
+                } else {
+                    ip6packet = (struct ip6_hdr *) packet;
+                    iphlen = 40;
+                    ippacket = NULL;
+                    protocol = ip6packet->ip6_nxt;
+                    frag_off = 0;
+                }
                 transpacket = (struct tcphdr *) (packet + iphlen);
 
-                if (ippacket->protocol == IPPROTO_TCP) {
+        	if (protocol == IPPROTO_TCP) {
 
+                if (ippacket != NULL)
                     tcpentry =
                         in_table(&table, ippacket->saddr, ippacket->daddr,
-                                 ntohs(sport), ntohs(dport), ifname,
-                                 logging, logfile, &nomem, options);
+                            NULL , NULL,
+                            ntohs(sport), ntohs(dport), ifname,
+                            logging, logfile, &nomem, options);
+               else
+                   tcpentry = in_table(&table, 0, 0, (uint8_t*)(&ip6packet->ip6_src.s6_addr), (uint8_t*)(&ip6packet->ip6_dst.s6_addr),
+                             ntohs(sport), ntohs(dport), ifname,
+                             logging, logfile, &nomem, options);
 
                     /* 
                      * Add a new entry if it doesn't exist, and, 
                      * to reduce the chances of stales, not a FIN.
                      */
 
-                    if ((ntohs(ippacket->frag_off) & 0x3fff) == 0) {    /* first frag only */
+                    if ((ntohs(frag_off) & 0x3fff) == 0) {  /* first frag only */
                         totalhlen = iphlen + transpacket->doff * 4;
 
                         if ((tcpentry == NULL) && (!(transpacket->fin))) {
@@ -1084,17 +1118,26 @@ void ipmon(struct OPTIONS *options,
 
                             if (!nomem) {
                                 wasempty = (table.head == NULL);
+                                if (ippacket != NULL)
                                 tcpentry = addentry(&table, (unsigned long)
                                                     ippacket->saddr,
                                                     (unsigned long)
-                                                    ippacket->daddr, sport,
+                                                    ippacket->daddr,
+                                                    NULL, NULL, sport,
                                                     dport,
                                                     ippacket->protocol,
                                                     ifname, &revlook,
                                                     rvnfd,
                                                     options->servnames,
                                                     &nomem);
-
+                                else
+                                    tcpentry = addentry(&table, 0, 0,
+                                                 (uint8_t*)(&ip6packet->ip6_src.s6_addr),
+                                                 (uint8_t*)(&ip6packet->ip6_dst.s6_addr),
+                                                 sport, dport, ip6packet->ip6_nxt,
+                                                 ifname, &revlook,
+                                                 rvnfd, options->servnames,
+                                                 &nomem);
                                 if (tcpentry != NULL) {
                                     printentry(&table,
                                                tcpentry->oth_connection,
@@ -1152,12 +1195,18 @@ void ipmon(struct OPTIONS *options,
                                 p_sstat = tcpentry->s_fstat;
                                 p_dstat = tcpentry->d_fstat;
                             }
+                            if (ippacket != NULL)
                             updateentry(&table, tcpentry, transpacket,
                                         tpacket, linktype, readlen, br,
                                         ippacket->frag_off, logging,
                                         &revlook, rvnfd, options, logfile,
                                         &nomem);
-
+                            else
+                            updateentry(&table, tcpentry, transpacket, tpacket,
+                                     linktype, readlen,
+                                     readlen, 0, logging,
+                                     &revlook, rvnfd, options, logfile,
+                                     &nomem);
                             /*
                              * Log first packet of a TCP connection except if
                              * it's a RST, which was already logged earlier in
@@ -1213,7 +1262,7 @@ void ipmon(struct OPTIONS *options,
                                            screen_idx, mode);
                         }
                     }
-                } else {        /* now for the other IP protocols */
+            	} else if (ippacket != NULL) {
                     fragment = ((ntohs(ippacket->frag_off) & 0x1fff) != 0);
 
                     if (ippacket->protocol == IPPROTO_ICMP) {
@@ -1234,7 +1283,7 @@ void ipmon(struct OPTIONS *options,
 
                     othpent =
                         add_othp_entry(&othptbl, &table, ippacket->saddr,
-                                       ippacket->daddr, IS_IP,
+                                       ippacket->daddr, NULL, NULL, IS_IP,
                                        ippacket->protocol, linktype,
                                        (char *) tpacket,
                                        (char *) transpacket, readlen,
@@ -1242,6 +1291,21 @@ void ipmon(struct OPTIONS *options,
                                        options->timeout, logging, logfile,
                                        options->servnames, fragment,
                                        &nomem);
+
+            } else {
+                if (ip6packet->ip6_nxt == IPPROTO_ICMPV6) {
+            	    if (((struct icmp6_hdr *) transpacket)->icmp6_type == ICMP6_DST_UNREACH)
+                        process_dest_unreach(&table, (char *) transpacket,
+                            ifname, &nomem);
+                }
+                othpent =
+                    add_othp_entry(&othptbl, &table, 0, 0, &ip6packet->ip6_src,
+                                   &ip6packet->ip6_dst, IS_IP,
+                                   ip6packet->ip6_nxt, linktype,
+                                   (char *) tpacket, (char *) transpacket,
+                                   readlen, ifname, &revlook,
+                                   rvnfd, options->timeout, logging, logfile,
+                                   options->servnames, fragment, &nomem);
                 }
             }
         }
diff -up iptraf-3.0.1/src/landesc.c.ipv6 iptraf-3.0.1/src/landesc.c
--- iptraf-3.0.1/src/landesc.c.ipv6	2005-09-13 08:42:54.000000000 +0200
+++ iptraf-3.0.1/src/landesc.c	2008-09-02 13:57:02.000000000 +0200
@@ -208,7 +208,7 @@ void savedesclist(struct desclist *list,
     else if (linktype == LINK_FDDI)
         fd = fopen(FDDIFILE, "w");
 
-    if (fd < 0) {
+    if (fd <= 0) {
         etherr();
         return;
     }
diff -up iptraf-3.0.1/src/options.c.ipv6 iptraf-3.0.1/src/options.c
--- iptraf-3.0.1/src/options.c.ipv6	2005-09-13 08:42:54.000000000 +0200
+++ iptraf-3.0.1/src/options.c	2008-09-02 13:57:02.000000000 +0200
@@ -41,7 +41,7 @@ details.
 
 void makeoptionmenu(struct MENU *menu)
 {
-    tx_initmenu(menu, 19, 40, (LINES - 19) / 2 - 1, (COLS - 40) / 16,
+    tx_initmenu(menu, 20, 40, (LINES - 19) / 2 - 1, (COLS - 40) / 16,
                 BOXATTR, STDATTR, HIGHATTR, BARSTDATTR, BARHIGHATTR,
                 DESCATTR);
     tx_additem(menu, " ^R^everse DNS lookups",
@@ -58,6 +58,8 @@ void makeoptionmenu(struct MENU *menu)
                "Toggles activity indicators between kbits/s and kbytes/s");
     tx_additem(menu, " Source ^M^AC addrs in traffic monitor",
                "Toggles display of source MAC addresses in the IP Traffic Monitor");
+    tx_additem(menu, " ^S^how v6-in-v4 traffic as IPv6",
+               "Toggled display of IPv6 tunnel in IPv4 as IPv6 traffic");
     tx_additem(menu, NULL, NULL);
     tx_additem(menu, " ^T^imers...", "Configures timeouts and intervals");
     tx_additem(menu, NULL, NULL);
@@ -131,6 +133,8 @@ void indicatesetting(int row, struct OPT
     case 7:
         printoptonoff(options->mac, win);
         break;
+    case 8:
+        printoptonoff(options->v6inv4asv6, win);
     }
 
 }
@@ -168,6 +172,7 @@ void setdefaultopts(struct OPTIONS *opti
     options->logspan = 3600;
     options->updrate = 0;
     options->closedint = 0;
+    options->v6inv4asv6 = 1;
 }
 
 void loadoptions(struct OPTIONS *options)
@@ -189,17 +194,17 @@ void loadoptions(struct OPTIONS *options
 void updatetimes(struct OPTIONS *options, WINDOW * win)
 {
     wattrset(win, HIGHATTR);
-    mvwprintw(win, 9, 25, "%3u mins", options->timeout);
-    mvwprintw(win, 10, 25, "%3u mins", options->logspan / 60);
-    mvwprintw(win, 11, 25, "%3u secs", options->updrate);
-    mvwprintw(win, 12, 25, "%3u mins", options->closedint);
+    mvwprintw(win, 10, 25, "%3u mins", options->timeout);
+    mvwprintw(win, 11, 25, "%3u mins", options->logspan / 60);
+    mvwprintw(win, 12, 25, "%3u secs", options->updrate);
+    mvwprintw(win, 13, 25, "%3u mins", options->closedint);
 }
 
 void showoptions(struct OPTIONS *options, WINDOW * win)
 {
     int i;
 
-    for (i = 1; i <= 7; i++)
+    for (i = 1; i <= 8; i++)
         indicatesetting(i, options, win);
 
     updatetimes(options, win);
@@ -272,13 +277,13 @@ void setoptions(struct OPTIONS *options,
     }
     makeoptionmenu(&menu);
 
-    statwin = newwin(14, 35, (LINES - 19) / 2 - 1, (COLS - 40) / 16 + 40);
+    statwin = newwin(15, 35, (LINES - 19) / 2 - 1, (COLS - 40) / 16 + 40);
     statpanel = new_panel(statwin);
 
     wattrset(statwin, BOXATTR);
     tx_colorwin(statwin);
     tx_box(statwin, ACS_VLINE, ACS_HLINE);
-    wmove(statwin, 8, 1);
+    wmove(statwin, 9, 1);
     whline(statwin, ACS_HLINE, 33);
     mvwprintw(statwin, 0, 1, " Current Settings ");
     wattrset(statwin, STDATTR);
@@ -289,10 +294,11 @@ void setoptions(struct OPTIONS *options,
     mvwprintw(statwin, 5, 2, "Logging:");
     mvwprintw(statwin, 6, 2, "Activity mode:");
     mvwprintw(statwin, 7, 2, "MAC addresses:");
-    mvwprintw(statwin, 9, 2, "TCP timeout:");
-    mvwprintw(statwin, 10, 2, "Log interval:");
-    mvwprintw(statwin, 11, 2, "Update interval:");
-    mvwprintw(statwin, 12, 2, "Closed/idle persist:");
+    mvwprintw(statwin, 8, 2, "v6-in-v4 as IPv6:");
+    mvwprintw(statwin, 10, 2, "TCP timeout:");
+    mvwprintw(statwin, 11, 2, "Log interval:");
+    mvwprintw(statwin, 12, 2, "Update interval:");
+    mvwprintw(statwin, 13, 2, "Closed/idle persist:");
     showoptions(options, statwin);
 
     do {
@@ -321,7 +327,10 @@ void setoptions(struct OPTIONS *options,
         case 7:
             options->mac = ~(options->mac);
             break;
-        case 9:
+        case 8:
+            options->v6inv4asv6 = ~(options->v6inv4asv6);
+            break;
+        case 10:
             maketimermenu(&timermenu);
             trow = 1;
             do {
@@ -362,22 +371,22 @@ void setoptions(struct OPTIONS *options,
             update_panels();
             doupdate();
             break;
-        case 11:
+        case 12:
             addmoreports(ports);
             break;
-        case 12:
+        case 13:
             removeaport(ports);
             break;
-        case 14:
+        case 15:
             ethdescmgr(LINK_ETHERNET);
             break;
-        case 15:
+        case 16:
             ethdescmgr(LINK_FDDI);
             break;
         }
 
         indicatesetting(row, options, statwin);
-    } while (row != 17);
+    } while (row != 18);
 
     tx_destroymenu(&menu);
     del_panel(statpanel);
diff -up iptraf-3.0.1/src/options.h.ipv6 iptraf-3.0.1/src/options.h
--- iptraf-3.0.1/src/options.h.ipv6	2005-09-13 08:42:54.000000000 +0200
+++ iptraf-3.0.1/src/options.h	2008-09-02 13:57:02.000000000 +0200
@@ -2,7 +2,7 @@
 struct OPTIONS {
     unsigned int color:1,
         logging:1,
-        revlook:1, servnames:1, promisc:1, actmode:1, mac:1, dummy:9;
+        revlook:1, servnames:1, promisc:1, actmode:1, mac:1, v6inv4asv6:1, dummy:8;
     unsigned int timeout;
     unsigned int logspan;
     unsigned int updrate;
diff -up iptraf-3.0.1/src/othptab.c.ipv6 iptraf-3.0.1/src/othptab.c
--- iptraf-3.0.1/src/othptab.c.ipv6	2008-09-02 13:57:02.000000000 +0200
+++ iptraf-3.0.1/src/othptab.c	2008-09-02 13:57:02.000000000 +0200
@@ -23,6 +23,8 @@ details.
 #include <netinet/if_tr.h>
 #include <linux/netdevice.h>
 #include <netinet/if_fddi.h>
+#include <netinet/ip6.h>
+#include <netinet/icmp6.h>
 #include <winops.h>
 #include "arphdr.h"
 #include "options.h"
@@ -82,16 +84,12 @@ void process_dest_unreach(struct tcptabl
                           char *ifname, int *nomem)
 {
     struct iphdr *ip;
+    struct ip6_hdr *ip6;
     struct tcphdr *tcp;
     struct tcptableent *tcpentry;
 
     ip = (struct iphdr *) (packet + 8);
 
-    if (ip->protocol != IPPROTO_TCP)
-        return;
-
-    tcp = (struct tcphdr *) (packet + 8 + (ip->ihl * 4));
-
     /* 
      * We really won't be making use of nomem here.  Timeout checking
      * won't be performed either, so we just pass NULL as the pointer
@@ -99,9 +97,23 @@ void process_dest_unreach(struct tcptabl
      * and set its internal timeout variable to 0.
      */
 
-    tcpentry = in_table(table, ip->saddr, ip->daddr,
+    if (ip->version == 6)
+    {
+       ip6 = (struct ip6_hdr *) (packet + 8);
+       if (ip6->ip6_nxt != IPPROTO_TCP)
+           return;
+       tcp = (struct tcphdr *) (packet + 48);
+       tcpentry = in_table(table, 0, 0, ip6->ip6_src.s6_addr, ip6->ip6_dst.s6_addr,
                         ntohs(tcp->source), ntohs(tcp->dest), ifname,
                         0, NULL, nomem, NULL);
+    } else {
+        if (ip->protocol != IPPROTO_TCP)
+            return;
+        tcp = (struct tcphdr *) (packet + 8 + (ip->ihl * 4));
+        tcpentry = in_table(table, ip->saddr, ip->daddr, NULL, NULL,
+                        ntohs(tcp->source), ntohs(tcp->dest), ifname,
+                        0, NULL, nomem, NULL);
+    }
 
     if (tcpentry != NULL) {
         tcpentry->stat = tcpentry->oth_connection->stat = FLAG_RST;
@@ -112,6 +124,7 @@ void process_dest_unreach(struct tcptabl
 struct othptabent *add_othp_entry(struct othptable *table,
                                   struct tcptable *tcptab,
                                   unsigned long saddr, unsigned long daddr,
+				  struct in6_addr *s6addr, struct in6_addr *d6addr,
                                   int is_ip, int protocol,
                                   unsigned short linkproto, char *packet,
                                   char *packet2, unsigned int br,
@@ -158,10 +171,18 @@ struct othptabent *add_othp_entry(struct
     if (is_ip) {
         new_entry->saddr = isaddr.s_addr = saddr;
         new_entry->daddr = idaddr.s_addr = daddr;
-
-        revname(rev_lookup, &isaddr, new_entry->s_fqdn, rvnfd);
-        revname(rev_lookup, &idaddr, new_entry->d_fqdn, rvnfd);
-
+        if (s6addr != NULL)
+            memcpy(&new_entry->s6addr, s6addr, 16);
+        else
+            memset(&new_entry->s6addr, 0, 16);
+
+        if (d6addr != NULL)
+            memcpy(&new_entry->d6addr, d6addr, 16);
+        else
+            memset(&new_entry->s6addr, 0, 16);
+ 
+        revname(rev_lookup, &isaddr, s6addr, new_entry->s_fqdn, rvnfd);
+        revname(rev_lookup, &idaddr, d6addr, new_entry->d_fqdn, rvnfd);
         if (!fragment) {
             if (protocol == IPPROTO_ICMP) {
                 new_entry->un.icmp.type =
@@ -420,6 +441,14 @@ void printothpentry(struct othptable *ta
         wattrset(table->othpwin, GREATTR);
         strcpy(protname, "GRE");
         break;
+     case IPPROTO_ICMPV6:
+        wattrset(table->othpwin, ICMPV6ATTR);
+        strcpy(protname, "ICMPv6");
+        break;
+     case IPPROTO_IPV6:
+        wattrset(table->othpwin, IPV6ATTR);
+        strcpy(protname, "IPv6 tun");
+        break;
     default:
         wattrset(table->othpwin, UNKNIPATTR);
         protptr = getprotobynumber(entry->protocol);
@@ -525,7 +554,71 @@ void printothpentry(struct othptable *ta
                 strcpy(description, "bad/unkn");
                 break;
             }
-
+        } else if (entry->protocol == IPPROTO_ICMPV6) {
+            switch (entry->un.icmp6.type) {
+            case ICMP6_DST_UNREACH:
+                strcpy(description, "dest unrch");
+                switch (entry->un.icmp6.code) {
+                case ICMP6_DST_UNREACH_NOROUTE:
+                    strcpy(additional, "no route");
+                    break;
+                case ICMP6_DST_UNREACH_ADMIN:
+                    strcpy(additional, "admin");
+                    break;
+                case ICMP6_DST_UNREACH_NOTNEIGHBOR:
+                    strcpy(additional, "not neigh");
+                    break;
+                case ICMP6_DST_UNREACH_ADDR:
+                    strcpy(additional, "unreach addr");
+                    break;
+                case ICMP6_DST_UNREACH_NOPORT:
+                    strcpy(additional, "no port");
+                    break;
+                }
+                break;
+    	    case ICMP6_PACKET_TOO_BIG:
+            	strcpy(description, "pkt too big");
+                break;
+	    case ICMP6_TIME_EXCEEDED:
+    	        strcpy(description, "time exceeded");
+    		break;
+            case ICMP6_PARAM_PROB:
+	        strcpy(description, "param prob");
+    	        break;
+            case ICMP6_ECHO_REQUEST:
+                strcpy(description, "echo req");
+                break;
+            case ICMP6_ECHO_REPLY:
+                strcpy(description, "echo rply");
+                break;
+            case ND_ROUTER_SOLICIT:
+                strcpy(description, "router sol");
+                break;
+            case ND_ROUTER_ADVERT:
+                strcpy(description, "router adv");
+                break;
+            case ICMP6_MEMBERSHIP_QUERY:
+                strcpy(description, "mbrship query");
+                break;
+            case ICMP6_MEMBERSHIP_REPORT:
+                strcpy(description, "mbrship report");
+                break;
+            case ICMP6_MEMBERSHIP_REDUCTION:
+                strcpy(description, "mbrship reduc");
+                break;
+            case ND_NEIGHBOR_SOLICIT:
+                strcpy(description, "neigh sol");
+                break;
+            case ND_NEIGHBOR_ADVERT:
+                strcpy(description, "neigh adv");
+                break;
+            case ND_REDIRECT:
+                strcpy(description, "redirect");
+                break;
+            default:
+                strcpy(description, "bad/unkn");
+        	break;
+            }
         } else if (entry->protocol == IPPROTO_OSPFIGP) {
             switch (entry->un.ospf.type) {
             case OSPF_TYPE_HELLO:
@@ -569,11 +662,11 @@ void printothpentry(struct othptable *ta
     strcat(msgstring, scratchpad);
 
     if ((entry->protocol == IPPROTO_UDP) && (!(entry->fragment))) {
-        sprintf(scratchpad, "from %.25s:%s to %.25s:%s",
+        sprintf(scratchpad, "from %.40s:%s to %.40s:%s",
                 entry->s_fqdn, entry->un.udp.s_sname,
                 entry->d_fqdn, entry->un.udp.d_sname);
     } else {
-        sprintf(scratchpad, "from %.25s to %.25s", entry->s_fqdn,
+        sprintf(scratchpad, "from %.40s to %.40s", entry->s_fqdn,
                 entry->d_fqdn);
     }
 
diff -up iptraf-3.0.1/src/othptab.h.ipv6 iptraf-3.0.1/src/othptab.h
--- iptraf-3.0.1/src/othptab.h.ipv6	2005-09-13 08:42:54.000000000 +0200
+++ iptraf-3.0.1/src/othptab.h	2008-09-02 13:57:02.000000000 +0200
@@ -34,6 +34,8 @@ Copyright (c) Gerard Paul Java 1997
 struct othptabent {
     unsigned long int saddr;
     unsigned long int daddr;
+    struct in6_addr s6addr;
+    struct in6_addr d6addr;
     char smacaddr[15];
     char dmacaddr[15];
     unsigned short linkproto;
@@ -69,6 +71,10 @@ struct othptabent {
             char src_mac_address[6];
             char dest_mac_address[6];
         } rarp;
+        struct {
+            uint8_t     type;
+            uint8_t     code;
+        } icmp6;	
     } un;
     unsigned int type;
     unsigned int code;
@@ -133,9 +139,9 @@ void process_dest_unreach(struct tcptabl
 struct othptabent *add_othp_entry(struct othptable *table,
                                   struct tcptable *tcptab,
                                   unsigned long saddr,
-                                  unsigned long daddr, int is_ip,
-                                  int protocol, unsigned short linkproto,
-                                  char *packet, char *netpacket,
+                                  unsigned long daddr, struct in6_addr *s6addr,
+				  struct in6_addr *d6addr, int is_ip, int protocol, 
+				  unsigned short linkproto, char *packet, char *netpacket,
                                   unsigned int br, char *ifname,
                                   int *rev_lookup, int rvnamedon,
                                   unsigned int tm, int logging,
diff -up iptraf-3.0.1/src/packet.c.ipv6 iptraf-3.0.1/src/packet.c
--- iptraf-3.0.1/src/packet.c.ipv6	2007-09-25 11:21:18.000000000 +0200
+++ iptraf-3.0.1/src/packet.c	2008-09-02 13:57:02.000000000 +0200
@@ -28,6 +28,7 @@ details.
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
+#include <netinet/ip6.h>
 #include <netinet/tcp.h>
 #include <sys/time.h>
 #include <net/if_arp.h>
@@ -303,6 +304,7 @@ int processpacket(char *tpacket, char **
 {
     static char aligned_buf[ALIGNED_BUF_LEN];
     struct iphdr *ip;
+    struct ip6_hdr *ip6;
     int hdr_check;
     register int ip_checksum;
     register int iphlen;
@@ -356,7 +358,7 @@ int processpacket(char *tpacket, char **
      * Apply non-IP packet filter
      */
 
-    if (fromaddr->sll_protocol != ETH_P_IP) {
+    if ((fromaddr->sll_protocol != ETH_P_IP) && (fromaddr->sll_protocol != ETH_P_IPV6)) {
         if ((fromaddr->sll_protocol == ETH_P_ARP) ||
             (fromaddr->sll_protocol == ETH_P_RARP)) {
             if (!nonipfilter(filter, fromaddr->sll_protocol)) {
@@ -370,9 +372,7 @@ int processpacket(char *tpacket, char **
         return PACKET_OK;
     }
 
-    /*
-     * TODO: Insert IPv6 processing code here
-     */
+    if (fromaddr->sll_protocol == ETH_P_IP) {
 
     /*
      * At this point, we're now processing IP packets.  Start by getting
@@ -389,7 +389,7 @@ int processpacket(char *tpacket, char **
     ip->check = 0;
     hdr_check = in_cksum((u_short *) ip, iphlen);
 
-    if (hdr_check != ip_checksum)
+    if ((hdr_check != ip_checksum))
         return CHECKSUM_ERROR;
 
     if ((ip->protocol == IPPROTO_TCP || ip->protocol == IPPROTO_UDP) &&
@@ -453,9 +453,28 @@ int processpacket(char *tpacket, char **
                                            ip->protocol, match_opposite,
                                            &(filter->fl))))
             return PACKET_FILTERED;
-    }
-
-    return PACKET_OK;
+      }
+      return PACKET_OK;
+     }
+     else if (fromaddr->sll_protocol == ETH_P_IPV6) {
+       ip6 = (struct ip6_hdr *) (*packet);
+       iphlen = 40;
+       //TODO: Filter packets
+       if (ip6->ip6_nxt == IPPROTO_TCP) {
+           in_ip.tcp = (struct tcphdr *) ((char *) ip6 + iphlen);
+           if (sport != NULL)
+               *sport = in_ip.tcp->source;
+           if (dport != NULL)
+               *dport = in_ip.tcp->dest;
+       } else if (ip6->ip6_nxt == IPPROTO_UDP) {
+           in_ip.udp = (struct udphdr *) ((char *) ip6 + iphlen);
+           if (sport != NULL)
+               *sport = in_ip.udp->source;
+           if (dport != NULL)
+               *dport = in_ip.udp->dest;
+       }
+     }
+     return PACKET_OK;
 }
 
 void pkt_cleanup(void)
diff -up iptraf-3.0.1/src/revname.c.ipv6 iptraf-3.0.1/src/revname.c
--- iptraf-3.0.1/src/revname.c.ipv6	2005-09-13 08:42:54.000000000 +0200
+++ iptraf-3.0.1/src/revname.c	2008-09-02 13:57:02.000000000 +0200
@@ -153,7 +153,7 @@ void close_rvn_socket(int fd)
     }
 }
 
-int revname(int *lookup, struct in_addr *saddr, char *target, int rvnfd)
+int revname(int *lookup, struct in_addr *saddr, struct in6_addr *s6addr, char *target, int rvnfd)
 {
     struct hostent *he;
     struct rvn rpkt;
@@ -173,6 +173,11 @@ int revname(int *lookup, struct in_addr 
             rpkt.type = RVN_REQUEST;
             rpkt.saddr.s_addr = saddr->s_addr;
 
+           if (s6addr != NULL)
+               memcpy(rpkt.s6addr.s6_addr, s6addr->s6_addr, 16);
+           else
+               memset(rpkt.s6addr.s6_addr, 0, 4);
+
             sendto(rvnfd, &rpkt, sizeof(struct rvn), 0,
                    (struct sockaddr *) &su,
                    sizeof(su.sun_family) + strlen(su.sun_path));
@@ -197,7 +202,10 @@ int revname(int *lookup, struct in_addr 
             } while ((br < 0) && (errno == EINTR));
 
             if (br < 0) {
+                if (saddr->s_addr != 0)
                 strcpy(target, inet_ntoa(*saddr));
+                else
+                    inet_ntop(AF_INET6, s6addr, target, 44);
                 printipcerr();
                 *lookup = 0;
                 return RESOLVED;
@@ -205,18 +213,26 @@ int revname(int *lookup, struct in_addr 
             strncpy(target, rpkt.fqdn, 44);
             return (rpkt.ready);
         } else {
-            he = gethostbyaddr((char *) saddr,
-                               sizeof(struct in_addr), AF_INET);
+           if (saddr->s_addr != 0)
+               he = gethostbyaddr((char *) saddr, sizeof(struct in_addr), AF_INET);
+           else
+               he = gethostbyaddr((char *) s6addr, sizeof(struct in6_addr), AF_INET6);
 
-            if (he == NULL)
+            if (he == NULL) {
+                if (saddr->s_addr != 0)
                 strcpy(target, inet_ntoa(*saddr));
             else
+                inet_ntop(AF_INET6, s6addr, target, 44);
+            } else {
                 strncpy(target, he->h_name, 44);
+            }
 
             return RESOLVED;
         }
     } else {
-        strcpy(target, inet_ntoa(*saddr));
-        return RESOLVED;
+        if (saddr->s_addr != 0 || s6addr == NULL)
+            strcpy(target, inet_ntoa(*saddr));
+        else
+            inet_ntop(AF_INET6, s6addr, target, 44);
     }
 }
diff -up iptraf-3.0.1/src/revname.h.ipv6 iptraf-3.0.1/src/revname.h
--- iptraf-3.0.1/src/revname.h.ipv6	2005-09-13 08:42:54.000000000 +0200
+++ iptraf-3.0.1/src/revname.h	2008-09-02 13:57:02.000000000 +0200
@@ -8,4 +8,5 @@ int rvnamedactive();
 int killrvnamed();
 void open_rvn_socket(int *fd);
 void close_rvn_socket(int fd);
-int revname(int *lookup, struct in_addr *saddr, char *target, int rvnfd);
+
+int revname(int *lookup, struct in_addr *saddr, struct in6_addr *s6addr, char *target, int rvnfd);
diff -up iptraf-3.0.1/src/rvnamed.c.ipv6 iptraf-3.0.1/src/rvnamed.c
--- iptraf-3.0.1/src/rvnamed.c.ipv6	2005-09-13 08:42:54.000000000 +0200
+++ iptraf-3.0.1/src/rvnamed.c	2008-09-02 13:57:02.000000000 +0200
@@ -55,6 +55,7 @@ details.
 
 struct hosts {
     unsigned long addr;
+    uint8_t addr6[16];
     char fqdn[45];
     int ready;
 };
@@ -93,12 +94,17 @@ void process_rvn_packet(struct rvn *rvnp
 
     ccfd = socket(PF_UNIX, SOCK_DGRAM, 0);
 
-    he = gethostbyaddr((char *) &(rvnpacket->saddr),
-                       sizeof(struct in_addr), AF_INET);
+    if (rvnpacket->saddr.s_addr != 0)
+       he = gethostbyaddr((char *) &(rvnpacket->saddr), sizeof(struct in_addr), AF_INET);
+    else
+       he = gethostbyaddr((char *) &(rvnpacket->s6addr), sizeof(struct in6_addr), AF_INET6);
 
-    if (he == NULL)
+    if (he == NULL) {
+      if (rvnpacket->saddr.s_addr != 0)
         strcpy(rvnpacket->fqdn, inet_ntoa(rvnpacket->saddr));
-    else {
+      else
+           inet_ntop(AF_INET6, &(rvnpacket->s6addr), rvnpacket->fqdn, sizeof(rvnpacket->fqdn));
+    } else {
         bzero(rvnpacket->fqdn, 45);
         strncpy(rvnpacket->fqdn, he->h_name, 44);
     }
@@ -122,10 +128,14 @@ int name_resolved(struct rvn *rvnpacket,
     unsigned int i = 0;
 
     while (i != lastfree) {
+        if (rvnpacket->saddr.s_addr != 0) {
         if ((rvnpacket->saddr.s_addr == hostlist[i].addr)
             && (hostlist[i].ready == RESOLVED))
             return i;
-
+        } else {
+            if (!memcmp(rvnpacket->s6addr.s6_addr, hostlist[i].addr6, sizeof(hostlist[i].addr6)))
+            return i;
+        }
         i++;
     }
 
@@ -300,7 +310,8 @@ int main(void)
                 hi = 0;
 
                 while (hi <= lastfree) {
-                    if (hostlist[hi].addr == rvnpacket.saddr.s_addr)
+                    if ((hostlist[hi].addr == rvnpacket.saddr.s_addr) &&
+                        !memcmp(rvnpacket.s6addr.s6_addr, hostlist[hi].addr6, sizeof(hostlist[hi].addr6)))
                         break;
                     hi++;
                 }
@@ -313,6 +324,7 @@ int main(void)
                         hostindex = 0;
 
                     hostlist[hi].addr = rvnpacket.saddr.s_addr;
+                    memcpy(hostlist[hi].addr6, rvnpacket.s6addr.s6_addr, sizeof(hostlist[hi].addr6));
                 }
                 strncpy(hostlist[hi].fqdn, rvnpacket.fqdn, 44);
 
@@ -400,6 +412,8 @@ int main(void)
                                  */
                                 hostlist[hostindex].addr =
                                     rvnpacket.saddr.s_addr;
+                                memcpy(hostlist[hostindex].addr6, rvnpacket.s6addr.s6_addr,
+                                        sizeof(hostlist[hostindex].addr6));
                                 hostlist[hostindex].ready = RESOLVING;
 
                                 maxlogged = 0;
@@ -455,7 +469,10 @@ int main(void)
                         }
                         rvnpacket.type = RVN_REPLY;
                         bzero(rvnpacket.fqdn, 45);
+                        if (rvnpacket.saddr.s_addr != 0)
                         strcpy(rvnpacket.fqdn, inet_ntoa(rvnpacket.saddr));
+                        else
+                            inet_ntop(AF_INET6, &rvnpacket.s6addr, rvnpacket.fqdn, sizeof(rvnpacket.fqdn));
                         rvnpacket.ready = RESOLVING;
 
                         br = sendto(ifd, &rvnpacket, sizeof(struct rvn), 0,
diff -up iptraf-3.0.1/src/rvnamed.h.ipv6 iptraf-3.0.1/src/rvnamed.h
--- iptraf-3.0.1/src/rvnamed.h.ipv6	2005-09-13 08:42:54.000000000 +0200
+++ iptraf-3.0.1/src/rvnamed.h	2008-09-02 13:57:02.000000000 +0200
@@ -22,5 +22,6 @@ struct rvn {
     int type;
     int ready;
     struct in_addr saddr;
+    struct in6_addr s6addr;
     char fqdn[45];
 };
diff -up iptraf-3.0.1/src/serv.c.ipv6 iptraf-3.0.1/src/serv.c
--- iptraf-3.0.1/src/serv.c.ipv6	2005-09-13 08:42:54.000000000 +0200
+++ iptraf-3.0.1/src/serv.c	2008-09-02 13:57:02.000000000 +0200
@@ -31,6 +31,7 @@ details.
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
+#include <netinet/ip6.h>
 #include <netinet/udp.h>
 #include <linux/if_packet.h>
 #include <linux/if_ether.h>
@@ -1032,6 +1033,8 @@ void servmon(char *ifname, struct portta
             if (pkt_result != PACKET_OK)
                 continue;
 
+	    if (fromaddr.sll_protocol == ETH_P_IP) {
+
             if ((((struct iphdr *) ipacket)->protocol == IPPROTO_TCP)
                 || (((struct iphdr *) ipacket)->protocol == IPPROTO_UDP)) {
                 updateportent(&list, ((struct iphdr *) ipacket)->protocol,
@@ -1049,6 +1052,26 @@ void servmon(char *ifname, struct portta
                 }
             }
         }
+        } else {
+            if ((((struct ip6_hdr *) ipacket)->ip6_nxt == IPPROTO_TCP)
+                || (((struct ip6_hdr *) ipacket)->ip6_nxt ==
+                    IPPROTO_UDP)) {
+                updateportent(&list, ((struct ip6_hdr *) ipacket)->ip6_nxt,
+                    ntohs(sport),
+                    ntohs(((struct ip6_hdr *) ipacket)->ip6_plen + 40),
+                    idx, 0, ports, options->servnames);
+                updateportent(&list, ((struct ip6_hdr *) ipacket)->ip6_nxt,
+                    ntohs(dport),
+                    ntohs(((struct ip6_hdr *) ipacket)->ip6_plen + 40),
+                    idx, 1, ports, options->servnames);
+                if ((list.barptr == NULL) && (list.head != NULL)) {
+                    set_barptr((char **) &(list.barptr), (char *) list.head,
+                        &(list.head->starttime), (char *) &(list.head->spans),
+                        sizeof(struct serv_spans), statwin, &statcleared, statx);
+                    list.baridx = 1;
+                }
+            }
+        }
     }
 
     if (logging) {
diff -up iptraf-3.0.1/src/tcptable.c.ipv6 iptraf-3.0.1/src/tcptable.c
--- iptraf-3.0.1/src/tcptable.c.ipv6	2005-09-13 08:42:54.000000000 +0200
+++ iptraf-3.0.1/src/tcptable.c	2008-09-02 13:57:02.000000000 +0200
@@ -59,8 +59,8 @@ void setlabels(WINDOW * win, int mode)
  * The hash function for the TCP hash table
  */
 
-unsigned int tcp_hash(unsigned long saddr, unsigned int sport,
-                      unsigned long daddr, unsigned int dport,
+unsigned int tcp_hash(unsigned long saddr, uint32_t *s6addr, unsigned int sport,
+                      unsigned long daddr, uint32_t *d6addr, unsigned int dport,
                       char *ifname)
 {
     int i;
@@ -69,6 +69,13 @@ unsigned int tcp_hash(unsigned long sadd
     for (i = 0; i <= strlen(ifname) - 1; i++)
         ifsum += ifname[i];
 
+    if (s6addr != 0 && d6addr != 0) {
+       for (i = 0; i < 4; i++) {
+               saddr ^= s6addr[i];
+               daddr ^= d6addr[i];
+       }
+    }
+
     return ((ifsum + (4 * saddr) + (3 * sport) +
              (2 * daddr) + dport) % ENTRIES_IN_HASH_TABLE);
 }
@@ -139,8 +146,8 @@ int add_tcp_hash_entry(struct tcptable *
     unsigned int hp;            /* hash position in table */
     struct tcp_hashentry *ptmp;
 
-    hp = tcp_hash(entry->saddr.s_addr, entry->sport,
-                  entry->daddr.s_addr, entry->dport, entry->ifname);
+    hp = tcp_hash(entry->saddr.s_addr, entry->s6addr.s6_addr32, entry->sport,
+                  entry->daddr.s_addr, entry->d6addr.s6_addr32, entry->dport, entry->ifname);
 
     ptmp = malloc(sizeof(struct tcp_hashentry));
     bzero(ptmp, sizeof(struct tcp_hashentry));
@@ -215,6 +222,8 @@ void del_tcp_hash_node(struct tcptable *
 struct tcptableent *addentry(struct tcptable *table,
                              unsigned long int saddr,
                              unsigned long int daddr,
+                             uint8_t *s6addr,
+                             uint8_t *d6addr,
                              unsigned int sport, unsigned int dport,
                              int protocol,
                              char *ifname, int *rev_lookup,
@@ -311,8 +320,22 @@ struct tcptableent *addentry(struct tcpt
 
     new_entry->saddr.s_addr = new_entry->oth_connection->daddr.s_addr =
         saddr;
+    if (s6addr == NULL) {
+        memset(&new_entry->s6addr, 0, 16);
+	memset(&new_entry->oth_connection->d6addr, 0, 16);
+    } else {
+        memcpy(&new_entry->s6addr, s6addr, 16);
+        memcpy(&new_entry->oth_connection->d6addr, s6addr, 16);
+    }
     new_entry->daddr.s_addr = new_entry->oth_connection->saddr.s_addr =
         daddr;
+    if (d6addr == NULL) {
+       memset(&new_entry->d6addr, 0, 16);
+       memset(&new_entry->oth_connection->s6addr, 0, 16);
+    } else {
+       memcpy(&new_entry->d6addr, d6addr, 16);
+       memcpy(&new_entry->oth_connection->s6addr, d6addr, 16);
+    }
     new_entry->protocol = protocol;
 
     /*
@@ -349,9 +372,10 @@ struct tcptableent *addentry(struct tcpt
 
     new_entry->stat = new_entry->oth_connection->stat = 0;
 
-    new_entry->s_fstat = revname(rev_lookup, &(new_entry->saddr),
+    new_entry->s_fstat = revname(rev_lookup, &(new_entry->saddr), &new_entry->s6addr,
                                  new_entry->s_fqdn, rvnfd);
-    new_entry->d_fstat = revname(rev_lookup, &(new_entry->daddr),
+
+    new_entry->d_fstat = revname(rev_lookup, &(new_entry->daddr), &new_entry->d6addr,
                                  new_entry->d_fqdn, rvnfd);
 
     /*
@@ -490,7 +514,8 @@ void write_timeout_log(int logging, FILE
 }
 
 struct tcptableent *in_table(struct tcptable *table, unsigned long saddr,
-                             unsigned long daddr, unsigned int sport,
+                             unsigned long daddr, uint8_t *s6addr,
+                             uint8_t *d6addr, unsigned int sport,
                              unsigned int dport, char *ifname,
                              int logging, FILE * logfile,
                              int *nomem, struct OPTIONS *opts)
@@ -503,6 +528,9 @@ struct tcptableent *in_table(struct tcpt
     time_t now;
     time_t timeout;
 
+    int sfree = 0;
+    int dfree = 0;
+
     if (opts != NULL)
         timeout = opts->timeout;
     else
@@ -515,12 +543,24 @@ struct tcptableent *in_table(struct tcpt
      * Determine hash table index for this set of addresses and ports
      */
 
-    hp = tcp_hash(saddr, sport, daddr, dport, ifname);
+    hp = tcp_hash(saddr, (uint32_t*) s6addr, sport, daddr, (uint32_t*) d6addr, dport, ifname);
     hashptr = table->hash_table[hp];
 
+    if (s6addr == NULL) {
+       s6addr = malloc(sizeof(struct in6_addr));
+       memset(s6addr, 0, 16);
+       sfree = 1;
+    }
+    if (d6addr == NULL) {
+       d6addr = malloc(sizeof(struct in6_addr));
+       memset(d6addr, 0, 16);
+       dfree = 1;
+    }
     while (hashptr != NULL) {
         if ((hashptr->tcpnode->saddr.s_addr == saddr) &&
+            (!memcmp(&hashptr->tcpnode->s6addr.s6_addr, s6addr, 16)) &&
             (hashptr->tcpnode->daddr.s_addr == daddr) &&
+            (!memcmp(&hashptr->tcpnode->d6addr.s6_addr, d6addr, 16)) &&
             (hashptr->tcpnode->sport == sport) &&
             (hashptr->tcpnode->dport == dport) &&
             (strcmp(hashptr->tcpnode->ifname, ifname) == 0))
@@ -549,6 +589,9 @@ struct tcptableent *in_table(struct tcpt
         hashptr = hashptr->next_entry;
     }
 
+    if (sfree) free(s6addr);
+    if (dfree) free(d6addr);
+
     if (hashptr != NULL) {      /* needed to avoid SIGSEGV */
         if ((((hashptr->tcpnode->finsent == 2) &&
               (hashptr->tcpnode->oth_connection->finsent == 2))) ||
@@ -579,13 +622,13 @@ void updateentry(struct tcptable *table,
     char newmacaddr[15];
 
     if (tableentry->s_fstat != RESOLVED) {
-        tableentry->s_fstat = revname(revlook, &(tableentry->saddr),
+        tableentry->s_fstat = revname(revlook, &(tableentry->saddr), &(tableentry->s6addr),
                                       tableentry->s_fqdn, rvnfd);
         strcpy(tableentry->oth_connection->d_fqdn, tableentry->s_fqdn);
         tableentry->oth_connection->d_fstat = tableentry->s_fstat;
     }
     if (tableentry->d_fstat != RESOLVED) {
-        tableentry->d_fstat = revname(revlook, &(tableentry->daddr),
+       tableentry->d_fstat = revname(revlook, &(tableentry->daddr), &(tableentry->d6addr),
                                       tableentry->d_fqdn, rvnfd);
         strcpy(tableentry->oth_connection->s_fqdn, tableentry->d_fqdn);
         tableentry->oth_connection->s_fstat = tableentry->d_fstat;
diff -up iptraf-3.0.1/src/tcptable.h.ipv6 iptraf-3.0.1/src/tcptable.h
--- iptraf-3.0.1/src/tcptable.h.ipv6	2008-09-02 13:57:02.000000000 +0200
+++ iptraf-3.0.1/src/tcptable.h	2008-09-02 13:57:02.000000000 +0200
@@ -47,6 +47,8 @@
 struct tcptableent {
     struct in_addr saddr;
     struct in_addr daddr;
+    struct in6_addr s6addr;
+    struct in6_addr d6addr;
     char s_fqdn[45];            /* fully-qualified domain names */
     char d_fqdn[45];
     int s_fstat;
@@ -121,6 +123,7 @@ void init_tcp_table(struct tcptable *tab
 struct tcptableent *addentry(struct tcptable *table,
                              unsigned long int saddr,
                              unsigned long int daddr,
+                             uint8_t *s6addr, uint8_t *d6addr,
                              unsigned int sport, unsigned int dport,
                              int protocol,
                              char *ifname, int *rev_lookup, int rvnamedon,
@@ -128,6 +131,7 @@ struct tcptableent *addentry(struct tcpt
 
 struct tcptableent *in_table(struct tcptable *table,
                              unsigned long saddr, unsigned long daddr,
+                             uint8_t *s6addr, uint8_t *d6addr,
                              unsigned int sport, unsigned int dport,
                              char *ifname,
                              int logging, FILE * logfile, int *nomem,

iptraf-3.0.0-ifname.patch:

Index: iptraf-3.0.0-ifname.patch
===================================================================
RCS file: /cvs/extras/rpms/iptraf/devel/iptraf-3.0.0-ifname.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iptraf-3.0.0-ifname.patch	15 Apr 2008 09:26:22 -0000	1.1
+++ iptraf-3.0.0-ifname.patch	2 Sep 2008 12:39:04 -0000	1.2
@@ -59,7 +59,7 @@
 +    char ifname[18];
      unsigned int encap;
      unsigned long long iptotal;
-     unsigned long badtotal;
+     unsigned long long ip6total;
 --- ./src/iptraf.c.old	2007-01-31 12:20:24.000000000 -0800
 +++ ./src/iptraf.c	2007-01-31 12:23:19.000000000 -0800
 @@ -235,7 +235,7 @@

iptraf-3.0.1-incltypes.patch:

Index: iptraf-3.0.1-incltypes.patch
===================================================================
RCS file: /cvs/extras/rpms/iptraf/devel/iptraf-3.0.1-incltypes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iptraf-3.0.1-incltypes.patch	2 Nov 2007 12:19:38 -0000	1.1
+++ iptraf-3.0.1-incltypes.patch	2 Sep 2008 12:39:05 -0000	1.2
@@ -13,8 +13,8 @@
 --- iptraf-3.0.1/src/serv.c.old	2007-11-02 12:50:04.000000000 +0100
 +++ iptraf-3.0.1/src/serv.c	2007-11-02 12:50:25.000000000 +0100
 @@ -32,6 +32,7 @@ details.
- #include <netinet/in.h>
  #include <netinet/ip.h>
+ #include <netinet/ip6.h>
  #include <netinet/udp.h>
 +#include <linux/types.h>
  #include <linux/if_packet.h>


Index: iptraf.spec
===================================================================
RCS file: /cvs/extras/rpms/iptraf/devel/iptraf.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- iptraf.spec	5 Jun 2008 13:42:59 -0000	1.32
+++ iptraf.spec	2 Sep 2008 12:39:05 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: A console-based network monitoring utility
 Name: iptraf
 Version: 3.0.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: ftp://iptraf.seul.org/pub/iptraf/%{name}-%{version}.tar.gz
 Source1: iptraf 
 URL: http://iptraf.seul.org
@@ -16,7 +16,7 @@
 Patch9: iptraf-3.0.1-incltypes.patch
 Patch10: iptraf-3.0.0-ifname.patch
 Patch11: iptraf-3.0.0-interface.patch
-Patch12: iptraf-3.0.0-ipv6.patch
+Patch12: iptraf-3.0.1-ipv6.patch
 Patch13: iptraf-3.0.1-ipv6-fix.patch
 License: GPLv2+
 Group: Applications/System
@@ -44,7 +44,7 @@
 %prep
 %setup -q 
 %patch7 -p1 -b .compile
-%patch12 -p2 -b .ipv6
+%patch12 -p1 -b .ipv6
 %patch13 -p1 -b .ipv6-fix
 %patch0 -p1 -b .Makefile
 %patch1 -p1 -b .install
@@ -98,6 +98,9 @@
 %dir %attr(644,root,root) %config(noreplace) /etc/logrotate.d/iptraf
 
 %changelog
+* Tue Sep 02 2008 Zdenek Prikryl <zprikryl at redhat.com> - 3.0.1-6
+- Minor fixes in patches ipv6, incltypes and ifname
+
 * Thu Jun 05 2008 Zdenek Prikryl <zprikryl at redhat.com> - 3.0.1-5
 - Added support for ipv6 (#200503)
 - Fixed vlan support (#219772)


--- iptraf-3.0.0-ipv6.patch DELETED ---



From zprikryl at fedoraproject.org  Tue Sep  2 12:43:06 2008
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Tue,  2 Sep 2008 12:43:06 +0000 (UTC)
Subject: rpms/mtr/devel mtr-0.71-underflow.patch,1.1,1.2 mtr.spec,1.43,1.44
Message-ID: <20080902124306.370277011D@cvs1.fedora.phx.redhat.com>

Author: zprikryl

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

Modified Files:
	mtr-0.71-underflow.patch mtr.spec 
Log Message:
Minor fix in the patch underflow


mtr-0.71-underflow.patch:

Index: mtr-0.71-underflow.patch
===================================================================
RCS file: /cvs/extras/rpms/mtr/devel/mtr-0.71-underflow.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mtr-0.71-underflow.patch	30 May 2006 08:47:56 -0000	1.1
+++ mtr-0.71-underflow.patch	2 Sep 2008 12:42:35 -0000	1.2
@@ -11,4 +11,4 @@
 +  
    if ( addrcmp( (void *) &(host[index].addr),
  		(void *) &unspec_addr, af ) == 0 ) {
-     // should be out of if as addr can change
+     /* should be out of if as addr can change */


Index: mtr.spec
===================================================================
RCS file: /cvs/extras/rpms/mtr/devel/mtr.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- mtr.spec	21 May 2008 12:40:55 -0000	1.43
+++ mtr.spec	2 Sep 2008 12:42:35 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: A network diagnostic tool
 Name: mtr
 Version: 0.73
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch:	2
 Group: Applications/Internet
 License: GPLv2+
@@ -90,7 +90,10 @@
 %{_datadir}/pixmaps/mtr_icon.xpm
 
 %changelog
-* Wed May 21 2008 Zdenek Prikryl <zprikryl at redhat.com> - 2:0.73
+* Tue Sep 02 2008 Zdenek Prikryl <zprikryl at redhat.com> - 2:0.73-2
+- Minor fix in the patch underflow
+
+* Wed May 21 2008 Zdenek Prikryl <zprikryl at redhat.com> - 2:0.73-1
 - Updated to 0.73
 - Fixed mtr-0.69-CVE-2002-0497.patch
 - Added build requirement for GTK+



From bonii at fedoraproject.org  Tue Sep  2 12:51:45 2008
From: bonii at fedoraproject.org (Vivek Shah)
Date: Tue,  2 Sep 2008 12:51:45 +0000 (UTC)
Subject: rpms/teseq/F-9 import.log, NONE, 1.1 teseq.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080902125145.11FDC7011D@cvs1.fedora.phx.redhat.com>

Author: bonii

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log teseq.spec 
Log Message:

Initial Package import into CVS



--- NEW FILE import.log ---
teseq-1_0_0-2_fc8:F-9:teseq-1.0.0-2.fc8.src.rpm:1220379832


--- NEW FILE teseq.spec ---
Name:		teseq
Version:	1.0.0
Release:	2%{?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
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires(post):	info
Requires(preun): info

%description
Teseq, a tool for analyzing files that contain control characters and 
terminal control sequences. It is intended to be useful for diagnosing 
terminal emulators, and programs that make heavy use of terminal features 
(such as those based on the Curses library).

It is primarily targeted at individuals who possess a basic understanding of 
terminal control sequences, especially CSI sequences.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%check
make check

%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT

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 ChangeLog README COPYING NEWS
%{_bindir}/%{name}
%{_bindir}/reseq
%{_infodir}/%{name}.info.gz
%{_mandir}/man1/reseq.1.gz
%{_mandir}/man1/%{name}.1.gz
%{_libexecdir}/%{name}-post.sed


%changelog
* Sat Aug 23 2008 Vivek Shah <boni.vivek at, gmail.com> 1.0.0-2
- Added self check and fixed SOURCE0 URL with macros 

* Thu Aug 07 2008 Vivek Shah <boni.vivek at, gmail.com> 1.0.0-1
- Initial Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/teseq/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Aug 2008 21:04:38 -0000	1.1
+++ .cvsignore	2 Sep 2008 12:51:14 -0000	1.2
@@ -0,0 +1 @@
+teseq-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/teseq/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Aug 2008 21:04:38 -0000	1.1
+++ sources	2 Sep 2008 12:51:14 -0000	1.2
@@ -0,0 +1 @@
+3bec1d4ee22a4a087f11aa2cb7485dde  teseq-1.0.0.tar.gz



From pkgdb at fedoraproject.org  Tue Sep  2 12:54:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:54:29 +0000
Subject: [pkgdb] kdewebdev had acl change status
Message-ID: <20080902125430.CA161208D84@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdewebdev (Fedora devel) to Approved for jreznik

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



From tagoh at fedoraproject.org  Tue Sep  2 12:54:37 2008
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Tue,  2 Sep 2008 12:54:37 +0000 (UTC)
Subject: rpms/kinput2/devel kinput2-v3.1-linespace.patch, NONE,
	1.1 kinput2.spec, 1.20, 1.21
Message-ID: <20080902125437.1D7677011D@cvs1.fedora.phx.redhat.com>

Author: tagoh

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

Modified Files:
	kinput2.spec 
Added Files:
	kinput2-v3.1-linespace.patch 
Log Message:
* Tue Sep  2 2008 Akira TAGOH <tagoh at redhat.com> - v3.1-39
- Fix a value type of lineSpace attribute. (#458650)

kinput2-v3.1-linespace.patch:

--- NEW FILE kinput2-v3.1-linespace.patch ---
diff -pruN kinput2-v3.1.orig/lib/imlib/imattr.c kinput2-v3.1/lib/imlib/imattr.c
--- kinput2-v3.1.orig/lib/imlib/imattr.c	2008-09-02 14:44:15.000000000 +0900
+++ kinput2-v3.1/lib/imlib/imattr.c	2008-09-02 15:33:53.000000000 +0900
@@ -179,7 +179,7 @@ static ICAttribute icAttributes[] = {
 	  setBgPixmap, getBgPixmap },
     { XNFontSet, TYPE_XFONTSET, OP_C|OP_S|OP_G,
 	  setFontSet, getFontSet },
-    { XNLineSpace, TYPE_CARD16, OP_C|OP_S|OP_G,	  /* should be TYPE_INT16 */
+    { XNLineSpace, TYPE_CARD32, OP_C|OP_S|OP_G,	  /* should be TYPE_INT32 */
 	  setLineSpace, getLineSpace },
     { XNCursor, TYPE_CARD32, OP_C|OP_S|OP_G,
 	  setCursor, getCursor },
@@ -832,14 +832,14 @@ int op;
 
     TRACE(("imlib:setLineSpace()\n"));
 
-    CHECK_ICATTR_SIZE(2, IMBadSomething);
+    CHECK_ICATTR_SIZE(4, IMBadSomething);
 
     if ((ap = getPSPtr(icp, nest)) == NULL) {
 	unnestedError(icp);
 	return -1;
     }
 
-    line_space = getI16(value, order);	/* ??? linespacing is 'int' */
+    line_space = getC32(value, order);	/* ??? linespacing is 'int' */
     TRACE(("\tline space: %d\n", line_space));
 
     if (!(ap->set_mask & ATTR_MASK_LINESPACE) ||


Index: kinput2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kinput2/devel/kinput2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kinput2.spec	19 Feb 2008 12:51:23 -0000	1.20
+++ kinput2.spec	2 Sep 2008 12:54:06 -0000	1.21
@@ -25,7 +25,7 @@
 
 Name: kinput2
 Version: v3.1
-Release: 38%{?dist}
+Release: 39%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libICE-devel libSM-devel libX11-devel libXaw-devel libXext-devel libXmu-devel libXpm-devel libXt-devel libXp-devel
@@ -60,6 +60,7 @@
 Patch8: kinput2-v3.1-activate_im_with_kanji.patch
 Patch9: kinput2-v3.1-jp106_xfer.patch
 Patch10: kinput2-v3.1-status-update-204892.patch
+Patch11: kinput2-v3.1-linespace.patch
 
 Summary: kinput2 - kanji input server for X11
 Group: User Interface/X
@@ -91,6 +92,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 head -21 cmd/kinput2.c >Copyright
 
@@ -256,6 +258,9 @@
 %{_sysconfdir}/X11/xinit/xinput.d
 
 %changelog
+* Tue Sep  2 2008 Akira TAGOH <tagoh at redhat.com> - v3.1-39
+- Fix a value type of lineSpace attribute. (#458650)
+
 * Tue Feb 19 2008 Akira TAGOH <tagoh at redhat.com> - v3.1-38
 - Fix xinput script to get it working on latest im-chooser.
 



From pkgdb at fedoraproject.org  Tue Sep  2 12:54:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:54:34 +0000
Subject: [pkgdb] kdewebdev had acl change status
Message-ID: <20080902125435.88D3D208D88@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdewebdev (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:55:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:55:41 +0000
Subject: [pkgdb] kdewebdev had acl change status
Message-ID: <20080902125437.C189B208D8E@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdewebdev (Fedora devel) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:54:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:54:42 +0000
Subject: [pkgdb] kdewebdev had acl change status
Message-ID: <20080902125444.1DC22208D92@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdewebdev (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:54:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:54:51 +0000
Subject: [pkgdb] kdewebdev had acl change status
Message-ID: <20080902125451.7E12D208D9A@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdewebdev (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:55:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:55:49 +0000
Subject: [pkgdb] kdewebdev had acl change status
Message-ID: <20080902125445.71459208D96@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdewebdev (Fedora 8) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:55:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:55:57 +0000
Subject: [pkgdb] kdewebdev had acl change status
Message-ID: <20080902125453.CCF92208D9E@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdewebdev (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:54:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:54:54 +0000
Subject: [pkgdb] kdewebdev had acl change status
Message-ID: <20080902125454.DBD69208D9F@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdewebdev (Fedora 9) to Approved for jreznik

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



From pkgdb at fedoraproject.org  Tue Sep  2 12:54:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 12:54:58 +0000
Subject: [pkgdb] kdewebdev had acl change status
Message-ID: <20080902125500.68189208DA1@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdewebdev (Fedora 9) to Approved for jreznik

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



From tagoh at fedoraproject.org  Tue Sep  2 12:56:45 2008
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Tue,  2 Sep 2008 12:56:45 +0000 (UTC)
Subject: rpms/kinput2/F-9 kinput2-v3.1-linespace.patch, NONE,
	1.1 kinput2.spec, 1.20, 1.21
Message-ID: <20080902125645.F33B87011D@cvs1.fedora.phx.redhat.com>

Author: tagoh

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

Modified Files:
	kinput2.spec 
Added Files:
	kinput2-v3.1-linespace.patch 
Log Message:
* Tue Sep  2 2008 Akira TAGOH <tagoh at redhat.com> - v3.1-39
- Fix a value type of lineSpace attribute. (#458650)

kinput2-v3.1-linespace.patch:

--- NEW FILE kinput2-v3.1-linespace.patch ---
diff -pruN kinput2-v3.1.orig/lib/imlib/imattr.c kinput2-v3.1/lib/imlib/imattr.c
--- kinput2-v3.1.orig/lib/imlib/imattr.c	2008-09-02 14:44:15.000000000 +0900
+++ kinput2-v3.1/lib/imlib/imattr.c	2008-09-02 15:33:53.000000000 +0900
@@ -179,7 +179,7 @@ static ICAttribute icAttributes[] = {
 	  setBgPixmap, getBgPixmap },
     { XNFontSet, TYPE_XFONTSET, OP_C|OP_S|OP_G,
 	  setFontSet, getFontSet },
-    { XNLineSpace, TYPE_CARD16, OP_C|OP_S|OP_G,	  /* should be TYPE_INT16 */
+    { XNLineSpace, TYPE_CARD32, OP_C|OP_S|OP_G,	  /* should be TYPE_INT32 */
 	  setLineSpace, getLineSpace },
     { XNCursor, TYPE_CARD32, OP_C|OP_S|OP_G,
 	  setCursor, getCursor },
@@ -832,14 +832,14 @@ int op;
 
     TRACE(("imlib:setLineSpace()\n"));
 
-    CHECK_ICATTR_SIZE(2, IMBadSomething);
+    CHECK_ICATTR_SIZE(4, IMBadSomething);
 
     if ((ap = getPSPtr(icp, nest)) == NULL) {
 	unnestedError(icp);
 	return -1;
     }
 
-    line_space = getI16(value, order);	/* ??? linespacing is 'int' */
+    line_space = getC32(value, order);	/* ??? linespacing is 'int' */
     TRACE(("\tline space: %d\n", line_space));
 
     if (!(ap->set_mask & ATTR_MASK_LINESPACE) ||


Index: kinput2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kinput2/F-9/kinput2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kinput2.spec	19 Feb 2008 12:51:23 -0000	1.20
+++ kinput2.spec	2 Sep 2008 12:56:15 -0000	1.21
@@ -25,7 +25,7 @@
 
 Name: kinput2
 Version: v3.1
-Release: 38%{?dist}
+Release: 39%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libICE-devel libSM-devel libX11-devel libXaw-devel libXext-devel libXmu-devel libXpm-devel libXt-devel libXp-devel
@@ -60,6 +60,7 @@
 Patch8: kinput2-v3.1-activate_im_with_kanji.patch
 Patch9: kinput2-v3.1-jp106_xfer.patch
 Patch10: kinput2-v3.1-status-update-204892.patch
+Patch11: kinput2-v3.1-linespace.patch
 
 Summary: kinput2 - kanji input server for X11
 Group: User Interface/X
@@ -91,6 +92,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 head -21 cmd/kinput2.c >Copyright
 
@@ -256,6 +258,9 @@
 %{_sysconfdir}/X11/xinit/xinput.d
 
 %changelog
+* Tue Sep  2 2008 Akira TAGOH <tagoh at redhat.com> - v3.1-39
+- Fix a value type of lineSpace attribute. (#458650)
+
 * Tue Feb 19 2008 Akira TAGOH <tagoh at redhat.com> - v3.1-38
 - Fix xinput script to get it working on latest im-chooser.
 



From rjones at fedoraproject.org  Tue Sep  2 13:03:16 2008
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue,  2 Sep 2008 13:03:16 +0000 (UTC)
Subject: rpms/ocaml-cryptokit/devel cryptokit-META, NONE,
	1.1 ocaml-cryptokit.spec, 1.3, 1.4
Message-ID: <20080902130316.6E3AE7011D@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-cryptokit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31210

Modified Files:
	ocaml-cryptokit.spec 
Added Files:
	cryptokit-META 
Log Message:
* Tue Sep  2 2008 Richard W.M. Jones <rjones at redhat.com> - 1.3-5
- Install in cryptokit subdirectory.
- Include a META file (from Debian) (resolves rhbz#460844).



--- NEW FILE cryptokit-META ---
name="cryptokit"
version="@VERSION@"
description="Cryptographic primitives"
requires="num unix"
archive(byte)="cryptokit.cma"
archive(native)="cryptokit.cmxa"
directory="+cryptokit"

Index: ocaml-cryptokit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cryptokit/devel/ocaml-cryptokit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocaml-cryptokit.spec	23 Apr 2008 10:26:03 -0000	1.3
+++ ocaml-cryptokit.spec	2 Sep 2008 13:02:46 -0000	1.4
@@ -3,15 +3,17 @@
 
 Name:           ocaml-cryptokit
 Version:        1.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        OCaml library of cryptographic and hash functions
 
 Group:          Development/Libraries
 License:        LGPLv2 with exceptions
 URL:            http://pauillac.inria.fr/~xleroy/software.html
-Source0:        http://caml.inria.fr/distrib/bazar-ocaml/cryptokit-1.3.tar.gz
+Source0:        http://caml.inria.fr/distrib/bazar-ocaml/cryptokit-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source1:        cryptokit-META
+
 BuildRequires:  ocaml, zlib-devel, chrpath
 
 %define _use_internal_dependency_generator 0
@@ -74,9 +76,14 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
-make INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml install
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/cryptokit
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/cryptokit/stublibs
+make INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/cryptokit install
+mv $RPM_BUILD_ROOT%{_libdir}/ocaml/cryptokit/stublibs \
+  $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
+
+sed 's/@VERSION@/%{version}/' < %{SOURCE1} \
+  > $RPM_BUILD_ROOT%{_libdir}/ocaml/cryptokit/META
 
 
 %clean
@@ -86,13 +93,13 @@
 %files
 %defattr(-,root,root,-)
 %doc README LICENSE
-%{_libdir}/ocaml/*.*
+%{_libdir}/ocaml/cryptokit
 %if %opt
-%exclude %{_libdir}/ocaml/*.a
-%exclude %{_libdir}/ocaml/*.cmxa
-%exclude %{_libdir}/ocaml/*.cmx
+%exclude %{_libdir}/ocaml/cryptokit/*.a
+%exclude %{_libdir}/ocaml/cryptokit/*.cmxa
+%exclude %{_libdir}/ocaml/cryptokit/*.cmx
 %endif
-%exclude %{_libdir}/ocaml/*.mli
+%exclude %{_libdir}/ocaml/cryptokit/*.mli
 %{_libdir}/ocaml/stublibs/*.so
 
 
@@ -100,14 +107,18 @@
 %defattr(-,root,root,-)
 %doc LICENSE Changes doc
 %if %opt
-%{_libdir}/ocaml/*.a
-%{_libdir}/ocaml/*.cmxa
-%{_libdir}/ocaml/*.cmx
+%{_libdir}/ocaml/cryptokit/*.a
+%{_libdir}/ocaml/cryptokit/*.cmxa
+%{_libdir}/ocaml/cryptokit/*.cmx
 %endif
-%{_libdir}/ocaml/*.mli
+%{_libdir}/ocaml/cryptokit/*.mli
 
 
 %changelog
+* Tue Sep  2 2008 Richard W.M. Jones <rjones at redhat.com> - 1.3-5
+- Install in cryptokit subdirectory.
+- Include a META file (from Debian) (resolves rhbz#460844).
+
 * Wed Apr 23 2008 Richard W.M. Jones <rjones at redhat.com> - 1.3-4
 - Rebuild for OCaml 3.10.2
 



From jmoskovc at fedoraproject.org  Tue Sep  2 13:03:58 2008
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Tue,  2 Sep 2008 13:03:58 +0000 (UTC)
Subject: rpms/libbtctl/F-9 libbtctl.spec,1.51,1.52
Message-ID: <20080902130358.D04867011D@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

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

Modified Files:
	libbtctl.spec 
Log Message:
Moved documentation to separate package to avoid conflict on multiarch environment.



Index: libbtctl.spec
===================================================================
RCS file: /cvs/extras/rpms/libbtctl/F-9/libbtctl.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- libbtctl.spec	11 Feb 2008 11:16:35 -0000	1.51
+++ libbtctl.spec	2 Sep 2008 13:03:28 -0000	1.52
@@ -8,7 +8,7 @@
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.10.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL+
 Group: System Environment/Libraries
 URL: http://live.gnome.org/GnomeBluetooth 
@@ -38,6 +38,12 @@
 This package contains the files needed for developing applications,
 which use libbtctl.
 
+%package doc
+Summary: Documentation files for libbtctl
+Group: Development/Documentation
+
+%description doc
+%{summary}
 
 %prep
 %setup -q
@@ -94,12 +100,19 @@
 %{_libdir}/lib*.a
 %{_libdir}/pkgconfig/libbtctl.pc
 %{_includedir}/libbtctl
-%{_datadir}/gtk-doc/html/libbtctl
 %if %{with_mono}
 %{_libdir}/pkgconfig/libbtctl-sharp.pc
 %endif
 
+%files doc
+%defattr(-, root, root)
+%{_datadir}/gtk-doc/html/libbtctl
+
 %changelog
+* Mon Sep  1 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 0.10.0-3
+- made doc subpackage to avoid conflict on multiarch env.
+- Resolves: #341931
+
 * Mon Feb 11 2008 - Ondrej Vasik <ovasik at redhat.com> - 0.10.0-2
 - gcc43 rebuild
 



From than at fedoraproject.org  Tue Sep  2 13:11:55 2008
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  2 Sep 2008 13:11:55 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec, 1.187, 1.188 sources, 1.60,
	1.61 kdepim-4.1.1-strigi.patch, 1.1, NONE
Message-ID: <20080902131155.6FFCE7011D@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdepim.spec sources 
Removed Files:
	kdepim-4.1.1-strigi.patch 
Log Message:
respun



Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- kdepim.spec	1 Sep 2008 12:12:52 -0000	1.187
+++ kdepim.spec	2 Sep 2008 13:11:25 -0000	1.188
@@ -13,8 +13,6 @@
 Group:   Applications/Productivity
 URL:	 http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
-# upstream patches
-Patch100:  kdepim-4.1.1-strigi.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides: kdepim4 = %{version}-%{release}
@@ -91,7 +89,6 @@
 %setup -q
 
 # upstream patches
-%patch100 -p1 -b .strigi
 
 %build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	29 Aug 2008 16:05:29 -0000	1.60
+++ sources	2 Sep 2008 13:11:25 -0000	1.61
@@ -1 +1 @@
-fdb80cc1bfa78047d2793e1d6c3fde41  kdepim-4.1.1.tar.bz2
+792ddf463a7ade5b4dbade0f8b7c3085  kdepim-4.1.1.tar.bz2


--- kdepim-4.1.1-strigi.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Sep  2 13:16:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 13:16:35 +0000
Subject: [pkgdb] libical: rdieter has requested watchbugzilla
Message-ID: <20080902131636.A609D208D86@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on libical (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 13:16:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 13:16:37 +0000
Subject: [pkgdb] libical: rdieter has requested watchcommits
Message-ID: <20080902131638.7DB01208D81@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on libical (Fedora devel)

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



From bonii at fedoraproject.org  Tue Sep  2 13:22:32 2008
From: bonii at fedoraproject.org (Vivek Shah)
Date: Tue,  2 Sep 2008 13:22:32 +0000 (UTC)
Subject: rpms/teseq/F-8 import.log, NONE, 1.1 teseq.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080902132232.9F7D67011D@cvs1.fedora.phx.redhat.com>

Author: bonii

Update of /cvs/pkgs/rpms/teseq/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32389/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log teseq.spec 
Log Message:

Initial package import into CVS



--- NEW FILE import.log ---
teseq-1_0_0-2_fc8:F-8:teseq-1.0.0-2.fc8.src.rpm:1220381540


--- NEW FILE teseq.spec ---
Name:		teseq
Version:	1.0.0
Release:	2%{?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
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires(post):	info
Requires(preun): info

%description
Teseq, a tool for analyzing files that contain control characters and 
terminal control sequences. It is intended to be useful for diagnosing 
terminal emulators, and programs that make heavy use of terminal features 
(such as those based on the Curses library).

It is primarily targeted at individuals who possess a basic understanding of 
terminal control sequences, especially CSI sequences.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%check
make check

%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT

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 ChangeLog README COPYING NEWS
%{_bindir}/%{name}
%{_bindir}/reseq
%{_infodir}/%{name}.info.gz
%{_mandir}/man1/reseq.1.gz
%{_mandir}/man1/%{name}.1.gz
%{_libexecdir}/%{name}-post.sed


%changelog
* Sat Aug 23 2008 Vivek Shah <boni.vivek at, gmail.com> 1.0.0-2
- Added self check and fixed SOURCE0 URL with macros 

* Thu Aug 07 2008 Vivek Shah <boni.vivek at, gmail.com> 1.0.0-1
- Initial Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/teseq/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Aug 2008 21:04:38 -0000	1.1
+++ .cvsignore	2 Sep 2008 13:22:02 -0000	1.2
@@ -0,0 +1 @@
+teseq-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/teseq/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Aug 2008 21:04:38 -0000	1.1
+++ sources	2 Sep 2008 13:22:02 -0000	1.2
@@ -0,0 +1 @@
+3bec1d4ee22a4a087f11aa2cb7485dde  teseq-1.0.0.tar.gz



From bonii at fedoraproject.org  Tue Sep  2 13:26:39 2008
From: bonii at fedoraproject.org (Vivek Shah)
Date: Tue,  2 Sep 2008 13:26:39 +0000 (UTC)
Subject: rpms/teseq/devel import.log, NONE, 1.1 teseq.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080902132639.E81107011D@cvs1.fedora.phx.redhat.com>

Author: bonii

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log teseq.spec 
Log Message:

Initial package import



--- NEW FILE import.log ---
teseq-1_0_0-2_fc8:HEAD:teseq-1.0.0-2.fc8.src.rpm:1220381954


--- NEW FILE teseq.spec ---
Name:		teseq
Version:	1.0.0
Release:	2%{?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
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires(post):	info
Requires(preun): info

%description
Teseq, a tool for analyzing files that contain control characters and 
terminal control sequences. It is intended to be useful for diagnosing 
terminal emulators, and programs that make heavy use of terminal features 
(such as those based on the Curses library).

It is primarily targeted at individuals who possess a basic understanding of 
terminal control sequences, especially CSI sequences.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%check
make check

%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT

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 ChangeLog README COPYING NEWS
%{_bindir}/%{name}
%{_bindir}/reseq
%{_infodir}/%{name}.info.gz
%{_mandir}/man1/reseq.1.gz
%{_mandir}/man1/%{name}.1.gz
%{_libexecdir}/%{name}-post.sed


%changelog
* Sat Aug 23 2008 Vivek Shah <boni.vivek at, gmail.com> 1.0.0-2
- Added self check and fixed SOURCE0 URL with macros 

* Thu Aug 07 2008 Vivek Shah <boni.vivek at, gmail.com> 1.0.0-1
- Initial Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/teseq/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Aug 2008 21:04:38 -0000	1.1
+++ .cvsignore	2 Sep 2008 13:26:09 -0000	1.2
@@ -0,0 +1 @@
+teseq-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/teseq/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Aug 2008 21:04:38 -0000	1.1
+++ sources	2 Sep 2008 13:26:09 -0000	1.2
@@ -0,0 +1 @@
+3bec1d4ee22a4a087f11aa2cb7485dde  teseq-1.0.0.tar.gz



From harald at fedoraproject.org  Tue Sep  2 13:29:40 2008
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue,  2 Sep 2008 13:29:40 +0000 (UTC)
Subject: rpms/udev/devel udev-127.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.51, 
	1.52 sources, 1.51, 1.52 udev.spec, 1.250,
	1.251 udev-124.tar.bz2.sign, 1.1, NONE
Message-ID: <20080902132940.EEB6B7011D@cvs1.fedora.phx.redhat.com>

Author: harald

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

Modified Files:
	.cvsignore sources udev.spec 
Added Files:
	udev-127.tar.bz2.sign 
Removed Files:
	udev-124.tar.bz2.sign 
Log Message:
* Mon Sep 01 2008 Harald Hoyer <harald at redhat.com> 127-1
- version 127



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

iD8DBQBIuFtayGugalF9Dw4RApeuAJ9+7UghTzMsbLjLshA6+YxwGgM2FgCfbnj8
ylD6q64gmtAMRzK4pebQbKg=
=41ir
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	8 Aug 2008 13:12:38 -0000	1.51
+++ .cvsignore	2 Sep 2008 13:29:10 -0000	1.52
@@ -1 +1 @@
-udev-126.tar.bz2
+udev-127.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	8 Aug 2008 13:12:38 -0000	1.51
+++ sources	2 Sep 2008 13:29:10 -0000	1.52
@@ -1 +1 @@
-502964d8623b81b6565c727dd28024de  udev-126.tar.bz2
+59ebde702f1ab557be15ae76d645665b  udev-127.tar.bz2


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- udev.spec	8 Aug 2008 13:29:32 -0000	1.250
+++ udev.spec	2 Sep 2008 13:29:10 -0000	1.251
@@ -5,7 +5,7 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 126
+Version: 127
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
@@ -68,6 +68,27 @@
 This package contains the libvolume_id.so dynamic library,
 which contains functions to get volume ids.
 
+
+%package -n libudev0
+Summary: Dynamic library to access udev device information
+Group: System Environment/Libraries
+
+%description -n libudev0
+This package contains the dynamic library libudev, which provides access
+to udev device information, and an interface to search devices in sysfs.
+
+
+%package -n libudev-devel
+Summary: Development files for libudev
+Group: Development/Libraries
+Requires: udev = %{version}-%{release}
+Requires: libudev0 = %{version}-%{release}
+
+%description -n libudev-devel
+This package contains the development files for the library libudev, a
+dynamic library, which provides access to udev device information.
+
+
 %prep
 %setup -q  
 %patch102 -p1 -b .sysconf
@@ -229,6 +250,8 @@
 %post -n libvolume_id -p /sbin/ldconfig
 %postun -n libvolume_id -p /sbin/ldconfig
 
+%post -n libudev0 -p /sbin/ldconfig
+%postun -n libudev0 -p /sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -325,7 +348,24 @@
 %{_libdir}/libvolume_id.a 
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
+%files -n libudev0
+%defattr(-,root,root)
+/%{_lib}/libudev.so.*
+
+%files -n libudev-devel
+%defattr(-,root,root)
+%{_includedir}/libudev.h
+%{_libdir}/libudev.so
+%{_libdir}/pkgconfig/libudev.pc
+%if %{with_static}
+%{_libdir}/libudev.a
+%endif
+
+
 %changelog
+* Mon Sep 01 2008 Harald Hoyer <harald at redhat.com> 127-1
+- version 127
+
 * Fri Aug 08 2008 Harald Hoyer <harald at redhat.com> 126-1
 - version 126
 - fixed udevadm syntax in start_udev (credits B.J.W. Polman)


--- udev-124.tar.bz2.sign DELETED ---



From twaugh at fedoraproject.org  Tue Sep  2 13:33:20 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  2 Sep 2008 13:33:20 +0000 (UTC)
Subject: rpms/foomatic/F-9 foomatic-busyloop.patch, NONE, 1.1 foomatic.spec, 
	1.186, 1.187
Message-ID: <20080902133320.3EFFC7011D@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-busyloop.patch 
Log Message:
* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-61
- Avoid busy-looping when trying to shorten long PPD nicknames.


foomatic-busyloop.patch:

--- NEW FILE foomatic-busyloop.patch ---
diff -U0 foomatic-db-engine-3.0-20080211/ChangeLog.busyloop foomatic-db-engine-3.0-20080211/ChangeLog
diff -up foomatic-db-engine-3.0-20080211/lib/Foomatic/DB.pm.busyloop foomatic-db-engine-3.0-20080211/lib/Foomatic/DB.pm
--- foomatic-db-engine-3.0-20080211/lib/Foomatic/DB.pm.busyloop	2008-02-11 21:14:29.000000000 +0000
+++ foomatic-db-engine-3.0-20080211/lib/Foomatic/DB.pm	2008-09-02 13:19:24.000000000 +0100
@@ -4180,8 +4180,10 @@ EOFPGSZ
 	    # ShortNickName too long? Remove last words from model name.
 	    $parts{'model'} =~
 		s/(?<=[a-zA-Z0-9])[^a-zA-Z0-9]+[a-zA-Z0-9]*$//;
-	    $shortnickname =
+	    my $new =
 		"$parts{'make'} $parts{'model'}, $parts{'driver'}";
+	    last if ($new == $shortnickname);
+	    $shortnickname = $new;
 	}
 	if (length($shortnickname) > 31) {
 	    # If nothing else helps ...


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-9/foomatic.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- foomatic.spec	2 Sep 2008 10:35:33 -0000	1.186
+++ foomatic.spec	2 Sep 2008 13:32:49 -0000	1.187
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    60%{?dist}
+Release:    61%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -47,6 +47,7 @@
 Patch18: foomatic-sigpipe.patch
 
 Patch19: foomatic-459847.patch
+Patch20: foomatic-busyloop.patch
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
@@ -103,6 +104,7 @@
 %patch14 -p1 -b .ampathxml
 %patch10 -p1 -b .xml-cflags
 %patch15 -p1
+%patch20 -p1 -b .busyloop
 ./make_configure
 popd
 
@@ -253,6 +255,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-61
+- Avoid busy-looping when trying to shorten long PPD nicknames.
+
 * Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-60
 - Fixed PPD generation for HP LaserJet 4345 MFP (bug #459847).
 



From twaugh at fedoraproject.org  Tue Sep  2 13:37:36 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  2 Sep 2008 13:37:36 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic-busyloop.patch, NONE, 1.1 foomatic.spec,
	1.195, 1.196
Message-ID: <20080902133736.342AA7011D@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-busyloop.patch 
Log Message:
* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-63
- Avoid busy-looping when trying to shorten long PPD nicknames.


foomatic-busyloop.patch:

--- NEW FILE foomatic-busyloop.patch ---
diff -up foomatic-db-engine-3.0-20080710/lib/Foomatic/DB.pm.busyloop foomatic-db-engine-3.0-20080710/lib/Foomatic/DB.pm
--- foomatic-db-engine-3.0-20080710/lib/Foomatic/DB.pm.busyloop	2008-07-10 08:20:10.000000000 +0100
+++ foomatic-db-engine-3.0-20080710/lib/Foomatic/DB.pm	2008-09-02 14:34:27.000000000 +0100
@@ -4237,8 +4237,10 @@ EOFPGSZ
 	    # ShortNickName too long? Remove last words from model name.
 	    $parts{'model'} =~
 		s/(?<=[a-zA-Z0-9])[^a-zA-Z0-9]+[a-zA-Z0-9]*$//;
-	    $shortnickname =
+	    my $new =
 		"$parts{'make'} $parts{'model'}, $parts{'driver'}";
+	    last if ($new == $shortnickname);
+	    $shortnickname = $new;
 	}
 	if (length($shortnickname) > 31) {
 	    # If nothing else helps ...


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- foomatic.spec	2 Sep 2008 12:18:15 -0000	1.195
+++ foomatic.spec	2 Sep 2008 13:37:05 -0000	1.196
@@ -42,6 +42,7 @@
 
 Patch18: foomatic-sigpipe.patch
 Patch19: foomatic-459847.patch
+Patch20: foomatic-busyloop.patch
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
@@ -97,6 +98,7 @@
 %patch14 -p1 -b .ampathxml
 %patch10 -p1 -b .xml-cflags
 %patch15 -p1
+%patch20 -p1 -b .busyloop
 ./make_configure
 popd
 
@@ -248,6 +250,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-63
+- Avoid busy-looping when trying to shorten long PPD nicknames.
+
 * Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-62
 - Removed patch fuzz.
 - Fixed PPD generation for HP LaserJet 4345 MFP (bug #459847).



From twaugh at fedoraproject.org  Tue Sep  2 13:46:18 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  2 Sep 2008 13:46:18 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic.spec,1.196,1.197
Message-ID: <20080902134618.73ADA7011D@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	foomatic.spec 
Log Message:
3.0.2-63


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- foomatic.spec	2 Sep 2008 13:37:05 -0000	1.196
+++ foomatic.spec	2 Sep 2008 13:45:48 -0000	1.197
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    62%{?dist}
+Release:    63%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 



From xavierb at fedoraproject.org  Tue Sep  2 13:48:29 2008
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Tue,  2 Sep 2008 13:48:29 +0000 (UTC)
Subject: rpms/pnp4nagios/EL-4 pnp4nagios.logrotate.conf,1.2,1.3
Message-ID: <20080902134829.6C57E7011D@cvs1.fedora.phx.redhat.com>

Author: xavierb

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

Modified Files:
	pnp4nagios.logrotate.conf 
Log Message:
fix logrotate conf (RHBZ#460861)


Index: pnp4nagios.logrotate.conf
===================================================================
RCS file: /cvs/pkgs/rpms/pnp4nagios/EL-4/pnp4nagios.logrotate.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pnp4nagios.logrotate.conf	18 Jul 2008 21:55:50 -0000	1.2
+++ pnp4nagios.logrotate.conf	2 Sep 2008 13:47:59 -0000	1.3
@@ -1,4 +1,4 @@
-/var/log/pnp4nagios/* {
+/var/log/pnp4nagios/*.log {
     compress
     missingok
     notifempty



From xavierb at fedoraproject.org  Tue Sep  2 13:48:29 2008
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Tue,  2 Sep 2008 13:48:29 +0000 (UTC)
Subject: rpms/pnp4nagios/EL-5 pnp4nagios.logrotate.conf,1.2,1.3
Message-ID: <20080902134829.98A287011D@cvs1.fedora.phx.redhat.com>

Author: xavierb

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

Modified Files:
	pnp4nagios.logrotate.conf 
Log Message:
fix logrotate conf (RHBZ#460861)


Index: pnp4nagios.logrotate.conf
===================================================================
RCS file: /cvs/pkgs/rpms/pnp4nagios/EL-5/pnp4nagios.logrotate.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pnp4nagios.logrotate.conf	18 Jul 2008 21:56:07 -0000	1.2
+++ pnp4nagios.logrotate.conf	2 Sep 2008 13:47:59 -0000	1.3
@@ -1,4 +1,4 @@
-/var/log/pnp4nagios/* {
+/var/log/pnp4nagios/*.log {
     compress
     missingok
     notifempty



From xavierb at fedoraproject.org  Tue Sep  2 13:48:29 2008
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Tue,  2 Sep 2008 13:48:29 +0000 (UTC)
Subject: rpms/pnp4nagios/F-9 pnp4nagios.logrotate.conf,1.2,1.3
Message-ID: <20080902134829.CB4707011D@cvs1.fedora.phx.redhat.com>

Author: xavierb

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

Modified Files:
	pnp4nagios.logrotate.conf 
Log Message:
fix logrotate conf (RHBZ#460861)


Index: pnp4nagios.logrotate.conf
===================================================================
RCS file: /cvs/pkgs/rpms/pnp4nagios/F-9/pnp4nagios.logrotate.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pnp4nagios.logrotate.conf	18 Jul 2008 21:56:27 -0000	1.2
+++ pnp4nagios.logrotate.conf	2 Sep 2008 13:47:59 -0000	1.3
@@ -1,4 +1,4 @@
-/var/log/pnp4nagios/* {
+/var/log/pnp4nagios/*.log {
     compress
     missingok
     notifempty



From xavierb at fedoraproject.org  Tue Sep  2 13:48:30 2008
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Tue,  2 Sep 2008 13:48:30 +0000 (UTC)
Subject: rpms/pnp4nagios/devel pnp4nagios.logrotate.conf,1.2,1.3
Message-ID: <20080902134830.0FF5A7011D@cvs1.fedora.phx.redhat.com>

Author: xavierb

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

Modified Files:
	pnp4nagios.logrotate.conf 
Log Message:
fix logrotate conf (RHBZ#460861)


Index: pnp4nagios.logrotate.conf
===================================================================
RCS file: /cvs/pkgs/rpms/pnp4nagios/devel/pnp4nagios.logrotate.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pnp4nagios.logrotate.conf	18 Jul 2008 21:56:43 -0000	1.2
+++ pnp4nagios.logrotate.conf	2 Sep 2008 13:47:59 -0000	1.3
@@ -1,4 +1,4 @@
-/var/log/pnp4nagios/* {
+/var/log/pnp4nagios/*.log {
     compress
     missingok
     notifempty



From jmoskovc at fedoraproject.org  Tue Sep  2 13:50:04 2008
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Tue,  2 Sep 2008 13:50:04 +0000 (UTC)
Subject: rpms/libbtctl/F-8 libbtctl.spec,1.49,1.50
Message-ID: <20080902135004.9150A7011D@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/libbtctl/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2823

Modified Files:
	libbtctl.spec 
Log Message:
Moved doc files to doc package.



Index: libbtctl.spec
===================================================================
RCS file: /cvs/extras/rpms/libbtctl/F-8/libbtctl.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- libbtctl.spec	18 Sep 2007 15:18:16 -0000	1.49
+++ libbtctl.spec	2 Sep 2008 13:49:34 -0000	1.50
@@ -8,7 +8,7 @@
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.9.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL+
 Group: System Environment/Libraries
 URL: http://live.gnome.org/GnomeBluetooth 
@@ -39,6 +39,12 @@
 This package contains the files needed for developing applications,
 which use libbtctl.
 
+%package doc
+Summary: Documentation files for libbtctl
+Group: Development/Documentation
+
+%description doc
+%{summary}
 
 %prep
 %setup -q
@@ -96,12 +102,19 @@
 %{_libdir}/lib*.a
 %{_libdir}/pkgconfig/libbtctl.pc
 %{_includedir}/libbtctl
-%{_datadir}/gtk-doc/html/libbtctl
 %if %{with_mono}
 %{_libdir}/pkgconfig/libbtctl-sharp.pc
 %endif
 
+%files doc
+%defattr(-, root, root)
+%{_datadir}/gtk-doc/html/libbtctl
+
 %changelog
+* Tue Sep  2 2008 Jiri Moskovcak <jmoskovc at redhat.com> 0.9.0-4
+- made doc subpackage to avoid conflict on multiarch env.
+- Resolves: #341931
+
 * Tue Sep 18 2007 - Ondrej Vasik <ovasik at redhat.com> - 0.9.0-3
 - fixed wrong Source URL 
 



From than at fedoraproject.org  Tue Sep  2 13:50:50 2008
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  2 Sep 2008 13:50:50 +0000 (UTC)
Subject: rpms/sip/devel sip.spec,1.52,1.53
Message-ID: <20080902135050.8C7937011D@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	sip.spec 
Log Message:
- get rid of BR on qt



Index: sip.spec
===================================================================
RCS file: /cvs/extras/rpms/sip/devel/sip.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sip.spec	26 Aug 2008 15:19:59 -0000	1.52
+++ sip.spec	2 Sep 2008 13:50:20 -0000	1.53
@@ -2,18 +2,10 @@
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?python_inc:%global python_inc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc(1)")}
 
-%if 0%{?fedora} > 8
-%define qtver 3.3.8
-%define qtpkg qt3
-%else
-%define qtver 1:3.3.8
-%define qtpkg qt
-%endif
-
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
 Version: 4.7.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 # http://www.riverbankcomputing.com/Docs/sip4/sipref.html#license
 License: Python Software Foundation License v2 
 Group: Development/Tools
@@ -22,7 +14,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python-devel
-BuildRequires: %{qtpkg}-devel >= %{qtver}
 BuildRequires: sed
 
 %description
@@ -53,15 +44,6 @@
 
 
 %build
-QTDIR="" && source /etc/profile.d/qt.sh
-
-# use qt qmake files
-for target in default linux-g++ linux-g++-32 linux-g++-64 ; do
-  if [ -f $QTDIR/mkspecs/$target/qmake.conf -a -f specs/$target ] ; then
-    ln -sf $QTDIR/mkspecs/$target/qmake.conf specs/$target
-  fi
-done
-
 %{__python} configure.py -d %{python_sitearch} CXXFLAGS="%{optflags}" CFLAGS="%{optflags}"
 
 make %{?_smp_mflags} 
@@ -91,6 +73,9 @@
 
 
 %changelog
+* Tue Sep 02 2008 Than Ngo <than at redhat.com> 4.7.7-2
+- get rid of BR on qt
+
 * Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.7.7-1
 - sip-4.7.7
 



From limb at fedoraproject.org  Tue Sep  2 13:54:14 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  2 Sep 2008 13:54:14 +0000 (UTC)
Subject: rpms/nexuiz/devel nexuiz.spec,1.27,1.28
Message-ID: <20080902135414.570147011D@cvs1.fedora.phx.redhat.com>

Author: limb

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

Modified Files:
	nexuiz.spec 
Log Message:
Fix for BZ 460785.



Index: nexuiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz/devel/nexuiz.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- nexuiz.spec	7 Jul 2008 13:10:00 -0000	1.27
+++ nexuiz.spec	2 Sep 2008 13:53:44 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: nexuiz
 Version: 2.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
@@ -85,7 +85,7 @@
 desktop-file-install \
     --vendor=fedora \
     --dir %{buildroot}%{_datadir}/applications \
-    --add-category Application \
+    --add-category ActionGame \
     --add-category Game \
     %{name}.desktop
 
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Tue Sep 02 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.2-3
+- Fix .desktop category, BZ 460785.
+
 * Mon Jul 07 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.2-2
 - Fix debuginfo, BZ 454141.
 



From limb at fedoraproject.org  Tue Sep  2 13:54:14 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  2 Sep 2008 13:54:14 +0000 (UTC)
Subject: rpms/nexuiz/devel nexuiz.spec,1.27,1.28
Message-ID: <20080902135414.570147011D@cvs1.fedora.phx.redhat.com>

Author: limb

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

Modified Files:
	nexuiz.spec 
Log Message:
Fix for BZ 460785.



Index: nexuiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz/devel/nexuiz.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- nexuiz.spec	7 Jul 2008 13:10:00 -0000	1.27
+++ nexuiz.spec	2 Sep 2008 13:53:44 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: nexuiz
 Version: 2.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
@@ -85,7 +85,7 @@
 desktop-file-install \
     --vendor=fedora \
     --dir %{buildroot}%{_datadir}/applications \
-    --add-category Application \
+    --add-category ActionGame \
     --add-category Game \
     %{name}.desktop
 
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Tue Sep 02 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.2-3
+- Fix .desktop category, BZ 460785.
+
 * Mon Jul 07 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.2-2
 - Fix debuginfo, BZ 454141.
 



From pvrabec at fedoraproject.org  Tue Sep  2 13:56:42 2008
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Tue,  2 Sep 2008 13:56:42 +0000 (UTC)
Subject: rpms/sudo/devel sudo-1.6.9p13-audit.patch, 1.2, 1.3 sudo.spec, 1.68,
	1.69
Message-ID: <20080902135642.78E607011D@cvs1.fedora.phx.redhat.com>

Author: pvrabec

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

Modified Files:
	sudo-1.6.9p13-audit.patch sudo.spec 
Log Message:
- adjust audit patch, do not scream when kernel is
  compiled without audit netlink support (#401201


sudo-1.6.9p13-audit.patch:

Index: sudo-1.6.9p13-audit.patch
===================================================================
RCS file: /cvs/extras/rpms/sudo/devel/sudo-1.6.9p13-audit.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sudo-1.6.9p13-audit.patch	4 Mar 2008 10:28:10 -0000	1.2
+++ sudo-1.6.9p13-audit.patch	2 Sep 2008 13:56:42 -0000	1.3
@@ -1,184 +1,6 @@
-diff -up sudo-1.6.9p13/set_perms.c.audit sudo-1.6.9p13/set_perms.c
---- sudo-1.6.9p13/set_perms.c.audit	2007-11-28 00:41:23.000000000 +0100
-+++ sudo-1.6.9p13/set_perms.c	2008-03-04 11:18:45.000000000 +0100
-@@ -53,6 +53,10 @@
- #ifdef HAVE_LOGIN_CAP_H
- # include <login_cap.h>
- #endif
-+#if defined(WITH_AUDIT) && defined(HAVE_LIBCAP)
-+# include <sys/prctl.h>
-+# include <sys/capability.h>
-+#endif
- 
- #include "sudo.h"
- 
-@@ -119,13 +123,46 @@ set_perms(perm)
- 			      	break;
- 
- 	case PERM_FULL_RUNAS:
--				/* headed for exec(), assume euid == ROOT_UID */
--				runas_setup();
--				if (setresuid(def_stay_setuid ?
--				    user_uid : runas_pw->pw_uid,
--				    runas_pw->pw_uid, runas_pw->pw_uid))
--				    err(1, "unable to change to runas uid");
--				break;
-+#if defined(WITH_AUDIT) && defined(HAVE_LIBCAP)
-+                                { /* BEGIN CAP BLOCK */
-+                                 cap_t new_caps;
-+                                 cap_value_t cap_list[] = { CAP_AUDIT_WRITE };
-+
-+                                 if (runas_pw->pw_uid != ROOT_UID) {
-+                                     new_caps = cap_init ();
-+                                     if (!new_caps)
-+                                         err(1, "Error initing capabilities, aborting.\n");
-+
-+                                     if(cap_set_flag(new_caps, CAP_PERMITTED, 1, cap_list, CAP_SET) ||
-+                                        cap_set_flag(new_caps, CAP_EFFECTIVE, 1, cap_list, CAP_SET)) {
-+                                          err(1, "Error setting capabilities, aborting\n");
-+                                     }
-+
-+                                     if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0))
-+                                         err(1, "Error setting KEEPCAPS, aborting\n");
-+                                 }
-+#endif
-+                                /* headed for exec(), assume euid == ROOT_UID */
-+                                 runas_setup ();
-+                                 if (setresuid(def_stay_setuid ?
-+                                     user_uid : runas_pw->pw_uid,
-+                                     runas_pw->pw_uid, runas_pw->pw_uid))
-+                                     err(1, "unable to change to runas uid");
-+
-+#if defined(WITH_AUDIT) && defined(HAVE_LIBCAP)
-+                                 if (runas_pw->pw_uid != ROOT_UID) {
-+                                     if (prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0) < 0)
-+                                         err(1, "Error resetting KEEPCAPS, aborting\n");
-+
-+                                     if (cap_set_proc(new_caps))
-+                                         err(1, "Error dropping capabilities, aborting\n");
-+
-+                                     if (cap_free (new_caps))
-+                                         err(1, "Error freeing caps\n");
-+                                 }
-+                                } /* END CAP BLOCK */
-+#endif
-+                                break;
- 
- 	case PERM_SUDOERS:
- 				/* assume euid == ROOT_UID, ruid == user */
-diff -up sudo-1.6.9p13/sudo.c.audit sudo-1.6.9p13/sudo.c
---- sudo-1.6.9p13/sudo.c.audit	2008-03-04 11:18:45.000000000 +0100
-+++ sudo-1.6.9p13/sudo.c	2008-03-04 11:21:54.000000000 +0100
-@@ -100,6 +100,10 @@
- # include <selinux/selinux.h>
- #endif
- 
-+#ifdef WITH_AUDIT
-+#include <libaudit.h>
-+#endif
-+
- #include "sudo.h"
- #include "interfaces.h"
- #include "version.h"
-@@ -295,6 +299,10 @@ main(argc, argv, envp)
-     if (safe_cmnd == NULL)
- 	safe_cmnd = estrdup(user_cmnd);
- 
-+#if defined(WITH_AUDIT)
-+    audit_help_open ();
-+#endif
-+
-     /*
-      * Look up the timestamp dir owner if one is specified.
-      */
-@@ -442,6 +450,17 @@ main(argc, argv, envp)
- 	(void) sigaction(SIGTSTP, &saved_sa_tstp, NULL);
- 	(void) sigaction(SIGCHLD, &saved_sa_chld, NULL);
- 
-+        if (access(safe_cmnd, X_OK) != 0) {
-+                 warn ("unable to execute %s", safe_cmnd);
-+#ifdef WITH_AUDIT
-+                audit_logger(AUDIT_USER_CMD,  safe_cmnd, user_args, 0);
-+#endif
-+                exit(127);
-+        }
-+#ifdef WITH_AUDIT
-+        audit_logger(AUDIT_USER_CMD, safe_cmnd, user_args, 1);
-+#endif
-+
- #ifndef PROFILING
- 	if (ISSET(sudo_mode, MODE_BACKGROUND) && fork() > 0)
- 	    exit(0);
-@@ -465,10 +484,16 @@ main(argc, argv, envp)
- 	    NewArgv[1] = safe_cmnd;
- 	    execve(_PATH_BSHELL, NewArgv, environ);
- 	}
-+#ifdef WITH_AUDIT
-+	audit_logger(AUDIT_USER_CMD,  safe_cmnd, user_args, 0);
-+#endif
- 	warn("unable to execute %s", safe_cmnd);
- 	exit(127);
-     } else if (ISSET(validated, FLAG_NO_USER) || (validated & FLAG_NO_HOST)) {
- 	log_auth(validated, 1);
-+#ifdef WITH_AUDIT
-+	audit_logger(AUDIT_USER_CMD,  safe_cmnd, user_args, 0);
-+#endif
- 	exit(1);
-     } else if (ISSET(validated, VALIDATE_NOT_OK)) {
- 	if (def_path_info) {
-@@ -489,6 +514,9 @@ main(argc, argv, envp)
- 	    /* Just tell the user they are not allowed to run foo. */
- 	    log_auth(validated, 1);
- 	}
-+#ifdef WITH_AUDIT
-+	audit_logger(AUDIT_USER_CMD,  safe_cmnd, user_args, 0);
-+#endif
- 	exit(1);
-     } else {
- 	/* should never get here */
-diff -up sudo-1.6.9p13/configure.in.audit sudo-1.6.9p13/configure.in
---- sudo-1.6.9p13/configure.in.audit	2008-03-04 11:18:45.000000000 +0100
-+++ sudo-1.6.9p13/configure.in	2008-03-04 11:18:45.000000000 +0100
-@@ -166,6 +166,10 @@ dnl
- dnl Options for --with
- dnl
- 
-+AC_ARG_WITH(audit,
-+        [AC_HELP_STRING([--with-audit], [use auditing support @<:@default=yes if found@:>@])],
-+        [with_audit=$withval], [with_audit=yes])
-+
- AC_ARG_WITH(CC, [  --with-CC               C compiler to use],
- [case $with_CC in
-     yes)	AC_MSG_ERROR(["must give --with-CC an argument."])
-@@ -1614,6 +1618,25 @@ dnl
- : ${mansectsu='8'}
- : ${mansectform='5'}
- 
-+
-+AC_SUBST(LIBAUDIT)
-+if test "$with_audit" = "yes"; then
-+	# See if we have the audit library
-+        AC_CHECK_HEADER(libaudit.h, [audit_header="yes"], [audit_header="no"])
-+        if test "$audit_header" = "yes"; then
-+                AC_CHECK_LIB(audit, audit_log_user_command,
-+                        [AC_DEFINE(WITH_AUDIT, 1, [Define if you want to enable Audit messages])
-+                        LIBAUDIT="-laudit"])
-+        fi
-+	# See if we have the libcap library
-+	AC_CHECK_HEADERS(sys/capability.h sys/prctl.h, [cap_header="yes"], [cap_header="no"])
-+	if test "$cap_header" = "yes"; then
-+		AC_CHECK_LIB(cap, cap_init,
-+			[AC_DEFINE(HAVE_LIBCAP, 1, [SELinux libcap support])
-+			SUDO_LIBS="${SUDO_LIBS} -lcap"])
-+	fi
-+fi
-+
- dnl
- dnl Add in any libpaths or libraries specified via configure
- dnl
-diff -up /dev/null sudo-1.6.9p13/audit_help.c
---- /dev/null	2008-02-05 17:16:01.642928004 +0100
-+++ sudo-1.6.9p13/audit_help.c	2008-03-04 11:21:15.000000000 +0100
+diff -up /dev/null sudo-1.6.9p17/audit_help.c
+--- /dev/null	2008-08-23 21:55:45.734000982 +0200
++++ sudo-1.6.9p17/audit_help.c	2008-09-02 15:49:38.000000000 +0200
 @@ -0,0 +1,140 @@
 +/*
 + *  Audit helper functions used throughout sudo
@@ -275,7 +97,7 @@
 +		err = audit_log_user_command (audit_fd, type, msg, NULL, result);
 +               /* The kernel supports auditing and we had 
 +                  enough privilege to write to the socket. */
-+		if( err <= 0 && !(errno == EPERM && getuid() != 0) ) {
++		if( err <= 0 && !((errno == EPERM && getuid() > 0) || errno == ECONNREFUSED ) ) {
 +			perror("audit_log_user_command()");
 +		}
 +
@@ -320,10 +142,50 @@
 +#endif                         /* WITH_AUDIT */
 +
 +
-diff -up sudo-1.6.9p13/Makefile.in.audit sudo-1.6.9p13/Makefile.in
---- sudo-1.6.9p13/Makefile.in.audit	2008-02-19 19:13:10.000000000 +0100
-+++ sudo-1.6.9p13/Makefile.in	2008-03-04 11:18:45.000000000 +0100
-@@ -120,11 +120,13 @@ HDRS = compat.h def_data.h defaults.h in
+diff -up sudo-1.6.9p17/configure.in.audit sudo-1.6.9p17/configure.in
+--- sudo-1.6.9p17/configure.in.audit	2008-09-02 15:48:46.000000000 +0200
++++ sudo-1.6.9p17/configure.in	2008-09-02 15:48:46.000000000 +0200
+@@ -167,6 +167,10 @@ dnl
+ dnl Options for --with
+ dnl
+ 
++AC_ARG_WITH(audit,
++        [AC_HELP_STRING([--with-audit], [use auditing support @<:@default=yes if found@:>@])],
++        [with_audit=$withval], [with_audit=yes])
++
+ AC_ARG_WITH(CC, [  --with-CC               C compiler to use],
+ [case $with_CC in
+     yes)	AC_MSG_ERROR(["must give --with-CC an argument."])
+@@ -1616,6 +1620,25 @@ dnl
+ : ${mansectsu='8'}
+ : ${mansectform='5'}
+ 
++
++AC_SUBST(LIBAUDIT)
++if test "$with_audit" = "yes"; then
++	# See if we have the audit library
++        AC_CHECK_HEADER(libaudit.h, [audit_header="yes"], [audit_header="no"])
++        if test "$audit_header" = "yes"; then
++                AC_CHECK_LIB(audit, audit_log_user_command,
++                        [AC_DEFINE(WITH_AUDIT, 1, [Define if you want to enable Audit messages])
++                        LIBAUDIT="-laudit"])
++        fi
++	# See if we have the libcap library
++	AC_CHECK_HEADERS(sys/capability.h sys/prctl.h, [cap_header="yes"], [cap_header="no"])
++	if test "$cap_header" = "yes"; then
++		AC_CHECK_LIB(cap, cap_init,
++			[AC_DEFINE(HAVE_LIBCAP, 1, [SELinux libcap support])
++			SUDO_LIBS="${SUDO_LIBS} -lcap"])
++	fi
++fi
++
+ dnl
+ dnl Add in any libpaths or libraries specified via configure
+ dnl
+diff -up sudo-1.6.9p17/Makefile.in.audit sudo-1.6.9p17/Makefile.in
+--- sudo-1.6.9p17/Makefile.in.audit	2008-06-22 22:29:03.000000000 +0200
++++ sudo-1.6.9p17/Makefile.in	2008-09-02 15:48:46.000000000 +0200
+@@ -121,11 +121,13 @@ HDRS = compat.h def_data.h defaults.h in
  
  AUTH_OBJS = sudo_auth.o @AUTH_OBJS@
  
@@ -338,7 +200,7 @@
  
  VISUDOBJS = visudo.o fileops.o gettime.o goodpath.o find_path.o $(PARSEOBJS)
  
-@@ -276,6 +278,9 @@ securid5.o: $(authdir)/securid5.c $(AUTH
+@@ -277,6 +279,9 @@ securid5.o: $(authdir)/securid5.c $(AUTH
  sia.o: $(authdir)/sia.c $(AUTHDEP)
  	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(authdir)/sia.c
  
@@ -348,9 +210,147 @@
  sudo.man.in: $(srcdir)/sudo.pod
  	@rm -f $(srcdir)/$@
  	( cd $(srcdir); mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; sed -n -e '/^=pod/q' -e 's/^/.\\" /p' sudo.pod > $@; pod2man --quotes=none --date="`date '+%B %e, %Y'`" --section=$$mansectsu --release=$(VERSION) --center="MAINTENANCE COMMANDS" sudo.pod | sed -e "s/(5)/($$mansectform)/" -e "s/(8)/($$mansectsu)/" | perl -p sudo.man.pl >> $@ )
-diff -up sudo-1.6.9p13/sudo.h.audit sudo-1.6.9p13/sudo.h
---- sudo-1.6.9p13/sudo.h.audit	2008-03-04 11:18:45.000000000 +0100
-+++ sudo-1.6.9p13/sudo.h	2008-03-04 11:18:45.000000000 +0100
+diff -up sudo-1.6.9p17/set_perms.c.audit sudo-1.6.9p17/set_perms.c
+--- sudo-1.6.9p17/set_perms.c.audit	2007-11-28 00:41:23.000000000 +0100
++++ sudo-1.6.9p17/set_perms.c	2008-09-02 15:48:46.000000000 +0200
+@@ -53,6 +53,10 @@
+ #ifdef HAVE_LOGIN_CAP_H
+ # include <login_cap.h>
+ #endif
++#if defined(WITH_AUDIT) && defined(HAVE_LIBCAP)
++# include <sys/prctl.h>
++# include <sys/capability.h>
++#endif
+ 
+ #include "sudo.h"
+ 
+@@ -119,13 +123,46 @@ set_perms(perm)
+ 			      	break;
+ 
+ 	case PERM_FULL_RUNAS:
+-				/* headed for exec(), assume euid == ROOT_UID */
+-				runas_setup();
+-				if (setresuid(def_stay_setuid ?
+-				    user_uid : runas_pw->pw_uid,
+-				    runas_pw->pw_uid, runas_pw->pw_uid))
+-				    err(1, "unable to change to runas uid");
+-				break;
++#if defined(WITH_AUDIT) && defined(HAVE_LIBCAP)
++                                { /* BEGIN CAP BLOCK */
++                                 cap_t new_caps;
++                                 cap_value_t cap_list[] = { CAP_AUDIT_WRITE };
++
++                                 if (runas_pw->pw_uid != ROOT_UID) {
++                                     new_caps = cap_init ();
++                                     if (!new_caps)
++                                         err(1, "Error initing capabilities, aborting.\n");
++
++                                     if(cap_set_flag(new_caps, CAP_PERMITTED, 1, cap_list, CAP_SET) ||
++                                        cap_set_flag(new_caps, CAP_EFFECTIVE, 1, cap_list, CAP_SET)) {
++                                          err(1, "Error setting capabilities, aborting\n");
++                                     }
++
++                                     if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0))
++                                         err(1, "Error setting KEEPCAPS, aborting\n");
++                                 }
++#endif
++                                /* headed for exec(), assume euid == ROOT_UID */
++                                 runas_setup ();
++                                 if (setresuid(def_stay_setuid ?
++                                     user_uid : runas_pw->pw_uid,
++                                     runas_pw->pw_uid, runas_pw->pw_uid))
++                                     err(1, "unable to change to runas uid");
++
++#if defined(WITH_AUDIT) && defined(HAVE_LIBCAP)
++                                 if (runas_pw->pw_uid != ROOT_UID) {
++                                     if (prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0) < 0)
++                                         err(1, "Error resetting KEEPCAPS, aborting\n");
++
++                                     if (cap_set_proc(new_caps))
++                                         err(1, "Error dropping capabilities, aborting\n");
++
++                                     if (cap_free (new_caps))
++                                         err(1, "Error freeing caps\n");
++                                 }
++                                } /* END CAP BLOCK */
++#endif
++                                break;
+ 
+ 	case PERM_SUDOERS:
+ 				/* assume euid == ROOT_UID, ruid == user */
+diff -up sudo-1.6.9p17/sudo.c.audit sudo-1.6.9p17/sudo.c
+--- sudo-1.6.9p17/sudo.c.audit	2008-09-02 15:48:46.000000000 +0200
++++ sudo-1.6.9p17/sudo.c	2008-09-02 15:48:46.000000000 +0200
+@@ -100,6 +100,10 @@
+ # include <selinux/selinux.h>
+ #endif
+ 
++#ifdef WITH_AUDIT
++#include <libaudit.h>
++#endif
++
+ #include "sudo.h"
+ #include "interfaces.h"
+ #include "version.h"
+@@ -289,6 +293,10 @@ main(argc, argv, envp)
+     if (safe_cmnd == NULL)
+ 	safe_cmnd = estrdup(user_cmnd);
+ 
++#if defined(WITH_AUDIT)
++    audit_help_open ();
++#endif
++
+     /*
+      * Look up the timestamp dir owner if one is specified.
+      */
+@@ -435,6 +443,17 @@ main(argc, argv, envp)
+ 	(void) sigaction(SIGQUIT, &saved_sa_quit, NULL);
+ 	(void) sigaction(SIGTSTP, &saved_sa_tstp, NULL);
+ 
++        if (access(safe_cmnd, X_OK) != 0) {
++                 warn ("unable to execute %s", safe_cmnd);
++#ifdef WITH_AUDIT
++                audit_logger(AUDIT_USER_CMD,  safe_cmnd, user_args, 0);
++#endif
++                exit(127);
++        }
++#ifdef WITH_AUDIT
++        audit_logger(AUDIT_USER_CMD, safe_cmnd, user_args, 1);
++#endif
++
+ #ifndef PROFILING
+ 	if (ISSET(sudo_mode, MODE_BACKGROUND) && fork() > 0)
+ 	    exit(0);
+@@ -458,10 +477,16 @@ main(argc, argv, envp)
+ 	    NewArgv[1] = safe_cmnd;
+ 	    execve(_PATH_BSHELL, NewArgv, environ);
+ 	}
++#ifdef WITH_AUDIT
++	audit_logger(AUDIT_USER_CMD,  safe_cmnd, user_args, 0);
++#endif
+ 	warn("unable to execute %s", safe_cmnd);
+ 	exit(127);
+     } else if (ISSET(validated, FLAG_NO_USER) || (validated & FLAG_NO_HOST)) {
+ 	log_auth(validated, 1);
++#ifdef WITH_AUDIT
++	audit_logger(AUDIT_USER_CMD,  safe_cmnd, user_args, 0);
++#endif
+ 	exit(1);
+     } else if (ISSET(validated, VALIDATE_NOT_OK)) {
+ 	if (def_path_info) {
+@@ -482,6 +507,9 @@ main(argc, argv, envp)
+ 	    /* Just tell the user they are not allowed to run foo. */
+ 	    log_auth(validated, 1);
+ 	}
++#ifdef WITH_AUDIT
++	audit_logger(AUDIT_USER_CMD,  safe_cmnd, user_args, 0);
++#endif
+ 	exit(1);
+     } else {
+ 	/* should never get here */
+diff -up sudo-1.6.9p17/sudo.h.audit sudo-1.6.9p17/sudo.h
+--- sudo-1.6.9p17/sudo.h.audit	2008-09-02 15:48:46.000000000 +0200
++++ sudo-1.6.9p17/sudo.h	2008-09-02 15:48:46.000000000 +0200
 @@ -23,6 +23,8 @@
  #ifndef _SUDO_SUDO_H
  #define _SUDO_SUDO_H


Index: sudo.spec
===================================================================
RCS file: /cvs/extras/rpms/sudo/devel/sudo.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sudo.spec	4 Jul 2008 14:13:33 -0000	1.68
+++ sudo.spec	2 Sep 2008 13:56:42 -0000	1.69
@@ -1,7 +1,7 @@
 Summary: Allows restricted root access for specified users
 Name: sudo
 Version: 1.6.9p17
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Applications/System
 URL: http://www.courtesan.com/sudo/
@@ -133,6 +133,10 @@
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Tue Sep 02 2008 Peter Vrabec <pvrabec at redhat.com> 1.6.9p17-2
+- adjust audit patch, do not scream when kernel is
+  compiled without audit netlink support (#401201)
+
 * Fri Jul 04 2008 Peter Vrabec <pvrabec at redhat.com> 1.6.9p17-1
 - upgrade
 



From xavierb at fedoraproject.org  Tue Sep  2 13:59:20 2008
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Tue,  2 Sep 2008 13:59:20 +0000 (UTC)
Subject: rpms/pnp4nagios/EL-4 pnp4nagios.spec,1.2,1.3
Message-ID: <20080902135920.C73207011D@cvs1.fedora.phx.redhat.com>

Author: xavierb

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

Modified Files:
	pnp4nagios.spec 
Log Message:
and update spec file...


Index: pnp4nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pnp4nagios/EL-4/pnp4nagios.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pnp4nagios.spec	18 Jul 2008 21:55:50 -0000	1.2
+++ pnp4nagios.spec	2 Sep 2008 13:58:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           pnp4nagios
 Version:        0.4.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Nagios performance data analysis tool
 
 Group:          Applications/System
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Tue Sep 02 2008 Xavier Bachelot <xavier at bachelot.org> 0.4.10-3
+- Fix logrotate conf (RHBZ#460861).
+
 * Fri Jul 18 2008 Xavier Bachelot <xavier at bachelot.org> 0.4.10-2
 - Fix typo in logrotate conf.
 



From xavierb at fedoraproject.org  Tue Sep  2 13:59:21 2008
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Tue,  2 Sep 2008 13:59:21 +0000 (UTC)
Subject: rpms/pnp4nagios/F-9 pnp4nagios.spec,1.2,1.3
Message-ID: <20080902135921.2932F7011D@cvs1.fedora.phx.redhat.com>

Author: xavierb

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

Modified Files:
	pnp4nagios.spec 
Log Message:
and update spec file...


Index: pnp4nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pnp4nagios/F-9/pnp4nagios.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pnp4nagios.spec	18 Jul 2008 21:56:27 -0000	1.2
+++ pnp4nagios.spec	2 Sep 2008 13:58:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           pnp4nagios
 Version:        0.4.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Nagios performance data analysis tool
 
 Group:          Applications/System
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Tue Sep 02 2008 Xavier Bachelot <xavier at bachelot.org> 0.4.10-3
+- Fix logrotate conf (RHBZ#460861).
+
 * Fri Jul 18 2008 Xavier Bachelot <xavier at bachelot.org> 0.4.10-2
 - Fix typo in logrotate conf.
 



From xavierb at fedoraproject.org  Tue Sep  2 13:59:20 2008
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Tue,  2 Sep 2008 13:59:20 +0000 (UTC)
Subject: rpms/pnp4nagios/EL-5 pnp4nagios.spec,1.2,1.3
Message-ID: <20080902135920.E39097011D@cvs1.fedora.phx.redhat.com>

Author: xavierb

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

Modified Files:
	pnp4nagios.spec 
Log Message:
and update spec file...


Index: pnp4nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pnp4nagios/EL-5/pnp4nagios.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pnp4nagios.spec	18 Jul 2008 21:56:07 -0000	1.2
+++ pnp4nagios.spec	2 Sep 2008 13:58:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           pnp4nagios
 Version:        0.4.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Nagios performance data analysis tool
 
 Group:          Applications/System
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Tue Sep 02 2008 Xavier Bachelot <xavier at bachelot.org> 0.4.10-3
+- Fix logrotate conf (RHBZ#460861).
+
 * Fri Jul 18 2008 Xavier Bachelot <xavier at bachelot.org> 0.4.10-2
 - Fix typo in logrotate conf.
 



From xavierb at fedoraproject.org  Tue Sep  2 13:59:21 2008
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Tue,  2 Sep 2008 13:59:21 +0000 (UTC)
Subject: rpms/pnp4nagios/devel pnp4nagios.spec,1.2,1.3
Message-ID: <20080902135921.540527011D@cvs1.fedora.phx.redhat.com>

Author: xavierb

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

Modified Files:
	pnp4nagios.spec 
Log Message:
and update spec file...


Index: pnp4nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pnp4nagios/devel/pnp4nagios.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pnp4nagios.spec	18 Jul 2008 21:56:43 -0000	1.2
+++ pnp4nagios.spec	2 Sep 2008 13:58:51 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           pnp4nagios
 Version:        0.4.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Nagios performance data analysis tool
 
 Group:          Applications/System
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Tue Sep 02 2008 Xavier Bachelot <xavier at bachelot.org> 0.4.10-3
+- Fix logrotate conf (RHBZ#460861).
+
 * Fri Jul 18 2008 Xavier Bachelot <xavier at bachelot.org> 0.4.10-2
 - Fix typo in logrotate conf.
 



From twaugh at fedoraproject.org  Tue Sep  2 14:01:53 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  2 Sep 2008 14:01:53 +0000 (UTC)
Subject: rpms/tree/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tree.spec,
	1.30, 1.31
Message-ID: <20080902140153.3076B7011D@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore sources tree.spec 
Log Message:
* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 1.5.2.1-1
- 1.5.2.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tree/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Jun 2008 09:30:42 -0000	1.7
+++ .cvsignore	2 Sep 2008 14:01:22 -0000	1.8
@@ -3,3 +3,4 @@
 tree-1.5.1.1.tgz
 tree-1.5.1.2.tgz
 tree-1.5.2.tgz
+tree-1.5.2.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tree/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Jun 2008 09:30:42 -0000	1.7
+++ sources	2 Sep 2008 14:01:22 -0000	1.8
@@ -1 +1 @@
-b86a3091ec93e1e13e81020fa33b6270  tree-1.5.2.tgz
+73d5fa220dfef1ee9c1876c3966f1c18  tree-1.5.2.1.tgz


Index: tree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tree/devel/tree.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- tree.spec	16 Jun 2008 09:31:43 -0000	1.30
+++ tree.spec	2 Sep 2008 14:01:22 -0000	1.31
@@ -1,6 +1,6 @@
 Summary: A utility which displays a tree view of the contents of directories
 Name: tree
-Version: 1.5.2
+Version: 1.5.2.1
 Release: 1%{?dist}
 Group: Applications/File
 License: GPLv2+
@@ -45,6 +45,9 @@
 %doc README LICENSE
 
 %changelog
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 1.5.2.1-1
+- 1.5.2.1.
+
 * Mon Jun 16 2008 Tim Waugh <twaugh at redhat.com> 1.5.2-1
 - 1.5.2.
 - Dropped no-colour patch.



From twaugh at fedoraproject.org  Tue Sep  2 14:06:31 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  2 Sep 2008 14:06:31 +0000 (UTC)
Subject: rpms/tree/devel tree-1.2-carrot.patch,1.2,1.3 tree.spec,1.31,1.32
Message-ID: <20080902140631.B41DF7011D@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	tree-1.2-carrot.patch tree.spec 
Log Message:
* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 1.5.2.1-1
- Removed patch fuzz.


tree-1.2-carrot.patch:

Index: tree-1.2-carrot.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tree/devel/tree-1.2-carrot.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tree-1.2-carrot.patch	25 Apr 2008 11:34:08 -0000	1.2
+++ tree-1.2-carrot.patch	2 Sep 2008 14:06:01 -0000	1.3
@@ -1,6 +1,6 @@
-diff -up tree-1.5.1.1/man/tree.1.carrot tree-1.5.1.1/man/tree.1
---- tree-1.5.1.1/man/tree.1.carrot	2007-06-11 14:22:14.000000000 +0100
-+++ tree-1.5.1.1/man/tree.1	2008-04-25 12:25:40.000000000 +0100
+diff -up tree-1.5.2.1/man/tree.1.carrot tree-1.5.2.1/man/tree.1
+--- tree-1.5.2.1/man/tree.1.carrot	2008-06-04 16:35:31.000000000 +0100
++++ tree-1.5.2.1/man/tree.1	2008-09-02 15:05:28.000000000 +0100
 @@ -149,7 +149,7 @@ caret notation.
  .PP
  .TP
@@ -9,4 +9,4 @@
 +Print non-printable characters as is instead of the default caret notation.
  .PP
  .TP
- .B -r
+ .B -v


Index: tree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tree/devel/tree.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- tree.spec	2 Sep 2008 14:01:22 -0000	1.31
+++ tree.spec	2 Sep 2008 14:06:01 -0000	1.32
@@ -46,6 +46,7 @@
 
 %changelog
 * Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 1.5.2.1-1
+- Removed patch fuzz.
 - 1.5.2.1.
 
 * Mon Jun 16 2008 Tim Waugh <twaugh at redhat.com> 1.5.2-1



From limb at fedoraproject.org  Tue Sep  2 14:06:51 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  2 Sep 2008 14:06:51 +0000 (UTC)
Subject: rpms/nexuiz/F-9 nexuiz.spec,1.25,1.26
Message-ID: <20080902140651.5B2E77011D@cvs1.fedora.phx.redhat.com>

Author: limb

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

Modified Files:
	nexuiz.spec 
Log Message:
Fix .desktop category, BZ 460785.



Index: nexuiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz/F-9/nexuiz.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- nexuiz.spec	22 May 2008 17:04:01 -0000	1.25
+++ nexuiz.spec	2 Sep 2008 14:06:21 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: nexuiz
 Version: 2.4.2
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
@@ -52,7 +52,7 @@
 
 %build
 export DP_FS_BASEDIR=%{_datadir}/nexuiz
-%{__make} cl-nexuiz sv-nexuiz sdl-nexuiz OPTIM_RELEASE="$RPM_OPT_FLAGS"
+%{__make} cl-nexuiz sv-nexuiz sdl-nexuiz OPTIM_RELEASE="$RPM_OPT_FLAGS" STRIP=:
 convert darkplaces.ico nexuiz.png
 
 
@@ -85,7 +85,7 @@
 desktop-file-install \
     --vendor=fedora \
     --dir %{buildroot}%{_datadir}/applications \
-    --add-category Application \
+    --add-category ActionGame \
     --add-category Game \
     %{name}.desktop
 
@@ -128,6 +128,12 @@
 
 
 %changelog
+* Tue Sep 02 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.2-3
+- Fix .desktop category, BZ 460785.
+
+* Mon Jul 07 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.2-2
+- Fix debuginfo, BZ 454141.
+
 * Mon May 19 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.2-1
 - New upstream release.
 



From pvrabec at fedoraproject.org  Tue Sep  2 14:13:00 2008
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Tue,  2 Sep 2008 14:13:00 +0000 (UTC)
Subject: rpms/shadow-utils/devel shadow-4.1.2-audit.patch, NONE,
	1.1 shadow-utils.spec, 1.120, 1.121
Message-ID: <20080902141300.9AC3D7011D@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/shadow-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5416

Modified Files:
	shadow-utils.spec 
Added Files:
	shadow-4.1.2-audit.patch 
Log Message:
audit improvements, thnx. to sgrubb at redhat.com



shadow-4.1.2-audit.patch:

--- NEW FILE shadow-4.1.2-audit.patch ---
diff -urp shadow-4.1.2.orig/src/groupadd.c shadow-4.1.2/src/groupadd.c
--- shadow-4.1.2.orig/src/groupadd.c	2008-09-02 08:31:11.000000000 -0400
+++ shadow-4.1.2/src/groupadd.c	2008-09-02 09:05:14.000000000 -0400
@@ -205,7 +205,7 @@ static void grp_update (void)
 	}
 #endif				/* SHADOWGRP */
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding group", group_name,
+	audit_logger (AUDIT_ADD_GROUP, Prog, "adding group", group_name,
 	              group_id, 1);
 #endif
 	SYSLOG ((LOG_INFO, "new group: name=%s, GID=%u",
@@ -269,7 +269,7 @@ static void open_files (void)
 	if (!gr_lock ()) {
 		fprintf (stderr, _("%s: unable to lock group file\n"), Prog);
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "locking group file",
+		audit_logger (AUDIT_ADD_GROUP, Prog, "locking group file",
 		              group_name, -1, 0);
 #endif
 		exit (E_GRP_UPDATE);
@@ -277,7 +277,7 @@ static void open_files (void)
 	if (!gr_open (O_RDWR)) {
 		fprintf (stderr, _("%s: unable to open group file\n"), Prog);
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "opening group file",
+		audit_logger (AUDIT_ADD_GROUP, Prog, "opening group file",
 		              group_name, -1, 0);
 #endif
 		fail_exit (E_GRP_UPDATE);
@@ -310,7 +310,7 @@ static void fail_exit (int code)
 
 #ifdef WITH_AUDIT
 	if (code != E_SUCCESS) {
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding group",
+		audit_logger (AUDIT_ADD_GROUP, Prog, "adding group",
 		              group_name, -1, 0);
 	}
 #endif
diff -urp shadow-4.1.2.orig/src/groupdel.c shadow-4.1.2/src/groupdel.c
--- shadow-4.1.2.orig/src/groupdel.c	2008-09-02 08:31:11.000000000 -0400
+++ shadow-4.1.2/src/groupdel.c	2008-09-02 09:04:18.000000000 -0400
@@ -100,7 +100,7 @@ static void fail_exit (int code)
 #endif
 
 #ifdef	WITH_AUDIT
-	audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting group",
+	audit_logger (AUDIT_DEL_GROUP, Prog, "deleting group",
 	              group_name, -1, 0);
 #endif
 
@@ -143,7 +143,7 @@ static void grp_update (void)
 static void close_files (void)
 {
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting group", group_name,
+	audit_logger (AUDIT_DEL_GROUP, Prog, "deleting group", group_name,
 	              group_id, 1);
 #endif
 	SYSLOG ((LOG_INFO, "remove group `%s'\n", group_name));
@@ -316,7 +316,7 @@ int main (int argc, char **argv)
 			fprintf (stderr, _("%s: group %s does not exist\n"),
 				 Prog, group_name);
 #ifdef WITH_AUDIT
-			audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+			audit_logger (AUDIT_DEL_GROUP, Prog,
 				      "deleting group",
 				      group_name, -1, 0);
 #endif
@@ -338,7 +338,7 @@ int main (int argc, char **argv)
 			 Prog, group_name);
 
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting group",
+		audit_logger (AUDIT_DEL_GROUP, Prog, "deleting group",
 			      group_name, -1, 0);
 #endif
 		if (!yp_get_default_domain (&nis_domain) &&
diff -urp shadow-4.1.2.orig/src/useradd.c shadow-4.1.2/src/useradd.c
--- shadow-4.1.2.orig/src/useradd.c	2008-09-02 08:31:11.000000000 -0400
+++ shadow-4.1.2/src/useradd.c	2008-09-02 08:47:31.000000000 -0400
@@ -216,7 +216,7 @@ static void fail_exit (int code)
 #endif
 
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding user", user_name, -1,
+	audit_logger (AUDIT_ADD_USER, Prog, "adding user", user_name, -1,
 		      0);
 #endif
 	SYSLOG ((LOG_INFO, "failed adding user `%s', data deleted", user_name));
@@ -793,7 +793,7 @@ static void grp_update (void)
 			fail_exit (E_GRP_UPDATE);
 		}
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		audit_logger (AUDIT_ADD_USER, Prog,
 			      "adding user to group", user_name, -1, 1);
 #endif
 		SYSLOG ((LOG_INFO, "add `%s' to group `%s'",
@@ -844,7 +844,7 @@ static void grp_update (void)
 			fail_exit (E_GRP_UPDATE);
 		}
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		audit_logger (AUDIT_ADD_USER, Prog,
 			      "adding user to shadow group", user_name, -1, 1);
 #endif
 		SYSLOG ((LOG_INFO, "add `%s' to shadow group `%s'",
@@ -1162,7 +1162,7 @@ static void process_flags (int argc, cha
 				 ("%s: invalid user name '%s'\n"),
 				 Prog, user_name);
 #ifdef WITH_AUDIT
-			audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding user",
+			audit_logger (AUDIT_ADD_USER, Prog, "adding user",
 				      user_name, -1, 0);
 #endif
 			exit (E_BAD_ARG);
@@ -1251,7 +1251,7 @@ static void open_files (void)
 	if (!pw_lock ()) {
 		fprintf (stderr, _("%s: unable to lock password file\n"), Prog);
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		audit_logger (AUDIT_ADD_USER, Prog,
 			      "locking password file", user_name, user_id, 0);
 #endif
 		exit (E_PW_UPDATE);
@@ -1260,7 +1260,7 @@ static void open_files (void)
 	if (!pw_open (O_RDWR)) {
 		fprintf (stderr, _("%s: unable to open password file\n"), Prog);
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		audit_logger (AUDIT_ADD_USER, Prog,
 			      "opening password file", user_name, user_id, 0);
 #endif
 		fail_exit (E_PW_UPDATE);
@@ -1271,7 +1271,7 @@ static void open_files (void)
 			         _("%s: cannot lock shadow password file\n"),
 			         Prog);
 #ifdef WITH_AUDIT
-			audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+			audit_logger (AUDIT_ADD_USER, Prog,
 			              "locking shadow password file", user_name,
 			              user_id, 0);
 #endif
@@ -1283,7 +1283,7 @@ static void open_files (void)
 			         _("%s: cannot open shadow password file\n"),
 			         Prog);
 #ifdef WITH_AUDIT
-			audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+			audit_logger (AUDIT_ADD_USER, Prog,
 			              "opening shadow password file", user_name,
 			              user_id, 0);
 #endif
@@ -1385,6 +1385,10 @@ static void grp_add (void)
 	 * Write out the new group file entry.
 	 */
 	if (!gr_update (&grp)) {
+#ifdef WITH_AUDIT
+		audit_logger (AUDIT_ADD_GROUP, Prog,
+				      "adding group", grp.gr_name, -1, 0);
+#endif
 		fprintf (stderr, _("%s: error adding new group entry\n"), Prog);
 		fail_exit (E_GRP_UPDATE);
 	}
@@ -1393,11 +1397,19 @@ static void grp_add (void)
 	 * Write out the new shadow group entries as well.
 	 */
 	if (is_shadow_grp && !sgr_update (&sgrp)) {
+#ifdef WITH_AUDIT
+		audit_logger (AUDIT_ADD_GROUP, Prog,
+				      "adding group", grp.gr_name, -1, 0);
+#endif
 		fprintf (stderr, _("%s: error adding new group entry\n"), Prog);
 		fail_exit (E_GRP_UPDATE);
 	}
 #endif				/* SHADOWGRP */
 	SYSLOG ((LOG_INFO, "new group: name=%s, GID=%u", user_name, user_gid));
+#ifdef WITH_AUDIT
+	audit_logger (AUDIT_ADD_GROUP, Prog, "adding group", 
+			grp.gr_name, -1, 1);
+#endif
 	do_grp_update++;
 }
 
@@ -1486,13 +1498,13 @@ static void usr_update (void)
 			 ("%s: error adding new shadow password entry\n"),
 			 Prog);
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		audit_logger (AUDIT_ADD_USER, Prog,
 			      "adding shadow password", user_name, user_id, 0);
 #endif
 		fail_exit (E_PW_UPDATE);
 	}
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding user", user_name,
+	audit_logger (AUDIT_ADD_USER, Prog, "adding user", user_name,
 		      user_id, 1);
 #endif
 
@@ -1522,7 +1534,7 @@ static void selinux_update_mapping () {
 				 _("%s: warning: the user name %s to %s SELinux user mapping failed.\n"),
 				 Prog, user_name, user_selinux);
 #ifdef WITH_AUDIT
-			audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+			audit_logger (AUDIT_ADD_USER, Prog,
 				      "adding SELinux user mapping", user_name, user_id, 0);
 #endif        
 		}
@@ -1551,7 +1563,7 @@ static void create_home (void)
 				 ("%s: cannot create directory %s\n"),
 				 Prog, user_home);
 #ifdef WITH_AUDIT
-			audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+			audit_logger (AUDIT_ADD_USER, Prog,
 				      "adding home directory", user_name,
 				      user_id, 0);
 #endif
@@ -1562,7 +1574,7 @@ static void create_home (void)
 		       0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK));
 		home_added++;
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		audit_logger (AUDIT_ADD_USER, Prog,
 			      "adding home directory", user_name, user_id, 1);
 #endif
 #ifdef WITH_SELINUX
@@ -1722,7 +1734,7 @@ int main (int argc, char **argv)
 	if (getpwnam (user_name)) { /* local, no need for xgetpwnam */
 		fprintf (stderr, _("%s: user %s exists\n"), Prog, user_name);
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding user",
+		audit_logger (AUDIT_ADD_USER, Prog, "adding user",
 			      user_name, -1, 0);
 #endif
 		fail_exit (E_NAME_IN_USE);
@@ -1741,7 +1753,7 @@ int main (int argc, char **argv)
 				 ("%s: group %s exists - if you want to add this user to that group, use -g.\n"),
 				 Prog, user_name);
 #ifdef WITH_AUDIT
-			audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+			audit_logger (AUDIT_ADD_GROUP, Prog,
 				      "adding group", user_name, -1, 0);
 #endif
 			fail_exit (E_NAME_IN_USE);
@@ -1772,7 +1784,7 @@ int main (int argc, char **argv)
 			if (getpwuid (user_id) != NULL) {
 				fprintf (stderr, _("%s: UID %u is not unique\n"), Prog, (unsigned int) user_id);
 #ifdef WITH_AUDIT
-				audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding user", user_name, user_id, 0);
+				audit_logger (AUDIT_ADD_USER, Prog, "adding user", user_name, user_id, 0);
 #endif
 				fail_exit (E_UID_IN_USE);
 			}
diff -urp shadow-4.1.2.orig/src/userdel.c shadow-4.1.2/src/userdel.c
--- shadow-4.1.2.orig/src/userdel.c	2008-09-02 08:31:11.000000000 -0400
+++ shadow-4.1.2/src/userdel.c	2008-09-02 09:03:20.000000000 -0400
@@ -170,7 +170,7 @@ static void update_groups (void)
 		 * Update the DBM group file with the new entry as well.
 		 */
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		audit_logger (AUDIT_DEL_USER, Prog,
 			      "deleting user from group", user_name, user_id,
 			      0);
 #endif
@@ -220,8 +220,8 @@ static void update_groups (void)
 #endif
 
 #ifdef WITH_AUDIT
-			audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
-				      "deleting group", user_name, user_id, 0);
+			audit_logger (AUDIT_DEL_GROUP, Prog, "deleting group",
+					grp->gr_name, -1, 1);
 #endif
 			SYSLOG ((LOG_INFO,
 				 "removed group `%s' owned by `%s'\n",
@@ -270,7 +270,7 @@ static void update_groups (void)
 			exit (E_GRP_UPDATE);
 		}
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		audit_logger (AUDIT_DEL_USER, Prog,
 			      "deleting user from shadow group", user_name,
 			      user_id, 0);
 #endif
@@ -327,7 +327,7 @@ static void fail_exit (int code)
 		sgr_unlock ();
 #endif
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting user", user_name,
+	audit_logger (AUDIT_DEL_USER, Prog, "deleting user", user_name,
 		      user_id, 0);
 #endif
 	exit (code);
@@ -344,7 +344,7 @@ static void open_files (void)
 	if (!pw_lock ()) {
 		fprintf (stderr, _("%s: unable to lock password file\n"), Prog);
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		audit_logger (AUDIT_DEL_USER, Prog,
 			      "locking password file", user_name, user_id, 0);
 #endif
 		exit (E_PW_UPDATE);
@@ -352,7 +352,7 @@ static void open_files (void)
 	if (!pw_open (O_RDWR)) {
 		fprintf (stderr, _("%s: unable to open password file\n"), Prog);
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		audit_logger (AUDIT_DEL_USER, Prog,
 			      "opening password file", user_name, user_id, 0);
 #endif
 		fail_exit (E_PW_UPDATE);
@@ -361,7 +361,7 @@ static void open_files (void)
 		fprintf (stderr,
 			 _("%s: cannot lock shadow password file\n"), Prog);
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		audit_logger (AUDIT_DEL_USER, Prog,
 			      "locking shadow password file", user_name,
 			      user_id, 0);
 #endif
@@ -371,7 +371,7 @@ static void open_files (void)
 		fprintf (stderr,
 			 _("%s: cannot open shadow password file\n"), Prog);
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		audit_logger (AUDIT_DEL_USER, Prog,
 			      "opening shadow password file", user_name,
 			      user_id, 0);
 #endif
@@ -380,7 +380,7 @@ static void open_files (void)
 	if (!gr_lock ()) {
 		fprintf (stderr, _("%s: unable to lock group file\n"), Prog);
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "locking group file",
+		audit_logger (AUDIT_DEL_USER, Prog, "locking group file",
 			      user_name, user_id, 0);
 #endif
 		fail_exit (E_GRP_UPDATE);
@@ -388,7 +388,7 @@ static void open_files (void)
 	if (!gr_open (O_RDWR)) {
 		fprintf (stderr, _("%s: cannot open group file\n"), Prog);
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "opening group file",
+		audit_logger (AUDIT_DEL_USER, Prog, "opening group file",
 			      user_name, user_id, 0);
 #endif
 		fail_exit (E_GRP_UPDATE);
@@ -398,7 +398,7 @@ static void open_files (void)
 		fprintf (stderr,
 			 _("%s: unable to lock shadow group file\n"), Prog);
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		audit_logger (AUDIT_DEL_USER, Prog,
 			      "locking shadow group file", user_name, user_id,
 			      0);
 #endif
@@ -408,7 +408,7 @@ static void open_files (void)
 		fprintf (stderr, _("%s: cannot open shadow group file\n"),
 			 Prog);
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		audit_logger (AUDIT_DEL_USER, Prog,
 			      "opening shadow group file", user_name, user_id,
 			      0);
 #endif
@@ -436,7 +436,7 @@ static void update_user (void)
 		fail_exit (E_PW_UPDATE);
 	}
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting user entries",
+	audit_logger (AUDIT_DEL_USER, Prog, "deleting user entries",
 		      user_name, user_id, 1);
 #endif
 	SYSLOG ((LOG_INFO, "delete user `%s'\n", user_name));
@@ -476,7 +476,7 @@ static void user_busy (const char *name,
 			 _("%s: user %s is currently logged in\n"), Prog, name);
 		if (!fflg) {
 #ifdef WITH_AUDIT
-			audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+			audit_logger (AUDIT_DEL_USER, Prog,
 				      "deleting user logged in", name, -1, 0);
 #endif
 			exit (E_USER_BUSY);
@@ -577,7 +577,7 @@ static void remove_mailbox (void)
 	if (fflg) {
 		unlink (mailfile);	/* always remove, ignore errors */
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting mail file",
+		audit_logger (AUDIT_DEL_USER, Prog, "deleting mail file",
 			      user_name, user_id, 1);
 #endif
 		return;
@@ -589,7 +589,7 @@ static void remove_mailbox (void)
 			 ("%s: %s not owned by %s, not removing\n"),
 			 Prog, mailfile, user_name);
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting mail file",
+		audit_logger (AUDIT_DEL_USER, Prog, "deleting mail file",
 			      user_name, user_id, 0);
 #endif
 		return;
@@ -601,7 +601,7 @@ static void remove_mailbox (void)
 	}
 #ifdef WITH_AUDIT
 	else {
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting mail file",
+		audit_logger (AUDIT_DEL_USER, Prog, "deleting mail file",
 			      user_name, user_id, 1);
 	}
 #endif
@@ -713,7 +713,7 @@ int main (int argc, char **argv)
 			fprintf (stderr, _("%s: user %s does not exist\n"),
 				 Prog, user_name);
 #ifdef WITH_AUDIT
-			audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+			audit_logger (AUDIT_DEL_USER, Prog,
 				      "deleting user not found", user_name, -1, 0);
 #endif
 			exit (E_NOTFOUND);
@@ -799,14 +799,14 @@ int main (int argc, char **argv)
 				 _("%s: error removing directory %s\n"),
 				 Prog, user_home);
 #ifdef WITH_AUDIT
-			audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+			audit_logger (AUDIT_DEL_USER, Prog,
 				      "deleting home directory", user_name,
 				      user_id, 1);
 #endif
 			errors++;
 		}
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		audit_logger (AUDIT_DEL_USER, Prog,
 			      "deleting home directory", user_name, user_id, 1);
 #endif
 	}
@@ -838,7 +838,7 @@ int main (int argc, char **argv)
 #endif				/* USE_PAM */
 #ifdef WITH_AUDIT
 	if (errors)
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		audit_logger (AUDIT_DEL_USER, Prog,
 			      "deleting home directory", user_name, -1, 0);
 #endif
 	exit (errors ? E_HOMEDIR : E_SUCCESS);


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- shadow-utils.spec	2 Sep 2008 08:46:52 -0000	1.120
+++ shadow-utils.spec	2 Sep 2008 14:12:30 -0000	1.121
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.1.2
-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
@@ -17,6 +17,7 @@
 Patch2: shadow-4.1.2-selinux.patch
 Patch3: shadow-4.1.2-sysAccountDownhill.patch
 Patch4: shadow-4.1.2-gmSEGV.patch
+Patch5: shadow-4.1.2-audit.patch
 
 License: BSD
 Group: System Environment/Base
@@ -46,6 +47,7 @@
 %patch2 -p1 -b .selinux
 %patch3 -p1 -b .sysAccountDownhill
 %patch4 -p1 -b .gmSEGV
+%patch5 -p1 -b .audit
 
 
 rm po/*.gmo
@@ -186,6 +188,9 @@
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Thu Sep 02 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-6
+- audit improvements, thnx. to sgrubb at redhat.com
+
 * Thu Sep 02 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-5
 - fix groupmems issues (#459825)
 



From fabbione at fedoraproject.org  Tue Sep  2 14:24:40 2008
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue,  2 Sep 2008 14:24:40 +0000 (UTC)
Subject: rpms/cluster/devel .cvsignore, 1.8, 1.9 cluster.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <20080902142440.0557F7011D@cvs1.fedora.phx.redhat.com>

Author: fabbione

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

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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	12 Aug 2008 08:37:55 -0000	1.8
+++ .cvsignore	2 Sep 2008 14:24:09 -0000	1.9
@@ -1 +1 @@
-cluster-2.99.08.tar.gz
+cluster-2.99.09.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cluster.spec	12 Aug 2008 08:37:55 -0000	1.12
+++ cluster.spec	2 Sep 2008 14:24:09 -0000	1.13
@@ -18,7 +18,7 @@
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 2.99.08
+Version: 2.99.09
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -38,8 +38,9 @@
 # Build dependencies
 BuildRequires: perl python
 BuildRequires: glibc-kernheaders glibc-devel
-BuildRequires: libxml2-devel ncurses-devel slang-devel libvolume_id-devel
-BuildRequires: openais-devel >= 0.84-2 openais < 0.85 openldap-devel
+BuildRequires: libxml2-devel ncurses-devel slang-devel libvolume_id-devel openldap-devel
+BuildRequires: corosync-devel >= 0.91-3 corosync-devel < 0.92
+BuildRequires: openais-devel >= 0.90-1 openais-devel < 0.91
 BuildRequires: perl(ExtUtils::MakeMaker)
 %if %{buildxen}
 BuildRequires: nss-devel nspr-devel libvirt-devel xen-libs
@@ -57,6 +58,7 @@
 %if %{buildxen}
   --enable_xen \
 %endif
+  --corosynclibdir=%{_libdir}/corosync \
   --openaislibdir=%{_libdir}/openais \
   --without_kernel_modules \
   --disable_kernel_check
@@ -111,7 +113,8 @@
 Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
-Requires: openais >= 0.84-2 openais < 0.85 sg3_utils
+Requires: corosync >= 0.91-3 corosync < 0.92
+Requires: openais >= 0.90-1 openais < 0.91 sg3_utils
 Requires: sg3_utils OpenIPMI telnet openssh-clients
 Requires: pexpect net-snmp-utils pyOpenSSL
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -300,6 +303,11 @@
 %{_mandir}/man8/gnbd*
 
 %changelog
+* Tue Sep  2 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.09-1
+- New upstream release.
+- Update Requires: and Buildrequires: for new versions of corosync and openais.
+- Update build section to add info about corosync libdir.
+
 * Tue Aug 12 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.08-1
 - New upstream release.
 - Drop local patch that's part of upstream.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Aug 2008 08:37:55 -0000	1.8
+++ sources	2 Sep 2008 14:24:09 -0000	1.9
@@ -1 +1 @@
-fda11d6fd53c169016166a1df0a8d847  cluster-2.99.08.tar.gz
+ff6bd808913542075850b1053bb65f1a  cluster-2.99.09.tar.gz



From rdieter at fedoraproject.org  Tue Sep  2 14:26:11 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  2 Sep 2008 14:26:11 +0000 (UTC)
Subject: rpms/sbcl/devel .cvsignore, 1.39, 1.40 sbcl.spec, 1.93, 1.94 sources,
	1.40, 1.41 sbcl-1.0.16-GNU_SOURCE.patch, 1.1, NONE
Message-ID: <20080902142611.5AC327011F@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore sbcl.spec sources 
Removed Files:
	sbcl-1.0.16-GNU_SOURCE.patch 
Log Message:
* Tue Sep 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.20-1
- sbcl-1.0.20



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	30 Jul 2008 14:35:12 -0000	1.39
+++ .cvsignore	2 Sep 2008 14:25:41 -0000	1.40
@@ -1 +1 @@
-sbcl-1.0.19-source.tar.bz2
+sbcl-1.0.20-source.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- sbcl.spec	30 Jul 2008 15:44:01 -0000	1.93
+++ sbcl.spec	2 Sep 2008 14:25:41 -0000	1.94
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 1.0.19
+Version: 1.0.20
 Release: 1%{?dist}
 
 License: BSD
@@ -75,7 +75,6 @@
 Patch2: sbcl-0.9.5-personality.patch
 Patch3: sbcl-1.0.16-optflags.patch
 Patch4: sbcl-0.9.17-LIB_DIR.patch
-Patch5: sbcl-1.0.16-GNU_SOURCE.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
 Patch7: sbcl-1.0.2-permissive.patch
@@ -107,7 +106,6 @@
 %patch2 -p1 -b .personality
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
-%patch5 -p1 -b .GNU_SOURCE
 %{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
 %patch7 -p1 -b .permissive
 
@@ -239,6 +237,9 @@
 
 
 %changelog
+* Tue Sep 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.20-1
+- sbcl-1.0.20
+
 * Wed Jul 30 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.19-1
 - sbcl-1.0.19
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	30 Jul 2008 14:35:12 -0000	1.40
+++ sources	2 Sep 2008 14:25:41 -0000	1.41
@@ -1 +1 @@
-c84b4b3c2f4293e98f0941a43fb746f4  sbcl-1.0.19-source.tar.bz2
+b1101a7d64f66b943c3e6a7991de68f4  sbcl-1.0.20-source.tar.bz2


--- sbcl-1.0.16-GNU_SOURCE.patch DELETED ---



From rdieter at fedoraproject.org  Tue Sep  2 14:27:15 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  2 Sep 2008 14:27:15 +0000 (UTC)
Subject: rpms/maxima/devel maxima.spec,1.115,1.116
Message-ID: <20080902142715.C05E57011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	maxima.spec 
Log Message:
* Tue Sep 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 5.16.3-2
- respin (sbcl)



Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- maxima.spec	25 Aug 2008 01:48:55 -0000	1.115
+++ maxima.spec	2 Sep 2008 14:26:45 -0000	1.116
@@ -3,7 +3,7 @@
 Name: 	 maxima
 Version: 5.16.3
 
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 License: GPLv2
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -441,6 +441,9 @@
 
 
 %changelog
+* Tue Sep 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 5.16.3-2
+- respin (sbcl)
+
 * Sun Aug 24 2008 Rex Dieter <rdieter at fedoraproject.org> - 5.16.3-1
 - maxima-5.16.3
 



From tmraz at fedoraproject.org  Tue Sep  2 14:32:35 2008
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue,  2 Sep 2008 14:32:35 +0000 (UTC)
Subject: rpms/opensc/devel opensc-0.11.6-develconfig.patch, NONE,
	1.1 .cvsignore, 1.20, 1.21 opensc.spec, 1.38, 1.39 sources, 1.20,
	1.21 opensc-0.11.1-develconfig.patch, 1.1, NONE
Message-ID: <20080902143235.0963D7011D@cvs1.fedora.phx.redhat.com>

Author: tmraz

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

Modified Files:
	.cvsignore opensc.spec sources 
Added Files:
	opensc-0.11.6-develconfig.patch 
Removed Files:
	opensc-0.11.1-develconfig.patch 
Log Message:
* Tue Sep  2 2008 Tomas Mraz <tmraz at redhat.com> - 0.11.6-1
- Update to latest upstream, fixes CVE-2008-2235


opensc-0.11.6-develconfig.patch:

--- NEW FILE opensc-0.11.6-develconfig.patch ---
diff -up opensc-0.11.6/src/libopensc/libopensc.pc.in.config opensc-0.11.6/src/libopensc/libopensc.pc.in
--- opensc-0.11.6/src/libopensc/libopensc.pc.in.config	2008-07-31 14:20:07.000000000 +0200
+++ opensc-0.11.6/src/libopensc/libopensc.pc.in	2008-09-02 14:49:04.000000000 +0200
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libopensc
 Description: libopensc
 Version: @VERSION@
-Libs: -L${libdir} -lopensc -lscconf
+Libs: -L${libdir} -lopensc
 Cflags: -I${includedir}
 
diff -up opensc-0.11.6/src/libopensc/opensc-config.in.config opensc-0.11.6/src/libopensc/opensc-config.in
--- opensc-0.11.6/src/libopensc/opensc-config.in.config	2008-07-31 14:20:07.000000000 +0200
+++ opensc-0.11.6/src/libopensc/opensc-config.in	2008-09-02 14:52:12.000000000 +0200
@@ -15,10 +15,10 @@ prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 exec_prefix_set=no
 
-libdir="@libdir@"
-includedir="@includedir@"
+libdir=""
+includedir=""
 opensc_cflags=""
-opensc_libs="-L${libdir} -lopensc"
+opensc_libs="-lopensc"
 
 usage()
 {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	10 Sep 2007 16:18:55 -0000	1.20
+++ .cvsignore	2 Sep 2008 14:32:04 -0000	1.21
@@ -1 +1 @@
-opensc-0.11.4.tar.gz
+opensc-0.11.6.tar.gz


Index: opensc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- opensc.spec	10 Apr 2008 15:01:45 -0000	1.38
+++ opensc.spec	2 Sep 2008 14:32:04 -0000	1.39
@@ -1,15 +1,15 @@
 %define plugindir %{_libdir}/mozilla/plugins
 
 Name:           opensc
-Version:        0.11.4
-Release:        5%{?dist}
+Version:        0.11.6
+Release:        1%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.opensc-project.org/opensc/
 Source0:        http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.11.1-develconfig.patch
+Patch1:         %{name}-0.11.6-develconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.1.1
@@ -54,9 +54,8 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch1 -p1 -b .config
 sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure # lib64 rpaths
-f=doc/ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 cp -p src/pkcs15init/README ./README.pkcs15init
 cp -p src/scconf/README.scconf .
 # No %{_libdir} here to avoid multilib conflicts; it's just an example
@@ -64,9 +63,12 @@
 
 
 %build
-%configure --disable-dependency-tracking \
-  --disable-static \
-  --with-plugin-dir=%{plugindir} \
+%configure  --disable-static \
+  --enable-nsplugin \
+  --enable-pcsc \
+  --enable-openct \
+  --enable-doc \
+  --with-plugindir=%{plugindir} \
   --with-pin-entry=%{_bindir}/pinentry
 make %{?_smp_mflags}
 
@@ -77,16 +79,14 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf
 
-install -dm 755 _docs/openssh
-install -pm 644 src/openssh/README src/openssh/ask-for-pin.diff _docs/openssh
-cp -pR doc _docs
-rm -r _docs/doc/{*.sh,*.xsl,api,Makefile*,tools}
-
 find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" | xargs rm
 
 rm $RPM_BUILD_ROOT%{plugindir}/opensc-signer.so
 mv $RPM_BUILD_ROOT%{_libdir}/opensc-signer.so $RPM_BUILD_ROOT%{plugindir}
 
+mkdir apidocdir
+mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/api.html apidocdir
+mv -T $RPM_BUILD_ROOT%{_datadir}/doc/%{name} docdir
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,7 +99,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING NEWS README* _docs/doc/
+%doc COPYING NEWS README*
+%doc docdir/*
 %config(noreplace) %{_sysconfdir}/opensc.conf
 %{_bindir}/cardos-info
 %{_bindir}/cryptoflex-tool
@@ -112,9 +113,12 @@
 %{_bindir}/pkcs15-crypt
 %{_bindir}/pkcs15-init
 %{_bindir}/pkcs15-tool
+%{_bindir}/rutoken-tool
 %{_libdir}/lib*.so.*
 %{_libdir}/onepin-opensc-pkcs11.so
 %{_libdir}/opensc-pkcs11.so
+%{_libdir}/pkcs11/onepin-opensc-pkcs11.so
+%{_libdir}/pkcs11/opensc-pkcs11.so
 %{_datadir}/opensc/
 %{_mandir}/man1/cardos-info.1*
 %{_mandir}/man1/cryptoflex-tool.1*
@@ -133,17 +137,21 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc _docs/openssh/
+%doc apidocdir/*
 %{_bindir}/opensc-config
 %{_includedir}/opensc/
 %{_libdir}/lib*.so
 %{_libdir}/pkcs11-spy.so
+%{_libdir}/pkcs11/pkcs11-spy.so
 %{_libdir}/pkgconfig/lib*.pc
 %{_mandir}/man1/opensc-config.1*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Tue Sep  2 2008 Tomas Mraz <tmraz at redhat.com> - 0.11.6-1
+- Update to latest upstream, fixes CVE-2008-2235
+
 * Thu Apr 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> - 0.11.4-5
 - BuildRequire libassuan-devel instead of libassuan-static (bz 441812)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	10 Sep 2007 16:18:55 -0000	1.20
+++ sources	2 Sep 2008 14:32:04 -0000	1.21
@@ -1 +1 @@
-2031aa617be609d50d014d5d370bb8a2  opensc-0.11.4.tar.gz
+a426759f11350c32af2f17a5cd4d5938  opensc-0.11.6.tar.gz


--- opensc-0.11.1-develconfig.patch DELETED ---



From mdehaan at fedoraproject.org  Tue Sep  2 14:39:50 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Tue,  2 Sep 2008 14:39:50 +0000 (UTC)
Subject: rpms/cobbler/EL-4 .cvsignore, 1.38, 1.39 cobbler.spec, 1.48,
	1.49 sources, 1.46, 1.47
Message-ID: <20080902143950.0A0E67011D@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8379/EL-4

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.1, which fixes merge issues with 1.2.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	29 Aug 2008 20:28:50 -0000	1.38
+++ .cvsignore	2 Sep 2008 14:39:19 -0000	1.39
@@ -35,3 +35,4 @@
 cobbler-1.0.2.tar.gz
 cobbler-1.0.3.tar.gz
 cobbler-1.2.0.tar.gz
+cobbler-1.2.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- cobbler.spec	29 Aug 2008 20:28:50 -0000	1.48
+++ cobbler.spec	2 Sep 2008 14:39:19 -0000	1.49
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.0
+Version: 1.2.1
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -155,24 +155,36 @@
 %dir /var/lib/cobbler/config/images.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
+%dir /var/lib/cobbler/triggers/add/distro
+%dir /var/lib/cobbler/triggers/add/distro
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
+%dir /var/lib/cobbler/triggers/add/profile
 %dir /var/lib/cobbler/triggers/add/profile/pre
 %dir /var/lib/cobbler/triggers/add/profile/post
+%dir /var/lib/cobbler/triggers/add/system
 %dir /var/lib/cobbler/triggers/add/system/pre
 %dir /var/lib/cobbler/triggers/add/system/post
+%dir /var/lib/cobbler/triggers/add/repo
 %dir /var/lib/cobbler/triggers/add/repo/pre
 %dir /var/lib/cobbler/triggers/add/repo/post
+%dir /var/lib/cobbler/triggers/delete
+%dir /var/lib/cobbler/triggers/delete/distro
 %dir /var/lib/cobbler/triggers/delete/distro/pre
 %dir /var/lib/cobbler/triggers/delete/distro/post
+%dir /var/lib/cobbler/triggers/delete/profile
 %dir /var/lib/cobbler/triggers/delete/profile/pre
 %dir /var/lib/cobbler/triggers/delete/profile/post
+%dir /var/lib/cobbler/triggers/delete/system
 %dir /var/lib/cobbler/triggers/delete/system/pre
 %dir /var/lib/cobbler/triggers/delete/system/post
+%dir /var/lib/cobbler/triggers/delete/repo
 %dir /var/lib/cobbler/triggers/delete/repo/pre
 %dir /var/lib/cobbler/triggers/delete/repo/post
+%dir /var/lib/cobbler/triggers/sync
 %dir /var/lib/cobbler/triggers/sync/pre
 %dir /var/lib/cobbler/triggers/sync/post
+%dir /var/lib/cobbler/triggers/install
 %dir /var/lib/cobbler/triggers/install/pre
 %dir /var/lib/cobbler/triggers/install/post
 %dir /var/lib/cobbler/snippets/
@@ -206,6 +218,10 @@
 
 %changelog
 
+* Tue Sep 02 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.1-1
+- Upstream changes (see CHANGELOG)
+- Package unowned directories
+
 * Fri Aug 29 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.0-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	29 Aug 2008 20:28:50 -0000	1.46
+++ sources	2 Sep 2008 14:39:19 -0000	1.47
@@ -2,3 +2,4 @@
 a5ab7e39d616e3a13269b6fe088aec4c  cobbler-1.0.2.tar.gz
 95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
+2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz



From mdehaan at fedoraproject.org  Tue Sep  2 14:39:50 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Tue,  2 Sep 2008 14:39:50 +0000 (UTC)
Subject: rpms/cobbler/EL-5 .cvsignore, 1.42, 1.43 cobbler.spec, 1.50,
	1.51 sources, 1.49, 1.50
Message-ID: <20080902143950.3448F7011D@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8379/EL-5

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.1, which fixes merge issues with 1.2.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	29 Aug 2008 20:28:50 -0000	1.42
+++ .cvsignore	2 Sep 2008 14:39:19 -0000	1.43
@@ -39,3 +39,4 @@
 cobbler-1.0.2.tar.gz
 cobbler-1.0.3.tar.gz
 cobbler-1.2.0.tar.gz
+cobbler-1.2.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- cobbler.spec	29 Aug 2008 20:28:50 -0000	1.50
+++ cobbler.spec	2 Sep 2008 14:39:20 -0000	1.51
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.0
+Version: 1.2.1
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -155,24 +155,36 @@
 %dir /var/lib/cobbler/config/images.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
+%dir /var/lib/cobbler/triggers/add/distro
+%dir /var/lib/cobbler/triggers/add/distro
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
+%dir /var/lib/cobbler/triggers/add/profile
 %dir /var/lib/cobbler/triggers/add/profile/pre
 %dir /var/lib/cobbler/triggers/add/profile/post
+%dir /var/lib/cobbler/triggers/add/system
 %dir /var/lib/cobbler/triggers/add/system/pre
 %dir /var/lib/cobbler/triggers/add/system/post
+%dir /var/lib/cobbler/triggers/add/repo
 %dir /var/lib/cobbler/triggers/add/repo/pre
 %dir /var/lib/cobbler/triggers/add/repo/post
+%dir /var/lib/cobbler/triggers/delete
+%dir /var/lib/cobbler/triggers/delete/distro
 %dir /var/lib/cobbler/triggers/delete/distro/pre
 %dir /var/lib/cobbler/triggers/delete/distro/post
+%dir /var/lib/cobbler/triggers/delete/profile
 %dir /var/lib/cobbler/triggers/delete/profile/pre
 %dir /var/lib/cobbler/triggers/delete/profile/post
+%dir /var/lib/cobbler/triggers/delete/system
 %dir /var/lib/cobbler/triggers/delete/system/pre
 %dir /var/lib/cobbler/triggers/delete/system/post
+%dir /var/lib/cobbler/triggers/delete/repo
 %dir /var/lib/cobbler/triggers/delete/repo/pre
 %dir /var/lib/cobbler/triggers/delete/repo/post
+%dir /var/lib/cobbler/triggers/sync
 %dir /var/lib/cobbler/triggers/sync/pre
 %dir /var/lib/cobbler/triggers/sync/post
+%dir /var/lib/cobbler/triggers/install
 %dir /var/lib/cobbler/triggers/install/pre
 %dir /var/lib/cobbler/triggers/install/post
 %dir /var/lib/cobbler/snippets/
@@ -206,6 +218,10 @@
 
 %changelog
 
+* Tue Sep 02 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.1-1
+- Upstream changes (see CHANGELOG)
+- Package unowned directories
+
 * Fri Aug 29 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.0-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	29 Aug 2008 20:28:50 -0000	1.49
+++ sources	2 Sep 2008 14:39:20 -0000	1.50
@@ -2,3 +2,4 @@
 a5ab7e39d616e3a13269b6fe088aec4c  cobbler-1.0.2.tar.gz
 95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
+2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz



From mdehaan at fedoraproject.org  Tue Sep  2 14:39:50 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Tue,  2 Sep 2008 14:39:50 +0000 (UTC)
Subject: rpms/cobbler/F-9 .cvsignore, 1.38, 1.39 cobbler.spec, 1.50,
	1.51 sources, 1.45, 1.46
Message-ID: <20080902143950.F3B0C7011D@cvs1.fedora.phx.redhat.com>

Author: mdehaan

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

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.1, which fixes merge issues with 1.2.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	29 Aug 2008 20:28:51 -0000	1.38
+++ .cvsignore	2 Sep 2008 14:39:20 -0000	1.39
@@ -35,3 +35,4 @@
 cobbler-1.0.2.tar.gz
 cobbler-1.0.3.tar.gz
 cobbler-1.2.0.tar.gz
+cobbler-1.2.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/cobbler.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- cobbler.spec	29 Aug 2008 20:28:51 -0000	1.50
+++ cobbler.spec	2 Sep 2008 14:39:20 -0000	1.51
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.0
+Version: 1.2.1
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -155,24 +155,36 @@
 %dir /var/lib/cobbler/config/images.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
+%dir /var/lib/cobbler/triggers/add/distro
+%dir /var/lib/cobbler/triggers/add/distro
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
+%dir /var/lib/cobbler/triggers/add/profile
 %dir /var/lib/cobbler/triggers/add/profile/pre
 %dir /var/lib/cobbler/triggers/add/profile/post
+%dir /var/lib/cobbler/triggers/add/system
 %dir /var/lib/cobbler/triggers/add/system/pre
 %dir /var/lib/cobbler/triggers/add/system/post
+%dir /var/lib/cobbler/triggers/add/repo
 %dir /var/lib/cobbler/triggers/add/repo/pre
 %dir /var/lib/cobbler/triggers/add/repo/post
+%dir /var/lib/cobbler/triggers/delete
+%dir /var/lib/cobbler/triggers/delete/distro
 %dir /var/lib/cobbler/triggers/delete/distro/pre
 %dir /var/lib/cobbler/triggers/delete/distro/post
+%dir /var/lib/cobbler/triggers/delete/profile
 %dir /var/lib/cobbler/triggers/delete/profile/pre
 %dir /var/lib/cobbler/triggers/delete/profile/post
+%dir /var/lib/cobbler/triggers/delete/system
 %dir /var/lib/cobbler/triggers/delete/system/pre
 %dir /var/lib/cobbler/triggers/delete/system/post
+%dir /var/lib/cobbler/triggers/delete/repo
 %dir /var/lib/cobbler/triggers/delete/repo/pre
 %dir /var/lib/cobbler/triggers/delete/repo/post
+%dir /var/lib/cobbler/triggers/sync
 %dir /var/lib/cobbler/triggers/sync/pre
 %dir /var/lib/cobbler/triggers/sync/post
+%dir /var/lib/cobbler/triggers/install
 %dir /var/lib/cobbler/triggers/install/pre
 %dir /var/lib/cobbler/triggers/install/post
 %dir /var/lib/cobbler/snippets/
@@ -206,6 +218,10 @@
 
 %changelog
 
+* Tue Sep 02 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.1-1
+- Upstream changes (see CHANGELOG)
+- Package unowned directories
+
 * Fri Aug 29 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.0-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	29 Aug 2008 20:28:51 -0000	1.45
+++ sources	2 Sep 2008 14:39:20 -0000	1.46
@@ -2,3 +2,4 @@
 a5ab7e39d616e3a13269b6fe088aec4c  cobbler-1.0.2.tar.gz
 95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
+2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz



From mdehaan at fedoraproject.org  Tue Sep  2 14:39:51 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Tue,  2 Sep 2008 14:39:51 +0000 (UTC)
Subject: rpms/cobbler/devel .cvsignore, 1.38, 1.39 cobbler.spec, 1.52,
	1.53 sources, 1.47, 1.48
Message-ID: <20080902143951.31F497011D@cvs1.fedora.phx.redhat.com>

Author: mdehaan

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

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.1, which fixes merge issues with 1.2.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	29 Aug 2008 20:28:51 -0000	1.38
+++ .cvsignore	2 Sep 2008 14:39:20 -0000	1.39
@@ -35,3 +35,4 @@
 cobbler-1.0.2.tar.gz
 cobbler-1.0.3.tar.gz
 cobbler-1.2.0.tar.gz
+cobbler-1.2.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- cobbler.spec	2 Sep 2008 11:50:17 -0000	1.52
+++ cobbler.spec	2 Sep 2008 14:39:20 -0000	1.53
@@ -2,8 +2,8 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.0
-Release: 2%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -92,7 +92,6 @@
 /var/www/cobbler/svc/*.py*
 
 %defattr(755,apache,apache)
-%dir /usr/share/cobbler/
 %dir /usr/share/cobbler/webui_templates
 %defattr(444,apache,apache)
 /usr/share/cobbler/webui_templates/*.tmpl
@@ -134,7 +133,6 @@
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
 %dir %{python_sitelib}/cobbler/modules
-%dir %{python_sitelib}/cobbler/server
 %dir %{python_sitelib}/cobbler/webui
 %{python_sitelib}/cobbler/*.py*
 %{python_sitelib}/cobbler/yaml/*.py*
@@ -157,37 +155,36 @@
 %dir /var/lib/cobbler/config/images.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
-%dir /var/lib/cobbler/triggers/
-%dir /var/lib/cobbler/triggers/add/
-%dir /var/lib/cobbler/triggers/add/distro/
+%dir /var/lib/cobbler/triggers/add/distro
+%dir /var/lib/cobbler/triggers/add/distro
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
-%dir /var/lib/cobbler/triggers/add/profile/
+%dir /var/lib/cobbler/triggers/add/profile
 %dir /var/lib/cobbler/triggers/add/profile/pre
 %dir /var/lib/cobbler/triggers/add/profile/post
-%dir /var/lib/cobbler/triggers/add/system/
+%dir /var/lib/cobbler/triggers/add/system
 %dir /var/lib/cobbler/triggers/add/system/pre
 %dir /var/lib/cobbler/triggers/add/system/post
-%dir /var/lib/cobbler/triggers/add/repo/
+%dir /var/lib/cobbler/triggers/add/repo
 %dir /var/lib/cobbler/triggers/add/repo/pre
 %dir /var/lib/cobbler/triggers/add/repo/post
-%dir /var/lib/cobbler/triggers/delete/
-%dir /var/lib/cobbler/triggers/delete/distro/
+%dir /var/lib/cobbler/triggers/delete
+%dir /var/lib/cobbler/triggers/delete/distro
 %dir /var/lib/cobbler/triggers/delete/distro/pre
 %dir /var/lib/cobbler/triggers/delete/distro/post
-%dir /var/lib/cobbler/triggers/delete/profile/
+%dir /var/lib/cobbler/triggers/delete/profile
 %dir /var/lib/cobbler/triggers/delete/profile/pre
 %dir /var/lib/cobbler/triggers/delete/profile/post
-%dir /var/lib/cobbler/triggers/delete/system/
+%dir /var/lib/cobbler/triggers/delete/system
 %dir /var/lib/cobbler/triggers/delete/system/pre
 %dir /var/lib/cobbler/triggers/delete/system/post
-%dir /var/lib/cobbler/triggers/delete/repo/
+%dir /var/lib/cobbler/triggers/delete/repo
 %dir /var/lib/cobbler/triggers/delete/repo/pre
 %dir /var/lib/cobbler/triggers/delete/repo/post
-%dir /var/lib/cobbler/triggers/sync/
+%dir /var/lib/cobbler/triggers/sync
 %dir /var/lib/cobbler/triggers/sync/pre
 %dir /var/lib/cobbler/triggers/sync/post
-%dir /var/lib/cobbler/triggers/install/
+%dir /var/lib/cobbler/triggers/install
 %dir /var/lib/cobbler/triggers/install/pre
 %dir /var/lib/cobbler/triggers/install/post
 %dir /var/lib/cobbler/snippets/
@@ -220,8 +217,10 @@
 
 
 %changelog
-* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.2.0-2
-- Include lots of unowned directories.
+
+* Tue Sep 02 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.1-1
+- Upstream changes (see CHANGELOG)
+- Package unowned directories
 
 * Fri Aug 29 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.0-1
 - Upstream changes (see CHANGELOG)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	29 Aug 2008 20:28:51 -0000	1.47
+++ sources	2 Sep 2008 14:39:21 -0000	1.48
@@ -2,3 +2,4 @@
 a5ab7e39d616e3a13269b6fe088aec4c  cobbler-1.0.2.tar.gz
 95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
+2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz



From mdehaan at fedoraproject.org  Tue Sep  2 14:39:50 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Tue,  2 Sep 2008 14:39:50 +0000 (UTC)
Subject: rpms/cobbler/F-7 .cvsignore, 1.38, 1.39 cobbler.spec, 1.48,
	1.49 sources, 1.46, 1.47
Message-ID: <20080902143950.7C4BD7011D@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8379/F-7

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.1, which fixes merge issues with 1.2.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	29 Aug 2008 20:28:51 -0000	1.38
+++ .cvsignore	2 Sep 2008 14:39:20 -0000	1.39
@@ -35,3 +35,4 @@
 cobbler-1.0.2.tar.gz
 cobbler-1.0.3.tar.gz
 cobbler-1.2.0.tar.gz
+cobbler-1.2.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/cobbler.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- cobbler.spec	29 Aug 2008 20:28:51 -0000	1.48
+++ cobbler.spec	2 Sep 2008 14:39:20 -0000	1.49
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.0
+Version: 1.2.1
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -155,24 +155,36 @@
 %dir /var/lib/cobbler/config/images.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
+%dir /var/lib/cobbler/triggers/add/distro
+%dir /var/lib/cobbler/triggers/add/distro
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
+%dir /var/lib/cobbler/triggers/add/profile
 %dir /var/lib/cobbler/triggers/add/profile/pre
 %dir /var/lib/cobbler/triggers/add/profile/post
+%dir /var/lib/cobbler/triggers/add/system
 %dir /var/lib/cobbler/triggers/add/system/pre
 %dir /var/lib/cobbler/triggers/add/system/post
+%dir /var/lib/cobbler/triggers/add/repo
 %dir /var/lib/cobbler/triggers/add/repo/pre
 %dir /var/lib/cobbler/triggers/add/repo/post
+%dir /var/lib/cobbler/triggers/delete
+%dir /var/lib/cobbler/triggers/delete/distro
 %dir /var/lib/cobbler/triggers/delete/distro/pre
 %dir /var/lib/cobbler/triggers/delete/distro/post
+%dir /var/lib/cobbler/triggers/delete/profile
 %dir /var/lib/cobbler/triggers/delete/profile/pre
 %dir /var/lib/cobbler/triggers/delete/profile/post
+%dir /var/lib/cobbler/triggers/delete/system
 %dir /var/lib/cobbler/triggers/delete/system/pre
 %dir /var/lib/cobbler/triggers/delete/system/post
+%dir /var/lib/cobbler/triggers/delete/repo
 %dir /var/lib/cobbler/triggers/delete/repo/pre
 %dir /var/lib/cobbler/triggers/delete/repo/post
+%dir /var/lib/cobbler/triggers/sync
 %dir /var/lib/cobbler/triggers/sync/pre
 %dir /var/lib/cobbler/triggers/sync/post
+%dir /var/lib/cobbler/triggers/install
 %dir /var/lib/cobbler/triggers/install/pre
 %dir /var/lib/cobbler/triggers/install/post
 %dir /var/lib/cobbler/snippets/
@@ -206,6 +218,10 @@
 
 %changelog
 
+* Tue Sep 02 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.1-1
+- Upstream changes (see CHANGELOG)
+- Package unowned directories
+
 * Fri Aug 29 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.0-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	29 Aug 2008 20:28:51 -0000	1.46
+++ sources	2 Sep 2008 14:39:20 -0000	1.47
@@ -2,3 +2,4 @@
 a5ab7e39d616e3a13269b6fe088aec4c  cobbler-1.0.2.tar.gz
 95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
+2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz



From mdehaan at fedoraproject.org  Tue Sep  2 14:39:50 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Tue,  2 Sep 2008 14:39:50 +0000 (UTC)
Subject: rpms/cobbler/F-8 .cvsignore, 1.38, 1.39 cobbler.spec, 1.47,
	1.48 sources, 1.46, 1.47
Message-ID: <20080902143950.B42D17011D@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8379/F-8

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.1, which fixes merge issues with 1.2.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	29 Aug 2008 20:28:51 -0000	1.38
+++ .cvsignore	2 Sep 2008 14:39:20 -0000	1.39
@@ -35,3 +35,4 @@
 cobbler-1.0.2.tar.gz
 cobbler-1.0.3.tar.gz
 cobbler-1.2.0.tar.gz
+cobbler-1.2.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/cobbler.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- cobbler.spec	29 Aug 2008 20:28:51 -0000	1.47
+++ cobbler.spec	2 Sep 2008 14:39:20 -0000	1.48
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.0
+Version: 1.2.1
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -155,24 +155,36 @@
 %dir /var/lib/cobbler/config/images.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
+%dir /var/lib/cobbler/triggers/add/distro
+%dir /var/lib/cobbler/triggers/add/distro
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
+%dir /var/lib/cobbler/triggers/add/profile
 %dir /var/lib/cobbler/triggers/add/profile/pre
 %dir /var/lib/cobbler/triggers/add/profile/post
+%dir /var/lib/cobbler/triggers/add/system
 %dir /var/lib/cobbler/triggers/add/system/pre
 %dir /var/lib/cobbler/triggers/add/system/post
+%dir /var/lib/cobbler/triggers/add/repo
 %dir /var/lib/cobbler/triggers/add/repo/pre
 %dir /var/lib/cobbler/triggers/add/repo/post
+%dir /var/lib/cobbler/triggers/delete
+%dir /var/lib/cobbler/triggers/delete/distro
 %dir /var/lib/cobbler/triggers/delete/distro/pre
 %dir /var/lib/cobbler/triggers/delete/distro/post
+%dir /var/lib/cobbler/triggers/delete/profile
 %dir /var/lib/cobbler/triggers/delete/profile/pre
 %dir /var/lib/cobbler/triggers/delete/profile/post
+%dir /var/lib/cobbler/triggers/delete/system
 %dir /var/lib/cobbler/triggers/delete/system/pre
 %dir /var/lib/cobbler/triggers/delete/system/post
+%dir /var/lib/cobbler/triggers/delete/repo
 %dir /var/lib/cobbler/triggers/delete/repo/pre
 %dir /var/lib/cobbler/triggers/delete/repo/post
+%dir /var/lib/cobbler/triggers/sync
 %dir /var/lib/cobbler/triggers/sync/pre
 %dir /var/lib/cobbler/triggers/sync/post
+%dir /var/lib/cobbler/triggers/install
 %dir /var/lib/cobbler/triggers/install/pre
 %dir /var/lib/cobbler/triggers/install/post
 %dir /var/lib/cobbler/snippets/
@@ -206,6 +218,10 @@
 
 %changelog
 
+* Tue Sep 02 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.1-1
+- Upstream changes (see CHANGELOG)
+- Package unowned directories
+
 * Fri Aug 29 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.0-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	29 Aug 2008 20:28:51 -0000	1.46
+++ sources	2 Sep 2008 14:39:20 -0000	1.47
@@ -2,3 +2,4 @@
 a5ab7e39d616e3a13269b6fe088aec4c  cobbler-1.0.2.tar.gz
 95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
+2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz



From ivaxer at fedoraproject.org  Tue Sep  2 14:52:14 2008
From: ivaxer at fedoraproject.org (John A. Khvatov)
Date: Tue,  2 Sep 2008 14:52:14 +0000 (UTC)
Subject: rpms/gitosis/devel gitosis.spec, 1.1, 1.2 import.log, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080902145214.C6F827011D@cvs1.fedora.phx.redhat.com>

Author: ivaxer

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

Modified Files:
	gitosis.spec import.log sources 
Log Message:
upstream update for compatibility with git 1.6.



Index: gitosis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gitosis/devel/gitosis.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gitosis.spec	25 Aug 2008 05:58:23 -0000	1.1
+++ gitosis.spec	2 Sep 2008 14:51:44 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           gitosis
 Version:        0.2
-Release:        5.20080730git%{?dist}
+Release:        6.20080825git%{?dist}
 Summary:        Git repository hosting application
 
 Group:          Applications/System
@@ -12,7 +12,7 @@
 # following commands to generate the tarball:
 # $ git-clone --bare git://eagain.net/gitosis.git gitosis
 # $ cd gitosis
-# $ git-archive --format=tar --prefix=gitosis-0.2/ 0fd228752e94539cb232abe7a85adb08b6182eb9 | gzip > gitosis-0.2.tar.gz
+# $ git-archive --format=tar --prefix=gitosis-0.2/ 44c7e7f0dca54f55fcc254d0344984fb8390098b | gzip > ../gitosis-0.2.tar.gz
 Source0:        gitosis-%{version}.tar.gz
 Source1:        README.fedora
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -64,6 +64,9 @@
 %dir %attr(0755,gitosis,gitosis) %{_localstatedir}/lib/gitosis
 
 %changelog
+* Tue Sep  2 2008 John A. Khvatov <ivaxer at fedoraproject.org> 0.2-6.20080825git
+- upstream update for compatibility with git 1.6.
+
 * Wed Aug 13 2008 John A. Khvatov <ivaxer at gmail.com> 0.2-5.20080730git
 - Changed license tag GPL+
 - Wrote Source URL comment


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gitosis/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Aug 2008 05:58:23 -0000	1.1
+++ import.log	2 Sep 2008 14:51:44 -0000	1.2
@@ -1 +1,2 @@
 gitosis-0_2-5_20080730git_fc9:HEAD:gitosis-0.2-5.20080730git.fc9.src.rpm:1219643838
+gitosis-0_2-6_20080825git_fc9:HEAD:gitosis-0.2-6.20080825git.fc9.src.rpm:1220366872


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gitosis/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2008 05:58:23 -0000	1.2
+++ sources	2 Sep 2008 14:51:44 -0000	1.3
@@ -1 +1 @@
-1eb31df08df777898832bd3a7fcb0dc3  gitosis-0.2.tar.gz
+8280c2393c37b397392dbfb7d6dc8e66  gitosis-0.2.tar.gz



From pkgdb at fedoraproject.org  Tue Sep  2 14:54:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 14:54:25 +0000
Subject: [pkgdb] libical had acl change status
Message-ID: <20080902145425.28E72208D83@bastion.fedora.phx.redhat.com>

rishi has set the watchbugzilla acl on libical (Fedora devel) to Approved for rdieter

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



From pkgdb at fedoraproject.org  Tue Sep  2 14:54:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 14:54:25 +0000
Subject: [pkgdb] libical had acl change status
Message-ID: <20080902145426.0D16B208D86@bastion.fedora.phx.redhat.com>

rishi has set the watchcommits acl on libical (Fedora devel) to Approved for rdieter

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



From pkgdb at fedoraproject.org  Tue Sep  2 14:55:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 14:55:05 +0000
Subject: [pkgdb] opensm: steved has requested commit
Message-ID: <20080902145505.7D902208D84@bastion.fedora.phx.redhat.com>

steved has requested the commit acl on opensm (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 14:56:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 14:56:03 +0000
Subject: [pkgdb] libcxgb3: steved has requested commit
Message-ID: <20080902145603.E6C5920896B@bastion.fedora.phx.redhat.com>

steved has requested the commit acl on libcxgb3 (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 14:56:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 14:56:33 +0000
Subject: [pkgdb] libibcm: steved has requested commit
Message-ID: <20080902145633.2FDD620896B@bastion.fedora.phx.redhat.com>

steved has requested the commit acl on libibcm (Fedora devel)

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



From kyle at fedoraproject.org  Tue Sep  2 14:56:53 2008
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue,  2 Sep 2008 14:56:53 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-iwlwifi-use-dma_alloc_coherent.patch,
	NONE, 1.1 drm-nouveau.patch, 1.2, 1.3 kernel.spec, 1.919, 1.920
Message-ID: <20080902145653.8A55770120@cvs1.fedora.phx.redhat.com>

Author: kyle

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

Modified Files:
	drm-nouveau.patch kernel.spec 
Added Files:
	linux-2.6-iwlwifi-use-dma_alloc_coherent.patch 
Log Message:
* Tue Sep 02 2008 Kyle McMartin <kyle at redhat.com>
- hopefully fix the iwlwifi issues.
- add an include <linux/pagemap.h> to drm-nouveau to hopefully fix
  the build on powerpc64.


linux-2.6-iwlwifi-use-dma_alloc_coherent.patch:

--- NEW FILE linux-2.6-iwlwifi-use-dma_alloc_coherent.patch ---
Index: linux-2.6.26.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h
===================================================================
--- linux-2.6.26.noarch.orig/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ linux-2.6.26.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -135,6 +135,7 @@ struct iwl_tx_info {
 struct iwl_tx_queue {
 	struct iwl_queue q;
 	struct iwl_tfd_frame *bd;
+	dma_addr_t dma_addr_cmd[TFD_TX_CMD_SLOTS];
 	struct iwl_cmd *cmd[TFD_TX_CMD_SLOTS];
 	struct iwl_tx_info *txb;
 	int need_update;
Index: linux-2.6.26.noarch/drivers/net/wireless/iwlwifi/iwl-tx.c
===================================================================
--- linux-2.6.26.noarch.orig/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ linux-2.6.26.noarch/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -212,7 +212,7 @@ static void iwl_tx_queue_free(struct iwl
 {
 	struct iwl_tx_queue *txq = &priv->txq[txq_id];
 	struct iwl_queue *q = &txq->q;
-	struct pci_dev *dev = priv->pci_dev;
+	struct device *dev = &priv->pci_dev->dev;
 	int i, slots_num, len;
 
 	if (q->n_bd == 0)
@@ -223,22 +223,22 @@ static void iwl_tx_queue_free(struct iwl
 	     q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd))
 		iwl_hw_txq_free_tfd(priv, txq);
 
-	len = sizeof(struct iwl_cmd) * q->n_window;
-	if (q->id == IWL_CMD_QUEUE_NUM)
-		len += IWL_MAX_SCAN_SIZE;
-
 	/* De-alloc array of command/tx buffers */
+	len = sizeof(struct iwl_cmd);
 	slots_num = (txq_id == IWL_CMD_QUEUE_NUM) ?
 			TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;
 	for (i = 0; i < slots_num; i++)
-		kfree(txq->cmd[i]);
+		dma_free_coherent(dev, len, txq->cmd[i],
+				txq->dma_addr_cmd[i]);
 	if (txq_id == IWL_CMD_QUEUE_NUM)
-		kfree(txq->cmd[slots_num]);
+		dma_free_coherent(dev, len + IWL_MAX_SCAN_SIZE, txq->cmd[i],
+				txq->dma_addr_cmd[i]);
 
 	/* De-alloc circular buffer of TFDs */
 	if (txq->q.n_bd)
-		pci_free_consistent(dev, sizeof(struct iwl_tfd_frame) *
-				    txq->q.n_bd, txq->bd, txq->q.dma_addr);
+		pci_free_consistent(priv->pci_dev,
+			sizeof(struct iwl_tfd_frame) * txq->q.n_bd,
+			txq->bd, txq->q.dma_addr);
 
 	/* De-alloc array of per-TFD driver data */
 	kfree(txq->txb);
@@ -406,6 +406,7 @@ static int iwl_tx_queue_init(struct iwl_
 			     struct iwl_tx_queue *txq,
 			     int slots_num, u32 txq_id)
 {
+	struct device *dev = &priv->pci_dev->dev;
 	int i, len;
 	int rc = 0;
 
@@ -426,16 +427,27 @@ static int iwl_tx_queue_init(struct iwl_
 				continue;
 		}
 
-		txq->cmd[i] = kmalloc(len, GFP_KERNEL | GFP_DMA);
-		if (!txq->cmd[i])
+		txq->cmd[i] = dma_alloc_coherent(dev, len,
+				&txq->dma_addr_cmd[i], GFP_KERNEL);
+		if (!txq->cmd[i]) {
+			len = sizeof(struct iwl_cmd);
+			for (--i; i >= 0; --i)
+				dma_free_coherent(dev, len, txq->cmd[i],
+					txq->dma_addr_cmd[i]);
 			return -ENOMEM;
+		}
 	}
 
 	/* Alloc driver data array and TFD circular buffer */
 	rc = iwl_tx_queue_alloc(priv, txq, txq_id);
 	if (rc) {
+		len = sizeof(struct iwl_cmd);
 		for (i = 0; i < slots_num; i++)
-			kfree(txq->cmd[i]);
+			dma_free_coherent(dev, len, txq->cmd[i],
+				txq->dma_addr_cmd[i]);
+		if (txq_id == IWL_CMD_QUEUE_NUM)
+			dma_free_coherent(dev, len + IWL_MAX_SCAN_SIZE,
+				txq->cmd[i], txq->dma_addr_cmd[i]);
 
 		return -ENOMEM;
 	}
@@ -911,9 +923,7 @@ int iwl_tx_skb(struct iwl_priv *priv, st
 
 	/* Physical address of this Tx command's header (not MAC header!),
 	 * within command buffer array. */
-	txcmd_phys = pci_map_single(priv->pci_dev, out_cmd,
-				sizeof(struct iwl_cmd), PCI_DMA_TODEVICE);
-	txcmd_phys += offsetof(struct iwl_cmd, hdr);
+	txcmd_phys = txq->dma_addr_cmd[idx] + offsetof(struct iwl_cmd, hdr);
 
 	/* Add buffer containing Tx command and MAC(!) header to TFD's
 	 * first entry */
@@ -1060,9 +1070,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *pr
 		out_cmd->hdr.sequence |= cpu_to_le16(SEQ_HUGE_FRAME);
 	len = (idx == TFD_CMD_SLOTS) ?
 			IWL_MAX_SCAN_SIZE : sizeof(struct iwl_cmd);
-	phys_addr = pci_map_single(priv->pci_dev, out_cmd, len,
-						PCI_DMA_TODEVICE);
-	phys_addr += offsetof(struct iwl_cmd, hdr);
+	phys_addr = txq->dma_addr_cmd[idx] + offsetof(struct iwl_cmd, hdr);
 	iwl_hw_txq_attach_buf_to_tfd(priv, tfd, phys_addr, fix_size);
 
 	IWL_DEBUG_HC("Sending command %s (#%x), seq: 0x%04X, "
@@ -1127,9 +1135,6 @@ static void iwl_hcmd_queue_reclaim(struc
 {
 	struct iwl_tx_queue *txq = &priv->txq[txq_id];
 	struct iwl_queue *q = &txq->q;
-	struct iwl_tfd_frame *bd = &txq->bd[index];
-	dma_addr_t dma_addr;
-	int is_odd, buf_len;
 	int nfreed = 0;
 
 	if ((index >= q->n_bd) || (iwl_queue_used(q, index) == 0)) {
@@ -1147,19 +1152,7 @@ static void iwl_hcmd_queue_reclaim(struc
 					q->write_ptr, q->read_ptr);
 			queue_work(priv->workqueue, &priv->restart);
 		}
-		is_odd = (index/2) & 0x1;
-		if (is_odd) {
-			dma_addr = IWL_GET_BITS(bd->pa[index], tb2_addr_lo16) |
-					(IWL_GET_BITS(bd->pa[index],
-							tb2_addr_hi20) << 16);
-			buf_len = IWL_GET_BITS(bd->pa[index], tb2_len);
-		} else {
-			dma_addr = le32_to_cpu(bd->pa[index].tb1_addr);
-			buf_len = IWL_GET_BITS(bd->pa[index], tb1_len);
-		}
 
-		pci_unmap_single(priv->pci_dev, dma_addr, buf_len,
-				 PCI_DMA_TODEVICE);
 		nfreed++;
 	}
 }

drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- drm-nouveau.patch	2 Sep 2008 11:13:39 -0000	1.2
+++ drm-nouveau.patch	2 Sep 2008 14:56:52 -0000	1.3
@@ -5605,9 +5605,10 @@
 index 0000000..b35bfb7
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
-@@ -0,0 +1,341 @@
+@@ -0,0 +1,342 @@
 +#include "drmP.h"
 +#include "nouveau_drv.h"
++#include <linux/pagemap.h>
 +
 +#define NV_CTXDMA_PAGE_SHIFT 12
 +#define NV_CTXDMA_PAGE_SIZE  (1 << NV_CTXDMA_PAGE_SHIFT)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.919
retrieving revision 1.920
diff -u -r1.919 -r1.920
--- kernel.spec	2 Sep 2008 11:10:16 -0000	1.919
+++ kernel.spec	2 Sep 2008 14:56:52 -0000	1.920
@@ -597,6 +597,7 @@
 
 Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
+Patch682: linux-2.6-iwlwifi-use-dma_alloc_coherent.patch
 Patch690: linux-2.6-at76.patch
 
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
@@ -1127,6 +1128,9 @@
 # wireless patches headed for 2.6.28
 #ApplyPatch linux-2.6-wireless-pending.patch
 
+# fix spot's iwlwifi, hopefully...
+ApplyPatch linux-2.6-iwlwifi-use-dma_alloc_coherent.patch
+
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 
@@ -1746,6 +1750,11 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Sep 02 2008 Kyle McMartin <kyle at redhat.com>
+- hopefully fix the iwlwifi issues.
+- add an include <linux/pagemap.h> to drm-nouveau to hopefully fix
+  the build on powerpc64.
+
 * Tue Sep 02 2008 Dave Airlie <airlied at redhat.com>
 - bring back nouveau yet again
 



From pkgdb at fedoraproject.org  Tue Sep  2 14:57:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 14:57:20 +0000
Subject: [pkgdb] libibcommon: steved has requested commit
Message-ID: <20080902145720.24E3420896D@bastion.fedora.phx.redhat.com>

steved has requested the commit acl on libibcommon (Fedora devel)

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



From twaugh at fedoraproject.org  Tue Sep  2 14:42:31 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  2 Sep 2008 14:42:31 +0000 (UTC)
Subject: rpms/tree/devel tree-1.2-no-strip.patch,1.5,1.6
Message-ID: <20080902144231.EA8ED7011D@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	tree-1.2-no-strip.patch 
Log Message:
* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 1.5.2.1-1
- Removed patch fuzz.


tree-1.2-no-strip.patch:

Index: tree-1.2-no-strip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tree/devel/tree-1.2-no-strip.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tree-1.2-no-strip.patch	5 Jun 2008 13:15:32 -0000	1.5
+++ tree-1.2-no-strip.patch	2 Sep 2008 14:42:01 -0000	1.6
@@ -1,16 +1,16 @@
-diff -up tree-1.5.1.2/Makefile.no-strip tree-1.5.1.2/Makefile
---- tree-1.5.1.2/Makefile.no-strip	2008-06-04 15:15:40.000000000 +0100
-+++ tree-1.5.1.2/Makefile	2008-06-05 14:09:23.000000000 +0100
-@@ -9,7 +9,7 @@
- CC=gcc
+diff -up tree-1.5.2.1/Makefile.no-strip tree-1.5.2.1/Makefile
+--- tree-1.5.2.1/Makefile.no-strip	2008-08-27 19:34:43.000000000 +0100
++++ tree-1.5.2.1/Makefile	2008-09-02 15:41:33.000000000 +0100
+@@ -21,7 +21,7 @@ MANDIR=${prefix}/man/man1
+ # Linux defaults:
  #CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
  CFLAGS=-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 -LDFLAGS=-s
 +LDFLAGS=
  
  # Uncomment for FreeBSD:
- #CC=gcc
-@@ -62,7 +62,7 @@ install:
+ #CFLAGS=-O2 -Wall -fomit-frame-pointer
+@@ -72,7 +72,7 @@ install:
  	install -d $(BINDIR)
  	install -d $(MANDIR)
  	if [ -e $(TREE_DEST) ]; then \



From pkgdb at fedoraproject.org  Tue Sep  2 14:57:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 14:57:42 +0000
Subject: [pkgdb] libibmad: steved has requested commit
Message-ID: <20080902145742.F0CC120896C@bastion.fedora.phx.redhat.com>

steved has requested the commit acl on libibmad (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 14:58:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 14:58:11 +0000
Subject: [pkgdb] libibumad: steved has requested commit
Message-ID: <20080902145812.009CB20896B@bastion.fedora.phx.redhat.com>

steved has requested the commit acl on libibumad (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 14:58:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 14:58:44 +0000
Subject: [pkgdb] librdmacm: steved has requested commit
Message-ID: <20080902145844.517B520896D@bastion.fedora.phx.redhat.com>

steved has requested the commit acl on librdmacm (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 14:59:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 14:59:23 +0000
Subject: [pkgdb] rdma: steved has requested commit
Message-ID: <20080902145924.7282920896D@bastion.fedora.phx.redhat.com>

steved has requested the commit acl on rdma (Fedora devel)

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



From twoerner at fedoraproject.org  Tue Sep  2 14:59:19 2008
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Tue,  2 Sep 2008 14:59:19 +0000 (UTC)
Subject: rpms/SDL/devel SDL-1.2.13-audiodriver.patch, NONE, 1.1 SDL.spec,
	1.61, 1.62 SDL-1.2.12-preferalsa.patch, 1.1,
	NONE SDL_pulseaudio_hack.csh, 1.1, NONE SDL_pulseaudio_hack.sh,
	1.1, NONE
Message-ID: <20080902145919.32B077011D@cvs1.fedora.phx.redhat.com>

Author: twoerner

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

Modified Files:
	SDL.spec 
Added Files:
	SDL-1.2.13-audiodriver.patch 
Removed Files:
	SDL-1.2.12-preferalsa.patch SDL_pulseaudio_hack.csh 
	SDL_pulseaudio_hack.sh 
Log Message:
- dropped pulseaudio hack (rhbz#448270)
- pulseaudio is now used by default
- simplified spec file for new architecture support (rhbz#433618)



SDL-1.2.13-audiodriver.patch:

--- NEW FILE SDL-1.2.13-audiodriver.patch ---
diff -up SDL-1.2.13/src/audio/SDL_audio.c.audiodriver SDL-1.2.13/src/audio/SDL_audio.c
--- SDL-1.2.13/src/audio/SDL_audio.c.audiodriver	2007-12-31 05:47:59.000000000 +0100
+++ SDL-1.2.13/src/audio/SDL_audio.c	2008-09-01 14:53:58.000000000 +0200
@@ -36,6 +36,12 @@
 
 /* Available audio drivers */
 static AudioBootStrap *bootstrap[] = {
+#if SDL_AUDIO_DRIVER_PULSE
+	&PULSE_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_ALSA
+	&ALSA_bootstrap,
+#endif
 #if SDL_AUDIO_DRIVER_BSD
 	&BSD_AUDIO_bootstrap,
 #endif
@@ -43,12 +49,6 @@ static AudioBootStrap *bootstrap[] = {
 	&DSP_bootstrap,
 	&DMA_bootstrap,
 #endif
-#if SDL_AUDIO_DRIVER_ALSA
-	&ALSA_bootstrap,
-#endif
-#if SDL_AUDIO_DRIVER_PULSE
-	&PULSE_bootstrap,
-#endif
 #if SDL_AUDIO_DRIVER_QNXNTO
 	&QNXNTOAUDIO_bootstrap,
 #endif


Index: SDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- SDL.spec	14 Jul 2008 16:00:05 -0000	1.61
+++ SDL.spec	2 Sep 2008 14:58:48 -0000	1.62
@@ -1,24 +1,18 @@
 Summary: A cross-platform multimedia library
 Name: SDL
 Version: 1.2.13
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Source1: SDL_config.h
-# Temporary hack: Use pulseaudio via esd so SDL apps don't lock up when they
-# attempt to use ALSA via pulseaudio.  This will be removed when...
-# 1) SDL's pulseaudio support is working natively without problems
-# 2) it conditionally switches to pulseaudio or ALSA automatically
-Source2: SDL_pulseaudio_hack.csh
-Source3: SDL_pulseaudio_hack.sh
 Patch0: SDL-1.2.10-byteorder.patch
 Patch17: SDL-1.2.13-libdir.patch
-Patch19: SDL-1.2.12-preferalsa.patch
 Patch21: SDL-1.2.12-multilib.patch
 Patch23: SDL-1.2.11-dynamic-esd.patch
 Patch24: SDL-1.2.12-x11dyn64.patch
 Patch25: SDL-1.2.12-disable_yasm.patch
 Patch26: SDL-1.2.13-dynamic-pulse.patch
 Patch27: SDL-1.2.13-pulse-rework.patch
+Patch28: SDL-1.2.13-audiodriver.patch
 
 URL: http://www.libsdl.org/
 License: LGPLv2+
@@ -74,13 +68,13 @@
 %setup -q 
 %patch0 -p1 -b .byteorder
 %patch17 -p1 -b .libdir
-%patch19 -p1 -b .preferalsa
 %patch21 -p1 -b .multilib
 %patch23 -p1 -b .dynamic-esd
 %patch24 -p1 -b .x11dyn64
 %patch25 -p1 -b .disable_yasm
 %patch26 -p1 -b .dynamic-pulse
 %patch27 -p1 -b .pulse-rework
+%patch28 -p1 -b .audiodriver
 
 %build
 aclocal
@@ -104,27 +98,12 @@
 
 # Rename SDL_config.h to SDL_config-<arch>.h to avoid file conflicts on
 # multilib systems and install SDL_config.h wrapper
-basearch=%{_arch}
-# always use i386 for iX86
-%ifarch %{ix86}
-basearch=i386
-%endif
-# always use arm for arm*
-%ifarch %{arm}
-basearch=arm
-%endif
-# Rename SDL_config.h
-mv %{buildroot}/%{_includedir}/SDL/SDL_config.h %{buildroot}/%{_includedir}/SDL/SDL_config-${basearch}.h
+mv %{buildroot}/%{_includedir}/SDL/SDL_config.h %{buildroot}/%{_includedir}/SDL/SDL_config-%{_arch}.h
 install -m644 %{SOURCE1} %{buildroot}/%{_includedir}/SDL/SDL_config.h
 
 # remove libtool .la file
 rm -f %{buildroot}%{_libdir}/*.la
 
-# Temporary SDL pulseaudio hack
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-
 %clean
 rm -rf %{buildroot}
 
@@ -136,8 +115,6 @@
 %defattr(-,root,root)
 %doc README-SDL.txt COPYING CREDITS BUGS
 %{_libdir}/lib*.so.*
-# Temporary SDL pulseaudio hack
-%{_sysconfdir}/profile.d/*
 
 %files devel
 %defattr(-,root,root)
@@ -155,6 +132,11 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Tue Sep  2 2008 Thomas Woerner <twoerner at redhat.com> 1.2.13-6
+- dropped pulseaudio hack (rhbz#448270)
+- pulseaudio is now used by default
+- simplified spec file for new architecture support (rhbz#433618)
+
 * Mon Jul 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.13-5
 - fix license tag
 


--- SDL-1.2.12-preferalsa.patch DELETED ---


--- SDL_pulseaudio_hack.csh DELETED ---


--- SDL_pulseaudio_hack.sh DELETED ---



From spot at fedoraproject.org  Tue Sep  2 15:12:29 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  2 Sep 2008 15:12:29 +0000 (UTC)
Subject: rpms/fedora-bookmarks/devel default-bookmarks.html, 1.3,
	1.4 fedora-bookmarks.spec, 1.3, 1.4
Message-ID: <20080902151229.B72BA7011D@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	default-bookmarks.html fedora-bookmarks.spec 
Log Message:
strip embedded icons out of bookmarks file, resolves bz 433471


Index: default-bookmarks.html
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-bookmarks/devel/default-bookmarks.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- default-bookmarks.html	18 Oct 2007 17:18:13 -0000	1.3
+++ default-bookmarks.html	2 Sep 2008 15:11:59 -0000	1.4
@@ -9,36 +9,36 @@
 <DL><p>
     <DT><H3 ADD_DATE="961112773" LAST_MODIFIED="1176675480" PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">Personal Toolbar Folder</H3>
     <DL><p>
-        <DT><A HREF="http://docs.fedoraproject.org/release-notes/" ADD_DATE="1158286602" LAST_VISIT="1158286627" LAST_MODIFIED="1176675660" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAAAAABoBQAAJgAAACAgAAAAAAAAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wDGeQAAxauNAG4uAAClfUwA9uC8AJdXAADerWEA2sOmAI9dJgCtcBoAsI5kAH9GAADp4NQAsGkAAJpuOQC6mnYA28y4AJpiFwDRt5YA+fXyALx3DQCndzgAwaSAAHg5AACMTgAAqYNYAL1tAACmYAAAn3REAJNlMwCwgkgAnmchAKFwMADPup8Aza+KAH5ECQCiZhUAe0ADAL2efADYx7MAn10AAK2CTwDdr2gAhkoAAMB1AAC3aAAArIddAJdqMwByNwAAl1EAAJJUAACfcDkAgEEAAJtaAAC8cgAAw6mJAPbiwAB2PQAAhEYAAJ92SAB7QwAAcTMAALZsAACngVUA/v38AHlAAACQUQAAo3tKAHU6AACJSwAAwKSDAJptNgDo3tIAs2kAAIJEAACVVQAAbzAAAHQ4AAB3OwAAw6qLAH1EAACCRwAAv3MAAKqGXQB5QgAAhEgAAIpOAAC3agAAfEIAAH5FAACARQAAgEcAAIhKAADFeAAAvXEAAG4vAABvLwAAdzoAAHc9AAB8QwAAfEQAAH5EAACBRQAAgEYAAINHAACFRgAAhEcAAINIAACHSgAAxngAAIhLAAC9cgAAnFoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADWshJBQrTDxTaQAAAAAAAGozLAEBATknZ21HXAAAAABEVBY1PUoBRVBbW15bAAAAcgJNMmEFAUhjW1tbRwAAAHICNzsEMQEoTmQ+W21SAAAaOGAmQQMBKTAicGVnbQAAaTQvCAEBAQEBOhwqUlcAAFNlbBMbUQESVRdLXwdTAABSU2ZDBBABEWJGWC4PWwAAAG5bW1BJASM/T2hxQFYAAABTXVtaJQ5CDB8Lbx0AAAAAAEdpW1AeFQEBBlkAAAAAAAAAU25TUAoYCSAAAAAAAAAAAAAAXC02UBkAAAAAAAAAAAAAAAAAAAAAAAA
 AAAD//wAAgB8AAIAHAACAAwAAgAMAAIABAACAAQAAgAEAAIABAACAAQAAwAEAAMADAADgBwAA8A8AAPwfAAD//wAAKAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AxoUgAM+5nwB9RAAArotgAOfczwCWaDAAqmUAANqwcADSn1AAv6KAAKZ5QACWXBAA28ivALp2EAD38+8AypNAAO/o3wCOUQAAtpZwAMeujwDfuYAA49O/AIZREACOXCAAunAAAPPlzwDv3L8AnlwAAIZLAACWYiAAwnwQAJZWAACyagAAnnRAAPv27wDr388AgkgAAIpOAADXxa8AmlkAAKZiAADTvJ8Atm0AAL5zAACaazAAuplwAN/RvwCSUwAArmgAAH5FAAB9RQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMzMzMzMzMzMzMzMzAAAAAAAAAAAAAAAAAAAAAAAEMzMzMzMzMzMzMzMzMzMzNAAAAAAAAAAAAAAAAAAAADMzMzMmDBUwAxQZMzMzMzMzMzM0AAAAAAAAAAAAAAAzMzMzIREBAQEBAQELMzMzMzMzMzMzNAAAAAAAAAAAADMzMyktCQEBAQEBAQEDMzMzMzMzMzMzMwAAAAAAAAAAMzMTLS0gHAEXAQEBAQELMzMzMzMzMzMzMwAAAAAAAAAzMyItLS0qJjMzFAEBAQEYMzMzMzMzMzMzMwAAAAAAADMeLS0tCDMzMzMzLwEBAQUzMzMzMzMzMzMzNAAAAAAAMxMtLS0TMzMzMzMYAQEBCzMzMzMzMzMzMzMzAAAAAAAzEy0tLR4zMzMzMzMBAQELMzMzMzMzMzMzMzMzAAAAA
 DMTLS0tITMzMzMzMwEBAQszMzMzMzMzMzMzMzMAAAAAMyYtLS0sJjMzMzMzAQEBCzMzMzMzMzMzMzMzMwAAAAAzMyotLS0sIRMjIyMBAQEDIyMuJzMzMzMzMzMzMwAAADMzJhotLS0CJAEBAQEBAQEBAQEcLSIxMzMzMzMzAAAAMzMzJxotLQoBAQEBAQEBAQEBAQEtLS0qMzMzMzMAAAAzMzMzJioaAiQBAQEBAQEBAQEBGy0tLS0qMzMzMwAAAAQzMzMzMzMTHyMjIwEBATAjIyMNKi0tLS0TMzMzAAAABDMzMzMzMzMzMzMzAQEBCzMzMzMzIS0tLQgzMzMAAAAAMzMzMzMzMzMzMzMBAQELMzMzMzMzMi0tLTMzNAAAAAAzMzMzMzMzMzMzMwEBAQszMzMzMzMdLS0tMzMAAAAAADQzMzMzMzMzMzMzJQEBDjMzMzMzMx0tLS0zMwAAAAAAADMzMzMzMzMzMzMoAQEBGTMzMzMmLC0tLDM0AAAAAAAANDMzMzMzMzMzMzMBAQEGBzMzJggtLS0xMwAAAAAAAAAAMzMzMzMzMzMzMxIBAQEBBjAcFi0tGh4EAAAAAAAAAAAAMzMzMzMzMzMzMxABAQEBAQEBAi0hNAAAAAAAAAAAAAAEMzMzMzMzMzMzMwYBAQEBASQPMzMAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMDMDArMyY0AAAAAAAAAAAAAAAAAAAANDMzMzMzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAADQzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////+AAf//AAB//wAAD/4AAAP+AAAB/gAAAP4AAAB+AAAAPgAAAD4AAAAeAAAAHgAAAB4AAAAOAAAADgAAAA4AAAAOAAA
 ADgAAAA8AAAAPAAAAHwAAAB+AAAAfgAAAP8AAAD/gAAB/4AAA//gAAf/8AAP//wAP///g///////8=" LAST_CHARSET="UTF-8" ID="rdf:#$b7+Ar2">Release Notes</A>
+        <DT><A HREF="http://docs.fedoraproject.org/release-notes/" ADD_DATE="1158286602" LAST_VISIT="1158286627" LAST_MODIFIED="1176675660" LAST_CHARSET="UTF-8" ID="rdf:#$b7+Ar2">Release Notes</A>
 <DD>Fedora Release Notes
         <DT><H3 ADD_DATE="1130967903" LAST_MODIFIED="1176675263" ID="rdf:#$A80oc3">Fedora Project</H3>
         <DL><p>
-            <DT><A HREF="http://fedoraproject.org/" ADD_DATE="1158286779" LAST_VISIT="1176675005" LAST_MODIFIED="1176675285" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAAAAABoBQAAJgAAACAgAAAAAAAAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wDGeQAAxauNAG4uAAClfUwA9uC8AJdXAADerWEA2sOmAI9dJgCtcBoAsI5kAH9GAADp4NQAsGkAAJpuOQC6mnYA28y4AJpiFwDRt5YA+fXyALx3DQCndzgAwaSAAHg5AACMTgAAqYNYAL1tAACmYAAAn3REAJNlMwCwgkgAnmchAKFwMADPup8Aza+KAH5ECQCiZhUAe0ADAL2efADYx7MAn10AAK2CTwDdr2gAhkoAAMB1AAC3aAAArIddAJdqMwByNwAAl1EAAJJUAACfcDkAgEEAAJtaAAC8cgAAw6mJAPbiwAB2PQAAhEYAAJ92SAB7QwAAcTMAALZsAACngVUA/v38AHlAAACQUQAAo3tKAHU6AACJSwAAwKSDAJptNgDo3tIAs2kAAIJEAACVVQAAbzAAAHQ4AAB3OwAAw6qLAH1EAACCRwAAv3MAAKqGXQB5QgAAhEgAAIpOAAC3agAAfEIAAH5FAACARQAAgEcAAIhKAADFeAAAvXEAAG4vAABvLwAAdzoAAHc9AAB8QwAAfEQAAH5EAACBRQAAgEYAAINHAACFRgAAhEcAAINIAACHSgAAxngAAIhLAAC9cgAAnFoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADWshJBQrTDxTaQAAAAAAAGozLAEBATknZ21HXAAAAABEVBY1PUoBRVBbW15bAAAAcgJNMmEFAUhjW1tbRwAAAHICNzsEMQEoTmQ+W21SAAAaOGAmQQMBKTAicGVnbQAAaTQvCAEBAQEBOhwqUlcAAFNlbBMbUQESVRdLXwdTAABSU2ZDBBABEWJGWC4PWwAAAG5bW1BJASM/T2hxQFYAAABTXVtaJQ5CDB8Lbx0AAAAAAEdpW1AeFQEBBlkAAAAAAAAAU25TUAoYCSAAAAAAAAAAAAAAXC02UBkAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wAAgB8AAI
 AHAACAAwAAgAMAAIABAACAAQAAgAEAAIABAACAAQAAwAEAAMADAADgBwAA8A8AAPwfAAD//wAAKAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AxoUgAM+5nwB9RAAArotgAOfczwCWaDAAqmUAANqwcADSn1AAv6KAAKZ5QACWXBAA28ivALp2EAD38+8AypNAAO/o3wCOUQAAtpZwAMeujwDfuYAA49O/AIZREACOXCAAunAAAPPlzwDv3L8AnlwAAIZLAACWYiAAwnwQAJZWAACyagAAnnRAAPv27wDr388AgkgAAIpOAADXxa8AmlkAAKZiAADTvJ8Atm0AAL5zAACaazAAuplwAN/RvwCSUwAArmgAAH5FAAB9RQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMzMzMzMzMzMzMzMzAAAAAAAAAAAAAAAAAAAAAAAEMzMzMzMzMzMzMzMzMzMzNAAAAAAAAAAAAAAAAAAAADMzMzMmDBUwAxQZMzMzMzMzMzM0AAAAAAAAAAAAAAAzMzMzIREBAQEBAQELMzMzMzMzMzMzNAAAAAAAAAAAADMzMyktCQEBAQEBAQEDMzMzMzMzMzMzMwAAAAAAAAAAMzMTLS0gHAEXAQEBAQELMzMzMzMzMzMzMwAAAAAAAAAzMyItLS0qJjMzFAEBAQEYMzMzMzMzMzMzMwAAAAAAADMeLS0tCDMzMzMzLwEBAQUzMzMzMzMzMzMzNAAAAAAAMxMtLS0TMzMzMzMYAQEBCzMzMzMzMzMzMzMzAAAAAAAzEy0tLR4zMzMzMzMBAQELMzMzMzMzMzMzMzMzAAAAADMTLS0tITMzMzMz
 MwEBAQszMzMzMzMzMzMzMzMAAAAAMyYtLS0sJjMzMzMzAQEBCzMzMzMzMzMzMzMzMwAAAAAzMyotLS0sIRMjIyMBAQEDIyMuJzMzMzMzMzMzMwAAADMzJhotLS0CJAEBAQEBAQEBAQEcLSIxMzMzMzMzAAAAMzMzJxotLQoBAQEBAQEBAQEBAQEtLS0qMzMzMzMAAAAzMzMzJioaAiQBAQEBAQEBAQEBGy0tLS0qMzMzMwAAAAQzMzMzMzMTHyMjIwEBATAjIyMNKi0tLS0TMzMzAAAABDMzMzMzMzMzMzMzAQEBCzMzMzMzIS0tLQgzMzMAAAAAMzMzMzMzMzMzMzMBAQELMzMzMzMzMi0tLTMzNAAAAAAzMzMzMzMzMzMzMwEBAQszMzMzMzMdLS0tMzMAAAAAADQzMzMzMzMzMzMzJQEBDjMzMzMzMx0tLS0zMwAAAAAAADMzMzMzMzMzMzMoAQEBGTMzMzMmLC0tLDM0AAAAAAAANDMzMzMzMzMzMzMBAQEGBzMzJggtLS0xMwAAAAAAAAAAMzMzMzMzMzMzMxIBAQEBBjAcFi0tGh4EAAAAAAAAAAAAMzMzMzMzMzMzMxABAQEBAQEBAi0hNAAAAAAAAAAAAAAEMzMzMzMzMzMzMwYBAQEBASQPMzMAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMDMDArMyY0AAAAAAAAAAAAAAAAAAAANDMzMzMzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAADQzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////+AAf//AAB//wAAD/4AAAP+AAAB/gAAAP4AAAB+AAAAPgAAAD4AAAAeAAAAHgAAAB4AAAAOAAAADgAAAA4AAAAOAAAADgAAAA8AAAAPAA
 AAHwAAAB+AAAAfgAAAP8AAAD/gAAB/4AAA//gAAf/8AAP//wAP///g///////8=" LAST_CHARSET="UTF-8" ID="rdf:#$c7+Ar2">Fedora Project</A>
+            <DT><A HREF="http://fedoraproject.org/" ADD_DATE="1158286779" LAST_VISIT="1176675005" LAST_MODIFIED="1176675285" LAST_CHARSET="UTF-8" ID="rdf:#$c7+Ar2">Fedora Project</A>
 <DD>Starting point for the Fedora Project
-            <DT><A HREF="http://forums.fedoraforum.org/" ADD_DATE="1130967896" LAST_VISIT="1158286671" LAST_MODIFIED="1176675301" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////ALd9TgC2trUAUz8sAJGLhgBwZFoA3NrZAIlWLAAaHB8A0ZVrALidiwCRbEsAMTIxAGBRQwDUysMAjHZlAPHv7gBpSS0AwI1dAIBfPwBCMiIAqH5eAJ6XkgCkckQACgwNAJNhOQCHfXYAsqumAKKQgABhW1UAd1M2AH5nUAB8cGYAclpGAObm5gCael8AsqWZAJ5xUAC8sqoA+ff3ANDPzgAUEhIAiGNIAJxrPgCsekoAtINYAMiUZAB8XEoAjYR7AF9HLwCurq8AgVcyAG9TPADh4N8AaltSAJB0XQAABAgAwIVgAJVfMQCqckwAuolZAKCThwDX1tUAiXJfANfRzQC6iWEAr39dALeyrwDIjWMAkYeAAI1eOwCeaEQA9fPyAPz7+wBIMyAAimRCALJ5SAC4g1AApndMAIB0aQDEkV8Ay5BnAJFiPgDq6egA3NjUAKlzRQAEBwkAy5VoAJVkPQC+i1kAeV1HAKt3RwC6hlYAiGdJAKJvRgC2gVMAgVw9AM6SaADGkWMAs3xKAJtvUQCcaDwA9/X0APPx8AC8i18AYVJGAI11XgD+/f0A+vr5AKd0RwD29vYA2NfXANvW0wDWz8wAnWlCAMWSYQDOlGkAm3BPAMGNWwDCkF8AhX11AIFePQCkb0YAvo1dAP38/AD29PMA9PLxAPLy8QDy8O8Az87NAP7+/gD7+/oA29rYALd8TwC+ilgA/f38APb09AD19PMA9PPy
 APLx8ADz8e8Az87OAKd0RgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMzMzMzMzONjY2NjY2NjY2NjY2NjTMzf39/fxE2REZQIQWOgX8zM35+fmgpF0BeTGFbeXB+MzNnST8bH25dd1pOTXMOVDMziwMie0V1L3gTh2SGR4UzM4ISYGI6ZTUEMnpcAkgHMzMdGGN2ag0JGVc5S18QijMzJI9PHjcwKwwUFSoxgG0zM1VrIDhSClh0US0GhISEMzNKKG8WJkNpfD0sHEpKSjMzfX19C1lmVi5CNCN9fX0zM4iIiA88OwgaUz6IiIiIMzNsbGyMckFxJSeJbGxsbDMzg4ODg4ODg4ODg4ODg4MzMzMzMzMzMzMzMzMzMzMzMwAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" LAST_CHARSET="ISO-8859-1" ID="rdf:#$z80oc3">Fedora Forum</A>
+            <DT><A HREF="http://forums.fedoraforum.org/" ADD_DATE="1130967896" LAST_VISIT="1158286671" LAST_MODIFIED="1176675301" LAST_CHARSET="ISO-8859-1" ID="rdf:#$z80oc3">Fedora Forum</A>
 <DD>Fedora Community Forums
-            <DT><A HREF="http://fedoraproject.org/wiki/FWN" ADD_DATE="1176675071" LAST_VISIT="1176675075" LAST_MODIFIED="1176675310" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAAAAABoBQAAJgAAACAgAAAAAAAAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wDGeQAAxauNAG4uAAClfUwA9uC8AJdXAADerWEA2sOmAI9dJgCtcBoAsI5kAH9GAADp4NQAsGkAAJpuOQC6mnYA28y4AJpiFwDRt5YA+fXyALx3DQCndzgAwaSAAHg5AACMTgAAqYNYAL1tAACmYAAAn3REAJNlMwCwgkgAnmchAKFwMADPup8Aza+KAH5ECQCiZhUAe0ADAL2efADYx7MAn10AAK2CTwDdr2gAhkoAAMB1AAC3aAAArIddAJdqMwByNwAAl1EAAJJUAACfcDkAgEEAAJtaAAC8cgAAw6mJAPbiwAB2PQAAhEYAAJ92SAB7QwAAcTMAALZsAACngVUA/v38AHlAAACQUQAAo3tKAHU6AACJSwAAwKSDAJptNgDo3tIAs2kAAIJEAACVVQAAbzAAAHQ4AAB3OwAAw6qLAH1EAACCRwAAv3MAAKqGXQB5QgAAhEgAAIpOAAC3agAAfEIAAH5FAACARQAAgEcAAIhKAADFeAAAvXEAAG4vAABvLwAAdzoAAHc9AAB8QwAAfEQAAH5EAACBRQAAgEYAAINHAACFRgAAhEcAAINIAACHSgAAxngAAIhLAAC9cgAAnFoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADWshJBQrTDxTaQAAAAAAAGozLAEBATknZ21HXAAAAABEVBY1PUoBRVBbW15bAAAAcgJNMmEFAUhjW1tbRwAAAHICNzsEMQEoTmQ+W21SAAAaOGAmQQMBKTAicGVnbQAAaTQvCAEBAQEBOhwqUlcAAFNlbBMbUQESVRdLXwdTAABSU2ZDBBABEWJGWC4PWwAAAG5bW1BJASM/T2hxQFYAAABTXVtaJQ5CDB8Lbx0AAAAAAEdpW1AeFQEBBlkAAAAAAAAAU25TUAoYCSAAAAAAAAAAAAAAXC02UBkAAAAAAAAAAAAAAAAAAAAAAAAAAAD//w
 AAgB8AAIAHAACAAwAAgAMAAIABAACAAQAAgAEAAIABAACAAQAAwAEAAMADAADgBwAA8A8AAPwfAAD//wAAKAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AxoUgAM+5nwB9RAAArotgAOfczwCWaDAAqmUAANqwcADSn1AAv6KAAKZ5QACWXBAA28ivALp2EAD38+8AypNAAO/o3wCOUQAAtpZwAMeujwDfuYAA49O/AIZREACOXCAAunAAAPPlzwDv3L8AnlwAAIZLAACWYiAAwnwQAJZWAACyagAAnnRAAPv27wDr388AgkgAAIpOAADXxa8AmlkAAKZiAADTvJ8Atm0AAL5zAACaazAAuplwAN/RvwCSUwAArmgAAH5FAAB9RQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMzMzMzMzMzMzMzMzAAAAAAAAAAAAAAAAAAAAAAAEMzMzMzMzMzMzMzMzMzMzNAAAAAAAAAAAAAAAAAAAADMzMzMmDBUwAxQZMzMzMzMzMzM0AAAAAAAAAAAAAAAzMzMzIREBAQEBAQELMzMzMzMzMzMzNAAAAAAAAAAAADMzMyktCQEBAQEBAQEDMzMzMzMzMzMzMwAAAAAAAAAAMzMTLS0gHAEXAQEBAQELMzMzMzMzMzMzMwAAAAAAAAAzMyItLS0qJjMzFAEBAQEYMzMzMzMzMzMzMwAAAAAAADMeLS0tCDMzMzMzLwEBAQUzMzMzMzMzMzMzNAAAAAAAMxMtLS0TMzMzMzMYAQEBCzMzMzMzMzMzMzMzAAAAAAAzEy0tLR4zMzMzMzMBAQELMzMzMzMzMzMzMzMzAAAAADMTLS0t
 ITMzMzMzMwEBAQszMzMzMzMzMzMzMzMAAAAAMyYtLS0sJjMzMzMzAQEBCzMzMzMzMzMzMzMzMwAAAAAzMyotLS0sIRMjIyMBAQEDIyMuJzMzMzMzMzMzMwAAADMzJhotLS0CJAEBAQEBAQEBAQEcLSIxMzMzMzMzAAAAMzMzJxotLQoBAQEBAQEBAQEBAQEtLS0qMzMzMzMAAAAzMzMzJioaAiQBAQEBAQEBAQEBGy0tLS0qMzMzMwAAAAQzMzMzMzMTHyMjIwEBATAjIyMNKi0tLS0TMzMzAAAABDMzMzMzMzMzMzMzAQEBCzMzMzMzIS0tLQgzMzMAAAAAMzMzMzMzMzMzMzMBAQELMzMzMzMzMi0tLTMzNAAAAAAzMzMzMzMzMzMzMwEBAQszMzMzMzMdLS0tMzMAAAAAADQzMzMzMzMzMzMzJQEBDjMzMzMzMx0tLS0zMwAAAAAAADMzMzMzMzMzMzMoAQEBGTMzMzMmLC0tLDM0AAAAAAAANDMzMzMzMzMzMzMBAQEGBzMzJggtLS0xMwAAAAAAAAAAMzMzMzMzMzMzMxIBAQEBBjAcFi0tGh4EAAAAAAAAAAAAMzMzMzMzMzMzMxABAQEBAQEBAi0hNAAAAAAAAAAAAAAEMzMzMzMzMzMzMwYBAQEBASQPMzMAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMDMDArMyY0AAAAAAAAAAAAAAAAAAAANDMzMzMzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAADQzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////+AAf//AAB//wAAD/4AAAP+AAAB/gAAAP4AAAB+AAAAPgAAAD4AAAAeAAAAHgAAAB4AAAAOAAAADgAAAA4AAAAOAAAADgAAAA
 8AAAAPAAAAHwAAAB+AAAAfgAAAP8AAAD/gAAB/4AAA//gAAf/8AAP//wAP///g///////8=" LAST_CHARSET="ISO-8859-1" ID="rdf:#$NKnQZ2">Fedora Weekly News</A>
+            <DT><A HREF="http://fedoraproject.org/wiki/FWN" ADD_DATE="1176675071" LAST_VISIT="1176675075" LAST_MODIFIED="1176675310" LAST_CHARSET="ISO-8859-1" ID="rdf:#$NKnQZ2">Fedora Weekly News</A>
 <DD>Fedora Weekly News
-            <DT><A HREF="http://www.fedoraunity.org/" ADD_DATE="1176675136" LAST_VISIT="1176675760" LAST_MODIFIED="1176675183" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAAAAABoBQAAJgAAACAgAAAAAAAAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wDGeQAAxauNAG4uAAClfUwA9uC8AJdXAADerWEA2sOmAI9dJgCtcBoAsI5kAH9GAADp4NQAsGkAAJpuOQC6mnYA28y4AJpiFwDRt5YA+fXyALx3DQCndzgAwaSAAHg5AACMTgAAqYNYAL1tAACmYAAAn3REAJNlMwCwgkgAnmchAKFwMADPup8Aza+KAH5ECQCiZhUAe0ADAL2efADYx7MAn10AAK2CTwDdr2gAhkoAAMB1AAC3aAAArIddAJdqMwByNwAAl1EAAJJUAACfcDkAgEEAAJtaAAC8cgAAw6mJAPbiwAB2PQAAhEYAAJ92SAB7QwAAcTMAALZsAACngVUA/v38AHlAAACQUQAAo3tKAHU6AACJSwAAwKSDAJptNgDo3tIAs2kAAIJEAACVVQAAbzAAAHQ4AAB3OwAAw6qLAH1EAACCRwAAv3MAAKqGXQB5QgAAhEgAAIpOAAC3agAAfEIAAH5FAACARQAAgEcAAIhKAADFeAAAvXEAAG4vAABvLwAAdzoAAHc9AAB8QwAAfEQAAH5EAACBRQAAgEYAAINHAACFRgAAhEcAAINIAACHSgAAxngAAIhLAAC9cgAAnFoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADWshJBQrTDxTaQAAAAAAAGozLAEBATknZ21HXAAAAABEVBY1PUoBRVBbW15bAAAAcgJNMmEFAUhjW1tbRwAAAHICNzsEMQEoTmQ+W21SAAAaOGAmQQMBKTAicGVnbQAAaTQvCAEBAQEBOhwqUlcAAFNlbBMbUQESVRdLXwdTAABSU2ZDBBABEWJGWC4PWwAAAG5bW1BJASM/T2hxQFYAAABTXVtaJQ5CDB8Lbx0AAAAAAEdpW1AeFQEBBlkAAAAAAAAAU25TUAoYCSAAAAAAAAAAAAAAXC02UBkAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wAAgB8A
 AIAHAACAAwAAgAMAAIABAACAAQAAgAEAAIABAACAAQAAwAEAAMADAADgBwAA8A8AAPwfAAD//wAAKAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AxoUgAM+5nwB9RAAArotgAOfczwCWaDAAqmUAANqwcADSn1AAv6KAAKZ5QACWXBAA28ivALp2EAD38+8AypNAAO/o3wCOUQAAtpZwAMeujwDfuYAA49O/AIZREACOXCAAunAAAPPlzwDv3L8AnlwAAIZLAACWYiAAwnwQAJZWAACyagAAnnRAAPv27wDr388AgkgAAIpOAADXxa8AmlkAAKZiAADTvJ8Atm0AAL5zAACaazAAuplwAN/RvwCSUwAArmgAAH5FAAB9RQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMzMzMzMzMzMzMzMzAAAAAAAAAAAAAAAAAAAAAAAEMzMzMzMzMzMzMzMzMzMzNAAAAAAAAAAAAAAAAAAAADMzMzMmDBUwAxQZMzMzMzMzMzM0AAAAAAAAAAAAAAAzMzMzIREBAQEBAQELMzMzMzMzMzMzNAAAAAAAAAAAADMzMyktCQEBAQEBAQEDMzMzMzMzMzMzMwAAAAAAAAAAMzMTLS0gHAEXAQEBAQELMzMzMzMzMzMzMwAAAAAAAAAzMyItLS0qJjMzFAEBAQEYMzMzMzMzMzMzMwAAAAAAADMeLS0tCDMzMzMzLwEBAQUzMzMzMzMzMzMzNAAAAAAAMxMtLS0TMzMzMzMYAQEBCzMzMzMzMzMzMzMzAAAAAAAzEy0tLR4zMzMzMzMBAQELMzMzMzMzMzMzMzMzAAAAADMTLS0tITMzMz
 MzMwEBAQszMzMzMzMzMzMzMzMAAAAAMyYtLS0sJjMzMzMzAQEBCzMzMzMzMzMzMzMzMwAAAAAzMyotLS0sIRMjIyMBAQEDIyMuJzMzMzMzMzMzMwAAADMzJhotLS0CJAEBAQEBAQEBAQEcLSIxMzMzMzMzAAAAMzMzJxotLQoBAQEBAQEBAQEBAQEtLS0qMzMzMzMAAAAzMzMzJioaAiQBAQEBAQEBAQEBGy0tLS0qMzMzMwAAAAQzMzMzMzMTHyMjIwEBATAjIyMNKi0tLS0TMzMzAAAABDMzMzMzMzMzMzMzAQEBCzMzMzMzIS0tLQgzMzMAAAAAMzMzMzMzMzMzMzMBAQELMzMzMzMzMi0tLTMzNAAAAAAzMzMzMzMzMzMzMwEBAQszMzMzMzMdLS0tMzMAAAAAADQzMzMzMzMzMzMzJQEBDjMzMzMzMx0tLS0zMwAAAAAAADMzMzMzMzMzMzMoAQEBGTMzMzMmLC0tLDM0AAAAAAAANDMzMzMzMzMzMzMBAQEGBzMzJggtLS0xMwAAAAAAAAAAMzMzMzMzMzMzMxIBAQEBBjAcFi0tGh4EAAAAAAAAAAAAMzMzMzMzMzMzMxABAQEBAQEBAi0hNAAAAAAAAAAAAAAEMzMzMzMzMzMzMwYBAQEBASQPMzMAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMDMDArMyY0AAAAAAAAAAAAAAAAAAAANDMzMzMzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAADQzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////+AAf//AAB//wAAD/4AAAP+AAAB/gAAAP4AAAB+AAAAPgAAAD4AAAAeAAAAHgAAAB4AAAAOAAAADgAAAA4AAAAOAAAADgAAAA8AAAAP
 AAAAHwAAAB+AAAAfgAAAP8AAAD/gAAB/4AAA//gAAf/8AAP//wAP///g///////8=" LAST_CHARSET="UTF-8" ID="rdf:#$OKnQZ2">Fedora Unity Project</A>
-            <DT><A HREF="http://planet.fedoraproject.org/" ADD_DATE="1176675201" LAST_VISIT="1176675207" LAST_MODIFIED="1176675329" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAAAAABoBQAAJgAAACAgAAAAAAAAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wDGeQAAxauNAG4uAAClfUwA9uC8AJdXAADerWEA2sOmAI9dJgCtcBoAsI5kAH9GAADp4NQAsGkAAJpuOQC6mnYA28y4AJpiFwDRt5YA+fXyALx3DQCndzgAwaSAAHg5AACMTgAAqYNYAL1tAACmYAAAn3REAJNlMwCwgkgAnmchAKFwMADPup8Aza+KAH5ECQCiZhUAe0ADAL2efADYx7MAn10AAK2CTwDdr2gAhkoAAMB1AAC3aAAArIddAJdqMwByNwAAl1EAAJJUAACfcDkAgEEAAJtaAAC8cgAAw6mJAPbiwAB2PQAAhEYAAJ92SAB7QwAAcTMAALZsAACngVUA/v38AHlAAACQUQAAo3tKAHU6AACJSwAAwKSDAJptNgDo3tIAs2kAAIJEAACVVQAAbzAAAHQ4AAB3OwAAw6qLAH1EAACCRwAAv3MAAKqGXQB5QgAAhEgAAIpOAAC3agAAfEIAAH5FAACARQAAgEcAAIhKAADFeAAAvXEAAG4vAABvLwAAdzoAAHc9AAB8QwAAfEQAAH5EAACBRQAAgEYAAINHAACFRgAAhEcAAINIAACHSgAAxngAAIhLAAC9cgAAnFoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADWshJBQrTDxTaQAAAAAAAGozLAEBATknZ21HXAAAAABEVBY1PUoBRVBbW15bAAAAcgJNMmEFAUhjW1tbRwAAAHICNzsEMQEoTmQ+W21SAAAaOGAmQQMBKTAicGVnbQAAaTQvCAEBAQEBOhwqUlcAAFNlbBMbUQESVRdLXwdTAABSU2ZDBBABEWJGWC4PWwAAAG5bW1BJASM/T2hxQFYAAABTXVtaJQ5CDB8Lbx0AAAAAAEdpW1AeFQEBBlkAAAAAAAAAU25TUAoYCSAAAAAAAAAAAAAAXC02UBkAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wA
 AgB8AAIAHAACAAwAAgAMAAIABAACAAQAAgAEAAIABAACAAQAAwAEAAMADAADgBwAA8A8AAPwfAAD//wAAKAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AxoUgAM+5nwB9RAAArotgAOfczwCWaDAAqmUAANqwcADSn1AAv6KAAKZ5QACWXBAA28ivALp2EAD38+8AypNAAO/o3wCOUQAAtpZwAMeujwDfuYAA49O/AIZREACOXCAAunAAAPPlzwDv3L8AnlwAAIZLAACWYiAAwnwQAJZWAACyagAAnnRAAPv27wDr388AgkgAAIpOAADXxa8AmlkAAKZiAADTvJ8Atm0AAL5zAACaazAAuplwAN/RvwCSUwAArmgAAH5FAAB9RQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMzMzMzMzMzMzMzMzAAAAAAAAAAAAAAAAAAAAAAAEMzMzMzMzMzMzMzMzMzMzNAAAAAAAAAAAAAAAAAAAADMzMzMmDBUwAxQZMzMzMzMzMzM0AAAAAAAAAAAAAAAzMzMzIREBAQEBAQELMzMzMzMzMzMzNAAAAAAAAAAAADMzMyktCQEBAQEBAQEDMzMzMzMzMzMzMwAAAAAAAAAAMzMTLS0gHAEXAQEBAQELMzMzMzMzMzMzMwAAAAAAAAAzMyItLS0qJjMzFAEBAQEYMzMzMzMzMzMzMwAAAAAAADMeLS0tCDMzMzMzLwEBAQUzMzMzMzMzMzMzNAAAAAAAMxMtLS0TMzMzMzMYAQEBCzMzMzMzMzMzMzMzAAAAAAAzEy0tLR4zMzMzMzMBAQELMzMzMzMzMzMzMzMzAAAAADMTLS0tI
 TMzMzMzMwEBAQszMzMzMzMzMzMzMzMAAAAAMyYtLS0sJjMzMzMzAQEBCzMzMzMzMzMzMzMzMwAAAAAzMyotLS0sIRMjIyMBAQEDIyMuJzMzMzMzMzMzMwAAADMzJhotLS0CJAEBAQEBAQEBAQEcLSIxMzMzMzMzAAAAMzMzJxotLQoBAQEBAQEBAQEBAQEtLS0qMzMzMzMAAAAzMzMzJioaAiQBAQEBAQEBAQEBGy0tLS0qMzMzMwAAAAQzMzMzMzMTHyMjIwEBATAjIyMNKi0tLS0TMzMzAAAABDMzMzMzMzMzMzMzAQEBCzMzMzMzIS0tLQgzMzMAAAAAMzMzMzMzMzMzMzMBAQELMzMzMzMzMi0tLTMzNAAAAAAzMzMzMzMzMzMzMwEBAQszMzMzMzMdLS0tMzMAAAAAADQzMzMzMzMzMzMzJQEBDjMzMzMzMx0tLS0zMwAAAAAAADMzMzMzMzMzMzMoAQEBGTMzMzMmLC0tLDM0AAAAAAAANDMzMzMzMzMzMzMBAQEGBzMzJggtLS0xMwAAAAAAAAAAMzMzMzMzMzMzMxIBAQEBBjAcFi0tGh4EAAAAAAAAAAAAMzMzMzMzMzMzMxABAQEBAQEBAi0hNAAAAAAAAAAAAAAEMzMzMzMzMzMzMwYBAQEBASQPMzMAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMDMDArMyY0AAAAAAAAAAAAAAAAAAAANDMzMzMzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAADQzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////+AAf//AAB//wAAD/4AAAP+AAAB/gAAAP4AAAB+AAAAPgAAAD4AAAAeAAAAHgAAAB4AAAAOAAAADgAAAA4AAAAOAAAADgAAAA8
 AAAAPAAAAHwAAAB+AAAAfgAAAP8AAAD/gAAB/4AAA//gAAf/8AAP//wAP///g///////8=" LAST_CHARSET="UTF-8" ID="rdf:#$PKnQZ2">Fedora People</A>
+            <DT><A HREF="http://www.fedoraunity.org/" ADD_DATE="1176675136" LAST_VISIT="1176675760" LAST_MODIFIED="1176675183" LAST_CHARSET="UTF-8" ID="rdf:#$OKnQZ2">Fedora Unity Project</A>
+            <DT><A HREF="http://planet.fedoraproject.org/" ADD_DATE="1176675201" LAST_VISIT="1176675207" LAST_MODIFIED="1176675329" LAST_CHARSET="UTF-8" ID="rdf:#$PKnQZ2">Fedora People</A>
 <DD>Blogs by Fedora Contributors
-            <DT><A HREF="http://fedoraproject.org/wiki/Communicate" ADD_DATE="1141318585" LAST_VISIT="1176674053" LAST_MODIFIED="1141318713" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAAAAABoBQAAJgAAACAgAAAAAAAAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wDGeQAAxauNAG4uAAClfUwA9uC8AJdXAADerWEA2sOmAI9dJgCtcBoAsI5kAH9GAADp4NQAsGkAAJpuOQC6mnYA28y4AJpiFwDRt5YA+fXyALx3DQCndzgAwaSAAHg5AACMTgAAqYNYAL1tAACmYAAAn3REAJNlMwCwgkgAnmchAKFwMADPup8Aza+KAH5ECQCiZhUAe0ADAL2efADYx7MAn10AAK2CTwDdr2gAhkoAAMB1AAC3aAAArIddAJdqMwByNwAAl1EAAJJUAACfcDkAgEEAAJtaAAC8cgAAw6mJAPbiwAB2PQAAhEYAAJ92SAB7QwAAcTMAALZsAACngVUA/v38AHlAAACQUQAAo3tKAHU6AACJSwAAwKSDAJptNgDo3tIAs2kAAIJEAACVVQAAbzAAAHQ4AAB3OwAAw6qLAH1EAACCRwAAv3MAAKqGXQB5QgAAhEgAAIpOAAC3agAAfEIAAH5FAACARQAAgEcAAIhKAADFeAAAvXEAAG4vAABvLwAAdzoAAHc9AAB8QwAAfEQAAH5EAACBRQAAgEYAAINHAACFRgAAhEcAAINIAACHSgAAxngAAIhLAAC9cgAAnFoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADWshJBQrTDxTaQAAAAAAAGozLAEBATknZ21HXAAAAABEVBY1PUoBRVBbW15bAAAAcgJNMmEFAUhjW1tbRwAAAHICNzsEMQEoTmQ+W21SAAAaOGAmQQMBKTAicGVnbQAAaTQvCAEBAQEBOhwqUlcAAFNlbBMbUQESVRdLXwdTAABSU2ZDBBABEWJGWC4PWwAAAG5bW1BJASM/T2hxQFYAAABTXVtaJQ5CDB8Lbx0AAAAAAEdpW1AeFQEBBlkAAAAAAAAAU25TUAoYCSAAAAAAAAAAAAAAXC02UBkAAAAAAAAAAAAAAAAAAAAAAA
 AAAAD//wAAgB8AAIAHAACAAwAAgAMAAIABAACAAQAAgAEAAIABAACAAQAAwAEAAMADAADgBwAA8A8AAPwfAAD//wAAKAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AxoUgAM+5nwB9RAAArotgAOfczwCWaDAAqmUAANqwcADSn1AAv6KAAKZ5QACWXBAA28ivALp2EAD38+8AypNAAO/o3wCOUQAAtpZwAMeujwDfuYAA49O/AIZREACOXCAAunAAAPPlzwDv3L8AnlwAAIZLAACWYiAAwnwQAJZWAACyagAAnnRAAPv27wDr388AgkgAAIpOAADXxa8AmlkAAKZiAADTvJ8Atm0AAL5zAACaazAAuplwAN/RvwCSUwAArmgAAH5FAAB9RQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMzMzMzMzMzMzMzMzAAAAAAAAAAAAAAAAAAAAAAAEMzMzMzMzMzMzMzMzMzMzNAAAAAAAAAAAAAAAAAAAADMzMzMmDBUwAxQZMzMzMzMzMzM0AAAAAAAAAAAAAAAzMzMzIREBAQEBAQELMzMzMzMzMzMzNAAAAAAAAAAAADMzMyktCQEBAQEBAQEDMzMzMzMzMzMzMwAAAAAAAAAAMzMTLS0gHAEXAQEBAQELMzMzMzMzMzMzMwAAAAAAAAAzMyItLS0qJjMzFAEBAQEYMzMzMzMzMzMzMwAAAAAAADMeLS0tCDMzMzMzLwEBAQUzMzMzMzMzMzMzNAAAAAAAMxMtLS0TMzMzMzMYAQEBCzMzMzMzMzMzMzMzAAAAAAAzEy0tLR4zMzMzMzMBAQELMzMzMzMzMzMzMzMzAAAA
 ADMTLS0tITMzMzMzMwEBAQszMzMzMzMzMzMzMzMAAAAAMyYtLS0sJjMzMzMzAQEBCzMzMzMzMzMzMzMzMwAAAAAzMyotLS0sIRMjIyMBAQEDIyMuJzMzMzMzMzMzMwAAADMzJhotLS0CJAEBAQEBAQEBAQEcLSIxMzMzMzMzAAAAMzMzJxotLQoBAQEBAQEBAQEBAQEtLS0qMzMzMzMAAAAzMzMzJioaAiQBAQEBAQEBAQEBGy0tLS0qMzMzMwAAAAQzMzMzMzMTHyMjIwEBATAjIyMNKi0tLS0TMzMzAAAABDMzMzMzMzMzMzMzAQEBCzMzMzMzIS0tLQgzMzMAAAAAMzMzMzMzMzMzMzMBAQELMzMzMzMzMi0tLTMzNAAAAAAzMzMzMzMzMzMzMwEBAQszMzMzMzMdLS0tMzMAAAAAADQzMzMzMzMzMzMzJQEBDjMzMzMzMx0tLS0zMwAAAAAAADMzMzMzMzMzMzMoAQEBGTMzMzMmLC0tLDM0AAAAAAAANDMzMzMzMzMzMzMBAQEGBzMzJggtLS0xMwAAAAAAAAAAMzMzMzMzMzMzMxIBAQEBBjAcFi0tGh4EAAAAAAAAAAAAMzMzMzMzMzMzMxABAQEBAQEBAi0hNAAAAAAAAAAAAAAEMzMzMzMzMzMzMwYBAQEBASQPMzMAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMDMDArMyY0AAAAAAAAAAAAAAAAAAAANDMzMzMzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAADQzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////+AAf//AAB//wAAD/4AAAP+AAAB/gAAAP4AAAB+AAAAPgAAAD4AAAAeAAAAHgAAAB4AAAAOAAAADgAAAA4AAAAOAA
 AADgAAAA8AAAAPAAAAHwAAAB+AAAAfgAAAP8AAAD/gAAB/4AAA//gAAf/8AAP//wAP///g///////8=" LAST_CHARSET="UTF-8" ID="rdf:#$ojXGd3">More Support &amp; Discussion</A>
+            <DT><A HREF="http://fedoraproject.org/wiki/Communicate" ADD_DATE="1141318585" LAST_VISIT="1176674053" LAST_MODIFIED="1141318713" LAST_CHARSET="UTF-8" ID="rdf:#$ojXGd3">More Support &amp; Discussion</A>
         </DL><p>
         <DT><H3 ADD_DATE="1176674113" LAST_MODIFIED="1176678438" ID="rdf:#$jKnQZ2">Red Hat</H3>
         <DL><p>
-            <DT><A HREF="http://www.redhatmagazine.com/" ADD_DATE="1176678438" LAST_VISIT="1176678446" LAST_MODIFIED="1176678459" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAAAAAAAAAAAAAAAL3gugPJ58sBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC737kQvOG+JwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKnZqo+k1qVeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC/4sAmhsmI9pnRm5y84b4MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACi1aNAks+UjYvMjtqDyIX/jc2Q1YnKi5CFyIiViMmLlYjJipWFyIiVicqLmp3TnlvF5scBAAAAAAAAAACw3LFahMiF/4XJh/+QzZL/ks+V/4bJiP+NzI//l9CZ/4fKiv+Ky4z/ltGZ/4nKiv+DyIT/oNWimdLr0xcAAAAAisuN14fJiP+Bx4L/zunP/9ft2P96xH3/t9+4//j8+f+Hyon/mdKb//v9+/+V0Jb/hsmH/4jKiv2j1qR8AAAAAI3Mj+iHyYj/gMaB/8zozf/W7df/ecN7/7bet//5/Pn/hsmI/5fRmf/8/vv/lM+U/4bJh/+Jy4v/m9KcnwAAAACNzI7ohsmH/4jKiv/l9Ob/7Pft/4bJiP/R6tP//////5PPlf+s2q7/////
 /6/bsP+DyIT/icuL/5vSnZ8AAAAAjcyO6IXJhv+RzpP//P78//7//v+Tz5X/6PXp//////+h1aL/wePB///////H5sf/gceC/4nLi/+b0p2fAAAAAI3Mj+iFyYb/kM2R//r8+v/9/v7/kc6T/+b05///////ndOe/7/iwP//////xOXF/4HHgv+Jy4r/mtKcnwAAAACJyoveh8qI/4LIhP/U7NX/3/Hg/37FgP++4r//+fz5/4nKi/+e1KD//v7+/57Un/+EyIb/iMqK/6LWpJ8AAAAAp9ipcYLHhP+Ax4L/veK+/8blx/99xX//qtms/9nu2f+GyYj/k8+V/9zw3f+Tz5X/fcV//53Tn/8AAAAAAAAAAAAAAACf1KFdmtKb6ZTQl+uU0JbqmdKb6pXQl+qTz5XqmNGa6pjRmeqTz5XqldCX6rPdtOoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//9sZf//cmnv/2lu8/9hbuAHZXLAAXN0gAFuZ4AACQmAAAk8gAB5PoAAbS6AAHBswABwcuAAdC7//2Nr//8ubQ==" LAST_CHARSET="UTF-8" ID="rdf:#$+T+iZ2">Red Hat Magazine</A>
-            <DT><A HREF="http://mugshot.org/main" ADD_DATE="1176674240" LAST_VISIT="1176674248" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjxhJjI8YSf+PGEn/jxhJ/48YSf+PGEn9jxhJ/48YSYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACPGEkzjxhJ/48YSf/Sp87/38Db/9/A2//fwNv/38Db/9Knzv+PGEn/jxhJ/48YSTMAAAAAAAAAAAAAAAAAAAAAjxhJ/9CjzP/kwdn/5MHZ/61Wfv+PGEn/jxhJ/61Wfv/kwdn/5MHZ/9CjzP+PGEn/AAAAAAAAAAAAAAAAjxhJjI8YSf/kwdn/5MHZ/48YSf/HkcL/2K6//9iuv//HkcL/jxhJ/+TB2f/kwdn/jxhJ/48YSYwAAAAAAAAAAI8YSf/Sp87/5MHZ/61Wfv+PGEn/jxhJ/48YSf+PGEn/jxhJ/48YSf+tVn7/5MHZ/9Knzv+PGEn/AAAAAAAAAACPGEn/5MHZ/+TB2f/kwdn/5MHZ/+TB2f/kwdn/5MHZ/+TB2f/kwdn/5MHZ/+TB2f/kwdn/jxhJ/QAAAAAAAAAAjxhJ/+TB2f/kwdn/5MHZ/+TB2f/CgJv/jxhJ/48YSf+8dJL/5MHZ/+TB2f/kwdn/5MHZ/48YSf0AAAAAAAAAAI8YSf/kwdn/5MHZ/9iuv/+PGEn/2K6//+TB2f/kwdn/5MHZ/+TB2f/kwdn/5MHZ/+TB2f+PGEn/AAAAAAAAAACPGEn/5MHZ/+TB2f+PGEn/2K6//48YSf/kwdn/5MHZ/9iuv/+PGEn/5MHZ/+TB2f/kwdn/jxhJ/wAAAAAAAAAAjxhJ/+
 TB2f/kwdn/jxhJ/+TB2f+PGEn/5MHZ/+TB2f/Yrr//jxhJ/+TB2f/kwdn/5MHZ/48YSf8AAAAAAAAAAI8YSf/kwdn/5MHZ/48YSf/Yrr//jxhJ/+TB2f/kwdn/2K6//48YSf/kwdn/5MHZ/+TB2f+PGEn/AAAAAAAAAACPGEn/5MHZ/+TB2f/Yrr//jxhJ/9iuv//kwdn/5MHZ/+TB2f/kwdn/5MHZ/+TB2f/kwdn/jxhJ/wAAAAAAAAAAjxhJ/+TB2f/kwdn/5MHZ/+TB2f/kwdn/5MHZ/+TB2f/kwdn/5MHZ/+TB2f/kwdn/5MHZ/48YSf8AAAAAAAAAAI8YSf/kwdn/jxhJ/+TB2f/kwdn/jxhJ/+TB2f/kwdn/jxhJ/+TB2f/kwdn/jxhJ/+TB2f+PGEn/AAAAAAAAAACPGEn/okiaM48YSZnkwdn/5MHZ/48YSf/kwdn/5MHZ/48YSf/kwdn/5MHZ/48YSZmiSJozjxhJ/wAAAAAAAAAAAAAAAAAAAACPGEmMAAAAAKJImjOPGEmMokiaM6JImjOPGEmMokiaMwAAAACPGEmMAAAAAAAAAAAAAAAA8A9pe+AHAADAA1wAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACgBQAA7bcAAA==" LAST_CHARSET="UTF-8" ID="rdf:#$sKnQZ2">Mugshot</A>
-            <DT><A HREF="http://www.redhat.com/" ADD_DATE="1176674148" LAST_VISIT="1176674165" LAST_MODIFIED="1176674158" ICON="data:image/x-icon;base64,AAABAAEAEBAQAAAAAAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAABxcYQA+fn5AOvr6wChoaMATU1UAM/PzQABAY4AAQGvAAAA2AABAWIACgopAAAAygAAAMwAAAAAAP///wAAAAAA7u7u7u4e7u7u7u7u7jXu7u7u7u7uLT7u7u7u4dDjpETuIu7uVeWt3VPR5UQABK3drVE0l3d3dq3aMHu4zMzIetpsyIu7u7vJp8iHaby7zIm8h5rZvLu3ari5qWjLuGrdqZm4jLvMnd3d27qWzIet3d3Ztnu2tt3a3dp4y5qa3a0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" LAST_CHARSET="ISO-8859-1" ID="rdf:#$qKnQZ2">Red Hat</A>
-            <DT><A HREF="http://www.jboss.com/" ADD_DATE="1176674189" LAST_VISIT="1176674209" LAST_MODIFIED="1176674200" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAABAAAAAAAADEkAAD1sIQB9SCkAfjF7AJl1cwC6mHUAh6JvAIuncQAAAMcABwfLABERzAAjI9MAAFXGAABayQBDQ9cAsH+vAADE/wBB2f8AS9j/AG3g/wB25P8Aq5COAKu+lwC8lLsAyK+TAMWwrgCrwJgAvcyyAN7PvgCamOsApaXsAKHE7ACnyOwAscvvALTR8AC60/EAvtfxAKbq/wC27/8A28PaAOXYygDn3NAA09L3ANzX+QDb2vkA8eriAPLs7ADw8+wA9vPvAOTk+wDv7/wA4Pn/AOf5/wDs+/8A+PL3APX59AD69/gA8vz/APr5+QD6+/4A/fv8AP7+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPj4+Pj4+Pj4+PjMyPj4+Pj4+Pj4+PiUlPi0MCx8+Pj4+Pj4+PiMODiMeCQkPPj4+Pj4+Pj4iDg0gLAwKHj4+Pj4+NhQVOiEgPj4yKz4+Pj4+PiYRESc+Pj4+Pj4+Pj4+Pj40EhM0Pj4+Pj4+Pj4+Pj4+Pjg+Pj4+Pj4+Pj4+Pj4+PhsCFz4+Pj4+Pj4+Pj4+Pj4IAQc+Pj4+Pj4+Pj4+Pj4+MBw4Pj4+Pj4+Pj4+Pj4+Pj4+KRkwPj4+Pj4+Pj4+Pj4+PgYDKjkvPj4+Pj4+Pj4+Pj4uHT4FAz4oGD4+Pj4+Pj4+Pj4+GhY+EAQ+Pj4+Pj4+Pj4+Pj4+Pj43Pj4+PgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" LAST_CHARSET="UTF-8" ID="rdf:#$rKnQZ2">JBoss</A>
+            <DT><A HREF="http://www.redhatmagazine.com/" ADD_DATE="1176678438" LAST_VISIT="1176678446" LAST_MODIFIED="1176678459" LAST_CHARSET="UTF-8" ID="rdf:#$+T+iZ2">Red Hat Magazine</A>
+            <DT><A HREF="http://mugshot.org/main" ADD_DATE="1176674240" LAST_VISIT="1176674248" LAST_CHARSET="UTF-8" ID="rdf:#$sKnQZ2">Mugshot</A>
+            <DT><A HREF="http://www.redhat.com/" ADD_DATE="1176674148" LAST_VISIT="1176674165" LAST_MODIFIED="1176674158" LAST_CHARSET="ISO-8859-1" ID="rdf:#$qKnQZ2">Red Hat</A>
+            <DT><A HREF="http://www.jboss.com/" ADD_DATE="1176674189" LAST_VISIT="1176674209" LAST_MODIFIED="1176674200" LAST_CHARSET="UTF-8" ID="rdf:#$rKnQZ2">JBoss</A>
         </DL><p>
         <DT><H3 ADD_DATE="1176674388" LAST_MODIFIED="1176674871" ID="rdf:#$tKnQZ2">Free Content</H3>
         <DL><p>
-            <DT><A HREF="http://www.wikipedia.org/" ADD_DATE="1176674401" LAST_VISIT="1176674649" LAST_MODIFIED="1176675382" ICON="data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAEAgQAhIOEAMjHyABIR0gA6ejpAGlqaQCpqKkAKCgoAPz9/AAZGBkAmJiYANjZ2ABXWFcAent6ALm6uQA8OjwAiIiIiIiIiIiIiI4oiL6IiIiIgzuIV4iIiIhndo53KIiIiB/WvXoYiIiIfEZfWBSIiIEGi/foqoiIgzuL84i9iIjpGIoMiEHoiMkos3FojmiLlUipYliEWIF+iDe0GoRa7D6GPbjcu1yIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" LAST_CHARSET="UTF-8" ID="rdf:#$uKnQZ2">Wikipedia</A>
+            <DT><A HREF="http://www.wikipedia.org/" ADD_DATE="1176674401" LAST_VISIT="1176674649" LAST_MODIFIED="1176675382" LAST_CHARSET="UTF-8" ID="rdf:#$uKnQZ2">Wikipedia</A>
 <DD>Online Encyclopedia
-            <DT><A HREF="http://www.jamendo.com/" ADD_DATE="1176674604" LAST_VISIT="1176674681" LAST_MODIFIED="1176675644" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcj8BAHZDAQB6RwEAf0wBAHxJBAB/f38AhFEBAIRSAgCJVgEAj1sBAI9cAgCNXAoAhFYbAJRgAACZZQAAnmoAAJ5rAQCZaA0AkWMbAKNvAACncwAAq3cAAK56AACseAIAsX0AAJBjIgCabiUAk2oxAKB5PACjfkgAoHxKAK6AHgCxhScAs4gsALqQLgCyij4AsItLAL2XRwCmhVoApINeAL6dXQClhWEAqophALCQYgC0lWUAuZhgALiccwC4nXsAuZ99AL+lfwDDnUgAx6RUAMOjYgDIqGAAzq5gAM+vYwDJqmgAxKhzANCzcADQtn0A07h6ANW6fgC+pYIAvqaDAMKpggDEq4AAwaqNANS7gwDWvYcAzbiXAM+7mADLuJwAz7udANC6kADPvKIA2MGOANXAlgDZwpAA2sSUANzHmQDYxqYA08KrANXFrADXx68A3syoAOXWtgDp4dQA7ebaAO/p3wDv6eAA9O/pAPTw6gD39PAA+PbyAG88AQAyB5J8qwaSfOsGknwWAAAAFgAAAAEAAADIBZJ8kJQHAGgQjgBRBZJ8eBMFAG0FknwAAAAAPQSSfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADOM5J8+bUAALgNjgA
 AAAUAbBKOABjukXzAQJJ8/////7tAknyO1gEARQAAAKwPjgCAABDAbBKOABjukXxwBZJ8/////wAAAAA9BJJ84BCOAHULgXy3AAAAAQAAAAIAAABcEo4AGAAAAAAAAADIEI4AQgAAAAAAAACsEI4AAAAAAAAAAAAAAAAADAAAAAIAAAABAZF8ANz9f2oAAAAAAAAAAwAAAHIAGgKYlAcAAAAAAJiUBwAFAAAA3+KAfAQRjgBPGoB8sAEAAAAAAMAAAAAAAAAAAAIAAACAAAAAAAAAAEQSjgA/ZUsAUDgJAQAAAMAAAAAAOBKOAAIAAACAAAAAAAAAAOgrjgDk9agAAgAAAEM6XEN5cHJpZW5cMXd3dy4FAAAAZXJmbHkuZnJlZS5mclxqYW1lbmRvXGZhdmljb24uaWNvANF3AND9f8wRjgAAAAAASCkJASqI0Xf/6ZF8DhCBfLABAAAAAAAAAAAAAAAAAADAEY4ASCkJARYAAAAAAAAALhCBfBYAAABcEo4AAQAAACAAAAAWAAAAAAAAABYAAACsEY4AKojRd2wSjgDzmYN8OBCBfP////8uEIF81mVLALABAABIKQkBFgAAABASjgAAAAAAAChfX19fX19fX19fX18qACgBAQEBAQEBAQEBAQEBASoCAgICAgICJ0MxMCsNAgICAwMDBR9SWl5dSz9IQBwDAwQEBDJZXFtXUx4aLFQvBAQHBwdJWEETCAcHBx1GLQcHCQkJCQkJCQkJCQxCRxsJCQoKCgoKCgoKCgslUS4KCgoODg4ODg4ODg4SSjoSDg4ODw8PDw8PDw8PKU0kDw8PDxAQEBAQEBAQEFU1ERAQEBAUFBQUFBQUFBRWPCEgIiY5FRUVFRUVFRUVNk9MREVOUBYWFhYWFhYWFhgzPT47NCM3FxcXFxcXFxcXFxcXFxc4ADcZGRkZGRkZGRkZGRk4AIABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAAA=" LAST_CHARSET="UTF-8" ID="rdf:#$JKnQZ2">Jamendo</A>
-            <DT><A HREF="http://magnatune.com/" ADD_DATE="1176674748" LAST_VISIT="1176675508" LAST_MODIFIED="1176675639" ICON="data:image/x-icon;base64,AAABAAIAICAQAAAAAADoAgAAJgAAABAQEAAAAAAAKAEAAA4DAAAoAAAAIAAAAEAAAAABAAQAAAAAAIACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAAgIAAAMDAwACAgIAAAAD/AAD/AAAA//8A/wAAAP8A/wD//wAA////AP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////3eIiHf//////////////3iIiIiIh/////////////eIh///eIh///////////94h/////94h//////////3iH9/9//394h/////////+If4h/iPeI94j////////3iP+If4j3iP+If///////94f/iH+I94j/eH////////iP/4h/iPeI//iP///////4j/+If4j3iP/4j///////+I//iH+I94j/+I////////iP/4j/iP+I//iP///////3h////4j///94f///////94j///+I////iH////////+If///iP//94j/////////eIf//4j//3iH//////////eIf/93//eIf///////////eIh///eIh/////////////eIiIiIiH//////////////93iIh3/////////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAEAAAACAAAAABAAQAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAAgIAAAMDAwACAgIAAAAD/AAD/AAAA//8A/wAAAP8A/wD//wAA////AP//d4iId/////eId3eIf///eHf//3eH//eHf///93h/eH+Hd39494d4f4d3d3j3h4f/h3d3eP94h/+Hd3d4/3iH/4d3d3j/eIf/d/d/d/94eH//93//94d4f//3f//3h/eH//d//3h//3h39393h///94h3d4h/////d4iId///AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$KKnQZ2">Magnatune</A>
-            <DT><A HREF="http://freesound.iua.upf.edu/" ADD_DATE="1176674764" LAST_VISIT="1176674804" LAST_MODIFIED="1176674833" ICON="data:image/gif;base64,R0lGODlhEAAQAOYAAPn5+f39/fv7+/z8/O/v752dnYaGhsPDw/f39/j4+KCgoPb29uDg4KysrDs7O+np6fLy8tfX19DQ0NXV1cTExPT09NnZ2dbW1u7u7qurq7S0tLi4uKSkpIeHh6Ojo7W1tb6+vpeXl4ODg0hISIiIiMDAwAsLC0tLS5GRkUxMTLa2tmpqatTU1K2trcXFxZ6enpmZmezs7LGxsdzc3G5ubpycnOfn59HR0S4uLmtra/Dw8Le3t5ubm6ampvPz8+3t7djY2GxsbGdnZ5KSkru7uzg4OAMDA3V1dVVVVZ+fn/7+/gAAAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAd4gACCg4SFhoQ8h4cFJoqFEUsHgiqGM0GCSUaCDjmGSDSCKSeCSxKGSzgUACMrAAdLGYMfLihHRQYNGzUAHDJCDkAlhDAhLwAWABcABQw3hQoNPQAsHoIKhxM7QwAUBoItigwdAEQgjoMkABoR54IiAKbty/KDE46BADs=" LAST_CHARSET="UTF-8" ID="rdf:#$LKnQZ2">The Freesound Project</A>
-            <DT><A HREF="http://creativecommons.org/" ADD_DATE="1176674776" LAST_VISIT="1176675582" LAST_MODIFIED="1176675626" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAEACABoBQAAJgAAACAgAAABAAgAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAABAAAAAAAAAAAAAP///wDu7u4A3d3dAMzMzAC7u7sAqqqqAJmZmQCIiIgAd3d3AGZmZgBVVVUAREREADMzMwAiIiIAERERAP///wABAQEBAwgMDAwMCAIBAQEBAQEBCA8ADAgIDAAPBwEBAQEBCgAJAgEBAQECCwAJAQEBCAAHAQEBAQEBAQEHAAYBAg8LAQEBAQEBAQEBAQsPAQcAAwEECAgCAggIBQEDAAYKDAEDDwsLCgoNCA8DAQ4IDAwBCAABAQEACAEBAQEMCwwMAQcAAgMDDwkBBAEBDAoJDgECDQ4PCQcADQ4DAQ8IBgAFAQEEAwEBAwUBAQYABAENDQIBAQEBAQEBAQIODAEBBA8KAgEBAQEBAQINDwQBAQEFDw4HAQEBAgcODwQBAQEBAQQMAAANDgAADAMBAQEBAQEBAQMICAgHAwEBAQEBAAASAKYCAAAPAgAADAIAADiEbwAHAAAAXgIAAGABAABFBAAA2QIAAAAAAAABAAAAHPYSAAAAAABc+BIAdsDXdyC31Xf/////pgIAAA8CAACs9hIAoWPUdziEbwCmAg8ChAAAAKYCDwIAAAAAAQAAAAAQAAABBAAAAAAAAHgEAgCgNUgAxPYSAHZw1HcM9xIA+2/Ud5oEAgCEAAAAAAAAAKYCDwIBAAAAsm/Ud5oEAgCEAAAAAAAAAMZv1HeEAAAApgIPAgAAAAABAAAAAAAAAAAAAADc9hIAAAAAAFz
 4EgB2wNd3GLjVd//////Gb9R3DQZBAJoEAgCEAAAAAAAAAKYCDwJM+BIAMARBAAT4EgAAAAAAQwAAAPn///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAMPcSABQAAADpBwqdAgAAAMEGCrHXAQAAAwAAAOYBAADU0MgALh7Hd7jBFgAAAAAA2PcSAAAAAABRAAEBmPgSAAMAAADCztV33PcSAKMblnFM+BIAMARBALjBFgDU0MgA3PcSAKkblnFRAAEB1NDIAC4ex3cE+BIAXzrUd5oEAgCEAAAAAAAAAKYCDwIwBEEAzau63AAAAABM+BIAMARBAGz4EgAuO9R3AOD9f2z4EgA/PNR3OPgSAEI71HcAAAAAmgQCAAcAAAADAAAAAAAAAAAAAAAUAAAAAQAAAAAAAAAAAAAAEAAAAAAAAAABAAAAIPgSAAAAAACw+BIAdsDXdyC31Xf/////QjvUd3RY1HcAAAAAMARBAJoEAgCEAAAAAAAAAKYCDwJMhG8Af1jUdxIBAAA4hG8ABwAAAOYBAAABAAAAlPgSAAIAAACw+RIAdsDXd4i31Xf/////f1jUd6RY1Hc4hG8AhAAAAAAAAAC0WNR3AAAAAAAAAAADCAwMDAwIAgAAAAAAAAAIDwAMCAgMAA8HAAAAAAAKAAkCAQEBAQILAAkAAAAIAAcBAQEBAQEBAQcABgACDwsBAQEBAQEBAQEBCw8ABwADAQQICAICCAgFAQMABgoMAQMPCwsKCg0IDwMBDggMDAEIAAEBAQAIAQEBAQwLDAwBBwACAwMPCQEEAQEMCgkOAQINDg8JBwANDgMBDwgGAAUBAQQDAQEDBQEBBgAEAA0NAgEBAQEBAQEBAg4MAAAEDwoCAQEBAQEBAg0PBAAAAAUPDgcBAQECBw4PBAAAAAAABAwAAA0OAAAMAwAAAAAAAAAAAwgICAcDAAAAAADwD///4Af/
 /8AD//+AAf//AAH//wAA//8AAP//AAD//wAA//8AAP//AAD//4AB//+AAf//wAP//+AH///4H///KAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAP///wDe3t4Ara2tAIyMjABzc3MAQkJCAFJSUgDOzs4AnJycAAAAAAAhISEAMTExABAQEADv7+8Avb29AGNjYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJBwMEBQUFBgMOCQkJCQkJCQkJCQkJCQkJCQkJCQkJCAoJCQkJCQkJCQkMDwEJCQkJCQkJCQkJCQkJCQkJDgoJCQkJCQkJCQkJCQkJCQMJCQkJCQkJCQkJCQkJCQMJCQkJBggBAAAAAA4ECgkJCQsBCQkJCQkJCQkJCQkPCQkJBgEAAAAAAAAAAAAACAwJCQwHCQkJCQkJCQkJBAkJCQgAAAAAAAAAAAAAAAAADQsJCQwBCQkJCQkJCQIJCQwHAAAAAAAAAAAAAAAAAAAAAA8JCQsJCQkJCQkNDAkJCAAAAAAAAAAAAAAAAAAAAAAAAAsJCQMJCQkJCQMJCQQAAAAAAAAAAAAAAAAAAAAAAAAAAQwJDA0JCQkNDAkMDQAAAAAAAAAAAAAAAAAAAAAAAAAAAwkJAwkJCQgJCQMAAAAAAQ
 MDAw4AAAAACAMDAw0AAAANCQkLCQkJDwkJAQAAAAgJCQkJCQ8ADQsJCQkJDAcAAAAFCQkJCQkFCQoAAAABCQkLCAMMCQgPCQkEAgYJCwAAAAMJCQ4JCQkJBQAAAAMJCQEAAA4OAAkJBgAAAAgNAAAAAgkJDgkJCQkFAAAABgkJAAAAAAAOCQkDAAAAAAAAAAAOCQkDCQkJCQUAAAAPCQkAAAAAAAcJCQMAAAAAAAAAAA4JCQMJCQkJBQAAAAMJCQ4AAAIBAAwJBQAADQgAAAAACAkJDgkJBQkMAAAADQwJDAMECQkCBAkJBgMLCQUAAAADCQkOCQkECQkHAAAABwwJCQkJBAAADwkJCQkKBwAAAAsJCQkJCQIJCQQAAAAADQgDAwEAAAAABwMDAgAAAAABCQkFCQkJCQwJDA0AAAAAAAAAAAAAAAAAAAAAAAAAAA8JCQgJCQkJAwkJDwAAAAAAAAAAAAAAAAAAAAAAAAAHCQkMDQkJCQkNCgkJCAAAAAAAAAAAAAAAAAAAAAAADQsJCQgJCQkJCQkOCQkJCAAAAAAAAAAAAAAAAAAAAA0LCQkFCQkJCQkJCQkICQkJAwAAAAAAAAAAAAAAAAABCwkJCw0JCQkJCQkJCQkECQkJBQEAAAAAAAAAAAAAAwwJCQoHCQkJCQkJCQkJCQkICQkJCQYIBwAAAA0CBAwJCQkLDQkJCQkJCQkJCQkJCQkHCwkJCQkJCQkJCQkJCQkMAwkJCQkJCQkJCQkJCQkJCQkJCAUJCQkJCQkJCQkKAwEJCQkJCQkJCQkJCQkJCQkJCQkJCQECAwQFBgMDBwkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJ///////gD///gAH//gAA//wAAD/4AAAf8AAAD+AAAA/AAAAHwAAAA4AAAAOAAAADgAAAA4AAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAO
 AAAADwAAAA8AAAAPAAAAH4AAAD/AAAA/4AAAf/AAAP/4AAP//gAH//+AP//////8=" LAST_CHARSET="UTF-8" ID="rdf:#$MKnQZ2">Creative Commons</A>
+            <DT><A HREF="http://www.jamendo.com/" ADD_DATE="1176674604" LAST_VISIT="1176674681" LAST_MODIFIED="1176675644" LAST_CHARSET="UTF-8" ID="rdf:#$JKnQZ2">Jamendo</A>
+            <DT><A HREF="http://magnatune.com/" ADD_DATE="1176674748" LAST_VISIT="1176675508" LAST_MODIFIED="1176675639" LAST_CHARSET="ISO-8859-1" ID="rdf:#$KKnQZ2">Magnatune</A>
+            <DT><A HREF="http://freesound.iua.upf.edu/" ADD_DATE="1176674764" LAST_VISIT="1176674804" LAST_MODIFIED="1176674833" LAST_CHARSET="UTF-8" ID="rdf:#$LKnQZ2">The Freesound Project</A>
+            <DT><A HREF="http://creativecommons.org/" ADD_DATE="1176674776" LAST_VISIT="1176675582" LAST_MODIFIED="1176675626" LAST_CHARSET="UTF-8" ID="rdf:#$MKnQZ2">Creative Commons</A>
 <DD>Free Content Licenses
         </DL><p>
     </DL><p>


Index: fedora-bookmarks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-bookmarks/devel/fedora-bookmarks.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-bookmarks.spec	18 Oct 2007 17:18:13 -0000	1.3
+++ fedora-bookmarks.spec	2 Sep 2008 15:11:59 -0000	1.4
@@ -1,10 +1,12 @@
 Name:           fedora-bookmarks
-Version:        8
+Version:        10
 Release:        1
 Summary:        Fedora bookmarks
 Group:          Applications/Internet
 License:        GFDL
 URL:            http://fedoraproject.org/
+# I had to strip the embedded icons out of the bookmarks file, because they are not 
+# distributable under the GFDL. See https://bugzilla.redhat.com/show_bug.cgi?id=433471
 Source0:        default-bookmarks.html
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -36,6 +38,10 @@
 %{_datadir}/bookmarks/default-bookmarks.html
 
 %changelog
+* Tue Sep  2 2008 Tom "spot" Callaway <tcallawa at redhat.com> 10-1
+- fix bookmarks.html to not have embedded icons, they aren't usable under the GFDL.
+  resolves bz 433471
+
 * Wed Oct 17 2007 Matthias Clasen <mclasen at redhat.com> 8-1
 - Update the link to the Fedora project homepage  (#291851)
 



From rhughes at fedoraproject.org  Tue Sep  2 15:28:29 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue,  2 Sep 2008 15:28:29 +0000 (UTC)
Subject: rpms/hal/devel hal.spec,1.159,1.160
Message-ID: <20080902152830.009207011E@cvs1.fedora.phx.redhat.com>

Author: rhughes

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

Modified Files:
	hal.spec 
Log Message:
* Tue Sep 02 2008 Richard Hughes <rhughes at redhat.com> - 0.5.11-4
- Rebuild for new udev (libvolume_id)



Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- hal.spec	22 Jul 2008 23:11:28 -0000	1.159
+++ hal.spec	2 Sep 2008 15:27:59 -0000	1.160
@@ -26,7 +26,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.11
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Patch1: hal-0.5.10-set-property-direct.patch
@@ -274,6 +274,9 @@
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Tue Sep 02 2008 Richard Hughes <rhughes at redhat.com> - 0.5.11-4
+- Rebuild for new udev (libvolume_id)
+
 * Tue Jul 22 2008 Jon McCann  <jmccann at redhat.com> - 0.5.11-3
 - Fix for CK API changes
 



From kvolny at fedoraproject.org  Tue Sep  2 15:34:36 2008
From: kvolny at fedoraproject.org (=?utf-8?q?Karel_Voln=C3=BD?=)
Date: Tue,  2 Sep 2008 15:34:36 +0000 (UTC)
Subject: rpms/qmmp/devel .cvsignore, 1.4, 1.5 qmmp.spec, 1.6, 1.7 sources,
	1.4, 1.5
Message-ID: <20080902153436.9D9DE7011D@cvs1.fedora.phx.redhat.com>

Author: kvolny

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

Modified Files:
	.cvsignore qmmp.spec sources 
Log Message:
new version




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qmmp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Jul 2008 14:10:18 -0000	1.4
+++ .cvsignore	2 Sep 2008 15:34:05 -0000	1.5
@@ -1 +1 @@
-qmmp-0.2.0.tar.bz2
+qmmp-0.2.2.tar.bz2


Index: qmmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qmmp/devel/qmmp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qmmp.spec	30 Jul 2008 12:42:36 -0000	1.6
+++ qmmp.spec	2 Sep 2008 15:34:06 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		qmmp
-Version:	0.2.0
+Version:	0.2.2
 Release:	1%{?dist}
 Summary:	Qt-based multimedia player
 
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Tue Sep 02 2008 Karel Volny <kvolny at redhat.com> 0.2.2-1
+- new version
+
 * Wed Jul 30 2008 Karel Volny <kvolny at redhat.com> 0.2.0-1
 - new version
 - updated %%description to match upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qmmp/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Jul 2008 14:10:18 -0000	1.4
+++ sources	2 Sep 2008 15:34:06 -0000	1.5
@@ -1 +1 @@
-3dd56fc0c9dd632572465f9eab3e4c80  qmmp-0.2.0.tar.bz2
+363d331d5454750277a7180118cbc62d  qmmp-0.2.2.tar.bz2



From mschwendt at fedoraproject.org  Tue Sep  2 15:46:49 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  2 Sep 2008 15:46:49 +0000 (UTC)
Subject: rpms/presto/devel presto.spec,1.1,1.2
Message-ID: <20080902154649.7606E7011D@cvs1.fedora.phx.redhat.com>

Author: mschwendt

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

Modified Files:
	presto.spec 
Log Message:
* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> 0.1.3-5
- Include unowned directories

No build-job.



Index: presto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/presto/devel/presto.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- presto.spec	22 Jul 2008 17:11:27 -0000	1.1
+++ presto.spec	2 Sep 2008 15:46:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           presto
 Version:        0.1.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A tilemap engine using the Allegro game programming library
 
 Group:          Development/Libraries
@@ -56,6 +56,7 @@
 %{_libdir}/libpresto.so.0
 %{_libdir}/libpresto.so.0.1
 %{_libdir}/libpresto.so.%{version}
+%dir %{_docdir}/presto-%{version}
 %doc %{_docdir}/presto-%{version}/README
 %doc %{_docdir}/presto-%{version}/COPYING
 
@@ -63,9 +64,11 @@
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libpresto.so
+%dir %{_includedir}/presto
 %{_includedir}/presto/presto.h
 %{_includedir}/presto/functions.h
 %{_includedir}/presto/loadpng.h
+%dir %{_docdir}/presto-%{version}/examples
 %doc %{_docdir}/presto-%{version}/examples/build
 %doc %{_docdir}/presto-%{version}/examples/test.c
 %doc %{_docdir}/presto-%{version}/examples/test.map
@@ -76,6 +79,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> 0.1.3-5
+- Include unowned directories
+
 * Mon Jul 21 2008 Peter Fernandes <supersonicandtails at gmail.com> 0.1.3-4
 - Fixed clean section
 



From twaugh at fedoraproject.org  Tue Sep  2 15:50:13 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  2 Sep 2008 15:50:13 +0000 (UTC)
Subject: rpms/foomatic/F-8 foomatic-hpclj9500mfp.patch, NONE,
	1.1 foomatic.spec, 1.176, 1.177
Message-ID: <20080902155013.531317011D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17682

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-hpclj9500mfp.patch 
Log Message:
* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com>
- Fixed typo in HP-Color_LaserJet_9500_MFP.xml.


foomatic-hpclj9500mfp.patch:

--- NEW FILE foomatic-hpclj9500mfp.patch ---
diff -U0 foomatic-db-20080211/ChangeLog.hpclj9500mfp foomatic-db-20080211/ChangeLog
diff -up foomatic-db-20080211/db/source/printer/HP-Color_LaserJet_9500_MFP.xml.hpclj9500mfp foomatic-db-20080211/db/source/printer/HP-Color_LaserJet_9500_MFP.xml
--- foomatic-db-20080211/db/source/printer/HP-Color_LaserJet_9500_MFP.xml.hpclj9500mfp	2008-09-02 16:47:46.000000000 +0100
+++ foomatic-db-20080211/db/source/printer/HP-Color_LaserJet_9500_MFP.xml	2008-09-02 16:48:14.000000000 +0100
@@ -1,6 +1,6 @@
 <printer id="printer/HP-Color_LaserJet_9500_MFP">
   <make>HP</make>
-  <model>ColorLaserJet 9500 MFP</model>
+  <model>Color LaserJet 9500 MFP</model>
   <mechanism>
     <laser/>
     <color/>


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-8/foomatic.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- foomatic.spec	2 Sep 2008 12:22:30 -0000	1.176
+++ foomatic.spec	2 Sep 2008 15:49:43 -0000	1.177
@@ -48,6 +48,7 @@
 
 Patch19: foomatic-459847.patch
 Patch20: foomatic-busyloop.patch
+Patch21: foomatic-hpclj9500mfp.patch
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
@@ -116,6 +117,7 @@
 
 %patch16 -p1 -b .ieee1284
 %patch19 -p1 -b .459847
+%patch21 -p1 -b .hpclj9500mfp
 
 cd db/source
 
@@ -255,6 +257,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com>
+- Fixed typo in HP-Color_LaserJet_9500_MFP.xml.
+
 * Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-61
 - Avoid busy-looping when trying to shorten long PPD nicknames.
 



From twaugh at fedoraproject.org  Tue Sep  2 15:51:07 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  2 Sep 2008 15:51:07 +0000 (UTC)
Subject: rpms/foomatic/F-9 foomatic-hpclj9500mfp.patch, NONE,
	1.1 foomatic.spec, 1.187, 1.188
Message-ID: <20080902155107.3A42F7011D@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-hpclj9500mfp.patch 
Log Message:
* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com>
- Fixed typo in HP-Color_LaserJet_9500_MFP.xml.


foomatic-hpclj9500mfp.patch:

--- NEW FILE foomatic-hpclj9500mfp.patch ---
diff -U0 foomatic-db-20080211/ChangeLog.hpclj9500mfp foomatic-db-20080211/ChangeLog
diff -up foomatic-db-20080211/db/source/printer/HP-Color_LaserJet_9500_MFP.xml.hpclj9500mfp foomatic-db-20080211/db/source/printer/HP-Color_LaserJet_9500_MFP.xml
--- foomatic-db-20080211/db/source/printer/HP-Color_LaserJet_9500_MFP.xml.hpclj9500mfp	2008-09-02 16:47:46.000000000 +0100
+++ foomatic-db-20080211/db/source/printer/HP-Color_LaserJet_9500_MFP.xml	2008-09-02 16:48:14.000000000 +0100
@@ -1,6 +1,6 @@
 <printer id="printer/HP-Color_LaserJet_9500_MFP">
   <make>HP</make>
-  <model>ColorLaserJet 9500 MFP</model>
+  <model>Color LaserJet 9500 MFP</model>
   <mechanism>
     <laser/>
     <color/>


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-9/foomatic.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- foomatic.spec	2 Sep 2008 13:32:49 -0000	1.187
+++ foomatic.spec	2 Sep 2008 15:50:37 -0000	1.188
@@ -48,6 +48,7 @@
 
 Patch19: foomatic-459847.patch
 Patch20: foomatic-busyloop.patch
+Patch21: foomatic-hpclj9500mfp.patch
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
@@ -116,6 +117,7 @@
 
 %patch16 -p1 -b .ieee1284
 %patch19 -p1 -b .459847
+%patch21 -p1 -b .hpclj9500mfp
 
 cd db/source
 
@@ -255,6 +257,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com>
+- Fixed typo in HP-Color_LaserJet_9500_MFP.xml.
+
 * Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-61
 - Avoid busy-looping when trying to shorten long PPD nicknames.
 



From twaugh at fedoraproject.org  Tue Sep  2 15:53:32 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  2 Sep 2008 15:53:32 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic-hpclj9500mfp.patch, NONE,
	1.1 foomatic.spec, 1.197, 1.198
Message-ID: <20080902155332.3CB557011D@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-hpclj9500mfp.patch 
Log Message:
* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com>
- Fixed typo in HP-Color_LaserJet_9500_MFP.xml.


foomatic-hpclj9500mfp.patch:

--- NEW FILE foomatic-hpclj9500mfp.patch ---
diff -up foomatic-db-20080710/db/source/printer/HP-Color_LaserJet_9500_MFP.xml.hpclj9500mfp foomatic-db-20080710/db/source/printer/HP-Color_LaserJet_9500_MFP.xml
--- foomatic-db-20080710/db/source/printer/HP-Color_LaserJet_9500_MFP.xml.hpclj9500mfp	2008-09-02 16:51:29.000000000 +0100
+++ foomatic-db-20080710/db/source/printer/HP-Color_LaserJet_9500_MFP.xml	2008-09-02 16:51:39.000000000 +0100
@@ -1,6 +1,6 @@
 <printer id="printer/HP-Color_LaserJet_9500_MFP">
   <make>HP</make>
-  <model>ColorLaserJet 9500 MFP</model>
+  <model>Color LaserJet 9500 MFP</model>
   <mechanism>
     <laser/>
     <color/>


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- foomatic.spec	2 Sep 2008 13:45:48 -0000	1.197
+++ foomatic.spec	2 Sep 2008 15:53:01 -0000	1.198
@@ -43,6 +43,7 @@
 Patch18: foomatic-sigpipe.patch
 Patch19: foomatic-459847.patch
 Patch20: foomatic-busyloop.patch
+Patch21: foomatic-hpclj9500mfp.patch
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
@@ -108,6 +109,7 @@
 pushd foomatic-db-%{dbver}
 %patch7 -p1 -b .ppdload-ppd
 %patch19 -p1 -b .459847
+%patch21 -p1 -b .hpclj9500mfp
 
 cd db/source
 
@@ -250,6 +252,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com>
+- Fixed typo in HP-Color_LaserJet_9500_MFP.xml.
+
 * Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-63
 - Avoid busy-looping when trying to shorten long PPD nicknames.
 



From nhorman at fedoraproject.org  Tue Sep  2 16:01:07 2008
From: nhorman at fedoraproject.org (Neil Horman)
Date: Tue,  2 Sep 2008 16:01:07 +0000 (UTC)
Subject: rpms/kexec-tools/F-9 kexec-tools-1.102pre-ppc64-rel_detect.patch,
	NONE, 1.1 kexec-tools.spec, 1.116, 1.117
Message-ID: <20080902160107.734F67011D@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19479

Modified Files:
	kexec-tools.spec 
Added Files:
	kexec-tools-1.102pre-ppc64-rel_detect.patch 
Log Message:
Resolves: bz 460897

kexec-tools-1.102pre-ppc64-rel_detect.patch:

--- NEW FILE kexec-tools-1.102pre-ppc64-rel_detect.patch ---
diff -up kexec-tools-testing-20070330/kexec/arch/ppc64/kexec-elf-rel-ppc64.c.orig kexec-tools-testing-20070330/kexec/arch/ppc64/kexec-elf-rel-ppc64.c
--- kexec-tools-testing-20070330/kexec/arch/ppc64/kexec-elf-rel-ppc64.c.orig	2008-09-02 11:57:57.000000000 -0400
+++ kexec-tools-testing-20070330/kexec/arch/ppc64/kexec-elf-rel-ppc64.c	2008-09-02 11:58:14.000000000 -0400
@@ -56,6 +56,7 @@ void machine_apply_elf_rel(struct mem_eh
 		break;
 
 	case R_PPC64_ADDR64:
+	case R_PPC64_REL64:
 		/* Simply set it */
 		*(uint64_t *)location = value;
 		break;


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-9/kexec-tools.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- kexec-tools.spec	12 Aug 2008 15:23:12 -0000	1.116
+++ kexec-tools.spec	2 Sep 2008 16:00:37 -0000	1.117
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.102pre 
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -50,6 +50,8 @@
 Patch302: kexec-tools-1.102pre-ppc64-buffer-overflow.patch
 Patch303: kexec-tools-1.102pre-ppc-boots-ppc64.patch 
 Patch304: kexec-tools-1.102pre-ppc64-devtree.patch
+Patch305: kexec-tools-1.102pre-ppc64-rel_detect.patch
+
 #
 # Patches 401 through 500 are meant for s390 kexec-tools enablement
 #
@@ -88,6 +90,7 @@
 %patch302 -p1
 %patch303 -p1
 %patch304 -p1
+%patch305 -p1
 
 %patch501 -p1
 
@@ -231,6 +234,9 @@
 %doc kexec-kdump-howto.txt
 
 %changelog
+* Tue Sep 02 2008 Neil Horman <nhorman at redhat.com> - 1.102pre-13
+- fix ppc64 relocatable symbol detection (bz 460897)
+
 * Tue Aug 12 2008 Neil Horman <nhorman at redhat.com> - 1.102pre-12
 - update mkdumprd to devel version since several fixes are missing 
 



From mschwendt at fedoraproject.org  Tue Sep  2 16:03:48 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  2 Sep 2008 16:03:48 +0000 (UTC)
Subject: rpms/python-TurboMail/devel python-TurboMail.spec,1.7,1.8
Message-ID: <20080902160348.188EA7011D@cvs1.fedora.phx.redhat.com>

Author: mschwendt

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

Modified Files:
	python-TurboMail.spec 
Log Message:
* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> 2.1-4
- Include unowned directory.

No build-job.



Index: python-TurboMail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-TurboMail/devel/python-TurboMail.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-TurboMail.spec	19 Feb 2008 18:41:22 -0000	1.7
+++ python-TurboMail.spec	2 Sep 2008 16:03:16 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           python-TurboMail
 Version:        2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Multi-threaded mail queue manager for TurboGears applications
 
 Group:          Development/Libraries
@@ -50,9 +50,13 @@
 %defattr(-,root,root,-)
 %doc README.txt LICENSE.txt
 %{python_sitelib}/TurboMail-%{version}-py%{pyver}.egg-info
+%dir %{python_sitelib}/turbomail
 %{python_sitelib}/turbomail/*.py*
 
 %changelog
+* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> 2.1-4
+- Include unowned directory.
+
 * Tue Feb 19 2008 Luke Macken <lmacken at redhat.com> 2.1-2
 - Patch setup.py to add __requires__="TurboGears".  This will make sure we pull
   in the appropriate CherryPy module.



From twaugh at fedoraproject.org  Tue Sep  2 16:04:19 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  2 Sep 2008 16:04:19 +0000 (UTC)
Subject: rpms/foomatic/F-8 foomatic.spec,1.177,1.178
Message-ID: <20080902160419.B03F57011D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20130

Modified Files:
	foomatic.spec 
Log Message:
3.0.2-62


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-8/foomatic.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- foomatic.spec	2 Sep 2008 15:49:43 -0000	1.177
+++ foomatic.spec	2 Sep 2008 16:03:49 -0000	1.178
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    61%{?dist}
+Release:    62%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -257,7 +257,7 @@
 %{_var}/cache/foomatic
 
 %changelog
-* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com>
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-62
 - Fixed typo in HP-Color_LaserJet_9500_MFP.xml.
 
 * Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-61



From twaugh at fedoraproject.org  Tue Sep  2 16:04:30 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  2 Sep 2008 16:04:30 +0000 (UTC)
Subject: rpms/foomatic/F-9 foomatic.spec,1.188,1.189
Message-ID: <20080902160430.B4C327011D@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	foomatic.spec 
Log Message:
3.0.2-62


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-9/foomatic.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- foomatic.spec	2 Sep 2008 15:50:37 -0000	1.188
+++ foomatic.spec	2 Sep 2008 16:04:00 -0000	1.189
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    61%{?dist}
+Release:    62%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -257,7 +257,7 @@
 %{_var}/cache/foomatic
 
 %changelog
-* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com>
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-62
 - Fixed typo in HP-Color_LaserJet_9500_MFP.xml.
 
 * Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-61



From twaugh at fedoraproject.org  Tue Sep  2 16:04:44 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  2 Sep 2008 16:04:44 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic.spec,1.198,1.199
Message-ID: <20080902160444.8F2EB7011D@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	foomatic.spec 
Log Message:
3.0.2-64


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- foomatic.spec	2 Sep 2008 15:53:01 -0000	1.198
+++ foomatic.spec	2 Sep 2008 16:04:14 -0000	1.199
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    63%{?dist}
+Release:    64%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -252,7 +252,7 @@
 %{_var}/cache/foomatic
 
 %changelog
-* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com>
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-64
 - Fixed typo in HP-Color_LaserJet_9500_MFP.xml.
 
 * Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-63



From dsd at fedoraproject.org  Tue Sep  2 16:14:41 2008
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  2 Sep 2008 16:14:41 +0000 (UTC)
Subject: rpms/hal/OLPC-3 hal-battery-poll.patch, NONE, 1.1 hal.spec, 1.158,
	1.159
Message-ID: <20080902161441.930D07011D@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/hal/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21920

Modified Files:
	hal.spec 
Added Files:
	hal-battery-poll.patch 
Log Message:
Add patch to disable battery polling

hal-battery-poll.patch:

--- NEW FILE hal-battery-poll.patch ---
>From 3143949531e84213170039cbf6f0190c5060587c Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd at laptop.org>
Date: Mon, 4 Aug 2008 12:10:37 -0400
Subject: [PATCH] Don't poll batteries which provide notifications

Commit 7430beeb6c6f introduced mandatory polling for all batteries.
However, OLPC's battery does not require this - it provides interrupts
when battery charge level changes, and these notifications make it to
userspace and are successfully handled by HAL.

This patch makes HAL understand the "battery.change_notifications"
attribute which can be specified by fdi files. When true, HAL will not poll
the battery.

This is useful for OLPC because checking battery status is quite a heavy
operation and affects performance of some of our audio applications.
---
 hald/linux/device.c |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/hald/linux/device.c b/hald/linux/device.c
index 72bff9c..9a88c97 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -77,6 +77,7 @@ gboolean _have_sysfs_lid_button = FALSE;
 gboolean _have_sysfs_power_button = FALSE;
 gboolean _have_sysfs_sleep_button = FALSE;
 gboolean _have_sysfs_power_supply = FALSE; 
+static gboolean battery_poll_running = FALSE;
 
 #define POWER_SUPPLY_BATTERY_POLL_INTERVAL 30  /* in seconds */
 #define DOCK_STATION_UNDOCK_POLL_INTERVAL 300  /* in milliseconds */
@@ -3381,6 +3382,7 @@ power_supply_battery_poll (gpointer data) {
 	GSList *i;
 	GSList *battery_devices;
 	HalDevice *d;
+	gboolean battery_polled = FALSE;
 
 	/* for now do it only for primary batteries and extend if neede for the other types */
 	battery_devices = hal_device_store_match_multiple_key_value_string (hald_get_gdl (),
@@ -3390,19 +3392,29 @@ power_supply_battery_poll (gpointer data) {
 	if (battery_devices) {
 		for (i = battery_devices; i != NULL; i = g_slist_next (i)) {
 			const char *subsys;
+			gboolean need_poll;
 
 			d = HAL_DEVICE (i->data);
+			/* we don't need to poll battery systems that provide change notifications */
+			need_poll = !hal_device_property_get_bool (d, "battery.change_notifications");
+			HAL_INFO(("need poll? %d", need_poll));
+			if (!need_poll)
+				continue;
+
 			subsys = hal_device_property_get_string (d, "info.subsystem");
 			if (subsys && (strcmp(subsys, "power_supply") == 0)) {
 				hal_util_grep_discard_existing_data();
 				device_property_atomic_update_begin ();
 				refresh_battery_fast(d);
 				device_property_atomic_update_end ();
+				battery_polled = TRUE;
 			}
 		}		
 	}
 	g_slist_free (battery_devices);
-	return TRUE;
+	battery_poll_running = battery_polled;
+	HAL_INFO(("$$$$$ BATTERY POLL HANDLER RETURNING %d", battery_polled));
+	return battery_polled;
 }
 
 static HalDevice *
@@ -3449,16 +3461,18 @@ power_supply_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *
 		hal_device_add_capability (d, "battery");
 
 		/* setup timer for things that we need to poll */
+		if (!battery_poll_running) {
 #ifdef HAVE_GLIB_2_14
-		g_timeout_add_seconds (POWER_SUPPLY_BATTERY_POLL_INTERVAL,
+			g_timeout_add_seconds (POWER_SUPPLY_BATTERY_POLL_INTERVAL,
+                                               power_supply_battery_poll,
+                                               NULL);
+#else
+			g_timeout_add (1000 * POWER_SUPPLY_BATTERY_POLL_INTERVAL,
                                        power_supply_battery_poll,
                                        NULL);
-#else
-		g_timeout_add (1000 * POWER_SUPPLY_BATTERY_POLL_INTERVAL,
-                               power_supply_battery_poll,
-                               NULL);
 #endif
-
+			battery_poll_running = TRUE;
+		}
 	}
 
 	if (is_ac_adapter == TRUE) {
-- 
1.5.5.1



Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/OLPC-3/hal.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- hal.spec	12 Jun 2008 14:37:34 -0000	1.158
+++ hal.spec	2 Sep 2008 16:14:11 -0000	1.159
@@ -26,12 +26,13 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.11
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Patch1: hal-0.5.10-set-property-direct.patch
 Patch2: hal-change-priority.patch
 Patch3: hal-cloexec.patch
+Patch4: hal-battery-poll.patch
 License: AFL or GPLv2
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -128,6 +129,7 @@
 %patch1 -p1 -b .direct
 %patch2 -p1 -b .priority
 %patch3 -p1 -b .selinux-leak
+%patch4 -p1
 
 %build
 autoreconf
@@ -272,6 +274,9 @@
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Tue Sep  2 2008 Daniel Drake <dsd at laptop.org> - 0.5.11-2.1
+- Add patch to disable battery polling
+
 * Thu Jun 12 2008 Richard Hughes <rhughes at redhat.com> - 0.5.11-2
 - Fix unmounting of USB drives when using SELinux due to a leaking file
   descriptor (#447195)



From dsd at fedoraproject.org  Tue Sep  2 16:16:39 2008
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  2 Sep 2008 16:16:39 +0000 (UTC)
Subject: rpms/hal-info/OLPC-3 battery-fdi.patch, NONE, 1.1 hal-info.spec,
	1.25, 1.26
Message-ID: <20080902161639.A1DA97011D@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/hal-info/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22306

Modified Files:
	hal-info.spec 
Added Files:
	battery-fdi.patch 
Log Message:
Add battery FDI file to disable OLPC battery polling

battery-fdi.patch:

--- NEW FILE battery-fdi.patch ---
Index: hal-info-20080607/fdi/information/10freedesktop/10-battery.fdi
===================================================================
--- /dev/null
+++ hal-info-20080607/fdi/information/10freedesktop/10-battery.fdi
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- xml -*- --> 
+
+<deviceinfo version="0.2">
+  <device>
+    <match key="info.category" string="battery">
+
+      <!-- OLPC's power management system provides charge level change notifications -->
+      <match key="info.udi" contains="olpc_battery">
+        <merge key="battery.change_notifications" type="bool">true</merge>
+      </match>
+
+    </match>
+  </device>
+</deviceinfo>
Index: hal-info-20080607/fdi/information/10freedesktop/Makefile.in
===================================================================
--- hal-info-20080607.orig/fdi/information/10freedesktop/Makefile.in
+++ hal-info-20080607/fdi/information/10freedesktop/Makefile.in
@@ -86,6 +86,7 @@ am__dist_fdi_DATA_DIST = 10-usb-card-rea
 	10-usb-music-players.fdi 10-usb-zip-drives.fdi \
 	10-camera-ptp.fdi 10-usb-pda.fdi 10-usbcsr-mice.fdi \
 	10-laptop-panel-hardware.fdi 10-cd-dvd-burner.fdi 10-modem.fdi \
+	10-battery.fdi \
 	10-dell-rfkill-switch-wlan.fdi \
 	10-dell-rfkill-switch-bluetooth.fdi \
 	10-dell-rfkill-switch-wwan.fdi 10-sony-bluetooth-switch.fdi \
@@ -201,7 +202,7 @@ fdidir = $(datadir)/hal/fdi/information/
 dist_fdi_DATA = 10-usb-card-readers.fdi 10-usb-music-players.fdi \
 	10-usb-zip-drives.fdi 10-camera-ptp.fdi 10-usb-pda.fdi \
 	10-usbcsr-mice.fdi 10-laptop-panel-hardware.fdi \
-	10-cd-dvd-burner.fdi 10-modem.fdi $(am__append_1) \
+	10-cd-dvd-burner.fdi 10-modem.fdi 10-battery.fdi $(am__append_1) \
 	$(am__append_2) $(am__append_3) $(am__append_4) \
 	$(am__append_5) $(am__append_6) $(am__append_7) \
 	$(am__append_8) $(am__append_9)


Index: hal-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/OLPC-3/hal-info.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- hal-info.spec	7 Jun 2008 22:03:27 -0000	1.25
+++ hal-info.spec	2 Sep 2008 16:16:09 -0000	1.26
@@ -1,11 +1,12 @@
 Summary: Device information files for HAL
 Name: hal-info
 Version: 20080607
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 License: AFL or GPLv2
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
+Patch0: battery-fdi.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 Requires: hal >= 0.5.10
@@ -17,6 +18,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -35,6 +37,9 @@
 %{_datadir}/hal/fdi/preprobe/10osvendor/*.fdi
 
 %changelog
+* Tue Sep 02 2008 Daniel Drake <dsd at laptop.org> - 20080607-1.1
+- Add battery FDI file to disable OLPC battery polling
+
 * Sat Jun 07 2008 Dan Williams <dcbw at redhat.com> - 20080607-1
 - Update to git snapshot
 



From timn at fedoraproject.org  Tue Sep  2 16:19:38 2008
From: timn at fedoraproject.org (Tim Niemueller)
Date: Tue,  2 Sep 2008 16:19:38 +0000 (UTC)
Subject: rpms/player/F-9 player-2.1.1-norpath.patch, NONE, 1.1 player.spec,
	1.1, 1.2 player-2.1.0rc2-norpath.patch, 1.1, NONE
Message-ID: <20080902161938.CEDD27011D@cvs1.fedora.phx.redhat.com>

Author: timn

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

Modified Files:
	player.spec 
Added Files:
	player-2.1.1-norpath.patch 
Removed Files:
	player-2.1.0rc2-norpath.patch 
Log Message:
Port fixes from F-8

player-2.1.1-norpath.patch:

--- NEW FILE player-2.1.1-norpath.patch ---
diff -urN player-2.1.1/aclocal.m4 player-2.1.1.norpath_am/aclocal.m4
--- player-2.1.1/aclocal.m4	2008-06-16 01:39:27.000000000 +0200
+++ player-2.1.1.norpath_am/aclocal.m4	2008-09-01 00:18:39.000000000 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2005, 2006  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,17 +11,14 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf.  If you want to use that,
+you should regenerate the build system entirely.], [63])])
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
+# serial 51 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -109,6 +106,7 @@
 AC_REQUIRE([AC_OBJEXT])dnl
 AC_REQUIRE([AC_EXEEXT])dnl
 dnl
+
 AC_LIBTOOL_SYS_MAX_CMD_LEN
 AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
 AC_LIBTOOL_OBJDIR
@@ -210,8 +208,6 @@
   ;;
 esac
 
-_LT_REQUIRED_DARWIN_CHECKS
-
 AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 enable_win32_dll=yes, enable_win32_dll=no)
@@ -291,80 +287,9 @@
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
+$rm conftest*
 ])# _LT_LINKER_BOILERPLATE
 
-# _LT_REQUIRED_DARWIN_CHECKS
-# --------------------------
-# Check for some things on darwin
-AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-   # By default we will add the -single_module flag. You can override
-   # by either setting the environment variable LT_MULTI_MODULE
-   # non-empty at configure time, or by adding -multi_module to the
-   # link flags.
-   echo "int foo(void){return 1;}" > conftest.c
-   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-     -dynamiclib ${wl}-single_module conftest.c
-   if test -f libconftest.dylib; then
-     lt_cv_apple_cc_single_mod=yes
-     rm -rf libconftest.dylib*
-   fi
-   rm conftest.c
-      fi])
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-   [lt_cv_ld_exported_symbols_list=yes],
-   [lt_cv_ld_exported_symbols_list=no])
-   LDFLAGS="$save_LDFLAGS"
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[0123]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*)
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-   10.[[012]]*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-   10.*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil="~$DSYMUTIL \$lib || :"
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
 
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
@@ -645,6 +570,7 @@
       esac
       ;;
     *64-bit*)
+      libsuff=64
       case $host in
         x86_64-*kfreebsd*-gnu)
           LD="${LD-ld} -m elf_x86_64_fbsd"
@@ -689,11 +615,7 @@
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
+      *)    LD="${LD-ld} -64" ;;
       esac
       ;;
     esac
@@ -786,7 +708,7 @@
        $2=yes
      fi
    fi
-   $rm -r conftest*
+   $rm conftest*
    LDFLAGS="$save_LDFLAGS"
 ])
 
@@ -1057,7 +979,7 @@
     AC_CHECK_FUNC([shl_load],
 	  [lt_cv_dlopen="shl_load"],
       [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
 	[AC_CHECK_FUNC([dlopen],
 	      [lt_cv_dlopen="dlopen"],
 	  [AC_CHECK_LIB([dl], [dlopen],
@@ -1065,7 +987,7 @@
 	    [AC_CHECK_LIB([svld], [dlopen],
 		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
 	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
 	      ])
 	    ])
 	  ])
@@ -1382,7 +1304,7 @@
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix[[4-9]]*)
+aix4* | aix5*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1707,11 +1629,13 @@
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 
[...13547 lines suppressed...]
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -77,7 +77,7 @@
 am_pmaptest_OBJECTS = pmap_test.$(OBJEXT)
 pmaptest_OBJECTS = $(am_pmaptest_OBJECTS)
 pmaptest_DEPENDENCIES =
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc at am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -170,7 +170,6 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
 DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
 DUMMY_LIB = @DUMMY_LIB@
 ECHO = @ECHO@
@@ -299,7 +298,6 @@
 ND_LIB = @ND_LIB@
 NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
 NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
 NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
 NOMAD_LIB = @NOMAD_LIB@
 OBJDUMP = @OBJDUMP@
@@ -539,8 +537,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -548,8 +546,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -575,8 +573,8 @@
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -666,8 +664,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -679,8 +677,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -690,12 +688,13 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -urN player-2.1.1/utils/xmms-plugin/Makefile.in player-2.1.1.norpath_am/utils/xmms-plugin/Makefile.in
--- player-2.1.1/utils/xmms-plugin/Makefile.in	2008-06-16 01:40:22.000000000 +0200
+++ player-2.1.1.norpath_am/utils/xmms-plugin/Makefile.in	2008-09-01 00:19:06.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -64,7 +64,7 @@
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libplayerxmms_la_CFLAGS) \
 	$(CFLAGS) $(libplayerxmms_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_XMMS_TRUE at am_libplayerxmms_la_rpath = -rpath $(libdir)
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc at am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -146,7 +146,6 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
 DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
 DUMMY_LIB = @DUMMY_LIB@
 ECHO = @ECHO@
@@ -275,7 +274,6 @@
 ND_LIB = @ND_LIB@
 NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
 NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
 NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
 NOMAD_LIB = @NOMAD_LIB@
 OBJDUMP = @OBJDUMP@
@@ -504,8 +502,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -513,8 +511,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -575,8 +573,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -588,8 +586,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -599,12 +597,13 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique


Index: player.spec
===================================================================
RCS file: /cvs/pkgs/rpms/player/F-9/player.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- player.spec	13 Aug 2008 09:05:44 -0000	1.1
+++ player.spec	2 Sep 2008 16:19:08 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           player
 Version:        2.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Cross-platform robot device interface and server
 
 Group:          Applications/System
@@ -13,11 +13,12 @@
 Source2:        playercam.desktop 
 Source3:        playerv.desktop 
 Patch0:         %{name}-2.1.1-gcc43.patch
-Patch1:         %{name}-2.1.0rc2-norpath.patch
+Patch1:         %{name}-2.1.1-norpath.patch
 Patch2:         %{name}-2.1.0rc2-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libtool-ltdl-devel
+BuildRequires:  autoconf, automake
+BuildRequires:  libtool, libtool-ltdl-devel
 %if 0%{?fedora} <= 9
 BuildRequires:  geos-devel
 %endif
@@ -37,7 +38,7 @@
 BuildRequires:  avahi-compat-howl-devel
 BuildRequires:  zlib-devel
 BuildRequires:  doxygen, graphviz
-BuildRequires: desktop-file-utils
+BuildRequires:  desktop-file-utils
 
 %description
 Player is a network server for robot control. Running on your robot, Player
@@ -102,6 +103,9 @@
 
 
 %build
+# Required because patches modify .am files
+aclocal
+autoreconf
 # Broken: --enable-alsa --enable-sonartoranger --enable-lasertoranger
 find ./ -name '*.c' -exec chmod a-x {} \;
 find ./ -name '*.cc' -exec chmod a-x {} \;
@@ -184,6 +188,11 @@
 %{_libdir}/*.a
 
 %changelog
+* Fri Aug 15 2008 Tim Niemueller <tim at niemueller.de> - 2.1.1-4
+- Changed norpath patch, fixes build problem on Fedora 8
+- Added libtool BR
+- Added autotools BR, needed because for patches of .am files
+
 * Mon Aug 08 2008 Jef Spaleta <jspaleta at fedoraproject dot org> - 2.1.1-3
 - Review clean-ups
 


--- player-2.1.0rc2-norpath.patch DELETED ---



From thl at fedoraproject.org  Tue Sep  2 16:19:40 2008
From: thl at fedoraproject.org (Thorsten Leemhuis)
Date: Tue,  2 Sep 2008 16:19:40 +0000 (UTC)
Subject: rpms/gweled/devel gweled.spec,1.21,1.22
Message-ID: <20080902161940.E4F2D7011D@cvs1.fedora.phx.redhat.com>

Author: thl

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

Modified Files:
	gweled.spec 
Log Message:
* Tue Sep 02 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0.7-12
- define _default_patch_fuzz 2



Index: gweled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gweled/devel/gweled.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gweled.spec	17 Feb 2008 17:44:41 -0000	1.21
+++ gweled.spec	2 Sep 2008 16:19:10 -0000	1.22
@@ -1,6 +1,8 @@
+%define _default_patch_fuzz 2
+
 Name:           gweled
 Version:        0.7
-Release:        11.1
+Release:        12.1
 
 Summary:        Swapping gem game
 
@@ -76,6 +78,9 @@
 %{_datadir}/sounds/%{name}/
 
 %changelog
+* Tue Sep 02 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0.7-12
+- define _default_patch_fuzz 2
+
 * Sat Feb 09 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0.7-11
 - rebuilt (again, this time for new mikmod)
 



From konradm at fedoraproject.org  Tue Sep  2 16:31:04 2008
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Tue,  2 Sep 2008 16:31:04 +0000 (UTC)
Subject: rpms/joni/devel joni-include-objectweb-asm.patch, NONE,
	1.1 joni.spec, 1.7, 1.8
Message-ID: <20080902163104.79EC470120@cvs1.fedora.phx.redhat.com>

Author: konradm

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

Modified Files:
	joni.spec 
Added Files:
	joni-include-objectweb-asm.patch 
Log Message:
Add objectweb-asm dependency/patch.

joni-include-objectweb-asm.patch:

--- NEW FILE joni-include-objectweb-asm.patch ---
--- build.xml.orig	2008-09-02 09:16:39.000000000 -0700
+++ build.xml	2008-09-02 09:26:49.000000000 -0700
@@ -5,20 +5,25 @@
     <property name="ant.build.javac.source" value="1.5" />
     <property name="src.dir" value="src" />
     <property name="bin.dir" value="target/classes" />
     <property name="dist.dir" value="target" />
     <property name="jar.name" value="joni.jar" />
+    <path id="lib.dir">
+	<pathelement location="build_lib/objectweb-asm_asm.jar" />
+    </path>
 
     <target name="clean">
         <delete dir="${bin.dir}" />
         <delete dir="${dist.dir}" />
 
     </target>
 
     <target name="compile">
         <mkdir dir="${bin.dir}" />
-        <javac srcdir="${src.dir}" destdir="${bin.dir}"/>
+	<javac srcdir="${src.dir}" destdir="${bin.dir}">
+	    <classpath refid="lib.dir" />
+        </javac>
     </target>
     
     <target name="build" depends="compile">
         <mkdir dir="${dist.dir}" />
 


Index: joni.spec
===================================================================
RCS file: /cvs/pkgs/rpms/joni/devel/joni.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- joni.spec	1 Sep 2008 05:26:03 -0000	1.7
+++ joni.spec	2 Sep 2008 16:30:34 -0000	1.8
@@ -11,12 +11,17 @@
 #   tar -cjf joni-1.0.3.tar.bz2 joni-1.0.3
 Source0:          %{name}-%{version}.tar.bz2
 Patch0:           joni-set-java-5_0-target-and-source.patch
+Patch1:           joni-include-objectweb-asm.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    java-devel >= 1.5
 BuildRequires:    ant
+BuildRequires:    objectweb-asm
+BuildRequires:    junit
 BuildRequires:    jpackage-utils
 Requires:         java >= 1.5
+Requires:         objectweb-asm
+Requires:         junit
 Requires:         jpackage-utils
 
 #%if 0%{?fedora} > 9
@@ -36,6 +41,9 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
+mkdir build_lib
+build-jar-repository -s -p build_lib objectweb-asm/asm
 
 
 %build



From kkofler at fedoraproject.org  Tue Sep  2 17:03:14 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue,  2 Sep 2008 17:03:14 +0000 (UTC)
Subject: rpms/kdelibs3/devel kdelibs3.spec,1.40,1.41
Message-ID: <20080902170314.BF17B7011D@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	kdelibs3.spec 
Log Message:
Completely remove no longer needed kde#137675 patch.


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kdelibs3.spec	26 Aug 2008 18:47:44 -0000	1.40
+++ kdelibs3.spec	2 Sep 2008 17:02:44 -0000	1.41
@@ -93,8 +93,6 @@
 Patch100: kdelibs-3.5.5-kstandarddirs.patch
 # http://bugs.kde.org/93359, alternative to export libltdl_cv_shlibext=".so" hack.
 Patch101: kde-3.5-libtool-shlibext.patch
-# automake-1.10, $(all_libraries) is missing from a few LDFLAGS (kde #137675)
-Patch102: kdelibs-3.5.6-137675.patch
 # kget ignores simultaneous download limit (kde #101956)
 Patch103: kdelibs-3.5.0-101956.patch
 
@@ -273,7 +271,6 @@
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
-#patch102 -p0 -b .kde#137675
 
 # upstream patches
 



From kkofler at fedoraproject.org  Tue Sep  2 17:09:54 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue,  2 Sep 2008 17:09:54 +0000 (UTC)
Subject: rpms/kdelibs3/F-9 kdelibs-3.5.9-fix-flock-redefinition.patch, NONE, 
	1.1 kdelibs3.spec, 1.31, 1.32 kdelibs-3.5.6-137675.patch, 1.1, NONE
Message-ID: <20080902170954.673BC7011D@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.9-fix-flock-redefinition.patch 
Removed Files:
	kdelibs-3.5.6-137675.patch 
Log Message:
Sync from devel:

* Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-1
- kde-3.5.10

* Fri Aug 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-18
- fix build against Rawhide kernel headers (fix flock and flock64 redefinition)

kdelibs-3.5.9-fix-flock-redefinition.patch:

--- NEW FILE kdelibs-3.5.9-fix-flock-redefinition.patch ---
diff -ur kdelibs-3.5.9/kio/kio/kdirwatch.cpp kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp
--- kdelibs-3.5.9/kio/kio/kdirwatch.cpp	2006-07-22 10:16:37.000000000 +0200
+++ kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp	2008-08-23 00:59:17.000000000 +0200
@@ -71,7 +71,11 @@
 #include <linux/types.h>
 // Linux kernel headers are documented to not compile
 #define _S390_BITOPS_H
+#define flock linux_flock
+#define flock64 linux_flock64
 #include <linux/inotify.h>
+#undef flock
+#undef flock64
 
 static inline int inotify_init (void)
 {


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/F-9/kdelibs3.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kdelibs3.spec	22 Aug 2008 22:01:30 -0000	1.31
+++ kdelibs3.spec	2 Sep 2008 17:09:24 -0000	1.32
@@ -1,15 +1,22 @@
 # kdelibs3 review: http://bugzilla.redhat.com/248899
 
+%define _default_patch_fuzz 2
+
 %define distname "Fedora"
 
 %define kde_settings 1 
 
 %define arts 1
-%define arts_epoch 8
-%define arts_version 1.5.9
+%define arts_ev 8:1.5.9
 
-%define qt3_epoch 1
+%if 0%{?fedora} > 8
+%define qt3 qt3
+%else
+%define qt3_epoch 1:
+%define qt3 qt
+%endif
 %define qt3_version 3.3.8b
+%define qt3_ev %{?qt3_epoch}%{qt3_version} 
 # unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8
 #global qt3_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt3_version})
 %define qt3_ver %{qt3_version}
@@ -28,8 +35,8 @@
 %define include_crystalsvg 1
 
 Summary: K Desktop Environment 3 - Libraries
-Version: 3.5.9
-Release: 17%{?dist}
+Version: 3.5.10
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -79,21 +86,20 @@
 Patch52: kdelibs-3.5.9-KDE3.patch
 # use /usr/libexec/kde4/drkonqi in KCrash (#453243)
 Patch53: kdelibs-3.5.9-drkonqi-kde4.patch
+# fix build against Rawhide kernel headers (fix flock and flock64 redefinition)
+Patch54: kdelibs-3.5.9-fix-flock-redefinition.patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch100: kdelibs-3.5.5-kstandarddirs.patch
 # http://bugs.kde.org/93359, alternative to export libltdl_cv_shlibext=".so" hack.
 Patch101: kde-3.5-libtool-shlibext.patch
-# automake-1.10, $(all_libraries) is missing from a few LDFLAGS (kde #137675)
-Patch102: kdelibs-3.5.6-137675.patch
 # kget ignores simultaneous download limit (kde #101956)
 Patch103: kdelibs-3.5.0-101956.patch
 
 ## upstream patches
-Patch200: kdelibs-3.5.9-kate-regression.patch
 
-#{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
-#Requires: qt3 >= %{qt3_epoch}:%{qt3_ver}
+#{?arts:Requires: arts >= %{arts_ev}}
+#Requires: %{qt3} >= %{qt3_ev}
 Requires: hicolor-icon-theme
 %if %{kde_settings}
 Requires: kde-settings >= 3.5
@@ -128,8 +134,8 @@
 BuildRequires: gettext
 BuildRequires: pcre-devel
 BuildRequires: cups-devel cups
-BuildRequires: qt3-devel qt3-devel-docs
-%{?arts:BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version}}
+BuildRequires: %{qt3}-devel %{qt3}-devel-docs
+%{?arts:BuildRequires: arts-devel >= %{arts_ev}}
 BuildRequires: flex >= 2.5.4a-13
 BuildRequires: doxygen
 BuildRequires: libxslt-devel
@@ -207,7 +213,7 @@
 Provides:  kdelibs-devel = 6:%{version}-%{release}
 %endif
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: qt3-devel
+Requires: %{qt3}-devel
 Requires: openssl-devel
 %{?arts:Requires: arts-devel}
 %{?libkdnssd:Requires: libkdnssd-devel}
@@ -261,13 +267,12 @@
 %if "%{name}" != "kdelibs"
 %patch53 -p1 -b .drkonqi-kde4
 %endif
+%patch54 -p1 -b .flock-redefinition
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
-%patch102 -p0 -b .kde#137675
 
 # upstream patches
-%patch200 -p1 -b .kate-regression
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -620,6 +625,12 @@
 
 
 %changelog
+* Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-1
+- kde-3.5.10
+
+* Fri Aug 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-18
+- fix build against Rawhide kernel headers (fix flock and flock64 redefinition)
+
 * Fri Aug 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-17
 - fix logic error in OnlyShowIn=KDE3 patch
 


--- kdelibs-3.5.6-137675.patch DELETED ---



From wtogami at fedoraproject.org  Tue Sep  2 17:13:19 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue,  2 Sep 2008 17:13:19 +0000 (UTC)
Subject: fedora-release RPM-GPG-KEY-fedora-8-and-9-primary, NONE,
	1.1 RPM-GPG-KEY-fedora-test-8-and-9-primary, NONE, 1.1
Message-ID: <20080902171319.AF0D77011D@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/fedora/fedora-release
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30379

Added Files:
	RPM-GPG-KEY-fedora-8-and-9-primary 
	RPM-GPG-KEY-fedora-test-8-and-9-primary 
Log Message:
New keys for F8 and F9.



--- NEW FILE RPM-GPG-KEY-fedora-8-and-9-primary ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.9 (GNU/Linux)

mQGiBEi11ZYRBACjAKCM0ckAnqEZWP/z96Bb4c6WH252/2JJiC8BWw20hBhJ0CT1
Jzfg6rhpFsB1Hv8/yFbV2bMKzHP5QySMkJ7Jp/mlDMwj0mx5dGoxshSED40E4b1h
ZRkuvyVKKn4IKE9vIhl1nhudwSIjsoYD3wH2wbE2CHVg/kB4vuBaP5WPSwCgndSE
sAssoEObir4Ndq/gep6jFjEEAI53sM8u2PQ9inKNXrkuw+GCUMXChk/zhZhmdyDx
cySIgy17X17/jF+TnXsCSXTo87Oz9X4BAk+fzHPKqTLm0/RjjuQd1DwNxsVkPbQJ
QqnIFwfnSZmVcfbZ0u/KLaSUPwi3PjzzBI4L8fsTwspZmpuipRM/pCh1tbOo3Lbq
WqSyA/9wlKJ11Ycvr/yZYlbqipKC4hFJnu4y/DD2xwBMNT5vkQeQNRlLh8smqmMf
FNoCUPwGSiuYG2wP1OLX6EG6uCVStjcvWvONtCKgG4TdsfPv4tMPO1dtnK97CVjz
10HJ5qC5WxLNqQY5U5jRnOyzq4yE3cakXk5shLsT/ch5lffPErQrRmVkb3JhICg4
IGFuZCA5KSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPohgBBMRAgAgBQJItdWW
AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQYq7D3G3yGW8mgACfaXJGS96k
+ggwwo0A4GC7iH6T1awAn12SDBWY8X1wq45trdHGRLig68C0uQQNBEi11ZYQEADB
hyS3+Fgz+qLPlYe8Ic47435mwDzUeCFnNO+yA3c1OD1PE5OVi4Fco/pHUfMkMSFo
p0FM6iCkudzGQKWgmlJ8TTsMK20VAXTcUBzksOx9WJBSIHVGnAVSuMb+S5Rclma1
tiEbpNRkEFcUKRz85XDD5s072F1tY31yOObptzFbRi5m8fZvJXlFNkmkp/si70SN
ZcyMFwXEiPDPmnauAkZfD+rJ7c19C/MlQ0HI3IATxp3DfCCnN7FcTRPvieFUYoq/
z/cjOQioliAhZE0zMJtiY+YEuxL65d/zj536kMmO6v9d31n1GPGD5XS3HGK2jHbw
MCDKzGVJTFpT7K3jb2ZJ7H7MRJ+bbEgPBMZiFiUml+wbTsEempLrK2fkFxqIfrpl
DuGxgBVqyydfC/nnaiBR6pjeKV2veNbAL6f+G3SaQ0LykreiZB/CDfLFJQBE7M6T
5wGIF1WPCmsekkQyPUUbWpxtdmECepOAOETgGpzoySyNf0V4WRTfHLXYRYbplPzD
qPdRSba5kmrhmFBXimHrybvjH8n4Z+s33dbJigjv1L/XDhxL1QZfUBZr+u6LNDKQ
BNdb/1o7op1kcJ1dPqd5nNAMwbvAkTEnvsdPPuBg7rAju3lV5i7ZbMRVHwuhHjBt
BMBcZt5PBr9IianAqxE6eGJyWkSuY7i2Ig/1+pcvBwADBQ/+IOXV47IbdrfgUgv9
MYlnlk4GBUz1lIRoZzyzsRiRsWNqN8BNtnZe1IGgc/5G3sIOLYJ+XNSAOphLkLxb
WXsNDkRt64Z+ZmjOlqW34TxyEyzeJLZC8cL2Zu8U61oPT27LFe929AJD1CdzeEZT
qd2gfxm7JEw2Vxb76f299qhe/ubgd6VaG+WaNBx9yFdUNAB/oK3arGL0LxUR5j87
CAafpqjNQteZmd6yJ5dJAkwlJ1RXJaOMOdE0V/ARsV38cxNce31dazbmf01QGhxW
IZBmAdoqeoykCQ/rIwN7WakwxHf/lz522qa0E4RQ8niKktdHK26goQ3H6nQcbS6i
DgHckODOm3ZO4NTwRPM0UhFw663cQt289xdODJWCdb4P17AV3oqCUJBf82PbHIhD
I5fZTp2Bgn2Gu2WseNqQJQCq+S2uXUxxqMiBWaOk8+8i9aMdBZkTHn8KIfhrdSW3
gbpyIWITDY5KQqJy9AQk3NfTkavMZy09q5mUD5Tiw+X75Taj8IbZJMuO2AsEUvFX
rLBuY7FyLX0gyq6no44Enhsq5H9/1yx1EIAx1pgYyPW+0IIPdGHFW33yKHfbo8wf
2MITxZpd3eaNifBfO3iGOAOJAFYAO7wXeHHX43Syyj5KGlOAdaX7Dp4gU8nGTeFi
2B7oYh0vSvB7F/6Tu/mHilzenzeISQQYEQIACQUCSLXVlgIbDAAKCRBirsPcbfIZ
b+s6AJ9MxzebTDyCoSGb17gmU23fAk72XwCgmdn5nV35GD8LYcojs8O7HXPfLrk=
=Bp6s
-----END PGP PUBLIC KEY BLOCK-----


--- NEW FILE RPM-GPG-KEY-fedora-test-8-and-9-primary ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.9 (GNU/Linux)

mQGiBEi12pURBACCiC3NeEdXbE1AY59iPwsgmcjOBivSe3nhU90AnLjg2qvaizqa
420fbq1bNlQvU83+C7ZP2FJ5pVLYQBKHGIP9VTbZL1yIp5DZdvpd1PDdjJPep2fV
1y8Iozd694ujn1DVG2utnpXhnJxzXmXsoFMu2xGvV+sTKQSS8vJJc9Eq2wCgvvZ+
FTtk2lbaCmgTVZpFIeCEOUED/AwvjJjDy846GI+H5o+J9Rbtcp2mWNqaIF8DRfGA
JfbH9H14Q/4WW75Y+HNoSVWTiZeLJspHR5yUqsU30D+fFi7I9HdKJWWMEAk5sATe
znIGTPvMaBFomRT+Mm/ugkgZPpAwBNbxapCEH8U2qF2c5he9pGvyWwWsMydEaffX
9DrNA/421ns/pPoL7EYOhWsvuC8Te+LVNkfC3beLpYSEcQcu0rsCSuy0+t98zbCY
UKUE+rTWAveaMdFA0o9it/fUVRzNAkX62Zg8aNLAtkAurjqxwqJ6QdMydNqrQBXA
P3GLZoKg+YveEEx8jxZ4tC1Z3VWHzXSzO4ej30Cl1Ae2aN1LMrQzRmVkb3JhICg4
IGFuZCA5IHRlc3RpbmcpIDxmZWRvcmFAZmVkb3JhcHJvamVjdC5vcmc+iGAEExEC
ACAFAki12pUCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRCOaTtN35sK6a0G
AKC33X7/usCOS6uHj2OiBxQwLY7++wCgvG5hzgNys5cfbzp2YAgPoTVzXEm5BA0E
SLXalRAQAJHPSkzNsHStgqXLojWIYlnSCiGtmpEZentHpPrw653cOhCQ4VGk9YhA
eSgTIE9hBav2zNR/lHLRvAIIGvAqCF3QcVJgWR/A6MeWbysZhlRnLGJXGJMDceO8
D8jno6ngh0nzenQiB4S4Vpa/PEzh9tEzZ33ktRHJUTKrtCO5r1haLAGp6csh2pa7
Mfu3jFBKwFwTkwyUE+odadtQBZAIu4ZnSFqpX5JXfHdjn/GbzlpJ8UsSPFAy7wZ1
VSl65g+j6TADUtL2wPB1GxIJSs7kVvM5YwyddXeVOrpJwD3ayNSGzqnL1rqL3ZNn
Ho6NIc2dMouwx3EPvrGt/j3xqCQej2+63r8d9qLdOtvvTcJnlDIYR61+EKBKYugN
CVmcztNa8N44P3mHFX2zWbURYSEiCL8H8K6esPB1a82eOGpP+hnDc+BwoLMniDb9
SIwsRtxhyGmHUnP0h+HyRbC9ykveeoqA0Viyvs0qicd6lIhMtaA8RXmiv/PkEzX8
QqhH+zU1G7M5dH8qN9mJ7zJ4jB0y5WkoHXwIhPjzgKERMmvh1Cepr1CyKxP+HoVz
MexUf7bfV4e874Dnqgsga5OS5l53NQj7lp1A41lehVgPxFP5Z11NsmJY4Vzwk2Yc
Twt0IKLa7jSI/NoWpjU4ooAcg/klVNf2CQEVFUPpG0BTSaflV2yrAAMFD/oCBJuM
GSSzYwFmwVTfLgjCAs8e12wc02I1BslWC+hNmn6O+5Vc9W7bpphZfX5SWuiRRh7E
uEW5m1jJ/79W31g6DX64e4JJ3nIU5At1KdDWwZL8KDTHeHMHci7yZ5BdXT0yfG9g
fjFtNeK6McbDeLJFIB8kFMoEjjU+RuUPZ8fli7EbY5ij2Yi9XuKMbbOK0nBLJmxh
KyXtMxlcYZo4Kr/k7XJY4yPZIYSITNfQaekzkStxbPMevgh5x7rT5XOz7c8/NI3n
s+aifWxlerjP9Ls+OQHyF+fU+9XymN7+PI8UwQjTSC0p7THz52zMYgJ0Rz4oPbwZ
aR9C+w/fnNF4k/wIpDWwv0yrxbG6pGrlMLGT9m2pUdwJWg+3jVMx3PlgAcNPXUyu
64GhIneaqFQj1Mqy3+GCYr5wHSkRJRmxaMcbwGC4890tbfbS6bLKPYAtM7AthRUL
Pkt6de/CdJOK8gQjc27rPCxzEEil28xijpa4XGOp0P5nk8BL4Bp2g2iJnh6xJJrN
OY6UH2ZGRFl1cv8/sDBVMc/KfXaDgMh8fDhYkzRPkLPKdicdDRGUYXtmNf1NurT8
W12YKqlj9C28mv6rLesHAGT1lIfkwvcbg/dE539c6VHg05DdfsD05io4WvMf9iy/
DfIiGqnRvoXvfvrVi5Y4AMAkJKNydxa47b3wG4hIBBgRAgAJBQJItdqVAhsMAAoJ
EI5pO03fmwrp7Q8An1wCbS0WAB+U3TZVA/z+U4yhcv08AJUQGF9I7RlUxkOPAwGE
X3ofpIDE
=yrQo
-----END PGP PUBLIC KEY BLOCK-----



From kkofler at fedoraproject.org  Tue Sep  2 17:17:34 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue,  2 Sep 2008 17:17:34 +0000 (UTC)
Subject: rpms/kdelibs/F-8 kdelibs-3.5.9-fix-flock-redefinition.patch, NONE, 
	1.1 .cvsignore, 1.42, 1.43 kdelibs.spec, 1.252, 1.253 sources,
	1.53, 1.54 kdelibs-3.5.6-137675.patch, 1.1, NONE
Message-ID: <20080902171734.85A9F7011D@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31050/F-8

Modified Files:
	.cvsignore kdelibs.spec sources 
Added Files:
	kdelibs-3.5.9-fix-flock-redefinition.patch 
Removed Files:
	kdelibs-3.5.6-137675.patch 
Log Message:
Sync from kdelibs3/devel:

* Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-1
- kde-3.5.10

* Fri Aug 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-18
- fix build against Rawhide kernel headers (fix flock and flock64 redefinition)

* Fri Aug 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-17
- fix logic error in OnlyShowIn=KDE3 patch

* Wed Jul 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-16
- f9+: use drkonqi from KDE 4 kdebase-runtime in KCrash (#453243)

* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-15
- set include_crystalsvg to 1 everywhere
- use Epoch 1 for crystalsvg-icon-theme, add Obsoletes

* Tue Jun 03 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-14
- revert kdeui symlink hack (there be dragons) 
- unbreak -apidocs, add %%check so this never ever happens again

* Sat May 24 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-13
- f9+: include kdeui symlink here + scriptlets to help rpm handle it

* Fri May 23 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-12
- f9+: omit %%{_datadir}/apps/kdeui, use version from kdelibs-common (rh#447965, kde#157850)

* Thu May 15 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-11
- (Only|Not)ShowIn=KDE3 patch (helps #446466)

* Thu May 15 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-10
- fix kresources.desktop: NoDisplay=true

* Mon Apr 14 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-8
- omit Requires: kdndsd-avahi (#441222)

* Wed Apr 02 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-7
- more qt->qt3 fixes

* Tue Mar 25 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-6
- s/qt-devel/qt3-devel/

kdelibs-3.5.9-fix-flock-redefinition.patch:

--- NEW FILE kdelibs-3.5.9-fix-flock-redefinition.patch ---
diff -ur kdelibs-3.5.9/kio/kio/kdirwatch.cpp kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp
--- kdelibs-3.5.9/kio/kio/kdirwatch.cpp	2006-07-22 10:16:37.000000000 +0200
+++ kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp	2008-08-23 00:59:17.000000000 +0200
@@ -71,7 +71,11 @@
 #include <linux/types.h>
 // Linux kernel headers are documented to not compile
 #define _S390_BITOPS_H
+#define flock linux_flock
+#define flock64 linux_flock64
 #include <linux/inotify.h>
+#undef flock
+#undef flock64
 
 static inline int inotify_init (void)
 {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-8/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	14 Feb 2008 17:05:34 -0000	1.42
+++ .cvsignore	2 Sep 2008 17:17:04 -0000	1.43
@@ -1 +1 @@
-kdelibs-3.5.9.tar.bz2
+kdelibs-3.5.10.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-8/kdelibs.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- kdelibs.spec	10 Mar 2008 18:54:22 -0000	1.252
+++ kdelibs.spec	2 Sep 2008 17:17:04 -0000	1.253
@@ -1,19 +1,27 @@
 # kdelibs3 review: http://bugzilla.redhat.com/248899
 
+%define _default_patch_fuzz 2
+
 %define distname "Fedora"
 
 %define kde_settings 1 
 
 %define arts 1
-%define arts_epoch 8
-%define arts_version 1.5.9
+%define arts_ev 8:1.5.9
 
-%define qt_epoch 1
-%define qt_version 3.3.8b
+%if 0%{?fedora} > 8
+%define qt3 qt3
+%else
+%define qt3_epoch 1:
+%define qt3 qt
+%endif
+%define qt3_version 3.3.8b
+%define qt3_ev %{?qt3_epoch}%{qt3_version} 
 # unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8
-#global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version})
-%define qt_ver %{qt_version}
-%define qtdocdir %{_docdir}/qt-devel-%{qt_ver}
+#global qt3_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt3_version})
+%define qt3_ver %{qt3_version}
+# fix this?... -- Rex
+%define qt3_docdir %{_docdir}/qt-devel-%{qt3_ver}
 
 %define kde_major_version 3
 
@@ -21,20 +29,26 @@
 
 %define apidocs 1
 
+# We always include this here now because kdeartwork 4 has moved on to
+# icon-naming-spec names (partially, so the icon theme isn't usable with KDE 4
+# yet either). Maybe the conditional should be dropped entirely? -- Kevin
+%define include_crystalsvg 1
+
 Summary: K Desktop Environment 3 - Libraries
-Version: 3.5.9
-Release: 5%{?dist}
+Version: 3.5.10
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
 Obsoletes: kdelibs < 6:%{version}-%{release}
 Provides: kdelibs = 6:%{version}-%{release}
+# define to enable kdeui symlink hack -- Rex
+#define kdeui_symlink 1
 %else
 Name: kdelibs
 Epoch: 6
 Obsoletes: kdelibs3 < %{version}-%{release}
 Provides: kdelibs3 = %{version}-%{release}
-%define include_crystalsvg 1
 %endif
 
 License: LGPLv2
@@ -68,21 +82,24 @@
 Patch49: kdelibs-3.5.8-kspell2-enchant.patch
 Patch50: kdelibs-3.5.8-kspell2-no-ispell.patch
 Patch51: kdelibs-3.5.9-cupsserverbin.patch
+# initial support for (Only|Not)ShowIn=KDE3
+Patch52: kdelibs-3.5.9-KDE3.patch
+# use /usr/libexec/kde4/drkonqi in KCrash (#453243)
+Patch53: kdelibs-3.5.9-drkonqi-kde4.patch
+# fix build against Rawhide kernel headers (fix flock and flock64 redefinition)
+Patch54: kdelibs-3.5.9-fix-flock-redefinition.patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch100: kdelibs-3.5.5-kstandarddirs.patch
 # http://bugs.kde.org/93359, alternative to export libltdl_cv_shlibext=".so" hack.
 Patch101: kde-3.5-libtool-shlibext.patch
-# automake-1.10, $(all_libraries) is missing from a few LDFLAGS (kde #137675)
-Patch102: kdelibs-3.5.6-137675.patch
 # kget ignores simultaneous download limit (kde #101956)
 Patch103: kdelibs-3.5.0-101956.patch
 
 ## upstream patches
-Patch200: kdelibs-3.5.9-kate-regression.patch
 
-%{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
-Requires: qt >= %{qt_epoch}:%{qt_ver}
+#{?arts:Requires: arts >= %{arts_ev}}
+#Requires: %{qt3} >= %{qt3_ev}
 Requires: hicolor-icon-theme
 %if %{kde_settings}
 Requires: kde-settings >= 3.5
@@ -98,7 +115,8 @@
 
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
 %define   libkdnssd libkdnssd
-Requires: %{libkdnssd}
+# omit for now, may contribute to http://bugzilla.redhat.com/441222 
+#Requires: %{libkdnssd}
 %define BuildRequires: xorg-x11-proto-devel libX11-devel
 %define _with_rgbfile --with-rgbfile=%{_datadir}/X11/rgb.txt
 Requires: iceauth
@@ -108,11 +126,16 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
+%if 0%{?kdeui_symlink}
+# for %_kde4_* macros
+BuildRequires: kde4-macros(api) 
+%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+%endif
 BuildRequires: gettext
 BuildRequires: pcre-devel
 BuildRequires: cups-devel cups
-BuildRequires: qt-devel qt-devel-docs
-%{?arts:BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version}}
+BuildRequires: %{qt3}-devel %{qt3}-devel-docs
+%{?arts:BuildRequires: arts-devel >= %{arts_ev}}
 BuildRequires: flex >= 2.5.4a-13
 BuildRequires: doxygen
 BuildRequires: libxslt-devel
@@ -164,9 +187,10 @@
 %endif
 
 %if 0%{?include_crystalsvg}
-Provides: crystalsvg-icon-theme = %{version}-%{release}
+Provides: crystalsvg-icon-theme = 1:%{version}-%{release}
+Obsoletes: crystalsvg-icon-theme < 1:%{version}-%{release}
 %else
-# this Requires could be made unconditional -- Rex
+# for bootstrapping kde3, omit Requires: crystalsvg... -- Rex
 Requires: crystalsvg-icon-theme
 %endif
 
@@ -189,7 +213,7 @@
 Provides:  kdelibs-devel = 6:%{version}-%{release}
 %endif
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: qt-devel
+Requires: %{qt3}-devel
 Requires: openssl-devel
 %{?arts:Requires: arts-devel}
 %{?libkdnssd:Requires: libkdnssd-devel}
@@ -239,13 +263,16 @@
 %patch50 -p1 -b .no-ispell
 %endif
 %patch51 -p1 -b .cupsserverbin
+%patch52 -p1 -b .KDE3
+%if "%{name}" != "kdelibs"
+%patch53 -p1 -b .drkonqi-kde4
+%endif
+%patch54 -p1 -b .flock-redefinition
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
-%patch102 -p0 -b .kde#137675
 
 # upstream patches
-%patch200 -p1 -b .kate-regression
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -257,7 +284,7 @@
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
 
-export QTDOC=%{qtdocdir}
+export QTDOC=%{qt3_docdir}
 
 if [ -x /etc/profile.d/krb5.sh ]; then
   . /etc/profile.d/krb5.sh
@@ -300,7 +327,7 @@
 
 make %{?_smp_mflags}
 
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
   make %{?_smp_mflags} apidox
 %endif
 
@@ -313,7 +340,7 @@
 chmod a+x %{buildroot}%{_libdir}/*
 install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/services/devices.protocol
 
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
 pushd %{buildroot}%{_docdir}
 ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version}
 popd
@@ -422,8 +449,15 @@
 rm -rf %{buildroot}%{_datadir}/locale/all_languages
 rm -rf %{buildroot}%{_sysconfdir}/xdg/menus/
 rm -rf %{buildroot}%{_datadir}/autostart/
-# make kresources hidden
-echo "Hidden=true;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
+# don't show kresources
+sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," %{buildroot}%{_datadir}/applications/kde/kresources.desktop 
+
+%if 0%{?kdeui_symlink}
+# kdeui for kde3, kinda workaround http://bugs.kde.org/157850
+# and save space by sharing
+rm -rf %{buildroot}%{_datadir}/apps/kdeui/
+ln -s  %{_kde4_appsdir}/kdeui %{buildroot}%{_datadir}/apps/kdeui
+%endif
 %endif
 
 %if 0%{?include_crystalsvg} == 0
@@ -432,6 +466,17 @@
 %endif
 
 
+%check
+ERROR=0
+%if 0%{?apidocs}
+if [ ! -f %{buildroot}%{_docdir}/HTML/en/kdelibs-apidocs/index.html ]; then
+  echo "ERROR: %{_docdir}/HTML/en/kdelibs-apidocs/index.html not generated"
+  ERROR=1
+fi 
+%endif
+exit $ERROR
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -443,6 +488,13 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %endif
 %{_bindir}/update-desktop-database > /dev/null 2>&1 || :
+%if 0%{?kdeui_symlink}
+rm -rf %{_datadir}/apps/kdeui.rpm_remove ||:
+
+%pre
+test -d %{_datadir}/apps/kdeui -a ! -L %{_datadir}/apps/kdeui && \
+  mv %{_datadir}/apps/kdeui %{_datadir}/apps/kdeui.rpm_remove ||:
+%endif
 
 %postun
 /sbin/ldconfig
@@ -564,7 +616,7 @@
 %{_libdir}/lib*.a
 %exclude %{_libdir}/libkdeinit_*.so
 
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
 %files apidocs
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-devel-%{kde_major_version}
@@ -573,6 +625,47 @@
 
 
 %changelog
+* Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-1
+- kde-3.5.10
+
+* Fri Aug 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-18
+- fix build against Rawhide kernel headers (fix flock and flock64 redefinition)
+
+* Fri Aug 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-17
+- fix logic error in OnlyShowIn=KDE3 patch
+
+* Wed Jul 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-16
+- f9+: use drkonqi from KDE 4 kdebase-runtime in KCrash (#453243)
+
+* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-15
+- set include_crystalsvg to 1 everywhere
+- use Epoch 1 for crystalsvg-icon-theme, add Obsoletes
+
+* Tue Jun 03 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-14
+- revert kdeui symlink hack (there be dragons) 
+- unbreak -apidocs, add %%check so this never ever happens again
+
+* Sat May 24 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-13
+- f9+: include kdeui symlink here + scriptlets to help rpm handle it
+
+* Fri May 23 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-12
+- f9+: omit %%{_datadir}/apps/kdeui, use version from kdelibs-common (rh#447965, kde#157850)
+
+* Thu May 15 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-11
+- (Only|Not)ShowIn=KDE3 patch (helps #446466)
+
+* Thu May 15 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-10
+- fix kresources.desktop: NoDisplay=true
+
+* Mon Apr 14 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-8
+- omit Requires: kdndsd-avahi (#441222)
+
+* Wed Apr 02 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-7
+- more qt->qt3 fixes
+
+* Tue Mar 25 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-6
+- s/qt-devel/qt3-devel/
+
 * Mon Mar 10 2008 Than Ngo <than at redhat.com> 3.5.9-5
 - apply upstream patch to fix regression in kate (bz#436384)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-8/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	14 Feb 2008 17:05:34 -0000	1.53
+++ sources	2 Sep 2008 17:17:04 -0000	1.54
@@ -1 +1 @@
-55e5f00874933d1a7ba7c95e369a205e  kdelibs-3.5.9.tar.bz2
+43cd55ed15f63b5738d620ef9f9fd568  kdelibs-3.5.10.tar.bz2


--- kdelibs-3.5.6-137675.patch DELETED ---



From kkofler at fedoraproject.org  Tue Sep  2 17:19:05 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue,  2 Sep 2008 17:19:05 +0000 (UTC)
Subject: rpms/kdelibs3/F-9 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <20080902171905.22D137011D@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	.cvsignore sources 
Log Message:
Sync from devel:

* Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-1
- kde-3.5.10

* Fri Aug 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-18
- fix build against Rawhide kernel headers (fix flock and flock64 redefinition)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Feb 2008 14:57:22 -0000	1.4
+++ .cvsignore	2 Sep 2008 17:18:34 -0000	1.5
@@ -1 +1 @@
-kdelibs-3.5.9.tar.bz2
+kdelibs-3.5.10.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Feb 2008 14:57:22 -0000	1.4
+++ sources	2 Sep 2008 17:18:34 -0000	1.5
@@ -1 +1 @@
-55e5f00874933d1a7ba7c95e369a205e  kdelibs-3.5.9.tar.bz2
+43cd55ed15f63b5738d620ef9f9fd568  kdelibs-3.5.10.tar.bz2



From otaylor at fedoraproject.org  Tue Sep  2 17:21:44 2008
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Tue,  2 Sep 2008 17:21:44 +0000 (UTC)
Subject: rpms/online-desktop/devel .cvsignore, 1.19, 1.20 online-desktop.spec,
	1.28, 1.29 sources, 1.20, 1.21
Message-ID: <20080902172144.B5B2E7011D@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/online-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31784

Modified Files:
	.cvsignore online-desktop.spec sources 
Log Message:
Update to 0.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/online-desktop/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	24 Apr 2008 20:59:24 -0000	1.19
+++ .cvsignore	2 Sep 2008 17:21:14 -0000	1.20
@@ -1 +1,2 @@
 online-desktop-0.2.28.tar.gz
+online-desktop-0.3.0.tar.gz


Index: online-desktop.spec
===================================================================
RCS file: /cvs/extras/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- online-desktop.spec	11 Aug 2008 21:00:51 -0000	1.28
+++ online-desktop.spec	2 Sep 2008 17:21:14 -0000	1.29
@@ -2,16 +2,15 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.29
-Release:        5%{?dist}
+Version:        0.3.0
+Release:        1%{?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/
-#X-VCS:         svn:http://svn.mugshot.org/online-desktop/trunk
-Source0:        http://download.mugshot.org/online-desktop/sources/online-desktop-%{version}.tar.gz
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/online-desktop/0.3/online-desktop-%{version}.tar.gz
 Source1:        Getting_Started.html
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires:	dbus-python
@@ -116,6 +115,8 @@
 %exclude %{_datadir}/icons/hicolor/*/apps/yahoo-mail.png
 %dir %{python_sitearch}/pyonlinedesktop
 %{python_sitearch}/pyonlinedesktop/*
+%dir %{python_sitearch}/weblogindriver
+%{python_sitearch}/weblogindriver/*
 %dir %{python_sitearch}/ddm
 %{python_sitearch}/ddm/*
 %{python_sitearch}/*.so
@@ -200,6 +201,9 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Tue Sep  2 2008 Owen Taylor <otaylor at redhat.com> - 0.3.0-1
+- Update to 0.3.0
+
 * Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.29-5
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/online-desktop/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	20 Jun 2008 15:34:02 -0000	1.20
+++ sources	2 Sep 2008 17:21:14 -0000	1.21
@@ -1 +1 @@
-ac26e90272d6cc5ec0fa1ca87da5f0d6  online-desktop-0.2.29.tar.gz
+e8ad7cf6afe60099e75a75fc1603c812  online-desktop-0.3.0.tar.gz



From kkofler at fedoraproject.org  Tue Sep  2 17:22:37 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue,  2 Sep 2008 17:22:37 +0000 (UTC)
Subject: rpms/kdelibs3/F-9 kdelibs-3.5.9-kate-regression.patch,1.2,NONE
Message-ID: <20080902172237.875C87011D@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Removed Files:
	kdelibs-3.5.9-kate-regression.patch 
Log Message:
Sync from devel:

* Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-1
- kde-3.5.10

* Fri Aug 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-18
- fix build against Rawhide kernel headers (fix flock and flock64 redefinition)


--- kdelibs-3.5.9-kate-regression.patch DELETED ---



From otaylor at fedoraproject.org  Tue Sep  2 17:23:54 2008
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Tue,  2 Sep 2008 17:23:54 +0000 (UTC)
Subject: rpms/bigboard/devel .cvsignore, 1.40, 1.41 bigboard.spec, 1.60,
	1.61 sources, 1.41, 1.42
Message-ID: <20080902172354.E34A97011D@cvs1.fedora.phx.redhat.com>

Author: otaylor

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

Modified Files:
	.cvsignore bigboard.spec sources 
Log Message:
Update to 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bigboard/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	20 Jun 2008 15:55:44 -0000	1.40
+++ .cvsignore	2 Sep 2008 17:23:24 -0000	1.41
@@ -1,2 +1,3 @@
 bigboard-0.5.31.tar.gz
 bigboard-0.5.34.tar.bz2
+bigboard-0.6.0.tar.gz


Index: bigboard.spec
===================================================================
RCS file: /cvs/extras/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- bigboard.spec	14 Jul 2008 20:29:13 -0000	1.60
+++ bigboard.spec	2 Sep 2008 17:23:24 -0000	1.61
@@ -2,18 +2,16 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.38
-Release:        3%{?dist}
+Version:        0.6.0
+Release:        1%{?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.5/bigboard-%{version}.tar.bz2
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/bigboard/0.6/bigboard-%{version}.tar.gz
 # This patch is Fedora-specific
 Patch0:         bigboard-default-fedora-theme.patch
-# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=444870
-Patch1:         bigboard-0.5.34-noshutdown.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       mugshot >= 1.1.90-1
@@ -25,7 +23,7 @@
 Requires:       gnome-python2-gconf
 Requires:	gnome-python2-applet
 Requires:       dbus-python
-Requires:       online-desktop
+Requires:       online-desktop >= 0.3.0
 Requires:	python-BeautifulSoup
 Requires:       python-gdata
 
@@ -48,7 +46,6 @@
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p1
 
 %build
 %configure --disable-static --disable-pymod-checks --disable-schemas-install
@@ -73,6 +70,15 @@
 %{python_sitearch}/bigboard/*.py
 %{python_sitearch}/bigboard/*.pyc
 %{python_sitearch}/bigboard/*.pyo
+%dir %{python_sitearch}/bigboard/core
+%{python_sitearch}/bigboard/core/*.py
+%{python_sitearch}/bigboard/core/*.pyc
+%{python_sitearch}/bigboard/core/*.pyo
+%dir %{python_sitearch}/bigboard/empathy
+%{python_sitearch}/bigboard/empathy/*.py
+%{python_sitearch}/bigboard/empathy/*.pyc
+%{python_sitearch}/bigboard/empathy/*.pyo
+%{python_sitearch}/bigboard/empathy/*.so
 %dir %{python_sitearch}/bigboard/libbig
 %{python_sitearch}/bigboard/libbig/*.py
 %{python_sitearch}/bigboard/libbig/*.pyc
@@ -117,6 +123,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Tue Sep  2 2008 Owen Taylor <otaylor at redhat.com> - 0.6.0-1
+- Update to 0.6.0
+
 * Mon Jul 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.38-3
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bigboard/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	20 Jun 2008 15:55:44 -0000	1.41
+++ sources	2 Sep 2008 17:23:24 -0000	1.42
@@ -1 +1 @@
-a12ed37d5f83b99decfafcd981d6e146  bigboard-0.5.38.tar.bz2
+c1355cba1247d6f65522342a96821bbd  bigboard-0.6.0.tar.gz



From kkofler at fedoraproject.org  Tue Sep  2 17:24:54 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue,  2 Sep 2008 17:24:54 +0000 (UTC)
Subject: rpms/kdelibs/F-8 kdelibs-3.5.9-KDE3.patch, NONE,
	1.1 kdelibs-3.5.9-drkonqi-kde4.patch, NONE,
	1.1 kdelibs-3.5.9-kate-regression.patch, 1.2, NONE
Message-ID: <20080902172454.4D7FB7011D@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32523/F-8

Added Files:
	kdelibs-3.5.9-KDE3.patch kdelibs-3.5.9-drkonqi-kde4.patch 
Removed Files:
	kdelibs-3.5.9-kate-regression.patch 
Log Message:
Sync from kdelibs3/devel:

* Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-1
- kde-3.5.10

* Fri Aug 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-18
- fix build against Rawhide kernel headers (fix flock and flock64 redefinition)

* Fri Aug 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-17
- fix logic error in OnlyShowIn=KDE3 patch

* Wed Jul 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-16
- f9+: use drkonqi from KDE 4 kdebase-runtime in KCrash (#453243)

* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-15
- set include_crystalsvg to 1 everywhere
- use Epoch 1 for crystalsvg-icon-theme, add Obsoletes

* Tue Jun 03 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-14
- revert kdeui symlink hack (there be dragons) 
- unbreak -apidocs, add %%check so this never ever happens again

* Sat May 24 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-13
- f9+: include kdeui symlink here + scriptlets to help rpm handle it

* Fri May 23 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-12
- f9+: omit %%{_datadir}/apps/kdeui, use version from kdelibs-common (rh#447965, kde#157850)

* Thu May 15 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-11
- (Only|Not)ShowIn=KDE3 patch (helps #446466)

* Thu May 15 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-10
- fix kresources.desktop: NoDisplay=true

* Mon Apr 14 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-8
- omit Requires: kdndsd-avahi (#441222)

* Wed Apr 02 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-7
- more qt->qt3 fixes

* Tue Mar 25 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-6
- s/qt-devel/qt3-devel/

kdelibs-3.5.9-KDE3.patch:

--- NEW FILE kdelibs-3.5.9-KDE3.patch ---
diff -up kdelibs-3.5.9/kio/kio/kservice.cpp.KDE3 kdelibs-3.5.9/kio/kio/kservice.cpp
--- kdelibs-3.5.9/kio/kio/kservice.cpp.KDE3	2008-02-13 03:41:06.000000000 -0600
+++ kdelibs-3.5.9/kio/kio/kservice.cpp	2008-05-15 15:36:13.000000000 -0500
@@ -701,7 +701,7 @@ bool KService::noDisplay() const {
   {
      QString aValue = it.data().toString();
      QStringList aList = QStringList::split(';', aValue);
-     if (!aList.contains("KDE"))
+     if (!(aList.contains("KDE") || aList.contains("KDE3")) )
         return true;
   }
 
@@ -710,7 +710,7 @@ bool KService::noDisplay() const {
   {
      QString aValue = it.data().toString();
      QStringList aList = QStringList::split(';', aValue);
-     if (aList.contains("KDE"))
+     if (aList.contains("KDE") || aList.contains("KDE3"))
         return true;
   }
   
diff -up kdelibs-3.5.9/kio/kio/kservicegroup.cpp.KDE3 kdelibs-3.5.9/kio/kio/kservicegroup.cpp
--- kdelibs-3.5.9/kio/kio/kservicegroup.cpp.KDE3	2007-05-14 02:52:35.000000000 -0500
+++ kdelibs-3.5.9/kio/kio/kservicegroup.cpp	2008-05-15 15:39:34.000000000 -0500
@@ -76,12 +76,14 @@ KServiceGroup::KServiceGroup( const QStr
   QStringList tmpList;
   if (config.hasKey("OnlyShowIn"))
   {
-     if (!config.readListEntry("OnlyShowIn", ';').contains("KDE"))
+     QStringList onlyShowInList = config.readListEntry("OnlyShowIn", ';');
+     if (! (onlyShowInList.contains("KDE") || onlyShowInList.contains("KDE3")))
         d->m_bNoDisplay = true;
   }
   if (config.hasKey("NotShowIn"))
   {
-     if (config.readListEntry("NotShowIn", ';').contains("KDE"))
+     QStringList notShowInList = config.readListEntry("NotShowIn", ';');
+     if (notShowInList.contains("KDE") || notShowInList.contains("KDE3"))
         d->m_bNoDisplay = true;
   }
 

kdelibs-3.5.9-drkonqi-kde4.patch:

--- NEW FILE kdelibs-3.5.9-drkonqi-kde4.patch ---
diff -ur kdelibs-3.5.9/kdecore/kcrash.cpp kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp
--- kdelibs-3.5.9/kdecore/kcrash.cpp	2007-01-15 12:34:17.000000000 +0100
+++ kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp	2008-07-02 08:24:37.000000000 +0200
@@ -158,7 +158,7 @@
           int i = 0;
 
           // argument 0 has to be drkonqi
-          argv[i++] = "drkonqi";
+          argv[i++] = "/usr/libexec/kde4/drkonqi";
 
 #if defined Q_WS_X11
           // start up on the correct display
@@ -325,7 +325,7 @@
       _exit(253);
     if(!geteuid() && setuid(getuid()) < 0)
       _exit(253);
-    execvp("drkonqi", const_cast< char** >( argv ));
+    execv("/usr/libexec/kde4/drkonqi", const_cast< char** >( argv ));
     _exit(errno);
   }
   else


--- kdelibs-3.5.9-kate-regression.patch DELETED ---



From kkofler at fedoraproject.org  Tue Sep  2 17:35:36 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue,  2 Sep 2008 17:35:36 +0000 (UTC)
Subject: rpms/arts/F-8 arts.spec,1.85,1.86
Message-ID: <20080902173536.E85957011D@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/arts/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2099/F-8

Modified Files:
	arts.spec 
Log Message:
* Tue Sep 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 8:1.5.10-1.1
- fix qt-devel dependency on F8


Index: arts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arts/F-8/arts.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- arts.spec	30 Aug 2008 14:28:08 -0000	1.85
+++ arts.spec	2 Sep 2008 17:35:06 -0000	1.86
@@ -27,7 +27,7 @@
 Group:   System Environment/Daemons
 Epoch:   8
 Version: 1.5.10
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: LGPLv2+
 Url: http://www.kde.org
@@ -83,7 +83,7 @@
 Group: Development/Libraries
 Summary: Development files for the aRts sound server
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: qt3-devel
+Requires: %{qt3}-devel
 Requires: pkgconfig
 Requires: glib2-devel
 %description devel
@@ -207,6 +207,9 @@
 
 
 %changelog
+* Tue Sep 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 8:1.5.10-1.1
+- fix qt-devel dependency on F8
+
 * Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 8:1.5.10-1
 - arts-1.5.10
 



From kkofler at fedoraproject.org  Tue Sep  2 17:36:35 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue,  2 Sep 2008 17:36:35 +0000 (UTC)
Subject: rpms/arts/F-9 arts.spec,1.87,1.88
Message-ID: <20080902173635.293407011D@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	arts.spec 
Log Message:
Sync up (no new builds needed):

* Tue Sep 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 8:1.5.10-1.1
- fix qt-devel dependency on F8


Index: arts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arts/F-9/arts.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- arts.spec	30 Aug 2008 14:27:08 -0000	1.87
+++ arts.spec	2 Sep 2008 17:36:04 -0000	1.88
@@ -27,7 +27,7 @@
 Group:   System Environment/Daemons
 Epoch:   8
 Version: 1.5.10
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: LGPLv2+
 Url: http://www.kde.org
@@ -83,7 +83,7 @@
 Group: Development/Libraries
 Summary: Development files for the aRts sound server
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: qt3-devel
+Requires: %{qt3}-devel
 Requires: pkgconfig
 Requires: glib2-devel
 %description devel
@@ -207,6 +207,9 @@
 
 
 %changelog
+* Tue Sep 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 8:1.5.10-1.1
+- fix qt-devel dependency on F8
+
 * Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 8:1.5.10-1
 - arts-1.5.10
 



From kkofler at fedoraproject.org  Tue Sep  2 17:36:35 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue,  2 Sep 2008 17:36:35 +0000 (UTC)
Subject: rpms/arts/devel arts.spec,1.88,1.89
Message-ID: <20080902173635.7688F7011D@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	arts.spec 
Log Message:
Sync up (no new builds needed):

* Tue Sep 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 8:1.5.10-1.1
- fix qt-devel dependency on F8


Index: arts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arts/devel/arts.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- arts.spec	26 Aug 2008 18:45:34 -0000	1.88
+++ arts.spec	2 Sep 2008 17:36:05 -0000	1.89
@@ -27,7 +27,7 @@
 Group:   System Environment/Daemons
 Epoch:   8
 Version: 1.5.10
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: LGPLv2+
 Url: http://www.kde.org
@@ -83,7 +83,7 @@
 Group: Development/Libraries
 Summary: Development files for the aRts sound server
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: qt3-devel
+Requires: %{qt3}-devel
 Requires: pkgconfig
 Requires: glib2-devel
 %description devel
@@ -207,6 +207,9 @@
 
 
 %changelog
+* Tue Sep 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 8:1.5.10-1.1
+- fix qt-devel dependency on F8
+
 * Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 8:1.5.10-1
 - arts-1.5.10
 



From ingvar at fedoraproject.org  Tue Sep  2 17:54:34 2008
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Tue,  2 Sep 2008 17:54:34 +0000 (UTC)
Subject: rpms/varnish/devel varnish.coresize.patch, NONE,
	1.1 varnish.lockfile.patch, NONE, 1.1 varnish.vcl_changes.patch,
	NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 varnish.spec,
	1.9, 1.10
Message-ID: <20080902175434.4574C7011D@cvs1.fedora.phx.redhat.com>

Author: ingvar

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

Modified Files:
	.cvsignore sources varnish.spec 
Added Files:
	varnish.coresize.patch varnish.lockfile.patch 
	varnish.vcl_changes.patch 
Log Message:
Started update series till 2.0. First out: beta1.
Also fixed up init scripts.


varnish.coresize.patch:

--- NEW FILE varnish.coresize.patch ---
diff -Naur ../varnish-2.0-beta1.orig/redhat/varnish.sysconfig ./redhat/varnish.sysconfig
--- ../varnish-2.0-beta1.orig/redhat/varnish.sysconfig	2008-06-18 12:59:41.000000000 +0200
+++ ./redhat/varnish.sysconfig	2008-09-02 14:50:51.000000000 +0200
@@ -11,6 +11,9 @@
 # Default log size is 82MB + header
 MEMLOCK=82000
 
+# Maximum size of corefile (for ulimit -c). Default in Fedora is 0
+# DAEMON_COREFILE_LIMIT="unlimited"
+
 # This file contains 4 alternatives, please use only one.
 
 ## Alternative 1, Minimal configuration, no VCL

varnish.lockfile.patch:

--- NEW FILE varnish.lockfile.patch ---
diff -Naur ../varnish-2.0-beta1.orig/redhat/varnish.initrc ./redhat/varnish.initrc
--- ../varnish-2.0-beta1.orig/redhat/varnish.initrc	2008-08-27 09:45:40.000000000 +0200
+++ ./redhat/varnish.initrc	2008-08-29 22:52:23.000000000 +0200
@@ -31,8 +31,6 @@
 # Include varnish defaults
 [ -e /etc/sysconfig/varnish ] && . /etc/sysconfig/varnish
 
-lockfile=/var/lock/subsys/$prog
-
 start() {
 
 	if [ ! -x $exec ]
diff -Naur ../varnish-2.0-beta1.orig/redhat/varnishlog.initrc ./redhat/varnishlog.initrc
--- ../varnish-2.0-beta1.orig/redhat/varnishlog.initrc	2008-08-27 09:45:40.000000000 +0200
+++ ./redhat/varnishlog.initrc	2008-08-29 22:53:30.000000000 +0200
@@ -32,8 +32,6 @@
 # Include varnish defaults
 [ -e /etc/sysconfig/varnishlog ] && . /etc/sysconfig/varnishlog
 
-lockfile=/var/lock/subsys/$prog
-
 start() {
 
 	if [ ! -x $exec ]

varnish.vcl_changes.patch:

--- NEW FILE varnish.vcl_changes.patch ---
diff -Naur ../varnish-2.0-beta1.orig/redhat/README.redhat ./redhat/README.redhat
--- ../varnish-2.0-beta1.orig/redhat/README.redhat	2008-08-27 09:45:40.000000000 +0200
+++ ./redhat/README.redhat	2008-09-02 16:14:43.000000000 +0200
@@ -5,6 +5,24 @@
 
 Varnish should work fine with GCC 3.3 and above.
 
+Upgrading from 1.x to 2.0
+=========================
+There are a few changes in the vcl language from varnish-1.x to 2.0.
+Because of varnish' dynamic vcl loading feature, there is no way to
+guarantee that the vcl file in use actually exists on disk. Thus,
+there is no way to securely automate this process, and one must do the
+changes by hand.
+
+In vcl, the word "insert" has been replaced by "deliver". 
+
+In the vcl declaration of backends, where one earlier used "set
+backend", backend parts are now just prefixed with a dot, so the
+default localhost configuration will look like this:
+
+backend default {
+  .host = "127.0.0.1";
+  .port = "80";
+}
 
 Configuration of addresses and ports
 ====================================


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Dec 2007 20:45:56 -0000	1.4
+++ .cvsignore	2 Sep 2008 17:54:03 -0000	1.5
@@ -1 +1 @@
-varnish-1.1.2.tar.gz
+varnish-2.0-beta1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Dec 2007 19:19:57 -0000	1.4
+++ sources	2 Sep 2008 17:54:03 -0000	1.5
@@ -1 +1 @@
-d9f74dae59a2158cdc31f446b6d92397  varnish-1.1.2.tar.gz
+66582fd4baa3f7fb91727fa27f41aa94  varnish-2.0-beta1.tar.gz


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/devel/varnish.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- varnish.spec	19 Feb 2008 05:14:07 -0000	1.9
+++ varnish.spec	2 Sep 2008 17:54:03 -0000	1.10
@@ -1,22 +1,29 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
-Version: 1.1.2
-Release: 6%{?dist}
+Version: 2.0
+Release: 0.6.beta1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
-Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
+#Source0: http://varnish.projects.linpro.no/static/varnish-cache.tar.gz
+#Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/varnish/varnish-2.0-beta1.tar.gz
+Patch0: varnish.lockfile.patch
+Patch1: varnish.coresize.patch
+Patch2: varnish.vcl_changes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# The svn sources needs autoconf, automake and libtoolto generate a suitable
+# The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
-# BuildRequires: ncurses-devel automake autoconf libtool libxslt
-BuildRequires: ncurses-devel libxslt
+#BuildRequires: automake autoconf libtool
+BuildRequires: ncurses-devel libxslt groff
 Requires: kernel >= 2.6.0 varnish-libs = %{version}-%{release}
 Requires: logrotate
+Requires: ncurses
 Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+Requires(preun): initscripts
 
 # Varnish actually needs gcc installed to work. It uses the C compiler 
 # at runtime to compile the VCL configuration files. This is by design.
@@ -31,7 +38,6 @@
 Summary: Libraries for %{name}
 Group: System Environment/Libraries
 BuildRequires: ncurses-devel
-#Requires: ncurses
 #Obsoletes: libvarnish1
 
 %description libs
@@ -48,15 +54,30 @@
 Development files for %{name}-libs
 Varnish is a high-performance HTTP accelerator
 
+#%package libs-static
+#Summary: Files for static linking of %{name} library functions
+#Group: System Environment/Libraries
+#BuildRequires: ncurses-devel
+#Requires: kernel >= 2.6.0 varnish-libs-devel = %{version}-%{release}
+#
+#%description libs-static
+#Files for static linking of varnish library functions
+#Varnish is a high-performance HTTP accelerator
+
 %prep
-%setup -q
+#%setup -q
+%setup -q -n varnish-2.0-beta1
+
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
 # ./autogen.sh
 
 mkdir examples
-cp etc/default.vcl etc/zope-plone.vcl examples
+cp bin/varnishd/default.vcl etc/zope-plone.vcl examples
 
 %build
 
@@ -70,16 +91,27 @@
 
 %{__make} %{?_smp_mflags}
 
-sed -e ' s/8080/80/g ' etc/default.vcl > redhat/default.vcl
+head -6 etc/default.vcl > redhat/default.vcl
+
+cat << EOF >> redhat/default.vcl
+backend default {
+  .host = "127.0.0.1";
+  .port = "80";
+}
+EOF
 
+tail -n +11 etc/default.vcl >> redhat/default.vcl
 
 %if "%dist" == "el4"
-    sed -i 's,daemon --pidfile \${\?PIDFILE}\?,daemon,g;
-            s,status -p \$PIDFILE,status,g;
-            s,killproc -p \$PIDFILE,killproc,g' \
+    sed -i 's,--pidfile \$pidfile,,g;
+            s,status -p \$pidfile,status,g;
+            s,killproc -p \$pidfile,killproc,g' \
     redhat/varnish.initrc redhat/varnishlog.initrc
 %endif
 
+%check
+%{__make} check LD_LIBRARY_PATH="../../lib/libvarnish/.libs:../../lib/libvarnishcompat/.libs:../../lib/libvarnishapi/.libs:../../lib/libvcl/.libs"
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="install -p"
@@ -92,12 +124,12 @@
 
 mkdir -p %{buildroot}/var/lib/varnish
 mkdir -p %{buildroot}/var/log/varnish
-
+mkdir -p %{buildroot}/var/run/varnish
 %{__install} -D -m 0644 redhat/default.vcl %{buildroot}%{_sysconfdir}/varnish/default.vcl
 %{__install} -D -m 0644 redhat/varnish.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/varnish
 %{__install} -D -m 0644 redhat/varnish.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/varnish
-%{__install} -D -m 0755 redhat/varnish.initrc %{buildroot}%{_sysconfdir}/init.d/varnish
-%{__install} -D -m 0755 redhat/varnishlog.initrc %{buildroot}%{_sysconfdir}/init.d/varnishlog
+%{__install} -D -m 0755 redhat/varnish.initrc %{buildroot}%{_initrddir}/varnish
+%{__install} -D -m 0755 redhat/varnishlog.initrc %{buildroot}%{_initrddir}/varnishlog
 
 %clean
 rm -rf %{buildroot}
@@ -116,8 +148,8 @@
 %config(noreplace) %{_sysconfdir}/varnish/default.vcl
 %config(noreplace) %{_sysconfdir}/sysconfig/varnish
 %config(noreplace) %{_sysconfdir}/logrotate.d/varnish
-%{_sysconfdir}/init.d/varnish
-%{_sysconfdir}/init.d/varnishlog
+%{_initrddir}/varnish
+%{_initrddir}/varnishlog
 
 %files libs
 %defattr(-,root,root,-)
@@ -130,23 +162,27 @@
 %{_libdir}/libvarnishapi.so
 %{_libdir}/libvarnishcompat.so
 %{_libdir}/libvcl.so
+%dir %{_includedir}/varnish
 %{_includedir}/varnish/shmlog.h
 %{_includedir}/varnish/shmlog_tags.h
 %{_includedir}/varnish/stat_field.h
 %{_includedir}/varnish/stats.h
 %{_includedir}/varnish/varnishapi.h
 %{_libdir}/pkgconfig/varnishapi.pc
+%doc LICENSE
+
+#%files libs-static
 #%{_libdir}/libvarnish.a
 #%{_libdir}/libvarnishapi.a
 #%{_libdir}/libvarnishcompat.a
 #%{_libdir}/libvcl.a
-%doc LICENSE
+#%doc LICENSE
 
 %pre
 getent group varnish >/dev/null || groupadd -r varnish
 getent passwd varnish >/dev/null || \
-useradd -r -g varnish -d /var/lib/varnish -s /sbin/nologin \
-    -c "Varnish http accelerator user" varnish
+    useradd -r -g varnish -d /var/lib/varnish -s /sbin/nologin \
+        -c "Varnish http accelerator user" varnish
 exit 0
 
 %post
@@ -155,16 +191,16 @@
 
 %preun
 if [ $1 -lt 1 ]; then
-  /sbin/service varnish stop > /dev/null 2>/dev/null
-  /sbin/service varnishlog stop > /dev/null 2>/dev/null
+  /sbin/service varnish stop > /dev/null 2>&1
+  /sbin/service varnishlog stop > /dev/null 2>&1
   /sbin/chkconfig --del varnish
   /sbin/chkconfig --del varnishlog
 fi
 
 %postun
 if [ $1 -ge 1 ]; then
-  /sbin/service varnish condrestart > /dev/null 2>/dev/null
-  /sbin/service varnishlog condrestart > /dev/null 2>/dev/null
+  /sbin/service varnish condrestart > /dev/null 2>&1
+  /sbin/service varnishlog condrestart > /dev/null 2>&1
 fi
 
 %post libs -p /sbin/ldconfig
@@ -172,6 +208,33 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Sep 02 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.6.beta1
+- Added a commented option for max coresize in the sysconfig script
+- Added a comment in README.redhat about upgrading from 1.x to 2.0
+
+* Fri Aug 29 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.5.beta1
+- Bumped version numbers and source url for first beta release \o/
+- Added a missing directory to the libs-devel package (Michael Schwendt)
+- Added the LICENSE file to the libs-devel package
+- Moved make check to its proper place
+- Removed superfluous definition of lockfile in initscripts
+
+* Wed Aug 27 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.4.20080827svn3136
+- Fixed up init script for varnishlog too
+
+* Mon Aug 25 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.3.20080825svn3125
+- Fixing up init script according to newer Fedora standards
+- The build now runs the test suite after compiling
+- Requires initscripts
+- Change default.vcl from nothing but comments to point to localhost:80,
+
+* Mon Aug 18 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.2.tp2
+- Changed source, version and release to match 2.0-tp2
+
+* Thu Aug 14 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.1.20080814svn
+- default.vcl has moved
+- Added groff to build requirements
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1.2-6
 - Autorebuild for GCC 4.3
 
@@ -204,7 +267,7 @@
 - Added the devel package for the header files and static library files
 - Added a varnish user, and fixed the init script accordingly
 
-* Thu Jul 05 2007 Dag-Erling Sm??rgrav <des at linpro.no> - 1.1-1
+* Thu Jul 05 2007 Dag-Erling Sm??rgrav <des at des.no> - 1.1-1
 - Bump Version and Release for 1.1
 
 * Mon May 28 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.4-3



From otaylor at fedoraproject.org  Tue Sep  2 17:54:47 2008
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Tue,  2 Sep 2008 17:54:47 +0000 (UTC)
Subject: rpms/bigboard/devel bigboard.spec,1.61,1.62
Message-ID: <20080902175447.9E7377011D@cvs1.fedora.phx.redhat.com>

Author: otaylor

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

Modified Files:
	bigboard.spec 
Log Message:
Add missing BuildRequires on empathy-devel


Index: bigboard.spec
===================================================================
RCS file: /cvs/extras/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- bigboard.spec	2 Sep 2008 17:23:24 -0000	1.61
+++ bigboard.spec	2 Sep 2008 17:54:17 -0000	1.62
@@ -3,7 +3,7 @@
 
 Name:           bigboard
 Version:        0.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
 Group:          Applications/Internet
@@ -28,6 +28,7 @@
 Requires:       python-gdata
 
 BuildRequires:	pkgconfig
+BuildRequires:	empathy-devel
 BuildRequires:	intltool
 BuildRequires:	gtk2-devel
 BuildRequires:	pygtk2-devel
@@ -123,6 +124,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Tue Sep  2 2008 Owen Taylor <otaylor at redhat.com> - 0.6.0-2
+- Add missing BuildRequires on empathy-devel
+
 * Tue Sep  2 2008 Owen Taylor <otaylor at redhat.com> - 0.6.0-1
 - Update to 0.6.0
 



From timn at fedoraproject.org  Tue Sep  2 18:10:18 2008
From: timn at fedoraproject.org (Tim Niemueller)
Date: Tue,  2 Sep 2008 18:10:18 +0000 (UTC)
Subject: rpms/player/F-9 player-2.1.1-plugindir.patch, NONE, 1.1 player.spec,
	1.2, 1.3
Message-ID: <20080902181018.C96687011D@cvs1.fedora.phx.redhat.com>

Author: timn

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

Modified Files:
	player.spec 
Added Files:
	player-2.1.1-plugindir.patch 
Log Message:
Added plugindir patch

+ Patch resolves two issues:
. - /usr/lib was searched for plugins, even on x86_64. dlopen magic
.   prevented havoc.
. - We now have a specified plugin directory where plugins can be put.

Tim


player-2.1.1-plugindir.patch:

--- NEW FILE player-2.1.1-plugindir.patch ---
diff -urN player-2.1.1/libplayercore/Makefile.am player-2.1.1-plugindir/libplayercore/Makefile.am
--- player-2.1.1/libplayercore/Makefile.am	2008-06-11 03:11:18.000000000 +0200
+++ player-2.1.1-plugindir/libplayercore/Makefile.am	2008-09-02 19:59:41.000000000 +0200
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -g -Wall -D PLAYER_INSTALL_PREFIX="\"@PREFIX@\"" -I$(top_srcdir)
+AM_CPPFLAGS = -g -Wall -D PLAYER_INSTALL_PREFIX="\"@PREFIX@\"" -D PLAYER_PLUGINDIR="\"@libdir@/player\"" -D LIBDIR="\"@libdir@\"" -I$(top_srcdir)
 
 # create the pkg-config entry for the server headers
 pkgconfigdir = $(libdir)/pkgconfig
diff -urN player-2.1.1/libplayercore/plugins.cc player-2.1.1-plugindir/libplayercore/plugins.cc
--- player-2.1.1/libplayercore/plugins.cc	2008-04-13 00:16:48.000000000 +0200
+++ player-2.1.1-plugindir/libplayercore/plugins.cc	2008-09-02 20:00:15.000000000 +0200
@@ -169,8 +169,22 @@
   if(!handle)
   {
     memset(fullpath,0,PATH_MAX);
-    strncpy(fullpath,PLAYER_INSTALL_PREFIX, PATH_MAX);
-    strncat(fullpath,"/lib/", PATH_MAX);
+    strncpy(fullpath,LIBDIR, PATH_MAX);
+    strncat(fullpath,"/", PATH_MAX);
+    strncat(fullpath,pluginname, PATH_MAX);
+    PLAYER_MSG1(1, "trying to load %s...", fullpath);
+    if((handle = lt_dlopenext(fullpath)))
+      PLAYER_MSG0(1, "success");
+    else
+      PLAYER_MSG1(1, "failed (%s)\n", lt_dlerror() );
+  }
+
+  // try to load it from prefix/lib/player
+  if(!handle)
+  {
+    memset(fullpath,0,PATH_MAX);
+    strncpy(fullpath,PLAYER_PLUGINDIR, PATH_MAX);
+    strncat(fullpath,"/", PATH_MAX);
     strncat(fullpath,pluginname, PATH_MAX);
     PLAYER_MSG1(1, "trying to load %s...", fullpath);
     if((handle = lt_dlopenext(fullpath)))


Index: player.spec
===================================================================
RCS file: /cvs/pkgs/rpms/player/F-9/player.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- player.spec	2 Sep 2008 16:19:08 -0000	1.2
+++ player.spec	2 Sep 2008 18:09:48 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           player
 Version:        2.1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Cross-platform robot device interface and server
 
 Group:          Applications/System
@@ -15,6 +15,7 @@
 Patch0:         %{name}-2.1.1-gcc43.patch
 Patch1:         %{name}-2.1.1-norpath.patch
 Patch2:         %{name}-2.1.0rc2-paths.patch
+Patch3:         %{name}-2.1.1-plugindir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  autoconf, automake
@@ -100,6 +101,7 @@
 %patch0 -p1 -b .gcc43
 %patch1 -p1 -b .norpath
 %patch2 -p1 -b .paths
+%patch3 -p1 -b .plugindir
 
 
 %build
@@ -132,6 +134,10 @@
 rm -f $RPM_BUILD_ROOT%{_bindir}/*.pyo
 #mv $RPM_BUILD_ROOT%{_libdir}/player/examples $RPM_BUILD_ROOT%{_datadir}/player/examples
 
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
+mv $RPM_BUILD_ROOT%{_libdir}/liblododriver.so.?.?.? $RPM_BUILD_ROOT%{_libdir}/%{name}/liblododriver.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/liblododriver.so*
+
 desktop-file-install --vendor="fedora"               \
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
 %{SOURCE1}
@@ -162,6 +168,8 @@
 %dir %{_datadir}/player
 %dir %{_libdir}/player
 %{_datadir}/applications/*.desktop
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}
 
 %files python
 %defattr(-,root,root,-)
@@ -188,6 +196,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Tue Sep 02 2008 Tim Niemueller <tim at niemueller.de> - 2.1.1-5
+- Added plugindir patch
+
 * Fri Aug 15 2008 Tim Niemueller <tim at niemueller.de> - 2.1.1-4
 - Changed norpath patch, fixes build problem on Fedora 8
 - Added libtool BR



From arozansk at fedoraproject.org  Tue Sep  2 18:50:16 2008
From: arozansk at fedoraproject.org (Aristeu Sergio Rozanski Filho)
Date: Tue,  2 Sep 2008 18:50:16 +0000 (UTC)
Subject: rpms/wdaemon/F-9 wdaemon.spec,1.4,1.5
Message-ID: <20080902185016.805B27011D@cvs1.fedora.phx.redhat.com>

Author: arozansk

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

Modified Files:
	wdaemon.spec 
Log Message:
* rebuild




Index: wdaemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/F-9/wdaemon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wdaemon.spec	12 Mar 2008 17:26:27 -0000	1.4
+++ wdaemon.spec	2 Sep 2008 18:49:44 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		wdaemon
 Version:	0.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Hotplug helper for Wacom X.org driver
 
 Group:		User Interface/X Hardware Support
@@ -65,6 +65,9 @@
 %{_sysconfdir}/udev/scripts/is_uinput.sh
 
 %changelog
+* Tue Sep 02 2008 Aristeu Rozanski <arozansk at redhat.com> 0.14-2
+- rebuild
+
 * Wed Mar 12 2008 Aristeu Rozanski <arozansk at redhat.com> 0.14-1
 - Updated to version 0.14
 - Added fix for Z axis on newer tablets



From arozansk at fedoraproject.org  Tue Sep  2 19:14:05 2008
From: arozansk at fedoraproject.org (Aristeu Sergio Rozanski Filho)
Date: Tue,  2 Sep 2008 19:14:05 +0000 (UTC)
Subject: rpms/wdaemon/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 wdaemon.spec, 1.5, 1.6
Message-ID: <20080902191406.1B8B87011D@cvs1.fedora.phx.redhat.com>

Author: arozansk

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

Modified Files:
	.cvsignore sources wdaemon.spec 
Log Message:
* updating to version 0.15




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Mar 2008 17:26:26 -0000	1.5
+++ .cvsignore	2 Sep 2008 19:13:34 -0000	1.6
@@ -1 +1 @@
-wdaemon-0.14.tar.bz2
+wdaemon-0.15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Mar 2008 17:26:27 -0000	1.5
+++ sources	2 Sep 2008 19:13:34 -0000	1.6
@@ -1 +1 @@
-121b74766daa0c58e05090758e796c35  wdaemon-0.14.tar.bz2
+814152b327aea3cf5e373d92f7472f52  wdaemon-0.15.tar.bz2


Index: wdaemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/devel/wdaemon.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wdaemon.spec	21 May 2008 18:27:26 -0000	1.5
+++ wdaemon.spec	2 Sep 2008 19:13:34 -0000	1.6
@@ -1,13 +1,12 @@
 Name:		wdaemon
-Version:	0.14
-Release:	2%{?dist}
+Version:	0.15
+Release:	1%{?dist}
 Summary:	Hotplug helper for Wacom X.org driver
 
 Group:		User Interface/X Hardware Support
 License:	GPLv2+
 URL:		http://jake.ruivo.org/~aris/wdaemon/
 Source0:	http://jake.ruivo.org/~aris/wdaemon/wdaemon-%{version}.tar.bz2
-Patch:		wdaemon-add_abs_z.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	glibc-devel
@@ -20,7 +19,6 @@
 
 %prep
 %setup -q
-%patch -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -65,6 +63,9 @@
 %{_sysconfdir}/udev/scripts/is_uinput.sh
 
 %changelog
+* Tue Sep 02 2008 Aristeu Rozanski <arozansk at redhat.com> 0.15-1
+- updated to version 0.15
+
 * Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.14-2
 - fix license tag
 



From dcbw at fedoraproject.org  Tue Sep  2 19:40:19 2008
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Tue,  2 Sep 2008 19:40:19 +0000 (UTC)
Subject: rpms/wpa_supplicant/F-8 wpa_supplicant-0.5.10-rsn-race-fix.patch,
	NONE, 
	1.1 wpa_supplicant-0.6.3-wext-scan-parser-crash-fix.patch, NONE,
	1.1 wpa_supplicant-0.6.4-mac80211-mode-order-fix.patch, NONE,
	1.1 wpa_supplicant.spec, 1.48, 1.49
Message-ID: <20080902194019.3CBF67011D@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/wpa_supplicant/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18676

Modified Files:
	wpa_supplicant.spec 
Added Files:
	wpa_supplicant-0.5.10-rsn-race-fix.patch 
	wpa_supplicant-0.6.3-wext-scan-parser-crash-fix.patch 
	wpa_supplicant-0.6.4-mac80211-mode-order-fix.patch 
Log Message:
* Tue Sep  2 2008 Dan Williams <dcbw at redhat.com> - 0.5.10-6
- Fix possible crash when parsing scan results
- Fix possible race condition when using RSN/WPA2
- Fix starting ad-hoc networks with mac80211-based drivers



wpa_supplicant-0.5.10-rsn-race-fix.patch:

--- NEW FILE wpa_supplicant-0.5.10-rsn-race-fix.patch ---
Backport of the following commit to 0.5.10:

commit 3e2ad1b932d827ddb038a5f9163bca766803811a
Author: Jouni Malinen <j at w1.fi>
Date:   Mon Jun 9 16:26:47 2008 +0300

    Fixed race condition between disassociation event and group key handshake
    
    This avoids getting stuck in state where wpa_supplicant has canceled scans,
    but the driver is actually in disassociated state. The previously used code
    that controlled scan timeout from WPA module is not really needed anymore
    (and has not been needed for past four years since authentication timeout
    was separated from scan request timeout), so this can simply be removed to
    resolved the race condition. As an extra bonus, this simplifies the
    interface to WPA module.
    [Bug 261]

diff -up wpa_supplicant-0.5.10/preauth_test.c.race-fix wpa_supplicant-0.5.10/preauth_test.c
--- wpa_supplicant-0.5.10/preauth_test.c.race-fix	2007-03-24 22:09:50.000000000 -0400
+++ wpa_supplicant-0.5.10/preauth_test.c	2008-08-29 13:31:40.000000000 -0400
@@ -44,12 +44,6 @@ struct preauth_test_data {
 };
 
 
-static void _wpa_supplicant_req_scan(void *wpa_s, int sec, int usec)
-{
-	wpa_supplicant_req_scan(wpa_s, sec, usec);
-}
-
-
 static void _wpa_supplicant_disassociate(void *wpa_s, int reason_code)
 {
 	wpa_supplicant_disassociate(wpa_s, reason_code);
@@ -254,7 +248,6 @@ static void wpa_init_conf(struct wpa_sup
 	ctx->ctx = wpa_s;
 	ctx->set_state = _wpa_supplicant_set_state;
 	ctx->get_state = _wpa_supplicant_get_state;
-	ctx->req_scan = _wpa_supplicant_req_scan;
 	ctx->deauthenticate = _wpa_supplicant_deauthenticate;
 	ctx->disassociate = _wpa_supplicant_disassociate;
 	ctx->set_key = wpa_supplicant_set_key;
diff -up wpa_supplicant-0.5.10/wpa.c.race-fix wpa_supplicant-0.5.10/wpa.c
--- wpa_supplicant-0.5.10/wpa.c.race-fix	2008-02-17 19:10:46.000000000 -0500
+++ wpa_supplicant-0.5.10/wpa.c	2008-08-29 13:31:40.000000000 -0400
@@ -1567,7 +1567,6 @@ static void wpa_supplicant_key_neg_compl
 		MACSTR " [PTK=%s GTK=%s]", MAC2STR(addr),
 		wpa_cipher_txt(sm->pairwise_cipher),
 		wpa_cipher_txt(sm->group_cipher));
-	eloop_cancel_timeout(sm->ctx->scan, sm->ctx->ctx, NULL);
 	wpa_sm_cancel_auth_timeout(sm);
 	wpa_sm_set_state(sm, WPA_COMPLETED);
 
@@ -1904,7 +1903,6 @@ static void wpa_report_ie_mismatch(struc
 	}
 
 	wpa_sm_disassociate(sm, REASON_IE_IN_4WAY_DIFFERS);
-	wpa_sm_req_scan(sm, 0, 0);
 }
 
 
@@ -3798,7 +3796,6 @@ static void wpa_sm_pmksa_free_cb(struct 
 
 		os_memset(sm->pmk, 0, sizeof(sm->pmk));
 		wpa_sm_deauthenticate(sm, REASON_UNSPECIFIED);
-		wpa_sm_req_scan(sm, 0, 0);
 	}
 }
 
diff -up wpa_supplicant-0.5.10/wpa.h.race-fix wpa_supplicant-0.5.10/wpa.h
--- wpa_supplicant-0.5.10/wpa.h.race-fix	2007-03-24 22:09:50.000000000 -0400
+++ wpa_supplicant-0.5.10/wpa.h	2008-08-29 13:31:40.000000000 -0400
@@ -59,7 +59,6 @@ struct wpa_sm_ctx {
 
 	void (*set_state)(void *ctx, wpa_states state);
 	wpa_states (*get_state)(void *ctx);
-	void (*req_scan)(void *ctx, int sec, int usec);
 	void (*deauthenticate)(void * ctx, int reason_code); 
 	void (*disassociate)(void *ctx, int reason_code);
 	int (*set_key)(void *ctx, wpa_alg alg,
diff -up wpa_supplicant-0.5.10/wpa_i.h.race-fix wpa_supplicant-0.5.10/wpa_i.h
--- wpa_supplicant-0.5.10/wpa_i.h.race-fix	2007-03-24 22:09:50.000000000 -0400
+++ wpa_supplicant-0.5.10/wpa_i.h	2008-08-29 13:31:40.000000000 -0400
@@ -146,11 +146,6 @@ static inline wpa_states wpa_sm_get_stat
 	return sm->ctx->get_state(sm->ctx->ctx);
 }
 
-static inline void wpa_sm_req_scan(struct wpa_sm *sm, int sec, int usec)
-{
-	sm->ctx->req_scan(sm->ctx->ctx, sec, usec);
-}
-
 static inline void wpa_sm_deauthenticate(struct wpa_sm *sm, int reason_code)
 {
 	sm->ctx->deauthenticate(sm->ctx->ctx, reason_code);
diff -up wpa_supplicant-0.5.10/wpa_supplicant.c.race-fix wpa_supplicant-0.5.10/wpa_supplicant.c
--- wpa_supplicant-0.5.10/wpa_supplicant.c.race-fix	2008-08-29 13:31:40.000000000 -0400
+++ wpa_supplicant-0.5.10/wpa_supplicant.c	2008-08-29 13:32:55.000000000 -0400
@@ -362,7 +362,6 @@ static void wpa_supplicant_notify_eapol_
 	if (wpa_s->key_mgmt == WPA_KEY_MGMT_IEEE8021X) {
 		wpa_supplicant_set_state(wpa_s, WPA_4WAY_HANDSHAKE);
 	} else {
-		eloop_cancel_timeout(wpa_supplicant_scan, wpa_s, NULL);
 		wpa_supplicant_cancel_auth_timeout(wpa_s);
 		wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);
 	}
@@ -1817,12 +1816,6 @@ static int _wpa_ether_send(void *wpa_s, 
 }
 
 
-static void _wpa_supplicant_req_scan(void *wpa_s, int sec, int usec)
-{
-	wpa_supplicant_req_scan(wpa_s, sec, usec);
-}
-
-
 static void _wpa_supplicant_cancel_auth_timeout(void *wpa_s)
 {
 	wpa_supplicant_cancel_auth_timeout(wpa_s);
@@ -1844,12 +1837,16 @@ static wpa_states _wpa_supplicant_get_st
 static void _wpa_supplicant_disassociate(void *wpa_s, int reason_code)
 {
 	wpa_supplicant_disassociate(wpa_s, reason_code);
+	/* Schedule a scan to make sure we continue looking for networks */
+	wpa_supplicant_req_scan(wpa_s, 0, 0);
 }
 
 
 static void _wpa_supplicant_deauthenticate(void *wpa_s, int reason_code)
 {
 	wpa_supplicant_deauthenticate(wpa_s, reason_code);
+	/* Schedule a scan to make sure we continue looking for networks */
+	wpa_supplicant_req_scan(wpa_s, 0, 0);
 }
 
 
@@ -2227,7 +2224,6 @@ static int wpa_supplicant_init_wpa(struc
 	ctx->ctx = wpa_s;
 	ctx->set_state = _wpa_supplicant_set_state;
 	ctx->get_state = _wpa_supplicant_get_state;
-	ctx->req_scan = _wpa_supplicant_req_scan;
 	ctx->deauthenticate = _wpa_supplicant_deauthenticate;
 	ctx->disassociate = _wpa_supplicant_disassociate;
 	ctx->set_key = wpa_supplicant_set_key;

wpa_supplicant-0.6.3-wext-scan-parser-crash-fix.patch:

--- NEW FILE wpa_supplicant-0.6.3-wext-scan-parser-crash-fix.patch ---
Inspired by the following commit; the rest of the patch for custom scan
event processing does not apply to wpa_supplicant 0.5.10.

commit fd630bc183fb79d0a14b5f3a346544f3d277bd05
Author: Jouni Malinen <jouni.malinen at atheros.com>
Date:   Wed Aug 27 09:52:16 2008 +0300

    Fixed WEXT scan result parser to not crash on invalid IEs (zero len buffer)
    
    If IWEVGENIE or custom event wpa_ie/rsn_ie is received in scan with empty
    buffer, the previous version ended up calling realloc(NULL, 0) which seems
    to return a non-NULL value in some cases. When this return value is passed
    again into realloc with realloc(ptr, 0), the returned value could be NULL.
    If the ptr is then freed (os_free(data.ie) in SIOCGIWAP handling), glibc
    may crash due to invalid pointer being freed (or double-freed?). The
    non-NULL realloc(NULL, 0) return value from glibc looks a bit odd behavior,
    but anyway, better avoid this case completely and just skip the IE events
    that have an empty buffer.
    
    This issue should not show up with drivers that produce proper scan results
    since the IEs will always include the two-octet header. However, it seems
    to be possible to see this when using 64-bit kernel and 32-bit userspace
    with incorrect compat-ioctl processing.

diff -up wpa_supplicant-0.5.10/driver_wext.c.scan-parse-crash wpa_supplicant-0.5.10/driver_wext.c
--- wpa_supplicant-0.5.10/driver_wext.c.scan-parse-crash	2008-08-29 11:16:09.000000000 -0400
+++ wpa_supplicant-0.5.10/driver_wext.c	2008-08-29 11:17:43.000000000 -0400
@@ -1302,6 +1302,8 @@ int wpa_driver_wext_get_scan_results(voi
 		case IWEVGENIE:
 			if (ap_num >= max_size)
 				break;
+			if (iwe->u.data.length == 0)
+				break;
 			gpos = genie = custom;
 			gend = genie + iwe->u.data.length;
 			if (gend > end) {


wpa_supplicant-0.6.4-mac80211-mode-order-fix.patch:

--- NEW FILE wpa_supplicant-0.6.4-mac80211-mode-order-fix.patch ---
diff -up wpa_supplicant-0.5.10/driver.h.mode-order-fix wpa_supplicant-0.5.10/driver.h
--- wpa_supplicant-0.5.10/driver.h.mode-order-fix	2007-03-24 22:09:49.000000000 -0400
+++ wpa_supplicant-0.5.10/driver.h	2008-08-29 19:07:47.000000000 -0400
@@ -469,6 +469,15 @@ struct wpa_driver_ops {
 	 */
 	int (*disassociate)(void *priv, const u8 *addr, int reason_code);
 
+ 	/**
+	 * associate - Request driver to set the operating mode
+	 * @priv: private driver interface data
+	 * @mode: Operation mode (infra/ibss) IEEE80211_MODE_*
+	 *
+	 * Returns: 0 on success, -1 on failure
+	 */
+	int (*set_mode)(void *priv, int mode);
+
 	/**
 	 * associate - Request driver to associate
 	 * @priv: private driver interface data
diff -up wpa_supplicant-0.5.10/driver_test.c.mode-order-fix wpa_supplicant-0.5.10/driver_test.c
--- wpa_supplicant-0.5.10/driver_test.c.mode-order-fix	2007-12-27 19:21:09.000000000 -0500
+++ wpa_supplicant-0.5.10/driver_test.c	2008-08-29 19:07:47.000000000 -0400
@@ -901,6 +901,7 @@ const struct wpa_driver_ops wpa_driver_t
 	wpa_driver_test_get_scan_results,
 	wpa_driver_test_deauthenticate,
 	wpa_driver_test_disassociate,
+	NULL /* set_mode */,
 	wpa_driver_test_associate,
 	NULL /* set_auth_alg */,
 	NULL /* add_pmkid */,
diff -up wpa_supplicant-0.5.10/driver_wext.c.mode-order-fix wpa_supplicant-0.5.10/driver_wext.c
--- wpa_supplicant-0.5.10/driver_wext.c.mode-order-fix	2008-08-29 19:07:47.000000000 -0400
+++ wpa_supplicant-0.5.10/driver_wext.c	2008-08-29 19:07:47.000000000 -0400
@@ -1839,8 +1839,6 @@ wpa_driver_wext_associate(void *priv,
 	    wpa_driver_wext_set_bssid(drv, NULL) < 0)
 		ret = -1;
 
-	if (wpa_driver_wext_set_mode(drv, params->mode) < 0)
-		ret = -1;
 	/* TODO: should consider getting wpa version and cipher/key_mgmt suites
 	 * from configuration, not from here, where only the selected suite is
 	 * available */
@@ -2398,6 +2396,7 @@ const struct wpa_driver_ops wpa_driver_w
 	.get_scan_results = wpa_driver_wext_get_scan_results,
 	.deauthenticate = wpa_driver_wext_deauthenticate,
 	.disassociate = wpa_driver_wext_disassociate,
+	.set_mode = wpa_driver_wext_set_mode,
 	.associate = wpa_driver_wext_associate,
 	.set_auth_alg = wpa_driver_wext_set_auth_alg,
 	.init = wpa_driver_wext_init,
diff -up wpa_supplicant-0.5.10/wpa_supplicant.c.mode-order-fix wpa_supplicant-0.5.10/wpa_supplicant.c
--- wpa_supplicant-0.5.10/wpa_supplicant.c.mode-order-fix	2008-08-29 19:07:47.000000000 -0400
+++ wpa_supplicant-0.5.10/wpa_supplicant.c	2008-08-29 19:07:47.000000000 -0400
@@ -1379,6 +1379,11 @@ void wpa_supplicant_associate(struct wpa
 	 * previous association. */
 	wpa_sm_set_assoc_wpa_ie(wpa_s->wpa, NULL, 0);
 
+	if (wpa_drv_set_mode(wpa_s, ssid->mode)) {
+		wpa_printf(MSG_WARNING, "Failed to set operating mode");
+		assoc_failed = 1;
+	}
+
 #ifdef IEEE8021X_EAPOL
 	if (ssid->key_mgmt & WPA_KEY_MGMT_IEEE8021X_NO_WPA) {
 		if (ssid->leap) {
diff -up wpa_supplicant-0.5.10/wpa_supplicant_i.h.mode-order-fix wpa_supplicant-0.5.10/wpa_supplicant_i.h
--- wpa_supplicant-0.5.10/wpa_supplicant_i.h.mode-order-fix	2007-12-27 19:50:15.000000000 -0500
+++ wpa_supplicant-0.5.10/wpa_supplicant_i.h	2008-08-29 19:07:47.000000000 -0400
@@ -460,6 +460,14 @@ static inline int wpa_drv_set_wpa(struct
 	return 0;
 }
 
+static inline int wpa_drv_set_mode(struct wpa_supplicant *wpa_s, int mode)
+{
+	if (wpa_s->driver->set_mode) {
+		return wpa_s->driver->set_mode(wpa_s->drv_priv, mode);
+	}
+	return 0;
+}
+
 static inline int wpa_drv_associate(struct wpa_supplicant *wpa_s,
 				    struct wpa_driver_associate_params *params)
 {


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/F-8/wpa_supplicant.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- wpa_supplicant.spec	11 Jun 2008 11:12:58 -0000	1.48
+++ wpa_supplicant.spec	2 Sep 2008 19:39:48 -0000	1.49
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.5.10
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -21,10 +21,19 @@
 Patch4: wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch
 Patch5: wpa_supplicant-0.5.10-dbus-service-file.patch
 Patch6: wpa_supplicant-0.5.10-default-log-file.patch
+# Upstream in 0.6.x
 Patch7: wpa_supplicant-0.6.3-wext-dont-overwrite-BSS-frequency.patch
+# Upstream in 0.6.x
 Patch8: wpa_supplicant-0.6.3-dont-reschedule-specific-scans.patch
+# Upstream in 0.6.x
 Patch9: wpa_supplicant-0.6.3-wext-handle-mac80211-mode-switches.patch
+# Upstream in 0.6.x
 Patch10: wpa_supplicant-0.6.3-wpa-gui-fixes.patch
+# Backported from 0.6.x
+Patch11: wpa_supplicant-0.6.3-wext-scan-parser-crash-fix.patch
+# Backported from 0.6.x
+Patch12: wpa_supplicant-0.5.10-rsn-race-fix.patch
+Patch13: wpa_supplicant-0.6.4-mac80211-mode-order-fix.patch
 
 URL: http://w1.fi/wpa_supplicant/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,6 +72,9 @@
 %patch8 -p3 -b .ssid-scans
 %patch9 -p3 -b .mac80211-mode
 %patch10 -p1 -b .wpa-gui-fixes
+%patch11 -p1 -b .scan-parse-crash
+%patch12 -p1 -b .rsn-race-fix
+%patch13 -p1 -b .mode-order-fix
 
 %build
 cp %{SOURCE1} ./.config
@@ -70,7 +82,8 @@
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
 CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
 make %{_smp_mflags}
-QTDIR=%{_libdir}/qt-3.3 make wpa_gui %{_smp_mflags}
+unset QTDIR && . /etc/profile.d/qt.sh
+make wpa_gui %{_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -151,6 +164,11 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Tue Sep  2 2008 Dan Williams <dcbw at redhat.com> - 0.5.10-6
+- Fix possible crash when parsing scan results
+- Fix possible race condition when using RSN/WPA2
+- Fix starting ad-hoc networks with mac80211-based drivers
+
 * Wed Jun 11 2008 Dan Williams <dcbw at redhat.com> - 0.5.10-5
 - Fix 802.11a frequency bug
 - Always schedule specific SSID scans to help find hidden APs



From pkgdb at fedoraproject.org  Tue Sep  2 19:50:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 19:50:16 +0000
Subject: [pkgdb] lxpanel: cwickert has requested watchcommits
Message-ID: <20080902195017.59B9B208D13@bastion.fedora.phx.redhat.com>

cwickert has requested the watchcommits acl on lxpanel (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 19:50:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 19:50:12 +0000
Subject: [pkgdb] lxpanel: cwickert has requested watchbugzilla
Message-ID: <20080902195013.38AED208D0F@bastion.fedora.phx.redhat.com>

cwickert has requested the watchbugzilla acl on lxpanel (Fedora devel)

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



From mmcgrath at fedoraproject.org  Tue Sep  2 19:50:17 2008
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Tue,  2 Sep 2008 19:50:17 +0000 (UTC)
Subject: rpms/ytalk/devel ytalk.spec,1.47,1.48
Message-ID: <20080902195017.D8F117011D@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

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

Modified Files:
	ytalk.spec 
Log Message:
testing commit mail


Index: ytalk.spec
===================================================================
RCS file: /cvs/extras/rpms/ytalk/devel/ytalk.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ytalk.spec	25 Aug 2008 18:38:20 -0000	1.47
+++ ytalk.spec	2 Sep 2008 19:49:47 -0000	1.48
@@ -1,6 +1,7 @@
 Summary: A chat program for multiple users
 Name: ytalk
 Version: 3.3.0
+
 Release: 12%{?dist}
 License: GPLv2+
 Group: Applications/Internet



From pkgdb at fedoraproject.org  Tue Sep  2 19:50:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 19:50:19 +0000
Subject: [pkgdb] lxpanel: cwickert has requested commit
Message-ID: <20080902195019.EAC7B208D17@bastion.fedora.phx.redhat.com>

cwickert has requested the commit acl on lxpanel (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 19:50:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 19:50:23 +0000
Subject: [pkgdb] lxpanel: cwickert has requested approveacls
Message-ID: <20080902195024.15DCC208D7B@bastion.fedora.phx.redhat.com>

cwickert has requested the approveacls acl on lxpanel (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 19:50:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 19:50:44 +0000
Subject: [pkgdb] lxpanel: cwickert has requested watchcommits
Message-ID: <20080902195045.8CC63208D15@bastion.fedora.phx.redhat.com>

cwickert has requested the watchcommits acl on lxpanel (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 19:50:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 19:50:41 +0000
Subject: [pkgdb] lxpanel: cwickert has requested watchbugzilla
Message-ID: <20080902195041.315AF208D13@bastion.fedora.phx.redhat.com>

cwickert has requested the watchbugzilla acl on lxpanel (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 19:50:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 19:50:48 +0000
Subject: [pkgdb] lxpanel: cwickert has requested commit
Message-ID: <20080902195048.2893D208D19@bastion.fedora.phx.redhat.com>

cwickert has requested the commit acl on lxpanel (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 19:50:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 19:50:50 +0000
Subject: [pkgdb] lxpanel: cwickert has requested approveacls
Message-ID: <20080902195051.0DC06208D85@bastion.fedora.phx.redhat.com>

cwickert has requested the approveacls acl on lxpanel (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 19:50:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 19:50:58 +0000
Subject: [pkgdb] lxpanel: cwickert has given up approveacls
Message-ID: <20080902195058.75706208D6C@bastion.fedora.phx.redhat.com>

cwickert has given up the approveacls acl on lxpanel (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Sep  2 19:51:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 19:51:00 +0000
Subject: [pkgdb] lxpanel: cwickert has given up approveacls
Message-ID: <20080902195100.CC0E4208D88@bastion.fedora.phx.redhat.com>

cwickert has given up the approveacls acl on lxpanel (Fedora 8)

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



From pkgdb at fedoraproject.org  Tue Sep  2 19:51:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 19:51:07 +0000
Subject: [pkgdb] lxpanel: cwickert has requested watchbugzilla
Message-ID: <20080902195107.9C673208D14@bastion.fedora.phx.redhat.com>

cwickert has requested the watchbugzilla acl on lxpanel (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 19:51:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 19:51:12 +0000
Subject: [pkgdb] lxpanel: cwickert has requested watchcommits
Message-ID: <20080902195113.6534A208D89@bastion.fedora.phx.redhat.com>

cwickert has requested the watchcommits acl on lxpanel (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Sep  2 19:51:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 02 Sep 2008 19:51:13 +0000
Subject: [pkgdb] lxpanel: cwickert has requested commit
Message-ID: <20080902195114.610A6208D8C@bastion.fedora.phx.redhat.com>

cwickert has requested the commit acl on lxpanel (Fedora 9)

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



From konradm at fedoraproject.org  Tue Sep  2 20:12:36 2008
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Tue,  2 Sep 2008 20:12:36 +0000 (UTC)
Subject: rpms/joni/F-9 joni.spec,1.3,1.4
Message-ID: <20080902201236.A173F7011D@cvs1.fedora.phx.redhat.com>

Author: konradm

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

Modified Files:
	joni.spec 
Log Message:
Add objectweb-asm dependency/patch.


Index: joni.spec
===================================================================
RCS file: /cvs/pkgs/rpms/joni/F-9/joni.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- joni.spec	1 Sep 2008 05:26:49 -0000	1.3
+++ joni.spec	2 Sep 2008 20:12:06 -0000	1.4
@@ -11,12 +11,17 @@
 #   tar -cjf joni-1.0.3.tar.bz2 joni-1.0.3
 Source0:          %{name}-%{version}.tar.bz2
 Patch0:           joni-set-java-5_0-target-and-source.patch
+Patch1:           joni-include-objectweb-asm.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    java-devel >= 1.5
 BuildRequires:    ant
+BuildRequires:    objectweb-asm
+BuildRequires:    junit
 BuildRequires:    jpackage-utils
 Requires:         java >= 1.5
+Requires:         objectweb-asm
+Requires:         junit
 Requires:         jpackage-utils
 
 #%if 0%{?fedora} > 9
@@ -36,6 +41,9 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
+mkdir build_lib
+build-jar-repository -s -p build_lib objectweb-asm/asm
 
 
 %build



From konradm at fedoraproject.org  Tue Sep  2 20:12:37 2008
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Tue,  2 Sep 2008 20:12:37 +0000 (UTC)
Subject: rpms/joni/EL-5 joni.spec,1.7,1.8
Message-ID: <20080902201237.B8F8C7011D@cvs1.fedora.phx.redhat.com>

Author: konradm

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

Modified Files:
	joni.spec 
Log Message:
Add objectweb-asm dependency/patch.


Index: joni.spec
===================================================================
RCS file: /cvs/pkgs/rpms/joni/EL-5/joni.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- joni.spec	1 Sep 2008 05:27:00 -0000	1.7
+++ joni.spec	2 Sep 2008 20:12:07 -0000	1.8
@@ -11,12 +11,17 @@
 #   tar -cjf joni-1.0.3.tar.bz2 joni-1.0.3
 Source0:          %{name}-%{version}.tar.bz2
 Patch0:           joni-set-java-5_0-target-and-source.patch
+Patch1:           joni-include-objectweb-asm.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    java-devel >= 1.5
 BuildRequires:    ant
+BuildRequires:    objectweb-asm
+BuildRequires:    junit
 BuildRequires:    jpackage-utils
 Requires:         java >= 1.5
+Requires:         objectweb-asm
+Requires:         junit
 Requires:         jpackage-utils
 
 #%if 0%{?fedora} > 9
@@ -36,6 +41,9 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
+mkdir build_lib
+build-jar-repository -s -p build_lib objectweb-asm/asm
 
 
 %build



From konradm at fedoraproject.org  Tue Sep  2 20:12:42 2008
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Tue,  2 Sep 2008 20:12:42 +0000 (UTC)
Subject: rpms/joni/F-8 joni.spec,1.3,1.4
Message-ID: <20080902201242.845697011D@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/joni/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23303

Modified Files:
	joni.spec 
Log Message:
Add objectweb-asm dependency/patch.


Index: joni.spec
===================================================================
RCS file: /cvs/pkgs/rpms/joni/F-8/joni.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- joni.spec	1 Sep 2008 05:26:54 -0000	1.3
+++ joni.spec	2 Sep 2008 20:12:12 -0000	1.4
@@ -11,12 +11,17 @@
 #   tar -cjf joni-1.0.3.tar.bz2 joni-1.0.3
 Source0:          %{name}-%{version}.tar.bz2
 Patch0:           joni-set-java-5_0-target-and-source.patch
+Patch1:           joni-include-objectweb-asm.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    java-devel >= 1.5
 BuildRequires:    ant
+BuildRequires:    objectweb-asm
+BuildRequires:    junit
 BuildRequires:    jpackage-utils
 Requires:         java >= 1.5
+Requires:         objectweb-asm
+Requires:         junit
 Requires:         jpackage-utils
 
 #%if 0%{?fedora} > 9
@@ -36,6 +41,9 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
+mkdir build_lib
+build-jar-repository -s -p build_lib objectweb-asm/asm
 
 
 %build



From konradm at fedoraproject.org  Tue Sep  2 20:16:35 2008
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Tue,  2 Sep 2008 20:16:35 +0000 (UTC)
Subject: rpms/joni/F-9 joni-include-objectweb-asm.patch,NONE,1.1
Message-ID: <20080902201635.7830B7011D@cvs1.fedora.phx.redhat.com>

Author: konradm

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

Added Files:
	joni-include-objectweb-asm.patch 
Log Message:
Add objectweb-asm dependency/patch.

joni-include-objectweb-asm.patch:

--- NEW FILE joni-include-objectweb-asm.patch ---
--- build.xml.orig	2008-09-02 09:16:39.000000000 -0700
+++ build.xml	2008-09-02 09:26:49.000000000 -0700
@@ -5,20 +5,25 @@
     <property name="ant.build.javac.source" value="1.5" />
     <property name="src.dir" value="src" />
     <property name="bin.dir" value="target/classes" />
     <property name="dist.dir" value="target" />
     <property name="jar.name" value="joni.jar" />
+    <path id="lib.dir">
+	<pathelement location="build_lib/objectweb-asm_asm.jar" />
+    </path>
 
     <target name="clean">
         <delete dir="${bin.dir}" />
         <delete dir="${dist.dir}" />
 
     </target>
 
     <target name="compile">
         <mkdir dir="${bin.dir}" />
-        <javac srcdir="${src.dir}" destdir="${bin.dir}"/>
+	<javac srcdir="${src.dir}" destdir="${bin.dir}">
+	    <classpath refid="lib.dir" />
+        </javac>
     </target>
     
     <target name="build" depends="compile">
         <mkdir dir="${dist.dir}" />
 



From konradm at fedoraproject.org  Tue Sep  2 20:16:37 2008
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Tue,  2 Sep 2008 20:16:37 +0000 (UTC)
Subject: rpms/joni/F-8 joni-include-objectweb-asm.patch,NONE,1.1
Message-ID: <20080902201637.AB34E7011D@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/joni/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24398

Added Files:
	joni-include-objectweb-asm.patch 
Log Message:
Add objectweb-asm dependency/patch.

joni-include-objectweb-asm.patch:

--- NEW FILE joni-include-objectweb-asm.patch ---
--- build.xml.orig	2008-09-02 09:16:39.000000000 -0700
+++ build.xml	2008-09-02 09:26:49.000000000 -0700
@@ -5,20 +5,25 @@
     <property name="ant.build.javac.source" value="1.5" />
     <property name="src.dir" value="src" />
     <property name="bin.dir" value="target/classes" />
     <property name="dist.dir" value="target" />
     <property name="jar.name" value="joni.jar" />
+    <path id="lib.dir">
+	<pathelement location="build_lib/objectweb-asm_asm.jar" />
+    </path>
 
     <target name="clean">
         <delete dir="${bin.dir}" />
         <delete dir="${dist.dir}" />
 
     </target>
 
     <target name="compile">
         <mkdir dir="${bin.dir}" />
-        <javac srcdir="${src.dir}" destdir="${bin.dir}"/>
+	<javac srcdir="${src.dir}" destdir="${bin.dir}">
+	    <classpath refid="lib.dir" />
+        </javac>
     </target>
     
     <target name="build" depends="compile">
         <mkdir dir="${dist.dir}" />
 



From konradm at fedoraproject.org  Tue Sep  2 20:16:41 2008
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Tue,  2 Sep 2008 20:16:41 +0000 (UTC)
Subject: rpms/joni/EL-5 joni-include-objectweb-asm.patch,NONE,1.1
Message-ID: <20080902201641.21FA37011D@cvs1.fedora.phx.redhat.com>

Author: konradm

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

Added Files:
	joni-include-objectweb-asm.patch 
Log Message:
Add objectweb-asm dependency/patch.

joni-include-objectweb-asm.patch:

--- NEW FILE joni-include-objectweb-asm.patch ---
--- build.xml.orig	2008-09-02 09:16:39.000000000 -0700
+++ build.xml	2008-09-02 09:26:49.000000000 -0700
@@ -5,20 +5,25 @@
     <property name="ant.build.javac.source" value="1.5" />
     <property name="src.dir" value="src" />
     <property name="bin.dir" value="target/classes" />
     <property name="dist.dir" value="target" />
     <property name="jar.name" value="joni.jar" />
+    <path id="lib.dir">
+	<pathelement location="build_lib/objectweb-asm_asm.jar" />
+    </path>
 
     <target name="clean">
         <delete dir="${bin.dir}" />
         <delete dir="${dist.dir}" />
 
     </target>
 
     <target name="compile">
         <mkdir dir="${bin.dir}" />
-        <javac srcdir="${src.dir}" destdir="${bin.dir}"/>
+	<javac srcdir="${src.dir}" destdir="${bin.dir}">
+	    <classpath refid="lib.dir" />
+        </javac>
     </target>
     
     <target name="build" depends="compile">
         <mkdir dir="${dist.dir}" />
 



From ingvar at fedoraproject.org  Tue Sep  2 20:37:38 2008
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Tue,  2 Sep 2008 20:37:38 +0000 (UTC)
Subject: rpms/varnish/devel varnish.cs3157.patch, NONE, 1.1 varnish.spec,
	1.10, 1.11
Message-ID: <20080902203738.B52587011D@cvs1.fedora.phx.redhat.com>

Author: ingvar

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

Modified Files:
	varnish.spec 
Added Files:
	varnish.cs3157.patch 
Log Message:
Added a patch from svn r3156 and r3157, hiding a legit errno in make check


varnish.cs3157.patch:

--- NEW FILE varnish.cs3157.patch ---
Index: bin/varnishtest/vtc_server.c
===================================================================
--- bin/varnishtest/vtc_server.c	(revision 3155)
+++ bin/varnishtest/vtc_server.c	(revision 3157)
@@ -97,7 +97,7 @@
 		vtc_log(vl, 3, "Accepted socket fd is %d", fd);
 		http_process(vl, s->spec, fd, 0);
 		vtc_log(vl, 3, "shutting fd %d", fd);
-		AZ(shutdown(fd, SHUT_WR));
+		assert((shutdown(fd, SHUT_WR) == 0) || errno == ENOTCONN);
 		TCP_close(&fd);
 	}
 	vtc_log(vl, 2, "Ending");


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/devel/varnish.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- varnish.spec	2 Sep 2008 17:54:03 -0000	1.10
+++ varnish.spec	2 Sep 2008 20:37:08 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
 Version: 2.0
-Release: 0.6.beta1%{?dist}
+Release: 0.7.beta1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -11,6 +11,7 @@
 Patch0: varnish.lockfile.patch
 Patch1: varnish.coresize.patch
 Patch2: varnish.vcl_changes.patch
+Patch3: varnish.cs3157.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 @@
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
@@ -208,6 +210,9 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Sep 02 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.7.beta1
+- Added a patch from r3156 and r3157, hiding a legit errno in make check
+
 * Tue Sep 02 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.6.beta1
 - Added a commented option for max coresize in the sysconfig script
 - Added a comment in README.redhat about upgrading from 1.x to 2.0



From otaylor at fedoraproject.org  Tue Sep  2 21:11:43 2008
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Tue,  2 Sep 2008 21:11:43 +0000 (UTC)
Subject: rpms/bigboard/devel .cvsignore, 1.41, 1.42 bigboard.spec, 1.62,
	1.63 sources, 1.42, 1.43
Message-ID: <20080902211143.AB8DD7011D@cvs1.fedora.phx.redhat.com>

Author: otaylor

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

Modified Files:
	.cvsignore bigboard.spec sources 
Log Message:
Update to 0.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bigboard/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	2 Sep 2008 17:23:24 -0000	1.41
+++ .cvsignore	2 Sep 2008 21:11:13 -0000	1.42
@@ -1,3 +1,4 @@
 bigboard-0.5.31.tar.gz
 bigboard-0.5.34.tar.bz2
 bigboard-0.6.0.tar.gz
+bigboard-0.6.1.tar.gz


Index: bigboard.spec
===================================================================
RCS file: /cvs/extras/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- bigboard.spec	2 Sep 2008 17:54:17 -0000	1.62
+++ bigboard.spec	2 Sep 2008 21:11:13 -0000	1.63
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.6.0
-Release:        2%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
 Group:          Applications/Internet
@@ -124,6 +124,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Tue Sep  2 2008 Owen Taylor <otaylor at redhat.com> - 0.6.1-1
+- Update to 0.6.1
+
 * Tue Sep  2 2008 Owen Taylor <otaylor at redhat.com> - 0.6.0-2
 - Add missing BuildRequires on empathy-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bigboard/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	2 Sep 2008 17:23:24 -0000	1.42
+++ sources	2 Sep 2008 21:11:13 -0000	1.43
@@ -1 +1 @@
-c1355cba1247d6f65522342a96821bbd  bigboard-0.6.0.tar.gz
+ada00604ace214809b7eb3635b774e6b  bigboard-0.6.1.tar.gz



From dsd at fedoraproject.org  Tue Sep  2 21:26:29 2008
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  2 Sep 2008 21:26:29 +0000 (UTC)
Subject: rpms/xorg-x11-server/OLPC-3 dix-destroy-pixmap.patch, NONE,
	1.1 xorg-x11-server.spec, 1.341, 1.342
Message-ID: <20080902212629.541E97011D@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/xorg-x11-server/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2392

Modified Files:
	xorg-x11-server.spec 
Added Files:
	dix-destroy-pixmap.patch 
Log Message:
fix DIX crash when Pixmap can't be allocated

dix-destroy-pixmap.patch:

--- NEW FILE dix-destroy-pixmap.patch ---
From: Daniel Drake <dsd at laptop.org>
Subject: fix destroy of NULL pixmap

Index: xorg-server-1.4.99.906/dix/dispatch.c
===================================================================
--- xorg-server-1.4.99.906.orig/dix/dispatch.c
+++ xorg-server-1.4.99.906/dix/dispatch.c
@@ -1338,8 +1338,8 @@ CreatePmap:
 	}
 	if (AddResource(stuff->pid, RT_PIXMAP, (pointer)pMap))
 	    return(client->noClientException);
+	(*pDraw->pScreen->DestroyPixmap)(pMap);
     }
-    (*pDraw->pScreen->DestroyPixmap)(pMap);
     return (BadAlloc);
 }
 


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/OLPC-3/xorg-x11-server.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- xorg-x11-server.spec	29 Aug 2008 14:51:20 -0000	1.341
+++ xorg-x11-server.spec	2 Sep 2008 21:25:58 -0000	1.342
@@ -59,6 +59,7 @@
 
 Patch6000: exa-copyarea.patch
 Patch6001: xserver-1.5.0-hide-cursor.patch
+Patch6001: dix-destroy-pixmap.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -465,6 +466,9 @@
 
 
 %changelog
+* Tue Sep  2 2008 Daniel Drake <dsd at laptop.org> 1.4.99.906-2.3
+- fix DIX crash when Pixmap can't be allocated
+
 * Fri Aug 29 2008 Daniel Drake <dsd at laptop.org> 1.4.99.906-2.1
 - add EXA CopyArea patch to solve rendering bugs (dlo#7612)
 - Suppress displaying the cursor until an app calls XDefineCursor().



From dsd at fedoraproject.org  Tue Sep  2 21:34:30 2008
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  2 Sep 2008 21:34:30 +0000 (UTC)
Subject: rpms/xorg-x11-server/OLPC-3 xorg-x11-server.spec,1.342,1.343
Message-ID: <20080902213430.8528B7011D@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/xorg-x11-server/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3345

Modified Files:
	xorg-x11-server.spec 
Log Message:
bump version number


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/OLPC-3/xorg-x11-server.spec,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- xorg-x11-server.spec	2 Sep 2008 21:25:58 -0000	1.342
+++ xorg-x11-server.spec	2 Sep 2008 21:34:00 -0000	1.343
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.906
-Release:   2%{?dist}.2
+Release:   2%{?dist}.3
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X



From pfj at fedoraproject.org  Tue Sep  2 21:45:14 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Tue,  2 Sep 2008 21:45:14 +0000 (UTC)
Subject: rpms/xmms/devel import.log, NONE, 1.1 xmms-1.2.11-alsalib.patch,
	NONE, 
	1.1 xmms-1.2.11-arts.patch, NONE, 1.1 xmms-1.2.11-multilib.patch,
	NONE, 1.1 xmms-1.2.11-nomp3.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4 xmms.spec, 1.35,
	1.36 xmms-1.2.10-joycrash.patch, 1.1,
	NONE xmms-1.2.10-multidevel.patch, 1.1,
	NONE xmms-1.2.10-pls-188603.patch, 1.1,
	NONE xmms-1.2.10-ubuntu-CVE-2007-0653.patch, 1.1,
	NONE xmms-1.2.8-alsalib.patch, 1.1, NONE xmms-1.2.8-arts.patch,
	1.1, NONE xmms-1.2.9-nomp3.patch, 1.1,
	NONE xmms-alsa-backport.patch, 1.1, NONE xmms-underquoted.patch,
	1.1, NONE
Message-ID: <20080902214515.075297011E@cvs1.fedora.phx.redhat.com>

Author: pfj

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

Modified Files:
	.cvsignore sources xmms.spec 
Added Files:
	import.log xmms-1.2.11-alsalib.patch xmms-1.2.11-arts.patch 
	xmms-1.2.11-multilib.patch xmms-1.2.11-nomp3.patch 
Removed Files:
	xmms-1.2.10-joycrash.patch xmms-1.2.10-multidevel.patch 
	xmms-1.2.10-pls-188603.patch 
	xmms-1.2.10-ubuntu-CVE-2007-0653.patch 
	xmms-1.2.8-alsalib.patch xmms-1.2.8-arts.patch 
	xmms-1.2.9-nomp3.patch xmms-alsa-backport.patch 
	xmms-underquoted.patch 
Log Message:

Bump to latest devel branch
Removed patches no longer required
Fixed patches that were out of date
If you are using livna's mp3 plugin, this will not install until they rebuild the version they have! 



--- NEW FILE import.log ---
xmms-1_2_11-1_20071117cvs_fc10:HEAD:xmms-1.2.11-1.20071117cvs.fc10.src.rpm:1220391799

xmms-1.2.11-alsalib.patch:

--- NEW FILE xmms-1.2.11-alsalib.patch ---
--- xmms-1.2.11-20071117cvs/configure	2008-09-02 19:22:09.000000000 +0100
+++ xmms-1.2.11-20071117cvs/configure-new	2008-09-02 21:02:33.000000000 +0100
@@ -30090,8 +30090,6 @@
 #define HAVE_LIBASOUND 1
 _ACEOF
 
-  LIBS="-lasound $LIBS"
-
 else
 
 	 alsa_found=no
@@ -30104,7 +30102,6 @@
    have_alsa=yes
    LIBS=`echo $LIBS | sed 's/-lasound//g'`
    LIBS=`echo $LIBS | sed 's/  //'`
-   LIBS="-lasound $LIBS"
 fi
 if test "x$alsa_found" = "xno" ; then
    have_alsa=no

xmms-1.2.11-arts.patch:

--- NEW FILE xmms-1.2.11-arts.patch ---
--- xmms-1.2.11-20071117cvs/xmms/main.c	2008-09-02 19:08:34.000000000 +0100
+++ xmms-1.2.11-20071117cvs/xmms/main-new.c	2008-09-02 19:16:29.000000000 +0100
@@ -307,6 +307,40 @@
 	sizeof(mainwin_general_menu_entries) / 
 	sizeof(mainwin_general_menu_entries[0]);
 
+#include <kde/artsc/artsc.h>
+#include <dlfcn.h>
+
+/* dlopen libarts, for seeing if we should use this as the default plugin. */
+static int arts_running(void) {
+	void *arts_handle;
+	int (*a_init)(void);
+	void (*a_close)(void);
+	int ret = 0;
+	
+	arts_handle = dlopen("libartsc.so.0", RTLD_NOW);
+	if (!arts_handle)
+		return 0;
+
+	a_init = dlsym(arts_handle, "arts_init");
+	a_close = dlsym(arts_handle, "arts_free");
+	if (!a_init || !a_close) {
+		dlclose(arts_handle);
+		return 0;
+	}
+	signal(SIGPIPE, SIG_DFL);
+	if ((*a_init)() == 0) {
+		ret = 1;
+		/* there are problems with library unloading in conjunction with X11, */
+		/* (Arts::X11GlobalComm), so we don't unload stuff here */
+ 		/* (*a_close)(); */
+	}
+	signal(SIGPIPE, SIG_IGN);
+	dlclose(arts_handle);
+	return ret;
+}
+
+
+
 static void make_xmms_dir(void)
 {
 	gchar *filename;
@@ -503,6 +537,19 @@
 		cfg.skin = g_strdup("/usr/share/xmms/Skins/Bluecurve-xmms.zip");
 	if (cfg.outputplugin == NULL)
 	{
+		/* If aRts is running and the plugin is there, use that... */
+		if (arts_running())
+		{
+			cfg.outputplugin = g_strdup_printf("%s/%s/libarts.so", PLUGIN_DIR, plugin_dir_list[0]);
+			if (access(cfg.outputplugin, X_OK))
+			{
+				g_free(cfg.outputplugin);
+				cfg.outputplugin = NULL;
+			}
+		}
+	}
+	if (cfg.outputplugin == NULL)
+	{
 #ifdef HAVE_OSS
 		cfg.outputplugin = g_strdup_printf("%s/%s/libALSA.so", PLUGIN_DIR, plugin_dir_list[0]);
 #elif defined(sun)
@@ -515,6 +562,13 @@
 		cfg.outputplugin = g_strdup("");
 #endif
 	}
+	/* Migrate users of the previous arts plugin */
+	if (!strcmp(g_basename(cfg.outputplugin),"libartsout.so")) {
+		if (access(cfg.outputplugin,X_OK)) {
+			g_free(cfg.outputplugin);
+			cfg.outputplugin = g_strdup_printf("%s/%s/libarts.so", PLUGIN_DIR, plugin_dir_list[0]);
+		}
+	}
 	if (cfg.eqpreset_default_file == NULL)
 		cfg.eqpreset_default_file = g_strdup("dir_default.preset");
 	if (cfg.eqpreset_extension == NULL)

xmms-1.2.11-multilib.patch:

--- NEW FILE xmms-1.2.11-multilib.patch ---
--- xmms-1.2.11-20071117cvs/configure	2008-09-02 21:03:56.000000000 +0100
+++ xmms-1.2.11-20071117cvs/configure-new	2008-09-02 21:36:04.000000000 +0100
@@ -33510,7 +33510,7 @@
 
 
 
-                                                                                                                                                                                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visualization/blur_scope/Mak
 efile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile"
+                                                                                                                                                                                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms.pc xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visualization/blur_s
 cope/Makefile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile"
           ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -34178,6 +34178,7 @@
   "wmxmms.1" ) CONFIG_FILES="$CONFIG_FILES wmxmms.1" ;;
   "xmms.spec" ) CONFIG_FILES="$CONFIG_FILES xmms.spec" ;;
   "xmms-config" ) CONFIG_FILES="$CONFIG_FILES xmms-config" ;;
+  "xmms.pc" ) CONFIG_FILES="$CONFIG_FILES xmms.pc" ;;
   "xmms/Makefile" ) CONFIG_FILES="$CONFIG_FILES xmms/Makefile" ;;
   "xmms/defskin/Makefile" ) CONFIG_FILES="$CONFIG_FILES xmms/defskin/Makefile" ;;
   "Output/Makefile" ) CONFIG_FILES="$CONFIG_FILES Output/Makefile" ;;
--- xmms-1.2.11-20071117cvs/xmms-config.in	2001-04-06 01:35:49.000000000 +0100
+++ xmms-1.2.11-20071117cvs/xmms-config-new.in	2008-09-02 22:23:29.000000000 +0100
@@ -18,24 +18,6 @@
 data_dir="@datadir@/@PACKAGE@"
 
 version="@VERSION@"
-include_dir="@includedir@"
-xmms_include_dir="@includedir@/@PACKAGE@"
-lib_dir="@libdir@"
-
-if ( (gtk-config --version) > /dev/null 2>&1)  then
-   gtk_libs=`gtk-config --libs`
-   gtk_cflags=`gtk-config --cflags`
-else
-   gtk_libs="@GTK_LIBS@"
-   gtk_cflags="@GTK_CFLAGS@"
-fi
-
-plugin_dir="@plugindir@"
-visualization_plugin_dir="@plugindir@/@VISUALIZATION_PLUGIN_DIR@"
-input_plugin_dir="@plugindir@/@INPUT_PLUGIN_DIR@"
-output_plugin_dir="@plugindir@/@OUTPUT_PLUGIN_DIR@"
-effect_plugin_dir="@plugindir@/@EFFECT_PLUGIN_DIR@"
-general_plugin_dir="@plugindir@/@GENERAL_PLUGIN_DIR@"
 
 usage()
 {
@@ -146,24 +128,12 @@
     echo $exec_prefix
 fi
 
-if test "$include_dir" != "/usr/include"; then
-    cflags="-I$include_dir -I$xmms_include_dir $gtk_cflags"
-else
-    cflags="-I$xmms_include_dir $gtk_cflags"
-fi
-
-if test "$lib_dir" != "/usr/lib"; then
-    libs="-L$lib_dir $gtk_libs -lxmms"
-else
-    libs="$gtk_libs -lxmms"
-fi
-
 if test "$echo_cflags" = "yes"; then
-    echo $cflags
+    pkg-config xmms --cflags
 fi
 
 if test "$echo_libs" = "yes"; then
-    echo $libs
+    pkg-config xmms --libs
 fi
 
 if test "$echo_data_dir" = "yes"; then
@@ -171,25 +141,25 @@
 fi
 
 if test "$echo_plugin_dir" = "yes"; then
-    echo $plugin_dir
+    pkg-config xmms --variable=plugin_dir
 fi
 
 if test "$echo_visualization_plugin_dir" = "yes"; then
-    echo $visualization_plugin_dir
+    pkg-config xmms --variable=visualization_plugin_dirr
 fi
 
 if test "$echo_input_plugin_dir" = "yes"; then
-    echo $input_plugin_dir
+    pkg-config xmms --variable=input_plugin_dir
 fi
 
 if test "$echo_output_plugin_dir" = "yes"; then
-    echo $output_plugin_dir
+    pkg-config xmms --variable=output_plugin_dir
 fi
 
 if test "$echo_general_plugin_dir" = "yes"; then
-    echo $general_plugin_dir
+    pkg-config xmms --variable=general_plugin_dir
 fi
 
 if test "$echo_effect_plugin_dir" = "yes"; then
-    echo $effect_plugin_dir
+    pkg-config xmms --variable=effect_plugin_dir
 fi

--- xmms-1.2.10/xmms.pc.in~	2006-05-24 23:54:59.000000000 +0300
+++ xmms-1.2.10/xmms.pc.in	2006-05-24 23:54:48.000000000 +0300
@@ -0,0 +1,18 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+data_dir=@datadir@
+plugin_dir=@plugindir@
+visualization_plugin_dir=${plugin_dir}/@VISUALIZATION_PLUGIN_DIR@
+input_plugin_dir=${plugin_dir}/@INPUT_PLUGIN_DIR@
+output_plugin_dir=${plugin_dir}/@OUTPUT_PLUGIN_DIR@
+effect_plugin_dir=${plugin_dir}/@EFFECT_PLUGIN_DIR@
+general_plugin_dir=${plugin_dir}/@GENERAL_PLUGIN_DIR@
+
+Name: XMMS
+Description: The X MultiMedia System, a media player
+Version: @VERSION@
+Requires: gtk+
+Libs: -L${libdir} -lxmms
+Cflags: -I${includedir} -I${includedir}/@PACKAGE@


xmms-1.2.11-nomp3.patch:

--- NEW FILE xmms-1.2.11-nomp3.patch ---
--- xmms-1.2.11-20071117cvs/xmms/input.c	2005-05-15 22:46:35.000000000 +0100
+++ xmms-1.2.11-20071117cvs/xmms/input-new.c	2008-09-02 19:07:19.000000000 +0100
@@ -17,6 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+#define _GNU_SOURCE 1
 #include "xmms.h"
 #include "fft.h"
 #include "libxmms/titlestring.h"
@@ -228,16 +229,21 @@
 {
 	GList *node;
 	InputPlugin *ip;
-
+	InputPlugin *rhmp3 = NULL;
 	node = get_input_list();
 	while (node)
 	{
 		ip = (InputPlugin *) node->data;
-		if (ip && !g_list_find(disabled_iplugins, ip) &&
+		if (ip && !strcmp(basename(ip->filename),"librh_mp3.so"))
+			rhmp3 = ip;
+		else if (ip && !g_list_find(disabled_iplugins, ip) &&
 		    ip->is_our_file(filename))
 			return TRUE;
 		node = node->next;
 	}
+	if (rhmp3 && !g_list_find(disabled_iplugins, rhmp3) &&
+	    rhmp3->is_our_file(filename))
+		return TRUE;
 	return FALSE;
 }
 
@@ -245,7 +251,7 @@
 {
 	GList *node;
 	InputPlugin *ip;
-
+	InputPlugin *rhmp3 = NULL;
 	node = get_input_list();
 	if (get_current_output_plugin() == NULL)
 	{
@@ -263,8 +269,9 @@
 	while (node)
 	{
 		ip = node->data;
-		if (ip && !g_list_find(disabled_iplugins, ip) &&
-		    ip->is_our_file(filename))
+		if (ip && !strcmp(basename(ip->filename),"librh_mp3.so"))
+			rhmp3 = ip;
+		else if (ip && !g_list_find(disabled_iplugins, ip) && 			    ip->is_our_file(filename))
 		{
 			set_current_input_plugin(ip);
 			ip->output = get_current_output_plugin();
@@ -274,6 +281,15 @@
 		}
 		node = node->next;
 	}
+	if (rhmp3 && !g_list_find(disabled_iplugins, rhmp3) &&
+	    rhmp3->is_our_file(filename))
+	{
+		set_current_input_plugin(rhmp3);
+		rhmp3->output = get_current_output_plugin();
+		rhmp3->play_file(filename);
+		ip_data->playing = TRUE;
+		return;
+	}
 	set_current_input_plugin(NULL);
 }
 
 
--- xmms-1.2.11-20071117cvs/Input/Makefile.am	2002-03-15 23:10:06.000000000 +0000
+++ xmms-1.2.11-20071117cvs/Input/Makefile-new.am	2008-09-02 13:50:06.000000000 +0100
@@ -1,3 +1,3 @@
-ALL_PLUGINS = wav mpg123 mikmod cdaudio tonegen vorbis
+ALL_PLUGINS = wav mikmod cdaudio tonegen vorbis
 SUBDIRS = @INPUT_PLUGINS@
 
--- xmms-1.2.11-20071117cvs/Input/Makefile.in	2007-11-17 22:45:30.000000000 +0000
+++ xmms-1.2.11-20071117cvs/Input/Makefile-new.in	2008-09-02 13:51:16.000000000 +0100
@@ -260,7 +260,7 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 xmmsdir = @xmmsdir@
-ALL_PLUGINS = wav mpg123 mikmod cdaudio tonegen vorbis
+ALL_PLUGINS = wav mikmod cdaudio tonegen vorbis
 SUBDIRS = @INPUT_PLUGINS@
 all: all-recursive
 
--- xmms-1.2.11-20071117cvs/po/POTFILES.in	2004-01-17 22:45:07.000000000 +0000
+++ xmms-1.2.11-20071117cvs/po/POTFILES-new.in	2008-09-02 13:52:14.000000000 +0100
@@ -19,11 +19,6 @@
 Input/cdaudio/http.c
 Input/mikmod/drv_xmms.c
 Input/mikmod/plugin.c
-Input/mpg123/common.c
-Input/mpg123/configure.c
-Input/mpg123/fileinfo.c
-Input/mpg123/http.c
-Input/mpg123/mpg123.c
 Input/tonegen/tonegen.c
 Input/vorbis/configure.c
 Input/vorbis/fileinfo.c

--- xmms-1.2.9/configure.cow	2004-01-28 21:14:46.418517318 -0500
+++ xmms-1.2.9/configure	2004-01-28 21:14:57.290123348 -0500
@@ -19192,7 +19192,7 @@
 
 
 
-                                                                                                                                                                                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mpg123/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visual
 ization/blur_scope/Makefile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile"
+                                                                                                                                                                                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visualization/blur_scope/Mak
 efile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile"
           ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -19863,7 +19863,6 @@
   "Output/alsa/Makefile" ) CONFIG_FILES="$CONFIG_FILES Output/alsa/Makefile" ;;
   "Input/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/Makefile" ;;
   "Input/wav/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/wav/Makefile" ;;
-  "Input/mpg123/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/mpg123/Makefile" ;;
   "Input/mikmod/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/mikmod/Makefile" ;;
   "Input/cdaudio/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/cdaudio/Makefile" ;;
   "Input/tonegen/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/tonegen/Makefile" ;;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmms/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Apr 2005 20:07:18 -0000	1.3
+++ .cvsignore	2 Sep 2008 21:44:44 -0000	1.4
@@ -1 +1 @@
-xmms-1.2.10.patched.tar.bz2
+xmms-1.2.11-20071117cvs.patched.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmms/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Apr 2005 20:07:18 -0000	1.3
+++ sources	2 Sep 2008 21:44:44 -0000	1.4
@@ -1 +1 @@
-16414f1c15f0b87c3ee6362a7dcf4e7e  xmms-1.2.10.patched.tar.bz2
+4b96f79ab252fa790341a1fa80cc081c  xmms-1.2.11-20071117cvs.patched.tar.bz2


Index: xmms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xmms.spec	12 Aug 2008 01:33:54 -0000	1.35
+++ xmms.spec	2 Sep 2008 21:44:44 -0000	1.36
@@ -1,39 +1,34 @@
 Name:           xmms
-Version:        1.2.10
-Release:        39%{?dist}
+Version:        1.2.11
+Release:        1.20071117cvs%{?dist}
 Epoch:          1
 Summary:        The X MultiMedia System, a media player
 
 Group:          Applications/Multimedia
-License:        GPLv2+
+License:        GPLv2
 URL:            http://www.xmms.org/
 # http://www.xmms.org/download.php, to recreate the tarball:
 # $ wget http://www.xmms.org/files/1.2.x/xmms-1.2.10.tar.bz2
 # $ tar jx --exclude "mpg123*" -f xmms-1.2.10.tar.bz2
 # $ tar jcf xmms-1.2.10.patched.tar.bz2 xmms-1.2.10
-Source0:        %{name}-%{version}.patched.tar.bz2
+Source0:        %{name}-%{version}-20071117cvs.patched.tar.bz2
 Source1:        xmms.sh
 Source2:        xmms.xpm
 Source3:        rh_mp3.c
 # http://cvs.xmms.org/cvsweb.cgi/xmms/General/joystick/joy.c.diff?r1=1.8&r2=1.9
-Patch0:         %{name}-1.2.10-joycrash.patch
 Patch1:         %{name}-1.2.6-audio.patch
 Patch2:         %{name}-1.2.6-lazy.patch
 Patch3:         %{name}-1.2.8-default-skin.patch
-Patch4:         %{name}-1.2.9-nomp3.patch
-Patch5:         %{name}-1.2.8-arts.patch
-Patch6:         %{name}-1.2.8-alsalib.patch
+Patch4:         %{name}-1.2.11-nomp3.patch
+Patch5:         %{name}-1.2.11-arts.patch
+Patch6:         %{name}-1.2.11-alsalib.patch
 Patch7:         %{name}-cd-mountpoint.patch
 # Patch8 on top of patch4
-Patch8:         %{name}-1.2.10-multidevel.patch
-Patch9:         %{name}-underquoted.patch
-Patch10:        %{name}-alsa-backport.patch
+Patch8:         %{name}-1.2.11-multilib.patch
 Patch11:        %{name}-1.2.10-gcc4.patch
 Patch12:        %{name}-1.2.10-crossfade-0.3.9.patch
-Patch13:        %{name}-1.2.10-pls-188603.patch
 Patch14:	%{name}-1.2.10-configfile-safe-write.patch
 Patch15:	%{name}-1.2.10-reposition.patch
-Patch16:	%{name}-1.2.10-ubuntu-CVE-2007-0653.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk+-devel
@@ -87,9 +82,7 @@
 
 
 %prep
-%setup -q 
-# Fix joystick plugin crashes
-%patch0 -p1 -b .joycrash
+%setup -q -n %{name}-%{version}-20071117cvs
 # Set default output plugin to ALSA
 %patch1 -p1 -b .audio
 # Use RTLD_LAZY, not RTLD_NOW
@@ -106,19 +99,11 @@
 %patch7 -p0 -b .cd-mountpoint
 # Avoid multilib devel conflicts
 %patch8 -p1 -b .multidevel
-# Fix m4 underquoted warning
-%patch9 -p1 -b .underquoted
-# Backport for recent ALSA
-%patch10 -p0 -b .alsa-backport
-# Fix compilation with gcc4
-%patch11 -p1 -b .gcc4
 # Fix for crossfade >= 0.3.9 to work properly
 %patch12 -p1 -b .crossfade
 # Randomize playlists better
-%patch13 -p1 -b .pls
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
 # Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it
 sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure
 
@@ -230,8 +215,11 @@
 
 
 %changelog
-* Mon Aug 11 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.2.10-39
-- Fix license tag.
+* Tue Sep 02 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.11-20071117cvs-1
+- Bump to 1.2.11 devel branch
+- Alter license
+- Removed unused patches
+- Fixed old patches to work with new version
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:1.2.10-38
 - Autorebuild for GCC 4.3


--- xmms-1.2.10-joycrash.patch DELETED ---


--- xmms-1.2.10-multidevel.patch DELETED ---


--- xmms-1.2.10-pls-188603.patch DELETED ---


--- xmms-1.2.10-ubuntu-CVE-2007-0653.patch DELETED ---


--- xmms-1.2.8-alsalib.patch DELETED ---


--- xmms-1.2.8-arts.patch DELETED ---


--- xmms-1.2.9-nomp3.patch DELETED ---


--- xmms-alsa-backport.patch DELETED ---


--- xmms-underquoted.patch DELETED ---



From dsd at fedoraproject.org  Tue Sep  2 21:49:56 2008
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  2 Sep 2008 21:49:56 +0000 (UTC)
Subject: rpms/gnash/OLPC-3 gnash.spec,1.21,1.22
Message-ID: <20080902214956.A990E7011D@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/gnash/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6049

Modified Files:
	gnash.spec 
Log Message:
rebuild against reverted gstreamer components


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-3/gnash.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnash.spec	25 Jun 2008 12:34:10 -0000	1.21
+++ gnash.spec	2 Sep 2008 21:49:26 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           gnash
 Version:        0.8.3
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        GNU flash movie player
 Patch0:         gnash-0.8.3-link-glib.patch
 
@@ -164,6 +164,9 @@
 %{_libdir}/mozilla/plugins/libgnashplugin.so
 
 %changelog
+* Tue Sep  2 2008 Daniel Drake <dsd at laptop.org> 0.8.3-1.1
+- rebuild against reverted gstreamer components
+
 * Sun Jun 25 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> 0.8.3-1
 - update to 0.8.3 and adapt to OLPC
 



From orion at fedoraproject.org  Tue Sep  2 21:53:26 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue,  2 Sep 2008 21:53:26 +0000 (UTC)
Subject: rpms/cmake/devel cmake.spec, 1.40, 1.41 cmake-2.4.5-xmlrpc.patch,
	1.2, NONE cmake-2.6.1-jni.patch, 1.1, NONE
Message-ID: <20080902215326.EF0537011D@cvs1.fedora.phx.redhat.com>

Author: orion

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

Modified Files:
	cmake.spec 
Removed Files:
	cmake-2.4.5-xmlrpc.patch cmake-2.6.1-jni.patch 
Log Message:
* Tue Sep 2 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.1-3
- Drop jni patch, applied upstream.



Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cmake.spec	26 Aug 2008 20:16:52 -0000	1.40
+++ cmake.spec	2 Sep 2008 21:52:56 -0000	1.41
@@ -4,7 +4,7 @@
 
 Name:           cmake
 Version:        2.6.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -12,13 +12,8 @@
 URL:            http://www.cmake.org
 Source0:        http://www.cmake.org/files/v2.6/cmake-%{version}.tar.gz
 Source2:        macros.cmake
-#Patch to look for jni files where Fedora puts them.
-#Submitted upstream: http://public.kitware.com/Bug/view.php?id=7333
-Patch0:         cmake-2.6.1-jni.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# fix a crasher, see 
-# http://www.redhat.com/archives/fedora-devel-list/2008-August/msg01145.html
+#See http://public.kitware.com/Bug/view.php?id=7392
 Patch1:         cmake-2.6.1-parens.patch   
 
 BuildRequires:  ncurses-devel, libX11-devel
@@ -48,10 +43,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-
-%patch0 -p1 -b .jni
 %patch1 -p1 -b .parens
-
 # Fixup permissions
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
@@ -122,6 +114,9 @@
 
 
 %changelog
+* Tue Sep 2 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.1-3
+- Drop jni patch, applied upstream.
+
 * Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.6.1-2
 - attempt to patch logic error, crasher
 


--- cmake-2.4.5-xmlrpc.patch DELETED ---


--- cmake-2.6.1-jni.patch DELETED ---



From dsd at fedoraproject.org  Tue Sep  2 21:57:14 2008
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  2 Sep 2008 21:57:14 +0000 (UTC)
Subject: rpms/gnash/OLPC-3 gnash.spec,1.22,1.23
Message-ID: <20080902215714.533637011D@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/gnash/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7291

Modified Files:
	gnash.spec 
Log Message:
retag


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-3/gnash.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnash.spec	2 Sep 2008 21:49:26 -0000	1.22
+++ gnash.spec	2 Sep 2008 21:56:44 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           gnash
 Version:        0.8.3
-Release:        1%{?dist}.1
+Release:        1%{?dist}.2
 Summary:        GNU flash movie player
 Patch0:         gnash-0.8.3-link-glib.patch
 
@@ -164,6 +164,9 @@
 %{_libdir}/mozilla/plugins/libgnashplugin.so
 
 %changelog
+* Tue Sep  2 2008 Daniel Drake <dsd at laptop.org> 0.8.3-1.2
+- retag
+
 * Tue Sep  2 2008 Daniel Drake <dsd at laptop.org> 0.8.3-1.1
 - rebuild against reverted gstreamer components
 



From orion at fedoraproject.org  Tue Sep  2 21:57:39 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue,  2 Sep 2008 21:57:39 +0000 (UTC)
Subject: rpms/cmake/F-9 cmake-2.6.1-parens.patch, NONE, 1.1 cmake.spec, 1.30,
	1.31 sources, 1.14, 1.15 cmake-2.4.2-fedora.patch, 1.3,
	NONE cmake-2.4.5-xmlrpc.patch, 1.2, NONE
Message-ID: <20080902215739.55F747011D@cvs1.fedora.phx.redhat.com>

Author: orion

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

Modified Files:
	cmake.spec sources 
Added Files:
	cmake-2.6.1-parens.patch 
Removed Files:
	cmake-2.4.2-fedora.patch cmake-2.4.5-xmlrpc.patch 
Log Message:
Update to 2.6.1 from current devel branch.


cmake-2.6.1-parens.patch:

--- NEW FILE cmake-2.6.1-parens.patch ---
diff -up cmake-2.6.1/Source/cmELF.cxx.parens cmake-2.6.1/Source/cmELF.cxx
--- cmake-2.6.1/Source/cmELF.cxx.parens	2008-08-01 10:34:52.000000000 -0500
+++ cmake-2.6.1/Source/cmELF.cxx	2008-08-26 14:58:23.000000000 -0500
@@ -884,8 +884,8 @@ cmELF::StringEntry const* cmELF::GetSONa
 cmELF::StringEntry const* cmELF::GetRPath()
 {
   if(this->Valid() &&
-     this->Internal->GetFileType() == cmELF::FileTypeExecutable ||
-     this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary)
+     (this->Internal->GetFileType() == cmELF::FileTypeExecutable ||
+     this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary) )
     {
     return this->Internal->GetRPath();
     }
@@ -899,8 +899,8 @@ cmELF::StringEntry const* cmELF::GetRPat
 cmELF::StringEntry const* cmELF::GetRunPath()
 {
   if(this->Valid() &&
-     this->Internal->GetFileType() == cmELF::FileTypeExecutable ||
-     this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary)
+     (this->Internal->GetFileType() == cmELF::FileTypeExecutable ||
+     this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary) )
     {
     return this->Internal->GetRunPath();
     }


Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-9/cmake.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cmake.spec	28 Mar 2008 15:11:31 -0000	1.30
+++ cmake.spec	2 Sep 2008 21:57:09 -0000	1.31
@@ -2,20 +2,22 @@
 # or architecture
 %bcond_with bootstrap
 
-Name:		cmake
-Version:	2.4.8
-Release:	3%{?dist}
-Summary:	Cross-platform make system
-
-Group:		Development/Tools
-License:	BSD
-URL:		http://www.cmake.org
-Source0:	http://www.cmake.org/files/v2.4/cmake-%{version}.tar.gz
+Name:           cmake
+Version:        2.6.1
+Release:        3%{?dist}
+Summary:        Cross-platform make system
+
+Group:          Development/Tools
+License:        BSD
+URL:            http://www.cmake.org
+Source0:        http://www.cmake.org/files/v2.6/cmake-%{version}.tar.gz
 Source2:        macros.cmake
-Patch0:         cmake-2.4.2-fedora.patch
-Patch1:         cmake-2.4.5-xmlrpc.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#See http://public.kitware.com/Bug/view.php?id=7392
+Patch1:         cmake-2.6.1-parens.patch   
+
 BuildRequires:  ncurses-devel, libX11-devel
+BuildRequires:  qt4-devel, desktop-file-utils
 BuildRequires:  curl-devel, expat-devel, zlib-devel
 %{?!with_bootstrap:BuildRequires: xmlrpc-c-devel}
 Requires:       rpm
@@ -30,18 +32,30 @@
 generation, code generation, and template instantiation.
 
 
+%package        gui
+Summary:        Qt GUI for %{name}
+Group:          Development/Tools
+Requires:       %{name} = %{version}-%{release}
+
+%description    gui
+The %{name}-gui package contains the Qt based GUI for CMake.
+
+
 %prep
-%setup -q
-%patch -p1 -b .fedora
-%patch1 -p1 -b .xmlrpc
+%setup -q -n %{name}-%{version}
+%patch1 -p1 -b .parens
+# Fixup permissions
+find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
-./bootstrap --init=%SOURCE1 --prefix=%{_prefix} --datadir=/share/%{name} \
+./bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \
             --docdir=/share/doc/%{name}-%{version} --mandir=/share/man \
-            --%{?with_bootstrap:no-}system-libs
+            --%{?with_bootstrap:no-}system-libs \
+            --parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \
+            --qt-gui
 make VERBOSE=1 %{?_smp_mflags}
 
 
@@ -55,16 +69,30 @@
 # RPM macros
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
+# Desktop file
+desktop-file-install --delete-original \
+  --dir=%{buildroot}%{_datadir}/applications \
+  %{buildroot}/%{_datadir}/applications/CMake.desktop
 
 
 %check
-ctest -V
+unset DISPLAY
+bin/ctest -V
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post gui
+update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+
+%postun gui
+update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/rpm/macros.cmake
@@ -77,8 +105,47 @@
 %{_mandir}/man1/*.1*
 %{_datadir}/emacs/
 
+%files gui
+%defattr(-,root,root,-)
+%{_bindir}/cmake-gui
+%{_datadir}/applications/CMake.desktop
+%{_datadir}/mime/packages/cmakecache.xml
+%{_datadir}/pixmaps/CMakeSetup.png
+
 
 %changelog
+* Tue Sep 2 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.1-3
+- Drop jni patch, applied upstream.
+
+* Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.6.1-2
+- attempt to patch logic error, crasher
+
+* Tue Aug 5 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.1-1
+- Update to 2.6.1
+
+* Mon Jul 14 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.1-0.rc8.1
+- Update to 2.6.1-RC-8
+- Drop xmlrpc patch fixed upstream
+
+* Tue May 6 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-1
+- Update to 2.6.0
+
+* Mon May 5 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-0.rc10.1
+- Update to 2.6.0-RC-10
+
+* Thu Apr 24 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-0.rc9.1
+- Update to 2.6.0-RC-9
+
+* Fri Apr 11 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-0.rc8.1
+- Update to 2.6.0-RC-8
+
+* Thu Apr 3 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-0.rc6.1
+- Update to 2.6.0-RC-6
+
+* Fri Mar 28 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-0.rc5.1
+- Update to 2.6.0-RC-5
+- Add gui sub-package for Qt frontend
+
 * Fri Mar 7 2008 Orion Poplawski <orion at cora.nwra.com> - 2.4.8-3
 - Add macro for bootstrapping new release/architecture
 - Add %%check section


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	22 Jan 2008 22:47:30 -0000	1.14
+++ sources	2 Sep 2008 21:57:09 -0000	1.15
@@ -1 +1 @@
-f5dd061c31765a49dc17ae8bdc986779  cmake-2.4.8.tar.gz
+6717f4bc3cfcced4172ad98660ce7599  cmake-2.6.1.tar.gz


--- cmake-2.4.2-fedora.patch DELETED ---


--- cmake-2.4.5-xmlrpc.patch DELETED ---



From mclasen at fedoraproject.org  Tue Sep  2 21:58:16 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  2 Sep 2008 21:58:16 +0000 (UTC)
Subject: rpms/glib2/devel .cvsignore, 1.94, 1.95 glib2.spec, 1.181,
	1.182 sources, 1.96, 1.97
Message-ID: <20080902215816.14C007011D@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- .cvsignore	22 Aug 2008 15:49:17 -0000	1.94
+++ .cvsignore	2 Sep 2008 21:57:45 -0000	1.95
@@ -1 +1 @@
-glib-2.17.7.tar.bz2
+glib-2.18.0.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/extras/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- glib2.spec	22 Aug 2008 15:49:17 -0000	1.181
+++ glib2.spec	2 Sep 2008 21:57:45 -0000	1.182
@@ -2,12 +2,12 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.17.7
+Version: 2.18.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
-Source: http://download.gnome.org/sources/glib/2.17/glib-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/glib/2.18/glib-%{version}.tar.bz2
 Source2: glib2.sh
 Source3: glib2.csh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -133,6 +133,9 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.18.0-1
+- Update to 2.18.0
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.17.7-1
 - Update to 2.17.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glib2/devel/sources,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- sources	22 Aug 2008 15:49:17 -0000	1.96
+++ sources	2 Sep 2008 21:57:45 -0000	1.97
@@ -1 +1 @@
-50abcc857a93498fe7d8d0bda2ed2805  glib-2.17.7.tar.bz2
+06e5afe4ce055085dc5fd9fdab527bf7  glib-2.18.0.tar.bz2



From mstone at fedoraproject.org  Tue Sep  2 22:05:50 2008
From: mstone at fedoraproject.org (Michael Stone)
Date: Tue,  2 Sep 2008 22:05:50 +0000 (UTC)
Subject: rpms/rainbow/F-9 .cvsignore, 1.8, 1.9 rainbow.spec, 1.8, 1.9 sources,
	1.8, 1.9
Message-ID: <20080902220550.E346F7011D@cvs1.fedora.phx.redhat.com>

Author: mstone

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

Modified Files:
	.cvsignore rainbow.spec sources 
Log Message:
- Michael Stone (6):
    dlo#7921: Read ~/.i18n and set $LANG before importing gtk.
    Always call setgroups().
    dlo#6465: Make a 'constant-uid' bundle permission.
    Ensure that $HOME exists regardless of what useradd tells you.
    Make the instance directory setgid.
    Clean /home/olpc/.i18n before passing its contents to arbitrary uid-0 code.
- Simon Schampijer (1):
    dlo#5428: downloads not starting in Browse due to old compreg.dat



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Aug 2008 22:38:37 -0000	1.8
+++ .cvsignore	2 Sep 2008 22:05:20 -0000	1.9
@@ -1 +1 @@
-rainbow-0.7.19.tar.bz2
+rainbow-0.7.20.tar.bz2


Index: rainbow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/F-9/rainbow.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rainbow.spec	4 Aug 2008 22:38:37 -0000	1.8
+++ rainbow.spec	2 Sep 2008 22:05:20 -0000	1.9
@@ -3,7 +3,7 @@
 %{!?python_version: %define python_version %(%{__python} -c "import sys; print sys.version[0:3]")}
 
 Name:           rainbow
-Version:        0.7.19
+Version:        0.7.20
 Release:        1%{?dist}
 Summary:        The OLPC security service
 
@@ -81,6 +81,17 @@
 %{python_sitelib}/%{name}-%{version}-py%{python_version}.egg-info/*
 
 %changelog
+* Tue Sep 02 2008 Michael Stone <michael at laptop.org> - 0.7.20-1.olpc3
+- Michael Stone (6):
+    dlo#7921: Read ~/.i18n and set $LANG before importing gtk.
+    Always call setgroups().
+    dlo#6465: Make a 'constant-uid' bundle permission.
+    Ensure that $HOME exists regardless of what useradd tells you.
+    Make the instance directory setgid.
+    Clean /home/olpc/.i18n before passing its contents to arbitrary uid-0 code.
+- Simon Schampijer (1):
+    dlo#5428: downloads not starting in Browse due to old compreg.dat
+
 * Mon Aug 04 2008 Michael Stone <michael at laptop.org> - 0.7.19-1.olpc3
 - Michael Stone (1):
     Adjust the rainbow startup and logging logic.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Aug 2008 22:38:37 -0000	1.8
+++ sources	2 Sep 2008 22:05:20 -0000	1.9
@@ -1 +1 @@
-2d1d15cfd9f6cca1b8c338e0712eb00c  rainbow-0.7.19.tar.bz2
+8a4306c406045f89640c248191b9af06  rainbow-0.7.20.tar.bz2



From rishi at fedoraproject.org  Tue Sep  2 22:11:01 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue,  2 Sep 2008 22:11:01 +0000 (UTC)
Subject: rpms/libical/F-8 libical-0.32-makefile.patch, NONE, 1.1 .cvsignore, 
	1.3, 1.4 libical.spec, 1.7, 1.8 sources, 1.3,
	1.4 libical-0.31-makefile.patch, 1.1, NONE
Message-ID: <20080902221101.CC7177011D@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libical/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9356

Modified Files:
	.cvsignore libical.spec sources 
Added Files:
	libical-0.32-makefile.patch 
Removed Files:
	libical-0.31-makefile.patch 
Log Message:
* Tue Sep 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.32-1
- Version bump to 0.32.
- Parallel build problems fixed.


libical-0.32-makefile.patch:

--- NEW FILE libical-0.32-makefile.patch ---
diff -urNp libical-0.32.orig/src/libical/Makefile.in libical-0.32/src/libical/Makefile.in
--- libical-0.32.orig/src/libical/Makefile.in	2008-09-02 00:06:16.000000000 +0530
+++ libical-0.32/src/libical/Makefile.in	2008-09-02 20:02:36.195993974 +0530
@@ -103,7 +103,7 @@ am_libical_la_OBJECTS = $(am__objects_2)
 	icalduration.lo icalperiod.lo icaltypes.lo icalvalue.lo pvl.lo \
 	sspm.lo vsnprintf.lo icallangbind.lo caldate.lo
 libical_la_OBJECTS = $(am_libical_la_OBJECTS)
-libical_cxx_la_LIBADD =
+libical_cxx_la_LIBADD = $(PTHREAD_LIBS)
 am__libical_cxx_la_SOURCES_DIST = icalderivedparameter.h \
 	icalderivedproperty.h icalderivedvalue.h \
 	icalderivedparameter.c icalderivedproperty.c icalrestriction.c \
diff -urNp libical-0.32.orig/src/libicalss/Makefile.in libical-0.32/src/libicalss/Makefile.in
--- libical-0.32.orig/src/libicalss/Makefile.in	2008-09-02 00:06:16.000000000 +0530
+++ libical-0.32/src/libicalss/Makefile.in	2008-09-02 21:56:38.509744465 +0530
@@ -100,7 +100,6 @@ am_libicalss_la_OBJECTS = icalcalendar.l
 	icalset.lo icalspanlist.lo icalmessage.lo $(am__objects_1) \
 	$(am__objects_2)
 libicalss_la_OBJECTS = $(am_libicalss_la_OBJECTS)
-libicalss_cxx_la_LIBADD =
 am__libicalss_cxx_la_SOURCES_DIST = icalspanlist_cxx.h \
 	icalspanlist_cxx.cpp
 @WITH_CXX_BINDINGS_TRUE at am_libicalss_cxx_la_OBJECTS =  \
@@ -307,7 +306,7 @@ INCLUDES = \
 	$(BDB_INCLUDE)
 
 libicalss_la_LDFLAGS = -version-info 32:0:32
-libicalss_la_LIBADD = $(BDB_LIBFILES) 
+libicalss_la_LIBADD = $(BDB_LIBFILES) ../libical/libical.la
 @DEV_FALSE at libicalss_la_DEVSOURCES = icalsslexer.c icalssyacc.c
 @DEV_TRUE at libicalss_la_DEVSOURCES = icalsslexer.l icalssyacc.y
 libicalss_la_SOURCES = \
@@ -350,6 +349,8 @@ COMBINEDHEADERS = \
 	$(srcdir)/icalspanlist.h	\
 	$(srcdir)/icalmessage.h
 
+libicalss_cxx_la_LIBADD = ./libicalss.la ../libical/libical_cxx.la
+libicalss_cxx_la_DEPENDENCIES = ./libicalss.la ../libical/libical_cxx.la
 @WITH_CXX_BINDINGS_TRUE at libicalss_cxx_la_SOURCES = \
 @WITH_CXX_BINDINGS_TRUE@	$(libicalss_evolution_la_SOURCES)	\
 @WITH_CXX_BINDINGS_TRUE@	icalspanlist_cxx.h	\
diff -urNp libical-0.32.orig/src/test/Makefile.in libical-0.32/src/test/Makefile.in
--- libical-0.32.orig/src/test/Makefile.in	2008-09-02 00:06:17.000000000 +0530
+++ libical-0.32/src/test/Makefile.in	2008-09-02 21:30:44.140744843 +0530
@@ -78,10 +78,11 @@ recur_LDADD = $(LDADD)
 recur_DEPENDENCIES = ../libicalss/libicalss.la \
 	../libicalvcal/libicalvcal.la $(am__DEPENDENCIES_1) \
 	../libical/libical.la $(am__DEPENDENCIES_2)
+ at WITH_CXX_BINDINGS_TRUE@am__objects_1 = regression-cxx.$(OBJEXT)
 am_regression_OBJECTS = regression.$(OBJEXT) \
 	regression-component.$(OBJEXT) regression-classify.$(OBJEXT) \
 	regression-utils.$(OBJEXT) regression-recur.$(OBJEXT) \
-	regression-storage.$(OBJEXT)
+	regression-storage.$(OBJEXT) $(am__objects_1)
 regression_OBJECTS = $(am_regression_OBJECTS)
 regression_LDADD = $(LDADD)
 regression_DEPENDENCIES = ../libicalss/libicalss.la \
@@ -116,6 +117,11 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
 SOURCES = $(copycluster_SOURCES) $(parser_SOURCES) $(process_SOURCES) \
 	$(recur_SOURCES) $(regression_SOURCES) $(stow_SOURCES) \
 	$(testmime_SOURCES) $(testvcal_SOURCES)
@@ -270,13 +276,6 @@ target_vendor = @target_vendor@
 @WITH_CXX_BINDINGS_FALSE at cxx_libs = 
 @WITH_CXX_BINDINGS_TRUE at cxx_libs = ../libical/libical_cxx.la
 @WITH_CXX_BINDINGS_TRUE at regression_cxx_SOURCES = \
- at WITH_CXX_BINDINGS_TRUE@	regression.c		\
- at WITH_CXX_BINDINGS_TRUE@	regression.h		\
- at WITH_CXX_BINDINGS_TRUE@	regression-component.c	\
- at WITH_CXX_BINDINGS_TRUE@	regression-classify.c	\
- at WITH_CXX_BINDINGS_TRUE@	regression-utils.c	\
- at WITH_CXX_BINDINGS_TRUE@	regression-recur.c	\
- at WITH_CXX_BINDINGS_TRUE@	regression-storage.c	\
 @WITH_CXX_BINDINGS_TRUE@	regression-cxx.cpp
 
 @WITH_BDB4_FALSE at bdb4_inc = 
@@ -301,7 +300,8 @@ regression_SOURCES = \
 	regression-classify.c	\
 	regression-utils.c	\
 	regression-recur.c	\
-	regression-storage.c
+	regression-storage.c	\
+	$(regression_cxx_SOURCES)
 
 TESTS = regression
 copycluster_SOURCES = copycluster.c
@@ -321,7 +321,7 @@ CLEANFILES = \
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .cpp .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -395,6 +395,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/recur.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-classify.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-component.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-cxx.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-recur.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-storage.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-utils.Po at am__quote@
@@ -424,6 +425,27 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+.cpp.o:
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+
 mostlyclean-libtool:
 	-rm -f *.lo
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libical/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Jul 2008 18:14:14 -0000	1.3
+++ .cvsignore	2 Sep 2008 22:10:31 -0000	1.4
@@ -1 +1 @@
-libical-0.31.tar.gz
+libical-0.32.tar.gz


Index: libical.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libical/F-8/libical.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libical.spec	27 Jul 2008 15:05:24 -0000	1.7
+++ libical.spec	2 Sep 2008 22:10:31 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		libical
-Version:	0.31
-Release:	3%{?dist}
+Version:	0.32
+Release:	1%{?dist}
 Summary:	Reference implementation of the iCalendar data type and serialization format
 Summary(pl):	Implementacja formatu iCalendar
 
@@ -49,9 +49,7 @@
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
 
-# PATCH0 breaks parallel build.
-# Parallel make does not work.
-make
+make %{?_smp_mflags}
 
 %check
 # make check
@@ -90,18 +88,32 @@
 %defattr(-,root,root,-)
 %doc doc/UsingLibical.txt
 %{_includedir}/ical.h
-%{_includedir}/ical*.h
-%{_includedir}/icptrholder.h
-%{_includedir}/pvl.h
-%{_includedir}/sspm.h
-%{_includedir}/vcomponent.h
 %{_libdir}/%{name}.so
 %{_libdir}/%{name}_cxx.so
 %{_libdir}/libicalss.so
 %{_libdir}/libicalss_cxx.so
 %{_libdir}/libicalvcal.so
 
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/ical.h
+%{_includedir}/%{name}/ical*.h
+%{_includedir}/%{name}/icptrholder.h
+%{_includedir}/%{name}/pvl.h
+%{_includedir}/%{name}/sspm.h
+%{_includedir}/%{name}/vcomponent.h
+
+%dir %{_includedir}/libicalvcal
+%{_includedir}/libicalvcal/icalvcal.h
+%{_includedir}/libicalvcal/port.h
+%{_includedir}/libicalvcal/vcaltmp.h
+%{_includedir}/libicalvcal/vcc.h
+%{_includedir}/libicalvcal/vobject.h
+
 %changelog
+* Tue Sep 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.32-1
+- Version bump to 0.32.
+- Parallel build problems fixed.
+
 * Sun Jul 27 2008 Jeff Perry <jeffperry_fedora at sourcesink.com> - 0.31-3
 - Added 'BuildRequires: bison byacc flex'.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libical/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Jul 2008 18:14:14 -0000	1.3
+++ sources	2 Sep 2008 22:10:31 -0000	1.4
@@ -1 +1 @@
-39382c919abd9abfab6ecba27715eaa5  libical-0.31.tar.gz
+7e38be0c75769e62b7f76c5b6f373db9  libical-0.32.tar.gz


--- libical-0.31-makefile.patch DELETED ---



From rishi at fedoraproject.org  Tue Sep  2 22:15:05 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue,  2 Sep 2008 22:15:05 +0000 (UTC)
Subject: rpms/libical/F-9 libical-0.32-makefile.patch, NONE, 1.1 .cvsignore, 
	1.4, 1.5 libical.spec, 1.8, 1.9 sources, 1.4,
	1.5 libical-0.31-makefile.patch, 1.1, NONE
Message-ID: <20080902221505.A7F327011D@cvs1.fedora.phx.redhat.com>

Author: rishi

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

Modified Files:
	.cvsignore libical.spec sources 
Added Files:
	libical-0.32-makefile.patch 
Removed Files:
	libical-0.31-makefile.patch 
Log Message:
* Tue Sep 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.32-1
- Version bump to 0.32.
- Parallel build problems fixed.


libical-0.32-makefile.patch:

--- NEW FILE libical-0.32-makefile.patch ---
diff -urNp libical-0.32.orig/src/libical/Makefile.in libical-0.32/src/libical/Makefile.in
--- libical-0.32.orig/src/libical/Makefile.in	2008-09-02 00:06:16.000000000 +0530
+++ libical-0.32/src/libical/Makefile.in	2008-09-02 20:02:36.195993974 +0530
@@ -103,7 +103,7 @@ am_libical_la_OBJECTS = $(am__objects_2)
 	icalduration.lo icalperiod.lo icaltypes.lo icalvalue.lo pvl.lo \
 	sspm.lo vsnprintf.lo icallangbind.lo caldate.lo
 libical_la_OBJECTS = $(am_libical_la_OBJECTS)
-libical_cxx_la_LIBADD =
+libical_cxx_la_LIBADD = $(PTHREAD_LIBS)
 am__libical_cxx_la_SOURCES_DIST = icalderivedparameter.h \
 	icalderivedproperty.h icalderivedvalue.h \
 	icalderivedparameter.c icalderivedproperty.c icalrestriction.c \
diff -urNp libical-0.32.orig/src/libicalss/Makefile.in libical-0.32/src/libicalss/Makefile.in
--- libical-0.32.orig/src/libicalss/Makefile.in	2008-09-02 00:06:16.000000000 +0530
+++ libical-0.32/src/libicalss/Makefile.in	2008-09-02 21:56:38.509744465 +0530
@@ -100,7 +100,6 @@ am_libicalss_la_OBJECTS = icalcalendar.l
 	icalset.lo icalspanlist.lo icalmessage.lo $(am__objects_1) \
 	$(am__objects_2)
 libicalss_la_OBJECTS = $(am_libicalss_la_OBJECTS)
-libicalss_cxx_la_LIBADD =
 am__libicalss_cxx_la_SOURCES_DIST = icalspanlist_cxx.h \
 	icalspanlist_cxx.cpp
 @WITH_CXX_BINDINGS_TRUE at am_libicalss_cxx_la_OBJECTS =  \
@@ -307,7 +306,7 @@ INCLUDES = \
 	$(BDB_INCLUDE)
 
 libicalss_la_LDFLAGS = -version-info 32:0:32
-libicalss_la_LIBADD = $(BDB_LIBFILES) 
+libicalss_la_LIBADD = $(BDB_LIBFILES) ../libical/libical.la
 @DEV_FALSE at libicalss_la_DEVSOURCES = icalsslexer.c icalssyacc.c
 @DEV_TRUE at libicalss_la_DEVSOURCES = icalsslexer.l icalssyacc.y
 libicalss_la_SOURCES = \
@@ -350,6 +349,8 @@ COMBINEDHEADERS = \
 	$(srcdir)/icalspanlist.h	\
 	$(srcdir)/icalmessage.h
 
+libicalss_cxx_la_LIBADD = ./libicalss.la ../libical/libical_cxx.la
+libicalss_cxx_la_DEPENDENCIES = ./libicalss.la ../libical/libical_cxx.la
 @WITH_CXX_BINDINGS_TRUE at libicalss_cxx_la_SOURCES = \
 @WITH_CXX_BINDINGS_TRUE@	$(libicalss_evolution_la_SOURCES)	\
 @WITH_CXX_BINDINGS_TRUE@	icalspanlist_cxx.h	\
diff -urNp libical-0.32.orig/src/test/Makefile.in libical-0.32/src/test/Makefile.in
--- libical-0.32.orig/src/test/Makefile.in	2008-09-02 00:06:17.000000000 +0530
+++ libical-0.32/src/test/Makefile.in	2008-09-02 21:30:44.140744843 +0530
@@ -78,10 +78,11 @@ recur_LDADD = $(LDADD)
 recur_DEPENDENCIES = ../libicalss/libicalss.la \
 	../libicalvcal/libicalvcal.la $(am__DEPENDENCIES_1) \
 	../libical/libical.la $(am__DEPENDENCIES_2)
+ at WITH_CXX_BINDINGS_TRUE@am__objects_1 = regression-cxx.$(OBJEXT)
 am_regression_OBJECTS = regression.$(OBJEXT) \
 	regression-component.$(OBJEXT) regression-classify.$(OBJEXT) \
 	regression-utils.$(OBJEXT) regression-recur.$(OBJEXT) \
-	regression-storage.$(OBJEXT)
+	regression-storage.$(OBJEXT) $(am__objects_1)
 regression_OBJECTS = $(am_regression_OBJECTS)
 regression_LDADD = $(LDADD)
 regression_DEPENDENCIES = ../libicalss/libicalss.la \
@@ -116,6 +117,11 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
 SOURCES = $(copycluster_SOURCES) $(parser_SOURCES) $(process_SOURCES) \
 	$(recur_SOURCES) $(regression_SOURCES) $(stow_SOURCES) \
 	$(testmime_SOURCES) $(testvcal_SOURCES)
@@ -270,13 +276,6 @@ target_vendor = @target_vendor@
 @WITH_CXX_BINDINGS_FALSE at cxx_libs = 
 @WITH_CXX_BINDINGS_TRUE at cxx_libs = ../libical/libical_cxx.la
 @WITH_CXX_BINDINGS_TRUE at regression_cxx_SOURCES = \
- at WITH_CXX_BINDINGS_TRUE@	regression.c		\
- at WITH_CXX_BINDINGS_TRUE@	regression.h		\
- at WITH_CXX_BINDINGS_TRUE@	regression-component.c	\
- at WITH_CXX_BINDINGS_TRUE@	regression-classify.c	\
- at WITH_CXX_BINDINGS_TRUE@	regression-utils.c	\
- at WITH_CXX_BINDINGS_TRUE@	regression-recur.c	\
- at WITH_CXX_BINDINGS_TRUE@	regression-storage.c	\
 @WITH_CXX_BINDINGS_TRUE@	regression-cxx.cpp
 
 @WITH_BDB4_FALSE at bdb4_inc = 
@@ -301,7 +300,8 @@ regression_SOURCES = \
 	regression-classify.c	\
 	regression-utils.c	\
 	regression-recur.c	\
-	regression-storage.c
+	regression-storage.c	\
+	$(regression_cxx_SOURCES)
 
 TESTS = regression
 copycluster_SOURCES = copycluster.c
@@ -321,7 +321,7 @@ CLEANFILES = \
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .cpp .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -395,6 +395,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/recur.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-classify.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-component.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-cxx.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-recur.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-storage.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-utils.Po at am__quote@
@@ -424,6 +425,27 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+.cpp.o:
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+
 mostlyclean-libtool:
 	-rm -f *.lo
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libical/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Jul 2008 18:16:10 -0000	1.4
+++ .cvsignore	2 Sep 2008 22:14:35 -0000	1.5
@@ -1 +1 @@
-libical-0.31.tar.gz
+libical-0.32.tar.gz


Index: libical.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libical/F-9/libical.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libical.spec	27 Jul 2008 15:06:34 -0000	1.8
+++ libical.spec	2 Sep 2008 22:14:35 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		libical
-Version:	0.31
-Release:	3%{?dist}
+Version:	0.32
+Release:	1%{?dist}
 Summary:	Reference implementation of the iCalendar data type and serialization format
 Summary(pl):	Implementacja formatu iCalendar
 
@@ -49,9 +49,7 @@
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
 
-# PATCH0 breaks parallel build.
-# Parallel make does not work.
-make
+make %{?_smp_mflags}
 
 %check
 # make check
@@ -90,18 +88,32 @@
 %defattr(-,root,root,-)
 %doc doc/UsingLibical.txt
 %{_includedir}/ical.h
-%{_includedir}/ical*.h
-%{_includedir}/icptrholder.h
-%{_includedir}/pvl.h
-%{_includedir}/sspm.h
-%{_includedir}/vcomponent.h
 %{_libdir}/%{name}.so
 %{_libdir}/%{name}_cxx.so
 %{_libdir}/libicalss.so
 %{_libdir}/libicalss_cxx.so
 %{_libdir}/libicalvcal.so
 
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/ical.h
+%{_includedir}/%{name}/ical*.h
+%{_includedir}/%{name}/icptrholder.h
+%{_includedir}/%{name}/pvl.h
+%{_includedir}/%{name}/sspm.h
+%{_includedir}/%{name}/vcomponent.h
+
+%dir %{_includedir}/libicalvcal
+%{_includedir}/libicalvcal/icalvcal.h
+%{_includedir}/libicalvcal/port.h
+%{_includedir}/libicalvcal/vcaltmp.h
+%{_includedir}/libicalvcal/vcc.h
+%{_includedir}/libicalvcal/vobject.h
+
 %changelog
+* Tue Sep 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.32-1
+- Version bump to 0.32.
+- Parallel build problems fixed.
+
 * Sun Jul 27 2008 Jeff Perry <jeffperry_fedora at sourcesink.com> - 0.31-3
 - Added 'BuildRequires: bison byacc flex'.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libical/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Jul 2008 18:16:10 -0000	1.4
+++ sources	2 Sep 2008 22:14:35 -0000	1.5
@@ -1 +1 @@
-39382c919abd9abfab6ecba27715eaa5  libical-0.31.tar.gz
+7e38be0c75769e62b7f76c5b6f373db9  libical-0.32.tar.gz


--- libical-0.31-makefile.patch DELETED ---



From rishi at fedoraproject.org  Tue Sep  2 22:18:32 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue,  2 Sep 2008 22:18:32 +0000 (UTC)
Subject: rpms/libical/devel libical-0.32-makefile.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 libical.spec, 1.8, 1.9 sources, 1.4,
	1.5 libical-0.31-makefile.patch, 1.1, NONE
Message-ID: <20080902221832.6AE727011D@cvs1.fedora.phx.redhat.com>

Author: rishi

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

Modified Files:
	.cvsignore libical.spec sources 
Added Files:
	libical-0.32-makefile.patch 
Removed Files:
	libical-0.31-makefile.patch 
Log Message:
* Tue Sep 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.32-1
- Version bump to 0.32.
- Parallel build problems fixed.


libical-0.32-makefile.patch:

--- NEW FILE libical-0.32-makefile.patch ---
diff -urNp libical-0.32.orig/src/libical/Makefile.in libical-0.32/src/libical/Makefile.in
--- libical-0.32.orig/src/libical/Makefile.in	2008-09-02 00:06:16.000000000 +0530
+++ libical-0.32/src/libical/Makefile.in	2008-09-02 20:02:36.195993974 +0530
@@ -103,7 +103,7 @@ am_libical_la_OBJECTS = $(am__objects_2)
 	icalduration.lo icalperiod.lo icaltypes.lo icalvalue.lo pvl.lo \
 	sspm.lo vsnprintf.lo icallangbind.lo caldate.lo
 libical_la_OBJECTS = $(am_libical_la_OBJECTS)
-libical_cxx_la_LIBADD =
+libical_cxx_la_LIBADD = $(PTHREAD_LIBS)
 am__libical_cxx_la_SOURCES_DIST = icalderivedparameter.h \
 	icalderivedproperty.h icalderivedvalue.h \
 	icalderivedparameter.c icalderivedproperty.c icalrestriction.c \
diff -urNp libical-0.32.orig/src/libicalss/Makefile.in libical-0.32/src/libicalss/Makefile.in
--- libical-0.32.orig/src/libicalss/Makefile.in	2008-09-02 00:06:16.000000000 +0530
+++ libical-0.32/src/libicalss/Makefile.in	2008-09-02 21:56:38.509744465 +0530
@@ -100,7 +100,6 @@ am_libicalss_la_OBJECTS = icalcalendar.l
 	icalset.lo icalspanlist.lo icalmessage.lo $(am__objects_1) \
 	$(am__objects_2)
 libicalss_la_OBJECTS = $(am_libicalss_la_OBJECTS)
-libicalss_cxx_la_LIBADD =
 am__libicalss_cxx_la_SOURCES_DIST = icalspanlist_cxx.h \
 	icalspanlist_cxx.cpp
 @WITH_CXX_BINDINGS_TRUE at am_libicalss_cxx_la_OBJECTS =  \
@@ -307,7 +306,7 @@ INCLUDES = \
 	$(BDB_INCLUDE)
 
 libicalss_la_LDFLAGS = -version-info 32:0:32
-libicalss_la_LIBADD = $(BDB_LIBFILES) 
+libicalss_la_LIBADD = $(BDB_LIBFILES) ../libical/libical.la
 @DEV_FALSE at libicalss_la_DEVSOURCES = icalsslexer.c icalssyacc.c
 @DEV_TRUE at libicalss_la_DEVSOURCES = icalsslexer.l icalssyacc.y
 libicalss_la_SOURCES = \
@@ -350,6 +349,8 @@ COMBINEDHEADERS = \
 	$(srcdir)/icalspanlist.h	\
 	$(srcdir)/icalmessage.h
 
+libicalss_cxx_la_LIBADD = ./libicalss.la ../libical/libical_cxx.la
+libicalss_cxx_la_DEPENDENCIES = ./libicalss.la ../libical/libical_cxx.la
 @WITH_CXX_BINDINGS_TRUE at libicalss_cxx_la_SOURCES = \
 @WITH_CXX_BINDINGS_TRUE@	$(libicalss_evolution_la_SOURCES)	\
 @WITH_CXX_BINDINGS_TRUE@	icalspanlist_cxx.h	\
diff -urNp libical-0.32.orig/src/test/Makefile.in libical-0.32/src/test/Makefile.in
--- libical-0.32.orig/src/test/Makefile.in	2008-09-02 00:06:17.000000000 +0530
+++ libical-0.32/src/test/Makefile.in	2008-09-02 21:30:44.140744843 +0530
@@ -78,10 +78,11 @@ recur_LDADD = $(LDADD)
 recur_DEPENDENCIES = ../libicalss/libicalss.la \
 	../libicalvcal/libicalvcal.la $(am__DEPENDENCIES_1) \
 	../libical/libical.la $(am__DEPENDENCIES_2)
+ at WITH_CXX_BINDINGS_TRUE@am__objects_1 = regression-cxx.$(OBJEXT)
 am_regression_OBJECTS = regression.$(OBJEXT) \
 	regression-component.$(OBJEXT) regression-classify.$(OBJEXT) \
 	regression-utils.$(OBJEXT) regression-recur.$(OBJEXT) \
-	regression-storage.$(OBJEXT)
+	regression-storage.$(OBJEXT) $(am__objects_1)
 regression_OBJECTS = $(am_regression_OBJECTS)
 regression_LDADD = $(LDADD)
 regression_DEPENDENCIES = ../libicalss/libicalss.la \
@@ -116,6 +117,11 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
 SOURCES = $(copycluster_SOURCES) $(parser_SOURCES) $(process_SOURCES) \
 	$(recur_SOURCES) $(regression_SOURCES) $(stow_SOURCES) \
 	$(testmime_SOURCES) $(testvcal_SOURCES)
@@ -270,13 +276,6 @@ target_vendor = @target_vendor@
 @WITH_CXX_BINDINGS_FALSE at cxx_libs = 
 @WITH_CXX_BINDINGS_TRUE at cxx_libs = ../libical/libical_cxx.la
 @WITH_CXX_BINDINGS_TRUE at regression_cxx_SOURCES = \
- at WITH_CXX_BINDINGS_TRUE@	regression.c		\
- at WITH_CXX_BINDINGS_TRUE@	regression.h		\
- at WITH_CXX_BINDINGS_TRUE@	regression-component.c	\
- at WITH_CXX_BINDINGS_TRUE@	regression-classify.c	\
- at WITH_CXX_BINDINGS_TRUE@	regression-utils.c	\
- at WITH_CXX_BINDINGS_TRUE@	regression-recur.c	\
- at WITH_CXX_BINDINGS_TRUE@	regression-storage.c	\
 @WITH_CXX_BINDINGS_TRUE@	regression-cxx.cpp
 
 @WITH_BDB4_FALSE at bdb4_inc = 
@@ -301,7 +300,8 @@ regression_SOURCES = \
 	regression-classify.c	\
 	regression-utils.c	\
 	regression-recur.c	\
-	regression-storage.c
+	regression-storage.c	\
+	$(regression_cxx_SOURCES)
 
 TESTS = regression
 copycluster_SOURCES = copycluster.c
@@ -321,7 +321,7 @@ CLEANFILES = \
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .cpp .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -395,6 +395,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/recur.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-classify.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-component.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-cxx.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-recur.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-storage.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-utils.Po at am__quote@
@@ -424,6 +425,27 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+.cpp.o:
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+
 mostlyclean-libtool:
 	-rm -f *.lo
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libical/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Jul 2008 18:19:34 -0000	1.4
+++ .cvsignore	2 Sep 2008 22:18:02 -0000	1.5
@@ -1 +1 @@
-libical-0.31.tar.gz
+libical-0.32.tar.gz


Index: libical.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libical/devel/libical.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libical.spec	27 Jul 2008 15:07:56 -0000	1.8
+++ libical.spec	2 Sep 2008 22:18:02 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		libical
-Version:	0.31
-Release:	3%{?dist}
+Version:	0.32
+Release:	1%{?dist}
 Summary:	Reference implementation of the iCalendar data type and serialization format
 Summary(pl):	Implementacja formatu iCalendar
 
@@ -49,9 +49,7 @@
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
 
-# PATCH0 breaks parallel build.
-# Parallel make does not work.
-make
+make %{?_smp_mflags}
 
 %check
 # make check
@@ -90,18 +88,32 @@
 %defattr(-,root,root,-)
 %doc doc/UsingLibical.txt
 %{_includedir}/ical.h
-%{_includedir}/ical*.h
-%{_includedir}/icptrholder.h
-%{_includedir}/pvl.h
-%{_includedir}/sspm.h
-%{_includedir}/vcomponent.h
 %{_libdir}/%{name}.so
 %{_libdir}/%{name}_cxx.so
 %{_libdir}/libicalss.so
 %{_libdir}/libicalss_cxx.so
 %{_libdir}/libicalvcal.so
 
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/ical.h
+%{_includedir}/%{name}/ical*.h
+%{_includedir}/%{name}/icptrholder.h
+%{_includedir}/%{name}/pvl.h
+%{_includedir}/%{name}/sspm.h
+%{_includedir}/%{name}/vcomponent.h
+
+%dir %{_includedir}/libicalvcal
+%{_includedir}/libicalvcal/icalvcal.h
+%{_includedir}/libicalvcal/port.h
+%{_includedir}/libicalvcal/vcaltmp.h
+%{_includedir}/libicalvcal/vcc.h
+%{_includedir}/libicalvcal/vobject.h
+
 %changelog
+* Tue Sep 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.32-1
+- Version bump to 0.32.
+- Parallel build problems fixed.
+
 * Sun Jul 27 2008 Jeff Perry <jeffperry_fedora at sourcesink.com> - 0.31-3
 - Added 'BuildRequires: bison byacc flex'.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libical/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Jul 2008 18:19:34 -0000	1.4
+++ sources	2 Sep 2008 22:18:02 -0000	1.5
@@ -1 +1 @@
-39382c919abd9abfab6ecba27715eaa5  libical-0.31.tar.gz
+7e38be0c75769e62b7f76c5b6f373db9  libical-0.32.tar.gz


--- libical-0.31-makefile.patch DELETED ---



From mclasen at fedoraproject.org  Tue Sep  2 22:26:09 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  2 Sep 2008 22:26:09 +0000 (UTC)
Subject: rpms/gok/devel .cvsignore, 1.29, 1.30 gok.spec, 1.59, 1.60 sources, 
	1.29, 1.30
Message-ID: <20080902222609.A4AF37011D@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gok.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	15 Jul 2008 19:49:42 -0000	1.29
+++ .cvsignore	2 Sep 2008 22:25:39 -0000	1.30
@@ -1 +1 @@
-gok-1.4.0.tar.bz2
+gok-2.23.91.tar.bz2


Index: gok.spec
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/gok.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- gok.spec	15 Jul 2008 19:49:42 -0000	1.59
+++ gok.spec	2 Sep 2008 22:25:39 -0000	1.60
@@ -2,12 +2,12 @@
 
 Summary: GNOME Onscreen Keyboard
 Name: gok
-Version: 1.4.0
+Version: 2.23.91
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
 URL: http://www.gok.ca/
-Source0: http://download.gnome.org/sources/gok/1.4/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gok/2.23/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Patch0: gok-0.10.2-launcher.patch
 
@@ -123,6 +123,9 @@
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Tue Jul 15 2008 Matthias Clasen <mclasen at redhat.com> - 1.4.0-1
 - Update to 1.4.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	15 Jul 2008 19:49:42 -0000	1.29
+++ sources	2 Sep 2008 22:25:39 -0000	1.30
@@ -1 +1 @@
-ba9b013643a0ff9572978a97fa5c49fe  gok-1.4.0.tar.bz2
+b67f4df192bb41965ce0bc6413064512  gok-2.23.91.tar.bz2



From jwilson at fedoraproject.org  Tue Sep  2 22:27:48 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue,  2 Sep 2008 22:27:48 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.163, 1.164 kernel.spec, 1.920, 
	1.921 linux-2.6-lirc.patch, 1.9, 1.10
Message-ID: <20080902222748.9AA707011D@cvs1.fedora.phx.redhat.com>

Author: jwilson

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

Modified Files:
	config-generic kernel.spec linux-2.6-lirc.patch 
Log Message:
* Tue Sep 02 2008 Jarod Wilson <jarod at redhat.com>
- Rename lirc_pvr150 to more appropriate lirc_zilog



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- config-generic	26 Aug 2008 15:28:38 -0000	1.163
+++ config-generic	2 Sep 2008 22:27:17 -0000	1.164
@@ -3580,7 +3580,7 @@
 CONFIG_LIRC_IT87=m
 CONFIG_LIRC_MCEUSB=m
 CONFIG_LIRC_MCEUSB2=m
-CONFIG_LIRC_PVR150=m
+CONFIG_LIRC_ZILOG=m
 CONFIG_LIRC_PARALLEL=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SIR=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.920
retrieving revision 1.921
diff -u -r1.920 -r1.921
--- kernel.spec	2 Sep 2008 14:56:52 -0000	1.920
+++ kernel.spec	2 Sep 2008 22:27:17 -0000	1.921
@@ -1750,6 +1750,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Sep 02 2008 Jarod Wilson <jarod at redhat.com>
+- Rename lirc_pvr150 to more appropriate lirc_zilog
+
 * Tue Sep 02 2008 Kyle McMartin <kyle at redhat.com>
 - hopefully fix the iwlwifi issues.
 - add an include <linux/pagemap.h> to drm-nouveau to hopefully fix

linux-2.6-lirc.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.9 -r 1.10 linux-2.6-lirc.patch
Index: linux-2.6-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-lirc.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-lirc.patch	4 Aug 2008 15:19:01 -0000	1.9
+++ linux-2.6-lirc.patch	2 Sep 2008 22:27:18 -0000	1.10
@@ -1,6 +1,6 @@
  drivers/input/Kconfig                 |    2 +
  drivers/input/Makefile                |    2 +
- drivers/input/lirc/Kconfig            |  127 +++
+ drivers/input/lirc/Kconfig            |  128 +++
  drivers/input/lirc/Makefile           |   24 +
  drivers/input/lirc/commandir.c        | 1009 +++++++++++++++++++++++
  drivers/input/lirc/commandir.h        |   41 +
@@ -13,21 +13,21 @@
  drivers/input/lirc/lirc_dev.c         |  827 +++++++++++++++++++
  drivers/input/lirc/lirc_dev.h         |  264 ++++++
  drivers/input/lirc/lirc_i2c.c         |  668 +++++++++++++++
- drivers/input/lirc/lirc_igorplugusb.c |  624 ++++++++++++++
- drivers/input/lirc/lirc_imon.c        | 1248 ++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_igorplugusb.c |  624 +++++++++++++++
+ drivers/input/lirc/lirc_imon.c        | 1248 +++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.c        | 1012 +++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 +++
  drivers/input/lirc/lirc_mceusb.c      |  890 ++++++++++++++++++++
  drivers/input/lirc/lirc_mceusb2.c     | 1060 ++++++++++++++++++++++++
  drivers/input/lirc/lirc_parallel.c    |  745 +++++++++++++++++
  drivers/input/lirc/lirc_parallel.h    |   26 +
- drivers/input/lirc/lirc_pvr150.c      | 1431 +++++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_sasem.c       |  971 ++++++++++++++++++++++
  drivers/input/lirc/lirc_serial.c      | 1348 +++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_sir.c         | 1323 ++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_streamzap.c   |  810 +++++++++++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  393 +++++++++
- 29 files changed, 17566 insertions(+), 0 deletions(-)
+ drivers/input/lirc/lirc_zilog.c       | 1425 +++++++++++++++++++++++++++++++++
+ 29 files changed, 17561 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
 index 5f9d860..747633c 100644
@@ -53,10 +53,10 @@
 +obj-$(CONFIG_INPUT_LIRC)       += lirc/
 diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
 new file mode 100644
-index 0000000..138e58a
+index 0000000..62cfbf7
 --- /dev/null
 +++ b/drivers/input/lirc/Kconfig
-@@ -0,0 +1,127 @@
+@@ -0,0 +1,128 @@
 +#
 +# LIRC driver(s) configuration
 +#
@@ -141,12 +141,13 @@
 +	help
 +	  Driver for the Microsoft Media Center Ed. Receiver, v2
 +
-+config LIRC_PVR150
-+	tristate "Hauppauge PVR-XXX Transmitter"
++config LIRC_ZILOG
++	tristate "Zilog/Hauppauge IR Transmitter"
 +	default m
 +	depends on LIRC_DEV
 +	help
-+	  Driver for the Hauppauge PVR-150/250/350/500 IR Transmitter
++	  Driver for the Zilog/Hauppauge IR Transmitter, found on
++	  PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards
 +
 +config LIRC_PARALLEL
 +	tristate "Homebrew Parallel Port Receiver"
@@ -186,7 +187,7 @@
 +endif
 diff --git a/drivers/input/lirc/Makefile b/drivers/input/lirc/Makefile
 new file mode 100644
-index 0000000..71124ef
+index 0000000..d22dc5b
 --- /dev/null
 +++ b/drivers/input/lirc/Makefile
 @@ -0,0 +1,24 @@
@@ -207,7 +208,7 @@
 +obj-$(CONFIG_LIRC_IT87)		+= lirc_it87.o
 +obj-$(CONFIG_LIRC_MCEUSB)	+= lirc_mceusb.o
 +obj-$(CONFIG_LIRC_MCEUSB2)	+= lirc_mceusb2.o
-+obj-$(CONFIG_LIRC_PVR150)	+= lirc_pvr150.o
++obj-$(CONFIG_LIRC_ZILOG)	+= lirc_zilog.o
 +obj-$(CONFIG_LIRC_PARALLEL)	+= lirc_parallel.o
 +obj-$(CONFIG_LIRC_SASEM)	+= lirc_sasem.o
 +obj-$(CONFIG_LIRC_SERIAL)	+= lirc_serial.o
@@ -11463,34 +11464,53 @@
 +#define LIRC_PARALLEL_TRANSMITTER_MASK ((1<<LIRC_PARALLEL_MAX_TRANSMITTERS) - 1)
 +
 +#endif
-diff --git a/drivers/input/lirc/lirc_pvr150.c b/drivers/input/lirc/lirc_pvr150.c
+diff --git a/drivers/input/lirc/lirc_sasem.c b/drivers/input/lirc/lirc_sasem.c
 new file mode 100644
-index 0000000..fed5720
+index 0000000..0d3e55f
 --- /dev/null
-+++ b/drivers/input/lirc/lirc_pvr150.c
-@@ -0,0 +1,1431 @@
++++ b/drivers/input/lirc/lirc_sasem.c
+@@ -0,0 +1,971 @@
 +/*      $Id$      */
 +
-+/*
-+ * i2c IR lirc plugin for Hauppauge PVR 150 card
++/* lirc_sasem.c - USB remote support for LIRC
++ * Version 0.5
 + *
-+ * Copyright (c) 2000 Gerd Knorr <kraxel at goldbach.in-berlin.de>
-+ * modified for PixelView (BT878P+W/FM) by
-+ *      Michal Kochanowicz <mkochano at pld.org.pl>
-+ *      Christoph Bartelmus <lirc at bartelmus.de>
-+ * modified for KNC ONE TV Station/Anubis Typhoon TView Tuner by
-+ *      Ulrich Mueller <ulrich.mueller42 at web.de>
-+ * modified for Asus TV-Box and Creative/VisionTek BreakOut-Box by
-+ *      Stefan Jahn <stefan at lkcc.org>
-+ * modified for inclusion into kernel sources by
-+ *      Jerome Brock <jbrock at users.sourceforge.net>
-+ * modified for Leadtek Winfast PVR2000 by
-+ *      Thomas Reitmayr (treitmayr at yahoo.com)
-+ * modified for Hauppauge PVR-150 IR TX device by
-+ *      Mark Weaver <mark at npsl.co.uk>
++ * Copyright (C) 2004-2005 Oliver Stabel <oliver.stabel at gmx.de>
++ *			 Tim Davies <tim at opensystems.net.au>
 + *
-+ * parts are cut&pasted from the lirc_i2c.c driver
++ * This driver was derived from:
++ *   Venky Raju <dev at venky.ws>
++ *      "lirc_imon - "LIRC plugin/VFD driver for Ahanix/Soundgraph IMON IR/VFD"
++ *   Paul Miller <pmiller9 at users.sourceforge.net>'s 2003-2004
++ *      "lirc_atiusb - USB remote support for LIRC"
++ *   Culver Consulting Services <henry at culcon.com>'s 2003
++ *      "Sasem OnAir VFD/IR USB driver"
 + *
++ *
++ * 2004/06/13   -   0.1
++ *		  initial version
++ *
++ * 2004/06/28   -   0.2
++ *		  added file system support to write data to VFD device (used
++ *		  in conjunction with LCDProc)
++ *
++ * 2004/11/22   -   0.3
++ *		  Ported to 2.6 kernel
++ *		  	- Tim Davies <tim at opensystems.net.au>
++ *
++ * 2005/03/29   -   0.4
++ *		  A few tidyups and keypress timings
++ *		  	- Tim Davies <tim at opensystems.net.au>
++ *
++ * 2005/06/23   -   0.5
++ *		  A complete rewrite (shamelessly) based on lirc_imon.c
++ *		  Tim Davies <tim at opensystems.net.au>
++ *
++ * NOTE - The LCDproc iMon driver should work with this module.  More info at
++ *	http://www.frogstorm.info/sasem
++ */
++
++/*
 + *  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
@@ -11504,2399 +11524,2289 @@
 + *  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/version.h>
 +
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
 +
-+#include <linux/version.h>
-+#include <linux/module.h>
-+#include <linux/kmod.h>
-+#include <linux/kernel.h>
-+#include <linux/sched.h>
-+#include <linux/fs.h>
-+#include <linux/poll.h>
-+#include <linux/string.h>
-+#include <linux/timer.h>
-+#include <linux/delay.h>
-+#include <linux/completion.h>
++#include <linux/autoconf.h>
++
 +#include <linux/errno.h>
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
 +#include <linux/slab.h>
-+#include <linux/i2c.h>
-+#include <linux/i2c-algo-bit.h>
-+#include <linux/firmware.h>
-+#include <linux/vmalloc.h>
[...11067 lines suppressed...]
-+	ttusbir->plugin.owner = THIS_MODULE;
-+	ttusbir->plugin.features = LIRC_CAN_REC_MODE2;
-+	ttusbir->minor = lirc_register_plugin(&ttusbir->plugin);
-+	if (ttusbir->minor < 0) {
-+		err("Error registering as LIRC plugin\n");
-+		usb_set_intfdata(intf, NULL);
-+		lirc_buffer_free(&ttusbir->rbuf);
-+		kfree(ttusbir);
-+		return -EIO;
++		/* unregister device */
++		i2c_detach_client(&ir->c_rx);
++	} else if (client == &ir->c_tx) {
++		i2c_detach_client(&ir->c_tx);
++	} else {
++		up(&ir->lock);
++		zilog_error("ir_detach: detached from something we didn't "
++			    "attach to\n");
++		return -ENODEV;
 +	}
 +
-+	/* Allocate and setup the URB that we will use to talk to the device */
-+	for (i = 0; i < num_urbs; i++) {
-+		ttusbir->urb[i] = usb_alloc_urb(8, GFP_KERNEL);
-+		if (!ttusbir->urb[i]) {
-+			err("Could not allocate memory for the URB\n");
-+			for (j = i - 1; j >= 0; j--)
-+				kfree(ttusbir->urb[j]);
-+			lirc_buffer_free(&ttusbir->rbuf);
-+			lirc_unregister_plugin(ttusbir->minor);
-+			kfree(ttusbir);
-+			usb_set_intfdata(intf, NULL);
-+			return -ENOMEM;
-+		}
-+		ttusbir->urb[i]->dev = ttusbir->udev;
-+		ttusbir->urb[i]->context = ttusbir;
-+		ttusbir->urb[i]->pipe = usb_rcvisocpipe(ttusbir->udev,
-+							ttusbir->endpoint);
-+		ttusbir->urb[i]->interval = 1;
-+		ttusbir->urb[i]->transfer_flags = URB_ISO_ASAP;
-+		ttusbir->urb[i]->transfer_buffer = &ttusbir->buffer[i][0];
-+		ttusbir->urb[i]->complete = urb_complete;
-+		ttusbir->urb[i]->number_of_packets = 8;
-+		ttusbir->urb[i]->transfer_buffer_length = 128;
-+		for (j = 0; j < 8; j++) {
-+			ttusbir->urb[i]->iso_frame_desc[j].offset = j*16;
-+			ttusbir->urb[i]->iso_frame_desc[j].length = 16;
++	--ir->devs;
++	if (ir->devs < 0) {
++		up(&ir->lock);
++		zilog_error("ir_detach: invalid device count\n");
++		return -ENODEV;
++	} else if (ir->devs == 0) {
++		/* unregister lirc plugin */
++		if (ir->l.minor >= 0 && ir->l.minor < MAX_IRCTL_DEVICES) {
++			lirc_unregister_plugin(ir->l.minor);
++			ir_devices[ir->l.minor] = NULL;
 +		}
++
++		/* free memory */
++		lirc_buffer_free(&ir->buf);
++		up(&ir->lock);
++		kfree(ir);
++		return 0;
 +	}
++	up(&ir->lock);
 +	return 0;
 +}
 +
-+/* Called when the driver is unloaded or the device is unplugged
-+ */
-+static void disconnect(struct usb_interface *intf)
++static int ir_probe(struct i2c_adapter *adap)
 +{
-+	int i;
-+	struct ttusbir_device *ttusbir;
++	struct i2c_client c;
++	char buf;
 +
-+	DPRINTK("Module ttusbir disconnect\n");
++#ifdef I2C_HW_B_CX2341X
++	if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848) ||
++		adap->id == (I2C_ALGO_BIT | I2C_HW_B_CX2341X))
++#else
++	if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
++#endif
++	{
++		int have_rx = 0, have_tx = 0;
 +
-+	ttusbir = (struct ttusbir_device *) usb_get_intfdata(intf);
-+	usb_set_intfdata(intf, NULL);
-+	lirc_unregister_plugin(ttusbir->minor);
-+	DPRINTK("unregistered\n");
++		/* The external IR receiver is at
++		 * i2c address 0x71 on the PVR-150.
++		 * The IR transmitter is at 0x70. */
++		memset(&c, 0, sizeof(c));
++		c.adapter = adap;
++		c.addr = 0x70;
 +
-+	for (i = 0; i < num_urbs; i++) {
-+		usb_kill_urb(ttusbir->urb[i]);
-+		usb_free_urb(ttusbir->urb[i]);
++		if (!disable_rx) {
++			if (i2c_master_recv(&c, &buf, 1) == 1)
++				have_rx = 1;
++			dprintk("probe 0x70 @ %s: %s\n",
++				adap->name,
++				have_rx ? "yes" : "no");
++		}
++
++		if (!disable_tx) {
++			c.addr = 0x71;
++			if (i2c_master_recv(&c, &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);
 +	}
-+	DPRINTK("URBs killed\n");
-+	lirc_buffer_free(&ttusbir->rbuf);
-+	kfree(ttusbir);
++
++	return 0;
 +}
 +
-+static int ttusbir_init_module(void)
++static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg)
 +{
-+	int result;
++	/* nothing */
++	return 0;
++}
 +
-+	DPRINTK(KERN_DEBUG "Module ttusbir init\n");
++/* ----------------------------------------------------------------------- */
++#ifdef MODULE
 +
-+	/* register this driver with the USB subsystem */
-+	result = usb_register(&driver);
-+	if (result)
-+		err("usb_register failed. Error number %d", result);
-+	return result;
++int init_module(void)
++{
++	init_MUTEX(&tx_data_lock);
++	request_module("ivtv");
++	request_module("firmware_class");
++	i2c_add_driver(&driver);
++	return 0;
 +}
 +
-+static void ttusbir_exit_module(void)
++void cleanup_module(void)
 +{
-+	printk(KERN_DEBUG "Module ttusbir exit\n");
-+	/* deregister this driver with the USB subsystem */
-+	usb_deregister(&driver);
++	i2c_del_driver(&driver);
++	/* if loaded */
++	fw_unload();
 +}
 +
-+module_init(ttusbir_init_module);
-+module_exit(ttusbir_exit_module);
++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");
++
++EXPORT_NO_SYMBOLS;
++
++#endif /* MODULE */
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-basic-offset: 8
++ * End:
++ */



From mclasen at fedoraproject.org  Tue Sep  2 22:30:59 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  2 Sep 2008 22:30:59 +0000 (UTC)
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.29,
	1.30 gnome-doc-utils.spec, 1.46, 1.47 sources, 1.29, 1.30
Message-ID: <20080902223059.765BC7011D@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-doc-utils.spec sources 
Log Message:
0.13.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	10 Mar 2008 05:18:05 -0000	1.29
+++ .cvsignore	2 Sep 2008 22:30:29 -0000	1.30
@@ -1 +1 @@
-gnome-doc-utils-0.12.2.tar.bz2
+gnome-doc-utils-0.13.1.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gnome-doc-utils.spec	10 Mar 2008 05:18:05 -0000	1.46
+++ gnome-doc-utils.spec	2 Sep 2008 22:30:29 -0000	1.47
@@ -1,14 +1,14 @@
 ### Abstract ###
 
 Name: gnome-doc-utils
-Version: 0.12.2
+Version: 0.13.1
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group: Development/Tools
 Summary: Documentation utilities for the GNOME project
 URL: http://www.gnome.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-Source: http://download.gnome.org/sources/gnome-doc-utils/0.12/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-doc-utils/0.13/%{name}-%{version}.tar.bz2
 
 BuildArch: noarch
 
@@ -96,6 +96,9 @@
 %{_datadir}/xml/gnome
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 0.13.1-1
+- Update to 0.13.1
+
 * Mon Mar 10 2008 Matthias Clasen <mclasen at redhat.com> - 0.12.2-1
 - Update to 0.12.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	10 Mar 2008 05:18:05 -0000	1.29
+++ sources	2 Sep 2008 22:30:29 -0000	1.30
@@ -1 +1 @@
-e1a9e9ba923b8950f8803c90ebeaadb8  gnome-doc-utils-0.12.2.tar.bz2
+7cb98de7c6bdc9ebffaf37c653f126a5  gnome-doc-utils-0.13.1.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  2 22:40:06 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  2 Sep 2008 22:40:06 +0000 (UTC)
Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.59,
	1.60 gnome-icon-theme.spec, 1.92, 1.93 sources, 1.62, 1.63
Message-ID: <20080902224006.165087011D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13673

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	22 Aug 2008 22:49:48 -0000	1.59
+++ .cvsignore	2 Sep 2008 22:39:35 -0000	1.60
@@ -1 +1 @@
-gnome-icon-theme-2.23.90.tar.bz2
+gnome-icon-theme-2.23.91.tar.bz2


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- gnome-icon-theme.spec	22 Aug 2008 22:49:48 -0000	1.92
+++ gnome-icon-theme.spec	2 Sep 2008 22:39:35 -0000	1.93
@@ -1,6 +1,6 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
-Version: 2.23.90
+Version: 2.23.91
 Release: 1%{?dist}
 Source0: http://download.gnome.org/sources/gnome-icon-theme/2.23/%{name}-%{version}.tar.bz2
 Source1: gnome-icon-theme-extra-device-icons-4.tar.bz2
@@ -9,7 +9,7 @@
 BuildArch: noarch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-BuildRequires: icon-naming-utils >= 0.8.6
+BuildRequires: icon-naming-utils >= 0.8.7
 BuildRequires: perl(XML::Parser)
 BuildRequires: pkgconfig
 BuildRequires: gettext
@@ -100,6 +100,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-1
 - Update to 2.23.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	22 Aug 2008 22:49:48 -0000	1.62
+++ sources	2 Sep 2008 22:39:35 -0000	1.63
@@ -1,3 +1,3 @@
-1255f5d7c978ac26fe30a82a795f9cfa  gnome-icon-theme-2.23.90.tar.bz2
+f97e1e797a6d55d0c020f0f008329599  gnome-icon-theme-2.23.91.tar.bz2
 881e28a01badeead87578edd2d1bbc1c  gnome-icon-theme-extra-device-icons-4.tar.bz2
 



From mclasen at fedoraproject.org  Tue Sep  2 23:00:55 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  2 Sep 2008 23:00:55 +0000 (UTC)
Subject: rpms/at-spi/devel .cvsignore, 1.51, 1.52 at-spi.spec, 1.91,
	1.92 sources, 1.51, 1.52
Message-ID: <20080902230055.501DA7011D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14518

Modified Files:
	.cvsignore at-spi.spec sources 
Log Message:
1.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	5 Aug 2008 02:33:14 -0000	1.51
+++ .cvsignore	2 Sep 2008 23:00:24 -0000	1.52
@@ -1 +1 @@
-at-spi-1.23.6.tar.bz2
+at-spi-1.23.91.tar.bz2


Index: at-spi.spec
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- at-spi.spec	20 Aug 2008 13:32:44 -0000	1.91
+++ at-spi.spec	2 Sep 2008 23:00:25 -0000	1.92
@@ -9,8 +9,8 @@
 
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
-Version: 1.23.6
-Release: 2%{?dist}
+Version: 1.23.91
+Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://download.gnome.org/sources/at-spi/1.23/%{name}-%{version}.tar.bz2
 
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 1.23.91-1
+- Update to 1.23.91
+
 * Wed Aug 20 2008 Jarod Wilson <jarod at redhat.com> - 1.23.6-2
 - Silence incessant atk-bridge spew filling xsession-errors (#459275)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	5 Aug 2008 02:33:14 -0000	1.51
+++ sources	2 Sep 2008 23:00:25 -0000	1.52
@@ -1 +1 @@
-0a53d08b26a8e52ddcdfea8243564ba5  at-spi-1.23.6.tar.bz2
+83ebbb0f8c441278af47919a011a09d8  at-spi-1.23.91.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  2 23:09:07 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  2 Sep 2008 23:09:07 +0000 (UTC)
Subject: rpms/gucharmap/devel .cvsignore, 1.14, 1.15 gucharmap.spec, 1.26,
	1.27 sources, 1.14, 1.15
Message-ID: <20080902230907.8EA847011D@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gucharmap.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gucharmap/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	5 Aug 2008 03:51:05 -0000	1.14
+++ .cvsignore	2 Sep 2008 23:08:37 -0000	1.15
@@ -1 +1 @@
-gucharmap-2.23.6.tar.bz2
+gucharmap-2.23.91.tar.bz2


Index: gucharmap.spec
===================================================================
RCS file: /cvs/extras/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gucharmap.spec	5 Aug 2008 03:51:05 -0000	1.26
+++ gucharmap.spec	2 Sep 2008 23:08:37 -0000	1.27
@@ -3,7 +3,7 @@
 %define desktop_file_utils_version 0.9
 
 Name:           gucharmap
-Version:        2.23.6
+Version:        2.23.91
 Release:        1%{?dist}
 Summary:        Unicode character picker and font browser
 
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Mon Aug  4 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.6-1
 - Update to 2.23.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gucharmap/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	5 Aug 2008 03:51:05 -0000	1.14
+++ sources	2 Sep 2008 23:08:37 -0000	1.15
@@ -1 +1 @@
-d8f335451b922fc393cc77f802a7ea9a  gucharmap-2.23.6.tar.bz2
+e78fe1e5f88a79c6116acc86e4012bb0  gucharmap-2.23.91.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  2 23:13:49 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  2 Sep 2008 23:13:49 +0000 (UTC)
Subject: rpms/at-spi/devel at-spi.spec,1.92,1.93
Message-ID: <20080902231349.9A08C7011D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15188

Modified Files:
	at-spi.spec 
Log Message:
drop upstreamed patch



Index: at-spi.spec
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- at-spi.spec	2 Sep 2008 23:00:25 -0000	1.92
+++ at-spi.spec	2 Sep 2008 23:13:19 -0000	1.93
@@ -37,7 +37,6 @@
 BuildRequires: libXevie-devel 
 BuildRequires: libXt-devel 
 
-Patch1: at-spi-1.21.92-firefoxperf1.patch
 Patch2: at-spi-silence-no-event-spew.patch
 
 %description
@@ -74,7 +73,6 @@
 
 %prep
 %setup -q
-%patch1 -p0 -b .firefoxperf1
 %patch2 -p1 -b .spew
 
 



From mclasen at fedoraproject.org  Tue Sep  2 23:16:33 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  2 Sep 2008 23:16:33 +0000 (UTC)
Subject: rpms/mousetweaks/devel .cvsignore, 1.8, 1.9 mousetweaks.spec, 1.11, 
	1.12 sources, 1.8, 1.9
Message-ID: <20080902231633.187B27011D@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore mousetweaks.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mousetweaks/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Aug 2008 23:28:18 -0000	1.8
+++ .cvsignore	2 Sep 2008 23:16:02 -0000	1.9
@@ -1 +1 @@
-mousetweaks-2.23.90.tar.bz2
+mousetweaks-2.23.91.tar.bz2


Index: mousetweaks.spec
===================================================================
RCS file: /cvs/extras/rpms/mousetweaks/devel/mousetweaks.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mousetweaks.spec	22 Aug 2008 23:28:18 -0000	1.11
+++ mousetweaks.spec	2 Sep 2008 23:16:02 -0000	1.12
@@ -1,5 +1,5 @@
 Name:		mousetweaks
-Version:	2.23.90
+Version:	2.23.91
 Release:	1%{?dist}
 Summary:	Mouse accessibility support for the GNOME desktop
 Group:		User Interface/Desktops
@@ -92,6 +92,9 @@
 %doc %{_mandir}/man1/*
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-1
 - Update to 2.23.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mousetweaks/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Aug 2008 23:28:18 -0000	1.8
+++ sources	2 Sep 2008 23:16:02 -0000	1.9
@@ -1 +1 @@
-bad3340e7d8b7cd34b599ee41a74e6c0  mousetweaks-2.23.90.tar.bz2
+3805fdd9bd4723f740b48a62ee333a7a  mousetweaks-2.23.91.tar.bz2



From mstone at fedoraproject.org  Tue Sep  2 23:18:38 2008
From: mstone at fedoraproject.org (Michael Stone)
Date: Tue,  2 Sep 2008 23:18:38 +0000 (UTC)
Subject: rpms/olpc-utils/OLPC-3 .cvsignore, 1.11, 1.12 olpc-utils.spec, 1.17,
	1.18 sources, 1.12, 1.13
Message-ID: <20080902231838.CEDEF7011E@cvs1.fedora.phx.redhat.com>

Author: mstone

Update of /cvs/pkgs/rpms/olpc-utils/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15809

Modified Files:
	.cvsignore olpc-utils.spec sources 
Log Message:
- Michael Stone (1):
    dlo#7690: Remove the msh0-renaming rule since dlo#5746 was fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 Aug 2008 21:54:52 -0000	1.11
+++ .cvsignore	2 Sep 2008 23:18:08 -0000	1.12
@@ -1 +1 @@
-olpc-utils-0.84.tar.bz2
+olpc-utils-0.85.tar.bz2


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/olpc-utils.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- olpc-utils.spec	14 Aug 2008 21:54:52 -0000	1.17
+++ olpc-utils.spec	2 Sep 2008 23:18:08 -0000	1.18
@@ -1,5 +1,5 @@
 Name:       olpc-utils
-Version:    0.84
+Version:    0.85
 Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
@@ -81,11 +81,14 @@
 %config(noreplace) %{_sysconfdir}/X11/xorg-dcon-1.3.conf
 %config(noreplace) %{_sysconfdir}/X11/xorg-emu-1.3.conf
 %config(noreplace) %{_sysconfdir}/pam.d/olpc-login
-%config(noreplace) %{_sysconfdir}/udev/rules.d
 %config(noreplace) %{_sysconfdir}/skel/.xsession-example
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-foreground-compat.ck
 
 %changelog
+* Tue Sep 02 2008 Michael Stone <michael at laptop.org> 0.85-1
+- Michael Stone (1):
+    dlo#7690: Remove the msh0-renaming rule since dlo#5746 was fixed upstream.
+
 * Fri Aug 15 2008 Sayamindu Dasgupta <sayamindu at laptop.org> 0.84-1
 - Sayamindu Dasgupta (1):
     dlo#7818: Load the XIM GTK Input Module conditionally.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	14 Aug 2008 21:54:52 -0000	1.12
+++ sources	2 Sep 2008 23:18:08 -0000	1.13
@@ -1 +1 @@
-7a121d372e4595b3fe7108bac2dbdf72  olpc-utils-0.84.tar.bz2
+5f10b3443bb4cbdb391cd356d34be116  olpc-utils-0.85.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  2 23:20:35 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  2 Sep 2008 23:20:35 +0000 (UTC)
Subject: rpms/gnome-terminal/devel .cvsignore, 1.51, 1.52 gnome-terminal.spec,
	1.103, 1.104 sources, 1.52, 1.53
Message-ID: <20080902232035.239A87011D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16248

Modified Files:
	.cvsignore gnome-terminal.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-terminal/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	5 Aug 2008 05:07:49 -0000	1.51
+++ .cvsignore	2 Sep 2008 23:20:04 -0000	1.52
@@ -1 +1 @@
-gnome-terminal-2.23.6.tar.bz2
+gnome-terminal-2.23.91.tar.bz2


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- gnome-terminal.spec	24 Aug 2008 00:50:32 -0000	1.103
+++ gnome-terminal.spec	2 Sep 2008 23:20:04 -0000	1.104
@@ -10,8 +10,8 @@
 
 Summary: GNOME Terminal
 Name: gnome-terminal
-Version: 2.23.6
-Release: 2%{?dist}
+Version: 2.23.91
+Release: 1%{?dist}
 URL: http://www.gnome.org/
 Source0: http://download.gnome.org/sources/gnome-terminal/2.23/gnome-terminal-%{version}.tar.bz2
 # Fix gnome.org Bug 338913 ??? Terminal resized when switching tabs
@@ -121,6 +121,9 @@
 %{_libdir}/bonobo/servers/gnome-terminal.server
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Sat Aug 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.6-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-terminal/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	5 Aug 2008 05:07:49 -0000	1.52
+++ sources	2 Sep 2008 23:20:04 -0000	1.53
@@ -1 +1 @@
-efd049fc27467dc73593013699c3cbe3  gnome-terminal-2.23.6.tar.bz2
+dd5334aa1b85cc7a7254c92b5d508d4d  gnome-terminal-2.23.91.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  2 23:25:33 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  2 Sep 2008 23:25:33 +0000 (UTC)
Subject: rpms/at-spi/devel at-spi.spec,1.93,1.94
Message-ID: <20080902232533.668637011D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16509

Modified Files:
	at-spi.spec 
Log Message:
damn you, intltool



Index: at-spi.spec
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- at-spi.spec	2 Sep 2008 23:13:19 -0000	1.93
+++ at-spi.spec	2 Sep 2008 23:25:03 -0000	1.94
@@ -30,6 +30,7 @@
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: fontconfig
 BuildRequires: gettext
+BuildRequires: intltool
 BuildRequires: perl(XML::Parser)
 BuildRequires: libX11-devel
 BuildRequires: libXtst-devel



From cebbert at fedoraproject.org  Tue Sep  2 23:28:46 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue,  2 Sep 2008 23:28:46 +0000 (UTC)
Subject: rpms/kernel/F-9 config-powerpc32-generic, 1.9, 1.10 kernel.spec,
	1.754, 1.755
Message-ID: <20080902232846.2BCA77011D@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16722

Modified Files:
	config-powerpc32-generic kernel.spec 
Log Message:
Restore most of the drivers dropped in the 2.6.26 update. (F8#460853)


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-powerpc32-generic,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- config-powerpc32-generic	4 Aug 2008 22:20:04 -0000	1.9
+++ config-powerpc32-generic	2 Sep 2008 23:28:15 -0000	1.10
@@ -13,28 +13,8 @@
 CONFIG_PPC_PREP=y
 
 # CONFIG_PPC_MPC5200_SIMPLE is not set
-# CONFIG_SATA_PMP is not set
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_SIL24 is not set
 CONFIG_SATA_FSL=m
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_MV is not set
 # CONFIG_SATA_NV is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_SX4 is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-# CONFIG_SATA_INIC162X is not set
-
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_MM is not set
-# CONFIG_MEGARAID_MAILBOX is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
 
 CONFIG_GIANFAR=m
 CONFIG_GFAR_NAPI=y
@@ -77,6 +57,7 @@
 CONFIG_FB_VALKYRIE=y
 CONFIG_FB_CT65550=y
 # CONFIG_BDI_SWITCH is not set
+
 CONFIG_MAC_FLOPPY=m
 # CONFIG_BLK_DEV_FD is not set
 
@@ -93,44 +74,14 @@
 # CONFIG_UDBG_RTAS_CONSOLE is not set
 CONFIG_BRIQ_PANEL=m
 
-# CONFIG_PATA_ALI is not set
+# CONFIG_ATA_PIIX is not set
 # CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-CONFIG_ATA_GENERIC=m
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_MARVELL is not set
 CONFIG_PATA_MPC52xx=m
 # CONFIG_PATA_MPIIX is not set
 # CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_NS87415 is not set
 # CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_QDI is not set
 # CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_WINBOND is not set
-
-# CONFIG_TR is not set
 
 CONFIG_SERIAL_MPC52xx=y
 CONFIG_SERIAL_MPC52xx_CONSOLE=y
@@ -151,22 +102,12 @@
 CONFIG_HIGH_RES_TIMERS=y
 
 # CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_BLK_DEV_4DRIVES is not set
 # CONFIG_BLK_DEV_ALI14XX is not set
 # CONFIG_BLK_DEV_DTC2278 is not set
 # CONFIG_BLK_DEV_HT6560B is not set
 # CONFIG_BLK_DEV_QD65XX is not set
 # CONFIG_BLK_DEV_UMC8672 is not set
-# CONFIG_BLK_DEV_DELKIN is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_SX8 is not set
-
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
 
 # CONFIG_VIRQ_DEBUG is not set
 
@@ -186,92 +127,17 @@
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_HTC_EGPIO is not set
 
-# CONFIG_PARIDE is not set
-# CONFIG_PARPORT_PC_PCMCIA is not set
-# CONFIG_MTD is not set
 # CONFIG_TIFM_CORE is not set
 
-# CONFIG_RFKILL is not set
-# CONFIG_DONGLE is not set
-# CONFIG_IP_VS is not set
-
-
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_CISS_SCSI_TAPE is not set
-# CONFIG_ATA_OVER_ETH is not set
-
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_FC_TGT_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_ARCMSR_AER is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_PPA is not set
-# CONFIG_SCSI_IMM is not set
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-
-# CONFIG_ISCSI_TCP is not set
-
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SAS_ATA is not set
-# CONFIG_SCSI_SAS_HOST_SMP is not set
-
-# CONFIG_FUSION is not set
-
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
-
-# CONFIG_IWLWIFI is not set
-# CONFIG_IWLCORE is not set
-# CONFIG_IWL3945 is not set
-# CONFIG_IWL4965 is not set
-# CONFIG_ISDN is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_PCIPCWATCHDOG is not set
-# CONFIG_WDTPCI is not set
-# CONFIG_WDT_501_PCI is not set
 
 # CONFIG_I2C_NFORCE2 is not set
 
-# CONFIG_SND_ADLIB is not set
-# CONFIG_SND_CS4236 is not set
-# CONFIG_SND_SC6000 is not set
-# CONFIG_SND_OPL3SA2 is not set
-# CONFIG_SND_MIRO is not set
-# CONFIG_SND_SB16 is not set
-# CONFIG_SND_SBAWE is not set
-# CONFIG_SND_HDA_INTEL is not set
-# CONFIG_SND_YMFPCI is not set
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
 
-# CONFIG_MMC is not set
 # CONFIG_MEMSTICK is not set
-# CONFIG_INFINIBAND is not set
 
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_TCG_TPM is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.754
retrieving revision 1.755
diff -u -r1.754 -r1.755
--- kernel.spec	31 Aug 2008 04:51:20 -0000	1.754
+++ kernel.spec	2 Sep 2008 23:28:15 -0000	1.755
@@ -1822,6 +1822,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Tue Sep 02 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.3-28
+- Restore most of the drivers dropped in the 2.6.26 update. (F8#460853)
+
 * Sat Aug 30 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.3-27
 - x86-32: amd c1e force timer broadcast late
   (fixes failure to disable local apic timer)



From mclasen at fedoraproject.org  Tue Sep  2 23:29:52 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  2 Sep 2008 23:29:52 +0000 (UTC)
Subject: rpms/mousetweaks/devel mousetweaks.spec,1.12,1.13
Message-ID: <20080902232952.EE02B7011D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/mousetweaks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16770

Modified Files:
	mousetweaks.spec 
Log Message:
add missing BRs



Index: mousetweaks.spec
===================================================================
RCS file: /cvs/extras/rpms/mousetweaks/devel/mousetweaks.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mousetweaks.spec	2 Sep 2008 23:16:02 -0000	1.12
+++ mousetweaks.spec	2 Sep 2008 23:29:22 -0000	1.13
@@ -15,6 +15,7 @@
 BuildRequires:  GConf2-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  libXcursor-devel
+BuildRequires:  libXtst-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  gnome-panel-devel
 BuildRequires:  at-spi-devel



From mclasen at fedoraproject.org  Tue Sep  2 23:32:09 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  2 Sep 2008 23:32:09 +0000 (UTC)
Subject: rpms/gcalctool/devel .cvsignore, 1.46, 1.47 gcalctool.spec, 1.71,
	1.72 sources, 1.47, 1.48
Message-ID: <20080902233209.E50357011D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gcalctool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16981

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	22 Aug 2008 22:42:44 -0000	1.46
+++ .cvsignore	2 Sep 2008 23:31:39 -0000	1.47
@@ -1 +1 @@
-gcalctool-5.23.90.tar.bz2
+gcalctool-5.23.91.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- gcalctool.spec	22 Aug 2008 22:42:44 -0000	1.71
+++ gcalctool.spec	2 Sep 2008 23:31:39 -0000	1.72
@@ -1,5 +1,5 @@
 Name:           gcalctool
-Version:        5.23.90
+Version:        5.23.91
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 5.23.91-1
+- Update to 5.23.91
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 5.23.90-1
 - Update to 5.23.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	22 Aug 2008 22:42:44 -0000	1.47
+++ sources	2 Sep 2008 23:31:39 -0000	1.48
@@ -1 +1 @@
-6d9ae9c978f57d6b9d17d403ec589b3d  gcalctool-5.23.90.tar.bz2
+2643852ed7956e7c5e6a6cfb88df26fe  gcalctool-5.23.91.tar.bz2



From cebbert at fedoraproject.org  Tue Sep  2 23:32:29 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue,  2 Sep 2008 23:32:29 +0000 (UTC)
Subject: rpms/kernel/F-8 config-powerpc32-generic, 1.6, 1.7 kernel.spec,
	1.522, 1.523
Message-ID: <20080902233229.51DB57011D@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17010

Modified Files:
	config-powerpc32-generic kernel.spec 
Log Message:
Restore most of the drivers dropped in the 2.6.26 update. (#460853)


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-powerpc32-generic,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config-powerpc32-generic	8 Aug 2008 18:56:00 -0000	1.6
+++ config-powerpc32-generic	2 Sep 2008 23:31:58 -0000	1.7
@@ -13,28 +13,8 @@
 CONFIG_PPC_PREP=y
 
 # CONFIG_PPC_MPC5200_SIMPLE is not set
-# CONFIG_SATA_PMP is not set
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_SIL24 is not set
 CONFIG_SATA_FSL=m
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_MV is not set
 # CONFIG_SATA_NV is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_SX4 is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-# CONFIG_SATA_INIC162X is not set
-
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_MM is not set
-# CONFIG_MEGARAID_MAILBOX is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
 
 CONFIG_GIANFAR=m
 CONFIG_GFAR_NAPI=y
@@ -77,6 +57,7 @@
 CONFIG_FB_VALKYRIE=y
 CONFIG_FB_CT65550=y
 # CONFIG_BDI_SWITCH is not set
+
 CONFIG_MAC_FLOPPY=m
 # CONFIG_BLK_DEV_FD is not set
 
@@ -93,44 +74,14 @@
 # CONFIG_UDBG_RTAS_CONSOLE is not set
 CONFIG_BRIQ_PANEL=m
 
-# CONFIG_PATA_ALI is not set
+# CONFIG_ATA_PIIX is not set
 # CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-CONFIG_ATA_GENERIC=m
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_MARVELL is not set
 CONFIG_PATA_MPC52xx=m
 # CONFIG_PATA_MPIIX is not set
 # CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_NS87415 is not set
 # CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_QDI is not set
 # CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_WINBOND is not set
-
-# CONFIG_TR is not set
 
 CONFIG_SERIAL_MPC52xx=y
 CONFIG_SERIAL_MPC52xx_CONSOLE=y
@@ -151,22 +102,12 @@
 CONFIG_HIGH_RES_TIMERS=y
 
 # CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_BLK_DEV_4DRIVES is not set
 # CONFIG_BLK_DEV_ALI14XX is not set
 # CONFIG_BLK_DEV_DTC2278 is not set
 # CONFIG_BLK_DEV_HT6560B is not set
 # CONFIG_BLK_DEV_QD65XX is not set
 # CONFIG_BLK_DEV_UMC8672 is not set
-# CONFIG_BLK_DEV_DELKIN is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_SX8 is not set
-
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
 
 # CONFIG_VIRQ_DEBUG is not set
 
@@ -186,92 +127,17 @@
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_HTC_EGPIO is not set
 
-# CONFIG_PARIDE is not set
-# CONFIG_PARPORT_PC_PCMCIA is not set
-# CONFIG_MTD is not set
 # CONFIG_TIFM_CORE is not set
 
-# CONFIG_RFKILL is not set
-# CONFIG_DONGLE is not set
-# CONFIG_IP_VS is not set
-
-
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_CISS_SCSI_TAPE is not set
-# CONFIG_ATA_OVER_ETH is not set
-
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_FC_TGT_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_ARCMSR_AER is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_PPA is not set
-# CONFIG_SCSI_IMM is not set
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-
-# CONFIG_ISCSI_TCP is not set
-
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SAS_ATA is not set
-# CONFIG_SCSI_SAS_HOST_SMP is not set
-
-# CONFIG_FUSION is not set
-
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
-
-# CONFIG_IWLWIFI is not set
-# CONFIG_IWLCORE is not set
-# CONFIG_IWL3945 is not set
-# CONFIG_IWL4965 is not set
-# CONFIG_ISDN is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_PCIPCWATCHDOG is not set
-# CONFIG_WDTPCI is not set
-# CONFIG_WDT_501_PCI is not set
 
 # CONFIG_I2C_NFORCE2 is not set
 
-# CONFIG_SND_ADLIB is not set
-# CONFIG_SND_CS4236 is not set
-# CONFIG_SND_SC6000 is not set
-# CONFIG_SND_OPL3SA2 is not set
-# CONFIG_SND_MIRO is not set
-# CONFIG_SND_SB16 is not set
-# CONFIG_SND_SBAWE is not set
-# CONFIG_SND_HDA_INTEL is not set
-# CONFIG_SND_YMFPCI is not set
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
 
-# CONFIG_MMC is not set
 # CONFIG_MEMSTICK is not set
-# CONFIG_INFINIBAND is not set
 
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_TCG_TPM is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -r1.522 -r1.523
--- kernel.spec	31 Aug 2008 05:18:36 -0000	1.522
+++ kernel.spec	2 Sep 2008 23:31:59 -0000	1.523
@@ -1813,6 +1813,9 @@
 
 
 %changelog
+* Tue Sep 02 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.3-13
+- Restore most of the drivers dropped in the 2.6.26 update. (#460853)
+
 * Sat Aug 30 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.3-12
 - x86-32: amd c1e force timer broadcast late
   (fixes failure to disable local apic timer)



From mclasen at fedoraproject.org  Tue Sep  2 23:41:04 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  2 Sep 2008 23:41:04 +0000 (UTC)
Subject: rpms/evince/devel .cvsignore, 1.49, 1.50 evince.spec, 1.127,
	1.128 sources, 1.48, 1.49
Message-ID: <20080902234104.B771E7011D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/evince/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17338

Modified Files:
	.cvsignore evince.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	7 Aug 2008 03:32:20 -0000	1.49
+++ .cvsignore	2 Sep 2008 23:40:34 -0000	1.50
@@ -1 +1 @@
-evince-2.23.6.tar.bz2
+evince-2.23.91.tar.bz2


Index: evince.spec
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/evince.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- evince.spec	28 Aug 2008 21:02:58 -0000	1.127
+++ evince.spec	2 Sep 2008 23:40:34 -0000	1.128
@@ -5,8 +5,8 @@
 %define theme_version 2.17.1
 
 Name:		evince
-Version:	2.23.6
-Release:	2%{?dist}
+Version:	2.23.91
+Release:	1%{?dist}
 Summary:	Document viewer
 
 License: 	GPLv2+ and GFDL
@@ -22,7 +22,6 @@
 BuildRequires:	libXt-devel
 BuildRequires:	nautilus-devel
 BuildRequires:  gnome-keyring-devel
-BuildRequires:	libgnomeui-devel
 BuildRequires:	libglade2-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libjpeg-devel
@@ -34,7 +33,9 @@
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  desktop-file-utils
 BuildRequires:  gnome-icon-theme >= %{theme_version}
-BuildRequires:  libtool gtk-doc intltool
+BuildRequires:  libtool
+BuildRequires:  gtk-doc 
+BuildRequires:  intltool
 
 # for the dvi backend
 BuildRequires: kpathsea-devel
@@ -230,6 +231,9 @@
 %{_libdir}/evince/backends/djvudocument.evince-backend
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.23.6-2
 - Include %%_libdir/evince directory.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	7 Aug 2008 03:32:20 -0000	1.48
+++ sources	2 Sep 2008 23:40:34 -0000	1.49
@@ -1 +1 @@
-04763835f04c3c8f52bfcef2041948a9  evince-2.23.6.tar.bz2
+cd8f03186172147d74c3c0a488389e89  evince-2.23.91.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  2 23:44:49 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  2 Sep 2008 23:44:49 +0000 (UTC)
Subject: rpms/cheese/devel .cvsignore, 1.15, 1.16 cheese.spec, 1.29,
	1.30 sources, 1.15, 1.16
Message-ID: <20080902234449.975E77011D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/cheese/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17496

Modified Files:
	.cvsignore cheese.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cheese/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	23 Aug 2008 02:43:52 -0000	1.15
+++ .cvsignore	2 Sep 2008 23:44:19 -0000	1.16
@@ -1 +1 @@
-cheese-2.23.90.tar.bz2
+cheese-2.23.91.tar.bz2


Index: cheese.spec
===================================================================
RCS file: /cvs/extras/rpms/cheese/devel/cheese.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- cheese.spec	23 Aug 2008 02:54:53 -0000	1.29
+++ cheese.spec	2 Sep 2008 23:44:19 -0000	1.30
@@ -1,5 +1,5 @@
 Name:           cheese
-Version:        2.23.90
+Version:        2.23.91
 Release:        1%{?dist}
 Summary:        A webcam application for snapshots and movies
 
@@ -108,6 +108,9 @@
 %{_datadir}/dbus-1/services/org.gnome.Cheese.service
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen  <mclasen at redhat.com> 2.23.91-1
+- Update to 2.23.91
+
 * Fri Aug 22 2008 Matthias Clasen  <mclasen at redhat.com> 2.23.90-1
 - Update to 2.23.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cheese/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	23 Aug 2008 02:43:52 -0000	1.15
+++ sources	2 Sep 2008 23:44:19 -0000	1.16
@@ -1 +1 @@
-400cf7e2456a0c1a0764fdb4b27e8f13  cheese-2.23.90.tar.bz2
+2de86694e145ce455ae1063acb45a18b  cheese-2.23.91.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  2 23:53:32 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  2 Sep 2008 23:53:32 +0000 (UTC)
Subject: rpms/gnome-themes/devel .cvsignore, 1.63, 1.64 gnome-themes.spec,
	1.115, 1.116 sources, 1.68, 1.69
Message-ID: <20080902235332.885E07011E@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-themes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18183

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	22 Aug 2008 22:29:38 -0000	1.63
+++ .cvsignore	2 Sep 2008 23:53:02 -0000	1.64
@@ -1 +1 @@
-gnome-themes-2.23.90.tar.bz2
+gnome-themes-2.23.91.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- gnome-themes.spec	22 Aug 2008 22:56:02 -0000	1.115
+++ gnome-themes.spec	2 Sep 2008 23:53:02 -0000	1.116
@@ -1,6 +1,6 @@
 Summary: Themes collection for GNOME
 Name: gnome-themes
-Version: 2.23.90
+Version: 2.23.91
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/gnome-themes/
 Source: http://download.gnome.org/sources/gnome-themes/2.23/%{name}-%{version}.tar.bz2
@@ -94,6 +94,9 @@
 %doc AUTHORS COPYING NEWS README
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-1
 - Update to 2.23.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	22 Aug 2008 22:29:38 -0000	1.68
+++ sources	2 Sep 2008 23:53:02 -0000	1.69
@@ -1 +1 @@
-d392438a9e38dfe133c8fe5c258edd4a  gnome-themes-2.23.90.tar.bz2
+e05b69e2bddcabf2d487bd2752715e25  gnome-themes-2.23.91.tar.bz2



From mclasen at fedoraproject.org  Wed Sep  3 00:00:56 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 00:00:56 +0000 (UTC)
Subject: rpms/libwnck/devel .cvsignore, 1.64, 1.65 libwnck.spec, 1.99,
	1.100 sources, 1.64, 1.65
Message-ID: <20080903000056.812A870121@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libwnck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18719

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	5 Aug 2008 03:39:11 -0000	1.64
+++ .cvsignore	3 Sep 2008 00:00:25 -0000	1.65
@@ -1 +1 @@
-libwnck-2.23.6.tar.bz2
+libwnck-2.23.91.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- libwnck.spec	5 Aug 2008 03:39:11 -0000	1.99
+++ libwnck.spec	3 Sep 2008 00:00:26 -0000	1.100
@@ -5,7 +5,7 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.23.6
+Version: 2.23.91
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/libwnck/
 Source0: http://download.gnome.org/sources/libwnck/2.23/%{name}-%{version}.tar.bz2
@@ -93,6 +93,9 @@
 %doc %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Mon Aug  4 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.6-1
 - Update to 2.23.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	5 Aug 2008 03:39:11 -0000	1.64
+++ sources	3 Sep 2008 00:00:26 -0000	1.65
@@ -1 +1 @@
-9c6d134dc1d454b4c5a717638caa56c6  libwnck-2.23.6.tar.bz2
+2afd35e602844c3c859f3a41b701545d  libwnck-2.23.91.tar.bz2



From mclasen at fedoraproject.org  Wed Sep  3 00:12:34 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 00:12:34 +0000 (UTC)
Subject: rpms/libgweather/devel .cvsignore, 1.11, 1.12 libgweather.spec, 1.20,
	1.21 sources, 1.11, 1.12
Message-ID: <20080903001234.8E2A870121@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgweather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19433

Modified Files:
	.cvsignore libgweather.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgweather/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	5 Aug 2008 03:45:51 -0000	1.11
+++ .cvsignore	3 Sep 2008 00:12:04 -0000	1.12
@@ -1 +1 @@
-libgweather-2.23.6.tar.bz2
+libgweather-2.23.91.tar.bz2


Index: libgweather.spec
===================================================================
RCS file: /cvs/extras/rpms/libgweather/devel/libgweather.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libgweather.spec	5 Aug 2008 03:45:51 -0000	1.20
+++ libgweather.spec	3 Sep 2008 00:12:04 -0000	1.21
@@ -1,5 +1,5 @@
 Name:           libgweather
-Version:        2.23.6
+Version:        2.23.91
 Release:        1%{?dist}
 Summary:        A library for weather information 
 
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> 2.23.91-1
+- Update to 2.23.91
+
 * Mon Aug  4 2008 Matthias Clasen <mclasen at redhat.com> 2.23.6-1
 - Update to 2.23.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgweather/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Aug 2008 03:45:51 -0000	1.11
+++ sources	3 Sep 2008 00:12:04 -0000	1.12
@@ -1 +1 @@
-3e6a079f0402025495ea7b3a39c3fad4  libgweather-2.23.6.tar.bz2
+d4fb29abc1d3afc10c864376d1fd6732  libgweather-2.23.91.tar.bz2



From mclasen at fedoraproject.org  Wed Sep  3 00:15:17 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 00:15:17 +0000 (UTC)
Subject: rpms/libgweather/devel libgweather.spec,1.21,1.22
Message-ID: <20080903001517.4159C70121@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgweather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19637

Modified Files:
	libgweather.spec 
Log Message:
2.23.91



Index: libgweather.spec
===================================================================
RCS file: /cvs/extras/rpms/libgweather/devel/libgweather.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libgweather.spec	3 Sep 2008 00:12:04 -0000	1.21
+++ libgweather.spec	3 Sep 2008 00:14:46 -0000	1.22
@@ -13,6 +13,7 @@
 BuildRequires:  GConf2-devel >= 2.8.0
 BuildRequires:  gtk2-devel >= 2.11.0
 BuildRequires:  libsoup-devel >= 2.4
+BuildRequires:  libxml2-devel >= 2.6
 BuildRequires:  gettext
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  intltool



From mclasen at fedoraproject.org  Wed Sep  3 00:29:32 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 00:29:32 +0000 (UTC)
Subject: rpms/orca/devel .cvsignore, 1.37, 1.38 orca.spec, 1.63, 1.64 sources,
	1.38, 1.39
Message-ID: <20080903002933.04F997011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/orca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20784

Modified Files:
	.cvsignore orca.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	23 Aug 2008 04:16:27 -0000	1.37
+++ .cvsignore	3 Sep 2008 00:29:02 -0000	1.38
@@ -1 +1 @@
-orca-2.23.90.tar.bz2
+orca-2.23.91.tar.bz2


Index: orca.spec
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/orca.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- orca.spec	26 Aug 2008 04:53:43 -0000	1.63
+++ orca.spec	3 Sep 2008 00:29:02 -0000	1.64
@@ -17,8 +17,8 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.23.90
-Release: 	2%{?dist}
+Version:	2.23.91
+Release: 	1%{?dist}
 Summary:	Flexible, extensible, and powerful assistive technology
 
 Group:		User Interface/Desktops
@@ -40,7 +40,6 @@
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	gettext
 BuildRequires:	intltool
-BuildRequires:  autoconf, automake, libtool
 BuildRequires:  gnome-python2-bonobo
 BuildRequires:  gnome-python2-libwnck
 Obsoletes:	gnopernicus
@@ -53,9 +52,6 @@
 Requires:	gnome-python2-libwnck
 Requires:	gnome-python2-gnome
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=549117
-Patch0: 	no-display.patch
-
 %description
 Orca is a flexible, extensible, and powerful assistive technology for people
 with visual impairments. Using various combinations of speech synthesis,
@@ -64,12 +60,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .no-display
-# no-display patch changes configure.in
-libtoolize --force --copy
-aclocal
-automake
-autoconf
 
 %build
 %configure
@@ -117,6 +107,9 @@
 
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Tue Aug 26 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-2
 - Require gnome-python2-gnome
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	23 Aug 2008 04:16:27 -0000	1.38
+++ sources	3 Sep 2008 00:29:02 -0000	1.39
@@ -1 +1 @@
-409140cd6787a2f1b36b476832019616  orca-2.23.90.tar.bz2
+bfe93e7e9f4b89c90943faced977f3fb  orca-2.23.91.tar.bz2



From mclasen at fedoraproject.org  Wed Sep  3 00:32:04 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 00:32:04 +0000 (UTC)
Subject: rpms/gtk2-engines/devel .cvsignore, 1.54, 1.55 gtk2-engines.spec,
	1.94, 1.95 sources, 1.55, 1.56
Message-ID: <20080903003204.A82B37011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2-engines/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21211

Modified Files:
	.cvsignore gtk2-engines.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	22 Aug 2008 22:38:05 -0000	1.54
+++ .cvsignore	3 Sep 2008 00:31:34 -0000	1.55
@@ -1 +1 @@
-gtk-engines-2.15.3.tar.bz2
+gtk-engines-2.15.4.tar.bz2


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- gtk2-engines.spec	22 Aug 2008 22:38:05 -0000	1.94
+++ gtk2-engines.spec	3 Sep 2008 00:31:34 -0000	1.95
@@ -2,7 +2,7 @@
 
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
-Version:        2.15.3
+Version:        2.15.4
 Release:	1%{?dist}
 # for details on which engines are GPL vs LGPL, see COPYING
 License:        GPLv2+ and LGPLv2+
@@ -67,6 +67,9 @@
 %{_datadir}/gtk-engines
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
+- Update to 2.15.4
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
 - Update to 2.15.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	22 Aug 2008 22:38:05 -0000	1.55
+++ sources	3 Sep 2008 00:31:34 -0000	1.56
@@ -1 +1 @@
-3d5746d42c2cef7bef0650784f28dbb3  gtk-engines-2.15.3.tar.bz2
+060ea25c471e5f4cf5c1baeac27d0345  gtk-engines-2.15.4.tar.bz2



From cebbert at fedoraproject.org  Wed Sep  3 00:35:08 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  3 Sep 2008 00:35:08 +0000 (UTC)
Subject: rpms/kernel/devel
	linux-2.6-selinux-memory-leak-in-security-context-to-sid-core.patch, 
	NONE, 1.1 kernel.spec, 1.921, 1.922
Message-ID: <20080903003508.6018B7011F@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21617

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-selinux-memory-leak-in-security-context-to-sid-core.patch 
Log Message:
Fix selinux memory leak (#460848)

linux-2.6-selinux-memory-leak-in-security-context-to-sid-core.patch:

--- NEW FILE linux-2.6-selinux-memory-leak-in-security-context-to-sid-core.patch ---
From: Eric Paris <eparis at redhat.com>
Date: Tue, 2 Sep 2008 21:15:11 +0000 (-0400)
Subject: SELinux: memory leak in security_context_to_sid_core
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjmorris%2Fsecurity-testing-2.6.git;a=commitdiff_plain;h=b14c3a15b26f22f7a11c4f11092314665b1dc45d

SELinux: memory leak in security_context_to_sid_core

Memory leak in security_context_to_sid_core() as a result of the
deferred context patches.  Code audit found another possible leak in
string_to_context_struct() so I fixed that error path as well.

This is a regression since 2.6.26.

Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
---

diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index b52f923..e1090c1 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -805,18 +805,20 @@ static int string_to_context_struct(struct policydb *pol,
 
 	if ((p - scontext) < scontext_len) {
 		rc = -EINVAL;
-		goto out;
+		goto out_destroy;
 	}
 
 	/* Check the validity of the new context. */
 	if (!policydb_context_isvalid(pol, ctx)) {
 		rc = -EINVAL;
-		context_destroy(ctx);
-		goto out;
+		goto out_destroy;
 	}
 	rc = 0;
 out:
 	return rc;
+out_destroy:
+	context_destroy(ctx);
+	goto out;
 }
 
 static int security_context_to_sid_core(const char *scontext, u32 scontext_len,
@@ -868,10 +870,9 @@ static int security_context_to_sid_core(const char *scontext, u32 scontext_len,
 	} else if (rc)
 		goto out;
 	rc = sidtab_context_to_sid(&sidtab, &context, sid);
-	if (rc)
-		context_destroy(&context);
 out:
 	read_unlock(&policy_rwlock);
+	context_destroy(&context);
 	kfree(scontext2);
 	kfree(str);
 	return rc;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.921
retrieving revision 1.922
diff -u -r1.921 -r1.922
--- kernel.spec	2 Sep 2008 22:27:17 -0000	1.921
+++ kernel.spec	3 Sep 2008 00:34:38 -0000	1.922
@@ -642,6 +642,9 @@
 # silence the ACPI blacklist code
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
 
+# fix selinux memory leak, patch headed upstream
+Patch3000:  linux-2.6-selinux-memory-leak-in-security-context-to-sid-core.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1176,7 +1179,7 @@
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
 
-# ---------- below all scheduled for 2.6.24 -----------------
+ApplyPatch  linux-2.6-selinux-memory-leak-in-security-context-to-sid-core.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1750,6 +1753,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Sep 02 2008 Chuck Ebbert <cebbert at redhat.com>
+- Fix selinux memory leak (#460848)
+
 * Tue Sep 02 2008 Jarod Wilson <jarod at redhat.com>
 - Rename lirc_pvr150 to more appropriate lirc_zilog
 



From davej at fedoraproject.org  Wed Sep  3 00:42:02 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Wed,  3 Sep 2008 00:42:02 +0000 (UTC)
Subject: rpms/kernel/devel .cvsignore, 1.912, 1.913 kernel.spec, 1.922,
	1.923 sources, 1.875, 1.876 upstream, 1.788, 1.789
Message-ID: <20080903004202.5FEF47011F@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22355

Modified Files:
	.cvsignore kernel.spec sources upstream 
Log Message:
2.6.27-rc5-git3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.912
retrieving revision 1.913
diff -u -r1.912 -r1.913
--- .cvsignore	30 Aug 2008 16:31:22 -0000	1.912
+++ .cvsignore	3 Sep 2008 00:41:31 -0000	1.913
@@ -5,4 +5,4 @@
 kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc5.bz2
-patch-2.6.27-rc5-git2.bz2
+patch-2.6.27-rc5-git3.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.922
retrieving revision 1.923
diff -u -r1.922 -r1.923
--- kernel.spec	3 Sep 2008 00:34:38 -0000	1.922
+++ kernel.spec	3 Sep 2008 00:41:31 -0000	1.923
@@ -45,7 +45,7 @@
 # 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
@@ -1753,6 +1753,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Sep 02 2008 Dave Jones <davej at redhat.com>
+- 2.6.27-rc5-git3
+
 * Tue Sep 02 2008 Chuck Ebbert <cebbert at redhat.com>
 - Fix selinux memory leak (#460848)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.875
retrieving revision 1.876
diff -u -r1.875 -r1.876
--- sources	30 Aug 2008 16:31:22 -0000	1.875
+++ sources	3 Sep 2008 00:41:31 -0000	1.876
@@ -1,3 +1,3 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 d91adda8bcf04852048b8eab06eeae3d  patch-2.6.27-rc5.bz2
-8fc7c1f780ce0f08c4dafa54f47dd8f4  patch-2.6.27-rc5-git2.bz2
+1ce15320844f500f7866e183948b8a93  patch-2.6.27-rc5-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.788
retrieving revision 1.789
diff -u -r1.788 -r1.789
--- upstream	30 Aug 2008 16:31:23 -0000	1.788
+++ upstream	3 Sep 2008 00:41:31 -0000	1.789
@@ -1,3 +1,3 @@
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc5.bz2
-patch-2.6.27-rc5-git2.bz2
+patch-2.6.27-rc5-git3.bz2



From davej at fedoraproject.org  Wed Sep  3 00:42:59 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Wed,  3 Sep 2008 00:42:59 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc5-git3.bz2.sign, NONE,
	1.1 patch-2.6.27-rc5-git2.bz2.sign, 1.1, NONE
Message-ID: <20080903004259.096267011F@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22533

Added Files:
	patch-2.6.27-rc5-git3.bz2.sign 
Removed Files:
	patch-2.6.27-rc5-git2.bz2.sign 
Log Message:
2.6.27-rc5-git3


--- NEW FILE patch-2.6.27-rc5-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIvdQ5yGugalF9Dw4RAipVAJ9XJL8HyjHtgN2+hmTyF2ZHBSiiFgCgj3jm
+nX34hNSPeRipgnV9AZmd18=
=LCmf
-----END PGP SIGNATURE-----


--- patch-2.6.27-rc5-git2.bz2.sign DELETED ---



From mclasen at fedoraproject.org  Wed Sep  3 00:48:44 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 00:48:44 +0000 (UTC)
Subject: rpms/gnome-menus/devel .cvsignore, 1.45, 1.46 gnome-menus.spec, 1.86,
	1.87 sources, 1.45, 1.46
Message-ID: <20080903004844.771467011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-menus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23052

Modified Files:
	.cvsignore gnome-menus.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	5 Aug 2008 04:15:10 -0000	1.45
+++ .cvsignore	3 Sep 2008 00:48:14 -0000	1.46
@@ -1 +1 @@
-gnome-menus-2.23.6.tar.bz2
+gnome-menus-2.23.91.tar.bz2


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- gnome-menus.spec	5 Aug 2008 04:15:10 -0000	1.86
+++ gnome-menus.spec	3 Sep 2008 00:48:14 -0000	1.87
@@ -5,7 +5,7 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.23.6
+Version: 2.23.91
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -99,6 +99,9 @@
 %{_includedir}/gnome-menus
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Tue Aug  5 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.6-1
 - Update to 2.23.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	5 Aug 2008 04:15:10 -0000	1.45
+++ sources	3 Sep 2008 00:48:14 -0000	1.46
@@ -1 +1 @@
-bc921ce52815009498c63031933ff906  gnome-menus-2.23.6.tar.bz2
+33125708678e1fb5225e48d1f93f1ea9  gnome-menus-2.23.91.tar.bz2



From mclasen at fedoraproject.org  Wed Sep  3 00:52:43 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 00:52:43 +0000 (UTC)
Subject: rpms/gconf-editor/devel .cvsignore, 1.26, 1.27 gconf-editor.spec,
	1.52, 1.53 sources, 1.26, 1.27
Message-ID: <20080903005243.C1B257011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gconf-editor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23775

Modified Files:
	.cvsignore gconf-editor.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	11 Mar 2008 03:42:34 -0000	1.26
+++ .cvsignore	3 Sep 2008 00:52:13 -0000	1.27
@@ -1 +1 @@
-gconf-editor-2.22.0.tar.bz2
+gconf-editor-2.23.91.tar.bz2


Index: gconf-editor.spec
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gconf-editor.spec	27 Jul 2008 02:00:45 -0000	1.52
+++ gconf-editor.spec	3 Sep 2008 00:52:13 -0000	1.53
@@ -7,8 +7,8 @@
 
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
-Version: 2.22.0
-Release: 2%{?dist}
+Version: 2.23.91
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gconf-editor/2.22/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL
@@ -108,6 +108,9 @@
 %dir %{_datadir}/omf/gconf-editor
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Sat Jul 26 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-2
 - Fix missing icon
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	11 Mar 2008 03:42:34 -0000	1.26
+++ sources	3 Sep 2008 00:52:13 -0000	1.27
@@ -1 +1 @@
-7ca99aec214dd855b5de7dacc8937055  gconf-editor-2.22.0.tar.bz2
+61e4e284c8f73d24858195800a6c61fe  gconf-editor-2.23.91.tar.bz2



From mclasen at fedoraproject.org  Wed Sep  3 00:55:52 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 00:55:52 +0000 (UTC)
Subject: rpms/gnome-mag/devel gnome-mag.spec,1.56,1.57
Message-ID: <20080903005552.B3B727011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-mag/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24252

Modified Files:
	gnome-mag.spec 
Log Message:
0.15.3



Index: gnome-mag.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gnome-mag.spec	4 Aug 2008 03:42:34 -0000	1.56
+++ gnome-mag.spec	3 Sep 2008 00:55:22 -0000	1.57
@@ -2,7 +2,7 @@
 
 Summary: GNOME Magnifier
 Name: gnome-mag
-Version: 0.15.2
+Version: 0.15.3
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
@@ -74,6 +74,9 @@
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 0.15.3-1
+- Update to 0.15.3
+
 * Sun Aug  3 2008 Matthias Clasen <mclasen at redhat.com> - 0.15.2-1
 - Update to 0.15.2
 



From mclasen at fedoraproject.org  Wed Sep  3 00:59:49 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 00:59:49 +0000 (UTC)
Subject: rpms/vinagre/devel .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 vinagre.spec, 1.29, 1.30
Message-ID: <20080903005949.1561E7011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24740

Modified Files:
	.cvsignore sources vinagre.spec 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vinagre/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	23 Aug 2008 02:11:24 -0000	1.13
+++ .cvsignore	3 Sep 2008 00:59:18 -0000	1.14
@@ -1 +1 @@
-vinagre-2.23.90.tar.bz2
+vinagre-2.23.91.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vinagre/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	23 Aug 2008 02:11:24 -0000	1.13
+++ sources	3 Sep 2008 00:59:18 -0000	1.14
@@ -1 +1 @@
-b59005762742fd20ed1a691b1b83d860  vinagre-2.23.90.tar.bz2
+257a7d5f23d74a591a3a4469012d2301  vinagre-2.23.91.tar.bz2


Index: vinagre.spec
===================================================================
RCS file: /cvs/extras/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- vinagre.spec	23 Aug 2008 02:11:24 -0000	1.29
+++ vinagre.spec	3 Sep 2008 00:59:18 -0000	1.30
@@ -1,5 +1,5 @@
 Name:		vinagre
-Version:	2.23.90
+Version:	2.23.91
 Release:	1%{?dist}
 Summary:	VNC client for the GNOME desktop
 
@@ -101,6 +101,9 @@
 %doc README NEWS COPYING AUTHORS
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-1
 - Update to 2.23.90
 



From mclasen at fedoraproject.org  Wed Sep  3 01:05:05 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 01:05:05 +0000 (UTC)
Subject: rpms/evince/devel evince.spec,1.128,1.129
Message-ID: <20080903010505.52B197011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/evince/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25370

Modified Files:
	evince.spec 
Log Message:
fix BRs



Index: evince.spec
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/evince.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- evince.spec	2 Sep 2008 23:40:34 -0000	1.128
+++ evince.spec	3 Sep 2008 01:04:34 -0000	1.129
@@ -36,6 +36,7 @@
 BuildRequires:  libtool
 BuildRequires:  gtk-doc 
 BuildRequires:  intltool
+BuildRequires:  GConf2-devel
 
 # for the dvi backend
 BuildRequires: kpathsea-devel
@@ -89,8 +90,6 @@
 %patch0 -p1 -b .print-error
 
 %build
-intltoolize --force
-autoreconf
 %configure --disable-static --disable-scrollkeeper \
 	--with-print=gtk \
 	--enable-comics=yes \



From mclasen at fedoraproject.org  Wed Sep  3 01:09:38 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 01:09:38 +0000 (UTC)
Subject: rpms/gnome-media/devel .cvsignore, 1.43, 1.44 gnome-media.spec,
	1.136, 1.137 sources, 1.42, 1.43
Message-ID: <20080903010938.2ADDD7011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25830

Modified Files:
	.cvsignore gnome-media.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-media/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	4 Jun 2008 00:54:18 -0000	1.43
+++ .cvsignore	3 Sep 2008 01:09:06 -0000	1.44
@@ -1 +1 @@
-gnome-media-2.23.3.tar.bz2
+gnome-media-2.23.91.tar.bz2


Index: gnome-media.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- gnome-media.spec	1 Sep 2008 15:46:20 -0000	1.136
+++ gnome-media.spec	3 Sep 2008 01:09:06 -0000	1.137
@@ -13,8 +13,8 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.23.3
-Release:        4%{?dist}
+Version:        2.23.91
+Release:        1%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.23/gnome-media-%{version}.tar.bz2
@@ -201,6 +201,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com>  2.23.91-1
+- Update to 2.23.91
+
 * Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> 2.23.3-4
 - Update description (#448399)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-media/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	4 Jun 2008 00:54:18 -0000	1.42
+++ sources	3 Sep 2008 01:09:06 -0000	1.43
@@ -1 +1 @@
-b1b57dc3470cbd19ee4a64acd97deaf0  gnome-media-2.23.3.tar.bz2
+cfa4a675b3cc24c79a8821ac712c0deb  gnome-media-2.23.91.tar.bz2



From mclasen at fedoraproject.org  Wed Sep  3 01:13:39 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 01:13:39 +0000 (UTC)
Subject: rpms/gconf-editor/devel gconf-editor.spec, 1.53,
	1.54 icon-names.patch, 1.1, NONE
Message-ID: <20080903011339.1D3437011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gconf-editor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26278

Modified Files:
	gconf-editor.spec 
Removed Files:
	icon-names.patch 
Log Message:
drop upstreamed patch



Index: gconf-editor.spec
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gconf-editor.spec	3 Sep 2008 00:52:13 -0000	1.53
+++ gconf-editor.spec	3 Sep 2008 01:13:08 -0000	1.54
@@ -32,17 +32,12 @@
 BuildRequires: gnome-doc-utils
 BuildRequires: perl(XML::Parser)
 
-
-# fixed in upstream svn
-Patch0: icon-names.patch
-
 %description
 gconf-editor allows you to browse and modify GConf configuration 
 sources.
 
 %prep
 %setup -q
-%patch0 -p1 -b .icon-names
 
 %build
 %configure --disable-scrollkeeper


--- icon-names.patch DELETED ---



From mclasen at fedoraproject.org  Wed Sep  3 01:33:14 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 01:33:14 +0000 (UTC)
Subject: rpms/file-roller/devel .cvsignore, 1.75, 1.76 file-roller.spec,
	1.129, 1.130 sources, 1.75, 1.76
Message-ID: <20080903013314.83A7D7011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28258

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- .cvsignore	23 Aug 2008 01:22:57 -0000	1.75
+++ .cvsignore	3 Sep 2008 01:32:43 -0000	1.76
@@ -1 +1 @@
-file-roller-2.23.6.tar.bz2
+file-roller-2.23.91.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- file-roller.spec	23 Aug 2008 01:22:58 -0000	1.129
+++ file-roller.spec	3 Sep 2008 01:32:43 -0000	1.130
@@ -10,7 +10,7 @@
 
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
-Version:	2.23.6
+Version:	2.23.91
 Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
@@ -128,6 +128,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.6-1
 - Update to 2.23.6
 - Drop upstreamed patches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- sources	23 Aug 2008 01:22:58 -0000	1.75
+++ sources	3 Sep 2008 01:32:43 -0000	1.76
@@ -1 +1 @@
-ef4cd14f8129bfde4c6c49643cc91332  file-roller-2.23.6.tar.bz2
+c18d39e47b0ee1c80ac49709e8b20eef  file-roller-2.23.91.tar.bz2



From mclasen at fedoraproject.org  Wed Sep  3 01:34:04 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 01:34:04 +0000 (UTC)
Subject: rpms/gconf-editor/devel gconf-editor.spec,1.54,1.55
Message-ID: <20080903013404.DE8757011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gconf-editor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28347

Modified Files:
	gconf-editor.spec 
Log Message:
damn you, intltool



Index: gconf-editor.spec
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gconf-editor.spec	3 Sep 2008 01:13:08 -0000	1.54
+++ gconf-editor.spec	3 Sep 2008 01:33:34 -0000	1.55
@@ -31,6 +31,7 @@
 BuildRequires: gettext
 BuildRequires: gnome-doc-utils
 BuildRequires: perl(XML::Parser)
+BuildRequires: intltool
 
 %description
 gconf-editor allows you to browse and modify GConf configuration 



From mclasen at fedoraproject.org  Wed Sep  3 01:39:39 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 01:39:39 +0000 (UTC)
Subject: rpms/gnome-mag/devel .cvsignore,1.32,1.33 sources,1.33,1.34
Message-ID: <20080903013939.270A97011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-mag/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29001

Modified Files:
	.cvsignore sources 
Log Message:
0.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	4 Aug 2008 03:42:34 -0000	1.32
+++ .cvsignore	3 Sep 2008 01:39:08 -0000	1.33
@@ -1 +1 @@
-gnome-mag-0.15.2.tar.bz2
+gnome-mag-0.15.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	4 Aug 2008 03:42:34 -0000	1.33
+++ sources	3 Sep 2008 01:39:08 -0000	1.34
@@ -1 +1 @@
-11832e5e816d0c79c4bd46eaf94ee867  gnome-mag-0.15.2.tar.bz2
+1045cdf4e548564de7e653de0169c85a  gnome-mag-0.15.3.tar.bz2



From mclasen at fedoraproject.org  Wed Sep  3 01:44:08 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 01:44:08 +0000 (UTC)
Subject: rpms/gconf-editor/devel gconf-editor.spec,1.55,1.56
Message-ID: <20080903014408.994D07011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gconf-editor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29760

Modified Files:
	gconf-editor.spec 
Log Message:
fix file list



Index: gconf-editor.spec
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gconf-editor.spec	3 Sep 2008 01:33:34 -0000	1.55
+++ gconf-editor.spec	3 Sep 2008 01:43:38 -0000	1.56
@@ -97,6 +97,7 @@
 %doc AUTHORS COPYING NEWS README
 %{_bindir}/gconf-editor
 %{_datadir}/icons/hicolor/*/apps/gconf-editor.png
+%{_datadir}/icons/hicolor/16x16/status/*.png
 %{_datadir}/pixmaps/gconf-editor
 %{_datadir}/applications/gnome-gconf-editor.desktop
 %{_mandir}/man1/gconf-editor.1.gz



From mclasen at fedoraproject.org  Wed Sep  3 01:48:08 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 01:48:08 +0000 (UTC)
Subject: rpms/gnome-games-extra-data/devel .cvsignore, 1.8,
	1.9 gnome-games-extra-data.spec, 1.9, 1.10 sources, 1.8, 1.9
Message-ID: <20080903014808.BBE927011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-games-extra-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30541

Modified Files:
	.cvsignore gnome-games-extra-data.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-games-extra-data/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Mar 2008 04:23:50 -0000	1.8
+++ .cvsignore	3 Sep 2008 01:47:38 -0000	1.9
@@ -1 +1 @@
-gnome-games-extra-data-2.22.0.tar.bz2
+gnome-games-extra-data-2.24.0.tar.bz2


Index: gnome-games-extra-data.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-games-extra-data/devel/gnome-games-extra-data.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-games-extra-data.spec	26 Mar 2008 04:23:50 -0000	1.9
+++ gnome-games-extra-data.spec	3 Sep 2008 01:47:38 -0000	1.10
@@ -4,11 +4,11 @@
 
 Summary: GNOME games extra data
 Name: gnome-games-extra-data
-Version: 2.22.0
+Version: 2.24.0
 Release: 1
 License: GPL+
 Group: Amusements/Games
-Source: http://download.gnome.org/sources/gnome-games-extra-data/2.22/gnome-games-extra-data-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-games-extra-data/2.24/gnome-games-extra-data-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
 BuildArch: noarch
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Wed Mar 26 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-1
 - Update to 2.22.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-games-extra-data/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	26 Mar 2008 04:23:50 -0000	1.8
+++ sources	3 Sep 2008 01:47:38 -0000	1.9
@@ -1 +1 @@
-9c520b6766095f5ae1f0508adcf559c1  gnome-games-extra-data-2.22.0.tar.bz2
+6167bd439e1923c127885e253be4fdbe  gnome-games-extra-data-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Wed Sep  3 01:51:43 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 01:51:43 +0000 (UTC)
Subject: rpms/gconf-editor/devel gconf-editor.spec,1.56,1.57
Message-ID: <20080903015143.C12AB7011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gconf-editor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31175

Modified Files:
	gconf-editor.spec 
Log Message:
fix file list again



Index: gconf-editor.spec
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gconf-editor.spec	3 Sep 2008 01:43:38 -0000	1.56
+++ gconf-editor.spec	3 Sep 2008 01:51:13 -0000	1.57
@@ -97,7 +97,7 @@
 %doc AUTHORS COPYING NEWS README
 %{_bindir}/gconf-editor
 %{_datadir}/icons/hicolor/*/apps/gconf-editor.png
-%{_datadir}/icons/hicolor/16x16/status/*.png
+%{_datadir}/gconf-editor
 %{_datadir}/pixmaps/gconf-editor
 %{_datadir}/applications/gnome-gconf-editor.desktop
 %{_mandir}/man1/gconf-editor.1.gz



From mclasen at fedoraproject.org  Wed Sep  3 01:58:11 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 01:58:11 +0000 (UTC)
Subject: rpms/gnome-backgrounds/devel .cvsignore, 1.12,
	1.13 gnome-backgrounds.spec, 1.18, 1.19 sources, 1.12, 1.13
Message-ID: <20080903015811.7D4347011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32492

Modified Files:
	.cvsignore gnome-backgrounds.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 Aug 2008 17:38:41 -0000	1.12
+++ .cvsignore	3 Sep 2008 01:57:41 -0000	1.13
@@ -1 +1 @@
-gnome-backgrounds-2.23.90.tar.bz2
+gnome-backgrounds-2.23.91.tar.bz2


Index: gnome-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/gnome-backgrounds.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnome-backgrounds.spec	22 Aug 2008 17:38:42 -0000	1.18
+++ gnome-backgrounds.spec	3 Sep 2008 01:57:41 -0000	1.19
@@ -1,6 +1,6 @@
 Summary: Desktop backgrounds packaged with the GNOME desktop
 Name: gnome-backgrounds
-Version: 2.23.90
+Version: 2.23.91
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
@@ -51,6 +51,9 @@
 %{_datadir}/backgrounds/*
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-1
 - Update to 2.23.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	22 Aug 2008 17:38:42 -0000	1.12
+++ sources	3 Sep 2008 01:57:41 -0000	1.13
@@ -1 +1 @@
-c536f8597db153cf67d4a368a7e17299  gnome-backgrounds-2.23.90.tar.bz2
+c39409ede1e220470c7168dfdfd1c00b  gnome-backgrounds-2.23.91.tar.bz2



From salimma at fedoraproject.org  Wed Sep  3 02:05:12 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  3 Sep 2008 02:05:12 +0000 (UTC)
Subject: rpms/Django/EL-4 .cvsignore, 1.6, 1.7 Django.spec, 1.9, 1.10 sources,
	1.6, 1.7
Message-ID: <20080903020512.F2DA17011F@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/Django/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1315/EL-4

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org>
- CSRF security update: bz#460966



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 May 2008 20:00:52 -0000	1.6
+++ .cvsignore	3 Sep 2008 02:04:42 -0000	1.7
@@ -1 +1 @@
-Django-0.96.2.tar.gz
+Django-0.96.3.tar.gz


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/Django.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Django.spec	19 May 2008 20:00:52 -0000	1.9
+++ Django.spec	3 Sep 2008 02:04:42 -0000	1.10
@@ -4,7 +4,7 @@
 %define mainver 0.96
 
 Name:           Django
-Version:        %{mainver}.2
+Version:        %{mainver}.3
 Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
@@ -80,6 +80,9 @@
 %doc docs/*
 
 %changelog
+* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 0.96.3-1
+- CSRF security update: bz#460966
+
 * Mon May 19 2008 Michel Salim <salimma at fedoraproject.org> - 0.96.2-1
 - XSS security update: CVE-2008-2302 (bz# 442757-60)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 May 2008 20:00:52 -0000	1.6
+++ sources	3 Sep 2008 02:04:42 -0000	1.7
@@ -1 +1 @@
-2e39a43b93b50c2ca90bcade26010878  Django-0.96.2.tar.gz
+ee36233367d2abc5b058a3a84a4447cf  Django-0.96.3.tar.gz



From salimma at fedoraproject.org  Wed Sep  3 02:05:13 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  3 Sep 2008 02:05:13 +0000 (UTC)
Subject: rpms/Django/EL-5 .cvsignore, 1.6, 1.7 Django.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <20080903020513.332257011F@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/Django/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1315/EL-5

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org>
- CSRF security update: bz#460966



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 May 2008 20:01:19 -0000	1.6
+++ .cvsignore	3 Sep 2008 02:04:42 -0000	1.7
@@ -1 +1 @@
-Django-0.96.2.tar.gz
+Django-0.96.3.tar.gz


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/Django.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Django.spec	19 May 2008 20:01:19 -0000	1.5
+++ Django.spec	3 Sep 2008 02:04:42 -0000	1.6
@@ -4,7 +4,7 @@
 %define mainver 0.96
 
 Name:           Django
-Version:        %{mainver}.2
+Version:        %{mainver}.3
 Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
@@ -80,6 +80,9 @@
 %doc docs/*
 
 %changelog
+* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 0.96.3-1
+- CSRF security update: bz#460966
+
 * Mon May 19 2008 Michel Salim <salimma at fedoraproject.org> - 0.96.2-1
 - XSS security update: CVE-2008-2302 (bz# 442757-60)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 May 2008 20:01:19 -0000	1.6
+++ sources	3 Sep 2008 02:04:42 -0000	1.7
@@ -1 +1 @@
-2e39a43b93b50c2ca90bcade26010878  Django-0.96.2.tar.gz
+ee36233367d2abc5b058a3a84a4447cf  Django-0.96.3.tar.gz



From salimma at fedoraproject.org  Wed Sep  3 02:05:13 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  3 Sep 2008 02:05:13 +0000 (UTC)
Subject: rpms/Django/F-9 .cvsignore, 1.6, 1.7 Django.spec, 1.10, 1.11 sources,
	1.6, 1.7
Message-ID: <20080903020513.E87687011F@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/Django/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1315/F-9

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org>
- CSRF security update: bz#460966



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 May 2008 20:02:42 -0000	1.6
+++ .cvsignore	3 Sep 2008 02:04:43 -0000	1.7
@@ -1 +1 @@
-Django-0.96.2.tar.gz
+Django-0.96.3.tar.gz


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-9/Django.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Django.spec	19 May 2008 20:02:42 -0000	1.10
+++ Django.spec	3 Sep 2008 02:04:43 -0000	1.11
@@ -4,7 +4,7 @@
 %define mainver 0.96
 
 Name:           Django
-Version:        %{mainver}.2
+Version:        %{mainver}.3
 Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
@@ -80,6 +80,9 @@
 %doc docs/*
 
 %changelog
+* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 0.96.3-1
+- CSRF security update: bz#460966
+
 * Mon May 19 2008 Michel Salim <salimma at fedoraproject.org> - 0.96.2-1
 - XSS security update: CVE-2008-2302 (bz# 442757-60)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 May 2008 20:02:42 -0000	1.6
+++ sources	3 Sep 2008 02:04:43 -0000	1.7
@@ -1 +1 @@
-2e39a43b93b50c2ca90bcade26010878  Django-0.96.2.tar.gz
+ee36233367d2abc5b058a3a84a4447cf  Django-0.96.3.tar.gz



From salimma at fedoraproject.org  Wed Sep  3 02:05:13 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  3 Sep 2008 02:05:13 +0000 (UTC)
Subject: rpms/Django/F-7 .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <20080903020513.72B547011F@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/Django/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1315/F-7

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org>
- CSRF security update: bz#460966



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 May 2008 20:01:45 -0000	1.6
+++ .cvsignore	3 Sep 2008 02:04:43 -0000	1.7
@@ -1 +1 @@
-Django-0.96.2.tar.gz
+Django-0.96.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 May 2008 20:01:45 -0000	1.6
+++ sources	3 Sep 2008 02:04:43 -0000	1.7
@@ -1 +1 @@
-2e39a43b93b50c2ca90bcade26010878  Django-0.96.2.tar.gz
+ee36233367d2abc5b058a3a84a4447cf  Django-0.96.3.tar.gz



From salimma at fedoraproject.org  Wed Sep  3 02:05:13 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  3 Sep 2008 02:05:13 +0000 (UTC)
Subject: rpms/Django/F-8 .cvsignore, 1.6, 1.7 Django.spec, 1.9, 1.10 sources,
	1.6, 1.7
Message-ID: <20080903020513.AD1D87011F@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/Django/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1315/F-8

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org>
- CSRF security update: bz#460966



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-8/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 May 2008 20:02:18 -0000	1.6
+++ .cvsignore	3 Sep 2008 02:04:43 -0000	1.7
@@ -1 +1 @@
-Django-0.96.2.tar.gz
+Django-0.96.3.tar.gz


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-8/Django.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Django.spec	19 May 2008 20:02:18 -0000	1.9
+++ Django.spec	3 Sep 2008 02:04:43 -0000	1.10
@@ -4,7 +4,7 @@
 %define mainver 0.96
 
 Name:           Django
-Version:        %{mainver}.2
+Version:        %{mainver}.3
 Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
@@ -80,6 +80,9 @@
 %doc docs/*
 
 %changelog
+* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 0.96.3-1
+- CSRF security update: bz#460966
+
 * Mon May 19 2008 Michel Salim <salimma at fedoraproject.org> - 0.96.2-1
 - XSS security update: CVE-2008-2302 (bz# 442757-60)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 May 2008 20:02:18 -0000	1.6
+++ sources	3 Sep 2008 02:04:43 -0000	1.7
@@ -1 +1 @@
-2e39a43b93b50c2ca90bcade26010878  Django-0.96.2.tar.gz
+ee36233367d2abc5b058a3a84a4447cf  Django-0.96.3.tar.gz



From salimma at fedoraproject.org  Wed Sep  3 02:05:14 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  3 Sep 2008 02:05:14 +0000 (UTC)
Subject: rpms/Django/devel .cvsignore, 1.8, 1.9 Django.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <20080903020514.3061D7011F@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/Django/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1315/devel

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org>
- CSRF security update: bz#460966



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Aug 2008 06:19:41 -0000	1.8
+++ .cvsignore	3 Sep 2008 02:04:43 -0000	1.9
@@ -1 +1 @@
-Django-1.0-beta_2.tar.gz
+Django-1.0-rc_1.tar.gz


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/Django.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Django.spec	28 Aug 2008 06:19:41 -0000	1.12
+++ Django.spec	3 Sep 2008 02:04:43 -0000	1.13
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 %define mainver 1.0
-%define prerel  beta
-%define prever  2
+%define prerel  rc
+%define prever  1
 
 Name:           Django
 Version:        %{mainver}
@@ -83,6 +83,9 @@
 %doc docs/*
 
 %changelog
+* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-0.1.rc1%{?dist}
+- CSRF security update: bz#460966
+
 * Wed Aug 27 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-0.1.beta2
 - Update to 1.0 beta2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Aug 2008 06:19:41 -0000	1.8
+++ sources	3 Sep 2008 02:04:43 -0000	1.9
@@ -1 +1 @@
-6841c270ade061a28e61dd723351bdaf  Django-1.0-beta_2.tar.gz
+df9db6ee729137ec66cb3e21ffd3ba60  Django-1.0-rc_1.tar.gz



From mclasen at fedoraproject.org  Wed Sep  3 02:07:25 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 02:07:25 +0000 (UTC)
Subject: rpms/gconf-editor/devel gconf-editor.spec,1.57,1.58
Message-ID: <20080903020725.46ADD7011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gconf-editor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2002

Modified Files:
	gconf-editor.spec 
Log Message:
fix file lists, part 3



Index: gconf-editor.spec
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gconf-editor.spec	3 Sep 2008 01:51:13 -0000	1.57
+++ gconf-editor.spec	3 Sep 2008 02:06:54 -0000	1.58
@@ -98,7 +98,6 @@
 %{_bindir}/gconf-editor
 %{_datadir}/icons/hicolor/*/apps/gconf-editor.png
 %{_datadir}/gconf-editor
-%{_datadir}/pixmaps/gconf-editor
 %{_datadir}/applications/gnome-gconf-editor.desktop
 %{_mandir}/man1/gconf-editor.1.gz
 %{_sysconfdir}/gconf/schemas/gconf-editor.schemas



From mclasen at fedoraproject.org  Wed Sep  3 02:11:48 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 02:11:48 +0000 (UTC)
Subject: rpms/vino/devel .cvsignore, 1.36, 1.37 sources, 1.36, 1.37 vino.spec,
	1.77, 1.78
Message-ID: <20080903021148.224597011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/vino/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2964

Modified Files:
	.cvsignore sources vino.spec 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vino/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	23 Aug 2008 02:07:41 -0000	1.36
+++ .cvsignore	3 Sep 2008 02:11:17 -0000	1.37
@@ -1 +1 @@
-vino-2.23.90.tar.bz2
+vino-2.23.91.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vino/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	23 Aug 2008 02:07:41 -0000	1.36
+++ sources	3 Sep 2008 02:11:17 -0000	1.37
@@ -1 +1 @@
-f6d5dd8511840b4ff0fe2b5d80ffac06  vino-2.23.90.tar.bz2
+229d79e0fd64e87a7ce8b9cf5a9d453d  vino-2.23.91.tar.bz2


Index: vino.spec
===================================================================
RCS file: /cvs/extras/rpms/vino/devel/vino.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- vino.spec	23 Aug 2008 02:52:40 -0000	1.77
+++ vino.spec	3 Sep 2008 02:11:17 -0000	1.78
@@ -8,7 +8,7 @@
 
 Summary: A remote desktop system for GNOME
 Name: vino
-Version: 2.23.90
+Version: 2.23.91
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/vino/2.23/%{name}-%{version}.tar.bz2
@@ -108,6 +108,9 @@
 %{_datadir}/gnome/autostart/vino-server.desktop
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-1
 - Update to 2.23.90
 



From mclasen at fedoraproject.org  Wed Sep  3 02:19:19 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 02:19:19 +0000 (UTC)
Subject: rpms/gnome-desktop/devel .cvsignore, 1.69, 1.70 gnome-desktop.spec, 
	1.157, 1.158 sources, 1.69, 1.70
Message-ID: <20080903021919.99E2F7011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4080

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	23 Aug 2008 03:16:12 -0000	1.69
+++ .cvsignore	3 Sep 2008 02:18:49 -0000	1.70
@@ -1 +1 @@
-gnome-desktop-2.23.90.tar.bz2
+gnome-desktop-2.23.91.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- gnome-desktop.spec	30 Aug 2008 16:28:36 -0000	1.157
+++ gnome-desktop.spec	3 Sep 2008 02:18:49 -0000	1.158
@@ -11,18 +11,14 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.23.90
-Release: 5%{?dist}
+Version: 2.23.91
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.23/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# fixed upstream
-Patch0: gnome-desktop-2.23.90-eedid.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=549876
-Patch1: gnome-bg-leak.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=549960
 Patch2: rr-leaks.patch
 
@@ -77,8 +73,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .eedid
-%patch1 -p0 -b .gnome-bg-leak
 %patch2 -p1 -b .rr-leaks
 
 %build
@@ -125,6 +119,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Fri Aug 29 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-5
 - Plug more memory leaks
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	23 Aug 2008 03:16:12 -0000	1.69
+++ sources	3 Sep 2008 02:18:49 -0000	1.70
@@ -1 +1 @@
-8423e406f8785fdbf75780a2cfa897bb  gnome-desktop-2.23.90.tar.bz2
+a07b31b16cf8f429a131c0fb1fc15d1c  gnome-desktop-2.23.91.tar.bz2



From mclasen at fedoraproject.org  Wed Sep  3 02:21:13 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 02:21:13 +0000 (UTC)
Subject: rpms/gnome-desktop/devel gnome-bg-leak.patch, 1.1,
	NONE gnome-desktop-2.23.90-eedid.patch, 1.1, NONE multires.patch,
	1.4, NONE
Message-ID: <20080903022113.406D47011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4311

Removed Files:
	gnome-bg-leak.patch gnome-desktop-2.23.90-eedid.patch 
	multires.patch 
Log Message:
drop unused patches



--- gnome-bg-leak.patch DELETED ---


--- gnome-desktop-2.23.90-eedid.patch DELETED ---


--- multires.patch DELETED ---



From mclasen at fedoraproject.org  Wed Sep  3 02:24:17 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 02:24:17 +0000 (UTC)
Subject: rpms/vino/devel vino.spec,1.78,1.79
Message-ID: <20080903022417.8BEDC7011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/vino/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4857

Modified Files:
	vino.spec 
Log Message:
fix file list



Index: vino.spec
===================================================================
RCS file: /cvs/extras/rpms/vino/devel/vino.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- vino.spec	3 Sep 2008 02:11:17 -0000	1.78
+++ vino.spec	3 Sep 2008 02:23:47 -0000	1.79
@@ -101,7 +101,6 @@
 %doc AUTHORS COPYING NEWS README docs/TODO docs/remote-desktop.txt
 %{_datadir}/vino
 %{_datadir}/applications/*.desktop
-%{_libdir}/bonobo/servers/*.server
 %{_bindir}/*
 %{_libexecdir}/*
 %{_sysconfdir}/gconf/schemas/*.schemas



From mclasen at fedoraproject.org  Wed Sep  3 02:28:00 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 02:28:00 +0000 (UTC)
Subject: rpms/gtksourceview2/devel .cvsignore, 1.16, 1.17 gtksourceview2.spec,
	1.18, 1.19 sources, 1.16, 1.17
Message-ID: <20080903022800.C268C7011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtksourceview2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5728

Modified Files:
	.cvsignore gtksourceview2.spec sources 
Log Message:
2.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	13 Aug 2008 16:43:05 -0000	1.16
+++ .cvsignore	3 Sep 2008 02:27:30 -0000	1.17
@@ -1 +1 @@
-gtksourceview-2.3.1.tar.bz2
+gtksourceview-2.3.2.tar.bz2


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/gtksourceview2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gtksourceview2.spec	13 Aug 2008 16:43:05 -0000	1.18
+++ gtksourceview2.spec	3 Sep 2008 02:27:30 -0000	1.19
@@ -5,7 +5,7 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview2
-Version: 2.3.1
+Version: 2.3.2
 Release: 1%{?dist} 
 License: LGPLv2+ and GPLv2+
 # the library itself is LGPL, some .lang files are GPL
@@ -81,6 +81,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.3.2-1
+- Update to 2.3.2
+
 * Wed Aug 13 2008 Matthias Clasen <mclasen at redhat.com> - 2.3.1-1
 - Update to 2.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	13 Aug 2008 16:43:05 -0000	1.16
+++ sources	3 Sep 2008 02:27:30 -0000	1.17
@@ -1 +1 @@
-b1ff7544afbbdaa474374d106d7e1c1a  gtksourceview-2.3.1.tar.bz2
+93bb6f41c1ad8d73ff40e94328770870  gtksourceview-2.3.2.tar.bz2



From mclasen at fedoraproject.org  Wed Sep  3 02:30:26 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 02:30:26 +0000 (UTC)
Subject: rpms/eog/devel .cvsignore, 1.67, 1.68 eog.spec, 1.119, 1.120 sources,
	1.67, 1.68
Message-ID: <20080903023026.2E16F7011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/eog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6260

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	23 Aug 2008 01:32:18 -0000	1.67
+++ .cvsignore	3 Sep 2008 02:29:55 -0000	1.68
@@ -1 +1 @@
-eog-2.23.90.tar.bz2
+eog-2.23.91.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/eog.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- eog.spec	23 Aug 2008 01:32:19 -0000	1.119
+++ eog.spec	3 Sep 2008 02:29:55 -0000	1.120
@@ -13,7 +13,7 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.23.90
+Version: 2.23.91
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source: http://download.gnome.org/sources/eog/2.23/%{name}-%{version}.tar.bz2
@@ -155,6 +155,9 @@
 %{_datadir}/gtk-doc/html/eog
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-1
 - Update to 2.23.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	23 Aug 2008 01:32:19 -0000	1.67
+++ sources	3 Sep 2008 02:29:55 -0000	1.68
@@ -1 +1 @@
-d99b907696d59a7c41e2a9e8c0ec34bd  eog-2.23.90.tar.bz2
+d2aeadd23d1873b1a0898ca72cec2840  eog-2.23.91.tar.bz2



From salimma at fedoraproject.org  Wed Sep  3 02:37:07 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  3 Sep 2008 02:37:07 +0000 (UTC)
Subject: rpms/google-gadgets/F-9 google-gadgets.spec,1.1,1.2
Message-ID: <20080903023707.65FF17011F@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/google-gadgets/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7324/F-9

Modified Files:
	google-gadgets.spec 
Log Message:
* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 0.10.1-4
- Unquote version strings in .pc files



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-9/google-gadgets.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- google-gadgets.spec	31 Aug 2008 00:02:05 -0000	1.1
+++ google-gadgets.spec	3 Sep 2008 02:36:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           google-gadgets
 Version:        0.10.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -62,6 +62,7 @@
 
 %prep
 %setup -q -n %{name}-for-linux-%{version}
+%patch0 -p1 -b .unquote
 # Permission fixes
 chmod -x ggadget/qt/utilities.h
 
@@ -84,6 +85,9 @@
 # default compile flags are impossibly strict
 make %{?_smp_mflags} DEFAULT_COMPILE_FLAGS=
 
+# Remove quotes from .pc files
+find . -name '*.pc' -exec sed -i 's|\"||g' '{}' \;
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -167,6 +171,9 @@
 
 
 %changelog
+* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 0.10.1-4
+- Unquote version strings in .pc files
+
 * Thu Aug 28 2008 Michel Salim <salimma at fedoraproject.org> - 0.10.1-3
 - RPATH and timestamp fixes from Mamoru Tasaka
 



From salimma at fedoraproject.org  Wed Sep  3 02:37:07 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  3 Sep 2008 02:37:07 +0000 (UTC)
Subject: rpms/google-gadgets/devel google-gadgets.spec,1.1,1.2
Message-ID: <20080903023707.8687970120@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/google-gadgets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7324/devel

Modified Files:
	google-gadgets.spec 
Log Message:
* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 0.10.1-4
- Unquote version strings in .pc files



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/devel/google-gadgets.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- google-gadgets.spec	31 Aug 2008 00:02:05 -0000	1.1
+++ google-gadgets.spec	3 Sep 2008 02:36:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           google-gadgets
 Version:        0.10.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -62,6 +62,7 @@
 
 %prep
 %setup -q -n %{name}-for-linux-%{version}
+%patch0 -p1 -b .unquote
 # Permission fixes
 chmod -x ggadget/qt/utilities.h
 
@@ -84,6 +85,9 @@
 # default compile flags are impossibly strict
 make %{?_smp_mflags} DEFAULT_COMPILE_FLAGS=
 
+# Remove quotes from .pc files
+find . -name '*.pc' -exec sed -i 's|\"||g' '{}' \;
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -167,6 +171,9 @@
 
 
 %changelog
+* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 0.10.1-4
+- Unquote version strings in .pc files
+
 * Thu Aug 28 2008 Michel Salim <salimma at fedoraproject.org> - 0.10.1-3
 - RPATH and timestamp fixes from Mamoru Tasaka
 



From mclasen at fedoraproject.org  Wed Sep  3 02:38:35 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 02:38:35 +0000 (UTC)
Subject: rpms/metacity/devel .cvsignore, 1.75, 1.76 metacity.spec, 1.156,
	1.157 sources, 1.75, 1.76
Message-ID: <20080903023835.2BCD47011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7664

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
2.23.233



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- .cvsignore	22 Aug 2008 16:14:52 -0000	1.75
+++ .cvsignore	3 Sep 2008 02:38:04 -0000	1.76
@@ -1 +1 @@
-metacity-2.23.144.tar.bz2
+metacity-2.23.233.tar.bz2


Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- metacity.spec	22 Aug 2008 16:14:52 -0000	1.156
+++ metacity.spec	3 Sep 2008 02:38:04 -0000	1.157
@@ -1,6 +1,6 @@
 Summary: Metacity window manager
 Name: metacity
-Version: 2.23.144
+Version: 2.23.233
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.23/metacity-%{version}.tar.bz2
@@ -149,6 +149,9 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.233-1
+- Update to 2.23.233
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.144-1
 - Update to 2.23.144
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- sources	22 Aug 2008 16:14:52 -0000	1.75
+++ sources	3 Sep 2008 02:38:04 -0000	1.76
@@ -1 +1 @@
-910e423b28a26a4bb42094a6692f9c56  metacity-2.23.144.tar.bz2
+eb54496ce52ac42de154472faf90b9b4  metacity-2.23.233.tar.bz2



From salimma at fedoraproject.org  Wed Sep  3 02:39:43 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  3 Sep 2008 02:39:43 +0000 (UTC)
Subject: rpms/Django/EL-4 Django.spec,1.10,1.11
Message-ID: <20080903023943.D76B97011F@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/Django/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7789/EL-4

Modified Files:
	Django.spec 
Log Message:
Don't exclude compiled files under %{_bindir} for EL-4, where the files are not generated



Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/Django.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Django.spec	3 Sep 2008 02:04:42 -0000	1.10
+++ Django.spec	3 Sep 2008 02:39:13 -0000	1.11
@@ -69,7 +69,6 @@
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE README
 %{_bindir}/django-admin.py
-%exclude %{_bindir}/django-admin.py?
 %{python_sitelib}/django
 %if 0%{?fedora} >= 9
 %{python_sitelib}/*.egg-info



From mclasen at fedoraproject.org  Wed Sep  3 02:44:07 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 02:44:07 +0000 (UTC)
Subject: rpms/bug-buddy/devel .cvsignore, 1.42, 1.43 bug-buddy.spec, 1.103, 
	1.104 sources, 1.42, 1.43
Message-ID: <20080903024407.298B67011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/bug-buddy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8595

Modified Files:
	.cvsignore bug-buddy.spec sources 
Log Message:
2.23.91.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	5 Aug 2008 04:42:35 -0000	1.42
+++ .cvsignore	3 Sep 2008 02:43:36 -0000	1.43
@@ -1 +1 @@
-bug-buddy-2.23.6.tar.bz2
+bug-buddy-2.23.91.1.tar.bz2


Index: bug-buddy.spec
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- bug-buddy.spec	5 Aug 2008 16:01:21 -0000	1.103
+++ bug-buddy.spec	3 Sep 2008 02:43:36 -0000	1.104
@@ -5,7 +5,7 @@
 %define gconf_version 2.14
 
 Name: bug-buddy
-Version: 2.23.6
+Version: 2.23.91.1
 Release: 1%{?dist}
 Epoch: 1
 Summary: A bug reporting utility for GNOME
@@ -140,6 +140,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.91.1-1
+- Update to 2.23.91.1
+
 * Tue Aug  5 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.6-1
 - Update to 2.23.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	5 Aug 2008 04:42:35 -0000	1.42
+++ sources	3 Sep 2008 02:43:36 -0000	1.43
@@ -1 +1 @@
-b9a49490c3503c04976ebd79d40afa51  bug-buddy-2.23.6.tar.bz2
+17f77de7ba92eb467fa1b827ec64e9fa  bug-buddy-2.23.91.1.tar.bz2



From salimma at fedoraproject.org  Wed Sep  3 02:47:18 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  3 Sep 2008 02:47:18 +0000 (UTC)
Subject: rpms/google-gadgets/F-9 google-gadgets.spec,1.2,1.3
Message-ID: <20080903024718.C7F4E7011F@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/google-gadgets/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9081/F-9

Modified Files:
	google-gadgets.spec 
Log Message:
Remove application of unquote patch; using sed, post-build, on .pc files instead, as the quotes are needed during the build process



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-9/google-gadgets.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- google-gadgets.spec	3 Sep 2008 02:36:37 -0000	1.2
+++ google-gadgets.spec	3 Sep 2008 02:46:48 -0000	1.3
@@ -62,7 +62,6 @@
 
 %prep
 %setup -q -n %{name}-for-linux-%{version}
-%patch0 -p1 -b .unquote
 # Permission fixes
 chmod -x ggadget/qt/utilities.h
 



From salimma at fedoraproject.org  Wed Sep  3 02:47:18 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  3 Sep 2008 02:47:18 +0000 (UTC)
Subject: rpms/google-gadgets/devel google-gadgets.spec,1.2,1.3
Message-ID: <20080903024718.E694E70120@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/google-gadgets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9081/devel

Modified Files:
	google-gadgets.spec 
Log Message:
Remove application of unquote patch; using sed, post-build, on .pc files instead, as the quotes are needed during the build process



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/devel/google-gadgets.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- google-gadgets.spec	3 Sep 2008 02:36:37 -0000	1.2
+++ google-gadgets.spec	3 Sep 2008 02:46:48 -0000	1.3
@@ -62,7 +62,6 @@
 
 %prep
 %setup -q -n %{name}-for-linux-%{version}
-%patch0 -p1 -b .unquote
 # Permission fixes
 chmod -x ggadget/qt/utilities.h
 



From mclasen at fedoraproject.org  Wed Sep  3 02:47:43 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 02:47:43 +0000 (UTC)
Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.69,
	1.70 gnome-system-monitor.spec, 1.125, 1.126 sources, 1.69, 1.70
Message-ID: <20080903024743.1516B7011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-system-monitor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9309

Modified Files:
	.cvsignore gnome-system-monitor.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	23 Aug 2008 03:27:21 -0000	1.69
+++ .cvsignore	3 Sep 2008 02:47:12 -0000	1.70
@@ -1 +1 @@
-gnome-system-monitor-2.23.90.tar.bz2
+gnome-system-monitor-2.23.91.tar.bz2


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- gnome-system-monitor.spec	23 Aug 2008 03:27:21 -0000	1.125
+++ gnome-system-monitor.spec	3 Sep 2008 02:47:12 -0000	1.126
@@ -12,7 +12,7 @@
 
 Summary: Simple process monitor
 Name: gnome-system-monitor
-Version: 2.23.90
+Version: 2.23.91
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -126,6 +126,9 @@
 
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-1
 - Update to 2.23.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	23 Aug 2008 03:27:21 -0000	1.69
+++ sources	3 Sep 2008 02:47:12 -0000	1.70
@@ -1 +1 @@
-6f19bc3a4a1a210892bbed9aa1fde676  gnome-system-monitor-2.23.90.tar.bz2
+f465d83c11fcb573c970d41de5c4c4cd  gnome-system-monitor-2.23.91.tar.bz2



From mclasen at fedoraproject.org  Wed Sep  3 02:52:02 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 02:52:02 +0000 (UTC)
Subject: rpms/metacity/devel metacity.spec,1.157,1.158
Message-ID: <20080903025202.38A147011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10041

Modified Files:
	metacity.spec 
Log Message:
fix file list



Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- metacity.spec	3 Sep 2008 02:38:04 -0000	1.157
+++ metacity.spec	3 Sep 2008 02:51:31 -0000	1.158
@@ -100,6 +100,10 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
+desktop-file-install --vendor "" --delete-original \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+	$RPM_BUILD_ROOT%{_datadir}/applications/metacity.desktop
+
 %find_lang %{name}
 
 %clean
@@ -137,6 +141,7 @@
 %{_datadir}/gnome-control-center/keybindings/*
 %{_libdir}/lib*.so.*
 %{_mandir}/man1/metacity.1.gz
+%{_datadir}/applications/metacity.desktop
 
 %files devel
 %defattr(-,root,root)



From mclasen at fedoraproject.org  Wed Sep  3 02:58:13 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 02:58:13 +0000 (UTC)
Subject: rpms/epiphany/devel .cvsignore, 1.71, 1.72 epiphany.spec, 1.196,
	1.197 sources, 1.74, 1.75
Message-ID: <20080903025813.EE72B7011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11312

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- .cvsignore	23 Jul 2008 03:13:03 -0000	1.71
+++ .cvsignore	3 Sep 2008 02:57:43 -0000	1.72
@@ -1 +1 @@
-epiphany-2.23.5.tar.bz2
+epiphany-2.23.91.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- epiphany.spec	23 Jul 2008 20:57:24 -0000	1.196
+++ epiphany.spec	3 Sep 2008 02:57:43 -0000	1.197
@@ -7,8 +7,8 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.23.5
-Release: 2%{?dist}
+Version: 2.23.91
+Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -212,6 +212,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Wed Jul 23 2008 Christopher Aillon <caillon at redhat.com> - 2.23.5-2
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources	23 Jul 2008 03:13:03 -0000	1.74
+++ sources	3 Sep 2008 02:57:43 -0000	1.75
@@ -1 +1 @@
-47ca7802e0dccd1c6ec92bda673a093e  epiphany-2.23.5.tar.bz2
+280e097f42fcab5f1a76f8e6a59dd741  epiphany-2.23.91.tar.bz2



From mclasen at fedoraproject.org  Wed Sep  3 03:27:01 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 03:27:01 +0000 (UTC)
Subject: rpms/gnome-panel/devel .cvsignore, 1.82, 1.83 gnome-panel.spec,
	1.315, 1.316 sources, 1.85, 1.86
Message-ID: <20080903032701.B898A7011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15317

Modified Files:
	.cvsignore gnome-panel.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- .cvsignore	23 Aug 2008 04:57:22 -0000	1.82
+++ .cvsignore	3 Sep 2008 03:26:30 -0000	1.83
@@ -1 +1 @@
-gnome-panel-2.23.90.1.tar.bz2
+gnome-panel-2.23.91.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- gnome-panel.spec	23 Aug 2008 04:57:22 -0000	1.315
+++ gnome-panel.spec	3 Sep 2008 03:26:30 -0000	1.316
@@ -22,7 +22,7 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.23.90.1
+Version: 2.23.91
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar.bz2
@@ -346,6 +346,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Sat Aug 23 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.90.1-1
 - Update to 2.23.90.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- sources	23 Aug 2008 04:57:22 -0000	1.85
+++ sources	3 Sep 2008 03:26:30 -0000	1.86
@@ -1 +1 @@
-fb33af68201e66faf84abab3fb75fe2e  gnome-panel-2.23.90.1.tar.bz2
+56b17e14666d80a02e48c6ef457dde7e  gnome-panel-2.23.91.tar.bz2



From mclasen at fedoraproject.org  Wed Sep  3 03:29:10 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 03:29:10 +0000 (UTC)
Subject: rpms/metacity/devel metacity.spec,1.158,1.159
Message-ID: <20080903032910.1EB347011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15846

Modified Files:
	metacity.spec 
Log Message:
grr, invalid desktop file



Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- metacity.spec	3 Sep 2008 02:51:31 -0000	1.158
+++ metacity.spec	3 Sep 2008 03:28:39 -0000	1.159
@@ -100,9 +100,10 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
-desktop-file-install --vendor "" --delete-original \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	$RPM_BUILD_ROOT%{_datadir}/applications/metacity.desktop
+# the desktop file is not valid, I've complained on metacity-devel-list
+#desktop-file-install --vendor "" --delete-original \
+#	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+#	$RPM_BUILD_ROOT%{_datadir}/applications/metacity.desktop
 
 %find_lang %{name}
 



From mclasen at fedoraproject.org  Wed Sep  3 03:40:41 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 03:40:41 +0000 (UTC)
Subject: rpms/gnome-session/devel gnome-session.spec,1.186,1.187
Message-ID: <20080903034041.8A52F7011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17358

Modified Files:
	gnome-session.spec 
Log Message:
2.23.91



Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- gnome-session.spec	28 Aug 2008 14:10:28 -0000	1.186
+++ gnome-session.spec	3 Sep 2008 03:40:11 -0000	1.187
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.23.91
-Release: 0.20080828.1%{?dist}
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -63,6 +63,8 @@
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(preun): GConf2 >= %{gconf2_version}
 
+Patch0: valgrind-leaks.patch
+
 %description
 
 gnome-session manages a GNOME desktop session. It starts up the other core
@@ -70,6 +72,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .leaks
 
 %build
 
@@ -168,6 +171,9 @@
 
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Thu Aug 28 2008 Jon McCann  <jmccann at redhat.com> - 2.23.91.0.2008.08.28.1
 - Update to snapshot
 



From mclasen at fedoraproject.org  Wed Sep  3 03:44:42 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 03:44:42 +0000 (UTC)
Subject: rpms/metacity/devel metacity.spec,1.159,1.160
Message-ID: <20080903034442.D57417011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18016

Modified Files:
	metacity.spec 
Log Message:
fix file list, part 2



Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- metacity.spec	3 Sep 2008 03:28:39 -0000	1.159
+++ metacity.spec	3 Sep 2008 03:44:12 -0000	1.160
@@ -135,7 +135,6 @@
 %{_bindir}/metacity
 %{_bindir}/metacity-message
 %{_libexecdir}/*
-%{_datadir}/gnome/wm-properties/metacity.desktop
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/metacity
 %{_datadir}/themes/*



From mclasen at fedoraproject.org  Wed Sep  3 03:45:48 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 03:45:48 +0000 (UTC)
Subject: rpms/gnome-session/devel gnome-session.spec,1.187,1.188
Message-ID: <20080903034548.C6A517011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18163

Modified Files:
	gnome-session.spec 
Log Message:
drop private patch



Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- gnome-session.spec	3 Sep 2008 03:40:11 -0000	1.187
+++ gnome-session.spec	3 Sep 2008 03:45:18 -0000	1.188
@@ -63,8 +63,6 @@
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(preun): GConf2 >= %{gconf2_version}
 
-Patch0: valgrind-leaks.patch
-
 %description
 
 gnome-session manages a GNOME desktop session. It starts up the other core
@@ -72,7 +70,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .leaks
 
 %build
 



From mclasen at fedoraproject.org  Wed Sep  3 03:52:05 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  3 Sep 2008 03:52:05 +0000 (UTC)
Subject: rpms/gedit/devel .cvsignore, 1.77, 1.78 gedit.spec, 1.165,
	1.166 sources, 1.79, 1.80
Message-ID: <20080903035205.068F07011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19238

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- .cvsignore	23 Aug 2008 01:59:23 -0000	1.77
+++ .cvsignore	3 Sep 2008 03:51:34 -0000	1.78
@@ -1 +1 @@
-gedit-2.23.90.tar.bz2
+gedit-2.23.91.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- gedit.spec	23 Aug 2008 01:59:23 -0000	1.165
+++ gedit.spec	3 Sep 2008 03:51:34 -0000	1.166
@@ -17,7 +17,7 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
-Version: 	2.23.90
+Version: 	2.23.91
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.91-1
+- Update to 2.23.91
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.90-1
 - Update to 2.23.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- sources	23 Aug 2008 01:59:23 -0000	1.79
+++ sources	3 Sep 2008 03:51:34 -0000	1.80
@@ -1 +1 @@
-965b4b8f7dfd22e5fbbf9ec6da8da15f  gedit-2.23.90.tar.bz2
+041d69d83279b5eb015622847e660779  gedit-2.23.91.tar.bz2



From pkgdb at fedoraproject.org  Wed Sep  3 03:55:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 03:55:44 +0000
Subject: [pkgdb] gnumeric (Fedora EPEL, 5) updated by toshio
Message-ID: <20080903035544.4E258208D0D@bastion.fedora.phx.redhat.com>

toshio added a Fedora EPEL 5 branch for gnumeric
toshio has set commit to Approved for uberpackager on gnumeric (Fedora EPEL 5)
toshio has set build to Approved for uberpackager on gnumeric (Fedora EPEL 5)
toshio has set checkout to Approved for uberpackager on gnumeric (Fedora EPEL 5)
toshio changed owner of gnumeric in Fedora EPEL 5 to huzaifas
toshio Approved packager for commit access on gnumeric (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 03:56:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 03:56:09 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903035609.1F672208D0D@bastion.fedora.phx.redhat.com>

toshio has set the watchcommits acl on gnumeric (Fedora EPEL 5) to Awaiting Review for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 03:56:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 03:56:10 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903035610.BA219208D14@bastion.fedora.phx.redhat.com>

toshio has set the build acl on gnumeric (Fedora EPEL 5) to Awaiting Review for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 03:56:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 03:56:07 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903035613.5C00E208D17@bastion.fedora.phx.redhat.com>

toshio has set the commit acl on gnumeric (Fedora EPEL 5) to Awaiting Review for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 03:56:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 03:56:14 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903035615.07151208D81@bastion.fedora.phx.redhat.com>

toshio has set the approveacls acl on gnumeric (Fedora EPEL 5) to Awaiting Review for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 03:56:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 03:56:13 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903035613.E57C5208D6C@bastion.fedora.phx.redhat.com>

toshio has set the watchbugzilla acl on gnumeric (Fedora EPEL 5) to Awaiting Review for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From ausil at fedoraproject.org  Wed Sep  3 04:43:05 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  3 Sep 2008 04:43:05 +0000 (UTC)
Subject: extras-buildsys ChangeLog,1.126.2.44.2.1.2.13,1.126.2.44.2.1.2.14
Message-ID: <20080903044305.9DA677011F@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26154

Modified Files:
      Tag: Plague-0_4_5
	ChangeLog 
Log Message:
add changelog for 0.4.5 release



Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.44.2.1.2.13
retrieving revision 1.126.2.44.2.1.2.14
diff -u -r1.126.2.44.2.1.2.13 -r1.126.2.44.2.1.2.14
--- ChangeLog	23 Aug 2008 10:32:32 -0000	1.126.2.44.2.1.2.13
+++ ChangeLog	3 Sep 2008 04:43:05 -0000	1.126.2.44.2.1.2.14
@@ -1,3 +1,6 @@
+2008-09-02  Dennis Gilmore <dennis at ausil.us>
+        * Release of 0.4.5 
+
 2008-08-23  Michael Schwendt <mschwendt at fedoraproject.org>
 
 	* client/client.py



From lmacken at fedoraproject.org  Wed Sep  3 04:56:57 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  3 Sep 2008 04:56:57 +0000 (UTC)
Subject: rpms/bodhi/devel .cvsignore, 1.15, 1.16 bodhi.spec, 1.20,
	1.21 sources, 1.17, 1.18
Message-ID: <20080903045657.859157011F@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/bodhi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28012

Modified Files:
	.cvsignore bodhi.spec sources 
Log Message:
0.5.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	22 Aug 2008 20:54:44 -0000	1.15
+++ .cvsignore	3 Sep 2008 04:56:27 -0000	1.16
@@ -1 +1 @@
-bodhi-0.5.1.tar.bz2
+bodhi-0.5.2.tar.bz2


Index: bodhi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/devel/bodhi.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bodhi.spec	29 Aug 2008 23:43:06 -0000	1.20
+++ bodhi.spec	3 Sep 2008 04:56:27 -0000	1.21
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
-Version:        0.5.1
-Release:        3%{?dist}
+Version:        0.5.2
+Release:        1%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
 License:        GPLv2+
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Wed Sep 03 2008 Luke Macken <lmacken at redhat.com> - 0.5.2-1
+- Latest upstream bugfix release
+
 * Fri Aug 29 2008 Luke Macken <lmacken at redhat.com> - 0.5.1-3
 - Fix some setuptools issues with our client subpackage
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	29 Aug 2008 23:43:06 -0000	1.17
+++ sources	3 Sep 2008 04:56:27 -0000	1.18
@@ -1 +1 @@
-f99a09797b5941e16ce4a3a4c0d75596  bodhi-0.5.1.tar.bz2
+3406f588f7f414bfa82a332456f0afbc  bodhi-0.5.2.tar.bz2



From lmacken at fedoraproject.org  Wed Sep  3 04:57:44 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  3 Sep 2008 04:57:44 +0000 (UTC)
Subject: rpms/bodhi/F-9 .cvsignore, 1.14, 1.15 bodhi.spec, 1.20, 1.21 sources,
	1.17, 1.18
Message-ID: <20080903045744.130B17011F@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/bodhi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28277

Modified Files:
	.cvsignore bodhi.spec sources 
Log Message:
0.5.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	22 Aug 2008 21:04:31 -0000	1.14
+++ .cvsignore	3 Sep 2008 04:57:13 -0000	1.15
@@ -1 +1 @@
-bodhi-0.5.1.tar.bz2
+bodhi-0.5.2.tar.bz2


Index: bodhi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-9/bodhi.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bodhi.spec	29 Aug 2008 23:49:12 -0000	1.20
+++ bodhi.spec	3 Sep 2008 04:57:13 -0000	1.21
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
-Version:        0.5.1
-Release:        3%{?dist}
+Version:        0.5.2
+Release:        1%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
 License:        GPLv2+
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Wed Sep 03 2008 Luke Macken <lmacken at redhat.com> - 0.5.2-1
+- Latest upstream bugfix release
+
 * Fri Aug 29 2008 Luke Macken <lmacken at redhat.com> - 0.5.1-3
 - Fix some setuptools issues with our client subpackage
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-9/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	29 Aug 2008 23:49:12 -0000	1.17
+++ sources	3 Sep 2008 04:57:13 -0000	1.18
@@ -1 +1 @@
-f99a09797b5941e16ce4a3a4c0d75596  bodhi-0.5.1.tar.bz2
+3406f588f7f414bfa82a332456f0afbc  bodhi-0.5.2.tar.bz2



From lmacken at fedoraproject.org  Wed Sep  3 04:57:47 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  3 Sep 2008 04:57:47 +0000 (UTC)
Subject: rpms/bodhi/F-8 bodhi.spec,1.14,1.15 sources,1.13,1.14
Message-ID: <20080903045747.6CFC07011F@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/bodhi/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28311

Modified Files:
	bodhi.spec sources 
Log Message:
0.5.2


Index: bodhi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-8/bodhi.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bodhi.spec	22 Aug 2008 21:51:38 -0000	1.14
+++ bodhi.spec	3 Sep 2008 04:57:17 -0000	1.15
@@ -2,7 +2,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
-Version:        0.5.1
+Version:        0.5.2
 Release:        1%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
@@ -82,6 +82,8 @@
 %{__install} -m 640 %{name}/config/*mash* %{buildroot}%{_sysconfdir}/%{name}/
 %{__install} apache/%{name}.wsgi %{buildroot}%{_datadir}/%{name}/%{name}.wsgi
 
+%{__install} %{name}/tools/client.py %{buildroot}%{_bindir}/%{name}
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -93,20 +95,28 @@
 %{python_sitelib}/%{name}/
 %{_bindir}/start-%{name}
 %{_bindir}/%{name}-*
-%{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info/
 %{_sysconfdir}/httpd/conf.d/bodhi.conf
 %attr(-,apache,root) %{_datadir}/%{name}
 %attr(-,apache,root) %config(noreplace) %{_sysconfdir}/bodhi/*
 %attr(-,apache,root) %{_localstatedir}/log/bodhi
+%{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info/
 
 
 %files client
-%doc COPYING README
 %{_bindir}/bodhi
 %{_mandir}/man1/bodhi.1.gz
 
 
 %changelog
+* Wed Sep 03 2008 Luke Macken <lmacken at redhat.com> - 0.5.2-1
+- Latest upstream bugfix release
+
+* Fri Aug 29 2008 Luke Macken <lmacken at redhat.com> - 0.5.1-3
+- Fix some setuptools issues with our client subpackage
+
+* Mon Aug 25 2008 Luke Macken <lmacken at redhat.com> - 0.5.1-2
+- Include the egg-info in the client subpackage.
+
 * Fri Aug 22 2008 Luke Macken <lmacken at redhat.com> - 0.5.1-1
 - Latest upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-8/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Aug 2008 21:51:38 -0000	1.13
+++ sources	3 Sep 2008 04:57:17 -0000	1.14
@@ -1 +1 @@
-a964c5fa799a186417b7b4039c4a94a7  bodhi-0.5.1.tar.bz2
+3406f588f7f414bfa82a332456f0afbc  bodhi-0.5.2.tar.bz2



From ausil at fedoraproject.org  Wed Sep  3 05:07:23 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  3 Sep 2008 05:07:23 +0000 (UTC)
Subject: rpms/plague/devel .cvsignore, 1.11, 1.12 plague.spec, 1.32,
	1.33 sources, 1.25, 1.26 plague-0.4-daemonize.patch, 1.1,
	NONE plague-0.4-py25.patch, 1.1, NONE
Message-ID: <20080903050723.EFE4A7011F@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plague/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30065

Modified Files:
	.cvsignore plague.spec sources 
Removed Files:
	plague-0.4-daemonize.patch plague-0.4-py25.patch 
Log Message:
update to 0.4.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Mar 2006 15:30:00 -0000	1.11
+++ .cvsignore	3 Sep 2008 05:06:53 -0000	1.12
@@ -1,10 +1 @@
-plague-0.3.1.tar.bz2
-plague-0.3.2.tar.bz2
-plague-0.3.3.tar.bz2
-plague-0.3.4.tar.bz2
-plague-0.4.tar.bz2
-plague-0.4.1.tar.bz2
-plague-0.4.2.tar.bz2
-plague-0.4.3.tar.bz2
-plague-0.4.4.tar.bz2
-plague-0.4.4.1.tar.bz2
+plague-0.4.5.tar.bz2


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/plague.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- plague.spec	22 May 2008 04:12:08 -0000	1.32
+++ plague.spec	3 Sep 2008 05:06:53 -0000	1.33
@@ -2,13 +2,14 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.4.1
-Release: 6%{?dist}
+Version: 0.4.5
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: python
 Requires: python-sqlite, createrepo >= 0.4.3
 Requires: %{name}-common = %{version}-%{release}
 Requires(post): /sbin/chkconfig
@@ -16,9 +17,6 @@
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
-Patch0: plague-0.4-daemonize.patch
-Patch1: plague-0.4-py25.patch
-
 %description
 The Plague build system is a client/server distributed build system for
 building RPM packages.  This package provides the plague server.
@@ -68,8 +66,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .umask
-%patch1 -p1 -b .py25
 
 %build
 make
@@ -152,6 +148,9 @@
 
 
 %changelog
+* Tue Sep 02 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5-1
+- update to 0.4.5  lots of fixes 
+
 * Thu May 22 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.4.4.1-6
 - licensing tag fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	13 Mar 2006 15:30:00 -0000	1.25
+++ sources	3 Sep 2008 05:06:53 -0000	1.26
@@ -1 +1 @@
-0eb43e25cdd8d630759d010115101956  plague-0.4.4.1.tar.bz2
+91b27539286838d6900c3427eabe1850  plague-0.4.5.tar.bz2


--- plague-0.4-daemonize.patch DELETED ---


--- plague-0.4-py25.patch DELETED ---



From ausil at fedoraproject.org  Wed Sep  3 05:09:08 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  3 Sep 2008 05:09:08 +0000 (UTC)
Subject: rpms/plague/F-9 plague.spec,1.31,1.32 sources,1.25,1.26
Message-ID: <20080903050908.11F4F7011F@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plague/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30409

Modified Files:
	plague.spec sources 
Log Message:
update to 0.4.5



Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-9/plague.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- plague.spec	18 Sep 2007 12:30:49 -0000	1.31
+++ plague.spec	3 Sep 2008 05:08:37 -0000	1.32
@@ -2,13 +2,14 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.4.1
-Release: 5%{?dist}
-License: GPL
+Version: 0.4.5
+Release: 1%{?dist}
+License: GPLv2+
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: python
 Requires: python-sqlite, createrepo >= 0.4.3
 Requires: %{name}-common = %{version}-%{release}
 Requires(post): /sbin/chkconfig
@@ -16,9 +17,6 @@
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
-Patch0: plague-0.4-daemonize.patch
-Patch1: plague-0.4-py25.patch
-
 %description
 The Plague build system is a client/server distributed build system for
 building RPM packages.  This package provides the plague server.
@@ -68,8 +66,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .umask
-%patch1 -p1 -b .py25
 
 %build
 make
@@ -152,6 +148,12 @@
 
 
 %changelog
+* Tue Sep 02 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5-1
+- update to 0.4.5  lots of fixes 
+
+* Thu May 22 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.4.4.1-6
+- licensing tag fix
+
 * Tue Sep 18 2007 Michael Schwendt <mschwendt at users.sf.net> - 0.4.4.1-5
 - Add dirs /etc/plague and /usr/share/plague to plague-common
   since "plague-builder" and "plague" use them (#233904).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-9/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	13 Mar 2006 15:30:00 -0000	1.25
+++ sources	3 Sep 2008 05:08:37 -0000	1.26
@@ -1 +1 @@
-0eb43e25cdd8d630759d010115101956  plague-0.4.4.1.tar.bz2
+91b27539286838d6900c3427eabe1850  plague-0.4.5.tar.bz2



From ausil at fedoraproject.org  Wed Sep  3 05:10:22 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  3 Sep 2008 05:10:22 +0000 (UTC)
Subject: rpms/plague/F-9 plague-0.4-daemonize.patch, 1.1,
	NONE plague-0.4-py25.patch, 1.1, NONE
Message-ID: <20080903051022.044557011F@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plague/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30748

Removed Files:
	plague-0.4-daemonize.patch plague-0.4-py25.patch 
Log Message:
remove old patches



--- plague-0.4-daemonize.patch DELETED ---


--- plague-0.4-py25.patch DELETED ---



From ausil at fedoraproject.org  Wed Sep  3 05:11:20 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  3 Sep 2008 05:11:20 +0000 (UTC)
Subject: rpms/plague/F-8 plague.spec, 1.31, 1.32 sources, 1.25,
	1.26 plague-0.4-daemonize.patch, 1.1, NONE plague-0.4-py25.patch,
	1.1, NONE
Message-ID: <20080903051120.892E07011F@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plague/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30842

Modified Files:
	plague.spec sources 
Removed Files:
	plague-0.4-daemonize.patch plague-0.4-py25.patch 
Log Message:
update to 0.4.5



Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-8/plague.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- plague.spec	18 Sep 2007 12:30:49 -0000	1.31
+++ plague.spec	3 Sep 2008 05:10:50 -0000	1.32
@@ -2,13 +2,14 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.4.1
-Release: 5%{?dist}
-License: GPL
+Version: 0.4.5
+Release: 1%{?dist}
+License: GPLv2+
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: python
 Requires: python-sqlite, createrepo >= 0.4.3
 Requires: %{name}-common = %{version}-%{release}
 Requires(post): /sbin/chkconfig
@@ -16,9 +17,6 @@
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
-Patch0: plague-0.4-daemonize.patch
-Patch1: plague-0.4-py25.patch
-
 %description
 The Plague build system is a client/server distributed build system for
 building RPM packages.  This package provides the plague server.
@@ -68,8 +66,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .umask
-%patch1 -p1 -b .py25
 
 %build
 make
@@ -152,6 +148,12 @@
 
 
 %changelog
+* Tue Sep 02 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5-1
+- update to 0.4.5  lots of fixes 
+
+* Thu May 22 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.4.4.1-6
+- licensing tag fix
+
 * Tue Sep 18 2007 Michael Schwendt <mschwendt at users.sf.net> - 0.4.4.1-5
 - Add dirs /etc/plague and /usr/share/plague to plague-common
   since "plague-builder" and "plague" use them (#233904).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-8/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	13 Mar 2006 15:30:00 -0000	1.25
+++ sources	3 Sep 2008 05:10:50 -0000	1.26
@@ -1 +1 @@
-0eb43e25cdd8d630759d010115101956  plague-0.4.4.1.tar.bz2
+91b27539286838d6900c3427eabe1850  plague-0.4.5.tar.bz2


--- plague-0.4-daemonize.patch DELETED ---


--- plague-0.4-py25.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Sep  3 05:13:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 05:13:48 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903051349.145DA208D0B@bastion.fedora.phx.redhat.com>

huzaifas has set the watchcommits acl on gnumeric (Fedora devel) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 05:13:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 05:13:52 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903051352.9325E208D10@bastion.fedora.phx.redhat.com>

huzaifas has set the commit acl on gnumeric (Fedora devel) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 05:13:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 05:13:50 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903051356.50725208D12@bastion.fedora.phx.redhat.com>

huzaifas has set the watchbugzilla acl on gnumeric (Fedora devel) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 05:14:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 05:14:04 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903051406.C6C1B208D19@bastion.fedora.phx.redhat.com>

huzaifas has set the watchbugzilla acl on gnumeric (Fedora 8) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 05:14:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 05:14:05 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903051408.80331208D16@bastion.fedora.phx.redhat.com>

huzaifas has set the commit acl on gnumeric (Fedora 8) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 05:13:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 05:13:55 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903051357.A8ACC208D15@bastion.fedora.phx.redhat.com>

huzaifas has set the approveacls acl on gnumeric (Fedora devel) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 05:14:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 05:14:06 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903051409.BEE73208D18@bastion.fedora.phx.redhat.com>

huzaifas has set the watchcommits acl on gnumeric (Fedora 8) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 05:14:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 05:14:07 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903051410.83397208D0B@bastion.fedora.phx.redhat.com>

huzaifas has set the approveacls acl on gnumeric (Fedora 8) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 05:14:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 05:14:13 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903051413.C8E65208D84@bastion.fedora.phx.redhat.com>

huzaifas has set the watchbugzilla acl on gnumeric (Fedora 9) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 05:14:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 05:14:14 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903051414.67680208D0D@bastion.fedora.phx.redhat.com>

huzaifas has set the commit acl on gnumeric (Fedora 9) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 05:14:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 05:14:14 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903051415.1E08E208D11@bastion.fedora.phx.redhat.com>

huzaifas has set the watchcommits acl on gnumeric (Fedora 9) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 05:14:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 05:14:17 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903051417.B3841208D12@bastion.fedora.phx.redhat.com>

huzaifas has set the watchbugzilla acl on gnumeric (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 05:14:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 05:14:18 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903051419.DC228208D13@bastion.fedora.phx.redhat.com>

huzaifas has set the watchcommits acl on gnumeric (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 05:14:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 05:14:17 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903051420.B7F35208D87@bastion.fedora.phx.redhat.com>

huzaifas has set the approveacls acl on gnumeric (Fedora 9) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 05:14:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 05:14:22 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903051422.CAB8C208D8A@bastion.fedora.phx.redhat.com>

huzaifas has set the approveacls acl on gnumeric (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From pkgdb at fedoraproject.org  Wed Sep  3 05:14:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 05:14:23 +0000
Subject: [pkgdb] gnumeric had acl change status
Message-ID: <20080903051423.EE771208D8C@bastion.fedora.phx.redhat.com>

huzaifas has set the commit acl on gnumeric (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnumeric



From alexlan at fedoraproject.org  Wed Sep  3 05:14:44 2008
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Wed,  3 Sep 2008 05:14:44 +0000 (UTC)
Subject: rpms/picard/devel sources, 1.8, 1.9 picard.spec, 1.11,
	1.12 .cvsignore, 1.6, 1.7
Message-ID: <20080903051444.A409E7011F@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/picard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31313

Modified Files:
	sources picard.spec .cvsignore 
Log Message:
- Update plugin versions to 0.10 where possible.  
- Temporarily disable the search plugins until they are ported to new API.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/picard/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	31 Aug 2008 12:21:02 -0000	1.8
+++ sources	3 Sep 2008 05:14:14 -0000	1.9
@@ -1,9 +1,4 @@
 6d4e31446d3a65cbc6ff880947bb500e  picard-0.10.tar.gz
-ba58f55711c22ffcf6aa229f008caaa1  bonusdisc.py
-47a9a85385462134c35ab1a2e00844a6  coverart.py
-3614f4157edb858505d387ec0891d6f3  discnumber.py
-d369bb099473e8e81169c39416638742  featartist.py
-abd33550fc54220363940e29c2342cb2  __init__.py
 f58cb1c53d94e22b5c6cd6fcd91a2d5e  SearchAmazon3.py
 c2b8a059dd047c7f7b48a0d872373171  SearchAMG.py
 eedcec32b66e89c3ba27ee4c37c11241  SearchCastAlbums3.py
@@ -15,3 +10,10 @@
 3451a6d0f826fa19f7ebf13a404468e0  SearchSoundtrackCollector3.py
 b831e73aece0f0a1dad14b63895717b8  SearchSoundtrackINFO3.py
 691cb36b7724362a9986c7a8fbb559f2  ui_options_lastfm.py
+7c9ca3c1355900761a0f697dc8de30cd  bonusdisc.py
+64cf9fcb6212dde57aed679a02e88b31  addrelease.py
+edd3f6351ddbfe8c3687895cef58536a  cuesheet.py
+4dcbf286e1facae1c03f116fe2d078d6  discnumber.py
+7885928a813344a80679794c21dfd193  featartist.py
+b5cfbdb00a21928078d9590a91083773  __init__.py
+a9643e50a28a8b4a12759117c53b029d  coverart.py


Index: picard.spec
===================================================================
RCS file: /cvs/extras/rpms/picard/devel/picard.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- picard.spec	31 Aug 2008 12:05:16 -0000	1.11
+++ picard.spec	3 Sep 2008 05:14:14 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:             picard
 Version:          0.10
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          MusicBrainz-based audio tagger
 Group:            Applications/Multimedia
 
@@ -16,20 +16,19 @@
 Source4:          http://dispuut-ivv.nl/~jan/bonusdisc.py
 Source5:          http://users.musicbrainz.org/~luks/picard-qt/plugins/lastfm/__init__.py
 Source6:          http://users.musicbrainz.org/~luks/picard-qt/plugins/lastfm/ui_options_lastfm.py
-
+Source7:          http://users.musicbrainz.org/~luks/picard-qt/plugins/addrelease.py
 # search plugins
 
-Source10:         SearchAMG.py
-## actual URL http://wiki.musicbrainz.org/PicardQt/Plugins?action=AttachFile&do=get&target=SearchAMG.py
-Source11:         http://users.musicbrainz.org/~brianfreud/SearchAmazon3.py
-Source12:         http://users.musicbrainz.org/~brianfreud/SearchCastAlbums3.py
-Source13:         http://users.musicbrainz.org/~brianfreud/SearchDiscogs3.py
-Source14:         http://users.musicbrainz.org/~brianfreud/SearchFilmMusziek3.py
-Source15:         http://users.musicbrainz.org/~brianfreud/SearchGMR.py
-Source16:         http://users.musicbrainz.org/~brianfreud/SearchGoogle3.py
-Source17:         http://users.musicbrainz.org/~brianfreud/SearchLortelArchives3.py
-Source18:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackCollector3.py
-Source19:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackINFO3.py
+#Source10:         http://users.musicbrainz.org/~brianfreud/SearchAMG.py
+#Source11:         http://users.musicbrainz.org/~brianfreud/SearchAmazon3.py
+#Source12:         http://users.musicbrainz.org/~brianfreud/SearchCastAlbums3.py
+#Source13:         http://users.musicbrainz.org/~brianfreud/SearchDiscogs3.py
+#Source14:         http://users.musicbrainz.org/~brianfreud/SearchFilmMusziek3.py
+#Source15:         http://users.musicbrainz.org/~brianfreud/SearchGMR.py
+#Source16:         http://users.musicbrainz.org/~brianfreud/SearchGoogle3.py
+#Source17:         http://users.musicbrainz.org/~brianfreud/SearchLortelArchives3.py
+#Source18:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackCollector3.py
+#Source19:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackINFO3.py
 
 # setup.py doesn't run installation of datadir properly without this patch
 # filed upstream at: http://bugs.musicbrainz.org/ticket/3934
@@ -87,18 +86,21 @@
 mkdir ${PLUGINDIR}/lastfm/
 install -pm 0644 %{SOURCE5} ${PLUGINDIR}/lastfm/
 install -pm 0644 %{SOURCE6} ${PLUGINDIR}/lastfm/
+install -pm 0644 %{SOURCE7} ${PLUGINDIR}
 
 # install search plugins
-install -pm 0644 %{SOURCE10} ${PLUGINDIR}
-install -pm 0644 %{SOURCE11} ${PLUGINDIR}
-install -pm 0644 %{SOURCE12} ${PLUGINDIR}
-install -pm 0644 %{SOURCE13} ${PLUGINDIR}
-install -pm 0644 %{SOURCE14} ${PLUGINDIR}
-install -pm 0644 %{SOURCE15} ${PLUGINDIR}
-install -pm 0644 %{SOURCE16} ${PLUGINDIR}
-install -pm 0644 %{SOURCE17} ${PLUGINDIR}
-install -pm 0644 %{SOURCE18} ${PLUGINDIR}
-install -pm 0644 %{SOURCE19} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE10} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE11} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE12} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE13} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE14} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE15} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE16} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE17} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE18} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE19} ${PLUGINDIR}
+
+echo %{fedora}
 
 ## disable tests for the moment
 %check
@@ -120,6 +122,10 @@
 %{python_sitearch}/picard/*
 
 %changelog
+* Tue Sep  2 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.10-2
+- Update plugin versions to 0.10 where possible.  
+- Temporarily disable the search plugins until they are ported to new API.
+
 * Sun Aug 31 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.10-1
 - Update to latest upstream (0.10).
 - Add patch to work around broken setup.py.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/picard/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Aug 2008 12:05:16 -0000	1.6
+++ .cvsignore	3 Sep 2008 05:14:14 -0000	1.7
@@ -15,3 +15,5 @@
 SearchSoundtrackCollector3.py
 SearchSoundtrackINFO3.py
 ui_options_lastfm.py
+addrelease.py
+cuesheet.py



From pkgdb at fedoraproject.org  Wed Sep  3 05:16:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 05:16:43 +0000
Subject: [pkgdb] libgnomedb (Fedora EPEL, 5) updated by kevin
Message-ID: <20080903051643.4EEE0208D10@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for libgnomedb
kevin has set commit to Approved for uberpackager on libgnomedb (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on libgnomedb (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on libgnomedb (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From alexlan at fedoraproject.org  Wed Sep  3 05:23:01 2008
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Wed,  3 Sep 2008 05:23:01 +0000 (UTC)
Subject: rpms/picard/F-8 sources, 1.5, 1.6 picard.spec, 1.4, 1.5 .cvsignore, 
	1.5, 1.6
Message-ID: <20080903052301.A3A0C7011F@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/picard/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32668/F-8

Modified Files:
	sources picard.spec .cvsignore 
Log Message:
- Update plugin versions to 0.10 where possible.  
- Temporarily disable the search plugins until they are ported 
  to new 0.10 API.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/picard/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Sep 2008 00:54:41 -0000	1.5
+++ sources	3 Sep 2008 05:22:31 -0000	1.6
@@ -1,9 +1,4 @@
 6d4e31446d3a65cbc6ff880947bb500e  picard-0.10.tar.gz
-ba58f55711c22ffcf6aa229f008caaa1  bonusdisc.py
-47a9a85385462134c35ab1a2e00844a6  coverart.py
-3614f4157edb858505d387ec0891d6f3  discnumber.py
-d369bb099473e8e81169c39416638742  featartist.py
-abd33550fc54220363940e29c2342cb2  __init__.py
 f58cb1c53d94e22b5c6cd6fcd91a2d5e  SearchAmazon3.py
 c2b8a059dd047c7f7b48a0d872373171  SearchAMG.py
 eedcec32b66e89c3ba27ee4c37c11241  SearchCastAlbums3.py
@@ -15,3 +10,10 @@
 3451a6d0f826fa19f7ebf13a404468e0  SearchSoundtrackCollector3.py
 b831e73aece0f0a1dad14b63895717b8  SearchSoundtrackINFO3.py
 691cb36b7724362a9986c7a8fbb559f2  ui_options_lastfm.py
+7c9ca3c1355900761a0f697dc8de30cd  bonusdisc.py
+64cf9fcb6212dde57aed679a02e88b31  addrelease.py
+edd3f6351ddbfe8c3687895cef58536a  cuesheet.py
+4dcbf286e1facae1c03f116fe2d078d6  discnumber.py
+7885928a813344a80679794c21dfd193  featartist.py
+b5cfbdb00a21928078d9590a91083773  __init__.py
+a9643e50a28a8b4a12759117c53b029d  coverart.py


Index: picard.spec
===================================================================
RCS file: /cvs/extras/rpms/picard/F-8/picard.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- picard.spec	1 Sep 2008 00:54:41 -0000	1.4
+++ picard.spec	3 Sep 2008 05:22:31 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:             picard
 Version:          0.10
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          MusicBrainz-based audio tagger
 Group:            Applications/Multimedia
 
@@ -16,20 +16,19 @@
 Source4:          http://dispuut-ivv.nl/~jan/bonusdisc.py
 Source5:          http://users.musicbrainz.org/~luks/picard-qt/plugins/lastfm/__init__.py
 Source6:          http://users.musicbrainz.org/~luks/picard-qt/plugins/lastfm/ui_options_lastfm.py
-
+Source7:          http://users.musicbrainz.org/~luks/picard-qt/plugins/addrelease.py
 # search plugins
 
-Source10:         SearchAMG.py
-## actual URL http://wiki.musicbrainz.org/PicardQt/Plugins?action=AttachFile&do=get&target=SearchAMG.py
-Source11:         http://users.musicbrainz.org/~brianfreud/SearchAmazon3.py
-Source12:         http://users.musicbrainz.org/~brianfreud/SearchCastAlbums3.py
-Source13:         http://users.musicbrainz.org/~brianfreud/SearchDiscogs3.py
-Source14:         http://users.musicbrainz.org/~brianfreud/SearchFilmMusziek3.py
-Source15:         http://users.musicbrainz.org/~brianfreud/SearchGMR.py
-Source16:         http://users.musicbrainz.org/~brianfreud/SearchGoogle3.py
-Source17:         http://users.musicbrainz.org/~brianfreud/SearchLortelArchives3.py
-Source18:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackCollector3.py
-Source19:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackINFO3.py
+#Source10:         http://users.musicbrainz.org/~brianfreud/SearchAMG.py
+#Source11:         http://users.musicbrainz.org/~brianfreud/SearchAmazon3.py
+#Source12:         http://users.musicbrainz.org/~brianfreud/SearchCastAlbums3.py
+#Source13:         http://users.musicbrainz.org/~brianfreud/SearchDiscogs3.py
+#Source14:         http://users.musicbrainz.org/~brianfreud/SearchFilmMusziek3.py
+#Source15:         http://users.musicbrainz.org/~brianfreud/SearchGMR.py
+#Source16:         http://users.musicbrainz.org/~brianfreud/SearchGoogle3.py
+#Source17:         http://users.musicbrainz.org/~brianfreud/SearchLortelArchives3.py
+#Source18:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackCollector3.py
+#Source19:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackINFO3.py
 
 # setup.py doesn't run installation of datadir properly without this patch
 # filed upstream at: http://bugs.musicbrainz.org/ticket/3934
@@ -87,18 +86,21 @@
 mkdir ${PLUGINDIR}/lastfm/
 install -pm 0644 %{SOURCE5} ${PLUGINDIR}/lastfm/
 install -pm 0644 %{SOURCE6} ${PLUGINDIR}/lastfm/
+install -pm 0644 %{SOURCE7} ${PLUGINDIR}
 
 # install search plugins
-install -pm 0644 %{SOURCE10} ${PLUGINDIR}
-install -pm 0644 %{SOURCE11} ${PLUGINDIR}
-install -pm 0644 %{SOURCE12} ${PLUGINDIR}
-install -pm 0644 %{SOURCE13} ${PLUGINDIR}
-install -pm 0644 %{SOURCE14} ${PLUGINDIR}
-install -pm 0644 %{SOURCE15} ${PLUGINDIR}
-install -pm 0644 %{SOURCE16} ${PLUGINDIR}
-install -pm 0644 %{SOURCE17} ${PLUGINDIR}
-install -pm 0644 %{SOURCE18} ${PLUGINDIR}
-install -pm 0644 %{SOURCE19} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE10} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE11} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE12} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE13} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE14} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE15} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE16} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE17} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE18} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE19} ${PLUGINDIR}
+
+echo %{fedora}
 
 ## disable tests for the moment
 %check
@@ -120,6 +122,10 @@
 %{python_sitearch}/picard/*
 
 %changelog
+* Tue Sep  2 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.10-2
+- Update plugin versions to 0.10 where possible.  
+- Temporarily disable the search plugins until they are ported to new API.
+
 * Sun Aug 31 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.10-1
 - Update to latest upstream (0.10).
 - Add patch to work around broken setup.py.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/picard/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Sep 2008 00:54:41 -0000	1.5
+++ .cvsignore	3 Sep 2008 05:22:31 -0000	1.6
@@ -15,3 +15,5 @@
 SearchSoundtrackCollector3.py
 SearchSoundtrackINFO3.py
 ui_options_lastfm.py
+addrelease.py
+cuesheet.py



From alexlan at fedoraproject.org  Wed Sep  3 05:23:01 2008
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Wed,  3 Sep 2008 05:23:01 +0000 (UTC)
Subject: rpms/picard/F-9 sources, 1.6, 1.7 picard.spec, 1.11, 1.12 .cvsignore,
	1.6, 1.7
Message-ID: <20080903052301.86A097011F@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/picard/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32668/F-9

Modified Files:
	sources picard.spec .cvsignore 
Log Message:
- Update plugin versions to 0.10 where possible.  
- Temporarily disable the search plugins until they are ported 
  to new 0.10 API.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/picard/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Sep 2008 00:48:46 -0000	1.6
+++ sources	3 Sep 2008 05:22:31 -0000	1.7
@@ -1,9 +1,4 @@
 6d4e31446d3a65cbc6ff880947bb500e  picard-0.10.tar.gz
-ba58f55711c22ffcf6aa229f008caaa1  bonusdisc.py
-47a9a85385462134c35ab1a2e00844a6  coverart.py
-3614f4157edb858505d387ec0891d6f3  discnumber.py
-d369bb099473e8e81169c39416638742  featartist.py
-abd33550fc54220363940e29c2342cb2  __init__.py
 f58cb1c53d94e22b5c6cd6fcd91a2d5e  SearchAmazon3.py
 c2b8a059dd047c7f7b48a0d872373171  SearchAMG.py
 eedcec32b66e89c3ba27ee4c37c11241  SearchCastAlbums3.py
@@ -15,3 +10,10 @@
 3451a6d0f826fa19f7ebf13a404468e0  SearchSoundtrackCollector3.py
 b831e73aece0f0a1dad14b63895717b8  SearchSoundtrackINFO3.py
 691cb36b7724362a9986c7a8fbb559f2  ui_options_lastfm.py
+7c9ca3c1355900761a0f697dc8de30cd  bonusdisc.py
+64cf9fcb6212dde57aed679a02e88b31  addrelease.py
+edd3f6351ddbfe8c3687895cef58536a  cuesheet.py
+4dcbf286e1facae1c03f116fe2d078d6  discnumber.py
+7885928a813344a80679794c21dfd193  featartist.py
+b5cfbdb00a21928078d9590a91083773  __init__.py
+a9643e50a28a8b4a12759117c53b029d  coverart.py


Index: picard.spec
===================================================================
RCS file: /cvs/extras/rpms/picard/F-9/picard.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- picard.spec	1 Sep 2008 00:48:46 -0000	1.11
+++ picard.spec	3 Sep 2008 05:22:31 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:             picard
 Version:          0.10
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          MusicBrainz-based audio tagger
 Group:            Applications/Multimedia
 
@@ -16,20 +16,19 @@
 Source4:          http://dispuut-ivv.nl/~jan/bonusdisc.py
 Source5:          http://users.musicbrainz.org/~luks/picard-qt/plugins/lastfm/__init__.py
 Source6:          http://users.musicbrainz.org/~luks/picard-qt/plugins/lastfm/ui_options_lastfm.py
-
+Source7:          http://users.musicbrainz.org/~luks/picard-qt/plugins/addrelease.py
 # search plugins
 
-Source10:         SearchAMG.py
-## actual URL http://wiki.musicbrainz.org/PicardQt/Plugins?action=AttachFile&do=get&target=SearchAMG.py
-Source11:         http://users.musicbrainz.org/~brianfreud/SearchAmazon3.py
-Source12:         http://users.musicbrainz.org/~brianfreud/SearchCastAlbums3.py
-Source13:         http://users.musicbrainz.org/~brianfreud/SearchDiscogs3.py
-Source14:         http://users.musicbrainz.org/~brianfreud/SearchFilmMusziek3.py
-Source15:         http://users.musicbrainz.org/~brianfreud/SearchGMR.py
-Source16:         http://users.musicbrainz.org/~brianfreud/SearchGoogle3.py
-Source17:         http://users.musicbrainz.org/~brianfreud/SearchLortelArchives3.py
-Source18:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackCollector3.py
-Source19:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackINFO3.py
+#Source10:         http://users.musicbrainz.org/~brianfreud/SearchAMG.py
+#Source11:         http://users.musicbrainz.org/~brianfreud/SearchAmazon3.py
+#Source12:         http://users.musicbrainz.org/~brianfreud/SearchCastAlbums3.py
+#Source13:         http://users.musicbrainz.org/~brianfreud/SearchDiscogs3.py
+#Source14:         http://users.musicbrainz.org/~brianfreud/SearchFilmMusziek3.py
+#Source15:         http://users.musicbrainz.org/~brianfreud/SearchGMR.py
+#Source16:         http://users.musicbrainz.org/~brianfreud/SearchGoogle3.py
+#Source17:         http://users.musicbrainz.org/~brianfreud/SearchLortelArchives3.py
+#Source18:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackCollector3.py
+#Source19:         http://users.musicbrainz.org/~brianfreud/SearchSoundtrackINFO3.py
 
 # setup.py doesn't run installation of datadir properly without this patch
 # filed upstream at: http://bugs.musicbrainz.org/ticket/3934
@@ -87,18 +86,21 @@
 mkdir ${PLUGINDIR}/lastfm/
 install -pm 0644 %{SOURCE5} ${PLUGINDIR}/lastfm/
 install -pm 0644 %{SOURCE6} ${PLUGINDIR}/lastfm/
+install -pm 0644 %{SOURCE7} ${PLUGINDIR}
 
 # install search plugins
-install -pm 0644 %{SOURCE10} ${PLUGINDIR}
-install -pm 0644 %{SOURCE11} ${PLUGINDIR}
-install -pm 0644 %{SOURCE12} ${PLUGINDIR}
-install -pm 0644 %{SOURCE13} ${PLUGINDIR}
-install -pm 0644 %{SOURCE14} ${PLUGINDIR}
-install -pm 0644 %{SOURCE15} ${PLUGINDIR}
-install -pm 0644 %{SOURCE16} ${PLUGINDIR}
-install -pm 0644 %{SOURCE17} ${PLUGINDIR}
-install -pm 0644 %{SOURCE18} ${PLUGINDIR}
-install -pm 0644 %{SOURCE19} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE10} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE11} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE12} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE13} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE14} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE15} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE16} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE17} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE18} ${PLUGINDIR}
+#install -pm 0644 %{SOURCE19} ${PLUGINDIR}
+
+echo %{fedora}
 
 ## disable tests for the moment
 %check
@@ -120,6 +122,10 @@
 %{python_sitearch}/picard/*
 
 %changelog
+* Tue Sep  2 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.10-2
+- Update plugin versions to 0.10 where possible.  
+- Temporarily disable the search plugins until they are ported to new API.
+
 * Sun Aug 31 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.10-1
 - Update to latest upstream (0.10).
 - Add patch to work around broken setup.py.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/picard/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Sep 2008 00:48:46 -0000	1.6
+++ .cvsignore	3 Sep 2008 05:22:31 -0000	1.7
@@ -15,3 +15,5 @@
 SearchSoundtrackCollector3.py
 SearchSoundtrackINFO3.py
 ui_options_lastfm.py
+addrelease.py
+cuesheet.py



From nim at fedoraproject.org  Wed Sep  3 06:15:17 2008
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Wed,  3 Sep 2008 06:15:17 +0000 (UTC)
Subject: rpms/nomarch/devel import.log,NONE,1.1 nomarch.spec,1.12,1.13
Message-ID: <20080903061517.A5F677011F@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/nomarch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7383/devel

Modified Files:
	nomarch.spec 
Added Files:
	import.log 
Log Message:
update url


--- NEW FILE import.log ---
nomarch-1_4-4_fc10:HEAD:nomarch-1.4-4.fc10.src.rpm:1220422467


Index: nomarch.spec
===================================================================
RCS file: /cvs/extras/rpms/nomarch/devel/nomarch.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nomarch.spec	8 Feb 2008 21:37:00 -0000	1.12
+++ nomarch.spec	3 Sep 2008 06:14:47 -0000	1.13
@@ -1,12 +1,12 @@
-Name:      nomarch
-Version:   1.4
-Release:   3%{?dist}
+Name:    nomarch
+Version: 1.4
+Release: 4%{?dist}
 
-Summary:   GPLed Arc de-archiver
+Summary: GPLed Arc de-archiver
 
 Group:     Applications/Archiving
 License:   GPLv2+
-URL:       http://rus.members.beeb.net/nomarch.html
+URL:       http://www.svgalib.org/rus/nomarch.html
 Source:    ftp://ftp.ibiblio.org/pub/Linux/utils/compress/%{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -29,8 +29,8 @@
 %install
 rm -fr %{buildroot}
 %makeinstall \
-        BINDIR="%{buildroot}%{_bindir}" \
-        MANDIR="%{buildroot}%{_mandir}/man1"
+    BINDIR="%{buildroot}%{_bindir}" \
+    MANDIR="%{buildroot}%{_mandir}/man1"
 
 
 %clean
@@ -45,12 +45,16 @@
 
 
 %changelog
-* Fri Feb 08 2008  Nicolas Mailhot <nicolas.mailhot at laposte.net>
+* Wed Sep 3 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 1.4-4
+??? Update URL
+
+* Fri Feb 08 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 1.4-3
 ??? gcc 4.3 rebuild
 ??? License fix
 
-* Sat Sep 02 2006  Nicolas Mailhot <nicolas.mailhot at laposte.net>
+* Sat Sep 02 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 1.4-2
 - FE6 Rebuild
 
@@ -70,7 +74,7 @@
 - 1.3-3
 - rebuild on all arches
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
 * Sun Apr 18 2004 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net>



From denis at fedoraproject.org  Wed Sep  3 06:46:23 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed,  3 Sep 2008 06:46:23 +0000 (UTC)
Subject: rpms/goocanvasmm/devel .cvsignore, 1.3, 1.4 goocanvasmm.spec, 1.3, 
	1.4 sources, 1.3, 1.4
Message-ID: <20080903064623.6D5F47011F@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/goocanvasmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12016

Modified Files:
	.cvsignore goocanvasmm.spec sources 
Log Message:
Update to upstream 0.9.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvasmm/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Jul 2008 11:13:56 -0000	1.3
+++ .cvsignore	3 Sep 2008 06:45:52 -0000	1.4
@@ -1 +1 @@
-goocanvasmm-0.6.0.tar.bz2
+goocanvasmm-0.9.0.tar.bz2


Index: goocanvasmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvasmm/devel/goocanvasmm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- goocanvasmm.spec	11 Jul 2008 11:13:56 -0000	1.3
+++ goocanvasmm.spec	3 Sep 2008 06:45:52 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           goocanvasmm
-Version:        0.6.0
+Version:        0.9.0
 Release:        1%{?dist}
 
 Summary:        C++ interface for goocanvas
@@ -12,7 +12,7 @@
 
 BuildRequires:  glibmm24-devel >= 2.14.2
 BuildRequires:  gtkmm24-devel >= 2.10.9
-BuildRequires:  goocanvas-devel >= 0.8
+BuildRequires:  goocanvas-devel >= 0.10
 BuildRequires:  doxygen graphviz
 
 
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Denis Leroy <denis at poolshark.org> - 0.9.0-1
+- Update to upstream 0.9.0
+
 * Fri Jul 11 2008 Denis Leroy <denis at poolshark.org> - 0.6.0-1
 - Update to upstream 0.6.0
 - Updated BRs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvasmm/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Jul 2008 11:13:56 -0000	1.3
+++ sources	3 Sep 2008 06:45:53 -0000	1.4
@@ -1 +1 @@
-7e9b52bec18def03def91196393d2fea  goocanvasmm-0.6.0.tar.bz2
+202953757c7e86463ac1480475aa53e0  goocanvasmm-0.9.0.tar.bz2



From cebbert at fedoraproject.org  Wed Sep  3 06:48:49 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  3 Sep 2008 06:48:49 +0000 (UTC)
Subject: rpms/kernel/F-9
	linux-2.6-fs-cifs-turn-off-unicode-during-session-establishment.patch,
	NONE, 1.1 linux-2.6-netdev-atl1-disable-tso-by-default.patch, NONE,
	1.1 linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch,
	NONE, 1.1 kernel.spec, 1.755, 1.756 todo, 1.2, 1.3
Message-ID: <20080903064849.7303E7011F@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12504

Modified Files:
	kernel.spec todo 
Added Files:
	linux-2.6-fs-cifs-turn-off-unicode-during-session-establishment.patch 
	linux-2.6-netdev-atl1-disable-tso-by-default.patch 
	linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch 
Log Message:
[CIFS] Turn off Unicode during session establishment for plaintext authentication
atl1: disable TSO by default
x86: PAT proper tracking of set_memory_uc and friends

linux-2.6-fs-cifs-turn-off-unicode-during-session-establishment.patch:

--- NEW FILE linux-2.6-fs-cifs-turn-off-unicode-during-session-establishment.patch ---
From: Steve French <sfrench at us.ibm.com>
Date: Thu, 28 Aug 2008 15:32:22 +0000 (+0000)
Subject: [CIFS] Turn off Unicode during session establishment for plaintext authentication
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c76da9da1fffa6de263486df54950eb328d58f71

[CIFS] Turn off Unicode during session establishment for plaintext authentication

LANMAN session setup did not support Unicode (after session setup, unicode can
still be used though).

Fixes samba bug# 5319

CC: Jeff Layton <jlayton at redhat.com>
CC: Stable Kernel <stable at vger.kernel.org>
Signed-off-by: Steve French <sfrench at us.ibm.com>
---

diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index b537fad..252fdc0 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -409,6 +409,8 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
 #ifdef CONFIG_CIFS_WEAK_PW_HASH
 		char lnm_session_key[CIFS_SESS_KEY_SIZE];
 
+		pSMB->req.hdr.Flags2 &= ~SMBFLG2_UNICODE;
+
 		/* no capabilities flags in old lanman negotiation */
 
 		pSMB->old_req.PasswordLength = cpu_to_le16(CIFS_SESS_KEY_SIZE);

linux-2.6-netdev-atl1-disable-tso-by-default.patch:

--- NEW FILE linux-2.6-netdev-atl1-disable-tso-by-default.patch ---
From: Jay Cliburn <jacliburn at bellsouth.net>
Date: Tue, 19 Aug 2008 00:28:13 +0000 (-0500)
Subject: atl1: disable TSO by default
X-Git-Tag: v2.6.27-rc5~8^2~4^2~13
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=82c26a9d117f0178b8c1b33429014b6d99c470f6

atl1: disable TSO by default

The atl1 driver is causing stalled connections and file corruption
whenever TSO is enabled.  Two examples are here:

http://lkml.org/lkml/2008/7/15/325
http://lkml.org/lkml/2008/8/18/543

Disable TSO by default until we can determine the source of the
problem.

Signed-off-by: Jay Cliburn <jacliburn at bellsouth.net>
cc: stable at kernel.org
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---

diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index e6a7bb7..e23ce77 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -3022,7 +3022,6 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
 	netdev->features = NETIF_F_HW_CSUM;
 	netdev->features |= NETIF_F_SG;
 	netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
-	netdev->features |= NETIF_F_TSO;
 	netdev->features |= NETIF_F_LLTX;
 
 	/*

linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch:

--- NEW FILE linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch ---
From: venkatesh.pallipadi at intel.com <venkatesh.pallipadi at intel.com>
Date: Wed, 20 Aug 2008 23:45:51 +0000 (-0700)
Subject: x86: PAT proper tracking of set_memory_uc and friends
X-Git-Tag: v2.6.27-rc5~5^2~23
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c15238df3b65e34fadb1021b0fb0d5aebc7c42c6

x86: PAT proper tracking of set_memory_uc and friends

Big thinko in pat memtype tracking code. reserve_memtype should be called
with physical address and not virtual address.

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.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 f5f5154..43e2f84 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -849,7 +849,7 @@ int set_memory_uc(unsigned long addr, int numpages)
 	/*
 	 * for now UC MINUS. see comments in ioremap_nocache()
 	 */
-	if (reserve_memtype(addr, addr + numpages * PAGE_SIZE,
+	if (reserve_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE,
 			    _PAGE_CACHE_UC_MINUS, NULL))
 		return -EINVAL;
 
@@ -868,7 +868,7 @@ int set_memory_wc(unsigned long addr, int numpages)
 	if (!pat_enabled)
 		return set_memory_uc(addr, numpages);
 
-	if (reserve_memtype(addr, addr + numpages * PAGE_SIZE,
+	if (reserve_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE,
 		_PAGE_CACHE_WC, NULL))
 		return -EINVAL;
 
@@ -884,7 +884,7 @@ int _set_memory_wb(unsigned long addr, int numpages)
 
 int set_memory_wb(unsigned long addr, int numpages)
 {
-	free_memtype(addr, addr + numpages * PAGE_SIZE);
+	free_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE);
 
 	return _set_memory_wb(addr, numpages);
 }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.755
retrieving revision 1.756
diff -u -r1.755 -r1.756
--- kernel.spec	2 Sep 2008 23:28:15 -0000	1.755
+++ kernel.spec	3 Sep 2008 06:48:18 -0000	1.756
@@ -584,6 +584,7 @@
 Patch90: linux-2.6-x86-io-delay-add-hp-f700-quirk.patch
 Patch91: linux-2.6-x86-fix-oprofile-and-hibernation-issues.patch
 Patch92: linux-2.6-x86-32-amd-c1e-force-timer-broadcast-late.patch
+Patch93: linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch
 
 # ppc
 Patch140: linux-2.6-ps3-ehci-iso.patch
@@ -613,6 +614,7 @@
 Patch412: linux-2.6-block-submit_bh-discards-barrier-flag.patch
 
 # filesystem patches
+Patch420: linux-2.6-fs-cifs-turn-off-unicode-during-session-establishment.patch
 Patch421: linux-2.6-squashfs.patch
 
 Patch430: linux-2.6-net-silence-noisy-printks.patch
@@ -660,6 +662,7 @@
 # atl2 network driver
 Patch2020: linux-2.6-netdev-atl2.patch
 Patch2021: linux-2.6-netdev-atl1e.patch
+Patch2022: linux-2.6-netdev-atl1-disable-tso-by-default.patch
 
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
@@ -1036,6 +1039,8 @@
 ApplyPatch linux-2.6-x86-fix-oprofile-and-hibernation-issues.patch
 #
 ApplyPatch linux-2.6-x86-32-amd-c1e-force-timer-broadcast-late.patch
+#
+ApplyPatch linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch
 
 #
 # PowerPC
@@ -1136,6 +1141,7 @@
 
 # Filesystem patches.
 # cifs
+ApplyPatch linux-2.6-fs-cifs-turn-off-unicode-during-session-establishment.patch
 # Squashfs
 ApplyPatch linux-2.6-squashfs.patch
 
@@ -1210,6 +1216,7 @@
 
 ApplyPatch linux-2.6-netdev-atl2.patch
 ApplyPatch linux-2.6-netdev-atl1e.patch
+ApplyPatch linux-2.6-netdev-atl1-disable-tso-by-default.patch
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
@@ -1822,6 +1829,11 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Wed Sep 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.3-29
+- [CIFS] Turn off Unicode during session establishment for plaintext authentication
+- atl1: disable TSO by default
+- x86: PAT proper tracking of set_memory_uc and friends
+
 * Tue Sep 02 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.3-28
 - Restore most of the drivers dropped in the 2.6.26 update. (F8#460853)
 


Index: todo
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/todo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- todo	31 Aug 2008 22:05:53 -0000	1.2
+++ todo	3 Sep 2008 06:48:19 -0000	1.3
@@ -10,6 +10,7 @@
 linux-2.6-x86-64-fix-overlap-of-modules-and-fixmap-areas.patch
 linux-2.6-x86-fdiv-bug-detection-fix.patch
 linux-2.6-x86-fix-oprofile-and-hibernation-issues.patch
+linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch
 
 Submit for 2.6.27:
 linux-2.6-x86-io-delay-add-hp-f700-quirk.patch



From cebbert at fedoraproject.org  Wed Sep  3 06:57:22 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  3 Sep 2008 06:57:22 +0000 (UTC)
Subject: rpms/kernel/F-8
	linux-2.6-fs-cifs-turn-off-unicode-during-session-establishment.patch,
	NONE, 1.1 linux-2.6-netdev-atl1-disable-tso-by-default.patch, NONE,
	1.1 linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch,
	NONE, 1.1 kernel.spec, 1.523, 1.524
Message-ID: <20080903065722.18AA67011F@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13677

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-fs-cifs-turn-off-unicode-during-session-establishment.patch 
	linux-2.6-netdev-atl1-disable-tso-by-default.patch 
	linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch 
Log Message:
[CIFS] Turn off Unicode during session establishment for plaintext authentication
atl1: disable TSO by default
x86: PAT proper tracking of set_memory_uc and friends

linux-2.6-fs-cifs-turn-off-unicode-during-session-establishment.patch:

--- NEW FILE linux-2.6-fs-cifs-turn-off-unicode-during-session-establishment.patch ---
From: Steve French <sfrench at us.ibm.com>
Date: Thu, 28 Aug 2008 15:32:22 +0000 (+0000)
Subject: [CIFS] Turn off Unicode during session establishment for plaintext authentication
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c76da9da1fffa6de263486df54950eb328d58f71

[CIFS] Turn off Unicode during session establishment for plaintext authentication

LANMAN session setup did not support Unicode (after session setup, unicode can
still be used though).

Fixes samba bug# 5319

CC: Jeff Layton <jlayton at redhat.com>
CC: Stable Kernel <stable at vger.kernel.org>
Signed-off-by: Steve French <sfrench at us.ibm.com>
---

diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index b537fad..252fdc0 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -409,6 +409,8 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
 #ifdef CONFIG_CIFS_WEAK_PW_HASH
 		char lnm_session_key[CIFS_SESS_KEY_SIZE];
 
+		pSMB->req.hdr.Flags2 &= ~SMBFLG2_UNICODE;
+
 		/* no capabilities flags in old lanman negotiation */
 
 		pSMB->old_req.PasswordLength = cpu_to_le16(CIFS_SESS_KEY_SIZE);

linux-2.6-netdev-atl1-disable-tso-by-default.patch:

--- NEW FILE linux-2.6-netdev-atl1-disable-tso-by-default.patch ---
From: Jay Cliburn <jacliburn at bellsouth.net>
Date: Tue, 19 Aug 2008 00:28:13 +0000 (-0500)
Subject: atl1: disable TSO by default
X-Git-Tag: v2.6.27-rc5~8^2~4^2~13
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=82c26a9d117f0178b8c1b33429014b6d99c470f6

atl1: disable TSO by default

The atl1 driver is causing stalled connections and file corruption
whenever TSO is enabled.  Two examples are here:

http://lkml.org/lkml/2008/7/15/325
http://lkml.org/lkml/2008/8/18/543

Disable TSO by default until we can determine the source of the
problem.

Signed-off-by: Jay Cliburn <jacliburn at bellsouth.net>
cc: stable at kernel.org
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---

diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index e6a7bb7..e23ce77 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -3022,7 +3022,6 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
 	netdev->features = NETIF_F_HW_CSUM;
 	netdev->features |= NETIF_F_SG;
 	netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
-	netdev->features |= NETIF_F_TSO;
 	netdev->features |= NETIF_F_LLTX;
 
 	/*

linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch:

--- NEW FILE linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch ---
From: venkatesh.pallipadi at intel.com <venkatesh.pallipadi at intel.com>
Date: Wed, 20 Aug 2008 23:45:51 +0000 (-0700)
Subject: x86: PAT proper tracking of set_memory_uc and friends
X-Git-Tag: v2.6.27-rc5~5^2~23
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c15238df3b65e34fadb1021b0fb0d5aebc7c42c6

x86: PAT proper tracking of set_memory_uc and friends

Big thinko in pat memtype tracking code. reserve_memtype should be called
with physical address and not virtual address.

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.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 f5f5154..43e2f84 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -849,7 +849,7 @@ int set_memory_uc(unsigned long addr, int numpages)
 	/*
 	 * for now UC MINUS. see comments in ioremap_nocache()
 	 */
-	if (reserve_memtype(addr, addr + numpages * PAGE_SIZE,
+	if (reserve_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE,
 			    _PAGE_CACHE_UC_MINUS, NULL))
 		return -EINVAL;
 
@@ -868,7 +868,7 @@ int set_memory_wc(unsigned long addr, int numpages)
 	if (!pat_enabled)
 		return set_memory_uc(addr, numpages);
 
-	if (reserve_memtype(addr, addr + numpages * PAGE_SIZE,
+	if (reserve_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE,
 		_PAGE_CACHE_WC, NULL))
 		return -EINVAL;
 
@@ -884,7 +884,7 @@ int _set_memory_wb(unsigned long addr, int numpages)
 
 int set_memory_wb(unsigned long addr, int numpages)
 {
-	free_memtype(addr, addr + numpages * PAGE_SIZE);
+	free_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE);
 
 	return _set_memory_wb(addr, numpages);
 }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -r1.523 -r1.524
--- kernel.spec	2 Sep 2008 23:31:59 -0000	1.523
+++ kernel.spec	3 Sep 2008 06:56:51 -0000	1.524
@@ -582,6 +582,7 @@
 Patch89: linux-2.6-x86-fdiv-bug-detection-fix.patch
 Patch91: linux-2.6-x86-fix-oprofile-and-hibernation-issues.patch
 Patch92: linux-2.6-x86-32-amd-c1e-force-timer-broadcast-late.patch
+Patch93: linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch
 
 #ALSA
 
@@ -619,6 +620,7 @@
 Patch412: linux-2.6-block-submit_bh-discards-barrier-flag.patch
 
 # filesystem patches
+Patch420: linux-2.6-fs-cifs-turn-off-unicode-during-session-establishment.patch
 Patch421: linux-2.6-squashfs.patch
 Patch424: linux-2.6-gfs-locking-exports.patch
 Patch425: linux-2.6-nfs-client-mounts-hang.patch
@@ -652,6 +654,7 @@
 Patch725: linux-2.6-netdev-atl2.patch
 Patch726: linux-2.6-netdev-atl1e.patch
 Patch727: linux-2.6-e1000-ich9.patch
+Patch728: linux-2.6-netdev-atl1-disable-tso-by-default.patch
 
 #ACPI
 Patch800: linux-2.6-acpi-processor-use-signed-int.patch
@@ -1019,6 +1022,8 @@
 ApplyPatch linux-2.6-x86-fix-oprofile-and-hibernation-issues.patch
 # fix failure to disable local apic on AMD c1e-enabled machines
 ApplyPatch linux-2.6-x86-32-amd-c1e-force-timer-broadcast-late.patch
+#
+ApplyPatch linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch
 
 #
 # PowerPC
@@ -1096,6 +1101,8 @@
 # fin initio driver
 
 # Filesystem patches.
+#
+ApplyPatch linux-2.6-fs-cifs-turn-off-unicode-during-session-establishment.patch
 # Squashfs
 ApplyPatch linux-2.6-squashfs.patch
 # export symbols for gfs2 locking modules
@@ -1176,6 +1183,8 @@
 ApplyPatch linux-2.6-netdev-atl2.patch
 # add atl1e network driver for eeepc 901
 ApplyPatch linux-2.6-netdev-atl1e.patch
+#
+ApplyPatch linux-2.6-netdev-atl1-disable-tso-by-default.patch
 
 # ACPI/PM patches
 # fix obvious thinko
@@ -1813,6 +1822,11 @@
 
 
 %changelog
+* Wed Sep 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.3-14
+- [CIFS] Turn off Unicode during session establishment for plaintext authentication
+- atl1: disable TSO by default
+- x86: PAT proper tracking of set_memory_uc and friends
+
 * Tue Sep 02 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.3-13
 - Restore most of the drivers dropped in the 2.6.26 update. (#460853)
 



From denis at fedoraproject.org  Wed Sep  3 07:06:42 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed,  3 Sep 2008 07:06:42 +0000 (UTC)
Subject: rpms/gstreamermm/devel .cvsignore, 1.2, 1.3 gstreamermm.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <20080903070643.05BA070122@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gstreamermm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14975

Modified Files:
	.cvsignore gstreamermm.spec sources 
Log Message:
Update to upstream 0.9.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamermm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Jun 2008 05:30:24 -0000	1.2
+++ .cvsignore	3 Sep 2008 07:06:12 -0000	1.3
@@ -1 +1 @@
-gstreamermm-0.9.5.tar.bz2
+gstreamermm-0.9.6.tar.bz2


Index: gstreamermm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamermm/devel/gstreamermm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gstreamermm.spec	2 Jun 2008 05:47:05 -0000	1.2
+++ gstreamermm.spec	3 Sep 2008 07:06:12 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           gstreamermm
-Version:        0.9.5
+Version:        0.9.6
 Release:        1%{?dist}
 
 Summary:        C++ wrapper for GStreamer library
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glibmm24-devel >= 2.8.0
-BuildRequires: gstreamer-devel >= 0.10
+BuildRequires: gstreamer-devel >= 0.10.20
 BuildRequires: gstreamer-plugins-base-devel >= 0.10
 BuildRequires: doxygen
 
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Denis Leroy <denis at poolshark.org> - 0.9.6-1
+- Update to upstream 0.9.6
+
 * Sat May 31 2008 Denis Leroy <denis at poolshark.org> - 0.9.5-1
 - Update to upstream 0.9.5
 - Fixed gstreamer plugin BuildRequires 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamermm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Jun 2008 05:30:24 -0000	1.2
+++ sources	3 Sep 2008 07:06:12 -0000	1.3
@@ -1 +1 @@
-7e167980e558fbd18c3988348e00e279  gstreamermm-0.9.5.tar.bz2
+4e6046749155e8537093b017a398ff54  gstreamermm-0.9.6.tar.bz2



From huzaifas at fedoraproject.org  Wed Sep  3 07:15:45 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed,  3 Sep 2008 07:15:45 +0000 (UTC)
Subject: rpms/gnumeric/devel gnumeric-1.6.1-desktop.patch,1.3,1.4
Message-ID: <20080903071545.B467E7011F@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/gnumeric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16354

Modified Files:
	gnumeric-1.6.1-desktop.patch 
Log Message:
Changed to the desktop patch

gnumeric-1.6.1-desktop.patch:

Index: gnumeric-1.6.1-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/devel/gnumeric-1.6.1-desktop.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnumeric-1.6.1-desktop.patch	25 Jan 2008 16:29:18 -0000	1.3
+++ gnumeric-1.6.1-desktop.patch	3 Sep 2008 07:15:15 -0000	1.4
@@ -2,10 +2,10 @@
 +++ gnumeric-1.6.1/gnumeric.desktop.in	2005-11-30 09:31:53.000000000 +0100
 @@ -4,7 +4,7 @@
  _GenericName=Spreadsheet
- _Comment=The GNOME Spreadsheet
+ _Comment=Calculation, Analysis, and Visualization of Information
  Exec=gnumeric %F_OR_U
 -Icon=gnome-gnumeric.png
 +Icon=gnumeric.png
  Terminal=false
  Type=Application
- Categories=Application;Office;Spreadsheet;
+ Categories=Application;Office;Spreadsheet;Science;Math;GNOME;GTK;



From lucilanga at fedoraproject.org  Wed Sep  3 07:25:24 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Wed,  3 Sep 2008 07:25:24 +0000 (UTC)
Subject: rpms/cwdaemon/devel cwdaemon.init, 1.1, 1.2 cwdaemon.spec, 1.1,
	1.2 cwdaemon.sysconfig, 1.1, 1.2
Message-ID: <20080903072524.46B847011F@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/cwdaemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17620

Modified Files:
	cwdaemon.init cwdaemon.spec cwdaemon.sysconfig 
Log Message:
* Wed Sep 03 2008 Lucian Langa <cooly at gnome.eu.org> - 0.9.4-9
- fix sysvinit script


Index: cwdaemon.init
===================================================================
RCS file: /cvs/pkgs/rpms/cwdaemon/devel/cwdaemon.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cwdaemon.init	24 Aug 2008 14:07:05 -0000	1.1
+++ cwdaemon.init	3 Sep 2008 07:24:53 -0000	1.2
@@ -27,10 +27,6 @@
 RETVAL=0
 prog="cwdaemon"
 
-# Exit if it says no start
-grep -q '^START_CWDAEMON=yes' /etc/sysconfig/$NAME || exit 0
-
-
 start() {
         # Start daemons.
         echo -n $"Starting $prog: "


Index: cwdaemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cwdaemon/devel/cwdaemon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cwdaemon.spec	24 Aug 2008 14:07:05 -0000	1.1
+++ cwdaemon.spec	3 Sep 2008 07:24:53 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		cwdaemon
 Version:	0.9.4
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Morse daemon for the parallel or serial port
 
 Group:		System Environment/Daemons
@@ -73,6 +73,9 @@
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Wed Sep 03 2008 Lucian Langa <cooly at gnome.eu.org> - 0.9.4-9
+- fix sysvinit script
+
 * Wed Aug 20 2008 Lucian Langa <cooly at gnome.eu.org> - 0.9.4-8
 - added postun scriptlet
 


Index: cwdaemon.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/cwdaemon/devel/cwdaemon.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cwdaemon.sysconfig	24 Aug 2008 14:07:05 -0000	1.1
+++ cwdaemon.sysconfig	3 Sep 2008 07:24:53 -0000	1.2
@@ -26,4 +26,4 @@
 
 #example: 
 #OPTS="-d parport0 -p 6789 -P 0 -s 24 -t 0 -v 70 -w 0 -x c"
-OPTS="-d parport"
+OPTS="-d parport0"



From pkgdb at fedoraproject.org  Wed Sep  3 07:34:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 07:34:05 +0000
Subject: [pkgdb] lxpanel had acl change status
Message-ID: <20080903073405.E6F6F208D10@bastion.fedora.phx.redhat.com>

svahl has set the watchbugzilla acl on lxpanel (Fedora 8) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lxpanel



From pkgdb at fedoraproject.org  Wed Sep  3 07:34:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 07:34:09 +0000
Subject: [pkgdb] lxpanel had acl change status
Message-ID: <20080903073409.A84CF208D12@bastion.fedora.phx.redhat.com>

svahl has set the watchcommits acl on lxpanel (Fedora 8) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lxpanel



From pkgdb at fedoraproject.org  Wed Sep  3 07:34:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 07:34:11 +0000
Subject: [pkgdb] lxpanel had acl change status
Message-ID: <20080903073411.9078F208D14@bastion.fedora.phx.redhat.com>

svahl has set the commit acl on lxpanel (Fedora 8) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lxpanel



From pkgdb at fedoraproject.org  Wed Sep  3 07:34:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 07:34:19 +0000
Subject: [pkgdb] lxpanel had acl change status
Message-ID: <20080903073419.2895D208D17@bastion.fedora.phx.redhat.com>

svahl has set the watchbugzilla acl on lxpanel (Fedora 9) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lxpanel



From pkgdb at fedoraproject.org  Wed Sep  3 07:34:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 07:34:23 +0000
Subject: [pkgdb] lxpanel had acl change status
Message-ID: <20080903073423.DF210208D11@bastion.fedora.phx.redhat.com>

svahl has set the commit acl on lxpanel (Fedora 9) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lxpanel



From pkgdb at fedoraproject.org  Wed Sep  3 07:34:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 07:34:22 +0000
Subject: [pkgdb] lxpanel had acl change status
Message-ID: <20080903073428.C6E45208D18@bastion.fedora.phx.redhat.com>

svahl has set the watchcommits acl on lxpanel (Fedora 9) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lxpanel



From pkgdb at fedoraproject.org  Wed Sep  3 07:34:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 07:34:30 +0000
Subject: [pkgdb] lxpanel had acl change status
Message-ID: <20080903073430.94385208D80@bastion.fedora.phx.redhat.com>

svahl has set the watchbugzilla acl on lxpanel (Fedora devel) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lxpanel



From pkgdb at fedoraproject.org  Wed Sep  3 07:34:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 07:34:33 +0000
Subject: [pkgdb] lxpanel had acl change status
Message-ID: <20080903073433.E720E208D15@bastion.fedora.phx.redhat.com>

svahl has set the watchcommits acl on lxpanel (Fedora devel) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lxpanel



From pkgdb at fedoraproject.org  Wed Sep  3 07:34:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 07:34:34 +0000
Subject: [pkgdb] lxpanel had acl change status
Message-ID: <20080903073434.A703A208D81@bastion.fedora.phx.redhat.com>

svahl has set the commit acl on lxpanel (Fedora devel) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lxpanel



From lucilanga at fedoraproject.org  Wed Sep  3 07:39:05 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Wed,  3 Sep 2008 07:39:05 +0000 (UTC)
Subject: rpms/cwdaemon/F-9 cwdaemon.init,1.1,1.2 cwdaemon.spec,1.1,1.2
Message-ID: <20080903073905.F365D7011F@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/cwdaemon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20145

Modified Files:
	cwdaemon.init cwdaemon.spec 
Log Message:
* Wed Sep 03 2008 Lucian Langa <cooly at gnome.eu.org> - 0.9.4-9
- fix sysvinit script


Index: cwdaemon.init
===================================================================
RCS file: /cvs/pkgs/rpms/cwdaemon/F-9/cwdaemon.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cwdaemon.init	24 Aug 2008 14:13:49 -0000	1.1
+++ cwdaemon.init	3 Sep 2008 07:38:35 -0000	1.2
@@ -27,10 +27,6 @@
 RETVAL=0
 prog="cwdaemon"
 
-# Exit if it says no start
-grep -q '^START_CWDAEMON=yes' /etc/sysconfig/$NAME || exit 0
-
-
 start() {
         # Start daemons.
         echo -n $"Starting $prog: "


Index: cwdaemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cwdaemon/F-9/cwdaemon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cwdaemon.spec	24 Aug 2008 14:13:49 -0000	1.1
+++ cwdaemon.spec	3 Sep 2008 07:38:35 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		cwdaemon
 Version:	0.9.4
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Morse daemon for the parallel or serial port
 
 Group:		System Environment/Daemons
@@ -73,6 +73,9 @@
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Wed Sep 03 2008 Lucian Langa <cooly at gnome.eu.org> - 0.9.4-9
+- fix sysvinit script
+
 * Wed Aug 20 2008 Lucian Langa <cooly at gnome.eu.org> - 0.9.4-8
 - added postun scriptlet
 



From lucilanga at fedoraproject.org  Wed Sep  3 07:51:08 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Wed,  3 Sep 2008 07:51:08 +0000 (UTC)
Subject: rpms/cwdaemon/F-8 cwdaemon.init,1.1,1.2 cwdaemon.spec,1.1,1.2
Message-ID: <20080903075108.495887011F@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/cwdaemon/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22106

Modified Files:
	cwdaemon.init cwdaemon.spec 
Log Message:
* Wed Sep 03 2008 Lucian Langa <cooly at gnome.eu.org> - 0.9.4-9
- fix sysvinit script


Index: cwdaemon.init
===================================================================
RCS file: /cvs/pkgs/rpms/cwdaemon/F-8/cwdaemon.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cwdaemon.init	24 Aug 2008 14:16:20 -0000	1.1
+++ cwdaemon.init	3 Sep 2008 07:50:37 -0000	1.2
@@ -27,10 +27,6 @@
 RETVAL=0
 prog="cwdaemon"
 
-# Exit if it says no start
-grep -q '^START_CWDAEMON=yes' /etc/sysconfig/$NAME || exit 0
-
-
 start() {
         # Start daemons.
         echo -n $"Starting $prog: "


Index: cwdaemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cwdaemon/F-8/cwdaemon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cwdaemon.spec	24 Aug 2008 14:16:20 -0000	1.1
+++ cwdaemon.spec	3 Sep 2008 07:50:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		cwdaemon
 Version:	0.9.4
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Morse daemon for the parallel or serial port
 
 Group:		System Environment/Daemons
@@ -73,6 +73,9 @@
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Wed Sep 03 2008 Lucian Langa <cooly at gnome.eu.org> - 0.9.4-9
+- fix sysvinit script
+
 * Wed Aug 20 2008 Lucian Langa <cooly at gnome.eu.org> - 0.9.4-8
 - added postun scriptlet
 



From wtogami at fedoraproject.org  Wed Sep  3 08:12:53 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  3 Sep 2008 08:12:53 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.84,1.85
Message-ID: <20080903081253.4EBEC7011F@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24879

Modified Files:
	comps-f10.xml.in 
Log Message:
libflashsupport no longer needed by Flash 10.



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- comps-f10.xml.in	1 Sep 2008 22:53:00 -0000	1.84
+++ comps-f10.xml.in	3 Sep 2008 08:12:22 -0000	1.85
@@ -2062,7 +2062,6 @@
       <packagereq type="optional">kita</packagereq>
       <packagereq type="optional">knetstats</packagereq>
       <packagereq type="optional">konversation</packagereq>
-      <packagereq type="optional">libflashsupport</packagereq>
       <packagereq type="optional">licq</packagereq>
       <packagereq type="optional">liferea</packagereq>
       <packagereq type="optional">linphone</packagereq>



From than at fedoraproject.org  Wed Sep  3 08:45:08 2008
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  3 Sep 2008 08:45:08 +0000 (UTC)
Subject: rpms/kde-i18n/F-8 .cvsignore, 1.39, 1.40 kde-i18n.spec, 1.77,
	1.78 sources, 1.42, 1.43 kde-i18n-ru-3.5.9-fix-Makefile.in.patch,
	1.1, NONE
Message-ID: <20080903084508.6FD517011F@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-i18n/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29219

Modified Files:
	.cvsignore kde-i18n.spec sources 
Removed Files:
	kde-i18n-ru-3.5.9-fix-Makefile.in.patch 
Log Message:
3.5.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-i18n/F-8/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	15 Feb 2008 16:36:48 -0000	1.39
+++ .cvsignore	3 Sep 2008 08:44:37 -0000	1.40
@@ -76,3 +76,42 @@
 kde-i18n-uk-3.5.9.tar.bz2
 kde-i18n-zh_CN-3.5.9.tar.bz2
 kde-i18n-zh_TW-3.5.9.tar.bz2
+kde-i18n-ar-3.5.10.tar.bz2
+kde-i18n-bg-3.5.10.tar.bz2
+kde-i18n-bn-3.5.10.tar.bz2
+kde-i18n-ca-3.5.10.tar.bz2
+kde-i18n-cs-3.5.10.tar.bz2
+kde-i18n-da-3.5.10.tar.bz2
+kde-i18n-de-3.5.10.tar.bz2
+kde-i18n-el-3.5.10.tar.bz2
+kde-i18n-en_GB-3.5.10.tar.bz2
+kde-i18n-es-3.5.10.tar.bz2
+kde-i18n-et-3.5.10.tar.bz2
+kde-i18n-fi-3.5.10.tar.bz2
+kde-i18n-fr-3.5.10.tar.bz2
+kde-i18n-he-3.5.10.tar.bz2
+kde-i18n-hi-3.5.10.tar.bz2
+kde-i18n-hu-3.5.10.tar.bz2
+kde-i18n-is-3.5.10.tar.bz2
+kde-i18n-it-3.5.10.tar.bz2
+kde-i18n-ja-3.5.10.tar.bz2
+kde-i18n-ko-3.5.10.tar.bz2
+kde-i18n-lt-3.5.10.tar.bz2
+kde-i18n-nb-3.5.10.tar.bz2
+kde-i18n-nl-3.5.10.tar.bz2
+kde-i18n-nn-3.5.10.tar.bz2
+kde-i18n-pa-3.5.10.tar.bz2
+kde-i18n-pl-3.5.10.tar.bz2
+kde-i18n-pt-3.5.10.tar.bz2
+kde-i18n-pt_BR-3.5.10.tar.bz2
+kde-i18n-ro-3.5.10.tar.bz2
+kde-i18n-ru-3.5.10.tar.bz2
+kde-i18n-sk-3.5.10.tar.bz2
+kde-i18n-sl-3.5.10.tar.bz2
+kde-i18n-sr-3.5.10.tar.bz2
+kde-i18n-sv-3.5.10.tar.bz2
+kde-i18n-ta-3.5.10.tar.bz2
+kde-i18n-tr-3.5.10.tar.bz2
+kde-i18n-uk-3.5.10.tar.bz2
+kde-i18n-zh_CN-3.5.10.tar.bz2
+kde-i18n-zh_TW-3.5.10.tar.bz2


Index: kde-i18n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-i18n/F-8/kde-i18n.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- kde-i18n.spec	16 Feb 2008 20:05:21 -0000	1.77
+++ kde-i18n.spec	3 Sep 2008 08:44:37 -0000	1.78
@@ -5,8 +5,8 @@
 Summary: Internationalization support for KDE3
 Name: kde-i18n
 Epoch: 1
-Version: 3.5.9
-Release: 4%{?dist}
+Version: 3.5.10
+Release: 1%{?dist}
 
 # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 License: GFDL 
@@ -61,8 +61,6 @@
 Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ko-%{version}.tar.bz2
 Source1000: subdirs-kde-i18n
 
-Patch0: kde-i18n-ru-3.5.9-fix-Makefile.in.patch
-
 BuildRequires: findutils
 BuildRequires: gettext
 BuildRequires: kdelibs3-devel
@@ -632,8 +630,6 @@
   tar jxf %{_sourcedir}/%{name}-$i-%{version}.tar.bz2
 done
 
-%patch0 -p0
-
 
 %build
 for i in $(cat %{SOURCE1000}) ; do
@@ -1672,6 +1668,10 @@
 
 
 %changelog
+* Wed Sep 03 2008 Than Ngo <than at redhat.com> 3.5.10-1
+- 3.5.10
+
+
 * Sat Feb 16 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:3.5.9-4
 - bump Release because of Koji failure
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-i18n/F-8/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	15 Feb 2008 16:36:48 -0000	1.42
+++ sources	3 Sep 2008 08:44:38 -0000	1.43
@@ -1,39 +1,39 @@
-6211dd0fc0c4a78635bf101c5cd02b5e  kde-i18n-ar-3.5.9.tar.bz2
-eb39d6b16dbe6d3ce7892ada50e410fe  kde-i18n-bg-3.5.9.tar.bz2
-7ce4868d7ae6cccbff8a5ba458bce8ea  kde-i18n-bn-3.5.9.tar.bz2
-a59840da5d7b85206442e97ade2593e0  kde-i18n-ca-3.5.9.tar.bz2
-5a93c2949eaee06e340fdd27eded8f0f  kde-i18n-cs-3.5.9.tar.bz2
-951f305c56de946b4184f0f2671d1d98  kde-i18n-da-3.5.9.tar.bz2
-61a65a171c992f5569c4586e7d84ea3c  kde-i18n-de-3.5.9.tar.bz2
-9e08c7b4717718f9de94eaed573e3c84  kde-i18n-el-3.5.9.tar.bz2
-2ff484173da22e8ca6257caeba0930c8  kde-i18n-en_GB-3.5.9.tar.bz2
-5c6c4e421fa082470dfc4c30317b9b61  kde-i18n-es-3.5.9.tar.bz2
-d728e6d136b5d69692e72abd2486e487  kde-i18n-et-3.5.9.tar.bz2
-7ca0c2d8b52b53fc6afb9bbe32241db6  kde-i18n-fi-3.5.9.tar.bz2
-c90cbd2437f4f83ac55f3e7b5fc168b0  kde-i18n-fr-3.5.9.tar.bz2
-074d617454bf56185361d4fa71aba96e  kde-i18n-he-3.5.9.tar.bz2
-07924a60a5246a49603d0cfb5b7675af  kde-i18n-hi-3.5.9.tar.bz2
-7d0fac1410fdc08522f7ec4111245615  kde-i18n-hu-3.5.9.tar.bz2
-4196b2e01c5e959375ab9a3cf12c264f  kde-i18n-is-3.5.9.tar.bz2
-d2dc789e4e77e195c36e900f472bf1f2  kde-i18n-it-3.5.9.tar.bz2
-42af0c4b72c8f4980f6b76e6643b573e  kde-i18n-ja-3.5.9.tar.bz2
-769b35812de7bef6f8d7fd3b091413c9  kde-i18n-ko-3.5.9.tar.bz2
-b5468778503a6d870e5cd8c09fcdb4ac  kde-i18n-lt-3.5.9.tar.bz2
-a1268287cf867503641ed9505dc271f6  kde-i18n-nb-3.5.9.tar.bz2
-da217d35e1f8fab4d53622888459942c  kde-i18n-nl-3.5.9.tar.bz2
-6cd1f400cd12c46a9826d3c51f8e5478  kde-i18n-nn-3.5.9.tar.bz2
-3d0815c760939d6f0a03417001056ef1  kde-i18n-pa-3.5.9.tar.bz2
-4f60d874b599abca41e1c1f34b8246af  kde-i18n-pl-3.5.9.tar.bz2
-3a698240517f9193a760f2285bd891e4  kde-i18n-pt-3.5.9.tar.bz2
-e20c9a990701bd3e85a4c456815c652b  kde-i18n-pt_BR-3.5.9.tar.bz2
-1e11b29a81ac67d9545bbdd053428642  kde-i18n-ro-3.5.9.tar.bz2
-eaf85b9354c4fa6af65e592e48b15041  kde-i18n-ru-3.5.9.tar.bz2
-0d0611c736d0d2bc4cf46c0e411a6085  kde-i18n-sk-3.5.9.tar.bz2
-91b950dcaf610ac25d6a882f4e5e8f1b  kde-i18n-sl-3.5.9.tar.bz2
-f350a5572ddda5fad629d0ccd340d463  kde-i18n-sr-3.5.9.tar.bz2
-74ffe1e5cc7066f30f60483129f05072  kde-i18n-sv-3.5.9.tar.bz2
-489d1ca912353049693edfe61fb1290c  kde-i18n-ta-3.5.9.tar.bz2
-9e6eb6503c467a5bfcfa2545abdf0c9e  kde-i18n-tr-3.5.9.tar.bz2
-76b84d1592ed0b417b29048f0dfa57df  kde-i18n-uk-3.5.9.tar.bz2
-232a615fc0dedb13615d4d89dcd6d416  kde-i18n-zh_CN-3.5.9.tar.bz2
-4e247ee8af22a2a08edb67d083425b90  kde-i18n-zh_TW-3.5.9.tar.bz2
+ff3f9b816be41df76dfdfa7dbefadb2f  kde-i18n-ar-3.5.10.tar.bz2
+c3efc49aef6bb21f8fa604e4f300fc73  kde-i18n-bg-3.5.10.tar.bz2
+6d49f20c81ffae866559c09976f6b733  kde-i18n-bn-3.5.10.tar.bz2
+7587f2accb4231e0cb68e750e2496f55  kde-i18n-ca-3.5.10.tar.bz2
+cc83561a25a53dea5452f0261d94e2cc  kde-i18n-cs-3.5.10.tar.bz2
+de37394373fef218ffd19f2efbb139b4  kde-i18n-da-3.5.10.tar.bz2
+9d24448a403242c64253fcde28d94321  kde-i18n-de-3.5.10.tar.bz2
+b46f636e5e89a6a22d65b8ab40c99aa0  kde-i18n-el-3.5.10.tar.bz2
+3ac6784dd0b7f24e88de85f0196fc138  kde-i18n-en_GB-3.5.10.tar.bz2
+37b1d4f181dbfab4a2f235657e672eea  kde-i18n-es-3.5.10.tar.bz2
+58862bbec128c29db0df33a824813c15  kde-i18n-et-3.5.10.tar.bz2
+195580d7f80330bf703db2d32c6973ec  kde-i18n-fi-3.5.10.tar.bz2
+b92590c756aedd16ee863f307ec20c58  kde-i18n-fr-3.5.10.tar.bz2
+4ba23539fa791d7a9e9b93c6992031a5  kde-i18n-he-3.5.10.tar.bz2
+0d5b52ef04c80034e4148db916a5b8d8  kde-i18n-hi-3.5.10.tar.bz2
+998409be294212345806483033485c0f  kde-i18n-hu-3.5.10.tar.bz2
+92cf1c508c3c719d6899e1f56d91cd31  kde-i18n-is-3.5.10.tar.bz2
+aa850328a980fbcb4253ff97bd7d0305  kde-i18n-it-3.5.10.tar.bz2
+3417f460b7da4b3538439c3fd91defa5  kde-i18n-ja-3.5.10.tar.bz2
+910573d994b6236d64f3f13be7211112  kde-i18n-ko-3.5.10.tar.bz2
+c12d47a5a9f29a9e2b51d40296d4c8c3  kde-i18n-lt-3.5.10.tar.bz2
+d990123fe61f6f15a215c5b189f7f141  kde-i18n-nb-3.5.10.tar.bz2
+a934c97f18dbb1fcb6d2ad72e3247dd1  kde-i18n-nl-3.5.10.tar.bz2
+6e6a432ffc3b8242c29fb3806a61c1d1  kde-i18n-nn-3.5.10.tar.bz2
+f87435d069e4adc9c211775359c336ea  kde-i18n-pa-3.5.10.tar.bz2
+f32e46ce95dc3c7e150d57ae08de1a55  kde-i18n-pl-3.5.10.tar.bz2
+da33de5028e91be24115304b9ec95bb4  kde-i18n-pt-3.5.10.tar.bz2
+8f1344d86383337a930d4c69cfcc1c91  kde-i18n-pt_BR-3.5.10.tar.bz2
+864955c215254a4cb2675c7c1631a8c8  kde-i18n-ro-3.5.10.tar.bz2
+0e76918a045a4792c86216bdc6dccaf4  kde-i18n-ru-3.5.10.tar.bz2
+0b012bc94d7a374e6fad26b66815eb16  kde-i18n-sk-3.5.10.tar.bz2
+dc1a128d27c5cf76de1a98ea80928884  kde-i18n-sl-3.5.10.tar.bz2
+5df0699edb6e7ab7243648838fca3e13  kde-i18n-sr-3.5.10.tar.bz2
+0769547c21b2b82e01e430826002abdd  kde-i18n-sv-3.5.10.tar.bz2
+040cecbcc246733cbb692099138a278b  kde-i18n-ta-3.5.10.tar.bz2
+a043c8e13c699be9b60f0d56833162a8  kde-i18n-tr-3.5.10.tar.bz2
+c4bb322541cbba9dad22da3c588ba639  kde-i18n-uk-3.5.10.tar.bz2
+65ac47c0c1d2424158e416dfa878cc26  kde-i18n-zh_CN-3.5.10.tar.bz2
+c9b7fc28f62fc43f57c0d75535860be6  kde-i18n-zh_TW-3.5.10.tar.bz2


--- kde-i18n-ru-3.5.9-fix-Makefile.in.patch DELETED ---



From than at fedoraproject.org  Wed Sep  3 08:57:35 2008
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  3 Sep 2008 08:57:35 +0000 (UTC)
Subject: rpms/kde-i18n/F-9 kde-i18n.spec, 1.85, 1.86 sources, 1.42,
	1.43 kde-i18n-ru-3.5.9-fix-Makefile.in.patch, 1.1, NONE
Message-ID: <20080903085735.93D5E7011F@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-i18n/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31114

Modified Files:
	kde-i18n.spec sources 
Removed Files:
	kde-i18n-ru-3.5.9-fix-Makefile.in.patch 
Log Message:
3.5.10



Index: kde-i18n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-i18n/F-9/kde-i18n.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- kde-i18n.spec	24 Jul 2008 16:00:42 -0000	1.85
+++ kde-i18n.spec	3 Sep 2008 08:57:05 -0000	1.86
@@ -5,8 +5,8 @@
 Summary: Internationalization support for KDE3
 Name: kde-i18n
 Epoch: 1
-Version: 3.5.9
-Release: 8%{?dist}
+Version: 3.5.10
+Release: 1%{?dist}
 
 # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 License: GFDL 
@@ -61,8 +61,6 @@
 Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ko-%{version}.tar.bz2
 Source1000: subdirs-kde-i18n
 
-Patch0: kde-i18n-ru-3.5.9-fix-Makefile.in.patch
-
 BuildRequires: findutils
 BuildRequires: gettext
 BuildRequires: kdelibs3-devel
@@ -632,8 +630,6 @@
   tar jxf %{_sourcedir}/%{name}-$i-%{version}.tar.bz2
 done
 
-%patch0 -p0
-
 
 %build
 for i in $(cat %{SOURCE1000}) ; do
@@ -1793,6 +1789,9 @@
 
 
 %changelog
+* Wed Sep 03 2008 Than Ngo <than at redhat.com> 3.5.10-1
+- 3.5.10
+
 * Sun Jul 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:3.5.9-8
 - also remove kpovmodeler translations on F9+ (#454458)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-i18n/F-9/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	15 Feb 2008 16:36:58 -0000	1.42
+++ sources	3 Sep 2008 08:57:05 -0000	1.43
@@ -1,39 +1,39 @@
-6211dd0fc0c4a78635bf101c5cd02b5e  kde-i18n-ar-3.5.9.tar.bz2
-eb39d6b16dbe6d3ce7892ada50e410fe  kde-i18n-bg-3.5.9.tar.bz2
-7ce4868d7ae6cccbff8a5ba458bce8ea  kde-i18n-bn-3.5.9.tar.bz2
-a59840da5d7b85206442e97ade2593e0  kde-i18n-ca-3.5.9.tar.bz2
-5a93c2949eaee06e340fdd27eded8f0f  kde-i18n-cs-3.5.9.tar.bz2
-951f305c56de946b4184f0f2671d1d98  kde-i18n-da-3.5.9.tar.bz2
-61a65a171c992f5569c4586e7d84ea3c  kde-i18n-de-3.5.9.tar.bz2
-9e08c7b4717718f9de94eaed573e3c84  kde-i18n-el-3.5.9.tar.bz2
-2ff484173da22e8ca6257caeba0930c8  kde-i18n-en_GB-3.5.9.tar.bz2
-5c6c4e421fa082470dfc4c30317b9b61  kde-i18n-es-3.5.9.tar.bz2
-d728e6d136b5d69692e72abd2486e487  kde-i18n-et-3.5.9.tar.bz2
-7ca0c2d8b52b53fc6afb9bbe32241db6  kde-i18n-fi-3.5.9.tar.bz2
-c90cbd2437f4f83ac55f3e7b5fc168b0  kde-i18n-fr-3.5.9.tar.bz2
-074d617454bf56185361d4fa71aba96e  kde-i18n-he-3.5.9.tar.bz2
-07924a60a5246a49603d0cfb5b7675af  kde-i18n-hi-3.5.9.tar.bz2
-7d0fac1410fdc08522f7ec4111245615  kde-i18n-hu-3.5.9.tar.bz2
-4196b2e01c5e959375ab9a3cf12c264f  kde-i18n-is-3.5.9.tar.bz2
-d2dc789e4e77e195c36e900f472bf1f2  kde-i18n-it-3.5.9.tar.bz2
-42af0c4b72c8f4980f6b76e6643b573e  kde-i18n-ja-3.5.9.tar.bz2
-769b35812de7bef6f8d7fd3b091413c9  kde-i18n-ko-3.5.9.tar.bz2
-b5468778503a6d870e5cd8c09fcdb4ac  kde-i18n-lt-3.5.9.tar.bz2
-a1268287cf867503641ed9505dc271f6  kde-i18n-nb-3.5.9.tar.bz2
-da217d35e1f8fab4d53622888459942c  kde-i18n-nl-3.5.9.tar.bz2
-6cd1f400cd12c46a9826d3c51f8e5478  kde-i18n-nn-3.5.9.tar.bz2
-3d0815c760939d6f0a03417001056ef1  kde-i18n-pa-3.5.9.tar.bz2
-4f60d874b599abca41e1c1f34b8246af  kde-i18n-pl-3.5.9.tar.bz2
-3a698240517f9193a760f2285bd891e4  kde-i18n-pt-3.5.9.tar.bz2
-e20c9a990701bd3e85a4c456815c652b  kde-i18n-pt_BR-3.5.9.tar.bz2
-1e11b29a81ac67d9545bbdd053428642  kde-i18n-ro-3.5.9.tar.bz2
-eaf85b9354c4fa6af65e592e48b15041  kde-i18n-ru-3.5.9.tar.bz2
-0d0611c736d0d2bc4cf46c0e411a6085  kde-i18n-sk-3.5.9.tar.bz2
-91b950dcaf610ac25d6a882f4e5e8f1b  kde-i18n-sl-3.5.9.tar.bz2
-f350a5572ddda5fad629d0ccd340d463  kde-i18n-sr-3.5.9.tar.bz2
-74ffe1e5cc7066f30f60483129f05072  kde-i18n-sv-3.5.9.tar.bz2
-489d1ca912353049693edfe61fb1290c  kde-i18n-ta-3.5.9.tar.bz2
-9e6eb6503c467a5bfcfa2545abdf0c9e  kde-i18n-tr-3.5.9.tar.bz2
-76b84d1592ed0b417b29048f0dfa57df  kde-i18n-uk-3.5.9.tar.bz2
-232a615fc0dedb13615d4d89dcd6d416  kde-i18n-zh_CN-3.5.9.tar.bz2
-4e247ee8af22a2a08edb67d083425b90  kde-i18n-zh_TW-3.5.9.tar.bz2
+ff3f9b816be41df76dfdfa7dbefadb2f  kde-i18n-ar-3.5.10.tar.bz2
+c3efc49aef6bb21f8fa604e4f300fc73  kde-i18n-bg-3.5.10.tar.bz2
+6d49f20c81ffae866559c09976f6b733  kde-i18n-bn-3.5.10.tar.bz2
+7587f2accb4231e0cb68e750e2496f55  kde-i18n-ca-3.5.10.tar.bz2
+cc83561a25a53dea5452f0261d94e2cc  kde-i18n-cs-3.5.10.tar.bz2
+de37394373fef218ffd19f2efbb139b4  kde-i18n-da-3.5.10.tar.bz2
+9d24448a403242c64253fcde28d94321  kde-i18n-de-3.5.10.tar.bz2
+b46f636e5e89a6a22d65b8ab40c99aa0  kde-i18n-el-3.5.10.tar.bz2
+3ac6784dd0b7f24e88de85f0196fc138  kde-i18n-en_GB-3.5.10.tar.bz2
+37b1d4f181dbfab4a2f235657e672eea  kde-i18n-es-3.5.10.tar.bz2
+58862bbec128c29db0df33a824813c15  kde-i18n-et-3.5.10.tar.bz2
+195580d7f80330bf703db2d32c6973ec  kde-i18n-fi-3.5.10.tar.bz2
+b92590c756aedd16ee863f307ec20c58  kde-i18n-fr-3.5.10.tar.bz2
+4ba23539fa791d7a9e9b93c6992031a5  kde-i18n-he-3.5.10.tar.bz2
+0d5b52ef04c80034e4148db916a5b8d8  kde-i18n-hi-3.5.10.tar.bz2
+998409be294212345806483033485c0f  kde-i18n-hu-3.5.10.tar.bz2
+92cf1c508c3c719d6899e1f56d91cd31  kde-i18n-is-3.5.10.tar.bz2
+aa850328a980fbcb4253ff97bd7d0305  kde-i18n-it-3.5.10.tar.bz2
+3417f460b7da4b3538439c3fd91defa5  kde-i18n-ja-3.5.10.tar.bz2
+910573d994b6236d64f3f13be7211112  kde-i18n-ko-3.5.10.tar.bz2
+c12d47a5a9f29a9e2b51d40296d4c8c3  kde-i18n-lt-3.5.10.tar.bz2
+d990123fe61f6f15a215c5b189f7f141  kde-i18n-nb-3.5.10.tar.bz2
+a934c97f18dbb1fcb6d2ad72e3247dd1  kde-i18n-nl-3.5.10.tar.bz2
+6e6a432ffc3b8242c29fb3806a61c1d1  kde-i18n-nn-3.5.10.tar.bz2
+f87435d069e4adc9c211775359c336ea  kde-i18n-pa-3.5.10.tar.bz2
+f32e46ce95dc3c7e150d57ae08de1a55  kde-i18n-pl-3.5.10.tar.bz2
+da33de5028e91be24115304b9ec95bb4  kde-i18n-pt-3.5.10.tar.bz2
+8f1344d86383337a930d4c69cfcc1c91  kde-i18n-pt_BR-3.5.10.tar.bz2
+864955c215254a4cb2675c7c1631a8c8  kde-i18n-ro-3.5.10.tar.bz2
+0e76918a045a4792c86216bdc6dccaf4  kde-i18n-ru-3.5.10.tar.bz2
+0b012bc94d7a374e6fad26b66815eb16  kde-i18n-sk-3.5.10.tar.bz2
+dc1a128d27c5cf76de1a98ea80928884  kde-i18n-sl-3.5.10.tar.bz2
+5df0699edb6e7ab7243648838fca3e13  kde-i18n-sr-3.5.10.tar.bz2
+0769547c21b2b82e01e430826002abdd  kde-i18n-sv-3.5.10.tar.bz2
+040cecbcc246733cbb692099138a278b  kde-i18n-ta-3.5.10.tar.bz2
+a043c8e13c699be9b60f0d56833162a8  kde-i18n-tr-3.5.10.tar.bz2
+c4bb322541cbba9dad22da3c588ba639  kde-i18n-uk-3.5.10.tar.bz2
+65ac47c0c1d2424158e416dfa878cc26  kde-i18n-zh_CN-3.5.10.tar.bz2
+c9b7fc28f62fc43f57c0d75535860be6  kde-i18n-zh_TW-3.5.10.tar.bz2


--- kde-i18n-ru-3.5.9-fix-Makefile.in.patch DELETED ---



From pvrabec at fedoraproject.org  Wed Sep  3 09:00:30 2008
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Wed,  3 Sep 2008 09:00:30 +0000 (UTC)
Subject: rpms/sudo/devel sudo.spec,1.69,1.70
Message-ID: <20080903090030.0EA687011F@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/sudo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31636

Modified Files:
	sudo.spec 
Log Message:
spec file fix



Index: sudo.spec
===================================================================
RCS file: /cvs/extras/rpms/sudo/devel/sudo.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sudo.spec	2 Sep 2008 13:56:42 -0000	1.69
+++ sudo.spec	3 Sep 2008 08:59:59 -0000	1.70
@@ -81,7 +81,6 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT" install_uid=`id -u` install_gid=`id -g` sudoers_uid=`id -u` sudoers_gid=`id -g`
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_sbindir}/* 
 install -p -d -m 700 $RPM_BUILD_ROOT/var/run/sudo



From airlied at fedoraproject.org  Wed Sep  3 09:00:37 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  3 Sep 2008 09:00:37 +0000 (UTC)
Subject: rpms/xorg-x11-drv-i810/devel intel-fix-irq.patch, NONE,
	1.1 xorg-x11-drv-i810.spec, 1.102, 1.103
Message-ID: <20080903090037.21FA37011F@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31676

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-fix-irq.patch 
Log Message:
* Wed Sep 03 2008 Dave Airlie <airlied at redhat.com> 2.4.2-3
- intel-fix-irq.patch - Don't die on irq handler failure
- I think krh DRI2 patches broke it.


intel-fix-irq.patch:

--- NEW FILE intel-fix-irq.patch ---
diff --git a/src/i830_dri.c b/src/i830_dri.c
index ca3bc62..9333651 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -921,7 +921,8 @@ I830DRIInstIrqHandler(ScrnInfoPtr pScrn)
        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 	       "[drm] failure adding irq handler\n");
        pI830DRI->irq = 0;
-       return FALSE;
+	/* don't fail on irq handler install */
+       return TRUE;
    } else
        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 	       "[drm] dma control initialized, using IRQ %d\n",


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- xorg-x11-drv-i810.spec	31 Aug 2008 07:32:22 -0000	1.102
+++ xorg-x11-drv-i810.spec	3 Sep 2008 09:00:06 -0000	1.103
@@ -6,7 +6,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.4.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -23,6 +23,7 @@
 Patch1: intel-2.4.2-git-diffs.patch
 Patch3: intel-2.1.1-fix-xv-reset.patch
 Patch4: intel-fix-flip.patch
+Patch5: intel-fix-irq.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -55,6 +56,7 @@
 %patch1 -p1 -b .gitupdate
 %patch3 -p1 -b .xvfix
 %patch4 -p1 -b .fixflip
+%patch5 -p1 -b .irqfix
 
 %build
 
@@ -97,6 +99,10 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Wed Sep 03 2008 Dave Airlie <airlied at redhat.com> 2.4.2-3
+- intel-fix-irq.patch - Don't die on irq handler failure
+- I think krh DRI2 patches broke it.
+
 * Thu Aug 28 2008 Dave Airlie <airlied at redhat.com> 2.4.2-2
 - upgrade to git head - brings in modesetting + GEM bits - fix flip
 



From than at fedoraproject.org  Wed Sep  3 09:05:24 2008
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  3 Sep 2008 09:05:24 +0000 (UTC)
Subject: rpms/kde-i18n/devel kde-i18n.spec, 1.91, 1.92 sources, 1.42,
	1.43 kde-i18n-ru-3.5.9-fix-Makefile.in.patch, 1.1, NONE
Message-ID: <20080903090524.73E737011F@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-i18n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32472

Modified Files:
	kde-i18n.spec sources 
Removed Files:
	kde-i18n-ru-3.5.9-fix-Makefile.in.patch 
Log Message:
3.5.10



Index: kde-i18n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-i18n/devel/kde-i18n.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- kde-i18n.spec	3 Aug 2008 06:36:50 -0000	1.91
+++ kde-i18n.spec	3 Sep 2008 09:04:53 -0000	1.92
@@ -5,8 +5,8 @@
 Summary: Internationalization support for KDE3
 Name: kde-i18n
 Epoch: 1
-Version: 3.5.9
-Release: 10%{?dist}
+Version: 3.5.10
+Release: 1%{?dist}
 
 # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 License: GFDL 
@@ -61,8 +61,6 @@
 Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ko-%{version}.tar.bz2
 Source1000: subdirs-kde-i18n
 
-Patch0: kde-i18n-ru-3.5.9-fix-Makefile.in.patch
-
 BuildRequires: findutils
 BuildRequires: gettext
 BuildRequires: kdelibs3-devel
@@ -632,8 +630,6 @@
   tar jxf %{_sourcedir}/%{name}-$i-%{version}.tar.bz2
 done
 
-%patch0 -p0
-
 
 %build
 for i in $(cat %{SOURCE1000}) ; do
@@ -1853,6 +1849,9 @@
 
 
 %changelog
+* Wed Sep 03 2008 Than Ngo <than at redhat.com> 3.5.10-1
+- 3.5.10
+
 * Sun Aug 03 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:3.5.9-10
 - F10+: remove more kdepim translations (conflicts reported by Michael Schwendt)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-i18n/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	15 Feb 2008 16:36:58 -0000	1.42
+++ sources	3 Sep 2008 09:04:54 -0000	1.43
@@ -1,39 +1,39 @@
-6211dd0fc0c4a78635bf101c5cd02b5e  kde-i18n-ar-3.5.9.tar.bz2
-eb39d6b16dbe6d3ce7892ada50e410fe  kde-i18n-bg-3.5.9.tar.bz2
-7ce4868d7ae6cccbff8a5ba458bce8ea  kde-i18n-bn-3.5.9.tar.bz2
-a59840da5d7b85206442e97ade2593e0  kde-i18n-ca-3.5.9.tar.bz2
-5a93c2949eaee06e340fdd27eded8f0f  kde-i18n-cs-3.5.9.tar.bz2
-951f305c56de946b4184f0f2671d1d98  kde-i18n-da-3.5.9.tar.bz2
-61a65a171c992f5569c4586e7d84ea3c  kde-i18n-de-3.5.9.tar.bz2
-9e08c7b4717718f9de94eaed573e3c84  kde-i18n-el-3.5.9.tar.bz2
-2ff484173da22e8ca6257caeba0930c8  kde-i18n-en_GB-3.5.9.tar.bz2
-5c6c4e421fa082470dfc4c30317b9b61  kde-i18n-es-3.5.9.tar.bz2
-d728e6d136b5d69692e72abd2486e487  kde-i18n-et-3.5.9.tar.bz2
-7ca0c2d8b52b53fc6afb9bbe32241db6  kde-i18n-fi-3.5.9.tar.bz2
-c90cbd2437f4f83ac55f3e7b5fc168b0  kde-i18n-fr-3.5.9.tar.bz2
-074d617454bf56185361d4fa71aba96e  kde-i18n-he-3.5.9.tar.bz2
-07924a60a5246a49603d0cfb5b7675af  kde-i18n-hi-3.5.9.tar.bz2
-7d0fac1410fdc08522f7ec4111245615  kde-i18n-hu-3.5.9.tar.bz2
-4196b2e01c5e959375ab9a3cf12c264f  kde-i18n-is-3.5.9.tar.bz2
-d2dc789e4e77e195c36e900f472bf1f2  kde-i18n-it-3.5.9.tar.bz2
-42af0c4b72c8f4980f6b76e6643b573e  kde-i18n-ja-3.5.9.tar.bz2
-769b35812de7bef6f8d7fd3b091413c9  kde-i18n-ko-3.5.9.tar.bz2
-b5468778503a6d870e5cd8c09fcdb4ac  kde-i18n-lt-3.5.9.tar.bz2
-a1268287cf867503641ed9505dc271f6  kde-i18n-nb-3.5.9.tar.bz2
-da217d35e1f8fab4d53622888459942c  kde-i18n-nl-3.5.9.tar.bz2
-6cd1f400cd12c46a9826d3c51f8e5478  kde-i18n-nn-3.5.9.tar.bz2
-3d0815c760939d6f0a03417001056ef1  kde-i18n-pa-3.5.9.tar.bz2
-4f60d874b599abca41e1c1f34b8246af  kde-i18n-pl-3.5.9.tar.bz2
-3a698240517f9193a760f2285bd891e4  kde-i18n-pt-3.5.9.tar.bz2
-e20c9a990701bd3e85a4c456815c652b  kde-i18n-pt_BR-3.5.9.tar.bz2
-1e11b29a81ac67d9545bbdd053428642  kde-i18n-ro-3.5.9.tar.bz2
-eaf85b9354c4fa6af65e592e48b15041  kde-i18n-ru-3.5.9.tar.bz2
-0d0611c736d0d2bc4cf46c0e411a6085  kde-i18n-sk-3.5.9.tar.bz2
-91b950dcaf610ac25d6a882f4e5e8f1b  kde-i18n-sl-3.5.9.tar.bz2
-f350a5572ddda5fad629d0ccd340d463  kde-i18n-sr-3.5.9.tar.bz2
-74ffe1e5cc7066f30f60483129f05072  kde-i18n-sv-3.5.9.tar.bz2
-489d1ca912353049693edfe61fb1290c  kde-i18n-ta-3.5.9.tar.bz2
-9e6eb6503c467a5bfcfa2545abdf0c9e  kde-i18n-tr-3.5.9.tar.bz2
-76b84d1592ed0b417b29048f0dfa57df  kde-i18n-uk-3.5.9.tar.bz2
-232a615fc0dedb13615d4d89dcd6d416  kde-i18n-zh_CN-3.5.9.tar.bz2
-4e247ee8af22a2a08edb67d083425b90  kde-i18n-zh_TW-3.5.9.tar.bz2
+ff3f9b816be41df76dfdfa7dbefadb2f  kde-i18n-ar-3.5.10.tar.bz2
+c3efc49aef6bb21f8fa604e4f300fc73  kde-i18n-bg-3.5.10.tar.bz2
+6d49f20c81ffae866559c09976f6b733  kde-i18n-bn-3.5.10.tar.bz2
+7587f2accb4231e0cb68e750e2496f55  kde-i18n-ca-3.5.10.tar.bz2
+cc83561a25a53dea5452f0261d94e2cc  kde-i18n-cs-3.5.10.tar.bz2
+de37394373fef218ffd19f2efbb139b4  kde-i18n-da-3.5.10.tar.bz2
+9d24448a403242c64253fcde28d94321  kde-i18n-de-3.5.10.tar.bz2
+b46f636e5e89a6a22d65b8ab40c99aa0  kde-i18n-el-3.5.10.tar.bz2
+3ac6784dd0b7f24e88de85f0196fc138  kde-i18n-en_GB-3.5.10.tar.bz2
+37b1d4f181dbfab4a2f235657e672eea  kde-i18n-es-3.5.10.tar.bz2
+58862bbec128c29db0df33a824813c15  kde-i18n-et-3.5.10.tar.bz2
+195580d7f80330bf703db2d32c6973ec  kde-i18n-fi-3.5.10.tar.bz2
+b92590c756aedd16ee863f307ec20c58  kde-i18n-fr-3.5.10.tar.bz2
+4ba23539fa791d7a9e9b93c6992031a5  kde-i18n-he-3.5.10.tar.bz2
+0d5b52ef04c80034e4148db916a5b8d8  kde-i18n-hi-3.5.10.tar.bz2
+998409be294212345806483033485c0f  kde-i18n-hu-3.5.10.tar.bz2
+92cf1c508c3c719d6899e1f56d91cd31  kde-i18n-is-3.5.10.tar.bz2
+aa850328a980fbcb4253ff97bd7d0305  kde-i18n-it-3.5.10.tar.bz2
+3417f460b7da4b3538439c3fd91defa5  kde-i18n-ja-3.5.10.tar.bz2
+910573d994b6236d64f3f13be7211112  kde-i18n-ko-3.5.10.tar.bz2
+c12d47a5a9f29a9e2b51d40296d4c8c3  kde-i18n-lt-3.5.10.tar.bz2
+d990123fe61f6f15a215c5b189f7f141  kde-i18n-nb-3.5.10.tar.bz2
+a934c97f18dbb1fcb6d2ad72e3247dd1  kde-i18n-nl-3.5.10.tar.bz2
+6e6a432ffc3b8242c29fb3806a61c1d1  kde-i18n-nn-3.5.10.tar.bz2
+f87435d069e4adc9c211775359c336ea  kde-i18n-pa-3.5.10.tar.bz2
+f32e46ce95dc3c7e150d57ae08de1a55  kde-i18n-pl-3.5.10.tar.bz2
+da33de5028e91be24115304b9ec95bb4  kde-i18n-pt-3.5.10.tar.bz2
+8f1344d86383337a930d4c69cfcc1c91  kde-i18n-pt_BR-3.5.10.tar.bz2
+864955c215254a4cb2675c7c1631a8c8  kde-i18n-ro-3.5.10.tar.bz2
+0e76918a045a4792c86216bdc6dccaf4  kde-i18n-ru-3.5.10.tar.bz2
+0b012bc94d7a374e6fad26b66815eb16  kde-i18n-sk-3.5.10.tar.bz2
+dc1a128d27c5cf76de1a98ea80928884  kde-i18n-sl-3.5.10.tar.bz2
+5df0699edb6e7ab7243648838fca3e13  kde-i18n-sr-3.5.10.tar.bz2
+0769547c21b2b82e01e430826002abdd  kde-i18n-sv-3.5.10.tar.bz2
+040cecbcc246733cbb692099138a278b  kde-i18n-ta-3.5.10.tar.bz2
+a043c8e13c699be9b60f0d56833162a8  kde-i18n-tr-3.5.10.tar.bz2
+c4bb322541cbba9dad22da3c588ba639  kde-i18n-uk-3.5.10.tar.bz2
+65ac47c0c1d2424158e416dfa878cc26  kde-i18n-zh_CN-3.5.10.tar.bz2
+c9b7fc28f62fc43f57c0d75535860be6  kde-i18n-zh_TW-3.5.10.tar.bz2


--- kde-i18n-ru-3.5.9-fix-Makefile.in.patch DELETED ---



From timn at fedoraproject.org  Wed Sep  3 09:21:15 2008
From: timn at fedoraproject.org (Tim Niemueller)
Date: Wed,  3 Sep 2008 09:21:15 +0000 (UTC)
Subject: rpms/player/F-8 player-2.1.1-plugindir.patch, NONE, 1.1 player.spec,
	1.4, 1.5
Message-ID: <20080903092116.10C227011F@cvs1.fedora.phx.redhat.com>

Author: timn

Update of /cvs/pkgs/rpms/player/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2175

Modified Files:
	player.spec 
Added Files:
	player-2.1.1-plugindir.patch 
Log Message:
Copy plugindir patch from F-9 branch

Tim


player-2.1.1-plugindir.patch:

--- NEW FILE player-2.1.1-plugindir.patch ---
diff -urN player-2.1.1/libplayercore/Makefile.am player-2.1.1-plugindir/libplayercore/Makefile.am
--- player-2.1.1/libplayercore/Makefile.am	2008-06-11 03:11:18.000000000 +0200
+++ player-2.1.1-plugindir/libplayercore/Makefile.am	2008-09-02 19:59:41.000000000 +0200
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -g -Wall -D PLAYER_INSTALL_PREFIX="\"@PREFIX@\"" -I$(top_srcdir)
+AM_CPPFLAGS = -g -Wall -D PLAYER_INSTALL_PREFIX="\"@PREFIX@\"" -D PLAYER_PLUGINDIR="\"@libdir@/player\"" -D LIBDIR="\"@libdir@\"" -I$(top_srcdir)
 
 # create the pkg-config entry for the server headers
 pkgconfigdir = $(libdir)/pkgconfig
diff -urN player-2.1.1/libplayercore/plugins.cc player-2.1.1-plugindir/libplayercore/plugins.cc
--- player-2.1.1/libplayercore/plugins.cc	2008-04-13 00:16:48.000000000 +0200
+++ player-2.1.1-plugindir/libplayercore/plugins.cc	2008-09-02 20:00:15.000000000 +0200
@@ -169,8 +169,22 @@
   if(!handle)
   {
     memset(fullpath,0,PATH_MAX);
-    strncpy(fullpath,PLAYER_INSTALL_PREFIX, PATH_MAX);
-    strncat(fullpath,"/lib/", PATH_MAX);
+    strncpy(fullpath,LIBDIR, PATH_MAX);
+    strncat(fullpath,"/", PATH_MAX);
+    strncat(fullpath,pluginname, PATH_MAX);
+    PLAYER_MSG1(1, "trying to load %s...", fullpath);
+    if((handle = lt_dlopenext(fullpath)))
+      PLAYER_MSG0(1, "success");
+    else
+      PLAYER_MSG1(1, "failed (%s)\n", lt_dlerror() );
+  }
+
+  // try to load it from prefix/lib/player
+  if(!handle)
+  {
+    memset(fullpath,0,PATH_MAX);
+    strncpy(fullpath,PLAYER_PLUGINDIR, PATH_MAX);
+    strncat(fullpath,"/", PATH_MAX);
     strncat(fullpath,pluginname, PATH_MAX);
     PLAYER_MSG1(1, "trying to load %s...", fullpath);
     if((handle = lt_dlopenext(fullpath)))


Index: player.spec
===================================================================
RCS file: /cvs/pkgs/rpms/player/F-8/player.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- player.spec	1 Sep 2008 23:27:05 -0000	1.4
+++ player.spec	3 Sep 2008 09:20:45 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           player
 Version:        2.1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Cross-platform robot device interface and server
 
 Group:          Applications/System
@@ -15,6 +15,7 @@
 Patch0:         %{name}-2.1.1-gcc43.patch
 Patch1:         %{name}-2.1.1-norpath.patch
 Patch2:         %{name}-2.1.0rc2-paths.patch
+Patch3:         %{name}-2.1.1-plugindir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  autoconf, automake
@@ -100,6 +101,7 @@
 %patch0 -p1 -b .gcc43
 %patch1 -p1 -b .norpath
 %patch2 -p1 -b .paths
+%patch3 -p1 -b .plugindir
 
 
 %build
@@ -132,6 +134,10 @@
 rm -f $RPM_BUILD_ROOT%{_bindir}/*.pyo
 #mv $RPM_BUILD_ROOT%{_libdir}/player/examples $RPM_BUILD_ROOT%{_datadir}/player/examples
 
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
+mv $RPM_BUILD_ROOT%{_libdir}/liblododriver.so.?.?.? $RPM_BUILD_ROOT%{_libdir}/%{name}/liblododriver.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/liblododriver.so*
+
 desktop-file-install --vendor="fedora"               \
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
 %{SOURCE1}
@@ -162,6 +168,8 @@
 %dir %{_datadir}/player
 %dir %{_libdir}/player
 %{_datadir}/applications/*.desktop
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}
 
 %files python
 %defattr(-,root,root,-)
@@ -188,6 +196,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Tue Sep 02 2008 Tim Niemueller <tim at niemueller.de> - 2.1.1-5
+- Added plugindir patch
+
 * Fri Aug 15 2008 Tim Niemueller <tim at niemueller.de> - 2.1.1-4
 - Changed norpath patch, fixes build problem on Fedora 8
 - Added libtool BR



From than at fedoraproject.org  Wed Sep  3 09:48:49 2008
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  3 Sep 2008 09:48:49 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames.spec,1.101,1.102
Message-ID: <20080903094849.0CF967011F@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5996

Modified Files:
	kdegames.spec 
Log Message:
get rid of the patch that is already included in 4.1.1



Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- kdegames.spec	29 Aug 2008 15:51:02 -0000	1.101
+++ kdegames.spec	3 Sep 2008 09:48:17 -0000	1.102
@@ -92,7 +92,6 @@
 %prep
 %setup -q -n kdegames-%{version}
 %patch0 -p1 -b .parallel_devel
-%patch1 -p0 -b .fix-bovo
 
 
 %build



From than at fedoraproject.org  Wed Sep  3 09:50:17 2008
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  3 Sep 2008 09:50:17 +0000 (UTC)
Subject: rpms/kdegames/F-9 kdegames.spec,1.92,1.93
Message-ID: <20080903095017.C2A347011F@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegames/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6395

Modified Files:
	kdegames.spec 
Log Message:
get rid of the patch that is included in 4.1.1



Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-9/kdegames.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- kdegames.spec	29 Aug 2008 19:00:38 -0000	1.92
+++ kdegames.spec	3 Sep 2008 09:50:16 -0000	1.93
@@ -92,7 +92,6 @@
 %prep
 %setup -q -n kdegames-%{version}
 %patch0 -p1 -b .parallel_devel
-%patch1 -p0 -b .fix-bovo
 
 
 %build



From timn at fedoraproject.org  Wed Sep  3 09:52:57 2008
From: timn at fedoraproject.org (Tim Niemueller)
Date: Wed,  3 Sep 2008 09:52:57 +0000 (UTC)
Subject: rpms/player/devel player-2.1.1-norpath.patch, NONE,
	1.1 player-2.1.1-plugindir.patch, NONE, 1.1 player.spec, 1.1,
	1.2 player-2.1.0rc2-norpath.patch, 1.1, NONE
Message-ID: <20080903095257.9839F7011F@cvs1.fedora.phx.redhat.com>

Author: timn

Update of /cvs/pkgs/rpms/player/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6832

Modified Files:
	player.spec 
Added Files:
	player-2.1.1-norpath.patch player-2.1.1-plugindir.patch 
Removed Files:
	player-2.1.0rc2-norpath.patch 
Log Message:
Copied latest fixes from F-8/F-9 branches to devel branch

Tim


player-2.1.1-norpath.patch:

--- NEW FILE player-2.1.1-norpath.patch ---
diff -urN player-2.1.1/aclocal.m4 player-2.1.1.norpath_am/aclocal.m4
--- player-2.1.1/aclocal.m4	2008-06-16 01:39:27.000000000 +0200
+++ player-2.1.1.norpath_am/aclocal.m4	2008-09-01 00:18:39.000000000 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2005, 2006  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,17 +11,14 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf.  If you want to use that,
+you should regenerate the build system entirely.], [63])])
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
+# serial 51 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -109,6 +106,7 @@
 AC_REQUIRE([AC_OBJEXT])dnl
 AC_REQUIRE([AC_EXEEXT])dnl
 dnl
+
 AC_LIBTOOL_SYS_MAX_CMD_LEN
 AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
 AC_LIBTOOL_OBJDIR
@@ -210,8 +208,6 @@
   ;;
 esac
 
-_LT_REQUIRED_DARWIN_CHECKS
-
 AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 enable_win32_dll=yes, enable_win32_dll=no)
@@ -291,80 +287,9 @@
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
+$rm conftest*
 ])# _LT_LINKER_BOILERPLATE
 
-# _LT_REQUIRED_DARWIN_CHECKS
-# --------------------------
-# Check for some things on darwin
-AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-   # By default we will add the -single_module flag. You can override
-   # by either setting the environment variable LT_MULTI_MODULE
-   # non-empty at configure time, or by adding -multi_module to the
-   # link flags.
-   echo "int foo(void){return 1;}" > conftest.c
-   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-     -dynamiclib ${wl}-single_module conftest.c
-   if test -f libconftest.dylib; then
-     lt_cv_apple_cc_single_mod=yes
-     rm -rf libconftest.dylib*
-   fi
-   rm conftest.c
-      fi])
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-   [lt_cv_ld_exported_symbols_list=yes],
-   [lt_cv_ld_exported_symbols_list=no])
-   LDFLAGS="$save_LDFLAGS"
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[0123]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*)
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-   10.[[012]]*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-   10.*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil="~$DSYMUTIL \$lib || :"
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
 
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
@@ -645,6 +570,7 @@
       esac
       ;;
     *64-bit*)
+      libsuff=64
       case $host in
         x86_64-*kfreebsd*-gnu)
           LD="${LD-ld} -m elf_x86_64_fbsd"
@@ -689,11 +615,7 @@
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
+      *)    LD="${LD-ld} -64" ;;
       esac
       ;;
     esac
@@ -786,7 +708,7 @@
        $2=yes
      fi
    fi
-   $rm -r conftest*
+   $rm conftest*
    LDFLAGS="$save_LDFLAGS"
 ])
 
@@ -1057,7 +979,7 @@
     AC_CHECK_FUNC([shl_load],
 	  [lt_cv_dlopen="shl_load"],
       [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
 	[AC_CHECK_FUNC([dlopen],
 	      [lt_cv_dlopen="dlopen"],
 	  [AC_CHECK_LIB([dl], [dlopen],
@@ -1065,7 +987,7 @@
 	    [AC_CHECK_LIB([svld], [dlopen],
 		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
 	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
 	      ])
 	    ])
 	  ])
@@ -1382,7 +1304,7 @@
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix[[4-9]]*)
+aix4* | aix5*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1707,11 +1629,13 @@
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 
[...13547 lines suppressed...]
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -77,7 +77,7 @@
 am_pmaptest_OBJECTS = pmap_test.$(OBJEXT)
 pmaptest_OBJECTS = $(am_pmaptest_OBJECTS)
 pmaptest_DEPENDENCIES =
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc at am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -170,7 +170,6 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
 DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
 DUMMY_LIB = @DUMMY_LIB@
 ECHO = @ECHO@
@@ -299,7 +298,6 @@
 ND_LIB = @ND_LIB@
 NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
 NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
 NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
 NOMAD_LIB = @NOMAD_LIB@
 OBJDUMP = @OBJDUMP@
@@ -539,8 +537,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -548,8 +546,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -575,8 +573,8 @@
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -666,8 +664,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -679,8 +677,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -690,12 +688,13 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -urN player-2.1.1/utils/xmms-plugin/Makefile.in player-2.1.1.norpath_am/utils/xmms-plugin/Makefile.in
--- player-2.1.1/utils/xmms-plugin/Makefile.in	2008-06-16 01:40:22.000000000 +0200
+++ player-2.1.1.norpath_am/utils/xmms-plugin/Makefile.in	2008-09-01 00:19:06.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -64,7 +64,7 @@
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libplayerxmms_la_CFLAGS) \
 	$(CFLAGS) $(libplayerxmms_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_XMMS_TRUE at am_libplayerxmms_la_rpath = -rpath $(libdir)
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc at am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -146,7 +146,6 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
 DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
 DUMMY_LIB = @DUMMY_LIB@
 ECHO = @ECHO@
@@ -275,7 +274,6 @@
 ND_LIB = @ND_LIB@
 NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
 NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
 NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
 NOMAD_LIB = @NOMAD_LIB@
 OBJDUMP = @OBJDUMP@
@@ -504,8 +502,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -513,8 +511,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -575,8 +573,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -588,8 +586,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -599,12 +597,13 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

player-2.1.1-plugindir.patch:

--- NEW FILE player-2.1.1-plugindir.patch ---
diff -urN player-2.1.1/libplayercore/Makefile.am player-2.1.1-plugindir/libplayercore/Makefile.am
--- player-2.1.1/libplayercore/Makefile.am	2008-06-11 03:11:18.000000000 +0200
+++ player-2.1.1-plugindir/libplayercore/Makefile.am	2008-09-02 19:59:41.000000000 +0200
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -g -Wall -D PLAYER_INSTALL_PREFIX="\"@PREFIX@\"" -I$(top_srcdir)
+AM_CPPFLAGS = -g -Wall -D PLAYER_INSTALL_PREFIX="\"@PREFIX@\"" -D PLAYER_PLUGINDIR="\"@libdir@/player\"" -D LIBDIR="\"@libdir@\"" -I$(top_srcdir)
 
 # create the pkg-config entry for the server headers
 pkgconfigdir = $(libdir)/pkgconfig
diff -urN player-2.1.1/libplayercore/plugins.cc player-2.1.1-plugindir/libplayercore/plugins.cc
--- player-2.1.1/libplayercore/plugins.cc	2008-04-13 00:16:48.000000000 +0200
+++ player-2.1.1-plugindir/libplayercore/plugins.cc	2008-09-02 20:00:15.000000000 +0200
@@ -169,8 +169,22 @@
   if(!handle)
   {
     memset(fullpath,0,PATH_MAX);
-    strncpy(fullpath,PLAYER_INSTALL_PREFIX, PATH_MAX);
-    strncat(fullpath,"/lib/", PATH_MAX);
+    strncpy(fullpath,LIBDIR, PATH_MAX);
+    strncat(fullpath,"/", PATH_MAX);
+    strncat(fullpath,pluginname, PATH_MAX);
+    PLAYER_MSG1(1, "trying to load %s...", fullpath);
+    if((handle = lt_dlopenext(fullpath)))
+      PLAYER_MSG0(1, "success");
+    else
+      PLAYER_MSG1(1, "failed (%s)\n", lt_dlerror() );
+  }
+
+  // try to load it from prefix/lib/player
+  if(!handle)
+  {
+    memset(fullpath,0,PATH_MAX);
+    strncpy(fullpath,PLAYER_PLUGINDIR, PATH_MAX);
+    strncat(fullpath,"/", PATH_MAX);
     strncat(fullpath,pluginname, PATH_MAX);
     PLAYER_MSG1(1, "trying to load %s...", fullpath);
     if((handle = lt_dlopenext(fullpath)))


Index: player.spec
===================================================================
RCS file: /cvs/pkgs/rpms/player/devel/player.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- player.spec	13 Aug 2008 09:07:33 -0000	1.1
+++ player.spec	3 Sep 2008 09:52:26 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           player
 Version:        2.1.1
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Cross-platform robot device interface and server
 
 Group:          Applications/System
@@ -13,11 +13,13 @@
 Source2:        playercam.desktop 
 Source3:        playerv.desktop 
 Patch0:         %{name}-2.1.1-gcc43.patch
-Patch1:         %{name}-2.1.0rc2-norpath.patch
+Patch1:         %{name}-2.1.1-norpath.patch
 Patch2:         %{name}-2.1.0rc2-paths.patch
+Patch3:         %{name}-2.1.1-plugindir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libtool-ltdl-devel
+BuildRequires:  autoconf, automake
+BuildRequires:  libtool, libtool-ltdl-devel
 %if 0%{?fedora} <= 9
 BuildRequires:  geos-devel
 %endif
@@ -37,7 +39,7 @@
 BuildRequires:  avahi-compat-howl-devel
 BuildRequires:  zlib-devel
 BuildRequires:  doxygen, graphviz
-BuildRequires: desktop-file-utils
+BuildRequires:  desktop-file-utils
 
 %description
 Player is a network server for robot control. Running on your robot, Player
@@ -99,9 +101,13 @@
 %patch0 -p1 -b .gcc43
 %patch1 -p1 -b .norpath
 %patch2 -p1 -b .paths
+%patch3 -p1 -b .plugindir
 
 
 %build
+# Required because patches modify .am files
+aclocal
+autoreconf
 # Broken: --enable-alsa --enable-sonartoranger --enable-lasertoranger
 find ./ -name '*.c' -exec chmod a-x {} \;
 find ./ -name '*.cc' -exec chmod a-x {} \;
@@ -128,6 +134,10 @@
 rm -f $RPM_BUILD_ROOT%{_bindir}/*.pyo
 #mv $RPM_BUILD_ROOT%{_libdir}/player/examples $RPM_BUILD_ROOT%{_datadir}/player/examples
 
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
+mv $RPM_BUILD_ROOT%{_libdir}/liblododriver.so.?.?.? $RPM_BUILD_ROOT%{_libdir}/%{name}/liblododriver.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/liblododriver.so*
+
 desktop-file-install --vendor="fedora"               \
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
 %{SOURCE1}
@@ -158,6 +168,8 @@
 %dir %{_datadir}/player
 %dir %{_libdir}/player
 %{_datadir}/applications/*.desktop
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}
 
 %files python
 %defattr(-,root,root,-)
@@ -184,6 +196,14 @@
 %{_libdir}/*.a
 
 %changelog
+* Tue Sep 02 2008 Tim Niemueller <tim at niemueller.de> - 2.1.1-5
+- Added plugindir patch
+
+* Fri Aug 15 2008 Tim Niemueller <tim at niemueller.de> - 2.1.1-4
+- Changed norpath patch, fixes build problem on Fedora 8
+- Added libtool BR
+- Added autotools BR, needed because for patches of .am files
+
 * Mon Aug 08 2008 Jef Spaleta <jspaleta at fedoraproject dot org> - 2.1.1-3
 - Review clean-ups
 


--- player-2.1.0rc2-norpath.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Sep  3 10:07:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 10:07:58 +0000
Subject: [pkgdb] ucarp had acl change status
Message-ID: <20080903100758.150DA208D0C@bastion.fedora.phx.redhat.com>

thias has set the watchbugzilla acl on ucarp (Fedora EPEL 5) to Approved for ask

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ucarp



From pkgdb at fedoraproject.org  Wed Sep  3 10:08:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 10:08:04 +0000
Subject: [pkgdb] ucarp had acl change status
Message-ID: <20080903100804.948E7208D12@bastion.fedora.phx.redhat.com>

thias has set the watchcommits acl on ucarp (Fedora EPEL 5) to Approved for ask

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ucarp



From pkgdb at fedoraproject.org  Wed Sep  3 10:08:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 10:08:40 +0000
Subject: [pkgdb] ucarp had acl change status
Message-ID: <20080903100840.A654A208D10@bastion.fedora.phx.redhat.com>

thias has set the watchcommits acl on ucarp (Fedora 8) to Approved for ask

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ucarp



From pkgdb at fedoraproject.org  Wed Sep  3 10:08:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 10:08:37 +0000
Subject: [pkgdb] ucarp had acl change status
Message-ID: <20080903100843.9637F208D13@bastion.fedora.phx.redhat.com>

thias has set the watchbugzilla acl on ucarp (Fedora 8) to Approved for ask

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ucarp



From pkgdb at fedoraproject.org  Wed Sep  3 10:09:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 10:09:00 +0000
Subject: [pkgdb] ucarp had acl change status
Message-ID: <20080903100900.6F40A208D0C@bastion.fedora.phx.redhat.com>

thias has set the watchbugzilla acl on ucarp (Fedora 9) to Approved for ask

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ucarp



From pkgdb at fedoraproject.org  Wed Sep  3 10:09:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 10:09:04 +0000
Subject: [pkgdb] ucarp had acl change status
Message-ID: <20080903100905.5B361208D12@bastion.fedora.phx.redhat.com>

thias has set the watchcommits acl on ucarp (Fedora 9) to Approved for ask

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ucarp



From caolanm at fedoraproject.org  Wed Sep  3 10:12:08 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  3 Sep 2008 10:12:08 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch,
	NONE, 1.1 openoffice.org.spec, 1.1635, 1.1636
Message-ID: <20080903101209.224C17011F@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9216

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch 
Log Message:
Resolves: rhbz#460883 openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch

openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch:

--- NEW FILE openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch ---
Index: inc/svx/AccessibleContextBase.hxx
===================================================================
RCS file: /cvs/graphics/svx/inc/svx/AccessibleContextBase.hxx,v
retrieving revision 1.4
diff -u -r1.4 AccessibleContextBase.hxx
--- inc/svx/AccessibleContextBase.hxx	7 Jul 2008 14:27:26 -0000	1.4
+++ inc/svx/AccessibleContextBase.hxx	3 Sep 2008 10:01:10 -0000
@@ -396,6 +396,15 @@
 	*/
 	void SetAccessibleRole( sal_Int16 _nRole );
 
+        /** Same as non-Initial versions, except don't fire events */
+	void SetInitialAccessibleName (
+	    const ::rtl::OUString& rName,
+	    StringOrigin eNameOrigin);
+
+	void SetInitialAccessibleDescription (
+            const ::rtl::OUString& rsDescription,
+            StringOrigin eDescriptionOrigin);
+
 private:
     ///	Reference to the parent object.
     ::com::sun::star::uno::Reference<
Index: inc/svx/AccessibleShape.hxx
===================================================================
RCS file: /cvs/graphics/svx/inc/svx/AccessibleShape.hxx,v
retrieving revision 1.4
diff -u -r1.4 AccessibleShape.hxx
--- inc/svx/AccessibleShape.hxx	7 Jul 2008 14:28:01 -0000	1.4
+++ inc/svx/AccessibleShape.hxx	3 Sep 2008 10:01:11 -0000
@@ -437,6 +437,8 @@
         AccessibleContextBase base class.
     */
     void UpdateNameAndDescription (void);
+
+    void SetInitialNameAndDescription (void);
 };
 
 } // end of namespace accessibility
Index: source/accessibility/AccessibleContextBase.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/accessibility/AccessibleContextBase.cxx,v
retrieving revision 1.28
diff -u -r1.28 AccessibleContextBase.cxx
--- source/accessibility/AccessibleContextBase.cxx	7 Jul 2008 14:28:50 -0000	1.28
+++ source/accessibility/AccessibleContextBase.cxx	3 Sep 2008 10:02:17 -0000
@@ -587,6 +587,13 @@
 }
 
 
+void AccessibleContextBase::SetInitialAccessibleDescription (
+    const ::rtl::OUString& rDescription,
+    StringOrigin eDescriptionOrigin)
+{
+	msDescription = rDescription;
+	meDescriptionOrigin = eDescriptionOrigin;
+}
 
 
 void AccessibleContextBase::SetAccessibleDescription (
@@ -601,8 +608,7 @@
 		aOldValue <<= msDescription;
 		aNewValue <<= rDescription;
 
-		msDescription = rDescription;
-        meDescriptionOrigin = eDescriptionOrigin;
+		SetInitialAccessibleDescription(rDescription, eDescriptionOrigin);
 
         CommitChange(
             AccessibleEventId::DESCRIPTION_CHANGED,
@@ -612,6 +618,14 @@
 }
 
 
+void AccessibleContextBase::SetInitialAccessibleName (
+    const ::rtl::OUString& rName,
+    StringOrigin eNameOrigin)
+{
+	msName = rName;
+    meNameOrigin = eNameOrigin;
+}
+
 
 
 void AccessibleContextBase::SetAccessibleName (
@@ -626,8 +640,7 @@
 		aOldValue <<= msName;
 		aNewValue <<= rName;
 
-		msName = rName;
-        meNameOrigin = eNameOrigin;
+		SetAccessibleDescription(rName, eNameOrigin);
 
         CommitChange(
             AccessibleEventId::NAME_CHANGED,
Index: source/accessibility/AccessibleShape.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/accessibility/AccessibleShape.cxx,v
retrieving revision 1.54
diff -u -r1.54 AccessibleShape.cxx
--- source/accessibility/AccessibleShape.cxx	7 Jul 2008 14:31:23 -0000	1.54
+++ source/accessibility/AccessibleShape.cxx	3 Sep 2008 10:02:17 -0000
@@ -123,7 +123,7 @@
       mpParent (rShapeInfo.mpChildrenManager)
 {
 	m_pShape = GetSdrObjectFromXShape(mxShape);
-    UpdateNameAndDescription();
+	SetInitialNameAndDescription();
 }
 
 
@@ -1198,6 +1198,37 @@
     return nIndex;
 }
 
+void AccessibleShape::SetInitialNameAndDescription (void)
+{
+    // Ignore missing title, name, or description.  There are fallbacks for
+    // them.
+    try
+    {
+        Reference<beans::XPropertySet> xSet (mxShape, uno::UNO_QUERY_THROW);
+        OUString sString;
+
+        // Get the accessible name.
+        sString = GetOptionalProperty(xSet, OUString(RTL_CONSTASCII_USTRINGPARAM("Title")));
+        if (sString.getLength() > 0)
+        {
+            SetInitialAccessibleName(sString, AccessibleContextBase::FromShape);
+        }
+        else
+        {
+            sString = GetOptionalProperty(xSet, OUString(RTL_CONSTASCII_USTRINGPARAM("Name")));
+            if (sString.getLength() > 0)
+                SetInitialAccessibleName(sString, AccessibleContextBase::FromShape);
+        }
+
+        // Get the accessible description.
+        sString = GetOptionalProperty(xSet, OUString(RTL_CONSTASCII_USTRINGPARAM("Description")));
+        if (sString.getLength() > 0)
+            SetInitialAccessibleDescription(sString, AccessibleContextBase::FromShape);
+    }
+    catch (uno::RuntimeException&)
+    {
+    }
+}
 
 
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1635
retrieving revision 1.1636
diff -u -r1.1635 -r1.1636
--- openoffice.org.spec	2 Sep 2008 10:46:07 -0000	1.1635
+++ openoffice.org.spec	3 Sep 2008 10:11:35 -0000	1.1636
@@ -110,6 +110,7 @@
 Patch40: workspace.cmcfixes49.patch
 Patch41: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
 Patch42: openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch
+Patch43: openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1291,6 +1292,7 @@
 %patch40 -p0 -b .workspace.cmcfixes49.patch
 %patch41 -p1 -b .ooo91924.svx.consistentordering.patch
 %patch42 -p1 -b .ooo93366.fpicker_in_main.patch
+%patch43 -p1 -b .ooo93419.svx.ref_deref.before.ctored.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3646,8 +3648,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Sep 01 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-4.2
+* Wed Sep 03 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-4.2
 - Resolves: rhbz#460755 TryExec oowriter on brwriter.desktop etc
+- Resolves: rhbz#460883 openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
 - defuzz patches
 - add openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch
 



From ltinkl at fedoraproject.org  Wed Sep  3 10:51:23 2008
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  3 Sep 2008 10:51:23 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.1.1-kde#856379-cookiejar.patch, NONE,
	1.1 kdelibs-4.1.1-kde#856403-urlnav.patch, NONE,
	1.1 kdelibs.spec, 1.346, 1.347
Message-ID: <20080903105123.2260F7011F@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14782

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.1-kde#856379-cookiejar.patch 
	kdelibs-4.1.1-kde#856403-urlnav.patch 
Log Message:
some post-4.1.1 fixes


kdelibs-4.1.1-kde#856379-cookiejar.patch:

--- NEW FILE kdelibs-4.1.1-kde#856379-cookiejar.patch ---
Index: kioslave/http/kcookiejar/kcookiejar.cpp
===================================================================
--- kioslave/http/kcookiejar/kcookiejar.cpp	(revision 856378)
+++ kioslave/http/kcookiejar/kcookiejar.cpp	(revision 856379)
@@ -516,8 +516,10 @@
    extractDomains(_fqdn, domains);
    if (domains.count() > 3)
       _domain = domains[3];
+   else if ( domains.count() > 0 )
+      _domain = domains[0];
    else
-      _domain = domains[0];
+      _domain = L1("");
 }
 
 QString KCookieJar::stripDomain(const KHttpCookie& cookie)

kdelibs-4.1.1-kde#856403-urlnav.patch:

--- NEW FILE kdelibs-4.1.1-kde#856403-urlnav.patch ---
Index: kfile/kurlnavigator.cpp
===================================================================
--- kfile/kurlnavigator.cpp	(revision 856402)
+++ kfile/kurlnavigator.cpp	(revision 856403)
@@ -344,6 +344,7 @@
     // initialize the path box of the traditional view
     m_pathBox = new KUrlComboBox(KUrlComboBox::Both, true, q);
     m_pathBox->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
+    m_pathBox->installEventFilter(q);
 
     KUrlCompletion* kurlCompletion = new KUrlCompletion(KUrlCompletion::DirCompletion);
     m_pathBox->setCompletionObject(kurlCompletion);
@@ -1122,6 +1123,16 @@
     QWidget::resizeEvent(event);
 }
 
+bool KUrlNavigator::eventFilter(QObject* watched, QEvent* event)
+{
+    if ((watched == d->m_pathBox) && (event->type() == QEvent::FocusIn)) {
+        requestActivation();
+        setFocus();
+    }
+
+    return QWidget::eventFilter(watched, event);
+}
+
 int KUrlNavigator::historySize() const
 {
     return d->m_history.count();
Index: kfile/kurlnavigator.h
===================================================================
--- kfile/kurlnavigator.h	(revision 856402)
+++ kfile/kurlnavigator.h	(revision 856403)
@@ -312,6 +312,8 @@
     /* @see QWidget::resizeEvent() */
     virtual void resizeEvent(QResizeEvent* event);
 
+    virtual bool eventFilter(QObject* watched, QEvent* event);
+
 private:
     Q_PRIVATE_SLOT(d, void slotReturnPressed(const QString& text))
     Q_PRIVATE_SLOT(d, void slotReturnPressed())


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- kdelibs.spec	2 Sep 2008 10:14:44 -0000	1.346
+++ kdelibs.spec	3 Sep 2008 10:51:21 -0000	1.347
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -82,6 +82,8 @@
 
 ## upstream patches
 Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
+Patch101: kdelibs-4.1.1-kde#856379-cookiejar.patch
+Patch102: kdelibs-4.1.1-kde#856403-urlnav.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -209,6 +211,8 @@
 
 ## upstream patches
 %patch100 -p0 -b .kde#169447-khtml-regression
+%patch101 -p0 -b .kde#856379-cookiejar
+%patch102 -p0 -b .kde#856403-urlnav
 
 %build
 
@@ -369,6 +373,11 @@
 
 
 %changelog
+* Wed Sep 03 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-5
+- fixed crash on setting cookies on empty domains (like the file
+  system), KDE bug #170147
+- fix URL navigator focus in file dialogs, KDE bug #169497, #170211
+
 * Tue Sep 02 2008 Than Ngo <than at redhat.com> 4.1.1-4
 - apply patch to fix regression in khtml
 



From pkgdb at fedoraproject.org  Wed Sep  3 11:15:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:15:07 +0000
Subject: [pkgdb] file ownership updated
Message-ID: <20080903111507.12980208D0B@bastion.fedora.phx.redhat.com>

Package file in Fedora 7 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/file



From pkgdb at fedoraproject.org  Wed Sep  3 11:15:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:15:04 +0000
Subject: [pkgdb] file ownership updated
Message-ID: <20080903111509.EDEAF208D0D@bastion.fedora.phx.redhat.com>

Package file in Fedora devel was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/file



From pkgdb at fedoraproject.org  Wed Sep  3 11:15:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:15:17 +0000
Subject: [pkgdb] file ownership updated
Message-ID: <20080903111517.72CA2208D14@bastion.fedora.phx.redhat.com>

Package file in Fedora 9 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/file



From pkgdb at fedoraproject.org  Wed Sep  3 11:15:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:15:10 +0000
Subject: [pkgdb] file ownership updated
Message-ID: <20080903111510.AE917208D12@bastion.fedora.phx.redhat.com>

Package file in Fedora 8 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/file



From pkgdb at fedoraproject.org  Wed Sep  3 11:15:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:15:59 +0000
Subject: [pkgdb] logrotate ownership updated
Message-ID: <20080903111559.96729208D0D@bastion.fedora.phx.redhat.com>

Package logrotate in Fedora 7 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:15:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:15:59 +0000
Subject: [pkgdb] logrotate ownership updated
Message-ID: <20080903111559.B8E52208D15@bastion.fedora.phx.redhat.com>

Package logrotate in Fedora devel was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:16:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:16:01 +0000
Subject: [pkgdb] logrotate ownership updated
Message-ID: <20080903111601.BB663208D19@bastion.fedora.phx.redhat.com>

Package logrotate in Fedora 8 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:16:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:16:01 +0000
Subject: [pkgdb] logrotate ownership updated
Message-ID: <20080903111601.DDED2208D6C@bastion.fedora.phx.redhat.com>

Package logrotate in Fedora 9 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From rrankin at fedoraproject.org  Wed Sep  3 11:16:16 2008
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Wed,  3 Sep 2008 11:16:16 +0000 (UTC)
Subject: rpms/denemo/devel denemo-binreloc.patch, NONE,
	1.1 denemo-block_debug.patch, NONE, 1.1 denemo-undo-assert.patch,
	NONE, 1.1 denemo.spec, 1.1, 1.2
Message-ID: <20080903111616.910387011F@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/denemo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18168

Modified Files:
	denemo.spec 
Added Files:
	denemo-binreloc.patch denemo-block_debug.patch 
	denemo-undo-assert.patch 
Log Message:
Patches ???or assert undo crash, un-needed messages on start up


denemo-binreloc.patch:

--- NEW FILE denemo-binreloc.patch ---
diff --git a/src/utils.c b/src/utils.c
index b0751ed..49b5cea 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -509,6 +509,7 @@ void
 initdir ()
 {
 #ifndef G_OS_WIN32
+#ifdef ENABLE_BINRELOC
   GError *error=NULL;
   if(!gbr_init (&error))
     {
@@ -521,6 +522,7 @@ initdir ()
       g_error_free (error);
       g_print ("----------------\n");
     }
+#endif /* ENABLE_BINRELOC */
 #endif /* not G_OS_WIN32 */
 }
 

denemo-block_debug.patch:

--- NEW FILE denemo-block_debug.patch ---
diff --git a/src/prefops.c b/src/prefops.c
index df24107..c7048b1 100644
--- a/src/prefops.c
+++ b/src/prefops.c
@@ -368,7 +368,9 @@ parseConfig (xmlDocPtr doc, xmlNodePtr cur, DenemoPrefs * prefs)
 static void
 writeHistoryEntry (gpointer data, gpointer user_data)
 {
+#ifdef DEBUG
   g_print ("filename %s\n", (gchar *) data);
+#endif
   xmlNewTextChild ((xmlNodePtr) user_data, NULL, (xmlChar *) "file",
 		   (xmlChar *) data);
 }

denemo-undo-assert.patch:

--- NEW FILE denemo-undo-assert.patch ---
diff --git a/src/selectops.c b/src/selectops.c
index b281c23..d53f2e6 100644
--- a/src/selectops.c
+++ b/src/selectops.c
@@ -53,7 +53,9 @@ setcurrentobject (DenemoScore * si, gint cursorpos)
 
   si->currentobject = g_list_nth ((objnode *) si->currentmeasure->data,
 				  cursorpos);
+#ifdef DEBUG
   g_assert (si->currentobject != NULL);
+#endif /* DEBUG */
 }
 
 /**


Index: denemo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/denemo/devel/denemo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- denemo.spec	24 Aug 2008 23:05:19 -0000	1.1
+++ denemo.spec	3 Sep 2008 11:16:14 -0000	1.2
@@ -1,10 +1,14 @@
 Summary: Graphical music notation program
 Name: denemo
 Version: 0.7.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 Source: http://download.savannah.gnu.org/releases/denemo/%{name}-%{version}.tar.gz
+Patch0: %{name}-block_debug.patch
+Patch1: %{name}-undo-assert.patch
+Patch2: %{name}-binreloc.patch
+
 URL: http://www.denemo.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,6 +28,9 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure 
@@ -52,6 +59,8 @@
 %doc COPYING README README.lilypond ChangeLog 
 
 %changelog
+* Wed Sep 03 2008 Roy Rankin <rrankin at ihug.com.au> - 0.7.9-5
+-Add Patches assert undo crash, un-needed messages on start up
 * Mon Aug 18 2008 Roy Rankin <rrankin at ihug.com.au> 0.7.9-4
 -Simplify Requires
 * Sat Aug 16 2008 Roy Rankin <rrankin at ihug.com.au> 0.7.9-3



From pkgdb at fedoraproject.org  Wed Sep  3 11:16:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:16:18 +0000
Subject: [pkgdb] logrotate: tsmetana has requested watchbugzilla
Message-ID: <20080903111618.8D71E208D11@bastion.fedora.phx.redhat.com>

tsmetana has requested the watchbugzilla acl on logrotate (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:16:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:16:27 +0000
Subject: [pkgdb] logrotate: tsmetana has requested commit
Message-ID: <20080903111627.46594208D18@bastion.fedora.phx.redhat.com>

tsmetana has requested the commit acl on logrotate (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:16:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:16:20 +0000
Subject: [pkgdb] logrotate: tsmetana has requested watchcommits
Message-ID: <20080903111620.DAAE8208D81@bastion.fedora.phx.redhat.com>

tsmetana has requested the watchcommits acl on logrotate (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:16:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:16:21 +0000
Subject: [pkgdb] logrotate: tsmetana has requested commit
Message-ID: <20080903111621.EB64E208D84@bastion.fedora.phx.redhat.com>

tsmetana has requested the commit acl on logrotate (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:17:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:17:28 +0000
Subject: [pkgdb] file ownership updated
Message-ID: <20080903111729.03CFA208D12@bastion.fedora.phx.redhat.com>

Package file in Fedora devel is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/file



From pkgdb at fedoraproject.org  Wed Sep  3 11:17:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:17:36 +0000
Subject: [pkgdb] file ownership updated
Message-ID: <20080903111736.2762C208D0D@bastion.fedora.phx.redhat.com>

Package file in Fedora 8 is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/file



From pkgdb at fedoraproject.org  Wed Sep  3 11:17:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:17:39 +0000
Subject: [pkgdb] logrotate: tsmetana has requested watchbugzilla
Message-ID: <20080903111739.4896F208D0B@bastion.fedora.phx.redhat.com>

tsmetana has requested the watchbugzilla acl on logrotate (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:17:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:17:44 +0000
Subject: [pkgdb] logrotate: tsmetana has requested commit
Message-ID: <20080903111744.03275208D12@bastion.fedora.phx.redhat.com>

tsmetana has requested the commit acl on logrotate (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:17:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:17:40 +0000
Subject: [pkgdb] file ownership updated
Message-ID: <20080903111746.9F53A208D15@bastion.fedora.phx.redhat.com>

Package file in Fedora 9 is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/file



From pkgdb at fedoraproject.org  Wed Sep  3 11:17:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:17:44 +0000
Subject: [pkgdb] logrotate: tsmetana has requested watchcommits
Message-ID: <20080903111746.DDC69208D16@bastion.fedora.phx.redhat.com>

tsmetana has requested the watchcommits acl on logrotate (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:17:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:17:59 +0000
Subject: [pkgdb] procinfo ownership updated
Message-ID: <20080903111759.81BBB208D0B@bastion.fedora.phx.redhat.com>

Package procinfo in Fedora 7 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/procinfo



From pkgdb at fedoraproject.org  Wed Sep  3 11:18:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:18:00 +0000
Subject: [pkgdb] procinfo ownership updated
Message-ID: <20080903111800.EB44E208D0D@bastion.fedora.phx.redhat.com>

Package procinfo in Fedora devel was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/procinfo



From pkgdb at fedoraproject.org  Wed Sep  3 11:18:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:18:01 +0000
Subject: [pkgdb] procinfo ownership updated
Message-ID: <20080903111801.85236208D12@bastion.fedora.phx.redhat.com>

Package procinfo in Fedora 8 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/procinfo



From pkgdb at fedoraproject.org  Wed Sep  3 11:18:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:18:05 +0000
Subject: [pkgdb] procps ownership updated
Message-ID: <20080903111805.2F60F208D16@bastion.fedora.phx.redhat.com>

Package procps in Fedora devel was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/procps



From pkgdb at fedoraproject.org  Wed Sep  3 11:18:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:18:03 +0000
Subject: [pkgdb] procinfo ownership updated
Message-ID: <20080903111803.93C34208D14@bastion.fedora.phx.redhat.com>

Package procinfo in Fedora 9 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/procinfo



From pkgdb at fedoraproject.org  Wed Sep  3 11:18:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:18:06 +0000
Subject: [pkgdb] procps ownership updated
Message-ID: <20080903111806.EA4F2208D19@bastion.fedora.phx.redhat.com>

Package procps in Fedora 8 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/procps



From pkgdb at fedoraproject.org  Wed Sep  3 11:18:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:18:07 +0000
Subject: [pkgdb] procps ownership updated
Message-ID: <20080903111807.67D96208D6C@bastion.fedora.phx.redhat.com>

Package procps in Fedora 7 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/procps



From pkgdb at fedoraproject.org  Wed Sep  3 11:18:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:18:08 +0000
Subject: [pkgdb] procps ownership updated
Message-ID: <20080903111808.018AF208D81@bastion.fedora.phx.redhat.com>

Package procps in Fedora 9 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/procps



From mbarnes at fedoraproject.org  Wed Sep  3 11:18:14 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  3 Sep 2008 11:18:14 +0000 (UTC)
Subject: rpms/pygobject2/devel .cvsignore, 1.17, 1.18 pygobject2.spec, 1.40, 
	1.41 sources, 1.17, 1.18
Message-ID: <20080903111814.34F447011F@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pygobject2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18723

Modified Files:
	.cvsignore pygobject2.spec sources 
Log Message:

* Wed Sep 03 2008 Matthew Barnes <mbarnes at redhat.com> - 2.15.4-1.fc10
- Update to 2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	1 Sep 2008 00:41:12 -0000	1.17
+++ .cvsignore	3 Sep 2008 11:17:42 -0000	1.18
@@ -1 +1 @@
-pygobject-2.15.3.tar.bz2
+pygobject-2.15.4.tar.bz2


Index: pygobject2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- pygobject2.spec	1 Sep 2008 00:41:12 -0000	1.40
+++ pygobject2.spec	3 Sep 2008 11:17:42 -0000	1.41
@@ -7,7 +7,7 @@
 ### Abstract ###
 
 Name: pygobject2
-Version: 2.15.3
+Version: 2.15.4
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
@@ -116,6 +116,9 @@
 %{_datadir}/pygobject/xsl
 
 %changelog
+* Wed Sep 03 2008 Matthew Barnes <mbarnes at redhat.com> - 2.15.4-1.fc10
+- Update to 2.15.4
+
 * Sun Aug 31 2008 Matthew Barnes <mbarnes at redhat.com> - 2.15.3-1.fc10
 - Update to 2.15.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	1 Sep 2008 00:41:12 -0000	1.17
+++ sources	3 Sep 2008 11:17:42 -0000	1.18
@@ -1 +1 @@
-277e654c45746506455627a506dbb65c  pygobject-2.15.3.tar.bz2
+df59affe5b8fd7148506c3473d479868  pygobject-2.15.4.tar.bz2



From pkgdb at fedoraproject.org  Wed Sep  3 11:18:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:18:14 +0000
Subject: [pkgdb] psmisc ownership updated
Message-ID: <20080903111814.951EC208D11@bastion.fedora.phx.redhat.com>

Package psmisc in Fedora 8 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/psmisc



From pkgdb at fedoraproject.org  Wed Sep  3 11:18:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:18:14 +0000
Subject: [pkgdb] psmisc ownership updated
Message-ID: <20080903111814.C2795208D87@bastion.fedora.phx.redhat.com>

Package psmisc in Fedora 7 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/psmisc



From pkgdb at fedoraproject.org  Wed Sep  3 11:18:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:18:16 +0000
Subject: [pkgdb] psmisc ownership updated
Message-ID: <20080903111816.187CB208D12@bastion.fedora.phx.redhat.com>

Package psmisc in Fedora 9 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/psmisc



From pkgdb at fedoraproject.org  Wed Sep  3 11:18:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:18:15 +0000
Subject: [pkgdb] psmisc ownership updated
Message-ID: <20080903111820.9DCBF208D8E@bastion.fedora.phx.redhat.com>

Package psmisc in Fedora devel was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/psmisc



From pkgdb at fedoraproject.org  Wed Sep  3 11:18:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:18:34 +0000
Subject: [pkgdb] gob2 ownership updated
Message-ID: <20080903111834.C0041208D19@bastion.fedora.phx.redhat.com>

Package gob2 in Fedora devel is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gob2



From pkgdb at fedoraproject.org  Wed Sep  3 11:18:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:18:43 +0000
Subject: [pkgdb] gob2 ownership updated
Message-ID: <20080903111843.BB055208D6C@bastion.fedora.phx.redhat.com>

Package gob2 in Fedora 8 is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gob2



From pkgdb at fedoraproject.org  Wed Sep  3 11:18:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:18:47 +0000
Subject: [pkgdb] gob2 ownership updated
Message-ID: <20080903111848.367D7208D80@bastion.fedora.phx.redhat.com>

Package gob2 in Fedora 9 is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gob2



From pkgdb at fedoraproject.org  Wed Sep  3 11:19:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:19:11 +0000
Subject: [pkgdb] procps ownership updated
Message-ID: <20080903111911.D3369208D87@bastion.fedora.phx.redhat.com>

Package procps in Fedora devel is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/procps



From pkgdb at fedoraproject.org  Wed Sep  3 11:19:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:19:16 +0000
Subject: [pkgdb] procps ownership updated
Message-ID: <20080903111916.85A49208D89@bastion.fedora.phx.redhat.com>

Package procps in Fedora 8 is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/procps



From pkgdb at fedoraproject.org  Wed Sep  3 11:19:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:19:19 +0000
Subject: [pkgdb] procps ownership updated
Message-ID: <20080903111919.59B28208D8B@bastion.fedora.phx.redhat.com>

Package procps in Fedora 9 is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/procps



From pkgdb at fedoraproject.org  Wed Sep  3 11:19:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:19:50 +0000
Subject: [pkgdb] logrotate ownership updated
Message-ID: <20080903111950.2168B208D16@bastion.fedora.phx.redhat.com>

Package logrotate in Fedora devel is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:19:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:19:56 +0000
Subject: [pkgdb] logrotate ownership updated
Message-ID: <20080903111956.5F03F208D18@bastion.fedora.phx.redhat.com>

Package logrotate in Fedora 9 is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:19:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:19:53 +0000
Subject: [pkgdb] logrotate ownership updated
Message-ID: <20080903111959.4F779208D12@bastion.fedora.phx.redhat.com>

Package logrotate in Fedora 8 is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:20:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:20:35 +0000
Subject: [pkgdb] procinfo ownership updated
Message-ID: <20080903112035.5D8DC208D14@bastion.fedora.phx.redhat.com>

Package procinfo in Fedora devel is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/procinfo



From pkgdb at fedoraproject.org  Wed Sep  3 11:20:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:20:37 +0000
Subject: [pkgdb] procinfo ownership updated
Message-ID: <20080903112037.BC6F9208D16@bastion.fedora.phx.redhat.com>

Package procinfo in Fedora 8 is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/procinfo



From pkgdb at fedoraproject.org  Wed Sep  3 11:20:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:20:40 +0000
Subject: [pkgdb] procinfo ownership updated
Message-ID: <20080903112040.0532B208D17@bastion.fedora.phx.redhat.com>

Package procinfo in Fedora 9 is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/procinfo



From pkgdb at fedoraproject.org  Wed Sep  3 11:21:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:21:56 +0000
Subject: [pkgdb] logrotate had acl change status
Message-ID: <20080903112156.550B8208D0C@bastion.fedora.phx.redhat.com>

dnovotny has set the watchbugzilla acl on logrotate (Fedora devel) to Approved for tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:22:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:22:06 +0000
Subject: [pkgdb] logrotate had acl change status
Message-ID: <20080903112206.55A71208D13@bastion.fedora.phx.redhat.com>

dnovotny has set the watchcommits acl on logrotate (Fedora devel) to Approved for tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:22:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:22:12 +0000
Subject: [pkgdb] logrotate had acl change status
Message-ID: <20080903112212.74027208D0C@bastion.fedora.phx.redhat.com>

dnovotny has set the commit acl on logrotate (Fedora devel) to Approved for tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:22:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:22:19 +0000
Subject: [pkgdb] logrotate had acl change status
Message-ID: <20080903112219.7F8DB208D11@bastion.fedora.phx.redhat.com>

dnovotny has set the watchbugzilla acl on logrotate (Fedora 9) to Approved for tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:22:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:22:25 +0000
Subject: [pkgdb] logrotate had acl change status
Message-ID: <20080903112225.4E483208D13@bastion.fedora.phx.redhat.com>

dnovotny has set the watchcommits acl on logrotate (Fedora 9) to Approved for tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:22:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:22:28 +0000
Subject: [pkgdb] logrotate had acl change status
Message-ID: <20080903112228.C894B208D19@bastion.fedora.phx.redhat.com>

dnovotny has set the commit acl on logrotate (Fedora 9) to Approved for tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:24:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:24:13 +0000
Subject: [pkgdb] psmisc ownership updated
Message-ID: <20080903112413.AB9F1208D0F@bastion.fedora.phx.redhat.com>

Package psmisc in Fedora 8 is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/psmisc



From pkgdb at fedoraproject.org  Wed Sep  3 11:24:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:24:16 +0000
Subject: [pkgdb] psmisc ownership updated
Message-ID: <20080903112416.AF268208D13@bastion.fedora.phx.redhat.com>

Package psmisc in Fedora 9 is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/psmisc



From pkgdb at fedoraproject.org  Wed Sep  3 11:24:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:24:10 +0000
Subject: [pkgdb] psmisc ownership updated
Message-ID: <20080903112416.04D5E208D11@bastion.fedora.phx.redhat.com>

Package psmisc in Fedora devel is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/psmisc



From pkgdb at fedoraproject.org  Wed Sep  3 11:15:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:15:41 +0000
Subject: [pkgdb] gob2 ownership updated
Message-ID: <20080903111541.57597208D12@bastion.fedora.phx.redhat.com>

Package gob2 in Fedora 8 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gob2



From pkgdb at fedoraproject.org  Wed Sep  3 11:15:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:15:41 +0000
Subject: [pkgdb] gob2 ownership updated
Message-ID: <20080903111541.6E79C208D14@bastion.fedora.phx.redhat.com>

Package gob2 in Fedora 9 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gob2



From pkgdb at fedoraproject.org  Wed Sep  3 11:15:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:15:28 +0000
Subject: [pkgdb] gob2 ownership updated
Message-ID: <20080903111528.81E44208D19@bastion.fedora.phx.redhat.com>

Package gob2 in Fedora 7 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gob2



From pkgdb at fedoraproject.org  Wed Sep  3 11:15:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:15:26 +0000
Subject: [pkgdb] gob2 ownership updated
Message-ID: <20080903111526.29DB9208D16@bastion.fedora.phx.redhat.com>

Package gob2 in Fedora devel was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gob2



From pkgdb at fedoraproject.org  Wed Sep  3 11:16:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:16:31 +0000
Subject: [pkgdb] logrotate: tsmetana has requested watchbugzilla
Message-ID: <20080903111631.F1ED2208D0C@bastion.fedora.phx.redhat.com>

tsmetana has requested the watchbugzilla acl on logrotate (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From pkgdb at fedoraproject.org  Wed Sep  3 11:16:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:16:34 +0000
Subject: [pkgdb] logrotate: tsmetana has requested watchcommits
Message-ID: <20080903111634.CA20C208D19@bastion.fedora.phx.redhat.com>

tsmetana has requested the watchcommits acl on logrotate (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/logrotate



From vcrhonek at fedoraproject.org  Wed Sep  3 11:50:39 2008
From: vcrhonek at fedoraproject.org (Vitezslav Crhonek)
Date: Wed,  3 Sep 2008 11:50:39 +0000 (UTC)
Subject: rpms/tcsh/devel tcsh-6.13.00-memoryuse.patch, NONE,
	1.1 tcsh-6.14.00-octal.patch, NONE, 1.1 tcsh-6.14.00-order.patch,
	NONE, 1.1 tcsh-6.14.00-set.patch, NONE,
	1.1 tcsh-6.14.00-syntax.patch, NONE,
	1.1 tcsh-6.15.00-wide-str.patch, NONE, 1.1 tcsh.spec, 1.57, 1.58
Message-ID: <20080903115039.C5B3B7011F@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/tcsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23063

Modified Files:
	tcsh.spec 
Added Files:
	tcsh-6.13.00-memoryuse.patch tcsh-6.14.00-octal.patch 
	tcsh-6.14.00-order.patch tcsh-6.14.00-set.patch 
	tcsh-6.14.00-syntax.patch tcsh-6.15.00-wide-str.patch 
Log Message:
Fix UTF-8 Japanese character is garbled in tcsh script in a certain situation, Fix calculation order of operators description in tcsh manpage, Fix strings which begin with '0' are not recognized as octal numbers, Fix memoryuse description in tcsh manpage, Fix tcsh scripts with multiple case statement with end keywords break with error, Fix description of builtin command 'set' in tcsh manpage

tcsh-6.13.00-memoryuse.patch:

--- NEW FILE tcsh-6.13.00-memoryuse.patch ---
diff -up tcsh-6.15.00/tcsh.man.memoryuse tcsh-6.15.00/tcsh.man
--- tcsh-6.15.00/tcsh.man.memoryuse	2008-09-03 12:16:48.000000000 +0200
+++ tcsh-6.15.00/tcsh.man	2008-09-03 12:16:48.000000000 +0200
@@ -2901,7 +2901,8 @@ the size of the largest core dump that w
 .TP
 \fImemoryuse\fR
 the maximum amount of physical memory a process
-may have allocated to it at a given time
+may have allocated to it at a given time (this is not implemented in the 2.6 kernel. The value is meaningless
+and changing this value will have no effect)
 .TP
 \fIheapsize\fR
 the maximum amount of memory a process

tcsh-6.14.00-octal.patch:

--- NEW FILE tcsh-6.14.00-octal.patch ---
diff -up tcsh-6.15.00/sh.set.c.octal tcsh-6.15.00/sh.set.c
--- tcsh-6.15.00/sh.set.c.octal	2006-08-24 22:56:31.000000000 +0200
+++ tcsh-6.15.00/sh.set.c	2008-09-03 12:28:10.000000000 +0200
@@ -525,6 +525,7 @@ getn(Char *cp)
 {
     int n;
     int     sign;
+    int base;
 
     if (!cp)			/* PWP: extra error checking */
 	stderror(ERR_NAME | ERR_BADNUM);
@@ -538,9 +539,19 @@ getn(Char *cp)
 	if (!Isdigit(*cp))
 	    stderror(ERR_NAME | ERR_BADNUM);
     }
+
+    if (cp[0] == '0' && cp[1])
+	base = 8;
+    else
+	base = 10;
+
     n = 0;
     while (Isdigit(*cp))
-	n = n * 10 + *cp++ - '0';
+    {
+	if (base == 8 && *cp >= '8')
+	    stderror(ERR_NAME | ERR_BADNUM);
+	n = n * base + *cp++ - '0';
+    }
     if (*cp)
 	stderror(ERR_NAME | ERR_BADNUM);
     return (sign ? -n : n);

tcsh-6.14.00-order.patch:

--- NEW FILE tcsh-6.14.00-order.patch ---
diff -up tcsh-6.15.00/tcsh.man.order tcsh-6.15.00/tcsh.man
--- tcsh-6.15.00/tcsh.man.order	2008-09-03 12:30:44.000000000 +0200
+++ tcsh-6.15.00/tcsh.man	2008-09-03 12:30:44.000000000 +0200
@@ -1614,7 +1614,9 @@ They include
 .PP
 Here the precedence increases to the right, `==' `!=' `=~' and `!~', `<='
 `>=' `<' and `>', `<<' and `>>', `+' and `\-', `*' `/' and `%' being, in
-groups, at the same level.  The `==' `!=' `=~' and `!~' operators compare
+groups, at the same level.  When multiple operators which have same precedence 
+are used in one expression, calculation must be done from operator of right 
+side.  The `==' `!=' `=~' and `!~' operators compare
 their arguments as strings; all others operate on numbers.  The operators
 `=~' and `!~' are like `!=' and `==' except that the right hand side is a
 glob-pattern (see \fBFilename substitution\fR) against which the left hand

tcsh-6.14.00-set.patch:

--- NEW FILE tcsh-6.14.00-set.patch ---
diff -up tcsh-6.15.00/tcsh.man.set tcsh-6.15.00/tcsh.man
--- tcsh-6.15.00/tcsh.man.set	2008-09-03 11:43:55.000000000 +0200
+++ tcsh-6.15.00/tcsh.man	2008-09-03 11:43:55.000000000 +0200
@@ -3213,7 +3213,6 @@ The fifth form sets the \fIindex\fR'th c
 this component must already exist.
 The sixth form lists only the names of all shell variables that are read-only.
 The seventh form makes \fIname\fR read-only, whether or not it has a value.
-The second form sets \fIname\fR to the null string.
 The eighth form is the same as the third form, but
 make \fIname\fR read-only at the same time.
 .PD

tcsh-6.14.00-syntax.patch:

--- NEW FILE tcsh-6.14.00-syntax.patch ---
diff -up tcsh-6.15.00/sh.func.c.syntax tcsh-6.15.00/sh.func.c
--- tcsh-6.15.00/sh.func.c.syntax	2006-08-24 22:56:31.000000000 +0200
+++ tcsh-6.15.00/sh.func.c	2008-09-03 11:53:05.000000000 +0200
@@ -751,8 +751,6 @@ search(int type, int level, Char *goal)
 {
     struct Strbuf word = Strbuf_INIT;
     Char *cp;
-    struct whyle *wp;
-    int wlevel = 0;
 
     Stype = type;
     Sgoal = goal;
@@ -791,24 +789,13 @@ search(int type, int level, Char *goal)
 
 	case TC_FOREACH:
 	case TC_WHILE:
-	    wlevel++;
 	    if (type == TC_BREAK)
 		level++;
 	    break;
 
 	case TC_END:
-	    if (type == TC_BRKSW) {
-		if (wlevel == 0) {
-		    wp = whyles;
-		    if (wp) {
-			    whyles = wp->w_next;
-			    wpfree(wp);
-		    }
-		}
-	    }
 	    if (type == TC_BREAK)
 		level--;
-	    wlevel--;
 	    break;
 
 	case TC_SWITCH:

tcsh-6.15.00-wide-str.patch:

--- NEW FILE tcsh-6.15.00-wide-str.patch ---
diff -up tcsh-6.15.00/tc.str.c_old tcsh-6.15.00/tc.str.c
--- tcsh-6.15.00/tc.str.c_old	2008-09-03 13:08:44.000000000 +0200
+++ tcsh-6.15.00/tc.str.c	2008-09-03 13:11:32.000000000 +0200
@@ -154,7 +154,7 @@ short2str(const Char *src)
 {
     static char *sdst = NULL;
     static size_t dstsize = 0;
-    char *dst, *edst;
+    char *dst, *edst, *wdst, *wedst;
 
     if (src == NULL)
 	return (NULL);
@@ -171,8 +171,15 @@ short2str(const Char *src)
 	if (dst >= edst) {
 	    dstsize += MALLOC_INCR;
 	    sdst = xrealloc(sdst, (dstsize + MALLOC_SURPLUS) * sizeof(char));
+	    wdst = dst;
+	    wedst = edst;
 	    edst = &sdst[dstsize];
 	    dst = &edst[-MALLOC_INCR];
+	    while (wdst > wedst) {
+	        dst++;
+	        wdst--;
+	    }
+
 	}
     }
     *dst = 0;


Index: tcsh.spec
===================================================================
RCS file: /cvs/extras/rpms/tcsh/devel/tcsh.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- tcsh.spec	29 Aug 2008 10:42:02 -0000	1.57
+++ tcsh.spec	3 Sep 2008 11:50:36 -0000	1.58
@@ -3,7 +3,7 @@
 Summary: An enhanced version of csh, the C shell
 Name: tcsh
 Version: 6.15
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD with advertising
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz
@@ -13,6 +13,12 @@
 Patch4: tcsh-6.15.00-hist-sub.patch
 Patch5: tcsh-6.15.00-var-sub.patch
 Patch6: tcsh-6.15.00-ca-color.patch
+Patch7: tcsh-6.14.00-set.patch
+Patch8: tcsh-6.14.00-syntax.patch
+Patch9: tcsh-6.13.00-memoryuse.patch
+Patch10: tcsh-6.14.00-octal.patch
+Patch11: tcsh-6.14.00-order.patch
+Patch12: tcsh-6.15.00-wide-str.patch
 Provides: csh = %{version}
 Requires(post): grep
 Requires(postun): coreutils, grep
@@ -36,6 +42,12 @@
 %patch4 -p1 -b .hist-sub
 %patch5 -p1 -b .var-sub
 %patch6 -p1 -b .ca-color
+%patch7 -p1 -b .set
+%patch8 -p1 -b .syntax
+%patch9 -p1 -b .memoryuse
+%patch10 -p1 -b .octal
+%patch11 -p1 -b .order
+%patch12 -p1 -b .wide-str
 
 %build
 # For tcsh-6.14.00-tinfo.patch
@@ -103,6 +115,22 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Sep  3 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.15-6
+- Fix UTF-8 Japanese character is garbled in tcsh script in
+  a certain situation
+  Related: #453785
+- Fix calculation order of operators description in tcsh manpage
+  Related: #442536
+- Fix strings which begin with '0' are not recognized as octal numbers
+  Related: #438109
+- Fix memoryuse description in tcsh manpage
+  Related: #437095
+- Fix tcsh scripts with multiple case statement with end keywords
+  break with error
+  Related: #436956
+- Fix description of builtin command 'set' in tcsh manpage
+  Related: #430459
+
 * Fri Aug 29 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.15-5
 - Rediffed all patches to work with patch --fuzz=0
 - Let tcsh know 'ca' colorls variable



From timn at fedoraproject.org  Wed Sep  3 11:54:37 2008
From: timn at fedoraproject.org (Tim Niemueller)
Date: Wed,  3 Sep 2008 11:54:37 +0000 (UTC)
Subject: rpms/lua/F-9 lua-5.1.4-autotoolize.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 lua.spec, 1.31, 1.32 sources, 1.10,
	1.11 lua-5.1.3-autotoolize.patch, 1.1, NONE
Message-ID: <20080903115437.946F67011F@cvs1.fedora.phx.redhat.com>

Author: timn

Update of /cvs/pkgs/rpms/lua/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23597

Modified Files:
	.cvsignore lua.spec sources 
Added Files:
	lua-5.1.4-autotoolize.patch 
Removed Files:
	lua-5.1.3-autotoolize.patch 
Log Message:
New upstream release 5.1.4


lua-5.1.4-autotoolize.patch:

--- NEW FILE lua-5.1.4-autotoolize.patch ---
diff -urN lua-5.1.4/aclocal.m4 lua-5.1.4-autotoolize/aclocal.m4
--- lua-5.1.4/aclocal.m4	1970-01-01 01:00:00.000000000 +0100
+++ lua-5.1.4-autotoolize/aclocal.m4	2008-09-03 13:18:37.000000000 +0200
@@ -0,0 +1,7307 @@
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 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.
+
+# 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.
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+# serial 48 AC_PROG_LIBTOOL
+
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+	         [m4_ifdef([AC_PROVIDE_$1],
+		           [$2], [$3])])])
+
+
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+	[AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+	     [define([LT_AC_PROG_GCJ],
+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+_LT_CC_BASENAME([$compiler])
[...43261 lines suppressed...]
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+EXTRA_DIST = \
+	bisect.lua  env.lua         fib.lua      life.lua          printf.lua \
+	sieve.lua   trace-calls.lua cf.lua       factorial.lua     globals.lua \
+	luac.lua    README          sort.lua     trace-globals.lua echo.lua \
+	fibfor.lua  hello.lua       readonly.lua table.lua         xd.lua
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  test/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  test/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lua/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Jan 2008 23:07:49 -0000	1.8
+++ .cvsignore	3 Sep 2008 11:54:31 -0000	1.9
@@ -1 +1 @@
-lua-5.1.3.tar.gz
+lua-5.1.4.tar.gz


Index: lua.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lua/F-9/lua.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- lua.spec	12 May 2008 16:59:22 -0000	1.31
+++ lua.spec	3 Sep 2008 11:54:33 -0000	1.32
@@ -1,12 +1,12 @@
 Name:           lua
-Version:        5.1.3
-Release:        6%{?dist}
+Version:        5.1.4
+Release:        1%{?dist}
 Summary:        Powerful light-weight programming language
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.lua.org/
 Source0:        http://www.lua.org/ftp/lua-%{version}.tar.gz
-Patch0:         lua-5.1.3-autotoolize.patch
+Patch0:         lua-5.1.4-autotoolize.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel ncurses-devel
 Provides:       lua = 5.1
@@ -94,6 +94,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Sep 03 2008 Tim Niemueller <tim at niemueller.de> - 5.1.4-1
+- New upstream release 5.1.4
+
 * Mon May 12 2008 Tim Niemueller <tim at niemueller.de> - 5.1.3-6
 - Add -static subpackage with static liblua, fixes rh bug #445939
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lua/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	26 Jan 2008 23:07:49 -0000	1.10
+++ sources	3 Sep 2008 11:54:33 -0000	1.11
@@ -1 +1 @@
-a70a8dfaa150e047866dc01a46272599  lua-5.1.3.tar.gz
+d0870f2de55d59c1c8419f36e8fac150  lua-5.1.4.tar.gz


--- lua-5.1.3-autotoolize.patch DELETED ---



From mschwendt at fedoraproject.org  Wed Sep  3 12:06:14 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  3 Sep 2008 12:06:14 +0000 (UTC)
Subject: rpms/plague/F-8 plague-0.4.5-logtail.patch, NONE,
	1.1 plague-0.4.5-mock-0.8.patch, NONE,
	1.1 plague-0.4.5-sqlite3.patch, NONE, 1.1 plague.spec, 1.32, 1.33
Message-ID: <20080903120614.AC6977011F@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25033/F-8

Modified Files:
	plague.spec 
Added Files:
	plague-0.4.5-logtail.patch plague-0.4.5-mock-0.8.patch 
	plague-0.4.5-sqlite3.patch 
Log Message:
* Wed Sep  3 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5-2
- add the patches from 0.4.5-0.4 (sqlite3, mock08, logtail)
- merge more spec changes


plague-0.4.5-logtail.patch:

--- NEW FILE plague-0.4.5-logtail.patch ---
diff -Nur plague-0.4.5-orig/server/PackageJob.py plague-0.4.5/server/PackageJob.py
--- plague-0.4.5-orig/server/PackageJob.py	2008-01-31 15:30:57.000000000 +0100
+++ plague-0.4.5/server/PackageJob.py	2008-07-14 23:44:47.000000000 +0200
@@ -729,30 +729,9 @@
 
         self.bm.notify_job_done(self)
 
-    def _get_log_tail(self, arch):
-        """ Returns the last 30 lines of the most relevant log file """
-
-        pkg_dir = "%s-%s-%s-%s" % (self.uid, self.name, self.ver, self.release)
-        work_dir = self._server_cfg.get_str("Directories", "server_work_dir")
-        log_dir = os.path.join(work_dir, self._target_str, pkg_dir, arch)
-        final_log = None
-        build_log = "%s/%s" % (log_dir, "build.log")
-        root_log = "%s/%s" % (log_dir, "root.log")
-        job_log = "%s/%s" % (log_dir, "job.log")
-
-        # Try the most relevant log file first
-        if os.path.exists(build_log) and os.path.getsize(build_log) > 0:
-            final_log = build_log
-        elif os.path.exists(root_log) and os.path.getsize(root_log) > 0:
-            final_log = root_log
-        elif os.path.exists(job_log) and os.path.getsize(job_log) > 0:
-            final_log = job_log
-
-        if not final_log:
-            return ""
-
-        seek_pos = os.path.getsize(final_log) - 4096
-        f = open(final_log, "r", 4096);
+    def _get_log_file_tail(self, logfile):
+        seek_pos = os.path.getsize(logfile) - 4096
+        f = open(logfile, "r", 4096);
         if seek_pos > 0:
             f.seek(seek_pos)
         try:
@@ -770,9 +749,28 @@
             lines.append(line)
             if len(lines) > 30:  # only want last 30 lines
                 del lines[0]
-
         f.close()
-        return "".join(lines)
+        return lines
+
+    def _get_log_tail(self, arch):
+        """ Returns the last 30 lines of the most relevant log file(s) """
+
+        pkg_dir = "%s-%s-%s-%s" % (self.uid, self.name, self.ver, self.release)
+        work_dir = self._server_cfg.get_str("Directories", "server_work_dir")
+        log_dir = os.path.join(work_dir, self._target_str, pkg_dir, arch)
+
+        logtail = []
+        for l in ["build.log", "root.log", "job.log"]:
+            lpath = os.path.join(log_dir, l)
+            if os.path.exists(lpath) and os.path.getsize(lpath)>0:
+                lines = self._get_log_file_tail(lpath)
+                if l=="build.log" and len(lines)<10:
+                    logtail += lines
+                    logtail.append("\n\n"+">"*40+"\n\n")
+                else:
+                    logtail += lines
+                    break
+        return "".join(logtail)
 
     def email_result(self, to, resultstring, subject=None):
         """send 'resultstring' to self.username"""

plague-0.4.5-mock-0.8.patch:

--- NEW FILE plague-0.4.5-mock-0.8.patch ---
diff -Nur plague-0.4.5-orig/builder/builder.py plague-0.4.5/builder/builder.py
--- plague-0.4.5-orig/builder/builder.py	2008-01-31 18:21:32.000000000 +0100
+++ plague-0.4.5/builder/builder.py	2008-01-31 18:58:40.000000000 +0100
@@ -108,9 +108,7 @@
         if not os.path.exists(self._result_dir):
             os.makedirs(self._result_dir)
 
-        self._state_dir = os.path.join(self._work_dir, self._uniqid, "mock-state")
-        if not os.path.exists(self._state_dir):
-            os.makedirs(self._state_dir)
+        self._state_file = os.path.join(self._result_dir,"state.log")
 
         logfile = os.path.join(self._result_dir, "job.log")
         self._log_fd = open(logfile, "w+")
@@ -218,12 +216,12 @@
                 args.append(arg)
             cmd = os.path.abspath(arg_list[0])
         args.append(builder_cmd)
+        args.append("rebuild")
         args.append("-r")
         args.append(self.buildroot)
         args.append("--arch")
         args.append(self.buildarch)
         args.append("--resultdir=%s" % self._result_dir)
-        args.append("--statedir=%s" % self._state_dir)
         args.append("--uniqueext=%s" % self._uniqid)
         args.append(self._srpm_path)
         self._log("   %s\n" % string.join(args))
@@ -257,14 +255,14 @@
     def _mock_is_prepping(self):
         mock_status = self._get_mock_status()
         if mock_status:
-            prepstates = ['init','prep','unpa','crea','setu']
+            prepstates = ['enabl','creating cache','unpacking cache','setup']
             for s in prepstates:
-                if mock_status == s:
+                if mock_status.startswith(s):
                     return True
         return False
 
     def _get_mock_status(self):
-        mockstatusfile = os.path.join(self._state_dir, 'status')
+        mockstatusfile = self._state_file
         if not os.path.exists(mockstatusfile):
             return None
 
@@ -273,8 +271,7 @@
         
         while True:
             try:
-                f.seek(0, 0)
-                string = f.read(4)
+                lines = f.readlines()
             except OSError, e:
                 if e.errno == errno.EAGAIN:
                     try:
@@ -283,12 +280,19 @@
                         pass
                     continue
             else:
-                if len(string) < 4:
+                if not len(lines):
                     continue
                 break
         f.close()
-        string = string.lower()
-        return string
+        mockstat = None
+        lastline = lines[len(lines)-1].lower()
+        statedelim = "state changed:"
+        stateidx = lastline.rfind(statedelim)
+        if stateidx>0:
+            mockstat = lastline[stateidx+len(statedelim):].lstrip()
+            return mockstat
+        else:
+            return None
 
     def _read_mock_config(self):
         mockconfigfile = os.path.join(self._result_dir, 'mockconfig.log')
@@ -353,8 +357,7 @@
     def _status_prepping(self):
         # We need to make sure that mock has dumped the status file withing a certain
         # amount of time, otherwise we can't tell what it's doing
-        mockstatusfile = os.path.join(self._state_dir, 'status')
-        if not os.path.exists(mockstatusfile):
+        if not os.path.exists(self._state_file):
             # something is wrong if mock takes more than 15s to write the status file
             if time.time() > self._mockstarttime + 15:
                 self._mockstarttime = 0
@@ -383,9 +386,6 @@
                     if mock_root_dir.endswith(self._uniqid):
                         shutil.rmtree(mock_root_dir, ignore_errors=True)
 
-                if self._mock_config.has_key('statedir'):
-                    shutil.rmtree(self._mock_config['statedir'], ignore_errors=True)
-
                 source_dir = os.path.abspath(os.path.join(self._mock_config['rootdir'], "../source"))
                 # Ensure we're actually deleteing the job's sourcedir
                 if source_dir.endswith(os.path.join(self._uniqid, "source")):

plague-0.4.5-sqlite3.patch:

--- NEW FILE plague-0.4.5-sqlite3.patch ---
diff -Nur plague-0.4.5-orig/server/BuildMaster.py plague-0.4.5/server/BuildMaster.py
--- plague-0.4.5-orig/server/BuildMaster.py	2008-01-31 15:21:09.000000000 +0100
+++ plague-0.4.5/server/BuildMaster.py	2008-06-14 14:25:54.000000000 +0200
@@ -65,10 +65,6 @@
         self._building_jobs = {}
         self._building_jobs_lock = threading.Lock()
 
-        self._dbcx = self._db_manager.dbcx()
-        self._cursor = self._dbcx.cursor()
-
-        self._requeue_interrupted_jobs()
         threading.Thread.__init__(self)
         self.setName("BuildMaster")
 
@@ -397,6 +393,12 @@
 
     def run(self):
         DebugUtils.registerThreadName(self)
+
+        self._dbcx = self._db_manager.dbcx()
+        self._cursor = self._dbcx.cursor()
+
+        self._requeue_interrupted_jobs()
+
         while self.should_stop == False:
             # Write update status for jobs to the database
             self._save_job_status()
diff -Nur plague-0.4.5-orig/server/DBManager.py plague-0.4.5/server/DBManager.py
--- plague-0.4.5-orig/server/DBManager.py	2008-01-31 15:21:09.000000000 +0100
+++ plague-0.4.5/server/DBManager.py	2008-06-14 14:25:54.000000000 +0200
@@ -124,11 +124,15 @@
 
     def fetchall(self, cursor):
         """ sqlite returns the items in a dict-like class already """
-        return cursor.fetchall()
+        rows = cursor.fetchall()
+        return [ResultSet(row, cursor.description) for row in rows]
 
     def fetchone(self, cursor):
         """ sqlite returns the items in a dict-like class already """
-        return cursor.fetchone()
+        row = cursor.fetchone()
+        if not row:
+            return None
+        return ResultSet(row, cursor.description)
 
     def _connect(self):
         try:
@@ -143,7 +147,7 @@
             tm = 3
 
         try:
-            dbcx = sqlite.connect(dbloc, encoding="utf-8", timeout=tm)
+            dbcx = sqlite.connect(dbloc)
         except StandardError, e:
             print "Error: %s" % e
             os._exit(1)
@@ -266,8 +270,8 @@
 # isn't present, remove its class entry from
 # the db engine dict
 try:
-    import sqlite
-except ImportError, e:
+    import sqlite3 as sqlite
+except ImportError:
     db_engines['sqlite'] = None
 
 try:
diff -Nur plague-0.4.5-orig/server/UserInterface.py plague-0.4.5/server/UserInterface.py
--- plague-0.4.5-orig/server/UserInterface.py	2008-01-31 15:21:09.000000000 +0100
+++ plague-0.4.5/server/UserInterface.py	2008-06-14 14:25:54.000000000 +0200
@@ -84,6 +84,12 @@
     return target_cfg
 
 
+def _fetchone(cursor,row):  # sqlite3 helper
+    if not row:
+        return None
+    return DBManager.ResultSet(row, cursor.description)
+
+
 class UserInterface:
     """
     Base UserInterface class. NO AUTHENTICATION.  Subclass this to provide some.
@@ -184,7 +190,7 @@
             del curs, dbcx
             return (-1, "Unable to access job database: '%s'" % e)
         curs.execute(sql)
-        job = dbcx.fetchone(curs)
+        job = _fetchone(curs,dbcx.fetchone(curs))
         result = None
         if not job:
             result = (-1, "Error: Invalid job UID.")
@@ -318,7 +324,7 @@
             del curs, dbcx
             return (-1, "Unable to access job database: '%s'" % e, [])
         curs.execute(sql)
-        data = dbcx.fetchall(curs)
+        data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
         jobs = []
         for row in data:
             jobrec = {}
@@ -349,7 +355,7 @@
             sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, "  \
                     "status, builder_status FROM archjobs WHERE " + uids
             curs.execute(sql)
-            data = dbcx.fetchall(curs)
+            data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
             for row in data:
                 ajrec = {}
                 ajrec['jobid'] = row['jobid']
@@ -386,7 +392,7 @@
         except StandardError, e:
             return (-1, "Unable to access job database: '%s'" % e, {})
         curs.execute(sql)
-        job = dbcx.fetchone(curs)
+        job = _fetchone(curs,dbcx.fetchone(curs))
         if not job:
             del curs, dbcx
             return (-1, "Error: Invalid job UID.", {})
@@ -420,7 +426,7 @@
         sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, "    \
                 "status, builder_status FROM archjobs WHERE parent_uid=%d " % uid
         curs.execute(sql)
-        data = dbcx.fetchall(curs)
+        data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
         for row in data:
             ajrec = {}
             ajrec['jobid'] = row['jobid']
@@ -541,7 +547,7 @@
             return (-1, "Unable to access job database: '%s'" % e)
 
         curs.execute(sql)
-        job = dbcx.fetchone(curs)
+        job = _fetchone(curs,dbcx.fetchone(curs))
 
         result = None
         if not job:
@@ -630,7 +636,7 @@
             return (-1, "Unable to access job database: '%s'" % e)
 
         curs.execute(sql)
-        data = dbcx.fetchall(curs)
+        data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
 
         # Ensure that the user can actually finish the jobs they requested
         final_uid_list = []
diff -Nur plague-0.4.5-orig/server/User.py plague-0.4.5/server/User.py
--- plague-0.4.5-orig/server/User.py	2008-01-31 15:21:09.000000000 +0100
+++ plague-0.4.5/server/User.py	2008-06-14 14:25:54.000000000 +0200
@@ -15,7 +15,11 @@
 # Copyright 2005 Dan Williams <dcbw at redhat.com> and Red Hat, Inc.
 
 
-import sqlite
+import sqlite3 as sqlite
+
+import sys
+sys.path.append('/usr/share/plague/server')
+from DBManager import ResultSet
 
 CONFIG_LOCATION = "/etc/plague/server/"
 
@@ -30,10 +34,9 @@
         self.user_admin = False
         self.server_admin = False
 
-
 def get_userdb_dbcx():
     try:
-        dbcx = sqlite.connect(CONFIG_LOCATION + "userdb", encoding="utf-8", timeout=4)
+        dbcx = sqlite.connect(CONFIG_LOCATION + "userdb")
         curs = dbcx.cursor()
         return (dbcx, curs)
     except sqlite.DatabaseError, e:
@@ -57,7 +60,7 @@
         try:
             curs.execute('SELECT * FROM users')
             dbcx.commit()
-        except sqlite._sqlite.DatabaseError, e:
+        except sqlite.DatabaseError, e:
             create = True
 
         if create:
@@ -81,6 +84,7 @@
         dbcx.commit()
         item = curs.fetchone()
         if item:
+            item = ResultSet(item, curs.description)
             user = User(email, False)
             user.own_jobs = item['own_jobs']
             user.job_admin = item['job_admin']
diff -Nur plague-0.4.5-orig/utils/user-manager.py plague-0.4.5/utils/user-manager.py
--- plague-0.4.5-orig/utils/user-manager.py	2005-08-08 18:15:18.000000000 +0200
+++ plague-0.4.5/utils/user-manager.py	2008-06-14 14:25:54.000000000 +0200
@@ -18,7 +18,10 @@
 
 
 import sys, os
-import sqlite
+import sqlite3
+
+sys.path.append('/usr/share/plague/server')
+from DBManager import ResultSet
 
 
 def print_usage(prog):
@@ -38,7 +41,7 @@
 
 class UserManager:
     def __init__(self, dbfile):
-        self.dbcx = sqlite.connect(dbfile, encoding="utf-8", timeout=2)
+        self.dbcx = sqlite3.connect(dbfile)
         self.curs = self.dbcx.cursor()
 
         # Ensure the table exists in the database
@@ -176,7 +179,7 @@
 
         self.curs.execute(sql)
         self.dbcx.commit()
-        data = self.curs.fetchall()
+        data = [ResultSet(row,self.curs.description) for row in self.curs.fetchall()]
         if not len(data):
             raise UserManagerException("No matching users found.")
 


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-8/plague.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- plague.spec	3 Sep 2008 05:10:50 -0000	1.32
+++ plague.spec	3 Sep 2008 12:06:12 -0000	1.33
@@ -3,20 +3,26 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
-Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
+#Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.bz2
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
-Requires: python-sqlite, createrepo >= 0.4.3
+Requires: createrepo >= 0.4.3
 Requires: %{name}-common = %{version}-%{release}
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
+Patch1: plague-0.4.5-sqlite3.patch
+Patch2: plague-0.4.5-mock-0.8.patch
+Patch3: plague-0.4.5-logtail.patch
+
+
 %description
 The Plague build system is a client/server distributed build system for
 building RPM packages.  This package provides the plague server.
@@ -28,14 +34,20 @@
 Requires: pyOpenSSL
 
 %description common
-This package includes the common Python module that all Plague services require.
+This package includes the common Python module that all Plague services
+require.
 
 
 %package builder
 Summary: Builder daemon for Plague builder slaves
 Group: Development/Tools
 Requires: %{name}-common = %{version}-%{release}
-Requires: yum >= 2.2.1, mock >= 0.3
+Requires: yum >= 2.2.1
+%if 0%{?fedora} > 6
+Requires: mock >= 0.8
+%else
+Requires: mock < 0.8
+%endif
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -51,7 +63,8 @@
 Requires: %{name}-common = %{version}-%{release}
 
 %description client
-Client program for enqueueing package builds and interrogating the build system.
+Client program for enqueueing package builds and interrogating the build
+system.
 
 
 %package utils
@@ -66,6 +79,12 @@
 
 %prep
 %setup -q
+%if 0%{?fedora} > 6
+%patch1 -p1 -b .sqlite3
+%patch2 -p1 -b .mock8
+%endif
+%patch3 -p1 -b .logtail
+
 
 %build
 make
@@ -73,12 +92,13 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-install -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder
-install -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder
-install -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server
-install -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server
-mkdir -p $RPM_BUILD_ROOT/srv/plague_builder
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
+chmod +x $RPM_BUILD_ROOT%{_bindir}/*
+install -p -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder
+install -p -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder
+install -p -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server
+install -p -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server
+mkdir -p $RPM_BUILD_ROOT/var/lib/plague/builder
 
 
 %clean
@@ -96,7 +116,7 @@
 fi
 
 %pre builder
-/usr/sbin/useradd -G mock -s /sbin/nologin -M -r -d /srv/plague_builder plague-builder 2>/dev/null || :
+/usr/sbin/useradd -G mock -s /sbin/nologin -M -r -d /var/lib/plague/builder plague-builder 2>/dev/null || :
 
 %post builder
 /sbin/chkconfig --add plague-builder
@@ -135,7 +155,8 @@
 %dir %{_sysconfdir}/%{name}/builder/certs
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-builder
 %{_initrddir}/%{name}-builder
-%attr(0755, plague-builder, plague-builder) /srv/plague_builder
+%dir /var/lib/plague
+%attr(0755, plague-builder, plague-builder) /var/lib/plague/builder
 
 %files client
 %defattr(-, root, root)
@@ -148,13 +169,17 @@
 
 
 %changelog
+* Wed Sep  3 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5-2
+- add the patches from 0.4.5-0.4 (sqlite3, mock08, logtail)
+- merge more spec changes
+
 * Tue Sep 02 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5-1
 - update to 0.4.5  lots of fixes 
 
 * Thu May 22 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.4.4.1-6
 - licensing tag fix
 
-* Tue Sep 18 2007 Michael Schwendt <mschwendt at users.sf.net> - 0.4.4.1-5
+* Tue Sep 18 2007 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.4.1-5
 - Add dirs /etc/plague and /usr/share/plague to plague-common
   since "plague-builder" and "plague" use them (#233904).
 
@@ -321,7 +346,7 @@
 
 * Sat Jul 16 2005 Dan Williams <dcbw at redhat.com>
 - Bump version to 0.2
-- Grab python files from /usr/lib, not %{_libdir} until the
+- Grab python files from /usr/lib, not %%{_libdir} until the
     multiarch issues get worked out
 
 * Sun Jun 26 2005 Dan Williams <dcbw at redhat.com>



From mschwendt at fedoraproject.org  Wed Sep  3 12:06:42 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  3 Sep 2008 12:06:42 +0000 (UTC)
Subject: rpms/plague/devel plague-0.4.5-logtail.patch, NONE,
	1.1 plague-0.4.5-mock-0.8.patch, NONE,
	1.1 plague-0.4.5-sqlite3.patch, NONE, 1.1 plague.spec, 1.33, 1.34
Message-ID: <20080903120642.72E917011F@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25033/devel

Modified Files:
	plague.spec 
Added Files:
	plague-0.4.5-logtail.patch plague-0.4.5-mock-0.8.patch 
	plague-0.4.5-sqlite3.patch 
Log Message:
* Wed Sep  3 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5-2
- add the patches from 0.4.5-0.4 (sqlite3, mock08, logtail)
- merge more spec changes


plague-0.4.5-logtail.patch:

--- NEW FILE plague-0.4.5-logtail.patch ---
diff -Nur plague-0.4.5-orig/server/PackageJob.py plague-0.4.5/server/PackageJob.py
--- plague-0.4.5-orig/server/PackageJob.py	2008-01-31 15:30:57.000000000 +0100
+++ plague-0.4.5/server/PackageJob.py	2008-07-14 23:44:47.000000000 +0200
@@ -729,30 +729,9 @@
 
         self.bm.notify_job_done(self)
 
-    def _get_log_tail(self, arch):
-        """ Returns the last 30 lines of the most relevant log file """
-
-        pkg_dir = "%s-%s-%s-%s" % (self.uid, self.name, self.ver, self.release)
-        work_dir = self._server_cfg.get_str("Directories", "server_work_dir")
-        log_dir = os.path.join(work_dir, self._target_str, pkg_dir, arch)
-        final_log = None
-        build_log = "%s/%s" % (log_dir, "build.log")
-        root_log = "%s/%s" % (log_dir, "root.log")
-        job_log = "%s/%s" % (log_dir, "job.log")
-
-        # Try the most relevant log file first
-        if os.path.exists(build_log) and os.path.getsize(build_log) > 0:
-            final_log = build_log
-        elif os.path.exists(root_log) and os.path.getsize(root_log) > 0:
-            final_log = root_log
-        elif os.path.exists(job_log) and os.path.getsize(job_log) > 0:
-            final_log = job_log
-
-        if not final_log:
-            return ""
-
-        seek_pos = os.path.getsize(final_log) - 4096
-        f = open(final_log, "r", 4096);
+    def _get_log_file_tail(self, logfile):
+        seek_pos = os.path.getsize(logfile) - 4096
+        f = open(logfile, "r", 4096);
         if seek_pos > 0:
             f.seek(seek_pos)
         try:
@@ -770,9 +749,28 @@
             lines.append(line)
             if len(lines) > 30:  # only want last 30 lines
                 del lines[0]
-
         f.close()
-        return "".join(lines)
+        return lines
+
+    def _get_log_tail(self, arch):
+        """ Returns the last 30 lines of the most relevant log file(s) """
+
+        pkg_dir = "%s-%s-%s-%s" % (self.uid, self.name, self.ver, self.release)
+        work_dir = self._server_cfg.get_str("Directories", "server_work_dir")
+        log_dir = os.path.join(work_dir, self._target_str, pkg_dir, arch)
+
+        logtail = []
+        for l in ["build.log", "root.log", "job.log"]:
+            lpath = os.path.join(log_dir, l)
+            if os.path.exists(lpath) and os.path.getsize(lpath)>0:
+                lines = self._get_log_file_tail(lpath)
+                if l=="build.log" and len(lines)<10:
+                    logtail += lines
+                    logtail.append("\n\n"+">"*40+"\n\n")
+                else:
+                    logtail += lines
+                    break
+        return "".join(logtail)
 
     def email_result(self, to, resultstring, subject=None):
         """send 'resultstring' to self.username"""

plague-0.4.5-mock-0.8.patch:

--- NEW FILE plague-0.4.5-mock-0.8.patch ---
diff -Nur plague-0.4.5-orig/builder/builder.py plague-0.4.5/builder/builder.py
--- plague-0.4.5-orig/builder/builder.py	2008-01-31 18:21:32.000000000 +0100
+++ plague-0.4.5/builder/builder.py	2008-01-31 18:58:40.000000000 +0100
@@ -108,9 +108,7 @@
         if not os.path.exists(self._result_dir):
             os.makedirs(self._result_dir)
 
-        self._state_dir = os.path.join(self._work_dir, self._uniqid, "mock-state")
-        if not os.path.exists(self._state_dir):
-            os.makedirs(self._state_dir)
+        self._state_file = os.path.join(self._result_dir,"state.log")
 
         logfile = os.path.join(self._result_dir, "job.log")
         self._log_fd = open(logfile, "w+")
@@ -218,12 +216,12 @@
                 args.append(arg)
             cmd = os.path.abspath(arg_list[0])
         args.append(builder_cmd)
+        args.append("rebuild")
         args.append("-r")
         args.append(self.buildroot)
         args.append("--arch")
         args.append(self.buildarch)
         args.append("--resultdir=%s" % self._result_dir)
-        args.append("--statedir=%s" % self._state_dir)
         args.append("--uniqueext=%s" % self._uniqid)
         args.append(self._srpm_path)
         self._log("   %s\n" % string.join(args))
@@ -257,14 +255,14 @@
     def _mock_is_prepping(self):
         mock_status = self._get_mock_status()
         if mock_status:
-            prepstates = ['init','prep','unpa','crea','setu']
+            prepstates = ['enabl','creating cache','unpacking cache','setup']
             for s in prepstates:
-                if mock_status == s:
+                if mock_status.startswith(s):
                     return True
         return False
 
     def _get_mock_status(self):
-        mockstatusfile = os.path.join(self._state_dir, 'status')
+        mockstatusfile = self._state_file
         if not os.path.exists(mockstatusfile):
             return None
 
@@ -273,8 +271,7 @@
         
         while True:
             try:
-                f.seek(0, 0)
-                string = f.read(4)
+                lines = f.readlines()
             except OSError, e:
                 if e.errno == errno.EAGAIN:
                     try:
@@ -283,12 +280,19 @@
                         pass
                     continue
             else:
-                if len(string) < 4:
+                if not len(lines):
                     continue
                 break
         f.close()
-        string = string.lower()
-        return string
+        mockstat = None
+        lastline = lines[len(lines)-1].lower()
+        statedelim = "state changed:"
+        stateidx = lastline.rfind(statedelim)
+        if stateidx>0:
+            mockstat = lastline[stateidx+len(statedelim):].lstrip()
+            return mockstat
+        else:
+            return None
 
     def _read_mock_config(self):
         mockconfigfile = os.path.join(self._result_dir, 'mockconfig.log')
@@ -353,8 +357,7 @@
     def _status_prepping(self):
         # We need to make sure that mock has dumped the status file withing a certain
         # amount of time, otherwise we can't tell what it's doing
-        mockstatusfile = os.path.join(self._state_dir, 'status')
-        if not os.path.exists(mockstatusfile):
+        if not os.path.exists(self._state_file):
             # something is wrong if mock takes more than 15s to write the status file
             if time.time() > self._mockstarttime + 15:
                 self._mockstarttime = 0
@@ -383,9 +386,6 @@
                     if mock_root_dir.endswith(self._uniqid):
                         shutil.rmtree(mock_root_dir, ignore_errors=True)
 
-                if self._mock_config.has_key('statedir'):
-                    shutil.rmtree(self._mock_config['statedir'], ignore_errors=True)
-
                 source_dir = os.path.abspath(os.path.join(self._mock_config['rootdir'], "../source"))
                 # Ensure we're actually deleteing the job's sourcedir
                 if source_dir.endswith(os.path.join(self._uniqid, "source")):

plague-0.4.5-sqlite3.patch:

--- NEW FILE plague-0.4.5-sqlite3.patch ---
diff -Nur plague-0.4.5-orig/server/BuildMaster.py plague-0.4.5/server/BuildMaster.py
--- plague-0.4.5-orig/server/BuildMaster.py	2008-01-31 15:21:09.000000000 +0100
+++ plague-0.4.5/server/BuildMaster.py	2008-06-14 14:25:54.000000000 +0200
@@ -65,10 +65,6 @@
         self._building_jobs = {}
         self._building_jobs_lock = threading.Lock()
 
-        self._dbcx = self._db_manager.dbcx()
-        self._cursor = self._dbcx.cursor()
-
-        self._requeue_interrupted_jobs()
         threading.Thread.__init__(self)
         self.setName("BuildMaster")
 
@@ -397,6 +393,12 @@
 
     def run(self):
         DebugUtils.registerThreadName(self)
+
+        self._dbcx = self._db_manager.dbcx()
+        self._cursor = self._dbcx.cursor()
+
+        self._requeue_interrupted_jobs()
+
         while self.should_stop == False:
             # Write update status for jobs to the database
             self._save_job_status()
diff -Nur plague-0.4.5-orig/server/DBManager.py plague-0.4.5/server/DBManager.py
--- plague-0.4.5-orig/server/DBManager.py	2008-01-31 15:21:09.000000000 +0100
+++ plague-0.4.5/server/DBManager.py	2008-06-14 14:25:54.000000000 +0200
@@ -124,11 +124,15 @@
 
     def fetchall(self, cursor):
         """ sqlite returns the items in a dict-like class already """
-        return cursor.fetchall()
+        rows = cursor.fetchall()
+        return [ResultSet(row, cursor.description) for row in rows]
 
     def fetchone(self, cursor):
         """ sqlite returns the items in a dict-like class already """
-        return cursor.fetchone()
+        row = cursor.fetchone()
+        if not row:
+            return None
+        return ResultSet(row, cursor.description)
 
     def _connect(self):
         try:
@@ -143,7 +147,7 @@
             tm = 3
 
         try:
-            dbcx = sqlite.connect(dbloc, encoding="utf-8", timeout=tm)
+            dbcx = sqlite.connect(dbloc)
         except StandardError, e:
             print "Error: %s" % e
             os._exit(1)
@@ -266,8 +270,8 @@
 # isn't present, remove its class entry from
 # the db engine dict
 try:
-    import sqlite
-except ImportError, e:
+    import sqlite3 as sqlite
+except ImportError:
     db_engines['sqlite'] = None
 
 try:
diff -Nur plague-0.4.5-orig/server/UserInterface.py plague-0.4.5/server/UserInterface.py
--- plague-0.4.5-orig/server/UserInterface.py	2008-01-31 15:21:09.000000000 +0100
+++ plague-0.4.5/server/UserInterface.py	2008-06-14 14:25:54.000000000 +0200
@@ -84,6 +84,12 @@
     return target_cfg
 
 
+def _fetchone(cursor,row):  # sqlite3 helper
+    if not row:
+        return None
+    return DBManager.ResultSet(row, cursor.description)
+
+
 class UserInterface:
     """
     Base UserInterface class. NO AUTHENTICATION.  Subclass this to provide some.
@@ -184,7 +190,7 @@
             del curs, dbcx
             return (-1, "Unable to access job database: '%s'" % e)
         curs.execute(sql)
-        job = dbcx.fetchone(curs)
+        job = _fetchone(curs,dbcx.fetchone(curs))
         result = None
         if not job:
             result = (-1, "Error: Invalid job UID.")
@@ -318,7 +324,7 @@
             del curs, dbcx
             return (-1, "Unable to access job database: '%s'" % e, [])
         curs.execute(sql)
-        data = dbcx.fetchall(curs)
+        data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
         jobs = []
         for row in data:
             jobrec = {}
@@ -349,7 +355,7 @@
             sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, "  \
                     "status, builder_status FROM archjobs WHERE " + uids
             curs.execute(sql)
-            data = dbcx.fetchall(curs)
+            data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
             for row in data:
                 ajrec = {}
                 ajrec['jobid'] = row['jobid']
@@ -386,7 +392,7 @@
         except StandardError, e:
             return (-1, "Unable to access job database: '%s'" % e, {})
         curs.execute(sql)
-        job = dbcx.fetchone(curs)
+        job = _fetchone(curs,dbcx.fetchone(curs))
         if not job:
             del curs, dbcx
             return (-1, "Error: Invalid job UID.", {})
@@ -420,7 +426,7 @@
         sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, "    \
                 "status, builder_status FROM archjobs WHERE parent_uid=%d " % uid
         curs.execute(sql)
-        data = dbcx.fetchall(curs)
+        data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
         for row in data:
             ajrec = {}
             ajrec['jobid'] = row['jobid']
@@ -541,7 +547,7 @@
             return (-1, "Unable to access job database: '%s'" % e)
 
         curs.execute(sql)
-        job = dbcx.fetchone(curs)
+        job = _fetchone(curs,dbcx.fetchone(curs))
 
         result = None
         if not job:
@@ -630,7 +636,7 @@
             return (-1, "Unable to access job database: '%s'" % e)
 
         curs.execute(sql)
-        data = dbcx.fetchall(curs)
+        data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
 
         # Ensure that the user can actually finish the jobs they requested
         final_uid_list = []
diff -Nur plague-0.4.5-orig/server/User.py plague-0.4.5/server/User.py
--- plague-0.4.5-orig/server/User.py	2008-01-31 15:21:09.000000000 +0100
+++ plague-0.4.5/server/User.py	2008-06-14 14:25:54.000000000 +0200
@@ -15,7 +15,11 @@
 # Copyright 2005 Dan Williams <dcbw at redhat.com> and Red Hat, Inc.
 
 
-import sqlite
+import sqlite3 as sqlite
+
+import sys
+sys.path.append('/usr/share/plague/server')
+from DBManager import ResultSet
 
 CONFIG_LOCATION = "/etc/plague/server/"
 
@@ -30,10 +34,9 @@
         self.user_admin = False
         self.server_admin = False
 
-
 def get_userdb_dbcx():
     try:
-        dbcx = sqlite.connect(CONFIG_LOCATION + "userdb", encoding="utf-8", timeout=4)
+        dbcx = sqlite.connect(CONFIG_LOCATION + "userdb")
         curs = dbcx.cursor()
         return (dbcx, curs)
     except sqlite.DatabaseError, e:
@@ -57,7 +60,7 @@
         try:
             curs.execute('SELECT * FROM users')
             dbcx.commit()
-        except sqlite._sqlite.DatabaseError, e:
+        except sqlite.DatabaseError, e:
             create = True
 
         if create:
@@ -81,6 +84,7 @@
         dbcx.commit()
         item = curs.fetchone()
         if item:
+            item = ResultSet(item, curs.description)
             user = User(email, False)
             user.own_jobs = item['own_jobs']
             user.job_admin = item['job_admin']
diff -Nur plague-0.4.5-orig/utils/user-manager.py plague-0.4.5/utils/user-manager.py
--- plague-0.4.5-orig/utils/user-manager.py	2005-08-08 18:15:18.000000000 +0200
+++ plague-0.4.5/utils/user-manager.py	2008-06-14 14:25:54.000000000 +0200
@@ -18,7 +18,10 @@
 
 
 import sys, os
-import sqlite
+import sqlite3
+
+sys.path.append('/usr/share/plague/server')
+from DBManager import ResultSet
 
 
 def print_usage(prog):
@@ -38,7 +41,7 @@
 
 class UserManager:
     def __init__(self, dbfile):
-        self.dbcx = sqlite.connect(dbfile, encoding="utf-8", timeout=2)
+        self.dbcx = sqlite3.connect(dbfile)
         self.curs = self.dbcx.cursor()
 
         # Ensure the table exists in the database
@@ -176,7 +179,7 @@
 
         self.curs.execute(sql)
         self.dbcx.commit()
-        data = self.curs.fetchall()
+        data = [ResultSet(row,self.curs.description) for row in self.curs.fetchall()]
         if not len(data):
             raise UserManagerException("No matching users found.")
 


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/plague.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- plague.spec	3 Sep 2008 05:06:53 -0000	1.33
+++ plague.spec	3 Sep 2008 12:06:10 -0000	1.34
@@ -3,20 +3,26 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
-Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
+#Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.bz2
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
-Requires: python-sqlite, createrepo >= 0.4.3
+Requires: createrepo >= 0.4.3
 Requires: %{name}-common = %{version}-%{release}
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
+Patch1: plague-0.4.5-sqlite3.patch
+Patch2: plague-0.4.5-mock-0.8.patch
+Patch3: plague-0.4.5-logtail.patch
+
+
 %description
 The Plague build system is a client/server distributed build system for
 building RPM packages.  This package provides the plague server.
@@ -28,14 +34,20 @@
 Requires: pyOpenSSL
 
 %description common
-This package includes the common Python module that all Plague services require.
+This package includes the common Python module that all Plague services
+require.
 
 
 %package builder
 Summary: Builder daemon for Plague builder slaves
 Group: Development/Tools
 Requires: %{name}-common = %{version}-%{release}
-Requires: yum >= 2.2.1, mock >= 0.3
+Requires: yum >= 2.2.1
+%if 0%{?fedora} > 6
+Requires: mock >= 0.8
+%else
+Requires: mock < 0.8
+%endif
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -51,7 +63,8 @@
 Requires: %{name}-common = %{version}-%{release}
 
 %description client
-Client program for enqueueing package builds and interrogating the build system.
+Client program for enqueueing package builds and interrogating the build
+system.
 
 
 %package utils
@@ -66,6 +79,12 @@
 
 %prep
 %setup -q
+%if 0%{?fedora} > 6
+%patch1 -p1 -b .sqlite3
+%patch2 -p1 -b .mock8
+%endif
+%patch3 -p1 -b .logtail
+
 
 %build
 make
@@ -73,12 +92,13 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-install -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder
-install -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder
-install -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server
-install -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server
-mkdir -p $RPM_BUILD_ROOT/srv/plague_builder
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
+chmod +x $RPM_BUILD_ROOT%{_bindir}/*
+install -p -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder
+install -p -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder
+install -p -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server
+install -p -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server
+mkdir -p $RPM_BUILD_ROOT/var/lib/plague/builder
 
 
 %clean
@@ -96,7 +116,7 @@
 fi
 
 %pre builder
-/usr/sbin/useradd -G mock -s /sbin/nologin -M -r -d /srv/plague_builder plague-builder 2>/dev/null || :
+/usr/sbin/useradd -G mock -s /sbin/nologin -M -r -d /var/lib/plague/builder plague-builder 2>/dev/null || :
 
 %post builder
 /sbin/chkconfig --add plague-builder
@@ -135,7 +155,8 @@
 %dir %{_sysconfdir}/%{name}/builder/certs
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-builder
 %{_initrddir}/%{name}-builder
-%attr(0755, plague-builder, plague-builder) /srv/plague_builder
+%dir /var/lib/plague
+%attr(0755, plague-builder, plague-builder) /var/lib/plague/builder
 
 %files client
 %defattr(-, root, root)
@@ -148,13 +169,17 @@
 
 
 %changelog
+* Wed Sep  3 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5-2
+- add the patches from 0.4.5-0.4 (sqlite3, mock08, logtail)
+- merge more spec changes
+
 * Tue Sep 02 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5-1
 - update to 0.4.5  lots of fixes 
 
 * Thu May 22 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.4.4.1-6
 - licensing tag fix
 
-* Tue Sep 18 2007 Michael Schwendt <mschwendt at users.sf.net> - 0.4.4.1-5
+* Tue Sep 18 2007 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.4.1-5
 - Add dirs /etc/plague and /usr/share/plague to plague-common
   since "plague-builder" and "plague" use them (#233904).
 
@@ -321,7 +346,7 @@
 
 * Sat Jul 16 2005 Dan Williams <dcbw at redhat.com>
 - Bump version to 0.2
-- Grab python files from /usr/lib, not %{_libdir} until the
+- Grab python files from /usr/lib, not %%{_libdir} until the
     multiarch issues get worked out
 
 * Sun Jun 26 2005 Dan Williams <dcbw at redhat.com>



From mschwendt at fedoraproject.org  Wed Sep  3 12:06:43 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  3 Sep 2008 12:06:43 +0000 (UTC)
Subject: rpms/plague/F-9 plague-0.4.5-logtail.patch, NONE,
	1.1 plague-0.4.5-mock-0.8.patch, NONE,
	1.1 plague-0.4.5-sqlite3.patch, NONE, 1.1 plague.spec, 1.32, 1.33
Message-ID: <20080903120643.BE3177011F@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25033/F-9

Modified Files:
	plague.spec 
Added Files:
	plague-0.4.5-logtail.patch plague-0.4.5-mock-0.8.patch 
	plague-0.4.5-sqlite3.patch 
Log Message:
* Wed Sep  3 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5-2
- add the patches from 0.4.5-0.4 (sqlite3, mock08, logtail)
- merge more spec changes


plague-0.4.5-logtail.patch:

--- NEW FILE plague-0.4.5-logtail.patch ---
diff -Nur plague-0.4.5-orig/server/PackageJob.py plague-0.4.5/server/PackageJob.py
--- plague-0.4.5-orig/server/PackageJob.py	2008-01-31 15:30:57.000000000 +0100
+++ plague-0.4.5/server/PackageJob.py	2008-07-14 23:44:47.000000000 +0200
@@ -729,30 +729,9 @@
 
         self.bm.notify_job_done(self)
 
-    def _get_log_tail(self, arch):
-        """ Returns the last 30 lines of the most relevant log file """
-
-        pkg_dir = "%s-%s-%s-%s" % (self.uid, self.name, self.ver, self.release)
-        work_dir = self._server_cfg.get_str("Directories", "server_work_dir")
-        log_dir = os.path.join(work_dir, self._target_str, pkg_dir, arch)
-        final_log = None
-        build_log = "%s/%s" % (log_dir, "build.log")
-        root_log = "%s/%s" % (log_dir, "root.log")
-        job_log = "%s/%s" % (log_dir, "job.log")
-
-        # Try the most relevant log file first
-        if os.path.exists(build_log) and os.path.getsize(build_log) > 0:
-            final_log = build_log
-        elif os.path.exists(root_log) and os.path.getsize(root_log) > 0:
-            final_log = root_log
-        elif os.path.exists(job_log) and os.path.getsize(job_log) > 0:
-            final_log = job_log
-
-        if not final_log:
-            return ""
-
-        seek_pos = os.path.getsize(final_log) - 4096
-        f = open(final_log, "r", 4096);
+    def _get_log_file_tail(self, logfile):
+        seek_pos = os.path.getsize(logfile) - 4096
+        f = open(logfile, "r", 4096);
         if seek_pos > 0:
             f.seek(seek_pos)
         try:
@@ -770,9 +749,28 @@
             lines.append(line)
             if len(lines) > 30:  # only want last 30 lines
                 del lines[0]
-
         f.close()
-        return "".join(lines)
+        return lines
+
+    def _get_log_tail(self, arch):
+        """ Returns the last 30 lines of the most relevant log file(s) """
+
+        pkg_dir = "%s-%s-%s-%s" % (self.uid, self.name, self.ver, self.release)
+        work_dir = self._server_cfg.get_str("Directories", "server_work_dir")
+        log_dir = os.path.join(work_dir, self._target_str, pkg_dir, arch)
+
+        logtail = []
+        for l in ["build.log", "root.log", "job.log"]:
+            lpath = os.path.join(log_dir, l)
+            if os.path.exists(lpath) and os.path.getsize(lpath)>0:
+                lines = self._get_log_file_tail(lpath)
+                if l=="build.log" and len(lines)<10:
+                    logtail += lines
+                    logtail.append("\n\n"+">"*40+"\n\n")
+                else:
+                    logtail += lines
+                    break
+        return "".join(logtail)
 
     def email_result(self, to, resultstring, subject=None):
         """send 'resultstring' to self.username"""

plague-0.4.5-mock-0.8.patch:

--- NEW FILE plague-0.4.5-mock-0.8.patch ---
diff -Nur plague-0.4.5-orig/builder/builder.py plague-0.4.5/builder/builder.py
--- plague-0.4.5-orig/builder/builder.py	2008-01-31 18:21:32.000000000 +0100
+++ plague-0.4.5/builder/builder.py	2008-01-31 18:58:40.000000000 +0100
@@ -108,9 +108,7 @@
         if not os.path.exists(self._result_dir):
             os.makedirs(self._result_dir)
 
-        self._state_dir = os.path.join(self._work_dir, self._uniqid, "mock-state")
-        if not os.path.exists(self._state_dir):
-            os.makedirs(self._state_dir)
+        self._state_file = os.path.join(self._result_dir,"state.log")
 
         logfile = os.path.join(self._result_dir, "job.log")
         self._log_fd = open(logfile, "w+")
@@ -218,12 +216,12 @@
                 args.append(arg)
             cmd = os.path.abspath(arg_list[0])
         args.append(builder_cmd)
+        args.append("rebuild")
         args.append("-r")
         args.append(self.buildroot)
         args.append("--arch")
         args.append(self.buildarch)
         args.append("--resultdir=%s" % self._result_dir)
-        args.append("--statedir=%s" % self._state_dir)
         args.append("--uniqueext=%s" % self._uniqid)
         args.append(self._srpm_path)
         self._log("   %s\n" % string.join(args))
@@ -257,14 +255,14 @@
     def _mock_is_prepping(self):
         mock_status = self._get_mock_status()
         if mock_status:
-            prepstates = ['init','prep','unpa','crea','setu']
+            prepstates = ['enabl','creating cache','unpacking cache','setup']
             for s in prepstates:
-                if mock_status == s:
+                if mock_status.startswith(s):
                     return True
         return False
 
     def _get_mock_status(self):
-        mockstatusfile = os.path.join(self._state_dir, 'status')
+        mockstatusfile = self._state_file
         if not os.path.exists(mockstatusfile):
             return None
 
@@ -273,8 +271,7 @@
         
         while True:
             try:
-                f.seek(0, 0)
-                string = f.read(4)
+                lines = f.readlines()
             except OSError, e:
                 if e.errno == errno.EAGAIN:
                     try:
@@ -283,12 +280,19 @@
                         pass
                     continue
             else:
-                if len(string) < 4:
+                if not len(lines):
                     continue
                 break
         f.close()
-        string = string.lower()
-        return string
+        mockstat = None
+        lastline = lines[len(lines)-1].lower()
+        statedelim = "state changed:"
+        stateidx = lastline.rfind(statedelim)
+        if stateidx>0:
+            mockstat = lastline[stateidx+len(statedelim):].lstrip()
+            return mockstat
+        else:
+            return None
 
     def _read_mock_config(self):
         mockconfigfile = os.path.join(self._result_dir, 'mockconfig.log')
@@ -353,8 +357,7 @@
     def _status_prepping(self):
         # We need to make sure that mock has dumped the status file withing a certain
         # amount of time, otherwise we can't tell what it's doing
-        mockstatusfile = os.path.join(self._state_dir, 'status')
-        if not os.path.exists(mockstatusfile):
+        if not os.path.exists(self._state_file):
             # something is wrong if mock takes more than 15s to write the status file
             if time.time() > self._mockstarttime + 15:
                 self._mockstarttime = 0
@@ -383,9 +386,6 @@
                     if mock_root_dir.endswith(self._uniqid):
                         shutil.rmtree(mock_root_dir, ignore_errors=True)
 
-                if self._mock_config.has_key('statedir'):
-                    shutil.rmtree(self._mock_config['statedir'], ignore_errors=True)
-
                 source_dir = os.path.abspath(os.path.join(self._mock_config['rootdir'], "../source"))
                 # Ensure we're actually deleteing the job's sourcedir
                 if source_dir.endswith(os.path.join(self._uniqid, "source")):

plague-0.4.5-sqlite3.patch:

--- NEW FILE plague-0.4.5-sqlite3.patch ---
diff -Nur plague-0.4.5-orig/server/BuildMaster.py plague-0.4.5/server/BuildMaster.py
--- plague-0.4.5-orig/server/BuildMaster.py	2008-01-31 15:21:09.000000000 +0100
+++ plague-0.4.5/server/BuildMaster.py	2008-06-14 14:25:54.000000000 +0200
@@ -65,10 +65,6 @@
         self._building_jobs = {}
         self._building_jobs_lock = threading.Lock()
 
-        self._dbcx = self._db_manager.dbcx()
-        self._cursor = self._dbcx.cursor()
-
-        self._requeue_interrupted_jobs()
         threading.Thread.__init__(self)
         self.setName("BuildMaster")
 
@@ -397,6 +393,12 @@
 
     def run(self):
         DebugUtils.registerThreadName(self)
+
+        self._dbcx = self._db_manager.dbcx()
+        self._cursor = self._dbcx.cursor()
+
+        self._requeue_interrupted_jobs()
+
         while self.should_stop == False:
             # Write update status for jobs to the database
             self._save_job_status()
diff -Nur plague-0.4.5-orig/server/DBManager.py plague-0.4.5/server/DBManager.py
--- plague-0.4.5-orig/server/DBManager.py	2008-01-31 15:21:09.000000000 +0100
+++ plague-0.4.5/server/DBManager.py	2008-06-14 14:25:54.000000000 +0200
@@ -124,11 +124,15 @@
 
     def fetchall(self, cursor):
         """ sqlite returns the items in a dict-like class already """
-        return cursor.fetchall()
+        rows = cursor.fetchall()
+        return [ResultSet(row, cursor.description) for row in rows]
 
     def fetchone(self, cursor):
         """ sqlite returns the items in a dict-like class already """
-        return cursor.fetchone()
+        row = cursor.fetchone()
+        if not row:
+            return None
+        return ResultSet(row, cursor.description)
 
     def _connect(self):
         try:
@@ -143,7 +147,7 @@
             tm = 3
 
         try:
-            dbcx = sqlite.connect(dbloc, encoding="utf-8", timeout=tm)
+            dbcx = sqlite.connect(dbloc)
         except StandardError, e:
             print "Error: %s" % e
             os._exit(1)
@@ -266,8 +270,8 @@
 # isn't present, remove its class entry from
 # the db engine dict
 try:
-    import sqlite
-except ImportError, e:
+    import sqlite3 as sqlite
+except ImportError:
     db_engines['sqlite'] = None
 
 try:
diff -Nur plague-0.4.5-orig/server/UserInterface.py plague-0.4.5/server/UserInterface.py
--- plague-0.4.5-orig/server/UserInterface.py	2008-01-31 15:21:09.000000000 +0100
+++ plague-0.4.5/server/UserInterface.py	2008-06-14 14:25:54.000000000 +0200
@@ -84,6 +84,12 @@
     return target_cfg
 
 
+def _fetchone(cursor,row):  # sqlite3 helper
+    if not row:
+        return None
+    return DBManager.ResultSet(row, cursor.description)
+
+
 class UserInterface:
     """
     Base UserInterface class. NO AUTHENTICATION.  Subclass this to provide some.
@@ -184,7 +190,7 @@
             del curs, dbcx
             return (-1, "Unable to access job database: '%s'" % e)
         curs.execute(sql)
-        job = dbcx.fetchone(curs)
+        job = _fetchone(curs,dbcx.fetchone(curs))
         result = None
         if not job:
             result = (-1, "Error: Invalid job UID.")
@@ -318,7 +324,7 @@
             del curs, dbcx
             return (-1, "Unable to access job database: '%s'" % e, [])
         curs.execute(sql)
-        data = dbcx.fetchall(curs)
+        data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
         jobs = []
         for row in data:
             jobrec = {}
@@ -349,7 +355,7 @@
             sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, "  \
                     "status, builder_status FROM archjobs WHERE " + uids
             curs.execute(sql)
-            data = dbcx.fetchall(curs)
+            data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
             for row in data:
                 ajrec = {}
                 ajrec['jobid'] = row['jobid']
@@ -386,7 +392,7 @@
         except StandardError, e:
             return (-1, "Unable to access job database: '%s'" % e, {})
         curs.execute(sql)
-        job = dbcx.fetchone(curs)
+        job = _fetchone(curs,dbcx.fetchone(curs))
         if not job:
             del curs, dbcx
             return (-1, "Error: Invalid job UID.", {})
@@ -420,7 +426,7 @@
         sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, "    \
                 "status, builder_status FROM archjobs WHERE parent_uid=%d " % uid
         curs.execute(sql)
-        data = dbcx.fetchall(curs)
+        data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
         for row in data:
             ajrec = {}
             ajrec['jobid'] = row['jobid']
@@ -541,7 +547,7 @@
             return (-1, "Unable to access job database: '%s'" % e)
 
         curs.execute(sql)
-        job = dbcx.fetchone(curs)
+        job = _fetchone(curs,dbcx.fetchone(curs))
 
         result = None
         if not job:
@@ -630,7 +636,7 @@
             return (-1, "Unable to access job database: '%s'" % e)
 
         curs.execute(sql)
-        data = dbcx.fetchall(curs)
+        data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
 
         # Ensure that the user can actually finish the jobs they requested
         final_uid_list = []
diff -Nur plague-0.4.5-orig/server/User.py plague-0.4.5/server/User.py
--- plague-0.4.5-orig/server/User.py	2008-01-31 15:21:09.000000000 +0100
+++ plague-0.4.5/server/User.py	2008-06-14 14:25:54.000000000 +0200
@@ -15,7 +15,11 @@
 # Copyright 2005 Dan Williams <dcbw at redhat.com> and Red Hat, Inc.
 
 
-import sqlite
+import sqlite3 as sqlite
+
+import sys
+sys.path.append('/usr/share/plague/server')
+from DBManager import ResultSet
 
 CONFIG_LOCATION = "/etc/plague/server/"
 
@@ -30,10 +34,9 @@
         self.user_admin = False
         self.server_admin = False
 
-
 def get_userdb_dbcx():
     try:
-        dbcx = sqlite.connect(CONFIG_LOCATION + "userdb", encoding="utf-8", timeout=4)
+        dbcx = sqlite.connect(CONFIG_LOCATION + "userdb")
         curs = dbcx.cursor()
         return (dbcx, curs)
     except sqlite.DatabaseError, e:
@@ -57,7 +60,7 @@
         try:
             curs.execute('SELECT * FROM users')
             dbcx.commit()
-        except sqlite._sqlite.DatabaseError, e:
+        except sqlite.DatabaseError, e:
             create = True
 
         if create:
@@ -81,6 +84,7 @@
         dbcx.commit()
         item = curs.fetchone()
         if item:
+            item = ResultSet(item, curs.description)
             user = User(email, False)
             user.own_jobs = item['own_jobs']
             user.job_admin = item['job_admin']
diff -Nur plague-0.4.5-orig/utils/user-manager.py plague-0.4.5/utils/user-manager.py
--- plague-0.4.5-orig/utils/user-manager.py	2005-08-08 18:15:18.000000000 +0200
+++ plague-0.4.5/utils/user-manager.py	2008-06-14 14:25:54.000000000 +0200
@@ -18,7 +18,10 @@
 
 
 import sys, os
-import sqlite
+import sqlite3
+
+sys.path.append('/usr/share/plague/server')
+from DBManager import ResultSet
 
 
 def print_usage(prog):
@@ -38,7 +41,7 @@
 
 class UserManager:
     def __init__(self, dbfile):
-        self.dbcx = sqlite.connect(dbfile, encoding="utf-8", timeout=2)
+        self.dbcx = sqlite3.connect(dbfile)
         self.curs = self.dbcx.cursor()
 
         # Ensure the table exists in the database
@@ -176,7 +179,7 @@
 
         self.curs.execute(sql)
         self.dbcx.commit()
-        data = self.curs.fetchall()
+        data = [ResultSet(row,self.curs.description) for row in self.curs.fetchall()]
         if not len(data):
             raise UserManagerException("No matching users found.")
 


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-9/plague.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- plague.spec	3 Sep 2008 05:08:37 -0000	1.32
+++ plague.spec	3 Sep 2008 12:06:11 -0000	1.33
@@ -3,20 +3,26 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
-Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
+#Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.bz2
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
-Requires: python-sqlite, createrepo >= 0.4.3
+Requires: createrepo >= 0.4.3
 Requires: %{name}-common = %{version}-%{release}
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
+Patch1: plague-0.4.5-sqlite3.patch
+Patch2: plague-0.4.5-mock-0.8.patch
+Patch3: plague-0.4.5-logtail.patch
+
+
 %description
 The Plague build system is a client/server distributed build system for
 building RPM packages.  This package provides the plague server.
@@ -28,14 +34,20 @@
 Requires: pyOpenSSL
 
 %description common
-This package includes the common Python module that all Plague services require.
+This package includes the common Python module that all Plague services
+require.
 
 
 %package builder
 Summary: Builder daemon for Plague builder slaves
 Group: Development/Tools
 Requires: %{name}-common = %{version}-%{release}
-Requires: yum >= 2.2.1, mock >= 0.3
+Requires: yum >= 2.2.1
+%if 0%{?fedora} > 6
+Requires: mock >= 0.8
+%else
+Requires: mock < 0.8
+%endif
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -51,7 +63,8 @@
 Requires: %{name}-common = %{version}-%{release}
 
 %description client
-Client program for enqueueing package builds and interrogating the build system.
+Client program for enqueueing package builds and interrogating the build
+system.
 
 
 %package utils
@@ -66,6 +79,12 @@
 
 %prep
 %setup -q
+%if 0%{?fedora} > 6
+%patch1 -p1 -b .sqlite3
+%patch2 -p1 -b .mock8
+%endif
+%patch3 -p1 -b .logtail
+
 
 %build
 make
@@ -73,12 +92,13 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-install -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder
-install -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder
-install -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server
-install -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server
-mkdir -p $RPM_BUILD_ROOT/srv/plague_builder
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
+chmod +x $RPM_BUILD_ROOT%{_bindir}/*
+install -p -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder
+install -p -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder
+install -p -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server
+install -p -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server
+mkdir -p $RPM_BUILD_ROOT/var/lib/plague/builder
 
 
 %clean
@@ -96,7 +116,7 @@
 fi
 
 %pre builder
-/usr/sbin/useradd -G mock -s /sbin/nologin -M -r -d /srv/plague_builder plague-builder 2>/dev/null || :
+/usr/sbin/useradd -G mock -s /sbin/nologin -M -r -d /var/lib/plague/builder plague-builder 2>/dev/null || :
 
 %post builder
 /sbin/chkconfig --add plague-builder
@@ -135,7 +155,8 @@
 %dir %{_sysconfdir}/%{name}/builder/certs
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-builder
 %{_initrddir}/%{name}-builder
-%attr(0755, plague-builder, plague-builder) /srv/plague_builder
+%dir /var/lib/plague
+%attr(0755, plague-builder, plague-builder) /var/lib/plague/builder
 
 %files client
 %defattr(-, root, root)
@@ -148,13 +169,17 @@
 
 
 %changelog
+* Wed Sep  3 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5-2
+- add the patches from 0.4.5-0.4 (sqlite3, mock08, logtail)
+- merge more spec changes
+
 * Tue Sep 02 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5-1
 - update to 0.4.5  lots of fixes 
 
 * Thu May 22 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.4.4.1-6
 - licensing tag fix
 
-* Tue Sep 18 2007 Michael Schwendt <mschwendt at users.sf.net> - 0.4.4.1-5
+* Tue Sep 18 2007 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.4.1-5
 - Add dirs /etc/plague and /usr/share/plague to plague-common
   since "plague-builder" and "plague" use them (#233904).
 
@@ -321,7 +346,7 @@
 
 * Sat Jul 16 2005 Dan Williams <dcbw at redhat.com>
 - Bump version to 0.2
-- Grab python files from /usr/lib, not %{_libdir} until the
+- Grab python files from /usr/lib, not %%{_libdir} until the
     multiarch issues get worked out
 
 * Sun Jun 26 2005 Dan Williams <dcbw at redhat.com>



From mschwendt at fedoraproject.org  Wed Sep  3 12:11:46 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  3 Sep 2008 12:11:46 +0000 (UTC)
Subject: extras-buildsys plague.spec,1.27.2.5.2.1.2.2,1.27.2.5.2.1.2.3
Message-ID: <20080903121146.B142A7011F@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26208

Modified Files:
      Tag: Plague-0_4_5
	plague.spec 
Log Message:
a few rpmlint fixes


Index: plague.spec
===================================================================
RCS file: /cvs/fedora/extras-buildsys/plague.spec,v
retrieving revision 1.27.2.5.2.1.2.2
retrieving revision 1.27.2.5.2.1.2.3
diff -u -r1.27.2.5.2.1.2.2 -r1.27.2.5.2.1.2.3
--- plague.spec	14 Jun 2008 10:43:40 -0000	1.27.2.5.2.1.2.2
+++ plague.spec	3 Sep 2008 12:11:45 -0000	1.27.2.5.2.1.2.3
@@ -27,7 +27,8 @@
 Requires: pyOpenSSL
 
 %description common
-This package includes the common Python module that all Plague services require.
+This package includes the common Python module that all Plague services
+require.
 
 
 %package builder
@@ -50,7 +51,8 @@
 Requires: %{name}-common = %{version}-%{release}
 
 %description client
-Client program for enqueueing package builds and interrogating the build system.
+Client program for enqueueing package builds and interrogating the build
+system.
 
 
 %package utils
@@ -73,6 +75,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
+chmod +x $RPM_BUILD_ROOT%{_bindir}/*
 install -p -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder
 install -p -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder
 install -p -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server
@@ -311,7 +314,7 @@
 
 * Sat Jul 16 2005 Dan Williams <dcbw at redhat.com>
 - Bump version to 0.2
-- Grab python files from /usr/lib, not %{_libdir} until the
+- Grab python files from /usr/lib, not %%{_libdir} until the
     multiarch issues get worked out
 
 * Sun Jun 26 2005 Dan Williams <dcbw at redhat.com>



From timn at fedoraproject.org  Wed Sep  3 12:13:49 2008
From: timn at fedoraproject.org (Tim Niemueller)
Date: Wed,  3 Sep 2008 12:13:49 +0000 (UTC)
Subject: rpms/lua/F-8 lua-5.1.4-autotoolize.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 lua.spec, 1.26, 1.27 sources, 1.10,
	1.11 lua-5.1.3-autotoolize.patch, 1.1, NONE
Message-ID: <20080903121349.31C2C7011F@cvs1.fedora.phx.redhat.com>

Author: timn

Update of /cvs/pkgs/rpms/lua/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26516

Modified Files:
	.cvsignore lua.spec sources 
Added Files:
	lua-5.1.4-autotoolize.patch 
Removed Files:
	lua-5.1.3-autotoolize.patch 
Log Message:
New upstream release 5.1.4


lua-5.1.4-autotoolize.patch:

--- NEW FILE lua-5.1.4-autotoolize.patch ---
diff -urN lua-5.1.4/aclocal.m4 lua-5.1.4-autotoolize/aclocal.m4
--- lua-5.1.4/aclocal.m4	1970-01-01 01:00:00.000000000 +0100
+++ lua-5.1.4-autotoolize/aclocal.m4	2008-09-03 13:18:37.000000000 +0200
@@ -0,0 +1,7307 @@
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 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.
+
+# 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.
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+# serial 48 AC_PROG_LIBTOOL
+
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+	         [m4_ifdef([AC_PROVIDE_$1],
+		           [$2], [$3])])])
+
+
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+	[AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+	     [define([LT_AC_PROG_GCJ],
+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+_LT_CC_BASENAME([$compiler])
[...43261 lines suppressed...]
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+EXTRA_DIST = \
+	bisect.lua  env.lua         fib.lua      life.lua          printf.lua \
+	sieve.lua   trace-calls.lua cf.lua       factorial.lua     globals.lua \
+	luac.lua    README          sort.lua     trace-globals.lua echo.lua \
+	fibfor.lua  hello.lua       readonly.lua table.lua         xd.lua
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  test/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  test/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lua/F-8/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	11 Mar 2008 10:20:21 -0000	1.8
+++ .cvsignore	3 Sep 2008 12:13:46 -0000	1.9
@@ -1 +1 @@
-lua-5.1.3.tar.gz
+lua-5.1.4.tar.gz


Index: lua.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lua/F-8/lua.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- lua.spec	12 May 2008 16:48:00 -0000	1.26
+++ lua.spec	3 Sep 2008 12:13:47 -0000	1.27
@@ -1,12 +1,12 @@
 Name:           lua
-Version:        5.1.3
-Release:        6%{?dist}
+Version:        5.1.4
+Release:        1%{?dist}
 Summary:        Powerful light-weight programming language
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.lua.org/
 Source0:        http://www.lua.org/ftp/lua-%{version}.tar.gz
-Patch0:         lua-5.1.3-autotoolize.patch
+Patch0:         lua-5.1.4-autotoolize.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel ncurses-devel
 Provides:       lua = 5.1
@@ -94,6 +94,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Sep 03 2008 Tim Niemueller <tim at niemueller.de> - 5.1.4-1
+- New upstream release 5.1.4
+
 * Mon May 12 2008 Tim Niemueller <tim at niemueller.de> - 5.1.3-6
 - Add -static subpackage with static liblua, fixes rh bug #445939
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lua/F-8/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Mar 2008 10:20:21 -0000	1.10
+++ sources	3 Sep 2008 12:13:47 -0000	1.11
@@ -1 +1 @@
-a70a8dfaa150e047866dc01a46272599  lua-5.1.3.tar.gz
+d0870f2de55d59c1c8419f36e8fac150  lua-5.1.4.tar.gz


--- lua-5.1.3-autotoolize.patch DELETED ---



From caolanm at fedoraproject.org  Wed Sep  3 12:27:00 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  3 Sep 2008 12:27:00 +0000 (UTC)
Subject: rpms/writer2latex/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 writer2latex.spec, 1.8, 1.9
Message-ID: <20080903122700.437087011F@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/writer2latex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27766

Modified Files:
	.cvsignore sources writer2latex.spec 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/writer2latex/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Aug 2008 08:34:16 -0000	1.3
+++ .cvsignore	3 Sep 2008 12:26:28 -0000	1.4
@@ -1 +1 @@
-writer2latex0501-fix2.zip
+writer2latex0502.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/writer2latex/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Aug 2008 08:34:16 -0000	1.3
+++ sources	3 Sep 2008 12:26:28 -0000	1.4
@@ -1 +1 @@
-1fce735854c036a90b3b6702b45c42ec  writer2latex0501-fix2.zip
+82b67fb729a86c36028dbe77f6b70e69  writer2latex0502.zip


Index: writer2latex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/writer2latex/devel/writer2latex.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- writer2latex.spec	25 Aug 2008 08:34:16 -0000	1.8
+++ writer2latex.spec	3 Sep 2008 12:26:28 -0000	1.9
@@ -2,12 +2,12 @@
 %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:          writer2latex
-Version:       0.5.0.1
+Version:       0.5.0.2
 Release:       1%{?dist}
 Summary:       Writer2LateX Document Converter
 License:       LGPLv2
 Url:           http://www.hj-gym.dk/~hj/writer2latex/
-Source0:       http://www.hj-gym.dk/~hj/writer2latex/writer2latex0501-fix2.zip
+Source0:       http://www.hj-gym.dk/~hj/writer2latex/writer2latex0502.zip
 Patch0:        writer2latex05.rh.patch
 BuildRequires: ant, openoffice.org-core
 Group:         Text Processing/Markup/XML
@@ -181,7 +181,7 @@
 %{_datadir}/openoffice.org/extensions/writer2xhtml.oxt
 
 %changelog
-* Mon Aug 25 2008 Caolan McNamara <caolanm at redhat.com> 0.5.0.1-1
+* Wed Sep 03 2008 Caolan McNamara <caolanm at redhat.com> 0.5.0.2-1
 - latest version
 
 * Sat Aug 09 2008 Caolan McNamara <caolanm at redhat.com> 0.5-4



From timn at fedoraproject.org  Wed Sep  3 12:27:57 2008
From: timn at fedoraproject.org (Tim Niemueller)
Date: Wed,  3 Sep 2008 12:27:57 +0000 (UTC)
Subject: rpms/lua/devel lua-5.1.4-autotoolize.patch, NONE, 1.1 .cvsignore,
	1.8, 1.9 lua.spec, 1.31, 1.32 sources, 1.10,
	1.11 lua-5.1.3-autotoolize.patch, 1.1, NONE
Message-ID: <20080903122757.EBF3C7011F@cvs1.fedora.phx.redhat.com>

Author: timn

Update of /cvs/pkgs/rpms/lua/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27989

Modified Files:
	.cvsignore lua.spec sources 
Added Files:
	lua-5.1.4-autotoolize.patch 
Removed Files:
	lua-5.1.3-autotoolize.patch 
Log Message:
New upstream release 5.1.4


lua-5.1.4-autotoolize.patch:

--- NEW FILE lua-5.1.4-autotoolize.patch ---
diff -urN lua-5.1.4/aclocal.m4 lua-5.1.4-autotoolize/aclocal.m4
--- lua-5.1.4/aclocal.m4	1970-01-01 01:00:00.000000000 +0100
+++ lua-5.1.4-autotoolize/aclocal.m4	2008-09-03 13:18:37.000000000 +0200
@@ -0,0 +1,7307 @@
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 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.
+
+# 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.
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+# serial 48 AC_PROG_LIBTOOL
+
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+	         [m4_ifdef([AC_PROVIDE_$1],
+		           [$2], [$3])])])
+
+
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+	[AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+	     [define([LT_AC_PROG_GCJ],
+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+_LT_CC_BASENAME([$compiler])
[...43261 lines suppressed...]
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+EXTRA_DIST = \
+	bisect.lua  env.lua         fib.lua      life.lua          printf.lua \
+	sieve.lua   trace-calls.lua cf.lua       factorial.lua     globals.lua \
+	luac.lua    README          sort.lua     trace-globals.lua echo.lua \
+	fibfor.lua  hello.lua       readonly.lua table.lua         xd.lua
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  test/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  test/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lua/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Jan 2008 23:07:49 -0000	1.8
+++ .cvsignore	3 Sep 2008 12:27:53 -0000	1.9
@@ -1 +1 @@
-lua-5.1.3.tar.gz
+lua-5.1.4.tar.gz


Index: lua.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lua/devel/lua.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- lua.spec	12 May 2008 16:59:32 -0000	1.31
+++ lua.spec	3 Sep 2008 12:27:55 -0000	1.32
@@ -1,12 +1,12 @@
 Name:           lua
-Version:        5.1.3
-Release:        6%{?dist}
+Version:        5.1.4
+Release:        1%{?dist}
 Summary:        Powerful light-weight programming language
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.lua.org/
 Source0:        http://www.lua.org/ftp/lua-%{version}.tar.gz
-Patch0:         lua-5.1.3-autotoolize.patch
+Patch0:         lua-5.1.4-autotoolize.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel ncurses-devel
 Provides:       lua = 5.1
@@ -94,6 +94,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Sep 03 2008 Tim Niemueller <tim at niemueller.de> - 5.1.4-1
+- New upstream release 5.1.4
+
 * Mon May 12 2008 Tim Niemueller <tim at niemueller.de> - 5.1.3-6
 - Add -static subpackage with static liblua, fixes rh bug #445939
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lua/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	26 Jan 2008 23:07:49 -0000	1.10
+++ sources	3 Sep 2008 12:27:55 -0000	1.11
@@ -1 +1 @@
-a70a8dfaa150e047866dc01a46272599  lua-5.1.3.tar.gz
+d0870f2de55d59c1c8419f36e8fac150  lua-5.1.4.tar.gz


--- lua-5.1.3-autotoolize.patch DELETED ---



From mmahut at fedoraproject.org  Wed Sep  3 12:37:41 2008
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Wed,  3 Sep 2008 12:37:41 +0000 (UTC)
Subject: rpms/ircd-ratbox/devel ircd-ratbox.spec,1.1,1.2
Message-ID: <20080903123741.5692370121@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/ircd-ratbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29100

Modified Files:
	ircd-ratbox.spec 
Log Message:
small typo



Index: ircd-ratbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ircd-ratbox/devel/ircd-ratbox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ircd-ratbox.spec	31 Aug 2008 15:04:07 -0000	1.1
+++ ircd-ratbox.spec	3 Sep 2008 12:37:10 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		ircd-ratbox
 Version:	2.2.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Ircd-ratbox is an advanced, stable and fast ircd	
 
 License:	GPLv2
@@ -38,7 +38,6 @@
 Ircd-mkpasswd is a password hash generator for ircd-ratbox.
 
 %prep
-echo  %{_var}
 %setup -q 
 %patch0 -p1 -b .offbyone
 
@@ -46,7 +45,7 @@
 	-e 's|#servlink_path = "/usr/local/ircd/bin/servlink";|servlink_path = "%{_bindir}/servlink";|'		\
 	-e 's|/usr/local/ircd/modules|%{_datadir}/ircd/modules|g'						\
 	-e 's|/usr/local/ircd/etc/|%{_sysconfdir}/ircd|g'							\
-	-e 's|"logs/|"%{_var}log|g'										\
+	-e 's|"logs/|"%{_var}/log|g'										\
 doc/example.*conf
 
 sed 's/-Werror//g' -i configure
@@ -58,7 +57,7 @@
 	--with-moduledir=%{_datadir}/ircd/modules	\
 	--with-confdir=%{_sysconfdir}/ircd		\
 	--mandir=%{_mandir}				\
-	--with-logdir=%{_var}log/ircd			\
+	--with-logdir=%{_var}/log/ircd			\
 	--enable-ipv6					\
 	--enable-openssl				\
 	--enable-zlib					\
@@ -72,7 +71,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_datadir}/ircd $RPM_BUILD_ROOT%{_var}log $RPM_BUILD_ROOT%{_sysconfdir}/ircd
+mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_datadir}/ircd $RPM_BUILD_ROOT%{_var}/log $RPM_BUILD_ROOT%{_sysconfdir}/ircd
 make install DESTDIR=$RPM_BUILD_ROOT
 install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/ircd
 install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/ircd
@@ -89,7 +88,7 @@
 %pre
 getent group ircd  >/dev/null || groupadd -r ircd
 getent passwd ircd >/dev/null || \
-useradd -r -g ircd -m -d %{_var}run/ircd-ratbox -s /sbin/nologin \
+useradd -r -g ircd -m -d %{_var}/run/ircd-ratbox -s /sbin/nologin \
 	-c "ircd-ratbox user" ircd
 
 %post
@@ -122,12 +121,12 @@
 %{_sysconfdir}/sysconfig/ircd
 %{_sysconfdir}/init.d/ircd
 %doc %{_mandir}/man8/ircd*
-%dir %attr(750,ircd,ircd) %{_var}log/ircd
+%dir %attr(750,ircd,ircd) %{_var}/log/ircd
 %config(noreplace) %{_sysconfdir}/logrotate.d/ircd
 
 %files mkpasswd
 %{_bindir}/ircd-mkpasswd
 
 %changelog
-* Wed Aug 27 2008 Marek Mahut <mmahut at fedoraproject.org> - 2.2.8-1
+* Wed Aug 27 2008 Marek Mahut <mmahut at fedoraproject.org> - 2.2.8-2
 - Initial package build



From pkgdb at fedoraproject.org  Wed Sep  3 12:02:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 12:02:18 +0000
Subject: [pkgdb] mailman ownership updated
Message-ID: <20080903120223.B990D208D14@bastion.fedora.phx.redhat.com>

Package mailman in Fedora 7 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailman



From pkgdb at fedoraproject.org  Wed Sep  3 12:03:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 12:03:09 +0000
Subject: [pkgdb] mailman ownership updated
Message-ID: <20080903120310.0C0D5208D11@bastion.fedora.phx.redhat.com>

Package mailman in Fedora 8 is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailman



From pkgdb at fedoraproject.org  Wed Sep  3 12:02:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 12:02:19 +0000
Subject: [pkgdb] mailman ownership updated
Message-ID: <20080903120219.5DAA4208D12@bastion.fedora.phx.redhat.com>

Package mailman in Fedora 9 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailman



From pkgdb at fedoraproject.org  Wed Sep  3 12:02:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 12:02:18 +0000
Subject: [pkgdb] mailman ownership updated
Message-ID: <20080903120218.B7292208D10@bastion.fedora.phx.redhat.com>

Package mailman in Fedora 8 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailman



From pkgdb at fedoraproject.org  Wed Sep  3 12:02:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 12:02:16 +0000
Subject: [pkgdb] mailman ownership updated
Message-ID: <20080903120216.BC317208D0B@bastion.fedora.phx.redhat.com>

Package mailman in Fedora devel was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailman



From pkgdb at fedoraproject.org  Wed Sep  3 12:03:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 12:03:13 +0000
Subject: [pkgdb] mailman ownership updated
Message-ID: <20080903120313.6D092208D13@bastion.fedora.phx.redhat.com>

Package mailman in Fedora 9 is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailman



From pkgdb at fedoraproject.org  Wed Sep  3 12:03:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 12:03:04 +0000
Subject: [pkgdb] mailman ownership updated
Message-ID: <20080903120304.BEAE7208D0C@bastion.fedora.phx.redhat.com>

Package mailman in Fedora devel is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailman



From pkgdb at fedoraproject.org  Wed Sep  3 11:20:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 11:20:40 +0000
Subject: [pkgdb] procinfo ownership updated
Message-ID: <20080903112040.0532B208D17@bastion.fedora.phx.redhat.com>

Package procinfo in Fedora 9 is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/procinfo



From mmahut at fedoraproject.org  Wed Sep  3 12:54:21 2008
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Wed,  3 Sep 2008 12:54:21 +0000 (UTC)
Subject: rpms/ircd-ratbox/EL-5 ircd-ratbox.spec,1.1,1.2
Message-ID: <20080903125421.8BA0F7011F@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/ircd-ratbox/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30674

Modified Files:
	ircd-ratbox.spec 
Log Message:
small typo



Index: ircd-ratbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ircd-ratbox/EL-5/ircd-ratbox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ircd-ratbox.spec	31 Aug 2008 15:28:06 -0000	1.1
+++ ircd-ratbox.spec	3 Sep 2008 12:53:50 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		ircd-ratbox
 Version:	2.2.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Ircd-ratbox is an advanced, stable and fast ircd	
 
 License:	GPLv2
@@ -38,7 +38,6 @@
 Ircd-mkpasswd is a password hash generator for ircd-ratbox.
 
 %prep
-echo  %{_var}
 %setup -q 
 %patch0 -p1 -b .offbyone
 
@@ -46,7 +45,7 @@
 	-e 's|#servlink_path = "/usr/local/ircd/bin/servlink";|servlink_path = "%{_bindir}/servlink";|'		\
 	-e 's|/usr/local/ircd/modules|%{_datadir}/ircd/modules|g'						\
 	-e 's|/usr/local/ircd/etc/|%{_sysconfdir}/ircd|g'							\
-	-e 's|"logs/|"%{_var}log|g'										\
+	-e 's|"logs/|"%{_var}/log|g'										\
 doc/example.*conf
 
 sed 's/-Werror//g' -i configure
@@ -58,7 +57,7 @@
 	--with-moduledir=%{_datadir}/ircd/modules	\
 	--with-confdir=%{_sysconfdir}/ircd		\
 	--mandir=%{_mandir}				\
-	--with-logdir=%{_var}log/ircd			\
+	--with-logdir=%{_var}/log/ircd			\
 	--enable-ipv6					\
 	--enable-openssl				\
 	--enable-zlib					\
@@ -72,7 +71,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_datadir}/ircd $RPM_BUILD_ROOT%{_var}log $RPM_BUILD_ROOT%{_sysconfdir}/ircd
+mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_datadir}/ircd $RPM_BUILD_ROOT%{_var}/log $RPM_BUILD_ROOT%{_sysconfdir}/ircd
 make install DESTDIR=$RPM_BUILD_ROOT
 install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/ircd
 install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/ircd
@@ -89,7 +88,7 @@
 %pre
 getent group ircd  >/dev/null || groupadd -r ircd
 getent passwd ircd >/dev/null || \
-useradd -r -g ircd -m -d %{_var}run/ircd-ratbox -s /sbin/nologin \
+useradd -r -g ircd -m -d %{_var}/run/ircd-ratbox -s /sbin/nologin \
 	-c "ircd-ratbox user" ircd
 
 %post
@@ -122,12 +121,12 @@
 %{_sysconfdir}/sysconfig/ircd
 %{_sysconfdir}/init.d/ircd
 %doc %{_mandir}/man8/ircd*
-%dir %attr(750,ircd,ircd) %{_var}log/ircd
+%dir %attr(750,ircd,ircd) %{_var}/log/ircd
 %config(noreplace) %{_sysconfdir}/logrotate.d/ircd
 
 %files mkpasswd
 %{_bindir}/ircd-mkpasswd
 
 %changelog
-* Wed Aug 27 2008 Marek Mahut <mmahut at fedoraproject.org> - 2.2.8-1
+* Wed Aug 27 2008 Marek Mahut <mmahut at fedoraproject.org> - 2.2.8-2
 - Initial package build



From jbowes at fedoraproject.org  Wed Sep  3 12:54:58 2008
From: jbowes at fedoraproject.org (James Bowes)
Date: Wed,  3 Sep 2008 12:54:58 +0000 (UTC)
Subject: rpms/python-vobject/devel .cvsignore, 1.12, 1.13 python-vobject.spec,
	1.15, 1.16 sources, 1.12, 1.13
Message-ID: <20080903125458.D590E7011F@cvs1.fedora.phx.redhat.com>

Author: jbowes

Update of /cvs/pkgs/rpms/python-vobject/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30725

Modified Files:
	.cvsignore python-vobject.spec sources 
Log Message:
update to 0.7.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-vobject/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	24 Jul 2008 15:02:09 -0000	1.12
+++ .cvsignore	3 Sep 2008 12:54:27 -0000	1.13
@@ -1 +1 @@
-vobject-0.7.0.tar.gz
+vobject-0.7.1.tar.gz


Index: python-vobject.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-vobject/devel/python-vobject.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- python-vobject.spec	24 Jul 2008 15:02:09 -0000	1.15
+++ python-vobject.spec	3 Sep 2008 12:54:28 -0000	1.16
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-vobject 
-Version:        0.7.0 
+Version:        0.7.1 
 Release:        1%{?dist}
 Summary:        A python library for manipulating vCard and vCalendar files
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Sep 03 2008 James Bowes <jbowes at redhat.com> - 0.7.1-1
+- Update to 0.7.1
+
 * Thu Jul 24 2008 James Bowes <jbowes at redhat.com> - 0.7.0-1
 - Update to 0.7.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-vobject/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	24 Jul 2008 15:02:09 -0000	1.12
+++ sources	3 Sep 2008 12:54:28 -0000	1.13
@@ -1 +1 @@
-2678ed290cdcc72606062005ee25d950  vobject-0.7.0.tar.gz
+9f2c151ba6c08afcc47b8966ea862061  vobject-0.7.1.tar.gz



From than at fedoraproject.org  Wed Sep  3 13:00:37 2008
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  3 Sep 2008 13:00:37 +0000 (UTC)
Subject: rpms/konq-plugins/devel konq-plugins.spec,1.8,1.9
Message-ID: <20080903130037.448197011F@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/konq-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31110

Modified Files:
	konq-plugins.spec 
Log Message:
remove patch that already included in 4.1.1



Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/devel/konq-plugins.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- konq-plugins.spec	29 Aug 2008 17:11:19 -0000	1.8
+++ konq-plugins.spec	3 Sep 2008 13:00:06 -0000	1.9
@@ -55,7 +55,6 @@
 
 %prep
 %setup -q
-%patch100 -p0 -b .akregator-files
 
 
 %build



From than at fedoraproject.org  Wed Sep  3 13:02:21 2008
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  3 Sep 2008 13:02:21 +0000 (UTC)
Subject: rpms/konq-plugins/F-9 konq-plugins.spec, 1.9, 1.10 sources, 1.4,
	1.5 konq-plugins-4.1.0-fix-uninstalled-akregator-files.patch,
	1.1, NONE
Message-ID: <20080903130221.69BD07011F@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/konq-plugins/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31374

Modified Files:
	konq-plugins.spec sources 
Removed Files:
	konq-plugins-4.1.0-fix-uninstalled-akregator-files.patch 
Log Message:
4.1.1



Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-9/konq-plugins.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- konq-plugins.spec	7 Aug 2008 04:01:24 -0000	1.9
+++ konq-plugins.spec	3 Sep 2008 13:01:50 -0000	1.10
@@ -1,8 +1,8 @@
 # Review Request: http://bugzilla.redhat.com/438126
 
 Name:           konq-plugins
-Version:        4.1.0
-Release:        2%{?dist}
+Version:        4.1.1
+Release:        1%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
 Group:          Applications/Internet
@@ -22,10 +22,6 @@
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/4.1.0/src/extragear/konq-plugins-%{version}.tar.bz2
 
-# http://websvn.kde.org/?view=rev&revision=843360
-# Fix data files from akregator plugin not getting installed
-Patch100: konq-plugins-4.1.0-fix-uninstalled-akregator-files.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: kdebase4-devel >= 4.1
@@ -59,7 +55,6 @@
 
 %prep
 %setup -q
-%patch100 -p0 -b .akregator-files
 
 
 %build
@@ -124,6 +119,9 @@
 
 
 %changelog
+* Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
+- 4.1.1
+
 * Thu Aug 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.1.0-2
 - fix data files from akregator plugin not getting installed
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Aug 2008 16:53:48 -0000	1.4
+++ sources	3 Sep 2008 13:01:50 -0000	1.5
@@ -1 +1 @@
-aac0727e541c0e53c0d821ea644d13fb  konq-plugins-4.1.0.tar.bz2
+91ba68f763811deec646edb02e8b44ad  konq-plugins-4.1.1.tar.bz2


--- konq-plugins-4.1.0-fix-uninstalled-akregator-files.patch DELETED ---



From jbowes at fedoraproject.org  Wed Sep  3 13:09:03 2008
From: jbowes at fedoraproject.org (James Bowes)
Date: Wed,  3 Sep 2008 13:09:03 +0000 (UTC)
Subject: rpms/python-vobject/devel python-vobject.spec,1.16,1.17
Message-ID: <20080903130903.B971A70122@cvs1.fedora.phx.redhat.com>

Author: jbowes

Update of /cvs/pkgs/rpms/python-vobject/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31832

Modified Files:
	python-vobject.spec 
Log Message:
add change_tz executable


Index: python-vobject.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-vobject/devel/python-vobject.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- python-vobject.spec	3 Sep 2008 12:54:28 -0000	1.16
+++ python-vobject.spec	3 Sep 2008 13:09:01 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           python-vobject 
 Version:        0.7.1 
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A python library for manipulating vCard and vCalendar files
 
 Group:          Development/Languages
@@ -47,10 +47,14 @@
 
 %{python_sitelib}/*
 
+%{_bindir}/change_tz
 %{_bindir}/ics_diff
 
 
 %changelog
+* Wed Sep 03 2008 James Bowes <jbowes at redhat.com> - 0.7.1-2
+- Add change_tz executable
+
 * Wed Sep 03 2008 James Bowes <jbowes at redhat.com> - 0.7.1-1
 - Update to 0.7.1
 



From rnorwood at fedoraproject.org  Wed Sep  3 13:49:16 2008
From: rnorwood at fedoraproject.org (Robin Norwood)
Date: Wed,  3 Sep 2008 13:49:16 +0000 (UTC)
Subject: rpms/xmms-pulse/devel xmms-pulse.spec,1.1,1.2
Message-ID: <20080903134917.0BD8D7011F@cvs1.fedora.phx.redhat.com>

Author: rnorwood

Update of /cvs/pkgs/rpms/xmms-pulse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1046

Modified Files:
	xmms-pulse.spec 
Log Message:
Build against new xmms.


Index: xmms-pulse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmms-pulse/devel/xmms-pulse.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmms-pulse.spec	12 Jun 2008 18:52:45 -0000	1.1
+++ xmms-pulse.spec	3 Sep 2008 13:48:46 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           xmms-pulse
 Version:        0.9.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        XMMS output plugin for the PulseAudio sound server
 
 Group:          Applications/Multimedia
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Robin Norwood <rnorwood at redhat.com> - 0.9.4-6
+- Build against latest xmms
+
 * Wed Jun  4 2008 Robin Norwood <rnorwood at redhat.com> - 0.9.4-5
 - Bump release
 



From vcrhonek at fedoraproject.org  Wed Sep  3 14:10:46 2008
From: vcrhonek at fedoraproject.org (Vitezslav Crhonek)
Date: Wed,  3 Sep 2008 14:10:46 +0000 (UTC)
Subject: rpms/fetchmail/devel fetchmail.spec,1.58,1.59
Message-ID: <20080903141046.99FFD7011F@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/fetchmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2253

Modified Files:
	fetchmail.spec 
Log Message:
Replace server(smtp) requires by procmail


Index: fetchmail.spec
===================================================================
RCS file: /cvs/extras/rpms/fetchmail/devel/fetchmail.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- fetchmail.spec	27 Jun 2008 09:50:26 -0000	1.58
+++ fetchmail.spec	3 Sep 2008 14:10:16 -0000	1.59
@@ -4,8 +4,8 @@
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
 Version: 6.3.8
-Release: 7%{?dist}
-Requires: server(smtp)
+Release: 8%{?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
@@ -55,7 +55,8 @@
 %build
 %configure --enable-POP3 --enable-IMAP --with-ssl --with-hesiod \
 	--enable-ETRN --enable-NTLM --enable-SDPS --enable-RPA \
-	--enable-nls --with-kerberos --with-kerberos5 --with-gssapi
+	--enable-nls --with-kerberos --with-kerberos5 --with-gssapi \
+	--enable-fallback=procmail
 make
 
 %install
@@ -88,6 +89,10 @@
 %endif
 
 %changelog
+* Wed Sep  3 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.3.8-8
+- Replace server(smtp) requires by procmail
+  Resolves: #66396
+
 * Fri Jun 27 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.3.8-7
 - Fix CVE-2008-2711
 



From caolanm at fedoraproject.org  Wed Sep  3 14:18:41 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  3 Sep 2008 14:18:41 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.0.oooXXXXX.filter.latex.patch, NONE,
	1.1 openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch, 
	1.1, 1.2 openoffice.org.spec, 1.1636, 1.1637
Message-ID: <20080903141841.CE4FD7011F@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2875

Modified Files:
	openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.oooXXXXX.filter.latex.patch 
Log Message:
add openoffice.org-3.0.0.oooXXXXX.filter.latex.patch

openoffice.org-3.0.0.oooXXXXX.filter.latex.patch:

--- NEW FILE openoffice.org-3.0.0.oooXXXXX.filter.latex.patch ---
Index: source/config/fragments/fcfg_writer.mk
===================================================================
RCS file: /cvs/framework/filter/source/config/fragments/fcfg_writer.mk,v
retrieving revision 1.14.20.1
diff -u -r1.14.20.1 fcfg_writer.mk
--- openoffice.org.orig/filter/source/config/fragments/fcfg_writer.mk	15 Aug 2008 10:33:45 -0000	1.14.20.1
+++ openoffice.org/filter/source/config/fragments/fcfg_writer.mk	3 Sep 2008 14:16:49 -0000
@@ -29,9 +29,13 @@
     writer_MS_Word_2003_XML \
 	writer_MS_Word_2007_XML \
 	writer_MS_Word_2007_XML_Template \
-    MediaWiki_File \
+    MediaWiki_File
+
+.IF "$(WITH_WRITER2LATEX)" != "NO"
+T4_WRITER += \
 	LaTeX \
 	BibTeX
+.ENDIF
 
 # -----------------------------------------------
 # count = 39
@@ -63,9 +67,13 @@
     writer_web_MediaWiki_File \
     MS_Word_2003_XML \
 	MS_Word_2007_XML \
-	MS_Word_2007_XML_Template \
+	MS_Word_2007_XML_Template
+
+.IF "$(WITH_WRITER2LATEX)" != "NO"
+F4_WRITER += \
 	LaTeX_Writer \
 	BibTeX_Writer
+.ENDIF
 
 # -----------------------------------------------
 # count = 14

openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch:

Index: openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch	3 Sep 2008 10:11:35 -0000	1.1
+++ openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch	3 Sep 2008 14:18:41 -0000	1.2
@@ -3,8 +3,8 @@
 RCS file: /cvs/graphics/svx/inc/svx/AccessibleContextBase.hxx,v
 retrieving revision 1.4
 diff -u -r1.4 AccessibleContextBase.hxx
---- inc/svx/AccessibleContextBase.hxx	7 Jul 2008 14:27:26 -0000	1.4
-+++ inc/svx/AccessibleContextBase.hxx	3 Sep 2008 10:01:10 -0000
+--- openoffice.org.orig/svx/inc/svx/AccessibleContextBase.hxx	7 Jul 2008 14:27:26 -0000	1.4
++++ openoffice.org/svx/inc/svx/AccessibleContextBase.hxx	3 Sep 2008 10:01:10 -0000
 @@ -396,6 +396,15 @@
  	*/
  	void SetAccessibleRole( sal_Int16 _nRole );
@@ -26,8 +26,8 @@
 RCS file: /cvs/graphics/svx/inc/svx/AccessibleShape.hxx,v
 retrieving revision 1.4
 diff -u -r1.4 AccessibleShape.hxx
---- inc/svx/AccessibleShape.hxx	7 Jul 2008 14:28:01 -0000	1.4
-+++ inc/svx/AccessibleShape.hxx	3 Sep 2008 10:01:11 -0000
+--- openoffice.org.orig/svx/inc/svx/AccessibleShape.hxx	7 Jul 2008 14:28:01 -0000	1.4
++++ openoffice.org/svx/inc/svx/AccessibleShape.hxx	3 Sep 2008 10:01:11 -0000
 @@ -437,6 +437,8 @@
          AccessibleContextBase base class.
      */
@@ -42,8 +42,8 @@
 RCS file: /cvs/graphics/svx/source/accessibility/AccessibleContextBase.cxx,v
 retrieving revision 1.28
 diff -u -r1.28 AccessibleContextBase.cxx
---- source/accessibility/AccessibleContextBase.cxx	7 Jul 2008 14:28:50 -0000	1.28
-+++ source/accessibility/AccessibleContextBase.cxx	3 Sep 2008 10:02:17 -0000
+--- openoffice.org.orig/svx/source/accessibility/AccessibleContextBase.cxx	7 Jul 2008 14:28:50 -0000	1.28
++++ openoffice.org/svx/source/accessibility/AccessibleContextBase.cxx	3 Sep 2008 10:02:17 -0000
 @@ -587,6 +587,13 @@
  }
  
@@ -98,8 +98,8 @@
 RCS file: /cvs/graphics/svx/source/accessibility/AccessibleShape.cxx,v
 retrieving revision 1.54
 diff -u -r1.54 AccessibleShape.cxx
---- source/accessibility/AccessibleShape.cxx	7 Jul 2008 14:31:23 -0000	1.54
-+++ source/accessibility/AccessibleShape.cxx	3 Sep 2008 10:02:17 -0000
+--- openoffice.org.orig/svx/source/accessibility/AccessibleShape.cxx	7 Jul 2008 14:31:23 -0000	1.54
++++ openoffice.org/svx/source/accessibility/AccessibleShape.cxx	3 Sep 2008 10:02:17 -0000
 @@ -123,7 +123,7 @@
        mpParent (rShapeInfo.mpChildrenManager)
  {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1636
retrieving revision 1.1637
diff -u -r1.1636 -r1.1637
--- openoffice.org.spec	3 Sep 2008 10:11:35 -0000	1.1636
+++ openoffice.org.spec	3 Sep 2008 14:18:41 -0000	1.1637
@@ -111,6 +111,7 @@
 Patch41: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
 Patch42: openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch
 Patch43: openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
+Patch44: openoffice.org-3.0.0.oooXXXXX.filter.latex.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1293,6 +1294,7 @@
 %patch41 -p1 -b .ooo91924.svx.consistentordering.patch
 %patch42 -p1 -b .ooo93366.fpicker_in_main.patch
 %patch43 -p1 -b .ooo93419.svx.ref_deref.before.ctored.patch
+%patch44 -p1 -b .oooXXXXX.filter.latex.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3653,6 +3655,7 @@
 - Resolves: rhbz#460883 openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
 - defuzz patches
 - add openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch
+- add openoffice.org-3.0.0.oooXXXXX.filter.latex.patch
 
 * Fri Aug 29 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-4.1
 - next milestone



From pkgdb at fedoraproject.org  Wed Sep  3 14:18:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 14:18:59 +0000
Subject: [pkgdb] cheese: jwrdegoede has requested watchcommits
Message-ID: <20080903141859.8C17A208D13@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the watchcommits acl on cheese (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cheese



From pkgdb at fedoraproject.org  Wed Sep  3 14:18:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 14:18:55 +0000
Subject: [pkgdb] cheese: jwrdegoede has requested watchbugzilla
Message-ID: <20080903141856.2435C208D0F@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the watchbugzilla acl on cheese (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cheese



From pkgdb at fedoraproject.org  Wed Sep  3 14:19:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 14:19:04 +0000
Subject: [pkgdb] cheese: jwrdegoede has requested commit
Message-ID: <20080903141904.1C38D208D16@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the commit acl on cheese (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cheese



From pkgdb at fedoraproject.org  Wed Sep  3 14:19:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 14:19:12 +0000
Subject: [pkgdb] cheese: jwrdegoede has requested watchbugzilla
Message-ID: <20080903141912.A0BC8208D17@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the watchbugzilla acl on cheese (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cheese



From pkgdb at fedoraproject.org  Wed Sep  3 14:19:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 14:19:15 +0000
Subject: [pkgdb] cheese: jwrdegoede has requested watchcommits
Message-ID: <20080903141915.1E1E4208D6C@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the watchcommits acl on cheese (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cheese



From pkgdb at fedoraproject.org  Wed Sep  3 14:19:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 14:19:19 +0000
Subject: [pkgdb] cheese: jwrdegoede has requested commit
Message-ID: <20080903141925.2191A208D12@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the commit acl on cheese (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cheese



From caolanm at fedoraproject.org  Wed Sep  3 14:22:43 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  3 Sep 2008 14:22:43 +0000 (UTC)
Subject: rpms/libgsf/devel .cvsignore, 1.21, 1.22 libgsf.spec, 1.56,
	1.57 sources, 1.21, 1.22
Message-ID: <20080903142243.1B0287011F@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libgsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3103

Modified Files:
	.cvsignore libgsf.spec sources 
Log Message:
latest version with gio support


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	6 Mar 2008 09:22:31 -0000	1.21
+++ .cvsignore	3 Sep 2008 14:22:12 -0000	1.22
@@ -1 +1 @@
-libgsf-1.14.8.tar.bz2
+libgsf-1.14.9.tar.bz2


Index: libgsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- libgsf.spec	8 Aug 2008 13:11:59 -0000	1.56
+++ libgsf.spec	3 Sep 2008 14:22:12 -0000	1.57
@@ -3,15 +3,15 @@
 
 Summary: GNOME Structured File library
 Name: libgsf
-Version: 1.14.8
-Release: 2%{?dist}
+Version: 1.14.9
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.bz2
 URL: http://www.gnome.org/projects/libgsf/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel, perl-XML-Parser
-BuildRequires: libtool, libxml2-devel, gnome-vfs2-devel, bzip2-devel, gettext
+BuildRequires: libtool, libxml2-devel, glib2-devel, bzip2-devel, gettext
 BuildRequires: libbonobo-devel, pygtk2-devel
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -24,7 +24,7 @@
 Summary: GNOME integration bits for libgsf
 Group: System Environment/Libraries
 Requires: libgsf = %{version}-%{release}
-Requires: gnome-vfs2, ImageMagick
+Requires: ImageMagick
 
 %description gnome
 Libraries for using libgsf in conjunction with the GNOME applications
@@ -42,7 +42,7 @@
 %package gnome-devel
 Summary: Support files necessary to compile applications with libgsf and GNOME
 Group: Development/Libraries
-Requires: libgsf-devel = %{version}-%{release}, gnome-vfs2-devel
+Requires: libgsf-devel = %{version}-%{release}, glib2-devel
 
 %description gnome-devel
 Libraries, headers, and support files necessary to compile applications using
@@ -114,9 +114,9 @@
 %{_libdir}/pkgconfig/libgsf-1.pc
 %dir %{_includedir}/libgsf-1
 %{_includedir}/libgsf-1/gsf
-%{_includedir}/libgsf-1/gsf-gvfs
 %{_datadir}/gtk-doc/html/gsf
 %{_mandir}/man1/gsf.1.gz
+%{_mandir}/man1/gsf-vba-dump.1.gz
 
 %files gnome-devel
 %defattr(-,root,root,-)
@@ -132,6 +132,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Sep 03 2008 Caol??n McNamara <caolanm at redhat.com> 1.14.9-1
+- latest version with gio support
+
 * Fri Aug 08 2008 Caol??n McNamara <caolanm at redhat.com> 1.14.8-2
 - Resolves: rhbz#458353 gsf-office-thumbnailer doesn't work without ImageMagick's convert.
   Move that into the gnome subpackage


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	6 Mar 2008 09:22:31 -0000	1.21
+++ sources	3 Sep 2008 14:22:12 -0000	1.22
@@ -1 +1 @@
-09e4b6639be79fa888cabc751f73674f  libgsf-1.14.8.tar.bz2
+422a8461927b863780d3579991a915a5  libgsf-1.14.9.tar.bz2



From harald at fedoraproject.org  Wed Sep  3 14:26:19 2008
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed,  3 Sep 2008 14:26:19 +0000 (UTC)
Subject: rpms/readahead/devel readahead-1.4.5-audit_reply_list.patch, NONE, 
	1.1 readahead.spec, 1.47, 1.48
Message-ID: <20080903142619.6691B7011F@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/readahead/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3491

Modified Files:
	readahead.spec 
Added Files:
	readahead-1.4.5-audit_reply_list.patch 
Log Message:
* Wed Sep 03 2008 Harald Hoyer <harald at redhat.com> 1.4.5-2
- fixed compiling agaings audit-libs-devel-1.4.5


readahead-1.4.5-audit_reply_list.patch:

--- NEW FILE readahead-1.4.5-audit_reply_list.patch ---
diff -up readahead-1.4.5/src/readahead-collector.c.reply_list readahead-1.4.5/src/readahead-collector.c
--- readahead-1.4.5/src/readahead-collector.c.reply_list	2008-09-03 16:22:50.000000000 +0200
+++ readahead-1.4.5/src/readahead-collector.c	2008-09-03 16:22:57.000000000 +0200
@@ -48,6 +48,12 @@
 
 #define MAX_READLINKS 32
 
+struct auditd_reply_list {
+        struct audit_reply reply;
+        struct auditd_reply_list *next;
+        int ack_socket;
+        unsigned long sequence_id;
+};
 
 /* daemon initialization pipe */
 static int init_pipe[2];


Index: readahead.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/readahead.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- readahead.spec	1 Sep 2008 14:41:20 -0000	1.47
+++ readahead.spec	3 Sep 2008 14:25:49 -0000	1.48
@@ -9,6 +9,7 @@
 Source1:        default.early
 Source2:        default.later
 Patch: 		readahead-1.4.5-usr.patch
+Patch2: 	readahead-1.4.5-audit_reply_list.patch
 
 URL:            https://hosted.fedoraproject.org/projects/readahead
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,6 +28,8 @@
 %prep
 %setup -q
 %patch -p1 -b .usr
+%patch2 -p1 -b .audit_reply_list
+
 cp -f -t ./lists/ %{SOURCE1}
 cp -f -t ./lists/ %{SOURCE2}
 
@@ -75,6 +78,9 @@
 /sbin/readahead-collector
 
 %changelog
+* Wed Sep 03 2008 Harald Hoyer <harald at redhat.com> 1.4.5-2
+- fixed compiling agaings audit-libs-devel-1.4.5
+
 * Mon Sep 01 2008 Harald Hoyer <harald at redhat.com> 1.4.5-2
 - moved readahead to /sbin (bug #460715)
 



From bretm at fedoraproject.org  Wed Sep  3 14:33:03 2008
From: bretm at fedoraproject.org (Bret Richard McMillan)
Date: Wed,  3 Sep 2008 14:33:03 +0000 (UTC)
Subject: rpms/wordpress-mu/devel README.fedora.wordpress-mu, NONE,
	1.1 import.log, NONE, 1.1 wordpress-mu-httpd-conf, NONE,
	1.1 wordpress-mu.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20080903143303.EC6D87011F@cvs1.fedora.phx.redhat.com>

Author: bretm

Update of /cvs/pkgs/rpms/wordpress-mu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4073/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora.wordpress-mu import.log wordpress-mu-httpd-conf 
	wordpress-mu.spec 
Log Message:
initial cvs import of wordpress-mu package



--- NEW FILE README.fedora.wordpress-mu ---
Alias /wordpress-mu /usr/share/wordpress-mu

<Directory /usr/share/wordpress-mu>
  AllowOverride Options
  RewriteEngine On

  RewriteBase /wordpress-mu/

  #uploaded files
  RewriteRule ^(.*/)?files/$ index.php [L]
  RewriteRule ^(.*/)?files/(.*) wp-content/blogs.php?file=$2 [L]

  RewriteCond %{REQUEST_FILENAME} -f [OR]
  RewriteCond %{REQUEST_FILENAME} -d
  RewriteRule . - [L]
  RewriteRule  ^([_0-9a-zA-Z-]+/)?(wp-.*) $2 [L]
  RewriteRule  ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]
  RewriteRule . index.php [L]
</Directory>



--- NEW FILE import.log ---
wordpress-mu-2_6_1-1_fc8:HEAD:wordpress-mu-2.6.1-1.fc8.src.rpm:1220452323


--- NEW FILE wordpress-mu-httpd-conf ---
Alias /wordpress-mu /usr/share/wordpress-mu

<Directory /usr/share/wordpress-mu>
  AllowOverride Options
  RewriteEngine On

  RewriteBase /wordpress-mu/

  #uploaded files
  RewriteRule ^(.*/)?files/$ index.php [L]
  RewriteCond %{REQUEST_URI} !.*wp-content/plugins.*
  RewriteRule ^(.*/)?files/(.*) wp-content/blogs.php?file=$2 [L]

  # add a trailing slash to /wp-admin
  RewriteCond %{REQUEST_URI} ^.*/wp-admin$
  RewriteRule ^(.+)$ $1/ [R=301,L]

  RewriteCond %{REQUEST_FILENAME} -f [OR]
  RewriteCond %{REQUEST_FILENAME} -d
  RewriteRule . - [L]
  RewriteRule  ^([_0-9a-zA-Z-]+/)?(wp-.*) $2 [L]
  RewriteRule  ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]
  RewriteRule . index.php [L]
</Directory>



--- NEW FILE wordpress-mu.spec ---
Summary: WordPress-MU multi-user blogging software
URL: http://mu.wordpress.org/latest.tar.gz
Name: wordpress-mu
Version: 2.6.1
Release: 1%{?dist}
Group: Applications/Publishing
License: GPLv2
Source0: %{name}-%{version}.tar.gz
Source1: wordpress-mu-httpd-conf
Source2: README.fedora.wordpress-mu
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: php >= 4.1.0, httpd, php-mysql
BuildArch: noarch

%description
WordPress-MU is a derivative of the WordPress blogging codebase, to allow
one instance to serve multiple users.

%prep
%setup -q

# disable-wordpress-core-update, updates are always installed via rpm
#
# the sed script from wordpress.spec doesn't work due to if/else statement in upstream wordpress-mu's update.php
# sed -i -e "s,add_action,#add_action,g" wp-includes/update.php

echo "<?php // update script removed, updates via RPMs for Fedora ?>" > wp-includes/update.php

%build


%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_datadir}/wordpress-mu
mkdir -p %{buildroot}%{_sysconfdir}/wordpress-mu
install -m 0644 -D -p %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/wordpress-mu.conf
install -m 0644 -D -p %{SOURCE2} %{buildroot}%{_docdir}/%{name}-%{version}/README.fedora

cp -pr * %{buildroot}%{_datadir}/wordpress-mu

# fix weird upstream perms...
chmod 0644 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/css/content.css
chmod 0664 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js
chmod 0664 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/config.php


# since we're using /etc/httpd/conf.d, don't do the funky .htaccess stuff
# that the installer wants
echo "# please see /etc/httpd/conf.d/wordpress-mu.conf" > %{buildroot}%{_datadir}/wordpress-mu/htaccess.dist


# Remove empty files to make rpmlint happy
find %{buildroot} -empty -exec rm -f {} \;
# These are docs, remove them from here, docify them later
rm -f %{buildroot}%{_datadir}/wordpress-mu/{license.txt,README.txt}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/httpd/conf.d/wordpress-mu.conf
%dir %{_datadir}/wordpress-mu
%{_datadir}/wordpress-mu/htaccess.dist
%{_datadir}/wordpress-mu/wp-admin
%{_datadir}/wordpress-mu/wp-content
%{_datadir}/wordpress-mu/wp-includes
%{_datadir}/wordpress-mu/index.php
%doc license.txt
%doc README.txt
%{_datadir}/wordpress-mu/index-install.php
%{_datadir}/wordpress-mu/wp-activate.php
%{_datadir}/wordpress-mu/wp-atom.php
%{_datadir}/wordpress-mu/wp-app.php
%{_datadir}/wordpress-mu/wp-blog-header.php
%{_datadir}/wordpress-mu/wp-comments-post.php
%{_datadir}/wordpress-mu/wp-commentsrss2.php
%{_datadir}/wordpress-mu/wp-config-sample.php
%{_datadir}/wordpress-mu/wp-cron.php
%{_datadir}/wordpress-mu/wp-feed.php
%{_datadir}/wordpress-mu/wp-load.php
%{_datadir}/wordpress-mu/wp-links-opml.php
%{_datadir}/wordpress-mu/wp-login.php
%{_datadir}/wordpress-mu/wp-mail.php
%{_datadir}/wordpress-mu/wp-pass.php
%{_datadir}/wordpress-mu/wp-rdf.php
%{_datadir}/wordpress-mu/wp-rss.php
%{_datadir}/wordpress-mu/wp-rss2.php
%{_datadir}/wordpress-mu/wp-settings.php
%{_datadir}/wordpress-mu/wpmu-settings.php
%{_datadir}/wordpress-mu/wp-signup.php
%{_datadir}/wordpress-mu/wp-trackback.php
%{_datadir}/wordpress-mu/xmlrpc.php
%{_datadir}/wordpress-mu/favicon.ico
%dir %{_sysconfdir}/wordpress-mu

%changelog
* Wed Sep  3 2008 Bret McMillan <bretm at redhat.com> - 2.6.1-1
- update to 2.6.1

* Tue Jul 29 2008 Bret McMillan <bretm at redhat.com> - 2.6-7
- added build section to the spec file

* Wed Jul 29 2008 Bret McMillan <bretm at redhat.com> - 2.6-6
- rebasing to wpmu 2.6

* Fri May 30 2008 Bret McMillan <bretm at redhat.com> - 1.5.1-2
- trying to clean up how we're dealing with htaccess.dist

* Mon May 26 2008 Bret McMillan <bretm at redhat.com> - 1.5.1-1
- update to 1.5.1; getting ready for Fedora submission

* Fri Apr 25 2008 Bret McMillan <bretm at redhat.com> - 1.3.3-1
- initial version; copying heuristics from the base fedora wordpress pkg



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Aug 2008 19:55:16 -0000	1.1
+++ .cvsignore	3 Sep 2008 14:32:33 -0000	1.2
@@ -0,0 +1 @@
+wordpress-mu-2.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Aug 2008 19:55:16 -0000	1.1
+++ sources	3 Sep 2008 14:32:33 -0000	1.2
@@ -0,0 +1 @@
+231c841354005a7efdfbaa0d61fc531b  wordpress-mu-2.6.1.tar.gz



From caolanm at fedoraproject.org  Wed Sep  3 14:35:34 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  3 Sep 2008 14:35:34 +0000 (UTC)
Subject: rpms/libgsf/devel libgsf.spec,1.57,1.58
Message-ID: <20080903143534.871DE7011F@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libgsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4500

Modified Files:
	libgsf.spec 
Log Message:
needs intltool


Index: libgsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- libgsf.spec	3 Sep 2008 14:22:12 -0000	1.57
+++ libgsf.spec	3 Sep 2008 14:35:04 -0000	1.58
@@ -12,7 +12,7 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel, perl-XML-Parser
 BuildRequires: libtool, libxml2-devel, glib2-devel, bzip2-devel, gettext
-BuildRequires: libbonobo-devel, pygtk2-devel
+BuildRequires: libbonobo-devel, pygtk2-devel, intltool
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2



From bretm at fedoraproject.org  Wed Sep  3 14:35:43 2008
From: bretm at fedoraproject.org (Bret Richard McMillan)
Date: Wed,  3 Sep 2008 14:35:43 +0000 (UTC)
Subject: rpms/wordpress-mu/F-8 README.fedora.wordpress-mu, NONE,
	1.1 import.log, 
	NONE, 1.1 wordpress-mu-httpd-conf, NONE, 1.1 wordpress-mu.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080903143543.843737011F@cvs1.fedora.phx.redhat.com>

Author: bretm

Update of /cvs/pkgs/rpms/wordpress-mu/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4474/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora.wordpress-mu import.log wordpress-mu-httpd-conf 
	wordpress-mu.spec 
Log Message:
importing wordpress-mu-2.6.1-1 into Fedora 8



--- NEW FILE README.fedora.wordpress-mu ---
Alias /wordpress-mu /usr/share/wordpress-mu

<Directory /usr/share/wordpress-mu>
  AllowOverride Options
  RewriteEngine On

  RewriteBase /wordpress-mu/

  #uploaded files
  RewriteRule ^(.*/)?files/$ index.php [L]
  RewriteRule ^(.*/)?files/(.*) wp-content/blogs.php?file=$2 [L]

  RewriteCond %{REQUEST_FILENAME} -f [OR]
  RewriteCond %{REQUEST_FILENAME} -d
  RewriteRule . - [L]
  RewriteRule  ^([_0-9a-zA-Z-]+/)?(wp-.*) $2 [L]
  RewriteRule  ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]
  RewriteRule . index.php [L]
</Directory>



--- NEW FILE import.log ---
wordpress-mu-2_6_1-1_fc8:F-8:wordpress-mu-2.6.1-1.fc8.src.rpm:1220452479


--- NEW FILE wordpress-mu-httpd-conf ---
Alias /wordpress-mu /usr/share/wordpress-mu

<Directory /usr/share/wordpress-mu>
  AllowOverride Options
  RewriteEngine On

  RewriteBase /wordpress-mu/

  #uploaded files
  RewriteRule ^(.*/)?files/$ index.php [L]
  RewriteCond %{REQUEST_URI} !.*wp-content/plugins.*
  RewriteRule ^(.*/)?files/(.*) wp-content/blogs.php?file=$2 [L]

  # add a trailing slash to /wp-admin
  RewriteCond %{REQUEST_URI} ^.*/wp-admin$
  RewriteRule ^(.+)$ $1/ [R=301,L]

  RewriteCond %{REQUEST_FILENAME} -f [OR]
  RewriteCond %{REQUEST_FILENAME} -d
  RewriteRule . - [L]
  RewriteRule  ^([_0-9a-zA-Z-]+/)?(wp-.*) $2 [L]
  RewriteRule  ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]
  RewriteRule . index.php [L]
</Directory>



--- NEW FILE wordpress-mu.spec ---
Summary: WordPress-MU multi-user blogging software
URL: http://mu.wordpress.org/latest.tar.gz
Name: wordpress-mu
Version: 2.6.1
Release: 1%{?dist}
Group: Applications/Publishing
License: GPLv2
Source0: %{name}-%{version}.tar.gz
Source1: wordpress-mu-httpd-conf
Source2: README.fedora.wordpress-mu
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: php >= 4.1.0, httpd, php-mysql
BuildArch: noarch

%description
WordPress-MU is a derivative of the WordPress blogging codebase, to allow
one instance to serve multiple users.

%prep
%setup -q

# disable-wordpress-core-update, updates are always installed via rpm
#
# the sed script from wordpress.spec doesn't work due to if/else statement in upstream wordpress-mu's update.php
# sed -i -e "s,add_action,#add_action,g" wp-includes/update.php

echo "<?php // update script removed, updates via RPMs for Fedora ?>" > wp-includes/update.php

%build


%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_datadir}/wordpress-mu
mkdir -p %{buildroot}%{_sysconfdir}/wordpress-mu
install -m 0644 -D -p %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/wordpress-mu.conf
install -m 0644 -D -p %{SOURCE2} %{buildroot}%{_docdir}/%{name}-%{version}/README.fedora

cp -pr * %{buildroot}%{_datadir}/wordpress-mu

# fix weird upstream perms...
chmod 0644 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/css/content.css
chmod 0664 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js
chmod 0664 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/config.php


# since we're using /etc/httpd/conf.d, don't do the funky .htaccess stuff
# that the installer wants
echo "# please see /etc/httpd/conf.d/wordpress-mu.conf" > %{buildroot}%{_datadir}/wordpress-mu/htaccess.dist


# Remove empty files to make rpmlint happy
find %{buildroot} -empty -exec rm -f {} \;
# These are docs, remove them from here, docify them later
rm -f %{buildroot}%{_datadir}/wordpress-mu/{license.txt,README.txt}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/httpd/conf.d/wordpress-mu.conf
%dir %{_datadir}/wordpress-mu
%{_datadir}/wordpress-mu/htaccess.dist
%{_datadir}/wordpress-mu/wp-admin
%{_datadir}/wordpress-mu/wp-content
%{_datadir}/wordpress-mu/wp-includes
%{_datadir}/wordpress-mu/index.php
%doc license.txt
%doc README.txt
%{_datadir}/wordpress-mu/index-install.php
%{_datadir}/wordpress-mu/wp-activate.php
%{_datadir}/wordpress-mu/wp-atom.php
%{_datadir}/wordpress-mu/wp-app.php
%{_datadir}/wordpress-mu/wp-blog-header.php
%{_datadir}/wordpress-mu/wp-comments-post.php
%{_datadir}/wordpress-mu/wp-commentsrss2.php
%{_datadir}/wordpress-mu/wp-config-sample.php
%{_datadir}/wordpress-mu/wp-cron.php
%{_datadir}/wordpress-mu/wp-feed.php
%{_datadir}/wordpress-mu/wp-load.php
%{_datadir}/wordpress-mu/wp-links-opml.php
%{_datadir}/wordpress-mu/wp-login.php
%{_datadir}/wordpress-mu/wp-mail.php
%{_datadir}/wordpress-mu/wp-pass.php
%{_datadir}/wordpress-mu/wp-rdf.php
%{_datadir}/wordpress-mu/wp-rss.php
%{_datadir}/wordpress-mu/wp-rss2.php
%{_datadir}/wordpress-mu/wp-settings.php
%{_datadir}/wordpress-mu/wpmu-settings.php
%{_datadir}/wordpress-mu/wp-signup.php
%{_datadir}/wordpress-mu/wp-trackback.php
%{_datadir}/wordpress-mu/xmlrpc.php
%{_datadir}/wordpress-mu/favicon.ico
%dir %{_sysconfdir}/wordpress-mu

%changelog
* Wed Sep  3 2008 Bret McMillan <bretm at redhat.com> - 2.6.1-1
- update to 2.6.1

* Tue Jul 29 2008 Bret McMillan <bretm at redhat.com> - 2.6-7
- added build section to the spec file

* Wed Jul 29 2008 Bret McMillan <bretm at redhat.com> - 2.6-6
- rebasing to wpmu 2.6

* Fri May 30 2008 Bret McMillan <bretm at redhat.com> - 1.5.1-2
- trying to clean up how we're dealing with htaccess.dist

* Mon May 26 2008 Bret McMillan <bretm at redhat.com> - 1.5.1-1
- update to 1.5.1; getting ready for Fedora submission

* Fri Apr 25 2008 Bret McMillan <bretm at redhat.com> - 1.3.3-1
- initial version; copying heuristics from the base fedora wordpress pkg



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Aug 2008 19:55:16 -0000	1.1
+++ .cvsignore	3 Sep 2008 14:35:13 -0000	1.2
@@ -0,0 +1 @@
+wordpress-mu-2.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Aug 2008 19:55:16 -0000	1.1
+++ sources	3 Sep 2008 14:35:13 -0000	1.2
@@ -0,0 +1 @@
+231c841354005a7efdfbaa0d61fc531b  wordpress-mu-2.6.1.tar.gz



From bretm at fedoraproject.org  Wed Sep  3 14:37:11 2008
From: bretm at fedoraproject.org (Bret Richard McMillan)
Date: Wed,  3 Sep 2008 14:37:11 +0000 (UTC)
Subject: rpms/wordpress-mu/F-9 README.fedora.wordpress-mu, NONE,
	1.1 import.log, 
	NONE, 1.1 wordpress-mu-httpd-conf, NONE, 1.1 wordpress-mu.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080903143711.856DB7011F@cvs1.fedora.phx.redhat.com>

Author: bretm

Update of /cvs/pkgs/rpms/wordpress-mu/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4924/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora.wordpress-mu import.log wordpress-mu-httpd-conf 
	wordpress-mu.spec 
Log Message:
importing wordpress-mu 2.6.1 into the Fedora 9 branch



--- NEW FILE README.fedora.wordpress-mu ---
Alias /wordpress-mu /usr/share/wordpress-mu

<Directory /usr/share/wordpress-mu>
  AllowOverride Options
  RewriteEngine On

  RewriteBase /wordpress-mu/

  #uploaded files
  RewriteRule ^(.*/)?files/$ index.php [L]
  RewriteRule ^(.*/)?files/(.*) wp-content/blogs.php?file=$2 [L]

  RewriteCond %{REQUEST_FILENAME} -f [OR]
  RewriteCond %{REQUEST_FILENAME} -d
  RewriteRule . - [L]
  RewriteRule  ^([_0-9a-zA-Z-]+/)?(wp-.*) $2 [L]
  RewriteRule  ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]
  RewriteRule . index.php [L]
</Directory>



--- NEW FILE import.log ---
wordpress-mu-2_6_1-1_fc8:F-9:wordpress-mu-2.6.1-1.fc8.src.rpm:1220452567


--- NEW FILE wordpress-mu-httpd-conf ---
Alias /wordpress-mu /usr/share/wordpress-mu

<Directory /usr/share/wordpress-mu>
  AllowOverride Options
  RewriteEngine On

  RewriteBase /wordpress-mu/

  #uploaded files
  RewriteRule ^(.*/)?files/$ index.php [L]
  RewriteCond %{REQUEST_URI} !.*wp-content/plugins.*
  RewriteRule ^(.*/)?files/(.*) wp-content/blogs.php?file=$2 [L]

  # add a trailing slash to /wp-admin
  RewriteCond %{REQUEST_URI} ^.*/wp-admin$
  RewriteRule ^(.+)$ $1/ [R=301,L]

  RewriteCond %{REQUEST_FILENAME} -f [OR]
  RewriteCond %{REQUEST_FILENAME} -d
  RewriteRule . - [L]
  RewriteRule  ^([_0-9a-zA-Z-]+/)?(wp-.*) $2 [L]
  RewriteRule  ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]
  RewriteRule . index.php [L]
</Directory>



--- NEW FILE wordpress-mu.spec ---
Summary: WordPress-MU multi-user blogging software
URL: http://mu.wordpress.org/latest.tar.gz
Name: wordpress-mu
Version: 2.6.1
Release: 1%{?dist}
Group: Applications/Publishing
License: GPLv2
Source0: %{name}-%{version}.tar.gz
Source1: wordpress-mu-httpd-conf
Source2: README.fedora.wordpress-mu
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: php >= 4.1.0, httpd, php-mysql
BuildArch: noarch

%description
WordPress-MU is a derivative of the WordPress blogging codebase, to allow
one instance to serve multiple users.

%prep
%setup -q

# disable-wordpress-core-update, updates are always installed via rpm
#
# the sed script from wordpress.spec doesn't work due to if/else statement in upstream wordpress-mu's update.php
# sed -i -e "s,add_action,#add_action,g" wp-includes/update.php

echo "<?php // update script removed, updates via RPMs for Fedora ?>" > wp-includes/update.php

%build


%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_datadir}/wordpress-mu
mkdir -p %{buildroot}%{_sysconfdir}/wordpress-mu
install -m 0644 -D -p %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/wordpress-mu.conf
install -m 0644 -D -p %{SOURCE2} %{buildroot}%{_docdir}/%{name}-%{version}/README.fedora

cp -pr * %{buildroot}%{_datadir}/wordpress-mu

# fix weird upstream perms...
chmod 0644 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/css/content.css
chmod 0664 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js
chmod 0664 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/config.php


# since we're using /etc/httpd/conf.d, don't do the funky .htaccess stuff
# that the installer wants
echo "# please see /etc/httpd/conf.d/wordpress-mu.conf" > %{buildroot}%{_datadir}/wordpress-mu/htaccess.dist


# Remove empty files to make rpmlint happy
find %{buildroot} -empty -exec rm -f {} \;
# These are docs, remove them from here, docify them later
rm -f %{buildroot}%{_datadir}/wordpress-mu/{license.txt,README.txt}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/httpd/conf.d/wordpress-mu.conf
%dir %{_datadir}/wordpress-mu
%{_datadir}/wordpress-mu/htaccess.dist
%{_datadir}/wordpress-mu/wp-admin
%{_datadir}/wordpress-mu/wp-content
%{_datadir}/wordpress-mu/wp-includes
%{_datadir}/wordpress-mu/index.php
%doc license.txt
%doc README.txt
%{_datadir}/wordpress-mu/index-install.php
%{_datadir}/wordpress-mu/wp-activate.php
%{_datadir}/wordpress-mu/wp-atom.php
%{_datadir}/wordpress-mu/wp-app.php
%{_datadir}/wordpress-mu/wp-blog-header.php
%{_datadir}/wordpress-mu/wp-comments-post.php
%{_datadir}/wordpress-mu/wp-commentsrss2.php
%{_datadir}/wordpress-mu/wp-config-sample.php
%{_datadir}/wordpress-mu/wp-cron.php
%{_datadir}/wordpress-mu/wp-feed.php
%{_datadir}/wordpress-mu/wp-load.php
%{_datadir}/wordpress-mu/wp-links-opml.php
%{_datadir}/wordpress-mu/wp-login.php
%{_datadir}/wordpress-mu/wp-mail.php
%{_datadir}/wordpress-mu/wp-pass.php
%{_datadir}/wordpress-mu/wp-rdf.php
%{_datadir}/wordpress-mu/wp-rss.php
%{_datadir}/wordpress-mu/wp-rss2.php
%{_datadir}/wordpress-mu/wp-settings.php
%{_datadir}/wordpress-mu/wpmu-settings.php
%{_datadir}/wordpress-mu/wp-signup.php
%{_datadir}/wordpress-mu/wp-trackback.php
%{_datadir}/wordpress-mu/xmlrpc.php
%{_datadir}/wordpress-mu/favicon.ico
%dir %{_sysconfdir}/wordpress-mu

%changelog
* Wed Sep  3 2008 Bret McMillan <bretm at redhat.com> - 2.6.1-1
- update to 2.6.1

* Tue Jul 29 2008 Bret McMillan <bretm at redhat.com> - 2.6-7
- added build section to the spec file

* Wed Jul 29 2008 Bret McMillan <bretm at redhat.com> - 2.6-6
- rebasing to wpmu 2.6

* Fri May 30 2008 Bret McMillan <bretm at redhat.com> - 1.5.1-2
- trying to clean up how we're dealing with htaccess.dist

* Mon May 26 2008 Bret McMillan <bretm at redhat.com> - 1.5.1-1
- update to 1.5.1; getting ready for Fedora submission

* Fri Apr 25 2008 Bret McMillan <bretm at redhat.com> - 1.3.3-1
- initial version; copying heuristics from the base fedora wordpress pkg



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Aug 2008 19:55:16 -0000	1.1
+++ .cvsignore	3 Sep 2008 14:36:41 -0000	1.2
@@ -0,0 +1 @@
+wordpress-mu-2.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Aug 2008 19:55:16 -0000	1.1
+++ sources	3 Sep 2008 14:36:41 -0000	1.2
@@ -0,0 +1 @@
+231c841354005a7efdfbaa0d61fc531b  wordpress-mu-2.6.1.tar.gz



From pkgdb at fedoraproject.org  Wed Sep  3 14:40:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 14:40:50 +0000
Subject: [pkgdb] cheese had acl change status
Message-ID: <20080903144050.BF638208D10@bastion.fedora.phx.redhat.com>

mclasen has set the watchbugzilla acl on cheese (Fedora devel) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cheese



From pkgdb at fedoraproject.org  Wed Sep  3 14:40:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 14:40:51 +0000
Subject: [pkgdb] cheese had acl change status
Message-ID: <20080903144051.4A044208D14@bastion.fedora.phx.redhat.com>

mclasen has set the watchcommits acl on cheese (Fedora devel) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cheese



From pkgdb at fedoraproject.org  Wed Sep  3 14:40:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 14:40:56 +0000
Subject: [pkgdb] cheese had acl change status
Message-ID: <20080903144056.74270208D19@bastion.fedora.phx.redhat.com>

mclasen has set the commit acl on cheese (Fedora devel) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cheese



From pkgdb at fedoraproject.org  Wed Sep  3 14:41:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 14:41:02 +0000
Subject: [pkgdb] cheese had acl change status
Message-ID: <20080903144102.BD599208D6C@bastion.fedora.phx.redhat.com>

mclasen has set the watchbugzilla acl on cheese (Fedora 9) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cheese



From pkgdb at fedoraproject.org  Wed Sep  3 14:41:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 14:41:03 +0000
Subject: [pkgdb] cheese had acl change status
Message-ID: <20080903144103.99507208D81@bastion.fedora.phx.redhat.com>

mclasen has set the watchcommits acl on cheese (Fedora 9) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cheese



From pkgdb at fedoraproject.org  Wed Sep  3 14:41:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 14:41:10 +0000
Subject: [pkgdb] cheese had acl change status
Message-ID: <20080903144116.22441208D14@bastion.fedora.phx.redhat.com>

mclasen has set the commit acl on cheese (Fedora 9) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cheese



From tagoh at fedoraproject.org  Wed Sep  3 14:42:24 2008
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Wed,  3 Sep 2008 14:42:24 +0000 (UTC)
Subject: rpms/namazu/devel filter-requires-namazu.sh, 1.3, 1.4 namazu.spec, 
	1.22, 1.23
Message-ID: <20080903144224.708137011F@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/namazu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5259

Modified Files:
	filter-requires-namazu.sh namazu.spec 
Log Message:
* Wed Sep  3 2008 Akira TAGOH <tagoh at redhat.com> - 2.0.18-6
- Fix a broken deps.


Index: filter-requires-namazu.sh
===================================================================
RCS file: /cvs/pkgs/rpms/namazu/devel/filter-requires-namazu.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- filter-requires-namazu.sh	21 Nov 2007 06:41:33 -0000	1.3
+++ filter-requires-namazu.sh	3 Sep 2008 14:41:54 -0000	1.4
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/usr/lib/rpm/perl.req $* | egrep -v 'perl\((nmzidx.pl|conf.pl|document.pl|time.pl|util.pl|var.pl)\)'
+/usr/lib/rpm/perl.req $* | egrep -v 'perl\((codeconv.pl|conf.pl|document.pl|filter.pl|gettext.pl|gfilter.pl|html.pl|mailnews.pl|nmzidx.pl|ooo.pl|time.pl|util.pl|var.pl|zip.pl)\)'


Index: namazu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/namazu/devel/namazu.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- namazu.spec	1 Sep 2008 10:33:44 -0000	1.22
+++ namazu.spec	3 Sep 2008 14:41:54 -0000	1.23
@@ -4,7 +4,7 @@
 
 Name:		namazu
 Version:	2.0.18
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+
 URL:		http://www.namazu.org/
 BuildRequires:	perl >= 5.6.0, perl(NKF) >= 1.70, perl(Text::Kakasi) >= 1.00
@@ -161,6 +161,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Akira TAGOH <tagoh at redhat.com> - 2.0.18-6
+- Fix a broken deps.
+
 * Mon Sep  1 2008 Akira TAGOH <tagoh at redhat.com> - 2.0.18-5
 - Update patch to fix a fuzz issue.
 



From caolanm at fedoraproject.org  Wed Sep  3 14:52:51 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  3 Sep 2008 14:52:51 +0000 (UTC)
Subject: rpms/libgsf/devel libgsf.spec,1.58,1.59
Message-ID: <20080903145251.854CE7011F@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libgsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6225

Modified Files:
	libgsf.spec 
Log Message:
build with gnome-vfs2 compatibility for now


Index: libgsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- libgsf.spec	3 Sep 2008 14:35:04 -0000	1.58
+++ libgsf.spec	3 Sep 2008 14:52:21 -0000	1.59
@@ -12,7 +12,7 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel, perl-XML-Parser
 BuildRequires: libtool, libxml2-devel, glib2-devel, bzip2-devel, gettext
-BuildRequires: libbonobo-devel, pygtk2-devel, intltool
+BuildRequires: libbonobo-devel, pygtk2-devel, intltool, gnome-vfs2-devel
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -24,7 +24,7 @@
 Summary: GNOME integration bits for libgsf
 Group: System Environment/Libraries
 Requires: libgsf = %{version}-%{release}
-Requires: ImageMagick
+Requires: ImageMagick, gnome-vfs2
 
 %description gnome
 Libraries for using libgsf in conjunction with the GNOME applications



From twaugh at fedoraproject.org  Wed Sep  3 14:58:57 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed,  3 Sep 2008 14:58:57 +0000 (UTC)
Subject: rpms/cups/devel cups-res_init.patch,NONE,1.1 cups.spec,1.435,1.436
Message-ID: <20080903145857.A5FA87011F@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6846

Modified Files:
	cups.spec 
Added Files:
	cups-res_init.patch 
Log Message:
* Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com>
- cups-polld: reinit the resolver if we haven't yet resolved the
  hostname (bug #354071).


cups-res_init.patch:

--- NEW FILE cups-res_init.patch ---
diff -up cups-1.3.8/config.h.in.res_init cups-1.3.8/config.h.in
--- cups-1.3.8/config.h.in.res_init	2008-09-03 15:34:23.000000000 +0100
+++ cups-1.3.8/config.h.in	2008-09-03 15:34:52.000000000 +0100
@@ -365,6 +365,13 @@
 
 
 /*
+ * Do we have __res_init()?
+ */
+
+#undef HAVE_RES_INIT
+
+
+/*
  * Do we have hstrerror()?
  */
 
diff -up cups-1.3.8/config-scripts/cups-network.m4.res_init cups-1.3.8/config-scripts/cups-network.m4
--- cups-1.3.8/config-scripts/cups-network.m4.res_init	2007-12-19 01:47:57.000000000 +0000
+++ cups-1.3.8/config-scripts/cups-network.m4	2008-09-03 15:34:14.000000000 +0100
@@ -18,6 +18,7 @@ AC_SEARCH_LIBS(gethostbyaddr, nsl)
 AC_SEARCH_LIBS(getifaddrs, nsl, AC_DEFINE(HAVE_GETIFADDRS))
 AC_SEARCH_LIBS(hstrerror, nsl socket resolv, AC_DEFINE(HAVE_HSTRERROR))
 AC_SEARCH_LIBS(rresvport_af, nsl, AC_DEFINE(HAVE_RRESVPORT_AF))
+AC_SEARCH_LIBS(__res_init, resolv bind, AC_DEFINE(HAVE_RES_INIT))
 
 # Tru64 5.1b leaks file descriptors with these functions; disable until
 # we can come up with a test for this...
diff -up cups-1.3.8/configure.res_init cups-1.3.8/configure
--- cups-1.3.8/configure.res_init	2008-09-03 15:34:14.000000000 +0100
+++ cups-1.3.8/configure	2008-09-03 15:34:14.000000000 +0100
@@ -12189,6 +12189,92 @@ _ACEOF
 
 fi
 
+{ echo "$as_me:$LINENO: checking for library containing __res_init" >&5
+echo $ECHO_N "checking for library containing __res_init... $ECHO_C" >&6; }
+if test "${ac_cv_search___res_init+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_func_search_save_LIBS=$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 __res_init ();
+int
+main ()
+{
+return __res_init ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' resolv bind; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  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_search___res_init=$ac_res
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search___res_init+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search___res_init+set}" = set; then
+  :
+else
+  ac_cv_search___res_init=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_search___res_init" >&5
+echo "${ECHO_T}$ac_cv_search___res_init" >&6; }
+ac_res=$ac_cv_search___res_init
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  cat >>confdefs.h <<\_ACEOF
+#define HAVE_RES_INIT 1
+_ACEOF
+
+fi
+
 
 # Tru64 5.1b leaks file descriptors with these functions; disable until
 # we can come up with a test for this...
diff -up cups-1.3.8/scheduler/cups-polld.c.res_init cups-1.3.8/scheduler/cups-polld.c
--- cups-1.3.8/scheduler/cups-polld.c.res_init	2008-01-08 00:16:30.000000000 +0000
+++ cups-1.3.8/scheduler/cups-polld.c	2008-09-03 15:34:14.000000000 +0100
@@ -155,6 +155,18 @@ main(int  argc,				/* I - Number of comm
       restart_polling = 0;
       httpClose(http);
 
+#ifdef HAVE_RES_INIT
+      if (!http)
+      {
+       /*
+	* Reinit the resolver so that it doesn't cache a previous
+	* hostname lookup failure.  This fixes the situation where a
+	* network interface becomes available after polling starts.
+	*/
+	__res_init ();
+      }
+#endif /* HAVE_RES_INIT */
+
       if ((http = httpConnectEncrypt(argv[1], atoi(argv[2]),
                                      cupsEncryption())) == NULL)
       {


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -r1.435 -r1.436
--- cups.spec	11 Aug 2008 16:34:51 -0000	1.435
+++ cups.spec	3 Sep 2008 14:58:27 -0000	1.436
@@ -49,6 +49,7 @@
 Patch22: cups-getnameddest.patch
 Patch23: cups-str2892.patch
 Patch24: cups-str2101.patch
+Patch25: cups-res_init.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -172,6 +173,7 @@
 %patch22 -p1 -b .getnameddest
 %patch23 -p1 -b .str2892
 %patch24 -p1 -b .str2101
+%patch25 -p1 -b .res_init
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -459,6 +461,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com>
+- cups-polld: reinit the resolver if we haven't yet resolved the
+  hostname (bug #354071).
+
 * Mon Aug 11 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.8-4
 - Better password prompting behaviour (bug #215133, STR #2101).
 



From twaugh at fedoraproject.org  Wed Sep  3 15:01:25 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed,  3 Sep 2008 15:01:25 +0000 (UTC)
Subject: rpms/cups/F-9 cups-res_init.patch,NONE,1.1 cups.spec,1.421,1.422
Message-ID: <20080903150125.697D07011F@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7104

Modified Files:
	cups.spec 
Added Files:
	cups-res_init.patch 
Log Message:
* Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com>
- cups-polld: reinit the resolver if we haven't yet resolved the
  hostname (bug #354071).


cups-res_init.patch:

--- NEW FILE cups-res_init.patch ---
diff -up cups-1.3.8/config.h.in.res_init cups-1.3.8/config.h.in
--- cups-1.3.8/config.h.in.res_init	2008-09-03 15:59:04.000000000 +0100
+++ cups-1.3.8/config.h.in	2008-09-03 15:59:11.000000000 +0100
@@ -365,6 +365,13 @@
 
 
 /*
+ * Do we have __res_init()?
+ */
+
+#undef HAVE_RES_INIT
+
+
+/*
  * Do we have hstrerror()?
  */
 
diff -up cups-1.3.8/config-scripts/cups-network.m4.res_init cups-1.3.8/config-scripts/cups-network.m4
--- cups-1.3.8/config-scripts/cups-network.m4.res_init	2007-12-19 01:47:57.000000000 +0000
+++ cups-1.3.8/config-scripts/cups-network.m4	2008-09-03 15:59:11.000000000 +0100
@@ -18,6 +18,7 @@ AC_SEARCH_LIBS(gethostbyaddr, nsl)
 AC_SEARCH_LIBS(getifaddrs, nsl, AC_DEFINE(HAVE_GETIFADDRS))
 AC_SEARCH_LIBS(hstrerror, nsl socket resolv, AC_DEFINE(HAVE_HSTRERROR))
 AC_SEARCH_LIBS(rresvport_af, nsl, AC_DEFINE(HAVE_RRESVPORT_AF))
+AC_SEARCH_LIBS(__res_init, resolv bind, AC_DEFINE(HAVE_RES_INIT))
 
 # Tru64 5.1b leaks file descriptors with these functions; disable until
 # we can come up with a test for this...
diff -up cups-1.3.8/configure.res_init cups-1.3.8/configure
--- cups-1.3.8/configure.res_init	2008-09-03 15:59:04.000000000 +0100
+++ cups-1.3.8/configure	2008-09-03 15:59:11.000000000 +0100
@@ -12192,6 +12192,92 @@ _ACEOF
 
 fi
 
+{ echo "$as_me:$LINENO: checking for library containing __res_init" >&5
+echo $ECHO_N "checking for library containing __res_init... $ECHO_C" >&6; }
+if test "${ac_cv_search___res_init+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_func_search_save_LIBS=$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 __res_init ();
+int
+main ()
+{
+return __res_init ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' resolv bind; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  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_search___res_init=$ac_res
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search___res_init+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search___res_init+set}" = set; then
+  :
+else
+  ac_cv_search___res_init=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_search___res_init" >&5
+echo "${ECHO_T}$ac_cv_search___res_init" >&6; }
+ac_res=$ac_cv_search___res_init
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  cat >>confdefs.h <<\_ACEOF
+#define HAVE_RES_INIT 1
+_ACEOF
+
+fi
+
 
 # Tru64 5.1b leaks file descriptors with these functions; disable until
 # we can come up with a test for this...
diff -up cups-1.3.8/scheduler/cups-polld.c.res_init cups-1.3.8/scheduler/cups-polld.c
--- cups-1.3.8/scheduler/cups-polld.c.res_init	2008-01-08 00:16:30.000000000 +0000
+++ cups-1.3.8/scheduler/cups-polld.c	2008-09-03 15:59:11.000000000 +0100
@@ -155,6 +155,18 @@ main(int  argc,				/* I - Number of comm
       restart_polling = 0;
       httpClose(http);
 
+#ifdef HAVE_RES_INIT
+      if (!http)
+      {
+       /*
+	* Reinit the resolver so that it doesn't cache a previous
+	* hostname lookup failure.  This fixes the situation where a
+	* network interface becomes available after polling starts.
+	*/
+	__res_init ();
+      }
+#endif /* HAVE_RES_INIT */
+
       if ((http = httpConnectEncrypt(argv[1], atoi(argv[2]),
                                      cupsEncryption())) == NULL)
       {


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -r1.421 -r1.422
--- cups.spec	5 Aug 2008 08:38:35 -0000	1.421
+++ cups.spec	3 Sep 2008 15:00:55 -0000	1.422
@@ -48,6 +48,7 @@
 Patch21: cups-usb-paperout.patch
 Patch22: cups-getnameddest.patch
 Patch23: cups-str2892.patch
+Patch24: cups-res_init.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -166,6 +167,7 @@
 %patch21 -p1 -b .usb-paperout
 %patch22 -p1 -b .getnameddest
 %patch23 -p1 -b .str2892
+%patch24 -p1 -b .res_init
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -448,6 +450,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com>
+- cups-polld: reinit the resolver if we haven't yet resolved the
+  hostname (bug #354071).
+
 * Tue Aug  5 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.8-2
 - Mark template files config(noreplace) for site-local modifications
   (bug #441719).



From nphilipp at fedoraproject.org  Wed Sep  3 15:25:07 2008
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed,  3 Sep 2008 15:25:07 +0000 (UTC)
Subject: rpms/sane-backends/devel sane-backends-1.0.19-glibc-2.7.patch, NONE,
	1.1 sane-backends.spec, 1.110,
	1.111 sane-backends-1.0.18-glibc-2.7.patch, 1.2, NONE
Message-ID: <20080903152507.EB5157011F@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-backends/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9117

Modified Files:
	sane-backends.spec 
Added Files:
	sane-backends-1.0.19-glibc-2.7.patch 
Removed Files:
	sane-backends-1.0.18-glibc-2.7.patch 
Log Message:
update glibc-2.7 patch to apply without fuzz


sane-backends-1.0.19-glibc-2.7.patch:

--- NEW FILE sane-backends-1.0.19-glibc-2.7.patch ---
diff -up sane-backends-1.0.19/backend/mustek_pp.c.glibc-2.7 sane-backends-1.0.19/backend/mustek_pp.c
--- sane-backends-1.0.19/backend/mustek_pp.c.glibc-2.7	2005-04-10 13:53:16.000000000 +0200
+++ sane-backends-1.0.19/backend/mustek_pp.c	2008-09-03 17:15:12.000000000 +0200
@@ -1152,7 +1152,7 @@ sane_open (SANE_String_Const devicename,
 
 	}
 	
-	if ((status = dev->func->open (dev->port, dev->caps, &fd)) != SANE_STATUS_GOOD) {
+	if ((status = (dev->func->open) (dev->port, dev->caps, &fd)) != SANE_STATUS_GOOD) {
 
 		DBG (1, "sane_open: could not open device (%s)\n",
 				sane_strstatus (status));
diff -up sane-backends-1.0.19/backend/pixma_common.c.glibc-2.7 sane-backends-1.0.19/backend/pixma_common.c
--- sane-backends-1.0.19/backend/pixma_common.c.glibc-2.7	2007-04-09 22:41:25.000000000 +0200
+++ sane-backends-1.0.19/backend/pixma_common.c	2008-09-03 17:20:36.000000000 +0200
@@ -500,7 +500,7 @@ pixma_open (unsigned devnr, pixma_t ** h
   strncpy (s->id, pixma_get_device_id (devnr), sizeof (s->id) - 1);
   s->ops = s->cfg->ops;
   s->scanning = 0;
-  error = s->ops->open (s);
+  error = (s->ops->open) (s);
   if (error < 0)
     goto rollback;
   *handle = s;
diff -up sane-backends-1.0.19/backend/plustek_pp.c.glibc-2.7 sane-backends-1.0.19/backend/plustek_pp.c
--- sane-backends-1.0.19/backend/plustek_pp.c.glibc-2.7	2007-11-18 11:59:18.000000000 +0100
+++ sane-backends-1.0.19/backend/plustek_pp.c	2008-09-03 17:15:12.000000000 +0200
@@ -258,7 +258,7 @@ static int drvopen(	Plustek_Device *dev 
 
     DBG( _DBG_INFO, "drvopen()\n" );
 
-	handle = dev->open((const char*)dev->name, (void *)dev );
+	handle = (dev->open)((const char*)dev->name, (void *)dev );
 
 	tsecs = 0;
 
diff -up sane-backends-1.0.19/sanei/sanei_scsi.c.glibc-2.7 sane-backends-1.0.19/sanei/sanei_scsi.c
--- sane-backends-1.0.19/sanei/sanei_scsi.c.glibc-2.7	2007-11-16 19:37:07.000000000 +0100
+++ sane-backends-1.0.19/sanei/sanei_scsi.c	2008-09-03 17:15:12.000000000 +0200
@@ -5072,7 +5072,7 @@ sanei_scsi_find_devices (const char *fin
     (*plugInInterface)->Release (plugInInterface);
     IOObjectRelease (scsiDevice);
 
-    ioReturnValue = (*scsiDeviceInterface)->open (scsiDeviceInterface);
+    ioReturnValue = ((*scsiDeviceInterface)->open) (scsiDeviceInterface);
     if (ioReturnValue != kIOReturnSuccess)
       {
 	DBG (5, "Error opening SCSI interface (0x%08x)\n", ioReturnValue);


Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- sane-backends.spec	27 Mar 2008 10:23:43 -0000	1.110
+++ sane-backends.spec	3 Sep 2008 15:24:37 -0000	1.111
@@ -1,7 +1,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.19
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
 Group: System Environment/Libraries
 Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -10,7 +10,7 @@
 Patch0: sane-backends-1.0.19-acinclude.patch.bz2
 Patch1: sane-backends-1.0.18-rpath.patch
 Patch2: sane-backends-1.0.19-pkgconfig.patch
-Patch3: sane-backends-1.0.18-glibc-2.7.patch
+Patch3: sane-backends-1.0.19-glibc-2.7.patch
 Patch4: sane-backends-1.0.19-policykit.patch
 Patch5: sane-backends-1.0.19-uninitialized.patch
 URL: http://www.sane-project.org
@@ -159,6 +159,9 @@
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Wed Sep 03 2008 Nils Philippsen <nphilipp at redhat.com> - 1.0.19-11
+- update glibc-2.7 patch to apply without fuzz
+
 * Thu Mar 27 2008 Nils Philippsen <nphilipp at redhat.com> - 1.0.19-10
 - rename 60-libsane.fdi to 19-libsane.fdi so that hal-acl-tool callouts get
   added (#438827)


--- sane-backends-1.0.18-glibc-2.7.patch DELETED ---



From twaugh at fedoraproject.org  Wed Sep  3 15:45:39 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed,  3 Sep 2008 15:45:39 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic.spec, 1.199,
	1.200 foomatic-ppdload-ppd.patch, 1.1,
	NONE foomatic-ppdload.patch, 1.3, NONE
Message-ID: <20080903154539.A02367011F@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9943

Modified Files:
	foomatic.spec 
Removed Files:
	foomatic-ppdload-ppd.patch foomatic-ppdload.patch 
Log Message:
* Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com>
- Finally remove ppdload.



Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- foomatic.spec	2 Sep 2008 16:04:14 -0000	1.199
+++ foomatic.spec	3 Sep 2008 15:45:09 -0000	1.200
@@ -27,10 +27,6 @@
 # Set GS_FONTPATH in gs wrapper (bug #81410).
 Patch5: foomatic-2.0.2-fontpath.patch
 
-# Reinstate ppdload long enough for me to work around its disappearance.
-Patch6: foomatic-ppdload.patch
-Patch7: foomatic-ppdload-ppd.patch
-
 # Fix 3.0.2 build.
 Patch10: foomatic-db-engine-xml-cflags.patch
 
@@ -95,7 +91,6 @@
 pushd foomatic-db-engine-%{enginever}
 chmod a+x mkinstalldirs
 %patch2 -p1 -b .libdir
-%patch6 -p1 -b .ppdload
 %patch14 -p1 -b .ampathxml
 %patch10 -p1 -b .xml-cflags
 %patch15 -p1
@@ -107,7 +102,6 @@
 popd
 
 pushd foomatic-db-%{dbver}
-%patch7 -p1 -b .ppdload-ppd
 %patch19 -p1 -b .459847
 %patch21 -p1 -b .hpclj9500mfp
 
@@ -252,6 +246,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com>
+- Finally remove ppdload.
+
 * Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-64
 - Fixed typo in HP-Color_LaserJet_9500_MFP.xml.
 


--- foomatic-ppdload-ppd.patch DELETED ---


--- foomatic-ppdload.patch DELETED ---



From orion at fedoraproject.org  Wed Sep  3 15:46:48 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed,  3 Sep 2008 15:46:48 +0000 (UTC)
Subject: rpms/eclipse-photran/devel eclipse-photran.spec,1.3,1.4
Message-ID: <20080903154648.938B470121@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/eclipse-photran/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10051

Modified Files:
	eclipse-photran.spec 
Log Message:
* Wed Sep 3 2008 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-0.b4.2
- Split out IBM XL Fortran support into sub-package



Index: eclipse-photran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/eclipse-photran.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-photran.spec	28 Aug 2008 20:22:05 -0000	1.3
+++ eclipse-photran.spec	3 Sep 2008 15:46:18 -0000	1.4
@@ -8,7 +8,7 @@
 Summary:        Eclipse Fortran Development Tools (Photran) plugin
 Name:           eclipse-photran
 Version:        %{majmin}.%{patch}
-Release:        0.b4%{?dist}.1
+Release:        0.b4%{?dist}.2
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/photran
@@ -32,11 +32,7 @@
 Requires:       eclipse-platform >= 1:3.3.0
 
 # Currently, upstream CDT only supports building on the platforms listed here.
-%if %{gcj_support}
-ExclusiveArch: %{ix86} x86_64 ppc ia64
-%else
-ExclusiveArch: %{ix86} x86_64 ppc ia64
-%endif
+#ExclusiveArch: %{ix86} x86_64 ppc ia64
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 
@@ -45,6 +41,15 @@
 that are useful for Fortran development.
 
 
+%package        xlf
+Summary:        IBM XL Fortran compiler support for Photran
+Group:          Development/Libraries
+Requires:       libvirt = %{version}
+
+%description    xlf
+%{summary}.
+
+
 %prep
 %setup -q -n org.eclipse.photran-v20080808_4_0_0_Beta4
 # Fixup to use 1.5 source level
@@ -54,7 +59,7 @@
 %build
 export JAVA_HOME=%{java_home}
 export PATH=%{java_bin}:/usr/bin:$PATH
-for feature in org.eclipse.photran_feature org.eclipse.photran.vpg_feature \
+for feature in org.eclipse.photran_feature org.eclipse.photran.intel org.eclipse.photran.vpg_feature \
                org.eclipse.photran.xlf_feature
 do
   %{eclipse_base}/buildscripts/pdebuild -d cdt \
@@ -71,6 +76,9 @@
   
   unzip -o -d ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature} \
               build/rpmBuild/org.eclipse.${feature}_feature.zip
+  mv ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}/eclipse/* \
+     ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}
+  rmdir ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}/eclipse
 done
 
 %if %{gcj_support}
@@ -90,15 +98,23 @@
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc org.eclipse.photran-feature/epl-v10.html
-%{eclipse_base}/dropins/*
+%{eclipse_base}/dropins/photran
+%{eclipse_base}/dropins/photran.vpg
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
+%files xlf
+%defattr(-,root,root,-)
+%{eclipse_base}/dropins/photran.xlf
+
 
 %changelog
+* Wed Sep 3 2008 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-0.b4.2
+- Split out IBM XL Fortran support into sub-package
+
 * Thu Aug 28 2008 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-0.b4.1
 - 4.0.0 Beta 4
 - Update for building against Eclipse SDK 3.4



From orion at fedoraproject.org  Wed Sep  3 15:53:44 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed,  3 Sep 2008 15:53:44 +0000 (UTC)
Subject: rpms/eclipse-photran/devel eclipse-photran.spec,1.4,1.5
Message-ID: <20080903155344.45D547011F@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/eclipse-photran/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10842

Modified Files:
	eclipse-photran.spec 
Log Message:
CDT still isn't on ppc64



Index: eclipse-photran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/eclipse-photran.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-photran.spec	3 Sep 2008 15:46:18 -0000	1.4
+++ eclipse-photran.spec	3 Sep 2008 15:53:14 -0000	1.5
@@ -32,7 +32,7 @@
 Requires:       eclipse-platform >= 1:3.3.0
 
 # Currently, upstream CDT only supports building on the platforms listed here.
-#ExclusiveArch: %{ix86} x86_64 ppc ia64
+ExclusiveArch: %{ix86} x86_64 ppc ia64
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 



From jkeating at fedoraproject.org  Wed Sep  3 15:57:57 2008
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Wed,  3 Sep 2008 15:57:57 +0000 (UTC)
Subject: rpms/cluster/devel import.log, NONE, 1.1 .cvsignore, 1.9,
	1.10 cluster.spec, 1.13, 1.14 sources, 1.9, 1.10
Message-ID: <20080903155757.964B67011F@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11253/devel

Modified Files:
	.cvsignore cluster.spec sources 
Added Files:
	import.log 
Log Message:
Revert changes to previously built cluster package.  Changes were made to
reference as of yet nonexistant packages in Fedora, and we need to rebuild
this package to fix broken deps.



--- NEW FILE import.log ---
cluster-2_99_08-1_fc10:HEAD:cluster-2.99.08-1.fc10.src.rpm:1220457349


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	2 Sep 2008 14:24:09 -0000	1.9
+++ .cvsignore	3 Sep 2008 15:57:27 -0000	1.10
@@ -1 +1 @@
-cluster-2.99.09.tar.gz
+cluster-2.99.08.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cluster.spec	2 Sep 2008 14:24:09 -0000	1.13
+++ cluster.spec	3 Sep 2008 15:57:27 -0000	1.14
@@ -18,7 +18,7 @@
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 2.99.09
+Version: 2.99.08
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -38,9 +38,8 @@
 # Build dependencies
 BuildRequires: perl python
 BuildRequires: glibc-kernheaders glibc-devel
-BuildRequires: libxml2-devel ncurses-devel slang-devel libvolume_id-devel openldap-devel
-BuildRequires: corosync-devel >= 0.91-3 corosync-devel < 0.92
-BuildRequires: openais-devel >= 0.90-1 openais-devel < 0.91
+BuildRequires: libxml2-devel ncurses-devel slang-devel libvolume_id-devel
+BuildRequires: openais-devel >= 0.84-2 openais < 0.85 openldap-devel
 BuildRequires: perl(ExtUtils::MakeMaker)
 %if %{buildxen}
 BuildRequires: nss-devel nspr-devel libvirt-devel xen-libs
@@ -58,7 +57,6 @@
 %if %{buildxen}
   --enable_xen \
 %endif
-  --corosynclibdir=%{_libdir}/corosync \
   --openaislibdir=%{_libdir}/openais \
   --without_kernel_modules \
   --disable_kernel_check
@@ -113,8 +111,7 @@
 Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
-Requires: corosync >= 0.91-3 corosync < 0.92
-Requires: openais >= 0.90-1 openais < 0.91 sg3_utils
+Requires: openais >= 0.84-2 openais < 0.85 sg3_utils
 Requires: sg3_utils OpenIPMI telnet openssh-clients
 Requires: pexpect net-snmp-utils pyOpenSSL
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -303,11 +300,6 @@
 %{_mandir}/man8/gnbd*
 
 %changelog
-* Tue Sep  2 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.09-1
-- New upstream release.
-- Update Requires: and Buildrequires: for new versions of corosync and openais.
-- Update build section to add info about corosync libdir.
-
 * Tue Aug 12 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.08-1
 - New upstream release.
 - Drop local patch that's part of upstream.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	2 Sep 2008 14:24:09 -0000	1.9
+++ sources	3 Sep 2008 15:57:27 -0000	1.10
@@ -1 +1 @@
-ff6bd808913542075850b1053bb65f1a  cluster-2.99.09.tar.gz
+fda11d6fd53c169016166a1df0a8d847  cluster-2.99.08.tar.gz



From spot at fedoraproject.org  Wed Sep  3 16:00:51 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 16:00:51 +0000 (UTC)
Subject: rpms/python-docs/devel python-docs.spec,1.14,1.15
Message-ID: <20080903160051.90A987011F@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11442

Modified Files:
	python-docs.spec 
Log Message:
fix license tag


Index: python-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-docs/devel/python-docs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- python-docs.spec	11 Feb 2008 20:36:43 -0000	1.14
+++ python-docs.spec	3 Sep 2008 16:00:21 -0000	1.15
@@ -13,8 +13,8 @@
 Summary: Documentation for the Python programming language.
 Name: %{python}-docs
 Version: %{pybasever}
-Release: 2%{?dist}
-License: PSF - see LICENSE
+Release: 3%{?dist}
+License: Python
 Group: Documentation
 Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
 BuildArch: noarch
@@ -69,6 +69,9 @@
 %doc Misc/HISTORY Doc/html
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.5.1-3
+- fix license tag
+
 * Mon Feb 11 2008 Jame Antill <james.antill at redhat.com> - 2.5.1-2
 - mkdir a build root to keep recent rpm/mock happy.
 



From jkeating at fedoraproject.org  Wed Sep  3 16:01:01 2008
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Wed,  3 Sep 2008 16:01:01 +0000 (UTC)
Subject: rpms/cluster/devel cluster.spec,1.14,1.15
Message-ID: <20080903160101.93E007011F@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11493

Modified Files:
	cluster.spec 
Log Message:
* Wed Sep 03 2008 Jesse Keating <jkeating at redhat.com> - 2.99.08-2
- Rebuild for broken deps.



Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cluster.spec	3 Sep 2008 15:57:27 -0000	1.14
+++ cluster.spec	3 Sep 2008 16:00:31 -0000	1.15
@@ -19,7 +19,7 @@
 Name: cluster
 Summary: Red Hat Cluster
 Version: 2.99.08
-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/
@@ -300,6 +300,9 @@
 %{_mandir}/man8/gnbd*
 
 %changelog
+* Wed Sep 03 2008 Jesse Keating <jkeating at redhat.com> - 2.99.08-2
+- Rebuild for broken deps.
+
 * Tue Aug 12 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.08-1
 - New upstream release.
 - Drop local patch that's part of upstream.



From spot at fedoraproject.org  Wed Sep  3 16:01:53 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 16:01:53 +0000 (UTC)
Subject: rpms/python-feedparser/devel python-feedparser.spec,1.4,1.5
Message-ID: <20080903160153.028397011F@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-feedparser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11783

Modified Files:
	python-feedparser.spec 
Log Message:
fix license tag


Index: python-feedparser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-feedparser/devel/python-feedparser.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-feedparser.spec	29 Jun 2007 20:46:15 -0000	1.4
+++ python-feedparser.spec	3 Sep 2008 16:01:22 -0000	1.5
@@ -2,11 +2,11 @@
 
 Name:           python-feedparser
 Version:        4.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Parse RSS and Atom feeds in Python
 
 Group:          Development/Languages
-License:        BSD-ish
+License:        BSD
 URL:            http://feedparser.org/
 Source0:        http://download.sourceforge.net/feedparser/feedparser-%{version}.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.1-4
+- fix license tag
+
 * Thu Jun 28 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.1-3
 - Ghostbusting (#205413).
 - Remove manual python-abi Requires.



From pknirsch at fedoraproject.org  Wed Sep  3 16:35:05 2008
From: pknirsch at fedoraproject.org (Phil Knirsch)
Date: Wed,  3 Sep 2008 16:35:05 +0000 (UTC)
Subject: rpms/setup/devel .cvsignore, 1.53, 1.54 setup.spec, 1.58,
	1.59 sources, 1.54, 1.55
Message-ID: <20080903163505.D093E7011F@cvs1.fedora.phx.redhat.com>

Author: pknirsch

Update of /cvs/pkgs/rpms/setup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13392

Modified Files:
	.cvsignore setup.spec sources 
Log Message:
- Added SBinSanity patch as an approved feature (#458176)
- Added uidgid pair for condor
- Added uidgid pair for trousers



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/setup/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	25 Jul 2008 15:57:36 -0000	1.53
+++ .cvsignore	3 Sep 2008 16:34:35 -0000	1.54
@@ -1 +1 @@
-setup-2.7.1.tar.bz2
+setup-2.7.3.tar.bz2


Index: setup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setup/devel/setup.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- setup.spec	25 Jul 2008 15:57:36 -0000	1.58
+++ setup.spec	3 Sep 2008 16:34:35 -0000	1.59
@@ -1,6 +1,6 @@
-Summary: A set of system configuration and setup files.
+Summary: A set of system configuration and setup files
 Name: setup
-Version: 2.7.1
+Version: 2.7.3
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -76,6 +76,13 @@
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Wed Sep 03 2008 Phil Knirsch <pknirsch at redhat.com> 2.7.3-1
+- Added SBinSanity patch as an approved feature (#458176)
+
+* Wed Aug 06 2008 Phil Knirsch <pknirsch at redhat.com> 2.7.2-1
+- Added uidgid pair for condor
+- Added uidgid pair for trousers
+
 * Fri Jul 25 2008 Phil Knirsch <pknirsch at redhat.com> 2.7.1-1
 - Bump to 2.7.1 to avoid version problems with F-9
 - Removed group news as well (#437462)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/setup/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	25 Jul 2008 15:57:36 -0000	1.54
+++ sources	3 Sep 2008 16:34:35 -0000	1.55
@@ -1 +1 @@
-411120aebc89a60abd84ad60b9546f07  setup-2.7.1.tar.bz2
+a3e0f367e4a3785048ba3aac79488a83  setup-2.7.3.tar.bz2



From mschwendt at fedoraproject.org  Wed Sep  3 16:39:16 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  3 Sep 2008 16:39:16 +0000 (UTC)
Subject: rpms/xmms-sid/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xmms-sid.spec, 1.15, 1.16
Message-ID: <20080903163916.6D90E7011F@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/xmms-sid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13692

Modified Files:
	.cvsignore sources xmms-sid.spec 
Log Message:
* Wed Sep  3 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.0-0.6.beta19
- update to beta19



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmms-sid/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Aug 2007 14:56:28 -0000	1.4
+++ .cvsignore	3 Sep 2008 16:38:46 -0000	1.5
@@ -1,2 +1,2 @@
-xmms-sid-0.8.0beta17.tar.bz2.asc
-xmms-sid-0.8.0beta17.tar.bz2
+xmms-sid-0.8.0beta19.tar.bz2.asc
+xmms-sid-0.8.0beta19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmms-sid/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Aug 2007 14:56:28 -0000	1.4
+++ sources	3 Sep 2008 16:38:46 -0000	1.5
@@ -1,2 +1,2 @@
-b64945084cf71c790dc0381beae726d7  xmms-sid-0.8.0beta17.tar.bz2.asc
-c948bdac2fb0c85da030d67b583385d5  xmms-sid-0.8.0beta17.tar.bz2
+5399850d08166106a1ef7d142efa45d2  xmms-sid-0.8.0beta19.tar.bz2.asc
+1f580736787f9c4d7cbc8166d96363ba  xmms-sid-0.8.0beta19.tar.bz2


Index: xmms-sid.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-sid/devel/xmms-sid.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xmms-sid.spec	8 Feb 2008 21:50:15 -0000	1.15
+++ xmms-sid.spec	3 Sep 2008 16:38:46 -0000	1.16
@@ -1,33 +1,35 @@
 %define xmms_inputdir %(xmms-config --input-plugin-dir)
 
-Summary: SIDPlay input plugin for X MultiMedia System (XMMS)
+%define sourceversion 0.8.0beta19
+
+Summary: SID music input plugin for X MultiMedia System (XMMS)
 Name: xmms-sid
 Version: 0.8.0
-Release: 0.5.beta17%{?dist}
+Release: 0.6.beta19%{?dist}
 URL: http://www.tnsp.org/xmms-sid.php
 License: GPLv2+
 Group: Applications/Multimedia
-Source0: http://www.tnsp.org/xs-files/%{name}-0.8.0beta17.tar.bz2
-Source1: http://www.tnsp.org/xs-files/%{name}-0.8.0beta17.tar.bz2.asc
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Source0: http://www.tnsp.org/xs-files/%{name}-%{sourceversion}.tar.bz2
+Source1: http://www.tnsp.org/xs-files/%{name}-%{sourceversion}.tar.bz2.asc
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: xmms-devel libsidplay-devel
 BuildRequires: glib-devel gtk+-devel
 
 %description
 XMMS-SID is a plugin for XMMS (X MultiMedia System) which provides
 support for playing the so-called "SID tunes". For the actual playing,
-XMMS-SID uses the excellent libsidplay SID-chip/6502 emulator engine.
+XMMS-SID uses the libsidplay emulator engine.
 
 If you are not familiar with the term "SID tune" or "SID" concept at
 all, a short (yes it is! ;-) explanation follows:
 
-SID is the sound chip that was used in many of the old 8-bit home
-computers manufactured by Commodore Inc. in 1980's. Best known of
-those was the Commodore 64 home computer (aka C64 or CBM64, also
+SID is the MOS-6581 (and MOS-8580) sound chip that was used in many of the
+old 8-bit home computers manufactured by Commodore Inc. in 1980's. Best
+known of those was the Commodore 64 home computer (aka C64 or CBM64, also
 known as VIC-64 in some countries).
 
 %prep
-%setup -q -n %{name}-0.8.0beta17
+%setup -q -n %{name}-%{sourceversion}
 
 
 %build
@@ -53,6 +55,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.0-0.6.beta19
+- update to beta19
+
 * Fri Feb 08 2008 Michael Schwendt <mschwendt at fedoraproject.org>
 - rebuilt for GCC 4.3 as requested by Fedora Release Engineering
 



From twaugh at fedoraproject.org  Wed Sep  3 16:43:43 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed,  3 Sep 2008 16:43:43 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.436,1.437
Message-ID: <20080903164343.D22897011F@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14096

Modified Files:
	cups.spec 
Log Message:
* Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com>
- New php sub-package (bug #428235).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -r1.436 -r1.437
--- cups.spec	3 Sep 2008 14:58:27 -0000	1.436
+++ cups.spec	3 Sep 2008 16:43:13 -0000	1.437
@@ -123,6 +123,12 @@
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: xinetd
 
+%package php
+Summary: Common Unix Printing System - php module
+Group: Development/Languages
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: php-common
+
 %description
 The Common UNIX Printing System provides a portable printing layer for 
 UNIX?? operating systems. It has been developed by Easy Software Products 
@@ -147,6 +153,11 @@
 UNIX?? operating systems. This is the package that provices standard 
 lpd emulation.
 
+%description php
+The Common UNIX Printing System provides a portable printing layer for
+UNIX?? operating systems. This is the package that provices a PHP
+module. 
+
 %prep
 %setup -q -n %{name}-%{version}%{?svn:svn-r%{svn}}
 %patch1 -p1 -b .no-gzip-man
@@ -441,7 +452,6 @@
 %{_datadir}/pixmaps/cupsprinter.png
 %{_sysconfdir}/cron.daily/cups
 %{_sysconfdir}/dbus-1/system.d/cups.conf
-%{_libdir}/php/modules/*.so
 
 %files libs
 %defattr(-,root,root)
@@ -460,8 +470,13 @@
 %dir %{cups_serverbin}/daemon
 %{cups_serverbin}/daemon/cups-lpd
 
+%files php
+%defattr(-,root,root)
+%{_libdir}/php/modules/*.so
+
 %changelog
 * Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com>
+- New php sub-package (bug #428235).
 - cups-polld: reinit the resolver if we haven't yet resolved the
   hostname (bug #354071).
 



From twaugh at fedoraproject.org  Wed Sep  3 16:45:52 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed,  3 Sep 2008 16:45:52 +0000 (UTC)
Subject: rpms/cups/F-9 cups.spec,1.422,1.423
Message-ID: <20080903164552.990A47011F@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14294

Modified Files:
	cups.spec 
Log Message:
* Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com>
- The dnssd backend uses avahi-browse so require it (bug #458565).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -r1.422 -r1.423
--- cups.spec	3 Sep 2008 15:00:55 -0000	1.422
+++ cups.spec	3 Sep 2008 16:45:22 -0000	1.423
@@ -98,6 +98,9 @@
 # Requires tmpwatch for the cron.daily script (bug #218901).
 Requires: tmpwatch
 
+# The dnssd backend uses avahi-browse so require it (bug #458565).
+Requires: avahi-tools
+
 %package devel
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
@@ -451,6 +454,7 @@
 
 %changelog
 * Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com>
+- The dnssd backend uses avahi-browse so require it (bug #458565).
 - cups-polld: reinit the resolver if we haven't yet resolved the
   hostname (bug #354071).
 



From twaugh at fedoraproject.org  Wed Sep  3 16:46:38 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed,  3 Sep 2008 16:46:38 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.437,1.438
Message-ID: <20080903164638.DD89E7011F@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14372

Modified Files:
	cups.spec 
Log Message:
* Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com>
- The dnssd backend uses avahi-browse so require it (bug #458565).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -r1.437 -r1.438
--- cups.spec	3 Sep 2008 16:43:13 -0000	1.437
+++ cups.spec	3 Sep 2008 16:46:08 -0000	1.438
@@ -103,6 +103,9 @@
 # Require the package here so that we know /etc/portreserve/ exists.
 Requires: portreserve
 
+# The dnssd backend uses avahi-browse so require it (bug #458565).
+Requires: avahi-tools
+
 %package devel
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
@@ -476,6 +479,7 @@
 
 %changelog
 * Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com>
+- The dnssd backend uses avahi-browse so require it (bug #458565).
 - New php sub-package (bug #428235).
 - cups-polld: reinit the resolver if we haven't yet resolved the
   hostname (bug #354071).



From twaugh at fedoraproject.org  Wed Sep  3 16:47:24 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed,  3 Sep 2008 16:47:24 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.438,1.439
Message-ID: <20080903164724.CE9037011F@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14416

Modified Files:
	cups.spec 
Log Message:
1.3.8-5


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- cups.spec	3 Sep 2008 16:46:08 -0000	1.438
+++ cups.spec	3 Sep 2008 16:46:54 -0000	1.439
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.8
-Release: 4%{?svn:.svn%{svn}}%{?dist}
+Release: 5%{?svn:.svn%{svn}}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@@ -478,7 +478,7 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
-* Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com>
+* Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.8-5
 - The dnssd backend uses avahi-browse so require it (bug #458565).
 - New php sub-package (bug #428235).
 - cups-polld: reinit the resolver if we haven't yet resolved the



From mschwendt at fedoraproject.org  Wed Sep  3 16:48:36 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  3 Sep 2008 16:48:36 +0000 (UTC)
Subject: rpms/xmms-sid/devel xmms-sid.spec,1.16,1.17
Message-ID: <20080903164836.0E06E7011F@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/xmms-sid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14591

Modified Files:
	xmms-sid.spec 
Log Message:
remove unpackaged file that cannot be included


Index: xmms-sid.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-sid/devel/xmms-sid.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xmms-sid.spec	3 Sep 2008 16:38:46 -0000	1.16
+++ xmms-sid.spec	3 Sep 2008 16:48:05 -0000	1.17
@@ -41,6 +41,7 @@
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 rm -f %{buildroot}/%{xmms_inputdir}/*.la
+rm -f %{_datadir}/%{name}/Kummatti_City.sid
 %find_lang %{name}
 
 



From spot at fedoraproject.org  Wed Sep  3 16:50:12 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 16:50:12 +0000 (UTC)
Subject: rpms/python-gammu/devel python-gammu.spec,1.9,1.10
Message-ID: <20080903165012.2E7107011F@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-gammu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14914

Modified Files:
	python-gammu.spec 
Log Message:
fix license tag


Index: python-gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gammu/devel/python-gammu.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-gammu.spec	25 Aug 2008 09:32:31 -0000	1.9
+++ python-gammu.spec	3 Sep 2008 16:49:41 -0000	1.10
@@ -2,11 +2,11 @@
 
 Name:		python-gammu
 Version:	0.26        
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Python bindings for Gammu
 
 Group:		Development/Languages
-License:	GPL
+License:	GPLv2
 URL:		http://cihar.com/gammu/python/
 Source0:	ftp://dl.cihar.com/python-gammu/latest/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.26-2
+- fix license tag
+
 * Mon Aug 25 2008 Xavier Lamien <lxtnow at gmail.com> - 0.26-1
 - Update release.
 



From mschwendt at fedoraproject.org  Wed Sep  3 16:56:04 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  3 Sep 2008 16:56:04 +0000 (UTC)
Subject: rpms/xmms-sid/devel xmms-sid.spec,1.17,1.18
Message-ID: <20080903165604.B18EF7011F@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/xmms-sid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15407

Modified Files:
	xmms-sid.spec 
Log Message:
remove unpackaged file that cannot be included


Index: xmms-sid.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-sid/devel/xmms-sid.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xmms-sid.spec	3 Sep 2008 16:48:05 -0000	1.17
+++ xmms-sid.spec	3 Sep 2008 16:55:34 -0000	1.18
@@ -41,7 +41,7 @@
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 rm -f %{buildroot}/%{xmms_inputdir}/*.la
-rm -f %{_datadir}/%{name}/Kummatti_City.sid
+rm -f %{buildroot}%{_datadir}/%{name}/Kummatti_City.sid
 %find_lang %{name}
 
 



From spot at fedoraproject.org  Wed Sep  3 16:57:07 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 16:57:07 +0000 (UTC)
Subject: rpms/python-htmltmpl/devel python-htmltmpl.spec,1.4,1.5
Message-ID: <20080903165707.ABC667011F@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-htmltmpl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15680

Modified Files:
	python-htmltmpl.spec 
Log Message:
fix license tag


Index: python-htmltmpl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-htmltmpl/devel/python-htmltmpl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-htmltmpl.spec	2 Feb 2007 13:56:52 -0000	1.4
+++ python-htmltmpl.spec	3 Sep 2008 16:56:37 -0000	1.5
@@ -2,11 +2,12 @@
 
 Name:           python-htmltmpl
 Version:        1.22
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Templating engine for separation of code and HTML
 
 Group:          Development/Libraries
-License:        GPL
+# No version specified.
+License:        GPL+
 URL:            http://htmltmpl.sourceforge.net/
 Source0:        http://dl.sourceforge.net/htmltmpl/htmltmpl-%{version}.tar.gz
 Patch0:         %{name}-1.22-performance.patch
@@ -37,13 +38,6 @@
 EOT
 exit 1
 
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q -n htmltmpl-%{version}
 %patch0 -p0
 %patch1 -p0
@@ -79,6 +73,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.22-9
+- fix license tag
+
 * Sat Dec 23 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.22-8
 - Rebuild with Python 2.5.
 - BuildRequires: python-devel.



From spot at fedoraproject.org  Wed Sep  3 16:58:31 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 16:58:31 +0000 (UTC)
Subject: rpms/python-id3/devel python-id3.spec,1.4,1.5
Message-ID: <20080903165831.794067011F@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-id3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15912

Modified Files:
	python-id3.spec 
Log Message:
fix license tag


Index: python-id3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-id3/devel/python-id3.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-id3.spec	2 Feb 2007 13:56:56 -0000	1.4
+++ python-id3.spec	3 Sep 2008 16:58:01 -0000	1.5
@@ -2,11 +2,11 @@
 
 Name:           python-id3
 Version:        1.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        ID3 tag library for Python
 
 Group:          Development/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://id3-py.sourceforge.net/
 Source0:        http://dl.sourceforge.net/id3-py/id3-py_%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,13 +31,6 @@
 EOT
 exit 1
 
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q -n id3-py-%{version}
 
 
@@ -61,6 +54,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2-10
+- fix license tag
+
 * Sat Dec 23 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.2-9
 - Rebuild with Python 2.5.
 - BuildRequires: python-devel is now necessary for a successful build.



From spot at fedoraproject.org  Wed Sep  3 17:00:42 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 17:00:42 +0000 (UTC)
Subject: rpms/python-irclib/devel python-irclib.spec,1.7,1.8
Message-ID: <20080903170042.956937011F@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-irclib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16174

Modified Files:
	python-irclib.spec 
Log Message:
fix license tag


Index: python-irclib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-irclib/devel/python-irclib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-irclib.spec	9 Feb 2008 03:03:52 -0000	1.7
+++ python-irclib.spec	3 Sep 2008 17:00:12 -0000	1.8
@@ -3,11 +3,11 @@
 
 Name: python-irclib
 Version: 0.4.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A set of Python modules for IRC support
 
 Group: Development/Libraries
-License: LGPL
+License: LGPLv2+
 URL: http://python-irclib.sourceforge.net
 Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,6 +42,9 @@
 %{python_sitelib}/python_irclib-%{version}-py%{pyver}.egg-info/
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.4.6-6
+- fix license tag
+
 * Fri Feb  8 2008 Luke Macken <lmacken at redhat.com> 0.4.6-5
 - Include our new egg-info
 



From spot at fedoraproject.org  Wed Sep  3 17:01:35 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 17:01:35 +0000 (UTC)
Subject: rpms/python-isprelink/devel python-isprelink.spec,1.3,1.4
Message-ID: <20080903170135.8FC2A7011F@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-isprelink/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16347

Modified Files:
	python-isprelink.spec 
Log Message:
fix license tag


Index: python-isprelink.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-isprelink/devel/python-isprelink.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-isprelink.spec	19 Feb 2008 06:05:22 -0000	1.3
+++ python-isprelink.spec	3 Sep 2008 17:01:05 -0000	1.4
@@ -2,11 +2,11 @@
 
 Name:           python-isprelink
 Version:        0.1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python module to determine if a file has been prelinked
 
 Group:          Development/Languages
-License:        GPL
+License:        GPLv2+
 URL:            http://trac.mcs.anl.gov/projects/bcfg2
 Source0:        ftp://ftp.mcs.anl.gov/pub/bcfg/isprelink-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,6 +36,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.1.2-5
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.2-4
 - Autorebuild for GCC 4.3
 



From dcnomura at fedoraproject.org  Wed Sep  3 17:17:41 2008
From: dcnomura at fedoraproject.org (Dave Nomura)
Date: Wed,  3 Sep 2008 17:17:41 +0000 (UTC)
Subject: rpms/stapitrace/devel stapitrace.spec,1.9,1.10
Message-ID: <20080903171741.3E3737011F@cvs1.fedora.phx.redhat.com>

Author: dcnomura

Update of /cvs/pkgs/rpms/stapitrace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16097

Modified Files:
	stapitrace.spec 
Log Message:
Added dependencies for libbfd and libopcodes



Index: stapitrace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stapitrace/devel/stapitrace.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- stapitrace.spec	3 Aug 2008 15:13:57 -0000	1.9
+++ stapitrace.spec	3 Sep 2008 17:17:10 -0000	1.10
@@ -6,7 +6,7 @@
 Name:		stapitrace
 Summary:	Instruction Tracing Tool
 Version:	1.0.0
-Release:	6.%{alphatag}%{?dist}
+Release:	8.%{alphatag}%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://sourceforge.net/projects/perfinsp
@@ -14,7 +14,7 @@
 Patch0:		itrace_fix1.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:	systemtap systemtap-runtime
-BuildRequires:	binutils binutils-devel autoconf automake
+BuildRequires:	binutils binutils-devel autoconf automake libbfd libopcodes
 ExclusiveArch:	ppc
 
 %description



From overholt at fedoraproject.org  Wed Sep  3 17:24:04 2008
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed,  3 Sep 2008 17:24:04 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.586,1.587
Message-ID: <20080903172404.E20C97011F@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17759

Modified Files:
	eclipse.spec 
Log Message:
* Tue Sep 02 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-23
- Use icu4j in its new place.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.586
retrieving revision 1.587
diff -u -r1.586 -r1.587
--- eclipse.spec	27 Aug 2008 22:42:32 -0000	1.586
+++ eclipse.spec	3 Sep 2008 17:23:34 -0000	1.587
@@ -1,5 +1,4 @@
 # TODO:
-# - update icu4j and jasper to use %%{_libdir}/eclipse and not %%{_datadir}/eclipse after we build 3.4
 # - update ecj-rpmdebuginfo patch
 # - look at startup script and launcher patches
 # - get Ganymede update site pre-configured
@@ -23,7 +22,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        22%{?dist} 
+Release:        23%{?dist} 
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -168,7 +167,7 @@
 BuildRequires:  mesa-libGLU-devel
 BuildRequires:  cairo >= 1.0
 BuildRequires:  unzip
-BuildRequires:  icu4j-eclipse >= 3.8.1
+BuildRequires:  icu4j-eclipse >= 3.8.1-3
 BuildRequires:  tomcat5-jasper-eclipse >= 5.5.26-1.5
 BuildRequires:  desktop-file-utils
 BuildRequires:  java-devel >= 1.6.0
@@ -232,7 +231,7 @@
 # FIXME:  investigate.  Can we just add a %{arch} to the above?
 ## This file-level requirement is for the bi-arch multilib case
 #Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar
-Requires:       icu4j-eclipse >= 3.8.1
+Requires:       icu4j-eclipse >= 3.8.1-3
 Requires:       java >= 1.6.0
 
 %description    rcp
@@ -357,6 +356,7 @@
 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
@@ -565,7 +565,7 @@
 # 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 %{_datadir}/eclipse/plugins/com.ibm.icu_*.jar plugins/com.ibm.icu_$ICUVERSION
+ln -s %{_libdir}/eclipse/plugins/com.ibm.icu_*.jar plugins/com.ibm.icu_$ICUVERSION
 
 # link to lucene
 LUCENEVERSION=$(ls plugins | grep org.apache.lucene_ | \
@@ -1210,7 +1210,6 @@
 # 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 %{_datadir}/eclipse/plugins/com.ibm.icu_*.jar plugins/com.ibm.icu_$ICUVERSION
 
 # link to lucene
 LUCENEVERSION=$(ls plugins | grep org.apache.lucene_ | \
@@ -1517,6 +1516,9 @@
 %{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Sep 02 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-23
+- Use icu4j in its new place.
+
 * Wed Aug 27 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-22
 - Add test framework
 - Remove two duplicate lines in eclipse-mv-Platform.sh



From spot at fedoraproject.org  Wed Sep  3 17:35:36 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 17:35:36 +0000 (UTC)
Subject: rpms/python-json/devel python-json.spec,1.4,1.5
Message-ID: <20080903173536.AB5FD7011F@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-json/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18439

Modified Files:
	python-json.spec 
Log Message:
fix license tag


Index: python-json.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-json/devel/python-json.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-json.spec	10 Dec 2006 03:36:33 -0000	1.4
+++ python-json.spec	3 Sep 2008 17:35:06 -0000	1.5
@@ -5,11 +5,11 @@
 Name:           python-json
 Version:        3.4
 %define version_munge %(sed 's/\\./_/g' <<< %{version})
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A JSON reader and writer for Python
 
 Group:          Development/Languages
-License:        LGPL
+License:        LGPLv2+
 URL:            https://sourceforge.net/projects/json-py/
 Source0:        http://dl.sourceforge.net/json-py/json-py-%{version_munge}.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,9 @@
 %{python_sitelib}/*.py[co]
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 3.4-4
+- fix license tag
+
 * Sat Dec  9 2006 Luke Macken <lmacken at redhat.com> 3.4-3
 - Rebuild for python 2.5
 



From orion at fedoraproject.org  Wed Sep  3 17:40:43 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed,  3 Sep 2008 17:40:43 +0000 (UTC)
Subject: rpms/environment-modules/devel environment-modules.spec,1.16,1.17
Message-ID: <20080903174043.7D7DC7011F@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18712

Modified Files:
	environment-modules.spec 
Log Message:
* Wed Sep 3 2008 - Orion Poplawski <orion at cora.nwra.com> - 3.2.6-6
- Change %patch -> %patch0



Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/devel/environment-modules.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- environment-modules.spec	14 Mar 2008 15:07:31 -0000	1.16
+++ environment-modules.spec	3 Sep 2008 17:40:13 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           environment-modules
 Version:        3.2.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
@@ -36,7 +36,7 @@
 
 %prep
 %setup -q -n modules-%{version}
-%patch -p1 -b .versioning
+%patch0 -p1 -b .versioning
 
 
 %build
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Wed Sep 3 2008 - Orion Poplawski <orion at cora.nwra.com> - 3.2.6-6
+- Change %%patch -> %%patch0
+
 * Fri Mar 14 2008 - Orion Poplawski <orion at cora.nwra.com> - 3.2.6-5
 - Add BR libX11-devel so modulecmd can handle X resources
 



From orion at fedoraproject.org  Wed Sep  3 17:51:26 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed,  3 Sep 2008 17:51:26 +0000 (UTC)
Subject: rpms/gifsicle/devel .cvsignore, 1.2, 1.3 gifsicle.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20080903175126.2A3F770120@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gifsicle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19785

Modified Files:
	.cvsignore gifsicle.spec sources 
Log Message:
* Wed Sep 3 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.52-1
- Update to 1.52



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gifsicle/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Jul 2007 15:29:09 -0000	1.2
+++ .cvsignore	3 Sep 2008 17:50:55 -0000	1.3
@@ -1 +1 @@
-gifsicle-1.48.tar.gz
+gifsicle-1.52.tar.gz


Index: gifsicle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gifsicle/devel/gifsicle.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gifsicle.spec	9 Feb 2008 17:45:18 -0000	1.3
+++ gifsicle.spec	3 Sep 2008 17:50:55 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gifsicle
-Version:        1.48
-Release:        4%{?dist}
+Version:        1.52
+Release:        1%{?dist}
 Summary:        Powerful program for manipulating GIF images and animations
 
 Group:          Applications/File
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Wed Sep 3 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.52-1
+- Update to 1.52
+
 * Sat Feb  9 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.48-4
 - Rebuild for gcc 3.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gifsicle/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Jul 2007 15:29:09 -0000	1.2
+++ sources	3 Sep 2008 17:50:55 -0000	1.3
@@ -1 +1 @@
-3857d3d920180f2b9bac32c7b1a2e276  gifsicle-1.48.tar.gz
+b68d3a08368656b1dfc4066d65c07a05  gifsicle-1.52.tar.gz



From orion at fedoraproject.org  Wed Sep  3 17:56:25 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed,  3 Sep 2008 17:56:25 +0000 (UTC)
Subject: rpms/gifsicle/devel gifsicle.spec,1.4,1.5
Message-ID: <20080903175625.339B97011F@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gifsicle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20190

Modified Files:
	gifsicle.spec 
Log Message:
No more ChangeLog



Index: gifsicle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gifsicle/devel/gifsicle.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gifsicle.spec	3 Sep 2008 17:50:55 -0000	1.4
+++ gifsicle.spec	3 Sep 2008 17:55:54 -0000	1.5
@@ -67,7 +67,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING NEWS README
+%doc COPYING NEWS README
 %{_bindir}/gifdiff
 %{_bindir}/gifsicle
 %{_mandir}/man1/gifdiff.1*



From spot at fedoraproject.org  Wed Sep  3 18:00:24 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 18:00:24 +0000 (UTC)
Subject: rpms/python-ldap/devel .cvsignore, 1.6,
	1.7 python-ldap-2.2.0-dirs.patch, 1.2, 1.3 python-ldap.spec,
	1.23, 1.24 sources, 1.6, 1.7
Message-ID: <20080903180024.5C1467011F@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20640

Modified Files:
	.cvsignore python-ldap-2.2.0-dirs.patch python-ldap.spec 
	sources 
Log Message:
update to 2.3.5, fix license tag


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-ldap/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Oct 2007 20:07:51 -0000	1.6
+++ .cvsignore	3 Sep 2008 17:59:54 -0000	1.7
@@ -1 +1 @@
-python-ldap-2.3.1.tar.gz
+python-ldap-2.3.5.tar.gz

python-ldap-2.2.0-dirs.patch:

Index: python-ldap-2.2.0-dirs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-ldap/devel/python-ldap-2.2.0-dirs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-ldap-2.2.0-dirs.patch	8 Jun 2007 12:59:58 -0000	1.2
+++ python-ldap-2.2.0-dirs.patch	3 Sep 2008 17:59:54 -0000	1.3
@@ -1,12 +1,13 @@
---- python-ldap-2.3/setup.cfg.dirs	2006-11-15 12:26:26.000000000 -0500
-+++ python-ldap-2.3/setup.cfg	2007-06-08 08:55:58.000000000 -0400
-@@ -7,8 +7,7 @@
- # for wrapping OpenLDAP 2 libs
- [_ldap]
- 
+diff -up python-ldap-2.3.5/setup.cfg.dirs python-ldap-2.3.5/setup.cfg
+--- python-ldap-2.3.5/setup.cfg.dirs	2008-07-06 11:04:13.000000000 -0400
++++ python-ldap-2.3.5/setup.cfg	2008-09-03 13:45:20.000000000 -0400
+@@ -2,8 +2,7 @@
+ extra_objects = 
+ extra_compile_args = 
+ libs = ldap_r lber sasl2 ssl crypto
 -library_dirs = /usr/local/openldap-2.3/lib
 -include_dirs = /usr/local/openldap-2.3/include /usr/include/sasl
 +include_dirs = /usr/include/sasl
  
- extra_compile_args = 
- extra_objects = 
+ [egg_info]
+ tag_build = 


Index: python-ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-ldap/devel/python-ldap.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- python-ldap.spec	17 Feb 2008 16:14:08 -0000	1.23
+++ python-ldap.spec	3 Sep 2008 17:59:54 -0000	1.24
@@ -5,15 +5,15 @@
 ### Abstract ###
 
 Name: python-ldap
-Version: 2.3.1
-Release: 3%{?dist}
+Version: 2.3.5
+Release: 1%{?dist}
 Epoch: 0
-License: PSF - see LICENCE
+License: Python
 Group: System Environment/Libraries
-Summary: An object-oriented API to access LDAP directory servers.
+Summary: An object-oriented API to access LDAP directory servers
 URL: http://python-ldap.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Source: python-ldap-%{version}.tar.gz
+Source0: http://download.sourceforge.net/python-ldap/python-ldap-%{version}.tar.gz
 
 ### Patches ###
 
@@ -41,25 +41,38 @@
 %setup -q -n python-ldap-%{version}
 %patch0 -p1 -b .dirs
 
+# clean up cvs hidden files
+rm -rf Demo/Lib/ldap/.cvsignore Demo/.cvsignore Demo/Lib/ldif/.cvsignore Demo/Lib/ldap/async/.cvsignore \
+       Demo/Lib/.cvsignore Demo/Lib/ldapurl/.cvsignore
+
+# Fix interpreter
+sed -i 's|#! python|#!/usr/bin/python|g' Demo/simplebrowse.py
+
 %build
 %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --root=$RPM_BUILD_ROOT \
-  --record=INSTALLED_FILES
-sed 's|^\(.*\.pyo\)$|%ghost \1|' < INSTALLED_FILES > %{name}-%{version}.files
-find $RPM_BUILD_ROOT/%{python_sitearch}/* -type d \
-  | sed "s|^$RPM_BUILD_ROOT|%dir |" >> %{name}-%{version}.files
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}-%{version}.files
+%files
 %defattr(-,root,root,-)
 %doc LICENCE CHANGES README TODO Demo
+%{python_sitearch}/_ldap.so
+%{python_sitearch}/dsml.py*
+%{python_sitearch}/ldapurl.py*
+%{python_sitearch}/ldif.py*
+%{python_sitearch}/ldap/
+%{python_sitearch}/python_ldap-%{version}-*.egg-info/
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:2.3.5-1
+- fix license tag
+- update to 2.3.5
+
 * Sun Feb 17 2008 Matthew Barnes <mbarnes at redhat.com> - 0:2.3.1-3.fc9
 - Rebuild with GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-ldap/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Oct 2007 20:07:51 -0000	1.6
+++ sources	3 Sep 2008 17:59:54 -0000	1.7
@@ -1 +1 @@
-1a97e0fef2567e30d75ed137a8914559  python-ldap-2.3.1.tar.gz
+c9732621075edc65b54233fff21fe07c  python-ldap-2.3.5.tar.gz



From overholt at fedoraproject.org  Wed Sep  3 18:01:58 2008
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed,  3 Sep 2008 18:01:58 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.587,1.588
Message-ID: <20080903180158.27C927011F@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20851

Modified Files:
	eclipse.spec 
Log Message:
Forgot to remove com.ibm.icu* from files section.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.587
retrieving revision 1.588
diff -u -r1.587 -r1.588
--- eclipse.spec	3 Sep 2008 17:23:34 -0000	1.587
+++ eclipse.spec	3 Sep 2008 18:01:27 -0000	1.588
@@ -1346,7 +1346,6 @@
 %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_*
 %{_libdir}/%{name}/plugins/org.eclipse.update.configurator_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator_*
-%{_libdir}/%{name}/plugins/com.ibm.icu_*
 
 %files platform -f %{name}-platform.install
 %defattr(-,root,root)



From spot at fedoraproject.org  Wed Sep  3 18:05:31 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 18:05:31 +0000 (UTC)
Subject: rpms/python-memcached/devel .cvsignore, 1.4,
	1.5 python-memcached.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20080903180531.6B75C7002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-memcached/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21213

Modified Files:
	.cvsignore python-memcached.spec sources 
Log Message:
fix license tag, update to 1.43


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Aug 2007 20:49:54 -0000	1.4
+++ .cvsignore	3 Sep 2008 18:05:01 -0000	1.5
@@ -1 +1 @@
-python-memcached-1.39.tar.gz
+python-memcached-1.43.tar.gz


Index: python-memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/devel/python-memcached.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-memcached.spec	14 Aug 2007 20:49:54 -0000	1.3
+++ python-memcached.spec	3 Sep 2008 18:05:01 -0000	1.4
@@ -1,12 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-memcached
-Version:        1.39
+Version:        1.43
 Release:        1%{?dist}
 Summary:        A Python memcached client library
 
 Group:          Development/Languages
-License:        Python license
+License:        Python
 URL:            http://www.tummy.com/Community/software/python-memcached/
 Source0:        ftp://ftp.tummy.com/pub/python-memcached/python-memcached-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,8 +38,13 @@
 %doc ChangeLog README
 %attr(755,root,root) %{python_sitelib}/memcache.py
 %{python_sitelib}/memcache.py[co]
+%{python_sitelib}/python_memcached-%{version}-py*.egg-info/
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.43-1
+- fix license tag
+- update to 1.43
+
 * Tue Aug 14 2007 Sean Reifschneider <jafo at tummy.com> 1.39-1
 - Update to 1.39 upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Aug 2007 20:49:54 -0000	1.4
+++ sources	3 Sep 2008 18:05:01 -0000	1.5
@@ -1 +1 @@
-403d509d3d386adbc2d27763655cd268  python-memcached-1.39.tar.gz
+9bfa9d9b10dfc2d91ab74486773c6fc2  python-memcached-1.43.tar.gz



From spot at fedoraproject.org  Wed Sep  3 18:07:37 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 18:07:37 +0000 (UTC)
Subject: rpms/python-myghty/devel python-myghty.spec,1.12,1.13
Message-ID: <20080903180737.3D6237002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-myghty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21612

Modified Files:
	python-myghty.spec 
Log Message:
fix license tag


Index: python-myghty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-myghty/devel/python-myghty.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- python-myghty.spec	27 Oct 2007 22:24:28 -0000	1.12
+++ python-myghty.spec	3 Sep 2008 18:07:06 -0000	1.13
@@ -2,11 +2,11 @@
 
 Name:           python-myghty
 Version:        1.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A Python-based templating system derived from HTML::Mason
 
 Group:          Development/Libraries
-License:        LGPL
+License:        MIT
 URL:            http://www.myghty.org
 Source0:        http://download.sourceforge.net/sourceforge/myghty/Myghty-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-6
+- fix license tag
+
 * Sat Oct 27 2007 Luke Macken <lmacken at redhat.com> 1.1-5
 - Fix broken Source0
 



From spot at fedoraproject.org  Wed Sep  3 18:12:38 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 18:12:38 +0000 (UTC)
Subject: rpms/python-paramiko/devel python-paramiko.spec,1.15,1.16
Message-ID: <20080903181238.31EFC7002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-paramiko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21971

Modified Files:
	python-paramiko.spec 
Log Message:
fix license tag


Index: python-paramiko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paramiko/devel/python-paramiko.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- python-paramiko.spec	7 Jul 2008 04:15:28 -0000	1.15
+++ python-paramiko.spec	3 Sep 2008 18:12:07 -0000	1.16
@@ -4,11 +4,12 @@
 
 Name:           python-paramiko
 Version:        1.7.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A SSH2 protocol library for python
 
 Group:          Development/Libraries
-License:        LGPL
+# No version specified.
+License:        LGPLv2+
 URL:            http://www.lag.net/paramiko/
 Source0:        http://www.lag.net/paramiko/download/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7.4-2
+- fix license tag
+
 * Sun Jul  6 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.7.4-1
 - Update to 1.7.4
 



From spot at fedoraproject.org  Wed Sep  3 18:14:19 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 18:14:19 +0000 (UTC)
Subject: rpms/python-memcached/devel python-memcached.spec,1.4,1.5
Message-ID: <20080903181419.638C07002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-memcached/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22157

Modified Files:
	python-memcached.spec 
Log Message:
fix BR


Index: python-memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/devel/python-memcached.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-memcached.spec	3 Sep 2008 18:05:01 -0000	1.4
+++ python-memcached.spec	3 Sep 2008 18:13:49 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           python-memcached
 Version:        1.43
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Python memcached client library
 
 Group:          Development/Languages
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
+BuildRequires:  python-devel, python-setuptools
 
 %description
 This software is a 100% Python interface to the memcached memory cache
@@ -41,6 +41,9 @@
 %{python_sitelib}/python_memcached-%{version}-py*.egg-info/
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.43-2
+- add BR: python-setuptools
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.43-1
 - fix license tag
 - update to 1.43



From sgrubb at fedoraproject.org  Wed Sep  3 18:16:36 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed,  3 Sep 2008 18:16:36 +0000 (UTC)
Subject: rpms/libprelude/devel .cvsignore, 1.10, 1.11 libprelude.spec, 1.18, 
	1.19 sources, 1.11, 1.12
Message-ID: <20080903181636.275F77002B@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22461

Modified Files:
	.cvsignore libprelude.spec sources 
Log Message:
* Wed Sep 03 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.20-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Aug 2008 17:21:15 -0000	1.10
+++ .cvsignore	3 Sep 2008 18:16:05 -0000	1.11
@@ -5,3 +5,4 @@
 libprelude-0.9.17.2.tar.gz
 libprelude-0.9.18.1.tar.gz
 libprelude-0.9.19.tar.gz
+libprelude-0.9.20.tar.gz


Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libprelude.spec	5 Aug 2008 20:10:42 -0000	1.18
+++ libprelude.spec	3 Sep 2008 18:16:05 -0000	1.19
@@ -4,7 +4,7 @@
 
 
 Name:		libprelude
-Version:	0.9.19
+Version:	0.9.20
 Release:	1%{?dist}
 Summary:	The prelude library        
 Group:		System Environment/Libraries 
@@ -145,6 +145,9 @@
 %{ruby_sitearch}/PreludeEasy.so
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Aug 2008 17:21:15 -0000	1.11
+++ sources	3 Sep 2008 18:16:05 -0000	1.12
@@ -1 +1 @@
-4b29f2725d63a835a054e64092719591  libprelude-0.9.19.tar.gz
+09526a1422d547313a1983779cc5ed20  libprelude-0.9.20.tar.gz



From chitlesh at fedoraproject.org  Wed Sep  3 18:17:04 2008
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed,  3 Sep 2008 18:17:04 +0000 (UTC)
Subject: rpms/gwave/devel gwave.desktop,1.1,1.2 gwave.spec,1.5,1.6
Message-ID: <20080903181704.3C4EA7002B@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/gwave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22500

Modified Files:
	gwave.desktop gwave.spec 
Log Message:
fixing segmentation fault


Index: gwave.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gwave/devel/gwave.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gwave.desktop	30 Dec 2007 22:26:23 -0000	1.1
+++ gwave.desktop	3 Sep 2008 18:16:33 -0000	1.2
@@ -6,5 +6,5 @@
 Type=Application
 Terminal=false
 GenericName=Gwave
-Categories=Science;
+Categories=Electronics;Engineering;
 Comment=Analog Waveform Viewer


Index: gwave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwave/devel/gwave.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gwave.spec	29 Aug 2008 09:45:08 -0000	1.5
+++ gwave.spec	3 Sep 2008 18:16:34 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           gwave
 Version:        2
-Release:        8.%{snap_date}snap%{?dist}
+Release:        9.%{snap_date}snap%{?dist}
 Summary:        GPLed Analog Waveform Viewing Environment
 
 License:        GPLv2+
@@ -15,7 +15,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel guile-devel readline-devel desktop-file-utils
-BuildRequires:  g-wrap-devel guile-gnome-platform-devel 
+BuildRequires:  g-wrap-devel guile-gnome-platform-devel
 
 %if %{fedora} < 9
 BuildRequires:  libtermcap-devel
@@ -25,6 +25,8 @@
 
 ExcludeArch:    ppc64
 
+Requires:       electronics-menu
+
 %description
 
 Gwave is a waveform viewer, intended originaly for displaying the output
@@ -65,7 +67,6 @@
 
 
 desktop-file-install --vendor fedora \
-    --add-category Engineering       \
     --dir %{buildroot}%{_datadir}/applications/ \
     %{SOURCE1}
 
@@ -99,6 +100,9 @@
 
 
 %changelog
+* Wed Aug 03 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2-9.20070514snap
+- rebuild due to segmentation fault
+
 * Fri Aug 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2-8.20070514snap
 - rebuild
 
@@ -112,7 +116,7 @@
 - rebuilt due to dependency breakage
 
 * Sun Dec 30 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2-4.20070514snap
-- Fixed obsoleted libtermcap-devel in rawhide 
+- Fixed obsoleted libtermcap-devel in rawhide
 
 * Fri Dec 20 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2-3.20070514snap
 - Removed icon's extension from desktop file as described in the Icon Theme Specification



From spot at fedoraproject.org  Wed Sep  3 18:17:21 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 18:17:21 +0000 (UTC)
Subject: rpms/python-protocols/devel python-protocols.spec,1.13,1.14
Message-ID: <20080903181721.3C60B7002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-protocols/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22606

Modified Files:
	python-protocols.spec 
Log Message:
fix license tag


Index: python-protocols.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-protocols/devel/python-protocols.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- python-protocols.spec	19 Feb 2008 23:48:31 -0000	1.13
+++ python-protocols.spec	3 Sep 2008 18:16:51 -0000	1.14
@@ -9,12 +9,12 @@
 
 Name:           python-protocols
 Version:        1.0
-Release:        0.7.%{alphatag}_%{revision}%{?dist}
+Release:        0.8.%{alphatag}_%{revision}%{?dist}
 
 Summary:        Open Protocols and Component Adaptation for Python
 
 Group:          Development/Libraries
-License:        Python License or Zope Public License v 2.1
+License:        Python or ZPLv2.1
 URL:            http://peak.telecommunity.com/PyProtocols.html
 Source0:        http://www.turbogears.org/download/eggs/%{srcname}-%{filever}.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,6 +55,9 @@
 %{python_sitearch}/%{srcname}-%{eggver}%{alphatag}_%{revision}-py%{python_abi}.egg-info/*
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-0.8.a0dev_r2302
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0-0.7.a0dev_r2302
 - Autorebuild for GCC 4.3
 



From chitlesh at fedoraproject.org  Wed Sep  3 18:18:59 2008
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed,  3 Sep 2008 18:18:59 +0000 (UTC)
Subject: rpms/gwave/devel gwave.spec,1.6,1.7
Message-ID: <20080903181859.889217002B@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/gwave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22924

Modified Files:
	gwave.spec 
Log Message:
fixing segmentation fault


Index: gwave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwave/devel/gwave.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gwave.spec	3 Sep 2008 18:16:34 -0000	1.6
+++ gwave.spec	3 Sep 2008 18:18:29 -0000	1.7
@@ -100,7 +100,7 @@
 
 
 %changelog
-* Wed Aug 03 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2-9.20070514snap
+* Wed Sep 03 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2-9.20070514snap
 - rebuild due to segmentation fault
 
 * Fri Aug 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2-8.20070514snap



From spot at fedoraproject.org  Wed Sep  3 18:19:47 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 18:19:47 +0000 (UTC)
Subject: rpms/python-psycopg/devel python-psycopg.spec,1.12,1.13
Message-ID: <20080903181947.752A87002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-psycopg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22960

Modified Files:
	python-psycopg.spec 
Log Message:
fix license tag


Index: python-psycopg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-psycopg/devel/python-psycopg.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- python-psycopg.spec	19 Feb 2008 23:50:29 -0000	1.12
+++ python-psycopg.spec	3 Sep 2008 18:19:17 -0000	1.13
@@ -4,12 +4,13 @@
 
 Name:           python-psycopg
 Version:        1.1.21
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        PostgreSQL database adapter for Python
 
 Group:          Development/Libraries
-License:        GPL
+# See README for details
+License:        GPLv2+ with exceptions
 URL:            http://www.initd.org/software/initd/psycopg
 Source0:        http://initd.org/pub/software/psycopg/%{srcname}-%{version}.tar.gz
 Patch0:         psycopg-pgversion.patch
@@ -26,7 +27,7 @@
 being thread safe at level 2.
 
 %prep
-%setup -n %{srcname}-%{version}
+%setup -q -n %{srcname}-%{version}
 %patch0 -p0
 
 %build



From spot at fedoraproject.org  Wed Sep  3 18:20:22 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 18:20:22 +0000 (UTC)
Subject: rpms/python-psycopg/devel python-psycopg.spec,1.13,1.14
Message-ID: <20080903182022.4F09B7002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-psycopg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23086

Modified Files:
	python-psycopg.spec 
Log Message:
fix license tag


Index: python-psycopg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-psycopg/devel/python-psycopg.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- python-psycopg.spec	3 Sep 2008 18:19:17 -0000	1.13
+++ python-psycopg.spec	3 Sep 2008 18:19:52 -0000	1.14
@@ -57,6 +57,9 @@
 %{python_sitearch}/*.so
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.21-8
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1.21-7
 - Autorebuild for GCC 4.3
 



From sgrubb at fedoraproject.org  Wed Sep  3 18:30:16 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed,  3 Sep 2008 18:30:16 +0000 (UTC)
Subject: rpms/libprelude/devel libprelude.spec,1.19,1.20
Message-ID: <20080903183016.4B8547002B@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23693

Modified Files:
	libprelude.spec 
Log Message:
include cpp headers in devel package



Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libprelude.spec	3 Sep 2008 18:16:05 -0000	1.19
+++ libprelude.spec	3 Sep 2008 18:29:45 -0000	1.20
@@ -129,6 +129,7 @@
 %{_libdir}/*.so
 %dir %{_includedir}/libprelude/
 %{_includedir}/libprelude/*
+%{_includedir}/libpreludecpp/*
 %{_datadir}/aclocal/libprelude.m4
 
 %files python



From spot at fedoraproject.org  Wed Sep  3 18:30:37 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 18:30:37 +0000 (UTC)
Subject: rpms/python-pydns/devel .cvsignore, 1.2, 1.3 python-pydns.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20080903183037.8FABD7002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-pydns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23745

Modified Files:
	.cvsignore python-pydns.spec sources 
Log Message:
fix license tag, update to 2.3.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pydns/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2006 02:04:43 -0000	1.2
+++ .cvsignore	3 Sep 2008 18:30:07 -0000	1.3
@@ -1 +1 @@
-pydns-2.3.0.tgz
+pydns-2.3.3.tar.gz


Index: python-pydns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pydns/devel/python-pydns.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-pydns.spec	22 Jan 2007 05:35:13 -0000	1.2
+++ python-pydns.spec	3 Sep 2008 18:30:07 -0000	1.3
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-pydns
-Version:        2.3.0
-Release:        5%{?dist}
+Version:        2.3.3
+Release:        1%{?dist}
 Summary:        Python module for DNS (Domain Name Service)
 
 Group:          Development/Languages
-License:        Python license
+License:        Python
 URL:            http://pydns.sourceforge.net/
-Source0:        http://easynews.dl.sourceforge.net/sourceforge/pydns/pydns-%{version}.tgz
+Source0:        http://download.sourceforge.net/pydns/pydns-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -55,8 +55,13 @@
 %doc CREDITS.txt PKG-INFO README-guido.txt README.txt
 %dir %{python_sitelib}/DNS
 %{python_sitelib}/DNS/*.py*
+%{python_sitelib}/pydns-%{version}-py*.egg-info
+
+%changelog 
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.3-1
+- fix license tag
+- update to 2.3.3
 
-%changelog
 * Sun Jan 21 2007 Sean Reifschneider <jafo at tummy.com> 2.3.0-5
 - Adding encoding of the Python files.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pydns/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2006 02:04:43 -0000	1.2
+++ sources	3 Sep 2008 18:30:07 -0000	1.3
@@ -1 +1 @@
-b79616da9e88abce88edf82b369ee58d  pydns-2.3.0.tgz
+40001fb178de5920e7d67c000a782d6a  pydns-2.3.3.tar.gz



From spot at fedoraproject.org  Wed Sep  3 18:39:29 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 18:39:29 +0000 (UTC)
Subject: rpms/python-pyspf/devel .cvsignore, 1.3, 1.4 python-pyspf.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20080903183929.1163E70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-pyspf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24575

Modified Files:
	.cvsignore python-pyspf.spec sources 
Log Message:
fix license tag, update to 2.0.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pyspf/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Jun 2007 06:02:45 -0000	1.3
+++ .cvsignore	3 Sep 2008 18:38:58 -0000	1.4
@@ -1 +1 @@
-pyspf-2.0.3.tar.gz
+pyspf-2.0.5.tar.gz


Index: python-pyspf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pyspf/devel/python-pyspf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-pyspf.spec	10 Jun 2007 06:02:45 -0000	1.3
+++ python-pyspf.spec	3 Sep 2008 18:38:58 -0000	1.4
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-pyspf
-Version:        2.0.3
+Version:        2.0.5
 Release:        1%{?dist}
 Summary:        Python module and programs for SPF (Sender Policy Framework)
 
 Group:          Development/Languages
-License:        Python Software Foundation License
+License:        Python
 URL:            http://sourceforge.net/forum/forum.php?forum_id=596908
-Source0:        http://easynews.dl.sourceforge.net/sourceforge/pymilter/pyspf-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/pymilter/pyspf-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -36,9 +36,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT/usr/bin/type99.py $RPM_BUILD_ROOT/usr/bin/type99
-mv $RPM_BUILD_ROOT/usr/bin/spfquery.py $RPM_BUILD_ROOT/usr/bin/spfquery
-rm -f $RPM_BUILD_ROOT/usr/bin/*.py{o,c}
+mv $RPM_BUILD_ROOT%{_bindir}/type99.py $RPM_BUILD_ROOT%{_bindir}/type99
+mv $RPM_BUILD_ROOT%{_bindir}/spfquery.py $RPM_BUILD_ROOT%{_bindir}/spfquery
+rm -f $RPM_BUILD_ROOT%{_bindir}/*.py{o,c}
 sed -i -e 's|^#!/usr/bin/env python$||' $RPM_BUILD_ROOT/%{python_sitelib}/spf.py
 
 
@@ -49,11 +49,16 @@
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG PKG-INFO README
+%{_bindir}/type99
+%{_bindir}/spfquery
 %{python_sitelib}/spf.py*
-/usr/bin/type99
-/usr/bin/spfquery
+%{python_sitelib}/pyspf-%{version}-py*.egg-info
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.5-1
+- update to 2.0.5
+- fix license tag
+
 * Sat Jun 09 2007 Sean Reifschneider <jafo at tummy.com> 2.0.3-1
 - Upgrading to 2.0.3 release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pyspf/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jun 2007 06:02:45 -0000	1.3
+++ sources	3 Sep 2008 18:38:58 -0000	1.4
@@ -1 +1 @@
-edb452311287449bc0b3a4f8df567f2b  pyspf-2.0.3.tar.gz
+7e3f53362e3ad52ec8a496445085a34f  pyspf-2.0.5.tar.gz



From spot at fedoraproject.org  Wed Sep  3 18:44:33 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 18:44:33 +0000 (UTC)
Subject: rpms/python-qpid/devel python-qpid.spec,1.7,1.8
Message-ID: <20080903184433.5BE4E70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24922

Modified Files:
	python-qpid.spec 
Log Message:
fix license tag


Index: python-qpid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-qpid/devel/python-qpid.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-qpid.spec	18 Jun 2008 17:23:16 -0000	1.7
+++ python-qpid.spec	3 Sep 2008 18:44:03 -0000	1.8
@@ -1,10 +1,10 @@
 Name:           python-qpid
 Version:        0.2.668378
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python language client for AMQP
 
 Group:          Development/Python
-License:        Apache Software License
+License:        ASL 2.0
 URL:            http://incubator.apache.org/qpid
 Source0:        %{name}-%{version}.tar.gz
 # svn export -r<rev> http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/python python-qpid-0.2.<rev>
@@ -69,6 +69,9 @@
 %doc LICENSE.txt NOTICE.txt README.txt doc/test-requirements.txt
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.668378-2
+- fix license tag
+
 * Mon Jun 16 2008 Rafael Schloming <rafaels at redhat.com> - 0.2.668378-1
 - Source update for MRG RC1
 



From spot at fedoraproject.org  Wed Sep  3 18:49:24 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 18:49:24 +0000 (UTC)
Subject: rpms/python-ruledispatch/devel python-ruledispatch.spec,1.9,1.10
Message-ID: <20080903184924.854DD70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-ruledispatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25397

Modified Files:
	python-ruledispatch.spec 
Log Message:
fix license tag


Index: python-ruledispatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-ruledispatch/devel/python-ruledispatch.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-ruledispatch.spec	6 Feb 2008 19:07:11 -0000	1.9
+++ python-ruledispatch.spec	3 Sep 2008 18:48:54 -0000	1.10
@@ -5,11 +5,11 @@
 
 Name:           python-ruledispatch
 Version:        0.5a0
-Release:        0.9.svn%{svnrev}%{?dist}
+Release:        0.10.svn%{svnrev}%{?dist}
 Summary:        A generic function package for Python
 
 Group:          Development/Languages
-License:        PSF or ZPL
+License:        Python or ZPLv2.1
 URL:            http://www.turbogears.org
 Source0:        http://files.turbogears.org/eggs/RuleDispatch-%{version}.dev-%{svnrev}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +50,9 @@
 %{python_sitearch}/dispatch/tests/*.pyo
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.5a0-0.10.svn2305
+- fix license tag
+
 * Wed Feb  6 2008 Luke Macken <lmacken at redhat.com> 0.5a0-0.8.svn2305
 - Own our dispatch and dispatch/tests directories (Bug #431743)
 



From spot at fedoraproject.org  Wed Sep  3 18:52:32 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 18:52:32 +0000 (UTC)
Subject: rpms/python-sexy/devel python-sexy.spec,1.9,1.10
Message-ID: <20080903185232.B66B170120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-sexy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25828

Modified Files:
	python-sexy.spec 
Log Message:
fix license tag


Index: python-sexy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sexy/devel/python-sexy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-sexy.spec	19 Feb 2008 04:57:29 -0000	1.9
+++ python-sexy.spec	3 Sep 2008 18:52:02 -0000	1.10
@@ -2,12 +2,13 @@
 %define real_name sexy-python
 Name:           python-sexy
 Version:        0.1.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        Python bindings to libsexy
 
 Group:          System Environment/Libraries
-License:        LGPL
+# No version specified.
+License:        LGPLv2+
 URL:            http://www.chipx86.com/wiki/Libsexy
 Source0:        http://releases.chipx86.com/libsexy/sexy-python/sexy-python-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +51,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.1.9-6
+- fix license tag
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.9-5
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Wed Sep  3 18:54:07 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 18:54:07 +0000 (UTC)
Subject: rpms/python-simpletal/devel python-simpletal.spec,1.10,1.11
Message-ID: <20080903185407.56CED70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-simpletal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26079

Modified Files:
	python-simpletal.spec 
Log Message:
fix license tag


Index: python-simpletal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-simpletal/devel/python-simpletal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-simpletal.spec	23 Dec 2006 21:03:13 -0000	1.10
+++ python-simpletal.spec	3 Sep 2008 18:53:37 -0000	1.11
@@ -4,12 +4,12 @@
 
 Name:           python-simpletal
 Version:        4.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        An XML based template processor for TAL, TALES and METAL specifications.
 
 Group:          Development/Libraries
-License:        Other
+License:        BSD
 URL:            http://www.owlfish.com/software/simpleTAL/index.html
 Source0:        http://www.owlfish.com/software/simpleTAL/downloads/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -47,6 +47,9 @@
 %{python_sitelib}/simpletal/*.pyo
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.1-6
+- fix license tag
+
 * Sat Dec 23 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 4.1-5
 - Rebuild with Python 2.5
 



From kevin at fedoraproject.org  Wed Sep  3 20:29:55 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:29:55 +0000 (UTC)
Subject: rpms/python-virtualenv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20080903202955.AC5AF7002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-virtualenv/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvskd4846/rpms/python-virtualenv/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-virtualenv


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-virtualenv
# $Id: Makefile,v 1.1 2008/09/03 20:29:55 kevin Exp $
NAME := python-virtualenv
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Sep  3 20:25:46 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:25:46 +0000 (UTC)
Subject: rpms/ini4j/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20080903202546.DB3CD7002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ini4j/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsks4374/rpms/ini4j/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ini4j


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ini4j
# $Id: Makefile,v 1.1 2008/09/03 20:25:46 kevin Exp $
NAME := ini4j
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From spot at fedoraproject.org  Wed Sep  3 19:57:45 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 19:57:45 +0000 (UTC)
Subject: rpms/rb_libtorrent/devel rb_libtorrent.spec,1.12,1.13
Message-ID: <20080903195745.0767F7002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rb_libtorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32478

Modified Files:
	rb_libtorrent.spec 
Log Message:
fix license tag


Index: rb_libtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/devel/rb_libtorrent.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rb_libtorrent.spec	22 Jul 2008 04:44:32 -0000	1.12
+++ rb_libtorrent.spec	3 Sep 2008 19:57:14 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:		rb_libtorrent
 Version:	0.13.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A C++ BitTorrent library aiming to be the best alternative
 
 Group:		System Environment/Libraries
@@ -42,7 +42,7 @@
 %package 	devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
-License:	BSD and zlib/libpng License and Boost Software License
+License:	BSD and zlib and Boost
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
 ## Same include directory. :(
@@ -78,7 +78,7 @@
 %package	python
 Summary:	Python bindings for %{name}
 Group:		Development/Languages
-License:	Boost Software License
+License:	Boost
 Requires:	%{name} = %{version}-%{release}
 
 %description	python
@@ -184,6 +184,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.13.1-3
+- fix license tag
+
 * Mon Jul 14 2008 Peter Gordon <peter at thecodergeek.com> - 0.13.1-2
 - Add python bindings in a -python subpackage. 
 



From kevin at fedoraproject.org  Wed Sep  3 20:29:54 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:29:54 +0000 (UTC)
Subject: rpms/python-virtualenv - New directory
Message-ID: <20080903202954.299AA7002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-virtualenv
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvskd4846/rpms/python-virtualenv

Log Message:
Directory /cvs/extras/rpms/python-virtualenv added to the repository




From kevin at fedoraproject.org  Wed Sep  3 20:24:01 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:24:01 +0000 (UTC)
Subject: rpms/sugar-terminal/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080903202401.A1FF27002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQb4046/rpms/sugar-terminal/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sugar-terminal


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sugar-terminal
# $Id: Makefile,v 1.1 2008/09/03 20:24:01 kevin Exp $
NAME := sugar-terminal
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Sep  3 20:23:16 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:23:16 +0000 (UTC)
Subject: rpms/samefile/devel - New directory
Message-ID: <20080903202316.7422F7002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/samefile/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshM3736/rpms/samefile/devel

Log Message:
Directory /cvs/extras/rpms/samefile/devel added to the repository




From pkgdb at fedoraproject.org  Wed Sep  3 20:26:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:26:25 +0000
Subject: [pkgdb] coredumper (Fedora, 8) updated by kevin
Message-ID: <20080903202625.8D85A2E0138@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for coredumper
kevin has set commit to Approved for uberpackager on coredumper (Fedora 8)
kevin has set build to Approved for uberpackager on coredumper (Fedora 8)
kevin has set checkout to Approved for uberpackager on coredumper (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coredumper



From pkgdb at fedoraproject.org  Wed Sep  3 20:29:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:29:43 +0000
Subject: [pkgdb] python-virtualenv (Fedora, 9) updated by kevin
Message-ID: <20080903202943.BE1F82E0151@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for python-virtualenv
kevin has set commit to Approved for uberpackager on python-virtualenv (Fedora 9)
kevin has set build to Approved for uberpackager on python-virtualenv (Fedora 9)
kevin has set checkout to Approved for uberpackager on python-virtualenv (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtualenv



From pkgdb at fedoraproject.org  Wed Sep  3 20:26:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:26:24 +0000
Subject: [pkgdb] coredumper was added for rakesh
Message-ID: <20080903202624.411D42E0135@bastion.fedora.phx.redhat.com>

kevin has added Package coredumper with summary Library to help applications create core dumps
kevin has approved Package coredumper
kevin has added a Fedora devel branch for coredumper with an owner of rakesh
kevin has approved coredumper in Fedora devel
kevin has approved Package coredumper
kevin has set commit to Approved for packager on coredumper (Fedora devel)
kevin has set build to Approved for packager on coredumper (Fedora devel)
kevin has set checkout to Approved for packager on coredumper (Fedora devel)
kevin has set commit to Approved for uberpackager on coredumper (Fedora devel)
kevin has set build to Approved for uberpackager on coredumper (Fedora devel)
kevin has set checkout to Approved for uberpackager on coredumper (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coredumper



From kevin at fedoraproject.org  Wed Sep  3 20:26:40 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:26:40 +0000 (UTC)
Subject: rpms/coredumper/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080903202640.7E5077002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/coredumper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssg4471/rpms/coredumper/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module coredumper


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: coredumper
# $Id: Makefile,v 1.1 2008/09/03 20:26:40 kevin Exp $
NAME := coredumper
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  3 20:23:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:23:50 +0000
Subject: [pkgdb] sugar-terminal was added for katzj
Message-ID: <20080903202356.609AE2E00F5@bastion.fedora.phx.redhat.com>

kevin has added Package sugar-terminal with summary Terminal activity for sugar
kevin has approved Package sugar-terminal
kevin has added a Fedora devel branch for sugar-terminal with an owner of katzj
kevin has approved sugar-terminal in Fedora devel
kevin has approved Package sugar-terminal
kevin has set commit to Approved for packager on sugar-terminal (Fedora devel)
kevin has set build to Approved for packager on sugar-terminal (Fedora devel)
kevin has set checkout to Approved for packager on sugar-terminal (Fedora devel)
kevin has set commit to Approved for uberpackager on sugar-terminal (Fedora devel)
kevin has set build to Approved for uberpackager on sugar-terminal (Fedora devel)
kevin has set checkout to Approved for uberpackager on sugar-terminal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From spot at fedoraproject.org  Wed Sep  3 20:19:21 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 20:19:21 +0000 (UTC)
Subject: rpms/rdesktop/devel rdesktop.spec,1.30,1.31
Message-ID: <20080903201921.D61107002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rdesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3086

Modified Files:
	rdesktop.spec 
Log Message:
fix license tag


Index: rdesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rdesktop/devel/rdesktop.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- rdesktop.spec	14 May 2008 01:29:56 -0000	1.30
+++ rdesktop.spec	3 Sep 2008 20:18:51 -0000	1.31
@@ -1,10 +1,10 @@
 Name:           rdesktop
 Version:        1.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        X client for remote desktop into Windows Terminal Server
 
 Group:          User Interface/Desktops
-License:        GPL
+License:        GPLv2+
 URL:            http://www.rdesktop.org/
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,6 +38,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.6.0-2
+- fix license tag
+
 * Tue May 13 2008 Soren Sandmann <sandmann at redhat.com> - 1.6.0-1
 Update to 1.6.0
 



From pkgdb at fedoraproject.org  Wed Sep  3 20:29:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:29:43 +0000
Subject: [pkgdb] python-virtualenv (Fedora EPEL, 5) updated by kevin
Message-ID: <20080903202943.AAD502E014E@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-virtualenv
kevin has set commit to Approved for uberpackager on python-virtualenv (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on python-virtualenv (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on python-virtualenv (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtualenv



From kevin at fedoraproject.org  Wed Sep  3 20:23:17 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:23:17 +0000 (UTC)
Subject: rpms/samefile Makefile,NONE,1.1
Message-ID: <20080903202317.519347002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/samefile
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshM3736/rpms/samefile

Added Files:
	Makefile 
Log Message:
Setup of module samefile


--- NEW FILE Makefile ---
# Top level Makefile for module samefile
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep  3 20:22:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:22:54 +0000
Subject: [pkgdb] samefile (Fedora, 9) updated by kevin
Message-ID: <20080903202254.8DD2D2E00E8@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for samefile
kevin has set commit to Approved for uberpackager on samefile (Fedora 9)
kevin has set build to Approved for uberpackager on samefile (Fedora 9)
kevin has set checkout to Approved for uberpackager on samefile (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/samefile



From kevin at fedoraproject.org  Wed Sep  3 20:25:02 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:25:02 +0000 (UTC)
Subject: rpms/freemarker - New directory
Message-ID: <20080903202502.26ABD7002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/freemarker
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIq4268/rpms/freemarker

Log Message:
Directory /cvs/extras/rpms/freemarker added to the repository




From spot at fedoraproject.org  Wed Sep  3 20:23:26 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 20:23:26 +0000 (UTC)
Subject: rpms/redhat-rpm-config/devel redhat-rpm-config.spec,1.55,1.56
Message-ID: <20080903202326.D25887002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/redhat-rpm-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3701

Modified Files:
	redhat-rpm-config.spec 
Log Message:
fix license tag


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-rpm-config/devel/redhat-rpm-config.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- redhat-rpm-config.spec	11 Aug 2008 07:26:42 -0000	1.55
+++ redhat-rpm-config.spec	3 Sep 2008 20:22:56 -0000	1.56
@@ -1,21 +1,15 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
 Version: 9.0.3
-Release: 2%{?dist}
-License: GPL
+Release: 3%{?dist}
+# No version specified.
+License: GPL+
 Group: Development/System
 Source: redhat-rpm-config-%{version}.tar.bz2
 Patch0: redhat-rpm-config-9.0.3-fix-requires.patch
 BuildArch: noarch
 Requires: mktemp
-# if rpm-build is present (thus building rpms), we need newer for 
-# check buildroot 
-Conflicts: rpm-build < 4.4.2.1-0.4.rc2
 BuildRoot: %{_tmppath}/%{name}-root
-# rpmrc passes -mtune which first appeared in gcc 3.4
-%ifarch i386 i686 sparc
-Conflicts: gcc < 3.4
-%endif
 
 %description
 Red Hat specific rpm configuration files.
@@ -35,6 +29,10 @@
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 9.0.3-3
+- fix license tag
+- nuke ancient conflicts
+
 * Mon Aug 11 2008 Panu Matilainen <pmatilai at redhat.com> - 9.0.3-2
 - Unbreak find-requires (#443015)
 



From spot at fedoraproject.org  Wed Sep  3 19:54:18 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 19:54:18 +0000 (UTC)
Subject: rpms/radvd/devel radvd.spec,1.45,1.46
Message-ID: <20080903195418.D1B777002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/radvd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32079

Modified Files:
	radvd.spec 
Log Message:
fix license tag


Index: radvd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/radvd/devel/radvd.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- radvd.spec	23 Jun 2008 14:41:25 -0000	1.45
+++ radvd.spec	3 Sep 2008 19:53:48 -0000	1.46
@@ -5,9 +5,9 @@
 Summary:    A Router Advertisement daemon
 Name:       radvd
 Version:    1.1
-Release:    4%{?dist}
+Release:    5%{?dist}
 # The code includes the advertising clause, so it's GPL-incompatible
-License:    BSD-style
+License:    BSD with advertising
 Group:      System Environment/Daemons
 URL:        http://www.litech.org/radvd/
 Source:     http://www.litech.org/radvd/dist/%{name}-%{version}.tar.gz
@@ -97,6 +97,9 @@
 %{_sbindir}/radvdump
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-5
+- fix license tag
+
 * Mon Jun 23 2008 Jiri Skala <jskala at redhat.com> - 1.1-4
 - radvd.init LSB compliant
 



From kevin at fedoraproject.org  Wed Sep  3 20:25:03 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:25:03 +0000 (UTC)
Subject: rpms/freemarker Makefile,NONE,1.1
Message-ID: <20080903202503.531537002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/freemarker
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIq4268/rpms/freemarker

Added Files:
	Makefile 
Log Message:
Setup of module freemarker


--- NEW FILE Makefile ---
# Top level Makefile for module freemarker
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  3 20:25:45 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:25:45 +0000 (UTC)
Subject: rpms/ini4j - New directory
Message-ID: <20080903202545.2B1307002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ini4j
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsks4374/rpms/ini4j

Log Message:
Directory /cvs/extras/rpms/ini4j added to the repository




From kevin at fedoraproject.org  Wed Sep  3 20:24:00 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:24:00 +0000 (UTC)
Subject: rpms/sugar-terminal - New directory
Message-ID: <20080903202400.28BE87002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-terminal
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQb4046/rpms/sugar-terminal

Log Message:
Directory /cvs/extras/rpms/sugar-terminal added to the repository




From pkgdb at fedoraproject.org  Wed Sep  3 20:29:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:29:41 +0000
Subject: [pkgdb] python-virtualenv was added for smilner
Message-ID: <20080903202948.5D7942E0154@bastion.fedora.phx.redhat.com>

kevin has added Package python-virtualenv with summary a tool to create isolated Python environments
kevin has approved Package python-virtualenv
kevin has added a Fedora devel branch for python-virtualenv with an owner of smilner
kevin has approved python-virtualenv in Fedora devel
kevin has approved Package python-virtualenv
kevin has set commit to Approved for packager on python-virtualenv (Fedora devel)
kevin has set build to Approved for packager on python-virtualenv (Fedora devel)
kevin has set checkout to Approved for packager on python-virtualenv (Fedora devel)
kevin has set commit to Approved for uberpackager on python-virtualenv (Fedora devel)
kevin has set build to Approved for uberpackager on python-virtualenv (Fedora devel)
kevin has set checkout to Approved for uberpackager on python-virtualenv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtualenv



From kevin at fedoraproject.org  Wed Sep  3 20:24:00 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:24:00 +0000 (UTC)
Subject: rpms/sugar-terminal/devel - New directory
Message-ID: <20080903202400.5CB947002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQb4046/rpms/sugar-terminal/devel

Log Message:
Directory /cvs/extras/rpms/sugar-terminal/devel added to the repository




From kevin at fedoraproject.org  Wed Sep  3 20:25:46 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:25:46 +0000 (UTC)
Subject: rpms/ini4j Makefile,NONE,1.1
Message-ID: <20080903202546.8C8F17002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ini4j
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsks4374/rpms/ini4j

Added Files:
	Makefile 
Log Message:
Setup of module ini4j


--- NEW FILE Makefile ---
# Top level Makefile for module ini4j
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  3 20:25:45 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:25:45 +0000 (UTC)
Subject: rpms/ini4j/devel - New directory
Message-ID: <20080903202545.76B387002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ini4j/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsks4374/rpms/ini4j/devel

Log Message:
Directory /cvs/extras/rpms/ini4j/devel added to the repository




From kevin at fedoraproject.org  Wed Sep  3 20:25:03 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:25:03 +0000 (UTC)
Subject: rpms/freemarker/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080903202503.8F7907002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/freemarker/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIq4268/rpms/freemarker/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module freemarker


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: freemarker
# $Id: Makefile,v 1.1 2008/09/03 20:25:03 kevin Exp $
NAME := freemarker
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  3 20:25:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:25:37 +0000
Subject: [pkgdb] ini4j was added for victorv
Message-ID: <20080903202543.3F0EA2E011D@bastion.fedora.phx.redhat.com>

kevin has added Package ini4j with summary Java API for handling files in Windows .ini format
kevin has approved Package ini4j
kevin has added a Fedora devel branch for ini4j with an owner of victorv
kevin has approved ini4j in Fedora devel
kevin has approved Package ini4j
kevin has set commit to Approved for packager on ini4j (Fedora devel)
kevin has set build to Approved for packager on ini4j (Fedora devel)
kevin has set checkout to Approved for packager on ini4j (Fedora devel)
kevin has set commit to Approved for uberpackager on ini4j (Fedora devel)
kevin has set build to Approved for uberpackager on ini4j (Fedora devel)
kevin has set checkout to Approved for uberpackager on ini4j (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ini4j



From kevin at fedoraproject.org  Wed Sep  3 20:29:54 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:29:54 +0000 (UTC)
Subject: rpms/python-virtualenv/devel - New directory
Message-ID: <20080903202954.68B077002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-virtualenv/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvskd4846/rpms/python-virtualenv/devel

Log Message:
Directory /cvs/extras/rpms/python-virtualenv/devel added to the repository




From pkgdb at fedoraproject.org  Wed Sep  3 20:22:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:22:54 +0000
Subject: [pkgdb] samefile (Fedora, 8) updated by kevin
Message-ID: <20080903202254.832D62E00E5@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for samefile
kevin has set commit to Approved for uberpackager on samefile (Fedora 8)
kevin has set build to Approved for uberpackager on samefile (Fedora 8)
kevin has set checkout to Approved for uberpackager on samefile (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/samefile



From pkgdb at fedoraproject.org  Wed Sep  3 20:22:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:22:53 +0000
Subject: [pkgdb] samefile was added for bonii
Message-ID: <20080903202253.2FA162E00E2@bastion.fedora.phx.redhat.com>

kevin has added Package samefile with summary An utility to find identical files on the file system
kevin has approved Package samefile
kevin has added a Fedora devel branch for samefile with an owner of bonii
kevin has approved samefile in Fedora devel
kevin has approved Package samefile
kevin has set commit to Approved for packager on samefile (Fedora devel)
kevin has set build to Approved for packager on samefile (Fedora devel)
kevin has set checkout to Approved for packager on samefile (Fedora devel)
kevin has set commit to Approved for uberpackager on samefile (Fedora devel)
kevin has set build to Approved for uberpackager on samefile (Fedora devel)
kevin has set checkout to Approved for uberpackager on samefile (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/samefile



From spot at fedoraproject.org  Wed Sep  3 19:55:15 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 19:55:15 +0000 (UTC)
Subject: rpms/rarpd/devel rarpd.spec,1.24,1.25
Message-ID: <20080903195515.DFBF17002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rarpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32237

Modified Files:
	rarpd.spec 
Log Message:
fix license tag


Index: rarpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rarpd/devel/rarpd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rarpd.spec	19 Feb 2008 06:33:28 -0000	1.24
+++ rarpd.spec	3 Sep 2008 19:54:45 -0000	1.25
@@ -1,8 +1,8 @@
 Summary: The RARP daemon.
 Name: rarpd
 Version: ss981107
-Release: 26.1%{?dist}
-License: GPL
+Release: 27%{?dist}
+License: GPLv2+
 Group: System Environment/Daemons
 Source: ftp://ftp.inr.ac.ru/ip-routing/dhcp.bootp.rarp/rarpd-%{version}.tar.gz
 Patch0: rarpd-%{version}.patch
@@ -80,6 +80,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - ss981107-27
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - ss981107-26.1
 - Autorebuild for GCC 4.3
 



From kevin at fedoraproject.org  Wed Sep  3 20:23:16 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:23:16 +0000 (UTC)
Subject: rpms/samefile - New directory
Message-ID: <20080903202316.3B2E47002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/samefile
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshM3736/rpms/samefile

Log Message:
Directory /cvs/extras/rpms/samefile added to the repository




From kevin at fedoraproject.org  Wed Sep  3 20:23:17 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:23:17 +0000 (UTC)
Subject: rpms/samefile/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080903202317.882827002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/samefile/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshM3736/rpms/samefile/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module samefile


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: samefile
# $Id: Makefile,v 1.1 2008/09/03 20:23:17 kevin Exp $
NAME := samefile
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Sep  3 20:29:55 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:29:55 +0000 (UTC)
Subject: rpms/python-virtualenv Makefile,NONE,1.1
Message-ID: <20080903202955.67CA17002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-virtualenv
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvskd4846/rpms/python-virtualenv

Added Files:
	Makefile 
Log Message:
Setup of module python-virtualenv


--- NEW FILE Makefile ---
# Top level Makefile for module python-virtualenv
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  3 20:26:40 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:26:40 +0000 (UTC)
Subject: rpms/coredumper Makefile,NONE,1.1
Message-ID: <20080903202640.476687002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/coredumper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssg4471/rpms/coredumper

Added Files:
	Makefile 
Log Message:
Setup of module coredumper


--- NEW FILE Makefile ---
# Top level Makefile for module coredumper
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From dwalsh at fedoraproject.org  Wed Sep  3 20:24:25 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  3 Sep 2008 20:24:25 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.202,
	1.203 selinux-policy.spec, 1.704, 1.705
Message-ID: <20080903202425.0B5087002B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4016

Modified Files:
	policy-20071130.patch selinux-policy.spec 
Log Message:
* Tue Sep 2 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-88
- Allow sendmail to transition to postfix_postdrop_t


policy-20071130.patch:

Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- policy-20071130.patch	29 Aug 2008 20:55:32 -0000	1.202
+++ policy-20071130.patch	3 Sep 2008 20:24:23 -0000	1.203
@@ -2451,6 +2451,18 @@
 +optional_policy(`
 +	unconfined_domain(prelink_t)
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.3.1/policy/modules/admin/readahead.te
+--- nsaserefpolicy/policy/modules/admin/readahead.te	2008-06-12 23:38:01.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/admin/readahead.te	2008-09-03 12:58:10.000000000 -0400
+@@ -22,7 +22,7 @@
+ # Local policy
+ #
+ 
+-allow readahead_t self:capability { dac_override dac_read_search };
++allow readahead_t self:capability { fowner dac_override dac_read_search };
+ dontaudit readahead_t self:capability sys_tty_config;
+ allow readahead_t self:process signal_perms;
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.3.1/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2008-06-12 23:38:01.000000000 -0400
 +++ serefpolicy-3.3.1/policy/modules/admin/rpm.fc	2008-07-15 14:02:51.000000000 -0400
@@ -6250,8 +6262,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.3.1/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.te	2008-08-13 13:26:58.000000000 -0400
-@@ -0,0 +1,228 @@
++++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.te	2008-09-03 14:36:36.000000000 -0400
+@@ -0,0 +1,230 @@
 +
 +policy_module(nsplugin,1.0.0)
 +
@@ -6374,6 +6386,7 @@
 +userdom_read_user_tmp_files(user, nsplugin_t)
 +userdom_write_user_tmp_sockets(user, nsplugin_t)
 +userdom_dontaudit_append_unpriv_home_content_files(nsplugin_t)
++userdom_dontaudit_unlink_unpriv_home_content_files(nsplugin_t)
 +userdom_dontaudit_manage_user_tmp_files(user, nsplugin_t)
 +
 +optional_policy(`
@@ -6405,6 +6418,7 @@
 +	xserver_read_xdm_tmp_files(nsplugin_t)
 +	xserver_read_xdm_pid(nsplugin_t)
 +	xserver_read_user_xauth(user, nsplugin_t)
++	xserver_read_user_iceauth(user, nsplugin_t)
 +	xserver_use_user_fonts(user, nsplugin_t)
 +	xserver_manage_home_fonts(nsplugin_t)
 +')
@@ -12799,8 +12813,8 @@
 +/var/lib/misc(/.*)?			gen_context(system_u:object_r:system_crond_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.3.1/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/cron.if	2008-08-26 20:19:09.000000000 -0400
-@@ -35,38 +35,23 @@
++++ serefpolicy-3.3.1/policy/modules/services/cron.if	2008-09-03 13:55:34.000000000 -0400
+@@ -35,38 +35,24 @@
  #
  template(`cron_per_role_template',`
  	gen_require(`
@@ -12813,6 +12827,7 @@
  	# Type of user crontabs once moved to cron spool.
  	type $1_cron_spool_t, cron_spool_type;
  	files_type($1_cron_spool_t)
++	mta_mailcontent($1_cron_spool_t)
  
 -	type $1_crond_t;
 -	domain_type($1_crond_t)
@@ -12843,7 +12858,7 @@
  	# The entrypoint interface is not used as this is not
  	# a regular entrypoint.  Since crontab files are
  	# not directly executed, crond must ensure that
-@@ -74,116 +59,23 @@
+@@ -74,116 +60,23 @@
  	# for the domain of the user cron job.  It
  	# performs an entrypoint permission check
  	# for this purpose.
@@ -12967,7 +12982,7 @@
  	##############################
  	#
  	# $1_crontab_t local policy
-@@ -192,9 +84,13 @@
+@@ -192,9 +85,13 @@
  	# dac_override is to create the file in the directory under /tmp
  	allow $1_crontab_t self:capability { fowner setuid setgid chown dac_override };
  	allow $1_crontab_t self:process signal_perms;
@@ -12981,7 +12996,7 @@
  
  	# crontab shows up in user ps
  	ps_process_pattern($2,$1_crontab_t)
-@@ -205,9 +101,6 @@
+@@ -205,9 +102,6 @@
  	# Allow crond to read those crontabs in cron spool.
  	allow crond_t $1_cron_spool_t:file manage_file_perms;
  
@@ -12991,7 +13006,7 @@
  	# create files in /var/spool/cron
  	manage_files_pattern($1_crontab_t,cron_spool_t,$1_cron_spool_t)
  	filetrans_pattern($1_crontab_t,cron_spool_t,$1_cron_spool_t,file)
-@@ -226,16 +119,20 @@
+@@ -226,16 +120,20 @@
  	# Run helper programs as the user domain
  	corecmd_bin_domtrans($1_crontab_t,$2)
  	corecmd_shell_domtrans($1_crontab_t,$2)
@@ -13012,7 +13027,7 @@
  
  	miscfiles_read_localization($1_crontab_t)
  
-@@ -247,6 +144,7 @@
+@@ -247,6 +145,7 @@
  	userdom_use_user_terminals($1,$1_crontab_t)
  	# Read user crontabs
  	userdom_read_user_home_content_files($1,$1_crontab_t)
@@ -13020,7 +13035,7 @@
  
  	tunable_policy(`fcron_crond',`
  		# fcron wants an instant update of a crontab change for the administrator
-@@ -285,14 +183,12 @@
+@@ -285,14 +184,12 @@
  template(`cron_admin_template',`
  	gen_require(`
  		attribute cron_spool_type;
@@ -13036,7 +13051,7 @@
  	# Manipulate other users crontab.
  	selinux_get_fs_mount($1_crontab_t)
  	selinux_validate_context($1_crontab_t)
-@@ -438,7 +334,26 @@
+@@ -438,7 +335,26 @@
  
  ########################################
  ## <summary>
@@ -13064,7 +13079,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -446,7 +361,7 @@
+@@ -446,7 +362,7 @@
  ##	</summary>
  ## </param>
  #
@@ -13073,7 +13088,7 @@
  	gen_require(`
  		type crond_t;
  	')
-@@ -558,11 +473,14 @@
+@@ -558,11 +474,14 @@
  #
  interface(`cron_read_system_job_tmp_files',`
  	gen_require(`
@@ -13089,7 +13104,7 @@
  ')
  
  ########################################
-@@ -583,3 +501,62 @@
+@@ -583,3 +502,62 @@
  
  	dontaudit $1 system_crond_tmp_t:file append;
  ')
@@ -13154,7 +13169,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.3.1/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/cron.te	2008-07-24 07:27:14.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/cron.te	2008-09-03 13:55:10.000000000 -0400
 @@ -12,14 +12,6 @@
  
  ## <desc>
@@ -13256,8 +13271,11 @@
  
  seutil_read_config(crond_t)
  seutil_read_default_contexts(crond_t)
-@@ -163,9 +170,6 @@
+@@ -161,11 +168,9 @@
+ userdom_list_all_users_home_dirs(crond_t)
+ 
  mta_send_mail(crond_t)
++mta_mailcontent(cron_spool_t)
  
  ifdef(`distro_debian',`
 -	# pam_limits is used
@@ -13266,7 +13284,7 @@
  	optional_policy(`
  		# Debian logcheck has the home dir set to its cache
  		logwatch_search_cache_dir(crond_t)
-@@ -180,21 +184,45 @@
+@@ -180,21 +185,45 @@
  	')
  ')
  
@@ -13313,7 +13331,7 @@
  ')
  
  optional_policy(`
-@@ -236,6 +264,9 @@
+@@ -236,6 +265,9 @@
  allow system_crond_t cron_var_lib_t:file manage_file_perms;
  files_var_lib_filetrans(system_crond_t,cron_var_lib_t,file)
  
@@ -13323,7 +13341,7 @@
  allow system_crond_t system_cron_spool_t:file read_file_perms;
  # The entrypoint interface is not used as this is not
  # a regular entrypoint.  Since crontab files are
-@@ -267,9 +298,13 @@
+@@ -267,9 +299,13 @@
  filetrans_pattern(system_crond_t,crond_tmp_t,system_crond_tmp_t,{ file lnk_file })
  files_tmp_filetrans(system_crond_t,system_crond_tmp_t,file)
  
@@ -13338,7 +13356,7 @@
  
  kernel_read_kernel_sysctls(system_crond_t)
  kernel_read_system_state(system_crond_t)
-@@ -323,7 +358,8 @@
+@@ -323,7 +359,8 @@
  init_read_utmp(system_crond_t)
  init_dontaudit_rw_utmp(system_crond_t)
  # prelink tells init to restart it self, we either need to allow or dontaudit
@@ -13348,7 +13366,7 @@
  
  auth_use_nsswitch(system_crond_t)
  
-@@ -333,6 +369,7 @@
+@@ -333,6 +370,7 @@
  libs_exec_ld_so(system_crond_t)
  
  logging_read_generic_logs(system_crond_t)
@@ -13356,7 +13374,7 @@
  logging_send_syslog_msg(system_crond_t)
  
  miscfiles_read_localization(system_crond_t)
-@@ -348,18 +385,6 @@
+@@ -348,18 +386,6 @@
  	')
  ')
  
@@ -13375,7 +13393,7 @@
  optional_policy(`
  	# Needed for certwatch
  	apache_exec_modules(system_crond_t)
-@@ -383,6 +408,14 @@
+@@ -383,11 +409,20 @@
  ')
  
  optional_policy(`
@@ -13390,7 +13408,13 @@
  	mrtg_append_create_logs(system_crond_t)
  ')
  
-@@ -415,8 +448,7 @@
+ optional_policy(`
+ 	mta_send_mail(system_crond_t)
++	mta_mailcontent(system_cron_spool_t)
+ ')
+ 
+ optional_policy(`
+@@ -415,8 +450,7 @@
  ')
  
  optional_policy(`
@@ -13400,7 +13424,7 @@
  ')
  
  optional_policy(`
-@@ -424,15 +456,12 @@
+@@ -424,15 +458,12 @@
  ')
  
  optional_policy(`
@@ -13423,7 +13447,7 @@
 -') dnl end TODO
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.3.1/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/cups.fc	2008-07-30 11:32:46.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/cups.fc	2008-09-02 16:34:56.000000000 -0400
 @@ -8,24 +8,28 @@
  /etc/cups/ppd/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/ppds\.dat	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
@@ -13467,7 +13491,15 @@
  
  /var/cache/alchemist/printconf.* gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /var/cache/foomatic(/.*)? 	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
-@@ -50,3 +54,13 @@
+@@ -43,10 +47,20 @@
+ /var/lib/cups/certs/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
+ 
+ /var/log/cups(/.*)?		gen_context(system_u:object_r:cupsd_log_t,s0)
+-/var/log/turboprint_cups\.log.* -- gen_context(system_u:object_r:cupsd_log_t,s0)
++/var/log/turboprint.*		gen_context(system_u:object_r:cupsd_log_t,s0)
+ 
+ /var/run/cups(/.*)?		gen_context(system_u:object_r:cupsd_var_run_t,s0)
+ /var/run/hp.*\.pid	--	gen_context(system_u:object_r:hplip_var_run_t,s0)
  /var/run/hp.*\.port	--	gen_context(system_u:object_r:hplip_var_run_t,s0)
  /var/run/ptal-printd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
  /var/run/ptal-mlcd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
@@ -16828,16 +16860,17 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.3.1/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/hal.fc	2008-07-15 14:02:52.000000000 -0400
-@@ -8,6 +8,7 @@
++++ serefpolicy-3.3.1/policy/modules/services/hal.fc	2008-09-03 14:04:19.000000000 -0400
+@@ -8,6 +8,8 @@
  /usr/libexec/hal-hotplug-map 		--	gen_context(system_u:object_r:hald_exec_t,s0)
  /usr/libexec/hal-system-sonypic	 	--	gen_context(system_u:object_r:hald_sonypic_exec_t,s0)
  /usr/libexec/hald-addon-macbookpro-backlight --	gen_context(system_u:object_r:hald_mac_exec_t,s0)
 +/usr/libexec/hald-addon-macbook-backlight --	gen_context(system_u:object_r:hald_mac_exec_t,s0)
++/usr/sbin/radeontool			  --	gen_context(system_u:object_r:hald_mac_exec_t,s0)
  
  /usr/sbin/hald		--			gen_context(system_u:object_r:hald_exec_t,s0)
  
-@@ -16,10 +17,13 @@
+@@ -16,10 +18,13 @@
  /var/lib/hal(/.*)?				gen_context(system_u:object_r:hald_var_lib_t,s0)
  
  /var/log/pm-suspend\.log			gen_context(system_u:object_r:hald_log_t,s0)
@@ -16901,7 +16934,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.3.1/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/hal.te	2008-08-12 11:59:06.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/hal.te	2008-09-03 14:03:50.000000000 -0400
 @@ -49,6 +49,9 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -17068,10 +17101,12 @@
  domtrans_pattern(hald_t, hald_mac_exec_t, hald_mac_t)
  allow hald_t hald_mac_t:process signal;
  allow hald_mac_t hald_t:unix_stream_socket connectto;
-@@ -338,9 +385,16 @@
+@@ -338,9 +385,18 @@
  manage_files_pattern(hald_mac_t,hald_var_lib_t,hald_var_lib_t)
  files_search_var_lib(hald_mac_t)
  
++write_files_pattern(hald_mac_t, hald_log_t, hald_log_t)
++
 +dev_read_raw_memory(hald_mac_t)
  dev_write_raw_memory(hald_mac_t)
 +dev_read_sysfs(hald_mac_t)
@@ -17085,7 +17120,25 @@
  
  libs_use_ld_so(hald_mac_t)
  libs_use_shared_libs(hald_mac_t)
-@@ -391,3 +445,8 @@
+@@ -363,6 +419,8 @@
+ manage_files_pattern(hald_sonypic_t,hald_var_lib_t,hald_var_lib_t)
+ files_search_var_lib(hald_sonypic_t)
+ 
++write_files_pattern(hald_sonypic_t, hald_log_t, hald_log_t)
++
+ files_read_usr_files(hald_sonypic_t)
+ 
+ libs_use_ld_so(hald_sonypic_t)
+@@ -383,6 +441,8 @@
+ manage_files_pattern(hald_keymap_t,hald_var_lib_t,hald_var_lib_t)
+ files_search_var_lib(hald_keymap_t)
+ 
++write_files_pattern(hald_keymap_t, hald_log_t, hald_log_t)
++
+ dev_rw_input_dev(hald_keymap_t)
+ 
+ files_read_usr_files(hald_keymap_t)
+@@ -391,3 +451,8 @@
  libs_use_shared_libs(hald_keymap_t)
  
  miscfiles_read_localization(hald_keymap_t)
@@ -17094,6 +17147,18 @@
 +# Should be removed when this is fixed
 +cron_read_system_job_lib_files(hald_t)
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.fc serefpolicy-3.3.1/policy/modules/services/inetd.fc
+--- nsaserefpolicy/policy/modules/services/inetd.fc	2008-06-12 23:38:02.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/inetd.fc	2008-09-03 15:04:23.000000000 -0400
+@@ -1,6 +1,8 @@
+ 
+ /usr/sbin/identd	--	gen_context(system_u:object_r:inetd_child_exec_t,s0)
+ /usr/sbin/in\..*d	--	gen_context(system_u:object_r:inetd_child_exec_t,s0)
++/usr/local/lib/pysieved/pysieved.*\.py -- gen_context(system_u:object_r:inetd_child_exec_t,s0)
++
+ /usr/sbin/inetd		--	gen_context(system_u:object_r:inetd_exec_t,s0)
+ /usr/sbin/rlinetd	--	gen_context(system_u:object_r:inetd_exec_t,s0)
+ /usr/sbin/xinetd	--	gen_context(system_u:object_r:inetd_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.if serefpolicy-3.3.1/policy/modules/services/inetd.if
 --- nsaserefpolicy/policy/modules/services/inetd.if	2008-06-12 23:38:01.000000000 -0400
 +++ serefpolicy-3.3.1/policy/modules/services/inetd.if	2008-07-15 14:02:52.000000000 -0400
@@ -21168,7 +21233,7 @@
  /var/spool/postfix/pid/.*	gen_context(system_u:object_r:postfix_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.3.1/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/postfix.if	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/postfix.if	2008-09-02 15:23:02.000000000 -0400
 @@ -206,9 +206,8 @@
  		type postfix_etc_t;
  	')
@@ -21243,6 +21308,29 @@
  ##	Execute postfix user mail programs
  ##	in their respective domains.
  ## </summary>
+@@ -519,3 +557,22 @@
+ 
+ 	typeattribute $1 postfix_user_domtrans;
+ ')
++
++########################################
++## <summary>
++##	Execute the master postdrop in the
++##	postfix_postdrop domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`postfix_domtrans_postdrop',`
++	gen_require(`
++		type postfix_postdrop_t, postfix_postdrop_exec_t;
++	')
++
++	domtrans_pattern($1, postfix_postdrop_exec_t, postfix_postdrop_t)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.3.1/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2008-06-12 23:38:02.000000000 -0400
 +++ serefpolicy-3.3.1/policy/modules/services/postfix.te	2008-08-29 15:46:12.000000000 -0400
@@ -25555,7 +25643,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.3.1/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/sendmail.te	2008-08-12 10:20:06.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/sendmail.te	2008-09-02 15:23:14.000000000 -0400
 @@ -20,13 +20,17 @@
  mta_mailserver_delivery(sendmail_t)
  mta_mailserver_sender(sendmail_t)
@@ -25614,7 +25702,7 @@
  
  auth_use_nsswitch(sendmail_t)
  
-@@ -91,33 +101,50 @@
+@@ -91,33 +101,51 @@
  libs_read_lib_files(sendmail_t)
  
  logging_send_syslog_msg(sendmail_t)
@@ -25656,6 +25744,7 @@
 +')
 +
 +optional_policy(`
++	postfix_domtrans_postdrop(sendmail_t)
 +	postfix_domtrans_master(sendmail_t)
  	postfix_read_config(sendmail_t)
  	postfix_search_spool(sendmail_t)
@@ -25667,7 +25756,7 @@
  ')
  
  optional_policy(`
-@@ -125,24 +152,25 @@
+@@ -125,24 +153,25 @@
  ')
  
  optional_policy(`
@@ -28422,7 +28511,7 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.3.1/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/xserver.if	2008-08-12 17:02:07.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/xserver.if	2008-09-03 15:05:26.000000000 -0400
 @@ -12,9 +12,15 @@
  ##	</summary>
  ## </param>
@@ -32117,7 +32206,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.3.1/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/libraries.fc	2008-08-01 10:49:37.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/system/libraries.fc	2008-09-02 16:10:03.000000000 -0400
 @@ -69,8 +69,10 @@
  ifdef(`distro_gentoo',`
  # despite the extensions, they are actually libs
@@ -32150,10 +32239,12 @@
  /usr/lib(64)?/xulrunner-[^/]*/libgtkembedmoz\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xulrunner-[^/]*/libxul\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
-@@ -165,6 +170,7 @@
+@@ -164,7 +169,8 @@
+ # Fedora Core packages: gstreamer-plugins, compat-libstdc++, Glide3, libdv
  # 	HelixPlayer, SDL, xorg-x11, xorg-x11-libs, Hermes, valgrind, openoffice.org-libs, httpd - php
  /usr/lib(64)?/gstreamer-.*/[^/]*\.so.* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
- HOME_DIR/.*/\.gstreamer-.*/plugins/*\.so.* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-HOME_DIR/.*/\.gstreamer-.*/plugins/*\.so.* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++HOME_DIR/\.gstreamer-.*/plugins/.*\.so.* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +HOME_DIR/.*/plugins/nppdf\.so.* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  /usr/lib/firefox-[^/]*/plugins/nppdf.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -35957,7 +36048,7 @@
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.3.1/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/userdomain.if	2008-08-12 12:21:18.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/system/userdomain.if	2008-09-03 14:36:03.000000000 -0400
 @@ -29,9 +29,14 @@
  	')
  
@@ -38108,14 +38199,13 @@
  ##	users home directory.
  ## </summary>
  ## <param name="domain">
-@@ -4307,12 +4535,35 @@
+@@ -4307,12 +4535,54 @@
  ##	</summary>
  ## </param>
  #
 -interface(`userdom_dontaudit_append_staff_home_content_files',`
 +interface(`userdom_dontaudit_append_unpriv_home_content_files',`
- 	gen_require(`
--		type staff_home_t;
++	gen_require(`
 +		type user_home_t;
 +	')
 +
@@ -38127,10 +38217,30 @@
 +
 +	tunable_policy(`use_samba_home_dirs',`
 +		fs_dontaudit_append_cifs_files($1)
- 	')
++	')
 +')
++
++########################################
++## <summary>
++##	Do not audit attempts to unlink to the 
++##	users home directory.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`userdom_dontaudit_unlink_unpriv_home_content_files',`
+ 	gen_require(`
+-		type staff_home_t;
++		type user_home_t;
+ 	')
  
 -	dontaudit $1 staff_home_t:file append;
++	dontaudit $1 user_home_t:file unlink;
++')
++
 +########################################
 +## <summary>
 +##	Do not audit attempts to append to the staff
@@ -38147,7 +38257,7 @@
  ')
  
  ########################################
-@@ -4327,13 +4578,13 @@
+@@ -4327,13 +4597,13 @@
  #
  interface(`userdom_read_staff_home_content_files',`
  	gen_require(`
@@ -38165,7 +38275,7 @@
  ')
  
  ########################################
-@@ -4531,10 +4782,10 @@
+@@ -4531,10 +4801,10 @@
  #
  interface(`userdom_getattr_sysadm_home_dirs',`
  	gen_require(`
@@ -38178,7 +38288,7 @@
  ')
  
  ########################################
-@@ -4551,10 +4802,10 @@
+@@ -4551,10 +4821,10 @@
  #
  interface(`userdom_dontaudit_getattr_sysadm_home_dirs',`
  	gen_require(`
@@ -38191,7 +38301,7 @@
  ')
  
  ########################################
-@@ -4569,10 +4820,10 @@
+@@ -4569,10 +4839,10 @@
  #
  interface(`userdom_search_sysadm_home_dirs',`
  	gen_require(`
@@ -38204,7 +38314,7 @@
  ')
  
  ########################################
-@@ -4588,10 +4839,10 @@
+@@ -4588,10 +4858,10 @@
  #
  interface(`userdom_dontaudit_search_sysadm_home_dirs',`
  	gen_require(`
@@ -38217,7 +38327,7 @@
  ')
  
  ########################################
-@@ -4606,10 +4857,10 @@
+@@ -4606,10 +4876,10 @@
  #
  interface(`userdom_list_sysadm_home_dirs',`
  	gen_require(`
@@ -38230,7 +38340,7 @@
  ')
  
  ########################################
-@@ -4625,10 +4876,10 @@
+@@ -4625,10 +4895,10 @@
  #
  interface(`userdom_dontaudit_list_sysadm_home_dirs',`
  	gen_require(`
@@ -38243,7 +38353,7 @@
  ')
  
  ########################################
-@@ -4644,12 +4895,29 @@
+@@ -4644,12 +4914,29 @@
  #
  interface(`userdom_dontaudit_read_sysadm_home_content_files',`
  	gen_require(`
@@ -38277,7 +38387,7 @@
  ')
  
  ########################################
-@@ -4676,10 +4944,10 @@
+@@ -4676,10 +4963,10 @@
  #
  interface(`userdom_sysadm_home_dir_filetrans',`
  	gen_require(`
@@ -38290,7 +38400,7 @@
  ')
  
  ########################################
-@@ -4694,10 +4962,10 @@
+@@ -4694,10 +4981,10 @@
  #
  interface(`userdom_search_sysadm_home_content_dirs',`
  	gen_require(`
@@ -38303,7 +38413,7 @@
  ')
  
  ########################################
-@@ -4712,13 +4980,13 @@
+@@ -4712,13 +4999,13 @@
  #
  interface(`userdom_read_sysadm_home_content_files',`
  	gen_require(`
@@ -38321,20 +38431,103 @@
  ')
  
  ########################################
-@@ -4754,11 +5022,49 @@
+@@ -4754,16 +5041,16 @@
  #
  interface(`userdom_search_all_users_home_dirs',`
  	gen_require(`
+-		attribute home_dir_type;
 +		attribute user_home_dir_type;
+ 	')
+ 
+ 	files_list_home($1)
+-	allow $1 home_dir_type:dir search_dir_perms;
++	allow $1 user_home_dir_type:dir search_dir_perms;
+ ')
+ 
+ ########################################
+ ## <summary>
+-##	List all users home directories.
++##	Read all users home directories symlinks.
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -4771,18 +5058,18 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_list_all_users_home_dirs',`
++interface(`userdom_read_all_users_home_dirs_symlinks',`
+ 	gen_require(`
+ 		attribute home_dir_type;
+ 	')
+ 
+ 	files_list_home($1)
+-	allow $1 home_dir_type:dir list_dir_perms;
++	allow $1 home_dir_type:lnk_file read_lnk_file_perms;
+ ')
+ 
+ ########################################
+ ## <summary>
+-##	Search all users home directories.
++##	Read all users home directories symlinks.
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -4790,36 +5077,84 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_search_all_users_home_content',`
++interface(`userdom_read_all_users_home_content_symlinks',`
+ 	gen_require(`
+-		attribute home_dir_type, home_type;
++		type user_home_t;
+ 	')
+ 
+ 	files_list_home($1)
+-	allow $1 { home_dir_type home_type }:dir search_dir_perms;
++	allow $1 user_home_t:lnk_file read_lnk_file_perms;
+ ')
+ 
+ ########################################
+ ## <summary>
+-##	Do not audit attempts to search all users home directories.
++##	List all users home directories.
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+-##	Domain to not audit.
++##	Domain allowed access.
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_dontaudit_search_all_users_home_content',`
++interface(`userdom_list_all_users_home_dirs',`
+ 	gen_require(`
+-		attribute home_dir_type, home_type;
++		attribute home_dir_type;
+ 	')
+ 
+-	dontaudit $1 { home_dir_type home_type }:dir search_dir_perms;
+-')
++	files_list_home($1)
++	allow $1 home_dir_type:dir list_dir_perms;
+ 
+-########################################
+-## <summary>
+-##	Read all files in all users home directories.
++	tunable_policy(`use_nfs_home_dirs',`
++		fs_list_nfs($1)
 +	')
 +
-+	files_list_home($1)
-+	allow $1 user_home_dir_type:dir search_dir_perms;
++	tunable_policy(`use_samba_home_dirs',`
++		fs_list_cifs($1)
++	')
 +')
 +
 +########################################
 +## <summary>
-+##	Read all users home directories symlinks.
++##	Search all users home directories.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -38342,87 +38535,46 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_read_all_users_home_dirs_symlinks',`
++interface(`userdom_search_all_users_home_content',`
 +	gen_require(`
- 		attribute home_dir_type;
- 	')
- 
- 	files_list_home($1)
--	allow $1 home_dir_type:dir search_dir_perms;
-+	allow $1 home_dir_type:lnk_file read_lnk_file_perms;
++		attribute home_dir_type, home_type;
++	')
++
++	files_list_home($1)
++	allow $1 { home_dir_type home_type }:dir search_dir_perms;
 +')
 +
 +########################################
 +## <summary>
-+##	Read all users home directories symlinks.
++##	Do not audit attempts to search all users home directories.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
-+##	Domain allowed access.
++##	Domain to not audit.
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_read_all_users_home_content_symlinks',`
++interface(`userdom_dontaudit_search_all_users_home_content',`
 +	gen_require(`
-+		type user_home_t;
-+	')
-+
-+	files_list_home($1)
-+	allow $1 user_home_t:lnk_file read_lnk_file_perms;
- ')
- 
- ########################################
-@@ -4778,6 +5084,14 @@
- 
- 	files_list_home($1)
- 	allow $1 home_dir_type:dir list_dir_perms;
-+
-+	tunable_policy(`use_nfs_home_dirs',`
-+		fs_list_nfs($1)
++		attribute home_dir_type, home_type;
 +	')
 +
-+	tunable_policy(`use_samba_home_dirs',`
-+		fs_list_cifs($1)
-+	')
- ')
- 
- ########################################
-@@ -4815,6 +5129,8 @@
- 	')
- 
- 	dontaudit $1 { home_dir_type home_type }:dir search_dir_perms;
++	dontaudit $1 { home_dir_type home_type }:dir search_dir_perms;
 +	fs_dontaudit_list_nfs($1)
 +	fs_dontaudit_list_cifs($1)
- ')
- 
- ########################################
-@@ -4839,7 +5155,7 @@
- 
- ########################################
- ## <summary>
--##	Create, read, write, and delete all directories
-+##	delete all directories
- ##	in all users home directories.
- ## </summary>
- ## <param name="domain">
-@@ -4848,13 +5164,52 @@
- ##	</summary>
- ## </param>
- #
--interface(`userdom_manage_all_users_home_content_dirs',`
-+interface(`userdom_delete_all_users_home_content_dirs',`
- 	gen_require(`
- 		attribute home_type;
- 	')
- 
- 	files_list_home($1)
--	allow $1 home_type:dir manage_dir_perms;
-+	delete_dirs_pattern($1, home_type, home_type)
 +')
 +
 +########################################
 +## <summary>
-+##	Create, read, write, and delete all directories
++##	Read all files in all users home directories.
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -4839,6 +5174,26 @@
+ 
+ ########################################
+ ## <summary>
++##	delete all directories
 +##	in all users home directories.
 +## </summary>
 +## <param name="domain">
@@ -38431,17 +38583,24 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_manage_all_users_home_content_dirs',`
++interface(`userdom_delete_all_users_home_content_dirs',`
 +	gen_require(`
 +		attribute home_type;
 +	')
 +
 +	files_list_home($1)
-+	allow $1 home_type:dir manage_dir_perms;
++	delete_dirs_pattern($1, home_type, home_type)
 +')
 +
 +########################################
 +## <summary>
+ ##	Create, read, write, and delete all directories
+ ##	in all users home directories.
+ ## </summary>
+@@ -4859,6 +5214,25 @@
+ 
+ ########################################
+ ## <summary>
 +##	Delete all files
 +##	in all users home directories.
 +## </summary>
@@ -38457,10 +38616,14 @@
 +	')
 +
 +	delete_files_pattern($1,home_type,home_type)
- ')
- 
- ########################################
-@@ -4879,6 +5234,26 @@
++')
++
++########################################
++## <summary>
+ ##	Create, read, write, and delete all files
+ ##	in all users home directories.
+ ## </summary>
+@@ -4879,6 +5253,26 @@
  
  ########################################
  ## <summary>
@@ -38487,7 +38650,7 @@
  ##	Create, read, write, and delete all symlinks
  ##	in all users home directories.
  ## </summary>
-@@ -5115,7 +5490,7 @@
+@@ -5115,7 +5509,7 @@
  #
  interface(`userdom_relabelto_generic_user_home_dirs',`
  	gen_require(`
@@ -38496,7 +38659,7 @@
  	')
  
  	files_search_home($1)
-@@ -5304,6 +5679,63 @@
+@@ -5304,6 +5698,63 @@
  
  ########################################
  ## <summary>
@@ -38560,7 +38723,7 @@
  ##	Create, read, write, and delete directories in
  ##	unprivileged users home directories.
  ## </summary>
-@@ -5509,6 +5941,43 @@
+@@ -5509,6 +5960,43 @@
  
  ########################################
  ## <summary>
@@ -38604,7 +38767,7 @@
  ##	Read and write unprivileged user ttys.
  ## </summary>
  ## <param name="domain">
-@@ -5559,7 +6028,7 @@
+@@ -5559,7 +6047,7 @@
  		attribute userdomain;
  	')
  
@@ -38613,7 +38776,7 @@
  	kernel_search_proc($1)
  ')
  
-@@ -5674,6 +6143,42 @@
+@@ -5674,6 +6162,42 @@
  
  ########################################
  ## <summary>
@@ -38656,7 +38819,7 @@
  ##	Send a dbus message to all user domains.
  ## </summary>
  ## <param name="domain">
-@@ -5704,3 +6209,408 @@
+@@ -5704,3 +6228,408 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v
retrieving revision 1.704
retrieving revision 1.705
diff -u -r1.704 -r1.705
--- selinux-policy.spec	29 Aug 2008 20:40:28 -0000	1.704
+++ selinux-policy.spec	3 Sep 2008 20:24:24 -0000	1.705
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.3.1
-Release: 87%{?dist}
+Release: 88%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -386,6 +386,9 @@
 %endif
 
 %changelog
+* Tue Sep 2 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-88
+- Allow sendmail to transition to postfix_postdrop_t
+
 * Tue Aug 26 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-87
 - Allow crontab to work for unconfined users
 - Allow courier_authdaemon_t to create sock_file in courier_spool directories



From kevin at fedoraproject.org  Wed Sep  3 20:26:39 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:26:39 +0000 (UTC)
Subject: rpms/coredumper/devel - New directory
Message-ID: <20080903202639.5F7427002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/coredumper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssg4471/rpms/coredumper/devel

Log Message:
Directory /cvs/extras/rpms/coredumper/devel added to the repository




From kevin at fedoraproject.org  Wed Sep  3 20:24:01 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:24:01 +0000 (UTC)
Subject: rpms/sugar-terminal Makefile,NONE,1.1
Message-ID: <20080903202401.5F9F27002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-terminal
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQb4046/rpms/sugar-terminal

Added Files:
	Makefile 
Log Message:
Setup of module sugar-terminal


--- NEW FILE Makefile ---
# Top level Makefile for module sugar-terminal
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep  3 20:24:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:24:49 +0000
Subject: [pkgdb] freemarker was added for victorv
Message-ID: <20080903202449.C5B562E0107@bastion.fedora.phx.redhat.com>

kevin has added Package freemarker with summary FreeMarker template engine
kevin has approved Package freemarker
kevin has added a Fedora devel branch for freemarker with an owner of victorv
kevin has approved freemarker in Fedora devel
kevin has approved Package freemarker
kevin has set commit to Approved for packager on freemarker (Fedora devel)
kevin has set build to Approved for packager on freemarker (Fedora devel)
kevin has set checkout to Approved for packager on freemarker (Fedora devel)
kevin has set commit to Approved for uberpackager on freemarker (Fedora devel)
kevin has set build to Approved for uberpackager on freemarker (Fedora devel)
kevin has set checkout to Approved for uberpackager on freemarker (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freemarker



From pkgdb at fedoraproject.org  Wed Sep  3 20:26:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:26:25 +0000
Subject: [pkgdb] coredumper (Fedora, 9) updated by kevin
Message-ID: <20080903202625.9AA662E013B@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for coredumper
kevin has set commit to Approved for uberpackager on coredumper (Fedora 9)
kevin has set build to Approved for uberpackager on coredumper (Fedora 9)
kevin has set checkout to Approved for uberpackager on coredumper (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coredumper



From kevin at fedoraproject.org  Wed Sep  3 20:25:02 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:25:02 +0000 (UTC)
Subject: rpms/freemarker/devel - New directory
Message-ID: <20080903202502.667A27002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/freemarker/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIq4268/rpms/freemarker/devel

Log Message:
Directory /cvs/extras/rpms/freemarker/devel added to the repository




From kevin at fedoraproject.org  Wed Sep  3 20:26:39 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:26:39 +0000 (UTC)
Subject: rpms/coredumper - New directory
Message-ID: <20080903202639.2737D7002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/coredumper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssg4471/rpms/coredumper

Log Message:
Directory /cvs/extras/rpms/coredumper added to the repository




From spot at fedoraproject.org  Wed Sep  3 20:20:06 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 20:20:06 +0000 (UTC)
Subject: rpms/recordmydesktop/devel recordmydesktop.spec,1.9,1.10
Message-ID: <20080903202006.CC5967002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/recordmydesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3298

Modified Files:
	recordmydesktop.spec 
Log Message:
fix license tag


Index: recordmydesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/recordmydesktop/devel/recordmydesktop.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- recordmydesktop.spec	28 May 2008 14:17:40 -0000	1.9
+++ recordmydesktop.spec	3 Sep 2008 20:19:36 -0000	1.10
@@ -1,10 +1,10 @@
 Name:           recordmydesktop
 Version:        0.3.7.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Desktop session recorder with audio and video
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2+
 URL:            http://recordmydesktop.iovar.org/
 Source0:        http://dl.sourceforge.net/recordmydesktop/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.7.3-2
+- fix license tag
+
 * Wed May 28 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.7.3-1
 - New upstream release
 



From spot at fedoraproject.org  Wed Sep  3 20:48:40 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 20:48:40 +0000 (UTC)
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.204,1.205
Message-ID: <20080903204840.C954F7002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7750

Modified Files:
	rhythmbox.spec 
Log Message:
fix license tag


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- rhythmbox.spec	1 Sep 2008 14:49:54 -0000	1.204
+++ rhythmbox.spec	3 Sep 2008 20:48:10 -0000	1.205
@@ -3,8 +3,8 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.6
-Release: 7%{?dist}
-License: GPLv2+ and GFDL+
+Release: 8%{?dist}
+License: GPLv2+ and GFDL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
 Source: http://download.gnome.org/sources/rhythmbox/0.11/%{name}-%{version}.tar.bz2
@@ -219,6 +219,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.11.6-8
+- fix license tag
+
 * Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> 0.11.6-7
 - Add wbur.org to the default playlist (#446791)
 



From jwrdegoede at fedoraproject.org  Wed Sep  3 20:50:35 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed,  3 Sep 2008 20:50:35 +0000 (UTC)
Subject: rpms/cheese/devel cheese-2.23.90-only-list-resolutions-once.patch, 
	NONE, 1.1 cheese-2.23.90-sort-resolutions.patch, NONE, 1.1
	cheese-2.23.91-cheese_webcam_get_supported_video_formats-shuffle.patch,
	NONE, 1.1 cheese-2.23.91-dont-use-non-capture-devices.patch,
	NONE, 1.1 cheese-2.23.91-let-gstreamer-choose-yuv-or-rgb.patch,
	NONE, 1.1 cheese-2.23.91-supported-resolutions-per-device.patch,
	NONE, 1.1 cheese.spec, 1.30, 1.31
Message-ID: <20080903205035.CD20C7002B@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/cheese/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8179

Modified Files:
	cheese.spec 
Added Files:
	cheese-2.23.90-only-list-resolutions-once.patch 
	cheese-2.23.90-sort-resolutions.patch 
	cheese-2.23.91-cheese_webcam_get_supported_video_formats-shuffle.patch 
	cheese-2.23.91-dont-use-non-capture-devices.patch 
	cheese-2.23.91-let-gstreamer-choose-yuv-or-rgb.patch 
	cheese-2.23.91-supported-resolutions-per-device.patch 
Log Message:
* Wed Sep  3 2008 Hans de Goede <hdegoede at redhat.com> 2.23.91-2
- Fix use with multiple v4l devices (rh 460956, gnome 546868, gnome 547144)


cheese-2.23.90-only-list-resolutions-once.patch:

--- NEW FILE cheese-2.23.90-only-list-resolutions-once.patch ---
diff -up cheese-2.23.90/src/cheese-webcam.c.qwerty cheese-2.23.90/src/cheese-webcam.c
--- cheese-2.23.90/src/cheese-webcam.c.qwerty	2008-09-02 17:14:30.000000000 +0200
+++ cheese-2.23.90/src/cheese-webcam.c	2008-09-02 19:38:50.000000000 +0200
@@ -442,6 +442,7 @@ cheese_webcam_add_video_format (CheeseWe
   CheeseVideoFormat *video_format, GstStructure *format_structure)
 {
   int i;
+  gchar *resolution;
 
   cheese_webcam_get_supported_framerates (video_format, format_structure);
   find_highest_framerate (video_format);
@@ -453,12 +454,33 @@ cheese_webcam_add_video_format (CheeseWe
     g_print ("%d/%d ", video_format->framerates[i].numerator,
              video_format->framerates[i].denominator);
   }
-  g_print ("\n");
+  
+  resolution = g_strdup_printf ("%ix%i", video_format->width,
+                                video_format->height);
+  i = GPOINTER_TO_INT(g_hash_table_lookup (
+                                     webcam_device->supported_resolutions,
+                                     resolution));
+  if (i) { /* Resolution already added ? */
+    CheeseVideoFormat *curr_format = &g_array_index(
+                                                webcam_device->video_formats,
+                                                CheeseVideoFormat, i - 1);
+    float new_framerate = (float)video_format->highest_framerate.numerator /
+                                 video_format->highest_framerate.denominator;
+    float curr_framerate = (float)curr_format->highest_framerate.numerator /
+                                  curr_format->highest_framerate.denominator;
+    if (new_framerate > curr_framerate) {
+      g_print ("higher framerate replacing existing format\n");
+      *curr_format = *video_format;
+    }
+    else
+      g_print ("already added, skipping\n");
+
+    g_free (resolution);
+    return;
+  }
 
   g_array_append_val (webcam_device->video_formats, *video_format);
-  g_hash_table_insert (webcam_device->supported_resolutions, 
-                       g_strdup_printf ("%ix%i", video_format->width,
-                                        video_format->height), 
+  g_hash_table_insert (webcam_device->supported_resolutions, resolution,
                        GINT_TO_POINTER(webcam_device->num_video_formats + 1));
 
   webcam_device->num_video_formats++;

cheese-2.23.90-sort-resolutions.patch:

--- NEW FILE cheese-2.23.90-sort-resolutions.patch ---
diff -up cheese-2.23.90/src/cheese-webcam.c.qwerty cheese-2.23.90/src/cheese-webcam.c
--- cheese-2.23.90/src/cheese-webcam.c.qwerty	2008-09-02 19:41:29.000000000 +0200
+++ cheese-2.23.90/src/cheese-webcam.c	2008-09-02 20:01:33.000000000 +0200
@@ -486,6 +486,17 @@ cheese_webcam_add_video_format (CheeseWe
   webcam_device->num_video_formats++;
 }
 
+static gint cheese_resolution_compare(gconstpointer _a, gconstpointer _b)
+{
+  const CheeseVideoFormat *a = _a;
+  const CheeseVideoFormat *b = _b;
+
+  if (a->width == b->width)
+    return a->height - b->height;
+
+  return a->width - b->width;
+}
+
 static void
 cheese_webcam_get_supported_video_formats (CheeseWebcamDevice *webcam_device, GstCaps *caps)
 {
@@ -564,6 +575,20 @@ cheese_webcam_get_supported_video_format
       g_critical ("GValue type %s, cannot be handled for resolution width", G_VALUE_TYPE_NAME (width));
     }
   }
+  
+  /* Sort the format array (so that it will show sorted in the resolution
+     selection GUI), and rebuild the hashtable (as that will be invalid after
+     the sorting) */
+  g_array_sort (webcam_device->video_formats, cheese_resolution_compare);
+  g_hash_table_remove_all (webcam_device->supported_resolutions);
+  for (i = 0; i < webcam_device->num_video_formats; i++) {
+    CheeseVideoFormat *format = &g_array_index(webcam_device->video_formats,
+                                               CheeseVideoFormat, i);
+    g_hash_table_insert (webcam_device->supported_resolutions, 
+                         g_strdup_printf ("%ix%i", format->width,
+                                          format->height), 
+                         GINT_TO_POINTER(i + 1));
+  }
 }
 
 static void

cheese-2.23.91-cheese_webcam_get_supported_video_formats-shuffle.patch:

--- NEW FILE cheese-2.23.91-cheese_webcam_get_supported_video_formats-shuffle.patch ---
diff -up cheese-2.23.91/src/cheese-webcam.c.coocoo cheese-2.23.91/src/cheese-webcam.c
--- cheese-2.23.91/src/cheese-webcam.c.coocoo	2008-09-03 20:34:12.000000000 +0200
+++ cheese-2.23.91/src/cheese-webcam.c	2008-09-03 22:36:43.000000000 +0200
@@ -48,6 +48,8 @@ G_DEFINE_TYPE (CheeseWebcam, cheese_webc
 
 #define CHEESE_WEBCAM_ERROR cheese_webcam_error_quark ()
 
+static void find_highest_framerate (CheeseVideoFormat *format);
+
 enum CheeseWebcamError
 {
   CHEESE_WEBCAM_ERROR_UNKNOWN,
@@ -444,6 +446,33 @@ cheese_webcam_get_supported_framerates (
 }
 
 static void
+cheese_webcam_add_video_format (CheeseWebcamDevice *webcam_device,
+  CheeseVideoFormat *video_format, GstStructure *format_structure)
+{
+  int i;
+
+  cheese_webcam_get_supported_framerates (video_format, format_structure);
+  find_highest_framerate (video_format);
+
+  g_print ("%s %d x %d num_framerates %d\n", video_format->mimetype, video_format->width, 
+           video_format->height, video_format->num_framerates);
+  for (i = 0; i < video_format->num_framerates; i++)
+  {
+    g_print ("%d/%d ", video_format->framerates[i].numerator,
+             video_format->framerates[i].denominator);
+  }
+  g_print ("\n");
+
+  g_array_append_val (webcam_device->video_formats, *video_format);
+  g_hash_table_insert (webcam_device->supported_resolutions, 
+                       g_strdup_printf ("%ix%i", video_format->width,
+                                        video_format->height), 
+                       GINT_TO_POINTER(webcam_device->num_video_formats + 1));
+
+  webcam_device->num_video_formats++;
+}
+
+static void
 cheese_webcam_get_supported_video_formats (CheeseWebcamDevice *webcam_device, GstCaps *caps)
 {
   int i;
@@ -476,10 +505,7 @@ cheese_webcam_get_supported_video_format
       video_format.mimetype = g_strdup (gst_structure_get_name (structure));
       gst_structure_get_int (structure, "width", &(video_format.width));
       gst_structure_get_int (structure, "height", &(video_format.height));
-      cheese_webcam_get_supported_framerates (&video_format, structure);
-
-      g_array_append_val (webcam_device->video_formats, video_format);
-      webcam_device->num_video_formats++;
+      cheese_webcam_add_video_format(webcam_device, &video_format, structure);
     }
     else if (GST_VALUE_HOLDS_INT_RANGE (width))
     {
@@ -500,9 +526,7 @@ cheese_webcam_get_supported_video_format
         video_format.mimetype = g_strdup (gst_structure_get_name (structure));
         video_format.width    = cur_width;
         video_format.height   = cur_height;
-        cheese_webcam_get_supported_framerates (&video_format, structure);
-        g_array_append_val (webcam_device->video_formats, video_format);
-        webcam_device->num_video_formats++;
+        cheese_webcam_add_video_format(webcam_device, &video_format, structure);
         cur_width  *= 2;
         cur_height *= 2;
       }
@@ -516,9 +540,7 @@ cheese_webcam_get_supported_video_format
         video_format.mimetype = g_strdup (gst_structure_get_name (structure));
         video_format.width    = cur_width;
         video_format.height   = cur_height;
-        cheese_webcam_get_supported_framerates (&video_format, structure);
-        g_array_append_val (webcam_device->video_formats, video_format);
-        webcam_device->num_video_formats++;
+        cheese_webcam_add_video_format(webcam_device, &video_format, structure);
         cur_width  /= 2;
         cur_height /= 2;
       }
@@ -540,7 +562,6 @@ cheese_webcam_get_webcam_device_data (Ch
   GstStateChangeReturn ret;
   GstMessage          *msg;
   GstBus              *bus;
-  int                  i, j;
 
   {
     pipeline_desc = g_strdup_printf ("%s name=source device=%s ! fakesink",
@@ -575,6 +596,7 @@ cheese_webcam_get_webcam_device_data (Ch
           name = "Unknown";
 
         g_print ("Detected webcam: %s\n", name);
+        g_print ("device: %s\n", webcam_device->video_device);
         pad                         = gst_element_get_pad (src, "src");
         caps                        = gst_pad_get_caps (pad);
         gst_object_unref (pad);
@@ -589,27 +611,6 @@ cheese_webcam_get_webcam_device_data (Ch
 
     g_free (pipeline_desc);
   }
-
-  g_print ("device: %s\n", webcam_device->video_device);
-  for (i = 0; i < webcam_device->num_video_formats; i++)
-  {
-    CheeseVideoFormat video_format;
-
-    video_format = g_array_index (webcam_device->video_formats, CheeseVideoFormat, i);
-    g_hash_table_insert (webcam_device->supported_resolutions,
-                         g_strdup_printf ("%ix%i", video_format.width,
-                                          video_format.height),
-                         &g_array_index (webcam_device->video_formats,
-                                         CheeseVideoFormat, i));
-    g_print ("%s %d x %d num_framerates %d\n", video_format.mimetype, video_format.width,
-             video_format.height, video_format.num_framerates);
-    for (j = 0; j < video_format.num_framerates; j++)
-    {
-      g_print ("%d/%d ", video_format.framerates[j].numerator,
-               video_format.framerates[j].denominator);
-    }
-    g_print ("\n");
-  }
 }
 
 static void
@@ -651,8 +652,7 @@ cheese_webcam_detect_webcam_devices (Che
 }
 
 static void
-find_highest_framerate (CheeseVideoFormat *format, int *numerator,
-                        int *denominator)
+find_highest_framerate (CheeseVideoFormat *format)
 {
   int framerate_numerator;
   int framerate_denominator;
@@ -672,8 +672,8 @@ find_highest_framerate (CheeseVideoForma
     }
   }
 
-  *numerator   = framerate_numerator;
-  *denominator = framerate_denominator;
+  format->highest_framerate.numerator = framerate_numerator;
+  format->highest_framerate.denominator = framerate_denominator;
 }
 
 static gboolean
@@ -695,7 +695,6 @@ cheese_webcam_create_webcam_source_bin (
   {
     CheeseVideoFormat *format;
     int                i;
-    int                framerate_numerator, framerate_denominator;
     gchar             *resolution;
 
     /* If we have a matching video device use that one, otherwise use the first */
@@ -714,7 +713,12 @@ cheese_webcam_create_webcam_source_bin (
     /* Use the previously set resolution from gconf if it is set and the
      * camera supports it. */
     if (priv->x_resolution != 0 && priv->y_resolution != 0)
-      format = g_hash_table_lookup (selected_webcam->supported_resolutions, resolution);
+    {
+      i = GPOINTER_TO_INT(g_hash_table_lookup (selected_webcam->supported_resolutions, resolution));
+      if (i)
+        format = &g_array_index (selected_webcam->video_formats,
+                                 CheeseVideoFormat, i - 1);
+    }
 
     if (!format)
     {
@@ -738,21 +742,18 @@ cheese_webcam_create_webcam_source_bin (
     if (format == NULL)
       goto fallback;
 
-    find_highest_framerate (format, &framerate_numerator,
-                            &framerate_denominator);
-
     webcam_input = g_strdup_printf (
       "%s name=video_source device=%s ! capsfilter name=capsfilter caps=video/x-raw-rgb,width=%d,height=%d,framerate=%d/%d;video/x-raw-yuv,width=%d,height=%d,framerate=%d/%d ! identity",
       selected_webcam->gstreamer_src,
       selected_webcam->video_device,
       format->width,
       format->height,
-      framerate_numerator,
-      framerate_denominator,
+      format->highest_framerate.numerator,
+      format->highest_framerate.denominator,
       format->width,
       format->height,
-      framerate_numerator,
-      framerate_denominator);
+      format->highest_framerate.numerator,
+      format->highest_framerate.denominator);
     g_print ("%s\n", webcam_input);
 
     priv->webcam_source_bin = gst_parse_bin_from_description (webcam_input,
@@ -1539,10 +1540,6 @@ cheese_webcam_set_video_format (CheeseWe
   CheeseWebcamPrivate *priv = CHEESE_WEBCAM_GET_PRIVATE (webcam);
 
   GstCaps *new_caps;
-  int      framerate_numerator;
-  int      framerate_denominator;
-
-  find_highest_framerate (format, &framerate_numerator, &framerate_denominator);
 
   new_caps = gst_caps_new_simple ("video/x-raw-rgb",
                                   "width", G_TYPE_INT,
@@ -1550,8 +1547,8 @@ cheese_webcam_set_video_format (CheeseWe
                                   "height", G_TYPE_INT,
                                   format->height,
                                   "framerate", GST_TYPE_FRACTION,
-                                  framerate_numerator,
-                                  framerate_denominator,
+                                  format->highest_framerate.numerator,
+                                  format->highest_framerate.denominator,
                                   NULL);
 
   gst_caps_append(new_caps, gst_caps_new_simple ("video/x-raw-yuv",
@@ -1560,8 +1557,8 @@ cheese_webcam_set_video_format (CheeseWe
                                   "height", G_TYPE_INT,
                                   format->height,
                                   "framerate", GST_TYPE_FRACTION,
-                                  framerate_numerator,
-                                  framerate_denominator,
+                                  format->highest_framerate.numerator,
+                                  format->highest_framerate.denominator,
                                   NULL));
 
   priv->current_format = format;
diff -up cheese-2.23.91/src/cheese-webcam.h.coocoo cheese-2.23.91/src/cheese-webcam.h
--- cheese-2.23.91/src/cheese-webcam.h.coocoo	2008-09-03 20:27:59.000000000 +0200
+++ cheese-2.23.91/src/cheese-webcam.h	2008-09-03 22:31:42.000000000 +0200
@@ -49,6 +49,7 @@ typedef struct
   int   height;
   int   num_framerates;
   CheeseFramerate *framerates;
+  CheeseFramerate highest_framerate;
 } CheeseVideoFormat;
 
 typedef struct

cheese-2.23.91-dont-use-non-capture-devices.patch:

--- NEW FILE cheese-2.23.91-dont-use-non-capture-devices.patch ---
diff -up cheese-2.23.91/src/cheese-webcam.c.orig cheese-2.23.91/src/cheese-webcam.c
--- cheese-2.23.91/src/cheese-webcam.c.orig	2008-09-01 20:47:10.000000000 +0200
+++ cheese-2.23.91/src/cheese-webcam.c	2008-09-03 20:27:25.000000000 +0200
@@ -33,6 +33,11 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <X11/Xlib.h>
 #include <libhal.h>
+/* for ioctl query */
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <linux/videodev.h>
 
 #include "cheese-webcam.h"
 #include "cheese-flash.h"
@@ -235,16 +240,13 @@ cheese_webcam_get_video_devices_from_hal
 {
   CheeseWebcamPrivate *priv = CHEESE_WEBCAM_GET_PRIVATE (webcam);
 
-  int i;
-  int num_udis;
-  int num_devices;                  /* Devices we actually create formats for; can either be the
-                                     * number of webcams detected, or 1 if none were. The one
-                                     * refers to a fake device so that resolution changing still
-                                     * works even if the computer doesn't have a webcam. */
+  int i, fd, ok;
+  int num_udis = 0;
   char         **udis;
   DBusError      error;
   LibHalContext *hal_ctx;
 
+  priv->num_webcam_devices = 0;
 
   dbus_error_init (&error);
   hal_ctx = libhal_ctx_new ();
@@ -252,14 +254,14 @@ cheese_webcam_get_video_devices_from_hal
   {
     g_error ("error: libhal_ctx_new");
     dbus_error_free (&error);
-    return;
+    goto fallback;
   }
 
   if (!libhal_ctx_set_dbus_connection (hal_ctx, dbus_bus_get (DBUS_BUS_SYSTEM, &error)))
   {
     g_error ("error: libhal_ctx_set_dbus_connection: %s: %s", error.name, error.message);
     dbus_error_free (&error);
-    return;
+    goto fallback;
   }
 
   if (!libhal_ctx_init (hal_ctx, &error))
@@ -271,53 +273,113 @@ cheese_webcam_get_video_devices_from_hal
     }
     g_error ("Could not initialise connection to hald.\n"
              "Normally this means the HAL daemon (hald) is not running or not ready");
-    return;
+    goto fallback;
   }
 
   udis = libhal_find_device_by_capability (hal_ctx, "video4linux", &num_udis, &error);
 
   if (dbus_error_is_set (&error))
   {
-    g_error ("error: %s: %s\n", error.name, error.message);
+    g_error ("error: libhal_find_device_by_capability: %s: %s\n", error.name, error.message);
     dbus_error_free (&error);
-    return;
+    goto fallback;
   }
 
   /* Initialize webcam structures */
+  priv->webcam_devices = g_new0 (CheeseWebcamDevice, num_udis);
 
-  if (num_udis > 0)
-    priv->num_webcam_devices = num_devices = num_udis;
-  else
-  {
-    num_devices              = 1;
-    priv->num_webcam_devices = num_udis;  /* We don't have any real cameras--
-                                           * this is important when we create
-                                           * the pipeline. */
-  }
-
-  priv->webcam_devices = g_new0 (CheeseWebcamDevice, num_devices);
-  for (i = 0; i < num_devices; i++)
-  {
-    priv->webcam_devices[i].num_video_formats = 0;
-    priv->webcam_devices[i].video_formats     = g_array_new (FALSE, FALSE, sizeof (CheeseVideoFormat));
-    priv->webcam_devices[i].hal_udi           = g_strdup (udis[i]);
-  }
-
-  for (i = 0; i < priv->num_webcam_devices; i++)
+  for (i = 0; i < num_udis; i++) 
   {
     char *device;
+    char *gstreamer_src, *product_name;
+    struct v4l2_capability v2cap;
+    struct video_capability v1cap;
 
     device = libhal_device_get_property_string (hal_ctx, udis[i], "video4linux.device", &error);
-    if (dbus_error_is_set (&error))
+    if (dbus_error_is_set (&error)) 
     {
-      g_error ("error: %s: %s\n", error.name, error.message);
+      g_error ("error geting device for %s: %s: %s\n", udis[i], error.name, error.message);
       dbus_error_free (&error);
-      return;
+      continue;
+    }
+
+    /* vbi devices support capture capability too, but cannot be used,
+       so detect them by device name */
+    if (strstr(device, "vbi"))
+    {
+      g_print ("Skipping vbi device: %s\n", device);
+      libhal_free_string (device);
+      continue;
+    }
+
+    if ((fd = open(device, O_RDONLY | O_NONBLOCK)) < 0)
+    {
+      g_error ("Failed to open %s: %s\n", device, strerror(errno));
+      libhal_free_string (device);
+      continue;
+    }
+    ok = ioctl (fd, VIDIOC_QUERYCAP, &v2cap);
+    if (ok < 0) {
+      ok = ioctl (fd, VIDIOCGCAP, &v1cap);
+      if (ok < 0) {
+        g_error ("Error while probing v4l capabilities for %s: %s\n",
+                 device, strerror (errno));
+        libhal_free_string (device);
+        close(fd);
+        continue;
+      }
+      g_print ("Detected v4l device: %s\n", v1cap.name);
+      g_print ("Device type: %d\n", v1cap.type);
+      gstreamer_src = "v4lsrc";
+      product_name = v1cap.name;
+    }
+    else
+    {
+      guint cap = v2cap.capabilities;
+      g_print ("Detected v4l2 device: %s\n", v2cap.card);
+      g_print ("Driver: %s, version: %d\n", v2cap.driver, v2cap.version);
+      g_print ("Bus info: %s\n", v2cap.bus_info);
+      g_print ("Capabilities: 0x%08X\n", v2cap.capabilities);
+      if (!(cap & V4L2_CAP_VIDEO_CAPTURE))
+      {
+        g_print ("Device %s seems to not have the capture capability, (radio tuner?)\n"
+                 "Removing it from device list.\n", device);
+        libhal_free_string (device);
+        close(fd);
+        continue;
+      }
+      gstreamer_src = "v4l2src";
+      product_name = (char *)v2cap.card;
     }
-    priv->webcam_devices[i].video_device = g_strdup (device);
+
+    priv->webcam_devices[priv->num_webcam_devices].hal_udi = g_strdup (udis[i]);
+    priv->webcam_devices[priv->num_webcam_devices].video_device = g_strdup (device);
+    priv->webcam_devices[priv->num_webcam_devices].gstreamer_src = g_strdup (gstreamer_src);
+    priv->webcam_devices[priv->num_webcam_devices].product_name = g_strdup (product_name);
+    priv->webcam_devices[priv->num_webcam_devices].num_video_formats = 0;
+    priv->webcam_devices[priv->num_webcam_devices].video_formats = 
+      g_array_new (FALSE, FALSE, sizeof (CheeseVideoFormat));
+    priv->num_webcam_devices++;
+
     libhal_free_string (device);
+    close(fd);
   }
   libhal_free_string_array (udis);
+
+  if (priv->num_webcam_devices == 0)
+  {
+    /* Create a fake device so that resolution changing stil works even if the
+       computer doesn't have a webcam. */
+fallback:
+    if (num_udis == 0)
+    {
+      priv->webcam_devices = g_new0 (CheeseWebcamDevice, 1);
+    }
+    priv->webcam_devices[0].num_video_formats = 0;
+    priv->webcam_devices[0].video_formats =
+      g_array_new (FALSE, FALSE, sizeof (CheeseVideoFormat));
+    priv->webcam_devices[0].hal_udi = g_strdup ("cheese_fake_videodevice");
+  }
 }
 
 static void
@@ -479,19 +541,11 @@ cheese_webcam_get_webcam_device_data (Ch
   GstStateChangeReturn ret;
   GstMessage          *msg;
   GstBus              *bus;
-  gboolean             pipeline_works = FALSE;
   int                  i, j;
 
-  static const char *GSTREAMER_VIDEO_SOURCES[] = {
-    "v4l2src",
-    "v4lsrc"
-  };
-
-  i = 0;
-  while (!pipeline_works && (i < G_N_ELEMENTS (GSTREAMER_VIDEO_SOURCES)))
   {
     pipeline_desc = g_strdup_printf ("%s name=source device=%s ! fakesink",
-                                     GSTREAMER_VIDEO_SOURCES[i],
+                                     webcam_device->gstreamer_src,
                                      webcam_device->video_device);
     err      = NULL;
     pipeline = gst_parse_launch (pipeline_desc, &err);
@@ -513,10 +567,8 @@ cheese_webcam_get_webcam_device_data (Ch
         char       *name;
         GstCaps    *caps;
 
-        pipeline_works = TRUE;
         gst_element_set_state (pipeline, GST_STATE_PAUSED);
 
-        webcam_device->gstreamer_src = g_strdup (GSTREAMER_VIDEO_SOURCES[i]);
         src                          = gst_bin_get_by_name (GST_BIN (pipeline), "source");
 
         g_object_get (G_OBJECT (src), "device-name", &name, NULL);
@@ -524,7 +576,6 @@ cheese_webcam_get_webcam_device_data (Ch
           name = "Unknown";
 
         g_print ("Detected webcam: %s\n", name);
-        webcam_device->product_name = g_strdup (name);
         pad                         = gst_element_get_pad (src, "src");
         caps                        = gst_pad_get_caps (pad);
         gst_object_unref (pad);
@@ -538,8 +589,8 @@ cheese_webcam_get_webcam_device_data (Ch
       g_error_free (err);
 
     g_free (pipeline_desc);
-    i++;
   }
+
   g_print ("device: %s\n", webcam_device->video_device);
   for (i = 0; i < webcam_device->num_video_formats; i++)
   {

cheese-2.23.91-let-gstreamer-choose-yuv-or-rgb.patch:

--- NEW FILE cheese-2.23.91-let-gstreamer-choose-yuv-or-rgb.patch ---
diff -up cheese-2.23.91/src/cheese-webcam.c.foo cheese-2.23.91/src/cheese-webcam.c
--- cheese-2.23.91/src/cheese-webcam.c.foo	2008-09-03 22:43:48.000000000 +0200
+++ cheese-2.23.91/src/cheese-webcam.c	2008-09-03 22:44:46.000000000 +0200
@@ -742,10 +742,13 @@ cheese_webcam_create_webcam_source_bin (
                             &framerate_denominator);
 
     webcam_input = g_strdup_printf (
-      "%s name=video_source device=%s ! capsfilter name=capsfilter caps=%s,width=%d,height=%d,framerate=%d/%d ! identity",
+      "%s name=video_source device=%s ! capsfilter name=capsfilter caps=video/x-raw-rgb,width=%d,height=%d,framerate=%d/%d;video/x-raw-yuv,width=%d,height=%d,framerate=%d/%d ! identity",
       selected_webcam->gstreamer_src,
       selected_webcam->video_device,
-      format->mimetype,
+      format->width,
+      format->height,
+      framerate_numerator,
+      framerate_denominator,
       format->width,
       format->height,
       framerate_numerator,
@@ -1541,7 +1544,7 @@ cheese_webcam_set_video_format (CheeseWe
 
   find_highest_framerate (format, &framerate_numerator, &framerate_denominator);
 
-  new_caps = gst_caps_new_simple (format->mimetype,
+  new_caps = gst_caps_new_simple ("video/x-raw-rgb",
                                   "width", G_TYPE_INT,
                                   format->width,
                                   "height", G_TYPE_INT,
@@ -1551,6 +1554,16 @@ cheese_webcam_set_video_format (CheeseWe
                                   framerate_denominator,
                                   NULL);
 
+  gst_caps_append(new_caps, gst_caps_new_simple ("video/x-raw-yuv",
+                                  "width", G_TYPE_INT,
+                                  format->width,
+                                  "height", G_TYPE_INT,
+                                  format->height,
+                                  "framerate", GST_TYPE_FRACTION,
+                                  framerate_numerator,
+                                  framerate_denominator,
+                                  NULL));
+
   priv->current_format = format;
 
   cheese_webcam_stop (webcam);

cheese-2.23.91-supported-resolutions-per-device.patch:

--- NEW FILE cheese-2.23.91-supported-resolutions-per-device.patch ---
diff -up cheese-2.23.91/src/cheese-webcam.c.foo cheese-2.23.91/src/cheese-webcam.c
--- cheese-2.23.91/src/cheese-webcam.c.foo	2008-09-03 20:27:25.000000000 +0200
+++ cheese-2.23.91/src/cheese-webcam.c	2008-09-03 20:30:32.000000000 +0200
@@ -90,7 +90,6 @@ typedef struct
   int y_resolution;
   int selected_device;
   CheeseVideoFormat *current_format;
-  GHashTable *supported_resolutions;
 
   CheeseFlash *flash;
 } CheeseWebcamPrivate;
@@ -359,6 +358,8 @@ cheese_webcam_get_video_devices_from_hal
     priv->webcam_devices[priv->num_webcam_devices].num_video_formats = 0;
     priv->webcam_devices[priv->num_webcam_devices].video_formats = 
       g_array_new (FALSE, FALSE, sizeof (CheeseVideoFormat));
+    priv->webcam_devices[priv->num_webcam_devices].supported_resolutions =
+      g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
     priv->num_webcam_devices++;
 
     libhal_free_string (device);
@@ -533,8 +534,6 @@ static void
 cheese_webcam_get_webcam_device_data (CheeseWebcam       *webcam,
                                       CheeseWebcamDevice *webcam_device)
 {
-  CheeseWebcamPrivate *priv = CHEESE_WEBCAM_GET_PRIVATE (webcam);
-
   char                *pipeline_desc;
   GstElement          *pipeline;
   GError              *err;
@@ -597,7 +596,7 @@ cheese_webcam_get_webcam_device_data (Ch
     CheeseVideoFormat video_format;
 
     video_format = g_array_index (webcam_device->video_formats, CheeseVideoFormat, i);
-    g_hash_table_insert (priv->supported_resolutions,
+    g_hash_table_insert (webcam_device->supported_resolutions,
                          g_strdup_printf ("%ix%i", video_format.width,
                                           video_format.height),
                          &g_array_index (webcam_device->video_formats,
@@ -715,7 +714,7 @@ cheese_webcam_create_webcam_source_bin (
     /* Use the previously set resolution from gconf if it is set and the
      * camera supports it. */
     if (priv->x_resolution != 0 && priv->y_resolution != 0)
-      format = g_hash_table_lookup (priv->supported_resolutions, resolution);
+      format = g_hash_table_lookup (selected_webcam->supported_resolutions, resolution);
 
     if (!format)
     {
@@ -1260,13 +1259,15 @@ cheese_webcam_finalize (GObject *object)
       g_free (g_array_index (priv->webcam_devices[i].video_formats, CheeseVideoFormat, j).framerates);
       g_free (g_array_index (priv->webcam_devices[i].video_formats, CheeseVideoFormat, j).mimetype);
     }
+    g_free (priv->webcam_devices[i].video_device);
     g_free (priv->webcam_devices[i].hal_udi);
+    g_free (priv->webcam_devices[i].gstreamer_src);
+    g_free (priv->webcam_devices[i].product_name);
     g_array_free (priv->webcam_devices[i].video_formats, TRUE);
+    g_hash_table_destroy (priv->webcam_devices[i].supported_resolutions);
   }
   g_free (priv->webcam_devices);
 
-  g_hash_table_destroy (priv->supported_resolutions);
-
   G_OBJECT_CLASS (cheese_webcam_parent_class)->finalize (object);
 }
 
@@ -1403,10 +1404,6 @@ cheese_webcam_init (CheeseWebcam *webcam
   priv->webcam_devices      = NULL;
   priv->device_name         = NULL;
 
-  priv->supported_resolutions = g_hash_table_new_full (g_str_hash,
-                                                       g_str_equal,
-                                                       g_free, NULL);
-
   priv->flash = cheese_flash_new ();
 }
 
diff -up cheese-2.23.91/src/cheese-webcam.h.foo cheese-2.23.91/src/cheese-webcam.h
--- cheese-2.23.91/src/cheese-webcam.h.foo	2008-09-01 20:47:10.000000000 +0200
+++ cheese-2.23.91/src/cheese-webcam.h	2008-09-03 20:27:59.000000000 +0200
@@ -59,6 +59,8 @@ typedef struct
   char *product_name;
   int   num_video_formats;
   GArray *video_formats;
+  /* Hash table for resolution based lookup of video_formats */
+  GHashTable *supported_resolutions;
 } CheeseWebcamDevice;
 
 typedef enum


Index: cheese.spec
===================================================================
RCS file: /cvs/extras/rpms/cheese/devel/cheese.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cheese.spec	2 Sep 2008 23:44:19 -0000	1.30
+++ cheese.spec	3 Sep 2008 20:50:35 -0000	1.31
@@ -1,12 +1,22 @@
 Name:           cheese
 Version:        2.23.91
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A webcam application for snapshots and movies
 
 Group:          Amusements/Graphics
 License:        GPLv2+
 URL:            http://live.gnome.org/Cheese
 Source0:        http://download.gnome.org/sources/cheese/2.23/%{name}-%{version}.tar.bz2
+# Following 3 patches reported upstream here:
+# http://bugzilla.gnome.org/show_bug.cgi?id=546868
+Patch0:         cheese-2.23.91-dont-use-non-capture-devices.patch
+Patch1:         cheese-2.23.91-supported-resolutions-per-device.patch
+Patch2:         cheese-2.23.91-let-gstreamer-choose-yuv-or-rgb.patch
+# Following 3 patches reported upstream here:
+# http://bugzilla.gnome.org/show_bug.cgi?id=547144
+Patch3:         cheese-2.23.91-cheese_webcam_get_supported_video_formats-shuffle.patch
+Patch4:         cheese-2.23.90-only-list-resolutions-once.patch
+Patch5:         cheese-2.23.90-sort-resolutions.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel >= 2.10.0
@@ -39,8 +49,16 @@
 videos from a webcam. It also includes fancy graphical effects based on the 
 gstreamer-backend.
 
+
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+
 
 %build
 %configure
@@ -108,6 +126,9 @@
 %{_datadir}/dbus-1/services/org.gnome.Cheese.service
 
 %changelog
+* Wed Sep  3 2008 Hans de Goede <hdegoede at redhat.com> 2.23.91-2
+- Fix use with multiple v4l devices (rh 460956, gnome 546868, gnome 547144)
+
 * Tue Sep  2 2008 Matthias Clasen  <mclasen at redhat.com> 2.23.91-1
 - Update to 2.23.91
 



From spot at fedoraproject.org  Wed Sep  3 20:54:26 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 20:54:26 +0000 (UTC)
Subject: rpms/root-tail/devel root-tail.spec,1.2,1.3
Message-ID: <20080903205426.89BF67002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/root-tail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8452

Modified Files:
	root-tail.spec 
Log Message:
fix license tag


Index: root-tail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/root-tail/devel/root-tail.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- root-tail.spec	19 Feb 2008 02:44:47 -0000	1.2
+++ root-tail.spec	3 Sep 2008 20:53:55 -0000	1.3
@@ -1,10 +1,10 @@
 Name:           root-tail
 Version:        1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Displays a given file anywhere on your X11 root window
 
 Group:          User Interface/X
-License:        GPL
+License:        GPLv2+
 URL:            http://www.goof.com/pcg/marc/root-tail.html
 Source0:        http://www.goof.com/pcg/marc/data/root-tail-1.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2-4
+- fix license tag
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2-3
 - Autorebuild for GCC 4.3
 



From kevin at fedoraproject.org  Wed Sep  3 20:35:09 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:35:09 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Pg/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080903203509.91DE47002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-DateTime-Format-Pg/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrk5819/rpms/perl-DateTime-Format-Pg/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-DateTime-Format-Pg


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-DateTime-Format-Pg
# $Id: Makefile,v 1.1 2008/09/03 20:35:09 kevin Exp $
NAME := perl-DateTime-Format-Pg
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From spot at fedoraproject.org  Wed Sep  3 19:48:55 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 19:48:55 +0000 (UTC)
Subject: rpms/quodlibet/devel quodlibet.spec,1.11,1.12
Message-ID: <20080903194855.485FA7002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/quodlibet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31751

Modified Files:
	quodlibet.spec 
Log Message:
fix license tag


Index: quodlibet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quodlibet/devel/quodlibet.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- quodlibet.spec	19 Feb 2008 06:07:25 -0000	1.11
+++ quodlibet.spec	3 Sep 2008 19:48:24 -0000	1.12
@@ -1,10 +1,10 @@
 Name:           quodlibet
 Version:        1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A music management program
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2
 URL:            http://www.sacredchao.net/quodlibet
 Source0:        http://www.sacredchao.net/~piman/software/quodlibet-%{version}.tar.gz
 Source1:        dl-quodlibet-plugins.sh
@@ -140,6 +140,9 @@
 %{_mandir}/man1/quodlibet.1*
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-4
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0-3
 - Autorebuild for GCC 4.3
 



From jmoyer at fedoraproject.org  Wed Sep  3 20:18:12 2008
From: jmoyer at fedoraproject.org (Jeffrey E. Moyer)
Date: Wed,  3 Sep 2008 20:18:12 +0000 (UTC)
Subject: rpms/libaio/devel libaio-install-to-slash.patch, NONE,
	1.1 libaio.spec, 1.26, 1.27
Message-ID: <20080903201812.D415D7002B@cvs1.fedora.phx.redhat.com>

Author: jmoyer

Update of /cvs/pkgs/rpms/libaio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2839

Modified Files:
	libaio.spec 
Added Files:
	libaio-install-to-slash.patch 
Log Message:
- Install to / instead of /usr for early users of libaio (Jeff Moyer)
- Resolves: bz#459158



libaio-install-to-slash.patch:

--- NEW FILE libaio-install-to-slash.patch ---
diff -up libaio-0.3.107/src/Makefile.orig libaio-0.3.107/src/Makefile
--- libaio-0.3.107/src/Makefile.orig	2008-09-03 15:57:48.233332354 -0400
+++ libaio-0.3.107/src/Makefile	2008-09-03 15:58:23.591332705 -0400
@@ -1,6 +1,7 @@
 prefix=/usr
-includedir=$(prefix)/include
-libdir=$(prefix)/lib
+includedir=/usr/include
+libdir=/usr/lib
+usrlibdir=/usr/lib
 
 ARCH := $(shell uname -m | sed -e s/i.86/i386/)
 CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
@@ -51,11 +52,11 @@ $(libname): $(libaio_sobjs) libaio.map
 	$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
 
 install: $(all_targets)
-	install -D -m 644 libaio.h $(includedir)/libaio.h
-	install -D -m 644 libaio.a $(libdir)/libaio.a
-	install -D -m 755 $(libname) $(libdir)/$(libname)
-	ln -sf $(libname) $(libdir)/$(soname)
-	ln -sf $(libname) $(libdir)/libaio.so
+	install -D -m 644 libaio.h $(destdir)$(includedir)/libaio.h
+	install -D -m 644 libaio.a $(destdir)$(usrlibdir)/libaio.a
+	install -D -m 755 $(libname) $(destdir)$(libdir)/$(libname)
+	ln -sf $(libdir)/$(libname) $(destdir)$(usrlibdir)/$(soname)
+	ln -sf $(libdir)/$(libname) $(destdir)$(usrlibdir)/libaio.so
 
 $(libaio_objs): libaio.h
 


Index: libaio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libaio/devel/libaio.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libaio.spec	5 Aug 2008 20:46:16 -0000	1.26
+++ libaio.spec	3 Sep 2008 20:17:42 -0000	1.27
@@ -1,11 +1,13 @@
 Name: libaio
 Version: 0.3.107
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Linux-native asynchronous I/O access library
 License: LGPLv2+
 Group:  System Environment/Libraries
 Source: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-root
+Patch1: libaio-install-to-slash.patch
+
 # Fix ExclusiveArch as we implement this functionality on more architectures
 ExclusiveArch: i386 x86_64 ia64 s390 s390x ppc ppc64 ppc64pseries ppc64iseries alpha alphaev6
 
@@ -17,6 +19,9 @@
 kernel-accelerated async I/O capabilities, as do applications which
 require the Linux-native async I/O API.
 
+%define libdir /%{_lib}
+%define usrlibdir %{_prefix}/%{_lib}
+
 %package devel
 Summary: Development files for Linux-native asynchronous I/O access
 Group: Development/System
@@ -28,6 +33,7 @@
 
 %prep
 %setup -a 0
+%patch1 -p1
 mv %{name}-%{version} compat-%{name}-%{version}
 
 %build
@@ -44,12 +50,10 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 cd compat-%{name}-%{version}
 install -D -m 755 src/libaio.so.1.0.0 \
-  $RPM_BUILD_ROOT/%{_libdir}/libaio.so.1.0.0
+  $RPM_BUILD_ROOT/%{libdir}/libaio.so.1.0.0
 cd ..
-make install prefix=$RPM_BUILD_ROOT/usr \
- libdir=$RPM_BUILD_ROOT/%{_libdir} \
- root=$RPM_BUILD_ROOT
-
+make destdir=$RPM_BUILD_ROOT prefix=/ libdir=%{libdir} usrlibdir=%{usrlibdir} \
+	includedir=%{_includedir} install
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -60,16 +64,20 @@
 
 %files
 %defattr(-,root,root)
-%attr(0755,root,root) %{_libdir}/libaio.so.*
+%attr(0755,root,root) %{libdir}/libaio.so.*
 %doc COPYING TODO
 
 %files devel
 %defattr(-,root,root)
 %attr(0644,root,root) %{_includedir}/*
-%attr(0755,root,root) %{_libdir}/libaio.so
+%attr(0755,root,root) %{usrlibdir}/libaio.so*
 %attr(0644,root,root) %{_libdir}/libaio.a
 
 %changelog
+* Wed Sep  3 2008 Jeff Moyer <jmoyer at redhat.com> - 0.3.107-4
+- Install to / instead of /usr for early users of libaio (Jeff Moyer)
+- Resolves: bz#459158
+
 * Tue Aug  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.107-3
 - fix license tag
 



From pkgdb at fedoraproject.org  Wed Sep  3 20:34:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:34:45 +0000
Subject: [pkgdb] perl-DateTime-Format-Pg was added for cweyl
Message-ID: <20080903203445.DC2722E0175@bastion.fedora.phx.redhat.com>

kevin has added Package perl-DateTime-Format-Pg with summary Parse and format PostgreSQL dates and times
kevin has approved Package perl-DateTime-Format-Pg
kevin has added a Fedora devel branch for perl-DateTime-Format-Pg with an owner of cweyl
kevin has approved perl-DateTime-Format-Pg in Fedora devel
kevin has approved Package perl-DateTime-Format-Pg
kevin has set commit to Approved for packager on perl-DateTime-Format-Pg (Fedora devel)
kevin has set build to Approved for packager on perl-DateTime-Format-Pg (Fedora devel)
kevin has set checkout to Approved for packager on perl-DateTime-Format-Pg (Fedora devel)
kevin has set commit to Approved for uberpackager on perl-DateTime-Format-Pg (Fedora devel)
kevin has set build to Approved for uberpackager on perl-DateTime-Format-Pg (Fedora devel)
kevin has set checkout to Approved for uberpackager on perl-DateTime-Format-Pg (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-Pg



From spot at fedoraproject.org  Wed Sep  3 19:46:34 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 19:46:34 +0000 (UTC)
Subject: rpms/quagga/devel quagga.spec,1.45,1.46
Message-ID: <20080903194634.1DA3B7002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/quagga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31450

Modified Files:
	quagga.spec 
Log Message:
fix license tag


Index: quagga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quagga/devel/quagga.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- quagga.spec	11 Jun 2008 08:57:48 -0000	1.45
+++ quagga.spec	3 Sep 2008 19:46:03 -0000	1.46
@@ -32,9 +32,9 @@
 Summary:    Routing daemon
 Name:		quagga
 Version:	0.99.10
-Release:    1%{?dist}
+Release:    2%{?dist}
 Epoch:      0
-License:	GPL
+License:	GPLv2+
 Group:      System Environment/Daemons
 Source0:	http://www.quagga.net/download/%{name}-%{version}.tar.gz
 Source1:    quagga-filter-perl-requires.sh
@@ -348,6 +348,9 @@
 %endif
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.99.10-2
+- fix license tag
+
 * Wed Jun 11 2008 Martin Nagy <mnagy at redhat.com> - 0.99.10-1
 - upgrade to new upstream 0.99.10
 



From kevin at fedoraproject.org  Wed Sep  3 20:35:08 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:35:08 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Pg - New directory
Message-ID: <20080903203508.22BE77002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-DateTime-Format-Pg
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrk5819/rpms/perl-DateTime-Format-Pg

Log Message:
Directory /cvs/extras/rpms/perl-DateTime-Format-Pg added to the repository




From pkgdb at fedoraproject.org  Wed Sep  3 20:36:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:36:36 +0000
Subject: [pkgdb] tennix was added for claudiotomasoni
Message-ID: <20080903203636.2C8F32E01A8@bastion.fedora.phx.redhat.com>

kevin has added Package tennix with summary A simple tennis game
kevin has approved Package tennix
kevin has added a Fedora devel branch for tennix with an owner of claudiotomasoni
kevin has approved tennix in Fedora devel
kevin has approved Package tennix
kevin has set commit to Approved for packager on tennix (Fedora devel)
kevin has set build to Approved for packager on tennix (Fedora devel)
kevin has set checkout to Approved for packager on tennix (Fedora devel)
kevin has set commit to Approved for uberpackager on tennix (Fedora devel)
kevin has set build to Approved for uberpackager on tennix (Fedora devel)
kevin has set checkout to Approved for uberpackager on tennix (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tennix



From kevin at fedoraproject.org  Wed Sep  3 20:36:07 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:36:07 +0000 (UTC)
Subject: rpms/ocaml-lwt/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080903203607.84E6D7002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ocaml-lwt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKM6129/rpms/ocaml-lwt/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ocaml-lwt


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ocaml-lwt
# $Id: Makefile,v 1.1 2008/09/03 20:36:07 kevin Exp $
NAME := ocaml-lwt
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Sep  3 20:32:03 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:32:03 +0000 (UTC)
Subject: rpms/inetvis Makefile,NONE,1.1
Message-ID: <20080903203203.2CFDC7002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/inetvis
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyj5354/rpms/inetvis

Added Files:
	Makefile 
Log Message:
Setup of module inetvis


--- NEW FILE Makefile ---
# Top level Makefile for module inetvis
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep  3 20:31:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:31:55 +0000
Subject: [pkgdb] inetvis (Fedora, devel) updated by kevin
Message-ID: <20080903203201.994ED2E0169@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on inetvis (Fedora devel) for pvrabec
kevin approved watchcommits on inetvis (Fedora devel) for pvrabec

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/inetvis



From jkeating at fedoraproject.org  Wed Sep  3 20:37:20 2008
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Wed,  3 Sep 2008 20:37:20 +0000 (UTC)
Subject: rpms/cluster/devel cluster.spec,1.15,1.16
Message-ID: <20080903203720.F19FE70121@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6385

Modified Files:
	cluster.spec 
Log Message:
* Wed Sep 03 2008 Jesse Keating <jkeating at redhat.com> - 2.99.08-3
- Rebuild for broken deps.
- Pull in upstream patches for libvolume_id changes



Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cluster.spec	3 Sep 2008 16:00:31 -0000	1.15
+++ cluster.spec	3 Sep 2008 20:36:50 -0000	1.16
@@ -19,11 +19,13 @@
 Name: cluster
 Summary: Red Hat Cluster
 Version: 2.99.08
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Release: 3%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
 Source0: ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz
+Patch1: 0001-Changes-needed-to-stay-compatible-with-libvolume_id.patch
+Patch2: 0002-Changes-needed-to-stay-current-with-libvolume_id.patch
 
 ## Setup/build bits
 
@@ -47,6 +49,8 @@
 
 %prep
 %setup -q -n cluster-%{version}
+%patch1 -p1
+%patch2 -p1
 
 %build
 # for legacy reasons, all binaries have always been installed in /sbin
@@ -300,8 +304,9 @@
 %{_mandir}/man8/gnbd*
 
 %changelog
-* Wed Sep 03 2008 Jesse Keating <jkeating at redhat.com> - 2.99.08-2
+* Wed Sep 03 2008 Jesse Keating <jkeating at redhat.com> - 2.99.08-3
 - Rebuild for broken deps.
+- Pull in upstream patches for libvolume_id changes
 
 * Tue Aug 12 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.08-1
 - New upstream release.



From pkgdb at fedoraproject.org  Wed Sep  3 20:35:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:35:47 +0000
Subject: [pkgdb] ocaml-lwt (Fedora, 9) updated by kevin
Message-ID: <20080903203553.789D22E019A@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for ocaml-lwt
kevin has set commit to Approved for uberpackager on ocaml-lwt (Fedora 9)
kevin has set build to Approved for uberpackager on ocaml-lwt (Fedora 9)
kevin has set checkout to Approved for uberpackager on ocaml-lwt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lwt



From pkgdb at fedoraproject.org  Wed Sep  3 20:36:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:36:37 +0000
Subject: [pkgdb] tennix (Fedora, 8) updated by kevin
Message-ID: <20080903203637.A2A502E01AB@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for tennix
kevin has set commit to Approved for uberpackager on tennix (Fedora 8)
kevin has set build to Approved for uberpackager on tennix (Fedora 8)
kevin has set checkout to Approved for uberpackager on tennix (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tennix



From kevin at fedoraproject.org  Wed Sep  3 20:36:57 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:36:57 +0000 (UTC)
Subject: rpms/tennix/devel - New directory
Message-ID: <20080903203657.8175F70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tennix/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsaS6457/rpms/tennix/devel

Log Message:
Directory /cvs/extras/rpms/tennix/devel added to the repository




From pkgdb at fedoraproject.org  Wed Sep  3 20:34:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:34:47 +0000
Subject: [pkgdb] perl-DateTime-Format-Pg (Fedora, 9) updated by kevin
Message-ID: <20080903203447.AE23B2E017F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-DateTime-Format-Pg
kevin has set commit to Approved for uberpackager on perl-DateTime-Format-Pg (Fedora 9)
kevin has set build to Approved for uberpackager on perl-DateTime-Format-Pg (Fedora 9)
kevin has set checkout to Approved for uberpackager on perl-DateTime-Format-Pg (Fedora 9)
kevin approved watchbugzilla on perl-DateTime-Format-Pg (Fedora 9) for perl-sig
kevin approved watchcommits on perl-DateTime-Format-Pg (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-Pg



From kevin at fedoraproject.org  Wed Sep  3 20:32:02 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:32:02 +0000 (UTC)
Subject: rpms/inetvis - New directory
Message-ID: <20080903203202.216EF7002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/inetvis
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyj5354/rpms/inetvis

Log Message:
Directory /cvs/extras/rpms/inetvis added to the repository




From kevin at fedoraproject.org  Wed Sep  3 20:36:58 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:36:58 +0000 (UTC)
Subject: rpms/tennix Makefile,NONE,1.1
Message-ID: <20080903203658.A9C3270121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tennix
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsaS6457/rpms/tennix

Added Files:
	Makefile 
Log Message:
Setup of module tennix


--- NEW FILE Makefile ---
# Top level Makefile for module tennix
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From spot at fedoraproject.org  Wed Sep  3 20:32:29 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 20:32:29 +0000 (UTC)
Subject: rpms/reiserfs-utils/devel reiserfs-utils.spec,1.17,1.18
Message-ID: <20080903203229.BA2017002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/reiserfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5327

Modified Files:
	reiserfs-utils.spec 
Log Message:
fix license tag


Index: reiserfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/reiserfs-utils/devel/reiserfs-utils.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- reiserfs-utils.spec	19 Feb 2008 06:15:03 -0000	1.17
+++ reiserfs-utils.spec	3 Sep 2008 20:31:59 -0000	1.18
@@ -1,12 +1,12 @@
 Name: reiserfs-utils
 Version: 3.6.19
-Release: 3.4.1
-Summary: Tools for creating, repairing, and debugging ReiserFS filesystems.
+Release: 4%{?dist}
+Summary: Tools for creating, repairing, and debugging ReiserFS filesystems
 URL: http://www.namesys.com/
 Source: ftp://namesys.com/pub/reiserfsprogs/reiserfsprogs-%{version}.tar.gz
-License: GPL
+# See README.
+License: GPLv2 with exceptions
 Group: System Environment/Base
-Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
 Epoch: 2
 BuildRequires: e2fsprogs-devel
@@ -25,15 +25,14 @@
 You should install the reiserfs-utils package if you want to use
 ReiserFS on any of your partitions.
 
-%{name} contains reiserfsck (used to repair filesystem
 %prep
-%setup -n reiserfsprogs-%{version}
+%setup -q -n reiserfsprogs-%{version}
 %patch1 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 find . -name "config.cache" |xargs rm -f
-%configure --prefix=/
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -49,7 +48,7 @@
   ln -fs reiserfsck fsck.reiserfs )
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README
 /sbin/debugreiserfs
 /sbin/mkreiserfs
@@ -61,9 +60,12 @@
 %{_mandir}/*/*
 
 %clean
-rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}
+rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:3.6.19-4
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2:3.6.19-3.4.1
 - Autorebuild for GCC 4.3
 



From pkgdb at fedoraproject.org  Wed Sep  3 20:36:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:36:37 +0000
Subject: [pkgdb] tennix (Fedora, 9) updated by kevin
Message-ID: <20080903203637.AAF832E01AE@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for tennix
kevin has set commit to Approved for uberpackager on tennix (Fedora 9)
kevin has set build to Approved for uberpackager on tennix (Fedora 9)
kevin has set checkout to Approved for uberpackager on tennix (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tennix



From pkgdb at fedoraproject.org  Wed Sep  3 20:34:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:34:47 +0000
Subject: [pkgdb] perl-DateTime-Format-Pg (Fedora, devel) updated by kevin
Message-ID: <20080903203447.9BCB22E017C@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-DateTime-Format-Pg (Fedora devel) for perl-sig
kevin approved watchcommits on perl-DateTime-Format-Pg (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-Pg



From pkgdb at fedoraproject.org  Wed Sep  3 20:31:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:31:51 +0000
Subject: [pkgdb] inetvis was added for mildew
Message-ID: <20080903203151.E11552E0165@bastion.fedora.phx.redhat.com>

kevin has added Package inetvis with summary 3-D scatter-plot visualization for network traffic
kevin has approved Package inetvis
kevin has added a Fedora devel branch for inetvis with an owner of mildew
kevin has approved inetvis in Fedora devel
kevin has approved Package inetvis
kevin has set commit to Approved for packager on inetvis (Fedora devel)
kevin has set build to Approved for packager on inetvis (Fedora devel)
kevin has set checkout to Approved for packager on inetvis (Fedora devel)
kevin has set commit to Approved for uberpackager on inetvis (Fedora devel)
kevin has set build to Approved for uberpackager on inetvis (Fedora devel)
kevin has set checkout to Approved for uberpackager on inetvis (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/inetvis



From dwalsh at fedoraproject.org  Wed Sep  3 20:17:05 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  3 Sep 2008 20:17:05 +0000 (UTC)
Subject: rpms/selinux-policy/devel .cvsignore, 1.145, 1.146 sources, 1.160,
	1.161
Message-ID: <20080903201705.C79E57002B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2557

Modified Files:
	.cvsignore sources 
Log Message:
* Wed Sep 3 2008 Dan Walsh <dwalsh at redhat.com> 3.5.6-1
- Update to upstream
- 	 New handling of init scripts



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- .cvsignore	26 Aug 2008 14:13:27 -0000	1.145
+++ .cvsignore	3 Sep 2008 20:16:35 -0000	1.146
@@ -147,3 +147,4 @@
 serefpolicy-3.5.3.tgz
 serefpolicy-3.5.4.tgz
 serefpolicy-3.5.5.tgz
+serefpolicy-3.5.6.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- sources	26 Aug 2008 14:13:27 -0000	1.160
+++ sources	3 Sep 2008 20:16:35 -0000	1.161
@@ -1 +1 @@
-c063352ae3c196d2c0e80c0f82242547  serefpolicy-3.5.5.tgz
+3df6acf59f55a2b00b7757111baf474d  serefpolicy-3.5.6.tgz



From kevin at fedoraproject.org  Wed Sep  3 20:36:57 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:36:57 +0000 (UTC)
Subject: rpms/tennix - New directory
Message-ID: <20080903203657.353CF70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tennix
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsaS6457/rpms/tennix

Log Message:
Directory /cvs/extras/rpms/tennix added to the repository




From maxx at fedoraproject.org  Wed Sep  3 19:09:57 2008
From: maxx at fedoraproject.org (Mads Villadsen)
Date: Wed,  3 Sep 2008 19:09:57 +0000 (UTC)
Subject: rpms/hamster-applet/devel .cvsignore, 1.10, 1.11 hamster-applet.spec,
	1.15, 1.16 sources, 1.10, 1.11
Message-ID: <20080903190957.A10A07011F@cvs1.fedora.phx.redhat.com>

Author: maxx

Update of /cvs/pkgs/rpms/hamster-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28098

Modified Files:
	.cvsignore hamster-applet.spec sources 
Log Message:
* Wed Sep  3 2008 Mads Villadsen <maxx at krakoa.dk> - 2.23.91-1
- Update to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	26 Aug 2008 18:44:56 -0000	1.10
+++ .cvsignore	3 Sep 2008 19:09:27 -0000	1.11
@@ -1 +1 @@
-hamster-applet-2.23.90.tar.bz2
+hamster-applet-2.23.91.tar.bz2


Index: hamster-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/hamster-applet.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- hamster-applet.spec	26 Aug 2008 18:44:56 -0000	1.15
+++ hamster-applet.spec	3 Sep 2008 19:09:27 -0000	1.16
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           hamster-applet
-Version:        2.23.90
+Version:        2.23.91
 Release:        1%{?dist}
 Summary:        Time tracking applet
 
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Mads Villadsen <maxx at krakoa.dk> - 2.23.91-1
+- Update to latest upstream release
+
 * Tue Aug 26 2008 Mads Villadsen <maxx at krakoa.dk> - 2.23.90-1
 - Update to latest upstream release
 - Change gnome-python2 requires as per bug #460007


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	26 Aug 2008 18:44:56 -0000	1.10
+++ sources	3 Sep 2008 19:09:27 -0000	1.11
@@ -1 +1 @@
-9ec6054b9dc38096934565b02c8c0f52  hamster-applet-2.23.90.tar.bz2
+1ba23e31973403d03f9c9063b2b14a7b  hamster-applet-2.23.91.tar.bz2



From kevin at fedoraproject.org  Wed Sep  3 20:36:06 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:36:06 +0000 (UTC)
Subject: rpms/ocaml-lwt/devel - New directory
Message-ID: <20080903203606.5BDCC7002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ocaml-lwt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKM6129/rpms/ocaml-lwt/devel

Log Message:
Directory /cvs/extras/rpms/ocaml-lwt/devel added to the repository




From pkgdb at fedoraproject.org  Wed Sep  3 20:34:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:34:47 +0000
Subject: [pkgdb] perl-DateTime-Format-Pg (Fedora, 8) updated by kevin
Message-ID: <20080903203447.828B12E0179@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for perl-DateTime-Format-Pg
kevin has set commit to Approved for uberpackager on perl-DateTime-Format-Pg (Fedora 8)
kevin has set build to Approved for uberpackager on perl-DateTime-Format-Pg (Fedora 8)
kevin has set checkout to Approved for uberpackager on perl-DateTime-Format-Pg (Fedora 8)
kevin approved watchbugzilla on perl-DateTime-Format-Pg (Fedora 8) for perl-sig
kevin approved watchcommits on perl-DateTime-Format-Pg (Fedora 8) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-Pg



From clumens at fedoraproject.org  Wed Sep  3 20:35:29 2008
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed,  3 Sep 2008 20:35:29 +0000 (UTC)
Subject: rpms/pykickstart/devel .cvsignore, 1.96, 1.97 pykickstart.spec,
	1.104, 1.105 sources, 1.105, 1.106
Message-ID: <20080903203529.B66D37002B@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5767

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- .cvsignore	11 Aug 2008 17:40:14 -0000	1.96
+++ .cvsignore	3 Sep 2008 20:34:59 -0000	1.97
@@ -30,3 +30,4 @@
 pykickstart-1.40.tar.gz
 pykickstart-1.41.tar.gz
 pykickstart-1.42.tar.gz
+pykickstart-1.43.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- pykickstart.spec	11 Aug 2008 17:40:14 -0000	1.104
+++ pykickstart.spec	3 Sep 2008 20:34:59 -0000	1.105
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.42
+Version: 1.43
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -44,6 +44,11 @@
 %{_bindir}/ksflatten
 
 %changelog
+* Wed Sep 03 2008 Chris Lumens <clumens at redhat.com> - 1.43-1
+- Revert "Do not include passphrases for encrypted block devices in
+  anaconda-ks.cfg." (dlehman)
+- yum doesn't like when mirrorlist is "". (clumens)
+
 * Mon Aug 11 2008 Chris Lumens <clumens at redhat.com> - 1.42-1
 - Add rescue command to pykickstart (atodorov)
 - Sort %packages output (katzj)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- sources	11 Aug 2008 17:40:14 -0000	1.105
+++ sources	3 Sep 2008 20:34:59 -0000	1.106
@@ -1 +1 @@
-3761b1e456c1dba745af1e44681829b7  pykickstart-1.42.tar.gz
+36469ea69fd78e77f278bd6893c39c5a  pykickstart-1.43.tar.gz



From kevin at fedoraproject.org  Wed Sep  3 20:35:09 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:35:09 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Pg Makefile,NONE,1.1
Message-ID: <20080903203509.570657002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-DateTime-Format-Pg
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrk5819/rpms/perl-DateTime-Format-Pg

Added Files:
	Makefile 
Log Message:
Setup of module perl-DateTime-Format-Pg


--- NEW FILE Makefile ---
# Top level Makefile for module perl-DateTime-Format-Pg
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  3 20:36:59 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:36:59 +0000 (UTC)
Subject: rpms/tennix/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080903203659.098AA70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tennix/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsaS6457/rpms/tennix/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tennix


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tennix
# $Id: Makefile,v 1.1 2008/09/03 20:36:58 kevin Exp $
NAME := tennix
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Sep  3 20:35:08 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:35:08 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Pg/devel - New directory
Message-ID: <20080903203508.635CF7002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-DateTime-Format-Pg/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrk5819/rpms/perl-DateTime-Format-Pg/devel

Log Message:
Directory /cvs/extras/rpms/perl-DateTime-Format-Pg/devel added to the repository




From kevin at fedoraproject.org  Wed Sep  3 20:32:03 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:32:03 +0000 (UTC)
Subject: rpms/inetvis/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080903203203.655537002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/inetvis/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyj5354/rpms/inetvis/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module inetvis


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: inetvis
# $Id: Makefile,v 1.1 2008/09/03 20:32:03 kevin Exp $
NAME := inetvis
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From spot at fedoraproject.org  Wed Sep  3 20:31:43 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 20:31:43 +0000 (UTC)
Subject: rpms/rhm/devel rhm.spec,1.23,1.24
Message-ID: <20080903203143.60D617002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rhm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5104

Modified Files:
	rhm.spec 
Log Message:
fix license tag


Index: rhm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhm/devel/rhm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rhm.spec	15 Jul 2008 21:19:27 -0000	1.23
+++ rhm.spec	3 Sep 2008 20:31:13 -0000	1.24
@@ -7,10 +7,10 @@
 
 Name:           rhm
 Version:        0.2.%{svnrev}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Red Hat persistence extension to the Qpid messaging system
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2+
 URL:            http://rhm.et.redhat.com
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.2153-3
+- fix license tag
+
 * Tue Jul 15 2008 Nuno Santos <nsantos at redhat.com> - 0.2.2153-2
 - BZ359461: fix package URL
 



From kevin at fedoraproject.org  Wed Sep  3 20:32:02 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:32:02 +0000 (UTC)
Subject: rpms/inetvis/devel - New directory
Message-ID: <20080903203202.55E647002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/inetvis/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyj5354/rpms/inetvis/devel

Log Message:
Directory /cvs/extras/rpms/inetvis/devel added to the repository




From kevin at fedoraproject.org  Wed Sep  3 20:36:07 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:36:07 +0000 (UTC)
Subject: rpms/ocaml-lwt Makefile,NONE,1.1
Message-ID: <20080903203607.4D4247002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ocaml-lwt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKM6129/rpms/ocaml-lwt

Added Files:
	Makefile 
Log Message:
Setup of module ocaml-lwt


--- NEW FILE Makefile ---
# Top level Makefile for module ocaml-lwt
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep  3 20:35:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:35:39 +0000
Subject: [pkgdb] ocaml-lwt was added for rjones
Message-ID: <20080903203539.6CEDC2E0196@bastion.fedora.phx.redhat.com>

kevin has added Package ocaml-lwt with summary OCaml lightweight thread library
kevin has approved Package ocaml-lwt
kevin has added a Fedora devel branch for ocaml-lwt with an owner of rjones
kevin has approved ocaml-lwt in Fedora devel
kevin has approved Package ocaml-lwt
kevin has set commit to Approved for packager on ocaml-lwt (Fedora devel)
kevin has set build to Approved for packager on ocaml-lwt (Fedora devel)
kevin has set checkout to Approved for packager on ocaml-lwt (Fedora devel)
kevin has set commit to Approved for uberpackager on ocaml-lwt (Fedora devel)
kevin has set build to Approved for uberpackager on ocaml-lwt (Fedora devel)
kevin has set checkout to Approved for uberpackager on ocaml-lwt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lwt



From kevin at fedoraproject.org  Wed Sep  3 20:36:06 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:36:06 +0000 (UTC)
Subject: rpms/ocaml-lwt - New directory
Message-ID: <20080903203606.256857002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ocaml-lwt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKM6129/rpms/ocaml-lwt

Log Message:
Directory /cvs/extras/rpms/ocaml-lwt added to the repository




From spot at fedoraproject.org  Wed Sep  3 20:56:32 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 20:56:32 +0000 (UTC)
Subject: rpms/rp-pppoe/devel rp-pppoe.spec,1.42,1.43
Message-ID: <20080903205632.55F897002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rp-pppoe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8948

Modified Files:
	rp-pppoe.spec 
Log Message:
fix license tag


Index: rp-pppoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rp-pppoe/devel/rp-pppoe.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- rp-pppoe.spec	10 Apr 2008 09:17:46 -0000	1.42
+++ rp-pppoe.spec	3 Sep 2008 20:56:02 -0000	1.43
@@ -1,8 +1,8 @@
 Summary: A PPP over Ethernet client (for xDSL support).
 Name: rp-pppoe
 Version: 3.8
-Release: 4%{?dist}
-License: GPL
+Release: 5%{?dist}
+License: GPLv2+
 Group: System Environment/Daemons
 Url: http://www.roaringpenguin.com/pppoe/
 Source: http://www.roaringpenguin.com/rp-pppoe-%{version}.tar.gz
@@ -145,6 +145,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 3.8-5
+- fix license tag
+
 * Thu Apr 10 2008 Karsten Hopp <karsten at redhat.com> 3.8-4
 - Build with $RPM_OPT_FLAGS (#249978) (Ville Skytt??)
 



From orion at fedoraproject.org  Wed Sep  3 20:58:18 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed,  3 Sep 2008 20:58:18 +0000 (UTC)
Subject: rpms/netcdf/devel netcdf-4.0.0-gcc4.3-cstring.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 netcdf.spec, 1.31, 1.32 sources, 1.7,
	1.8 netcdf-4.0.0-beta2-gcc4.3-cstring.patch, 1.1, NONE
Message-ID: <20080903205818.23D307002B@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/netcdf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9457

Modified Files:
	.cvsignore netcdf.spec sources 
Added Files:
	netcdf-4.0.0-gcc4.3-cstring.patch 
Removed Files:
	netcdf-4.0.0-beta2-gcc4.3-cstring.patch 
Log Message:
* Wed Sep  3 2008 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-1
- Update to 4.0 final
- Drop netcdf-3 symlink (bug #337158)
- Update cstring patch, partially upstreamed


netcdf-4.0.0-gcc4.3-cstring.patch:

--- NEW FILE netcdf-4.0.0-gcc4.3-cstring.patch ---
diff -urN netcdf-4.0-beta2-ORIG/examples/CXX4/sfc_pres_temp_rd.cpp netcdf-4.0-beta2/examples/CXX4/sfc_pres_temp_rd.cpp
--- netcdf-4.0-beta2-ORIG/examples/CXX4/sfc_pres_temp_rd.cpp	2007-07-29 20:18:22.000000000 -0400
+++ netcdf-4.0-beta2/examples/CXX4/sfc_pres_temp_rd.cpp	2008-05-08 00:30:54.000000000 -0400
@@ -17,6 +17,7 @@
 */
 
 #include <iostream>
+#include <cstring>
 #include <netcdfcpp4.h>
 
 using namespace std;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 May 2008 04:55:48 -0000	1.7
+++ .cvsignore	3 Sep 2008 20:57:47 -0000	1.8
@@ -1 +1 @@
-netcdf-4.0-beta2.tar.gz
+netcdf-4.0.tar.gz






--- netcdf-4.0.0-beta2-gcc4.3-cstring.patch DELETED ---



From orion at fedoraproject.org  Wed Sep  3 20:58:47 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed,  3 Sep 2008 20:58:47 +0000 (UTC)
Subject: rpms/netcdf/devel netcdf.spec,1.32,1.33
Message-ID: <20080903205847.274217002B@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/netcdf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9491

Modified Files:
	netcdf.spec 
Log Message:
* Wed Sep  3 2008 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-1
- Update to 4.0 final
- Drop netcdf-3 symlink (bug #337158)
- Update cstring patch, partially upstreamed



Index: netcdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/devel/netcdf.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- netcdf.spec	3 Sep 2008 20:57:47 -0000	1.32
+++ netcdf.spec	3 Sep 2008 20:58:16 -0000	1.33
@@ -130,7 +130,7 @@
 %changelog
 * Wed Sep  3 2008 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-1
 - Update to 4.0 final
-- Drop netcdf-3 symlink (bug #337158)
+- Drop netcdf-3 symlink (bug #447158)
 - Update cstring patch, partially upstreamed
 
 * Thu May 29 2008 Balint Cristian <rezso at rdsor.ro> - 4.0.0-0.6.beta2



From spot at fedoraproject.org  Wed Sep  3 20:59:24 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 20:59:24 +0000 (UTC)
Subject: rpms/rpld/devel rpld.spec,1.3,1.4
Message-ID: <20080903205924.C1AB87002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rpld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9600

Modified Files:
	rpld.spec 
Log Message:
fix license tag


Index: rpld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpld/devel/rpld.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpld.spec	24 Feb 2008 18:08:02 -0000	1.3
+++ rpld.spec	3 Sep 2008 20:58:54 -0000	1.4
@@ -1,9 +1,10 @@
 Name:           rpld
 Version:        1.8
-Release:        0.3.beta1%{?dist}
+Release:        0.4.beta1%{?dist}
 Summary:        RPL/RIPL remote boot daemon
 Group:          System Environment/Daemons
-License:        GPL
+# No version specified.
+License:        GPL+
 URL:            http://gimel.esc.cam.ac.uk/james/rpld/index.html
 Source0:        http://gimel.esc.cam.ac.uk/james/rpld/src/rpld-1.8-beta-1.tar.gz
 Patch0:         rpld_1.8beta1-6.diff.gz
@@ -50,6 +51,9 @@
 %{_mandir}/man[^3]/*
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.8-0.4.beta1
+- fix license tag
+
 * Sun Feb 24 2008 Paul P Komkoff Jr <i at stingr.net> - 1.8-0.3.beta1
 - make rpld a PIE
 



From nim at fedoraproject.org  Wed Sep  3 21:00:08 2008
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Wed,  3 Sep 2008 21:00:08 +0000 (UTC)
Subject: rpms/argyllcms/devel argyllcms-1.0.3-remove-libusb-fork-check.patch,
	NONE, 1.1 .cvsignore, 1.4, 1.5 argyllcms.spec, 1.5,
	1.6 import.log, 1.2, 1.3 sources, 1.4,
	1.5 argyllcms-0.70-color-device-file.policy, 1.1,
	NONE argyllcms-1.0.1-19-color.fdi, 1.1,
	NONE argyllcms-1.0.1-remove-libusb-fork-check.patch, 1.1, NONE
Message-ID: <20080903210008.A2D567002B@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/argyllcms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9870/devel

Modified Files:
	.cvsignore argyllcms.spec import.log sources 
Added Files:
	argyllcms-1.0.3-remove-libusb-fork-check.patch 
Removed Files:
	argyllcms-0.70-color-device-file.policy 
	argyllcms-1.0.1-19-color.fdi 
	argyllcms-1.0.1-remove-libusb-fork-check.patch 
Log Message:
1.0.3

argyllcms-1.0.3-remove-libusb-fork-check.patch:

--- NEW FILE argyllcms-1.0.3-remove-libusb-fork-check.patch ---
diff -uNr Argyll_V1.0.3.orig/spectro/usbio.c Argyll_V1.0.3/spectro/usbio.c
--- Argyll_V1.0.3.orig/spectro/usbio.c	2008-09-03 02:10:32.000000000 +0200
+++ Argyll_V1.0.3/spectro/usbio.c	2008-09-03 22:27:19.000000000 +0200
@@ -102,9 +102,6 @@
 #ifdef ENABLE_USB
 	struct usb_bus *bus;
 
-	/* Check that we've got an up to date version of libusb */
-	if (usb_argyll_patched() < 2)
-		error("usblib isn't up to date to work with this version of Argyll");
 
 // ~~99
 //	if (p->debug)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/argyllcms/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Sep 2008 12:28:39 -0000	1.4
+++ .cvsignore	3 Sep 2008 20:59:38 -0000	1.5
@@ -1,2 +1,2 @@
 Argyll_V1.0.1_autotools.patch.gz
-Argyll_V1.0.2_src.zip
+Argyll_V1.0.3_src.zip


Index: argyllcms.spec
===================================================================
RCS file: /cvs/extras/rpms/argyllcms/devel/argyllcms.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- argyllcms.spec	1 Sep 2008 12:28:39 -0000	1.5
+++ argyllcms.spec	3 Sep 2008 20:59:38 -0000	1.6
@@ -4,7 +4,7 @@
 %define archivename Argyll_V%{version}%{?alphaversion}_src.zip
 
 Name:    argyllcms
-Version: 1.0.2
+Version: 1.0.3
 Release: 1%{?alphatag}%{?dist}
 Summary: ICC compatible color management system
 
@@ -13,11 +13,9 @@
 URL:     http://www.%{name}.com/
 
 Source0: %{url}%{archivename}
-Source1: %{name}-1.0.1-19-color.fdi
-Source2: %{name}-0.70-color-device-file.policy
 # Many thanks to Alastair M. Robinson!
 Patch1:  http://www.blackfiveservices.co.uk/Argyll_V1.0.1_autotools.patch.gz
-Patch2:  %{name}-1.0.1-remove-libusb-fork-check.patch
+Patch2:  %{name}-1.0.3-remove-libusb-fork-check.patch
 # Patch applied for legal reasons
 Patch4:  %{name}-1.0.2-legal.patch
 
@@ -67,6 +65,10 @@
 # Legal patch required
 %patch4 -p1 -b .legal
 
+# Salvage policy files
+mv libusb/19-color.fdi .
+mv libusb/color-device-file.policy .
+
 # Remove useless bundled libs to make sure we don't accidentally include them
 rm -fr tiff libusb libusbw
 
@@ -84,12 +86,12 @@
 
 # Do some device permission magic
 install -d -m 0755 %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/
-install -p -m 0644 %{SOURCE1} \
-        %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/19-color.fdi
+install -p -m 0644 19-color.fdi \
+        %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/
 
 install -d -m 0755 %{buildroot}%{_datadir}/PolicyKit/policy/
-install -p -m 0644 %{SOURCE2} \
-        %{buildroot}%{_datadir}/PolicyKit/policy/color-device-file.policy
+install -p -m 0644 color-device-file.policy \
+        %{buildroot}%{_datadir}/PolicyKit/policy/
 
 
 %clean
@@ -113,6 +115,10 @@
 
 
 %changelog
+* Wed Sep 3 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 1.0.3-1
+??? Bugfix release
+
 * Mon Sep 1 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 1.0.2-1
 ??? Bugfix release


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/argyllcms/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	1 Sep 2008 12:28:39 -0000	1.2
+++ import.log	3 Sep 2008 20:59:38 -0000	1.3
@@ -1,2 +1,3 @@
 argyllcms-1_0_1-1_fc10_nim:HEAD:argyllcms-1.0.1-1.fc10.nim.src.rpm:1217165503
 argyllcms-1_0_2-1_fc10:HEAD:argyllcms-1.0.2-1.fc10.src.rpm:1220272108
+argyllcms-1_0_3-1_fc10:HEAD:argyllcms-1.0.3-1.fc10.src.rpm:1220475532


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/argyllcms/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Sep 2008 12:28:39 -0000	1.4
+++ sources	3 Sep 2008 20:59:38 -0000	1.5
@@ -1,2 +1,2 @@
 cdb94385421c2fae1cf6fb068069cd9e  Argyll_V1.0.1_autotools.patch.gz
-fd56b470873cbca980a37836adc41095  Argyll_V1.0.2_src.zip
+01915869a2fda1fdaa91174edf57a0c6  Argyll_V1.0.3_src.zip


--- argyllcms-0.70-color-device-file.policy DELETED ---


--- argyllcms-1.0.1-19-color.fdi DELETED ---


--- argyllcms-1.0.1-remove-libusb-fork-check.patch DELETED ---



From jkeating at fedoraproject.org  Wed Sep  3 21:02:09 2008
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Wed,  3 Sep 2008 21:02:09 +0000 (UTC)
Subject: rpms/cluster/devel
	0001-Changes-needed-to-stay-compatible-with-libvolume_id.patch, NONE, 
	1.1 0002-Changes-needed-to-stay-current-with-libvolume_id.patch,
	NONE, 1.1
Message-ID: <20080903210209.113C77002B@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10414

Added Files:
	0001-Changes-needed-to-stay-compatible-with-libvolume_id.patch 
	0002-Changes-needed-to-stay-current-with-libvolume_id.patch 
Log Message:
Add missing patches


0001-Changes-needed-to-stay-compatible-with-libvolume_id.patch:

--- NEW FILE 0001-Changes-needed-to-stay-compatible-with-libvolume_id.patch ---
>From 1e00b980fb2531de1272229f9900b8bf94caae56 Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso at redhat.com>
Date: Wed, 3 Sep 2008 13:29:35 -0500
Subject: [PATCH] Changes needed to stay compatible with libvolume_id.

---
 gfs/gfs_mkfs/main.c |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/gfs/gfs_mkfs/main.c b/gfs/gfs_mkfs/main.c
index 87316c7..f216b5c 100644
--- a/gfs/gfs_mkfs/main.c
+++ b/gfs/gfs_mkfs/main.c
@@ -208,18 +208,34 @@ void are_you_sure(commandline_t *comline)
 {
 	char input[32];
 	struct volume_id *vid = NULL;
+	int fd;
 
-	vid = volume_id_open_node(comline->device);
-	if (vid == NULL)
+	fd = open(comline->device, O_RDONLY);
+	if (fd < 0)
+		die("Error: device %s not found.\n", comline->device);
+	vid = volume_id_open_fd(fd);
+	if (vid == NULL) {
+		close(fd);
 		die("error identifying the contents of %s: %s\n",
 		    comline->device, strerror(errno));
-
+	}
 	printf("This will destroy any data on %s.\n",
 	       comline->device);
-	if (volume_id_probe_all(vid, 0, MKFS_DEFAULT_BSIZE) == 0)
-		printf("  It appears to contain a %s %s.\n", vid->type,
-			   vid->usage_id == VOLUME_ID_OTHER? "partition" : vid->usage);
+	if (volume_id_probe_all(vid, 0, MKFS_DEFAULT_BSIZE) == 0) {
+		const char *fstype, *fsusage;
+		int rc;
+
+		rc = volume_id_get_type(vid, &fstype);
+		if (rc) {
+			rc = volume_id_get_usage(vid, &fsusage);
+			if (!rc || strncmp(fsusage, "other", 5) == 0)
+				fsusage = "partition";
+			printf("  It appears to contain a %s %s.\n", fstype,
+			       fsusage);
+		}
+	}
 	volume_id_close(vid);
+	close(fd);
 	printf("\nAre you sure you want to proceed? [y/n] ");
 	if (fgets(input, 32, stdin) == NULL || input[0] != 'y')
 		die("aborted\n");
-- 
1.6.0.1


0002-Changes-needed-to-stay-current-with-libvolume_id.patch:

--- NEW FILE 0002-Changes-needed-to-stay-current-with-libvolume_id.patch ---
>From f00e7639798652daf6cce0dc7f9d8d3be0dae194 Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso at redhat.com>
Date: Wed, 3 Sep 2008 13:49:41 -0500
Subject: [PATCH] Changes needed to stay current with libvolume_id.

---
 gfs2/mkfs/main_mkfs.c |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c
index 381380c..9b57f5a 100644
--- a/gfs2/mkfs/main_mkfs.c
+++ b/gfs2/mkfs/main_mkfs.c
@@ -260,17 +260,33 @@ static void are_you_sure(struct gfs2_sbd *sdp)
 {
 	char input[32];
 	struct volume_id *vid = NULL;
-
-	vid = volume_id_open_node(sdp->device_name);
-	if (vid == NULL)
+	int fd;
+
+	fd = open(sdp->device_name, O_RDONLY);
+	if (fd < 0)
+		die("Error: device %s not found.\n", sdp->device_name);
+	vid = volume_id_open_fd(fd);
+	if (vid == NULL) {
+		close(fd);
 		die("error identifying the contents of %s: %s\n",
 		    sdp->device_name, strerror(errno));
-
+	}
 	printf("This will destroy any data on %s.\n", sdp->device_name);
-	if (volume_id_probe_all(vid, 0, sdp->device_size) == 0)
-		printf("  It appears to contain a %s %s.\n", vid->type,
-			   vid->usage_id == VOLUME_ID_OTHER? "partition" : vid->usage);
+	if (volume_id_probe_all(vid, 0, sdp->device_size) == 0) {
+		const char *fstype, *fsusage;
+		int rc;
+
+		rc = volume_id_get_type(vid, &fstype);
+		if (rc) {
+			rc = volume_id_get_usage(vid, &fsusage);
+			if (!rc || strncmp(fsusage, "other", 5) == 0)
+				fsusage = "partition";
+			printf("  It appears to contain a %s %s.\n", fstype,
+			       fsusage);
+		}
+	}
 	volume_id_close(vid);
+	close(fd);
 	printf("\nAre you sure you want to proceed? [y/n] ");
 	if(!fgets(input, 32, stdin))
 		die("unable to read from stdin\n");
-- 
1.6.0.1




From rjones at fedoraproject.org  Wed Sep  3 21:02:33 2008
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed,  3 Sep 2008 21:02:33 +0000 (UTC)
Subject: rpms/ocaml-lwt/F-9 import.log, NONE, 1.1 ocaml-lwt.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080903210233.0DB0E7002B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-lwt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10365/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ocaml-lwt.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
ocaml-lwt-1_1_0-1_fc10:F-9:ocaml-lwt-1.1.0-1.fc10.src.rpm:1220475698


--- NEW FILE ocaml-lwt.spec ---
%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%define debug_package %{nil}

Name:           ocaml-lwt
Version:        1.1.0
Release:        1%{?dist}
Summary:        OCaml lightweight thread library

Group:          Development/Libraries
License:        LGPLv2+ with exceptions
URL:            http://ocsigen.org/install/lwt
Source0:        http://ocsigen.org/download/lwt-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ocaml >= 3.10.0
BuildRequires:  ocaml-findlib-devel
BuildRequires:  ocaml-ocamldoc
BuildRequires:  ocaml-ssl >= 0.4.0

%define _use_internal_dependency_generator 0
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh


%description
Lwt is a lightweight thread library for Objective Caml.  This library
is part of the Ocsigen project.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}


%description    devel
The %{name}-devel package contains libraries and signature files for
developing applications that use %{name}.


%prep
%setup -q -n lwt-%{version}

mv README README.old
iconv -f iso-8859-1 -t utf-8 < README.old > README


%build
make


%install
rm -rf $RPM_BUILD_ROOT
export DESTDIR=$RPM_BUILD_ROOT
export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
make install


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE COPYING
%{_libdir}/ocaml/lwt
%if %opt
%exclude %{_libdir}/ocaml/lwt/*.a
%exclude %{_libdir}/ocaml/lwt/*.cmxa
%exclude %{_libdir}/ocaml/lwt/*.cmx
%endif
%exclude %{_libdir}/ocaml/lwt/*.mli


%files devel
%defattr(-,root,root,-)
%doc LICENSE COPYING CHANGES CHANGES.darcs README VERSION _build/lwt.docdir
%if %opt
%{_libdir}/ocaml/lwt/*.a
%{_libdir}/ocaml/lwt/*.cmxa
%{_libdir}/ocaml/lwt/*.cmx
%endif
%{_libdir}/ocaml/lwt/*.mli


%changelog
* Mon Sep  1 2008 Richard W.M. Jones <rjones at redhat.com> - 1.1.0-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lwt/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:36:07 -0000	1.1
+++ .cvsignore	3 Sep 2008 21:02:02 -0000	1.2
@@ -0,0 +1 @@
+lwt-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lwt/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:36:07 -0000	1.1
+++ sources	3 Sep 2008 21:02:02 -0000	1.2
@@ -0,0 +1 @@
+dcc43458f3e39647bb7992749de43fa5  lwt-1.1.0.tar.gz



From rjones at fedoraproject.org  Wed Sep  3 21:02:47 2008
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed,  3 Sep 2008 21:02:47 +0000 (UTC)
Subject: rpms/ocaml-lwt/devel import.log, NONE, 1.1 ocaml-lwt.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080903210247.D8B057002B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-lwt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10473/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ocaml-lwt.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
ocaml-lwt-1_1_0-1_fc10:HEAD:ocaml-lwt-1.1.0-1.fc10.src.rpm:1220475706


--- NEW FILE ocaml-lwt.spec ---
%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%define debug_package %{nil}

Name:           ocaml-lwt
Version:        1.1.0
Release:        1%{?dist}
Summary:        OCaml lightweight thread library

Group:          Development/Libraries
License:        LGPLv2+ with exceptions
URL:            http://ocsigen.org/install/lwt
Source0:        http://ocsigen.org/download/lwt-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ocaml >= 3.10.0
BuildRequires:  ocaml-findlib-devel
BuildRequires:  ocaml-ocamldoc
BuildRequires:  ocaml-ssl >= 0.4.0

%define _use_internal_dependency_generator 0
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh


%description
Lwt is a lightweight thread library for Objective Caml.  This library
is part of the Ocsigen project.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}


%description    devel
The %{name}-devel package contains libraries and signature files for
developing applications that use %{name}.


%prep
%setup -q -n lwt-%{version}

mv README README.old
iconv -f iso-8859-1 -t utf-8 < README.old > README


%build
make


%install
rm -rf $RPM_BUILD_ROOT
export DESTDIR=$RPM_BUILD_ROOT
export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
make install


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE COPYING
%{_libdir}/ocaml/lwt
%if %opt
%exclude %{_libdir}/ocaml/lwt/*.a
%exclude %{_libdir}/ocaml/lwt/*.cmxa
%exclude %{_libdir}/ocaml/lwt/*.cmx
%endif
%exclude %{_libdir}/ocaml/lwt/*.mli


%files devel
%defattr(-,root,root,-)
%doc LICENSE COPYING CHANGES CHANGES.darcs README VERSION _build/lwt.docdir
%if %opt
%{_libdir}/ocaml/lwt/*.a
%{_libdir}/ocaml/lwt/*.cmxa
%{_libdir}/ocaml/lwt/*.cmx
%endif
%{_libdir}/ocaml/lwt/*.mli


%changelog
* Mon Sep  1 2008 Richard W.M. Jones <rjones at redhat.com> - 1.1.0-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lwt/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:36:07 -0000	1.1
+++ .cvsignore	3 Sep 2008 21:02:17 -0000	1.2
@@ -0,0 +1 @@
+lwt-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lwt/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:36:07 -0000	1.1
+++ sources	3 Sep 2008 21:02:17 -0000	1.2
@@ -0,0 +1 @@
+dcc43458f3e39647bb7992749de43fa5  lwt-1.1.0.tar.gz



From rjones at fedoraproject.org  Wed Sep  3 21:05:23 2008
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed,  3 Sep 2008 21:05:23 +0000 (UTC)
Subject: rpms/ocaml-lwt/devel ocaml-lwt.spec,1.1,1.2
Message-ID: <20080903210523.76EF07002B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-lwt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11042

Modified Files:
	ocaml-lwt.spec 
Log Message:
* Wed Sep  3 2008 Richard W.M. Jones <rjones at redhat.com> - 1.1.0-2
- Rebuild with higher EVR than F-9 branch.



Index: ocaml-lwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lwt/devel/ocaml-lwt.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocaml-lwt.spec	3 Sep 2008 21:02:17 -0000	1.1
+++ ocaml-lwt.spec	3 Sep 2008 21:04:53 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           ocaml-lwt
 Version:        1.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OCaml lightweight thread library
 
 Group:          Development/Libraries
@@ -85,5 +85,8 @@
 
 
 %changelog
+* Wed Sep  3 2008 Richard W.M. Jones <rjones at redhat.com> - 1.1.0-2
+- Rebuild with higher EVR than F-9 branch.
+
 * Mon Sep  1 2008 Richard W.M. Jones <rjones at redhat.com> - 1.1.0-1
 - Initial RPM release.



From spot at fedoraproject.org  Wed Sep  3 21:09:14 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 21:09:14 +0000 (UTC)
Subject: rpms/rsnapshot/devel .cvsignore, 1.6, 1.7 rsnapshot.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <20080903210914.F383E7002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rsnapshot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11614

Modified Files:
	.cvsignore rsnapshot.spec sources 
Log Message:
fix license tag, update to 1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rsnapshot/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 May 2007 20:28:52 -0000	1.6
+++ .cvsignore	3 Sep 2008 21:08:44 -0000	1.7
@@ -1 +1 @@
-rsnapshot-1.3.0.tar.gz
+rsnapshot-1.3.1.tar.gz


Index: rsnapshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsnapshot/devel/rsnapshot.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rsnapshot.spec	28 May 2007 20:28:52 -0000	1.12
+++ rsnapshot.spec	3 Sep 2008 21:08:44 -0000	1.13
@@ -5,56 +5,35 @@
 #
 
 Name:           rsnapshot
-Version:        1.3.0
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        Local and remote filesystem snapshot utility
-
 Group:          Applications/System
-License:        GPL
+License:        GPLv2+
 URL:            http://www.rsnapshot.org/
-
-################################################################################
-
 Source:         http://www.rsnapshot.org/downloads/%{name}-%{version}.tar.gz
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
-
-################################################################################
-
 # This patch enables a few defaults in the config file that make sense to have
 # enabled in linux.
-Patch:          rsnapshot.conf.patch
-
-################################################################################
-
+Patch0:         rsnapshot.conf.patch
 BuildRequires:  rsync
 BuildRequires:  openssh-clients
-
 Requires:       openssh-clients
 Requires:       rsync
 
-################################################################################
-
 %description
 This is a remote backup program that uses rsync to take backup snapshots of
 filesystems.  It uses hard links to save space on disk.
 
-################################################################################
-
 %prep
-
 %setup -q
+%patch0 -p0
 
-%patch
-
-# Disable the config-file testing during ./configure because it freaks out if
+# Disable the config-file testing during configure because it freaks out if
 # you're building as non-root on a system that actually has rsnapshot installed.
 sed -ie 's|if test -e "\$RSNAPSHOT_SYSCONFDIR/rsnapshot.conf"|if false|' configure
 
-################################################################################
-
 %build
 %configure                              \
     --with-perl="%{__perl}"             \
@@ -63,10 +42,7 @@
     --with-logger="%{_bindir}/logger"   \
     --with-du="%{_bindir}/du"
 
-################################################################################
-
 %install
-
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
@@ -76,10 +52,7 @@
 # Change the perms on the utils/ files so rpm doesn't pick up their dependencies
 find utils/ -type f -print0 | xargs -r0 chmod 644
 
-################################################################################
-
 %post
-
 %define logmsg logger -t %{name}/rpm
 
 # Get the version of the current rsnapshot config file so we can see if it
@@ -101,16 +74,11 @@
         exit 1
     fi
 
-################################################################################
-
 %clean
-
 rm -rf $RPM_BUILD_ROOT
 
-################################################################################
-
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING INSTALL README TODO
 %doc rsnapshot.conf.default
 %doc utils/
@@ -118,9 +86,11 @@
 %{_bindir}/*
 %{_mandir}/man1/*
 
-################################################################################
-
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.3.1-1
+- fix license tag
+- update to 1.3.1
+- remove comment lines (more trouble than they're worth)
 
 * Mon May 28 2007 Chris Petersen <rpm at forevermore.net>                  1.3.0-1
 - Upgrade to 1.3.0
@@ -144,8 +114,8 @@
 * Wed May 17 2006 Chris Petersen <rpm at forevermore.net>                  1.2.3-1
 - Update to version 1.2.3 which is in the downloads directory but not linked on the site.
 - Change openssh requirement to openssh-clients
-- Update %post script with better info from the rpmforge spec and nifty logger reports
-- Add utils/ to the %doc files
+- Update %%post script with better info from the rpmforge spec and nifty logger reports
+- Add utils/ to the %%doc files
 
 * Sat May 13 2006 Chris Petersen <rpm at forevermore.net>                  1.2.1-1
 - Update specfile to be compatible with fedora guidelines


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rsnapshot/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 May 2007 20:28:52 -0000	1.6
+++ sources	3 Sep 2008 21:08:44 -0000	1.7
@@ -1 +1 @@
-8487514517e78fe1cd1143ca67cb4b62  rsnapshot-1.3.0.tar.gz
+588f92995dcf60a6ea6df8d94a017e7e  rsnapshot-1.3.1.tar.gz



From nim at fedoraproject.org  Wed Sep  3 21:10:34 2008
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Wed,  3 Sep 2008 21:10:34 +0000 (UTC)
Subject: rpms/edrip-fonts/devel edrip-fonts.spec, 1.11, 1.12 import.log, 1.3,
	1.4
Message-ID: <20080903211034.8B3687002B@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/edrip-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11954/devel

Modified Files:
	edrip-fonts.spec import.log 
Log Message:
rebuild with pre-F10-freeze fontforge


Index: edrip-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/edrip-fonts/devel/edrip-fonts.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- edrip-fonts.spec	1 Sep 2008 15:35:26 -0000	1.11
+++ edrip-fonts.spec	3 Sep 2008 21:10:04 -0000	1.12
@@ -6,7 +6,7 @@
 
 Name:    %{fontname}-fonts
 Version: 20080826
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Edrip decorative font
 
 Group:   User Interface/X
@@ -75,6 +75,10 @@
 
 
 %changelog
+* Wed Sep 3 2008 <nicolas.mailhot at laposte.net>
+- 20080826-2
+??? Rebuild with pre-F10-freeze fontforge
+
 * Mon Sep 1 2008 <nicolas.mailhot at laposte.net>
 - 20080826-1
 ?? Still more extended cyrillic coverage


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/edrip-fonts/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	1 Sep 2008 15:35:26 -0000	1.3
+++ import.log	3 Sep 2008 21:10:04 -0000	1.4
@@ -1,3 +1,4 @@
 edrip-fonts-20080710-1_fc10:HEAD:edrip-fonts-20080710-1.fc10.src.rpm:1215808287
 edrip-fonts-20080717-1_fc10_nim:HEAD:edrip-fonts-20080717-1.fc10.nim.src.rpm:1216368564
 edrip-fonts-20080826-1_fc10_nim:HEAD:edrip-fonts-20080826-1.fc10.nim.src.rpm:1220283093
+edrip-fonts-20080826-2_fc10:HEAD:edrip-fonts-20080826-2.fc10.src.rpm:1220476184



From kevin at fedoraproject.org  Wed Sep  3 20:04:26 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:04:26 +0000 (UTC)
Subject: rpms/fontforge/devel sources, 1.20, 1.21 .cvsignore, 1.20,
	1.21 fontforge.spec, 1.34, 1.35
Message-ID: <20080903200426.1D66B7002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fontforge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv672

Modified Files:
	sources .cvsignore fontforge.spec 
Log Message:
Upgrade to 20080828
Add Requires on autotrace. Fixes 460668
Confirm patch from 459451 is upstream here. 



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	18 May 2008 16:17:11 -0000	1.20
+++ sources	3 Sep 2008 20:03:55 -0000	1.21
@@ -1,2 +1,2 @@
-ca239de93aeceed08c263333d0e898c8  fontforge_full-20080429.tar.bz2
-17def25d0a140a1e3359c0287d694bc6  fontforge_htdocs-20080429.tar.bz2
+3c232a6e412d8b443b0b881332dbc26c  fontforge_full-20080828.tar.bz2
+5eee3058485b52208dfca1d46aeb96aa  fontforge_htdocs-20080824.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	18 May 2008 16:17:11 -0000	1.20
+++ .cvsignore	3 Sep 2008 20:03:55 -0000	1.21
@@ -1,2 +1,2 @@
-fontforge_full-20080429.tar.bz2
-fontforge_htdocs-20080429.tar.bz2
+fontforge_full-20080828.tar.bz2
+fontforge_htdocs-20080824.tar.bz2


Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- fontforge.spec	18 May 2008 16:17:11 -0000	1.34
+++ fontforge.spec	3 Sep 2008 20:03:55 -0000	1.35
@@ -1,8 +1,8 @@
-%define docs_version 20080429
+%define docs_version 20080824
 %define gettext_package FontForge
 
 Name:           fontforge
-Version:        20080429
+Version:        20080828
 Release:        1%{?dist}
 Summary:        Outline and bitmap font editor
 
@@ -16,6 +16,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       xdg-utils
+Requires:	autotrace
 
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
@@ -58,8 +59,6 @@
 chmod 644 htdocs/*.html
 chmod 644 htdocs/*.png
 rm -rf htdocs/flags/CVS
-mkdir cidmaps
-tar xzf htdocs/cidmaps.tgz -C cidmaps
 
 # Fix bad line terminators
 %{__sed} -i 's/\r//' htdocs/Big5.txt
@@ -77,7 +76,6 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -p -m 644 cidmaps/Adobe* $RPM_BUILD_ROOT%{_datadir}/fontforge
 rm -f $RPM_BUILD_ROOT%{_libdir}/libg{draw,unicode}.{la,so}
 
 install -Dpm 644 htdocs/ffanvil32.png \
@@ -138,6 +136,11 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Sep 03 2008 Kevin Fenzi <kevin at tummy.com> - 20080828-1
+- Upgrade to 20080828
+- Add Requires on autotrace. Fixes 460668
+- Confirm patch from 459451 is upstream here. 
+
 * Fri May 16 2008 Kevin Fenzi <kevin at tummy.com> - 20080429-1
 - Upgrade to 20080429
 



From pkgdb at fedoraproject.org  Wed Sep  3 20:38:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 03 Sep 2008 20:38:35 +0000
Subject: [pkgdb] augeas (Fedora EPEL, 5) updated by kevin
Message-ID: <20080903203842.1F9382E01C3@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for augeas
kevin has set commit to Approved for uberpackager on augeas (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on augeas (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on augeas (Fedora EPEL 5)
kevin changed owner of augeas in Fedora EPEL 5 to lutter
kevin approved watchbugzilla on augeas (Fedora EPEL 5) for apevec
kevin approved watchcommits on augeas (Fedora EPEL 5) for apevec
kevin approved commit on augeas (Fedora EPEL 5) for apevec
kevin approved build on augeas (Fedora EPEL 5) for apevec
kevin approved approveacls on augeas (Fedora EPEL 5) for apevec

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/augeas



From spot at fedoraproject.org  Wed Sep  3 20:05:54 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 20:05:54 +0000 (UTC)
Subject: rpms/rcs/devel rcs-5.7-DESTDIR.patch,NONE,1.1 rcs.spec,1.20,1.21
Message-ID: <20080903200554.0FA9B7011F@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rcs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1066

Modified Files:
	rcs.spec 
Added Files:
	rcs-5.7-DESTDIR.patch 
Log Message:
fix license tag

rcs-5.7-DESTDIR.patch:

--- NEW FILE rcs-5.7-DESTDIR.patch ---
diff -up rcs-5.7/man/Makefile.in.BAD rcs-5.7/man/Makefile.in
--- rcs-5.7/man/Makefile.in.BAD	2008-09-03 16:00:36.000000000 -0400
+++ rcs-5.7/man/Makefile.in	2008-09-03 16:01:35.000000000 -0400
@@ -49,16 +49,16 @@ rcsfile.5 : rcsfile.5in
 check dvi info TAGS ::
 
 installdirs :: ../mkinstalldirs
-	-$(srcdir)/../mkinstalldirs $(man1dir) $(man5dir)
+	-$(srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir)
 
 man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog
 
 install :: installdirs
 	-for m in $(man1pages); do \
-		$(INSTALL_DATA) $(srcdir)/$$m.1 $(man1dir)/$$m$(man1ext); \
+		$(INSTALL_DATA) $(srcdir)/$$m.1 $(DESTDIR)$(man1dir)/$$m$(man1ext); \
 	done
 	-{ test -f rcsfile.5 || cd $(srcdir); } && \
-	$(INSTALL_DATA) rcsfile.5 $(man5dir)/rcsfile$(man5ext)
+	$(INSTALL_DATA) rcsfile.5 $(DESTDIR)$(man5dir)/rcsfile$(man5ext)
 
 uninstall ::
 	for m in $(man1pages); do \
diff -up rcs-5.7/src/Makefile.in.BAD rcs-5.7/src/Makefile.in
--- rcs-5.7/src/Makefile.in.BAD	2008-09-03 15:59:48.000000000 -0400
+++ rcs-5.7/src/Makefile.in	2008-09-03 16:00:26.000000000 -0400
@@ -110,11 +110,11 @@ all :: $(PROGRAMS)
 	$(CC) -c $(ALL_CFLAGS) $<
 
 installdirs :: ../mkinstalldirs
-	$(srcdir)/../mkinstalldirs $(bindir)
+	$(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
 
 install :: all installdirs
 	for p in $(PROGRAMS); do \
-	  $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
+	  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p; \
 	done
 
 uninstall ::


Index: rcs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcs/devel/rcs.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rcs.spec	19 Feb 2008 06:34:20 -0000	1.20
+++ rcs.spec	3 Sep 2008 20:05:23 -0000	1.21
@@ -1,17 +1,17 @@
-Summary: Revision Control System (RCS) file version management tools.
+Summary: Revision Control System (RCS) file version management tools
 Name: rcs
 Version: 5.7
-Release: 32
-License: GPL
+Release: 33%{?dist}
+License: GPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/rcs/
 Source: ftp://ftp.gnu.org/gnu/rcs/%{name}-%{version}.tar.gz
-Patch: rcs-5.7-stupidrcs.patch
+Patch0: rcs-5.7-stupidrcs.patch
 Patch1: rcs-5.7-security.patch
 Patch2: rcs-5.7-sameuserlocks.patch
 Patch3: rcs-5.7-option.patch
 Patch4: rcs-5.7-newsvnsyntax.patch
-Prefix: %{_prefix}
+Patch5: rcs-5.7-DESTDIR.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: automake
 
@@ -32,24 +32,20 @@
 %patch2 -p1 -b .sameuserlocks
 %patch3 -p1 -b .option
 %patch4 -p1 -b .newsvnsyntax
-
+%patch5 -p1 -b .DESTDIR
 autoconf
 
 %build
-
 %configure --with-diffutils
-
 touch src/conf.h
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-
-#make prefix=${RPM_BUILD_ROOT}/%{_prefix} install
-%makeinstall man1dir=${RPM_BUILD_ROOT}%{_mandir}/man1 man5dir=${RPM_BUILD_ROOT}%{_mandir}/man5
+make DESTDIR=${RPM_BUILD_ROOT} man1dir=%{_mandir}/man1 man5dir=%{_mandir}/man5 install
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc ChangeLog CREDITS NEWS rcs_func.ms rcs.ms README REFS
 %{_bindir}/*
 %{_mandir}/man[15]/*
@@ -58,6 +54,9 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.7-33
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 5.7-32
 - Autorebuild for GCC 4.3
 



From katzj at fedoraproject.org  Wed Sep  3 20:42:09 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Wed,  3 Sep 2008 20:42:09 +0000 (UTC)
Subject: rpms/sugar-terminal/devel sugar-terminal.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080903204209.DF23D7002B@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/sugar-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7096

Modified Files:
	.cvsignore sources 
Added Files:
	sugar-terminal.spec 
Log Message:
* Tue Sep  2 2008 Jeremy Katz <katzj at redhat.com> - 16-1
- update to Terminal-16
- use %find_lang which works with new bundlebuilder changes
- remove bogus pseudo.po translation



--- NEW FILE sugar-terminal.spec ---
Name: sugar-terminal
Version: 16
Release: 1%{?dist}
Summary: Terminal for Sugar
Group: Sugar/Activities
License: GPLv2+
URL: http://wiki.laptop.org/go/Terminal
Source0: http://dev.laptop.org/pub/sugar/sources/terminal-activity/Terminal-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python sugar-toolkit
Requires: sugar vte
BuildArch: noarch

%description
The terminal activity provides a vte-based terminal for the Sugar interface.

%prep
%setup -q -n Terminal-%{version}

# remove bogus pseudo.po
rm -vf po/pseudo.po

%build
python ./setup.py build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{sugaractivitydir}
./setup.py install --prefix=$RPM_BUILD_ROOT/%{_prefix}

%find_lang org.laptop.Terminal

%clean
rm -rf $RPM_BUILD_ROOT


%files -f org.laptop.Terminal.lang
%defattr(-,root,root,-)
%doc NEWS README
%{sugaractivitydir}/Terminal.activity/


%changelog
* Tue Sep  2 2008 Jeremy Katz <katzj at redhat.com> - 16-1
- update to Terminal-16
- use %%find_lang which works with new bundlebuilder changes
- remove bogus pseudo.po translation

* Tue Jul 22 2008 Jeremy Katz <katzj at redhat.com> - 13-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-terminal/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:24:01 -0000	1.1
+++ .cvsignore	3 Sep 2008 20:41:39 -0000	1.2
@@ -0,0 +1 @@
+Terminal-16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-terminal/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:24:01 -0000	1.1
+++ sources	3 Sep 2008 20:41:39 -0000	1.2
@@ -0,0 +1 @@
+64185b62752e41cf764dce08d7be1d11  Terminal-16.tar.bz2



From spot at fedoraproject.org  Wed Sep  3 19:27:51 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 19:27:51 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.33,1.34
Message-ID: <20080903192751.C35E97011F@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29729

Modified Files:
	qpidc.spec 
Log Message:
fix license tag


Index: qpidc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- qpidc.spec	7 Jul 2008 16:10:37 -0000	1.33
+++ qpidc.spec	3 Sep 2008 19:27:21 -0000	1.34
@@ -8,10 +8,10 @@
 
 Name:           qpidc
 Version:        0.2.%{svnrev}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
-License:        Apache Software License
+License:        ASL 2.0
 URL:            http://rhm.et.redhat.com/qpidc
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -214,6 +214,9 @@
 /sbin/ldconfig
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.667603-3
+- fix license tag
+
 * Tue Jul  7 2008 Nuno Santos <nsantos at redhat.com> - 0.2.667603-2
 - MRG GA release
 



From mstone at fedoraproject.org  Wed Sep  3 21:12:24 2008
From: mstone at fedoraproject.org (Michael Stone)
Date: Wed,  3 Sep 2008 21:12:24 +0000 (UTC)
Subject: rpms/olpc-utils/OLPC-3 .cvsignore, 1.12, 1.13 olpc-utils.spec, 1.18,
	1.19 sources, 1.13, 1.14
Message-ID: <20080903211224.8E0B17002B@cvs1.fedora.phx.redhat.com>

Author: mstone

Update of /cvs/pkgs/rpms/olpc-utils/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12306

Modified Files:
	.cvsignore olpc-utils.spec sources 
Log Message:
- Guillaume Desmottes (1):
    xsession-example: open Telepathy log files in append mode instead of trunc (#8142)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	2 Sep 2008 23:18:08 -0000	1.12
+++ .cvsignore	3 Sep 2008 21:11:54 -0000	1.13
@@ -1 +1 @@
-olpc-utils-0.85.tar.bz2
+olpc-utils-0.86.tar.bz2


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/olpc-utils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- olpc-utils.spec	2 Sep 2008 23:18:08 -0000	1.18
+++ olpc-utils.spec	3 Sep 2008 21:11:54 -0000	1.19
@@ -1,5 +1,5 @@
 Name:       olpc-utils
-Version:    0.85
+Version:    0.86
 Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
@@ -85,6 +85,10 @@
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-foreground-compat.ck
 
 %changelog
+* Tue Sep 02 2008 Michael Stone <michael at laptop.org> 0.86-1
+- Guillaume Desmottes (1):
+    xsession-example: open Telepathy log files in append mode instead of trunc (#8142)
+
 * Tue Sep 02 2008 Michael Stone <michael at laptop.org> 0.85-1
 - Michael Stone (1):
     dlo#7690: Remove the msh0-renaming rule since dlo#5746 was fixed upstream.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	2 Sep 2008 23:18:08 -0000	1.13
+++ sources	3 Sep 2008 21:11:54 -0000	1.14
@@ -1 +1 @@
-5f10b3443bb4cbdb391cd356d34be116  olpc-utils-0.85.tar.bz2
+58a74678030b6066a933eae1348d896e  olpc-utils-0.86.tar.bz2



From spot at fedoraproject.org  Wed Sep  3 19:05:33 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 19:05:33 +0000 (UTC)
Subject: rpms/pyxmms/devel pyxmms.spec,1.6,1.7
Message-ID: <20080903190533.2B40B70121@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pyxmms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27552

Modified Files:
	pyxmms.spec 
Log Message:
fix license tag


Index: pyxmms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyxmms/devel/pyxmms.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pyxmms.spec	7 Mar 2008 16:29:10 -0000	1.6
+++ pyxmms.spec	3 Sep 2008 19:05:02 -0000	1.7
@@ -4,11 +4,11 @@
 Name: pyxmms
 Summary: Python Interface to XMMS
 Version: 2.06
-Release: 6%{?dist}
-License: GPL
+Release: 7%{?dist}
+License: GPLv2
 Group: Development/Libraries
 URL: http://www.via.ecp.fr/~flo/
-Source: http://people.via.ecp.fr/~flo/2002/PyXMMS/dist/%{name}-%{version}.tar.bz2
+Source0: http://people.via.ecp.fr/~flo/2002/PyXMMS/dist/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python, glib-devel, python-devel, xmms-devel
 Requires: python
@@ -20,7 +20,7 @@
 program.
 
 %prep
-%setup -n %{name}-%{version}
+%setup -q -n %{name}-%{version}
 %{__rm} setup.cfg
 
 %build
@@ -45,6 +45,9 @@
 %endif
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.06-7
+- fix license tag
+
 * Fri Mar 07 2008 Jesse Keating <jkeating at redhat.com> - 2.06-6
 - Handle the egg file.
 



From katzj at fedoraproject.org  Wed Sep  3 20:42:45 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Wed,  3 Sep 2008 20:42:45 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.85,1.86
Message-ID: <20080903204245.7888A7002B@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7154

Modified Files:
	comps-f10.xml.in 
Log Message:
add sugar-terminal


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- comps-f10.xml.in	3 Sep 2008 08:12:22 -0000	1.85
+++ comps-f10.xml.in	3 Sep 2008 20:42:15 -0000	1.86
@@ -3938,6 +3938,7 @@
       <packagereq type="mandatory">sugar-journal</packagereq>
       <packagereq type="mandatory">telepathy-gabble</packagereq>
       <packagereq type="mandatory">telepathy-salut</packagereq>
+      <packagereq type="default">sugar-terminal</packagereq>
     </packagelist>
   </group>
   <group>



From spot at fedoraproject.org  Wed Sep  3 21:12:43 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 21:12:43 +0000 (UTC)
Subject: rpms/rtorrent/devel rtorrent.spec,1.21,1.22
Message-ID: <20080903211243.7EAAC7002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rtorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12364

Modified Files:
	rtorrent.spec 
Log Message:
fix license tag


Index: rtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rtorrent/devel/rtorrent.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rtorrent.spec	5 Apr 2008 14:26:41 -0000	1.21
+++ rtorrent.spec	3 Sep 2008 21:12:13 -0000	1.22
@@ -1,8 +1,9 @@
 Name:          rtorrent
-License:       GPL
+# OpenSSL exception, see README
+License:       GPLv2+ with exceptions
 Group:         Applications/Internet
 Version:       0.7.8
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
@@ -49,6 +50,9 @@
 %{_mandir}/man1/rtorrent*
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.7.8-4
+- fix license tag
+
 * Sat Apr  5 2008 Christopher Aillon <caillon at redhat.com> - 0.7.8-3
 - Fix build against newer sigc++
 - Fix build against GCC 4.3



From spot at fedoraproject.org  Wed Sep  3 19:00:21 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 19:00:21 +0000 (UTC)
Subject: rpms/python-xlib/devel python-xlib.spec,1.2,1.3
Message-ID: <20080903190021.7BA3370120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-xlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26865

Modified Files:
	python-xlib.spec 
Log Message:
fix license tag


Index: python-xlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-xlib/devel/python-xlib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-xlib.spec	1 Jul 2008 19:54:48 -0000	1.2
+++ python-xlib.spec	3 Sep 2008 18:59:51 -0000	1.3
@@ -3,11 +3,11 @@
 
 Name:           python-xlib
 Version:        0.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        X client library for Python
 
 Group:          Development/Languages
-License:        GPL
+License:        GPLv2+
 URL:            http://python-xlib.sourceforge.net/
 Source0:        http://prdownloads.sourceforge.net/python-xlib/python-xlib-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.14-2
+- fix license tag
+
 * Tue Jul 1 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.14-1
 - Latest upstream release
 



From spot at fedoraproject.org  Wed Sep  3 18:59:05 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 18:59:05 +0000 (UTC)
Subject: rpms/python-tpg/devel .cvsignore, 1.4, 1.5 python-tpg.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <20080903185905.B1CF170120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-tpg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26631

Modified Files:
	.cvsignore python-tpg.spec sources 
Log Message:
fix license tag, update to 3.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tpg/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Aug 2006 15:51:56 -0000	1.4
+++ .cvsignore	3 Sep 2008 18:58:35 -0000	1.5
@@ -1 +1 @@
-TPG-3.1.0.tar.gz
+TPG-3.1.2.tar.gz


Index: python-tpg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tpg/devel/python-tpg.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-tpg.spec	23 Dec 2006 21:09:18 -0000	1.10
+++ python-tpg.spec	3 Sep 2008 18:58:35 -0000	1.11
@@ -3,13 +3,13 @@
 %define srcname TPG
 
 Name:           python-tpg
-Version:        3.1.0
-Release:        4%{?dist}
+Version:        3.1.2
+Release:        1%{?dist}
 
 Summary:        A Python "toy parser generator"
 Group:          Development/Libraries
-License:        LGPL
-URL:            http://christophe.delord.free.fr/en/tpg/
+License:        LGPLv2+
+URL:            http://christophe.delord.free.fr/tpg/index.html
 Source0:        http://christophe.delord.free.fr/soft/tpg/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -59,8 +59,13 @@
 %{python_sitelib}/tpg.py
 %{python_sitelib}/tpg.pyc
 %{python_sitelib}/tpg.pyo
+%{python_sitelib}/TPG-%{version}-py*.egg-info
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.1.2-1
+- fix license tag
+- update to 3.1.2
+
 * Sat Dec 23 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 3.1.0-4
 - Rebuild with Python 2.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tpg/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Aug 2006 15:51:56 -0000	1.4
+++ sources	3 Sep 2008 18:58:35 -0000	1.5
@@ -1 +1 @@
-1f0ca4cc754afa82c0212967d6263c5c  TPG-3.1.0.tar.gz
+6db93d06bba42dd8200098a6ea4365e5  TPG-3.1.2.tar.gz



From spot at fedoraproject.org  Wed Sep  3 19:03:50 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 19:03:50 +0000 (UTC)
Subject: rpms/python-xmpp/devel python-xmpp.spec,1.7,1.8
Message-ID: <20080903190350.2D6C670120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-xmpp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27337

Modified Files:
	python-xmpp.spec 
Log Message:
fix license tag


Index: python-xmpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-xmpp/devel/python-xmpp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-xmpp.spec	4 Jan 2008 14:45:23 -0000	1.7
+++ python-xmpp.spec	3 Sep 2008 19:03:19 -0000	1.8
@@ -2,11 +2,11 @@
 
 Name:           python-xmpp
 Version:        0.4.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python library for easy scripting with Jabber
 
 Group:          Development/Languages
-License:        GPL
+License:        GPLv2+
 URL:            http://xmpppy.sourceforge.net/
 Source0:        http://dl.sourceforge.net/xmpppy/xmpppy-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,6 +55,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.1-3
+- fix license tag
+
 * Thu Jan  3 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.4.1-2
 - Get eggs building correctly on F-7 and F-8.
 



From kevin at fedoraproject.org  Wed Sep  3 20:09:09 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  3 Sep 2008 20:09:09 +0000 (UTC)
Subject: rpms/twinkle/devel sources, 1.6, 1.7 .cvsignore, 1.6,
	1.7 twinkle.spec, 1.14, 1.15 twinkle-1.2-gcc43.patch, 1.1,
	NONE twinkle-1.2-zrtpgcc43.patch, 1.1, NONE
Message-ID: <20080903200909.607E37002B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/twinkle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1696

Modified Files:
	sources .cvsignore twinkle.spec 
Removed Files:
	twinkle-1.2-gcc43.patch twinkle-1.2-zrtpgcc43.patch 
Log Message:
Update to 1.3.2



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Mar 2008 01:19:05 -0000	1.6
+++ sources	3 Sep 2008 20:08:39 -0000	1.7
@@ -1 +1 @@
-5f396d9367d7260732298c821639773b  twinkle-1.2.tar.gz
+8bafa14baeafc47be43c59fefc836c63  twinkle-1.3.2.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Mar 2008 01:19:05 -0000	1.6
+++ .cvsignore	3 Sep 2008 20:08:39 -0000	1.7
@@ -1 +1 @@
-twinkle-1.2.tar.gz
+twinkle-1.3.2.tar.gz


Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/twinkle.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- twinkle.spec	30 Jun 2008 23:01:41 -0000	1.14
+++ twinkle.spec	3 Sep 2008 20:08:39 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           twinkle
-Version:        1.2
-Release:        3%{?dist}
+Version:        1.3.2
+Release:        1%{?dist}
 Summary:        A SIP Soft Phone
 
 Group:          Applications/Internet
@@ -8,8 +8,6 @@
 URL:            http://www.twinklephone.com
 Source0:        http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz
 Patch0:         twinkle-1.1-msg.patch
-Patch1:		twinkle-1.2-gcc43.patch
-Patch2:		twinkle-1.2-zrtpgcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: commoncpp2-devel
@@ -18,11 +16,11 @@
 BuildRequires: speex-devel
 BuildRequires: boost-devel
 BuildRequires: desktop-file-utils
-BuildRequires: bind-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: kdelibs3-devel
 BuildRequires: bison
 BuildRequires: libzrtpcpp-devel
+BuildRequires: file-devel
 
 %description
 Twinkle is a SIP based soft phone for making telephone calls over IP networks.
@@ -30,8 +28,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .msg
-%patch1 -p1 -b .gcc43
-%patch2 -p1 -b .zrtpgcc43
 
 %build
 %configure
@@ -64,6 +60,9 @@
 %{_datadir}/applications/fedora-twinkle.desktop
 
 %changelog
+* Tue Sep 02 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-1
+- Update to 1.3.2
+
 * Mon Jun 30 2008 Kevin Fenzi <kevin at tummy.com> - 1.2-3
 - Rebuild with libzrtpcpp
 


--- twinkle-1.2-gcc43.patch DELETED ---


--- twinkle-1.2-zrtpgcc43.patch DELETED ---



From spot at fedoraproject.org  Wed Sep  3 20:47:40 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 20:47:40 +0000 (UTC)
Subject: rpms/rng-utils/devel rng-utils.spec,1.15,1.16
Message-ID: <20080903204740.07F947002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rng-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7549

Modified Files:
	rng-utils.spec 
Log Message:
fix license tag


Index: rng-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rng-utils/devel/rng-utils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rng-utils.spec	19 Feb 2008 06:16:02 -0000	1.15
+++ rng-utils.spec	3 Sep 2008 20:47:09 -0000	1.16
@@ -1,58 +1,50 @@
 Summary:        Random number generator related utilities
 Name:           rng-utils
 Version:        2.0
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}).1%{?dist}
-Epoch:		1
+Release:        2%{?dist}
+Epoch:          1
 Group:          System Environment/Base
-License:        GPL
-Source0: 	rng-tools-2.tar.gz
+License:        GPLv2+
+URL:            http://sourceforge.net/projects/gkernel/
+Source0:        http://download.sourceforge.net/gkernel/rng-tools-2.tar.gz
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
-Prereq:		/sbin/chkconfig /sbin/service
-BuildPreReq: 	/usr/bin/aclocal /usr/bin/automake /usr/bin/autoconf groff gettext
-
-Obsoletes:	kernel-utils
-
-Patch1: rng-tools-2-devname.patch
+Requires:       /sbin/chkconfig /sbin/service
+BuildRequires:  automake autoconf groff gettext
+Patch1:         rng-tools-2-devname.patch
 
 %description
 Hardware random number generation tools.
 
 %prep
-%setup -q -c -a 0
-%patch1 -p0
+%setup -q -n rng-tools-2
+%patch1 -p1
 
 %build
-rm -rf $RPM_BUILD_ROOT
-
-mkdir -p %{buildroot}/usr/sbin
-mkdir -p %{buildroot}/usr/man
-mkdir -p %{buildroot}/etc/rc.d/init.d
-mkdir -p %{buildroot}/etc/sysconfig
-
-cd rng-tools-2
 %configure --sbindir=/sbin
 make CFLAGS="$RPM_OPT_FLAGS"
-cd ..
 
 %install
-mkdir -p %{buildroot}/usr/share/man/man{1,8}
-
-cd rng-tools-2
-make DESTDIR=$RPM_BUILD_ROOT install
-
-chmod -R a-s %{buildroot}
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_sbindir}
+mkdir -p %{buildroot}%{_initrddir}
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}%{_mandir}/man{1,8}
+make DESTDIR=%{buildroot} install
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
+rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
-/usr/bin/rngtest
+%defattr(-,root,root,-)
+%{_bindir}/rngtest
 /sbin/rngd
-/usr/share/man/man1/rngtest.1.gz
-/usr/share/man/man8/rngd.8.gz
+%{_mandir}/man1/rngtest.1.gz
+%{_mandir}/man8/rngd.8.gz
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.0-2
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:2.0-1.14.1
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Wed Sep  3 19:02:15 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 19:02:15 +0000 (UTC)
Subject: rpms/python-simpletal/devel python-simpletal.spec,1.11,1.12
Message-ID: <20080903190215.5D2FE70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-simpletal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27154

Modified Files:
	python-simpletal.spec 
Log Message:
fix build


Index: python-simpletal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-simpletal/devel/python-simpletal.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-simpletal.spec	3 Sep 2008 18:53:37 -0000	1.11
+++ python-simpletal.spec	3 Sep 2008 19:01:45 -0000	1.12
@@ -4,7 +4,7 @@
 
 Name:           python-simpletal
 Version:        4.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        An XML based template processor for TAL, TALES and METAL specifications.
 
@@ -16,7 +16,6 @@
 
 BuildArch:      noarch
 BuildRequires:  python-devel
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
 SimpleTAL is a stand alone Python implementation of the TAL, TALES and METAL  specifications  used in Zope to power HTML and XML templates.
@@ -47,6 +46,9 @@
 %{python_sitelib}/simpletal/*.pyo
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.1-7
+- drop old abi Requires
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.1-6
 - fix license tag
 



From dwalsh at fedoraproject.org  Wed Sep  3 20:05:57 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  3 Sep 2008 20:05:57 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.94,
	1.95 policy-20080710.patch, 1.25, 1.26 selinux-policy.spec,
	1.701, 1.702
Message-ID: <20080903200557.3E11D7011F@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv829

Modified Files:
	modules-targeted.conf policy-20080710.patch 
	selinux-policy.spec 
Log Message:
* Wed Sep 3 2008 Dan Walsh <dwalsh at redhat.com> 3.5.6-1
- Update to upstream
- 	 New handling of init scripts



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- modules-targeted.conf	29 Aug 2008 18:58:58 -0000	1.94
+++ modules-targeted.conf	3 Sep 2008 20:05:26 -0000	1.95
@@ -1623,8 +1623,6 @@
 # Layer: services
 # Module: prelude
 #
-# 
-# 
 prelude = module
 
 # Layer: services
@@ -1682,3 +1680,10 @@
 # Snort network intrusion detection system
 # 
 snort = module
+
+# Layer: services
+# Module: memcached
+#
+#  high-performance memory object caching system
+# 
+memcached = module

policy-20080710.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.25 -r 1.26 policy-20080710.patch
Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- policy-20080710.patch	29 Aug 2008 20:54:34 -0000	1.25
+++ policy-20080710.patch	3 Sep 2008 20:05:26 -0000	1.26
@@ -1,6 +1,6 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.5/Makefile
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.6/Makefile
 --- nsaserefpolicy/Makefile	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.5.5/Makefile	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/Makefile	2008-09-03 11:18:25.000000000 -0400
 @@ -311,20 +311,22 @@
  
  # parse-rolemap modulename,outputfile
@@ -45,9 +45,9 @@
  $(appdir)/%: $(appconf)/%
  	@mkdir -p $(appdir)
  	$(verbose) $(INSTALL) -m 644 $< $@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.5/Rules.modular
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.6/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.5.5/Rules.modular	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/Rules.modular	2008-09-03 11:18:25.000000000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -77,9 +77,9 @@
  
  $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy
  $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.5/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.5.6/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.5/config/appconfig-mcs/default_contexts	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mcs/default_contexts	2008-09-03 11:18:25.000000000 -0400
 @@ -1,15 +0,0 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -96,15 +96,15 @@
 -
 -user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.5/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.5.6/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.5/config/appconfig-mcs/failsafe_context	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mcs/failsafe_context	2008-09-03 11:18:25.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.5/config/appconfig-mcs/guest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.6/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.5/config/appconfig-mcs/guest_u_default_contexts	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mcs/guest_u_default_contexts	2008-09-03 11:18:25.000000000 -0400
 @@ -0,0 +1,6 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -112,9 +112,9 @@
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
 +system_r:initrc_su_t:s0		guest_r:guest_t:s0
 +guest_r:guest_t:s0		guest_r:guest_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.5.5/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.5.6/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.5/config/appconfig-mcs/root_default_contexts	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mcs/root_default_contexts	2008-09-03 11:18:25.000000000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
  system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -128,18 +128,9 @@
  #
 -#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 +system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.5.5/config/appconfig-mcs/seusers
---- nsaserefpolicy/config/appconfig-mcs/seusers	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.5/config/appconfig-mcs/seusers	2008-08-25 10:50:15.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
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.5.5/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.5.6/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.5/config/appconfig-mcs/staff_u_default_contexts	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mcs/staff_u_default_contexts	2008-09-03 11:18:25.000000000 -0400
 @@ -5,6 +5,8 @@
  system_r:xdm_t:s0		staff_r:staff_t:s0
  staff_r:staff_su_t:s0		staff_r:staff_t:s0
@@ -149,9 +140,9 @@
  sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
  sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.5/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.5.6/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.5/config/appconfig-mcs/unconfined_u_default_contexts	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-03 11:18:25.000000000 -0400
 @@ -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
@@ -159,9 +150,9 @@
 +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/user_u_default_contexts serefpolicy-3.5.5/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.5.6/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.5/config/appconfig-mcs/user_u_default_contexts	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mcs/user_u_default_contexts	2008-09-03 11:18:25.000000000 -0400
 @@ -5,4 +5,5 @@
  system_r:xdm_t:s0		user_r:user_t:s0
  user_r:user_su_t:s0		user_r:user_t:s0
@@ -169,15 +160,15 @@
 -
 +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/userhelper_context serefpolicy-3.5.5/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.5.6/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.5/config/appconfig-mcs/userhelper_context	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mcs/userhelper_context	2008-09-03 11:18:25.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/xguest_u_default_contexts serefpolicy-3.5.5/config/appconfig-mcs/xguest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.6/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.5/config/appconfig-mcs/xguest_u_default_contexts	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mcs/xguest_u_default_contexts	2008-09-03 11:18:25.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -186,25 +177,25 @@
 +system_r:xdm_t		xguest_r:xguest_t:s0
 +system_r:initrc_su_t:s0	xguest_r:xguest_t:s0
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.5/config/appconfig-mls/guest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.6/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.5/config/appconfig-mls/guest_u_default_contexts	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mls/guest_u_default_contexts	2008-09-03 11:18:25.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
 +system_r:sshd_t:s0		guest_r:guest_t:s0
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.5/config/appconfig-standard/guest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.6/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.5/config/appconfig-standard/guest_u_default_contexts	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-standard/guest_u_default_contexts	2008-09-03 11:18:25.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
 +system_r:sshd_t		guest_r:guest_t
 +system_r:crond_t	guest_r:guest_crond_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.5.5/config/appconfig-standard/root_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.5.6/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.5/config/appconfig-standard/root_default_contexts	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-standard/root_default_contexts	2008-09-03 11:18:25.000000000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t	unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t
  system_r:local_login_t  unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
@@ -218,18 +209,18 @@
  #
 -#system_r:sshd_t	unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
 +system_r:sshd_t	unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.5/config/appconfig-standard/xguest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.6/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.5/config/appconfig-standard/xguest_u_default_contexts	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-standard/xguest_u_default_contexts	2008-09-03 11:18:25.000000000 -0400
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
 +system_r:sshd_t		xguest_r:xguest_t
 +system_r:crond_t	xguest_r:xguest_crond_t
 +system_r:xdm_t		xguest_r:xguest_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.5.5/policy/global_tunables
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.5.6/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.5/policy/global_tunables	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/policy/global_tunables	2008-09-03 11:18:25.000000000 -0400
 @@ -34,7 +34,7 @@
  
  ## <desc>
@@ -268,9 +259,9 @@
 +gen_tunable(allow_console_login,false)
 +
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.5.5/policy/modules/admin/alsa.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.5.6/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2008-08-07 11:15:13.000000000 -0400
[...7532 lines suppressed...]
+ 
+ ########################################
+ #
  # Declarations
  #
  
@@ -32592,24 +32690,28 @@
  ')
  
  optional_policy(`
-@@ -159,38 +216,48 @@
+@@ -159,43 +216,48 @@
  ')
  
  optional_policy(`
+-	postfix_per_role_template(unconfined, unconfined_t, unconfined_r)
 -	postfix_run_map(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t })
 -	# cjp: this should probably be removed:
 -	postfix_domtrans_master(unconfined_t)
 -')
--
 +	qemu_per_role_template_notrans(unconfined, unconfined_t, unconfined_r)
  
+-
 -optional_policy(`
 -	pyzor_per_role_template(unconfined)
 +	tunable_policy(`allow_unconfined_qemu_transition',`
 +		qemu_runas(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t })
 +	',`
 +		qemu_runas_unconfined(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t })
-+')
+ ')
+-
+-optional_policy(`
+-	qmail_per_role_template(unconfined, unconfined_t, unconfined_r)
 +	qemu_role(unconfined_r)
 +	qemu_unconfined_role(unconfined_r)
  ')
@@ -32653,7 +32755,7 @@
  ')
  
  optional_policy(`
-@@ -198,7 +265,7 @@
+@@ -203,7 +265,7 @@
  ')
  
  optional_policy(`
@@ -32662,7 +32764,7 @@
  ')
  
  optional_policy(`
-@@ -210,11 +277,12 @@
+@@ -215,11 +277,12 @@
  ')
  
  optional_policy(`
@@ -32677,7 +32779,7 @@
  ')
  
  ########################################
-@@ -224,14 +292,35 @@
+@@ -229,14 +292,35 @@
  
  allow unconfined_execmem_t self:process { execstack execmem };
  unconfined_domain_noaudit(unconfined_execmem_t)
@@ -32715,9 +32817,9 @@
 +# Allow SELinux aware applications to request rpm_script execution
 +rpm_transition_script(unconfined_notrans_t)
 +domain_ptrace_all_domains(unconfined_notrans_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.5/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.5.6/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.5/policy/modules/system/userdomain.fc	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/userdomain.fc	2008-09-03 11:18:25.000000000 -0400
 @@ -1,4 +1,5 @@
 -HOME_DIR	-d	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
 -HOME_DIR/.+		gen_context(system_u:object_r:ROLE_home_t,s0)
@@ -32728,9 +32830,9 @@
 +HOME_DIR/.+		gen_context(system_u:object_r:user_home_t,s0)
 +/tmp/gconfd-USER -d	gen_context(system_u:object_r:user_tmp_t,s0)
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.5.5/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.5.6/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.5/policy/modules/system/userdomain.if	2008-08-29 13:08:43.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/userdomain.if	2008-09-03 14:36:24.000000000 -0400
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -34765,7 +34867,7 @@
  	gen_require(`
  		attribute userdomain;
  		class dbus send_msg;
-@@ -5513,3 +5656,506 @@
+@@ -5513,3 +5656,524 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')
@@ -35272,9 +35374,27 @@
 +	delete_lnk_files_pattern($1, home_type, home_type)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.5/policy/modules/system/userdomain.te
++########################################
++## <summary>
++##	Do not audit attempts to unlink to the 
++##	users home directory.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`userdom_dontaudit_unlink_unpriv_home_content_files',`
++	gen_require(`
++		type user_home_t;
++	')
++
++	dontaudit $1 user_home_t:file unlink;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.6/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.5/policy/modules/system/userdomain.te	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/userdomain.te	2008-09-03 11:18:25.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -35389,9 +35509,9 @@
 +	manage_fifo_files_pattern(privhome, cifs_t, cifs_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.5/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.5.6/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.5/policy/modules/system/xen.fc	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/xen.fc	2008-09-03 11:18:25.000000000 -0400
 @@ -20,6 +20,7 @@
  /var/run/xenconsoled\.pid --	gen_context(system_u:object_r:xenconsoled_var_run_t,s0)
  /var/run/xend(/.*)?		gen_context(system_u:object_r:xend_var_run_t,s0)
@@ -35400,9 +35520,9 @@
  /var/run/xenstore\.pid	--	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  /var/run/xenstored(/.*)?	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.5/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.5.6/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.5/policy/modules/system/xen.if	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/xen.if	2008-09-03 11:18:25.000000000 -0400
 @@ -167,11 +167,14 @@
  #
  interface(`xen_stream_connect',`
@@ -35444,9 +35564,9 @@
 +	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.5.5/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.5.6/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.5/policy/modules/system/xen.te	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/xen.te	2008-09-03 11:18:25.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -35683,9 +35803,9 @@
 +optional_policy(`
 +	unconfined_domain(xend_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.5/policy/support/file_patterns.spt
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.6/policy/support/file_patterns.spt
 --- nsaserefpolicy/policy/support/file_patterns.spt	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.5/policy/support/file_patterns.spt	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/policy/support/file_patterns.spt	2008-09-03 11:18:25.000000000 -0400
 @@ -537,3 +537,18 @@
  	allow $1 $2:dir rw_dir_perms;
  	type_transition $1 $2:$4 $3;
@@ -35705,9 +35825,9 @@
 +        relabel_sock_files_pattern($1,$2,$2)
 +
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.5/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.5.6/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.5/policy/support/obj_perm_sets.spt	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/policy/support/obj_perm_sets.spt	2008-09-03 11:18:25.000000000 -0400
 @@ -316,3 +316,13 @@
  #
  define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }')
@@ -35722,9 +35842,9 @@
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
 +
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.5/policy/users
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.6/policy/users
 --- nsaserefpolicy/policy/users	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.5/policy/users	2008-08-25 10:50:15.000000000 -0400
++++ serefpolicy-3.5.6/policy/users	2008-09-03 11:18:25.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.701
retrieving revision 1.702
diff -u -r1.701 -r1.702
--- selinux-policy.spec	29 Aug 2008 20:42:15 -0000	1.701
+++ selinux-policy.spec	3 Sep 2008 20:05:26 -0000	1.702
@@ -16,8 +16,8 @@
 %define CHECKPOLICYVER 2.0.16-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.5.5
-Release: 3%{?dist}
+Version: 3.5.6
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -159,7 +159,7 @@
 
 %description
 SELinux Reference Policy - modular.
-Based off of reference policy: Checked out revision  2778.
+Based off of reference policy: Checked out revision  2797.
 
 %build
 
@@ -380,6 +380,14 @@
 %endif
 
 %changelog
+* Wed Sep 3 2008 Dan Walsh <dwalsh at redhat.com> 3.5.6-1
+- Update to upstream
+- 	 New handling of init scripts
+
+* Fri Aug 29 2008 Dan Walsh <dwalsh at redhat.com> 3.5.5-4
+- Allow pcsd to dbus
+- Add memcache policy
+
 * Fri Aug 29 2008 Dan Walsh <dwalsh at redhat.com> 3.5.5-3
 - Allow audit dispatcher to kill his children
 



From spot at fedoraproject.org  Wed Sep  3 20:13:40 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 20:13:40 +0000 (UTC)
Subject: rpms/rdate/devel rdate.spec,1.25,1.26
Message-ID: <20080903201340.34E747002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rdate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2135

Modified Files:
	rdate.spec 
Log Message:
fix license tag


Index: rdate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rdate/devel/rdate.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- rdate.spec	31 Mar 2008 12:32:59 -0000	1.25
+++ rdate.spec	3 Sep 2008 20:13:09 -0000	1.26
@@ -1,8 +1,8 @@
 Summary: Tool for getting the date/time from a remote machine
 Name: rdate
 Version: 1.4
-Release: 11%{?dist}
-License: GPL
+Release: 12%{?dist}
+License: GPLv2+
 Group: Applications/System
 Source: ftp://people.redhat.com/sopwith/rdate-%{version}.tar.gz
 Patch0: rdate-1.4-udp.patch
@@ -39,6 +39,9 @@
 %{_mandir}/man1/rdate.1*
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4-12
+- fix license tag
+
 * Mon Mar 31 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 1.4-11
 - fixed early freeing of addrinfo
 



From spot at fedoraproject.org  Wed Sep  3 21:13:50 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 21:13:50 +0000 (UTC)
Subject: rpms/ruby-ncurses/devel ruby-ncurses.spec,1.2,1.3
Message-ID: <20080903211350.855FD7002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ruby-ncurses/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12699

Modified Files:
	ruby-ncurses.spec 
Log Message:
fix license tag


Index: ruby-ncurses.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-ncurses/devel/ruby-ncurses.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ruby-ncurses.spec	19 Feb 2008 05:15:09 -0000	1.2
+++ ruby-ncurses.spec	3 Sep 2008 21:13:20 -0000	1.3
@@ -7,10 +7,10 @@
 
 Name: %distname
 Version: 1.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: A module for ruby applications for using ncurses interfaces
 Group: System Environment/Libraries 
-License: LGPL
+License: LGPLv2+
 URL: http://ncurses-ruby.berlios.de/
 Source0: http://download.berlios.de/ncurses-ruby/%{realname}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +52,9 @@
 %{ruby_sitelib}/ncurses.rb
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-7
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1-6
 - Autorebuild for GCC 4.3
 



From nim at fedoraproject.org  Wed Sep  3 21:17:32 2008
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Wed,  3 Sep 2008 21:17:32 +0000 (UTC)
Subject: rpms/dejavu-fonts/devel dejavu-fonts.spec, 1.85, 1.86 import.log,
	1.2, 1.3
Message-ID: <20080903211732.C07137002B@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13242/devel

Modified Files:
	dejavu-fonts.spec import.log 
Log Message:
rebuild with pre-F10-freeze fontforge


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- dejavu-fonts.spec	27 Jul 2008 13:35:50 -0000	1.85
+++ dejavu-fonts.spec	3 Sep 2008 21:17:02 -0000	1.86
@@ -16,7 +16,7 @@
 
 Name:    %{fontname}-fonts
 Version: 2.26
-Release: 1%{?alphatag}%{?dist}
+Release: 2%{?alphatag}%{?dist}
 Summary: DejaVu fonts, mature typefaces
 
 Group:   User Interface/X
@@ -176,6 +176,10 @@
 
 
 %changelog
+* Wed Sep 3 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 2.26-2
+??? Rebuild with pre-F10-freeze fontforge
+
 * Sun Jul 26 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 2.26-1
 ?? New release at last


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	27 Jul 2008 13:35:50 -0000	1.2
+++ import.log	3 Sep 2008 21:17:02 -0000	1.3
@@ -1,2 +1,3 @@
 dejavu-fonts-2_25-2_fc10:HEAD:dejavu-fonts-2.25-2.fc10.src.rpm:1215806350
 dejavu-fonts-2_26-1_fc10:HEAD:dejavu-fonts-2.26-1.fc10.src.rpm:1217165726
+dejavu-fonts-2_26-2_fc10:HEAD:dejavu-fonts-2.26-2.fc10.src.rpm:1220476598



From spot at fedoraproject.org  Wed Sep  3 21:17:52 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 21:17:52 +0000 (UTC)
Subject: rpms/python-tpg/devel python-tpg.spec,1.11,1.12
Message-ID: <20080903211752.D12337002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-tpg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13304

Modified Files:
	python-tpg.spec 
Log Message:
drop old API Requires


Index: python-tpg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tpg/devel/python-tpg.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-tpg.spec	3 Sep 2008 18:58:35 -0000	1.11
+++ python-tpg.spec	3 Sep 2008 21:17:22 -0000	1.12
@@ -4,7 +4,7 @@
 
 Name:           python-tpg
 Version:        3.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A Python "toy parser generator"
 Group:          Development/Libraries
@@ -15,7 +15,6 @@
 
 BuildArch:      noarch
 BuildRequires:  python-devel
-Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
 Toy Parser Generator is a lexical and syntactic parser generator
@@ -62,6 +61,9 @@
 %{python_sitelib}/TPG-%{version}-py*.egg-info
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.1.2-2
+- drop ancient API Requires
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.1.2-1
 - fix license tag
 - update to 3.1.2



From sgrubb at fedoraproject.org  Wed Sep  3 21:18:22 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed,  3 Sep 2008 21:18:22 +0000 (UTC)
Subject: rpms/libprelude/devel libprelude.spec,1.20,1.21
Message-ID: <20080903211822.658827002B@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13464

Modified Files:
	libprelude.spec 
Log Message:
* Wed Sep 03 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.20-2
- Get rid of rpath and enable test suite



Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libprelude.spec	3 Sep 2008 18:29:45 -0000	1.20
+++ libprelude.spec	3 Sep 2008 21:17:52 -0000	1.21
@@ -5,7 +5,7 @@
 
 Name:		libprelude
 Version:	0.9.20
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The prelude library        
 Group:		System Environment/Libraries 
 License:	GPLv2+
@@ -14,7 +14,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gnutls-devel, python-devel, ruby, ruby-devel, lua-devel
-BuildRequires:	swig
+BuildRequires:	swig valgrind chrpath
 
 %description
 The Prelude Library is a collection of generic functions providing
@@ -75,7 +75,6 @@
 %prep
 %setup -q
 
-
 %build
 %configure	--disable-static \
 		--with-html-dir=%{_defaultdocdir}/%{name}-%{version}/html \
@@ -101,10 +100,16 @@
 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/*
 
+%check
+make check
+
 %clean
 rm -rf %{buildroot}
 
@@ -146,6 +151,9 @@
 %{ruby_sitearch}/PreludeEasy.so
 
 %changelog
+* Wed Sep 03 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.20-2
+- Get rid of rpath and enable test suite
+
 * Wed Sep 03 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.20-1
 - New upstream release
 



From spot at fedoraproject.org  Wed Sep  3 21:21:04 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 21:21:04 +0000 (UTC)
Subject: rpms/ruby-postgres/devel ruby-postgres.spec,1.6,1.7
Message-ID: <20080903212104.ED4337002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ruby-postgres/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13918

Modified Files:
	ruby-postgres.spec 
Log Message:
fix license tag


Index: ruby-postgres.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-postgres/devel/ruby-postgres.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ruby-postgres.spec	19 Feb 2008 12:51:48 -0000	1.6
+++ ruby-postgres.spec	3 Sep 2008 21:20:34 -0000	1.7
@@ -2,12 +2,12 @@
 
 Name: ruby-postgres
 Version: 0.7.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: A Ruby interface for the PostgreSQL database engine
 Group: Development/Languages
 # Source says that ruby-gems-postgres is distributable under the same
 # terms as ruby.
-License: Ruby License
+License: Ruby
 URL: http://ruby.scripting.ca/postgres/
 Source: http://ruby.scripting.ca/postgres/archive/ruby-postgres-0.7.1.tar.gz
 Patch0: cflags.patch
@@ -47,6 +47,9 @@
 %{ruby_sitearch}/postgres.so
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.7.1-9
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.7.1-8
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Wed Sep  3 21:22:25 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 21:22:25 +0000 (UTC)
Subject: rpms/ruby-qpid/devel ruby-qpid.spec,1.1,1.2
Message-ID: <20080903212225.D6DB37002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ruby-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14123

Modified Files:
	ruby-qpid.spec 
Log Message:
fix license tag


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-qpid/devel/ruby-qpid.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-qpid.spec	17 Apr 2007 14:14:10 -0000	1.1
+++ ruby-qpid.spec	3 Sep 2008 21:21:55 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           ruby-qpid
 Version:        0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Ruby language client for AMQP
 
 Group:          Development/Ruby
-License:        Apache Software License
+License:        ASL 2.0
 URL:            http://incubator.apache.org/qpid
 Source0:        %{name}.tar.gz
 # svn export http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/ruby \
@@ -47,6 +47,9 @@
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.1-2
+- fix license tag
+
 * Thu Mar 22 2007 Rafael Schloming <rafaels at redhat.com> - 0.1-1
 - Initial build
 - Comply with Fedora packaging guidelines



From spot at fedoraproject.org  Wed Sep  3 21:23:13 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 21:23:13 +0000 (UTC)
Subject: rpms/ruby-postgres/devel ruby-postgres.spec,1.7,1.8
Message-ID: <20080903212313.81A257002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ruby-postgres/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14344

Modified Files:
	ruby-postgres.spec 
Log Message:
apply patch properly


Index: ruby-postgres.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-postgres/devel/ruby-postgres.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ruby-postgres.spec	3 Sep 2008 21:20:34 -0000	1.7
+++ ruby-postgres.spec	3 Sep 2008 21:22:43 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name: ruby-postgres
 Version: 0.7.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: A Ruby interface for the PostgreSQL database engine
 Group: Development/Languages
 # Source says that ruby-gems-postgres is distributable under the same
@@ -27,7 +27,7 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 chmod a-x sample/psql.rb
 
 %build
@@ -47,6 +47,9 @@
 %{ruby_sitearch}/postgres.so
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.7.1-10
+- apply patch properly
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.7.1-9
 - fix license tag
 



From nim at fedoraproject.org  Wed Sep  3 21:23:54 2008
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Wed,  3 Sep 2008 21:23:54 +0000 (UTC)
Subject: rpms/linux-libertine-fonts/devel import.log, NONE,
	1.1 linux-libertine-fonts.spec, 1.8, 1.9
Message-ID: <20080903212354.B345C7002B@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/linux-libertine-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14632/devel

Modified Files:
	linux-libertine-fonts.spec 
Added Files:
	import.log 
Log Message:
rebuild with pre-F10-freeze fontforge


--- NEW FILE import.log ---
linux-libertine-fonts-2_7_9-2_fc10:HEAD:linux-libertine-fonts-2.7.9-2.fc10.src.rpm:1220476988


Index: linux-libertine-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/linux-libertine-fonts/devel/linux-libertine-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-libertine-fonts.spec	3 Feb 2008 12:43:04 -0000	1.8
+++ linux-libertine-fonts.spec	3 Sep 2008 21:23:24 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:          linux-libertine-fonts
 Version:       2.7.9
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Linux Libertine Open Fonts
 Group:         User Interface/X
 License:       GPLv2+ with exceptions or OFL
@@ -69,6 +69,10 @@
 
 
 %changelog
+* Wed Sep 3 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+-  2.7.9-2
+??? Rebuild with pre-F10-freeze fontforge
+
 * Sun Feb 03 2008 Frank Arnold <frank at scirocco-5v-turbo.de> 2.7.9-1
 - Updated to 2.7.9
 - Drop generated PDF files to save space



From rishi at fedoraproject.org  Wed Sep  3 21:25:33 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Wed,  3 Sep 2008 21:25:33 +0000 (UTC)
Subject: rpms/freetalk/F-8 .cvsignore, 1.2, 1.3 freetalk.spec, 1.1,
	1.2 sources, 1.2, 1.3 freetalk-3.0-open.patch, 1.1, NONE
Message-ID: <20080903212533.9B5F47002B@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/freetalk/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14838

Modified Files:
	.cvsignore freetalk.spec sources 
Removed Files:
	freetalk-3.0-open.patch 
Log Message:
* Wed Sep 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.1-1
- Version bump to 0.32.
- open(2) problem fixed by upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freetalk/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Feb 2008 16:57:05 -0000	1.2
+++ .cvsignore	3 Sep 2008 21:25:03 -0000	1.3
@@ -1 +1 @@
-freetalk-3.0.tar.gz
+freetalk-3.1.tar.gz


Index: freetalk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freetalk/F-8/freetalk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freetalk.spec	14 Feb 2008 16:57:05 -0000	1.1
+++ freetalk.spec	3 Sep 2008 21:25:03 -0000	1.2
@@ -1,19 +1,17 @@
 Summary:	A console based Jabber client
 Name:		freetalk
-Version:	3.0
-Release:	2%{?dist}
+Version:	3.1
+Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
 URL:		http://www.gnu.org/software/freetalk/
 Source0:	http://sv.gnu.org/download/freetalk/%{name}-%{version}.tar.gz
 
-Patch0:		%{name}-%{version}-open.patch
-
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	words
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
+Requires(post): info
+Requires(preun): info
 
 BuildRequires:	gettext
 BuildRequires:	guile-devel
@@ -21,13 +19,12 @@
 BuildRequires:	readline-devel
 
 %description
-Freetalk is a console based Jabber client. It features a readline interface
+GNU Freetalk is a console based Jabber client. It features a readline interface
 with completion of buddy names, commands, and even ordinary English words.
 Freetalk is extensible, configurable, and scriptable through a Guile interface.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure --disable-rpath
@@ -40,6 +37,11 @@
 
 rm -rf $RPM_BUILD_ROOT%{_infodir}/dir
 
+# Move examples from /usr/share/doc/freetalk to RPM_BUILD_DIR.
+# To be later listed against %doc.
+rm -rf ./examples
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}/examples .
+
 %find_lang %{name}
 
 # Files containing shebangs need to have the executable bits.
@@ -49,11 +51,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %preun
 if [ $1 = 0 ]; then
-  /sbin/install-info --delete %{_infodir}/%{name}.info.gz \
+  /sbin/install-info --delete %{_infodir}/%{name}.info \
   %{_infodir}/dir >/dev/null 2>&1 || :
 fi
 
@@ -64,14 +66,19 @@
 %doc COPYING
 %doc NEWS
 %doc README
+%doc examples
+%doc %{_infodir}/%{name}.info*
+%doc %{_mandir}/man1/%{name}.1*
 %{_bindir}/%{name}
-%{_infodir}/%{name}.info.gz
-%{_mandir}/man1/%{name}.1.gz
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/extensions
 
 %changelog
+* Wed Sep 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.1-1
+- Version bump to 0.32.
+- open(2) problem fixed by upstream.
+
 * Thu Feb 14 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.0-2
 - Added 'Requires: words'.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freetalk/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Feb 2008 16:57:05 -0000	1.2
+++ sources	3 Sep 2008 21:25:03 -0000	1.3
@@ -1 +1 @@
-6002575edb6f4932165743883cecd4c5  freetalk-3.0.tar.gz
+301272d8e3e83b5902d43d2b993ec0be  freetalk-3.1.tar.gz


--- freetalk-3.0-open.patch DELETED ---



From spot at fedoraproject.org  Wed Sep  3 21:26:27 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 21:26:27 +0000 (UTC)
Subject: rpms/ruby-racc/devel ruby-racc.spec,1.1,1.2
Message-ID: <20080903212627.B48447002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ruby-racc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15087

Modified Files:
	ruby-racc.spec 
Log Message:
fix license tag


Index: ruby-racc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-racc/devel/ruby-racc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-racc.spec	9 Oct 2006 21:41:52 -0000	1.1
+++ ruby-racc.spec	3 Sep 2008 21:25:57 -0000	1.2
@@ -5,10 +5,10 @@
 Summary: LALR(1) Parser Generator
 Name: ruby-%{rname}
 Version: 1.4.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://i.loveruby.net/en/racc.html
 Source0: http://i.loveruby.net/archive/racc/%{rname}-%{version}-all.tar.gz
-License: LGPL
+License: LGPLv2
 Group: Development/Tools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: ruby(abi) = 1.8
@@ -48,6 +48,9 @@
 %doc packages/racc/COPYING README.* packages/racc/NEWS.* packages/racc/doc.*
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4.5-3
+- fix license tag
+
 * Fri Aug 11 2006 David Lutterkort <dlutter at redhat.com> - 1.4.5-2
 - Brought in accordance with packaging guidelines
 - Add %%check to run the tests



From nim at fedoraproject.org  Wed Sep  3 21:26:50 2008
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Wed,  3 Sep 2008 21:26:50 +0000 (UTC)
Subject: rpms/inconsolata-fonts/devel import.log, NONE,
	1.1 inconsolata-fonts.spec, 1.1, 1.2
Message-ID: <20080903212650.E0A177002B@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/inconsolata-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15198/devel

Modified Files:
	inconsolata-fonts.spec 
Added Files:
	import.log 
Log Message:
rebuild with pre-F10-freeze fontforge


--- NEW FILE import.log ---
inconsolata-fonts-1_009-2_fc10:HEAD:inconsolata-fonts-1.009-2.fc10.src.rpm:1220477135


Index: inconsolata-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/inconsolata-fonts/devel/inconsolata-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- inconsolata-fonts.spec	4 Feb 2008 21:28:34 -0000	1.1
+++ inconsolata-fonts.spec	3 Sep 2008 21:26:20 -0000	1.2
@@ -4,14 +4,14 @@
 
 Name: %{fontname}-fonts
 Version: 1.009
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Inconsolata fonts
 Group: User Interface/X
 License: OFL
 URL: http://www.levien.com/type/myfonts/inconsolata.html
-	
+
 Source0: http://www.levien.com/type/myfonts/Inconsolata.sfd
-	
+
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 BuildRequires: fontforge
@@ -68,6 +68,10 @@
 %dir %{fontdir}
 %{fontdir}/*.ttf
 
-%changelog 
+%changelog
+* Wed Sep 3 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 1.009-2
+??? Rebuild with pre-F10-freeze fontforge
+
 * Sat Feb 02 2008 Kevin Fenzi <kevin at tummy.com> - 1.009-1
 - Initial package for fedora



From spot at fedoraproject.org  Wed Sep  3 19:23:52 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 19:23:52 +0000 (UTC)
Subject: rpms/qcomicbook/devel qcomicbook.spec,1.13,1.14
Message-ID: <20080903192352.B89397011F@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/qcomicbook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29351

Modified Files:
	qcomicbook.spec 
Log Message:
fix license tag


Index: qcomicbook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qcomicbook/devel/qcomicbook.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- qcomicbook.spec	1 Apr 2008 17:01:47 -0000	1.13
+++ qcomicbook.spec	3 Sep 2008 19:23:22 -0000	1.14
@@ -1,8 +1,8 @@
 Summary: A viewer for comic book archives
 Name: qcomicbook
 Version: 0.4.0
-Release: 2%{?dist}
-License: GPL
+Release: 3%{?dist}
+License: GPLv2
 Group: Amusements/Graphics
 URL: http://linux.bydg.org/~yogin
 
@@ -61,6 +61,9 @@
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.0-3
+- fix license tag
+
 * Tue Apr 01 2008 Scott Baker <scott at perturb.org> - 0.4.0-2
 - QT4 -> QT convesions (WOOHOO KDE4)
 



From dsd at fedoraproject.org  Wed Sep  3 19:12:15 2008
From: dsd at fedoraproject.org (Daniel Drake)
Date: Wed,  3 Sep 2008 19:12:15 +0000 (UTC)
Subject: rpms/xorg-x11-server/OLPC-3 reimplement-shmputimage.patch, NONE,
	1.1 xorg-x11-server.spec, 1.343, 1.344 exa-copyarea.patch, 1.1, NONE
Message-ID: <20080903191215.64B517011F@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/xorg-x11-server/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28466

Modified Files:
	xorg-x11-server.spec 
Added Files:
	reimplement-shmputimage.patch 
Removed Files:
	exa-copyarea.patch 
Log Message:
update rendering fix to the one that went upstream, fixes dlo#8289

reimplement-shmputimage.patch:

--- NEW FILE reimplement-shmputimage.patch ---
From: Adam Jackson <ajax at redhat.com>
Date: Wed, 27 Aug 2008 20:05:47 +0000 (-0400)
Subject: Reimplement ShmPutImage.
X-Git-Tag: xf-3_9_16Z / xf-3_9_16d / xf-3_9_16e / xf-3_9_16f
X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=4652c51e92ab21df020f83be3dc1ca1c897f6cf9

Reimplement ShmPutImage.

There's no reason to not just dispatch this straight into the GC.  As a
bonus, if you do so, damage wraps correctly, and thus swcursor works.
The side effect is it's no longer possible to override ShmPutImage with
ShmRegisterFuncs().

Also remove the (broken) damage tracking for same from EXA, since it didn't
work right, and is now superfluous.

(cherry picked from commit ee7c684f21d220d5e046bab31ae617a7d64d60f6)
---

--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -106,7 +106,6 @@ typedef struct _ShmDesc {
     unsigned long size;
 } ShmDescRec, *ShmDescPtr;
 
-static void miShmPutImage(XSHM_PUT_IMAGE_ARGS);
 static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS);
 static int ShmDetachSegment(
     pointer		/* value */,
@@ -148,8 +147,8 @@ static int shmPixFormat[MAXSCREENS];
 static ShmFuncsPtr shmFuncs[MAXSCREENS];
 static DestroyPixmapProcPtr destroyPixmap[MAXSCREENS];
 static DevPrivateKey shmPixmapPrivate = &shmPixmapPrivate;
-static ShmFuncs miFuncs = {NULL, miShmPutImage};
-static ShmFuncs fbFuncs = {fbShmCreatePixmap, fbShmPutImage};
+static ShmFuncs miFuncs = {NULL, NULL};
+static ShmFuncs fbFuncs = {fbShmCreatePixmap, NULL};
 
 #define VERIFY_SHMSEG(shmseg,shmdesc,client) \
 { \
@@ -522,70 +521,28 @@ ProcShmDetach(client)
     return(client->noClientException);
 }
 
+/*
+ * If the given request doesn't exactly match PutImage's constraints,
+ * wrap the image in a scratch pixmap header and let CopyArea sort it out.
+ */
 static void
-miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
-    DrawablePtr dst;
-    GCPtr	pGC;
-    int		depth, w, h, sx, sy, sw, sh, dx, dy;
-    unsigned int format;
-    char 	*data;
-{
-    PixmapPtr pmap;
-    GCPtr putGC;
-
-    putGC = GetScratchGC(depth, dst->pScreen);
-    if (!putGC)
-	return;
-    pmap = (*dst->pScreen->CreatePixmap)(dst->pScreen, sw, sh, depth,
-					 CREATE_PIXMAP_USAGE_SCRATCH);
-    if (!pmap)
-    {
-	FreeScratchGC(putGC);
+doShmPutImage(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)
+{
+    PixmapPtr pPixmap;
+  
+    pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth,
+				     BitsPerPixel(depth),
+				     PixmapBytePad(w, depth),
+				     data);
+    if (!pPixmap)
 	return;
-    }
-    ValidateGC((DrawablePtr)pmap, putGC);
-    (*putGC->ops->PutImage)((DrawablePtr)pmap, putGC, depth, -sx, -sy, w, h, 0,
-			    (format == XYPixmap) ? XYPixmap : ZPixmap, data);
-    FreeScratchGC(putGC);
-    if (format == XYBitmap)
-	(void)(*pGC->ops->CopyPlane)((DrawablePtr)pmap, dst, pGC, 0, 0, sw, sh,
-				     dx, dy, 1L);
-    else
-	(void)(*pGC->ops->CopyArea)((DrawablePtr)pmap, dst, pGC, 0, 0, sw, sh,
-				    dx, dy);
-    (*pmap->drawable.pScreen->DestroyPixmap)(pmap);
-}
-
-_X_EXPORT void
-fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
-    DrawablePtr dst;
-    GCPtr	pGC;
-    int		depth, w, h, sx, sy, sw, sh, dx, dy;
-    unsigned int format;
-    char 	*data;
-{
-    if ((format == ZPixmap) || (depth == 1))
-    {
-	PixmapPtr pPixmap;
-
-	pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth,
-		BitsPerPixel(depth), PixmapBytePad(w, depth), (pointer)data);
-	if (!pPixmap)
-	    return;
-	if (format == XYBitmap)
-	    (void)(*pGC->ops->CopyPlane)((DrawablePtr)pPixmap, dst, pGC,
-					 sx, sy, sw, sh, dx, dy, 1L);
-	else
-	    (void)(*pGC->ops->CopyArea)((DrawablePtr)pPixmap, dst, pGC,
-					sx, sy, sw, sh, dx, dy);
-	FreeScratchPixmapHeader(pPixmap);
-    }
-    else
-	miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy,
-		      data);
+    pGC->ops->CopyArea((DrawablePtr)pPixmap, dst, pGC, sx, sy, sw, sh, dx, dy);
+    FreeScratchPixmapHeader(pPixmap);
 }
 
-
 #ifdef PANORAMIX
 static int 
 ProcPanoramiXShmPutImage(register ClientPtr client)
@@ -940,13 +897,12 @@ ProcShmPutImage(client)
 			       shmdesc->addr + stuff->offset +
 			       (stuff->srcY * length));
     else
-	(*shmFuncs[pDraw->pScreen->myNum]->PutImage)(
-			       pDraw, pGC, stuff->depth, stuff->format,
-			       stuff->totalWidth, stuff->totalHeight,
-			       stuff->srcX, stuff->srcY,
-			       stuff->srcWidth, stuff->srcHeight,
-			       stuff->dstX, stuff->dstY,
-                               shmdesc->addr + stuff->offset);
+	doShmPutImage(pDraw, pGC, stuff->depth, stuff->format,
+		      stuff->totalWidth, stuff->totalHeight,
+		      stuff->srcX, stuff->srcY,
+		      stuff->srcWidth, stuff->srcHeight,
+		      stuff->dstX, stuff->dstY,
+                      shmdesc->addr + stuff->offset);
 
     if (stuff->sendEvent)
     {
--- a/Xext/shmint.h
+++ b/Xext/shmint.h
@@ -37,9 +37,6 @@ void
 ShmSetPixmapFormat(ScreenPtr pScreen, int format);
 
 void
-fbShmPutImage(XSHM_PUT_IMAGE_ARGS);
-
-void
 ShmRegisterFbFuncs(ScreenPtr pScreen);
 
 #endif /* _SHMINT_H_ */
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -924,13 +924,6 @@ exaDriverInit (ScreenPtr		pScreen,
     }
 #endif
 
-#ifdef MITSHM
-    /* Re-register with the MI funcs, which don't allow shared pixmaps.
-     * Shared pixmaps are almost always a performance loss for us, but this
-     * still allows for SHM PutImage.
-     */
-    ShmRegisterFuncs(pScreen, &exaShmFuncs);
-#endif
     /*
      * Hookup offscreen pixmaps
      */
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -245,104 +245,12 @@ exaDoPutImage (DrawablePtr pDrawable, GC
     return TRUE;
 }
 
-#ifdef MITSHM
-
-static Bool
-exaDoShmPutImage(DrawablePtr pDrawable, 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)
-{
-    int src_stride = PixmapBytePad(w, depth);
-
-    if (exaDoPutImage(pDrawable, pGC, depth, dx, dy, sw, sh, format, data +
-		      sy * src_stride + sx * BitsPerPixel(depth) / 8,
-		      src_stride))
-	return TRUE;
-
-    if (format == ZPixmap)
-    {
-	PixmapPtr pPixmap;
-
-	pPixmap = GetScratchPixmapHeader(pDrawable->pScreen, w, h, depth,
-		BitsPerPixel(depth), PixmapBytePad(w, depth), (pointer)data);
-	if (!pPixmap)
-	    return FALSE;
-
-	if (exaGCReadsDestination(pDrawable, pGC->planemask, pGC->fillStyle,
-				  pGC->alu))
-	    exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);
-	else
-	    ExaDoPrepareAccess (pDrawable, EXA_PREPARE_DEST);
-	fbCopyArea((DrawablePtr)pPixmap, pDrawable, pGC, sx, sy, sw, sh, dx, dy);
-	exaFinishAccess(pDrawable, EXA_PREPARE_DEST);
-
-	FreeScratchPixmapHeader(pPixmap);
-
-	return TRUE;
-    }
-
-    return FALSE;
-}
-
-/* The actual ShmPutImage isn't wrapped by the damage layer, so we need to
- * inform any interested parties of the damage incurred to the drawable.
- *
- * We also need to set the pending damage to ensure correct migration in all
- * cases.
- */
-void
-exaShmPutImage(DrawablePtr pDrawable, 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)
-{
-    PixmapPtr pPixmap = exaGetDrawablePixmap(pDrawable);
-    ExaPixmapPriv(pPixmap);
-    BoxRec box = { .x1 = pDrawable->x + dx, .y1 = pDrawable->y + dy,
-		   .x2 = pDrawable->x + dx + sw, .y2 = pDrawable->y + dy + sh };
-    RegionRec region;
-    int xoff, yoff;
-    RegionPtr pending_damage = DamagePendingRegion(pExaPixmap->pDamage);
-
-    REGION_INIT(pScreen, &region, &box, 1);
-
-    exaGetDrawableDeltas(pDrawable, pPixmap, &xoff, &yoff);
-
-    REGION_TRANSLATE(pScreen, &region, xoff, yoff);
-    REGION_UNION(pScreen, pending_damage, pending_damage, &region);
-
-    if (!exaDoShmPutImage(pDrawable, pGC, depth, format, w, h, sx, sy, sw, sh,
-			  dx, dy, data)) {
-	if (exaGCReadsDestination(pDrawable, pGC->planemask, pGC->fillStyle,
-				  pGC->alu))
-	    exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);
-	else
-	    ExaDoPrepareAccess (pDrawable, EXA_PREPARE_DEST);
-	fbShmPutImage(pDrawable, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy,
-		      data);
-	exaFinishAccess(pDrawable, EXA_PREPARE_DEST);
-    }
-
-    REGION_TRANSLATE(pScreen, &region, -xoff, -yoff);
-    DamageDamageRegion(pDrawable, &region);
-
-    REGION_UNINIT(pScreen, &region);
-}
-
-ShmFuncs exaShmFuncs = { NULL, exaShmPutImage };
-
-#endif
-
 static void
 exaPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y,
 	     int w, int h, int leftPad, int format, char *bits)
 {
-#ifdef MITSHM
-    if (!exaDoShmPutImage(pDrawable, pGC, depth, format, w, h, 0, 0, w, h, x, y,
-			  bits))
-#else
     if (!exaDoPutImage(pDrawable, pGC, depth, x, y, w, h, format, bits,
 		       PixmapBytePad(w, pDrawable->depth)))
-#endif
 	ExaCheckPutImage(pDrawable, pGC, depth, x, y, w, h, leftPad, format,
 			 bits);
 }
--- a/exa/exa_priv.h
+++ b/exa/exa_priv.h
@@ -320,20 +320,11 @@ exaFillRegionTiled (DrawablePtr	pDrawabl
 		    DDXPointPtr pPatOrg, CARD32 planemask, CARD32 alu);
 
 void
-exaShmPutImage(DrawablePtr pDrawable, 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);
-
-void
 exaGetImage (DrawablePtr pDrawable, int x, int y, int w, int h,
 	     unsigned int format, unsigned long planeMask, char *d);
 
 extern const GCOps exaOps;
 
-#ifdef MITSHM
-extern ShmFuncs exaShmFuncs;
-#endif
-
 #ifdef RENDER
 void
 ExaCheckComposite (CARD8      op,


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/OLPC-3/xorg-x11-server.spec,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- xorg-x11-server.spec	2 Sep 2008 21:34:00 -0000	1.343
+++ xorg-x11-server.spec	3 Sep 2008 19:11:45 -0000	1.344
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.906
-Release:   2%{?dist}.3
+Release:   2%{?dist}.4
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -57,7 +57,7 @@
 Patch5007:  xserver-1.5.0-bad-fbdev-thats-mine.patch
 #Patch5009:  xserver-1.5.0-no-evdev-keyboards-kthnx.patch
 
-Patch6000: exa-copyarea.patch
+Patch6000: reimplement-shmputimage.patch
 Patch6001: xserver-1.5.0-hide-cursor.patch
 Patch6001: dix-destroy-pixmap.patch
 
@@ -466,6 +466,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Daniel Drake <dsd at laptop.org> 1.4.99.906-2.4
+- update rendering fix to the one that went upstream, fixes dlo#8289
+
 * Tue Sep  2 2008 Daniel Drake <dsd at laptop.org> 1.4.99.906-2.3
 - fix DIX crash when Pixmap can't be allocated
 


--- exa-copyarea.patch DELETED ---



From spot at fedoraproject.org  Wed Sep  3 19:20:40 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 19:20:40 +0000 (UTC)
Subject: rpms/qa-assistant/devel qa-assistant.spec,1.12,1.13
Message-ID: <20080903192040.7A3D07011F@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/qa-assistant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28926

Modified Files:
	qa-assistant.spec 
Log Message:
fix license tag


Index: qa-assistant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qa-assistant/devel/qa-assistant.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qa-assistant.spec	1 Sep 2006 05:33:12 -0000	1.12
+++ qa-assistant.spec	3 Sep 2008 19:20:10 -0000	1.13
@@ -1,9 +1,10 @@
 Name:           qa-assistant
 Version:        0.4.90.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Graphical quality assurance report generator
 Group:          Development/Tools
-License:        GPL
+# Only file with versioning is src/gnomeglade.py
+License:        GPLv2+
 URL:            http://developer.berlios.de/projects/qa-assistant/
 Source0:        http://download.berlios.de/qa-assistant/qa-assistant-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -135,6 +136,9 @@
 %{_datadir}/xml/%{name}
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.90.5-3
+- fix license tag
+
 * Thu Aug 31 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.4.90.5-2
 - No longer %%ghost .pyo files.
 - Switch to disabling installing the schema into GConf via a configure



From spot at fedoraproject.org  Wed Sep  3 19:21:59 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 19:21:59 +0000 (UTC)
Subject: rpms/qcad/devel qcad.spec,1.17,1.18
Message-ID: <20080903192159.B49247011F@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/qcad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29112

Modified Files:
	qcad.spec 
Log Message:
fix license tag


Index: qcad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qcad/devel/qcad.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qcad.spec	25 Mar 2008 15:01:25 -0000	1.17
+++ qcad.spec	3 Sep 2008 19:21:29 -0000	1.18
@@ -1,10 +1,10 @@
 Name:		qcad
 Version:	2.0.5.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Simple 2D CAD program
 
 Group:		Applications/Engineering
-License:	GPL
+License:	GPLv2
 Source:		http://www.ribbonsoft.com/archives/qcad/qcad-2.0.5.0-1-community.src.tar.gz
 Source1:	http://www.ribbonsoft.com/archives/qcad/qcad-manual-en-2.0.4.0-1.html.zip
 Patch:		qcad-qass.patch
@@ -125,6 +125,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.5.0-9
+- fix license tag
+
 * Fri Feb 22 2008 Gerard Milmeister <gemi at bluewin.ch> - 2.0.5.0-8
 - patch to compile with GCC 4.3
 



From jwilson at fedoraproject.org  Wed Sep  3 19:20:19 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Wed,  3 Sep 2008 19:20:19 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.923, 1.924 linux-2.6-lirc.patch,
	1.10, 1.11
Message-ID: <20080903192019.675F77011F@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28890

Modified Files:
	kernel.spec linux-2.6-lirc.patch 
Log Message:
* Wed Sep 03 2008 Jarod Wilson <jarod at redhat.com>
- Another series of checkpatch cleanups to lirc code,
  courtesy of Janne Grunau. This stuff might actually
  finally get upstream soon...



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.923
retrieving revision 1.924
diff -u -r1.923 -r1.924
--- kernel.spec	3 Sep 2008 00:41:31 -0000	1.923
+++ kernel.spec	3 Sep 2008 19:19:48 -0000	1.924
@@ -1753,6 +1753,11 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Sep 03 2008 Jarod Wilson <jarod at redhat.com>
+- Another series of checkpatch cleanups to lirc code,
+  courtesy of Janne Grunau. This stuff might actually
+  finally get upstream soon...
+
 * Tue Sep 02 2008 Dave Jones <davej at redhat.com>
 - 2.6.27-rc5-git3
 

linux-2.6-lirc.patch:

Index: linux-2.6-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-lirc.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-lirc.patch	2 Sep 2008 22:27:18 -0000	1.10
+++ linux-2.6-lirc.patch	3 Sep 2008 19:19:48 -0000	1.11
@@ -4,30 +4,30 @@
  drivers/input/lirc/Makefile           |   24 +
  drivers/input/lirc/commandir.c        | 1009 +++++++++++++++++++++++
  drivers/input/lirc/commandir.h        |   41 +
- drivers/input/lirc/kcompat.h          |  152 ++++
+ drivers/input/lirc/kcompat.h          |  142 ++++
  drivers/input/lirc/lirc.h             |  102 +++
- drivers/input/lirc/lirc_atiusb.c      | 1326 ++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_atiusb.c      | 1328 +++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_bt829.c       |  393 +++++++++
  drivers/input/lirc/lirc_cmdir.c       |  605 ++++++++++++++
  drivers/input/lirc/lirc_cmdir.h       |   27 +
  drivers/input/lirc/lirc_dev.c         |  827 +++++++++++++++++++
  drivers/input/lirc/lirc_dev.h         |  264 ++++++
- drivers/input/lirc/lirc_i2c.c         |  668 +++++++++++++++
+ drivers/input/lirc/lirc_i2c.c         |  668 ++++++++++++++++
  drivers/input/lirc/lirc_igorplugusb.c |  624 +++++++++++++++
  drivers/input/lirc/lirc_imon.c        | 1248 +++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.c        | 1012 +++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 +++
- drivers/input/lirc/lirc_mceusb.c      |  890 ++++++++++++++++++++
+ drivers/input/lirc/lirc_mceusb.c      |  890 +++++++++++++++++++++
  drivers/input/lirc/lirc_mceusb2.c     | 1060 ++++++++++++++++++++++++
  drivers/input/lirc/lirc_parallel.c    |  745 +++++++++++++++++
  drivers/input/lirc/lirc_parallel.h    |   26 +
- drivers/input/lirc/lirc_sasem.c       |  971 ++++++++++++++++++++++
+ drivers/input/lirc/lirc_sasem.c       |  972 ++++++++++++++++++++++
  drivers/input/lirc/lirc_serial.c      | 1348 +++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_sir.c         | 1323 ++++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_streamzap.c   |  810 +++++++++++++++++++
+ drivers/input/lirc/lirc_streamzap.c   |  804 +++++++++++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  393 +++++++++
- drivers/input/lirc/lirc_zilog.c       | 1425 +++++++++++++++++++++++++++++++++
- 29 files changed, 17561 insertions(+), 0 deletions(-)
+ drivers/input/lirc/lirc_zilog.c       | 1416 +++++++++++++++++++++++++++++++++
+ 29 files changed, 17539 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
 index 5f9d860..747633c 100644
@@ -217,7 +217,7 @@
 +obj-$(CONFIG_LIRC_TTUSBIR)	+= lirc_ttusbir.o
 diff --git a/drivers/input/lirc/commandir.c b/drivers/input/lirc/commandir.c
 new file mode 100644
-index 0000000..a49d996
+index 0000000..eb63980
 --- /dev/null
 +++ b/drivers/input/lirc/commandir.c
 @@ -0,0 +1,1009 @@
@@ -257,7 +257,7 @@
 +#define USB_CMDIR_MINOR_BASE	192
 +
 +/* table of devices that work with this driver */
-+static struct usb_device_id cmdir_table [] =
++static struct usb_device_id cmdir_table[] =
 +{
 +	{ USB_DEVICE(USB_CMDIR_VENDOR_ID, USB_CMDIR_PRODUCT_ID) },
 +	{ }			/* Terminating entry */
@@ -389,7 +389,7 @@
 +	interface = usb_find_interface(&cmdir_driver, subminor);
 +	if (!interface) {
 +		err("%s - error, can't find device for minor %d",
-+		     __FUNCTION__, subminor);
++		     __func__, subminor);
 +		retval = -ENODEV;
 +		goto exit;
 +	}
@@ -1187,7 +1187,7 @@
 +	retval = usb_submit_urb(urb, GFP_KERNEL);
 +	if (retval) {
 +		err("%s - failed submitting write urb, error %d",
-+		    __FUNCTION__, retval);
++		    __func__, retval);
 +		goto error;
 +	}
 +
@@ -1279,10 +1279,10 @@
 +
 diff --git a/drivers/input/lirc/kcompat.h b/drivers/input/lirc/kcompat.h
 new file mode 100644
-index 0000000..da2e7eb
+index 0000000..db392a8
 --- /dev/null
 +++ b/drivers/input/lirc/kcompat.h
-@@ -0,0 +1,152 @@
+@@ -0,0 +1,142 @@
 +/*      $Id$      */
 +
 +#ifndef _KCOMPAT_H
@@ -1304,8 +1304,6 @@
 +#define LIRC_DEVFS_PREFIX
 +
 +
-+typedef struct class lirc_class_t;
-+
 +#define lirc_device_destroy device_destroy
 +
 +
@@ -1366,14 +1364,6 @@
 +#define MODULE_DEVICE_TABLE(x, y)
 +#endif
 +
-+#include <linux/interrupt.h>
-+#ifndef IRQ_RETVAL
-+typedef void irqreturn_t;
-+#define IRQ_NONE
-+#define IRQ_HANDLED
-+#define IRQ_RETVAL(x)
-+#endif
-+
 +#ifndef MOD_IN_USE
 +#ifdef CONFIG_MODULE_UNLOAD
 +#define MOD_IN_USE module_refcount(THIS_MODULE)
@@ -1437,7 +1427,7 @@
 +#endif /* _KCOMPAT_H */
 diff --git a/drivers/input/lirc/lirc.h b/drivers/input/lirc/lirc.h
 new file mode 100644
-index 0000000..accd2cd
+index 0000000..73425c1
 --- /dev/null
 +++ b/drivers/input/lirc/lirc.h
 @@ -0,0 +1,102 @@
@@ -1446,7 +1436,7 @@
 +#ifndef _LINUX_LIRC_H
 +#define _LINUX_LIRC_H
 +
-+#include <asm/types.h>
++#include <linux/types.h>
 +#include <linux/ioctl.h>
 +
 +#define PULSE_BIT  0x01000000
@@ -1545,10 +1535,10 @@
 +#endif
 diff --git a/drivers/input/lirc/lirc_atiusb.c b/drivers/input/lirc/lirc_atiusb.c
 new file mode 100644
-index 0000000..9a78d13
+index 0000000..ff91277
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_atiusb.c
-@@ -0,0 +1,1326 @@
+@@ -0,0 +1,1328 @@
 +/* lirc_atiusb - USB remote support for LIRC
 + * (currently only supports X10 USB remotes)
 + * (supports ATI Remote Wonder and ATI Remote Wonder II, too)
@@ -1614,9 +1604,9 @@
 +#define DRIVER_DESC		"USB remote driver for LIRC"
 +#define DRIVER_NAME		"lirc_atiusb"
 +
-+#define CODE_LENGTH		code_length[ir->remote_type]
-+#define CODE_MIN_LENGTH		code_min_length[ir->remote_type]
-+#define DECODE_LENGTH		decode_length[ir->remote_type]
++#define CODE_LENGTH		(code_length[ir->remote_type])
++#define CODE_MIN_LENGTH		(code_min_length[ir->remote_type])
++#define DECODE_LENGTH		(decode_length[ir->remote_type])
 +
 +#define RW2_MODENAV_KEYCODE	0x3F
 +#define RW2_NULL_MODE		0xFF
@@ -1683,7 +1673,7 @@
 +#define VENDOR_MS2		0x045e
 +#define VENDOR_MS3		0xFFFF
 +
-+static struct usb_device_id usb_remote_table [] = {
++static struct usb_device_id usb_remote_table[] = {
 +	/* X10 USB Firecracker Interface */
 +	{ USB_DEVICE(VENDOR_ATI1, 0x0002) },
 +
@@ -1987,7 +1977,8 @@
 +	dprintk(DRIVER_NAME "[%d]: accept channel %d\n", ir->devnum, chan+1);
 +
 +	if (ir->remote_type == ATI1_COMPATIBLE) {
-+		for (i = len; i < CODE_LENGTH; i++) iep->buf[i] = 0;
++		for (i = len; i < CODE_LENGTH; i++)
++			iep->buf[i] = 0;
 +		/* check for repeats */
 +		if (memcmp(iep->old, iep->buf, len) == 0) {
 +			if (iep->old_jiffies + repeat_jiffies > jiffies)
@@ -2090,7 +2081,8 @@
 +			ir->devnum, len);
 +		return -1;
 +	}
-+	for (i = len; i < CODE_LENGTH; i++) iep->buf[i] = 0;
++	for (i = len; i < CODE_LENGTH; i++)
++		iep->buf[i] = 0;
 +
 +	mode = buf[0];
 +
@@ -2765,7 +2757,7 @@
 +	usb_set_intfdata(intf, NULL);
 +
 +	dprintk(DRIVER_NAME ": disconnecting remote %d:\n",
-+		(ir? ir->devnum: -1));
++		ir ? ir->devnum : -1);
 +	if (!ir || !ir->p)
 +		return;
 +
@@ -2877,7 +2869,7 @@
 +EXPORT_NO_SYMBOLS;
 diff --git a/drivers/input/lirc/lirc_bt829.c b/drivers/input/lirc/lirc_bt829.c
 new file mode 100644
-index 0000000..d9e65e7
+index 0000000..08ea957
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_bt829.c
 @@ -0,0 +1,393 @@
@@ -3206,11 +3198,11 @@
 +	write_index(0x34, reg_val);
 +
 +	reg_val = read_index(0x31);
-+	if (new_bits & 1) {
++	if (new_bits & 1)
 +		reg_val |= 0x1000000;
-+	} else {
++	else
 +		reg_val &= 0xFEFFFFFF;
-+	}
++
 +	reg_val |= 0x8000000;
 +	write_index(0x31, reg_val);
 +}
@@ -3227,17 +3219,17 @@
 +
 +	reg_val = read_index(0x34);
 +	bits = 0;
-+	if (reg_val & 8) {
++	if (reg_val & 8)
 +		bits |= 2;
-+	} else {
++	else
 +		bits &= 0xFD;
-+	}
++
 +	reg_val = read_index(0x31);
-+	if (reg_val & 0x1000000) {
++	if (reg_val & 0x1000000)
 +		bits |= 1;
-+	} else {
++	else
 +		bits &= 0xFE;
-+	}
++
 +	return bits;
 +}
 +
@@ -3276,7 +3268,7 @@
 + */
 diff --git a/drivers/input/lirc/lirc_cmdir.c b/drivers/input/lirc/lirc_cmdir.c
 new file mode 100644
-index 0000000..6b906f1
+index 0000000..f131caa
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_cmdir.c
 @@ -0,0 +1,605 @@
@@ -3730,7 +3722,7 @@
 +	safe_udelay(wait_this);
 +#endif
 +
-+	return(n);
++	return n;
 +}
 +
 +
@@ -3920,7 +3912,7 @@
 +#endif
 diff --git a/drivers/input/lirc/lirc_dev.c b/drivers/input/lirc/lirc_dev.c
 new file mode 100644
-index 0000000..93ac8de
+index 0000000..43c9ee9
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_dev.c
 @@ -0,0 +1,827 @@
@@ -4009,7 +4001,7 @@
 +static struct file_operations fops;
 +
 +/* Only used for sysfs but defined to void otherwise */
-+static lirc_class_t *lirc_class;
++static struct class *lirc_class;
 +
 +/*  helper function
 + *  initializes the irctl structure
@@ -4076,7 +4068,7 @@
 +		if (res == -ENODEV)
 +			kthread_stop(ir->task);
 +
-+		return (got_data ? SUCCESS : res);
++		return got_data ? SUCCESS : res;
 +	}
 +
 +	return SUCCESS;
@@ -4753,7 +4745,7 @@
 + */
 diff --git a/drivers/input/lirc/lirc_dev.h b/drivers/input/lirc/lirc_dev.h
 new file mode 100644
-index 0000000..c3a0c0f
+index 0000000..16daf58
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_dev.h
 @@ -0,0 +1,264 @@
@@ -4829,7 +4821,7 @@
 +}
 +static inline int  lirc_buffer_full(struct lirc_buffer *buf)
 +{
-+	return (buf->fill >= buf->size);
++	return buf->fill >= buf->size;
 +}
 +static inline int  lirc_buffer_empty(struct lirc_buffer *buf)
 +{
@@ -4837,7 +4829,7 @@
 +}
 +static inline int  lirc_buffer_available(struct lirc_buffer *buf)
 +{
-+    return (buf->size - buf->fill);
++    return buf->size - buf->fill;
 +}
 +static inline void lirc_buffer_lock(struct lirc_buffer *buf,
 +				    unsigned long *flags)
@@ -5023,7 +5015,7 @@
 +#endif
 diff --git a/drivers/input/lirc/lirc_i2c.c b/drivers/input/lirc/lirc_i2c.c
 new file mode 100644
-index 0000000..3d107f6
+index 0000000..b9d89af
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_i2c.c
 @@ -0,0 +1,668 @@
@@ -5122,7 +5114,7 @@
 +	int c;
 +
 +	for (c = 0, i = 0; i < bits; i++)
-+		c |= (((data & (1<<i)) ? 1:0)) << (bits-1-i);
++		c |= ((data & (1<<i)) ? 1 : 0) << (bits-1-i);
 +
 +	return c;
 +}
@@ -5697,7 +5689,7 @@
 + */
 diff --git a/drivers/input/lirc/lirc_igorplugusb.c b/drivers/input/lirc/lirc_igorplugusb.c
 new file mode 100644
-index 0000000..0c2ca5a
+index 0000000..978483b
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_igorplugusb.c
 @@ -0,0 +1,624 @@
@@ -6264,7 +6256,7 @@
 +	unregister_from_lirc(ir);
 +}
 +
-+static struct usb_device_id usb_remote_id_table [] = {
++static struct usb_device_id usb_remote_id_table[] = {
 +	/* Igor Plug USB (Atmel's Manufact. ID) */
 +	{ USB_DEVICE(0x03eb, 0x0002) },
 +
@@ -6327,7 +6319,7 @@
 + */
 diff --git a/drivers/input/lirc/lirc_imon.c b/drivers/input/lirc/lirc_imon.c
 new file mode 100644
-index 0000000..776c742
+index 0000000..a2236dd
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_imon.c
 @@ -0,0 +1,1248 @@
@@ -6576,7 +6568,7 @@
 +	kfree(context);
 +
 +	if (debug)
-+		info("%s: context deleted", __FUNCTION__);
++		info("%s: context deleted", __func__);
 +}
 +
 +static inline void deregister_from_lirc(struct imon_context *context)
@@ -6587,7 +6579,7 @@
 +	retval = lirc_unregister_plugin(minor);
 +	if (retval)
 +		err("%s: unable to deregister from lirc(%d)",
-+			__FUNCTION__, retval);
++			__func__, retval);
 +	else
 +		info("Deregistered iMON plugin(minor:%d)", minor);
 +
@@ -6611,7 +6603,7 @@
 +	interface = usb_find_interface(&imon_driver, subminor);
 +	if (!interface) {
 +		err("%s: could not find interface for minor %d",
-+		    __FUNCTION__, subminor);
++		    __func__, subminor);
 +		retval = -ENODEV;
 +		goto exit;
 +	}
@@ -6619,7 +6611,7 @@
 +
 +	if (!context) {
 +		err("%s: no context found for minor %d",
-+					__FUNCTION__, subminor);
++					__func__, subminor);
 +		retval = -ENODEV;
 +		goto exit;
 +	}
@@ -6627,10 +6619,10 @@
 +	LOCK_CONTEXT;
 +
 +	if (!context->vfd_supported) {
-+		err("%s: VFD not supported by device", __FUNCTION__);
++		err("%s: VFD not supported by device", __func__);
 +		retval = -ENODEV;
 +	} else if (context->vfd_isopen) {
-+		err("%s: VFD port is already open", __FUNCTION__);
++		err("%s: VFD port is already open", __func__);
 +		retval = -EBUSY;
 +	} else {
 +		MOD_INC_USE_COUNT;
@@ -6658,17 +6650,17 @@
 +	context = (struct imon_context *) file->private_data;
 +
 +	if (!context) {
-+		err("%s: no context for device", __FUNCTION__);
++		err("%s: no context for device", __func__);
 +		return -ENODEV;
 +	}
 +
 +	LOCK_CONTEXT;
 +
 +	if (!context->vfd_supported) {
-+		err("%s: VFD not supported by device", __FUNCTION__);
++		err("%s: VFD not supported by device", __func__);
 +		retval = -ENODEV;
 +	} else if (!context->vfd_isopen) {
-+		err("%s: VFD is not open", __FUNCTION__);
++		err("%s: VFD is not open", __func__);
 +		retval = -EIO;
 +	} else {
 +		context->vfd_isopen = FALSE;
@@ -6713,7 +6705,7 @@
 +	retval =  usb_submit_urb(context->tx_urb, GFP_KERNEL);
 +	if (retval != SUCCESS) {
 +		atomic_set(&(context->tx.busy), 0);
-+		err("%s: error submitting urb(%d)", __FUNCTION__, retval);
++		err("%s: error submitting urb(%d)", __func__, retval);
 +	} else {
 +		/* Wait for tranmission to complete(or abort) */
 +		UNLOCK_CONTEXT;
@@ -6722,7 +6714,7 @@
 +
 +		retval = context->tx.status;
 +		if (retval != SUCCESS)
-+			err("%s: packet tx failed(%d)", __FUNCTION__, retval);
++			err("%s: packet tx failed(%d)", __func__, retval);
 +	}
 +
 +	return retval;
@@ -6744,14 +6736,14 @@
 +					  0x00, 0x00, 0x00, 0x20 };
 +
 +	if (!context) {
-+		err("%s: no context for device", __FUNCTION__);
++		err("%s: no context for device", __func__);
 +		return -ENODEV;
 +	}
 +
 +	LOCK_CONTEXT;
 +
 +	if (!context->dev_present) {
-+		err("%s: no iMON device present", __FUNCTION__);
++		err("%s: no iMON device present", __func__);
 +		retval = -ENODEV;
 +		goto exit;
 +	}
@@ -6853,20 +6845,20 @@
 +
 +	context = (struct imon_context *) file->private_data;
 +	if (!context) {
-+		err("%s: no context for device", __FUNCTION__);
++		err("%s: no context for device", __func__);
 +		return -ENODEV;
 +	}
 +
 +	LOCK_CONTEXT;
 +
 +	if (!context->dev_present) {
-+		err("%s: no iMON device present", __FUNCTION__);
++		err("%s: no iMON device present", __func__);
 +		retval = -ENODEV;
 +		goto exit;
 +	}
 +
 +	if (n_bytes <= 0 || n_bytes > 32) {
-+		err("%s: invalid payload size", __FUNCTION__);
++		err("%s: invalid payload size", __func__);
 +		retval = -EINVAL;
 +		goto exit;
 +	}
@@ -6893,7 +6885,7 @@
 +		retval = send_packet(context);
 +		if (retval != SUCCESS) {
 +			err("%s: send packet failed for packet #%d",
-+					__FUNCTION__, seq/2);
++					__func__, seq/2);
 +			goto exit;
 +		} else {
 +			seq += 2;
@@ -6909,13 +6901,13 @@
 +		retval = send_packet(context);
 +		if (retval != SUCCESS)
 +			err("%s: send packet failed for packet #%d",
-+					__FUNCTION__, seq/2);
++					__func__, seq/2);
 +	}
 +
 +exit:
 +	UNLOCK_CONTEXT;
 +
-+	return(retval == SUCCESS) ? n_bytes : retval;
++	return (retval == SUCCESS) ? n_bytes : retval;
 +}
 +
 +/**
@@ -6939,21 +6931,21 @@
 +
 +	context = (struct imon_context *) file->private_data;
 +	if (!context) {
-+		err("%s: no context for device", __FUNCTION__);
++		err("%s: no context for device", __func__);
 +		return -ENODEV;
 +	}
 +
 +	LOCK_CONTEXT;
 +
 +	if (!context->dev_present) {
-+		err("%s: no iMON device present", __FUNCTION__);
++		err("%s: no iMON device present", __func__);
 +		retval = -ENODEV;
 +		goto exit;
 +	}
 +
 +	if (n_bytes != 8) {
 +		err("%s: invalid payload size: %d (expecting 8)",
-+		  __FUNCTION__, (int) n_bytes);
++		  __func__, (int) n_bytes);
 +		retval = -EINVAL;
 +		goto exit;
 +	}
@@ -6965,10 +6957,10 @@
 +
 +	retval = send_packet(context);
 +	if (retval != SUCCESS) {
-+		err("%s: send packet failed!", __FUNCTION__);
++		err("%s: send packet failed!", __func__);
 +		goto exit;
 +	} else if (debug) {
-+		info("%s: write %d bytes to LCD", __FUNCTION__, (int) n_bytes);
++		info("%s: write %d bytes to LCD", __func__, (int) n_bytes);
 +	}
 +exit:
 +	UNLOCK_CONTEXT;
@@ -7013,7 +7005,7 @@
 +	LOCK_CONTEXT;
 +
 +	if (context->ir_isopen) {
-+		err("%s: IR port is already open", __FUNCTION__);
++		err("%s: IR port is already open", __func__);
 +		retval = -EBUSY;
 +		goto exit;
 +	}
@@ -7033,7 +7025,7 @@
 +
 +	if (retval)
 +		err("%s: usb_submit_urb failed for ir_open(%d)",
-+		    __FUNCTION__, retval);
++		    __func__, retval);
 +	else {
 +		MOD_INC_USE_COUNT;
 +		context->ir_isopen = TRUE;
@@ -7056,7 +7048,7 @@
 +
 +	context = (struct imon_context *)data;
 +	if (!context) {
-+		err("%s: no context for device", __FUNCTION__);
++		err("%s: no context for device", __func__);
 +		return;
 +	}
 +
@@ -7129,7 +7121,7 @@
 +
 +	if (len != 8) {
 +		warn("%s: invalid incoming packet size(%d)",
-+		     __FUNCTION__, len);
++		     __func__, len);
 +		return;
 +	}
 +
@@ -7141,7 +7133,7 @@
 +	    buf[5] == 0xFF &&				/* iMON 2.4G */
 +	   ((buf[6] == 0x4E && buf[7] == 0xDF) ||	/* LT */
 +	    (buf[6] == 0x5E && buf[7] == 0xDF))) {	/* DT */
-+		warn("%s: remote associated refid=%02X", __FUNCTION__, buf[1]);
++		warn("%s: remote associated refid=%02X", __func__, buf[1]);
 +		context->ir_isassociating = FALSE;
 +	}
 +
@@ -7238,8 +7230,8 @@
 +		if (context->ir_isopen)
 +			incoming_packet(context, urb);
 +		break;
-+	default	:
-+		warn("%s: status(%d): ignored", __FUNCTION__, urb->status);
++	default:
++		warn("%s: status(%d): ignored", __func__, urb->status);
 +		break;
 +	}
 +
@@ -7274,7 +7266,7 @@
 +	struct imon_context *context = NULL;
 +	int i;
 +
-+	info("%s: found IMON device", __FUNCTION__);
++	info("%s: found IMON device", __func__);
 +
 +	/*
 +	 * If it's the LCD, as opposed to the VFD, we just need to replace
@@ -7311,7 +7303,7 @@
 +			rx_endpoint = ep;
 +			ir_ep_found = TRUE;
 +			if (debug)
-+				info("%s: found IR endpoint", __FUNCTION__);
++				info("%s: found IR endpoint", __func__);
 +
 +		} else if (!vfd_ep_found &&
 +			   ep_dir == USB_DIR_OUT &&
@@ -7319,13 +7311,13 @@
 +			tx_endpoint = ep;
 +			vfd_ep_found = TRUE;
 +			if (debug)
-+				info("%s: found VFD endpoint", __FUNCTION__);
++				info("%s: found VFD endpoint", __func__);
 +		}
 +	}
 +
 +	/* Input endpoint is mandatory */
 +	if (!ir_ep_found) {
-+		err("%s: no valid input(IR) endpoint found.", __FUNCTION__);
++		err("%s: no valid input(IR) endpoint found.", __func__);
 +		retval = -ENODEV;
 +		goto exit;
 +	} else {
@@ -7371,30 +7363,30 @@
 +
 +	context = kmalloc(sizeof(struct imon_context), GFP_KERNEL);
 +	if (!context) {
-+		err("%s: kmalloc failed for context", __FUNCTION__);
++		err("%s: kmalloc failed for context", __func__);
 +		alloc_status = 1;
 +		goto alloc_status_switch;
 +	}
 +	plugin = kmalloc(sizeof(struct lirc_plugin), GFP_KERNEL);
 +	if (!plugin) {
-+		err("%s: kmalloc failed for lirc_plugin", __FUNCTION__);
++		err("%s: kmalloc failed for lirc_plugin", __func__);
 +		alloc_status = 2;
 +		goto alloc_status_switch;
 +	}
 +	rbuf = kmalloc(sizeof(struct lirc_buffer), GFP_KERNEL);
 +	if (!rbuf) {
-+		err("%s: kmalloc failed for lirc_buffer", __FUNCTION__);
++		err("%s: kmalloc failed for lirc_buffer", __func__);
 +		alloc_status = 3;
 +		goto alloc_status_switch;
 +	}
 +	if (lirc_buffer_init(rbuf, BUF_CHUNK_SIZE, BUF_SIZE)) {
-+		err("%s: lirc_buffer_init failed", __FUNCTION__);
++		err("%s: lirc_buffer_init failed", __func__);
 +		alloc_status = 4;
 +		goto alloc_status_switch;
 +	}
 +	rx_urb = usb_alloc_urb(0, GFP_KERNEL);
 +	if (!rx_urb) {
-+		err("%s: usb_alloc_urb failed for IR urb", __FUNCTION__);
++		err("%s: usb_alloc_urb failed for IR urb", __func__);
 +		alloc_status = 5;
 +		goto alloc_status_switch;
 +	}
@@ -7402,7 +7394,7 @@
 +		tx_urb = usb_alloc_urb(0, GFP_KERNEL);
 +		if (!tx_urb) {
 +			err("%s: usb_alloc_urb failed for VFD urb",
-+			    __FUNCTION__);
++			    __func__);
 +			alloc_status = 6;
 +			goto alloc_status_switch;
 +		}
@@ -7434,13 +7426,13 @@
 +
 +	lirc_minor = lirc_register_plugin(plugin);
 +	if (lirc_minor < 0) {
-+		err("%s: lirc_register_plugin failed", __FUNCTION__);
++		err("%s: lirc_register_plugin failed", __func__);
 +		alloc_status = 7;
 +		UNLOCK_CONTEXT;
 +		goto alloc_status_switch;
 +	} else
 +		info("%s: Registered iMON plugin(minor:%d)",
-+		     __FUNCTION__, lirc_minor);
++		     __func__, lirc_minor);
 +
 +	/* Needed while unregistering! */
 +	plugin->minor = lirc_minor;
@@ -7465,7 +7457,7 @@
 +					 &imon_attribute_group);
 +		if (err)
 +			err("%s: Could not create sysfs entries(%d)",
-+			    __FUNCTION__, err);
++			    __func__, err);
 +	}
 +
 +	if (vfd_ep_found) {
@@ -7474,12 +7466,12 @@
 +		if (usb_register_dev(interface, &imon_class)) {
 +			/* Not a fatal error, so ignore */
 +			info("%s: could not get a minor number for VFD",
-+				__FUNCTION__);
++				__func__);
 +		}
 +	}
 +
 +	info("%s: iMON device on usb<%d:%d> initialized",
-+			__FUNCTION__, dev->bus->busnum, dev->devnum);
++			__func__, dev->bus->busnum, dev->devnum);
 +
 +	UNLOCK_CONTEXT;
 +
@@ -7521,7 +7513,7 @@
 +	context = usb_get_intfdata(interface);
 +	LOCK_CONTEXT;
 +
-+	info("%s: iMON device disconnected", __FUNCTION__);
++	info("%s: iMON device disconnected", __func__);
 +
 +	/* sysfs_remove_group is safe to call even if sysfs_create_group
 +	 * hasn't been called */
@@ -7563,7 +7555,7 @@
 +
 +	rc = usb_register(&imon_driver);
 +	if (rc) {
-+		err("%s: usb register failed(%d)", __FUNCTION__, rc);
++		err("%s: usb register failed(%d)", __func__, rc);
 +		return -ENODEV;
 +	}
 +	return SUCCESS;
@@ -7581,7 +7573,7 @@
 +
 diff --git a/drivers/input/lirc/lirc_it87.c b/drivers/input/lirc/lirc_it87.c
 new file mode 100644
-index 0000000..003c249
+index 0000000..d6d0397
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_it87.c
 @@ -0,0 +1,1012 @@
@@ -8207,7 +8199,7 @@
 +	static unsigned char byte_out;
 +	unsigned long hw_flags;
 +
-+	dprintk("%s: len=%ld, sb=%d\n", __FUNCTION__, len, send_byte);
++	dprintk("%s: len=%ld, sb=%d\n", __func__, len, send_byte);
 +
 +	time_left = (long)len - (long)count * (long)stime;
 +	count += ((2 * time_left) / stime);
@@ -8375,7 +8367,7 @@
 +	unsigned long hw_flags;
 +	int retval = 0;
 +
-+	unsigned char init_bytes[4] = {IT87_INIT};
++	unsigned char init_bytes[4] = IT87_INIT;
 +	unsigned char it87_chipid = 0;
 +	unsigned char ldn = 0;
 +	unsigned int  it87_io = 0;
@@ -8484,7 +8476,7 @@
 +static void drop_port(void)
 +{
 +/*
-+	unsigned char init_bytes[4] = {IT87_INIT};
++	unsigned char init_bytes[4] = IT87_INIT;
 +
 +	/ * Enter MB PnP Mode * /
 +	outb(init_bytes[0], IT87_ADRPORT);
@@ -8599,7 +8591,7 @@
 + */
 diff --git a/drivers/input/lirc/lirc_it87.h b/drivers/input/lirc/lirc_it87.h
 new file mode 100644
-index 0000000..2bbbfa3
+index 0000000..a997204
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_it87.h
 @@ -0,0 +1,116 @@
@@ -8617,13 +8609,13 @@
 +/* IT8712/05 Ports: */
 +#define IT87_ADRPORT      0x2e
 +#define IT87_DATAPORT     0x2f
-+#define IT87_INIT         0x87, 0x01, 0x55, 0x55
++#define IT87_INIT         {0x87, 0x01, 0x55, 0x55}
 +
 +/* alternate Ports: */
 +/*
 +#define IT87_ADRPORT      0x4e
 +#define IT87_DATAPORT     0x4f
-+#define IT87_INIT         0x87, 0x01, 0x55, 0xaa
++#define IT87_INIT         {0x87, 0x01, 0x55, 0xaa}
 + */
 +
 +/* IT8712/05 Registers */
@@ -8721,7 +8713,7 @@
 +/********************************* ITE IT87xx ************************/
 diff --git a/drivers/input/lirc/lirc_mceusb.c b/drivers/input/lirc/lirc_mceusb.c
 new file mode 100644
-index 0000000..aed3f6f
+index 0000000..5b9c8b0
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_mceusb.c
 @@ -0,0 +1,890 @@
@@ -9081,7 +9073,7 @@
 +	int partial, this_read = 0;
 +	int bulkidx = 0;
 +	int bytes_left_in_packet = 0;
-+	signed char *signedp = (signed char*)dev->bulk_in_buffer;
++	signed char *signedp = (signed char *)dev->bulk_in_buffer;
 +
 +	if (words_to_read == 0)
 +		return dev->lirccnt;
@@ -9617,7 +9609,7 @@
 +EXPORT_NO_SYMBOLS;
 diff --git a/drivers/input/lirc/lirc_mceusb2.c b/drivers/input/lirc/lirc_mceusb2.c
 new file mode 100644
-index 0000000..2f78da8
+index 0000000..47b2b78
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_mceusb2.c
 @@ -0,0 +1,1060 @@
@@ -9748,7 +9740,7 @@
 +#define VENDOR_FINTEK		0x1934
 +#define VENDOR_PINNACLE		0x2304
 +
-+static struct usb_device_id usb_remote_table [] = {
++static struct usb_device_id usb_remote_table[] = {
 +	/* Philips eHome Infrared Transceiver */
 +	{ USB_DEVICE(VENDOR_PHILIPS, 0x0815) },
 +	/* Philips Infrared Transceiver - HP branded */
@@ -10183,12 +10175,12 @@
 +		return -EFAULT;
 +
 +	if (n % sizeof(lirc_t))
-+		return(-EINVAL);
++		return -EINVAL;
 +	count = n / sizeof(lirc_t);
 +
 +	/* Check if command is within limits */
 +	if (count > LIRCBUF_SIZE || count%2 == 0)
-+		return(-EINVAL);
++		return -EINVAL;
 +	if (copy_from_user(wbuf, buf, n))
 +		return -EFAULT;
 +
@@ -10683,7 +10675,7 @@
 +EXPORT_NO_SYMBOLS;
 diff --git a/drivers/input/lirc/lirc_parallel.c b/drivers/input/lirc/lirc_parallel.c
 new file mode 100644
-index 0000000..dec0f94
+index 0000000..b46d109
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_parallel.c
 @@ -0,0 +1,745 @@
@@ -10810,11 +10802,11 @@
 +{
 +	switch (offset) {
 +	case LIRC_LP_BASE:
-+		return (parport_read_data(pport));
++		return parport_read_data(pport);
 +	case LIRC_LP_STATUS:
-+		return (parport_read_status(pport));
++		return parport_read_status(pport);
 +	case LIRC_LP_CONTROL:
-+		return (parport_read_control(pport));
++		return parport_read_control(pport);
 +	}
 +	return 0; /* make compiler happy */
 +}
@@ -10837,12 +10829,12 @@
 +
 +static inline unsigned int lirc_get_timer(void)
 +{
-+	return (in(LIRC_PORT_TIMER)&LIRC_PORT_TIMER_BIT);
++	return in(LIRC_PORT_TIMER) & LIRC_PORT_TIMER_BIT;
 +}
 +
 +static inline  unsigned int lirc_get_signal(void)
 +{
-+	return (in(LIRC_PORT_SIGNAL)&LIRC_PORT_SIGNAL_BIT);
++	return in(LIRC_PORT_SIGNAL) & LIRC_PORT_SIGNAL_BIT;
 +}
 +
 +static inline void lirc_on(void)
@@ -11008,8 +11000,8 @@
 +			printk(KERN_NOTICE "%s: timeout\n", LIRC_DRIVER_NAME);
 +			break;
 +		}
-+	}
-+	while (lirc_get_signal());
++	} while (lirc_get_signal());
++
 +	if (signal != 0) {
 +		/* ajust value to usecs */
 +		unsigned long long helper;
@@ -11082,7 +11074,7 @@
 +	}
 +	remove_wait_queue(&lirc_wait, &wait);
 +	set_current_state(TASK_RUNNING);
-+	return (count ? count : result);
++	return count ? count : result;
 +}
 +
 +static ssize_t lirc_write(struct file *filep, const char *buf, size_t n,
@@ -11095,15 +11087,15 @@
 +	lirc_t counttimer;
 +
 +	if (!is_claimed)
-+		return(-EBUSY);
++		return -EBUSY;
 +
 +	if (n % sizeof(lirc_t))
-+		return(-EINVAL);
++		return -EINVAL;
 +
 +	count = n / sizeof(lirc_t);
 +
 +	if (count > WBUF_SIZE || count % 2 == 0)
-+		return(-EINVAL);
++		return -EINVAL;
 +
 +	if (copy_from_user(wbuf, buf, n))
 +		return -EFAULT;
@@ -11113,7 +11105,7 @@
 +		/* try again if device is ready */
 +		timer = init_lirc_timer();
 +		if (timer == 0)
-+			return(-EIO);
++			return -EIO;
 +	}
 +
 +	/* ajust values from usecs */
@@ -11172,7 +11164,7 @@
 +{
 +	poll_wait(file, &lirc_wait, wait);
 +	if (rptr != wptr)
-+		return (POLLIN|POLLRDNORM);
++		return POLLIN | POLLRDNORM;
 +	return 0;
 +}
 +
@@ -11466,10 +11458,10 @@
 +#endif
 diff --git a/drivers/input/lirc/lirc_sasem.c b/drivers/input/lirc/lirc_sasem.c
 new file mode 100644
-index 0000000..0d3e55f
+index 0000000..2c0a278
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_sasem.c
-@@ -0,0 +1,971 @@
+@@ -0,0 +1,972 @@
 +/*      $Id$      */
 +
 +/* lirc_sasem.c - USB remote support for LIRC
@@ -11551,7 +11543,7 @@
 +#define MOD_VERSION	"0.5"
 +
 +#define VFD_MINOR_BASE	144	/* Same as LCD */
-+#define DEVFS_MODE S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH
++#define DEVFS_MODE (S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH)
 +#define DEVFS_NAME	LIRC_DEVFS_PREFIX "lcd%d"
 +
 +#define BUF_CHUNK_SIZE	8
@@ -11611,11 +11603,11 @@
 +	struct usb_endpoint_descriptor *tx_endpoint;
 +	struct urb *rx_urb;
 +	struct urb *tx_urb;
-+	unsigned char usb_rx_buf [8];
-+	unsigned char usb_tx_buf [8];
++	unsigned char usb_rx_buf[8];
++	unsigned char usb_tx_buf[8];
 +
 +	struct tx_t {
-+		unsigned char data_buf [32]; /* user data buffer	  */
++		unsigned char data_buf[32];  /* user data buffer	  */
 +		struct completion finished;  /* wait for write to finish  */
 +		atomic_t busy;		     /* write in progress	 */
 +		int status;		     /* status of tx completion   */
@@ -11641,7 +11633,7 @@
 +};
 +
 +/* USB Device ID for Sasem USB Control Board */
-+static struct usb_device_id sasem_usb_id_table [] = {
++static struct usb_device_id sasem_usb_id_table[] = {
 +	{ USB_DEVICE(0x11ba, 0x0101) },		/* Sasem       */
 +	{}
 +};
@@ -11688,7 +11680,7 @@
 +	kfree(context);
 +
 +	if (debug)
-+		info("%s: context deleted", __FUNCTION__);
++		info("%s: context deleted", __func__);
 +}
 +
 +static inline void deregister_from_lirc(struct sasem_context *context)
@@ -11699,7 +11691,7 @@
 +	retval = lirc_unregister_plugin(minor);
 +	if (retval)
 +		err("%s: unable to deregister from lirc (%d)",
-+			__FUNCTION__, retval);
++			__func__, retval);
 +	else
 +		info("Deregistered Sasem plugin (minor:%d)", minor);
 +
@@ -11723,7 +11715,7 @@
 +	interface = usb_find_interface(&sasem_driver, subminor);
 +	if (!interface) {
 +		err("%s: could not find interface for minor %d",
-+		    __FUNCTION__, subminor);
++		    __func__, subminor);
 +		retval = -ENODEV;
 +		goto exit;
 +	}
@@ -11731,7 +11723,7 @@
 +
 +	if (!context) {
 +		err("%s: no context found for minor %d",
-+					__FUNCTION__, subminor);
++					__func__, subminor);
 +		retval = -ENODEV;
 +		goto exit;
 +	}
@@ -11739,7 +11731,7 @@
 +	LOCK_CONTEXT;
 +
 +	if (context->vfd_isopen) {
-+		err("%s: VFD port is already open", __FUNCTION__);
++		err("%s: VFD port is already open", __func__);
 +		retval = -EBUSY;
 +	} else {
 +		MOD_INC_USE_COUNT;
@@ -11767,7 +11759,7 @@
 +	context = (struct sasem_context *) file->private_data;
 +
 +	if (!context) {
-+		err("%s: no context for device", __FUNCTION__);
++		err("%s: no context for device", __func__);
 +		return -ENODEV;
 +	}
 +
@@ -11803,14 +11795,14 @@
 +	context = (struct sasem_context *) file->private_data;
 +
 +	if (!context) {
-+		err("%s: no context for device", __FUNCTION__);
++		err("%s: no context for device", __func__);
 +		return -ENODEV;
 +	}
 +
 +	LOCK_CONTEXT;
 +
 +	if (!context->vfd_isopen) {
-+		err("%s: VFD is not open", __FUNCTION__);
++		err("%s: VFD is not open", __func__);
 +		retval = -EIO;
 +	} else {
 +		context->vfd_isopen = FALSE;
@@ -11856,7 +11848,7 @@
 +	retval =  usb_submit_urb(context->tx_urb, GFP_KERNEL);
 +	if (retval != SUCCESS) {
 +		atomic_set(&(context->tx.busy), 0);
-+		err("%s: error submitting urb (%d)", __FUNCTION__, retval);
++		err("%s: error submitting urb (%d)", __func__, retval);
 +	} else {
 +		/* Wait for tranmission to complete (or abort) */
 +		UNLOCK_CONTEXT;
@@ -11865,7 +11857,7 @@
 +
 +		retval = context->tx.status;
 +		if (retval != SUCCESS)
-+			err("%s: packet tx failed (%d)", __FUNCTION__, retval);
++			err("%s: packet tx failed (%d)", __func__, retval);
 +	}
 +
 +	return retval;
@@ -11885,20 +11877,20 @@
 +
 +	context = (struct sasem_context *) file->private_data;
 +	if (!context) {
-+		err("%s: no context for device", __FUNCTION__);
++		err("%s: no context for device", __func__);
 +		return -ENODEV;
 +	}
 +
 +	LOCK_CONTEXT;
 +
 +	if (!context->dev_present) {
-+		err("%s: no Sasem device present", __FUNCTION__);
++		err("%s: no Sasem device present", __func__);
 +		retval = -ENODEV;
 +		goto exit;
 +	}
 +
 +	if (n_bytes <= 0 || n_bytes > 32) {
-+		err("%s: invalid payload size", __FUNCTION__);
++		err("%s: invalid payload size", __func__);
 +		retval = -EINVAL;
 +		goto exit;
 +	}
@@ -11907,7 +11899,7 @@
 +
 +	/* Pad with spaces */
 +	for (i = n_bytes; i < 32; ++i)
-+		context->tx.data_buf [i] = ' ';
++		context->tx.data_buf[i] = ' ';
 +
 +	/* Nine 8 byte packets to be sent */
 +	/* NOTE: "\x07\x01\0\0\0\0\0\0" or "\x0c\0\0\0\0\0\0\0"
@@ -11917,7 +11909,8 @@
 +		case 0:
 +			memcpy(context->usb_tx_buf, "\x07\0\0\0\0\0\0\0", 8);
 +			context->usb_tx_buf[1] = (context->vfd_contrast) ?
-+				(0x2B - (context->vfd_contrast - 1) / 250):0x2B;
++				(0x2B - (context->vfd_contrast - 1) / 250)
++				: 0x2B;
 +			break;
 +		case 1:
 +			memcpy(context->usb_tx_buf, "\x09\x01\0\0\0\0\0\0", 8);
@@ -11951,7 +11944,7 @@
 +		if (retval != SUCCESS) {
 +
 +			err("%s: send packet failed for packet #%d",
-+					__FUNCTION__, i);
++					__func__, i);
 +			goto exit;
 +		}
 +	}
@@ -12000,7 +11993,7 @@
 +	LOCK_CONTEXT;
 +
 +	if (context->ir_isopen) {
-+		err("%s: IR port is already open", __FUNCTION__);
++		err("%s: IR port is already open", __func__);
 +		retval = -EBUSY;
 +		goto exit;
 +	}
@@ -12015,7 +12008,7 @@
 +
 +	if (retval)
 +		err("%s: usb_submit_urb failed for ir_open (%d)",
-+		    __FUNCTION__, retval);
++		    __func__, retval);
 +	else {
 +		MOD_INC_USE_COUNT;
 +		context->ir_isopen = TRUE;
@@ -12038,7 +12031,7 @@
 +
 +	context = (struct sasem_context *)data;
 +	if (!context) {
-+		err("%s: no context for device", __FUNCTION__);
++		err("%s: no context for device", __func__);
 +		return;
 +	}
 +
@@ -12084,14 +12077,14 @@
 +
 +	if (len != 8) {
 +		warn("%s: invalid incoming packet size (%d)",
-+		     __FUNCTION__, len);
++		     __func__, len);
 +		return;
 +	}
 +
 +#ifdef DEBUG
 +	int i;
 +	for (i = 0; i < 8; ++i)
-+		printk(KERN_INFO "%02x ", buf [i]);
++		printk(KERN_INFO "%02x ", buf[i]);
 +	printk(KERN_INFO "\n");
 +#endif
 +
@@ -12155,7 +12148,7 @@
 +
 +	default:
 +		warn("%s: status (%d): ignored",
-+			 __FUNCTION__, urb->status);
++			 __func__, urb->status);
 +		break;
 +	}
 +
@@ -12188,7 +12181,7 @@
 +	struct sasem_context *context = NULL;
 +	int i;
 +
-+	info("%s: found Sasem device", __FUNCTION__);
++	info("%s: found Sasem device", __func__);
 +
 +
 +	dev = usb_get_dev(interface_to_usbdev(interface));
@@ -12220,7 +12213,7 @@
 +			rx_endpoint = ep;
 +			ir_ep_found = TRUE;
 +			if (debug)
-+				info("%s: found IR endpoint", __FUNCTION__);
++				info("%s: found IR endpoint", __func__);
 +
 +		} else if (!vfd_ep_found &&
 +			ep_dir == USB_DIR_OUT &&
@@ -12229,21 +12222,21 @@
 +			tx_endpoint = ep;
 +			vfd_ep_found = TRUE;
 +			if (debug)
-+				info("%s: found VFD endpoint", __FUNCTION__);
++				info("%s: found VFD endpoint", __func__);
 +		}
 +	}
 +
 +	/* Input endpoint is mandatory */
 +	if (!ir_ep_found) {
 +
-+		err("%s: no valid input (IR) endpoint found.", __FUNCTION__);
++		err("%s: no valid input (IR) endpoint found.", __func__);
 +		retval = -ENODEV;
 +		goto exit;
 +	}
 +
 +	/* Warning if no VFD endpoint */
 +	if (!vfd_ep_found)
-+		info("%s: no valid output (VFD) endpoint found.", __FUNCTION__);
++		info("%s: no valid output (VFD) endpoint found.", __func__);
 +
 +
 +	/* Allocate memory */
@@ -12251,30 +12244,30 @@
 +
 +	context = kmalloc(sizeof(struct sasem_context), GFP_KERNEL);
 +	if (!context) {
-+		err("%s: kmalloc failed for context", __FUNCTION__);
++		err("%s: kmalloc failed for context", __func__);
 +		alloc_status = 1;
 +		goto alloc_status_switch;
 +	}
 +	plugin = kmalloc(sizeof(struct lirc_plugin), GFP_KERNEL);
 +	if (!plugin) {
-+		err("%s: kmalloc failed for lirc_plugin", __FUNCTION__);
++		err("%s: kmalloc failed for lirc_plugin", __func__);
 +		alloc_status = 2;
 +		goto alloc_status_switch;
 +	}
 +	rbuf = kmalloc(sizeof(struct lirc_buffer), GFP_KERNEL);
 +	if (!rbuf) {
-+		err("%s: kmalloc failed for lirc_buffer", __FUNCTION__);
++		err("%s: kmalloc failed for lirc_buffer", __func__);
 +		alloc_status = 3;
 +		goto alloc_status_switch;
 +	}
 +	if (lirc_buffer_init(rbuf, BUF_CHUNK_SIZE, BUF_SIZE)) {
-+		err("%s: lirc_buffer_init failed", __FUNCTION__);
++		err("%s: lirc_buffer_init failed", __func__);
 +		alloc_status = 4;
 +		goto alloc_status_switch;
 +	}
 +	rx_urb = usb_alloc_urb(0, GFP_KERNEL);
 +	if (!rx_urb) {
-+		err("%s: usb_alloc_urb failed for IR urb", __FUNCTION__);
++		err("%s: usb_alloc_urb failed for IR urb", __func__);
 +		alloc_status = 5;
 +		goto alloc_status_switch;
 +	}
@@ -12282,7 +12275,7 @@
 +		tx_urb = usb_alloc_urb(0, GFP_KERNEL);
 +		if (!tx_urb) {
 +			err("%s: usb_alloc_urb failed for VFD urb",
-+			    __FUNCTION__);
++			    __func__);
 +			alloc_status = 6;
 +			goto alloc_status_switch;
 +		}
@@ -12310,12 +12303,12 @@
 +
 +	lirc_minor = lirc_register_plugin(plugin);
 +	if (lirc_minor < 0) {
-+		err("%s: lirc_register_plugin failed", __FUNCTION__);
++		err("%s: lirc_register_plugin failed", __func__);
 +		alloc_status = 7;
 +		UNLOCK_CONTEXT;
 +	} else
 +		info("%s: Registered Sasem plugin (minor:%d)",
-+			__FUNCTION__, lirc_minor);
++			__func__, lirc_minor);
 +
 +alloc_status_switch:
 +
@@ -12363,11 +12356,11 @@
 +		if (usb_register_dev(interface, &sasem_class))
 +			/* Not a fatal error, so ignore */
 +			info("%s: could not get a minor number for VFD",
-+				__FUNCTION__);
++				__func__);
 +	}
 +
 +	info("%s: Sasem device on usb<%d:%d> initialized",
-+			__FUNCTION__, dev->bus->busnum, dev->devnum);
++			__func__, dev->bus->busnum, dev->devnum);
 +
 +	UNLOCK_CONTEXT;
 +exit:
@@ -12387,7 +12380,7 @@
 +	context = usb_get_intfdata(interface);
 +	LOCK_CONTEXT;
 +
-+	info("%s: Sasem device disconnected", __FUNCTION__);
++	info("%s: Sasem device disconnected", __func__);
 +
 +	usb_set_intfdata(interface, NULL);
 +	context->dev_present = FALSE;
@@ -12425,7 +12418,7 @@
 +
 +	rc = usb_register(&sasem_driver);
 +	if (rc < 0) {
-+		err("%s: usb register failed (%d)", __FUNCTION__, rc);
++		err("%s: usb register failed (%d)", __func__, rc);
 +		return -ENODEV;
 +	}
 +	return SUCCESS;
@@ -12443,7 +12436,7 @@
 +
 diff --git a/drivers/input/lirc/lirc_serial.c b/drivers/input/lirc/lirc_serial.c
 new file mode 100644
-index 0000000..1a28a5c
+index 0000000..b7cd5e6
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_serial.c
 @@ -0,0 +1,1348 @@
@@ -13004,9 +12997,9 @@
 +	}
 +
 +	if (i == 0)
-+		return ((-rawbits)*10000/1152);
++		return (-rawbits)*10000/1152;
 +	else
-+		return ((3-i)*3*10000/1152+(-rawbits)*10000/1152);
++		return (3-i)*3*10000/1152 + (-rawbits)*10000/1152;
 +}
 +
 +#ifdef USE_RDTSC
@@ -13032,9 +13025,9 @@
 +	flag = 1;
 +	while ((now-start) < length) {
 +		/* Delay till flip time */
-+		do
++		do {
 +			rdtscl(now);
-+		while ((now-start) < target);
++		} while ((now-start) < target);
 +
 +		/* flip */
 +		if (flag) {
@@ -13047,7 +13040,7 @@
 +		flag = !flag;
 +	}
 +	rdtscl(now);
-+	return (((now-start)-length)/conv_us_to_clocks);
++	return ((now-start)-length) / conv_us_to_clocks;
 +}
 +#else /* ! USE_RDTSC */
 +/* Version using udelay() */
@@ -13080,7 +13073,7 @@
 +		actual += (d<<8)+LIRC_SERIAL_TRANSMITTER_LATENCY;
 +		flag = !flag;
 +	}
-+	return ((actual-length)>>8);
++	return (actual-length)>>8;
 +}
 +#endif /* USE_RDTSC */
 +
@@ -13216,7 +13209,7 @@
 +
 +			/* calculate time since last interrupt in
 +			   microseconds */
-+			dcd = (status & hardware[type].signal_pin) ? 1:0;
++			dcd = (status & hardware[type].signal_pin) ? 1 : 0;
 +
 +			if (dcd == last_dcd) {
 +				printk(KERN_WARNING LIRC_DRIVER_NAME
@@ -13252,7 +13245,7 @@
 +					       tv.tv_usec, lasttv.tv_usec);
 +					/* detecting pulse while this
 +					   MUST be a space! */
-+					sense = sense ? 0:1;
++					sense = sense ? 0 : 1;
 +				}
 +			} else
 +				data = (lirc_t) (deltv*1000000 +
@@ -13372,7 +13365,7 @@
 +		   active high/low */
 +		nlow = 0;
 +		nhigh = 0;
-+		for (i = 0; i < 9; i ++) {
++		for (i = 0; i < 9; i++) {
 +			if (sinp(UART_MSR) & hardware[type].signal_pin)
 +				nlow++;
 +			else
@@ -13381,10 +13374,10 @@
 +		}
 +		sense = (nlow >= nhigh ? 1 : 0);
 +		printk(KERN_INFO  LIRC_DRIVER_NAME  ": auto-detected active "
-+		       "%s receiver\n", sense ? "low":"high");
++		       "%s receiver\n", sense ? "low" : "high");
 +	} else
 +		printk(KERN_INFO  LIRC_DRIVER_NAME  ": Manually using active "
-+		       "%s receiver\n", sense ? "low":"high");
++		       "%s receiver\n", sense ? "low" : "high");
 +
 +	return 0;
 +}
@@ -13402,7 +13395,7 @@
 +	do_gettimeofday(&lasttv);
 +
 +	result = request_irq(irq, irq_handler,
-+			   IRQF_DISABLED | (share_irq ? IRQF_SHARED:0),
++			   IRQF_DISABLED | (share_irq ? IRQF_SHARED : 0),
 +			   LIRC_DRIVER_NAME, (void *)&hardware);
 +
 +	switch (result) {
@@ -13797,7 +13790,7 @@
 +#endif /* MODULE */
 diff --git a/drivers/input/lirc/lirc_sir.c b/drivers/input/lirc/lirc_sir.c
 new file mode 100644
-index 0000000..2553316
+index 0000000..fb98b10
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_sir.c
 @@ -0,0 +1,1323 @@
@@ -13873,10 +13866,10 @@
 +#include <linux/delay.h>
 +#include <linux/poll.h>
 +#include <asm/system.h>
-+#include <asm/uaccess.h>
-+#include <asm/io.h>
++#include <linux/uaccess.h>
++#include <linux/io.h>
 +#include <asm/irq.h>
-+#include <asm/fcntl.h>
++#include <linux/fcntl.h>
 +#ifdef LIRC_ON_SA1100
 +#include <asm/hardware.h>
 +#ifdef CONFIG_SA1100_COLLIE
@@ -14132,7 +14125,7 @@
 +	}
 +	remove_wait_queue(&lirc_read_queue, &wait);
 +	set_current_state(TASK_RUNNING);
-+	return (n ? n : retval);
++	return n ? n : retval;
 +}
 +static ssize_t lirc_write(struct file *file, const char *buf, size_t n,
 +				loff_t *pos)
@@ -14525,9 +14518,9 @@
 +								SIR_TIMEOUT;
 +					add_timer(&timerlist);
 +				}
-+			}
-+			while ((lsr = inb(io + UART_LSR))
-+				& UART_LSR_DR); /* data ready */
++
++				lsr = inb(io + UART_LSR);
++			} while (lsr & UART_LSR_DR); /* data ready */
 +			spin_unlock_irqrestore(&timer_lock, flags);
 +			break;
 +		default:
@@ -15126,10 +15119,10 @@
 +#endif /* MODULE */
 diff --git a/drivers/input/lirc/lirc_streamzap.c b/drivers/input/lirc/lirc_streamzap.c
 new file mode 100644
-index 0000000..147f3a9
+index 0000000..d73314f
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_streamzap.c
-@@ -0,0 +1,810 @@
+@@ -0,0 +1,804 @@
 +/*      $Id$      */
 +
 +/*
@@ -15202,7 +15195,7 @@
 +/*
 + * table of devices that work with this driver
 + */
-+static struct usb_device_id streamzap_table [] = {
++static struct usb_device_id streamzap_table[] = {
 +	{ USB_DEVICE(USB_STREAMZAP_VENDOR_ID, USB_STREAMZAP_PRODUCT_ID) },
 +	{ }	/* Terminating entry */
 +};
@@ -15332,7 +15325,7 @@
 +	unsigned long flags;
 +	/* deliver data every 10 ms */
 +	static unsigned long timer_inc =
-+		(10000/(1000000/HZ)) == 0 ? 1:(10000/(1000000/HZ));
++		(10000/(1000000/HZ)) == 0 ? 1 : (10000/(1000000/HZ));
 +	struct usb_streamzap *sz = (struct usb_streamzap *) arg;
 +	lirc_t data;
 +
@@ -15590,7 +15583,7 @@
 +	iface_host = interface->cur_altsetting;
 +
 +	if (iface_host->desc.bNumEndpoints != 1) {
-+		err("%s: Unexpected desc.bNumEndpoints (%d)", __FUNCTION__,
++		err("%s: Unexpected desc.bNumEndpoints (%d)", __func__,
 +		    iface_host->desc.bNumEndpoints);
 +		retval = -ENODEV;
 +		goto error;
@@ -15600,7 +15593,7 @@
 +	if ((sz->endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK)
 +	    != USB_DIR_IN) {
 +		err("%s: endpoint doesn't match input device 02%02x",
-+		    __FUNCTION__, sz->endpoint->bEndpointAddress);
++		    __func__, sz->endpoint->bEndpointAddress);
 +		retval = -ENODEV;
 +		goto error;
 +	}
@@ -15608,13 +15601,13 @@
 +	if ((sz->endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
 +	    != USB_ENDPOINT_XFER_INT) {
 +		err("%s: endpoint attributes don't match xfer 02%02x",
-+		    __FUNCTION__, sz->endpoint->bmAttributes);
++		    __func__, sz->endpoint->bmAttributes);
 +		retval = -ENODEV;
 +		goto error;
 +	}
 +
 +	if (sz->endpoint->wMaxPacketSize == 0) {
-+		err("%s: endpoint message size==0? ", __FUNCTION__);
++		err("%s: endpoint message size==0? ", __func__);
 +		retval = -ENODEV;
 +		goto error;
 +	}
@@ -15720,14 +15713,8 @@
 +		err("Out of memory");
 +
 +	if (sz) {
-+
-+		if (sz->urb_in)
-+			usb_free_urb(sz->urb_in);
-+
-+		if (sz->buf_in) {
-+			usb_buffer_free(udev, sz->buf_in_len,
-+					sz->buf_in, sz->dma_in);
-+		}
++		usb_free_urb(sz->urb_in);
++		usb_buffer_free(udev, sz->buf_in_len, sz->buf_in, sz->dma_in);
 +		kfree(sz);
 +	}
 +
@@ -15739,7 +15726,7 @@
 +	struct usb_streamzap *sz = data;
 +
 +	if (!sz) {
-+		dprintk("%s called with no context", -1, __FUNCTION__);
++		dprintk("%s called with no context", -1, __func__);
 +		return -EINVAL;
 +	}
 +	dprintk("set use inc", sz->plugin.minor);
@@ -15772,7 +15759,7 @@
 +	struct usb_streamzap *sz = data;
 +
 +	if (!sz) {
-+		dprintk("%s called with no context", -1, __FUNCTION__);
++		dprintk("%s called with no context", -1, __func__);
 +		return;
 +	}
 +	dprintk("set use dec", sz->plugin.minor);
@@ -15799,7 +15786,7 @@
 +	case LIRC_GET_REC_RESOLUTION:
 +		result = put_user(STREAMZAP_RESOLUTION, (unsigned long *) arg);
 +		if (result)
-+			return(result);
++			return result;
 +		break;
 +	default:
 +		return -ENOIOCTLCMD;
@@ -16341,10 +16328,10 @@
 +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..e3c96b6
+index 0000000..a9d738e
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_zilog.c
-@@ -0,0 +1,1425 @@
+@@ -0,0 +1,1416 @@
 +/*      $Id$      */
 +
 +/*
@@ -16435,7 +16422,7 @@
 +	struct completion  *t_notify;
 +	struct completion  *t_notify2;
 +	int		   shutdown;
-+	int		   tpid;
++	struct task_struct *task;
 +
 +	/* RX read data */
 +	unsigned char      b[3];
@@ -16455,7 +16442,7 @@
 +#define TX_BLOCK_SIZE	99
 +
 +/* Hauppuage IR transmitter data */
-+typedef struct TX_DATA_s {
++struct tx_data_struct {
 +	/* Boot block */
 +	unsigned char *boot_data;
 +
@@ -16473,15 +16460,16 @@
 +
 +	/* Global fixed data template */
 +	int fixed[TX_BLOCK_SIZE];
-+} TX_DATA;
++};
 +
-+static TX_DATA *tx_data;
++static struct tx_data_struct *tx_data;
 +struct semaphore tx_data_lock;
 +
 +/* ----------------------------------------------------------------------- */
 +
 +#define DEVICE_NAME "lirc_zilog"
-+#define zilog_notify(s, args...) printk(KERN_NOTICE KBUILD_MODNAME ": " s, ## args)
++#define zilog_notify(s, args...) printk(KERN_NOTICE KBUILD_MODNAME ": " s, \
++					## args)
 +#define zilog_error(s, args...) printk(KERN_ERR KBUILD_MODNAME ": " s, ## args)
 +
 +/* ----------------------------------------------------------------------- */
@@ -16594,11 +16582,6 @@
 +{
 +	struct IR *ir = arg;
 +
-+	/* This thread doesn't need any user-level access,
-+	 * so get rid of all our resources
-+	 */
-+	daemonize("lirc_zilog");
-+
 +	if (ir->t_notify != NULL)
 +		complete(ir->t_notify);
 +
@@ -16631,10 +16614,10 @@
 +		}
 +	} while (!ir->shutdown);
 +
-+	if (ir->t_notify2 != NULL) {
++	if (ir->t_notify2 != NULL)
 +		wait_for_completion(ir->t_notify2);
 +
-+	ir->tpid = -1;
++	ir->task = NULL;
 +	if (ir->t_notify != NULL)
 +		complete(ir->t_notify);
 +
@@ -16675,7 +16658,7 @@
 +}
 +
 +/* safe read of a uint32 (always network byte order) */
-+static __inline int read_uint32(unsigned char **data,
++static inline int read_uint32(unsigned char **data,
 +				     unsigned char *endp, unsigned int *val)
 +{
 +	if (*data + 4 > endp)
@@ -16687,7 +16670,7 @@
 +}
 +
 +/* safe read of a uint8 */
-+static __inline int read_uint8(unsigned char **data,
++static inline int read_uint8(unsigned char **data,
 +				    unsigned char *endp, unsigned char *val)
 +{
 +	if (*data + 1 > endp)
@@ -16697,7 +16680,7 @@
 +}
 +
 +/* safe skipping of N bytes */
-+static __inline int skip(unsigned char **data,
++static inline int skip(unsigned char **data,
 +			      unsigned char *endp, unsigned int distance)
 +{
 +	if (*data + distance > endp)
@@ -16924,7 +16907,7 @@
 +	zilog_notify("firmware of size %d loaded\n", fw_entry->size);
 +
 +	/* Parse the file */
-+	tx_data = vmalloc(sizeof(TX_DATA));
++	tx_data = vmalloc(sizeof(*tx_data));
 +	if (tx_data == NULL) {
 +		zilog_error("out of memory\n");
 +		release_firmware(fw_entry);
@@ -17521,7 +17504,7 @@
 +	init_MUTEX(&ir->buf_sem);
 +	ir->open = 0;
 +	ir->devs = 0;
-+	ir->tpid = 0;
++	ir->task = NULL;
 +	ir->need_boot = 1;
 +	ir->shutdown = 0;
 +	ir->t_notify = ir->t_notify2 = NULL;
@@ -17546,11 +17529,11 @@
 +
 +		/* try to fire up polling thread */
 +		ir->t_notify = &tn;
-+		ir->tpid = kernel_thread(lirc_thread, ir, 0);
-+		if (ir->tpid < 0) {
++		ir->task = kthread_run(lirc_thread, ir, "lirc_zilog");
++		ret = PTR_ERR(ir->task);
++		if (ret <= 0) {
 +			zilog_error("lirc_register_plugin: cannot run "
 +				    "poll thread\n");
-+			ret = -ECHILD;
 +			goto err;
 +		}
 +		wait_for_completion(&tn);
@@ -17619,16 +17602,11 @@
 +		DECLARE_COMPLETION(tn2);
 +
 +		/* end up polling thread */
-+		if (ir->tpid >= 0) {
++		if (ir->task && !IS_ERR(ir->task)) {
 +			ir->t_notify = &tn;
 +			ir->t_notify2 = &tn2;
 +			ir->shutdown = 1;
-+			{
-+				struct task_struct *p;
-+
-+				p = find_task_by_pid(ir->tpid);
-+				wake_up_process(p);
-+			}
++			wake_up_process(ir->task);
 +			complete(&tn2);
 +			wait_for_completion(&tn);
 +			ir->t_notify = NULL;



From rishi at fedoraproject.org  Wed Sep  3 21:28:21 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Wed,  3 Sep 2008 21:28:21 +0000 (UTC)
Subject: rpms/freetalk/F-9 .cvsignore, 1.2, 1.3 freetalk.spec, 1.1,
	1.2 sources, 1.2, 1.3 freetalk-3.0-open.patch, 1.1, NONE
Message-ID: <20080903212821.949E87002B@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/freetalk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15512

Modified Files:
	.cvsignore freetalk.spec sources 
Removed Files:
	freetalk-3.0-open.patch 
Log Message:
* Wed Sep 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.1-1
- Version bump to 0.32.
- open(2) problem fixed by upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freetalk/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Feb 2008 17:00:29 -0000	1.2
+++ .cvsignore	3 Sep 2008 21:27:51 -0000	1.3
@@ -1 +1 @@
-freetalk-3.0.tar.gz
+freetalk-3.1.tar.gz


Index: freetalk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freetalk/F-9/freetalk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freetalk.spec	14 Feb 2008 17:00:29 -0000	1.1
+++ freetalk.spec	3 Sep 2008 21:27:51 -0000	1.2
@@ -1,19 +1,17 @@
 Summary:	A console based Jabber client
 Name:		freetalk
-Version:	3.0
-Release:	2%{?dist}
+Version:	3.1
+Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
 URL:		http://www.gnu.org/software/freetalk/
 Source0:	http://sv.gnu.org/download/freetalk/%{name}-%{version}.tar.gz
 
-Patch0:		%{name}-%{version}-open.patch
-
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	words
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
+Requires(post): info
+Requires(preun): info
 
 BuildRequires:	gettext
 BuildRequires:	guile-devel
@@ -21,13 +19,12 @@
 BuildRequires:	readline-devel
 
 %description
-Freetalk is a console based Jabber client. It features a readline interface
+GNU Freetalk is a console based Jabber client. It features a readline interface
 with completion of buddy names, commands, and even ordinary English words.
 Freetalk is extensible, configurable, and scriptable through a Guile interface.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure --disable-rpath
@@ -40,6 +37,11 @@
 
 rm -rf $RPM_BUILD_ROOT%{_infodir}/dir
 
+# Move examples from /usr/share/doc/freetalk to RPM_BUILD_DIR.
+# To be later listed against %doc.
+rm -rf ./examples
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}/examples .
+
 %find_lang %{name}
 
 # Files containing shebangs need to have the executable bits.
@@ -49,11 +51,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %preun
 if [ $1 = 0 ]; then
-  /sbin/install-info --delete %{_infodir}/%{name}.info.gz \
+  /sbin/install-info --delete %{_infodir}/%{name}.info \
   %{_infodir}/dir >/dev/null 2>&1 || :
 fi
 
@@ -64,14 +66,19 @@
 %doc COPYING
 %doc NEWS
 %doc README
+%doc examples
+%doc %{_infodir}/%{name}.info*
+%doc %{_mandir}/man1/%{name}.1*
 %{_bindir}/%{name}
-%{_infodir}/%{name}.info.gz
-%{_mandir}/man1/%{name}.1.gz
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/extensions
 
 %changelog
+* Wed Sep 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.1-1
+- Version bump to 0.32.
+- open(2) problem fixed by upstream.
+
 * Thu Feb 14 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.0-2
 - Added 'Requires: words'.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freetalk/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Feb 2008 17:00:29 -0000	1.2
+++ sources	3 Sep 2008 21:27:51 -0000	1.3
@@ -1 +1 @@
-6002575edb6f4932165743883cecd4c5  freetalk-3.0.tar.gz
+301272d8e3e83b5902d43d2b993ec0be  freetalk-3.1.tar.gz


--- freetalk-3.0-open.patch DELETED ---



From spot at fedoraproject.org  Wed Sep  3 21:29:14 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 21:29:14 +0000 (UTC)
Subject: rpms/rubygems/devel rubygems.spec,1.4,1.5
Message-ID: <20080903212914.51F8F7002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rubygems/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15613

Modified Files:
	rubygems.spec 
Log Message:
fix license tag


Index: rubygems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/devel/rubygems.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rubygems.spec	11 Sep 2007 21:57:59 -0000	1.4
+++ rubygems.spec	3 Sep 2008 21:28:44 -0000	1.5
@@ -13,9 +13,10 @@
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
 Version: 0.9.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Libraries
-License: Ruby License/GPL
+# No GPL version is specified.
+License: Ruby or GPL+
 URL: http://rubyforge.org/projects/rubygems/
 Source0: http://rubyforge.org/frs/download.php/20989/rubygems-0.9.4.tgz
 Patch0: noarch-gemdir.patch
@@ -87,6 +88,9 @@
 %{ruby_sitelib}/rbconfig/datadir.rb
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.4-2
+- fix license tag
+
 * Fri Jul 27 2007 David Lutterkort <dlutter at redhat.com> - 0.9.4-1
 - Conditionalize so it builds on RHEL4
 



From spot at fedoraproject.org  Wed Sep  3 21:30:41 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 21:30:41 +0000 (UTC)
Subject: rpms/rudeconfig/devel rudeconfig.spec,1.2,1.3
Message-ID: <20080903213041.BCCAB7002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rudeconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15918

Modified Files:
	rudeconfig.spec 
Log Message:
fix license tag


Index: rudeconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rudeconfig/devel/rudeconfig.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rudeconfig.spec	19 Feb 2008 04:59:28 -0000	1.2
+++ rudeconfig.spec	3 Sep 2008 21:30:11 -0000	1.3
@@ -1,10 +1,10 @@
 Name:           rudeconfig
 Version:        5.0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library (C++ API) for reading and writing configuration/.ini files
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://www.rudeserver.com/config
 Source0:        http://www.rudeserver.com/config/download/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +60,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.0.5-3
+- fix license tag
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 5.0.5-2
 - Autorebuild for GCC 4.3
 



From rishi at fedoraproject.org  Wed Sep  3 21:31:08 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Wed,  3 Sep 2008 21:31:08 +0000 (UTC)
Subject: rpms/freetalk/devel .cvsignore, 1.2, 1.3 freetalk.spec, 1.1,
	1.2 sources, 1.2, 1.3 freetalk-3.0-open.patch, 1.1, NONE
Message-ID: <20080903213108.89BBD7002B@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/freetalk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16001

Modified Files:
	.cvsignore freetalk.spec sources 
Removed Files:
	freetalk-3.0-open.patch 
Log Message:
* Wed Sep 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.1-1
- Version bump to 0.32.
- open(2) problem fixed by upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freetalk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Feb 2008 17:00:29 -0000	1.2
+++ .cvsignore	3 Sep 2008 21:30:38 -0000	1.3
@@ -1 +1 @@
-freetalk-3.0.tar.gz
+freetalk-3.1.tar.gz


Index: freetalk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freetalk/devel/freetalk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freetalk.spec	14 Feb 2008 17:00:29 -0000	1.1
+++ freetalk.spec	3 Sep 2008 21:30:38 -0000	1.2
@@ -1,19 +1,17 @@
 Summary:	A console based Jabber client
 Name:		freetalk
-Version:	3.0
-Release:	2%{?dist}
+Version:	3.1
+Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
 URL:		http://www.gnu.org/software/freetalk/
 Source0:	http://sv.gnu.org/download/freetalk/%{name}-%{version}.tar.gz
 
-Patch0:		%{name}-%{version}-open.patch
-
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	words
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
+Requires(post): info
+Requires(preun): info
 
 BuildRequires:	gettext
 BuildRequires:	guile-devel
@@ -21,13 +19,12 @@
 BuildRequires:	readline-devel
 
 %description
-Freetalk is a console based Jabber client. It features a readline interface
+GNU Freetalk is a console based Jabber client. It features a readline interface
 with completion of buddy names, commands, and even ordinary English words.
 Freetalk is extensible, configurable, and scriptable through a Guile interface.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure --disable-rpath
@@ -40,6 +37,11 @@
 
 rm -rf $RPM_BUILD_ROOT%{_infodir}/dir
 
+# Move examples from /usr/share/doc/freetalk to RPM_BUILD_DIR.
+# To be later listed against %doc.
+rm -rf ./examples
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}/examples .
+
 %find_lang %{name}
 
 # Files containing shebangs need to have the executable bits.
@@ -49,11 +51,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %preun
 if [ $1 = 0 ]; then
-  /sbin/install-info --delete %{_infodir}/%{name}.info.gz \
+  /sbin/install-info --delete %{_infodir}/%{name}.info \
   %{_infodir}/dir >/dev/null 2>&1 || :
 fi
 
@@ -64,14 +66,19 @@
 %doc COPYING
 %doc NEWS
 %doc README
+%doc examples
+%doc %{_infodir}/%{name}.info*
+%doc %{_mandir}/man1/%{name}.1*
 %{_bindir}/%{name}
-%{_infodir}/%{name}.info.gz
-%{_mandir}/man1/%{name}.1.gz
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/extensions
 
 %changelog
+* Wed Sep 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.1-1
+- Version bump to 0.32.
+- open(2) problem fixed by upstream.
+
 * Thu Feb 14 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.0-2
 - Added 'Requires: words'.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freetalk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Feb 2008 17:00:29 -0000	1.2
+++ sources	3 Sep 2008 21:30:38 -0000	1.3
@@ -1 +1 @@
-6002575edb6f4932165743883cecd4c5  freetalk-3.0.tar.gz
+301272d8e3e83b5902d43d2b993ec0be  freetalk-3.1.tar.gz


--- freetalk-3.0-open.patch DELETED ---



From spot at fedoraproject.org  Wed Sep  3 21:31:38 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 21:31:38 +0000 (UTC)
Subject: rpms/rzip/devel rzip.spec,1.7,1.8
Message-ID: <20080903213138.ECB577002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rzip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16150

Modified Files:
	rzip.spec 
Log Message:
fix license tag


Index: rzip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rzip/devel/rzip.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rzip.spec	24 Feb 2008 08:07:10 -0000	1.7
+++ rzip.spec	3 Sep 2008 21:31:08 -0000	1.8
@@ -1,9 +1,9 @@
 Name:           rzip
 Version:        2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A large-file compression program
 Group:          Applications/File
-License:        GPL
+License:        GPLv2+
 URL:            http://rzip.samba.org
 Source0:        http://rzip.samba.org/ftp/rzip/%{name}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -37,6 +37,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1-4
+- fix license tag
+
 * Sun Feb 24 2008  Paul P Komkoff Jr <i at stingr.net> - 2.1-3
 - make rzip a PIE
 



From spot at fedoraproject.org  Wed Sep  3 21:36:59 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 21:36:59 +0000 (UTC)
Subject: rpms/qa-assistant/devel qa-assistant.spec,1.13,1.14
Message-ID: <20080903213659.C3AAA7002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/qa-assistant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16602

Modified Files:
	qa-assistant.spec 
Log Message:
fix BR


Index: qa-assistant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qa-assistant/devel/qa-assistant.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- qa-assistant.spec	3 Sep 2008 19:20:10 -0000	1.13
+++ qa-assistant.spec	3 Sep 2008 21:36:29 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           qa-assistant
 Version:        0.4.90.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Graphical quality assurance report generator
 Group:          Development/Tools
 # Only file with versioning is src/gnomeglade.py
@@ -18,7 +18,7 @@
 BuildRequires:  pygtk2-devel >= 2.4.0
 BuildRequires:  pkgconfig
 BuildRequires:  gtk2-devel
-BuildRequires:  gnome-python2 >= 2.10.0
+BuildRequires:  gnome-python2-devel >= 2.10.0
 Requires:       libxml2-python
 Requires:       gnome-python2
 Requires:       gnome-python2-gconf
@@ -136,6 +136,9 @@
 %{_datadir}/xml/%{name}
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.90.5-4
+- fix BR
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.90.5-3
 - fix license tag
 



From spot at fedoraproject.org  Wed Sep  3 21:42:59 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 21:42:59 +0000 (UTC)
Subject: rpms/s3switch/devel s3switch-lrmi.patch, 1.3, 1.4 s3switch.spec,
	1.13, 1.14
Message-ID: <20080903214259.0B3837002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/s3switch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17426

Modified Files:
	s3switch-lrmi.patch s3switch.spec 
Log Message:
fix license tag

s3switch-lrmi.patch:

Index: s3switch-lrmi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/s3switch/devel/s3switch-lrmi.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- s3switch-lrmi.patch	7 Aug 2006 20:29:10 -0000	1.3
+++ s3switch-lrmi.patch	3 Sep 2008 21:42:28 -0000	1.4
@@ -1,10 +1,14 @@
---- Makefile.orig	2002-09-12 01:26:57.000000000 +0300
-+++ Makefile	2004-07-23 12:43:44.000000000 +0300
-@@ -1,5 +1,6 @@
- CC = gcc -g
+--- Makefile.BAD	2008-09-03 17:38:22.000000000 -0400
++++ Makefile	2008-09-03 17:38:38.000000000 -0400
+@@ -1,9 +1,10 @@
+ CFLAGS = -g
+ CC = gcc
 +LDFLAGS = -llrmi
  
  all: s3switch
  
 -s3switch: s3switch.o lrmi.o
 +s3switch: s3switch.o
+ 
+ clean:
+ 	rm -f s3switch *.o


Index: s3switch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s3switch/devel/s3switch.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- s3switch.spec	19 Feb 2008 20:14:47 -0000	1.13
+++ s3switch.spec	3 Sep 2008 21:42:28 -0000	1.14
@@ -1,10 +1,10 @@
 Name:           s3switch
 Version:        0.0
-Release:        10.20020912%{?dist}
+Release:        11.20020912%{?dist}
 Summary:        Manage the output device on S3 Savage chips
 
 Group:          Applications/System
-License:        BSD-like
+License:        MIT
 URL:            http://www.probo.com/timr/savage40.html
 Source0:        http://www.probo.com/timr/s3ssrc.zip
 Source1:        %{name}.pam
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.0-11.20020912
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.0-10.20020912
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Wed Sep  3 19:29:20 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 19:29:20 +0000 (UTC)
Subject: rpms/qps/devel qps.spec,1.15,1.16
Message-ID: <20080903192920.B46687011F@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/qps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29903

Modified Files:
	qps.spec 
Log Message:
fix license tag


Index: qps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qps/devel/qps.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qps.spec	19 Feb 2008 13:01:08 -0000	1.15
+++ qps.spec	3 Sep 2008 19:28:50 -0000	1.16
@@ -1,10 +1,11 @@
 Name:           qps
 Version:        1.9.19
-Release:        0.3.b%{?dist}
+Release:        0.4.b%{?dist}
 Summary:        Visual process status monitor
 
 Group:          Applications/System
-License:        GPL
+# No version specified.
+License:        GPL+
 URL:            http://qps.kldp.net/
 Source0:        http://kldp.net/frs/download.php/3839/qps-1.9.19b.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,6 +52,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.9.19-0.4.b
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.9.19-0.3.b
 - Autorebuild for GCC 4.3
 



From orion at fedoraproject.org  Wed Sep  3 19:39:01 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed,  3 Sep 2008 19:39:01 +0000 (UTC)
Subject: rpms/kompose/devel kompose.spec,1.12,1.13
Message-ID: <20080903193901.435D27002B@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/kompose/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30806

Modified Files:
	kompose.spec 
Log Message:
* Wed Sep 3 2008 Orion Poplawski <orion at cora.nwra.com> - 0.5.3-13
- Change %patch -> %patch0



Index: kompose.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kompose/devel/kompose.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kompose.spec	17 Mar 2008 19:10:36 -0000	1.12
+++ kompose.spec	3 Sep 2008 19:38:30 -0000	1.13
@@ -1,7 +1,7 @@
 Name: kompose
 Summary: Provides a full screen view of all open windows
 Version: 0.5.3
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+
 Group: User Interface/X
 Url: http://kompose.berlios.de
@@ -20,7 +20,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b .x
+%patch0 -p1 -b .x
 
 
 %build
@@ -66,6 +66,9 @@
 %{_datadir}/pixmaps/kompose.png
 
 %changelog
+* Wed Sep 3 2008 Orion Poplawski <orion at cora.nwra.com> - 0.5.3-13
+- Change %%patch -> %%patch0
+
 * Mon Mar 17 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.3-12
 - Drop Requires kdebase3
 



From spot at fedoraproject.org  Wed Sep  3 19:34:51 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 19:34:51 +0000 (UTC)
Subject: rpms/qsynth/devel qsynth.spec,1.4,1.5
Message-ID: <20080903193451.5F01F7011F@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/qsynth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30249

Modified Files:
	qsynth.spec 
Log Message:
fix license tag


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/devel/qsynth.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qsynth.spec	19 Feb 2008 15:59:43 -0000	1.4
+++ qsynth.spec	3 Sep 2008 19:34:21 -0000	1.5
@@ -3,11 +3,11 @@
 Summary: Qt based Fluidsynth GUI front end
 Name: qsynth
 Version: 0.2.5
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL: http://qsynth.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/qsynth/qsynth-%{version}.tar.gz
 Source1: qsynth.desktop
-License: GPL
+License: GPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: hicolor-icon-theme
@@ -70,6 +70,9 @@
 %{_datadir}/applications/%{desktop_vendor}-qsynth.desktop
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.5-8
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2.5-7
 - Autorebuild for GCC 4.3
 



From orion at fedoraproject.org  Wed Sep  3 19:41:48 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed,  3 Sep 2008 19:41:48 +0000 (UTC)
Subject: rpms/ksynaptics/devel ksynaptics.spec,1.9,1.10
Message-ID: <20080903194148.414FE7002B@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/ksynaptics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31091

Modified Files:
	ksynaptics.spec 
Log Message:
* Wed Sep  3 2008 Orion Poplawski <orion at cora.nwra.com> - 0.3.3-6
- Change %patch -> %patch0



Index: ksynaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ksynaptics/devel/ksynaptics.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ksynaptics.spec	5 Aug 2008 17:51:16 -0000	1.9
+++ ksynaptics.spec	3 Sep 2008 19:41:17 -0000	1.10
@@ -1,7 +1,7 @@
 Name:		ksynaptics
 Summary:	KDE configuration for synaptics module
 Version:	0.3.3
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPLv2+
 Group:		Applications/Utilities
 URL:		http://qsynaptics.sourceforge.net/
@@ -19,7 +19,7 @@
 
 %prep 
 %setup -q
-%patch -p1 -b .poll
+%patch0 -p1 -b .poll
 
 %build
 %configure --disable-rpath
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Orion Poplawski <orion at cora.nwra.com> - 0.3.3-6
+- Change %%patch -> %%patch0
+
 * Tue Aug  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.3-6
 - fix license tag
 



From dwalsh at fedoraproject.org  Wed Sep  3 21:46:35 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  3 Sep 2008 21:46:35 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.386,
	1.387 policycoreutils.spec, 1.550, 1.551
Message-ID: <20080903214635.28DEB7002B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19495

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Wed Sep 3 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-2
- Add glob support to restorecond so it can check every file in the homedir


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- policycoreutils-rhat.patch	29 Aug 2008 19:05:24 -0000	1.386
+++ policycoreutils-rhat.patch	3 Sep 2008 21:46:03 -0000	1.387
@@ -1,23 +1,77 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.54/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.55/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.54/Makefile	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/Makefile	2008-08-29 14:34:58.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.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.54/restorecond/restorecond.conf
+diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.55/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.54/restorecond/restorecond.conf	2008-08-06 18:05:28.000000000 -0400
-@@ -1,3 +1,4 @@
++++ policycoreutils-2.0.55/restorecond/restorecond.conf	2008-09-03 17:38:35.000000000 -0400
+@@ -1,7 +1,8 @@
 +/etc/services
  /etc/resolv.conf
  /etc/samba/secrets.tdb
  /etc/mtab
-diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.54/semanage/semanage
+ /var/run/utmp
+ /var/log/wtmp
+-~/public_html
++~/*
+ ~/.mozilla/plugins/libflashplayer.so
+diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/stringslist.c policycoreutils-2.0.55/restorecond/stringslist.c
+--- nsapolicycoreutils/restorecond/stringslist.c	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.55/restorecond/stringslist.c	2008-09-03 17:43:40.000000000 -0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2006 Red Hat 
++ * Copyright (C) 2006, 2008 Red Hat 
+  * see file 'COPYING' for use and warranty information
+  *
+  * This program is free software; you can redistribute it and/or
+@@ -27,6 +27,7 @@
+ #include <stdlib.h>
+ #include "stringslist.h"
+ #include "restorecond.h"
++#include <fnmatch.h>
+ 
+ /* Sorted lists */
+ void strings_list_add(struct stringsList **list, const char *string)
+@@ -57,11 +58,9 @@
+ int strings_list_find(struct stringsList *ptr, const char *string)
+ {
+ 	while (ptr) {
+-		int cmp = strcmp(string, ptr->string);
+-		if (cmp < 0)
+-			return -1;	/* Not on list break out to add */
+-		if (cmp == 0)
+-			return 0;	/* Already on list */
++		int cmp = fnmatch(ptr->string, string, 0);
++		if (cmp == 0) 
++			return 0;	/* Match found */
+ 		ptr = ptr->next;
+ 	}
+ 	return -1;
+@@ -120,6 +119,7 @@
+ 	if (strings_list_diff(list, list1) == 0)
+ 		printf("strings_list_diff test2 bug\n");
+ 	strings_list_add(&list1, "/etc/walsh");
++	strings_list_add(&list1, "/etc/walsh/*");
+ 	strings_list_add(&list1, "/etc/resolv.conf");
+ 	strings_list_add(&list1, "/etc/mtab1");
+ 	if (strings_list_diff(list, list1) == 0)
+@@ -127,6 +127,7 @@
+ 	printf("strings list\n");
+ 	strings_list_print(list);
+ 	printf("strings list1\n");
++	strings_list_find(list1, "/etc/walsh/dan");
+ 	strings_list_print(list1);
+ 	strings_list_free(list);
+ 	strings_list_free(list1);
+diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.55/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.54/semanage/semanage	2008-08-07 08:18:35.000000000 -0400
++++ policycoreutils-2.0.55/semanage/semanage	2008-08-29 14:34:58.000000000 -0400
 @@ -20,7 +20,7 @@
  #                                        02111-1307  USA
  #
@@ -408,9 +462,9 @@
  		errorExit(error.args[1])
 -	except KeyboardInterrupt, error:
 -		sys.exit(0)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.54/semanage/semanage.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.55/semanage/semanage.8
 --- nsapolicycoreutils/semanage/semanage.8	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.54/semanage/semanage.8	2008-08-05 09:58:59.000000000 -0400
++++ policycoreutils-2.0.55/semanage/semanage.8	2008-08-29 14:34:58.000000000 -0400
 @@ -3,7 +3,7 @@
  semanage \- SELinux Policy Management tool
  
@@ -438,9 +492,9 @@
  .TP
  .I                \-r, \-\-range      
  MLS/MCS Security Range (MLS/MCS Systems only)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.54/semanage/seobject.py
+diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.55/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.54/semanage/seobject.py	2008-08-08 17:02:42.000000000 -0400
++++ policycoreutils-2.0.55/semanage/seobject.py	2008-08-29 14:34:58.000000000 -0400
 @@ -26,7 +26,6 @@
  PROGNAME="policycoreutils"
  import sepolgen.module as module


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.550
retrieving revision 1.551
diff -u -r1.550 -r1.551
--- policycoreutils.spec	29 Aug 2008 19:05:25 -0000	1.550
+++ policycoreutils.spec	3 Sep 2008 21:46:04 -0000	1.551
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.55
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Wed Sep 3 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-2
+- Add glob support to restorecond so it can check every file in the homedir
+
 * Thu Aug 28 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-1
 - Update to upstream
 	* Merged semanage node support from Christian Kuester.



From spot at fedoraproject.org  Wed Sep  3 21:50:29 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 21:50:29 +0000 (UTC)
Subject: rpms/rudeconfig/devel rudeconfig-5.0.5-gcc43.patch, NONE,
	1.1 rudeconfig.spec, 1.3, 1.4
Message-ID: <20080903215029.429C37002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rudeconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20548

Modified Files:
	rudeconfig.spec 
Added Files:
	rudeconfig-5.0.5-gcc43.patch 
Log Message:
fix compile with gcc43

rudeconfig-5.0.5-gcc43.patch:

--- NEW FILE rudeconfig-5.0.5-gcc43.patch ---
diff -up rudeconfig-5.0.5/src/File.h.BAD rudeconfig-5.0.5/src/File.h
--- rudeconfig-5.0.5/src/File.h.BAD	2008-09-03 17:43:17.000000000 -0400
+++ rudeconfig-5.0.5/src/File.h	2008-09-03 17:45:13.000000000 -0400
@@ -39,6 +39,9 @@
 #define INCLUDED_MAP
 #endif
 
+#include <string>
+#include <cstring>
+
 using namespace rude::config;
 
 namespace rude{


Index: rudeconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rudeconfig/devel/rudeconfig.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rudeconfig.spec	3 Sep 2008 21:30:11 -0000	1.3
+++ rudeconfig.spec	3 Sep 2008 21:49:58 -0000	1.4
@@ -8,6 +8,7 @@
 URL:            http://www.rudeserver.com/config
 Source0:        http://www.rudeserver.com/config/download/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         rudeconfig-5.0.5-gcc43.patch
 
 #BuildRequires:  
 #Requires:       
@@ -29,6 +30,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gcc43
 
 %build
 %configure --disable-static
@@ -60,6 +62,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.0.5-4
+- fix compile with gcc43
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.0.5-3
 - fix license tag
 



From spot at fedoraproject.org  Wed Sep  3 21:53:19 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 21:53:19 +0000 (UTC)
Subject: rpms/rudeconfig/devel rudeconfig.spec,1.4,1.5
Message-ID: <20080903215319.B97717002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rudeconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20750

Modified Files:
	rudeconfig.spec 
Log Message:
fix compile with gcc43


Index: rudeconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rudeconfig/devel/rudeconfig.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rudeconfig.spec	3 Sep 2008 21:49:58 -0000	1.4
+++ rudeconfig.spec	3 Sep 2008 21:52:49 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           rudeconfig
 Version:        5.0.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library (C++ API) for reading and writing configuration/.ini files
 
 Group:          System Environment/Libraries



From spot at fedoraproject.org  Wed Sep  3 22:00:44 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  3 Sep 2008 22:00:44 +0000 (UTC)
Subject: rpms/salinfo/devel .cvsignore, 1.4, 1.5 salinfo.spec, 1.16,
	1.17 sources, 1.3, 1.4
Message-ID: <20080903220044.B78107002B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/salinfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21294

Modified Files:
	.cvsignore salinfo.spec sources 
Log Message:
fix license tag, update to 1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/salinfo/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Oct 2006 15:56:53 -0000	1.4
+++ .cvsignore	3 Sep 2008 22:00:14 -0000	1.5
@@ -1,3 +1 @@
-salinfo-1.1.tar.gz
-salinfo_decode-init
-salinfo_decode-sysconfig
+salinfo-1.2.tar.gz


Index: salinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/salinfo/devel/salinfo.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- salinfo.spec	17 Oct 2006 15:52:53 -0000	1.16
+++ salinfo.spec	3 Sep 2008 22:00:14 -0000	1.17
@@ -1,10 +1,10 @@
-Summary: Sal info tool.
+Summary: SAL info tool
 Name: salinfo
-Version: 1.1
-Release: 2%{?dist}
-License: GPL
+Version: 1.2
+Release: 1%{?dist}
+License: GPLv2+
 Group: Utilities/System
-Source: salinfo-%{version}.tar.gz
+Source0: http://www.kernel.org/pub/linux/kernel/people/helgaas/salinfo-%{version}.tar.gz
 Source1:  salinfo_decode-init
 Source2:  salinfo_decode-sysconfig
 ExclusiveOS: Linux
@@ -21,7 +21,7 @@
 and INIT records.
 
 %prep
-%setup
+%setup -q
 
 %build
 make
@@ -42,7 +42,7 @@
 rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %attr(700,root,root) %dir	/var/log/salinfo/raw
 %attr(700,root,root) %dir	/var/log/salinfo/decoded
 %attr(755,root,root)		%{_sbindir}/salinfo_decode
@@ -59,6 +59,10 @@
 chkconfig --add salinfo_decode
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.2-1
+- fix license tag
+- bump to 1.2
+
 * Tue Oct 17 2006 Prarit Bhargava <prarit at redhat.com> 1.1-2
 - updated release with dist argument
 * Tue Sep 19 2006 Prarit Bhargava <prarit at redhat.com> 1.1-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/salinfo/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Oct 2006 15:56:53 -0000	1.3
+++ sources	3 Sep 2008 22:00:14 -0000	1.4
@@ -1,3 +1 @@
-a153be731f40bac259e031daf64b36c1  salinfo-1.1.tar.gz
-610a75846aae65d01b6cc8843061671e  salinfo_decode-init
-bcf2519e6ee7827d2c191562c80df7fa  salinfo_decode-sysconfig
+7c7c733cebe3066628d9a65b114c18e6  salinfo-1.2.tar.gz



From victorv at fedoraproject.org  Wed Sep  3 22:24:40 2008
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Wed,  3 Sep 2008 22:24:40 +0000 (UTC)
Subject: rpms/freemarker/devel freemarker-2.3.13-PyObject.__class__.patch,
	NONE, 1.1 freemarker-2.3.13-build.patch, NONE, 1.1 freemarker.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080903222440.8D37A7002B@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/freemarker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22712/devel

Modified Files:
	.cvsignore sources 
Added Files:
	freemarker-2.3.13-PyObject.__class__.patch 
	freemarker-2.3.13-build.patch freemarker.spec import.log 
Log Message:
Initial version


freemarker-2.3.13-PyObject.__class__.patch:

--- NEW FILE freemarker-2.3.13-PyObject.__class__.patch ---
diff -Nur freemarker-2.3.13/src/freemarker/ext/jython/JythonHashModel.java freemarker-2.3.13.new/src/freemarker/ext/jython/JythonHashModel.java
--- freemarker-2.3.13/src/freemarker/ext/jython/JythonHashModel.java	2008-05-05 22:56:38.000000000 +0400
+++ freemarker-2.3.13.new/src/freemarker/ext/jython/JythonHashModel.java	2008-07-17 03:19:42.000000000 +0400
@@ -137,7 +137,8 @@
         {
             throw new TemplateModelException(e);
         }
-        throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object.__class__.__name__);
+//        throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object.__class__.__name__);
+        throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object);
     }
 
     /**
@@ -157,6 +158,7 @@
         {
             throw new TemplateModelException(e);
         }
-        throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute on an instance of " + object.__class__.__name__);
+//        throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute on an instance of " + object.__class__.__name__);
+        throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute on an instance of " + object);
     }
 }

freemarker-2.3.13-build.patch:

--- NEW FILE freemarker-2.3.13-build.patch ---
diff -Nur freemarker-2.3.13/build.xml freemarker-2.3.13.new/build.xml
--- freemarker-2.3.13/build.xml	2008-05-05 22:56:37.000000000 +0400
+++ freemarker-2.3.13.new/build.xml	2008-07-17 18:10:55.000000000 +0400
@@ -51,6 +51,7 @@
     <property name="lib.jsp12" location="lib/jsp-api-1.2.jar"/>
     <property name="lib.jsp20" location="lib/jsp-api-2.0.jar"/>
     <property name="lib.jsp21" location="lib/jsp-api-2.1.jar"/>
+    <property name="lib.el" location="lib/el-api.jar"/>
 	
     <property name="lib.jython" location="lib/jython.jar"/>
     <!-- If not overridden, use default -->
@@ -74,6 +75,7 @@
     <path id="compile.classpath">
         <path refid="compile.nojsp.classpath"/>
         <pathelement path="${lib.jsp21}"/>
+        <pathelement path="${lib.el}"/>
     </path>
 
     <path id="compile.jsp1.classpath">
@@ -104,7 +106,8 @@
         <pathelement path="${lib.saxpath}"/>
         <pathelement path="${lib.xalan}"/> <!-- Xalan is not included with Sun JRE 1.5 with the old classname! -->
         <pathelement path="${lib.servlet}"/>
-        <pathelement path="${lib.jsp21}"/>
+        <pathelement path="${lib.jsp21}"/>
+        <pathelement path="${lib.el}"/>
         <pathelement path="${lib.logkit}"/>
         <pathelement path="${lib.log4j}"/>
         <pathelement path="${src.dir}"/>
@@ -261,6 +264,7 @@
 
     <target name="fetchlibs" unless="all.libs.present" description="fetch build dependencies and put them in lib directory">
 	<mkdir dir="lib"/>
+<!--
 	<echo>Fetching libraries from server.</echo>
 	<get src="${libs.location}/README.txt" dest="lib/README.txt" usetimestamp="true"/>
 	<get src="${libs.location}/ant.jar" dest="lib/ant.jar" usetimestamp="true"/>
@@ -283,6 +287,7 @@
 	<get src="${libs.location}/jsp-api-2.0.jar" dest="lib/jsp-api-2.0.jar" usetimestamp="true"/>
 	<get src="${libs.location}/jsp-api-2.1.jar" dest="lib/jsp-api-2.1.jar" usetimestamp="true"/>
 	<get src="${libs.location}/xalan.jar" dest="lib/xalan.jar" usetimestamp="true"/>
+!-->
     </target>
 
     <target name="init">
@@ -445,11 +450,11 @@
         <antcall target="compile-logkit"/>
         <antcall target="compile-jdk14"/>
         <antcall target="compile-jdk15"/>
-        <antcall target="compile-jsp1"/>
+<!--        <antcall target="compile-jsp1"/> -->
         <antcall target="compile-jsp2"/>
         <antcall target="compile-jython"/>
         <antcall target="compile-dom4j"/>
-        <antcall target="compile-jdom"/>
+<!--        <antcall target="compile-jdom"/> -->
         <antcall target="compile-xalan"/>
         <antcall target="compile-jaxen"/>
         <antcall target="compile-rhino"/>


--- NEW FILE freemarker.spec ---
%define checkForbiddenJARFiles F=`find -type f -iname '*.jar'`; [ ! -z "$F" ] && \
echo "ERROR: Sources should not contain JAR files:" && echo "$F" && exit 1

%define fm_compatible_ver 2.3
%define fm_ver %{fm_compatible_ver}.13

Name:           freemarker
Version:        %{fm_ver}
Release:        4%{?dist}
Summary:        FreeMarker template engine

Group:          Development/Libraries
License:        BSD
URL:            http://freemarker.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz

# disabled functionality: ext/jdom, ext/jsp/FreeMarkerPageContext1, ext/xml/JdomNavigator
Patch0:         %{name}-%{version}-build.patch

Patch1:         %{name}-%{version}-PyObject.__class__.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires: ant >= 1.6
BuildRequires: ant-nodeps >= 1.6
BuildRequires: avalon-logkit >= 1.2
BuildRequires: dom4j >= 1.6.1
BuildRequires: dos2unix
BuildRequires: emma >= 2.0
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: javacc >= 4.0
BuildRequires: jaxen >= 1.1
BuildRequires: jdom >= 1.0
BuildRequires: jpackage-utils
BuildRequires: junit >= 3.8.2
BuildRequires: jython >= 2.2.1
BuildRequires: log4j >= 1.2
BuildRequires: rhino >= 1.6
BuildRequires: struts >= 1.2.9
BuildRequires: tomcat5-jsp-2.0-api >= 5.5.26
BuildRequires: tomcat5-servlet-2.4-api >= 5.5
BuildRequires: tomcat6-servlet-2.5-api >= 6.0
BuildRequires: tomcat6-lib >= 6.0.16
BuildRequires: xalan-j2 >= 2.7.0

Requires: java >= 1:1.6.0
Requires: jpackage-utils

%description
FreeMarker is a Java tool to generate text output based on templates.
It is designed to be practical as a template engine to generate web
pages and particularly for servlet-based page production that follows
the MVC (Model View Controller) pattern. That is, you can separate the
work of Java programmers and website designers - Java programmers
needn't know how to design nice websites, and website designers needn't
know Java programming.

%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 -n %{name}-%{version}

find -type f \( -iname '*.jar' -o -iname '*.class' \)  -exec rm -f '{}' \;

%patch0 -p1 -b .sav
%patch1 -p1

# %{__rm} -rf src/freemarker/core/ParseException.java
%{__rm} -rf src/freemarker/core/FMParser.java
%{__rm} -rf src/freemarker/core/FMParserConstants.java
%{__rm} -rf src/freemarker/core/FMParserTokenManager.java
%{__rm} -rf src/freemarker/core/SimpleCharStream.java
%{__rm} -rf src/freemarker/core/Token.java
%{__rm} -rf src/freemarker/core/TokenMgrError.java

%{__ln_s} -f %{_javadir}/ant.jar           lib/ant.jar
%{__ln_s} -f %{_javadir}/dom4j.jar         lib/dom4j.jar
%{__ln_s} -f %{_javadir}/emma_ant.jar      lib/emma_ant.jar
%{__ln_s} -f %{_javadir}/emma.jar          lib/emma.jar
%{__ln_s} -f %{_javadir}/javacc.jar        lib/javacc.jar
%{__ln_s} -f %{_javadir}/jaxen.jar         lib/jaxen.jar
%{__ln_s} -f %{_javadir}/jdom.jar          lib/jdom.jar
# js.jsr provided by rhino package
%{__ln_s} -f %{_javadir}/js.jar            lib/js.jar

# The JavaServer Pages 1.2 technology isn't provided in Fedora 10
#%{__ln_s} -f %{_javadir}/jsp-api-1.2.jar   lib/jsp-api-1.2.jar

%{__ln_s} -f %{_javadir}/tomcat5-jsp-2.0-api.jar  lib/jsp-api-2.0.jar

%{__ln_s} -f %{_javadir}/tomcat6-jsp-2.1-api.jar  lib/jsp-api-2.1.jar

%{__ln_s} -f %{_javadir}/junit.jar         lib/junit.jar
%{__ln_s} -f %{_javadir}/jython.jar        lib/jython.jar
%{__ln_s} -f %{_javadir}/log4j.jar         lib/log4j.jar
%{__ln_s} -f %{_javadir}/avalon-logkit.jar lib/logkit.jar

# It doesn't required due to OpenJDK 6 is used
#%{__ln_s} -f %{_javadir}/rt122.jar         lib/rt122.jar

# SAXPath has been merged into the Jaxen codebase and is 
# no longer being maintained separately. See jaxen-1.1.jar
#%{__ln_s} -f %{_javadir}/saxpath.jar       lib/saxpath.jar

# The package javax.el isn't included in:
%{__ln_s} -f %{_javadir}/tomcat6-servlet-2.5-api.jar lib/servlet.jar
# so, el-api.jar is additionally used.
%{__ln_s} -f %{_javadir}/tomcat6/el-api.jar lib/el-api.jar

%{__ln_s} -f %{_javadir}/struts.jar        lib/struts.jar
%{__ln_s} -f %{_javadir}/xalan-j2.jar      lib/xalan.jar

dos2unix -k docs/docs/api/stylesheet.css
dos2unix -k docs/docs/api/package-list

%checkForbiddenJARFiles

%build
%{ant}

%install
%{__rm} -rf %{buildroot}

# jars
%{__install} -d -m 755 %{buildroot}%{_javadir}
%{__install} -m 644 lib/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
# The freemarker 2.2 isn't compatible with 2.3.
%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{fm_compatible_ver}.jar

# javadoc
%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}
%{__cp} -pr docs/docs/api/* %{buildroot}%{_javadocdir}/%{name}

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_javadir}/*.jar
%doc LICENSE.txt README.txt

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}

%changelog
* Mon Sep 01 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 2.3.13-4
- Redundant dependency upon xerces-j2 is removed (#456276#c6)
- The dos2unix package is added as the build requirements
- The ant-nodeps build-time requirement is added

* Wed Aug 20 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 2.3.13-3
- The downloads.sourceforge.net host is used in the source URL
- %%{__install} and %%{__cp} are used everywhere
- %%defattr(-,root,root,-) is used everywhere

* Fri Aug 14 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 2.3.13-2
- Appropriate values of Group Tags are chosen from the official list
- Versions of java-devel & jpackage-utils are corrected
- Name of dir for javadoc is changed
- Manual is removed due to http://freemarker.org/docs/index.html

* Fri Jun 06 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 2.3.13-1
- Initial version


--- NEW FILE import.log ---
freemarker-2_3_13-4_fc10:HEAD:freemarker-2.3.13-4.fc10.src.rpm:1220480615


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freemarker/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:25:03 -0000	1.1
+++ .cvsignore	3 Sep 2008 22:24:10 -0000	1.2
@@ -0,0 +1 @@
+freemarker-2.3.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freemarker/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:25:03 -0000	1.1
+++ sources	3 Sep 2008 22:24:10 -0000	1.2
@@ -0,0 +1 @@
+8201b01e09828bd268522ed66b50a236  freemarker-2.3.13.tar.gz



From victorv at fedoraproject.org  Wed Sep  3 22:28:19 2008
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Wed,  3 Sep 2008 22:28:19 +0000 (UTC)
Subject: rpms/ini4j/devel LICENSE-2.0.txt, NONE, 1.1 import.log, NONE,
	1.1 ini4j-0.3.2-pom.xml.patch, NONE, 1.1 ini4j.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080903222819.D332C7002B@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/ini4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23141/devel

Modified Files:
	.cvsignore sources 
Added Files:
	LICENSE-2.0.txt import.log ini4j-0.3.2-pom.xml.patch 
	ini4j.spec 
Log Message:
Initial version



--- NEW FILE LICENSE-2.0.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 [yyyy] [name of copyright owner]

   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.


--- NEW FILE import.log ---
ini4j-0_3_2-4_fc10:HEAD:ini4j-0.3.2-4.fc10.src.rpm:1220480845

ini4j-0.3.2-pom.xml.patch:

--- NEW FILE ini4j-0.3.2-pom.xml.patch ---
diff -Nur ini4j-0.3.2/pom.xml ini4j-0.3.2.new/pom.xml
--- ini4j-0.3.2/pom.xml	2008-02-17 18:40:22.000000000 +0300
+++ ini4j-0.3.2.new/pom.xml	2008-07-10 17:24:13.000000000 +0400
@@ -54,6 +54,7 @@
             <version>2.3</version>
             <scope>provided</scope>
         </dependency>
+<!--
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -78,6 +79,7 @@
             <version>2.3</version>
             <scope>test</scope>
         </dependency>
+!-->
     </dependencies>
     
     <build>
@@ -106,6 +108,7 @@
                 </configuration>
             </plugin>
             
+<!--
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>retrotranslator-maven-plugin</artifactId>
@@ -121,6 +124,7 @@
                     </execution>
                 </executions>
             </plugin>            
+!-->
             
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -140,6 +144,7 @@
                 </configuration>
             </plugin>
             
+<!--
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
@@ -162,7 +167,7 @@
                     </execution>
                 </executions>
             </plugin>            
-            
+!-->            
         </plugins>
     </build>
     


--- NEW FILE ini4j.spec ---
Name:           ini4j
Version:        0.3.2
Release:        4%{?dist}
Summary:        Java API for handling files in Windows .ini format

Group:          Development/Libraries
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


BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

# Recommended by http://fedoraproject.org/wiki/Packaging/Java
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:  java-devel >= 1:1.6.0
BuildRequires:  maven2 >= 2.0.4
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

Requires:       jpackage-utils
Requires:       java >= 1:1.6.0

Requires(post):       jpackage-utils
Requires(postun):     jpackage-utils

%description
The [ini4j] is a simple Java API for handling configuration files in Windows 
.ini format. Additionally, the library includes Java Preferences API 
implementation based on the .ini file.

%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

cp -a %{SOURCE1} ./LICENSE-2.0.txt

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

%install
%{__rm} -rf %{buildroot}

# JAR
%{__mkdir_p} %{buildroot}%{_javadir}
%{__cp} -p target/%{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}

%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

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* 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.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ini4j/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:25:46 -0000	1.1
+++ .cvsignore	3 Sep 2008 22:27:49 -0000	1.2
@@ -0,0 +1 @@
+ini4j-0.3.2-src.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ini4j/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:25:46 -0000	1.1
+++ sources	3 Sep 2008 22:27:49 -0000	1.2
@@ -0,0 +1 @@
+2c499f245b1668b51dd09e894f62b484  ini4j-0.3.2-src.zip



From cweyl at fedoraproject.org  Wed Sep  3 22:55:18 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed,  3 Sep 2008 22:55:18 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Pg/devel import.log, NONE,
	1.1 perl-DateTime-Format-Pg.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080903225518.D3F357002B@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-serv24402/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DateTime-Format-Pg.spec 
Log Message:
initial import



--- NEW FILE import.log ---
perl-DateTime-Format-Pg-0_16002-1_fc9:HEAD:perl-DateTime-Format-Pg-0.16002-1.fc9.src.rpm:1220482480


--- NEW FILE perl-DateTime-Format-Pg.spec ---
Name:           perl-DateTime-Format-Pg
Version:        0.16002
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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

BuildRequires:  perl(DateTime)                  >= 0.10
BuildRequires:  perl(DateTime::Format::Builder) >= 0.72
BuildRequires:  perl(DateTime::TimeZone)        >= 0.05
BuildRequires:  perl(ExtUtils::MakeMaker)
# tests
BuildRequires:  perl(Test::More)
# optional tests
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)

#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
in order to create DateTime or DateTime::Duration objects, and it can take
a DateTime or DateTime::Duration object and produce a string representing
it in a format accepted by PostgreSQL.

%prep
%setup -q -n DateTime-Format-Pg-%{version}

cat README | iconv -f iso8859-1 -t utf8 > foo ; mv foo README

perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/*.t

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README t/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Aug 24 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.16002-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Pg/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:35:09 -0000	1.1
+++ .cvsignore	3 Sep 2008 22:54:48 -0000	1.2
@@ -0,0 +1 @@
+DateTime-Format-Pg-0.16002.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Pg/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:35:09 -0000	1.1
+++ sources	3 Sep 2008 22:54:48 -0000	1.2
@@ -0,0 +1 @@
+381bb4e599cae0da2c0c8a48d4b0e759  DateTime-Format-Pg-0.16002.tar.gz



From cweyl at fedoraproject.org  Wed Sep  3 22:56:00 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed,  3 Sep 2008 22:56:00 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Pg/devel perl-DateTime-Format-Pg.spec, 1.1,
	1.2
Message-ID: <20080903225600.6EE047002B@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-serv24602

Modified Files:
	perl-DateTime-Format-Pg.spec 
Log Message:
release bump


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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-DateTime-Format-Pg.spec	3 Sep 2008 22:54:48 -0000	1.1
+++ perl-DateTime-Format-Pg.spec	3 Sep 2008 22:55:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-Pg
 Version:        0.16002
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Parse and format PostgreSQL dates and times
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -65,5 +65,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 03 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.16002-2
+- bump
+
 * Sun Aug 24 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.16002-1
 - Specfile autogenerated by cpanspec 1.77.



From cweyl at fedoraproject.org  Wed Sep  3 22:56:41 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed,  3 Sep 2008 22:56:41 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Pg/F-8 import.log, NONE,
	1.1 perl-DateTime-Format-Pg.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080903225641.BB38F7002B@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DateTime-Format-Pg/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24768

Modified Files:
	sources 
Added Files:
	import.log perl-DateTime-Format-Pg.spec 
Log Message:
pseudo-branch of perl-DateTime-Format-Pg to F-8


--- NEW FILE import.log ---
perl-DateTime-Format-Pg-0_16002-1_fc9:HEAD:perl-DateTime-Format-Pg-0.16002-1.fc9.src.rpm:1220482480


--- NEW FILE perl-DateTime-Format-Pg.spec ---
Name:           perl-DateTime-Format-Pg
Version:        0.16002
Release:        2%{?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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

BuildRequires:  perl(DateTime)                  >= 0.10
BuildRequires:  perl(DateTime::Format::Builder) >= 0.72
BuildRequires:  perl(DateTime::TimeZone)        >= 0.05
BuildRequires:  perl(ExtUtils::MakeMaker)
# tests
BuildRequires:  perl(Test::More)
# optional tests
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)

#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
in order to create DateTime or DateTime::Duration objects, and it can take
a DateTime or DateTime::Duration object and produce a string representing
it in a format accepted by PostgreSQL.

%prep
%setup -q -n DateTime-Format-Pg-%{version}

cat README | iconv -f iso8859-1 -t utf8 > foo ; mv foo README

perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/*.t

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README t/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Sep 03 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.16002-2
- bump

* Sun Aug 24 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.16002-1
- Specfile autogenerated by cpanspec 1.77.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Pg/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:35:09 -0000	1.1
+++ sources	3 Sep 2008 22:56:11 -0000	1.2
@@ -0,0 +1 @@
+381bb4e599cae0da2c0c8a48d4b0e759  DateTime-Format-Pg-0.16002.tar.gz



From cweyl at fedoraproject.org  Wed Sep  3 23:00:38 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed,  3 Sep 2008 23:00:38 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Pg/F-9 import.log, NONE,
	1.1 perl-DateTime-Format-Pg.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080903230038.CF26F7002B@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DateTime-Format-Pg/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25075

Modified Files:
	sources 
Added Files:
	import.log perl-DateTime-Format-Pg.spec 
Log Message:
pseudo-branch of perl-DateTime-Format-Pg to F-9


--- NEW FILE import.log ---
perl-DateTime-Format-Pg-0_16002-1_fc9:HEAD:perl-DateTime-Format-Pg-0.16002-1.fc9.src.rpm:1220482480


--- NEW FILE perl-DateTime-Format-Pg.spec ---
Name:           perl-DateTime-Format-Pg
Version:        0.16002
Release:        2%{?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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

BuildRequires:  perl(DateTime)                  >= 0.10
BuildRequires:  perl(DateTime::Format::Builder) >= 0.72
BuildRequires:  perl(DateTime::TimeZone)        >= 0.05
BuildRequires:  perl(ExtUtils::MakeMaker)
# tests
BuildRequires:  perl(Test::More)
# optional tests
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)

#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
in order to create DateTime or DateTime::Duration objects, and it can take
a DateTime or DateTime::Duration object and produce a string representing
it in a format accepted by PostgreSQL.

%prep
%setup -q -n DateTime-Format-Pg-%{version}

cat README | iconv -f iso8859-1 -t utf8 > foo ; mv foo README

perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/*.t

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README t/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Sep 03 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.16002-2
- bump

* Sun Aug 24 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.16002-1
- Specfile autogenerated by cpanspec 1.77.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Pg/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:35:09 -0000	1.1
+++ sources	3 Sep 2008 23:00:08 -0000	1.2
@@ -0,0 +1 @@
+381bb4e599cae0da2c0c8a48d4b0e759  DateTime-Format-Pg-0.16002.tar.gz



From ssp at fedoraproject.org  Wed Sep  3 23:03:35 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Wed,  3 Sep 2008 23:03:35 +0000 (UTC)
Subject: rpms/metacity/F-9 metacity.spec,1.152,1.153
Message-ID: <20080903230335.5354A7002B@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/metacity/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25377

Modified Files:
	metacity.spec 
Log Message:
Rebuild


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/F-9/metacity.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- metacity.spec	23 Aug 2008 17:20:58 -0000	1.152
+++ metacity.spec	3 Sep 2008 23:03:04 -0000	1.153
@@ -1,7 +1,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: 2.22.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.22/metacity-%{version}.tar.bz2
 Patch0: default-theme.patch
@@ -160,6 +160,9 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Wed Sep 3 2008 Soren Sandmann <sandmann at redhat.com> - 2.22.0-5
+- Rebuild
+
 * Sat Aug 23 2008 Soren Sandmann <sandmann at redhat.com> - 2.22.0-4
 - Fix memory corruption that caused vertical maximization to be flaky.
   (GNOME bug 468075)



From ajax at fedoraproject.org  Wed Sep  3 23:41:50 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  3 Sep 2008 23:41:50 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel gitignore, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.46, 1.47 sources, 1.41,
	1.42 xorg-x11-server.spec, 1.345, 1.346 commitid, 1.17,
	NONE make-git-snapshot.sh, 1.2,
	NONE xserver-1.4.99-exa-master-upgrade.patch, 1.3,
	NONE xserver-1.5.0-enable-selinux.patch, 1.1,
	NONE xserver-1.5.0-no-evdev-keyboards-kthnx.patch, 1.2,
	NONE xserver-1.5.0-xkb-fix-ProcXkbSetXYZ-to-work-on-all.patch,
	1.1, NONE
Message-ID: <20080903234150.6E7C67002B@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-serv27440/devel

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
Added Files:
	gitignore import.log 
Removed Files:
	commitid make-git-snapshot.sh 
	xserver-1.4.99-exa-master-upgrade.patch 
	xserver-1.5.0-enable-selinux.patch 
	xserver-1.5.0-no-evdev-keyboards-kthnx.patch 
	xserver-1.5.0-xkb-fix-ProcXkbSetXYZ-to-work-on-all.patch 
Log Message:
xserver 1.5.0.



--- NEW FILE gitignore ---
Makefile
Makefile.in
.deps
.libs
.msg
*.lo
*.la
*.a
*.o
*~
.*sw?
*.pbxuser
*.mode1v3
obj*
build*
local
aclocal.m4
autom4te.cache
compile
config.guess
config.log
config.status
config.sub
configure
configure.lineno
depcomp
install-sh
libtool
ltmain.sh
missing
TAGS
tags
ylwrap
xorg-server.pc
stamp-h?
do-not-use-config.h
do-not-use-config.h.in
afb/afbbltC.c
afb/afbbltCI.c
afb/afbbltG.c
afb/afbbltO.c
afb/afbbltX.c
afb/afbseg.c
afb/afbtileC.c
afb/afbtileG.c
cfb/cfb8lineCO.c
cfb/cfb8lineCP.c
cfb/cfb8lineG.c
cfb/cfb8lineX.c
cfb/cfb8segC.c
cfb/cfb8segCS.c
cfb/cfb8segX.c
cfb/cfb8setG.c
cfb/cfbbltC.c
cfb/cfbbltG.c
cfb/cfbbltO.c
cfb/cfbbltX.c
cfb/cfbfillarcC.c
cfb/cfbfillarcG.c
cfb/cfbglrop8.c
cfb/cfbply1rctC.c
cfb/cfbply1rctG.c
cfb/cfbseg.c
cfb/cfbsolidC.c
cfb/cfbsolidG.c
cfb/cfbsolidX.c
cfb/cfbtile32C.c
cfb/cfbtile32G.c
cfb/cfbtileoddC.c
cfb/cfbtileoddG.c
cfb/cfbzerarcC.c
cfb/cfbzerarcG.c
cfb/cfbzerarcX.c
cfb32/cfb8lineCO.c
cfb32/cfb8lineCP.c
cfb32/cfb8lineG.c
cfb32/cfb8lineX.c
cfb32/cfb8segC.c
cfb32/cfb8segCS.c
cfb32/cfb8segX.c
cfb32/cfb8setG.c
cfb32/cfbbltC.c
cfb32/cfbbltG.c
cfb32/cfbbltO.c
cfb32/cfbbltX.c
cfb32/cfbfillarcC.c
cfb32/cfbfillarcG.c
cfb32/cfbply1rctC.c
cfb32/cfbply1rctG.c
cfb32/cfbseg.c
cfb32/cfbsolidC.c
cfb32/cfbsolidG.c
cfb32/cfbsolidX.c
cfb32/cfbtile32C.c
cfb32/cfbtile32G.c
cfb32/cfbtileoddC.c
cfb32/cfbtileoddG.c
cfb32/cfbzerarcC.c
cfb32/cfbzerarcG.c
cfb32/cfbzerarcX.c
doc/Xserver.1x
doc/Xserver.man
hw/dmx/Xdmx
hw/dmx/Xdmx.1x
hw/dmx/config/dmxtodmx
hw/dmx/config/dmxtodmx.1x
hw/dmx/config/parser.c
hw/dmx/config/parser.h
hw/dmx/config/scanner.c
hw/dmx/config/vdltodmx
hw/dmx/config/vdltodmx.1x
hw/dmx/config/xdmxconfig
hw/dmx/config/xdmxconfig.1x
hw/dmx/examples/dmxaddinput
hw/dmx/examples/dmxaddscreen
hw/dmx/examples/dmxreconfig
hw/dmx/examples/dmxresize
hw/dmx/examples/dmxrminput
hw/dmx/examples/dmxrmscreen
hw/dmx/examples/dmxwininfo
hw/dmx/examples/ev
hw/dmx/examples/evi
hw/dmx/examples/res
hw/dmx/examples/xbell
hw/dmx/examples/xdmx
hw/dmx/examples/xinput
hw/dmx/examples/xled
hw/dmx/examples/xtest
hw/kdrive/ati/Xati
hw/kdrive/chips/Xchips
hw/kdrive/ephyr/Xephyr
hw/kdrive/epson/Xepson
hw/kdrive/fake/Xfake
hw/kdrive/fbdev/Xfbdev
hw/kdrive/i810/Xi810
hw/kdrive/mach64/Xmach64
hw/kdrive/mga/Xmga
hw/kdrive/neomagic/Xneomagic
hw/kdrive/nvidia/Xnvidia
hw/kdrive/pm2/Xpm2
hw/kdrive/r128/Xr128
hw/kdrive/sdl/Xsdl
hw/kdrive/sis300/Xsis
hw/kdrive/smi/Xsmi
hw/kdrive/vesa/Xvesa
hw/kdrive/via/Xvia
hw/vfb/Xvfb
hw/vfb/Xvfb.1x
hw/vfb/Xvfb.man
hw/xfree86/Xorg
hw/xfree86/common/xf86Build.h
hw/xfree86/common/xf86DefModeSet.c
hw/xfree86/doc/man/Xorg.1x
hw/xfree86/doc/man/Xorg.man
hw/xfree86/doc/man/xorg.conf.5x
hw/xfree86/doc/man/xorg.conf.man
hw/xfree86/exa/exa.4
hw/xfree86/exa/exa.4x
hw/xfree86/exa/exa.man
hw/xfree86/fbdevhw/fbdevhw.4x
hw/xfree86/fbdevhw/fbdevhw.man
hw/xfree86/getconfig/cfg.man
hw/xfree86/getconfig/getconfig.1x
hw/xfree86/getconfig/getconfig.5x
hw/xfree86/getconfig/getconfig.man
hw/xfree86/os-support/xorgos.c
hw/xfree86/osandcommon.c
hw/xfree86/ramdac/xf86BitOrder.c
hw/xfree86/scanpci/xf86PciData.c
hw/xfree86/scanpci/xf86PciIds.h
hw/xfree86/utils/cvt/cvt
hw/xfree86/utils/cvt/cvt.man
hw/xfree86/utils/gtf/gtf
hw/xfree86/utils/gtf/gtf.1x
hw/xfree86/utils/gtf/gtf.man
hw/xfree86/utils/ioport/inb
hw/xfree86/utils/ioport/inl
hw/xfree86/utils/ioport/inw
hw/xfree86/utils/ioport/ioport
hw/xfree86/utils/ioport/outb
hw/xfree86/utils/ioport/outl
hw/xfree86/utils/ioport/outw
hw/xfree86/utils/pcitweak/pcitweak
hw/xfree86/utils/pcitweak/pcitweak.1x
hw/xfree86/utils/pcitweak/pcitweak.man
hw/xfree86/utils/scanpci/scanpci
hw/xfree86/utils/scanpci/scanpci.1x
hw/xfree86/utils/scanpci/scanpci.man
hw/xfree86/utils/xorgcfg/XOrgCfg
hw/xfree86/utils/xorgcfg/xorgcfg
hw/xfree86/utils/xorgcfg/xorgcfg.1x
hw/xfree86/utils/xorgcfg/xorgcfg.man
hw/xfree86/utils/xorgconfig/xorgconfig
hw/xfree86/utils/xorgconfig/xorgconfig.1x
hw/xfree86/utils/xorgconfig/xorgconfig.man
hw/xfree86/xaa/l-xaaBitmap.c
hw/xfree86/xaa/l-xaaStipple.c
hw/xfree86/xaa/l-xaaTEGlyph.c
hw/xfree86/xaa/l3-xaaBitmap.c
hw/xfree86/xaa/l3-xaaStipple.c
hw/xfree86/xaa/lf-xaaBitmap.c
hw/xfree86/xaa/lf-xaaStipple.c
hw/xfree86/xaa/lf-xaaTEGlyph.c
hw/xfree86/xaa/lf3-xaaBitmap.c
hw/xfree86/xaa/lf3-xaaStipple.c
hw/xfree86/xaa/m-xaaBitmap.c
hw/xfree86/xaa/m-xaaStipple.c
hw/xfree86/xaa/m-xaaTEGlyph.c
hw/xfree86/xaa/m3-xaaBitmap.c
hw/xfree86/xaa/m3-xaaStipple.c
hw/xfree86/xaa/mf-xaaBitmap.c
hw/xfree86/xaa/mf-xaaStipple.c
hw/xfree86/xaa/mf-xaaTEGlyph.c
hw/xfree86/xaa/mf3-xaaBitmap.c
hw/xfree86/xaa/mf3-xaaStipple.c
hw/xfree86/xaa/s-xaaDashLine.c
hw/xfree86/xaa/s-xaaLine.c
hw/xfree86/xf1bpp/maskbits.c
hw/xfree86/xf1bpp/mfbbitblt.c
hw/xfree86/xf1bpp/mfbbltC.c
hw/xfree86/xf1bpp/mfbbltCI.c
hw/xfree86/xf1bpp/mfbbltG.c
hw/xfree86/xf1bpp/mfbbltO.c
hw/xfree86/xf1bpp/mfbbltX.c
hw/xfree86/xf1bpp/mfbbres.c
hw/xfree86/xf1bpp/mfbbresd.c
hw/xfree86/xf1bpp/mfbclip.c
hw/xfree86/xf1bpp/mfbcmap.c
hw/xfree86/xf1bpp/mfbfillarc.c
hw/xfree86/xf1bpp/mfbfillrct.c
hw/xfree86/xf1bpp/mfbfillsp.c
hw/xfree86/xf1bpp/mfbfont.c
hw/xfree86/xf1bpp/mfbgc.c
hw/xfree86/xf1bpp/mfbgetsp.c
hw/xfree86/xf1bpp/mfbigbblak.c
hw/xfree86/xf1bpp/mfbigbwht.c
hw/xfree86/xf1bpp/mfbhrzvert.c
hw/xfree86/xf1bpp/mfbimage.c
hw/xfree86/xf1bpp/mfbline.c
hw/xfree86/xf1bpp/mfbmisc.c
hw/xfree86/xf1bpp/mfbpablack.c
hw/xfree86/xf1bpp/mfbpainv.c
hw/xfree86/xf1bpp/mfbpawhite.c
hw/xfree86/xf1bpp/mfbpgbblak.c
hw/xfree86/xf1bpp/mfbpgbinv.c
hw/xfree86/xf1bpp/mfbpgbwht.c
hw/xfree86/xf1bpp/mfbpixmap.c
hw/xfree86/xf1bpp/mfbplyblack.c
hw/xfree86/xf1bpp/mfbplyinv.c
hw/xfree86/xf1bpp/mfbplywhite.c
hw/xfree86/xf1bpp/mfbpntwin.c
hw/xfree86/xf1bpp/mfbpolypnt.c
hw/xfree86/xf1bpp/mfbpushpxl.c
hw/xfree86/xf1bpp/mfbscrclse.c
hw/xfree86/xf1bpp/mfbscrinit.c
hw/xfree86/xf1bpp/mfbseg.c
hw/xfree86/xf1bpp/mfbsetsp.c
hw/xfree86/xf1bpp/mfbteblack.c
hw/xfree86/xf1bpp/mfbtewhite.c
hw/xfree86/xf1bpp/mfbtileC.c
hw/xfree86/xf1bpp/mfbtileG.c
hw/xfree86/xf1bpp/mfbwindow.c
hw/xfree86/xf1bpp/mfbzerarc.c
hw/xfree86/xf4bpp/mfbseg.c
hw/xfree86/xf8_32bpp/cfbgc32.c
hw/xfree86/xf8_32bpp/cfbgc8.c
hw/xfree86/xorg.c
hw/xfree86/xorg.conf.example
hw/xfree86/xorg.conf.example.pre
hw/xnest/Xnest
hw/xnest/Xnest.1x
hw/xnest/Xnest.man
hw/xprint/Xprt
hw/xprint/config/C/print/Xprinters.ghostscript
hw/xprint/doc/Xprt.1x
hw/xprint/doc/Xprt.man
hw/xprint/dpmsstubs-wrapper.c
hw/xprint/miinitext-wrapper.c
include/dix-config.h
include/kdrive-config.h
include/xgl-config.h
include/xkb-config.h
include/xorg-config.h
include/xorg-server.h
include/xwin-config.h
mfb/mfbbltC.c
mfb/mfbbltCI.c
mfb/mfbbltG.c
mfb/mfbbltO.c
mfb/mfbbltX.c
mfb/mfbigbblak.c
mfb/mfbigbwht.c
mfb/mfbpablack.c
mfb/mfbpainv.c
mfb/mfbpawhite.c
mfb/mfbpgbblak.c
mfb/mfbpgbinv.c
mfb/mfbpgbwht.c
mfb/mfbplyblack.c
mfb/mfbplyinv.c
mfb/mfbplywhite.c
mfb/mfbseg.c
mfb/mfbteblack.c
mfb/mfbtewhite.c
mfb/mfbtileC.c
mfb/mfbtileG.c


--- NEW FILE import.log ---
xorg-x11-server-1_5_0-1_fc10:HEAD:xorg-x11-server-1.5.0-1.fc10.src.rpm:1220485219


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	2 Jul 2008 12:36:39 -0000	1.46
+++ .cvsignore	3 Sep 2008 23:41:17 -0000	1.47
@@ -1 +1 @@
-xorg-server-20080701.tar.bz2
+xorg-server-1.5.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	24 Jul 2008 18:49:14 -0000	1.41
+++ sources	3 Sep 2008 23:41:17 -0000	1.42
@@ -1 +1 @@
-d225476fea6721d9f64c3268e47d6c51  xorg-server-1.4.99.906.tar.bz2
+9a817e5f7374d45b4dbe64b21bc0fb61  xorg-server-1.5.0.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- xorg-x11-server.spec	27 Aug 2008 15:38:51 -0000	1.345
+++ xorg-x11-server.spec	3 Sep 2008 23:41:17 -0000	1.346
@@ -18,8 +18,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.4.99.906
-Release:   10%{?dist}
+Version:   1.5.0
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -33,6 +33,7 @@
 Source2:   commitid
 %else
 Source0:   http://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
+Source1:   gitignore
 %endif
 
 # keyboard enablement
@@ -42,7 +43,8 @@
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
 Patch101:  xserver-1.4.99-dont-backfill-bg-none.patch
-Patch102:  xserver-1.4.99-exa-master-upgrade.patch
+# XXX does this need rebasing still?
+#Patch102:  xserver-1.4.99-exa-master-upgrade.patch
 Patch103:  xserver-1.5.0-bg-none-root.patch
 
 # Red Hat specific tweaking, not intended for upstream
@@ -65,9 +67,9 @@
 Patch5011: xserver-1.4.99-endian.patch
 
 # evdev keyboard map fix
-Patch5013: xserver-1.5.0-xkb-fix-ProcXkbSetXYZ-to-work-on-all.patch
+#Patch5013: xserver-1.5.0-xkb-fix-ProcXkbSetXYZ-to-work-on-all.patch
 Patch5014: xserver-1.5.0-force-SwitchCoreKeyboard-for-evdev.patch
-Patch5015: xserver-1.5.0-enable-selinux.patch
+# Patch5015: xserver-1.5.0-enable-selinux.patch
 Patch6000: xserver-1.5.0-hide-cursor.patch
 Patch6001: xserver-1.5.0-edid-backport.patch
 
@@ -276,6 +278,7 @@
     git-config user.email "x at fedoraproject.org"
     git-config user.name "Fedora X Ninjas"
 fi
+cp %{SOURCE1} .gitignore
 git-add .
 git-commit -a -q -m "%{version} baseline."
 %endif
@@ -495,6 +498,12 @@
 
 
 %changelog
+* Wed Sep 03 2008 Adam Jackson <ajax at redhat.com> 1.5.0-1
+- xserver 1.5.0
+- Revert to the EXA from 1.5.0, should be good enough one hopes.
+- Add .gitignore from git, so working with the artificial git tree is less
+  flakey.
+
 * Mon Aug 25 2008 Adam Jackson <ajax at redhat.com> 1.4.99.906-10
 - xserver-1.5.0-edid-backport.patch: Backport EDID updates from master.
 


--- commitid DELETED ---


--- make-git-snapshot.sh DELETED ---


--- xserver-1.4.99-exa-master-upgrade.patch DELETED ---


--- xserver-1.5.0-enable-selinux.patch DELETED ---


--- xserver-1.5.0-no-evdev-keyboards-kthnx.patch DELETED ---


--- xserver-1.5.0-xkb-fix-ProcXkbSetXYZ-to-work-on-all.patch DELETED ---



From ajax at fedoraproject.org  Wed Sep  3 23:49:43 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  3 Sep 2008 23:49:43 +0000 (UTC)
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.39, 1.40 sources, 1.38,
	1.39 xorg-x11-proto-devel.spec, 1.78, 1.79
Message-ID: <20080903234943.857C67002B@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-proto-devel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28103/devel

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Log Message:
inputproto 1.4.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	28 Aug 2008 20:48:51 -0000	1.39
+++ .cvsignore	3 Sep 2008 23:49:12 -0000	1.40
@@ -2,13 +2,13 @@
 compositeproto-0.4.tar.bz2
 damageproto-1.1.0.tar.bz2
 dmxproto-2.2.2.tar.bz2
-dri2proto-1.1.tar.bz2
+dri2proto-1.99.1.tar.bz2
 evieext-1.0.2.tar.bz2
 fixesproto-4.0.tar.bz2
 fontsproto-2.0.2.tar.bz2
 glproto-1.4.9.tar.bz2
-inputproto-1.4.3.tar.bz2
 kbproto-1.0.3.tar.bz2
+randrproto-1.2.2.tar.bz2
 recordproto-1.13.2.tar.bz2
 renderproto-0.9.3.tar.bz2
 resourceproto-1.0.2.tar.bz2
@@ -24,5 +24,4 @@
 xineramaproto-1.1.2.tar.bz2
 xproto-7.0.13.tar.bz2
 xproxymanagementprotocol-1.0.2.tar.bz2
-randrproto-1.2.2.tar.bz2
-dri2proto-1.99.1.tar.bz2
+inputproto-1.4.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	28 Aug 2008 20:48:51 -0000	1.38
+++ sources	3 Sep 2008 23:49:12 -0000	1.39
@@ -2,12 +2,13 @@
 6281344d656d4e0c8e9db4918efe3d1d  compositeproto-0.4.tar.bz2
 33ee591e0b1ca5ad7902934541db7d24  damageproto-1.1.0.tar.bz2
 d80acad88411e7944b9b085463d53302  dmxproto-2.2.2.tar.bz2
+3b72cd0440c29ba5d832cc8d22b2d1b4  dri2proto-1.99.1.tar.bz2
 2507b5d0f4b2848147fbddd155aa6cfe  evieext-1.0.2.tar.bz2
 8b298cc3424597f8138c7faf7763dce9  fixesproto-4.0.tar.bz2
 c946f166107b016a21cc7a02e1132724  fontsproto-2.0.2.tar.bz2
 e60951628422663e60faeb400f27bac1  glproto-1.4.9.tar.bz2
-a0f0d8cf6fbf0db8ba3937d0cc16138d  inputproto-1.4.3.tar.bz2
 6092cdb0a1225f95356ddbe6c2abaad5  kbproto-1.0.3.tar.bz2
+0458f24d6a77ff4bc5182816f482afa1  randrproto-1.2.2.tar.bz2
 0ed4706564a34fc2aff724aa16d3ff00  recordproto-1.13.2.tar.bz2
 598bc9a493deee2e48e4434e94467189  renderproto-0.9.3.tar.bz2
 b823b314e37eb19dae1f297951d2e933  resourceproto-1.0.2.tar.bz2
@@ -23,5 +24,4 @@
 1cc292c562962ad0ad3a253cae68c632  xineramaproto-1.1.2.tar.bz2
 7d26f45dca52632712a696e0631dc17b  xproto-7.0.13.tar.bz2
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
-0458f24d6a77ff4bc5182816f482afa1  randrproto-1.2.2.tar.bz2
-3b72cd0440c29ba5d832cc8d22b2d1b4  dri2proto-1.99.1.tar.bz2
+3a532379f226c34b36a5c585999f75e4  inputproto-1.4.4.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.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- xorg-x11-proto-devel.spec	28 Aug 2008 20:48:51 -0000	1.78
+++ xorg-x11-proto-devel.spec	3 Sep 2008 23:49:12 -0000	1.79
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -33,8 +33,8 @@
 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.9.tar.bz2
 Provides: glproto = 1.4.9
-Source9:  http://www.x.org/pub/individual/proto/inputproto-1.4.3.tar.bz2
-Provides: inputproto = 1.4.3
+Source9:  http://www.x.org/pub/individual/proto/inputproto-1.4.4.tar.bz2
+Provides: inputproto = 1.4.4
 Source10: http://www.x.org/pub/individual/proto/kbproto-1.0.3.tar.bz2
 Provides: kbproto = 1.0.3
 Source13: http://www.x.org/pub/individual/proto/randrproto-1.2.2.tar.bz2
@@ -284,6 +284,9 @@
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Fri Aug 29 2008 Adam Jackson <ajax at redhat.com> 7.4-3
+- inputproto 1.4.4
+
 * Thu Aug 28 2008 Kristian H??gsberg <krh at redhat.com> - 7.4-2
 - dri2proto 1.99.1
 



From cebbert at fedoraproject.org  Wed Sep  3 23:56:56 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  3 Sep 2008 23:56:56 +0000 (UTC)
Subject: rpms/kernel/F-9 todo,1.3,1.4
Message-ID: <20080903235656.247677011F@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28508

Modified Files:
	todo 
Log Message:
remove submitted patches from list



Index: todo
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/todo,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- todo	3 Sep 2008 06:48:19 -0000	1.3
+++ todo	3 Sep 2008 23:56:25 -0000	1.4
@@ -1,19 +1,10 @@
 Submit for -stable:
-linux-2.6-acpi-processor-use-signed-int.patch
-linux-2.6-block-submit_bh-discards-barrier-flag.patch
 linux-2.6-cpuidle-1-do-not-use-poll_idle-unless-user-asks-for-it.patch
 linux-2.6-cpuidle-2-menu-governor-fix-wrong-usage-of-measured_us.patch
 linux-2.6-cpuidle-3-make-ladder-governor-honor-latency-requirements.patch
 linux-2.6-libata-pata_it821x-driver-updates-and-reworking.patch
 linux-2.6-mm-dirty-page-tracking-race-fix.patch
-linux-2.6-x86-32-amd-c1e-force-timer-broadcast-late.patch
 linux-2.6-x86-64-fix-overlap-of-modules-and-fixmap-areas.patch
-linux-2.6-x86-fdiv-bug-detection-fix.patch
-linux-2.6-x86-fix-oprofile-and-hibernation-issues.patch
-linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch
-
-Submit for 2.6.27:
-linux-2.6-x86-io-delay-add-hp-f700-quirk.patch
 
 Submit for -stable after it appears in mainline:
 linux-2.6-usb-fix-hcd-interrupt-disabling.patch



From wtogami at fedoraproject.org  Thu Sep  4 00:28:34 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu,  4 Sep 2008 00:28:34 +0000 (UTC)
Subject: rpms/curl/F-9 curl-7.18.2-nss-thread-safety.patch, NONE,
	1.1 curl.spec, 1.78, 1.79
Message-ID: <20080904002834.CC92A70121@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/curl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30113

Modified Files:
	curl.spec 
Added Files:
	curl-7.18.2-nss-thread-safety.patch 
Log Message:
add thread safety to libcurl NSS cleanup() functions (#459297)


curl-7.18.2-nss-thread-safety.patch:

--- NEW FILE curl-7.18.2-nss-thread-safety.patch ---
diff -u --recursive curl-7.18.2.orig/lib/nss.c curl-7.18.2/lib/nss.c
--- curl-7.18.2.orig/lib/nss.c	2008-05-26 11:02:49.000000000 -0400
+++ curl-7.18.2/lib/nss.c	2008-09-03 13:33:32.000000000 -0400
@@ -73,6 +73,8 @@
 
 PRFileDesc *PR_ImportTCPSocket(PRInt32 osfd);
 
+PRLock * nss_initlock = NULL;
+
 int initialized = 0;
 
 #define HANDSHAKE_TIMEOUT 30
@@ -718,9 +720,12 @@
  * @retval 1 SSL initialized successfully
  */
 int Curl_nss_init(void)
-{
-  if(!initialized)
+{ 
+  /* curl_global_init() is not thread-safe so this test is ok */
+  if (nss_initlock == NULL) {
     PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 256);
+    nss_initlock = PR_NewLock();
+  }
 
   /* We will actually initialize NSS later */
 
@@ -730,7 +735,17 @@
 /* Global cleanup */
 void Curl_nss_cleanup(void)
 {
-  NSS_Shutdown();
+  /* This function isn't required to be threadsafe and this is only done
+   * as a safety feature.
+   */
+  PR_Lock(nss_initlock);
+  if (initialized)
+    NSS_Shutdown();
+  PR_Unlock(nss_initlock);
+
+  PR_DestroyLock(nss_initlock);
+  nss_initlock = NULL;
+
   initialized = 0;
 }
 
@@ -805,7 +820,8 @@
   curlerr = CURLE_SSL_CONNECT_ERROR;
 
   /* FIXME. NSS doesn't support multiple databases open at the same time. */
-  if(!initialized) {
+  PR_Lock(nss_initlock);
+  if(!initialized && !NSS_IsInitialized()) {
     initialized = 1;
 
     certDir = getenv("SSL_DIR"); /* Look in $SSL_DIR */
@@ -829,8 +845,11 @@
     if(rv != SECSuccess) {
       infof(conn->data, "Unable to initialize NSS database\n");
       curlerr = CURLE_SSL_CACERT_BADFILE;
+      PR_Unlock(nss_initlock);
+      initialized = 0;
       goto error;
     }
+    PR_Unlock(nss_initlock);
 
     NSS_SetDomesticPolicy();
 


Index: curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/curl/F-9/curl.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- curl.spec	22 Aug 2008 16:18:28 -0000	1.78
+++ curl.spec	4 Sep 2008 00:28:02 -0000	1.79
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.18.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -9,6 +9,7 @@
 Patch2: curl-7.16.0-privlibs.patch
 Patch3: curl-7.17.1-badsocket.patch
 Patch4: curl-7.18.2-nssproxy.patch
+Patch5: curl-7.18.2-nss-thread-safety.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +51,7 @@
 %patch2 -p1 -b .privlibs
 %patch3 -p1 -b .badsocket
 %patch4 -p1 -b .nssproxy
+%patch5 -p1 -b .nssthreadsafety
 
 # Convert docs to UTF-8
 for f in CHANGES README; do
@@ -116,6 +118,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Sep 03 2008 Warren Togami <wtogami at redhat.com> 7.18.2-5
+- add thread safety to libcurl NSS cleanup() functions (#459297)
+
 * Fri Aug 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 7.18.2-4
 - undo mini libcurl.so.3
 



From cebbert at fedoraproject.org  Thu Sep  4 00:28:59 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu,  4 Sep 2008 00:28:59 +0000 (UTC)
Subject: rpms/kernel/F-9 todo,1.4,1.5
Message-ID: <20080904002859.1C38370121@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30153

Modified Files:
	todo 
Log Message:
submit more patches



Index: todo
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/todo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- todo	3 Sep 2008 23:56:25 -0000	1.4
+++ todo	4 Sep 2008 00:28:28 -0000	1.5
@@ -3,8 +3,6 @@
 linux-2.6-cpuidle-2-menu-governor-fix-wrong-usage-of-measured_us.patch
 linux-2.6-cpuidle-3-make-ladder-governor-honor-latency-requirements.patch
 linux-2.6-libata-pata_it821x-driver-updates-and-reworking.patch
-linux-2.6-mm-dirty-page-tracking-race-fix.patch
-linux-2.6-x86-64-fix-overlap-of-modules-and-fixmap-areas.patch
 
 Submit for -stable after it appears in mainline:
 linux-2.6-usb-fix-hcd-interrupt-disabling.patch



From wtogami at fedoraproject.org  Thu Sep  4 00:38:34 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu,  4 Sep 2008 00:38:34 +0000 (UTC)
Subject: rpms/curl/F-8 curl-7.18.2-nss-thread-safety.patch, NONE,
	1.1 curl.spec, 1.67, 1.68
Message-ID: <20080904003834.997CE70121@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/curl/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30660

Modified Files:
	curl.spec 
Added Files:
	curl-7.18.2-nss-thread-safety.patch 
Log Message:
add thread safety to libcurl NSS cleanup() functions (#459297)


curl-7.18.2-nss-thread-safety.patch:

--- NEW FILE curl-7.18.2-nss-thread-safety.patch ---
diff -u --recursive curl-7.18.2.orig/lib/nss.c curl-7.18.2/lib/nss.c
--- curl-7.18.2.orig/lib/nss.c	2008-05-26 11:02:49.000000000 -0400
+++ curl-7.18.2/lib/nss.c	2008-09-03 13:33:32.000000000 -0400
@@ -73,6 +73,8 @@
 
 PRFileDesc *PR_ImportTCPSocket(PRInt32 osfd);
 
+PRLock * nss_initlock = NULL;
+
 int initialized = 0;
 
 #define HANDSHAKE_TIMEOUT 30
@@ -718,9 +720,12 @@
  * @retval 1 SSL initialized successfully
  */
 int Curl_nss_init(void)
-{
-  if(!initialized)
+{ 
+  /* curl_global_init() is not thread-safe so this test is ok */
+  if (nss_initlock == NULL) {
     PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 256);
+    nss_initlock = PR_NewLock();
+  }
 
   /* We will actually initialize NSS later */
 
@@ -730,7 +735,17 @@
 /* Global cleanup */
 void Curl_nss_cleanup(void)
 {
-  NSS_Shutdown();
+  /* This function isn't required to be threadsafe and this is only done
+   * as a safety feature.
+   */
+  PR_Lock(nss_initlock);
+  if (initialized)
+    NSS_Shutdown();
+  PR_Unlock(nss_initlock);
+
+  PR_DestroyLock(nss_initlock);
+  nss_initlock = NULL;
+
   initialized = 0;
 }
 
@@ -805,7 +820,8 @@
   curlerr = CURLE_SSL_CONNECT_ERROR;
 
   /* FIXME. NSS doesn't support multiple databases open at the same time. */
-  if(!initialized) {
+  PR_Lock(nss_initlock);
+  if(!initialized && !NSS_IsInitialized()) {
     initialized = 1;
 
     certDir = getenv("SSL_DIR"); /* Look in $SSL_DIR */
@@ -829,8 +845,11 @@
     if(rv != SECSuccess) {
       infof(conn->data, "Unable to initialize NSS database\n");
       curlerr = CURLE_SSL_CACERT_BADFILE;
+      PR_Unlock(nss_initlock);
+      initialized = 0;
       goto error;
     }
+    PR_Unlock(nss_initlock);
 
     NSS_SetDomesticPolicy();
 


Index: curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/curl/F-8/curl.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- curl.spec	22 Aug 2008 16:12:27 -0000	1.67
+++ curl.spec	4 Sep 2008 00:38:32 -0000	1.68
@@ -4,7 +4,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.18.2
-Release: 3%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -12,6 +12,7 @@
 Patch2: curl-7.16.0-privlibs.patch
 Patch3: curl-7.17.1-badsocket.patch
 Patch4: curl-7.18.2-nssproxy.patch
+Patch5: curl-7.18.2-nss-thread-safety.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +45,7 @@
 %patch2 -p1 -b .privlibs
 %patch3 -p1 -b .badsocket
 %patch4 -p1 -b .nssproxy
+%patch5 -p1 -b .nssthreadsafety
 
 # Convert docs to UTF-8
 for f in CHANGES README; do
@@ -111,6 +113,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Sep 03 2008 Warren Togami <wtogami at redhat.com> 7.18.2-5
+- add thread safety to libcurl NSS cleanup() functions (#459297)
+
 * Fri Aug 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 7.18.2-3
 - undo mini libcurl.so.3
 



From wtogami at fedoraproject.org  Thu Sep  4 00:47:53 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu,  4 Sep 2008 00:47:53 +0000 (UTC)
Subject: rpms/curl/devel curl-7.18.2-nss-thread-safety.patch, NONE,
	1.1 curl.spec, 1.80, 1.81
Message-ID: <20080904004753.7252570121@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31130

Modified Files:
	curl.spec 
Added Files:
	curl-7.18.2-nss-thread-safety.patch 
Log Message:
add thread safety to libcurl NSS cleanup() functions (#459297)


curl-7.18.2-nss-thread-safety.patch:

--- NEW FILE curl-7.18.2-nss-thread-safety.patch ---
diff -u --recursive curl-7.18.2.orig/lib/nss.c curl-7.18.2/lib/nss.c
--- curl-7.18.2.orig/lib/nss.c	2008-05-26 11:02:49.000000000 -0400
+++ curl-7.18.2/lib/nss.c	2008-09-03 13:33:32.000000000 -0400
@@ -73,6 +73,8 @@
 
 PRFileDesc *PR_ImportTCPSocket(PRInt32 osfd);
 
+PRLock * nss_initlock = NULL;
+
 int initialized = 0;
 
 #define HANDSHAKE_TIMEOUT 30
@@ -718,9 +720,12 @@
  * @retval 1 SSL initialized successfully
  */
 int Curl_nss_init(void)
-{
-  if(!initialized)
+{ 
+  /* curl_global_init() is not thread-safe so this test is ok */
+  if (nss_initlock == NULL) {
     PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 256);
+    nss_initlock = PR_NewLock();
+  }
 
   /* We will actually initialize NSS later */
 
@@ -730,7 +735,17 @@
 /* Global cleanup */
 void Curl_nss_cleanup(void)
 {
-  NSS_Shutdown();
+  /* This function isn't required to be threadsafe and this is only done
+   * as a safety feature.
+   */
+  PR_Lock(nss_initlock);
+  if (initialized)
+    NSS_Shutdown();
+  PR_Unlock(nss_initlock);
+
+  PR_DestroyLock(nss_initlock);
+  nss_initlock = NULL;
+
   initialized = 0;
 }
 
@@ -805,7 +820,8 @@
   curlerr = CURLE_SSL_CONNECT_ERROR;
 
   /* FIXME. NSS doesn't support multiple databases open at the same time. */
-  if(!initialized) {
+  PR_Lock(nss_initlock);
+  if(!initialized && !NSS_IsInitialized()) {
     initialized = 1;
 
     certDir = getenv("SSL_DIR"); /* Look in $SSL_DIR */
@@ -829,8 +845,11 @@
     if(rv != SECSuccess) {
       infof(conn->data, "Unable to initialize NSS database\n");
       curlerr = CURLE_SSL_CACERT_BADFILE;
+      PR_Unlock(nss_initlock);
+      initialized = 0;
       goto error;
     }
+    PR_Unlock(nss_initlock);
 
     NSS_SetDomesticPolicy();
 


Index: curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/curl/devel/curl.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- curl.spec	22 Aug 2008 16:22:28 -0000	1.80
+++ curl.spec	4 Sep 2008 00:47:20 -0000	1.81
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.18.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -9,6 +9,7 @@
 Patch2: curl-7.16.0-privlibs.patch
 Patch3: curl-7.17.1-badsocket.patch
 Patch4: curl-7.18.2-nssproxy.patch
+Patch5: curl-7.18.2-nss-thread-safety.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +51,7 @@
 %patch2 -p1 -b .privlibs
 %patch3 -p1 -b .badsocket
 %patch4 -p1 -b .nssproxy
+%patch5 -p1 -b .nssthreadsafety
 
 # Convert docs to UTF-8
 for f in CHANGES README; do
@@ -118,6 +120,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Sep 03 2008 Warren Togami <wtogami at redhat.com> 7.18.2-6
+- add thread safety to libcurl NSS cleanup() functions (#459297)
+
 * Fri Aug 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 7.18.2-5
 - undo mini libcurl.so.3
 



From wtogami at fedoraproject.org  Thu Sep  4 01:02:08 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu,  4 Sep 2008 01:02:08 +0000 (UTC)
Subject: rpms/curl/devel curl-7.18.2-nss-thread-safety.patch,1.1,1.2
Message-ID: <20080904010208.BB10670120@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32129

Modified Files:
	curl-7.18.2-nss-thread-safety.patch 
Log Message:
rediff


curl-7.18.2-nss-thread-safety.patch:

Index: curl-7.18.2-nss-thread-safety.patch
===================================================================
RCS file: /cvs/pkgs/rpms/curl/devel/curl-7.18.2-nss-thread-safety.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- curl-7.18.2-nss-thread-safety.patch	4 Sep 2008 00:47:20 -0000	1.1
+++ curl-7.18.2-nss-thread-safety.patch	4 Sep 2008 01:02:07 -0000	1.2
@@ -1,6 +1,6 @@
-diff -u --recursive curl-7.18.2.orig/lib/nss.c curl-7.18.2/lib/nss.c
---- curl-7.18.2.orig/lib/nss.c	2008-05-26 11:02:49.000000000 -0400
-+++ curl-7.18.2/lib/nss.c	2008-09-03 13:33:32.000000000 -0400
+diff -urN curl-7.18.2.orig/lib/nss.c curl-7.18.2/lib/nss.c
+--- curl-7.18.2.orig/lib/nss.c	2008-09-03 20:56:33.000000000 -0400
++++ curl-7.18.2/lib/nss.c	2008-09-03 20:57:07.000000000 -0400
 @@ -73,6 +73,8 @@
  
  PRFileDesc *PR_ImportTCPSocket(PRInt32 osfd);
@@ -44,8 +44,8 @@
    initialized = 0;
  }
  
-@@ -805,7 +820,8 @@
-   curlerr = CURLE_SSL_CONNECT_ERROR;
+@@ -808,7 +823,8 @@
+     return CURLE_OK;
  
    /* FIXME. NSS doesn't support multiple databases open at the same time. */
 -  if(!initialized) {
@@ -54,7 +54,7 @@
      initialized = 1;
  
      certDir = getenv("SSL_DIR"); /* Look in $SSL_DIR */
-@@ -829,8 +845,11 @@
+@@ -832,8 +848,11 @@
      if(rv != SECSuccess) {
        infof(conn->data, "Unable to initialize NSS database\n");
        curlerr = CURLE_SSL_CACERT_BADFILE;



From cweyl at fedoraproject.org  Thu Sep  4 01:20:19 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  4 Sep 2008 01:20:19 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-DBI/devel more_dbds.patch, NONE,
	1.1 perl-DateTime-Format-DBI.spec, 1.2, 1.3
Message-ID: <20080904012019.9D18F70120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DateTime-Format-DBI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv762

Modified Files:
	perl-DateTime-Format-DBI.spec 
Added Files:
	more_dbds.patch 
Log Message:
* Wed Sep 03 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.031-4
- add the dbd-specific DateTime::Format's as requires.  Makes sense that
  installing this package should have stuff "just work".
- patch for additional DBD support (just DB2 at this point)


more_dbds.patch:

--- NEW FILE more_dbds.patch ---
--- lib/DateTime/Format/DBI.pm.orig	2008-09-03 18:02:20.937616172 -0700
+++ lib/DateTime/Format/DBI.pm	2008-09-03 18:11:00.206836977 -0700
@@ -12,8 +12,9 @@
 
 our %db_to_parser = (
   # lowercase for case-insensitivity!
-  'mysql'	=> 'DateTime::Format::MySQL',
-  'pg'		=> 'DateTime::Format::Pg',
+  'mysql'   => 'DateTime::Format::MySQL',
+  'pg'      => 'DateTime::Format::Pg',
+  'db2'     => 'DateTime::Format::DB2',
 );
 
 sub new {


Index: perl-DateTime-Format-DBI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-DBI/devel/perl-DateTime-Format-DBI.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-DateTime-Format-DBI.spec	24 Jul 2008 23:02:15 -0000	1.2
+++ perl-DateTime-Format-DBI.spec	4 Sep 2008 01:19:46 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-DBI
 Version:        0.031
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Find a parser class for a database connection
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -10,6 +10,9 @@
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+# additional dbd support...
+Patch0:         more_dbds.patch
+
 BuildRequires:  perl(DateTime)            >= 0.1
 BuildRequires:  perl(DBI)                 >= 1.21
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -20,6 +23,12 @@
 AutoProv:       no
 Provides:       perl(DateTime::Format::DBI) = %{version}
 
+# require the dbd-specific datetime formats, so this "just works" the way we
+# expect it to.
+Requires:       perl(DateTime::Format::MySQL)
+Requires:       perl(DateTime::Format::Pg)
+Requires:       perl(DateTime::Format::DB2)
+
 %description
 This module finds a DateTime::Format::* class that is suitable for the use
 with a given DBI connection (and DBD::* driver).
@@ -30,6 +39,7 @@
 
 %prep
 %setup -q -n DateTime-Format-DBI-%{version}
+%patch0
 
 for i in README lib/DateTime/Format/DBI.pm ; do
     
@@ -65,6 +75,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 03 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.031-4
+- add the dbd-specific DateTime::Format's as requires.  Makes sense that
+  installing this package should have stuff "just work".
+- patch for additional DBD support (just DB2 at this point)
+
 * Thu Jul 24 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.031-3
 - bump
 



From katzj at fedoraproject.org  Thu Sep  4 01:46:47 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Thu,  4 Sep 2008 01:46:47 +0000 (UTC)
Subject: rpms/sugar-terminal/devel sugar-terminal.spec,1.1,1.2
Message-ID: <20080904014647.C683070120@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/sugar-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2130

Modified Files:
	sugar-terminal.spec 
Log Message:
* Wed Sep  3 2008 Jeremy Katz <katzj at redhat.com> - 16-2
- temporarily BR gettext



Index: sugar-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-terminal/devel/sugar-terminal.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sugar-terminal.spec	3 Sep 2008 20:41:39 -0000	1.1
+++ sugar-terminal.spec	4 Sep 2008 01:46:15 -0000	1.2
@@ -1,6 +1,6 @@
 Name: sugar-terminal
 Version: 16
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Terminal for Sugar
 Group: Sugar/Activities
 License: GPLv2+
@@ -8,6 +8,7 @@
 Source0: http://dev.laptop.org/pub/sugar/sources/terminal-activity/Terminal-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python sugar-toolkit
+BuildRequires: gettext
 Requires: sugar vte
 BuildArch: noarch
 
@@ -41,6 +42,9 @@
 
 
 %changelog
+* Wed Sep  3 2008 Jeremy Katz <katzj at redhat.com> - 16-2
+- temporarily BR gettext
+
 * Tue Sep  2 2008 Jeremy Katz <katzj at redhat.com> - 16-1
 - update to Terminal-16
 - use %%find_lang which works with new bundlebuilder changes



From katzj at fedoraproject.org  Thu Sep  4 01:51:48 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Thu,  4 Sep 2008 01:51:48 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel sugar-toolkit.spec,1.18,1.19
Message-ID: <20080904015148.9657270120@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2457

Modified Files:
	sugar-toolkit.spec 
Log Message:
* Wed Sep  3 2008 Jeremy Katz <katzj at redhat.com> - 0.82.5-3
- requires gettext for bundlebuilder



Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sugar-toolkit.spec	1 Sep 2008 19:58:52 -0000	1.18
+++ sugar-toolkit.spec	4 Sep 2008 01:51:17 -0000	1.19
@@ -6,7 +6,7 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.82.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -35,6 +35,7 @@
 Requires: sugar-presence-service
 Requires: python-simplejson
 Requires: python-json
+Requires: gettext
 
 %description
 Sugar is the core of the OLPC Human Interface. The toolkit provides
@@ -66,6 +67,9 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Wed Sep  3 2008 Jeremy Katz <katzj at redhat.com> - 0.82.5-3
+- requires gettext for bundlebuilder
+
 * Mon Sep 01 2008 Simon Schampijer <simon at laptop.org> - 0.82.5-2
 - added the python-json dependency
 



From cebbert at fedoraproject.org  Thu Sep  4 01:58:05 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu,  4 Sep 2008 01:58:05 +0000 (UTC)
Subject: rpms/kernel/F-9 patch-2.6.26.4-rc1, NONE, 1.1 kernel.spec, 1.756,
	1.757 linux-2.6-bio-fix-__bio_copy_iov-handling-of-bv_len.patch, 1.1, 
	NONE linux-2.6-bio-fix-bio_copy_kern-handling-of-bv_len.patch,
	1.1, NONE linux-2.6-netdev-atl1-disable-tso-by-default.patch,
	1.1, NONE
Message-ID: <20080904015805.51BC570120@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2777

Modified Files:
	kernel.spec 
Added Files:
	patch-2.6.26.4-rc1 
Removed Files:
	linux-2.6-bio-fix-__bio_copy_iov-handling-of-bv_len.patch 
	linux-2.6-bio-fix-bio_copy_kern-handling-of-bv_len.patch 
	linux-2.6-netdev-atl1-disable-tso-by-default.patch 
Log Message:
Linux 2.6.26.4-rc1
  Dropped patches:
    linux-2.6-bio-fix-__bio_copy_iov-handling-of-bv_len.patch
    linux-2.6-bio-fix-bio_copy_kern-handling-of-bv_len.patch
    linux-2.6-netdev-atl1-disable-tso-by-default.patch


--- NEW FILE patch-2.6.26.4-rc1 ---
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index e289a98..387d3f6 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -842,6 +842,9 @@ static unsigned long nid_range(unsigned long start, unsigned long end,
 		start += PAGE_SIZE;
 	}
 
+	if (start > end)
+		start = end;
+
 	return start;
 }
 #else
@@ -1769,8 +1772,7 @@ void __init paging_init(void)
 
 	find_ramdisk(phys_base);
 
-	if (cmdline_memory_size)
-		lmb_enforce_memory_limit(phys_base + cmdline_memory_size);
+	lmb_enforce_memory_limit(cmdline_memory_size);
 
 	lmb_analyze();
 	lmb_dump_all();
@@ -2007,6 +2009,15 @@ void __init mem_init(void)
 void free_initmem(void)
 {
 	unsigned long addr, initend;
+	int do_free = 1;
+
+	/* If the physical memory maps were trimmed by kernel command
+	 * line options, don't even try freeing this initmem stuff up.
+	 * The kernel image could have been in the trimmed out region
+	 * and if so the freeing below will free invalid page structs.
+	 */
+	if (cmdline_memory_size)
+		do_free = 0;
 
 	/*
 	 * The init section is aligned to 8k in vmlinux.lds. Page align for >8k pagesizes.
@@ -2021,13 +2032,16 @@ void free_initmem(void)
 			((unsigned long) __va(kern_base)) -
 			((unsigned long) KERNBASE));
 		memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
-		p = virt_to_page(page);
 
-		ClearPageReserved(p);
-		init_page_count(p);
-		__free_page(p);
-		num_physpages++;
-		totalram_pages++;
+		if (do_free) {
+			p = virt_to_page(page);
+
+			ClearPageReserved(p);
+			init_page_count(p);
+			__free_page(p);
+			num_physpages++;
+			totalram_pages++;
+		}
 	}
 }
 
diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c
index 3fd7a67..e710a21 100644
--- a/arch/x86/kernel/cpu/cyrix.c
+++ b/arch/x86/kernel/cpu/cyrix.c
@@ -134,23 +134,6 @@ static void __cpuinit set_cx86_memwb(void)
 	setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x14);
 }
 
-static void __cpuinit set_cx86_inc(void)
-{
-	unsigned char ccr3;
-
-	printk(KERN_INFO "Enable Incrementor on Cyrix/NSC processor.\n");
-
-	ccr3 = getCx86(CX86_CCR3);
-	setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */
-	/* PCR1 -- Performance Control */
-	/* Incrementor on, whatever that is */
-	setCx86(CX86_PCR1, getCx86(CX86_PCR1) | 0x02);
-	/* PCR0 -- Performance Control */
-	/* Incrementor Margin 10 */
-	setCx86(CX86_PCR0, getCx86(CX86_PCR0) | 0x04);
-	setCx86(CX86_CCR3, ccr3);	/* disable MAPEN */
-}
-
 /*
  *	Configure later MediaGX and/or Geode processor.
  */
@@ -174,7 +157,6 @@ static void __cpuinit geode_configure(void)
 
 	set_cx86_memwb();
 	set_cx86_reorder();
-	set_cx86_inc();
 
 	local_irq_restore(flags);
 }
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index 75b14b1..745b974 100644
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -365,6 +365,7 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,
 			     unsigned long *size, mtrr_type *type)
 {
 	unsigned int mask_lo, mask_hi, base_lo, base_hi;
+	unsigned int tmp, hi;
 
 	rdmsr(MTRRphysMask_MSR(reg), mask_lo, mask_hi);
 	if ((mask_lo & 0x800) == 0) {
@@ -378,8 +379,23 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,
 	rdmsr(MTRRphysBase_MSR(reg), base_lo, base_hi);
 
 	/* Work out the shifted address mask. */
-	mask_lo = size_or_mask | mask_hi << (32 - PAGE_SHIFT)
-	    | mask_lo >> PAGE_SHIFT;
+	tmp = mask_hi << (32 - PAGE_SHIFT) | mask_lo >> PAGE_SHIFT;
+	mask_lo = size_or_mask | tmp;
+	/* Expand tmp with high bits to all 1s*/
+	hi = fls(tmp);
+	if (hi > 0) {
+		tmp |= ~((1<<(hi - 1)) - 1);
+
+		if (tmp != mask_lo) {
+			static int once = 1;
+
+			if (once) {
+				printk(KERN_INFO "mtrr: your BIOS has set up an incorrect mask, fixing it up.\n");
+				once = 0;
+			}
+			mask_lo = tmp;
+		}
+	}
 
 	/* This works correctly if size is a power of two, i.e. a
 	   contiguous range. */
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index 934c7b6..d333a74 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -343,7 +343,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
 		shadow_addr = __pa(shadow_page->spt);
 		shadow_pte = shadow_addr | PT_PRESENT_MASK | PT_ACCESSED_MASK
 			| PT_WRITABLE_MASK | PT_USER_MASK;
-		*shadow_ent = shadow_pte;
+		set_shadow_pte(shadow_ent, shadow_pte);
 	}
 
 	mmu_set_spte(vcpu, shadow_ent, access, walker->pte_access & access,
diff --git a/crypto/authenc.c b/crypto/authenc.c
index 4b22676..fd9f06c 100644
--- a/crypto/authenc.c
+++ b/crypto/authenc.c
@@ -174,8 +174,9 @@ static int crypto_authenc_genicv(struct aead_request *req, u8 *iv,
 static void crypto_authenc_encrypt_done(struct crypto_async_request *req,
 					int err)
 {
+	struct aead_request *areq = req->data;
+
 	if (!err) {
-		struct aead_request *areq = req->data;
 		struct crypto_aead *authenc = crypto_aead_reqtfm(areq);
 		struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
 		struct ablkcipher_request *abreq = aead_request_ctx(areq);
@@ -185,7 +186,7 @@ static void crypto_authenc_encrypt_done(struct crypto_async_request *req,
 		err = crypto_authenc_genicv(areq, iv, 0);
 	}
 
-	aead_request_complete(req->data, err);
+	aead_request_complete(areq, err);
 }
 
 static int crypto_authenc_encrypt(struct aead_request *req)
@@ -216,14 +217,15 @@ static int crypto_authenc_encrypt(struct aead_request *req)
 static void crypto_authenc_givencrypt_done(struct crypto_async_request *req,
 					   int err)
 {
+	struct aead_request *areq = req->data;
+
 	if (!err) {
-		struct aead_request *areq = req->data;
 		struct skcipher_givcrypt_request *greq = aead_request_ctx(areq);
 
 		err = crypto_authenc_genicv(areq, greq->giv, 0);
 	}
 
-	aead_request_complete(req->data, err);
+	aead_request_complete(areq, err);
 }
 
 static int crypto_authenc_givencrypt(struct aead_givcrypt_request *req)
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index ad169ff..80c655f 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -1134,30 +1134,16 @@ static int mv_qc_defer(struct ata_queued_cmd *qc)
 	if (ap->nr_active_links == 0)
 		return 0;
 
-	if (pp->pp_flags & MV_PP_FLAG_EDMA_EN) {
-		/*
-		 * The port is operating in host queuing mode (EDMA).
-		 * It can accomodate a new qc if the qc protocol
-		 * is compatible with the current host queue mode.
-		 */
-		if (pp->pp_flags & MV_PP_FLAG_NCQ_EN) {
-			/*
-			 * The host queue (EDMA) is in NCQ mode.
-			 * If the new qc is also an NCQ command,
-			 * then allow the new qc.
-			 */
-			if (qc->tf.protocol == ATA_PROT_NCQ)
-				return 0;
-		} else {
-			/*
-			 * The host queue (EDMA) is in non-NCQ, DMA mode.
-			 * If the new qc is also a non-NCQ, DMA command,
-			 * then allow the new qc.
-			 */
-			if (qc->tf.protocol == ATA_PROT_DMA)
-				return 0;
-		}
-	}
+	/*
+	 * The port is operating in host queuing mode (EDMA) with NCQ
+	 * enabled, allow multiple NCQ commands.  EDMA also allows
+	 * queueing multiple DMA commands but libata core currently
+	 * doesn't allow it.
+	 */
+	if ((pp->pp_flags & MV_PP_FLAG_EDMA_EN) &&
+	    (pp->pp_flags & MV_PP_FLAG_NCQ_EN) && ata_is_ncq(qc->tf.protocol))
+		return 0;
+
 	return ATA_DEFER_PORT;
 }
 
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 0cf98bd..71320d2 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -406,7 +406,7 @@ struct entropy_store {
 	/* read-write data: */
 	spinlock_t lock;
 	unsigned add_ptr;
-	int entropy_count;
+	int entropy_count;	/* Must at no time exceed ->POOLBITS! */
 	int input_rotate;
 };
 
@@ -519,6 +519,7 @@ static void mix_pool_bytes(struct entropy_store *r, const void *in, int bytes)
 static void credit_entropy_bits(struct entropy_store *r, int nbits)
 {
 	unsigned long flags;
+	int entropy_count;
 
 	if (!nbits)
 		return;
@@ -526,20 +527,20 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits)
 	spin_lock_irqsave(&r->lock, flags);
 
 	DEBUG_ENT("added %d entropy credits to %s\n", nbits, r->name);
-	r->entropy_count += nbits;
-	if (r->entropy_count < 0) {
+	entropy_count = r->entropy_count;
+	entropy_count += nbits;
+	if (entropy_count < 0) {
 		DEBUG_ENT("negative entropy/overflow\n");
-		r->entropy_count = 0;
-	} else if (r->entropy_count > r->poolinfo->POOLBITS)
-		r->entropy_count = r->poolinfo->POOLBITS;
+		entropy_count = 0;
+	} else if (entropy_count > r->poolinfo->POOLBITS)
+		entropy_count = r->poolinfo->POOLBITS;
+	r->entropy_count = entropy_count;
 
 	/* should we wake readers? */
-	if (r == &input_pool &&
-	    r->entropy_count >= random_read_wakeup_thresh) {
+	if (r == &input_pool && entropy_count >= random_read_wakeup_thresh) {
 		wake_up_interruptible(&random_read_wait);
 		kill_fasync(&fasync, SIGIO, POLL_IN);
 	}
-
 	spin_unlock_irqrestore(&r->lock, flags);
 }
 
diff --git a/drivers/misc/eeepc-laptop.c b/drivers/misc/eeepc-laptop.c
index 6d72760..3f3abf9 100644
--- a/drivers/misc/eeepc-laptop.c
+++ b/drivers/misc/eeepc-laptop.c
@@ -553,9 +553,9 @@ static void eeepc_hwmon_exit(void)
 	hwmon = eeepc_hwmon_device;
 	if (!hwmon)
 		return ;
-	hwmon_device_unregister(hwmon);
 	sysfs_remove_group(&hwmon->kobj,
 			   &hwmon_attribute_group);
+	hwmon_device_unregister(hwmon);
 	eeepc_hwmon_device = NULL;
 }
 
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 3c798ae..8fe0a49 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -3019,7 +3019,6 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
 	netdev->features = NETIF_F_HW_CSUM;
 	netdev->features |= NETIF_F_SG;
 	netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
-	netdev->features |= NETIF_F_TSO;
 	netdev->features |= NETIF_F_LLTX;
 
 	/*
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 20d4fe9..1652f10 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5420,7 +5420,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
 	if (id->driver_data & DEV_HAS_CHECKSUM) {
 		np->rx_csum = 1;
 		np->txrxctl_bits |= NVREG_TXRXCTL_RXCHECK;
-		dev->features |= NETIF_F_HW_CSUM | NETIF_F_SG;
+		dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;
 		dev->features |= NETIF_F_TSO;
 	}
 
@@ -5728,7 +5728,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
 
 	dev_printk(KERN_INFO, &pci_dev->dev, "%s%s%s%s%s%s%s%s%s%sdesc-v%u\n",
 		   dev->features & NETIF_F_HIGHDMA ? "highdma " : "",
-		   dev->features & (NETIF_F_HW_CSUM | NETIF_F_SG) ?
+		   dev->features & (NETIF_F_IP_CSUM | NETIF_F_SG) ?
 		   	"csum " : "",
 		   dev->features & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX) ?
 		   	"vlan " : "",
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 42d7c0a..0e4eb15 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2822,7 +2822,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev,
 					pkt_size, PCI_DMA_FROMDEVICE);
 				rtl8169_mark_to_asic(desc, tp->rx_buf_sz);
 			} else {
-				pci_unmap_single(pdev, addr, pkt_size,
+				pci_unmap_single(pdev, addr, tp->rx_buf_sz,
 						 PCI_DMA_FROMDEVICE);
 				tp->Rx_skbuff[entry] = NULL;
 			}
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index cc4bde8..1710e49 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -1672,15 +1672,43 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
 }
 
 /* tp->lock is held. */
+static inline void tg3_generate_fw_event(struct tg3 *tp)
+{
+	u32 val;
+
+	val = tr32(GRC_RX_CPU_EVENT);
+	val |= GRC_RX_CPU_DRIVER_EVENT;
+	tw32_f(GRC_RX_CPU_EVENT, val);
+
+	tp->last_event_jiffies = jiffies;
+}
+
+#define TG3_FW_EVENT_TIMEOUT_USEC 2500
+
+/* tp->lock is held. */
 static void tg3_wait_for_event_ack(struct tg3 *tp)
 {
 	int i;
+	unsigned int delay_cnt;
+	long time_remain;
+
+	/* If enough time has passed, no wait is necessary. */
+	time_remain = (long)(tp->last_event_jiffies + 1 +
+		      usecs_to_jiffies(TG3_FW_EVENT_TIMEOUT_USEC)) -
+		      (long)jiffies;
+	if (time_remain < 0)
+		return;
 
-	/* Wait for up to 2.5 milliseconds */
-	for (i = 0; i < 250000; i++) {
+	/* Check if we can shorten the wait time. */
+	delay_cnt = jiffies_to_usecs(time_remain);
+	if (delay_cnt > TG3_FW_EVENT_TIMEOUT_USEC)
+		delay_cnt = TG3_FW_EVENT_TIMEOUT_USEC;
+	delay_cnt = (delay_cnt >> 3) + 1;
+
+	for (i = 0; i < delay_cnt; i++) {
 		if (!(tr32(GRC_RX_CPU_EVENT) & GRC_RX_CPU_DRIVER_EVENT))
 			break;
-		udelay(10);
+		udelay(8);
 	}
 }
 
@@ -1729,9 +1757,7 @@ static void tg3_ump_link_report(struct tg3 *tp)
 		val = 0;
 	tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX + 12, val);
 
-	val = tr32(GRC_RX_CPU_EVENT);
-	val |= GRC_RX_CPU_DRIVER_EVENT;
-	tw32_f(GRC_RX_CPU_EVENT, val);
+	tg3_generate_fw_event(tp);
 }
 
 static void tg3_link_report(struct tg3 *tp)
@@ -5565,6 +5591,7 @@ static int tg3_chip_reset(struct tg3 *tp)
 		tg3_read_mem(tp, NIC_SRAM_DATA_CFG, &nic_cfg);
 		if (nic_cfg & NIC_SRAM_DATA_CFG_ASF_ENABLE) {
 			tp->tg3_flags |= TG3_FLAG_ENABLE_ASF;
+			tp->last_event_jiffies = jiffies;
 			if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS)
 				tp->tg3_flags2 |= TG3_FLG2_ASF_NEW_HANDSHAKE;
 		}
@@ -5578,15 +5605,12 @@ static void tg3_stop_fw(struct tg3 *tp)
 {
 	if ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) &&
 	   !(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE)) {
-		u32 val;
-
 		/* Wait for RX cpu to ACK the previous event. */
 		tg3_wait_for_event_ack(tp);
 
 		tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX, FWCMD_NICDRV_PAUSE_FW);
-		val = tr32(GRC_RX_CPU_EVENT);
-		val |= GRC_RX_CPU_DRIVER_EVENT;
-		tw32(GRC_RX_CPU_EVENT, val);
+
+		tg3_generate_fw_event(tp);
 
 		/* Wait for RX cpu to ACK this event. */
 		tg3_wait_for_event_ack(tp);
@@ -7477,8 +7501,6 @@ static void tg3_timer(unsigned long __opaque)
 	 */
 	if (!--tp->asf_counter) {
 		if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {
-			u32 val;
-
 			tg3_wait_for_event_ack(tp);
 
 			tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX,
@@ -7486,9 +7508,8 @@ static void tg3_timer(unsigned long __opaque)
 			tg3_write_mem(tp, NIC_SRAM_FW_CMD_LEN_MBOX, 4);
 			/* 5 seconds timeout */
 			tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX, 5);
-			val = tr32(GRC_RX_CPU_EVENT);
-			val |= GRC_RX_CPU_DRIVER_EVENT;
-			tw32_f(GRC_RX_CPU_EVENT, val);
+
+			tg3_generate_fw_event(tp);
 		}
 		tp->asf_counter = tp->asf_multiplier;
 	}
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index 0404f93..d68b579 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2404,7 +2404,10 @@ struct tg3 {
 	struct tg3_ethtool_stats	estats;
 	struct tg3_ethtool_stats	estats_prev;
 
+	union {
 	unsigned long			phy_crc_errors;
+	unsigned long			last_event_jiffies;
+	};
 
 	u32				rx_offset;
 	u32				tg3_flags;
diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index 217814f..3b3b5f1 100644
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -280,6 +280,8 @@ static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
 			      match_pci_dev_by_id);
 	if (dev)
 		pdev = to_pci_dev(dev);
+	if (from)
+		pci_dev_put(from);
 	return pdev;
 }
 
diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c
index 9f996ec..dd70bf7 100644
--- a/drivers/rtc/rtc-lib.c
+++ b/drivers/rtc/rtc-lib.c
@@ -51,10 +51,11 @@ EXPORT_SYMBOL(rtc_year_days);
  */
 void rtc_time_to_tm(unsigned long time, struct rtc_time *tm)
 {
-	unsigned int days, month, year;
+	unsigned int month, year;
+	int days;
 
 	days = time / 86400;
-	time -= days * 86400;
+	time -= (unsigned int) days * 86400;
 
 	/* day of the week, 1970-01-01 was a Thursday */
 	tm->tm_wday = (days + 4) % 7;
diff --git a/drivers/s390/block/dasd_eckd.h b/drivers/s390/block/dasd_eckd.h
index fc2509c..a466820 100644
--- a/drivers/s390/block/dasd_eckd.h
+++ b/drivers/s390/block/dasd_eckd.h
@@ -379,7 +379,7 @@ struct dasd_psf_prssd_data {
 	unsigned char flags;
 	unsigned char reserved[4];
 	unsigned char suborder;
-	unsigned char varies[9];
+	unsigned char varies[5];
 } __attribute__ ((packed));
 
 /*
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index be95e55..4050845 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1895,15 +1895,23 @@ static int serial8250_startup(struct uart_port *port)
 		 * kick the UART on a regular basis.
 		 */
 		if (!(iir1 & UART_IIR_NO_INT) && (iir & UART_IIR_NO_INT)) {
+			up->bugs |= UART_BUG_THRE;
 			pr_debug("ttyS%d - using backup timer\n", port->line);
-			up->timer.function = serial8250_backup_timeout;
-			up->timer.data = (unsigned long)up;
-			mod_timer(&up->timer, jiffies +
-				poll_timeout(up->port.timeout) + HZ / 5);
 		}
 	}
 
 	/*
+	 * The above check will only give an accurate result the first time
+	 * the port is opened so this value needs to be preserved.
+	 */
+	if (up->bugs & UART_BUG_THRE) {
+		up->timer.function = serial8250_backup_timeout;
+		up->timer.data = (unsigned long)up;
+		mod_timer(&up->timer, jiffies +
+			  poll_timeout(up->port.timeout) + HZ / 5);
+	}
+
+	/*
 	 * If the "interrupt" for this port doesn't correspond with any
 	 * hardware interrupt, we use a timer-based system.  The original
 	 * driver used to do this with IRQ0.
diff --git a/drivers/serial/8250.h b/drivers/serial/8250.h
index 91bd28f..245288d 100644
--- a/drivers/serial/8250.h
+++ b/drivers/serial/8250.h
@@ -49,6 +49,7 @@ struct serial8250_config {
 #define UART_BUG_QUOT	(1 << 0)	/* UART has buggy quot LSB */
 #define UART_BUG_TXEN	(1 << 1)	/* UART has buggy TX IIR status */
 #define UART_BUG_NOMSR	(1 << 2)	/* UART has buggy MSR status bits (Au1x00) */
+#define UART_BUG_THRE	(1 << 3)	/* UART has buggy THRE reassertion */
 
 #define PROBE_RSA	(1 << 0)
 #define PROBE_ANY	(~0)
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index c3201af..560337a 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -525,8 +525,8 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)
 	tasklet_schedule(&acm->urb_task);
 
 done:
-err_out:
 	mutex_unlock(&acm->mutex);
+err_out:
 	mutex_unlock(&open_mutex);
 	return rv;
 
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index 59df132..4835bdc 100644
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -114,6 +114,17 @@ static struct vm_operations_struct fb_deferred_io_vm_ops = {
 	.page_mkwrite	= fb_deferred_io_mkwrite,
 };
 
+static int fb_deferred_io_set_page_dirty(struct page *page)
+{
+	if (!PageDirty(page))
+		SetPageDirty(page);
+	return 0;
+}
+
+static const struct address_space_operations fb_deferred_io_aops = {
+	.set_page_dirty = fb_deferred_io_set_page_dirty,
+};
+
 static int fb_deferred_io_mmap(struct fb_info *info, struct vm_area_struct *vma)
 {
 	vma->vm_ops = &fb_deferred_io_vm_ops;
@@ -163,6 +174,14 @@ void fb_deferred_io_init(struct fb_info *info)
 }
 EXPORT_SYMBOL_GPL(fb_deferred_io_init);
 
+void fb_deferred_io_open(struct fb_info *info,
+			 struct inode *inode,
+			 struct file *file)
+{
+	file->f_mapping->a_ops = &fb_deferred_io_aops;
+}
+EXPORT_SYMBOL_GPL(fb_deferred_io_open);
+
 void fb_deferred_io_cleanup(struct fb_info *info)
 {
 	void *screen_base = (void __force *) info->screen_base;
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 776f7fc..ce6b5da 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1340,6 +1340,10 @@ fb_open(struct inode *inode, struct file *file)
 		if (res)
 			module_put(info->fbops->owner);
 	}
+#ifdef CONFIG_FB_DEFERRED_IO
+	if (info->fbdefio)
+		fb_deferred_io_open(info, inode, file);
+#endif
 	return res;
 }
 
diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index 7191306..a0a7157 100644
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -119,8 +119,6 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 	if (bprm->misc_bang)
 		goto _ret;
 
-	bprm->misc_bang = 1;
-
 	/* to keep locking time low, we copy the interpreter string */
 	read_lock(&entries_lock);
 	fmt = check_file(bprm);
@@ -198,6 +196,8 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 	if (retval < 0)
 		goto _error;
 
+	bprm->misc_bang = 1;
+
 	retval = search_binary_handler (bprm, regs);
 	if (retval < 0)
 		goto _error;
diff --git a/fs/bio.c b/fs/bio.c
index 7856257..7db618c 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -464,20 +464,21 @@ static void bio_free_map_data(struct bio_map_data *bmd)
 	kfree(bmd);
 }
 
-static struct bio_map_data *bio_alloc_map_data(int nr_segs, int iov_count)
+static struct bio_map_data *bio_alloc_map_data(int nr_segs, int iov_count,
+					       gfp_t gfp_mask)
 {
-	struct bio_map_data *bmd = kmalloc(sizeof(*bmd), GFP_KERNEL);
+	struct bio_map_data *bmd = kmalloc(sizeof(*bmd), gfp_mask);
 
 	if (!bmd)
 		return NULL;
 
-	bmd->iovecs = kmalloc(sizeof(struct bio_vec) * nr_segs, GFP_KERNEL);
+	bmd->iovecs = kmalloc(sizeof(struct bio_vec) * nr_segs, gfp_mask);
 	if (!bmd->iovecs) {
 		kfree(bmd);
 		return NULL;
 	}
 
-	bmd->sgvecs = kmalloc(sizeof(struct sg_iovec) * iov_count, GFP_KERNEL);
+	bmd->sgvecs = kmalloc(sizeof(struct sg_iovec) * iov_count, gfp_mask);
 	if (bmd->sgvecs)
 		return bmd;
 
@@ -486,8 +487,8 @@ static struct bio_map_data *bio_alloc_map_data(int nr_segs, int iov_count)
 	return NULL;
 }
 
-static int __bio_copy_iov(struct bio *bio, struct sg_iovec *iov, int iov_count,
-			  int uncopy)
+static int __bio_copy_iov(struct bio *bio, struct bio_vec *iovecs,
+			  struct sg_iovec *iov, int iov_count, int uncopy)
 {
 	int ret = 0, i;
 	struct bio_vec *bvec;
@@ -497,7 +498,7 @@ static int __bio_copy_iov(struct bio *bio, struct sg_iovec *iov, int iov_count,
 
 	__bio_for_each_segment(bvec, bio, i, 0) {
 		char *bv_addr = page_address(bvec->bv_page);
-		unsigned int bv_len = bvec->bv_len;
+		unsigned int bv_len = iovecs[i].bv_len;
 
 		while (bv_len && iov_idx < iov_count) {
 			unsigned int bytes;
@@ -549,7 +550,7 @@ int bio_uncopy_user(struct bio *bio)
 	struct bio_map_data *bmd = bio->bi_private;
 	int ret;
 
-	ret = __bio_copy_iov(bio, bmd->sgvecs, bmd->nr_sgvecs, 1);
+	ret = __bio_copy_iov(bio, bmd->iovecs, bmd->sgvecs, bmd->nr_sgvecs, 1);
 
 	bio_free_map_data(bmd);
 	bio_put(bio);
@@ -591,7 +592,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q, struct sg_iovec *iov,
 		len += iov[i].iov_len;
 	}
 
-	bmd = bio_alloc_map_data(nr_pages, iov_count);
+	bmd = bio_alloc_map_data(nr_pages, iov_count, GFP_KERNEL);
 	if (!bmd)
 		return ERR_PTR(-ENOMEM);
 
@@ -628,7 +629,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q, struct sg_iovec *iov,
 	 * success
 	 */
 	if (!write_to_vm) {
-		ret = __bio_copy_iov(bio, iov, iov_count, 0);
+		ret = __bio_copy_iov(bio, bio->bi_io_vec, iov, iov_count, 0);
 		if (ret)
 			goto cleanup;
 	}
@@ -941,19 +942,22 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
 {
 	struct bio_vec *bvec;
 	const int read = bio_data_dir(bio) == READ;
-	char *p = bio->bi_private;
+	struct bio_map_data *bmd = bio->bi_private;
 	int i;
+	char *p = bmd->sgvecs[0].iov_base;
 
 	__bio_for_each_segment(bvec, bio, i, 0) {
 		char *addr = page_address(bvec->bv_page);
+		int len = bmd->iovecs[i].bv_len;
 
 		if (read && !err)
-			memcpy(p, addr, bvec->bv_len);
+			memcpy(p, addr, len);
 
 		__free_page(bvec->bv_page);
-		p += bvec->bv_len;
+		p += len;
 	}
 
+	bio_free_map_data(bmd);
 	bio_put(bio);
 }
 
@@ -977,11 +981,21 @@ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len,
 	const int nr_pages = end - start;
 	struct bio *bio;
 	struct bio_vec *bvec;
+	struct bio_map_data *bmd;
 	int i, ret;
+	struct sg_iovec iov;
+
+	iov.iov_base = data;
+	iov.iov_len = len;
+
+	bmd = bio_alloc_map_data(nr_pages, 1, gfp_mask);
+	if (!bmd)
+		return ERR_PTR(-ENOMEM);
 
+	ret = -ENOMEM;
 	bio = bio_alloc(gfp_mask, nr_pages);
 	if (!bio)
-		return ERR_PTR(-ENOMEM);
+		goto out_bmd;
 
 	while (len) {
 		struct page *page;
@@ -1015,14 +1029,18 @@ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len,
 		}
 	}
 
-	bio->bi_private = data;
+	bio->bi_private = bmd;
 	bio->bi_end_io = bio_copy_kern_endio;
+
+	bio_set_map_data(bmd, bio, &iov, 1);
 	return bio;
 cleanup:
 	bio_for_each_segment(bvec, bio, i)
 		__free_page(bvec->bv_page);
 
 	bio_put(bio);
+out_bmd:
+	bio_free_map_data(bmd);
 
 	return ERR_PTR(ret);
 }
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 0aac824..8da903b 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -832,6 +832,10 @@ ssize_t cifs_user_write(struct file *file, const char __user *write_data,
 		return -EBADF;
 	open_file = (struct cifsFileInfo *) file->private_data;
 
+	rc = generic_write_checks(file, poffset, &write_size, 0);
+	if (rc)
+		return rc;
+
 	xid = GetXid();
 
 	if (*poffset > file->f_path.dentry->d_inode->i_size)
diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c
index 0c3b618..f40423e 100644
--- a/fs/cramfs/inode.c
+++ b/fs/cramfs/inode.c
@@ -43,58 +43,13 @@ static DEFINE_MUTEX(read_mutex);
 static int cramfs_iget5_test(struct inode *inode, void *opaque)
 {
 	struct cramfs_inode *cramfs_inode = opaque;
-
-	if (inode->i_ino != CRAMINO(cramfs_inode))
-		return 0; /* does not match */
-
-	if (inode->i_ino != 1)
-		return 1;
-
-	/* all empty directories, char, block, pipe, and sock, share inode #1 */
-
-	if ((inode->i_mode != cramfs_inode->mode) ||
-	    (inode->i_gid != cramfs_inode->gid) ||
-	    (inode->i_uid != cramfs_inode->uid))
-		return 0; /* does not match */
-
-	if ((S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) &&
-	    (inode->i_rdev != old_decode_dev(cramfs_inode->size)))
-		return 0; /* does not match */
-
-	return 1; /* matches */
+	return inode->i_ino == CRAMINO(cramfs_inode) && inode->i_ino != 1;
 }
 
 static int cramfs_iget5_set(struct inode *inode, void *opaque)
 {
-	static struct timespec zerotime;
 	struct cramfs_inode *cramfs_inode = opaque;
-	inode->i_mode = cramfs_inode->mode;
-	inode->i_uid = cramfs_inode->uid;
-	inode->i_size = cramfs_inode->size;
-	inode->i_blocks = (cramfs_inode->size - 1) / 512 + 1;
-	inode->i_gid = cramfs_inode->gid;
-	/* Struct copy intentional */
-	inode->i_mtime = inode->i_atime = inode->i_ctime = zerotime;
 	inode->i_ino = CRAMINO(cramfs_inode);
-	/* inode->i_nlink is left 1 - arguably wrong for directories,
-	   but it's the best we can do without reading the directory
-           contents.  1 yields the right result in GNU find, even
-	   without -noleaf option. */
-	if (S_ISREG(inode->i_mode)) {
-		inode->i_fop = &generic_ro_fops;
-		inode->i_data.a_ops = &cramfs_aops;
-	} else if (S_ISDIR(inode->i_mode)) {
-		inode->i_op = &cramfs_dir_inode_operations;
-		inode->i_fop = &cramfs_directory_operations;
-	} else if (S_ISLNK(inode->i_mode)) {
-		inode->i_op = &page_symlink_inode_operations;
-		inode->i_data.a_ops = &cramfs_aops;
-	} else {
-		inode->i_size = 0;
-		inode->i_blocks = 0;
-		init_special_inode(inode, inode->i_mode,
-			old_decode_dev(cramfs_inode->size));
-	}
 	return 0;
 }
 
@@ -104,12 +59,48 @@ static struct inode *get_cramfs_inode(struct super_block *sb,
 	struct inode *inode = iget5_locked(sb, CRAMINO(cramfs_inode),
 					    cramfs_iget5_test, cramfs_iget5_set,
 					    cramfs_inode);
+	static struct timespec zerotime;
+
 	if (inode && (inode->i_state & I_NEW)) {
+		inode->i_mode = cramfs_inode->mode;
+		inode->i_uid = cramfs_inode->uid;
+		inode->i_size = cramfs_inode->size;
+		inode->i_blocks = (cramfs_inode->size - 1) / 512 + 1;
+		inode->i_gid = cramfs_inode->gid;
+		/* Struct copy intentional */
+		inode->i_mtime = inode->i_atime = inode->i_ctime = zerotime;
+		/* inode->i_nlink is left 1 - arguably wrong for directories,
+		   but it's the best we can do without reading the directory
+		   contents.  1 yields the right result in GNU find, even
+		   without -noleaf option. */
+		if (S_ISREG(inode->i_mode)) {
+			inode->i_fop = &generic_ro_fops;
+			inode->i_data.a_ops = &cramfs_aops;
+		} else if (S_ISDIR(inode->i_mode)) {
+			inode->i_op = &cramfs_dir_inode_operations;
+			inode->i_fop = &cramfs_directory_operations;
+		} else if (S_ISLNK(inode->i_mode)) {
+			inode->i_op = &page_symlink_inode_operations;
+			inode->i_data.a_ops = &cramfs_aops;
+		} else {
+			inode->i_size = 0;
+			inode->i_blocks = 0;
+			init_special_inode(inode, inode->i_mode,
+				old_decode_dev(cramfs_inode->size));
+		}
 		unlock_new_inode(inode);
 	}
 	return inode;
 }
 
+static void cramfs_drop_inode(struct inode *inode)
+{
+	if (inode->i_ino == 1)
+		generic_delete_inode(inode);
+	else
+		generic_drop_inode(inode);
+}
+
 /*
  * We have our own block cache: don't fill up the buffer cache
  * with the rom-image, because the way the filesystem is set
@@ -534,6 +525,7 @@ static const struct super_operations cramfs_ops = {
 	.put_super	= cramfs_put_super,
 	.remount_fs	= cramfs_remount,
 	.statfs		= cramfs_statfs,
+	.drop_inode	= cramfs_drop_inode,
 };
 
 static int cramfs_get_sb(struct file_system_type *fs_type,
diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
index b6ed383..54b8b41 100644
--- a/fs/nfsd/nfs4acl.c
+++ b/fs/nfsd/nfs4acl.c
@@ -443,7 +443,7 @@ init_state(struct posix_acl_state *state, int cnt)
 	 * enough space for either:
 	 */
 	alloc = sizeof(struct posix_ace_state_array)
-		+ cnt*sizeof(struct posix_ace_state);
+		+ cnt*sizeof(struct posix_user_ace_state);
 	state->users = kzalloc(alloc, GFP_KERNEL);
 	if (!state->users)
 		return -ENOMEM;
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 71d70d1..27af0b8 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -293,7 +293,6 @@ unifdef-y += parport.h
 unifdef-y += patchkey.h
 unifdef-y += pci.h
 unifdef-y += personality.h
-unifdef-y += pim.h
 unifdef-y += pktcdvd.h
 unifdef-y += pmu.h
 unifdef-y += poll.h
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 72295b0..dd82c76 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -973,6 +973,9 @@ static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch,
 
 /* drivers/video/fb_defio.c */
 extern void fb_deferred_io_init(struct fb_info *info);
+extern void fb_deferred_io_open(struct fb_info *info,
+				struct inode *inode,
+				struct file *file);
 extern void fb_deferred_io_cleanup(struct fb_info *info);
 extern int fb_deferred_io_fsync(struct file *file, struct dentry *dentry,
 				int datasync);
diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index de4decf..35a8277 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -2,11 +2,7 @@
 #define __LINUX_MROUTE_H
 
 #include <linux/sockios.h>
-#include <linux/types.h>
-#ifdef __KERNEL__
 #include <linux/in.h>
-#endif
-#include <linux/pim.h>
 
 /*
  *	Based on the MROUTING 3.5 defines primarily to keep
@@ -214,6 +210,27 @@ struct mfc_cache
 #define IGMPMSG_WHOLEPKT	3		/* For PIM Register processing */
 
 #ifdef __KERNEL__
+
+#define PIM_V1_VERSION		__constant_htonl(0x10000000)
+#define PIM_V1_REGISTER		1
+
+#define PIM_VERSION		2
+#define PIM_REGISTER		1
+
+#define PIM_NULL_REGISTER	__constant_htonl(0x40000000)
+
+/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */
+
+struct pimreghdr
+{
+	__u8	type;
+	__u8	reserved;
+	__be16	csum;
+	__be32	flags;
+};
+
+extern int pim_rcv_v1(struct sk_buff *);
+
 struct rtmsg;
 extern int ipmr_get_route(struct sk_buff *skb, struct rtmsg *rtm, int nowait);
 #endif
diff --git a/include/linux/pim.h b/include/linux/pim.h
deleted file mode 100644
index 236ffd3..0000000
--- a/include/linux/pim.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef __LINUX_PIM_H
-#define __LINUX_PIM_H
-
-#include <asm/byteorder.h>
-
-#ifndef __KERNEL__
-struct pim {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8	pim_type:4,		/* PIM message type */
-		pim_ver:4;		/* PIM version */
-#elif defined(__BIG_ENDIAN_BITFIELD)
-	__u8	pim_ver:4;		/* PIM version */
-		pim_type:4;		/* PIM message type */
-#endif
-	__u8	pim_rsv;		/* Reserved */
-	__be16	pim_cksum;		/* Checksum */
-};
-
-#define PIM_MINLEN		8
-#endif
-
-/* Message types - V1 */
-#define PIM_V1_VERSION		__constant_htonl(0x10000000)
-#define PIM_V1_REGISTER		1
-
-/* Message types - V2 */
-#define PIM_VERSION		2
-#define PIM_REGISTER		1
-
-#if defined(__KERNEL__)
-#define PIM_NULL_REGISTER	__constant_htonl(0x40000000)
-
-/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */
-struct pimreghdr
-{
-	__u8	type;
-	__u8	reserved;
-	__be16	csum;
-	__be32	flags;
-};
-
-struct sk_buff;
-extern int pim_rcv_v1(struct sk_buff *);
-#endif
-#endif
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index bbd3d58..99ca7cd 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -80,7 +80,8 @@ extern struct inet6_ifaddr      *ipv6_get_ifaddr(struct net *net,
 						 struct net_device *dev,
 						 int strict);
 
-extern int			ipv6_dev_get_saddr(struct net_device *dev, 
+extern int			ipv6_dev_get_saddr(struct net *net,
+					       struct net_device *dev,
 					       const struct in6_addr *daddr,
 					       unsigned int srcprefs,
 					       struct in6_addr *saddr);
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 9313491..03462e5 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -112,6 +112,7 @@ struct rt6_rtnl_dump_arg
 {
 	struct sk_buff *skb;
 	struct netlink_callback *cb;
+	struct net *net;
 };
 
 extern int rt6_dump_route(struct rt6_info *rt, void *p_arg);
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index f32fae3..0d520dc 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -693,6 +693,9 @@ int move_freepages(struct zone *zone,
 #endif
 
 	for (page = start_page; page <= end_page;) {
+		/* Make sure we are not inadvertently changing nodes */
+		VM_BUG_ON(page_to_nid(page) != zone_to_nid(zone));
+
 		if (!pfn_valid_within(page_to_pfn(page))) {
 			page++;
 			continue;
@@ -2475,6 +2478,10 @@ static void setup_zone_migrate_reserve(struct zone *zone)
 			continue;
 		page = pfn_to_page(pfn);
 
+		/* Watch out for overlapping nodes */
+		if (page_to_nid(page) != zone_to_nid(zone))
+			continue;
+
 		/* Blocks with reserved pages will never free, skip them. */
 		if (PageReserved(page))
 			continue;
diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
index f597987..f288fc4 100644
--- a/net/ax25/sysctl_net_ax25.c
+++ b/net/ax25/sysctl_net_ax25.c
@@ -36,6 +36,7 @@ static struct ctl_path ax25_path[] = {
 	{ .procname = "ax25", .ctl_name = NET_AX25, },
 	{ }
 };
+
 static const ctl_table ax25_param_table[] = {
 	{
 		.ctl_name	= NET_AX25_IP_DEFAULT_MODE,
@@ -167,6 +168,7 @@ static const ctl_table ax25_param_table[] = {
 		.extra1		= &min_proto,
 		.extra2		= &max_proto
 	},
+#ifdef CONFIG_AX25_DAMA_SLAVE
 	{
 		.ctl_name	= NET_AX25_DAMA_SLAVE_TIMEOUT,
 		.procname	= "dama_slave_timeout",
@@ -177,6 +179,8 @@ static const ctl_table ax25_param_table[] = {
 		.extra1		= &min_ds_timeout,
 		.extra2		= &max_ds_timeout
 	},
+#endif
+
 	{ .ctl_name = 0 }	/* that's all, folks! */
 };
 
@@ -210,16 +214,6 @@ void ax25_register_sysctl(void)
 		ax25_table[n].procname     = ax25_dev->dev->name;
 		ax25_table[n].mode         = 0555;
 
-#ifndef CONFIG_AX25_DAMA_SLAVE
-		/*
-		 * We do not wish to have a representation of this parameter
-		 * in /proc/sys/ when configured *not* to include the
-		 * AX.25 DAMA slave code, do we?
-		 */
-
-		child[AX25_VALUES_DS_TIMEOUT].procname = NULL;
-#endif
-
 		child[AX25_MAX_VALUES].ctl_name = 0;	/* just in case... */
 
 		for (k = 0; k < AX25_MAX_VALUES; k++)
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 9f3f7ba..b6e7ec0 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -988,7 +988,9 @@ int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
 		    up->encap_rcv != NULL) {
 			int ret;
 
+			bh_unlock_sock(sk);
 			ret = (*up->encap_rcv)(sk, skb);
+			bh_lock_sock(sk);
 			if (ret <= 0) {
 				UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS,
 						 is_udplite);
@@ -1087,7 +1089,7 @@ static int __udp4_lib_mcast_deliver(struct sk_buff *skb,
 			if (skb1) {
 				int ret = 0;
 
-				bh_lock_sock_nested(sk);
+				bh_lock_sock(sk);
 				if (!sock_owned_by_user(sk))
 					ret = udp_queue_rcv_skb(sk, skb1);
 				else
@@ -1187,7 +1189,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[],
 
 	if (sk != NULL) {
 		int ret = 0;
-		bh_lock_sock_nested(sk);
+		bh_lock_sock(sk);
 		if (!sock_owned_by_user(sk))
 			ret = udp_queue_rcv_skb(sk, skb);
 		else
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index ff61a5c..1a1d494 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1076,13 +1076,12 @@ out:
 	return ret;
 }
 
-int ipv6_dev_get_saddr(struct net_device *dst_dev,
+int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
 		       const struct in6_addr *daddr, unsigned int prefs,
 		       struct in6_addr *saddr)
 {
 	struct ipv6_saddr_score scores[2],
 				*score = &scores[0], *hiscore = &scores[1];
-	struct net *net = dev_net(dst_dev);
 	struct ipv6_saddr_dst dst;
 	struct net_device *dev;
 	int dst_type;
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index 8d05527..f5de3f9 100644
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -93,7 +93,8 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp,
 			if (flags & RT6_LOOKUP_F_SRCPREF_COA)
 				srcprefs |= IPV6_PREFER_SRC_COA;
 
-			if (ipv6_dev_get_saddr(ip6_dst_idev(&rt->u.dst)->dev,
+			if (ipv6_dev_get_saddr(net,
+					       ip6_dst_idev(&rt->u.dst)->dev,
 					       &flp->fl6_dst, srcprefs,
 					       &saddr))
 				goto again;
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 918fde4..fe80171 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -380,6 +380,7 @@ static int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)
 
 	arg.skb = skb;
 	arg.cb = cb;
+	arg.net = net;
 	w->args = &arg;
 
 	for (h = s_h; h < FIB_TABLE_HASHSZ; h++, s_e = 0) {
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 4019770..d99f094 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -925,7 +925,7 @@ static int ip6_dst_lookup_tail(struct sock *sk,
 		goto out_err_release;
 
 	if (ipv6_addr_any(&fl->fl6_src)) {
-		err = ipv6_dev_get_saddr(ip6_dst_idev(*dst)->dev,
+		err = ipv6_dev_get_saddr(net, ip6_dst_idev(*dst)->dev,
 					 &fl->fl6_dst,
 					 sk ? inet6_sk(sk)->srcprefs : 0,
 					 &fl->fl6_src);
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 282fdb3..efa84ae 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -549,7 +549,7 @@ static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh,
 			override = 0;
 		in6_ifa_put(ifp);
 	} else {
-		if (ipv6_dev_get_saddr(dev, daddr,
+		if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
 				       inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs,
 				       &tmpaddr))
 			return;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 7ff6870..9deee59 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2098,7 +2098,8 @@ static inline size_t rt6_nlmsg_size(void)
 	       + nla_total_size(sizeof(struct rta_cacheinfo));
 }
 
-static int rt6_fill_node(struct sk_buff *skb, struct rt6_info *rt,
+static int rt6_fill_node(struct net *net,
+			 struct sk_buff *skb, struct rt6_info *rt,
 			 struct in6_addr *dst, struct in6_addr *src,
 			 int iif, int type, u32 pid, u32 seq,
 			 int prefix, int nowait, unsigned int flags)
@@ -2179,8 +2180,9 @@ static int rt6_fill_node(struct sk_buff *skb, struct rt6_info *rt,
 #endif
 			NLA_PUT_U32(skb, RTA_IIF, iif);
 	} else if (dst) {
+		struct inet6_dev *idev = ip6_dst_idev(&rt->u.dst);
 		struct in6_addr saddr_buf;
-		if (ipv6_dev_get_saddr(ip6_dst_idev(&rt->u.dst)->dev,
+		if (ipv6_dev_get_saddr(net, idev ? idev->dev : NULL,
 				       dst, 0, &saddr_buf) == 0)
 			NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf);
 	}
@@ -2225,7 +2227,8 @@ int rt6_dump_route(struct rt6_info *rt, void *p_arg)
 	} else
 		prefix = 0;
 
-	return rt6_fill_node(arg->skb, rt, NULL, NULL, 0, RTM_NEWROUTE,
+	return rt6_fill_node(arg->net,
+		     arg->skb, rt, NULL, NULL, 0, RTM_NEWROUTE,
 		     NETLINK_CB(arg->cb->skb).pid, arg->cb->nlh->nlmsg_seq,
 		     prefix, 0, NLM_F_MULTI);
 }
@@ -2291,7 +2294,7 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void
 	rt = (struct rt6_info*) ip6_route_output(net, NULL, &fl);
 	skb->dst = &rt->u.dst;
 
-	err = rt6_fill_node(skb, rt, &fl.fl6_dst, &fl.fl6_src, iif,
+	err = rt6_fill_node(net, skb, rt, &fl.fl6_dst, &fl.fl6_src, iif,
 			    RTM_NEWROUTE, NETLINK_CB(in_skb).pid,
 			    nlh->nlmsg_seq, 0, 0, 0);
 	if (err < 0) {
@@ -2318,7 +2321,7 @@ void inet6_rt_notify(int event, struct rt6_info *rt, struct nl_info *info)
 	if (skb == NULL)
 		goto errout;
 
-	err = rt6_fill_node(skb, rt, NULL, NULL, 0,
+	err = rt6_fill_node(net, skb, rt, NULL, NULL, 0,
 				event, info->pid, seq, 0, 0, 0);
 	if (err < 0) {
 		/* -EMSGSIZE implies BUG in rt6_nlmsg_size() */
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index dd30962..e14aa66 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -376,7 +376,7 @@ static int __udp6_lib_mcast_deliver(struct sk_buff *skb, struct in6_addr *saddr,
 					uh->source, saddr, dif))) {
 		struct sk_buff *buff = skb_clone(skb, GFP_ATOMIC);
 		if (buff) {
-			bh_lock_sock_nested(sk2);
+			bh_lock_sock(sk2);
 			if (!sock_owned_by_user(sk2))
 				udpv6_queue_rcv_skb(sk2, buff);
 			else
@@ -384,7 +384,7 @@ static int __udp6_lib_mcast_deliver(struct sk_buff *skb, struct in6_addr *saddr,
 			bh_unlock_sock(sk2);
 		}
 	}
-	bh_lock_sock_nested(sk);
+	bh_lock_sock(sk);
 	if (!sock_owned_by_user(sk))
 		udpv6_queue_rcv_skb(sk, skb);
 	else
@@ -502,7 +502,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[],
 
 	/* deliver */
 
-	bh_lock_sock_nested(sk);
+	bh_lock_sock(sk);
 	if (!sock_owned_by_user(sk))
 		udpv6_queue_rcv_skb(sk, skb);
 	else
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 8f1e054..08e4cbb 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -52,12 +52,14 @@ static struct dst_entry *xfrm6_dst_lookup(int tos, xfrm_address_t *saddr,
 static int xfrm6_get_saddr(xfrm_address_t *saddr, xfrm_address_t *daddr)
 {
 	struct dst_entry *dst;
+	struct net_device *dev;
 
 	dst = xfrm6_dst_lookup(0, NULL, daddr);
 	if (IS_ERR(dst))
 		return -EHOSTUNREACH;
 
-	ipv6_dev_get_saddr(ip6_dst_idev(dst)->dev,
+	dev = ip6_dst_idev(dst)->dev;
+	ipv6_dev_get_saddr(dev_net(dev), dev,
 			   (struct in6_addr *)&daddr->a6, 0,
 			   (struct in6_addr *)&saddr->a6);
 	dst_release(dst);
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 74e662c..b5e116c 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -205,10 +205,9 @@ struct tcf_common *tcf_hash_check(u32 index, struct tc_action *a, int bind,
 {
 	struct tcf_common *p = NULL;
 	if (index && (p = tcf_hash_lookup(index, hinfo)) != NULL) {
-		if (bind) {
+		if (bind)
 			p->tcfc_bindcnt++;
-			p->tcfc_refcnt++;
-		}
+		p->tcfc_refcnt++;
 		a->priv = p;
 	}
 	return p;
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 3fb58f4..51c3f68 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -595,11 +595,13 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 		kfree_skb(skb);
 		return ret;
 #endif
-	} else if (cl->un.leaf.q->enqueue(skb, cl->un.leaf.q) !=
+	} else if ((ret = cl->un.leaf.q->enqueue(skb, cl->un.leaf.q)) !=
 		   NET_XMIT_SUCCESS) {
-		sch->qstats.drops++;
-		cl->qstats.drops++;
-		return NET_XMIT_DROP;
+		if (ret == NET_XMIT_DROP) {
+			sch->qstats.drops++;
+			cl->qstats.drops++;
+		}
+		return ret;
 	} else {
 		cl->bstats.packets +=
 			skb_is_gso(skb)?skb_shinfo(skb)->gso_segs:1;
@@ -639,11 +641,13 @@ static int htb_requeue(struct sk_buff *skb, struct Qdisc *sch)
 		kfree_skb(skb);
 		return ret;
 #endif
-	} else if (cl->un.leaf.q->ops->requeue(skb, cl->un.leaf.q) !=
+	} else if ((ret = cl->un.leaf.q->ops->requeue(skb, cl->un.leaf.q)) !=
 		   NET_XMIT_SUCCESS) {
-		sch->qstats.drops++;
-		cl->qstats.drops++;
-		return NET_XMIT_DROP;
+		if (ret == NET_XMIT_DROP) {
+			sch->qstats.drops++;
+			cl->qstats.drops++;
+		}
+		return ret;
 	} else
 		htb_activate(q, cl);
 
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c
index 5532f10..ec0c921 100644
--- a/net/sched/sch_prio.c
+++ b/net/sched/sch_prio.c
@@ -228,14 +228,20 @@ static int prio_tune(struct Qdisc *sch, struct nlattr *opt)
 {
 	struct prio_sched_data *q = qdisc_priv(sch);
 	struct tc_prio_qopt *qopt;
-	struct nlattr *tb[TCA_PRIO_MAX + 1];
+	struct nlattr *tb[TCA_PRIO_MAX + 1] = {0};
 	int err;
 	int i;
 
-	err = nla_parse_nested_compat(tb, TCA_PRIO_MAX, opt, NULL, qopt,
-				      sizeof(*qopt));
-	if (err < 0)
-		return err;
+	qopt = nla_data(opt);
+	if (nla_len(opt) < sizeof(*qopt))
+		return -1;
+
+	if (nla_len(opt) >= sizeof(*qopt) + sizeof(struct nlattr)) {
+		err = nla_parse_nested(tb, TCA_PRIO_MAX,
+				       (struct nlattr *) (qopt + 1), NULL);
+		if (err < 0)
+			return err;
+	}
 
 	q->bands = qopt->bands;
 	/* If we're multiqueue, make sure the number of incoming bands
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
index 0b7d78f..fc6f8f3 100644
--- a/net/sched/sch_tbf.c
+++ b/net/sched/sch_tbf.c
@@ -123,15 +123,8 @@ static int tbf_enqueue(struct sk_buff *skb, struct Qdisc* sch)
 	struct tbf_sched_data *q = qdisc_priv(sch);
 	int ret;
 
-	if (skb->len > q->max_size) {
-		sch->qstats.drops++;
-#ifdef CONFIG_NET_CLS_ACT
-		if (sch->reshape_fail == NULL || sch->reshape_fail(skb, sch))
-#endif
-			kfree_skb(skb);
-
-		return NET_XMIT_DROP;
-	}
+	if (skb->len > q->max_size)
+		return qdisc_reshape_fail(skb, sch);
 
 	if ((ret = q->qdisc->enqueue(skb, q->qdisc)) != 0) {
 		sch->qstats.drops++;
diff --git a/net/sctp/auth.c b/net/sctp/auth.c
index 675a5c3..52db5f6 100644
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
@@ -80,6 +80,10 @@ static struct sctp_auth_bytes *sctp_auth_create_key(__u32 key_len, gfp_t gfp)
 {
 	struct sctp_auth_bytes *key;
 
+	/* Verify that we are not going to overflow INT_MAX */
+	if ((INT_MAX - key_len) < sizeof(struct sctp_auth_bytes))
+		return NULL;
+
 	/* Allocate the shared key */
 	key = kmalloc(sizeof(struct sctp_auth_bytes) + key_len, gfp);
 	if (!key)
@@ -782,6 +786,9 @@ int sctp_auth_ep_set_hmacs(struct sctp_endpoint *ep,
 	for (i = 0; i < hmacs->shmac_num_idents; i++) {
 		id = hmacs->shmac_idents[i];
 
+		if (id > SCTP_AUTH_HMAC_ID_MAX)
+			return -EOPNOTSUPP;
+
 		if (SCTP_AUTH_HMAC_ID_SHA1 == id)
 			has_sha1 = 1;
 
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c
index e39a0cd..4c8d9f4 100644
--- a/net/sctp/endpointola.c
+++ b/net/sctp/endpointola.c
@@ -103,6 +103,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,
 
 		/* Initialize the CHUNKS parameter */
 		auth_chunks->param_hdr.type = SCTP_PARAM_CHUNKS;
+		auth_chunks->param_hdr.length = htons(sizeof(sctp_paramhdr_t));
 
 		/* If the Add-IP functionality is enabled, we must
 		 * authenticate, ASCONF and ASCONF-ACK chunks
@@ -110,8 +111,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,
 		if (sctp_addip_enable) {
 			auth_chunks->chunks[0] = SCTP_CID_ASCONF;
 			auth_chunks->chunks[1] = SCTP_CID_ASCONF_ACK;
-			auth_chunks->param_hdr.length =
-					htons(sizeof(sctp_paramhdr_t) + 2);
+			auth_chunks->param_hdr.length += htons(2);
 		}
 	}
 
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index a2f4d4d..38a5d80 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -317,7 +317,8 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk,
 			  __func__, asoc, dst, NIP6(daddr->v6.sin6_addr));
 
 	if (!asoc) {
-		ipv6_dev_get_saddr(dst ? ip6_dst_idev(dst)->dev : NULL,
+		ipv6_dev_get_saddr(sock_net(sctp_opt2sk(sk)),
+				   dst ? ip6_dst_idev(dst)->dev : NULL,
 				   &daddr->v6.sin6_addr,
 				   inet6_sk(&sk->inet.sk)->srcprefs,
 				   &saddr->v6.sin6_addr);
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 0dbcde6..700d27d 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -2965,6 +2965,9 @@ static int sctp_setsockopt_auth_chunk(struct sock *sk,
 {
 	struct sctp_authchunk val;
 
+	if (!sctp_auth_enable)
+		return -EACCES;
+
 	if (optlen != sizeof(struct sctp_authchunk))
 		return -EINVAL;
 	if (copy_from_user(&val, optval, optlen))
@@ -2993,8 +2996,12 @@ static int sctp_setsockopt_hmac_ident(struct sock *sk,
 				    int optlen)
 {
 	struct sctp_hmacalgo *hmacs;
+	u32 idents;
 	int err;
 
+	if (!sctp_auth_enable)
+		return -EACCES;
+
 	if (optlen < sizeof(struct sctp_hmacalgo))
 		return -EINVAL;
 
@@ -3007,8 +3014,9 @@ static int sctp_setsockopt_hmac_ident(struct sock *sk,
 		goto out;
 	}
 
-	if (hmacs->shmac_num_idents == 0 ||
-	    hmacs->shmac_num_idents > SCTP_AUTH_NUM_HMACS) {
+	idents = hmacs->shmac_num_idents;
+	if (idents == 0 || idents > SCTP_AUTH_NUM_HMACS ||
+	    (idents * sizeof(u16)) > (optlen - sizeof(struct sctp_hmacalgo))) {
 		err = -EINVAL;
 		goto out;
 	}
@@ -3033,6 +3041,9 @@ static int sctp_setsockopt_auth_key(struct sock *sk,
 	struct sctp_association *asoc;
 	int ret;
 
+	if (!sctp_auth_enable)
+		return -EACCES;
+
 	if (optlen <= sizeof(struct sctp_authkey))
 		return -EINVAL;
 
@@ -3045,6 +3056,11 @@ static int sctp_setsockopt_auth_key(struct sock *sk,
 		goto out;
 	}
 
+	if (authkey->sca_keylength > optlen - sizeof(struct sctp_authkey)) {
+		ret = -EINVAL;
+		goto out;
+	}
+
 	asoc = sctp_id2assoc(sk, authkey->sca_assoc_id);
 	if (!asoc && authkey->sca_assoc_id && sctp_style(sk, UDP)) {
 		ret = -EINVAL;
@@ -3070,6 +3086,9 @@ static int sctp_setsockopt_active_key(struct sock *sk,
 	struct sctp_authkeyid val;
 	struct sctp_association *asoc;
 
+	if (!sctp_auth_enable)
+		return -EACCES;
+
 	if (optlen != sizeof(struct sctp_authkeyid))
 		return -EINVAL;
 	if (copy_from_user(&val, optval, optlen))
@@ -3095,6 +3114,9 @@ static int sctp_setsockopt_del_key(struct sock *sk,
 	struct sctp_authkeyid val;
 	struct sctp_association *asoc;
 
+	if (!sctp_auth_enable)
+		return -EACCES;
+
 	if (optlen != sizeof(struct sctp_authkeyid))
 		return -EINVAL;
 	if (copy_from_user(&val, optval, optlen))
@@ -5053,19 +5075,29 @@ static int sctp_getsockopt_maxburst(struct sock *sk, int len,
 static int sctp_getsockopt_hmac_ident(struct sock *sk, int len,
 				    char __user *optval, int __user *optlen)
 {
+	struct sctp_hmacalgo  __user *p = (void __user *)optval;
 	struct sctp_hmac_algo_param *hmacs;
-	__u16 param_len;
+	__u16 data_len = 0;
+	u32 num_idents;
+
+	if (!sctp_auth_enable)
+		return -EACCES;
 
 	hmacs = sctp_sk(sk)->ep->auth_hmacs_list;
-	param_len = ntohs(hmacs->param_hdr.length);
+	data_len = ntohs(hmacs->param_hdr.length) - sizeof(sctp_paramhdr_t);
 
-	if (len < param_len)
+	if (len < sizeof(struct sctp_hmacalgo) + data_len)
 		return -EINVAL;
+
+	len = sizeof(struct sctp_hmacalgo) + data_len;
+	num_idents = data_len / sizeof(u16);
+
 	if (put_user(len, optlen))
 		return -EFAULT;
-	if (copy_to_user(optval, hmacs->hmac_ids, len))
+	if (put_user(num_idents, &p->shmac_num_idents))
+		return -EFAULT;
+	if (copy_to_user(p->shmac_idents, hmacs->hmac_ids, data_len))
 		return -EFAULT;
-
 	return 0;
 }
 
@@ -5075,6 +5107,9 @@ static int sctp_getsockopt_active_key(struct sock *sk, int len,
 	struct sctp_authkeyid val;
 	struct sctp_association *asoc;
 
+	if (!sctp_auth_enable)
+		return -EACCES;
+
 	if (len < sizeof(struct sctp_authkeyid))
 		return -EINVAL;
 	if (copy_from_user(&val, optval, sizeof(struct sctp_authkeyid)))
@@ -5089,6 +5124,12 @@ static int sctp_getsockopt_active_key(struct sock *sk, int len,
 	else
 		val.scact_keynumber = sctp_sk(sk)->ep->active_key_id;
 
+	len = sizeof(struct sctp_authkeyid);
+	if (put_user(len, optlen))
+		return -EFAULT;
+	if (copy_to_user(optval, &val, len))
+		return -EFAULT;
+
 	return 0;
 }
 
@@ -5099,13 +5140,16 @@ static int sctp_getsockopt_peer_auth_chunks(struct sock *sk, int len,
 	struct sctp_authchunks val;
 	struct sctp_association *asoc;
 	struct sctp_chunks_param *ch;
-	u32    num_chunks;
+	u32    num_chunks = 0;
 	char __user *to;
 
-	if (len <= sizeof(struct sctp_authchunks))
+	if (!sctp_auth_enable)
+		return -EACCES;
+
+	if (len < sizeof(struct sctp_authchunks))
 		return -EINVAL;
 
-	if (copy_from_user(&val, p, sizeof(struct sctp_authchunks)))
+	if (copy_from_user(&val, optval, sizeof(struct sctp_authchunks)))
 		return -EFAULT;
 
 	to = p->gauth_chunks;
@@ -5114,20 +5158,21 @@ static int sctp_getsockopt_peer_auth_chunks(struct sock *sk, int len,
 		return -EINVAL;
 
 	ch = asoc->peer.peer_chunks;
+	if (!ch)
+		goto num;
 
 	/* See if the user provided enough room for all the data */
 	num_chunks = ntohs(ch->param_hdr.length) - sizeof(sctp_paramhdr_t);
 	if (len < num_chunks)
 		return -EINVAL;
 
-	len = num_chunks;
-	if (put_user(len, optlen))
+	if (copy_to_user(to, ch->chunks, num_chunks))
 		return -EFAULT;
+num:
+	len = sizeof(struct sctp_authchunks) + num_chunks;
+	if (put_user(len, optlen)) return -EFAULT;
 	if (put_user(num_chunks, &p->gauth_number_of_chunks))
 		return -EFAULT;
-	if (copy_to_user(to, ch->chunks, len))
-		return -EFAULT;
-
 	return 0;
 }
 
@@ -5138,13 +5183,16 @@ static int sctp_getsockopt_local_auth_chunks(struct sock *sk, int len,
 	struct sctp_authchunks val;
 	struct sctp_association *asoc;
 	struct sctp_chunks_param *ch;
-	u32    num_chunks;
+	u32    num_chunks = 0;
 	char __user *to;
 
-	if (len <= sizeof(struct sctp_authchunks))
+	if (!sctp_auth_enable)
+		return -EACCES;
+
+	if (len < sizeof(struct sctp_authchunks))
 		return -EINVAL;
 
-	if (copy_from_user(&val, p, sizeof(struct sctp_authchunks)))
+	if (copy_from_user(&val, optval, sizeof(struct sctp_authchunks)))
 		return -EFAULT;
 
 	to = p->gauth_chunks;
@@ -5157,17 +5205,21 @@ static int sctp_getsockopt_local_auth_chunks(struct sock *sk, int len,
 	else
 		ch = sctp_sk(sk)->ep->auth_chunk_list;
 
+	if (!ch)
+		goto num;
+
 	num_chunks = ntohs(ch->param_hdr.length) - sizeof(sctp_paramhdr_t);
-	if (len < num_chunks)
+	if (len < sizeof(struct sctp_authchunks) + num_chunks)
 		return -EINVAL;
 
-	len = num_chunks;
+	if (copy_to_user(to, ch->chunks, num_chunks))
+		return -EFAULT;
+num:
+	len = sizeof(struct sctp_authchunks) + num_chunks;
 	if (put_user(len, optlen))
 		return -EFAULT;
 	if (put_user(num_chunks, &p->gauth_number_of_chunks))
 		return -EFAULT;
-	if (copy_to_user(to, ch->chunks, len))
-		return -EFAULT;
 
 	return 0;
 }
diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c
index 0f8c439..5231f7a 100644
--- a/net/sunrpc/sysctl.c
+++ b/net/sunrpc/sysctl.c
@@ -60,24 +60,14 @@ static int proc_do_xprt(ctl_table *table, int write, struct file *file,
 			void __user *buffer, size_t *lenp, loff_t *ppos)
 {
 	char tmpbuf[256];
-	int len;
+	size_t len;
+
 	if ((*ppos && !write) || !*lenp) {
 		*lenp = 0;
 		return 0;
 	}
-	if (write)
-		return -EINVAL;
-	else {
-		len = svc_print_xprts(tmpbuf, sizeof(tmpbuf));
-		if (!access_ok(VERIFY_WRITE, buffer, len))
-			return -EFAULT;
-
-		if (__copy_to_user(buffer, tmpbuf, len))
-			return -EFAULT;
-	}
-	*lenp -= len;
-	*ppos += len;
-	return 0;
+	len = svc_print_xprts(tmpbuf, sizeof(tmpbuf));
+	return simple_read_from_buffer(buffer, *lenp, ppos, tmpbuf, len);
 }
 
 static int
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 72fddaf..391f456 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -780,11 +780,13 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr,
 {
 	unsigned int h;
 	struct hlist_node *entry;
-	struct xfrm_state *x, *x0;
+	struct xfrm_state *x, *x0, *to_put;
 	int acquire_in_progress = 0;
 	int error = 0;
 	struct xfrm_state *best = NULL;
 
+	to_put = NULL;
+
 	spin_lock_bh(&xfrm_state_lock);
 	h = xfrm_dst_hash(daddr, saddr, tmpl->reqid, family);
 	hlist_for_each_entry(x, entry, xfrm_state_bydst+h, bydst) {
@@ -833,7 +835,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr,
 		if (tmpl->id.spi &&
 		    (x0 = __xfrm_state_lookup(daddr, tmpl->id.spi,
 					      tmpl->id.proto, family)) != NULL) {
-			xfrm_state_put(x0);
+			to_put = x0;
 			error = -EEXIST;
 			goto out;
 		}
@@ -849,7 +851,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr,
 		error = security_xfrm_state_alloc_acquire(x, pol->security, fl->secid);
 		if (error) {
 			x->km.state = XFRM_STATE_DEAD;
-			xfrm_state_put(x);
+			to_put = x;
 			x = NULL;
 			goto out;
 		}
@@ -870,7 +872,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr,
 			xfrm_hash_grow_check(x->bydst.next != NULL);
 		} else {
 			x->km.state = XFRM_STATE_DEAD;
-			xfrm_state_put(x);
+			to_put = x;
 			x = NULL;
 			error = -ESRCH;
 		}
@@ -881,6 +883,8 @@ out:
 	else
 		*err = acquire_in_progress ? -EAGAIN : error;
 	spin_unlock_bh(&xfrm_state_lock);
+	if (to_put)
+		xfrm_state_put(to_put);
 	return x;
 }
 
@@ -1067,18 +1071,20 @@ static struct xfrm_state *__xfrm_find_acq_byseq(u32 seq);
 
 int xfrm_state_add(struct xfrm_state *x)
 {
-	struct xfrm_state *x1;
+	struct xfrm_state *x1, *to_put;
 	int family;
 	int err;
 	int use_spi = xfrm_id_proto_match(x->id.proto, IPSEC_PROTO_ANY);
 
 	family = x->props.family;
 
+	to_put = NULL;
+
 	spin_lock_bh(&xfrm_state_lock);
 
 	x1 = __xfrm_state_locate(x, use_spi, family);
 	if (x1) {
-		xfrm_state_put(x1);
+		to_put = x1;
 		x1 = NULL;
 		err = -EEXIST;
 		goto out;
@@ -1088,7 +1094,7 @@ int xfrm_state_add(struct xfrm_state *x)
 		x1 = __xfrm_find_acq_byseq(x->km.seq);
 		if (x1 && ((x1->id.proto != x->id.proto) ||
 		    xfrm_addr_cmp(&x1->id.daddr, &x->id.daddr, family))) {
-			xfrm_state_put(x1);
+			to_put = x1;
 			x1 = NULL;
 		}
 	}
@@ -1110,6 +1116,9 @@ out:
 		xfrm_state_put(x1);
 	}
 
+	if (to_put)
+		xfrm_state_put(to_put);
+
 	return err;
 }
 EXPORT_SYMBOL(xfrm_state_add);
@@ -1269,10 +1278,12 @@ EXPORT_SYMBOL(xfrm_state_migrate);
 
 int xfrm_state_update(struct xfrm_state *x)
 {
-	struct xfrm_state *x1;
+	struct xfrm_state *x1, *to_put;
 	int err;
 	int use_spi = xfrm_id_proto_match(x->id.proto, IPSEC_PROTO_ANY);
 
+	to_put = NULL;
+
 	spin_lock_bh(&xfrm_state_lock);
 	x1 = __xfrm_state_locate(x, use_spi, x->props.family);
 
@@ -1281,7 +1292,7 @@ int xfrm_state_update(struct xfrm_state *x)
 		goto out;
 
 	if (xfrm_state_kern(x1)) {
-		xfrm_state_put(x1);
+		to_put = x1;
 		err = -EEXIST;
 		goto out;
 	}
@@ -1295,6 +1306,9 @@ int xfrm_state_update(struct xfrm_state *x)
 out:
 	spin_unlock_bh(&xfrm_state_lock);
 
+	if (to_put)
+		xfrm_state_put(to_put);
+
 	if (err)
 		return err;
 
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c
index 6facac5..05eb899 100644
--- a/sound/pci/oxygen/oxygen_mixer.c
+++ b/sound/pci/oxygen/oxygen_mixer.c
@@ -512,9 +512,12 @@ static int ac97_switch_get(struct snd_kcontrol *ctl,
 
 static void mute_ac97_ctl(struct oxygen *chip, unsigned int control)
 {
-	unsigned int priv_idx = chip->controls[control]->private_value & 0xff;
+	unsigned int priv_idx;
 	u16 value;
 
+	if (!chip->controls[control])
+		return;
+	priv_idx = chip->controls[control]->private_value & 0xff;
 	value = oxygen_read_ac97(chip, 0, priv_idx);
 	if (!(value & 0x8000)) {
 		oxygen_write_ac97(chip, 0, priv_idx, value | 0x8000);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.756
retrieving revision 1.757
diff -u -r1.756 -r1.757
--- kernel.spec	3 Sep 2008 06:48:18 -0000	1.756
+++ kernel.spec	4 Sep 2008 01:57:33 -0000	1.757
@@ -554,7 +554,7 @@
 %endif
 
 # stable release candidate
-# Patch03: patch-2.6.25.6-rc1.bz2
+Patch03: patch-2.6.26.4-rc1
 
 # we always need nonintconfig, even for -vanilla kernels
 Patch06: linux-2.6-build-nonintconfig.patch
@@ -609,8 +609,6 @@
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch402: linux-2.6-scsi-mpt-vmware-fix.patch
 
-Patch410: linux-2.6-bio-fix-__bio_copy_iov-handling-of-bv_len.patch
-Patch411: linux-2.6-bio-fix-bio_copy_kern-handling-of-bv_len.patch
 Patch412: linux-2.6-block-submit_bh-discards-barrier-flag.patch
 
 # filesystem patches
@@ -662,7 +660,6 @@
 # atl2 network driver
 Patch2020: linux-2.6-netdev-atl2.patch
 Patch2021: linux-2.6-netdev-atl1e.patch
-Patch2022: linux-2.6-netdev-atl1-disable-tso-by-default.patch
 
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
@@ -988,7 +985,7 @@
 %endif
 
 # stable release candidate
-# ApplyPatch patch-2.6.25.6-rc1.bz2
+ApplyPatch patch-2.6.26.4-rc1
 
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
 # also gives a list of missing options at the end. Useful for automated
@@ -1133,9 +1130,6 @@
 
 # block/bio
 #
-# bio patches queued for -stable
-ApplyPatch linux-2.6-bio-fix-__bio_copy_iov-handling-of-bv_len.patch
-ApplyPatch linux-2.6-bio-fix-bio_copy_kern-handling-of-bv_len.patch
 # don't discard barrier flags
 ApplyPatch linux-2.6-block-submit_bh-discards-barrier-flag.patch
 
@@ -1216,7 +1210,6 @@
 
 ApplyPatch linux-2.6-netdev-atl2.patch
 ApplyPatch linux-2.6-netdev-atl1e.patch
-ApplyPatch linux-2.6-netdev-atl1-disable-tso-by-default.patch
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
@@ -1829,6 +1822,13 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Wed Sep 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.3-30
+- Linux 2.6.26.4-rc1
+  Dropped patches:
+    linux-2.6-bio-fix-__bio_copy_iov-handling-of-bv_len.patch
+    linux-2.6-bio-fix-bio_copy_kern-handling-of-bv_len.patch
+    linux-2.6-netdev-atl1-disable-tso-by-default.patch
+
 * Wed Sep 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.3-29
 - [CIFS] Turn off Unicode during session establishment for plaintext authentication
 - atl1: disable TSO by default


--- linux-2.6-bio-fix-__bio_copy_iov-handling-of-bv_len.patch DELETED ---


--- linux-2.6-bio-fix-bio_copy_kern-handling-of-bv_len.patch DELETED ---


--- linux-2.6-netdev-atl1-disable-tso-by-default.patch DELETED ---



From cebbert at fedoraproject.org  Thu Sep  4 02:03:11 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu,  4 Sep 2008 02:03:11 +0000 (UTC)
Subject: rpms/kernel/F-8 patch-2.6.26.4-rc1, NONE, 1.1 kernel.spec, 1.524,
	1.525 linux-2.6-bio-fix-__bio_copy_iov-handling-of-bv_len.patch, 1.1, 
	NONE linux-2.6-bio-fix-bio_copy_kern-handling-of-bv_len.patch,
	1.1, NONE linux-2.6-netdev-atl1-disable-tso-by-default.patch,
	1.1, NONE
Message-ID: <20080904020311.A303370120@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3252

Modified Files:
	kernel.spec 
Added Files:
	patch-2.6.26.4-rc1 
Removed Files:
	linux-2.6-bio-fix-__bio_copy_iov-handling-of-bv_len.patch 
	linux-2.6-bio-fix-bio_copy_kern-handling-of-bv_len.patch 
	linux-2.6-netdev-atl1-disable-tso-by-default.patch 
Log Message:
Linux 2.6.26.4-rc1
  Dropped patches:
    linux-2.6-bio-fix-__bio_copy_iov-handling-of-bv_len.patch
    linux-2.6-bio-fix-bio_copy_kern-handling-of-bv_len.patch
    linux-2.6-netdev-atl1-disable-tso-by-default.patch


--- NEW FILE patch-2.6.26.4-rc1 ---
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index e289a98..387d3f6 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -842,6 +842,9 @@ static unsigned long nid_range(unsigned long start, unsigned long end,
 		start += PAGE_SIZE;
 	}
 
+	if (start > end)
+		start = end;
+
 	return start;
 }
 #else
@@ -1769,8 +1772,7 @@ void __init paging_init(void)
 
 	find_ramdisk(phys_base);
 
-	if (cmdline_memory_size)
-		lmb_enforce_memory_limit(phys_base + cmdline_memory_size);
+	lmb_enforce_memory_limit(cmdline_memory_size);
 
 	lmb_analyze();
 	lmb_dump_all();
@@ -2007,6 +2009,15 @@ void __init mem_init(void)
 void free_initmem(void)
 {
 	unsigned long addr, initend;
+	int do_free = 1;
+
+	/* If the physical memory maps were trimmed by kernel command
+	 * line options, don't even try freeing this initmem stuff up.
+	 * The kernel image could have been in the trimmed out region
+	 * and if so the freeing below will free invalid page structs.
+	 */
+	if (cmdline_memory_size)
+		do_free = 0;
 
 	/*
 	 * The init section is aligned to 8k in vmlinux.lds. Page align for >8k pagesizes.
@@ -2021,13 +2032,16 @@ void free_initmem(void)
 			((unsigned long) __va(kern_base)) -
 			((unsigned long) KERNBASE));
 		memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
-		p = virt_to_page(page);
 
-		ClearPageReserved(p);
-		init_page_count(p);
-		__free_page(p);
-		num_physpages++;
-		totalram_pages++;
+		if (do_free) {
+			p = virt_to_page(page);
+
+			ClearPageReserved(p);
+			init_page_count(p);
+			__free_page(p);
+			num_physpages++;
+			totalram_pages++;
+		}
 	}
 }
 
diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c
index 3fd7a67..e710a21 100644
--- a/arch/x86/kernel/cpu/cyrix.c
+++ b/arch/x86/kernel/cpu/cyrix.c
@@ -134,23 +134,6 @@ static void __cpuinit set_cx86_memwb(void)
 	setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x14);
 }
 
-static void __cpuinit set_cx86_inc(void)
-{
-	unsigned char ccr3;
-
-	printk(KERN_INFO "Enable Incrementor on Cyrix/NSC processor.\n");
-
-	ccr3 = getCx86(CX86_CCR3);
-	setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */
-	/* PCR1 -- Performance Control */
-	/* Incrementor on, whatever that is */
-	setCx86(CX86_PCR1, getCx86(CX86_PCR1) | 0x02);
-	/* PCR0 -- Performance Control */
-	/* Incrementor Margin 10 */
-	setCx86(CX86_PCR0, getCx86(CX86_PCR0) | 0x04);
-	setCx86(CX86_CCR3, ccr3);	/* disable MAPEN */
-}
-
 /*
  *	Configure later MediaGX and/or Geode processor.
  */
@@ -174,7 +157,6 @@ static void __cpuinit geode_configure(void)
 
 	set_cx86_memwb();
 	set_cx86_reorder();
-	set_cx86_inc();
 
 	local_irq_restore(flags);
 }
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index 75b14b1..745b974 100644
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -365,6 +365,7 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,
 			     unsigned long *size, mtrr_type *type)
 {
 	unsigned int mask_lo, mask_hi, base_lo, base_hi;
+	unsigned int tmp, hi;
 
 	rdmsr(MTRRphysMask_MSR(reg), mask_lo, mask_hi);
 	if ((mask_lo & 0x800) == 0) {
@@ -378,8 +379,23 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,
 	rdmsr(MTRRphysBase_MSR(reg), base_lo, base_hi);
 
 	/* Work out the shifted address mask. */
-	mask_lo = size_or_mask | mask_hi << (32 - PAGE_SHIFT)
-	    | mask_lo >> PAGE_SHIFT;
+	tmp = mask_hi << (32 - PAGE_SHIFT) | mask_lo >> PAGE_SHIFT;
+	mask_lo = size_or_mask | tmp;
+	/* Expand tmp with high bits to all 1s*/
+	hi = fls(tmp);
+	if (hi > 0) {
+		tmp |= ~((1<<(hi - 1)) - 1);
+
+		if (tmp != mask_lo) {
+			static int once = 1;
+
+			if (once) {
+				printk(KERN_INFO "mtrr: your BIOS has set up an incorrect mask, fixing it up.\n");
+				once = 0;
+			}
+			mask_lo = tmp;
+		}
+	}
 
 	/* This works correctly if size is a power of two, i.e. a
 	   contiguous range. */
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index 934c7b6..d333a74 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -343,7 +343,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
 		shadow_addr = __pa(shadow_page->spt);
 		shadow_pte = shadow_addr | PT_PRESENT_MASK | PT_ACCESSED_MASK
 			| PT_WRITABLE_MASK | PT_USER_MASK;
-		*shadow_ent = shadow_pte;
+		set_shadow_pte(shadow_ent, shadow_pte);
 	}
 
 	mmu_set_spte(vcpu, shadow_ent, access, walker->pte_access & access,
diff --git a/crypto/authenc.c b/crypto/authenc.c
index 4b22676..fd9f06c 100644
--- a/crypto/authenc.c
+++ b/crypto/authenc.c
@@ -174,8 +174,9 @@ static int crypto_authenc_genicv(struct aead_request *req, u8 *iv,
 static void crypto_authenc_encrypt_done(struct crypto_async_request *req,
 					int err)
 {
+	struct aead_request *areq = req->data;
+
 	if (!err) {
-		struct aead_request *areq = req->data;
 		struct crypto_aead *authenc = crypto_aead_reqtfm(areq);
 		struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
 		struct ablkcipher_request *abreq = aead_request_ctx(areq);
@@ -185,7 +186,7 @@ static void crypto_authenc_encrypt_done(struct crypto_async_request *req,
 		err = crypto_authenc_genicv(areq, iv, 0);
 	}
 
-	aead_request_complete(req->data, err);
+	aead_request_complete(areq, err);
 }
 
 static int crypto_authenc_encrypt(struct aead_request *req)
@@ -216,14 +217,15 @@ static int crypto_authenc_encrypt(struct aead_request *req)
 static void crypto_authenc_givencrypt_done(struct crypto_async_request *req,
 					   int err)
 {
+	struct aead_request *areq = req->data;
+
 	if (!err) {
-		struct aead_request *areq = req->data;
 		struct skcipher_givcrypt_request *greq = aead_request_ctx(areq);
 
 		err = crypto_authenc_genicv(areq, greq->giv, 0);
 	}
 
-	aead_request_complete(req->data, err);
+	aead_request_complete(areq, err);
 }
 
 static int crypto_authenc_givencrypt(struct aead_givcrypt_request *req)
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index ad169ff..80c655f 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -1134,30 +1134,16 @@ static int mv_qc_defer(struct ata_queued_cmd *qc)
 	if (ap->nr_active_links == 0)
 		return 0;
 
-	if (pp->pp_flags & MV_PP_FLAG_EDMA_EN) {
-		/*
-		 * The port is operating in host queuing mode (EDMA).
-		 * It can accomodate a new qc if the qc protocol
-		 * is compatible with the current host queue mode.
-		 */
-		if (pp->pp_flags & MV_PP_FLAG_NCQ_EN) {
-			/*
-			 * The host queue (EDMA) is in NCQ mode.
-			 * If the new qc is also an NCQ command,
-			 * then allow the new qc.
-			 */
-			if (qc->tf.protocol == ATA_PROT_NCQ)
-				return 0;
-		} else {
-			/*
-			 * The host queue (EDMA) is in non-NCQ, DMA mode.
-			 * If the new qc is also a non-NCQ, DMA command,
-			 * then allow the new qc.
-			 */
-			if (qc->tf.protocol == ATA_PROT_DMA)
-				return 0;
-		}
-	}
+	/*
+	 * The port is operating in host queuing mode (EDMA) with NCQ
+	 * enabled, allow multiple NCQ commands.  EDMA also allows
+	 * queueing multiple DMA commands but libata core currently
+	 * doesn't allow it.
+	 */
+	if ((pp->pp_flags & MV_PP_FLAG_EDMA_EN) &&
+	    (pp->pp_flags & MV_PP_FLAG_NCQ_EN) && ata_is_ncq(qc->tf.protocol))
+		return 0;
+
 	return ATA_DEFER_PORT;
 }
 
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 0cf98bd..71320d2 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -406,7 +406,7 @@ struct entropy_store {
 	/* read-write data: */
 	spinlock_t lock;
 	unsigned add_ptr;
-	int entropy_count;
+	int entropy_count;	/* Must at no time exceed ->POOLBITS! */
 	int input_rotate;
 };
 
@@ -519,6 +519,7 @@ static void mix_pool_bytes(struct entropy_store *r, const void *in, int bytes)
 static void credit_entropy_bits(struct entropy_store *r, int nbits)
 {
 	unsigned long flags;
+	int entropy_count;
 
 	if (!nbits)
 		return;
@@ -526,20 +527,20 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits)
 	spin_lock_irqsave(&r->lock, flags);
 
 	DEBUG_ENT("added %d entropy credits to %s\n", nbits, r->name);
-	r->entropy_count += nbits;
-	if (r->entropy_count < 0) {
+	entropy_count = r->entropy_count;
+	entropy_count += nbits;
+	if (entropy_count < 0) {
 		DEBUG_ENT("negative entropy/overflow\n");
-		r->entropy_count = 0;
-	} else if (r->entropy_count > r->poolinfo->POOLBITS)
-		r->entropy_count = r->poolinfo->POOLBITS;
+		entropy_count = 0;
+	} else if (entropy_count > r->poolinfo->POOLBITS)
+		entropy_count = r->poolinfo->POOLBITS;
+	r->entropy_count = entropy_count;
 
 	/* should we wake readers? */
-	if (r == &input_pool &&
-	    r->entropy_count >= random_read_wakeup_thresh) {
+	if (r == &input_pool && entropy_count >= random_read_wakeup_thresh) {
 		wake_up_interruptible(&random_read_wait);
 		kill_fasync(&fasync, SIGIO, POLL_IN);
 	}
-
 	spin_unlock_irqrestore(&r->lock, flags);
 }
 
diff --git a/drivers/misc/eeepc-laptop.c b/drivers/misc/eeepc-laptop.c
index 6d72760..3f3abf9 100644
--- a/drivers/misc/eeepc-laptop.c
+++ b/drivers/misc/eeepc-laptop.c
@@ -553,9 +553,9 @@ static void eeepc_hwmon_exit(void)
 	hwmon = eeepc_hwmon_device;
 	if (!hwmon)
 		return ;
-	hwmon_device_unregister(hwmon);
 	sysfs_remove_group(&hwmon->kobj,
 			   &hwmon_attribute_group);
+	hwmon_device_unregister(hwmon);
 	eeepc_hwmon_device = NULL;
 }
 
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 3c798ae..8fe0a49 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -3019,7 +3019,6 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
 	netdev->features = NETIF_F_HW_CSUM;
 	netdev->features |= NETIF_F_SG;
 	netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
-	netdev->features |= NETIF_F_TSO;
 	netdev->features |= NETIF_F_LLTX;
 
 	/*
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 20d4fe9..1652f10 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5420,7 +5420,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
 	if (id->driver_data & DEV_HAS_CHECKSUM) {
 		np->rx_csum = 1;
 		np->txrxctl_bits |= NVREG_TXRXCTL_RXCHECK;
-		dev->features |= NETIF_F_HW_CSUM | NETIF_F_SG;
+		dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;
 		dev->features |= NETIF_F_TSO;
 	}
 
@@ -5728,7 +5728,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
 
 	dev_printk(KERN_INFO, &pci_dev->dev, "%s%s%s%s%s%s%s%s%s%sdesc-v%u\n",
 		   dev->features & NETIF_F_HIGHDMA ? "highdma " : "",
-		   dev->features & (NETIF_F_HW_CSUM | NETIF_F_SG) ?
+		   dev->features & (NETIF_F_IP_CSUM | NETIF_F_SG) ?
 		   	"csum " : "",
 		   dev->features & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX) ?
 		   	"vlan " : "",
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 42d7c0a..0e4eb15 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2822,7 +2822,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev,
 					pkt_size, PCI_DMA_FROMDEVICE);
 				rtl8169_mark_to_asic(desc, tp->rx_buf_sz);
 			} else {
-				pci_unmap_single(pdev, addr, pkt_size,
+				pci_unmap_single(pdev, addr, tp->rx_buf_sz,
 						 PCI_DMA_FROMDEVICE);
 				tp->Rx_skbuff[entry] = NULL;
 			}
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index cc4bde8..1710e49 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -1672,15 +1672,43 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
 }
 
 /* tp->lock is held. */
+static inline void tg3_generate_fw_event(struct tg3 *tp)
+{
+	u32 val;
+
+	val = tr32(GRC_RX_CPU_EVENT);
+	val |= GRC_RX_CPU_DRIVER_EVENT;
+	tw32_f(GRC_RX_CPU_EVENT, val);
+
+	tp->last_event_jiffies = jiffies;
+}
+
+#define TG3_FW_EVENT_TIMEOUT_USEC 2500
+
+/* tp->lock is held. */
 static void tg3_wait_for_event_ack(struct tg3 *tp)
 {
 	int i;
+	unsigned int delay_cnt;
+	long time_remain;
+
+	/* If enough time has passed, no wait is necessary. */
+	time_remain = (long)(tp->last_event_jiffies + 1 +
+		      usecs_to_jiffies(TG3_FW_EVENT_TIMEOUT_USEC)) -
+		      (long)jiffies;
+	if (time_remain < 0)
+		return;
 
-	/* Wait for up to 2.5 milliseconds */
-	for (i = 0; i < 250000; i++) {
+	/* Check if we can shorten the wait time. */
+	delay_cnt = jiffies_to_usecs(time_remain);
+	if (delay_cnt > TG3_FW_EVENT_TIMEOUT_USEC)
+		delay_cnt = TG3_FW_EVENT_TIMEOUT_USEC;
+	delay_cnt = (delay_cnt >> 3) + 1;
+
+	for (i = 0; i < delay_cnt; i++) {
 		if (!(tr32(GRC_RX_CPU_EVENT) & GRC_RX_CPU_DRIVER_EVENT))
 			break;
-		udelay(10);
+		udelay(8);
 	}
 }
 
@@ -1729,9 +1757,7 @@ static void tg3_ump_link_report(struct tg3 *tp)
 		val = 0;
 	tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX + 12, val);
 
-	val = tr32(GRC_RX_CPU_EVENT);
-	val |= GRC_RX_CPU_DRIVER_EVENT;
-	tw32_f(GRC_RX_CPU_EVENT, val);
+	tg3_generate_fw_event(tp);
 }
 
 static void tg3_link_report(struct tg3 *tp)
@@ -5565,6 +5591,7 @@ static int tg3_chip_reset(struct tg3 *tp)
 		tg3_read_mem(tp, NIC_SRAM_DATA_CFG, &nic_cfg);
 		if (nic_cfg & NIC_SRAM_DATA_CFG_ASF_ENABLE) {
 			tp->tg3_flags |= TG3_FLAG_ENABLE_ASF;
+			tp->last_event_jiffies = jiffies;
 			if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS)
 				tp->tg3_flags2 |= TG3_FLG2_ASF_NEW_HANDSHAKE;
 		}
@@ -5578,15 +5605,12 @@ static void tg3_stop_fw(struct tg3 *tp)
 {
 	if ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) &&
 	   !(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE)) {
-		u32 val;
-
 		/* Wait for RX cpu to ACK the previous event. */
 		tg3_wait_for_event_ack(tp);
 
 		tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX, FWCMD_NICDRV_PAUSE_FW);
-		val = tr32(GRC_RX_CPU_EVENT);
-		val |= GRC_RX_CPU_DRIVER_EVENT;
-		tw32(GRC_RX_CPU_EVENT, val);
+
+		tg3_generate_fw_event(tp);
 
 		/* Wait for RX cpu to ACK this event. */
 		tg3_wait_for_event_ack(tp);
@@ -7477,8 +7501,6 @@ static void tg3_timer(unsigned long __opaque)
 	 */
 	if (!--tp->asf_counter) {
 		if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {
-			u32 val;
-
 			tg3_wait_for_event_ack(tp);
 
 			tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX,
@@ -7486,9 +7508,8 @@ static void tg3_timer(unsigned long __opaque)
 			tg3_write_mem(tp, NIC_SRAM_FW_CMD_LEN_MBOX, 4);
 			/* 5 seconds timeout */
 			tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX, 5);
-			val = tr32(GRC_RX_CPU_EVENT);
-			val |= GRC_RX_CPU_DRIVER_EVENT;
-			tw32_f(GRC_RX_CPU_EVENT, val);
+
+			tg3_generate_fw_event(tp);
 		}
 		tp->asf_counter = tp->asf_multiplier;
 	}
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index 0404f93..d68b579 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2404,7 +2404,10 @@ struct tg3 {
 	struct tg3_ethtool_stats	estats;
 	struct tg3_ethtool_stats	estats_prev;
 
+	union {
 	unsigned long			phy_crc_errors;
+	unsigned long			last_event_jiffies;
+	};
 
 	u32				rx_offset;
 	u32				tg3_flags;
diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index 217814f..3b3b5f1 100644
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -280,6 +280,8 @@ static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
 			      match_pci_dev_by_id);
 	if (dev)
 		pdev = to_pci_dev(dev);
+	if (from)
+		pci_dev_put(from);
 	return pdev;
 }
 
diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c
index 9f996ec..dd70bf7 100644
--- a/drivers/rtc/rtc-lib.c
+++ b/drivers/rtc/rtc-lib.c
@@ -51,10 +51,11 @@ EXPORT_SYMBOL(rtc_year_days);
  */
 void rtc_time_to_tm(unsigned long time, struct rtc_time *tm)
 {
-	unsigned int days, month, year;
+	unsigned int month, year;
+	int days;
 
 	days = time / 86400;
-	time -= days * 86400;
+	time -= (unsigned int) days * 86400;
 
 	/* day of the week, 1970-01-01 was a Thursday */
 	tm->tm_wday = (days + 4) % 7;
diff --git a/drivers/s390/block/dasd_eckd.h b/drivers/s390/block/dasd_eckd.h
index fc2509c..a466820 100644
--- a/drivers/s390/block/dasd_eckd.h
+++ b/drivers/s390/block/dasd_eckd.h
@@ -379,7 +379,7 @@ struct dasd_psf_prssd_data {
 	unsigned char flags;
 	unsigned char reserved[4];
 	unsigned char suborder;
-	unsigned char varies[9];
+	unsigned char varies[5];
 } __attribute__ ((packed));
 
 /*
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index be95e55..4050845 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1895,15 +1895,23 @@ static int serial8250_startup(struct uart_port *port)
 		 * kick the UART on a regular basis.
 		 */
 		if (!(iir1 & UART_IIR_NO_INT) && (iir & UART_IIR_NO_INT)) {
+			up->bugs |= UART_BUG_THRE;
 			pr_debug("ttyS%d - using backup timer\n", port->line);
-			up->timer.function = serial8250_backup_timeout;
-			up->timer.data = (unsigned long)up;
-			mod_timer(&up->timer, jiffies +
-				poll_timeout(up->port.timeout) + HZ / 5);
 		}
 	}
 
 	/*
+	 * The above check will only give an accurate result the first time
+	 * the port is opened so this value needs to be preserved.
+	 */
+	if (up->bugs & UART_BUG_THRE) {
+		up->timer.function = serial8250_backup_timeout;
+		up->timer.data = (unsigned long)up;
+		mod_timer(&up->timer, jiffies +
+			  poll_timeout(up->port.timeout) + HZ / 5);
+	}
+
+	/*
 	 * If the "interrupt" for this port doesn't correspond with any
 	 * hardware interrupt, we use a timer-based system.  The original
 	 * driver used to do this with IRQ0.
diff --git a/drivers/serial/8250.h b/drivers/serial/8250.h
index 91bd28f..245288d 100644
--- a/drivers/serial/8250.h
+++ b/drivers/serial/8250.h
@@ -49,6 +49,7 @@ struct serial8250_config {
 #define UART_BUG_QUOT	(1 << 0)	/* UART has buggy quot LSB */
 #define UART_BUG_TXEN	(1 << 1)	/* UART has buggy TX IIR status */
 #define UART_BUG_NOMSR	(1 << 2)	/* UART has buggy MSR status bits (Au1x00) */
+#define UART_BUG_THRE	(1 << 3)	/* UART has buggy THRE reassertion */
 
 #define PROBE_RSA	(1 << 0)
 #define PROBE_ANY	(~0)
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index c3201af..560337a 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -525,8 +525,8 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)
 	tasklet_schedule(&acm->urb_task);
 
 done:
-err_out:
 	mutex_unlock(&acm->mutex);
+err_out:
 	mutex_unlock(&open_mutex);
 	return rv;
 
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index 59df132..4835bdc 100644
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -114,6 +114,17 @@ static struct vm_operations_struct fb_deferred_io_vm_ops = {
 	.page_mkwrite	= fb_deferred_io_mkwrite,
 };
 
+static int fb_deferred_io_set_page_dirty(struct page *page)
+{
+	if (!PageDirty(page))
+		SetPageDirty(page);
+	return 0;
+}
+
+static const struct address_space_operations fb_deferred_io_aops = {
+	.set_page_dirty = fb_deferred_io_set_page_dirty,
+};
+
 static int fb_deferred_io_mmap(struct fb_info *info, struct vm_area_struct *vma)
 {
 	vma->vm_ops = &fb_deferred_io_vm_ops;
@@ -163,6 +174,14 @@ void fb_deferred_io_init(struct fb_info *info)
 }
 EXPORT_SYMBOL_GPL(fb_deferred_io_init);
 
+void fb_deferred_io_open(struct fb_info *info,
+			 struct inode *inode,
+			 struct file *file)
+{
+	file->f_mapping->a_ops = &fb_deferred_io_aops;
+}
+EXPORT_SYMBOL_GPL(fb_deferred_io_open);
+
 void fb_deferred_io_cleanup(struct fb_info *info)
 {
 	void *screen_base = (void __force *) info->screen_base;
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 776f7fc..ce6b5da 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1340,6 +1340,10 @@ fb_open(struct inode *inode, struct file *file)
 		if (res)
 			module_put(info->fbops->owner);
 	}
+#ifdef CONFIG_FB_DEFERRED_IO
+	if (info->fbdefio)
+		fb_deferred_io_open(info, inode, file);
+#endif
 	return res;
 }
 
diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index 7191306..a0a7157 100644
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -119,8 +119,6 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 	if (bprm->misc_bang)
 		goto _ret;
 
-	bprm->misc_bang = 1;
-
 	/* to keep locking time low, we copy the interpreter string */
 	read_lock(&entries_lock);
 	fmt = check_file(bprm);
@@ -198,6 +196,8 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 	if (retval < 0)
 		goto _error;
 
+	bprm->misc_bang = 1;
+
 	retval = search_binary_handler (bprm, regs);
 	if (retval < 0)
 		goto _error;
diff --git a/fs/bio.c b/fs/bio.c
index 7856257..7db618c 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -464,20 +464,21 @@ static void bio_free_map_data(struct bio_map_data *bmd)
 	kfree(bmd);
 }
 
-static struct bio_map_data *bio_alloc_map_data(int nr_segs, int iov_count)
+static struct bio_map_data *bio_alloc_map_data(int nr_segs, int iov_count,
+					       gfp_t gfp_mask)
 {
-	struct bio_map_data *bmd = kmalloc(sizeof(*bmd), GFP_KERNEL);
+	struct bio_map_data *bmd = kmalloc(sizeof(*bmd), gfp_mask);
 
 	if (!bmd)
 		return NULL;
 
-	bmd->iovecs = kmalloc(sizeof(struct bio_vec) * nr_segs, GFP_KERNEL);
+	bmd->iovecs = kmalloc(sizeof(struct bio_vec) * nr_segs, gfp_mask);
 	if (!bmd->iovecs) {
 		kfree(bmd);
 		return NULL;
 	}
 
-	bmd->sgvecs = kmalloc(sizeof(struct sg_iovec) * iov_count, GFP_KERNEL);
+	bmd->sgvecs = kmalloc(sizeof(struct sg_iovec) * iov_count, gfp_mask);
 	if (bmd->sgvecs)
 		return bmd;
 
@@ -486,8 +487,8 @@ static struct bio_map_data *bio_alloc_map_data(int nr_segs, int iov_count)
 	return NULL;
 }
 
-static int __bio_copy_iov(struct bio *bio, struct sg_iovec *iov, int iov_count,
-			  int uncopy)
+static int __bio_copy_iov(struct bio *bio, struct bio_vec *iovecs,
+			  struct sg_iovec *iov, int iov_count, int uncopy)
 {
 	int ret = 0, i;
 	struct bio_vec *bvec;
@@ -497,7 +498,7 @@ static int __bio_copy_iov(struct bio *bio, struct sg_iovec *iov, int iov_count,
 
 	__bio_for_each_segment(bvec, bio, i, 0) {
 		char *bv_addr = page_address(bvec->bv_page);
-		unsigned int bv_len = bvec->bv_len;
+		unsigned int bv_len = iovecs[i].bv_len;
 
 		while (bv_len && iov_idx < iov_count) {
 			unsigned int bytes;
@@ -549,7 +550,7 @@ int bio_uncopy_user(struct bio *bio)
 	struct bio_map_data *bmd = bio->bi_private;
 	int ret;
 
-	ret = __bio_copy_iov(bio, bmd->sgvecs, bmd->nr_sgvecs, 1);
+	ret = __bio_copy_iov(bio, bmd->iovecs, bmd->sgvecs, bmd->nr_sgvecs, 1);
 
 	bio_free_map_data(bmd);
 	bio_put(bio);
@@ -591,7 +592,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q, struct sg_iovec *iov,
 		len += iov[i].iov_len;
 	}
 
-	bmd = bio_alloc_map_data(nr_pages, iov_count);
+	bmd = bio_alloc_map_data(nr_pages, iov_count, GFP_KERNEL);
 	if (!bmd)
 		return ERR_PTR(-ENOMEM);
 
@@ -628,7 +629,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q, struct sg_iovec *iov,
 	 * success
 	 */
 	if (!write_to_vm) {
-		ret = __bio_copy_iov(bio, iov, iov_count, 0);
+		ret = __bio_copy_iov(bio, bio->bi_io_vec, iov, iov_count, 0);
 		if (ret)
 			goto cleanup;
 	}
@@ -941,19 +942,22 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
 {
 	struct bio_vec *bvec;
 	const int read = bio_data_dir(bio) == READ;
-	char *p = bio->bi_private;
+	struct bio_map_data *bmd = bio->bi_private;
 	int i;
+	char *p = bmd->sgvecs[0].iov_base;
 
 	__bio_for_each_segment(bvec, bio, i, 0) {
 		char *addr = page_address(bvec->bv_page);
+		int len = bmd->iovecs[i].bv_len;
 
 		if (read && !err)
-			memcpy(p, addr, bvec->bv_len);
+			memcpy(p, addr, len);
 
 		__free_page(bvec->bv_page);
-		p += bvec->bv_len;
+		p += len;
 	}
 
+	bio_free_map_data(bmd);
 	bio_put(bio);
 }
 
@@ -977,11 +981,21 @@ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len,
 	const int nr_pages = end - start;
 	struct bio *bio;
 	struct bio_vec *bvec;
+	struct bio_map_data *bmd;
 	int i, ret;
+	struct sg_iovec iov;
+
+	iov.iov_base = data;
+	iov.iov_len = len;
+
+	bmd = bio_alloc_map_data(nr_pages, 1, gfp_mask);
+	if (!bmd)
+		return ERR_PTR(-ENOMEM);
 
+	ret = -ENOMEM;
 	bio = bio_alloc(gfp_mask, nr_pages);
 	if (!bio)
-		return ERR_PTR(-ENOMEM);
+		goto out_bmd;
 
 	while (len) {
 		struct page *page;
@@ -1015,14 +1029,18 @@ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len,
 		}
 	}
 
-	bio->bi_private = data;
+	bio->bi_private = bmd;
 	bio->bi_end_io = bio_copy_kern_endio;
+
+	bio_set_map_data(bmd, bio, &iov, 1);
 	return bio;
 cleanup:
 	bio_for_each_segment(bvec, bio, i)
 		__free_page(bvec->bv_page);
 
 	bio_put(bio);
+out_bmd:
+	bio_free_map_data(bmd);
 
 	return ERR_PTR(ret);
 }
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 0aac824..8da903b 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -832,6 +832,10 @@ ssize_t cifs_user_write(struct file *file, const char __user *write_data,
 		return -EBADF;
 	open_file = (struct cifsFileInfo *) file->private_data;
 
+	rc = generic_write_checks(file, poffset, &write_size, 0);
+	if (rc)
+		return rc;
+
 	xid = GetXid();
 
 	if (*poffset > file->f_path.dentry->d_inode->i_size)
diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c
index 0c3b618..f40423e 100644
--- a/fs/cramfs/inode.c
+++ b/fs/cramfs/inode.c
@@ -43,58 +43,13 @@ static DEFINE_MUTEX(read_mutex);
 static int cramfs_iget5_test(struct inode *inode, void *opaque)
 {
 	struct cramfs_inode *cramfs_inode = opaque;
-
-	if (inode->i_ino != CRAMINO(cramfs_inode))
-		return 0; /* does not match */
-
-	if (inode->i_ino != 1)
-		return 1;
-
-	/* all empty directories, char, block, pipe, and sock, share inode #1 */
-
-	if ((inode->i_mode != cramfs_inode->mode) ||
-	    (inode->i_gid != cramfs_inode->gid) ||
-	    (inode->i_uid != cramfs_inode->uid))
-		return 0; /* does not match */
-
-	if ((S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) &&
-	    (inode->i_rdev != old_decode_dev(cramfs_inode->size)))
-		return 0; /* does not match */
-
-	return 1; /* matches */
+	return inode->i_ino == CRAMINO(cramfs_inode) && inode->i_ino != 1;
 }
 
 static int cramfs_iget5_set(struct inode *inode, void *opaque)
 {
-	static struct timespec zerotime;
 	struct cramfs_inode *cramfs_inode = opaque;
-	inode->i_mode = cramfs_inode->mode;
-	inode->i_uid = cramfs_inode->uid;
-	inode->i_size = cramfs_inode->size;
-	inode->i_blocks = (cramfs_inode->size - 1) / 512 + 1;
-	inode->i_gid = cramfs_inode->gid;
-	/* Struct copy intentional */
-	inode->i_mtime = inode->i_atime = inode->i_ctime = zerotime;
 	inode->i_ino = CRAMINO(cramfs_inode);
-	/* inode->i_nlink is left 1 - arguably wrong for directories,
-	   but it's the best we can do without reading the directory
-           contents.  1 yields the right result in GNU find, even
-	   without -noleaf option. */
-	if (S_ISREG(inode->i_mode)) {
-		inode->i_fop = &generic_ro_fops;
-		inode->i_data.a_ops = &cramfs_aops;
-	} else if (S_ISDIR(inode->i_mode)) {
-		inode->i_op = &cramfs_dir_inode_operations;
-		inode->i_fop = &cramfs_directory_operations;
-	} else if (S_ISLNK(inode->i_mode)) {
-		inode->i_op = &page_symlink_inode_operations;
-		inode->i_data.a_ops = &cramfs_aops;
-	} else {
-		inode->i_size = 0;
-		inode->i_blocks = 0;
-		init_special_inode(inode, inode->i_mode,
-			old_decode_dev(cramfs_inode->size));
-	}
 	return 0;
 }
 
@@ -104,12 +59,48 @@ static struct inode *get_cramfs_inode(struct super_block *sb,
 	struct inode *inode = iget5_locked(sb, CRAMINO(cramfs_inode),
 					    cramfs_iget5_test, cramfs_iget5_set,
 					    cramfs_inode);
+	static struct timespec zerotime;
+
 	if (inode && (inode->i_state & I_NEW)) {
+		inode->i_mode = cramfs_inode->mode;
+		inode->i_uid = cramfs_inode->uid;
+		inode->i_size = cramfs_inode->size;
+		inode->i_blocks = (cramfs_inode->size - 1) / 512 + 1;
+		inode->i_gid = cramfs_inode->gid;
+		/* Struct copy intentional */
+		inode->i_mtime = inode->i_atime = inode->i_ctime = zerotime;
+		/* inode->i_nlink is left 1 - arguably wrong for directories,
+		   but it's the best we can do without reading the directory
+		   contents.  1 yields the right result in GNU find, even
+		   without -noleaf option. */
+		if (S_ISREG(inode->i_mode)) {
+			inode->i_fop = &generic_ro_fops;
+			inode->i_data.a_ops = &cramfs_aops;
+		} else if (S_ISDIR(inode->i_mode)) {
+			inode->i_op = &cramfs_dir_inode_operations;
+			inode->i_fop = &cramfs_directory_operations;
+		} else if (S_ISLNK(inode->i_mode)) {
+			inode->i_op = &page_symlink_inode_operations;
+			inode->i_data.a_ops = &cramfs_aops;
+		} else {
+			inode->i_size = 0;
+			inode->i_blocks = 0;
+			init_special_inode(inode, inode->i_mode,
+				old_decode_dev(cramfs_inode->size));
+		}
 		unlock_new_inode(inode);
 	}
 	return inode;
 }
 
+static void cramfs_drop_inode(struct inode *inode)
+{
+	if (inode->i_ino == 1)
+		generic_delete_inode(inode);
+	else
+		generic_drop_inode(inode);
+}
+
 /*
  * We have our own block cache: don't fill up the buffer cache
  * with the rom-image, because the way the filesystem is set
@@ -534,6 +525,7 @@ static const struct super_operations cramfs_ops = {
 	.put_super	= cramfs_put_super,
 	.remount_fs	= cramfs_remount,
 	.statfs		= cramfs_statfs,
+	.drop_inode	= cramfs_drop_inode,
 };
 
 static int cramfs_get_sb(struct file_system_type *fs_type,
diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
index b6ed383..54b8b41 100644
--- a/fs/nfsd/nfs4acl.c
+++ b/fs/nfsd/nfs4acl.c
@@ -443,7 +443,7 @@ init_state(struct posix_acl_state *state, int cnt)
 	 * enough space for either:
 	 */
 	alloc = sizeof(struct posix_ace_state_array)
-		+ cnt*sizeof(struct posix_ace_state);
+		+ cnt*sizeof(struct posix_user_ace_state);
 	state->users = kzalloc(alloc, GFP_KERNEL);
 	if (!state->users)
 		return -ENOMEM;
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 71d70d1..27af0b8 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -293,7 +293,6 @@ unifdef-y += parport.h
 unifdef-y += patchkey.h
 unifdef-y += pci.h
 unifdef-y += personality.h
-unifdef-y += pim.h
 unifdef-y += pktcdvd.h
 unifdef-y += pmu.h
 unifdef-y += poll.h
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 72295b0..dd82c76 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -973,6 +973,9 @@ static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch,
 
 /* drivers/video/fb_defio.c */
 extern void fb_deferred_io_init(struct fb_info *info);
+extern void fb_deferred_io_open(struct fb_info *info,
+				struct inode *inode,
+				struct file *file);
 extern void fb_deferred_io_cleanup(struct fb_info *info);
 extern int fb_deferred_io_fsync(struct file *file, struct dentry *dentry,
 				int datasync);
diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index de4decf..35a8277 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -2,11 +2,7 @@
 #define __LINUX_MROUTE_H
 
 #include <linux/sockios.h>
-#include <linux/types.h>
-#ifdef __KERNEL__
 #include <linux/in.h>
-#endif
-#include <linux/pim.h>
 
 /*
  *	Based on the MROUTING 3.5 defines primarily to keep
@@ -214,6 +210,27 @@ struct mfc_cache
 #define IGMPMSG_WHOLEPKT	3		/* For PIM Register processing */
 
 #ifdef __KERNEL__
+
+#define PIM_V1_VERSION		__constant_htonl(0x10000000)
+#define PIM_V1_REGISTER		1
+
+#define PIM_VERSION		2
+#define PIM_REGISTER		1
+
+#define PIM_NULL_REGISTER	__constant_htonl(0x40000000)
+
+/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */
+
+struct pimreghdr
+{
+	__u8	type;
+	__u8	reserved;
+	__be16	csum;
+	__be32	flags;
+};
+
+extern int pim_rcv_v1(struct sk_buff *);
+
 struct rtmsg;
 extern int ipmr_get_route(struct sk_buff *skb, struct rtmsg *rtm, int nowait);
 #endif
diff --git a/include/linux/pim.h b/include/linux/pim.h
deleted file mode 100644
index 236ffd3..0000000
--- a/include/linux/pim.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef __LINUX_PIM_H
-#define __LINUX_PIM_H
-
-#include <asm/byteorder.h>
-
-#ifndef __KERNEL__
-struct pim {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8	pim_type:4,		/* PIM message type */
-		pim_ver:4;		/* PIM version */
-#elif defined(__BIG_ENDIAN_BITFIELD)
-	__u8	pim_ver:4;		/* PIM version */
-		pim_type:4;		/* PIM message type */
-#endif
-	__u8	pim_rsv;		/* Reserved */
-	__be16	pim_cksum;		/* Checksum */
-};
-
-#define PIM_MINLEN		8
-#endif
-
-/* Message types - V1 */
-#define PIM_V1_VERSION		__constant_htonl(0x10000000)
-#define PIM_V1_REGISTER		1
-
-/* Message types - V2 */
-#define PIM_VERSION		2
-#define PIM_REGISTER		1
-
-#if defined(__KERNEL__)
-#define PIM_NULL_REGISTER	__constant_htonl(0x40000000)
-
-/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */
-struct pimreghdr
-{
-	__u8	type;
-	__u8	reserved;
-	__be16	csum;
-	__be32	flags;
-};
-
-struct sk_buff;
-extern int pim_rcv_v1(struct sk_buff *);
-#endif
-#endif
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index bbd3d58..99ca7cd 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -80,7 +80,8 @@ extern struct inet6_ifaddr      *ipv6_get_ifaddr(struct net *net,
 						 struct net_device *dev,
 						 int strict);
 
-extern int			ipv6_dev_get_saddr(struct net_device *dev, 
+extern int			ipv6_dev_get_saddr(struct net *net,
+					       struct net_device *dev,
 					       const struct in6_addr *daddr,
 					       unsigned int srcprefs,
 					       struct in6_addr *saddr);
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 9313491..03462e5 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -112,6 +112,7 @@ struct rt6_rtnl_dump_arg
 {
 	struct sk_buff *skb;
 	struct netlink_callback *cb;
+	struct net *net;
 };
 
 extern int rt6_dump_route(struct rt6_info *rt, void *p_arg);
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index f32fae3..0d520dc 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -693,6 +693,9 @@ int move_freepages(struct zone *zone,
 #endif
 
 	for (page = start_page; page <= end_page;) {
+		/* Make sure we are not inadvertently changing nodes */
+		VM_BUG_ON(page_to_nid(page) != zone_to_nid(zone));
+
 		if (!pfn_valid_within(page_to_pfn(page))) {
 			page++;
 			continue;
@@ -2475,6 +2478,10 @@ static void setup_zone_migrate_reserve(struct zone *zone)
 			continue;
 		page = pfn_to_page(pfn);
 
+		/* Watch out for overlapping nodes */
+		if (page_to_nid(page) != zone_to_nid(zone))
+			continue;
+
 		/* Blocks with reserved pages will never free, skip them. */
 		if (PageReserved(page))
 			continue;
diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
index f597987..f288fc4 100644
--- a/net/ax25/sysctl_net_ax25.c
+++ b/net/ax25/sysctl_net_ax25.c
@@ -36,6 +36,7 @@ static struct ctl_path ax25_path[] = {
 	{ .procname = "ax25", .ctl_name = NET_AX25, },
 	{ }
 };
+
 static const ctl_table ax25_param_table[] = {
 	{
 		.ctl_name	= NET_AX25_IP_DEFAULT_MODE,
@@ -167,6 +168,7 @@ static const ctl_table ax25_param_table[] = {
 		.extra1		= &min_proto,
 		.extra2		= &max_proto
 	},
+#ifdef CONFIG_AX25_DAMA_SLAVE
 	{
 		.ctl_name	= NET_AX25_DAMA_SLAVE_TIMEOUT,
 		.procname	= "dama_slave_timeout",
@@ -177,6 +179,8 @@ static const ctl_table ax25_param_table[] = {
 		.extra1		= &min_ds_timeout,
 		.extra2		= &max_ds_timeout
 	},
+#endif
+
 	{ .ctl_name = 0 }	/* that's all, folks! */
 };
 
@@ -210,16 +214,6 @@ void ax25_register_sysctl(void)
 		ax25_table[n].procname     = ax25_dev->dev->name;
 		ax25_table[n].mode         = 0555;
 
-#ifndef CONFIG_AX25_DAMA_SLAVE
-		/*
-		 * We do not wish to have a representation of this parameter
-		 * in /proc/sys/ when configured *not* to include the
-		 * AX.25 DAMA slave code, do we?
-		 */
-
-		child[AX25_VALUES_DS_TIMEOUT].procname = NULL;
-#endif
-
 		child[AX25_MAX_VALUES].ctl_name = 0;	/* just in case... */
 
 		for (k = 0; k < AX25_MAX_VALUES; k++)
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 9f3f7ba..b6e7ec0 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -988,7 +988,9 @@ int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
 		    up->encap_rcv != NULL) {
 			int ret;
 
+			bh_unlock_sock(sk);
 			ret = (*up->encap_rcv)(sk, skb);
+			bh_lock_sock(sk);
 			if (ret <= 0) {
 				UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS,
 						 is_udplite);
@@ -1087,7 +1089,7 @@ static int __udp4_lib_mcast_deliver(struct sk_buff *skb,
 			if (skb1) {
 				int ret = 0;
 
-				bh_lock_sock_nested(sk);
+				bh_lock_sock(sk);
 				if (!sock_owned_by_user(sk))
 					ret = udp_queue_rcv_skb(sk, skb1);
 				else
@@ -1187,7 +1189,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[],
 
 	if (sk != NULL) {
 		int ret = 0;
-		bh_lock_sock_nested(sk);
+		bh_lock_sock(sk);
 		if (!sock_owned_by_user(sk))
 			ret = udp_queue_rcv_skb(sk, skb);
 		else
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index ff61a5c..1a1d494 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1076,13 +1076,12 @@ out:
 	return ret;
 }
 
-int ipv6_dev_get_saddr(struct net_device *dst_dev,
+int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
 		       const struct in6_addr *daddr, unsigned int prefs,
 		       struct in6_addr *saddr)
 {
 	struct ipv6_saddr_score scores[2],
 				*score = &scores[0], *hiscore = &scores[1];
-	struct net *net = dev_net(dst_dev);
 	struct ipv6_saddr_dst dst;
 	struct net_device *dev;
 	int dst_type;
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index 8d05527..f5de3f9 100644
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -93,7 +93,8 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp,
 			if (flags & RT6_LOOKUP_F_SRCPREF_COA)
 				srcprefs |= IPV6_PREFER_SRC_COA;
 
-			if (ipv6_dev_get_saddr(ip6_dst_idev(&rt->u.dst)->dev,
+			if (ipv6_dev_get_saddr(net,
+					       ip6_dst_idev(&rt->u.dst)->dev,
 					       &flp->fl6_dst, srcprefs,
 					       &saddr))
 				goto again;
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 918fde4..fe80171 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -380,6 +380,7 @@ static int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)
 
 	arg.skb = skb;
 	arg.cb = cb;
+	arg.net = net;
 	w->args = &arg;
 
 	for (h = s_h; h < FIB_TABLE_HASHSZ; h++, s_e = 0) {
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 4019770..d99f094 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -925,7 +925,7 @@ static int ip6_dst_lookup_tail(struct sock *sk,
 		goto out_err_release;
 
 	if (ipv6_addr_any(&fl->fl6_src)) {
-		err = ipv6_dev_get_saddr(ip6_dst_idev(*dst)->dev,
+		err = ipv6_dev_get_saddr(net, ip6_dst_idev(*dst)->dev,
 					 &fl->fl6_dst,
 					 sk ? inet6_sk(sk)->srcprefs : 0,
 					 &fl->fl6_src);
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 282fdb3..efa84ae 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -549,7 +549,7 @@ static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh,
 			override = 0;
 		in6_ifa_put(ifp);
 	} else {
-		if (ipv6_dev_get_saddr(dev, daddr,
+		if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
 				       inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs,
 				       &tmpaddr))
 			return;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 7ff6870..9deee59 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2098,7 +2098,8 @@ static inline size_t rt6_nlmsg_size(void)
 	       + nla_total_size(sizeof(struct rta_cacheinfo));
 }
 
-static int rt6_fill_node(struct sk_buff *skb, struct rt6_info *rt,
+static int rt6_fill_node(struct net *net,
+			 struct sk_buff *skb, struct rt6_info *rt,
 			 struct in6_addr *dst, struct in6_addr *src,
 			 int iif, int type, u32 pid, u32 seq,
 			 int prefix, int nowait, unsigned int flags)
@@ -2179,8 +2180,9 @@ static int rt6_fill_node(struct sk_buff *skb, struct rt6_info *rt,
 #endif
 			NLA_PUT_U32(skb, RTA_IIF, iif);
 	} else if (dst) {
+		struct inet6_dev *idev = ip6_dst_idev(&rt->u.dst);
 		struct in6_addr saddr_buf;
-		if (ipv6_dev_get_saddr(ip6_dst_idev(&rt->u.dst)->dev,
+		if (ipv6_dev_get_saddr(net, idev ? idev->dev : NULL,
 				       dst, 0, &saddr_buf) == 0)
 			NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf);
 	}
@@ -2225,7 +2227,8 @@ int rt6_dump_route(struct rt6_info *rt, void *p_arg)
 	} else
 		prefix = 0;
 
-	return rt6_fill_node(arg->skb, rt, NULL, NULL, 0, RTM_NEWROUTE,
+	return rt6_fill_node(arg->net,
+		     arg->skb, rt, NULL, NULL, 0, RTM_NEWROUTE,
 		     NETLINK_CB(arg->cb->skb).pid, arg->cb->nlh->nlmsg_seq,
 		     prefix, 0, NLM_F_MULTI);
 }
@@ -2291,7 +2294,7 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void
 	rt = (struct rt6_info*) ip6_route_output(net, NULL, &fl);
 	skb->dst = &rt->u.dst;
 
-	err = rt6_fill_node(skb, rt, &fl.fl6_dst, &fl.fl6_src, iif,
+	err = rt6_fill_node(net, skb, rt, &fl.fl6_dst, &fl.fl6_src, iif,
 			    RTM_NEWROUTE, NETLINK_CB(in_skb).pid,
 			    nlh->nlmsg_seq, 0, 0, 0);
 	if (err < 0) {
@@ -2318,7 +2321,7 @@ void inet6_rt_notify(int event, struct rt6_info *rt, struct nl_info *info)
 	if (skb == NULL)
 		goto errout;
 
-	err = rt6_fill_node(skb, rt, NULL, NULL, 0,
+	err = rt6_fill_node(net, skb, rt, NULL, NULL, 0,
 				event, info->pid, seq, 0, 0, 0);
 	if (err < 0) {
 		/* -EMSGSIZE implies BUG in rt6_nlmsg_size() */
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index dd30962..e14aa66 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -376,7 +376,7 @@ static int __udp6_lib_mcast_deliver(struct sk_buff *skb, struct in6_addr *saddr,
 					uh->source, saddr, dif))) {
 		struct sk_buff *buff = skb_clone(skb, GFP_ATOMIC);
 		if (buff) {
-			bh_lock_sock_nested(sk2);
+			bh_lock_sock(sk2);
 			if (!sock_owned_by_user(sk2))
 				udpv6_queue_rcv_skb(sk2, buff);
 			else
@@ -384,7 +384,7 @@ static int __udp6_lib_mcast_deliver(struct sk_buff *skb, struct in6_addr *saddr,
 			bh_unlock_sock(sk2);
 		}
 	}
-	bh_lock_sock_nested(sk);
+	bh_lock_sock(sk);
 	if (!sock_owned_by_user(sk))
 		udpv6_queue_rcv_skb(sk, skb);
 	else
@@ -502,7 +502,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[],
 
 	/* deliver */
 
-	bh_lock_sock_nested(sk);
+	bh_lock_sock(sk);
 	if (!sock_owned_by_user(sk))
 		udpv6_queue_rcv_skb(sk, skb);
 	else
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 8f1e054..08e4cbb 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -52,12 +52,14 @@ static struct dst_entry *xfrm6_dst_lookup(int tos, xfrm_address_t *saddr,
 static int xfrm6_get_saddr(xfrm_address_t *saddr, xfrm_address_t *daddr)
 {
 	struct dst_entry *dst;
+	struct net_device *dev;
 
 	dst = xfrm6_dst_lookup(0, NULL, daddr);
 	if (IS_ERR(dst))
 		return -EHOSTUNREACH;
 
-	ipv6_dev_get_saddr(ip6_dst_idev(dst)->dev,
+	dev = ip6_dst_idev(dst)->dev;
+	ipv6_dev_get_saddr(dev_net(dev), dev,
 			   (struct in6_addr *)&daddr->a6, 0,
 			   (struct in6_addr *)&saddr->a6);
 	dst_release(dst);
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 74e662c..b5e116c 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -205,10 +205,9 @@ struct tcf_common *tcf_hash_check(u32 index, struct tc_action *a, int bind,
 {
 	struct tcf_common *p = NULL;
 	if (index && (p = tcf_hash_lookup(index, hinfo)) != NULL) {
-		if (bind) {
+		if (bind)
 			p->tcfc_bindcnt++;
-			p->tcfc_refcnt++;
-		}
+		p->tcfc_refcnt++;
 		a->priv = p;
 	}
 	return p;
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 3fb58f4..51c3f68 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -595,11 +595,13 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 		kfree_skb(skb);
 		return ret;
 #endif
-	} else if (cl->un.leaf.q->enqueue(skb, cl->un.leaf.q) !=
+	} else if ((ret = cl->un.leaf.q->enqueue(skb, cl->un.leaf.q)) !=
 		   NET_XMIT_SUCCESS) {
-		sch->qstats.drops++;
-		cl->qstats.drops++;
-		return NET_XMIT_DROP;
+		if (ret == NET_XMIT_DROP) {
+			sch->qstats.drops++;
+			cl->qstats.drops++;
+		}
+		return ret;
 	} else {
 		cl->bstats.packets +=
 			skb_is_gso(skb)?skb_shinfo(skb)->gso_segs:1;
@@ -639,11 +641,13 @@ static int htb_requeue(struct sk_buff *skb, struct Qdisc *sch)
 		kfree_skb(skb);
 		return ret;
 #endif
-	} else if (cl->un.leaf.q->ops->requeue(skb, cl->un.leaf.q) !=
+	} else if ((ret = cl->un.leaf.q->ops->requeue(skb, cl->un.leaf.q)) !=
 		   NET_XMIT_SUCCESS) {
-		sch->qstats.drops++;
-		cl->qstats.drops++;
-		return NET_XMIT_DROP;
+		if (ret == NET_XMIT_DROP) {
+			sch->qstats.drops++;
+			cl->qstats.drops++;
+		}
+		return ret;
 	} else
 		htb_activate(q, cl);
 
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c
index 5532f10..ec0c921 100644
--- a/net/sched/sch_prio.c
+++ b/net/sched/sch_prio.c
@@ -228,14 +228,20 @@ static int prio_tune(struct Qdisc *sch, struct nlattr *opt)
 {
 	struct prio_sched_data *q = qdisc_priv(sch);
 	struct tc_prio_qopt *qopt;
-	struct nlattr *tb[TCA_PRIO_MAX + 1];
+	struct nlattr *tb[TCA_PRIO_MAX + 1] = {0};
 	int err;
 	int i;
 
-	err = nla_parse_nested_compat(tb, TCA_PRIO_MAX, opt, NULL, qopt,
-				      sizeof(*qopt));
-	if (err < 0)
-		return err;
+	qopt = nla_data(opt);
+	if (nla_len(opt) < sizeof(*qopt))
+		return -1;
+
+	if (nla_len(opt) >= sizeof(*qopt) + sizeof(struct nlattr)) {
+		err = nla_parse_nested(tb, TCA_PRIO_MAX,
+				       (struct nlattr *) (qopt + 1), NULL);
+		if (err < 0)
+			return err;
+	}
 
 	q->bands = qopt->bands;
 	/* If we're multiqueue, make sure the number of incoming bands
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
index 0b7d78f..fc6f8f3 100644
--- a/net/sched/sch_tbf.c
+++ b/net/sched/sch_tbf.c
@@ -123,15 +123,8 @@ static int tbf_enqueue(struct sk_buff *skb, struct Qdisc* sch)
 	struct tbf_sched_data *q = qdisc_priv(sch);
 	int ret;
 
-	if (skb->len > q->max_size) {
-		sch->qstats.drops++;
-#ifdef CONFIG_NET_CLS_ACT
-		if (sch->reshape_fail == NULL || sch->reshape_fail(skb, sch))
-#endif
-			kfree_skb(skb);
-
-		return NET_XMIT_DROP;
-	}
+	if (skb->len > q->max_size)
+		return qdisc_reshape_fail(skb, sch);
 
 	if ((ret = q->qdisc->enqueue(skb, q->qdisc)) != 0) {
 		sch->qstats.drops++;
diff --git a/net/sctp/auth.c b/net/sctp/auth.c
index 675a5c3..52db5f6 100644
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
@@ -80,6 +80,10 @@ static struct sctp_auth_bytes *sctp_auth_create_key(__u32 key_len, gfp_t gfp)
 {
 	struct sctp_auth_bytes *key;
 
+	/* Verify that we are not going to overflow INT_MAX */
+	if ((INT_MAX - key_len) < sizeof(struct sctp_auth_bytes))
+		return NULL;
+
 	/* Allocate the shared key */
 	key = kmalloc(sizeof(struct sctp_auth_bytes) + key_len, gfp);
 	if (!key)
@@ -782,6 +786,9 @@ int sctp_auth_ep_set_hmacs(struct sctp_endpoint *ep,
 	for (i = 0; i < hmacs->shmac_num_idents; i++) {
 		id = hmacs->shmac_idents[i];
 
+		if (id > SCTP_AUTH_HMAC_ID_MAX)
+			return -EOPNOTSUPP;
+
 		if (SCTP_AUTH_HMAC_ID_SHA1 == id)
 			has_sha1 = 1;
 
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c
index e39a0cd..4c8d9f4 100644
--- a/net/sctp/endpointola.c
+++ b/net/sctp/endpointola.c
@@ -103,6 +103,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,
 
 		/* Initialize the CHUNKS parameter */
 		auth_chunks->param_hdr.type = SCTP_PARAM_CHUNKS;
+		auth_chunks->param_hdr.length = htons(sizeof(sctp_paramhdr_t));
 
 		/* If the Add-IP functionality is enabled, we must
 		 * authenticate, ASCONF and ASCONF-ACK chunks
@@ -110,8 +111,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,
 		if (sctp_addip_enable) {
 			auth_chunks->chunks[0] = SCTP_CID_ASCONF;
 			auth_chunks->chunks[1] = SCTP_CID_ASCONF_ACK;
-			auth_chunks->param_hdr.length =
-					htons(sizeof(sctp_paramhdr_t) + 2);
+			auth_chunks->param_hdr.length += htons(2);
 		}
 	}
 
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index a2f4d4d..38a5d80 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -317,7 +317,8 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk,
 			  __func__, asoc, dst, NIP6(daddr->v6.sin6_addr));
 
 	if (!asoc) {
-		ipv6_dev_get_saddr(dst ? ip6_dst_idev(dst)->dev : NULL,
+		ipv6_dev_get_saddr(sock_net(sctp_opt2sk(sk)),
+				   dst ? ip6_dst_idev(dst)->dev : NULL,
 				   &daddr->v6.sin6_addr,
 				   inet6_sk(&sk->inet.sk)->srcprefs,
 				   &saddr->v6.sin6_addr);
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 0dbcde6..700d27d 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -2965,6 +2965,9 @@ static int sctp_setsockopt_auth_chunk(struct sock *sk,
 {
 	struct sctp_authchunk val;
 
+	if (!sctp_auth_enable)
+		return -EACCES;
+
 	if (optlen != sizeof(struct sctp_authchunk))
 		return -EINVAL;
 	if (copy_from_user(&val, optval, optlen))
@@ -2993,8 +2996,12 @@ static int sctp_setsockopt_hmac_ident(struct sock *sk,
 				    int optlen)
 {
 	struct sctp_hmacalgo *hmacs;
+	u32 idents;
 	int err;
 
+	if (!sctp_auth_enable)
+		return -EACCES;
+
 	if (optlen < sizeof(struct sctp_hmacalgo))
 		return -EINVAL;
 
@@ -3007,8 +3014,9 @@ static int sctp_setsockopt_hmac_ident(struct sock *sk,
 		goto out;
 	}
 
-	if (hmacs->shmac_num_idents == 0 ||
-	    hmacs->shmac_num_idents > SCTP_AUTH_NUM_HMACS) {
+	idents = hmacs->shmac_num_idents;
+	if (idents == 0 || idents > SCTP_AUTH_NUM_HMACS ||
+	    (idents * sizeof(u16)) > (optlen - sizeof(struct sctp_hmacalgo))) {
 		err = -EINVAL;
 		goto out;
 	}
@@ -3033,6 +3041,9 @@ static int sctp_setsockopt_auth_key(struct sock *sk,
 	struct sctp_association *asoc;
 	int ret;
 
+	if (!sctp_auth_enable)
+		return -EACCES;
+
 	if (optlen <= sizeof(struct sctp_authkey))
 		return -EINVAL;
 
@@ -3045,6 +3056,11 @@ static int sctp_setsockopt_auth_key(struct sock *sk,
 		goto out;
 	}
 
+	if (authkey->sca_keylength > optlen - sizeof(struct sctp_authkey)) {
+		ret = -EINVAL;
+		goto out;
+	}
+
 	asoc = sctp_id2assoc(sk, authkey->sca_assoc_id);
 	if (!asoc && authkey->sca_assoc_id && sctp_style(sk, UDP)) {
 		ret = -EINVAL;
@@ -3070,6 +3086,9 @@ static int sctp_setsockopt_active_key(struct sock *sk,
 	struct sctp_authkeyid val;
 	struct sctp_association *asoc;
 
+	if (!sctp_auth_enable)
+		return -EACCES;
+
 	if (optlen != sizeof(struct sctp_authkeyid))
 		return -EINVAL;
 	if (copy_from_user(&val, optval, optlen))
@@ -3095,6 +3114,9 @@ static int sctp_setsockopt_del_key(struct sock *sk,
 	struct sctp_authkeyid val;
 	struct sctp_association *asoc;
 
+	if (!sctp_auth_enable)
+		return -EACCES;
+
 	if (optlen != sizeof(struct sctp_authkeyid))
 		return -EINVAL;
 	if (copy_from_user(&val, optval, optlen))
@@ -5053,19 +5075,29 @@ static int sctp_getsockopt_maxburst(struct sock *sk, int len,
 static int sctp_getsockopt_hmac_ident(struct sock *sk, int len,
 				    char __user *optval, int __user *optlen)
 {
+	struct sctp_hmacalgo  __user *p = (void __user *)optval;
 	struct sctp_hmac_algo_param *hmacs;
-	__u16 param_len;
+	__u16 data_len = 0;
+	u32 num_idents;
+
+	if (!sctp_auth_enable)
+		return -EACCES;
 
 	hmacs = sctp_sk(sk)->ep->auth_hmacs_list;
-	param_len = ntohs(hmacs->param_hdr.length);
+	data_len = ntohs(hmacs->param_hdr.length) - sizeof(sctp_paramhdr_t);
 
-	if (len < param_len)
+	if (len < sizeof(struct sctp_hmacalgo) + data_len)
 		return -EINVAL;
+
+	len = sizeof(struct sctp_hmacalgo) + data_len;
+	num_idents = data_len / sizeof(u16);
+
 	if (put_user(len, optlen))
 		return -EFAULT;
-	if (copy_to_user(optval, hmacs->hmac_ids, len))
+	if (put_user(num_idents, &p->shmac_num_idents))
+		return -EFAULT;
+	if (copy_to_user(p->shmac_idents, hmacs->hmac_ids, data_len))
 		return -EFAULT;
-
 	return 0;
 }
 
@@ -5075,6 +5107,9 @@ static int sctp_getsockopt_active_key(struct sock *sk, int len,
 	struct sctp_authkeyid val;
 	struct sctp_association *asoc;
 
+	if (!sctp_auth_enable)
+		return -EACCES;
+
 	if (len < sizeof(struct sctp_authkeyid))
 		return -EINVAL;
 	if (copy_from_user(&val, optval, sizeof(struct sctp_authkeyid)))
@@ -5089,6 +5124,12 @@ static int sctp_getsockopt_active_key(struct sock *sk, int len,
 	else
 		val.scact_keynumber = sctp_sk(sk)->ep->active_key_id;
 
+	len = sizeof(struct sctp_authkeyid);
+	if (put_user(len, optlen))
+		return -EFAULT;
+	if (copy_to_user(optval, &val, len))
+		return -EFAULT;
+
 	return 0;
 }
 
@@ -5099,13 +5140,16 @@ static int sctp_getsockopt_peer_auth_chunks(struct sock *sk, int len,
 	struct sctp_authchunks val;
 	struct sctp_association *asoc;
 	struct sctp_chunks_param *ch;
-	u32    num_chunks;
+	u32    num_chunks = 0;
 	char __user *to;
 
-	if (len <= sizeof(struct sctp_authchunks))
+	if (!sctp_auth_enable)
+		return -EACCES;
+
+	if (len < sizeof(struct sctp_authchunks))
 		return -EINVAL;
 
-	if (copy_from_user(&val, p, sizeof(struct sctp_authchunks)))
+	if (copy_from_user(&val, optval, sizeof(struct sctp_authchunks)))
 		return -EFAULT;
 
 	to = p->gauth_chunks;
@@ -5114,20 +5158,21 @@ static int sctp_getsockopt_peer_auth_chunks(struct sock *sk, int len,
 		return -EINVAL;
 
 	ch = asoc->peer.peer_chunks;
+	if (!ch)
+		goto num;
 
 	/* See if the user provided enough room for all the data */
 	num_chunks = ntohs(ch->param_hdr.length) - sizeof(sctp_paramhdr_t);
 	if (len < num_chunks)
 		return -EINVAL;
 
-	len = num_chunks;
-	if (put_user(len, optlen))
+	if (copy_to_user(to, ch->chunks, num_chunks))
 		return -EFAULT;
+num:
+	len = sizeof(struct sctp_authchunks) + num_chunks;
+	if (put_user(len, optlen)) return -EFAULT;
 	if (put_user(num_chunks, &p->gauth_number_of_chunks))
 		return -EFAULT;
-	if (copy_to_user(to, ch->chunks, len))
-		return -EFAULT;
-
 	return 0;
 }
 
@@ -5138,13 +5183,16 @@ static int sctp_getsockopt_local_auth_chunks(struct sock *sk, int len,
 	struct sctp_authchunks val;
 	struct sctp_association *asoc;
 	struct sctp_chunks_param *ch;
-	u32    num_chunks;
+	u32    num_chunks = 0;
 	char __user *to;
 
-	if (len <= sizeof(struct sctp_authchunks))
+	if (!sctp_auth_enable)
+		return -EACCES;
+
+	if (len < sizeof(struct sctp_authchunks))
 		return -EINVAL;
 
-	if (copy_from_user(&val, p, sizeof(struct sctp_authchunks)))
+	if (copy_from_user(&val, optval, sizeof(struct sctp_authchunks)))
 		return -EFAULT;
 
 	to = p->gauth_chunks;
@@ -5157,17 +5205,21 @@ static int sctp_getsockopt_local_auth_chunks(struct sock *sk, int len,
 	else
 		ch = sctp_sk(sk)->ep->auth_chunk_list;
 
+	if (!ch)
+		goto num;
+
 	num_chunks = ntohs(ch->param_hdr.length) - sizeof(sctp_paramhdr_t);
-	if (len < num_chunks)
+	if (len < sizeof(struct sctp_authchunks) + num_chunks)
 		return -EINVAL;
 
-	len = num_chunks;
+	if (copy_to_user(to, ch->chunks, num_chunks))
+		return -EFAULT;
+num:
+	len = sizeof(struct sctp_authchunks) + num_chunks;
 	if (put_user(len, optlen))
 		return -EFAULT;
 	if (put_user(num_chunks, &p->gauth_number_of_chunks))
 		return -EFAULT;
-	if (copy_to_user(to, ch->chunks, len))
-		return -EFAULT;
 
 	return 0;
 }
diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c
index 0f8c439..5231f7a 100644
--- a/net/sunrpc/sysctl.c
+++ b/net/sunrpc/sysctl.c
@@ -60,24 +60,14 @@ static int proc_do_xprt(ctl_table *table, int write, struct file *file,
 			void __user *buffer, size_t *lenp, loff_t *ppos)
 {
 	char tmpbuf[256];
-	int len;
+	size_t len;
+
 	if ((*ppos && !write) || !*lenp) {
 		*lenp = 0;
 		return 0;
 	}
-	if (write)
-		return -EINVAL;
-	else {
-		len = svc_print_xprts(tmpbuf, sizeof(tmpbuf));
-		if (!access_ok(VERIFY_WRITE, buffer, len))
-			return -EFAULT;
-
-		if (__copy_to_user(buffer, tmpbuf, len))
-			return -EFAULT;
-	}
-	*lenp -= len;
-	*ppos += len;
-	return 0;
+	len = svc_print_xprts(tmpbuf, sizeof(tmpbuf));
+	return simple_read_from_buffer(buffer, *lenp, ppos, tmpbuf, len);
 }
 
 static int
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 72fddaf..391f456 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -780,11 +780,13 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr,
 {
 	unsigned int h;
 	struct hlist_node *entry;
-	struct xfrm_state *x, *x0;
+	struct xfrm_state *x, *x0, *to_put;
 	int acquire_in_progress = 0;
 	int error = 0;
 	struct xfrm_state *best = NULL;
 
+	to_put = NULL;
+
 	spin_lock_bh(&xfrm_state_lock);
 	h = xfrm_dst_hash(daddr, saddr, tmpl->reqid, family);
 	hlist_for_each_entry(x, entry, xfrm_state_bydst+h, bydst) {
@@ -833,7 +835,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr,
 		if (tmpl->id.spi &&
 		    (x0 = __xfrm_state_lookup(daddr, tmpl->id.spi,
 					      tmpl->id.proto, family)) != NULL) {
-			xfrm_state_put(x0);
+			to_put = x0;
 			error = -EEXIST;
 			goto out;
 		}
@@ -849,7 +851,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr,
 		error = security_xfrm_state_alloc_acquire(x, pol->security, fl->secid);
 		if (error) {
 			x->km.state = XFRM_STATE_DEAD;
-			xfrm_state_put(x);
+			to_put = x;
 			x = NULL;
 			goto out;
 		}
@@ -870,7 +872,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr,
 			xfrm_hash_grow_check(x->bydst.next != NULL);
 		} else {
 			x->km.state = XFRM_STATE_DEAD;
-			xfrm_state_put(x);
+			to_put = x;
 			x = NULL;
 			error = -ESRCH;
 		}
@@ -881,6 +883,8 @@ out:
 	else
 		*err = acquire_in_progress ? -EAGAIN : error;
 	spin_unlock_bh(&xfrm_state_lock);
+	if (to_put)
+		xfrm_state_put(to_put);
 	return x;
 }
 
@@ -1067,18 +1071,20 @@ static struct xfrm_state *__xfrm_find_acq_byseq(u32 seq);
 
 int xfrm_state_add(struct xfrm_state *x)
 {
-	struct xfrm_state *x1;
+	struct xfrm_state *x1, *to_put;
 	int family;
 	int err;
 	int use_spi = xfrm_id_proto_match(x->id.proto, IPSEC_PROTO_ANY);
 
 	family = x->props.family;
 
+	to_put = NULL;
+
 	spin_lock_bh(&xfrm_state_lock);
 
 	x1 = __xfrm_state_locate(x, use_spi, family);
 	if (x1) {
-		xfrm_state_put(x1);
+		to_put = x1;
 		x1 = NULL;
 		err = -EEXIST;
 		goto out;
@@ -1088,7 +1094,7 @@ int xfrm_state_add(struct xfrm_state *x)
 		x1 = __xfrm_find_acq_byseq(x->km.seq);
 		if (x1 && ((x1->id.proto != x->id.proto) ||
 		    xfrm_addr_cmp(&x1->id.daddr, &x->id.daddr, family))) {
-			xfrm_state_put(x1);
+			to_put = x1;
 			x1 = NULL;
 		}
 	}
@@ -1110,6 +1116,9 @@ out:
 		xfrm_state_put(x1);
 	}
 
+	if (to_put)
+		xfrm_state_put(to_put);
+
 	return err;
 }
 EXPORT_SYMBOL(xfrm_state_add);
@@ -1269,10 +1278,12 @@ EXPORT_SYMBOL(xfrm_state_migrate);
 
 int xfrm_state_update(struct xfrm_state *x)
 {
-	struct xfrm_state *x1;
+	struct xfrm_state *x1, *to_put;
 	int err;
 	int use_spi = xfrm_id_proto_match(x->id.proto, IPSEC_PROTO_ANY);
 
+	to_put = NULL;
+
 	spin_lock_bh(&xfrm_state_lock);
 	x1 = __xfrm_state_locate(x, use_spi, x->props.family);
 
@@ -1281,7 +1292,7 @@ int xfrm_state_update(struct xfrm_state *x)
 		goto out;
 
 	if (xfrm_state_kern(x1)) {
-		xfrm_state_put(x1);
+		to_put = x1;
 		err = -EEXIST;
 		goto out;
 	}
@@ -1295,6 +1306,9 @@ int xfrm_state_update(struct xfrm_state *x)
 out:
 	spin_unlock_bh(&xfrm_state_lock);
 
+	if (to_put)
+		xfrm_state_put(to_put);
+
 	if (err)
 		return err;
 
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c
index 6facac5..05eb899 100644
--- a/sound/pci/oxygen/oxygen_mixer.c
+++ b/sound/pci/oxygen/oxygen_mixer.c
@@ -512,9 +512,12 @@ static int ac97_switch_get(struct snd_kcontrol *ctl,
 
 static void mute_ac97_ctl(struct oxygen *chip, unsigned int control)
 {
-	unsigned int priv_idx = chip->controls[control]->private_value & 0xff;
+	unsigned int priv_idx;
 	u16 value;
 
+	if (!chip->controls[control])
+		return;
+	priv_idx = chip->controls[control]->private_value & 0xff;
 	value = oxygen_read_ac97(chip, 0, priv_idx);
 	if (!(value & 0x8000)) {
 		oxygen_write_ac97(chip, 0, priv_idx, value | 0x8000);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.524
retrieving revision 1.525
diff -u -r1.524 -r1.525
--- kernel.spec	3 Sep 2008 06:56:51 -0000	1.524
+++ kernel.spec	4 Sep 2008 02:03:09 -0000	1.525
@@ -557,7 +557,7 @@
 %endif
 
 # -stable RC
-# Patch02: patch-2.6.23.15-rc1.bz2
+Patch02: patch-2.6.26.4-rc1
 
 # we also need compile fixes for -vanilla
 Patch07: linux-2.6-compile-fixes.patch
@@ -615,8 +615,6 @@
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch402: linux-2.6-scsi-mpt-vmware-fix.patch
 
-Patch410: linux-2.6-bio-fix-__bio_copy_iov-handling-of-bv_len.patch
-Patch411: linux-2.6-bio-fix-bio_copy_kern-handling-of-bv_len.patch
 Patch412: linux-2.6-block-submit_bh-discards-barrier-flag.patch
 
 # filesystem patches
@@ -654,7 +652,6 @@
 Patch725: linux-2.6-netdev-atl2.patch
 Patch726: linux-2.6-netdev-atl1e.patch
 Patch727: linux-2.6-e1000-ich9.patch
-Patch728: linux-2.6-netdev-atl1-disable-tso-by-default.patch
 
 #ACPI
 Patch800: linux-2.6-acpi-processor-use-signed-int.patch
@@ -962,7 +959,7 @@
 %endif
 
 # -stable RC
-# ApplyPatch patch-2.6.23.15-rc1.bz2
+ApplyPatch patch-2.6.26.4-rc1
 
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
 # also gives a list of missing options at the end. Useful for automated
@@ -993,9 +990,6 @@
 
 # block/bio
 #
-# bio patches queued for -stable
-ApplyPatch linux-2.6-bio-fix-__bio_copy_iov-handling-of-bv_len.patch
-ApplyPatch linux-2.6-bio-fix-bio_copy_kern-handling-of-bv_len.patch
 # don't discard barrier flags
 ApplyPatch linux-2.6-block-submit_bh-discards-barrier-flag.patch
 
@@ -1183,8 +1177,6 @@
 ApplyPatch linux-2.6-netdev-atl2.patch
 # add atl1e network driver for eeepc 901
 ApplyPatch linux-2.6-netdev-atl1e.patch
-#
-ApplyPatch linux-2.6-netdev-atl1-disable-tso-by-default.patch
 
 # ACPI/PM patches
 # fix obvious thinko
@@ -1822,6 +1814,13 @@
 
 
 %changelog
+* Wed Sep 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.3-15
+- Linux 2.6.26.4-rc1
+  Dropped patches:
+    linux-2.6-bio-fix-__bio_copy_iov-handling-of-bv_len.patch
+    linux-2.6-bio-fix-bio_copy_kern-handling-of-bv_len.patch
+    linux-2.6-netdev-atl1-disable-tso-by-default.patch
+
 * Wed Sep 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.3-14
 - [CIFS] Turn off Unicode during session establishment for plaintext authentication
 - atl1: disable TSO by default


--- linux-2.6-bio-fix-__bio_copy_iov-handling-of-bv_len.patch DELETED ---


--- linux-2.6-bio-fix-bio_copy_kern-handling-of-bv_len.patch DELETED ---


--- linux-2.6-netdev-atl1-disable-tso-by-default.patch DELETED ---



From toshio at fedoraproject.org  Thu Sep  4 02:09:16 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu,  4 Sep 2008 02:09:16 +0000 (UTC)
Subject: rpms/bzr/devel .cvsignore, 1.26, 1.27 bzr.spec, 1.39, 1.40 sources, 
	1.26, 1.27
Message-ID: <20080904020916.5818770120@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3607

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
* Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.6.1-0.1.rc2
- New upstream bugfix release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	21 May 2008 12:29:58 -0000	1.26
+++ .cvsignore	4 Sep 2008 02:08:44 -0000	1.27
@@ -1 +1 @@
-bzr-1.5.tar.gz
+bzr-1.6.1rc2.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- bzr.spec	21 May 2008 12:32:28 -0000	1.39
+++ bzr.spec	4 Sep 2008 02:08:44 -0000	1.40
@@ -1,14 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bzr
-Version:        1.5
-Release:        2%{?dist}
+Version:        1.6.1
+Release:        0.1.rc2%{?dist}
 Summary:        Friendly distributed version control system
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://www.bazaar-vcs.org/
-Source0:        https://launchpad.net/%{name}/%{version}/%{version}/+download/%{name}-%{version}.tar.gz
+Source0:        https://launchpad.net/%{name}/1.6/%{version}rc2/+download/%{name}-%{version}rc2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}rc2
 
 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/_patiencediff_py.py
 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/weave.py
@@ -75,6 +75,9 @@
 %endif
 
 %changelog
+* Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.6.1-0.1.rc2
+- New upstream bugfix release.
+
 * Thu May 21 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.5-2
 - Upload tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	21 May 2008 12:29:58 -0000	1.26
+++ sources	4 Sep 2008 02:08:44 -0000	1.27
@@ -1 +1 @@
-fa82e556401802537eeb8e50ecc8b4e7  bzr-1.5.tar.gz
+112ba4410323383b8b20e1522483bbeb  bzr-1.6.1rc2.tar.gz



From ausil at fedoraproject.org  Thu Sep  4 02:14:23 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  4 Sep 2008 02:14:23 +0000 (UTC)
Subject: extras-buildsys/utils Makefile, 1.5, 1.5.8.1 user-manager.py, 1.3, 
	1.3.8.1
Message-ID: <20080904021423.3D8D770120@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4025/utils

Modified Files:
      Tag: Plague-0_4_5
	Makefile user-manager.py 
Log Message:
- update to 0.4.5.1  applying Michael schwendt's logging and mock patches
- using pysqlite2 on fedora and python-sqlite on RHEL
- requires mock > 0.8
- requires createrepo >= 0.4.7




Index: Makefile
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/Makefile,v
retrieving revision 1.5
retrieving revision 1.5.8.1
diff -u -r1.5 -r1.5.8.1
--- Makefile	8 Aug 2005 19:11:25 -0000	1.5
+++ Makefile	4 Sep 2008 02:14:21 -0000	1.5.8.1
@@ -11,5 +11,5 @@
 
 install:
 	$(MKDIR) -p $(DESTDIR)/$(BINDIR)
-	$(INSTALL) -m 755 user-manager.py $(DESTDIR)/$(BINDIR)/$(PKGNAME)-user-manager.py
-	$(INSTALL) -m 755 certhelper.py $(DESTDIR)/$(BINDIR)/$(PKGNAME)-certhelper.py
+	$(INSTALL) -m 755 user-manager.py $(DESTDIR)/$(BINDIR)/$(PKGNAME)-user-manager
+	$(INSTALL) -m 755 certhelper.py $(DESTDIR)/$(BINDIR)/$(PKGNAME)-certhelper


Index: user-manager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/user-manager.py,v
retrieving revision 1.3
retrieving revision 1.3.8.1
diff -u -r1.3 -r1.3.8.1
--- user-manager.py	8 Aug 2005 16:15:18 -0000	1.3
+++ user-manager.py	4 Sep 2008 02:14:21 -0000	1.3.8.1
@@ -18,8 +18,10 @@
 
 
 import sys, os
-import sqlite
-
+try:
+    import sqlite
+except ImportError, e:
+    import pysqlite2._sqlite as sqlite
 
 def print_usage(prog):
     print "Usage:\n"
@@ -38,7 +40,7 @@
 
 class UserManager:
     def __init__(self, dbfile):
-        self.dbcx = sqlite.connect(dbfile, encoding="utf-8", timeout=2)
+        self.dbcx = sqlite.connect(dbfile, timeout=2)
         self.curs = self.dbcx.cursor()
 
         # Ensure the table exists in the database
@@ -46,7 +48,7 @@
         try:
             self.curs.execute('SELECT * FROM users')
             self.dbcx.commit()
-        except sqlite._sqlite.DatabaseError, e:
+        except sqlite.DatabaseError, e:
             create = True
 
         if create:



From ausil at fedoraproject.org  Thu Sep  4 02:14:49 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  4 Sep 2008 02:14:49 +0000 (UTC)
Subject: extras-buildsys ChangeLog, 1.126.2.44.2.1.2.14,
	1.126.2.44.2.1.2.15 plague.spec, 1.27.2.5.2.1.2.3, 1.27.2.5.2.1.2.4
Message-ID: <20080904021449.ECDA370120@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4025

Modified Files:
      Tag: Plague-0_4_5
	ChangeLog plague.spec 
Log Message:
- update to 0.4.5.1  applying Michael schwendt's logging and mock patches
- using pysqlite2 on fedora and python-sqlite on RHEL
- requires mock > 0.8
- requires createrepo >= 0.4.7




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.44.2.1.2.14
retrieving revision 1.126.2.44.2.1.2.15
diff -u -r1.126.2.44.2.1.2.14 -r1.126.2.44.2.1.2.15
--- ChangeLog	3 Sep 2008 04:43:05 -0000	1.126.2.44.2.1.2.14
+++ ChangeLog	4 Sep 2008 02:14:18 -0000	1.126.2.44.2.1.2.15
@@ -1,3 +1,14 @@
+2008-09-03  Dennis Gilmore <dennis at ausil.us>
+        * Release of 0.4.5.1
+	   - require mock > 0.8
+	   - require createrepo > 0.4.7
+	   - apply patches from Michael Schwendt
+	   - plague-0.4.5-logtail.patch
+	   - plague-0.4.5-mock-0.8.patch
+	   - create sqlite data for createrepo
+	   - based on plague-0.4.5-sqlite3.patch fix sqlite so it will work as
+	   shipped on RHEL5 and Fedora,  tested on RHEL5 and rawhide
+
 2008-09-02  Dennis Gilmore <dennis at ausil.us>
         * Release of 0.4.5 
 


Index: plague.spec
===================================================================
RCS file: /cvs/fedora/extras-buildsys/plague.spec,v
retrieving revision 1.27.2.5.2.1.2.3
retrieving revision 1.27.2.5.2.1.2.4
diff -u -r1.27.2.5.2.1.2.3 -r1.27.2.5.2.1.2.4
--- plague.spec	3 Sep 2008 12:11:45 -0000	1.27.2.5.2.1.2.3
+++ plague.spec	4 Sep 2008 02:14:18 -0000	1.27.2.5.2.1.2.4
@@ -2,14 +2,22 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5
-Release: 0.2%{?dist}
+Version: 0.4.5.1
+Release: 0.1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: python-sqlite, createrepo >= 0.4.3
+BuildRequires: python
+%if 0%{?rhel}
+Requires: python-sqlite
+%else
+Requires: python-sqlite2
+%endif
+
+Requires: createrepo >= 0.4.7
+
 Requires: %{name}-common = %{version}-%{release}
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
@@ -35,7 +43,7 @@
 Summary: Builder daemon for Plague builder slaves
 Group: Development/Tools
 Requires: %{name}-common = %{version}-%{release}
-Requires: yum >= 2.2.1, mock < 0.8
+Requires: yum >= 2.2.1, mock >= 0.8
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -146,11 +154,14 @@
 
 %files utils
 %defattr(-, root, root)
-%{_bindir}/%{name}-user-manager.py*
-%{_bindir}/%{name}-certhelper.py*
+%{_bindir}/%{name}-user-manager
+%{_bindir}/%{name}-certhelper
 
 
 %changelog
+* Wed Sep 03 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.1
+- make mock 0.8 or greater mandatory fedora and epel both have 0.9 series
+
 * Sat Jun 14 2008 Michael Schwendt <mschwendt at fedoraproject.org>
 - Caution! Move plague-builder home to /var/lib/plague/builder
   (this breaks upgrades).



From ausil at fedoraproject.org  Thu Sep  4 02:14:50 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  4 Sep 2008 02:14:50 +0000 (UTC)
Subject: extras-buildsys/builder builder.py, 1.44.2.8.2.1.2.5,
	1.44.2.8.2.1.2.6
Message-ID: <20080904021450.AF82670120@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4025/builder

Modified Files:
      Tag: Plague-0_4_5
	builder.py 
Log Message:
- update to 0.4.5.1  applying Michael schwendt's logging and mock patches
- using pysqlite2 on fedora and python-sqlite on RHEL
- requires mock > 0.8
- requires createrepo >= 0.4.7




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/Attic/builder.py,v
retrieving revision 1.44.2.8.2.1.2.5
retrieving revision 1.44.2.8.2.1.2.6
diff -u -r1.44.2.8.2.1.2.5 -r1.44.2.8.2.1.2.6
--- builder.py	31 Jan 2008 18:16:28 -0000	1.44.2.8.2.1.2.5
+++ builder.py	4 Sep 2008 02:14:19 -0000	1.44.2.8.2.1.2.6
@@ -108,9 +108,7 @@
         if not os.path.exists(self._result_dir):
             os.makedirs(self._result_dir)
 
-        self._state_dir = os.path.join(self._work_dir, self._uniqid, "mock-state")
-        if not os.path.exists(self._state_dir):
-            os.makedirs(self._state_dir)
+        self._state_file = os.path.join(self._result_dir,"state.log")
 
         logfile = os.path.join(self._result_dir, "job.log")
         self._log_fd = open(logfile, "w+")
@@ -216,12 +214,12 @@
                 args.append(arg)
             cmd = os.path.abspath(arg_list[0])
         args.append(builder_cmd)
+        args.append("rebuild")
         args.append("-r")
         args.append(self.buildroot)
         args.append("--arch")
         args.append(self.buildarch)
         args.append("--resultdir=%s" % self._result_dir)
-        args.append("--statedir=%s" % self._state_dir)
         args.append("--uniqueext=%s" % self._uniqid)
         args.append(self._srpm_path)
         self._log("   %s\n" % string.join(args))
@@ -255,14 +253,14 @@
     def _mock_is_prepping(self):
         mock_status = self._get_mock_status()
         if mock_status:
-            prepstates = ['init','prep','unpa','crea','setu']
+            prepstates = ['enabl','creating cache','unpacking cache','setup']
             for s in prepstates:
-                if mock_status == s:
+                if mock_status.startswith(s):
                     return True
         return False
 
     def _get_mock_status(self):
-        mockstatusfile = os.path.join(self._state_dir, 'status')
+        mockstatusfile = self._state_file
         if not os.path.exists(mockstatusfile):
             return None
 
@@ -271,8 +269,7 @@
         
         while True:
             try:
-                f.seek(0, 0)
-                string = f.read(4)
+                lines = f.readlines()
             except OSError, e:
                 if e.errno == errno.EAGAIN:
                     try:
@@ -281,12 +278,19 @@
                         pass
                     continue
             else:
-                if len(string) < 4:
+                if not len(lines):
                     continue
                 break
         f.close()
-        string = string.lower()
-        return string
+        mockstat = None
+        lastline = lines[len(lines)-1].lower()
+        statedelim = "state changed:"
+        stateidx = lastline.rfind(statedelim)
+        if stateidx>0:
+            mockstat = lastline[stateidx+len(statedelim):].lstrip()
+            return mockstat
+        else:
+            return None
 
     def _read_mock_config(self):
         mockconfigfile = os.path.join(self._result_dir, 'mockconfig.log')
@@ -351,8 +355,7 @@
     def _status_prepping(self):
         # We need to make sure that mock has dumped the status file withing a certain
         # amount of time, otherwise we can't tell what it's doing
-        mockstatusfile = os.path.join(self._state_dir, 'status')
-        if not os.path.exists(mockstatusfile):
+        if not os.path.exists(self._state_file):
             # something is wrong if mock takes more than 15s to write the status file
             if time.time() > self._mockstarttime + 15:
                 self._mockstarttime = 0
@@ -381,9 +384,6 @@
                     if mock_root_dir.endswith(self._uniqid):
                         shutil.rmtree(mock_root_dir, ignore_errors=True)
 
-                if self._mock_config.has_key('statedir'):
-                    shutil.rmtree(self._mock_config['statedir'], ignore_errors=True)
-
                 source_dir = os.path.abspath(os.path.join(self._mock_config['rootdir'], "../source"))
                 # Ensure we're actually deleteing the job's sourcedir
                 if source_dir.endswith(os.path.join(self._uniqid, "source")):



From ausil at fedoraproject.org  Thu Sep  4 02:14:52 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  4 Sep 2008 02:14:52 +0000 (UTC)
Subject: extras-buildsys/server BuildMaster.py, 1.35.2.1.4.1,
	1.35.2.1.4.2 DBManager.py, 1.1.2.2.4.1,
	1.1.2.2.4.2 PackageJob.py, 1.31.2.10.4.4, 1.31.2.10.4.5 Repo.py,
	1.16.2.3.4.2, 1.16.2.3.4.3 User.py, 1.7.6.1, 1.7.6.2
Message-ID: <20080904021452.2780770120@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/fedora/extras-buildsys/server
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4025/server

Modified Files:
      Tag: Plague-0_4_5
	BuildMaster.py DBManager.py PackageJob.py Repo.py User.py 
Log Message:
- update to 0.4.5.1  applying Michael schwendt's logging and mock patches
- using pysqlite2 on fedora and python-sqlite on RHEL
- requires mock > 0.8
- requires createrepo >= 0.4.7




Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.35.2.1.4.1
retrieving revision 1.35.2.1.4.2
diff -u -r1.35.2.1.4.1 -r1.35.2.1.4.2
--- BuildMaster.py	31 Jan 2008 14:30:13 -0000	1.35.2.1.4.1
+++ BuildMaster.py	4 Sep 2008 02:14:20 -0000	1.35.2.1.4.2
@@ -65,10 +65,6 @@
         self._building_jobs = {}
         self._building_jobs_lock = threading.Lock()
 
-        self._dbcx = self._db_manager.dbcx()
-        self._cursor = self._dbcx.cursor()
-
-        self._requeue_interrupted_jobs()
         threading.Thread.__init__(self)
         self.setName("BuildMaster")
 
@@ -397,6 +393,12 @@
 
     def run(self):
         DebugUtils.registerThreadName(self)
+
+        self._dbcx = self._db_manager.dbcx()
+        self._cursor = self._dbcx.cursor()
+
+        self._requeue_interrupted_jobs()
+
         while self.should_stop == False:
             # Write update status for jobs to the database
             self._save_job_status()


Index: DBManager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/DBManager.py,v
retrieving revision 1.1.2.2.4.1
retrieving revision 1.1.2.2.4.2
diff -u -r1.1.2.2.4.1 -r1.1.2.2.4.2
--- DBManager.py	31 Jan 2008 14:30:13 -0000	1.1.2.2.4.1
+++ DBManager.py	4 Sep 2008 02:14:20 -0000	1.1.2.2.4.2
@@ -124,11 +124,15 @@
 
     def fetchall(self, cursor):
         """ sqlite returns the items in a dict-like class already """
-        return cursor.fetchall()
+        rows = cursor.fetchall()
+        return [ResultSet(row, cursor.description) for row in rows]
 
     def fetchone(self, cursor):
         """ sqlite returns the items in a dict-like class already """
-        return cursor.fetchone()
+        row = cursor.fetchone()
+        if not row:
+            return None
+        return ResultSet(row, cursor.description)
 
     def _connect(self):
         try:
@@ -143,7 +147,7 @@
             tm = 3
 
         try:
-            dbcx = sqlite.connect(dbloc, encoding="utf-8", timeout=tm)
+            dbcx = sqlite.connect(dbloc, timeout=tm)
         except StandardError, e:
             print "Error: %s" % e
             os._exit(1)
@@ -268,7 +272,10 @@
 try:
     import sqlite
 except ImportError, e:
-    db_engines['sqlite'] = None
+    try:
+        import pysqlite2._sqlite as sqlite
+    except ImportError, e:
+        db_engines['sqlite'] = None
 
 try:
     import pgdb


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.31.2.10.4.4
retrieving revision 1.31.2.10.4.5
diff -u -r1.31.2.10.4.4 -r1.31.2.10.4.5
--- PackageJob.py	31 Jan 2008 14:34:23 -0000	1.31.2.10.4.4
+++ PackageJob.py	4 Sep 2008 02:14:20 -0000	1.31.2.10.4.5
@@ -729,30 +729,9 @@
 
         self.bm.notify_job_done(self)
 
-    def _get_log_tail(self, arch):
-        """ Returns the last 30 lines of the most relevant log file """
-
-        pkg_dir = "%s-%s-%s-%s" % (self.uid, self.name, self.ver, self.release)
-        work_dir = self._server_cfg.get_str("Directories", "server_work_dir")
-        log_dir = os.path.join(work_dir, self._target_str, pkg_dir, arch)
-        final_log = None
-        build_log = "%s/%s" % (log_dir, "build.log")
-        root_log = "%s/%s" % (log_dir, "root.log")
-        job_log = "%s/%s" % (log_dir, "job.log")
-
-        # Try the most relevant log file first
-        if os.path.exists(build_log) and os.path.getsize(build_log) > 0:
-            final_log = build_log
-        elif os.path.exists(root_log) and os.path.getsize(root_log) > 0:
-            final_log = root_log
-        elif os.path.exists(job_log) and os.path.getsize(job_log) > 0:
-            final_log = job_log
-
-        if not final_log:
-            return ""
-
-        seek_pos = os.path.getsize(final_log) - 4096
-        f = open(final_log, "r", 4096);
+    def _get_log_file_tail(self, logfile):
+        seek_pos = os.path.getsize(logfile) - 4096
+        f = open(logfile, "r", 4096);
         if seek_pos > 0:
             f.seek(seek_pos)
         try:
@@ -770,9 +749,28 @@
             lines.append(line)
             if len(lines) > 30:  # only want last 30 lines
                 del lines[0]
-
         f.close()
-        return "".join(lines)
+        return lines
+
+    def _get_log_tail(self, arch):
+        """ Returns the last 30 lines of the most relevant log file(s) """
+
+        pkg_dir = "%s-%s-%s-%s" % (self.uid, self.name, self.ver, self.release)
+        work_dir = self._server_cfg.get_str("Directories", "server_work_dir")
+        log_dir = os.path.join(work_dir, self._target_str, pkg_dir, arch)
+
+        logtail = []
+        for l in ["build.log", "root.log", "job.log"]:
+            lpath = os.path.join(log_dir, l)
+            if os.path.exists(lpath) and os.path.getsize(lpath)>0:
+                lines = self._get_log_file_tail(lpath)
+                if l=="build.log" and len(lines)<10:
+                    logtail += lines
+                    logtail.append("\n\n"+">"*40+"\n\n")
+                else:
+                    logtail += lines
+                    break
+        return "".join(logtail)
 
     def email_result(self, to, resultstring, subject=None):
         """send 'resultstring' to self.username"""


Index: Repo.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v
retrieving revision 1.16.2.3.4.2
retrieving revision 1.16.2.3.4.3
diff -u -r1.16.2.3.4.2 -r1.16.2.3.4.3
--- Repo.py	5 Mar 2008 22:39:47 -0000	1.16.2.3.4.2
+++ Repo.py	4 Sep 2008 02:14:20 -0000	1.16.2.3.4.3
@@ -87,7 +87,7 @@
             return True
         return False
 
-    def _update_repo(self):
+    def _update_repo(self, target_string):
         """ Copy new RPMS to each repo, and update each repo at the end """
         for buildjob in self._repo_additions:
             # Ensure all the files are accessible
@@ -118,11 +118,11 @@
 
         self._repo_additions = []
 
-        (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -c %s -x "*.src.rpm" -x "*-debuginfo-*.rpm" %s' % (self._repo_cache_dir, self._repodir))
+        (s, o) = commands.getstatusoutput('/usr/bin/createrepo -d -q -c %s -x "*.src.rpm" -x "*-debuginfo-*.rpm" %s' % (self._repo_cache_dir, self._repodir))
         if s != 0:
-            print "Repo Error (%s): createrepo failed with exit status %d!  Output: '%s'" % (target_string, s, o)
+            target_str = self._target_cfg.target_string()
+            print "Repo Error (%s): createrepo failed with exit status %d!  Output: '%s'" % (target_str, s, o)
 
-        del target_string
 
     def _run_repo_script(self):
         target_str = self._target_cfg.target_string()


Index: User.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/User.py,v
retrieving revision 1.7.6.1
retrieving revision 1.7.6.2
diff -u -r1.7.6.1 -r1.7.6.2
--- User.py	31 Jan 2008 14:30:13 -0000	1.7.6.1
+++ User.py	4 Sep 2008 02:14:20 -0000	1.7.6.2
@@ -14,8 +14,12 @@
 #
 # Copyright 2005 Dan Williams <dcbw at redhat.com> and Red Hat, Inc.
 
+try:
+    import sqlite
+except ImportError, e:
+    import pysqlite2._sqlite as sqlite
 
-import sqlite
+import sys
 
 CONFIG_LOCATION = "/etc/plague/server/"
 
@@ -30,10 +34,9 @@
         self.user_admin = False
         self.server_admin = False
 
-
 def get_userdb_dbcx():
     try:
-        dbcx = sqlite.connect(CONFIG_LOCATION + "userdb", encoding="utf-8", timeout=4)
+        dbcx = sqlite.connect(CONFIG_LOCATION + "userdb", timeout=4)
         curs = dbcx.cursor()
         return (dbcx, curs)
     except sqlite.DatabaseError, e:
@@ -57,7 +60,7 @@
         try:
             curs.execute('SELECT * FROM users')
             dbcx.commit()
-        except sqlite._sqlite.DatabaseError, e:
+        except sqlite.DatabaseError, e:
             create = True
 
         if create:



From ausil at fedoraproject.org  Thu Sep  4 02:19:58 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  4 Sep 2008 02:19:58 +0000 (UTC)
Subject: rpms/plague/devel .cvsignore, 1.12, 1.13 plague.spec, 1.34,
	1.35 sources, 1.26, 1.27 plague-0.4.5-logtail.patch, 1.1,
	NONE plague-0.4.5-mock-0.8.patch, 1.1,
	NONE plague-0.4.5-sqlite3.patch, 1.1, NONE
Message-ID: <20080904021958.6A4DE70120@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plague/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4441

Modified Files:
	.cvsignore plague.spec sources 
Removed Files:
	plague-0.4.5-logtail.patch plague-0.4.5-mock-0.8.patch 
	plague-0.4.5-sqlite3.patch 
Log Message:
update to 0.4.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Sep 2008 05:06:53 -0000	1.12
+++ .cvsignore	4 Sep 2008 02:19:26 -0000	1.13
@@ -1 +1 @@
-plague-0.4.5.tar.bz2
+plague-0.4.5.1.tar.bz2


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/plague.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- plague.spec	3 Sep 2008 12:06:10 -0000	1.34
+++ plague.spec	4 Sep 2008 02:19:26 -0000	1.35
@@ -2,8 +2,8 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5
-Release: 2%{?dist}
+Version: 0.4.5.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 #Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -11,16 +11,20 @@
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
-Requires: createrepo >= 0.4.3
+Requires: createrepo >= 0.4.7
+# get the version of the sqlite api thats available to us
+%if 0%{?rhel}
+Requires: python-sqlite
+%else
+Requires: python-sqlite2
+%endif
+
 Requires: %{name}-common = %{version}-%{release}
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
-Patch1: plague-0.4.5-sqlite3.patch
-Patch2: plague-0.4.5-mock-0.8.patch
-Patch3: plague-0.4.5-logtail.patch
 
 
 %description
@@ -43,11 +47,7 @@
 Group: Development/Tools
 Requires: %{name}-common = %{version}-%{release}
 Requires: yum >= 2.2.1
-%if 0%{?fedora} > 6
 Requires: mock >= 0.8
-%else
-Requires: mock < 0.8
-%endif
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -79,11 +79,6 @@
 
 %prep
 %setup -q
-%if 0%{?fedora} > 6
-%patch1 -p1 -b .sqlite3
-%patch2 -p1 -b .mock8
-%endif
-%patch3 -p1 -b .logtail
 
 
 %build
@@ -164,11 +159,17 @@
 
 %files utils
 %defattr(-, root, root)
-%{_bindir}/%{name}-user-manager.py*
-%{_bindir}/%{name}-certhelper.py*
+%{_bindir}/%{name}-user-manager
+%{_bindir}/%{name}-certhelper
 
 
 %changelog
+* Wed Sep 03 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.1-1
+- update to 0.4.5.1  applying Michael schwendt's logging and mock patches
+- using pysqlite2 on fedora and python-sqlite on RHEL
+- requires mock > 0.8
+- requires createrepo >= 0.4.7
+
 * Wed Sep  3 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5-2
 - add the patches from 0.4.5-0.4 (sqlite3, mock08, logtail)
 - merge more spec changes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	3 Sep 2008 05:06:53 -0000	1.26
+++ sources	4 Sep 2008 02:19:26 -0000	1.27
@@ -1 +1 @@
-91b27539286838d6900c3427eabe1850  plague-0.4.5.tar.bz2
+99f5a996f16cddf3b8f4051068aa452a  plague-0.4.5.1.tar.bz2


--- plague-0.4.5-logtail.patch DELETED ---


--- plague-0.4.5-mock-0.8.patch DELETED ---


--- plague-0.4.5-sqlite3.patch DELETED ---



From ausil at fedoraproject.org  Thu Sep  4 02:24:10 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  4 Sep 2008 02:24:10 +0000 (UTC)
Subject: rpms/plague/F-9 plague.spec, 1.33, 1.34 sources, 1.26,
	1.27 plague-0.4.5-logtail.patch, 1.1,
	NONE plague-0.4.5-mock-0.8.patch, 1.1,
	NONE plague-0.4.5-sqlite3.patch, 1.1, NONE
Message-ID: <20080904022410.E2CF570120@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plague/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4690

Modified Files:
	plague.spec sources 
Removed Files:
	plague-0.4.5-logtail.patch plague-0.4.5-mock-0.8.patch 
	plague-0.4.5-sqlite3.patch 
Log Message:
update to 0.4.5.1



Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-9/plague.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- plague.spec	3 Sep 2008 12:06:11 -0000	1.33
+++ plague.spec	4 Sep 2008 02:23:39 -0000	1.34
@@ -2,8 +2,8 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5
-Release: 2%{?dist}
+Version: 0.4.5.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 #Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -11,16 +11,20 @@
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
-Requires: createrepo >= 0.4.3
+Requires: createrepo >= 0.4.7
+# get the version of the sqlite api thats available to us
+%if 0%{?rhel}
+Requires: python-sqlite
+%else
+Requires: python-sqlite2
+%endif
+
 Requires: %{name}-common = %{version}-%{release}
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
-Patch1: plague-0.4.5-sqlite3.patch
-Patch2: plague-0.4.5-mock-0.8.patch
-Patch3: plague-0.4.5-logtail.patch
 
 
 %description
@@ -43,11 +47,7 @@
 Group: Development/Tools
 Requires: %{name}-common = %{version}-%{release}
 Requires: yum >= 2.2.1
-%if 0%{?fedora} > 6
 Requires: mock >= 0.8
-%else
-Requires: mock < 0.8
-%endif
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -79,11 +79,6 @@
 
 %prep
 %setup -q
-%if 0%{?fedora} > 6
-%patch1 -p1 -b .sqlite3
-%patch2 -p1 -b .mock8
-%endif
-%patch3 -p1 -b .logtail
 
 
 %build
@@ -164,11 +159,17 @@
 
 %files utils
 %defattr(-, root, root)
-%{_bindir}/%{name}-user-manager.py*
-%{_bindir}/%{name}-certhelper.py*
+%{_bindir}/%{name}-user-manager
+%{_bindir}/%{name}-certhelper
 
 
 %changelog
+* Wed Sep 03 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.1-1
+- update to 0.4.5.1  applying Michael schwendt's logging and mock patches
+- using pysqlite2 on fedora and python-sqlite on RHEL
+- requires mock > 0.8
+- requires createrepo >= 0.4.7
+
 * Wed Sep  3 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5-2
 - add the patches from 0.4.5-0.4 (sqlite3, mock08, logtail)
 - merge more spec changes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-9/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	3 Sep 2008 05:08:37 -0000	1.26
+++ sources	4 Sep 2008 02:23:39 -0000	1.27
@@ -1 +1 @@
-91b27539286838d6900c3427eabe1850  plague-0.4.5.tar.bz2
+99f5a996f16cddf3b8f4051068aa452a  plague-0.4.5.1.tar.bz2


--- plague-0.4.5-logtail.patch DELETED ---


--- plague-0.4.5-mock-0.8.patch DELETED ---


--- plague-0.4.5-sqlite3.patch DELETED ---



From ausil at fedoraproject.org  Thu Sep  4 02:25:53 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  4 Sep 2008 02:25:53 +0000 (UTC)
Subject: rpms/plague/F-8 plague.spec, 1.33, 1.34 sources, 1.26,
	1.27 plague-0.4.5-logtail.patch, 1.1,
	NONE plague-0.4.5-mock-0.8.patch, 1.1,
	NONE plague-0.4.5-sqlite3.patch, 1.1, NONE
Message-ID: <20080904022553.C037670120@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plague/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4855

Modified Files:
	plague.spec sources 
Removed Files:
	plague-0.4.5-logtail.patch plague-0.4.5-mock-0.8.patch 
	plague-0.4.5-sqlite3.patch 
Log Message:
update to 0.4.5.1



Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-8/plague.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- plague.spec	3 Sep 2008 12:06:12 -0000	1.33
+++ plague.spec	4 Sep 2008 02:25:52 -0000	1.34
@@ -2,8 +2,8 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5
-Release: 2%{?dist}
+Version: 0.4.5.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 #Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -11,16 +11,20 @@
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
-Requires: createrepo >= 0.4.3
+Requires: createrepo >= 0.4.7
+# get the version of the sqlite api thats available to us
+%if 0%{?rhel}
+Requires: python-sqlite
+%else
+Requires: python-sqlite2
+%endif
+
 Requires: %{name}-common = %{version}-%{release}
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
-Patch1: plague-0.4.5-sqlite3.patch
-Patch2: plague-0.4.5-mock-0.8.patch
-Patch3: plague-0.4.5-logtail.patch
 
 
 %description
@@ -43,11 +47,7 @@
 Group: Development/Tools
 Requires: %{name}-common = %{version}-%{release}
 Requires: yum >= 2.2.1
-%if 0%{?fedora} > 6
 Requires: mock >= 0.8
-%else
-Requires: mock < 0.8
-%endif
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -79,11 +79,6 @@
 
 %prep
 %setup -q
-%if 0%{?fedora} > 6
-%patch1 -p1 -b .sqlite3
-%patch2 -p1 -b .mock8
-%endif
-%patch3 -p1 -b .logtail
 
 
 %build
@@ -164,11 +159,17 @@
 
 %files utils
 %defattr(-, root, root)
-%{_bindir}/%{name}-user-manager.py*
-%{_bindir}/%{name}-certhelper.py*
+%{_bindir}/%{name}-user-manager
+%{_bindir}/%{name}-certhelper
 
 
 %changelog
+* Wed Sep 03 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.1-1
+- update to 0.4.5.1  applying Michael schwendt's logging and mock patches
+- using pysqlite2 on fedora and python-sqlite on RHEL
+- requires mock > 0.8
+- requires createrepo >= 0.4.7
+
 * Wed Sep  3 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5-2
 - add the patches from 0.4.5-0.4 (sqlite3, mock08, logtail)
 - merge more spec changes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-8/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	3 Sep 2008 05:10:50 -0000	1.26
+++ sources	4 Sep 2008 02:25:52 -0000	1.27
@@ -1 +1 @@
-91b27539286838d6900c3427eabe1850  plague-0.4.5.tar.bz2
+99f5a996f16cddf3b8f4051068aa452a  plague-0.4.5.1.tar.bz2


--- plague-0.4.5-logtail.patch DELETED ---


--- plague-0.4.5-mock-0.8.patch DELETED ---


--- plague-0.4.5-sqlite3.patch DELETED ---



From ausil at fedoraproject.org  Thu Sep  4 02:28:05 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  4 Sep 2008 02:28:05 +0000 (UTC)
Subject: rpms/plague/EL-5 plague.spec, 1.28, 1.29 sources, 1.25,
	1.26 plague-0.4-daemonize.patch, 1.1, NONE
Message-ID: <20080904022805.DD39470120@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plague/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5034

Modified Files:
	plague.spec sources 
Removed Files:
	plague-0.4-daemonize.patch 
Log Message:
update to 0.4.5.1



Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/EL-5/plague.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- plague.spec	14 Sep 2006 16:13:05 -0000	1.28
+++ plague.spec	4 Sep 2008 02:28:03 -0000	1.29
@@ -2,21 +2,31 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.4.1
-Release: 2%{?dist}
-License: GPL
+Version: 0.4.5.1
+Release: 1%{?dist}
+License: GPLv2+
 Group: Development/Tools
-Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
+#Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.bz2
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: python-sqlite, createrepo >= 0.4.3
+BuildRequires: python
+Requires: createrepo >= 0.4.7
+# get the version of the sqlite api thats available to us
+%if 0%{?rhel}
+Requires: python-sqlite
+%else
+Requires: python-sqlite2
+%endif
+
 Requires: %{name}-common = %{version}-%{release}
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
-Patch0: plague-0.4-daemonize.patch
+
+
 %description
 The Plague build system is a client/server distributed build system for
 building RPM packages.  This package provides the plague server.
@@ -28,14 +38,16 @@
 Requires: pyOpenSSL
 
 %description common
-This package includes the common Python module that all Plague services require.
+This package includes the common Python module that all Plague services
+require.
 
 
 %package builder
 Summary: Builder daemon for Plague builder slaves
 Group: Development/Tools
 Requires: %{name}-common = %{version}-%{release}
-Requires: yum >= 2.2.1, mock >= 0.3
+Requires: yum >= 2.2.1
+Requires: mock >= 0.8
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -51,7 +63,8 @@
 Requires: %{name}-common = %{version}-%{release}
 
 %description client
-Client program for enqueueing package builds and interrogating the build system.
+Client program for enqueueing package builds and interrogating the build
+system.
 
 
 %package utils
@@ -66,7 +79,7 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .umask
+
 
 %build
 make
@@ -74,12 +87,13 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-install -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder
-install -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder
-install -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server
-install -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server
-mkdir -p $RPM_BUILD_ROOT/srv/plague_builder
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
+chmod +x $RPM_BUILD_ROOT%{_bindir}/*
+install -p -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder
+install -p -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder
+install -p -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server
+install -p -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server
+mkdir -p $RPM_BUILD_ROOT/var/lib/plague/builder
 
 
 %clean
@@ -97,7 +111,7 @@
 fi
 
 %pre builder
-/usr/sbin/useradd -G mock -s /sbin/nologin -M -r -d /srv/plague_builder plague-builder 2>/dev/null || :
+/usr/sbin/useradd -G mock -s /sbin/nologin -M -r -d /var/lib/plague/builder plague-builder 2>/dev/null || :
 
 %post builder
 /sbin/chkconfig --add plague-builder
@@ -122,6 +136,8 @@
 %files common
 %defattr(-, root, root)
 %doc README ChangeLog
+%dir %{_sysconfdir}/%{name}
+%dir %{_datadir}/%{name}
 %dir /usr/lib/python?.?/site-packages/%{name}
 /usr/lib/python?.?/site-packages/%{name}/*.py*
 
@@ -134,7 +150,8 @@
 %dir %{_sysconfdir}/%{name}/builder/certs
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-builder
 %{_initrddir}/%{name}-builder
-%attr(0755, plague-builder, plague-builder) /srv/plague_builder
+%dir /var/lib/plague
+%attr(0755, plague-builder, plague-builder) /var/lib/plague/builder
 
 %files client
 %defattr(-, root, root)
@@ -142,11 +159,38 @@
 
 %files utils
 %defattr(-, root, root)
-%{_bindir}/%{name}-user-manager.py*
-%{_bindir}/%{name}-certhelper.py*
+%{_bindir}/%{name}-user-manager
+%{_bindir}/%{name}-certhelper
 
 
 %changelog
+* Wed Sep 03 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.1-1
+- update to 0.4.5.1  applying Michael schwendt's logging and mock patches
+- using pysqlite2 on fedora and python-sqlite on RHEL
+- requires mock > 0.8
+- requires createrepo >= 0.4.7
+
+* Wed Sep  3 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5-2
+- add the patches from 0.4.5-0.4 (sqlite3, mock08, logtail)
+- merge more spec changes
+
+* Tue Sep 02 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5-1
+- update to 0.4.5  lots of fixes 
+
+* Thu May 22 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.4.4.1-6
+- licensing tag fix
+
+* Tue Sep 18 2007 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.4.1-5
+- Add dirs /etc/plague and /usr/share/plague to plague-common
+  since "plague-builder" and "plague" use them (#233904).
+
+* Fri Dec 15 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.4.4.1-4
+- Small fix for a change in python 2.5's xmlrpc library.  The patch has been
+  upstreamed.
+
+* Thu Dec 14 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.4.4.1-3
+- Rebuild for new Python
+
 * Thu Sep 14 2006 Dennis Gilmore <dennis at ausil.us> 0.4.4.0-2
 - add patch  for bad umask setting
 
@@ -303,7 +347,7 @@
 
 * Sat Jul 16 2005 Dan Williams <dcbw at redhat.com>
 - Bump version to 0.2
-- Grab python files from /usr/lib, not %{_libdir} until the
+- Grab python files from /usr/lib, not %%{_libdir} until the
     multiarch issues get worked out
 
 * Sun Jun 26 2005 Dan Williams <dcbw at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/EL-5/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	13 Mar 2006 15:30:00 -0000	1.25
+++ sources	4 Sep 2008 02:28:03 -0000	1.26
@@ -1 +1 @@
-0eb43e25cdd8d630759d010115101956  plague-0.4.4.1.tar.bz2
+99f5a996f16cddf3b8f4051068aa452a  plague-0.4.5.1.tar.bz2


--- plague-0.4-daemonize.patch DELETED ---



From toshio at fedoraproject.org  Thu Sep  4 02:46:49 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu,  4 Sep 2008 02:46:49 +0000 (UTC)
Subject: rpms/bzr/F-9 .cvsignore, 1.26, 1.27 bzr.spec, 1.35, 1.36 sources,
	1.26, 1.27
Message-ID: <20080904024649.76C0570120@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5925

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
* Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.6.1-0.1.rc2
- New upstream bugfix release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-9/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	30 May 2008 17:04:44 -0000	1.26
+++ .cvsignore	4 Sep 2008 02:46:18 -0000	1.27
@@ -1 +1 @@
-bzr-1.5.tar.gz
+bzr-1.6.1rc2.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-9/bzr.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- bzr.spec	30 May 2008 17:04:44 -0000	1.35
+++ bzr.spec	4 Sep 2008 02:46:18 -0000	1.36
@@ -1,14 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bzr
-Version:        1.5
-Release:        2%{?dist}
+Version:        1.6.1
+Release:        0.1.rc2%{?dist}
 Summary:        Friendly distributed version control system
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://www.bazaar-vcs.org/
-Source0:        https://launchpad.net/%{name}/%{version}/%{version}/+download/%{name}-%{version}.tar.gz
+Source0:        https://launchpad.net/%{name}/1.6/%{version}rc2/+download/%{name}-%{version}rc2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}rc2
 
 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/_patiencediff_py.py
 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/weave.py
@@ -75,6 +75,9 @@
 %endif
 
 %changelog
+* Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.6.1-0.1.rc2
+- New upstream bugfix release.
+
 * Thu May 21 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.5-2
 - Upload tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-9/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	30 May 2008 17:04:44 -0000	1.26
+++ sources	4 Sep 2008 02:46:18 -0000	1.27
@@ -1 +1 @@
-fa82e556401802537eeb8e50ecc8b4e7  bzr-1.5.tar.gz
+112ba4410323383b8b20e1522483bbeb  bzr-1.6.1rc2.tar.gz



From toshio at fedoraproject.org  Thu Sep  4 02:50:11 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu,  4 Sep 2008 02:50:11 +0000 (UTC)
Subject: rpms/bzrtools/devel .cvsignore, 1.20, 1.21 bzrtools.spec, 1.30,
	1.31 sources, 1.20, 1.21
Message-ID: <20080904025011.E9A9270120@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzrtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6257

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:

* Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> 1.6.0-1
- Update to 1.6.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	21 May 2008 19:29:43 -0000	1.20
+++ .cvsignore	4 Sep 2008 02:49:40 -0000	1.21
@@ -1 +1 @@
-bzrtools-1.5.0.tar.gz
+bzrtools-1.6.0.tar.gz


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/bzrtools.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- bzrtools.spec	21 May 2008 19:29:43 -0000	1.30
+++ bzrtools.spec	4 Sep 2008 02:49:41 -0000	1.31
@@ -5,8 +5,8 @@
 # (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
 %define debug_package %{nil}
 
-%define bzrver 1.5
-%define bzrnextver 1.6
+%define bzrver 1.6
+%define bzrnextver 1.7
 
 Name:           bzrtools
 Version:        %{bzrver}.0
@@ -71,6 +71,9 @@
 %endif
 
 %changelog
+* Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> 1.6.0-1
+- Update to 1.6.0
+
 * Wed May 21 2008 Toshio Kuratomi <toshio at fedoraproject.org> 1.5.0-1
 - Update to 1.5.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	21 May 2008 19:29:43 -0000	1.20
+++ sources	4 Sep 2008 02:49:41 -0000	1.21
@@ -1 +1 @@
-35648241d1857086a57860b31026b5e8  bzrtools-1.5.0.tar.gz
+82c5b96fd996bede6ed92759ef28a108  bzrtools-1.6.0.tar.gz



From katzj at fedoraproject.org  Thu Sep  4 02:59:18 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Thu,  4 Sep 2008 02:59:18 +0000 (UTC)
Subject: rpms/sugar/devel sugar.spec,1.20,1.21
Message-ID: <20080904025918.D592870120@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7081

Modified Files:
	sugar.spec 
Log Message:
* Wed Sep  3 2008 Jeremy Katz <katzj at redhat.com> - 0.82.2-2
- Require gstreamer-python and telepathy-python (rhbz#447589)



Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sugar.spec	30 Aug 2008 00:36:25 -0000	1.20
+++ sugar.spec	4 Sep 2008 02:58:48 -0000	1.21
@@ -4,7 +4,7 @@
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.82.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/sugar
@@ -28,6 +28,8 @@
 Requires: gnome-python2-libwnck
 Requires: matchbox-window-manager
 Requires: numpy
+Requires: python-telepathy
+Requires: gstreamer-python
 
 %description
 
@@ -92,6 +94,9 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Wed Sep  3 2008 Jeremy Katz <katzj at redhat.com> - 0.82.2-2
+- Require gstreamer-python and telepathy-python (rhbz#447589)
+
 * Fri Aug 29 2008 Simon Schampijer <simon at laptop.org> - 0.82.2-1
 - 6929 Control panel: include copyright/licensing info in about dialogue 
 - Fix some launcher issues



From toshio at fedoraproject.org  Thu Sep  4 03:00:20 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu,  4 Sep 2008 03:00:20 +0000 (UTC)
Subject: rpms/bzrtools/F-9 .cvsignore, 1.20, 1.21 bzrtools.spec, 1.30,
	1.31 sources, 1.20, 1.21
Message-ID: <20080904030020.15C9770120@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzrtools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7333

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:

* Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> 1.6.0-1
- Update to 1.6.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/F-9/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	30 May 2008 17:04:57 -0000	1.20
+++ .cvsignore	4 Sep 2008 02:59:49 -0000	1.21
@@ -1 +1 @@
-bzrtools-1.5.0.tar.gz
+bzrtools-1.6.0.tar.gz


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/F-9/bzrtools.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- bzrtools.spec	30 May 2008 17:04:57 -0000	1.30
+++ bzrtools.spec	4 Sep 2008 02:59:49 -0000	1.31
@@ -5,8 +5,8 @@
 # (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
 %define debug_package %{nil}
 
-%define bzrver 1.5
-%define bzrnextver 1.6
+%define bzrver 1.6
+%define bzrnextver 1.7
 
 Name:           bzrtools
 Version:        %{bzrver}.0
@@ -71,6 +71,9 @@
 %endif
 
 %changelog
+* Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> 1.6.0-1
+- Update to 1.6.0
+
 * Wed May 21 2008 Toshio Kuratomi <toshio at fedoraproject.org> 1.5.0-1
 - Update to 1.5.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	30 May 2008 17:04:57 -0000	1.20
+++ sources	4 Sep 2008 02:59:49 -0000	1.21
@@ -1 +1 @@
-35648241d1857086a57860b31026b5e8  bzrtools-1.5.0.tar.gz
+82c5b96fd996bede6ed92759ef28a108  bzrtools-1.6.0.tar.gz



From tagoh at fedoraproject.org  Thu Sep  4 03:11:39 2008
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu,  4 Sep 2008 03:11:39 +0000 (UTC)
Subject: rpms/mew/devel .cvsignore, 1.15, 1.16 mew.spec, 1.29, 1.30 sources, 
	1.15, 1.16
Message-ID: <20080904031140.007AD70120@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/mew/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8271

Modified Files:
	.cvsignore mew.spec sources 
Log Message:
* Thu Sep  4 2008 Akira TAGOH <tagoh at redhat.com> - 6.1.50-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mew/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	13 Jun 2008 02:51:12 -0000	1.15
+++ .cvsignore	4 Sep 2008 03:11:09 -0000	1.16
@@ -15,3 +15,4 @@
 mew-6.0.51.tar.gz
 mew-6.1rc1.tar.gz
 mew-6.1.tar.gz
+mew-6.1.50.tar.gz


Index: mew.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mew/devel/mew.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mew.spec	13 Jun 2008 02:51:12 -0000	1.29
+++ mew.spec	4 Sep 2008 03:11:09 -0000	1.30
@@ -1,11 +1,11 @@
 %define _use_internal_dependency_generator 0
 
-%define srcver		6.1
+%define srcver		6.1.50
 %define	emacsver	20.7
 %define	xemacsver	21.4.11
 
 Name:			mew
-Version:		6.1
+Version:		6.1.50
 Release:		1%{?dist}
 License:		BSD
 URL:			http://www.mew.org/
@@ -188,6 +188,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 Akira TAGOH <tagoh at redhat.com> - 6.1.50-1
+- New upstream release.
+
 * Fri Jun 13 2008 Akira TAGOH <tagoh at redhat.com> - 6.1-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mew/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	13 Jun 2008 02:51:12 -0000	1.15
+++ sources	4 Sep 2008 03:11:09 -0000	1.16
@@ -1 +1 @@
-44c2f841de5503d3195547ec512f0ab5  mew-6.1.tar.gz
+0f068c3d44100ef44d55805d6ce68a4a  mew-6.1.50.tar.gz



From cebbert at fedoraproject.org  Thu Sep  4 03:11:47 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu,  4 Sep 2008 03:11:47 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc5-git5.bz2.sign, NONE,
	1.1 .cvsignore, 1.913, 1.914 kernel.spec, 1.924,
	1.925 linux-2.6-iwlwifi-use-dma_alloc_coherent.patch, 1.1,
	1.2 sources, 1.876, 1.877 upstream, 1.789,
	1.790 patch-2.6.27-rc5-git3.bz2.sign, 1.1, NONE
Message-ID: <20080904031147.906D570120@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8309

Modified Files:
	.cvsignore kernel.spec 
	linux-2.6-iwlwifi-use-dma_alloc_coherent.patch sources 
	upstream 
Added Files:
	patch-2.6.27-rc5-git5.bz2.sign 
Removed Files:
	patch-2.6.27-rc5-git3.bz2.sign 
Log Message:
2.6.27-rc5-git5


--- NEW FILE patch-2.6.27-rc5-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD4DBQBIvyW4yGugalF9Dw4RAoRGAJQO0rDVQvu1odrSmdLgodt1qQ/cAKCONkRs
1T6zFh3LQfmKuj7Xd9pCmw==
=Lf2p
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.913
retrieving revision 1.914
diff -u -r1.913 -r1.914
--- .cvsignore	3 Sep 2008 00:41:31 -0000	1.913
+++ .cvsignore	4 Sep 2008 03:11:16 -0000	1.914
@@ -5,4 +5,4 @@
 kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc5.bz2
-patch-2.6.27-rc5-git3.bz2
+patch-2.6.27-rc5-git5.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.924
retrieving revision 1.925
diff -u -r1.924 -r1.925
--- kernel.spec	3 Sep 2008 19:19:48 -0000	1.924
+++ kernel.spec	4 Sep 2008 03:11:17 -0000	1.925
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 5
 # The git snapshot level
-%define gitrev 3
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1753,6 +1753,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Sep 03 2008 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.27-rc5-git5
+
 * Wed Sep 03 2008 Jarod Wilson <jarod at redhat.com>
 - Another series of checkpatch cleanups to lirc code,
   courtesy of Janne Grunau. This stuff might actually

linux-2.6-iwlwifi-use-dma_alloc_coherent.patch:

Index: linux-2.6-iwlwifi-use-dma_alloc_coherent.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-iwlwifi-use-dma_alloc_coherent.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-iwlwifi-use-dma_alloc_coherent.patch	2 Sep 2008 14:56:53 -0000	1.1
+++ linux-2.6-iwlwifi-use-dma_alloc_coherent.patch	4 Sep 2008 03:11:17 -0000	1.2
@@ -66,7 +66,7 @@
  				continue;
  		}
  
--		txq->cmd[i] = kmalloc(len, GFP_KERNEL | GFP_DMA);
+-		txq->cmd[i] = kmalloc(len, GFP_KERNEL);
 -		if (!txq->cmd[i])
 +		txq->cmd[i] = dma_alloc_coherent(dev, len,
 +				&txq->dma_addr_cmd[i], GFP_KERNEL);


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.876
retrieving revision 1.877
diff -u -r1.876 -r1.877
--- sources	3 Sep 2008 00:41:31 -0000	1.876
+++ sources	4 Sep 2008 03:11:17 -0000	1.877
@@ -1,3 +1,3 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 d91adda8bcf04852048b8eab06eeae3d  patch-2.6.27-rc5.bz2
-1ce15320844f500f7866e183948b8a93  patch-2.6.27-rc5-git3.bz2
+158f207e6cbc26ed8a5dc601c4f1883f  patch-2.6.27-rc5-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.789
retrieving revision 1.790
diff -u -r1.789 -r1.790
--- upstream	3 Sep 2008 00:41:31 -0000	1.789
+++ upstream	4 Sep 2008 03:11:17 -0000	1.790
@@ -1,3 +1,3 @@
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc5.bz2
-patch-2.6.27-rc5-git3.bz2
+patch-2.6.27-rc5-git5.bz2


--- patch-2.6.27-rc5-git3.bz2.sign DELETED ---



From ssp at fedoraproject.org  Thu Sep  4 03:29:44 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu,  4 Sep 2008 03:29:44 +0000 (UTC)
Subject: rpms/gnome-desktop/devel clone-modes.patch, NONE,
	1.1 gnome-desktop.spec, 1.158, 1.159
Message-ID: <20080904032944.991BE70120@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9244

Modified Files:
	gnome-desktop.spec 
Added Files:
	clone-modes.patch 
Log Message:
Patch to move clone mode enumeration to gnome-rr.c

clone-modes.patch:

--- NEW FILE clone-modes.patch ---
Index: libgnome-desktop/libgnomeui/gnome-rr-config.h
===================================================================
--- libgnome-desktop/libgnomeui/gnome-rr-config.h	(revision 5210)
+++ libgnome-desktop/libgnomeui/gnome-rr-config.h	(working copy)
@@ -34,6 +34,13 @@
 typedef struct GnomeOutputInfo GnomeOutputInfo;
 typedef struct GnomeRRConfig GnomeRRConfig;
 
+/* FIXME:
+ *
+ * This structure is a Frankenstein monster where all of the fields
+ * are generated by the system, but some of them can be changed by
+ * the client.
+ */
+
 struct GnomeOutputInfo
 {
     char *		name;
@@ -66,14 +73,24 @@
 };
 
 GnomeRRConfig  *gnome_rr_config_new_current  (GnomeRRScreen  *screen);
+GnomeRRConfig  *gnome_rr_config_new_stored   (GnomeRRScreen  *screen);
 void            gnome_rr_config_free         (GnomeRRConfig  *configuration);
 gboolean        gnome_rr_config_match        (GnomeRRConfig  *config1,
 					      GnomeRRConfig  *config2);
+gboolean        gnome_rr_config_equal	     (GnomeRRConfig  *config1,
+					      GnomeRRConfig  *config2);
 gboolean        gnome_rr_config_save         (GnomeRRConfig  *configuration,
 					      GError        **err);
 void            gnome_rr_config_sanitize     (GnomeRRConfig  *configuration);
+gboolean	gnome_rr_config_apply        (GnomeRRConfig  *configuration,
+					      GnomeRRScreen  *screen);
 gboolean        gnome_rr_config_apply_stored (GnomeRRScreen  *screen);
 gboolean        gnome_rr_config_applicable   (GnomeRRConfig  *configuration,
 					      GnomeRRScreen  *screen);
 
+/* A utility function that isn't really in the spirit of this file, but I don't
+ * don't know a better place for it.
+ */
+GnomeRRMode **gnome_rr_create_clone_modes (GnomeRRScreen *screen);
+
 #endif
Index: libgnome-desktop/libgnomeui/gnome-rr.h
===================================================================
--- libgnome-desktop/libgnomeui/gnome-rr.h	(revision 5210)
+++ libgnome-desktop/libgnomeui/gnome-rr.h	(working copy)
@@ -56,6 +56,7 @@
 GnomeRROutput **gnome_rr_screen_list_outputs       (GnomeRRScreen         *screen);
 GnomeRRCrtc **  gnome_rr_screen_list_crtcs         (GnomeRRScreen         *screen);
 GnomeRRMode **  gnome_rr_screen_list_modes         (GnomeRRScreen         *screen);
+GnomeRRMode **  gnome_rr_screen_list_clone_modes   (GnomeRRScreen	  *screen);
 void            gnome_rr_screen_set_size           (GnomeRRScreen         *screen,
 						    int                    width,
 						    int                    height,
Index: libgnome-desktop/gnome-rr.c
===================================================================
--- libgnome-desktop/gnome-rr.c	(revision 5210)
+++ libgnome-desktop/gnome-rr.c	(working copy)
@@ -50,6 +50,8 @@
     GnomeRRMode **	modes;
     
     GnomeRRScreen *	screen;
+
+    GnomeRRMode **	clone_modes;
 };
 
 struct GnomeRRScreen
@@ -222,11 +224,86 @@
 	    mode_free (*mode);
 	g_free (info->modes);
     }
+
+    if (info->clone_modes)
+    {
+	/* The modes themselves were freed above */
+	g_free (info->clone_modes);
+    }
     
     g_free (info);
 }
 
 static gboolean
+has_similar_mode (GnomeRROutput *output, GnomeRRMode *mode)
+{
+    int i;
+    GnomeRRMode **modes = gnome_rr_output_list_modes (output);
+    int width = gnome_rr_mode_get_width (mode);
+    int height = gnome_rr_mode_get_height (mode);
+
+    for (i = 0; modes[i] != NULL; ++i)
+    {
+	GnomeRRMode *m = modes[i];
+
+	if (gnome_rr_mode_get_width (m) == width	&&
+	    gnome_rr_mode_get_height (m) == height)
+	{
+	    return TRUE;
+	}
+    }
+
+    return FALSE;
+}
+
+static void
+gather_clone_modes (ScreenInfo *info)
+{
+    int i;
+    GPtrArray *result = g_ptr_array_new ();
+
+    for (i = 0; info->outputs[i] != NULL; ++i)
+    {
+	int j;
+	GnomeRROutput *output1, *output2;
+
+	output1 = info->outputs[i];
+	
+	if (!output1->connected)
+	    continue;
+	
+	for (j = 0; output1->modes[j] != NULL; ++j)
+	{
+	    GnomeRRMode *mode = output1->modes[j];
+	    gboolean valid;
+	    int k;
+
+	    valid = TRUE;
+	    for (k = 0; info->outputs[k] != NULL; ++k)
+	    {
+		output2 = info->outputs[k];
+		
+		if (!output2->connected)
+		    continue;
+		
+		if (!has_similar_mode (output2, mode))
+		{
+		    valid = FALSE;
+		    break;
+		}
+	    }
+
+	    if (valid)
+		g_ptr_array_add (result, mode);
+	}
+    }
+
+    g_ptr_array_add (result, NULL);
+    
+    info->clone_modes = (GnomeRRMode **)g_ptr_array_free (result, FALSE);
+}
+
+static gboolean
 fill_out_screen_info (Display *xdisplay,
 		      Window xroot,
 		      ScreenInfo *info)
@@ -322,6 +399,8 @@
 	    
 	    mode_initialize (mode, &(resources->modes[i]));
 	}
+
+	gather_clone_modes (info);
 	
 	return TRUE;
     }
@@ -526,6 +605,15 @@
     return screen->info->modes;
 }
 
+GnomeRRMode **
+gnome_rr_screen_list_clone_modes   (GnomeRRScreen *screen)
+{
+    g_return_val_if_fail (screen != NULL, NULL);
+    g_return_val_if_fail (screen->info != NULL, NULL);
+
+    return screen->info->clone_modes;
+}
+
 GnomeRRCrtc **
 gnome_rr_screen_list_crtcs (GnomeRRScreen *screen)
 {
Index: libgnome-desktop/gnome-rr-config.c
===================================================================
--- libgnome-desktop/gnome-rr-config.c	(revision 5210)
+++ libgnome-desktop/gnome-rr-config.c	(working copy)
@@ -745,6 +745,42 @@
     return TRUE;
 }
 
+static gboolean
+output_equal (GnomeOutputInfo *output1, GnomeOutputInfo *output2)
+{
+    g_assert (output1 != NULL);
+    g_assert (output2 != NULL);
+
+    if (!output_match (output1, output2))
+	return FALSE;
+
+    if (output1->on != output2->on)
+	return FALSE;
+
+    if (output1->on)
+    {
+	if (output1->width != output2->width)
+	    return FALSE;
+	
+	if (output1->height != output2->height)
+	    return FALSE;
+	
+	if (output1->rate != output2->rate)
+	    return FALSE;
+	
+	if (output1->x != output2->x)
+	    return FALSE;
+	
+	if (output1->y != output2->y)
+	    return FALSE;
+	
+	if (output1->rotation != output2->rotation)
+	    return FALSE;
+    }
+
+    return TRUE;
+}
+
 static GnomeOutputInfo *
 find_output (GnomeRRConfig *config, const char *name)
 {
@@ -761,6 +797,9 @@
     return NULL;
 }
 
+/* Match means "these configurations apply to the same hardware
+ * setups"
+ */
 gboolean
 gnome_rr_config_match (GnomeRRConfig *c1, GnomeRRConfig *c2)
 {
@@ -779,6 +818,28 @@
     return TRUE;
 }
 
+/* Equal means "the configurations will result in the same
+ * modes being set on the outputs"
+ */
+gboolean
+gnome_rr_config_equal (GnomeRRConfig  *c1,
+		       GnomeRRConfig  *c2)
+{
+    int i;
+
+    for (i = 0; c1->outputs[i] != NULL; ++i)
+    {
+	GnomeOutputInfo *output1 = c1->outputs[i];
+	GnomeOutputInfo *output2;
+
+	output2 = find_output (c2, output1->name);
+	if (!output2 || !output_equal (output1, output2))
+	    return FALSE;
+    }
+    
+    return TRUE;
+}
+
 static GnomeOutputInfo **
 make_outputs (GnomeRRConfig *config)
 {
@@ -840,21 +901,6 @@
     return result;
 }
 
-static GnomeRRConfig *
-gnome_rr_config_find (GnomeRRConfig **haystack,
-		    GnomeRRConfig  *needle)
-{
-    int i;
-
-    for (i = 0; haystack[i] != NULL; ++i)
-    {
-	if (gnome_rr_config_match (haystack[i], needle))
-	    return haystack[i];
-    }
-
-    return NULL;
-}
-
 /* Database management */
 
 static gchar *
@@ -1036,13 +1082,67 @@
     return result;
 }
 
-static gboolean
-apply_configuration (GnomeRRConfig *conf, GnomeRRScreen *screen)
+static GnomeRRConfig *
+gnome_rr_config_copy (GnomeRRConfig *config)
 {
+    GnomeRRConfig *copy = g_new0 (GnomeRRConfig, 1);
+    int i;
+    GPtrArray *array = g_ptr_array_new ();
+
+    copy->clone = config->clone;
+    
+    for (i = 0; config->outputs[i] != NULL; ++i)
+	g_ptr_array_add (array, output_copy (config->outputs[i]));
+
+    g_ptr_array_add (array, NULL);
+    copy->outputs = (GnomeOutputInfo **)g_ptr_array_free (array, FALSE);
+
+    return copy;
+}
+
+GnomeRRConfig *
+gnome_rr_config_new_stored (GnomeRRScreen *screen)
+{
+    GnomeRRConfig *current;
+    GnomeRRConfig **configs;
+    GnomeRRConfig *result;
+
+    if (!screen)
+	return NULL;
+    
+    current = gnome_rr_config_new_current (screen);
+    
+    configs = configurations_read (NULL); /* NULL_GError */
+
+    result = NULL;
+    if (configs)
+    {
+	int i;
+	
+	for (i = 0; configs[i] != NULL; ++i)
+	{
+	    if (gnome_rr_config_match (configs[i], current))
+	    {
+		result = gnome_rr_config_copy (configs[i]);
+		break;
+	    }
+	}
+    }
+
+    gnome_rr_config_free (current);
+    configurations_free (configs);
+    
+    return result;
+}
+
+gboolean
+gnome_rr_config_apply (GnomeRRConfig *config,
+		       GnomeRRScreen *screen)
+{
     CrtcAssignment *assignment;
     GnomeOutputInfo **outputs;
 
-    outputs = make_outputs (conf);
+    outputs = make_outputs (config);
 
     assignment = crtc_assignment_new (screen, outputs);
 
@@ -1065,42 +1165,51 @@
 gboolean
 gnome_rr_config_apply_stored (GnomeRRScreen *screen)
 {
-    GnomeRRConfig **configs;
-    GnomeRRConfig *current;
-    GnomeRRConfig *found;
-    gboolean result = TRUE;
+    GnomeRRConfig *stored;
 
     if (!screen)
 	return FALSE;
 
-    configs = configurations_read (NULL); /* NULL-GError */
-
     gnome_rr_screen_refresh (screen);
-    
-    current = gnome_rr_config_new_current (screen);
 
-    if (configs)
+    stored = gnome_rr_config_new_stored (screen);
+
+    if (stored)
     {
-	if ((found = gnome_rr_config_find (configs, current)))
-	{
-	    apply_configuration (found, screen);
+	gnome_rr_config_apply (stored, screen);
 
-	    result = TRUE;
-	}
-	else
+	gnome_rr_config_free (stored);
+	
+	return TRUE;
+    }
+    else
+    {
+	return FALSE;
+    }
+}
+
+static gboolean
+has_similar_mode (GnomeRROutput *output, GnomeRRMode *mode)
+{
+    int i;
+    GnomeRRMode **modes = gnome_rr_output_list_modes (output);
+    int width = gnome_rr_mode_get_width (mode);
+    int height = gnome_rr_mode_get_height (mode);
+
+    for (i = 0; modes[i] != NULL; ++i)
+    {
+	GnomeRRMode *m = modes[i];
+
+	if (gnome_rr_mode_get_width (m) == width	&&
+	    gnome_rr_mode_get_height (m) == height)
 	{
-	    result = FALSE;
+	    return TRUE;
 	}
-	
-	configurations_free (configs);
     }
-	
-    gnome_rr_config_free (current);
 
-    return result;
+    return FALSE;
 }
 
-
 /*
  * CRTC assignment
  */


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- gnome-desktop.spec	3 Sep 2008 02:18:49 -0000	1.158
+++ gnome-desktop.spec	4 Sep 2008 03:29:14 -0000	1.159
@@ -21,6 +21,7 @@
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=549960
 Patch2: rr-leaks.patch
+Patch3: clone-modes.patch
 
 Requires: redhat-menus
 Requires: pycairo
@@ -74,6 +75,7 @@
 %prep
 %setup -q
 %patch2 -p1 -b .rr-leaks
+%patch3 -p0 -b .clone-modes
 
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" --disable-scrollkeeper
@@ -119,6 +121,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Wed Sep  3 2008 Soren Sandmann <sandmann at redhat.com> - 2.23.91-2
+- Add patch to move clone mode enumeration to gnome-rr.c
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 



From ssp at fedoraproject.org  Thu Sep  4 03:31:36 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu,  4 Sep 2008 03:31:36 +0000 (UTC)
Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.159,1.160
Message-ID: <20080904033136.6DD5270120@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9552

Modified Files:
	gnome-desktop.spec 
Log Message:
Bump release


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- gnome-desktop.spec	4 Sep 2008 03:29:14 -0000	1.159
+++ gnome-desktop.spec	4 Sep 2008 03:31:06 -0000	1.160
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.23.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.23/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+



From ssp at fedoraproject.org  Thu Sep  4 03:40:04 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu,  4 Sep 2008 03:40:04 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel gnome-settings-daemon.spec, 1.48, 
	1.49
Message-ID: <20080904034004.B273F70120@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10282

Modified Files:
	gnome-settings-daemon.spec 
Log Message:
Add patch to do fn f7 cycling


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gnome-settings-daemon.spec	1 Sep 2008 14:53:45 -0000	1.48
+++ gnome-settings-daemon.spec	4 Sep 2008 03:39:34 -0000	1.49
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.23.91
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -33,6 +33,7 @@
 
 Patch2:         gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
 Patch6:		gnome-settings-daemon-2.23.4-drop-sample-cache.patch
+Patch7:		gnome-settings-daemon-2.23.91-fnf7-cycle.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -54,6 +55,7 @@
 
 %patch2 -p1 -b .ignore-layout-if-using-evdev
 %patch6 -p1 -b .drop-sample-cache
+%patch7 -p0 -b .fnf7-cycle
 
 %build
 aclocal
@@ -153,6 +155,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Sep 03 2008 Soren Sandmann <sandmann at redhat.com> - 2.23.91-2
+- Add patch to do fn-f7 cycling
+
 * Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 



From ssp at fedoraproject.org  Thu Sep  4 03:42:25 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu,  4 Sep 2008 03:42:25 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel
	gnome-settings-daemon-2.23.91-fnf7-cycle.patch, NONE, 1.1
Message-ID: <20080904034225.5AFC270120@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10555

Added Files:
	gnome-settings-daemon-2.23.91-fnf7-cycle.patch 
Log Message:
Add the fn f7 patch

gnome-settings-daemon-2.23.91-fnf7-cycle.patch:

--- NEW FILE gnome-settings-daemon-2.23.91-fnf7-cycle.patch ---
Index: plugins/xrandr/gsd-xrandr-manager.c
===================================================================
--- plugins/xrandr/gsd-xrandr-manager.c	(revision 480)
+++ plugins/xrandr/gsd-xrandr-manager.c	(working copy)
@@ -61,6 +61,7 @@
 #define CONF_KEY "show_notification_icon"
 
 #define VIDEO_KEYSYM    "XF86Display"
+#define VIDEO_KEYSYM    "F7"
 
 /* name of the icon files (gsd-xrandr.svg, etc.) */
 #define GSD_XRANDR_ICON_NAME "gsd-xrandr"
@@ -82,6 +83,10 @@
         GnomeRRLabeler *labeler;
         GConfClient *client;
         int notify_id;
+
+        /* fn-F7 status */
+        int             current_fn_f7_config;             /* -1 if no configs */
+        GnomeRRConfig **fn_f7_configs;  /* NULL terminated, NULL if there are no configs */
 };
 
 static void     gsd_xrandr_manager_class_init  (GsdXrandrManagerClass *klass);
@@ -127,6 +132,418 @@
         return GDK_FILTER_CONTINUE;
 }
 
+static gboolean
+is_laptop (GnomeOutputInfo *output)
+{
+        const char *output_name = output->name;
+
+        if (output->connected && output_name &&
+            (strstr ("lvds", output_name)	||
+             strstr ("LVDS", output_name)	||
+             strstr ("Lvds", output_name)))
+        {
+                return TRUE;
+        }
+
+        return FALSE;
+}
+
+static gboolean
+get_clone_size (GnomeRRScreen *screen, int *width, int *height)
+{
+        GnomeRRMode **modes = gnome_rr_screen_list_clone_modes (screen);
+        int best_w, best_h;
+        int i;
+
+        best_w = 0;
+        best_h = 0;
+
+        for (i = 0; modes[i] != NULL; ++i) {
+                GnomeRRMode *mode = modes[i];
+                int w, h;
+
+                w = gnome_rr_mode_get_width (mode);
+                h = gnome_rr_mode_get_height (mode);
+
+                if (w * h > best_w * best_h) {
+                        best_w = w;
+                        best_h = h;
+                }
+        }
+
+        if (best_w > 0 && best_h > 0) {
+                if (width)
+                        *width = best_w;
+                if (height)
+                        *height = best_h;
+
+                return TRUE;
+        }
+
+        return FALSE;
+}
+
+static void
+print_output (GnomeOutputInfo *info)
+{
+        g_print ("  Output: %s attached to %s\n", info->display_name, info->name);
+        g_print ("     status: %s\n", info->on ? "on" : "off");
+        g_print ("     width: %d\n", info->width);
+        g_print ("     height: %d\n", info->height);
+        g_print ("     rate: %d\n", info->rate);
+        g_print ("     position: %d %d\n", info->x, info->y);
+}
+
+static void
+print_configuration (GnomeRRConfig *config, const char *header)
+{
+        int i;
+
+        g_print ("=== %s Configuration ===\n", header);
+        if (!config) {
+                g_print ("  none\n");
+                return;
+        }
+        
+        for (i = 0; config->outputs[i] != NULL; ++i)
+                print_output (config->outputs[i]);
+}
+
+static GnomeRRConfig *
+make_clone_setup (GnomeRRScreen *screen)
+{
+        GnomeRRConfig *result;
+        int width, height;
+        int i;
+
+        if (!get_clone_size (screen, &width, &height))
+                return NULL;
+        
+        result = gnome_rr_config_new_current (screen);
+
+        for (i = 0; result->outputs[i] != NULL; ++i) {
+                GnomeOutputInfo *info = result->outputs[i];
+
+                info->on = FALSE;
+                if (info->connected) {
+                        GnomeRROutput *output =
+                                gnome_rr_screen_get_output_by_name (screen, info->name);
+                        GnomeRRMode **modes = gnome_rr_output_list_modes (output);
+                        int j;
+                        int best_rate = 0;
+                        
+                        for (j = 0; modes[j] != NULL; ++j) {
+                                GnomeRRMode *mode = modes[j];
+                                int w, h;
+                                
+                                w = gnome_rr_mode_get_width (mode);
+                                h = gnome_rr_mode_get_height (mode);
+                                
+                                if (w == width && h == height) {
+                                        int r = gnome_rr_mode_get_freq (mode);
+                                        if (r > best_rate)
+                                                best_rate = r;
+                                }
+                        }
+
+                        if (best_rate > 0) {
+                                info->on = TRUE;
+                                info->width = width;
+                                info->height = height;
+                                info->rate = best_rate;
+                                info->x = 0;
+                                info->y = 0;
+                        }
+                }
+        }
+
+        print_configuration (result, "clone setup");
+        
+        return result;
+}
+
+static gboolean
+turn_on (GnomeRRScreen *screen,
+         GnomeOutputInfo *info,
+         int x, int y)
+{
+        GnomeRROutput *output =
+                gnome_rr_screen_get_output_by_name (screen, info->name);
+        GnomeRRMode *mode = gnome_rr_output_get_preferred_mode (output);
+
+        if (mode) {
+                info->on = TRUE;
+                info->x = x;
+                info->y = y;
+                info->width = gnome_rr_mode_get_width (mode);
+                info->height = gnome_rr_mode_get_height (mode);
+                info->rotation = GNOME_RR_ROTATION_0;
+                info->rate = gnome_rr_mode_get_freq (mode);
+
+                return TRUE;
+        }
+
+        return FALSE;
+}
+
+static GnomeRRConfig *
+make_laptop_setup (GnomeRRScreen *screen)
+{
+        /* Turn on the laptop, disable everything else */
+        GnomeRRConfig *result = gnome_rr_config_new_current (screen);
+        int i;
+
+        for (i = 0; result->outputs[i] != NULL; ++i) {
+                GnomeOutputInfo *info = result->outputs[i];
+
+                if (is_laptop (info)) {
+                        if (!info->on) {
+                                if (!turn_on (screen, info, 0, 0)) {
+                                        gnome_rr_config_free (result);
+                                        result = NULL;
+                                        break;
+                                }
+                        }
+                }
+                else {
+                        info->on = FALSE;
+                }
+        }
+
+        print_configuration (result, "Laptop setup");
+        
+        /* FIXME - Maybe we should return NULL if there is more than
+         * one connected "laptop" screen?
+         */
+        return result;
+        
+}
+
+static GnomeRRConfig *
+make_xinerama_setup (GnomeRRScreen *screen)
+{
+        /* Turn on everything that has a preferred mode, and
+         * position it from left to right
+         */
+        GnomeRRConfig *result = gnome_rr_config_new_current (screen);
+        int i;
+        int x;
+
+        x = 0;
+        for (i = 0; result->outputs[i] != NULL; ++i) {
+                GnomeOutputInfo *info = result->outputs[i];
+
+                if (is_laptop (info)) {
+                        if (!info->on) {
+                                if (turn_on (screen, info, x, 0)) {
+                                        x += info->width;
+                                }
+                        }
+                }
+        }
+
+        for (i = 0; result->outputs[i] != NULL; ++i) {
+                GnomeOutputInfo *info = result->outputs[i];
+
+                if (info->connected && !is_laptop (info)) {
+                        if (!info->on) {
+                                if (turn_on (screen, info, x, 0)) {
+                                        x += info->width;
+                                }
+                        }
+                }
+        }
+
+        print_configuration (result, "xinerama setup");
+        
+        return result;
+}
+
+static GnomeRRConfig *
+make_other_setup (GnomeRRScreen *screen)
+{
+        /* Turn off all laptops, and make all external monitors clone
+         * from (0, 0)
+         */
+        
+        GnomeRRConfig *result = gnome_rr_config_new_current (screen);
+        int i;
+
+        for (i = 0; result->outputs[i] != NULL; ++i) {
+                GnomeOutputInfo *info = result->outputs[i];
+
+                if (is_laptop (info)) {
+                        info->on = FALSE;
+                }
+                else {
+                        if (info->connected && !info->on) {
+                                turn_on (screen, info, 0, 0);
+                        }
+               }
+        }
+
+        print_configuration (result, "other setup");
+        
+        return result;
+}
+
+static GPtrArray *
+sanitize (GPtrArray *array)
+{
+        int i;
+        GPtrArray *new;
+
+        g_print ("before sanitizing\n");
+
+        for (i = 0; i < array->len; ++i) {
+                if (array->pdata[i]) {
+                        print_configuration (array->pdata[i], "before");
+                }
+        }
+        
+
+        /* Remove configurations that are duplicates of
+         * configurations earlier in the cycle
+         */
+        for (i = 0; i < array->len; ++i) {
+                int j;
+
+                for (j = 0; j < i; ++j) {
+                        GnomeRRConfig *this = array->pdata[j];
+                        GnomeRRConfig *other = array->pdata[i];
+
+                        if (this && other && gnome_rr_config_equal (this, other)) {
+                                g_print ("removing duplicate configuration\n");
+                                gnome_rr_config_free (this);
+                                array->pdata[j] = NULL;
+                                break;
+                        }
+                }
+        }
+
+        for (i = 0; i < array->len; ++i) {
+                GnomeRRConfig *config = array->pdata[i];
+
+                if (config) {
+                        gboolean all_off = TRUE;
+                        int j;
+                        
+                        for (j = 0; config->outputs[j] != NULL; ++j) {
+                                if (config->outputs[j]->on)
+                                        all_off = FALSE;
+                        }
+                        
+                        if (all_off) {
+                                gnome_rr_config_free (array->pdata[i]);
+                                array->pdata[i] = NULL;
+                        }
+                }
+        }
+        
+        /* Remove NULL configurations */
+        new = g_ptr_array_new ();
+
+        for (i = 0; i < array->len; ++i) {
+                if (array->pdata[i]) {
+                        g_ptr_array_add (new, array->pdata[i]);
+                        print_configuration (array->pdata[i], "Final");
+                }
+        }
+
+        g_ptr_array_add (new, NULL);
+
+        g_ptr_array_free (array, TRUE);
+
+        return new;
+}
+
+static void
+generate_fn_f7_configs (GsdXrandrManager *mgr)
+{
+        GPtrArray *array = g_ptr_array_new ();
+        GnomeRRScreen *screen = mgr->priv->rw_screen;
+
+        g_print ("Generating configurations\n");
+        
+        /* Free any existing list of configurations */
+        if (mgr->priv->fn_f7_configs) {
+                int i;
+
+                for (i = 0; mgr->priv->fn_f7_configs[i] != NULL; ++i)
+                        gnome_rr_config_free (mgr->priv->fn_f7_configs[i]);
+                g_free (mgr->priv->fn_f7_configs);
+
+                mgr->priv->fn_f7_configs = NULL;
+                mgr->priv->current_fn_f7_config = -1;
+        }
+
+        g_ptr_array_add (array, gnome_rr_config_new_current (screen));
+        g_ptr_array_add (array, make_xinerama_setup (screen));
+        g_ptr_array_add (array, make_clone_setup (screen));
+        g_ptr_array_add (array, make_laptop_setup (screen));
+        g_ptr_array_add (array, make_other_setup (screen));
+        g_ptr_array_add (array, gnome_rr_config_new_stored (screen));
+        g_ptr_array_add (array, NULL);
+
+        array = sanitize (array);
+        
+        mgr->priv->fn_f7_configs = (GnomeRRConfig **)g_ptr_array_free (array, FALSE);
+        mgr->priv->current_fn_f7_config = 0;
+}
+
+static void
+handle_fn_f7 (GsdXrandrManager *mgr)
+{
+        GsdXrandrManagerPrivate *priv = mgr->priv;
+        GnomeRRScreen *screen = priv->rw_screen;
+        GnomeRRConfig *current;
+        
+        /* Theory of fn-F7 operation
+         *
+         * We maintain a datastructure "fn_f7_status", that contains
+         * a list of GnomeRRConfig's. Each of the GnomeRRConfigs has a
+         * mode (or "off") for each connected output.
+         *
+         * When the user hits fn-F7, we cycle to the next GnomeRRConfig
+         * in the data structure. If the data structure does not exist, it
+         * is generated. If the configs in the data structure do not match
+         * the current hardware reality, it is regenerated.
+         *
+         */
+        g_print ("Handling fn-f7\n");
+        gnome_rr_screen_refresh (screen);
+
+        if (!priv->fn_f7_configs)
+                generate_fn_f7_configs (mgr);
+
+        current = gnome_rr_config_new_current (screen);
+        
+        if (priv->fn_f7_configs && !gnome_rr_config_match (current, priv->fn_f7_configs[0]))
+                generate_fn_f7_configs (mgr);
+
+        gnome_rr_config_free (current);
+        
+        if (priv->fn_f7_configs) {
+                mgr->priv->current_fn_f7_config++;
+
+                if (priv->fn_f7_configs[mgr->priv->current_fn_f7_config] == NULL)
+                        mgr->priv->current_fn_f7_config = 0;
+
+                g_print ("cycling to next configuration (%d)\n", mgr->priv->current_fn_f7_config);
+
+                print_configuration (priv->fn_f7_configs[mgr->priv->current_fn_f7_config], "new config");
+
+                g_print ("applying\n");
+                
+                gnome_rr_config_apply (priv->fn_f7_configs[mgr->priv->current_fn_f7_config],
+                                       screen);
+        }
+        else {
+                g_print ("no configurations generated\n");
+        }
+        g_print ("done handling fn-f7\n");
+}
+
 static GdkFilterReturn
 event_filter (GdkXEvent           *xevent,
               GdkEvent            *event,
@@ -142,12 +559,9 @@
         if (xev->xany.type != KeyPress && xev->xany.type != KeyRelease)
                 return GDK_FILTER_CONTINUE;
 
-        if (xev->xkey.keycode == manager->priv->keycode) {
-                /* FIXME: here we should cycle between valid
-                 * configurations, and save them
-                 */
-                gnome_rr_config_apply_stored (manager->priv->rw_screen);
-
+        if (xev->xkey.keycode == manager->priv->keycode && xev->xany.type == KeyPress) {
+                handle_fn_f7 (manager);
+                
                 return GDK_FILTER_CONTINUE;
         }
 
@@ -869,6 +1283,9 @@
         manager->priv = GSD_XRANDR_MANAGER_GET_PRIVATE (manager);
 
         manager->priv->keycode = keycode;
+
+        manager->priv->current_fn_f7_config = -1;
+        manager->priv->fn_f7_configs = NULL;
 }
 
 static void



From ssp at fedoraproject.org  Thu Sep  4 03:47:54 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu,  4 Sep 2008 03:47:54 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel gnome-settings-daemon.spec, 1.49, 
	1.50
Message-ID: <20080904034754.6B9B270120@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11009

Modified Files:
	gnome-settings-daemon.spec 
Log Message:
Bump gnome-desktop requirement


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gnome-settings-daemon.spec	4 Sep 2008 03:39:34 -0000	1.49
+++ gnome-settings-daemon.spec	4 Sep 2008 03:47:24 -0000	1.50
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.23.91
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -17,7 +17,7 @@
 BuildRequires:	GConf2-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	gnome-vfs2-devel
-BuildRequires:	gnome-desktop-devel >= 2.23.90
+BuildRequires:	gnome-desktop-devel >= 2.23.91-2
 BuildRequires:	libglade2-devel
 BuildRequires:	libgnomeui-devel
 BuildRequires:	libgnome-devel
@@ -155,6 +155,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Sep 03 2008 Soren Sandmann <sandmann at redhat.com> - 2.23.91-3
+- Bump gnome-desktop requirement
+
 * Wed Sep 03 2008 Soren Sandmann <sandmann at redhat.com> - 2.23.91-2
 - Add patch to do fn-f7 cycling
 



From ianweller at fedoraproject.org  Thu Sep  4 03:47:58 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Thu,  4 Sep 2008 03:47:58 +0000 (UTC)
Subject: rpms/flam3/F-8 .cvsignore, 1.8, 1.9 flam3.spec, 1.8, 1.9 import.log,
	1.1, 1.2 sources, 1.8, 1.9
Message-ID: <20080904034758.E6F1A70120@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/flam3/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11057/F-8

Modified Files:
	.cvsignore flam3.spec import.log sources 
Log Message:
importing flam3-2.7.15-1 in F-8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-8/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Aug 2008 17:24:13 -0000	1.8
+++ .cvsignore	4 Sep 2008 03:47:28 -0000	1.9
@@ -1 +1 @@
-flam3-2.7.14.tar.gz
+flam3-2.7.15.tar.gz


Index: flam3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-8/flam3.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- flam3.spec	4 Aug 2008 17:24:13 -0000	1.8
+++ flam3.spec	4 Sep 2008 03:47:28 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           flam3
-Version:        2.7.14
+Version:        2.7.15
 Release:        1%{?dist}
 Summary:        Programs to generate and render cosmic recursive fractal flames
 
@@ -86,6 +86,25 @@
 
 
 %changelog
+* Wed Sep 03 2008 Ian Weller <ianweller at gmail.com> 2.7.15-1
+- Upstream updated:
+    Added new interpolation types 'old' and 'older', for use in 
+    recreating old animations.  'linear' mode now does not rotate padded
+    xforms (results in prettier symmetric singularities). switched to
+    using a 'padding' flag instead of a 'just initialized' flag; padding 
+    flag used for implementation of 'old' and 'older' types.  
+    interpolation_space now deprecated, instead use interpolation_type. 
+    flam3_align is now idempotent (multiple applications do not change
+    the control points.)  Default number of temporal samples bumped to 
+    1000.  Removed CVS headers from source code (now using SVN).
+    Default interpolation mode now log. Removed 'move' and 'split' vars.
+    changes to flam3-genome: sequence mode now returns linear 
+    interpolation mode for all control points except first/last of edges 
+    - these cps will use the original interpolation mode;  inter and 
+    rotate modes will now return padded genomes for all control points,
+    all with linear interpolation specified.  instead of centering 
+    sometimes reframe by golden mean plus noise. Release as 2.7.15.
+
 * Mon Aug 04 2008 Ian Weller <ianweller at gmail.com> 2.7.14-1
 - Upstream updated:
     Add configuration option for atomic-ops.  bug fix: do not


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-8/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Aug 2008 17:24:13 -0000	1.1
+++ import.log	4 Sep 2008 03:47:28 -0000	1.2
@@ -1 +1,2 @@
 flam3-2_7_14-1_fc9:F-8:flam3-2.7.14-1.fc9.src.rpm:1217870618
+flam3-2_7_15-1_fc9:F-8:flam3-2.7.15-1.fc9.src.rpm:1220499885


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-8/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Aug 2008 17:24:13 -0000	1.8
+++ sources	4 Sep 2008 03:47:28 -0000	1.9
@@ -1 +1 @@
-94bdff2e2e1f3051e46780d0fd153577  flam3-2.7.14.tar.gz
+d65e28f27866820117ee2039dbcf1c0b  flam3-2.7.15.tar.gz



From toshio at fedoraproject.org  Thu Sep  4 03:52:34 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu,  4 Sep 2008 03:52:34 +0000 (UTC)
Subject: rpms/bzr-gtk/devel .cvsignore, 1.13,
	1.14 bzr-gtk-disable-nautilus-pull.patch, 1.2, 1.3 bzr-gtk.spec,
	1.35, 1.36 sources, 1.13, 1.14 bzr-gtk-disable-notifier.patch,
	1.2, NONE bzr-gtk-ghost-keyerror.patch, 1.3,
	NONE bzr-gtk-more-better-seahorse-dbus-check.patch, 1.2,
	NONE bzr-gtk-nautilus-setup.patch, 1.1, NONE
Message-ID: <20080904035234.1FDC870120@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11685

Modified Files:
	.cvsignore bzr-gtk-disable-nautilus-pull.patch bzr-gtk.spec 
	sources 
Removed Files:
	bzr-gtk-disable-notifier.patch bzr-gtk-ghost-keyerror.patch 
	bzr-gtk-more-better-seahorse-dbus-check.patch 
	bzr-gtk-nautilus-setup.patch 
Log Message:

* Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.95.0-1
- New Upstream release for use with bzr >= 1.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 May 2008 23:25:32 -0000	1.13
+++ .cvsignore	4 Sep 2008 03:52:03 -0000	1.14
@@ -1 +1 @@
-bzr-gtk-0.94.0.tar.gz
+bzr-gtk-0.95.0.tar.gz

bzr-gtk-disable-nautilus-pull.patch:

Index: bzr-gtk-disable-nautilus-pull.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk-disable-nautilus-pull.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bzr-gtk-disable-nautilus-pull.patch	15 Jul 2008 09:09:06 -0000	1.2
+++ bzr-gtk-disable-nautilus-pull.patch	4 Sep 2008 03:52:03 -0000	1.3
@@ -1,10 +1,10 @@
-Index: bzr-gtk-0.94.0/nautilus-bzr.py
+Index: bzr-gtk-0.95.0/nautilus-bzr.py
 ===================================================================
---- bzr-gtk-0.94.0.orig/nautilus-bzr.py
-+++ bzr-gtk-0.94.0/nautilus-bzr.py
-@@ -183,24 +183,6 @@ class BzrExtension(nautilus.MenuProvider
- 
-         return
+--- bzr-gtk-0.95.0.orig/nautilus-bzr.py
++++ bzr-gtk-0.95.0/nautilus-bzr.py
+@@ -185,24 +185,6 @@ class BzrExtension(nautilus.MenuProvider
+         pp.show()
+         gtk.main()
  
 -    def pull_cb(self, menu, vfs_file):
 -        # We can only cope with local files
@@ -27,16 +27,16 @@
      def merge_cb(self, menu, vfs_file):
          # We can only cope with local files
          if vfs_file.get_uri_scheme() != 'file':
-@@ -265,12 +247,6 @@ class BzrExtension(nautilus.MenuProvider
+@@ -267,12 +249,6 @@ class BzrExtension(nautilus.MenuProvider
          item.connect('activate', self.log_cb, vfs_file)
          items.append(item)
  
 -        item = nautilus.MenuItem('BzrNautilus::pull',
--                             'Pull',
+-                             'Pull ...',
 -                             'Pull from another branch')
 -        item.connect('activate', self.pull_cb, vfs_file)
 -        items.append(item)
 -
          item = nautilus.MenuItem('BzrNautilus::merge',
-                              'Merge',
+                              'Merge ...',
                               'Merge from another branch')


Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- bzr-gtk.spec	24 Jul 2008 18:26:52 -0000	1.35
+++ bzr-gtk.spec	4 Sep 2008 03:52:03 -0000	1.36
@@ -7,27 +7,20 @@
 %define debug_package %{nil}
 
 Name:           bzr-gtk
-Version:        0.94.0
-Release:        5%{?dist}
+Version:        0.95.0
+Release:        1%{?dist}
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://bazaar-vcs.org/bzr-gtk
 Source0:        http://samba.org/~jelmer/bzr/bzr-gtk-%{version}.tar.gz
-# We can't use the notifier functionality without a bzr-dbus-package.
-Patch0:         bzr-gtk-disable-notifier.patch
 # This requires some nonexistent functionality.  Bug filed upstream.  Disabled
 # for now.
-Patch1:         bzr-gtk-disable-nautilus-pull.patch
-Patch2:         bzr-gtk-nautilus-setup.patch
-# https://bugs.launchpad.net/bzr-gtk/+bug/228922
-Patch3:         bzr-gtk-more-better-seahorse-dbus-check.patch
-# From upstream
-Patch4:         bzr-gtk-ghost-keyerror.patch
+Patch0:         bzr-gtk-disable-nautilus-pull.patch
 %if 0%{?fedora} <= 7
 # In EL-5 and Fedora < 7 Encoding was a mandatory field.  Now it's deprecated.
-Patch100:	bzr-gtk-el5-encoding.patch
+Patch100:       bzr-gtk-el5-encoding.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -39,9 +32,9 @@
 # nautilus-python is not present in EPEL at this time.
 BuildRequires:  nautilus-python-devel
 %endif
-Requires:       bzr >= 1.0
+Requires:       bzr >= 1.6
 Requires:       pygtk2
-# This enables the commit-notify functionality but it's not packaged for
+# This enables the bzr-notify functionality but it's not packaged for
 # Fedora yet.
 #Requires:       bzr-dbus
 Obsoletes:      olive < %{version}-%{release}
@@ -68,11 +61,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .disable
-%patch1 -p1 -b .nautilusdisable
-%patch2 -p1 -b .nautilusinstall
-%patch3 -p0 -b .seahorse-fix
-%patch4 -p1 -b .ghost
+%patch0 -p1 -b .nautilusdisable
 
 %if 0%{?fedora} <= 7
 # EPEL 5 and Fedora <= 7
@@ -123,10 +112,14 @@
 # If building for fedora, create the nautilus-bzr subpackage.  If building for
 # RHEL, exclude the files.
 %files -n nautilus-bzr
+%defattr(-,root,root,-)
 %{_libdir}/nautilus/extensions-1.0/python/*
 %endif
 
 %changelog
+* Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.95.0-1
+- New Upstream release for use with bzr >= 1.6.
+
 * Thu Jul 24 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.94.0-5
 - Upstream has a new patch for bz#455284.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 May 2008 23:25:32 -0000	1.13
+++ sources	4 Sep 2008 03:52:03 -0000	1.14
@@ -1 +1 @@
-623715992ca761e7e6470134bf07f27f  bzr-gtk-0.94.0.tar.gz
+00aedce625672abca13d2d962b047ac0  bzr-gtk-0.95.0.tar.gz


--- bzr-gtk-disable-notifier.patch DELETED ---


--- bzr-gtk-ghost-keyerror.patch DELETED ---


--- bzr-gtk-more-better-seahorse-dbus-check.patch DELETED ---


--- bzr-gtk-nautilus-setup.patch DELETED ---



From ianweller at fedoraproject.org  Thu Sep  4 03:53:51 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Thu,  4 Sep 2008 03:53:51 +0000 (UTC)
Subject: rpms/flam3/F-9 .cvsignore, 1.8, 1.9 flam3.spec, 1.8, 1.9 import.log,
	1.1, 1.2 sources, 1.8, 1.9
Message-ID: <20080904035351.ED1DD70120@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/flam3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12094/F-9

Modified Files:
	.cvsignore flam3.spec import.log sources 
Log Message:
importing flam3-2.7.15-1 in F-9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Aug 2008 17:27:08 -0000	1.8
+++ .cvsignore	4 Sep 2008 03:53:21 -0000	1.9
@@ -1 +1 @@
-flam3-2.7.14.tar.gz
+flam3-2.7.15.tar.gz


Index: flam3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-9/flam3.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- flam3.spec	4 Aug 2008 17:27:08 -0000	1.8
+++ flam3.spec	4 Sep 2008 03:53:21 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           flam3
-Version:        2.7.14
+Version:        2.7.15
 Release:        1%{?dist}
 Summary:        Programs to generate and render cosmic recursive fractal flames
 
@@ -86,6 +86,25 @@
 
 
 %changelog
+* Wed Sep 03 2008 Ian Weller <ianweller at gmail.com> 2.7.15-1
+- Upstream updated:
+    Added new interpolation types 'old' and 'older', for use in 
+    recreating old animations.  'linear' mode now does not rotate padded
+    xforms (results in prettier symmetric singularities). switched to
+    using a 'padding' flag instead of a 'just initialized' flag; padding 
+    flag used for implementation of 'old' and 'older' types.  
+    interpolation_space now deprecated, instead use interpolation_type. 
+    flam3_align is now idempotent (multiple applications do not change
+    the control points.)  Default number of temporal samples bumped to 
+    1000.  Removed CVS headers from source code (now using SVN).
+    Default interpolation mode now log. Removed 'move' and 'split' vars.
+    changes to flam3-genome: sequence mode now returns linear 
+    interpolation mode for all control points except first/last of edges 
+    - these cps will use the original interpolation mode;  inter and 
+    rotate modes will now return padded genomes for all control points,
+    all with linear interpolation specified.  instead of centering 
+    sometimes reframe by golden mean plus noise. Release as 2.7.15.
+
 * Mon Aug 04 2008 Ian Weller <ianweller at gmail.com> 2.7.14-1
 - Upstream updated:
     Add configuration option for atomic-ops.  bug fix: do not


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Aug 2008 17:27:08 -0000	1.1
+++ import.log	4 Sep 2008 03:53:21 -0000	1.2
@@ -1 +1,2 @@
 flam3-2_7_14-1_fc9:F-9:flam3-2.7.14-1.fc9.src.rpm:1217870714
+flam3-2_7_15-1_fc9:F-9:flam3-2.7.15-1.fc9.src.rpm:1220500094


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Aug 2008 17:27:08 -0000	1.8
+++ sources	4 Sep 2008 03:53:21 -0000	1.9
@@ -1 +1 @@
-94bdff2e2e1f3051e46780d0fd153577  flam3-2.7.14.tar.gz
+d65e28f27866820117ee2039dbcf1c0b  flam3-2.7.15.tar.gz



From ianweller at fedoraproject.org  Thu Sep  4 03:55:07 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Thu,  4 Sep 2008 03:55:07 +0000 (UTC)
Subject: rpms/flam3/devel .cvsignore, 1.8, 1.9 flam3.spec, 1.9,
	1.10 import.log, 1.1, 1.2 sources, 1.8, 1.9
Message-ID: <20080904035507.5332D70120@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/flam3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12437/devel

Modified Files:
	.cvsignore flam3.spec import.log sources 
Log Message:
importing flam3-2.7.15-1 in devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Aug 2008 17:19:35 -0000	1.8
+++ .cvsignore	4 Sep 2008 03:54:37 -0000	1.9
@@ -1 +1 @@
-flam3-2.7.14.tar.gz
+flam3-2.7.15.tar.gz


Index: flam3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/devel/flam3.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- flam3.spec	4 Aug 2008 17:19:35 -0000	1.9
+++ flam3.spec	4 Sep 2008 03:54:37 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           flam3
-Version:        2.7.14
+Version:        2.7.15
 Release:        1%{?dist}
 Summary:        Programs to generate and render cosmic recursive fractal flames
 
@@ -86,6 +86,25 @@
 
 
 %changelog
+* Wed Sep 03 2008 Ian Weller <ianweller at gmail.com> 2.7.15-1
+- Upstream updated:
+    Added new interpolation types 'old' and 'older', for use in 
+    recreating old animations.  'linear' mode now does not rotate padded
+    xforms (results in prettier symmetric singularities). switched to
+    using a 'padding' flag instead of a 'just initialized' flag; padding 
+    flag used for implementation of 'old' and 'older' types.  
+    interpolation_space now deprecated, instead use interpolation_type. 
+    flam3_align is now idempotent (multiple applications do not change
+    the control points.)  Default number of temporal samples bumped to 
+    1000.  Removed CVS headers from source code (now using SVN).
+    Default interpolation mode now log. Removed 'move' and 'split' vars.
+    changes to flam3-genome: sequence mode now returns linear 
+    interpolation mode for all control points except first/last of edges 
+    - these cps will use the original interpolation mode;  inter and 
+    rotate modes will now return padded genomes for all control points,
+    all with linear interpolation specified.  instead of centering 
+    sometimes reframe by golden mean plus noise. Release as 2.7.15.
+
 * Mon Aug 04 2008 Ian Weller <ianweller at gmail.com> 2.7.14-1
 - Upstream updated:
     Add configuration option for atomic-ops.  bug fix: do not


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Aug 2008 17:19:35 -0000	1.1
+++ import.log	4 Sep 2008 03:54:37 -0000	1.2
@@ -1 +1,2 @@
 flam3-2_7_14-1_fc9:HEAD:flam3-2.7.14-1.fc9.src.rpm:1217870319
+flam3-2_7_15-1_fc9:HEAD:flam3-2.7.15-1.fc9.src.rpm:1220500457


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Aug 2008 17:19:35 -0000	1.8
+++ sources	4 Sep 2008 03:54:37 -0000	1.9
@@ -1 +1 @@
-94bdff2e2e1f3051e46780d0fd153577  flam3-2.7.14.tar.gz
+d65e28f27866820117ee2039dbcf1c0b  flam3-2.7.15.tar.gz



From toshio at fedoraproject.org  Thu Sep  4 03:56:06 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu,  4 Sep 2008 03:56:06 +0000 (UTC)
Subject: rpms/bzr-gtk/F-9 .cvsignore, 1.13,
	1.14 bzr-gtk-disable-nautilus-pull.patch, 1.2, 1.3 bzr-gtk.spec,
	1.21, 1.22 sources, 1.13, 1.14 bzr-gtk-disable-notifier.patch,
	1.2, NONE bzr-gtk-ghost-keyerror.patch, 1.2,
	NONE bzr-gtk-more-better-seahorse-dbus-check.patch, 1.1,
	NONE bzr-gtk-nautilus-setup.patch, 1.1, NONE
Message-ID: <20080904035606.2037E70120@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12669

Modified Files:
	.cvsignore bzr-gtk-disable-nautilus-pull.patch bzr-gtk.spec 
	sources 
Removed Files:
	bzr-gtk-disable-notifier.patch bzr-gtk-ghost-keyerror.patch 
	bzr-gtk-more-better-seahorse-dbus-check.patch 
	bzr-gtk-nautilus-setup.patch 
Log Message:

* Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.95.0-1
- New Upstream release for use with bzr >= 1.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	7 May 2008 13:23:17 -0000	1.13
+++ .cvsignore	4 Sep 2008 03:55:35 -0000	1.14
@@ -1 +1 @@
-bzr-gtk-0.94.0.tar.gz
+bzr-gtk-0.95.0.tar.gz

bzr-gtk-disable-nautilus-pull.patch:

Index: bzr-gtk-disable-nautilus-pull.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-9/bzr-gtk-disable-nautilus-pull.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bzr-gtk-disable-nautilus-pull.patch	24 Jul 2008 18:31:34 -0000	1.2
+++ bzr-gtk-disable-nautilus-pull.patch	4 Sep 2008 03:55:35 -0000	1.3
@@ -1,10 +1,10 @@
-Index: bzr-gtk-0.94.0/nautilus-bzr.py
+Index: bzr-gtk-0.95.0/nautilus-bzr.py
 ===================================================================
---- bzr-gtk-0.94.0.orig/nautilus-bzr.py
-+++ bzr-gtk-0.94.0/nautilus-bzr.py
-@@ -183,24 +183,6 @@ class BzrExtension(nautilus.MenuProvider
- 
-         return
+--- bzr-gtk-0.95.0.orig/nautilus-bzr.py
++++ bzr-gtk-0.95.0/nautilus-bzr.py
+@@ -185,24 +185,6 @@ class BzrExtension(nautilus.MenuProvider
+         pp.show()
+         gtk.main()
  
 -    def pull_cb(self, menu, vfs_file):
 -        # We can only cope with local files
@@ -27,16 +27,16 @@
      def merge_cb(self, menu, vfs_file):
          # We can only cope with local files
          if vfs_file.get_uri_scheme() != 'file':
-@@ -265,12 +247,6 @@ class BzrExtension(nautilus.MenuProvider
+@@ -267,12 +249,6 @@ class BzrExtension(nautilus.MenuProvider
          item.connect('activate', self.log_cb, vfs_file)
          items.append(item)
  
 -        item = nautilus.MenuItem('BzrNautilus::pull',
--                             'Pull',
+-                             'Pull ...',
 -                             'Pull from another branch')
 -        item.connect('activate', self.pull_cb, vfs_file)
 -        items.append(item)
 -
          item = nautilus.MenuItem('BzrNautilus::merge',
-                              'Merge',
+                              'Merge ...',
                               'Merge from another branch')


Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-9/bzr-gtk.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bzr-gtk.spec	24 Jul 2008 18:31:34 -0000	1.21
+++ bzr-gtk.spec	4 Sep 2008 03:55:35 -0000	1.22
@@ -7,27 +7,20 @@
 %define debug_package %{nil}
 
 Name:           bzr-gtk
-Version:        0.94.0
-Release:        5%{?dist}
+Version:        0.95.0
+Release:        1%{?dist}
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://bazaar-vcs.org/bzr-gtk
 Source0:        http://samba.org/~jelmer/bzr/bzr-gtk-%{version}.tar.gz
-# We can't use the notifier functionality without a bzr-dbus-package.
-Patch0:         bzr-gtk-disable-notifier.patch
 # This requires some nonexistent functionality.  Bug filed upstream.  Disabled
 # for now.
-Patch1:         bzr-gtk-disable-nautilus-pull.patch
-Patch2:         bzr-gtk-nautilus-setup.patch
-# https://bugs.launchpad.net/bzr-gtk/+bug/228922
-Patch3:         bzr-gtk-more-better-seahorse-dbus-check.patch
-# From upstream
-Patch4:         bzr-gtk-ghost-keyerror.patch
+Patch0:         bzr-gtk-disable-nautilus-pull.patch
 %if 0%{?fedora} <= 7
 # In EL-5 and Fedora < 7 Encoding was a mandatory field.  Now it's deprecated.
-Patch100:	bzr-gtk-el5-encoding.patch
+Patch100:       bzr-gtk-el5-encoding.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -39,9 +32,9 @@
 # nautilus-python is not present in EPEL at this time.
 BuildRequires:  nautilus-python-devel
 %endif
-Requires:       bzr >= 1.0
+Requires:       bzr >= 1.6
 Requires:       pygtk2
-# This enables the commit-notify functionality but it's not packaged for
+# This enables the bzr-notify functionality but it's not packaged for
 # Fedora yet.
 #Requires:       bzr-dbus
 Obsoletes:      olive < %{version}-%{release}
@@ -68,11 +61,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .disable
-%patch1 -p1 -b .nautilusdisable
-%patch2 -p1 -b .nautilusinstall
-%patch3 -p0 -b .seahorse-fix
-%patch4 -p1 -b .ghost
+%patch0 -p1 -b .nautilusdisable
 
 %if 0%{?fedora} <= 7
 # EPEL 5 and Fedora <= 7
@@ -123,10 +112,14 @@
 # If building for fedora, create the nautilus-bzr subpackage.  If building for
 # RHEL, exclude the files.
 %files -n nautilus-bzr
+%defattr(-,root,root,-)
 %{_libdir}/nautilus/extensions-1.0/python/*
 %endif
 
 %changelog
+* Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.95.0-1
+- New Upstream release for use with bzr >= 1.6.
+
 * Thu Jul 24 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.94.0-5
 - Upstream has a new patch for bz#455284.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	7 May 2008 13:23:17 -0000	1.13
+++ sources	4 Sep 2008 03:55:35 -0000	1.14
@@ -1 +1 @@
-623715992ca761e7e6470134bf07f27f  bzr-gtk-0.94.0.tar.gz
+00aedce625672abca13d2d962b047ac0  bzr-gtk-0.95.0.tar.gz


--- bzr-gtk-disable-notifier.patch DELETED ---


--- bzr-gtk-ghost-keyerror.patch DELETED ---


--- bzr-gtk-more-better-seahorse-dbus-check.patch DELETED ---


--- bzr-gtk-nautilus-setup.patch DELETED ---



From ssp at fedoraproject.org  Thu Sep  4 04:00:04 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu,  4 Sep 2008 04:00:04 +0000 (UTC)
Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.160,1.161
Message-ID: <20080904040004.EECD570120@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13359

Modified Files:
	gnome-desktop.spec 
Log Message:
Bump release number


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- gnome-desktop.spec	4 Sep 2008 03:31:06 -0000	1.160
+++ gnome-desktop.spec	4 Sep 2008 03:59:34 -0000	1.161
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.23.91
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.23/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -121,6 +121,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Wed Sep  3 2008 Soren Sandmann <sandmann at redhat.com> - 2.23.91-3
+- Bump release number to make chain-build work
+
 * Wed Sep  3 2008 Soren Sandmann <sandmann at redhat.com> - 2.23.91-2
 - Add patch to move clone mode enumeration to gnome-rr.c
 



From ssp at fedoraproject.org  Thu Sep  4 04:02:41 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu,  4 Sep 2008 04:02:41 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel gnome-settings-daemon.spec, 1.50, 
	1.51
Message-ID: <20080904040241.8E1E470120@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13739

Modified Files:
	gnome-settings-daemon.spec 
Log Message:
Bump gnome-desktop requirement


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gnome-settings-daemon.spec	4 Sep 2008 03:47:24 -0000	1.50
+++ gnome-settings-daemon.spec	4 Sep 2008 04:02:11 -0000	1.51
@@ -17,7 +17,7 @@
 BuildRequires:	GConf2-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	gnome-vfs2-devel
-BuildRequires:	gnome-desktop-devel >= 2.23.91-2
+BuildRequires:	gnome-desktop-devel >= 2.23.91-3
 BuildRequires:	libglade2-devel
 BuildRequires:	libgnomeui-devel
 BuildRequires:	libgnome-devel



From roland at fedoraproject.org  Thu Sep  4 04:05:55 2008
From: roland at fedoraproject.org (Roland McGrath)
Date: Thu,  4 Sep 2008 04:05:55 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.925, 1.926 linux-2.6-utrace.patch, 
	1.94, 1.95
Message-ID: <20080904040555.2FDD170120@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14305

Modified Files:
	kernel.spec linux-2.6-utrace.patch 
Log Message:
utrace update


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.925
retrieving revision 1.926
diff -u -r1.925 -r1.926
--- kernel.spec	4 Sep 2008 03:11:17 -0000	1.925
+++ kernel.spec	4 Sep 2008 04:05:24 -0000	1.926
@@ -1753,6 +1753,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Sep  3 2008 Roland McGrath <roland at redhat.com>
+- utrace update
+
 * Wed Sep 03 2008 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.27-rc5-git5
 

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- linux-2.6-utrace.patch	26 Aug 2008 01:55:23 -0000	1.94
+++ linux-2.6-utrace.patch	4 Sep 2008 04:05:24 -0000	1.95
@@ -4,13 +4,13 @@
  include/linux/ptrace.h            |   21 +
  include/linux/sched.h             |    6 +
  include/linux/tracehook.h         |   65 +-
- include/linux/utrace.h            |  711 +++++++++++
+ include/linux/utrace.h            |  708 +++++++++++
  init/Kconfig                      |   27 +
  kernel/Makefile                   |    1 +
- kernel/ptrace.c                   |  604 +++++++++-
+ kernel/ptrace.c                   |  605 +++++++++-
  kernel/signal.c                   |   14 +-
- kernel/utrace.c                   | 2511 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 4523 insertions(+), 8 deletions(-)
+ kernel/utrace.c                   | 2516 +++++++++++++++++++++++++++++++++++++
+ 12 files changed, 4526 insertions(+), 8 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
 index 1615350..92ca631 100644  
@@ -27,7 +27,7 @@
  	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
 diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl
 new file mode 100644
-index ...396a00d 100644  
+index ...1c37104 100644  
 --- /dev/null
 +++ b/Documentation/DocBook/utrace.tmpl
 @@ -0,0 +1,566 @@
@@ -413,7 +413,7 @@
 +    <function>utrace_set_events</function> call (these do not block), you can
 +    call <function>utrace_barrier</function> to block until callbacks have
 +    finished.  This returns <constant>-ESRCH</constant> only if the engine is
-+    completely detached (finished all callbacks).  Otherwise returns it waits
++    completely detached (finished all callbacks).  Otherwise it waits
 +    until the thread is definitely not in the midst of a callback to this
 +    engine and then returns zero, but can return
 +    <constant>-ERESTARTSYS</constant> if its wait is interrupted.
@@ -906,10 +906,10 @@
  
 diff --git a/include/linux/utrace.h b/include/linux/utrace.h
 new file mode 100644
-index ...1509012 100644  
+index ...4dd29e9 100644  
 --- /dev/null
 +++ b/include/linux/utrace.h
-@@ -0,0 +1,711 @@
+@@ -0,0 +1,708 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -950,12 +950,8 @@
 +struct linux_binprm;
 +struct pt_regs;
 +struct utrace;
-+struct utrace_engine_ops;
-+struct utrace_attached_engine;
-+struct utrace_examiner;
 +struct user_regset;
 +struct user_regset_view;
-+enum utrace_resume_action;
 +
 +/*
 + * Event bits passed to utrace_set_events().
@@ -1076,30 +1072,6 @@
 +
 +void task_utrace_proc_status(struct seq_file *m, struct task_struct *p);
 +
-+/*
-+ * These are the exported entry points for tracing engines to use.
-+ * See kernel/utrace.c for their kerneldoc comments with interface details.
-+ */
-+struct utrace_attached_engine *utrace_attach_task(
-+	struct task_struct *, int, const struct utrace_engine_ops *, void *);
-+struct utrace_attached_engine *utrace_attach_pid(
-+	struct pid *, int, const struct utrace_engine_ops *, void *);
-+int __must_check utrace_control(struct task_struct *,
-+				struct utrace_attached_engine *,
-+				enum utrace_resume_action);
-+int __must_check utrace_set_events(struct task_struct *,
-+				   struct utrace_attached_engine *,
-+				   unsigned long eventmask);
-+int __must_check utrace_barrier(struct task_struct *,
-+				struct utrace_attached_engine *);
-+int __must_check utrace_prepare_examine(struct task_struct *,
-+					struct utrace_attached_engine *,
-+					struct utrace_examiner *);
-+int __must_check utrace_finish_examine(struct task_struct *,
-+				       struct utrace_attached_engine *,
-+				       struct utrace_examiner *);
-+void __utrace_engine_release(struct kref *);
-+
 +/**
 + * enum utrace_resume_action - engine's choice of action for a traced task
 + * @UTRACE_STOP:		Stay quiescent after callbacks.
@@ -1262,6 +1234,8 @@
 +	kref_get(&engine->kref);
 +}
 +
++void __utrace_engine_release(struct kref *);
++
 +/**
 + * utrace_engine_put - release a reference on a &struct utrace_attached_engine
 + * @engine:	&struct utrace_attached_engine pointer
@@ -1552,6 +1526,29 @@
 +	struct {} dummy;
 +};
 +
++/*
++ * These are the exported entry points for tracing engines to use.
++ * See kernel/utrace.c for their kerneldoc comments with interface details.
++ */
++struct utrace_attached_engine *utrace_attach_task(
++	struct task_struct *, int, const struct utrace_engine_ops *, void *);
++struct utrace_attached_engine *utrace_attach_pid(
++	struct pid *, int, const struct utrace_engine_ops *, void *);
++int __must_check utrace_control(struct task_struct *,
++				struct utrace_attached_engine *,
++				enum utrace_resume_action);
++int __must_check utrace_set_events(struct task_struct *,
++				   struct utrace_attached_engine *,
++				   unsigned long eventmask);
++int __must_check utrace_barrier(struct task_struct *,
++				struct utrace_attached_engine *);
++int __must_check utrace_prepare_examine(struct task_struct *,
++					struct utrace_attached_engine *,
++					struct utrace_examiner *);
++int __must_check utrace_finish_examine(struct task_struct *,
++				       struct utrace_attached_engine *,
++				       struct utrace_examiner *);
++
 +/**
 + * utrace_control_pid - control a thread being traced by a tracing engine
 + * @pid:		thread to affect
@@ -1672,7 +1669,7 @@
  obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
  obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 356699a..9734661 100644  
+index 356699a..355297b 100644  
 --- a/kernel/ptrace.c
 +++ b/kernel/ptrace.c
 @@ -16,6 +16,7 @@
@@ -1691,7 +1688,7 @@
  /*
   * Turn a tracing stop into a normal stop now, since with no tracer there
   * would be no way to wake it up with SIGCONT or SIGKILL.  If there was a
-@@ -58,6 +60,54 @@ void ptrace_untrace(struct task_struct *
+@@ -58,6 +60,55 @@ void ptrace_untrace(struct task_struct *
  	spin_unlock(&child->sighand->siglock);
  }
  
@@ -1723,7 +1720,8 @@
 +				    &ptrace_utrace_ops, NULL);
 +	if (likely(!IS_ERR(engine))) {
 +		int ret = utrace_control(child, engine, UTRACE_DETACH);
-+		WARN_ON(ret && ret != -ESRCH);
++		WARN_ON(ret && ret != -EINPROGRESS &&
++			ret != -ESRCH && ret != -EALREADY);
 +		utrace_engine_put(engine);
 +	}
 +}
@@ -1746,7 +1744,7 @@
  /*
   * unptrace a task: move it back to its original parent and
   * remove it from the ptrace list.
-@@ -72,10 +122,11 @@ void __ptrace_unlink(struct task_struct 
+@@ -72,10 +123,11 @@ void __ptrace_unlink(struct task_struct 
  	child->parent = child->real_parent;
  	list_del_init(&child->ptrace_entry);
  
@@ -1760,7 +1758,7 @@
  /*
   * Check that we have indeed attached to the thing..
   */
-@@ -113,6 +164,457 @@ int ptrace_check_attach(struct task_stru
+@@ -113,6 +165,457 @@ int ptrace_check_attach(struct task_stru
  	return ret;
  }
  
@@ -2218,7 +2216,7 @@
  int __ptrace_may_access(struct task_struct *task, unsigned int mode)
  {
  	/* May we inspect the given task?
-@@ -156,6 +658,7 @@ int ptrace_attach(struct task_struct *ta
+@@ -156,6 +659,7 @@ int ptrace_attach(struct task_struct *ta
  {
  	int retval;
  	unsigned long flags;
@@ -2226,7 +2224,7 @@
  
  	audit_ptrace(task);
  
-@@ -163,6 +666,13 @@ int ptrace_attach(struct task_struct *ta
+@@ -163,6 +667,13 @@ int ptrace_attach(struct task_struct *ta
  	if (same_thread_group(task, current))
  		goto out;
  
@@ -2240,7 +2238,7 @@
  repeat:
  	/*
  	 * Nasty, nasty.
-@@ -202,6 +712,11 @@ repeat:
+@@ -202,6 +713,11 @@ repeat:
  bad:
  	write_unlock_irqrestore(&tasklist_lock, flags);
  	task_unlock(task);
@@ -2252,7 +2250,7 @@
  out:
  	return retval;
  }
-@@ -221,9 +736,7 @@ int ptrace_detach(struct task_struct *ch
+@@ -221,9 +737,7 @@ int ptrace_detach(struct task_struct *ch
  	if (!valid_signal(data))
  		return -EIO;
  
@@ -2263,7 +2261,7 @@
  
  	write_lock_irq(&tasklist_lock);
  	/* protect against de_thread()->release_task() */
-@@ -309,6 +822,8 @@ static int ptrace_setoptions(struct task
+@@ -309,6 +823,8 @@ static int ptrace_setoptions(struct task
  	if (data & PTRACE_O_TRACEEXIT)
  		child->ptrace |= PT_TRACE_EXIT;
  
@@ -2272,7 +2270,7 @@
  	return (data & ~PTRACE_O_MASK) ? -EINVAL : 0;
  }
  
-@@ -367,6 +882,7 @@ static int ptrace_setsiginfo(struct task
+@@ -367,6 +883,7 @@ static int ptrace_setsiginfo(struct task
  #define is_sysemu_singlestep(request)	0
  #endif
  
@@ -2280,7 +2278,7 @@
  static int ptrace_resume(struct task_struct *child, long request, long data)
  {
  	if (!valid_signal(data))
-@@ -401,6 +917,76 @@ static int ptrace_resume(struct task_str
+@@ -401,6 +918,76 @@ static int ptrace_resume(struct task_str
  
  	return 0;
  }
@@ -2357,7 +2355,7 @@
  
  int ptrace_request(struct task_struct *child, long request,
  		   long addr, long data)
-@@ -480,6 +1066,11 @@ int ptrace_request(struct task_struct *c
+@@ -480,6 +1067,11 @@ int ptrace_request(struct task_struct *c
  int ptrace_traceme(void)
  {
  	int ret = -EPERM;
@@ -2369,7 +2367,7 @@
  
  	/*
  	 * Are we already being traced?
-@@ -513,6 +1104,9 @@ repeat:
+@@ -513,6 +1105,9 @@ repeat:
  		write_unlock_irqrestore(&tasklist_lock, flags);
  	}
  	task_unlock(current);
@@ -2434,10 +2432,10 @@
  			  struct pt_regs *regs, void *cookie)
 diff --git a/kernel/utrace.c b/kernel/utrace.c
 new file mode 100644
-index ...aad2181 100644  
+index ...5ef8fcd 100644  
 --- /dev/null
 +++ b/kernel/utrace.c
-@@ -0,0 +1,2511 @@
+@@ -0,0 +1,2516 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -2540,7 +2538,7 @@
 +	utrace_engine_cachep = KMEM_CACHE(utrace_attached_engine, SLAB_PANIC);
 +	return 0;
 +}
-+subsys_initcall(utrace_init);
++module_init(utrace_init);
 +
 +
 +/*
@@ -2635,7 +2633,6 @@
 +{
 +	CHECK_DEAD(utrace);
 +	spin_unlock(&utrace->lock);
-+	INIT_RCU_HEAD(&utrace->u.dead);
 +	call_rcu(&utrace->u.dead, utrace_free);
 +}
 +
@@ -2923,8 +2920,8 @@
 +	spin_lock_irq(&task->sighand->siglock);
 +
 +	if (unlikely(sigismember(&task->pending.signal, SIGKILL))) {
-+		spin_unlock(&utrace->lock);
 +		spin_unlock_irq(&task->sighand->siglock);
++		spin_unlock(&utrace->lock);
 +		return true;
 +	}
 +
@@ -3291,7 +3288,7 @@
 +		set_tsk_thread_flag(target, TIF_SYSCALL_TRACE);
 +
 +	ret = 0;
-+	if (!utrace->stopped) {
++	if (!utrace->stopped && target != current) {
 +		smp_mb();
 +		if (utrace->reporting == engine)
 +			ret = -EINPROGRESS;
@@ -3400,18 +3397,21 @@
 + * some stale bits in @task->utrace_flags.  Clean them up and recompute the
 + * flags.
 + *
-+ * @wake is false when @task is current.  @wake is true when @task is
-+ * stopped and @utrace->stopped is set; wake it up if it should not be.
++ * @action is NULL when @task is stopped and @utrace->stopped is set; wake
++ * it up if it should not be.  @action is set when @task is current; if
++ * we're fully detached, reset *@action to UTRACE_RESUME.
 + *
 + * Called with @utrace->lock held, returns with it released.
++ * Returns true if
 + */
 +static void utrace_reset(struct task_struct *task, struct utrace *utrace,
-+			 bool wake)
++			 enum utrace_resume_action *action)
 +	__releases(utrace->lock)
 +{
 +	struct utrace_attached_engine *engine, *next;
 +	unsigned long flags = 0;
 +	LIST_HEAD(detached);
++	bool wake = !action;
 +
 +	splice_attaching(utrace);
 +
@@ -3453,6 +3453,9 @@
 +		goto done;
 +	}
 +
++	if (action)
++		*action = UTRACE_RESUME;
++
 +	/*
 +	 * No more engines, clear out the utrace.  Here we can race with
 +	 * utrace_release_task().  If it gets task_lock() first, then it
@@ -3753,7 +3756,7 @@
 +	 * there is nothing more we need to do.
 +	 */
 +	if (resume)
-+		utrace_reset(target, utrace, true);
++		utrace_reset(target, utrace, NULL);
 +	else
 +		spin_unlock(&utrace->lock);
 +
@@ -3868,7 +3871,7 @@
 +	if (clean)
 +		spin_unlock(&utrace->lock);
 +	else
-+		utrace_reset(task, utrace, false);
++		utrace_reset(task, utrace, &report->action);
 +}
 +
 +/*
@@ -4227,7 +4230,7 @@
 +		 */
 +		utrace_reap(task, utrace);
 +	else
-+		utrace_reset(task, utrace, false);
++		utrace_reset(task, utrace, &report.action);
 +}
 +
 +/*
@@ -4243,7 +4246,7 @@
 +{
 +	if (report->detaches || !report->takers) {
 +		spin_lock(&utrace->lock);
-+		utrace_reset(task, utrace, false);
++		utrace_reset(task, utrace, &report->action);
 +	}
 +
 +	switch (report->action) {



From cchance at fedoraproject.org  Thu Sep  4 04:27:47 2008
From: cchance at fedoraproject.org (Caius Chance)
Date: Thu,  4 Sep 2008 04:27:47 +0000 (UTC)
Subject: rpms/scim-tables/devel .cvsignore, 1.9, 1.10 scim-tables.spec, 1.47,
	1.48 sources, 1.9, 1.10
Message-ID: <20080904042747.E22D270120@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/scim-tables/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16176

Modified Files:
	.cvsignore scim-tables.spec sources 
Log Message:
* Thu Sep 04 2008 Caius Chance <cchance at redhat.com> - 0.5.8-7.fc10
- Resolves: rhbz#461092 (Create specific CangJie 5 icon.)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scim-tables/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	31 Mar 2008 03:10:38 -0000	1.9
+++ .cvsignore	4 Sep 2008 04:27:17 -0000	1.10
@@ -1 +1,2 @@
 scim-tables-0.5.8.tar.gz
+CangJie5.png


Index: scim-tables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-tables/devel/scim-tables.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- scim-tables.spec	29 Aug 2008 04:31:44 -0000	1.47
+++ scim-tables.spec	4 Sep 2008 04:27:17 -0000	1.48
@@ -6,7 +6,7 @@
 
 Name:           scim-tables
 Version:        0.5.8
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        SCIM Generic Table IMEngine
 
 License:        GPLv2+
@@ -17,6 +17,7 @@
 Source2:        ZhuYin-Big.txt.in
 Source3:        Cantonese.txt.in
 Source4:        CangJie5.txt.in
+Source5:        CangJie5.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
 BuildRequires:  scim-devel, gtk2-devel
@@ -231,6 +232,9 @@
 # kill *.a and *.la files
 rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*/*.la
 
+# Insert CangJie5 icon mod.
+%{__cp} %{SOURCE5} ${RPM_BUILD_ROOT}/%{_datadir}/scim/icons/
+
 %if !%{indic_tables}
 rm ${RPM_BUILD_ROOT}/%{_datadir}/scim/{icons,tables}/{Bengali,Gujarati,Hindi,Kannada,Malayalam,Punjabi,Tamil,Telugu}-*
 %endif
@@ -239,6 +243,7 @@
 rm ${RPM_BUILD_ROOT}/%{_datadir}/scim/{icons,tables}/{Hangul,Hanja,HIRAGANA,KATAKANA,Nippon}*
 %endif
 
+
 %find_lang %{name}
 
 
@@ -291,6 +296,7 @@
 %{_datadir}/scim/tables/CangJie3.bin
 %{_datadir}/scim/icons/CangJie3.png
 %{_datadir}/scim/tables/CangJie5.bin
+%{_datadir}/scim/icons/CangJie5.png
 %{_datadir}/scim/tables/CantonHK.bin
 %{_datadir}/scim/icons/CantonHK.png
 %{_datadir}/scim/tables/Quick.bin
@@ -456,6 +462,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Caius Chance <cchance at redhat.com> - 0.5.8-7.fc10
+- Resolves: rhbz#461092 (Create specific CangJie 5 icon.)
+
 * Wed Aug 28 2008 Caius Chance <cchance at redhat.com> - 0.5.8-6.fc10
 - Resolves: rhbz#459772 (Update CangJie 5 table.)
 - Turned on dynamic candidate order (frequency).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scim-tables/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	31 Mar 2008 03:09:01 -0000	1.9
+++ sources	4 Sep 2008 04:27:17 -0000	1.10
@@ -1 +1,2 @@
 53ba0d00a71e467b5d009954cf56cb07  scim-tables-0.5.8.tar.gz
+8895b0b0cb89f877eb712890684e63ac  CangJie5.png



From cebbert at fedoraproject.org  Thu Sep  4 04:33:52 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu,  4 Sep 2008 04:33:52 +0000 (UTC)
Subject: rpms/kernel/F-8 linux-2.6-compile-fixes.patch,1.159,1.160
Message-ID: <20080904043352.5439F70120@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16599

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
fix 2.6.26.4-rc1 build


linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-compile-fixes.patch,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- linux-2.6-compile-fixes.patch	19 Dec 2007 00:44:05 -0000	1.159
+++ linux-2.6-compile-fixes.patch	4 Sep 2008 04:33:51 -0000	1.160
@@ -4,3 +4,17 @@
 # Please add the errors from gcc before the diffs to save others having
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
+
+net/ipv6/ip6mr.c:48:23: error: linux/pim.h: no such file or directory
+
+--- linux-2.6.26.noarch.orig/net/ipv6/ip6mr.c
++++ linux-2.6.26.noarch/net/ipv6/ip6mr.c
+@@ -45,7 +45,7 @@
+ #include <net/ipv6.h>
+ #include <net/ip6_route.h>
+ #include <linux/mroute6.h>
+-#include <linux/pim.h>
++#include <linux/mroute.h>
+ #include <net/addrconf.h>
+ #include <linux/netfilter_ipv6.h>
+ 



From cebbert at fedoraproject.org  Thu Sep  4 04:35:02 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu,  4 Sep 2008 04:35:02 +0000 (UTC)
Subject: rpms/kernel/F-9 linux-2.6-compile-fixes.patch,1.162,1.163
Message-ID: <20080904043502.68FFD70120@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16716

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
fix 2.6.26.4-rc1 build


linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-compile-fixes.patch,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- linux-2.6-compile-fixes.patch	9 Apr 2008 04:28:26 -0000	1.162
+++ linux-2.6-compile-fixes.patch	4 Sep 2008 04:35:02 -0000	1.163
@@ -4,3 +4,17 @@
 # Please add the errors from gcc before the diffs to save others having
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
+
+net/ipv6/ip6mr.c:48:23: error: linux/pim.h: no such file or directory
+
+--- linux-2.6.26.noarch.orig/net/ipv6/ip6mr.c
++++ linux-2.6.26.noarch/net/ipv6/ip6mr.c
+@@ -45,7 +45,7 @@
+ #include <net/ipv6.h>
+ #include <net/ip6_route.h>
+ #include <linux/mroute6.h>
+-#include <linux/pim.h>
++#include <linux/mroute.h>
+ #include <net/addrconf.h>
+ #include <linux/netfilter_ipv6.h>
+ 



From mclasen at fedoraproject.org  Thu Sep  4 04:51:52 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  4 Sep 2008 04:51:52 +0000 (UTC)
Subject: rpms/esound/devel .cvsignore, 1.18, 1.19 esound.spec, 1.47,
	1.48 sources, 1.18, 1.19
Message-ID: <20080904045152.AD85970120@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/esound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17533

Modified Files:
	.cvsignore esound.spec sources 
Log Message:
0.2.40



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/esound/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	15 Jul 2008 19:23:10 -0000	1.18
+++ .cvsignore	4 Sep 2008 04:51:22 -0000	1.19
@@ -1 +1 @@
-esound-0.2.39.tar.bz2
+esound-0.2.40.tar.bz2


Index: esound.spec
===================================================================
RCS file: /cvs/extras/rpms/esound/devel/esound.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- esound.spec	17 Jul 2008 20:28:27 -0000	1.47
+++ esound.spec	4 Sep 2008 04:51:22 -0000	1.48
@@ -1,8 +1,8 @@
 # Note that this is NOT a relocatable package
 Summary: Allows several audio streams to play on a single audio device
 Name:    esound
-Version: 0.2.39
-Release: 2%{?dist}
+Version: 0.2.40
+Release: 1%{?dist}
 Epoch:   1
 License: LGPLv2+
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/esound
@@ -125,6 +125,9 @@
 %{_mandir}/man1/esd-config.1.gz
 
 %changelog
+* Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> 0 1:0.2.40-1
+- Update to 0.2.40
+
 * Thu Jul 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1:0.2.39-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/esound/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	15 Jul 2008 19:23:10 -0000	1.18
+++ sources	4 Sep 2008 04:51:22 -0000	1.19
@@ -1 +1 @@
-d950b9cd0d7b5406cc4bb16bcdcea8f4  esound-0.2.39.tar.bz2
+e9009889ab81269f3021ebcad8addb96  esound-0.2.40.tar.bz2



From mclasen at fedoraproject.org  Thu Sep  4 04:55:09 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  4 Sep 2008 04:55:09 +0000 (UTC)
Subject: rpms/gnome-devel-docs/devel .cvsignore, 1.4,
	1.5 gnome-devel-docs.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20080904045509.36DA370120@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-devel-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18004

Modified Files:
	.cvsignore gnome-devel-docs.spec sources 
Log Message:
2.23.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-devel-docs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Mar 2008 01:59:13 -0000	1.4
+++ .cvsignore	4 Sep 2008 04:54:38 -0000	1.5
@@ -1 +1 @@
-gnome-devel-docs-2.22.0.tar.bz2
+gnome-devel-docs-2.23.1.tar.bz2


Index: gnome-devel-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-devel-docs/devel/gnome-devel-docs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-devel-docs.spec	11 Mar 2008 01:59:13 -0000	1.4
+++ gnome-devel-docs.spec	4 Sep 2008 04:54:38 -0000	1.5
@@ -1,11 +1,11 @@
 Summary: GNOME developer documentation
 Name: gnome-devel-docs
-Version: 2.22.0
+Version: 2.23.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.22/%{name}-%{version}.tar.bz2  
+Source: http://download.gnome.org/sources/gnome-devel-docs/2.23/%{name}-%{version}.tar.bz2  
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildArch: noarch
 BuildRequires: gnome-doc-utils
@@ -49,6 +49,9 @@
 %{_datadir}/omf/platform-overview
 
 %changelog
+* Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.1-1
+- Update to 2.23.1
+
 * Mon Mar 10 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-1
 - Update to 2.22.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-devel-docs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Mar 2008 01:59:13 -0000	1.4
+++ sources	4 Sep 2008 04:54:38 -0000	1.5
@@ -1 +1 @@
-fde987f35c495fa16b9af1de9a6aed7b  gnome-devel-docs-2.22.0.tar.bz2
+44269a2ba6d8c12d2c16cd88ef0fc79e  gnome-devel-docs-2.23.1.tar.bz2



From mclasen at fedoraproject.org  Thu Sep  4 04:57:12 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  4 Sep 2008 04:57:12 +0000 (UTC)
Subject: rpms/libgnomekbd/devel .cvsignore, 1.15, 1.16 libgnomekbd.spec, 1.37,
	1.38 sources, 1.15, 1.16
Message-ID: <20080904045712.A584C70120@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnomekbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18269

Modified Files:
	.cvsignore libgnomekbd.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	12 May 2008 03:05:20 -0000	1.15
+++ .cvsignore	4 Sep 2008 04:56:42 -0000	1.16
@@ -1 +1 @@
-libgnomekbd-2.23.2.tar.bz2
+libgnomekbd-2.23.91.tar.bz2


Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/libgnomekbd.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- libgnomekbd.spec	29 Aug 2008 22:24:26 -0000	1.37
+++ libgnomekbd.spec	4 Sep 2008 04:56:42 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           libgnomekbd
-Version:       	2.23.2
-Release:        2%{?dist}
+Version:       	2.23.91
+Release:        1%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
@@ -132,6 +132,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Fri Aug 29 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.2-2
 - Plug a small memory leak
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	12 May 2008 03:05:20 -0000	1.15
+++ sources	4 Sep 2008 04:56:42 -0000	1.16
@@ -1 +1 @@
-a904fe74cefb9967cc0734b4c1ebc5cc  libgnomekbd-2.23.2.tar.bz2
+5d2a377c038f8a9e34778f65a80516bd  libgnomekbd-2.23.91.tar.bz2



From cchance at fedoraproject.org  Thu Sep  4 05:02:08 2008
From: cchance at fedoraproject.org (Caius Chance)
Date: Thu,  4 Sep 2008 05:02:08 +0000 (UTC)
Subject: rpms/scim-tables/devel CangJie5.txt.in,1.1,1.2
Message-ID: <20080904050208.A8D7770120@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/scim-tables/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18657

Modified Files:
	CangJie5.txt.in 
Log Message:
changed icon name



Index: CangJie5.txt.in
===================================================================
RCS file: /cvs/pkgs/rpms/scim-tables/devel/CangJie5.txt.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CangJie5.txt.in	29 Aug 2008 04:31:44 -0000	1.1
+++ CangJie5.txt.in	4 Sep 2008 05:01:38 -0000	1.2
@@ -31,7 +31,7 @@
 ### This number must be less than 2^32.
 SERIAL_NUMBER = 20080808
 
-ICON = @SCIM_ICONDIR@/CangJie.png
+ICON = @SCIM_ICONDIR@/CangJie5.png
 
 ### The default name of this table
 NAME = CangJie 5



From mclasen at fedoraproject.org  Thu Sep  4 05:00:33 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  4 Sep 2008 05:00:33 +0000 (UTC)
Subject: rpms/gnome-keyring/devel .cvsignore, 1.46, 1.47 gnome-keyring.spec, 
	1.91, 1.92 sources, 1.46, 1.47
Message-ID: <20080904050033.4632570120@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18608

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	20 Aug 2008 08:43:15 -0000	1.46
+++ .cvsignore	4 Sep 2008 05:00:02 -0000	1.47
@@ -1 +1 @@
-gnome-keyring-2.23.90.tar.bz2
+gnome-keyring-2.23.91.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- gnome-keyring.spec	20 Aug 2008 08:43:16 -0000	1.91
+++ gnome-keyring.spec	4 Sep 2008 05:00:02 -0000	1.92
@@ -7,11 +7,11 @@
 
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
-Version: 2.23.90
+Version: 2.23.91
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/gnome-keyring/2.22/gnome-keyring-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-keyring/2.23/gnome-keyring-%{version}.tar.bz2
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Wed Aug 20 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.23.90-1
 - Update to 2.23.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	20 Aug 2008 08:43:16 -0000	1.46
+++ sources	4 Sep 2008 05:00:02 -0000	1.47
@@ -1 +1 @@
-592bf44e1e554a28c61276515d6f8c4b  gnome-keyring-2.23.90.tar.bz2
+dcbdfd69bae4fb133ac9ba9b9846f8aa  gnome-keyring-2.23.91.tar.bz2



From mclasen at fedoraproject.org  Thu Sep  4 05:15:33 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  4 Sep 2008 05:15:33 +0000 (UTC)
Subject: rpms/gnome-devel-docs/devel gnome-devel-docs.spec,1.5,1.6
Message-ID: <20080904051534.01C7F70120@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-devel-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19871

Modified Files:
	gnome-devel-docs.spec 
Log Message:
try to fix up BRs



Index: gnome-devel-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-devel-docs/devel/gnome-devel-docs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-devel-docs.spec	4 Sep 2008 04:54:38 -0000	1.5
+++ gnome-devel-docs.spec	4 Sep 2008 05:15:03 -0000	1.6
@@ -10,6 +10,7 @@
 BuildArch: noarch
 BuildRequires: gnome-doc-utils
 BuildRequires: rarian-compat
+BuildRequires: docbook-utils
 
 %description 
 This package contains documents which are targeted for GNOME developers.



From mclasen at fedoraproject.org  Thu Sep  4 05:17:16 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  4 Sep 2008 05:17:16 +0000 (UTC)
Subject: rpms/libgnomekbd/devel libgnomekbd.spec,1.38,1.39
Message-ID: <20080904051716.9FAB070120@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnomekbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20094

Modified Files:
	libgnomekbd.spec 
Log Message:
damn you, intltool



Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/libgnomekbd.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libgnomekbd.spec	4 Sep 2008 04:56:42 -0000	1.38
+++ libgnomekbd.spec	4 Sep 2008 05:16:46 -0000	1.39
@@ -22,6 +22,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  gettext
+BuildRequires:  intltool
 
 Requires(pre): GConf2
 Requires(post): GConf2



From mclasen at fedoraproject.org  Thu Sep  4 05:19:01 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  4 Sep 2008 05:19:01 +0000 (UTC)
Subject: rpms/gnome-keyring/devel gnome-keyring.spec,1.92,1.93
Message-ID: <20080904051901.A54CE70120@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20266

Modified Files:
	gnome-keyring.spec 
Log Message:
fix file lists



Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- gnome-keyring.spec	4 Sep 2008 05:00:02 -0000	1.92
+++ gnome-keyring.spec	4 Sep 2008 05:18:31 -0000	1.93
@@ -128,6 +128,7 @@
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
 %doc %{_datadir}/gtk-doc/html/gnome-keyring/
+%doc %{_datadir}/gtk-doc/html/gp11/
 
 %files pam
 %defattr(-, root, root)



From mclasen at fedoraproject.org  Thu Sep  4 05:21:02 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  4 Sep 2008 05:21:02 +0000 (UTC)
Subject: rpms/gnome-devel-docs/devel gnome-devel-docs.spec,1.6,1.7
Message-ID: <20080904052102.837AF70120@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-devel-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20373

Modified Files:
	gnome-devel-docs.spec 
Log Message:
more BR fixes



Index: gnome-devel-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-devel-docs/devel/gnome-devel-docs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-devel-docs.spec	4 Sep 2008 05:15:03 -0000	1.6
+++ gnome-devel-docs.spec	4 Sep 2008 05:20:32 -0000	1.7
@@ -11,6 +11,7 @@
 BuildRequires: gnome-doc-utils
 BuildRequires: rarian-compat
 BuildRequires: docbook-utils
+BuildRequires: gettext
 
 %description 
 This package contains documents which are targeted for GNOME developers.



From mclasen at fedoraproject.org  Thu Sep  4 05:23:35 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  4 Sep 2008 05:23:35 +0000 (UTC)
Subject: rpms/seahorse/devel .cvsignore, 1.16, 1.17 seahorse.spec, 1.47,
	1.48 sources, 1.18, 1.19
Message-ID: <20080904052335.8635C70120@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/seahorse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20720

Modified Files:
	.cvsignore seahorse.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	23 Aug 2008 04:10:13 -0000	1.16
+++ .cvsignore	4 Sep 2008 05:23:05 -0000	1.17
@@ -1 +1 @@
-seahorse-2.23.90.tar.bz2
+seahorse-2.23.91.tar.bz2


Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- seahorse.spec	31 Aug 2008 03:05:54 -0000	1.47
+++ seahorse.spec	4 Sep 2008 05:23:05 -0000	1.48
@@ -1,6 +1,6 @@
 Name: 		seahorse
-Version: 	2.23.90
-Release:        2%{?dist}
+Version: 	2.23.91
+Release:        1%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
 # seahorse is GPLv2+
@@ -142,6 +142,9 @@
 %{_libdir}/pkgconfig/cryptui-0.0.pc
 
 %changelog
+* Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> 2.23.91-1
+- Update to 2.23.91
+
 * Sat Aug 30 2008 Michel Salim <salimma at fedoraproject.org> 2.23.90-2
 - Patch configure to detect gpg2 binary
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	23 Aug 2008 04:10:13 -0000	1.18
+++ sources	4 Sep 2008 05:23:05 -0000	1.19
@@ -1 +1 @@
-d23e3bb9fbc45868b4f1d3ac3d0d72a3  seahorse-2.23.90.tar.bz2
+e4949546bdf97ce26c334afab6c62365  seahorse-2.23.91.tar.bz2



From devrim at fedoraproject.org  Thu Sep  4 05:24:18 2008
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Thu,  4 Sep 2008 05:24:18 +0000 (UTC)
Subject: rpms/postgresql-table_log/EL-5 postgresql-table_log.spec,1.1,1.2
Message-ID: <20080904052418.3BE6B70120@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-table_log/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20779/EL-5

Modified Files:
	postgresql-table_log.spec 
Log Message:
Include unowned directories.
Michael Schwendt



Index: postgresql-table_log.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-table_log/EL-5/postgresql-table_log.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postgresql-table_log.spec	18 Jun 2007 05:27:27 -0000	1.1
+++ postgresql-table_log.spec	4 Sep 2008 05:23:48 -0000	1.2
@@ -3,7 +3,7 @@
 Summary:	Log data changes in a PostgreSQL table
 Name:		postgresql-%{sname}
 Version:	0.4.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://pgfoundry.org/frs/download.php/1387/%{sname}-%{version}.tar.gz
@@ -42,11 +42,16 @@
 
 %files
 %defattr(644,root,root,755)
-%doc %{_docdir}//%{name}-%{version}/README
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/README
+%dir %{_datadir}/%{name}
 %{_datadir}/%{name}/%{sname}*.sql
 %{_libdir}/pgsql/%{sname}.so
 
 %changelog
+* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.4-3
+- Include unowned directories.
+
 * Sat Jun 17 2007 - Devrim GUNDUZ <devrim at commandprompt.com> 0.4.4-2
 - Added Requires, per bugzilla review #244536 (Thanks Ruben)
 - Renamed README file, per bugzilla review #244536



From devrim at fedoraproject.org  Thu Sep  4 05:24:18 2008
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Thu,  4 Sep 2008 05:24:18 +0000 (UTC)
Subject: rpms/postgresql-table_log/EL-4 postgresql-table_log.spec,1.1,1.2
Message-ID: <20080904052418.0CB0770120@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-table_log/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20779/EL-4

Modified Files:
	postgresql-table_log.spec 
Log Message:
Include unowned directories.
Michael Schwendt



Index: postgresql-table_log.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-table_log/EL-4/postgresql-table_log.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postgresql-table_log.spec	18 Jun 2007 05:27:22 -0000	1.1
+++ postgresql-table_log.spec	4 Sep 2008 05:23:47 -0000	1.2
@@ -3,7 +3,7 @@
 Summary:	Log data changes in a PostgreSQL table
 Name:		postgresql-%{sname}
 Version:	0.4.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://pgfoundry.org/frs/download.php/1387/%{sname}-%{version}.tar.gz
@@ -42,11 +42,16 @@
 
 %files
 %defattr(644,root,root,755)
-%doc %{_docdir}//%{name}-%{version}/README
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/README
+%dir %{_datadir}/%{name}
 %{_datadir}/%{name}/%{sname}*.sql
 %{_libdir}/pgsql/%{sname}.so
 
 %changelog
+* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.4-3
+- Include unowned directories.
+
 * Sat Jun 17 2007 - Devrim GUNDUZ <devrim at commandprompt.com> 0.4.4-2
 - Added Requires, per bugzilla review #244536 (Thanks Ruben)
 - Renamed README file, per bugzilla review #244536



From devrim at fedoraproject.org  Thu Sep  4 05:24:18 2008
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Thu,  4 Sep 2008 05:24:18 +0000 (UTC)
Subject: rpms/postgresql-table_log/devel postgresql-table_log.spec,1.4,1.5
Message-ID: <20080904052418.D699570120@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-table_log/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20779/devel

Modified Files:
	postgresql-table_log.spec 
Log Message:
Include unowned directories.
Michael Schwendt



Index: postgresql-table_log.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-table_log/devel/postgresql-table_log.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- postgresql-table_log.spec	19 Feb 2008 01:29:33 -0000	1.4
+++ postgresql-table_log.spec	4 Sep 2008 05:23:48 -0000	1.5
@@ -3,7 +3,7 @@
 Summary:	Log data changes in a PostgreSQL table
 Name:		postgresql-%{sname}
 Version:	0.4.4
-Release:	4%{?dist}.1
+Release:	5%{?dist}
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://pgfoundry.org/frs/download.php/1387/%{sname}-%{version}.tar.gz
@@ -42,11 +42,16 @@
 
 %files
 %defattr(644,root,root,755)
-%doc %{_docdir}//%{name}-%{version}/README
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/README
+%dir %{_datadir}/%{name}
 %{_datadir}/%{name}/%{sname}*.sql
 %{_libdir}/pgsql/%{sname}.so
 
 %changelog
+* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.4-5
+- Include unowned directories.
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.4-4.1
 - Autorebuild for GCC 4.3
 



From devrim at fedoraproject.org  Thu Sep  4 05:24:18 2008
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Thu,  4 Sep 2008 05:24:18 +0000 (UTC)
Subject: rpms/postgresql-table_log/F-8 postgresql-table_log.spec,1.2,1.3
Message-ID: <20080904052418.7204D70120@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-table_log/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20779/F-8

Modified Files:
	postgresql-table_log.spec 
Log Message:
Include unowned directories.
Michael Schwendt



Index: postgresql-table_log.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-table_log/F-8/postgresql-table_log.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- postgresql-table_log.spec	29 Aug 2007 03:58:31 -0000	1.2
+++ postgresql-table_log.spec	4 Sep 2008 05:23:48 -0000	1.3
@@ -3,7 +3,7 @@
 Summary:	Log data changes in a PostgreSQL table
 Name:		postgresql-%{sname}
 Version:	0.4.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://pgfoundry.org/frs/download.php/1387/%{sname}-%{version}.tar.gz
@@ -42,11 +42,16 @@
 
 %files
 %defattr(644,root,root,755)
-%doc %{_docdir}//%{name}-%{version}/README
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/README
+%dir %{_datadir}/%{name}
 %{_datadir}/%{name}/%{sname}*.sql
 %{_libdir}/pgsql/%{sname}.so
 
 %changelog
+* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.4-4
+- Include unowned directories.
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.4.4-3
 - Rebuild for selinux ppc32 issue.
 



From devrim at fedoraproject.org  Thu Sep  4 05:24:18 2008
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Thu,  4 Sep 2008 05:24:18 +0000 (UTC)
Subject: rpms/postgresql-table_log/F-9 postgresql-table_log.spec,1.4,1.5
Message-ID: <20080904052418.A7A1D70120@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-table_log/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20779/F-9

Modified Files:
	postgresql-table_log.spec 
Log Message:
Include unowned directories.
Michael Schwendt



Index: postgresql-table_log.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-table_log/F-9/postgresql-table_log.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- postgresql-table_log.spec	19 Feb 2008 01:29:33 -0000	1.4
+++ postgresql-table_log.spec	4 Sep 2008 05:23:48 -0000	1.5
@@ -3,7 +3,7 @@
 Summary:	Log data changes in a PostgreSQL table
 Name:		postgresql-%{sname}
 Version:	0.4.4
-Release:	4%{?dist}.1
+Release:	5%{?dist}
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://pgfoundry.org/frs/download.php/1387/%{sname}-%{version}.tar.gz
@@ -42,11 +42,16 @@
 
 %files
 %defattr(644,root,root,755)
-%doc %{_docdir}//%{name}-%{version}/README
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/README
+%dir %{_datadir}/%{name}
 %{_datadir}/%{name}/%{sname}*.sql
 %{_libdir}/pgsql/%{sname}.so
 
 %changelog
+* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.4-5
+- Include unowned directories.
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.4-4.1
 - Autorebuild for GCC 4.3
 



From pnemade at fedoraproject.org  Thu Sep  4 05:35:41 2008
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Thu,  4 Sep 2008 05:35:41 +0000 (UTC)
Subject: rpms/hunspell-bn/devel hunspell-bn.spec,1.1,1.2
Message-ID: <20080904053541.1983E70120@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hunspell-bn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21784

Modified Files:
	hunspell-bn.spec 
Log Message:

* Tue Sep 02 2008 Caol??n McNamara <caolanm at redhat.com> - 20050726-3
- add bn_BD alias





Index: hunspell-bn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-bn/devel/hunspell-bn.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hunspell-bn.spec	7 Jan 2008 06:32:06 -0000	1.1
+++ hunspell-bn.spec	4 Sep 2008 05:35:10 -0000	1.2
@@ -1,7 +1,7 @@
 Name: hunspell-bn
 Summary: Bengali hunspell dictionaries
 Version: 20050726
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: http://hunspell.sourceforge.net/bn-demo.tar.gz
 Group: Applications/Text
 URL: http://hunspell.sourceforge.net
@@ -28,6 +28,14 @@
 mv bn/bn.aff bn/bn_IN.aff
 cp -p bn/*.dic bn/*.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
 
+pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/
+bn_IN_aliases="bn_BD"
+for lang in $bn_IN_aliases; do
+        ln -s bn_IN.aff $lang.aff
+        ln -s bn_IN.dic $lang.dic
+done
+popd
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -37,6 +45,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Tue Sep 02 2008 Caol??n McNamara <caolanm at redhat.com> - 20050726-3
+- add bn_BD alias
+
 * Sun Jan 06 2008 Parag <pnemade at redhat.com> - 20050726-2
 - Added Copyright and corrected changelog version.
 



From salimma at fedoraproject.org  Thu Sep  4 05:42:17 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu,  4 Sep 2008 05:42:17 +0000 (UTC)
Subject: rpms/podsleuth/F-8 podsleuth.spec,1.2,1.3
Message-ID: <20080904054217.F032D70120@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/podsleuth/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22478/F-8

Modified Files:
	podsleuth.spec 
Log Message:
* Wed Sep  3 2008 Michel Salim <salimma at fedoraproject.org> - 0.6.2-3
- Manually requires sg3_utils-libs



Index: podsleuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-8/podsleuth.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- podsleuth.spec	25 Aug 2008 08:16:22 -0000	1.2
+++ podsleuth.spec	4 Sep 2008 05:41:47 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:		podsleuth
 Version:	0.6.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Probes, identifies, and exposes properties and metadata bound to iPods
 Group:		Applications/Multimedia
 License:	MIT
@@ -16,6 +16,7 @@
 BuildRequires:	hal-devel
 BuildRequires:	ndesk-dbus-devel
 BuildRequires:	sg3_utils-devel
+Requires:       sg3_utils-libs
 
 # JIT only availible on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
@@ -78,6 +79,9 @@
 %{_libdir}/pkgconfig/podsleuth.pc
 
 %changelog
+* Wed Sep  3 2008 Michel Salim <salimma at fedoraproject.org> - 0.6.2-3
+- Manually requires sg3_utils-libs
+
 * Mon Aug 25 2008 Michel Salim <salimma at fedoraproject.org> - 0.6.2-2
 - Apply sg3_utils patch only on F10 and above
 



From salimma at fedoraproject.org  Thu Sep  4 05:42:18 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu,  4 Sep 2008 05:42:18 +0000 (UTC)
Subject: rpms/podsleuth/devel podsleuth.spec,1.5,1.6
Message-ID: <20080904054218.62DE070120@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/podsleuth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22478/devel

Modified Files:
	podsleuth.spec 
Log Message:
* Wed Sep  3 2008 Michel Salim <salimma at fedoraproject.org> - 0.6.2-3
- Manually requires sg3_utils-libs



Index: podsleuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/devel/podsleuth.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- podsleuth.spec	25 Aug 2008 08:16:23 -0000	1.5
+++ podsleuth.spec	4 Sep 2008 05:41:48 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:		podsleuth
 Version:	0.6.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Probes, identifies, and exposes properties and metadata bound to iPods
 Group:		Applications/Multimedia
 License:	MIT
@@ -16,6 +16,7 @@
 BuildRequires:	hal-devel
 BuildRequires:	ndesk-dbus-devel
 BuildRequires:	sg3_utils-devel
+Requires:       sg3_utils-libs
 
 # JIT only availible on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
@@ -78,6 +79,9 @@
 %{_libdir}/pkgconfig/podsleuth.pc
 
 %changelog
+* Wed Sep  3 2008 Michel Salim <salimma at fedoraproject.org> - 0.6.2-3
+- Manually requires sg3_utils-libs
+
 * Mon Aug 25 2008 Michel Salim <salimma at fedoraproject.org> - 0.6.2-2
 - Apply sg3_utils patch only on F10 and above
 



From salimma at fedoraproject.org  Thu Sep  4 05:42:18 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu,  4 Sep 2008 05:42:18 +0000 (UTC)
Subject: rpms/podsleuth/F-9 podsleuth.spec,1.4,1.5
Message-ID: <20080904054218.23B5170120@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/podsleuth/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22478/F-9

Modified Files:
	podsleuth.spec 
Log Message:
* Wed Sep  3 2008 Michel Salim <salimma at fedoraproject.org> - 0.6.2-3
- Manually requires sg3_utils-libs



Index: podsleuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-9/podsleuth.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- podsleuth.spec	25 Aug 2008 08:16:22 -0000	1.4
+++ podsleuth.spec	4 Sep 2008 05:41:47 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		podsleuth
 Version:	0.6.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Probes, identifies, and exposes properties and metadata bound to iPods
 Group:		Applications/Multimedia
 License:	MIT
@@ -16,6 +16,7 @@
 BuildRequires:	hal-devel
 BuildRequires:	ndesk-dbus-devel
 BuildRequires:	sg3_utils-devel
+Requires:       sg3_utils-libs
 
 # JIT only availible on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
@@ -78,6 +79,9 @@
 %{_libdir}/pkgconfig/podsleuth.pc
 
 %changelog
+* Wed Sep  3 2008 Michel Salim <salimma at fedoraproject.org> - 0.6.2-3
+- Manually requires sg3_utils-libs
+
 * Mon Aug 25 2008 Michel Salim <salimma at fedoraproject.org> - 0.6.2-2
 - Apply sg3_utils patch only on F10 and above
 



From pnemade at fedoraproject.org  Thu Sep  4 06:08:27 2008
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Thu,  4 Sep 2008 06:08:27 +0000 (UTC)
Subject: rpms/m17n-contrib/devel m17n-contrib.spec,1.14,1.15
Message-ID: <20080904060827.DCD0370120@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-contrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23727

Modified Files:
	m17n-contrib.spec 
Log Message:

* Thu Sep 04 2008 Parag Nemade <pnemade at redhat.com> -1.1.7-3
- Resolves: rh# Bug 458264-Required Inscript map for Sindhi language




Index: m17n-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-contrib/devel/m17n-contrib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- m17n-contrib.spec	4 Jul 2008 05:48:50 -0000	1.14
+++ m17n-contrib.spec	4 Sep 2008 06:07:57 -0000	1.15
@@ -1,12 +1,14 @@
 Name:     m17n-contrib
 Summary:  Contributed multilingualization datafiles for m17n-lib
 Version:  1.1.7
-Release:  2%{?dist}
+Release:  3%{?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:  kn-kgp.mim
+Source2:  sd-inscript.mim
+Source3:  sd-inscript.png
 Patch0:	  bug433416-bn-probhat.patch
 Patch1:	  as-inscript-keysummary-440201.patch
 Patch2:   ml-inscript-keysummary-435259.patch
@@ -112,6 +114,9 @@
 %{_datadir}/m17n/scripts
   
 %changelog
+* Thu Sep 04 2008 Parag Nemade <pnemade at redhat.com> -1.1.7-3
+- Resolves: rh# Bug 458264-Required Inscript map for Sindhi language 
+
 * Fri Jul 04 2008 Parag Nemade <pnemade at redhat.com> -1.1.7-2
 - Resolves: rh#453910: [kn_IN]Include latest kn- kgp.mim againist the latest build
 



From mclasen at fedoraproject.org  Thu Sep  4 06:11:29 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  4 Sep 2008 06:11:29 +0000 (UTC)
Subject: rpms/seahorse-plugins/devel .cvsignore, 1.2,
	1.3 seahorse-plugins.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20080904061129.7DDB970123@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/seahorse-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23852

Modified Files:
	.cvsignore seahorse-plugins.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Aug 2008 02:00:44 -0000	1.2
+++ .cvsignore	4 Sep 2008 06:10:59 -0000	1.3
@@ -1 +1 @@
-seahorse-plugins-2.23.6.tar.bz2
+seahorse-plugins-2.23.91.tar.bz2


Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/devel/seahorse-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- seahorse-plugins.spec	25 Aug 2008 01:03:37 -0000	1.2
+++ seahorse-plugins.spec	4 Sep 2008 06:10:59 -0000	1.3
@@ -1,16 +1,12 @@
 Name: 		seahorse-plugins
-Version: 	2.23.6
-Release:        2%{?dist}
+Version: 	2.23.91
+Release:        1%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
 Group: 		User Interface/Desktops
 License:        GPLv2+ and GFDL
 URL:            http://projects.gnome.org/seahorse/
 Source:         http://download.gnome.org/sources/seahorse-plugins/2.23/%{name}-%{version}.tar.bz2
 Source1:	seahorse-agent.sh
-# gettext domain conflict, reported on the upstream mailinglist
-Patch0:		gettext-domain.patch
-# check for epiphany 2.23, reported on the upstream mailinglist
-Patch1: 	epiphany-2.23.patch
 
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,8 +60,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gettext-domain
-%patch1 -p1 -b .epiphany-2.23
 
 autoreconf
 
@@ -95,17 +89,6 @@
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 
-
-# Nuke these files since they are conflicting with the main seahorse
-# package. This is still being sorted out upstream.
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/help/seahorse
-rm -rf $RPM_BUILD_ROOT%{_datadir}/omf/seahorse
-rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
-rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps
-
-mv $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/seahorse.schemas \
-   $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/seahorse-plugins.schemas
-
 %find_lang %{name} --with-gnome --all-name
 
 %clean
@@ -119,6 +102,11 @@
 	%{_sysconfdir}/gconf/schemas/seahorse-plugins.schemas 	\
 	%{_sysconfdir}/gconf/schemas/seahorse-gedit.schemas 	\
 	>& /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
+
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -142,6 +130,10 @@
 %postun
 scrollkeeper-update -q
 update-mime-database %{_datadir}/mime >& /dev/null
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %files -f %{name}.lang
@@ -167,12 +159,21 @@
 %{_datadir}/applications/seahorse-pgp-signature.desktop
 %{_datadir}/mime/packages/seahorse.xml
 %{_datadir}/seahorse-plugins
-%{_datadir}/seahorse/glade/seahorse-agent-cache.glade
 %{_datadir}/seahorse/glade/seahorse-applet-preferences.glade
 %{_mandir}/man1/seahorse-agent.1.gz
 %{_mandir}/man1/seahorse-tool.1.gz
+%{_datadir}/pixmaps/seahorse-applet.svg
+%{_datadir}/pixmaps/seahorse/22x22/*
+%{_datadir}/pixmaps/seahorse/48x48/*
+%{_datadir}/pixmaps/seahorse/scalable/*
+%{_datadir}/icons/hicolor/48x48/apps/seahorse-applet.png
+%{_datadir}/icons/hicolor/scalable/apps/seahorse-applet.svg
+
 
 %changelog
+* Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> 2.23.91-1
+- Update to 2.23.91
+
 * Sun Aug 24 2008 Matthias Clasen <mclasen at redhat.com> 2.23.6-2
 - Brutally fix some file conflicts with the main seahorse package
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Aug 2008 02:00:44 -0000	1.2
+++ sources	4 Sep 2008 06:10:59 -0000	1.3
@@ -1 +1 @@
-714f7749d0d586ba62180141098756a3  seahorse-plugins-2.23.6.tar.bz2
+585371c1302077894e514b6305c82acd  seahorse-plugins-2.23.91.tar.bz2



From pnemade at fedoraproject.org  Thu Sep  4 06:18:21 2008
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Thu,  4 Sep 2008 06:18:21 +0000 (UTC)
Subject: rpms/m17n-contrib/devel sd-inscript.mim, NONE, 1.1 sd-inscript.png, 
	NONE, 1.1 m17n-contrib.spec, 1.15, 1.16
Message-ID: <20080904061821.4F6A170120@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-contrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24289

Modified Files:
	m17n-contrib.spec 
Added Files:
	sd-inscript.mim sd-inscript.png 
Log Message:

- Added Sindhi keymap and icon files to cvs




--- NEW FILE sd-inscript.mim ---
;; sd-inscript.mim -- Sindhi 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.
;; Copyright (c) 2008 Red Hat, 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 sd inscript)

(description "Sindhi input method for inscript layout.

Reference URL : http://indlinux.org/wiki/index.php/InscriptLayouts#Devanagari

Key Summary:
??? : 
	This characters can be typed using [??? + '_'(underscore)] or
	['i' + '_'] or ['???'+ ???]
??? :
	This characters can be typed using ??? + '_'(underscore)] or
	['p' + '_'] or ['???'+ ???]
??? :
	This characters can be typed using ??? + '_'(underscore)] or
	['[' + '_'] or ['???'+ ???]
??? :                 
	This characters can be typed using ??? + '_'(underscore)] or
	['y' + '_'] or ['???'+ ???]

Author: Pravin Satpute <psatpute 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" "??????") 
  ("i_" ????)
  ("p_" ????)
  ("[_" ????)
  ("y_" ????)
  ))

(state
  (init
    (trans)))


Index: m17n-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-contrib/devel/m17n-contrib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- m17n-contrib.spec	4 Sep 2008 06:07:57 -0000	1.15
+++ m17n-contrib.spec	4 Sep 2008 06:17:51 -0000	1.16
@@ -78,6 +78,7 @@
 %mk_pkg_uses_db oriya or 1
 %mk_pkg_uses_db punjabi pa 1
 %mk_pkg_uses_db russian ru 0
+%mk_pkg sindhi sd 1
 %mk_pkg_uses_db sinhala si 0
 %mk_pkg tai tai 0
 %mk_pkg_uses_db tamil ta 1
@@ -101,7 +102,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p"
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/m17n/
+cp -p %{SOURCE1}  %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/m17n/
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/m17n/icons
 
 %find_lang %name
 



From kkofler at fedoraproject.org  Thu Sep  4 07:40:18 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 07:40:18 +0000 (UTC)
Subject: rpms/kdebase3/devel kdebase3.spec, 1.68,
	1.69 kdebase-3.5.7-kde#83974.patch, 1.1,
	NONE kdebase-3.5.8-glibc28-struct-ucred.patch, 1.1,
	NONE kdebase-3.5.8-konsole-bz#244906.patch, 1.1, NONE
Message-ID: <20080904074018.40D6170120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv384/devel

Modified Files:
	kdebase3.spec 
Removed Files:
	kdebase-3.5.7-kde#83974.patch 
	kdebase-3.5.8-glibc28-struct-ucred.patch 
	kdebase-3.5.8-konsole-bz#244906.patch 
Log Message:
Remove no longer used patches.


Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- kdebase3.spec	28 Aug 2008 22:17:19 -0000	1.68
+++ kdebase3.spec	4 Sep 2008 07:39:47 -0000	1.69
@@ -79,23 +79,15 @@
 Patch26: kdebase-3.5.5-suspend.patch
 Patch27: kdebase-3.5.8-consolekit-kdm.patch
 Patch28: kdebase-3.5.6-kdm-alternatebackground.patch
-# FIXME? (still needed?) -- Rex
-Patch29: kdebase-3.5.8-konsole-bz#244906.patch
 Patch30: kdebase-3.5.7-kio_media_mounthelper.patch
 # kdebase: "Root Shell" sessions will not close, http://bugzilla.redhat.com/301841
 Patch31: kdebase-3.5.10-konsolesu-kdesu.patch
-# fix check for struct ucred to work with current glibc 2.7.90
-Patch35: kdebase-3.5.8-glibc28-struct-ucred.patch
 # modified version of kubuntu_9915_userdiskmount.diff
 # fixes NTFS (#378041) and adds PolicyKit support (#428212)
 Patch36: kdebase-3.5.9-userdiskmount.patch
 # don't link kcm_colors against libkrdb
 Patch37: kdebase-3.5.9-libkrdb_dep.patch
 
-# upstream patches
-# alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
-Patch200: kdebase-3.5.7-kde#83974.patch
-
 # security fixes
 
 %if 0%{?libs}
@@ -318,18 +310,13 @@
 %{?_with_suspend:%patch26 -p1 -b .suspend}
 %{?_with_hal:%patch27 -p1 -b .consolekit}
 %patch28 -p1 -b .kdm-alternatebackground
-#patch29 -p1 -b .konsole-bz#244906
 %patch30 -p1 -b .bz#265801
 %patch31 -p1 -b .konsolesu-kdesu
-#patch35 -p1 -b .ucred
 %if 0%{?fedora} > 7
 %patch36 -p1 -b .userdiskmount
 %endif
 %patch37 -p1 -b .libkrdb_dep
 
-## alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
-#patch200 -p4 -b .kde#83974
-
 %if "%{name}" != "kdebase"
 # hacks to omit stuff that doesn't support DO_NOT_COMPILE
 # colors is pending on http://bugzilla.redhat.com/443343


--- kdebase-3.5.7-kde#83974.patch DELETED ---


--- kdebase-3.5.8-glibc28-struct-ucred.patch DELETED ---


--- kdebase-3.5.8-konsole-bz#244906.patch DELETED ---



From kkofler at fedoraproject.org  Thu Sep  4 07:45:06 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 07:45:06 +0000 (UTC)
Subject: rpms/kdebase3/F-9 kdebase-3.5.10-konsolesu-kdesu.patch, NONE,
	1.1 kdebase3.spec, 1.65, 1.66 kdebase-3.5-khotkeys-crash.patch,
	1.1, NONE kdebase-3.5.7-kde#83974.patch, 1.1,
	NONE kdebase-3.5.7-konsolesu.patch, 1.1,
	NONE kdebase-3.5.8-glibc28-struct-ucred.patch, 1.1,
	NONE kdebase-3.5.8-konsole-bz#244906.patch, 1.1,
	NONE kdebase-3.5.9-lmsensors.patch, 1.1, NONE
Message-ID: <20080904074506.BA30470121@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1330/F-9

Modified Files:
	kdebase3.spec 
Added Files:
	kdebase-3.5.10-konsolesu-kdesu.patch 
Removed Files:
	kdebase-3.5-khotkeys-crash.patch kdebase-3.5.7-kde#83974.patch 
	kdebase-3.5.7-konsolesu.patch 
	kdebase-3.5.8-glibc28-struct-ucred.patch 
	kdebase-3.5.8-konsole-bz#244906.patch 
	kdebase-3.5.9-lmsensors.patch 
Log Message:
Sync from devel:

* Thu Aug 28 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-1
- kde-3.5.10

* Wed Jul 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-17
- rebuild for new libraw1394

kdebase-3.5.10-konsolesu-kdesu.patch:

--- NEW FILE kdebase-3.5.10-konsolesu-kdesu.patch ---
diff -up kdebase-3.5.10/konsole/konsolesu.desktop.konsolesu-kdesu kdebase-3.5.10/konsole/konsolesu.desktop
--- kdebase-3.5.10/konsole/konsolesu.desktop.konsolesu-kdesu	2008-08-19 13:17:13.000000000 -0500
+++ kdebase-3.5.10/konsole/konsolesu.desktop	2008-08-28 17:15:14.000000000 -0500
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Exec=konsole --type su
+Exec=kdesu konsole
 Icon=konsole
 DocPath=konsole/index.html
 MimeType=application/x-konsole;


Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/F-9/kdebase3.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- kdebase3.spec	11 Jun 2008 14:14:46 -0000	1.65
+++ kdebase3.spec	4 Sep 2008 07:44:36 -0000	1.66
@@ -1,3 +1,5 @@
+%define _default_patch_fuzz 2
+
 %define debug 0 
 %define final 1 
 %define redhatify 1
@@ -11,8 +13,8 @@
 
 %define _with_samba --with-samba
 
-Version: 3.5.9
-Release: 16%{?dist}
+Version: 3.5.10
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -77,24 +79,15 @@
 Patch26: kdebase-3.5.5-suspend.patch
 Patch27: kdebase-3.5.8-consolekit-kdm.patch
 Patch28: kdebase-3.5.6-kdm-alternatebackground.patch
-# FIXME? (still needed?) -- Rex
-Patch29: kdebase-3.5.8-konsole-bz#244906.patch
 Patch30: kdebase-3.5.7-kio_media_mounthelper.patch
-Patch31: kdebase-3.5.7-konsolesu.patch
-# fix check for struct ucred to work with current glibc 2.7.90
-Patch35: kdebase-3.5.8-glibc28-struct-ucred.patch
+# kdebase: "Root Shell" sessions will not close, http://bugzilla.redhat.com/301841
+Patch31: kdebase-3.5.10-konsolesu-kdesu.patch
 # modified version of kubuntu_9915_userdiskmount.diff
 # fixes NTFS (#378041) and adds PolicyKit support (#428212)
 Patch36: kdebase-3.5.9-userdiskmount.patch
 # don't link kcm_colors against libkrdb
 Patch37: kdebase-3.5.9-libkrdb_dep.patch
 
-# upstream patches
-# alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
-Patch200: kdebase-3.5.7-kde#83974.patch
-Patch201: kdebase-3.5.9-lmsensors.patch
-Patch202: kdebase-3.5-khotkeys-crash.patch
-
 # security fixes
 
 %if 0%{?libs}
@@ -317,20 +310,13 @@
 %{?_with_suspend:%patch26 -p1 -b .suspend}
 %{?_with_hal:%patch27 -p1 -b .consolekit}
 %patch28 -p1 -b .kdm-alternatebackground
-#patch29 -p1 -b .konsole-bz#244906
 %patch30 -p1 -b .bz#265801
 %patch31 -p1 -b .konsolesu-kdesu
-%patch35 -p1 -b .ucred
 %if 0%{?fedora} > 7
 %patch36 -p1 -b .userdiskmount
 %endif
 %patch37 -p1 -b .libkrdb_dep
 
-## alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
-#patch200 -p4 -b .kde#83974
-%patch201 -p0 -b .sensor
-%patch202 -p0 -b .khotkeys-crash
-
 %if "%{name}" != "kdebase"
 # hacks to omit stuff that doesn't support DO_NOT_COMPILE
 # colors is pending on http://bugzilla.redhat.com/443343
@@ -800,6 +786,7 @@
 %ghost %{_localstatedir}/lib/kdm/kdmsts
 %endif
 %{_datadir}/config.kcfg/*
+%{_bindir}/kde3
 %{_bindir}/kio_media_mounthelper
 %{_bindir}/kio_system_documenthelper
 %{_bindir}/kdcop
@@ -870,6 +857,12 @@
 
 
 %changelog
+* Thu Aug 28 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-1
+- kde-3.5.10
+
+* Wed Jul 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-17
+- rebuild for new libraw1394
+
 * Wed Jun 11 2008 Luk???? Tinkl <ltinkl at redhat.com> - 3.5.9-16
 - remove kded_media* to prevent clashes with Solid from KDE 4 (#447852, kdebug:163717)
 


--- kdebase-3.5-khotkeys-crash.patch DELETED ---


--- kdebase-3.5.7-kde#83974.patch DELETED ---


--- kdebase-3.5.7-konsolesu.patch DELETED ---


--- kdebase-3.5.8-glibc28-struct-ucred.patch DELETED ---


--- kdebase-3.5.8-konsole-bz#244906.patch DELETED ---


--- kdebase-3.5.9-lmsensors.patch DELETED ---



From kkofler at fedoraproject.org  Thu Sep  4 07:46:05 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 07:46:05 +0000 (UTC)
Subject: rpms/kdebase3/F-9 .cvsignore,1.4,1.5 sources,1.5,1.6
Message-ID: <20080904074605.9FF6070123@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1637/F-9

Modified Files:
	.cvsignore sources 
Log Message:
Sync from devel:

* Thu Aug 28 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-1
- kde-3.5.10

* Wed Jul 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-17
- rebuild for new libraw1394


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Apr 2008 13:28:23 -0000	1.4
+++ .cvsignore	4 Sep 2008 07:45:35 -0000	1.5
@@ -1,4 +1,4 @@
-kdebase-3.5.9.tar.bz2
 cr16-app-package_games_kids.png
 cr32-app-package_games_kids.png
 cr48-app-package_games_kids.png
+kdebase-3.5.10.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Apr 2008 13:28:23 -0000	1.5
+++ sources	4 Sep 2008 07:45:35 -0000	1.6
@@ -1,4 +1,4 @@
 0b4d2328a153d9987562cbf875c5a228  cr16-app-package_games_kids.png
 a2fb4b0bc9b7816bf29b7f2fe52b04c0  cr32-app-package_games_kids.png
 259dd812748a2964f01ca3c3493b72c6  cr48-app-package_games_kids.png
-c8c35389a238aa1b73e68ef5298eadf8  kdebase-3.5.9.tar.bz2
+88237188271fbf1e6bcd40180a75d953  kdebase-3.5.10.tar.bz2



From mildew at fedoraproject.org  Thu Sep  4 07:47:22 2008
From: mildew at fedoraproject.org (=?utf-8?q?Daniel_Kope=C4=8Dek?=)
Date: Thu,  4 Sep 2008 07:47:22 +0000 (UTC)
Subject: rpms/inetvis/devel import.log, NONE, 1.1 inetvis-0.9.3.1-build.patch,
	NONE, 1.1 inetvis.desktop, NONE, 1.1 inetvis.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080904074722.B809E70120@cvs1.fedora.phx.redhat.com>

Author: mildew

Update of /cvs/pkgs/rpms/inetvis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2102/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log inetvis-0.9.3.1-build.patch inetvis.desktop 
	inetvis.spec 
Log Message:
Initial commit



--- NEW FILE import.log ---
inetvis-0_9_3_1-1_fc8:HEAD:inetvis-0.9.3.1-1.fc8.src.rpm:1220521550

inetvis-0.9.3.1-build.patch:

--- NEW FILE inetvis-0.9.3.1-build.patch ---
diff -up inetvis-0.9.3.1/src/dataproc.cpp.orig inetvis-0.9.3.1/src/dataproc.cpp
--- inetvis-0.9.3.1/src/dataproc.cpp.orig	2008-08-14 18:24:48.000000000 +0200
+++ inetvis-0.9.3.1/src/dataproc.cpp	2008-08-14 18:25:32.000000000 +0200
@@ -2,6 +2,7 @@
 #include <glviswidget.h>
 #include <iostream>
 #include <stdio.h>
+#include <stdlib.h>
 
 using namespace std; //for debugging purposes
 
diff -up inetvis-0.9.3.1/src/glviswidget.cpp.orig inetvis-0.9.3.1/src/glviswidget.cpp
--- inetvis-0.9.3.1/src/glviswidget.cpp.orig	2008-08-14 21:27:22.000000000 +0200
+++ inetvis-0.9.3.1/src/glviswidget.cpp	2008-08-15 10:34:22.000000000 +0200
@@ -4,6 +4,7 @@
 //#include <plotter.h>
 #include <dataproc.h>
 #include "logui.h"
+#include "glviswidget.h"
 
 using namespace std;
 
@@ -26,7 +27,8 @@ GLVisWidget::GLVisWidget(QWidget *parent
    blending = false;
 
    //set background related colours
-   setBackgroundCol(BLACK_BACKGROUND); //default
+   //setBackgroundCol(BLACK_BACKGROUND); //default
+   backgroundCol = BLACK_BACKGROUND;
 
    //set refrence for list id
    referenceAxesList = 1;
@@ -161,10 +163,13 @@ void GLVisWidget::initializeGL()
    glLineWidth(globalLineWidth);
 
    //set background colour
+   /*
    if (backgroundCol == BLACK_BACKGROUND)
       glClearColor(0.0, 0.0, 0.0, 0.0);
    else
       glClearColor(1.0, 1.0, 1.0, 0.0);
+   */
+   setBackgroundCol(backgroundCol);
 
    //set memmory data alignment for capturing frames
    glPixelStorei(GL_PACK_ALIGNMENT, 1); //align to byte rather than the default
diff -up inetvis-0.9.3.1/src/glviswidget.h.orig inetvis-0.9.3.1/src/glviswidget.h
--- inetvis-0.9.3.1/src/glviswidget.h.orig	2007-11-18 02:37:01.000000000 +0100
+++ inetvis-0.9.3.1/src/glviswidget.h	2008-08-14 18:18:37.000000000 +0200
@@ -44,6 +44,9 @@ Street, Fifth Floor, Boston, MA 02110-13
  *
  */
 
+#ifndef GLVISWIDGET_H_INCLUDED
+#define GLVISWIDGET_H_INCLUDED
+
 //To use nvidia development GL header
 //#include "/usr/share/doc/nvidia-glx-dev/include/GL/gl.h"
 
@@ -302,3 +305,6 @@ signals:
    void showReferenceFrameSettings();
 
 };
+
+#endif  // GLVISWIDGET_H_INCLUDED
+
diff -up inetvis-0.9.3.1/src/helpdocumentationdialog.ui.h.orig inetvis-0.9.3.1/src/helpdocumentationdialog.ui.h
--- inetvis-0.9.3.1/src/helpdocumentationdialog.ui.h.orig	2007-11-18 02:37:01.000000000 +0100
+++ inetvis-0.9.3.1/src/helpdocumentationdialog.ui.h	2008-08-14 18:18:37.000000000 +0200
@@ -47,14 +47,19 @@ Street, Fifth Floor, Boston, MA 02110-13
 
 void HelpDocumentationDialog::init()
 {
-    helpTextBrowser->mimeSourceFactory()->setFilePath(QDir::currentDirPath() + "/doc");
+#ifdef INETVIS_DOCDIR
+    QString docdir = INETVIS_DOCDIR;
+#else
+    QString docdir = QDir::currentDirPath() + "/doc";
+#endif
+    helpTextBrowser->mimeSourceFactory()->setFilePath(docdir);
 
     QString documentationFileRef;
     documentationFileRef = "inetvisdoc.html";
     QString altDocumentationText;
     altDocumentationText = "<h3>Documentation & Help pane</h3><p>if you see this message, there was an error reading the InetVis html manual providing documentation and help for the program. It should be installed in a 'doc/' directory relative to the inetvis binary.</p>";
 
-    if (QFile::exists("doc/" + documentationFileRef))
+    if (QFile::exists(docdir + documentationFileRef))
         helpTextBrowser->setSource(documentationFileRef);
     else
         helpTextBrowser->setText(altDocumentationText);
diff -up inetvis-0.9.3.1/src/inetvis.pro.orig inetvis-0.9.3.1/src/inetvis.pro
--- inetvis-0.9.3.1/src/inetvis.pro.orig	2007-11-18 02:35:13.000000000 +0100
+++ inetvis-0.9.3.1/src/inetvis.pro	2008-08-15 11:43:42.000000000 +0200
@@ -53,11 +53,12 @@ CONFIG   += release
 
 ## Linking
 CONFIG   += create_prl link_prl static
-QMAKE_LFLAGS_RELEASE = -m32
+#QMAKE_LFLAGS_RELEASE = -m32
 
 ## Optimization flags
-QMAKE_CFLAGS_RELEASE = -O3 -march=pentium4 -m32 -mfpmath=sse -mmmx -msse -msse2 -mno-sse3 -momit-leaf-frame-pointer -maccumulate-outgoing-args
-QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
+#QMAKE_CFLAGS_RELEASE += -m32 -mfpmath=sse -mmmx -msse -msse2 -mno-sse3 -momit-leaf-frame-pointer -maccumulate-outgoing-args
+QMAKE_CFLAGS_RELEASE +=
+QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
 
 ## end of CUSTOM SETTINGS ---------------------------------
 
diff -up inetvis-0.9.3.1/src/main.cpp.orig inetvis-0.9.3.1/src/main.cpp


--- NEW FILE inetvis.desktop ---
[Desktop Entry]
Name=InetVis
GenericName=Network traffic visualizer
Comment=3-D scatter-plot visualization for network traffic
Exec=inetvis
#Icon=inetvis
Terminal=false
Type=Application
Categories=System;Monitor;


--- NEW FILE inetvis.spec ---
Name:           inetvis
Version:        0.9.3.1
Release:        1%{?dist}
Summary:        3-D scatter-plot visualization for network traffic
Group:          Applications/System
License:        GPLv2
URL:            http://www.cs.ru.ac.za/research/g02v2468/inetvis.html
Source0:        http://www.cs.ru.ac.za/research/g02v2468/inetvis/0.9.3/%{name}-%{version}.tar.gz
Source1:        %{name}.desktop
Patch1:         %{name}-0.9.3.1-build.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libX11-devel
BuildRequires:  mesa-libGL-devel
BuildRequires:  mesa-libGLU-devel
BuildRequires:  libXext-devel
BuildRequires:  libXmu-devel
BuildRequires:  libpcap-devel
BuildRequires:  desktop-file-utils

%if 0%{?fedora} < 9
BuildRequires:  qt-devel
%else
BuildRequires:  qt3-devel
%endif

%description
InetVis is a 3-D scatter-plot visualization for network traffic.
In way, it's more or less like a media player, but for network traffic.
It's quite handy for observing scan activity and other anomolous
traffic patterns.

%prep
%setup -q
%patch1 -p1 -b .build

%build
#%%configure
pushd src
qmake 'QMAKE_CFLAGS_RELEASE += -DINETVIS_DOCDIR=\"%{_docdir}/%{name}-%{version}/\"'
make %{?_smp_mflags}
popd
# fix permissions
chmod 644 doc/images/* doc/inetvisdoc.html
chmod 755 doc/ doc/images/

%install
rm -rf %{buildroot}
#setup directories
mkdir -p %{buildroot}/%{_bindir}
install -m 755 src/inetvis %{buildroot}/%{_bindir}/
desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_bindir}/inetvis
%{_datadir}/applications/fedora-%{name}.desktop
%doc doc/*

%changelog
* Tue Aug 12 2008 Lukas Kuklinek <lkukline at redhat.com> 0.9.3.1-1
- initial rpm
- patches to intall to right system paths and build properly




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inetvis/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:32:03 -0000	1.1
+++ .cvsignore	4 Sep 2008 07:46:52 -0000	1.2
@@ -0,0 +1 @@
+inetvis-0.9.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inetvis/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:32:03 -0000	1.1
+++ sources	4 Sep 2008 07:46:52 -0000	1.2
@@ -0,0 +1 @@
+9f7cae12928c9888329c228c4d9fbaba  inetvis-0.9.3.1.tar.gz



From kkofler at fedoraproject.org  Thu Sep  4 08:00:24 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 08:00:24 +0000 (UTC)
Subject: rpms/kdebase3/F-9 env.sh,1.1,1.2 kdebase3.spec,1.66,1.67
Message-ID: <20080904080024.92D1A70120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4545/F-9

Modified Files:
	env.sh kdebase3.spec 
Log Message:
Sync up (don't need new builds for this, env.sh is only used on F8-):

* Fri May 23 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-14.1
- don't set XDG_CONFIG_DIRS (#249109)


Index: env.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/F-9/env.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- env.sh	1 Dec 2007 06:52:52 -0000	1.1
+++ env.sh	4 Sep 2008 07:59:54 -0000	1.2
@@ -1,11 +1,5 @@
 ## from http://standards.freedesktop.org/menu-spec/latest/
 
-# XDG_CONFIG_DIRS: where to look for menu config(s)
-if [ -z "${XDG_CONFIG_DIRS}" ] ; then
-   XDG_CONFIG_DIRS=/etc/kde/xdg:/etc/xdg
-   export XDG_CONFIG_DIRS
-fi
-
 # XDG_MENU_PREFIX
 if [ -z "${XDG_MENU_PREFIX}" ] ; then
    XDG_MENU_PREFIX="kde-"


Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/F-9/kdebase3.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- kdebase3.spec	4 Sep 2008 07:44:36 -0000	1.66
+++ kdebase3.spec	4 Sep 2008 07:59:54 -0000	1.67
@@ -869,6 +869,9 @@
 * Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-15
 - reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4)
 
+* Fri May 23 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-14.1
+- don't set XDG_CONFIG_DIRS (#249109)
+
 * Fri May 16 2008 Rex Dieter <rdieter at fedoraprojecdt.org> - 3.5.9-14
 - f9+: omit extraneous kcontrol modules (#446575)
 



From kkofler at fedoraproject.org  Thu Sep  4 08:00:24 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 08:00:24 +0000 (UTC)
Subject: rpms/kdebase3/devel env.sh,1.1,1.2 kdebase3.spec,1.69,1.70
Message-ID: <20080904080024.C6B0E70120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4545/devel

Modified Files:
	env.sh kdebase3.spec 
Log Message:
Sync up (don't need new builds for this, env.sh is only used on F8-):

* Fri May 23 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-14.1
- don't set XDG_CONFIG_DIRS (#249109)


Index: env.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/env.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- env.sh	1 Dec 2007 06:52:52 -0000	1.1
+++ env.sh	4 Sep 2008 07:59:54 -0000	1.2
@@ -1,11 +1,5 @@
 ## from http://standards.freedesktop.org/menu-spec/latest/
 
-# XDG_CONFIG_DIRS: where to look for menu config(s)
-if [ -z "${XDG_CONFIG_DIRS}" ] ; then
-   XDG_CONFIG_DIRS=/etc/kde/xdg:/etc/xdg
-   export XDG_CONFIG_DIRS
-fi
-
 # XDG_MENU_PREFIX
 if [ -z "${XDG_MENU_PREFIX}" ] ; then
    XDG_MENU_PREFIX="kde-"


Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- kdebase3.spec	4 Sep 2008 07:39:47 -0000	1.69
+++ kdebase3.spec	4 Sep 2008 07:59:54 -0000	1.70
@@ -869,6 +869,9 @@
 * Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-15
 - reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4)
 
+* Fri May 23 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-14.1
+- don't set XDG_CONFIG_DIRS (#249109)
+
 * Fri May 16 2008 Rex Dieter <rdieter at fedoraprojecdt.org> - 3.5.9-14
 - f9+: omit extraneous kcontrol modules (#446575)
 



From kkofler at fedoraproject.org  Thu Sep  4 08:02:18 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 08:02:18 +0000 (UTC)
Subject: rpms/kdebase/F-8 kdebase-3.5.10-konsolesu-kdesu.patch, NONE,
	1.1 .cvsignore, 1.61, 1.62 kdebase.spec, 1.297, 1.298 sources,
	1.81, 1.82 kdebase-3.5-khotkeys-crash.patch, 1.2,
	NONE kdebase-3.5.7-kde#83974.patch, 1.1,
	NONE kdebase-3.5.7-konsolesu.patch, 1.1,
	NONE kdebase-3.5.8-glibc28-struct-ucred.patch, 1.1,
	NONE kdebase-3.5.8-konsole-bz#244906.patch, 1.1,
	NONE kdebase-3.5.9-lmsensors.patch, 1.1, NONE
Message-ID: <20080904080218.2EB3F70120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4896/F-8

Modified Files:
	.cvsignore kdebase.spec sources 
Added Files:
	kdebase-3.5.10-konsolesu-kdesu.patch 
Removed Files:
	kdebase-3.5-khotkeys-crash.patch kdebase-3.5.7-kde#83974.patch 
	kdebase-3.5.7-konsolesu.patch 
	kdebase-3.5.8-glibc28-struct-ucred.patch 
	kdebase-3.5.8-konsole-bz#244906.patch 
	kdebase-3.5.9-lmsensors.patch 
Log Message:
Sync from kdebase3/devel:

* Thu Aug 28 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-1
- kde-3.5.10

* Wed Jul 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-17
- rebuild for new libraw1394

* Wed Jun 11 2008 Luk???? Tinkl <ltinkl at redhat.com> - 3.5.9-16
- remove kded_media* to prevent clashes with Solid from KDE 4 (#447852, kdebug:163717)

* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-15
- reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4)

kdebase-3.5.10-konsolesu-kdesu.patch:

--- NEW FILE kdebase-3.5.10-konsolesu-kdesu.patch ---
diff -up kdebase-3.5.10/konsole/konsolesu.desktop.konsolesu-kdesu kdebase-3.5.10/konsole/konsolesu.desktop
--- kdebase-3.5.10/konsole/konsolesu.desktop.konsolesu-kdesu	2008-08-19 13:17:13.000000000 -0500
+++ kdebase-3.5.10/konsole/konsolesu.desktop	2008-08-28 17:15:14.000000000 -0500
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Exec=konsole --type su
+Exec=kdesu konsole
 Icon=konsole
 DocPath=konsole/index.html
 MimeType=application/x-konsole;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-8/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	16 Apr 2008 13:44:12 -0000	1.61
+++ .cvsignore	4 Sep 2008 08:01:47 -0000	1.62
@@ -1,4 +1,4 @@
-kdebase-3.5.9.tar.bz2
 cr16-app-package_games_kids.png
 cr32-app-package_games_kids.png
 cr48-app-package_games_kids.png
+kdebase-3.5.10.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-8/kdebase.spec,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- kdebase.spec	23 May 2008 13:23:42 -0000	1.297
+++ kdebase.spec	4 Sep 2008 08:01:47 -0000	1.298
@@ -1,3 +1,5 @@
+%define _default_patch_fuzz 2
+
 %define debug 0 
 %define final 1 
 %define redhatify 1
@@ -11,8 +13,8 @@
 
 %define _with_samba --with-samba
 
-Version: 3.5.9
-Release: 14%{?dist}.1
+Version: 3.5.10
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -77,24 +79,15 @@
 Patch26: kdebase-3.5.5-suspend.patch
 Patch27: kdebase-3.5.8-consolekit-kdm.patch
 Patch28: kdebase-3.5.6-kdm-alternatebackground.patch
-# FIXME? (still needed?) -- Rex
-Patch29: kdebase-3.5.8-konsole-bz#244906.patch
 Patch30: kdebase-3.5.7-kio_media_mounthelper.patch
-Patch31: kdebase-3.5.7-konsolesu.patch
-# fix check for struct ucred to work with current glibc 2.7.90
-Patch35: kdebase-3.5.8-glibc28-struct-ucred.patch
+# kdebase: "Root Shell" sessions will not close, http://bugzilla.redhat.com/301841
+Patch31: kdebase-3.5.10-konsolesu-kdesu.patch
 # modified version of kubuntu_9915_userdiskmount.diff
 # fixes NTFS (#378041) and adds PolicyKit support (#428212)
 Patch36: kdebase-3.5.9-userdiskmount.patch
 # don't link kcm_colors against libkrdb
 Patch37: kdebase-3.5.9-libkrdb_dep.patch
 
-# upstream patches
-# alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
-Patch200: kdebase-3.5.7-kde#83974.patch
-Patch201: kdebase-3.5.9-lmsensors.patch
-Patch202: kdebase-3.5-khotkeys-crash.patch
-
 # security fixes
 
 %if 0%{?libs}
@@ -317,21 +310,12 @@
 %{?_with_suspend:%patch26 -p1 -b .suspend}
 %{?_with_hal:%patch27 -p1 -b .consolekit}
 %patch28 -p1 -b .kdm-alternatebackground
-#patch29 -p1 -b .konsole-bz#244906
 %patch30 -p1 -b .bz#265801
 %patch31 -p1 -b .konsolesu-kdesu
-%patch35 -p1 -b .ucred
 %if 0%{?fedora} > 7
 %patch36 -p1 -b .userdiskmount
 %endif
-%if "%{name}" != "kdebase"
 %patch37 -p1 -b .libkrdb_dep
-%endif
-
-## alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
-#patch200 -p4 -b .kde#83974
-%patch201 -p0 -b .sensor
-%patch202 -p0 -b .khotkeys-crash
 
 %if "%{name}" != "kdebase"
 # hacks to omit stuff that doesn't support DO_NOT_COMPILE
@@ -469,7 +453,6 @@
    for f in $(find %{buildroot}%{_datadir}/applnk -name "*.desktop") ; do
       echo "OnlyShowIn=KDE;" >> $f
    done
-
 %endif
 
 # Own Mozilla plugin dir
@@ -543,6 +526,14 @@
 rm -f %{buildroot}%{_datadir}/config/kshorturifilterrc
 rm -f %{buildroot}%{_datadir}/xsessions/kde.desktop
 
+#??remove mediamanager stuff #447852 and kdebug:163717
+rm -f %{buildroot}%{_libdir}/kde3/kded_mediamanager.*
+rm -f %{buildroot}%{_libdir}/kde3/kded_medianotifier.*
+rm -f %{buildroot}%{_libdir}/kde3/kcm_media.*
+rm -f %{buildroot}%{_datadir}/services/kded/mediamanager.desktop
+rm -f %{buildroot}%{_datadir}/services/kded/medianotifier.desktop
+rm -f %{buildroot}%{_datadir}/applications/kde/media.desktop
+
 # remove conflicts with kdesdk
 rm -f %{buildroot}%{_datadir}/config/katerc
 
@@ -565,8 +556,6 @@
 sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," *.desktop
 popd
 
-# remove all crsystalsvg icons for now
-rm -rf %{buildroot}%{_datadir}/icons/crystalsvg/
 # hicolor
 rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/kappfinder.*
 rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/khelpcenter.*
@@ -762,7 +751,6 @@
 %{_datadir}/desktop-directories/*
 %{_datadir}/locale/*/entry.desktop
 %{_datadir}/locale/l10n
-%{_datadir}/icons/crystalsvg/*/*/*
 %{_datadir}/templates/*
 %{_datadir}/templates/.source/*
 %{_datadir}/wallpapers/*
@@ -798,6 +786,7 @@
 %ghost %{_localstatedir}/lib/kdm/kdmsts
 %endif
 %{_datadir}/config.kcfg/*
+%{_bindir}/kde3
 %{_bindir}/kio_media_mounthelper
 %{_bindir}/kio_system_documenthelper
 %{_bindir}/kdcop
@@ -810,6 +799,7 @@
 %{_datadir}/applications/*/*
 %{_datadir}/apps/*
 %{_datadir}/icons/*color/*/*/*
+%{_datadir}/icons/crystalsvg/*/*/*
 %{_datadir}/mimelnk/*/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
@@ -867,6 +857,18 @@
 
 
 %changelog
+* Thu Aug 28 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-1
+- kde-3.5.10
+
+* Wed Jul 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-17
+- rebuild for new libraw1394
+
+* Wed Jun 11 2008 Luk???? Tinkl <ltinkl at redhat.com> - 3.5.9-16
+- remove kded_media* to prevent clashes with Solid from KDE 4 (#447852, kdebug:163717)
+
+* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-15
+- reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4)
+
 * Fri May 23 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-14.1
 - don't set XDG_CONFIG_DIRS (#249109)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-8/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sources	16 Feb 2008 02:46:32 -0000	1.81
+++ sources	4 Sep 2008 08:01:47 -0000	1.82
@@ -1,4 +1,4 @@
 0b4d2328a153d9987562cbf875c5a228  cr16-app-package_games_kids.png
 a2fb4b0bc9b7816bf29b7f2fe52b04c0  cr32-app-package_games_kids.png
 259dd812748a2964f01ca3c3493b72c6  cr48-app-package_games_kids.png
-c8c35389a238aa1b73e68ef5298eadf8  kdebase-3.5.9.tar.bz2
+88237188271fbf1e6bcd40180a75d953  kdebase-3.5.10.tar.bz2


--- kdebase-3.5-khotkeys-crash.patch DELETED ---


--- kdebase-3.5.7-kde#83974.patch DELETED ---


--- kdebase-3.5.7-konsolesu.patch DELETED ---


--- kdebase-3.5.8-glibc28-struct-ucred.patch DELETED ---


--- kdebase-3.5.8-konsole-bz#244906.patch DELETED ---


--- kdebase-3.5.9-lmsensors.patch DELETED ---



From kkofler at fedoraproject.org  Thu Sep  4 08:58:51 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 08:58:51 +0000 (UTC)
Subject: rpms/kdegames3/F-9 kdegames-3.5.10-trademarks.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 kdegames3.spec, 1.6, 1.7 sources, 1.3,
	1.4 kdegames-3.5.9-trademarks.patch, 1.1, NONE
Message-ID: <20080904085851.DE84070120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18427/F-9

Modified Files:
	.cvsignore kdegames3.spec sources 
Added Files:
	kdegames-3.5.10-trademarks.patch 
Removed Files:
	kdegames-3.5.9-trademarks.patch 
Log Message:
Sync from devel:

* Fri Aug 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-1
- update to 3.5.10
- update trademarks patch

kdegames-3.5.10-trademarks.patch:

--- NEW FILE kdegames-3.5.10-trademarks.patch ---
diff -ur kdegames-3.5.10/doc/katomic/index.docbook kdegames-3.5.10-trademarks/doc/katomic/index.docbook
--- kdegames-3.5.10/doc/katomic/index.docbook	2006-01-19 17:36:48.000000000 +0100
+++ kdegames-3.5.10-trademarks/doc/katomic/index.docbook	2008-08-29 13:25:56.000000000 +0200
@@ -50,8 +50,8 @@
 <title>Introduction</title>
 <para>
 <application>Atomic Entertainment</application> is a small game which resembles
-<application>Sokoban</application>. The object of the game is to build chemical
-molecules on a <application>Sokoban</application> like board.</para>
+<application>BoxPush</application>. The object of the game is to build chemical
+molecules on a <application>BoxPush</application> like board.</para>
 </chapter>
 
 
diff -ur kdegames-3.5.10/doc/ksokoban/index.docbook kdegames-3.5.10-trademarks/doc/ksokoban/index.docbook
--- kdegames-3.5.10/doc/ksokoban/index.docbook	2006-07-22 10:10:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/doc/ksokoban/index.docbook	2008-08-29 13:25:56.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ksokoban;">
+  <!ENTITY kappname "<application>KBoxPush</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
   <!ENTITY % addindex "IGNORE">
@@ -8,7 +8,7 @@
 	
 <book lang="&language;">
 <bookinfo>
-<title>The &ksokoban; Handbook</title>
+<title>The <application>KBoxPush</application> Handbook</title>
 
 <authorgroup>
 <author>
@@ -33,8 +33,8 @@
 
 <abstract>
 <para>
-&ksokoban; is a &kde; implementation of the Japanese warehouse keeper
-game <quote>sokoban</quote>.
+<application>KBoxPush</application> is a &kde; implementation of the Japanese warehouse keeper
+box pushing game.
 </para>
 </abstract>
 
@@ -42,8 +42,8 @@
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
 <keyword>game</keyword>
-<keyword>sokoban</keyword>
-<keyword>ksokoban</keyword>
+<keyword>boxpush</keyword>
+<keyword>kboxpush</keyword>
 </keywordset>
 </bookinfo>
 
@@ -51,8 +51,8 @@
 <title>Introduction</title>
 
 <para>
-The first sokoban game was created in 1982 by Hiroyuki Imabayashi at
-the Japanese company Thinking Rabbit, Inc.  <quote>Sokoban</quote> is
+The first BoxPush game was created in 1982 by Hiroyuki Imabayashi at
+the Japanese company Thinking Rabbit, Inc.  The original name is
 japanese for <quote>warehouse keeper</quote>.  The idea is that you
 are a warehouse keeper trying to push crates to their proper locations
 in a warehouse.
@@ -72,7 +72,7 @@
 
 <para>
 To make the game more fun for small kids (below 10 years or so), some
-collections with easier levels are also included in &ksokoban;. These
+collections with easier levels are also included in <application>KBoxPush</application>. These
 are marked <emphasis>(easy)</emphasis> in the level collection menu.
 Of course, these levels can be fun for adults too, for example if you
 don't want to expose yourself to too much mental strain.
@@ -138,11 +138,11 @@
 <title>Loading external levels</title>
 
 <para>
-&ksokoban; has the ability to load external sokoban levels from text
+<application>KBoxPush</application> has the ability to load external levels from text
 files.  You can load levels using the menu entry
 <menuchoice><guimenu>Game</guimenu> <guimenuitem>Load
 Levels...</guimenuitem> </menuchoice>, or by specifying the level file
-&URL; as a command line argument when starting &ksokoban; from a
+&URL; as a command line argument when starting <application>KBoxPush</application> from a
 shell.
 </para>
 
@@ -193,7 +193,7 @@
 <chapter id="menu-reference">
 <title>Menu Reference</title>
 
-<para>This is a complete guide to the menus of &ksokoban;.</para>
+<para>This is a complete guide to the menus of <application>KBoxPush</application>.</para>
 
 <sect1 id="game-menu">
 <title>The <guimenu>Game</guimenu> Menu</title>
@@ -250,7 +250,7 @@
 <guisubmenu>Level Collection</guisubmenu>
 </menuchoice></term>
 <listitem>
-<para><action>Change to a different set of levels.</action> &ksokoban;
+<para><action>Change to a different set of levels.</action> <application>KBoxPush</application>
 comes with several level sets, and you can load more that you can find
 on the internet.</para>
 </listitem>
@@ -286,7 +286,7 @@
 <guimenuitem>Quit</guimenuitem>
 </menuchoice></term>
 <listitem>
-<para><action>Exit</action> &ksokoban;.</para>
+<para><action>Exit</action> <application>KBoxPush</application>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -354,7 +354,7 @@
 <guisubmenu>Set Bookmark</guisubmenu>
 </menuchoice></term>
 <listitem>
-<para>&ksokoban; allows you to <action>set bookmarks with a level at a
+<para><application>KBoxPush</application> allows you to <action>set bookmarks with a level at a
 particular state.</action> You might use this to save yourself
 repeating the same initial steps in a level.</para>
 <para>You can have up to ten bookmarks at a time, and access them via the
@@ -389,9 +389,9 @@
 <title>Credits and License</title>
 
 <para>
-&ksokoban; is copyright &copy; 1998-2000 by &Anders.Widell;
+<application>KBoxPush</application> is copyright &copy; 1998-2000 by &Anders.Widell;
 &Anders.Widell.mail;.  For
-the latest info on &ksokoban;, see the &ksokoban; home page at
+the latest info on <application>KBoxPush</application>, see the <application>KBoxPush</application> home page at
 <ulink url="http://hem.passagen.se/awl/ksokoban/">
 http://hem.passagen.se/awl/ksokoban/</ulink>
 </para>
@@ -404,8 +404,8 @@
 </para>
 
 <para>
-All the currently included sokoban levels were created by David W.
-Skinner <email>sasquatch at bentonrea.com</email>. See his sokoban page
+All the currently included levels were created by David W.
+Skinner <email>sasquatch at bentonrea.com</email>. See his page
 at <ulink url="http://users.bentonrea.com/~sasquatch/sokoban/">
 http://users.bentonrea.com/~sasquatch/sokoban/</ulink>
 </para>
diff -ur kdegames-3.5.10/doc/ktron/index.docbook kdegames-3.5.10-trademarks/doc/ktron/index.docbook
--- kdegames-3.5.10/doc/ktron/index.docbook	2006-07-22 10:10:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/doc/ktron/index.docbook	2008-08-29 13:25:56.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ktron;">
+  <!ENTITY kappname "<application>KSnakeDuel</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
@@ -8,7 +8,7 @@
 
 <book lang="&language;">
 <bookinfo>
-<title>The &ktron; Handbook</title>
+<title>The <application>KSnakeDuel</application> Handbook</title>
 
 <authorgroup>
 <author>
@@ -57,7 +57,7 @@
 
 <abstract>
 <para>
-&ktron; is a simple <quote>Tron</quote> clone for &kde;, which you can
+<application>KSnakeDuel</application> is a simple <quote>SnakeDuel</quote> clone for &kde;, which you can
 play alone or against a friend.
 </para>
 </abstract>
@@ -65,9 +65,9 @@
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>KTron</keyword>
+<keyword>KSnakeDuel</keyword>
 <keyword>game</keyword>
-<keyword>tron</keyword>
+<keyword>snakeduel</keyword>
 </keywordset>
 </bookinfo>
 
@@ -75,9 +75,9 @@
 <title>Introduction</title>
 
 <para>
-&ktron; is a simple Tron-Clone for the
+<application>KSnakeDuel</application> is a simple SnakeDuel-Clone for the
 <ulink url="http://www.kde.org">K Desktop Environment</ulink>. You can play
-&ktron; against the computer or a friend.
+<application>KSnakeDuel</application> against the computer or a friend.
 </para>
 
 <para>
@@ -88,7 +88,7 @@
 </chapter>
 
 <chapter id="playing-ktron">
-<title>Playing &ktron;</title>
+<title>Playing <application>KSnakeDuel</application></title>
 
 <sect1 id="playing-ktron-rules">
 <title>Rules</title>
@@ -353,7 +353,7 @@
 </row>
 <row>
 <entry><keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo></entry>
-<entry>Quit &ktron;</entry>
+<entry>Quit <application>KSnakeDuel</application></entry>
 </row>
 <row>
 <entry><keycap>F1</keycap></entry>
@@ -395,7 +395,7 @@
 <varlistentry>
 <term><guilabel>Show winner by changing color</guilabel></term>
 <listitem><para>Enable this box to improve visualizing that the game is over
-by making &ktron; change the color of the loser's trail to the color of
+by making <application>KSnakeDuel</application> change the color of the loser's trail to the color of
 the winner.</para></listitem>
 </varlistentry>
 
@@ -508,7 +508,7 @@
 <title>Credits and License</title>
 
 <para>
-&ktron; 
+<application>KSnakeDuel</application> 
 </para>
 <para>Program Copyright 1999 &Matthias.Kiefer;
 &Matthias.Kiefer.mail;
@@ -538,7 +538,7 @@
 <title>Installation</title>
 
 <sect1 id="getting-ktron">
-<title>How to obtain &ktron;</title>
+<title>How to obtain <application>KSnakeDuel</application></title>
 
 &install.intro.documentation;
 
@@ -548,8 +548,8 @@
 <title>Requirements</title>
 
 <para>
-In order to successfully compile &ktron;, you need &kde; 3.0. All
-required libraries as well as &ktron; itself can be found on &kde-ftp;.</para>
+In order to successfully compile <application>KSnakeDuel</application>, you need &kde; 3.0. All
+required libraries as well as <application>KSnakeDuel</application> itself can be found on &kde-ftp;.</para>
 </sect1>
 
 <sect1 id="compilation">
diff -ur kdegames-3.5.10/katomic/katomic.desktop kdegames-3.5.10-trademarks/katomic/katomic.desktop
--- kdegames-3.5.10/katomic/katomic.desktop	2008-08-19 20:12:02.000000000 +0200
+++ kdegames-3.5.10-trademarks/katomic/katomic.desktop	2008-08-29 13:25:56.000000000 +0200
@@ -20,54 +20,54 @@
 Type=Application
 Exec=katomic %i %m -caption "%c"
 DocPath=katomic/index.html
-GenericName=Sokoban-like Logic Game
-GenericName[be]=???????????????? ???????????? ???????? Sokoban
+GenericName=BoxPush-like Logic Game
+GenericName[be]=???????????????? ???????????? ???????? BoxPush
 GenericName[bg]=?????????????????? ???????? ?? ??????????
 GenericName[bn]=?????????????????????-?????? ?????? ????????????????????? ????????????
-GenericName[bs]=Logi??ka igra nalik na Sokoban
-GenericName[ca]=Joc de l??gica similar al Sokoban
-GenericName[cs]=Logick?? hra jako Sokoban
-GenericName[cy]=G??m Resymeg sy'n debyg i Sokoban
-GenericName[da]=Sokoban-lignende logisk spil
-GenericName[de]=Logikspiel (??hnlich Sokoban)
-GenericName[el]=???????????????? ?????????????? ???????????????? ???? ???? Sokoban
-GenericName[eo]=Logikludo simila al Sokoban
-GenericName[es]=Juego de l??gica similar al Sokoban
-GenericName[et]=Sokobani moodi loogikam??ng
-GenericName[eu]=Sokoban-en antzeko joko logikoa
-GenericName[fi]=Sokoban-tyylinen Logiikkapeli
-GenericName[fr]=Jeu de logique dans le style de Sokoban
-GenericName[ga]=Cluiche Loighce Mar Sokoban
-GenericName[he]=?????????? Sokoban, ???????? ????????
-GenericName[hr]=Logi??ka igra poput Sokobana
-GenericName[hu]=Sokoban-szer?? logikai
-GenericName[is]=Leikur sem l??kist Sokoban
-GenericName[it]=Gioco di logica simile a Sokoban
+GenericName[bs]=Logi??ka igra nalik na BoxPush
+GenericName[ca]=Joc de l??gica similar al BoxPush
+GenericName[cs]=Logick?? hra jako BoxPush
+GenericName[cy]=G??m Resymeg sy'n debyg i BoxPush
+GenericName[da]=BoxPush-lignende logisk spil
+GenericName[de]=Logikspiel (??hnlich BoxPush)
+GenericName[el]=???????????????? ?????????????? ???????????????? ???? ???? BoxPush
+GenericName[eo]=Logikludo simila al BoxPush
+GenericName[es]=Juego de l??gica similar al BoxPush
+GenericName[et]=BoxPushi moodi loogikam??ng
+GenericName[eu]=BoxPush-en antzeko joko logikoa
+GenericName[fi]=BoxPush-tyylinen Logiikkapeli
+GenericName[fr]=Jeu de logique dans le style de BoxPush
+GenericName[ga]=Cluiche Loighce Mar BoxPush
+GenericName[he]=?????????? BoxPush, ???????? ????????
+GenericName[hr]=Logi??ka igra poput BoxPusha
+GenericName[hu]=BoxPush-szer?? logikai
+GenericName[is]=Leikur sem l??kist BoxPush
+GenericName[it]=Gioco di logica simile a BoxPush
 GenericName[ja]=????????????????????????????????????
-GenericName[km]=?????????????????????????????????????????? Sokoban
+GenericName[km]=?????????????????????????????????????????? BoxPush
 GenericName[ko]=????????? ?????? ?????? ??????
-GenericName[lt]=Sokoban tipo loginis ??aidimas
-GenericName[lv]=Sokoban l??dz??ga lo??isk?? sp??le
+GenericName[lt]=BoxPush tipo loginis ??aidimas
+GenericName[lv]=BoxPush l??dz??ga lo??isk?? sp??le
 GenericName[mk]=?????????????? ???????? ???????????? ???? ??????????????
-GenericName[nb]=Sokoban-lignende logikkspill
-GenericName[nds]=Sokoban-liek Logikspeel
+GenericName[nb]=BoxPush-lignende logikkspill
+GenericName[nds]=BoxPush-liek Logikspeel
 GenericName[ne]=????????????????????? ??????????????? ?????????????????????????????? ?????????
-GenericName[nl]=Sokoban-achtig logisch spel
-GenericName[nn]=Sokoban-liknande logikkspel
-GenericName[pl]=Gra logiczna typu Sokoban
-GenericName[pt]=Jogo de L??gica tipo Sokoban
-GenericName[pt_BR]=Jogo L??gico parecido com Sokoban
+GenericName[nl]=BoxPush-achtig logisch spel
+GenericName[nn]=BoxPush-liknande logikkspel
+GenericName[pl]=Gra logiczna typu BoxPush
+GenericName[pt]=Jogo de L??gica tipo BoxPush
+GenericName[pt_BR]=Jogo L??gico parecido com BoxPush
 GenericName[ru]=???????????????? ??????????
-GenericName[se]=Sokoban-l??gan logihkkaspeallu
-GenericName[sk]=Logick?? hra ako Sokoban
-GenericName[sl]=Logi??na igra podobna Sokobanu
-GenericName[sr]=?????????????? ???????? ?????????? ???? Sokoban
-GenericName[sr at Latn]=Logi??ka igra nalik na Sokoban
-GenericName[sv]=Sokoban-liknande logiskt spel
+GenericName[se]=BoxPush-l??gan logihkkaspeallu
+GenericName[sk]=Logick?? hra ako BoxPush
+GenericName[sl]=Logi??na igra podobna BoxPushu
+GenericName[sr]=?????????????? ???????? ?????????? ???? BoxPush
+GenericName[sr at Latn]=Logi??ka igra nalik na BoxPush
+GenericName[sv]=BoxPush-liknande logiskt spel
 GenericName[ta]=???????????????????????? ??????????????? ?????????????????? ??????????????????????????????
 GenericName[uk]=?????? ???? ???????????? ?????????????? ???? ????????????????
-GenericName[wa]=Djeu di lodjike rishonnant a sokoban
-GenericName[zh_TW]=?????????(sokoban)??????????????????
+GenericName[wa]=Djeu di lodjike rishonnant a BoxPush
+GenericName[zh_TW]=?????????(BoxPush)??????????????????
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;StrategyGame;
diff -ur kdegames-3.5.10/ksokoban/AUTHORS kdegames-3.5.10-trademarks/ksokoban/AUTHORS
--- kdegames-3.5.10/ksokoban/AUTHORS	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/AUTHORS	2008-08-29 13:25:56.000000000 +0200
@@ -1,36 +1,15 @@
 ------------------------------------------------------------------------
-ksokoban is written by:
+KBoxPush is written by:
 
 Anders Widell <awl at hem.passagen.se>
 
 ------------------------------------------------------------------------
-The levels were taken from:
-
-xsokoban 3.3c for X-windows
-	www:	http://xsokoban.lcs.mit.edu/xsokoban.html
-	author:	Andrew Myers <andru at lcs.mit.edu>
-
-MacSokoban 3.0.3 for Macintosh
-	www:	http://www.lysator.liu.se/~ingemar/games.html
-	author:	Ingemar Ragnemalm <ingemar at lysator.liu.se>
-
-Sokoban 2.4 for Macintosh
-	www:	http://members.aol.com/SokobanMac/
-	author:	Scott Lindhurst <scottl at alumni.Princeton.EDU>
-
-------------------------------------------------------------------------
-The levels originally come from:
-
-Original               the 50 original sokoban levels
-                       made by Thinking rabbit Inc. in Japan
-Extra                  some more levels from xsokoban
-Still more             by J. Franklin Mentzer <wryter at aol.com>
-MacTommy inventions    by a guy called Tommy in Pennsylvania
-Yoshio's autogenerated by Yoshio Murase <yoshio at asahi.email.ne.jp>
-                       see http://www.ne.jp/asahi/ai/yoshio/sokoban/main.htm
-For the kids           by Ross (W.R.) Brown <ross at bnr.ca>
-Simple Sokoban         simplified original levels
-		       by Phil Shapiro <pshapiro at his.com>
-Dimitri & Yorick       by Jacques Duthen <duthen at club-internet.fr>
+The included level sets (Sasquatch, Mas Sasquatch, Sasquatch III,
+Sasquatch IV and Microban) are the work of:
+David W. Skinner <sasquatch at bentonrea.com>
+http://users.bentonrea.com/~sasquatch/sokoban/
+From the web page:
+> These sets may be freely distributed provided they remain unchanged
+> and credited with my name and email address.
 
 ------------------------------------------------------------------------
diff -ur kdegames-3.5.10/ksokoban/Bookmark.cpp kdegames-3.5.10-trademarks/ksokoban/Bookmark.cpp
--- kdegames-3.5.10/ksokoban/Bookmark.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/Bookmark.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/Bookmark.h kdegames-3.5.10-trademarks/ksokoban/Bookmark.h
--- kdegames-3.5.10/ksokoban/Bookmark.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/Bookmark.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/data/ksokoban.desktop kdegames-3.5.10-trademarks/ksokoban/data/ksokoban.desktop
--- kdegames-3.5.10/ksokoban/data/ksokoban.desktop	2008-08-19 20:12:03.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/data/ksokoban.desktop	2008-08-29 13:30:09.000000000 +0200
@@ -1,64 +1,64 @@
 [Desktop Entry]
-Name=KSokoban
-Name[af]=Ksokoban
-Name[be]=??????????????
+Name=KBoxPush
+Name[af]=KBoxPush
+Name[be]=KBoxPush
 Name[bn]=??????-?????????????????????
 Name[hi]=??????-?????????????????????
-Name[mk]=????????????????
-Name[nb]=Sokoban
+Name[mk]=KBoxPush
+Name[nb]=KBoxPush
 Name[ne]=??????????????? ?????????????????????
-Name[pl]=Sokoban
-Name[sv]=Ksokoban
-Name[ta]=K???????????????????????? 
-Name[tg]=K??????????????
-Name[zh_TW]=KSokoban ?????????
-Name[zu]=I-KSokoban
-GenericName=Sokoban Game
-GenericName[be]=???????????? ??????????????
+Name[pl]=KBoxPush
+Name[sv]=KBoxPush
+Name[ta]=KBoxPush
+Name[tg]=KBoxPush
+Name[zh_TW]=KBoxPush ?????????
+Name[zu]=I-KBoxPush
+GenericName=BoxPush Game
+GenericName[be]=???????????? BoxPush
 GenericName[bg]=?????????????????? ????????
 GenericName[bn]=????????????????????? ????????????
-GenericName[bs]=Igra Sokoban
-GenericName[ca]=Joc Sokoban
-GenericName[cs]=Hra Sokoban
-GenericName[cy]=G??m Sokoban
-GenericName[da]=Sokoban spil
-GenericName[de]=Sokoban Spiel
-GenericName[el]=???????????????? Sokoban
-GenericName[eo]=Sokobana ludo
-GenericName[es]=Juego Sokoban
-GenericName[et]=Sokoban
-GenericName[eu]=Sokoban jokoa
-GenericName[fa]=???????? Sokoban
-GenericName[fi]=Sokoban
-GenericName[fr]=Jeu Sokoban
-GenericName[ga]=Cluiche Sokoban
-GenericName[he]=???????? Sokoban
-GenericName[hr]=Sokoban
-GenericName[hu]=Sokoban
-GenericName[is]=Sokoban leikur
-GenericName[it]=Gioco del Sokoban
+GenericName[bs]=Igra BoxPush
+GenericName[ca]=Joc BoxPush
+GenericName[cs]=Hra BoxPush
+GenericName[cy]=G??m BoxPush
+GenericName[da]=BoxPush spil
+GenericName[de]=BoxPush Spiel
+GenericName[el]=???????????????? BoxPush
+GenericName[eo]=BoxPusha ludo
+GenericName[es]=Juego BoxPush
+GenericName[et]=BoxPush
+GenericName[eu]=BoxPush jokoa
+GenericName[fa]=???????? BoxPush
+GenericName[fi]=BoxPush
+GenericName[fr]=Jeu BoxPush
+GenericName[ga]=Cluiche BoxPush
+GenericName[he]=???????? BoxPush
+GenericName[hr]=BoxPush
+GenericName[hu]=BoxPush
+GenericName[is]=BoxPush leikur
+GenericName[it]=Gioco del BoxPush
 GenericName[ja]=??????????????????
 GenericName[km]=???????????????????????????????????????
-GenericName[lt]=Sokoban ??aidimas
-GenericName[lv]=Sokoban sp??le
-GenericName[mk]=???????? ??????????????
-GenericName[nb]=Sokoban-spill
-GenericName[nds]=Sokoban-Speel
+GenericName[lt]=BoxPush ??aidimas
+GenericName[lv]=BoxPush sp??le
+GenericName[mk]=???????? BoxPush
+GenericName[nb]=BoxPush-spill
+GenericName[nds]=BoxPush-Speel
 GenericName[ne]=????????????????????? ?????????
-GenericName[nl]=Sokobanspel
-GenericName[nn]=Sokoban-spel
-GenericName[pl]=Sokoban
-GenericName[pt]=Jogo de Sokoban
-GenericName[pt_BR]=Jogo de Sokoban
-GenericName[ru]=??????????????
-GenericName[se]=Sokoban-speallu
-GenericName[sk]=Hra Sokoban
-GenericName[sl]=Igra Sokobana
-GenericName[sr]=???????? Sokoban-??
-GenericName[sr at Latn]=Igra Sokoban-a
-GenericName[sv]=Sokoban-spel
+GenericName[nl]=BoxPushspel
+GenericName[nn]=BoxPush-spel
+GenericName[pl]=BoxPush
+GenericName[pt]=Jogo de BoxPush
+GenericName[pt_BR]=Jogo de BoxPush
+GenericName[ru]=BoxPush
+GenericName[se]=BoxPush-speallu
+GenericName[sk]=Hra BoxPush
+GenericName[sl]=Igra BoxPusha
+GenericName[sr]=???????? BoxPush-??
+GenericName[sr at Latn]=Igra BoxPush-a
+GenericName[sv]=BoxPush-spel
 GenericName[ta]=???????????????????????? ??????????????????????????????
-GenericName[uk]=?????? Sokoban
+GenericName[uk]=?????? BoxPush
 GenericName[zh_TW]=???????????????
 DocPath=ksokoban/index.html
 Exec=ksokoban %i %m -caption "%c"
diff -ur kdegames-3.5.10/ksokoban/History.cpp kdegames-3.5.10-trademarks/ksokoban/History.cpp
--- kdegames-3.5.10/ksokoban/History.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/History.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/History.h kdegames-3.5.10-trademarks/ksokoban/History.h
--- kdegames-3.5.10/ksokoban/History.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/History.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/HtmlPrinter.cpp kdegames-3.5.10-trademarks/ksokoban/HtmlPrinter.cpp
--- kdegames-3.5.10/ksokoban/HtmlPrinter.cpp	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/HtmlPrinter.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -81,7 +81,7 @@
   printf ("\
 <html>\n\
 <head>\n\
-<title>ksokoban level</title>\n\
+<title>KBoxPush level</title>\n\
 </head>\n\
 <body background=background.gif>\n\
 ");
diff -ur kdegames-3.5.10/ksokoban/ImageData.cpp kdegames-3.5.10-trademarks/ksokoban/ImageData.cpp
--- kdegames-3.5.10/ksokoban/ImageData.cpp	2007-05-14 09:39:12.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/ImageData.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/ImageData.h kdegames-3.5.10-trademarks/ksokoban/ImageData.h
--- kdegames-3.5.10/ksokoban/ImageData.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/ImageData.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/InternalCollections.h kdegames-3.5.10-trademarks/ksokoban/InternalCollections.h
--- kdegames-3.5.10/ksokoban/InternalCollections.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/InternalCollections.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998-2000  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/LevelCollection.h kdegames-3.5.10-trademarks/ksokoban/LevelCollection.h
--- kdegames-3.5.10/ksokoban/LevelCollection.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/LevelCollection.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998,1999  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/LevelMap.cpp kdegames-3.5.10-trademarks/ksokoban/LevelMap.cpp
--- kdegames-3.5.10/ksokoban/LevelMap.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/LevelMap.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/LevelMap.h kdegames-3.5.10-trademarks/ksokoban/LevelMap.h
--- kdegames-3.5.10/ksokoban/LevelMap.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/LevelMap.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/main.cpp kdegames-3.5.10-trademarks/ksokoban/main.cpp
--- kdegames-3.5.10/ksokoban/main.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/main.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998-2000  Anders Widell  <awl at passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -42,7 +42,7 @@
 int
 main (int argc, char **argv)
 {
-  KAboutData aboutData("ksokoban", I18N_NOOP("KSokoban"),
+  KAboutData aboutData("ksokoban", I18N_NOOP("KBoxPush"),
 		       version, description, KAboutData::License_GPL,
 		       "(c) 1998-2001  Anders Widell", 0,
 		       "http://hem.passagen.se/awl/ksokoban/");
@@ -50,7 +50,7 @@
 		      "awl at passagen.se",
 		      "http://hem.passagen.se/awl/");
   aboutData.addCredit("David W. Skinner",
-		      I18N_NOOP("For contributing the Sokoban levels included in this game"),
+		      I18N_NOOP("For contributing the BoxPush levels included in this game"),
 		      "sasquatch at bentonrea.com",
 		      "http://users.bentonrea.com/~sasquatch/");
   KCmdLineArgs::init(argc, argv, &aboutData);
diff -ur kdegames-3.5.10/ksokoban/MainWindow.cpp kdegames-3.5.10-trademarks/ksokoban/MainWindow.cpp
--- kdegames-3.5.10/ksokoban/MainWindow.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/MainWindow.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/MainWindow.h kdegames-3.5.10-trademarks/ksokoban/MainWindow.h
--- kdegames-3.5.10/ksokoban/MainWindow.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/MainWindow.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/Map.cpp kdegames-3.5.10-trademarks/ksokoban/Map.cpp
--- kdegames-3.5.10/ksokoban/Map.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/Map.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/MapDelta.cpp kdegames-3.5.10-trademarks/ksokoban/MapDelta.cpp
--- kdegames-3.5.10/ksokoban/MapDelta.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/MapDelta.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/MapDelta.h kdegames-3.5.10-trademarks/ksokoban/MapDelta.h
--- kdegames-3.5.10/ksokoban/MapDelta.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/MapDelta.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/Map.h kdegames-3.5.10-trademarks/ksokoban/Map.h
--- kdegames-3.5.10/ksokoban/Map.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/Map.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/ModalLabel.cpp kdegames-3.5.10-trademarks/ksokoban/ModalLabel.cpp
--- kdegames-3.5.10/ksokoban/ModalLabel.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/ModalLabel.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/ModalLabel.h kdegames-3.5.10-trademarks/ksokoban/ModalLabel.h
--- kdegames-3.5.10/ksokoban/ModalLabel.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/ModalLabel.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/Move.cpp kdegames-3.5.10-trademarks/ksokoban/Move.cpp
--- kdegames-3.5.10/ksokoban/Move.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/Move.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/Move.h kdegames-3.5.10-trademarks/ksokoban/Move.h
--- kdegames-3.5.10/ksokoban/Move.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/Move.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/MoveSequence.cpp kdegames-3.5.10-trademarks/ksokoban/MoveSequence.cpp
--- kdegames-3.5.10/ksokoban/MoveSequence.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/MoveSequence.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/MoveSequence.h kdegames-3.5.10-trademarks/ksokoban/MoveSequence.h
--- kdegames-3.5.10/ksokoban/MoveSequence.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/MoveSequence.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/NEWS kdegames-3.5.10-trademarks/ksokoban/NEWS
--- kdegames-3.5.10/ksokoban/NEWS	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/NEWS	2008-08-29 13:25:56.000000000 +0200
@@ -52,17 +52,17 @@
 * Internationalisation
 
 -------------------------------------------------------------------------------
-version 0.1.2: ksokoban imported to CVS. Date 1998-08-30
+version 0.1.2: imported to CVS. Date 1998-08-30
 
 -------------------------------------------------------------------------------
 version 0.1.1: bugfix release. Date 1998-08-25
 
-* BUGFIX: ksokoban now ignores mouseclicks while a move is in progress.
+* BUGFIX: now ignores mouseclicks while a move is in progress.
 	  Previously such a click would cause a memory leak and a corrupted
 	  undo/redo history (or a failed assertion if debugging was turned on).
 	  Thanks to Natali Giuliano <natali at stone.trew.it> for reporting this.
 
-* ksokoban should now work with older zlib & Qt libraries.
+* should now work with older zlib & Qt libraries.
   I have tested it with zlib 1.0.3 and Qt 1.33
 
 * Detects the old gcc 2.7 and turns off optimisations if it is found.
diff -ur kdegames-3.5.10/ksokoban/PathFinder.cpp kdegames-3.5.10-trademarks/ksokoban/PathFinder.cpp
--- kdegames-3.5.10/ksokoban/PathFinder.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/PathFinder.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/PathFinder.h kdegames-3.5.10-trademarks/ksokoban/PathFinder.h
--- kdegames-3.5.10/ksokoban/PathFinder.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/PathFinder.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/PlayField.cpp kdegames-3.5.10-trademarks/ksokoban/PlayField.cpp
--- kdegames-3.5.10/ksokoban/PlayField.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/PlayField.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/PlayField.h kdegames-3.5.10-trademarks/ksokoban/PlayField.h
--- kdegames-3.5.10/ksokoban/PlayField.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/PlayField.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/Queue.h kdegames-3.5.10-trademarks/ksokoban/Queue.h
--- kdegames-3.5.10/ksokoban/Queue.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/Queue.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/README kdegames-3.5.10-trademarks/ksokoban/README
--- kdegames-3.5.10/ksokoban/README	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/README	2008-08-29 13:25:56.000000000 +0200
@@ -1,12 +1,12 @@
-ksokoban 0.2.2 - a Sokoban game for KDE
+KBoxPush 0.2.2 - a BoxPush game for KDE
 
 copyright 1998 Anders Widell  <d95-awi at nada.kth.se>
 
-ksokoban is free software; you can redistribute it and/or modify it
+KBoxPush is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License. See the file
 COPYING for details.
 
-See http://hem.passagen.se/awl/ksokoban/ for later versions of ksokoban.
+See http://hem.passagen.se/awl/ksokoban/ for later versions of KBoxPush.
 See the file AUTHORS for details about where the levels come from.
 
 ------------------------------------------------------------------------
diff -ur kdegames-3.5.10/ksokoban/StaticImage.cpp kdegames-3.5.10-trademarks/ksokoban/StaticImage.cpp
--- kdegames-3.5.10/ksokoban/StaticImage.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/StaticImage.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/StaticImage.h kdegames-3.5.10-trademarks/ksokoban/StaticImage.h
--- kdegames-3.5.10/ksokoban/StaticImage.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/StaticImage.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ktron/ktron.cpp kdegames-3.5.10-trademarks/ktron/ktron.cpp
--- kdegames-3.5.10/ktron/ktron.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/ktron.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /* ****************************************************************************
-   This file is part of the game 'KTron'
+   This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -42,10 +42,10 @@
 /**
  * Constuctor
  */ 
-KTron::KTron(QWidget *parent, const char *name) : KMainWindow(parent, name) {
+KSnakeDuel::KSnakeDuel(QWidget *parent, const char *name) : KMainWindow(parent, name) {
   playerPoints[0]=playerPoints[1]=0;
 
-  tron=new Tron(this, "Tron");
+  tron=new SnakeDuel(this, "SnakeDuel");
   connect(tron,SIGNAL(gameEnds(Player)),SLOT(changeStatus(Player)));
   setCentralWidget(tron);
   tron->setMinimumSize(200,180);
@@ -54,7 +54,7 @@
   statusBar()->insertItem("abcdefghijklmnopqrst: 0  ",ID_STATUS_BASE+1);
   statusBar()->insertItem("abcdefghijklmnopqrst: 0  ",ID_STATUS_BASE+2);
 
-  // We match up keyboard events ourselves in Tron::keyPressEvent()
+  // We match up keyboard events ourselves in SnakeDuel::keyPressEvent()
   // We must disable the actions, otherwise we don't get the keyPressEvent's
   KAction *act;
   act = new KAction(i18n("Player 1 Up"), Key_R, 0, 0, actionCollection(), "Pl1Up");
@@ -90,7 +90,7 @@
   loadSettings();
 }
 
-void KTron::loadSettings() {
+void KSnakeDuel::loadSettings() {
    playerName[0]=Settings::namePlayer1();
    if ( playerName[0].isEmpty() )
        playerName[0] = i18n("Player 1");
@@ -101,7 +101,7 @@
    updateStatusbar();
 }
 
-void KTron::updateStatusbar(){
+void KSnakeDuel::updateStatusbar(){
   for(int i=0;i<2;i++){
     Player player;
     player=(i==0?One:Two);
@@ -118,7 +118,7 @@
   }
 }
 
-void KTron::changeStatus(Player player) {
+void KSnakeDuel::changeStatus(Player player) {
   // if player=Nobody, then new game
   if(player==Nobody){
     playerPoints[0]=playerPoints[1]=0;
@@ -143,18 +143,18 @@
     showWinner(Two);
 }
 
-void KTron::showWinner(Player winner){
+void KSnakeDuel::showWinner(Player winner){
   if(tron->isComputer(Both) || (winner != One && winner != Two))
     return;
 
-  QString loserName = i18n("KTron");
+  QString loserName = i18n("KSnakeDuel");
   int loser = Two;
   if(winner == Two)
     loser = One;
   if(!tron->isComputer(((Player)loser)))
     loserName = playerName[loser];
   
-  QString winnerName = i18n("KTron");
+  QString winnerName = i18n("KSnakeDuel");
   if(!tron->isComputer(winner))
     winnerName = playerName[winner];
   
@@ -169,7 +169,7 @@
   tron->newGame();
 }
 
-void KTron::paletteChange(const QPalette &/*oldPalette*/){
+void KSnakeDuel::paletteChange(const QPalette &/*oldPalette*/){
    update();
    tron->updatePixmap();
    tron->update();
@@ -178,7 +178,7 @@
 /**
  * Show Settings dialog.
  */
-void KTron::showSettings(){
+void KSnakeDuel::showSettings(){
   if(KConfigDialog::showDialog("settings"))
     return;
   
diff -ur kdegames-3.5.10/ktron/ktron.desktop kdegames-3.5.10-trademarks/ktron/ktron.desktop
--- kdegames-3.5.10/ktron/ktron.desktop	2008-08-19 20:12:02.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/ktron.desktop	2008-08-29 13:25:56.000000000 +0200
@@ -3,64 +3,64 @@
 Exec=ktron -caption "%c" %i %m
 Icon=ktron
 DocPath=ktron/index.html
-GenericName=Tron-like Game
-GenericName[be]=???????????? ????????
+GenericName=SnakeDuel-like Game
+GenericName[be]=???????????? SnakeDuel
 GenericName[bg]=?????????????????? ????????
 GenericName[bn]=????????????-??????????????? ????????????
-GenericName[br]=C'hoari doare Tron
-GenericName[bs]=Igra nalik na Tron
-GenericName[ca]=Joc a l'estil Tron
-GenericName[cs]=Hra podobn?? Tronu
-GenericName[cy]=G??m sy'n debyg i Tron
-GenericName[da]=Tron-lignende spil
-GenericName[de]=Tron-??hnliches Spiel
-GenericName[el]=???????????????? ???????????????? ???? ???? Tron
-GenericName[eo]="Tron"-simila ludo
-GenericName[es]=Juego similar a Tron
-GenericName[et]=Tron
-GenericName[eu]=Tron-en antzeko jokoa
-GenericName[fa]=???????? ????????Tron
-GenericName[fi]=Tron-tyylinen peli
-GenericName[fr]=Jeu dans le style de Tron
-GenericName[he]=???????? ?????????? Tron
-GenericName[hr]=Igra poput Trona
-GenericName[hu]=Tron-szer??
-GenericName[is]=Leikur sem l??kist Tron
-GenericName[it]=Gioco simile a Tron
+GenericName[br]=C'hoari doare SnakeDuel
+GenericName[bs]=Igra nalik na SnakeDuel
+GenericName[ca]=Joc a l'estil SnakeDuel
+GenericName[cs]=Hra podobn?? SnakeDuelu
+GenericName[cy]=G??m sy'n debyg i SnakeDuel
+GenericName[da]=SnakeDuel-lignende spil
+GenericName[de]=SnakeDuel-??hnliches Spiel
+GenericName[el]=???????????????? ???????????????? ???? ???? SnakeDuel
+GenericName[eo]="SnakeDuel"-simila ludo
+GenericName[es]=Juego similar a SnakeDuel
+GenericName[et]=SnakeDuel
+GenericName[eu]=SnakeDuel-en antzeko jokoa
+GenericName[fa]=???????? ????????SnakeDuel
+GenericName[fi]=SnakeDuel-tyylinen peli
+GenericName[fr]=Jeu dans le style de SnakeDuel
+GenericName[he]=???????? ?????????? SnakeDuel
+GenericName[hr]=Igra poput SnakeDuela
+GenericName[hu]=SnakeDuel-szer??
+GenericName[is]=Leikur sem l??kist SnakeDuel
+GenericName[it]=Gioco simile a SnakeDuel
 GenericName[ja]=??????????????????????????????
-GenericName[km]=??????????????????????????? Tron
-GenericName[lv]=Tron l??dz??ga sp??le
-GenericName[mk]=???????? ???????????? ???? Tron
-GenericName[nb]=Tron-lignende spill
-GenericName[nds]=Tron-liek Speel
+GenericName[km]=??????????????????????????? SnakeDuel
+GenericName[lv]=SnakeDuel l??dz??ga sp??le
+GenericName[mk]=???????? ???????????? ???? SnakeDuel
+GenericName[nb]=SnakeDuel-lignende spill
+GenericName[nds]=SnakeDuel-liek Speel
 GenericName[ne]=??????????????? ??????????????? ?????????
-GenericName[nl]=Tron-achtig spel
-GenericName[nn]=Tron-liknande spel
-GenericName[pl]=Gra typu Tron
-GenericName[pt]=Jogo tipo Tron
-GenericName[pt_BR]=Jogo parecido com Tron
-GenericName[ru]=????????
-GenericName[se]=Tron-l??gan speallu
-GenericName[sk]=Hra typu Tron
-GenericName[sl]=Igra podobna Tronu
-GenericName[sr]=???????? ?????????? ???? Tron
-GenericName[sr at Latn]=Igra nalik na Tron
-GenericName[sv]=Tron-liknande spel
+GenericName[nl]=SnakeDuel-achtig spel
+GenericName[nn]=SnakeDuel-liknande spel
+GenericName[pl]=Gra typu SnakeDuel
+GenericName[pt]=Jogo tipo SnakeDuel
+GenericName[pt_BR]=Jogo parecido com SnakeDuel
+GenericName[ru]=SnakeDuel
+GenericName[se]=SnakeDuel-l??gan speallu
+GenericName[sk]=Hra typu SnakeDuel
+GenericName[sl]=Igra podobna SnakeDuelu
+GenericName[sr]=???????? ?????????? ???? SnakeDuel
+GenericName[sr at Latn]=Igra nalik na SnakeDuel
+GenericName[sv]=SnakeDuel-liknande spel
 GenericName[ta]=?????????????????? ??????????????? ??????????????????????????????
-GenericName[uk]=?????? ?????????? ???? ?????? "????????"
-GenericName[zh_TW]=?????? Tron ??????
+GenericName[uk]=?????? ?????????? ???? ?????? "SnakeDuel"
+GenericName[zh_TW]=?????? SnakeDuel ??????
 Terminal=false
-Name=KTron
-Name[af]=Ktron
-Name[be]=????????
+Name=KSnakeDuel
+Name[af]=KSnakeDuel
+Name[be]=KSnakeDuel
 Name[bn]=??????-????????????
 Name[hi]=??????-???????????????
-Name[nb]=Tron
+Name[nb]=KSnakeDuel
 Name[ne]=??????????????? ???????????????
-Name[sv]=Ktron
+Name[sv]=KSnakeDuel
 Name[ta]=K??????????????????
-Name[tg]=K????????
-Name[zu]=I-KTron
+Name[tg]=KSnakeDuel
+Name[zu]=I-KSnakeDuel
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;ArcadeGame;
diff -ur kdegames-3.5.10/ktron/ktron.h kdegames-3.5.10-trademarks/ktron/ktron.h
--- kdegames-3.5.10/ktron/ktron.h	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/ktron.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /* ***************************************************************************
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -31,21 +31,21 @@
 
 class KAccel;
 class KSelectAction;
-class Tron;
+class SnakeDuel;
 
 /**
- * @short The main window of KTron
+ * @short The main window of KSnakeDuel
  */
-class KTron : public KMainWindow {
+class KSnakeDuel : public KMainWindow {
 
 Q_OBJECT
 
 public:
-  KTron(QWidget *parent=0, const char *name=0);
+  KSnakeDuel(QWidget *parent=0, const char *name=0);
 
 private:
   KAccel *accel;
-  Tron *tron;
+  SnakeDuel *tron;
   QString playerName[2];
   int playerPoints[2];
   void updateStatusbar();
diff -ur kdegames-3.5.10/ktron/main.cpp kdegames-3.5.10-trademarks/ktron/main.cpp
--- kdegames-3.5.10/ktron/main.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/main.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /******************************************************************************
-   This file is part of the game 'KTron'
+   This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -34,7 +34,7 @@
 
 int main(int argc, char* argv[])
 {
-  KAboutData aboutData( "ktron", I18N_NOOP("KTron"), 
+  KAboutData aboutData( "ktron", I18N_NOOP("KSnakeDuel"), 
     KTRON_VERSION, description, KAboutData::License_GPL, notice);
   aboutData.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"), "matthias.kiefer at gmx.de");
   aboutData.addAuthor("Benjamin Meyer",I18N_NOOP("Various improvements"), "ben+ktron at meyerhome.net");
@@ -47,10 +47,10 @@
   KImageIO::registerFormats();
 
   if(a.isRestored()){
-     RESTORE(KTron)
+     RESTORE(KSnakeDuel)
   }
   else {
-     KTron *ktron = new KTron();
+     KSnakeDuel *ktron = new KSnakeDuel();
      a.setMainWidget(ktron);
      ktron->show();
   }
diff -ur kdegames-3.5.10/ktron/player.cpp kdegames-3.5.10-trademarks/ktron/player.cpp
--- kdegames-3.5.10/ktron/player.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/player.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /********************************************************************************** 
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
diff -ur kdegames-3.5.10/ktron/player.h kdegames-3.5.10-trademarks/ktron/player.h
--- kdegames-3.5.10/ktron/player.h	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/player.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /* ********************************************************************************
-  This file is part of the kde-game 'KTron'
+  This file is part of the kde-game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
diff -ur kdegames-3.5.10/ktron/README kdegames-3.5.10-trademarks/ktron/README
--- kdegames-3.5.10/ktron/README	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/README	2008-08-29 13:25:56.000000000 +0200
@@ -1,6 +1,6 @@
 Hello!
 
-KTron is a simple tron-clone for the K Desktop Environment.
+KSnakeDuel is a simple snake duel game for the K Desktop Environment.
 I think it's just nothing to say about the game:
 avoid running into walls, your own tail, and that of your opponent.
 
@@ -14,15 +14,15 @@
 
 Copyright:
 
-KTron
+KSnakeDuel
 
 Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
-KTron is free software; you can redistribute it and/or modify	
+KSnakeDuel is free software; you can redistribute it and/or modify	
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 or any later version.
 
-KTron is distributed in the hope that it will be useful,
+KSnakeDuel is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
diff -ur kdegames-3.5.10/ktron/TODO kdegames-3.5.10-trademarks/ktron/TODO
--- kdegames-3.5.10/ktron/TODO	2005-09-10 10:18:12.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/TODO	2008-08-29 13:25:56.000000000 +0200
@@ -1,8 +1,8 @@
-KTron in general does everything I wanted it to do. :-)
+KSnakeDuel in general does everything I wanted it to do. :-)
 
 Plans for the future are:
 - possibility to create, load, save playfield with walls
-- real cool would be to play KTron over the internet
+- real cool would be to play KSnakeDuel over the internet
 
 ------------------
 Matthias Kiefer
diff -ur kdegames-3.5.10/ktron/tron.cpp kdegames-3.5.10-trademarks/ktron/tron.cpp
--- kdegames-3.5.10/ktron/tron.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/tron.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /****************************************************************************
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -41,7 +41,7 @@
  * init-functions
  **/
 
-Tron::Tron(QWidget *parent,const char *name)
+SnakeDuel::SnakeDuel(QWidget *parent,const char *name)
   : QWidget(parent,name)
 {
   pixmap=0;
@@ -63,7 +63,7 @@
   QTimer::singleShot(15000, this,SLOT(showBeginHint()));
 }
 
-void Tron::loadSettings(){
+void SnakeDuel::loadSettings(){
   setPalette(Settings::color_Background());
 
   // Size
@@ -107,7 +107,7 @@
   setComputerplayer(Two, Settings::computerplayer2());
 }
 
-Tron::~Tron()
+SnakeDuel::~SnakeDuel()
 {
   if(playfield)
     {
@@ -119,7 +119,7 @@
 
 }
 
-void Tron::createNewPlayfield()
+void SnakeDuel::createNewPlayfield()
 {
   if(playfield)
     delete [] playfield;
@@ -143,7 +143,7 @@
   //lookForward=min/4;
 }
 
-void Tron::newGame()
+void SnakeDuel::newGame()
 {
   players[0].score=0;
   players[1].score=0;
@@ -153,7 +153,7 @@
   QTimer::singleShot(15000,this,SLOT(showBeginHint()));
 }
 
-void Tron::reset()
+void SnakeDuel::reset()
 {
   gamePaused=false;
   stopGame();
@@ -188,7 +188,7 @@
     emit gameReset();
 }
 
-void Tron::computerStart()
+void SnakeDuel::computerStart()
 {
    if(isComputer(Both))
    {
@@ -201,14 +201,14 @@
 **                   	??? functions										 **
 ** *************************************************************** */
 
-void Tron::startGame()
+void SnakeDuel::startGame()
 {
    gameEnded=false;
    beginHint=false;
    timer->start(velocity);
 }
 
-void Tron::stopGame()
+void SnakeDuel::stopGame()
 {
    timer->stop();
    gameEnded=true;
@@ -216,7 +216,7 @@
    players[1].last_dir = Directions::None;
 }
 
-void Tron::togglePause() // pause or continue game
+void SnakeDuel::togglePause() // pause or continue game
 {
   if(!gameEnded)
   {
@@ -235,7 +235,7 @@
   }
 }
 
-void Tron::showWinner(Player player)
+void SnakeDuel::showWinner(Player player)
 {
    int i,j;
 
@@ -282,7 +282,7 @@
 **                    paint functions										 **
 ** *************************************************************** */
 
-void Tron::updatePixmap()
+void SnakeDuel::updatePixmap()
 {
   int i,j;
 
@@ -302,7 +302,7 @@
   QPainter p;
   p.begin(pixmap);
 
-  // alle Pixel pr?fen und evt. zeichnen
+  // alle Pixel pr???fen und evt. zeichnen
   for(i=0;i<fieldWidth;i++)
      for(j=0;j<fieldHeight;j++)
      {
@@ -328,7 +328,7 @@
 }
 
 // draw new player rects
-void Tron::paintPlayers()
+void SnakeDuel::paintPlayers()
 {
    QPainter p;
    p.begin(this);
@@ -342,7 +342,7 @@
    p.end();
 }
 
-void Tron::drawRect(QPainter & p, int x, int y)
+void SnakeDuel::drawRect(QPainter & p, int x, int y)
 {
    int xOffset=x*rectSize+(width()-fieldWidth*rectSize)/2;
    int yOffset=y*rectSize+(height()-fieldHeight*rectSize)/2;
@@ -364,7 +364,7 @@
    }
    else
    {
-      kdDebug() << "No player defined in Tron::drawRect(...)" << endl;
+      kdDebug() << "No player defined in SnakeDuel::drawRect(...)" << endl;
       return;
    }
 
@@ -422,12 +422,12 @@
 **                    config functions										 **
 ** *************************************************************** */
 
-void Tron::setActionCollection(KActionCollection *a)
+void SnakeDuel::setActionCollection(KActionCollection *a)
 {
    actionCollection = a;
 }
 
-void Tron::setBackgroundPix(QPixmap pix)
+void SnakeDuel::setBackgroundPix(QPixmap pix)
 {
     bgPix=pix;
 
@@ -438,7 +438,7 @@
     }
 }
 
-void Tron::setVelocity(int newVel)            // set new velocity
+void SnakeDuel::setVelocity(int newVel)            // set new velocity
 {
   velocity=(10-newVel)*15;
 
@@ -446,7 +446,7 @@
     timer->changeInterval(velocity);
 }
 
-void Tron::setComputerplayer(Player player, bool flag) {
+void SnakeDuel::setComputerplayer(Player player, bool flag) {
   if(player==One)
     players[0].setComputer(flag);
   else if(player==Two)
@@ -456,7 +456,7 @@
       QTimer::singleShot(1000,this,SLOT(computerStart()));
 }
 
-bool Tron::isComputer(Player player)
+bool SnakeDuel::isComputer(Player player)
 {
    if(player==One)
      return players[0].computer;
@@ -475,7 +475,7 @@
 **                    moving functions										 **
 ** *************************************************************** */
 
-bool Tron::crashed(int playerNr,int xInc, int yInc) const
+bool SnakeDuel::crashed(int playerNr,int xInc, int yInc) const
 {
   bool flag;
   int newX=players[playerNr].xCoordinate+xInc;
@@ -490,7 +490,7 @@
   return flag;
 }
 
-void Tron::switchDir(int playerNr,Directions::Direction newDirection)
+void SnakeDuel::switchDir(int playerNr,Directions::Direction newDirection)
 {
   if(playerNr!=0 && playerNr != 1)
   {
@@ -513,7 +513,7 @@
   players[playerNr].dir=newDirection;
 }
 
-void Tron::updateDirections(int playerNr)
+void SnakeDuel::updateDirections(int playerNr)
 {
    if(playerNr==-1 || playerNr==0)
    {
@@ -581,7 +581,7 @@
 **                    			Events										 **
 ** *************************************************************** */
 
-void Tron::paintEvent(QPaintEvent *e)
+void SnakeDuel::paintEvent(QPaintEvent *e)
 {
    bitBlt(this,e->rect().topLeft(),pixmap,e->rect());
 
@@ -629,13 +629,13 @@
    }
 }
 
-void Tron::resizeEvent(QResizeEvent *)
+void SnakeDuel::resizeEvent(QResizeEvent *)
 {
     createNewPlayfield();
     reset();
 }
 
-void Tron::keyPressEvent(QKeyEvent *e)
+void SnakeDuel::keyPressEvent(QKeyEvent *e)
 {
   KKey key(e);
   if(!players[1].computer)
@@ -718,7 +718,7 @@
   }
 }
 
-void Tron::keyReleaseEvent(QKeyEvent * e)
+void SnakeDuel::keyReleaseEvent(QKeyEvent * e)
 {
   KKey key(e);
 
@@ -785,7 +785,7 @@
 }
 
 // if playingfield loses keyboard focus, pause game
-void Tron::focusOutEvent(QFocusEvent *)
+void SnakeDuel::focusOutEvent(QFocusEvent *)
 {
    if(!gameEnded && !gamePaused)
    {
@@ -797,12 +797,12 @@
 **     				slots										 **
 ** *************************************************************** */
 
-void Tron::unblockGame()
+void SnakeDuel::unblockGame()
 {
   gameBlocked=false;
 }
 
-void Tron::showBeginHint()
+void SnakeDuel::showBeginHint()
 {
    if(gameEnded)
    {
@@ -816,12 +816,12 @@
 }
 
 // doMove() is called from QTimer
-void Tron::doMove()
+void SnakeDuel::doMove()
 {
    int i;
    for(i=0;i<2;i++)
    {
-      // ?berpr?fen, ob Acceleratortaste gedr?ckt wurde...
+      // ???berpr???fen, ob Acceleratortaste gedr???ckt wurde...
       if(players[i].accelerated)
       {
          updateDirections(i);
@@ -1067,7 +1067,7 @@
 
 // This part is partly ported from
 // xtron-1.1 by Rhett D. Jacobs <rhett at hotel.canberra.edu.au>
-void Tron::think(int playerNr)
+void SnakeDuel::think(int playerNr)
 {
 if(Settings::skill() != Settings::EnumSkill::Easy)
 {
@@ -1598,7 +1598,7 @@
  }
 }
 
-void Tron::changeDirection(int playerNr,int dis_right,int dis_left)
+void SnakeDuel::changeDirection(int playerNr,int dis_right,int dis_left)
 {
    Directions::Direction currentDir=players[playerNr].dir;
    Directions::Direction sides[2];
diff -ur kdegames-3.5.10/ktron/tron.h kdegames-3.5.10-trademarks/ktron/tron.h
--- kdegames-3.5.10/ktron/tron.h	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/tron.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /* ********************************************************************************
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -43,13 +43,13 @@
 /**
 * @short The playingfield
 */
-class Tron : public QWidget
+class SnakeDuel : public QWidget
 {
   Q_OBJECT
 
 public:
-  Tron(QWidget *parent=0, const char *name=0);
-  ~Tron();
+  SnakeDuel(QWidget *parent=0, const char *name=0);
+  ~SnakeDuel();
   void setActionCollection(KActionCollection*);
   void updatePixmap();
   void setBackgroundPix(QPixmap);
@@ -77,7 +77,7 @@
   void gameReset();
 
 protected:
-  /** bitBlt?s the rect that has to be updated from the
+  /** bitBlt???s the rect that has to be updated from the
   * bufferpixmap on the screen and writes eventually text
   */
   void paintEvent(QPaintEvent *);
@@ -136,7 +136,7 @@
   void createNewPlayfield();
   /** paints players at current player coordinates */
   void paintPlayers();
-  /** draws a rect in current TronStyle at position x,y of the playingfield */
+  /** draws a rect in current SnakeDuelStyle at position x,y of the playingfield */
   void drawRect(QPainter & p, int x, int y);
   /** emits gameEnds(Player) and displays the winner by changing color*/
   void showWinner(Player winner);
@@ -162,7 +162,7 @@
   
 private slots:
     /**
-    * This is the main function of KTron.
+    * This is the main function of KSnakeDuel.
     * It checkes if an accelerator is pressed and than moves this player
     * forward. Then it checkes if a crash occurred.
     * If no crash happen it moves both players forward and checks again
diff -ur kdegames-3.5.10/README kdegames-3.5.10-trademarks/README
--- kdegames-3.5.10/README	2005-09-10 10:18:37.000000000 +0200
+++ kdegames-3.5.10-trademarks/README	2008-08-29 13:25:56.000000000 +0200
@@ -38,6 +38,9 @@
 * kbounce
     Claim areas and don't get disturbed.
 
+* kboxpush
+    Move all storage boxes into the cabinet.
+
 * keneloba
     Push pieces of your opponent out of the board (an Abalone type game).
 
@@ -89,15 +92,12 @@
 * ksnake
     Don't bite yourself, eat apples!
 
-* ksokoban
-    Move all storage boxes into the cabinet.
+* ksnakeduel
+    Like ksnake, but without fruits.
 
 * kspaceduel
     Two player game with shooting spaceships flying around a sun.
 
-* ktron
-    Like ksnake, but without fruits.
-
 * ktuberling
     Kids game: make your own potato (NO french fries!)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames3/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Feb 2008 06:25:26 -0000	1.3
+++ .cvsignore	4 Sep 2008 08:58:21 -0000	1.4
@@ -1 +1 @@
-kdegames-3.5.9.tar.bz2
+kdegames-3.5.10.tar.bz2


Index: kdegames3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames3/F-9/kdegames3.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kdegames3.spec	4 Jun 2008 22:15:18 -0000	1.6
+++ kdegames3.spec	4 Sep 2008 08:58:21 -0000	1.7
@@ -8,15 +8,15 @@
 
 Name:    kdegames3
 Summary: K Desktop Environment 3 - Games not ported to KDE 4
-Version: 3.5.9
-Release: 2%{?dist}
+Version: 3.5.10
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Amusements/Games
 Url:     http://www.kde.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
-Patch0: kdegames-3.5.9-trademarks.patch
+Patch0: kdegames-3.5.10-trademarks.patch
 
 Requires: kdelibs3 >= %{version}
 # directory ownership
@@ -91,7 +91,6 @@
 
 %install
 rm -rf %{buildroot}
-mkdir %{buildroot}
 
 export DO_NOT_COMPILE="%{donotcompilelist}"
 make install DESTDIR=%{buildroot}
@@ -190,6 +189,10 @@
 
 
 %changelog
+* Fri Aug 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-1
+- update to 3.5.10
+- update trademarks patch
+
 * Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-2
 - reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames3/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Feb 2008 06:25:27 -0000	1.3
+++ sources	4 Sep 2008 08:58:21 -0000	1.4
@@ -1 +1 @@
-472385f21a692270fb5643d7617c7ff3  kdegames-3.5.9.tar.bz2
+5533b3886cbb74180933fe3f3d209031  kdegames-3.5.10.tar.bz2


--- kdegames-3.5.9-trademarks.patch DELETED ---



From kkofler at fedoraproject.org  Thu Sep  4 09:06:04 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 09:06:04 +0000 (UTC)
Subject: rpms/kdegames/F-8 kdegames-3.5.10-trademarks.patch, NONE,
	1.1 .cvsignore, 1.39, 1.40 kdegames.spec, 1.66, 1.67 sources,
	1.42, 1.43 kdegames-3.5.9-trademarks.patch, 1.1, NONE
Message-ID: <20080904090604.4991970120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20583/F-8

Modified Files:
	.cvsignore kdegames.spec sources 
Added Files:
	kdegames-3.5.10-trademarks.patch 
Removed Files:
	kdegames-3.5.9-trademarks.patch 
Log Message:
* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-1
- update to 3.5.10
- update trademarks patch

kdegames-3.5.10-trademarks.patch:

--- NEW FILE kdegames-3.5.10-trademarks.patch ---
diff -ur kdegames-3.5.10/doc/katomic/index.docbook kdegames-3.5.10-trademarks/doc/katomic/index.docbook
--- kdegames-3.5.10/doc/katomic/index.docbook	2006-01-19 17:36:48.000000000 +0100
+++ kdegames-3.5.10-trademarks/doc/katomic/index.docbook	2008-08-29 13:25:56.000000000 +0200
@@ -50,8 +50,8 @@
 <title>Introduction</title>
 <para>
 <application>Atomic Entertainment</application> is a small game which resembles
-<application>Sokoban</application>. The object of the game is to build chemical
-molecules on a <application>Sokoban</application> like board.</para>
+<application>BoxPush</application>. The object of the game is to build chemical
+molecules on a <application>BoxPush</application> like board.</para>
 </chapter>
 
 
diff -ur kdegames-3.5.10/doc/ksokoban/index.docbook kdegames-3.5.10-trademarks/doc/ksokoban/index.docbook
--- kdegames-3.5.10/doc/ksokoban/index.docbook	2006-07-22 10:10:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/doc/ksokoban/index.docbook	2008-08-29 13:25:56.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ksokoban;">
+  <!ENTITY kappname "<application>KBoxPush</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
   <!ENTITY % addindex "IGNORE">
@@ -8,7 +8,7 @@
 	
 <book lang="&language;">
 <bookinfo>
-<title>The &ksokoban; Handbook</title>
+<title>The <application>KBoxPush</application> Handbook</title>
 
 <authorgroup>
 <author>
@@ -33,8 +33,8 @@
 
 <abstract>
 <para>
-&ksokoban; is a &kde; implementation of the Japanese warehouse keeper
-game <quote>sokoban</quote>.
+<application>KBoxPush</application> is a &kde; implementation of the Japanese warehouse keeper
+box pushing game.
 </para>
 </abstract>
 
@@ -42,8 +42,8 @@
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
 <keyword>game</keyword>
-<keyword>sokoban</keyword>
-<keyword>ksokoban</keyword>
+<keyword>boxpush</keyword>
+<keyword>kboxpush</keyword>
 </keywordset>
 </bookinfo>
 
@@ -51,8 +51,8 @@
 <title>Introduction</title>
 
 <para>
-The first sokoban game was created in 1982 by Hiroyuki Imabayashi at
-the Japanese company Thinking Rabbit, Inc.  <quote>Sokoban</quote> is
+The first BoxPush game was created in 1982 by Hiroyuki Imabayashi at
+the Japanese company Thinking Rabbit, Inc.  The original name is
 japanese for <quote>warehouse keeper</quote>.  The idea is that you
 are a warehouse keeper trying to push crates to their proper locations
 in a warehouse.
@@ -72,7 +72,7 @@
 
 <para>
 To make the game more fun for small kids (below 10 years or so), some
-collections with easier levels are also included in &ksokoban;. These
+collections with easier levels are also included in <application>KBoxPush</application>. These
 are marked <emphasis>(easy)</emphasis> in the level collection menu.
 Of course, these levels can be fun for adults too, for example if you
 don't want to expose yourself to too much mental strain.
@@ -138,11 +138,11 @@
 <title>Loading external levels</title>
 
 <para>
-&ksokoban; has the ability to load external sokoban levels from text
+<application>KBoxPush</application> has the ability to load external levels from text
 files.  You can load levels using the menu entry
 <menuchoice><guimenu>Game</guimenu> <guimenuitem>Load
 Levels...</guimenuitem> </menuchoice>, or by specifying the level file
-&URL; as a command line argument when starting &ksokoban; from a
+&URL; as a command line argument when starting <application>KBoxPush</application> from a
 shell.
 </para>
 
@@ -193,7 +193,7 @@
 <chapter id="menu-reference">
 <title>Menu Reference</title>
 
-<para>This is a complete guide to the menus of &ksokoban;.</para>
+<para>This is a complete guide to the menus of <application>KBoxPush</application>.</para>
 
 <sect1 id="game-menu">
 <title>The <guimenu>Game</guimenu> Menu</title>
@@ -250,7 +250,7 @@
 <guisubmenu>Level Collection</guisubmenu>
 </menuchoice></term>
 <listitem>
-<para><action>Change to a different set of levels.</action> &ksokoban;
+<para><action>Change to a different set of levels.</action> <application>KBoxPush</application>
 comes with several level sets, and you can load more that you can find
 on the internet.</para>
 </listitem>
@@ -286,7 +286,7 @@
 <guimenuitem>Quit</guimenuitem>
 </menuchoice></term>
 <listitem>
-<para><action>Exit</action> &ksokoban;.</para>
+<para><action>Exit</action> <application>KBoxPush</application>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -354,7 +354,7 @@
 <guisubmenu>Set Bookmark</guisubmenu>
 </menuchoice></term>
 <listitem>
-<para>&ksokoban; allows you to <action>set bookmarks with a level at a
+<para><application>KBoxPush</application> allows you to <action>set bookmarks with a level at a
 particular state.</action> You might use this to save yourself
 repeating the same initial steps in a level.</para>
 <para>You can have up to ten bookmarks at a time, and access them via the
@@ -389,9 +389,9 @@
 <title>Credits and License</title>
 
 <para>
-&ksokoban; is copyright &copy; 1998-2000 by &Anders.Widell;
+<application>KBoxPush</application> is copyright &copy; 1998-2000 by &Anders.Widell;
 &Anders.Widell.mail;.  For
-the latest info on &ksokoban;, see the &ksokoban; home page at
+the latest info on <application>KBoxPush</application>, see the <application>KBoxPush</application> home page at
 <ulink url="http://hem.passagen.se/awl/ksokoban/">
 http://hem.passagen.se/awl/ksokoban/</ulink>
 </para>
@@ -404,8 +404,8 @@
 </para>
 
 <para>
-All the currently included sokoban levels were created by David W.
-Skinner <email>sasquatch at bentonrea.com</email>. See his sokoban page
+All the currently included levels were created by David W.
+Skinner <email>sasquatch at bentonrea.com</email>. See his page
 at <ulink url="http://users.bentonrea.com/~sasquatch/sokoban/">
 http://users.bentonrea.com/~sasquatch/sokoban/</ulink>
 </para>
diff -ur kdegames-3.5.10/doc/ktron/index.docbook kdegames-3.5.10-trademarks/doc/ktron/index.docbook
--- kdegames-3.5.10/doc/ktron/index.docbook	2006-07-22 10:10:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/doc/ktron/index.docbook	2008-08-29 13:25:56.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ktron;">
+  <!ENTITY kappname "<application>KSnakeDuel</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
@@ -8,7 +8,7 @@
 
 <book lang="&language;">
 <bookinfo>
-<title>The &ktron; Handbook</title>
+<title>The <application>KSnakeDuel</application> Handbook</title>
 
 <authorgroup>
 <author>
@@ -57,7 +57,7 @@
 
 <abstract>
 <para>
-&ktron; is a simple <quote>Tron</quote> clone for &kde;, which you can
+<application>KSnakeDuel</application> is a simple <quote>SnakeDuel</quote> clone for &kde;, which you can
 play alone or against a friend.
 </para>
 </abstract>
@@ -65,9 +65,9 @@
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>KTron</keyword>
+<keyword>KSnakeDuel</keyword>
 <keyword>game</keyword>
-<keyword>tron</keyword>
+<keyword>snakeduel</keyword>
 </keywordset>
 </bookinfo>
 
@@ -75,9 +75,9 @@
 <title>Introduction</title>
 
 <para>
-&ktron; is a simple Tron-Clone for the
+<application>KSnakeDuel</application> is a simple SnakeDuel-Clone for the
 <ulink url="http://www.kde.org">K Desktop Environment</ulink>. You can play
-&ktron; against the computer or a friend.
+<application>KSnakeDuel</application> against the computer or a friend.
 </para>
 
 <para>
@@ -88,7 +88,7 @@
 </chapter>
 
 <chapter id="playing-ktron">
-<title>Playing &ktron;</title>
+<title>Playing <application>KSnakeDuel</application></title>
 
 <sect1 id="playing-ktron-rules">
 <title>Rules</title>
@@ -353,7 +353,7 @@
 </row>
 <row>
 <entry><keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo></entry>
-<entry>Quit &ktron;</entry>
+<entry>Quit <application>KSnakeDuel</application></entry>
 </row>
 <row>
 <entry><keycap>F1</keycap></entry>
@@ -395,7 +395,7 @@
 <varlistentry>
 <term><guilabel>Show winner by changing color</guilabel></term>
 <listitem><para>Enable this box to improve visualizing that the game is over
-by making &ktron; change the color of the loser's trail to the color of
+by making <application>KSnakeDuel</application> change the color of the loser's trail to the color of
 the winner.</para></listitem>
 </varlistentry>
 
@@ -508,7 +508,7 @@
 <title>Credits and License</title>
 
 <para>
-&ktron; 
+<application>KSnakeDuel</application> 
 </para>
 <para>Program Copyright 1999 &Matthias.Kiefer;
 &Matthias.Kiefer.mail;
@@ -538,7 +538,7 @@
 <title>Installation</title>
 
 <sect1 id="getting-ktron">
-<title>How to obtain &ktron;</title>
+<title>How to obtain <application>KSnakeDuel</application></title>
 
 &install.intro.documentation;
 
@@ -548,8 +548,8 @@
 <title>Requirements</title>
 
 <para>
-In order to successfully compile &ktron;, you need &kde; 3.0. All
-required libraries as well as &ktron; itself can be found on &kde-ftp;.</para>
+In order to successfully compile <application>KSnakeDuel</application>, you need &kde; 3.0. All
+required libraries as well as <application>KSnakeDuel</application> itself can be found on &kde-ftp;.</para>
 </sect1>
 
 <sect1 id="compilation">
diff -ur kdegames-3.5.10/katomic/katomic.desktop kdegames-3.5.10-trademarks/katomic/katomic.desktop
--- kdegames-3.5.10/katomic/katomic.desktop	2008-08-19 20:12:02.000000000 +0200
+++ kdegames-3.5.10-trademarks/katomic/katomic.desktop	2008-08-29 13:25:56.000000000 +0200
@@ -20,54 +20,54 @@
 Type=Application
 Exec=katomic %i %m -caption "%c"
 DocPath=katomic/index.html
-GenericName=Sokoban-like Logic Game
-GenericName[be]=???????????????? ???????????? ???????? Sokoban
+GenericName=BoxPush-like Logic Game
+GenericName[be]=???????????????? ???????????? ???????? BoxPush
 GenericName[bg]=?????????????????? ???????? ?? ??????????
 GenericName[bn]=?????????????????????-?????? ?????? ????????????????????? ????????????
-GenericName[bs]=Logi??ka igra nalik na Sokoban
-GenericName[ca]=Joc de l??gica similar al Sokoban
-GenericName[cs]=Logick?? hra jako Sokoban
-GenericName[cy]=G??m Resymeg sy'n debyg i Sokoban
-GenericName[da]=Sokoban-lignende logisk spil
-GenericName[de]=Logikspiel (??hnlich Sokoban)
-GenericName[el]=???????????????? ?????????????? ???????????????? ???? ???? Sokoban
-GenericName[eo]=Logikludo simila al Sokoban
-GenericName[es]=Juego de l??gica similar al Sokoban
-GenericName[et]=Sokobani moodi loogikam??ng
-GenericName[eu]=Sokoban-en antzeko joko logikoa
-GenericName[fi]=Sokoban-tyylinen Logiikkapeli
-GenericName[fr]=Jeu de logique dans le style de Sokoban
-GenericName[ga]=Cluiche Loighce Mar Sokoban
-GenericName[he]=?????????? Sokoban, ???????? ????????
-GenericName[hr]=Logi??ka igra poput Sokobana
-GenericName[hu]=Sokoban-szer?? logikai
-GenericName[is]=Leikur sem l??kist Sokoban
-GenericName[it]=Gioco di logica simile a Sokoban
+GenericName[bs]=Logi??ka igra nalik na BoxPush
+GenericName[ca]=Joc de l??gica similar al BoxPush
+GenericName[cs]=Logick?? hra jako BoxPush
+GenericName[cy]=G??m Resymeg sy'n debyg i BoxPush
+GenericName[da]=BoxPush-lignende logisk spil
+GenericName[de]=Logikspiel (??hnlich BoxPush)
+GenericName[el]=???????????????? ?????????????? ???????????????? ???? ???? BoxPush
+GenericName[eo]=Logikludo simila al BoxPush
+GenericName[es]=Juego de l??gica similar al BoxPush
+GenericName[et]=BoxPushi moodi loogikam??ng
+GenericName[eu]=BoxPush-en antzeko joko logikoa
+GenericName[fi]=BoxPush-tyylinen Logiikkapeli
+GenericName[fr]=Jeu de logique dans le style de BoxPush
+GenericName[ga]=Cluiche Loighce Mar BoxPush
+GenericName[he]=?????????? BoxPush, ???????? ????????
+GenericName[hr]=Logi??ka igra poput BoxPusha
+GenericName[hu]=BoxPush-szer?? logikai
+GenericName[is]=Leikur sem l??kist BoxPush
+GenericName[it]=Gioco di logica simile a BoxPush
 GenericName[ja]=????????????????????????????????????
-GenericName[km]=?????????????????????????????????????????? Sokoban
+GenericName[km]=?????????????????????????????????????????? BoxPush
 GenericName[ko]=????????? ?????? ?????? ??????
-GenericName[lt]=Sokoban tipo loginis ??aidimas
-GenericName[lv]=Sokoban l??dz??ga lo??isk?? sp??le
+GenericName[lt]=BoxPush tipo loginis ??aidimas
+GenericName[lv]=BoxPush l??dz??ga lo??isk?? sp??le
 GenericName[mk]=?????????????? ???????? ???????????? ???? ??????????????
-GenericName[nb]=Sokoban-lignende logikkspill
-GenericName[nds]=Sokoban-liek Logikspeel
+GenericName[nb]=BoxPush-lignende logikkspill
+GenericName[nds]=BoxPush-liek Logikspeel
 GenericName[ne]=????????????????????? ??????????????? ?????????????????????????????? ?????????
-GenericName[nl]=Sokoban-achtig logisch spel
-GenericName[nn]=Sokoban-liknande logikkspel
-GenericName[pl]=Gra logiczna typu Sokoban
-GenericName[pt]=Jogo de L??gica tipo Sokoban
-GenericName[pt_BR]=Jogo L??gico parecido com Sokoban
+GenericName[nl]=BoxPush-achtig logisch spel
+GenericName[nn]=BoxPush-liknande logikkspel
+GenericName[pl]=Gra logiczna typu BoxPush
+GenericName[pt]=Jogo de L??gica tipo BoxPush
+GenericName[pt_BR]=Jogo L??gico parecido com BoxPush
 GenericName[ru]=???????????????? ??????????
-GenericName[se]=Sokoban-l??gan logihkkaspeallu
-GenericName[sk]=Logick?? hra ako Sokoban
-GenericName[sl]=Logi??na igra podobna Sokobanu
-GenericName[sr]=?????????????? ???????? ?????????? ???? Sokoban
-GenericName[sr at Latn]=Logi??ka igra nalik na Sokoban
-GenericName[sv]=Sokoban-liknande logiskt spel
+GenericName[se]=BoxPush-l??gan logihkkaspeallu
+GenericName[sk]=Logick?? hra ako BoxPush
+GenericName[sl]=Logi??na igra podobna BoxPushu
+GenericName[sr]=?????????????? ???????? ?????????? ???? BoxPush
+GenericName[sr at Latn]=Logi??ka igra nalik na BoxPush
+GenericName[sv]=BoxPush-liknande logiskt spel
 GenericName[ta]=???????????????????????? ??????????????? ?????????????????? ??????????????????????????????
 GenericName[uk]=?????? ???? ???????????? ?????????????? ???? ????????????????
-GenericName[wa]=Djeu di lodjike rishonnant a sokoban
-GenericName[zh_TW]=?????????(sokoban)??????????????????
+GenericName[wa]=Djeu di lodjike rishonnant a BoxPush
+GenericName[zh_TW]=?????????(BoxPush)??????????????????
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;StrategyGame;
diff -ur kdegames-3.5.10/ksokoban/AUTHORS kdegames-3.5.10-trademarks/ksokoban/AUTHORS
--- kdegames-3.5.10/ksokoban/AUTHORS	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/AUTHORS	2008-08-29 13:25:56.000000000 +0200
@@ -1,36 +1,15 @@
 ------------------------------------------------------------------------
-ksokoban is written by:
+KBoxPush is written by:
 
 Anders Widell <awl at hem.passagen.se>
 
 ------------------------------------------------------------------------
-The levels were taken from:
-
-xsokoban 3.3c for X-windows
-	www:	http://xsokoban.lcs.mit.edu/xsokoban.html
-	author:	Andrew Myers <andru at lcs.mit.edu>
-
-MacSokoban 3.0.3 for Macintosh
-	www:	http://www.lysator.liu.se/~ingemar/games.html
-	author:	Ingemar Ragnemalm <ingemar at lysator.liu.se>
-
-Sokoban 2.4 for Macintosh
-	www:	http://members.aol.com/SokobanMac/
-	author:	Scott Lindhurst <scottl at alumni.Princeton.EDU>
-
-------------------------------------------------------------------------
-The levels originally come from:
-
-Original               the 50 original sokoban levels
-                       made by Thinking rabbit Inc. in Japan
-Extra                  some more levels from xsokoban
-Still more             by J. Franklin Mentzer <wryter at aol.com>
-MacTommy inventions    by a guy called Tommy in Pennsylvania
-Yoshio's autogenerated by Yoshio Murase <yoshio at asahi.email.ne.jp>
-                       see http://www.ne.jp/asahi/ai/yoshio/sokoban/main.htm
-For the kids           by Ross (W.R.) Brown <ross at bnr.ca>
-Simple Sokoban         simplified original levels
-		       by Phil Shapiro <pshapiro at his.com>
-Dimitri & Yorick       by Jacques Duthen <duthen at club-internet.fr>
+The included level sets (Sasquatch, Mas Sasquatch, Sasquatch III,
+Sasquatch IV and Microban) are the work of:
+David W. Skinner <sasquatch at bentonrea.com>
+http://users.bentonrea.com/~sasquatch/sokoban/
+From the web page:
+> These sets may be freely distributed provided they remain unchanged
+> and credited with my name and email address.
 
 ------------------------------------------------------------------------
diff -ur kdegames-3.5.10/ksokoban/Bookmark.cpp kdegames-3.5.10-trademarks/ksokoban/Bookmark.cpp
--- kdegames-3.5.10/ksokoban/Bookmark.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/Bookmark.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/Bookmark.h kdegames-3.5.10-trademarks/ksokoban/Bookmark.h
--- kdegames-3.5.10/ksokoban/Bookmark.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/Bookmark.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/data/ksokoban.desktop kdegames-3.5.10-trademarks/ksokoban/data/ksokoban.desktop
--- kdegames-3.5.10/ksokoban/data/ksokoban.desktop	2008-08-19 20:12:03.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/data/ksokoban.desktop	2008-08-29 13:30:09.000000000 +0200
@@ -1,64 +1,64 @@
 [Desktop Entry]
-Name=KSokoban
-Name[af]=Ksokoban
-Name[be]=??????????????
+Name=KBoxPush
+Name[af]=KBoxPush
+Name[be]=KBoxPush
 Name[bn]=??????-?????????????????????
 Name[hi]=??????-?????????????????????
-Name[mk]=????????????????
-Name[nb]=Sokoban
+Name[mk]=KBoxPush
+Name[nb]=KBoxPush
 Name[ne]=??????????????? ?????????????????????
-Name[pl]=Sokoban
-Name[sv]=Ksokoban
-Name[ta]=K???????????????????????? 
-Name[tg]=K??????????????
-Name[zh_TW]=KSokoban ?????????
-Name[zu]=I-KSokoban
-GenericName=Sokoban Game
-GenericName[be]=???????????? ??????????????
+Name[pl]=KBoxPush
+Name[sv]=KBoxPush
+Name[ta]=KBoxPush
+Name[tg]=KBoxPush
+Name[zh_TW]=KBoxPush ?????????
+Name[zu]=I-KBoxPush
+GenericName=BoxPush Game
+GenericName[be]=???????????? BoxPush
 GenericName[bg]=?????????????????? ????????
 GenericName[bn]=????????????????????? ????????????
-GenericName[bs]=Igra Sokoban
-GenericName[ca]=Joc Sokoban
-GenericName[cs]=Hra Sokoban
-GenericName[cy]=G??m Sokoban
-GenericName[da]=Sokoban spil
-GenericName[de]=Sokoban Spiel
-GenericName[el]=???????????????? Sokoban
-GenericName[eo]=Sokobana ludo
-GenericName[es]=Juego Sokoban
-GenericName[et]=Sokoban
-GenericName[eu]=Sokoban jokoa
-GenericName[fa]=???????? Sokoban
-GenericName[fi]=Sokoban
-GenericName[fr]=Jeu Sokoban
-GenericName[ga]=Cluiche Sokoban
-GenericName[he]=???????? Sokoban
-GenericName[hr]=Sokoban
-GenericName[hu]=Sokoban
-GenericName[is]=Sokoban leikur
-GenericName[it]=Gioco del Sokoban
+GenericName[bs]=Igra BoxPush
+GenericName[ca]=Joc BoxPush
+GenericName[cs]=Hra BoxPush
+GenericName[cy]=G??m BoxPush
+GenericName[da]=BoxPush spil
+GenericName[de]=BoxPush Spiel
+GenericName[el]=???????????????? BoxPush
+GenericName[eo]=BoxPusha ludo
+GenericName[es]=Juego BoxPush
+GenericName[et]=BoxPush
+GenericName[eu]=BoxPush jokoa
+GenericName[fa]=???????? BoxPush
+GenericName[fi]=BoxPush
+GenericName[fr]=Jeu BoxPush
+GenericName[ga]=Cluiche BoxPush
+GenericName[he]=???????? BoxPush
+GenericName[hr]=BoxPush
+GenericName[hu]=BoxPush
+GenericName[is]=BoxPush leikur
+GenericName[it]=Gioco del BoxPush
 GenericName[ja]=??????????????????
 GenericName[km]=???????????????????????????????????????
-GenericName[lt]=Sokoban ??aidimas
-GenericName[lv]=Sokoban sp??le
-GenericName[mk]=???????? ??????????????
-GenericName[nb]=Sokoban-spill
-GenericName[nds]=Sokoban-Speel
+GenericName[lt]=BoxPush ??aidimas
+GenericName[lv]=BoxPush sp??le
+GenericName[mk]=???????? BoxPush
+GenericName[nb]=BoxPush-spill
+GenericName[nds]=BoxPush-Speel
 GenericName[ne]=????????????????????? ?????????
-GenericName[nl]=Sokobanspel
-GenericName[nn]=Sokoban-spel
-GenericName[pl]=Sokoban
-GenericName[pt]=Jogo de Sokoban
-GenericName[pt_BR]=Jogo de Sokoban
-GenericName[ru]=??????????????
-GenericName[se]=Sokoban-speallu
-GenericName[sk]=Hra Sokoban
-GenericName[sl]=Igra Sokobana
-GenericName[sr]=???????? Sokoban-??
-GenericName[sr at Latn]=Igra Sokoban-a
-GenericName[sv]=Sokoban-spel
+GenericName[nl]=BoxPushspel
+GenericName[nn]=BoxPush-spel
+GenericName[pl]=BoxPush
+GenericName[pt]=Jogo de BoxPush
+GenericName[pt_BR]=Jogo de BoxPush
+GenericName[ru]=BoxPush
+GenericName[se]=BoxPush-speallu
+GenericName[sk]=Hra BoxPush
+GenericName[sl]=Igra BoxPusha
+GenericName[sr]=???????? BoxPush-??
+GenericName[sr at Latn]=Igra BoxPush-a
+GenericName[sv]=BoxPush-spel
 GenericName[ta]=???????????????????????? ??????????????????????????????
-GenericName[uk]=?????? Sokoban
+GenericName[uk]=?????? BoxPush
 GenericName[zh_TW]=???????????????
 DocPath=ksokoban/index.html
 Exec=ksokoban %i %m -caption "%c"
diff -ur kdegames-3.5.10/ksokoban/History.cpp kdegames-3.5.10-trademarks/ksokoban/History.cpp
--- kdegames-3.5.10/ksokoban/History.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/History.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/History.h kdegames-3.5.10-trademarks/ksokoban/History.h
--- kdegames-3.5.10/ksokoban/History.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/History.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/HtmlPrinter.cpp kdegames-3.5.10-trademarks/ksokoban/HtmlPrinter.cpp
--- kdegames-3.5.10/ksokoban/HtmlPrinter.cpp	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/HtmlPrinter.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -81,7 +81,7 @@
   printf ("\
 <html>\n\
 <head>\n\
-<title>ksokoban level</title>\n\
+<title>KBoxPush level</title>\n\
 </head>\n\
 <body background=background.gif>\n\
 ");
diff -ur kdegames-3.5.10/ksokoban/ImageData.cpp kdegames-3.5.10-trademarks/ksokoban/ImageData.cpp
--- kdegames-3.5.10/ksokoban/ImageData.cpp	2007-05-14 09:39:12.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/ImageData.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/ImageData.h kdegames-3.5.10-trademarks/ksokoban/ImageData.h
--- kdegames-3.5.10/ksokoban/ImageData.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/ImageData.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/InternalCollections.h kdegames-3.5.10-trademarks/ksokoban/InternalCollections.h
--- kdegames-3.5.10/ksokoban/InternalCollections.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/InternalCollections.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998-2000  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/LevelCollection.h kdegames-3.5.10-trademarks/ksokoban/LevelCollection.h
--- kdegames-3.5.10/ksokoban/LevelCollection.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/LevelCollection.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998,1999  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/LevelMap.cpp kdegames-3.5.10-trademarks/ksokoban/LevelMap.cpp
--- kdegames-3.5.10/ksokoban/LevelMap.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/LevelMap.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/LevelMap.h kdegames-3.5.10-trademarks/ksokoban/LevelMap.h
--- kdegames-3.5.10/ksokoban/LevelMap.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/LevelMap.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/main.cpp kdegames-3.5.10-trademarks/ksokoban/main.cpp
--- kdegames-3.5.10/ksokoban/main.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/main.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998-2000  Anders Widell  <awl at passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -42,7 +42,7 @@
 int
 main (int argc, char **argv)
 {
-  KAboutData aboutData("ksokoban", I18N_NOOP("KSokoban"),
+  KAboutData aboutData("ksokoban", I18N_NOOP("KBoxPush"),
 		       version, description, KAboutData::License_GPL,
 		       "(c) 1998-2001  Anders Widell", 0,
 		       "http://hem.passagen.se/awl/ksokoban/");
@@ -50,7 +50,7 @@
 		      "awl at passagen.se",
 		      "http://hem.passagen.se/awl/");
   aboutData.addCredit("David W. Skinner",
-		      I18N_NOOP("For contributing the Sokoban levels included in this game"),
+		      I18N_NOOP("For contributing the BoxPush levels included in this game"),
 		      "sasquatch at bentonrea.com",
 		      "http://users.bentonrea.com/~sasquatch/");
   KCmdLineArgs::init(argc, argv, &aboutData);
diff -ur kdegames-3.5.10/ksokoban/MainWindow.cpp kdegames-3.5.10-trademarks/ksokoban/MainWindow.cpp
--- kdegames-3.5.10/ksokoban/MainWindow.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/MainWindow.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/MainWindow.h kdegames-3.5.10-trademarks/ksokoban/MainWindow.h
--- kdegames-3.5.10/ksokoban/MainWindow.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/MainWindow.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/Map.cpp kdegames-3.5.10-trademarks/ksokoban/Map.cpp
--- kdegames-3.5.10/ksokoban/Map.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/Map.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/MapDelta.cpp kdegames-3.5.10-trademarks/ksokoban/MapDelta.cpp
--- kdegames-3.5.10/ksokoban/MapDelta.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/MapDelta.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/MapDelta.h kdegames-3.5.10-trademarks/ksokoban/MapDelta.h
--- kdegames-3.5.10/ksokoban/MapDelta.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/MapDelta.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/Map.h kdegames-3.5.10-trademarks/ksokoban/Map.h
--- kdegames-3.5.10/ksokoban/Map.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/Map.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/ModalLabel.cpp kdegames-3.5.10-trademarks/ksokoban/ModalLabel.cpp
--- kdegames-3.5.10/ksokoban/ModalLabel.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/ModalLabel.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/ModalLabel.h kdegames-3.5.10-trademarks/ksokoban/ModalLabel.h
--- kdegames-3.5.10/ksokoban/ModalLabel.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/ModalLabel.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/Move.cpp kdegames-3.5.10-trademarks/ksokoban/Move.cpp
--- kdegames-3.5.10/ksokoban/Move.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/Move.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/Move.h kdegames-3.5.10-trademarks/ksokoban/Move.h
--- kdegames-3.5.10/ksokoban/Move.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/Move.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/MoveSequence.cpp kdegames-3.5.10-trademarks/ksokoban/MoveSequence.cpp
--- kdegames-3.5.10/ksokoban/MoveSequence.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/MoveSequence.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/MoveSequence.h kdegames-3.5.10-trademarks/ksokoban/MoveSequence.h
--- kdegames-3.5.10/ksokoban/MoveSequence.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/MoveSequence.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/NEWS kdegames-3.5.10-trademarks/ksokoban/NEWS
--- kdegames-3.5.10/ksokoban/NEWS	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/NEWS	2008-08-29 13:25:56.000000000 +0200
@@ -52,17 +52,17 @@
 * Internationalisation
 
 -------------------------------------------------------------------------------
-version 0.1.2: ksokoban imported to CVS. Date 1998-08-30
+version 0.1.2: imported to CVS. Date 1998-08-30
 
 -------------------------------------------------------------------------------
 version 0.1.1: bugfix release. Date 1998-08-25
 
-* BUGFIX: ksokoban now ignores mouseclicks while a move is in progress.
+* BUGFIX: now ignores mouseclicks while a move is in progress.
 	  Previously such a click would cause a memory leak and a corrupted
 	  undo/redo history (or a failed assertion if debugging was turned on).
 	  Thanks to Natali Giuliano <natali at stone.trew.it> for reporting this.
 
-* ksokoban should now work with older zlib & Qt libraries.
+* should now work with older zlib & Qt libraries.
   I have tested it with zlib 1.0.3 and Qt 1.33
 
 * Detects the old gcc 2.7 and turns off optimisations if it is found.
diff -ur kdegames-3.5.10/ksokoban/PathFinder.cpp kdegames-3.5.10-trademarks/ksokoban/PathFinder.cpp
--- kdegames-3.5.10/ksokoban/PathFinder.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/PathFinder.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/PathFinder.h kdegames-3.5.10-trademarks/ksokoban/PathFinder.h
--- kdegames-3.5.10/ksokoban/PathFinder.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/PathFinder.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/PlayField.cpp kdegames-3.5.10-trademarks/ksokoban/PlayField.cpp
--- kdegames-3.5.10/ksokoban/PlayField.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/PlayField.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/PlayField.h kdegames-3.5.10-trademarks/ksokoban/PlayField.h
--- kdegames-3.5.10/ksokoban/PlayField.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/PlayField.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/Queue.h kdegames-3.5.10-trademarks/ksokoban/Queue.h
--- kdegames-3.5.10/ksokoban/Queue.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/Queue.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/README kdegames-3.5.10-trademarks/ksokoban/README
--- kdegames-3.5.10/ksokoban/README	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/README	2008-08-29 13:25:56.000000000 +0200
@@ -1,12 +1,12 @@
-ksokoban 0.2.2 - a Sokoban game for KDE
+KBoxPush 0.2.2 - a BoxPush game for KDE
 
 copyright 1998 Anders Widell  <d95-awi at nada.kth.se>
 
-ksokoban is free software; you can redistribute it and/or modify it
+KBoxPush is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License. See the file
 COPYING for details.
 
-See http://hem.passagen.se/awl/ksokoban/ for later versions of ksokoban.
+See http://hem.passagen.se/awl/ksokoban/ for later versions of KBoxPush.
 See the file AUTHORS for details about where the levels come from.
 
 ------------------------------------------------------------------------
diff -ur kdegames-3.5.10/ksokoban/StaticImage.cpp kdegames-3.5.10-trademarks/ksokoban/StaticImage.cpp
--- kdegames-3.5.10/ksokoban/StaticImage.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/StaticImage.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ksokoban/StaticImage.h kdegames-3.5.10-trademarks/ksokoban/StaticImage.h
--- kdegames-3.5.10/ksokoban/StaticImage.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.10-trademarks/ksokoban/StaticImage.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.10/ktron/ktron.cpp kdegames-3.5.10-trademarks/ktron/ktron.cpp
--- kdegames-3.5.10/ktron/ktron.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/ktron.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /* ****************************************************************************
-   This file is part of the game 'KTron'
+   This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -42,10 +42,10 @@
 /**
  * Constuctor
  */ 
-KTron::KTron(QWidget *parent, const char *name) : KMainWindow(parent, name) {
+KSnakeDuel::KSnakeDuel(QWidget *parent, const char *name) : KMainWindow(parent, name) {
   playerPoints[0]=playerPoints[1]=0;
 
-  tron=new Tron(this, "Tron");
+  tron=new SnakeDuel(this, "SnakeDuel");
   connect(tron,SIGNAL(gameEnds(Player)),SLOT(changeStatus(Player)));
   setCentralWidget(tron);
   tron->setMinimumSize(200,180);
@@ -54,7 +54,7 @@
   statusBar()->insertItem("abcdefghijklmnopqrst: 0  ",ID_STATUS_BASE+1);
   statusBar()->insertItem("abcdefghijklmnopqrst: 0  ",ID_STATUS_BASE+2);
 
-  // We match up keyboard events ourselves in Tron::keyPressEvent()
+  // We match up keyboard events ourselves in SnakeDuel::keyPressEvent()
   // We must disable the actions, otherwise we don't get the keyPressEvent's
   KAction *act;
   act = new KAction(i18n("Player 1 Up"), Key_R, 0, 0, actionCollection(), "Pl1Up");
@@ -90,7 +90,7 @@
   loadSettings();
 }
 
-void KTron::loadSettings() {
+void KSnakeDuel::loadSettings() {
    playerName[0]=Settings::namePlayer1();
    if ( playerName[0].isEmpty() )
        playerName[0] = i18n("Player 1");
@@ -101,7 +101,7 @@
    updateStatusbar();
 }
 
-void KTron::updateStatusbar(){
+void KSnakeDuel::updateStatusbar(){
   for(int i=0;i<2;i++){
     Player player;
     player=(i==0?One:Two);
@@ -118,7 +118,7 @@
   }
 }
 
-void KTron::changeStatus(Player player) {
+void KSnakeDuel::changeStatus(Player player) {
   // if player=Nobody, then new game
   if(player==Nobody){
     playerPoints[0]=playerPoints[1]=0;
@@ -143,18 +143,18 @@
     showWinner(Two);
 }
 
-void KTron::showWinner(Player winner){
+void KSnakeDuel::showWinner(Player winner){
   if(tron->isComputer(Both) || (winner != One && winner != Two))
     return;
 
-  QString loserName = i18n("KTron");
+  QString loserName = i18n("KSnakeDuel");
   int loser = Two;
   if(winner == Two)
     loser = One;
   if(!tron->isComputer(((Player)loser)))
     loserName = playerName[loser];
   
-  QString winnerName = i18n("KTron");
+  QString winnerName = i18n("KSnakeDuel");
   if(!tron->isComputer(winner))
     winnerName = playerName[winner];
   
@@ -169,7 +169,7 @@
   tron->newGame();
 }
 
-void KTron::paletteChange(const QPalette &/*oldPalette*/){
+void KSnakeDuel::paletteChange(const QPalette &/*oldPalette*/){
    update();
    tron->updatePixmap();
    tron->update();
@@ -178,7 +178,7 @@
 /**
  * Show Settings dialog.
  */
-void KTron::showSettings(){
+void KSnakeDuel::showSettings(){
   if(KConfigDialog::showDialog("settings"))
     return;
   
diff -ur kdegames-3.5.10/ktron/ktron.desktop kdegames-3.5.10-trademarks/ktron/ktron.desktop
--- kdegames-3.5.10/ktron/ktron.desktop	2008-08-19 20:12:02.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/ktron.desktop	2008-08-29 13:25:56.000000000 +0200
@@ -3,64 +3,64 @@
 Exec=ktron -caption "%c" %i %m
 Icon=ktron
 DocPath=ktron/index.html
-GenericName=Tron-like Game
-GenericName[be]=???????????? ????????
+GenericName=SnakeDuel-like Game
+GenericName[be]=???????????? SnakeDuel
 GenericName[bg]=?????????????????? ????????
 GenericName[bn]=????????????-??????????????? ????????????
-GenericName[br]=C'hoari doare Tron
-GenericName[bs]=Igra nalik na Tron
-GenericName[ca]=Joc a l'estil Tron
-GenericName[cs]=Hra podobn?? Tronu
-GenericName[cy]=G??m sy'n debyg i Tron
-GenericName[da]=Tron-lignende spil
-GenericName[de]=Tron-??hnliches Spiel
-GenericName[el]=???????????????? ???????????????? ???? ???? Tron
-GenericName[eo]="Tron"-simila ludo
-GenericName[es]=Juego similar a Tron
-GenericName[et]=Tron
-GenericName[eu]=Tron-en antzeko jokoa
-GenericName[fa]=???????? ????????Tron
-GenericName[fi]=Tron-tyylinen peli
-GenericName[fr]=Jeu dans le style de Tron
-GenericName[he]=???????? ?????????? Tron
-GenericName[hr]=Igra poput Trona
-GenericName[hu]=Tron-szer??
-GenericName[is]=Leikur sem l??kist Tron
-GenericName[it]=Gioco simile a Tron
+GenericName[br]=C'hoari doare SnakeDuel
+GenericName[bs]=Igra nalik na SnakeDuel
+GenericName[ca]=Joc a l'estil SnakeDuel
+GenericName[cs]=Hra podobn?? SnakeDuelu
+GenericName[cy]=G??m sy'n debyg i SnakeDuel
+GenericName[da]=SnakeDuel-lignende spil
+GenericName[de]=SnakeDuel-??hnliches Spiel
+GenericName[el]=???????????????? ???????????????? ???? ???? SnakeDuel
+GenericName[eo]="SnakeDuel"-simila ludo
+GenericName[es]=Juego similar a SnakeDuel
+GenericName[et]=SnakeDuel
+GenericName[eu]=SnakeDuel-en antzeko jokoa
+GenericName[fa]=???????? ????????SnakeDuel
+GenericName[fi]=SnakeDuel-tyylinen peli
+GenericName[fr]=Jeu dans le style de SnakeDuel
+GenericName[he]=???????? ?????????? SnakeDuel
+GenericName[hr]=Igra poput SnakeDuela
+GenericName[hu]=SnakeDuel-szer??
+GenericName[is]=Leikur sem l??kist SnakeDuel
+GenericName[it]=Gioco simile a SnakeDuel
 GenericName[ja]=??????????????????????????????
-GenericName[km]=??????????????????????????? Tron
-GenericName[lv]=Tron l??dz??ga sp??le
-GenericName[mk]=???????? ???????????? ???? Tron
-GenericName[nb]=Tron-lignende spill
-GenericName[nds]=Tron-liek Speel
+GenericName[km]=??????????????????????????? SnakeDuel
+GenericName[lv]=SnakeDuel l??dz??ga sp??le
+GenericName[mk]=???????? ???????????? ???? SnakeDuel
+GenericName[nb]=SnakeDuel-lignende spill
+GenericName[nds]=SnakeDuel-liek Speel
 GenericName[ne]=??????????????? ??????????????? ?????????
-GenericName[nl]=Tron-achtig spel
-GenericName[nn]=Tron-liknande spel
-GenericName[pl]=Gra typu Tron
-GenericName[pt]=Jogo tipo Tron
-GenericName[pt_BR]=Jogo parecido com Tron
-GenericName[ru]=????????
-GenericName[se]=Tron-l??gan speallu
-GenericName[sk]=Hra typu Tron
-GenericName[sl]=Igra podobna Tronu
-GenericName[sr]=???????? ?????????? ???? Tron
-GenericName[sr at Latn]=Igra nalik na Tron
-GenericName[sv]=Tron-liknande spel
+GenericName[nl]=SnakeDuel-achtig spel
+GenericName[nn]=SnakeDuel-liknande spel
+GenericName[pl]=Gra typu SnakeDuel
+GenericName[pt]=Jogo tipo SnakeDuel
+GenericName[pt_BR]=Jogo parecido com SnakeDuel
+GenericName[ru]=SnakeDuel
+GenericName[se]=SnakeDuel-l??gan speallu
+GenericName[sk]=Hra typu SnakeDuel
+GenericName[sl]=Igra podobna SnakeDuelu
+GenericName[sr]=???????? ?????????? ???? SnakeDuel
+GenericName[sr at Latn]=Igra nalik na SnakeDuel
+GenericName[sv]=SnakeDuel-liknande spel
 GenericName[ta]=?????????????????? ??????????????? ??????????????????????????????
-GenericName[uk]=?????? ?????????? ???? ?????? "????????"
-GenericName[zh_TW]=?????? Tron ??????
+GenericName[uk]=?????? ?????????? ???? ?????? "SnakeDuel"
+GenericName[zh_TW]=?????? SnakeDuel ??????
 Terminal=false
-Name=KTron
-Name[af]=Ktron
-Name[be]=????????
+Name=KSnakeDuel
+Name[af]=KSnakeDuel
+Name[be]=KSnakeDuel
 Name[bn]=??????-????????????
 Name[hi]=??????-???????????????
-Name[nb]=Tron
+Name[nb]=KSnakeDuel
 Name[ne]=??????????????? ???????????????
-Name[sv]=Ktron
+Name[sv]=KSnakeDuel
 Name[ta]=K??????????????????
-Name[tg]=K????????
-Name[zu]=I-KTron
+Name[tg]=KSnakeDuel
+Name[zu]=I-KSnakeDuel
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;ArcadeGame;
diff -ur kdegames-3.5.10/ktron/ktron.h kdegames-3.5.10-trademarks/ktron/ktron.h
--- kdegames-3.5.10/ktron/ktron.h	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/ktron.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /* ***************************************************************************
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -31,21 +31,21 @@
 
 class KAccel;
 class KSelectAction;
-class Tron;
+class SnakeDuel;
 
 /**
- * @short The main window of KTron
+ * @short The main window of KSnakeDuel
  */
-class KTron : public KMainWindow {
+class KSnakeDuel : public KMainWindow {
 
 Q_OBJECT
 
 public:
-  KTron(QWidget *parent=0, const char *name=0);
+  KSnakeDuel(QWidget *parent=0, const char *name=0);
 
 private:
   KAccel *accel;
-  Tron *tron;
+  SnakeDuel *tron;
   QString playerName[2];
   int playerPoints[2];
   void updateStatusbar();
diff -ur kdegames-3.5.10/ktron/main.cpp kdegames-3.5.10-trademarks/ktron/main.cpp
--- kdegames-3.5.10/ktron/main.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/main.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /******************************************************************************
-   This file is part of the game 'KTron'
+   This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -34,7 +34,7 @@
 
 int main(int argc, char* argv[])
 {
-  KAboutData aboutData( "ktron", I18N_NOOP("KTron"), 
+  KAboutData aboutData( "ktron", I18N_NOOP("KSnakeDuel"), 
     KTRON_VERSION, description, KAboutData::License_GPL, notice);
   aboutData.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"), "matthias.kiefer at gmx.de");
   aboutData.addAuthor("Benjamin Meyer",I18N_NOOP("Various improvements"), "ben+ktron at meyerhome.net");
@@ -47,10 +47,10 @@
   KImageIO::registerFormats();
 
   if(a.isRestored()){
-     RESTORE(KTron)
+     RESTORE(KSnakeDuel)
   }
   else {
-     KTron *ktron = new KTron();
+     KSnakeDuel *ktron = new KSnakeDuel();
      a.setMainWidget(ktron);
      ktron->show();
   }
diff -ur kdegames-3.5.10/ktron/player.cpp kdegames-3.5.10-trademarks/ktron/player.cpp
--- kdegames-3.5.10/ktron/player.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/player.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /********************************************************************************** 
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
diff -ur kdegames-3.5.10/ktron/player.h kdegames-3.5.10-trademarks/ktron/player.h
--- kdegames-3.5.10/ktron/player.h	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/player.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /* ********************************************************************************
-  This file is part of the kde-game 'KTron'
+  This file is part of the kde-game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
diff -ur kdegames-3.5.10/ktron/README kdegames-3.5.10-trademarks/ktron/README
--- kdegames-3.5.10/ktron/README	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/README	2008-08-29 13:25:56.000000000 +0200
@@ -1,6 +1,6 @@
 Hello!
 
-KTron is a simple tron-clone for the K Desktop Environment.
+KSnakeDuel is a simple snake duel game for the K Desktop Environment.
 I think it's just nothing to say about the game:
 avoid running into walls, your own tail, and that of your opponent.
 
@@ -14,15 +14,15 @@
 
 Copyright:
 
-KTron
+KSnakeDuel
 
 Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
-KTron is free software; you can redistribute it and/or modify	
+KSnakeDuel is free software; you can redistribute it and/or modify	
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 or any later version.
 
-KTron is distributed in the hope that it will be useful,
+KSnakeDuel is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
diff -ur kdegames-3.5.10/ktron/TODO kdegames-3.5.10-trademarks/ktron/TODO
--- kdegames-3.5.10/ktron/TODO	2005-09-10 10:18:12.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/TODO	2008-08-29 13:25:56.000000000 +0200
@@ -1,8 +1,8 @@
-KTron in general does everything I wanted it to do. :-)
+KSnakeDuel in general does everything I wanted it to do. :-)
 
 Plans for the future are:
 - possibility to create, load, save playfield with walls
-- real cool would be to play KTron over the internet
+- real cool would be to play KSnakeDuel over the internet
 
 ------------------
 Matthias Kiefer
diff -ur kdegames-3.5.10/ktron/tron.cpp kdegames-3.5.10-trademarks/ktron/tron.cpp
--- kdegames-3.5.10/ktron/tron.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/tron.cpp	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /****************************************************************************
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -41,7 +41,7 @@
  * init-functions
  **/
 
-Tron::Tron(QWidget *parent,const char *name)
+SnakeDuel::SnakeDuel(QWidget *parent,const char *name)
   : QWidget(parent,name)
 {
   pixmap=0;
@@ -63,7 +63,7 @@
   QTimer::singleShot(15000, this,SLOT(showBeginHint()));
 }
 
-void Tron::loadSettings(){
+void SnakeDuel::loadSettings(){
   setPalette(Settings::color_Background());
 
   // Size
@@ -107,7 +107,7 @@
   setComputerplayer(Two, Settings::computerplayer2());
 }
 
-Tron::~Tron()
+SnakeDuel::~SnakeDuel()
 {
   if(playfield)
     {
@@ -119,7 +119,7 @@
 
 }
 
-void Tron::createNewPlayfield()
+void SnakeDuel::createNewPlayfield()
 {
   if(playfield)
     delete [] playfield;
@@ -143,7 +143,7 @@
   //lookForward=min/4;
 }
 
-void Tron::newGame()
+void SnakeDuel::newGame()
 {
   players[0].score=0;
   players[1].score=0;
@@ -153,7 +153,7 @@
   QTimer::singleShot(15000,this,SLOT(showBeginHint()));
 }
 
-void Tron::reset()
+void SnakeDuel::reset()
 {
   gamePaused=false;
   stopGame();
@@ -188,7 +188,7 @@
     emit gameReset();
 }
 
-void Tron::computerStart()
+void SnakeDuel::computerStart()
 {
    if(isComputer(Both))
    {
@@ -201,14 +201,14 @@
 **                   	??? functions										 **
 ** *************************************************************** */
 
-void Tron::startGame()
+void SnakeDuel::startGame()
 {
    gameEnded=false;
    beginHint=false;
    timer->start(velocity);
 }
 
-void Tron::stopGame()
+void SnakeDuel::stopGame()
 {
    timer->stop();
    gameEnded=true;
@@ -216,7 +216,7 @@
    players[1].last_dir = Directions::None;
 }
 
-void Tron::togglePause() // pause or continue game
+void SnakeDuel::togglePause() // pause or continue game
 {
   if(!gameEnded)
   {
@@ -235,7 +235,7 @@
   }
 }
 
-void Tron::showWinner(Player player)
+void SnakeDuel::showWinner(Player player)
 {
    int i,j;
 
@@ -282,7 +282,7 @@
 **                    paint functions										 **
 ** *************************************************************** */
 
-void Tron::updatePixmap()
+void SnakeDuel::updatePixmap()
 {
   int i,j;
 
@@ -302,7 +302,7 @@
   QPainter p;
   p.begin(pixmap);
 
-  // alle Pixel pr?fen und evt. zeichnen
+  // alle Pixel pr???fen und evt. zeichnen
   for(i=0;i<fieldWidth;i++)
      for(j=0;j<fieldHeight;j++)
      {
@@ -328,7 +328,7 @@
 }
 
 // draw new player rects
-void Tron::paintPlayers()
+void SnakeDuel::paintPlayers()
 {
    QPainter p;
    p.begin(this);
@@ -342,7 +342,7 @@
    p.end();
 }
 
-void Tron::drawRect(QPainter & p, int x, int y)
+void SnakeDuel::drawRect(QPainter & p, int x, int y)
 {
    int xOffset=x*rectSize+(width()-fieldWidth*rectSize)/2;
    int yOffset=y*rectSize+(height()-fieldHeight*rectSize)/2;
@@ -364,7 +364,7 @@
    }
    else
    {
-      kdDebug() << "No player defined in Tron::drawRect(...)" << endl;
+      kdDebug() << "No player defined in SnakeDuel::drawRect(...)" << endl;
       return;
    }
 
@@ -422,12 +422,12 @@
 **                    config functions										 **
 ** *************************************************************** */
 
-void Tron::setActionCollection(KActionCollection *a)
+void SnakeDuel::setActionCollection(KActionCollection *a)
 {
    actionCollection = a;
 }
 
-void Tron::setBackgroundPix(QPixmap pix)
+void SnakeDuel::setBackgroundPix(QPixmap pix)
 {
     bgPix=pix;
 
@@ -438,7 +438,7 @@
     }
 }
 
-void Tron::setVelocity(int newVel)            // set new velocity
+void SnakeDuel::setVelocity(int newVel)            // set new velocity
 {
   velocity=(10-newVel)*15;
 
@@ -446,7 +446,7 @@
     timer->changeInterval(velocity);
 }
 
-void Tron::setComputerplayer(Player player, bool flag) {
+void SnakeDuel::setComputerplayer(Player player, bool flag) {
   if(player==One)
     players[0].setComputer(flag);
   else if(player==Two)
@@ -456,7 +456,7 @@
       QTimer::singleShot(1000,this,SLOT(computerStart()));
 }
 
-bool Tron::isComputer(Player player)
+bool SnakeDuel::isComputer(Player player)
 {
    if(player==One)
      return players[0].computer;
@@ -475,7 +475,7 @@
 **                    moving functions										 **
 ** *************************************************************** */
 
-bool Tron::crashed(int playerNr,int xInc, int yInc) const
+bool SnakeDuel::crashed(int playerNr,int xInc, int yInc) const
 {
   bool flag;
   int newX=players[playerNr].xCoordinate+xInc;
@@ -490,7 +490,7 @@
   return flag;
 }
 
-void Tron::switchDir(int playerNr,Directions::Direction newDirection)
+void SnakeDuel::switchDir(int playerNr,Directions::Direction newDirection)
 {
   if(playerNr!=0 && playerNr != 1)
   {
@@ -513,7 +513,7 @@
   players[playerNr].dir=newDirection;
 }
 
-void Tron::updateDirections(int playerNr)
+void SnakeDuel::updateDirections(int playerNr)
 {
    if(playerNr==-1 || playerNr==0)
    {
@@ -581,7 +581,7 @@
 **                    			Events										 **
 ** *************************************************************** */
 
-void Tron::paintEvent(QPaintEvent *e)
+void SnakeDuel::paintEvent(QPaintEvent *e)
 {
    bitBlt(this,e->rect().topLeft(),pixmap,e->rect());
 
@@ -629,13 +629,13 @@
    }
 }
 
-void Tron::resizeEvent(QResizeEvent *)
+void SnakeDuel::resizeEvent(QResizeEvent *)
 {
     createNewPlayfield();
     reset();
 }
 
-void Tron::keyPressEvent(QKeyEvent *e)
+void SnakeDuel::keyPressEvent(QKeyEvent *e)
 {
   KKey key(e);
   if(!players[1].computer)
@@ -718,7 +718,7 @@
   }
 }
 
-void Tron::keyReleaseEvent(QKeyEvent * e)
+void SnakeDuel::keyReleaseEvent(QKeyEvent * e)
 {
   KKey key(e);
 
@@ -785,7 +785,7 @@
 }
 
 // if playingfield loses keyboard focus, pause game
-void Tron::focusOutEvent(QFocusEvent *)
+void SnakeDuel::focusOutEvent(QFocusEvent *)
 {
    if(!gameEnded && !gamePaused)
    {
@@ -797,12 +797,12 @@
 **     				slots										 **
 ** *************************************************************** */
 
-void Tron::unblockGame()
+void SnakeDuel::unblockGame()
 {
   gameBlocked=false;
 }
 
-void Tron::showBeginHint()
+void SnakeDuel::showBeginHint()
 {
    if(gameEnded)
    {
@@ -816,12 +816,12 @@
 }
 
 // doMove() is called from QTimer
-void Tron::doMove()
+void SnakeDuel::doMove()
 {
    int i;
    for(i=0;i<2;i++)
    {
-      // ?berpr?fen, ob Acceleratortaste gedr?ckt wurde...
+      // ???berpr???fen, ob Acceleratortaste gedr???ckt wurde...
       if(players[i].accelerated)
       {
          updateDirections(i);
@@ -1067,7 +1067,7 @@
 
 // This part is partly ported from
 // xtron-1.1 by Rhett D. Jacobs <rhett at hotel.canberra.edu.au>
-void Tron::think(int playerNr)
+void SnakeDuel::think(int playerNr)
 {
 if(Settings::skill() != Settings::EnumSkill::Easy)
 {
@@ -1598,7 +1598,7 @@
  }
 }
 
-void Tron::changeDirection(int playerNr,int dis_right,int dis_left)
+void SnakeDuel::changeDirection(int playerNr,int dis_right,int dis_left)
 {
    Directions::Direction currentDir=players[playerNr].dir;
    Directions::Direction sides[2];
diff -ur kdegames-3.5.10/ktron/tron.h kdegames-3.5.10-trademarks/ktron/tron.h
--- kdegames-3.5.10/ktron/tron.h	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.10-trademarks/ktron/tron.h	2008-08-29 13:25:56.000000000 +0200
@@ -1,5 +1,5 @@
 /* ********************************************************************************
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -43,13 +43,13 @@
 /**
 * @short The playingfield
 */
-class Tron : public QWidget
+class SnakeDuel : public QWidget
 {
   Q_OBJECT
 
 public:
-  Tron(QWidget *parent=0, const char *name=0);
-  ~Tron();
+  SnakeDuel(QWidget *parent=0, const char *name=0);
+  ~SnakeDuel();
   void setActionCollection(KActionCollection*);
   void updatePixmap();
   void setBackgroundPix(QPixmap);
@@ -77,7 +77,7 @@
   void gameReset();
 
 protected:
-  /** bitBlt?s the rect that has to be updated from the
+  /** bitBlt???s the rect that has to be updated from the
   * bufferpixmap on the screen and writes eventually text
   */
   void paintEvent(QPaintEvent *);
@@ -136,7 +136,7 @@
   void createNewPlayfield();
   /** paints players at current player coordinates */
   void paintPlayers();
-  /** draws a rect in current TronStyle at position x,y of the playingfield */
+  /** draws a rect in current SnakeDuelStyle at position x,y of the playingfield */
   void drawRect(QPainter & p, int x, int y);
   /** emits gameEnds(Player) and displays the winner by changing color*/
   void showWinner(Player winner);
@@ -162,7 +162,7 @@
   
 private slots:
     /**
-    * This is the main function of KTron.
+    * This is the main function of KSnakeDuel.
     * It checkes if an accelerator is pressed and than moves this player
     * forward. Then it checkes if a crash occurred.
     * If no crash happen it moves both players forward and checks again
diff -ur kdegames-3.5.10/README kdegames-3.5.10-trademarks/README
--- kdegames-3.5.10/README	2005-09-10 10:18:37.000000000 +0200
+++ kdegames-3.5.10-trademarks/README	2008-08-29 13:25:56.000000000 +0200
@@ -38,6 +38,9 @@
 * kbounce
     Claim areas and don't get disturbed.
 
+* kboxpush
+    Move all storage boxes into the cabinet.
+
 * keneloba
     Push pieces of your opponent out of the board (an Abalone type game).
 
@@ -89,15 +92,12 @@
 * ksnake
     Don't bite yourself, eat apples!
 
-* ksokoban
-    Move all storage boxes into the cabinet.
+* ksnakeduel
+    Like ksnake, but without fruits.
 
 * kspaceduel
     Two player game with shooting spaceships flying around a sun.
 
-* ktron
-    Like ksnake, but without fruits.
-
 * ktuberling
     Kids game: make your own potato (NO french fries!)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-8/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	16 Feb 2008 01:29:44 -0000	1.39
+++ .cvsignore	4 Sep 2008 09:05:33 -0000	1.40
@@ -1 +1 @@
-kdegames-3.5.9.tar.bz2
+kdegames-3.5.10.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-8/kdegames.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- kdegames.spec	16 Feb 2008 01:29:44 -0000	1.66
+++ kdegames.spec	4 Sep 2008 09:05:33 -0000	1.67
@@ -11,7 +11,7 @@
 Name:    kdegames
 Summary: K Desktop Environment - Games
 Epoch:   6
-Version: 3.5.9
+Version: 3.5.10
 Release: 1%{?dist}
 
 License: GPLv2
@@ -21,7 +21,7 @@
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
 Patch0: kdegames-3.1.1-konquest.patch
-Patch1: kdegames-3.5.9-trademarks.patch
+Patch1: kdegames-3.5.10-trademarks.patch
 # http://bugzilla.redhat.com/247746
 Patch2: kdegames-3.5.8-kpat_background.patch
 
@@ -195,6 +195,10 @@
 
 
 %changelog
+* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-1
+- update to 3.5.10
+- update trademarks patch
+
 * Fri Feb 15 2008 Rex Dieter <rdieter at fedoraproject.org> 6:3.5.9-1
 - kde-3.5.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-8/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	16 Feb 2008 01:29:44 -0000	1.42
+++ sources	4 Sep 2008 09:05:33 -0000	1.43
@@ -1 +1 @@
-472385f21a692270fb5643d7617c7ff3  kdegames-3.5.9.tar.bz2
+5533b3886cbb74180933fe3f3d209031  kdegames-3.5.10.tar.bz2


--- kdegames-3.5.9-trademarks.patch DELETED ---



From twaugh at fedoraproject.org  Thu Sep  4 09:09:48 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  4 Sep 2008 09:09:48 +0000 (UTC)
Subject: rpms/foomatic/devel .cvsignore, 1.64, 1.65 foomatic.spec, 1.200,
	1.201 sources, 1.66, 1.67 foomatic-busyloop.patch, 1.1, NONE
Message-ID: <20080904090948.B908F70120@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22056

Modified Files:
	.cvsignore foomatic.spec sources 
Removed Files:
	foomatic-busyloop.patch 
Log Message:
* Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com>
- Updated db-engine to 3.0-20080904.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	10 Jul 2008 12:51:41 -0000	1.64
+++ .cvsignore	4 Sep 2008 09:09:18 -0000	1.65
@@ -58,3 +58,4 @@
 foomatic-filters-3.0-20080710.tar.gz
 foomatic-db-3.0-20080710.tar.gz
 foomatic-db-hpijs-20080710.tar.gz
+foomatic-db-engine-3.0-20080904.tar.gz


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- foomatic.spec	3 Sep 2008 15:45:09 -0000	1.200
+++ foomatic.spec	4 Sep 2008 09:09:18 -0000	1.201
@@ -1,5 +1,5 @@
 %define dbver 20080710
-%define enginever 3.0-20080710
+%define enginever 3.0-20080904
 %define filtersver 20080710
 %define hpijsver 20080710
 
@@ -38,7 +38,6 @@
 
 Patch18: foomatic-sigpipe.patch
 Patch19: foomatic-459847.patch
-Patch20: foomatic-busyloop.patch
 Patch21: foomatic-hpclj9500mfp.patch
 
 Url:		http://www.linuxprinting.org
@@ -94,7 +93,6 @@
 %patch14 -p1 -b .ampathxml
 %patch10 -p1 -b .xml-cflags
 %patch15 -p1
-%patch20 -p1 -b .busyloop
 ./make_configure
 popd
 
@@ -246,6 +244,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com>
+- Updated db-engine to 3.0-20080904.
+
 * Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com>
 - Finally remove ppdload.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	10 Jul 2008 12:51:41 -0000	1.66
+++ sources	4 Sep 2008 09:09:18 -0000	1.67
@@ -1,4 +1,4 @@
-cca75a1d1a189a2b816a0c20058e6aef  foomatic-db-engine-3.0-20080710.tar.gz
 ddd20fc710fba33900df82b0b2b95d35  foomatic-filters-3.0-20080710.tar.gz
 f959c63dface3453aa0918df3bf6f6a8  foomatic-db-3.0-20080710.tar.gz
 35a3a1ebe3c09b9e9a126e31bceedd72  foomatic-db-hpijs-20080710.tar.gz
+d46d1a26a8199c8c5c618ad2cd17a68a  foomatic-db-engine-3.0-20080904.tar.gz


--- foomatic-busyloop.patch DELETED ---



From twaugh at fedoraproject.org  Thu Sep  4 09:11:52 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  4 Sep 2008 09:11:52 +0000 (UTC)
Subject: rpms/foomatic/devel .cvsignore, 1.65, 1.66 foomatic.spec, 1.201,
	1.202 sources, 1.67, 1.68
Message-ID: <20080904091152.E1B5B70120@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22816

Modified Files:
	.cvsignore foomatic.spec sources 
Log Message:
* Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com>
- Updated filters to 3.0-20080904.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	4 Sep 2008 09:09:18 -0000	1.65
+++ .cvsignore	4 Sep 2008 09:11:22 -0000	1.66
@@ -59,3 +59,4 @@
 foomatic-db-3.0-20080710.tar.gz
 foomatic-db-hpijs-20080710.tar.gz
 foomatic-db-engine-3.0-20080904.tar.gz
+foomatic-filters-3.0-20080904.tar.gz


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- foomatic.spec	4 Sep 2008 09:09:18 -0000	1.201
+++ foomatic.spec	4 Sep 2008 09:11:22 -0000	1.202
@@ -1,6 +1,6 @@
 %define dbver 20080710
 %define enginever 3.0-20080904
-%define filtersver 20080710
+%define filtersver 20080904
 %define hpijsver 20080710
 
 Summary: Foomatic printer database.
@@ -245,6 +245,7 @@
 
 %changelog
 * Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com>
+- Updated filters to 3.0-20080904.
 - Updated db-engine to 3.0-20080904.
 
 * Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	4 Sep 2008 09:09:18 -0000	1.67
+++ sources	4 Sep 2008 09:11:22 -0000	1.68
@@ -1,4 +1,4 @@
-ddd20fc710fba33900df82b0b2b95d35  foomatic-filters-3.0-20080710.tar.gz
 f959c63dface3453aa0918df3bf6f6a8  foomatic-db-3.0-20080710.tar.gz
 35a3a1ebe3c09b9e9a126e31bceedd72  foomatic-db-hpijs-20080710.tar.gz
 d46d1a26a8199c8c5c618ad2cd17a68a  foomatic-db-engine-3.0-20080904.tar.gz
+ce3332981735ce5b50932640a6107220  foomatic-filters-3.0-20080904.tar.gz



From kkofler at fedoraproject.org  Thu Sep  4 09:15:08 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 09:15:08 +0000 (UTC)
Subject: rpms/kdepim/F-9 kdepim.spec, 1.171, 1.172 crystalsvg-conflicts.txt, 
	1.4, NONE
Message-ID: <20080904091509.032F370120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23833/F-9

Modified Files:
	kdepim.spec 
Removed Files:
	crystalsvg-conflicts.txt 
Log Message:
Reapply temporarily reverted changes:

* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.9-10
- reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4)


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-9/kdepim.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- kdepim.spec	1 Sep 2008 12:37:17 -0000	1.171
+++ kdepim.spec	4 Sep 2008 09:14:38 -0000	1.172
@@ -28,7 +28,6 @@
 Source10: cr48-app-kandy.png
 Source11: cr32-app-kandy.png
 Source12: cr16-app-kandy.png
-Source20: crystalsvg-conflicts.txt
 
 Patch1: kdepim-3.4.0-kandy-icons.patch
 Patch2: kdepim-xdg_open.patch
@@ -200,14 +199,6 @@
  -e "s at -lgpgme@@g" \
  -e "s at -lgpg-error@@g"
 
-%if 0%{?fedora} > 8
-# omit conflicts with kdeartwork-icons-crystalsvg
-# keep only: {kandy,kpilotDaemon}.png
-for icon in `cat %{SOURCE20}` ; do 
-  rm -f %{buildroot}%{_datadir}/icons/crystalsvg/*/*/${icon}
-done
-%endif
-
 
 %post
 %{!?libs:/sbin/ldconfig}
@@ -283,9 +274,12 @@
 * Mon Sep 01 2008 Than Ngo <than at redhat.com> 3.5.10-1
 - 3.5.10
 
-* Thu Jun 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-9.1
+* Thu Jun 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-10.1
 - metakit patch to fix build on sparc64
 
+* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.9-10
+- reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4)
+
 * Fri Apr 11 2008 Rex Dieter <rdieter at fedoraproject.org> 6:3.5.9-9
 - omit multilib upgrade hacks (see also #441222)
 


--- crystalsvg-conflicts.txt DELETED ---



From kkofler at fedoraproject.org  Thu Sep  4 09:19:17 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 09:19:17 +0000 (UTC)
Subject: rpms/kdepim/F-8 kdepim.spec, 1.149, 1.150 crystalsvg-conflicts.txt, 
	1.1, NONE
Message-ID: <20080904091917.E7DA670123@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25145/F-8

Modified Files:
	kdepim.spec 
Removed Files:
	crystalsvg-conflicts.txt 
Log Message:
Sync from F-9 (reapply temporarily reverted changes).


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-8/kdepim.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- kdepim.spec	1 Sep 2008 14:32:36 -0000	1.149
+++ kdepim.spec	4 Sep 2008 09:18:47 -0000	1.150
@@ -28,7 +28,6 @@
 Source10: cr48-app-kandy.png
 Source11: cr32-app-kandy.png
 Source12: cr16-app-kandy.png
-Source20: crystalsvg-conflicts.txt
 
 Patch1: kdepim-3.4.0-kandy-icons.patch
 Patch2: kdepim-xdg_open.patch
@@ -200,14 +199,6 @@
  -e "s at -lgpgme@@g" \
  -e "s at -lgpg-error@@g"
 
-%if 0%{?fedora} > 8
-# omit conflicts with kdeartwork-icons-crystalsvg
-# keep only: {kandy,kpilotDaemon}.png
-for icon in `cat %{SOURCE20}` ; do 
-  rm -f %{buildroot}%{_datadir}/icons/crystalsvg/*/*/${icon}
-done
-%endif
-
 
 %post
 %{!?libs:/sbin/ldconfig}
@@ -283,9 +274,12 @@
 * Mon Sep 01 2008 Than Ngo <than at redhat.com> 3.5.10-1
 - 3.5.10
 
-* Thu Jun 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-9.1
+* Thu Jun 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-10.1
 - metakit patch to fix build on sparc64
 
+* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.9-10
+- reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4)
+
 * Fri Apr 11 2008 Rex Dieter <rdieter at fedoraproject.org> 6:3.5.9-9
 - omit multilib upgrade hacks (see also #441222)
 


--- crystalsvg-conflicts.txt DELETED ---



From kkofler at fedoraproject.org  Thu Sep  4 09:20:03 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 09:20:03 +0000 (UTC)
Subject: rpms/kdepim/F-8 .cvsignore,1.41,1.42
Message-ID: <20080904092003.96FFA70123@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25471/F-8

Modified Files:
	.cvsignore 
Log Message:
Update .cvsignore.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-8/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	15 Feb 2008 22:16:29 -0000	1.41
+++ .cvsignore	4 Sep 2008 09:19:33 -0000	1.42
@@ -1,4 +1,4 @@
 cr16-app-kandy.png
 cr32-app-kandy.png
 cr48-app-kandy.png
-kdepim-3.5.9.tar.bz2
+kdepim-3.5.10.tar.bz2



From kkofler at fedoraproject.org  Thu Sep  4 09:24:57 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 09:24:57 +0000 (UTC)
Subject: rpms/kdevelop/F-9 .cvsignore, 1.34, 1.35 kdevelop.spec, 1.77,
	1.78 sources, 1.37, 1.38 kdevelop-3.5.0-svn.patch, 1.1, NONE
Message-ID: <20080904092457.CACE170120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdevelop/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27092/F-9

Modified Files:
	.cvsignore kdevelop.spec sources 
Removed Files:
	kdevelop-3.5.0-svn.patch 
Log Message:
Sync from devel:

* Sat Aug 30 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 9:3.5.3-1
- update to 3.5.3
- drop svn patch (fixed upstream)

* Mon Jul 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 9:3.5.2-3
- fix FTBFS (add BR openldap-devel to work around missing dep in apr-devel)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/F-9/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	19 May 2008 08:36:12 -0000	1.34
+++ .cvsignore	4 Sep 2008 09:24:27 -0000	1.35
@@ -1,2 +1,2 @@
 c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-kdevelop-3.5.2.tar.bz2
+kdevelop-3.5.3.tar.bz2


Index: kdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/F-9/kdevelop.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- kdevelop.spec	6 Jun 2008 22:11:08 -0000	1.77
+++ kdevelop.spec	4 Sep 2008 09:24:27 -0000	1.78
@@ -1,3 +1,4 @@
+%define _default_patch_fuzz 2
 
 %define debug 0
 %define final 1 
@@ -18,8 +19,8 @@
 Name:    kdevelop
 Summary: Integrated Development Environment for C++/C
 Epoch:   9
-Version: 3.5.2
-Release: 2%{?dist}
+Version: 3.5.3
+Release: 1%{?dist}
 
 License: GPLv2
 URL: http://www.kdevelop.org/
@@ -31,7 +32,6 @@
 
 Patch1: c_cpp_reference-2.0.2-config.patch
 Patch2: kdevelop-2.1.5_for_KDE_3.1-doc.patch
-Patch3: kdevelop-3.5.0-svn.patch
 # improved integration for the KDE 4 template - no special KDE 4 build environment needed in Fedora
 Patch4: kdevelop-3.5.2-kde4template.patch
 
@@ -86,6 +86,9 @@
 BuildRequires: kdesdk3-devel
 %endif
 BuildRequires: subversion-devel neon-devel
+# looks like this is dragged in by apr-devel (dep of subversion-devel), but not
+# a dependency
+BuildRequires: openldap-devel
 
 ## ancient, deprecated?  -- Rex
 #Obsoletes: kdevelop-c_c++_ref
@@ -143,7 +146,6 @@
 %setup -q -a1
 %patch1 -p0 -b .config
 %patch2 -p1 -b .doc
-%patch3 -p1 -b .svn
 %patch4 -p1 -b .kde4template
 
 %if %{make_cvs}
@@ -254,6 +256,13 @@
 
 
 %changelog
+* Sat Aug 30 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 9:3.5.3-1
+- update to 3.5.3
+- drop svn patch (fixed upstream)
+
+* Mon Jul 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 9:3.5.2-3
+- fix FTBFS (add BR openldap-devel to work around missing dep in apr-devel)
+
 * Fri Jun 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 9:3.5.2-2
 - improve integration of the KDE 4 app template
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/F-9/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	19 May 2008 08:36:12 -0000	1.37
+++ sources	4 Sep 2008 09:24:27 -0000	1.38
@@ -1,2 +1,2 @@
 5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-21c5085a4af3577d1d15fd169eb672a2  kdevelop-3.5.2.tar.bz2
+a2cdb5f71952386798175f8ce5a3e196  kdevelop-3.5.3.tar.bz2


--- kdevelop-3.5.0-svn.patch DELETED ---



From twaugh at fedoraproject.org  Thu Sep  4 09:28:42 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  4 Sep 2008 09:28:42 +0000 (UTC)
Subject: rpms/foomatic/devel .cvsignore, 1.66, 1.67 foomatic.spec, 1.202,
	1.203 sources, 1.68, 1.69 foomatic-459847.patch, 1.1,
	NONE foomatic-hpclj9500mfp.patch, 1.1, NONE
Message-ID: <20080904092842.5D2FE70120@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28264

Modified Files:
	.cvsignore foomatic.spec sources 
Removed Files:
	foomatic-459847.patch foomatic-hpclj9500mfp.patch 
Log Message:
* Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com>
- Updated db to 20080904.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore	4 Sep 2008 09:11:22 -0000	1.66
+++ .cvsignore	4 Sep 2008 09:28:11 -0000	1.67
@@ -60,3 +60,4 @@
 foomatic-db-hpijs-20080710.tar.gz
 foomatic-db-engine-3.0-20080904.tar.gz
 foomatic-filters-3.0-20080904.tar.gz
+foomatic-db-3.0-20080904.tar.gz


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- foomatic.spec	4 Sep 2008 09:11:22 -0000	1.202
+++ foomatic.spec	4 Sep 2008 09:28:12 -0000	1.203
@@ -1,4 +1,4 @@
-%define dbver 20080710
+%define dbver 20080904
 %define enginever 3.0-20080904
 %define filtersver 20080904
 %define hpijsver 20080710
@@ -37,8 +37,6 @@
 Patch15: foomatic-bad-utf8.patch
 
 Patch18: foomatic-sigpipe.patch
-Patch19: foomatic-459847.patch
-Patch21: foomatic-hpclj9500mfp.patch
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
@@ -100,8 +98,6 @@
 popd
 
 pushd foomatic-db-%{dbver}
-%patch19 -p1 -b .459847
-%patch21 -p1 -b .hpclj9500mfp
 
 cd db/source
 
@@ -245,6 +241,7 @@
 
 %changelog
 * Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com>
+- Updated db to 20080904.
 - Updated filters to 3.0-20080904.
 - Updated db-engine to 3.0-20080904.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	4 Sep 2008 09:11:22 -0000	1.68
+++ sources	4 Sep 2008 09:28:12 -0000	1.69
@@ -1,4 +1,4 @@
-f959c63dface3453aa0918df3bf6f6a8  foomatic-db-3.0-20080710.tar.gz
 35a3a1ebe3c09b9e9a126e31bceedd72  foomatic-db-hpijs-20080710.tar.gz
 d46d1a26a8199c8c5c618ad2cd17a68a  foomatic-db-engine-3.0-20080904.tar.gz
 ce3332981735ce5b50932640a6107220  foomatic-filters-3.0-20080904.tar.gz
+758ac14a7068a3c2016608d35c8994c7  foomatic-db-3.0-20080904.tar.gz


--- foomatic-459847.patch DELETED ---


--- foomatic-hpclj9500mfp.patch DELETED ---



From kkofler at fedoraproject.org  Thu Sep  4 09:29:26 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 09:29:26 +0000 (UTC)
Subject: rpms/kdewebdev/F-9 .cvsignore, 1.18, 1.19 kdewebdev.spec, 1.50,
	1.51 sources, 1.20, 1.21
Message-ID: <20080904092926.9231E70120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdewebdev/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28502/F-9

Modified Files:
	.cvsignore kdewebdev.spec sources 
Log Message:
Sync from devel:

* Sat Aug 30 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-1
- update to 3.5.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/F-9/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	15 Feb 2008 09:48:35 -0000	1.18
+++ .cvsignore	4 Sep 2008 09:28:56 -0000	1.19
@@ -3,4 +3,4 @@
 javascript.tar.bz2
 php_manual_en_20030401.tar.bz2
 hi48-app-kxsldbg.png
-kdewebdev-3.5.9.tar.bz2
+kdewebdev-3.5.10.tar.bz2


Index: kdewebdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/F-9/kdewebdev.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kdewebdev.spec	4 Jun 2008 22:23:48 -0000	1.50
+++ kdewebdev.spec	4 Sep 2008 09:28:56 -0000	1.51
@@ -9,8 +9,8 @@
 Name:    kdewebdev
 Summary: Web development applications 
 Epoch:   6
-Version: 3.5.9
-Release: 4%{?dist}
+Version: 3.5.10
+Release: 1%{?dist}
 
 License: GPLv2
 Url:     http://kdewebdev.org/ 
@@ -215,6 +215,9 @@
 
 
 %changelog
+* Sat Aug 30 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-1
+- update to 3.5.10
+
 * Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.9-4
 - reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	15 Feb 2008 09:48:35 -0000	1.20
+++ sources	4 Sep 2008 09:28:56 -0000	1.21
@@ -3,4 +3,4 @@
 eea6e25a1c25af1f5a0c33e32e52c136  javascript.tar.bz2
 149607cecd4bf6783dc6e43a03b80138  php_manual_en_20030401.tar.bz2
 b2242db588538fb5f02bd0de196a872b  hi48-app-kxsldbg.png
-e95d1fbb698ec76966abfa5bdf96bd5e  kdewebdev-3.5.9.tar.bz2
+7188f351158ca5a7613c3de4a6854b37  kdewebdev-3.5.10.tar.bz2



From kkofler at fedoraproject.org  Thu Sep  4 09:41:02 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 09:41:02 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.1.1-kde#856379-cookiejar.patch, NONE, 
	1.1 kdelibs-4.1.1-kde#856403-urlnav.patch, NONE,
	1.1 kdelibs.spec, 1.372, 1.373
Message-ID: <20080904094102.0ADE170120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32360/devel

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.1-kde#856379-cookiejar.patch 
	kdelibs-4.1.1-kde#856403-urlnav.patch 
Log Message:
Sync from F-9:

* Wed Sep 03 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-5
- fixed crash on setting cookies on empty domains (like the file
  system), KDE bug #170147
- fix URL navigator focus in file dialogs, KDE bug #169497, #170211

kdelibs-4.1.1-kde#856379-cookiejar.patch:

--- NEW FILE kdelibs-4.1.1-kde#856379-cookiejar.patch ---
Index: kioslave/http/kcookiejar/kcookiejar.cpp
===================================================================
--- kioslave/http/kcookiejar/kcookiejar.cpp	(revision 856378)
+++ kioslave/http/kcookiejar/kcookiejar.cpp	(revision 856379)
@@ -516,8 +516,10 @@
    extractDomains(_fqdn, domains);
    if (domains.count() > 3)
       _domain = domains[3];
+   else if ( domains.count() > 0 )
+      _domain = domains[0];
    else
-      _domain = domains[0];
+      _domain = L1("");
 }
 
 QString KCookieJar::stripDomain(const KHttpCookie& cookie)

kdelibs-4.1.1-kde#856403-urlnav.patch:

--- NEW FILE kdelibs-4.1.1-kde#856403-urlnav.patch ---
Index: kfile/kurlnavigator.cpp
===================================================================
--- kfile/kurlnavigator.cpp	(revision 856402)
+++ kfile/kurlnavigator.cpp	(revision 856403)
@@ -344,6 +344,7 @@
     // initialize the path box of the traditional view
     m_pathBox = new KUrlComboBox(KUrlComboBox::Both, true, q);
     m_pathBox->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
+    m_pathBox->installEventFilter(q);
 
     KUrlCompletion* kurlCompletion = new KUrlCompletion(KUrlCompletion::DirCompletion);
     m_pathBox->setCompletionObject(kurlCompletion);
@@ -1122,6 +1123,16 @@
     QWidget::resizeEvent(event);
 }
 
+bool KUrlNavigator::eventFilter(QObject* watched, QEvent* event)
+{
+    if ((watched == d->m_pathBox) && (event->type() == QEvent::FocusIn)) {
+        requestActivation();
+        setFocus();
+    }
+
+    return QWidget::eventFilter(watched, event);
+}
+
 int KUrlNavigator::historySize() const
 {
     return d->m_history.count();
Index: kfile/kurlnavigator.h
===================================================================
--- kfile/kurlnavigator.h	(revision 856402)
+++ kfile/kurlnavigator.h	(revision 856403)
@@ -312,6 +312,8 @@
     /* @see QWidget::resizeEvent() */
     virtual void resizeEvent(QResizeEvent* event);
 
+    virtual bool eventFilter(QObject* watched, QEvent* event);
+
 private:
     Q_PRIVATE_SLOT(d, void slotReturnPressed(const QString& text))
     Q_PRIVATE_SLOT(d, void slotReturnPressed())


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- kdelibs.spec	2 Sep 2008 09:56:16 -0000	1.372
+++ kdelibs.spec	4 Sep 2008 09:40:31 -0000	1.373
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -82,6 +82,8 @@
 
 ## upstream patches
 Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
+Patch101: kdelibs-4.1.1-kde#856379-cookiejar.patch
+Patch102: kdelibs-4.1.1-kde#856403-urlnav.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -209,6 +211,8 @@
 
 ## upstream patches
 %patch100 -p0 -b .kde#169447-khtml-regression
+%patch101 -p0 -b .kde#856379-cookiejar
+%patch102 -p0 -b .kde#856403-urlnav
 
 %build
 
@@ -369,6 +373,11 @@
 
 
 %changelog
+* Wed Sep 03 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-5
+- fixed crash on setting cookies on empty domains (like the file
+  system), KDE bug #170147
+- fix URL navigator focus in file dialogs, KDE bug #169497, #170211
+
 * Tue Sep 02 2008 Than Ngo <than at redhat.com> 4.1.1-4
 - apply patch to fix regression in khtml
 



From kkofler at fedoraproject.org  Thu Sep  4 09:45:52 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 09:45:52 +0000 (UTC)
Subject: rpms/kdelibs4/F-8 kdelibs-4.1.0-#455130.patch, NONE,
	1.1 kdelibs-4.1.1-kde#169447-khtml-regression.patch, NONE,
	1.1 kdelibs-4.1.1-kde#856379-cookiejar.patch, NONE,
	1.1 kdelibs-4.1.1-kde#856403-urlnav.patch, NONE, 1.1 .cvsignore,
	1.12, 1.13 kdelibs4.spec, 1.32, 1.33 sources, 1.12,
	1.13 kdelibs-4.0.98-revert-kinit-regression.patch, 1.1,
	NONE kdelibs-4.1.0-kcookiejar-crash.patch, 1.2,
	NONE kdelibs-4.1.0-kde#167826.patch, 1.2, NONE
Message-ID: <20080904094552.1759370120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1629/F-8

Modified Files:
	.cvsignore kdelibs4.spec sources 
Added Files:
	kdelibs-4.1.0-#455130.patch 
	kdelibs-4.1.1-kde#169447-khtml-regression.patch 
	kdelibs-4.1.1-kde#856379-cookiejar.patch 
	kdelibs-4.1.1-kde#856403-urlnav.patch 
Removed Files:
	kdelibs-4.0.98-revert-kinit-regression.patch 
	kdelibs-4.1.0-kcookiejar-crash.patch 
	kdelibs-4.1.0-kde#167826.patch 
Log Message:
Sync from kdelibs/devel:

* Wed Sep 03 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-5
- fixed crash on setting cookies on empty domains (like the file
  system), KDE bug #170147
- fix URL navigator focus in file dialogs, KDE bug #169497, #170211

* Tue Sep 02 2008 Than Ngo <than at redhat.com> 4.1.1-4
- apply patch to fix regression in khtml

* Mon Sep 01 2008 Than Ngo <than at redhat.com> 4.1.1-3
- respun

* Fri Aug 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
- fix #455130 (kinit crashing in kglobalconfig with no KComponentData) properly
- drop revert-kinit-regression hack (fixes ioslave translations)

* Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
- 4.1.1

kdelibs-4.1.0-#455130.patch:

--- NEW FILE kdelibs-4.1.0-#455130.patch ---
diff -ur kdelibs-4.1.0/kdecore/config/kconfiggroup.cpp kdelibs-4.1.0-#455130/kdecore/config/kconfiggroup.cpp
--- kdelibs-4.1.0/kdecore/config/kconfiggroup.cpp	2008-06-25 09:57:24.000000000 +0200
+++ kdelibs-4.1.0-#455130/kdecore/config/kconfiggroup.cpp	2008-08-29 14:48:54.000000000 +0200
@@ -393,7 +393,7 @@
 
             QString result;
             QByteArray oldpath = qgetenv( "PATH" );
-            QByteArray newpath = QFile::encodeName( KGlobal::dirs()->resourceDirs( "exe" ).join( QChar( KPATH_SEPARATOR ) ) );
+            QByteArray newpath = QFile::encodeName( KGlobal::hasMainComponent() ? KGlobal::dirs()->resourceDirs( "exe" ).join( QChar( KPATH_SEPARATOR ) ) : QString() );
             if( !newpath.isEmpty() && !oldpath.isEmpty() )
                 newpath += KPATH_SEPARATOR;
             newpath += oldpath;

kdelibs-4.1.1-kde#169447-khtml-regression.patch:

--- NEW FILE kdelibs-4.1.1-kde#169447-khtml-regression.patch ---
Index: khtml/rendering/render_layer.cpp
===================================================================
--- khtml/rendering/render_layer.cpp	(Revision 855359)
+++ khtml/rendering/render_layer.cpp	(Revision 855360)
@@ -397,7 +397,7 @@
                     }
                 }
             }
-            count = sc->m_negZOrderList ? sc->m_negZOrderList->count() : 0;
+            count = sc->m_posZOrderList ? sc->m_posZOrderList->count() : 0;
             if ( count > 0 ) {
                 needUpdate = true;
                 for (uint i = 0; i < count; i++) {

kdelibs-4.1.1-kde#856379-cookiejar.patch:

--- NEW FILE kdelibs-4.1.1-kde#856379-cookiejar.patch ---
Index: kioslave/http/kcookiejar/kcookiejar.cpp
===================================================================
--- kioslave/http/kcookiejar/kcookiejar.cpp	(revision 856378)
+++ kioslave/http/kcookiejar/kcookiejar.cpp	(revision 856379)
@@ -516,8 +516,10 @@
    extractDomains(_fqdn, domains);
    if (domains.count() > 3)
       _domain = domains[3];
+   else if ( domains.count() > 0 )
+      _domain = domains[0];
    else
-      _domain = domains[0];
+      _domain = L1("");
 }
 
 QString KCookieJar::stripDomain(const KHttpCookie& cookie)

kdelibs-4.1.1-kde#856403-urlnav.patch:

--- NEW FILE kdelibs-4.1.1-kde#856403-urlnav.patch ---
Index: kfile/kurlnavigator.cpp
===================================================================
--- kfile/kurlnavigator.cpp	(revision 856402)
+++ kfile/kurlnavigator.cpp	(revision 856403)
@@ -344,6 +344,7 @@
     // initialize the path box of the traditional view
     m_pathBox = new KUrlComboBox(KUrlComboBox::Both, true, q);
     m_pathBox->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
+    m_pathBox->installEventFilter(q);
 
     KUrlCompletion* kurlCompletion = new KUrlCompletion(KUrlCompletion::DirCompletion);
     m_pathBox->setCompletionObject(kurlCompletion);
@@ -1122,6 +1123,16 @@
     QWidget::resizeEvent(event);
 }
 
+bool KUrlNavigator::eventFilter(QObject* watched, QEvent* event)
+{
+    if ((watched == d->m_pathBox) && (event->type() == QEvent::FocusIn)) {
+        requestActivation();
+        setFocus();
+    }
+
+    return QWidget::eventFilter(watched, event);
+}
+
 int KUrlNavigator::historySize() const
 {
     return d->m_history.count();
Index: kfile/kurlnavigator.h
===================================================================
--- kfile/kurlnavigator.h	(revision 856402)
+++ kfile/kurlnavigator.h	(revision 856403)
@@ -312,6 +312,8 @@
     /* @see QWidget::resizeEvent() */
     virtual void resizeEvent(QResizeEvent* event);
 
+    virtual bool eventFilter(QObject* watched, QEvent* event);
+
 private:
     Q_PRIVATE_SLOT(d, void slotReturnPressed(const QString& text))
     Q_PRIVATE_SLOT(d, void slotReturnPressed())


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	24 Jul 2008 18:16:49 -0000	1.12
+++ .cvsignore	4 Sep 2008 09:45:21 -0000	1.13
@@ -1 +1 @@
-kdelibs-4.1.0.tar.bz2
+kdelibs-4.1.1.tar.bz2


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- kdelibs4.spec	29 Aug 2008 08:45:31 -0000	1.32
+++ kdelibs4.spec	4 Sep 2008 09:45:21 -0000	1.33
@@ -1,8 +1,8 @@
 %define _default_patch_fuzz 2
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.1.0
-Release: 9%{?dist}
+Version: 4.1.1
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -77,17 +77,13 @@
 Patch14: kdelibs-4.0.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.0-kstandarddirs.patch
-# revert a kinit patch which triggers an assertion failure in KComponentData
-# (and its followup) (#455130)
-Patch19: kdelibs-4.0.98-revert-kinit-regression.patch
+# fix running commands in kglobalconfig before KComponentData init (#455130)
+Patch19: kdelibs-4.1.0-#455130.patch
 
 ## upstream patches
-# konq processes never terminate, 
-# http://bugs.kde.org/167825 , http://bugzilla.redhat.com/457526
-Patch100: kdelibs-4.1.0-kde#167826.patch
-# fix kcookiejar crash on invalid cookie file from KDE 3
-# http://websvn.kde.org/?view=rev&revision=844830
-Patch101: kdelibs-4.1.0-kcookiejar-crash.patch
+Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
+Patch101: kdelibs-4.1.1-kde#856379-cookiejar.patch
+Patch102: kdelibs-4.1.1-kde#856403-urlnav.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -211,12 +207,12 @@
 %patch13 -p1 -b .fedora-buildtype
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
-%patch19 -p0 -b .kinit-regression
+%patch19 -p1 -b .#455130
 
 ## upstream patches
-%patch100 -p1 -b .kde#167826
-%patch101 -p0 -b .kcookiejar-crash
-
+%patch100 -p0 -b .kde#169447-khtml-regression
+%patch101 -p0 -b .kde#856379-cookiejar
+%patch102 -p0 -b .kde#856403-urlnav
 
 %build
 
@@ -377,6 +373,24 @@
 
 
 %changelog
+* Wed Sep 03 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-5
+- fixed crash on setting cookies on empty domains (like the file
+  system), KDE bug #170147
+- fix URL navigator focus in file dialogs, KDE bug #169497, #170211
+
+* Tue Sep 02 2008 Than Ngo <than at redhat.com> 4.1.1-4
+- apply patch to fix regression in khtml
+
+* Mon Sep 01 2008 Than Ngo <than at redhat.com> 4.1.1-3
+- respun
+
+* Fri Aug 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
+- fix #455130 (kinit crashing in kglobalconfig with no KComponentData) properly
+- drop revert-kinit-regression hack (fixes ioslave translations)
+
+* Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
+- 4.1.1
+
 * Fri Aug 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-9
 - -devel: +Requires: libutempter-devel (cmake wants to link it in)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	24 Jul 2008 18:16:50 -0000	1.12
+++ sources	4 Sep 2008 09:45:21 -0000	1.13
@@ -1 +1 @@
-86496aed25d4dce440418b3064a27913  kdelibs-4.1.0.tar.bz2
+d75ec557cd864e3f9150059c3e58ed61  kdelibs-4.1.1.tar.bz2


--- kdelibs-4.0.98-revert-kinit-regression.patch DELETED ---


--- kdelibs-4.1.0-kcookiejar-crash.patch DELETED ---


--- kdelibs-4.1.0-kde#167826.patch DELETED ---



From twaugh at fedoraproject.org  Thu Sep  4 09:49:14 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  4 Sep 2008 09:49:14 +0000 (UTC)
Subject: rpms/foomatic/devel .cvsignore, 1.67, 1.68 foomatic.spec, 1.203,
	1.204 sources, 1.69, 1.70
Message-ID: <20080904094914.995EA70120@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3019

Modified Files:
	.cvsignore foomatic.spec sources 
Log Message:
* Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com>
- Updated db-hpijs to 20080904.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	4 Sep 2008 09:28:11 -0000	1.67
+++ .cvsignore	4 Sep 2008 09:48:44 -0000	1.68
@@ -61,3 +61,4 @@
 foomatic-db-engine-3.0-20080904.tar.gz
 foomatic-filters-3.0-20080904.tar.gz
 foomatic-db-3.0-20080904.tar.gz
+foomatic-db-hpijs-20080904.tar.gz


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- foomatic.spec	4 Sep 2008 09:28:12 -0000	1.203
+++ foomatic.spec	4 Sep 2008 09:48:44 -0000	1.204
@@ -1,7 +1,7 @@
 %define dbver 20080904
 %define enginever 3.0-20080904
 %define filtersver 20080904
-%define hpijsver 20080710
+%define hpijsver 20080904
 
 Summary: Foomatic printer database.
 Name:		foomatic
@@ -241,6 +241,7 @@
 
 %changelog
 * Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com>
+- Updated db-hpijs to 20080904.
 - Updated db to 20080904.
 - Updated filters to 3.0-20080904.
 - Updated db-engine to 3.0-20080904.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	4 Sep 2008 09:28:12 -0000	1.69
+++ sources	4 Sep 2008 09:48:44 -0000	1.70
@@ -1,4 +1,4 @@
-35a3a1ebe3c09b9e9a126e31bceedd72  foomatic-db-hpijs-20080710.tar.gz
 d46d1a26a8199c8c5c618ad2cd17a68a  foomatic-db-engine-3.0-20080904.tar.gz
 ce3332981735ce5b50932640a6107220  foomatic-filters-3.0-20080904.tar.gz
 758ac14a7068a3c2016608d35c8994c7  foomatic-db-3.0-20080904.tar.gz
+a46f919c711547181d651509d771967e  foomatic-db-hpijs-20080904.tar.gz



From twaugh at fedoraproject.org  Thu Sep  4 09:51:23 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  4 Sep 2008 09:51:23 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic.spec,1.204,1.205
Message-ID: <20080904095123.79D4F70121@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3836

Modified Files:
	foomatic.spec 
Log Message:
3.0.2-65


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- foomatic.spec	4 Sep 2008 09:48:44 -0000	1.204
+++ foomatic.spec	4 Sep 2008 09:50:53 -0000	1.205
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    64%{?dist}
+Release:    65%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -240,7 +240,7 @@
 %{_var}/cache/foomatic
 
 %changelog
-* Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com>
+* Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-65
 - Updated db-hpijs to 20080904.
 - Updated db to 20080904.
 - Updated filters to 3.0-20080904.



From twaugh at fedoraproject.org  Thu Sep  4 10:03:58 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  4 Sep 2008 10:03:58 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic.spec, 1.205,
	1.206 foomatic-ampathxml.patch, 1.1,
	NONE foomatic-db-engine-xml-cflags.patch, 1.1, NONE
Message-ID: <20080904100358.5C6D270120@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7350

Modified Files:
	foomatic.spec 
Removed Files:
	foomatic-ampathxml.patch foomatic-db-engine-xml-cflags.patch 
Log Message:
* Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-65
- Removed ampathxml and xml-cflags patches.



Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- foomatic.spec	4 Sep 2008 09:50:53 -0000	1.205
+++ foomatic.spec	4 Sep 2008 10:03:28 -0000	1.206
@@ -27,12 +27,6 @@
 # Set GS_FONTPATH in gs wrapper (bug #81410).
 Patch5: foomatic-2.0.2-fontpath.patch
 
-# Fix 3.0.2 build.
-Patch10: foomatic-db-engine-xml-cflags.patch
-
-# Make foomatic-db-engine build.
-Patch14: foomatic-ampathxml.patch
-
 # Handle non-UTF-8 encodings in imported PPD files.
 Patch15: foomatic-bad-utf8.patch
 
@@ -88,8 +82,6 @@
 pushd foomatic-db-engine-%{enginever}
 chmod a+x mkinstalldirs
 %patch2 -p1 -b .libdir
-%patch14 -p1 -b .ampathxml
-%patch10 -p1 -b .xml-cflags
 %patch15 -p1
 ./make_configure
 popd
@@ -241,6 +233,7 @@
 
 %changelog
 * Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-65
+- Removed ampathxml and xml-cflags patches.
 - Updated db-hpijs to 20080904.
 - Updated db to 20080904.
 - Updated filters to 3.0-20080904.


--- foomatic-ampathxml.patch DELETED ---


--- foomatic-db-engine-xml-cflags.patch DELETED ---



From kraxel at fedoraproject.org  Thu Sep  4 10:54:08 2008
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Thu,  4 Sep 2008 10:54:08 +0000 (UTC)
Subject: rpms/xenner/devel .cvsignore, 1.20, 1.21 sources, 1.19,
	1.20 xenner.spec, 1.32, 1.33
Message-ID: <20080904105408.1F37070123@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xenner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21197

Modified Files:
	.cvsignore sources xenner.spec 
Log Message:
- update to version 0.44


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	1 Sep 2008 14:41:22 -0000	1.20
+++ .cvsignore	4 Sep 2008 10:53:37 -0000	1.21
@@ -1 +1 @@
-xenner-0.43.tar.gz
+xenner-0.44.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	1 Sep 2008 14:41:22 -0000	1.19
+++ sources	4 Sep 2008 10:53:37 -0000	1.20
@@ -1 +1 @@
-bdc9fd4b7b2dcd83c4e0722bc5c19e9a  xenner-0.43.tar.gz
+ddb4ff50a64ee1a84f9d3337c09b1c79  xenner-0.44.tar.gz


Index: xenner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/devel/xenner.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xenner.spec	1 Sep 2008 15:16:04 -0000	1.32
+++ xenner.spec	4 Sep 2008 10:53:37 -0000	1.33
@@ -1,6 +1,6 @@
 Name:         xenner
 License:      GPLv2+
-Version:      0.43
+Version:      0.44
 Release:      1%{?dist}
 Summary:      Xen emulator for kvm
 Group:        Applications/Emulators
@@ -33,7 +33,6 @@
 rm -rf %{buildroot}
 make prefix="%{_prefix}" DESTDIR=%{buildroot} STRIP="" install
 chmod 644 vivm # make rpmlint happy (this goes to %doc)
-rm -f %{buildroot}/usr/lib*/xenner/hvm*.elf
 
 %files
 %defattr(-,root,root)
@@ -58,6 +57,8 @@
 rm -rf %{buildroot}
 
 %changelog
+* Thu Sep 4 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.44-1.fc10
+- update to version 0.44
 * Mon Sep 1 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.43-1.fc10
 - update to version 0.43
 * Fri Aug 29 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.42-1.fc10



From tsmetana at fedoraproject.org  Thu Sep  4 11:27:58 2008
From: tsmetana at fedoraproject.org (Tomas Smetana)
Date: Thu,  4 Sep 2008 11:27:58 +0000 (UTC)
Subject: rpms/gocr/devel gocr.spec,1.6,1.7
Message-ID: <20080904112758.7EC7270120@cvs1.fedora.phx.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gocr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29541

Modified Files:
	gocr.spec 
Log Message:
* Thu Sep 04 2008 Tomas Smetana <tsmetana at redhat.com> - 0.45-3
- remove the unusable devel package again (related #344721)



Index: gocr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gocr/devel/gocr.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gocr.spec	13 Feb 2008 10:59:51 -0000	1.6
+++ gocr.spec	4 Sep 2008 11:27:26 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gocr
 Version:        0.45
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNU Optical Character Recognition program
 
 Group:          Applications/Multimedia
@@ -23,18 +23,6 @@
 to different OSes and architectures. It can open many different image
 formats, and its quality have been improving in a daily basis.
 
-%package devel
-Group:          Applications/Multimedia
-Summary:        GNU Optical Character Recognition program development files
-# not strictly required
-Requires:       %{name} = %{version}-%{release}
-Provides:       %{name}-static = %{version}-%{release}
-
-%description devel
-This package enables you to develop applications capable of image to text
-conversion using Pgm2asc library which is part of GOCR. Install this package
-if you want to develop text recognition programs using Pgm2asc.
-
 %prep
 %setup -q
 %patch0 -p1 -b .perms
@@ -48,6 +36,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+# Don't ship static library
+rm -rf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}
 # Don't ship buggy Tcl/Tk frontend
 rm $RPM_BUILD_ROOT/%{_bindir}/gocr.tcl
 
@@ -62,12 +52,10 @@
 %{_bindir}/gocr
 %{_mandir}/man1/gocr.1*
 
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/gocr.h
-%{_libdir}/libPgm2asc.a
-
 %changelog
+* Thu Sep 04 2008 Tomas Smetana <tsmetana at redhat.com> - 0.45-3
+- remove the unusable devel package again (related #344721)
+
 * Wed Feb 13 2008 Tomas Smetana <tsmetana at redhat.com> - 0.45-2
 - rebuild (gcc-4.3)
 



From tsmetana at fedoraproject.org  Thu Sep  4 11:38:29 2008
From: tsmetana at fedoraproject.org (Tomas Smetana)
Date: Thu,  4 Sep 2008 11:38:29 +0000 (UTC)
Subject: rpms/gocr/devel gocr.spec,1.7,1.8
Message-ID: <20080904113829.DEF8D70120@cvs1.fedora.phx.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gocr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32726

Modified Files:
	gocr.spec 
Log Message:
* Thu Sep 04 2008 Tomas Smetana <tsmetana at redhat.com> - 0.45-4
- and obsolete the devel package



Index: gocr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gocr/devel/gocr.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gocr.spec	4 Sep 2008 11:27:26 -0000	1.7
+++ gocr.spec	4 Sep 2008 11:37:59 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gocr
 Version:        0.45
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GNU Optical Character Recognition program
 
 Group:          Applications/Multimedia
@@ -13,6 +13,7 @@
 BuildRequires:  netpbm-devel
 # Needed for conversion programs
 Requires:       gzip, bzip2, libjpeg, netpbm-progs, transfig
+Obsoletes:      %{name}-devel <= 0.45-2
 
 %description
 GOCR is an OCR (Optical Character Recognition) program, developed under the
@@ -53,6 +54,9 @@
 %{_mandir}/man1/gocr.1*
 
 %changelog
+* Thu Sep 04 2008 Tomas Smetana <tsmetana at redhat.com> - 0.45-4
+- and obsolete the devel package
+
 * Thu Sep 04 2008 Tomas Smetana <tsmetana at redhat.com> - 0.45-3
 - remove the unusable devel package again (related #344721)
 



From tsmetana at fedoraproject.org  Thu Sep  4 11:43:52 2008
From: tsmetana at fedoraproject.org (Tomas Smetana)
Date: Thu,  4 Sep 2008 11:43:52 +0000 (UTC)
Subject: rpms/gocr/devel gocr.spec,1.8,1.9
Message-ID: <20080904114352.85C0E70120@cvs1.fedora.phx.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gocr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1814

Modified Files:
	gocr.spec 
Log Message:
fix a typo in version


Index: gocr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gocr/devel/gocr.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gocr.spec	4 Sep 2008 11:37:59 -0000	1.8
+++ gocr.spec	4 Sep 2008 11:43:22 -0000	1.9
@@ -13,7 +13,7 @@
 BuildRequires:  netpbm-devel
 # Needed for conversion programs
 Requires:       gzip, bzip2, libjpeg, netpbm-progs, transfig
-Obsoletes:      %{name}-devel <= 0.45-2
+Obsoletes:      %{name}-devel <= 0.45-4
 
 %description
 GOCR is an OCR (Optical Character Recognition) program, developed under the



From kkofler at fedoraproject.org  Thu Sep  4 12:01:46 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 12:01:46 +0000 (UTC)
Subject: rpms/kdeaddons/F-9 .cvsignore, 1.36, 1.37 kdeaddons.spec, 1.72,
	1.73 sources, 1.39, 1.40
Message-ID: <20080904120146.7F9D870120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeaddons/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6791/F-9

Modified Files:
	.cvsignore kdeaddons.spec sources 
Log Message:
Sync from devel:

* Sat Aug 30 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.10-1
- update to 3.5.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/F-9/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	15 Feb 2008 07:39:44 -0000	1.36
+++ .cvsignore	4 Sep 2008 12:01:16 -0000	1.37
@@ -1 +1 @@
-kdeaddons-3.5.9.tar.bz2
+kdeaddons-3.5.10.tar.bz2


Index: kdeaddons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/F-9/kdeaddons.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- kdeaddons.spec	15 Feb 2008 07:39:44 -0000	1.72
+++ kdeaddons.spec	4 Sep 2008 12:01:16 -0000	1.73
@@ -6,7 +6,7 @@
 
 Name:    kdeaddons
 Summary: K Desktop Environment - Plugins
-Version: 3.5.9
+Version: 3.5.10
 Release: 1%{?dist}
 License: GPLv2
 Group: User Interface/Desktops
@@ -53,7 +53,6 @@
 
 %install
 rm -rf %{buildroot}
-mkdir %{buildroot}
 
 export DO_NOT_COMPILE="%{donotcompilelist}"
 make install DESTDIR=%{buildroot}
@@ -82,6 +81,9 @@
 
 
 %changelog
+* Sat Aug 30 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.10-1
+- update to 3.5.10
+
 * Fri Feb 15 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-1
 - update to 3.5.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/F-9/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	15 Feb 2008 07:39:44 -0000	1.39
+++ sources	4 Sep 2008 12:01:16 -0000	1.40
@@ -1 +1 @@
-eaa3832a25b483d1a9613f75991c3d7b  kdeaddons-3.5.9.tar.bz2
+c69d082407b2c1bb46d078f8ac5d2bea  kdeaddons-3.5.10.tar.bz2



From kkofler at fedoraproject.org  Thu Sep  4 12:14:34 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 12:14:34 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-8 .cvsignore, 1.16,
	1.17 kdeaccessibility.spec, 1.36, 1.37 sources, 1.17,
	1.18 kdeaccessibility-3.5.7-desktop-file.patch, 1.1, NONE
Message-ID: <20080904121434.854FA70120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeaccessibility/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10271/F-8

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Removed Files:
	kdeaccessibility-3.5.7-desktop-file.patch 
Log Message:
* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:3.5.10-1
- update to 3.5.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-8/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	16 Feb 2008 01:20:02 -0000	1.16
+++ .cvsignore	4 Sep 2008 12:14:03 -0000	1.17
@@ -1 +1 @@
-kdeaccessibility-3.5.9.tar.bz2
+kdeaccessibility-3.5.10.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-8/kdeaccessibility.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- kdeaccessibility.spec	16 Feb 2008 01:20:02 -0000	1.36
+++ kdeaccessibility.spec	4 Sep 2008 12:14:03 -0000	1.37
@@ -8,7 +8,7 @@
 Summary: K Desktop Environment - Accessibility
 Name:    kdeaccessibility
 Epoch:   1
-Version: 3.5.9
+Version: 3.5.10
 Release: 1%{?dist}
 
 License: GPLv2
@@ -17,10 +17,6 @@
 Url: http://accessibility.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
-# what's this for?  
-# anything other than to make rpmlint/desktop-file-install happy?  -- Rex
-Patch1: kdeaccessibility-3.5.7-desktop-file.patch
-
 %if ! 0%{?devel}
 # helps multilib upgrades
 Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
@@ -60,8 +56,6 @@
 %prep
 %setup -q
 
-#patch1 -p1 -b .desktop-file
-
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -164,6 +158,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:3.5.10-1
+- update to 3.5.10
+
 * Fri Feb 15 2008 Rex Dieter <rdieter at fedoraproject.org> - 1:3.5.9-1
 - kde-3.5.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-8/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	16 Feb 2008 01:20:02 -0000	1.17
+++ sources	4 Sep 2008 12:14:04 -0000	1.18
@@ -1 +1 @@
-79c7fa53ec60ad51fbdb16aac56d85a1  kdeaccessibility-3.5.9.tar.bz2
+feb1582b9acc573cef8cd357d8a7bc1d  kdeaccessibility-3.5.10.tar.bz2


--- kdeaccessibility-3.5.7-desktop-file.patch DELETED ---



From kkofler at fedoraproject.org  Thu Sep  4 12:23:31 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 12:23:31 +0000 (UTC)
Subject: rpms/kdeadmin/F-8 .cvsignore, 1.38, 1.39 kdeadmin.spec, 1.82,
	1.83 sources, 1.40, 1.41
Message-ID: <20080904122331.56C2D70120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeadmin/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12589/F-8

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 7:3.5.10-1
- update to 3.5.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-8/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	16 Feb 2008 01:34:33 -0000	1.38
+++ .cvsignore	4 Sep 2008 12:23:00 -0000	1.39
@@ -1 +1 @@
-kdeadmin-3.5.9.tar.bz2
+kdeadmin-3.5.10.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-8/kdeadmin.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- kdeadmin.spec	14 May 2008 15:20:01 -0000	1.82
+++ kdeadmin.spec	4 Sep 2008 12:23:00 -0000	1.83
@@ -5,8 +5,8 @@
 Name:    kdeadmin
 Summary: Administrative tools for KDE
 Epoch:   7
-Version: 3.5.9
-Release: 2%{?dist}
+Version: 3.5.10
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -166,6 +166,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 7:3.5.10-1
+- update to 3.5.10
+
 * Wed May 14 2008 Than Ngo <than at redhat.com> -  3.5.9-2
 - fix #420631, kcron silent option is broken
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-8/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	16 Feb 2008 01:34:33 -0000	1.40
+++ sources	4 Sep 2008 12:23:00 -0000	1.41
@@ -1 +1 @@
-e6607ea27b332616d20f4564656cb885  kdeadmin-3.5.9.tar.bz2
+eb23c52c945f31a48f2c9df4330a1262  kdeadmin-3.5.10.tar.bz2



From twaugh at fedoraproject.org  Thu Sep  4 12:41:06 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  4 Sep 2008 12:41:06 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.439,1.440
Message-ID: <20080904124106.485D170120@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17628

Modified Files:
	cups.spec 
Log Message:
* Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com>
- Use php-cgi for executing PHP scripts (bug #460898).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -r1.439 -r1.440
--- cups.spec	3 Sep 2008 16:46:54 -0000	1.439
+++ cups.spec	4 Sep 2008 12:40:34 -0000	1.440
@@ -210,6 +210,7 @@
 %endif
 	--with-log-file-perm=0600 --enable-pie --enable-relro \
 	--enable-pdftops --with-dbusdir=%{_sysconfdir}/dbus-1 \
+	--with-php=/usr/bin/php-cgi \
 	localedir=%{_datadir}/locale
 
 # If we got this far, all prerequisite libraries must be here.
@@ -478,6 +479,9 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com>
+- Use php-cgi for executing PHP scripts (bug #460898).
+
 * Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.8-5
 - The dnssd backend uses avahi-browse so require it (bug #458565).
 - New php sub-package (bug #428235).



From kkofler at fedoraproject.org  Thu Sep  4 12:48:25 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 12:48:25 +0000 (UTC)
Subject: rpms/kdemultimedia/F-8 .cvsignore, 1.40, 1.41 kdemultimedia.spec,
	1.95, 1.96 sources, 1.42, 1.43
Message-ID: <20080904124825.E57D070120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdemultimedia/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19529/F-8

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-1
- update to 3.5.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-8/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	16 Feb 2008 13:48:04 -0000	1.40
+++ .cvsignore	4 Sep 2008 12:47:53 -0000	1.41
@@ -1 +1 @@
-kdemultimedia-3.5.9-patched.tar.bz2
+kdemultimedia-3.5.10-patched.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-8/kdemultimedia.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- kdemultimedia.spec	9 Apr 2008 15:50:10 -0000	1.95
+++ kdemultimedia.spec	4 Sep 2008 12:47:53 -0000	1.96
@@ -25,8 +25,8 @@
 Name:    kdemultimedia
 Summary: Multimedia applications for the K Desktop Environment (KDE)
 Epoch:   6
-Version: 3.5.9
-Release: 2%{?dist}
+Version: 3.5.10
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Multimedia
@@ -39,7 +39,8 @@
 # 2. mv kdemultimedia-%{version} kdemultimedia-%{version}-%{patch}
 # 3. (cd kdemultimedia-%{version}-%{patch}; rm -rf %nonfree_bits )
 # 4. remove %nonfree_bits from kdemultimedia-%{version}-%{patch}/subdirs
-# 5. tar cjf kdemultimedia-%{version}-%{patch}.tar.bz2 kdemultimedia-%{version}-%{patch}
+# 5. remove kmid/examples (see Patch4 and the F9+ standalone kmid package)
+# 6. tar cjf kdemultimedia-%{version}-%{patch}.tar.bz2 kdemultimedia-%{version}-%{patch}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}-%{patch}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -423,6 +424,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-1
+- update to 3.5.10
+
 * Wed Apr 09 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-2
 - -extras-libs,-libs: omit multilib Obsoletes hack (#435956)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-8/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	16 Feb 2008 13:48:04 -0000	1.42
+++ sources	4 Sep 2008 12:47:53 -0000	1.43
@@ -1 +1 @@
-a8a3bdc863b6911c6139099252e1674b  kdemultimedia-3.5.9-patched.tar.bz2
+046d02d590cef9ab365401d6a120a910  kdemultimedia-3.5.10-patched.tar.bz2



From mmahut at fedoraproject.org  Thu Sep  4 12:52:55 2008
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Thu,  4 Sep 2008 12:52:55 +0000 (UTC)
Subject: rpms/ircd-ratbox/F-9 ircd-ratbox.spec,1.1,1.2
Message-ID: <20080904125255.C736770120@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/ircd-ratbox/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20905

Modified Files:
	ircd-ratbox.spec 
Log Message:
typo in the spec file, grr



Index: ircd-ratbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ircd-ratbox/F-9/ircd-ratbox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ircd-ratbox.spec	31 Aug 2008 15:13:43 -0000	1.1
+++ ircd-ratbox.spec	4 Sep 2008 12:52:53 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		ircd-ratbox
 Version:	2.2.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Ircd-ratbox is an advanced, stable and fast ircd	
 
 License:	GPLv2
@@ -38,7 +38,6 @@
 Ircd-mkpasswd is a password hash generator for ircd-ratbox.
 
 %prep
-echo  %{_var}
 %setup -q 
 %patch0 -p1 -b .offbyone
 
@@ -46,7 +45,7 @@
 	-e 's|#servlink_path = "/usr/local/ircd/bin/servlink";|servlink_path = "%{_bindir}/servlink";|'		\
 	-e 's|/usr/local/ircd/modules|%{_datadir}/ircd/modules|g'						\
 	-e 's|/usr/local/ircd/etc/|%{_sysconfdir}/ircd|g'							\
-	-e 's|"logs/|"%{_var}log|g'										\
+	-e 's|"logs/|"%{_var}/log|g'										\
 doc/example.*conf
 
 sed 's/-Werror//g' -i configure
@@ -58,7 +57,7 @@
 	--with-moduledir=%{_datadir}/ircd/modules	\
 	--with-confdir=%{_sysconfdir}/ircd		\
 	--mandir=%{_mandir}				\
-	--with-logdir=%{_var}log/ircd			\
+	--with-logdir=%{_var}/log/ircd			\
 	--enable-ipv6					\
 	--enable-openssl				\
 	--enable-zlib					\
@@ -72,7 +71,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_datadir}/ircd $RPM_BUILD_ROOT%{_var}log $RPM_BUILD_ROOT%{_sysconfdir}/ircd
+mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_datadir}/ircd $RPM_BUILD_ROOT%{_var}/log $RPM_BUILD_ROOT%{_sysconfdir}/ircd
 make install DESTDIR=$RPM_BUILD_ROOT
 install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/ircd
 install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/ircd
@@ -89,7 +88,7 @@
 %pre
 getent group ircd  >/dev/null || groupadd -r ircd
 getent passwd ircd >/dev/null || \
-useradd -r -g ircd -m -d %{_var}run/ircd-ratbox -s /sbin/nologin \
+useradd -r -g ircd -m -d %{_var}/run/ircd-ratbox -s /sbin/nologin \
 	-c "ircd-ratbox user" ircd
 
 %post
@@ -122,12 +121,12 @@
 %{_sysconfdir}/sysconfig/ircd
 %{_sysconfdir}/init.d/ircd
 %doc %{_mandir}/man8/ircd*
-%dir %attr(750,ircd,ircd) %{_var}log/ircd
+%dir %attr(750,ircd,ircd) %{_var}/log/ircd
 %config(noreplace) %{_sysconfdir}/logrotate.d/ircd
 
 %files mkpasswd
 %{_bindir}/ircd-mkpasswd
 
 %changelog
-* Wed Aug 27 2008 Marek Mahut <mmahut at fedoraproject.org> - 2.2.8-1
+* Wed Aug 27 2008 Marek Mahut <mmahut at fedoraproject.org> - 2.2.8-2
 - Initial package build



From sgrubb at fedoraproject.org  Thu Sep  4 13:08:34 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Thu,  4 Sep 2008 13:08:34 +0000 (UTC)
Subject: rpms/libprelude/devel libprelude.spec,1.21,1.22
Message-ID: <20080904130834.EC16870120@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25181

Modified Files:
	libprelude.spec 
Log Message:
doing a test for ppc64



Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libprelude.spec	3 Sep 2008 21:17:52 -0000	1.21
+++ libprelude.spec	4 Sep 2008 13:08:03 -0000	1.22
@@ -108,7 +108,8 @@
 touch -r ./configure.in %{buildroot}%{_sysconfdir}/prelude/default/*
 
 %check
-make check
+cd tests
+make valgrind
 
 %clean
 rm -rf %{buildroot}



From jcollie at fedoraproject.org  Thu Sep  4 13:11:14 2008
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu,  4 Sep 2008 13:11:14 +0000 (UTC)
Subject: rpms/zaptel/devel zaptel.spec,1.28,1.29
Message-ID: <20080904131114.BC3E570120@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/zaptel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26058

Modified Files:
	zaptel.spec 
Log Message:
* Thu Sep  4 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.12-1
- Update to 1.4.12



Index: zaptel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zaptel/devel/zaptel.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- zaptel.spec	11 Aug 2008 23:48:12 -0000	1.28
+++ zaptel.spec	4 Sep 2008 13:10:42 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces
 Name: zaptel
-Version: 1.4.11
-Release: 2%{?dist}
+Version: 1.4.12
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.digium.com/
@@ -181,6 +181,9 @@
 %{_libdir}/libtonezone.so
 
 %changelog
+* Thu Sep  4 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.12-1
+- Update to 1.4.12
+
 * Mon Aug 11 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.4.11-2
 - Fix license tag.
 



From mkasik at fedoraproject.org  Thu Sep  4 13:20:05 2008
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Thu,  4 Sep 2008 13:20:05 +0000 (UTC)
Subject: rpms/gtk2/F-9 cups-unix-domain-socket.patch, NONE, 1.1 gtk2.spec,
	1.295, 1.296
Message-ID: <20080904132005.C8BEA70120@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/gtk2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29000

Modified Files:
	gtk2.spec 
Added Files:
	cups-unix-domain-socket.patch 
Log Message:
* Thu Sep  4 2008 Marek Kasik <mkasik at redhat.com> - 2.12.11-2
- Add ability to comunicate with CUPS through Unix domain socket
- Resolves: #455742


cups-unix-domain-socket.patch:

--- NEW FILE cups-unix-domain-socket.patch ---
--- modules/printbackends/cups/gtkprintbackendcups.c	2008-09-03 16:58:29.000000000 +0200
+++ modules/printbackends/cups/gtkprintbackendcups.c	2008-09-03 16:57:39.000000000 +0200
@@ -1181,6 +1181,7 @@ cups_request_printer_list_cb (GtkPrintBa
 	  char hostname[HTTP_MAX_URI];	/* Hostname */
 	  char resource[HTTP_MAX_URI];	/* Resource name */
 	  int  port;			/* Port number */
+	  char *cups_server;            /* CUPS server */
 	  
           list_has_changed = TRUE;
 	  cups_printer = gtk_printer_cups_new (printer_name, backend);
@@ -1227,8 +1228,14 @@ cups_request_printer_list_cb (GtkPrintBa
             }
 
 	  gethostname (uri, sizeof (uri));
-	  if (strcasecmp (uri, hostname) == 0)
-	    strcpy (hostname, "localhost");
+	  cups_server = g_strdup (cupsServer());
+
+	  if ((strcasecmp (uri, hostname) == 0) ||
+	      ((strstr (hostname, "localhost") != NULL) &&
+	       (cups_server[0] == '/')))
+	    strcpy (hostname, cups_server);
+
+	  g_free (cups_server);
 
 	  cups_printer->hostname = g_strdup (hostname);
 	  cups_printer->port = port;


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-9/gtk2.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- gtk2.spec	1 Jul 2008 22:05:46 -0000	1.295
+++ gtk2.spec	4 Sep 2008 13:20:04 -0000	1.296
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2
@@ -52,6 +52,9 @@
 # fixed upstream
 Patch14: empty-modmap-crash.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=455742
+Patch15: cups-unix-domain-socket.patch
+
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -133,6 +136,7 @@
 %patch4 -p1 -b .im-setting
 %patch10 -p0 -b .printer-state
 %patch13 -p0 -b .printer-paper-size
+%patch15 -p0 -b .cuds
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -325,6 +329,10 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Thu Sep  4 2008 Marek Kasik <mkasik at redhat.com> - 2.12.11-2
+- Add ability to comunicate with CUPS through Unix domain socket
+- Resolves: #455742
+
 * Tue Jul  1 2008 Matthias Clasen <mclasen at redhat.com> - 2.12.11-1
 - Update to 2.12.11
 



From dcnomura at fedoraproject.org  Thu Sep  4 13:33:00 2008
From: dcnomura at fedoraproject.org (Dave Nomura)
Date: Thu,  4 Sep 2008 13:33:00 +0000 (UTC)
Subject: rpms/stapitrace/devel stapitrace.spec,1.10,1.11
Message-ID: <20080904133301.1CE3D70123@cvs1.fedora.phx.redhat.com>

Author: dcnomura

Update of /cvs/pkgs/rpms/stapitrace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32580

Modified Files:
	stapitrace.spec 
Log Message:
try looking for libbfd.* and libopcodes.* in gcc-devel



Index: stapitrace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stapitrace/devel/stapitrace.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- stapitrace.spec	3 Sep 2008 17:17:10 -0000	1.10
+++ stapitrace.spec	4 Sep 2008 13:32:29 -0000	1.11
@@ -6,15 +6,15 @@
 Name:		stapitrace
 Summary:	Instruction Tracing Tool
 Version:	1.0.0
-Release:	8.%{alphatag}%{?dist}
+Release:	9.%{alphatag}%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://sourceforge.net/projects/perfinsp
 Source0:	%{name}-%{version}.%{alphatag}.tar.gz
 Patch0:		itrace_fix1.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
-Requires:	systemtap systemtap-runtime
-BuildRequires:	binutils binutils-devel autoconf automake libbfd libopcodes
+Requires:	systemtap systemtap-runtime binutils-devel gcc-devel
+BuildRequires:	binutils binutils-devel autoconf automake gcc-devel
 ExclusiveArch:	ppc
 
 %description



From jcollie at fedoraproject.org  Thu Sep  4 13:42:26 2008
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu,  4 Sep 2008 13:42:26 +0000 (UTC)
Subject: rpms/zaptel/devel .cvsignore,1.14,1.15 sources,1.14,1.15
Message-ID: <20080904134226.40CCE70120@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/zaptel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3481

Modified Files:
	.cvsignore sources 
Log Message:
Upload sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zaptel/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	29 May 2008 04:14:29 -0000	1.14
+++ .cvsignore	4 Sep 2008 13:41:54 -0000	1.15
@@ -1 +1 @@
-zaptel-1.4.11.tar.gz
+zaptel-1.4.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zaptel/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	29 May 2008 04:14:29 -0000	1.14
+++ sources	4 Sep 2008 13:41:54 -0000	1.15
@@ -1 +1 @@
-894d548d180fddf360de1c0426a68bac  zaptel-1.4.11.tar.gz
+95789a0960c82da6aaf63cf9736af066  zaptel-1.4.12.tar.gz



From kkofler at fedoraproject.org  Thu Sep  4 13:44:56 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 13:44:56 +0000 (UTC)
Subject: rpms/kdemultimedia/F-8 kdemultimedia.spec,1.96,1.97
Message-ID: <20080904134456.B2FC170120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdemultimedia/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4526/F-8

Modified Files:
	kdemultimedia.spec 
Log Message:
* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-2
- drop FORTIFY_SOURCE hack, the misuse of open should be fixed since 3.5.9


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-8/kdemultimedia.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- kdemultimedia.spec	4 Sep 2008 12:47:53 -0000	1.96
+++ kdemultimedia.spec	4 Sep 2008 13:44:23 -0000	1.97
@@ -26,7 +26,7 @@
 Summary: Multimedia applications for the K Desktop Environment (KDE)
 Epoch:   6
 Version: 3.5.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Multimedia
@@ -194,12 +194,7 @@
   %{?_with_taglib} %{!?_with_taglib:--without-taglib} \
   %{?_with_xine} %{!?_with_xine:--without-xine}
 
-# FIXME: See http://bugzilla.redhat.com/330971
-make %{?_smp_mflags} -k || \
-  sed -i -e "s|-Wp,-D_FORTIFY_SOURCE=2||" noatun/modules/artseffects/Makefile && \
-  make %{?_smp_mflags}
-
-make %{?_smp_mflags} -C kaudiocreator
+make %{?_smp_mflags}
 
 
 %install
@@ -424,6 +419,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-2
+- drop FORTIFY_SOURCE hack, the misuse of open should be fixed since 3.5.9
+
 * Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-1
 - update to 3.5.10
 



From mlichvar at fedoraproject.org  Thu Sep  4 13:46:15 2008
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu,  4 Sep 2008 13:46:15 +0000 (UTC)
Subject: rpms/pinfo/devel pinfo-0.6.9-infopath.patch, NONE, 1.1 pinfo.spec, 
	1.34, 1.35
Message-ID: <20080904134616.1B5EC70120@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/pinfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4261

Modified Files:
	pinfo.spec 
Added Files:
	pinfo-0.6.9-infopath.patch 
Log Message:
- modify default search path for info pages so that current
  directory is searched last (#458633)


pinfo-0.6.9-infopath.patch:

--- NEW FILE pinfo-0.6.9-infopath.patch ---
diff -up pinfo-0.6.9/src/datatypes.c.infopath pinfo-0.6.9/src/datatypes.c
--- pinfo-0.6.9/src/datatypes.c.infopath	2006-03-09 21:54:53.000000000 +0100
+++ pinfo-0.6.9/src/datatypes.c	2008-09-04 15:14:20.000000000 +0200
@@ -31,7 +31,7 @@ char *ftpviewer = "lynx";
 char *maileditor = "mail";
 char *printutility = "lpr";
 char *manlinks = "1:8:2:3:4:5:6:7:9:n:l:p:o:3X11:3Xt:3X:3x";
-char *configuredinfopath = ".:/usr/share/info:/usr/info:/usr/local/share/info:/usr/local/info:/opt/info";
+char *configuredinfopath = "/usr/share/info:/usr/info:/usr/local/share/info:/usr/local/info:/opt/info:.";
 char *ignoredmacros = 0;
 char *rcfile = NULL;
 


Index: pinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinfo/devel/pinfo.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- pinfo.spec	1 Apr 2008 14:56:30 -0000	1.34
+++ pinfo.spec	4 Sep 2008 13:45:43 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: An info file viewer
 Name: pinfo
 Version: 0.6.9
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: System Environment/Base
 License: GPLv2
 URL: http://pinfo.alioth.debian.org
@@ -10,6 +10,7 @@
 Patch2: pinfo-0.6.9-infosuff.patch
 Patch3: pinfo-0.6.9-nogroup.patch
 Patch4: pinfo-0.6.9-mansection.patch
+Patch5: pinfo-0.6.9-infopath.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ncurses-devel
@@ -29,6 +30,7 @@
 %patch2 -p1 -b .infosuff
 %patch3 -p1 -b .nogroup
 %patch4 -p1 -b .mansection
+%patch5 -p1 -b .infopath
 
 %build
 %configure --without-readline
@@ -72,6 +74,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Sep 04 2008 Miroslav Lichvar <mlichvar at redhat.com> 0.6.9-8
+- modify default search path for info pages so that current
+  directory is searched last (#458633)
+
 * Tue Apr  1 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.9-7
 - drop symbolic links to avoid file conflict with perl-pmtools (bz 437612)
 



From jmoskovc at fedoraproject.org  Thu Sep  4 13:53:40 2008
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Thu,  4 Sep 2008 13:53:40 +0000 (UTC)
Subject: rpms/rusers/devel netkit-rusers-0.17-truncate.patch, 1.1,
	1.2 rusers.spec, 1.29, 1.30
Message-ID: <20080904135340.8529E70120@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/rusers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6537

Modified Files:
	netkit-rusers-0.17-truncate.patch rusers.spec 
Log Message:
modified truncate patch to work with fuzz=0


netkit-rusers-0.17-truncate.patch:

Index: netkit-rusers-0.17-truncate.patch
===================================================================
RCS file: /cvs/extras/rpms/rusers/devel/netkit-rusers-0.17-truncate.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netkit-rusers-0.17-truncate.patch	9 Sep 2004 11:57:10 -0000	1.1
+++ netkit-rusers-0.17-truncate.patch	4 Sep 2008 13:53:38 -0000	1.2
@@ -1,6 +1,6 @@
---- netkit-rusers-0.17/rpc.rusersd/rusers_proc.c.orig  Mon Aug 28 20:06:36 2000
-+++ netkit-rusers-0.17/rpc.rusersd/rusers_proc.c       Mon Aug 28 21:59:34 2000
-@@ -300,7 +300,11 @@
+--- netkit-rusers-0.17/rpc.rusersd/rusers_proc.c	2008-09-04 15:34:47.000000000 +0200
++++ netkit-rusers-0.17_new/rpc.rusersd/rusers_proc.c	2008-09-04 15:18:34.000000000 +0200
+@@ -309,7 +309,11 @@ rusersproc_allnames_3(void *tmp1, CLIENT
  
  static void do_strncpy(char *tgt, const char *src, size_t len) {
      strncpy(tgt, src, len);
@@ -11,4 +11,4 @@
 +#endif /* BROKEN_UTMP */
  }
  
- static
+ static 


Index: rusers.spec
===================================================================
RCS file: /cvs/extras/rpms/rusers/devel/rusers.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- rusers.spec	19 Feb 2008 06:37:07 -0000	1.29
+++ rusers.spec	4 Sep 2008 13:53:38 -0000	1.30
@@ -5,7 +5,7 @@
 Summary: Displays the users logged into machines on the local network.
 Name: rusers
 Version: 0.17
-Release: 53%{?dist}
+Release: 54%{?dist}
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rusers-%{version}.tar.gz
@@ -146,6 +146,9 @@
 %config /etc/rc.d/init.d/rstatd
 
 %changelog
+* Thu Sep  4 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 0.17-54
+- modified truncate patch to work with fuzz=0
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.17-53
 - Autorebuild for GCC 4.3
 



From dcnomura at fedoraproject.org  Thu Sep  4 13:54:13 2008
From: dcnomura at fedoraproject.org (Dave Nomura)
Date: Thu,  4 Sep 2008 13:54:13 +0000 (UTC)
Subject: rpms/stapitrace/devel stapitrace.spec,1.11,1.12
Message-ID: <20080904135413.813B770120@cvs1.fedora.phx.redhat.com>

Author: dcnomura

Update of /cvs/pkgs/rpms/stapitrace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6658

Modified Files:
	stapitrace.spec 
Log Message:
removed gcc-devel from *Requires



Index: stapitrace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stapitrace/devel/stapitrace.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- stapitrace.spec	4 Sep 2008 13:32:29 -0000	1.11
+++ stapitrace.spec	4 Sep 2008 13:54:12 -0000	1.12
@@ -6,15 +6,15 @@
 Name:		stapitrace
 Summary:	Instruction Tracing Tool
 Version:	1.0.0
-Release:	9.%{alphatag}%{?dist}
+Release:	10.%{alphatag}%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://sourceforge.net/projects/perfinsp
 Source0:	%{name}-%{version}.%{alphatag}.tar.gz
 Patch0:		itrace_fix1.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
-Requires:	systemtap systemtap-runtime binutils-devel gcc-devel
-BuildRequires:	binutils binutils-devel autoconf automake gcc-devel
+Requires:	systemtap systemtap-runtime binutils-devel
+BuildRequires:	binutils binutils-devel autoconf automake
 ExclusiveArch:	ppc
 
 %description



From mtasaka at fedoraproject.org  Thu Sep  4 13:54:19 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  4 Sep 2008 13:54:19 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.61, 1.62 cairo-dock.spec, 1.77, 
	1.78 sources, 1.61, 1.62
Message-ID: <20080904135419.985BF70120@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6891/devel

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Thu Sep  4 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.2-1
- 1.6.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	30 Aug 2008 07:11:55 -0000	1.61
+++ .cvsignore	4 Sep 2008 13:54:18 -0000	1.62
@@ -1,3 +1,3 @@
-cairo-dock-1.6.2.1.tar.bz2
-cairo-dock-plugins-1.6.2.1.tar.bz2
-cairo-dock-themes-1.6.2.1.tar.bz2
+cairo-dock-1.6.2.2.tar.bz2
+cairo-dock-plugins-1.6.2.2.tar.bz2
+cairo-dock-themes-1.6.2.2.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- cairo-dock.spec	30 Aug 2008 07:11:55 -0000	1.77
+++ cairo-dock.spec	4 Sep 2008 13:54:18 -0000	1.78
@@ -8,7 +8,7 @@
 %define		build_other	1
 
 %define		tarballver	svn1276_trunk
-%define		mainver		1.6.2.1
+%define		mainver		1.6.2.2
 %undefine		betaver
 %define		build_gecko	1
 
@@ -265,9 +265,7 @@
 	-e 's|stack\\|stacks\\|' \
 	Makefile.am
 %else
-# Still some typos in 1.6.2.1....
-grep -rl STACKS stack/ | \
-	xargs sed -i.typo -e 's|STACKS|STACK|g'
+# STACK vs STACKS typo fixed in 1.6.2.2
 %endif
 
 # template: upstream says this is not needed
@@ -323,13 +321,13 @@
 	if [ $skip == 2 ] ; then continue ; fi
 	cd $dir
 
-# For 1.6.2 RC4 sed for Makefile.am is needed because of stack directory
+# typos in stack/ directory now fixed in 1.6.2.2
 	%{__sed} -i.error \
 		-e 's|-O3|-O2|' \
 		-e 's|-Werror\\|\\|' \
 		-e 's|-Werror$||' \
 %if 0%{?released} > 0
-		src/Makefile.am
+		src/Makefile.in
 %else
 		src/Makefile.am
 %endif
@@ -343,9 +341,7 @@
 	cd ..
 done
 
-# Makefile.am in Subdirs are modified, autoreconf must be called here
-# For 1.6.2 RC4 autoreconf call is needed because of stack
-%if %{released} < 1 || 1
+%if %{released} < 1
 autoreconf -f -i
 %endif
 
@@ -649,6 +645,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Sep  4 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.2-1
+- 1.6.2.2
+
 * Sat Aug 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.1-1
 - 1.6.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	30 Aug 2008 07:11:55 -0000	1.61
+++ sources	4 Sep 2008 13:54:18 -0000	1.62
@@ -1,3 +1,3 @@
-5a78c34999ec43ad236bd81ece3a2123  cairo-dock-1.6.2.1.tar.bz2
-0334d9aa217194ec46fdbec4a4c54087  cairo-dock-plugins-1.6.2.1.tar.bz2
-e165b25b70eb5d1bc460a80ee04ad1a6  cairo-dock-themes-1.6.2.1.tar.bz2
+53e5736f145fe936837bf7709af4713b  cairo-dock-1.6.2.2.tar.bz2
+81e899f6a4d0b2e9539392d8b5fec10f  cairo-dock-plugins-1.6.2.2.tar.bz2
+9d44ad771c71c5a7c6bc709aa5244370  cairo-dock-themes-1.6.2.2.tar.bz2



From mtasaka at fedoraproject.org  Thu Sep  4 13:54:48 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  4 Sep 2008 13:54:48 +0000 (UTC)
Subject: rpms/cairo-dock/F-9 .cvsignore, 1.12, 1.13 cairo-dock.spec, 1.18,
	1.19 sources, 1.12, 1.13
Message-ID: <20080904135448.2EE5470120@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6891/F-9

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Thu Sep  4 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.2-1
- 1.6.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	30 Aug 2008 07:11:54 -0000	1.12
+++ .cvsignore	4 Sep 2008 13:54:17 -0000	1.13
@@ -1,3 +1,3 @@
-cairo-dock-1.6.2.1.tar.bz2
-cairo-dock-plugins-1.6.2.1.tar.bz2
-cairo-dock-themes-1.6.2.1.tar.bz2
+cairo-dock-1.6.2.2.tar.bz2
+cairo-dock-plugins-1.6.2.2.tar.bz2
+cairo-dock-themes-1.6.2.2.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-9/cairo-dock.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cairo-dock.spec	30 Aug 2008 07:11:54 -0000	1.18
+++ cairo-dock.spec	4 Sep 2008 13:54:17 -0000	1.19
@@ -8,7 +8,7 @@
 %define		build_other	1
 
 %define		tarballver	svn1276_trunk
-%define		mainver		1.6.2.1
+%define		mainver		1.6.2.2
 %undefine		betaver
 %define		build_gecko	1
 
@@ -265,9 +265,7 @@
 	-e 's|stack\\|stacks\\|' \
 	Makefile.am
 %else
-# Still some typos in 1.6.2.1....
-grep -rl STACKS stack/ | \
-	xargs sed -i.typo -e 's|STACKS|STACK|g'
+# STACK vs STACKS typo fixed in 1.6.2.2
 %endif
 
 # template: upstream says this is not needed
@@ -323,13 +321,13 @@
 	if [ $skip == 2 ] ; then continue ; fi
 	cd $dir
 
-# For 1.6.2 RC4 sed for Makefile.am is needed because of stack directory
+# typos in stack/ directory now fixed in 1.6.2.2
 	%{__sed} -i.error \
 		-e 's|-O3|-O2|' \
 		-e 's|-Werror\\|\\|' \
 		-e 's|-Werror$||' \
 %if 0%{?released} > 0
-		src/Makefile.am
+		src/Makefile.in
 %else
 		src/Makefile.am
 %endif
@@ -343,9 +341,7 @@
 	cd ..
 done
 
-# Makefile.am in Subdirs are modified, autoreconf must be called here
-# For 1.6.2 RC4 autoreconf call is needed because of stack
-%if %{released} < 1 || 1
+%if %{released} < 1
 autoreconf -f -i
 %endif
 
@@ -649,6 +645,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Sep  4 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.2-1
+- 1.6.2.2
+
 * Sat Aug 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.1-1
 - 1.6.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 Aug 2008 07:11:54 -0000	1.12
+++ sources	4 Sep 2008 13:54:17 -0000	1.13
@@ -1,3 +1,3 @@
-5a78c34999ec43ad236bd81ece3a2123  cairo-dock-1.6.2.1.tar.bz2
-0334d9aa217194ec46fdbec4a4c54087  cairo-dock-plugins-1.6.2.1.tar.bz2
-e165b25b70eb5d1bc460a80ee04ad1a6  cairo-dock-themes-1.6.2.1.tar.bz2
+53e5736f145fe936837bf7709af4713b  cairo-dock-1.6.2.2.tar.bz2
+81e899f6a4d0b2e9539392d8b5fec10f  cairo-dock-plugins-1.6.2.2.tar.bz2
+9d44ad771c71c5a7c6bc709aa5244370  cairo-dock-themes-1.6.2.2.tar.bz2



From mtasaka at fedoraproject.org  Thu Sep  4 13:54:47 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  4 Sep 2008 13:54:47 +0000 (UTC)
Subject: rpms/cairo-dock/F-8 .cvsignore, 1.12, 1.13 cairo-dock.spec, 1.22,
	1.23 sources, 1.12, 1.13
Message-ID: <20080904135447.8067870120@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6891/F-8

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Thu Sep  4 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.2-1
- 1.6.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-8/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	30 Aug 2008 07:11:54 -0000	1.12
+++ .cvsignore	4 Sep 2008 13:54:16 -0000	1.13
@@ -1,3 +1,3 @@
-cairo-dock-1.6.2.1.tar.bz2
-cairo-dock-plugins-1.6.2.1.tar.bz2
-cairo-dock-themes-1.6.2.1.tar.bz2
+cairo-dock-1.6.2.2.tar.bz2
+cairo-dock-plugins-1.6.2.2.tar.bz2
+cairo-dock-themes-1.6.2.2.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-8/cairo-dock.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cairo-dock.spec	30 Aug 2008 07:11:54 -0000	1.22
+++ cairo-dock.spec	4 Sep 2008 13:54:16 -0000	1.23
@@ -8,7 +8,7 @@
 %define		build_other	1
 
 %define		tarballver	svn1276_trunk
-%define		mainver		1.6.2.1
+%define		mainver		1.6.2.2
 %undefine		betaver
 %define		build_gecko	1
 
@@ -265,9 +265,7 @@
 	-e 's|stack\\|stacks\\|' \
 	Makefile.am
 %else
-# Still some typos in 1.6.2.1....
-grep -rl STACKS stack/ | \
-	xargs sed -i.typo -e 's|STACKS|STACK|g'
+# STACK vs STACKS typo fixed in 1.6.2.2
 %endif
 
 # template: upstream says this is not needed
@@ -323,13 +321,13 @@
 	if [ $skip == 2 ] ; then continue ; fi
 	cd $dir
 
-# For 1.6.2 RC4 sed for Makefile.am is needed because of stack directory
+# typos in stack/ directory now fixed in 1.6.2.2
 	%{__sed} -i.error \
 		-e 's|-O3|-O2|' \
 		-e 's|-Werror\\|\\|' \
 		-e 's|-Werror$||' \
 %if 0%{?released} > 0
-		src/Makefile.am
+		src/Makefile.in
 %else
 		src/Makefile.am
 %endif
@@ -343,9 +341,7 @@
 	cd ..
 done
 
-# Makefile.am in Subdirs are modified, autoreconf must be called here
-# For 1.6.2 RC4 autoreconf call is needed because of stack
-%if %{released} < 1 || 1
+%if %{released} < 1
 autoreconf -f -i
 %endif
 
@@ -649,6 +645,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Sep  4 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.2-1
+- 1.6.2.2
+
 * Sat Aug 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.1-1
 - 1.6.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-8/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 Aug 2008 07:11:54 -0000	1.12
+++ sources	4 Sep 2008 13:54:16 -0000	1.13
@@ -1,3 +1,3 @@
-5a78c34999ec43ad236bd81ece3a2123  cairo-dock-1.6.2.1.tar.bz2
-0334d9aa217194ec46fdbec4a4c54087  cairo-dock-plugins-1.6.2.1.tar.bz2
-e165b25b70eb5d1bc460a80ee04ad1a6  cairo-dock-themes-1.6.2.1.tar.bz2
+53e5736f145fe936837bf7709af4713b  cairo-dock-1.6.2.2.tar.bz2
+81e899f6a4d0b2e9539392d8b5fec10f  cairo-dock-plugins-1.6.2.2.tar.bz2
+9d44ad771c71c5a7c6bc709aa5244370  cairo-dock-themes-1.6.2.2.tar.bz2



From rdieter at fedoraproject.org  Thu Sep  4 14:12:32 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  4 Sep 2008 14:12:32 +0000 (UTC)
Subject: rpms/kipi-plugins/devel .cvsignore, 1.18, 1.19 kipi-plugins.spec,
	1.56, 1.57 sources, 1.18, 1.19
Message-ID: <20080904141232.862E070120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12083

Modified Files:
	.cvsignore kipi-plugins.spec sources 
Log Message:
* Thu Sep 04 2008 Rex Dieter <rdieter at fedoraproject.org> 0.2.0-0.1.beta1
- kipi-plugins-0.2.0-beta1, kde4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	26 May 2008 16:39:46 -0000	1.18
+++ .cvsignore	4 Sep 2008 14:11:59 -0000	1.19
@@ -1,2 +1 @@
-kipi-plugins-0.1.6-beta1.tar.bz2
-kipi-plugins-0.1.6-beta1.tar.bz2.md5
+kipi-plugins-0.2.0-beta1.tar.bz2


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kipi-plugins.spec	25 Jun 2008 13:14:15 -0000	1.56
+++ kipi-plugins.spec	4 Sep 2008 14:11:59 -0000	1.57
@@ -5,51 +5,38 @@
 
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
-Version: 0.1.6
-Release: 0.2.%{beta}%{?dist}
+Version: 0.2.0
+Release: 0.1.%{beta}%{?dist}
 
 License: GPLv2+
 Group:   Applications/Multimedia
 Url:	 http://www.kipi-plugins.org/
-Source0: http://downloads.sourceforge.net/sourceforge/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2
-Source1: http://www.linux.it/~anaselli/kipi-plugins/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2.md5
+Source0: http://digikam3rdparty.free.fr/0.10.x-releases/kipi-plugins-0.2.0-beta1.tar.bz2
+#Source0: http://downloads.sourceforge.net/sourceforge/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
-BuildRequires: kdelibs3-devel
-BuildRequires: libkipi-devel >= 0.1.5
-BuildRequires: libkdcraw-devel >= 0.1.4
-BuildRequires: libkexiv2-devel >= 0.1.6
+BuildRequires: kdegraphics4-devel
+BuildRequires: libkipi-devel >= 0.2.0
+BuildRequires: libkdcraw-devel >= 0.2.0
+BuildRequires: libkexiv2-devel >= 0.2.0
 BuildRequires: exiv2-devel 
-%if 0%{?fedora} > 6
-%define _with_libgpod --with-libgpod
-BuildRequires: libgpod-devel >= 0.4.2, glib2-devel
-%endif
-## slideshow plugin
-#BuildRequires: imlib2-devel
 ## acquireimages, jpeglossless and rawconverter plugins
 BuildRequires: libtiff-devel
-## kameraklient plugin
-BuildRequires: gphoto2-devel 
-## htmlexport plugin (libgcrypt is a bogus extra dep from libxslt.la)
-BuildRequires: libxml2-devel libxslt-devel libgcrypt-devel 
-## calendar plugin (uses libkcal) 
-%if 0%{?fedora} < 10
-BuildRequires: kdepim3-devel
-%endif
+## htmlexport plugin 
+BuildRequires: libxslt-devel
+
+Requires(post): /sbin/ldconfig xdg-utils
+Requires(postun): /sbin/ldconfig xdg-utils
 
 ## jpeglossless plugin 
 Requires: ImageMagick 
 
 ## optional bits
-# cdarchiver plugin
-#Requires(hint): k3b
 %if 0%{?fedora} > 3
 # rawconverter plugin 
 Requires(hint): dcraw
 %endif
-# mjpeg plugin 
-#Requires(hint): mjpegtools >= 1.6.0
 
 %description
 This package contains plugins to use with Kipi, the KDE Image Plugin
@@ -57,20 +44,13 @@
  * RawConverter       : Raw image converter for digital cameras
  * SlideShow          : Slideshow with effects ripped out from kslideshow
                         and 3D effects using OpenGL
- * MpegEncoder        : Create an MPEG slideshow from your images
-                        (requires mjpegtools)
- * PrintWizard:	      : Print multiple images/index pages in one page
- * ImagesGallery      : An HTML gallery generator
- * PrintWizard        : Print images in various format
  * JpegLossLess       : Batch process your JPEG images without losing meta 
                         information and compression
- * CdArchiving        : Archive your albums on CD or DVD (requires k3b)
  * AcquireImages      : Acquire images interface, includes these parts:
                            ScanImages (scanner management using Kooka)
                            ScreenshotImages (Snap Screen based on KSnapshot)
- * Calendar           : Create calendars
- * SendImages         : Send images by email, allowing resizing
-                        and recompressing before sending
+ * SendImages         : Send images by email, allowing resizing and 
+                        recompressing before sending
  * BatchProcessImages : Batch process images: 
                            RenameImages (Image file names renaming)
                            ConvertImages (Image files format converting)
@@ -81,19 +61,11 @@
                            ResizeImages (Basic/Prepare-to-print resizing)
                            RecompressImages (Recompress JPEG/TIFF/PNG/TGA)
  * TimeAdjust         : Adjust image file Time and Date
- * WallPaper          : Image to KDE Desktop (requires kdebase)
- * FindImages         : Find dupplicate images in albums
- * GalleryExport      : Export images to a remote Gallery server
-                        (http://gallery.sf.net)
  * FlickrExport       : Export images to a remote Flickr web service
                         (http://www.flickr.com)
  * HTMLExport         : Export images collections into HTML page
  * SimpleViewerExport : Export images to SimpleViewer
                          (http://www.airtightinteractive.com/simpleviewer/)
- * GPSSync            : Geolocalize pictures.
-%if "%{?_with_libgpod:1}" == "1"
- * IpodExport         : Export pictures with an Ipod device
-%endif
  * MetadataEdit       : Edit EXIF and IPTC pictures metadata
  * PicasaWebExport    : Export pictures to Picasa web service
 
@@ -103,28 +75,27 @@
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
 
-%configure \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependancy-tracking --disable-final \
-  --with-opengl
-
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-make install DESTDIR=$RPM_BUILD_ROOT
 
 ## File lists
+touch  %{name}.lang
+%if 0
 # HTML (1.0)
-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
   if [ -d $lang_dir ]; then
     lang=$(basename $lang_dir)
     echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
@@ -138,41 +109,61 @@
 done
 fi
 # locale's
-for app_file in $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/*.mo ; do
+for app_file in %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/*.mo ; do
    app=$(basename $app_file .mo)
    # don't repeat
    [ ! -f ${app}.lang ] && %find_lang ${app}
 done
+%endif
 
 cat *.lang > %{name}-all.lang
 
 ## unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.{la,so}
+rm -f %{buildroot}%{_kde4_libdir}/lib*.so
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
 %files -f %{name}-all.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
-%{_bindir}/*
-%{_libdir}/lib*.so.*
-%{_libdir}/kde3/kipiplugin_*.*
-%{_mandir}/man[^3]/*
-%{_datadir}/apps/kipi/
-%{_datadir}/apps/kipiplugin_*
-%{_datadir}/config*/*
-%{_datadir}/services/*.desktop
+%{_kde4_libdir}/libkipiplugins.so.*
+%{_kde4_libdir}/kde4/kipiplugin_acquireimages.so
+%{_kde4_libdir}/kde4/kipiplugin_flickrexport.so
+%{_kde4_libdir}/kde4/kipiplugin_gpssync.so
+%{_kde4_libdir}/kde4/kipiplugin_htmlexport.so
+%{_kde4_libdir}/kde4/kipiplugin_imageviewer.so
+%{_kde4_libdir}/kde4/kipiplugin_jpeglossless.so
+%{_kde4_libdir}/kde4/kipiplugin_metadataedit.so
+%{_kde4_libdir}/kde4/kipiplugin_picasawebexport.so
+%{_kde4_libdir}/kde4/kipiplugin_rawconverter.so
+%{_kde4_libdir}/kde4/kipiplugin_sendimages.so
+%{_kde4_libdir}/kde4/kipiplugin_simpleviewer.so
+%{_kde4_libdir}/kde4/kipiplugin_slideshow.so
+%{_kde4_libdir}/kde4/kipiplugin_timeadjust.so
+%{_kde4_appsdir}/kipiplugin_htmlexport
+%{_kde4_appsdir}/kipiplugin_imageviewer
+%{_kde4_appsdir}/kipiplugin_metadataedit  
+%{_kde4_appsdir}/kipiplugin_simpleviewerexport
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_iconsdir}/hicolor/*/*/*
 
 
 %changelog
+* Thu Sep 04 2008 Rex Dieter <rdieter at fedoraproject.org> 0.2.0-0.1.beta1
+- kipi-plugins-0.2.0-beta1, kde4
+
 * Wed Jun 25 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-0.2.beta1
 - respin for exiv2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	26 May 2008 16:39:46 -0000	1.18
+++ sources	4 Sep 2008 14:11:59 -0000	1.19
@@ -1,2 +1 @@
-1f3e98dc0cb1f34eaafa5c3b7f81a2f5  kipi-plugins-0.1.6-beta1.tar.bz2
-a37254ab99cf898f5af8c38c8118ba80  kipi-plugins-0.1.6-beta1.tar.bz2.md5
+63c5f66c017f1b626126a87d7b56636e  kipi-plugins-0.2.0-beta1.tar.bz2



From rdieter at fedoraproject.org  Thu Sep  4 14:21:13 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  4 Sep 2008 14:21:13 +0000 (UTC)
Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.57,1.58
Message-ID: <20080904142113.5997F70120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14499

Modified Files:
	kipi-plugins.spec 
Log Message:
BR: giflib-devel



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kipi-plugins.spec	4 Sep 2008 14:11:59 -0000	1.57
+++ kipi-plugins.spec	4 Sep 2008 14:20:41 -0000	1.58
@@ -16,6 +16,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
+BuildRequires: giflib-devel
 BuildRequires: kdegraphics4-devel
 BuildRequires: libkipi-devel >= 0.2.0
 BuildRequires: libkdcraw-devel >= 0.2.0



From sgrubb at fedoraproject.org  Thu Sep  4 14:24:46 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Thu,  4 Sep 2008 14:24:46 +0000 (UTC)
Subject: rpms/libprelude/devel libprelude.spec,1.22,1.23
Message-ID: <20080904142446.B4ED570120@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15757

Modified Files:
	libprelude.spec 
Log Message:
ppc64 debugging



Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libprelude.spec	4 Sep 2008 13:08:03 -0000	1.22
+++ libprelude.spec	4 Sep 2008 14:24:45 -0000	1.23
@@ -106,11 +106,12 @@
 
 # Fix time stamp for both 32 and 64 bit libraries
 touch -r ./configure.in %{buildroot}%{_sysconfdir}/prelude/default/*
-
-%check
 cd tests
 make valgrind
 
+%check
+make check
+
 %clean
 rm -rf %{buildroot}
 



From rdieter at fedoraproject.org  Thu Sep  4 14:31:11 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  4 Sep 2008 14:31:11 +0000 (UTC)
Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.58,1.59
Message-ID: <20080904143111.C7F6670120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17638

Modified Files:
	kipi-plugins.spec 
Log Message:
BR: pcre-devel



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kipi-plugins.spec	4 Sep 2008 14:20:41 -0000	1.58
+++ kipi-plugins.spec	4 Sep 2008 14:31:09 -0000	1.59
@@ -16,7 +16,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
-BuildRequires: giflib-devel
+BuildRequires: giflib-devel pcre-devel
 BuildRequires: kdegraphics4-devel
 BuildRequires: libkipi-devel >= 0.2.0
 BuildRequires: libkdcraw-devel >= 0.2.0



From rmeggins at fedoraproject.org  Thu Sep  4 14:31:19 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 14:31:19 +0000 (UTC)
Subject: rpms/fedora-ds-base/devel .cvsignore, 1.9, 1.10 fedora-ds-base.spec,
	1.17, 1.18 sources, 1.13, 1.14
Message-ID: <20080904143119.784D370120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17687/devel

Modified Files:
	.cvsignore fedora-ds-base.spec sources 
Log Message:
This is the release for version 1.1.2
The list of bugs fixed by this release can be found here:
https://bugzilla.redhat.com/showdependencytree.cgi?id=452721&hide_resolved=0
This version also contains the winsync enhancements for the winsync plugin api
which includes winsync-plugin.h



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 May 2008 19:04:29 -0000	1.9
+++ .cvsignore	4 Sep 2008 14:31:17 -0000	1.10
@@ -1,2 +1,3 @@
 fedora-ds-base-1.1.0.tar.bz2
 fedora-ds-base-1.1.1.tar.bz2
+fedora-ds-base-1.1.2.tar.bz2


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/fedora-ds-base.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fedora-ds-base.spec	6 Jun 2008 17:25:22 -0000	1.17
+++ fedora-ds-base.spec	4 Sep 2008 14:31:17 -0000	1.18
@@ -4,8 +4,8 @@
 
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
-Version:          1.1.1
-Release:          2%{?dist}
+Version:          1.1.2
+Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -70,7 +70,6 @@
 %description      devel
 Development Libraries and headers for the Fedora Directory Server base package.
 
-
 %prep
 %setup -q -n %{name}-%{version}
 cp %{SOURCE2} README.devel
@@ -104,6 +103,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/plugins/*.la
 
 install -p -m 644 ldap/servers/slapd/slapi-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{pkgname}/
+install -p -m 644 ldap/servers/plugins/replication/winsync-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{pkgname}/
 
 # make sure perl scripts have a proper shebang 
 sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/script-templates/template-*.pl
@@ -146,6 +146,8 @@
 %dir %{_localstatedir}/lib/%{pkgname}
 %dir %{_localstatedir}/log/%{pkgname}
 %dir %{_localstatedir}/lock/%{pkgname}
+%{_mandir}/man1/*
+%{_mandir}/man8/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -154,6 +156,11 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Fri Jun 13 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.2-1
+- This is the 1.1.2 release.  The bugs fixed can be found here
+- https://bugzilla.redhat.com/showdependencytree.cgi?id=452721
+- Added winsync-plugin.h to the devel subpackage
+
 * Fri Jun  6 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.1-2
 - bump rev to rebuild and pick up new version of ICU
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	30 May 2008 19:04:29 -0000	1.13
+++ sources	4 Sep 2008 14:31:17 -0000	1.14
@@ -1,2 +1,3 @@
 a60d1ce51207e61c48b70aa85ae5e5a5  fedora-ds-base-1.1.0.tar.bz2
 c525e0412ae4b9582adbd01305126975  fedora-ds-base-1.1.1.tar.bz2
+797c93351e8fcca9bac6326e7270355e  fedora-ds-base-1.1.2.tar.bz2



From rmeggins at fedoraproject.org  Thu Sep  4 14:31:45 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 14:31:45 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-7 .cvsignore, 1.8, 1.9 fedora-ds-base.spec,
	1.11, 1.12 sources, 1.11, 1.12
Message-ID: <20080904143145.C359A70120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17687/F-7

Modified Files:
	.cvsignore fedora-ds-base.spec sources 
Log Message:
This is the release for version 1.1.2
The list of bugs fixed by this release can be found here:
https://bugzilla.redhat.com/showdependencytree.cgi?id=452721&hide_resolved=0
This version also contains the winsync enhancements for the winsync plugin api
which includes winsync-plugin.h



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 May 2008 19:03:17 -0000	1.8
+++ .cvsignore	4 Sep 2008 14:31:14 -0000	1.9
@@ -1,2 +1,3 @@
 fedora-ds-base-1.1.0.tar.bz2
 fedora-ds-base-1.1.1.tar.bz2
+fedora-ds-base-1.1.2.tar.bz2


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-7/fedora-ds-base.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fedora-ds-base.spec	30 May 2008 19:03:17 -0000	1.11
+++ fedora-ds-base.spec	4 Sep 2008 14:31:14 -0000	1.12
@@ -4,7 +4,7 @@
 
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
-Version:          1.1.1
+Version:          1.1.2
 Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
@@ -67,7 +67,6 @@
 %description      devel
 Development Libraries and headers for the Fedora Directory Server base package.
 
-
 %prep
 %setup -q -n %{name}-%{version}
 cp %{SOURCE2} README.devel
@@ -101,6 +100,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/plugins/*.la
 
 install -p -m 644 ldap/servers/slapd/slapi-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{pkgname}/
+install -p -m 644 ldap/servers/plugins/replication/winsync-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{pkgname}/
 
 # make sure perl scripts have a proper shebang 
 sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/script-templates/template-*.pl
@@ -143,6 +143,8 @@
 %dir %{_localstatedir}/lib/%{pkgname}
 %dir %{_localstatedir}/log/%{pkgname}
 %dir %{_localstatedir}/lock/%{pkgname}
+%{_mandir}/man1/*
+%{_mandir}/man8/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -151,6 +153,11 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Fri Jun 13 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.2-1
+- This is the 1.1.2 release.  The bugs fixed can be found here
+- https://bugzilla.redhat.com/showdependencytree.cgi?id=452721
+- Added winsync-plugin.h to the devel subpackage
+
 * Fri May 23 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.1-1
 - 1.1.1 release candidate - several bug fixes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	30 May 2008 19:03:17 -0000	1.11
+++ sources	4 Sep 2008 14:31:14 -0000	1.12
@@ -1,2 +1,3 @@
 a60d1ce51207e61c48b70aa85ae5e5a5  fedora-ds-base-1.1.0.tar.bz2
 c525e0412ae4b9582adbd01305126975  fedora-ds-base-1.1.1.tar.bz2
+797c93351e8fcca9bac6326e7270355e  fedora-ds-base-1.1.2.tar.bz2



From rmeggins at fedoraproject.org  Thu Sep  4 14:31:47 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 14:31:47 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-9 .cvsignore, 1.9, 1.10 fedora-ds-base.spec, 
	1.16, 1.17 sources, 1.13, 1.14 bug439829.patch, 1.1, NONE
Message-ID: <20080904143147.C74F670120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17687/F-9

Modified Files:
	.cvsignore fedora-ds-base.spec sources 
Removed Files:
	bug439829.patch 
Log Message:
This is the release for version 1.1.2
The list of bugs fixed by this release can be found here:
https://bugzilla.redhat.com/showdependencytree.cgi?id=452721&hide_resolved=0
This version also contains the winsync enhancements for the winsync plugin api
which includes winsync-plugin.h



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 May 2008 19:03:55 -0000	1.9
+++ .cvsignore	4 Sep 2008 14:31:16 -0000	1.10
@@ -1,2 +1,3 @@
 fedora-ds-base-1.1.0.tar.bz2
 fedora-ds-base-1.1.1.tar.bz2
+fedora-ds-base-1.1.2.tar.bz2


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/fedora-ds-base.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- fedora-ds-base.spec	30 May 2008 19:03:55 -0000	1.16
+++ fedora-ds-base.spec	4 Sep 2008 14:31:16 -0000	1.17
@@ -4,7 +4,7 @@
 
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
-Version:          1.1.1
+Version:          1.1.2
 Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
@@ -70,7 +70,6 @@
 %description      devel
 Development Libraries and headers for the Fedora Directory Server base package.
 
-
 %prep
 %setup -q -n %{name}-%{version}
 cp %{SOURCE2} README.devel
@@ -104,6 +103,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/plugins/*.la
 
 install -p -m 644 ldap/servers/slapd/slapi-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{pkgname}/
+install -p -m 644 ldap/servers/plugins/replication/winsync-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{pkgname}/
 
 # make sure perl scripts have a proper shebang 
 sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/script-templates/template-*.pl
@@ -146,6 +146,8 @@
 %dir %{_localstatedir}/lib/%{pkgname}
 %dir %{_localstatedir}/log/%{pkgname}
 %dir %{_localstatedir}/lock/%{pkgname}
+%{_mandir}/man1/*
+%{_mandir}/man8/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -154,6 +156,11 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Fri Jun 13 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.2-1
+- This is the 1.1.2 release.  The bugs fixed can be found here
+- https://bugzilla.redhat.com/showdependencytree.cgi?id=452721
+- Added winsync-plugin.h to the devel subpackage
+
 * Fri May 23 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.1-1
 - 1.1.1 release candidate - several bug fixes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	30 May 2008 19:03:55 -0000	1.13
+++ sources	4 Sep 2008 14:31:16 -0000	1.14
@@ -1,2 +1,3 @@
 a60d1ce51207e61c48b70aa85ae5e5a5  fedora-ds-base-1.1.0.tar.bz2
 c525e0412ae4b9582adbd01305126975  fedora-ds-base-1.1.1.tar.bz2
+797c93351e8fcca9bac6326e7270355e  fedora-ds-base-1.1.2.tar.bz2


--- bug439829.patch DELETED ---



From rmeggins at fedoraproject.org  Thu Sep  4 14:31:46 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 14:31:46 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-8 .cvsignore, 1.8, 1.9 fedora-ds-base.spec,
	1.10, 1.11 sources, 1.11, 1.12
Message-ID: <20080904143146.D4FD670120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17687/F-8

Modified Files:
	.cvsignore fedora-ds-base.spec sources 
Log Message:
This is the release for version 1.1.2
The list of bugs fixed by this release can be found here:
https://bugzilla.redhat.com/showdependencytree.cgi?id=452721&hide_resolved=0
This version also contains the winsync enhancements for the winsync plugin api
which includes winsync-plugin.h



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-8/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 May 2008 19:03:33 -0000	1.8
+++ .cvsignore	4 Sep 2008 14:31:14 -0000	1.9
@@ -1,2 +1,3 @@
 fedora-ds-base-1.1.0.tar.bz2
 fedora-ds-base-1.1.1.tar.bz2
+fedora-ds-base-1.1.2.tar.bz2


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-8/fedora-ds-base.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fedora-ds-base.spec	30 May 2008 19:03:33 -0000	1.10
+++ fedora-ds-base.spec	4 Sep 2008 14:31:15 -0000	1.11
@@ -4,7 +4,7 @@
 
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
-Version:          1.1.1
+Version:          1.1.2
 Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
@@ -67,7 +67,6 @@
 %description      devel
 Development Libraries and headers for the Fedora Directory Server base package.
 
-
 %prep
 %setup -q -n %{name}-%{version}
 cp %{SOURCE2} README.devel
@@ -101,6 +100,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/plugins/*.la
 
 install -p -m 644 ldap/servers/slapd/slapi-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{pkgname}/
+install -p -m 644 ldap/servers/plugins/replication/winsync-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{pkgname}/
 
 # make sure perl scripts have a proper shebang 
 sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/script-templates/template-*.pl
@@ -143,6 +143,8 @@
 %dir %{_localstatedir}/lib/%{pkgname}
 %dir %{_localstatedir}/log/%{pkgname}
 %dir %{_localstatedir}/lock/%{pkgname}
+%{_mandir}/man1/*
+%{_mandir}/man8/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -151,6 +153,11 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Fri Jun 13 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.2-1
+- This is the 1.1.2 release.  The bugs fixed can be found here
+- https://bugzilla.redhat.com/showdependencytree.cgi?id=452721
+- Added winsync-plugin.h to the devel subpackage
+
 * Fri May 23 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.1-1
 - 1.1.1 release candidate - several bug fixes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-8/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	30 May 2008 19:03:33 -0000	1.11
+++ sources	4 Sep 2008 14:31:15 -0000	1.12
@@ -1,2 +1,3 @@
 a60d1ce51207e61c48b70aa85ae5e5a5  fedora-ds-base-1.1.0.tar.bz2
 c525e0412ae4b9582adbd01305126975  fedora-ds-base-1.1.1.tar.bz2
+797c93351e8fcca9bac6326e7270355e  fedora-ds-base-1.1.2.tar.bz2



From rmeggins at fedoraproject.org  Thu Sep  4 14:31:47 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 14:31:47 +0000 (UTC)
Subject: rpms/fedora-ds-base/FC-6 .cvsignore, 1.7, 1.8 fedora-ds-base.spec, 
	1.10, 1.11 sources, 1.10, 1.11
Message-ID: <20080904143147.EBBA070124@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/FC-6
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17687/FC-6

Modified Files:
	.cvsignore fedora-ds-base.spec sources 
Log Message:
This is the release for version 1.1.2
The list of bugs fixed by this release can be found here:
https://bugzilla.redhat.com/showdependencytree.cgi?id=452721&hide_resolved=0
This version also contains the winsync enhancements for the winsync plugin api
which includes winsync-plugin.h



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 May 2008 19:04:12 -0000	1.7
+++ .cvsignore	4 Sep 2008 14:31:16 -0000	1.8
@@ -1,2 +1,3 @@
 fedora-ds-base-1.1.0.tar.bz2
 fedora-ds-base-1.1.1.tar.bz2
+fedora-ds-base-1.1.2.tar.bz2


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/FC-6/fedora-ds-base.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fedora-ds-base.spec	30 May 2008 19:04:12 -0000	1.10
+++ fedora-ds-base.spec	4 Sep 2008 14:31:16 -0000	1.11
@@ -4,7 +4,7 @@
 
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
-Version:          1.1.1
+Version:          1.1.2
 Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
@@ -67,7 +67,6 @@
 %description      devel
 Development Libraries and headers for the Fedora Directory Server base package.
 
-
 %prep
 %setup -q -n %{name}-%{version}
 cp %{SOURCE2} README.devel
@@ -101,6 +100,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/plugins/*.la
 
 install -p -m 644 ldap/servers/slapd/slapi-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{pkgname}/
+install -p -m 644 ldap/servers/plugins/replication/winsync-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{pkgname}/
 
 # make sure perl scripts have a proper shebang 
 sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/script-templates/template-*.pl
@@ -143,6 +143,8 @@
 %dir %{_localstatedir}/lib/%{pkgname}
 %dir %{_localstatedir}/log/%{pkgname}
 %dir %{_localstatedir}/lock/%{pkgname}
+%{_mandir}/man1/*
+%{_mandir}/man8/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -151,6 +153,11 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Fri Jun 13 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.2-1
+- This is the 1.1.2 release.  The bugs fixed can be found here
+- https://bugzilla.redhat.com/showdependencytree.cgi?id=452721
+- Added winsync-plugin.h to the devel subpackage
+
 * Fri May 23 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.1-1
 - 1.1.1 release candidate - several bug fixes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 May 2008 19:04:12 -0000	1.10
+++ sources	4 Sep 2008 14:31:16 -0000	1.11
@@ -1,2 +1,3 @@
 a60d1ce51207e61c48b70aa85ae5e5a5  fedora-ds-base-1.1.0.tar.bz2
 c525e0412ae4b9582adbd01305126975  fedora-ds-base-1.1.1.tar.bz2
+797c93351e8fcca9bac6326e7270355e  fedora-ds-base-1.1.2.tar.bz2



From sgrubb at fedoraproject.org  Thu Sep  4 14:37:52 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Thu,  4 Sep 2008 14:37:52 +0000 (UTC)
Subject: rpms/libprelude/devel libprelude.spec,1.23,1.24
Message-ID: <20080904143752.478C970120@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19787

Modified Files:
	libprelude.spec 
Log Message:
ppc debug



Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libprelude.spec	4 Sep 2008 14:24:45 -0000	1.23
+++ libprelude.spec	4 Sep 2008 14:37:50 -0000	1.24
@@ -109,8 +109,8 @@
 cd tests
 make valgrind
 
-%check
-make check
+#%check
+#make check
 
 %clean
 rm -rf %{buildroot}



From rdieter at fedoraproject.org  Thu Sep  4 14:41:53 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  4 Sep 2008 14:41:53 +0000 (UTC)
Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.59,1.60
Message-ID: <20080904144153.AE07F70121@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21353

Modified Files:
	kipi-plugins.spec 
Log Message:
+BR: sane-backends-devel



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kipi-plugins.spec	4 Sep 2008 14:31:09 -0000	1.59
+++ kipi-plugins.spec	4 Sep 2008 14:41:20 -0000	1.60
@@ -18,6 +18,8 @@
 BuildRequires: gettext
 BuildRequires: giflib-devel pcre-devel
 BuildRequires: kdegraphics4-devel
+# Until when/if libksane goes a dep on sane-backends-devel
+BuildRequires: sane-backends-devel 
 BuildRequires: libkipi-devel >= 0.2.0
 BuildRequires: libkdcraw-devel >= 0.2.0
 BuildRequires: libkexiv2-devel >= 0.2.0



From rmeggins at fedoraproject.org  Thu Sep  4 14:53:01 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 14:53:01 +0000 (UTC)
Subject: rpms/fedora-ds-admin/devel .cvsignore, 1.4,
	1.5 fedora-ds-admin-cvs.sh, 
	1.3, 1.4 fedora-ds-admin.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20080904145301.A026B70120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25655/devel

Modified Files:
	.cvsignore fedora-ds-admin-cvs.sh fedora-ds-admin.spec sources 
Log Message:
this is the 1.1.6 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Jun 2008 16:18:32 -0000	1.4
+++ .cvsignore	4 Sep 2008 14:53:00 -0000	1.5
@@ -1 +1,2 @@
 fedora-ds-admin-1.1.5.tar.bz2
+fedora-ds-admin-1.1.6.tar.bz2


Index: fedora-ds-admin-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/fedora-ds-admin-cvs.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds-admin-cvs.sh	9 Jun 2008 16:18:32 -0000	1.3
+++ fedora-ds-admin-cvs.sh	4 Sep 2008 14:53:00 -0000	1.4
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSrvAdmin115
-VERSION=1.1.5
+CVSTAG=FedoraDirSrvAdmin_1_1_6
+VERSION=1.1.6
 PKGNAME=fedora-ds-admin
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: fedora-ds-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/fedora-ds-admin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds-admin.spec	9 Jun 2008 16:18:32 -0000	1.3
+++ fedora-ds-admin.spec	4 Sep 2008 14:53:00 -0000	1.4
@@ -3,7 +3,7 @@
 
 Summary:          Fedora Administration Server (admin)
 Name:             fedora-ds-admin
-Version:          1.1.5
+Version:          1.1.6
 Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
@@ -36,6 +36,7 @@
 Source0:          http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2
 # fedora-ds-cvs.sh should be used to generate the source tarball from CVS
 Source1:          %{name}-cvs.sh
+Patch0:           bug451702.patch
 
 %description
 Fedora Administration Server is an HTTP agent that provides management features
@@ -45,6 +46,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0
 
 %build
 %configure --disable-rpath
@@ -102,6 +104,10 @@
 %{_libdir}/%{pkgname}
 
 %changelog
+* Wed Jul  2 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.6-1
+- add patch for bug 451702
+- The 1.1.6 release
+
 * Fri Jun  6 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.5-1
 - Resolves: Bug 448366
 - genrb no longer supports -p option


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Jun 2008 16:18:32 -0000	1.4
+++ sources	4 Sep 2008 14:53:00 -0000	1.5
@@ -1 +1,2 @@
 766c2ab5a7659450ac9fb37fac5ddeb5  fedora-ds-admin-1.1.5.tar.bz2
+63a2b5f4496d0cb4b067160fc9da5fd8  fedora-ds-admin-1.1.6.tar.bz2



From rmeggins at fedoraproject.org  Thu Sep  4 14:53:28 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 14:53:28 +0000 (UTC)
Subject: rpms/fedora-ds-admin/F-7 .cvsignore, 1.4, 1.5 fedora-ds-admin-cvs.sh,
	1.3, 1.4 fedora-ds-admin.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20080904145328.3CC3570120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25655/F-7

Modified Files:
	.cvsignore fedora-ds-admin-cvs.sh fedora-ds-admin.spec sources 
Log Message:
this is the 1.1.6 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Jun 2008 16:17:34 -0000	1.4
+++ .cvsignore	4 Sep 2008 14:52:56 -0000	1.5
@@ -1 +1,2 @@
 fedora-ds-admin-1.1.5.tar.bz2
+fedora-ds-admin-1.1.6.tar.bz2


Index: fedora-ds-admin-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-7/fedora-ds-admin-cvs.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds-admin-cvs.sh	9 Jun 2008 16:17:34 -0000	1.3
+++ fedora-ds-admin-cvs.sh	4 Sep 2008 14:52:56 -0000	1.4
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSrvAdmin115
-VERSION=1.1.5
+CVSTAG=FedoraDirSrvAdmin_1_1_6
+VERSION=1.1.6
 PKGNAME=fedora-ds-admin
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: fedora-ds-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-7/fedora-ds-admin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds-admin.spec	9 Jun 2008 16:17:34 -0000	1.3
+++ fedora-ds-admin.spec	4 Sep 2008 14:52:56 -0000	1.4
@@ -3,7 +3,7 @@
 
 Summary:          Fedora Administration Server (admin)
 Name:             fedora-ds-admin
-Version:          1.1.5
+Version:          1.1.6
 Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
@@ -102,6 +102,10 @@
 %{_libdir}/%{pkgname}
 
 %changelog
+* Wed Jul  2 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.6-1
+- The 1.1.6 release
+- setup/dscreate issues
+
 * Fri Jun  6 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.5-1
 - Resolves: Bug 448366
 - genrb no longer supports -p option


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Jun 2008 16:17:34 -0000	1.4
+++ sources	4 Sep 2008 14:52:56 -0000	1.5
@@ -1 +1,2 @@
 766c2ab5a7659450ac9fb37fac5ddeb5  fedora-ds-admin-1.1.5.tar.bz2
+63a2b5f4496d0cb4b067160fc9da5fd8  fedora-ds-admin-1.1.6.tar.bz2



From rmeggins at fedoraproject.org  Thu Sep  4 14:53:29 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 14:53:29 +0000 (UTC)
Subject: rpms/fedora-ds-admin/F-8 .cvsignore, 1.4, 1.5 fedora-ds-admin-cvs.sh,
	1.3, 1.4 fedora-ds-admin.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20080904145329.4263170120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25655/F-8

Modified Files:
	.cvsignore fedora-ds-admin-cvs.sh fedora-ds-admin.spec sources 
Log Message:
this is the 1.1.6 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Jun 2008 16:17:49 -0000	1.4
+++ .cvsignore	4 Sep 2008 14:52:57 -0000	1.5
@@ -1 +1,2 @@
 fedora-ds-admin-1.1.5.tar.bz2
+fedora-ds-admin-1.1.6.tar.bz2


Index: fedora-ds-admin-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-8/fedora-ds-admin-cvs.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds-admin-cvs.sh	9 Jun 2008 16:17:49 -0000	1.3
+++ fedora-ds-admin-cvs.sh	4 Sep 2008 14:52:57 -0000	1.4
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSrvAdmin115
-VERSION=1.1.5
+CVSTAG=FedoraDirSrvAdmin_1_1_6
+VERSION=1.1.6
 PKGNAME=fedora-ds-admin
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: fedora-ds-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-8/fedora-ds-admin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds-admin.spec	9 Jun 2008 16:17:49 -0000	1.3
+++ fedora-ds-admin.spec	4 Sep 2008 14:52:57 -0000	1.4
@@ -3,7 +3,7 @@
 
 Summary:          Fedora Administration Server (admin)
 Name:             fedora-ds-admin
-Version:          1.1.5
+Version:          1.1.6
 Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
@@ -102,6 +102,10 @@
 %{_libdir}/%{pkgname}
 
 %changelog
+* Wed Jul  2 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.6-1
+- The 1.1.6 release
+- setup/dscreate issues
+
 * Fri Jun  6 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.5-1
 - Resolves: Bug 448366
 - genrb no longer supports -p option


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Jun 2008 16:17:49 -0000	1.4
+++ sources	4 Sep 2008 14:52:57 -0000	1.5
@@ -1 +1,2 @@
 766c2ab5a7659450ac9fb37fac5ddeb5  fedora-ds-admin-1.1.5.tar.bz2
+63a2b5f4496d0cb4b067160fc9da5fd8  fedora-ds-admin-1.1.6.tar.bz2



From rmeggins at fedoraproject.org  Thu Sep  4 14:53:30 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 14:53:30 +0000 (UTC)
Subject: rpms/fedora-ds-admin/FC-6 fedora-ds-admin.spec,1.2,1.3
Message-ID: <20080904145330.6DBEA70120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin/FC-6
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25655/FC-6

Modified Files:
	fedora-ds-admin.spec 
Log Message:
this is the 1.1.6 release


Index: fedora-ds-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/FC-6/fedora-ds-admin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-ds-admin.spec	9 Jun 2008 16:18:15 -0000	1.2
+++ fedora-ds-admin.spec	4 Sep 2008 14:52:59 -0000	1.3
@@ -3,7 +3,7 @@
 
 Summary:          Fedora Administration Server (admin)
 Name:             fedora-ds-admin
-Version:          1.1.5
+Version:          1.1.6
 Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
@@ -102,6 +102,10 @@
 %{_libdir}/%{pkgname}
 
 %changelog
+* Wed Jul  2 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.6-1
+- The 1.1.6 release
+- setup/dscreate issues
+
 * Fri Jun  6 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.5-1
 - Resolves: Bug 448366
 - genrb no longer supports -p option



From rmeggins at fedoraproject.org  Thu Sep  4 14:53:29 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 14:53:29 +0000 (UTC)
Subject: rpms/fedora-ds-admin/F-9 .cvsignore, 1.4, 1.5 fedora-ds-admin-cvs.sh,
	1.3, 1.4 fedora-ds-admin.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20080904145329.E1BD570120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25655/F-9

Modified Files:
	.cvsignore fedora-ds-admin-cvs.sh fedora-ds-admin.spec sources 
Log Message:
this is the 1.1.6 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Jun 2008 16:18:02 -0000	1.4
+++ .cvsignore	4 Sep 2008 14:52:58 -0000	1.5
@@ -1 +1,2 @@
 fedora-ds-admin-1.1.5.tar.bz2
+fedora-ds-admin-1.1.6.tar.bz2


Index: fedora-ds-admin-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-9/fedora-ds-admin-cvs.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds-admin-cvs.sh	9 Jun 2008 16:18:02 -0000	1.3
+++ fedora-ds-admin-cvs.sh	4 Sep 2008 14:52:58 -0000	1.4
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSrvAdmin115
-VERSION=1.1.5
+CVSTAG=FedoraDirSrvAdmin_1_1_6
+VERSION=1.1.6
 PKGNAME=fedora-ds-admin
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: fedora-ds-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-9/fedora-ds-admin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds-admin.spec	9 Jun 2008 16:18:02 -0000	1.3
+++ fedora-ds-admin.spec	4 Sep 2008 14:52:58 -0000	1.4
@@ -3,7 +3,7 @@
 
 Summary:          Fedora Administration Server (admin)
 Name:             fedora-ds-admin
-Version:          1.1.5
+Version:          1.1.6
 Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
@@ -102,6 +102,9 @@
 %{_libdir}/%{pkgname}
 
 %changelog
+* Wed Jul  2 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.6-1
+- The 1.1.6 release
+
 * Fri Jun  6 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.5-1
 - Resolves: Bug 448366 
 - genrb no longer supports -p option


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Jun 2008 16:18:02 -0000	1.4
+++ sources	4 Sep 2008 14:52:58 -0000	1.5
@@ -1 +1,2 @@
 766c2ab5a7659450ac9fb37fac5ddeb5  fedora-ds-admin-1.1.5.tar.bz2
+63a2b5f4496d0cb4b067160fc9da5fd8  fedora-ds-admin-1.1.6.tar.bz2



From nbecker at fedoraproject.org  Thu Sep  4 14:55:01 2008
From: nbecker at fedoraproject.org (Neal Becker)
Date: Thu,  4 Sep 2008 14:55:01 +0000 (UTC)
Subject: rpms/mercurial/EL-5 mercurial.spec,1.14,1.15 sources,1.10,1.11
Message-ID: <20080904145501.7C90970120@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26228

Modified Files:
	mercurial.spec sources 
Log Message:
Update to 1.0.2



Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-5/mercurial.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mercurial.spec	2 Apr 2007 21:26:04 -0000	1.14
+++ mercurial.spec	4 Sep 2008 14:54:30 -0000	1.15
@@ -1,49 +1,289 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 0.9.3
-Release: 1%{?dist}
-License: GPL
+Version: 1.0.2
+Release: 2%{?dist}
+License: GPLv2
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
+Source1: mercurial-site-start.el
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: python-devel asciidoc xmlto
+BuildRequires: python python-devel asciidoc xmlto
+BuildRequires: emacs emacs-el pkgconfig
+Requires: python
+Provides: hg = %{version}-%{release}
 
 %description
-Mercurial is a fast, lightweight source control management system designed 
+Mercurial is a fast, lightweight source control management system designed
 for efficient handling of very large distributed projects.
- 
+
+Quick start: http://www.selenic.com/mercurial/wiki/index.cgi/QuickStart
+Tutorial: http://www.selenic.com/mercurial/wiki/index.cgi/Tutorial
+Extensions: http://www.selenic.com/mercurial/wiki/index.cgi/CategoryExtension
+
+%define pkg mercurial
+#%define pkgname Foo
+
+# If the emacs-el package has installed a pkgconfig file, use that to determine
+# install locations and Emacs version at build time, otherwise set defaults.
+%if %($(pkg-config emacs) ; echo $?)
+%define emacs_version 22.1
+%define emacs_lispdir %{_datadir}/emacs/site-lisp
+%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
+%else
+%define emacs_version %{expand:%(pkg-config emacs --modversion)}
+%define emacs_lispdir %{expand:%(pkg-config emacs --variable sitepkglispdir)}
+%define emacs_startdir %{expand:%(pkg-config emacs --variable sitestartdir)}
+%endif
+
+%package -n emacs-%{pkg}
+Summary:	Mercurial version control system support for Emacs
+Group:		Applications/Editors
+Requires:	hg = %{version}-%{release}, emacs-common
+Requires:       emacs(bin) >= %{emacs_version}
+Obsoletes:	%{pkg}-emacs
+
+%description -n emacs-%{pkg}
+Contains byte compiled elisp packages for %{pkg}.
+To get started: start emacs, load hg-mode with M-x hg-mode, and show 
+help with C-c h h
+
+%package -n emacs-%{pkg}-el
+Summary:        Elisp source files for %{pkg} under GNU Emacs
+Group:          Applications/Editors
+Requires:       emacs-%{pkg} = %{version}-%{release}
+
+%description -n emacs-%{pkg}-el
+This package contains the elisp source files for %{pkg} under GNU Emacs. You
+do not need to install this package to run %{pkg}. Install the emacs-%{pkg}
+package to use %{pkg} with GNU Emacs.
+
+%package hgk
+Summary:	Hgk interface for mercurial
+Group:		Development/Tools
+Requires:	hg = %{version}-%{release}, tk
+
+
+%description hgk
+A Mercurial extension for displaying the change history graphically
+using Tcl/Tk.  Displays branches and merges in an easily
+understandable way and shows diffs for each revision.  Based on
+gitk for the git SCM.
+
+Adds the "hg view" command.  See 
+http://www.selenic.com/mercurial/wiki/index.cgi/UsingHgk for more
+documentation.
+
 %prep
 %setup -q
 
 %build
-python ./setup.py build
-
-# not built by default.  kind of lame
-pushd doc ; make man ; popd
+make all
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
+%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT --prefix %{_prefix} --record=%{name}.files
+make install-doc DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir}
+
+grep -v 'hgk.py*' < %{name}.files > %{name}-base.files
+grep 'hgk.py*' < %{name}.files > %{name}-hgk.files
+
+install -D contrib/hgk       $RPM_BUILD_ROOT%{_libexecdir}/mercurial/hgk
+install contrib/convert-repo $RPM_BUILD_ROOT%{_bindir}/mercurial-convert-repo
+install contrib/hg-ssh       $RPM_BUILD_ROOT%{_bindir}
+install contrib/git-viz/{hg-viz,git-rev-tree} $RPM_BUILD_ROOT%{_bindir}
+
+bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+mkdir -p $bash_completion_dir
+install -m 644 contrib/bash_completion $bash_completion_dir/mercurial.sh
+
+zsh_completion_dir=$RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
+mkdir -p $zsh_completion_dir
+install -m 644 contrib/zsh_completion $zsh_completion_dir/_mercurial
+
+mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}
+
+pushd contrib
+for file in mercurial.el mq.el; do
+  emacs -batch -l mercurial.el --no-site-file -f batch-byte-compile $file
+  install -p -m 644 $file ${file}c $RPM_BUILD_ROOT%{emacs_lispdir}
+  rm ${file}c
+done
+popd
+
+
+
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
 
-# and we have to install the man pages
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
-install -m 0644 doc/hg.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hg.1
-install -m 0644 doc/hgmerge.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hgmerge.1
-install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
+mkdir -p $RPM_BUILD_ROOT%{emacs_startdir} && install -m644 %SOURCE1 $RPM_BUILD_ROOT%{emacs_startdir}
 
+cat >hgk.rc <<EOF
+[extensions]
+# enable hgk extension ('hg help' shows 'view' as a command)
+hgk=
+
+[hgk]
+path=%{_libexecdir}/mercurial/hgk
+EOF
+install hgk.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
+
+install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%files -f %{name}.files
+%files -f %{name}-base.files
 %defattr(-,root,root,-)
-%doc CONTRIBUTORS README contrib/sample.hgrc
-%{_mandir}/man*/*
+%doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html doc/ja *.cgi contrib/*.fcgi
+%doc %attr(644,root,root) %{_mandir}/man?/hg*.gz
+%doc %attr(644,root,root) contrib/*.svg contrib/sample.hgrc
+%{_sysconfdir}/bash_completion.d/mercurial.sh
+%{_datadir}/zsh/site-functions/_mercurial
+%{_bindir}/hg-ssh
+%{_bindir}/hg-viz
+%{_bindir}/git-rev-tree
+%{_bindir}/mercurial-convert-repo
+%dir %{_sysconfdir}/mercurial
+%dir %{_sysconfdir}/mercurial/hgrc.d
+%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
+%dir %{python_sitearch}/mercurial
+%dir %{python_sitearch}/hgext
+
+%files -n emacs-%{pkg}
+%{emacs_lispdir}/*.elc
+%{emacs_startdir}/*.el
+
+%files -n emacs-%{pkg}-el
+%{emacs_lispdir}/*.el
+
+%files hgk -f %{name}-hgk.files
+%{_libexecdir}/mercurial/
+%{_sysconfdir}/mercurial/hgrc.d/hgk.rc
 
+#%%check
+#cd tests && %{__python} run-tests.py
 
 %changelog
+* Thu Aug 28 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.2-2
+- Use macro for python executable
+
+* Fri Aug 15 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.2-1
+- Update to 1.0.2
+
+* Sun Jun 15 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.1-4
+- Bitten by expansion of commented out macro (again)
+
+* Sun Jun 15 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.1-3
+- Add BR pkgconfig
+
+* Sun Jun 15 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.1-2
+- Update to 1.0.1
+- Fix emacs_version, etc macros (need expand)
+- Remove patch0
+
+* Mon Jun  2 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-15
+- Bump release tag
+
+* Thu Apr 17 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-14
+- Oops, fix %%files due to last change
+
+* Wed Apr 16 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-13
+- install mergetools.hgrc as mergetools.rc
+
+* Sat Apr 12 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-12
+- Remove xemacs pkg - this is moved to xemacs-extras
+- Own %{python_sitearch}/{mercurial,hgext} dirs
+
+* Thu Apr 10 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-11
+- Use install -p to install .el{c} files
+- Don't (load mercurial) by default.
+
+* Wed Apr  9 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-10
+- Patch to hgk from Mads Kiilerich <mads at kiilerich.com>
+
+* Tue Apr  8 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-9
+- Add '-l mercurial.el' for emacs also
+
+* Tue Apr  8 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-8
+- BR xemacs-packages-extra
+
+* Tue Apr  8 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-7
+- Various fixes
+
+* Tue Apr  8 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-6
+- fix to comply with emacs packaging guidelines
+
+* Thu Mar 27 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-5
+- Move hgk-related py files to hgk
+- Put mergetools.hgrc in /etc/mercurial/hgrc.d
+- Add hgk.rc and put in /etc/mercurial/hgrc.d
+
+* Wed Mar 26 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-4
+- Rename mercurial-site-start -> mercurial-site-start.el
+
+* Wed Mar 26 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-3
+- Incorprate suggestions from hopper at omnifarious.org
+
+* Wed Mar 26 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-2
+- Add site-start
+
+* Tue Mar 25 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-1
+- Update to 1.0
+- Disable check for now - 1 test fails
+- Move emacs to separate package
+- Add check
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.5-7
+- Autorebuild for GCC 4.3
+
+* Fri Nov  9 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.5-6
+- rpmlint fixes
+
+* Fri Nov  9 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.5-5
+- /etc/mercurial/hgrc.d missing
+
+* Fri Nov  9 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.5-3
+- Fix to last change
+
+* Fri Nov  9 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.5-2
+- mkdir /etc/mercurial/hgrc.d for plugins
+
+* Tue Oct 23 2007  <ndbecker2 at gmail.com> - 0.9.5-2
+- Bump tag to fix confusion
+
+* Mon Oct 15 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.5-1
+- Sync with spec file from mercurial
+
+* Sat Sep 22 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-8
+- Just cp contrib tree.
+- Revert install -O2
+
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-7
+- Change setup.py install to -O2 to get bytecompile on EL-4
+
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-6
+- Revert last change.
+
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-5
+- Use {ghost} on contrib, otherwise EL-4 build fails
+
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-4
+- remove {_datadir}/contrib stuff for now
+
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-3
+- Fix mercurial-install-contrib.patch (/usr/share/mercurial->/usr/share/mercurial/contrib)
+
+* Wed Aug 29 2007 Jonathan Shapiro <shap at eros-os.com> - 0.9.4-2
+- update to 0.9.4-2
+- install contrib directory
+- set up required path for hgk
+- install man5 man pages
+
+* Thu Aug 23 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-1
+- update to 0.9.4
+
 * Wed Jan  3 2007 Jeremy Katz <katzj at redhat.com> - 0.9.3-1
 - update to 0.9.3
 - remove asciidoc files now that we have them as manpages


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	2 Apr 2007 21:26:04 -0000	1.10
+++ sources	4 Sep 2008 14:54:30 -0000	1.11
@@ -1 +1 @@
-5e39fed853e5669cbac32b77a67bb6dd  mercurial-0.9.3.tar.gz
+32432616f517107e6582721c257cd1f4  mercurial-1.0.2.tar.gz



From wtogami at fedoraproject.org  Thu Sep  4 15:04:35 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu,  4 Sep 2008 15:04:35 +0000 (UTC)
Subject: rpms/lrzip/F-9 .cvsignore, 1.3, 1.4 lrzip.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20080904150435.3D8E070120@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/lrzip/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29379

Modified Files:
	.cvsignore lrzip.spec sources 
Log Message:
Upgrade to 0.23 to fix #455222



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lrzip/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Feb 2008 21:50:53 -0000	1.3
+++ .cvsignore	4 Sep 2008 15:04:04 -0000	1.4
@@ -1 +1 @@
-lrzip-0.19.tar.bz2
+lrzip-0.23.tar.bz2


Index: lrzip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lrzip/F-9/lrzip.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lrzip.spec	8 Feb 2008 21:50:53 -0000	1.2
+++ lrzip.spec	4 Sep 2008 15:04:04 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           lrzip
-Version:        0.19
+Version:        0.23
 Release:        1%{?dist}
 Summary:        Compression program optimised for large files
 
@@ -9,7 +9,7 @@
 Source0:        http://ck.kolivas.org/apps/lrzip/lrzip-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  bzip2-devel lzo-devel
+BuildRequires:  bzip2-devel lzo-devel nasm
 
 %description
 Long Range ZIP or Lzma RZIP
@@ -43,10 +43,13 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/lrzip
+%{_bindir}/lrunzip
 %{_datadir}/man/man1/lrzip.1.gz
 
-
 %changelog
+* Fri Jul 18 2008 Shawn Starr <spstarr at fedoraproject.org> 0.23-1
+- New upstream release
+
 * Fri Feb 08 2008 Warren Togami <wtogami at redhat.com> 0.19-1
 - 0.19 and rebuild for gcc-4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lrzip/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Feb 2008 21:50:53 -0000	1.3
+++ sources	4 Sep 2008 15:04:04 -0000	1.4
@@ -1 +1 @@
-a724f4bc8c89d698873b46a0de60bcd1  lrzip-0.19.tar.bz2
+a15ca1768adb50c839baabc13b0fb60a  lrzip-0.23.tar.bz2



From sgrubb at fedoraproject.org  Thu Sep  4 15:05:06 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Thu,  4 Sep 2008 15:05:06 +0000 (UTC)
Subject: rpms/libprelude/devel libprelude-0.9.20-libtool.patch, NONE,
	1.1 libprelude.spec, 1.24, 1.25
Message-ID: <20080904150506.C56B570120@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29839

Modified Files:
	libprelude.spec 
Added Files:
	libprelude-0.9.20-libtool.patch 
Log Message:
ppc debug


libprelude-0.9.20-libtool.patch:

--- NEW FILE libprelude-0.9.20-libtool.patch ---
diff -ur libprelude-0.9.20.orig/tests/Makefile.in libprelude-0.9.20/tests/Makefile.in
--- libprelude-0.9.20.orig/tests/Makefile.in	2008-09-03 11:58:21.000000000 -0400
+++ libprelude-0.9.20/tests/Makefile.in	2008-09-04 11:02:38.000000000 -0400
@@ -1012,7 +1012,7 @@
 @HAVE_VALGRIND_TRUE@	$(MAKE) valgrind
 
 @HAVE_VALGRIND_TRUE@%.valgrind: %
- at HAVE_VALGRIND_TRUE@	libtool --mode=execute                                  \
+ at HAVE_VALGRIND_TRUE@	$(LIBTOOL) --mode=execute                                  \
 @HAVE_VALGRIND_TRUE@	$(VALGRIND) -q                                          \
 @HAVE_VALGRIND_TRUE@	--tool=memcheck --leak-check=full --trace-children=yes  \
 @HAVE_VALGRIND_TRUE@	--leak-resolution=high --num-callers=20                 \


Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libprelude.spec	4 Sep 2008 14:37:50 -0000	1.24
+++ libprelude.spec	4 Sep 2008 15:05:05 -0000	1.25
@@ -11,6 +11,7 @@
 License:	GPLv2+
 URL:		http://prelude-ids.org/
 Source0:	http://www.prelude-ids.org/download/releases/%{name}/%{name}-%{version}.tar.gz
+Patch1:         libprelude-0.9.20-libtool.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gnutls-devel, python-devel, ruby, ruby-devel, lua-devel
@@ -74,6 +75,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure	--disable-static \



From mlichvar at fedoraproject.org  Thu Sep  4 15:06:54 2008
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu,  4 Sep 2008 15:06:54 +0000 (UTC)
Subject: rpms/openbox/devel openbox-3.4.7.2-gnomesession.patch, NONE,
	1.1 openbox.spec, 1.37, 1.38
Message-ID: <20080904150654.7D69770120@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/openbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30292

Modified Files:
	openbox.spec 
Added Files:
	openbox-3.4.7.2-gnomesession.patch 
Log Message:
- Don't use --choose-session option in gnome session script


openbox-3.4.7.2-gnomesession.patch:

--- NEW FILE openbox-3.4.7.2-gnomesession.patch ---
diff -up openbox-3.4.7.2/data/xsession/openbox-gnome-session.in.gnomesession openbox-3.4.7.2/data/xsession/openbox-gnome-session.in
--- openbox-3.4.7.2/data/xsession/openbox-gnome-session.in.gnomesession	2008-09-04 16:48:21.000000000 +0200
+++ openbox-3.4.7.2/data/xsession/openbox-gnome-session.in	2008-09-04 16:49:56.000000000 +0200
@@ -12,4 +12,4 @@ xprop -root -remove _NET_NUMBER_OF_DESKT
 
 # Run GNOME with Openbox as its window manager
 export WINDOW_MANAGER="@bindir@/openbox"
-exec gnome-session --choose-session=openbox-session "$@"
+exec gnome-session "$@"


Index: openbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/devel/openbox.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- openbox.spec	1 Aug 2008 12:01:24 -0000	1.37
+++ openbox.spec	4 Sep 2008 15:06:23 -0000	1.38
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.4.7.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -13,6 +13,7 @@
 
 Patch0:		openbox-3.4.7.1-autostartdir.patch
 Patch1:		openbox-3.4.7.2-gdm.patch
+Patch2:		openbox-3.4.7.2-gnomesession.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -67,6 +68,7 @@
 %setup -q
 %patch0 -p1 -b .autostartdir
 %patch1 -p1 -b .gdm
+%patch2 -p1 -b .gnomesession
 
 
 %build
@@ -134,6 +136,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.7.2-5
+- Don't use --choose-session option in gnome session script
+
 * Fri Aug 01 2008 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.7.2-4
 - Remove field codes from commands in xdg-menu (#452403)
 - Add support for launching applications in xterm to xdg-menu



From wtogami at fedoraproject.org  Thu Sep  4 15:06:58 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu,  4 Sep 2008 15:06:58 +0000 (UTC)
Subject: rpms/lrzip/F-8 .cvsignore, 1.2, 1.3 lrzip.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20080904150658.386C470120@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/lrzip/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29796

Modified Files:
	.cvsignore lrzip.spec sources 
Log Message:
upgrade to 0.23 to fix bug #455222



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lrzip/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Nov 2007 16:14:17 -0000	1.2
+++ .cvsignore	4 Sep 2008 15:06:26 -0000	1.3
@@ -1 +1 @@
-lrzip-0.18.tar.bz2
+lrzip-0.23.tar.bz2


Index: lrzip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lrzip/F-8/lrzip.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lrzip.spec	26 Nov 2007 16:14:17 -0000	1.1
+++ lrzip.spec	4 Sep 2008 15:06:26 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           lrzip
-Version:        0.18
+Version:        0.23
 Release:        1%{?dist}
 Summary:        Compression program optimised for large files
 
@@ -9,7 +9,7 @@
 Source0:        http://ck.kolivas.org/apps/lrzip/lrzip-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  bzip2-devel lzo-devel
+BuildRequires:  bzip2-devel lzo-devel nasm
 
 %description
 Long Range ZIP or Lzma RZIP
@@ -43,9 +43,15 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/lrzip
+%{_bindir}/lrunzip
 %{_datadir}/man/man1/lrzip.1.gz
 
-
 %changelog
+* Fri Jul 18 2008 Shawn Starr <spstarr at fedoraproject.org> 0.23-1
+- New upstream release
+
+* Fri Feb 08 2008 Warren Togami <wtogami at redhat.com> 0.19-1
+- 0.19 and rebuild for gcc-4.3
+
 * Mon Nov 12 2007 Warren Togami <wtogami at redhat.com> 0.18-1
 - initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lrzip/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Nov 2007 16:14:17 -0000	1.2
+++ sources	4 Sep 2008 15:06:26 -0000	1.3
@@ -1 +1 @@
-285c995f6d861c4125f6164ab0ab2368  lrzip-0.18.tar.bz2
+a15ca1768adb50c839baabc13b0fb60a  lrzip-0.23.tar.bz2



From pjones at fedoraproject.org  Thu Sep  4 15:08:55 2008
From: pjones at fedoraproject.org (Peter Jones)
Date: Thu,  4 Sep 2008 15:08:55 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-merge-efifb-imacfb.patch,1.4,1.5
Message-ID: <20080904150855.B7B4D70120@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30901

Modified Files:
	linux-2.6-merge-efifb-imacfb.patch 
Log Message:
Add some more DMI info (4th gen MBP)


linux-2.6-merge-efifb-imacfb.patch:

Index: linux-2.6-merge-efifb-imacfb.patch
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/linux-2.6-merge-efifb-imacfb.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-merge-efifb-imacfb.patch	30 Jun 2008 15:25:53 -0000	1.4
+++ linux-2.6-merge-efifb-imacfb.patch	4 Sep 2008 15:08:53 -0000	1.5
@@ -1,15 +1,15 @@
 
  Kconfig  |   15 --
  Makefile |    1 
- efifb.c  |  178 ++++++++++++++++++++++++++++-
+ efifb.c  |  191 ++++++++++++++++++++++++++++++--
  imacfb.c |  376 ---------------------------------------------------------------
- 4 files changed, 171 insertions(+), 399 deletions(-)
+ 4 files changed, 184 insertions(+), 399 deletions(-)
 
 diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
-index 1bd5fb3..474c375 100644
+index 70d135e..be947ff 100644
 --- a/drivers/video/Kconfig
 +++ b/drivers/video/Kconfig
-@@ -689,23 +689,14 @@ config FB_VESA
+@@ -687,23 +687,14 @@ config FB_VESA
  
  config FB_EFI
  	bool "EFI-based Framebuffer Support"
@@ -37,10 +37,10 @@
  config FB_N411
         tristate "N411 Apollo/Hecuba devkit support"
 diff --git a/drivers/video/Makefile b/drivers/video/Makefile
-index 11c0e5e..c789b01 100644
+index a6b5529..2e0cd0c 100644
 --- a/drivers/video/Makefile
 +++ b/drivers/video/Makefile
-@@ -118,7 +118,6 @@ obj-$(CONFIG_FB_OMAP)             += omap/
+@@ -125,7 +125,6 @@ obj-$(CONFIG_FB_CARMINE)          += carminefb.o
  # Platform or fallback drivers go here
  obj-$(CONFIG_FB_UVESA)            += uvesafb.o
  obj-$(CONFIG_FB_VESA)             += vesafb.o
@@ -49,7 +49,7 @@
  obj-$(CONFIG_FB_VGA16)            += vga16fb.o
  obj-$(CONFIG_FB_OF)               += offb.o
 diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c
-index bd779ae..d4b47d4 100644
+index bd779ae..daf9b81 100644
 --- a/drivers/video/efifb.c
 +++ b/drivers/video/efifb.c
 @@ -12,6 +12,7 @@
@@ -60,7 +60,7 @@
  
  #include <video/vga.h>
  
-@@ -33,6 +34,92 @@ static struct fb_fix_screeninfo efifb_fix __initdata = {
+@@ -33,6 +34,105 @@ static struct fb_fix_screeninfo efifb_fix __initdata = {
  	.visual			= FB_VISUAL_TRUECOLOR,
  };
  
@@ -71,10 +71,14 @@
 +	M_I24,		/* 24-Inch iMac */
 +	M_MINI,		/* Mac Mini */
 +	M_MB,		/* MacBook */
++	M_MB_2,		/* MacBook, 2nd rev. */
++	M_MB_3,		/* MacBook, 3rd rev. */
++	M_MB_SR,	/* MacBook, 2nd gen, (Santa Rosa) */
 +	M_MBA,		/* MacBook Air */
 +	M_MBP,		/* MacBook Pro */
 +	M_MBP_2,	/* MacBook Pro 2nd gen */
 +	M_MBP_SR,	/* MacBook Pro (Santa Rosa) */
++	M_MBP_4,	/* MacBook Pro, 4th gen */
 +	M_UNKNOWN	/* placeholder */
 +};
 +
@@ -95,6 +99,7 @@
 +	[M_MBP] = { "mbp", 0x80010000, 1472 * 4, 1440, 900 },
 +	[M_MBP_2] = { "mbp2", 0, 0, 0, 0 }, /* placeholder */
 +	[M_MBP_SR] = { "mbp3", 0x80030000, 2048 * 4, 1440, 900 },
++	[M_MBP_4] = { "mbp4", 0xc0060000, 2048 * 4, 1920, 1200 },
 +	[M_UNKNOWN] = { NULL, 0, 0, 0, 0 }
 +};
 +
@@ -117,12 +122,20 @@
 +	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac7,1", M_I20_SR),
 +	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "Macmini1,1", M_MINI),
 +	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook1,1", M_MB),
++	/* At least one of these two will be right; maybe both? */
++	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook2,1", M_MB),
++	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook2,1", M_MB),
++	/* At least one of these two will be right; maybe both? */
++	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook3,1", M_MB),
++	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook3,1", M_MB),
++	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook4,1", M_MB),
 +	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookAir1,1", M_MBA),
 +	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro1,1", M_MBP),
 +	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro2,1", M_MBP_2),
 +	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro2,1", M_MBP_2),
 +	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro3,1", M_MBP_SR),
 +	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro3,1", M_MBP_SR),
++	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro4,1", M_MBP_4),
 +	{},
 +};
 +
@@ -153,7 +166,7 @@
  static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green,
  			   unsigned blue, unsigned transp,
  			   struct fb_info *info)
-@@ -67,6 +154,38 @@ static struct fb_ops efifb_ops = {
+@@ -67,6 +167,38 @@ static struct fb_ops efifb_ops = {
  	.fb_imageblit	= cfb_imageblit,
  };
  
@@ -192,7 +205,7 @@
  static int __init efifb_probe(struct platform_device *dev)
  {
  	struct fb_info *info;
-@@ -74,6 +193,26 @@ static int __init efifb_probe(struct platform_device *dev)
+@@ -74,6 +206,26 @@ static int __init efifb_probe(struct platform_device *dev)
  	unsigned int size_vmode;
  	unsigned int size_remap;
  	unsigned int size_total;
@@ -219,7 +232,7 @@
  
  	efifb_fix.smem_start = screen_info.lfb_base;
  	efifb_defined.bits_per_pixel = screen_info.lfb_depth;
-@@ -98,21 +237,25 @@ static int __init efifb_probe(struct platform_device *dev)
+@@ -98,21 +250,25 @@ static int __init efifb_probe(struct platform_device *dev)
  	 *                 option to simply use size_total as that
  	 *                 wastes plenty of kernel address space. */
  	size_remap  = size_vmode * 2;
@@ -244,11 +257,11 @@
  
  	info = framebuffer_alloc(sizeof(u32) * 16, &dev->dev);
  	if (!info) {
-+		printk(KERN_ERR "efifb: cannot allocate framebuffer\n"); 
++		printk(KERN_ERR "efifb: cannot allocate framebuffer\n");
  		err = -ENOMEM;
  		goto err_release_mem;
  	}
-@@ -125,7 +268,7 @@ static int __init efifb_probe(struct platform_device *dev)
+@@ -125,7 +281,7 @@ static int __init efifb_probe(struct platform_device *dev)
  				"0x%x @ 0x%lx\n",
  			efifb_fix.smem_len, efifb_fix.smem_start);
  		err = -EIO;
@@ -257,7 +270,7 @@
  	}
  
  	printk(KERN_INFO "efifb: framebuffer at 0x%lx, mapped to 0x%p, "
-@@ -178,25 +321,27 @@ static int __init efifb_probe(struct platform_device *dev)
+@@ -178,25 +334,27 @@ static int __init efifb_probe(struct platform_device *dev)
  	info->fix = efifb_fix;
  	info->flags = FBINFO_FLAG_DEFAULT;
  
@@ -291,7 +304,7 @@
  	return err;
  }
  
-@@ -214,9 +359,22 @@ static struct platform_device efifb_device = {
+@@ -214,9 +372,22 @@ static struct platform_device efifb_device = {
  static int __init efifb_init(void)
  {
  	int ret;



From kkofler at fedoraproject.org  Thu Sep  4 15:09:38 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 15:09:38 +0000 (UTC)
Subject: rpms/kdepimlibs/F-8 .cvsignore, 1.14, 1.15 kdepimlibs.spec, 1.22,
	1.23 sources, 1.14, 1.15
Message-ID: <20080904150938.4E09670120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31116/F-8

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
Sync from devel:

* Thu Aug 28 2008 Than Ngo <than at redhat.com> 4.1.1-1
- 4.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-8/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	25 Jul 2008 11:37:19 -0000	1.14
+++ .cvsignore	4 Sep 2008 15:09:06 -0000	1.15
@@ -1,2 +1,3 @@
 kdepimlibs-4.0.99.tar.bz2
 kdepimlibs-4.1.0.tar.bz2
+kdepimlibs-4.1.1.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-8/kdepimlibs.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kdepimlibs.spec	5 Aug 2008 22:09:43 -0000	1.22
+++ kdepimlibs.spec	4 Sep 2008 15:09:06 -0000	1.23
@@ -13,8 +13,8 @@
 
 Name: kdepimlibs
 
-Version: 4.1.0
-Release: 2%{?dist}
+Version: 4.1.1
+Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Thu Aug 28 2008 Than Ngo <than at redhat.com> 4.1.1-1
+- 4.1.1
+
 * Tue Aug 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-2
 - -devel: Requires: boost-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-8/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	25 Jul 2008 11:37:19 -0000	1.14
+++ sources	4 Sep 2008 15:09:06 -0000	1.15
@@ -1 +1 @@
-b1eddf3b85a70a31f6a4385948b2a6cd  kdepimlibs-4.1.0.tar.bz2
+36316f5fc5b2e0ec123a8e00a522dd80  kdepimlibs-4.1.1.tar.bz2



From nalin at fedoraproject.org  Thu Sep  4 15:13:52 2008
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Thu,  4 Sep 2008 15:13:52 +0000 (UTC)
Subject: rpms/krb5/devel krb5-trunk-preauth-master.patch, NONE, 1.1 krb5.spec,
	1.175, 1.176
Message-ID: <20080904151352.E81D570120@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32688

Modified Files:
	krb5.spec 
Added Files:
	krb5-trunk-preauth-master.patch 
Log Message:
- if we successfully change the user's password during an attempt to get
  initial credentials, but then fail to get initial creds from a non-master
  using the new password, retry against the master (#432334)


krb5-trunk-preauth-master.patch:

--- NEW FILE krb5-trunk-preauth-master.patch ---
Assume that KRB5_PREAUTH_FAILED is subject to propagation delay between the
master and replicas (this error is only returned when ENC_TIMESTAMP fails),
and if we get a key-expired error right after changing the password, try
again against the master KDC.  RT#6108

Index: src/lib/krb5/krb/gic_pwd.c
===================================================================
--- src/lib/krb5/krb/gic_pwd.c	(revision 20704)
+++ src/lib/krb5/krb/gic_pwd.c	(working copy)
@@ -147,10 +147,10 @@
       goto cleanup;
 
    /* If all the kdc's are unavailable, or if the error was due to a
-      user interrupt, or preauth errored out, fail */
+      user interrupt, or preauth errored out against the master, fail */
 
    if ((ret == KRB5_KDC_UNREACH) ||
-       (ret == KRB5_PREAUTH_FAILED) ||
+       ((ret == KRB5_PREAUTH_FAILED) && use_master) ||
        (ret == KRB5_LIBOS_PWDINTR) ||
 	   (ret == KRB5_REALM_CANT_RESOLVE))
       goto cleanup;
@@ -320,6 +320,25 @@
 			     krb5_get_as_key_password, (void *) &pw0,
 			     &use_master, &as_reply);
 
+   if ((ret != KRB5KDC_ERR_KEY_EXP) || use_master)
+      goto cleanup;
+   else {
+      /* Okay, we *just* changed the password. Retry against a master KDC,
+       * because either the non-master's using outdated data or the admin
+       * has set an impossibly low maximum password lifetime. */
+      use_master = 1;
+      ret2 = krb5_get_init_creds(context, creds, client, prompter, data,
+			         start_time, in_tkt_service, opte,
+			         krb5_get_as_key_password, (void *) &pw0,
+			         &use_master, &as_reply);
+      if ((ret2 != KRB5_KDC_UNREACH) &&
+	  (ret2 != KRB5_REALM_CANT_RESOLVE) &&
+	  (ret2 != KRB5_REALM_UNKNOWN))
+	 ret = ret2;
+      else
+	 use_master = 0;
+   }
+
 cleanup:
    krb5int_set_prompt_types(context, 0);
    /* if getting the password was successful, then check to see if the


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- krb5.spec	5 Aug 2008 17:46:07 -0000	1.175
+++ krb5.spec	4 Sep 2008 15:13:51 -0000	1.176
@@ -101,6 +101,7 @@
 Patch77: krb5-CVE-2007-5971.patch
 Patch78: krb5-1.6.3-lucid-acceptor.patch
 Patch79: krb5-trunk-ftp_mget_case.patch
+Patch80: krb5-trunk-preauth-master.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -231,6 +232,11 @@
 certificate.
 
 %changelog
+* Thu Sep  4 2008 Nalin Dahyabhai <nalin at redhat.com>
+- if we successfully change the user's password during an attempt to get
+  initial credentials, but then fail to get initial creds from a non-master
+  using the new password, retry against the master (#432334)
+
 * Tue Aug  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.3-16
 - fix license tag
 
@@ -1383,6 +1389,7 @@
 %patch77 -p0 -b .2007-5971
 %patch78 -p0 -b .lucid_acceptor
 %patch79 -p0 -b .ftp_mget_case
+%patch80 -p0 -b .preauth_master
 cp src/krb524/README README.krb524
 gzip doc/*.ps
 



From orion at fedoraproject.org  Thu Sep  4 15:18:07 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu,  4 Sep 2008 15:18:07 +0000 (UTC)
Subject: rpms/perl-HTML-Table/devel .cvsignore, 1.5, 1.6 perl-HTML-Table.spec,
	1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20080904151808.05E0770124@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/perl-HTML-Table/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1672

Modified Files:
	.cvsignore perl-HTML-Table.spec sources 
Log Message:
* Thu Sep 4 2008 Orion Poplawski <orion at cora.nwra.com> 2.08a-1
- Update to 2.08a



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Table/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Feb 2008 03:27:47 -0000	1.5
+++ .cvsignore	4 Sep 2008 15:18:06 -0000	1.6
@@ -1 +1 @@
-HTML-Table-2.07b.tar.gz
+HTML-Table-2.08a.tar.gz


Index: perl-HTML-Table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Table/devel/perl-HTML-Table.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-HTML-Table.spec	7 Mar 2008 02:04:15 -0000	1.6
+++ perl-HTML-Table.spec	4 Sep 2008 15:18:06 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Table
-Version:        2.07b
-Release:        2%{?dist}
+Version:        2.08a
+Release:        1%{?dist}
 Summary:        Create HTML tables using simple interface
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Thu Sep 4 2008 Orion Poplawski <orion at cora.nwra.com> 2.08a-1
+- Update to 2.08a
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.07b-2
 Rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Table/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Feb 2008 03:27:47 -0000	1.5
+++ sources	4 Sep 2008 15:18:06 -0000	1.6
@@ -1 +1 @@
-6956955e5bb088648c63773aa29e4b09  HTML-Table-2.07b.tar.gz
+ae24eb86442e34d9ef6c8f3e4deac968  HTML-Table-2.08a.tar.gz



From rmeggins at fedoraproject.org  Thu Sep  4 15:19:21 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 15:19:21 +0000 (UTC)
Subject: rpms/idm-console-framework/F-8 .cvsignore, 1.2,
	1.3 idm-console-framework.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20080904151921.DFF5E70124@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/idm-console-framework/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2036/F-8

Modified Files:
	.cvsignore idm-console-framework.spec sources 
Log Message:
this is the 1.1.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/idm-console-framework/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Jan 2008 18:50:25 -0000	1.2
+++ .cvsignore	4 Sep 2008 15:18:50 -0000	1.3
@@ -1 +1,2 @@
 idm-console-framework-1.1.1.tar.bz2
+idm-console-framework-1.1.2.tar.bz2


Index: idm-console-framework.spec
===================================================================
RCS file: /cvs/extras/rpms/idm-console-framework/F-8/idm-console-framework.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- idm-console-framework.spec	15 Apr 2008 23:45:55 -0000	1.2
+++ idm-console-framework.spec	4 Sep 2008 15:18:50 -0000	1.3
@@ -1,9 +1,9 @@
 %define major_version 1.1
-%define minor_version 1
+%define minor_version 2
 
 Name: idm-console-framework
 Version: %{major_version}.%{minor_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: Identity Management Console Framework
 
 Group: System Environment/Libraries
@@ -75,6 +75,9 @@
 %{_javadir}/idm-console-nmclf_en.jar
 
 %changelog
+* Wed Jul  2 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-1
+- numerous fixes for threading issues and help for debugging and eclipse
+
 * Tue Apr 15 2008 Rich Megginson <rmeggins at redhat.com> 1.1.1-3
 - use java > 1.5.0 for the requirements
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/idm-console-framework/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Jan 2008 18:50:25 -0000	1.2
+++ sources	4 Sep 2008 15:18:50 -0000	1.3
@@ -1 +1,2 @@
 a23291c9aea256f075b69df981fae42a  idm-console-framework-1.1.1.tar.bz2
+f2db919004fcaf5d6adf6db55b4d589f  idm-console-framework-1.1.2.tar.bz2



From rmeggins at fedoraproject.org  Thu Sep  4 15:19:22 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 15:19:22 +0000 (UTC)
Subject: rpms/idm-console-framework/F-9 .cvsignore, 1.2,
	1.3 idm-console-framework.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20080904151922.8FA9C70124@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/idm-console-framework/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2036/F-9

Modified Files:
	.cvsignore idm-console-framework.spec sources 
Log Message:
this is the 1.1.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/idm-console-framework/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Jan 2008 18:46:00 -0000	1.2
+++ .cvsignore	4 Sep 2008 15:18:51 -0000	1.3
@@ -1 +1,2 @@
 idm-console-framework-1.1.1.tar.bz2
+idm-console-framework-1.1.2.tar.bz2


Index: idm-console-framework.spec
===================================================================
RCS file: /cvs/extras/rpms/idm-console-framework/F-9/idm-console-framework.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- idm-console-framework.spec	15 Apr 2008 23:47:55 -0000	1.2
+++ idm-console-framework.spec	4 Sep 2008 15:18:51 -0000	1.3
@@ -1,9 +1,9 @@
 %define major_version 1.1
-%define minor_version 1
+%define minor_version 2
 
 Name: idm-console-framework
 Version: %{major_version}.%{minor_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: Identity Management Console Framework
 
 Group: System Environment/Libraries
@@ -75,6 +75,9 @@
 %{_javadir}/idm-console-nmclf_en.jar
 
 %changelog
+* Wed Jul  2 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-1
+- numerous fixes for threading issues and help for debugging and eclipse
+
 * Tue Apr 15 2008 Rich Megginson <rmeggins at redhat.com> 1.1.1-3
 - use java > 1.5.0 for the requirements
 - install jar files with mode 644


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/idm-console-framework/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Jan 2008 18:46:00 -0000	1.2
+++ sources	4 Sep 2008 15:18:51 -0000	1.3
@@ -1 +1,2 @@
 a23291c9aea256f075b69df981fae42a  idm-console-framework-1.1.1.tar.bz2
+f2db919004fcaf5d6adf6db55b4d589f  idm-console-framework-1.1.2.tar.bz2



From rmeggins at fedoraproject.org  Thu Sep  4 15:19:25 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 15:19:25 +0000 (UTC)
Subject: rpms/idm-console-framework/devel .cvsignore, 1.2,
	1.3 idm-console-framework.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20080904151925.15EAE70124@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/idm-console-framework/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2036/devel

Modified Files:
	.cvsignore idm-console-framework.spec sources 
Log Message:
this is the 1.1.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/idm-console-framework/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Jan 2008 18:46:00 -0000	1.2
+++ .cvsignore	4 Sep 2008 15:18:52 -0000	1.3
@@ -1 +1,2 @@
 idm-console-framework-1.1.1.tar.bz2
+idm-console-framework-1.1.2.tar.bz2


Index: idm-console-framework.spec
===================================================================
RCS file: /cvs/extras/rpms/idm-console-framework/devel/idm-console-framework.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- idm-console-framework.spec	15 Apr 2008 23:47:55 -0000	1.2
+++ idm-console-framework.spec	4 Sep 2008 15:18:52 -0000	1.3
@@ -1,9 +1,9 @@
 %define major_version 1.1
-%define minor_version 1
+%define minor_version 2
 
 Name: idm-console-framework
 Version: %{major_version}.%{minor_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: Identity Management Console Framework
 
 Group: System Environment/Libraries
@@ -75,6 +75,9 @@
 %{_javadir}/idm-console-nmclf_en.jar
 
 %changelog
+* Wed Jul  2 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-1
+- numerous fixes for threading issues and help for debugging and eclipse
+
 * Tue Apr 15 2008 Rich Megginson <rmeggins at redhat.com> 1.1.1-3
 - use java > 1.5.0 for the requirements
 - install jar files with mode 644


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/idm-console-framework/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Jan 2008 18:46:00 -0000	1.2
+++ sources	4 Sep 2008 15:18:53 -0000	1.3
@@ -1 +1,2 @@
 a23291c9aea256f075b69df981fae42a  idm-console-framework-1.1.1.tar.bz2
+f2db919004fcaf5d6adf6db55b4d589f  idm-console-framework-1.1.2.tar.bz2



From kkofler at fedoraproject.org  Thu Sep  4 15:22:14 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 15:22:14 +0000 (UTC)
Subject: rpms/kdesdk/F-8 .cvsignore, 1.35, 1.36 kdesdk.spec, 1.75,
	1.76 sources, 1.37, 1.38
Message-ID: <20080904152214.CB1F370120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdesdk/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3208/F-8

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-1
- update to 3.5.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-8/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	16 Feb 2008 03:15:34 -0000	1.35
+++ .cvsignore	4 Sep 2008 15:21:42 -0000	1.36
@@ -1 +1 @@
-kdesdk-3.5.9.tar.bz2
+kdesdk-3.5.10.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-8/kdesdk.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- kdesdk.spec	16 Feb 2008 03:15:34 -0000	1.75
+++ kdesdk.spec	4 Sep 2008 15:21:42 -0000	1.76
@@ -14,7 +14,7 @@
 
 Name:    kdesdk
 Summary: The KDE Software Development Kit (SDK)
-Version: 3.5.9
+Version: 3.5.10
 Release: 1%{?dist}
 
 License: GPLv2
@@ -211,6 +211,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-1
+- update to 3.5.10
+
 * Fri Feb 15 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-1
 - kde-3.5.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-8/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	16 Feb 2008 03:15:34 -0000	1.37
+++ sources	4 Sep 2008 15:21:42 -0000	1.38
@@ -1 +1 @@
-fd86abfe0ac7c5af61b15eb5367d0399  kdesdk-3.5.9.tar.bz2
+ad711d1ce09242bd13b73a9a005f3143  kdesdk-3.5.10.tar.bz2



From sgrubb at fedoraproject.org  Thu Sep  4 15:23:00 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Thu,  4 Sep 2008 15:23:00 +0000 (UTC)
Subject: rpms/libprelude/devel libprelude.spec,1.25,1.26
Message-ID: <20080904152300.5EC1570120@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3474

Modified Files:
	libprelude.spec 
Log Message:
ppc debug



Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libprelude.spec	4 Sep 2008 15:05:05 -0000	1.25
+++ libprelude.spec	4 Sep 2008 15:22:29 -0000	1.26
@@ -15,7 +15,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gnutls-devel, python-devel, ruby, ruby-devel, lua-devel
-BuildRequires:	swig valgrind chrpath
+BuildRequires:	swig chrpath valgrind glibc-debuginfo
 
 %description
 The Prelude Library is a collection of generic functions providing



From kkofler at fedoraproject.org  Thu Sep  4 15:27:10 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 15:27:10 +0000 (UTC)
Subject: rpms/kdeaddons/F-8 .cvsignore, 1.35, 1.36 kdeaddons.spec, 1.69,
	1.70 sources, 1.38, 1.39
Message-ID: <20080904152710.749A470120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeaddons/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5171/F-8

Modified Files:
	.cvsignore kdeaddons.spec sources 
Log Message:
* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-1
- update to 3.5.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/F-8/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	16 Feb 2008 13:40:55 -0000	1.35
+++ .cvsignore	4 Sep 2008 15:26:38 -0000	1.36
@@ -1,2 +1 @@
-metabar-fedora.tar.bz2
-kdeaddons-3.5.9.tar.bz2
+kdeaddons-3.5.10.tar.bz2


Index: kdeaddons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/F-8/kdeaddons.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- kdeaddons.spec	10 Mar 2008 15:31:45 -0000	1.69
+++ kdeaddons.spec	4 Sep 2008 15:26:38 -0000	1.70
@@ -1,8 +1,8 @@
 
 Name:    kdeaddons
 Summary: K Desktop Environment - Plugins
-Version: 3.5.9
-Release: 1%{?dist}.1
+Version: 3.5.10
+Release: 1%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -208,6 +208,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-1
+- update to 3.5.10
+
 * Sat Feb 16 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-1
 - kde-3.5.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/F-8/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	16 Feb 2008 13:40:55 -0000	1.38
+++ sources	4 Sep 2008 15:26:38 -0000	1.39
@@ -1,2 +1 @@
-0bec436d63d3d04878c1231061326d4a  metabar-fedora.tar.bz2
-eaa3832a25b483d1a9613f75991c3d7b  kdeaddons-3.5.9.tar.bz2
+c69d082407b2c1bb46d078f8ac5d2bea  kdeaddons-3.5.10.tar.bz2



From spot at fedoraproject.org  Thu Sep  4 15:29:56 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 15:29:56 +0000 (UTC)
Subject: rpms/sane-backends/devel sane-backends.spec,1.111,1.112
Message-ID: <20080904152956.79C8B70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sane-backends/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6229

Modified Files:
	sane-backends.spec 
Log Message:
fix license tag


Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- sane-backends.spec	3 Sep 2008 15:24:37 -0000	1.111
+++ sane-backends.spec	4 Sep 2008 15:29:55 -0000	1.112
@@ -1,8 +1,11 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.19
-Release: 11%{?dist}
-License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
+Release: 12%{?dist}
+# lib/ is LGPLv2+, backends are GPLv2+ with exceptions
+# Tools are GPLv2+, docs are public domain
+# see LICENSE for details
+License: GPLv2+ and GPLv2+ with exceptions and Public Domain
 Group: System Environment/Libraries
 Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
 Source1: sane.png
@@ -159,6 +162,9 @@
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.19-12
+- fix license tag
+
 * Wed Sep 03 2008 Nils Philippsen <nphilipp at redhat.com> - 1.0.19-11
 - update glibc-2.7 patch to apply without fuzz
 



From kkofler at fedoraproject.org  Thu Sep  4 15:31:40 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 15:31:40 +0000 (UTC)
Subject: rpms/kdeaddons/F-8 .cvsignore,1.36,1.37 sources,1.39,1.40
Message-ID: <20080904153140.9F6E870120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeaddons/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6782/F-8

Modified Files:
	.cvsignore sources 
Log Message:
Restore metabar-fedora.tar.bz2 in sources and .cvsignore.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/F-8/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	4 Sep 2008 15:26:38 -0000	1.36
+++ .cvsignore	4 Sep 2008 15:31:08 -0000	1.37
@@ -1 +1,2 @@
+metabar-fedora.tar.bz2
 kdeaddons-3.5.10.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/F-8/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	4 Sep 2008 15:26:38 -0000	1.39
+++ sources	4 Sep 2008 15:31:09 -0000	1.40
@@ -1 +1,2 @@
+0bec436d63d3d04878c1231061326d4a  metabar-fedora.tar.bz2
 c69d082407b2c1bb46d078f8ac5d2bea  kdeaddons-3.5.10.tar.bz2



From spot at fedoraproject.org  Thu Sep  4 15:34:34 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 15:34:34 +0000 (UTC)
Subject: rpms/sane-frontends/devel sane-frontends.spec,1.23,1.24
Message-ID: <20080904153434.C7D4B70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sane-frontends/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7853

Modified Files:
	sane-frontends.spec 
Log Message:
fix license tag


Index: sane-frontends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-frontends/devel/sane-frontends.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sane-frontends.spec	19 Feb 2008 16:27:18 -0000	1.23
+++ sane-frontends.spec	4 Sep 2008 15:34:32 -0000	1.24
@@ -1,11 +1,11 @@
 Name: sane-frontends
 Version: 1.0.14
-Release: 4%{?dist}
+Release: 5%{?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
 Patch0: sane-frontends-1.0.14-badcode.patch
-License: GPL
+License: GPLv2+
 Group: Applications/System
 BuildRequires: gtk2-devel gimp-devel libjpeg-devel
 BuildRequires: sane-backends-devel libieee1284-devel
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.14-5
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.14-4
 - Autorebuild for GCC 4.3
 



From dcnomura at fedoraproject.org  Thu Sep  4 15:36:09 2008
From: dcnomura at fedoraproject.org (Dave Nomura)
Date: Thu,  4 Sep 2008 15:36:09 +0000 (UTC)
Subject: rpms/stapitrace/devel stapitrace.spec,1.12,1.13
Message-ID: <20080904153609.9057070120@cvs1.fedora.phx.redhat.com>

Author: dcnomura

Update of /cvs/pkgs/rpms/stapitrace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8385

Modified Files:
	stapitrace.spec 
Log Message:
added binutils to Requires



Index: stapitrace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stapitrace/devel/stapitrace.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- stapitrace.spec	4 Sep 2008 13:54:12 -0000	1.12
+++ stapitrace.spec	4 Sep 2008 15:36:08 -0000	1.13
@@ -6,14 +6,14 @@
 Name:		stapitrace
 Summary:	Instruction Tracing Tool
 Version:	1.0.0
-Release:	10.%{alphatag}%{?dist}
+Release:	11.%{alphatag}%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://sourceforge.net/projects/perfinsp
 Source0:	%{name}-%{version}.%{alphatag}.tar.gz
 Patch0:		itrace_fix1.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
-Requires:	systemtap systemtap-runtime binutils-devel
+Requires:	systemtap systemtap-runtime binutils binutils-devel
 BuildRequires:	binutils binutils-devel autoconf automake
 ExclusiveArch:	ppc
 



From rmeggins at fedoraproject.org  Thu Sep  4 15:36:52 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 15:36:52 +0000 (UTC)
Subject: rpms/fedora-ds-console/F-8 .cvsignore, 1.2,
	1.3 fedora-ds-console.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20080904153652.458D170120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-console/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8536/F-8

Modified Files:
	.cvsignore fedora-ds-console.spec sources 
Log Message:
this is the 1.1.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Jan 2008 21:38:40 -0000	1.2
+++ .cvsignore	4 Sep 2008 15:36:20 -0000	1.3
@@ -1 +1,2 @@
 fedora-ds-console-1.1.1.tar.bz2
+fedora-ds-console-1.1.2.tar.bz2


Index: fedora-ds-console.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/F-8/fedora-ds-console.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds-console.spec	16 Apr 2008 15:26:26 -0000	1.3
+++ fedora-ds-console.spec	4 Sep 2008 15:36:20 -0000	1.4
@@ -1,12 +1,12 @@
 %define major_version 1.1
-%define minor_version 1
+%define minor_version 2
 
 %define shortname fedora-ds
 %define pkgname   dirsrv
 
 Name: fedora-ds-console
 Version: %{major_version}.%{minor_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: Fedora Directory Server Management Console
 
 Group: Applications/System
@@ -69,6 +69,9 @@
 %doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
                                                                                 
 %changelog
+* Thu Jul  3 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-1
+- fix threading issues with create new ds instance dialog
+
 * Wed Apr 16 2008 Rich Megginson <rmeggins at redhat.com> 1.1.1-3
 - use java-devel > 1.5.0 for build requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Jan 2008 17:23:33 -0000	1.3
+++ sources	4 Sep 2008 15:36:20 -0000	1.4
@@ -1 +1,2 @@
 ee0401937a81ce2466292a4f9b14e20a  fedora-ds-console-1.1.1.tar.bz2
+dafb8ef0305f99ec4593d70e8a660541  fedora-ds-console-1.1.2.tar.bz2



From rmeggins at fedoraproject.org  Thu Sep  4 15:36:53 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 15:36:53 +0000 (UTC)
Subject: rpms/fedora-ds-console/F-9 .cvsignore, 1.2,
	1.3 fedora-ds-console.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20080904153653.14DFB70120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-console/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8536/F-9

Modified Files:
	.cvsignore fedora-ds-console.spec sources 
Log Message:
this is the 1.1.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Jan 2008 21:36:52 -0000	1.2
+++ .cvsignore	4 Sep 2008 15:36:21 -0000	1.3
@@ -1 +1,2 @@
 fedora-ds-console-1.1.1.tar.bz2
+fedora-ds-console-1.1.2.tar.bz2


Index: fedora-ds-console.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/F-9/fedora-ds-console.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds-console.spec	16 Apr 2008 15:26:33 -0000	1.3
+++ fedora-ds-console.spec	4 Sep 2008 15:36:22 -0000	1.4
@@ -1,12 +1,12 @@
 %define major_version 1.1
-%define minor_version 1
+%define minor_version 2
 
 %define shortname fedora-ds
 %define pkgname   dirsrv
 
 Name: fedora-ds-console
 Version: %{major_version}.%{minor_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: Fedora Directory Server Management Console
 
 Group: Applications/System
@@ -69,8 +69,11 @@
 %doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
                                                                                 
 %changelog
+* Thu Jul  3 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-1
+- fix threading issues with create new ds instance dialog
+
 * Wed Apr 16 2008 Rich Megginson <rmeggins at redhat.com> 1.1.1-3
-- use java > 1.5.0 for build requires
+- use java-devel > 1.5.0 for build requires
 
 * Tue Jan 22 2008 Rich Megginson <rmeggins at redhat.com> 1.1.1-2
 - resolves bug 429421


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Jan 2008 17:23:47 -0000	1.3
+++ sources	4 Sep 2008 15:36:22 -0000	1.4
@@ -1 +1,2 @@
 ee0401937a81ce2466292a4f9b14e20a  fedora-ds-console-1.1.1.tar.bz2
+dafb8ef0305f99ec4593d70e8a660541  fedora-ds-console-1.1.2.tar.bz2



From rmeggins at fedoraproject.org  Thu Sep  4 15:36:54 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 15:36:54 +0000 (UTC)
Subject: rpms/fedora-ds-console/devel .cvsignore, 1.2,
	1.3 fedora-ds-console.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20080904153654.BEC1C70120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-console/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8536/devel

Modified Files:
	.cvsignore fedora-ds-console.spec sources 
Log Message:
this is the 1.1.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Jan 2008 21:36:52 -0000	1.2
+++ .cvsignore	4 Sep 2008 15:36:23 -0000	1.3
@@ -1 +1,2 @@
 fedora-ds-console-1.1.1.tar.bz2
+fedora-ds-console-1.1.2.tar.bz2


Index: fedora-ds-console.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/devel/fedora-ds-console.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds-console.spec	16 Apr 2008 15:26:33 -0000	1.3
+++ fedora-ds-console.spec	4 Sep 2008 15:36:23 -0000	1.4
@@ -1,12 +1,12 @@
 %define major_version 1.1
-%define minor_version 1
+%define minor_version 2
 
 %define shortname fedora-ds
 %define pkgname   dirsrv
 
 Name: fedora-ds-console
 Version: %{major_version}.%{minor_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: Fedora Directory Server Management Console
 
 Group: Applications/System
@@ -69,6 +69,9 @@
 %doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
                                                                                 
 %changelog
+* Thu Jul  3 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-1
+- fix threading issues with create new ds instance dialog
+
 * Wed Apr 16 2008 Rich Megginson <rmeggins at redhat.com> 1.1.1-3
 - use java > 1.5.0 for build requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Jan 2008 17:23:47 -0000	1.3
+++ sources	4 Sep 2008 15:36:23 -0000	1.4
@@ -1 +1,2 @@
 ee0401937a81ce2466292a4f9b14e20a  fedora-ds-console-1.1.1.tar.bz2
+dafb8ef0305f99ec4593d70e8a660541  fedora-ds-console-1.1.2.tar.bz2



From spot at fedoraproject.org  Thu Sep  4 15:37:40 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 15:37:40 +0000 (UTC)
Subject: rpms/schroedinger/devel schroedinger.spec,1.8,1.9
Message-ID: <20080904153740.8F89570120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/schroedinger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9043

Modified Files:
	schroedinger.spec 
Log Message:
fix license tag


Index: schroedinger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/devel/schroedinger.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- schroedinger.spec	27 Aug 2008 19:14:30 -0000	1.8
+++ schroedinger.spec	4 Sep 2008 15:37:39 -0000	1.9
@@ -2,11 +2,12 @@
 
 Name:           schroedinger
 Version:        1.0.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Portable libraries for the high quality Dirac video codec
 
 Group:          System Environment/Libraries
-License:        LGPL/MIT/MPL
+# No version is given for the GPL or the LGPL
+License:        GPL+ or LGPLv2+ or MIT or MPLv1.1
 URL:            http://www.diracvideo.org/
 Source0:	http://www.diracvideo.org/download/schroedinger/schroedinger-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -79,6 +80,9 @@
 %{_libdir}/gstreamer-0.10/libgstschro.so
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.5-2
+- fix license tag
+
 * Wed Aug 27 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.0.5-1
 - Update to 1.0.5
 



From kkofler at fedoraproject.org  Thu Sep  4 15:41:23 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 15:41:23 +0000 (UTC)
Subject: rpms/kdeartwork/F-8 .cvsignore, 1.35, 1.36 kdeartwork.spec, 1.66,
	1.67 sources, 1.37, 1.38
Message-ID: <20080904154123.B55B570120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeartwork/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10195/F-8

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.10-1
- update to 3.5.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-8/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	16 Feb 2008 22:15:52 -0000	1.35
+++ .cvsignore	4 Sep 2008 15:40:50 -0000	1.36
@@ -1 +1 @@
-kdeartwork-3.5.9.tar.bz2
+kdeartwork-3.5.10.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-8/kdeartwork.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- kdeartwork.spec	3 Apr 2008 02:15:58 -0000	1.66
+++ kdeartwork.spec	4 Sep 2008 15:40:50 -0000	1.67
@@ -8,8 +8,8 @@
 
 Name:    kdeartwork
 Summary: Additional artwork (themes, sound themes, ...) for KDE
-Version: 3.5.9
-Release: 2%{?dist}
+Version: 3.5.10
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -174,6 +174,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.10-1
+- update to 3.5.10
+
 * Wed Apr 02 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-2
 - -kxs: move here: Requires: kdebase3
 
@@ -209,7 +212,7 @@
 * Wed Mar 21 2007 Than Ngo <than at redhat.com> - 3.5.6-2.fc7
 - cleanup specfile
 
-* Wed Feb 07 2007 han Ngo <than at redhat.com> 3.5.6-1.fc7
+* Wed Feb 07 2007 Than Ngo <than at redhat.com> 3.5.6-1.fc7
 - 3.5.6
 
 * Thu Aug 10 2006 Than Ngo <than at redhat.com> 3.5.4-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-8/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	16 Feb 2008 22:15:52 -0000	1.37
+++ sources	4 Sep 2008 15:40:50 -0000	1.38
@@ -1 +1 @@
-ec526eba38421fd3b143682b8d683c86  kdeartwork-3.5.9.tar.bz2
+6e6f089dc0f1dabb0f138641600d0b59  kdeartwork-3.5.10.tar.bz2



From kkofler at fedoraproject.org  Thu Sep  4 15:46:35 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 15:46:35 +0000 (UTC)
Subject: rpms/kdebindings/F-8 .cvsignore, 1.34, 1.35 kdebindings.spec, 1.71, 
	1.72 sources, 1.37, 1.38
Message-ID: <20080904154635.7EDEA70120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11697/F-8

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-1
- update to 3.5.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-8/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	16 Feb 2008 03:03:12 -0000	1.34
+++ .cvsignore	4 Sep 2008 15:46:03 -0000	1.35
@@ -1 +1 @@
-kdebindings-3.5.9.tar.bz2
+kdebindings-3.5.10.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-8/kdebindings.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- kdebindings.spec	16 Feb 2008 03:03:12 -0000	1.71
+++ kdebindings.spec	4 Sep 2008 15:46:03 -0000	1.72
@@ -1,7 +1,7 @@
 
 Name:	 kdebindings
 Summary: KDE bindings to non-C++ languages
-Version: 3.5.9
+Version: 3.5.10
 Release: 1%{?dist}
 
 License: GPLv2
@@ -208,6 +208,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-1
+- update to 3.5.10
+
 * Fri Feb 15 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-1
 - kde-3.5.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-8/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	16 Feb 2008 03:03:12 -0000	1.37
+++ sources	4 Sep 2008 15:46:03 -0000	1.38
@@ -1 +1 @@
-ba780920f6b810a30a61b1ffa888706b  kdebindings-3.5.9.tar.bz2
+7d5119160ac3688ac1a63954d03ab4a8  kdebindings-3.5.10.tar.bz2



From orion at fedoraproject.org  Thu Sep  4 15:49:59 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu,  4 Sep 2008 15:49:59 +0000 (UTC)
Subject: rpms/R-mvtnorm/devel .cvsignore, 1.4, 1.5 R-mvtnorm.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20080904154959.0E74670123@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-mvtnorm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13343

Modified Files:
	.cvsignore R-mvtnorm.spec sources 
Log Message:
* Thu Sep 4 2008 Orion Poplawski <orion at cora.nwra.com> - 0.9-1
- Update to 0.9-2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-mvtnorm/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Jul 2007 21:02:29 -0000	1.4
+++ .cvsignore	4 Sep 2008 15:49:57 -0000	1.5
@@ -1 +1 @@
-mvtnorm_0.8-1.tar.gz
+mvtnorm_0.9-2.tar.gz


Index: R-mvtnorm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-mvtnorm/devel/R-mvtnorm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- R-mvtnorm.spec	9 Feb 2008 17:21:55 -0000	1.5
+++ R-mvtnorm.spec	4 Sep 2008 15:49:57 -0000	1.6
@@ -1,10 +1,10 @@
 %define packname mvtnorm
-%define packrel  1
+%define packrel  2
 
 Summary:	Multivariate normal and T distribution R Package
 Name:		R-%{packname}
-Version:	0.8
-Release:	4%{?dist}
+Version:	0.9
+Release:	1%{?dist}
 License:	GPLv2
 Group:		Applications/Engineering
 Source0:	http://cran.r-project.org/src/contrib/%{packname}_%{version}-%{packrel}.tar.gz
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Thu Sep 4 2008 Orion Poplawski <orion at cora.nwra.com> - 0.9-1
+- Update to 0.9-2
+
 * Sat Feb  9 2008 Orion Poplawski <orion at cora.nwra.com> - 0.8-4
 - Rebuild for gcc 3.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-mvtnorm/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Jul 2007 21:02:29 -0000	1.4
+++ sources	4 Sep 2008 15:49:57 -0000	1.5
@@ -1 +1 @@
-acfa1f695584341613cdfc8bd35274c0  mvtnorm_0.8-1.tar.gz
+71fc2bf523ef749c8e2f3cfb0501ce8c  mvtnorm_0.9-2.tar.gz



From pertusus at fedoraproject.org  Thu Sep  4 15:50:07 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Thu,  4 Sep 2008 15:50:07 +0000 (UTC)
Subject: rpms/libnc-dap/devel libnc-dap-3.7.0-gcc43.patch, NONE,
	1.1 libnc-dap.spec, 1.22, 1.23
Message-ID: <20080904155007.B96D570123@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libnc-dap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13422

Modified Files:
	libnc-dap.spec 
Added Files:
	libnc-dap-3.7.0-gcc43.patch 
Log Message:
* Thu Sep  4 2008 Patrice Dumas <pertusus at free.fr> 3.7.0-11
- gcc 4.3 patch for missing include files


libnc-dap-3.7.0-gcc43.patch:

--- NEW FILE libnc-dap-3.7.0-gcc43.patch ---
diff -up libnc-dap-3.7.0/ClientParams.cc.gcc43 libnc-dap-3.7.0/ClientParams.cc
--- libnc-dap-3.7.0/ClientParams.cc.gcc43	2006-11-06 23:06:22.000000000 +0100
+++ libnc-dap-3.7.0/ClientParams.cc	2008-05-23 16:07:58.000000000 +0200
@@ -25,6 +25,7 @@
 
 #include "ClientParams.h"
 
+#include <cstdlib>
 #include <sstream>
 
 // #define DODS_DEBUG 1
diff -up libnc-dap-3.7.0/Dattr.cc.gcc43 libnc-dap-3.7.0/Dattr.cc
--- libnc-dap-3.7.0/Dattr.cc.gcc43	2006-11-22 01:14:38.000000000 +0100
+++ libnc-dap-3.7.0/Dattr.cc	2008-05-23 16:10:03.000000000 +0200
@@ -36,6 +36,8 @@
 
 #include "config_nc.h"
 
+#include <cstring>
+
 static char rcsid[] not_used ={"$Id: Dattr.cc 15125 2006-11-21 23:12:00Z jimg $"};
 
 #include "Dnetcdf.h"
diff -up libnc-dap-3.7.0/Ddim.cc.gcc43 libnc-dap-3.7.0/Ddim.cc
--- libnc-dap-3.7.0/Ddim.cc.gcc43	2006-11-06 23:06:22.000000000 +0100
+++ libnc-dap-3.7.0/Ddim.cc	2008-05-23 16:09:40.000000000 +0200
@@ -37,6 +37,8 @@
 
 #include "config_nc.h"
 
+#include <cstring>
+
 static char rcsid[] not_used ={"$Id: Ddim.cc 11906 2005-08-08 19:51:43Z root $"};
 
 #include "Dnetcdf.h"
diff -up libnc-dap-3.7.0/Dncx.cc.gcc43 libnc-dap-3.7.0/Dncx.cc
--- libnc-dap-3.7.0/Dncx.cc.gcc43	2006-11-06 23:06:22.000000000 +0100
+++ libnc-dap-3.7.0/Dncx.cc	2008-05-23 16:07:58.000000000 +0200
@@ -32,7 +32,7 @@
 // $Id: Dncx.cc 11906 2005-08-08 19:51:43Z root $ 
 
 #include "Dncx.h"
-#include <string.h>
+#include <cstring>
 #include <limits.h>
 /* alias poorly named limits.h macros */
 #define  SHORT_MAX  SHRT_MAX
diff -up libnc-dap-3.7.0/Dvar.cc.gcc43 libnc-dap-3.7.0/Dvar.cc
--- libnc-dap-3.7.0/Dvar.cc.gcc43	2006-11-06 23:06:22.000000000 +0100
+++ libnc-dap-3.7.0/Dvar.cc	2008-05-23 16:10:29.000000000 +0200
@@ -36,6 +36,8 @@
 
 #include "config_nc.h"
 
+#include <cstring>
+
 static char rcsid[] not_used ={"$Id: Dvar.cc 11906 2005-08-08 19:51:43Z root $"};
 
 #include "Dnetcdf.h"
diff -up libnc-dap-3.7.0/NCArray.cc.gcc43 libnc-dap-3.7.0/NCArray.cc
--- libnc-dap-3.7.0/NCArray.cc.gcc43	2006-04-19 20:06:01.000000000 +0200
+++ libnc-dap-3.7.0/NCArray.cc	2008-05-23 16:07:58.000000000 +0200
@@ -41,11 +41,7 @@
 static char rcsid[] not_used =
     { "$Id: NCArray.cc 13725 2006-04-19 18:06:01Z jimg $" };
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-
+#include <cstring>
 #include <iostream>
 #include <sstream>
 #include <algorithm>
diff -up libnc-dap-3.7.0/nc_util.cc.gcc43 libnc-dap-3.7.0/nc_util.cc
--- libnc-dap-3.7.0/nc_util.cc.gcc43	2006-11-22 23:08:33.000000000 +0100
+++ libnc-dap-3.7.0/nc_util.cc	2008-05-23 16:07:58.000000000 +0200
@@ -37,6 +37,7 @@
 static char rcsid[] not_used =
     { "$Id: nc_util.cc 15135 2006-11-22 21:05:57Z jimg $" };
 
+#include <cstring>
 #include <sstream>
 
 // #define DODS_DEBUG


Index: libnc-dap.spec
===================================================================
RCS file: /cvs/extras/rpms/libnc-dap/devel/libnc-dap.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libnc-dap.spec	19 Feb 2008 18:21:08 -0000	1.22
+++ libnc-dap.spec	4 Sep 2008 15:50:06 -0000	1.23
@@ -1,7 +1,7 @@
 Name: libnc-dap
 Summary: The NetCDF interface to DAP-2 from OPeNDAP
 Version: 3.7.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 Group: Development/Libraries
 # ncdump, netcdf headers, lnetcdf are coverd by a BSD/MIT-like license
@@ -10,6 +10,7 @@
 URL: http://www.opendap.org/
 Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz 
 Patch0: libnc-dap-3.7.0-nolibdir.patch
+Patch1: libnc-dap-3.7.0-gcc43.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libdap-devel >= 3.7.3 gcc-gfortran
@@ -39,6 +40,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .nolibdir
+%patch1 -p1 -b .gcc43
 rm -rf netcdf/.svn
 
 %build
@@ -74,6 +76,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 Patrice Dumas <pertusus at free.fr> 3.7.0-11
+- gcc 4.3 patch for missing include files
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.7.0-10
 - Autorebuild for GCC 4.3
 



From rmeggins at fedoraproject.org  Thu Sep  4 15:51:31 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 15:51:31 +0000 (UTC)
Subject: rpms/fedora-ds-admin-console/F-8 .cvsignore, 1.2,
	1.3 fedora-ds-admin-console.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20080904155131.8CCEA70123@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin-console/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13895/F-8

Modified Files:
	.cvsignore fedora-ds-admin-console.spec sources 
Log Message:
this is the 1.1.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin-console/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Jan 2008 21:43:49 -0000	1.2
+++ .cvsignore	4 Sep 2008 15:50:59 -0000	1.3
@@ -1 +1,2 @@
 fedora-ds-admin-console-1.1.1.tar.bz2
+fedora-ds-admin-console-1.1.2.tar.bz2


Index: fedora-ds-admin-console.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin-console/F-8/fedora-ds-admin-console.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-ds-admin-console.spec	16 Apr 2008 15:59:49 -0000	1.2
+++ fedora-ds-admin-console.spec	4 Sep 2008 15:50:59 -0000	1.3
@@ -1,5 +1,5 @@
 %define major_version 1.1
-%define minor_version 1
+%define minor_version 2
 
 %define dsname fedora-ds
 %define shortname fedora-admin
@@ -7,7 +7,7 @@
 
 Name: fedora-ds-admin-console
 Version: %{major_version}.%{minor_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: Fedora Admin Server Management Console
 
 Group: Applications/System
@@ -71,6 +71,9 @@
 %doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html
 
 %changelog
+* Thu Jul  3 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-1
+- disable SSLv2 settings
+
 * Wed Apr 16 2008 Rich Megginson <rmeggins at redhat.com> 1.1.1-3
 - use java > 1.5.0 for requirements
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin-console/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Jan 2008 21:43:49 -0000	1.2
+++ sources	4 Sep 2008 15:50:59 -0000	1.3
@@ -1 +1,2 @@
 3f8c2757b92917aa58ab782c1d30bad3  fedora-ds-admin-console-1.1.1.tar.bz2
+e40ffc75263637e886fdf62b20e9a628  fedora-ds-admin-console-1.1.2.tar.bz2



From rmeggins at fedoraproject.org  Thu Sep  4 15:51:32 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 15:51:32 +0000 (UTC)
Subject: rpms/fedora-ds-admin-console/F-9 .cvsignore, 1.2,
	1.3 fedora-ds-admin-console.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20080904155132.7D84170123@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin-console/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13895/F-9

Modified Files:
	.cvsignore fedora-ds-admin-console.spec sources 
Log Message:
this is the 1.1.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin-console/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Jan 2008 21:40:12 -0000	1.2
+++ .cvsignore	4 Sep 2008 15:51:00 -0000	1.3
@@ -1 +1,2 @@
 fedora-ds-admin-console-1.1.1.tar.bz2
+fedora-ds-admin-console-1.1.2.tar.bz2


Index: fedora-ds-admin-console.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin-console/F-9/fedora-ds-admin-console.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-ds-admin-console.spec	16 Apr 2008 16:00:00 -0000	1.2
+++ fedora-ds-admin-console.spec	4 Sep 2008 15:51:00 -0000	1.3
@@ -1,5 +1,5 @@
 %define major_version 1.1
-%define minor_version 1
+%define minor_version 2
 
 %define dsname fedora-ds
 %define shortname fedora-admin
@@ -7,7 +7,7 @@
 
 Name: fedora-ds-admin-console
 Version: %{major_version}.%{minor_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: Fedora Admin Server Management Console
 
 Group: Applications/System
@@ -71,6 +71,9 @@
 %doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html
 
 %changelog
+* Thu Jul  3 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-1
+- disable SSLv2 settings
+
 * Wed Apr 16 2008 Rich Megginson <rmeggins at redhat.com> 1.1.1-3
 - use java > 1.5.0 for requirements
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin-console/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Jan 2008 21:40:12 -0000	1.2
+++ sources	4 Sep 2008 15:51:00 -0000	1.3
@@ -1 +1,2 @@
 3f8c2757b92917aa58ab782c1d30bad3  fedora-ds-admin-console-1.1.1.tar.bz2
+e40ffc75263637e886fdf62b20e9a628  fedora-ds-admin-console-1.1.2.tar.bz2



From rmeggins at fedoraproject.org  Thu Sep  4 15:51:33 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 15:51:33 +0000 (UTC)
Subject: rpms/fedora-ds-admin-console/devel .cvsignore, 1.2,
	1.3 fedora-ds-admin-console.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20080904155133.B54B970123@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin-console/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13895/devel

Modified Files:
	.cvsignore fedora-ds-admin-console.spec sources 
Log Message:
this is the 1.1.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin-console/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Jan 2008 21:40:12 -0000	1.2
+++ .cvsignore	4 Sep 2008 15:51:02 -0000	1.3
@@ -1 +1,2 @@
 fedora-ds-admin-console-1.1.1.tar.bz2
+fedora-ds-admin-console-1.1.2.tar.bz2


Index: fedora-ds-admin-console.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin-console/devel/fedora-ds-admin-console.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-ds-admin-console.spec	16 Apr 2008 16:00:00 -0000	1.2
+++ fedora-ds-admin-console.spec	4 Sep 2008 15:51:02 -0000	1.3
@@ -1,5 +1,5 @@
 %define major_version 1.1
-%define minor_version 1
+%define minor_version 2
 
 %define dsname fedora-ds
 %define shortname fedora-admin
@@ -7,7 +7,7 @@
 
 Name: fedora-ds-admin-console
 Version: %{major_version}.%{minor_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: Fedora Admin Server Management Console
 
 Group: Applications/System
@@ -71,6 +71,9 @@
 %doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html
 
 %changelog
+* Thu Jul  3 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-1
+- disable SSLv2 settings
+
 * Wed Apr 16 2008 Rich Megginson <rmeggins at redhat.com> 1.1.1-3
 - use java > 1.5.0 for requirements
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin-console/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Jan 2008 21:40:12 -0000	1.2
+++ sources	4 Sep 2008 15:51:02 -0000	1.3
@@ -1 +1,2 @@
 3f8c2757b92917aa58ab782c1d30bad3  fedora-ds-admin-console-1.1.1.tar.bz2
+e40ffc75263637e886fdf62b20e9a628  fedora-ds-admin-console-1.1.2.tar.bz2



From orion at fedoraproject.org  Thu Sep  4 16:13:30 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu,  4 Sep 2008 16:13:30 +0000 (UTC)
Subject: rpms/R-mvtnorm/devel R-mvtnorm.spec,1.6,1.7
Message-ID: <20080904161330.B081D70120@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-mvtnorm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22181

Modified Files:
	R-mvtnorm.spec 
Log Message:
todo is no longer included



Index: R-mvtnorm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-mvtnorm/devel/R-mvtnorm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- R-mvtnorm.spec	4 Sep 2008 15:49:57 -0000	1.6
+++ R-mvtnorm.spec	4 Sep 2008 16:12:59 -0000	1.7
@@ -23,8 +23,6 @@
 
 %prep
 %setup -q -c -n %{packname}
-#Don't install todo
-rm -r %{packname}/inst/todo
 
 
 %build



From rmeggins at fedoraproject.org  Thu Sep  4 16:16:06 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 16:16:06 +0000 (UTC)
Subject: rpms/fedora-ds-dsgw/F-7 .cvsignore, 1.2, 1.3 fedora-ds-dsgw.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080904161606.D31EB70120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-dsgw/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23200/F-7

Modified Files:
	.cvsignore fedora-ds-dsgw.spec sources 
Log Message:
this is the 1.1.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2008 15:17:29 -0000	1.2
+++ .cvsignore	4 Sep 2008 16:15:35 -0000	1.3
@@ -1 +1,2 @@
 fedora-ds-dsgw-1.1.0.tar.bz2
+fedora-ds-dsgw-1.1.1.tar.bz2


Index: fedora-ds-dsgw.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/F-7/fedora-ds-dsgw.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-ds-dsgw.spec	7 Apr 2008 15:17:29 -0000	1.1
+++ fedora-ds-dsgw.spec	4 Sep 2008 16:15:35 -0000	1.2
@@ -2,7 +2,7 @@
 
 Summary:          Fedora Directory Server Gateway (dsgw)
 Name:             fedora-ds-dsgw
-Version:          1.1.0
+Version:          1.1.1
 Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
@@ -74,5 +74,8 @@
 %{_libdir}/%{pkgname}/dsgw-cgi-bin
 
 %changelog
+* Thu Sep  4 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.1-1
+- this is the 1.1.1 release
+
 * Mon Mar  3 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.0-1
 - Initial version based on fedora-ds-admin.spec


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2008 15:17:29 -0000	1.2
+++ sources	4 Sep 2008 16:15:35 -0000	1.3
@@ -1 +1,2 @@
 b0da249e798b0105012f0deab43f55e3  fedora-ds-dsgw-1.1.0.tar.bz2
+fd86e38de705e75296100d7fe9025970  fedora-ds-dsgw-1.1.1.tar.bz2



From rmeggins at fedoraproject.org  Thu Sep  4 16:16:07 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 16:16:07 +0000 (UTC)
Subject: rpms/fedora-ds-dsgw/F-8 .cvsignore, 1.2, 1.3 fedora-ds-dsgw.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080904161607.76BF670120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-dsgw/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23200/F-8

Modified Files:
	.cvsignore fedora-ds-dsgw.spec sources 
Log Message:
this is the 1.1.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2008 15:17:40 -0000	1.2
+++ .cvsignore	4 Sep 2008 16:15:36 -0000	1.3
@@ -1 +1,2 @@
 fedora-ds-dsgw-1.1.0.tar.bz2
+fedora-ds-dsgw-1.1.1.tar.bz2


Index: fedora-ds-dsgw.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/F-8/fedora-ds-dsgw.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-ds-dsgw.spec	7 Apr 2008 15:17:40 -0000	1.1
+++ fedora-ds-dsgw.spec	4 Sep 2008 16:15:36 -0000	1.2
@@ -2,7 +2,7 @@
 
 Summary:          Fedora Directory Server Gateway (dsgw)
 Name:             fedora-ds-dsgw
-Version:          1.1.0
+Version:          1.1.1
 Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
@@ -74,5 +74,8 @@
 %{_libdir}/%{pkgname}/dsgw-cgi-bin
 
 %changelog
+* Thu Sep  4 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.1-1
+- this is the 1.1.1 release
+
 * Mon Mar  3 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.0-1
 - Initial version based on fedora-ds-admin.spec


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2008 15:17:40 -0000	1.2
+++ sources	4 Sep 2008 16:15:36 -0000	1.3
@@ -1 +1,2 @@
 b0da249e798b0105012f0deab43f55e3  fedora-ds-dsgw-1.1.0.tar.bz2
+fd86e38de705e75296100d7fe9025970  fedora-ds-dsgw-1.1.1.tar.bz2



From rmeggins at fedoraproject.org  Thu Sep  4 16:16:10 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 16:16:10 +0000 (UTC)
Subject: rpms/fedora-ds-dsgw/devel .cvsignore, 1.2, 1.3 fedora-ds-dsgw.spec, 
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080904161610.2167770120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-dsgw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23200/devel

Modified Files:
	.cvsignore fedora-ds-dsgw.spec sources 
Log Message:
this is the 1.1.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2008 15:13:09 -0000	1.2
+++ .cvsignore	4 Sep 2008 16:15:38 -0000	1.3
@@ -1 +1,2 @@
 fedora-ds-dsgw-1.1.0.tar.bz2
+fedora-ds-dsgw-1.1.1.tar.bz2


Index: fedora-ds-dsgw.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/devel/fedora-ds-dsgw.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-ds-dsgw.spec	7 Apr 2008 15:13:09 -0000	1.1
+++ fedora-ds-dsgw.spec	4 Sep 2008 16:15:38 -0000	1.2
@@ -2,7 +2,7 @@
 
 Summary:          Fedora Directory Server Gateway (dsgw)
 Name:             fedora-ds-dsgw
-Version:          1.1.0
+Version:          1.1.1
 Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
@@ -74,5 +74,8 @@
 %{_libdir}/%{pkgname}/dsgw-cgi-bin
 
 %changelog
+* Thu Sep  4 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.1-1
+- this is the 1.1.1 release
+
 * Mon Mar  3 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.0-1
 - Initial version based on fedora-ds-admin.spec


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2008 15:13:09 -0000	1.2
+++ sources	4 Sep 2008 16:15:38 -0000	1.3
@@ -1 +1,2 @@
 b0da249e798b0105012f0deab43f55e3  fedora-ds-dsgw-1.1.0.tar.bz2
+fd86e38de705e75296100d7fe9025970  fedora-ds-dsgw-1.1.1.tar.bz2



From rmeggins at fedoraproject.org  Thu Sep  4 16:16:08 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 16:16:08 +0000 (UTC)
Subject: rpms/fedora-ds-dsgw/F-9 .cvsignore, 1.2, 1.3 fedora-ds-dsgw.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080904161608.C355770120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-dsgw/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23200/F-9

Modified Files:
	.cvsignore fedora-ds-dsgw.spec sources 
Log Message:
this is the 1.1.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2008 15:13:09 -0000	1.2
+++ .cvsignore	4 Sep 2008 16:15:37 -0000	1.3
@@ -1 +1,2 @@
 fedora-ds-dsgw-1.1.0.tar.bz2
+fedora-ds-dsgw-1.1.1.tar.bz2


Index: fedora-ds-dsgw.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/F-9/fedora-ds-dsgw.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-ds-dsgw.spec	7 Apr 2008 15:13:09 -0000	1.1
+++ fedora-ds-dsgw.spec	4 Sep 2008 16:15:37 -0000	1.2
@@ -2,7 +2,7 @@
 
 Summary:          Fedora Directory Server Gateway (dsgw)
 Name:             fedora-ds-dsgw
-Version:          1.1.0
+Version:          1.1.1
 Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
@@ -74,5 +74,8 @@
 %{_libdir}/%{pkgname}/dsgw-cgi-bin
 
 %changelog
+* Thu Sep  4 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.1-1
+- this is the 1.1.1 release
+
 * Mon Mar  3 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.0-1
 - Initial version based on fedora-ds-admin.spec


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2008 15:13:09 -0000	1.2
+++ sources	4 Sep 2008 16:15:37 -0000	1.3
@@ -1 +1,2 @@
 b0da249e798b0105012f0deab43f55e3  fedora-ds-dsgw-1.1.0.tar.bz2
+fd86e38de705e75296100d7fe9025970  fedora-ds-dsgw-1.1.1.tar.bz2



From kkofler at fedoraproject.org  Thu Sep  4 15:56:31 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 15:56:31 +0000 (UTC)
Subject: rpms/kdeedu/F-8 .cvsignore, 1.32, 1.33 kdeedu.spec, 1.65,
	1.66 sources, 1.35, 1.36
Message-ID: <20080904155632.0BFD570120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeedu/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15603/F-8

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-1
- update to 3.5.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-8/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	16 Feb 2008 03:09:38 -0000	1.32
+++ .cvsignore	4 Sep 2008 15:56:00 -0000	1.33
@@ -1 +1 @@
-kdeedu-3.5.9.tar.bz2
+kdeedu-3.5.10.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-8/kdeedu.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- kdeedu.spec	9 Apr 2008 15:57:27 -0000	1.65
+++ kdeedu.spec	4 Sep 2008 15:56:00 -0000	1.66
@@ -22,8 +22,8 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 3.5.9
-Release: 3%{?dist}
+Version: 3.5.10
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Amusements/Games
@@ -221,6 +221,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-1
+- update to 3.5.10
+
 * Wed Apr 09 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-3
 - -libs: omit multilib Obsoletes hack (#435956)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-8/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	16 Feb 2008 03:09:38 -0000	1.35
+++ sources	4 Sep 2008 15:56:00 -0000	1.36
@@ -1 +1 @@
-cbdabe916ce6fa300f8dab972c5cb4a4  kdeedu-3.5.9.tar.bz2
+1b1466bf4cb0a59b1abd8613a2588142  kdeedu-3.5.10.tar.bz2



From orion at fedoraproject.org  Thu Sep  4 15:54:23 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu,  4 Sep 2008 15:54:23 +0000 (UTC)
Subject: rpms/R-multcomp/devel .cvsignore, 1.6, 1.7 R-multcomp.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <20080904155423.8FAD170120@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-multcomp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15035

Modified Files:
	.cvsignore R-multcomp.spec sources 
Log Message:
* Thu Sep 4 2008 Orion Poplawski <orion at cora.nwra.com> - 1.0-2
- Update to 1.0-2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-multcomp/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Apr 2008 20:23:05 -0000	1.6
+++ .cvsignore	4 Sep 2008 15:53:51 -0000	1.7
@@ -1 +1 @@
-multcomp_1.0-0.tar.gz
+multcomp_1.0-2.tar.gz


Index: R-multcomp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-multcomp/devel/R-multcomp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- R-multcomp.spec	2 Apr 2008 20:23:05 -0000	1.7
+++ R-multcomp.spec	4 Sep 2008 15:53:51 -0000	1.8
@@ -1,5 +1,5 @@
 %define packname multcomp
-%define packrel  0
+%define packrel  2
 
 Summary:	Simultaneous inference for general linear hypotheses R Package
 Name:		R-%{packname}
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Thu Sep 4 2008 Orion Poplawski <orion at cora.nwra.com> - 1.0-2
+- Update to 1.0-2
+
 * Wed Apr 2 2008 Orion Poplawski <orion at cora.nwra.com> - 1.0-1
 - Update to 1.0-0
 - Update URL


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-multcomp/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Apr 2008 20:23:05 -0000	1.6
+++ sources	4 Sep 2008 15:53:51 -0000	1.7
@@ -1 +1 @@
-02d735e6723307e09eec008735e5dbaa  multcomp_1.0-0.tar.gz
+15ff84f719b19e7264d59d4ca1b0de69  multcomp_1.0-2.tar.gz



From kwizart at fedoraproject.org  Thu Sep  4 16:01:02 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Thu,  4 Sep 2008 16:01:02 +0000 (UTC)
Subject: rpms/afflib/devel afflib.spec, 1.15, 1.16 .cvsignore, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <20080904160102.DFEAA70120@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/afflib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17521

Modified Files:
	afflib.spec .cvsignore sources 
Log Message:
- Update to 3.3.2
- Remove Requires for ewftools from afftools
- Qemu image support is disabled (experimental)



Index: afflib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/afflib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- afflib.spec	1 Sep 2008 08:25:31 -0000	1.15
+++ afflib.spec	4 Sep 2008 16:00:31 -0000	1.16
@@ -1,7 +1,7 @@
 %define _default_patch_fuzz 2
 
 Name:           afflib
-Version:        3.3.1
+Version:        3.3.2
 Release:        1%{?dist}
 Summary:        Library to support the Advanced Forensic Format
 
@@ -41,7 +41,6 @@
 Summary:        Utilities for %{name}
 Group:          Applications/System
 Requires:       %{name} = %{version}-%{release}
-Requires:       ewftools
 
 %description -n afftools
 The %{name}-utils package contains utilities for using %{name}.
@@ -69,6 +68,8 @@
 find lzma443 -type f -exec chmod 0644 {} ';'
 chmod 0644 lib/base64.cpp
 
+sed -i -e 's/-static/-lrt/' lib/Makefile.am lib/Makefile.in
+
 # Autoreconf
 autoreconf
 
@@ -77,8 +78,8 @@
 %configure --enable-shared \
   --enable-wide-character-type \
   --disable-static \
-  --disable-s3 \
-  --enable-libewf=yes
+  --enable-libewf=yes \
+  --enable-qemu=no
 
 #??Remove rpath from libtool
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -125,6 +126,11 @@
 
 
 %changelog
+* Thu Sep  4 2008 kwizart < kwizart at gmail.com > - 3.3.2-1
+- Update to 3.3.2
+- Remove Requires for ewftools from afftools
+- Qemu image support is disabled (experimental)
+
 * Mon Sep  1 2008 kwizart < kwizart at gmail.com > - 3.3.1-1
 - Update to 3.3.1
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	1 Sep 2008 08:25:31 -0000	1.8
+++ .cvsignore	4 Sep 2008 16:00:31 -0000	1.9
@@ -1 +1 @@
-afflib-3.3.1.tar.gz
+afflib-3.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Sep 2008 08:25:31 -0000	1.8
+++ sources	4 Sep 2008 16:00:31 -0000	1.9
@@ -1 +1 @@
-f2b5150af6d8f52bb0a5c702e975741d  afflib-3.3.1.tar.gz
+cc96dc62d380fcc3c6679d2404c61306  afflib-3.3.2.tar.gz



From orion at fedoraproject.org  Thu Sep  4 15:59:31 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu,  4 Sep 2008 15:59:31 +0000 (UTC)
Subject: rpms/R-zoo/devel .cvsignore, 1.2, 1.3 R-zoo.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <20080904155931.999F770120@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-zoo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16894

Modified Files:
	.cvsignore R-zoo.spec sources 
Log Message:
* Thu Sep 4 2008 Orion Poplawski <orion at cora.nwra.com> 1.5-5
- Update to 1.5-4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-zoo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 May 2008 20:01:19 -0000	1.2
+++ .cvsignore	4 Sep 2008 15:59:30 -0000	1.3
@@ -1 +1 @@
-zoo_1.5-3.tar.gz
+zoo_1.5-4.tar.gz


Index: R-zoo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-zoo/devel/R-zoo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- R-zoo.spec	20 May 2008 20:01:19 -0000	1.1
+++ R-zoo.spec	4 Sep 2008 15:59:30 -0000	1.2
@@ -1,7 +1,7 @@
 # This is the CRAN name
 %define packname zoo
 # Note that some R packages do not use packrel
-%define packrel 3
+%define packrel 4
 
 Name:             R-%{packname}
 Version:          1.5
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Thu Sep 4 2008 Orion Poplawski <orion at cora.nwra.com> 1.5-5
+- Update to 1.5-4
+
 * Tue May 20 2008 Orion Poplawski <orion at cora.nwra.com> 1.5-4
 - Add a couple more doc files
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-zoo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 May 2008 20:01:19 -0000	1.2
+++ sources	4 Sep 2008 15:59:30 -0000	1.3
@@ -1 +1 @@
-af9f197a572233455a674a68bd7e8d9c  zoo_1.5-3.tar.gz
+fc3d54b3df786afd0726cc0941459bc3  zoo_1.5-4.tar.gz



From orion at fedoraproject.org  Thu Sep  4 16:00:36 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu,  4 Sep 2008 16:00:36 +0000 (UTC)
Subject: rpms/R-zoo/devel R-zoo.spec,1.2,1.3
Message-ID: <20080904160036.0D34C70120@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-zoo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17588

Modified Files:
	R-zoo.spec 
Log Message:
Bump rel dummy



Index: R-zoo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-zoo/devel/R-zoo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- R-zoo.spec	4 Sep 2008 15:59:30 -0000	1.2
+++ R-zoo.spec	4 Sep 2008 16:00:35 -0000	1.3
@@ -5,7 +5,7 @@
 
 Name:             R-%{packname}
 Version:          1.5
-Release:          4%{?dist}
+Release:          5%{?dist}
 Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{version}-%{packrel}.tar.gz
 License:          GPLv2
 URL:              http://cran.r-project.org/web/packages/zoo/index.html



From rmeggins at fedoraproject.org  Thu Sep  4 16:00:46 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 16:00:46 +0000 (UTC)
Subject: rpms/fedora-ds-console/devel fedora-ds-console.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20080904160046.61E8170120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-console/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17361/devel

Modified Files:
	fedora-ds-console.spec sources 
Log Message:
fixed incorrect source for 1.1.2 release


Index: fedora-ds-console.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/devel/fedora-ds-console.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-ds-console.spec	4 Sep 2008 15:36:23 -0000	1.4
+++ fedora-ds-console.spec	4 Sep 2008 16:00:15 -0000	1.5
@@ -6,7 +6,7 @@
 
 Name: fedora-ds-console
 Version: %{major_version}.%{minor_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Fedora Directory Server Management Console
 
 Group: Applications/System
@@ -69,6 +69,9 @@
 %doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
                                                                                 
 %changelog
+* Thu Sep  4 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-2
+- fixed incorrect source
+
 * Thu Jul  3 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-1
 - fix threading issues with create new ds instance dialog
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Sep 2008 15:36:23 -0000	1.4
+++ sources	4 Sep 2008 16:00:15 -0000	1.5
@@ -1,2 +1,2 @@
 ee0401937a81ce2466292a4f9b14e20a  fedora-ds-console-1.1.1.tar.bz2
-dafb8ef0305f99ec4593d70e8a660541  fedora-ds-console-1.1.2.tar.bz2
+62964d896042c032143d9bac60abd105  fedora-ds-console-1.1.2.tar.bz2



From trasher at fedoraproject.org  Thu Sep  4 16:04:21 2008
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Thu,  4 Sep 2008 16:04:21 +0000 (UTC)
Subject: rpms/yakuake/F-9 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 yakuake.spec,
	1.11, 1.12
Message-ID: <20080904160421.6E76970120@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/yakuake/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18803

Modified Files:
	.cvsignore sources yakuake.spec 
Log Message:
2.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yakuake/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Jun 2008 05:32:45 -0000	1.6
+++ .cvsignore	4 Sep 2008 16:03:49 -0000	1.7
@@ -1 +1 @@
-yakuake-2.9.3.tar.bz2
+yakuake-2.9.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yakuake/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Jun 2008 05:32:45 -0000	1.6
+++ sources	4 Sep 2008 16:03:49 -0000	1.7
@@ -1 +1 @@
-4facbeab425dfee58cca5f75eb9e88f1  yakuake-2.9.3.tar.bz2
+e1671e6709146c6c85a5884176d99c4b  yakuake-2.9.4.tar.bz2


Index: yakuake.spec
===================================================================
RCS file: /cvs/extras/rpms/yakuake/F-9/yakuake.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- yakuake.spec	20 Jun 2008 05:32:45 -0000	1.11
+++ yakuake.spec	4 Sep 2008 16:03:49 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           yakuake
-Version:        2.9.3
+Version:        2.9.4
 Release:        1%{?dist}
 Summary:        Terminal emulator
 
@@ -13,7 +13,7 @@
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  kdelibs4-devel
+BuildRequires:  kdelibs-devel
 BuildRequires:  cmake
 BuildRequires:  chrpath
 
@@ -71,9 +71,14 @@
 %{_datadir}/applications/*yakuake.desktop
 %{_datadir}/kde4/apps/yakuake
 %{_datadir}/icons/hicolor/??x??/apps/%{name}.png
-
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svgz
 
 %changelog
+* Thu Sep 4 2008 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.9.4-1
+- 2.9.4
+- change BR from kdelibs4-devel to kdelibs-devel
+
 * Fri Jun 20 2008 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.9.3-1
 - 2.9.3
 



From rmeggins at fedoraproject.org  Thu Sep  4 16:00:45 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 16:00:45 +0000 (UTC)
Subject: rpms/fedora-ds-console/F-9 fedora-ds-console.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <20080904160045.5911470120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-console/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17361/F-9

Modified Files:
	fedora-ds-console.spec sources 
Log Message:
fixed incorrect source for 1.1.2 release


Index: fedora-ds-console.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/F-9/fedora-ds-console.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-ds-console.spec	4 Sep 2008 15:36:22 -0000	1.4
+++ fedora-ds-console.spec	4 Sep 2008 16:00:14 -0000	1.5
@@ -6,7 +6,7 @@
 
 Name: fedora-ds-console
 Version: %{major_version}.%{minor_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Fedora Directory Server Management Console
 
 Group: Applications/System
@@ -69,6 +69,9 @@
 %doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
                                                                                 
 %changelog
+* Thu Sep  4 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-2
+- fixed incorrect source
+
 * Thu Jul  3 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-1
 - fix threading issues with create new ds instance dialog
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Sep 2008 15:36:22 -0000	1.4
+++ sources	4 Sep 2008 16:00:14 -0000	1.5
@@ -1,2 +1,2 @@
 ee0401937a81ce2466292a4f9b14e20a  fedora-ds-console-1.1.1.tar.bz2
-dafb8ef0305f99ec4593d70e8a660541  fedora-ds-console-1.1.2.tar.bz2
+62964d896042c032143d9bac60abd105  fedora-ds-console-1.1.2.tar.bz2



From rmeggins at fedoraproject.org  Thu Sep  4 16:00:44 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 16:00:44 +0000 (UTC)
Subject: rpms/fedora-ds-console/F-8 fedora-ds-console.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <20080904160044.EA48670120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-console/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17361/F-8

Modified Files:
	fedora-ds-console.spec sources 
Log Message:
fixed incorrect source for 1.1.2 release


Index: fedora-ds-console.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/F-8/fedora-ds-console.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-ds-console.spec	4 Sep 2008 15:36:20 -0000	1.4
+++ fedora-ds-console.spec	4 Sep 2008 16:00:13 -0000	1.5
@@ -6,7 +6,7 @@
 
 Name: fedora-ds-console
 Version: %{major_version}.%{minor_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Fedora Directory Server Management Console
 
 Group: Applications/System
@@ -69,6 +69,9 @@
 %doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
                                                                                 
 %changelog
+* Thu Sep  4 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-2
+- fixed incorrect source
+
 * Thu Jul  3 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-1
 - fix threading issues with create new ds instance dialog
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Sep 2008 15:36:20 -0000	1.4
+++ sources	4 Sep 2008 16:00:13 -0000	1.5
@@ -1,2 +1,2 @@
 ee0401937a81ce2466292a4f9b14e20a  fedora-ds-console-1.1.1.tar.bz2
-dafb8ef0305f99ec4593d70e8a660541  fedora-ds-console-1.1.2.tar.bz2
+62964d896042c032143d9bac60abd105  fedora-ds-console-1.1.2.tar.bz2



From orion at fedoraproject.org  Thu Sep  4 16:24:03 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu,  4 Sep 2008 16:24:03 +0000 (UTC)
Subject: rpms/R-mvtnorm/devel R-mvtnorm.spec,1.7,1.8
Message-ID: <20080904162403.D8A0970121@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-mvtnorm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25956

Modified Files:
	R-mvtnorm.spec 
Log Message:
Now ships CHANGES



Index: R-mvtnorm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-mvtnorm/devel/R-mvtnorm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- R-mvtnorm.spec	4 Sep 2008 16:12:59 -0000	1.7
+++ R-mvtnorm.spec	4 Sep 2008 16:23:31 -0000	1.8
@@ -60,6 +60,7 @@
 %doc %{_libdir}/R/library/%{packname}/doc
 %doc %{_libdir}/R/library/%{packname}/html
 %doc %{_libdir}/R/library/%{packname}/man
+%doc %{_libdir}/R/library/%{packname}/CHANGES
 %doc %{_libdir}/R/library/%{packname}/DESCRIPTION
 %{_libdir}/R/library/%{packname}/CONTENTS
 %{_libdir}/R/library/%{packname}/INDEX



From rmeggins at fedoraproject.org  Thu Sep  4 16:25:45 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 16:25:45 +0000 (UTC)
Subject: rpms/fedora-ds/F-8 fedora-ds.spec,1.1,1.2
Message-ID: <20080904162545.E914870121@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26939/F-8

Modified Files:
	fedora-ds.spec 
Log Message:
this is the 1.1.2 release - added fedora-ds-dsgw


Index: fedora-ds.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds/F-8/fedora-ds.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-ds.spec	16 Jan 2008 21:47:01 -0000	1.1
+++ fedora-ds.spec	4 Sep 2008 16:25:14 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:          Red Hat Directory, Administration, and Console Suite
 Name:             fedora-ds
-Version:          1.1.1
-Release:          2%{?dist}
+Version:          1.1.2
+Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -15,6 +15,7 @@
 Requires:         fedora-idm-console
 Requires:         fedora-ds-console
 Requires:         fedora-ds-admin-console
+Requires:         fedora-ds-dsgw
 
 %description
 The Red Hat Directory Server, Administration Server, and Console Suite provide
@@ -35,6 +36,11 @@
 %doc LICENSE
 
 %changelog
+* Thu Sep  4 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-1
+- this is the 1.1.2 release
+- made noarch because Fedora is supposed to just "do the right thing" now
+- added fedora-ds-dsgw
+
 * Wed Jan 16 2008 Rich Megginson <rmeggins at redhat.com> 1.1.1-2
 - fedora-admin-console was changed to fedora-ds-admin-console
 



From rmeggins at fedoraproject.org  Thu Sep  4 16:25:46 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 16:25:46 +0000 (UTC)
Subject: rpms/fedora-ds/F-9 fedora-ds.spec,1.2,1.3
Message-ID: <20080904162546.90CCC70121@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26939/F-9

Modified Files:
	fedora-ds.spec 
Log Message:
this is the 1.1.2 release - added fedora-ds-dsgw


Index: fedora-ds.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds/F-9/fedora-ds.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-ds.spec	22 Apr 2008 22:28:10 -0000	1.2
+++ fedora-ds.spec	4 Sep 2008 16:25:15 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:          Red Hat Directory, Administration, and Console Suite
 Name:             fedora-ds
-Version:          1.1.1
-Release:          3%{?dist}
+Version:          1.1.2
+Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -15,6 +15,7 @@
 Requires:         fedora-idm-console
 Requires:         fedora-ds-console
 Requires:         fedora-ds-admin-console
+Requires:         fedora-ds-dsgw
 
 %description
 The Red Hat Directory Server, Administration Server, and Console Suite provide
@@ -35,6 +36,11 @@
 %doc LICENSE
 
 %changelog
+* Thu Sep  4 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-1
+- this is the 1.1.2 release
+- made noarch because Fedora is supposed to just "do the right thing" now
+- added fedora-ds-dsgw
+
 * Tue Apr 22 2008 Rich Megginson <rmeggins at redhat.com> 1.1.1-3
 - bump rev to force retag and rebuild
 



From rmeggins at fedoraproject.org  Thu Sep  4 16:25:47 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  4 Sep 2008 16:25:47 +0000 (UTC)
Subject: rpms/fedora-ds/devel fedora-ds.spec,1.1,1.2
Message-ID: <20080904162547.6D59370121@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26939/devel

Modified Files:
	fedora-ds.spec 
Log Message:
this is the 1.1.2 release - added fedora-ds-dsgw


Index: fedora-ds.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds/devel/fedora-ds.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-ds.spec	16 Jan 2008 21:45:33 -0000	1.1
+++ fedora-ds.spec	4 Sep 2008 16:25:16 -0000	1.2
@@ -1,11 +1,12 @@
 Summary:          Red Hat Directory, Administration, and Console Suite
 Name:             fedora-ds
-Version:          1.1.1
-Release:          2%{?dist}
+Version:          1.1.2
+Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:        noarch
 
 Source:           LICENSE
 
@@ -15,6 +16,7 @@
 Requires:         fedora-idm-console
 Requires:         fedora-ds-console
 Requires:         fedora-ds-admin-console
+Requires:         fedora-ds-dsgw
 
 %description
 The Red Hat Directory Server, Administration Server, and Console Suite provide
@@ -35,6 +37,11 @@
 %doc LICENSE
 
 %changelog
+* Thu Sep  4 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-1
+- this is the 1.1.2 release
+- made noarch because Fedora is supposed to just "do the right thing" now
+- added fedora-ds-dsgw
+
 * Wed Jan 16 2008 Rich Megginson <rmeggins at redhat.com> 1.1.1-2
 - fedora-admin-console was changed to fedora-ds-admin-console
 



From spot at fedoraproject.org  Thu Sep  4 16:37:49 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 16:37:49 +0000 (UTC)
Subject: rpms/scim-input-pad/devel scim-input-pad.spec,1.10,1.11
Message-ID: <20080904163749.7455170120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/scim-input-pad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30699

Modified Files:
	scim-input-pad.spec 
Log Message:
fix license tag


Index: scim-input-pad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-input-pad/devel/scim-input-pad.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scim-input-pad.spec	19 Feb 2008 23:05:55 -0000	1.10
+++ scim-input-pad.spec	4 Sep 2008 16:37:19 -0000	1.11
@@ -1,10 +1,10 @@
 Name:           scim-input-pad
 Version:        0.1.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        On-screen Input Pad for SCIM
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://www.scim-im.org/
 Source0:        http://dl.sourceforge.net/sourceforge/scim/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.1.1-9
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.1-8
 - Autorebuild for GCC 4.3
 



From trasher at fedoraproject.org  Thu Sep  4 16:07:28 2008
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Thu,  4 Sep 2008 16:07:28 +0000 (UTC)
Subject: rpms/yakuake/devel sources,1.6,1.7 yakuake.spec,1.10,1.11
Message-ID: <20080904160728.58E4270120@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/yakuake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19947

Modified Files:
	sources yakuake.spec 
Log Message:
2.9.4



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yakuake/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Jun 2008 05:36:44 -0000	1.6
+++ sources	4 Sep 2008 16:06:57 -0000	1.7
@@ -1 +1 @@
-4facbeab425dfee58cca5f75eb9e88f1  yakuake-2.9.3.tar.bz2
+e1671e6709146c6c85a5884176d99c4b  yakuake-2.9.4.tar.bz2


Index: yakuake.spec
===================================================================
RCS file: /cvs/extras/rpms/yakuake/devel/yakuake.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- yakuake.spec	20 Jun 2008 05:36:44 -0000	1.10
+++ yakuake.spec	4 Sep 2008 16:06:57 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           yakuake
-Version:        2.9.3
+Version:        2.9.4
 Release:        1%{?dist}
 Summary:        Terminal emulator
 
@@ -13,7 +13,7 @@
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  kdelibs4-devel
+BuildRequires:  kdelibs-devel
 BuildRequires:  cmake
 BuildRequires:  chrpath
 
@@ -71,9 +71,14 @@
 %{_datadir}/applications/*yakuake.desktop
 %{_datadir}/kde4/apps/yakuake
 %{_datadir}/icons/hicolor/??x??/apps/%{name}.png
-
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svgz
 
 %changelog
+* Thu Sep 4 2008 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.9.4-1
+- 2.9.4
+- change BR from kdelibs4-devel to kdelibs-devel
+
 * Fri Jun 20 2008 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.9.3-1
 - 2.9.3
 - kdebase is required



From orion at fedoraproject.org  Thu Sep  4 16:08:38 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu,  4 Sep 2008 16:08:38 +0000 (UTC)
Subject: rpms/wgrib/devel .cvsignore, 1.3, 1.4 Changes, 1.3, 1.4 sources, 1.3,
	1.4 wgrib.spec, 1.6, 1.7
Message-ID: <20080904160838.9AB8F70120@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/wgrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20488

Modified Files:
	.cvsignore Changes sources wgrib.spec 
Log Message:
* Thu Sep  4 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.8.0.12u-1
- Update to 1.8.0.12u



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Feb 2008 18:40:00 -0000	1.3
+++ .cvsignore	4 Sep 2008 16:08:07 -0000	1.4
@@ -1 +1 @@
-wgrib.c.v1.8.0.12q
+wgrib.c.v1.8.0.12u


Index: Changes
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib/devel/Changes,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Changes	9 Feb 2008 18:40:00 -0000	1.3
+++ Changes	4 Sep 2008 16:08:07 -0000	1.4
@@ -1,3 +1,7 @@
+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)
+v1.8.0.12r: 12/07 update ncep table 133 (CFSRR)
 v1.8.0.12q: 11/07 update ecmwf table 128
 v1.8.0.12p: 10/07 update ncep table 129, 130, add ncep table 140
 v1.8.0.12o: 5/07 update ncep table 129


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Feb 2008 18:40:00 -0000	1.3
+++ sources	4 Sep 2008 16:08:07 -0000	1.4
@@ -1 +1 @@
-9018086f9bbf74cc622e16a5305f51f3  wgrib.c.v1.8.0.12q
+bdd893c4b5d955ff1b7c9d05e3a473ec  wgrib.c.v1.8.0.12u


Index: wgrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib/devel/wgrib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wgrib.spec	9 Feb 2008 18:40:00 -0000	1.6
+++ wgrib.spec	4 Sep 2008 16:08:07 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           wgrib
-Version:        1.8.0.12q
-Release:        2%{?dist}
+Version:        1.8.0.12u
+Release:        1%{?dist}
 Summary:        Manipulate, inventory and decode GRIB files
 
 Group:          Applications/Engineering
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.8.0.12u-1
+- Update to 1.8.0.12u
+
 * Fri Feb  8 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.8.0.12q-1
 - Update to 1.8.0.12q
 



From spot at fedoraproject.org  Thu Sep  4 16:39:36 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 16:39:36 +0000 (UTC)
Subject: rpms/scim-qtimm/devel scim-qtimm.spec,1.16,1.17
Message-ID: <20080904163936.EC55D70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/scim-qtimm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31296

Modified Files:
	scim-qtimm.spec 
Log Message:
fix license tag


Index: scim-qtimm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-qtimm/devel/scim-qtimm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- scim-qtimm.spec	2 Apr 2008 21:35:06 -0000	1.16
+++ scim-qtimm.spec	4 Sep 2008 16:39:06 -0000	1.17
@@ -1,9 +1,10 @@
 Name:           scim-qtimm
 Version:        0.9.4
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        SCIM input method module for Qt
 
-License:        GPL
+# No version specified.
+License:        GPL+
 Group:          System/Libraries
 URL:            http://www.scim-im.org/projects/scim_qtimm
 Source0:        %{name}-%{version}.tar.bz2
@@ -56,6 +57,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.4-11
+- fix license tag
+
 * Thu Apr 03 2008 Huang Peng <phuang at redhat.com> - 0.9.4-10
 - Change scim-qtimm's dependence qt to qt3.
 



From kwizart at fedoraproject.org  Thu Sep  4 16:41:13 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Thu,  4 Sep 2008 16:41:13 +0000 (UTC)
Subject: rpms/afflib/devel afflib-3.3.2-gcc43.patch, NONE, 1.1 afflib.spec, 
	1.16, 1.17 afflib-3.1.3-gcc43.patch, 1.1, NONE
Message-ID: <20080904164113.4979570120@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/afflib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31849

Modified Files:
	afflib.spec 
Added Files:
	afflib-3.3.2-gcc43.patch 
Removed Files:
	afflib-3.1.3-gcc43.patch 
Log Message:
Update gcc43 patch


afflib-3.3.2-gcc43.patch:

--- NEW FILE afflib-3.3.2-gcc43.patch ---
diff -up afflib-3.1.3/lib/s3_glue.h.gcc43 afflib-3.1.3/lib/s3_glue.h
--- afflib-3.1.3/lib/s3_glue.h.gcc43	2008-03-12 18:58:28.000000000 +0100
+++ afflib-3.1.3/lib/s3_glue.h	2008-03-12 18:59:25.000000000 +0100
@@ -17,6 +17,8 @@
 #include <string>
 #include <map>
 #include <vector>
+#include <cstring>                          // memcpy, strcmp, strlen
+#include <algorithm>                        // sort
 
 #define S3_DEFAULT_BUCKET "S3_DEFAULT_BUCKET"
 #define S3_DEBUG   "S3_DEBUG"
diff -up afflib-3.3.2/lib/utils.h.gcc43 afflib-3.3.2/lib/utils.h
--- afflib-3.3.2/lib/utils.h.gcc43	2008-09-04 18:36:08.000000000 +0200
+++ afflib-3.3.2/lib/utils.h	2008-09-04 18:37:24.000000000 +0200
@@ -11,6 +11,7 @@
 #include <cstdlib>
 #include <vector>
 #include <string>
+#include <cstring>
 #include <map>
 #include <iostream>
 


Index: afflib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/afflib.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- afflib.spec	4 Sep 2008 16:00:31 -0000	1.16
+++ afflib.spec	4 Sep 2008 16:40:43 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           afflib
 Version:        3.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library to support the Advanced Forensic Format
 
 Group:          System Environment/Libraries
@@ -10,7 +10,7 @@
 URL:            http://www.afflib.org
 Source0:        http://www.afflib.org/downloads/afflib-%{version}.tar.gz
 Patch0:         afflib-3.0.1-WCtype.patch
-Patch1:         afflib-3.1.3-gcc43.patch
+Patch1:         afflib-3.3.2-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtool
@@ -126,6 +126,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 kwizart < kwizart at gmail.com > - 3.3.2-2
+- Update gcc43 patch
+
 * Thu Sep  4 2008 kwizart < kwizart at gmail.com > - 3.3.2-1
 - Update to 3.3.2
 - Remove Requires for ewftools from afftools


--- afflib-3.1.3-gcc43.patch DELETED ---



From spot at fedoraproject.org  Thu Sep  4 16:41:19 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 16:41:19 +0000 (UTC)
Subject: rpms/scim-skk/devel scim-skk.spec,1.17,1.18
Message-ID: <20080904164119.527DD70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/scim-skk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31976

Modified Files:
	scim-skk.spec 
Log Message:
fix license tag


Index: scim-skk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-skk/devel/scim-skk.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- scim-skk.spec	19 Feb 2008 23:07:00 -0000	1.17
+++ scim-skk.spec	4 Sep 2008 16:40:49 -0000	1.18
@@ -1,10 +1,10 @@
 Name:		scim-skk
 Version:	0.5.2
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	SCIM IMEngine module for skk
 
 Group:		System Environment/Libraries
-License:	GPL
+License:	GPLv2+
 URL:		http://scim-imengine.sourceforge.jp/
 Source0:	http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.2-10
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.2-9
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Thu Sep  4 16:43:44 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 16:43:44 +0000 (UTC)
Subject: rpms/scim-tomoe/devel scim-tomoe.spec,1.24,1.25
Message-ID: <20080904164344.0C73E70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/scim-tomoe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv307

Modified Files:
	scim-tomoe.spec 
Log Message:
fix license tag


Index: scim-tomoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-tomoe/devel/scim-tomoe.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- scim-tomoe.spec	10 Jul 2008 06:19:49 -0000	1.24
+++ scim-tomoe.spec	4 Sep 2008 16:43:13 -0000	1.25
@@ -1,10 +1,10 @@
 Name:           scim-tomoe
 Version:        0.6.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Tomoe module for SCIM for handwritten input
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://tomoe.sourceforge.net/
 Source0:        http://dl.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.0-5
+- fix license tag
+
 * Thu Jul 10 2008 Jens Petersen <petersen at redhat.com> - 0.6.0-4.fc10
 - libtomoe-gtk package was renamed to tomoe-gtk
 - rebuild also for gucharmap disabled now



From spot at fedoraproject.org  Thu Sep  4 16:45:05 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 16:45:05 +0000 (UTC)
Subject: rpms/scmxx/devel scmxx.spec,1.6,1.7
Message-ID: <20080904164505.9FBF170120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/scmxx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv833

Modified Files:
	scmxx.spec 
Log Message:
fix license tag


Index: scmxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scmxx/devel/scmxx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scmxx.spec	11 Feb 2008 17:10:40 -0000	1.6
+++ scmxx.spec	4 Sep 2008 16:44:35 -0000	1.7
@@ -1,9 +1,9 @@
 Summary: Exchange data with Siemens mobile phones
 Name: scmxx
 Version: 0.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Communications
-License: GPL
+License: GPLv2+
 URL: http://www.hendrik-sattler.de/scmxx
 Source0: http://dl.sourceforge.net/scmxx/scmxx-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,6 +46,9 @@
 %lang(ru) %{_mandir}/ru/man1/scmxx.1.gz
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.0-2
+- fix license tag
+
 * Mon Feb 11 2008 Andreas Thienemann <andreas at bawue.net> - 0.9.0-1
 - Updated to 0.9.0
 



From spot at fedoraproject.org  Thu Sep  4 16:46:31 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 16:46:31 +0000 (UTC)
Subject: rpms/scratchpad/devel scratchpad.spec,1.2,1.3
Message-ID: <20080904164631.97F9B70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/scratchpad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1444

Modified Files:
	scratchpad.spec 
Log Message:
fix license tag


Index: scratchpad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scratchpad/devel/scratchpad.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scratchpad.spec	20 Feb 2008 00:24:11 -0000	1.2
+++ scratchpad.spec	4 Sep 2008 16:46:01 -0000	1.3
@@ -1,10 +1,10 @@
 Name:           scratchpad
 Version:        0.3.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Spatial text editor for the GNOME desktop
 
 Group:          Applications/Editors
-License:        GPL
+License:        GPLv2+
 URL:            http://dborg.wordpress.com/scratchpad/
 Source0:        http://braindump.chorse.org/stuff/scratchpad/%{name}-%{version}.tar.bz2	
 #Starting the application from the gnome menu just gives a popup window that
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.0-5
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.3.0-4
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Thu Sep  4 16:50:11 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 16:50:11 +0000 (UTC)
Subject: rpms/screem/devel screem.spec,1.12,1.13
Message-ID: <20080904165011.7A83F70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/screem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2579

Modified Files:
	screem.spec 
Log Message:
fix license tag


Index: screem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/screem/devel/screem.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- screem.spec	11 Dec 2006 16:36:53 -0000	1.12
+++ screem.spec	4 Sep 2008 16:49:41 -0000	1.13
@@ -1,10 +1,10 @@
 Name:           screem
 Version:        0.16.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Website development environment
 
 Group:          Development/Tools
-License:        GPL
+License:        GPLv2+
 URL:            http://www.screem.org/
 Source0:        http://download.sourceforge.net/screem/screem-%{version}.tar.gz
 Patch0:		fix_miscompile.patch
@@ -111,6 +111,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.16.1-6
+- fix license tag
+
 * Fri Sep 08 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.16.1-5
 - Don't own /usr/share/omf
 



From spot at fedoraproject.org  Thu Sep  4 16:52:17 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 16:52:17 +0000 (UTC)
Subject: rpms/scribes-templates/devel scribes-templates.spec,1.4,1.5
Message-ID: <20080904165217.E936A70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/scribes-templates/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3268

Modified Files:
	scribes-templates.spec 
Log Message:
fix license tag


Index: scribes-templates.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribes-templates/devel/scribes-templates.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scribes-templates.spec	12 Sep 2007 23:42:16 -0000	1.4
+++ scribes-templates.spec	4 Sep 2008 16:51:47 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		scribes-templates
 Version:	20070602
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Templates ("Snippets") for the Scribes text editor
 Group:		Applications/Editors
 
@@ -8,7 +8,7 @@
 # maintainer of Scribes) did state that these are GPL in an email message to
 # me on 2006-10-17, a copy of which is contained in COPYING.Fedora. Future
 # versions should contain an explicit COPYING file.
-License:	GPL
+License:	GPL+
 URL:		http://scribes.sourceforge.net/template.html
 
 # The tarball is not versioned, so I update the mirrored tarball on my
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 20070602-2
+- fix license tag
+
 * Mon Jun 04 2007 Peter Gordon <peter at thecodergeek.com> - 20070602-1
 - Update to new upstream templates tarball (2007-06-02), including updated
   templates for LaTeX, Perl, PHP, and VHDL.



From spot at fedoraproject.org  Thu Sep  4 16:54:35 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 16:54:35 +0000 (UTC)
Subject: rpms/sdcc/devel sdcc.spec,1.5,1.6
Message-ID: <20080904165435.0767070120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sdcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4040

Modified Files:
	sdcc.spec 
Log Message:
fix license tag


Index: sdcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/devel/sdcc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sdcc.spec	3 Mar 2008 10:33:09 -0000	1.5
+++ sdcc.spec	4 Sep 2008 16:54:04 -0000	1.6
@@ -1,10 +1,10 @@
 Name:           sdcc
 Version:        2.6.0
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Small Device C Compiler
 
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2+
 URL:            http://sdcc.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
 Source1:        README.fedora
@@ -113,6 +113,9 @@
 %{_datadir}/%{name}/lib/*/*.asm
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.6.0-13
+- fix license tag
+
 * Sun Mar 2  2008 Marek Mahut <mmahut at fedoraproject.org> - 2.6.0-12
 - Fixing build problems under GCC 4.3
 



From kkofler at fedoraproject.org  Thu Sep  4 16:56:58 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 16:56:58 +0000 (UTC)
Subject: rpms/kdegraphics/F-8 .cvsignore, 1.36, 1.37 kdegraphics.spec, 1.121,
	1.122 sources, 1.39, 1.40 kdegraphics-3.5.9-kpdf-crashes.patch,
	1.1, NONE
Message-ID: <20080904165658.0FEAF70120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegraphics/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4958/F-8

Modified Files:
	.cvsignore kdegraphics.spec sources 
Removed Files:
	kdegraphics-3.5.9-kpdf-crashes.patch 
Log Message:
* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 7:3.5.10-1
- update to 3.5.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-8/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	16 Feb 2008 03:25:20 -0000	1.36
+++ .cvsignore	4 Sep 2008 16:56:27 -0000	1.37
@@ -1 +1 @@
-kdegraphics-3.5.9.tar.bz2
+kdegraphics-3.5.10.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-8/kdegraphics.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- kdegraphics.spec	17 Jun 2008 18:24:51 -0000	1.121
+++ kdegraphics.spec	4 Sep 2008 16:56:27 -0000	1.122
@@ -21,8 +21,8 @@
 Name:    kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch:   7
-Version: 3.5.9
-Release: 3%{?dist}
+Version: 3.5.10
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Multimedia
@@ -35,7 +35,6 @@
 Patch3: kdegraphics-3.5.1-warning.patch
 
 #??upstream patches
-Patch50: kdegraphics-3.5.9-kpdf-crashes.patch
 
 Provides: kdegraphics3 = %{version}-%{release}
 
@@ -152,7 +151,6 @@
 %patch3 -p1 -b .gcc-warning
 
 #upstream patches
-%patch50 -p1 -b .kpdf-crashes
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -378,6 +376,10 @@
 
 
 %changelog
+* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 7:3.5.10-1
+- update to 3.5.10
+- drop kpdf-crashes patch (fixed upstream)
+
 * Tue Jun 17 2008 Rex Dieter <rdieter at fedoraproject.org> 7:3.5.9-3
 - omit multilib upgrade hacks (see also #441222)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-8/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	16 Feb 2008 03:25:20 -0000	1.39
+++ sources	4 Sep 2008 16:56:27 -0000	1.40
@@ -1 +1 @@
-3d75e27180573a4e077e0245055891a5  kdegraphics-3.5.9.tar.bz2
+a09094b5357d8cd5c49d45b5d291dcfe  kdegraphics-3.5.10.tar.bz2


--- kdegraphics-3.5.9-kpdf-crashes.patch DELETED ---



From spot at fedoraproject.org  Thu Sep  4 16:58:57 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 16:58:57 +0000 (UTC)
Subject: rpms/sec/devel sec.spec,1.3,1.4
Message-ID: <20080904165857.DD55070120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5714

Modified Files:
	sec.spec 
Log Message:
fix license tag


Index: sec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/sec.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sec.spec	28 May 2007 20:06:22 -0000	1.3
+++ sec.spec	4 Sep 2008 16:58:27 -0000	1.4
@@ -6,11 +6,11 @@
 
 Name:           sec
 Version:        2.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SEC (simple event correlator)
 
 Group:          System Environment/Daemons
-License:        GPL
+License:        GPLv2+
 URL:            http://www.estpak.ee/~risto/sec/
 
 ################################################################################
@@ -193,6 +193,8 @@
 ################################################################################
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.1-2
+- fix license tag
 
 * Mon May 28 2007 Chris Petersen <rpm at forevermore.net>                  2.4.1-1
 - Update to 2.4.1



From spot at fedoraproject.org  Thu Sep  4 17:00:34 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 17:00:34 +0000 (UTC)
Subject: rpms/seedit/devel seedit.spec,1.16,1.17
Message-ID: <20080904170034.5BED370120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/seedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6292

Modified Files:
	seedit.spec 
Log Message:
fix license tag


Index: seedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seedit/devel/seedit.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- seedit.spec	20 Feb 2008 08:39:26 -0000	1.16
+++ seedit.spec	4 Sep 2008 17:00:04 -0000	1.17
@@ -16,10 +16,10 @@
 
 Name: seedit         
 Version: 2.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: SELinux Policy Editor:Core component
 Group:  System Environment/Base        
-License: GPL       
+License: GPLv2+       
 URL: http://seedit.sourceforge.net/
 Source0: http://osdn.dl.sourceforge.jp/selpe/23577/%{name}-%{version}.tar.gz
 Source1: seedit-gui.desktop
@@ -170,6 +170,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.2.0-3
+- fix license tag
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2.0-2
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Thu Sep  4 17:04:40 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 17:04:40 +0000 (UTC)
Subject: rpms/shapelib/devel shapelib.spec,1.12,1.13
Message-ID: <20080904170440.8D6E870120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/shapelib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7603

Modified Files:
	shapelib.spec 
Log Message:
fix license tag


Index: shapelib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shapelib/devel/shapelib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- shapelib.spec	20 Feb 2008 00:30:49 -0000	1.12
+++ shapelib.spec	4 Sep 2008 17:04:10 -0000	1.13
@@ -2,14 +2,15 @@
 Summary: API in "C" for Shapefile handling
 Name: shapelib
 Version: 1.2.10
-Release: 16.20060304cvs
+Release: 17.20060304cvs
 URL: http://shapelib.maptools.org/
 Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz
 Patch0: shapelib-1.2.10-Makefile.patch
 Patch1: shapelib-1.2.10-endian.patch
 Patch2: shapelib-1.2.10-Makefile2.patch
 Patch3: shapelib-build-id.patch
-License: LGPL/MIT
+# No version of the LGPL is given.
+License: LGPLv2+ or MIT
 Group: Development/Libraries
 BuildRequires: proj-devel >= 4.4.1
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,6 +75,9 @@
 %exclude %{_libdir}/libshp.la
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2.10-17.20060304cvs
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.10-16.20060304cvs
 - Autorebuild for GCC 4.3
 



From kkofler at fedoraproject.org  Thu Sep  4 17:06:50 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 17:06:50 +0000 (UTC)
Subject: rpms/kdenetwork/F-8 .cvsignore, 1.42, 1.43 kdenetwork.spec, 1.117, 
	1.118 sources, 1.48, 1.49 kdenetwork-3.1-buildroot.patch, 1.1, NONE
Message-ID: <20080904170650.E532070120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdenetwork/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8416/F-8

Modified Files:
	.cvsignore kdenetwork.spec sources 
Removed Files:
	kdenetwork-3.1-buildroot.patch 
Log Message:
* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 7:3.5.10-1
- update to 3.5.10
- drop kopete-icq patch (fixed upstream)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-8/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	16 Feb 2008 03:33:43 -0000	1.42
+++ .cvsignore	4 Sep 2008 17:06:20 -0000	1.43
@@ -1 +1 @@
-kdenetwork-3.5.9.tar.bz2
+kdenetwork-3.5.10.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-8/kdenetwork.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- kdenetwork.spec	1 Jul 2008 21:22:32 -0000	1.117
+++ kdenetwork.spec	4 Sep 2008 17:06:20 -0000	1.118
@@ -23,8 +23,8 @@
 
 Name:    kdenetwork
 Epoch:   7
-Version: 3.5.9
-Release: 3%{?dist}
+Version: 3.5.10
+Release: 1%{?dist}
 Summary: K Desktop Environment - Network Applications
 
 License: GPLv2
@@ -41,17 +41,12 @@
 Source5: lisa.redhat
 
 Patch1: kdenetwork-3.1-desktop.patch
-Patch2: kdenetwork-3.1-buildroot.patch
 Patch3: kdenetwork-3.5.8-kppp.patch
 Patch4: kdenetwork-3.2.3-resolv.patch
 # include more/proper ppp headers
 Patch5: kdenetwork-3.5.9-ppp.patch
 Patch6: kdenetwork-3.5.9-krfb_httpd.patch
 
-# fix kde#165502: ICQ doesn't connect (Client to old)
-# use the same ICQ version number as Kopete from KDE 4
-Patch100: kdenetwork-3.5.9-kopete-icq.patch
-
 %if 0%{?libs}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 %else
@@ -167,8 +162,6 @@
 %setup -q
 
 %patch1 -p1 -b .dt
-# harmless, not needed -- Rex
-#patch2 -p1 -b .buildroot
 %if %{console_helper}
 %patch3 -p1 -b .kppp
 %endif
@@ -176,8 +169,6 @@
 %patch5 -p1 -b .ppp
 %patch6 -p1 -b .krfb_httpd
 
-%patch100 -p1 -b .kopete-icq
-
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
@@ -479,8 +470,12 @@
 
 
 %changelog
+* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 7:3.5.10-1
+- update to 3.5.10
+- drop kopete-icq patch (fixed upstream)
+
 * Tue Jul 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 7:3.5.9-3
-- kde#165502: ICQ doesn't connect (Client to old)
+- kde#165502: ICQ doesn't connect (Client too old)
 
 * Tue Feb 26 2008 Luk???? Tinkl <ltinkl at redhat.com> - 7:3.5.9-2
 - #433511: vnc server through krfb and accessing by http broken


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-8/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	16 Feb 2008 03:33:43 -0000	1.48
+++ sources	4 Sep 2008 17:06:20 -0000	1.49
@@ -1 +1 @@
-0ec1d4ccd550510821a622eb91b893e8  kdenetwork-3.5.9.tar.bz2
+634b2e914661faebae79d95dcc6c5bfa  kdenetwork-3.5.10.tar.bz2


--- kdenetwork-3.1-buildroot.patch DELETED ---



From kkofler at fedoraproject.org  Thu Sep  4 17:07:26 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 17:07:26 +0000 (UTC)
Subject: rpms/kdenetwork/F-8 kdenetwork-3.5.9-kopete-icq.patch,1.1,NONE
Message-ID: <20080904170726.146D270120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdenetwork/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8844/F-8

Removed Files:
	kdenetwork-3.5.9-kopete-icq.patch 
Log Message:
* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 7:3.5.10-1
- update to 3.5.10
- drop kopete-icq patch (fixed upstream)


--- kdenetwork-3.5.9-kopete-icq.patch DELETED ---



From spot at fedoraproject.org  Thu Sep  4 17:08:18 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 17:08:18 +0000 (UTC)
Subject: rpms/shapelib/devel shapelib.spec,1.13,1.14
Message-ID: <20080904170818.CB97070120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/shapelib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9039

Modified Files:
	shapelib.spec 
Log Message:
fix patch application


Index: shapelib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shapelib/devel/shapelib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- shapelib.spec	4 Sep 2008 17:04:10 -0000	1.13
+++ shapelib.spec	4 Sep 2008 17:07:48 -0000	1.14
@@ -2,7 +2,7 @@
 Summary: API in "C" for Shapefile handling
 Name: shapelib
 Version: 1.2.10
-Release: 17.20060304cvs
+Release: 18.20060304cvs
 URL: http://shapelib.maptools.org/
 Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz
 Patch0: shapelib-1.2.10-Makefile.patch
@@ -31,7 +31,7 @@
 
 %prep
 %setup -q -T -b 0
-%patch -p1 -b .buildroot
+%patch0 -p1 -b .buildroot
 %patch1 -p1 -b .endian
 %patch2 -p1 -b .buildroot
 %patch3 -p1 -b .buildroot
@@ -75,6 +75,9 @@
 %exclude %{_libdir}/libshp.la
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2.10-18.20060304cvs
+- fix patch application
+
 * Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2.10-17.20060304cvs
 - fix license tag
 



From ssp at fedoraproject.org  Thu Sep  4 17:11:33 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu,  4 Sep 2008 17:11:33 +0000 (UTC)
Subject: rpms/gnome-desktop/devel clone-modes.patch, 1.1,
	1.2 gnome-desktop.spec, 1.161, 1.162
Message-ID: <20080904171133.6466B70120@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10193

Modified Files:
	clone-modes.patch gnome-desktop.spec 
Log Message:
Fix bug 461152

clone-modes.patch:

Index: clone-modes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/clone-modes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clone-modes.patch	4 Sep 2008 03:29:14 -0000	1.1
+++ clone-modes.patch	4 Sep 2008 17:11:02 -0000	1.2
@@ -286,7 +286,7 @@
  /* Database management */
  
  static gchar *
-@@ -1036,13 +1082,67 @@
+@@ -1036,13 +1082,68 @@
      return result;
  }
  
@@ -337,10 +337,11 @@
 +		break;
 +	    }
 +	}
++
++	configurations_free (configs);
 +    }
 +
 +    gnome_rr_config_free (current);
-+    configurations_free (configs);
 +    
 +    return result;
 +}
@@ -357,7 +358,7 @@
  
      assignment = crtc_assignment_new (screen, outputs);
  
-@@ -1065,42 +1165,51 @@
+@@ -1065,42 +1166,51 @@
  gboolean
  gnome_rr_config_apply_stored (GnomeRRScreen *screen)
  {


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- gnome-desktop.spec	4 Sep 2008 03:59:34 -0000	1.161
+++ gnome-desktop.spec	4 Sep 2008 17:11:02 -0000	1.162
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.23.91
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.23/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -121,6 +121,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Thu Sep  4 2008 Soren Sandmann <sandmann at redhat.com> - 2.23.91-4
+- Fix bug 461152
+
 * Wed Sep  3 2008 Soren Sandmann <sandmann at redhat.com> - 2.23.91-3
 - Bump release number to make chain-build work
 



From kkofler at fedoraproject.org  Thu Sep  4 17:11:51 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 17:11:51 +0000 (UTC)
Subject: rpms/kdetoys/F-8 .cvsignore, 1.11, 1.12 kdetoys.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <20080904171151.303F370120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdetoys/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10305/F-8

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 7:3.5.10-1
- update to 3.5.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-8/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	16 Feb 2008 03:46:18 -0000	1.11
+++ .cvsignore	4 Sep 2008 17:11:20 -0000	1.12
@@ -1 +1 @@
-kdetoys-3.5.9.tar.bz2
+kdetoys-3.5.10.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-8/kdetoys.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kdetoys.spec	16 Feb 2008 03:46:18 -0000	1.12
+++ kdetoys.spec	4 Sep 2008 17:11:20 -0000	1.13
@@ -3,7 +3,7 @@
 Name: 	 kdetoys
 Group:	 Amusements/Graphics
 Epoch:	 7
-Version: 3.5.9
+Version: 3.5.10
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -121,6 +121,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 7:3.5.10-1
+- update to 3.5.10
+
 * Fri Feb 15 2008 Rex Dieter <rdieter at fedoraproject.rog> 7:3.5.9-1
 - kde.3.5.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 Feb 2008 03:46:18 -0000	1.9
+++ sources	4 Sep 2008 17:11:20 -0000	1.10
@@ -1 +1 @@
-10fd55e004a582f87eed6796811bb3b8  kdetoys-3.5.9.tar.bz2
+1da4383e2d520dfd572edb33b708822d  kdetoys-3.5.10.tar.bz2



From kkofler at fedoraproject.org  Thu Sep  4 17:14:57 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 17:14:57 +0000 (UTC)
Subject: rpms/kdeutils/F-8 .cvsignore, 1.37, 1.38 kdeutils.spec, 1.103,
	1.104 sources, 1.40, 1.41
Message-ID: <20080904171457.335D070120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeutils/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11437/F-8

Modified Files:
	.cvsignore kdeutils.spec sources 
Log Message:
* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-1
- update to 3.5.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-8/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	16 Feb 2008 03:52:24 -0000	1.37
+++ .cvsignore	4 Sep 2008 17:14:26 -0000	1.38
@@ -1 +1 @@
-kdeutils-3.5.9.tar.bz2
+kdeutils-3.5.10.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-8/kdeutils.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- kdeutils.spec	16 Feb 2008 03:55:17 -0000	1.103
+++ kdeutils.spec	4 Sep 2008 17:14:26 -0000	1.104
@@ -13,7 +13,7 @@
 Name:    kdeutils
 Summary: K Desktop Environment - Utilities
 Epoch:   6
-Version: 3.5.9
+Version: 3.5.10
 Release: 1%{?dist}
 
 License: GPLv2
@@ -336,6 +336,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-1
+- update to 3.5.10
+
 * Fri Feb 15 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-1
 - kde-3.5.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-8/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	16 Feb 2008 03:52:24 -0000	1.40
+++ sources	4 Sep 2008 17:14:26 -0000	1.41
@@ -1 +1 @@
-dbe5ddff57141f27778601df5571e182  kdeutils-3.5.9.tar.bz2
+038f94275f42df3cae89735506ffbc0b  kdeutils-3.5.10.tar.bz2



From nim at fedoraproject.org  Thu Sep  4 17:16:56 2008
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Thu,  4 Sep 2008 17:16:56 +0000 (UTC)
Subject: rpms/perl-Font-TTF/devel perl-Font-TTF-COPYING.Fedora, NONE,
	1.1 import.log, 1.1, 1.2 perl-Font-TTF.spec, 1.11, 1.12
Message-ID: <20080904171656.1974B70120@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Font-TTF/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12208/devel

Modified Files:
	import.log perl-Font-TTF.spec 
Added Files:
	perl-Font-TTF-COPYING.Fedora 
Log Message:
relicense


--- NEW FILE perl-Font-TTF-COPYING.Fedora ---
Date: Thu, 4 Sep 2008 09:01:32 +0700
From: Martin Hosken <martin_hosken at sil.org>
To: "Tom \"spot\" Callaway" <tcallawa at redhat.com>
Cc: nicolas.spalinger at sil.org, Nicolas Mailhot <nicolas.mailhot at laposte.net>
Subject: Re: License of perl-Font-TTF
Message-ID: <20080904090132.6248a852 at sil-mh4>
In-Reply-To: <1220470951.3764.63.camel at localhost.localdomain>

Dear Tom,

> The best case scenario is a new release of Font::TTF that is under a
> Free license (we suggest the same license as perl (GPL+ or Artistic) or
> Artistic 2.0). However, given the time constraints, we would also be
> able to use written (email is fine) permission from the copyright holder
> for Fedora to distribute Font::TTF under a Free license.

I'm sorry to be seeming to drag my heels on this, but I don't really want to
produce another release just to change the license, at this time. So:

I hereby declare that Fedora may distribute the Font::TTF and
Font::TTF::Scripts modules under the Artistic 2.0 license.

I have changed the COPYING file in both projects and the next version will
appear with it. If you still really need me to do another release (sigh) then
please get back to me.

Thank you for your patience.

Yours,
Martin Hosken

??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????

Artistic License 2.0

Copyright (c) 2000-2006, The Perl Foundation.

Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
Preamble

This license establishes the terms under which a given free software Package
may be copied, modified, distributed, and/or redistributed. The intent is that
the Copyright Holder maintains some artistic control over the development of
that Package while still keeping the Package available as open source and free
software.

You are always permitted to make arrangements wholly outside of this license
directly with the Copyright Holder of a given Package. If the terms of this
license do not permit the full use that you propose to make of the Package, you
should contact the Copyright Holder and seek a different licensing arrangement.
Definitions

"Copyright Holder" means the individual(s) or organization(s) named in the
copyright notice for the entire Package.

"Contributor" means any party that has contributed code or other material to
the Package, in accordance with the Copyright Holder's procedures.

"You" and "your" means any person who would like to copy, distribute, or modify
the Package.

"Package" means the collection of files distributed by the Copyright Holder,
and derivatives of that collection and/or of those files. A given Package may
consist of either the Standard Version, or a Modified Version.

"Distribute" means providing a copy of the Package or making it accessible to
anyone else, or in the case of a company or organization, to others outside of
your company or organization.

"Distributor Fee" means any fee that you charge for Distributing this Package
or providing support for this Package to another party. It does not mean
licensing fees.

"Standard Version" refers to the Package if it has not been modified, or has
been modified only in ways explicitly requested by the Copyright Holder.

"Modified Version" means the Package, if it has been changed, and such changes
were not explicitly requested by the Copyright Holder.

"Original License" means this Artistic License as Distributed with the Standard
Version of the Package, in its current version or as it may be modified by The
Perl Foundation in the future.

"Source" form means the source code, documentation source, and configuration
files for the Package.

"Compiled" form means the compiled bytecode, object code, binary, or any other
form resulting from mechanical transformation or translation of the Source form.
Permission for Use and Modification Without Distribution

(1) You are permitted to use the Standard Version and create and use Modified
Versions for any purpose without restriction, provided that you do not
Distribute the Modified Version.
Permissions for Redistribution of the Standard Version

(2) You may Distribute verbatim copies of the Source form of the Standard
Version of this Package in any medium without restriction, either gratis or for
a Distributor Fee, provided that you duplicate all of the original copyright
notices and associated disclaimers. At your discretion, such verbatim copies
may or may not include a Compiled form of the Package.

(3) You may apply any bug fixes, portability changes, and other modifications
made available from the Copyright Holder. The resulting Package will still be
considered the Standard Version, and as such will be subject to the Original
License.
Distribution of Modified Versions of the Package as Source

(4) You may Distribute your Modified Version as Source (either gratis or for a
Distributor Fee, and with or without a Compiled form of the Modified Version)
provided that you clearly document how it differs from the Standard Version,
including, but not limited to, documenting any non-standard features,
executables, or modules, and provided that you do at least ONE of the following:

(a) make the Modified Version available to the Copyright Holder of the Standard
Version, under the Original License, so that the Copyright Holder may include
your modifications in the Standard Version.
(b) ensure that installation of your Modified Version does not prevent the user
installing or running the Standard Version. In addition, the Modified Version
must bear a name that is different from the name of the Standard Version.
(c) allow anyone who receives a copy of the Modified Version to make the Source
form of the Modified Version available to others under
(i) the Original License or
(ii) a license that permits the licensee to freely copy, modify and
redistribute the Modified Version using the same licensing terms that apply to
the copy that the licensee received, and requires that the Source form of the
Modified Version, and of any works derived from it, be made freely available in
that license fees are prohibited but Distributor Fees are allowed.
Distribution of Compiled Forms of the Standard Version or Modified Versions
without the Source

(5) You may Distribute Compiled forms of the Standard Version without the
Source, provided that you include complete instructions on how to get the
Source of the Standard Version. Such instructions must be valid at the time of
your distribution. If these instructions, at any time while you are carrying
out such distribution, become invalid, you must provide new instructions on
demand or cease further distribution. If you provide valid instructions or
cease distribution within thirty days after you become aware that the
instructions are invalid, then you do not forfeit any of your rights under this
license.

(6) You may Distribute a Modified Version in Compiled form without the Source,
provided that you comply with Section 4 with respect to the Source of the
Modified Version.
Aggregating or Linking the Package

(7) You may aggregate the Package (either the Standard Version or Modified
Version) with other packages and Distribute the resulting aggregation provided
that you do not charge a licensing fee for the Package. Distributor Fees are
permitted, and licensing fees for other components in the aggregation are
permitted. The terms of this license apply to the use and Distribution of the
Standard or Modified Versions as included in the aggregation.

(8) You are permitted to link Modified and Standard Versions with other works,
to embed the Package in a larger work of your own, or to build stand-alone
binary or bytecode versions of applications that include the Package, and
Distribute the result without restriction, provided the result does not expose
a direct interface to the Package.
Items That are Not Considered Part of a Modified Version

(9) Works (including, but not limited to, modules and scripts) that merely
extend or make use of the Package, do not, by themselves, cause the Package to
be a Modified Version. In addition, such works are not considered parts of the
Package itself, and are not subject to the terms of this license.
General Provisions

(10) Any use, modification, and distribution of the Standard or Modified
Versions is governed by this Artistic License. By using, modifying or
distributing the Package, you accept this license. Do not use, modify, or
distribute the Package, if you do not accept this license.

(11) If your Modified Version has been derived from a Modified Version made by
someone other than you, you are nevertheless required to ensure that your
Modified Version complies with the requirements of this license.

(12) This license does not grant you the right to use any trademark, service
mark, tradename, or logo of the Copyright Holder.

(13) This license includes the non-exclusive, worldwide, free-of-charge patent
license to make, have made, use, offer to sell, sell, import and otherwise
transfer the Package with respect to any patent claims licensable by the
Copyright Holder that are necessarily infringed by the Package. If you
institute patent litigation (including a cross-claim or counterclaim) against
any party alleging that the Package constitutes direct or contributory patent
infringement, then this Artistic License to you shall terminate on the date
that such litigation is filed.

(14) Disclaimer of Warranty: THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER
AND CONTRIBUTORS "AS IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE
IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL LAW.
UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY
OUT OF THE USE OF THE PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Font-TTF/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Jul 2008 21:25:52 -0000	1.1
+++ import.log	4 Sep 2008 17:16:25 -0000	1.2
@@ -1 +1,2 @@
 perl-Font-TTF-0_45-1_fc10:HEAD:perl-Font-TTF-0.45-1.fc10.src.rpm:1215811435
+perl-Font-TTF-0_45-2_fc10:HEAD:perl-Font-TTF-0.45-2.fc10.src.rpm:1220548574


Index: perl-Font-TTF.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Font-TTF/devel/perl-Font-TTF.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Font-TTF.spec	11 Jul 2008 21:25:52 -0000	1.11
+++ perl-Font-TTF.spec	4 Sep 2008 17:16:25 -0000	1.12
@@ -2,14 +2,14 @@
 
 Name:    perl-%{cpanname}
 Version: 0.45
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Perl library for modifying TTF font files
 
 Group:     Development/Libraries
-# Will probalby die soonish because of the following
-License:   Artistic
+License:   Artistic 2.0
 URL:       http://search.cpan.org/dist/%{cpanname}/
 Source0:   http://cpan.org/authors/id/M/MH/MHOSKEN/%{cpanname}-%{version}.tar.gz
+Source1:   %{name}-COPYING.Fedora
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:     noarch
@@ -34,6 +34,7 @@
 %prep
 %setup -q -n %{cpanname}-%{version}
 dos2unix README.TXT COPYING lib/Font/TTF/Changes
+install -m 0644 -p %{SOURCE1} COPYING.Fedora
 
 
 %build
@@ -62,7 +63,7 @@
 
 %files
 %defattr(0644,root,root,0755)
-%doc README.TXT COPYING lib/Font/TTF/Changes
+%doc README.TXT COPYING COPYING.Fedora lib/Font/TTF/Changes
 
 %dir %{perl_vendorlib}/Font
 %dir %{perl_vendorlib}/Font/TTF
@@ -82,6 +83,10 @@
 
 
 %changelog
+* Thu Sep 4 2008 <nicolas.mailhot at laposte.net>
+- 0.45-2
+??? ??? Artistic 2.0
+
 * Fri Jul 11 2008 <nicolas.mailhot at laposte.net>
 - 0.45-1
 ??? Fedora 10 alpha general package cleanup



From ausil at fedoraproject.org  Thu Sep  4 17:19:10 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  4 Sep 2008 17:19:10 +0000 (UTC)
Subject: extras-buildsys/utils user-manager.py,1.3.8.1,1.3.8.2
Message-ID: <20080904171910.495A070120@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13119/utils

Modified Files:
      Tag: Plague-0_4_5
	user-manager.py 
Log Message:
update to 0.4.5.2  fixes bug in find to user-manager



Index: user-manager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/user-manager.py,v
retrieving revision 1.3.8.1
retrieving revision 1.3.8.2
diff -u -r1.3.8.1 -r1.3.8.2
--- user-manager.py	4 Sep 2008 02:14:21 -0000	1.3.8.1
+++ user-manager.py	4 Sep 2008 17:19:09 -0000	1.3.8.2
@@ -22,6 +22,8 @@
     import sqlite
 except ImportError, e:
     import pysqlite2._sqlite as sqlite
+sys.path.append('/usr/share/plague/server')
+from DBManager import ResultSet
 
 def print_usage(prog):
     print "Usage:\n"
@@ -178,7 +180,7 @@
 
         self.curs.execute(sql)
         self.dbcx.commit()
-        data = self.curs.fetchall()
+        data = [ResultSet(row,self.curs.description) for row in self.curs.fetchall()]
         if not len(data):
             raise UserManagerException("No matching users found.")
 



From ausil at fedoraproject.org  Thu Sep  4 17:19:39 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  4 Sep 2008 17:19:39 +0000 (UTC)
Subject: extras-buildsys ChangeLog, 1.126.2.44.2.1.2.15,
	1.126.2.44.2.1.2.16 plague.spec, 1.27.2.5.2.1.2.4, 1.27.2.5.2.1.2.5
Message-ID: <20080904171939.D461570120@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13119

Modified Files:
      Tag: Plague-0_4_5
	ChangeLog plague.spec 
Log Message:
update to 0.4.5.2  fixes bug in find to user-manager



Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.44.2.1.2.15
retrieving revision 1.126.2.44.2.1.2.16
diff -u -r1.126.2.44.2.1.2.15 -r1.126.2.44.2.1.2.16
--- ChangeLog	4 Sep 2008 02:14:18 -0000	1.126.2.44.2.1.2.15
+++ ChangeLog	4 Sep 2008 17:19:09 -0000	1.126.2.44.2.1.2.16
@@ -1,3 +1,7 @@
+2008-09-04  Dennis Gilmore <dennis at ausil.us>
+	* Release of 0.4.5.2
+	  - fix bug in find option for plague-user-manager
+
 2008-09-03  Dennis Gilmore <dennis at ausil.us>
         * Release of 0.4.5.1
 	   - require mock > 0.8


Index: plague.spec
===================================================================
RCS file: /cvs/fedora/extras-buildsys/plague.spec,v
retrieving revision 1.27.2.5.2.1.2.4
retrieving revision 1.27.2.5.2.1.2.5
diff -u -r1.27.2.5.2.1.2.4 -r1.27.2.5.2.1.2.5
--- plague.spec	4 Sep 2008 02:14:18 -0000	1.27.2.5.2.1.2.4
+++ plague.spec	4 Sep 2008 17:19:09 -0000	1.27.2.5.2.1.2.5
@@ -2,7 +2,7 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.1
+Version: 0.4.5.2
 Release: 0.1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -67,6 +67,7 @@
 Summary: Utility programs for the Plague build system
 Group: Development/Tools
 Requires: %{name}-common = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description utils
 This package includes user utilities for the Plague build system, including
@@ -159,6 +160,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.2
+- fix bug in find command to plague-user-manager
+
 * Wed Sep 03 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.1
 - make mock 0.8 or greater mandatory fedora and epel both have 0.9 series
 



From caolanm at fedoraproject.org  Thu Sep  4 17:27:46 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  4 Sep 2008 17:27:46 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch, NONE,
	1.1 openoffice.org.spec, 1.1637, 1.1638
Message-ID: <20080904172746.B564F70120@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15505

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch 
Log Message:
add openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch to get better
focus for new frames when already running and behind in stacking order



openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch:

--- NEW FILE openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch ---
Index: unx/gtk/window/gtkframe.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
retrieving revision 1.72.8.2
diff -u -r1.72.8.2 gtkframe.cxx
--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx	23 Jan 2008 17:17:10 -0000	1.72.8.2
+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx	4 Sep 2008 17:21:25 -0000
@@ -757,7 +768,8 @@
         nStyle &= ~SAL_FRAME_STYLE_FLOAT;
     }
 
-    m_pWindow = GTK_WINDOW( gtk_widget_new( GTK_TYPE_WINDOW, "type", ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL, "visible", FALSE, NULL ) );
+    GtkWindowType eWinType = ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL;
+    m_pWindow = GTK_WINDOW( gtk_widget_new( GTK_TYPE_WINDOW, "type", eWinType, "visible", FALSE, NULL ) );
 	g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", this );
 
     m_pParent = static_cast<GtkSalFrame*>(pParent);
@@ -820,6 +832,9 @@
 
     InitCommon();
 
+    if (eWinType == GTK_WINDOW_TOPLEVEL)
+        gdk_x11_window_set_user_time(GTK_WIDGET(m_pWindow)->window, GDK_CURRENT_TIME);
+
     if( bDecoHandling )
     {
         gtk_window_set_resizable( m_pWindow, (nStyle & SAL_FRAME_STYLE_SIZEABLE) ? TRUE : FALSE );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1637
retrieving revision 1.1638
diff -u -r1.1637 -r1.1638
--- openoffice.org.spec	3 Sep 2008 14:18:41 -0000	1.1637
+++ openoffice.org.spec	4 Sep 2008 17:27:15 -0000	1.1638
@@ -112,6 +112,7 @@
 Patch42: openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch
 Patch43: openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
 Patch44: openoffice.org-3.0.0.oooXXXXX.filter.latex.patch
+Patch45: openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1295,6 +1296,7 @@
 %patch42 -p1 -b .ooo93366.fpicker_in_main.patch
 %patch43 -p1 -b .ooo93419.svx.ref_deref.before.ctored.patch
 %patch44 -p1 -b .oooXXXXX.filter.latex.patch
+%patch45 -p1 -b .oooXXXXX.vcl.jrb-frames.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3650,12 +3652,14 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Sep 03 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-4.2
+* Thu Sep 04 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-4.2
 - Resolves: rhbz#460755 TryExec oowriter on brwriter.desktop etc
 - Resolves: rhbz#460883 openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
 - defuzz patches
 - add openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch
 - add openoffice.org-3.0.0.oooXXXXX.filter.latex.patch
+- add openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch to get better
+  focus for new frames when already running and behind in stacking order
 
 * Fri Aug 29 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-4.1
 - next milestone



From kkofler at fedoraproject.org  Thu Sep  4 17:34:16 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 17:34:16 +0000 (UTC)
Subject: rpms/kdewebdev/F-8 .cvsignore, 1.17, 1.18 kdewebdev.spec, 1.44,
	1.45 sources, 1.19, 1.20
Message-ID: <20080904173416.40DEE70120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdewebdev/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17727/F-8

Modified Files:
	.cvsignore kdewebdev.spec sources 
Log Message:
Sync from devel:

* Sat Aug 30 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-1
- update to 3.5.10

* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.9-4
- reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4)

* Fri Mar 28 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-3
- drop Requires: gnupg
- omit multilib upgrade hacks


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/F-8/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	16 Feb 2008 04:07:37 -0000	1.17
+++ .cvsignore	4 Sep 2008 17:33:45 -0000	1.18
@@ -3,4 +3,4 @@
 javascript.tar.bz2
 php_manual_en_20030401.tar.bz2
 hi48-app-kxsldbg.png
-kdewebdev-3.5.9.tar.bz2
+kdewebdev-3.5.10.tar.bz2


Index: kdewebdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/F-8/kdewebdev.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kdewebdev.spec	7 Mar 2008 21:18:20 -0000	1.44
+++ kdewebdev.spec	4 Sep 2008 17:33:45 -0000	1.45
@@ -9,8 +9,8 @@
 Name:    kdewebdev
 Summary: Web development applications 
 Epoch:   6
-Version: 3.5.9
-Release: 2%{?dist}
+Version: 3.5.10
+Release: 1%{?dist}
 
 License: GPLv2
 Url:     http://kdewebdev.org/ 
@@ -51,7 +51,7 @@
 %endif
 
 # optional
-Requires(hint): gnupg
+#Requires(hint): gnupg
 Requires(hint): tidy
 
 Provides: kdewebdev3 = %{version}-%{release}
@@ -88,8 +88,8 @@
 Group:   System Environment/Libraries
 Requires: kdelibs3 >= %{version}
 # helps multilib upgrades
-Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:  %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+#Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
+#Requires:  %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
 %{summary}.
 %endif
@@ -154,11 +154,6 @@
   done
 done
 
-%if 0%{?fedora} >= 9
-# remove crystalsvg bug.png which conflicts with the one from kdeartwork
-rm -rf %{buildroot}%{_datadir}/icons/crystalsvg/16x16/actions/
-%endif
-
 
 %post
 %{!?libs:/sbin/ldconfig}
@@ -220,6 +215,16 @@
 
 
 %changelog
+* Sat Aug 30 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-1
+- update to 3.5.10
+
+* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.9-4
+- reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4)
+
+* Fri Mar 28 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-3
+- drop Requires: gnupg
+- omit multilib upgrade hacks
+
 * Tue Mar 04 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-2
 - -libs: Requires: %%name, fixes "yum update removes kdewebdev" (#435956)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/F-8/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	16 Feb 2008 04:07:37 -0000	1.19
+++ sources	4 Sep 2008 17:33:45 -0000	1.20
@@ -3,4 +3,4 @@
 eea6e25a1c25af1f5a0c33e32e52c136  javascript.tar.bz2
 149607cecd4bf6783dc6e43a03b80138  php_manual_en_20030401.tar.bz2
 b2242db588538fb5f02bd0de196a872b  hi48-app-kxsldbg.png
-e95d1fbb698ec76966abfa5bdf96bd5e  kdewebdev-3.5.9.tar.bz2
+7188f351158ca5a7613c3de4a6854b37  kdewebdev-3.5.10.tar.bz2



From ausil at fedoraproject.org  Thu Sep  4 17:52:43 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  4 Sep 2008 17:52:43 +0000 (UTC)
Subject: rpms/plague/F-9 plague.spec,1.34,1.35 sources,1.27,1.28
Message-ID: <20080904175243.2A2F170120@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plague/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23363

Modified Files:
	plague.spec sources 
Log Message:
update to 0.4.5.2 fixxies minor bug



Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-9/plague.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- plague.spec	4 Sep 2008 02:23:39 -0000	1.34
+++ plague.spec	4 Sep 2008 17:52:12 -0000	1.35
@@ -2,7 +2,7 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.1
+Version: 0.4.5.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -71,6 +71,7 @@
 Summary: Utility programs for the Plague build system
 Group: Development/Tools
 Requires: %{name}-common = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description utils
 This package includes user utilities for the Plague build system, including
@@ -164,6 +165,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.2-1
+- fix bug in find option to plague-user-manager
+
 * Wed Sep 03 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.1-1
 - update to 0.4.5.1  applying Michael schwendt's logging and mock patches
 - using pysqlite2 on fedora and python-sqlite on RHEL


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-9/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	4 Sep 2008 02:23:39 -0000	1.27
+++ sources	4 Sep 2008 17:52:12 -0000	1.28
@@ -1 +1 @@
-99f5a996f16cddf3b8f4051068aa452a  plague-0.4.5.1.tar.bz2
+e7377cd89cf1f21ff8e4ac83c9d199d4  plague-0.4.5.2.tar.bz2



From dcbw at fedoraproject.org  Thu Sep  4 17:56:26 2008
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu,  4 Sep 2008 17:56:26 +0000 (UTC)
Subject: rpms/NetworkManager/F-9 wpa-adhoc-fix.patch, NONE,
	1.1 NetworkManager.spec, 1.237, 1.238
Message-ID: <20080904175626.426FA70120@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24524

Modified Files:
	NetworkManager.spec 
Added Files:
	wpa-adhoc-fix.patch 
Log Message:
* Thu Sep  4 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.1
- Fix WPA Ad-Hoc connections



wpa-adhoc-fix.patch:

--- NEW FILE wpa-adhoc-fix.patch ---
diff -up NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c.foo NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c
--- NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c.foo	2008-09-04 13:33:24.000000000 -0400
+++ NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c	2008-09-04 13:33:32.000000000 -0400
@@ -66,7 +66,7 @@ static const struct validate_entry valid
 const char * pairwise_allowed[] = { "CCMP", "TKIP", "NONE", NULL };
 const char * group_allowed[] =    { "CCMP", "TKIP", "WEP104", "WEP40", NULL };
 const char * proto_allowed[] =    { "WPA", "RSN", NULL };
-const char * key_mgmt_allowed[] = { "WPA-PSK", "WPA-EAP", "IEEE8021X",
+const char * key_mgmt_allowed[] = { "WPA-PSK", "WPA-EAP", "IEEE8021X", "WPA-NONE",
                                     "NONE", NULL };
 const char * auth_alg_allowed[] = { "OPEN", "SHARED", "LEAP", NULL };
 const char * eap_allowed[] =      { "LEAP", "MD5", "TLS", "PEAP", "TTLS", "SIM",


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- NetworkManager.spec	27 Aug 2008 20:33:13 -0000	1.237
+++ NetworkManager.spec	4 Sep 2008 17:55:55 -0000	1.238
@@ -16,7 +16,7 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.11.%{snapshot}%{?dist}
+Release: 0.11.%{snapshot}.1%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -28,6 +28,7 @@
 Patch3: old-dbus-glib.patch
 Patch4: serial-debug.patch
 Patch5: explain-dns1-dns2.patch
+Patch6: wpa-adhoc-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -153,6 +154,7 @@
 %patch3 -p1 -b .old-dbus-glib
 %patch4 -p1 -b .serial-debug
 %patch5 -p1 -b .explain-dns1-dns2
+%patch6 -p1 -b .wpa-adhoc-fix
 
 %build
 autoreconf -i
@@ -307,6 +309,9 @@
 %{_datadir}/gtk-doc/html/libnm-glib/
 
 %changelog
+* Thu Sep  4 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.1
+- Fix WPA Ad-Hoc connections
+
 * Wed Aug 27 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022
 - Fix parsing of DOMAIN in ifcfg files (rh #459370)
 - Fix reconnection to mobile broadband networks after an auth failure



From ausil at fedoraproject.org  Thu Sep  4 17:59:28 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  4 Sep 2008 17:59:28 +0000 (UTC)
Subject: rpms/plague/F-8 plague.spec,1.34,1.35 sources,1.27,1.28
Message-ID: <20080904175928.0811C70120@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plague/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25362

Modified Files:
	plague.spec sources 
Log Message:
update to 0.4.5.2 fixes minor bug



Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-8/plague.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- plague.spec	4 Sep 2008 02:25:52 -0000	1.34
+++ plague.spec	4 Sep 2008 17:58:57 -0000	1.35
@@ -2,7 +2,7 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.1
+Version: 0.4.5.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -71,6 +71,7 @@
 Summary: Utility programs for the Plague build system
 Group: Development/Tools
 Requires: %{name}-common = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description utils
 This package includes user utilities for the Plague build system, including
@@ -164,6 +165,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.2-1
+- fix bug in find option to plague-user-manager
+
 * Wed Sep 03 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.1-1
 - update to 0.4.5.1  applying Michael schwendt's logging and mock patches
 - using pysqlite2 on fedora and python-sqlite on RHEL


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-8/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	4 Sep 2008 02:25:52 -0000	1.27
+++ sources	4 Sep 2008 17:58:57 -0000	1.28
@@ -1 +1 @@
-99f5a996f16cddf3b8f4051068aa452a  plague-0.4.5.1.tar.bz2
+e7377cd89cf1f21ff8e4ac83c9d199d4  plague-0.4.5.2.tar.bz2



From ausil at fedoraproject.org  Thu Sep  4 17:43:08 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  4 Sep 2008 17:43:08 +0000 (UTC)
Subject: rpms/plague/devel .cvsignore, 1.13, 1.14 plague.spec, 1.35,
	1.36 sources, 1.27, 1.28
Message-ID: <20080904174308.B2A4F70120@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plague/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19830

Modified Files:
	.cvsignore plague.spec sources 
Log Message:
update to o.4.5.2  fixes bug in find option of plague-user-helper




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	4 Sep 2008 02:19:26 -0000	1.13
+++ .cvsignore	4 Sep 2008 17:42:38 -0000	1.14
@@ -1 +1 @@
-plague-0.4.5.1.tar.bz2
+plague-0.4.5.2.tar.bz2


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/plague.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- plague.spec	4 Sep 2008 02:19:26 -0000	1.35
+++ plague.spec	4 Sep 2008 17:42:38 -0000	1.36
@@ -2,7 +2,7 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.1
+Version: 0.4.5.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -71,6 +71,7 @@
 Summary: Utility programs for the Plague build system
 Group: Development/Tools
 Requires: %{name}-common = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description utils
 This package includes user utilities for the Plague build system, including
@@ -164,6 +165,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.2-1
+- fix bug in find option to plague-user-manager
+
 * Wed Sep 03 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.1-1
 - update to 0.4.5.1  applying Michael schwendt's logging and mock patches
 - using pysqlite2 on fedora and python-sqlite on RHEL


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	4 Sep 2008 02:19:26 -0000	1.27
+++ sources	4 Sep 2008 17:42:38 -0000	1.28
@@ -1 +1 @@
-99f5a996f16cddf3b8f4051068aa452a  plague-0.4.5.1.tar.bz2
+e7377cd89cf1f21ff8e4ac83c9d199d4  plague-0.4.5.2.tar.bz2



From dcbw at fedoraproject.org  Thu Sep  4 17:35:55 2008
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu,  4 Sep 2008 17:35:55 +0000 (UTC)
Subject: rpms/NetworkManager/devel wpa-adhoc-fix.patch, NONE,
	1.1 NetworkManager.spec, 1.236, 1.237
Message-ID: <20080904173555.C1E7F70120@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18303

Modified Files:
	NetworkManager.spec 
Added Files:
	wpa-adhoc-fix.patch 
Log Message:
* Thu Sep  4 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.1
- Fix WPA Ad-Hoc connections



wpa-adhoc-fix.patch:

--- NEW FILE wpa-adhoc-fix.patch ---
diff -up NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c.foo NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c
--- NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c.foo	2008-09-04 13:33:24.000000000 -0400
+++ NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c	2008-09-04 13:33:32.000000000 -0400
@@ -66,7 +66,7 @@ static const struct validate_entry valid
 const char * pairwise_allowed[] = { "CCMP", "TKIP", "NONE", NULL };
 const char * group_allowed[] =    { "CCMP", "TKIP", "WEP104", "WEP40", NULL };
 const char * proto_allowed[] =    { "WPA", "RSN", NULL };
-const char * key_mgmt_allowed[] = { "WPA-PSK", "WPA-EAP", "IEEE8021X",
+const char * key_mgmt_allowed[] = { "WPA-PSK", "WPA-EAP", "IEEE8021X", "WPA-NONE",
                                     "NONE", NULL };
 const char * auth_alg_allowed[] = { "OPEN", "SHARED", "LEAP", NULL };
 const char * eap_allowed[] =      { "LEAP", "MD5", "TLS", "PEAP", "TTLS", "SIM",


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- NetworkManager.spec	27 Aug 2008 20:56:34 -0000	1.236
+++ NetworkManager.spec	4 Sep 2008 17:35:25 -0000	1.237
@@ -16,7 +16,7 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.11.%{snapshot}%{?dist}
+Release: 0.11.%{snapshot}.1%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -26,6 +26,7 @@
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch4: serial-debug.patch
 Patch5: explain-dns1-dns2.patch
+Patch6: wpa-adhoc-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -146,6 +147,7 @@
 %patch1 -p1 -b .buildfix
 %patch4 -p1 -b .serial-debug
 %patch5 -p1 -b .explain-dns1-dns2
+%patch6 -p1 -b .wpa-adhoc-fix
 
 %build
 autoreconf -i
@@ -300,6 +302,9 @@
 %{_datadir}/gtk-doc/html/libnm-glib/
 
 %changelog
+* Thu Sep  4 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.1
+- Fix WPA Ad-Hoc connections
+
 * Wed Aug 27 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022
 - Fix parsing of DOMAIN in ifcfg files (rh #459370)
 - Fix reconnection to mobile broadband networks after an auth failure



From kwizart at fedoraproject.org  Thu Sep  4 18:12:50 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Thu,  4 Sep 2008 18:12:50 +0000 (UTC)
Subject: rpms/aimage/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 aimage.spec,
	1.1, 1.2
Message-ID: <20080904181250.DCE5870120@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/aimage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29241

Modified Files:
	.cvsignore sources aimage.spec 
Log Message:
- Update to 3.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aimage/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Mar 2008 14:10:51 -0000	1.2
+++ .cvsignore	4 Sep 2008 18:12:20 -0000	1.3
@@ -1 +1 @@
-aimage-3.1.0.tar.gz
+aimage-3.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aimage/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Mar 2008 14:10:51 -0000	1.2
+++ sources	4 Sep 2008 18:12:20 -0000	1.3
@@ -1 +1 @@
-b9fa654161a76f817f5f3dd1e2b74984  aimage-3.1.0.tar.gz
+5e9ac74251977832d05da74683698a31  aimage-3.1.2.tar.gz


Index: aimage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aimage/devel/aimage.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aimage.spec	25 Mar 2008 14:10:51 -0000	1.1
+++ aimage.spec	4 Sep 2008 18:12:20 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           aimage
-Version:        3.1.0
+Version:        3.1.2
 Release:        1%{?dist}
 Summary:        Advanced Disk Imager
 
@@ -42,5 +42,8 @@
 
 
 %changelog
+* Thu Sep  4 2008 kwizart < kwizart at gmail.com > - 3.1.2-1
+- Update to 3.1.2
+
 * Wed Mar 12 2008 kwizart < kwizart at gmail.com > - 3.1.0-1
 - Initial spec file



From mgarski at fedoraproject.org  Thu Sep  4 18:16:52 2008
From: mgarski at fedoraproject.org (Marcin Garski)
Date: Thu,  4 Sep 2008 18:16:52 +0000 (UTC)
Subject: rpms/smb4k/devel .cvsignore, 1.25, 1.26 smb4k.spec, 1.36,
	1.37 sources, 1.25, 1.26
Message-ID: <20080904181652.D452470120@cvs1.fedora.phx.redhat.com>

Author: mgarski

Update of /cvs/pkgs/rpms/smb4k/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30538

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Update to 0.10.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Jul 2008 16:21:33 -0000	1.25
+++ .cvsignore	4 Sep 2008 18:16:22 -0000	1.26
@@ -1 +1 @@
-smb4k-0.9.6.tar.bz2
+smb4k-0.10.0.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/devel/smb4k.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- smb4k.spec	30 Jul 2008 16:21:33 -0000	1.36
+++ smb4k.spec	4 Sep 2008 18:16:22 -0000	1.37
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.9.6
+Version:	0.10.0
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -9,7 +9,8 @@
 Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	kdelibs3-devel kdebase3-devel gettext desktop-file-utils
+BuildRequires:	cmake >= 2.6.0
+BuildRequires:	kdelibs-devel >= 4.1.0 desktop-file-utils
 Requires:	samba-client
 
 %description
@@ -30,27 +31,23 @@
 %setup -q
 
 %build
-unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
 
-%configure \
-	--disable-rpath \
-	--disable-debug \
-	--disable-dependency-tracking \
-	--with-konqplugin=no
-# Broken on 0.7.0
-#	--enable-final
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 desktop-file-install --vendor="" \
-	--dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+	--dir=%{buildroot}%{_datadir}/applications/kde4 \
 	--add-category Network \
 	--add-category FileTransfer \
 	--add-category FileManager \
-	$RPM_BUILD_ROOT%{_datadir}/applications/kde/smb4k.desktop
+	%{buildroot}%{_datadir}/applications/kde4/smb4k.desktop
 
 # Make symlink relative
 pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en/smb4k/
@@ -59,48 +56,47 @@
 
 %find_lang %{name}
 
-# Bug #435149
-#rm -f $RPM_BUILD_ROOT%{_libdir}/libsmb4k*.la
-
 %post
 /sbin/ldconfig
 
-touch --no-create %{_datadir}/icons/crystalsvg || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-fi
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
 /sbin/ldconfig
 
-touch --no-create %{_datadir}/icons/crystalsvg || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-fi
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS ChangeLog COPYING FAQ README TODO
-%{_bindir}/*
-%{_libdir}/kde3/libsmb4k*.*
-%{_libdir}/libsmb4k*.la
-%{_libdir}/libsmb4kdialogs.so
-%{_libdir}/libsmb4k*.so.*
-%{_datadir}/applications/kde/smb4k.desktop
-%{_datadir}/apps/smb4k*/
-%{_datadir}/config.kcfg/smb4k.kcfg
-%{_docdir}/HTML/en/smb4k/
-%{_datadir}/icons/crystalsvg/*/apps/smb4k.png
+%{_kde4_bindir}/*
+%{_kde4_libdir}/kde4/libsmb4k*.*
+%{_kde4_libdir}/libsmb4k*.so.*
+%{_kde4_libdir}/libsmb4kdialogs.so
+%{_kde4_datadir}/applications/kde4/smb4k.desktop
+%{_kde4_datadir}/config.kcfg/smb4k.kcfg
+%{_kde4_docdir}/HTML/en/smb4k/
+%{_kde4_iconsdir}/hicolor/*/apps/smb4k.png
+%{_kde4_iconsdir}/oxygen/*/apps/smb4k.png
+%{_kde4_datadir}/kde4/apps/kconf_update/*
+%{_kde4_datadir}/kde4/apps/smb4k/
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/smb4k*.h
+%{_kde4_includedir}/smb4k*.h
 %{_libdir}/libsmb4kc*.so
 
 %changelog
+* Thu Sep 04 2008 Marcin Garski <mgarski[AT]post.pl> 0.10.0-1
+- Update to 0.10.0
+
 * Wed Jul 30 2008 Marcin Garski <mgarski[AT]post.pl> 0.9.6-1
 - Update to 0.9.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Jul 2008 16:21:33 -0000	1.25
+++ sources	4 Sep 2008 18:16:22 -0000	1.26
@@ -1 +1 @@
-e02948415fc2b56c4f6bf0c6dff9dbad  smb4k-0.9.6.tar.bz2
+9b41d9041894abc1c8cc5c71e58d3ec2  smb4k-0.10.0.tar.bz2



From ausil at fedoraproject.org  Thu Sep  4 18:18:09 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  4 Sep 2008 18:18:09 +0000 (UTC)
Subject: rpms/plague/EL-5 plague.spec,1.29,1.30 sources,1.26,1.27
Message-ID: <20080904181809.5F22570120@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plague/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27300

Modified Files:
	plague.spec sources 
Log Message:
update to 0.4.5.2 small bugfix



Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/EL-5/plague.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- plague.spec	4 Sep 2008 02:28:03 -0000	1.29
+++ plague.spec	4 Sep 2008 18:17:39 -0000	1.30
@@ -2,7 +2,7 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.1
+Version: 0.4.5.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -71,6 +71,7 @@
 Summary: Utility programs for the Plague build system
 Group: Development/Tools
 Requires: %{name}-common = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description utils
 This package includes user utilities for the Plague build system, including
@@ -164,6 +165,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.2-1
+- fix bug in find option to plague-user-manager
+
 * Wed Sep 03 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.1-1
 - update to 0.4.5.1  applying Michael schwendt's logging and mock patches
 - using pysqlite2 on fedora and python-sqlite on RHEL


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/EL-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	4 Sep 2008 02:28:03 -0000	1.26
+++ sources	4 Sep 2008 18:17:39 -0000	1.27
@@ -1 +1 @@
-99f5a996f16cddf3b8f4051068aa452a  plague-0.4.5.1.tar.bz2
+e7377cd89cf1f21ff8e4ac83c9d199d4  plague-0.4.5.2.tar.bz2



From kkofler at fedoraproject.org  Thu Sep  4 17:46:11 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 17:46:11 +0000 (UTC)
Subject: rpms/kdevelop/F-8 .cvsignore, 1.34, 1.35 kdevelop.spec, 1.68,
	1.69 sources, 1.37, 1.38 kdevelop-3.5.0-svn.patch, 1.1, NONE
Message-ID: <20080904174611.8812770120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdevelop/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21490/F-8

Modified Files:
	.cvsignore kdevelop.spec sources 
Removed Files:
	kdevelop-3.5.0-svn.patch 
Log Message:
Sync from devel:

* Sat Aug 30 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 9:3.5.3-1
- update to 3.5.3
- drop svn patch (fixed upstream)

* Mon Jul 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 9:3.5.2-3
- fix FTBFS (add BR openldap-devel to work around missing dep in apr-devel)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/F-8/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	19 May 2008 09:47:05 -0000	1.34
+++ .cvsignore	4 Sep 2008 17:45:41 -0000	1.35
@@ -1,2 +1,2 @@
 c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-kdevelop-3.5.2.tar.bz2
+kdevelop-3.5.3.tar.bz2


Index: kdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/F-8/kdevelop.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- kdevelop.spec	6 Jun 2008 22:12:19 -0000	1.68
+++ kdevelop.spec	4 Sep 2008 17:45:41 -0000	1.69
@@ -1,3 +1,4 @@
+%define _default_patch_fuzz 2
 
 %define debug 0
 %define final 1 
@@ -18,8 +19,8 @@
 Name:    kdevelop
 Summary: Integrated Development Environment for C++/C
 Epoch:   9
-Version: 3.5.2
-Release: 2%{?dist}
+Version: 3.5.3
+Release: 1%{?dist}
 
 License: GPLv2
 URL: http://www.kdevelop.org/
@@ -31,7 +32,6 @@
 
 Patch1: c_cpp_reference-2.0.2-config.patch
 Patch2: kdevelop-2.1.5_for_KDE_3.1-doc.patch
-Patch3: kdevelop-3.5.0-svn.patch
 # improved integration for the KDE 4 template - no special KDE 4 build environment needed in Fedora
 Patch4: kdevelop-3.5.2-kde4template.patch
 
@@ -86,6 +86,9 @@
 BuildRequires: kdesdk3-devel
 %endif
 BuildRequires: subversion-devel neon-devel
+# looks like this is dragged in by apr-devel (dep of subversion-devel), but not
+# a dependency
+BuildRequires: openldap-devel
 
 ## ancient, deprecated?  -- Rex
 #Obsoletes: kdevelop-c_c++_ref
@@ -143,7 +146,6 @@
 %setup -q -a1
 %patch1 -p0 -b .config
 %patch2 -p1 -b .doc
-%patch3 -p1 -b .svn
 %patch4 -p1 -b .kde4template
 
 %if %{make_cvs}
@@ -254,6 +256,13 @@
 
 
 %changelog
+* Sat Aug 30 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 9:3.5.3-1
+- update to 3.5.3
+- drop svn patch (fixed upstream)
+
+* Mon Jul 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 9:3.5.2-3
+- fix FTBFS (add BR openldap-devel to work around missing dep in apr-devel)
+
 * Fri Jun 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 9:3.5.2-2
 - improve integration of the KDE 4 app template
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/F-8/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	19 May 2008 09:47:05 -0000	1.37
+++ sources	4 Sep 2008 17:45:41 -0000	1.38
@@ -1,2 +1,2 @@
 5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-21c5085a4af3577d1d15fd169eb672a2  kdevelop-3.5.2.tar.bz2
+a2cdb5f71952386798175f8ce5a3e196  kdevelop-3.5.3.tar.bz2


--- kdevelop-3.5.0-svn.patch DELETED ---



From steved at fedoraproject.org  Thu Sep  4 18:18:52 2008
From: steved at fedoraproject.org (Steve Dickson)
Date: Thu,  4 Sep 2008 18:18:52 +0000 (UTC)
Subject: rpms/libtirpc/devel libtirpc-0.1.9-ipv6-socket.patch, NONE,
	1.1 libtirpc-0.1.9-rpc_getbroadifs-sizeof.patch, NONE,
	1.1 libtirpc.spec, 1.32, 1.33
Message-ID: <20080904181852.56DD970120@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/libtirpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31266

Modified Files:
	libtirpc.spec 
Added Files:
	libtirpc-0.1.9-ipv6-socket.patch 
	libtirpc-0.1.9-rpc_getbroadifs-sizeof.patch 
Log Message:
- Always make IPv6 sockets V6ONLY
- Fix incorrect sizeof() in __rpc_getbroadifs


libtirpc-0.1.9-ipv6-socket.patch:

--- NEW FILE libtirpc-0.1.9-ipv6-socket.patch ---
commit ea9f048761d0b9a2ab6310bffa07351f0b04d8c5
Author: Olaf Kirch <okir at suse.de>
Date:   Tue Sep 2 12:11:15 2008 -0400

    Always make IPv6 sockets V6ONLY
    
    Assume you have a netconfig file looking like this:
    
    udp        tpi_clts      v     inet     udp     -       -
    udp6       tpi_clts      v     inet6    udp     -       -
    ...
    
    a call to svc_tli_create(... &someaddr, "udp") will fail to create an
    IPv6 server socket. The problem is that on Linux, passive IPv6 sockets
    will also accept packets/connections from IPv4, and will simply map
    the sender's address to an IPv6 mapped IPv4 address. So if you want to
    bind both a UDPv4 and UDPv6 socket to the same port, this will fail with
    EADDRINUSE.
    
    The way to avoid this behavior is to change the socket to V6ONLY,
    which tells the kernel to avoid the autmatic mapping.
    
    The change proposed in the patch below does this. I *think* this is
    a good place to do this, as it will also fix applications that do not
    use svc_tli_create() - such as rpcbind, which creates the sockets on
    its own using __rpc_nconf2fd.
    
    I think this also improves portability, as BSD code assumes BSD
    behavior, where this mapping does not occur either.
    
    Signed-off-by: Olaf Kirch <okir at suse.de>
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/src/rpc_generic.c b/src/rpc_generic.c
index 583aff0..ff4ba16 100644
--- a/src/rpc_generic.c
+++ b/src/rpc_generic.c
@@ -525,11 +525,18 @@ int
 __rpc_nconf2fd(const struct netconfig *nconf)
 {
 	struct __rpc_sockinfo si;
+	int fd;
 
 	if (!__rpc_nconf2sockinfo(nconf, &si))
 		return 0;
 
-	return socket(si.si_af, si.si_socktype, si.si_proto);
+	if ((fd = socket(si.si_af, si.si_socktype, si.si_proto)) >= 0 &&
+	    si.si_af == AF_INET6) {
+		int val = 1;
+
+		setsockopt(fd, SOL_IPV6, IPV6_V6ONLY, &val, sizeof(val));
+	}
+	return fd;
 }
 
 int

libtirpc-0.1.9-rpc_getbroadifs-sizeof.patch:

--- NEW FILE libtirpc-0.1.9-rpc_getbroadifs-sizeof.patch ---
commit 95c8f7227e6b15f2e430d7b87dadc95b2acd4a61
Author: Olaf Kirch <okir at suse.de>
Date:   Tue Sep 2 12:09:39 2008 -0400

    Fix incorrect sizeof() in __rpc_getbroadifs
    
    __rpc_getbroadifs returns bad broadcast addresses on 32bit
    machines because when copying the broadcast addresses, ite
    applies the sizeof() operator to a pointer to a sockaddr,
    rather than the sockaddr itself.
    
    Signed-off-by: Olaf Kirch <okir at suse.de>
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/src/clnt_bcast.c b/src/clnt_bcast.c
index a96db45..aa2b8f2 100644
--- a/src/clnt_bcast.c
+++ b/src/clnt_bcast.c
@@ -163,7 +163,7 @@ __rpc_getbroadifs(int af, int proto, int socktype, broadlist_t *list)
 		  /*	memcpy(&bip->broadaddr, ifap->ifa_broadaddr,
 			(size_t)ifap->ifa_broadaddr->sa_len);*/
 			memcpy(&bip->broadaddr, ifap->ifa_broadaddr,
-			(size_t)sizeof(ifap->ifa_broadaddr));
+					sizeof(bip->broadaddr));
 			sin = (struct sockaddr_in *)(void *)&bip->broadaddr;
 			sin->sin_port =
 			    ((struct sockaddr_in *)


Index: libtirpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtirpc/devel/libtirpc.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libtirpc.spec	7 Aug 2008 15:52:20 -0000	1.32
+++ libtirpc.spec	4 Sep 2008 18:18:22 -0000	1.33
@@ -1,6 +1,6 @@
 Name:		   libtirpc
 Version:		0.1.9
-Release:		3%{?dist}
+Release:		4%{?dist}
 Summary:		Transport Independent RPC Library
 Group:		  	System Environment/Libraries
 License:		SISSL
@@ -30,6 +30,9 @@
 Requires:	%{name} = %{version}-%{release}
 Requires(devel):	pkgconfig man
 
+Patch01:  libtirpc-0.1.9-rpc_getbroadifs-sizeof.patch
+Patch02:  libtirpc-0.1.9-ipv6-socket.patch
+
 Patch100: libtirpc-0.1.7-compile.patch
 
 %description devel
@@ -40,6 +43,9 @@
 %prep
 %setup -q
 
+%patch01	-p1
+%patch02	-p1
+
 %patch100	-p1
 
 # Remove .orig files
@@ -137,6 +143,10 @@
 %{_mandir}/*/*
 
 %changelog
+* Thu Sep  4 2008 Steve Dickson <steved at redhat.com> 0.1.9-4
+- Always make IPv6 sockets V6ONLY
+- Fix incorrect sizeof() in __rpc_getbroadifs
+
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.1.9-3
 - fix license tag
 



From arbiter at fedoraproject.org  Thu Sep  4 18:22:23 2008
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Thu,  4 Sep 2008 18:22:23 +0000 (UTC)
Subject: rpms/automoc/devel .cvsignore, 1.4, 1.5 automoc.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <20080904182223.C085670120@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/automoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32665

Modified Files:
	.cvsignore automoc.spec sources 
Log Message:
0.9.87


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/automoc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Jul 2008 12:15:46 -0000	1.4
+++ .cvsignore	4 Sep 2008 18:21:53 -0000	1.5
@@ -1 +1,2 @@
 automoc4-0.9.84.tar.bz2
+automoc4-0.9.87.tar.bz2


Index: automoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/automoc/devel/automoc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- automoc.spec	23 Jul 2008 12:36:03 -0000	1.10
+++ automoc.spec	4 Sep 2008 18:21:53 -0000	1.11
@@ -1,15 +1,16 @@
 #define snaptag .20080527svn811390
-%define beta 0.9.84
-%define beta_tag rc1 
+%define beta 0.9.87
+%define beta_tag rc2
 
 Name:           automoc
 Version:        1.0
-Release:        0.8.%{?beta_tag}%{?dist}
+Release:        0.9.%{?beta_tag}%{?dist}
 Summary:        KDE4 automoc
 Group:          Development/Tools
 License:        BSD
 URL:            http://www.kde.org
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/4.0.94/support/automoc4-%{beta}.tar.bz2
+#Source0:        ftp://ftp.kde.org/pub/kde/unstable/4.0.94/support/automoc4-%{beta}.tar.bz2
+Source0:	automoc4-%{beta}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides: automoc4 = %{beta}
@@ -50,6 +51,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 1.0-0.9.rc2
+- automoc4-0.9.87 (1.0-rc2)
+
 * Wed Jul 23 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0-0.8.rc1
 - automoc4-0.9.84 (1.0-rc1)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/automoc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Jul 2008 12:15:46 -0000	1.4
+++ sources	4 Sep 2008 18:21:53 -0000	1.5
@@ -1 +1,2 @@
 6e1167594b8edd0fd2156aad75b4b2b0  automoc4-0.9.84.tar.bz2
+f7d7fa4e948bfdc720ae4996a1ae07ee  automoc4-0.9.87.tar.bz2



From ajax at fedoraproject.org  Thu Sep  4 18:26:53 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  4 Sep 2008 18:26:53 +0000 (UTC)
Subject: rpms/libXScrnSaver/devel import.log, NONE, 1.1 .cvsignore, 1.10,
	1.11 libXScrnSaver.spec, 1.26, 1.27 sources, 1.10, 1.11
Message-ID: <20080904182653.452AE70120@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXScrnSaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1791/devel

Modified Files:
	.cvsignore libXScrnSaver.spec sources 
Added Files:
	import.log 
Log Message:
libXScrnSaver 1.1.3



--- NEW FILE import.log ---
libXScrnSaver-1_1_3-1_fc10:HEAD:libXScrnSaver-1.1.3-1.fc10.src.rpm:1220552759


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXScrnSaver/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Jan 2007 23:50:03 -0000	1.10
+++ .cvsignore	4 Sep 2008 18:26:22 -0000	1.11
@@ -1 +1 @@
-libXScrnSaver-1.1.2.tar.bz2
+libXScrnSaver-1.1.3.tar.bz2


Index: libXScrnSaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXScrnSaver/devel/libXScrnSaver.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libXScrnSaver.spec	15 Jul 2008 17:25:24 -0000	1.26
+++ libXScrnSaver.spec	4 Sep 2008 18:26:22 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXss runtime library
 Name: libXScrnSaver
-Version: 1.1.2
-Release: 5%{?dist}
+Version: 1.1.3
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -83,6 +83,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Sep 04 2008 Adam Jackson <ajax at redhat.com> 1.1.3-1
+- libXScrnSaver 1.1.3
+
 * Tue Jul 15 2008 Adam Jackson <ajax at redhat.com> 1.1.2-5
 - Fix license tag.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXScrnSaver/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	5 Jan 2007 23:50:03 -0000	1.10
+++ sources	4 Sep 2008 18:26:22 -0000	1.11
@@ -1 +1 @@
-ac2d697dd02f51e5c15f7104f4be5328  libXScrnSaver-1.1.2.tar.bz2
+93f84b6797f2f29cae1ce23b0355d00d  libXScrnSaver-1.1.3.tar.bz2



From ajax at fedoraproject.org  Thu Sep  4 18:32:05 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  4 Sep 2008 18:32:05 +0000 (UTC)
Subject: rpms/libXau/devel import.log, NONE, 1.1 .cvsignore, 1.9,
	1.10 libXau.spec, 1.22, 1.23 sources, 1.10, 1.11
Message-ID: <20080904183205.C9E6D70124@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3863/devel

Modified Files:
	.cvsignore libXau.spec sources 
Added Files:
	import.log 
Log Message:
libXau 1.0.4



--- NEW FILE import.log ---
libXau-1_0_4-1_fc10:HEAD:libXau-1.0.4-1.fc10.src.rpm:1220553075


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXau/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	6 Jan 2007 00:00:42 -0000	1.9
+++ .cvsignore	4 Sep 2008 18:31:35 -0000	1.10
@@ -1 +1 @@
-libXau-1.0.3.tar.bz2
+libXau-1.0.4.tar.bz2


Index: libXau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXau/devel/libXau.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libXau.spec	15 Jul 2008 17:26:26 -0000	1.22
+++ libXau.spec	4 Sep 2008 18:31:35 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXau runtime library
 Name: libXau
-Version: 1.0.3
-Release: 6%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -79,6 +79,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Sep 04 2008 Adam Jackson <ajax at redhat.com> 1.0.4-1
+- libXau 1.0.4
+
 * Tue Jul 15 2008 Adam Jackson <ajax at redhat.com> 1.0.3-6
 - Fix license tag.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXau/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	6 Jan 2007 00:00:42 -0000	1.10
+++ sources	4 Sep 2008 18:31:35 -0000	1.11
@@ -1 +1 @@
-75a9f2b85cd1617b5ca98c9095323853  libXau-1.0.3.tar.bz2
+0f2b88d857e0a3f5898e4759c541af46  libXau-1.0.4.tar.bz2



From lennart at fedoraproject.org  Thu Sep  4 18:36:33 2008
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Thu,  4 Sep 2008 18:36:33 +0000 (UTC)
Subject: rpms/bluez-libs/devel .cvsignore, 1.41, 1.42 bluez-libs.spec, 1.58, 
	1.59 sources, 1.41, 1.42
Message-ID: <20080904183633.C233970120@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/bluez-libs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5564

Modified Files:
	.cvsignore bluez-libs.spec sources 
Log Message:
Update to 3.36


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-libs/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	3 Jul 2008 15:53:38 -0000	1.41
+++ .cvsignore	4 Sep 2008 18:36:03 -0000	1.42
@@ -1 +1 @@
-bluez-libs-3.35.tar.gz
+bluez-libs-3.36.tar.gz


Index: bluez-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-libs/devel/bluez-libs.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- bluez-libs.spec	3 Jul 2008 15:53:38 -0000	1.58
+++ bluez-libs.spec	4 Sep 2008 18:36:03 -0000	1.59
@@ -1,6 +1,6 @@
 Summary: Bluetooth libraries
 Name: bluez-libs
-Version: 3.35
+Version: 3.36
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -63,6 +63,9 @@
 %{_libdir}/pkgconfig/bluez.pc
 
 %changelog
+* Thu Sep 04 2008 - Lennart Poettering <lpoetter at redhat.com> - 3.36-1
+- Update to 3.36
+
 * Thu Jul 03 2008 - Bastien Nocera <bnocera at redhat.com> - 3.35-1
 - Update to 3.35
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-libs/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	3 Jul 2008 15:53:38 -0000	1.41
+++ sources	4 Sep 2008 18:36:03 -0000	1.42
@@ -1 +1 @@
-2682b84da32cd78b48982d1d69ba637c  bluez-libs-3.35.tar.gz
+8c2ca546c0e7bb73dbd0e906fce7f6b1  bluez-libs-3.36.tar.gz



From mgarski at fedoraproject.org  Thu Sep  4 18:50:32 2008
From: mgarski at fedoraproject.org (Marcin Garski)
Date: Thu,  4 Sep 2008 18:50:32 +0000 (UTC)
Subject: rpms/smb4k/devel smb4k.spec,1.37,1.38
Message-ID: <20080904185032.A527470120@cvs1.fedora.phx.redhat.com>

Author: mgarski

Update of /cvs/pkgs/rpms/smb4k/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8353

Modified Files:
	smb4k.spec 
Log Message:
+BR: gettext



Index: smb4k.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/devel/smb4k.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- smb4k.spec	4 Sep 2008 18:16:22 -0000	1.37
+++ smb4k.spec	4 Sep 2008 18:50:02 -0000	1.38
@@ -1,6 +1,6 @@
 Name:		smb4k
 Version:	0.10.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
 Group:		Applications/Internet
@@ -10,7 +10,9 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.6.0
-BuildRequires:	kdelibs-devel >= 4.1.0 desktop-file-utils
+BuildRequires:	kdelibs-devel >= 4.1.0
+BuildRequires:	gettext
+BuildRequires:	desktop-file-utils
 Requires:	samba-client
 
 %description
@@ -94,7 +96,7 @@
 %{_libdir}/libsmb4kc*.so
 
 %changelog
-* Thu Sep 04 2008 Marcin Garski <mgarski[AT]post.pl> 0.10.0-1
+* Thu Sep 04 2008 Marcin Garski <mgarski[AT]post.pl> 0.10.0-2
 - Update to 0.10.0
 
 * Wed Jul 30 2008 Marcin Garski <mgarski[AT]post.pl> 0.9.6-1



From spot at fedoraproject.org  Thu Sep  4 18:51:55 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 18:51:55 +0000 (UTC)
Subject: rpms/sinjdoc/devel sinjdoc.spec,1.6,1.7
Message-ID: <20080904185155.B54A970120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sinjdoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8736

Modified Files:
	sinjdoc.spec 
Log Message:
fix license tag


Index: sinjdoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sinjdoc/devel/sinjdoc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sinjdoc.spec	19 Feb 2008 03:05:13 -0000	1.6
+++ sinjdoc.spec	4 Sep 2008 18:51:25 -0000	1.7
@@ -1,10 +1,11 @@
 Name:           sinjdoc
 Version:        0.5
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Documentation generator for Java source code
 
 Group:          Development/Tools
-License:        GPL
+# No version given.
+License:        GPL+
 URL:            http://cscott.net/Projects/GJ/sinjdoc-latest/
 Source0:        http://cscott.net/Projects/GJ/sinjdoc-latest/sinjdoc-0.5.tar.gz
 Patch0:         sinjdoc-annotations.patch
@@ -77,6 +78,9 @@
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5-7
+- fix license tag
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5-6
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Thu Sep  4 18:55:29 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 18:55:29 +0000 (UTC)
Subject: rpms/sharutils/devel sharutils.spec,1.29,1.30
Message-ID: <20080904185530.0525270120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sharutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9791

Modified Files:
	sharutils.spec 
Log Message:
fix license tag, update to 4.7, cleanup spec


Index: sharutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sharutils/devel/sharutils.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sharutils.spec	19 Feb 2008 10:09:40 -0000	1.29
+++ sharutils.spec	4 Sep 2008 18:54:59 -0000	1.30
@@ -1,14 +1,15 @@
-Summary: The GNU shar utilities for packaging and unpackaging shell archives.
+Summary: The GNU shar utilities for packaging and unpackaging shell archives
 Name: sharutils
-Version: 4.6.3
-Release: 2%{?dist}
-License: GPL
+Version: 4.7
+Release: 1%{?dist}
+License: GPLv3+
 Group: Applications/Archiving
 Source: ftp://ftp.gnu.org/gnu/sharutils/REL-%{version}/sharutils-%{version}.tar.bz2
 URL: http://www.gnu.org/software/sharutils/
 BuildRequires: gettext
-Prereq: /sbin/install-info
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires(pre): info
+Requires(preun): info
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The sharutils package contains the GNU shar utilities, a set of tools
@@ -23,44 +24,55 @@
 strips off mail headers and introductory text and then unpacks the
 shar files.
 
-Install sharutils if you send binary files through e-mail.
-
 %prep
 %setup -q
 
+# convert TODO, THANKS to UTF-8
+for i in TODO THANKS; do
+  iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,}
+  mv $i{.utf8,}
+done
+
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-
-%makeinstall
+make DESTDIR=${RPM_BUILD_ROOT} INSTALL='install -p' install
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
-mkdir -p ${RPM_BUILD_ROOT}%{_docdir}-%{name}-%{version}
 chmod 644 AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 
+%check
+make check
+
 %find_lang %{name}
 
 %post
-/sbin/install-info %{_infodir}/sharutils.info.gz %{_infodir}/dir ||:
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir ||:
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/sharutils.info.gz %{_infodir}/dir ||:
+    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir ||:
 fi
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %{_bindir}/*
 %{_infodir}/*info*
-%{_mandir}/*/*
+%{_mandir}/man1/*
+%{_mandir}/man5/*
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.7-1
+- update to 4.7
+- fix license tag
+- package cleanups
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 4.6.3-2
 - Autorebuild for GCC 4.3
 
@@ -158,7 +170,7 @@
 - rebuilt in the new build environment
 
 * Thu Jun 08 2000 Than Ngo <than at redhat.de>
-- add %defattr(-,root,root) (Bug# 11990)
+- add %%defattr(-,root,root) (Bug# 11990)
 - use rpm macros
 
 * Sun May 21 2000 Ngo Than <than at redhat.de>



From walters at fedoraproject.org  Thu Sep  4 19:00:46 2008
From: walters at fedoraproject.org (Colin Walters)
Date: Thu,  4 Sep 2008 19:00:46 +0000 (UTC)
Subject: rpms/jna/devel jna.spec,1.3,1.4
Message-ID: <20080904190046.86D2870120@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/jna/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11366

Modified Files:
	jna.spec 
Log Message:
* Thu Sep 04 2008 Colin Walters <walters at redhat.com> - 3.0.4-2.svn630
- Add two (sent upstream) patches that I need for JGIR



Index: jna.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jna/devel/jna.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jna.spec	31 Jul 2008 20:30:35 -0000	1.3
+++ jna.spec	4 Sep 2008 19:00:16 -0000	1.4
@@ -16,6 +16,10 @@
 Patch1:         jna-3.0.2-loadlibrary.patch
 # Will send upstream...
 Patch2:         jna-3.0.4-nomixedjar.patch
+# https://jna.dev.java.net/issues/show_bug.cgi?id=84
+Patch3:         jna-3.0.4-callbacks-typemappers.patch
+# https://jna.dev.java.net/issues/show_bug.cgi?id=XXX
+Patch4:         jna-3.0.4-callbacks-methodname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  java-devel >= 1.6 ant jpackage-utils ant-nodeps
@@ -47,6 +51,8 @@
 %setup -q -n %{name}-%{version}-svn630
 sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH1} | patch -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 # all java binaries must be removed from the sources
 find . -name '*.jar' -exec rm -f '{}' \;
@@ -103,6 +109,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Colin Walters <walters at redhat.com> - 3.0.4-2.svn630
+- Add two (sent upstream) patches that I need for JGIR
+
 * Thu Jul 31 2008 Colin Walters <walters at redhat.com> - 3.0.4-1.svn630
 - New upstream version, drop upstreamed patch parts
 - New patch jna-3.0.4-nomixedjar.patch which ensures that we don't



From walters at fedoraproject.org  Thu Sep  4 19:01:15 2008
From: walters at fedoraproject.org (Colin Walters)
Date: Thu,  4 Sep 2008 19:01:15 +0000 (UTC)
Subject: rpms/jna/devel jna.spec,1.4,1.5
Message-ID: <20080904190115.CEDA370120@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/jna/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11540

Modified Files:
	jna.spec 
Log Message:
increment integer


Index: jna.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jna/devel/jna.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jna.spec	4 Sep 2008 19:00:16 -0000	1.4
+++ jna.spec	4 Sep 2008 19:00:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           jna
 Version:        3.0.4
-Release:        1.svn630%{?dist}
+Release:        2.svn630%{?dist}
 Summary:        Pure Java access to native libraries
 
 Group:          Development/Libraries



From lennart at fedoraproject.org  Thu Sep  4 19:02:48 2008
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Thu,  4 Sep 2008 19:02:48 +0000 (UTC)
Subject: rpms/bluez-utils/devel .cvsignore, 1.39, 1.40 bluez-utils.spec,
	1.113, 1.114 sources, 1.39, 1.40
Message-ID: <20080904190248.288A170120@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/bluez-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12133

Modified Files:
	.cvsignore bluez-utils.spec sources 
Log Message:
Update to 3.36


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	3 Jul 2008 15:56:21 -0000	1.39
+++ .cvsignore	4 Sep 2008 19:02:17 -0000	1.40
@@ -1 +1 @@
-bluez-utils-3.35.tar.gz
+bluez-utils-3.36.tar.gz


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- bluez-utils.spec	11 Aug 2008 15:55:35 -0000	1.113
+++ bluez-utils.spec	4 Sep 2008 19:02:17 -0000	1.114
@@ -2,8 +2,8 @@
 
 Summary: Bluetooth utilities 
 Name: bluez-utils
-Version: 3.35
-Release: 4%{?dist}
+Version: 3.36
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -165,6 +165,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Thu Sep 04 2008 - Lennart Poettering <lpoetter at redhat.com> - 3.36-1
+- Update to 3.36
+
 * Mon Aug 11 2008 - Bastien Nocera <bnocera at redhat.com> - 3.35-4
 - Re-add dund (#458680)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	3 Jul 2008 15:56:21 -0000	1.39
+++ sources	4 Sep 2008 19:02:17 -0000	1.40
@@ -1 +1 @@
-21dc2f8c03dae9db87da351c735510bb  bluez-utils-3.35.tar.gz
+4fc292b635ba7b442c7aaf5680199012  bluez-utils-3.36.tar.gz



From orion at fedoraproject.org  Thu Sep  4 19:06:22 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu,  4 Sep 2008 19:06:22 +0000 (UTC)
Subject: rpms/R-multcomp/devel R-multcomp.spec,1.8,1.9
Message-ID: <20080904190622.D3FFC70120@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-multcomp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13796

Modified Files:
	R-multcomp.spec 
Log Message:
Handle some extra files



Index: R-multcomp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-multcomp/devel/R-multcomp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- R-multcomp.spec	4 Sep 2008 15:53:51 -0000	1.8
+++ R-multcomp.spec	4 Sep 2008 19:05:52 -0000	1.9
@@ -27,6 +27,8 @@
 
 %prep
 %setup -q -c -n %{packname}
+#Delete stray file
+rm multcomp/inst/svn-commit.tmp
 
 
 %build
@@ -68,16 +70,19 @@
 %doc %{_datadir}/R/library/%{packname}/doc
 %doc %{_datadir}/R/library/%{packname}/html
 %doc %{_datadir}/R/library/%{packname}/man
+%doc %{_datadir}/R/library/%{packname}/CHANGES 
+%doc %{_datadir}/R/library/%{packname}/CITATION 
 %doc %{_datadir}/R/library/%{packname}/DESCRIPTION 
 %{_datadir}/R/library/%{packname}/CONTENTS
 %{_datadir}/R/library/%{packname}/INDEX
 %{_datadir}/R/library/%{packname}/NAMESPACE
+%{_datadir}/R/library/%{packname}/MCMT
 %{_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}/applications
 %{_datadir}/R/library/%{packname}/data
-%{_datadir}/R/library/%{packname}/MCMT
+%{_datadir}/R/library/%{packname}/help
 
 
 %changelog



From spot at fedoraproject.org  Thu Sep  4 19:06:38 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 19:06:38 +0000 (UTC)
Subject: rpms/sharutils/devel .cvsignore, 1.5, 1.6 sharutils.spec, 1.30,
	1.31 sources, 1.5, 1.6
Message-ID: <20080904190638.E7E7D70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sharutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13931

Modified Files:
	.cvsignore sharutils.spec sources 
Log Message:
forgot the new source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sharutils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Apr 2007 16:34:15 -0000	1.5
+++ .cvsignore	4 Sep 2008 19:06:08 -0000	1.6
@@ -1,4 +1 @@
-sharutils-4.2.1.tar.gz
-sharutils-4.6.tar.bz2
-sharutils-4.6.1.tar.bz2
-sharutils-4.6.3.tar.bz2
+sharutils-4.7.tar.bz2


Index: sharutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sharutils/devel/sharutils.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sharutils.spec	4 Sep 2008 18:54:59 -0000	1.30
+++ sharutils.spec	4 Sep 2008 19:06:08 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: The GNU shar utilities for packaging and unpackaging shell archives
 Name: sharutils
 Version: 4.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 Source: ftp://ftp.gnu.org/gnu/sharutils/REL-%{version}/sharutils-%{version}.tar.bz2
@@ -68,6 +68,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.7-2
+- forgot the new source
+
 * Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.7-1
 - update to 4.7
 - fix license tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sharutils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Apr 2007 16:34:15 -0000	1.5
+++ sources	4 Sep 2008 19:06:08 -0000	1.6
@@ -1 +1 @@
-ec4c932d0704efe288d82219b089a3dc  sharutils-4.6.3.tar.bz2
+729c070d814d9c688489d88dd7fd3efb  sharutils-4.7.tar.bz2



From walters at fedoraproject.org  Thu Sep  4 19:06:55 2008
From: walters at fedoraproject.org (Colin Walters)
Date: Thu,  4 Sep 2008 19:06:55 +0000 (UTC)
Subject: rpms/jna/devel jna-3.0.4-callbacks-methodname.patch, NONE,
	1.1 jna-3.0.4-callbacks-typemappers.patch, NONE, 1.1
Message-ID: <20080904190655.6795F70120@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/jna/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14494

Added Files:
	jna-3.0.4-callbacks-methodname.patch 
	jna-3.0.4-callbacks-typemappers.patch 
Log Message:
actually add patches

jna-3.0.4-callbacks-methodname.patch:

--- NEW FILE jna-3.0.4-callbacks-methodname.patch ---
diff -ur jna-3.0.4-svn630/src/com/sun/jna/CallbackReference.java jna-3.0.4-svn630.orig/src/com/sun/jna/CallbackReference.java
--- jna-3.0.4-svn630/src/com/sun/jna/CallbackReference.java	2008-07-31 13:44:21.000000000 -0400
+++ jna-3.0.4-svn630.orig/src/com/sun/jna/CallbackReference.java	2008-09-03 09:04:35.000000000 -0400
@@ -16,6 +16,7 @@
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.reflect.Field;
 import java.lang.reflect.Proxy;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -150,22 +151,45 @@
         }
         return cls;
     }
+
+    private static Method checkMethod(Method m) {
+	if (m.getParameterTypes().length > Function.MAX_NARGS) {
+	    String msg = "Method signature exceeds the maximum "
+		+ "parameter count: " + m;
+	    throw new IllegalArgumentException(msg);
+	}
+	return m;
+    }
     
     private static Method getCallbackMethod(Callback callback) {
-        Method[] mlist = callback.getClass().getMethods();
+        Class klass = callback.getClass();
+        Method[] mlist = klass.getDeclaredMethods();
+
+	/* If there's only one method, just try it. */
+	if (mlist.length == 1)
+	    return checkMethod(mlist[0]);
+
+	/* Now try looking for a field named "METHOD_NAME" which
+	 * tells us which method to use.
+	 */
+	String methName = Callback.METHOD_NAME;
+	try {
+	    Field methNameField = klass.getField("METHOD_NAME");
+	    methName = (String) methNameField.get(null);
+        } catch (NoSuchFieldException e) { 
+        } catch (Exception e) {
+	    String msg = "Callback METHOD_NAME field is invalid";
+	    throw new IllegalArgumentException(msg);
+        }
+
         for (int mi=0;mi < mlist.length;mi++) {
             Method m = mlist[mi];
-            if (Callback.METHOD_NAME.equals(m.getName())) {
-                if (m.getParameterTypes().length > Function.MAX_NARGS) {
-                    String msg = "Method signature exceeds the maximum "
-                        + "parameter count: " + m;
-                    throw new IllegalArgumentException(msg);
-                }
-                return m;
+            if (methName.equals(m.getName())) {
+		return checkMethod(m);
             }
         }
         String msg = "Callback must implement method named '"
-            + Callback.METHOD_NAME + "'";
+            + methName + "'";
         throw new IllegalArgumentException(msg);
     }
     

jna-3.0.4-callbacks-typemappers.patch:

--- NEW FILE jna-3.0.4-callbacks-typemappers.patch ---
Only in jna-3.0.4-svn630.orig/: build-d64
Only in jna-3.0.4-svn630.orig/: build.number
Only in jna-3.0.4-svn630.orig/: debugfiles.list
Only in jna-3.0.4-svn630.orig/: debuglinks.list
Only in jna-3.0.4-svn630.orig/: debugsources.list
Only in jna-3.0.4-svn630.orig/doc: javadoc
diff -ur jna-3.0.4-svn630/src/com/sun/jna/Native.java jna-3.0.4-svn630.orig/src/com/sun/jna/Native.java
--- jna-3.0.4-svn630/src/com/sun/jna/Native.java	2008-09-01 12:12:50.000000000 -0400
+++ jna-3.0.4-svn630.orig/src/com/sun/jna/Native.java	2008-09-01 12:12:27.000000000 -0400
@@ -51,7 +51,9 @@
  * which would require every {@link Structure} which requires custom mapping
  * or alignment to define a constructor and pass parameters to the superclass.
  * To avoid lots of boilerplate, the base {@link Structure} constructor
- * figures out these properties based on its enclosing interface.<p>
+ * figures out these properties based on its enclosing interface.  Alternatively,
+ * A field named TYPE_MAPPER may be declared.
+ * <p>
  * <a name=library_loading></a>
  * <h2>Library Loading</h2>
  * When JNA classes are loaded, the native shared library (jnidispatch) is
@@ -350,32 +352,44 @@
         }
     }
 
+    private static final TypeMapper getClassTypeMapper(Class cls) {
+	try {
+	    Field field = cls.getField("TYPE_MAPPER");
+	    return (TypeMapper) field.get(null);
+	}
+	catch (NoSuchFieldException e) {
+	    return null;
+	}
+	catch (Exception e) {
+	    throw new IllegalArgumentException("TYPE_MAPPER must be a public field of type "
+					       + TypeMapper.class.getName() + " (" 
+					       + e + "): " + cls);
+	}
+    }
+
     /** Return the preferred {@link TypeMapper} for the given native interface.
      * See {@link com.sun.jna.Library#OPTION_TYPE_MAPPER}. 
      */
     public static TypeMapper getTypeMapper(Class cls) {
+	if (Callback.class.isAssignableFrom(cls)) {
+	    return getClassTypeMapper(cls);
+	}
         synchronized(libraries) {
             Class interfaceClass = findLibraryClass(cls);
             if (interfaceClass == null)
                 return null;
+	    TypeMapper mapper = getClassTypeMapper(interfaceClass);
+	    if (mapper != null) {
+		typeMappers.put(interfaceClass, mapper);
+	    } else {
+		Map options = getLibraryOptions(cls);
+		if (options != null
+		    && options.containsKey(Library.OPTION_TYPE_MAPPER)) {
+		    typeMappers.put(interfaceClass, options.get(Library.OPTION_TYPE_MAPPER));
+		}
+	    }
             if (!loadInstance(interfaceClass) 
                 || !typeMappers.containsKey(interfaceClass)) {
-                try {
-                    Field field = interfaceClass.getField("TYPE_MAPPER");
-                    typeMappers.put(interfaceClass, field.get(null));
-                }
-                catch (NoSuchFieldException e) {
-                    Map options = getLibraryOptions(cls);
-                    if (options != null
-                        && options.containsKey(Library.OPTION_TYPE_MAPPER)) {
-                        typeMappers.put(interfaceClass, options.get(Library.OPTION_TYPE_MAPPER));
-                    }
-                }
-                catch (Exception e) {
-                    throw new IllegalArgumentException("TYPE_MAPPER must be a public field of type "
-                                                       + TypeMapper.class.getName() + " (" 
-                                                       + e + "): " + interfaceClass);
-                }
             }
             return (TypeMapper)typeMappers.get(interfaceClass);
         }



From sgrubb at fedoraproject.org  Thu Sep  4 18:42:29 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Thu,  4 Sep 2008 18:42:29 +0000 (UTC)
Subject: rpms/libprelude/devel libprelude.spec,1.26,1.27
Message-ID: <20080904184229.9C6A470120@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7203

Modified Files:
	libprelude.spec 
Log Message:
debug complete



Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libprelude.spec	4 Sep 2008 15:22:29 -0000	1.26
+++ libprelude.spec	4 Sep 2008 18:41:59 -0000	1.27
@@ -15,7 +15,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gnutls-devel, python-devel, ruby, ruby-devel, lua-devel
-BuildRequires:	swig chrpath valgrind glibc-debuginfo
+BuildRequires:	swig chrpath valgrind 
 
 %description
 The Prelude Library is a collection of generic functions providing
@@ -108,11 +108,12 @@
 
 # Fix time stamp for both 32 and 64 bit libraries
 touch -r ./configure.in %{buildroot}%{_sysconfdir}/prelude/default/*
-cd tests
-make valgrind
 
-#%check
-#make check
+# PPC strips ld.so so valgrind can't run
+%ifnarch ppc ppc64
+%check
+make check
+%endif
 
 %clean
 rm -rf %{buildroot}



From ajax at fedoraproject.org  Thu Sep  4 19:11:56 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  4 Sep 2008 19:11:56 +0000 (UTC)
Subject: rpms/libXft/devel import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 libXft.spec, 1.22, 1.23 sources, 1.8, 1.9
Message-ID: <20080904191156.4A73570120@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXft/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15876/devel

Modified Files:
	.cvsignore libXft.spec sources 
Added Files:
	import.log 
Log Message:
libXft 2.1.13



--- NEW FILE import.log ---
libXft-2_1_13-1_fc10:HEAD:libXft-2.1.13-1.fc10.src.rpm:1220555421


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXft/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Jan 2007 23:31:42 -0000	1.7
+++ .cvsignore	4 Sep 2008 19:11:25 -0000	1.8
@@ -1 +1 @@
-libXft-2.1.12.tar.bz2
+libXft-2.1.13.tar.bz2


Index: libXft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXft/devel/libXft.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libXft.spec	20 Feb 2008 02:19:13 -0000	1.22
+++ libXft.spec	4 Sep 2008 19:11:25 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXft runtime library
 Name: libXft
-Version: 2.1.12
-Release: 5%{?dist}
+Version: 2.1.13
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -70,8 +70,7 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README ChangeLog
-%{_libdir}/libXft.so.2
-%{_libdir}/libXft.so.2.1.2
+%{_libdir}/libXft.so.2*
 
 %files devel
 %defattr(-,root,root,-)
@@ -90,6 +89,9 @@
 %{_mandir}/man3/Xft.3*
 
 %changelog
+* Thu Sep 04 2008 Adam Jackson <ajax at redhat.com> 2.1.13-1
+- libXft 2.1.13
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.1.12-5
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXft/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Jan 2007 23:31:42 -0000	1.8
+++ sources	4 Sep 2008 19:11:25 -0000	1.9
@@ -1 +1 @@
-1309301e2d979bd475dc58325cb8c056  libXft-2.1.12.tar.bz2
+bc8881851f3bd8dcc625fac37350a1c6  libXft-2.1.13.tar.bz2



From mclasen at fedoraproject.org  Thu Sep  4 19:20:09 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  4 Sep 2008 19:20:09 +0000 (UTC)
Subject: rpms/gtk2/devel .cvsignore, 1.91, 1.92 gtk2.spec, 1.315,
	1.316 sources, 1.99, 1.100
Message-ID: <20080904192009.B6AA170120@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15798

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.14.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- .cvsignore	22 Aug 2008 23:01:25 -0000	1.91
+++ .cvsignore	4 Sep 2008 19:19:39 -0000	1.92
@@ -1 +1 @@
-gtk+-2.13.7.tar.bz2
+gtk+-2.14.0.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- gtk2.spec	27 Aug 2008 02:23:09 -0000	1.315
+++ gtk2.spec	4 Sep 2008 19:19:39 -0000	1.316
@@ -10,16 +10,16 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.13.7
+%define base_version 2.14,0
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 4%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/gtk+/2.13/gtk+-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
 Source1: update-gdk-pixbuf-loaders
 Source2: update-gtk-immodules 
 
@@ -30,10 +30,6 @@
 # a workaround for some brokenness in the flash plugin
 # see http://bugzilla.gnome.org/show_bug.cgi?id=463773
 Patch2: workaround.patch
-# from upstream svn
-Patch3: color-loop.patch
-Patch4: flash-swarm.patch
-Patch5: screen-size-change.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -119,9 +115,6 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
-%patch3 -p1 -b .color-loop
-%patch4 -p1 -b .flash-swarm
-%patch5 -p1 -b .screen-size-change
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -145,7 +138,7 @@
 
 ## smp_mflags doesn't work for now due to gdk-pixbuf.loaders, may be fixed 
 ## past gtk 2.1.2
-make CFLAGS="-ggdb -O0" ## %{?_smp_mflags}
+make #%{?_smp_mflags}
 # turn off for now, since floatingtest needs a display
 #make check
 
@@ -305,6 +298,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
+- Update to 2.14.0
+
 * Tue Aug 26 2008 Matthias Clasen <mclasen at redhat.com> - 2.13.7-4
 - Fix an Xrandr bug
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/sources,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- sources	22 Aug 2008 23:01:25 -0000	1.99
+++ sources	4 Sep 2008 19:19:39 -0000	1.100
@@ -1 +1 @@
-53c925985a399a68b9c0439ee18b81f3  gtk+-2.13.7.tar.bz2
+8cd2732b4e07a490691ae3635b71d932  gtk+-2.14.0.tar.bz2



From mclasen at fedoraproject.org  Thu Sep  4 19:21:23 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  4 Sep 2008 19:21:23 +0000 (UTC)
Subject: rpms/gtk2/devel gtk2.spec,1.316,1.317
Message-ID: <20080904192123.6CC0B70120@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18550

Modified Files:
	gtk2.spec 
Log Message:
fix typo



Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- gtk2.spec	4 Sep 2008 19:19:39 -0000	1.316
+++ gtk2.spec	4 Sep 2008 19:20:53 -0000	1.317
@@ -10,7 +10,7 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.14,0
+%define base_version 2.14.0
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X



From tibbs at fedoraproject.org  Thu Sep  4 19:23:55 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu,  4 Sep 2008 19:23:55 +0000 (UTC)
Subject: rpms/sharutils/devel sharutils.spec,1.31,1.32
Message-ID: <20080904192355.2EBA570120@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/sharutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19436

Modified Files:
	sharutils.spec 
Log Message:
* Thu Sep 04 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 4.7-3
- Requires(pre) should be Requires(post).



Index: sharutils.spec
===================================================================
RCS file: /cvs/extras/rpms/sharutils/devel/sharutils.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sharutils.spec	4 Sep 2008 19:06:08 -0000	1.31
+++ sharutils.spec	4 Sep 2008 19:23:24 -0000	1.32
@@ -1,13 +1,13 @@
 Summary: The GNU shar utilities for packaging and unpackaging shell archives
 Name: sharutils
 Version: 4.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 Source: ftp://ftp.gnu.org/gnu/sharutils/REL-%{version}/sharutils-%{version}.tar.bz2
 URL: http://www.gnu.org/software/sharutils/
 BuildRequires: gettext
-Requires(pre): info
+Requires(post): info
 Requires(preun): info
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -68,6 +68,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Thu Sep 04 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 4.7-3
+- Requires(pre) should be Requires(post).
+
 * Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.7-2
 - forgot the new source
 



From lennart at fedoraproject.org  Thu Sep  4 19:24:14 2008
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Thu,  4 Sep 2008 19:24:14 +0000 (UTC)
Subject: rpms/bluez-utils/devel bluez-utils.spec, 1.114,
	1.115 org.bluez.service, 1.1, 1.2
Message-ID: <20080904192414.1392970120@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/bluez-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19533

Modified Files:
	bluez-utils.spec org.bluez.service 
Log Message:
Pass -x to hcid by default to make new BlueZ 4.x APIs available


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- bluez-utils.spec	4 Sep 2008 19:02:17 -0000	1.114
+++ bluez-utils.spec	4 Sep 2008 19:23:43 -0000	1.115
@@ -3,7 +3,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
 Version: 3.36
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -165,6 +165,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Thu Sep 04 2008 - Lennart Poettering <lpoetter at redhat.com> - 3.36-2
+- Pass -x to hcid by default to make new BlueZ 4.x APIs available
+
 * Thu Sep 04 2008 - Lennart Poettering <lpoetter at redhat.com> - 3.36-1
 - Update to 3.36
 


Index: org.bluez.service
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/org.bluez.service,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- org.bluez.service	21 May 2008 00:17:50 -0000	1.1
+++ org.bluez.service	4 Sep 2008 19:23:43 -0000	1.2
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=org.bluez
-Exec=/usr/sbin/hcid
+Exec=/usr/sbin/hcid -x
 User=root



From ajax at fedoraproject.org  Thu Sep  4 19:28:19 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  4 Sep 2008 19:28:19 +0000 (UTC)
Subject: rpms/libXrandr/devel .cvsignore, 1.11, 1.12 libXrandr.spec, 1.24,
	1.25 sources, 1.11, 1.12
Message-ID: <20080904192819.7281770120@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXrandr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21120/devel

Modified Files:
	.cvsignore libXrandr.spec sources 
Log Message:
libXrandr 1.2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXrandr/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	24 Sep 2007 18:28:49 -0000	1.11
+++ .cvsignore	4 Sep 2008 19:27:49 -0000	1.12
@@ -1 +1 @@
-libXrandr-1.2.2.tar.bz2
+libXrandr-1.2.3.tar.bz2


Index: libXrandr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXrandr/devel/libXrandr.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libXrandr.spec	20 Feb 2008 02:24:27 -0000	1.24
+++ libXrandr.spec	4 Sep 2008 19:27:49 -0000	1.25
@@ -1,13 +1,13 @@
 Summary: X.Org X11 libXrandr runtime library
 Name: libXrandr
-Version: 1.2.2
-Release: 3%{?dist}
+Version: 1.2.3
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Source0: http://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: randrproto >= 1.2.1
@@ -69,6 +69,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Sep 04 2008 Adam Jackson <ajax at redhat.com> 1.2.3-1
+- libXrandr 1.2.3
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.2-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXrandr/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	24 Sep 2007 18:28:49 -0000	1.11
+++ sources	4 Sep 2008 19:27:49 -0000	1.12
@@ -1 +1 @@
-1b244b5d19f0ccab01d7083436cd3558  libXrandr-1.2.2.tar.bz2
+5cd67cc02a50c9644ba0a1846ea3b08e  libXrandr-1.2.3.tar.bz2



From ssp at fedoraproject.org  Thu Sep  4 19:36:52 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu,  4 Sep 2008 19:36:52 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel
	gnome-settings-daemon-2.23.91-fnf7-cycle.patch, 1.1,
	1.2 gnome-settings-daemon.spec, 1.51, 1.52
Message-ID: <20080904193652.42FAB70120@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23693

Modified Files:
	gnome-settings-daemon-2.23.91-fnf7-cycle.patch 
	gnome-settings-daemon.spec 
Log Message:
Use fn-f7, not F7

gnome-settings-daemon-2.23.91-fnf7-cycle.patch:

Index: gnome-settings-daemon-2.23.91-fnf7-cycle.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon-2.23.91-fnf7-cycle.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-settings-daemon-2.23.91-fnf7-cycle.patch	4 Sep 2008 03:42:25 -0000	1.1
+++ gnome-settings-daemon-2.23.91-fnf7-cycle.patch	4 Sep 2008 19:36:21 -0000	1.2
@@ -1,16 +1,8 @@
-Index: plugins/xrandr/gsd-xrandr-manager.c
-===================================================================
---- plugins/xrandr/gsd-xrandr-manager.c	(revision 480)
-+++ plugins/xrandr/gsd-xrandr-manager.c	(working copy)
-@@ -61,6 +61,7 @@
- #define CONF_KEY "show_notification_icon"
- 
- #define VIDEO_KEYSYM    "XF86Display"
-+#define VIDEO_KEYSYM    "F7"
- 
- /* name of the icon files (gsd-xrandr.svg, etc.) */
- #define GSD_XRANDR_ICON_NAME "gsd-xrandr"
-@@ -82,6 +83,10 @@
+diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
+index 4d8ce2f..b80e55d 100644
+--- a/plugins/xrandr/gsd-xrandr-manager.c
++++ b/plugins/xrandr/gsd-xrandr-manager.c
+@@ -82,6 +82,10 @@ struct GsdXrandrManagerPrivate
          GnomeRRLabeler *labeler;
          GConfClient *client;
          int notify_id;
@@ -21,7 +13,7 @@
  };
  
  static void     gsd_xrandr_manager_class_init  (GsdXrandrManagerClass *klass);
-@@ -127,6 +132,418 @@
+@@ -127,6 +131,418 @@ on_client_message (GdkXEvent  *xevent,
          return GDK_FILTER_CONTINUE;
  }
  
@@ -440,7 +432,7 @@
  static GdkFilterReturn
  event_filter (GdkXEvent           *xevent,
                GdkEvent            *event,
-@@ -142,12 +559,9 @@
+@@ -142,12 +558,9 @@ event_filter (GdkXEvent           *xevent,
          if (xev->xany.type != KeyPress && xev->xany.type != KeyRelease)
                  return GDK_FILTER_CONTINUE;
  
@@ -456,7 +448,7 @@
                  return GDK_FILTER_CONTINUE;
          }
  
-@@ -869,6 +1283,9 @@
+@@ -869,6 +1282,9 @@ gsd_xrandr_manager_init (GsdXrandrManager *manager)
          manager->priv = GSD_XRANDR_MANAGER_GET_PRIVATE (manager);
  
          manager->priv->keycode = keycode;


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gnome-settings-daemon.spec	4 Sep 2008 04:02:11 -0000	1.51
+++ gnome-settings-daemon.spec	4 Sep 2008 19:36:21 -0000	1.52
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.23.91
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -55,7 +55,7 @@
 
 %patch2 -p1 -b .ignore-layout-if-using-evdev
 %patch6 -p1 -b .drop-sample-cache
-%patch7 -p0 -b .fnf7-cycle
+%patch7 -p1 -b .fnf7-cycle
 
 %build
 aclocal
@@ -155,6 +155,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Tue Sep 04 2008 Soren Sandmann <sandmann at redhat.com> - 2.23.91-4
+- Use the fn-F7 key, not the F7 key.
+
 * Wed Sep 03 2008 Soren Sandmann <sandmann at redhat.com> - 2.23.91-3
 - Bump gnome-desktop requirement
 



From spot at fedoraproject.org  Thu Sep  4 19:38:07 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 19:38:07 +0000 (UTC)
Subject: rpms/sip/devel sip.spec,1.53,1.54
Message-ID: <20080904193807.4864970120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24181

Modified Files:
	sip.spec 
Log Message:
fix license tag


Index: sip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sip/devel/sip.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sip.spec	2 Sep 2008 13:50:20 -0000	1.53
+++ sip.spec	4 Sep 2008 19:37:36 -0000	1.54
@@ -5,9 +5,9 @@
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
 Version: 4.7.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 # http://www.riverbankcomputing.com/Docs/sip4/sipref.html#license
-License: Python Software Foundation License v2 
+License: Python
 Group: Development/Tools
 Url: http://www.riverbankcomputing.com/software/sip/intro 
 Source0: http://www.riverbankcomputing.com/static/Downloads/sip4/sip-%{version}.tar.gz
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Thu Sep 04 2008 Tom "spot" Callaway <tcallawa at redhat.com> 4.7.7-3
+- fix license tag
+
 * Tue Sep 02 2008 Than Ngo <than at redhat.com> 4.7.7-2
 - get rid of BR on qt
 



From pkgdb at fedoraproject.org  Thu Sep  4 19:38:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 19:38:31 +0000
Subject: [pkgdb] livecd-tools: apevec has requested watchcommits
Message-ID: <20080904193831.CB5B620876D@bastion.fedora.phx.redhat.com>

apevec has requested the watchcommits acl on livecd-tools (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/livecd-tools



From pkgdb at fedoraproject.org  Thu Sep  4 19:38:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 19:38:32 +0000
Subject: [pkgdb] livecd-tools: apevec has requested watchbugzilla
Message-ID: <20080904193832.9741C208771@bastion.fedora.phx.redhat.com>

apevec has requested the watchbugzilla acl on livecd-tools (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/livecd-tools



From pkgdb at fedoraproject.org  Thu Sep  4 19:39:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 19:39:36 +0000
Subject: [pkgdb] augeas: apevec has requested watchcommits
Message-ID: <20080904193936.E2193208769@bastion.fedora.phx.redhat.com>

apevec has requested the watchcommits acl on augeas (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/augeas



From pkgdb at fedoraproject.org  Thu Sep  4 19:39:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 19:39:38 +0000
Subject: [pkgdb] augeas: apevec has requested watchbugzilla
Message-ID: <20080904193938.7CB0C20876D@bastion.fedora.phx.redhat.com>

apevec has requested the watchbugzilla acl on augeas (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/augeas



From pkgdb at fedoraproject.org  Thu Sep  4 19:39:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 19:39:44 +0000
Subject: [pkgdb] augeas: apevec has requested watchcommits
Message-ID: <20080904193944.6E676208770@bastion.fedora.phx.redhat.com>

apevec has requested the watchcommits acl on augeas (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/augeas



From pkgdb at fedoraproject.org  Thu Sep  4 19:39:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 19:39:45 +0000
Subject: [pkgdb] augeas: apevec has requested watchbugzilla
Message-ID: <20080904193945.BA9E5208D0C@bastion.fedora.phx.redhat.com>

apevec has requested the watchbugzilla acl on augeas (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/augeas



From pkgdb at fedoraproject.org  Thu Sep  4 19:39:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 19:39:49 +0000
Subject: [pkgdb] augeas: apevec has requested watchcommits
Message-ID: <20080904193949.C5B77208769@bastion.fedora.phx.redhat.com>

apevec has requested the watchcommits acl on augeas (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/augeas



From pkgdb at fedoraproject.org  Thu Sep  4 19:39:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 19:39:49 +0000
Subject: [pkgdb] augeas: apevec has requested watchbugzilla
Message-ID: <20080904193949.E629F208D97@bastion.fedora.phx.redhat.com>

apevec has requested the watchbugzilla acl on augeas (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/augeas



From mbooth at fedoraproject.org  Thu Sep  4 19:42:22 2008
From: mbooth at fedoraproject.org (Mat Booth)
Date: Thu,  4 Sep 2008 19:42:22 +0000 (UTC)
Subject: rpms/eclipse-epic/devel .cvsignore, 1.4, 1.5 eclipse-epic.spec, 1.5,
	1.6 get-epic.sh, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20080904194222.8FDF070120@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-epic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25369

Modified Files:
	.cvsignore eclipse-epic.spec get-epic.sh sources 
Log Message:
* Thu Sep 04 2008 Mat Booth <fedora at matbooth.co.uk> 0.6.25-1
- Updated to version 0.6.25.
- New features: Persistent variables view options and Module::Starter
  integration.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-epic/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Jun 2008 13:58:31 -0000	1.4
+++ .cvsignore	4 Sep 2008 19:41:51 -0000	1.5
@@ -1 +1 @@
-epic-0.6.24.tar.gz
+epic-0.6.25.tar.gz


Index: eclipse-epic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-epic/devel/eclipse-epic.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-epic.spec	10 Aug 2008 11:03:40 -0000	1.5
+++ eclipse-epic.spec	4 Sep 2008 19:41:52 -0000	1.6
@@ -2,8 +2,8 @@
 %define gcj_support      1
 
 Name:      eclipse-epic
-Version:   0.6.24
-Release:   3%{?dist}
+Version:   0.6.25
+Release:   1%{?dist}
 Summary:   Perl Eclipse plugin
 Group:     Development/Tools
 License:   CPL
@@ -141,6 +141,11 @@
 %endif
 
 %changelog
+* Thu Sep 04 2008 Mat Booth <fedora at matbooth.co.uk> 0.6.25-1
+- Updated to version 0.6.25.
+- New features: Persistent variables view options and Module::Starter
+  integration.
+
 * Wed Jul 30 2008 Andrew Overholt <overholt at redhat.com> 0.6.24-3
 - Update for building with Eclipse SDK 3.4.
 


Index: get-epic.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-epic/devel/get-epic.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- get-epic.sh	1 Jun 2008 13:58:31 -0000	1.3
+++ get-epic.sh	4 Sep 2008 19:41:52 -0000	1.4
@@ -1,7 +1,7 @@
 #!/bin/sh
 NAME="epic"
-VERSION=0.6.24
-TAG="testing_0_6_24"
+VERSION=0.6.25
+TAG="testing_0_6_25"
 
 echo "Exporting from CVS..."
 mkdir $NAME-$VERSION


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-epic/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Jun 2008 13:58:31 -0000	1.4
+++ sources	4 Sep 2008 19:41:52 -0000	1.5
@@ -1 +1 @@
-f78d4fb6b401bea7815f1285ae83bbdf  epic-0.6.24.tar.gz
+c3a8c56324a85507c1d0164a1f293354  epic-0.6.25.tar.gz



From mschwendt at fedoraproject.org  Thu Sep  4 19:45:43 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu,  4 Sep 2008 19:45:43 +0000 (UTC)
Subject: extras-buildsys ChangeLog,1.126.2.44.2.1.2.16,1.126.2.44.2.1.2.17
Message-ID: <20080904194544.02D6C70120@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26857

Modified Files:
      Tag: Plague-0_4_5
	ChangeLog 
Log Message:
merge the remaining sqlite2/sqlite3 API fixes


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.44.2.1.2.16
retrieving revision 1.126.2.44.2.1.2.17
diff -u -r1.126.2.44.2.1.2.16 -r1.126.2.44.2.1.2.17
--- ChangeLog	4 Sep 2008 17:19:09 -0000	1.126.2.44.2.1.2.16
+++ ChangeLog	4 Sep 2008 19:45:43 -0000	1.126.2.44.2.1.2.17
@@ -1,3 +1,8 @@
+2008-09-04  Michael Schwendt <mschwendt at fedoraproject.org>
+
+	* server/User.py, server/UserInterface.py
+	  - Apply the remaining SQLite2/SQLite3 API fixes.
+
 2008-09-04  Dennis Gilmore <dennis at ausil.us>
 	* Release of 0.4.5.2
 	  - fix bug in find option for plague-user-manager



From spot at fedoraproject.org  Thu Sep  4 19:46:21 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 19:46:21 +0000 (UTC)
Subject: rpms/sipsak/devel sipsak.spec,1.3,1.4
Message-ID: <20080904194621.535DB70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sipsak/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26922

Modified Files:
	sipsak.spec 
Log Message:
fix license tag


Index: sipsak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sipsak/devel/sipsak.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sipsak.spec	19 Feb 2008 18:41:25 -0000	1.3
+++ sipsak.spec	4 Sep 2008 19:45:51 -0000	1.4
@@ -1,8 +1,8 @@
 Summary:	SIP swiss army knife
 Name:		sipsak
 Version:	0.9.6
-Release: 	3%{?dist}
-License:	GPL
+Release: 	4%{?dist}
+License:	GPLv2+
 Group:		Applications/Communications
 URL:		http://sipsak.org/
 Source0:	http://download.berlios.de/sipsak/%{name}-%{version}-1.tar.gz
@@ -41,6 +41,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 04 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.6-4
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.6-3
 - Autorebuild for GCC 4.3
 



From ajax at fedoraproject.org  Thu Sep  4 19:52:39 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  4 Sep 2008 19:52:39 +0000 (UTC)
Subject: rpms/libXt/devel import.log, NONE, 1.1 .cvsignore, 1.9,
	1.10 libXt.spec, 1.28, 1.29 sources, 1.10, 1.11
Message-ID: <20080904195239.B053270120@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29277/devel

Modified Files:
	.cvsignore libXt.spec sources 
Added Files:
	import.log 
Log Message:
libXt 1.0.5



--- NEW FILE import.log ---
libXt-1_0_5-1_fc10:HEAD:libXt-1.0.5-1.fc10.src.rpm:1220557784


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXt/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	20 Nov 2006 19:22:50 -0000	1.9
+++ .cvsignore	4 Sep 2008 19:52:09 -0000	1.10
@@ -1 +1 @@
-libXt-1.0.4.tar.bz2
+libXt-1.0.5.tar.bz2


Index: libXt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXt/devel/libXt.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libXt.spec	20 Feb 2008 02:27:36 -0000	1.28
+++ libXt.spec	4 Sep 2008 19:52:09 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXt runtime library
 Name: libXt
-Version: 1.0.4
-Release: 5%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -121,11 +121,14 @@
 %{_libdir}/libXt.so
 %{_libdir}/pkgconfig/xt.pc
 #%dir %{_mandir}/man1x
-%{_mandir}/man1/makestrs.1x*
+%{_mandir}/man1/makestrs.1*
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Sep 04 2008 Adam Jackson <ajax at redhat.com> 1.0.5-1
+- libXt 1.0.5
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.4-5
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXt/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	20 Nov 2006 19:22:50 -0000	1.10
+++ sources	4 Sep 2008 19:52:09 -0000	1.11
@@ -1 +1 @@
-937735f342c046db239852fec0413f6c  libXt-1.0.4.tar.bz2
+f3bdd67785ace8cd0b23249e9d8c9975  libXt-1.0.5.tar.bz2



From ajax at fedoraproject.org  Thu Sep  4 20:02:21 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  4 Sep 2008 20:02:21 +0000 (UTC)
Subject: rpms/libXv/devel import.log, NONE, 1.1 .cvsignore, 1.8,
	1.9 libXv.spec, 1.22, 1.23 sources, 1.8, 1.9
Message-ID: <20080904200221.2FEB370120@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3594/devel

Modified Files:
	.cvsignore libXv.spec sources 
Added Files:
	import.log 
Log Message:
libXv 1.0.4



--- NEW FILE import.log ---
libXv-1_0_4-1_fc10:HEAD:libXv-1.0.4-1.fc10.src.rpm:1220558340


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXv/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Jan 2007 03:39:17 -0000	1.8
+++ .cvsignore	4 Sep 2008 20:01:50 -0000	1.9
@@ -1 +1 @@
-libXv-1.0.3.tar.bz2
+libXv-1.0.4.tar.bz2


Index: libXv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXv/devel/libXv.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libXv.spec	20 Feb 2008 02:29:35 -0000	1.22
+++ libXv.spec	4 Sep 2008 20:01:50 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXv runtime library
 Name:    libXv
-Version: 1.0.3
-Release: 5%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -77,6 +77,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Sep 04 2008 Adam Jackson <ajax at redhat.com> 1.0.4-1
+- libXv 1.0.4
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.3-5
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXv/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Jan 2007 03:39:17 -0000	1.8
+++ sources	4 Sep 2008 20:01:50 -0000	1.9
@@ -1 +1 @@
-f1c4109fa804aeaf7188b66c5cdd9f57  libXv-1.0.3.tar.bz2
+723a0275227165383e967a1ca8899b52  libXv-1.0.4.tar.bz2



From ajax at fedoraproject.org  Thu Sep  4 20:05:44 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  4 Sep 2008 20:05:44 +0000 (UTC)
Subject: rpms/libXxf86vm/devel import.log, NONE, 1.1 .cvsignore, 1.6,
	1.7 libXxf86vm.spec, 1.19, 1.20 sources, 1.7, 1.8
Message-ID: <20080904200544.F0C2670124@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXxf86vm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5211/devel

Modified Files:
	.cvsignore libXxf86vm.spec sources 
Added Files:
	import.log 
Log Message:
libXxf86vm 1.0.2



--- NEW FILE import.log ---
libXxf86vm-1_0_2-1_fc10:HEAD:libXxf86vm-1.0.2-1.fc10.src.rpm:1220558680


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86vm/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Apr 2006 21:18:41 -0000	1.6
+++ .cvsignore	4 Sep 2008 20:05:14 -0000	1.7
@@ -1 +1 @@
-libXxf86vm-1.0.1.tar.bz2
+libXxf86vm-1.0.2.tar.bz2


Index: libXxf86vm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86vm/devel/libXxf86vm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libXxf86vm.spec	15 Jul 2008 17:31:55 -0000	1.19
+++ libXxf86vm.spec	4 Sep 2008 20:05:14 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXxf86vm runtime library
 Name: libXxf86vm
-Version: 1.0.1
-Release: 6%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -75,9 +75,12 @@
 %{_libdir}/libXxf86vm.so
 %{_libdir}/pkgconfig/xxf86vm.pc
 #%dir %{_mandir}/man3x
-%{_mandir}/man3/*.3x*
+%{_mandir}/man3/*.3*
 
 %changelog
+* Thu Sep 04 2008 Adam Jackson <ajax at redhat.com> 1.0.2-1
+- libXxf86vm 1.0.2
+
 * Tue Jul 15 2008 Adam Jackson <ajax at redhat.com> 1.0.1-6
 - Fix license tag.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86vm/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Apr 2006 21:18:41 -0000	1.7
+++ sources	4 Sep 2008 20:05:14 -0000	1.8
@@ -1 +1 @@
-8de1ca6c55aaad7d8cae19b4f0b3da32  libXxf86vm-1.0.1.tar.bz2
+304d37bd0a10d9b58aa9b64469ad73e5  libXxf86vm-1.0.2.tar.bz2



From spot at fedoraproject.org  Thu Sep  4 20:06:52 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 20:06:52 +0000 (UTC)
Subject: rpms/sloccount/devel sloccount.spec,1.6,1.7
Message-ID: <20080904200652.58B1F70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sloccount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6094

Modified Files:
	sloccount.spec 
Log Message:
fix license tag


Index: sloccount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sloccount/devel/sloccount.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sloccount.spec	19 Feb 2008 04:30:09 -0000	1.6
+++ sloccount.spec	4 Sep 2008 20:06:20 -0000	1.7
@@ -1,8 +1,8 @@
 Name: sloccount
 Summary: Measures source lines of code (SLOC) in programs
 Version: 2.26
-Release: 7%{?dist}
-License: GPL
+Release: 8%{?dist}
+License: GPLv2+
 Group: Development/Tools
 Source: http://www.dwheeler.com/sloccount/sloccount-%{version}.tar.gz
 URL: http://www.dwheeler.com/sloccount
@@ -39,6 +39,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Thu Sep 04 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.26-8
+- fix license tag
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.26-7
 - Autorebuild for GCC 4.3
 



From omajid at fedoraproject.org  Thu Sep  4 20:10:33 2008
From: omajid at fedoraproject.org (Omair Majid)
Date: Thu,  4 Sep 2008 20:10:33 +0000 (UTC)
Subject: rpms/libmatthew-java/devel .cvsignore, 1.2, 1.3 libmatthew-java.spec,
	1.3, 1.4 sources, 1.2, 1.3 early_upstream.patch, 1.1, NONE
Message-ID: <20080904201033.98D4670120@cvs1.fedora.phx.redhat.com>

Author: omajid

Update of /cvs/pkgs/rpms/libmatthew-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8302

Modified Files:
	.cvsignore libmatthew-java.spec sources 
Removed Files:
	early_upstream.patch 
Log Message:
* Thu Sep 4 2008 Omair Majid <omajid at redhat.com> 0.7.1-4
- Added -j1 to disable parallel build. Fixes the race condition that resulted 
  in class files of size 0
- Eliminated early_upstream.patch (patch was adapted by upstream)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmatthew-java/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Jun 2008 19:52:15 -0000	1.2
+++ .cvsignore	4 Sep 2008 20:10:03 -0000	1.3
@@ -1 +1 @@
-libmatthew-java_0.7.1.orig.tar.gz
+libmatthew-java-0.7.1.tar.gz


Index: libmatthew-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmatthew-java/devel/libmatthew-java.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libmatthew-java.spec	28 Aug 2008 19:47:44 -0000	1.3
+++ libmatthew-java.spec	4 Sep 2008 20:10:03 -0000	1.4
@@ -2,27 +2,26 @@
 
 Name:           libmatthew-java
 Version:        0.7.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A few useful Java libraries
 Group:          Development/Libraries
 License:        LGPLv2
 
 # actual upstream:
-#URL: http://matthew.ath.cx/projects/java/
-#Source0: http://matthew.ath.cx/projects/java/%{name}-%{version}.tar.gz
+URL: http://matthew.ath.cx/projects/java/
+Source0: http://matthew.ath.cx/projects/java/%{name}-%{version}.tar.gz
 
 # upstream author is also the debian maintainer for this package.
 # he gets newer releases into debian before he puts them up on
 # the upstream website. so we use the "original" source from debian
 # (ie, the source before debian patches are applied to it)
-URL:            http://packages.debian.org/source/sid/%{name}
-Source0:        http://ftp.de.debian.org/debian/pool/main/libm/%{name}/%{name}_%{version}.orig.tar.gz
-Patch0:         early_upstream.patch
-Patch1:         install_doc.patch
-Patch2:         jpackage_compliance.patch
-Patch3:         classpath_fix.patch
-Patch4:         openjdk.patch
-Patch5:         makefile.patch
+#URL:            http://packages.debian.org/source/sid/%{name}
+#Source0:        http://ftp.de.debian.org/debian/pool/main/libm/%{name}/%{name}_%{version}.orig.tar.gz
+Patch0:         install_doc.patch
+Patch1:         jpackage_compliance.patch
+Patch2:         classpath_fix.patch
+Patch3:         openjdk.patch
+Patch4:         makefile.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -72,15 +71,14 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 # this patch adds a system dependent path, so we fix it before
 # applying the patch
-sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH2} | patch -p1 
+sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH1} | patch -p1 
 
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 
 %build
@@ -88,7 +86,8 @@
     CFLAGS='%{optflags}'\
     GCJFLAGS='%{optflags}' \
     LDFLAGS='%{optflags}' \
-    PPFLAGS='%{optflags}'
+    PPFLAGS='%{optflags}' \
+    -j1
 
 
 %install
@@ -142,6 +141,11 @@
 
 
 %changelog
+* Thu Sep 4 2008 Omair Majid <omajid at redhat.com> 0.7.1-4
+- Added -j1 to disable parallel build. Fixes the race condition that resulted 
+  in class files of size 0
+- Eliminated early_upstream.patch (patch was adapted by upstream)
+
 * Thu Aug 28 2008 Omair Majid <omajid at redhat.com> 0.7.1-3
 - Created new patches that dont cause fuzz when patching.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmatthew-java/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jun 2008 19:52:15 -0000	1.2
+++ sources	4 Sep 2008 20:10:03 -0000	1.3
@@ -1 +1 @@
-d6145d37c6d289713d68c5745eab23af  libmatthew-java_0.7.1.orig.tar.gz
+6a4db221129f230c64a0f937d00bb703  libmatthew-java-0.7.1.tar.gz


--- early_upstream.patch DELETED ---



From mclasen at fedoraproject.org  Thu Sep  4 20:14:09 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  4 Sep 2008 20:14:09 +0000 (UTC)
Subject: rpms/empathy/devel .cvsignore, 1.19, 1.20 empathy.spec, 1.33,
	1.34 sources, 1.19, 1.20
Message-ID: <20080904201409.36A1C70120@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31917

Modified Files:
	.cvsignore empathy.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	22 Aug 2008 22:58:42 -0000	1.19
+++ .cvsignore	4 Sep 2008 20:13:38 -0000	1.20
@@ -1 +1 @@
-empathy-2.23.90.tar.bz2
+empathy-2.23.91.tar.bz2


Index: empathy.spec
===================================================================
RCS file: /cvs/extras/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- empathy.spec	24 Aug 2008 22:17:05 -0000	1.33
+++ empathy.spec	4 Sep 2008 20:13:38 -0000	1.34
@@ -9,8 +9,8 @@
 %global	enchant_version		1.2.0		
 
 Name:		empathy
-Version:	2.23.90
-Release:	2%{?dist}
+Version:	2.23.91
+Release:	1%{?dist}
 Summary:	GNOME Instant Messaging Client
 
 Group:		Applications/Communications
@@ -224,6 +224,9 @@
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
 * Sun Aug 24 2008 Peter Gordon <peter at thecodergeek.com> - 2.23.90-2
 - Now that Empathy will be the default IM client in F10+, hardcode a dependency
   on telepathy-haze to keep the same protocol functionality across upgrades,


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/empathy/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	22 Aug 2008 22:58:42 -0000	1.19
+++ sources	4 Sep 2008 20:13:38 -0000	1.20
@@ -1 +1 @@
-9bd5b3aef85262f8ae3efdbe87a7dbf8  empathy-2.23.90.tar.bz2
+c10aef3ab410c3c407c1505efd3df0c2  empathy-2.23.91.tar.bz2



From jcwillia at fedoraproject.org  Thu Sep  4 20:15:09 2008
From: jcwillia at fedoraproject.org (John Clark Williams)
Date: Thu,  4 Sep 2008 20:15:09 +0000 (UTC)
Subject: rpms/mock/devel .cvsignore, 1.44, 1.45 mock.spec, 1.64, 1.65 sources,
	1.47, 1.48
Message-ID: <20080904201509.B9B4F70120@cvs1.fedora.phx.redhat.com>

Author: jcwillia

Update of /cvs/pkgs/rpms/mock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10807

Modified Files:
	.cvsignore mock.spec sources 
Log Message:
* Thu Sep  4 2008 Clark Williams <williams at redhat.com> - 0.9.11-1
- added workarounds for rawhide rpm (BZ 455387 and 458234)
- disabled tmpfs plugin on epel-4-x86_64
- fixed autotools breakage in configure.ac



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mock/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	20 May 2008 19:47:31 -0000	1.44
+++ .cvsignore	4 Sep 2008 20:14:39 -0000	1.45
@@ -1 +1 @@
-mock-0.9.10.tar.gz
+mock-0.9.11.tar.gz


Index: mock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mock/devel/mock.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- mock.spec	20 May 2008 19:47:31 -0000	1.64
+++ mock.spec	4 Sep 2008 20:14:39 -0000	1.65
@@ -1,7 +1,7 @@
 # next four lines substituted by autoconf
 %define major 0
 %define minor 9
-%define sub 10
+%define sub 11
 %define extralevel %{nil}
 %define release_name mock
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -93,6 +93,11 @@
 %attr(02775, root, mock) %dir /var/lib/mock
 
 %changelog
+* Thu Sep  4 2008 Clark Williams <williams at redhat.com> - 0.9.11-1
+- added workarounds for rawhide rpm (BZ 455387 and 458234)
+- disabled tmpfs plugin on epel-4-x86_64
+- fixed autotools breakage in configure.ac
+
 * Tue May 20 2008 Jesse Keating <jkeating at redhat.com> - 0.9.10-1
 - added fix for building F-8 mock (clark)
 - Update epel configs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mock/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	20 May 2008 19:47:31 -0000	1.47
+++ sources	4 Sep 2008 20:14:39 -0000	1.48
@@ -1 +1 @@
-cef9e786e769a92dc37603ca8faf4be5  mock-0.9.10.tar.gz
+c1192f37025eca20f03e90f6d7e5854d  mock-0.9.11.tar.gz



From spot at fedoraproject.org  Thu Sep  4 20:19:02 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 20:19:02 +0000 (UTC)
Subject: rpms/smolt/devel .cvsignore, 1.23, 1.24 smolt.spec, 1.51,
	1.52 sources, 1.24, 1.25
Message-ID: <20080904201902.C87D170120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/smolt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13164

Modified Files:
	.cvsignore smolt.spec sources 
Log Message:
fix license tag


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	9 May 2008 13:31:04 -0000	1.23
+++ .cvsignore	4 Sep 2008 20:18:32 -0000	1.24
@@ -0,0 +1 @@
+smolt-1.1.1.1.tar.gz


Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- smolt.spec	9 May 2008 13:31:04 -0000	1.51
+++ smolt.spec	4 Sep 2008 20:18:32 -0000	1.52
@@ -1,14 +1,10 @@
 Name: smolt
 Summary: Fedora hardware profiler
 Version: 1.1.1.1
-Release: 4%{?dist}
-License: GPL
+Release: 5%{?dist}
+License: GPLv2+
 Group: Applications/Internet
 URL: http://hosted.fedoraproject.org/projects/smolt
-
-# Note: This is a link to the gzip, you can't download it directly
-# This will get fixed as soon as hosted can create attachments directly
-
 Source: https://fedorahosted.org/releases/s/m/%{name}/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -175,6 +171,9 @@
 %{_bindir}/smoltGui
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.1.1.1-5
+- fix license tag
+
 * Thu Apr 03 2008 Mike McGrath <mmcgrath at redhat.com> - 1.1.1.1-4
 - One revert for rawhide
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	9 May 2008 13:31:04 -0000	1.24
+++ sources	4 Sep 2008 20:18:32 -0000	1.25
@@ -0,0 +1 @@
+c723a6808de0954e8e3e9228c7c94946  smolt-1.1.1.1.tar.gz



From mschwendt at fedoraproject.org  Thu Sep  4 20:24:56 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu,  4 Sep 2008 20:24:56 +0000 (UTC)
Subject: extras-buildsys/server Repo.py,1.16.2.3.4.3,1.16.2.3.4.4
Message-ID: <20080904202456.6970C70120@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/server
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17085/server

Modified Files:
      Tag: Plague-0_4_5
	Repo.py 
Log Message:
fix server/Repo.py


Index: Repo.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v
retrieving revision 1.16.2.3.4.3
retrieving revision 1.16.2.3.4.4
diff -u -r1.16.2.3.4.3 -r1.16.2.3.4.4
--- Repo.py	4 Sep 2008 02:14:20 -0000	1.16.2.3.4.3
+++ Repo.py	4 Sep 2008 20:24:55 -0000	1.16.2.3.4.4
@@ -25,6 +25,9 @@
 import EmailUtils
 from plague import DebugUtils
 
+# Lockfile used by external scripts to ensure mutual exclusion
+# from concurrent access to the repository's directory
+REPO_LOCKFILE_NAME = ".repo-update.lock"
 
 class Repo(threading.Thread):
     """ Represents an on-disk repository of RPMs and manages updates to the repo. """
@@ -41,6 +44,7 @@
         self._repodir = os.path.join(repodir, target_str)
         if not os.path.exists(self._repodir):
             os.makedirs(self._repodir)
+        self._lockfile_path = os.path.join(self._repodir, REPO_LOCKFILE_NAME)
 
         self._repo_cache_dir = os.path.join(repodir, "cache", target_str)
         if not os.path.exists(self._repo_cache_dir):
@@ -87,7 +91,27 @@
             return True
         return False
 
-    def _update_repo(self, target_string):
+    def _update_repo_with_pushlock(self):
+        lockfile = None
+        try:
+            lockfile = open(self._lockfile_path, 'w')
+            rc = fcntl.flock(lockfile, fcntl.LOCK_EX)
+        except IOError, (errno, strerr):
+            target_str = self._target_cfg.target_string()
+            print "Repo Error (%s): opening lockfile %s failed.  Output: (errno %d) '%s'" % (target_str, self._lockfile_path, errno, strerr)
+
+        try:
+            self._update_repo()
+        except:
+            if lockfile:
+                fcntl.flock(lockfile, fcntl.LOCK_UN)
+                lockfile.close()
+            raise
+        if lockfile:
+            fcntl.flock(lockfile, fcntl.LOCK_UN)
+            lockfile.close()
+
+    def _update_repo(self):
         """ Copy new RPMS to each repo, and update each repo at the end """
         for buildjob in self._repo_additions:
             # Ensure all the files are accessible
@@ -201,7 +225,12 @@
             if self._lock_count == 2:
                 target_str = self._target_cfg.target_string()
                 print "Repo '%s': updating repository metadata..." % target_str
-                self._update_repo()
+                try:
+                    self._update_repo_with_pushlock()
+                except IOError, (err, strerr):
+                    print "Repo '%s': %s (%d)" % (target_str, strerr, err)
+                except OSError, e:
+                    print "Repo '%s': %s" % (target_str, e)
                 print "Repo '%s': Done updating." % target_str
 
                 # If there's a repo script for this target, enter level 3



From mschwendt at fedoraproject.org  Thu Sep  4 20:25:26 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu,  4 Sep 2008 20:25:26 +0000 (UTC)
Subject: extras-buildsys ChangeLog,1.126.2.44.2.1.2.17,1.126.2.44.2.1.2.18
Message-ID: <20080904202526.0866D70120@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17085

Modified Files:
      Tag: Plague-0_4_5
	ChangeLog 
Log Message:
fix server/Repo.py


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.44.2.1.2.17
retrieving revision 1.126.2.44.2.1.2.18
diff -u -r1.126.2.44.2.1.2.17 -r1.126.2.44.2.1.2.18
--- ChangeLog	4 Sep 2008 19:45:43 -0000	1.126.2.44.2.1.2.17
+++ ChangeLog	4 Sep 2008 20:24:55 -0000	1.126.2.44.2.1.2.18
@@ -1,5 +1,9 @@
 2008-09-04  Michael Schwendt <mschwendt at fedoraproject.org>
 
+	* server/Repo.py
+	  - Fix _update_repo args traceback introduced in 0.4.5.1.
+	  - Merge repolock patch.
+
 	* server/User.py, server/UserInterface.py
 	  - Apply the remaining SQLite2/SQLite3 API fixes.
 



From robert at fedoraproject.org  Thu Sep  4 20:25:30 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu,  4 Sep 2008 20:25:30 +0000 (UTC)
Subject: rpms/mimedefang/EL-5 .cvsignore, 1.7, 1.8 mimedefang.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <20080904202530.3E92770120@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/mimedefang/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16988/EL-5

Modified Files:
	.cvsignore mimedefang.spec sources 
Log Message:
Upgrade to 2.65



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Feb 2008 21:33:33 -0000	1.7
+++ .cvsignore	4 Sep 2008 20:24:59 -0000	1.8
@@ -1 +1 @@
-mimedefang-2.64.tar.gz
+mimedefang-2.65.tar.gz


Index: mimedefang.spec
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/EL-5/mimedefang.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mimedefang.spec	9 Feb 2008 21:33:33 -0000	1.10
+++ mimedefang.spec	4 Sep 2008 20:24:59 -0000	1.11
@@ -1,6 +1,6 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
-Version:           2.64
+Version:           2.65
 Release:           1%{?dist}
 License:           GPLv2+
 Group:             System Environment/Daemons
@@ -98,6 +98,9 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Thu Sep 04 2008 Robert Scheck <robert at fedoraproject.org> 2.65-1
+- Upgrade to 2.65
+
 * Sat Feb 09 2008 Robert Scheck <robert at fedoraproject.org> 2.64-1
 - Upgrade to 2.64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Feb 2008 21:33:33 -0000	1.7
+++ sources	4 Sep 2008 20:24:59 -0000	1.8
@@ -1 +1 @@
-14a5f1a94a4c95c478fcc3d76f9a4fdf  mimedefang-2.64.tar.gz
+39e889adcf8bda767fc9a2f03e887c4c  mimedefang-2.65.tar.gz



From robert at fedoraproject.org  Thu Sep  4 20:25:31 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu,  4 Sep 2008 20:25:31 +0000 (UTC)
Subject: rpms/mimedefang/F-9 .cvsignore, 1.7, 1.8 mimedefang.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <20080904202531.0FE2E70120@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/mimedefang/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16988/F-9

Modified Files:
	.cvsignore mimedefang.spec sources 
Log Message:
Upgrade to 2.65



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Feb 2008 21:33:56 -0000	1.7
+++ .cvsignore	4 Sep 2008 20:25:00 -0000	1.8
@@ -1 +1 @@
-mimedefang-2.64.tar.gz
+mimedefang-2.65.tar.gz


Index: mimedefang.spec
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/F-9/mimedefang.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mimedefang.spec	9 Feb 2008 21:33:56 -0000	1.10
+++ mimedefang.spec	4 Sep 2008 20:25:00 -0000	1.11
@@ -1,6 +1,6 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
-Version:           2.64
+Version:           2.65
 Release:           1%{?dist}
 License:           GPLv2+
 Group:             System Environment/Daemons
@@ -98,6 +98,9 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Thu Sep 04 2008 Robert Scheck <robert at fedoraproject.org> 2.65-1
+- Upgrade to 2.65
+
 * Sat Feb 09 2008 Robert Scheck <robert at fedoraproject.org> 2.64-1
 - Upgrade to 2.64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Feb 2008 21:33:56 -0000	1.7
+++ sources	4 Sep 2008 20:25:00 -0000	1.8
@@ -1 +1 @@
-14a5f1a94a4c95c478fcc3d76f9a4fdf  mimedefang-2.64.tar.gz
+39e889adcf8bda767fc9a2f03e887c4c  mimedefang-2.65.tar.gz



From robert at fedoraproject.org  Thu Sep  4 20:25:31 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu,  4 Sep 2008 20:25:31 +0000 (UTC)
Subject: rpms/mimedefang/devel .cvsignore, 1.7, 1.8 mimedefang.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <20080904202531.7A0B170120@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/mimedefang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16988/devel

Modified Files:
	.cvsignore mimedefang.spec sources 
Log Message:
Upgrade to 2.65



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Feb 2008 21:33:56 -0000	1.7
+++ .cvsignore	4 Sep 2008 20:25:01 -0000	1.8
@@ -1 +1 @@
-mimedefang-2.64.tar.gz
+mimedefang-2.65.tar.gz


Index: mimedefang.spec
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/devel/mimedefang.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mimedefang.spec	9 Feb 2008 21:33:56 -0000	1.10
+++ mimedefang.spec	4 Sep 2008 20:25:01 -0000	1.11
@@ -1,6 +1,6 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
-Version:           2.64
+Version:           2.65
 Release:           1%{?dist}
 License:           GPLv2+
 Group:             System Environment/Daemons
@@ -98,6 +98,9 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Thu Sep 04 2008 Robert Scheck <robert at fedoraproject.org> 2.65-1
+- Upgrade to 2.65
+
 * Sat Feb 09 2008 Robert Scheck <robert at fedoraproject.org> 2.64-1
 - Upgrade to 2.64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Feb 2008 21:33:56 -0000	1.7
+++ sources	4 Sep 2008 20:25:01 -0000	1.8
@@ -1 +1 @@
-14a5f1a94a4c95c478fcc3d76f9a4fdf  mimedefang-2.64.tar.gz
+39e889adcf8bda767fc9a2f03e887c4c  mimedefang-2.65.tar.gz



From robert at fedoraproject.org  Thu Sep  4 20:25:30 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu,  4 Sep 2008 20:25:30 +0000 (UTC)
Subject: rpms/mimedefang/F-8 .cvsignore, 1.7, 1.8 mimedefang.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <20080904202530.B518E70120@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/mimedefang/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16988/F-8

Modified Files:
	.cvsignore mimedefang.spec sources 
Log Message:
Upgrade to 2.65



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Feb 2008 21:33:51 -0000	1.7
+++ .cvsignore	4 Sep 2008 20:25:00 -0000	1.8
@@ -1 +1 @@
-mimedefang-2.64.tar.gz
+mimedefang-2.65.tar.gz


Index: mimedefang.spec
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/F-8/mimedefang.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mimedefang.spec	9 Feb 2008 21:33:51 -0000	1.10
+++ mimedefang.spec	4 Sep 2008 20:25:00 -0000	1.11
@@ -1,6 +1,6 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
-Version:           2.64
+Version:           2.65
 Release:           1%{?dist}
 License:           GPLv2+
 Group:             System Environment/Daemons
@@ -98,6 +98,9 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Thu Sep 04 2008 Robert Scheck <robert at fedoraproject.org> 2.65-1
+- Upgrade to 2.65
+
 * Sat Feb 09 2008 Robert Scheck <robert at fedoraproject.org> 2.64-1
 - Upgrade to 2.64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Feb 2008 21:33:51 -0000	1.7
+++ sources	4 Sep 2008 20:25:00 -0000	1.8
@@ -1 +1 @@
-14a5f1a94a4c95c478fcc3d76f9a4fdf  mimedefang-2.64.tar.gz
+39e889adcf8bda767fc9a2f03e887c4c  mimedefang-2.65.tar.gz



From robert at fedoraproject.org  Thu Sep  4 20:25:29 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu,  4 Sep 2008 20:25:29 +0000 (UTC)
Subject: rpms/mimedefang/EL-4 .cvsignore, 1.5, 1.6 mimedefang.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <20080904202529.C898270120@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/mimedefang/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16988/EL-4

Modified Files:
	.cvsignore mimedefang.spec sources 
Log Message:
Upgrade to 2.65



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/EL-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Apr 2007 20:43:08 -0000	1.5
+++ .cvsignore	4 Sep 2008 20:24:59 -0000	1.6
@@ -1 +1 @@
-mimedefang-2.62.tar.gz
+mimedefang-2.65.tar.gz


Index: mimedefang.spec
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/EL-4/mimedefang.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mimedefang.spec	7 May 2007 18:14:41 -0000	1.8
+++ mimedefang.spec	4 Sep 2008 20:24:59 -0000	1.9
@@ -1,15 +1,15 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
-Version:           2.62
-Release:           2%{?dist}
-License:           GPL
+Version:           2.65
+Release:           1%{?dist}
+License:           GPLv2+
 Group:             System Environment/Daemons
 URL:               http://www.mimedefang.org/
 Source0:           http://www.mimedefang.org/static/%{name}-%{version}.tar.gz
 Source1:           README.FEDORA
 Requires:          sendmail-cf >= 8.12.0, perl-MailTools >= 1.15, perl(Mail::SpamAssassin) >= 1.6
 Requires:          perl(IO::Stringy) >= 1.212, perl(MIME::Base64) >= 3.03
-Requires(pre):     /usr/sbin/useradd
+Requires(pre):     shadow-utils
 Requires(post):    /sbin/chkconfig, perl(Digest::SHA1)
 Requires(preun):   /sbin/service, /sbin/chkconfig
 Requires(postun):  /sbin/service
@@ -52,11 +52,14 @@
 sed -i '1s@^@#!%{_bindir}/perl\n@' $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl
 
 %pre
-if [ -x %{_sbindir}/fedora-useradd ]; then
-  %{_sbindir}/fedora-useradd 8 -r -s /sbin/nologin -d %{_localstatedir}/spool/MIMEDefang -M -c "MIMEDefang User" defang > /dev/null 2>&1 || :
+if [ -x %{_sbindir}/fedora-groupadd -a -x %{_sbindir}/fedora-useradd ]; then
+  getent group defang > /dev/null || %{_sbindir}/fedora-groupadd 8 -r defang
+  getent passwd defang > /dev/null || %{_sbindir}/fedora-useradd 8 -r -g defang -d %{_localstatedir}/spool/MIMEDefang -s /sbin/nologin -c "MIMEDefang User" defang
 else
-  %{_sbindir}/useradd -r -s /sbin/nologin -d %{_localstatedir}/spool/MIMEDefang -M -c "MIMEDefang User" defang > /dev/null 2>&1 || :
+  getent group defang > /dev/null || %{_sbindir}/groupadd -r defang
+  getent passwd defang > /dev/null || %{_sbindir}/useradd -r -g defang -d %{_localstatedir}/spool/MIMEDefang -s /sbin/nologin -c "MIMEDefang User" defang
 fi
+exit 0
 
 %post
 /sbin/chkconfig --add %{name}
@@ -95,6 +98,16 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Thu Sep 04 2008 Robert Scheck <robert at fedoraproject.org> 2.65-1
+- Upgrade to 2.65
+
+* Sat Feb 09 2008 Robert Scheck <robert at fedoraproject.org> 2.64-1
+- Upgrade to 2.64
+
+* Wed Aug 29 2007 Robert Scheck <robert at fedoraproject.org> 2.63-1
+- Upgrade to 2.63
+- Updated the license tag according to the guidelines
+
 * Mon May 07 2007 Robert Scheck <robert at fedoraproject.org> 2.62-2
 - Changed sendmail build requirement slightly (#237157)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Apr 2007 20:43:08 -0000	1.5
+++ sources	4 Sep 2008 20:24:59 -0000	1.6
@@ -1 +1 @@
-2b040a77e93ab913a83aaa45a94a54a9  mimedefang-2.62.tar.gz
+39e889adcf8bda767fc9a2f03e887c4c  mimedefang-2.65.tar.gz



From spot at fedoraproject.org  Thu Sep  4 20:44:29 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 20:44:29 +0000 (UTC)
Subject: rpms/skkdic/devel .cvsignore, 1.2, 1.3 skkdic.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <20080904204429.AAA5570120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/skkdic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26968

Modified Files:
	.cvsignore skkdic.spec sources 
Log Message:
fix license tag, update source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skkdic/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jun 2005 08:17:46 -0000	1.2
+++ .cvsignore	4 Sep 2008 20:43:59 -0000	1.3
@@ -1 +1 @@
-skkdic-20050614.tar.bz2
+skkdic-20080904.tar.bz2


Index: skkdic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skkdic/devel/skkdic.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- skkdic.spec	23 Sep 2006 05:29:27 -0000	1.3
+++ skkdic.spec	4 Sep 2008 20:43:59 -0000	1.4
@@ -1,13 +1,19 @@
 Summary: Dictionaries for SKK (Simple Kana-Kanji conversion program)
 Name: skkdic
-Version: 20050614
-Release: 2%{?dist}
-License: GPL
+Version: 20080904
+Release: 1%{?dist}
+License: GPLv2+
 Group: System Environment/Libraries
-Source: skkdic-%{version}.tar.bz2
+# 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/wiki/wiki.cgi
-BuildArchitectures: noarch
+URL: http://openlab.ring.gr.jp/skk/skk/dic/
+BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 
 %description
@@ -23,6 +29,7 @@
 %build
 
 %install
+rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/skk
 
 for f in SKK-JISYO* zipcode/SKK-JISYO*; do \
@@ -35,10 +42,14 @@
 %files
 %defattr(-,root,root)
 %doc ChangeLog.gz READMEs/committers.txt edict_doc.txt zipcode/README-zipcode.ja README-skkdic.rh.ja
-%{_datadir}/skk
+%{_datadir}/skk/
 
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 20080904-1
+- fix license tag
+- update source files
+
 * Tue Sep 23 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20050614-2
 - mass rebuilding
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skkdic/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jun 2005 08:17:46 -0000	1.2
+++ sources	4 Sep 2008 20:43:59 -0000	1.3
@@ -1 +1 @@
-64b61570c19aef864e87c6ae8385db18  skkdic-20050614.tar.bz2
+a5132e3ab05cdd7a7a6f770fc45a58dc  skkdic-20080904.tar.bz2



From mschwendt at fedoraproject.org  Thu Sep  4 20:45:24 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu,  4 Sep 2008 20:45:24 +0000 (UTC)
Subject: extras-buildsys/server User.py, 1.7.6.2, 1.7.6.3 UserInterface.py, 
	1.58.2.2.4.2, 1.58.2.2.4.3
Message-ID: <20080904204524.30BF770120@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/server
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27566

Modified Files:
      Tag: Plague-0_4_5
	User.py UserInterface.py 
Log Message:
commit the fixes mentioned in changelog


Index: User.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/User.py,v
retrieving revision 1.7.6.2
retrieving revision 1.7.6.3
diff -u -r1.7.6.2 -r1.7.6.3
--- User.py	4 Sep 2008 02:14:20 -0000	1.7.6.2
+++ User.py	4 Sep 2008 20:45:23 -0000	1.7.6.3
@@ -20,6 +20,8 @@
     import pysqlite2._sqlite as sqlite
 
 import sys
+sys.path.append('/usr/share/plague/server')
+from DBManager import ResultSet
 
 CONFIG_LOCATION = "/etc/plague/server/"
 
@@ -84,6 +86,7 @@
         dbcx.commit()
         item = curs.fetchone()
         if item:
+            item = ResultSet(item, curs.description)
             user = User(email, False)
             user.own_jobs = item['own_jobs']
             user.job_admin = item['job_admin']


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.58.2.2.4.2
retrieving revision 1.58.2.2.4.3
diff -u -r1.58.2.2.4.2 -r1.58.2.2.4.3
--- UserInterface.py	31 Jan 2008 14:30:13 -0000	1.58.2.2.4.2
+++ UserInterface.py	4 Sep 2008 20:45:23 -0000	1.58.2.2.4.3
@@ -84,6 +84,12 @@
     return target_cfg
 
 
+def _fetchone(cursor,row):  # sqlite3 helper
+    if not row:
+        return None
+    return DBManager.ResultSet(row, cursor.description)
+
+
 class UserInterface:
     """
     Base UserInterface class. NO AUTHENTICATION.  Subclass this to provide some.
@@ -184,7 +190,7 @@
             del curs, dbcx
             return (-1, "Unable to access job database: '%s'" % e)
         curs.execute(sql)
-        job = dbcx.fetchone(curs)
+        job = _fetchone(curs,dbcx.fetchone(curs))
         result = None
         if not job:
             result = (-1, "Error: Invalid job UID.")
@@ -318,7 +324,7 @@
             del curs, dbcx
             return (-1, "Unable to access job database: '%s'" % e, [])
         curs.execute(sql)
-        data = dbcx.fetchall(curs)
+        data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
         jobs = []
         for row in data:
             jobrec = {}
@@ -349,7 +355,7 @@
             sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, "  \
                     "status, builder_status FROM archjobs WHERE " + uids
             curs.execute(sql)
-            data = dbcx.fetchall(curs)
+            data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
             for row in data:
                 ajrec = {}
                 ajrec['jobid'] = row['jobid']
@@ -386,7 +392,7 @@
         except StandardError, e:
             return (-1, "Unable to access job database: '%s'" % e, {})
         curs.execute(sql)
-        job = dbcx.fetchone(curs)
+        job = _fetchone(curs,dbcx.fetchone(curs))
         if not job:
             del curs, dbcx
             return (-1, "Error: Invalid job UID.", {})
@@ -420,7 +426,7 @@
         sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, "    \
                 "status, builder_status FROM archjobs WHERE parent_uid=%d " % uid
         curs.execute(sql)
-        data = dbcx.fetchall(curs)
+        data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
         for row in data:
             ajrec = {}
             ajrec['jobid'] = row['jobid']
@@ -541,7 +547,7 @@
             return (-1, "Unable to access job database: '%s'" % e)
 
         curs.execute(sql)
-        job = dbcx.fetchone(curs)
+        job = _fetchone(curs,dbcx.fetchone(curs))
 
         result = None
         if not job:
@@ -630,7 +636,7 @@
             return (-1, "Unable to access job database: '%s'" % e)
 
         curs.execute(sql)
-        data = dbcx.fetchall(curs)
+        data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
 
         # Ensure that the user can actually finish the jobs they requested
         final_uid_list = []



From mbooth at fedoraproject.org  Thu Sep  4 20:50:08 2008
From: mbooth at fedoraproject.org (Mat Booth)
Date: Thu,  4 Sep 2008 20:50:08 +0000 (UTC)
Subject: rpms/eclipse-epic/F-9 .cvsignore, 1.4, 1.5 eclipse-epic.spec, 1.4, 
	1.5 get-epic.sh, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20080904205008.D11AC70120@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-epic/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28974

Modified Files:
	.cvsignore eclipse-epic.spec get-epic.sh sources 
Log Message:
* Thu Sep 04 2008 Mat Booth <fedora at matbooth.co.uk> 0.6.25-1
- Updated to version 0.6.25.
- New features: Persistent variables view options and Module::Starter
  integration.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-epic/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Jun 2008 14:20:30 -0000	1.4
+++ .cvsignore	4 Sep 2008 20:49:38 -0000	1.5
@@ -1 +1 @@
-epic-0.6.24.tar.gz
+epic-0.6.25.tar.gz


Index: eclipse-epic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-epic/F-9/eclipse-epic.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-epic.spec	14 Jun 2008 12:36:40 -0000	1.4
+++ eclipse-epic.spec	4 Sep 2008 20:49:38 -0000	1.5
@@ -2,12 +2,12 @@
 %define gcj_support      1
 
 Name:      eclipse-epic
-Version:   0.6.24
-Release:   2%{?dist}
+Version:   0.6.25
+Release:   1%{?dist}
 Summary:   Perl Eclipse plugin
 Group:     Development/Tools
 License:   CPL
-URL:       http://e-p-i-c.sourceforge.net/
+URL:       http://www.epic-ide.org/
 
 # source tarball and the script used to generate it from upstream's source control
 # script usage:
@@ -134,7 +134,9 @@
 %files
 %defattr(-,root,root,-)
 %doc %{eclipse_base}/features/org.epic.feature.main_%{version}/license.html
-%{eclipse_base}/features/org.epic.feature.main_*
+%{eclipse_base}/features/org.epic.feature.main_%{version}/feature.xml
+%{eclipse_base}/features/org.epic.feature.main_%{version}/icons
+%dir %{eclipse_base}/features/org.epic.feature.main_%{version}
 %{eclipse_base}/plugins/org.epic.debug_*
 %{eclipse_base}/plugins/org.epic.doc_*
 %{eclipse_base}/plugins/org.epic.lib_*
@@ -146,6 +148,11 @@
 %endif
 
 %changelog
+* Thu Sep 04 2008 Mat Booth <fedora at matbooth.co.uk> 0.6.25-1
+- Updated to version 0.6.25.
+- New features: Persistent variables view options and Module::Starter
+  integration.
+
 * Sat Jun 14 2008 Mat Booth <fedora at matbooth.co.uk> 0.6.24-2
 - Fixed package ownership of feature directory.
 


Index: get-epic.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-epic/F-9/get-epic.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- get-epic.sh	1 Jun 2008 14:20:30 -0000	1.3
+++ get-epic.sh	4 Sep 2008 20:49:38 -0000	1.4
@@ -1,7 +1,7 @@
 #!/bin/sh
 NAME="epic"
-VERSION=0.6.24
-TAG="testing_0_6_24"
+VERSION=0.6.25
+TAG="testing_0_6_25"
 
 echo "Exporting from CVS..."
 mkdir $NAME-$VERSION


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-epic/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Jun 2008 14:20:30 -0000	1.4
+++ sources	4 Sep 2008 20:49:38 -0000	1.5
@@ -1 +1 @@
-f78d4fb6b401bea7815f1285ae83bbdf  epic-0.6.24.tar.gz
+c3a8c56324a85507c1d0164a1f293354  epic-0.6.25.tar.gz



From pkgdb at fedoraproject.org  Thu Sep  4 20:57:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 20:57:35 +0000
Subject: [pkgdb] augeas had acl change status
Message-ID: <20080904205735.BC54B208769@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on augeas (Fedora 9) to Approved for apevec

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/augeas



From pkgdb at fedoraproject.org  Thu Sep  4 20:57:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 20:57:37 +0000
Subject: [pkgdb] augeas had acl change status
Message-ID: <20080904205737.2BFEA20876D@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on augeas (Fedora 9) to Approved for apevec

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/augeas



From spot at fedoraproject.org  Thu Sep  4 20:57:44 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 20:57:44 +0000 (UTC)
Subject: rpms/socat/devel socat.spec,1.7,1.8
Message-ID: <20080904205744.0A01470120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/socat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31685

Modified Files:
	socat.spec 
Log Message:
fix license tag, update to 1.6.0.1


Index: socat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/socat/devel/socat.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- socat.spec	19 Feb 2008 20:15:44 -0000	1.7
+++ socat.spec	4 Sep 2008 20:57:13 -0000	1.8
@@ -1,14 +1,13 @@
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
-Version: 1.5.0.0
-Release: 8%{?dist}
-License: GPL
+Version: 1.6.0.1
+Release: 1%{?dist}
+License: GPLv2
 Url:  http://www.dest-unreach.org/%{name}
 Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel readline-devel ncurses-devel kernel-headers > 2.6.18
-Patch0: socat-ext2.patch
 
 %description
 Socat is a relay for bidirectional data transfer between two independent data
@@ -20,11 +19,10 @@
 
 %prep
 %setup -q 
-# some linux ext2 defines moved into fs.h, patch sent to upstream.
-%patch0 -p0
 
+%build
 %configure  \
-        --enable-help --enable-stdio \
+	--enable-help --enable-stdio \
         --enable-fdnum --enable-file --enable-creat \
         --enable-gopen --enable-pipe --enable-termios \
         --enable-unix --enable-ip4 --enable-ip6 \
@@ -34,7 +32,6 @@
         --enable-openssl --enable-sycls --enable-filan \
         --enable-retry --enable-libwrap
 
-%build
 chmod 644 *.sh
 make %{?_smp_mflags}
 
@@ -49,7 +46,7 @@
 %files 
 %defattr(-,root,root)
 %doc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ PORTING
-%doc COPYING* README SECURITY testcert.conf socat.html
+%doc COPYING* README SECURITY testcert.conf
 %doc daemon.sh ftp.sh gatherinfo.sh mail.sh proxy.sh 
 %doc proxyecho.sh readline.sh readline-test.sh
 %doc socks4echo.sh socks4a-echo.sh test.sh
@@ -59,6 +56,10 @@
 %doc %{_mandir}/man1/socat.1*
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.0.1-1
+- fix license tag
+- update to 1.6.0.1
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.5.0.0-8
 - Autorebuild for GCC 4.3
 



From pkgdb at fedoraproject.org  Thu Sep  4 20:57:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 20:57:49 +0000
Subject: [pkgdb] augeas had acl change status
Message-ID: <20080904205749.95233208771@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on augeas (Fedora devel) to Approved for apevec

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/augeas



From pkgdb at fedoraproject.org  Thu Sep  4 20:57:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 20:57:53 +0000
Subject: [pkgdb] augeas had acl change status
Message-ID: <20080904205753.643CD208D97@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on augeas (Fedora devel) to Approved for apevec

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/augeas



From pkgdb at fedoraproject.org  Thu Sep  4 20:58:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 20:58:06 +0000
Subject: [pkgdb] augeas had acl change status
Message-ID: <20080904205806.81CD8208769@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on augeas (Fedora devel) to Approved for apevec

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/augeas



From pkgdb at fedoraproject.org  Thu Sep  4 20:58:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 20:58:10 +0000
Subject: [pkgdb] augeas had acl change status
Message-ID: <20080904205810.6D08F2086F6@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on augeas (Fedora 8) to Approved for apevec

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/augeas



From pkgdb at fedoraproject.org  Thu Sep  4 20:58:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 20:58:11 +0000
Subject: [pkgdb] augeas had acl change status
Message-ID: <20080904205811.475AB208770@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on augeas (Fedora 9) to Approved for apevec

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/augeas



From pkgdb at fedoraproject.org  Thu Sep  4 20:58:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 20:58:26 +0000
Subject: [pkgdb] augeas had acl change status
Message-ID: <20080904205826.F07CD208D97@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on augeas (Fedora 8) to Approved for apevec

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/augeas



From pkgdb at fedoraproject.org  Thu Sep  4 20:58:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 20:58:27 +0000
Subject: [pkgdb] augeas had acl change status
Message-ID: <20080904205827.EC595208D99@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on augeas (Fedora 8) to Approved for apevec

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/augeas



From spot at fedoraproject.org  Thu Sep  4 20:59:40 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 20:59:40 +0000 (UTC)
Subject: rpms/sofsip-cli/devel sofsip-cli.spec,1.5,1.6
Message-ID: <20080904205940.F31B470120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sofsip-cli/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32473

Modified Files:
	sofsip-cli.spec 
Log Message:
fix license tag


Index: sofsip-cli.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sofsip-cli/devel/sofsip-cli.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sofsip-cli.spec	11 Feb 2008 20:44:37 -0000	1.5
+++ sofsip-cli.spec	4 Sep 2008 20:59:10 -0000	1.6
@@ -1,10 +1,10 @@
 Name:           sofsip-cli
 Version:        0.13
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        SIP VoIP/IM example client
 
 Group:          Applications/Internet
-License:        LGPL
+License:        LGPLv2+
 URL:            http://sofia-sip.sourceforge.net/
 Source0:        http://dl.sourceforge.net/sofia-sip/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +45,9 @@
 %{_mandir}/man1/sofsip_cli.1*
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.13-6
+- fix license tag
+
 * Mon Feb 11 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13-5
 - Rebuild for GCC 4.3
 



From spot at fedoraproject.org  Thu Sep  4 20:59:50 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 20:59:50 +0000 (UTC)
Subject: rpms/socat/devel .cvsignore, 1.2, 1.3 socat.spec, 1.8, 1.9 sources, 
	1.2, 1.3
Message-ID: <20080904205950.9FCF670120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/socat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32569

Modified Files:
	.cvsignore socat.spec sources 
Log Message:
forgot source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/socat/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Aug 2006 02:30:41 -0000	1.2
+++ .cvsignore	4 Sep 2008 20:59:20 -0000	1.3
@@ -1 +1 @@
-socat-1.5.0.0.tar.bz2
+socat-1.6.0.1.tar.bz2


Index: socat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/socat/devel/socat.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- socat.spec	4 Sep 2008 20:57:13 -0000	1.8
+++ socat.spec	4 Sep 2008 20:59:20 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
 Version: 1.6.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Url:  http://www.dest-unreach.org/%{name}
 Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
@@ -56,6 +56,9 @@
 %doc %{_mandir}/man1/socat.1*
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.0.1-2
+- forgot to upload new source
+
 * Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.0.1-1
 - fix license tag
 - update to 1.6.0.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/socat/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Aug 2006 02:30:41 -0000	1.2
+++ sources	4 Sep 2008 20:59:20 -0000	1.3
@@ -1 +1 @@
-84b709de13e236198a4606fb4b80e123  socat-1.5.0.0.tar.bz2
+6a0dd33cde2a18eb382433aca8f76ce2  socat-1.6.0.1.tar.bz2



From dwalsh at fedoraproject.org  Thu Sep  4 20:59:58 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  4 Sep 2008 20:59:58 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20080710.patch, 1.26,
	1.27 selinux-policy.spec, 1.702, 1.703
Message-ID: <20080904205958.D557870120@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32626

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
* Thu Sep 4 2008 Dan Walsh <dwalsh at redhat.com> 3.5.6-2
- Add tinyxs-max file system support


policy-20080710.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.26 -r 1.27 policy-20080710.patch
Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- policy-20080710.patch	3 Sep 2008 20:05:26 -0000	1.26
+++ policy-20080710.patch	4 Sep 2008 20:59:27 -0000	1.27
@@ -1,6 +1,6 @@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.6/Makefile
 --- nsaserefpolicy/Makefile	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.5.6/Makefile	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/Makefile	2008-09-03 15:55:22.000000000 -0400
 @@ -311,20 +311,22 @@
  
  # parse-rolemap modulename,outputfile
@@ -47,7 +47,7 @@
  	$(verbose) $(INSTALL) -m 644 $< $@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.6/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.5.6/Rules.modular	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/Rules.modular	2008-09-03 15:55:22.000000000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -79,7 +79,7 @@
  $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.6/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.6/config/appconfig-mcs/default_contexts	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mcs/default_contexts	2008-09-03 15:55:22.000000000 -0400
 @@ -1,15 +0,0 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -98,13 +98,13 @@
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_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.5.6/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.6/config/appconfig-mcs/failsafe_context	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mcs/failsafe_context	2008-09-03 15:55:22.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.6/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.6/config/appconfig-mcs/guest_u_default_contexts	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mcs/guest_u_default_contexts	2008-09-03 15:55:22.000000000 -0400
 @@ -0,0 +1,6 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -114,7 +114,7 @@
 +guest_r:guest_t:s0		guest_r:guest_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.5.6/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.6/config/appconfig-mcs/root_default_contexts	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mcs/root_default_contexts	2008-09-03 15:55:22.000000000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
  system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -130,7 +130,7 @@
 +system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.5.6/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.6/config/appconfig-mcs/staff_u_default_contexts	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mcs/staff_u_default_contexts	2008-09-03 15:55:22.000000000 -0400
 @@ -5,6 +5,8 @@
  system_r:xdm_t:s0		staff_r:staff_t:s0
  staff_r:staff_su_t:s0		staff_r:staff_t:s0
@@ -142,7 +142,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.6/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.6/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-03 15:55:22.000000000 -0400
 @@ -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
@@ -152,7 +152,7 @@
  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/user_u_default_contexts serefpolicy-3.5.6/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.6/config/appconfig-mcs/user_u_default_contexts	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mcs/user_u_default_contexts	2008-09-03 15:55:22.000000000 -0400
 @@ -5,4 +5,5 @@
  system_r:xdm_t:s0		user_r:user_t:s0
  user_r:user_su_t:s0		user_r:user_t:s0
@@ -162,13 +162,13 @@
 +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/userhelper_context serefpolicy-3.5.6/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.6/config/appconfig-mcs/userhelper_context	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mcs/userhelper_context	2008-09-03 15:55:22.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/xguest_u_default_contexts serefpolicy-3.5.6/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.6/config/appconfig-mcs/xguest_u_default_contexts	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mcs/xguest_u_default_contexts	2008-09-03 15:55:22.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -179,7 +179,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.6/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.6/config/appconfig-mls/guest_u_default_contexts	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-mls/guest_u_default_contexts	2008-09-03 15:55:22.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -187,7 +187,7 @@
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.6/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.6/config/appconfig-standard/guest_u_default_contexts	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-standard/guest_u_default_contexts	2008-09-03 15:55:22.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -195,7 +195,7 @@
 +system_r:crond_t	guest_r:guest_crond_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.5.6/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.6/config/appconfig-standard/root_default_contexts	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-standard/root_default_contexts	2008-09-03 15:55:22.000000000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t	unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t
  system_r:local_login_t  unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
@@ -211,7 +211,7 @@
 +system_r:sshd_t	unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.6/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.6/config/appconfig-standard/xguest_u_default_contexts	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/config/appconfig-standard/xguest_u_default_contexts	2008-09-03 15:55:22.000000000 -0400
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -220,7 +220,7 @@
 +system_r:xdm_t		xguest_r:xguest_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.5.6/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.6/policy/global_tunables	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/global_tunables	2008-09-03 15:55:22.000000000 -0400
 @@ -34,7 +34,7 @@
  
  ## <desc>
@@ -261,7 +261,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.5.6/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/admin/alsa.te	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/admin/alsa.te	2008-09-03 15:55:22.000000000 -0400
 @@ -51,6 +51,8 @@
  
  auth_use_nsswitch(alsa_t)
@@ -273,7 +273,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.5.6/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/admin/anaconda.te	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/admin/anaconda.te	2008-09-03 15:55:22.000000000 -0400
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -284,7 +284,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.5.6/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/admin/certwatch.te	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/admin/certwatch.te	2008-09-03 15:55:22.000000000 -0400
 @@ -15,8 +15,19 @@
  #
  # Local policy
@@ -323,7 +323,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.5.6/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/admin/consoletype.te	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/admin/consoletype.te	2008-09-03 15:55:22.000000000 -0400
 @@ -8,9 +8,11 @@
  
  type consoletype_t;
@@ -349,7 +349,7 @@
  init_use_fds(consoletype_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.5.6/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2008-08-25 09:12:31.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/admin/firstboot.te	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/admin/firstboot.te	2008-09-03 15:55:22.000000000 -0400
 @@ -118,15 +118,7 @@
  	usermanage_domtrans_admin_passwd(firstboot_t)
  ')
@@ -371,7 +371,7 @@
 -') dnl end TODO
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.5.6/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/admin/kismet.te	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/admin/kismet.te	2008-09-03 15:55:22.000000000 -0400
 @@ -26,7 +26,10 @@
  #
[...3930 lines suppressed...]
++########################################
++## <summary>
++##	Execute setrans server in the setrans domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++#
++interface(`setrans_script_domtrans',`
++	gen_require(`
++		type setrans_script_exec_t;
++	')
++
++	init_script_domtrans_spec($1, setrans_script_exec_t)
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-3.5.6/policy/modules/system/setrans.te
 --- nsaserefpolicy/policy/modules/system/setrans.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/setrans.te	2008-09-03 11:18:25.000000000 -0400
-@@ -28,7 +28,7 @@
++++ serefpolicy-3.5.6/policy/modules/system/setrans.te	2008-09-04 15:59:46.000000000 -0400
+@@ -14,6 +14,9 @@
+ files_pid_file(setrans_var_run_t)
+ mls_trusted_object(setrans_var_run_t)
+ 
++type setrans_script_exec_t;
++init_script_file(setrans_script_exec_t)
++
+ ifdef(`enable_mcs',`
+ 	init_ranged_daemon_domain(setrans_t, setrans_exec_t,s0 - mcs_systemhigh)
+ ')
+@@ -28,7 +31,7 @@
  #
  
  allow setrans_t self:capability sys_resource;
@@ -31697,7 +31809,7 @@
  allow setrans_t self:unix_stream_socket create_stream_socket_perms;
  allow setrans_t self:unix_dgram_socket create_socket_perms;
  allow setrans_t self:netlink_selinux_socket create_socket_perms;
-@@ -58,6 +58,7 @@
+@@ -58,6 +61,7 @@
  mls_socket_write_all_levels(setrans_t)
  mls_process_read_up(setrans_t)
  mls_socket_read_all_levels(setrans_t)
@@ -31707,7 +31819,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.6/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/sysnetwork.fc	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/sysnetwork.fc	2008-09-03 15:55:23.000000000 -0400
 @@ -57,3 +57,5 @@
  ifdef(`distro_gentoo',`
  /var/lib/dhcpc(/.*)?		gen_context(system_u:object_r:dhcpc_state_t,s0)
@@ -31716,7 +31828,7 @@
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.5.6/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/sysnetwork.if	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/sysnetwork.if	2008-09-03 15:55:23.000000000 -0400
 @@ -553,6 +553,7 @@
  		type net_conf_t;
  	')
@@ -31797,7 +31909,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.6/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2008-08-11 11:23:34.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/sysnetwork.te	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/sysnetwork.te	2008-09-03 15:55:23.000000000 -0400
 @@ -20,6 +20,10 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -31981,7 +32093,7 @@
  	xen_append_log(ifconfig_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.6/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/udev.if	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/udev.if	2008-09-03 15:55:23.000000000 -0400
 @@ -96,6 +96,24 @@
  
  ########################################
@@ -32037,7 +32149,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.6/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/udev.te	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/udev.te	2008-09-03 15:55:23.000000000 -0400
 @@ -83,6 +83,7 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
@@ -32095,7 +32207,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.6/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/unconfined.fc	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/unconfined.fc	2008-09-03 15:55:23.000000000 -0400
 @@ -2,15 +2,11 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -32136,7 +32248,7 @@
 +/opt/real/(.*/)?realplay\.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.5.6/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/unconfined.if	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/unconfined.if	2008-09-03 15:55:23.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -32482,7 +32594,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.6/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-09-03 07:59:15.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/unconfined.te	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/unconfined.te	2008-09-03 15:55:23.000000000 -0400
 @@ -1,40 +1,80 @@
  
 -policy_module(unconfined, 2.3.1)
@@ -32819,7 +32931,7 @@
 +domain_ptrace_all_domains(unconfined_notrans_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.6/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/userdomain.fc	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/userdomain.fc	2008-09-03 15:55:23.000000000 -0400
 @@ -1,4 +1,5 @@
 -HOME_DIR	-d	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
 -HOME_DIR/.+		gen_context(system_u:object_r:ROLE_home_t,s0)
@@ -32832,7 +32944,7 @@
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.5.6/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/userdomain.if	2008-09-03 14:36:24.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/userdomain.if	2008-09-03 15:55:23.000000000 -0400
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -35394,7 +35506,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.6/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/userdomain.te	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/userdomain.te	2008-09-03 15:55:23.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -35511,7 +35623,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.6/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/xen.fc	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/xen.fc	2008-09-03 15:55:23.000000000 -0400
 @@ -20,6 +20,7 @@
  /var/run/xenconsoled\.pid --	gen_context(system_u:object_r:xenconsoled_var_run_t,s0)
  /var/run/xend(/.*)?		gen_context(system_u:object_r:xend_var_run_t,s0)
@@ -35522,7 +35634,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.6/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/xen.if	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/xen.if	2008-09-03 15:55:23.000000000 -0400
 @@ -167,11 +167,14 @@
  #
  interface(`xen_stream_connect',`
@@ -35566,7 +35678,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.6/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/xen.te	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/modules/system/xen.te	2008-09-03 15:55:23.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -35805,7 +35917,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.6/policy/support/file_patterns.spt
 --- nsaserefpolicy/policy/support/file_patterns.spt	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.6/policy/support/file_patterns.spt	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/support/file_patterns.spt	2008-09-03 15:55:23.000000000 -0400
 @@ -537,3 +537,18 @@
  	allow $1 $2:dir rw_dir_perms;
  	type_transition $1 $2:$4 $3;
@@ -35827,7 +35939,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.6/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.6/policy/support/obj_perm_sets.spt	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/support/obj_perm_sets.spt	2008-09-03 15:55:23.000000000 -0400
 @@ -316,3 +316,13 @@
  #
  define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }')
@@ -35844,7 +35956,7 @@
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.6/policy/users
 --- nsaserefpolicy/policy/users	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.6/policy/users	2008-09-03 11:18:25.000000000 -0400
++++ serefpolicy-3.5.6/policy/users	2008-09-03 15:55:23.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.702
retrieving revision 1.703
diff -u -r1.702 -r1.703
--- selinux-policy.spec	3 Sep 2008 20:05:26 -0000	1.702
+++ selinux-policy.spec	4 Sep 2008 20:59:27 -0000	1.703
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -380,6 +380,9 @@
 %endif
 
 %changelog
+* Thu Sep 4 2008 Dan Walsh <dwalsh at redhat.com> 3.5.6-2
+- Add tinyxs-max file system support
+
 * Wed Sep 3 2008 Dan Walsh <dwalsh at redhat.com> 3.5.6-1
 - Update to upstream
 - 	 New handling of init scripts



From dwalsh at fedoraproject.org  Thu Sep  4 20:59:58 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  4 Sep 2008 20:59:58 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.203,
	1.204 selinux-policy.spec, 1.705, 1.706
Message-ID: <20080904205958.AE1A570120@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32603

Modified Files:
	policy-20071130.patch selinux-policy.spec 
Log Message:
* Tue Sep 2 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-89
- Fix init script paths


policy-20071130.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.203 -r 1.204 policy-20071130.patch
Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- policy-20071130.patch	3 Sep 2008 20:24:23 -0000	1.203
+++ policy-20071130.patch	4 Sep 2008 20:59:27 -0000	1.204
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.3.1/Makefile
 --- nsaserefpolicy/Makefile	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/Makefile	2008-07-15 14:02:51.000000000 -0400
++++ serefpolicy-3.3.1/Makefile	2008-09-04 16:31:44.000000000 -0400
 @@ -235,7 +235,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -56,7 +56,7 @@
  	$(verbose) $(INSTALL) -m 644 $< $@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.3.1/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/Rules.modular	2008-07-15 14:02:51.000000000 -0400
++++ serefpolicy-3.3.1/Rules.modular	2008-09-04 16:31:44.000000000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -88,7 +88,7 @@
  $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.monolithic serefpolicy-3.3.1/Rules.monolithic
 --- nsaserefpolicy/Rules.monolithic	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/Rules.monolithic	2008-07-15 14:02:51.000000000 -0400
++++ serefpolicy-3.3.1/Rules.monolithic	2008-09-04 16:31:44.000000000 -0400
 @@ -96,7 +96,7 @@
  #
  # Load the binary policy
@@ -100,13 +100,13 @@
  	@touch $(tmpdir)/load
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context	2008-07-15 14:02:51.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context	2008-09-04 16:31:44.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts	2008-08-13 13:50:55.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts	2008-09-04 16:31:44.000000000 -0400
 @@ -0,0 +1,6 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -116,7 +116,7 @@
 +guest_r:guest_t:s0		guest_r:guest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts	2008-07-15 14:02:51.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts	2008-09-04 16:31:44.000000000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
  system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -132,7 +132,7 @@
 +system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-mcs/staff_u_default_contexts	2008-08-13 13:50:13.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/staff_u_default_contexts	2008-09-04 16:31:44.000000000 -0400
 @@ -5,6 +5,8 @@
  system_r:xdm_t:s0		staff_r:staff_t:s0
  staff_r:staff_su_t:s0		staff_r:staff_t:s0
@@ -144,7 +144,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts	2008-08-13 13:49:38.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-04 16:31:44.000000000 -0400
 @@ -0,0 +1,11 @@
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0
 +system_r:initrc_t:s0		unconfined_r:unconfined_t:s0
@@ -159,7 +159,7 @@
 +system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts	2008-08-13 13:52:58.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts	2008-09-04 16:31:44.000000000 -0400
 @@ -5,4 +5,5 @@
  system_r:xdm_t:s0		user_r:user_t:s0
  user_r:user_su_t:s0		user_r:user_t:s0
@@ -169,13 +169,13 @@
 +user_r:user_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context	2008-07-15 14:02:51.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context	2008-09-04 16:31:44.000000000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/x_contexts serefpolicy-3.3.1/config/appconfig-mcs/x_contexts
 --- nsaserefpolicy/config/appconfig-mcs/x_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts	2008-07-15 14:02:51.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts	2008-09-04 16:31:44.000000000 -0400
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -367,7 +367,7 @@
 +event *					system_u:object_r:default_xevent_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts	2008-08-13 13:50:37.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts	2008-09-04 16:31:44.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -378,7 +378,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts	2008-07-15 14:02:51.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts	2008-09-04 16:31:44.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -386,7 +386,7 @@
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/x_contexts serefpolicy-3.3.1/config/appconfig-mls/x_contexts
 --- nsaserefpolicy/config/appconfig-mls/x_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts	2008-07-15 14:02:51.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts	2008-09-04 16:31:44.000000000 -0400
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -578,7 +578,7 @@
 +event *					system_u:object_r:default_xevent_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts	2008-07-15 14:02:51.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts	2008-09-04 16:31:44.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -586,7 +586,7 @@
 +system_r:crond_t	guest_r:guest_crond_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts	2008-07-15 14:02:51.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts	2008-09-04 16:31:44.000000000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t	unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t
  system_r:local_login_t  unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
@@ -602,7 +602,7 @@
 +system_r:sshd_t	unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/x_contexts serefpolicy-3.3.1/config/appconfig-standard/x_contexts
 --- nsaserefpolicy/config/appconfig-standard/x_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts	2008-07-15 14:02:51.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts	2008-09-04 16:31:44.000000000 -0400
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -794,7 +794,7 @@
 +event *					system_u:object_r:default_xevent_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts	2008-07-15 14:02:51.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts	2008-09-04 16:31:44.000000000 -0400
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -803,7 +803,7 @@
 +system_r:xdm_t		xguest_r:xguest_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-3.3.1/man/man8/ftpd_selinux.8
 --- nsaserefpolicy/man/man8/ftpd_selinux.8	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/man/man8/ftpd_selinux.8	2008-07-18 15:14:42.000000000 -0400
++++ serefpolicy-3.3.1/man/man8/ftpd_selinux.8	2008-09-04 16:31:44.000000000 -0400
 @@ -1,52 +1,65 @@
 -.TH  "ftpd_selinux"  "8"  "17 Jan 2005" "dwalsh at redhat.com" "ftpd Selinux Policy documentation"
 +.TH  "ftpd_selinux"  "8"  "17 Jan 2005" "dwalsh at redhat.com" "ftpd SELinux policy documentation"
@@ -911,7 +911,7 @@
 +selinux(8), ftpd(8), setsebool(8), semanage(8), restorecon(8)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.3.1/man/man8/httpd_selinux.8
 --- nsaserefpolicy/man/man8/httpd_selinux.8	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/man/man8/httpd_selinux.8	2008-07-15 14:02:51.000000000 -0400
++++ serefpolicy-3.3.1/man/man8/httpd_selinux.8	2008-09-04 16:31:44.000000000 -0400
 @@ -22,23 +22,19 @@
  .EX
  httpd_sys_content_t 
@@ -943,7 +943,7 @@
  .EE 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.3.1/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/flask/access_vectors	2008-07-15 14:02:51.000000000 -0400
++++ serefpolicy-3.3.1/policy/flask/access_vectors	2008-09-04 16:31:52.000000000 -0400
 @@ -407,141 +407,159 @@
  #
  # SE-X Windows stuff
@@ -1178,7 +1178,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/security_classes serefpolicy-3.3.1/policy/flask/security_classes
 --- nsaserefpolicy/policy/flask/security_classes	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/flask/security_classes	2008-07-15 14:02:51.000000000 -0400
++++ serefpolicy-3.3.1/policy/flask/security_classes	2008-09-04 16:31:53.000000000 -0400
 @@ -50,21 +50,19 @@
  # passwd/chfn/chsh
[...4514 lines suppressed...]
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/auditadm.fc serefpolicy-3.3.1/policy/modules/users/auditadm.fc
 --- nsaserefpolicy/policy/modules/users/auditadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/auditadm.fc	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/auditadm.fc	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1 @@
 +# No auditadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/auditadm.if serefpolicy-3.3.1/policy/modules/users/auditadm.if
 --- nsaserefpolicy/policy/modules/users/auditadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/auditadm.if	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/auditadm.if	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for auditadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/auditadm.te serefpolicy-3.3.1/policy/modules/users/auditadm.te
 --- nsaserefpolicy/policy/modules/users/auditadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/auditadm.te	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/auditadm.te	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1,25 @@
 +policy_module(auditadm,1.0.1)
 +gen_require(`
@@ -40398,17 +40467,17 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.3.1/policy/modules/users/guest.fc
 --- nsaserefpolicy/policy/modules/users/guest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/guest.fc	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/guest.fc	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1 @@
 +# No guest file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.3.1/policy/modules/users/guest.if
 --- nsaserefpolicy/policy/modules/users/guest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/guest.if	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/guest.if	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for guest user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.3.1/policy/modules/users/guest.te
 --- nsaserefpolicy/policy/modules/users/guest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/guest.te	2008-07-24 14:15:43.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/guest.te	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1,31 @@
 +policy_module(guest,1.0.1)
 +userdom_restricted_user_template(guest)
@@ -40443,17 +40512,17 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.3.1/policy/modules/users/logadm.fc
 --- nsaserefpolicy/policy/modules/users/logadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.fc	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/logadm.fc	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1 @@
 +# No logadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.3.1/policy/modules/users/logadm.if
 --- nsaserefpolicy/policy/modules/users/logadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.if	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/logadm.if	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for logadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.3.1/policy/modules/users/logadm.te
 --- nsaserefpolicy/policy/modules/users/logadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.te	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/logadm.te	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1,11 @@
 +policy_module(logadm,1.0.0)
 +
@@ -40468,22 +40537,22 @@
 +logging_admin(logadm_t, logadm_r, { logadm_devpts_t logadm_tty_device_t })
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.3.1/policy/modules/users/metadata.xml
 --- nsaserefpolicy/policy/modules/users/metadata.xml	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/metadata.xml	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/metadata.xml	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1 @@
 +<summary>Policy modules for users</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.fc serefpolicy-3.3.1/policy/modules/users/secadm.fc
 --- nsaserefpolicy/policy/modules/users/secadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.fc	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/secadm.fc	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1 @@
 +# No secadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.if serefpolicy-3.3.1/policy/modules/users/secadm.if
 --- nsaserefpolicy/policy/modules/users/secadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.if	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/secadm.if	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for secadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.te serefpolicy-3.3.1/policy/modules/users/secadm.te
 --- nsaserefpolicy/policy/modules/users/secadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.te	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/secadm.te	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1,39 @@
 +policy_module(secadm,1.0.1)
 +gen_require(`
@@ -40526,17 +40595,17 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.fc serefpolicy-3.3.1/policy/modules/users/staff.fc
 --- nsaserefpolicy/policy/modules/users/staff.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/staff.fc	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/staff.fc	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1 @@
 +# No staff file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.if serefpolicy-3.3.1/policy/modules/users/staff.if
 --- nsaserefpolicy/policy/modules/users/staff.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/staff.if	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/staff.if	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for staff user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.te serefpolicy-3.3.1/policy/modules/users/staff.te
 --- nsaserefpolicy/policy/modules/users/staff.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/staff.te	2008-07-29 16:29:56.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/staff.te	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1,30 @@
 +policy_module(staff,1.0.1)
 +userdom_admin_login_user_template(staff)
@@ -40570,17 +40639,17 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.fc serefpolicy-3.3.1/policy/modules/users/user.fc
 --- nsaserefpolicy/policy/modules/users/user.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/user.fc	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/user.fc	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1 @@
 +# No user file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.if serefpolicy-3.3.1/policy/modules/users/user.if
 --- nsaserefpolicy/policy/modules/users/user.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/user.if	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/user.if	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for user user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.te serefpolicy-3.3.1/policy/modules/users/user.te
 --- nsaserefpolicy/policy/modules/users/user.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/user.te	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/user.te	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1,18 @@
 +policy_module(user,1.0.1)
 +userdom_unpriv_user_template(user)
@@ -40602,17 +40671,17 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.3.1/policy/modules/users/webadm.fc
 --- nsaserefpolicy/policy/modules/users/webadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.fc	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/webadm.fc	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1 @@
 +# No webadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.3.1/policy/modules/users/webadm.if
 --- nsaserefpolicy/policy/modules/users/webadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.if	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/webadm.if	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for webadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.3.1/policy/modules/users/webadm.te
 --- nsaserefpolicy/policy/modules/users/webadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.te	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/webadm.te	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1,41 @@
 +policy_module(webadm,1.0.0)
 +
@@ -40657,17 +40726,17 @@
 +userdom_role_change_template(staff, webadm)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.fc serefpolicy-3.3.1/policy/modules/users/xguest.fc
 --- nsaserefpolicy/policy/modules/users/xguest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.fc	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/xguest.fc	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1 @@
 +# No xguest file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.if serefpolicy-3.3.1/policy/modules/users/xguest.if
 --- nsaserefpolicy/policy/modules/users/xguest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.if	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/xguest.if	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for xguest user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.te serefpolicy-3.3.1/policy/modules/users/xguest.te
 --- nsaserefpolicy/policy/modules/users/xguest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.te	2008-07-29 15:24:16.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/xguest.te	2008-09-04 16:31:45.000000000 -0400
 @@ -0,0 +1,69 @@
 +policy_module(xguest,1.0.1)
 +
@@ -40740,7 +40809,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.3.1/policy/support/file_patterns.spt
 --- nsaserefpolicy/policy/support/file_patterns.spt	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/support/file_patterns.spt	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/support/file_patterns.spt	2008-09-04 16:31:45.000000000 -0400
 @@ -537,3 +537,23 @@
  	allow $1 $2:dir rw_dir_perms;
  	type_transition $1 $2:$4 $3;
@@ -40767,7 +40836,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.3.1/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt	2008-08-29 16:21:06.000000000 -0400
++++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt	2008-09-04 16:31:45.000000000 -0400
 @@ -315,3 +315,13 @@
  #
  define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }')
@@ -40784,7 +40853,7 @@
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.3.1/policy/users
 --- nsaserefpolicy/policy/users	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/users	2008-07-15 14:02:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/users	2008-09-04 16:31:45.000000000 -0400
 @@ -16,7 +16,7 @@
  # and a user process should never be assigned the system user
  # identity.


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v
retrieving revision 1.705
retrieving revision 1.706
diff -u -r1.705 -r1.706
--- selinux-policy.spec	3 Sep 2008 20:24:24 -0000	1.705
+++ selinux-policy.spec	4 Sep 2008 20:59:27 -0000	1.706
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.3.1
-Release: 88%{?dist}
+Release: 89.1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -386,6 +386,9 @@
 %endif
 
 %changelog
+* Tue Sep 2 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-89
+- Fix init script paths
+
 * Tue Sep 2 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-88
 - Allow sendmail to transition to postfix_postdrop_t
 



From mschwendt at fedoraproject.org  Thu Sep  4 21:02:29 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu,  4 Sep 2008 21:02:29 +0000 (UTC)
Subject: extras-buildsys/server UserInterface.py,1.58.2.2.4.3,1.58.2.2.4.4
Message-ID: <20080904210229.2B38E70120@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/server
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1635

Modified Files:
      Tag: Plague-0_4_5
	UserInterface.py 
Log Message:
EL5 python-sqlite: PASS - now retry F8 python-sqlite2


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.58.2.2.4.3
retrieving revision 1.58.2.2.4.4
diff -u -r1.58.2.2.4.3 -r1.58.2.2.4.4
--- UserInterface.py	4 Sep 2008 20:45:23 -0000	1.58.2.2.4.3
+++ UserInterface.py	4 Sep 2008 21:02:28 -0000	1.58.2.2.4.4
@@ -84,12 +84,6 @@
     return target_cfg
 
 
-def _fetchone(cursor,row):  # sqlite3 helper
-    if not row:
-        return None
-    return DBManager.ResultSet(row, cursor.description)
-
-
 class UserInterface:
     """
     Base UserInterface class. NO AUTHENTICATION.  Subclass this to provide some.
@@ -190,7 +184,7 @@
             del curs, dbcx
             return (-1, "Unable to access job database: '%s'" % e)
         curs.execute(sql)
-        job = _fetchone(curs,dbcx.fetchone(curs))
+        job = dbcx.fetchone(curs)
         result = None
         if not job:
             result = (-1, "Error: Invalid job UID.")
@@ -324,7 +318,7 @@
             del curs, dbcx
             return (-1, "Unable to access job database: '%s'" % e, [])
         curs.execute(sql)
-        data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
+        data = dbcx.fetchall(curs)
         jobs = []
         for row in data:
             jobrec = {}
@@ -355,7 +349,7 @@
             sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, "  \
                     "status, builder_status FROM archjobs WHERE " + uids
             curs.execute(sql)
-            data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
+            data = dbcx.fetchall(curs)
             for row in data:
                 ajrec = {}
                 ajrec['jobid'] = row['jobid']
@@ -392,7 +386,7 @@
         except StandardError, e:
             return (-1, "Unable to access job database: '%s'" % e, {})
         curs.execute(sql)
-        job = _fetchone(curs,dbcx.fetchone(curs))
+        job = dbcx.fetchone(curs)
         if not job:
             del curs, dbcx
             return (-1, "Error: Invalid job UID.", {})
@@ -426,7 +420,7 @@
         sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, "    \
                 "status, builder_status FROM archjobs WHERE parent_uid=%d " % uid
         curs.execute(sql)
-        data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
+        data = dbcx.fetchall(curs)
         for row in data:
             ajrec = {}
             ajrec['jobid'] = row['jobid']
@@ -547,7 +541,7 @@
             return (-1, "Unable to access job database: '%s'" % e)
 
         curs.execute(sql)
-        job = _fetchone(curs,dbcx.fetchone(curs))
+        job = dbcx.fetchone(curs)
 
         result = None
         if not job:
@@ -636,7 +630,7 @@
             return (-1, "Unable to access job database: '%s'" % e)
 
         curs.execute(sql)
-        data = [DBManager.ResultSet(row,curs.description) for row in curs.fetchall()]
+        data = dbcx.fetchall(curs)
 
         # Ensure that the user can actually finish the jobs they requested
         final_uid_list = []



From spot at fedoraproject.org  Thu Sep  4 21:04:31 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 21:04:31 +0000 (UTC)
Subject: rpms/sos/devel sos.spec,1.2,1.3
Message-ID: <20080904210431.F256070120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2092

Modified Files:
	sos.spec 
Log Message:
fix license tag


Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/devel/sos.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sos.spec	13 Dec 2007 10:37:05 -0000	1.2
+++ sos.spec	4 Sep 2008 21:04:01 -0000	1.3
@@ -1,15 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define name sos
-%define version 1.8
-%define release 0
-
 %define _localedir %_datadir/locale
 
 Summary: A set of tools to gather troubleshooting information from a system
-Name: %{name}
-Version: %{version}
-Release: %{release}%{?dist}
+Name: sos
+Version: 1.8
+Release: 1%{?dist}
 Group: Application/Tools
 # The source for this package was pulled from upstream's svn.  Use the
 # following commands to generate the tarball:
@@ -17,7 +13,7 @@
 #  tar -czvf sos-1.7.tar.gz sos-1.7
 Source0: %{name}-%{version}.tar.gz
 Source1: rhsupport.pub
-License: GPL
+License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 Url: https://hosted.fedoraproject.org/projects/sos
@@ -62,6 +58,10 @@
 %config /etc/sos.conf
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.8-1
+- fix license tag
+- undid stupid duplicate variable declarations (name, version, release)
+
 * Wed Nov 21 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.8-0
 - Resolves: bz368261 sosGetCommandOutput() does not block on hung processes
 - Resolves: bz361861 work-around missing traceback.format_exc() in RHEL4



From spot at fedoraproject.org  Thu Sep  4 21:06:19 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 21:06:19 +0000 (UTC)
Subject: rpms/soundtracker/devel soundtracker.spec,1.14,1.15
Message-ID: <20080904210619.993D470120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/soundtracker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2743

Modified Files:
	soundtracker.spec 
Log Message:
fix license tag


Index: soundtracker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soundtracker/devel/soundtracker.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- soundtracker.spec	28 Aug 2008 23:10:12 -0000	1.14
+++ soundtracker.spec	4 Sep 2008 21:05:49 -0000	1.15
@@ -1,11 +1,11 @@
 Name:    soundtracker
 Version: 0.6.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Summary: Sound module composer/player
 
 Group:     Applications/Multimedia
-License:   GPL
+License:   GPLv2+
 URL:       http://www.soundtracker.org/
 Source0:   http://www.soundtracker.org/dl/v0.6/soundtracker-%{version}.tar.gz
 Source1:   soundtracker.desktop
@@ -56,6 +56,9 @@
 %{_datadir}/soundtracker/
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.8-6
+- fix license tag
+
 * Fri Aug 29 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.6.8-5
 - Actually use no-setuid patch, which fixes rawhide FTBFS issue.
 



From mschwendt at fedoraproject.org  Thu Sep  4 21:06:35 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu,  4 Sep 2008 21:06:35 +0000 (UTC)
Subject: extras-buildsys ChangeLog,1.126.2.44.2.1.2.18,1.126.2.44.2.1.2.19
Message-ID: <20080904210635.66CC470120@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3090

Modified Files:
      Tag: Plague-0_4_5
	ChangeLog 
Log Message:
F8 with python-sqlite2: PASS - User.py uses sqlite directory and not via DBManager


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.44.2.1.2.18
retrieving revision 1.126.2.44.2.1.2.19
diff -u -r1.126.2.44.2.1.2.18 -r1.126.2.44.2.1.2.19
--- ChangeLog	4 Sep 2008 20:24:55 -0000	1.126.2.44.2.1.2.18
+++ ChangeLog	4 Sep 2008 21:06:35 -0000	1.126.2.44.2.1.2.19
@@ -4,8 +4,8 @@
 	  - Fix _update_repo args traceback introduced in 0.4.5.1.
 	  - Merge repolock patch.
 
-	* server/User.py, server/UserInterface.py
-	  - Apply the remaining SQLite2/SQLite3 API fixes.
+	* server/User.py
+	  - Apply the missing SQLite2/SQLite3 API fix.
 
 2008-09-04  Dennis Gilmore <dennis at ausil.us>
 	* Release of 0.4.5.2



From pkgdb at fedoraproject.org  Thu Sep  4 21:21:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 21:21:33 +0000
Subject: [pkgdb] festival had acl change status
Message-ID: <20080904212133.D21F32082B8@bastion.fedora.phx.redhat.com>

davidz has set the watchbugzilla acl on festival (Fedora devel) to Approved for mattdm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/festival



From pkgdb at fedoraproject.org  Thu Sep  4 21:21:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 21:21:35 +0000
Subject: [pkgdb] festival had acl change status
Message-ID: <20080904212135.9B1C120876C@bastion.fedora.phx.redhat.com>

davidz has set the watchcommits acl on festival (Fedora devel) to Approved for mattdm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/festival



From pkgdb at fedoraproject.org  Thu Sep  4 21:21:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 04 Sep 2008 21:21:38 +0000
Subject: [pkgdb] festival had acl change status
Message-ID: <20080904212138.317CE20876F@bastion.fedora.phx.redhat.com>

davidz has set the commit acl on festival (Fedora devel) to Approved for mattdm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/festival



From orion at fedoraproject.org  Thu Sep  4 21:27:16 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu,  4 Sep 2008 21:27:16 +0000 (UTC)
Subject: rpms/perl-PDL/devel perl-PDL.spec,1.44,1.45
Message-ID: <20080904212717.002CC70120@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/perl-PDL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9316

Modified Files:
	perl-PDL.spec 
Log Message:
* Thu Sep 04 2008 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-13
- Add patch to add plparseopts function
- Update URL



Index: perl-PDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- perl-PDL.spec	10 Mar 2008 09:14:20 -0000	1.44
+++ perl-PDL.spec	4 Sep 2008 21:26:46 -0000	1.45
@@ -1,11 +1,11 @@
 Name:           perl-PDL
 Version:        2.4.3
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        The Perl Data Language
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
-Url:            http://search.cpan.org/dist/PDL/
+Url:            http://pdl.perl.org/
 Source0:        http://www.cpan.org/authors/id/C/CS/CSOE/PDL-%{version}.tar.gz
 Patch0:         perl-PDL-settings.patch
 Patch1:         perl-PDL-2.4.2-fix_ia64_sdump.patch
@@ -19,6 +19,8 @@
 Patch9:	        perl-PDL-2.4.3-gsl.patch
 Patch10:        PDL-2.4.3-perl510.patch
 Patch11:        perl-PDL-2.4.3-noDISPLAY.patch
+#See http://sourceforge.net/tracker/index.php?func=detail&aid=2093833&group_id=612&atid=300612
+Patch12:        perl-PDL-2.4.3-plparseopts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1
@@ -65,6 +67,7 @@
 %patch9 -p1 -b .gsl
 %patch10 -p1 -b .perl510
 %patch11 -p1 -b .noDISPLAY
+%patch12 -p1 -b .plparseopts
 
 # Provides: explicitly filter perl(Inline)
 cat <<__EOF__ > %{name}-findperlprovides
@@ -150,6 +153,10 @@
 
 
 %changelog
+* Thu Sep 04 2008 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-13
+- Add patch to add plparseopts function
+- Update URL
+
 * Mon Mar 10 2008 Marcela Maslanova <mmaslano at redhat.com> - 2.4.3-12
 - PERL_DL_NONLAZY=0 was uncommented in check part of spec.
 



From orion at fedoraproject.org  Thu Sep  4 21:28:52 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu,  4 Sep 2008 21:28:52 +0000 (UTC)
Subject: rpms/perl-PDL/devel perl-PDL-2.4.3-plparseopts.patch,NONE,1.1
Message-ID: <20080904212852.7DEF470120@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/perl-PDL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10118

Added Files:
	perl-PDL-2.4.3-plparseopts.patch 
Log Message:
Add the new patch


perl-PDL-2.4.3-plparseopts.patch:

--- NEW FILE perl-PDL-2.4.3-plparseopts.patch ---
--- PDL-2.4.3/Graphics/PLplot/plplot.pd.plparseopts	2005-05-03 08:19:47.000000000 -0600
+++ PDL-2.4.3/Graphics/PLplot/plplot.pd	2008-09-04 14:27:33.000000000 -0600
@@ -1573,7 +1573,7 @@
 # constants in plplot.h available in Perl in the form of functions.  It
 # should be then possible to write code like this:
 #
-#    plParseOpts (\@ARGV, PL_PARSE_SKIP | PL_PARSE_NOPROGRAM);
+#    plparseopts (\@ARGV, PL_PARSE_SKIP | PL_PARSE_NOPROGRAM);
 
 sub create_low_level_constants {
   my $defn = shift;
@@ -1599,7 +1599,7 @@
 
 create_low_level_constants (<<'EODEF');
 
-# Definitions used in plParseOpts
+# Definitions used in plparseopts
 
 PL_PARSE_PARTIAL
 PL_PARSE_FULL
@@ -2100,6 +2100,46 @@
 ## Parse PLplot options given in @ARGV-like arrays
 #
 
+pp_def ('plparseopts',
+        GenericTypes => [D],
+        Pars => 'int [o] retval()',
+        OtherPars => 'SV* argv; int mode',
+        Doc => 'FIXME: documentation here!',
+        Code => '
+                SV* sv = $COMP (argv);
+                AV* arr;
+                int argc, newargc, i, retval;
+                char** args;
+
+                if ( !(SvROK (sv) && SvTYPE (SvRV (sv)) == SVt_PVAV)) {
+                        barf("plparseopts requires an array ref");
+                }
+
+                arr = (AV*) SvRV (sv);
+                newargc = argc = av_len (arr) + 1;
+                args = calloc (argc , sizeof (char*));
+
+                for (i = 0; i < argc; i++) {
+                        STRLEN len;
+                        args[i] = SvPV (* av_fetch (arr, i, 0), len);
+                }
+
+                $retval() = plparseopts (&newargc, args, $COMP (mode));
+
+                for (i = 0; i < newargc; i++)
+                        av_push (arr, newSVpv (args[i], 0));
+
+                for (i = 0; i < argc; i++)
+                        av_shift (arr);
+
+                free (args);
+        ',
+);
+
+#
+## Parse PLplot options given in @ARGV-like arrays (deprecated)
+#
+
 pp_def ('plParseOpts',
         GenericTypes => [D],
         Pars => 'int [o] retval()',



From kkofler at fedoraproject.org  Thu Sep  4 21:33:59 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 21:33:59 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-9 kdebase-runtime-4.0.72-pulseaudio.patch,
	1.1, NONE
Message-ID: <20080904213359.B1DCB70120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-runtime/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11854/F-9

Removed Files:
	kdebase-runtime-4.0.72-pulseaudio.patch 
Log Message:
Remove old PulseAudio patch.


--- kdebase-runtime-4.0.72-pulseaudio.patch DELETED ---



From kkofler at fedoraproject.org  Thu Sep  4 21:37:01 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 21:37:01 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-8 kdebase-runtime-4.1.1-knetattach.patch,
	NONE, 1.1 .cvsignore, 1.10, 1.11 kdebase-runtime.spec, 1.17,
	1.18 kdebase-runtime-4.0.72-pulseaudio.patch, 1.1, NONE
Message-ID: <20080904213701.D5B6E70120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-runtime/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12827/F-8

Modified Files:
	.cvsignore kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.1.1-knetattach.patch 
Removed Files:
	kdebase-runtime-4.0.72-pulseaudio.patch 
Log Message:
Sync from devel:

* Mon Sep 01 2008 Than Ngo <than at redhat.com> 4.1.1-2
- fix #460710, knetattach is kio_remote's wizard program, don't show
  it in the menu.

kdebase-runtime-4.1.1-knetattach.patch:

--- NEW FILE kdebase-runtime-4.1.1-knetattach.patch ---
diff -up kdebase-runtime-4.1.1/knetattach/knetattach.desktop.orig kdebase-runtime-4.1.1/knetattach/knetattach.desktop
--- kdebase-runtime-4.1.1/knetattach/knetattach.desktop.orig	2008-09-01 18:50:10.000000000 +0200
+++ kdebase-runtime-4.1.1/knetattach/knetattach.desktop	2008-09-01 18:50:42.000000000 +0200
@@ -91,4 +91,5 @@ Type=Application
 Terminal=false
 X-KDE-StartupNotify=true
 Categories=Qt;KDE;Network;
+NoDisplay=true
 X-DocPath=knetattach/index.html


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-8/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	25 Jul 2008 13:57:47 -0000	1.10
+++ .cvsignore	4 Sep 2008 21:36:31 -0000	1.11
@@ -1,2 +1,3 @@
 kdebase-runtime-4.0.99.tar.bz2
 kdebase-runtime-4.1.0.tar.bz2
+kdebase-runtime-4.1.1.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-8/kdebase-runtime.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kdebase-runtime.spec	1 Sep 2008 09:44:52 -0000	1.17
+++ kdebase-runtime.spec	4 Sep 2008 21:36:31 -0000	1.18
@@ -10,7 +10,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
 Version:       4.1.1
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -19,6 +19,7 @@
 Source1:       khelpcenter.desktop
 Patch0:        kdebase-runtime-4.1.0-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
+Patch2:        kdebase-runtime-4.1.1-knetattach.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %ifarch noarch
@@ -100,6 +101,7 @@
 
 %patch0 -p1 -b .pulseaudio
 %patch1 -p1 -b .searchproviders-shortcuts
+%patch2 -p1 -b .knetattach
 
 # upstream patches
 
@@ -336,6 +338,10 @@
 
 
 %changelog
+* Mon Sep 01 2008 Than Ngo <than at redhat.com> 4.1.1-2
+- fix #460710, knetattach is kio_remote's wizard program, don't show
+  it in the menu.
+
 * Thu Aug 28 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


--- kdebase-runtime-4.0.72-pulseaudio.patch DELETED ---



From dwmw2 at fedoraproject.org  Thu Sep  4 21:46:27 2008
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Thu,  4 Sep 2008 21:46:27 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc5-git6.bz2.sign, NONE,
	1.1 .cvsignore, 1.914, 1.915 kernel.spec, 1.926,
	1.927 linux-2.6-iwlwifi-use-dma_alloc_coherent.patch, 1.2,
	1.3 sources, 1.877, 1.878 upstream, 1.790, 1.791
	linux-2.6-selinux-memory-leak-in-security-context-to-sid-core.patch, 
	1.1, NONE patch-2.6.27-rc5-git5.bz2.sign, 1.1, NONE
Message-ID: <20080904214627.6188E70120@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15925

Modified Files:
	.cvsignore kernel.spec 
	linux-2.6-iwlwifi-use-dma_alloc_coherent.patch sources 
	upstream 
Added Files:
	patch-2.6.27-rc5-git6.bz2.sign 
Removed Files:
	linux-2.6-selinux-memory-leak-in-security-context-to-sid-core.patch 
	patch-2.6.27-rc5-git5.bz2.sign 
Log Message:
2.6.27-rc6-git6. Hopefully it'll fix #460723


--- NEW FILE patch-2.6.27-rc5-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIv854yGugalF9Dw4RAgHKAJ9XWUGo65jMZz29Zx7wIuRw7Tj6gQCggwWb
4eE2b3zjXYzXSFKxea5pA80=
=GK12
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.914
retrieving revision 1.915
diff -u -r1.914 -r1.915
--- .cvsignore	4 Sep 2008 03:11:16 -0000	1.914
+++ .cvsignore	4 Sep 2008 21:45:56 -0000	1.915
@@ -5,4 +5,4 @@
 kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc5.bz2
-patch-2.6.27-rc5-git5.bz2
+patch-2.6.27-rc5-git6.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.926
retrieving revision 1.927
diff -u -r1.926 -r1.927
--- kernel.spec	4 Sep 2008 04:05:24 -0000	1.926
+++ kernel.spec	4 Sep 2008 21:45:56 -0000	1.927
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 5
 # The git snapshot level
-%define gitrev 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -642,9 +642,6 @@
 # silence the ACPI blacklist code
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
 
-# fix selinux memory leak, patch headed upstream
-Patch3000:  linux-2.6-selinux-memory-leak-in-security-context-to-sid-core.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1179,7 +1176,6 @@
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
 
-ApplyPatch  linux-2.6-selinux-memory-leak-in-security-context-to-sid-core.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1753,6 +1749,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Sep  4 2008 David Woodhouse <David.Woodhouse at intel.com>
+- 2.6.27-rc5-git6
+
 * Wed Sep  3 2008 Roland McGrath <roland at redhat.com>
 - utrace update
 

linux-2.6-iwlwifi-use-dma_alloc_coherent.patch:

Index: linux-2.6-iwlwifi-use-dma_alloc_coherent.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-iwlwifi-use-dma_alloc_coherent.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-iwlwifi-use-dma_alloc_coherent.patch	4 Sep 2008 03:11:17 -0000	1.2
+++ linux-2.6-iwlwifi-use-dma_alloc_coherent.patch	4 Sep 2008 21:45:56 -0000	1.3
@@ -1,7 +1,7 @@
-Index: linux-2.6.26.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h
-===================================================================
---- linux-2.6.26.noarch.orig/drivers/net/wireless/iwlwifi/iwl-dev.h
-+++ linux-2.6.26.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h
+diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
+index cdfb343..821feed 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
++++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
 @@ -135,6 +135,7 @@ struct iwl_tx_info {
  struct iwl_tx_queue {
  	struct iwl_queue q;
@@ -10,11 +10,11 @@
  	struct iwl_cmd *cmd[TFD_TX_CMD_SLOTS];
  	struct iwl_tx_info *txb;
  	int need_update;
-Index: linux-2.6.26.noarch/drivers/net/wireless/iwlwifi/iwl-tx.c
-===================================================================
---- linux-2.6.26.noarch.orig/drivers/net/wireless/iwlwifi/iwl-tx.c
-+++ linux-2.6.26.noarch/drivers/net/wireless/iwlwifi/iwl-tx.c
-@@ -212,7 +212,7 @@ static void iwl_tx_queue_free(struct iwl
+diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
+index 78b1a7a..e131707 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
++++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
+@@ -212,7 +212,7 @@ static void iwl_tx_queue_free(struct iwl_priv *priv, int txq_id)
  {
  	struct iwl_tx_queue *txq = &priv->txq[txq_id];
  	struct iwl_queue *q = &txq->q;
@@ -23,7 +23,7 @@
  	int i, slots_num, len;
  
  	if (q->n_bd == 0)
-@@ -223,22 +223,22 @@ static void iwl_tx_queue_free(struct iwl
+@@ -223,22 +223,22 @@ static void iwl_tx_queue_free(struct iwl_priv *priv, int txq_id)
  	     q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd))
  		iwl_hw_txq_free_tfd(priv, txq);
  
@@ -54,15 +54,15 @@
  
  	/* De-alloc array of per-TFD driver data */
  	kfree(txq->txb);
-@@ -406,6 +406,7 @@ static int iwl_tx_queue_init(struct iwl_
- 			     struct iwl_tx_queue *txq,
+@@ -405,6 +405,7 @@ static int iwl_hw_tx_queue_init(struct iwl_priv *priv,
+ static int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
  			     int slots_num, u32 txq_id)
  {
 +	struct device *dev = &priv->pci_dev->dev;
  	int i, len;
- 	int rc = 0;
+ 	int ret;
  
-@@ -426,16 +427,27 @@ static int iwl_tx_queue_init(struct iwl_
+@@ -425,9 +426,15 @@ static int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
  				continue;
  		}
  
@@ -74,26 +74,33 @@
 +			len = sizeof(struct iwl_cmd);
 +			for (--i; i >= 0; --i)
 +				dma_free_coherent(dev, len, txq->cmd[i],
-+					txq->dma_addr_cmd[i]);
- 			return -ENOMEM;
++						  txq->dma_addr_cmd[i]);
+ 			goto err;
 +		}
  	}
  
  	/* Alloc driver data array and TFD circular buffer */
- 	rc = iwl_tx_queue_alloc(priv, txq, txq_id);
- 	if (rc) {
-+		len = sizeof(struct iwl_cmd);
- 		for (i = 0; i < slots_num; i++)
--			kfree(txq->cmd[i]);
-+			dma_free_coherent(dev, len, txq->cmd[i],
-+				txq->dma_addr_cmd[i]);
-+		if (txq_id == IWL_CMD_QUEUE_NUM)
-+			dma_free_coherent(dev, len + IWL_MAX_SCAN_SIZE,
-+				txq->cmd[i], txq->dma_addr_cmd[i]);
+@@ -449,13 +456,17 @@ static int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
  
- 		return -ENOMEM;
+ 	return 0;
+ err:
++	len = sizeof(struct iwl_cmd);
+ 	for (i = 0; i < slots_num; i++) {
+-		kfree(txq->cmd[i]);
++		dma_free_coherent(dev, len, txq->cmd[i],
++				  txq->dma_addr_cmd[i]);
+ 		txq->cmd[i] = NULL;
+ 	}
+ 
+ 	if (txq_id == IWL_CMD_QUEUE_NUM) {
+-		kfree(txq->cmd[slots_num]);
++		dma_free_coherent(dev, len + IWL_MAX_SCAN_SIZE,
++				  txq->cmd[slots_num],
++				  txq->dma_addr_cmd[slots_num]);
+ 		txq->cmd[slots_num] = NULL;
  	}
-@@ -911,9 +923,7 @@ int iwl_tx_skb(struct iwl_priv *priv, st
+ 	return -ENOMEM;
+@@ -918,9 +929,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
  
  	/* Physical address of this Tx command's header (not MAC header!),
  	 * within command buffer array. */
@@ -104,7 +111,7 @@
  
  	/* Add buffer containing Tx command and MAC(!) header to TFD's
  	 * first entry */
-@@ -1060,9 +1070,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *pr
+@@ -1067,9 +1076,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
  		out_cmd->hdr.sequence |= cpu_to_le16(SEQ_HUGE_FRAME);
  	len = (idx == TFD_CMD_SLOTS) ?
  			IWL_MAX_SCAN_SIZE : sizeof(struct iwl_cmd);
@@ -115,7 +122,7 @@
  	iwl_hw_txq_attach_buf_to_tfd(priv, tfd, phys_addr, fix_size);
  
  	IWL_DEBUG_HC("Sending command %s (#%x), seq: 0x%04X, "
-@@ -1127,9 +1135,6 @@ static void iwl_hcmd_queue_reclaim(struc
+@@ -1134,9 +1141,6 @@ static void iwl_hcmd_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)
  {
  	struct iwl_tx_queue *txq = &priv->txq[txq_id];
  	struct iwl_queue *q = &txq->q;
@@ -125,7 +132,7 @@
  	int nfreed = 0;
  
  	if ((index >= q->n_bd) || (iwl_queue_used(q, index) == 0)) {
-@@ -1147,19 +1152,7 @@ static void iwl_hcmd_queue_reclaim(struc
+@@ -1154,19 +1158,7 @@ static void iwl_hcmd_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)
  					q->write_ptr, q->read_ptr);
  			queue_work(priv->workqueue, &priv->restart);
  		}


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.877
retrieving revision 1.878
diff -u -r1.877 -r1.878
--- sources	4 Sep 2008 03:11:17 -0000	1.877
+++ sources	4 Sep 2008 21:45:56 -0000	1.878
@@ -1,3 +1,3 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 d91adda8bcf04852048b8eab06eeae3d  patch-2.6.27-rc5.bz2
-158f207e6cbc26ed8a5dc601c4f1883f  patch-2.6.27-rc5-git5.bz2
+142aff1bfc8973698ca1a043c0aca51d  patch-2.6.27-rc5-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.790
retrieving revision 1.791
diff -u -r1.790 -r1.791
--- upstream	4 Sep 2008 03:11:17 -0000	1.790
+++ upstream	4 Sep 2008 21:45:56 -0000	1.791
@@ -1,3 +1,3 @@
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc5.bz2
-patch-2.6.27-rc5-git5.bz2
+patch-2.6.27-rc5-git6.bz2


--- linux-2.6-selinux-memory-leak-in-security-context-to-sid-core.patch DELETED ---


--- patch-2.6.27-rc5-git5.bz2.sign DELETED ---



From spot at fedoraproject.org  Thu Sep  4 21:47:00 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 21:47:00 +0000 (UTC)
Subject: rpms/spamassassin/devel spamassassin.spec,1.108,1.109
Message-ID: <20080904214700.47E4D70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16143

Modified Files:
	spamassassin.spec 
Log Message:
fix license tag


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- spamassassin.spec	27 Jun 2008 14:17:32 -0000	1.108
+++ spamassassin.spec	4 Sep 2008 21:46:30 -0000	1.109
@@ -14,8 +14,8 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
 Version: 3.2.5
-Release: 1%{?dist}
-License: Apache License
+Release: 2%{?dist}
+License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
 Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}.tar.bz2
@@ -195,6 +195,9 @@
 exit 0
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 3.2.5-2
+- fix license tag
+
 * Fri Jun 27 2008 Warren Togami <wtogami at redhat.com> - 3.2.5-1
 - 3.2.5
 



From wwoods at fedoraproject.org  Thu Sep  4 21:51:41 2008
From: wwoods at fedoraproject.org (Will Woods)
Date: Thu,  4 Sep 2008 21:51:41 +0000 (UTC)
Subject: rpms/python-bugzilla/devel .cvsignore, 1.2, 1.3 python-bugzilla.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20080904215141.343A370120@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/python-bugzilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17821

Modified Files:
	.cvsignore python-bugzilla.spec sources 
Log Message:
0.4 rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2007 21:01:48 -0000	1.2
+++ .cvsignore	4 Sep 2008 21:51:10 -0000	1.3
@@ -1 +1 @@
-python-bugzilla-0.2.tar.gz
+python-bugzilla-0.4-rc1.tar.bz2


Index: python-bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/devel/python-bugzilla.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-bugzilla.spec	12 Aug 2008 20:39:12 -0000	1.3
+++ python-bugzilla.spec	4 Sep 2008 21:51:10 -0000	1.4
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-bugzilla
-Version:        0.3
-Release:        1%{?dist}
+Version:        0.4
+Release:        0.rc1%{?dist}
 Summary:        A python library for interacting with Bugzilla
 
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://fedorahosted.org/python-bugzilla
-Source0:        python-bugzilla-0.3.tar.gz
+Source0:        python-bugzilla-0.4-rc1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -21,17 +21,14 @@
 
 %description
 python-bugzilla is a python library for interacting with bugzilla instances
-over XML-RPC. Currently it only supports the Red Hat Bugzilla web services.
-This package also includes the 'bugzilla' commandline tool for interacting with
-bugzilla.
+over XML-RPC. This package also includes the 'bugzilla' commandline tool for
+interacting with bugzilla from shell scripts.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc1
 
 
 %build
-# fix rpmlint complaint (this is fixed in git)
-sed -i -e 's|^#!/usr/bin/python|# -*- python -*-|' bugzilla.py
 %{__python} setup.py build
 
 %install
@@ -53,6 +50,12 @@
 
 
 %changelog
+* Thu Sep  4 2008 Will Woods <wwoods at redhat.com> 0.4-0.rc1
+- Update to python-bugzilla 0.4-rc1
+- We now support upstream Bugzilla 3.x and Red Hat's Bugzilla 3.x instance
+- library saves login cookie in ~/.bugzillacookies
+- new 'bugzilla login' command to get a login cookie
+
 * Sat Jan 12 2008 Will Woods <wwoods at redhat.com> 0.3-1
 - Update to python-bugzilla 0.3 
 - 'modify' works in the commandline-util


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Jan 2008 22:29:59 -0000	1.3
+++ sources	4 Sep 2008 21:51:10 -0000	1.4
@@ -1,2 +1 @@
-5253b8ba6bcc819def1184012e0f422a  python-bugzilla-0.2.tar.gz
-c01c9b489220b4fd853a3f6f8df20b01  python-bugzilla-0.3.tar.gz
+45d993640c1a73c1e52b9fd40d53f86e  python-bugzilla-0.4-rc1.tar.bz2



From mbooth at fedoraproject.org  Thu Sep  4 21:52:39 2008
From: mbooth at fedoraproject.org (Mat Booth)
Date: Thu,  4 Sep 2008 21:52:39 +0000 (UTC)
Subject: rpms/eclipse-epic/F-8 .cvsignore, 1.4, 1.5 eclipse-epic.spec, 1.5, 
	1.6 get-epic.sh, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20080904215239.72B9070120@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-epic/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18160

Modified Files:
	.cvsignore eclipse-epic.spec get-epic.sh sources 
Log Message:
* Thu Sep 04 2008 Mat Booth <fedora at matbooth.co.uk> 0.6.25-1
- Updated to version 0.6.25.
- New features: Persistent variables view options and Module::Starter
  integration.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-epic/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Jun 2008 14:24:27 -0000	1.4
+++ .cvsignore	4 Sep 2008 21:52:09 -0000	1.5
@@ -1 +1 @@
-epic-0.6.24.tar.gz
+epic-0.6.25.tar.gz


Index: eclipse-epic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-epic/F-8/eclipse-epic.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-epic.spec	14 Jun 2008 12:34:35 -0000	1.5
+++ eclipse-epic.spec	4 Sep 2008 21:52:09 -0000	1.6
@@ -2,12 +2,12 @@
 %define gcj_support      1
 
 Name:      eclipse-epic
-Version:   0.6.24
-Release:   2%{?dist}
+Version:   0.6.25
+Release:   1%{?dist}
 Summary:   Perl Eclipse plugin
 Group:     Development/Tools
 License:   CPL
-URL:       http://e-p-i-c.sourceforge.net/
+URL:       http://www.epic-ide.org/
 
 # source tarball and the script used to generate it from upstream's source control
 # script usage:
@@ -151,7 +151,9 @@
 %files
 %defattr(-,root,root,-)
 %doc %{eclipse_base}/features/org.epic.feature.main_%{version}/license.html
-%{eclipse_base}/features/org.epic.feature.main_*
+%{eclipse_base}/features/org.epic.feature.main_%{version}/feature.xml
+%{eclipse_base}/features/org.epic.feature.main_%{version}/icons
+%dir %{eclipse_base}/features/org.epic.feature.main_%{version}
 %{eclipse_base}/plugins/org.epic.debug_*
 %{eclipse_base}/plugins/org.epic.doc_*
 %{eclipse_base}/plugins/org.epic.lib_*
@@ -163,6 +165,11 @@
 %endif
 
 %changelog
+* Thu Sep 04 2008 Mat Booth <fedora at matbooth.co.uk> 0.6.25-1
+- Updated to version 0.6.25.
+- New features: Persistent variables view options and Module::Starter
+  integration.
+
 * Sat Jun 14 2008 Mat Booth <fedora at matbooth.co.uk> 0.6.24-2
 - Fixed package ownership of feature directory.
 


Index: get-epic.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-epic/F-8/get-epic.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- get-epic.sh	1 Jun 2008 14:24:27 -0000	1.3
+++ get-epic.sh	4 Sep 2008 21:52:09 -0000	1.4
@@ -1,7 +1,7 @@
 #!/bin/sh
 NAME="epic"
-VERSION=0.6.24
-TAG="testing_0_6_24"
+VERSION=0.6.25
+TAG="testing_0_6_25"
 
 echo "Exporting from CVS..."
 mkdir $NAME-$VERSION


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-epic/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Jun 2008 14:24:27 -0000	1.4
+++ sources	4 Sep 2008 21:52:09 -0000	1.5
@@ -1 +1 @@
-f78d4fb6b401bea7815f1285ae83bbdf  epic-0.6.24.tar.gz
+c3a8c56324a85507c1d0164a1f293354  epic-0.6.25.tar.gz



From spot at fedoraproject.org  Thu Sep  4 21:56:01 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 21:56:01 +0000 (UTC)
Subject: rpms/sox/devel .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 sox.spec, 
	1.34, 1.35
Message-ID: <20080904215601.0F39970120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19524

Modified Files:
	.cvsignore sources sox.spec 
Log Message:
fix license tag, update to 14.1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sox/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 Feb 2008 08:11:36 -0000	1.13
+++ .cvsignore	4 Sep 2008 21:55:30 -0000	1.14
@@ -1 +1 @@
-sox-14.0.1.tar.gz
+sox-14.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sox/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 Feb 2008 08:11:36 -0000	1.13
+++ sources	4 Sep 2008 21:55:30 -0000	1.14
@@ -1 +1 @@
-6c95af60b20b9655531bf3162c0be937  sox-14.0.1.tar.gz
+b8e2cb3d615d3830347a0948dd8b74a8  sox-14.1.0.tar.gz


Index: sox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sox/devel/sox.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sox.spec	16 Apr 2008 11:42:11 -0000	1.34
+++ sox.spec	4 Sep 2008 21:55:30 -0000	1.35
@@ -1,15 +1,15 @@
 Summary: A general purpose sound file conversion tool
 Name: sox
-Version: 14.0.1
-Release: 2%{?dist}
-License: GPL
+Version: 14.1.0
+Release: 1%{?dist}
+License: GPLv2+
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/sox/sox-%{version}.tar.gz
 URL: http://sox.sourceforge.net/
 BuildRequires: libvorbis-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: gsm-devel
-BuildRequires: flac-devel
+BuildRequires: flac-devel, libao-devel
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -18,8 +18,10 @@
 sound manipulation functions, including sound effects.
 
 %package -n  sox-devel
-Summary: The SoX sound file format converter libraries.
+Summary: The SoX sound file format converter libraries
 Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description -n sox-devel 
 This package contains the library needed for compiling applications
@@ -29,7 +31,7 @@
 %setup -q
 
 %build
-CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" %configure --enable-flac --with-gsm --includedir=%{_includedir}/sox
+CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" %configure --enable-flac --with-gsm --includedir=%{_includedir}/sox --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -49,26 +51,36 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/play
 %{_bindir}/rec
 %{_bindir}/sox
+%{_bindir}/soxi
 %{_libdir}/libsox.so.*
 %{_libdir}/libsfx.so.*
+%dir %{_libdir}/sox/
+%{_libdir}/sox/libsox_fmt_*.so.*
 %{_mandir}/man1/*
 %{_mandir}/man7/*
 
 %files -n sox-devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/sox
-%{_libdir}/libsox.a
 %{_libdir}/libsox.so
-%{_libdir}/libsfx.a
 %{_libdir}/libsfx.so
+%{_libdir}/sox/libsox_fmt_*.so
+%{_libdir}/pkgconfig/sox.pc
 %{_mandir}/man3/*
 
+
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 14.1.0-1
+- fix license tag
+- update to 14.1.0
+- disabled static libs (if something really needs them, re-enable them 
+  in a -static subpackage)
+
 * Wed Apr 16 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 14.0.1-2
 - enabled flac support
 - Resolves: #442703



From kkofler at fedoraproject.org  Thu Sep  4 21:56:43 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  4 Sep 2008 21:56:43 +0000 (UTC)
Subject: rpms/kdebase4/F-8 .cvsignore, 1.11, 1.12 kdebase4.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <20080904215643.A0C0D70120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase4/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19874/F-8

Modified Files:
	.cvsignore kdebase4.spec sources 
Log Message:
Sync from kdebase/devel:
* Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
- 4.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	25 Jul 2008 15:38:18 -0000	1.11
+++ .cvsignore	4 Sep 2008 21:56:13 -0000	1.12
@@ -1,2 +1 @@
-kdebase-4.0.99.tar.bz2
-kdebase-4.1.0.tar.bz2
+kdebase-4.1.1.tar.bz2


Index: kdebase4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/kdebase4.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kdebase4.spec	25 Jul 2008 15:55:52 -0000	1.18
+++ kdebase4.spec	4 Sep 2008 21:56:13 -0000	1.19
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.1.0
-Release: 1%{?dist}.1
+Version: 4.1.1
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -303,6 +303,9 @@
 
 
 %changelog
+* Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
+- 4.1.1
+
 * Fri Jul 25 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-1.1
 - always check for Plasma actually being present (fixes F8 kdebase4 build)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	25 Jul 2008 15:38:18 -0000	1.11
+++ sources	4 Sep 2008 21:56:13 -0000	1.12
@@ -1 +1 @@
-6b58b056d27e3103f087f12abe899a49  kdebase-4.1.0.tar.bz2
+33ab20f61aa33ed473fec710ad250ac7  kdebase-4.1.1.tar.bz2



From jcwillia at fedoraproject.org  Thu Sep  4 22:02:39 2008
From: jcwillia at fedoraproject.org (John Clark Williams)
Date: Thu,  4 Sep 2008 22:02:39 +0000 (UTC)
Subject: rpms/mock/F-7 .cvsignore, 1.36, 1.37 mock.spec, 1.53, 1.54 sources, 
	1.39, 1.40
Message-ID: <20080904220239.4D6F870120@cvs1.fedora.phx.redhat.com>

Author: jcwillia

Update of /cvs/pkgs/rpms/mock/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21641

Modified Files:
	.cvsignore mock.spec sources 
Log Message:
* Thu Sep  4 2008 Clark Williams <williams at redhat.com> - 0.9.11-1
- added workarounds for rawhide rpm (BZ 455387 and 458234)
- disabled tmpfs plugin on epel-4-x86_64
- fixed autotools breakage in configure.ac



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mock/F-7/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	1 Feb 2008 22:43:20 -0000	1.36
+++ .cvsignore	4 Sep 2008 22:02:08 -0000	1.37
@@ -1 +1 @@
-mock-0.9.7.tar.gz
+mock-0.9.11.tar.gz


Index: mock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mock/F-7/mock.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- mock.spec	1 Feb 2008 22:47:47 -0000	1.53
+++ mock.spec	4 Sep 2008 22:02:08 -0000	1.54
@@ -1,7 +1,7 @@
 # next four lines substituted by autoconf
 %define major 0
 %define minor 9
-%define sub 7
+%define sub 11
 %define extralevel %{nil}
 %define release_name mock
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -14,7 +14,6 @@
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
-#Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz?format=raw
 Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz
 URL: http://fedoraproject.org/wiki/Projects/Mock
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,6 +27,12 @@
 
 %prep
 %setup -q
+%if "%{?dist}" == ".fc8"
+pushd etc/mock
+sed -i -e 's/^#exclude=/exclude=/' -e '/^# The above is not/d' \
+    fedora-9-x86_64.cfg fedora-rawhide-x86_64.cfg
+popd
+%endif
 
 %build
 %configure
@@ -48,6 +53,11 @@
 ln -s epel-5-i386.cfg   fedora-5-i386-epel.cfg
 ln -s epel-5-ppc.cfg    fedora-5-ppc-epel.cfg
 ln -s epel-5-x86_64.cfg fedora-5-x86_64-epel.cfg
+# more compat, from devel/rawhide rename
+ln -s fedora-rawhide-i386.cfg fedora-devel-i386.cfg
+ln -s fedora-rawhide-x86_64.cfg fedora-devel-x86_64.cfg
+ln -s fedora-rawhide-ppc.cfg fedora-devel-ppc.cfg
+ln -s fedora-rawhide-ppc64.cfg fedora-devel-ppc64.cfg
 popd
 
 %clean
@@ -83,6 +93,25 @@
 %attr(02775, root, mock) %dir /var/lib/mock
 
 %changelog
+* Thu Sep  4 2008 Clark Williams <williams at redhat.com> - 0.9.11-1
+- added workarounds for rawhide rpm (BZ 455387 and 458234)
+- disabled tmpfs plugin on epel-4-x86_64
+- fixed autotools breakage in configure.ac
+
+* Tue May 20 2008 Jesse Keating <jkeating at redhat.com> - 0.9.10-1
+- added fix for building F-8 mock (clark)
+- Update epel configs
+
+* Tue Apr 22 2008 Jesse Keating <jkeating at redhat.com> - 0.9.9-1
+- Update config files for Fedora 9
+- Comment out multilib excludes, no longer needed in F9+ with yum multilib changes
+
+* Mon Mar 31 2008 Jesse Keating <jkeating at redhat.com> - 0.9.8-1
+- modify rootcache logic to rebuild cache if config files have newer timestamp
+- For Fedora 8 and higher, use priority failover method
+- Point to the correct static-repo for rawhide stuff.
+- Move "devel" to "rawhide" to match current Fedora naming schemes.
+
 * Thu Jan 31 2008 Michael Brown <mebrown at michaels-house.net> - 0.9.7-1
 - redo mock.util.do() to use python subprocess module, which should be
   much more maintainable than our old homegrown code.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mock/F-7/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	1 Feb 2008 22:43:21 -0000	1.39
+++ sources	4 Sep 2008 22:02:08 -0000	1.40
@@ -1 +1 @@
-6dc38e4cc22800a21192b6e854f99ef5  mock-0.9.7.tar.gz
+eec7aa72ba1d4cd92552a73c16d3b44e  mock-0.9.11.tar.gz



From jcwillia at fedoraproject.org  Thu Sep  4 22:05:45 2008
From: jcwillia at fedoraproject.org (John Clark Williams)
Date: Thu,  4 Sep 2008 22:05:45 +0000 (UTC)
Subject: rpms/mock/F-8 .cvsignore, 1.40, 1.41 mock.spec, 1.60, 1.61 sources, 
	1.43, 1.44
Message-ID: <20080904220545.408B670120@cvs1.fedora.phx.redhat.com>

Author: jcwillia

Update of /cvs/pkgs/rpms/mock/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22660

Modified Files:
	.cvsignore mock.spec sources 
Log Message:
* Thu Sep  4 2008 Clark Williams <williams at redhat.com> - 0.9.11-1
- added workarounds for rawhide rpm (BZ 455387 and 458234)
- disabled tmpfs plugin on epel-4-x86_64
- fixed autotools breakage in configure.ac



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mock/F-8/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	20 May 2008 19:53:36 -0000	1.40
+++ .cvsignore	4 Sep 2008 22:05:14 -0000	1.41
@@ -1 +1 @@
-mock-0.9.10.tar.gz
+mock-0.9.11.tar.gz


Index: mock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mock/F-8/mock.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- mock.spec	20 May 2008 19:53:36 -0000	1.60
+++ mock.spec	4 Sep 2008 22:05:14 -0000	1.61
@@ -1,7 +1,7 @@
 # next four lines substituted by autoconf
 %define major 0
 %define minor 9
-%define sub 10
+%define sub 11
 %define extralevel %{nil}
 %define release_name mock
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -93,6 +93,11 @@
 %attr(02775, root, mock) %dir /var/lib/mock
 
 %changelog
+* Thu Sep  4 2008 Clark Williams <williams at redhat.com> - 0.9.11-1
+- added workarounds for rawhide rpm (BZ 455387 and 458234)
+- disabled tmpfs plugin on epel-4-x86_64
+- fixed autotools breakage in configure.ac
+
 * Tue May 20 2008 Jesse Keating <jkeating at redhat.com> - 0.9.10-1
 - added fix for building F-8 mock (clark)
 - Update epel configs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mock/F-8/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	20 May 2008 19:53:36 -0000	1.43
+++ sources	4 Sep 2008 22:05:14 -0000	1.44
@@ -1 +1 @@
-cef9e786e769a92dc37603ca8faf4be5  mock-0.9.10.tar.gz
+eec7aa72ba1d4cd92552a73c16d3b44e  mock-0.9.11.tar.gz



From spot at fedoraproject.org  Thu Sep  4 22:08:12 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 22:08:12 +0000 (UTC)
Subject: rpms/sos/devel sos.spec,1.3,1.4
Message-ID: <20080904220812.AD94770120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23479

Modified Files:
	sos.spec 
Log Message:
fix package


Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/devel/sos.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sos.spec	4 Sep 2008 21:04:01 -0000	1.3
+++ sos.spec	4 Sep 2008 22:07:42 -0000	1.4
@@ -5,8 +5,8 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-Release: 1%{?dist}
-Group: Application/Tools
+Release: 2%{?dist}
+Group: Applications/System
 # The source for this package was pulled from upstream's svn.  Use the
 # following commands to generate the tarball:
 #  svn --username guest export https://sos.108.redhat.com/svn/sos/tags/r1-7 sos-1.7
@@ -20,7 +20,7 @@
 BuildRequires: python-devel
 Requires: libxml2-python
 Provides: sysreport = 1.4.3-13
-Obsoletes: sysreport
+Obsoletes: sysreport < 1.4.3-13
 
 %description
 Sos is a set of tools that gathers information about system
@@ -32,32 +32,38 @@
 %setup -q
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-install -D -m644 %{SOURCE1} ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.pub
-python setup.py install --optimize 1 --root=$RPM_BUILD_ROOT
-ln -s /usr/sbin/sosreport $RPM_BUILD_ROOT/usr/sbin/sysreport
+install -D -m644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/%{name}/rhsupport.pub
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+
+%find_lang %{name}
+cd $RPM_BUILD_ROOT%{_sbindir}
+ln -s sosreport sysreport
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_sbindir}/sosreport
-/usr/share/sos/rhsupport.pub
-/usr/bin/rh-upload-core
-/usr/sbin/sysreport
-/usr/sbin/sysreport.legacy
-/usr/share/sysreport
+%{_datadir}/sos/
+%{_bindir}/rh-upload-core
+%{_sbindir}/sysreport
+%{_sbindir}/sysreport.legacy
+%{_datadir}/sysreport
 %{python_sitelib}/sos/
+%{python_sitelib}/%{name}-0.0.0-py*.egg-info
 %{_mandir}/man1/sosreport.1*
-%{_localedir}/*/LC_MESSAGES/sos.mo
 %doc README README.rh-upload-core TODO LICENSE ChangeLog
-%config /etc/sos.conf
+%config(noreplace) %{_sysconfdir}/sos.conf
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.8-2
+- more cleanups to get this package building
+
 * Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.8-1
 - fix license tag
 - undid stupid duplicate variable declarations (name, version, release)



From jcwillia at fedoraproject.org  Thu Sep  4 22:11:28 2008
From: jcwillia at fedoraproject.org (John Clark Williams)
Date: Thu,  4 Sep 2008 22:11:28 +0000 (UTC)
Subject: rpms/mock/F-9 .cvsignore, 1.44, 1.45 mock.spec, 1.64, 1.65 sources, 
	1.47, 1.48
Message-ID: <20080904221128.093C370123@cvs1.fedora.phx.redhat.com>

Author: jcwillia

Update of /cvs/pkgs/rpms/mock/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24562

Modified Files:
	.cvsignore mock.spec sources 
Log Message:
* Thu Sep  4 2008 Clark Williams <williams at redhat.com> - 0.9.11-1
- added workarounds for rawhide rpm (BZ 455387 and 458234)
- disabled tmpfs plugin on epel-4-x86_64
- fixed autotools breakage in configure.ac



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mock/F-9/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	20 May 2008 19:50:40 -0000	1.44
+++ .cvsignore	4 Sep 2008 22:10:57 -0000	1.45
@@ -1 +1 @@
-mock-0.9.10.tar.gz
+mock-0.9.11.tar.gz


Index: mock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mock/F-9/mock.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- mock.spec	20 May 2008 19:50:40 -0000	1.64
+++ mock.spec	4 Sep 2008 22:10:57 -0000	1.65
@@ -1,7 +1,7 @@
 # next four lines substituted by autoconf
 %define major 0
 %define minor 9
-%define sub 10
+%define sub 11
 %define extralevel %{nil}
 %define release_name mock
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -93,6 +93,11 @@
 %attr(02775, root, mock) %dir /var/lib/mock
 
 %changelog
+* Thu Sep  4 2008 Clark Williams <williams at redhat.com> - 0.9.11-1
+- added workarounds for rawhide rpm (BZ 455387 and 458234)
+- disabled tmpfs plugin on epel-4-x86_64
+- fixed autotools breakage in configure.ac
+
 * Tue May 20 2008 Jesse Keating <jkeating at redhat.com> - 0.9.10-1
 - added fix for building F-8 mock (clark)
 - Update epel configs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mock/F-9/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	20 May 2008 19:50:40 -0000	1.47
+++ sources	4 Sep 2008 22:10:57 -0000	1.48
@@ -1 +1 @@
-cef9e786e769a92dc37603ca8faf4be5  mock-0.9.10.tar.gz
+eec7aa72ba1d4cd92552a73c16d3b44e  mock-0.9.11.tar.gz



From spot at fedoraproject.org  Thu Sep  4 22:13:14 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 22:13:14 +0000 (UTC)
Subject: rpms/sox/devel sox.spec,1.35,1.36
Message-ID: <20080904221314.770F770120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25368

Modified Files:
	sox.spec 
Log Message:
add missing BR


Index: sox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sox/devel/sox.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sox.spec	4 Sep 2008 21:55:30 -0000	1.35
+++ sox.spec	4 Sep 2008 22:12:44 -0000	1.36
@@ -1,15 +1,15 @@
 Summary: A general purpose sound file conversion tool
 Name: sox
 Version: 14.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/sox/sox-%{version}.tar.gz
 URL: http://sox.sourceforge.net/
 BuildRequires: libvorbis-devel
 BuildRequires: alsa-lib-devel
-BuildRequires: gsm-devel
-BuildRequires: flac-devel, libao-devel
+BuildRequires: gsm-devel, wavpack-devel, ladspa-devel, libpng-devel
+BuildRequires: flac-devel, libao-devel, libsndfile-devel, libid3tag-devel
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 14.1.0-2
+- enable the full set of functionality with missing BR
+
 * Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 14.1.0-1
 - fix license tag
 - update to 14.1.0



From spot at fedoraproject.org  Thu Sep  4 22:15:51 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 22:15:51 +0000 (UTC)
Subject: rpms/specspo/devel specspo.spec,1.40,1.41
Message-ID: <20080904221551.559D870120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/specspo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26232

Modified Files:
	specspo.spec 
Log Message:
fix license tag


Index: specspo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/specspo/devel/specspo.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- specspo.spec	5 Oct 2007 13:24:18 -0000	1.40
+++ specspo.spec	4 Sep 2008 22:15:20 -0000	1.41
@@ -3,15 +3,17 @@
 Summary: Fedora package descriptions, summaries, and groups.
 Name: specspo
 Version: 15
-Release: 1
+Release: 2
 Group: Documentation
 Source: specspo-%{version}.tar.bz2
-License: GPL
+# No version given, only license attribution is spec file
+# Since this is Red Hat generated, we can safely assume it is correct.
+License: GPL+
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gettext
 
-Patch: specspo-make.patch
+Patch0: specspo-make.patch
 
 %description
 The specspo package contains the portable object catalogues used to
@@ -19,7 +21,7 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 
 %build
 make
@@ -42,6 +44,9 @@
 %config(noreplace) %{_sysconfdir}/rpm/macros.specspo
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 15-2
+- fix license tag
+
 * Thu Oct  4 2007 Stepan Kasal <skasal at redhat.com> - 15-1
 - Updated translations
 - Fixed make_dist_pot, so that backslashes in the descriptions do not get



From spot at fedoraproject.org  Thu Sep  4 22:19:22 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 22:19:22 +0000 (UTC)
Subject: rpms/specto/devel specto.spec,1.5,1.6
Message-ID: <20080904221922.D472C70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/specto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27376

Modified Files:
	specto.spec 
Log Message:
fix license tag


Index: specto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/specto/devel/specto.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- specto.spec	5 Apr 2008 10:55:58 -0000	1.5
+++ specto.spec	4 Sep 2008 22:18:52 -0000	1.6
@@ -2,11 +2,11 @@
 
 Name:		specto
 Version:	0.2.2        
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An desktop application that will watch configurable events        
 
 Group:		Applications/System
-License:	GPL
+License:	GPLv2+
 URL:		http://specto.sourceforge.net/            
 Source0:	http://specto.googlecode.com/files/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.2-2
+- fix license tag
+
 * Wed Aug 02 2007 Xavier Lamien <lxtnow[at]gmail.com> - 0.2.2-1
 - Updated Release.
 



From spot at fedoraproject.org  Thu Sep  4 22:20:45 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 22:20:45 +0000 (UTC)
Subject: rpms/spicctrl/devel spicctrl.spec,1.7,1.8
Message-ID: <20080904222045.CDE1370120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/spicctrl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27985

Modified Files:
	spicctrl.spec 
Log Message:
fix license tag


Index: spicctrl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spicctrl/devel/spicctrl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- spicctrl.spec	19 Feb 2008 23:24:15 -0000	1.7
+++ spicctrl.spec	4 Sep 2008 22:20:15 -0000	1.8
@@ -1,10 +1,10 @@
 Name:           spicctrl
 Version:        1.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Sony Vaio laptop SPIC control program
 
 Group:          Applications/System
-License:        GPL
+License:        GPLv2+
 URL:            http://popies.net/sonypi/
 Source0:        http://popies.net/sonypi/spicctrl-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.9-7
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.9-6
 - Autorebuild for GCC 4.3
 



From than at fedoraproject.org  Thu Sep  4 22:25:12 2008
From: than at fedoraproject.org (Than Ngo)
Date: Thu,  4 Sep 2008 22:25:12 +0000 (UTC)
Subject: rpms/guidance-power-manager/F-9 guidance-power-manager.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20080904222512.93CAF70120@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/guidance-power-manager/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29514

Modified Files:
	guidance-power-manager.spec sources 
Log Message:
4.1.1



Index: guidance-power-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/guidance-power-manager/F-9/guidance-power-manager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- guidance-power-manager.spec	6 Aug 2008 17:38:44 -0000	1.4
+++ guidance-power-manager.spec	4 Sep 2008 22:24:42 -0000	1.5
@@ -6,7 +6,7 @@
 
 Name:	 guidance-power-manager
 Summary: KDE Power Manager 
-Version: 4.1.0 
+Version: 4.1.1 
 Release: 1%{?dist}
 
 License: GPLv2
@@ -26,7 +26,7 @@
 BuildRequires: PyKDE4-devel
 
 Requires: dbus-python
-Requires: PyKDE4 >= 4.0.5
+Requires: PyKDE4 >= 4.1.1
 
 %description
 Guidance Power Manager uses the information and facilities provided by HAL
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Fri Aug 29 2008 Than Ngo <than at redhat.com>  4.1.1 -1
+- 4.1.1
+
 * Wed Aug 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-1
 - guidance-power-manager-4.1.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/guidance-power-manager/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Aug 2008 17:38:44 -0000	1.4
+++ sources	4 Sep 2008 22:24:42 -0000	1.5
@@ -1 +1 @@
-e8f9c98901eb263c55700a8cca47e22e  guidance-power-manager-4.1.0.tar.bz2
+ccb28e284de4579aa0f3b7ebd8477a05  guidance-power-manager-4.1.1.tar.bz2



From spot at fedoraproject.org  Thu Sep  4 22:27:40 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  4 Sep 2008 22:27:40 +0000 (UTC)
Subject: rpms/sox/devel sox.spec,1.36,1.37
Message-ID: <20080904222740.B6C9570120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30286

Modified Files:
	sox.spec 
Log Message:
missed some BR, this should be all of them


Index: sox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sox/devel/sox.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sox.spec	4 Sep 2008 22:12:44 -0000	1.36
+++ sox.spec	4 Sep 2008 22:27:10 -0000	1.37
@@ -1,13 +1,13 @@
 Summary: A general purpose sound file conversion tool
 Name: sox
 Version: 14.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/sox/sox-%{version}.tar.gz
 URL: http://sox.sourceforge.net/
 BuildRequires: libvorbis-devel
-BuildRequires: alsa-lib-devel
+BuildRequires: alsa-lib-devel, libtool-ltdl-devel, libsamplerate-devel
 BuildRequires: gsm-devel, wavpack-devel, ladspa-devel, libpng-devel
 BuildRequires: flac-devel, libao-devel, libsndfile-devel, libid3tag-devel
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 14.1.0-3
+- missed a few BR, this should be all of them
+
 * Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 14.1.0-2
 - enable the full set of functionality with missing BR
 



From than at fedoraproject.org  Thu Sep  4 22:31:29 2008
From: than at fedoraproject.org (Than Ngo)
Date: Thu,  4 Sep 2008 22:31:29 +0000 (UTC)
Subject: rpms/kdeutils/F-9 kdeutils.spec,1.128,1.129 sources,1.53,1.54
Message-ID: <20080904223129.56FFF70120@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31537

Modified Files:
	kdeutils.spec sources 
Log Message:
4.1.1



Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-9/kdeutils.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- kdeutils.spec	29 Aug 2008 19:41:39 -0000	1.128
+++ kdeutils.spec	4 Sep 2008 22:30:59 -0000	1.129
@@ -19,9 +19,9 @@
 # FIXME/TODO: Check license
 License:        GPLv2
 URL:            http://www.kde.org
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+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/unstable/%{version}/src/kdepim-%{version}.tar.bz2
+Source1:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
 Patch0:         kdeutils-4.0.99-kjots-without-kdepim.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-9/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	30 Aug 2008 00:11:28 -0000	1.53
+++ sources	4 Sep 2008 22:30:59 -0000	1.54
@@ -1,2 +1,2 @@
 ba8d72606f71afcb649d2b9871815359  kdeutils-4.1.1.tar.bz2
-fdb80cc1bfa78047d2793e1d6c3fde41  kdepim-4.1.1.tar.bz2
+792ddf463a7ade5b4dbade0f8b7c3085  kdepim-4.1.1.tar.bz2



From than at fedoraproject.org  Thu Sep  4 22:38:49 2008
From: than at fedoraproject.org (Than Ngo)
Date: Thu,  4 Sep 2008 22:38:49 +0000 (UTC)
Subject: rpms/kdeutils/F-9 sources,1.54,1.55
Message-ID: <20080904223849.6DF9C70120@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv960

Modified Files:
	sources 
Log Message:
4.1.1



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-9/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	4 Sep 2008 22:30:59 -0000	1.54
+++ sources	4 Sep 2008 22:38:19 -0000	1.55
@@ -1,2 +1,2 @@
 ba8d72606f71afcb649d2b9871815359  kdeutils-4.1.1.tar.bz2
-792ddf463a7ade5b4dbade0f8b7c3085  kdepim-4.1.1.tar.bz2
+fdb80cc1bfa78047d2793e1d6c3fde41  kdepim-4.1.1.tar.bz2



From lutter at fedoraproject.org  Thu Sep  4 23:23:09 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Thu,  4 Sep 2008 23:23:09 +0000 (UTC)
Subject: rpms/augeas/EL-5 .cvsignore, 1.7, 1.8 augeas.spec, 1.6, 1.7 sources,
	1.7, 1.8
Message-ID: <20080904232309.E6DD270120@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11194/EL-5

Modified Files:
	.cvsignore augeas.spec sources 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Aug 2008 01:17:40 -0000	1.7
+++ .cvsignore	4 Sep 2008 23:22:39 -0000	1.8
@@ -1 +1 @@
-augeas-0.3.0.tar.gz
+augeas-0.3.1.tar.gz


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-5/augeas.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- augeas.spec	8 Aug 2008 01:17:40 -0000	1.6
+++ augeas.spec	4 Sep 2008 23:22:39 -0000	1.7
@@ -1,12 +1,12 @@
 Name:           augeas
-Version:        0.3.0
+Version:        0.3.1
 Release:        1%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://augeas.net/
-Source0:        http://augeas.net/download/augeas-0.3.0.tar.gz
+Source0:        http://augeas.net/download/augeas-0.3.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  readline-devel
@@ -80,6 +80,9 @@
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Thu Sep  4 2008 David Lutterkort <dlutter at redhat.com> - 0.3.1-1
+- New version
+
 * Thu Aug  7 2008 David Lutterkort <dlutter at redhat.com> - 0.3.0-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Aug 2008 01:17:40 -0000	1.7
+++ sources	4 Sep 2008 23:22:39 -0000	1.8
@@ -1 +1 @@
-a34017bdfb3ff2b94e39cbc28f6ef385  augeas-0.3.0.tar.gz
+a55bef6d9c3480299fa6a15e0dbaaa35  augeas-0.3.1.tar.gz



From lutter at fedoraproject.org  Thu Sep  4 23:23:10 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Thu,  4 Sep 2008 23:23:10 +0000 (UTC)
Subject: rpms/augeas/F-8 .cvsignore, 1.7, 1.8 augeas.spec, 1.7, 1.8 sources, 
	1.7, 1.8
Message-ID: <20080904232310.3744D70120@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11194/F-8

Modified Files:
	.cvsignore augeas.spec sources 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Aug 2008 01:17:39 -0000	1.7
+++ .cvsignore	4 Sep 2008 23:22:39 -0000	1.8
@@ -1 +1 @@
-augeas-0.3.0.tar.gz
+augeas-0.3.1.tar.gz


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-8/augeas.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- augeas.spec	8 Aug 2008 01:17:39 -0000	1.7
+++ augeas.spec	4 Sep 2008 23:22:39 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           augeas
-Version:        0.3.0
+Version:        0.3.1
 Release:        1%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://augeas.net/
-Source0:        http://augeas.net/download/augeas-0.3.0.tar.gz
+Source0:        http://augeas.net/download/augeas-0.3.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  readline-devel
@@ -80,6 +80,9 @@
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Thu Sep  4 2008 David Lutterkort <dlutter at redhat.com> - 0.3.1-1
+- New version
+
 * Thu Aug  7 2008 David Lutterkort <dlutter at redhat.com> - 0.3.0-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Aug 2008 01:17:39 -0000	1.7
+++ sources	4 Sep 2008 23:22:39 -0000	1.8
@@ -1 +1 @@
-a34017bdfb3ff2b94e39cbc28f6ef385  augeas-0.3.0.tar.gz
+a55bef6d9c3480299fa6a15e0dbaaa35  augeas-0.3.1.tar.gz



From lutter at fedoraproject.org  Thu Sep  4 23:23:10 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Thu,  4 Sep 2008 23:23:10 +0000 (UTC)
Subject: rpms/augeas/devel .cvsignore, 1.7, 1.8 augeas.spec, 1.6, 1.7 sources,
	1.7, 1.8
Message-ID: <20080904232310.C5B7D70120@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11194/devel

Modified Files:
	.cvsignore augeas.spec sources 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Aug 2008 01:17:40 -0000	1.7
+++ .cvsignore	4 Sep 2008 23:22:40 -0000	1.8
@@ -1 +1 @@
-augeas-0.3.0.tar.gz
+augeas-0.3.1.tar.gz


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/devel/augeas.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- augeas.spec	8 Aug 2008 01:17:40 -0000	1.6
+++ augeas.spec	4 Sep 2008 23:22:40 -0000	1.7
@@ -1,12 +1,12 @@
 Name:           augeas
-Version:        0.3.0
+Version:        0.3.1
 Release:        1%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://augeas.net/
-Source0:        http://augeas.net/download/augeas-0.3.0.tar.gz
+Source0:        http://augeas.net/download/augeas-0.3.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  readline-devel
@@ -80,6 +80,9 @@
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Thu Sep  4 2008 David Lutterkort <dlutter at redhat.com> - 0.3.1-1
+- New version
+
 * Thu Aug  7 2008 David Lutterkort <dlutter at redhat.com> - 0.3.0-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Aug 2008 01:17:40 -0000	1.7
+++ sources	4 Sep 2008 23:22:40 -0000	1.8
@@ -1 +1 @@
-a34017bdfb3ff2b94e39cbc28f6ef385  augeas-0.3.0.tar.gz
+a55bef6d9c3480299fa6a15e0dbaaa35  augeas-0.3.1.tar.gz



From lutter at fedoraproject.org  Thu Sep  4 23:23:10 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Thu,  4 Sep 2008 23:23:10 +0000 (UTC)
Subject: rpms/augeas/F-9 .cvsignore, 1.7, 1.8 augeas.spec, 1.6, 1.7 sources, 
	1.7, 1.8
Message-ID: <20080904232310.70D1370120@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11194/F-9

Modified Files:
	.cvsignore augeas.spec sources 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Aug 2008 01:17:40 -0000	1.7
+++ .cvsignore	4 Sep 2008 23:22:40 -0000	1.8
@@ -1 +1 @@
-augeas-0.3.0.tar.gz
+augeas-0.3.1.tar.gz


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-9/augeas.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- augeas.spec	8 Aug 2008 01:17:40 -0000	1.6
+++ augeas.spec	4 Sep 2008 23:22:40 -0000	1.7
@@ -1,12 +1,12 @@
 Name:           augeas
-Version:        0.3.0
+Version:        0.3.1
 Release:        1%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://augeas.net/
-Source0:        http://augeas.net/download/augeas-0.3.0.tar.gz
+Source0:        http://augeas.net/download/augeas-0.3.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  readline-devel
@@ -80,6 +80,9 @@
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Thu Sep  4 2008 David Lutterkort <dlutter at redhat.com> - 0.3.1-1
+- New version
+
 * Thu Aug  7 2008 David Lutterkort <dlutter at redhat.com> - 0.3.0-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Aug 2008 01:17:40 -0000	1.7
+++ sources	4 Sep 2008 23:22:40 -0000	1.8
@@ -1 +1 @@
-a34017bdfb3ff2b94e39cbc28f6ef385  augeas-0.3.0.tar.gz
+a55bef6d9c3480299fa6a15e0dbaaa35  augeas-0.3.1.tar.gz



From mclasen at fedoraproject.org  Fri Sep  5 01:05:58 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  5 Sep 2008 01:05:58 +0000 (UTC)
Subject: rpms/gtk2/devel init-deadlock.patch,NONE,1.1 gtk2.spec,1.317,1.318
Message-ID: <20080905010558.E03CF70121@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5770

Modified Files:
	gtk2.spec 
Added Files:
	init-deadlock.patch 
Log Message:
fix a deadlock in pixbuf loader initialization


init-deadlock.patch:

--- NEW FILE init-deadlock.patch ---
Index: gdk-pixbuf/gdk-pixbuf-loader.c
===================================================================
--- gdk-pixbuf/gdk-pixbuf-loader.c	(revision 21294)
+++ gdk-pixbuf/gdk-pixbuf-loader.c	(working copy)
@@ -356,9 +356,8 @@
         if (priv->image_module == NULL)
                 return 0;
   
-        if (priv->image_module->module == NULL)
-                if (!_gdk_pixbuf_load_module (priv->image_module, error))
-                        return 0;
+        if (!_gdk_pixbuf_load_module (priv->image_module, error))
+                return 0;
   
         if (priv->image_module->module == NULL)
                 return 0;
Index: gdk-pixbuf/gdk-pixbuf-io.c
===================================================================
--- gdk-pixbuf/gdk-pixbuf-io.c	(revision 21294)
+++ gdk-pixbuf/gdk-pixbuf-io.c	(working copy)
@@ -292,6 +292,11 @@
 
 #endif	/* USE_GMODULE */
 
+
+static gboolean
+gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module,
+				 GError         **error);
+
 static void 
 gdk_pixbuf_io_init (void)
 {
@@ -318,7 +323,7 @@
 #define load_one_builtin_module(format)					\
 	builtin_module = g_new0 (GdkPixbufModule, 1);			\
 	builtin_module->module_name = #format;				\
-	if (_gdk_pixbuf_load_module (builtin_module, NULL))		\
+	if (gdk_pixbuf_load_module_unlocked (builtin_module, NULL))		\
 		file_formats = g_slist_prepend (file_formats, builtin_module);\
 	else								\
 		g_free (builtin_module)
@@ -541,51 +546,7 @@
 #endif
 }
 
-#ifdef USE_GMODULE
 
-/* actually load the image handler - gdk_pixbuf_get_module only get a */
-/* reference to the module to load, it doesn't actually load it       */
-/* perhaps these actions should be combined in one function           */
-static gboolean
-_gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module,
-				  GError         **error)
-{
-	char *path;
-	GModule *module;
-	gpointer sym;
-		
-        g_return_val_if_fail (image_module->module == NULL, FALSE);
-
-	path = image_module->module_path;
-	module = g_module_open (path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
-
-        if (!module) {
-                g_set_error (error,
-                             GDK_PIXBUF_ERROR,
-                             GDK_PIXBUF_ERROR_FAILED,
-                             _("Unable to load image-loading module: %s: %s"),
-                             path, g_module_error ());
-                return FALSE;
-        }
-
-	image_module->module = module;        
-        
-        if (g_module_symbol (module, "fill_vtable", &sym)) {
-                GdkPixbufModuleFillVtableFunc func = (GdkPixbufModuleFillVtableFunc) sym;
-                (* func) (image_module);
-                return TRUE;
-        } else {
-                g_set_error (error,
-                             GDK_PIXBUF_ERROR,
-                             GDK_PIXBUF_ERROR_FAILED,
-                             _("Image-loading module %s does not export the proper interface; perhaps it's from a different GTK version?"),
-                             path);
-                return FALSE;
-        }
-}
-
-#endif  /* !USE_GMODULE */
-
 #define module(type) \
   extern void _gdk_pixbuf__##type##_fill_info   (GdkPixbufFormat *info);   \
   extern void _gdk_pixbuf__##type##_fill_vtable (GdkPixbufModule *module)
@@ -617,29 +578,19 @@
 
 #undef module
 
-gboolean
-_gdk_pixbuf_load_module (GdkPixbufModule *image_module,
-			 GError         **error)
+/* actually load the image handler - gdk_pixbuf_get_module only get a */
+/* reference to the module to load, it doesn't actually load it       */
+/* perhaps these actions should be combined in one function           */
+static gboolean
+gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module,
+				 GError         **error)
 {
-	gboolean ret;
-	gboolean locked = FALSE;
 	GdkPixbufModuleFillInfoFunc fill_info = NULL;
         GdkPixbufModuleFillVtableFunc fill_vtable = NULL;
+		
+        if (image_module->module != NULL)
+               return TRUE;
 
-	/* be extra careful, maybe the module initializes
-	 * the thread system
-	 */
-	if (g_threads_got_initialized) {
-		G_LOCK (init_lock);
-		locked = TRUE;
-	}
-
-	if (image_module->module != NULL) {
-		if (locked)
-			G_UNLOCK (init_lock);
-		return TRUE;
-	}
-
 #define try_module(format,id)						\
 	if (fill_info == NULL &&					\
 	    strcmp (image_module->module_name, #format) == 0) {		\
@@ -715,22 +666,70 @@
 		image_module->info = g_new0 (GdkPixbufFormat, 1);
 		(* fill_info) (image_module->info);
 
-                ret = TRUE;
+                return TRUE;
 	}
-	else {
+	else 
 #ifdef USE_GMODULE
-		ret = _gdk_pixbuf_load_module_unlocked (image_module, error);
+	{
+		char *path;
+		GModule *module;
+		gpointer sym;
+
+		path = image_module->module_path;
+		module = g_module_open (path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+
+        	if (!module) {
+                	g_set_error (error,
+                             	     GDK_PIXBUF_ERROR,
+                             	     GDK_PIXBUF_ERROR_FAILED,
+                             	     _("Unable to load image-loading module: %s: %s"),
+                             	     path, g_module_error ());
+                	return FALSE;
+        	}
+
+		image_module->module = module;        
+        
+        	if (g_module_symbol (module, "fill_vtable", &sym)) {
+                	fill_vtable = (GdkPixbufModuleFillVtableFunc) sym;
+                	(* fill_vtable) (image_module);
+                	return TRUE;
+        	} else {
+                	g_set_error (error,
+                        	     GDK_PIXBUF_ERROR,
+                             	     GDK_PIXBUF_ERROR_FAILED,
+                             	     _("Image-loading module %s does not export the proper interface; perhaps it's from a different GTK version?"),
+                             	     path);
+                	return FALSE;
+        	}
+	}
 #else
-		g_set_error (error,
-			     GDK_PIXBUF_ERROR,
-			     GDK_PIXBUF_ERROR_UNKNOWN_TYPE,
-			     _("Image type '%s' is not supported",
-			     image_module->module_name);
+	g_set_error (error,
+		     GDK_PIXBUF_ERROR,
+		     GDK_PIXBUF_ERROR_UNKNOWN_TYPE,
+		     _("Image type '%s' is not supported",
+		     image_module->module_name);
+	return FALSE;
+#endif  /* !USE_GMODULE */
+}
 
-		ret = FALSE;
-#endif
+
+gboolean
+_gdk_pixbuf_load_module (GdkPixbufModule *image_module,
+			 GError         **error)
+{
+	gboolean ret;
+	gboolean locked = FALSE;
+
+	/* be extra careful, maybe the module initializes
+	 * the thread system
+	 */
+	if (g_threads_got_initialized) {
+		G_LOCK (init_lock);
+		locked = TRUE;
 	}
 
+        ret = gdk_pixbuf_load_module_unlocked (image_module, error);
+
 	if (locked)
 		G_UNLOCK (init_lock);
 


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- gtk2.spec	4 Sep 2008 19:20:53 -0000	1.317
+++ gtk2.spec	5 Sep 2008 01:05:26 -0000	1.318
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
@@ -30,6 +30,8 @@
 # a workaround for some brokenness in the flash plugin
 # see http://bugzilla.gnome.org/show_bug.cgi?id=463773
 Patch2: workaround.patch
+# fixed upstream
+Patch3: init-deadlock.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -115,6 +117,7 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
+%patch3 -p0 -b .init-deadlock
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -298,6 +301,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.0-2
+- Fix a deadlock in pixbuf loader initialization
+
 * Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 



From petersen at fedoraproject.org  Fri Sep  5 01:21:23 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri,  5 Sep 2008 01:21:23 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.86,1.87
Message-ID: <20080905012124.111B070121@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9254

Modified Files:
	comps-f10.xml.in 
Log Message:
un-core-fonts replace baekmuk-ttf-fonts as default for Korean


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- comps-f10.xml.in	3 Sep 2008 20:42:15 -0000	1.86
+++ comps-f10.xml.in	5 Sep 2008 01:20:52 -0000	1.87
@@ -524,7 +524,7 @@
   </group>
   <group>
     <id>burmese-support</id>
-    <_name>Burmese Support</_name>
+    <_name>Myanmar (Burmese) Support</_name>
     <_description/>
     <default>false</default>
     <uservisible>false</uservisible>
@@ -1352,7 +1352,6 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">abyssinica-fonts</packagereq>
-      <packagereq type="default">baekmuk-ttf-fonts-gulim</packagereq>
       <packagereq type="default">cjkunifonts-uming</packagereq>
       <packagereq type="default">dejavu-fonts</packagereq>
       <packagereq type="default">dejavu-fonts-experimental</packagereq>
@@ -1374,11 +1373,13 @@
       <packagereq type="default">paktype-fonts</packagereq>
       <packagereq type="default">stix-fonts</packagereq>
       <packagereq type="default">thaifonts-scalable</packagereq>
+      <packagereq type="default">un-core-fonts-dotum</packagereq>
       <packagereq type="default">VLGothic-fonts</packagereq>
       <packagereq type="optional">andika-fonts</packagereq>
       <packagereq type="optional">asana-math-fonts</packagereq>
       <packagereq type="optional">baekmuk-ttf-fonts-batang</packagereq>
       <packagereq type="optional">baekmuk-ttf-fonts-dotum</packagereq>
+      <packagereq type="optional">baekmuk-ttf-fonts-gulim</packagereq>
       <packagereq type="optional">baekmuk-ttf-fonts-hline</packagereq>
       <packagereq type="optional">bitstream-vera-fonts</packagereq>
       <packagereq type="optional">brettfont-fonts</packagereq>
@@ -1454,6 +1455,11 @@
       <packagereq type="optional">thibault-fonts-staypuft</packagereq>
       <packagereq type="optional">tibetan-machine-uni-fonts</packagereq>
       <packagereq type="optional">tiresias-fonts</packagereq>
+      <packagereq type="optional">un-core-fonts-batang</packagereq>
+      <packagereq type="optional">un-core-fonts-dinaru</packagereq>
+      <packagereq type="optional">un-core-fonts-graphic</packagereq>
+      <packagereq type="optional">un-core-fonts-gungseo</packagereq>
+      <packagereq type="optional">un-core-fonts-pilgi</packagereq>
       <packagereq type="optional">VLGothic-fonts-proportional</packagereq>
       <packagereq type="optional">wqy-zenhei-fonts</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ethiopic</packagereq>
@@ -2924,7 +2930,7 @@
     <uservisible>false</uservisible>
     <langonly>ko</langonly>
     <packagelist>
-      <packagereq type="mandatory">baekmuk-ttf-fonts-gulim</packagereq>
+      <packagereq type="mandatory">un-core-fonts-dotum</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Korean</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Korean</packagereq>
       <packagereq type="conditional" requires="man-pages">man-pages-ko</packagereq>
@@ -2935,7 +2941,13 @@
       <packagereq type="default">baekmuk-bdf-fonts</packagereq>
       <packagereq type="default">baekmuk-ttf-fonts-batang</packagereq>
       <packagereq type="default">baekmuk-ttf-fonts-dotum</packagereq>
+      <packagereq type="default">baekmuk-ttf-fonts-gulim</packagereq>
       <packagereq type="default">baekmuk-ttf-fonts-hline</packagereq>
+      <packagereq type="default">un-core-fonts-batang</packagereq>
+      <packagereq type="default">un-core-fonts-dinaru</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="optional">ibus-hangul</packagereq>
       <packagereq type="optional">lv</packagereq>
       <packagereq type="optional">m17n-db-korean</packagereq>



From airlied at fedoraproject.org  Fri Sep  5 01:28:58 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  5 Sep 2008 01:28:58 +0000 (UTC)
Subject: rpms/kernel/devel drm-modesetting-radeon.patch, 1.19,
	1.20 kernel.spec, 
	1.927, 1.928 fixup-dri2-kms-merge.patch, 1.2, NONE
Message-ID: <20080905012858.E9AED70121@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11315

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Removed Files:
	fixup-dri2-kms-merge.patch 
Log Message:
* Fri Sep 05 2008 Dave Airlie <airlied at redhat.com>
- modesetting updates - fix AMD rs690 - roll in krh dri2 patch


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- drm-modesetting-radeon.patch	29 Aug 2008 00:04:46 -0000	1.19
+++ drm-modesetting-radeon.patch	5 Sep 2008 01:28:57 -0000	1.20
@@ -1,4 +1,36 @@
-commit 098dd0e6b64b5ec62988dc2cd2168ab5154899e1
+commit 6d533f4ec5624d7d294f5ce5d698c30d4382b4bd
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Sep 5 11:26:55 2008 +1000
+
+    drm: export drm_i915_flip_t type to userspace to build Mesa
+
+commit 3b5d57a098300ad79dd2693e4480a83d7fd2298c
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Sep 5 11:15:03 2008 +1000
+
+    radeon: only enable KMS for radeon on x86 for now
+
+commit ea2736134338c1f004a232107b61a7164a902b95
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Sep 5 10:46:17 2008 +1000
+
+    radeon: rs690 GART tables need to be in uncached memory.
+    
+    Allocate the rs480/690 tables from uncached memory.
+
+commit 129fe6b27ae6abf84426978c0fd5b09780504d11
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Sep 4 12:01:06 2008 +1000
+
+    drm: fixup DRI2 merge with kms code
+
+commit 1f9bbda7e991e206d29451d13b6a57e38da96e3d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Sep 4 11:58:08 2008 +1000
+
+    drm/radeon: fixup some avivo/rs690 checks
+
+commit ff8a10c7422b9ece2c9ac8310565b31b9c13e5fc
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 29 09:59:02 2008 +1000
 
@@ -6,7 +38,7 @@
     
     also change name from text to nomodeset
 
-commit 5aa38d1a3c8fbf239abeb6f73a9a76acc5124d5c
+commit c3bbe9c782d2edcd3524f438532e4297998ae8cc
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 28 21:22:27 2008 +1000
 
@@ -14,13 +46,13 @@
     
     also don't explode on lack of DDC
 
-commit 96941a75072d7d681c576921cc510c275891976d
+commit 0818f8ce90cdb651c273666bb5667e2cc5c35e13
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 28 18:31:50 2008 +1000
 
     drm: fix dev->master convert
 
-commit f3c81bea8d5160589fe21995a2e1077c0ad01afa
+commit 518d3561e50b3277d72b61297b6edf3272827bfd
 Author: Kristian H??gsberg <krh at redhat.com>
 Date:   Wed Aug 20 11:26:11 2008 -0400
 
@@ -30,7 +62,7 @@
     
     Signed-off-by: Kristian H??gsberg <krh at redhat.com>
 
-commit 6e88a37e7d7fa99b29e2c5022d1bee97afa2b28b
+commit 4a7d06ccebac463f0880d713a0b8bf80f53cc7a4
 Author: Kristian H??gsberg <krh at redhat.com>
 Date:   Wed Aug 20 11:24:13 2008 -0400
 
@@ -42,7 +74,7 @@
     
     Signed-off-by: Kristian H??gsberg <krh at redhat.com>
 
-commit fe4d7a07faea6fc365fed407d339980464590b71
+commit 488bfc69d766df0853afdfaa5985a554922b5376
 Author: Kristian H??gsberg <krh at redhat.com>
 Date:   Wed Aug 20 11:20:13 2008 -0400
 
@@ -52,7 +84,7 @@
     
     Signed-off-by: Kristian H??gsberg <krh at redhat.com>
 
-commit 3825c6b0af8a237fb3a6fe46dff499bddb50a0f2
+commit 431aca479c5a7b7f804a66dedad43ba44fdeea15
 Author: Kristian H??gsberg <krh at redhat.com>
 Date:   Wed Aug 20 11:08:52 2008 -0400
 
@@ -60,7 +92,7 @@
     
     Signed-off-by: Kristian H??gsberg <krh at redhat.com>
 
-commit 9a59e8227c2eb23fbf2bcb2737033ef21bb87720
+commit 7553946d48bb9ae64ced6d06f026a93b0c53b5cb
 Author: Kristian H??gsberg <krh at redhat.com>
 Date:   Wed Aug 20 11:04:27 2008 -0400
 
@@ -68,7 +100,7 @@
     
     Signed-off-by: Kristian H??gsberg <krh at redhat.com>
 
-commit 0a209ebe78920cfdcd991c2b7b74217579156bb0
+commit 584dbebb70f8230122afbbd5110009162770bf38
 Author: Kristian H??gsberg <krh at redhat.com>
 Date:   Tue Aug 12 22:39:54 2008 -0400
 
@@ -81,13 +113,13 @@
     
     Signed-off-by: Kristian H??gsberg <krh at redhat.com>
 
-commit 4a06f25afb8df52fa85897a3324b04df89f5a356
+commit 23406dd2f28e170f2c9f7add644609808e75f004
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 28 16:38:49 2008 +1000
 
     radeon: fix LVDS on atombios - typos
 
-commit 25ad7f2560a6a13441263af31e0de41cca305706
+commit 0e7b660ad45b4674604f20b9c3c5811219e075de
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 28 16:38:34 2008 +1000
 
@@ -95,43 +127,43 @@
     
     This should do a better job at picking the initial configuration crtcs
 
-commit 88c27423c813ab2482f8ece587e2c314508f3cc7
+commit 91cf052ae6e97f41c13ed1f7059b48f491b802ab
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 28 12:01:53 2008 +1000
 
     radeon: limit LVDS to first CRTC for now
 
-commit e6e68d08bf4c273c948fec76106b2f7b509cbf30
+commit 2f181c55321e6c24d706d5bb9cc7fc7b625f1ab4
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 28 12:01:38 2008 +1000
 
     radeon: fixup checks for crtc in dpms path
 
-commit f3a375d2c45dd865d736f9df03e157c698339f60
+commit c8a3d5f306b9dfd538f67b8e707bd454e6e53ced
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 27 15:39:17 2008 +1000
 
     radeon: fix after rebase
 
-commit a0c7cb6c3198485fb770cd768c8f6d6e1f20b99d
+commit da2237953d7e500d2e6a9fc66bed31ca3b1f2309
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 27 13:43:23 2008 +1000
 
     drm: fix whitespace
 
-commit 3caae63652c2e386342123daf34d13a8ad88359d
+commit 3f967e6277b6224ce9ef144636f8bb8e198c4139
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 27 13:43:04 2008 +1000
 
     radeon: avoid oops on encdoers with no crtc set
 
-commit cb10610337859488b79cc20acebf01c737633a28
+commit 812db8756bc94a232ac59e05cf9b040ec77dc4a5
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Tue Aug 26 17:23:21 2008 +1000
 
     radeon: fix warning from radeon_legacy_state removal
 
-commit 0bb060b65459a7392db7be8569fa5a0172dba2f6
+commit 0bea3d2964f2f05bdadc3e3a71d01a93813e7da4
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Tue Aug 26 17:22:37 2008 +1000
 
@@ -140,7 +172,7 @@
     - done: primary dac, vga on tvdac
     - todo: ext dac, tv on tvdac
 
-commit 53dd6f04236584661fd87acf0086f52b00b08ea9
+commit 790b51602d09d32d9a9b6f493fe62ddf70f83927
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Tue Aug 26 17:22:11 2008 +1000
 
@@ -148,25 +180,25 @@
     
     - todo: updated connected status
 
-commit 5725cb7d0ec835f5d1f4399ae15d670523678559
+commit 92bb1ccd4f62967b4659342996767d66f06d1b43
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Tue Aug 26 17:20:54 2008 +1000
 
     radeon: remove unused legacy state
 
-commit 9ce901bbfb5d8fca863d33728928c12baaff0809
+commit b3e17b7e1fe17f933a2525274c46c96714ad65b5
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Tue Aug 26 17:20:15 2008 +1000
 
     radeon: get primary dac adj info from bios tables
 
-commit 16f177e98bcd5527e88781cee4000ff71943b509
+commit fcca48fd45005f97d93ecdb463c25861c7f7c64a
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 26 17:03:13 2008 +1000
 
     x86: export pat_enabled
 
-commit 5e04fb54aa301877d55c9253faf5c970c3728e48
+commit ad980a21487d319e65a9cb97037a8b4becd7c2c4
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 26 17:02:43 2008 +1000
 
@@ -175,7 +207,7 @@
     If PAT is enabled, enable write combining support for kernel/user mappings
     when pat is enabled. Also set memory to WC instead of uncached in ttm
 
-commit f20a018d16f31c1a0147ce55c5c1e722aedde084
+commit 0fe8defc00119807852d4a27a93c946b0975f9a7
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 26 17:01:35 2008 +1000
 
@@ -184,7 +216,7 @@
     move domain validate function to separate function
     call it from correct places
 
-commit f7d6c99e83512b204447d7e767050245cbb4dcfb
+commit fcb412ce91c2add47fe980fff892adadb5b90b68
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 26 17:00:49 2008 +1000
 
@@ -193,37 +225,37 @@
     If a BO hasn't been dirtied, do a solid fill on VRAM instead of
     migrating pages to VRAM
 
-commit a91c4fbd5aee5f67343c75bac60c71e26f0e43e1
+commit de3aa9d4b97a1c8c45e90b4eae8ffd408ca7dbb1
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 26 16:59:45 2008 +1000
 
     drm: set clean flags in new flags so it doesn't disappear
 
-commit 0e526f63691981325dabcd573a12317a39955c1c
+commit 8f8127f7aa91b3362ab0d23a8228077e8e46eff4
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 22 10:16:20 2008 +1000
 
     radeon: wait for dma gui idle on 2D idle
 
-commit 16093c27570d4600741db95795097cdbd982e86f
+commit 281d8adbad846e93a8588af873e77dd3fe5f8535
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 22 10:16:01 2008 +1000
 
     radeon_gem: fix some misplace ==
 
-commit f5d271bc48d25a71ebb28df259c149fac58d277f
+commit 408b596180ee9801187dbc7ecf1d8d62b33a4833
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 22 10:13:25 2008 +1000
 
     radeon: get buffer upload working
 
-commit d641df30b7bf37669c351cc3b9966730e448b6b9
+commit 0ab3dbf4a344fefdb4e2508bc5e1d37166105eb7
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 22 10:12:57 2008 +1000
 
     radeon: read back register between on gart flush
 
-commit fa958febf783ecaf70d7f29485663a66a2383bce
+commit 6b4abf3528ce8ccbccc3b1965aa7fe9a867514e2
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 22 10:11:55 2008 +1000
 
@@ -232,7 +264,7 @@
     We need a buffer zeroing function for before we have
     accel running etc
 
-commit 1937c307b69f414909ab5ed5edb102311fc40d64
+commit 5983b2594314cb63dc5959c4e40799cda0a9f8ce
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 22 09:49:16 2008 +1000
 
@@ -243,55 +275,55 @@
     Primarily for the move code when we get a buffer in VRAM, we don't need
     to copy the contents just zero them.
 
-commit 03d6393cd4f19d451a431ded998d00510b760c5a
+commit d5cae241115ca48177ea18e6edd1ca50318493c4
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 22 09:39:07 2008 +1000
 
     ati_pcigart: add memory barrier and volatile for table access
 
-commit e4d94938c158e1081089d3f7967a2ab309353112
+commit bedbe67a192f5e887dbfe21df765756e2ca7b65f
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 22 09:35:26 2008 +1000
 
     drm: remove tlb flush logic from ttm
 
-commit 3958d38e1e813b9336ae49cd564ded90df57d870
+commit f7777d164fd1fc271d82fad9c5db34c086b50d9d
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 22 09:34:51 2008 +1000
 
     drm: wbinvd is cache coherent no need to ipi
 
-commit c3626f7b979aa3dd1f307677bc145a2938673737
+commit 56b426bbe9185b354deabbdd424351f02735641d
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 20 09:56:33 2008 +1000
 
     drm: edid don't probe 3 times because don't
 
-commit cf6aa44c45ee21808f3e30ded9d4bd14ae1f6e61
+commit 0d376172b21a3ec3a02264bc8e5e6029f627d386
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 19 12:16:13 2008 +1000
 
     FEDORA: add radeon copy root patch
 
-commit 8ffd3f2d6ac84a68b0b1b537cdb26fb635dc58db
+commit b141b286c4a0c6d51ad22a46d4a6c36859f93349
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 19 12:15:10 2008 +1000
 
     radeon: fix bug in scratch retreival
 
-commit e4eb4be9fe14535c0b55f0c0815b510637ca4e19
+commit 266219d447f683601bfc935674a4f72a6b2f8bce
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 19 12:14:38 2008 +1000
 
     radeon: add GTT domain
 
-commit 949adbdd4db02f334d3c7cd62fa0625184ea5600
+commit 7b14f1c59deeb0a21f42948b8db439eb992316ca
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 27 14:58:05 2008 +1000
 
     radeon: add missing regs from a previous rebase
 
-commit f5e665b3a3cee48baaa5ad9785a8d2ebd9b383ee
+commit 39417acd369f10d393c48ada6c72445d8d96948a
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 15 14:28:43 2008 +1000
 
@@ -303,37 +335,37 @@
     
     Signed-off-by: Dave Airlie <airlied at redhat.com>
 
-commit 95a92133270db49c86d8f1c14cff6f2061a9baa7
+commit 404a683d929e9050e84e747b4a9914c86ac3304e
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 18:14:56 2008 +1000
 
     disable modeset on < r300
 
-commit aa7120ad9438127008bf5a23edbafbafe4267167
+commit 3ad39ca001b9676367dbc206491c0337e36b8b32
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 15 09:36:21 2008 +1000
 
     radeon: set the base after mode is programmed
 
-commit 21b278e5d2616629daecfc4c20247b0d5b4ebf2a
+commit d223cf209ef2ea27d150976000cc085ff9b675e3
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 15 09:35:55 2008 +1000
 
     radeon: fix LVDS modes problem
 
-commit adcee8a0b33897b58406256178a4f7f6d5ebd325
+commit 31ae8e77d6eb2f689bc50ba011381fdd29fed837
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 19:29:03 2008 +1000
 
     i915: fix some missing gem defines for ddx build
 
-commit 6d897fc28180118504c3b37e951c838c4f28fcaa
+commit 42f365cc318481ed32001ed82a65fee1c1580a5c
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 18:06:31 2008 +1000
 
     radeon: reserve 64k of VRAM for now for text mode so we don't trample it
 
-commit 574b6890103556b0630815aeaf8ab87510d08f18
+commit 06c860cd26b97f03cbe04b4aa4bdaeb4b92a6155
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 15:23:51 2008 +1000
 
@@ -341,7 +373,7 @@
     
     Need to add to Intel when we get there
 
-commit 7a7260c2e30e136df2020c66eb941fe3566f4161
+commit 27771cc08e249ad1b0276943ae58f9557aaa6c05
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 14:38:27 2008 +1000
 
@@ -349,31 +381,31 @@
     
     This gets RN50 to initialise correctly
 
-commit 6ef0ad1914d97bf94c75314c6da0dd489c80621f
+commit 192b210ff5641a56acc5ec545b2ea1182ae6ce8b
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 14:37:25 2008 +1000
 
     radeon: add copy/solid regs for rn50
 
-commit 582693cab1971d5aaeb395efe1074fd38d9d7913
+commit 9e2acc2c62e2828360cf30ca626f5fe684910315
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:59:47 2008 +1000
 
     radeon: fill in and make use of more combios tables
 
-commit 7e218bb4290054d9c3849f204baa94579789ded7
+commit e2ca8ecd5c653688b9cc8a91c642fd3c86096f57
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 09:59:31 2008 +1000
 
     radeon: add quirks from DDX
 
-commit 5c6038ed70d36dc2bf71cd86983629faaa909d76
+commit 07fe78c61f7764857d5f2d62d206355ebd1a46fc
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:59:12 2008 +1000
 
     radeon: fix warnings
 
-commit 4c55b11e929ce6063f71eb9f933a558faa25cfc4
+commit 3f097342211662d9af58c37e6698a19e7ebeca3f
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:58:47 2008 +1000
 
@@ -384,31 +416,31 @@
     - add debugging for tracing calls
     - fix pitch calculation
 
-commit 70fd2d82fdb01dc3b581253b1dfb9b9c1d3f8801
+commit 1dc90a6f8ec005402d6ef0d0000b69019cde7035
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:58:24 2008 +1000
 
     radeon: set base in legacy crtc mode set
 
-commit 0a1a8af5e1d2ffa81061de4e4ba2ee6caf7c9384
+commit e2f9198ac5f453687b617a6e2ba2663b03e7e52d
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:55:06 2008 +1000
 
     radeon: Convert COM BIOS to table offset lookup function
 
-commit a73209ef04e58ff55155218f5739a20b8bfff7db
+commit a906d86cccd88df4b51e1aaee85684e1414c1773
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:54:03 2008 +1000
 
     radeon/cursor: Restructure cursor handling and add support for legacy cursors
 
-commit 098545153ab5c62bb1da12ab1aa512811e96ccd3
+commit 955cac80f53aa3e2d5acceb1f3d626860d48a6b6
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:53:08 2008 +1000
 
     radeon/atom: implement crtc lock
 
-commit abccc3f6e09cdc43beafb8016bbd24cda2ad8316
+commit 25cbb993b4e5f0deea4c12a775290eb47dabf928
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:50:15 2008 +1000
 
@@ -417,7 +449,7 @@
     - Add gamma set for legacy chips
     - Add 16 bpp gamma set
 
-commit 6459ec817757f3b096d7fa7216d9bb40795f07f3
+commit 0db2fe1ba7639e69f029d4e5c37b0308ff61a5e2
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:49:55 2008 +1000
 
@@ -427,19 +459,19 @@
     - move i2c_lock to radeon_i2c.c
     - enable tv dac on legacy
 
-commit 08668cf6bd2a474c9e55b6d2c714ebdc12e471eb
+commit a613b3c58291c7262499ba14d884b3bd51aedfd0
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:49:30 2008 +1000
 
     radeon: Add legacy dac detect stubs
 
-commit c0226a25d70563d4f72a90d88300c84605ed77bc
+commit 6df5c57f9ecb228793cfb91db33d9a1b29b75bb9
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:49:12 2008 +1000
 
     unify connector, i2c handling for atom and legacy
 
-commit 229038758dd6cd736e9d0d14ed8d2375ecb31397
+commit 56ce42ab90129a7d728442ad348a3c2d8a74f8e9
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:48:50 2008 +1000
 
@@ -447,25 +479,25 @@
     
     - removed save/init/restore chain with set functions
 
-commit 30ad651bf74b568d917c703f61c473d56a49c56c
+commit 3b0932a6397f09d8adb3106571404289b1f4ff98
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 08:54:04 2008 +1000
 
     FEDORA: radeon set gart buffers start
 
-commit df19079258c70194d0a0f7ec23198af33e27bb11
+commit a0332572f5fccef69bff690ebe3fd612ccfdec8c
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 08:52:41 2008 +1000
 
     radeon: command submission remove debug
 
-commit 7f87b15a51002f3210d8ed11ce27c3d83983fa30
+commit 3f36ffcdfeb921841326cfcc7a8f1e4fefb63f76
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 08:51:00 2008 +1000
 
     radeon: use mm_enabled variable to denote memory manager running
 
-commit 747ae8fabbec82790e177b6401f46c74d9ef7923
+commit 41a9bb0e8fae6bb919b7c403cf045d7e85a8744d
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 12 12:19:05 2008 +1000
 
@@ -473,19 +505,19 @@
     
     in the correct place in the drm so buffer swaps work again
 
-commit 9dd9199b81fa711871dfc89478a88a9c18338204
+commit 44b8b48b6b00da7a3e6389cb3bcb8d6a51d89867
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 12 12:18:08 2008 +1000
 
     radeon: add mm supported call for userspace
 
-commit ce9edcd268687a9a20ece68d5dfc72ac9d23bf2d
+commit 9353128519c93f700153d24068beae8f9c45271c
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 12 09:40:18 2008 +1000
 
     FEDORA: add old DMA buffers on top of GEM
 
-commit c5f3dc17201dd72d37629936e085a8dda8a590d1
+commit 5e1c3d29c8bb0d24583d29b4c9416e748ed8dc58
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 8 15:57:10 2008 +1000
 
@@ -494,7 +526,7 @@
     This adds the CRTC and PLL setting code, it doesn't work
     yet but its all heading in the right direction.
 
-commit e655643143bedce651b928d074a7c4f79a305fb7
+commit d0db720641ef368559fd7bee097a1c5985fb117a
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 8 13:32:50 2008 +1000
 
@@ -503,67 +535,67 @@
     In theory we should be setting the mapping for the legacy node.
     the inode for the control node might be different.
 
-commit e56ec66c332816f56caf49713fa1aca25c134fa6
+commit 241822918ff8c8f169707181dff8b8a24da1d0ef
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 8 10:11:23 2008 +1000
 
     radeon: add initial tmds parsing for legacy cards
 
-commit 90df9746484939fcbdac66ca3c3b16f87acf104c
+commit a834758f13a03bdcb3b2fc8e70f5f8ef57445610
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 6 16:01:22 2008 +1000
 
     radeon: set new memmap on gem enable
 
-commit ae99db100df21053ac5b6090068f464ebfe8b2e7
+commit aaa864fc11b2915a9807998bea364eef8dfed36f
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 6 15:51:02 2008 +1000
 
     radeon/pci: fixup table when GEM allocates it
 
-commit dcf60a1d40139bfc69506a7929f64fc2c4d0d951
+commit 655d0b2b4ae21984a056ebdd19e7a4832126186a
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 6 15:44:38 2008 +1000
 
     radeon: set gart table size
 
-commit 2391bf668d7d426d1b86b156d6b915e8de090881
+commit 6154373c4fb5cf6224aeffd09324f124f1a04b90
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 6 15:44:18 2008 +1000
 
     radeon: fix buffer evict slection
 
-commit 166865ddd6688686ac7d5688129bb0686c89acba
+commit 822cb91583da0d93f9fa50d06c029e4d3fedf273
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 6 15:43:51 2008 +1000
 
     pcigart: fix incorrect memset + no need for wbinvd
 
-commit d3faa4f6a3220996ea02c2e8acd3cb25e51445de
+commit 09f5011d67e0cafc1da7b2aad33aed037603cb15
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 5 15:01:02 2008 +1000
 
     drm: don't tear down certain things for modesetting drivers
 
-commit 0665b4d4cfadf49a8de4309233a1144eecbc5099
+commit 92aa6dc4d089f009c115bcb0b657f25edc9c9eb5
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 5 11:22:24 2008 +1000
 
     radeon: fix defines so blit works again
 
-commit 6fcb49ca611e00ac998236bcef9e4ee1d1a67b23
+commit 0c83b0b0065a0ec87bcdefa44f8458b5f5005e92
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Aug 4 17:10:35 2008 +1000
 
     drm: leave bo driver finish to the driver
 
-commit 1922ad6fef0e420b3ae2b972b08d23041aa00c13
+commit ee88d6959c5d222c5e4706333f134891e9b8c64a
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Aug 4 14:21:22 2008 +1000
 
     drm: fix unneeded debug
 
-commit 1734f536d4b161b7dceea19ea43d3e204c7dce52
+commit 1b0e34c58f75804f8a954008c931ee606651071d
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Aug 4 14:20:47 2008 +1000
 
@@ -571,49 +603,49 @@
     
     if kms enabled memory manager will be enabled by default
 
-commit dbffe9683d28b8d93a6950ab47a1e9a053e10605
+commit 93bbccaec3e3f3691dcbd2bbafae3eea03604a82
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Aug 4 14:20:26 2008 +1000
 
     drm: kill bo after driver lastclose
 
-commit e89731c87081070c8f9e4dce3809335b0a7276d1
+commit a7b10bfa67eec60137f55a639457bde0651f0d60
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Aug 4 11:32:45 2008 +1000
 
     radeon: don't invalidate cache if CP isn't running
 
-commit 52debd2ba8a189cc1aae7582185561b80ef90154
+commit 6b08921f54b1a5713a3ad434f5b65ab81cd6d93c
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Sat Aug 2 08:06:26 2008 +1000
 
     drm: fix release locking
 
-commit 45435a275d840f86cd9d3568ac0460ea5ba7990d
+commit 9ce806a95df91dd2f7f4266ae1d7cf44eccc78e7
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 1 23:39:24 2008 +1000
 
     fix build on powerpc
 
-commit 58e1bfaeef22179ca917c8bfb0a3fa482e827ba4
+commit f88aac6fb4621168aeefcdff7fb9228c11971656
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 1 16:55:34 2008 +1000
 
     drm: add radeon modesetting support
 
-commit db84d6124fe660ad490c3e7b3ee40e96c0dde0f0
+commit 7c4962d78781cee54293487f1cbdea606b4ddaeb
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 1 14:07:35 2008 +1000
 
     drm: add modesetting support
 
-commit eb9c1ca93d321cdfb32ff9273615ba6771e2debc
+commit 1c666edc002f1b74bf55235f936747462a34775d
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 1 14:06:12 2008 +1000
 
     drm: add TTM VM changes
 
-commit 51e04da2f8306a10617a3b205e1732de5b6b8dfd
+commit 2d12ab4e00baced8f449c1d8c213ce8ef8001bda
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 1 11:24:36 2008 +1000
 
@@ -621,13 +653,13 @@
     
     This adds the control device nodes also
 
-commit c9823c49595126884425c74641d62824c7231eae
+commit 74ef7b2718dc16ace74e29a2fbed2f9cdd8ee8ac
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 1 11:11:06 2008 +1000
 
     drm: add set/drop master ioctls
 
-commit f390842b72087c63f9c3c8e5a10bc6db6349b43a
+commit 7495aebe11e73fa3a08bd57bb67697c5aca9adde
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 1 10:23:57 2008 +1000
 
@@ -637,19 +669,19 @@
     
     Signed-off-by: Dave Airlie <airlied at redhat.com>
 
-commit a8fabd28323a87d95c0c5858cc29089fb710564b
+commit df5dc2674d276245da4f6720eedf33aba541085a
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 1 10:23:40 2008 +1000
 
     drm: make sarea_max unsigned long
 
-commit f8b1f041b4cf58b5e06195f69bf58979ab5fd86b
+commit 187aa3e85586d504b190e34bb8663308abeb11e7
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Jul 31 15:27:27 2008 +1000
 
     drm: import TTM basic objects
 
-commit 7b11f7c24283df70e5f76631d3f8daa941955028
+commit aa4b0695fae370bb7f6460163a768d3722850a72
 Author: Keith Packard <keithp at keithp.com>
 Date:   Fri Jun 20 00:08:06 2008 -0700
 
@@ -660,7 +692,7 @@
     
     Signed-off-by: Eric Anholt <eric at anholt.net>
 
-commit f540d73871f75826da9096ff5f76b9cbb674e410
+commit 6dbed074d3f057d0ef2c7664674202b613716b08
 Author: Matthew Wilcox <matthew at wil.cx>
 Date:   Tue Jul 22 08:52:16 2008 -0400
 
@@ -672,7 +704,7 @@
     
     Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
 
-commit edc5293b7e74bd9ae93755dfdf73375a743f4079
+commit 2b820d5eb4d375803e248c0b264bcc5290f9a6bd
 Author: David Howells <dhowells at redhat.com>
 Date:   Wed Jul 30 12:29:38 2008 -0700
 
@@ -687,7 +719,7 @@
     Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
     Signed-off-by: Dave Airlie <airlied at redhat.com>
 
-commit d340e4814d081815e6fb47cb90c5a3c6bc6e34e2
+commit 70e1dacc95af9c7ef34e7dfc3b453ae0ccc3ca11
 Author: David Howells <dhowells at redhat.com>
 Date:   Wed Jul 30 12:29:37 2008 -0700
 
@@ -703,7 +735,7 @@
     Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
     Signed-off-by: Dave Airlie <airlied at redhat.com>
 
-commit 9128c0d4fd881e1fe9780380307faa14d14d4c52
+commit 8d95ef54a3310fad5f558a84f0fd6792c452cecc
 Author: Carlos R. Mafra <crmafra2 at gmail.com>
 Date:   Wed Jul 30 12:29:37 2008 -0700
 
@@ -716,7 +748,7 @@
     Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
     Signed-off-by: Dave Airlie <airlied at redhat.com>
 
-commit a60cee8d6c685530dea08e457664af2cf6bdd187
+commit ac1b41ac2d7914da373c7527f9a8579cfdc3853b
 Author: Eric Anholt <eric at anholt.net>
 Date:   Wed Jul 30 12:06:12 2008 -0700
 
@@ -735,7 +767,7 @@
     
     Signed-off-by: Eric Anholt <eric at anholt.net>
 
-commit 764c89c3707c839dc177d939f846c4079592e00f
+commit 4826aad5b3836072e9b910bbb94623b56c19ee36
 Author: Eric Anholt <eric at anholt.net>
 Date:   Thu Aug 21 12:53:33 2008 -0700
 
@@ -747,7 +779,7 @@
     
     Signed-off-by: Eric Anholt <eric at anholt.net>
 
-commit 3a0980df34c533eb1d5533280f317e53277d354d
+commit 9874228e10e1386ce32c6fd10629b19120a5a62b
 Author: Keith Packard <keithp at keithp.com>
 Date:   Fri Jun 20 00:08:06 2008 -0700
 
@@ -760,7 +792,7 @@
     
     Signed-off-by: Eric Anholt <eric at anholt.net>
 
-commit 8088d4447f16e018884abc152b40f67c1f015a10
+commit d367d7dfafe70fa5a1b1166d6e8c083ecf814523
 Author: Matthew Garrett <mjg59 at srcf.ucam.org>
 Date:   Tue Aug 5 19:37:25 2008 +0100
 
@@ -773,7 +805,7 @@
     Signed-off-by: Matthew Garrett <mjg at redhat.com>
     Signed-off-by: Dave Airlie <airlied at linux.ie>
 
-commit e06ef39b6e69bb5459705da0ef6ba66d06235375
+commit 83a61e23d457af97f12e6c2d475f7acc4caf2a8d
 Author: Keith Packard <keithp at keithp.com>
 Date:   Wed Jul 30 13:03:43 2008 -0700
 
@@ -784,7 +816,7 @@
     
     Signed-off-by: Eric Anholt <eric at anholt.net>
 
-commit ace8f8454386744c676f748dc1ddbd0755e02dd7
+commit 78ed63058708dede907c063e20f420bfd15e6912
 Author: Keith Packard <keithp at keithp.com>
 Date:   Wed Jul 30 12:21:20 2008 -0700
 
@@ -794,7 +826,7 @@
     
     Signed-off-by: Eric Anholt <eric at anholt.net>
 
-commit 11ce22b4fa4e39d41af038945f54d0da3e05fcef
+commit 9280544a990c7bacf5d25a2a4fea88cf222ea763
 Author: Eric Anholt <eric at anholt.net>
 Date:   Tue Jul 29 12:10:39 2008 -0700
 
@@ -808,7 +840,7 @@
     
     Signed-off-by: Eric Anholt <eric at anholt.net>
 
-commit 1a1d9d9ceb6d9261bfa3ec1da4848a0e45e81d47
+commit 05603ca82b5a091c43e93622537c54227301fcb5
 Author: Jesse Barnes <jbarnes at virtuousgeek.org>
 Date:   Tue Jul 29 11:54:06 2008 -0700
 
@@ -816,7 +848,7 @@
     
     Signed-off-by: Eric Anholt <eric at anholt.net>
 
-commit 069b3238e1cc4f98852c77836f1d5a856e7613b2
+commit 865ebcf7c6413fbf87ad574dc3bcaa54372a233d
 Author: Keith Packard <keithp at keithp.com>
 Date:   Wed Jul 30 12:36:08 2008 -0700
 
@@ -826,7 +858,7 @@
     
     Signed-off-by: Eric Anholt <eric at anholt.net>
 
-commit f231aeac9602b38afb7605f9a80a2f7e77547d02
+commit b75b54fd350b8a18ee5e1ee26d5b2b7bf23e794d
 Author: Keith Packard <keithp at keithp.com>
 Date:   Wed Jul 30 12:28:47 2008 -0700
 
@@ -910,7 +942,7 @@
  drm-$(CONFIG_COMPAT) += drm_ioc32.o
  
 diff --git a/drivers/gpu/drm/ati_pcigart.c b/drivers/gpu/drm/ati_pcigart.c
-index c533d0c..947febc 100644
+index c533d0c..802c6e9 100644
 --- a/drivers/gpu/drm/ati_pcigart.c
 +++ b/drivers/gpu/drm/ati_pcigart.c
 @@ -34,9 +34,55 @@
@@ -971,10 +1003,16 @@
  {
  	gart_info->table_handle = drm_pci_alloc(dev, gart_info->table_size,
  						PAGE_SIZE,
-@@ -44,8 +90,10 @@ static int drm_ati_alloc_pcigart_table(struct drm_device *dev,
+@@ -44,12 +90,25 @@ static int drm_ati_alloc_pcigart_table(struct drm_device *dev,
  	if (gart_info->table_handle == NULL)
  		return -ENOMEM;
  
++#ifdef CONFIG_X86
++	/* IGPs only exist on x86 in any case */
++	if (gart_info->gart_reg_if == DRM_ATI_GART_IGP)
++		set_memory_uc(gart_info->table_handle->vaddr, gart_info->table_size >> PAGE_SHIFT);
++#endif
++
 +	memset(gart_info->table_handle->vaddr, 0, gart_info->table_size);
  	return 0;
  }
@@ -982,7 +1020,16 @@
  
  static void drm_ati_free_pcigart_table(struct drm_device *dev,
  				       struct drm_ati_pcigart_info *gart_info)
-@@ -63,7 +111,6 @@ int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info
+ {
++#ifdef CONFIG_X86
++	/* IGPs only exist on x86 in any case */
++	if (gart_info->gart_reg_if == DRM_ATI_GART_IGP)
++		set_memory_wb(gart_info->table_handle->vaddr, gart_info->table_size >> PAGE_SHIFT);
++#endif
+ 	drm_pci_free(dev, gart_info->table_handle);
+ 	gart_info->table_handle = NULL;
+ }
+@@ -63,7 +122,6 @@ int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info
  
  	/* we need to support large memory configurations */
  	if (!entry) {
@@ -990,7 +1037,7 @@
  		return 0;
  	}
  
-@@ -98,17 +145,14 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
+@@ -98,17 +156,14 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
  	struct drm_sg_mem *entry = dev->sg;
  	void *address = NULL;
  	unsigned long pages;
@@ -1011,7 +1058,7 @@
  		DRM_DEBUG("PCI: no table in VRAM: using normal RAM\n");
  
  		ret = drm_ati_alloc_pcigart_table(dev, gart_info);
-@@ -116,15 +160,19 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
+@@ -116,15 +171,19 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
  			DRM_ERROR("cannot allocate PCI GART page!\n");
  			goto done;
  		}
@@ -1034,7 +1081,7 @@
  	}
  
  	pci_gart = (u32 *) address;
-@@ -133,8 +181,6 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
+@@ -133,8 +192,6 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
  	pages = (entry->pages <= max_pages)
  	    ? entry->pages : max_pages;
  
@@ -1043,7 +1090,7 @@
  	for (i = 0; i < pages; i++) {
  		/* we need to support large memory configurations */
  		entry->busaddr[i] = pci_map_page(dev->pdev, entry->pagelist[i],
-@@ -146,32 +192,18 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
+@@ -146,32 +203,18 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
  			bus_address = 0;
  			goto done;
  		}
@@ -1080,7 +1127,7 @@
  
        done:
  	gart_info->addr = address;
-@@ -179,3 +211,142 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
+@@ -179,3 +222,142 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
  	return ret;
  }
  EXPORT_SYMBOL(drm_ati_pcigart_init);
@@ -4342,7 +4389,7 @@
 +EXPORT_SYMBOL(drm_bo_pfn_prot);
 +
 diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
-index bde64b8..112ba7a 100644
+index bde64b8..d4e42e0 100644
 --- a/drivers/gpu/drm/drm_bufs.c
 +++ b/drivers/gpu/drm/drm_bufs.c
 @@ -54,9 +54,9 @@ static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
@@ -4409,8 +4456,8 @@
  		vfree(map->handle);
 +		if (master) {
 +			if (dev->sigdata.lock == master->lock.hw_lock)
-+				dev->sigdata.lock = NULL;
-+			master->lock.hw_lock = NULL;   /* SHM removed */
++				dev->sigdata.lock = &dev->default_lock;
++			master->lock.hw_lock = &dev->default_lock;
 +			master->lock.file_priv = NULL;
 +			wake_up_interruptible(&master->lock.lock_queue);
 +		}
@@ -11367,7 +11414,7 @@
  
  static int drm__vma_info(char *buf, char **start, off_t offset, int request,
 diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
-index c2f584f..1f842d8 100644
+index c2f584f..1dc2965 100644
 --- a/drivers/gpu/drm/drm_stub.c
 +++ b/drivers/gpu/drm/drm_stub.c
 @@ -57,6 +57,14 @@ static int drm_minor_get_id(struct drm_device *dev, int type)
@@ -11443,8 +11490,8 @@
 +
 +	if (master->lock.hw_lock != &dev->default_lock) {
 +		if (dev->sigdata.lock == master->lock.hw_lock)
-+			dev->sigdata.lock = NULL;
-+		master->lock.hw_lock = NULL;	/* SHM removed */
++			dev->sigdata.lock = &dev->default_lock;
++		master->lock.hw_lock = &dev->default_lock;
 +		master->lock.file_priv = NULL;
 +		wake_up_interruptible(&master->lock.lock_queue);
 +	}
@@ -12742,7 +12789,7 @@
  i915-$(CONFIG_COMPAT)   += i915_ioc32.o
  
 diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index 8897434..24b43cd 100644
+index 8897434..bad0144 100644
 --- a/drivers/gpu/drm/i915/i915_dma.c
 +++ b/drivers/gpu/drm/i915/i915_dma.c
 @@ -39,42 +39,100 @@
@@ -12885,7 +12932,7 @@
  
  	return 0;
  }
-@@ -113,42 +162,33 @@ static int i915_dma_cleanup(struct drm_device * dev)
+@@ -113,42 +162,43 @@ static int i915_dma_cleanup(struct drm_device * dev)
  static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
  {
  	drm_i915_private_t *dev_priv = dev->dev_private;
@@ -12897,14 +12944,22 @@
 -		i915_dma_cleanup(dev);
 -		return -EINVAL;
 -	}
--
++        master_priv->sarea = drm_getsarea(dev);
++        if (!master_priv->sarea) {
++                DRM_ERROR("can not find sarea!\n");
++                i915_dma_cleanup(dev);
++                return -EINVAL;
++        }
+ 
 -	dev_priv->mmio_map = drm_core_findmap(dev, init->mmio_offset);
 -	if (!dev_priv->mmio_map) {
 -		i915_dma_cleanup(dev);
 -		DRM_ERROR("can not find mmio map!\n");
 -		return -EINVAL;
 -	}
--
++        master_priv->sarea_priv = (drm_i915_sarea_t *)
++		((u8 *) master_priv->sarea->handle + init->sarea_priv_offset);
+ 
 -	dev_priv->sarea_priv = (drm_i915_sarea_t *)
 -	    ((u8 *) dev_priv->sarea->handle + init->sarea_priv_offset);
 +	if (init->ring_size != 0) {
@@ -12950,7 +13005,7 @@
  	}
  
  	dev_priv->ring.virtual_start = dev_priv->ring.map.handle;
-@@ -157,36 +197,12 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
+@@ -157,36 +207,12 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
  	dev_priv->back_offset = init->back_offset;
  	dev_priv->front_offset = init->front_offset;
  	dev_priv->current_page = 0;
@@ -12988,7 +13043,7 @@
  	return 0;
  }
  
-@@ -196,16 +212,6 @@ static int i915_dma_resume(struct drm_device * dev)
+@@ -196,16 +222,6 @@ static int i915_dma_resume(struct drm_device * dev)
  
  	DRM_DEBUG("%s\n", __func__);
  
@@ -13005,7 +13060,7 @@
  	if (dev_priv->ring.map.handle == NULL) {
  		DRM_ERROR("can not ioremap virtual address for"
  			  " ring buffer\n");
-@@ -220,9 +226,9 @@ static int i915_dma_resume(struct drm_device * dev)
+@@ -220,9 +236,9 @@ static int i915_dma_resume(struct drm_device * dev)
  	DRM_DEBUG("hw status page @ %p\n", dev_priv->hw_status_page);
  
  	if (dev_priv->status_gfx_addr != 0)
@@ -13017,7 +13072,7 @@
  	DRM_DEBUG("Enabled hardware status page\n");
  
  	return 0;
-@@ -367,9 +373,10 @@ static int i915_emit_cmds(struct drm_device * dev, int __user * buffer, int dwor
+@@ -367,9 +383,10 @@ static int i915_emit_cmds(struct drm_device * dev, int __user * buffer, int dwor
  	return 0;
  }
  
@@ -13031,7 +13086,7 @@
  {
  	drm_i915_private_t *dev_priv = dev->dev_private;
  	struct drm_clip_rect box;
-@@ -413,16 +420,19 @@ static int i915_emit_box(struct drm_device * dev,
+@@ -413,16 +430,19 @@ static int i915_emit_box(struct drm_device * dev,
  static void i915_emit_breadcrumb(struct drm_device *dev)
  {
  	drm_i915_private_t *dev_priv = dev->dev_private;
@@ -13056,7 +13111,7 @@
  	OUT_RING(dev_priv->counter);
  	OUT_RING(0);
  	ADVANCE_LP_RING();
-@@ -486,7 +496,7 @@ static int i915_dispatch_batchbuffer(struct drm_device * dev,
+@@ -486,7 +506,7 @@ static int i915_dispatch_batchbuffer(struct drm_device * dev,
  				return ret;
  		}
  
@@ -13065,7 +13120,7 @@
  			BEGIN_LP_RING(2);
  			if (IS_I965G(dev)) {
  				OUT_RING(MI_BATCH_BUFFER_START | (2 << 6) | MI_BATCH_NON_SECURE_I965);
-@@ -514,17 +524,21 @@ static int i915_dispatch_batchbuffer(struct drm_device * dev,
+@@ -514,17 +534,21 @@ static int i915_dispatch_batchbuffer(struct drm_device * dev,
  static int i915_dispatch_flip(struct drm_device * dev)
  {
  	drm_i915_private_t *dev_priv = dev->dev_private;
@@ -13089,7 +13144,7 @@
  	OUT_RING(0);
  	ADVANCE_LP_RING();
  
-@@ -546,16 +560,16 @@ static int i915_dispatch_flip(struct drm_device * dev)
+@@ -546,16 +570,16 @@ static int i915_dispatch_flip(struct drm_device * dev)
  	OUT_RING(0);
  	ADVANCE_LP_RING();
  
@@ -13110,7 +13165,7 @@
  	return 0;
  }
  
-@@ -579,9 +593,10 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
+@@ -579,9 +603,10 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
  			    struct drm_file *file_priv)
  {
  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -13122,7 +13177,7 @@
  	drm_i915_batchbuffer_t *batch = data;
  	int ret;
  
-@@ -602,7 +617,8 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
+@@ -602,7 +627,8 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
  
  	ret = i915_dispatch_batchbuffer(dev, batch);
  
@@ -13132,7 +13187,7 @@
  	return ret;
  }
  
-@@ -610,9 +626,10 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
+@@ -610,9 +636,10 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
  			  struct drm_file *file_priv)
  {
  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -13144,7 +13199,7 @@
  	drm_i915_cmdbuffer_t *cmdbuf = data;
  	int ret;
  
-@@ -635,7 +652,8 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
+@@ -635,7 +662,8 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
  		return ret;
  	}
  
@@ -13154,7 +13209,7 @@
  	return 0;
  }
  
-@@ -663,7 +681,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
+@@ -663,7 +691,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
  
  	switch (param->param) {
  	case I915_PARAM_IRQ_ACTIVE:
@@ -13163,7 +13218,7 @@
  		break;
  	case I915_PARAM_ALLOW_BATCHBUFFER:
  		value = dev_priv->allow_batchbuffer ? 1 : 0;
-@@ -671,6 +689,12 @@ static int i915_getparam(struct drm_device *dev, void *data,
+@@ -671,6 +699,12 @@ static int i915_getparam(struct drm_device *dev, void *data,
  	case I915_PARAM_LAST_DISPATCH:
  		value = READ_BREADCRUMB(dev_priv);
  		break;
@@ -13176,7 +13231,7 @@
  	default:
  		DRM_ERROR("Unknown parameter %d\n", param->param);
  		return -EINVAL;
-@@ -697,8 +721,6 @@ static int i915_setparam(struct drm_device *dev, void *data,
+@@ -697,8 +731,6 @@ static int i915_setparam(struct drm_device *dev, void *data,
  
  	switch (param->param) {
  	case I915_SETPARAM_USE_MI_BATCHBUFFER_START:
@@ -13185,7 +13240,7 @@
  		break;
  	case I915_SETPARAM_TEX_LRU_LOG_GRANULARITY:
  		dev_priv->tex_lru_log_granularity = param->value;
-@@ -749,8 +771,8 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
+@@ -749,8 +781,8 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
  	dev_priv->hw_status_page = dev_priv->hws_map.handle;
  
  	memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
@@ -13196,7 +13251,7 @@
  			dev_priv->status_gfx_addr);
  	DRM_DEBUG("load hws at %p\n", dev_priv->hw_status_page);
  	return 0;
-@@ -776,6 +798,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -776,6 +808,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
  	memset(dev_priv, 0, sizeof(drm_i915_private_t));
  
  	dev->dev_private = (void *)dev_priv;
@@ -13204,7 +13259,7 @@
  
  	/* Add register map (needed for suspend/resume) */
  	base = drm_get_resource_start(dev, mmio_bar);
-@@ -784,6 +807,30 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -784,6 +817,30 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
  	ret = drm_addmap(dev, base, size, _DRM_REGISTERS,
  			 _DRM_KERNEL | _DRM_DRIVER,
  			 &dev_priv->mmio_map);
@@ -13235,7 +13290,7 @@
  	return ret;
  }
  
-@@ -791,15 +838,41 @@ int i915_driver_unload(struct drm_device *dev)
+@@ -791,15 +848,41 @@ int i915_driver_unload(struct drm_device *dev)
  {
  	struct drm_i915_private *dev_priv = dev->dev_private;
  
@@ -13277,7 +13332,7 @@
  void i915_driver_lastclose(struct drm_device * dev)
  {
  	drm_i915_private_t *dev_priv = dev->dev_private;
-@@ -807,6 +880,8 @@ void i915_driver_lastclose(struct drm_device * dev)
+@@ -807,6 +890,8 @@ void i915_driver_lastclose(struct drm_device * dev)
  	if (!dev_priv)
  		return;
  
@@ -13286,7 +13341,7 @@
  	if (dev_priv->agp_heap)
  		i915_mem_takedown(&(dev_priv->agp_heap));
  
-@@ -819,6 +894,13 @@ void i915_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)
+@@ -819,6 +904,13 @@ void i915_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)
  	i915_mem_release(dev, file_priv, dev_priv->agp_heap);
  }
  
@@ -13300,7 +13355,7 @@
  struct drm_ioctl_desc i915_ioctls[] = {
  	DRM_IOCTL_DEF(DRM_I915_INIT, i915_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
  	DRM_IOCTL_DEF(DRM_I915_FLUSH, i915_flush_ioctl, DRM_AUTH),
-@@ -837,6 +919,22 @@ struct drm_ioctl_desc i915_ioctls[] = {
+@@ -837,6 +929,22 @@ struct drm_ioctl_desc i915_ioctls[] = {
  	DRM_IOCTL_DEF(DRM_I915_GET_VBLANK_PIPE,  i915_vblank_pipe_get, DRM_AUTH ),
  	DRM_IOCTL_DEF(DRM_I915_VBLANK_SWAP, i915_vblank_swap, DRM_AUTH),
  	DRM_IOCTL_DEF(DRM_I915_HWS_ADDR, i915_set_status_page, DRM_AUTH),
@@ -18123,10 +18178,10 @@
 +}
 diff --git a/drivers/gpu/drm/i915/i915_init.c b/drivers/gpu/drm/i915/i915_init.c
 new file mode 100644
-index 0000000..f2c9a3a
+index 0000000..06f2ecb
 --- /dev/null
 +++ b/drivers/gpu/drm/i915/i915_init.c
-@@ -0,0 +1,49 @@
+@@ -0,0 +1,35 @@
 +/*
 + * Copyright (c) 2007 Intel Corporation
 + *   Jesse Barnes <jesse.barnes at intel.com>
@@ -18147,17 +18202,6 @@
 +	if (!master_priv)
 +		return -ENOMEM;
 +
-+	/* prebuild the SAREA */
-+	sareapage = max(SAREA_MAX, PAGE_SIZE);
-+	ret = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK|_DRM_DRIVER,
-+			 &master_priv->sarea);
-+	if (ret) {
-+		DRM_ERROR("SAREA setup failed\n");
-+		return ret;
-+	}
-+	master_priv->sarea_priv = master_priv->sarea->handle + sizeof(struct drm_sarea);
-+	master_priv->sarea_priv->pf_current_page = 0;
-+
 +	master->driver_priv = master_priv;
 +	return 0;
 +}
@@ -18168,16 +18212,13 @@
 +
 +	if (!master_priv)
 +		return;
-+
-+	if (master_priv->sarea)
-+		drm_rmmap_locked(dev, master_priv->sarea);
 +		
 +	drm_free(master_priv, sizeof(*master_priv), DRM_MEM_DRIVER);
 +
 +	master->driver_priv = NULL;
 +}
 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index df03611..8371abc 100644
+index df03611..965ec74 100644
 --- a/drivers/gpu/drm/i915/i915_irq.c
 +++ b/drivers/gpu/drm/i915/i915_irq.c
 @@ -31,12 +31,35 @@
@@ -18449,7 +18490,17 @@
   */
  int i915_irq_emit(struct drm_device *dev, void *data,
  			 struct drm_file *file_priv)
-@@ -414,20 +484,6 @@ int i915_irq_wait(struct drm_device *dev, void *data,
+@@ -381,7 +451,8 @@ int i915_irq_emit(struct drm_device *dev, void *data,
+ 	drm_i915_irq_emit_t *emit = data;
+ 	int result;
+ 
+-	LOCK_TEST_WITH_RETURN(dev, file_priv);
++	if (file_priv->master->lock.hw_lock != &dev->default_lock)
++		LOCK_TEST_WITH_RETURN(dev, file_priv);
+ 
+ 	if (!dev_priv) {
+ 		DRM_ERROR("called with no initialization\n");
+@@ -414,20 +485,6 @@ int i915_irq_wait(struct drm_device *dev, void *data,
  	return i915_wait_irq(dev, irqwait->irq_seq);
  }
  
@@ -18470,7 +18521,7 @@
  /* Set the vblank monitor pipe
   */
  int i915_vblank_pipe_set(struct drm_device *dev, void *data,
-@@ -435,6 +491,7 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
+@@ -435,6 +492,7 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
  {
  	drm_i915_private_t *dev_priv = dev->dev_private;
  	drm_i915_vblank_pipe_t *pipe = data;
@@ -18478,7 +18529,7 @@
  
  	if (!dev_priv) {
  		DRM_ERROR("called with no initialization\n");
-@@ -446,9 +503,20 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
+@@ -446,9 +504,20 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
  		return -EINVAL;
  	}
  
@@ -18501,7 +18552,7 @@
  
  	return 0;
  }
-@@ -465,11 +533,11 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
+@@ -465,11 +534,11 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
  		return -EINVAL;
  	}
  
@@ -18516,7 +18567,7 @@
  		pipe->pipe |= DRM_I915_VBLANK_PIPE_B;
  
  	return 0;
-@@ -482,18 +550,19 @@ int i915_vblank_swap(struct drm_device *dev, void *data,
+@@ -482,18 +551,19 @@ int i915_vblank_swap(struct drm_device *dev, void *data,
  		     struct drm_file *file_priv)
  {
  	drm_i915_private_t *dev_priv = dev->dev_private;
@@ -18538,7 +18589,7 @@
  		DRM_DEBUG("Rotation not supported\n");
  		return -EINVAL;
  	}
-@@ -587,9 +656,9 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
+@@ -587,9 +657,9 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
  {
  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
  
@@ -18551,7 +18602,7 @@
  }
  
  void i915_driver_irq_postinstall(struct drm_device * dev)
-@@ -602,7 +671,22 @@ void i915_driver_irq_postinstall(struct drm_device * dev)
+@@ -602,7 +672,22 @@ void i915_driver_irq_postinstall(struct drm_device * dev)
  
  	if (!dev_priv->vblank_pipe)
  		dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A;
@@ -18575,7 +18626,7 @@
  	DRM_INIT_WAITQUEUE(&dev_priv->irq_queue);
  }
  
-@@ -614,10 +698,10 @@ void i915_driver_irq_uninstall(struct drm_device * dev)
+@@ -614,10 +699,10 @@ void i915_driver_irq_uninstall(struct drm_device * dev)
  	if (!dev_priv)
  		return;
  
@@ -30404,7 +30455,7 @@
 +	return NULL;
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
-index 3331f88..40f6cbc 100644
+index 248ab4a..e96037e 100644
 --- a/drivers/gpu/drm/radeon/radeon_cp.c
 +++ b/drivers/gpu/drm/radeon/radeon_cp.c
 @@ -31,6 +31,7 @@
@@ -32550,7 +32601,7 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
 new file mode 100644
-index 0000000..a9cb635
+index 0000000..2e516a1
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_display.c
 @@ -0,0 +1,645 @@
@@ -32750,7 +32801,7 @@
 +		radeon_crtc->lut_b[i] = i;
 +	}
 +
-+	if (dev_priv->is_atom_bios && dev_priv->chip_family > CHIP_RS690)
++	if (dev_priv->is_atom_bios && radeon_is_avivo(dev_priv))
 +		radeon_atombios_init_crtc(dev, radeon_crtc);
 +	else
 +		radeon_legacy_init_crtc(dev, radeon_crtc);
@@ -33200,7 +33251,7 @@
 +
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
-index 637bd7f..1740aec 100644
+index 637bd7f..36335a7 100644
 --- a/drivers/gpu/drm/radeon/radeon_drv.c
 +++ b/drivers/gpu/drm/radeon/radeon_drv.c
 @@ -35,12 +35,20 @@
@@ -33287,7 +33338,7 @@
  	driver.num_ioctls = radeon_max_ioctl;
 +
 +	/* if enabled by default */
-+#ifdef CONFIG_DRM_RADEON_KMS
++#if defined(CONFIG_DRM_RADEON_KMS) && defined(CONFIG_X86)
 +	driver.driver_features |= DRIVER_MODESET;
 +	if (radeon_modeset == 0)
 +		driver.driver_features &= ~DRIVER_MODESET;
@@ -36113,10 +36164,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
 new file mode 100644
-index 0000000..eceb520
+index 0000000..24c806a
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_gem.c
-@@ -0,0 +1,1336 @@
+@@ -0,0 +1,1337 @@
 +/*
 + * Copyright 2008 Red Hat Inc.
 + *
@@ -36602,7 +36653,7 @@
 +	    dev_priv->chip_family == CHIP_RV380 ||
 +	    dev_priv->chip_family == CHIP_R420 ||
 +	    dev_priv->chip_family == CHIP_RV410 ||
-+	    dev_priv->chip_family >= CHIP_RS600) {
++	    radeon_is_avivo(dev_priv)) {
 +		uint32_t temp = RADEON_READ(RADEON_HOST_PATH_CNTL);
 +		temp |= RADEON_HDP_APER_CNTL;
 +		RADEON_WRITE(RADEON_HOST_PATH_CNTL, temp);
@@ -36634,7 +36685,7 @@
 +	uint32_t vram;
 +	uint32_t accessible,  bar_size;
 +
-+	if ((dev_priv->chip_family <= CHIP_RV515) && (dev_priv->flags & RADEON_IS_IGP)) {
++	if (!radeon_is_avivo(dev_priv) && (dev_priv->flags & RADEON_IS_IGP)) {
 +		uint32_t tom = RADEON_READ(RADEON_NB_TOM);
 +
 +		vram = (((tom >> 16) - (tom & 0xffff) + 1) << 6);
@@ -36732,17 +36783,18 @@
 +	} else if (!(dev_priv->flags & RADEON_IS_AGP)) {
 +		/* allocate PCI GART table */
 +		dev_priv->gart_info.table_mask = DMA_BIT_MASK(32);
++		dev_priv->gart_info.gart_table_location = DRM_ATI_GART_MAIN;
++		if (dev_priv->flags & RADEON_IS_IGPGART)
++			dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_IGP;
++		else
++			dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_PCI;
++
 +		ret = drm_ati_alloc_pcigart_table(dev, &dev_priv->gart_info);
 +		if (ret) {
 +			DRM_ERROR("cannot allocate PCI GART page!\n");
 +			return -EINVAL;
 +		}
 +
-+		dev_priv->gart_info.gart_table_location = DRM_ATI_GART_MAIN;
-+		if (dev_priv->flags & RADEON_IS_IGPGART)
-+			dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_IGP;
-+		else
-+			dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_PCI;
 +		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;
 +	}
@@ -49371,7 +49423,7 @@
  
  /** Maximum number of drawables in the SAREA */
 diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
-index 05c66cf..2195856 100644
+index 05c66cf..7d88a21 100644
 --- a/include/drm/i915_drm.h
 +++ b/include/drm/i915_drm.h
 @@ -63,7 +63,7 @@ typedef struct _drm_i915_init {
@@ -49418,7 +49470,7 @@
  } drm_i915_sarea_t;
  
  /* Flags for perf_boxes
-@@ -143,6 +155,22 @@ typedef struct _drm_i915_sarea {
+@@ -143,10 +155,26 @@ typedef struct _drm_i915_sarea {
  #define DRM_I915_GET_VBLANK_PIPE	0x0e
  #define DRM_I915_VBLANK_SWAP	0x0f
  #define DRM_I915_HWS_ADDR	0x11
@@ -49441,7 +49493,12 @@
  
  #define DRM_IOCTL_I915_INIT		DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
  #define DRM_IOCTL_I915_FLUSH		DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
-@@ -160,11 +188,27 @@ typedef struct _drm_i915_sarea {
+-#define DRM_IOCTL_I915_FLIP		DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLIP)
++#define DRM_IOCTL_I915_FLIP		DRM_IOW( DRM_COMMAND_BASE + DRM_I915_FLIP, drm_i915_flip_t)
+ #define DRM_IOCTL_I915_BATCHBUFFER	DRM_IOW( DRM_COMMAND_BASE + DRM_I915_BATCHBUFFER, drm_i915_batchbuffer_t)
+ #define DRM_IOCTL_I915_IRQ_EMIT         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_IRQ_EMIT, drm_i915_irq_emit_t)
+ #define DRM_IOCTL_I915_IRQ_WAIT         DRM_IOW( DRM_COMMAND_BASE + DRM_I915_IRQ_WAIT, drm_i915_irq_wait_t)
+@@ -160,11 +188,39 @@ typedef struct _drm_i915_sarea {
  #define DRM_IOCTL_I915_SET_VBLANK_PIPE	DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
  #define DRM_IOCTL_I915_GET_VBLANK_PIPE	DRM_IOR( DRM_COMMAND_BASE + DRM_I915_GET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
  #define DRM_IOCTL_I915_VBLANK_SWAP	DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_VBLANK_SWAP, drm_i915_vblank_swap_t)
@@ -49461,6 +49518,18 @@
 +#define DRM_IOCTL_I915_GEM_SW_FINISH	DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SW_FINISH, struct drm_i915_gem_sw_finish)
 +#define DRM_IOCTL_I915_GEM_SET_TILING	DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_SET_TILING, struct drm_i915_gem_set_tiling)
 +#define DRM_IOCTL_I915_GEM_GET_TILING	DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_TILING, struct drm_i915_gem_get_tiling)
++
++/* Asynchronous page flipping:
++ */
++typedef struct drm_i915_flip {
++	/*
++	 * This is really talking about planes, and we could rename it
++	 * except for the fact that some of the duplicated i915_drm.h files
++	 * out there check for HAVE_I915_FLIP and so might pick up this
++	 * version.
++	 */
++	int pipes;
++} drm_i915_flip_t;
  
  /* Allow drivers to submit batchbuffers directly to hardware, relying
   * on the security mechanisms provided by hardware.
@@ -49470,7 +49539,7 @@
  	int start;		/* agp offset */
  	int used;		/* nr bytes in use */
  	int DR1;		/* hw flags for GFX_OP_DRAWRECT_INFO */
-@@ -200,6 +244,8 @@ typedef struct drm_i915_irq_wait {
+@@ -200,6 +256,8 @@ typedef struct drm_i915_irq_wait {
  #define I915_PARAM_IRQ_ACTIVE            1
  #define I915_PARAM_ALLOW_BATCHBUFFER     2
  #define I915_PARAM_LAST_DISPATCH         3
@@ -49479,7 +49548,7 @@
  
  typedef struct drm_i915_getparam {
  	int param;
-@@ -267,4 +313,305 @@ typedef struct drm_i915_hws_addr {
+@@ -267,4 +325,305 @@ typedef struct drm_i915_hws_addr {
  	uint64_t addr;
  } drm_i915_hws_addr_t;
  


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.927
retrieving revision 1.928
diff -u -r1.927 -r1.928
--- kernel.spec	4 Sep 2008 21:45:56 -0000	1.927
+++ kernel.spec	5 Sep 2008 01:28:57 -0000	1.928
@@ -608,7 +608,6 @@
 
 # nouveau + drm fixes
 Patch1811: drm-modesetting-radeon.patch
-Patch1812: fixup-dri2-kms-merge.patch
 Patch1813: drm-nouveau.patch
 
 # kludge to make ich9 e1000 work
@@ -1156,7 +1155,6 @@
 
 # Nouveau DRM + drm fixes
 ApplyPatch drm-modesetting-radeon.patch
-ApplyPatch fixup-dri2-kms-merge.patch
 ApplyPatch drm-nouveau.patch
 
 # linux1394 git patches
@@ -1749,6 +1747,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Sep 05 2008 Dave Airlie <airlied at redhat.com>
+- modesetting updates - fix AMD rs690 - roll in krh dri2 patch
+
 * Thu Sep  4 2008 David Woodhouse <David.Woodhouse at intel.com>
 - 2.6.27-rc5-git6
 


--- fixup-dri2-kms-merge.patch DELETED ---



From bojan at fedoraproject.org  Fri Sep  5 01:44:21 2008
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Fri,  5 Sep 2008 01:44:21 +0000 (UTC)
Subject: rpms/apr-api-docs/devel apr-api-docs.spec,1.9,1.10
Message-ID: <20080905014421.374D170121@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr-api-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15247

Modified Files:
	apr-api-docs.spec 
Log Message:
Bump up to 1.3.3.


Index: apr-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-api-docs/devel/apr-api-docs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apr-api-docs.spec	7 Jul 2008 22:05:53 -0000	1.9
+++ apr-api-docs.spec	5 Sep 2008 01:43:50 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           apr-api-docs
-Version:        1.3.2
-Release:        2%{?dist}
+Version:        1.3.3
+Release:        1%{?dist}
 Summary:        Apache Portable Runtime API documentation
 
 Group:          Development/Tools
@@ -59,6 +59,9 @@
 %doc %{_docdir}/apr-%{version}/api-docs/*
 
 %changelog
+* Fri Sep  5 2008 Bojan Smojver <bojan at rexursive.com> 1.3.3-1
+- Bump up to 1.3.3
+
 * Fri Jul 04 2008 Bojan Smojver <bojan at rexursive.com> 1.3.2-2
 - %%{_arch} is set to noarch, cannot use that, include all headers
 



From jcwillia at fedoraproject.org  Fri Sep  5 01:48:14 2008
From: jcwillia at fedoraproject.org (John Clark Williams)
Date: Fri,  5 Sep 2008 01:48:14 +0000 (UTC)
Subject: rpms/mock/EL-5 .cvsignore, 1.18, 1.19 mock.spec, 1.35, 1.36 sources,
	1.21, 1.22
Message-ID: <20080905014814.8487770121@cvs1.fedora.phx.redhat.com>

Author: jcwillia

Update of /cvs/pkgs/rpms/mock/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16428

Modified Files:
	.cvsignore mock.spec sources 
Log Message:
* Thu Sep  4 2008 Clark Williams <williams at redhat.com> - 0.9.11-1
- added workarounds for rawhide rpm (BZ 455387 and 458234)
- disabled tmpfs plugin on epel-4-x86_64
- fixed autotools breakage in configure.ac



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mock/EL-5/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	1 Feb 2008 23:18:14 -0000	1.18
+++ .cvsignore	5 Sep 2008 01:47:44 -0000	1.19
@@ -1 +1 @@
-mock-0.9.7.tar.gz
+mock-0.9.11.tar.gz


Index: mock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mock/EL-5/mock.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mock.spec	1 Feb 2008 23:22:02 -0000	1.35
+++ mock.spec	5 Sep 2008 01:47:44 -0000	1.36
@@ -1,7 +1,7 @@
 # next four lines substituted by autoconf
 %define major 0
 %define minor 9
-%define sub 7
+%define sub 11
 %define extralevel %{nil}
 %define release_name mock
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -14,7 +14,6 @@
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
-#Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz?format=raw
 Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz
 URL: http://fedoraproject.org/wiki/Projects/Mock
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,6 +27,12 @@
 
 %prep
 %setup -q
+%if "%{?dist}" == ".fc8"
+pushd etc/mock
+sed -i -e 's/^#exclude=/exclude=/' -e '/^# The above is not/d' \
+    fedora-9-x86_64.cfg fedora-rawhide-x86_64.cfg
+popd
+%endif
 
 %build
 %configure
@@ -48,6 +53,11 @@
 ln -s epel-5-i386.cfg   fedora-5-i386-epel.cfg
 ln -s epel-5-ppc.cfg    fedora-5-ppc-epel.cfg
 ln -s epel-5-x86_64.cfg fedora-5-x86_64-epel.cfg
+# more compat, from devel/rawhide rename
+ln -s fedora-rawhide-i386.cfg fedora-devel-i386.cfg
+ln -s fedora-rawhide-x86_64.cfg fedora-devel-x86_64.cfg
+ln -s fedora-rawhide-ppc.cfg fedora-devel-ppc.cfg
+ln -s fedora-rawhide-ppc64.cfg fedora-devel-ppc64.cfg
 popd
 
 %clean
@@ -83,6 +93,25 @@
 %attr(02775, root, mock) %dir /var/lib/mock
 
 %changelog
+* Thu Sep  4 2008 Clark Williams <williams at redhat.com> - 0.9.11-1
+- added workarounds for rawhide rpm (BZ 455387 and 458234)
+- disabled tmpfs plugin on epel-4-x86_64
+- fixed autotools breakage in configure.ac
+
+* Tue May 20 2008 Jesse Keating <jkeating at redhat.com> - 0.9.10-1
+- added fix for building F-8 mock (clark)
+- Update epel configs
+
+* Tue Apr 22 2008 Jesse Keating <jkeating at redhat.com> - 0.9.9-1
+- Update config files for Fedora 9
+- Comment out multilib excludes, no longer needed in F9+ with yum multilib changes
+
+* Mon Mar 31 2008 Jesse Keating <jkeating at redhat.com> - 0.9.8-1
+- modify rootcache logic to rebuild cache if config files have newer timestamp
+- For Fedora 8 and higher, use priority failover method
+- Point to the correct static-repo for rawhide stuff.
+- Move "devel" to "rawhide" to match current Fedora naming schemes.
+
 * Thu Jan 31 2008 Michael Brown <mebrown at michaels-house.net> - 0.9.7-1
 - redo mock.util.do() to use python subprocess module, which should be
   much more maintainable than our old homegrown code.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mock/EL-5/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	1 Feb 2008 23:18:14 -0000	1.21
+++ sources	5 Sep 2008 01:47:44 -0000	1.22
@@ -1 +1 @@
-6dc38e4cc22800a21192b6e854f99ef5  mock-0.9.7.tar.gz
+eec7aa72ba1d4cd92552a73c16d3b44e  mock-0.9.11.tar.gz



From jcwillia at fedoraproject.org  Fri Sep  5 01:54:37 2008
From: jcwillia at fedoraproject.org (John Clark Williams)
Date: Fri,  5 Sep 2008 01:54:37 +0000 (UTC)
Subject: rpms/mock/EL-4 .cvsignore, 1.14, 1.15 mock.spec, 1.31, 1.32 sources,
	1.17, 1.18
Message-ID: <20080905015437.C887F70121@cvs1.fedora.phx.redhat.com>

Author: jcwillia

Update of /cvs/pkgs/rpms/mock/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18284

Modified Files:
	.cvsignore mock.spec sources 
Log Message:
* Thu Sep  4 2008 Clark Williams <williams at redhat.com> - 0.9.11-1
- added workarounds for rawhide rpm (BZ 455387 and 458234)
- disabled tmpfs plugin on epel-4-x86_64
- fixed autotools breakage in configure.ac



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mock/EL-4/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	25 Jun 2007 16:03:53 -0000	1.14
+++ .cvsignore	5 Sep 2008 01:54:07 -0000	1.15
@@ -1 +1 @@
-mock-0.7.2.tar.gz
+mock-0.9.11.tar.gz


Index: mock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mock/EL-4/mock.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mock.spec	9 Jul 2007 16:23:25 -0000	1.31
+++ mock.spec	5 Sep 2008 01:54:07 -0000	1.32
@@ -1,51 +1,64 @@
+# next four lines substituted by autoconf
+%define major 0
+%define minor 9
+%define sub 11
+%define extralevel %{nil}
+%define release_name mock
+%define release_version %{major}.%{minor}.%{sub}%{extralevel}
+
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.7.2
-Release: 1%{?dist}.1
-License: GPL
+Version: %{release_version}
+Release: 1%{?dist}
+License: GPLv2+
 Group: Development/Tools
-Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
+Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz
 URL: http://fedoraproject.org/wiki/Projects/Mock
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: python, yum >= 2.4
+BuildArch: noarch
+Requires: python >= 2.4, yum >= 2.4, tar, gzip, python-ctypes, python-decoratortools, usermode
 Requires(pre): shadow-utils
-BuildRequires: libselinux-devel
+BuildRequires: python-devel
 
 %description
 Mock takes a srpm and builds it in a chroot
 
 %prep
 %setup -q
+%if "%{?dist}" == ".fc8"
+pushd etc/mock
+sed -i -e 's/^#exclude=/exclude=/' -e '/^# The above is not/d' \
+    fedora-9-x86_64.cfg fedora-rawhide-x86_64.cfg
+popd
+%endif
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS"
+%configure
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-# make the default.cfg link
-cd $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
-
-%if 0%{?fedora:1}
-if [ -f fedora-%{fedora}-%{_target_cpu}-core.cfg ]; then
-        ln -s fedora-%{fedora}-%{_target_cpu}-core.cfg default.cfg
-elif [ -f fedora-%{fedora}-%{_target_cpu}.cfg ]; then
-        ln -s fedora-%{fedora}-%{_target_cpu}.cfg default.cfg
-fi
-%endif
+mkdir -p $RPM_BUILD_ROOT/var/lib/mock
+ln -s consolehelper $RPM_BUILD_ROOT/usr/bin/mock
 
-# if we haven't created a default link yet, try to do so as devel
-if [ ! -f default.cfg ]; then
-    if [ -f fedora-development-%{_target_cpu}.cfg ]; then
-        ln -s fedora-development-%{_target_cpu}.cfg default.cfg
-    elif [ -f fedora-devel-%{_target_cpu}.cfg ]; then
-        ln -s fedora-devel-%{_target_cpu}.cfg default.cfg
-    elif [ -f fedora-development-i386.cfg ]; then
-        ln -s fedora-development-i386.cfg default.cfg
-    elif [ -f fedora-devel-i386.cfg ]; then
-        ln -s fedora-devel-i386.cfg default.cfg
-    fi
-fi
+# compatibility symlinks
+# (probably be nuked in the future)
+pushd $RPM_BUILD_ROOT/etc/mock
+ln -s epel-4-i386.cfg   fedora-4-i386-epel.cfg
+ln -s epel-4-ppc.cfg    fedora-4-ppc-epel.cfg
+ln -s epel-4-x86_64.cfg fedora-4-x86_64-epel.cfg
+ln -s epel-5-i386.cfg   fedora-5-i386-epel.cfg
+ln -s epel-5-ppc.cfg    fedora-5-ppc-epel.cfg
+ln -s epel-5-x86_64.cfg fedora-5-x86_64-epel.cfg
+# more compat, from devel/rawhide rename
+ln -s fedora-rawhide-i386.cfg fedora-devel-i386.cfg
+ln -s fedora-rawhide-x86_64.cfg fedora-devel-x86_64.cfg
+ln -s fedora-rawhide-ppc.cfg fedora-devel-ppc.cfg
+ln -s fedora-rawhide-ppc64.cfg fedora-devel-ppc64.cfg
+popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,19 +70,213 @@
 
 %files
 %defattr(-, root, root)
-%doc README ChangeLog buildsys-build.spec
+
+# executables
+%{_bindir}/mock
+%attr(0755, root, root) %{_sbindir}/mock
+
+# python stuff
+%{python_sitelib}/*
+
+# config files
 %dir  %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*.cfg
-%{_bindir}/%{name}
-%{_libexecdir}/mock-yum
+%config(noreplace) %{_sysconfdir}/%{name}/*.ini
+%config(noreplace) %{_sysconfdir}/pam.d/%{name}
+%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
+
+# docs
 %{_mandir}/man1/mock.1*
-%attr(04750, root, mock) %{_sbindir}/mock-helper
+%doc ChangeLog
+
+# build dir
 %attr(02775, root, mock) %dir /var/lib/mock
-%{_libdir}/libselinux-mock.so
 
 %changelog
-* Mon Jul 09 2007 Michael Brown <mebrown at michaels-house.net> - 0.7.1-1.el4.1
-- back out yum>3 require
+* Thu Sep  4 2008 Clark Williams <williams at redhat.com> - 0.9.11-1
+- added workarounds for rawhide rpm (BZ 455387 and 458234)
+- disabled tmpfs plugin on epel-4-x86_64
+- fixed autotools breakage in configure.ac
+
+* Tue May 20 2008 Jesse Keating <jkeating at redhat.com> - 0.9.10-1
+- added fix for building F-8 mock (clark)
+- Update epel configs
+
+* Tue Apr 22 2008 Jesse Keating <jkeating at redhat.com> - 0.9.9-1
+- Update config files for Fedora 9
+- Comment out multilib excludes, no longer needed in F9+ with yum multilib changes
+
+* Mon Mar 31 2008 Jesse Keating <jkeating at redhat.com> - 0.9.8-1
+- modify rootcache logic to rebuild cache if config files have newer timestamp
+- For Fedora 8 and higher, use priority failover method
+- Point to the correct static-repo for rawhide stuff.
+- Move "devel" to "rawhide" to match current Fedora naming schemes.
+
+* Thu Jan 31 2008 Michael Brown <mebrown at michaels-house.net> - 0.9.7-1
+- redo mock.util.do() to use python subprocess module, which should be
+  much more maintainable than our old homegrown code.
+- Fix exclude= lines once again. Yum fnmatch parser doesnt understand [!x]
+  notation
+- add --unpriv and --cwd options to run chroot commands without elevated privs
+  and in a specific working directory (under the root).
+- mount all filesystems when running chroot commands
+- remove redundant ccache init since we now source /etc/profile.d/ccache.sh
+
+* Wed Jan 16 2008 Clark Williams <williams at redhat.com> - 0.9.6-1
+- renamed configs and put compat symlinks in place
+- misc cleanups (whitespace fixes, info messages, etc.)
+- tmpfs plugin fix
+- split --target and --arch command line arguments
+- changed from -l to --login on bash invocations
+- create /dev/full in chroot
+
+* Thu Dec 20 2007 Michael Brown <mebrown at michaels-house.net> - 0.9.5-1
+- really fix file-based BuildRequires
+
+* Wed Dec 19 2007 Michael Brown <mebrown at michaels-house.net> - 0.9.4-1
+- Result dir was not honoring --uniqueext=
+- make rpmbuild run under a chroot login shell
+- mock is now noarch due to drop of all binary components
+- add tmpfs plugin (disabled by default)
+- slightly more friendly logs.
+
+* Fri Dec 14 2007 Clark Williams <williams at redhat.com> - 0.9.3-1
+- added '--copyin' and '--copyout' modes
+- added makeChrootPath() method to Root
+- replaced most ad hock usages of .rootdir with makeChrootPath()
+- updated man page && added test cases
+- added 'help' target to Makefile.am
+
+* Thu Dec 13 2007 Michael Brown <mebrown at michaels-house.net> - 0.9.2-1
+- add '--update' mode
+- fix '--shell' mode
+
+* Tue Dec 11 2007 Michael Brown <mebrown at michaels-house.net> - 0.9.1-1
+- fix 'mock shell' command when passing more than one arg.
+- add --orphanskill mode which only does orphankill
+- make 'mock --shell' noninteractive and logged to root.log
+- fix for file-based BuildRequires
+- add sparcs to constant list for auto-setarch
+
+* Tue Dec 11 2007 Michael Brown <mebrown at michaels-house.net> - 0.8.17-1
+- fix 'mock shell' command when passing more than one arg.
+- add --orphanskill mode which only does orphankill
+- make 'mock --shell' noninteractive and logged to root.log
+- fix for file-based BuildRequires
+- add sparcs to constant list for auto-setarch
+
+* Sun Dec 09 2007 Michael Brown <mebrown at michaels-house.net> - 0.9.0-1
+- drop suid helper and use consolehelper instead.
+- add unshare() call rather than clone(CLONE_NEWNS...)
+
+* Sun Dec 09 2007 Michael Brown <mebrown at michaels-house.net> - 0.8.16-1
+- drop FC6 configs. FC6 no longer supported
+- add --trace cmdline parameter
+- make logs slightly less verbose
+
+* Wed Dec 05 2007 Michael Brown <mebrown at michaels-house.net> - 0.8.15-1
+- fix traceback when root cache doesnt exist.
+- add "--with", "--without", and "--define" cmdline parameters which are passed
+  to rpmbuild (courtesy Todd Zullinger)
+
+* Tue Dec 04 2007 Michael Brown <mebrown at michaels-house.net> - 0.8.14-1
+- fix traceback when cache dir was not found
+
+* Tue Dec 04 2007 Michael Brown <mebrown at michaels-house.net> - 0.8.13-1
+- brown-paper-bag bug where built rpm didnt work due to lack of path 
+  substitution in mock.py
+
+* Mon Dec 03 2007 Michael Brown <mebrown at michaels-house.net> - 0.8.12-1
+- fix builds of multiple srpms
+- fix 'mock install'
+- use python-decoratortools for better python 2.3 back compat
+
+* Thu Nov 29 2007 Clark Williams <williams at redhat.com> - 0.8.11-1
+- fixes from mebrown:
+-   added back -q and -v flags
+-   print yum output by default
+-   added --offline option
+-   cleaned up uid handling
+
+* Mon Nov 26 2007 Michael Brown <mebrown at michaels-house.net> - 0.8.10-1
+- fix 'shell' command
+- fix a couple different selinux avc denial messages (didnt affect functionality)
+
+* Tue Nov 20 2007 Michael Brown <mebrown at michaels-house.net> - 0.8.9-1
+- Fixes so that mock will run cleanly on RHEL5
+- Add glib-devel.i386, glib2-devel.i386 to yum exclude list as it breaks
+  builds.
+- Add backwards-compatibility code for old-style 'automatically assume rebuild'
+  convention
+- automake symlink accidentally included in tarball rather than file
+  (py-compile)
+- update manpage
+
+* Mon Nov 19 2007 Michael Brown <mebrown at michaels-house.net> - 0.8.8-1
+- make it run correctly when called by the 'root' user
+- internal_setarch: optionally run 'setarch' internally. This
+  eliminates the need to run "setarch i386 mock ..." when building on
+  target_arch != build_arch. This is turned on by default. Limitations:
+  must have 'ctypes' python module available, which is only available
+  by default in python 2.5, or as an extension module in <= 2.4.
+  If the 'ctypes' module is not available, this feature will be
+  disabled and you must manually run 'setarch'.
+- Does not run 'clean' action for 'shell', 'chroot', 'install', or
+  'installdeps' (docs updated)
+- fix build for top_builddir != top_srcdir
+- fix 'installdeps' so that it works with both rpms/srpms
+- missing device file /dev/ptmx was causing 'expect' command to always
+  fail. Affected any SRPM build that used 'expect'.
+- hard spec file dep on python >= 2.4 due to python syntax changes.
+- resultdir can now contain python-string substitutions for any
+  variable in the chroot config.
+  rebuild my.src.rpm
+- add 'dist' variable to all chroot config files so that it is
+  available for resultdir substitutions.
+- give good error message when logging.ini cannot be found.
+- change default logging format to remove verbosity from build.log.
+- make logging format configurable from defaults.cfg or chroot cfg.
+- less verbose state.log format
+
+* Mon Oct 22 2007 Michael Brown <mebrown at michaels-house.net> - 0.8.4-1
+- fix reported 'bad owner/group' from rpm in some configurations.
+
+* Mon Oct 22 2007 Michael Brown <mebrown at michaels-house.net> - 0.8.3-1
+- BZ# 336361 -- cannot su - mockbuild
+- BZ# 326561 -- update manpage
+- BZ# 235141 -- error with immutable bit
+
+* Fri Oct 20 2007 Michael Brown <mebrown at michaels-house.net> - 0.8.0-1
+- huge number of changes upstream
+- convert to setuid wrapper instead of old setuid helper
+- lots of bugfixes and improvements
+- /var/cache/yum now saved and bind-mounted
+- ccache integration
+- rootcache improvements (formerly called autocache)
+
+* Mon Aug 27 2007 Michael Brown <mebrown at michaels-house.net> - 0.7.6-1
+- ensure /etc/hosts is created in chroot properly
+
+* Mon Aug 13 2007 Clark Williams <williams at redhat.com> - 0.7.5-2
+- build fix from Roland McGrath to fix compile of selinux lib
+
+* Wed Aug 8 2007 Clark Williams <williams at redhat.com> - 0.7.5-1
+- orphanskill feature (BZ#221351)
+
+* Wed Aug 8 2007 Michael Brown <mebrown at michaels-house.net> - 0.7.5-1
+- add example configs to defaults.cfg
+- dont rebuild cache if not clean build (BZ#250425)
+
+* Wed Jul 18 2007 Michael Brown <mebrown at michaels-house.net> - 0.7.4-1
+- return child exit status, so we properly report subcommand failures
+
+* Fri Jul  6 2007 Michael Brown <mebrown at michaels-house.net> - 0.7.3-1
+- remove redundant defaults.cfg entries.
+
+* Wed Jun 20 2007 Michael Brown <mebrown at michaels-house.net> - 0.7.2-1
+- fix exclude list
+- remove legacy configs
+- disable 'local' repos by default (koji-repos)
 
 * Wed Jun 13 2007 Michael Brown <mebrown at michaels-house.net> - 0.7.1-1
 - Fix problem with autocache where different users couldnt share same cache


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mock/EL-4/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	25 Jun 2007 16:03:53 -0000	1.17
+++ sources	5 Sep 2008 01:54:07 -0000	1.18
@@ -1 +1 @@
-1d9ea644d0e48aa251344f619b71ed39  mock-0.7.2.tar.gz
+eec7aa72ba1d4cd92552a73c16d3b44e  mock-0.9.11.tar.gz



From mclasen at fedoraproject.org  Fri Sep  5 02:16:50 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  5 Sep 2008 02:16:50 +0000 (UTC)
Subject: rpms/gnome-media/devel icon-names.patch, NONE, 1.1 gnome-media.spec,
	1.137, 1.138
Message-ID: <20080905021650.A109470121@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23995

Modified Files:
	gnome-media.spec 
Added Files:
	icon-names.patch 
Log Message:
use standard icon names


icon-names.patch:

--- NEW FILE icon-names.patch ---
diff -up gnome-media-2.23.91/gst-mixer/src/track.c.icon-names gnome-media-2.23.91/gst-mixer/src/track.c
--- gnome-media-2.23.91/gst-mixer/src/track.c.icon-names	2008-09-04 22:07:30.000000000 -0400
+++ gnome-media-2.23.91/gst-mixer/src/track.c	2008-09-04 22:07:45.000000000 -0400
@@ -35,7 +35,7 @@ static const struct {
   gchar *label,
 	*pixmap;
 } pix[] = {
-  { "cd",         "media-cdrom"         	},
+  { "cd",         "media-optical"         	},
   { "line",       "gvc-line-in"                 },
   { "mic",        "audio-input-microphone"      },
   { "mix",        "multimedia-volume-control"   },


Index: gnome-media.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- gnome-media.spec	3 Sep 2008 01:09:06 -0000	1.137
+++ gnome-media.spec	5 Sep 2008 02:16:20 -0000	1.138
@@ -14,11 +14,13 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.23.91
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.23/gnome-media-%{version}.tar.bz2
 Patch0:         gnome-media-2.13.5-hide-help-button.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=550931
+Patch1:		icon-names.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Obsoletes:      gnome
@@ -79,6 +81,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .hide-help-button
+%patch1 -p1 -b .icon-names
 
 %build
 # try to work around a problem where gst-inspect does 
@@ -201,6 +204,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com>  2.23.91-2
+- Fix a non-standard icon name
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com>  2.23.91-1
 - Update to 2.23.91
 



From mclasen at fedoraproject.org  Fri Sep  5 03:07:37 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  5 Sep 2008 03:07:37 +0000 (UTC)
Subject: rpms/gnome-applets/devel .cvsignore, 1.66, 1.67 gnome-applets.spec, 
	1.293, 1.294 sources, 1.71, 1.72
Message-ID: <20080905030737.C9A1B70121@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5664

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore	23 Aug 2008 03:09:38 -0000	1.66
+++ .cvsignore	5 Sep 2008 03:07:07 -0000	1.67
@@ -1 +1 @@
-gnome-applets-2.23.90.tar.bz2
+gnome-applets-2.23.91.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- gnome-applets.spec	30 Aug 2008 01:33:44 -0000	1.293
+++ gnome-applets.spec	5 Sep 2008 03:07:07 -0000	1.294
@@ -34,8 +34,8 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.23.90
-Release: 	2%{?dist}
+Version:	2.23.91
+Release: 	1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -64,9 +64,6 @@
 # do the nullapplet dance for battstat
 Patch40:	gnome-applets-null-battstat.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=549890
-Patch41:	keyboard-applet-leak.patch
-
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -152,7 +149,6 @@
 %patch33 -p1 -b .node-leak
 %patch39 -p1 -b .gweather-network
 %patch40 -p1 -b .battstat-null
-%patch41 -p1 -b .keyboard-applet-leak
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -312,6 +308,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.91-1
+- Update to 2.23.91
+
 * Fri Aug 29 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.90-2
 - Plug a memory leak in the keyboard applet
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	23 Aug 2008 03:09:38 -0000	1.71
+++ sources	5 Sep 2008 03:07:07 -0000	1.72
@@ -1,2 +1,2 @@
-c82156f5fd740c5d8601e04eca2ec388  gnome-applets-2.23.90.tar.bz2
+5979757b1e790199f6191c390159b597  gnome-applets-2.23.91.tar.bz2
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2



From transif at fedoraproject.org  Fri Sep  5 03:31:03 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Fri,  5 Sep 2008 03:31:03 +0000 (UTC)
Subject: comps/po ko.po,1.13,1.14
Message-ID: <20080905033103.61D8F70121@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11701/po

Modified Files:
	ko.po 
Log Message:
Updated Korean translation


Index: ko.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ko.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ko.po	17 Jul 2008 18:31:24 -0000	1.13
+++ ko.po	5 Sep 2008 03:30:33 -0000	1.14
@@ -10,15 +10,15 @@
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-17 14:29-0400\n"
-"PO-Revision-Date: 2008-05-07 13:45+1000\n"
+"POT-Creation-Date: 2008-09-02 01:21+0000\n"
+"PO-Revision-Date: 2008-09-02 16:01+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"
 
@@ -128,82 +128,82 @@
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:23
+#: ../comps-f10.xml.in.h:24
 msgid "Catalan Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:24
+#: ../comps-f10.xml.in.h:25
 msgid "Chinese Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:25
+#: ../comps-f10.xml.in.h:26
 msgid "Clustering"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26
-#: ../comps-f10.xml.in.h:26
+#: ../comps-f10.xml.in.h:27
 msgid "Clustering Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27
-#: ../comps-f10.xml.in.h:27
+#: ../comps-f10.xml.in.h:28
 msgid "Core"
 msgstr "??????"
 
 #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28
-#: ../comps-f10.xml.in.h:28
+#: ../comps-f10.xml.in.h:29
 msgid "Croatian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29
-#: ../comps-f10.xml.in.h:29 ../comps-el5.xml.in.h:8
+#: ../comps-f10.xml.in.h:30 ../comps-el5.xml.in.h:8
 msgid "Czech Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30
-#: ../comps-f10.xml.in.h:30
+#: ../comps-f10.xml.in.h:31
 msgid "DNS Name Server"
 msgstr "DNS ?????? ??????"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31
-#: ../comps-f10.xml.in.h:31
+#: ../comps-f10.xml.in.h:32
 msgid "Danish Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
-#: ../comps-f10.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9
+#: ../comps-f10.xml.in.h:33 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
-#: ../comps-f10.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10
+#: ../comps-f10.xml.in.h:34 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
-#: ../comps-f10.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11
+#: ../comps-f10.xml.in.h:35 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35
-#: ../comps-f10.xml.in.h:35
+#: ../comps-f10.xml.in.h:36
 msgid "Development Libraries"
 msgstr "????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36
-#: ../comps-f10.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12
+#: ../comps-f10.xml.in.h:37 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37
-#: ../comps-f10.xml.in.h:37
+#: ../comps-f10.xml.in.h:38
 msgid "Dial-up Networking Support"
 msgstr "???????????? ???????????? ??????"
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
-#: ../comps-f10.xml.in.h:38
+#: ../comps-f10.xml.in.h:39
 msgid "Dutch Support"
 msgstr "??????????????? ??????"
 
@@ -212,72 +212,72 @@
 msgstr "Eclipse"
 
 #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39
-#: ../comps-f10.xml.in.h:39 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14
+#: ../comps-f10.xml.in.h:40 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40
-#: ../comps-f10.xml.in.h:40 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15
+#: ../comps-f10.xml.in.h:41 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "????????? ??????????????? "
 
 #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41
-#: ../comps-f10.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16
+#: ../comps-f10.xml.in.h:42 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "????????? ?????? ????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
-#: ../comps-f10.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
+#: ../comps-f10.xml.in.h:43 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43
-#: ../comps-f10.xml.in.h:43
+#: ../comps-f10.xml.in.h:44
 msgid "English (UK) Support"
 msgstr "?????? (?????????) ??????"
 
 #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45
-#: ../comps-f10.xml.in.h:45
+#: ../comps-f10.xml.in.h:46
 msgid "Estonian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46
-#: ../comps-f10.xml.in.h:46
+#: ../comps-f10.xml.in.h:47
 msgid "Ethiopic Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47
-#: ../comps-f10.xml.in.h:47 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18
+#: ../comps-f10.xml.in.h:48 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18
 msgid "FTP Server"
 msgstr "FTP ??????"
 
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48
-#: ../comps-f10.xml.in.h:48
+#: ../comps-f10.xml.in.h:49
 msgid "Faeroese Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
-#: ../comps-f10.xml.in.h:50 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19
+#: ../comps-f10.xml.in.h:51 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19
 msgid "Fedora Packager"
 msgstr "Fedora Packager"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
-#: ../comps-f10.xml.in.h:51
+#: ../comps-f10.xml.in.h:52
 msgid "Filipino Support"
 msgstr "???????????? ?????? "
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52
-#: ../comps-f10.xml.in.h:52
+#: ../comps-f10.xml.in.h:53
 msgid "Finnish Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55
-#: ../comps-f10.xml.in.h:55
+#: ../comps-f10.xml.in.h:56
 msgid "French Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56
-#: ../comps-f10.xml.in.h:56 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20
+#: ../comps-f10.xml.in.h:57 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
 "group allows you to work with sound and video on the system."
@@ -286,17 +286,17 @@
 "???????????? ????????? ???????????? ????????? ????????? ???????????? ??? ????????????."
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
-#: ../comps-f10.xml.in.h:57 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21
+#: ../comps-f10.xml.in.h:58 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ???????????? ??????"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58
-#: ../comps-f10.xml.in.h:58 ../comps-el4.xml.in.h:21 ../comps-el5.xml.in.h:22
+#: ../comps-f10.xml.in.h:59 ../comps-el4.xml.in.h:21 ../comps-el5.xml.in.h:22
 msgid "GNOME Software Development"
 msgstr "GNOME ??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59
-#: ../comps-f10.xml.in.h:59
+#: ../comps-f10.xml.in.h:60
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -305,159 +305,153 @@
 "????????? ?????? ????????? ????????? ????????? ????????????."
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60
-#: ../comps-f10.xml.in.h:60
+#: ../comps-f10.xml.in.h:61
 msgid "Gaelic Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61
-#: ../comps-f10.xml.in.h:61
+#: ../comps-f10.xml.in.h:62
 msgid "Galician Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62
-#: ../comps-f10.xml.in.h:62 ../comps-el5.xml.in.h:24
+#: ../comps-f10.xml.in.h:63 ../comps-el5.xml.in.h:24
 msgid "Games and Entertainment"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
-#: ../comps-f10.xml.in.h:63
+#: ../comps-f10.xml.in.h:64
 msgid "Georgian Support"
 msgstr "??????????????? ?????? "
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
-#: ../comps-f10.xml.in.h:64
+#: ../comps-f10.xml.in.h:65
 msgid "German Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65
-#: ../comps-f10.xml.in.h:65 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25
+#: ../comps-f10.xml.in.h:66 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25
 msgid "Graphical Internet"
 msgstr "????????? ?????????"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66
-#: ../comps-f10.xml.in.h:66 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26
+#: ../comps-f10.xml.in.h:67 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26
 msgid "Graphics"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67
-#: ../comps-f10.xml.in.h:67
+#: ../comps-f10.xml.in.h:68
 msgid "Greek Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68
-#: ../comps-f10.xml.in.h:68
+#: ../comps-f10.xml.in.h:69
 msgid "Gujarati Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69
-#: ../comps-f10.xml.in.h:69 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27
+#: ../comps-f10.xml.in.h:70 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27
 msgid "Hardware Support"
 msgstr "???????????? ?????? "
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70
-#: ../comps-f10.xml.in.h:71 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28
+#: ../comps-f10.xml.in.h:72 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28
 msgid "Hebrew Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71
-#: ../comps-f10.xml.in.h:72
+#: ../comps-f10.xml.in.h:73
 msgid "Hindi Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72
-#: ../comps-f10.xml.in.h:73
+#: ../comps-f10.xml.in.h:74
 msgid "Hungarian Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73
-#: ../comps-f10.xml.in.h:74
+#: ../comps-f10.xml.in.h:75
 msgid "Icelandic Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74
-#: ../comps-f10.xml.in.h:75
+#: ../comps-f10.xml.in.h:76
 msgid "Indonesian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75
-#: ../comps-f10.xml.in.h:78 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29
+#: ../comps-f10.xml.in.h:79 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
-msgstr ""
-"GTK+??? GNOME??? ????????? ?????? ??????????????? ?????????????????? ??? ???????????? ??????????????????."
+msgstr "GTK+??? GNOME??? ????????? ?????? ??????????????? ?????????????????? ??? ???????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
-#: ../comps-f10.xml.in.h:79
+#: ../comps-f10.xml.in.h:80
 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:80 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
+#: ../comps-f10.xml.in.h:81 ../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:81
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
-msgstr ""
-"??????????????? ?????? ????????? ????????? ????????? ?????? ???????????? ??? ????????? ??????????????????."
+#: ../comps-f10.xml.in.h:82
+msgid "Install these tools to enable the system to print or act as a print server."
+msgstr "??????????????? ?????? ????????? ????????? ????????? ?????? ???????????? ??? ????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
-#: ../comps-f10.xml.in.h:82 ../comps-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."
+#: ../comps-f10.xml.in.h:83 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31
+msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr ""
 "?????? ????????? (X) ????????? ?????????????????? ?????????????????? ??? ????????? ????????? ???????????????"
 "???."
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
-#: ../comps-f10.xml.in.h:84
+#: ../comps-f10.xml.in.h:85
 msgid "Inuktitut Support"
 msgstr "??????????????? ??????  "
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
-#: ../comps-f10.xml.in.h:85
+#: ../comps-f10.xml.in.h:86
 msgid "Irish Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83
-#: ../comps-f10.xml.in.h:86
+#: ../comps-f10.xml.in.h:87
 msgid "Italian Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84
-#: ../comps-f10.xml.in.h:87 ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:32
+#: ../comps-f10.xml.in.h:88 ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:32
 msgid "Japanese Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85
-#: ../comps-f10.xml.in.h:88 ../comps-el4.xml.in.h:31
+#: ../comps-f10.xml.in.h:89 ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "Java"
 
 #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86
-#: ../comps-f10.xml.in.h:89 ../comps-el4.xml.in.h:32
+#: ../comps-f10.xml.in.h:90 ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "Java ????????? ??????"
 
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
-#: ../comps-f10.xml.in.h:90 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33
+#: ../comps-f10.xml.in.h:91 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K ???????????? ??????)"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88
-#: ../comps-f10.xml.in.h:91 ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:34
+#: ../comps-f10.xml.in.h:92 ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:34
 msgid "KDE Software Development"
 msgstr "KDE ??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89
-#: ../comps-f10.xml.in.h:92
+#: ../comps-f10.xml.in.h:93
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -466,225 +460,224 @@
 "?????? ?????? ????????? ????????? ????????? ????????????."
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
-#: ../comps-f10.xml.in.h:93
+#: ../comps-f10.xml.in.h:94
 msgid "Kannada Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:95
+#: ../comps-f10.xml.in.h:96
 msgid "Khmer Support"
 msgstr "???????????? ?????? "
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:96
+#: ../comps-f10.xml.in.h:97
 msgid "Korean Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:94
-#: ../comps-f10.xml.in.h:97
+#: ../comps-f10.xml.in.h:98
 msgid "Languages"
 msgstr "?????? ??????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:98
+#: ../comps-f10.xml.in.h:99
 msgid "Lao Support"
 msgstr "????????? ?????? "
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:99
+#: ../comps-f10.xml.in.h:100
 msgid "Latvian Support"
 msgstr "??????????????? ??????  "
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:98
-#: ../comps-f10.xml.in.h:101
+#: ../comps-f10.xml.in.h:102
 msgid "Legacy Network Server"
 msgstr "????????? ???????????? ??????"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:102
+#: ../comps-f10.xml.in.h:103
 msgid "Legacy Software Development"
 msgstr "????????? ??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:103
+#: ../comps-f10.xml.in.h:104
 msgid "Legacy Software Support"
 msgstr "????????? ??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:104
+#: ../comps-f10.xml.in.h:105
 msgid "Lithuanian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:104
-#: ../comps-f10.xml.in.h:107 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
+#: ../comps-f10.xml.in.h:108 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "?????? ??????"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:108
+#: ../comps-f10.xml.in.h:109
 msgid "Malay Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:109
+#: ../comps-f10.xml.in.h:110
 msgid "Malayalam Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:110
+#: ../comps-f10.xml.in.h:111
 msgid "Maori Support"
 msgstr "???????????? ??????  "
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:111
+#: ../comps-f10.xml.in.h:112
 msgid "Marathi Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:110
-#: ../comps-f10.xml.in.h:113
+#: ../comps-f10.xml.in.h:114
 msgid "MySQL Database"
 msgstr "MySQL ??????????????????"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:112
-#: ../comps-f10.xml.in.h:115 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
+#: ../comps-f10.xml.in.h:116 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:116 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
+#: ../comps-f10.xml.in.h:117 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "?????? ??????"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:115
-#: ../comps-f10.xml.in.h:118
+#: ../comps-f10.xml.in.h:119
 msgid "Northern Sotho Support"
 msgstr "?????? ????????? ??????"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:119
+#: ../comps-f10.xml.in.h:120
 msgid "Norwegian Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:120 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
+#: ../comps-f10.xml.in.h:121 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "??????/?????????"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:119
-#: ../comps-f10.xml.in.h:122
+#: ../comps-f10.xml.in.h:123
 msgid "Oriya Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:123 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
+#: ../comps-f10.xml.in.h:124 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
 msgstr "??? ???????????? ?????? ??????????????? ???????????? ?????? ????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:124
+#: ../comps-f10.xml.in.h:125
 msgid "Persian Support"
 msgstr "??????????????? ??????  "
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:125
+#: ../comps-f10.xml.in.h:126
 msgid "Polish Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:126
+#: ../comps-f10.xml.in.h:127
 msgid "Portuguese Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:127
+#: ../comps-f10.xml.in.h:128
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ??????????????????"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:128
+#: ../comps-f10.xml.in.h:129
 msgid "Printing Support"
 msgstr "?????? ??????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:129
+#: ../comps-f10.xml.in.h:130
 msgid "Punjabi Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:130
+#: ../comps-f10.xml.in.h:131
 msgid "Romanian Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:131
+#: ../comps-f10.xml.in.h:132
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:132
+#: ../comps-f10.xml.in.h:133
 msgid "Russian Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:132
-#: ../comps-f10.xml.in.h:135
+#: ../comps-f10.xml.in.h:136
 msgid "Samoan Support"
 msgstr "???????????? ??????  "
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:136
+#: ../comps-f10.xml.in.h:137
 msgid "Serbian Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:137
+#: ../comps-f10.xml.in.h:138
 msgid "Server Configuration Tools"
 msgstr "?????? ?????? ??????"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:138 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
+#: ../comps-f10.xml.in.h:139 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "??????"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:139 ../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."
+#: ../comps-f10.xml.in.h:140 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
+msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "?????? ???????????? ????????? ???????????? ?????? ????????? ????????? ??????????????????. "
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:140
+#: ../comps-f10.xml.in.h:141
 msgid "Sinhala Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:141
+#: ../comps-f10.xml.in.h:142
 msgid "Slovak Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:142
+#: ../comps-f10.xml.in.h:143
 msgid "Slovenian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:143
+#: ../comps-f10.xml.in.h:144
 msgid "Smallest possible installation"
 msgstr "????????? ?????? ??????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:144 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
+#: ../comps-f10.xml.in.h:145 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "???????????? ????????? ???????????? ?????? ???????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:145
+#: ../comps-f10.xml.in.h:146
 msgid "Somali Support"
 msgstr "???????????? ??????  "
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:146
+#: ../comps-f10.xml.in.h:147
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -693,72 +686,72 @@
 "????????? ???????????????. ????????? ?????????????????? Emacs??? Vi??? ???????????????."
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:147 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
+#: ../comps-f10.xml.in.h:148 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "???????????? ?????????"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:148
+#: ../comps-f10.xml.in.h:149
 msgid "Southern Ndebele Support"
 msgstr "?????? ??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:149
+#: ../comps-f10.xml.in.h:150
 msgid "Southern Sotho Support"
 msgstr "?????? ????????? ??????"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:150
+#: ../comps-f10.xml.in.h:151
 msgid "Spanish Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:151 ../comps-el4.xml.in.h:46
+#: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "Java ??????????????? ????????? ????????? ????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:47
+#: ../comps-f10.xml.in.h:153 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "Java ??????????????? ????????? ????????? ???????????? ?????? ??????."
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:153
+#: ../comps-f10.xml.in.h:154
 msgid "Swati Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:154
+#: ../comps-f10.xml.in.h:155
 msgid "Swedish Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:155 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
+#: ../comps-f10.xml.in.h:156 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:156
+#: ../comps-f10.xml.in.h:157
 msgid "Tagalog Support"
 msgstr "??????????????? ??????  "
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:158
+#: ../comps-f10.xml.in.h:159
 msgid "Tamil Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:159
+#: ../comps-f10.xml.in.h:160
 msgid "Telugu Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:160 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
+#: ../comps-f10.xml.in.h:161 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "?????????-?????? ?????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:161
+#: ../comps-f10.xml.in.h:162
 msgid "Thai Support"
 msgstr "????????? ??????"
 
@@ -767,45 +760,39 @@
 msgstr "Eclipse ?????? ?????? ??????"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:162 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
+#: ../comps-f10.xml.in.h:163 ../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:159
-#: ../comps-f10.xml.in.h:163
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
-msgstr ""
-"??? ????????? ????????? ?????? ??????????????? ??????????????? ????????? ?????? ????????????????????????."
+#: ../comps-f10.xml.in.h:164
+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:160
-#: ../comps-f10.xml.in.h:164 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
+#: ../comps-f10.xml.in.h:165 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "??? ???????????? IMAP??? SMTP ?????? ?????? ????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:165
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+#: ../comps-f10.xml.in.h:166
+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:162
-#: ../comps-f10.xml.in.h:166 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+#: ../comps-f10.xml.in.h:167 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr "??? ???????????? ??? ?????? ?????????????????? ??? ????????? ????????? ???????????????. "
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:167
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+#: ../comps-f10.xml.in.h:168
+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:164
-#: ../comps-f10.xml.in.h:168
+#: ../comps-f10.xml.in.h:169
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -814,24 +801,24 @@
 "????????? ????????????."
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:169
+#: ../comps-f10.xml.in.h:170
 msgid "These packages provide a virtualization environment."
 msgstr "??? ???????????? ????????? ????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:170
+#: ../comps-f10.xml.in.h:171
 msgid "These packages provide compatibility with previous releases."
 msgstr "??? ???????????? ?????? ?????? ???????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:171
+#: ../comps-f10.xml.in.h:172
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
 msgstr "??? ???????????? ????????? ????????? (?????? ??? ?????? ??????)??? ???????????????."
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:172
+#: ../comps-f10.xml.in.h:173
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -840,17 +827,17 @@
 "HTML, PDF, Postscript??? ????????? ???????????? ????????? ??? ????????????."
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:173 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
+#: ../comps-f10.xml.in.h:174 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "??? ????????? ???????????? ????????? ????????? ???????????? ????????? ??? ????????????."
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:174 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
+#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "??? ????????? ???????????? ????????? ????????? FTP ????????? ????????? ??? ????????????."
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
+#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -859,18 +846,17 @@
 "??? ????????????."
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
+#: ../comps-f10.xml.in.h:177 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "??? ????????? ???????????? ???????????? ?????? ????????? ???????????? ??? ????????????."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:177
+#: ../comps-f10.xml.in.h:178
 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:174
-#: ../comps-f10.xml.in.h:178
+#: ../comps-f10.xml.in.h:179
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -879,12 +865,12 @@
 "??????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
+#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "??? ???????????? ????????? ?????????, ???, ?????? ?????????????????? ???????????? ????????????."
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
+#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -893,12 +879,12 @@
 "????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
+#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "??? ????????? ????????? ???????????? ???????????? ??????, ?????? ????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
+#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -907,7 +893,7 @@
 "?????? ???????????? ????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
+#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -916,19 +902,17 @@
 "??? ?????? ???????????????. "
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:184 ../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."
+#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "??? ????????? ?????????????????? ????????? ?????? ?????? ??? ?????? ???????????????. "
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:185 ../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."
+#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
+msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "??? ????????? ?????? ???????????? ??????????????? ?????? ?????? ???????????????. "
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
+#: ../comps-f10.xml.in.h:187 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
 "client for connecting to SMB shares and tools to monitor network traffic."
@@ -937,15 +921,14 @@
 "????????? ?????? ????????? ????????? ?????? ???????????????."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:187
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+#: ../comps-f10.xml.in.h:188
+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:184
-#: ../comps-f10.xml.in.h:188
+#: ../comps-f10.xml.in.h:189
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -954,132 +937,132 @@
 "??? ??? ????????????."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:189
+#: ../comps-f10.xml.in.h:190
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "??? ????????? ????????? ???????????? MySQL??? ????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:190
+#: ../comps-f10.xml.in.h:191
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "??? ????????? ????????? ???????????? Postgresql ????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:191
+#: ../comps-f10.xml.in.h:192
 msgid "Tibetan Support"
 msgstr "???????????? ??????  "
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:192
+#: ../comps-f10.xml.in.h:193
 msgid "Tonga Support"
 msgstr "????????? ?????? "
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:193 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
+#: ../comps-f10.xml.in.h:194 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Fedora Packager??? ????????? ?????? ??? ???????????? "
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:194
+#: ../comps-f10.xml.in.h:195
 msgid "Tsonga Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:195
+#: ../comps-f10.xml.in.h:196
 msgid "Tswana Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:196
+#: ../comps-f10.xml.in.h:197
 msgid "Turkish Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:197
+#: ../comps-f10.xml.in.h:198
 msgid "Ukrainian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:198
+#: ../comps-f10.xml.in.h:199
 msgid "Urdu Support"
 msgstr "???????????? ?????? "
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:199 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
+#: ../comps-f10.xml.in.h:200 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "????????? ?????? ?????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:200 ../comps-el5.xml.in.h:72
+#: ../comps-f10.xml.in.h:201 ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "????????? ???????????? ?????? ????????? ?????? ??? ?????? ????????? ??????."
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:201
+#: ../comps-f10.xml.in.h:202
 msgid "Venda Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:202
+#: ../comps-f10.xml.in.h:203
 msgid "Vietnamese Support"
 msgstr "???????????? ?????? "
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:203
+#: ../comps-f10.xml.in.h:204
 msgid "Virtualization"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:201
-#: ../comps-f10.xml.in.h:205 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
+#: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "??? ?????? "
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
+#: ../comps-f10.xml.in.h:207 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "??? ??????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:207
+#: ../comps-f10.xml.in.h:208
 msgid "Welsh Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:208 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
+#: ../comps-f10.xml.in.h:209 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "????????? ????????? "
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:209
+#: ../comps-f10.xml.in.h:210
 msgid "Windows File Server"
 msgstr "Windows ?????? ??????"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:210
+#: ../comps-f10.xml.in.h:211
 msgid "X Software Development"
 msgstr "X ??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:211 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
+#: ../comps-f10.xml.in.h:212 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X ????????? ?????????"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:212
+#: ../comps-f10.xml.in.h:213
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:213
+#: ../comps-f10.xml.in.h:214
 msgid "XFCE Software Development"
 msgstr "XFCE ??????????????? ?????? "
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:214
+#: ../comps-f10.xml.in.h:215
 msgid "Xhosa Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:215
+#: ../comps-f10.xml.in.h:216
 msgid "Zulu Support"
 msgstr "????????? ??????"
 
@@ -1087,87 +1070,89 @@
 msgid "Buildsystem building group"
 msgstr "?????? ????????? ?????? ?????? "
 
-#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49
+#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
-#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53
+#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54
 msgid "Fonts"
 msgstr "?????? "
 
-#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54
+#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "???????????? ????????? ????????? ????????? ??? ?????? ????????? "
 
-#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
+#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "Eclipse ?????? ?????? ?????? ?????? "
 
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:100
+#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:101
 msgid "Legacy Fonts"
 msgstr "????????? ?????? "
 
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:105
+#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:106
 msgid "Low Saxon Support"
 msgstr "?????? ????????? ?????? "
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:112
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:113
 msgid "Mongolian Support"
 msgstr "????????? ??????  "
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:114
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:115
 msgid "Nepali Support"
 msgstr "????????? ??????  "
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:121
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:122
 msgid "Older bitmap and vector fonts packages"
 msgstr "?????? ????????? ??? ?????? ?????? ????????? "
 
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44
+#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45
 msgid "Esperanto Support"
 msgstr "?????????????????? ?????? "
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:94
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95
 msgid "Kashubian Support"
 msgstr "??????????????? ??????  "
 
-#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:106
+#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:107
 msgid "Macedonian Support"
 msgstr "?????????????????? ??????     "
 
-#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:117
+#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:118
 msgid "Northern Sami Support"
 msgstr "?????? ????????? ??????  "
 
-#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:133
-#, fuzzy
+#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:134
 msgid "SUGAR Desktop Environment"
-msgstr "???????????? ??????"
+msgstr "SUGAR ???????????? ??????   "
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:134
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:135
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
-msgstr ""
+msgstr "SUGAR??? OLPC XO??? ?????? ????????? ???????????? ???????????????. "
 
-#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:204
+#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:205
 msgid "Walloon Support"
 msgstr "????????? ??????   "
 
-#: ../comps-f10.xml.in.h:70
+#: ../comps-f10.xml.in.h:23
+msgid "Burmese Support"
+msgstr "????????? ??????   "
+
+#: ../comps-f10.xml.in.h:71
 msgid "Haskell"
-msgstr ""
+msgstr "????????? "
 
-#: ../comps-f10.xml.in.h:76
+#: ../comps-f10.xml.in.h:77
 msgid "Input Methods"
-msgstr ""
+msgstr "?????? ?????? "
 
-#: ../comps-f10.xml.in.h:77
+#: ../comps-f10.xml.in.h:78
 msgid "Input method packages for the input of international text."
-msgstr ""
+msgstr "?????? ????????? ????????? ?????? ?????? ?????? ?????????  "
 
-#: ../comps-f10.xml.in.h:157
-#, fuzzy
+#: ../comps-f10.xml.in.h:158
 msgid "Tajik Support"
-msgstr "????????? ??????"
+msgstr "????????? ??????  "
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1218,18 +1203,15 @@
 msgstr "??? ????????? ?????? ????????? ?????? ???????????? ?????? ???????????????.  "
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "??? ????????? ????????? ????????? ?????? ?????? ??? ?????? ???????????????. "
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "??? ????????? ???????????? ????????? ?????? ?????? ??? ?????? ???????????????. "
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "??? ????????? ????????? ????????? ?????? ?????? ??? ?????? ???????????????. "
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1237,6 +1219,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??? ????????? ????????? ????????? ?????? ?????? ??? ?????? ???????????????. "
+



From jwilson at fedoraproject.org  Fri Sep  5 04:25:59 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Fri,  5 Sep 2008 04:25:59 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.164, 1.165 kernel.spec, 1.928, 
	1.929 linux-2.6-lirc.patch, 1.11, 1.12
Message-ID: <20080905042559.9B96470125@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20923

Modified Files:
	config-generic kernel.spec linux-2.6-lirc.patch 
Log Message:
* Fri Sep 05 2008 Jarod Wilson <jarod at redhat.com>
- More lirc updates:
  * convert single-holder semaphores to mutexes
  * actually build lirc_sasem driver
  * assorted compile-time warning cleanups
  * add lirc_ite8709 driver
  * sync with latest lirc cvs



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- config-generic	2 Sep 2008 22:27:17 -0000	1.164
+++ config-generic	5 Sep 2008 04:25:29 -0000	1.165
@@ -3578,11 +3578,13 @@
 CONFIG_LIRC_IGORPLUGUSB=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC_IT87=m
+CONFIG_LIRC_ITE8709=m
 CONFIG_LIRC_MCEUSB=m
 CONFIG_LIRC_MCEUSB2=m
 CONFIG_LIRC_ZILOG=m
 CONFIG_LIRC_PARALLEL=m
 CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SIR=m
 CONFIG_LIRC_STREAMZAP=m
 CONFIG_LIRC_TTUSBIR=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.928
retrieving revision 1.929
diff -u -r1.928 -r1.929
--- kernel.spec	5 Sep 2008 01:28:57 -0000	1.928
+++ kernel.spec	5 Sep 2008 04:25:29 -0000	1.929
@@ -1747,6 +1747,14 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Sep 05 2008 Jarod Wilson <jarod at redhat.com>
+- More lirc updates:
+  * convert single-holder semaphores to mutexes
+  * actually build lirc_sasem driver
+  * assorted compile-time warning cleanups
+  * add lirc_ite8709 driver
+  * sync with latest lirc cvs
+
 * Fri Sep 05 2008 Dave Airlie <airlied at redhat.com>
 - modesetting updates - fix AMD rs690 - roll in krh dri2 patch
 

linux-2.6-lirc.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.11 -r 1.12 linux-2.6-lirc.patch
Index: linux-2.6-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-lirc.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-lirc.patch	3 Sep 2008 19:19:48 -0000	1.11
+++ linux-2.6-lirc.patch	5 Sep 2008 04:25:29 -0000	1.12
@@ -1,33 +1,39 @@
+Linux Infrared Remote Control drivers
+
+Signed-off-by: Jarod Wilson <jarod at redhat.com>
+
+---
+
  drivers/input/Kconfig                 |    2 +
  drivers/input/Makefile                |    2 +
- drivers/input/lirc/Kconfig            |  128 +++
- drivers/input/lirc/Makefile           |   24 +
- drivers/input/lirc/commandir.c        | 1009 +++++++++++++++++++++++
- drivers/input/lirc/commandir.h        |   41 +
- drivers/input/lirc/kcompat.h          |  142 ++++
- drivers/input/lirc/lirc.h             |  102 +++
- drivers/input/lirc/lirc_atiusb.c      | 1328 +++++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_bt829.c       |  393 +++++++++
- drivers/input/lirc/lirc_cmdir.c       |  605 ++++++++++++++
- drivers/input/lirc/lirc_cmdir.h       |   27 +
- drivers/input/lirc/lirc_dev.c         |  827 +++++++++++++++++++
- drivers/input/lirc/lirc_dev.h         |  264 ++++++
- drivers/input/lirc/lirc_i2c.c         |  668 ++++++++++++++++
- drivers/input/lirc/lirc_igorplugusb.c |  624 +++++++++++++++
- drivers/input/lirc/lirc_imon.c        | 1248 +++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_it87.c        | 1012 +++++++++++++++++++++++
+ drivers/input/lirc/Kconfig            |  142 ++++
+ drivers/input/lirc/Makefile           |   25 +
+ drivers/input/lirc/commandir.c        |  982 +++++++++++++++++++++++
+ drivers/input/lirc/commandir.h        |   68 ++
+ drivers/input/lirc/lirc.h             |  103 +++
+ drivers/input/lirc/lirc_atiusb.c      | 1313 +++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_bt829.c       |  388 +++++++++
+ drivers/input/lirc/lirc_cmdir.c       |  600 ++++++++++++++
+ drivers/input/lirc/lirc_cmdir.h       |   25 +
+ drivers/input/lirc/lirc_dev.c         |  812 +++++++++++++++++++
+ drivers/input/lirc/lirc_dev.h         |  262 ++++++
+ drivers/input/lirc/lirc_i2c.c         |  643 +++++++++++++++
+ drivers/input/lirc/lirc_igorplugusb.c |  611 ++++++++++++++
+ drivers/input/lirc/lirc_imon.c        | 1280 ++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_it87.c        | 1004 +++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 +++
- drivers/input/lirc/lirc_mceusb.c      |  890 +++++++++++++++++++++
- drivers/input/lirc/lirc_mceusb2.c     | 1060 ++++++++++++++++++++++++
- drivers/input/lirc/lirc_parallel.c    |  745 +++++++++++++++++
+ drivers/input/lirc/lirc_ite8709.c     |  565 +++++++++++++
+ drivers/input/lirc/lirc_mceusb.c      |  884 +++++++++++++++++++++
+ drivers/input/lirc/lirc_mceusb2.c     | 1117 ++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_parallel.c    |  732 +++++++++++++++++
  drivers/input/lirc/lirc_parallel.h    |   26 +
- drivers/input/lirc/lirc_sasem.c       |  972 ++++++++++++++++++++++
- drivers/input/lirc/lirc_serial.c      | 1348 +++++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_sir.c         | 1323 ++++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_streamzap.c   |  804 +++++++++++++++++++
- drivers/input/lirc/lirc_ttusbir.c     |  393 +++++++++
- drivers/input/lirc/lirc_zilog.c       | 1416 +++++++++++++++++++++++++++++++++
- 29 files changed, 17539 insertions(+), 0 deletions(-)
+ drivers/input/lirc/lirc_sasem.c       |  967 +++++++++++++++++++++++
+ drivers/input/lirc/lirc_serial.c      | 1316 +++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_sir.c         | 1306 ++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_streamzap.c   |  795 +++++++++++++++++++
+ drivers/input/lirc/lirc_ttusbir.c     |  394 ++++++++++
+ drivers/input/lirc/lirc_zilog.c       | 1397 +++++++++++++++++++++++++++++++++
+ 29 files changed, 17877 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
 index 5f9d860..747633c 100644
@@ -53,10 +59,10 @@
 +obj-$(CONFIG_INPUT_LIRC)       += lirc/
 diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
 new file mode 100644
-index 0000000..62cfbf7
+index 0000000..44ad7cb
 --- /dev/null
 +++ b/drivers/input/lirc/Kconfig
-@@ -0,0 +1,128 @@
+@@ -0,0 +1,142 @@
 +#
 +# LIRC driver(s) configuration
 +#
@@ -127,6 +133,13 @@
 +	help
 +	  Driver for the ITE IT87xx IR Receiver
 +
++config LIRC_ITE8709
++	tristate "ITE8709 CIR Port Receiver"
++	default m
++	depends on LIRC_DEV
++	help
++	  Driver for the ITE8709 IR Receiver
++
 +config LIRC_MCEUSB
 +	tristate "Microsoft Media Center Ed. Receiver, v1"
 +	default m
@@ -156,6 +169,13 @@
 +	help
 +	  Driver for Homebrew Parallel Port Receivers
 +
++config LIRC_SASEM
++	tristate "Sasem USB IR Remote"
++	default m
++	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"
 +	default m
@@ -187,10 +207,10 @@
 +endif
 diff --git a/drivers/input/lirc/Makefile b/drivers/input/lirc/Makefile
 new file mode 100644
-index 0000000..d22dc5b
+index 0000000..506285d
 --- /dev/null
 +++ b/drivers/input/lirc/Makefile
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,25 @@
 +# Makefile for the lirc drivers.
 +#
 +
@@ -206,6 +226,7 @@
 +obj-$(CONFIG_LIRC_IGORPLUGUSB)	+= lirc_igorplugusb.o
 +obj-$(CONFIG_LIRC_IMON)		+= lirc_imon.o
 +obj-$(CONFIG_LIRC_IT87)		+= lirc_it87.o
++obj-$(CONFIG_LIRC_ITE8709)	+= lirc_ite8709.o
 +obj-$(CONFIG_LIRC_MCEUSB)	+= lirc_mceusb.o
 +obj-$(CONFIG_LIRC_MCEUSB2)	+= lirc_mceusb2.o
 +obj-$(CONFIG_LIRC_ZILOG)	+= lirc_zilog.o
@@ -217,10 +238,10 @@
 +obj-$(CONFIG_LIRC_TTUSBIR)	+= lirc_ttusbir.o
 diff --git a/drivers/input/lirc/commandir.c b/drivers/input/lirc/commandir.c
 new file mode 100644
-index 0000000..eb63980
+index 0000000..a05b0d6
 --- /dev/null
 +++ b/drivers/input/lirc/commandir.c
-@@ -0,0 +1,1009 @@
+@@ -0,0 +1,982 @@
 +
 +/*
 + *
@@ -264,33 +285,6 @@
 +};
 +MODULE_DEVICE_TABLE(usb, cmdir_table);
 +
-+static int cmdir_open(struct inode *inode, struct file *file);
-+static int cmdir_probe(struct usb_interface *interface,
-+		       const struct usb_device_id *id);
-+static void cmdir_disconnect(struct usb_interface *interface);
-+static int cmdir_release(struct inode *inode, struct file *file);
-+static int cmdir_check(int device_num);
-+static void init_cmdir_var(int device_num);
-+static void reset_cmdir(int device_num);
-+static void update_cmdir_string(int device_num);
-+static void print_cmdir(int device_num);
-+static ssize_t cmdir_file_read(struct file *file, char *buffer,
-+			       size_t count, loff_t *ppos);
-+ssize_t cmdir_read(unsigned char *buffer, size_t count);
-+static ssize_t cmdir_file_write(struct file *file, const char *buffer,
-+				size_t count, loff_t *ppos);
-+int cmdir_write(unsigned char *buffer, int count, void *callback_fct, int u);
-+int write_core(unsigned char *buffer, int count,
-+	       void *callback_fct, int device_num);
-+static void cmdir_write_bulk_callback(struct urb *urb, struct pt_regs *regs);
-+int set_tx_channels(unsigned int next_tx);
-+
-+int add_cmdir_queue(unsigned char *buffer, int count,
-+		    void *callback_vct, int usecdelay);
-+int cmdir_write_queue(unsigned char *buffer, int count, void *callback_vct);
-+int send_queue(void);
-+int wait_to_tx(int usecs);
-+
 +/* circular packet queue */
 +unsigned char ourbuffers[QUEUELENGTH][64];
 +int waitusecs[QUEUELENGTH];
@@ -686,7 +680,7 @@
 +ssize_t cmdir_read(unsigned char *buffer, size_t count)
 +{
 +	struct usb_skel *dev;
-+	int retval = 0;
++	int length, retval = 0;
 +
 +	struct usb_interface *interface;
 +	interface = usb_find_interface(&cmdir_driver,
@@ -703,14 +697,14 @@
 +	retval = usb_bulk_msg(dev->udev, usb_rcvbulkpipe(dev->udev,
 +						dev->bulk_in_endpointAddr),
 +		 dev->bulk_in_buffer, min(dev->bulk_in_size, count),
-+		 &count, HZ*10);
++		 &length, HZ*10);
 +	if (!retval) {
-+		if (!memcpy(buffer, dev->bulk_in_buffer, count))
[...4078 lines suppressed...]
-+		lirc_t command;
++		int command;
 +
 +		if (copy_from_user(&command, buf + i, sizeof(command))) {
-+			up(&ir->lock);
++			mutex_unlock(&ir->lock);
 +			return -EFAULT;
 +		}
 +
@@ -17251,7 +17605,7 @@
 +			ret = send_code(ir, (unsigned)command >> 16,
 +					    (unsigned)command & 0xFFFF);
 +			if (ret == -EPROTO) {
-+				up(&ir->lock);
++				mutex_unlock(&ir->lock);
 +				return ret;
 +			}
 +		}
@@ -17267,20 +17621,19 @@
 +			if (failures >= 3) {
 +				zilog_error("unable to send to the IR chip "
 +					    "after 3 resets, giving up\n");
-+				up(&ir->lock);
++				mutex_unlock(&ir->lock);
 +				return ret;
 +			}
-+			ivtv_reset_ir_gpio(i2c_get_adapdata(ir->c_tx.adapter));
 +			set_current_state(TASK_UNINTERRUPTIBLE);
 +			schedule_timeout((100 * HZ + 999) / 1000);
 +			ir->need_boot = 1;
 +			++failures;
 +		} else
-+			i += sizeof(lirc_t);
++			i += sizeof(int);
 +	}
 +
 +	/* Release i2c bus */
-+	up(&ir->lock);
++	mutex_unlock(&ir->lock);
 +
 +	/* All looks good */
 +	return n;
@@ -17296,7 +17649,7 @@
 +	if (ir->c_rx.addr == 0)
 +		return -ENODEV;
 +
-+	down(&ir->buf_sem);
++	mutex_lock(&ir->buf_lock);
 +
 +	poll_wait(filep, &ir->buf.wait_poll, wait);
 +
@@ -17305,7 +17658,7 @@
 +
 +	ret = lirc_buffer_empty(&ir->buf) ? 0 : (POLLIN|POLLRDNORM);
 +
-+	up(&ir->buf_sem);
++	mutex_unlock(&ir->buf_lock);
 +	return ret;
 +}
 +
@@ -17388,15 +17741,15 @@
 +	ir = ir_devices[minor];
 +
 +	/* increment in use count */
-+	down(&ir->lock);
++	mutex_lock(&ir->lock);
 +	++ir->open;
 +	ret = set_use_inc(ir);
 +	if (ret != 0) {
 +		--ir->open;
-+		up(&ir->lock);
++		mutex_unlock(&ir->lock);
 +		return ret;
 +	}
-+	up(&ir->lock);
++	mutex_unlock(&ir->lock);
 +
 +	/* stash our IR struct */
 +	filep->private_data = ir;
@@ -17415,10 +17768,10 @@
 +	}
 +
 +	/* decrement in use count */
-+	down(&ir->lock);
++	mutex_lock(&ir->lock);
 +	--ir->open;
 +	set_use_dec(ir);
-+	up(&ir->lock);
++	mutex_unlock(&ir->lock);
 +
 +	return 0;
 +}
@@ -17442,7 +17795,6 @@
 +		.owner	= THIS_MODULE,
 +		.name	= "i2c ir driver",
 +	},
-+	.id		= I2C_DRIVERID_EXP3, /* FIXME */
 +	.attach_adapter	= ir_probe,
 +	.detach_client	= ir_detach,
 +	.command	= ir_command,
@@ -17474,11 +17826,10 @@
 +		client->addr = 0;
 +		return ret;
 +	}
-+	ret = i2c_use_client(client);
-+	if (ret != 0) {
++	if (!i2c_use_client(client)) {
 +		i2c_detach_client(client);
 +		client->addr = 0;
-+		return ret;
++		return -EFAULT;
 +	}
 +	++ir->devs;
 +	return 0;
@@ -17500,8 +17851,8 @@
 +		kfree(ir);
 +		return -ENOMEM;
 +	}
-+	init_MUTEX(&ir->lock);
-+	init_MUTEX(&ir->buf_sem);
++	mutex_init(&ir->lock);
++	mutex_init(&ir->buf_lock);
 +	ir->open = 0;
 +	ir->devs = 0;
 +	ir->task = NULL;
@@ -17595,7 +17946,7 @@
 +static int ir_detach(struct i2c_client *client)
 +{
 +	struct IR *ir = i2c_get_clientdata(client);
-+	down(&ir->lock);
++	mutex_lock(&ir->lock);
 +
 +	if (client == &ir->c_rx) {
 +		DECLARE_COMPLETION(tn);
@@ -17618,7 +17969,7 @@
 +	} else if (client == &ir->c_tx) {
 +		i2c_detach_client(&ir->c_tx);
 +	} else {
-+		up(&ir->lock);
++		mutex_unlock(&ir->lock);
 +		zilog_error("ir_detach: detached from something we didn't "
 +			    "attach to\n");
 +		return -ENODEV;
@@ -17626,7 +17977,7 @@
 +
 +	--ir->devs;
 +	if (ir->devs < 0) {
-+		up(&ir->lock);
++		mutex_unlock(&ir->lock);
 +		zilog_error("ir_detach: invalid device count\n");
 +		return -ENODEV;
 +	} else if (ir->devs == 0) {
@@ -17638,11 +17989,11 @@
 +
 +		/* free memory */
 +		lirc_buffer_free(&ir->buf);
-+		up(&ir->lock);
++		mutex_unlock(&ir->lock);
 +		kfree(ir);
 +		return 0;
 +	}
-+	up(&ir->lock);
++	mutex_unlock(&ir->lock);
 +	return 0;
 +}
 +
@@ -17651,13 +18002,8 @@
 +	struct i2c_client c;
 +	char buf;
 +
-+#ifdef I2C_HW_B_CX2341X
-+	if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848) ||
-+		adap->id == (I2C_ALGO_BIT | I2C_HW_B_CX2341X))
-+#else
-+	if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
-+#endif
-+	{
++	if (adap->id == I2C_HW_B_BT848 ||
++	    adap->id == I2C_HW_B_CX2341X) {
 +		int have_rx = 0, have_tx = 0;
 +
 +		/* The external IR receiver is at
@@ -17704,7 +18050,7 @@
 +
 +int init_module(void)
 +{
-+	init_MUTEX(&tx_data_lock);
++	mutex_init(&tx_data_lock);
 +	request_module("ivtv");
 +	request_module("firmware_class");
 +	i2c_add_driver(&driver);
@@ -17737,8 +18083,6 @@
 +module_param(disable_tx, bool, 0644);
 +MODULE_PARM_DESC(disable_tx, "Disable the IR transmitter device");
 +
-+EXPORT_NO_SYMBOLS;
-+
 +#endif /* MODULE */
 +
 +/*



From mclasen at fedoraproject.org  Fri Sep  5 04:26:45 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  5 Sep 2008 04:26:45 +0000 (UTC)
Subject: rpms/gtk2/devel greeter-crash.patch,NONE,1.1 gtk2.spec,1.318,1.319
Message-ID: <20080905042645.DC3EA70125@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21112

Modified Files:
	gtk2.spec 
Added Files:
	greeter-crash.patch 
Log Message:
Fix a greeter crash


greeter-crash.patch:

--- NEW FILE greeter-crash.patch ---
diff -up gtk+-2.14.0/modules/other/gail/gailtreeview.c.greeter-crash gtk+-2.14.0/modules/other/gail/gailtreeview.c
--- gtk+-2.14.0/modules/other/gail/gailtreeview.c.greeter-crash	2008-09-05 00:24:19.000000000 -0400
+++ gtk+-2.14.0/modules/other/gail/gailtreeview.c	2008-09-05 00:24:27.000000000 -0400
@@ -2959,17 +2959,6 @@ model_row_deleted (GtkTreeModel *tree_mo
     g_signal_emit_by_name (atk_obj, "row_deleted", row, 
                            gailview->n_children_deleted + 1);
   gailview->n_children_deleted = 0;
-
-  /* Generate children-changed signals */
-  n_cols = get_n_actual_columns (tree_view);
-  for (col = 0; col < n_cols; col++)
-  {
-    /*
-     * Pass NULL as the child object, 4th argument.
-     */
-    g_signal_emit_by_name (atk_obj, "children_changed::remove",
-                           ((row * n_cols) + col), NULL, NULL);
-  }
 }
 
 /* 


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- gtk2.spec	5 Sep 2008 01:05:26 -0000	1.318
+++ gtk2.spec	5 Sep 2008 04:26:15 -0000	1.319
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
@@ -32,6 +32,8 @@
 Patch2: workaround.patch
 # fixed upstream
 Patch3: init-deadlock.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=548782
+Patch4: greeter-crash.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -118,6 +120,7 @@
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
 %patch3 -p0 -b .init-deadlock
+%patch4 -p1 -b .greeter-crash
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -301,6 +304,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Fri Sep  5 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.0-3
+- Fix a greeter crash
+
 * Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.0-2
 - Fix a deadlock in pixbuf loader initialization
 



From jwilson at fedoraproject.org  Fri Sep  5 04:34:05 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Fri,  5 Sep 2008 04:34:05 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-lirc.patch,1.12,1.13
Message-ID: <20080905043405.D65C170121@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22163

Modified Files:
	linux-2.6-lirc.patch 
Log Message:
whoops, helps if things compile...

linux-2.6-lirc.patch:

Index: linux-2.6-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-lirc.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-lirc.patch	5 Sep 2008 04:25:29 -0000	1.12
+++ linux-2.6-lirc.patch	5 Sep 2008 04:34:05 -0000	1.13
@@ -1,9 +1,3 @@
-Linux Infrared Remote Control drivers
-
-Signed-off-by: Jarod Wilson <jarod at redhat.com>
-
----
-
  drivers/input/Kconfig                 |    2 +
  drivers/input/Makefile                |    2 +
  drivers/input/lirc/Kconfig            |  142 ++++
@@ -22,7 +16,7 @@
  drivers/input/lirc/lirc_imon.c        | 1280 ++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.c        | 1004 +++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 +++
- drivers/input/lirc/lirc_ite8709.c     |  565 +++++++++++++
+ drivers/input/lirc/lirc_ite8709.c     |  561 +++++++++++++
  drivers/input/lirc/lirc_mceusb.c      |  884 +++++++++++++++++++++
  drivers/input/lirc/lirc_mceusb2.c     | 1117 ++++++++++++++++++++++++++
  drivers/input/lirc/lirc_parallel.c    |  732 +++++++++++++++++
@@ -33,7 +27,7 @@
  drivers/input/lirc/lirc_streamzap.c   |  795 +++++++++++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  394 ++++++++++
  drivers/input/lirc/lirc_zilog.c       | 1397 +++++++++++++++++++++++++++++++++
- 29 files changed, 17877 insertions(+), 0 deletions(-)
+ 29 files changed, 17873 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
 index 5f9d860..747633c 100644
@@ -5494,7 +5488,7 @@
 + */
 diff --git a/drivers/input/lirc/lirc_igorplugusb.c b/drivers/input/lirc/lirc_igorplugusb.c
 new file mode 100644
-index 0000000..b28706d
+index 0000000..6b3ac64
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_igorplugusb.c
 @@ -0,0 +1,611 @@
@@ -5601,7 +5595,7 @@
 +
 +/* times to poll per second */
 +#define SAMPLE_RATE	     100
-+static int sample_rate = SAMPLE_RATE
++static int sample_rate = SAMPLE_RATE;
 +
 +
 +/**** Igor's USB Request Codes */
@@ -6100,7 +6094,7 @@
 +MODULE_DEVICE_TABLE(usb, usb_remote_id_table);
 +
 +module_param(sample_rate, int, 0644);
-+MODULE_PARAM_DESC(sample_rate, "Sampling rate in Hz (default: 100)");
++MODULE_PARM_DESC(sample_rate, "Sampling rate in Hz (default: 100)");
 +
 +/*
 + * Overrides for Emacs so that we follow Linus's tabbing style.
@@ -8529,10 +8523,10 @@
 +/********************************* ITE IT87xx ************************/
 diff --git a/drivers/input/lirc/lirc_ite8709.c b/drivers/input/lirc/lirc_ite8709.c
 new file mode 100644
-index 0000000..a16e809
+index 0000000..60b28e9
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_ite8709.c
-@@ -0,0 +1,565 @@
+@@ -0,0 +1,561 @@
 +/*
 + * LIRC driver for ITE8709 CIR port
 + *
@@ -8562,17 +8556,17 @@
 +#endif
 +
 +#include <linux/autoconf.h>
++#include <linux/interrupt.h>
 +
 +#include <linux/pnp.h>
 +#include <linux/io.h>
 +
 +#include "lirc.h"
 +#include "lirc_dev.h"
-+#include "kcompat.h"
 +
 +#define LIRC_DRIVER_NAME "lirc_ite8709"
 +
-+#define BUF_CHUNK_SIZE	sizeof(lirc_t)
++#define BUF_CHUNK_SIZE	sizeof(int)
 +#define BUF_SIZE	(128*BUF_CHUNK_SIZE)
 +
 +/*******************************************************************************
@@ -8754,7 +8748,6 @@
 +static int ite8709_set_use_inc(void *data)
 +{
 +	struct ite8709_device *dev;
-+	MOD_INC_USE_COUNT;
 +	dev = data;
 +	if (dev->use_count == 0)
 +		ite8709_init_hardware(dev);
@@ -8765,7 +8758,6 @@
 +static void ite8709_set_use_dec(void *data)
 +{
 +	struct ite8709_device *dev;
-+	MOD_DEC_USE_COUNT;
 +	dev = data;
 +	dev->use_count--;
 +	if (dev->use_count == 0)
@@ -8775,7 +8767,7 @@
 +static void ite8709_add_read_queue(struct ite8709_device *dev, int flag,
 +					unsigned long long val)
 +{
-+	lirc_t value;
++	int value;
 +
 +	dprintk("add a %llu usec %s\n", val, flag ? "pulse" : "space");
 +
@@ -8973,7 +8965,7 @@
 +	plugin = &ite8709_dev->plugin;
 +	strcpy(plugin->name, LIRC_DRIVER_NAME);
 +	plugin->minor = -1;
-+	plugin->code_length = sizeof(lirc_t) * 8;
++	plugin->code_length = sizeof(int) * 8;
 +	plugin->sample_rate = 0;
 +	plugin->features = LIRC_CAN_REC_MODE2;
 +	plugin->data = ite8709_dev;
@@ -9089,8 +9081,6 @@
 +module_param(debug, bool, 0644);
 +MODULE_PARM_DESC(debug, "Enable debugging messages");
 +
-+EXPORT_NO_SYMBOLS;
-+
 +/*
 + * Overrides for Emacs so that we follow Linus's tabbing style.
 + * ---------------------------------------------------------------------------
@@ -9990,7 +9980,7 @@
 +MODULE_PARM_DESC(debug, "Debug enabled or not");
 diff --git a/drivers/input/lirc/lirc_mceusb2.c b/drivers/input/lirc/lirc_mceusb2.c
 new file mode 100644
-index 0000000..34d9bb2
+index 0000000..659d363
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_mceusb2.c
 @@ -0,0 +1,1117 @@
@@ -10946,7 +10936,7 @@
 +	ir->usbdev = dev;
 +	ir->len_in = maxp;
 +	ir->flags.connected = 0;
-+	ir-flags.pinnacle = is_pinnacle;
++	ir->flags.pinnacle = is_pinnacle;
 +	ir->flags.transmitter_mask_inverted =
 +		usb_match_id(intf, transmitter_mask_list) ? 0 : 1;
 +



From jwilson at fedoraproject.org  Fri Sep  5 05:02:59 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Fri,  5 Sep 2008 05:02:59 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-lirc.patch,1.13,1.14
Message-ID: <20080905050259.81FBF70121@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24404

Modified Files:
	linux-2.6-lirc.patch 
Log Message:
silence compile-time warnings from lirc_ite8709.c

linux-2.6-lirc.patch:

Index: linux-2.6-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-lirc.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-lirc.patch	5 Sep 2008 04:34:05 -0000	1.13
+++ linux-2.6-lirc.patch	5 Sep 2008 05:02:59 -0000	1.14
@@ -1,3 +1,9 @@
+Linux Infrared Remote Control drivers
+
+Signed-off-by: Jarod Wilson <jarod at redhat.com>
+
+---
+
  drivers/input/Kconfig                 |    2 +
  drivers/input/Makefile                |    2 +
  drivers/input/lirc/Kconfig            |  142 ++++
@@ -16,7 +22,7 @@
  drivers/input/lirc/lirc_imon.c        | 1280 ++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.c        | 1004 +++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 +++
- drivers/input/lirc/lirc_ite8709.c     |  561 +++++++++++++
+ drivers/input/lirc/lirc_ite8709.c     |  548 +++++++++++++
  drivers/input/lirc/lirc_mceusb.c      |  884 +++++++++++++++++++++
  drivers/input/lirc/lirc_mceusb2.c     | 1117 ++++++++++++++++++++++++++
  drivers/input/lirc/lirc_parallel.c    |  732 +++++++++++++++++
@@ -27,7 +33,7 @@
  drivers/input/lirc/lirc_streamzap.c   |  795 +++++++++++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  394 ++++++++++
  drivers/input/lirc/lirc_zilog.c       | 1397 +++++++++++++++++++++++++++++++++
- 29 files changed, 17873 insertions(+), 0 deletions(-)
+ 29 files changed, 17860 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
 index 5f9d860..747633c 100644
@@ -8523,10 +8529,10 @@
 +/********************************* ITE IT87xx ************************/
 diff --git a/drivers/input/lirc/lirc_ite8709.c b/drivers/input/lirc/lirc_ite8709.c
 new file mode 100644
-index 0000000..60b28e9
+index 0000000..2e1c178
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_ite8709.c
-@@ -0,0 +1,561 @@
+@@ -0,0 +1,548 @@
 +/*
 + * LIRC driver for ITE8709 CIR port
 + *
@@ -8691,19 +8697,6 @@
 +	ite8709_write(dev, ITE8709_MODE, ITE8709_MODE_WRITE);
 +}
 +
-+static unsigned char ite8709_read_register(struct ite8709_device *dev,
-+						unsigned char reg_adr)
-+{
-+	ite8709_wait_device(dev);
-+
-+	ite8709_write(dev, ITE8709_REG_ADR, reg_adr);
-+	ite8709_write(dev, ITE8709_MODE, ITE8709_MODE_READ);
-+
-+	ite8709_wait_device(dev);
-+
-+	return ite8709_read(dev, ITE8709_REG_VAL);
-+}
-+
 +static void ite8709_init_hardware(struct ite8709_device *dev)
 +{
 +	spin_lock_irq(&dev->hardware_lock);
@@ -8789,12 +8782,12 @@
 +	char bit;
 +	struct timeval curr_tv;
 +
-+	struct ite8709_device *dev;
-+	dev = dev_id;
-+
 +	/* Bit duration in microseconds */
 +	const unsigned long bit_duration = 1000000ul / (115200 / CFG_BDR);
 +
++	struct ite8709_device *dev;
++	dev = dev_id;
++
 +	/* If device is busy, we simply discard data because we are in one of */
 +	/* these two cases : shutting down or rearming the device, so this    */
 +	/* doesn't really matter and this avoids waiting too long in IRQ ctx  */



From transif at fedoraproject.org  Fri Sep  5 05:40:48 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Fri,  5 Sep 2008 05:40:48 +0000 (UTC)
Subject: comps/po de.po,1.20,1.21
Message-ID: <20080905054048.F319F70121@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27673/po

Modified Files:
	de.po 
Log Message:
    2008-09-05  Daniela Kugelmann <dkugelma at redhat.com> (via
dkugelma at fedoraproject.org)
    
      * po/de.po: Updated German translation.
    



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.20 -r 1.21 de.po
Index: de.po
===================================================================
RCS file: /cvs/pkgs/comps/po/de.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- de.po	22 Jul 2008 07:14:38 -0000	1.20
+++ de.po	5 Sep 2008 05:40:18 -0000	1.21
@@ -1,5 +1,7 @@
+# translation of comps.HEAD.de.po to German
 # translation of comps.HEAD.de.po to
 #
+#
 # Ronny Buchmann <ronny-vlug at vlugnet.org> 2004, 2005.
 # Bernd Groh <bgroh at redhat.com>, 2003,2004.
 # Verena <vfuehrer at redhat.com>, 2004.
@@ -7,15 +9,15 @@
 # Timo Trinks <ttrinks at redhat.com>, 2006, 2007,2008.
 # Severin Heiniger <severinheiniger at gmail.com>, 2007.
 # Fabian Affolter <fab at fedoraproject.org>, 2007,2008.
-#
+# Daniela Kugelmann <dkugelma at redhat.com >, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-22 02:39+0000\n"
-"PO-Revision-Date: 2008-07-22 09:10+0100\n"
-"Last-Translator: Fabian Affolter <fab at fedoraproject.org>\n"
-"Language-Team: German <fedora-trans-de at redhat.com>\n"
+"POT-Creation-Date: 2008-09-03 19:27+0000\n"
+"PO-Revision-Date: 2008-09-04 11:16+1000\n"
+"Last-Translator: Daniela Kugelmann <dkugelma at redhat.com >\n"
+"Language-Team: German <i18 at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,283 +26,188 @@
 "X-Poedit-Language: German\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: ../comps-f7.xml.in.h:1
-#: ../comps-f8.xml.in.h:1
-#: ../comps-f9.xml.in.h:1
+#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "Eine schlanke Desktop-Umgebung, die gut auf ??lteren Systemen funktioniert."
 
-#: ../comps-f7.xml.in.h:2
-#: ../comps-f8.xml.in.h:2
-#: ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2
-#: ../comps-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:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Verwaltungswerkzeuge"
 
-#: ../comps-f7.xml.in.h:3
-#: ../comps-f8.xml.in.h:3
-#: ../comps-f9.xml.in.h:3
+#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
 #: ../comps-f10.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "Unterst??tzung f??r Afrikaans"
 
-#: ../comps-f7.xml.in.h:4
-#: ../comps-f8.xml.in.h:4
-#: ../comps-f9.xml.in.h:4
+#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
 #: ../comps-f10.xml.in.h:4
 msgid "Albanian Support"
 msgstr "Unterst??tzung f??r Albanisch"
 
-#: ../comps-f7.xml.in.h:5
-#: ../comps-f8.xml.in.h:5
-#: ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5
-#: ../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:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: ../comps-f7.xml.in.h:6
-#: ../comps-f8.xml.in.h:6
-#: ../comps-f9.xml.in.h:6
+#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
 #: ../comps-f10.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
 msgstr "Anwendungen zur Durchf??hrung einer Vielzahl von Aufgaben"
 
-#: ../comps-f7.xml.in.h:7
-#: ../comps-f8.xml.in.h:7
-#: ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7
-#: ../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:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Unterst??tzung f??r Arabisch"
 
-#: ../comps-f7.xml.in.h:8
-#: ../comps-f8.xml.in.h:8
-#: ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8
-#: ../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:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Unterst??tzung f??r Armenisch"
 
-#: ../comps-f7.xml.in.h:9
-#: ../comps-f8.xml.in.h:9
-#: ../comps-f9.xml.in.h:9
+#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
 #: ../comps-f10.xml.in.h:9
 msgid "Assamese Support"
 msgstr "Unterst??tzung f??r Assamesisch"
 
-#: ../comps-f7.xml.in.h:10
-#: ../comps-f8.xml.in.h:10
-#: ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10
-#: ../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:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Schreiben und Publizieren"
 
-#: ../comps-f7.xml.in.h:11
-#: ../comps-f8.xml.in.h:11
-#: ../comps-f9.xml.in.h:11
+#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
 #: ../comps-f10.xml.in.h:11
 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:12
-#: ../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:12 ../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-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
 #: ../comps-f10.xml.in.h:13
 msgid "Basic support for the Ruby programming language."
 msgstr "Basis-Unterst??tzung f??r die Programmiersprache Ruby."
 
-#: ../comps-f7.xml.in.h:14
-#: ../comps-f8.xml.in.h:14
-#: ../comps-f9.xml.in.h:14
+#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
 #: ../comps-f10.xml.in.h:14
 msgid "Basque Support"
 msgstr "Unterst??tzung f??r Baskisch (Spanien)"
 
-#: ../comps-f7.xml.in.h:15
-#: ../comps-f8.xml.in.h:15
-#: ../comps-f9.xml.in.h:15
+#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
 #: ../comps-f10.xml.in.h:15
 msgid "Belarusian Support"
 msgstr "Unterst??tzung f??r Belarussisch"
 
-#: ../comps-f7.xml.in.h:16
-#: ../comps-f8.xml.in.h:16
-#: ../comps-f9.xml.in.h:16
+#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
 #: ../comps-f10.xml.in.h:16
 msgid "Bengali Support"
 msgstr "Unterst??tzung f??r Bengali"
 
-#: ../comps-f7.xml.in.h:17
-#: ../comps-f8.xml.in.h:17
-#: ../comps-f9.xml.in.h:17
+#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
 #: ../comps-f10.xml.in.h:17
 msgid "Bhutanese Support"
 msgstr "Unterst??tzung f??r Bhutanisch"
 
-#: ../comps-f7.xml.in.h:18
-#: ../comps-f8.xml.in.h:18
-#: ../comps-f9.xml.in.h:18
+#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
 #: ../comps-f10.xml.in.h:18
[...1956 lines suppressed...]
-#: ../comps-f9.xml.in.h:131
-#: ../comps-f10.xml.in.h:134
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:135
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR ist die Desktopumgebung, welche f??r den OLPC XO entwickelt wurde."
 
-#: ../comps-f9.xml.in.h:200
-#: ../comps-f10.xml.in.h:204
+#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:205
 msgid "Walloon Support"
 msgstr "Unterst??tzung f??r Wallonisch"
 
-#: ../comps-f10.xml.in.h:70
+#: ../comps-f10.xml.in.h:23
+msgid "Burmese Support"
+msgstr "Unterst??tzung f??r Burmesisch"
+
+#: ../comps-f10.xml.in.h:71
 msgid "Haskell"
 msgstr "Haskell"
 
-#: ../comps-f10.xml.in.h:76
+#: ../comps-f10.xml.in.h:77
 msgid "Input Methods"
 msgstr "Eingabemethoden"
 
-#: ../comps-f10.xml.in.h:77
+#: ../comps-f10.xml.in.h:78
 msgid "Input method packages for the input of international text."
 msgstr "Eingabemethoden-Paket f??r die Eingabe von internationalem Text."
 
-#: ../comps-f10.xml.in.h:157
+#: ../comps-f10.xml.in.h:158
 msgid "Tajik Support"
 msgstr "Unterst??tzung f??r Tajik"
 
-#: ../comps-el4.xml.in.h:3
-#: ../comps-el5.xml.in.h:3
+#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Anwendungen f??r eine Vielzahl von Aufgaben"
 
-#: ../comps-el4.xml.in.h:12
-#: ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "Unterst??tzung f??r DF??-Netzwerk"
 
-#: ../comps-el4.xml.in.h:22
-#: ../comps-el5.xml.in.h:23
-msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
-msgstr "GNOME ist eine leistungsstarke grafische Benutzeroberfl??che mit Men??leiste, Desktop, Systemsymbolen und grafischem Dateimanager."
-
-#: ../comps-el4.xml.in.h:35
-#: ../comps-el5.xml.in.h:35
-msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
-msgstr "KDE ist eine leistungsstarke, grafische Benutzeroberfl??che mit Men??leiste, Desktop, Systemsymbolen und grafischem Dateimanager."
-
-#: ../comps-el4.xml.in.h:44
-#: ../comps-el5.xml.in.h:44
-msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi."
-msgstr "Diese auch als Text-Editoren bezeichneten Programme erm??glichen das Anlegen und Bearbeiten von Dateien. Dazu geh??ren Emacs und Vi."
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+msgid ""
+"GNOME is a powerful, graphical user interface which includes a panel, "
+"desktop, system icons, and a graphical file manager."
+msgstr ""
+"GNOME ist eine leistungsstarke grafische Benutzeroberfl??che mit Men??leiste, "
+"Desktop, Systemsymbolen und grafischem Dateimanager."
+
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+msgid ""
+"KDE is a powerful, graphical user interface which includes a panel, desktop, "
+"system icons, and a graphical file manager."
+msgstr ""
+"KDE ist eine leistungsstarke, grafische Benutzeroberfl??che mit Men??leiste, "
+"Desktop, Systemsymbolen und grafischem Dateimanager."
+
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+msgid ""
+"Sometimes called text editors, these are programs that allow you to create "
+"and edit files. These include Emacs and Vi."
+msgstr ""
+"Diese auch als Text-Editoren bezeichneten Programme erm??glichen das Anlegen "
+"und Bearbeiten von Dateien. Dazu geh??ren Emacs und Vi."
 
-#: ../comps-el4.xml.in.h:50
-#: ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
 msgid "The XEmacs text editor."
 msgstr "Der Text-Editor XEmacs."
 
-#: ../comps-el4.xml.in.h:54
-#: ../comps-el5.xml.in.h:52
-msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text."
-msgstr "Mit diesen Programmen k??nnen Sie Dokumentationen im DocBook-Format anlegen und diese in die Formate HTML, PDF, Postscript und Text konvertieren."
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+msgid ""
+"These tools allow you to create documentation in the DocBook format and "
+"convert them to HTML, PDF, Postscript, and text."
+msgstr ""
+"Mit diesen Programmen k??nnen Sie Dokumentationen im DocBook-Format anlegen "
+"und diese in die Formate HTML, PDF, Postscript und Text konvertieren."
 
-#: ../comps-el4.xml.in.h:64
-#: ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
 msgid "This group is a collection of network servers for specific purposes"
-msgstr "Diese Gruppe umfasst eine Sammlung von Netzwerkservern f??r verschiedene Zwecke."
+msgstr ""
+"Diese Gruppe umfasst eine Sammlung von Netzwerkservern f??r verschiedene "
+"Zwecke."
 
-#: ../comps-el4.xml.in.h:65
-#: ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of tools and resources of Arabic environments."
-msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von arabische Umgebungen."
+msgstr ""
+"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
+"arabische Umgebungen."
 
-#: ../comps-el4.xml.in.h:67
-#: ../comps-el5.xml.in.h:66
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Hebrew environments."
-msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von hebr??ische Umgebungen."
+msgstr ""
+"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
+"hebr??ische Umgebungen."
 
-#: ../comps-el4.xml.in.h:68
-#: ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
 msgid "This group is a collection of tools and resources of Japanese environments."
-msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von japanische Umgebungen."
+msgstr ""
+"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
+"japanische Umgebungen."
 
-#: ../comps-el4.xml.in.h:77
-#: ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
 msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
 msgid "This group is a collection of tools and resources of Czech environments."
-msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von tschechischen Umgebungen."
-
-#~ msgid "British Support"
-#~ msgstr "Unterst??tzung f??r Englisch (Gro??britannien)"
-#~ msgid "Cluster Storage"
-#~ msgstr "Cluster-Speicher"
-#~ msgid "Clustering Support."
-#~ msgstr "Clustering-Support."
-#~ msgid "Libraries for applications built on older releases."
-#~ msgstr "Bibliotheken f??r auf ??lteren Versionen gebaute Anwendungen."
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "Verschiedene enthaltene Pakete"
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "Pakete, die Unterst??tzung f??r Cluster-Speicher bieten."
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "Pakete, die Support f??r single-node GFS bieten."
-#~ msgid "Single Node GFS Support"
-#~ msgstr "Unterst??tzung f??r Single Node GFS"
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr ""
-#~ "Diese Pakete bieten Kompatibilit??tsunterst??tzung f??r fr??here Versionen."
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "Java Runtime Environments und Development Kits"
-#~ msgid "Misc"
-#~ msgstr "Verschiedenes"
-#~ msgid "Misc packages"
-#~ msgstr "Verschiedene Pakete"
-#~ msgid "Multimedia"
-#~ msgstr "Multimedia"
-#~ msgid "Multimedia applications"
-#~ msgstr "Multimedia-Anwendungen"
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr ""
-#~ "Pakete, die zus??tzliche Funktionalit??t f??r Red Hat Enterprise Linux bieten"
-#~ msgid "Red Hat Enterprise Linux Supplementary"
-#~ msgstr "Red Hat Enterprise Linux Zusatzkomponenten"
-#~ msgid ""
-#~ "Components used for high performance networking and clustering, such as "
-#~ "Infiniband and RDMA."
-#~ msgstr ""
-#~ "Komponenten, welche f??r Hochleistungsnetzwerke und Clustering benutzt "
-#~ "werden, wie Infiniband und RDMA."
-#~ msgid "OpenFabrics Enterprise Distribution"
-#~ msgstr "OpenFabrics Enterprise Distribution"
-#~ msgid "Virtualization Support."
-#~ msgstr "Unterst??tzung f??r Virtualisierung."
+msgstr ""
+"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
+"tschechischen Umgebungen."
 



From airlied at fedoraproject.org  Fri Sep  5 05:48:32 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  5 Sep 2008 05:48:32 +0000 (UTC)
Subject: rpms/mesa/devel intel-mmio-fix.patch, NONE,
	1.1 mesa-7.1-nukeglthread-debug.patch, NONE,
	1.1 mesa-7.1-osmesa-version.patch, NONE,
	1.1 mesa-no-mach64.patch, NONE, 1.1 r300-bufmgr.patch, NONE,
	1.1 .cvsignore, 1.27, 1.28 mesa.spec, 1.190, 1.191 sources, 1.27,
	1.28 mesa-7.1pre-nukeglthread-debug.patch, 1.1,
	NONE mesa-7.1pre-osmesa-version.patch, 1.3,
	NONE mesa-fixes.patch, 1.1, NONE r300-cmdbuf.patch, 1.1, NONE
Message-ID: <20080905054832.CF40070121@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28447

Modified Files:
	.cvsignore mesa.spec sources 
Added Files:
	intel-mmio-fix.patch mesa-7.1-nukeglthread-debug.patch 
	mesa-7.1-osmesa-version.patch mesa-no-mach64.patch 
	r300-bufmgr.patch 
Removed Files:
	mesa-7.1pre-nukeglthread-debug.patch 
	mesa-7.1pre-osmesa-version.patch mesa-fixes.patch 
	r300-cmdbuf.patch 
Log Message:
* Fri Sep 05 2008 Dave Airlie <airlied at redhat.com> 7.2-0.1
- latest snapshot - r300 bufmgr code
- stop building mach64, patch around some intel issues


intel-mmio-fix.patch:

--- NEW FILE intel-mmio-fix.patch ---
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index c2ad5a0..18e7348 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -409,10 +409,12 @@ static const struct dri_extension brw_extensions[] = {
    { NULL,                                NULL }
 };
 
+#ifdef I915_MMIO_READ
 static const struct dri_extension arb_oc_extensions[] = {
    {"GL_ARB_occlusion_query",            GL_ARB_occlusion_query_functions},
    {NULL, NULL}
 };
+#endif
 
 static const struct dri_extension ttm_extensions[] = {
    {"GL_EXT_framebuffer_object", GL_EXT_framebuffer_object_functions},
@@ -437,10 +439,12 @@ void intelInitExtensions(GLcontext *ctx, GLboolean enable_imaging)
    if (intel == NULL || intel->ttm)
       driInitExtensions(ctx, ttm_extensions, GL_FALSE);
 
+#ifdef I915_MMIO_READ
    if (intel == NULL || 
        (IS_965(intel->intelScreen->deviceID) && 
 	intel->intelScreen->drmMinor >= 8))
       driInitExtensions(ctx, arb_oc_extensions, GL_FALSE);
+#endif
 
    if (intel == NULL || IS_965(intel->intelScreen->deviceID))
       driInitExtensions(ctx, brw_extensions, GL_FALSE);
@@ -538,6 +542,7 @@ intelFinish(GLcontext * ctx)
    }
 }
 
+#ifdef I915_MMIO_READ
 static void
 intelBeginQuery(GLcontext *ctx, GLenum target, struct gl_query_object *q)
 {
@@ -568,6 +573,7 @@ intelEndQuery(GLcontext *ctx, GLenum target, struct gl_query_object *q)
 	q->Ready = GL_TRUE;
 	intel->stats_wm--;
 }
+#endif
 
 /** Driver-specific fence emit implementation for the fake memory manager. */
 static unsigned int
@@ -684,8 +690,10 @@ intelInitDriverFunctions(struct dd_function_table *functions)
    functions->CopyConvolutionFilter1D = _swrast_CopyConvolutionFilter1D;
    functions->CopyConvolutionFilter2D = _swrast_CopyConvolutionFilter2D;
 
+#ifdef I915_MMIO_READ
    functions->BeginQuery = intelBeginQuery;
    functions->EndQuery = intelEndQuery;
+#endif
 
    intelInitTextureFuncs(functions);
    intelInitStateFuncs(functions);

mesa-7.1-nukeglthread-debug.patch:

--- NEW FILE mesa-7.1-nukeglthread-debug.patch ---
diff -up Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c.intel-glthread Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c
--- Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c.intel-glthread	2008-08-25 10:49:40.000000000 -0400
+++ Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c	2008-08-28 14:26:17.000000000 -0400
@@ -633,11 +633,6 @@ intel_render_texture(GLcontext * ctx,
        return;
    }
 
-   DBG("Begin render texture tid %x tex=%u w=%d h=%d refcount=%d\n",
-       _glthread_GetID(),
-       att->Texture->Name, newImage->Width, newImage->Height,
-       irb->Base.RefCount);
-
    /* point the renderbufer's region to the texture image region */
    intel_image = intel_texture_image(newImage);
    if (irb->region != intel_image->mt->region) {
@@ -674,8 +669,6 @@ intel_finish_render_texture(GLcontext * 
 {
    struct intel_renderbuffer *irb = intel_renderbuffer(att->Renderbuffer);
 
-   DBG("End render texture (tid %x) tex %u\n", _glthread_GetID(), att->Texture->Name);
-
    if (irb) {
       /* just release the region */
       intel_region_release(&irb->region);

mesa-7.1-osmesa-version.patch:

--- NEW FILE mesa-7.1-osmesa-version.patch ---
diff -up Mesa-7.1/src/mesa/drivers/osmesa/Makefile.jx Mesa-7.1/src/mesa/drivers/osmesa/Makefile
--- Mesa-7.1/src/mesa/drivers/osmesa/Makefile.jx	2008-08-28 14:05:47.000000000 -0400
+++ Mesa-7.1/src/mesa/drivers/osmesa/Makefile	2008-08-28 14:07:13.000000000 -0400
@@ -46,7 +46,7 @@ osmesa8: $(TOP)/lib/$(OSMESA_LIB_NAME)
 
 $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS)
 	$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
+		-major 6 -minor 5 -patch 3 \
 		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
 		-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
 		$(OSMESA_LIB_DEPS) $(OBJECTS)
@@ -58,7 +58,7 @@ $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS
 # with all the other Mesa sources (compiled with -DCHAN_BITS=16/32
 osmesa16: $(OBJECTS) $(CORE_MESA)
 	$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
+		-major 6 -minor 5 -patch 3 \
 		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
 		-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
 		$(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)

mesa-no-mach64.patch:

--- NEW FILE mesa-no-mach64.patch ---
--- configure.ac.mach64	2008-09-05 13:53:24.000000000 +1000
+++ configure.ac	2008-09-05 13:53:39.000000000 +1000
@@ -656,7 +656,7 @@
             # because there is no x86-64 system where they could *ever*
             # be used.
             if test "x$DRI_DIRS" = "xyes"; then
-                DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 radeon \
+                DRI_DIRS="i915 i965 mga r128 r200 r300 radeon \
                     savage tdfx unichrome swrast"
             fi
             ;;
@@ -664,13 +664,13 @@
             # Build only the drivers for cards that exist on PowerPC.
             # At some point MGA will be added, but not yet.
             if test "x$DRI_DIRS" = "xyes"; then
-                DRI_DIRS="mach64 r128 r200 r300 radeon tdfx swrast"
+                DRI_DIRS="r128 r200 r300 radeon tdfx swrast"
             fi
             ;;
         sparc*)
             # Build only the drivers for cards that exist on sparc`
             if test "x$DRI_DIRS" = "xyes"; then
-                DRI_DIRS="mach64 r128 r200 r300 radeon ffb swrast"
+                DRI_DIRS="r128 r200 r300 radeon ffb swrast"
             fi
             ;;
         esac
@@ -689,7 +689,7 @@
         # ffb and gamma are missing because they have not been converted
         # to use the new interface.
         if test "x$DRI_DIRS" = "xyes"; then
-            DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \
+            DRI_DIRS="i810 i915 i965 mga r128 r200 r300 radeon tdfx \
                 unichrome savage sis swrast"
         fi
         ;;
@@ -704,7 +704,7 @@
 
     # default drivers
     if test "x$DRI_DIRS" = "xyes"; then
-        DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
+        DRI_DIRS="i810 i915 i965 mga r128 r200 r300 radeon s3v \
             savage sis tdfx trident unichrome ffb swrast"
     fi
 

r300-bufmgr.patch:

--- NEW FILE r300-bufmgr.patch ---
diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile
index e9144ac..b6ed58b 100644
--- a/src/mesa/drivers/dri/r200/Makefile
+++ b/src/mesa/drivers/dri/r200/Makefile
@@ -48,7 +48,8 @@ SYMLINKS = \
 COMMON_SYMLINKS = \
 	radeon_chipset.h \
 	radeon_screen.c \
-	radeon_screen.h
+	radeon_screen.h \
+	radeon_buffer.h
 
 ##### TARGETS #####
 
diff --git a/src/mesa/drivers/dri/r300/Makefile b/src/mesa/drivers/dri/r300/Makefile
index 6ca9342..3bb1ff4 100644
--- a/src/mesa/drivers/dri/r300/Makefile
+++ b/src/mesa/drivers/dri/r300/Makefile
@@ -11,15 +11,6 @@ ifeq ($(USING_EGL), 1)
 EGL_SOURCES = server/radeon_egl.c
 endif
 
-COMMON_SOURCES = \
-	../../common/driverfuncs.c \
-	../common/mm.c \
-	../common/utils.c \
-	../common/texmem.c \
-	../common/vblank.c \
-	../common/xmlconfig.c \
-	../common/dri_util.c
-
 DRIVER_SOURCES = \
 		 radeon_screen.c \
 		 radeon_context.c \
@@ -36,6 +27,7 @@ DRIVER_SOURCES = \
 		 r300_texmem.c \
 		 r300_tex.c \
 		 r300_texstate.c \
+		 r300_mipmap_tree.c \
 		 radeon_program.c \
 		 radeon_program_alu.c \
 		 radeon_program_pair.c \
@@ -51,7 +43,7 @@ DRIVER_SOURCES = \
 		 r300_swtcl.c \
 		 $(EGL_SOURCES)
 
-C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
+C_SOURCES = $(COMMON_SOURCES) $(COMMON_BM_SOURCES) $(DRIVER_SOURCES)
 
 DRIVER_DEFINES = -DCOMPILE_R300 -DR200_MERGED=0 \
 	-DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300
@@ -68,7 +60,8 @@ COMMON_SYMLINKS = \
 	radeon_chipset.h \
 	radeon_screen.c \
 	radeon_screen.h \
-	radeon_span.h
+	radeon_span.h \
+	radeon_buffer.h
 
 ##### TARGETS #####
 
diff --git a/src/mesa/drivers/dri/r300/r300_cmdbuf.c b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
index c069660..dd42bf8 100644
--- a/src/mesa/drivers/dri/r300/r300_cmdbuf.c
+++ b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
@@ -51,11 +51,18 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "r300_reg.h"
 #include "r300_cmdbuf.h"
 #include "r300_emit.h"
+#include "r300_mem.h"
+#include "r300_mipmap_tree.h"
 #include "r300_state.h"
 
 // Set this to 1 for extremely verbose debugging of command buffers
 #define DEBUG_CMDBUF		0
 
+/** # of dwords reserved for additional instructions that may need to be written
+ * during flushing.
+ */
+#define SPACE_FOR_FLUSHING	4
+
 /**
  * Send the current command buffer via ioctl to the hardware.
  */
@@ -66,24 +73,42 @@ int r300FlushCmdBufLocked(r300ContextPtr r300, const char *caller)
 	drm_radeon_cmd_buffer_t cmd;
 	int start;
 
+	if (r300->cmdbuf.flushing) {
+		fprintf(stderr, "Recursive call into r300FlushCmdBufLocked!\n");
+		exit(-1);
+	}
+	r300->cmdbuf.flushing = 1;
+
 	if (r300->radeon.lost_context) {
 		start = 0;
 		r300->radeon.lost_context = GL_FALSE;
 	} else
-		start = r300->cmdbuf.count_reemit;
+		start = r300->cmdbuf.reemit;
 
 	if (RADEON_DEBUG & DEBUG_IOCTL) {
 		fprintf(stderr, "%s from %s - %i cliprects\n",
 			__FUNCTION__, caller, r300->radeon.numClipRects);
 
-		if (DEBUG_CMDBUF && RADEON_DEBUG & DEBUG_VERBOSE)
-			for (i = start; i < r300->cmdbuf.count_used; ++i)
+		if (DEBUG_CMDBUF && RADEON_DEBUG & DEBUG_VERBOSE) {
+			fprintf(stderr, "written: %d  committed: %d\n", r300->cmdbuf.written, r300->cmdbuf.committed);
+			for (i = start; i < r300->cmdbuf.written; ++i)
 				fprintf(stderr, "%d: %08x\n", i,
-					r300->cmdbuf.cmd_buf[i]);
+					((uint32_t*)r300->cmdbuf.buf->virtual)[i]);
+		}
 	}
 
-	cmd.buf = (char *)(r300->cmdbuf.cmd_buf + start);
-	cmd.bufsz = (r300->cmdbuf.count_used - start) * 4;
+	if (r300->cmdbuf.written != r300->cmdbuf.committed) {
+		_mesa_problem(r300->radeon.glCtx,
+			"Command buffer contains %d uncommitted dwords\n"
+			"in r300FlushCmdBufLocked called from %s.\n",
+			r300->cmdbuf.written - r300->cmdbuf.committed, caller);
+	}
+
+	dri_bo_unmap(r300->cmdbuf.buf);
+	dri_process_relocs(r300->cmdbuf.buf);
+
+	cmd.buf = (char *)r300->cmdbuf.buf->virtual + 4*start;
+	cmd.bufsz = (r300->cmdbuf.committed - start) * 4;
 
 	if (r300->radeon.state.scissor.enabled) {
 		cmd.nbox = r300->radeon.state.scissor.numClipRects;
@@ -103,9 +128,19 @@ int r300FlushCmdBufLocked(r300ContextPtr r300, const char *caller)
 		radeonWaitForIdleLocked(&r300->radeon);
 	}
 
+	dri_post_submit(r300->cmdbuf.buf);
+	dri_bo_unreference(r300->cmdbuf.buf);
+
 	r300->dma.nr_released_bufs = 0;
-	r300->cmdbuf.count_used = 0;
-	r300->cmdbuf.count_reemit = 0;
+	r300->cmdbuf.buf = radeon_bufmgr_classic_bo_alloc(&r300->radeon.bufmgr->base, "cmdbuf",
+							r300->cmdbuf.size*4, 16, DRM_BO_MEM_CMDBUF);
+	r300->cmdbuf.written = 0;
+	r300->cmdbuf.reserved = 0;
+	r300->cmdbuf.committed = 0;
+	r300->cmdbuf.reemit = 0;
+	dri_bo_map(r300->cmdbuf.buf, GL_TRUE);
+
+	r300->cmdbuf.flushing = 0;
 
 	return ret;
 }
@@ -115,9 +150,7 @@ int r300FlushCmdBuf(r300ContextPtr r300, const char *caller)
 	int ret;
 
 	LOCK_HARDWARE(&r300->radeon);
-
 	ret = r300FlushCmdBufLocked(r300, caller);
-
 	UNLOCK_HARDWARE(&r300->radeon);
 
 	if (ret) {
@@ -128,6 +161,44 @@ int r300FlushCmdBuf(r300ContextPtr r300, const char *caller)
 	return ret;
 }
 
+/**
+ * Make sure that enough space is available in the command buffer
+ * by flushing if necessary.
+ *
+ * \param dwords The number of dwords we need to be free on the command buffer
+ */
+void r300EnsureCmdBufSpace(r300ContextPtr r300, int dwords, const char *caller)
+{
+	assert(dwords < r300->cmdbuf.size);
+
+	if (!r300->cmdbuf.flushing)
+		dwords += SPACE_FOR_FLUSHING;
+
+	if (r300->cmdbuf.written + dwords > r300->cmdbuf.size)
+		r300FlushCmdBuf(r300, caller);
+}
+
+void r300BeginBatch(r300ContextPtr r300, int n, GLboolean autostate, const char* function, int line)
+{
+	assert(r300->cmdbuf.written == r300->cmdbuf.reserved);
+
+	r300EnsureCmdBufSpace(r300, n, function);
+
+	if (autostate && !r300->cmdbuf.written) {
+		if (RADEON_DEBUG & DEBUG_IOCTL)
+			fprintf(stderr,
+				"Reemit state after flush (from %s)\n", function);
+		r300EmitState(r300);
+	}
+
[...7445 lines suppressed...]
+	    ret->base.DataType = GL_UNSIGNED_BYTE;
+	    break;
+	case GL_RGBA8:
+	    ret->base._ActualFormat = GL_RGBA8;
+	    ret->base._BaseFormat = GL_RGBA;
+	    ret->base.RedBits = 8;
+	    ret->base.GreenBits = 8;
+	    ret->base.BlueBits = 8;
+	    ret->base.AlphaBits = 8;
+	    ret->base.DataType = GL_UNSIGNED_BYTE;
+	    break;
+	case GL_STENCIL_INDEX8_EXT:
+	    ret->base._ActualFormat = GL_STENCIL_INDEX8_EXT;
+	    ret->base._BaseFormat = GL_STENCIL_INDEX;
+	    ret->base.StencilBits = 8;
+	    ret->base.DataType = GL_UNSIGNED_BYTE;
+	    break;
+	case GL_DEPTH_COMPONENT16:
+	    ret->base._ActualFormat = GL_DEPTH_COMPONENT16;
+	    ret->base._BaseFormat = GL_DEPTH_COMPONENT;
+	    ret->base.DepthBits = 16;
+	    ret->base.DataType = GL_UNSIGNED_SHORT;
+	    break;
+	case GL_DEPTH_COMPONENT24:
+	    ret->base._ActualFormat = GL_DEPTH24_STENCIL8_EXT;
+	    ret->base._BaseFormat = GL_DEPTH_COMPONENT;
+	    ret->base.DepthBits = 24;
+	    ret->base.DataType = GL_UNSIGNED_INT;
+	    break;
+	case GL_DEPTH24_STENCIL8_EXT:
+	    ret->base._ActualFormat = GL_DEPTH24_STENCIL8_EXT;
+	    ret->base._BaseFormat = GL_DEPTH_STENCIL_EXT;
+	    ret->base.DepthBits = 24;
+	    ret->base.StencilBits = 8;
+	    ret->base.DataType = GL_UNSIGNED_INT_24_8_EXT;
+	    break;
+	default:
+	    fprintf(stderr, "%s: Unknown format 0x%04x\n", __FUNCTION__, format);
+	    _mesa_delete_renderbuffer(&ret->base);
+	    return NULL;
+    }
+
+    ret->dPriv = driDrawPriv;
+    ret->base.InternalFormat = format;
+
+    ret->base.AllocStorage = radeon_alloc_window_storage;
+
+    radeonSetSpanFunctions(ret);
+
+    return ret;
+}
+
+/**
+ * Create the Mesa framebuffer and renderbuffers for a given window/drawable.
+ *
+ * \todo This function (and its interface) will need to be updated to support
+ * pbuffers.
+ */
+static GLboolean
+radeonCreateBuffer( __DRIscreenPrivate *driScrnPriv,
+                    __DRIdrawablePrivate *driDrawPriv,
+                    const __GLcontextModes *mesaVis,
+                    GLboolean isPixmap )
+{
+   radeonScreenPtr screen = (radeonScreenPtr) driScrnPriv->private;
+
+    const GLboolean swDepth = GL_FALSE;
+    const GLboolean swAlpha = GL_FALSE;
+    const GLboolean swAccum = mesaVis->accumRedBits > 0;
+    const GLboolean swStencil = mesaVis->stencilBits > 0 &&
+	mesaVis->depthBits != 24;
+    GLenum rgbFormat = (mesaVis->redBits == 5 ? GL_RGB5 : GL_RGBA8);
+    GLenum depthFormat = GL_NONE;
+    struct gl_framebuffer *fb = _mesa_create_framebuffer(mesaVis);
+
+    if (mesaVis->depthBits == 16)
+	depthFormat = GL_DEPTH_COMPONENT16;
+    else if (mesaVis->depthBits == 24)
+	depthFormat = GL_DEPTH_COMPONENT24;
+
+    /* front color renderbuffer */
+    {
+	struct radeon_renderbuffer *front =
+	    radeon_create_renderbuffer(rgbFormat, driDrawPriv);
+	_mesa_add_renderbuffer(fb, BUFFER_FRONT_LEFT, &front->base);
+    }
+
+    /* back color renderbuffer */
+    if (mesaVis->doubleBufferMode) {
+	struct radeon_renderbuffer *back =
+	    radeon_create_renderbuffer(rgbFormat, driDrawPriv);
+	_mesa_add_renderbuffer(fb, BUFFER_BACK_LEFT, &back->base);
+    }
+
+    /* depth renderbuffer */
+    if (depthFormat != GL_NONE) {
+	struct radeon_renderbuffer *depth =
+	    radeon_create_renderbuffer(depthFormat, driDrawPriv);
+	_mesa_add_renderbuffer(fb, BUFFER_DEPTH, &depth->base);
+	depth->depthHasSurface = screen->depthHasSurface;
+    }
+
+    /* stencil renderbuffer */
+    if (mesaVis->stencilBits > 0 && !swStencil) {
+	struct radeon_renderbuffer *stencil =
+	    radeon_create_renderbuffer(GL_STENCIL_INDEX8_EXT, driDrawPriv);
+	_mesa_add_renderbuffer(fb, BUFFER_STENCIL, &stencil->base);
+	stencil->depthHasSurface = screen->depthHasSurface;
+    }
+
+    _mesa_add_soft_renderbuffers(fb,
+	    GL_FALSE, /* color */
+	    swDepth,
+	    swStencil,
+	    swAccum,
+	    swAlpha,
+	    GL_FALSE /* aux */);
+    driDrawPriv->driverPrivate = (void *) fb;
+
+    return (driDrawPriv->driverPrivate != NULL);
+}
+#else
 
 /**
  * Create the Mesa framebuffer and renderbuffers for a given window/drawable.
@@ -1103,7 +1376,7 @@ radeonCreateBuffer( __DRIscreenPrivate *driScrnPriv,
       return (driDrawPriv->driverPrivate != NULL);
    }
 }
-
+#endif
 
 static void
 radeonDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
@@ -1199,11 +1472,11 @@ radeonInitScreen(__DRIscreenPrivate *psp)
    if (!radeonInitDriver(psp))
        return NULL;
 
+   /* for now fill in all modes */
    return radeonFillInModes( psp,
 			     dri_priv->bpp,
 			     (dri_priv->bpp == 16) ? 16 : 24,
-			     (dri_priv->bpp == 16) ? 0  : 8,
-			     (dri_priv->backOffset != dri_priv->depthOffset) );
+			     (dri_priv->bpp == 16) ? 0  : 8, 1);
 }
 
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.h b/src/mesa/drivers/dri/radeon/radeon_screen.h
index ab859d5..82eb7d8 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.h
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.h
@@ -55,6 +55,14 @@ typedef struct {
    drmAddress map;			/* Mapping of the DRM region */
 } radeonRegionRec, *radeonRegionPtr;
 
+struct radeon_gem_object {
+   uint32_t gem_name;
+   uint32_t gem_handle;
+   uint64_t size;
+   void *map;
+   uint64_t offset;
+};
+
 typedef struct {
    int chip_family;
    int chip_flags;
@@ -107,6 +115,13 @@ typedef struct {
    const __DRIextension *extensions[8];
 
    int num_gb_pipes;
+
+   int kernel_mm;
+   struct radeon_gem_object front;
+   struct radeon_gem_object back;
+   struct radeon_gem_object depth;
+   struct radeon_gem_object vram_texture;
+   struct radeon_gem_object gart_texture;
 } radeonScreenRec, *radeonScreenPtr;
 
 #define IS_R100_CLASS(screen) \
diff --git a/src/mesa/drivers/dri/radeon/radeon_span.h b/src/mesa/drivers/dri/radeon/radeon_span.h
index 9abe086..1650a9b 100644
--- a/src/mesa/drivers/dri/radeon/radeon_span.h
+++ b/src/mesa/drivers/dri/radeon/radeon_span.h
@@ -44,7 +44,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "drirenderbuffer.h"
 
+#include "radeon_buffer.h"
+
 extern void radeonInitSpanFuncs(GLcontext * ctx);
-extern void radeonSetSpanFunctions(driRenderbuffer * rb, const GLvisual * vis);
 
+#if COMPILE_R300
+extern void radeonSetSpanFunctions(struct radeon_renderbuffer *rrb);
+#else
+extern void radeonSetSpanFunctions(driRenderbuffer * rb, const GLvisual * vis);
+#endif
 #endif


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	14 Aug 2008 06:35:21 -0000	1.27
+++ .cvsignore	5 Sep 2008 05:48:02 -0000	1.28
@@ -1,2 +1,2 @@
 gl-manpages-1.0.1.tar.bz2
-mesa-20080814.tar.bz2
+mesa-20080905.tar.bz2


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- mesa.spec	28 Aug 2008 12:36:35 -0000	1.190
+++ mesa.spec	5 Sep 2008 05:48:02 -0000	1.191
@@ -12,12 +12,12 @@
 %define _default_patch_fuzz 2
 
 %define manpages gl-manpages-1.0.1
-%define gitdate 20080814
+%define gitdate 20080905
 
 Summary: Mesa graphics libraries
 Name: mesa
-Version: 7.1
-Release: 0.38%{?dist}
+Version: 7.2
+Release: 0.1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -29,13 +29,14 @@
 Source2: %{manpages}.tar.bz2
 Source3: make-git-snapshot.sh
 
-Patch0: mesa-7.1pre-osmesa-version.patch
-Patch1: mesa-fixes.patch
-Patch2: mesa-7.1pre-nukeglthread-debug.patch
+Patch0: mesa-7.1-osmesa-version.patch
+Patch2: mesa-7.1-nukeglthread-debug.patch
+Patch3: mesa-no-mach64.patch
 
-Patch5: r300-cmdbuf.patch
+Patch5: r300-bufmgr.patch
 
 Patch7: mesa-7.1-link-shared.patch
+Patch8: intel-mmio-fix.patch
 
 Patch12: mesa-7.1-disable-intel-classic-warn.patch
 
@@ -164,10 +165,11 @@
 #%setup -q -n Mesa-%{version}pre -b1 -b2
 %setup -q -n mesa-%{gitdate} -b2
 %patch0 -p1 -b .osmesa
-%patch1 -p1 -b .fixes
 %patch2 -p1 -b .intel-glthread
-%patch5 -p1 -b .r300cmdbuf
+%patch3 -p0 -b .no-mach64
+%patch5 -p1 -b .r300-bufmgr
 %patch7 -p1 -b .dricore
+%patch8 -p1 -b .intel-mmio
 %patch12 -p1 -b .intel-nowarn
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
@@ -240,7 +242,7 @@
 %if %{with_dri}
 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 mga r128 r200 r300 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 || :
@@ -308,8 +310,8 @@
 %{_includedir}/GL/xmesa_xf86.h
 %dir %{_includedir}/GL/internal
 %{_includedir}/GL/internal/dri_interface.h
-%{_includedir}/GL/internal/dri_sarea.h
 %{_libdir}/libGL.so
+%{_libdir}/pkgconfig/dri.pc
 %{_libdir}/pkgconfig/gl.pc
 %{_datadir}/man/man3/gl[^uX]*.3gl*
 %{_datadir}/man/man3/glX*.3gl*
@@ -356,6 +358,7 @@
 %{_bindir}/cubemap
 %{_bindir}/drawpix
 %{_bindir}/engine
+%{_bindir}/fbo_firecube
 %{_bindir}/fire
 %{_bindir}/fogcoord
 %{_bindir}/fplight
@@ -402,6 +405,10 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Fri Sep 05 2008 Dave Airlie <airlied at redhat.com> 7.2-0.1
+- latest snapshot - r300 bufmgr code
+- stop building mach64, patch around some intel issues
+
 * Thu Aug 28 2008 Dave Airlie <airlied at redhat.com> 7.1-0.38
 - latest Mesa snapshot - re-enable tex offset
 - add r300 command buffer support on top of snapshot


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	14 Aug 2008 06:35:21 -0000	1.27
+++ sources	5 Sep 2008 05:48:02 -0000	1.28
@@ -1,2 +1,2 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
-937234d8b7b8528295b7080fbcf0a532  mesa-20080814.tar.bz2
+d5e2a6d63b4611ec38aaab19b8f68117  mesa-20080905.tar.bz2


--- mesa-7.1pre-nukeglthread-debug.patch DELETED ---


--- mesa-7.1pre-osmesa-version.patch DELETED ---


--- mesa-fixes.patch DELETED ---


--- r300-cmdbuf.patch DELETED ---



From airlied at fedoraproject.org  Fri Sep  5 05:50:03 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  5 Sep 2008 05:50:03 +0000 (UTC)
Subject: rpms/mesa/devel mesa.spec,1.191,1.192
Message-ID: <20080905055003.53C0470121@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28737

Modified Files:
	mesa.spec 
Log Message:
fixup kernel req



Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- mesa.spec	5 Sep 2008 05:48:02 -0000	1.191
+++ mesa.spec	5 Sep 2008 05:49:33 -0000	1.192
@@ -43,6 +43,7 @@
 BuildRequires: pkgconfig autoconf automake
 %if %{with_dri}
 BuildRequires: libdrm-devel >= 2.4.0-0.19
+BuildRequires: kernel-headers >= 2.6.27-0.305.rc5.git6
 %endif
 BuildRequires: libXxf86vm-devel
 BuildRequires: expat-devel >= 2.0



From cebbert at fedoraproject.org  Fri Sep  5 06:06:49 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri,  5 Sep 2008 06:06:49 +0000 (UTC)
Subject: rpms/kernel/devel config-powerpc32-generic, 1.20, 1.21 kernel.spec, 
	1.929, 1.930
Message-ID: <20080905060649.0E3F870121@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31998

Modified Files:
	config-powerpc32-generic kernel.spec 
Log Message:
Restore most of the dropped powerpc32 drivers.


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc32-generic,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- config-powerpc32-generic	14 Aug 2008 15:52:57 -0000	1.20
+++ config-powerpc32-generic	5 Sep 2008 06:06:18 -0000	1.21
@@ -13,28 +13,8 @@
 CONFIG_PPC_PREP=y
 
 # CONFIG_PPC_MPC5200_SIMPLE is not set
-# CONFIG_SATA_PMP is not set
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_SIL24 is not set
 CONFIG_SATA_FSL=m
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_MV is not set
 # CONFIG_SATA_NV is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_SX4 is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-# CONFIG_SATA_INIC162X is not set
-
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_MM is not set
-# CONFIG_MEGARAID_MAILBOX is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
 
 CONFIG_GIANFAR=m
 CONFIG_GFAR_NAPI=y
@@ -77,6 +57,7 @@
 CONFIG_FB_VALKYRIE=y
 CONFIG_FB_CT65550=y
 # CONFIG_BDI_SWITCH is not set
+
 CONFIG_MAC_FLOPPY=m
 # CONFIG_BLK_DEV_FD is not set
 
@@ -93,44 +74,14 @@
 # CONFIG_UDBG_RTAS_CONSOLE is not set
 CONFIG_BRIQ_PANEL=m
 
-# CONFIG_PATA_ALI is not set
+# CONFIG_ATA_PIIX is not set
 # CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-CONFIG_ATA_GENERIC=m
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_MARVELL is not set
 CONFIG_PATA_MPC52xx=m
 # CONFIG_PATA_MPIIX is not set
 # CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_NS87415 is not set
 # CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_QDI is not set
 # CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_WINBOND is not set
-
-# CONFIG_TR is not set
 
 CONFIG_SERIAL_MPC52xx=y
 CONFIG_SERIAL_MPC52xx_CONSOLE=y
@@ -151,22 +102,12 @@
 CONFIG_HIGH_RES_TIMERS=y
 
 # CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_BLK_DEV_4DRIVES is not set
 # CONFIG_BLK_DEV_ALI14XX is not set
 # CONFIG_BLK_DEV_DTC2278 is not set
 # CONFIG_BLK_DEV_HT6560B is not set
 # CONFIG_BLK_DEV_QD65XX is not set
 # CONFIG_BLK_DEV_UMC8672 is not set
-# CONFIG_BLK_DEV_DELKIN is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_SX8 is not set
-
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
 
 # CONFIG_VIRQ_DEBUG is not set
 
@@ -186,87 +127,17 @@
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_HTC_EGPIO is not set
 
-# CONFIG_PARIDE is not set
-# CONFIG_PARPORT_PC_PCMCIA is not set
-# CONFIG_MTD is not set
 # CONFIG_TIFM_CORE is not set
 
-# CONFIG_RFKILL is not set
-# CONFIG_DONGLE is not set
-# CONFIG_IP_VS is not set
-
-
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_CISS_SCSI_TAPE is not set
-# CONFIG_ATA_OVER_ETH is not set
-
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_FC_TGT_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_ARCMSR_AER is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_PPA is not set
-# CONFIG_SCSI_IMM is not set
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-
-# CONFIG_ISCSI_TCP is not set
-
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SAS_ATA is not set
-# CONFIG_SCSI_SAS_HOST_SMP is not set
-
-# CONFIG_FUSION is not set
-
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-
-# CONFIG_WLAN_80211 is not set
-
-# CONFIG_ISDN is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_PCIPCWATCHDOG is not set
-# CONFIG_WDTPCI is not set
-# CONFIG_WDT_501_PCI is not set
 
 # CONFIG_I2C_NFORCE2 is not set
 
-# CONFIG_SND_ADLIB is not set
-# CONFIG_SND_CS4236 is not set
-# CONFIG_SND_SC6000 is not set
-# CONFIG_SND_OPL3SA2 is not set
-# CONFIG_SND_MIRO is not set
-# CONFIG_SND_SB16 is not set
-# CONFIG_SND_SBAWE is not set
-# CONFIG_SND_HDA_INTEL is not set
-# CONFIG_SND_YMFPCI is not set
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
 
-# CONFIG_MMC is not set
 # CONFIG_MEMSTICK is not set
-# CONFIG_INFINIBAND is not set
 
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_TCG_TPM is not set
@@ -304,3 +175,5 @@
 # CONFIG_8xxx_WDT is not set
 
 # CONFIG_USB_MUSB_HDRC is not set
+
+CONFIG_MTD_NAND_FSL_UPM=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.929
retrieving revision 1.930
diff -u -r1.929 -r1.930
--- kernel.spec	5 Sep 2008 04:25:29 -0000	1.929
+++ kernel.spec	5 Sep 2008 06:06:18 -0000	1.930
@@ -1747,6 +1747,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Sep 05 2008 Chuck Ebbert <cebbert at redhat.com>
+- Restore most of the dropped powerpc32 drivers.
+
 * Fri Sep 05 2008 Jarod Wilson <jarod at redhat.com>
 - More lirc updates:
   * convert single-holder semaphores to mutexes



From jskala at fedoraproject.org  Fri Sep  5 06:17:39 2008
From: jskala at fedoraproject.org (Jiri Skala)
Date: Fri,  5 Sep 2008 06:17:39 +0000 (UTC)
Subject: rpms/iputils/F-9 iputils-20020927-arping-infiniband.patch, 1.3,
	1.4 iputils.spec, 1.60, 1.61
Message-ID: <20080905061739.A8DB670121@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/iputils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2374

Modified Files:
	iputils-20020927-arping-infiniband.patch iputils.spec 
Log Message:
* Thu Sep 04 2008 Jiri Skala <jskala at redhat.com> - 20071127-3
- removed a dependency on libsysfs library in arping
- Resolves: #455713 remove suid from ping
- corrected typing error in man


iputils-20020927-arping-infiniband.patch:

Index: iputils-20020927-arping-infiniband.patch
===================================================================
RCS file: /cvs/extras/rpms/iputils/F-9/iputils-20020927-arping-infiniband.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iputils-20020927-arping-infiniband.patch	18 Feb 2008 16:10:01 -0000	1.3
+++ iputils-20020927-arping-infiniband.patch	5 Sep 2008 06:17:39 -0000	1.4
@@ -1,27 +1,7 @@
-diff -up iputils-s20070202/Makefile.infiniband iputils-s20070202/Makefile
---- iputils-s20070202/Makefile.infiniband	2008-02-18 16:47:39.000000000 +0100
-+++ iputils-s20070202/Makefile	2008-02-18 16:47:39.000000000 +0100
-@@ -37,6 +37,8 @@ rdisc_srv: rdisc_srv.o
- rdisc_srv.o: rdisc.c
- 	$(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c
- 
-+arping: arping.o
-+	$(CC) $(LDFLAGS) arping.o $(LOADLIBES) $(LDLIBS) -lsysfs -o arping
- 
- check-kernel:
- ifeq ($(KERNEL_INCLUDE),)
-diff -up iputils-s20070202/arping.c.infiniband iputils-s20070202/arping.c
---- iputils-s20070202/arping.c.infiniband	2008-02-18 16:47:39.000000000 +0100
-+++ iputils-s20070202/arping.c	2008-02-18 16:50:44.000000000 +0100
-@@ -31,6 +31,7 @@
- #include <string.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-+#include <sysfs/libsysfs.h>
- 
- #include "SNAPSHOT.h"
- 
-@@ -50,8 +51,13 @@ int unicasting;
+diff -up iputils-s20071127/arping.c.infiniband iputils-s20071127/arping.c
+--- iputils-s20071127/arping.c.infiniband	2007-11-27 01:57:27.000000000 +0100
++++ iputils-s20071127/arping.c	2008-08-08 10:05:04.000000000 +0200
+@@ -50,14 +50,26 @@ int unicasting;
  int s;
  int broadcast_only;
  
@@ -37,7 +17,20 @@
  
  struct timeval start, last;
  
-@@ -124,7 +130,8 @@ int send_pack(int s, struct in_addr src,
+ int sent, brd_sent;
+ int received, brd_recv, req_recv;
+ 
++#define SYSFS_MNT_PATH          "/sys"
++#define SYSFS_CLASS             "class"
++#define SYSFS_NET               "net"
++#define SYSFS_BROADCAST         "broadcast"
++#define SYSFS_PATH_ENV          "SYSFS_PATH"
++#define SYSFS_PATH_LEN          256
++
+ #define MS_TDIFF(tv1,tv2) ( ((tv1).tv_sec-(tv2).tv_sec)*1000 + \
+ 			   ((tv1).tv_usec-(tv2).tv_usec)/1000 )
+ 
+@@ -124,7 +136,8 @@ int send_pack(int s, struct in_addr src,
  	p+=4;
  
  	gettimeofday(&now, NULL);
@@ -47,7 +40,7 @@
  	if (err == p-buf) {
  		last = now;
  		sent++;
-@@ -172,7 +179,7 @@ void catcher(void)
+@@ -172,7 +185,7 @@ void catcher(void)
  		finish();
  
  	if (last.tv_sec==0 || MS_TDIFF(tv,last) > 500) {
@@ -56,7 +49,7 @@
  		if (count == 0 && unsolicited)
  			finish();
  	}
-@@ -219,7 +226,7 @@ int recv_pack(unsigned char *buf, int le
+@@ -219,7 +232,7 @@ int recv_pack(unsigned char *buf, int le
  		return 0;
  	if (ah->ar_pln != 4)
  		return 0;
@@ -65,7 +58,7 @@
  		return 0;
  	if (len < sizeof(*ah) + 2*(4 + ah->ar_hln))
  		return 0;
-@@ -230,7 +237,7 @@ int recv_pack(unsigned char *buf, int le
+@@ -230,7 +243,7 @@ int recv_pack(unsigned char *buf, int le
  			return 0;
  		if (src.s_addr != dst_ip.s_addr)
  			return 0;
@@ -74,7 +67,7 @@
  			return 0;
  	} else {
  		/* DAD packet was:
-@@ -248,7 +255,7 @@ int recv_pack(unsigned char *buf, int le
+@@ -248,7 +261,7 @@ int recv_pack(unsigned char *buf, int le
  		 */
  		if (src_ip.s_addr != dst.s_addr)
  			return 0;
@@ -83,7 +76,7 @@
  			return 0;
  		if (src.s_addr && src.s_addr != dst_ip.s_addr)
  			return 0;
-@@ -264,7 +271,7 @@ int recv_pack(unsigned char *buf, int le
+@@ -264,7 +277,7 @@ int recv_pack(unsigned char *buf, int le
  			printf("for %s ", inet_ntoa(dst_ip));
  			s_printed = 1;
  		}
@@ -92,7 +85,7 @@
  			if (!s_printed)
  				printf("for ");
  			printf("[");
-@@ -290,7 +297,7 @@ int recv_pack(unsigned char *buf, int le
+@@ -290,12 +303,69 @@ int recv_pack(unsigned char *buf, int le
  	if (quit_on_reply)
  		finish();
  	if(!broadcast_only) {
@@ -101,7 +94,69 @@
  		unicasting=1;
  	}
  	return 1;
-@@ -459,9 +466,9 @@ main(int argc, char **argv)
+ }
+ 
++int get_sysfs_mnt_path(char *mnt_path, size_t len)
++{
++        const char *sysfs_path_env;
++        int pth_len=0;
++
++        if (len == 0 || mnt_path == NULL)
++                return -1;
++
++        /* possible overrride of real mount path */
++        sysfs_path_env = getenv(SYSFS_PATH_ENV);
++        memset(mnt_path, 0, len);
++        strncpy(mnt_path,
++                sysfs_path_env != NULL ? sysfs_path_env : SYSFS_MNT_PATH,
++                len-1);
++
++        if ((pth_len = strlen(mnt_path)) > 0 && mnt_path[pth_len-1] == '/')
++                mnt_path[pth_len-1] = '\0';
++
++        return 0;
++}
++
++int make_sysfs_broadcast_path(char *broadcast_path, size_t len)
++{
++        char mnt_path[SYSFS_PATH_LEN];
++
++        if (get_sysfs_mnt_path(mnt_path, len) != 0)
++                return -1;
++
++        snprintf(broadcast_path, len,
++                "%s/" SYSFS_CLASS "/" SYSFS_NET "/%s/" SYSFS_BROADCAST,
++                mnt_path, device);
++
++        return 0;
++}
++
++char * read_sysfs_broadcast(char *brdcast_path)
++{
++        int fd;
++        int len_to_read;
++        char *brdcast = NULL;
++
++        if ((fd = open(brdcast_path, O_RDONLY)) > -1) {
++                len_to_read = lseek(fd, 0L, SEEK_END);
++                if ((brdcast = malloc(len_to_read+1)) != NULL) {
++                        lseek(fd, 0L, SEEK_SET);
++                        memset(brdcast, 0, len_to_read+1);
++                        if (read(fd, brdcast, len_to_read) == -1) {
++                                free(brdcast);
++                                brdcast = NULL;
++                        }
++                }
++                close(fd);
++        }
++
++        return brdcast;
++}
++
+ int
+ main(int argc, char **argv)
+ {
+@@ -459,9 +529,9 @@ main(int argc, char **argv)
  		close(probe_fd);
  	};
  
@@ -114,7 +169,7 @@
  	if (bind(s, (struct sockaddr*)&me, sizeof(me)) == -1) {
  		perror("bind");
  		exit(2);
-@@ -474,14 +481,37 @@ main(int argc, char **argv)
+@@ -474,14 +544,33 @@ main(int argc, char **argv)
  			exit(2);
  		}
  	}
@@ -124,39 +179,34 @@
  			printf("Interface \"%s\" is not ARPable (no ll address)\n", device);
  		exit(dad?0:2);
  	}
--
--	he = me;
--	memset(he.sll_addr, -1, he.sll_halen);
 +	he[0] = me[0];
 +	he[1] = me[1];
 +	{
-+		struct sysfs_class_device *dev;
-+		struct sysfs_attribute *brdcast;
-+		char *next_ch;
-+
-+		dev = sysfs_open_class_device("net", device);
-+		if (!dev) {
-+			perror("sysfs class device");
-+			exit(2);
-+		}
-+		brdcast = sysfs_get_classdev_attr(dev, "broadcast");
-+		if (!brdcast) {
-+			perror("sysfs attribute broadcast");
-+			exit(2);
-+		}
-+		if (sysfs_read_attribute(brdcast)) {
-+			perror("sysfs read brdcast");
-+			exit(2);
-+		}
-+		for (ch=0; ch<he[0].sll_halen; ch++) {
-+			he[0].sll_addr[ch] = strtol(brdcast->value + (ch*3),
-+						    &next_ch, 16);
-+		}
++                char brdcast_path[SYSFS_PATH_LEN];
++                char *brdcast_val;
++                char *next_ch;
++
++                if (make_sysfs_broadcast_path(brdcast_path, sizeof brdcast_path) != 0) {
++                        perror("sysfs attribute broadcast");
++                        exit(2);
++                }
++
++                if ((brdcast_val = read_sysfs_broadcast(brdcast_path)) == NULL) {
++                        perror("sysfs read broadcast value");
++                        exit(2);
++                }
++                for (ch=0; ch<he[0].sll_halen; ch++) {
++                        he[0].sll_addr[ch] = strtol(brdcast_val + (ch*3), &next_ch, 16);
++                }
+ 
+-	he = me;
+-	memset(he.sll_addr, -1, he.sll_halen);
++                free(brdcast_val);
 +	}
  
  	if (!quiet) {
  		printf("ARPING %s ", inet_ntoa(dst));
-@@ -501,7 +531,7 @@ main(int argc, char **argv)
+@@ -501,12 +590,12 @@ main(int argc, char **argv)
  	while(1) {
  		sigset_t sset, osset;
  		unsigned char packet[4096];
@@ -165,7 +215,13 @@
  		socklen_t alen = sizeof(from);
  		int cc;
  
-@@ -514,7 +544,7 @@ main(int argc, char **argv)
+ 		if ((cc = recvfrom(s, packet, sizeof(packet), 0,
+-				   (struct sockaddr *)&from, &alen)) < 0) {
++				   (struct sockaddr *)&from[0], &alen)) < 0) {
+ 			perror("arping: recvfrom");
+ 			continue;
+ 		}
+@@ -514,7 +603,7 @@ main(int argc, char **argv)
  		sigaddset(&sset, SIGALRM);
  		sigaddset(&sset, SIGINT);
  		sigprocmask(SIG_BLOCK, &sset, &osset);
@@ -174,3 +230,15 @@
  		sigprocmask(SIG_SETMASK, &osset, NULL);
  	}
  }
+diff -up iputils-s20071127/Makefile.infiniband iputils-s20071127/Makefile
+--- iputils-s20071127/Makefile.infiniband	2008-08-08 09:17:35.000000000 +0200
++++ iputils-s20071127/Makefile	2008-08-08 10:02:10.000000000 +0200
+@@ -37,6 +37,8 @@ rdisc_srv: rdisc_srv.o
+ rdisc_srv.o: rdisc.c
+ 	$(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c
+ 
++arping: arping.o
++	$(CC) $(LDFLAGS) arping.o $(LOADLIBES) $(LDLIBS) -o arping
+ 
+ check-kernel:
+ ifeq ($(KERNEL_INCLUDE),)


Index: iputils.spec
===================================================================
RCS file: /cvs/extras/rpms/iputils/F-9/iputils.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- iputils.spec	5 Aug 2008 13:40:38 -0000	1.60
+++ iputils.spec	5 Sep 2008 06:17:39 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping
 Name: iputils
 Version: 20071127
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 URL: http://www.skbuff.net/iputils
 Group: System Environment/Daemons
@@ -27,9 +27,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: docbook-utils perl-SGMLSpm
 BuildRequires: glibc-kernheaders >= 2.4-8.19
-BuildRequires: libsysfs-devel
 BuildRequires: libidn-devel
 Requires(post): /sbin/chkconfig
+Requires(post): /usr/sbin/setcap
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
@@ -115,6 +115,9 @@
 %post
 /sbin/chkconfig --add rdisc
 
+/usr/sbin/setcap cap_net_raw=ep /bin/ping
+/usr/sbin/setcap cap_net_raw=ep /bin/ping6
+
 %preun
 if [ $1 = 0 ]; then
    service rdisc stop >/dev/null 2>&1
@@ -140,15 +143,15 @@
 %ifos linux
 /sbin/arping
 %{_sbindir}/arping
-%attr(4755,root,root) /bin/ping
+%attr(0755,root,root) /bin/ping
 /sbin/ifenslave
 %else
-%attr(4755,root,root) %{_sbindir}/ping
+%attr(0755,root,root) %{_sbindir}/ping
 %{_sbindir}/arping
 %{_sbindir}/ifenslave
 %endif
 /sbin/rdisc
-%attr(4755,root,root) /bin/ping6
+%attr(0755,root,root) /bin/ping6
 /bin/tracepath
 /bin/tracepath6
 %{_sbindir}/ping6
@@ -158,6 +161,11 @@
 %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Thu Sep 04 2008 Jiri Skala <jskala at redhat.com> - 20071127-3
+- removed a dependency on libsysfs library in arping
+- Resolves: #455713 remove suid from ping
+- corrected typing error in man
+
 * Tue Mar 25 2008 Martin Nagy <mnagy at redhat.com> - 20071127-2
 - fix inconsistent behaviour of ping (#360881)
 



From airlied at fedoraproject.org  Fri Sep  5 06:29:57 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  5 Sep 2008 06:29:57 +0000 (UTC)
Subject: rpms/kernel/devel drm-modesetting-radeon.patch, 1.20,
	1.21 kernel.spec, 1.930, 1.931
Message-ID: <20080905062957.B8B1170121@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5231

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Fri Sep 05 2008 Dave Airlie <airlied at redhat.com>
- introduce radeon suspend/resume + change pin api


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- drm-modesetting-radeon.patch	5 Sep 2008 01:28:57 -0000	1.20
+++ drm-modesetting-radeon.patch	5 Sep 2008 06:29:56 -0000	1.21
@@ -1,9 +1,29 @@
-commit 6d533f4ec5624d7d294f5ce5d698c30d4382b4bd
+commit 7111e3e07597d2eaeea9e39e22e9228458eb615b
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Sep 5 11:26:55 2008 +1000
 
     drm: export drm_i915_flip_t type to userspace to build Mesa
 
+commit b27e23f97a6896b0b9fb3981fbcc78246598fb1d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Sep 5 16:12:59 2008 +1000
+
+    radeon: further suspend/resume support
+
+commit a17cee00496d74239715d8a8b653a87e8703201e
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Aug 29 14:52:15 2008 +1000
+
+    radeon: add initial suspend/resume support
+    
+    this gets us back to fbcon.. its dirty like zebra
+
+commit 0eea7b4958401d85f6191ee6fcd095eaff569052
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Aug 29 14:51:46 2008 +1000
+
+    drm/modesetting: add helper to force restore modes on crtcs at resume time
+
 commit 3b5d57a098300ad79dd2693e4480a83d7fd2298c
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Sep 5 11:15:03 2008 +1000
@@ -1608,10 +1628,10 @@
  	return -EINVAL;
 diff --git a/drivers/gpu/drm/drm_bo.c b/drivers/gpu/drm/drm_bo.c
 new file mode 100644
-index 0000000..d2d7d9d
+index 0000000..6ef99d2
 --- /dev/null
 +++ b/drivers/gpu/drm/drm_bo.c
-@@ -0,0 +1,2062 @@
+@@ -0,0 +1,2109 @@
 +/**************************************************************************
 + *
 + * Copyright (c) 2006-2007 Tungsten Graphics, Inc., Cedar Park, TX., USA
@@ -2125,6 +2145,7 @@
 +		entry = list_entry(list, struct drm_buffer_object, ddestroy);
 +
 +		nentry = NULL;
++		DRM_DEBUG("bo is %p, %d\n", entry, entry->num_pages);
 +		if (next != &bm->ddestroy) {
 +			nentry = list_entry(next, struct drm_buffer_object,
 +					    ddestroy);
@@ -2935,14 +2956,15 @@
 +
 +	int ret;
 +
-+	DRM_DEBUG("Proposed flags 0x%016llx, Old flags 0x%016llx\n",
-+		  (unsigned long long) bo->mem.proposed_flags,
-+		  (unsigned long long) bo->mem.flags);
 +
 +	ret = drm_bo_modify_proposed_flags (bo, flags, mask);
 +	if (ret)
 +		return ret;
 +
++	DRM_DEBUG("Proposed flags 0x%016llx, Old flags 0x%016llx\n",
++		  (unsigned long long) bo->mem.proposed_flags,
++		  (unsigned long long) bo->mem.flags);
++
 +	ret = drm_bo_wait_unmapped(bo, no_wait);
 +	if (ret)
 +		return ret;
@@ -3674,6 +3696,51 @@
 +
 +	return 0;
 +}
++
++/* used to EVICT VRAM lru at suspend time */
++void drm_bo_evict_mm(struct drm_device *dev, int mem_type, int no_wait)
++{
++	struct drm_buffer_manager *bm = &dev->bm;
++	struct drm_mem_type_manager *man = &bm->man[mem_type];
++	struct drm_buffer_object *entry;
++	/* we need to migrate all objects in VRAM */
++	struct list_head *lru;
++	int ret;
++	/* evict all buffers on the LRU - won't evict pinned buffers */
++
++	mutex_lock(&dev->struct_mutex);
++	do {
++		lru = &man->lru;
++
++		if (lru->next == lru) {
++			DRM_ERROR("lru empty\n");
++			break;
++		}
++
++		entry = list_entry(lru->next, struct drm_buffer_object, lru);
++		atomic_inc(&entry->usage);
++		mutex_unlock(&dev->struct_mutex);
++		mutex_lock(&entry->mutex);
++
++		DRM_ERROR("Evicting %p %d\n", entry, entry->num_pages);
++		ret = drm_bo_evict(entry, mem_type, no_wait);
++		mutex_unlock(&entry->mutex);
++
++		if (ret)
++			DRM_ERROR("Evict failed for BO\n");
++
++		mutex_lock(&entry->mutex);
++		(void)drm_bo_expire_fence(entry, 0);
++		mutex_unlock(&entry->mutex);
++		drm_bo_usage_deref_unlocked(&entry);
++
++		mutex_lock(&dev->struct_mutex);
++	} while(0);
++
++	mutex_unlock(&dev->struct_mutex);
++
++}
++EXPORT_SYMBOL(drm_bo_evict_mm);
 diff --git a/drivers/gpu/drm/drm_bo_move.c b/drivers/gpu/drm/drm_bo_move.c
 new file mode 100644
 index 0000000..7a4b95b
@@ -7023,10 +7090,10 @@
 +}
 diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
 new file mode 100644
-index 0000000..708354a
+index 0000000..b507315
 --- /dev/null
 +++ b/drivers/gpu/drm/drm_crtc_helper.c
-@@ -0,0 +1,787 @@
+@@ -0,0 +1,805 @@
 +/* (c) 2006-2007 Intel Corporation
 + * Copyright (c) 2007 Dave Airlie <airlied at linux.ie>
 + *
@@ -7813,7 +7880,25 @@
 +}
 +EXPORT_SYMBOL(drm_helper_mode_fill_fb_struct);
 +
++int drm_helper_resume_force_mode(struct drm_device *dev)
++{
++	struct drm_crtc *crtc;
++	int ret;
++
++	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
++
++		if (!crtc->enabled)
++			continue;
++		
++		ret = drm_crtc_helper_set_mode(crtc, &crtc->mode, crtc->x,
++					       crtc->y);
 +
++		if (ret == false)
++			DRM_ERROR("failed to set mode on crtc %p\n", crtc);
++	}
++	return 0;
++}
++EXPORT_SYMBOL(drm_helper_resume_force_mode);
 diff --git a/drivers/gpu/drm/drm_dma.c b/drivers/gpu/drm/drm_dma.c
 index 7a8e2fb..0b2df71 100644
 --- a/drivers/gpu/drm/drm_dma.c
@@ -8776,10 +8861,10 @@
 +EXPORT_SYMBOL(drm_add_edid_modes);
 diff --git a/drivers/gpu/drm/drm_fence.c b/drivers/gpu/drm/drm_fence.c
 new file mode 100644
-index 0000000..7130d1b
+index 0000000..f1c386c
 --- /dev/null
 +++ b/drivers/gpu/drm/drm_fence.c
-@@ -0,0 +1,543 @@
+@@ -0,0 +1,540 @@
 +/**************************************************************************
 + *
 + * Copyright (c) 2006-2007 Tungsten Graphics, Inc., Cedar Park, TX., USA
@@ -9163,7 +9248,6 @@
 +	if (driver->wait)
 +		return driver->wait(fence, lazy, !ignore_signals, mask);
 +
-+
 +	drm_fence_object_flush(fence, mask);
 +	if (driver->has_irq(dev, fence->fence_class, mask)) {
 +		if (!ignore_signals)
@@ -9191,8 +9275,6 @@
 +}
 +EXPORT_SYMBOL(drm_fence_object_wait);
 +
-+
-+
 +int drm_fence_object_emit(struct drm_fence_object *fence, uint32_t fence_flags,
 +			  uint32_t fence_class, uint32_t type)
 +{
@@ -20457,7 +20539,7 @@
 +
 +#endif /* _I915_REG_H_ */
 diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile
-index feb521e..a802a28 100644
+index feb521e..f611328 100644
 --- a/drivers/gpu/drm/radeon/Makefile
 +++ b/drivers/gpu/drm/radeon/Makefile
 @@ -3,7 +3,11 @@
@@ -20469,7 +20551,7 @@
 +	    radeon_gem.o radeon_buffer.o radeon_fence.o radeon_cs.o \
 +	    radeon_i2c.o radeon_fb.o radeon_encoders.o radeon_connectors.o radeon_display.o \
 +	    atombios_crtc.o atom.o radeon_atombios.o radeon_combios.o radeon_legacy_crtc.o \
-+	    radeon_legacy_encoders.o radeon_cursor.o
++	    radeon_legacy_encoders.o radeon_cursor.o radeon_pm.o
  
  radeon-$(CONFIG_COMPAT) += radeon_ioc32.o
  
@@ -21173,10 +21255,10 @@
 +#endif
 diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c
 new file mode 100644
-index 0000000..33fb02f
+index 0000000..2a660a4
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/atom.c
-@@ -0,0 +1,1145 @@
+@@ -0,0 +1,1143 @@
 +/*
 + * Copyright 2008 Advanced Micro Devices, Inc.  
 + *
@@ -21449,7 +21531,6 @@
 +	if(print)
 +	    DEBUG("MC[0x%02X]", idx);
 +	val = gctx->card->mc_read(gctx->card, idx);
-+	printk(KERN_INFO "MC registers are not implemented.\n");
 +	return 0;
 +    }
 +    if(saved)
@@ -21631,7 +21712,6 @@
 +	(*ptr)++;
 +	DEBUG("MC[0x%02X]", idx);
 +	gctx->card->mc_write(gctx->card, idx, val);
-+	printk(KERN_INFO "MC registers are not implemented.\n");
 +	return;
 +    }
 +    switch(align) {
@@ -30455,7 +30535,7 @@
 +	return NULL;
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
-index 248ab4a..e96037e 100644
+index 248ab4a..8994326 100644
 --- a/drivers/gpu/drm/radeon/radeon_cp.c
 +++ b/drivers/gpu/drm/radeon/radeon_cp.c
 @@ -31,6 +31,7 @@
@@ -30547,9 +30627,7 @@
 -	drm_radeon_private_t *dev_priv = dev->dev_private;
 +	if (!(dev_priv->pll_errata & CHIP_ERRATA_PLL_DUMMYREADS))
 +		return;
- 
--	RADEON_WRITE8(RADEON_CLOCK_CNTL_INDEX, addr & 0x1f);
--	return RADEON_READ(RADEON_CLOCK_CNTL_DATA);
++
 +	(void)RADEON_READ(RADEON_CLOCK_CNTL_DATA);
 +	(void)RADEON_READ(RADEON_CRTC_GEN_CNTL);
 +}
@@ -30577,7 +30655,9 @@
 +		RADEON_WRITE(RADEON_CLOCK_CNTL_INDEX, save);
 +	}
 +}
-+
+ 
+-	RADEON_WRITE8(RADEON_CLOCK_CNTL_INDEX, addr & 0x1f);
+-	return RADEON_READ(RADEON_CLOCK_CNTL_DATA);
 +u32 RADEON_READ_PLL(struct drm_radeon_private *dev_priv, int addr)
 +{
 +	uint32_t data;
@@ -30647,7 +30727,15 @@
  		RADEON_WRITE(R500_SU_REG_DEST, ((1 << dev_priv->num_gb_pipes) - 1));
  	}
  	RADEON_WRITE(R300_GB_TILE_CONFIG, gb_tile_config);
-@@ -492,15 +614,15 @@ static int radeon_do_engine_reset(struct drm_device * dev)
+@@ -397,7 +519,6 @@ static void radeon_do_cp_flush(drm_radeon_private_t * dev_priv)
+ 	DRM_DEBUG("\n");
+ #if 0
+ 	u32 tmp;
+-
+ 	tmp = RADEON_READ(RADEON_CP_RB_WPTR) | (1 << 31);
+ 	RADEON_WRITE(RADEON_CP_RB_WPTR, tmp);
+ #endif
+@@ -492,15 +613,15 @@ static int radeon_do_engine_reset(struct drm_device * dev)
  	if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV410) {
  		/* may need something similar for newer chips */
  		clock_cntl_index = RADEON_READ(RADEON_CLOCK_CNTL_INDEX);
@@ -30672,7 +30760,7 @@
  	}
  
  	rbbm_soft_reset = RADEON_READ(RADEON_RBBM_SOFT_RESET);
-@@ -525,7 +647,7 @@ static int radeon_do_engine_reset(struct drm_device * dev)
+@@ -525,7 +646,7 @@ static int radeon_do_engine_reset(struct drm_device * dev)
  	RADEON_READ(RADEON_RBBM_SOFT_RESET);
  
  	if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV410) {
@@ -30681,7 +30769,7 @@
  		RADEON_WRITE(RADEON_CLOCK_CNTL_INDEX, clock_cntl_index);
  		RADEON_WRITE(RADEON_RBBM_SOFT_RESET, rbbm_soft_reset);
  	}
-@@ -541,7 +663,8 @@ static int radeon_do_engine_reset(struct drm_device * dev)
+@@ -541,7 +662,8 @@ static int radeon_do_engine_reset(struct drm_device * dev)
  	dev_priv->cp_running = 0;
  
  	/* Reset any pending vertex, indirect buffers */
@@ -30691,7 +30779,7 @@
  
  	return 0;
  }
-@@ -559,9 +682,13 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev,
+@@ -559,9 +681,13 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev,
  	 */
  	if (!dev_priv->new_memmap)
  		radeon_write_fb_location(dev_priv,
@@ -30708,7 +30796,7 @@
  #if __OS_HAS_AGP
  	if (dev_priv->flags & RADEON_IS_AGP) {
  		radeon_write_agp_base(dev_priv, dev->agp->base);
-@@ -569,7 +696,7 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev,
+@@ -569,7 +695,7 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev,
  		radeon_write_agp_location(dev_priv,
  			     (((dev_priv->gart_vm_start - 1 +
  				dev_priv->gart_size) & 0xffff0000) |
@@ -30717,7 +30805,7 @@
  
  		ring_start = (dev_priv->cp_ring->offset
  			      - dev->agp->base
-@@ -591,6 +718,12 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev,
+@@ -591,6 +717,12 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev,
  	SET_RING_HEAD(dev_priv, cur_read_ptr);
  	dev_priv->ring.tail = cur_read_ptr;
  
@@ -30730,7 +30818,16 @@
  #if __OS_HAS_AGP
  	if (dev_priv->flags & RADEON_IS_AGP) {
  		RADEON_WRITE(RADEON_CP_RB_RPTR_ADDR,
-@@ -639,9 +772,14 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev,
+@@ -626,8 +758,6 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev,
+ 		     dev_priv->ring.size_l2qw);
+ #endif
+ 
+-	/* Start with assuming that writeback doesn't work */
+-	dev_priv->writeback_works = 0;
+ 
+ 	/* Initialize the scratch register pointer.  This will cause
+ 	 * the scratch register values to be written out to memory
+@@ -639,9 +769,14 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev,
  	RADEON_WRITE(RADEON_SCRATCH_ADDR, RADEON_READ(RADEON_CP_RB_RPTR_ADDR)
  		     + RADEON_SCRATCH_REG_OFFSET);
  
@@ -30748,7 +30845,7 @@
  
  	RADEON_WRITE(RADEON_SCRATCH_UMSK, 0x7);
  
-@@ -649,39 +787,50 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev,
+@@ -649,39 +784,50 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev,
  	tmp = RADEON_READ(RADEON_BUS_CNTL) & ~RADEON_BUS_MASTER_DIS;
  	RADEON_WRITE(RADEON_BUS_CNTL, tmp);
  
@@ -30809,7 +30906,7 @@
  		    0xdeadbeef)
  			break;
  		DRM_UDELAY(1);
-@@ -700,9 +849,8 @@ static void radeon_test_writeback(drm_radeon_private_t * dev_priv)
+@@ -700,9 +846,8 @@ static void radeon_test_writeback(drm_radeon_private_t * dev_priv)
  	}
  
  	if (!dev_priv->writeback_works) {
@@ -30821,7 +30918,7 @@
  		RADEON_WRITE(RADEON_SCRATCH_UMSK, 0);
  	}
  }
-@@ -714,11 +862,12 @@ static void radeon_set_igpgart(drm_radeon_private_t * dev_priv, int on)
+@@ -714,11 +859,12 @@ static void radeon_set_igpgart(drm_radeon_private_t * dev_priv, int on)
  
  	if (on) {
  		DRM_DEBUG("programming igp gart %08X %08lX %08X\n",
@@ -30837,7 +30934,7 @@
  		if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690)
  			IGP_WRITE_MCIND(RS480_MC_MISC_CNTL, (RS480_GART_INDEX_REG_EN |
  							     RS690_BLOCK_GFX_D3_EN));
-@@ -742,13 +891,20 @@ static void radeon_set_igpgart(drm_radeon_private_t * dev_priv, int on)
+@@ -742,13 +888,20 @@ static void radeon_set_igpgart(drm_radeon_private_t * dev_priv, int on)
  		IGP_WRITE_MCIND(RS480_AGP_MODE_CNTL, ((1 << RS480_REQ_TYPE_SNOOP_SHIFT) |
  						      RS480_REQ_TYPE_SNOOP_DIS));
  
@@ -30862,7 +30959,7 @@
  
  		temp = IGP_READ_MCIND(dev_priv, RS480_AGP_ADDRESS_SPACE_SIZE);
  		IGP_WRITE_MCIND(RS480_AGP_ADDRESS_SPACE_SIZE, (RS480_GART_EN |
-@@ -759,7 +915,7 @@ static void radeon_set_igpgart(drm_radeon_private_t * dev_priv, int on)
+@@ -759,7 +912,7 @@ static void radeon_set_igpgart(drm_radeon_private_t * dev_priv, int on)
  			if ((temp & RS480_GART_CACHE_INVALIDATE) == 0)
  				break;
  			DRM_UDELAY(1);
@@ -30871,7 +30968,7 @@
  
  		IGP_WRITE_MCIND(RS480_GART_CACHE_CNTRL,
  				RS480_GART_CACHE_INVALIDATE);
-@@ -769,7 +925,7 @@ static void radeon_set_igpgart(drm_radeon_private_t * dev_priv, int on)
+@@ -769,7 +922,7 @@ static void radeon_set_igpgart(drm_radeon_private_t * dev_priv, int on)
  			if ((temp & RS480_GART_CACHE_INVALIDATE) == 0)
  				break;
  			DRM_UDELAY(1);
@@ -30880,7 +30977,7 @@
  
  		IGP_WRITE_MCIND(RS480_GART_CACHE_CNTRL, 0);
  	} else {
-@@ -796,7 +952,7 @@ static void radeon_set_pciegart(drm_radeon_private_t * dev_priv, int on)
+@@ -796,7 +949,7 @@ static void radeon_set_pciegart(drm_radeon_private_t * dev_priv, int on)
  				  dev_priv->gart_vm_start +
  				  dev_priv->gart_size - 1);
  
@@ -30889,7 +30986,7 @@
  
  		RADEON_WRITE_PCIE(RADEON_PCIE_TX_GART_CNTL,
  				  RADEON_PCIE_TX_GART_EN);
-@@ -807,7 +963,7 @@ static void radeon_set_pciegart(drm_radeon_private_t * dev_priv, int on)
+@@ -807,7 +960,7 @@ static void radeon_set_pciegart(drm_radeon_private_t * dev_priv, int on)
  }
  
  /* Enable or disable PCI GART on the chip */
@@ -30898,7 +30995,7 @@
  {
  	u32 tmp;
  
-@@ -840,7 +996,7 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on)
+@@ -840,7 +993,7 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on)
  
  		/* Turn off AGP aperture -- is this required for PCI GART?
  		 */
@@ -30907,7 +31004,7 @@
  		RADEON_WRITE(RADEON_AGP_COMMAND, 0);	/* clear AGP_COMMAND */
  	} else {
  		RADEON_WRITE(RADEON_AIC_CNTL,
-@@ -848,9 +1004,11 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on)
+@@ -848,9 +1001,11 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on)
  	}
  }
  
@@ -30920,7 +31017,7 @@
  
  	DRM_DEBUG("\n");
  
-@@ -888,17 +1046,6 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
+@@ -888,17 +1043,6 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
  	 */
  	dev_priv->vblank_crtc = DRM_RADEON_VBLANK_CRTC1;
  
@@ -30938,7 +31035,7 @@
  	dev_priv->do_boxes = 0;
  	dev_priv->cp_mode = init->cp_mode;
  
-@@ -946,9 +1093,8 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
+@@ -946,9 +1090,8 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
  	 */
  	dev_priv->depth_clear.rb3d_cntl = (RADEON_PLANE_MASK_ENABLE |
  					   (dev_priv->color_fmt << 10) |
@@ -30950,7 +31047,7 @@
  	dev_priv->depth_clear.rb3d_zstencilcntl =
  	    (dev_priv->depth_fmt |
  	     RADEON_Z_TEST_ALWAYS |
-@@ -975,8 +1121,8 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
+@@ -975,8 +1118,8 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
  	dev_priv->buffers_offset = init->buffers_offset;
  	dev_priv->gart_textures_offset = init->gart_textures_offset;
  
@@ -30961,7 +31058,7 @@
  		DRM_ERROR("could not find sarea!\n");
  		radeon_do_cleanup_cp(dev);
  		return -EINVAL;
-@@ -1012,10 +1158,6 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
+@@ -1012,10 +1155,6 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
  		}
  	}
  
@@ -30972,7 +31069,7 @@
  #if __OS_HAS_AGP
  	if (dev_priv->flags & RADEON_IS_AGP) {
  		drm_core_ioremap(dev_priv->cp_ring, dev);
-@@ -1145,28 +1287,41 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
+@@ -1145,28 +1284,41 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
  		dev_priv->gart_info.table_mask = DMA_BIT_MASK(32);
  		/* if we have an offset set from userspace */
  		if (dev_priv->pcigart_offset_set) {
@@ -31034,7 +31131,7 @@
  			if (dev_priv->flags & RADEON_IS_IGPGART)
  				dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_IGP;
  			else
-@@ -1175,12 +1330,7 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
+@@ -1175,12 +1327,7 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
  			    DRM_ATI_GART_MAIN;
  			dev_priv->gart_info.addr = NULL;
  			dev_priv->gart_info.bus_addr = 0;
@@ -31048,6 +31145,16 @@
  		}
  
  		if (!drm_ati_pcigart_init(dev, &dev_priv->gart_info)) {
+@@ -1193,6 +1340,9 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
+ 		radeon_set_pcigart(dev_priv, 1);
+ 	}
+ 
++	/* Start with assuming that writeback doesn't work */
++	dev_priv->writeback_works = 0;
++
+ 	radeon_cp_load_microcode(dev_priv);
+ 	radeon_cp_init_ring_buffer(dev, dev_priv);
+ 
 @@ -1237,14 +1387,16 @@ static int radeon_do_cleanup_cp(struct drm_device * dev)
  		if (dev_priv->gart_info.bus_addr) {
  			/* Turn off PCI GART */
@@ -31178,7 +31285,7 @@
  	LOCK_TEST_WITH_RETURN(dev, file_priv);
  
  	return radeon_do_engine_reset(dev);
-@@ -1688,6 +1866,553 @@ int radeon_cp_buffers(struct drm_device *dev, void *data, struct drm_file *file_
+@@ -1688,6 +1866,602 @@ int radeon_cp_buffers(struct drm_device *dev, void *data, struct drm_file *file_
  	return ret;
  }
  
@@ -31611,14 +31718,64 @@
 +	
 +}
 +
-+int radeon_modeset_cp_init(struct drm_device *dev)
++int radeon_modeset_cp_suspend(struct drm_device *dev)
++{
++	drm_radeon_private_t *dev_priv = dev->dev_private;
++	int ret;
++
++	ret = radeon_do_cp_idle(dev_priv);
++	if (ret)
++		DRM_ERROR("failed to idle CP on suspend\n");
++
++	radeon_do_cp_stop(dev_priv);
++	radeon_do_engine_reset(dev);
++	if (dev_priv->flags & RADEON_IS_AGP) {
++	} else {
++		radeon_set_pcigart(dev_priv, 0);
++	}
++	
++	return 0;
++}
++
++int radeon_modeset_cp_resume(struct drm_device *dev)
 +{
 +	drm_radeon_private_t *dev_priv = dev->dev_private;
 +	uint32_t tmp;
 +
++	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_flush(dev);
++
++	DRM_ERROR("microcode loading\n");
++	radeon_cp_load_microcode(dev_priv);
++	radeon_cp_init_ring_buffer(dev, dev_priv);
++
++	DRM_ERROR("engine init\n");
++	radeon_do_engine_reset(dev);
++
++	radeon_do_cp_start(dev_priv);
++	return 0;
++}
++
++int radeon_modeset_cp_init(struct drm_device *dev)
++{
++	drm_radeon_private_t *dev_priv = dev->dev_private;
++
 +	/* allocate a ring and ring rptr bits from GART space */
 +	/* these are allocated in GEM files */
 +	
++	/* Start with assuming that writeback doesn't work */
++	dev_priv->writeback_works = 0;
++
 +	dev_priv->usec_timeout = RADEON_DEFAULT_CP_TIMEOUT;
 +	dev_priv->ring.size = RADEON_DEFAULT_RING_SIZE;
 +	dev_priv->cp_mode = RADEON_CSQ_PRIBM_INDBM;
@@ -31637,23 +31794,8 @@
 +	dev_priv->new_memmap = true;
 +
 +	r300_init_reg_flags(dev);
-+		
-+	radeon_cp_load_microcode(dev_priv);
 +	
-+	DRM_DEBUG("ring offset is %x %x\n", dev_priv->mm.ring.bo->offset, dev_priv->mm.ring_read.bo->offset);
-+
-+	radeon_cp_init_ring_buffer(dev, dev_priv);
-+
-+	/* need to enable BUS mastering in Buscntl */
-+	tmp = RADEON_READ(RADEON_BUS_CNTL);
-+	tmp &= ~RADEON_BUS_MASTER_DIS;
-+	RADEON_WRITE(RADEON_BUS_CNTL, tmp);
-+
-+	radeon_do_engine_reset(dev);
-+	radeon_test_writeback(dev_priv);
-+
-+	radeon_do_cp_start(dev_priv);
-+	return 0;
++	return radeon_modeset_cp_resume(dev);
 +}
 +
 +static bool radeon_get_bios(struct drm_device *dev)
@@ -31728,11 +31870,25 @@
 +	return 0;
 +}
 +
++int radeon_static_clocks_init(struct drm_device *dev)
++{
++	drm_radeon_private_t *dev_priv = dev->dev_private;
++
++	if ((dev_priv->flags & RADEON_IS_MOBILITY) && !radeon_is_avivo(dev_priv)) {
++		radeon_set_dynamic_clock(dev, radeon_dynclks);
++	} else if (radeon_is_avivo(dev_priv)) {
++		if (radeon_dynclks) {
++			radeon_atom_static_pwrmgt_setup(dev, 1);
++			radeon_atom_dyn_clk_setup(dev, 1);
++		}
++	}
++	radeon_force_some_clocks(dev);
++}
 +
  int radeon_driver_load(struct drm_device *dev, unsigned long flags)
  {
  	drm_radeon_private_t *dev_priv;
-@@ -1701,6 +2426,8 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -1701,6 +2475,8 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
  	dev->dev_private = (void *)dev_priv;
  	dev_priv->flags = flags;
  
@@ -31741,7 +31897,7 @@
  	switch (flags & RADEON_FAMILY_MASK) {
  	case CHIP_R100:
  	case CHIP_RV200:
-@@ -1720,18 +2447,129 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -1720,18 +2496,119 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
  		break;
  	}
  
@@ -31773,7 +31929,6 @@
 +	if (drm_core_check_feature(dev, DRIVER_MODESET))
 +		radeon_modeset_preinit(dev);
 +
-+
 +	radeon_get_vram_type(dev);
 +
 +	dev_priv->pll_errata = 0;
@@ -31793,17 +31948,8 @@
 +		dev_priv->pll_errata |= CHIP_ERRATA_PLL_DELAY;
 +
 +
-+	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
-+		if ((dev_priv->flags & RADEON_IS_MOBILITY) && !radeon_is_avivo(dev_priv)) {
-+			radeon_set_dynamic_clock(dev, radeon_dynclks);
-+		} else if (radeon_is_avivo(dev_priv)) {
-+			if (radeon_dynclks) {
-+				radeon_atom_static_pwrmgt_setup(dev, 1);
-+				radeon_atom_dyn_clk_setup(dev, 1);
-+			}
-+		}
-+		radeon_force_some_clocks(dev);
-+	}
++	if (drm_core_check_feature(dev, DRIVER_MODESET))
++		radeon_static_clocks_init(dev);
 +		
 +	/* init memory manager - start with all of VRAM and a 32MB GART aperture for now */
 +	dev_priv->fb_aper_offset = drm_get_resource_start(dev, 0);
@@ -31872,7 +32018,7 @@
  /* Create mappings for registers and framebuffer so userland doesn't necessarily
   * have to find them.
   */
-@@ -1743,19 +2581,6 @@ int radeon_driver_firstopen(struct drm_device *dev)
+@@ -1743,19 +2620,6 @@ int radeon_driver_firstopen(struct drm_device *dev)
  
  	dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE;
  
@@ -31892,7 +32038,7 @@
  	return 0;
  }
  
-@@ -1763,9 +2588,40 @@ int radeon_driver_unload(struct drm_device *dev)
+@@ -1763,9 +2627,40 @@ int radeon_driver_unload(struct drm_device *dev)
  {
  	drm_radeon_private_t *dev_priv = dev->dev_private;
  
@@ -33251,7 +33397,7 @@
 +
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
-index 637bd7f..36335a7 100644
+index 637bd7f..9a96b05 100644
 --- a/drivers/gpu/drm/radeon/radeon_drv.c
 +++ b/drivers/gpu/drm/radeon/radeon_drv.c
 @@ -35,12 +35,20 @@
@@ -33310,7 +33456,16 @@
  	.dev_priv_size = sizeof(drm_radeon_buf_priv_t),
  	.load = radeon_driver_load,
  	.firstopen = radeon_driver_firstopen,
-@@ -80,7 +109,11 @@ static struct drm_driver driver = {
+@@ -69,6 +98,8 @@ static struct drm_driver driver = {
+ 	.postclose = radeon_driver_postclose,
+ 	.lastclose = radeon_driver_lastclose,
+ 	.unload = radeon_driver_unload,
++	.suspend = radeon_suspend,
++	.resume = radeon_resume,
+ 	.vblank_wait = radeon_driver_vblank_wait,
+ 	.vblank_wait2 = radeon_driver_vblank_wait2,
+ 	.dri_library_name = dri_library_name,
+@@ -80,7 +111,11 @@ static struct drm_driver driver = {
  	.get_map_ofs = drm_core_get_map_ofs,
  	.get_reg_ofs = drm_core_get_reg_ofs,
  	.ioctls = radeon_ioctls,
@@ -33322,7 +33477,7 @@
  	.fops = {
  		 .owner = THIS_MODULE,
  		 .open = drm_open,
-@@ -99,6 +132,9 @@ static struct drm_driver driver = {
+@@ -99,6 +134,9 @@ static struct drm_driver driver = {
  		 .id_table = pciidlist,
  	},
  
@@ -33332,7 +33487,7 @@
  	.name = DRIVER_NAME,
  	.desc = DRIVER_DESC,
  	.date = DRIVER_DATE,
-@@ -110,6 +146,23 @@ static struct drm_driver driver = {
+@@ -110,6 +148,23 @@ static struct drm_driver driver = {
  static int __init radeon_init(void)
  {
  	driver.num_ioctls = radeon_max_ioctl;
@@ -33357,7 +33512,7 @@
  }
  
 diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
-index 0993816..7eebd51 100644
+index 0993816..e35122e 100644
 --- a/drivers/gpu/drm/radeon/radeon_drv.h
 +++ b/drivers/gpu/drm/radeon/radeon_drv.h
 @@ -34,6 +34,8 @@
@@ -33450,7 +33605,7 @@
  
  typedef struct drm_radeon_freelist {
  	unsigned int age;
-@@ -223,14 +264,61 @@ struct radeon_virt_surface {
+@@ -223,14 +264,68 @@ struct radeon_virt_surface {
  #define RADEON_FLUSH_EMITED	(1 < 0)
  #define RADEON_PURGE_EMITED	(1 < 1)
  
@@ -33468,6 +33623,8 @@
 +	
 +	uint64_t gart_start;
 +	uint64_t gart_size;
++
++	void *pcie_table_backup;
 +	
 +	struct radeon_mm_obj pcie_table;
 +	struct radeon_mm_obj ring;
@@ -33508,6 +33665,11 @@
 +	int (*relocate)(struct drm_device *dev, struct drm_file *file_priv,
 +			 uint32_t *reloc, uint32_t *offset);
 +};
++
++struct radeon_pm_regs {
++	uint32_t crtc_ext_cntl;
++	uint32_t bios_scratch[8];
++};
  
 +typedef struct drm_radeon_private {
 +	drm_radeon_ring_buffer_t ring;
@@ -33517,7 +33679,7 @@
  	int gart_size;
  	u32 gart_vm_start;
  	unsigned long gart_buffers_offset;
-@@ -246,8 +334,6 @@ typedef struct drm_radeon_private {
+@@ -246,8 +341,6 @@ typedef struct drm_radeon_private {
  
  	int usec_timeout;
  
@@ -33526,7 +33688,7 @@
  	struct {
  		u32 boxes;
  		int freelist_timeouts;
-@@ -283,8 +369,6 @@ typedef struct drm_radeon_private {
+@@ -283,8 +376,6 @@ typedef struct drm_radeon_private {
  	unsigned long buffers_offset;
  	unsigned long gart_textures_offset;
  
@@ -33535,7 +33697,7 @@
  	drm_local_map_t *cp_ring;
  	drm_local_map_t *ring_rptr;
  	drm_local_map_t *gart_textures;
-@@ -293,8 +377,8 @@ typedef struct drm_radeon_private {
+@@ -293,8 +384,8 @@ typedef struct drm_radeon_private {
  	struct mem_block *fb_heap;
  
  	/* SW interrupt */
@@ -33545,7 +33707,7 @@
  	int vblank_crtc;
  	uint32_t irq_enable_reg;
  	int irq_enabled;
-@@ -303,9 +387,6 @@ typedef struct drm_radeon_private {
+@@ -303,9 +394,6 @@ typedef struct drm_radeon_private {
  	struct radeon_surface surfaces[RADEON_MAX_SURFACES];
  	struct radeon_virt_surface virt_surfaces[2 * RADEON_MAX_SURFACES];
  
@@ -33555,7 +33717,7 @@
  
  	u32 scratch_ages[5];
  
-@@ -315,6 +396,37 @@ typedef struct drm_radeon_private {
+@@ -315,6 +403,39 @@ typedef struct drm_radeon_private {
  
  	int num_gb_pipes;
  	int track_flush;
@@ -33590,10 +33752,12 @@
 +	/* ib bitmap */
 +	uint64_t ib_alloc_bitmap; // TO DO replace with a real bitmap
 +	struct drm_radeon_cs_priv cs;
++
++	struct radeon_pm_regs pmregs;
  } drm_radeon_private_t;
  
  typedef struct drm_radeon_buf_priv {
-@@ -329,6 +441,7 @@ typedef struct drm_radeon_kcmd_buffer {
+@@ -329,6 +450,7 @@ typedef struct drm_radeon_kcmd_buffer {
  } drm_radeon_kcmd_buffer_t;
  
  extern int radeon_no_wb;
@@ -33601,7 +33765,7 @@
  extern struct drm_ioctl_desc radeon_ioctls[];
  extern int radeon_max_ioctl;
  
-@@ -366,10 +479,6 @@ extern int radeon_wait_ring(drm_radeon_private_t * dev_priv, int n);
+@@ -366,10 +488,6 @@ extern int radeon_wait_ring(drm_radeon_private_t * dev_priv, int n);
  
  extern int radeon_do_cp_idle(drm_radeon_private_t * dev_priv);
  
@@ -33612,7 +33776,7 @@
  extern int radeon_mem_alloc(struct drm_device *dev, void *data, struct drm_file *file_priv);
  extern int radeon_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv);
  extern int radeon_mem_init_heap(struct drm_device *dev, void *data, struct drm_file *file_priv);
-@@ -397,13 +506,19 @@ extern int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value);
+@@ -397,13 +515,19 @@ extern int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value);
  extern int radeon_driver_load(struct drm_device *dev, unsigned long flags);
  extern int radeon_driver_unload(struct drm_device *dev);
  extern int radeon_driver_firstopen(struct drm_device *dev);
@@ -33635,7 +33799,19 @@
  /* r300_cmdbuf.c */
  extern void r300_init_reg_flags(struct drm_device *dev);
  
-@@ -419,10 +534,14 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -411,6 +535,11 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+ 			     struct drm_file *file_priv,
+ 			     drm_radeon_kcmd_buffer_t * cmdbuf);
+ 
++extern int radeon_modeset_cp_suspend(struct drm_device *dev);
++extern int radeon_modeset_cp_resume(struct drm_device *dev);
++/* radeon_pm.c */
++int radeon_suspend(struct drm_device *dev, pm_message_t state);
++int radeon_resume(struct drm_device *dev);
+ /* Flags for stats.boxes
+  */
+ #define RADEON_BOX_DMA_IDLE      0x1
+@@ -419,10 +548,14 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  #define RADEON_BOX_WAIT_IDLE     0x8
  #define RADEON_BOX_TEXTURE_LOAD  0x10
  
@@ -33650,7 +33826,7 @@
  #define RADEON_AGP_COMMAND		0x0f60
  #define RADEON_AGP_COMMAND_PCI_CONFIG   0x0060	/* offset in PCI config */
  #	define RADEON_AGP_ENABLE	(1<<8)
-@@ -525,16 +644,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -525,16 +658,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  #define R520_MC_IND_WR_EN (1 << 24)
  #define R520_MC_IND_DATA  0x74
  
@@ -33667,7 +33843,7 @@
  #define RADEON_MPP_TB_CONFIG		0x01c0
  #define RADEON_MEM_CNTL			0x0140
  #define RADEON_MEM_SDRAM_MODE_REG	0x0158
-@@ -599,14 +708,23 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -599,14 +722,23 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  #define RADEON_SCRATCH_REG3		0x15ec
  #define RADEON_SCRATCH_REG4		0x15f0
  #define RADEON_SCRATCH_REG5		0x15f4
@@ -33694,25 +33870,25 @@
  
  #define RADEON_GEN_INT_CNTL		0x0040
  #	define RADEON_CRTC_VBLANK_MASK		(1 << 0)
-@@ -623,11 +741,13 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -623,11 +755,13 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  #	define RADEON_SW_INT_TEST		(1 << 25)
  #	define RADEON_SW_INT_TEST_ACK		(1 << 25)
  #	define RADEON_SW_INT_FIRE		(1 << 26)
 +#       define R500_DISPLAY_INT_STATUS          (1 << 0)
-+
-+#define RADEON_HOST_PATH_CNTL               0x0130
-+#       define RADEON_HDP_SOFT_RESET        (1 << 26)
-+#       define RADEON_HDP_APER_CNTL         (1 << 23)
  
 -#define RADEON_HOST_PATH_CNTL		0x0130
 -#	define RADEON_HDP_SOFT_RESET		(1 << 26)
 -#	define RADEON_HDP_WC_TIMEOUT_MASK	(7 << 28)
 -#	define RADEON_HDP_WC_TIMEOUT_28BCLK	(7 << 28)
++#define RADEON_HOST_PATH_CNTL               0x0130
++#       define RADEON_HDP_SOFT_RESET        (1 << 26)
++#       define RADEON_HDP_APER_CNTL         (1 << 23)
++
 +#define RADEON_NB_TOM                       0x15c
  
  #define RADEON_ISYNC_CNTL		0x1724
  #	define RADEON_ISYNC_ANY2D_IDLE3D	(1 << 0)
-@@ -666,12 +786,17 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -666,12 +800,17 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  #define RADEON_PP_TXFILTER_1		0x1c6c
  #define RADEON_PP_TXFILTER_2		0x1c84
  
@@ -33736,7 +33912,7 @@
  #define RADEON_RB3D_CNTL		0x1c3c
  #	define RADEON_ALPHA_BLEND_ENABLE	(1 << 0)
  #	define RADEON_PLANE_MASK_ENABLE		(1 << 1)
-@@ -698,11 +823,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -698,11 +837,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  #	define R300_ZC_FLUSH		        (1 << 0)
  #	define R300_ZC_FREE		        (1 << 1)
  #	define R300_ZC_BUSY		        (1 << 31)
@@ -33748,7 +33924,7 @@
  #define R300_RB3D_DSTCACHE_CTLSTAT              0x4e4c
  #	define R300_RB3D_DC_FLUSH		(2 << 0)
  #	define R300_RB3D_DC_FREE		(2 << 2)
-@@ -710,15 +830,15 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -710,15 +844,15 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  #define RADEON_RB3D_ZSTENCILCNTL	0x1c2c
  #	define RADEON_Z_TEST_MASK		(7 << 4)
  #	define RADEON_Z_TEST_ALWAYS		(7 << 4)
@@ -33768,7 +33944,7 @@
  #define RADEON_RBBM_SOFT_RESET		0x00f0
  #	define RADEON_SOFT_RESET_CP		(1 <<  0)
  #	define RADEON_SOFT_RESET_HI		(1 <<  1)
-@@ -978,27 +1098,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -978,27 +1112,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  #define RADEON_NUM_VERTICES_SHIFT		16
  
  #define RADEON_COLOR_FORMAT_CI8		2
@@ -33796,7 +33972,7 @@
  
  #define R200_PP_TXCBLEND_0                0x2f00
  #define R200_PP_TXCBLEND_1                0x2f10
-@@ -1109,13 +1208,41 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -1109,13 +1222,41 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  
  #define R200_SE_TCL_POINT_SPRITE_CNTL     0x22c4
  
@@ -33840,7 +34016,7 @@
  #define R500_D1CRTC_STATUS 0x609c
  #define R500_D2CRTC_STATUS 0x689c
  #define R500_CRTC_V_BLANK (1<<0)
-@@ -1156,19 +1283,35 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -1156,19 +1297,35 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  #define RADEON_RING_HIGH_MARK		128
  
  #define RADEON_PCIGART_TABLE_SIZE      (32*1024)
@@ -33883,7 +34059,7 @@
  #define RADEON_WRITE_PCIE(addr, val)					\
  do {									\
  	RADEON_WRITE8(RADEON_PCIE_INDEX,				\
-@@ -1224,7 +1367,7 @@ do {									\
+@@ -1224,7 +1381,7 @@ do {									\
  #define RADEON_WAIT_UNTIL_2D_IDLE() do {				\
  	OUT_RING( CP_PACKET0( RADEON_WAIT_UNTIL, 0 ) );			\
  	OUT_RING( (RADEON_WAIT_2D_IDLECLEAN |				\
@@ -33892,7 +34068,7 @@
  } while (0)
  
  #define RADEON_WAIT_UNTIL_3D_IDLE() do {				\
-@@ -1301,8 +1444,9 @@ do {									\
+@@ -1301,8 +1458,9 @@ do {									\
  } while (0)
  
  #define VB_AGE_TEST_WITH_RETURN( dev_priv )				\
@@ -33904,7 +34080,16 @@
  	if ( sarea_priv->last_dispatch >= RADEON_MAX_VB_AGE ) {		\
  		int __ret = radeon_do_cp_idle( dev_priv );		\
  		if ( __ret ) return __ret;				\
-@@ -1408,4 +1552,139 @@ do {									\
+@@ -1330,7 +1488,7 @@ do {									\
+  * Ring control
+  */
+ 
+-#define RADEON_VERBOSE	0
++#define RADEON_VERBOSE	1
+ 
+ #define RING_LOCALS	int write, _nr; unsigned int mask; u32 *ring;
+ 
+@@ -1408,4 +1566,142 @@ do {									\
  	write &= mask;						\
  } while (0)
  
@@ -34014,7 +34199,8 @@
 +extern int radeon_gem_unpin_ioctl(struct drm_device *dev, void *data,
 +				  struct drm_file *file_priv);
 +int radeon_gem_object_pin(struct drm_gem_object *obj,
-+			  uint32_t alignment);
++			  uint32_t alignment, uint32_t pin_domain);
++int radeon_gem_object_unpin(struct drm_gem_object *obj);
 +int radeon_gem_indirect_ioctl(struct drm_device *dev, void *data,
 +			      struct drm_file *file_priv);
 +int radeon_gem_set_domain_ioctl(struct drm_device *dev, void *data,
@@ -34036,6 +34222,8 @@
 +extern int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *fpriv);
 +extern int radeon_cs_init(struct drm_device *dev);
 +void radeon_gem_update_offsets(struct drm_device *dev, struct drm_master *master);
++void radeon_init_memory_map(struct drm_device *dev);
++
 +
 +#define MARK_SAFE		1
 +#define MARK_CHECK_OFFSET	2
@@ -35133,7 +35321,7 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
 new file mode 100644
-index 0000000..2da5cc0
+index 0000000..83d39d3
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_fb.c
 @@ -0,0 +1,923 @@
@@ -35635,7 +35823,7 @@
 +	}
 +	obj_priv = fbo->driver_private;
 +
-+	ret = radeon_gem_object_pin(fbo, PAGE_SIZE);
++	ret = radeon_gem_object_pin(fbo, PAGE_SIZE, RADEON_GEM_DOMAIN_VRAM);
 +	if (ret) {
 +		DRM_ERROR("failed to pin fb: %d\n", ret);
 +		mutex_lock(&dev->struct_mutex);
@@ -36062,10 +36250,10 @@
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
 new file mode 100644
-index 0000000..1b32736
+index 0000000..591ad53
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_fence.c
-@@ -0,0 +1,96 @@
+@@ -0,0 +1,99 @@
 +/**************************************************************************
 + * 
 + * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND., USA
@@ -36113,6 +36301,8 @@
 +		return -EINVAL;
 +
 +	radeon_emit_irq(dev);
++
++	DRM_DEBUG("emitting %d\n", dev_priv->counter);
 +	*sequence = (uint32_t) dev_priv->counter;
 +	*native_type = DRM_FENCE_TYPE_EXE;
 +
@@ -36128,6 +36318,7 @@
 +
 +                sequence = READ_BREADCRUMB(dev_priv);
 +
++		DRM_DEBUG("polling %d\n", sequence);
 +                drm_fence_handler(dev, 0, sequence,
 +                                  DRM_FENCE_TYPE_EXE, 0);
 +        }
@@ -36164,10 +36355,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
 new file mode 100644
-index 0000000..24c806a
+index 0000000..f4a0a6c
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_gem.c
-@@ -0,0 +1,1337 @@
+@@ -0,0 +1,1387 @@
 +/*
 + * Copyright 2008 Red Hat Inc.
 + *
@@ -36213,7 +36404,6 @@
 +
 +	obj->driver_private = obj_priv;
 +	obj_priv->obj = obj;
-+	
 +	return 0;
 +}
 +
@@ -36490,6 +36680,8 @@
 +	struct drm_gem_object *obj;
 +	struct drm_radeon_gem_object *obj_priv;
 +	int ret;
++	int flags = DRM_BO_FLAG_NO_EVICT;
++	int mask = DRM_BO_FLAG_NO_EVICT;
 +
 +	obj = drm_gem_object_lookup(dev, file_priv, args->handle);
 +	if (obj == NULL)
@@ -36499,15 +36691,24 @@
 +
 +	DRM_DEBUG("got here %p %p %d\n", obj, obj_priv->bo, atomic_read(&obj_priv->bo->usage));
 +	/* validate into a pin with no fence */
++	if (args->pin_domain) {
++		mask |= DRM_BO_MASK_MEM;
++		if (args->pin_domain == RADEON_GEM_DOMAIN_GTT)
++			flags |= DRM_BO_FLAG_MEM_TT;
++		else if (args->pin_domain == RADEON_GEM_DOMAIN_VRAM)
++			flags |= DRM_BO_FLAG_MEM_VRAM;
++		else
++			return -EINVAL;
++	}
 +
 +	if (!(obj_priv->bo->type != drm_bo_type_kernel && !DRM_SUSER(DRM_CURPROC))) {
-+		ret = drm_bo_do_validate(obj_priv->bo, 0, DRM_BO_FLAG_NO_EVICT,
++		ret = drm_bo_do_validate(obj_priv->bo, flags, mask,
 +					 DRM_BO_HINT_DONT_FENCE, 0);
 +	} else
 +	  ret = 0;
 +
 +	args->offset = obj_priv->bo->offset;
-+	DRM_DEBUG("got here %p %p\n", obj, obj_priv->bo);
++	DRM_DEBUG("got here %p %p %x\n", obj, obj_priv->bo, obj_priv->bo->offset);
 +
 +	mutex_lock(&dev->struct_mutex);
 +	drm_gem_object_unreference(obj);
@@ -36531,7 +36732,7 @@
 +
 +	/* validate into a pin with no fence */
 +
-+	ret = drm_bo_do_validate(obj_priv->bo, DRM_BO_FLAG_NO_EVICT, DRM_BO_FLAG_NO_EVICT,
++	ret = drm_bo_do_validate(obj_priv->bo, 0, DRM_BO_FLAG_NO_EVICT,
 +				 DRM_BO_HINT_DONT_FENCE, 0);
 +
 +	mutex_lock(&dev->struct_mutex);
@@ -36768,7 +36969,11 @@
 +		if (ret)
 +			return -EINVAL;
 +
-+		DRM_DEBUG("pcie table bo created %p, %x\n", dev_priv->mm.pcie_table.bo, dev_priv->mm.pcie_table.bo->offset);
++		dev_priv->mm.pcie_table_backup = kzalloc(RADEON_PCIGART_TABLE_SIZE, GFP_KERNEL);
++		if (!dev_priv->mm.pcie_table_backup)
++			return -EINVAL;
++
++		DRM_ERROR("pcie table bo created %p, %x\n", dev_priv->mm.pcie_table.bo, dev_priv->mm.pcie_table.bo->offset);
 +		ret = drm_bo_kmap(dev_priv->mm.pcie_table.bo, 0, RADEON_PCIGART_TABLE_SIZE >> PAGE_SHIFT,
 +				  &dev_priv->mm.pcie_table.kmap);
 +		if (ret)
@@ -36860,10 +37065,16 @@
 +
 +}
 +
-+static void radeon_init_memory_map(struct drm_device *dev)
++void radeon_init_memory_map(struct drm_device *dev)
 +{
 +	drm_radeon_private_t *dev_priv = dev->dev_private;
 +	u32 mem_size, aper_size;
++	u32 tmp;
++
++	/* turn off VGA IO bits */
++	tmp = RADEON_READ(RADEON_CONFIG_CNTL);
++	tmp |= (1 << 9);
++	RADEON_WRITE(RADEON_CONFIG_CNTL, tmp);
 +
 +	dev_priv->mc_fb_location = radeon_read_fb_location(dev_priv);
 +	radeon_read_agp_location(dev_priv, &dev_priv->mc_agp_loc_lo, &dev_priv->mc_agp_loc_hi);
@@ -37011,6 +37222,10 @@
 +	}
 +
 +	if (dev_priv->flags & RADEON_IS_PCIE) {
++		if (dev_priv->mm.pcie_table_backup) {
++			kfree(dev_priv->mm.pcie_table_backup);
++			dev_priv->mm.pcie_table_backup = NULL;
++		}
 +		if (dev_priv->mm.pcie_table.bo) {
 +			drm_bo_kunmap(&dev_priv->mm.pcie_table.kmap);
 +			drm_bo_usage_deref_locked(&dev_priv->mm.pcie_table.bo);
@@ -37028,7 +37243,31 @@
 +}
 +
 +int radeon_gem_object_pin(struct drm_gem_object *obj,
-+			  uint32_t alignment)
++			  uint32_t alignment, uint32_t pin_domain)
++{
++	struct drm_radeon_gem_object *obj_priv;
++	int ret;
++	uint32_t flags = DRM_BO_FLAG_NO_EVICT;
++	uint32_t mask = DRM_BO_FLAG_NO_EVICT;
++
++	obj_priv = obj->driver_private;
++
++	if (pin_domain) {
++		mask |= DRM_BO_MASK_MEM;
++		if (pin_domain == RADEON_GEM_DOMAIN_GTT)
++			flags |= DRM_BO_FLAG_MEM_TT;
++		else if (pin_domain == RADEON_GEM_DOMAIN_VRAM)
++			flags |= DRM_BO_FLAG_MEM_VRAM;
++		else
++			return -EINVAL;
++	}
++	ret = drm_bo_do_validate(obj_priv->bo, flags, mask,
++				 DRM_BO_HINT_DONT_FENCE, 0);
++
++	return ret;
++}
++
++int radeon_gem_object_unpin(struct drm_gem_object *obj)
 +{
 +	struct drm_radeon_gem_object *obj_priv;
 +	int ret;
@@ -37505,6 +37744,8 @@
 +	dev_priv->color_fmt = RADEON_COLOR_FORMAT_ARGB8888;
 +
 +}
++
++
 diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c
 new file mode 100644
 index 0000000..00fc7c0
@@ -40089,10 +40330,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
 new file mode 100644
-index 0000000..f4d2757
+index 0000000..8236d1c
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_mode.h
-@@ -0,0 +1,331 @@
+@@ -0,0 +1,333 @@
 +/*
 + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
 + *                VA Linux Systems Inc., Fremont, California.
@@ -40423,7 +40664,195 @@
 +			   uint32_t dst_offset,
 +			   uint32_t pages);
 +void radeon_copy_fb(struct drm_device *dev, struct drm_gem_object *dst_obj);
++void radeon_combios_asic_init(struct drm_device *dev);
++extern int radeon_static_clocks_init(struct drm_device *dev);
 +#endif
+diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
+new file mode 100644
+index 0000000..c7a57b9
+--- /dev/null
++++ b/drivers/gpu/drm/radeon/radeon_pm.c
+@@ -0,0 +1,180 @@
++/*
++ * Copyright 2007-8 Advanced Micro Devices, Inc.
++ * Copyright 2008 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
++ */
++#include "drmP.h"
++#include "radeon_drm.h"
++#include "radeon_drv.h"
++
++#include "atom.h"
++
++#include "drm_crtc_helper.h"
++
++int radeon_suspend(struct drm_device *dev, pm_message_t state)
++{
++	struct drm_radeon_private *dev_priv = dev->dev_private;
++	struct drm_framebuffer *fb;
++	int i;
++
++	if (!dev || !dev_priv) {
++		return -ENODEV;
++	}
++
++	if (state.event == PM_EVENT_PRETHAW)
++		return 0;
++
++	if (!drm_core_check_feature(dev, DRIVER_MODESET))
++		return 0;
++
++	/* unpin the front buffers */
++	list_for_each_entry(fb, &dev->mode_config.fb_kernel_list, filp_head) {
++		struct radeon_framebuffer *radeon_fb = to_radeon_framebuffer(fb);
++
++		if (!radeon_fb)
++			continue;
++
++		if (!radeon_fb->obj)
++			continue;
++		
++		radeon_gem_object_unpin(radeon_fb->obj);
++	}
++
++	if (!(dev_priv->flags & RADEON_IS_IGP))
++		drm_bo_evict_mm(dev, DRM_BO_MEM_VRAM, 0);
++
++	if (dev_priv->flags & RADEON_IS_PCIE) {
++		memcpy_fromio(dev_priv->mm.pcie_table_backup, dev_priv->mm.pcie_table.kmap.virtual, RADEON_PCIGART_TABLE_SIZE);
++	}
++
++	dev_priv->pmregs.crtc_ext_cntl = RADEON_READ(RADEON_CRTC_EXT_CNTL);
++	for (i = 0; i < 8; i++)
++		dev_priv->pmregs.bios_scratch[i] = RADEON_READ(RADEON_BIOS_0_SCRATCH + (i * 4));
++
++	radeon_modeset_cp_suspend(dev);
++
++	pci_save_state(dev->pdev);
++
++	if (state.event == PM_EVENT_SUSPEND) {
++		/* Shut down the device */
++		pci_disable_device(dev->pdev);
++		pci_set_power_state(dev->pdev, PCI_D3hot);
++	}
++	return 0;
++}
++
++int radeon_resume(struct drm_device *dev)
++{
++	struct drm_radeon_private *dev_priv = dev->dev_private;
++	struct drm_framebuffer *fb;
++	int i;
++	u32 tmp;
++
++	if (!drm_core_check_feature(dev, DRIVER_MODESET))
++		return 0;
++
++	pci_set_power_state(dev->pdev, PCI_D0);
++	pci_restore_state(dev->pdev);
++	if (pci_enable_device(dev->pdev))
++		return -1;
++	pci_set_master(dev->pdev);
++
++	/* Turn on bus mastering */
++	tmp = RADEON_READ(RADEON_BUS_CNTL) & ~RADEON_BUS_MASTER_DIS;
++	RADEON_WRITE(RADEON_BUS_CNTL, tmp);
++
++	/* on atom cards re init the whole card 
++	   and set the modes again */
++
++	if (dev_priv->is_atom_bios) {
++		struct atom_context *ctx = dev_priv->mode_info.atom_context;
++		atom_asic_init(ctx);
++	} else {
++		radeon_combios_asic_init(dev);
++	}
++
++	for (i = 0; i < 8; i++)
++		RADEON_WRITE(RADEON_BIOS_0_SCRATCH + (i * 4), dev_priv->pmregs.bios_scratch[i]);
++
++	/* VGA render mayhaps */
++	if (dev_priv->chip_family >= CHIP_RS600) {
++		uint32_t tmp;
++
++		RADEON_WRITE(AVIVO_D1VGA_CONTROL, 0);
++		RADEON_WRITE(AVIVO_D2VGA_CONTROL, 0);
++		tmp = RADEON_READ(0x300);
++		tmp &= ~(3 << 16);
++		RADEON_WRITE(0x300, tmp);
++		RADEON_WRITE(0x308, (1 << 8));
++		RADEON_WRITE(0x310, dev_priv->fb_location);
++		RADEON_WRITE(0x594, 0);
++	}
++
++	RADEON_WRITE(RADEON_CRTC_EXT_CNTL, dev_priv->pmregs.crtc_ext_cntl);
++
++	radeon_static_clocks_init(dev);
++	
++	radeon_init_memory_map(dev);
++
++	if (dev_priv->flags & RADEON_IS_PCIE) {
++		memcpy_toio(dev_priv->mm.pcie_table.kmap.virtual, dev_priv->mm.pcie_table_backup, RADEON_PCIGART_TABLE_SIZE);
++	}
++
++	if (dev_priv->mm.ring.kmap.virtual)
++		memset(dev_priv->mm.ring.kmap.virtual, 0, RADEON_DEFAULT_RING_SIZE);
++
++	if (dev_priv->mm.ring_read.kmap.virtual)
++		memset(dev_priv->mm.ring_read.kmap.virtual, 0, PAGE_SIZE);
++
++	radeon_modeset_cp_resume(dev);
++
++	/* reset swi reg */
++	RADEON_WRITE(RADEON_LAST_SWI_REG, dev_priv->counter);
++
++	radeon_enable_interrupt(dev);
++
++	/* reset the context for userspace */
++	if (dev->primary->master) {
++		struct drm_radeon_master_private *master_priv = dev->primary->master->driver_priv;
++		if (master_priv->sarea_priv)
++			master_priv->sarea_priv->ctx_owner = 0;
++	}
++
++	/* unpin the front buffers */
++	list_for_each_entry(fb, &dev->mode_config.fb_kernel_list, filp_head) {
++		
++		struct radeon_framebuffer *radeon_fb = to_radeon_framebuffer(fb);
++
++		if (!radeon_fb)
++			continue;
++
++		if (!radeon_fb->obj)
++			continue;
++		
++		radeon_gem_object_pin(radeon_fb->obj, PAGE_SIZE, RADEON_GEM_DOMAIN_VRAM);
++	}
++	/* blat the mode back in */
++	drm_helper_resume_force_mode(dev);
++
++	return 0;
++}
 diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h
 new file mode 100644
 index 0000000..5910897
@@ -48218,10 +48647,10 @@
 +
 diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
 new file mode 100644
-index 0000000..dcb46f9
+index 0000000..c071915
 --- /dev/null
 +++ b/include/drm/drm_crtc_helper.h
-@@ -0,0 +1,97 @@
+@@ -0,0 +1,96 @@
 +/*
 + * Copyright ?? 2006 Keith Packard
 + * Copyright ?? 2007 Intel Corporation
@@ -48316,8 +48745,7 @@
 +	connector->helper_private = (void *)funcs;
 +}
 +
-+extern int drm_get_buffer_object(struct drm_device *dev, struct drm_buffer_object **bo, unsigned long handle);
-+
++extern int drm_helper_resume_force_mode(struct drm_device *dev);
 +#endif
 diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
 new file mode 100644
@@ -48505,10 +48933,10 @@
 +#endif /* __DRM_EDID_H__ */
 diff --git a/include/drm/drm_objects.h b/include/drm/drm_objects.h
 new file mode 100644
-index 0000000..e0ec1ba
+index 0000000..fa9fd96
 --- /dev/null
 +++ b/include/drm/drm_objects.h
-@@ -0,0 +1,893 @@
+@@ -0,0 +1,894 @@
 +/**************************************************************************
 + *
 + * Copyright (c) 2006-2007 Tungsten Graphics, Inc., Cedar Park, TX., USA
@@ -49303,6 +49731,7 @@
 +extern int drm_bo_evict_cached(struct drm_buffer_object *bo);
 +
 +extern void drm_bo_takedown_vm_locked(struct drm_buffer_object *bo);
++extern void drm_bo_evict_mm(struct drm_device *dev, int mem_type, int no_wait);
 +/*
 + * Buffer object memory move- and map helpers.
 + * drm_bo_move.c
@@ -49855,7 +50284,7 @@
 +
  #endif				/* _I915_DRM_H_ */
 diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
-index 73ff51f..77b97fb 100644
+index 73ff51f..1347faf 100644
 --- a/include/drm/radeon_drm.h
 +++ b/include/drm/radeon_drm.h
 @@ -453,6 +453,15 @@ typedef struct {
@@ -49974,7 +50403,7 @@
 +
 +struct drm_radeon_gem_pin {
 +	uint32_t handle;
-+	uint32_t pad;
++	uint32_t pin_domain;
 +	uint64_t alignment;
 +	uint64_t offset;
 +};


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.930
retrieving revision 1.931
diff -u -r1.930 -r1.931
--- kernel.spec	5 Sep 2008 06:06:18 -0000	1.930
+++ kernel.spec	5 Sep 2008 06:29:57 -0000	1.931
@@ -1747,6 +1747,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Sep 05 2008 Dave Airlie <airlied at redhat.com>
+- introduce radeon suspend/resume + change pin api
+
 * Fri Sep 05 2008 Chuck Ebbert <cebbert at redhat.com>
 - Restore most of the dropped powerpc32 drivers.
 



From airlied at fedoraproject.org  Fri Sep  5 06:35:57 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  5 Sep 2008 06:35:57 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.107,1.108
Message-ID: <20080905063557.7817570121@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-serv7097

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
* Fri Sep 05 2008 Dave Airlie <airlied at redhat.com> 6.9.0-8
- fix suspend/resume support - needs new pinning API



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.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- xorg-x11-drv-ati.spec	27 Aug 2008 05:56:29 -0000	1.107
+++ xorg-x11-drv-ati.spec	5 Sep 2008 06:35:27 -0000	1.108
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -16,13 +16,14 @@
 
 Patch0:	    radeon-6.9.0-to-git.patch
 Patch1:     radeon-modeset.patch
+Patch2:     radeon-suspend-fix.patch
 
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
 BuildRequires: mesa-libGL-devel >= 6.4-4
 BuildRequires: libdrm-devel >= 2.4.0-0.19
-BuildRequires: kernel-headers >= 2.6.27-0.280
+BuildRequires: kernel-headers >= 2.6.27-0.308
 BuildRequires: automake autoconf libtool pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.1.5
 
@@ -36,6 +37,7 @@
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1 -b .git
 %patch1 -p1 -b .modeset
+%patch2 -p1 -b .suspend
 
 %build
 autoreconf
@@ -67,6 +69,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Sep 05 2008 Dave Airlie <airlied at redhat.com> 6.9.0-8
+- fix suspend/resume support - needs new pinning API
+
 * Wed Aug 27 2008 Dave Airlie <airlied at redhat.com> 6.9.0-7
 - fix bug in modesetting to make 3D work again
 



From airlied at fedoraproject.org  Fri Sep  5 06:36:39 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  5 Sep 2008 06:36:39 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-suspend-fix.patch,NONE,1.1
Message-ID: <20080905063639.4D3BA70121@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-serv7389

Added Files:
	radeon-suspend-fix.patch 
Log Message:
* Fri Sep 05 2008 Dave Airlie <airlied at redhat.com> 6.9.0-8
- fix suspend/resume support - needs new pinning API


radeon-suspend-fix.patch:

--- NEW FILE radeon-suspend-fix.patch ---
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 1ae6018..1a3b74a 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -5590,8 +5590,11 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
 
     }
 
-    if (info->drm_mm)
+    if (info->drm_mm) {
 	radeon_bind_all_memory(pScrn);
+	info->XInited3D = FALSE;
+	info->engineMode = EXA_ENGINEMODE_UNKNOWN;
+    }
 
     radeon_update_dri_buffers(pScrn);
 
diff --git a/src/radeon_memory.c b/src/radeon_memory.c
index ccc3bb8..8a23ccd 100644
--- a/src/radeon_memory.c
+++ b/src/radeon_memory.c
@@ -21,6 +21,10 @@ radeon_bind_memory(ScrnInfoPtr pScrn, struct radeon_memory *mem)
 
 		int ret;
 
+    		if (mem->pool == RADEON_POOL_VRAM)
+		    pin.pin_domain = RADEON_GEM_DOMAIN_VRAM;
+    		else
+      		    pin.pin_domain = RADEON_GEM_DOMAIN_GTT;
 		pin.handle = mem->kernel_bo_handle;
 		pin.alignment = mem->alignment;
 



From transif at fedoraproject.org  Fri Sep  5 06:50:31 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Fri,  5 Sep 2008 06:50:31 +0000 (UTC)
Subject: comps/po zh_CN.po,1.14,1.15
Message-ID: <20080905065031.896C170121@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10871/po

Modified Files:
	zh_CN.po 
Log Message:
    2008-09-05  Asgeir Frimannsson <asgeirf at redhat.com> (via
asgeirf at fedoraproject.org)
    
      * po/zh_CN.po: Submitted for Leah Liu (lliu at redhat.com)
    



Index: zh_CN.po
===================================================================
RCS file: /cvs/pkgs/comps/po/zh_CN.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- zh_CN.po	17 Jul 2008 18:31:24 -0000	1.14
+++ zh_CN.po	5 Sep 2008 06:50:01 -0000	1.15
@@ -13,8 +13,8 @@
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-17 14:29-0400\n"
-"PO-Revision-Date: 2008-04-16 08:48+1000\n"
+"POT-Creation-Date: 2008-08-27 19:54+0000\n"
+"PO-Revision-Date: 2008-09-01 09:50+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"
@@ -400,14 +400,12 @@
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:81
-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:82 ../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
@@ -643,8 +641,7 @@
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
 #: ../comps-f10.xml.in.h:139 ../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:137
@@ -682,8 +679,7 @@
 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:144
 #: ../comps-f10.xml.in.h:147 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
@@ -766,8 +762,7 @@
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
 #: ../comps-f10.xml.in.h:163
-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:160
@@ -777,20 +772,17 @@
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
 #: ../comps-f10.xml.in.h:165
-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:162
 #: ../comps-f10.xml.in.h:166 ../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:163
 #: ../comps-f10.xml.in.h:167
-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:164
@@ -897,14 +889,12 @@
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
 #: ../comps-f10.xml.in.h:184 ../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:181
 #: ../comps-f10.xml.in.h:185 ../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:182
@@ -912,13 +902,11 @@
 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:183
 #: ../comps-f10.xml.in.h:187
-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:184
@@ -1099,55 +1087,48 @@
 msgstr "???????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44
-#, fuzzy
 msgid "Esperanto Support"
-msgstr "????????????"
+msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashubian Support"
-msgstr "?????????????????????"
+msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:106
-#, fuzzy
 msgid "Macedonian Support"
-msgstr "???????????????"
+msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:117
-#, fuzzy
 msgid "Northern Sami Support"
-msgstr "??????????????????"
+msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:133
-#, fuzzy
 msgid "SUGAR Desktop Environment"
-msgstr "????????????"
+msgstr "SUGAR ????????????"
 
 #: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:134
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
-msgstr ""
+msgstr "SUGAR ?????? OLPC XO ????????????????????????"
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:204
-#, fuzzy
 msgid "Walloon Support"
-msgstr "???????????????"
+msgstr "???????????????"
 
 #: ../comps-f10.xml.in.h:70
 msgid "Haskell"
-msgstr ""
+msgstr "Haskell"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
-msgstr ""
+msgstr "?????????"
 
 #: ../comps-f10.xml.in.h:77
 msgid "Input method packages for the input of international text."
-msgstr ""
+msgstr "??????????????????????????????????????????"
 
 #: ../comps-f10.xml.in.h:157
-#, fuzzy
 msgid "Tajik Support"
-msgstr "????????????"
+msgstr "??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1177,8 +1158,7 @@
 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."
@@ -1197,18 +1177,15 @@
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "???????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1216,67 +1193,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??????????????????????????????????????????????????????"
 
-#~ msgid "British Support"
-#~ msgstr "????????????"
-
-#~ msgid "Cluster Storage"
-#~ msgstr "????????????"
-
-#~ msgid "Clustering Support."
-#~ msgstr "???????????????"
-
-#~ msgid "Libraries for applications built on older releases."
-#~ msgstr "?????????????????????????????????????????????????????????"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "??????????????????????????????????????????"
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "??????????????? GFS ???????????????????????????"
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "???????????? GFS ??????"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "????????????????????????????????????????????????????????????"
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "Java ?????????????????????????????????"
-
-#~ msgid "Misc"
-#~ msgstr "Misc"
-
-#~ msgid "Misc packages"
-#~ msgstr "Misc ?????????"
-
-#~ msgid "Multimedia"
-#~ msgstr "?????????"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "?????????????????????"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr "?????????????????? Linux ?????????????????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux Supplementary"
-#~ msgstr "??????????????? Linux ????????????"
-
-#~ msgid ""
-#~ "Components used for high performance networking and clustering, such as "
-#~ "Infiniband and RDMA."
-#~ msgstr "??????????????????????????????????????????????????? Infiniband ??? RDMA???"
-
-#~ msgid "OpenFabrics Enterprise Distribution"
-#~ msgstr "OpenFabrics ???????????????"
-
-#~ msgid "Virtualization Support."
-#~ msgstr "??????????????????"



From pkgdb at fedoraproject.org  Fri Sep  5 06:55:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 06:55:19 +0000
Subject: [pkgdb] iok was added for pnemade
Message-ID: <20080905065520.0F63D2086F6@bastion.fedora.phx.redhat.com>

petersen has added Package iok with summary Indic onscreen virtual keyboard
petersen has approved Package iok
petersen has added a Fedora devel branch for iok with an owner of pnemade
petersen has approved iok in Fedora devel
petersen has approved Package iok
petersen has set commit to Approved for packager on iok (Fedora devel)
petersen has set build to Approved for packager on iok (Fedora devel)
petersen has set checkout to Approved for packager on iok (Fedora devel)
petersen has set commit to Approved for uberpackager on iok (Fedora devel)
petersen has set build to Approved for uberpackager on iok (Fedora devel)
petersen has set checkout to Approved for uberpackager on iok (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iok



From pkgdb at fedoraproject.org  Fri Sep  5 06:55:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 06:55:22 +0000
Subject: [pkgdb] iok (Fedora, 9) updated by petersen
Message-ID: <20080905065522.7F6CC20876D@bastion.fedora.phx.redhat.com>

petersen added a Fedora 9 branch for iok
petersen has set commit to Approved for uberpackager on iok (Fedora 9)
petersen has set build to Approved for uberpackager on iok (Fedora 9)
petersen has set checkout to Approved for uberpackager on iok (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iok



From mtasaka at fedoraproject.org  Fri Sep  5 07:34:56 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri,  5 Sep 2008 07:34:56 +0000 (UTC)
Subject: rpms/gtkmm24/devel gtkmm-2.13.7-compile-with-gtk0214.patch, NONE,
	1.1 gtkmm.spec, 1.41, 1.42
Message-ID: <20080905073456.1171570121@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gtkmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22241

Modified Files:
	gtkmm.spec 
Added Files:
	gtkmm-2.13.7-compile-with-gtk0214.patch 
Log Message:
* Fri Sep  5 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.13.7-2
- Patch from svn temporarily to make compatible with GTK 2.14
  (bug 461227)


gtkmm-2.13.7-compile-with-gtk0214.patch:

--- NEW FILE gtkmm-2.13.7-compile-with-gtk0214.patch ---
Index: gtk/src/widget.hg
===================================================================
--- gtk/src/widget.hg	(revision 1033)
+++ gtk/src/widget.hg	(revision 1035)
@@ -226,9 +226,6 @@
   _WRAP_METHOD(void set_child_visible(bool is_visible = true), gtk_widget_set_child_visible)
   _WRAP_METHOD(bool get_child_visible() const, gtk_widget_get_child_visible)
 
-#m4  _CONVERSION(`GtkAllocation',`Allocation',`($2)(Glib::wrap(&($3)))')
-  _WRAP_METHOD(Allocation get_allocation() const, gtk_widget_get_allocation)
-
   _WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_window(), gtk_widget_get_window, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_window() const, gtk_widget_get_window, refreturn, constversion)
 
@@ -615,7 +612,10 @@
   _MEMBER_GET(saved_state, saved_state, Gtk::StateType, guint8)
   _MEMBER_GET(requisition, requisition, Requisition, GtkRequisition)
 
+#m4  _CONVERSION(`GtkAllocation',`Allocation',`($2)(Glib::wrap(&($3)))')
+  _MEMBER_GET(allocation, allocation, Allocation, GtkAllocation)
 
+
   _WRAP_SIGNAL(void show(),"show")
   _WRAP_SIGNAL(void hide(),"hide")
 
Index: gtk/src/selectiondata.ccg
===================================================================
--- gtk/src/selectiondata.ccg	(revision 1033)
+++ gtk/src/selectiondata.ccg	(revision 1035)
@@ -90,18 +90,6 @@
     gdk_atom_name( gtk_selection_data_get_data_type(const_cast<GtkSelectionData*>(gobj())) ) );
 }
 
-#ifndef GTKMM_DISABLE_DEPRECATED
-const guint8* SelectionData::get_data() const
-{
-  return gobj()->data;
-}
- 
-int SelectionData::get_length() const
-{
-  return gobj()->length;
-}
-#endif // GTKMM_DISABLE_DEPRECATED
- 
 
 } // namespace Gtk
 
Index: gtk/src/selectiondata.hg
===================================================================
--- gtk/src/selectiondata.hg	(revision 1033)
+++ gtk/src/selectiondata.hg	(revision 1035)
@@ -86,16 +86,9 @@
   _WRAP_METHOD(Glib::StringArrayHandle get_uris() const, gtk_selection_data_get_uris)
 
 
-  _WRAP_METHOD(const guchar* get_data(guint& length) const, gtk_selection_data_get_data)
+  _WRAP_METHOD(const guchar* get_data() const, gtk_selection_data_get_data)
+  _WRAP_METHOD(int get_length() const, gtk_selection_data_get_length)
 
-#ifndef GTKMM_DISABLE_DEPRECATED
-  /// @deprecated Use the get_data() method that also provides both the data and length.
-  const guint8* get_data() const;
-
-  /// @deprecated Use the get_data() method that also provides both the data and length.
-  int get_length() const;
-#endif // GTKMM_DISABLE_DEPRECATED
-
   std::string get_data_as_string() const;
 
   /** Retrieves the target of the selection.
Index: gtk/src/gtk_methods.defs
===================================================================
--- gtk/src/gtk_methods.defs	(revision 1033)
+++ gtk/src/gtk_methods.defs	(revision 1035)
@@ -2171,6 +2171,22 @@
   )
 )
 
+(define-enum NumberUpLayout
+  (in-module "Gtk")
+  (c-name "GtkNumberUpLayout")
+  (gtype-id "GTK_TYPE_NUMBER_UP_LAYOUT")
+  (values
+    '("left-to-right-top-to-bottom" "GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_TOP_TO_BOTTOM")
+    '("left-to-right-bottom-to-top" "GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_BOTTOM_TO_TOP")
+    '("right-to-left-top-to-bottom" "GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_TOP_TO_BOTTOM")
+    '("right-to-left-bottom-to-top" "GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_BOTTOM_TO_TOP")
+    '("top-to-bottom-left-to-right" "GTK_NUMBER_UP_LAYOUT_TOP_TO_BOTTOM_LEFT_TO_RIGHT")
+    '("top-to-bottom-right-to-left" "GTK_NUMBER_UP_LAYOUT_TOP_TO_BOTTOM_RIGHT_TO_LEFT")
+    '("bottom-to-top-left-to-right" "GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_LEFT_TO_RIGHT")
+    '("bottom-to-top-right-to-left" "GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_RIGHT_TO_LEFT")
+  )
+)
+
 (define-enum PageOrientation
   (in-module "Gtk")
   (c-name "GtkPageOrientation")
@@ -2505,6 +2521,7 @@
     '("generate-ps" "GTK_PRINT_CAPABILITY_GENERATE_PS")
     '("preview" "GTK_PRINT_CAPABILITY_PREVIEW")
     '("number-up" "GTK_PRINT_CAPABILITY_NUMBER_UP")
+    '("number-up-layout" "GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT")
   )
 )
 
@@ -18522,6 +18539,21 @@
   )
 )
 
+(define-method get_number_up_layout
+  (of-object "GtkPrintSettings")
+  (c-name "gtk_print_settings_get_number_up_layout")
+  (return-type "GtkNumberUpLayout")
+)
+
+(define-method set_number_up_layout
+  (of-object "GtkPrintSettings")
+  (c-name "gtk_print_settings_set_number_up_layout")
+  (return-type "none")
+  (parameters
+    '("GtkNumberUpLayout" "number_up_layout")
+  )
+)
+
 (define-method get_resolution
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_resolution")
@@ -21150,11 +21182,14 @@
   (of-object "GtkSelectionData")
   (c-name "gtk_selection_data_get_data")
   (return-type "const-guchar*")
-  (parameters
-    '("guint*" "length")
-  )
 )
 
+(define-method get_length
+  (of-object "GtkSelectionData")
+  (c-name "gtk_selection_data_get_length")
+  (return-type "gint")
+)
+
 (define-method get_display
   (of-object "GtkSelectionData")
   (c-name "gtk_selection_data_get_display")
@@ -30422,6 +30457,11 @@
   (return-type "GType")
 )
 
+(define-function gtk_number_up_layout_get_type
+  (c-name "gtk_number_up_layout_get_type")
+  (return-type "GType")
+)
+
 (define-function gtk_page_orientation_get_type
   (c-name "gtk_page_orientation_get_type")
   (return-type "GType")
@@ -31592,6 +31632,12 @@
   )
 )
 
+(define-method get_parent
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_get_parent")
+  (return-type "GtkWidget*")
+)
+
 (define-method set_parent_window
   (of-object "GtkWidget")
   (c-name "gtk_widget_set_parent_window")
@@ -31601,6 +31647,12 @@
   )
 )
 
+(define-method get_parent_window
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_get_parent_window")
+  (return-type "GdkWindow*")
+)
+
 (define-method set_child_visible
   (of-object "GtkWidget")
   (c-name "gtk_widget_set_child_visible")
@@ -31616,30 +31668,12 @@
   (return-type "gboolean")
 )
 
-(define-method get_allocation
-  (of-object "GtkWidget")
-  (c-name "gtk_widget_get_allocation")
-  (return-type "GtkAllocation")
-)
-
 (define-method get_window
   (of-object "GtkWidget")
   (c-name "gtk_widget_get_window")
   (return-type "GdkWindow*")
 )
 
-(define-method get_parent
-  (of-object "GtkWidget")
-  (c-name "gtk_widget_get_parent")
-  (return-type "GtkWidget*")
-)
-
-(define-method get_parent_window
-  (of-object "GtkWidget")
-  (c-name "gtk_widget_get_parent_window")
-  (return-type "GdkWindow*")
-)
-
 (define-method child_focus
   (of-object "GtkWidget")
   (c-name "gtk_widget_child_focus")


Index: gtkmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gtkmm.spec	29 Aug 2008 15:29:57 -0000	1.41
+++ gtkmm.spec	5 Sep 2008 07:34:25 -0000	1.42
@@ -1,6 +1,6 @@
 Name:           gtkmm24
 Version:        2.13.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
@@ -8,6 +8,8 @@
 License:        LGPLv2+
 URL:            http://gtkmm.sourceforge.net/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.10/gtkmm-%{version}.tar.bz2
+# Patch pulled from svn to make compatible with GTK 2.14
+Patch0:		gtkmm-2.13.7-compile-with-gtk0214.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glibmm24-devel >= 2.16.0
@@ -55,6 +57,18 @@
 %prep
 %setup -q -n gtkmm-%{version}
 
+# Temporary fixes until 2.14 is released
+# All already applied in svn
+%patch0 -p0 -b .svn
+rm -f gtk/gtkmm/widget.* gtk/gtkmm/selectiondata.*
+( cd gtk/src
+  for f in widget selectiondata ; do
+    `pkg-config --variable=gmmprocdir glibmm-2.4`/gmmproc \
+      -I ../../tools/m4 --defs . $f . ../gtkmm || exit 1
+  done
+)
+# Temporary fixes end
+
 
 %build
 %configure %{!?_with_static: --disable-static} --enable-shared  --disable-demos
@@ -109,6 +123,10 @@
 
 
 %changelog
+* Fri Sep  5 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.13.7-2
+- Patch from svn temporarily to make compatible with GTK 2.14
+  (bug 461227)
+
 * Sun Aug 24 2008 Denis Leroy <denis at poolshark.org> - 2.13.7-1
 - Update to upstream 2.13.7, with pangomm split
 



From pkgdb at fedoraproject.org  Fri Sep  5 07:40:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 07:40:36 +0000
Subject: [pkgdb] iok (Fedora EPEL, 5) updated by petersen
Message-ID: <20080905074036.31AEE2086F6@bastion.fedora.phx.redhat.com>

petersen added a Fedora EPEL 5 branch for iok
petersen has set commit to Approved for uberpackager on iok (Fedora EPEL 5)
petersen has set build to Approved for uberpackager on iok (Fedora EPEL 5)
petersen has set checkout to Approved for uberpackager on iok (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iok



From till at fedoraproject.org  Fri Sep  5 08:26:22 2008
From: till at fedoraproject.org (Till Maas)
Date: Fri,  5 Sep 2008 08:26:22 +0000 (UTC)
Subject: rpms/pam_mount/devel .cvsignore, 1.14, 1.15 pam_mount.spec, 1.37,
	1.38 sources, 1.15,
	1.16 pam_mount-0.41-missing_initialization_or.patch, 1.1, NONE
Message-ID: <20080905082622.9A1BE70121@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3408

Modified Files:
	.cvsignore pam_mount.spec sources 
Removed Files:
	pam_mount-0.41-missing_initialization_or.patch 
Log Message:
* Fri Sep 05 2008 Till Maas <opensource at till.name> - 0.47-1
- Update to new version, that includes a security fix:
  https://sourceforge.net/project/shownotes.php?release_id=624240



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	17 Jun 2008 09:38:46 -0000	1.14
+++ .cvsignore	5 Sep 2008 08:25:52 -0000	1.15
@@ -1 +1 @@
-pam_mount-0.41.tar.bz2
+pam_mount-0.47.tar.lzma


Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- pam_mount.spec	23 Jun 2008 12:23:02 -0000	1.37
+++ pam_mount.spec	5 Sep 2008 08:25:52 -0000	1.38
@@ -1,16 +1,13 @@
 Name:           pam_mount
-Version:        0.41
-Release:        2%{?dist}
+Version:        0.47
+Release:        1%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
 Group:          System Environment/Base
 # The library and binary are LGPLv2+, the scripts are GPLv2+
 License:        LGPLv2+ and GPLv2+
 URL:            http://pam-mount.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.bz2
-# from Upstream:
-# http://dev.medozas.de/gitweb.cgi?p=pam_mount;a=blobdiff;f=src/rdconf1.c;h=593ae9dd68f159be374a43a8eda706f1f40897a2;hp=e743d48232695b6e1b4a7b9b4edb2793d1b87fab;hb=3760bbe48ae89398d5ee895034e9ee7cf3cd0d84;hpb=464d1c0a1b9e0f2f696ae423c91ddfaf9797bac6
-Patch0:         pam_mount-0.41-missing_initialization_or.patch
+Source0:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.lzma
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel, pam-devel, openssl-devel
@@ -42,8 +39,8 @@
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .missing_initialization_or
+%setup -q -T
+lzma -c -d %SOURCE0 | tar -xvvf - -C ..
 
 
 %build
@@ -53,7 +50,6 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT V=verbose
 
@@ -87,6 +83,7 @@
 %{_bindir}/mount_ehd
 %{_bindir}/passwdehd
 %{_bindir}/pmt-fd0ssh
+%{_bindir}/pmt-ofl
 /sbin/mount.crypt
 /sbin/umount.crypt
 %{_mandir}/man?/*
@@ -94,6 +91,10 @@
 
 
 %changelog
+* Fri Sep 05 2008 Till Maas <opensource at till.name> - 0.47-1
+- Update to new version, that includes a security fix:
+  https://sourceforge.net/project/shownotes.php?release_id=624240
+
 * Mon Jun 23 2008 Till Maas <opensource at till.name> - 0.41-2
 - Add patch to fix <or> handling in config file, reference:
   Red Hat Bugzilla #448485 comment 9


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	17 Jun 2008 09:38:46 -0000	1.15
+++ sources	5 Sep 2008 08:25:52 -0000	1.16
@@ -1 +1 @@
-0fd2ad3ea0ac111934816960134baf8b  pam_mount-0.41.tar.bz2
+5ef5d12af86a3fe61d1bb0d557f034ac  pam_mount-0.47.tar.lzma


--- pam_mount-0.41-missing_initialization_or.patch DELETED ---



From till at fedoraproject.org  Fri Sep  5 08:32:46 2008
From: till at fedoraproject.org (Till Maas)
Date: Fri,  5 Sep 2008 08:32:46 +0000 (UTC)
Subject: rpms/pam_mount/devel pam_mount.spec,1.38,1.39
Message-ID: <20080905083246.CAD1670121@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5304

Modified Files:
	pam_mount.spec 
Log Message:
* Fri Sep 05 2008 Till Maas <opensource at till.name> - 0.47-1
- Update to new version that includes a security fix:
  https://sourceforge.net/project/shownotes.php?release_id=624240
- Add lzma BR and unpack source manually



Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- pam_mount.spec	5 Sep 2008 08:25:52 -0000	1.38
+++ pam_mount.spec	5 Sep 2008 08:32:16 -0000	1.39
@@ -13,6 +13,7 @@
 BuildRequires:  glib2-devel, pam-devel, openssl-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  libHX-devel >= 1.18
+BuildRequires:  lzma
 Requires:       pam, lsof
 Requires:       psmisc
 Requires:       libHX >= 1.18
@@ -39,7 +40,7 @@
 
 
 %prep
-%setup -q -T
+%setup -q -T -c
 lzma -c -d %SOURCE0 | tar -xvvf - -C ..
 
 
@@ -92,8 +93,9 @@
 
 %changelog
 * Fri Sep 05 2008 Till Maas <opensource at till.name> - 0.47-1
-- Update to new version, that includes a security fix:
+- Update to new version that includes a security fix:
   https://sourceforge.net/project/shownotes.php?release_id=624240
+- Add lzma BR and unpack source manually
 
 * Mon Jun 23 2008 Till Maas <opensource at till.name> - 0.41-2
 - Add patch to fix <or> handling in config file, reference:



From jakub at fedoraproject.org  Fri Sep  5 08:44:25 2008
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri,  5 Sep 2008 08:44:25 +0000 (UTC)
Subject: rpms/gcc/devel gcc43-pr37189.patch, NONE,
	1.1 gcc43-x86_64-va_start.patch, NONE, 1.1 .cvsignore, 1.242,
	1.243 gcc43.spec, 1.40, 1.41 sources, 1.245,
	1.246 gcc43-fortran-debug1.patch, 1.1,
	NONE gcc43-fortran-debug10.patch, 1.2,
	NONE gcc43-fortran-debug11.patch, 1.1,
	NONE gcc43-fortran-debug2.patch, 1.2,
	NONE gcc43-fortran-debug3.patch, 1.1,
	NONE gcc43-fortran-debug4.patch, 1.1,
	NONE gcc43-fortran-debug5.patch, 1.1,
	NONE gcc43-fortran-debug6.patch, 1.1,
	NONE gcc43-fortran-debug7.patch, 1.1,
	NONE gcc43-fortran-debug8.patch, 1.1,
	NONE gcc43-fortran-debug9.patch, 1.1, NONE gcc43-pr37248.patch,
	1.2, NONE
Message-ID: <20080905084425.3FA8070121@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8814

Modified Files:
	.cvsignore gcc43.spec sources 
Added Files:
	gcc43-pr37189.patch gcc43-x86_64-va_start.patch 
Removed Files:
	gcc43-fortran-debug1.patch gcc43-fortran-debug10.patch 
	gcc43-fortran-debug11.patch gcc43-fortran-debug2.patch 
	gcc43-fortran-debug3.patch gcc43-fortran-debug4.patch 
	gcc43-fortran-debug5.patch gcc43-fortran-debug6.patch 
	gcc43-fortran-debug7.patch gcc43-fortran-debug8.patch 
	gcc43-fortran-debug9.patch gcc43-pr37248.patch 
Log Message:
4.3.2-2


gcc43-pr37189.patch:

--- NEW FILE gcc43-pr37189.patch ---
2008-09-03  Jakub Jelinek  <jakub at redhat.com>

	PR c++/37189
	* cp-tree.h (defer_mark_used_calls, deferred_mark_used_calls): New
	extern decls.
	* decl2.c (mark_used): If defer_mark_used_calls, push decl into
	deferred_mark_used_calls vector and exit early.
	* decl.c (defer_mark_used_calls, deferred_mark_used_calls): New
	variables.
	(finish_function): Set defer_mark_used_calls for the duration of the
	function.  Call mark_used on any queued decls.

	PR c++/37189
	* g++.dg/gomp/pr37189.C: New test.

--- gcc/cp/decl2.c	(revision 139954)
+++ gcc/cp/decl2.c	(revision 139955)
@@ -3776,6 +3776,15 @@ mark_used (tree decl)
   /* If we don't need a value, then we don't need to synthesize DECL.  */
   if (skip_evaluation)
     return;
+
+  /* If within finish_function, defer the rest until that function
+     finishes, otherwise it might recurse.  */
+  if (defer_mark_used_calls)
+    {
+      VEC_safe_push (tree, gc, deferred_mark_used_calls, decl);
+      return;
+    }
+
   /* Normally, we can wait until instantiation-time to synthesize
      DECL.  However, if DECL is a static data member initialized with
      a constant, we need the value right now because a reference to
--- gcc/cp/decl.c	(revision 139954)
+++ gcc/cp/decl.c	(revision 139955)
@@ -227,6 +227,11 @@ struct named_label_entry GTY(())
    function, two inside the body of a function in a local class, etc.)  */
 int function_depth;
 
+/* To avoid unwanted recursion, finish_function defers all mark_used calls
+   encountered during its execution until it finishes.  */
+bool defer_mark_used_calls;
+VEC(tree, gc) *deferred_mark_used_calls;
+
 /* States indicating how grokdeclarator() should handle declspecs marked
    with __attribute__((deprecated)).  An object declared as
    __attribute__((deprecated)) suppresses warnings of uses of other
@@ -12033,6 +12038,9 @@ finish_function (int flags)
   if (fndecl == NULL_TREE)
     return error_mark_node;
 
+  gcc_assert (!defer_mark_used_calls);
+  defer_mark_used_calls = true;
+
   if (DECL_NONSTATIC_MEMBER_FUNCTION_P (fndecl)
       && DECL_VIRTUAL_P (fndecl)
       && !processing_template_decl)
@@ -12232,6 +12240,17 @@ finish_function (int flags)
        cxx_pop_function_context and then reset via pop_function_context.  */
     current_function_decl = NULL_TREE;
 
+  defer_mark_used_calls = false;
+  if (deferred_mark_used_calls)
+    {
+      unsigned int i;
+      tree decl;
+
+      for (i = 0; VEC_iterate (tree, deferred_mark_used_calls, i, decl); i++)
+	mark_used (decl);
+      VEC_free (tree, gc, deferred_mark_used_calls);
+    }
+
   return fndecl;
 }
 
--- gcc/cp/cp-tree.h	(revision 139954)
+++ gcc/cp/cp-tree.h	(revision 139955)
@@ -4381,6 +4381,9 @@ extern void initialize_artificial_var		(
 extern tree check_var_type			(tree, tree);
 extern tree reshape_init (tree, tree);
 
+extern bool defer_mark_used_calls;
+extern GTY(()) VEC(tree, gc) *deferred_mark_used_calls;
+
 /* in decl2.c */
 extern bool check_java_method			(tree);
 extern tree build_memfn_type			(tree, tree, cp_cv_quals);
--- gcc/testsuite/g++.dg/gomp/pr37189.C	(revision 0)
+++ gcc/testsuite/g++.dg/gomp/pr37189.C	(revision 139955)
@@ -0,0 +1,27 @@
+// PR c++/37189
+// { dg-do compile }
+// { dg-options "-fopenmp" }
+
+struct S
+{
+  S () {}
+  S (S const &) {}
+};
+
+struct T
+{
+  S s;
+};
+
+void
+bar (T &)
+{
+}
+
+int
+foo ()
+{
+  T t;
+  #pragma omp task
+    bar (t);
+}

gcc43-x86_64-va_start.patch:

--- NEW FILE gcc43-x86_64-va_start.patch ---
2008-09-02  H.J. Lu  <hongjiu.lu at intel.com>
	    Jakub Jelinek  <jakub at redhat.com>

	* config/i386/i386.c (X86_64_VARARGS_SIZE): Removed.
	(setup_incoming_varargs_64): Set/check ix86_varargs_gpr_size and
	ix86_varargs_fpr_size.  Use ix86_varargs_gpr_size instead of
	REGPARM_MAX.  Don't set ix86_save_varrargs_registers.
	(ix86_va_start): Check ix86_varargs_gpr_size and
	ix86_varargs_fpr_size instead of cfun->va_list_gpr_size and
	cfun->va_list_fpr_size, respectively.  Subtract 8*REGPARM_MAX
	from frame pointer if ix86_varargs_gpr_size == 0.
	(ix86_compute_frame_layout): Updated.
	* config/i386/i386.h (ix86_save_varrargs_registers): Removed.
	(ix86_varargs_gpr_size): Define.
	(ix86_varargs_fpr_size): Likewise.
	(machine_function): Remove save_varrargs_registers.
	Add varargs_gpr_size and varargs_fpr_size.

	* gcc.target/i386/amd64-abi-3.c: New test.
	* gcc.target/i386/amd64-abi-4.c: Likewise.
	* gcc.target/i386/amd64-abi-5.c: Likewise.
	* gcc.target/i386/amd64-abi-6.c: Likewise.

--- gcc/config/i386/i386.h	(revision 139909)
+++ gcc/config/i386/i386.h	(revision 139910)
@@ -2440,7 +2440,8 @@ struct machine_function GTY(())
   struct stack_local_entry *stack_locals;
   const char *some_ld_name;
   rtx force_align_arg_pointer;
-  int save_varrargs_registers;
+  int varargs_gpr_size;
+  int varargs_fpr_size;
   int accesses_prev_frame;
   int optimize_mode_switching[MAX_386_ENTITIES];
   int needs_cld;
@@ -2463,7 +2464,8 @@ struct machine_function GTY(())
 };
 
 #define ix86_stack_locals (cfun->machine->stack_locals)
-#define ix86_save_varrargs_registers (cfun->machine->save_varrargs_registers)
+#define ix86_varargs_gpr_size (cfun->machine->varargs_gpr_size)
+#define ix86_varargs_fpr_size (cfun->machine->varargs_fpr_size)
 #define ix86_optimize_mode_switching (cfun->machine->optimize_mode_switching)
 #define ix86_current_function_needs_cld (cfun->machine->needs_cld)
 #define ix86_tls_descriptor_calls_expanded_in_cfun \
--- gcc/config/i386/i386.c	(revision 139909)
+++ gcc/config/i386/i386.c	(revision 139910)
@@ -1616,9 +1616,6 @@ rtx ix86_compare_op0 = NULL_RTX;
 rtx ix86_compare_op1 = NULL_RTX;
 rtx ix86_compare_emitted = NULL_RTX;
 
-/* Size of the register save area.  */
-#define X86_64_VARARGS_SIZE (REGPARM_MAX * UNITS_PER_WORD + SSE_REGPARM_MAX * 16)
-
 /* Define the structure for the machine field in struct function.  */
 
 struct stack_local_entry GTY(())
@@ -4976,11 +4973,22 @@ setup_incoming_varargs_64 (CUMULATIVE_AR
   alias_set_type set;
   int i;
 
-  if (! cfun->va_list_gpr_size && ! cfun->va_list_fpr_size)
+  /* GPR size of varargs save area.  */
+  if (cfun->va_list_gpr_size)
+    ix86_varargs_gpr_size = REGPARM_MAX * UNITS_PER_WORD;
+  else
+    ix86_varargs_gpr_size = 0;
+
+  /* FPR size of varargs save area.  We don't need it if we don't pass
+     anything in SSE registers.  */
+  if (cum->sse_nregs && cfun->va_list_fpr_size)
+    ix86_varargs_fpr_size = SSE_REGPARM_MAX * 16;
+  else
+    ix86_varargs_fpr_size = 0;
+
+  if (! ix86_varargs_gpr_size && ! ix86_varargs_fpr_size)
     return;
 
-  /* Indicate to allocate space on the stack for varargs save area.  */
-  ix86_save_varrargs_registers = 1;
   /* We need 16-byte stack alignment to save SSE registers.  If user
      asked for lower preferred_stack_boundary, lets just hope that he knows
      what he is doing and won't varargs SSE values.
@@ -5006,7 +5014,7 @@ setup_incoming_varargs_64 (CUMULATIVE_AR
 					x86_64_int_parameter_registers[i]));
     }
 
-  if (cum->sse_nregs && cfun->va_list_fpr_size)
+  if (ix86_varargs_fpr_size)
     {
       /* Now emit code to save SSE registers.  The AX parameter contains number
 	 of SSE parameter registers used to call this function.  We use
@@ -5041,7 +5049,7 @@ setup_incoming_varargs_64 (CUMULATIVE_AR
       tmp_reg = gen_reg_rtx (Pmode);
       emit_insn (gen_rtx_SET (VOIDmode, tmp_reg,
 			      plus_constant (save_area,
-					     8 * REGPARM_MAX + 127)));
+					     ix86_varargs_gpr_size + 127)));
       mem = gen_rtx_MEM (BLKmode, plus_constant (tmp_reg, -127));
       MEM_NOTRAP_P (mem) = 1;
       set_mem_alias_set (mem, set);
@@ -5145,7 +5153,7 @@ ix86_va_start (tree valist, rtx nextarg)
       expand_expr (t, const0_rtx, VOIDmode, EXPAND_NORMAL);
     }
 
-  if (cfun->va_list_fpr_size)
+  if (TARGET_SSE && cfun->va_list_fpr_size)
     {
       type = TREE_TYPE (fpr);
       t = build2 (GIMPLE_MODIFY_STMT, type, fpr,
@@ -5164,12 +5172,15 @@ ix86_va_start (tree valist, rtx nextarg)
   TREE_SIDE_EFFECTS (t) = 1;
   expand_expr (t, const0_rtx, VOIDmode, EXPAND_NORMAL);
 
-  if (cfun->va_list_gpr_size || cfun->va_list_fpr_size)
+  if (ix86_varargs_gpr_size || ix86_varargs_fpr_size)
     {
       /* Find the register save area.
 	 Prologue of the function save it right above stack frame.  */
       type = TREE_TYPE (sav);
       t = make_tree (type, frame_pointer_rtx);
+      if (!ix86_varargs_gpr_size)
+	t = build2 (POINTER_PLUS_EXPR, type, t,
+		    size_int (-8 * REGPARM_MAX));
       t = build2 (GIMPLE_MODIFY_STMT, type, sav, t);
       TREE_SIDE_EFFECTS (t) = 1;
       expand_expr (t, const0_rtx, VOIDmode, EXPAND_NORMAL);
@@ -6079,13 +6090,8 @@ ix86_compute_frame_layout (struct ix86_f
   offset += frame->nregs * UNITS_PER_WORD;
 
   /* Va-arg area */
-  if (ix86_save_varrargs_registers)
-    {
-      offset += X86_64_VARARGS_SIZE;
-      frame->va_arg_size = X86_64_VARARGS_SIZE;
-    }
-  else
-    frame->va_arg_size = 0;
+  frame->va_arg_size = ix86_varargs_gpr_size + ix86_varargs_fpr_size;
+  offset += frame->va_arg_size;
 
   /* Align start of frame for local function.  */
   frame->padding1 = ((offset + stack_alignment_needed - 1)
--- gcc/testsuite/gcc.target/i386/amd64-abi-3.c	(revision 0)
+++ gcc/testsuite/gcc.target/i386/amd64-abi-3.c	(revision 139910)
@@ -0,0 +1,18 @@
+/* { dg-do compile } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-options "-O2 -mno-sse" } */
+/* { dg-final { scan-assembler "subq\[\\t \]*\\\$88,\[\\t \]*%rsp" } } */
+/* { dg-final { scan-assembler-not "subq\[\\t \]*\\\$216,\[\\t \]*%rsp" } } */
+
+#include <stdarg.h>
+
+void foo (va_list va_arglist);
+
+void
+test (int a1, ...)
+{
+  va_list va_arglist;
+  va_start (va_arglist, a1);
+  foo (va_arglist);
+  va_end (va_arglist);
+}
--- gcc/testsuite/gcc.target/i386/amd64-abi-5.c	(revision 0)
+++ gcc/testsuite/gcc.target/i386/amd64-abi-5.c	(revision 139910)
@@ -0,0 +1,64 @@
+/* { dg-do run } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-options "-O2" } */
+
+#include <stdarg.h>
+#include <assert.h>
+
+int n1 = 30;
+double n2 = 324;
+double n3 = 39494.94;
+double n4 = 407;
+double n5 = 32.304;
+double n6 = 394.14;
+double n7 = 4.07;
+double n8 = 32.4;
+double n9 = 314.194;
+double n10 = 0.1407;
+
+int e1;
+double e2;
+double e3;
+double e4;
+double e5;
+double e6;
+double e7;
+double e8;
+double e9;
+double e10;
+
+static void
+__attribute__((noinline))
+test (int a1, ...)
+{
+  e1 = a1;
+  va_list va_arglist;
+  va_start (va_arglist, a1);
+  e2 = va_arg (va_arglist, double);
+  e3 = va_arg (va_arglist, double);
+  e4 = va_arg (va_arglist, double);
+  e5 = va_arg (va_arglist, double);
+  e6 = va_arg (va_arglist, double);
+  e7 = va_arg (va_arglist, double);
+  e8 = va_arg (va_arglist, double);
+  e9 = va_arg (va_arglist, double);
+  e10 = va_arg (va_arglist, double);
+  va_end (va_arglist);
+}
+
+int
+main ()
+{
+  test (n1, n2, n3, n4, n5, n6, n7, n8, n9, n10);
+  assert (n1 == e1);
+  assert (n2 == e2);
+  assert (n3 == e3);
+  assert (n4 == e4);
+  assert (n5 == e5);
+  assert (n6 == e6);
+  assert (n7 == e7);
+  assert (n8 == e8);
+  assert (n9 == e9);
+  assert (n10 == e10);
+  return 0;
+}
--- gcc/testsuite/gcc.target/i386/amd64-abi-4.c	(revision 0)
+++ gcc/testsuite/gcc.target/i386/amd64-abi-4.c	(revision 139910)
@@ -0,0 +1,47 @@
+/* { dg-do run } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-options "-O2 -mno-sse" } */
+
+#include <stdarg.h>
+#include <assert.h>
+
+int n1 = 30;
+int n2 = 324;
+void *n3 = (void *) &n2;
+int n4 = 407;
+
+int e1;
+int e2;
+void *e3;
+int e4;
+
+static void
+__attribute__((noinline))
+foo (va_list va_arglist)
+{
+  e2 = va_arg (va_arglist, int);
+  e3 = va_arg (va_arglist, void *);
+  e4 = va_arg (va_arglist, int);
+}
+
+static void
+__attribute__((noinline))
+test (int a1, ...)
+{
+  e1 = a1;
+  va_list va_arglist;
+  va_start (va_arglist, a1);
+  foo (va_arglist);
+  va_end (va_arglist);
+}
+
+int
+main ()
+{
+  test (n1, n2, n3, n4);
+  assert (n1 == e1);
+  assert (n2 == e2);
+  assert (n3 == e3);
+  assert (n4 == e4);
+  return 0;
+}
--- gcc/testsuite/gcc.target/i386/amd64-abi-6.c	(revision 0)
+++ gcc/testsuite/gcc.target/i386/amd64-abi-6.c	(revision 139910)
@@ -0,0 +1,71 @@
+/* { dg-do run } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-options "-O2" } */
+
+#include <stdarg.h>
+#include <assert.h>
+
+int n1 = 30;
+double n2 = 324;
+double n3 = 39494.94;
+double n4 = 407;
+double n5 = 32.304;
+double n6 = 394.14;
+double n7 = 4.07;
+double n8 = 32.4;
+double n9 = 314.194;
+double n10 = 0.1407;
+
+int e1;
+double e2;
+double e3;
+double e4;
+double e5;
+double e6;
+double e7;
+double e8;
+double e9;
+double e10;
+
+static void
+__attribute__((noinline))
+foo (va_list va_arglist)
+{
+  e2 = va_arg (va_arglist, double);
+  e3 = va_arg (va_arglist, double);
+  e4 = va_arg (va_arglist, double);
+  e5 = va_arg (va_arglist, double);
+  e6 = va_arg (va_arglist, double);
+  e7 = va_arg (va_arglist, double);
+  e8 = va_arg (va_arglist, double);
+  e9 = va_arg (va_arglist, double);
+  e10 = va_arg (va_arglist, double);
+}
+
+static void
+__attribute__((noinline))
+test (int a1, ...)
+{
+  va_list va_arglist;
+  e1 = a1;
+  va_start (va_arglist, a1);
+  foo (va_arglist);
+  va_end (va_arglist);
+}
+
+int
+main ()
+{
+  test (n1, n2, n3, n4, n5, n6, n7, n8, n9, n10);
+  assert (n1 == e1);
+  assert (n2 == e2);
+  assert (n3 == e3);
+  assert (n4 == e4);
+  assert (n5 == e5);
+  assert (n6 == e6);
+  assert (n7 == e7);
+  assert (n8 == e8);
+  assert (n9 == e9);
+  assert (n10 == e10);
+  return 0;
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- .cvsignore	29 Aug 2008 11:16:06 -0000	1.242
+++ .cvsignore	5 Sep 2008 08:43:54 -0000	1.243
@@ -1,2 +1,2 @@
-gcc-4.3.2-20080829.tar.bz2
+gcc-4.3.2-20080905.tar.bz2
 fastjar-0.95.tar.gz


Index: gcc43.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc43.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gcc43.spec	29 Aug 2008 11:16:06 -0000	1.40
+++ gcc43.spec	5 Sep 2008 08:43:54 -0000	1.41
@@ -1,6 +1,9 @@
-%define DATE 20080829
+%define DATE 20080905
+%define SVNREV 140029
 %define gcc_version 4.3.2
-%define gcc_release 1
+# Note, gcc_release must be integer, if you want to add suffixes to
+# %{release}, append them after %{gcc_release} on Release: line.
+%define gcc_release 2
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -37,6 +40,10 @@
 # restrictions.
 License: GPLv3+ and GPLv2+ with exceptions
 Group: Development/Languages
+# The source for this package was pulled from upstream's vcs.  Use the
+# following commands to generate the tarball:
+# svn export svn://gcc.gnu.org/svn/gcc/branches/redhat/gcc-4_3-branch@%{SVNREV} gcc-%{version}-%{DATE}
+# tar cf - gcc-%{version}-%{DATE} | bzip2 -9 > gcc-%{version}-%{DATE}.tar.bz2
 Source0: gcc-%{version}-%{DATE}.tar.bz2
 Source1: libgcc_post_upgrade.c
 Source2: README.libgcjwebplugin.so
@@ -44,7 +51,7 @@
 %define fastjar_ver 0.95
 Source4: http://download.savannah.nongnu.org/releases/fastjar/fastjar-%{fastjar_ver}.tar.gz
 URL: http://gcc.gnu.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n))
 # Need binutils with -pie support >= 2.14.90.0.4-4
 # Need binutils which can omit dot symbols and overlap .opd on ppc64 >= 2.15.91.0.2-4
 # Need binutils which handle -msecure-plt on ppc >= 2.16.91.0.2-2
@@ -103,27 +110,27 @@
 %endif
 Requires: libgcc >= %{version}-%{release}
 Requires: libgomp = %{version}-%{release}
-Obsoletes: gcc3
-Obsoletes: egcs
+#Obsoletes: gcc3
+#Obsoletes: egcs
 %ifarch sparc
-Obsoletes: gcc-sparc32
-Obsoletes: gcc-c++-sparc32
+#Obsoletes: gcc-sparc32
+#Obsoletes: gcc-c++-sparc32
 %endif
 %ifarch ppc
-Obsoletes: gcc-ppc32
-Obsoletes: gcc-c++-ppc32
+#Obsoletes: gcc-ppc32
+#Obsoletes: gcc-c++-ppc32
 %endif
-Obsoletes: gcc-chill
+#Obsoletes: gcc-chill
 %if !%{build_ada}
 Obsoletes: gcc-gnat < %{version}-%{release}
 Obsoletes: libgnat < %{version}-%{release}
 %endif
 %ifarch sparc sparc64
-Obsoletes: egcs64
+#Obsoletes: egcs64
 %endif
-Obsoletes: gcc34
-Obsoletes: gcc35
-Obsoletes: gcc4
+#Obsoletes: gcc34
+#Obsoletes: gcc35
+#Obsoletes: gcc4
 Prereq: /sbin/install-info
 AutoReq: true
 
@@ -143,18 +150,8 @@
 Patch14: gcc43-rh251682.patch
 Patch15: gcc43-sparc-config-detection.patch
 Patch16: gcc43-libgomp-omp_h-multilib.patch
-Patch17: gcc43-fortran-debug1.patch
-Patch18: gcc43-fortran-debug2.patch
-Patch19: gcc43-fortran-debug3.patch
-Patch20: gcc43-fortran-debug4.patch
-Patch21: gcc43-fortran-debug5.patch
-Patch22: gcc43-fortran-debug6.patch
-Patch23: gcc43-fortran-debug7.patch
-Patch24: gcc43-fortran-debug8.patch
-Patch25: gcc43-fortran-debug9.patch
-Patch26: gcc43-fortran-debug10.patch
-Patch27: gcc43-fortran-debug11.patch
-Patch28: gcc43-pr37248.patch
+Patch17: gcc43-x86_64-va_start.patch
+Patch18: gcc43-pr37189.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -190,10 +187,10 @@
 Requires: gcc = %{version}-%{release}
 Requires: libstdc++ = %{version}-%{release}
 Requires: libstdc++-devel = %{version}-%{release}
-Obsoletes: gcc3-c++
-Obsoletes: gcc34-c++
-Obsoletes: gcc35-c++
-Obsoletes: gcc4-c++
+#Obsoletes: gcc3-c++
+#Obsoletes: gcc34-c++
+#Obsoletes: gcc35-c++
+#Obsoletes: gcc4-c++
 Autoreq: true
 
 %description c++
@@ -204,8 +201,8 @@
 %package -n libstdc++
 Summary: GNU Standard C++ Library
 Group: System Environment/Libraries
-Obsoletes: libstdc++3
-Obsoletes: libstdc++34
+#Obsoletes: libstdc++3
+#Obsoletes: libstdc++34
 Autoreq: true
 
 %description -n libstdc++
@@ -216,8 +213,8 @@
 Summary: Header files and libraries for C++ development
 Group: Development/Libraries
 Requires: libstdc++ = %{version}-%{release}, %{_prefix}/%{_lib}/libstdc++.so.6
-Obsoletes: libstdc++3-devel
-Obsoletes: libstdc++34-devel
+#Obsoletes: libstdc++3-devel
+#Obsoletes: libstdc++34-devel
 Autoreq: true
 
 %description -n libstdc++-devel
@@ -230,7 +227,7 @@
 Group: Development/Languages
 Requires: gcc = %{version}-%{release}
 Requires: libobjc = %{version}-%{release}
-Obsoletes: gcc3-objc
+#Obsoletes: gcc3-objc
 Autoreq: true
 
 %description objc
@@ -263,9 +260,9 @@
 Requires: libgfortran = %{version}-%{release}
 BuildRequires: gmp-devel >= 4.1.2-8, mpfr-devel >= 2.2.1
 Prereq: /sbin/install-info
-Obsoletes: gcc3-g77
-Obsoletes: gcc-g77
-Obsoletes: gcc4-gfortran
+#Obsoletes: gcc3-g77
+#Obsoletes: gcc-g77
+#Obsoletes: gcc4-gfortran
 Autoreq: true
 
 %description gfortran
@@ -275,7 +272,7 @@
 %package -n libgfortran
 Summary: Fortran 95 runtime
 Group: System Environment/Libraries
-Obsoletes: libf2c
+#Obsoletes: libf2c
 Autoreq: true
 
 %description -n libgfortran
@@ -320,10 +317,10 @@
 Requires: libgcj = %{version}-%{release}
 Requires: libgcj-devel = %{version}-%{release}
 Requires: /usr/share/java/eclipse-ecj.jar
-Obsoletes: gcc3-java
-Obsoletes: gcc34-java
-Obsoletes: gcc35-java
-Obsoletes: gcc4-java
+#Obsoletes: gcc3-java
+#Obsoletes: gcc34-java
+#Obsoletes: gcc35-java
+#Obsoletes: gcc4-java
 Prereq: /sbin/install-info
 Autoreq: true
 
@@ -348,10 +345,10 @@
 BuildRequires: libXtst-devel
 BuildRequires: libXt-devel
 %endif
-Obsoletes: gcc-libgcj
-Obsoletes: libgcj3
-Obsoletes: libgcj34
-Obsoletes: libgcj4
+#Obsoletes: gcc-libgcj
+#Obsoletes: libgcj3
+#Obsoletes: libgcj34
+#Obsoletes: libgcj4
 Autoreq: true
 
 %description -n libgcj
@@ -364,9 +361,9 @@
 Requires: libgcj = %{version}-%{release}, %{_prefix}/%{_lib}/libgcj.so.9
 Requires: zlib-devel, %{_prefix}/%{_lib}/libz.so
 Requires: /bin/awk
-Obsoletes: libgcj3-devel
-Obsoletes: libgcj34-devel
-Obsoletes: libgcj4-devel
+#Obsoletes: libgcj3-devel
+#Obsoletes: libgcj34-devel
+#Obsoletes: libgcj4-devel
 Autoreq: false
 Autoprov: false
 
@@ -378,7 +375,7 @@
 Summary: Java library sources from GCC4 preview
 Group: System Environment/Libraries
 Requires: libgcj = %{version}-%{release}
-Obsoletes: libgcj4-src
+#Obsoletes: libgcj4-src
 Autoreq: true
 
 %description -n libgcj-src
@@ -389,7 +386,7 @@
 Group: Development/Languages
 Prereq: /sbin/install-info
 %ifarch ia64
-Obsoletes: gnupro
+#Obsoletes: gnupro
 %endif
 Autoreq: true
 
@@ -419,7 +416,7 @@
 Summary: Ada 95 support for GCC
 Group: Development/Languages
 Requires: gcc = %{version}-%{release}, libgnat = %{version}-%{release}
-Obsoletes: gnat-devel, gcc3-gnat
+#Obsoletes: gnat-devel, gcc3-gnat
 Prereq: /sbin/install-info
 Autoreq: true
 
@@ -430,7 +427,7 @@
 %package -n libgnat
 Summary: GNU Ada 95 runtime shared libraries
 Group: System Environment/Libraries
-Obsoletes: gnat libgnat3
+#Obsoletes: gnat libgnat3
 Autoreq: true
 
 %description -n libgnat
@@ -455,18 +452,8 @@
 %patch14 -p0 -b .rh251682~
 %patch15 -p0 -b .sparc-config-detection~
 %patch16 -p0 -b .libgomp-omp_h-multilib~
-%patch17 -p0 -b .fortran-debug1~
-%patch18 -p0 -b .fortran-debug2~
-%patch19 -p0 -b .fortran-debug3~
-%patch20 -p0 -b .fortran-debug4~
-%patch21 -p0 -b .fortran-debug5~
-%patch22 -p0 -b .fortran-debug6~
-%patch23 -p0 -b .fortran-debug7~
-%patch24 -p0 -b .fortran-debug8~
-%patch25 -p0 -b .fortran-debug9~
-%patch26 -p0 -b .fortran-debug10~
-%patch27 -p0 -b .fortran-debug11~
-%patch28 -p0 -b .pr37248~
+%patch17 -p0 -b .x86_64-va_start~
+%patch18 -p0 -b .pr37189~
 
 tar xzf %{SOURCE4}
 
@@ -489,6 +476,38 @@
 
 ./contrib/gcc_update --touch
 
+# To make rpmlint happy (argh), fix up names in ChangeLog entries to valid UTF-8
+LC_ALL=C sed -i \
+  -e 's/D\(o\|\xf6\)nmez/D\xc3\xb6nmez/' \
+  -e 's/\(Av\|\x81\xc1v\|\xc1v\|\xef\xbf\xbdv\?\|\x81\xc3\x81v\|\xc3v\)ila/\xc3\x81vila/' \
+  -e 's/Esp\(in\|\x81\xedn\|\xedn\|\xef\xbf\xbdn\?\|\xef\xbf\xbd\xadn\|\x81\xc3\xadn\)dola/Esp\xc3\xadndola/' \
+  -e 's/Schl\(u\|\xef\xbf\xbd\|\xfcu\?\|\x81\xfc\|\x81\xc3\xbc\|\xc3\xaf\xc2\xbf\xc2\xbd\|\xef\xbf\xbd\xef\xbf\xbd\xef\xbf\xbd\xc2\xbc\)ter/Schl\xc3\xbcter/' \
+  -e 's/Humi\(e\|\xe8\)res/Humi\xc3\xa8res/' \
+  -e 's/L\(ow\|\xc3\xaf\xc2\xbf\xc2\xbd\|oew\|\xf6w\)is/L\xc3\xb6wis/' \
+  -e 's/G\xfctlein/G\xc3\xbctlein/' \
+  -e 's/G\xe1[b]or/G\xc3\xa1bor/' \
+  -e 's/L\xf3ki/L\xc3\xb3ki/' \
+  -e 's/Fautr\xc3 /Fautr\xc3\xa9 /' \
+  -e 's/S\xe9[b]astian/S\xc3\xa9bastian/' \
+  -e 's/Th\xef\xbf\xbd[d]ore/Th\xc3\xa9odore/' \
+  -e 's/Cors\xc3\xc2\xa9pius/Cors\xc3\xa9pius/' \
+  -e 's/K\xfchl/K\xc3\xbchl/' \
+  -e 's/R\xf6nnerup/R\xc3\xb6nnerup/' \
+  -e 's/L\xf8vset/L\xc3\xb8vset/' \
+  -e 's/Ph\x81\xfb\x81\xf4ng-Th\x81\xe5o/Ph\xc3\xbb\xc3\xb4ng-Th\xc3\xa5o/' \
+  -e 's/V\x81\xf5/V\xc3\xb5/' \
+  -e 's/J\xf6nsson/J\xc3\xb6nsson/' \
+  -e 's/V\xef\xbf\xbdis\xef\xbf\xbdnen/V\xc3\xa4is\xc3\xa4nen/' \
+  -e 's/J\xef\xbf\xbdrg/J\xc3\xb6rg/' \
+  -e 's/M\xef\xbf\xbdsli/M\xc3\xb6sli/' \
+  -e 's/R\xe4ty/R\xc3\xa4ty/' \
+  -e 's/2003\xc2\xad-/2003-/' \
+  -e 's/\xc2\xa0/ /g' \
+  -e 's/ \xa0/  /g' \
+  -e 's/\xa0 //' \
+  `find . -name \*ChangeLog\*`
+LC_ALL=C sed -i -e 's/\xa0/ /' gcc/doc/options.texi
+
 %ifarch ppc
 if [ -d libstdc++-v3/config/abi/post/powerpc64-linux-gnu ]; then
   mkdir -p libstdc++-v3/config/abi/post/powerpc64-linux-gnu/64
@@ -523,12 +542,6 @@
 mkdir obj-%{gcc_target_platform}
 cd obj-%{gcc_target_platform}
 
-if [ ! -f /usr/lib/locale/de_DE/LC_CTYPE ]; then
-  mkdir locale
-  localedef -f ISO-8859-1 -i de_DE locale/de_DE
-  export LOCPATH=`pwd`/locale:/usr/lib/locale
-fi
-
 %if %{build_java}
 %if !%{bootstrap_java}
 # If we don't have gjavah in $PATH, try to build it with the old gij
@@ -738,10 +751,6 @@
 
 cd obj-%{gcc_target_platform}
 
-if [ ! -f /usr/lib/locale/de_DE/LC_CTYPE ]; then
-  export LOCPATH=`pwd`/locale:/usr/lib/locale
-fi
-
 %if %{build_java}
 export PATH=`pwd`/../fastjar-%{fastjar_ver}/obj-%{gcc_target_platform}${PATH:+:$PATH}
 %if !%{bootstrap_java}
@@ -1073,6 +1082,7 @@
 rm -f $FULLEPATH/install-tools/{mkheaders,fixincl}
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib/{32,64}/libiberty.a
 rm -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libssp*
+rm -f $RPM_BUILD_ROOT%{_prefix}/bin/gnative2ascii
 
 %ifarch %{multilib_64_archs}
 # Remove libraries for the other arch on multilib arches
@@ -1692,6 +1702,18 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Sep  5 2008 Jakub Jelinek <jakub at redhat.com> 4.3.2-2
+- update from gcc-4_3-branch
+  - PRs c++/37348, c/37261, fortran/36371, fortran/37193, middle-end/36449,
+	target/36332, target/37168
+- make ChangeLog files and gcc.info valid UTF-8, remove gnative2ascii from
+  gcc-gnat, comment out most of the Obsoletes (#225778)
+- on x86_64 decrease frame size in varargs functions that don't need saving
+  gpr or fpr registers
+- fix ICE on implicitly determined firstprivate where copy ctor or dtor
+  needs synthetization (PR c++/37189)
+- document how to recrease the tarball
+
 * Fri Aug 29 2008 Jakub Jelinek <jakub at redhat.com> 4.3.2-1
 - update from gcc-4_3-branch
   - 4.3.2 release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- sources	29 Aug 2008 11:16:06 -0000	1.245
+++ sources	5 Sep 2008 08:43:54 -0000	1.246
@@ -1,2 +1,2 @@
-69f70d92142466361146326f840a6185  gcc-4.3.2-20080829.tar.bz2
+373bfd18d804b93123d89b793967fb3b  gcc-4.3.2-20080905.tar.bz2
 92a70f9e56223b653bce0f58f90cf950  fastjar-0.95.tar.gz


--- gcc43-fortran-debug1.patch DELETED ---


--- gcc43-fortran-debug10.patch DELETED ---


--- gcc43-fortran-debug11.patch DELETED ---


--- gcc43-fortran-debug2.patch DELETED ---


--- gcc43-fortran-debug3.patch DELETED ---


--- gcc43-fortran-debug4.patch DELETED ---


--- gcc43-fortran-debug5.patch DELETED ---


--- gcc43-fortran-debug6.patch DELETED ---


--- gcc43-fortran-debug7.patch DELETED ---


--- gcc43-fortran-debug8.patch DELETED ---


--- gcc43-fortran-debug9.patch DELETED ---


--- gcc43-pr37248.patch DELETED ---



From caolanm at fedoraproject.org  Fri Sep  5 08:45:29 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  5 Sep 2008 08:45:29 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch, 1.1,
	1.2 workspace.i18n45.patch, 1.1, 1.2
Message-ID: <20080905084529.8092870121@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9685

Modified Files:
	openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch 
	workspace.i18n45.patch 
Log Message:
tweak up patches to apply cleanly

openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch:

Index: openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch	4 Sep 2008 17:27:15 -0000	1.1
+++ openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch	5 Sep 2008 08:44:59 -0000	1.2
@@ -5,23 +5,32 @@
 diff -u -r1.72.8.2 gtkframe.cxx
 --- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx	23 Jan 2008 17:17:10 -0000	1.72.8.2
 +++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx	4 Sep 2008 17:21:25 -0000
-@@ -757,7 +768,8 @@
-         nStyle &= ~SAL_FRAME_STYLE_FLOAT;
-     }
+@@ -745,6 +745,9 @@
+     m_aForeignTopLevelWindow = None;
+     m_nStyle = nStyle;
  
--    m_pWindow = GTK_WINDOW( gtk_widget_new( GTK_TYPE_WINDOW, "type", ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL, "visible", FALSE, NULL ) );
-+    GtkWindowType eWinType = ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL;
-+    m_pWindow = GTK_WINDOW( gtk_widget_new( GTK_TYPE_WINDOW, "type", eWinType, "visible", FALSE, NULL ) );
++    GtkWindowType eWinType = ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION))
++        ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL;
++
+     if( nStyle & SAL_FRAME_STYLE_SYSTEMCHILD )
+     {
+         m_pWindow = gtk_event_box_new();
+@@ -757,7 +760,7 @@
+         }
+     }
+     else
+-        m_pWindow = gtk_widget_new( GTK_TYPE_WINDOW, "type", ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL, "visible", FALSE, NULL );
++        m_pWindow = gtk_widget_new( GTK_TYPE_WINDOW, "type", eWinType, "visible", FALSE, NULL );
  	g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", this );
  
-     m_pParent = static_cast<GtkSalFrame*>(pParent);
-@@ -820,6 +832,9 @@
+     // force wm class hint
+@@ -817,6 +820,9 @@
  
      InitCommon();
  
 +    if (eWinType == GTK_WINDOW_TOPLEVEL)
-+        gdk_x11_window_set_user_time(GTK_WIDGET(m_pWindow)->window, GDK_CURRENT_TIME);
++        gdk_x11_window_set_user_time(GTK_WIDGET(m_pWindow)->window, gdk_x11_get_server_time (GTK_WIDGET (m_pWindow)->window));
 +
      if( bDecoHandling )
      {
-         gtk_window_set_resizable( m_pWindow, (nStyle & SAL_FRAME_STYLE_SIZEABLE) ? TRUE : FALSE );
+         gtk_window_set_resizable( GTK_WINDOW(m_pWindow), (nStyle & SAL_FRAME_STYLE_SIZEABLE) ? TRUE : FALSE );

workspace.i18n45.patch:

Index: workspace.i18n45.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.i18n45.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.i18n45.patch	2 Sep 2008 08:37:18 -0000	1.1
+++ workspace.i18n45.patch	5 Sep 2008 08:44:59 -0000	1.2
@@ -1,837 +1,68 @@
-Index: l10n/i18npool/inc/breakiterator_cjk.hxx
-diff -u l10n/i18npool/inc/breakiterator_cjk.hxx:1.6 l10n/i18npool/inc/breakiterator_cjk.hxx:1.6.16.1
---- l10n/i18npool/inc/breakiterator_cjk.hxx:1.6	Thu Apr 10 01:37:18 2008
-+++ l10n/i18npool/inc/breakiterator_cjk.hxx	Mon Aug 18 21:23:30 2008
-@@ -58,6 +58,7 @@
- 
- protected:
- 	xdictionary *dict;
-+    rtl::OUString hangingCharacters;
- };
- 
- #define BREAKITERATOR_CJK( lang ) \
-@@ -69,6 +70,7 @@
- 
- #ifdef BREAKITERATOR_ALL
- BREAKITERATOR_CJK( zh )
-+BREAKITERATOR_CJK( zh_TW )
- BREAKITERATOR_CJK( ja )
- BREAKITERATOR_CJK( ko )
- #endif
-Index: l10n/i18npool/inc/breakiterator_hi.hxx
-diff -u l10n/i18npool/inc/breakiterator_hi.hxx:1.1 l10n/i18npool/inc/breakiterator_hi.hxx:removed
---- l10n/i18npool/inc/breakiterator_hi.hxx:1.1	Wed Apr 24 10:08:25 2002
-+++ l10n/i18npool/inc/breakiterator_hi.hxx	Tue Sep  2 00:59:09 2008
-@@ -1,37 +0,0 @@
--/*************************************************************************
--#*
--#*  Copyright (c) 2002 Sun Microsystems Inc.
--#*
--#* Bugs! - Contact Prabhat.Hegde at sun.com
--#*************************************************************************/
--
--#ifndef _I18N_BREAKITERATOR_HI_HXX_
--#define _I18N_BREAKITERATOR_HI_HXX_
--
--#include <breakiterator_ctl.hxx>
--
--namespace com { 
--namespace sun { 
--namespace star { 
--namespace i18n {
--
--//	----------------------------------------------------
--//	class BreakIterator_hi
--//	----------------------------------------------------
--class BreakIterator_hi : public BreakIterator_CTL
--{
--public:
--	BreakIterator_hi();
--	~BreakIterator_hi();
--
--protected:
--	void SAL_CALL makeIndex(const rtl::OUString& text, sal_Int32 pos) 
--    throw(com::sun::star::uno::RuntimeException);
--};
--
--} 
--} 
--} 
--} 
--
--#endif
-Index: l10n/i18npool/inc/localedata.hxx
-diff -u l10n/i18npool/inc/localedata.hxx:1.20 l10n/i18npool/inc/localedata.hxx:1.20.16.1
---- l10n/i18npool/inc/localedata.hxx:1.20	Thu Apr 10 01:44:09 2008
-+++ l10n/i18npool/inc/localedata.hxx	Mon Aug 18 21:23:30 2008
-@@ -112,6 +112,7 @@
-     virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getFollowPageWords( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-     virtual sal_Bool SAL_CALL hasPhonetic( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-     virtual sal_Bool SAL_CALL isPhonetic( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& algorithm ) throw(com::sun::star::uno::RuntimeException);
-+    virtual rtl::OUString SAL_CALL getHangingCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
- 
- 	//XServiceInfo
- 	virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
-Index: l10n/i18npool/source/breakiterator/breakiteratorImpl.cxx
-diff -u l10n/i18npool/source/breakiterator/breakiteratorImpl.cxx:1.28 l10n/i18npool/source/breakiterator/breakiteratorImpl.cxx:1.27.4.2
---- l10n/i18npool/source/breakiterator/breakiteratorImpl.cxx:1.28	Thu Aug 14 09:27:36 2008
-+++ l10n/i18npool/source/breakiterator/breakiteratorImpl.cxx	Mon Aug 25 11:31:48 2008
-@@ -234,6 +234,7 @@
- {
-         if (nStartPos < 0 || nStartPos > Text.getLength())
-             return -1;
-+        if (Text.getLength() == 0) return 0;
-         return LBI->beginOfSentence(Text, nStartPos, rLocale);
- }
- 
-@@ -242,6 +243,7 @@
- {
-         if (nStartPos < 0 || nStartPos > Text.getLength())
-             return -1;
-+        if (Text.getLength() == 0) return 0;
-         return LBI->endOfSentence(Text, nStartPos, rLocale);
- }
- 
-Index: l10n/i18npool/source/breakiterator/breakiterator_cjk.cxx
-diff -u l10n/i18npool/source/breakiterator/breakiterator_cjk.cxx:1.17 l10n/i18npool/source/breakiterator/breakiterator_cjk.cxx:1.17.16.1
---- l10n/i18npool/source/breakiterator/breakiterator_cjk.cxx:1.17	Thu Apr 10 01:52:22 2008
-+++ l10n/i18npool/source/breakiterator/breakiterator_cjk.cxx	Mon Aug 18 21:24:50 2008
-@@ -33,6 +33,7 @@
- 
- #define BREAKITERATOR_ALL
- #include <breakiterator_cjk.hxx>
-+#include <localedata.hxx>
- #include <i18nutil/unicode.hxx>
- 
- using namespace ::com::sun::star::uno;
-@@ -108,7 +109,7 @@
-         LineBreakResults lbr;
- 
-         if (bOptions.allowPunctuationOutsideMargin &&
--                bOptions.forbiddenBeginCharacters.indexOf(Text[nStartPos]) != -1 &&
-+                hangingCharacters.indexOf(Text[nStartPos]) != -1 &&
-                 ++nStartPos == Text.getLength()) {
-             ; // do nothing
-         } else if (bOptions.applyForbiddenRules && 0 < nStartPos && nStartPos < Text.getLength()) {
-@@ -122,12 +123,15 @@
-         lbr.breakType = BreakType::WORDBOUNDARY;
-         return lbr;
- }
-+
-+#define LOCALE(language, country) lang::Locale(OUString::createFromAscii(language), OUString::createFromAscii(country), OUString())
- //      ----------------------------------------------------
- //      class BreakIterator_zh
- //      ----------------------------------------------------;
- BreakIterator_zh::BreakIterator_zh()
- {
-         dict = new xdictionary("zh");
-+        hangingCharacters = LocaleData().getHangingCharacters(LOCALE("zh", "CN"));
-         cBreakIterator = "com.sun.star.i18n.BreakIterator_zh";
- }
- 
-@@ -137,12 +141,28 @@
- }
- 
- //      ----------------------------------------------------
-+//      class BreakIterator_zh_TW
-+//      ----------------------------------------------------;
-+BreakIterator_zh_TW::BreakIterator_zh_TW()
-+{
-+        dict = new xdictionary("zh");
-+        hangingCharacters = LocaleData().getHangingCharacters(LOCALE("zh", "TW"));
-+        cBreakIterator = "com.sun.star.i18n.BreakIterator_zh_TW";
-+}
-+
-+BreakIterator_zh_TW::~BreakIterator_zh_TW()
-+{
-+        delete dict;
-+}
-+
-+//      ----------------------------------------------------
- //      class BreakIterator_ja
- //      ----------------------------------------------------;
- BreakIterator_ja::BreakIterator_ja()
- {
-         dict = new xdictionary("ja");
-         dict->setJapaneseWordBreak();
-+        hangingCharacters = LocaleData().getHangingCharacters(LOCALE("ja", "JP"));
-         cBreakIterator = "com.sun.star.i18n.BreakIterator_ja";
- }
- 
-@@ -156,6 +176,7 @@
- //      ----------------------------------------------------;
- BreakIterator_ko::BreakIterator_ko()
- {
-+        hangingCharacters = LocaleData().getHangingCharacters(LOCALE("ko", "KR"));
-         cBreakIterator = "com.sun.star.i18n.BreakIterator_ko";
- }
- 
-Index: l10n/i18npool/source/breakiterator/breakiterator_hi.cxx
-diff -u l10n/i18npool/source/breakiterator/breakiterator_hi.cxx:1.3 l10n/i18npool/source/breakiterator/breakiterator_hi.cxx:removed
---- l10n/i18npool/source/breakiterator/breakiterator_hi.cxx:1.3	Sun Sep 17 02:13:49 2006
-+++ l10n/i18npool/source/breakiterator/breakiterator_hi.cxx	Tue Sep  2 00:59:11 2008
-@@ -1,191 +0,0 @@
--/*************************************************************************
--#*
--#* Copyright (c) 2002 Sun Microsystems Inc.
--#*
--#* Bugs! - Contact Prabhat.Hegde at sun.com
--#************************************************************************/
--
--// MARKER(update_precomp.py): autogen include statement, do not remove
--#include "precompiled_i18npool.hxx"
--
--#include <breakiterator_hi.hxx>
--
--#include <string.h>	// for memset
--
--using namespace ::com::sun::star::uno;
--using namespace ::com::sun::star::lang;
--using namespace ::rtl;
--
--namespace com { namespace sun { namespace star { namespace i18n {
--
--//	----------------------------------------------------
--//	class Breakiterator_hi
--//	----------------------------------------------------;
--BreakIterator_hi::BreakIterator_hi()
--{
--	cBreakIterator = "com.sun.star.i18n.BreakIterator_hi";
--}
--
--BreakIterator_hi::~BreakIterator_hi()
--{
--}
--
--/*
-- * Devanagari character class Definitions
-- */
--#define	_NP		 1L
--#define _UP		 (1L<<1)
--#define _IV		 (1L<<2)
--#define _CN		 (1L<<3)
--#define _CK		 (1L<<4)
--#define _RC		 (1L<<5)
--#define _NM		 (1L<<6)
--#define _IM		 (1L<<7)
--#define _HL		 (1L<<8)
--#define _NK		 (1L<<9)
--#define _VD		 (1L<<10)
--#define _HD		 (1L<<11)
--#define	_II_M	 (1L<<12)
--#define	_EY_M	 (1L<<13)
--#define	_AI_M	 (1L<<14)
--#define	_OW1_M (1L<<15)
--#define	_OW2_M (1L<<16)
--#define	_MS		 (1L<<17)
--#define _AYE_M (1L<<18)
--#define _EE_M	 (1L<<19)
--#define _AWE_M (1L<<20)
--#define _O_M	 (1L<<21)
--#define _RM		 (_II_M|_EY_M|_AI_M|_OW1_M|_OW2_M|_AYE_M|_EE_M|_AWE_M|_O_M)
--
--/* Non-Defined Class type */
--#define __ND		0
--
--/*
-- * Devanagari character type definitions
-- */
--#define __UP  1  // ChandraBindu & Anuswar
--#define	__NP  2  // Visarg
--#define __IV	3  // Independant Vowels
--#define __CN	4  // Consonants except _CK & _RC 
--#define __CK	5  // Consonants that can be followed by Nukta
--#define __RC	6  // Ra
--#define __NM	7  // Matra
--#define __RM	8  // Ra + HAL
--#define __IM	9  // Choti I Matra
--#define __HL	10 // HAL
--#define __NK	11 // Nukta
--#define __VD	12 // Vedic
--#define __HD	13 // Hindu Numerals
--
--/*
-- * Devanagari character type table
-- */
--static const sal_uInt16 devaCT[128] = {
--/*         0,    1,    2,    3,    4,    5,    6,    7,
--           8,    9,    A,    B,    C,    D,    E,    F, */
--/* 0900 */ __ND, __UP, __UP, __NP, __ND, __IV, __IV, __IV,
--           __IV, __IV, __IV, __IV, __IV, __IV, __IV, __IV,
--/* 0910 */ __IV, __IV, __IV, __IV, __IV, __CK, __CK, __CK,
--           __CN, __CN, __CN, __CN, __CK, __CN, __CN, __CN,
--/* 0920 */ __CN, __CK, __CK, __CN, __CN, __CN, __CN, __CN,
--           __CN, __CN, __CN, __CK, __CN, __CN, __CN, __CN,
--/* 0930 */ __RC, __CN, __CN, __CN, __CN, __CN, __CN, __CN,
--           __CN, __CN, __ND, __ND, __NK, __VD, __NM, __IM,
--/* 0940 */ __RM, __NM, __NM, __NM, __NM, __RM, __RM, __RM,
--           __RM, __RM, __RM, __RM, __RM, __HL, __ND, __ND,
--/* 0950 */ __ND, __VD, __VD, __VD, __VD, __ND, __ND, __ND,
--           __CN, __CN, __CN, __CN, __CN, __CN, __CN, __CN,
--/* 0960 */ __IV, __IV, __NM, __NM, __ND, __ND, __HD, __HD,
--           __HD, __HD, __HD, __HD, __HD, __HD, __HD, __HD,
--/* 0970 */ __ND, __ND, __ND, __ND, __ND, __ND, __ND, __ND,
--           __ND, __ND, __ND, __ND, __ND, __ND, __ND, __ND,
--};
--
--
--#define getCharType(x) \
--	((x >= 0x0900 && x < 0x097f) ? devaCT[x - 0x0900] : __ND)
--
--/*
-- * Devanagari character composition table
-- */
--static const sal_uInt16 devaCompRel[14][14] = {
--  /*        ND, UP, NP, IV, CN, CK, RC, NM, RM, IM, HL, NK, VD, HD, */
--  /* 0  */ { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }, /* ND */
--  /* 1  */ { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }, /* UP */
--  /* 2  */ { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }, /* NP */
--  /* 3  */ { 0,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }, /* IV */
--  /* 4  */ { 0,  1,  1,  0,  0,  0,  0,  1,  1,  1,  1,  0,  0,  0 }, /* CN */
--  /* 5  */ { 0,  1,  1,  0,  0,  0,  0,  1,  1,  1,  1,  1,  0,  0 }, /* CK */
--  /* 6  */ { 0,  1,  1,  0,  0,  0,  0,  1,  1,  1,  1,  0,  0,  0 }, /* RC */
--  /* 7  */ { 0,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }, /* NM */
--  /* 8  */ { 0,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }, /* RM */
--  /* 9  */ { 0,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }, /* IM */
--  /* 10 */ { 0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0 }, /* HL */
--  /* 11 */ { 0,  1,  1,  0,  0,  0,  0,  1,  1,  1,  1,  0,  0,  0 }, /* NK */
--  /* 12 */ { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }, /* VD */
--  /* 13 */ { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }  /* HD */
--};
--
--static sal_uInt16 SAL_CALL 
--getCombState(const sal_Unicode *text, sal_Int32 pos)
--{
--	sal_uInt16 ch1 = getCharType(text[pos]);
--	sal_uInt16 ch2 = getCharType(text[pos+1]);
--
--	return devaCompRel[ch1][ch2];
--}
--
--static sal_uInt32 SAL_CALL 
--getACell(const sal_Unicode *text, sal_Int32 pos, sal_Int32 len)
--{
--	sal_uInt32 curr = 1;
--	for (; pos + 1 < len && getCombState(text, pos) == 1; curr++, pos++) {}
--	return curr;
--}
--
--#define is_Hindi(x)	((x >= 0x0900 && x < 0x097f) || (x >= 0x0905 && x < 0x0940) || \
--                     (x >= 0x093c && x < 0x094e) || (x >= 0x0950 && x < 0x0954) || \
--                     (x >= 0x0958 && x < 0x0971))
--
--void SAL_CALL 
--i18n::BreakIterator_hi::makeIndex(const OUString& Text, sal_Int32 nStartPos)
--	throw(uno::RuntimeException)
--{
--	if (Text != cachedText) {
--    cachedText = Text;
--    if (cellIndexSize < cachedText.getLength()) {
--      cellIndexSize = cachedText.getLength();
--      free(nextCellIndex);
--      free(previousCellIndex);
--      nextCellIndex = (sal_Int32*) calloc(cellIndexSize, sizeof(sal_Int32));
--      previousCellIndex = (sal_Int32*) calloc(cellIndexSize, sizeof(sal_Int32));
--    }
--    // reset nextCell for new Text
--    memset(nextCellIndex, 0, cellIndexSize * sizeof(sal_Int32));
--	}
--	else if (nextCellIndex[nStartPos] > 0 || ! is_Hindi(Text[nStartPos]))
--    return;
--  
--	const sal_Unicode* str = cachedText.getStr();
--	sal_Int32 len = cachedText.getLength(), startPos, endPos;
--  
--	startPos = nStartPos;
--	while (startPos > 0 && is_Hindi(str[startPos-1])) startPos--;
--	endPos = nStartPos+1;
--	while (endPos < len && is_Hindi(str[endPos])) endPos++;
--  
--	sal_Int32 start, end, pos;
--	pos = start = end = startPos;
--  
--	while (pos < endPos) {
--    end += getACell(str, start, endPos);
--    while (pos < end) {
--      nextCellIndex[pos] = end;
--      previousCellIndex[pos] = start;
--      pos++;
--    }
--    start = end;
--	}
--}
--
--} } } }
-Index: l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx
-diff -u l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx:1.36 l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx:1.36.2.1
---- l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx:1.36	Wed Jul  2 01:52:07 2008
-+++ l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx	Mon Sep  1 17:26:14 2008
-@@ -363,11 +363,17 @@
- {
-         LineBreakResults lbr;
- 
-+        if (nStartPos >= Text.getLength()) {
-+            lbr.breakIndex = Text.getLength();
-+            lbr.breakType = BreakType::WORDBOUNDARY;
-+            return lbr;
-+        }
-+
-         loadICUBreakIterator(rLocale, LOAD_LINE_BREAKITERATOR, 0, lineRule, Text);
- 
-         sal_Bool GlueSpace=sal_True;
-         while (GlueSpace) {
--            if (line.aBreakIterator->isBoundary(nStartPos)) { //Line boundary break
-+            if (line.aBreakIterator->preceding(nStartPos + 1) == nStartPos) { //Line boundary break
-                 lbr.breakIndex = nStartPos;
-                 lbr.breakType = BreakType::WORDBOUNDARY;
-             } else if (hOptions.rHyphenator.is()) { //Hyphenation break
-Index: l10n/i18npool/source/breakiterator/makefile.mk
-diff -u l10n/i18npool/source/breakiterator/makefile.mk:1.17 l10n/i18npool/source/breakiterator/makefile.mk:1.17.16.1
---- l10n/i18npool/source/breakiterator/makefile.mk:1.17	Thu Apr 10 01:53:36 2008
-+++ l10n/i18npool/source/breakiterator/makefile.mk	Mon Sep  1 11:01:24 2008
-@@ -57,7 +57,6 @@
- 	    $(SLO)$/breakiterator_cjk.obj \
- 	    $(SLO)$/breakiterator_ctl.obj \
- 	    $(SLO)$/breakiterator_th.obj \
--	    $(SLO)$/breakiterator_hi.obj \
- 	    $(SLO)$/breakiterator_unicode.obj \
- 	    $(SLO)$/xdictionary.obj \
-         $(subst,$(MISC)$/,$(SLO)$/ $(MY_MISC_CXXFILES:s/.c/.obj/))
-Index: l10n/i18npool/source/breakiterator/data/char_in.txt
-diff -u /dev/null l10n/i18npool/source/breakiterator/data/char_in.txt:1.1.2.1
---- /dev/null	Tue Sep  2 00:59:11 2008
-+++ l10n/i18npool/source/breakiterator/data/char_in.txt	Mon Sep  1 10:56:14 2008
-@@ -0,0 +1,48 @@
+--- /dev/null	2006-10-27 08:30:37.620506410 +0100
++++ OOD680_m4/i18npool/source/breakiterator/data/char.txt	2006-10-31 16:33:17.000000000 +0000
+@@ -0,0 +1,65 @@
 +#
-+#   Copyright (C) 2002-2003, International Business Machines Corporation and others.
++#   Copyright (C) 2002-2006, International Business Machines Corporation and others.
 +#       All Rights Reserved.
 +#
 +#   file:  char.txt 
 +#
 +#   ICU Character Break Rules, also known as Grapheme Cluster Boundaries
 +#      See Unicode Standard Annex #29.
-+#      These rules are based on TR29 Version 4.0.0
++#      These rules are based on TR29 Version 5.0.0
++#        Includes post-5.0 change to treat Japanese half width voicing marks
++#        as Grapheme Extend.
 +#
 +
 +#
 +#  Character Class Definitions.
-+#    The names are those from TR29.
 +#
-+$CR = \r;
-+$LF = \n;
-+$Control    = [[:Zl:] [:Zp:] [:Cc:] [:Cf:]];
++$CR      = [\p{Grapheme_Cluster_Break = CR}];
++$LF      = [\p{Grapheme_Cluster_Break = LF}];
++$Control = [\p{Grapheme_Cluster_Break = Control}];
 +
 +# add Japanese Half Width voicing marks to $Extend
-+$VoiceMarks = [\uff9e\uff9f];
-+$cmcextend = [ \u0903 \u093e-\u0940 \u0949-\u094C \u09bf-\u09c0 \u09c7-\u09c8 \u09cb-\u09cc \u0bc1-\u0bc2 \u0bc6-\u0bc8 \u0bca-\u0bcc \u0c01-\u0c03 \u0c41-\u0c44];
-+$Extend     = [[:Grapheme_Extend = TRUE:] $VoiceMarks $cmcextend]; 
++$VoiceMarks = [\uff9e\uff9f]; 
++$cmcextend = [\u0903 \u093e-\u0940 \u0949-\u094C \u09bf-\u09c0 \u09c7-\u09c8 \u09cb-\u09cc \u0c01-\u0c03 \u0c41-\u0c44];
++$Extend  = [\p{Grapheme_Cluster_Break = Extend} $VoiceMarks $cmcextend];
 +
 +#
 +# Korean Syllable Definitions
 +#
-+$L   = [:Hangul_Syllable_Type = L:];
-+$V   = [:Hangul_Syllable_Type = V:];
-+$T   = [:Hangul_Syllable_Type = T:];
++$L       = [\p{Grapheme_Cluster_Break = L}];
++$V       = [\p{Grapheme_Cluster_Break = V}];
++$T       = [\p{Grapheme_Cluster_Break = T}];
 +
-+$LV  = [:Hangul_Syllable_Type = LV:];
-+$LVT = [:Hangul_Syllable_Type = LVT:];
++$LV      = [\p{Grapheme_Cluster_Break = LV}];
++$LVT     = [\p{Grapheme_Cluster_Break = LVT}];
 +
 +$HangulSyllable = $L+ | ($L* ($LV? $V+ | $LV | $LVT) $T*) | $T+;
 +
-+#
-+#  Forward Break Rules
-+#
++## -------------------------------------------------
++
++!!forward;
++
 +$CR $LF;
-+([^$Control] | $HangulSyllable) $Extend*;
-+.;
++([^$Control $CR $LF] | $HangulSyllable) $Extend*;
 +
++## -------------------------------------------------
 +
-+#
-+#  Reverse Rule, back up to the beginning of some preceding grapheme cluster.
-+#
-+! ($Extend | $V | $T )*   ($LF $CR | ($LV | $LVT)?$L* | .);
-Index: l10n/i18npool/source/breakiterator/data/char_ta.txt
-diff -u l10n/i18npool/source/breakiterator/data/char_ta.txt:1.2 l10n/i18npool/source/breakiterator/data/char_ta.txt:removed
---- l10n/i18npool/source/breakiterator/data/char_ta.txt:1.2	Mon Oct 17 08:42:47 2005
-+++ l10n/i18npool/source/breakiterator/data/char_ta.txt	Tue Sep  2 00:59:11 2008
-@@ -1,46 +0,0 @@
--#
--#   Copyright (C) 2002-2003, International Business Machines Corporation and others.
--#       All Rights Reserved.
--#
--#   file:  char.txt 
--#
--#   ICU Character Break Rules, also known as Grapheme Cluster Boundaries
--#      See Unicode Standard Annex #29.
--#      These rules are based on TR29 Version 4.0.0
--#
--
--#
--#  Character Class Definitions.
--#    The names are those from TR29.
--#
--$CR = \r;
--$LF = \n;
--$Control    = [[:Zl:] [:Zp:] [:Cc:] [:Cf:]];
--
--$TAMIL = [ \u0bc1-\u0bc2 \u0bc6-\u0bc8 \u0bca-\u0bcc ];
--$Extend     = [[:Grapheme_Extend = TRUE:] $TAMIL]; 
--
--#
--# Korean Syllable Definitions
--#
--$L   = [:Hangul_Syllable_Type = L:];
--$V   = [:Hangul_Syllable_Type = V:];
--$T   = [:Hangul_Syllable_Type = T:];
--
--$LV  = [:Hangul_Syllable_Type = LV:];
--$LVT = [:Hangul_Syllable_Type = LVT:];
--
--$HangulSyllable = $L+ | ($L* ($LV? $V+ | $LV | $LVT) $T*) | $T+;
--
--#
--#  Forward Break Rules
--#
--$CR $LF;
--([^$Control] | $HangulSyllable) $Extend*;
--.;
--
--
--#
--#  Reverse Rule, back up to the beginning of some preceding grapheme cluster.
--#
--! ($Extend | $V | $T )*   ($LF $CR | ($LV | $LVT)?$L* | .);
-Index: l10n/i18npool/source/localedata/LocaleNode.cxx
-diff -u l10n/i18npool/source/localedata/LocaleNode.cxx:1.29 l10n/i18npool/source/localedata/LocaleNode.cxx:1.29.16.1
---- l10n/i18npool/source/localedata/LocaleNode.cxx:1.29	Thu Apr 10 02:04:34 2008
-+++ l10n/i18npool/source/localedata/LocaleNode.cxx	Mon Aug 18 21:26:23 2008
-@@ -1449,15 +1449,18 @@
-     if (forbidNode)    {
-      	of.writeParameter( "forbiddenBegin", forbidNode -> getChildAt(0)->getValue());
-      	of.writeParameter( "forbiddenEnd", forbidNode -> getChildAt(1)->getValue());
-+     	of.writeParameter( "hangingChars", forbidNode -> getChildAt(2)->getValue());
-     } else {
-      	of.writeParameter( "forbiddenBegin", ::rtl::OUString());
-      	of.writeParameter( "forbiddenEnd", ::rtl::OUString());
-+     	of.writeParameter( "hangingChars", ::rtl::OUString());
-     }
- 	of.writeAsciiString("\nstatic const sal_Unicode* LCForbiddenCharactersArray[] = {\n");
- 	of.writeAsciiString("\tforbiddenBegin,\n");
--	of.writeAsciiString("\tforbiddenEnd\n");
-+	of.writeAsciiString("\tforbiddenEnd,\n");
-+	of.writeAsciiString("\thangingChars\n");
- 	of.writeAsciiString("};\n\n");
--	of.writeFunction("getForbiddenCharacters_", "2", "LCForbiddenCharactersArray");
-+	of.writeFunction("getForbiddenCharacters_", "3", "LCForbiddenCharactersArray");
- 
-     if (breakNode) {
-      	of.writeParameter( "EditMode", breakNode -> getChildAt(0)->getValue());
-Index: l10n/i18npool/source/localedata/localedata.cxx
-diff -u l10n/i18npool/source/localedata/localedata.cxx:1.59 l10n/i18npool/source/localedata/localedata.cxx:1.59.16.1
---- l10n/i18npool/source/localedata/localedata.cxx:1.59	Thu Apr 10 02:05:23 2008
-+++ l10n/i18npool/source/localedata/localedata.cxx	Mon Aug 18 21:26:23 2008
-@@ -999,6 +999,21 @@
-         }
- }
- 
-+OUString SAL_CALL
-+LocaleData::getHangingCharacters( const Locale& rLocale ) throw(RuntimeException)
-+{
-+        sal_Int16 LCForbiddenCharactersCount = 0;
-+        sal_Unicode **LCForbiddenCharactersArray = NULL;
-+
-+        MyFunc_Type func = (MyFunc_Type) getFunctionSymbol( rLocale, "getForbiddenCharacters" );
-+
-+        if ( func ) {
-+            LCForbiddenCharactersArray = func(LCForbiddenCharactersCount);
-+            return OUString(LCForbiddenCharactersArray[2]);
-+        }
-+
-+        return OUString();
-+}
- 
- Sequence< OUString > SAL_CALL
- LocaleData::getBreakIteratorRules( const Locale& rLocale  ) throw(RuntimeException)
-Index: l10n/i18npool/source/localedata/data/bn_BD.xml
-diff -u l10n/i18npool/source/localedata/data/bn_BD.xml:1.3 l10n/i18npool/source/localedata/data/bn_BD.xml:1.3.186.1
---- l10n/i18npool/source/localedata/data/bn_BD.xml:1.3	Thu Apr 20 06:31:30 2006
-+++ l10n/i18npool/source/localedata/data/bn_BD.xml	Mon Sep  1 11:05:47 2008
-@@ -151,6 +151,13 @@
-   </LC_CURRENCY>
-   <LC_TRANSLITERATION ref="en_US"/>
-   <LC_MISC>
-+    <BreakIteratorRules>
-+      <EditMode/>
-+      <DictionaryMode/>
-+      <WordCountMode/>
-+      <CharacterMode>char_in</CharacterMode>
-+      <LineMode/>
-+    </BreakIteratorRules>
-     <ReservedWords>
-       <trueWord>????????????</trueWord>
-       <falseWord>??????????????????</falseWord>
-Index: l10n/i18npool/source/localedata/data/bn_IN.xml
-diff -u l10n/i18npool/source/localedata/data/bn_IN.xml:1.4 l10n/i18npool/source/localedata/data/bn_IN.xml:1.4.12.1
---- l10n/i18npool/source/localedata/data/bn_IN.xml:1.4	Tue May 13 07:06:42 2008
-+++ l10n/i18npool/source/localedata/data/bn_IN.xml	Mon Sep  1 11:05:47 2008
-@@ -316,6 +316,13 @@
-   </LC_CURRENCY>
-   <LC_TRANSLITERATION ref="en_US"/>
-   <LC_MISC>
-+    <BreakIteratorRules>
-+      <EditMode/>
-+      <DictionaryMode/>
-+      <WordCountMode/>
-+      <CharacterMode>char_in</CharacterMode>
-+      <LineMode/>
-+    </BreakIteratorRules>
-     <ReservedWords>
-       <trueWord>????????????</trueWord>
-       <falseWord>??????????????????</falseWord>
-Index: l10n/i18npool/source/localedata/data/gu_IN.xml
-diff -u l10n/i18npool/source/localedata/data/gu_IN.xml:1.5 l10n/i18npool/source/localedata/data/gu_IN.xml:1.5.4.1
---- l10n/i18npool/source/localedata/data/gu_IN.xml:1.5	Wed Jul  2 03:07:00 2008
-+++ l10n/i18npool/source/localedata/data/gu_IN.xml	Mon Sep  1 17:44:31 2008
-@@ -146,6 +146,13 @@
- </LC_CURRENCY>
- <LC_TRANSLITERATION ref="en_US"/>
- <LC_MISC>
-+<BreakIteratorRules>
-+<EditMode/>
-+<DictionaryMode/>
-+<WordCountMode/>
-+<CharacterMode>char_in</CharacterMode>
-+<LineMode/>
-+</BreakIteratorRules>
- <ReservedWords>
- <trueWord>?????????</trueWord>
- <falseWord>?????????</falseWord>
-Index: l10n/i18npool/source/localedata/data/hi_IN.xml
-diff -u l10n/i18npool/source/localedata/data/hi_IN.xml:1.14 l10n/i18npool/source/localedata/data/hi_IN.xml:1.14.4.1
---- l10n/i18npool/source/localedata/data/hi_IN.xml:1.14	Wed Jul  2 03:07:31 2008
-+++ l10n/i18npool/source/localedata/data/hi_IN.xml	Mon Sep  1 11:05:47 2008
-@@ -358,6 +358,13 @@
- </LC_CURRENCY>
- <LC_TRANSLITERATION ref="en_US"/>
- <LC_MISC>
-+<BreakIteratorRules>
-+<EditMode/>
-+<DictionaryMode/>
-+<WordCountMode/>
-+<CharacterMode>char_in</CharacterMode>
-+<LineMode/>
-+</BreakIteratorRules>
- <ReservedWords>
- <trueWord>?????????</trueWord>
- <falseWord>?????????</falseWord>
-Index: l10n/i18npool/source/localedata/data/ja_JP.xml
-diff -u l10n/i18npool/source/localedata/data/ja_JP.xml:1.17 l10n/i18npool/source/localedata/data/ja_JP.xml:1.17.26.2
---- l10n/i18npool/source/localedata/data/ja_JP.xml:1.17	Mon Jan 28 07:35:35 2008
-+++ l10n/i18npool/source/localedata/data/ja_JP.xml	Mon Sep  1 17:38:27 2008
-@@ -503,6 +503,7 @@
-     <ForbiddenCharacters>
-       <ForbiddenLineBeginCharacters>!%),.:;?]}???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????</ForbiddenLineBeginCharacters>
-       <ForbiddenLineEndCharacters>$([??{????????????????????????????????????????????????</ForbiddenLineEndCharacters>
-+      <LineBreakHangingCharacters>????????????</LineBreakHangingCharacters>
-     </ForbiddenCharacters>
-     <ReservedWords>
-       <trueWord>true</trueWord>
-Index: l10n/i18npool/source/localedata/data/kn_IN.xml
-diff -u l10n/i18npool/source/localedata/data/kn_IN.xml:1.9 l10n/i18npool/source/localedata/data/kn_IN.xml:1.9.4.1
---- l10n/i18npool/source/localedata/data/kn_IN.xml:1.9	Wed Jul  2 03:09:49 2008
-+++ l10n/i18npool/source/localedata/data/kn_IN.xml	Mon Sep  1 17:44:31 2008
-@@ -146,6 +146,13 @@
- </LC_CURRENCY>
- <LC_TRANSLITERATION ref="en_US"/>
- <LC_MISC>
-+<BreakIteratorRules>
-+<EditMode/>
-+<DictionaryMode/>
-+<WordCountMode/>
-+<CharacterMode>char_in</CharacterMode>
-+<LineMode/>
-+</BreakIteratorRules>
- <ReservedWords>
- <trueWord>?????????</trueWord>
- <falseWord>????????????</falseWord>
-Index: l10n/i18npool/source/localedata/data/ko_KR.xml
-diff -u l10n/i18npool/source/localedata/data/ko_KR.xml:1.22 l10n/i18npool/source/localedata/data/ko_KR.xml:1.22.186.1
---- l10n/i18npool/source/localedata/data/ko_KR.xml:1.22	Thu Apr 20 06:47:11 2006
-+++ l10n/i18npool/source/localedata/data/ko_KR.xml	Mon Aug 18 21:26:23 2008
-@@ -580,6 +580,7 @@
-     <ForbiddenCharacters>
-       <ForbiddenLineBeginCharacters>!%),.:;?]}??????&apos;&quot;?????????&gt;??????????????????????????????????????????????????????????????? ??????</ForbiddenLineBeginCharacters>
-       <ForbiddenLineEndCharacters>$(????[\{??????&apos;&quot;&lt;????????????????????????????????????</ForbiddenLineEndCharacters>
-+      <LineBreakHangingCharacters>!,.:;?????????????????????????</LineBreakHangingCharacters>
-     </ForbiddenCharacters>
-     <ReservedWords>
-       <trueWord>???</trueWord>
-Index: l10n/i18npool/source/localedata/data/locale.dtd
-diff -u l10n/i18npool/source/localedata/data/locale.dtd:1.24 l10n/i18npool/source/localedata/data/locale.dtd:1.24.26.1
---- l10n/i18npool/source/localedata/data/locale.dtd:1.24	Mon Jan 28 07:36:04 2008
-+++ l10n/i18npool/source/localedata/data/locale.dtd	Mon Aug 18 21:26:23 2008
-@@ -403,7 +403,7 @@
- 
- <!ELEMENT LC_MISC (ForbiddenCharacters?, BreakIteratorRules?, ReservedWords?)>
- <!ATTLIST LC_MISC %RefLocale;>
--<!ELEMENT ForbiddenCharacters (ForbiddenLineBeginCharacters, ForbiddenLineEndCharacters)>
-+<!ELEMENT ForbiddenCharacters (ForbiddenLineBeginCharacters, ForbiddenLineEndCharacters, LineBreakHangingCharacters)>
- <!ELEMENT ForbiddenLineBeginCharacters (#PCDATA)>
- <!ELEMENT ForbiddenLineEndCharacters (#PCDATA)>
- 
-Index: l10n/i18npool/source/localedata/data/ml_IN.xml
-diff -u l10n/i18npool/source/localedata/data/ml_IN.xml:1.2 l10n/i18npool/source/localedata/data/ml_IN.xml:1.2.182.1
---- l10n/i18npool/source/localedata/data/ml_IN.xml:1.2	Thu May  4 02:16:24 2006
-+++ l10n/i18npool/source/localedata/data/ml_IN.xml	Mon Sep  1 17:44:31 2008
-@@ -314,6 +314,13 @@
-   </LC_CURRENCY>
-   <LC_TRANSLITERATION ref="en_US"/>
-   <LC_MISC>
-+    <BreakIteratorRules>
-+      <EditMode/>
-+      <DictionaryMode/>
-+      <WordCountMode/>
-+      <CharacterMode>char_in</CharacterMode>
-+      <LineMode/>
-+    </BreakIteratorRules>
-     <ReservedWords>
-       <trueWord>?????????</trueWord>
-       <falseWord>????????????</falseWord>
-Index: l10n/i18npool/source/localedata/data/or_IN.xml
-diff -u l10n/i18npool/source/localedata/data/or_IN.xml:1.4 l10n/i18npool/source/localedata/data/or_IN.xml:1.4.4.1
---- l10n/i18npool/source/localedata/data/or_IN.xml:1.4	Wed Jul  2 03:11:42 2008
-+++ l10n/i18npool/source/localedata/data/or_IN.xml	Mon Sep  1 17:44:31 2008
-@@ -327,6 +327,13 @@
-     <Transliteration unoid="IGNORE_CASE"/>
-   </LC_TRANSLITERATION>
-   <LC_MISC>
-+    <BreakIteratorRules>
-+      <EditMode/>
-+      <DictionaryMode/>
-+      <WordCountMode/>
-+      <CharacterMode>char_in</CharacterMode>
-+      <LineMode/>
-+    </BreakIteratorRules>
-     <ReservedWords>
-       <trueWord>??????</trueWord>
-       <falseWord>?????????</falseWord>
-Index: l10n/i18npool/source/localedata/data/pa_IN.xml
-diff -u l10n/i18npool/source/localedata/data/pa_IN.xml:1.5 l10n/i18npool/source/localedata/data/pa_IN.xml:1.5.186.1
---- l10n/i18npool/source/localedata/data/pa_IN.xml:1.5	Thu Apr 20 06:50:32 2006
-+++ l10n/i18npool/source/localedata/data/pa_IN.xml	Mon Sep  1 11:05:47 2008
-@@ -168,6 +168,13 @@
-   </LC_CURRENCY>
-   <LC_TRANSLITERATION ref="en_US"/>
-   <LC_MISC>
-+    <BreakIteratorRules>
-+      <EditMode/>
-+      <DictionaryMode/>
-+      <WordCountMode/>
-+      <CharacterMode>char_in</CharacterMode>
-+      <LineMode/>
-+    </BreakIteratorRules>
-     <ReservedWords>
-       <trueWord>?????????</trueWord>
-       <falseWord>?????????</falseWord>
-Index: l10n/i18npool/source/localedata/data/ta_IN.xml
-diff -u l10n/i18npool/source/localedata/data/ta_IN.xml:1.8 l10n/i18npool/source/localedata/data/ta_IN.xml:1.8.4.1
---- l10n/i18npool/source/localedata/data/ta_IN.xml:1.8	Wed Jul  2 03:14:34 2008
-+++ l10n/i18npool/source/localedata/data/ta_IN.xml	Mon Sep  1 11:05:48 2008
-@@ -146,6 +146,13 @@
- </LC_CURRENCY>
- <LC_TRANSLITERATION ref="en_US"/>
- <LC_MISC>
-+<BreakIteratorRules>
-+<EditMode/>
-+<DictionaryMode/>
-+<WordCountMode/>
-+<CharacterMode>char_in</CharacterMode>
-+<LineMode/>
-+</BreakIteratorRules>
- <ReservedWords>
- <trueWord>?????????</trueWord>
- <falseWord>????????????</falseWord>
-Index: l10n/i18npool/source/localedata/data/te_IN.xml
-diff -u l10n/i18npool/source/localedata/data/te_IN.xml:1.9 l10n/i18npool/source/localedata/data/te_IN.xml:1.9.4.1
---- l10n/i18npool/source/localedata/data/te_IN.xml:1.9	Wed Jul  2 03:14:53 2008
-+++ l10n/i18npool/source/localedata/data/te_IN.xml	Mon Sep  1 11:05:48 2008
-@@ -145,6 +145,13 @@
- </LC_CURRENCY>
- <LC_TRANSLITERATION ref="en_US"/>
- <LC_MISC>
-+<BreakIteratorRules>
-+<EditMode/>
-+<DictionaryMode/>
-+<WordCountMode/>
-+<CharacterMode>char_in</CharacterMode>
-+<LineMode/>
-+</BreakIteratorRules>
- <ReservedWords>
- <trueWord>???????????????</trueWord>
- <falseWord>??????????????????</falseWord>
-Index: l10n/i18npool/source/localedata/data/zh_CN.xml
-diff -u l10n/i18npool/source/localedata/data/zh_CN.xml:1.21 l10n/i18npool/source/localedata/data/zh_CN.xml:1.21.4.1
---- l10n/i18npool/source/localedata/data/zh_CN.xml:1.21	Wed Jul  2 03:15:57 2008
-+++ l10n/i18npool/source/localedata/data/zh_CN.xml	Mon Aug 18 21:26:23 2008
-@@ -430,6 +430,7 @@
- <ForbiddenCharacters>
- <ForbiddenLineBeginCharacters>:!),.:;?]}??'"?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????--???</ForbiddenLineBeginCharacters>
- <ForbiddenLineEndCharacters>([{????'"?????????????????????????????????????????????????????????????????????????????????</ForbiddenLineEndCharacters>
-+<LineBreakHangingCharacters>!,.:;?????????????????????????</LineBreakHangingCharacters>
- </ForbiddenCharacters>
- <ReservedWords>
- <trueWord>???</trueWord>
-Index: l10n/i18npool/source/localedata/data/zh_TW.xml
-diff -u l10n/i18npool/source/localedata/data/zh_TW.xml:1.18 l10n/i18npool/source/localedata/data/zh_TW.xml:1.18.20.1
---- l10n/i18npool/source/localedata/data/zh_TW.xml:1.18	Wed Mar  5 10:45:25 2008
-+++ l10n/i18npool/source/localedata/data/zh_TW.xml	Mon Aug 18 21:26:23 2008
-@@ -359,6 +359,7 @@
- <ForbiddenCharacters>
- <ForbiddenLineBeginCharacters>!),.:;?]}????--'"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????</ForbiddenLineBeginCharacters>
- <ForbiddenLineEndCharacters>([{????'"???????????????????????????????????????????????????????????????</ForbiddenLineEndCharacters>
-+<LineBreakHangingCharacters>!,.:;?????????????????????????</LineBreakHangingCharacters>
- </ForbiddenCharacters>
- <ReservedWords>
- <trueWord>???</trueWord>
-Index: l10n/i18npool/source/registerservices/registerservices.cxx
-diff -u l10n/i18npool/source/registerservices/registerservices.cxx:1.44 l10n/i18npool/source/registerservices/registerservices.cxx:1.44.16.2
---- l10n/i18npool/source/registerservices/registerservices.cxx:1.44	Thu Apr 10 02:08:28 2008
-+++ l10n/i18npool/source/registerservices/registerservices.cxx	Mon Sep  1 11:04:41 2008
-@@ -65,7 +65,6 @@
- #include <breakiteratorImpl.hxx>
- #include <breakiterator_cjk.hxx>
- #include <breakiterator_th.hxx>
--#include <breakiterator_hi.hxx>
- #include <breakiterator_unicode.hxx>
- 
- #include <indexentrysupplier.hxx>
-@@ -152,9 +151,9 @@
- IMPL_CREATEINSTANCE( BreakIterator_Unicode )
- IMPL_CREATEINSTANCE( BreakIterator_ja )
- IMPL_CREATEINSTANCE( BreakIterator_zh )
-+IMPL_CREATEINSTANCE( BreakIterator_zh_TW )
- IMPL_CREATEINSTANCE( BreakIterator_ko )
- IMPL_CREATEINSTANCE( BreakIterator_th )
--IMPL_CREATEINSTANCE( BreakIterator_hi )
- IMPL_CREATEINSTANCE_MSF( ChapterCollator )
- IMPL_CREATEINSTANCE_MSF( CollatorImpl )
- IMPL_CREATEINSTANCE( Collator_Unicode )
-@@ -369,15 +368,15 @@
-     {   "com.sun.star.i18n.BreakIterator_zh",
-         "com.sun.star.i18n.BreakIterator_zh",
-         &BreakIterator_zh_CreateInstance },
-+    {   "com.sun.star.i18n.BreakIterator_zh_TW",
-+        "com.sun.star.i18n.BreakIterator_zh_TW",
-+        &BreakIterator_zh_TW_CreateInstance },
-     {   "com.sun.star.i18n.BreakIterator_ko",
-         "com.sun.star.i18n.BreakIterator_ko",
-         &BreakIterator_ko_CreateInstance },
-     {   "com.sun.star.i18n.BreakIterator_th",
-         "com.sun.star.i18n.BreakIterator_th",
-         &BreakIterator_th_CreateInstance },
--    {   "com.sun.star.i18n.BreakIterator_hi",
--        "com.sun.star.i18n.BreakIterator_hi",
--        &BreakIterator_hi_CreateInstance },
-     {   "com.sun.star.i18n.Collator",
-         "com.sun.star.i18n.Collator",
-         &CollatorImpl_CreateInstance },
++!!reverse;
++
++$BackHangulSyllable = $L+ | ($T* ($V+$LV? | $LV | $LVT) $L*) | $T+;
++$BackOneCluster = ($LF $CR) | ($Extend* ([^$Control $CR $LF] | $BackHangulSyllable));
++$BackOneCluster;
++
++## -------------------------------------------------
++
++!!safe_reverse;
++
++# rule 6, 7, 8
++$V+ $L;
++
++## -------------------------------------------------
++
++!!safe_forward;
++
++# rule 6, 7, 8
++$V+ $T;



From schmidtw at fedoraproject.org  Fri Sep  5 08:53:01 2008
From: schmidtw at fedoraproject.org (Weston T. Schmidt)
Date: Fri,  5 Sep 2008 08:53:01 +0000 (UTC)
Subject: rpms/dfu-programmer/F-9 .cvsignore, 1.3, 1.4 dfu-programmer.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20080905085301.1252670121@cvs1.fedora.phx.redhat.com>

Author: schmidtw

Update of /cvs/pkgs/rpms/dfu-programmer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11900

Modified Files:
	.cvsignore dfu-programmer.spec sources 
Log Message:
This updates dfu-programmer to 0.4.6-1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dfu-programmer/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Nov 2007 08:02:52 -0000	1.3
+++ .cvsignore	5 Sep 2008 08:52:30 -0000	1.4
@@ -1,2 +1 @@
-dfu-programmer-0.4.3.tar.gz
-dfu-programmer-0.4.4.tar.gz
+dfu-programmer-0.4.6.tar.gz


Index: dfu-programmer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dfu-programmer/F-9/dfu-programmer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dfu-programmer.spec	19 Feb 2008 23:26:53 -0000	1.3
+++ dfu-programmer.spec	5 Sep 2008 08:52:30 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           dfu-programmer
-Version:        0.4.4
-Release:        2%{?dist}
+Version:        0.4.6
+Release:        1%{?dist}
 Summary:        A Device Firmware Update based USB programmer for Atmel chips
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://dfu-programmer.sourceforge.net/
-Source0:        http://switch.dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel >= 0.1.10a
@@ -36,12 +36,8 @@
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install 
 
-%{__install} -d %{buildroot}%{_sysconfdir}/udev/rules.d/
-%{__install} -d %{buildroot}%{_sysconfdir}/security/console.perms.d/
-%{__install} -pm 644 fedora/99-%{name}.rules %{buildroot}%{_sysconfdir}/udev/rules.d/99-%{name}.rules
-%{__install} -pm 644 fedora/%{name}-at89c51.perms %{buildroot}%{_sysconfdir}/security/console.perms.d/%{name}-at89c51.perms
-%{__install} -pm 644 fedora/%{name}-at90usb.perms %{buildroot}%{_sysconfdir}/security/console.perms.d/%{name}-at90usb.perms
-
+%{__install} -d %{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty
+%{__install} -pm 644 fedora/10-dfu-programmer.fdi %{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty/10-dfu-programmer.fdi
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -51,14 +47,16 @@
 %doc AUTHORS ChangeLog NEWS README COPYING
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
-%config(noreplace) %{_sysconfdir}/udev/rules.d/99-%{name}.rules
-%config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
+%{_datadir}/hal/fdi/policy/20thirdparty/10-dfu-programmer.fdi
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.4-2
-- Autorebuild for GCC 4.3
-
 
+* Fri Aug 29 2008 Weston Schmidt <weston_schmidt at alumni.purdue.edu> - 0.4.6-1
+- change udev rules and permissions to be hal based
+* Wed Aug 20 2008 Weston Schmidt <weston_schmidt at alumni.purdue.edu> - 0.4.5-1
+- added 4K bootloader support
+- added eeprom-dump and eeprom-flash support
+- fixed the Source0 url
 * Mon Nov 19 2007 Weston Schmidt <weston_schmidt at alumni.purdue.edu> - 0.4.4-1
 - added reset command
 - added udev rules and permissions


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dfu-programmer/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Nov 2007 08:02:52 -0000	1.3
+++ sources	5 Sep 2008 08:52:30 -0000	1.4
@@ -1,2 +1 @@
-d0c01944933aaf53d46c3011e4717080  dfu-programmer-0.4.3.tar.gz
-bbe126e8666d524aea7675ccf705bfa2  dfu-programmer-0.4.4.tar.gz
+7fc0603dde9aad4e8348714bec145eba  dfu-programmer-0.4.6.tar.gz



From schmidtw at fedoraproject.org  Fri Sep  5 09:00:14 2008
From: schmidtw at fedoraproject.org (Weston T. Schmidt)
Date: Fri,  5 Sep 2008 09:00:14 +0000 (UTC)
Subject: rpms/dfu-programmer/devel .cvsignore, 1.3, 1.4 dfu-programmer.spec, 
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20080905090014.981DB70121@cvs1.fedora.phx.redhat.com>

Author: schmidtw

Update of /cvs/pkgs/rpms/dfu-programmer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13875

Modified Files:
	.cvsignore dfu-programmer.spec sources 
Log Message:
This updates dfu-programmer to 0.4.6-1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dfu-programmer/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Nov 2007 08:02:52 -0000	1.3
+++ .cvsignore	5 Sep 2008 08:59:44 -0000	1.4
@@ -1,2 +1 @@
-dfu-programmer-0.4.3.tar.gz
-dfu-programmer-0.4.4.tar.gz
+dfu-programmer-0.4.6.tar.gz


Index: dfu-programmer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dfu-programmer/devel/dfu-programmer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dfu-programmer.spec	19 Feb 2008 23:26:53 -0000	1.3
+++ dfu-programmer.spec	5 Sep 2008 08:59:44 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           dfu-programmer
-Version:        0.4.4
-Release:        2%{?dist}
+Version:        0.4.6
+Release:        1%{?dist}
 Summary:        A Device Firmware Update based USB programmer for Atmel chips
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://dfu-programmer.sourceforge.net/
-Source0:        http://switch.dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel >= 0.1.10a
@@ -36,12 +36,8 @@
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install 
 
-%{__install} -d %{buildroot}%{_sysconfdir}/udev/rules.d/
-%{__install} -d %{buildroot}%{_sysconfdir}/security/console.perms.d/
-%{__install} -pm 644 fedora/99-%{name}.rules %{buildroot}%{_sysconfdir}/udev/rules.d/99-%{name}.rules
-%{__install} -pm 644 fedora/%{name}-at89c51.perms %{buildroot}%{_sysconfdir}/security/console.perms.d/%{name}-at89c51.perms
-%{__install} -pm 644 fedora/%{name}-at90usb.perms %{buildroot}%{_sysconfdir}/security/console.perms.d/%{name}-at90usb.perms
-
+%{__install} -d %{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty
+%{__install} -pm 644 fedora/10-dfu-programmer.fdi %{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty/10-dfu-programmer.fdi
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -51,14 +47,16 @@
 %doc AUTHORS ChangeLog NEWS README COPYING
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
-%config(noreplace) %{_sysconfdir}/udev/rules.d/99-%{name}.rules
-%config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
+%{_datadir}/hal/fdi/policy/20thirdparty/10-dfu-programmer.fdi
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.4-2
-- Autorebuild for GCC 4.3
-
 
+* Fri Aug 29 2008 Weston Schmidt <weston_schmidt at alumni.purdue.edu> - 0.4.6-1
+- change udev rules and permissions to be hal based
+* Wed Aug 20 2008 Weston Schmidt <weston_schmidt at alumni.purdue.edu> - 0.4.5-1
+- added 4K bootloader support
+- added eeprom-dump and eeprom-flash support
+- fixed the Source0 url
 * Mon Nov 19 2007 Weston Schmidt <weston_schmidt at alumni.purdue.edu> - 0.4.4-1
 - added reset command
 - added udev rules and permissions


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dfu-programmer/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Nov 2007 08:02:52 -0000	1.3
+++ sources	5 Sep 2008 08:59:44 -0000	1.4
@@ -1,2 +1 @@
-d0c01944933aaf53d46c3011e4717080  dfu-programmer-0.4.3.tar.gz
-bbe126e8666d524aea7675ccf705bfa2  dfu-programmer-0.4.4.tar.gz
+7fc0603dde9aad4e8348714bec145eba  dfu-programmer-0.4.6.tar.gz



From pkgdb at fedoraproject.org  Fri Sep  5 09:31:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 09:31:20 +0000
Subject: [pkgdb] wormux: vh1962 has requested watchbugzilla
Message-ID: <20080905093120.9175720876A@bastion.fedora.phx.redhat.com>

vh1962 has requested the watchbugzilla acl on wormux (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wormux



From pkgdb at fedoraproject.org  Fri Sep  5 09:31:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 09:31:33 +0000
Subject: [pkgdb] wormux: vh1962 has requested watchcommits
Message-ID: <20080905093133.A04E920876B@bastion.fedora.phx.redhat.com>

vh1962 has requested the watchcommits acl on wormux (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wormux



From mschwendt at fedoraproject.org  Fri Sep  5 09:32:43 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  5 Sep 2008 09:32:43 +0000 (UTC)
Subject: extras-buildsys/server PackageJob.py,1.31.2.10.4.5,1.31.2.10.4.6
Message-ID: <20080905093243.E0BBC70121@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/server
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23704/server

Modified Files:
      Tag: Plague-0_4_5
	PackageJob.py 
Log Message:
Release 0.4.5.3


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.31.2.10.4.5
retrieving revision 1.31.2.10.4.6
diff -u -r1.31.2.10.4.5 -r1.31.2.10.4.6
--- PackageJob.py	4 Sep 2008 02:14:20 -0000	1.31.2.10.4.5
+++ PackageJob.py	5 Sep 2008 09:32:43 -0000	1.31.2.10.4.6
@@ -713,6 +713,7 @@
 
     def _stage_repodone(self):
         resultstring = " %s (%s): Build on target %s succeeded." % (self.uid, self.name, self._target_str)
+        log(resultstring)
         self.result = 'success'
         self._set_cur_stage('needsign', resultstring)
 



From mschwendt at fedoraproject.org  Fri Sep  5 09:33:13 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  5 Sep 2008 09:33:13 +0000 (UTC)
Subject: extras-buildsys ChangeLog, 1.126.2.44.2.1.2.19,
	1.126.2.44.2.1.2.20 README, 1.11, 1.11.8.1 plague.spec,
	1.27.2.5.2.1.2.5, 1.27.2.5.2.1.2.6
Message-ID: <20080905093313.6F10E70121@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23704

Modified Files:
      Tag: Plague-0_4_5
	ChangeLog README plague.spec 
Log Message:
Release 0.4.5.3


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.44.2.1.2.19
retrieving revision 1.126.2.44.2.1.2.20
diff -u -r1.126.2.44.2.1.2.19 -r1.126.2.44.2.1.2.20
--- ChangeLog	4 Sep 2008 21:06:35 -0000	1.126.2.44.2.1.2.19
+++ ChangeLog	5 Sep 2008 09:32:42 -0000	1.126.2.44.2.1.2.20
@@ -1,5 +1,7 @@
 2008-09-04  Michael Schwendt <mschwendt at fedoraproject.org>
 
+	* Release of 0.4.5.3
+	
 	* server/Repo.py
 	  - Fix _update_repo args traceback introduced in 0.4.5.1.
 	  - Merge repolock patch.


Index: README
===================================================================
RCS file: /cvs/fedora/extras-buildsys/README,v
retrieving revision 1.11
retrieving revision 1.11.8.1
diff -u -r1.11 -r1.11.8.1
--- README	8 Aug 2005 19:11:24 -0000	1.11
+++ README	5 Sep 2008 09:32:42 -0000	1.11.8.1
@@ -1,4 +1,4 @@
-fFedora Extras Build System
+Fedora Extras Build System
 
 System Requirements:
     - Python 2.3 or 2.4


Index: plague.spec
===================================================================
RCS file: /cvs/fedora/extras-buildsys/plague.spec,v
retrieving revision 1.27.2.5.2.1.2.5
retrieving revision 1.27.2.5.2.1.2.6
diff -u -r1.27.2.5.2.1.2.5 -r1.27.2.5.2.1.2.6
--- plague.spec	4 Sep 2008 17:19:09 -0000	1.27.2.5.2.1.2.5
+++ plague.spec	5 Sep 2008 09:32:42 -0000	1.27.2.5.2.1.2.6
@@ -2,28 +2,30 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.2
-Release: 0.1%{?dist}
+Version: 0.4.5.3
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
-Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
+#Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.bz2
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
+Requires: createrepo >= 0.4.7
+# get the version of the sqlite api thats available to us
 %if 0%{?rhel}
 Requires: python-sqlite
 %else
 Requires: python-sqlite2
 %endif
 
-Requires: createrepo >= 0.4.7
-
 Requires: %{name}-common = %{version}-%{release}
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
+
 %description
 The Plague build system is a client/server distributed build system for
 building RPM packages.  This package provides the plague server.
@@ -43,7 +45,8 @@
 Summary: Builder daemon for Plague builder slaves
 Group: Development/Tools
 Requires: %{name}-common = %{version}-%{release}
-Requires: yum >= 2.2.1, mock >= 0.8
+Requires: yum >= 2.2.1
+Requires: mock >= 0.8
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -77,6 +80,7 @@
 %prep
 %setup -q
 
+
 %build
 make
 
@@ -128,6 +132,7 @@
 %dir %{_sysconfdir}/%{name}/server/certs
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server
 %{_initrddir}/%{name}-server
+%doc www
 
 %files common
 %defattr(-, root, root)
@@ -160,6 +165,11 @@
 
 
 %changelog
+* Fri Sep  5 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-1
+- update to 0.4.5.3 for sqlite2 compatibility fixes for Fedora
+- merge fedora pkg spec changes
+- include the www tree as server pkg docs
+
 * Thu Sep 04 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.2
 - fix bug in find command to plague-user-manager
 



From pkgdb at fedoraproject.org  Fri Sep  5 09:36:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 09:36:03 +0000
Subject: [pkgdb] 8Kingdoms: vh1962 has requested watchbugzilla
Message-ID: <20080905093604.02D2520876A@bastion.fedora.phx.redhat.com>

vh1962 has requested the watchbugzilla acl on 8Kingdoms (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/8Kingdoms



From mschwendt at fedoraproject.org  Fri Sep  5 09:45:37 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  5 Sep 2008 09:45:37 +0000 (UTC)
Subject: rpms/plague/devel .cvsignore, 1.14, 1.15 plague.spec, 1.36,
	1.37 sources, 1.28, 1.29
Message-ID: <20080905094537.1E42770121@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27647/devel

Modified Files:
	.cvsignore plague.spec sources 
Log Message:
* Fri Sep  5 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-1
- update to 0.4.5.3 for sqlite2 compatibility fixes for Fedora
- merge fedora pkg spec changes
- include the www tree as server pkg docs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	4 Sep 2008 17:42:38 -0000	1.14
+++ .cvsignore	5 Sep 2008 09:45:06 -0000	1.15
@@ -1 +1,2 @@
-plague-0.4.5.2.tar.bz2
+plague-0.4.5.3.tar.bz2
+plague-0.4.5.3.tar.bz2.asc


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/plague.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- plague.spec	4 Sep 2008 17:42:38 -0000	1.36
+++ plague.spec	5 Sep 2008 09:45:06 -0000	1.37
@@ -2,7 +2,7 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.2
+Version: 0.4.5.3
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -26,7 +26,6 @@
 Requires(preun): /sbin/service
 
 
-
 %description
 The Plague build system is a client/server distributed build system for
 building RPM packages.  This package provides the plague server.
@@ -133,6 +132,7 @@
 %dir %{_sysconfdir}/%{name}/server/certs
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server
 %{_initrddir}/%{name}-server
+%doc www
 
 %files common
 %defattr(-, root, root)
@@ -165,6 +165,11 @@
 
 
 %changelog
+* Fri Sep  5 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-1
+- update to 0.4.5.3 for sqlite2 compatibility fixes for Fedora
+- merge fedora pkg spec changes
+- include the www tree as server pkg docs
+
 * Thu Sep 04 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.2-1
 - fix bug in find option to plague-user-manager
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	4 Sep 2008 17:42:38 -0000	1.28
+++ sources	5 Sep 2008 09:45:06 -0000	1.29
@@ -1 +1,2 @@
-e7377cd89cf1f21ff8e4ac83c9d199d4  plague-0.4.5.2.tar.bz2
+f9206fd27a4dbfba267eb149c1ed2a59  plague-0.4.5.3.tar.bz2
+285927a5b904db9f039958792de254fd  plague-0.4.5.3.tar.bz2.asc



From mschwendt at fedoraproject.org  Fri Sep  5 09:45:37 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  5 Sep 2008 09:45:37 +0000 (UTC)
Subject: rpms/plague/F-9 .cvsignore, 1.11, 1.12 plague.spec, 1.35,
	1.36 sources, 1.28, 1.29
Message-ID: <20080905094537.5834470121@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27647/F-9

Modified Files:
	.cvsignore plague.spec sources 
Log Message:
* Fri Sep  5 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-1
- update to 0.4.5.3 for sqlite2 compatibility fixes for Fedora
- merge fedora pkg spec changes
- include the www tree as server pkg docs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Mar 2006 15:30:00 -0000	1.11
+++ .cvsignore	5 Sep 2008 09:45:07 -0000	1.12
@@ -1,10 +1,2 @@
-plague-0.3.1.tar.bz2
-plague-0.3.2.tar.bz2
-plague-0.3.3.tar.bz2
-plague-0.3.4.tar.bz2
-plague-0.4.tar.bz2
-plague-0.4.1.tar.bz2
-plague-0.4.2.tar.bz2
-plague-0.4.3.tar.bz2
-plague-0.4.4.tar.bz2
-plague-0.4.4.1.tar.bz2
+plague-0.4.5.3.tar.bz2
+plague-0.4.5.3.tar.bz2.asc


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-9/plague.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- plague.spec	4 Sep 2008 17:52:12 -0000	1.35
+++ plague.spec	5 Sep 2008 09:45:07 -0000	1.36
@@ -2,7 +2,7 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.2
+Version: 0.4.5.3
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -26,7 +26,6 @@
 Requires(preun): /sbin/service
 
 
-
 %description
 The Plague build system is a client/server distributed build system for
 building RPM packages.  This package provides the plague server.
@@ -133,6 +132,7 @@
 %dir %{_sysconfdir}/%{name}/server/certs
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server
 %{_initrddir}/%{name}-server
+%doc www
 
 %files common
 %defattr(-, root, root)
@@ -165,6 +165,11 @@
 
 
 %changelog
+* Fri Sep  5 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-1
+- update to 0.4.5.3 for sqlite2 compatibility fixes for Fedora
+- merge fedora pkg spec changes
+- include the www tree as server pkg docs
+
 * Thu Sep 04 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.2-1
 - fix bug in find option to plague-user-manager
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-9/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	4 Sep 2008 17:52:12 -0000	1.28
+++ sources	5 Sep 2008 09:45:07 -0000	1.29
@@ -1 +1,2 @@
-e7377cd89cf1f21ff8e4ac83c9d199d4  plague-0.4.5.2.tar.bz2
+f9206fd27a4dbfba267eb149c1ed2a59  plague-0.4.5.3.tar.bz2
+285927a5b904db9f039958792de254fd  plague-0.4.5.3.tar.bz2.asc



From mschwendt at fedoraproject.org  Fri Sep  5 09:45:38 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  5 Sep 2008 09:45:38 +0000 (UTC)
Subject: rpms/plague/EL-5 .cvsignore, 1.11, 1.12 plague.spec, 1.30,
	1.31 sources, 1.27, 1.28
Message-ID: <20080905094538.13B6770121@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27647/EL-5

Modified Files:
	.cvsignore plague.spec sources 
Log Message:
* Fri Sep  5 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-1
- update to 0.4.5.3 for sqlite2 compatibility fixes for Fedora
- merge fedora pkg spec changes
- include the www tree as server pkg docs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plague/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Mar 2006 15:30:00 -0000	1.11
+++ .cvsignore	5 Sep 2008 09:45:07 -0000	1.12
@@ -1,10 +1,2 @@
-plague-0.3.1.tar.bz2
-plague-0.3.2.tar.bz2
-plague-0.3.3.tar.bz2
-plague-0.3.4.tar.bz2
-plague-0.4.tar.bz2
-plague-0.4.1.tar.bz2
-plague-0.4.2.tar.bz2
-plague-0.4.3.tar.bz2
-plague-0.4.4.tar.bz2
-plague-0.4.4.1.tar.bz2
+plague-0.4.5.3.tar.bz2
+plague-0.4.5.3.tar.bz2.asc


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/EL-5/plague.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- plague.spec	4 Sep 2008 18:17:39 -0000	1.30
+++ plague.spec	5 Sep 2008 09:45:07 -0000	1.31
@@ -2,7 +2,7 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.2
+Version: 0.4.5.3
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -26,7 +26,6 @@
 Requires(preun): /sbin/service
 
 
-
 %description
 The Plague build system is a client/server distributed build system for
 building RPM packages.  This package provides the plague server.
@@ -133,6 +132,7 @@
 %dir %{_sysconfdir}/%{name}/server/certs
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server
 %{_initrddir}/%{name}-server
+%doc www
 
 %files common
 %defattr(-, root, root)
@@ -165,6 +165,11 @@
 
 
 %changelog
+* Fri Sep  5 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-1
+- update to 0.4.5.3 for sqlite2 compatibility fixes for Fedora
+- merge fedora pkg spec changes
+- include the www tree as server pkg docs
+
 * Thu Sep 04 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.2-1
 - fix bug in find option to plague-user-manager
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/EL-5/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	4 Sep 2008 18:17:39 -0000	1.27
+++ sources	5 Sep 2008 09:45:07 -0000	1.28
@@ -1 +1,2 @@
-e7377cd89cf1f21ff8e4ac83c9d199d4  plague-0.4.5.2.tar.bz2
+f9206fd27a4dbfba267eb149c1ed2a59  plague-0.4.5.3.tar.bz2
+285927a5b904db9f039958792de254fd  plague-0.4.5.3.tar.bz2.asc



From mschwendt at fedoraproject.org  Fri Sep  5 09:45:37 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  5 Sep 2008 09:45:37 +0000 (UTC)
Subject: rpms/plague/F-8 .cvsignore, 1.11, 1.12 plague.spec, 1.35,
	1.36 sources, 1.28, 1.29
Message-ID: <20080905094537.AC8E170121@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27647/F-8

Modified Files:
	.cvsignore plague.spec sources 
Log Message:
* Fri Sep  5 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-1
- update to 0.4.5.3 for sqlite2 compatibility fixes for Fedora
- merge fedora pkg spec changes
- include the www tree as server pkg docs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-8/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Mar 2006 15:30:00 -0000	1.11
+++ .cvsignore	5 Sep 2008 09:45:07 -0000	1.12
@@ -1,10 +1,2 @@
-plague-0.3.1.tar.bz2
-plague-0.3.2.tar.bz2
-plague-0.3.3.tar.bz2
-plague-0.3.4.tar.bz2
-plague-0.4.tar.bz2
-plague-0.4.1.tar.bz2
-plague-0.4.2.tar.bz2
-plague-0.4.3.tar.bz2
-plague-0.4.4.tar.bz2
-plague-0.4.4.1.tar.bz2
+plague-0.4.5.3.tar.bz2
+plague-0.4.5.3.tar.bz2.asc


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-8/plague.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- plague.spec	4 Sep 2008 17:58:57 -0000	1.35
+++ plague.spec	5 Sep 2008 09:45:07 -0000	1.36
@@ -2,7 +2,7 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.2
+Version: 0.4.5.3
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -26,7 +26,6 @@
 Requires(preun): /sbin/service
 
 
-
 %description
 The Plague build system is a client/server distributed build system for
 building RPM packages.  This package provides the plague server.
@@ -133,6 +132,7 @@
 %dir %{_sysconfdir}/%{name}/server/certs
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server
 %{_initrddir}/%{name}-server
+%doc www
 
 %files common
 %defattr(-, root, root)
@@ -165,6 +165,11 @@
 
 
 %changelog
+* Fri Sep  5 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-1
+- update to 0.4.5.3 for sqlite2 compatibility fixes for Fedora
+- merge fedora pkg spec changes
+- include the www tree as server pkg docs
+
 * Thu Sep 04 2008 Dennis Gilmore <dennis at ausil.us> - 0.4.5.2-1
 - fix bug in find option to plague-user-manager
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-8/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	4 Sep 2008 17:58:57 -0000	1.28
+++ sources	5 Sep 2008 09:45:07 -0000	1.29
@@ -1 +1,2 @@
-e7377cd89cf1f21ff8e4ac83c9d199d4  plague-0.4.5.2.tar.bz2
+f9206fd27a4dbfba267eb149c1ed2a59  plague-0.4.5.3.tar.bz2
+285927a5b904db9f039958792de254fd  plague-0.4.5.3.tar.bz2.asc



From roland at fedoraproject.org  Fri Sep  5 09:45:46 2008
From: roland at fedoraproject.org (Roland McGrath)
Date: Fri,  5 Sep 2008 09:45:46 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc5-git7.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.915, 1.916 kernel.spec, 1.931, 1.932 linux-2.6-utrace.patch,
	1.95, 1.96 sources, 1.878, 1.879 upstream, 1.791,
	1.792 patch-2.6.27-rc5-git6.bz2.sign, 1.1, NONE
Message-ID: <20080905094546.A9A9E70121@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27720

Modified Files:
	.cvsignore kernel.spec linux-2.6-utrace.patch sources upstream 
Added Files:
	patch-2.6.27-rc5-git7.bz2.sign 
Removed Files:
	patch-2.6.27-rc5-git6.bz2.sign 
Log Message:
* Fri Sep  5 2008 Roland McGrath <roland at redhat.com>
- 2.6.27-rc5-git7
- utrace kerneldoc fixups



--- NEW FILE patch-2.6.27-rc5-git7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIwHb8yGugalF9Dw4RAmH9AJwI2JIidug6K/c9opb1WeEg/RnXgACeMCKq
DAMfD4BjfGFwMAZiF0Ss/dw=
=QaQJ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.915
retrieving revision 1.916
diff -u -r1.915 -r1.916
--- .cvsignore	4 Sep 2008 21:45:56 -0000	1.915
+++ .cvsignore	5 Sep 2008 09:45:16 -0000	1.916
@@ -5,4 +5,4 @@
 kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc5.bz2
-patch-2.6.27-rc5-git6.bz2
+patch-2.6.27-rc5-git7.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.931
retrieving revision 1.932
diff -u -r1.931 -r1.932
--- kernel.spec	5 Sep 2008 06:29:57 -0000	1.931
+++ kernel.spec	5 Sep 2008 09:45:16 -0000	1.932
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 5
 # The git snapshot level
-%define gitrev 6
+%define gitrev 7
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1747,6 +1747,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Sep  5 2008 Roland McGrath <roland at redhat.com>
+- 2.6.27-rc5-git7
+- utrace kerneldoc fixups
+
 * Fri Sep 05 2008 Dave Airlie <airlied at redhat.com>
 - introduce radeon suspend/resume + change pin api
 

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- linux-2.6-utrace.patch	4 Sep 2008 04:05:24 -0000	1.95
+++ linux-2.6-utrace.patch	5 Sep 2008 09:45:16 -0000	1.96
@@ -1,16 +1,17 @@
  Documentation/DocBook/Makefile    |    2 +-
  Documentation/DocBook/utrace.tmpl |  566 +++++++++
  fs/proc/array.c                   |    3 +
+ include/asm-generic/syscall.h     |    2 +-
  include/linux/ptrace.h            |   21 +
  include/linux/sched.h             |    6 +
- include/linux/tracehook.h         |   65 +-
- include/linux/utrace.h            |  708 +++++++++++
- init/Kconfig                      |   27 +
+ include/linux/tracehook.h         |   67 +-
+ include/linux/utrace.h            |  706 +++++++++++
+ init/Kconfig                      |   26 +
  kernel/Makefile                   |    1 +
  kernel/ptrace.c                   |  605 +++++++++-
  kernel/signal.c                   |   14 +-
  kernel/utrace.c                   | 2516 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 4526 insertions(+), 8 deletions(-)
+ 13 files changed, 4525 insertions(+), 10 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
 index 1615350..92ca631 100644  
@@ -618,6 +619,19 @@
  	task_lock(p);
  	if (p->files)
  		fdt = files_fdtable(p->files);
+diff --git a/include/asm-generic/syscall.h b/include/asm-generic/syscall.h
+index abcf34c..ea8087b 100644  
+--- a/include/asm-generic/syscall.h
++++ b/include/asm-generic/syscall.h
+@@ -126,7 +126,7 @@ void syscall_get_arguments(struct task_s
+  * @args:	array of argument values to store
+  *
+  * Changes @n arguments to the system call starting with the @i'th argument.
+- * @n'th argument to @val.  Argument @i gets value @args[0], and so on.
++ * Argument @i gets value @args[0], and so on.
+  * An arch inline version is probably optimal when @i and @n are constants.
+  *
+  * It's only valid to call this when @task is stopped for tracing on
 diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
 index ea7416c..06eaace 100644  
 --- a/include/linux/ptrace.h
@@ -682,7 +696,7 @@
  extern void force_sig_specific(int, struct task_struct *);
  extern int send_sig(int, struct task_struct *, int);
 diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
-index b48d819..717a1c8 100644  
+index b48d819..968909d 100644  
 --- a/include/linux/tracehook.h
 +++ b/include/linux/tracehook.h
 @@ -49,6 +49,7 @@
@@ -768,6 +782,15 @@
  	ptrace_init_task(child, (clone_flags & CLONE_PTRACE) || trace);
  }
  
+@@ -272,7 +291,7 @@ static inline void tracehook_finish_clon
+  * tracehook_report_clone_complete().  This must prevent the child from
+  * self-reaping if tracehook_report_clone_complete() uses the @child
+  * pointer; otherwise it might have died and been released by the time
+- * tracehook_report_report_clone_complete() is called.
++ * tracehook_report_clone_complete() is called.
+  *
+  * Called with no locks held, but the child cannot run until this returns.
+  */
 @@ -280,6 +299,8 @@ static inline void tracehook_report_clon
  					  unsigned long clone_flags,
  					  pid_t pid, struct task_struct *child)
@@ -906,10 +929,10 @@
  
 diff --git a/include/linux/utrace.h b/include/linux/utrace.h
 new file mode 100644
-index ...4dd29e9 100644  
+index ...6c9c536 100644  
 --- /dev/null
 +++ b/include/linux/utrace.h
-@@ -0,0 +1,708 @@
+@@ -0,0 +1,706 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -1512,18 +1535,16 @@
 +
 +/**
 + * struct utrace_examiner - private state for using utrace_prepare_examine()
-+ * @dummy:		all fields are private, none described here
++ * @state:		task's &struct task_struct.state value
++ * @ncsw:		return value from wait_task_inactive()
 + *
 + * The members of &struct utrace_examiner are private to the implementation.
 + * This data type holds the state from a call to utrace_prepare_examine()
 + * to be used by a call to utrace_finish_examine().
 + */
 +struct utrace_examiner {
-+/* private: */
-+	long state;	    /* cache of task_struct.state */
-+	unsigned long ncsw; /* cache of wait_task_inactive() return value */
-+/* public: */
-+	struct {} dummy;
++	long state;
++	unsigned long ncsw;
 +};
 +
 +/*
@@ -1619,10 +1640,10 @@
 +
 +#endif	/* linux/utrace.h */
 diff --git a/init/Kconfig b/init/Kconfig
-index c11da38..a2b8ea8 100644  
+index c11da38..9ca2a8f 100644  
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -898,6 +898,33 @@ config STOP_MACHINE
+@@ -898,6 +898,32 @@ config STOP_MACHINE
  	help
  	  Need stop_machine() primitive.
  
@@ -1630,7 +1651,6 @@
 +	bool "Infrastructure for tracing and debugging user processes"
 +	depends on EXPERIMENTAL
 +	depends on HAVE_ARCH_TRACEHOOK
-+	depends on MODULES
 +	help
 +	  Enable the utrace process tracing interface.  This is an internal
 +	  kernel interface exported to kernel modules, to track events in


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.878
retrieving revision 1.879
diff -u -r1.878 -r1.879
--- sources	4 Sep 2008 21:45:56 -0000	1.878
+++ sources	5 Sep 2008 09:45:16 -0000	1.879
@@ -1,3 +1,3 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 d91adda8bcf04852048b8eab06eeae3d  patch-2.6.27-rc5.bz2
-142aff1bfc8973698ca1a043c0aca51d  patch-2.6.27-rc5-git6.bz2
+064b47baf6ae8ecb15c96f2b38b62f4b  patch-2.6.27-rc5-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.791
retrieving revision 1.792
diff -u -r1.791 -r1.792
--- upstream	4 Sep 2008 21:45:56 -0000	1.791
+++ upstream	5 Sep 2008 09:45:16 -0000	1.792
@@ -1,3 +1,3 @@
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc5.bz2
-patch-2.6.27-rc5-git6.bz2
+patch-2.6.27-rc5-git7.bz2


--- patch-2.6.27-rc5-git6.bz2.sign DELETED ---



From kwizart at fedoraproject.org  Fri Sep  5 09:49:46 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Fri,  5 Sep 2008 09:49:46 +0000 (UTC)
Subject: rpms/iwl4965-firmware/devel iwl4965-firmware.spec,1.4,1.5
Message-ID: <20080905094946.4416870121@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/iwl4965-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29269

Modified Files:
	iwl4965-firmware.spec 
Log Message:
- Remove ppc/ppc64 from ExcludedArches



Index: iwl4965-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iwl4965-firmware/devel/iwl4965-firmware.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- iwl4965-firmware.spec	11 Jul 2008 15:47:50 -0000	1.4
+++ iwl4965-firmware.spec	5 Sep 2008 09:49:15 -0000	1.5
@@ -4,7 +4,7 @@
 
 Name:           iwl4965-firmware
 Version:        %{iwl4965_v2}
-Release:        2
+Release:        3
 Summary:        Firmware for Intel?? PRO/Wireless 4965 A/G/N network adaptors
 
 Group:          System Environment/Kernel
@@ -15,7 +15,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-ExcludeArch:    ppc ppc64
 
 
 %description
@@ -69,6 +68,9 @@
 
 
 %changelog
+* Fri Sep  5 2008 kwizart < kwizart at gmail.com > - 228.57.2.21-3
+- Remove ppc/ppc64 from ExcludedArches
+
 * Fri Jul 11 2008 kwizart < kwizart at gmail.com > - 228.57.2.21-2
 - Bump to keep the old 4.44.17 firmware dropped.
 



From kwizart at fedoraproject.org  Fri Sep  5 09:53:02 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Fri,  5 Sep 2008 09:53:02 +0000 (UTC)
Subject: rpms/iwl5000-firmware/F-8 iwl5000-firmware.spec,1.1,1.2
Message-ID: <20080905095302.B29D870121@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/iwl5000-firmware/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30633

Modified Files:
	iwl5000-firmware.spec 
Log Message:
- Remove ppc/ppc64 from ExcludedArches



Index: iwl5000-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iwl5000-firmware/F-8/iwl5000-firmware.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iwl5000-firmware.spec	1 Aug 2008 11:01:20 -0000	1.1
+++ iwl5000-firmware.spec	5 Sep 2008 09:52:32 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           iwl5000-firmware
 Version:        5.4.A.11
-Release:        2
+Release:        3
 Summary:        Firmware for Intel?? PRO/Wireless 5000 A/G/N network adaptors
 
 Group:          System Environment/Kernel
@@ -10,7 +10,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-ExcludeArch:    ppc ppc64
 
 
 %description
@@ -46,6 +45,9 @@
 /lib/firmware/*.ucode
 
 %changelog
+* Mon Jul 28 2008 kwizart < kwizart at gmail.com > - 5.4.A.11-3
+- Remove ppc/ppc64 from ExcludedArches
+
 * Mon Jul 28 2008 kwizart < kwizart at gmail.com > - 5.4.A.11-2
 - Add LICENSE.iwlwifi-5000-ucode README.iwlwifi-5000-ucode as %%doc
 



From kwizart at fedoraproject.org  Fri Sep  5 09:53:53 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Fri,  5 Sep 2008 09:53:53 +0000 (UTC)
Subject: rpms/iwl5000-firmware/F-8 iwl5000-firmware.spec,1.2,1.3
Message-ID: <20080905095353.A07BA70121@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/iwl5000-firmware/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30881

Modified Files:
	iwl5000-firmware.spec 
Log Message:
-Update date



Index: iwl5000-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iwl5000-firmware/F-8/iwl5000-firmware.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iwl5000-firmware.spec	5 Sep 2008 09:52:32 -0000	1.2
+++ iwl5000-firmware.spec	5 Sep 2008 09:53:23 -0000	1.3
@@ -45,7 +45,7 @@
 /lib/firmware/*.ucode
 
 %changelog
-* Mon Jul 28 2008 kwizart < kwizart at gmail.com > - 5.4.A.11-3
+* Fri Sep  5 2008 kwizart < kwizart at gmail.com > - 5.4.A.11-3
 - Remove ppc/ppc64 from ExcludedArches
 
 * Mon Jul 28 2008 kwizart < kwizart at gmail.com > - 5.4.A.11-2



From kwizart at fedoraproject.org  Fri Sep  5 09:55:42 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Fri,  5 Sep 2008 09:55:42 +0000 (UTC)
Subject: rpms/iwl5000-firmware/F-9 iwl5000-firmware.spec,1.1,1.2
Message-ID: <20080905095542.8E9D070121@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/iwl5000-firmware/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31562/F-9

Modified Files:
	iwl5000-firmware.spec 
Log Message:
Sync



Index: iwl5000-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iwl5000-firmware/F-9/iwl5000-firmware.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iwl5000-firmware.spec	1 Aug 2008 11:16:21 -0000	1.1
+++ iwl5000-firmware.spec	5 Sep 2008 09:55:12 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           iwl5000-firmware
 Version:        5.4.A.11
-Release:        2
+Release:        3
 Summary:        Firmware for Intel?? PRO/Wireless 5000 A/G/N network adaptors
 
 Group:          System Environment/Kernel
@@ -10,7 +10,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-ExcludeArch:    ppc ppc64
 
 
 %description
@@ -46,6 +45,9 @@
 /lib/firmware/*.ucode
 
 %changelog
+* Fri Sep  5 2008 kwizart < kwizart at gmail.com > - 5.4.A.11-3
+- Remove ppc/ppc64 from ExcludedArches
+
 * Mon Jul 28 2008 kwizart < kwizart at gmail.com > - 5.4.A.11-2
 - Add LICENSE.iwlwifi-5000-ucode README.iwlwifi-5000-ucode as %%doc
 



From kwizart at fedoraproject.org  Fri Sep  5 09:55:42 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Fri,  5 Sep 2008 09:55:42 +0000 (UTC)
Subject: rpms/iwl5000-firmware/devel iwl5000-firmware.spec,1.1,1.2
Message-ID: <20080905095542.A00BA70125@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/iwl5000-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31562/devel

Modified Files:
	iwl5000-firmware.spec 
Log Message:
Sync



Index: iwl5000-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iwl5000-firmware/devel/iwl5000-firmware.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iwl5000-firmware.spec	1 Aug 2008 11:17:56 -0000	1.1
+++ iwl5000-firmware.spec	5 Sep 2008 09:55:12 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           iwl5000-firmware
 Version:        5.4.A.11
-Release:        2
+Release:        3
 Summary:        Firmware for Intel?? PRO/Wireless 5000 A/G/N network adaptors
 
 Group:          System Environment/Kernel
@@ -10,7 +10,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-ExcludeArch:    ppc ppc64
 
 
 %description
@@ -46,6 +45,9 @@
 /lib/firmware/*.ucode
 
 %changelog
+* Fri Sep  5 2008 kwizart < kwizart at gmail.com > - 5.4.A.11-3
+- Remove ppc/ppc64 from ExcludedArches
+
 * Mon Jul 28 2008 kwizart < kwizart at gmail.com > - 5.4.A.11-2
 - Add LICENSE.iwlwifi-5000-ucode README.iwlwifi-5000-ucode as %%doc
 



From kwizart at fedoraproject.org  Fri Sep  5 09:59:09 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Fri,  5 Sep 2008 09:59:09 +0000 (UTC)
Subject: rpms/iwl4965-firmware/F-8 iwl4965-firmware.spec,1.3,1.4
Message-ID: <20080905095909.7C82C70121@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/iwl4965-firmware/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32532

Modified Files:
	iwl4965-firmware.spec 
Log Message:
- Remove ppc/ppc64 from ExcludedArches



Index: iwl4965-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iwl4965-firmware/F-8/iwl4965-firmware.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iwl4965-firmware.spec	11 Jul 2008 14:09:40 -0000	1.3
+++ iwl4965-firmware.spec	5 Sep 2008 09:58:39 -0000	1.4
@@ -5,7 +5,7 @@
 
 Name:           iwl4965-firmware
 Version:        %{iwl4965_v2}
-Release:        1
+Release:        1.1
 Summary:        Firmware for Intel?? PRO/Wireless 4965 A/G/N network adaptors
 
 Group:          System Environment/Kernel
@@ -17,7 +17,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-ExcludeArch:    ppc ppc64
 
 
 %description
@@ -71,6 +70,9 @@
 
 
 %changelog
+* Fri Sep  5 2008 kwizart < kwizart at gmail.com > - 228.57.2.21-1.1
+- Remove ppc/ppc64 from ExcludedArches
+
 * Fri Jul 11 2008 kwizart < kwizart at gmail.com > - 228.57.2.21-1
 - Keep firmware v to 4.44.17 for older gold kernel
 - Update firmware v1 to 228.57.1.21



From pkgdb at fedoraproject.org  Fri Sep  5 10:23:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 10:23:09 +0000
Subject: [pkgdb] swarp: mmahut has requested watchcommits
Message-ID: <20080905102310.0E8C620876A@bastion.fedora.phx.redhat.com>

mmahut has requested the watchcommits acl on swarp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/swarp



From pkgdb at fedoraproject.org  Fri Sep  5 10:23:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 10:23:11 +0000
Subject: [pkgdb] swarp: mmahut has requested commit
Message-ID: <20080905102311.BA57C20876E@bastion.fedora.phx.redhat.com>

mmahut has requested the commit acl on swarp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/swarp



From pkgdb at fedoraproject.org  Fri Sep  5 10:23:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 10:23:14 +0000
Subject: [pkgdb] swarp: mmahut has requested approveacls
Message-ID: <20080905102314.A96B9208771@bastion.fedora.phx.redhat.com>

mmahut has requested the approveacls acl on swarp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/swarp



From pkgdb at fedoraproject.org  Fri Sep  5 10:23:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 10:23:17 +0000
Subject: [pkgdb] swarp: mmahut has requested watchbugzilla
Message-ID: <20080905102317.9D2D9208D0F@bastion.fedora.phx.redhat.com>

mmahut has requested the watchbugzilla acl on swarp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/swarp



From rbhalera at fedoraproject.org  Fri Sep  5 10:42:09 2008
From: rbhalera at fedoraproject.org (Rahul Bhalerao)
Date: Fri,  5 Sep 2008 10:42:09 +0000 (UTC)
Subject: rpms/kacst-fonts/devel .cvsignore, 1.2, 1.3 kacst-fonts.spec, 1.3, 
	1.4 sources, 1.2, 1.3
Message-ID: <20080905104209.1FC2870125@cvs1.fedora.phx.redhat.com>

Author: rbhalera

Update of /cvs/pkgs/rpms/kacst-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12485

Modified Files:
	.cvsignore kacst-fonts.spec sources 
Log Message:
Updated to new version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kacst-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Oct 2007 16:15:51 -0000	1.2
+++ .cvsignore	5 Sep 2008 10:41:38 -0000	1.3
@@ -1 +1 @@
-kacst_fonts_1.6.2.tar.bz2
+kacst_fonts_2.0.tar.bz2


Index: kacst-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kacst-fonts/devel/kacst-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kacst-fonts.spec	23 Jul 2008 10:18:46 -0000	1.3
+++ kacst-fonts.spec	5 Sep 2008 10:41:38 -0000	1.4
@@ -2,8 +2,8 @@
 %define fontdir %{_datadir}/fonts/%{fontname}
 
 Name: %{fontname}-fonts
-Version: 1.6.2
-Release: 4%{?dist}
+Version: 2.0
+Release: 1%{?dist}
 License: GPLv2
 Source: http://downloads.sourceforge.net/sourceforge/arabeyes/%{fontname}_fonts_%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,7 +21,7 @@
 from the King Abdulaziz City for Science & Technology(kacst).
 
 %prep
-%setup -q -n KacstArabicFonts-1.6.2
+%setup -q -n KacstArabicFonts-%{version}
 find . -not -name \*.ttf -type f -exec dos2unix -k {} \;
 
 %build
@@ -50,11 +50,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc *.TXT
+%doc Copyright LICENSE README
 %dir %{fontdir}
 %{fontdir}/*.ttf
 
 %changelog
+* Fri Sep 05 2008 Rahul Bhalerao <rbhalera at redhat.com> - 2.0-1.fc10
+- Updated to new upstream version
+
 * Wed Jul 23 2008 Rahul Bhalerao <rbhalera at redhat.com> - 1.6.2-4.fc10
 - Dropping previous release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kacst-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2007 16:15:51 -0000	1.2
+++ sources	5 Sep 2008 10:41:38 -0000	1.3
@@ -1 +1 @@
-3f914b65dc4e0cc7b30e1d6b263f1d16  kacst_fonts_1.6.2.tar.bz2
+0b6d7b619c85e09c80fca7248af59892  kacst_fonts_2.0.tar.bz2



From petersen at fedoraproject.org  Fri Sep  5 10:47:28 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri,  5 Sep 2008 10:47:28 +0000 (UTC)
Subject: rpms/iok - New directory
Message-ID: <20080905104728.26CF570121@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/iok
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsM13755/rpms/iok

Log Message:
Directory /cvs/extras/rpms/iok added to the repository




From petersen at fedoraproject.org  Fri Sep  5 10:47:29 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri,  5 Sep 2008 10:47:29 +0000 (UTC)
Subject: rpms/iok/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080905104729.8506C70121@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/iok/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsM13755/rpms/iok/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module iok


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: iok
# $Id: Makefile,v 1.1 2008/09/05 10:47:29 petersen Exp $
NAME := iok
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From petersen at fedoraproject.org  Fri Sep  5 10:47:28 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri,  5 Sep 2008 10:47:28 +0000 (UTC)
Subject: rpms/iok/devel - New directory
Message-ID: <20080905104728.5F86970121@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/iok/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsM13755/rpms/iok/devel

Log Message:
Directory /cvs/extras/rpms/iok/devel added to the repository




From petersen at fedoraproject.org  Fri Sep  5 10:47:29 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri,  5 Sep 2008 10:47:29 +0000 (UTC)
Subject: rpms/iok Makefile,NONE,1.1
Message-ID: <20080905104729.4DB1570121@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/iok
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsM13755/rpms/iok

Added Files:
	Makefile 
Log Message:
Setup of module iok


--- NEW FILE Makefile ---
# Top level Makefile for module iok
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From than at fedoraproject.org  Fri Sep  5 10:54:27 2008
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  5 Sep 2008 10:54:27 +0000 (UTC)
Subject: rpms/kiconedit/F-9 kiconedit.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <20080905105427.DC9CF70121@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kiconedit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14981

Modified Files:
	kiconedit.spec sources 
Log Message:
4.1.1



Index: kiconedit.spec
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/F-9/kiconedit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kiconedit.spec	29 Aug 2008 07:32:00 -0000	1.8
+++ kiconedit.spec	5 Sep 2008 10:53:57 -0000	1.9
@@ -2,7 +2,7 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=432139
 
 Name:           kiconedit
-Version:        4.1.0
+Version:        4.1.1
 Release:        1%{?dist}
 Summary:        An icon editor
 
@@ -77,6 +77,9 @@
 %{_kde4_iconsdir}/hicolor/*/*/kiconedit.png
 
 %changelog
+* Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
+- 4.1.1
+
 * Thu Aug 28 2008 Sebastian Vahl <fedora at deadbabylon.de> 4.1.0-1
 - 4.1 (final)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Aug 2008 07:32:00 -0000	1.5
+++ sources	5 Sep 2008 10:53:57 -0000	1.6
@@ -1 +1 @@
-cc2af5cd8a3adceb0e2026618b8fa105  kiconedit-4.1.0.tar.bz2
+1687cb31916957b45587f20a1c7777b4  kiconedit-4.1.1.tar.bz2



From transif at fedoraproject.org  Fri Sep  5 10:56:43 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Fri,  5 Sep 2008 10:56:43 +0000 (UTC)
Subject: comps/po es.po,1.16,1.17
Message-ID: <20080905105643.E4AA370121@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15384/po

Modified Files:
	es.po 
Log Message:
    2008-09-05  Domingo Becker <domingobecker at gmail.com> (via
beckerde at fedoraproject.org)
    
      * po/es.po: updated spanish translation
    



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.16 -r 1.17 es.po
Index: es.po
===================================================================
RCS file: /cvs/pkgs/comps/po/es.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- es.po	17 Jul 2008 18:31:23 -0000	1.16
+++ es.po	5 Sep 2008 10:56:13 -0000	1.17
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-17 14:29-0400\n"
-"PO-Revision-Date: 2008-07-03 09:51-0300\n"
+"POT-Creation-Date: 2008-09-03 09:22+0000\n"
+"PO-Revision-Date: 2008-09-03 10:34-0300\n"
 "Last-Translator: Domingo Becker <domingobecker at gmail.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -18,190 +18,285 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-Language: Spanish\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
+#: ../comps-f7.xml.in.h:1
+#: ../comps-f8.xml.in.h:1
+#: ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
-"Un entorno de escritorio liviano que funciona bien en m??quinas peque??as."
+msgstr "Un entorno de escritorio liviano que funciona bien en m??quinas peque??as."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../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:2
+#: ../comps-el4.xml.in.h:1
+#: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Herramientas de Administraci??n"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
+#: ../comps-f7.xml.in.h:3
+#: ../comps-f8.xml.in.h:3
+#: ../comps-f9.xml.in.h:3
 #: ../comps-f10.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "Soporte para africano"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
+#: ../comps-f7.xml.in.h:4
+#: ../comps-f8.xml.in.h:4
+#: ../comps-f9.xml.in.h:4
 #: ../comps-f10.xml.in.h:4
 msgid "Albanian Support"
 msgstr "Soporte para alban??s"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../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:5
+#: ../comps-el4.xml.in.h:2
+#: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Aplicaciones"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
+#: ../comps-f7.xml.in.h:6
+#: ../comps-f8.xml.in.h:6
+#: ../comps-f9.xml.in.h:6
 #: ../comps-f10.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
 msgstr "Aplicaciones para una variedad de tareas"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../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:7
+#: ../comps-el4.xml.in.h:4
+#: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Soporte para ??rabe"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../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:8
+#: ../comps-el4.xml.in.h:5
+#: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Soporte para armenio"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
+#: ../comps-f7.xml.in.h:9
+#: ../comps-f8.xml.in.h:9
+#: ../comps-f9.xml.in.h:9
 #: ../comps-f10.xml.in.h:9
 msgid "Assamese Support"
 msgstr "Soporte para assam??s"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../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:10
+#: ../comps-el4.xml.in.h:6
+#: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Autor??a y publicaci??n"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
+#: ../comps-f7.xml.in.h:11
+#: ../comps-f8.xml.in.h:11
+#: ../comps-f9.xml.in.h:11
 #: ../comps-f10.xml.in.h:11
 msgid "Base"
 msgstr "Base"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-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:12
+#: ../comps-el4.xml.in.h:7
+#: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Sistema Base"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
+#: ../comps-f7.xml.in.h:13
+#: ../comps-f8.xml.in.h:13
+#: ../comps-f9.xml.in.h:13
 #: ../comps-f10.xml.in.h:13
 msgid "Basic support for the Ruby programming language."
 msgstr "Soporte b??sico para el lenguaje de programaci??n Ruby."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
+#: ../comps-f7.xml.in.h:14
+#: ../comps-f8.xml.in.h:14
+#: ../comps-f9.xml.in.h:14
 #: ../comps-f10.xml.in.h:14
 msgid "Basque Support"
 msgstr "Soporte para vascuence"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
+#: ../comps-f7.xml.in.h:15
+#: ../comps-f8.xml.in.h:15
+#: ../comps-f9.xml.in.h:15
 #: ../comps-f10.xml.in.h:15
 msgid "Belarusian Support"
 msgstr "Soporte para bielorruso"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
+#: ../comps-f7.xml.in.h:16
+#: ../comps-f8.xml.in.h:16
+#: ../comps-f9.xml.in.h:16
 #: ../comps-f10.xml.in.h:16
 msgid "Bengali Support"
 msgstr "Soporte para bengal??"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
+#: ../comps-f7.xml.in.h:17
+#: ../comps-f8.xml.in.h:17
+#: ../comps-f9.xml.in.h:17
 #: ../comps-f10.xml.in.h:17
 msgid "Bhutanese Support"
 msgstr "Soporte para bhutanese"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
+#: ../comps-f7.xml.in.h:18
+#: ../comps-f8.xml.in.h:18
+#: ../comps-f9.xml.in.h:18
 #: ../comps-f10.xml.in.h:18
 msgid "Bosnian Support"
 msgstr "Soporte para bosnio"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
+#: ../comps-f7.xml.in.h:19
+#: ../comps-f8.xml.in.h:19
+#: ../comps-f9.xml.in.h:19
 #: ../comps-f10.xml.in.h:19
 msgid "Brazilian Portuguese Support"
 msgstr "Soporte para portugu??s brasile??o"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
+#: ../comps-f7.xml.in.h:20
+#: ../comps-f8.xml.in.h:20
[...1939 lines suppressed...]
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:121
+#: ../comps-f8.xml.in.h:114
+#: ../comps-f9.xml.in.h:118
+#: ../comps-f10.xml.in.h:122
 msgid "Older bitmap and vector fonts packages"
 msgstr "Paquetes para viejas fuentes de mapas de bit y fuentes vectoriales"
 
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44
+#: ../comps-f9.xml.in.h:44
+#: ../comps-f10.xml.in.h:45
 msgid "Esperanto Support"
 msgstr "Soporte para esperanto"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:94
+#: ../comps-f9.xml.in.h:91
+#: ../comps-f10.xml.in.h:95
 msgid "Kashubian Support"
 msgstr "Soporte para casubiano"
 
-#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:106
+#: ../comps-f9.xml.in.h:103
+#: ../comps-f10.xml.in.h:107
 msgid "Macedonian Support"
 msgstr "Soporte para macedonio"
 
-#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:117
+#: ../comps-f9.xml.in.h:114
+#: ../comps-f10.xml.in.h:118
 msgid "Northern Sami Support"
 msgstr "Soporte para sami septentrional"
 
-#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:133
+#: ../comps-f9.xml.in.h:130
+#: ../comps-f10.xml.in.h:134
 msgid "SUGAR Desktop Environment"
 msgstr "Entorno de Escritorio SUGAR"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:134
+#: ../comps-f9.xml.in.h:131
+#: ../comps-f10.xml.in.h:135
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR es el entorno de escritorio desarrollado para la OLPC XO."
 
-#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:204
+#: ../comps-f9.xml.in.h:200
+#: ../comps-f10.xml.in.h:205
 msgid "Walloon Support"
 msgstr "Soporte para wallon??s"
 
-#: ../comps-f10.xml.in.h:70
+#: ../comps-f10.xml.in.h:23
+msgid "Burmese Support"
+msgstr "Soporte para burmese"
+
+#: ../comps-f10.xml.in.h:71
 msgid "Haskell"
-msgstr ""
+msgstr "Haskell"
 
-#: ../comps-f10.xml.in.h:76
+#: ../comps-f10.xml.in.h:77
 msgid "Input Methods"
 msgstr "M??todos de Entrada"
 
-#: ../comps-f10.xml.in.h:77
+#: ../comps-f10.xml.in.h:78
 msgid "Input method packages for the input of international text."
-msgstr ""
-"Los paquetes de m??todos de entrada para la entrada de texto internacional."
+msgstr "Los paquetes de m??todos de entrada para la entrada de texto internacional."
 
-#: ../comps-f10.xml.in.h:157
-#, fuzzy
+#: ../comps-f10.xml.in.h:158
 msgid "Tajik Support"
-msgstr "Soporte para tailand??s"
+msgstr "Soporte para Tajik"
 
-#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
+#: ../comps-el4.xml.in.h:3
+#: ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Aplicaciones para una variedad de tareas"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12
+#: ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "Soporte de red mediante discado"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
-msgid ""
-"GNOME is a powerful, graphical user interface which includes a panel, "
-"desktop, system icons, and a graphical file manager."
-msgstr ""
-"GNOME es una potente interfaz gr??fica de usuario que incluye un panel, un "
-"escritorio, iconos del sistema y gestores gr??ficos de archivos."
-
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
-msgid ""
-"KDE is a powerful, graphical user interface which includes a panel, desktop, "
-"system icons, and a graphical file manager."
-msgstr ""
-"KDE es una interfaz de usuario gr??fica y potente que incluye un panel, un "
-"escritorio, iconos del sistema y un gestor gr??fico de archivos. "
-
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
-msgid ""
-"Sometimes called text editors, these are programs that allow you to create "
-"and edit files. These include Emacs and Vi."
-msgstr ""
-"Existen programas que permiten crear y modificar archivos, a veces llamados "
-"editores de texto. Estos incluyen Emacs y Vi."
+#: ../comps-el4.xml.in.h:22
+#: ../comps-el5.xml.in.h:23
+msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "GNOME es una potente interfaz gr??fica de usuario que incluye un panel, un escritorio, iconos del sistema y gestores gr??ficos de archivos."
+
+#: ../comps-el4.xml.in.h:35
+#: ../comps-el5.xml.in.h:35
+msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "KDE es una interfaz de usuario gr??fica y potente que incluye un panel, un escritorio, iconos del sistema y un gestor gr??fico de archivos. "
+
+#: ../comps-el4.xml.in.h:44
+#: ../comps-el5.xml.in.h:44
+msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi."
+msgstr "Existen programas que permiten crear y modificar archivos, a veces llamados editores de texto. Estos incluyen Emacs y Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50
+#: ../comps-el5.xml.in.h:48
 msgid "The XEmacs text editor."
 msgstr "Editor de textos XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
-msgid ""
-"These tools allow you to create documentation in the DocBook format and "
-"convert them to HTML, PDF, Postscript, and text."
-msgstr ""
-"Estas herramientas le permiten crear documentaci??n en formato DocBook y "
-"convertirla a HTML, PDF, Postscript y texto."
+#: ../comps-el4.xml.in.h:54
+#: ../comps-el5.xml.in.h:52
+msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text."
+msgstr "Estas herramientas le permiten crear documentaci??n en formato DocBook y convertirla a HTML, PDF, Postscript y texto."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64
+#: ../comps-el5.xml.in.h:62
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "Este grupo es un conjunto de servidores para prop??sitos espec??ficos"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
-msgstr ""
-"Este grupo es un conjunto de herramientas y recursos para entornos en Ar??be."
-
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
-msgstr ""
-"Este grupo es un conjunto de herramientas y recursos para entornos en Hebreo."
-
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
-msgstr ""
-"Este grupo es un conjunto de herramientas y recursos para entornos en "
-"Japon??s."
+#: ../comps-el4.xml.in.h:65
+#: ../comps-el5.xml.in.h:63
+msgid "This group is a collection of tools and resources of Arabic environments."
+msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Ar??be."
+
+#: ../comps-el4.xml.in.h:67
+#: ../comps-el5.xml.in.h:66
+msgid "This group is a collection of tools and resources of Hebrew environments."
+msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Hebreo."
+
+#: ../comps-el4.xml.in.h:68
+#: ../comps-el5.xml.in.h:67
+msgid "This group is a collection of tools and resources of Japanese environments."
+msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Japon??s."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77
+#: ../comps-el5.xml.in.h:77
 msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
-msgstr ""
-"Este grupo es un conjunto de herramientas y recursos para entornos en Checo."
+msgid "This group is a collection of tools and resources of Czech environments."
+msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Checo."
+



From pnemade at fedoraproject.org  Fri Sep  5 11:00:12 2008
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Fri,  5 Sep 2008 11:00:12 +0000 (UTC)
Subject: rpms/iok/devel import.log, NONE, 1.1 iok.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080905110012.0CF4C70121@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/iok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15624/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log iok.spec 
Log Message:

* Tue Sep 02 2008 Parag Nemade <panemade at gmail.com>- 1.0.8-2
- Initial import for Fedora.




--- NEW FILE import.log ---
iok-1_0_8-2_fc9:HEAD:iok-1.0.8-2.fc9.src.rpm:1220611562


--- NEW FILE iok.spec ---
Name:           iok
Version:        1.0.8
Release:        2%{?dist}
Summary:        Indic Onscreen Virtual Keyboard
Group:          Applications/System
License:        GPLv2+
URL:            https://fedorahosted.org/iok/wiki/
Source0:        https://fedorahosted.org/releases/i/o/iok/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  desktop-file-utils libXtst-devel
BuildRequires:  gtk2-devel

%description
iok is Indic Onscreen Keyboard. It provides virtual Keyboard functionality. 
It currently works with Inscript keymaps for Indian languages. iok can even try 
to parse non-inscript keymaps and show them in iok.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"

desktop-file-install --vendor fedora \
    --delete-original \
    --dir %{buildroot}/%{_datadir}/applications/ \
     %{buildroot}%{_datadir}/applications/%{name}.desktop


%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS ChangeLog README
%{_bindir}/iok
%{_datadir}/applications/fedora-iok.desktop
%{_datadir}/pixmaps/iok.xpm

%changelog
* Tue Sep 02 2008 Parag Nemade <panemade at gmail.com>- 1.0.8-2
- Added Source URL and modified description 

* Tue Sep 02 2008 Parag Nemade <panemade at gmail.com>- 1.0.8-1
- Update to Next release 1.0.8

* Thu Aug 14 2008 Parag Nemade <panemade at gmail.com>- 1.0.7-3.svn9
- fix directory ownership

* Thu Aug 14 2008 Parag Nemade <panemade at gmail.com>- 1.0.7-2.svn9
- Update to svn snapshot revision 9

* Tue Jun 17 2008 Parag Nemade <panemade at gmail.com>- 1.0.7-1
- Update to Next release 1.0.7

* Thu Jun 12 2008 Parag Nemade <panemade at gmail.com>- 1.0.6-2
- Added missing BR:libXtst-devel

* Fri Apr 25 2008 Parag Nemade <panemade at gmail.com>- 1.0.6-1
- Update to Next release 1.0.6

* Tue Apr 17 2008 Parag Nemade <panemade at gmail.com>- 1.0.2-1
- Update to Next release 1.0.2

* Tue Apr 15 2008 Parag Nemade <panemade at gmail.com>- 1.0.0-1
- Initial specfile for Fedora 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iok/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 10:47:29 -0000	1.1
+++ .cvsignore	5 Sep 2008 10:59:41 -0000	1.2
@@ -0,0 +1 @@
+iok-1.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iok/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 10:47:29 -0000	1.1
+++ sources	5 Sep 2008 10:59:41 -0000	1.2
@@ -0,0 +1 @@
+2bd14a41a710f8c91fd994df6322d748  iok-1.0.8.tar.gz



From pnemade at fedoraproject.org  Fri Sep  5 11:06:51 2008
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Fri,  5 Sep 2008 11:06:51 +0000 (UTC)
Subject: rpms/iok/EL-5 sources,1.1,1.2
Message-ID: <20080905110651.F0DE970121@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/iok/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16769

Modified Files:
	sources 
Log Message:

* Tue Sep 02 2008 Parag Nemade <panemade at gmail.com>- 1.0.8-2
- Initial EPEL release




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iok/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 10:47:29 -0000	1.1
+++ sources	5 Sep 2008 11:06:21 -0000	1.2
@@ -0,0 +1 @@
+2bd14a41a710f8c91fd994df6322d748  iok-1.0.8.tar.gz



From pnemade at fedoraproject.org  Fri Sep  5 11:07:25 2008
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Fri,  5 Sep 2008 11:07:25 +0000 (UTC)
Subject: rpms/iok/EL-5 iok.spec,NONE,1.1
Message-ID: <20080905110725.00FD270121@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/iok/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16962

Added Files:
	iok.spec 
Log Message:

 - Added iok.spec to cvs




--- NEW FILE iok.spec ---
Name:           iok
Version:        1.0.8
Release:        2%{?dist}
Summary:        Indic Onscreen Virtual Keyboard
Group:          Applications/System
License:        GPLv2+
URL:            https://fedorahosted.org/iok/wiki/
Source0:        https://fedorahosted.org/releases/i/o/iok/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  desktop-file-utils libXtst-devel
BuildRequires:  gtk2-devel

%description
iok is Indic Onscreen Keyboard. It provides virtual Keyboard functionality. 
It currently works with Inscript keymaps for Indian languages. iok can even try 
to parse non-inscript keymaps and show them in iok.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"

desktop-file-install --vendor fedora \
    --delete-original \
    --dir %{buildroot}/%{_datadir}/applications/ \
     %{buildroot}%{_datadir}/applications/%{name}.desktop


%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS ChangeLog README
%{_bindir}/iok
%{_datadir}/applications/fedora-iok.desktop
%{_datadir}/pixmaps/iok.xpm

%changelog
* Tue Sep 02 2008 Parag Nemade <panemade at gmail.com>- 1.0.8-2
- Added Source URL and modified description 

* Tue Sep 02 2008 Parag Nemade <panemade at gmail.com>- 1.0.8-1
- Update to Next release 1.0.8

* Thu Aug 14 2008 Parag Nemade <panemade at gmail.com>- 1.0.7-3.svn9
- fix directory ownership

* Thu Aug 14 2008 Parag Nemade <panemade at gmail.com>- 1.0.7-2.svn9
- Update to svn snapshot revision 9

* Tue Jun 17 2008 Parag Nemade <panemade at gmail.com>- 1.0.7-1
- Update to Next release 1.0.7

* Thu Jun 12 2008 Parag Nemade <panemade at gmail.com>- 1.0.6-2
- Added missing BR:libXtst-devel

* Fri Apr 25 2008 Parag Nemade <panemade at gmail.com>- 1.0.6-1
- Update to Next release 1.0.6

* Tue Apr 17 2008 Parag Nemade <panemade at gmail.com>- 1.0.2-1
- Update to Next release 1.0.2

* Tue Apr 15 2008 Parag Nemade <panemade at gmail.com>- 1.0.0-1
- Initial specfile for Fedora 




From pnemade at fedoraproject.org  Fri Sep  5 11:10:49 2008
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Fri,  5 Sep 2008 11:10:49 +0000 (UTC)
Subject: rpms/iok/F-9 iok.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20080905111050.0480670121@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/iok/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17351

Modified Files:
	sources 
Added Files:
	iok.spec 
Log Message:

* Tue Sep 02 2008 Parag Nemade <panemade at gmail.com>- 1.0.8-2
- Initial import for Fedora




--- NEW FILE iok.spec ---
Name:           iok
Version:        1.0.8
Release:        2%{?dist}
Summary:        Indic Onscreen Virtual Keyboard
Group:          Applications/System
License:        GPLv2+
URL:            https://fedorahosted.org/iok/wiki/
Source0:        https://fedorahosted.org/releases/i/o/iok/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  desktop-file-utils libXtst-devel
BuildRequires:  gtk2-devel

%description
iok is Indic Onscreen Keyboard. It provides virtual Keyboard functionality. 
It currently works with Inscript keymaps for Indian languages. iok can even try 
to parse non-inscript keymaps and show them in iok.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"

desktop-file-install --vendor fedora \
    --delete-original \
    --dir %{buildroot}/%{_datadir}/applications/ \
     %{buildroot}%{_datadir}/applications/%{name}.desktop


%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS ChangeLog README
%{_bindir}/iok
%{_datadir}/applications/fedora-iok.desktop
%{_datadir}/pixmaps/iok.xpm

%changelog
* Tue Sep 02 2008 Parag Nemade <panemade at gmail.com>- 1.0.8-2
- Added Source URL and modified description 

* Tue Sep 02 2008 Parag Nemade <panemade at gmail.com>- 1.0.8-1
- Update to Next release 1.0.8

* Thu Aug 14 2008 Parag Nemade <panemade at gmail.com>- 1.0.7-3.svn9
- fix directory ownership

* Thu Aug 14 2008 Parag Nemade <panemade at gmail.com>- 1.0.7-2.svn9
- Update to svn snapshot revision 9

* Tue Jun 17 2008 Parag Nemade <panemade at gmail.com>- 1.0.7-1
- Update to Next release 1.0.7

* Thu Jun 12 2008 Parag Nemade <panemade at gmail.com>- 1.0.6-2
- Added missing BR:libXtst-devel

* Fri Apr 25 2008 Parag Nemade <panemade at gmail.com>- 1.0.6-1
- Update to Next release 1.0.6

* Tue Apr 17 2008 Parag Nemade <panemade at gmail.com>- 1.0.2-1
- Update to Next release 1.0.2

* Tue Apr 15 2008 Parag Nemade <panemade at gmail.com>- 1.0.0-1
- Initial specfile for Fedora 



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iok/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 10:47:29 -0000	1.1
+++ sources	5 Sep 2008 11:10:19 -0000	1.2
@@ -0,0 +1 @@
+2bd14a41a710f8c91fd994df6322d748  iok-1.0.8.tar.gz



From than at fedoraproject.org  Fri Sep  5 11:12:42 2008
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  5 Sep 2008 11:12:42 +0000 (UTC)
Subject: rpms/kcoloredit/F-9 kcoloredit.spec,1.7,1.8 sources,1.5,1.6
Message-ID: <20080905111242.AED1C70123@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kcoloredit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17619

Modified Files:
	kcoloredit.spec sources 
Log Message:
4.1.1



Index: kcoloredit.spec
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/F-9/kcoloredit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kcoloredit.spec	28 Aug 2008 22:15:56 -0000	1.7
+++ kcoloredit.spec	5 Sep 2008 11:12:12 -0000	1.8
@@ -2,14 +2,14 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=432137
 
 Name:           kcoloredit
-Version:        4.1
+Version:        4.1.1
 Release:        1%{?dist}
 Summary:        A color palette Editor
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://www.kde.org
-Source0:        ftp://ftp.kde.org/pub/kde/stable/4.1.0/src/extragear/kcoloredit-1.9.0-kde4.1.0.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/4.1.0/src/extragear/kcoloredit-1.9.0-kde%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kde-filesystem >= 4
@@ -29,7 +29,7 @@
 color palettes and for color choosing and naming.
 
 %prep
-%setup -qn kcoloredit-1.9.0-kde4.1.0
+%setup -qn kcoloredit-1.9.0-kde%{version}
 
 %build
 
@@ -74,6 +74,9 @@
 %{_kde4_iconsdir}/hicolor/*/*/kcoloredit.png
 
 %changelog
+* Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
+- 4.1.1
+
 * Thu Aug 28 2008 Sebastian Vahl <fedora at deadbabylon.de> 4.1-1
 - 4.1 (final)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Aug 2008 22:15:56 -0000	1.5
+++ sources	5 Sep 2008 11:12:12 -0000	1.6
@@ -1 +1 @@
-1643230fea1e678f58e581b92603c8ca  kcoloredit-1.9.0-kde4.1.0.tar.bz2
+d68e8b3530839096ee8b9e3a515570bd  kcoloredit-1.9.0-kde4.1.1.tar.bz2



From till at fedoraproject.org  Fri Sep  5 11:45:33 2008
From: till at fedoraproject.org (Till Maas)
Date: Fri,  5 Sep 2008 11:45:33 +0000 (UTC)
Subject: rpms/libHX/devel .cvsignore, 1.6, 1.7 libHX.spec, 1.7, 1.8 sources, 
	1.6, 1.7
Message-ID: <20080905114533.BA7B170121@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/libHX/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21483

Modified Files:
	.cvsignore libHX.spec sources 
Log Message:
* Fri Sep 05 2008 Till Maas <opensource at till.name> - 1.23-1
- Update to latest version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Jun 2008 20:44:19 -0000	1.6
+++ .cvsignore	5 Sep 2008 11:45:02 -0000	1.7
@@ -1 +1 @@
-libHX-1.18.tar.bz2
+libHX-1.23.tar.bz2


Index: libHX.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/libHX.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libHX.spec	11 Jun 2008 21:21:45 -0000	1.7
+++ libHX.spec	5 Sep 2008 11:45:02 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           libHX
-Version:        1.18
-Release:        2%{?dist}
+Version:        1.23
+Release:        1%{?dist}
 Summary:        General-purpose library for typical low-level operations
 
 Group:          System Environment/Libraries
 License:        LGPLv2 or LGPLv3
-URL:            http://jengelh.hopto.org/f/libHX/
-Source0:        http://jengelh.hopto.org/f/libHX/libHX-%{version}.tar.bz2
+URL:            http://jengelh.hopto.org/files/libHX/
+Source0:        http://jengelh.hopto.org/files/libHX/libHX-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl gcc-c++
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Fri Sep 05 2008 Till Maas <opensource at till.name> - 1.23-1
+- Update to latest version
+
 * Wed Jun 11 2008 Till Maas <opensource till name> - 1.18-2
 - Set variable V for make: displays full compiler commandline
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Jun 2008 20:44:19 -0000	1.6
+++ sources	5 Sep 2008 11:45:02 -0000	1.7
@@ -1 +1 @@
-9625203a52d12734f15364a48f461599  libHX-1.18.tar.bz2
+a14dcb5f8c89ec6ba754b4d1e61612b4  libHX-1.23.tar.bz2



From till at fedoraproject.org  Fri Sep  5 11:46:33 2008
From: till at fedoraproject.org (Till Maas)
Date: Fri,  5 Sep 2008 11:46:33 +0000 (UTC)
Subject: rpms/pam_mount/devel pam_mount.spec,1.39,1.40
Message-ID: <20080905114633.62F0770121@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21689

Modified Files:
	pam_mount.spec 
Log Message:
* Fri Sep 05 2008 Till Maas <opensource at till.name> - 0.47-1
- Update to new version that includes a security fix:
  https://sourceforge.net/project/shownotes.php?release_id=624240
- Add lzma BR and unpack source manually
- Update libHX requirements



Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- pam_mount.spec	5 Sep 2008 08:32:16 -0000	1.39
+++ pam_mount.spec	5 Sep 2008 11:46:03 -0000	1.40
@@ -12,11 +12,11 @@
 
 BuildRequires:  glib2-devel, pam-devel, openssl-devel
 BuildRequires:  libxml2-devel
-BuildRequires:  libHX-devel >= 1.18
+BuildRequires:  libHX-devel >= 1.23
 BuildRequires:  lzma
 Requires:       pam, lsof
 Requires:       psmisc
-Requires:       libHX >= 1.18
+Requires:       libHX >= 1.23
 Requires(post):  perl(XML::Writer)
 
 
@@ -96,6 +96,7 @@
 - Update to new version that includes a security fix:
   https://sourceforge.net/project/shownotes.php?release_id=624240
 - Add lzma BR and unpack source manually
+- Update libHX requirements
 
 * Mon Jun 23 2008 Till Maas <opensource at till.name> - 0.41-2
 - Add patch to fix <or> handling in config file, reference:



From rdieter at fedoraproject.org  Fri Sep  5 11:49:13 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  5 Sep 2008 11:49:13 +0000 (UTC)
Subject: rpms/libmusicbrainz3/devel libmusicbrainz3.spec,1.3,1.4
Message-ID: <20080905114913.7BF5B70121@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libmusicbrainz3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22114

Modified Files:
	libmusicbrainz3.spec 
Log Message:
* Fri Sep 05 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.1-4
- Build docs (#461238)
- -devel: drop extraneous Requires



Index: libmusicbrainz3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmusicbrainz3/devel/libmusicbrainz3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libmusicbrainz3.spec	25 Jul 2008 16:01:23 -0000	1.3
+++ libmusicbrainz3.spec	5 Sep 2008 11:48:43 -0000	1.4
@@ -4,7 +4,7 @@
 Summary: Library for accessing MusicBrainz servers
 Name: libmusicbrainz3
 Version: 3.0.1 
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.musicbrainz.org/
@@ -16,6 +16,7 @@
 Patch2: libmusicbrainz-3.0.1-private.patch
 
 BuildRequires: cmake
+BuildRequires: doxygen
 BuildRequires: libdiscid-devel
 BuildRequires: neon-devel
 
@@ -30,7 +31,7 @@
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 # patch2 likely fixes this , confirm w/upstream -- Rex
-Requires: libdiscid-devel neon-devel
+#Requires: libdiscid-devel neon-devel
 %description devel
 This package contains the headers that programmers will need to develop
 applications which will use %{name}. 
@@ -44,19 +45,17 @@
 
 
 %build
+%{cmake} .
 
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake} ..
-popd
-
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} 
+make docs
 
 
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install DESTDIR=%{buildroot} 
+
 
 %clean
 rm -rf %{buildroot}
@@ -74,12 +73,17 @@
 
 %files devel
 %defattr(-,root,root,-)
+%doc docs/
 %{_includedir}/musicbrainz3/
 %{_libdir}/libmusicbrainz3.so
 %{_libdir}/pkgconfig/libmusicbrainz3.pc
 
 
 %changelog
+* Fri Sep 05 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.1-4
+- Build docs (#461238)
+- -devel: drop extraneous Requires
+
 * Fri Jul 25 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.1-3
 - fix recursive linking against libdiscid neon
 



From rdieter at fedoraproject.org  Fri Sep  5 11:50:56 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  5 Sep 2008 11:50:56 +0000 (UTC)
Subject: rpms/libmusicbrainz3/F-9 libmusicbrainz-3.0.1-gcc43.patch, NONE,
	1.1 libmusicbrainz-3.0.1-private.patch, NONE,
	1.1 libmusicbrainz3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20080905115056.63E6F70121@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libmusicbrainz3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22473

Modified Files:
	.cvsignore sources 
Added Files:
	libmusicbrainz-3.0.1-gcc43.patch 
	libmusicbrainz-3.0.1-private.patch libmusicbrainz3.spec 
Log Message:
sync w/ devel


libmusicbrainz-3.0.1-gcc43.patch:

--- NEW FILE libmusicbrainz-3.0.1-gcc43.patch ---
diff -up libmusicbrainz-3.0.1/src/utils_private.cpp.gcc43 libmusicbrainz-3.0.1/src/utils_private.cpp
--- libmusicbrainz-3.0.1/src/utils_private.cpp.gcc43	2006-09-05 03:59:44.000000000 -0500
+++ libmusicbrainz-3.0.1/src/utils_private.cpp	2008-06-15 19:33:15.000000000 -0500
@@ -22,6 +22,7 @@
  
 #include <cstring>
 #include <cstdarg>
+#include <cstdlib>
 #include <iostream>
 #include <map>
 #include <ne_uri.h> 

libmusicbrainz-3.0.1-private.patch:

--- NEW FILE libmusicbrainz-3.0.1-private.patch ---
diff -up libmusicbrainz-3.0.1/libmusicbrainz3.pc.cmake.private libmusicbrainz-3.0.1/libmusicbrainz3.pc.cmake
--- libmusicbrainz-3.0.1/libmusicbrainz3.pc.cmake.private	2007-05-11 17:55:10.000000000 -0500
+++ libmusicbrainz-3.0.1/libmusicbrainz3.pc.cmake	2008-07-25 10:56:33.000000000 -0500
@@ -7,7 +7,7 @@ Name: ${PROJECT_NAME}
 Description: The Musicbrainz Client Library.
 URL: http://musicbrainz.org/doc/libmusicbrainz
 Version: ${PROJECT_VERSION}
-Requires: neon >= 0.25, libdiscid
+Requires.private: neon >= 0.25, libdiscid
 Libs: -L${LIB_INSTALL_DIR} -lmusicbrainz3
 Cflags: -I${INCLUDE_INSTALL_DIR}
 


--- NEW FILE libmusicbrainz3.spec ---

# Fedora package review: http://bugzilla.redhat.com/451643

Summary: Library for accessing MusicBrainz servers
Name: libmusicbrainz3
Version: 3.0.1 
Release: 4%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.musicbrainz.org/
Source0: ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# upstream these -- Rex
Patch1: libmusicbrainz-3.0.1-gcc43.patch
Patch2: libmusicbrainz-3.0.1-private.patch

BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: libdiscid-devel
BuildRequires: neon-devel

%description
The MusicBrainz client library allows applications to make metadata
lookup to a MusicBrainz server, generate signatures from WAV data and
create CD Index Disk ids from audio CD roms.

%package devel
Summary: Headers for developing programs that will use %{name} 
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
# patch2 likely fixes this , confirm w/upstream -- Rex
#Requires: libdiscid-devel neon-devel
%description devel
This package contains the headers that programmers will need to develop
applications which will use %{name}. 


%prep
%setup -q -n libmusicbrainz-%{version}

%patch1 -p1 -b .gcc43
%patch2 -p1 -b .private


%build
%{cmake} .

make %{?_smp_mflags} 
make docs


%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot} 


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS.txt COPYING.txt NEWS.txt README.txt
%{_libdir}/libmusicbrainz3.so.6*

%files devel
%defattr(-,root,root,-)
%doc docs/
%{_includedir}/musicbrainz3/
%{_libdir}/libmusicbrainz3.so
%{_libdir}/pkgconfig/libmusicbrainz3.pc


%changelog
* Fri Sep 05 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.1-4
- Build docs (#461238)
- -devel: drop extraneous Requires

* Fri Jul 25 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.1-3
- fix recursive linking against libdiscid neon

* Thu Jul 24 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.1-2
- BR: libdiscid-devel
- -devel: Requires: libdiscid-devel neon-devel

* Mon Jun 16 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.1-1
- libmusicbrainz3-3.0.1

* Sun Jun 15 2008 Rex Dieter <rdieter at fedoraproject.org> 2.1.5-7
- Provides: libmusicbrainz2(-devel), prepare for libmusicbrainz3

* Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 2.1.5-6
- gcc43 patch (#434127)

* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.1.5-5
- Autorebuild for GCC 4.3

* Mon Feb 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.1.5-4
- specfile cosmetics

* Thu Nov 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 2.1.5-3
- use versioned Obsoletes
- drop (Build)Requires: libstdc++-devel
- License: LGPLv2+

* Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 2.1.5-2
- Rebuild for PPC toolchain bug

* Thu Jun 21 2007 - Bastien Nocera <bnocera at redhat.com> - 2.1.5-1
- Update to 2.1.5

* Mon Oct 23 2006 Matthias Clasen <mclasen at redhat.com> - 2.1.4-1
- Update to 2.1.4

* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.1.1-4.1
- rebuild

* Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 2.1.1-4
- rebuild for -devel deps

* Tue Apr 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.1.1-3
- apply .spec file cleanups from Matthias Saou (#172926)

* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1.1-2.1
- bump again for double-long bug on ppc(64)

* Tue Feb  7 2006 Christopher Aillon <caillon at redhat.com> - 2.1.1-2
- Stop shipping the .a file in the main package

* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.1-1.2
- rebuilt for new gcc4.1 snapshot and glibc changes

* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
- rebuilt

* Wed Mar 23 2005 John (J5) Palmieri <johnp at redhat.com> 2.1.1-1
- Update to upstream version 2.1.1
- Removed libmusicbrainz-2.0.2-missing-return.patch
- Removed libmusicbrainz-2.0.2-conf.patch

* Wed Mar 03 2005 John (J5) Palmieri <johnp at redhat.com> 2.0.2-14
- Add patch to fix percision cast error to compile correctly on s390x
 
* Wed Mar 03 2005 John (J5) Palmieri <johnp at redhat.com> 2.0.2-13
- rebuild with gcc 4.0

* Mon Nov 08 2004 Colin Walters <walters at redhat.com> 2.0.2-12
- Add libmusicbrainz-2.0.2-missing-return.patch (bug #137289)

* Thu Oct 07 2004 Colin Walters <walters at redhat.com> 2.0.2-11
- BuildRequire expat-devel

* Tue Sep 28 2004 Colin Walters <walters at redhat.com> 2.0.2-10
- Move .so symlink to -devel package

* Tue Aug 31 2004 Colin Walters <walters at redhat.com> 2.0.2-9
- Add ldconfig calls (bz #131281)

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Dec 18 2003 Brent Fox <bfox at redhat.com> 2.0.2-6
- add a BuildPreReq for libstdc++-devel and gcc-c++ (bug #106556)
- add a Requires for libstdc++-devel for libmusicbrainz-devel

* Mon Sep  1 2003 Bill Nottingham <notting at redhat.com>
- Obsoletes musicbrainz-devel too

* Mon Sep  1 2003 Jonathan Blandford <jrb at redhat.com>
- Obsoletes musicbrainz

* Fri Aug 22 2003 Bill Nottingham <notting at redhat.com> 2.0.2-5
- fix autoconf/libtool weirdness, remove exclusivearch

* Fri Aug 22 2003 Brent Fox <bfox at redhat.com> 2.0.2-4
- add ExcludeArch for s390x (something is really broken)

* Fri Aug 22 2003 Brent Fox <bfox at redhat.com> 2.0.2-3
- add ExcludeArch for ppc64

* Fri Aug 22 2003 Brent Fox <bfox at redhat.com> 2.0.2-2
- add ExcludeArch for x86_64 for now

* Thu Aug 21 2003 Brent Fox <bfox at redhat.com> 
- Initial build.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmusicbrainz3/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jun 2008 17:17:30 -0000	1.1
+++ .cvsignore	5 Sep 2008 11:50:26 -0000	1.2
@@ -0,0 +1 @@
+libmusicbrainz-3.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmusicbrainz3/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jun 2008 17:17:30 -0000	1.1
+++ sources	5 Sep 2008 11:50:26 -0000	1.2
@@ -0,0 +1 @@
+d42110ae548dae1eea73e83b03a1a936  libmusicbrainz-3.0.1.tar.gz



From till at fedoraproject.org  Fri Sep  5 11:51:05 2008
From: till at fedoraproject.org (Till Maas)
Date: Fri,  5 Sep 2008 11:51:05 +0000 (UTC)
Subject: rpms/libHX/devel libHX.spec,1.8,1.9
Message-ID: <20080905115105.662DF70121@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/libHX/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22533

Modified Files:
	libHX.spec 
Log Message:
* Fri Sep 05 2008 Till Maas <opensource at till.name> - 1.23-1
- Update to latest version



Index: libHX.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/libHX.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libHX.spec	5 Sep 2008 11:45:02 -0000	1.8
+++ libHX.spec	5 Sep 2008 11:50:35 -0000	1.9
@@ -48,7 +48,6 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT V=verbose
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'



From rdieter at fedoraproject.org  Fri Sep  5 11:52:25 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  5 Sep 2008 11:52:25 +0000 (UTC)
Subject: rpms/libmusicbrainz3/F-8 libmusicbrainz-3.0.1-gcc43.patch, NONE,
	1.1 libmusicbrainz-3.0.1-private.patch, NONE,
	1.1 libmusicbrainz3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20080905115225.92B9C70121@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libmusicbrainz3/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23033

Modified Files:
	.cvsignore sources 
Added Files:
	libmusicbrainz-3.0.1-gcc43.patch 
	libmusicbrainz-3.0.1-private.patch libmusicbrainz3.spec 
Log Message:
sync w/ devel


libmusicbrainz-3.0.1-gcc43.patch:

--- NEW FILE libmusicbrainz-3.0.1-gcc43.patch ---
diff -up libmusicbrainz-3.0.1/src/utils_private.cpp.gcc43 libmusicbrainz-3.0.1/src/utils_private.cpp
--- libmusicbrainz-3.0.1/src/utils_private.cpp.gcc43	2006-09-05 03:59:44.000000000 -0500
+++ libmusicbrainz-3.0.1/src/utils_private.cpp	2008-06-15 19:33:15.000000000 -0500
@@ -22,6 +22,7 @@
  
 #include <cstring>
 #include <cstdarg>
+#include <cstdlib>
 #include <iostream>
 #include <map>
 #include <ne_uri.h> 

libmusicbrainz-3.0.1-private.patch:

--- NEW FILE libmusicbrainz-3.0.1-private.patch ---
diff -up libmusicbrainz-3.0.1/libmusicbrainz3.pc.cmake.private libmusicbrainz-3.0.1/libmusicbrainz3.pc.cmake
--- libmusicbrainz-3.0.1/libmusicbrainz3.pc.cmake.private	2007-05-11 17:55:10.000000000 -0500
+++ libmusicbrainz-3.0.1/libmusicbrainz3.pc.cmake	2008-07-25 10:56:33.000000000 -0500
@@ -7,7 +7,7 @@ Name: ${PROJECT_NAME}
 Description: The Musicbrainz Client Library.
 URL: http://musicbrainz.org/doc/libmusicbrainz
 Version: ${PROJECT_VERSION}
-Requires: neon >= 0.25, libdiscid
+Requires.private: neon >= 0.25, libdiscid
 Libs: -L${LIB_INSTALL_DIR} -lmusicbrainz3
 Cflags: -I${INCLUDE_INSTALL_DIR}
 


--- NEW FILE libmusicbrainz3.spec ---

# Fedora package review: http://bugzilla.redhat.com/451643

Summary: Library for accessing MusicBrainz servers
Name: libmusicbrainz3
Version: 3.0.1 
Release: 4%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.musicbrainz.org/
Source0: ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# upstream these -- Rex
Patch1: libmusicbrainz-3.0.1-gcc43.patch
Patch2: libmusicbrainz-3.0.1-private.patch

BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: libdiscid-devel
BuildRequires: neon-devel

%description
The MusicBrainz client library allows applications to make metadata
lookup to a MusicBrainz server, generate signatures from WAV data and
create CD Index Disk ids from audio CD roms.

%package devel
Summary: Headers for developing programs that will use %{name} 
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
# patch2 likely fixes this , confirm w/upstream -- Rex
#Requires: libdiscid-devel neon-devel
%description devel
This package contains the headers that programmers will need to develop
applications which will use %{name}. 


%prep
%setup -q -n libmusicbrainz-%{version}

%patch1 -p1 -b .gcc43
%patch2 -p1 -b .private


%build
%{cmake} .

make %{?_smp_mflags} 
make docs


%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot} 


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS.txt COPYING.txt NEWS.txt README.txt
%{_libdir}/libmusicbrainz3.so.6*

%files devel
%defattr(-,root,root,-)
%doc docs/
%{_includedir}/musicbrainz3/
%{_libdir}/libmusicbrainz3.so
%{_libdir}/pkgconfig/libmusicbrainz3.pc


%changelog
* Fri Sep 05 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.1-4
- Build docs (#461238)
- -devel: drop extraneous Requires

* Fri Jul 25 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.1-3
- fix recursive linking against libdiscid neon

* Thu Jul 24 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.1-2
- BR: libdiscid-devel
- -devel: Requires: libdiscid-devel neon-devel

* Mon Jun 16 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.1-1
- libmusicbrainz3-3.0.1

* Sun Jun 15 2008 Rex Dieter <rdieter at fedoraproject.org> 2.1.5-7
- Provides: libmusicbrainz2(-devel), prepare for libmusicbrainz3

* Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 2.1.5-6
- gcc43 patch (#434127)

* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.1.5-5
- Autorebuild for GCC 4.3

* Mon Feb 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.1.5-4
- specfile cosmetics

* Thu Nov 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 2.1.5-3
- use versioned Obsoletes
- drop (Build)Requires: libstdc++-devel
- License: LGPLv2+

* Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 2.1.5-2
- Rebuild for PPC toolchain bug

* Thu Jun 21 2007 - Bastien Nocera <bnocera at redhat.com> - 2.1.5-1
- Update to 2.1.5

* Mon Oct 23 2006 Matthias Clasen <mclasen at redhat.com> - 2.1.4-1
- Update to 2.1.4

* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.1.1-4.1
- rebuild

* Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 2.1.1-4
- rebuild for -devel deps

* Tue Apr 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.1.1-3
- apply .spec file cleanups from Matthias Saou (#172926)

* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1.1-2.1
- bump again for double-long bug on ppc(64)

* Tue Feb  7 2006 Christopher Aillon <caillon at redhat.com> - 2.1.1-2
- Stop shipping the .a file in the main package

* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.1-1.2
- rebuilt for new gcc4.1 snapshot and glibc changes

* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
- rebuilt

* Wed Mar 23 2005 John (J5) Palmieri <johnp at redhat.com> 2.1.1-1
- Update to upstream version 2.1.1
- Removed libmusicbrainz-2.0.2-missing-return.patch
- Removed libmusicbrainz-2.0.2-conf.patch

* Wed Mar 03 2005 John (J5) Palmieri <johnp at redhat.com> 2.0.2-14
- Add patch to fix percision cast error to compile correctly on s390x
 
* Wed Mar 03 2005 John (J5) Palmieri <johnp at redhat.com> 2.0.2-13
- rebuild with gcc 4.0

* Mon Nov 08 2004 Colin Walters <walters at redhat.com> 2.0.2-12
- Add libmusicbrainz-2.0.2-missing-return.patch (bug #137289)

* Thu Oct 07 2004 Colin Walters <walters at redhat.com> 2.0.2-11
- BuildRequire expat-devel

* Tue Sep 28 2004 Colin Walters <walters at redhat.com> 2.0.2-10
- Move .so symlink to -devel package

* Tue Aug 31 2004 Colin Walters <walters at redhat.com> 2.0.2-9
- Add ldconfig calls (bz #131281)

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Dec 18 2003 Brent Fox <bfox at redhat.com> 2.0.2-6
- add a BuildPreReq for libstdc++-devel and gcc-c++ (bug #106556)
- add a Requires for libstdc++-devel for libmusicbrainz-devel

* Mon Sep  1 2003 Bill Nottingham <notting at redhat.com>
- Obsoletes musicbrainz-devel too

* Mon Sep  1 2003 Jonathan Blandford <jrb at redhat.com>
- Obsoletes musicbrainz

* Fri Aug 22 2003 Bill Nottingham <notting at redhat.com> 2.0.2-5
- fix autoconf/libtool weirdness, remove exclusivearch

* Fri Aug 22 2003 Brent Fox <bfox at redhat.com> 2.0.2-4
- add ExcludeArch for s390x (something is really broken)

* Fri Aug 22 2003 Brent Fox <bfox at redhat.com> 2.0.2-3
- add ExcludeArch for ppc64

* Fri Aug 22 2003 Brent Fox <bfox at redhat.com> 2.0.2-2
- add ExcludeArch for x86_64 for now

* Thu Aug 21 2003 Brent Fox <bfox at redhat.com> 
- Initial build.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmusicbrainz3/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jun 2008 17:17:30 -0000	1.1
+++ .cvsignore	5 Sep 2008 11:51:55 -0000	1.2
@@ -0,0 +1 @@
+libmusicbrainz-3.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmusicbrainz3/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jun 2008 17:17:30 -0000	1.1
+++ sources	5 Sep 2008 11:51:55 -0000	1.2
@@ -0,0 +1 @@
+d42110ae548dae1eea73e83b03a1a936  libmusicbrainz-3.0.1.tar.gz



From pkgdb at fedoraproject.org  Fri Sep  5 11:52:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 11:52:34 +0000
Subject: [pkgdb] swarp had acl change status
Message-ID: <20080905115234.2698D20876C@bastion.fedora.phx.redhat.com>

sergiopr has set the commit acl on swarp (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/swarp



From pkgdb at fedoraproject.org  Fri Sep  5 11:52:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 11:52:36 +0000
Subject: [pkgdb] swarp had acl change status
Message-ID: <20080905115236.801D020876F@bastion.fedora.phx.redhat.com>

sergiopr has set the watchcommits acl on swarp (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/swarp



From pkgdb at fedoraproject.org  Fri Sep  5 11:52:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 11:52:36 +0000
Subject: [pkgdb] swarp had acl change status
Message-ID: <20080905115236.933C2208D07@bastion.fedora.phx.redhat.com>

sergiopr has set the approveacls acl on swarp (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/swarp



From pkgdb at fedoraproject.org  Fri Sep  5 11:52:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 11:52:36 +0000
Subject: [pkgdb] swarp had acl change status
Message-ID: <20080905115238.BCE27208D1E@bastion.fedora.phx.redhat.com>

sergiopr has set the watchbugzilla acl on swarp (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/swarp



From caolanm at fedoraproject.org  Fri Sep  5 11:57:55 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  5 Sep 2008 11:57:55 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch, NONE,
	1.1 openoffice.org.spec, 1.1638,
	1.1639 openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch, 1.2, NONE
Message-ID: <20080905115755.54F6270121@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23727

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch 
Removed Files:
	openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch 
Log Message:
fix the annoying float behaviour as well

openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch:

--- NEW FILE openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch ---
Index: unx/gtk/window/gtkframe.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
retrieving revision 1.72.8.2
diff -u -r1.72.8.2 gtkframe.cxx
--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx	23 Jan 2008 17:17:10 -0000	1.72.8.2
+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx	4 Sep 2008 17:21:25 -0000
@@ -745,6 +745,9 @@
     m_aForeignTopLevelWindow = None;
     m_nStyle = nStyle;
 
+    GtkWindowType eWinType = ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION))
+        ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL;
+
     if( nStyle & SAL_FRAME_STYLE_SYSTEMCHILD )
     {
         m_pWindow = gtk_event_box_new();
@@ -757,7 +760,7 @@
         }
     }
     else
-        m_pWindow = gtk_widget_new( GTK_TYPE_WINDOW, "type", ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL, "visible", FALSE, NULL );
+        m_pWindow = gtk_widget_new( GTK_TYPE_WINDOW, "type", eWinType, "visible", FALSE, NULL );
 	g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", this );
 
     // force wm class hint
@@ -806,7 +809,8 @@
             gtk_window_set_decorated( GTK_WINDOW(m_pWindow), FALSE );
         gtk_window_set_gravity( GTK_WINDOW(m_pWindow), GDK_GRAVITY_STATIC );
         if( m_pParent && ! (m_pParent->m_nStyle & SAL_FRAME_STYLE_PLUG) )
-            gtk_window_set_transient_for( GTK_WINDOW(m_pWindow), GTK_WINDOW(m_pParent->m_pWindow) );
+            if ((eType != GDK_WINDOW_TYPE_HINT_UTILITY) && (eType != GDK_WINDOW_TYPE_HINT_TOOLBAR))
+                gtk_window_set_transient_for( GTK_WINDOW(m_pWindow), GTK_WINDOW(m_pParent->m_pWindow) );
     }
     else if( (nStyle & SAL_FRAME_STYLE_FLOAT) )
     {
@@ -817,6 +821,9 @@
 
     InitCommon();
 
+    if (eWinType == GTK_WINDOW_TOPLEVEL)
+        gdk_x11_window_set_user_time(GTK_WIDGET(m_pWindow)->window, gdk_x11_get_server_time (GTK_WIDGET (m_pWindow)->window));
+
     if( bDecoHandling )
     {
         gtk_window_set_resizable( GTK_WINDOW(m_pWindow), (nStyle & SAL_FRAME_STYLE_SIZEABLE) ? TRUE : FALSE );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1638
retrieving revision 1.1639
diff -u -r1.1638 -r1.1639
--- openoffice.org.spec	4 Sep 2008 17:27:15 -0000	1.1638
+++ openoffice.org.spec	5 Sep 2008 11:57:24 -0000	1.1639
@@ -112,7 +112,7 @@
 Patch42: openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch
 Patch43: openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
 Patch44: openoffice.org-3.0.0.oooXXXXX.filter.latex.patch
-Patch45: openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch
+Patch45: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1296,7 +1296,7 @@
 %patch42 -p1 -b .ooo93366.fpicker_in_main.patch
 %patch43 -p1 -b .ooo93419.svx.ref_deref.before.ctored.patch
 %patch44 -p1 -b .oooXXXXX.filter.latex.patch
-%patch45 -p1 -b .oooXXXXX.vcl.jrb-frames.patch
+%patch45 -p1 -b .ooo93515.vcl.jrb-frames.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3658,7 +3658,7 @@
 - defuzz patches
 - add openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch
 - add openoffice.org-3.0.0.oooXXXXX.filter.latex.patch
-- add openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch to get better
+- add openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch to get better
   focus for new frames when already running and behind in stacking order
 
 * Fri Aug 29 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-4.1


--- openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch DELETED ---



From till at fedoraproject.org  Fri Sep  5 11:59:30 2008
From: till at fedoraproject.org (Till Maas)
Date: Fri,  5 Sep 2008 11:59:30 +0000 (UTC)
Subject: rpms/libHX/F-9 .cvsignore, 1.3, 1.4 libHX.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <20080905115930.491C970121@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/libHX/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24053

Modified Files:
	.cvsignore libHX.spec sources 
Log Message:
* Fri Sep 05 2008 Till Maas <opensource at till.name> - 1.23-1
- Update to latest version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Dec 2007 11:57:36 -0000	1.3
+++ .cvsignore	5 Sep 2008 11:59:00 -0000	1.4
@@ -1 +1 @@
-libHX-1.10.2.tar.bz2
+libHX-1.23.tar.bz2


Index: libHX.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/F-9/libHX.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libHX.spec	11 Jun 2008 20:56:24 -0000	1.4
+++ libHX.spec	5 Sep 2008 11:59:00 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           libHX
-Version:        1.18
+Version:        1.23
 Release:        1%{?dist}
 Summary:        General-purpose library for typical low-level operations
 
 Group:          System Environment/Libraries
 License:        LGPLv2 or LGPLv3
-URL:            http://jengelh.hopto.org/f/libHX/
-Source0:        http://jengelh.hopto.org/f/libHX/libHX-%{version}.tar.bz2
+URL:            http://jengelh.hopto.org/files/libHX/
+Source0:        http://jengelh.hopto.org/files/libHX/libHX-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl gcc-c++
@@ -43,14 +43,13 @@
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=verbose
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT V=verbose
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
@@ -78,6 +77,12 @@
 
 
 %changelog
+* Fri Sep 05 2008 Till Maas <opensource at till.name> - 1.23-1
+- Update to latest version
+
+* Wed Jun 11 2008 Till Maas <opensource till name> - 1.18-2
+- Set variable V for make: displays full compiler commandline
+
 * Wed Jun 11 2008 Till Maas <opensource till name> - 1.18-1
 - Update to latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Jun 2008 20:56:24 -0000	1.4
+++ sources	5 Sep 2008 11:59:00 -0000	1.5
@@ -1 +1 @@
-9625203a52d12734f15364a48f461599  libHX-1.18.tar.bz2
+a14dcb5f8c89ec6ba754b4d1e61612b4  libHX-1.23.tar.bz2



From till at fedoraproject.org  Fri Sep  5 12:16:18 2008
From: till at fedoraproject.org (Till Maas)
Date: Fri,  5 Sep 2008 12:16:18 +0000 (UTC)
Subject: rpms/libHX/F-8 .cvsignore, 1.2, 1.3 libHX.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20080905121618.CDEA670125@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/libHX/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26245

Modified Files:
	.cvsignore libHX.spec sources 
Log Message:
* Fri Sep 05 2008 Till Maas <opensource at till.name> - 1.23-1
- Update to latest version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Sep 2007 16:35:21 -0000	1.2
+++ .cvsignore	5 Sep 2008 12:15:48 -0000	1.3
@@ -1 +1 @@
-libHX-1.10.1.tar.bz2
+libHX-1.23.tar.bz2


Index: libHX.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/F-8/libHX.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libHX.spec	27 Sep 2007 16:35:21 -0000	1.1
+++ libHX.spec	5 Sep 2008 12:15:48 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           libHX
-Version:        1.10.1
-Release:        2%{?dist}
-Summary:        General-purpose library
+Version:        1.23
+Release:        1%{?dist}
+Summary:        General-purpose library for typical low-level operations
 
 Group:          System Environment/Libraries
 License:        LGPLv2 or LGPLv3
-URL:            http://jengelh.hopto.org/f/libHX/
-Source0:        http://jengelh.hopto.org/f/libHX/libHX-%{version}.tar.bz2
+URL:            http://jengelh.hopto.org/files/libHX/
+Source0:        http://jengelh.hopto.org/files/libHX/libHX-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl gcc-c++
@@ -14,13 +14,13 @@
 
 %description
 A library for:
-- A+R/B trees to use for lists or maps (associative arrays)
-- Deques (double-ended queues) (Stacks (LIFO) / Queues (FIFOs))
+- rbtree with key-value pair extension
+- deques (double-ended queues) (Stacks (LIFO) / Queues (FIFOs))
 - platform independent opendir-style directory access
 - platform independent dlopen-style shared library access
 - auto-storage strings with direct access
 - command line option (argv) parser
-- shell-style config file parser
+- shconfig-style config file parser
 - platform independent random number generator with transparent
   /dev/urandom support
 - various string, memory and zvec ops
@@ -39,17 +39,17 @@
 
 %prep
 %setup -q
-cp -a t examples
 
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
-rm examples/Makefile*
+make %{?_smp_mflags} V=verbose
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+
+make install DESTDIR=$RPM_BUILD_ROOT V=verbose
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
@@ -70,13 +70,36 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/* examples
+%doc doc/* README.txt
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libHX.pc
 
 
 %changelog
+* Fri Sep 05 2008 Till Maas <opensource at till.name> - 1.23-1
+- Update to latest version
+
+* Wed Jun 11 2008 Till Maas <opensource till name> - 1.18-2
+- Set variable V for make: displays full compiler commandline
+
+* Wed Jun 11 2008 Till Maas <opensource till name> - 1.18-1
+- Update to latest version
+
+* Tue May 27 2008 Till Maas <opensource till name> - 1.17-1
+- Update to latest version
+
+* Mon May 05 2008 Till Maas <opensource till name> - 1.15-1
+- Update to latest version
+- Update description
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.10.2-2
+- Autorebuild for GCC 4.3
+
+* Wed Dec 26 2007 Till Maas <opensource till name> - 1.10.2-1
+- update to latest version
+- fixed bug: https://sourceforge.net/tracker/?func=detail&atid=430593&aid=1845721&group_id=41452
+
 * Thu Sep 27 2007 Till Maas <opensource till name> - 1.10.1-2
 - add tests as examples to devel documentation
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Sep 2007 16:35:21 -0000	1.2
+++ sources	5 Sep 2008 12:15:48 -0000	1.3
@@ -1 +1 @@
-ae2c7ac182a03e589fd45a7867177a0a  libHX-1.10.1.tar.bz2
+a14dcb5f8c89ec6ba754b4d1e61612b4  libHX-1.23.tar.bz2



From jcollie at fedoraproject.org  Fri Sep  5 12:42:58 2008
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri,  5 Sep 2008 12:42:58 +0000 (UTC)
Subject: rpms/python-lxml/devel .cvsignore, 1.17, 1.18 python-lxml.spec, 1.23,
	1.24 sources, 1.17, 1.18
Message-ID: <20080905124258.BF06670121@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/python-lxml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29504

Modified Files:
	.cvsignore python-lxml.spec sources 
Log Message:
* Fri Sep  5 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.1.2-1
- 2.1.2 (2008-09-05)
- Features added
- 
-    * lxml.etree now tries to find the absolute path name of files when
-      parsing from a file-like object. This helps custom resolvers when
-      resolving relative URLs, as lixbml2 can prepend them with the path of
-      the source document.
- 
- Bugs fixed
- 
-    * Memory problem when passing documents between threads.
-    * Target parser did not honour the recover option and raised an exception
-      instead of calling .close() on the target.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	25 Jul 2008 14:52:19 -0000	1.17
+++ .cvsignore	5 Sep 2008 12:42:28 -0000	1.18
@@ -1 +1 @@
-lxml-2.1.1.tar.gz
+lxml-2.1.2.tar.gz


Index: python-lxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/devel/python-lxml.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- python-lxml.spec	25 Jul 2008 14:52:19 -0000	1.23
+++ python-lxml.spec	5 Sep 2008 12:42:28 -0000	1.24
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-lxml
-Version:        2.1.1
+Version:        2.1.2
 Release:        1%{?dist}
 Summary:        ElementTree-like Python bindings for libxml2 and libxslt
 
@@ -49,6 +49,21 @@
 %{python_sitearch}/*
 
 %changelog
+* Fri Sep  5 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.1.2-1
+- 2.1.2 (2008-09-05)
+- Features added
+- 
+-    * lxml.etree now tries to find the absolute path name of files when
+-      parsing from a file-like object. This helps custom resolvers when
+-      resolving relative URLs, as lixbml2 can prepend them with the path of
+-      the source document.
+- 
+- Bugs fixed
+- 
+-    * Memory problem when passing documents between threads.
+-    * Target parser did not honour the recover option and raised an exception
+-      instead of calling .close() on the target.
+
 * Fri Jul 25 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.1.1-1
 - Update to 2.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	25 Jul 2008 14:52:19 -0000	1.17
+++ sources	5 Sep 2008 12:42:28 -0000	1.18
@@ -1 +1 @@
-f6fd6f45e3034de29ec1411549bc529d  lxml-2.1.1.tar.gz
+d957423bbd56de25ef636671e7245069  lxml-2.1.2.tar.gz



From bonii at fedoraproject.org  Fri Sep  5 12:46:54 2008
From: bonii at fedoraproject.org (Vivek Shah)
Date: Fri,  5 Sep 2008 12:46:54 +0000 (UTC)
Subject: rpms/samefile/devel import.log, NONE, 1.1 samefile.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080905124654.83ECE70123@cvs1.fedora.phx.redhat.com>

Author: bonii

Update of /cvs/pkgs/rpms/samefile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30191/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log samefile.spec 
Log Message:

Initial import into CVS



--- NEW FILE import.log ---
samefile-2_12-3_fc8:HEAD:samefile-2.12-3.fc8.src.rpm:1220638747


--- NEW FILE samefile.spec ---
Name:		samefile
Version:	2.12
Release:	3%{?dist}
Summary:	An utility to find identical files on the file system

Group:		Applications/System
License:	BSD
URL:		http://schweikhardt.net/samefile/
Source0:	http://www.schweikhardt.net/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
The samefile utility finds files with identical contents, independent of file 
name. This program is for you if you are notoriously low on disk space, keep 
exceeding your disk quota, pay for your storage by the megabyte, run any kind 
of file server, need to reduce the size of your backups, or just want to get 
a feeling for how much redundant files are there on your system.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}

%check
make test

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README ChangeLog
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz


%changelog
* Fri Sep 5 2008 Vivek Shah <boni.vivek at gmail.com> 2.12-3
- Fixed SOURCE0 URL

* Mon Aug 25 2008 Vivek Shah <boni.vivek at gmail.com> 2.12-2
- Added self check and ChangeLog file

* Thu Aug 21 2008 Vivek Shah <boni.vivek at gmail.com> 2.12-1
- Initial Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samefile/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:23:17 -0000	1.1
+++ .cvsignore	5 Sep 2008 12:46:24 -0000	1.2
@@ -0,0 +1 @@
+samefile-2.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samefile/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:23:17 -0000	1.1
+++ sources	5 Sep 2008 12:46:24 -0000	1.2
@@ -0,0 +1 @@
+5e51411512f693897f9cfd59c45071f7  samefile-2.12.tar.gz



From twaugh at fedoraproject.org  Fri Sep  5 12:48:57 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  5 Sep 2008 12:48:57 +0000 (UTC)
Subject: rpms/foomatic/F-9 .cvsignore, 1.59,
	1.60 foomatic-2.0.2-fontpath.patch, 
	1.3, 1.4 foomatic-filters-libdir.patch, 1.5, 1.6 foomatic.spec,
	1.189, 1.190 sources, 1.61, 1.62 foomatic-459847.patch, 1.1,
	NONE foomatic-ampathxml.patch, 1.1, NONE foomatic-busyloop.patch,
	1.1, NONE foomatic-clean-up-on-cancel.patch, 1.1,
	NONE foomatic-db-engine-xml-cflags.patch, 1.1,
	NONE foomatic-hpclj9500mfp.patch, 1.1,
	NONE foomatic-ieee1284.patch, 1.1,
	NONE foomatic-ppdload-ppd.patch, 1.1,
	NONE foomatic-ppdload.patch, 1.2, NONE foomatic-ppdopts, 1.1, NONE
Message-ID: <20080905124857.ED01A70121@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30921

Modified Files:
	.cvsignore foomatic-2.0.2-fontpath.patch 
	foomatic-filters-libdir.patch foomatic.spec sources 
Removed Files:
	foomatic-459847.patch foomatic-ampathxml.patch 
	foomatic-busyloop.patch foomatic-clean-up-on-cancel.patch 
	foomatic-db-engine-xml-cflags.patch 
	foomatic-hpclj9500mfp.patch foomatic-ieee1284.patch 
	foomatic-ppdload-ppd.patch foomatic-ppdload.patch 
	foomatic-ppdopts 
Log Message:
Sync to rawhide package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-9/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	13 Feb 2008 11:53:16 -0000	1.59
+++ .cvsignore	5 Sep 2008 12:48:27 -0000	1.60
@@ -53,3 +53,7 @@
 foomatic-db-engine-3.0-20080211.tar.gz
 foomatic-db-hpijs-20080211.tar.gz
 foomatic-filters-3.0-20080211.tar.gz
+foomatic-db-engine-3.0-20080904.tar.gz
+foomatic-filters-3.0-20080904.tar.gz
+foomatic-db-3.0-20080904.tar.gz
+foomatic-db-hpijs-20080904.tar.gz

foomatic-2.0.2-fontpath.patch:

Index: foomatic-2.0.2-fontpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-9/foomatic-2.0.2-fontpath.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- foomatic-2.0.2-fontpath.patch	14 Jun 2007 09:35:27 -0000	1.3
+++ foomatic-2.0.2-fontpath.patch	5 Sep 2008 12:48:27 -0000	1.4
@@ -1,10 +1,11 @@
---- foomatic-filters-3.0-20070614/foomatic-gswrapper.in.fontpath	2007-06-14 08:20:15.000000000 +0100
-+++ foomatic-filters-3.0-20070614/foomatic-gswrapper.in	2007-06-14 10:33:10.000000000 +0100
-@@ -24,6 +24,7 @@
+diff -up foomatic-filters-3.0-20080710/foomatic-gswrapper.in.fontpath foomatic-filters-3.0-20080710/foomatic-gswrapper.in
+--- foomatic-filters-3.0-20080710/foomatic-gswrapper.in.fontpath	2008-07-10 08:20:17.000000000 +0100
++++ foomatic-filters-3.0-20080710/foomatic-gswrapper.in	2008-09-02 13:14:12.000000000 +0100
+@@ -24,6 +24,7 @@ my $execpath = "@EXECPATH@";
  # Get execution path from config file
  $execpath = $conf{execpath} if defined(%conf) and defined $conf{execpath};
  $ENV{'PATH'} = $execpath;
 +$ENV{'GS_FONTPATH'} = '/usr/share/fonts';
  
- # Check whether we have a GhostScript version with redirection of the
+ # Check whether we have a Ghostscript version with redirection of the
  # standard output of the PostScript programs via '-sstdout=%stderr'

foomatic-filters-libdir.patch:

Index: foomatic-filters-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-9/foomatic-filters-libdir.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- foomatic-filters-libdir.patch	14 Jun 2007 09:35:27 -0000	1.5
+++ foomatic-filters-libdir.patch	5 Sep 2008 12:48:27 -0000	1.6
@@ -1,6 +1,7 @@
---- foomatic-filters-3.0-20070614/configure.ac.libdir	2007-06-14 08:20:15.000000000 +0100
-+++ foomatic-filters-3.0-20070614/configure.ac	2007-06-14 10:30:50.000000000 +0100
-@@ -13,7 +13,7 @@
+diff -up foomatic-filters-3.0-20080710/configure.ac.libdir foomatic-filters-3.0-20080710/configure.ac
+--- foomatic-filters-3.0-20080710/configure.ac.libdir	2008-07-10 08:20:16.000000000 +0100
++++ foomatic-filters-3.0-20080710/configure.ac	2008-09-02 13:13:36.000000000 +0100
+@@ -13,7 +13,7 @@ AC_PROG_LN_S
  AC_PROG_MAKE_SET
  
  ETCSEARCHPATH=${prefix}/etc:/usr/etc:/usr/local/etc
@@ -9,7 +10,7 @@
  
  dnl Get the operating system and version number...
  uname=`uname`
-@@ -47,13 +47,13 @@
+@@ -47,13 +47,13 @@ dnl Check for /usr/lib/cups/backend
  AC_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$LIBSEARCHPATH)
  
  dnl Check for /usr/lib/ppr


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-9/foomatic.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- foomatic.spec	2 Sep 2008 16:04:00 -0000	1.189
+++ foomatic.spec	5 Sep 2008 12:48:27 -0000	1.190
@@ -1,12 +1,12 @@
-%define dbver 20080211
-%define enginever 3.0-20080211
-%define filtersver 20080211
-%define hpijsver 20080211
+%define dbver 20080904
+%define enginever 3.0-20080904
+%define filtersver 20080904
+%define hpijsver 20080904
 
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    62%{?dist}
+Release:    65%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -14,7 +14,7 @@
 # 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.linuxprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.tar.gz
+Source0: http://www.openprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.tar.gz
 
 Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-3.0-%{filtersver}.tar.gz
 Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-3.0-%{dbver}.tar.gz
@@ -27,29 +27,11 @@
 # Set GS_FONTPATH in gs wrapper (bug #81410).
 Patch5: foomatic-2.0.2-fontpath.patch
 
-# Reinstate ppdload long enough for me to work around its disappearance.
-Patch6: foomatic-ppdload.patch
-Patch7: foomatic-ppdload-ppd.patch
-
-# Fix 3.0.2 build.
-Patch10: foomatic-db-engine-xml-cflags.patch
-
-# Make foomatic-db-engine build.
-Patch14: foomatic-ampathxml.patch
-
 # Handle non-UTF-8 encodings in imported PPD files.
 Patch15: foomatic-bad-utf8.patch
 
-# Missing IEEE 1284 IDs.
-Patch16: foomatic-ieee1284.patch
-
-Patch17: foomatic-clean-up-on-cancel.patch
 Patch18: foomatic-sigpipe.patch
 
-Patch19: foomatic-459847.patch
-Patch20: foomatic-busyloop.patch
-Patch21: foomatic-hpclj9500mfp.patch
-
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -93,7 +75,6 @@
 pushd foomatic-filters-3.0-%{filtersver}
 %patch1 -p1 -b .libdir
 %patch5 -p1 -b .fontpath
-%patch17 -p1 -b .clean-up-on-cancel
 %patch18 -p1 -b .sigpipe
 ./make_configure
 popd
@@ -101,11 +82,7 @@
 pushd foomatic-db-engine-%{enginever}
 chmod a+x mkinstalldirs
 %patch2 -p1 -b .libdir
-%patch6 -p1 -b .ppdload
-%patch14 -p1 -b .ampathxml
-%patch10 -p1 -b .xml-cflags
 %patch15 -p1
-%patch20 -p1 -b .busyloop
 ./make_configure
 popd
 
@@ -113,11 +90,6 @@
 popd
 
 pushd foomatic-db-%{dbver}
-%patch7 -p1 -b .ppdload-ppd
-
-%patch16 -p1 -b .ieee1284
-%patch19 -p1 -b .459847
-%patch21 -p1 -b .hpclj9500mfp
 
 cd db/source
 
@@ -228,6 +200,8 @@
 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
+
 # Remove things we don't ship.
 rm -rf	$RPM_BUILD_ROOT%{_libdir}/perl5/site_perl \
 	$RPM_BUILD_ROOT%{_libdir}/ppr \
@@ -246,6 +220,7 @@
 %doc --parents */README */USAGE */ChangeLog
 %dir %{_sysconfdir}/foomatic
 %config(noreplace) %{_sysconfdir}/foomatic/filter.conf
+%config(noreplace) %{_sysconfdir}/foomatic/defaultspooler
 %{_bindir}/*
 %{_sbindir}/*
 %{_prefix}/lib*/perl5/vendor_perl/*/Foomatic
@@ -257,16 +232,38 @@
 %{_var}/cache/foomatic
 
 %changelog
-* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-62
+* Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-65
+- Removed ampathxml and xml-cflags patches.
+- Updated db-hpijs to 20080904.
+- Updated db to 20080904.
+- Updated filters to 3.0-20080904.
+- Updated db-engine to 3.0-20080904.
+
+* Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com>
+- Finally remove ppdload.
+
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-64
 - Fixed typo in HP-Color_LaserJet_9500_MFP.xml.
 
-* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-61
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-63
 - Avoid busy-looping when trying to shorten long PPD nicknames.
 
-* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-60
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-62
+- Removed patch fuzz.
 - Fixed PPD generation for HP LaserJet 4345 MFP (bug #459847).
 
-* Thu May  8 2008 Tim Waugh <twaugh at redhat.com>
+* Thu Jul 10 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-61
+- Updated db-hpijs to 20080710.
+- Updated db to 20080710.
+- Updated filters to 3.0-20080710.
+- Updated db-engine to 3.0-20080710.
+- Ship a defaultspooler file to avoid the need for spooler
+  auto-detection (bug #454684).
+
+* Thu May  8 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-60
+- Updated filters to 3.0-20080507.
+
+* Wed May  7 2008 Tim Waugh <twaugh at redhat.com>
 - Avoid busy-looping when the CUPS backend stops (bug #445555).
 
 * Tue Apr  1 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-59


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-9/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	13 Feb 2008 11:53:16 -0000	1.61
+++ sources	5 Sep 2008 12:48:27 -0000	1.62
@@ -1,4 +1,4 @@
-5d827cd3d95807c28609d49a5c412c29  foomatic-db-3.0-20080211.tar.gz
-ba8b08913589568f85548998f6321f95  foomatic-db-engine-3.0-20080211.tar.gz
-58bef426f769219592b6b0c81357a04a  foomatic-db-hpijs-20080211.tar.gz
-97b517e94ac85534cdc84a446a872bc2  foomatic-filters-3.0-20080211.tar.gz
+d46d1a26a8199c8c5c618ad2cd17a68a  foomatic-db-engine-3.0-20080904.tar.gz
+ce3332981735ce5b50932640a6107220  foomatic-filters-3.0-20080904.tar.gz
+758ac14a7068a3c2016608d35c8994c7  foomatic-db-3.0-20080904.tar.gz
+a46f919c711547181d651509d771967e  foomatic-db-hpijs-20080904.tar.gz


--- foomatic-459847.patch DELETED ---


--- foomatic-ampathxml.patch DELETED ---


--- foomatic-busyloop.patch DELETED ---


--- foomatic-clean-up-on-cancel.patch DELETED ---


--- foomatic-db-engine-xml-cflags.patch DELETED ---


--- foomatic-hpclj9500mfp.patch DELETED ---


--- foomatic-ieee1284.patch DELETED ---


--- foomatic-ppdload-ppd.patch DELETED ---


--- foomatic-ppdload.patch DELETED ---


--- foomatic-ppdopts DELETED ---



From bonii at fedoraproject.org  Fri Sep  5 12:49:56 2008
From: bonii at fedoraproject.org (Vivek Shah)
Date: Fri,  5 Sep 2008 12:49:56 +0000 (UTC)
Subject: rpms/samefile/F-8 import.log, NONE, 1.1 samefile.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080905124956.E3F2770121@cvs1.fedora.phx.redhat.com>

Author: bonii

Update of /cvs/pkgs/rpms/samefile/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31029/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log samefile.spec 
Log Message:

Initial import into CVS



--- NEW FILE import.log ---
samefile-2_12-3_fc8:F-8:samefile-2.12-3.fc8.src.rpm:1220638920


--- NEW FILE samefile.spec ---
Name:		samefile
Version:	2.12
Release:	3%{?dist}
Summary:	An utility to find identical files on the file system

Group:		Applications/System
License:	BSD
URL:		http://schweikhardt.net/samefile/
Source0:	http://www.schweikhardt.net/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
The samefile utility finds files with identical contents, independent of file 
name. This program is for you if you are notoriously low on disk space, keep 
exceeding your disk quota, pay for your storage by the megabyte, run any kind 
of file server, need to reduce the size of your backups, or just want to get 
a feeling for how much redundant files are there on your system.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}

%check
make test

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README ChangeLog
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz


%changelog
* Fri Sep 5 2008 Vivek Shah <boni.vivek at gmail.com> 2.12-3
- Fixed SOURCE0 URL

* Mon Aug 25 2008 Vivek Shah <boni.vivek at gmail.com> 2.12-2
- Added self check and ChangeLog file

* Thu Aug 21 2008 Vivek Shah <boni.vivek at gmail.com> 2.12-1
- Initial Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samefile/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:23:17 -0000	1.1
+++ .cvsignore	5 Sep 2008 12:49:26 -0000	1.2
@@ -0,0 +1 @@
+samefile-2.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samefile/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:23:17 -0000	1.1
+++ sources	5 Sep 2008 12:49:26 -0000	1.2
@@ -0,0 +1 @@
+5e51411512f693897f9cfd59c45071f7  samefile-2.12.tar.gz



From twaugh at fedoraproject.org  Fri Sep  5 12:51:33 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  5 Sep 2008 12:51:33 +0000 (UTC)
Subject: rpms/foomatic/F-8 .cvsignore, 1.53,
	1.54 foomatic-2.0.2-fontpath.patch, 
	1.3, 1.4 foomatic-filters-libdir.patch, 1.5, 1.6 foomatic.spec,
	1.178, 1.179 sources, 1.56, 1.57 foomatic-459847.patch, 1.1,
	NONE foomatic-ampathxml.patch, 1.1, NONE foomatic-busyloop.patch,
	1.1, NONE foomatic-clean-up-on-cancel.patch, 1.1,
	NONE foomatic-db-engine-xml-cflags.patch, 1.1,
	NONE foomatic-hpclj9500mfp.patch, 1.1,
	NONE foomatic-ieee1284.patch, 1.1,
	NONE foomatic-ppdload-ppd.patch, 1.1,
	NONE foomatic-ppdload.patch, 1.2, NONE foomatic-ppdopts, 1.1, NONE
Message-ID: <20080905125133.5A5C270121@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31554

Modified Files:
	.cvsignore foomatic-2.0.2-fontpath.patch 
	foomatic-filters-libdir.patch foomatic.spec sources 
Removed Files:
	foomatic-459847.patch foomatic-ampathxml.patch 
	foomatic-busyloop.patch foomatic-clean-up-on-cancel.patch 
	foomatic-db-engine-xml-cflags.patch 
	foomatic-hpclj9500mfp.patch foomatic-ieee1284.patch 
	foomatic-ppdload-ppd.patch foomatic-ppdload.patch 
	foomatic-ppdopts 
Log Message:
Sync to rawhide package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-8/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	9 Jan 2008 17:55:37 -0000	1.53
+++ .cvsignore	5 Sep 2008 12:51:02 -0000	1.54
@@ -49,3 +49,7 @@
 foomatic-db-engine-3.0-20071218.tar.gz
 foomatic-db-3.0-20071218.tar.gz
 foomatic-db-hpijs-20071218.tar.gz
+foomatic-db-engine-3.0-20080904.tar.gz
+foomatic-filters-3.0-20080904.tar.gz
+foomatic-db-3.0-20080904.tar.gz
+foomatic-db-hpijs-20080904.tar.gz

foomatic-2.0.2-fontpath.patch:

Index: foomatic-2.0.2-fontpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-8/foomatic-2.0.2-fontpath.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- foomatic-2.0.2-fontpath.patch	14 Jun 2007 09:35:27 -0000	1.3
+++ foomatic-2.0.2-fontpath.patch	5 Sep 2008 12:51:02 -0000	1.4
@@ -1,10 +1,11 @@
---- foomatic-filters-3.0-20070614/foomatic-gswrapper.in.fontpath	2007-06-14 08:20:15.000000000 +0100
-+++ foomatic-filters-3.0-20070614/foomatic-gswrapper.in	2007-06-14 10:33:10.000000000 +0100
-@@ -24,6 +24,7 @@
+diff -up foomatic-filters-3.0-20080710/foomatic-gswrapper.in.fontpath foomatic-filters-3.0-20080710/foomatic-gswrapper.in
+--- foomatic-filters-3.0-20080710/foomatic-gswrapper.in.fontpath	2008-07-10 08:20:17.000000000 +0100
++++ foomatic-filters-3.0-20080710/foomatic-gswrapper.in	2008-09-02 13:14:12.000000000 +0100
+@@ -24,6 +24,7 @@ my $execpath = "@EXECPATH@";
  # Get execution path from config file
  $execpath = $conf{execpath} if defined(%conf) and defined $conf{execpath};
  $ENV{'PATH'} = $execpath;
 +$ENV{'GS_FONTPATH'} = '/usr/share/fonts';
  
- # Check whether we have a GhostScript version with redirection of the
+ # Check whether we have a Ghostscript version with redirection of the
  # standard output of the PostScript programs via '-sstdout=%stderr'

foomatic-filters-libdir.patch:

Index: foomatic-filters-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-8/foomatic-filters-libdir.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- foomatic-filters-libdir.patch	14 Jun 2007 09:35:27 -0000	1.5
+++ foomatic-filters-libdir.patch	5 Sep 2008 12:51:03 -0000	1.6
@@ -1,6 +1,7 @@
---- foomatic-filters-3.0-20070614/configure.ac.libdir	2007-06-14 08:20:15.000000000 +0100
-+++ foomatic-filters-3.0-20070614/configure.ac	2007-06-14 10:30:50.000000000 +0100
-@@ -13,7 +13,7 @@
+diff -up foomatic-filters-3.0-20080710/configure.ac.libdir foomatic-filters-3.0-20080710/configure.ac
+--- foomatic-filters-3.0-20080710/configure.ac.libdir	2008-07-10 08:20:16.000000000 +0100
++++ foomatic-filters-3.0-20080710/configure.ac	2008-09-02 13:13:36.000000000 +0100
+@@ -13,7 +13,7 @@ AC_PROG_LN_S
  AC_PROG_MAKE_SET
  
  ETCSEARCHPATH=${prefix}/etc:/usr/etc:/usr/local/etc
@@ -9,7 +10,7 @@
  
  dnl Get the operating system and version number...
  uname=`uname`
-@@ -47,13 +47,13 @@
+@@ -47,13 +47,13 @@ dnl Check for /usr/lib/cups/backend
  AC_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$LIBSEARCHPATH)
  
  dnl Check for /usr/lib/ppr


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-8/foomatic.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- foomatic.spec	2 Sep 2008 16:03:49 -0000	1.178
+++ foomatic.spec	5 Sep 2008 12:51:03 -0000	1.179
@@ -1,12 +1,12 @@
-%define dbver 20080211
-%define enginever 3.0-20080211
-%define filtersver 20080211
-%define hpijsver 20080211
+%define dbver 20080904
+%define enginever 3.0-20080904
+%define filtersver 20080904
+%define hpijsver 20080904
 
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    62%{?dist}
+Release:    65%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -14,7 +14,7 @@
 # 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.linuxprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.tar.gz
+Source0: http://www.openprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.tar.gz
 
 Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-3.0-%{filtersver}.tar.gz
 Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-3.0-%{dbver}.tar.gz
@@ -27,29 +27,11 @@
 # Set GS_FONTPATH in gs wrapper (bug #81410).
 Patch5: foomatic-2.0.2-fontpath.patch
 
-# Reinstate ppdload long enough for me to work around its disappearance.
-Patch6: foomatic-ppdload.patch
-Patch7: foomatic-ppdload-ppd.patch
-
-# Fix 3.0.2 build.
-Patch10: foomatic-db-engine-xml-cflags.patch
-
-# Make foomatic-db-engine build.
-Patch14: foomatic-ampathxml.patch
-
 # Handle non-UTF-8 encodings in imported PPD files.
 Patch15: foomatic-bad-utf8.patch
 
-# Missing IEEE 1284 IDs.
-Patch16: foomatic-ieee1284.patch
-
-Patch17: foomatic-clean-up-on-cancel.patch
 Patch18: foomatic-sigpipe.patch
 
-Patch19: foomatic-459847.patch
-Patch20: foomatic-busyloop.patch
-Patch21: foomatic-hpclj9500mfp.patch
-
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -93,7 +75,6 @@
 pushd foomatic-filters-3.0-%{filtersver}
 %patch1 -p1 -b .libdir
 %patch5 -p1 -b .fontpath
-%patch17 -p1 -b .clean-up-on-cancel
 %patch18 -p1 -b .sigpipe
 ./make_configure
 popd
@@ -101,11 +82,7 @@
 pushd foomatic-db-engine-%{enginever}
 chmod a+x mkinstalldirs
 %patch2 -p1 -b .libdir
-%patch6 -p1 -b .ppdload
-%patch14 -p1 -b .ampathxml
-%patch10 -p1 -b .xml-cflags
 %patch15 -p1
-%patch20 -p1 -b .busyloop
 ./make_configure
 popd
 
@@ -113,11 +90,6 @@
 popd
 
 pushd foomatic-db-%{dbver}
-%patch7 -p1 -b .ppdload-ppd
-
-%patch16 -p1 -b .ieee1284
-%patch19 -p1 -b .459847
-%patch21 -p1 -b .hpclj9500mfp
 
 cd db/source
 
@@ -228,6 +200,8 @@
 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
+
 # Remove things we don't ship.
 rm -rf	$RPM_BUILD_ROOT%{_libdir}/perl5/site_perl \
 	$RPM_BUILD_ROOT%{_libdir}/ppr \
@@ -246,6 +220,7 @@
 %doc --parents */README */USAGE */ChangeLog
 %dir %{_sysconfdir}/foomatic
 %config(noreplace) %{_sysconfdir}/foomatic/filter.conf
+%config(noreplace) %{_sysconfdir}/foomatic/defaultspooler
 %{_bindir}/*
 %{_sbindir}/*
 %{_prefix}/lib*/perl5/vendor_perl/*/Foomatic
@@ -257,16 +232,38 @@
 %{_var}/cache/foomatic
 
 %changelog
-* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-62
+* Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-65
+- Removed ampathxml and xml-cflags patches.
+- Updated db-hpijs to 20080904.
+- Updated db to 20080904.
+- Updated filters to 3.0-20080904.
+- Updated db-engine to 3.0-20080904.
+
+* Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com>
+- Finally remove ppdload.
+
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-64
 - Fixed typo in HP-Color_LaserJet_9500_MFP.xml.
 
-* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-61
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-63
 - Avoid busy-looping when trying to shorten long PPD nicknames.
 
-* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-60
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-62
+- Removed patch fuzz.
 - Fixed PPD generation for HP LaserJet 4345 MFP (bug #459847).
 
-* Thu May  8 2008 Tim Waugh <twaugh at redhat.com>
+* Thu Jul 10 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-61
+- Updated db-hpijs to 20080710.
+- Updated db to 20080710.
+- Updated filters to 3.0-20080710.
+- Updated db-engine to 3.0-20080710.
+- Ship a defaultspooler file to avoid the need for spooler
+  auto-detection (bug #454684).
+
+* Thu May  8 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-60
+- Updated filters to 3.0-20080507.
+
+* Wed May  7 2008 Tim Waugh <twaugh at redhat.com>
 - Avoid busy-looping when the CUPS backend stops (bug #445555).
 
 * Tue Apr  1 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-59


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-8/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	1 Apr 2008 13:19:15 -0000	1.56
+++ sources	5 Sep 2008 12:51:03 -0000	1.57
@@ -1,4 +1,4 @@
-5d827cd3d95807c28609d49a5c412c29  foomatic-db-3.0-20080211.tar.gz
-ba8b08913589568f85548998f6321f95  foomatic-db-engine-3.0-20080211.tar.gz
-58bef426f769219592b6b0c81357a04a  foomatic-db-hpijs-20080211.tar.gz
-97b517e94ac85534cdc84a446a872bc2  foomatic-filters-3.0-20080211.tar.gz
+d46d1a26a8199c8c5c618ad2cd17a68a  foomatic-db-engine-3.0-20080904.tar.gz
+ce3332981735ce5b50932640a6107220  foomatic-filters-3.0-20080904.tar.gz
+758ac14a7068a3c2016608d35c8994c7  foomatic-db-3.0-20080904.tar.gz
+a46f919c711547181d651509d771967e  foomatic-db-hpijs-20080904.tar.gz


--- foomatic-459847.patch DELETED ---


--- foomatic-ampathxml.patch DELETED ---


--- foomatic-busyloop.patch DELETED ---


--- foomatic-clean-up-on-cancel.patch DELETED ---


--- foomatic-db-engine-xml-cflags.patch DELETED ---


--- foomatic-hpclj9500mfp.patch DELETED ---


--- foomatic-ieee1284.patch DELETED ---


--- foomatic-ppdload-ppd.patch DELETED ---


--- foomatic-ppdload.patch DELETED ---


--- foomatic-ppdopts DELETED ---



From jcollie at fedoraproject.org  Fri Sep  5 12:51:52 2008
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri,  5 Sep 2008 12:51:52 +0000 (UTC)
Subject: rpms/python-lxml/F-9 .cvsignore, 1.17, 1.18 python-lxml.spec, 1.23, 
	1.24 sources, 1.17, 1.18
Message-ID: <20080905125152.4A4AD70121@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/python-lxml/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31700

Modified Files:
	.cvsignore python-lxml.spec sources 
Log Message:
* Fri Sep  5 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.0.9-1
- 2.0.9 (2008-09-05)
- Bugs fixed
- 
-    * Memory problem when passing documents between threads.
-    * Target parser did not honour the recover option and raised an exception
-      instead of calling .close() on the target.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/F-9/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	25 Jul 2008 14:52:59 -0000	1.17
+++ .cvsignore	5 Sep 2008 12:51:22 -0000	1.18
@@ -1 +1 @@
-lxml-2.0.8.tar.gz
+lxml-2.0.9.tar.gz


Index: python-lxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/F-9/python-lxml.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- python-lxml.spec	25 Jul 2008 14:52:59 -0000	1.23
+++ python-lxml.spec	5 Sep 2008 12:51:22 -0000	1.24
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-lxml
-Version:        2.0.8
+Version:        2.0.9
 Release:        1%{?dist}
 Summary:        ElementTree-like Python bindings for libxml2 and libxslt
 
@@ -49,6 +49,14 @@
 %{python_sitearch}/*
 
 %changelog
+* Fri Sep  5 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.0.9-1
+- 2.0.9 (2008-09-05)
+- Bugs fixed
+- 
+-    * Memory problem when passing documents between threads.
+-    * Target parser did not honour the recover option and raised an exception
+-      instead of calling .close() on the target.
+
 * Fri Jul 25 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.0.8-1
 - Update to 2.0.8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/F-9/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	25 Jul 2008 14:52:59 -0000	1.17
+++ sources	5 Sep 2008 12:51:22 -0000	1.18
@@ -1 +1 @@
-f3e7ad6e0e4b66d596e8f301c6943b43  lxml-2.0.8.tar.gz
+cc8a7dc871d5e91d24432c9154af8664  lxml-2.0.9.tar.gz



From bonii at fedoraproject.org  Fri Sep  5 12:52:05 2008
From: bonii at fedoraproject.org (Vivek Shah)
Date: Fri,  5 Sep 2008 12:52:05 +0000 (UTC)
Subject: rpms/samefile/F-9 import.log, NONE, 1.1 samefile.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080905125205.77C4D70121@cvs1.fedora.phx.redhat.com>

Author: bonii

Update of /cvs/pkgs/rpms/samefile/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31673/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log samefile.spec 
Log Message:

Initial import into CVS



--- NEW FILE import.log ---
samefile-2_12-3_fc8:F-9:samefile-2.12-3.fc8.src.rpm:1220639096


--- NEW FILE samefile.spec ---
Name:		samefile
Version:	2.12
Release:	3%{?dist}
Summary:	An utility to find identical files on the file system

Group:		Applications/System
License:	BSD
URL:		http://schweikhardt.net/samefile/
Source0:	http://www.schweikhardt.net/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
The samefile utility finds files with identical contents, independent of file 
name. This program is for you if you are notoriously low on disk space, keep 
exceeding your disk quota, pay for your storage by the megabyte, run any kind 
of file server, need to reduce the size of your backups, or just want to get 
a feeling for how much redundant files are there on your system.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}

%check
make test

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README ChangeLog
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz


%changelog
* Fri Sep 5 2008 Vivek Shah <boni.vivek at gmail.com> 2.12-3
- Fixed SOURCE0 URL

* Mon Aug 25 2008 Vivek Shah <boni.vivek at gmail.com> 2.12-2
- Added self check and ChangeLog file

* Thu Aug 21 2008 Vivek Shah <boni.vivek at gmail.com> 2.12-1
- Initial Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samefile/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:23:17 -0000	1.1
+++ .cvsignore	5 Sep 2008 12:51:35 -0000	1.2
@@ -0,0 +1 @@
+samefile-2.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samefile/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:23:17 -0000	1.1
+++ sources	5 Sep 2008 12:51:35 -0000	1.2
@@ -0,0 +1 @@
+5e51411512f693897f9cfd59c45071f7  samefile-2.12.tar.gz



From jcollie at fedoraproject.org  Fri Sep  5 13:08:32 2008
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri,  5 Sep 2008 13:08:32 +0000 (UTC)
Subject: rpms/python-lxml/F-8 .cvsignore, 1.15, 1.16 python-lxml.spec, 1.20, 
	1.21 sources, 1.15, 1.16
Message-ID: <20080905130832.9038E70121@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/python-lxml/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1104

Modified Files:
	.cvsignore python-lxml.spec sources 
Log Message:
* Fri Sep  5 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.0.9-1
- 2.0.9 (2008-09-05)
- Bugs fixed
- 
-    * Memory problem when passing documents between threads.
-    * Target parser did not honour the recover option and raised an exception
-      instead of calling .close() on the target.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/F-8/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	25 Jul 2008 15:09:56 -0000	1.15
+++ .cvsignore	5 Sep 2008 13:08:02 -0000	1.16
@@ -1 +1 @@
-lxml-2.0.8.tar.gz
+lxml-2.0.9.tar.gz


Index: python-lxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/F-8/python-lxml.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- python-lxml.spec	25 Jul 2008 15:09:56 -0000	1.20
+++ python-lxml.spec	5 Sep 2008 13:08:02 -0000	1.21
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-lxml
-Version:        2.0.8
+Version:        2.0.9
 Release:        1%{?dist}
 Summary:        ElementTree-like Python bindings for libxml2 and libxslt
 
@@ -49,6 +49,14 @@
 %{python_sitearch}/*
 
 %changelog
+* Fri Sep  5 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.0.9-1
+- 2.0.9 (2008-09-05)
+- Bugs fixed
+- 
+-    * Memory problem when passing documents between threads.
+-    * Target parser did not honour the recover option and raised an exception
+-      instead of calling .close() on the target.
+
 * Fri Jul 25 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.0.8-1
 - Update to 2.0.8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/F-8/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	25 Jul 2008 15:09:56 -0000	1.15
+++ sources	5 Sep 2008 13:08:02 -0000	1.16
@@ -1 +1 @@
-f3e7ad6e0e4b66d596e8f301c6943b43  lxml-2.0.8.tar.gz
+cc8a7dc871d5e91d24432c9154af8664  lxml-2.0.9.tar.gz



From jcollie at fedoraproject.org  Fri Sep  5 13:21:49 2008
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri,  5 Sep 2008 13:21:49 +0000 (UTC)
Subject: rpms/python-lxml/EL-5 .cvsignore, 1.15, 1.16 python-lxml.spec, 1.17,
	1.18 sources, 1.15, 1.16
Message-ID: <20080905132149.ADA0470121@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/python-lxml/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2984

Modified Files:
	.cvsignore python-lxml.spec sources 
Log Message:
* Fri Sep  5 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.0.9-1
- 2.0.9 (2008-09-05)
- Bugs fixed
- 
-    * Memory problem when passing documents between threads.
-    * Target parser did not honour the recover option and raised an exception
-      instead of calling .close() on the target.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/EL-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	25 Jul 2008 15:10:45 -0000	1.15
+++ .cvsignore	5 Sep 2008 13:21:19 -0000	1.16
@@ -1 +1 @@
-lxml-2.0.8.tar.gz
+lxml-2.0.9.tar.gz


Index: python-lxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/EL-5/python-lxml.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- python-lxml.spec	25 Jul 2008 15:10:45 -0000	1.17
+++ python-lxml.spec	5 Sep 2008 13:21:19 -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)")}
 
 Name:           python-lxml
-Version:        2.0.8
+Version:        2.0.9
 Release:        1%{?dist}
 Summary:        ElementTree-like Python bindings for libxml2 and libxslt
 
@@ -49,6 +49,14 @@
 %{python_sitearch}/*
 
 %changelog
+* Fri Sep  5 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.0.9-1
+- 2.0.9 (2008-09-05)
+- Bugs fixed
+- 
+-    * Memory problem when passing documents between threads.
+-    * Target parser did not honour the recover option and raised an exception
+-      instead of calling .close() on the target.
+
 * Fri Jul 25 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.0.8-1
 - Update to 2.0.8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/EL-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	25 Jul 2008 15:10:45 -0000	1.15
+++ sources	5 Sep 2008 13:21:19 -0000	1.16
@@ -1 +1 @@
-f3e7ad6e0e4b66d596e8f301c6943b43  lxml-2.0.8.tar.gz
+cc8a7dc871d5e91d24432c9154af8664  lxml-2.0.9.tar.gz



From pkgdb at fedoraproject.org  Fri Sep  5 13:36:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 13:36:00 +0000
Subject: [pkgdb] justmoon was added for lkundrak
Message-ID: <20080905133600.C7D56208770@bastion.fedora.phx.redhat.com>

kevin has added Package justmoon with summary Lunar observing software
kevin has approved Package justmoon
kevin has added a Fedora devel branch for justmoon with an owner of lkundrak
kevin has approved justmoon in Fedora devel
kevin has approved Package justmoon
kevin has set commit to Approved for packager on justmoon (Fedora devel)
kevin has set build to Approved for packager on justmoon (Fedora devel)
kevin has set checkout to Approved for packager on justmoon (Fedora devel)
kevin has set commit to Approved for uberpackager on justmoon (Fedora devel)
kevin has set build to Approved for uberpackager on justmoon (Fedora devel)
kevin has set checkout to Approved for uberpackager on justmoon (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/justmoon



From pkgdb at fedoraproject.org  Fri Sep  5 13:36:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 13:36:06 +0000
Subject: [pkgdb] justmoon (Fedora, 8) updated by kevin
Message-ID: <20080905133606.DD1412086F6@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for justmoon
kevin has set commit to Approved for uberpackager on justmoon (Fedora 8)
kevin has set build to Approved for uberpackager on justmoon (Fedora 8)
kevin has set checkout to Approved for uberpackager on justmoon (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/justmoon



From pkgdb at fedoraproject.org  Fri Sep  5 13:36:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 13:36:06 +0000
Subject: [pkgdb] justmoon (Fedora EPEL, 5) updated by kevin
Message-ID: <20080905133607.A2BB0208D98@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for justmoon
kevin has set commit to Approved for uberpackager on justmoon (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on justmoon (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on justmoon (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/justmoon



From pkgdb at fedoraproject.org  Fri Sep  5 13:36:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 13:36:06 +0000
Subject: [pkgdb] justmoon (Fedora, 9) updated by kevin
Message-ID: <20080905133607.C9822208D9A@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for justmoon
kevin has set commit to Approved for uberpackager on justmoon (Fedora 9)
kevin has set build to Approved for uberpackager on justmoon (Fedora 9)
kevin has set checkout to Approved for uberpackager on justmoon (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/justmoon



From kevin at fedoraproject.org  Fri Sep  5 13:36:39 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 13:36:39 +0000 (UTC)
Subject: rpms/justmoon/devel - New directory
Message-ID: <20080905133639.52FB670127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/justmoon/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRI4709/rpms/justmoon/devel

Log Message:
Directory /cvs/extras/rpms/justmoon/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  5 13:36:39 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 13:36:39 +0000 (UTC)
Subject: rpms/justmoon - New directory
Message-ID: <20080905133639.22BE870121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/justmoon
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRI4709/rpms/justmoon

Log Message:
Directory /cvs/extras/rpms/justmoon added to the repository




From kevin at fedoraproject.org  Fri Sep  5 13:36:40 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 13:36:40 +0000 (UTC)
Subject: rpms/justmoon Makefile,NONE,1.1
Message-ID: <20080905133640.27EBB70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/justmoon
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRI4709/rpms/justmoon

Added Files:
	Makefile 
Log Message:
Setup of module justmoon


--- NEW FILE Makefile ---
# Top level Makefile for module justmoon
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  5 13:36:40 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 13:36:40 +0000 (UTC)
Subject: rpms/justmoon/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080905133640.5915B70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/justmoon/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRI4709/rpms/justmoon/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module justmoon


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: justmoon
# $Id: Makefile,v 1.1 2008/09/05 13:36:40 kevin Exp $
NAME := justmoon
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Fri Sep  5 13:58:29 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  5 Sep 2008 13:58:29 +0000 (UTC)
Subject: rpms/fedora-icon-theme/devel echo.patch, NONE,
	1.1 fedora-icon-theme.spec, 1.2, 1.3
Message-ID: <20080905135829.2B20470121@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/fedora-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7323

Modified Files:
	fedora-icon-theme.spec 
Added Files:
	echo.patch 
Log Message:
Echo by default 


echo.patch:

--- NEW FILE echo.patch ---
diff -up fedora-icon-theme-1.0.0/theme/index.theme.in.echo fedora-icon-theme-1.0.0/theme/index.theme.in
--- fedora-icon-theme-1.0.0/theme/index.theme.in.echo	2008-09-05 09:43:26.000000000 -0400
+++ fedora-icon-theme-1.0.0/theme/index.theme.in	2008-09-05 09:43:32.000000000 -0400
@@ -1,7 +1,7 @@
 [Icon Theme]
 _Name=Fedora
 _Comment=Fedora Icon Theme
-Inherits=Mist
+Inherits=Echo
 Example=x-directory-normal
 
 # KDE Specific Stuff


Index: fedora-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-icon-theme/devel/fedora-icon-theme.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-icon-theme.spec	10 Oct 2007 18:14:51 -0000	1.2
+++ fedora-icon-theme.spec	5 Sep 2008 13:57:58 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Fedora icon theme
 Name: fedora-icon-theme
 Version: 1.0.0
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 BuildArch: noarch
 License: GPL+
 Group: User Interface/Desktops
@@ -15,11 +15,15 @@
 
 Provides: system-icon-theme
 
+# try echo-by-default
+Patch0: echo.patch
+
 %description
 This package contains the Fedora icon theme.
 
 %prep
 %setup -q 
+%patch0 -p1 -b .echo
 
 %build
 %configure 
@@ -68,5 +72,8 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Fri Sep  5 2008 Matthias Clasen <mclasen at redhat.com> - 1.0.0-2
+- Switch to Echo as the default icon theme
+
 * Tue Sep 25 2007 Ray Strode <rstrode at redhat.com> - 1.0.0-1
 - Initial import, version 1.0.0



From mclasen at fedoraproject.org  Fri Sep  5 14:07:54 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  5 Sep 2008 14:07:54 +0000 (UTC)
Subject: rpms/at-spi/devel liyuan-greeter-crash.patch, NONE, 1.1 at-spi.spec,
	1.94, 1.95
Message-ID: <20080905140754.95D4970121@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9181

Modified Files:
	at-spi.spec 
Added Files:
	liyuan-greeter-crash.patch 
Log Message:
fix a greeter crash


liyuan-greeter-crash.patch:

--- NEW FILE liyuan-greeter-crash.patch ---
--- atk-bridge/bridge.c.orig	2008-09-05 15:37:54.046098231 +0800
+++ atk-bridge/bridge.c	2008-09-05 15:59:55.399017901 +0800
@@ -1101,7 +1101,7 @@
   CORBA_any any;
   CORBA_Object c_obj;
   char *sp = NULL;
-  AtkObject *ao;
+  AtkObject *ao = NULL;
   gint detail1 = 0, detail2 = 0;
   SpiAccessible *s_ao = NULL;
 #ifdef SPI_BRIDGE_DEBUG
@@ -1162,7 +1162,7 @@
           ao = ATK_OBJECT (child);
           g_object_ref (ao);
         }
-      else
+      else if (strcmp (detail, "add") == 0)
         {
           ao = atk_object_ref_accessible_child (ATK_OBJECT (gobject), 
                                                 detail1);


Index: at-spi.spec
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- at-spi.spec	2 Sep 2008 23:25:03 -0000	1.94
+++ at-spi.spec	5 Sep 2008 14:07:24 -0000	1.95
@@ -10,7 +10,7 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.23.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://download.gnome.org/sources/at-spi/1.23/%{name}-%{version}.tar.bz2
 
@@ -39,6 +39,8 @@
 BuildRequires: libXt-devel 
 
 Patch2: at-spi-silence-no-event-spew.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=548782
+Patch3: liyuan-greeter-crash.patch
 
 %description
 at-spi allows assistive technologies to access GTK-based
@@ -75,6 +77,7 @@
 %prep
 %setup -q
 %patch2 -p1 -b .spew
+%patch3 -p0 -b .greeter-crash
 
 
 %build
@@ -121,6 +124,9 @@
 
 
 %changelog
+* Fri Sep  5 2008 Matthias Clasen <mclasen at redhat.com> - 1.23.91-2
+- Fix a greeter crash
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 1.23.91-1
 - Update to 1.23.91
 



From mclasen at fedoraproject.org  Fri Sep  5 14:09:18 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  5 Sep 2008 14:09:18 +0000 (UTC)
Subject: rpms/gtk2/devel gtk2.spec,1.319,1.320
Message-ID: <20080905140918.7372170121@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9498

Modified Files:
	gtk2.spec 
Log Message:
Move crash fix to at-spi



Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -r1.319 -r1.320
--- gtk2.spec	5 Sep 2008 04:26:15 -0000	1.319
+++ gtk2.spec	5 Sep 2008 14:08:48 -0000	1.320
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
@@ -32,8 +32,6 @@
 Patch2: workaround.patch
 # fixed upstream
 Patch3: init-deadlock.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=548782
-Patch4: greeter-crash.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -120,7 +118,6 @@
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
 %patch3 -p0 -b .init-deadlock
-%patch4 -p1 -b .greeter-crash
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -304,6 +301,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Fri Sep  5 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.0-4
+- Remove the last patch, crash is fixed in at-spi now
+
 * Fri Sep  5 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.0-3
 - Fix a greeter crash
 



From pkgdb at fedoraproject.org  Fri Sep  5 14:09:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:09:24 +0000
Subject: [pkgdb] taskcoach had acl change status
Message-ID: <20080905140925.08DD320876C@bastion.fedora.phx.redhat.com>

kurzawa has set the watchbugzilla acl on taskcoach (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:09:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:09:25 +0000
Subject: [pkgdb] taskcoach had acl change status
Message-ID: <20080905140925.2988020876F@bastion.fedora.phx.redhat.com>

kurzawa has set the watchcommits acl on taskcoach (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:09:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:09:26 +0000
Subject: [pkgdb] taskcoach had acl change status
Message-ID: <20080905140926.10541208D07@bastion.fedora.phx.redhat.com>

kurzawa has set the commit acl on taskcoach (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:09:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:09:26 +0000
Subject: [pkgdb] taskcoach had acl change status
Message-ID: <20080905140926.8DB31208D7C@bastion.fedora.phx.redhat.com>

kurzawa has set the approveacls acl on taskcoach (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:09:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:09:29 +0000
Subject: [pkgdb] taskcoach had acl change status
Message-ID: <20080905140929.EC885208D9A@bastion.fedora.phx.redhat.com>

kurzawa has set the watchbugzilla acl on taskcoach (Fedora 8) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:09:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:09:33 +0000
Subject: [pkgdb] taskcoach had acl change status
Message-ID: <20080905140933.A74F9208D9C@bastion.fedora.phx.redhat.com>

kurzawa has set the watchcommits acl on taskcoach (Fedora 8) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:09:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:09:33 +0000
Subject: [pkgdb] taskcoach had acl change status
Message-ID: <20080905140933.BD009208D9F@bastion.fedora.phx.redhat.com>

kurzawa has set the commit acl on taskcoach (Fedora 8) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:09:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:09:34 +0000
Subject: [pkgdb] taskcoach had acl change status
Message-ID: <20080905140935.0F55B2D0024@bastion.fedora.phx.redhat.com>

kurzawa has set the approveacls acl on taskcoach (Fedora 8) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:09:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:09:36 +0000
Subject: [pkgdb] taskcoach had acl change status
Message-ID: <20080905140936.1D3422D0028@bastion.fedora.phx.redhat.com>

kurzawa has set the watchbugzilla acl on taskcoach (Fedora 9) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:09:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:09:39 +0000
Subject: [pkgdb] taskcoach had acl change status
Message-ID: <20080905140939.CA9932D0029@bastion.fedora.phx.redhat.com>

kurzawa has set the watchcommits acl on taskcoach (Fedora 9) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:09:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:09:40 +0000
Subject: [pkgdb] taskcoach had acl change status
Message-ID: <20080905140940.E3DAB20876C@bastion.fedora.phx.redhat.com>

kurzawa has set the commit acl on taskcoach (Fedora 9) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:09:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:09:41 +0000
Subject: [pkgdb] taskcoach had acl change status
Message-ID: <20080905140941.755F420876D@bastion.fedora.phx.redhat.com>

kurzawa has set the approveacls acl on taskcoach (Fedora 9) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:09:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:09:43 +0000
Subject: [pkgdb] taskcoach ownership updated
Message-ID: <20080905140944.0D8BA2D0030@bastion.fedora.phx.redhat.com>

Package taskcoach in Fedora 9 was orphaned by kurzawa

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:09:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:09:47 +0000
Subject: [pkgdb] taskcoach ownership updated
Message-ID: <20080905140947.70A1E2D0032@bastion.fedora.phx.redhat.com>

Package taskcoach in Fedora 7 was orphaned by kurzawa

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:09:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:09:51 +0000
Subject: [pkgdb] taskcoach ownership updated
Message-ID: <20080905140951.A3E542D0034@bastion.fedora.phx.redhat.com>

Package taskcoach in Fedora devel was orphaned by kurzawa

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:09:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:09:54 +0000
Subject: [pkgdb] taskcoach ownership updated
Message-ID: <20080905140956.11C212D0037@bastion.fedora.phx.redhat.com>

Package taskcoach in Fedora 8 was orphaned by kurzawa

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:11:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:11:56 +0000
Subject: [pkgdb] taskcoach ownership updated
Message-ID: <20080905141156.2F0B520876A@bastion.fedora.phx.redhat.com>

Package taskcoach in Fedora devel is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:00 +0000
Subject: [pkgdb] taskcoach ownership updated
Message-ID: <20080905141200.AF56520876C@bastion.fedora.phx.redhat.com>

Package taskcoach in Fedora 8 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:06 +0000
Subject: [pkgdb] taskcoach ownership updated
Message-ID: <20080905141206.B842520876E@bastion.fedora.phx.redhat.com>

Package taskcoach in Fedora 9 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:15 +0000
Subject: [pkgdb] taskcoach: rakesh has given up watchcommits
Message-ID: <20080905141215.C11CC20876C@bastion.fedora.phx.redhat.com>

rakesh has given up the watchcommits acl on taskcoach (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:12 +0000
Subject: [pkgdb] taskcoach: rakesh has given up watchbugzilla
Message-ID: <20080905141212.7C01520876A@bastion.fedora.phx.redhat.com>

rakesh has given up the watchbugzilla acl on taskcoach (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:17 +0000
Subject: [pkgdb] taskcoach: rakesh has given up commit
Message-ID: <20080905141217.D201320876F@bastion.fedora.phx.redhat.com>

rakesh has given up the commit acl on taskcoach (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:19 +0000
Subject: [pkgdb] taskcoach: rakesh has given up approveacls
Message-ID: <20080905141219.C8187208770@bastion.fedora.phx.redhat.com>

rakesh has given up the approveacls acl on taskcoach (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:24 +0000
Subject: [pkgdb] dayplanner had acl change status
Message-ID: <20080905141224.D01B7208D0F@bastion.fedora.phx.redhat.com>

kurzawa has set the watchbugzilla acl on dayplanner (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:25 +0000
Subject: [pkgdb] taskcoach: rakesh has given up watchbugzilla
Message-ID: <20080905141225.B2EEA208D7C@bastion.fedora.phx.redhat.com>

rakesh has given up the watchbugzilla acl on taskcoach (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:29 +0000
Subject: [pkgdb] taskcoach: rakesh has given up watchcommits
Message-ID: <20080905141229.B80CB208769@bastion.fedora.phx.redhat.com>

rakesh has given up the watchcommits acl on taskcoach (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:30 +0000
Subject: [pkgdb] taskcoach: rakesh has given up commit
Message-ID: <20080905141230.34FF520876C@bastion.fedora.phx.redhat.com>

rakesh has given up the commit acl on taskcoach (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:33 +0000
Subject: [pkgdb] dayplanner had acl change status
Message-ID: <20080905141233.C9BF2208D9D@bastion.fedora.phx.redhat.com>

kurzawa has set the watchcommits acl on dayplanner (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:32 +0000
Subject: [pkgdb] dayplanner had acl change status
Message-ID: <20080905141233.0491B208D9A@bastion.fedora.phx.redhat.com>

kurzawa has set the commit acl on dayplanner (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:33 +0000
Subject: [pkgdb] taskcoach: rakesh has given up approveacls
Message-ID: <20080905141233.DA1C0208DA0@bastion.fedora.phx.redhat.com>

rakesh has given up the approveacls acl on taskcoach (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:33 +0000
Subject: [pkgdb] dayplanner had acl change status
Message-ID: <20080905141234.3BBF52D0021@bastion.fedora.phx.redhat.com>

kurzawa has set the approveacls acl on dayplanner (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:36 +0000
Subject: [pkgdb] dayplanner had acl change status
Message-ID: <20080905141236.9C4922D0026@bastion.fedora.phx.redhat.com>

kurzawa has set the watchcommits acl on dayplanner (Fedora 8) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:37 +0000
Subject: [pkgdb] dayplanner had acl change status
Message-ID: <20080905141237.CFAAC2D002C@bastion.fedora.phx.redhat.com>

kurzawa has set the watchbugzilla acl on dayplanner (Fedora 8) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:37 +0000
Subject: [pkgdb] taskcoach: rakesh has given up watchbugzilla
Message-ID: <20080905141237.A8E222D0029@bastion.fedora.phx.redhat.com>

rakesh has given up the watchbugzilla acl on taskcoach (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:39 +0000
Subject: [pkgdb] taskcoach: rakesh has given up commit
Message-ID: <20080905141239.E8460208771@bastion.fedora.phx.redhat.com>

rakesh has given up the commit acl on taskcoach (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:38 +0000
Subject: [pkgdb] taskcoach: rakesh has given up watchcommits
Message-ID: <20080905141238.647832D002E@bastion.fedora.phx.redhat.com>

rakesh has given up the watchcommits acl on taskcoach (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:39 +0000
Subject: [pkgdb] dayplanner had acl change status
Message-ID: <20080905141240.E1557208D07@bastion.fedora.phx.redhat.com>

kurzawa has set the commit acl on dayplanner (Fedora 8) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:41 +0000
Subject: [pkgdb] dayplanner had acl change status
Message-ID: <20080905141241.8AF13208DA3@bastion.fedora.phx.redhat.com>

kurzawa has set the approveacls acl on dayplanner (Fedora 8) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:41 +0000
Subject: [pkgdb] taskcoach: rakesh has given up approveacls
Message-ID: <20080905141241.D6F69208DA5@bastion.fedora.phx.redhat.com>

rakesh has given up the approveacls acl on taskcoach (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/taskcoach



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:44 +0000
Subject: [pkgdb] dayplanner had acl change status
Message-ID: <20080905141244.4DD74208DA8@bastion.fedora.phx.redhat.com>

kurzawa has set the watchbugzilla acl on dayplanner (Fedora 9) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:46 +0000
Subject: [pkgdb] dayplanner had acl change status
Message-ID: <20080905141246.36B152D0032@bastion.fedora.phx.redhat.com>

kurzawa has set the watchcommits acl on dayplanner (Fedora 9) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:46 +0000
Subject: [pkgdb] dayplanner had acl change status
Message-ID: <20080905141247.14EB02D0035@bastion.fedora.phx.redhat.com>

kurzawa has set the commit acl on dayplanner (Fedora 9) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:47 +0000
Subject: [pkgdb] dayplanner had acl change status
Message-ID: <20080905141248.0632F2D003A@bastion.fedora.phx.redhat.com>

kurzawa has set the approveacls acl on dayplanner (Fedora 9) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:12:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:12:56 +0000
Subject: [pkgdb] dayplanner ownership updated
Message-ID: <20080905141256.DE2D6208D7C@bastion.fedora.phx.redhat.com>

Package dayplanner in Fedora devel was orphaned by kurzawa

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:13:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:13:01 +0000
Subject: [pkgdb] dayplanner ownership updated
Message-ID: <20080905141304.1943C20876C@bastion.fedora.phx.redhat.com>

Package dayplanner in Fedora 8 was orphaned by kurzawa

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:13:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:13:07 +0000
Subject: [pkgdb] dayplanner ownership updated
Message-ID: <20080905141307.B80FB208DAB@bastion.fedora.phx.redhat.com>

Package dayplanner in Fedora 7 was orphaned by kurzawa

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:13:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:13:10 +0000
Subject: [pkgdb] dayplanner ownership updated
Message-ID: <20080905141311.37886208DAD@bastion.fedora.phx.redhat.com>

Package dayplanner in Fedora 9 was orphaned by kurzawa

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:15:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:15:11 +0000
Subject: [pkgdb] dayplanner ownership updated
Message-ID: <20080905141512.9B4D9208D1E@bastion.fedora.phx.redhat.com>

Package dayplanner in Fedora devel is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:15:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:15:14 +0000
Subject: [pkgdb] dayplanner ownership updated
Message-ID: <20080905141514.52560208D97@bastion.fedora.phx.redhat.com>

Package dayplanner in Fedora 8 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:15:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:15:22 +0000
Subject: [pkgdb] dayplanner ownership updated
Message-ID: <20080905141522.F2998208D98@bastion.fedora.phx.redhat.com>

Package dayplanner in Fedora 9 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:15:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:15:28 +0000
Subject: [pkgdb] dayplanner: rakesh has given up watchbugzilla
Message-ID: <20080905141528.95067208D9B@bastion.fedora.phx.redhat.com>

rakesh has given up the watchbugzilla acl on dayplanner (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:15:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:15:29 +0000
Subject: [pkgdb] dayplanner: rakesh has given up watchcommits
Message-ID: <20080905141529.83574208DA8@bastion.fedora.phx.redhat.com>

rakesh has given up the watchcommits acl on dayplanner (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:15:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:15:32 +0000
Subject: [pkgdb] dayplanner: rakesh has given up commit
Message-ID: <20080905141532.69AA5208DAD@bastion.fedora.phx.redhat.com>

rakesh has given up the commit acl on dayplanner (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:15:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:15:32 +0000
Subject: [pkgdb] dayplanner: rakesh has given up approveacls
Message-ID: <20080905141532.7BF5F208DB4@bastion.fedora.phx.redhat.com>

rakesh has given up the approveacls acl on dayplanner (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:15:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:15:36 +0000
Subject: [pkgdb] dayplanner: rakesh has given up watchbugzilla
Message-ID: <20080905141536.5EF5C208D9A@bastion.fedora.phx.redhat.com>

rakesh has given up the watchbugzilla acl on dayplanner (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:15:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:15:37 +0000
Subject: [pkgdb] dayplanner: rakesh has given up watchcommits
Message-ID: <20080905141537.C1729208D9F@bastion.fedora.phx.redhat.com>

rakesh has given up the watchcommits acl on dayplanner (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:15:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:15:40 +0000
Subject: [pkgdb] dayplanner: rakesh has given up approveacls
Message-ID: <20080905141540.C9334208DB7@bastion.fedora.phx.redhat.com>

rakesh has given up the approveacls acl on dayplanner (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:15:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:15:40 +0000
Subject: [pkgdb] dayplanner: rakesh has given up commit
Message-ID: <20080905141540.926B8208DB6@bastion.fedora.phx.redhat.com>

rakesh has given up the commit acl on dayplanner (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:15:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:15:44 +0000
Subject: [pkgdb] dayplanner: rakesh has given up watchbugzilla
Message-ID: <20080905141544.5067D208DBA@bastion.fedora.phx.redhat.com>

rakesh has given up the watchbugzilla acl on dayplanner (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:15:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:15:47 +0000
Subject: [pkgdb] dayplanner: rakesh has given up watchcommits
Message-ID: <20080905141547.71B45208DAF@bastion.fedora.phx.redhat.com>

rakesh has given up the watchcommits acl on dayplanner (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:15:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:15:47 +0000
Subject: [pkgdb] dayplanner: rakesh has given up commit
Message-ID: <20080905141547.B8462208DB1@bastion.fedora.phx.redhat.com>

rakesh has given up the commit acl on dayplanner (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:15:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:15:50 +0000
Subject: [pkgdb] dayplanner: rakesh has given up approveacls
Message-ID: <20080905141550.A5DF5208DB2@bastion.fedora.phx.redhat.com>

rakesh has given up the approveacls acl on dayplanner (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner



From pkgdb at fedoraproject.org  Fri Sep  5 14:16:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:16:37 +0000
Subject: [pkgdb] jabbin ownership updated
Message-ID: <20080905141637.88CE6208771@bastion.fedora.phx.redhat.com>

Package jabbin in Fedora 8 was orphaned by kurzawa

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabbin



From pkgdb at fedoraproject.org  Fri Sep  5 14:16:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:16:35 +0000
Subject: [pkgdb] jabbin ownership updated
Message-ID: <20080905141635.254AB20876D@bastion.fedora.phx.redhat.com>

Package jabbin in Fedora devel was orphaned by kurzawa

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabbin



From pkgdb at fedoraproject.org  Fri Sep  5 14:16:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:16:40 +0000
Subject: [pkgdb] jabbin ownership updated
Message-ID: <20080905141640.D86CF208D1E@bastion.fedora.phx.redhat.com>

Package jabbin in Fedora 7 was orphaned by kurzawa

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabbin



From pkgdb at fedoraproject.org  Fri Sep  5 14:16:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:16:43 +0000
Subject: [pkgdb] jabbin ownership updated
Message-ID: <20080905141643.9B91F208D98@bastion.fedora.phx.redhat.com>

Package jabbin in Fedora 9 was orphaned by kurzawa

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabbin



From mmahut at fedoraproject.org  Fri Sep  5 14:24:38 2008
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Fri,  5 Sep 2008 14:24:38 +0000 (UTC)
Subject: rpms/justmoon/devel import.log, NONE,
	1.1 justmoon-0.3.3-datadir.patch, 
	NONE, 1.1 justmoon-0.3.3-parenth.patch, NONE,
	1.1 justmoon-gmoon.desktop, NONE, 1.1 justmoon-qmoon.desktop,
	NONE, 1.1 justmoon.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20080905142438.5B1AD70121@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/justmoon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10924/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log justmoon-0.3.3-datadir.patch 
	justmoon-0.3.3-parenth.patch justmoon-gmoon.desktop 
	justmoon-qmoon.desktop justmoon.spec 
Log Message:
initial import



--- NEW FILE import.log ---
justmoon-0_3_3-3_el5:HEAD:justmoon-0.3.3-3.el5.src.rpm:1220624188

justmoon-0.3.3-datadir.patch:

--- NEW FILE justmoon-0.3.3-datadir.patch ---
We pass DATADIR from CFLAGS

Lubomir Rintel <lkundrak at v3.sk>

--- justmoon-0.3.3/include/MoonFeature.h.datadir	2008-09-05 11:58:25.000000000 +0200
+++ justmoon-0.3.3/include/MoonFeature.h	2008-09-05 11:58:37.000000000 +0200
@@ -9,9 +9,6 @@
 #ifndef MOONFEATURE_H
 #define MOONFEATURE_H
 
-// Where the data files live:
-#define DATADIR "/usr/local/qmoon/"
-
 class MoonCanvas;
 
 class MoonFeature

justmoon-0.3.3-parenth.patch:

--- NEW FILE justmoon-0.3.3-parenth.patch ---
Fix build with gcc-4.1

Lubomir Rintel <lkundrak at v3.sk>

--- justmoon-0.3.3/libmoon/MoonFeature.cpp.parenth	2008-09-05 11:44:51.000000000 +0200
+++ justmoon-0.3.3/libmoon/MoonFeature.cpp	2008-09-05 11:45:08.000000000 +0200
@@ -128,7 +128,7 @@
     // Delete the old moonFeature list:
     if (sMoonFeatureList)
         DeleteFeatures();
-    sMoonFeatureList = new (MoonFeature*)[2000];
+    sMoonFeatureList = new MoonFeature*[2000];
 
     sNumFeatures = 0;
 


--- NEW FILE justmoon-gmoon.desktop ---
[Desktop Entry]
Name=Just Moon
Comment=Lunar observing software
GenericName=Just Moon
Exec=gmoon
Icon=/usr/share/justmoon/fullmoon
Type=Application
Categories=Education;Game;Astronomy;Science;
NotShowIn=KDE;


--- NEW FILE justmoon-qmoon.desktop ---
[Desktop Entry]
Name=Just Moon
Comment=Lunar observing software
GenericName=Just Moon
Exec=qmoon
Icon=/usr/share/justmoon/fullmoon
Type=Application
Categories=Education;Game;Astronomy;Science;
NotShowIn=GNOME;


--- NEW FILE justmoon.spec ---
Name:           justmoon
Version:        0.3.3
Release:        3%{?dist}
Summary:        Just Moon is lunar observing software for Linux

Group:          Amusements/Graphics
License:        GPL+
URL:            http://www.shallowsky.com/software/justmoon/
Source0:        http://www.shallowsky.com/software/justmoon/%{name}-%{version}.tar.gz
Source1:        justmoon-gmoon.desktop
Source2:        justmoon-qmoon.desktop
# Not sent to upstream yet
Patch0:         justmoon-0.3.3-parenth.patch
# Not upstreamable
Patch1:         justmoon-0.3.3-datadir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt3-devel
BuildRequires:  gtk+-devel
BuildRequires:  gdk-pixbuf-devel
BuildRequires:  desktop-file-utils

%description
%{summary}


%package gtk
Summary:        GTK+ frontend for Just Moon, a lunar observing software
Group:          Amusements/Graphics
Requires:       %{name}-common = %{version}

%description gtk
This package contains a lunar observing software with
GTK+-based user interface that fits the GNOME Desktop environment.


%package qt
Summary:        QT frontend for Just Moon, a lunar observing software
Group:          Amusements/Graphics
Requires:       %{name}-common = %{version}

%description qt
This package contains a lunar observing software with
QT-based user interface that fits the KDE Desktop environment.


%package common
Summary:        Data files for Just Moon, a lunar observing software
Group:          Amusements/Graphics

%description common
This package contains data file for a lunar observing software Just Moon.
In order to actually use Just Moon you need a graphical frontend from
justmoon-qt or justmoon-gtk package.


%prep
%setup -q
%patch0 -p1 -b .parenth
%patch1 -p1 -b .datadir


%build
make %{?_smp_mflags}                                            \
        'CFLAGS=%{optflags} -DDATADIR=\"%{_datadir}/%{name}/\"' \
        'CXXFLAGS=%{optflags} -DDATADIR=\"%{_datadir}/%{name}/\"'


%install
rm -rf $RPM_BUILD_ROOT
make installdata INSTALLDIR=$RPM_BUILD_ROOT/%{_datadir}/%{name}
make -C gmoon install INSTALLPREFIX=$RPM_BUILD_ROOT/%{_prefix}
install -p -m 0755 qmoon/qmoon $RPM_BUILD_ROOT/%{_bindir}
desktop-file-install --vendor="fedora"                          \
        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
        %{SOURCE1}
desktop-file-install --vendor="fedora"                          \
        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
        %{SOURCE2}


%clean
rm -rf $RPM_BUILD_ROOT


%files common
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}
%attr(0644,root,root) %{_datadir}/%{name}/*
%doc README


%files gtk
%defattr(-,root,root,-)
%{_bindir}/gmoon
%{_datadir}/applications/fedora-justmoon-gmoon.desktop


%files qt
%defattr(-,root,root,-)
%{_bindir}/qmoon
%{_datadir}/applications/fedora-justmoon-qmoon.desktop


%changelog
* Fri Sep 05 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.3-3
- Yet more review fixes, thanks to yet another Marek Mahut

* Fri Sep 05 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.3-2
- Integrate review fixes, thanks to Marek Mahut

* Fri Sep 05 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.3-1
- Initial packaging attempt


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/justmoon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 13:36:40 -0000	1.1
+++ .cvsignore	5 Sep 2008 14:24:08 -0000	1.2
@@ -0,0 +1 @@
+justmoon-0.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/justmoon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 13:36:40 -0000	1.1
+++ sources	5 Sep 2008 14:24:08 -0000	1.2
@@ -0,0 +1 @@
+3007c84e3b5232c0dba9f5c0b5c3a669  justmoon-0.3.3.tar.gz



From pkgdb at fedoraproject.org  Fri Sep  5 14:25:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:25:58 +0000
Subject: [pkgdb] anaconda: dcantrel has requested approveacls
Message-ID: <20080905142558.A512120876A@bastion.fedora.phx.redhat.com>

dcantrel has requested the approveacls acl on anaconda (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Fri Sep  5 14:26:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:26:09 +0000
Subject: [pkgdb] anaconda: dcantrel has requested commit
Message-ID: <20080905142610.07007208770@bastion.fedora.phx.redhat.com>

dcantrel has requested the commit acl on anaconda (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Fri Sep  5 14:26:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:26:15 +0000
Subject: [pkgdb] anaconda: dcantrel has requested watchcommits
Message-ID: <20080905142616.F3FD3208771@bastion.fedora.phx.redhat.com>

dcantrel has requested the watchcommits acl on anaconda (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Fri Sep  5 14:26:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:26:16 +0000
Subject: [pkgdb] anaconda: dcantrel has requested watchbugzilla
Message-ID: <20080905142617.27739208D98@bastion.fedora.phx.redhat.com>

dcantrel has requested the watchbugzilla acl on anaconda (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Fri Sep  5 14:26:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:26:18 +0000
Subject: [pkgdb] anaconda: dcantrel has requested approveacls
Message-ID: <20080905142618.D0B72208D9B@bastion.fedora.phx.redhat.com>

dcantrel has requested the approveacls acl on anaconda (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Fri Sep  5 14:26:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:26:19 +0000
Subject: [pkgdb] anaconda: dcantrel has requested watchcommits
Message-ID: <20080905142619.4FA14208D9F@bastion.fedora.phx.redhat.com>

dcantrel has requested the watchcommits acl on anaconda (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Fri Sep  5 14:26:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:26:20 +0000
Subject: [pkgdb] anaconda: dcantrel has requested commit
Message-ID: <20080905142620.49D61208DA4@bastion.fedora.phx.redhat.com>

dcantrel has requested the commit acl on anaconda (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Fri Sep  5 14:26:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:26:24 +0000
Subject: [pkgdb] anaconda: dcantrel has requested watchbugzilla
Message-ID: <20080905142624.D4DED208DA6@bastion.fedora.phx.redhat.com>

dcantrel has requested the watchbugzilla acl on anaconda (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Fri Sep  5 14:26:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:26:26 +0000
Subject: [pkgdb] anaconda: dcantrel has requested approveacls
Message-ID: <20080905142627.50392208DA7@bastion.fedora.phx.redhat.com>

dcantrel 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 pkgdb at fedoraproject.org  Fri Sep  5 14:26:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:26:27 +0000
Subject: [pkgdb] anaconda: dcantrel has requested commit
Message-ID: <20080905142627.DDA58208DAB@bastion.fedora.phx.redhat.com>

dcantrel 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  Fri Sep  5 14:26:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:26:28 +0000
Subject: [pkgdb] anaconda: dcantrel has requested watchcommits
Message-ID: <20080905142628.B808D208DAF@bastion.fedora.phx.redhat.com>

dcantrel has requested the watchcommits 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  Fri Sep  5 14:26:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:26:29 +0000
Subject: [pkgdb] anaconda: dcantrel has requested watchbugzilla
Message-ID: <20080905142629.DC0CB208DB3@bastion.fedora.phx.redhat.com>

dcantrel has requested the watchbugzilla 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  Fri Sep  5 14:26:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:26:35 +0000
Subject: [pkgdb] anaconda: dcantrel has requested approveacls
Message-ID: <20080905142635.BCE4C208771@bastion.fedora.phx.redhat.com>

dcantrel has requested the approveacls acl on anaconda (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Fri Sep  5 14:26:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:26:38 +0000
Subject: [pkgdb] anaconda: dcantrel has requested watchcommits
Message-ID: <20080905142638.28BDD208DB7@bastion.fedora.phx.redhat.com>

dcantrel has requested the watchcommits acl on anaconda (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Fri Sep  5 14:26:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:26:39 +0000
Subject: [pkgdb] anaconda: dcantrel has requested commit
Message-ID: <20080905142639.40F5D208DBB@bastion.fedora.phx.redhat.com>

dcantrel has requested the commit acl on anaconda (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Fri Sep  5 14:26:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 14:26:39 +0000
Subject: [pkgdb] anaconda: dcantrel has requested watchbugzilla
Message-ID: <20080905142639.6BCD4208DBF@bastion.fedora.phx.redhat.com>

dcantrel has requested the watchbugzilla acl on anaconda (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From orion at fedoraproject.org  Fri Sep  5 14:37:36 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri,  5 Sep 2008 14:37:36 +0000 (UTC)
Subject: rpms/eclipse-photran/devel eclipse-photran.spec,1.5,1.6
Message-ID: <20080905143736.EA66470121@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/eclipse-photran/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14240

Modified Files:
	eclipse-photran.spec 
Log Message:
* Fri Sep 5 2008 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-0.b4.3
- Fix xlf Requires



Index: eclipse-photran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/eclipse-photran.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-photran.spec	3 Sep 2008 15:53:14 -0000	1.5
+++ eclipse-photran.spec	5 Sep 2008 14:37:06 -0000	1.6
@@ -8,7 +8,7 @@
 Summary:        Eclipse Fortran Development Tools (Photran) plugin
 Name:           eclipse-photran
 Version:        %{majmin}.%{patch}
-Release:        0.b4%{?dist}.2
+Release:        0.b4%{?dist}.3
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/photran
@@ -44,7 +44,7 @@
 %package        xlf
 Summary:        IBM XL Fortran compiler support for Photran
 Group:          Development/Libraries
-Requires:       libvirt = %{version}
+Requires:       %{name} = %{version}-%{release}
 
 %description    xlf
 %{summary}.
@@ -62,7 +62,7 @@
 for feature in org.eclipse.photran_feature org.eclipse.photran.intel org.eclipse.photran.vpg_feature \
                org.eclipse.photran.xlf_feature
 do
-  %{eclipse_base}/buildscripts/pdebuild -d cdt \
+  %{eclipse_base}/buildscripts/pdebuild -D -d cdt \
     -f $feature -a "-DjavacSource=1.5 -DjavacTarget=1.5"
 done
 
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Fri Sep 5 2008 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-0.b4.3
+- Fix xlf Requires
+
 * Wed Sep 3 2008 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-0.b4.2
 - Split out IBM XL Fortran support into sub-package
 



From rdieter at fedoraproject.org  Fri Sep  5 14:43:41 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  5 Sep 2008 14:43:41 +0000 (UTC)
Subject: rpms/kdepimlibs/devel fix-invitations.diff, NONE,
	1.1 kdepimlibs.spec, 1.47, 1.48
Message-ID: <20080905144341.3D69F70121@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15355

Modified Files:
	kdepimlibs.spec 
Added Files:
	fix-invitations.diff 
Log Message:
* Fri Sep 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-2
- invitations crasher/regression (kde #170203)


fix-invitations.diff:

--- NEW FILE fix-invitations.diff ---
--- branches/KDE/4.1/kdepimlibs/kcal/incidenceformatter.cpp	2008/09/03 18:28:53	856767
+++ branches/KDE/4.1/kdepimlibs/kcal/incidenceformatter.cpp	2008/09/03 18:33:54	856768
@@ -1132,6 +1132,9 @@
     IncidenceCompareVisitor() : mExistingIncidence( 0 ) {}
     bool act( IncidenceBase *incidence, Incidence *existingIncidence )
     {
+      if (!existingIncidence) {
+        return false;
+      }
       Incidence *inc = dynamic_cast<Incidence *>( incidence );
       if ( inc && inc->revision() <= existingIncidence->revision() ) {
         return false;


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kdepimlibs.spec	29 Aug 2008 16:08:20 -0000	1.47
+++ kdepimlibs.spec	5 Sep 2008 14:43:10 -0000	1.48
@@ -14,7 +14,7 @@
 Name: kdepimlibs
 
 Version: 4.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -40,6 +40,10 @@
 # pulling in phonon-backend-xine
 #BuildRequires: phonon-backend-gstreamer
 
+## upstream patches
+# http://bugs.kde.org/170203
+Patch100: fix-invitations.diff
+
 %if 0%{?apidocs}
 BuildRequires: doxygen
 BuildRequires: graphviz
@@ -75,6 +79,8 @@
 %prep
 %setup -q -n kdepimlibs-%{version}
 
+%patch100 -p4 -b .invitations
+
 
 %build
 
@@ -165,6 +171,9 @@
 
 
 %changelog
+* Fri Sep 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-2
+- invitations crasher/regression (kde #170203)
+
 * Thu Aug 28 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 



From rdieter at fedoraproject.org  Fri Sep  5 14:46:19 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  5 Sep 2008 14:46:19 +0000 (UTC)
Subject: rpms/kdepimlibs/F-9 fix-invitations.diff, NONE, 1.1 .cvsignore, 1.20,
	1.21 kdepimlibs.spec, 1.38, 1.39
Message-ID: <20080905144619.A794470121@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15890

Modified Files:
	.cvsignore kdepimlibs.spec 
Added Files:
	fix-invitations.diff 
Log Message:
* Fri Sep 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-2
- invitations crasher/regression (kde #170203)


fix-invitations.diff:

--- NEW FILE fix-invitations.diff ---
--- branches/KDE/4.1/kdepimlibs/kcal/incidenceformatter.cpp	2008/09/03 18:28:53	856767
+++ branches/KDE/4.1/kdepimlibs/kcal/incidenceformatter.cpp	2008/09/03 18:33:54	856768
@@ -1132,6 +1132,9 @@
     IncidenceCompareVisitor() : mExistingIncidence( 0 ) {}
     bool act( IncidenceBase *incidence, Incidence *existingIncidence )
     {
+      if (!existingIncidence) {
+        return false;
+      }
       Incidence *inc = dynamic_cast<Incidence *>( incidence );
       if ( inc && inc->revision() <= existingIncidence->revision() ) {
         return false;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	25 Jul 2008 11:39:53 -0000	1.20
+++ .cvsignore	5 Sep 2008 14:45:49 -0000	1.21
@@ -1,2 +1,3 @@
 kdepimlibs-4.0.99.tar.bz2
 kdepimlibs-4.1.0.tar.bz2
+kdepimlibs-4.1.1.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/kdepimlibs.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- kdepimlibs.spec	29 Aug 2008 19:25:40 -0000	1.38
+++ kdepimlibs.spec	5 Sep 2008 14:45:49 -0000	1.39
@@ -14,7 +14,7 @@
 Name: kdepimlibs
 
 Version: 4.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -40,6 +40,10 @@
 # pulling in phonon-backend-xine
 #BuildRequires: phonon-backend-gstreamer
 
+## upstream patches
+# http://bugs.kde.org/170203
+Patch100: fix-invitations.diff
+
 %if 0%{?apidocs}
 BuildRequires: doxygen
 BuildRequires: graphviz
@@ -75,6 +79,8 @@
 %prep
 %setup -q -n kdepimlibs-%{version}
 
+%patch100 -p4 -b .invitations
+
 
 %build
 
@@ -165,6 +171,9 @@
 
 
 %changelog
+* Fri Sep 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-2
+- invitations crasher/regression (kde #170203)
+
 * Thu Aug 28 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 



From rdieter at fedoraproject.org  Fri Sep  5 14:47:43 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  5 Sep 2008 14:47:43 +0000 (UTC)
Subject: rpms/kdepimlibs/F-8 fix-invitations.diff, NONE, 1.1 kdepimlibs.spec,
	1.23, 1.24
Message-ID: <20080905144743.00D4070121@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16179

Modified Files:
	kdepimlibs.spec 
Added Files:
	fix-invitations.diff 
Log Message:
* Fri Sep 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-2
- invitations crasher/regression (kde #170203)


fix-invitations.diff:

--- NEW FILE fix-invitations.diff ---
--- branches/KDE/4.1/kdepimlibs/kcal/incidenceformatter.cpp	2008/09/03 18:28:53	856767
+++ branches/KDE/4.1/kdepimlibs/kcal/incidenceformatter.cpp	2008/09/03 18:33:54	856768
@@ -1132,6 +1132,9 @@
     IncidenceCompareVisitor() : mExistingIncidence( 0 ) {}
     bool act( IncidenceBase *incidence, Incidence *existingIncidence )
     {
+      if (!existingIncidence) {
+        return false;
+      }
       Incidence *inc = dynamic_cast<Incidence *>( incidence );
       if ( inc && inc->revision() <= existingIncidence->revision() ) {
         return false;


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-8/kdepimlibs.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- kdepimlibs.spec	4 Sep 2008 15:09:06 -0000	1.23
+++ kdepimlibs.spec	5 Sep 2008 14:47:12 -0000	1.24
@@ -14,7 +14,7 @@
 Name: kdepimlibs
 
 Version: 4.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -40,6 +40,10 @@
 # pulling in phonon-backend-xine
 #BuildRequires: phonon-backend-gstreamer
 
+## upstream patches
+# http://bugs.kde.org/170203
+Patch100: fix-invitations.diff
+
 %if 0%{?apidocs}
 BuildRequires: doxygen
 BuildRequires: graphviz
@@ -75,6 +79,8 @@
 %prep
 %setup -q -n kdepimlibs-%{version}
 
+%patch100 -p4 -b .invitations
+
 
 %build
 
@@ -165,6 +171,9 @@
 
 
 %changelog
+* Fri Sep 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-2
+- invitations crasher/regression (kde #170203)
+
 * Thu Aug 28 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 



From twaugh at fedoraproject.org  Fri Sep  5 14:49:35 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  5 Sep 2008 14:49:35 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic-ppdopts,1.1,NONE
Message-ID: <20080905144935.BFE2B70121@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16607

Removed Files:
	foomatic-ppdopts 
Log Message:
No longer need foomatic-ppdopts.


--- foomatic-ppdopts DELETED ---



From twaugh at fedoraproject.org  Fri Sep  5 14:55:24 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  5 Sep 2008 14:55:24 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic-ppd-filenames.patch, NONE,
	1.1 foomatic.spec, 1.206, 1.207
Message-ID: <20080905145524.2E25170121@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17677

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-ppd-filenames.patch 
Log Message:
* Fri Sep  5 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-66
- Fixed filename handling in foomatic-rip (bug #457679).


foomatic-ppd-filenames.patch:

--- NEW FILE foomatic-ppd-filenames.patch ---
diff -U0 foomatic-filters-3.0-20080904/ChangeLog.ppd-filenames foomatic-filters-3.0-20080904/ChangeLog
--- foomatic-filters-3.0-20080904/ChangeLog.ppd-filenames	2008-09-04 08:20:14.000000000 +0100
+++ foomatic-filters-3.0-20080904/ChangeLog	2008-09-05 15:51:23.000000000 +0100
@@ -0,0 +1,6 @@
+2008-09-05  Till Kamppeter <till.kamppeter at gmail.com>
+
+	* foomatic-rip.in: Make foomatic-rip also working with PPD file
+	  names which contain brackets or other special characters (Bug
+	  #169).
+
diff -up foomatic-filters-3.0-20080904/foomatic-rip.in.ppd-filenames foomatic-filters-3.0-20080904/foomatic-rip.in
--- foomatic-filters-3.0-20080904/foomatic-rip.in.ppd-filenames	2008-09-05 15:49:54.000000000 +0100
+++ foomatic-filters-3.0-20080904/foomatic-rip.in	2008-09-05 15:51:23.000000000 +0100
@@ -517,10 +517,10 @@ if (defined($ENV{'PRINTCAP_ENTRY'})){
 # PPD file name given via the command line
 # allow duplicates, and use the last specified one
 while ( ($spooler ne 'lprng') and ($argstr =~ s/\x01-p(\x01|)([^\x01]+)\x01/\x01/)) {
-    $ppdfile = removeshellescapes($2);
+    $ppdfile = $2;
 }
 while ($argstr =~ s/\x01--ppd(\x01|=|)([^\x01]+)\x01/\x01/) {
-    $ppdfile = removeshellescapes($2);
+    $ppdfile = $2;
 }
 
 # Check for LPD/GNUlpr by typical options which the spooler puts onto
@@ -818,7 +818,7 @@ if (($spooler eq 'lpd') ||
     ($spooler eq 'gnulpr')) {
 
     # Get PPD file name as the last command line argument
-    $ppdfile = removeshellescapes($rargs[$#rargs]);
+    $ppdfile = $rargs[$#rargs];
 
 }
 


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- foomatic.spec	4 Sep 2008 10:03:28 -0000	1.206
+++ foomatic.spec	5 Sep 2008 14:54:53 -0000	1.207
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    65%{?dist}
+Release:    66%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -32,6 +32,8 @@
 
 Patch18: foomatic-sigpipe.patch
 
+Patch19: foomatic-ppd-filenames.patch
+
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -76,6 +78,7 @@
 %patch1 -p1 -b .libdir
 %patch5 -p1 -b .fontpath
 %patch18 -p1 -b .sigpipe
+%patch19 -p1 -b .ppd-filenames
 ./make_configure
 popd
 
@@ -232,6 +235,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Fri Sep  5 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-66
+- Fixed filename handling in foomatic-rip (bug #457679).
+
 * Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-65
 - Removed ampathxml and xml-cflags patches.
 - Updated db-hpijs to 20080904.



From twaugh at fedoraproject.org  Fri Sep  5 14:56:30 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  5 Sep 2008 14:56:30 +0000 (UTC)
Subject: rpms/foomatic/F-9 foomatic-ppd-filenames.patch, NONE,
	1.1 foomatic.spec, 1.190, 1.191
Message-ID: <20080905145630.A4B6F70121@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18001

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-ppd-filenames.patch 
Log Message:
* Fri Sep  5 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-66
- Fixed filename handling in foomatic-rip (bug #457679).


foomatic-ppd-filenames.patch:

--- NEW FILE foomatic-ppd-filenames.patch ---
diff -U0 foomatic-filters-3.0-20080904/ChangeLog.ppd-filenames foomatic-filters-3.0-20080904/ChangeLog
--- foomatic-filters-3.0-20080904/ChangeLog.ppd-filenames	2008-09-04 08:20:14.000000000 +0100
+++ foomatic-filters-3.0-20080904/ChangeLog	2008-09-05 15:51:23.000000000 +0100
@@ -0,0 +1,6 @@
+2008-09-05  Till Kamppeter <till.kamppeter at gmail.com>
+
+	* foomatic-rip.in: Make foomatic-rip also working with PPD file
+	  names which contain brackets or other special characters (Bug
+	  #169).
+
diff -up foomatic-filters-3.0-20080904/foomatic-rip.in.ppd-filenames foomatic-filters-3.0-20080904/foomatic-rip.in
--- foomatic-filters-3.0-20080904/foomatic-rip.in.ppd-filenames	2008-09-05 15:49:54.000000000 +0100
+++ foomatic-filters-3.0-20080904/foomatic-rip.in	2008-09-05 15:51:23.000000000 +0100
@@ -517,10 +517,10 @@ if (defined($ENV{'PRINTCAP_ENTRY'})){
 # PPD file name given via the command line
 # allow duplicates, and use the last specified one
 while ( ($spooler ne 'lprng') and ($argstr =~ s/\x01-p(\x01|)([^\x01]+)\x01/\x01/)) {
-    $ppdfile = removeshellescapes($2);
+    $ppdfile = $2;
 }
 while ($argstr =~ s/\x01--ppd(\x01|=|)([^\x01]+)\x01/\x01/) {
-    $ppdfile = removeshellescapes($2);
+    $ppdfile = $2;
 }
 
 # Check for LPD/GNUlpr by typical options which the spooler puts onto
@@ -818,7 +818,7 @@ if (($spooler eq 'lpd') ||
     ($spooler eq 'gnulpr')) {
 
     # Get PPD file name as the last command line argument
-    $ppdfile = removeshellescapes($rargs[$#rargs]);
+    $ppdfile = $rargs[$#rargs];
 
 }
 


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-9/foomatic.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- foomatic.spec	5 Sep 2008 12:48:27 -0000	1.190
+++ foomatic.spec	5 Sep 2008 14:56:00 -0000	1.191
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    65%{?dist}
+Release:    66%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -32,6 +32,8 @@
 
 Patch18: foomatic-sigpipe.patch
 
+Patch19: foomatic-ppd-filenames.patch
+
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -76,6 +78,7 @@
 %patch1 -p1 -b .libdir
 %patch5 -p1 -b .fontpath
 %patch18 -p1 -b .sigpipe
+%patch19 -p1 -b .ppd-filenames
 ./make_configure
 popd
 
@@ -232,6 +235,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Fri Sep  5 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-66
+- Fixed filename handling in foomatic-rip (bug #457679).
+
 * Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-65
 - Removed ampathxml and xml-cflags patches.
 - Updated db-hpijs to 20080904.



From twaugh at fedoraproject.org  Fri Sep  5 14:57:07 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  5 Sep 2008 14:57:07 +0000 (UTC)
Subject: rpms/foomatic/F-8 foomatic-ppd-filenames.patch, NONE,
	1.1 foomatic.spec, 1.179, 1.180
Message-ID: <20080905145707.3F26470121@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18135

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-ppd-filenames.patch 
Log Message:
* Fri Sep  5 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-66
- Fixed filename handling in foomatic-rip (bug #457679).


foomatic-ppd-filenames.patch:

--- NEW FILE foomatic-ppd-filenames.patch ---
diff -U0 foomatic-filters-3.0-20080904/ChangeLog.ppd-filenames foomatic-filters-3.0-20080904/ChangeLog
--- foomatic-filters-3.0-20080904/ChangeLog.ppd-filenames	2008-09-04 08:20:14.000000000 +0100
+++ foomatic-filters-3.0-20080904/ChangeLog	2008-09-05 15:51:23.000000000 +0100
@@ -0,0 +1,6 @@
+2008-09-05  Till Kamppeter <till.kamppeter at gmail.com>
+
+	* foomatic-rip.in: Make foomatic-rip also working with PPD file
+	  names which contain brackets or other special characters (Bug
+	  #169).
+
diff -up foomatic-filters-3.0-20080904/foomatic-rip.in.ppd-filenames foomatic-filters-3.0-20080904/foomatic-rip.in
--- foomatic-filters-3.0-20080904/foomatic-rip.in.ppd-filenames	2008-09-05 15:49:54.000000000 +0100
+++ foomatic-filters-3.0-20080904/foomatic-rip.in	2008-09-05 15:51:23.000000000 +0100
@@ -517,10 +517,10 @@ if (defined($ENV{'PRINTCAP_ENTRY'})){
 # PPD file name given via the command line
 # allow duplicates, and use the last specified one
 while ( ($spooler ne 'lprng') and ($argstr =~ s/\x01-p(\x01|)([^\x01]+)\x01/\x01/)) {
-    $ppdfile = removeshellescapes($2);
+    $ppdfile = $2;
 }
 while ($argstr =~ s/\x01--ppd(\x01|=|)([^\x01]+)\x01/\x01/) {
-    $ppdfile = removeshellescapes($2);
+    $ppdfile = $2;
 }
 
 # Check for LPD/GNUlpr by typical options which the spooler puts onto
@@ -818,7 +818,7 @@ if (($spooler eq 'lpd') ||
     ($spooler eq 'gnulpr')) {
 
     # Get PPD file name as the last command line argument
-    $ppdfile = removeshellescapes($rargs[$#rargs]);
+    $ppdfile = $rargs[$#rargs];
 
 }
 


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-8/foomatic.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- foomatic.spec	5 Sep 2008 12:51:03 -0000	1.179
+++ foomatic.spec	5 Sep 2008 14:56:37 -0000	1.180
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    65%{?dist}
+Release:    66%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -32,6 +32,8 @@
 
 Patch18: foomatic-sigpipe.patch
 
+Patch19: foomatic-ppd-filenames.patch
+
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -76,6 +78,7 @@
 %patch1 -p1 -b .libdir
 %patch5 -p1 -b .fontpath
 %patch18 -p1 -b .sigpipe
+%patch19 -p1 -b .ppd-filenames
 ./make_configure
 popd
 
@@ -232,6 +235,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Fri Sep  5 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-66
+- Fixed filename handling in foomatic-rip (bug #457679).
+
 * Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-65
 - Removed ampathxml and xml-cflags patches.
 - Updated db-hpijs to 20080904.



From caolanm at fedoraproject.org  Fri Sep  5 15:00:26 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  5 Sep 2008 15:00:26 +0000 (UTC)
Subject: rpms/openoffice.org/devel .cvsignore, 1.185, 1.186 sources, 1.314,
	1.315
Message-ID: <20080905150026.6887F70121@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18831

Modified Files:
	.cvsignore sources 
Log Message:
next sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- .cvsignore	29 Aug 2008 21:38:33 -0000	1.185
+++ .cvsignore	5 Sep 2008 14:59:56 -0000	1.186
@@ -5,4 +5,4 @@
 redhat-templates.tar.gz
 redhat-registry.tar.gz
 redhat-langpacks.tar.gz
-OOO300_m4.tar.bz2
+OOO300_m5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- sources	29 Aug 2008 21:38:33 -0000	1.314
+++ sources	5 Sep 2008 14:59:56 -0000	1.315
@@ -5,4 +5,4 @@
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 5ff04a5d754f6770f07e679856d682f3  redhat-registry.tar.gz
 3a53d26158236a7a6a23fe836de721a8  redhat-langpacks.tar.gz
-bbd6b10fd9effa486e67ab9190779b17  OOO300_m4.tar.bz2
+cced643cb2a7261a28944b2096c1c649  OOO300_m5.tar.bz2



From caolanm at fedoraproject.org  Fri Sep  5 15:04:37 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  5 Sep 2008 15:04:37 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.cmcfixes50.patch, NONE,
	1.1 openoffice.org.spec, 1.1639,
	1.1640 openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch, 1.1,
	NONE openoffice.org-3.0.0.oooXXXXX.filter.latex.patch, 1.1,
	NONE openoffice.org-3.0.0.oooXXXXX.helpcontent2.fixlucene.patch,
	1.1, NONE
Message-ID: <20080905150437.3D50D70121@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19548

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.cmcfixes50.patch 
Removed Files:
	openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch 
	openoffice.org-3.0.0.oooXXXXX.filter.latex.patch 
	openoffice.org-3.0.0.oooXXXXX.helpcontent2.fixlucene.patch 
Log Message:
merge to workspace

workspace.cmcfixes50.patch:

--- NEW FILE workspace.cmcfixes50.patch ---
Index: source/config/fragments/fcfg_writer.mk
===================================================================
RCS file: /cvs/framework/filter/source/config/fragments/fcfg_writer.mk,v
retrieving revision 1.14.20.1
diff -u -r1.14.20.1 fcfg_writer.mk
--- openoffice.org.orig/filter/source/config/fragments/fcfg_writer.mk	15 Aug 2008 10:33:45 -0000	1.14.20.1
+++ openoffice.org/filter/source/config/fragments/fcfg_writer.mk	3 Sep 2008 14:16:49 -0000
@@ -29,9 +29,13 @@
     writer_MS_Word_2003_XML \
 	writer_MS_Word_2007_XML \
 	writer_MS_Word_2007_XML_Template \
-    MediaWiki_File \
+    MediaWiki_File
+
+.IF "$(WITH_WRITER2LATEX)" != "NO"
+T4_WRITER += \
 	LaTeX \
 	BibTeX
+.ENDIF
 
 # -----------------------------------------------
 # count = 39
@@ -63,9 +67,13 @@
     writer_web_MediaWiki_File \
     MS_Word_2003_XML \
 	MS_Word_2007_XML \
-	MS_Word_2007_XML_Template \
+	MS_Word_2007_XML_Template
+
+.IF "$(WITH_WRITER2LATEX)" != "NO"
+F4_WRITER += \
 	LaTeX_Writer \
 	BibTeX_Writer
+.ENDIF
 
 # -----------------------------------------------
 # count = 14
--- OOO300_m1.orig/helpcontent2/settings.pmk	2008-08-05 18:54:10.000000000 +0100
+++ OOO300_m1/helpcontent2/settings.pmk	2008-08-05 18:54:36.000000000 +0100
@@ -2,7 +2,7 @@
 
 my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$
 .IF "$(SYSTEM_LUCENE)" == "YES"
-my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)
+my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
 .ELSE
 my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar
 .ENDIF
Index: source/dialog/filedlghelper.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/dialog/filedlghelper.cxx,v
retrieving revision 1.144
diff -u -r1.144 filedlghelper.cxx
--- openoffiec.org.orig/sfx2/source/dialog/filedlghelper.cxx	4 Jun 2008 09:53:08 -0000	1.144
+++ openoffice.org/sfx2/source/dialog/filedlghelper.cxx	2 Sep 2008 08:24:03 -0000
@@ -1325,8 +1325,10 @@
 
 	sal_Int16 nRet = ExecutableDialogResults::CANCEL;
 
-#if !(defined(MACOSX) && defined(QUARTZ))
 //On MacOSX the native file picker has to run in the primordial thread because of drawing issues
+//On Linux the native gtk file picker, when backed by gnome-vfs2, needs to be run in the same
+//primordial thread as the ucb gnome-vfs2 provider was initialized in.
+#ifdef WNT
 	if ( mbSystemPicker )
 	{
 		PickerThread_Impl* pThread = new PickerThread_Impl( mxFileDlg );
diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.cxx fpicker/source/unx/gnome/SalGtkFilePicker.cxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.cxx	2008-09-02 09:16:04.000000000 +0100
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFilePicker.cxx	2008-09-02 09:20:51.000000000 +0100
@@ -999,13 +999,13 @@
     uno::Reference< awt::XExtendedToolkit > xToolkit(
         m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY);
 
-	RunDialog* pRunInMain = new RunDialog(m_pDialog, xToolkit);
-	uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunInMain);
+	RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit);
+	uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog);
 	while( GTK_RESPONSE_NO == btn )
 	{
 		btn = GTK_RESPONSE_YES; // we dont want to repeat unless user clicks NO for file save.
 
-        gint nStatus = pRunInMain->runandwaitforresult();
+        gint nStatus = pRunDialog->run();
 		switch( nStatus )
 		{
 			case GTK_RESPONSE_ACCEPT:
@@ -1032,9 +1032,9 @@
                                 OUStringToOString(aResProvider.getResString(FILE_PICKER_TITLE_SAVE ),
                                 RTL_TEXTENCODING_UTF8 ).getStr() );
                                  
-	                        RunDialog* pAnotherRunInMain = new RunDialog(dlg, xToolkit);
-	                        uno::Reference < awt::XTopWindowListener > xAnotherLifeCycle(pAnotherRunInMain);
-                            btn = pAnotherRunInMain->runandwaitforresult();
+	                        RunDialog* pAnotherDialog = new RunDialog(dlg, xToolkit);
+	                        uno::Reference < awt::XTopWindowListener > xAnotherLifeCycle(pAnotherDialog);
+                            btn = pAnotherDialog->run();
 
 							gtk_widget_destroy( dlg );
 						}
diff -ru fpicker.orig/source/unx/gnome/SalGtkFolderPicker.cxx fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx	2008-09-02 09:16:04.000000000 +0100
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx	2008-09-02 09:20:53.000000000 +0100
@@ -176,9 +176,9 @@
     uno::Reference< awt::XExtendedToolkit > xToolkit(
         m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY);
 
-    RunDialog* pRunInMain = new RunDialog(m_pDialog, xToolkit);
-    uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunInMain);
-    gint nStatus = pRunInMain->runandwaitforresult();
+    RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit);
+    uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog);
+    gint nStatus = pRunDialog->run();
 	switch( nStatus )
 	{
 		case GTK_RESPONSE_ACCEPT:
diff -ru fpicker.orig/source/unx/gnome/SalGtkPicker.cxx fpicker/source/unx/gnome/SalGtkPicker.cxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkPicker.cxx	2008-09-02 09:16:04.000000000 +0100
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkPicker.cxx	2008-09-02 09:20:22.000000000 +0100
@@ -124,7 +124,7 @@
 
 RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference< awt::XExtendedToolkit >& rToolkit ) :
     cppu::WeakComponentImplHelper1< awt::XTopWindowListener >( maLock ),
-    mbFinished(false), mpDialog(pDialog), mpCreatedParent(NULL), mxToolkit(rToolkit)
+    mpDialog(pDialog), mpCreatedParent(NULL), mxToolkit(rToolkit)
 {
     awt::SystemDependentXWindow aWindowHandle;
 
@@ -178,39 +178,20 @@
     gtk_widget_hide( mpDialog );
 }
 
-void RunDialog::run() 
+gint RunDialog::run() 
 { 
     if (mxToolkit.is())
         mxToolkit->addTopWindowListener(this);
 
-    mnStatus = gtk_dialog_run( GTK_DIALOG( mpDialog ) ); 
+    gint nStatus = gtk_dialog_run( GTK_DIALOG( mpDialog ) ); 
 
     if (mxToolkit.is())
         mxToolkit->removeTopWindowListener(this);
 
-
-    if (mnStatus != 1)	//PLAY
+    if (nStatus != 1)	//PLAY
         gtk_widget_hide( mpDialog );
 
-    maLock.acquire();
-    mbFinished = true;
-    maLock.release();
-
-    Application::EndYield();
-}
-
-gint RunDialog::runandwaitforresult() 
-{ 
-    g_timeout_add_full(G_PRIORITY_HIGH_IDLE, 0, (GSourceFunc)rundialog, this, NULL);
-    while (1)
-    {
-	maLock.acquire();
-    	if (mbFinished)
-            break;
-	maLock.release();
-        Application::Yield();
-    }
-    return mnStatus; 
+    return nStatus;
 }
 
 SalGtkPicker::~SalGtkPicker()
diff -ru fpicker.orig/source/unx/gnome/SalGtkPicker.hxx fpicker/source/unx/gnome/SalGtkPicker.hxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkPicker.hxx	2008-09-02 09:16:04.000000000 +0100
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkPicker.hxx	2008-09-02 09:16:49.000000000 +0100
@@ -74,8 +74,7 @@
 		static rtl::OString unicodetouri(const rtl::OUString &rURL);
 };
 
-//Run the Gtk Dialog in the "Main Thread" for us to avoid threading conflict and
-//report back to this thread. Watch for any "new windows" created while we're
+//Run the Gtk Dialog. Watch for any "new windows" created while we're
 //executing and consider that a CANCEL event to avoid e.g. "file cannot be opened"
 //modal dialogs and this one getting locked if some other API call causes this
 //to happen while we're opened waiting for user input, e.g. 
@@ -84,9 +83,7 @@
     public cppu::WeakComponentImplHelper1< ::com::sun::star::awt::XTopWindowListener >
 {
 private:
-    bool mbFinished;
     osl::Mutex maLock;
-    gint mnStatus;
     GtkWidget *mpDialog;
     GdkWindow *mpCreatedParent;
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit>  mxToolkit;
@@ -111,8 +108,7 @@
         throw (::com::sun::star::uno::RuntimeException) {}
 public:
     RunDialog(GtkWidget *pDialog, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit > &rToolkit);
-    gint runandwaitforresult();
-    void run();
+    gint run();
     void cancel();
     ~RunDialog();
 };


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1639
retrieving revision 1.1640
diff -u -r1.1639 -r1.1640
--- openoffice.org.spec	5 Sep 2008 11:57:24 -0000	1.1639
+++ openoffice.org.spec	5 Sep 2008 15:04:06 -0000	1.1640
@@ -1,6 +1,6 @@
 %define oootag OOO300
-%define ooomilestone 4
-%define rh_rpm_release 2
+%define ooomilestone 5
+%define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -104,15 +104,13 @@
 Patch34: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
 Patch35: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
 Patch36: workspace.dba301a.patch
-Patch37: openoffice.org-3.0.0.oooXXXXX.helpcontent2.fixlucene.patch
-Patch38: openoffice.org-3.0.0.ooo91904.sd.wrongindex.patch
-Patch39: workspace.fpicker8.patch
-Patch40: workspace.cmcfixes49.patch
-Patch41: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
-Patch42: openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch
-Patch43: openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
-Patch44: openoffice.org-3.0.0.oooXXXXX.filter.latex.patch
-Patch45: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
+Patch37: openoffice.org-3.0.0.ooo91904.sd.wrongindex.patch
+Patch38: workspace.fpicker8.patch
+Patch39: workspace.cmcfixes49.patch
+Patch40: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
+Patch41: openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
+Patch42: workspace.cmcfixes50.patch
+Patch43: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1288,15 +1286,13 @@
 %patch34 -p1 -b .ooo86142.serbiannumbering.patch
 %patch35 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
 %patch36 -p1 -b .workspace.dba301a.patch
-%patch37 -p1 -b .oooXXXXX.helpcontent2.fixlucene.patch
-%patch38 -p1 -b .ooo91904.sd.wrongindex.patch
-%patch39 -p1 -b .workspace.fpicker8.patch
-%patch40 -p0 -b .workspace.cmcfixes49.patch
-%patch41 -p1 -b .ooo91924.svx.consistentordering.patch
-%patch42 -p1 -b .ooo93366.fpicker_in_main.patch
-%patch43 -p1 -b .ooo93419.svx.ref_deref.before.ctored.patch
-%patch44 -p1 -b .oooXXXXX.filter.latex.patch
-%patch45 -p1 -b .ooo93515.vcl.jrb-frames.patch
+%patch37 -p1 -b .ooo91904.sd.wrongindex.patch
+%patch38 -p1 -b .workspace.fpicker8.patch
+%patch39 -p0 -b .workspace.cmcfixes49.patch
+%patch40 -p1 -b .ooo91924.svx.consistentordering.patch
+%patch41 -p1 -b .ooo93419.svx.ref_deref.before.ctored.patch
+%patch42 -p1 -b .workspace.cmcfixes50.patch
+%patch43 -p1 -b .ooo93515.vcl.jrb-frames.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3652,6 +3648,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Sep 05 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-5.1
+- next candidate
+
 * Thu Sep 04 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-4.2
 - Resolves: rhbz#460755 TryExec oowriter on brwriter.desktop etc
 - Resolves: rhbz#460883 openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch


--- openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch DELETED ---


--- openoffice.org-3.0.0.oooXXXXX.filter.latex.patch DELETED ---


--- openoffice.org-3.0.0.oooXXXXX.helpcontent2.fixlucene.patch DELETED ---



From mclasen at fedoraproject.org  Fri Sep  5 15:09:11 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  5 Sep 2008 15:09:11 +0000 (UTC)
Subject: rpms/gtk-vnc/devel .cvsignore, 1.6, 1.7 gtk-vnc.spec, 1.20,
	1.21 sources, 1.9, 1.10
Message-ID: <20080905150911.80ACD70121@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk-vnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20305

Modified Files:
	.cvsignore gtk-vnc.spec sources 
Log Message:
0.3.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-vnc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 May 2008 16:07:09 -0000	1.6
+++ .cvsignore	5 Sep 2008 15:08:41 -0000	1.7
@@ -1,4 +1 @@
-x86_64
-.build*.log
-*.rpm
-gtk-vnc-0.3.6.tar.gz
+gtk-vnc-0.3.7.tar.gz


Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-vnc/devel/gtk-vnc.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gtk-vnc.spec	28 Aug 2008 21:56:34 -0000	1.20
+++ gtk-vnc.spec	5 Sep 2008 15:08:41 -0000	1.21
@@ -6,12 +6,11 @@
 
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
-Version: 0.3.6
-Release: 4%{?dist}
+Version: 0.3.7
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch1: %{name}-%{version}-event-handlers.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gtk-vnc.sf.net/
 BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel
@@ -68,7 +67,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %if %{with_plugin}
@@ -122,6 +120,9 @@
 %endif
 
 %changelog
+* Fri Sep  5 2008 Matthias Clasen  <mclasen at redhat.com> - 0.3.7-1
+- Update to 0.3.7
+
 * Thu Aug 28 2008 Daniel P. Berrange <berrange at redhat.com> - 0.3.6-4.fc9
 - Fix key/mouse event propagation (rhbz #454627)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-vnc/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 May 2008 16:07:09 -0000	1.9
+++ sources	5 Sep 2008 15:08:41 -0000	1.10
@@ -1 +1 @@
-64650dff4850e1ca3158a3288c0e6c86  gtk-vnc-0.3.6.tar.gz
+41c613be4b554b71d63d30f844d60add  gtk-vnc-0.3.7.tar.gz



From denis at fedoraproject.org  Fri Sep  5 15:10:41 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri,  5 Sep 2008 15:10:41 +0000 (UTC)
Subject: rpms/transmission/F-8 .cvsignore, 1.16, 1.17 sources, 1.16,
	1.17 transmission.spec, 1.19,
	1.20 transmission-0.81-downloaddir.patch, 1.2,
	NONE transmission-1.05-gnusource.patch, 1.1, NONE
Message-ID: <20080905151041.CFE9D70121@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/transmission/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20658

Modified Files:
	.cvsignore sources transmission.spec 
Removed Files:
	transmission-0.81-downloaddir.patch 
	transmission-1.05-gnusource.patch 
Log Message:
- Update to upstream 1.33
- Now dual-licensed
- Gnusource and download dir patches upstreamed



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/F-8/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	24 Jul 2008 09:32:25 -0000	1.16
+++ .cvsignore	5 Sep 2008 15:10:11 -0000	1.17
@@ -1 +1 @@
-transmission-1.22.tar.bz2
+transmission-1.33.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/F-8/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	24 Jul 2008 09:32:25 -0000	1.16
+++ sources	5 Sep 2008 15:10:11 -0000	1.17
@@ -1 +1 @@
-aa0a2db19b0f3dbfd75a0fb354d6c47d  transmission-1.22.tar.bz2
+097a538a10e41c9e631ef23b11a2ddfa  transmission-1.33.tar.bz2


Index: transmission.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/F-8/transmission.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- transmission.spec	24 Jul 2008 09:32:25 -0000	1.19
+++ transmission.spec	5 Sep 2008 15:10:11 -0000	1.20
@@ -1,20 +1,18 @@
 
 Name:           transmission
-Version:        1.22
+Version:        1.33
 Release:        1%{?dist}
 Summary:        A lightweight GTK+ BitTorrent client
 
 Group:          Applications/Internet
-License:        MIT
+License:        MIT, GPLv2+
 URL:            http://www.transmissionbt.com/
 Source0:        http://download.m0k.org/transmission/files/transmission-%{version}.tar.bz2
-Patch0:         transmission-0.81-downloaddir.patch
-Patch1:         transmission-1.05-gnusource.patch
 Patch2:         transmission-1.11-copt.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel >= 0.9.4
-BuildRequires:  glib2-devel >= 2.15.5
+BuildRequires:  glib2-devel >= 2.6.0
 BuildRequires:  gtk2-devel >= 2.6.0
 BuildRequires:  libnotify-devel >= 0.4.4
 BuildRequires:  curl-devel >= 7.15.0
@@ -31,8 +29,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .dwnldir
-%patch1 -p1 -b .gnusrc
 %patch2 -p1 -b .copt
 
 
@@ -66,9 +62,9 @@
 
 %files -f %{name}.lang
 %defattr(-, root, root, -)
-%doc AUTHORS LICENSE NEWS README
+%doc AUTHORS COPYING NEWS README
 %{_bindir}/transmission*
-%{_bindir}/benc2php
+%{_datadir}/transmission
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/hicolor/*/apps/transmission.*
 %{_datadir}/applications/*transmission.desktop
@@ -76,6 +72,11 @@
 
 
 %changelog
+* Fri Sep  5 2008 Denis Leroy <denis at poolshark.org> - 1.33-1
+- Update to upstream 1.33
+- Now dual-licensed
+- Gnusource and download dir patches upstreamed
+
 * Thu Jul 24 2008 Denis Leroy <denis at poolshark.org> - 1.22-1
 - Update to upstream 1.22
 


--- transmission-0.81-downloaddir.patch DELETED ---


--- transmission-1.05-gnusource.patch DELETED ---



From pingou at fedoraproject.org  Fri Sep  5 15:19:12 2008
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Fri,  5 Sep 2008 15:19:12 +0000 (UTC)
Subject: rpms/R-affyio/devel .cvsignore, 1.3, 1.4 R-affyio.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20080905151913.0162F70121@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-affyio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22154

Modified Files:
	.cvsignore R-affyio.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 May 2008 07:56:15 -0000	1.3
+++ .cvsignore	5 Sep 2008 15:18:42 -0000	1.4
@@ -1 +1 @@
-affyio_1.8.0.tar.gz
+affyio_1.8.1.tar.gz


Index: R-affyio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/devel/R-affyio.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- R-affyio.spec	2 May 2008 07:56:15 -0000	1.4
+++ R-affyio.spec	5 Sep 2008 15:18:42 -0000	1.5
@@ -2,7 +2,7 @@
 %define bioc      2.2
 
 Name:             R-%{packname}
-Version:          1.8.0 
+Version:          1.8.1 
 Release:          1%{?dist}
 Summary:          Tools for parsing Affymetrix data files
 Summary(fr):      Outils d'analyse de fichier de donn??es de puces affymetrix
@@ -71,6 +71,9 @@
 %{_libdir}/R/library/%{packname}/libs/affyio.so
 
 %changelog
+* Fri Sep 05 2008 pingou <pingoufc4-at-yahoo.fr> 1.8.1-1
+- Update to version 1.8.1
+
 * Fri May 02 2008 Pingou <pingoufc4 at yahoo.fr> 1.8.0-1
 - Update to bioconductor 2.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 May 2008 07:56:15 -0000	1.3
+++ sources	5 Sep 2008 15:18:42 -0000	1.4
@@ -1 +1 @@
-3482df4371b79bf92fa4419ece0987ab  affyio_1.8.0.tar.gz
+a51e414adc3ad9739a524ac52ce0604e  affyio_1.8.1.tar.gz



From rstrode at fedoraproject.org  Fri Sep  5 15:29:53 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri,  5 Sep 2008 15:29:53 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec, 1.45, 1.46 sources, 1.17,
	1.18 escape-sends-empty-password.patch, 1.1,
	NONE fix-text-plugin-crasher.patch, 1.1, NONE
Message-ID: <20080905152953.4FAAD70121@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23433

Modified Files:
	plymouth.spec sources 
Removed Files:
	escape-sends-empty-password.patch 
	fix-text-plugin-crasher.patch 
Log Message:
- Fix some confusion with password handling in details plugin



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- plymouth.spec	27 Aug 2008 20:18:54 -0000	1.45
+++ plymouth.spec	5 Sep 2008 15:29:22 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: Plymouth Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.6.0
-Release: 0.2008.08.27.2%{?dist}
+Release: 0.2008.09.05.1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -9,8 +9,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: plymouth-0.5.0-textbar-hotness.patch
-Patch1: fix-text-plugin-crasher.patch
-Patch2: escape-sends-empty-password.patch
 
 Obsoletes: rhgb < 1:10.0.0
 Provides: rhgb = 1:10.0.0
@@ -108,8 +106,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .textbar
-%patch1 -p1 -b .fix-text-plugin-crasher
-%patch2 -p1 -b .escape-sends-empty-password
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -230,8 +226,8 @@
 %{_libdir}/plymouth/spinfinity.so
 
 %changelog
-* Wed Aug 27 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.08.27.2
-- If user hits escape, send "" as the password (bug 459111)
+* Fri Sep  5 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.05.1
+- Fix some confusion with password handling in details plugin
 
 * Wed Aug 27 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.08.27.1
 - Fix another crasher for users with encrypted disks (this time in


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	27 Aug 2008 16:16:23 -0000	1.17
+++ sources	5 Sep 2008 15:29:23 -0000	1.18
@@ -1 +1 @@
-3c3a0172f6ebc51a01e194caa9720cb3  plymouth-0.6.0.tar.bz2
+67a3e4a19ebf0c802d43d12a11fd8e9c  plymouth-0.6.0.tar.bz2


--- escape-sends-empty-password.patch DELETED ---


--- fix-text-plugin-crasher.patch DELETED ---



From pvrabec at fedoraproject.org  Fri Sep  5 15:32:25 2008
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Fri,  5 Sep 2008 15:32:25 +0000 (UTC)
Subject: rpms/sectool/devel .cvsignore, 1.12, 1.13 sectool.spec, 1.14,
	1.15 sources, 1.12, 1.13
Message-ID: <20080905153225.4B92170121@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/sectool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24297

Modified Files:
	.cvsignore sectool.spec sources 
Log Message:
upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sectool/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	24 Jul 2008 15:28:53 -0000	1.12
+++ .cvsignore	5 Sep 2008 15:31:54 -0000	1.13
@@ -1 +1 @@
-sectool-0.8.5.tar.bz2
+sectool-0.8.6.tar.bz2


Index: sectool.spec
===================================================================
RCS file: /cvs/extras/rpms/sectool/devel/sectool.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sectool.spec	24 Jul 2008 15:28:53 -0000	1.14
+++ sectool.spec	5 Sep 2008 15:31:54 -0000	1.15
@@ -1,12 +1,13 @@
 Summary: A security audit system and intrusion detection system
 Name: sectool
-Version: 0.8.5
+Version: 0.8.6
 Release: 1%{?dist}
 URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart
 Source0: %{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: Applications/System
-Requires: python2 gettext coreutils rpm-python
+Requires: gettext coreutils  libselinux
+Requires: python2 rpm-python libselinux-python
 BuildRequires: desktop-file-utils gettext intltool rpm-devel asciidoc
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -92,11 +93,8 @@
 
 
 %changelog
-* Thu Jul 24 2008 Peter Vrabec <pvrabec at redhat.com> - 0.8.5-1
-- upgrade
-
-* Fri Jul 18 2008 Caol??n McNamara <caolanm at redhat.com> - 0.8.0-2
-- rebuild for new rpm
+* Fri Sep 05 2008 Peter Vrabec <pvrabec at redhat.com> - 0.8.6-1
+- upgrade, see changelog
 
 * Thu Jul 03 2008 Peter Vrabec <pvrabec at redhat.com> - 0.8.0-1
 - upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sectool/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	24 Jul 2008 15:28:53 -0000	1.12
+++ sources	5 Sep 2008 15:31:54 -0000	1.13
@@ -1 +1 @@
-3e155945378b8c44ea0bff85fb66f38b  sectool-0.8.5.tar.bz2
+183812a2126857974064e9fbac1b4ba2  sectool-0.8.6.tar.bz2



From pingou at fedoraproject.org  Fri Sep  5 15:34:50 2008
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Fri,  5 Sep 2008 15:34:50 +0000 (UTC)
Subject: rpms/R-affyio/F-9 R-affyio.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <20080905153450.2064E70121@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-affyio/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24834

Modified Files:
	R-affyio.spec sources 
Log Message:



Index: R-affyio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/F-9/R-affyio.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- R-affyio.spec	25 Jun 2008 07:59:22 -0000	1.4
+++ R-affyio.spec	5 Sep 2008 15:34:19 -0000	1.5
@@ -2,15 +2,15 @@
 %define bioc      2.2
 
 Name:             R-%{packname}
-Version:          1.8.0 
+Version:          1.8.1 
 Release:          1%{?dist}
 Summary:          Tools for parsing Affymetrix data files
 Summary(fr):      Outils d'analyse de fichier de donn??es de puces affymetrix
 
 Group:            Applications/Engineering
 License:          LGPLv2+
-URL:              http://bioconductor.org/packages/%{bioc}/bioc/html/affyio.html
-Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz 
+URL:              http://bioconductor.org/packages/2.2/bioc/html/affyio.html
+Source0:          http://www.bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   R
@@ -71,8 +71,11 @@
 %{_libdir}/R/library/%{packname}/libs/affyio.so
 
 %changelog
-* Wed Jun 25 2008 pingou <pingoufc4-at-yahoo.fr> 1.8.0-1
-- Update to version 1.8.0
+* Fri Sep 05 2008 pingou <pingoufc4-at-yahoo.fr> 1.8.1-1
+- Update to version 1.8.1
+
+* Fri May 02 2008 Pingou <pingoufc4 at yahoo.fr> 1.8.0-1
+- Update to bioconductor 2.2
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.6.1-3
 - Autorebuild for GCC 4.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Jun 2008 07:59:22 -0000	1.3
+++ sources	5 Sep 2008 15:34:19 -0000	1.4
@@ -1 +1 @@
-3482df4371b79bf92fa4419ece0987ab  affyio_1.8.0.tar.gz
+a51e414adc3ad9739a524ac52ce0604e  affyio_1.8.1.tar.gz



From spot at fedoraproject.org  Fri Sep  5 15:48:08 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  5 Sep 2008 15:48:08 +0000 (UTC)
Subject: rpms/splint/devel splint.spec,1.10,1.11
Message-ID: <20080905154808.4429E70121@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/splint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27825

Modified Files:
	splint.spec 
Log Message:
fix license tag


Index: splint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/splint/devel/splint.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- splint.spec	12 Jul 2008 18:59:32 -0000	1.10
+++ splint.spec	5 Sep 2008 15:47:37 -0000	1.11
@@ -1,10 +1,10 @@
 Name:           splint
 Version:        3.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An implementation of the lint program
 
 Group:          Development/Tools
-License:        GPL
+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)
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.1.2-2
+- fix license tag
+
 * Sat Jul 12 2008 Panu Matilainen <pmatilai at redhat.com> - 3.1.2-1
 - update to 3.1.2
 



From spot at fedoraproject.org  Fri Sep  5 15:54:03 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  5 Sep 2008 15:54:03 +0000 (UTC)
Subject: rpms/sqlgrey/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 sqlgrey-1.7.4-warnings.patch, 1.1, 1.2 sqlgrey.spec, 1.2, 1.3
Message-ID: <20080905155403.766F770121@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sqlgrey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29311

Modified Files:
	.cvsignore sources sqlgrey-1.7.4-warnings.patch sqlgrey.spec 
Log Message:
fix license tag


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sqlgrey/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Mar 2007 15:14:51 -0000	1.3
+++ .cvsignore	5 Sep 2008 15:53:33 -0000	1.4
@@ -1 +1 @@
-sqlgrey-1.7.5.tar.bz2
+sqlgrey-1.7.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sqlgrey/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Mar 2007 15:14:51 -0000	1.3
+++ sources	5 Sep 2008 15:53:33 -0000	1.4
@@ -1 +1 @@
-53d6c3f318af8ffdd176361242268309  sqlgrey-1.7.5.tar.bz2
+1e7e5e3ed5f02b29f71ef4e26edc1c36  sqlgrey-1.7.6.tar.bz2

sqlgrey-1.7.4-warnings.patch:

Index: sqlgrey-1.7.4-warnings.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sqlgrey/devel/sqlgrey-1.7.4-warnings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sqlgrey-1.7.4-warnings.patch	19 Dec 2006 01:58:48 -0000	1.1
+++ sqlgrey-1.7.4-warnings.patch	5 Sep 2008 15:53:33 -0000	1.2
@@ -1,18 +1,19 @@
---- sqlgrey-1.7.4/sqlgrey.orig	2006-08-02 21:33:43.000000000 -0500
-+++ sqlgrey-1.7.4/sqlgrey	2006-12-12 15:13:07.000000000 -0600
-@@ -815,6 +815,7 @@
-         $self->mylog('dbaccess', 3, "Read_hosts: ".join(', ', @read_hosts)); 
-         
+diff -up sqlgrey-1.7.6/sqlgrey.orig sqlgrey-1.7.6/sqlgrey
+--- sqlgrey-1.7.6/sqlgrey.orig	2007-08-05 16:41:01.000000000 -0400
++++ sqlgrey-1.7.6/sqlgrey	2008-09-05 11:50:07.000000000 -0400
+@@ -827,6 +827,7 @@ sub connectdb($) {
+         $self->mylog('dbaccess', 3, "Read_hosts: ".join(', ', @read_hosts));
+ 
  	#Setting up cluster db's
 +        no warnings 'once';
      	$DBIx::DBCluster::CLUSTERS = {
          		"$self->{sqlgrey}{db_host}" => {
              		'WRITE_HOSTS'  => [$self->{sqlgrey}{db_host}],
-@@ -2410,6 +2411,7 @@
+@@ -2447,6 +2448,7 @@ sub main()
      no warnings 'uninitialized'; #Perl will spew warn's if running DBI only
      if ($dflt{db_cluster} eq 'on') {
-             #if loglevel >= 4, enable debugging for DBCluster
+             # if loglevel >= 4, enable debugging for DBCluster
 +            no warnings 'once';
              $DBIx::DBCluster::DEBUG = ($dflt{'loglevel'}>3)?1:0;
  
-             if ((defined $HOSTNAME) && (defined $dflt{db_cleanup_hostname})) {
+             # Ugly hack to make perl shut up about about "possible typo".


Index: sqlgrey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlgrey/devel/sqlgrey.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sqlgrey.spec	13 Mar 2007 15:14:51 -0000	1.2
+++ sqlgrey.spec	5 Sep 2008 15:53:33 -0000	1.3
@@ -1,9 +1,9 @@
 Name:           sqlgrey
-Version:        1.7.5
+Version:        1.7.6
 Release:        1%{?dist}
 Summary:        Postfix grey-listing policy service
 Group:          System Environment/Daemons
-License:        GPL
+License:        GPLv2+
 URL:            http://sqlgrey.sourceforge.net/
 Source0:        http://dl.sourceforge.net/sqlgrey/sqlgrey-%{version}.tar.bz2
 Source1:        sqlgrey.init
@@ -82,6 +82,10 @@
 fi
 
 %changelog
+* Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.7.6-1
+- fix license tag
+- update to 1.7.6
+
 * Mon Mar 12 2007 Steven Pritchard <steve at kspei.com> 1.7.5-1
 - Update to 1.7.5
 - Drop fedora-usermgmt requirement



From pghmcfc at fedoraproject.org  Fri Sep  5 16:02:07 2008
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Fri,  5 Sep 2008 16:02:07 +0000 (UTC)
Subject: rpms/perl-MIME-Lite/devel perl-MIME-Lite.spec,1.6,1.7
Message-ID: <20080905160207.188A670121@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-MIME-Lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31613

Modified Files:
	perl-MIME-Lite.spec 
Log Message:
* Fri Sep  2 2008 Paul Howarth <paul at city-fan.org> 3.01-7
- fix FTBFS (#449558)



Index: perl-MIME-Lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MIME-Lite/devel/perl-MIME-Lite.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-MIME-Lite.spec	2 Feb 2008 19:23:13 -0000	1.6
+++ perl-MIME-Lite.spec	5 Sep 2008 16:01:36 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-MIME-Lite
 Version:        3.01
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        MIME::Lite - low-calorie MIME generator
 
 Group:          Development/Libraries
@@ -11,8 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl >= 1:5.6.1
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 MIME::Lite is intended as a simple, standalone module for generating (not 
@@ -34,10 +33,10 @@
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
   -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
 
 
-%check || :
+%check
 make test
 
 
@@ -53,6 +52,9 @@
 
 
 %changelog
+* Fri Sep  2 2008 Paul Howarth <paul at city-fan.org> 3.01-7
+- fix FTBFS (#449558)
+
 * Sat Feb  2 2008 Tom "spot" Callaway <tcallawa at redhat.com> 3.01-6
 - rebuild for new perl
 



From denis at fedoraproject.org  Fri Sep  5 16:04:57 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri,  5 Sep 2008 16:04:57 +0000 (UTC)
Subject: rpms/soundconverter/F-9 .cvsignore, 1.11, 1.12 soundconverter.spec, 
	1.16, 1.17 sources, 1.11, 1.12
Message-ID: <20080905160457.1078970121@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/soundconverter/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32372

Modified Files:
	.cvsignore soundconverter.spec sources 
Log Message:
Update to upstream 1.3.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/soundconverter/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	11 Jan 2008 00:17:07 -0000	1.11
+++ .cvsignore	5 Sep 2008 16:04:26 -0000	1.12
@@ -1 +1 @@
-soundconverter-0.9.8.tar.gz
+soundconverter-1.3.2.tar.gz


Index: soundconverter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soundconverter/F-9/soundconverter.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- soundconverter.spec	11 Jan 2008 00:17:07 -0000	1.16
+++ soundconverter.spec	5 Sep 2008 16:04:26 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           soundconverter
-Version:        0.9.8
+Version:        1.3.2
 Release:        1%{?dist}
 Summary:        A simple sound converter application for GNOME
 
@@ -12,11 +12,11 @@
 BuildArch:      noarch
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  pygtk2 >= 2.10
+BuildRequires:  pygtk2 >= 2.8
 BuildRequires:  intltool gettext
-BuildRequires:  gnome-python2-devel >= 2.10
+BuildRequires:  gnome-python2-devel >= 2.8
 
-Requires:       pygtk2 >= 2.10
+Requires:       pygtk2 >= 2.8
 Requires:       gstreamer-python
 Requires:       gstreamer-plugins-base
 Requires:       gstreamer-plugins-good
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Fri Sep  5 2008 Denis Leroy <denis at poolshark.org> - 1.3.2-1
+- Update to upstream 1.3.2
+
 * Fri Jan 11 2008 Denis Leroy <denis at poolshark.org> - 0.9.8-1
 - Update to upstream 0.9.8, bugfix release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/soundconverter/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	11 Jan 2008 00:17:07 -0000	1.11
+++ sources	5 Sep 2008 16:04:26 -0000	1.12
@@ -1 +1 @@
-35e9f3e2345c336aea83e298f8a1a38b  soundconverter-0.9.8.tar.gz
+9839b348c9cd7564fcd1cf10b34112df  soundconverter-1.3.2.tar.gz



From denis at fedoraproject.org  Fri Sep  5 16:06:58 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri,  5 Sep 2008 16:06:58 +0000 (UTC)
Subject: rpms/soundconverter/F-8 .cvsignore, 1.11, 1.12 soundconverter.spec, 
	1.16, 1.17 sources, 1.11, 1.12
Message-ID: <20080905160658.9327270121@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/soundconverter/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv570

Modified Files:
	.cvsignore soundconverter.spec sources 
Log Message:
Update to upstream 1.3.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/soundconverter/F-8/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	11 Jan 2008 00:13:35 -0000	1.11
+++ .cvsignore	5 Sep 2008 16:06:28 -0000	1.12
@@ -1 +1 @@
-soundconverter-0.9.8.tar.gz
+soundconverter-1.3.2.tar.gz


Index: soundconverter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soundconverter/F-8/soundconverter.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- soundconverter.spec	11 Jan 2008 00:13:35 -0000	1.16
+++ soundconverter.spec	5 Sep 2008 16:06:28 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           soundconverter
-Version:        0.9.8
+Version:        1.3.2
 Release:        1%{?dist}
 Summary:        A simple sound converter application for GNOME
 
@@ -12,11 +12,11 @@
 BuildArch:      noarch
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  pygtk2 >= 2.10
+BuildRequires:  pygtk2 >= 2.8
 BuildRequires:  intltool gettext
-BuildRequires:  gnome-python2-devel >= 2.10
+BuildRequires:  gnome-python2-devel >= 2.8
 
-Requires:       pygtk2 >= 2.10
+Requires:       pygtk2 >= 2.8
 Requires:       gstreamer-python
 Requires:       gstreamer-plugins-base
 Requires:       gstreamer-plugins-good
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Fri Sep  5 2008 Denis Leroy <denis at poolshark.org> - 1.3.2-1
+- Update to upstream 1.3.2
+
 * Fri Jan 11 2008 Denis Leroy <denis at poolshark.org> - 0.9.8-1
 - Update to upstream 0.9.8, bugfix release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/soundconverter/F-8/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	11 Jan 2008 00:13:35 -0000	1.11
+++ sources	5 Sep 2008 16:06:28 -0000	1.12
@@ -1 +1 @@
-35e9f3e2345c336aea83e298f8a1a38b  soundconverter-0.9.8.tar.gz
+9839b348c9cd7564fcd1cf10b34112df  soundconverter-1.3.2.tar.gz



From remi at fedoraproject.org  Fri Sep  5 16:07:23 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Fri,  5 Sep 2008 16:07:23 +0000 (UTC)
Subject: rpms/php-pear-Net-DIME/devel .cvsignore, 1.4,
	1.5 php-pear-Net-DIME.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20080905160723.AB04F70121@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-DIME/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv719

Modified Files:
	.cvsignore php-pear-Net-DIME.spec sources 
Log Message:
update to 1.0.1 - bugfix


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-DIME/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Aug 2008 16:11:40 -0000	1.4
+++ .cvsignore	5 Sep 2008 16:06:53 -0000	1.5
@@ -1 +1 @@
-Net_DIME-1.0.0.tgz
+Net_DIME-1.0.1.tgz


Index: php-pear-Net-DIME.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-DIME/devel/php-pear-Net-DIME.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pear-Net-DIME.spec	29 Aug 2008 16:19:07 -0000	1.5
+++ php-pear-Net-DIME.spec	5 Sep 2008 16:06:53 -0000	1.6
@@ -4,8 +4,8 @@
 # define beta RC1
 
 Name:           php-pear-Net-DIME
-Version:        1.0.0
-Release:        2%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        Implements Direct Internet Message Encapsulation (DIME)
 
 Group:          Development/Libraries
@@ -82,10 +82,14 @@
 
 
 %changelog
+* Fri Sep 05 2008 Remi Collet <Fedora at FamilleCollet.com> 1.0.1-1
+- update to 1.0.1
+
 * Fri Aug 29 2008 Remi Collet <Fedora at FamilleCollet.com> 1.0.0-2
 - fix Source0
 
 * Fri Aug 29 2008 Remi Collet <Fedora at FamilleCollet.com> 1.0.0-1
+- update to 1.0.0
 - Switched license to BSD License
 
 * Fri Aug  8 2008 Remi Collet <Fedora at FamilleCollet.com> 1.0.0-0.1.RC1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-DIME/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Aug 2008 16:11:40 -0000	1.4
+++ sources	5 Sep 2008 16:06:53 -0000	1.5
@@ -1 +1 @@
-9cfec466f8ecfe3be3bc9b3b8b305e11  Net_DIME-1.0.0.tgz
+e922fd45f2983dd92d682f3c07103e19  Net_DIME-1.0.1.tgz



From pingou at fedoraproject.org  Fri Sep  5 15:40:03 2008
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Fri,  5 Sep 2008 15:40:03 +0000 (UTC)
Subject: rpms/R-affyio/F-8 R-affyio.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20080905154003.4BA5D70121@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-affyio/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26124

Modified Files:
	R-affyio.spec sources 
Log Message:



Index: R-affyio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/F-8/R-affyio.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- R-affyio.spec	25 Jun 2008 08:04:58 -0000	1.2
+++ R-affyio.spec	5 Sep 2008 15:39:32 -0000	1.3
@@ -2,15 +2,15 @@
 %define bioc      2.2
 
 Name:             R-%{packname}
-Version:          1.8.0 
+Version:          1.8.1 
 Release:          1%{?dist}
 Summary:          Tools for parsing Affymetrix data files
 Summary(fr):      Outils d'analyse de fichier de donn??es de puces affymetrix
 
 Group:            Applications/Engineering
 License:          LGPLv2+
-URL:              http://bioconductor.org/packages/%{bioc}/bioc/html/affyio.html
-Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz 
+URL:              http://bioconductor.org/packages/2.2/bioc/html/affyio.html
+Source0:          http://www.bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   R
@@ -71,8 +71,11 @@
 %{_libdir}/R/library/%{packname}/libs/affyio.so
 
 %changelog
-* Wed Jun 25 2008 pingou <pingoufc4-at-yahoo.fr> 1.8.0-1
-- Update to version 1.8.0
+* Fri Sep 05 2008 pingou <pingoufc4-at-yahoo.fr> 1.8.1-1
+- Update to version 1.8.1
+
+* Fri May 02 2008 Pingou <pingoufc4 at yahoo.fr> 1.8.0-1
+- Update to bioconductor 2.2
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.6.1-3
 - Autorebuild for GCC 4.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Jun 2008 08:04:58 -0000	1.3
+++ sources	5 Sep 2008 15:39:33 -0000	1.4
@@ -1 +1 @@
-3482df4371b79bf92fa4419ece0987ab  affyio_1.8.0.tar.gz
+a51e414adc3ad9739a524ac52ce0604e  affyio_1.8.1.tar.gz



From remi at fedoraproject.org  Fri Sep  5 16:17:32 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Fri,  5 Sep 2008 16:17:32 +0000 (UTC)
Subject: rpms/php-pear-Net-DIME/F-9 php-pear-Net-DIME.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <20080905161732.AD52C70121@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-DIME/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3046

Modified Files:
	php-pear-Net-DIME.spec sources 
Log Message:
update to 1.0.1 - bugfix


Index: php-pear-Net-DIME.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-DIME/F-9/php-pear-Net-DIME.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-Net-DIME.spec	29 Aug 2008 16:24:25 -0000	1.3
+++ php-pear-Net-DIME.spec	5 Sep 2008 16:17:02 -0000	1.4
@@ -4,8 +4,8 @@
 # define beta RC1
 
 Name:           php-pear-Net-DIME
-Version:        1.0.0
-Release:        2%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        Implements Direct Internet Message Encapsulation (DIME)
 
 Group:          Development/Libraries
@@ -82,10 +82,14 @@
 
 
 %changelog
+* Fri Sep 05 2008 Remi Collet <Fedora at FamilleCollet.com> 1.0.1-1
+- update to 1.0.1
+
 * Fri Aug 29 2008 Remi Collet <Fedora at FamilleCollet.com> 1.0.0-2
 - fix Source0
 
 * Fri Aug 29 2008 Remi Collet <Fedora at FamilleCollet.com> 1.0.0-1
+- update to 1.0.0
 - Switched license to BSD License
 
 * Fri Aug  8 2008 Remi Collet <Fedora at FamilleCollet.com> 1.0.0-0.1.RC1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-DIME/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Aug 2008 16:24:25 -0000	1.4
+++ sources	5 Sep 2008 16:17:02 -0000	1.5
@@ -1 +1 @@
-9cfec466f8ecfe3be3bc9b3b8b305e11  Net_DIME-1.0.0.tgz
+e922fd45f2983dd92d682f3c07103e19  Net_DIME-1.0.1.tgz



From ausil at fedoraproject.org  Fri Sep  5 16:22:04 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri,  5 Sep 2008 16:22:04 +0000 (UTC)
Subject: rpms/twinkle/F-9 sources, 1.6, 1.7 twinkle.spec, 1.14,
	1.15 twinkle-1.2-gcc43.patch, 1.1,
	NONE twinkle-1.2-zrtpgcc43.patch, 1.1, NONE
Message-ID: <20080905162204.F2F0A70121@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/twinkle/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4000

Modified Files:
	sources twinkle.spec 
Removed Files:
	twinkle-1.2-gcc43.patch twinkle-1.2-zrtpgcc43.patch 
Log Message:
update to 1.3.2



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/twinkle/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Mar 2008 01:19:05 -0000	1.6
+++ sources	5 Sep 2008 16:21:34 -0000	1.7
@@ -1 +1 @@
-5f396d9367d7260732298c821639773b  twinkle-1.2.tar.gz
+8bafa14baeafc47be43c59fefc836c63  twinkle-1.3.2.tar.gz


Index: twinkle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/twinkle/F-9/twinkle.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- twinkle.spec	11 Jul 2008 22:19:29 -0000	1.14
+++ twinkle.spec	5 Sep 2008 16:21:34 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           twinkle
-Version:        1.2
-Release:        3%{?dist}
+Version:        1.3.2
+Release:        1%{?dist}
 Summary:        A SIP Soft Phone
 
 Group:          Applications/Internet
@@ -8,8 +8,6 @@
 URL:            http://www.twinklephone.com
 Source0:        http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz
 Patch0:         twinkle-1.1-msg.patch
-Patch1:		twinkle-1.2-gcc43.patch
-Patch2:		twinkle-1.2-zrtpgcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: commoncpp2-devel
@@ -18,11 +16,11 @@
 BuildRequires: speex-devel
 BuildRequires: boost-devel
 BuildRequires: desktop-file-utils
-BuildRequires: bind-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: kdelibs3-devel
 BuildRequires: bison
 BuildRequires: libzrtpcpp-devel
+BuildRequires: file-devel
 
 %description
 Twinkle is a SIP based soft phone for making telephone calls over IP networks.
@@ -30,8 +28,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .msg
-%patch1 -p1 -b .gcc43
-%patch2 -p1 -b .zrtpgcc43
 
 %build
 %configure
@@ -64,6 +60,9 @@
 %{_datadir}/applications/fedora-twinkle.desktop
 
 %changelog
+* Tue Sep 02 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-1
+- Update to 1.3.2
+
 * Mon Jun 30 2008 Kevin Fenzi <kevin at tummy.com> - 1.2-3
 - Rebuild with libzrtpcpp
 


--- twinkle-1.2-gcc43.patch DELETED ---


--- twinkle-1.2-zrtpgcc43.patch DELETED ---



From remi at fedoraproject.org  Fri Sep  5 16:25:17 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Fri,  5 Sep 2008 16:25:17 +0000 (UTC)
Subject: rpms/php-pear-Net-DIME/F-8 php-pear-Net-DIME.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <20080905162517.5EA3670121@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-DIME/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4712

Modified Files:
	php-pear-Net-DIME.spec sources 
Log Message:
update to 1.0.1 - bugfix


Index: php-pear-Net-DIME.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-DIME/F-8/php-pear-Net-DIME.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-Net-DIME.spec	29 Aug 2008 16:28:39 -0000	1.3
+++ php-pear-Net-DIME.spec	5 Sep 2008 16:24:46 -0000	1.4
@@ -4,8 +4,8 @@
 # define beta RC1
 
 Name:           php-pear-Net-DIME
-Version:        1.0.0
-Release:        2%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        Implements Direct Internet Message Encapsulation (DIME)
 
 Group:          Development/Libraries
@@ -82,10 +82,14 @@
 
 
 %changelog
+* Fri Sep 05 2008 Remi Collet <Fedora at FamilleCollet.com> 1.0.1-1
+- update to 1.0.1
+
 * Fri Aug 29 2008 Remi Collet <Fedora at FamilleCollet.com> 1.0.0-2
 - fix Source0
 
 * Fri Aug 29 2008 Remi Collet <Fedora at FamilleCollet.com> 1.0.0-1
+- update to 1.0.0
 - Switched license to BSD License
 
 * Fri Aug  8 2008 Remi Collet <Fedora at FamilleCollet.com> 1.0.0-0.1.RC1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-DIME/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Aug 2008 16:28:39 -0000	1.4
+++ sources	5 Sep 2008 16:24:46 -0000	1.5
@@ -1 +1 @@
-9cfec466f8ecfe3be3bc9b3b8b305e11  Net_DIME-1.0.0.tgz
+e922fd45f2983dd92d682f3c07103e19  Net_DIME-1.0.1.tgz



From berrange at fedoraproject.org  Fri Sep  5 16:26:59 2008
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Fri,  5 Sep 2008 16:26:59 +0000 (UTC)
Subject: rpms/perl-Class-MethodMaker/F-9 .cvsignore, 1.7,
	1.8 perl-Class-MethodMaker.spec, 1.15, 1.16 sources, 1.7, 1.8
Message-ID: <20080905162659.4085F70126@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/extras/rpms/perl-Class-MethodMaker/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5229

Modified Files:
	.cvsignore perl-Class-MethodMaker.spec sources 
Log Message:
Update to 2.12 for rhbz #461285


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jul 2008 16:25:38 -0000	1.7
+++ .cvsignore	5 Sep 2008 16:26:28 -0000	1.8
@@ -1 +1,3 @@
-Class-MethodMaker-2.11.tar.gz
+Class-MethodMaker-2.12.tar.gz
+.build*.log
+*.rpm


Index: perl-Class-MethodMaker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/F-9/perl-Class-MethodMaker.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-Class-MethodMaker.spec	18 Jul 2008 16:25:38 -0000	1.15
+++ perl-Class-MethodMaker.spec	5 Sep 2008 16:26:28 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           perl-Class-MethodMaker
-Version:        2.11
+Version:        2.12
 Release:        1%{?dist}
 Summary:        Perl module for creating generic object-oriented methods
 
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Sep  5 2008 Daniel P. Berrange <berrange at redhat.com> - 2.12-1
+- Update to new release for rhbz #461285
+
 * Fri Jul 18 2008 Ralf Cors??pius <rc040203 at freenet.de> - 2.11-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jul 2008 16:25:38 -0000	1.7
+++ sources	5 Sep 2008 16:26:28 -0000	1.8
@@ -1 +1 @@
-61ed8327e50b99e574c5f5ce1a835d36  Class-MethodMaker-2.11.tar.gz
+2194eda77e0d1b4555d4084a2d2cf24f  Class-MethodMaker-2.12.tar.gz



From berrange at fedoraproject.org  Fri Sep  5 16:31:43 2008
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Fri,  5 Sep 2008 16:31:43 +0000 (UTC)
Subject: rpms/perl-Class-MethodMaker/devel .cvsignore, 1.7,
	1.8 perl-Class-MethodMaker.spec, 1.15, 1.16 sources, 1.7, 1.8
Message-ID: <20080905163143.5933F70121@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/extras/rpms/perl-Class-MethodMaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6387

Modified Files:
	.cvsignore perl-Class-MethodMaker.spec sources 
Log Message:
Update to 2.12 for rhbz #461285


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jul 2008 13:05:51 -0000	1.7
+++ .cvsignore	5 Sep 2008 16:31:12 -0000	1.8
@@ -1 +1,3 @@
-Class-MethodMaker-2.11.tar.gz
+Class-MethodMaker-2.12.tar.gz
+.build*.log
+*.rpm


Index: perl-Class-MethodMaker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/devel/perl-Class-MethodMaker.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-Class-MethodMaker.spec	18 Jul 2008 13:05:51 -0000	1.15
+++ perl-Class-MethodMaker.spec	5 Sep 2008 16:31:12 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           perl-Class-MethodMaker
-Version:        2.11
+Version:        2.12
 Release:        1%{?dist}
 Summary:        Perl module for creating generic object-oriented methods
 
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Sep  5 2008 Daniel P. Berrange <berrange at redhat.com> - 2.12-1
+- Update to new release for rhbz #461285
+
 * Fri Jul 18 2008 Ralf Cors??pius <rc040203 at freenet.de> - 2.11-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jul 2008 13:05:51 -0000	1.7
+++ sources	5 Sep 2008 16:31:12 -0000	1.8
@@ -1 +1 @@
-61ed8327e50b99e574c5f5ce1a835d36  Class-MethodMaker-2.11.tar.gz
+2194eda77e0d1b4555d4084a2d2cf24f  Class-MethodMaker-2.12.tar.gz



From remi at fedoraproject.org  Fri Sep  5 16:34:12 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Fri,  5 Sep 2008 16:34:12 +0000 (UTC)
Subject: rpms/php-pear-Log/devel .cvsignore, 1.13, 1.14 php-pear-Log.spec,
	1.14, 1.15 sources, 1.13, 1.14
Message-ID: <20080905163412.C988E70121@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-serv7301

Modified Files:
	.cvsignore php-pear-Log.spec sources 
Log Message:
update to 1.11.2 - bugfix


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	6 Aug 2008 14:45:09 -0000	1.13
+++ .cvsignore	5 Sep 2008 16:33:42 -0000	1.14
@@ -1 +1 @@
-Log-1.11.1.tgz
+Log-1.11.2.tgz


Index: php-pear-Log.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/devel/php-pear-Log.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- php-pear-Log.spec	6 Aug 2008 14:45:10 -0000	1.14
+++ php-pear-Log.spec	5 Sep 2008 16:33:42 -0000	1.15
@@ -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.1
+Version:        1.11.2
 Release:        1%{?dist}
 License:        MIT
 Group:          Development/Libraries
@@ -89,7 +89,7 @@
 # After install, as root :
 # pear run-tests -p Log
 # Should return 
-# 14 PASSED TESTS
+# 15 PASSED TESTS
 # 2 SKIPPED TESTS
 
 
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Fri Sep 05 2008 Remi Collet <Fedora at FamilleCollet.com> 1.11.2-1
+- update to 1.11.2
+
 * Wed Aug 06 2008 Remi Collet <Fedora at FamilleCollet.com> 1.11.1-1
 - update to 1.11.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	6 Aug 2008 14:45:10 -0000	1.13
+++ sources	5 Sep 2008 16:33:42 -0000	1.14
@@ -1 +1 @@
-54403840277d0b81808dc1d638bcc7a0  Log-1.11.1.tgz
+f11ac14c41fa4f87566c5ac5d22ee7fc  Log-1.11.2.tgz



From dwalluck at fedoraproject.org  Fri Sep  5 16:35:31 2008
From: dwalluck at fedoraproject.org (David Walluck)
Date: Fri,  5 Sep 2008 16:35:31 +0000 (UTC)
Subject: rpms/tomcat6/F-9 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tomcat6-6.0-bootstrap-MANIFEST.MF.patch, 1.1,
	1.2 tomcat6-6.0-tomcat-users-webapp.patch, 1.1,
	1.2 tomcat6-6.0.wrapper, 1.1, 1.2 tomcat6.spec, 1.1, 1.2
Message-ID: <20080905163531.2224F70121@cvs1.fedora.phx.redhat.com>

Author: dwalluck

Update of /cvs/pkgs/rpms/tomcat6/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7700

Modified Files:
	.cvsignore sources tomcat6-6.0-bootstrap-MANIFEST.MF.patch 
	tomcat6-6.0-tomcat-users-webapp.patch tomcat6-6.0.wrapper 
	tomcat6.spec 
Log Message:
- 6.0.18


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat6/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2008 23:06:26 -0000	1.2
+++ .cvsignore	5 Sep 2008 16:35:00 -0000	1.3
@@ -1 +1 @@
-apache-tomcat-6.0.16-src.tar.gz
+apache-tomcat-6.0.18-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat6/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2008 23:06:26 -0000	1.2
+++ sources	5 Sep 2008 16:35:00 -0000	1.3
@@ -1 +1 @@
-b2e42e8a875339e655d92975729717e5  apache-tomcat-6.0.16-src.tar.gz
+9bdbb1c1d79302c80057a70b18fe6721  apache-tomcat-6.0.18-src.tar.gz

tomcat6-6.0-bootstrap-MANIFEST.MF.patch:

Index: tomcat6-6.0-bootstrap-MANIFEST.MF.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat6/F-9/tomcat6-6.0-bootstrap-MANIFEST.MF.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat6-6.0-bootstrap-MANIFEST.MF.patch	7 Apr 2008 23:06:26 -0000	1.1
+++ tomcat6-6.0-bootstrap-MANIFEST.MF.patch	5 Sep 2008 16:35:00 -0000	1.2
@@ -1,5 +1,5 @@
---- apache-tomcat-6.0.16-src/res/bootstrap.jar.manifest.orig	2007-06-21 11:02:18.000000000 -0400
-+++ apache-tomcat-6.0.16-src/res/bootstrap.jar.manifest	2007-06-21 11:02:26.000000000 -0400
+--- res/bootstrap.jar.manifest.orig	2007-06-21 11:02:18.000000000 -0400
++++ res/bootstrap.jar.manifest	2007-06-21 11:02:26.000000000 -0400
 @@ -1,5 +1,4 @@
  Manifest-Version: 1.0
  Main-Class: org.apache.catalina.startup.Bootstrap

tomcat6-6.0-tomcat-users-webapp.patch:

Index: tomcat6-6.0-tomcat-users-webapp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat6/F-9/tomcat6-6.0-tomcat-users-webapp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat6-6.0-tomcat-users-webapp.patch	7 Apr 2008 23:06:26 -0000	1.1
+++ tomcat6-6.0-tomcat-users-webapp.patch	5 Sep 2008 16:35:00 -0000	1.2
@@ -1,5 +1,5 @@
---- apache-tomcat-6.0.16-src/conf/tomcat-users.xml~	2008-01-28 17:41:06.000000000 -0500
-+++ apache-tomcat-6.0.16-src/conf/tomcat-users.xml	2008-03-07 19:40:07.000000000 -0500
+--- conf/tomcat-users.xml~	2008-01-28 17:41:06.000000000 -0500
++++ conf/tomcat-users.xml	2008-03-07 19:40:07.000000000 -0500
 @@ -23,4 +23,9 @@
    <user username="both" password="tomcat" roles="tomcat,role1"/>
    <user username="role1" password="tomcat" roles="role1"/>


Index: tomcat6-6.0.wrapper
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat6/F-9/tomcat6-6.0.wrapper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat6-6.0.wrapper	7 Apr 2008 23:06:26 -0000	1.1
+++ tomcat6-6.0.wrapper	5 Sep 2008 16:35:00 -0000	1.2
@@ -48,7 +48,7 @@
     -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \
     -Djava.io.tmpdir="$CATALINA_TMPDIR" \
     -Djava.security.manager \
-    -Djava.security.policy="${CATALINA_BASE}/conf/catalina.policy" \
+    -Djava.security.policy=="${CATALINA_BASE}/conf/catalina.policy" \
     -Djava.util.logging.config.file="${CATALINA_BASE}/conf/logging.properties" \
     -Djava.util.logging.manager="org.apache.juli.ClassLoaderLogManager" \
     org.apache.catalina.startup.Bootstrap start \
@@ -57,7 +57,7 @@
       echo $! > $CATALINA_PID
     fi
 elif [ "$1" = "stop" ]; then
-  ${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \
+  ${JAVACMD} $JAVA_OPTS \
     -classpath "$CLASSPATH" \
     -Dcatalina.base="$CATALINA_BASE" \
     -Dcatalina.home="$CATALINA_HOME" \


Index: tomcat6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat6/F-9/tomcat6.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat6.spec	7 Apr 2008 23:06:26 -0000	1.1
+++ tomcat6.spec	5 Sep 2008 16:35:00 -0000	1.2
@@ -31,9 +31,9 @@
 %define section free
 
 %define jspspec 2.1
-%define macro_version 16
 %define major_version 6
 %define minor_version 0
+%define micro_version 18
 %define packdname apache-tomcat-%{version}-src
 %define servletspec 2.5
 %define tcuid 91
@@ -45,13 +45,13 @@
 %define homedir %{_datadir}/%{name}
 %define libdir %{_javadir}/%{name}
 %define logdir %{_var}/log/%{name}
-%define tempdir %{_var}/tmp/%{name}
-%define workdir %{_var}/cache/%{name}
+%define tempdir %{_var}/cache/%{name}/temp
+%define workdir %{_var}/cache/%{name}/work
 
 Name: tomcat6
 Epoch: 0
-Version: %{major_version}.%{minor_version}.%{macro_version}
-Release: 1jpp.7%{?dist}
+Version: %{major_version}.%{minor_version}.%{micro_version}
+Release: 1.1%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group: Networking/Daemons
@@ -72,23 +72,24 @@
 
 BuildRequires: ant
 BuildRequires: ant-trax
-BuildRequires: eclipse-ecj >= 0:3.2.2
+BuildRequires: ecj
 BuildRequires: findutils
 BuildRequires: jakarta-commons-collections
 BuildRequires: jakarta-commons-daemon
-BuildRequires: java-devel >= 0:1.6.0
+BuildRequires: java-devel
 BuildRequires: jpackage-utils >= 0:1.7.0
 BuildRequires: junit
 Requires(pre): shadow-utils
 Requires(pre): shadow-utils
 Requires: jakarta-commons-daemon
 Requires: jakarta-commons-logging
-Requires: java >= 0:1.6.0
+Requires: java
 Requires: procps
 Requires: %{name}-lib = %{epoch}:%{version}-%{release}
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
+Requires(post): chkconfig
+Requires(preun): chkconfig
+# for /sbin/service
+Requires(preun): initscripts
 
 %description
 Tomcat is the servlet container that is used in the official Reference
@@ -106,7 +107,7 @@
 Requires: %{name} = %{epoch}:%{version}-%{release}
 
 %description admin-webapps
-The host-manager and manager web applications for Apache Tomcat
+The host-manager and manager web applications for Apache Tomcat.
 
 %package docs-webapp
 Group: System Environment/Applications
@@ -114,14 +115,14 @@
 Requires: %{name} = %{epoch}:%{version}-%{release}
 
 %description docs-webapp
-The docs web application for Apache Tomcat
+The docs web application for Apache Tomcat.
 
 %package javadoc
 Group: Documentation
 Summary: Javadoc generated documentation for Apache Tomcat
 
 %description javadoc
-Javadoc generated documentation for Apache Tomcat
+Javadoc generated documentation for Apache Tomcat.
 
 %package jsp-%{jspspec}-api
 Group: Internet/WWW/Dynamic Content
@@ -133,21 +134,21 @@
 Requires(postun): chkconfig
 
 %description jsp-%{jspspec}-api
-Apache Tomcat JSP API implementation classes
+Apache Tomcat JSP API implementation classes.
 
 %package lib
 Group: Development/Compilers
 Summary: Libraries needed to run the Tomcat Web container
 Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
 Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
-Requires(post): eclipse-ecj >= 0:3.2.2
+Requires(post): ecj
 Requires(post): jakarta-commons-collections-tomcat5
 Requires(post): jakarta-commons-dbcp-tomcat5
 Requires(post): jakarta-commons-pool-tomcat5
 Requires(preun): coreutils
 
 %description lib
-Libraries needed to run the Tomcat Web container
+Libraries needed to run the Tomcat Web container.
 
 %package servlet-%{servletspec}-api
 Group: Internet/WWW/Dynamic Content
@@ -159,7 +160,7 @@
 Requires(postun): chkconfig
 
 %description servlet-%{servletspec}-api
-Apache Tomcat Servlet API implementation classes
+Apache Tomcat Servlet API implementation classes.
 
 %package webapps
 Group: System Environment/Applications
@@ -168,15 +169,17 @@
 Requires(post): jakarta-taglibs-standard >= 0:1.1
 
 %description webapps
-The ROOT and examples web applications for Apache Tomcat
+The ROOT and examples web applications for Apache Tomcat.
 
 %prep
 %setup -q -c -T -a 0
 # remove pre-built binaries and windows files
-find . \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \
-          -name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t %{__rm} -f
+find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \
+          -name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t %{__rm}
+pushd %{packdname}
 %patch0 -p0
 %patch1 -p0
+popd
 
 %build
 export CLASSPATH=
@@ -192,19 +195,19 @@
         -Dcommons-collections.jar="$(build-classpath commons-collections)" \
         -Dcommons-daemon.jar="$(build-classpath commons-daemon)" \
         -Dcommons-daemon.jsvc.tar.gz="HACK" \
-        -Djasper-jdt.jar="$(build-classpath eclipse-ecj)" \
-        -Djdt.jar="$(build-classpath eclipse-ecj)" \
+        -Djasper-jdt.jar="$(build-classpath ecj)" \
+        -Djdt.jar="$(build-classpath ecj)" \
         -Dtomcat-dbcp.jar="HACK" \
         -Dtomcat-native.tar.gz="HACK" \
         -Dversion="%{version}" \
-        -Dversion.build="%{macro_version}"
+        -Dversion.build="%{micro_version}"
     # javadoc generation
     %{ant} -f dist.xml dist-prepare
     %{ant} -f dist.xml dist-source
     %{ant} -f dist.xml dist-javadoc
     # remove some jars that we'll replace with symlinks later
     %{__rm} output/build/bin/commons-daemon.jar \
-            output/build/lib/eclipse-ecj.jar
+            output/build/lib/ecj.jar
     # remove the cruft we created
     %{__rm} output/build/bin/HACK \
             output/build/bin/tomcat-native.tar.gz \
@@ -243,8 +246,6 @@
     %{__cp} -a lib/*.jar ${RPM_BUILD_ROOT}%{libdir}
     %{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir}
 popd
-# remove admin webapp directory since it is not shipped and not available
-%{__rm} -r ${RPM_BUILD_ROOT}%{appdir}/ROOT/admin
 # javadoc
 pushd %{packdname}/output/dist/webapps
     %{__cp} -a docs/api/* ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}
@@ -337,7 +338,7 @@
 
 %post lib
 %{_bindir}/build-jar-repository %{libdir} commons-collections-tomcat5 \
-    commons-dbcp-tomcat5 commons-pool-tomcat5 eclipse-ecj 2>&1
+    commons-dbcp-tomcat5 commons-pool-tomcat5 ecj 2>&1
 
 %post servlet-%{servletspec}-api
 %{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \
@@ -360,7 +361,7 @@
     %{__rm} -f %{libdir}/\[commons-collections-tomcat5\].jar \
         %{libdir}/\[commons-dbcp-tomcat5\].jar \
         %{libdir}/\[commons-pool-tomcat5\].jar \
-        %{libdir}/\[eclipse-ecj\].jar >/dev/null 2>&1
+        %{libdir}/\[ecj\].jar >/dev/null 2>&1
 fi
 
 %postun jsp-%{jspspec}-api
@@ -433,6 +434,17 @@
 %{appdir}/sample
 
 %changelog
+* Tue Aug 26 2008 David Walluck <dwalluck at redhat.com> 0:6.0.18-1.1
+- 6.0.18
+- Resolves: CVE-2008-1232, CVE-2008-1947, CVE-2008-2370, CVE-2008-2938
+- fix definition of java.security.policy with d%%{name} start-security
+- don't pass $CATALINA_OPTS with d%%{name} stop
+- redefine tempdir and workdir for tmpwatch workaround
+- change eclipse-ecj references to ecj
+
+* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:6.0.16-1.8
+- drop repotag
+
 * Fri Apr 04 2008 David Walluck <dwalluck at redhat.com> 0:6.0.16-1jpp.7.fc9
 - version jsp and servlet Provides with their spec versions
 - remove Obsoletes/Provides for servletapi6 package as it can co-exist



From berrange at fedoraproject.org  Fri Sep  5 16:36:18 2008
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Fri,  5 Sep 2008 16:36:18 +0000 (UTC)
Subject: rpms/perl-Test-YAML-Meta/devel .cvsignore, 1.2,
	1.3 perl-Test-YAML-Meta.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20080905163618.1789970121@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/perl-Test-YAML-Meta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7916

Modified Files:
	.cvsignore perl-Test-YAML-Meta.spec sources 
Log Message:
Update to 0.11 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-YAML-Meta/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Dec 2007 21:29:36 -0000	1.2
+++ .cvsignore	5 Sep 2008 16:35:47 -0000	1.3
@@ -1 +1,3 @@
-Test-YAML-Meta-0.06.tar.gz
+Test-YAML-Meta-0.11.tar.gz
+.build*.log
+*.rpm


Index: perl-Test-YAML-Meta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-YAML-Meta/devel/perl-Test-YAML-Meta.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Test-YAML-Meta.spec	8 Feb 2008 16:38:01 -0000	1.2
+++ perl-Test-YAML-Meta.spec	5 Sep 2008 16:35:47 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Test-YAML-Meta
-Version:        0.06
-Release:        4%{?dist}
+Version:        0.11
+Release:        1%{?dist}
 Summary:        Validation of the META.yml file in a distribution
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@
 %{_mandir}/man3/*.3pm*
 
 %changelog
+* Fri Sep  5 2008 Daniel Berrange <berrange at redhat.com> - 0.11-1
+- Update to 0.11 release
+
 * Fri Feb  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.06-4
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-YAML-Meta/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Dec 2007 21:29:36 -0000	1.2
+++ sources	5 Sep 2008 16:35:47 -0000	1.3
@@ -1 +1 @@
-2f573f7cc983b6fc6509790e38cb14ed  Test-YAML-Meta-0.06.tar.gz
+b6aac8d8708f7c09c5a6f6c8c61476df  Test-YAML-Meta-0.11.tar.gz



From pkgdb at fedoraproject.org  Fri Sep  5 16:36:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 16:36:42 +0000
Subject: [pkgdb] xfce-mcs-plugins-extra was added for kevin
Message-ID: <20080905163642.16B432086F6@bastion.fedora.phx.redhat.com>

kevin has added Package xfce-mcs-plugins-extra with summary Extra plugins for the Xfce mcs manager
kevin has approved Package xfce-mcs-plugins-extra
kevin has added a Fedora devel branch for xfce-mcs-plugins-extra with an owner of kevin
kevin has approved xfce-mcs-plugins-extra in Fedora devel
kevin has approved Package xfce-mcs-plugins-extra
kevin has set commit to Approved for packager on xfce-mcs-plugins-extra (Fedora devel)
kevin has set build to Approved for packager on xfce-mcs-plugins-extra (Fedora devel)
kevin has set checkout to Approved for packager on xfce-mcs-plugins-extra (Fedora devel)
kevin has set commit to Approved for uberpackager on xfce-mcs-plugins-extra (Fedora devel)
kevin has set build to Approved for uberpackager on xfce-mcs-plugins-extra (Fedora devel)
kevin has set checkout to Approved for uberpackager on xfce-mcs-plugins-extra (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xfce-mcs-plugins-extra



From pkgdb at fedoraproject.org  Fri Sep  5 17:45:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:45:24 +0000
Subject: [pkgdb] xfce-mcs-plugins-extra (Fedora, 8) updated by kevin
Message-ID: <20080905163647.78FC120876E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for xfce-mcs-plugins-extra
kevin has set commit to Approved for uberpackager on xfce-mcs-plugins-extra (Fedora 8)
kevin has set build to Approved for uberpackager on xfce-mcs-plugins-extra (Fedora 8)
kevin has set checkout to Approved for uberpackager on xfce-mcs-plugins-extra (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xfce-mcs-plugins-extra



From pkgdb at fedoraproject.org  Fri Sep  5 17:45:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:45:24 +0000
Subject: [pkgdb] xfce-mcs-plugins-extra (Fedora, 9) updated by kevin
Message-ID: <20080905163647.80EA9208770@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for xfce-mcs-plugins-extra
kevin has set commit to Approved for uberpackager on xfce-mcs-plugins-extra (Fedora 9)
kevin has set build to Approved for uberpackager on xfce-mcs-plugins-extra (Fedora 9)
kevin has set checkout to Approved for uberpackager on xfce-mcs-plugins-extra (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xfce-mcs-plugins-extra



From kevin at fedoraproject.org  Fri Sep  5 16:37:51 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:37:51 +0000 (UTC)
Subject: rpms/xfce-mcs-plugins-extra - New directory
Message-ID: <20080905163751.24EC970121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins-extra
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsuJ8345/rpms/xfce-mcs-plugins-extra

Log Message:
Directory /cvs/extras/rpms/xfce-mcs-plugins-extra added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:37:51 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:37:51 +0000 (UTC)
Subject: rpms/xfce-mcs-plugins-extra/devel - New directory
Message-ID: <20080905163751.62D1170121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins-extra/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsuJ8345/rpms/xfce-mcs-plugins-extra/devel

Log Message:
Directory /cvs/extras/rpms/xfce-mcs-plugins-extra/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:37:52 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:37:52 +0000 (UTC)
Subject: rpms/xfce-mcs-plugins-extra Makefile,NONE,1.1
Message-ID: <20080905163752.45BD470121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins-extra
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsuJ8345/rpms/xfce-mcs-plugins-extra

Added Files:
	Makefile 
Log Message:
Setup of module xfce-mcs-plugins-extra


--- NEW FILE Makefile ---
# Top level Makefile for module xfce-mcs-plugins-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 kevin at fedoraproject.org  Fri Sep  5 16:37:52 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:37:52 +0000 (UTC)
Subject: rpms/xfce-mcs-plugins-extra/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080905163752.7D87270121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins-extra/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsuJ8345/rpms/xfce-mcs-plugins-extra/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce-mcs-plugins-extra


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xfce-mcs-plugins-extra
# $Id: Makefile,v 1.1 2008/09/05 16:37:52 kevin Exp $
NAME := xfce-mcs-plugins-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  Fri Sep  5 16:38:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 16:38:28 +0000
Subject: [pkgdb] txt2rss was added for rakesh
Message-ID: <20080905163829.017ED20876A@bastion.fedora.phx.redhat.com>

kevin has added Package txt2rss with summary Convert from txt to rss
kevin has approved Package txt2rss
kevin has added a Fedora devel branch for txt2rss with an owner of rakesh
kevin has approved txt2rss in Fedora devel
kevin has approved Package txt2rss
kevin has set commit to Approved for packager on txt2rss (Fedora devel)
kevin has set build to Approved for packager on txt2rss (Fedora devel)
kevin has set checkout to Approved for packager on txt2rss (Fedora devel)
kevin has set commit to Approved for uberpackager on txt2rss (Fedora devel)
kevin has set build to Approved for uberpackager on txt2rss (Fedora devel)
kevin has set checkout to Approved for uberpackager on txt2rss (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/txt2rss



From pkgdb at fedoraproject.org  Fri Sep  5 16:38:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 16:38:31 +0000
Subject: [pkgdb] txt2rss (Fedora, 8) updated by kevin
Message-ID: <20080905163831.4604920876E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for txt2rss
kevin has set commit to Approved for uberpackager on txt2rss (Fedora 8)
kevin has set build to Approved for uberpackager on txt2rss (Fedora 8)
kevin has set checkout to Approved for uberpackager on txt2rss (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/txt2rss



From pkgdb at fedoraproject.org  Fri Sep  5 16:38:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 16:38:31 +0000
Subject: [pkgdb] txt2rss (Fedora, 9) updated by kevin
Message-ID: <20080905163831.4E864208771@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for txt2rss
kevin has set commit to Approved for uberpackager on txt2rss (Fedora 9)
kevin has set build to Approved for uberpackager on txt2rss (Fedora 9)
kevin has set checkout to Approved for uberpackager on txt2rss (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/txt2rss



From kevin at fedoraproject.org  Fri Sep  5 16:38:54 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:38:54 +0000 (UTC)
Subject: rpms/txt2rss - New directory
Message-ID: <20080905163854.2FF3570121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/txt2rss
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscG8850/rpms/txt2rss

Log Message:
Directory /cvs/extras/rpms/txt2rss added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:38:54 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:38:54 +0000 (UTC)
Subject: rpms/txt2rss/devel - New directory
Message-ID: <20080905163854.6F6D070121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/txt2rss/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscG8850/rpms/txt2rss/devel

Log Message:
Directory /cvs/extras/rpms/txt2rss/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:38:55 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:38:55 +0000 (UTC)
Subject: rpms/txt2rss Makefile,NONE,1.1
Message-ID: <20080905163855.642D570121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/txt2rss
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscG8850/rpms/txt2rss

Added Files:
	Makefile 
Log Message:
Setup of module txt2rss


--- NEW FILE Makefile ---
# Top level Makefile for module txt2rss
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  5 16:38:55 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:38:55 +0000 (UTC)
Subject: rpms/txt2rss/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080905163855.A038E70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/txt2rss/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscG8850/rpms/txt2rss/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module txt2rss


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: txt2rss
# $Id: Makefile,v 1.1 2008/09/05 16:38:55 kevin Exp $
NAME := txt2rss
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From remi at fedoraproject.org  Fri Sep  5 16:39:04 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Fri,  5 Sep 2008 16:39:04 +0000 (UTC)
Subject: rpms/php-pear-Log/F-9 php-pear-Log.spec, 1.14, 1.15 sources, 1.13,
	1.14
Message-ID: <20080905163904.0726770121@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Log/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8761

Modified Files:
	php-pear-Log.spec sources 
Log Message:
update to 1.11.2 - bugfix


Index: php-pear-Log.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/F-9/php-pear-Log.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- php-pear-Log.spec	6 Aug 2008 14:56:23 -0000	1.14
+++ php-pear-Log.spec	5 Sep 2008 16:38:33 -0000	1.15
@@ -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.1
+Version:        1.11.2
 Release:        1%{?dist}
 License:        MIT
 Group:          Development/Libraries
@@ -89,7 +89,7 @@
 # After install, as root :
 # pear run-tests -p Log
 # Should return 
-# 14 PASSED TESTS
+# 15 PASSED TESTS
 # 2 SKIPPED TESTS
 
 
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Fri Sep 05 2008 Remi Collet <Fedora at FamilleCollet.com> 1.11.2-1
+- update to 1.11.2
+
 * Wed Aug 06 2008 Remi Collet <Fedora at FamilleCollet.com> 1.11.1-1
 - update to 1.11.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	6 Aug 2008 14:56:24 -0000	1.13
+++ sources	5 Sep 2008 16:38:33 -0000	1.14
@@ -1 +1 @@
-54403840277d0b81808dc1d638bcc7a0  Log-1.11.1.tgz
+f11ac14c41fa4f87566c5ac5d22ee7fc  Log-1.11.2.tgz



From pkgdb at fedoraproject.org  Fri Sep  5 16:39:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 16:39:45 +0000
Subject: [pkgdb] netbeans-resolver was added for victorv
Message-ID: <20080905163945.B09D120876A@bastion.fedora.phx.redhat.com>

kevin has added Package netbeans-resolver with summary Resolver subproject of xml-commons patched for NetBeans
kevin has approved Package netbeans-resolver
kevin has added a Fedora devel branch for netbeans-resolver with an owner of victorv
kevin has approved netbeans-resolver in Fedora devel
kevin has approved Package netbeans-resolver
kevin has set commit to Approved for packager on netbeans-resolver (Fedora devel)
kevin has set build to Approved for packager on netbeans-resolver (Fedora devel)
kevin has set checkout to Approved for packager on netbeans-resolver (Fedora devel)
kevin has set commit to Approved for uberpackager on netbeans-resolver (Fedora devel)
kevin has set build to Approved for uberpackager on netbeans-resolver (Fedora devel)
kevin has set checkout to Approved for uberpackager on netbeans-resolver (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netbeans-resolver



From kevin at fedoraproject.org  Fri Sep  5 16:40:07 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:40:07 +0000 (UTC)
Subject: rpms/netbeans-resolver - New directory
Message-ID: <20080905164007.2A31170121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/netbeans-resolver
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyB9382/rpms/netbeans-resolver

Log Message:
Directory /cvs/extras/rpms/netbeans-resolver added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:40:07 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:40:07 +0000 (UTC)
Subject: rpms/netbeans-resolver/devel - New directory
Message-ID: <20080905164007.75CE270121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/netbeans-resolver/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyB9382/rpms/netbeans-resolver/devel

Log Message:
Directory /cvs/extras/rpms/netbeans-resolver/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:40:08 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:40:08 +0000 (UTC)
Subject: rpms/netbeans-resolver Makefile,NONE,1.1
Message-ID: <20080905164008.8DEBA70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/netbeans-resolver
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyB9382/rpms/netbeans-resolver

Added Files:
	Makefile 
Log Message:
Setup of module netbeans-resolver


--- NEW FILE Makefile ---
# Top level Makefile for module netbeans-resolver
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  5 16:40:08 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:40:08 +0000 (UTC)
Subject: rpms/netbeans-resolver/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20080905164008.DBDD370121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/netbeans-resolver/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyB9382/rpms/netbeans-resolver/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module netbeans-resolver


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: netbeans-resolver
# $Id: Makefile,v 1.1 2008/09/05 16:40:08 kevin Exp $
NAME := netbeans-resolver
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  5 16:42:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 16:42:20 +0000
Subject: [pkgdb] pyvnc2swf was added for dtimms
Message-ID: <20080905164220.5DAF620876A@bastion.fedora.phx.redhat.com>

kevin has added Package pyvnc2swf with summary Vnc screen recorder
kevin has approved Package pyvnc2swf
kevin has added a Fedora devel branch for pyvnc2swf with an owner of dtimms
kevin has approved pyvnc2swf in Fedora devel
kevin has approved Package pyvnc2swf
kevin has set commit to Approved for packager on pyvnc2swf (Fedora devel)
kevin has set build to Approved for packager on pyvnc2swf (Fedora devel)
kevin has set checkout to Approved for packager on pyvnc2swf (Fedora devel)
kevin has set commit to Approved for uberpackager on pyvnc2swf (Fedora devel)
kevin has set build to Approved for uberpackager on pyvnc2swf (Fedora devel)
kevin has set checkout to Approved for uberpackager on pyvnc2swf (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyvnc2swf



From kevin at fedoraproject.org  Fri Sep  5 16:42:40 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:42:40 +0000 (UTC)
Subject: rpms/pyvnc2swf - New directory
Message-ID: <20080905164240.2EBF570121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pyvnc2swf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfc9970/rpms/pyvnc2swf

Log Message:
Directory /cvs/extras/rpms/pyvnc2swf added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:42:40 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:42:40 +0000 (UTC)
Subject: rpms/pyvnc2swf/devel - New directory
Message-ID: <20080905164240.814A270121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pyvnc2swf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfc9970/rpms/pyvnc2swf/devel

Log Message:
Directory /cvs/extras/rpms/pyvnc2swf/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:42:41 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:42:41 +0000 (UTC)
Subject: rpms/pyvnc2swf Makefile,NONE,1.1
Message-ID: <20080905164241.A87DD70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pyvnc2swf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfc9970/rpms/pyvnc2swf

Added Files:
	Makefile 
Log Message:
Setup of module pyvnc2swf


--- NEW FILE Makefile ---
# Top level Makefile for module pyvnc2swf
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  5 16:42:42 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:42:42 +0000 (UTC)
Subject: rpms/pyvnc2swf/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080905164242.06B6370121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pyvnc2swf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfc9970/rpms/pyvnc2swf/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pyvnc2swf


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pyvnc2swf
# $Id: Makefile,v 1.1 2008/09/05 16:42:41 kevin Exp $
NAME := pyvnc2swf
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From remi at fedoraproject.org  Fri Sep  5 16:44:40 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Fri,  5 Sep 2008 16:44:40 +0000 (UTC)
Subject: rpms/php-pear-Log/F-8 php-pear-Log.spec, 1.13, 1.14 sources, 1.12,
	1.13
Message-ID: <20080905164440.0B69F70121@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Log/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10445

Modified Files:
	php-pear-Log.spec sources 
Log Message:
update to 1.11.2 - bugfix


Index: php-pear-Log.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/F-8/php-pear-Log.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- php-pear-Log.spec	6 Aug 2008 15:01:55 -0000	1.13
+++ php-pear-Log.spec	5 Sep 2008 16:44:09 -0000	1.14
@@ -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.1
+Version:        1.11.2
 Release:        1%{?dist}
 License:        MIT
 Group:          Development/Libraries
@@ -89,7 +89,7 @@
 # After install, as root :
 # pear run-tests -p Log
 # Should return 
-# 14 PASSED TESTS
+# 15 PASSED TESTS
 # 2 SKIPPED TESTS
 
 
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Fri Sep 05 2008 Remi Collet <Fedora at FamilleCollet.com> 1.11.2-1
+- update to 1.11.2
+
 * Wed Aug 06 2008 Remi Collet <Fedora at FamilleCollet.com> 1.11.1-1
 - update to 1.11.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/F-8/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	6 Aug 2008 15:01:55 -0000	1.12
+++ sources	5 Sep 2008 16:44:09 -0000	1.13
@@ -1 +1 @@
-54403840277d0b81808dc1d638bcc7a0  Log-1.11.1.tgz
+f11ac14c41fa4f87566c5ac5d22ee7fc  Log-1.11.2.tgz



From dwmw2 at fedoraproject.org  Fri Sep  5 16:44:57 2008
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Fri,  5 Sep 2008 16:44:57 +0000 (UTC)
Subject: rpms/linux-atm/devel linux-atm.spec,1.27,1.28
Message-ID: <20080905164457.C0F3770121@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/linux-atm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10548

Modified Files:
	linux-atm.spec 
Log Message:
fix bug number for ftbfs bug


Index: linux-atm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linux-atm/devel/linux-atm.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- linux-atm.spec	28 May 2008 21:38:02 -0000	1.27
+++ linux-atm.spec	5 Sep 2008 16:44:27 -0000	1.28
@@ -89,7 +89,7 @@
 - fix license tag
 
 * Fri Apr 18 2008 David Woodhouse <dwmw2 at infradead.org> - 2.5.0-7
-- Fix GCC 4.3 compilation (#440981)
+- Fix GCC 4.3 compilation (#434069)
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.5.0-6
 - Autorebuild for GCC 4.3



From pkgdb at fedoraproject.org  Fri Sep  5 17:45:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:45:24 +0000
Subject: [pkgdb] pyvnc2swf (Fedora, 8) updated by kevin
Message-ID: <20080905164605.70BEE20876A@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for pyvnc2swf
kevin has set commit to Approved for uberpackager on pyvnc2swf (Fedora 8)
kevin has set build to Approved for uberpackager on pyvnc2swf (Fedora 8)
kevin has set checkout to Approved for uberpackager on pyvnc2swf (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyvnc2swf



From pkgdb at fedoraproject.org  Fri Sep  5 17:45:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:45:24 +0000
Subject: [pkgdb] pyvnc2swf (Fedora EPEL, 5) updated by kevin
Message-ID: <20080905164605.B968220876E@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for pyvnc2swf
kevin has set commit to Approved for uberpackager on pyvnc2swf (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on pyvnc2swf (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on pyvnc2swf (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyvnc2swf



From pkgdb at fedoraproject.org  Fri Sep  5 17:45:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:45:24 +0000
Subject: [pkgdb] pyvnc2swf (Fedora, 9) updated by kevin
Message-ID: <20080905164606.05C9F208771@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for pyvnc2swf
kevin has set commit to Approved for uberpackager on pyvnc2swf (Fedora 9)
kevin has set build to Approved for uberpackager on pyvnc2swf (Fedora 9)
kevin has set checkout to Approved for uberpackager on pyvnc2swf (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyvnc2swf



From pkgdb at fedoraproject.org  Fri Sep  5 17:45:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:45:24 +0000
Subject: [pkgdb] myanmar3-unicode-fonts (Fedora, 9) updated by kevin
Message-ID: <20080905164606.4F880208D99@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for myanmar3-unicode-fonts
kevin has set commit to Approved for uberpackager on myanmar3-unicode-fonts (Fedora 9)
kevin has set build to Approved for uberpackager on myanmar3-unicode-fonts (Fedora 9)
kevin has set checkout to Approved for uberpackager on myanmar3-unicode-fonts (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/myanmar3-unicode-fonts



From pkgdb at fedoraproject.org  Fri Sep  5 17:45:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:45:24 +0000
Subject: [pkgdb] myanmar3-unicode-fonts (Fedora, 8) updated by kevin
Message-ID: <20080905164606.30392208D7C@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for myanmar3-unicode-fonts
kevin has set commit to Approved for uberpackager on myanmar3-unicode-fonts (Fedora 8)
kevin has set build to Approved for uberpackager on myanmar3-unicode-fonts (Fedora 8)
kevin has set checkout to Approved for uberpackager on myanmar3-unicode-fonts (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/myanmar3-unicode-fonts



From pkgdb at fedoraproject.org  Fri Sep  5 16:47:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 16:47:55 +0000
Subject: [pkgdb] python-flickrapi was added for kushal
Message-ID: <20080905164755.DBBDB20876A@bastion.fedora.phx.redhat.com>

kevin has added Package python-flickrapi with summary python module for flickr api
kevin has approved Package python-flickrapi
kevin has added a Fedora devel branch for python-flickrapi with an owner of kushal
kevin has approved python-flickrapi in Fedora devel
kevin has approved Package python-flickrapi
kevin has set commit to Approved for packager on python-flickrapi (Fedora devel)
kevin has set build to Approved for packager on python-flickrapi (Fedora devel)
kevin has set checkout to Approved for packager on python-flickrapi (Fedora devel)
kevin has set commit to Approved for uberpackager on python-flickrapi (Fedora devel)
kevin has set build to Approved for uberpackager on python-flickrapi (Fedora devel)
kevin has set checkout to Approved for uberpackager on python-flickrapi (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-flickrapi



From pkgdb at fedoraproject.org  Fri Sep  5 17:45:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:45:24 +0000
Subject: [pkgdb] python-flickrapi (Fedora, 9) updated by kevin
Message-ID: <20080905164757.A2400208771@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for python-flickrapi
kevin has set commit to Approved for uberpackager on python-flickrapi (Fedora 9)
kevin has set build to Approved for uberpackager on python-flickrapi (Fedora 9)
kevin has set checkout to Approved for uberpackager on python-flickrapi (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-flickrapi



From pkgdb at fedoraproject.org  Fri Sep  5 17:45:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:45:24 +0000
Subject: [pkgdb] python-flickrapi (Fedora EPEL, 5) updated by kevin
Message-ID: <20080905164757.95A4B20876F@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-flickrapi
kevin has set commit to Approved for uberpackager on python-flickrapi (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on python-flickrapi (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on python-flickrapi (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-flickrapi



From dwmw2 at fedoraproject.org  Fri Sep  5 16:48:14 2008
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Fri,  5 Sep 2008 16:48:14 +0000 (UTC)
Subject: rpms/linux-atm/F-9 linux-atm.spec,1.26,1.27
Message-ID: <20080905164814.624C870121@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/linux-atm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11408

Modified Files:
	linux-atm.spec 
Log Message:
update from rawhide


Index: linux-atm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linux-atm/F-9/linux-atm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- linux-atm.spec	18 Apr 2008 13:16:56 -0000	1.26
+++ linux-atm.spec	5 Sep 2008 16:47:44 -0000	1.27
@@ -1,8 +1,9 @@
 Summary: Tools to support ATM networking under Linux
 Name: linux-atm
 Version: 2.5.0
-Release: 7
-License: BSD, GPLv2+, LGPLv2+
+Release: 8
+# The licensing here is a mess. This is as close to accurate as possible.
+License: BSD and GPLv2 and GPLv2+ and LGPLv2+ and MIT
 URL: http://linux-atm.sourceforge.net/
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -84,8 +85,11 @@
 %{_libdir}/libatm.so
 
 %changelog
+* Wed May 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.5.0-8
+- fix license tag
+
 * Fri Apr 18 2008 David Woodhouse <dwmw2 at infradead.org> - 2.5.0-7
-- Fix GCC 4.3 compilation (#440981)
+- Fix GCC 4.3 compilation (#434069)
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.5.0-6
 - Autorebuild for GCC 4.3



From kevin at fedoraproject.org  Fri Sep  5 16:48:19 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:48:19 +0000 (UTC)
Subject: rpms/python-flickrapi - New directory
Message-ID: <20080905164819.2D65070121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-flickrapi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso11630/rpms/python-flickrapi

Log Message:
Directory /cvs/extras/rpms/python-flickrapi added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:48:19 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:48:19 +0000 (UTC)
Subject: rpms/python-flickrapi/devel - New directory
Message-ID: <20080905164819.67E0D70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-flickrapi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso11630/rpms/python-flickrapi/devel

Log Message:
Directory /cvs/extras/rpms/python-flickrapi/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:48:20 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:48:20 +0000 (UTC)
Subject: rpms/python-flickrapi Makefile,NONE,1.1
Message-ID: <20080905164820.56B9570121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-flickrapi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso11630/rpms/python-flickrapi

Added Files:
	Makefile 
Log Message:
Setup of module python-flickrapi


--- NEW FILE Makefile ---
# Top level Makefile for module python-flickrapi
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  5 16:48:20 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:48:20 +0000 (UTC)
Subject: rpms/python-flickrapi/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080905164820.A054B70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-flickrapi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso11630/rpms/python-flickrapi/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-flickrapi


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-flickrapi
# $Id: Makefile,v 1.1 2008/09/05 16:48:20 kevin Exp $
NAME := python-flickrapi
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Fri Sep  5 16:51:11 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  5 Sep 2008 16:51:11 +0000 (UTC)
Subject: rpms/at-spi/devel at-spi.spec, 1.95, 1.96 liyuan-greeter-crash.patch,
	1.1, 1.2
Message-ID: <20080905165111.43C1D70121@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12263

Modified Files:
	at-spi.spec liyuan-greeter-crash.patch 
Log Message:
fix an evo crash



Index: at-spi.spec
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- at-spi.spec	5 Sep 2008 14:07:24 -0000	1.95
+++ at-spi.spec	5 Sep 2008 16:50:40 -0000	1.96
@@ -10,7 +10,7 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.23.91
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://download.gnome.org/sources/at-spi/1.23/%{name}-%{version}.tar.bz2
 
@@ -77,7 +77,7 @@
 %prep
 %setup -q
 %patch2 -p1 -b .spew
-%patch3 -p0 -b .greeter-crash
+%patch3 -p1 -b .greeter-crash
 
 
 %build
@@ -124,6 +124,9 @@
 
 
 %changelog
+* Fri Sep  5 2008 Matthias Clasen <mclasen at redhat.com> - 1.23.91-3
+- Fix an evo crash caused by the greeter crash fix
+
 * Fri Sep  5 2008 Matthias Clasen <mclasen at redhat.com> - 1.23.91-2
 - Fix a greeter crash
 

liyuan-greeter-crash.patch:

Index: liyuan-greeter-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/liyuan-greeter-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- liyuan-greeter-crash.patch	5 Sep 2008 14:07:24 -0000	1.1
+++ liyuan-greeter-crash.patch	5 Sep 2008 16:50:40 -0000	1.2
@@ -1,6 +1,7 @@
---- atk-bridge/bridge.c.orig	2008-09-05 15:37:54.046098231 +0800
-+++ atk-bridge/bridge.c	2008-09-05 15:59:55.399017901 +0800
-@@ -1101,7 +1101,7 @@
+diff -up at-spi-1.23.91/atk-bridge/bridge.c.greeter-crash at-spi-1.23.91/atk-bridge/bridge.c
+--- at-spi-1.23.91/atk-bridge/bridge.c.greeter-crash	2008-09-05 09:54:27.000000000 -0400
++++ at-spi-1.23.91/atk-bridge/bridge.c	2008-09-05 12:38:34.000000000 -0400
+@@ -1101,7 +1101,7 @@ spi_atk_bridge_signal_listener (GSignalI
    CORBA_any any;
    CORBA_Object c_obj;
    char *sp = NULL;
@@ -9,12 +10,12 @@
    gint detail1 = 0, detail2 = 0;
    SpiAccessible *s_ao = NULL;
  #ifdef SPI_BRIDGE_DEBUG
-@@ -1162,7 +1162,7 @@
+@@ -1162,7 +1162,7 @@ spi_atk_bridge_signal_listener (GSignalI
            ao = ATK_OBJECT (child);
            g_object_ref (ao);
          }
 -      else
-+      else if (strcmp (detail, "add") == 0)
++      else if (detail != NULL && strcmp (detail, "add") == 0)
          {
            ao = atk_object_ref_accessible_child (ATK_OBJECT (gobject), 
                                                  detail1);



From pkgdb at fedoraproject.org  Fri Sep  5 16:51:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 16:51:22 +0000
Subject: [pkgdb] perl-HTML-FromText was added for kwizart
Message-ID: <20080905165122.A503B20876D@bastion.fedora.phx.redhat.com>

kevin has added Package perl-HTML-FromText with summary Convert plain text to HTML
kevin has approved Package perl-HTML-FromText
kevin has added a Fedora devel branch for perl-HTML-FromText with an owner of kwizart
kevin has approved perl-HTML-FromText in Fedora devel
kevin has approved Package perl-HTML-FromText
kevin has set commit to Approved for packager on perl-HTML-FromText (Fedora devel)
kevin has set build to Approved for packager on perl-HTML-FromText (Fedora devel)
kevin has set checkout to Approved for packager on perl-HTML-FromText (Fedora devel)
kevin has set commit to Approved for uberpackager on perl-HTML-FromText (Fedora devel)
kevin has set build to Approved for uberpackager on perl-HTML-FromText (Fedora devel)
kevin has set checkout to Approved for uberpackager on perl-HTML-FromText (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-FromText



From pkgdb at fedoraproject.org  Fri Sep  5 16:51:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 16:51:29 +0000
Subject: [pkgdb] perl-HTML-FromText (Fedora, devel) updated by kevin
Message-ID: <20080905165129.1005B20876E@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-HTML-FromText (Fedora devel) for perl-sig
kevin approved watchcommits on perl-HTML-FromText (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-FromText



From pkgdb at fedoraproject.org  Fri Sep  5 16:51:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 16:51:29 +0000
Subject: [pkgdb] perl-HTML-FromText (Fedora, 8) updated by kevin
Message-ID: <20080905165129.225AB208D07@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for perl-HTML-FromText
kevin has set commit to Approved for uberpackager on perl-HTML-FromText (Fedora 8)
kevin has set build to Approved for uberpackager on perl-HTML-FromText (Fedora 8)
kevin has set checkout to Approved for uberpackager on perl-HTML-FromText (Fedora 8)
kevin approved watchbugzilla on perl-HTML-FromText (Fedora 8) for perl-sig
kevin approved watchcommits on perl-HTML-FromText (Fedora 8) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-FromText



From pkgdb at fedoraproject.org  Fri Sep  5 16:51:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 16:51:29 +0000
Subject: [pkgdb] perl-HTML-FromText (Fedora EPEL, 4) updated by kevin
Message-ID: <20080905165129.504D2208D97@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for perl-HTML-FromText
kevin has set commit to Approved for uberpackager on perl-HTML-FromText (Fedora EPEL 4)
kevin has set build to Approved for uberpackager on perl-HTML-FromText (Fedora EPEL 4)
kevin has set checkout to Approved for uberpackager on perl-HTML-FromText (Fedora EPEL 4)
kevin approved watchbugzilla on perl-HTML-FromText (Fedora EPEL 4) for perl-sig
kevin approved watchcommits on perl-HTML-FromText (Fedora EPEL 4) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-FromText



From pkgdb at fedoraproject.org  Fri Sep  5 16:51:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 16:51:29 +0000
Subject: [pkgdb] perl-HTML-FromText (Fedora EPEL, 5) updated by kevin
Message-ID: <20080905165129.6A69A208D99@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-HTML-FromText
kevin has set commit to Approved for uberpackager on perl-HTML-FromText (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on perl-HTML-FromText (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on perl-HTML-FromText (Fedora EPEL 5)
kevin approved watchbugzilla on perl-HTML-FromText (Fedora EPEL 5) for perl-sig
kevin approved watchcommits on perl-HTML-FromText (Fedora EPEL 5) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-FromText



From pkgdb at fedoraproject.org  Fri Sep  5 16:51:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 16:51:29 +0000
Subject: [pkgdb] perl-HTML-FromText (Fedora, 9) updated by kevin
Message-ID: <20080905165129.7F1FE208D9C@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-HTML-FromText
kevin has set commit to Approved for uberpackager on perl-HTML-FromText (Fedora 9)
kevin has set build to Approved for uberpackager on perl-HTML-FromText (Fedora 9)
kevin has set checkout to Approved for uberpackager on perl-HTML-FromText (Fedora 9)
kevin approved watchbugzilla on perl-HTML-FromText (Fedora 9) for perl-sig
kevin approved watchcommits on perl-HTML-FromText (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-FromText



From dwalluck at fedoraproject.org  Fri Sep  5 16:51:35 2008
From: dwalluck at fedoraproject.org (David Walluck)
Date: Fri,  5 Sep 2008 16:51:35 +0000 (UTC)
Subject: rpms/tomcat6/F-9 tomcat6.spec,1.2,1.3
Message-ID: <20080905165135.4375270121@cvs1.fedora.phx.redhat.com>

Author: dwalluck

Update of /cvs/pkgs/rpms/tomcat6/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12431

Modified Files:
	tomcat6.spec 
Log Message:
- (Build)Requires: java-1.6.0{,-devel}


Index: tomcat6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat6/F-9/tomcat6.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tomcat6.spec	5 Sep 2008 16:35:00 -0000	1.2
+++ tomcat6.spec	5 Sep 2008 16:51:04 -0000	1.3
@@ -76,14 +76,14 @@
 BuildRequires: findutils
 BuildRequires: jakarta-commons-collections
 BuildRequires: jakarta-commons-daemon
-BuildRequires: java-devel
+BuildRequires: java-1.6.0-devel
 BuildRequires: jpackage-utils >= 0:1.7.0
 BuildRequires: junit
 Requires(pre): shadow-utils
 Requires(pre): shadow-utils
 Requires: jakarta-commons-daemon
 Requires: jakarta-commons-logging
-Requires: java
+Requires: java-1.6.0
 Requires: procps
 Requires: %{name}-lib = %{epoch}:%{version}-%{release}
 Requires(post): chkconfig



From kevin at fedoraproject.org  Fri Sep  5 16:51:55 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:51:55 +0000 (UTC)
Subject: rpms/perl-HTML-FromText - New directory
Message-ID: <20080905165155.26C0C70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-HTML-FromText
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf12673/rpms/perl-HTML-FromText

Log Message:
Directory /cvs/extras/rpms/perl-HTML-FromText added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:51:55 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:51:55 +0000 (UTC)
Subject: rpms/perl-HTML-FromText/devel - New directory
Message-ID: <20080905165155.7841D70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-HTML-FromText/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf12673/rpms/perl-HTML-FromText/devel

Log Message:
Directory /cvs/extras/rpms/perl-HTML-FromText/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:51:56 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:51:56 +0000 (UTC)
Subject: rpms/perl-HTML-FromText Makefile,NONE,1.1
Message-ID: <20080905165156.87D0E70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-HTML-FromText
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf12673/rpms/perl-HTML-FromText

Added Files:
	Makefile 
Log Message:
Setup of module perl-HTML-FromText


--- NEW FILE Makefile ---
# Top level Makefile for module perl-HTML-FromText
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  5 16:51:56 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:51:56 +0000 (UTC)
Subject: rpms/perl-HTML-FromText/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20080905165156.D4D7970121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-HTML-FromText/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf12673/rpms/perl-HTML-FromText/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-HTML-FromText


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-HTML-FromText
# $Id: Makefile,v 1.1 2008/09/05 16:51:56 kevin Exp $
NAME := perl-HTML-FromText
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  5 17:45:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:45:24 +0000
Subject: [pkgdb] labrea was added for huzaifas
Message-ID: <20080905165226.E29EE20876E@bastion.fedora.phx.redhat.com>

kevin has added Package labrea with summary A sticky honeypot
kevin has approved Package labrea
kevin has added a Fedora devel branch for labrea with an owner of huzaifas
kevin has approved labrea in Fedora devel
kevin has approved Package labrea
kevin has set commit to Approved for packager on labrea (Fedora devel)
kevin has set build to Approved for packager on labrea (Fedora devel)
kevin has set checkout to Approved for packager on labrea (Fedora devel)
kevin has set commit to Approved for uberpackager on labrea (Fedora devel)
kevin has set build to Approved for uberpackager on labrea (Fedora devel)
kevin has set checkout to Approved for uberpackager on labrea (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/labrea



From pkgdb at fedoraproject.org  Fri Sep  5 17:45:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:45:24 +0000
Subject: [pkgdb] labrea (Fedora, 9) updated by kevin
Message-ID: <20080905165230.8FD84208771@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for labrea
kevin has set commit to Approved for uberpackager on labrea (Fedora 9)
kevin has set build to Approved for uberpackager on labrea (Fedora 9)
kevin has set checkout to Approved for uberpackager on labrea (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/labrea



From pkgdb at fedoraproject.org  Fri Sep  5 17:45:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:45:24 +0000
Subject: [pkgdb] labrea (Fedora, 8) updated by kevin
Message-ID: <20080905165230.5DFB3208D98@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for labrea
kevin has set commit to Approved for uberpackager on labrea (Fedora 8)
kevin has set build to Approved for uberpackager on labrea (Fedora 8)
kevin has set checkout to Approved for uberpackager on labrea (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/labrea



From kevin at fedoraproject.org  Fri Sep  5 16:53:05 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:53:05 +0000 (UTC)
Subject: rpms/labrea - New directory
Message-ID: <20080905165305.3019570121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/labrea
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn13127/rpms/labrea

Log Message:
Directory /cvs/extras/rpms/labrea added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:53:06 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:53:06 +0000 (UTC)
Subject: rpms/labrea Makefile,NONE,1.1
Message-ID: <20080905165306.A4E6A70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/labrea
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn13127/rpms/labrea

Added Files:
	Makefile 
Log Message:
Setup of module labrea


--- NEW FILE Makefile ---
# Top level Makefile for module labrea
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  5 16:53:05 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:53:05 +0000 (UTC)
Subject: rpms/labrea/devel - New directory
Message-ID: <20080905165305.728D970121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/labrea/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn13127/rpms/labrea/devel

Log Message:
Directory /cvs/extras/rpms/labrea/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:53:07 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:53:07 +0000 (UTC)
Subject: rpms/labrea/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080905165307.0064370121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/labrea/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn13127/rpms/labrea/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module labrea


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: labrea
# $Id: Makefile,v 1.1 2008/09/05 16:53:06 kevin Exp $
NAME := labrea
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  5 16:53:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 16:53:29 +0000
Subject: [pkgdb] liblayout was added for caolanm
Message-ID: <20080905165329.C735E20876E@bastion.fedora.phx.redhat.com>

kevin has added Package liblayout with summary Java Positioning Library
kevin has approved Package liblayout
kevin has added a Fedora devel branch for liblayout with an owner of caolanm
kevin has approved liblayout in Fedora devel
kevin has approved Package liblayout
kevin has set commit to Approved for packager on liblayout (Fedora devel)
kevin has set build to Approved for packager on liblayout (Fedora devel)
kevin has set checkout to Approved for packager on liblayout (Fedora devel)
kevin has set commit to Approved for uberpackager on liblayout (Fedora devel)
kevin has set build to Approved for uberpackager on liblayout (Fedora devel)
kevin has set checkout to Approved for uberpackager on liblayout (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/liblayout



From kevin at fedoraproject.org  Fri Sep  5 16:53:54 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:53:54 +0000 (UTC)
Subject: rpms/liblayout - New directory
Message-ID: <20080905165354.29CFE70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/liblayout
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf13482/rpms/liblayout

Log Message:
Directory /cvs/extras/rpms/liblayout added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:53:54 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:53:54 +0000 (UTC)
Subject: rpms/liblayout/devel - New directory
Message-ID: <20080905165354.62EA270121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/liblayout/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf13482/rpms/liblayout/devel

Log Message:
Directory /cvs/extras/rpms/liblayout/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:53:55 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:53:55 +0000 (UTC)
Subject: rpms/liblayout Makefile,NONE,1.1
Message-ID: <20080905165355.690D470121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/liblayout
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf13482/rpms/liblayout

Added Files:
	Makefile 
Log Message:
Setup of module liblayout


--- NEW FILE Makefile ---
# Top level Makefile for module liblayout
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  5 16:53:55 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:53:55 +0000 (UTC)
Subject: rpms/liblayout/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080905165355.AFC5270121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/liblayout/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf13482/rpms/liblayout/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module liblayout


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: liblayout
# $Id: Makefile,v 1.1 2008/09/05 16:53:55 kevin Exp $
NAME := liblayout
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  5 17:45:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:45:24 +0000
Subject: [pkgdb] pentaho-reporting-flow-engine was added for caolanm
Message-ID: <20080905165500.D08DC20876A@bastion.fedora.phx.redhat.com>

kevin has added Package pentaho-reporting-flow-engine with summary A flow reporting engine
kevin has approved Package pentaho-reporting-flow-engine
kevin has added a Fedora devel branch for pentaho-reporting-flow-engine with an owner of caolanm
kevin has approved pentaho-reporting-flow-engine in Fedora devel
kevin has approved Package pentaho-reporting-flow-engine
kevin has set commit to Approved for packager on pentaho-reporting-flow-engine (Fedora devel)
kevin has set build to Approved for packager on pentaho-reporting-flow-engine (Fedora devel)
kevin has set checkout to Approved for packager on pentaho-reporting-flow-engine (Fedora devel)
kevin has set commit to Approved for uberpackager on pentaho-reporting-flow-engine (Fedora devel)
kevin has set build to Approved for uberpackager on pentaho-reporting-flow-engine (Fedora devel)
kevin has set checkout to Approved for uberpackager on pentaho-reporting-flow-engine (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pentaho-reporting-flow-engine



From kevin at fedoraproject.org  Fri Sep  5 16:56:24 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:56:24 +0000 (UTC)
Subject: rpms/pentaho-reporting-flow-engine - New directory
Message-ID: <20080905165624.24C8070121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pentaho-reporting-flow-engine
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX13969/rpms/pentaho-reporting-flow-engine

Log Message:
Directory /cvs/extras/rpms/pentaho-reporting-flow-engine added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:56:25 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:56:25 +0000 (UTC)
Subject: rpms/pentaho-reporting-flow-engine Makefile,NONE,1.1
Message-ID: <20080905165625.5B10870121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pentaho-reporting-flow-engine
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX13969/rpms/pentaho-reporting-flow-engine

Added Files:
	Makefile 
Log Message:
Setup of module pentaho-reporting-flow-engine


--- NEW FILE Makefile ---
# Top level Makefile for module pentaho-reporting-flow-engine
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  5 16:56:24 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:56:24 +0000 (UTC)
Subject: rpms/pentaho-reporting-flow-engine/devel - New directory
Message-ID: <20080905165624.63DAB70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pentaho-reporting-flow-engine/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX13969/rpms/pentaho-reporting-flow-engine/devel

Log Message:
Directory /cvs/extras/rpms/pentaho-reporting-flow-engine/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:56:25 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:56:25 +0000 (UTC)
Subject: rpms/pentaho-reporting-flow-engine/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080905165625.957DC70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pentaho-reporting-flow-engine/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX13969/rpms/pentaho-reporting-flow-engine/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pentaho-reporting-flow-engine


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pentaho-reporting-flow-engine
# $Id: Makefile,v 1.1 2008/09/05 16:56:25 kevin Exp $
NAME := pentaho-reporting-flow-engine
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  5 16:57:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 16:57:36 +0000
Subject: [pkgdb] ctemplate was added for rakesh
Message-ID: <20080905165737.0C07120876B@bastion.fedora.phx.redhat.com>

kevin has added Package ctemplate with summary A simple but powerful template language for C++
kevin has approved Package ctemplate
kevin has added a Fedora devel branch for ctemplate with an owner of rakesh
kevin has approved ctemplate in Fedora devel
kevin has approved Package ctemplate
kevin has set commit to Approved for packager on ctemplate (Fedora devel)
kevin has set build to Approved for packager on ctemplate (Fedora devel)
kevin has set checkout to Approved for packager on ctemplate (Fedora devel)
kevin has set commit to Approved for uberpackager on ctemplate (Fedora devel)
kevin has set build to Approved for uberpackager on ctemplate (Fedora devel)
kevin has set checkout to Approved for uberpackager on ctemplate (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctemplate



From pkgdb at fedoraproject.org  Fri Sep  5 16:57:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 16:57:39 +0000
Subject: [pkgdb] ctemplate (Fedora, 8) updated by kevin
Message-ID: <20080905165739.43D8620876F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for ctemplate
kevin has set commit to Approved for uberpackager on ctemplate (Fedora 8)
kevin has set build to Approved for uberpackager on ctemplate (Fedora 8)
kevin has set checkout to Approved for uberpackager on ctemplate (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctemplate



From kevin at fedoraproject.org  Fri Sep  5 16:57:51 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:57:51 +0000 (UTC)
Subject: rpms/ctemplate - New directory
Message-ID: <20080905165751.2D84670125@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ctemplate
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG14402/rpms/ctemplate

Log Message:
Directory /cvs/extras/rpms/ctemplate added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:57:51 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:57:51 +0000 (UTC)
Subject: rpms/ctemplate/devel - New directory
Message-ID: <20080905165751.77EBE70125@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ctemplate/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG14402/rpms/ctemplate/devel

Log Message:
Directory /cvs/extras/rpms/ctemplate/devel added to the repository




From pkgdb at fedoraproject.org  Fri Sep  5 16:57:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 16:57:39 +0000
Subject: [pkgdb] ctemplate (Fedora, 9) updated by kevin
Message-ID: <20080905165739.53306208D07@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for ctemplate
kevin has set commit to Approved for uberpackager on ctemplate (Fedora 9)
kevin has set build to Approved for uberpackager on ctemplate (Fedora 9)
kevin has set checkout to Approved for uberpackager on ctemplate (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctemplate



From kevin at fedoraproject.org  Fri Sep  5 16:57:52 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:57:52 +0000 (UTC)
Subject: rpms/ctemplate Makefile,NONE,1.1
Message-ID: <20080905165752.A666770125@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ctemplate
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG14402/rpms/ctemplate

Added Files:
	Makefile 
Log Message:
Setup of module ctemplate


--- NEW FILE Makefile ---
# Top level Makefile for module ctemplate
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  5 16:57:52 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:57:52 +0000 (UTC)
Subject: rpms/ctemplate/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080905165752.EC95770125@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ctemplate/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG14402/rpms/ctemplate/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ctemplate


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ctemplate
# $Id: Makefile,v 1.1 2008/09/05 16:57:52 kevin Exp $
NAME := ctemplate
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From berrange at fedoraproject.org  Fri Sep  5 16:59:43 2008
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Fri,  5 Sep 2008 16:59:43 +0000 (UTC)
Subject: rpms/perl-Module-ExtractUse/devel .cvsignore, 1.2,
	1.3 perl-Module-ExtractUse.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20080905165943.5A36F70121@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/extras/rpms/perl-Module-ExtractUse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15077

Modified Files:
	.cvsignore perl-Module-ExtractUse.spec sources 
Log Message:
Update to 0.23 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ExtractUse/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Dec 2007 17:52:36 -0000	1.2
+++ .cvsignore	5 Sep 2008 16:59:12 -0000	1.3
@@ -1 +1 @@
-Module-ExtractUse-0.22.tar.gz
+Module-ExtractUse-0.23.tar.gz


Index: perl-Module-ExtractUse.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ExtractUse/devel/perl-Module-ExtractUse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Module-ExtractUse.spec	8 Feb 2008 18:12:10 -0000	1.2
+++ perl-Module-ExtractUse.spec	5 Sep 2008 16:59:12 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Module-ExtractUse
-Version:        0.22
-Release:        2%{?dist}
+Version:        0.23
+Release:        1%{?dist}
 Summary:        Find out what modules are used
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@
 %{_mandir}/man3/*.3pm*
 
 %changelog
+* Fri Sep  5 2008 Daniel P. Berrange <berrange at redhat.com> - 0.23-1
+- Update to 0.23 release
+
 * Fri Feb  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.22-2
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ExtractUse/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Dec 2007 17:52:36 -0000	1.2
+++ sources	5 Sep 2008 16:59:12 -0000	1.3
@@ -1 +1 @@
-afbabdb638d6c37b8dd31adb6544fee4  Module-ExtractUse-0.22.tar.gz
+b8be04e3dc4dda9165a47a1690d6cf10  Module-ExtractUse-0.23.tar.gz



From pkgdb at fedoraproject.org  Fri Sep  5 17:45:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:45:24 +0000
Subject: [pkgdb] ocaml-reins was added for rjones
Message-ID: <20080905165946.469D220876E@bastion.fedora.phx.redhat.com>

kevin has added Package ocaml-reins with summary Library of OCaml persistent data structures
kevin has approved Package ocaml-reins
kevin has added a Fedora devel branch for ocaml-reins with an owner of rjones
kevin has approved ocaml-reins in Fedora devel
kevin has approved Package ocaml-reins
kevin has set commit to Approved for packager on ocaml-reins (Fedora devel)
kevin has set build to Approved for packager on ocaml-reins (Fedora devel)
kevin has set checkout to Approved for packager on ocaml-reins (Fedora devel)
kevin has set commit to Approved for uberpackager on ocaml-reins (Fedora devel)
kevin has set build to Approved for uberpackager on ocaml-reins (Fedora devel)
kevin has set checkout to Approved for uberpackager on ocaml-reins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-reins



From kevin at fedoraproject.org  Fri Sep  5 16:59:56 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:59:56 +0000 (UTC)
Subject: rpms/ocaml-reins - New directory
Message-ID: <20080905165956.311A370121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ocaml-reins
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk15423/rpms/ocaml-reins

Log Message:
Directory /cvs/extras/rpms/ocaml-reins added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:59:56 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:59:56 +0000 (UTC)
Subject: rpms/ocaml-reins/devel - New directory
Message-ID: <20080905165956.77C1D70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ocaml-reins/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk15423/rpms/ocaml-reins/devel

Log Message:
Directory /cvs/extras/rpms/ocaml-reins/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  5 16:59:57 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:59:57 +0000 (UTC)
Subject: rpms/ocaml-reins Makefile,NONE,1.1
Message-ID: <20080905165957.5FF4370121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ocaml-reins
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk15423/rpms/ocaml-reins

Added Files:
	Makefile 
Log Message:
Setup of module ocaml-reins


--- NEW FILE Makefile ---
# Top level Makefile for module ocaml-reins
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  5 16:59:57 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 16:59:57 +0000 (UTC)
Subject: rpms/ocaml-reins/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080905165957.912C570121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ocaml-reins/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk15423/rpms/ocaml-reins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ocaml-reins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ocaml-reins
# $Id: Makefile,v 1.1 2008/09/05 16:59:57 kevin Exp $
NAME := ocaml-reins
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  5 17:01:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:01:07 +0000
Subject: [pkgdb] qrq was added for lucilanga
Message-ID: <20080905170107.7FAB220876C@bastion.fedora.phx.redhat.com>

kevin has added Package qrq with summary Morse telegraphy trainer
kevin has approved Package qrq
kevin has added a Fedora devel branch for qrq with an owner of lucilanga
kevin has approved qrq in Fedora devel
kevin has approved Package qrq
kevin has set commit to Approved for packager on qrq (Fedora devel)
kevin has set build to Approved for packager on qrq (Fedora devel)
kevin has set checkout to Approved for packager on qrq (Fedora devel)
kevin has set commit to Approved for uberpackager on qrq (Fedora devel)
kevin has set build to Approved for uberpackager on qrq (Fedora devel)
kevin has set checkout to Approved for uberpackager on qrq (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qrq



From pkgdb at fedoraproject.org  Fri Sep  5 17:01:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:01:11 +0000
Subject: [pkgdb] qrq (Fedora, 8) updated by kevin
Message-ID: <20080905170111.DF25020876E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for qrq
kevin has set commit to Approved for uberpackager on qrq (Fedora 8)
kevin has set build to Approved for uberpackager on qrq (Fedora 8)
kevin has set checkout to Approved for uberpackager on qrq (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qrq



From pkgdb at fedoraproject.org  Fri Sep  5 17:01:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:01:11 +0000
Subject: [pkgdb] qrq (Fedora, 9) updated by kevin
Message-ID: <20080905170111.F0884208771@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for qrq
kevin has set commit to Approved for uberpackager on qrq (Fedora 9)
kevin has set build to Approved for uberpackager on qrq (Fedora 9)
kevin has set checkout to Approved for uberpackager on qrq (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qrq



From pkgdb at fedoraproject.org  Fri Sep  5 17:01:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:01:11 +0000
Subject: [pkgdb] qrq (Fedora EPEL, 5) updated by kevin
Message-ID: <20080905170112.12BF8208D1E@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for qrq
kevin has set commit to Approved for uberpackager on qrq (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on qrq (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on qrq (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qrq



From kevin at fedoraproject.org  Fri Sep  5 17:01:35 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 17:01:35 +0000 (UTC)
Subject: rpms/qrq - New directory
Message-ID: <20080905170135.2E0F370121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qrq
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE15841/rpms/qrq

Log Message:
Directory /cvs/extras/rpms/qrq added to the repository




From kevin at fedoraproject.org  Fri Sep  5 17:01:35 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 17:01:35 +0000 (UTC)
Subject: rpms/qrq/devel - New directory
Message-ID: <20080905170135.6E45570121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qrq/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE15841/rpms/qrq/devel

Log Message:
Directory /cvs/extras/rpms/qrq/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  5 17:01:36 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 17:01:36 +0000 (UTC)
Subject: rpms/qrq Makefile,NONE,1.1
Message-ID: <20080905170136.7121A70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qrq
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE15841/rpms/qrq

Added Files:
	Makefile 
Log Message:
Setup of module qrq


--- NEW FILE Makefile ---
# Top level Makefile for module qrq
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  5 17:01:36 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 17:01:36 +0000 (UTC)
Subject: rpms/qrq/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080905170136.B316070121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qrq/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE15841/rpms/qrq/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module qrq


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: qrq
# $Id: Makefile,v 1.1 2008/09/05 17:01:36 kevin Exp $
NAME := qrq
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  5 17:45:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:45:24 +0000
Subject: [pkgdb] gupnp-av was added for pbrobinson
Message-ID: <20080905170233.BC23620876B@bastion.fedora.phx.redhat.com>

kevin has added Package gupnp-av with summary GUPnP-AV is a collection of helpers for building UPnP AV applications
kevin has approved Package gupnp-av
kevin has added a Fedora devel branch for gupnp-av with an owner of pbrobinson
kevin has approved gupnp-av in Fedora devel
kevin has approved Package gupnp-av
kevin has set commit to Approved for packager on gupnp-av (Fedora devel)
kevin has set build to Approved for packager on gupnp-av (Fedora devel)
kevin has set checkout to Approved for packager on gupnp-av (Fedora devel)
kevin has set commit to Approved for uberpackager on gupnp-av (Fedora devel)
kevin has set build to Approved for uberpackager on gupnp-av (Fedora devel)
kevin has set checkout to Approved for uberpackager on gupnp-av (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gupnp-av



From pkgdb at fedoraproject.org  Fri Sep  5 17:02:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:02:37 +0000
Subject: [pkgdb] gupnp-av (Fedora, 8) updated by kevin
Message-ID: <20080905170237.CB4B820876E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for gupnp-av
kevin has set commit to Approved for uberpackager on gupnp-av (Fedora 8)
kevin has set build to Approved for uberpackager on gupnp-av (Fedora 8)
kevin has set checkout to Approved for uberpackager on gupnp-av (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gupnp-av



From pkgdb at fedoraproject.org  Fri Sep  5 17:02:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 17:02:37 +0000
Subject: [pkgdb] gupnp-av (Fedora, 9) updated by kevin
Message-ID: <20080905170237.D48F2208771@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for gupnp-av
kevin has set commit to Approved for uberpackager on gupnp-av (Fedora 9)
kevin has set build to Approved for uberpackager on gupnp-av (Fedora 9)
kevin has set checkout to Approved for uberpackager on gupnp-av (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gupnp-av



From kevin at fedoraproject.org  Fri Sep  5 17:03:09 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 17:03:09 +0000 (UTC)
Subject: rpms/gupnp-av - New directory
Message-ID: <20080905170309.2579B70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gupnp-av
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg16366/rpms/gupnp-av

Log Message:
Directory /cvs/extras/rpms/gupnp-av added to the repository




From kevin at fedoraproject.org  Fri Sep  5 17:03:09 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 17:03:09 +0000 (UTC)
Subject: rpms/gupnp-av/devel - New directory
Message-ID: <20080905170309.6812070128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gupnp-av/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg16366/rpms/gupnp-av/devel

Log Message:
Directory /cvs/extras/rpms/gupnp-av/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  5 17:03:10 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 17:03:10 +0000 (UTC)
Subject: rpms/gupnp-av Makefile,NONE,1.1
Message-ID: <20080905170310.576A970121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gupnp-av
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg16366/rpms/gupnp-av

Added Files:
	Makefile 
Log Message:
Setup of module gupnp-av


--- NEW FILE Makefile ---
# Top level Makefile for module gupnp-av
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  5 17:03:10 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 17:03:10 +0000 (UTC)
Subject: rpms/gupnp-av/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080905170310.9996770121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gupnp-av/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg16366/rpms/gupnp-av/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gupnp-av


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gupnp-av
# $Id: Makefile,v 1.1 2008/09/05 17:03:10 kevin Exp $
NAME := gupnp-av
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kwizart at fedoraproject.org  Fri Sep  5 17:13:13 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Fri,  5 Sep 2008 17:13:13 +0000 (UTC)
Subject: rpms/perl-HTML-FromText/devel import.log, NONE,
	1.1 perl-HTML-FromText.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080905171313.9F6B270121@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-HTML-FromText/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18529/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-HTML-FromText.spec 
Log Message:
-Initial import for Rawhide



--- NEW FILE import.log ---
perl-HTML-FromText-2_05-2_fc8_kwizart:HEAD:perl-HTML-FromText-2.05-2.fc8.kwizart.src.rpm:1220634658


--- NEW FILE perl-HTML-FromText.spec ---
Name:           perl-HTML-FromText
Version:        2.05
Release:        2%{?dist}
Summary:        Convert plain text to HTML

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/HTML-FromText/
Source0:        http://search.cpan.org/CPAN/authors/id/C/CW/CWEST/HTML-FromText-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Email::Find::addrspec) >= 0.09
BuildRequires:  perl(Exporter::Lite) >= 0.01
BuildRequires:  perl(Scalar::Util) >= 1.12
BuildRequires:  perl(HTML::Entities) >= 1.26
BuildRequires:  perl(Text::Tabs) >= 98.1128
BuildRequires:  perl(Test::More) >= 0.47

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
"HTML::FromText" converts plain text to HTML. There are a handfull of
options that shape the conversion. There is a utility function,
"text2html", that's exported by default. This function is simply a
short- cut to the Object Oriented interface described in detail below.


%prep
%setup -q -n HTML-FromText-%{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
#Theses test are known to fail
rm t/01_features.t
rm t/02_v2.01.t
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{_bindir}/text2html
%{perl_vendorlib}/HTML/
%{_mandir}/man3/*.3*
%{_mandir}/man1/text2html.1.gz


%changelog
* Tue Sep  2 2008 kwizart < kwizart at gmail.com > - 2.05-2
- Add fixperms

* Thu Jul 31 2008 kwizart < kwizart at gmail.com > - 2.05-1
- Initial package for Fedora



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-FromText/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:51:56 -0000	1.1
+++ .cvsignore	5 Sep 2008 17:12:43 -0000	1.2
@@ -0,0 +1 @@
+HTML-FromText-2.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-FromText/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:51:56 -0000	1.1
+++ sources	5 Sep 2008 17:12:43 -0000	1.2
@@ -0,0 +1 @@
+fb8ae4ab0cae0b57101f78b046b3927b  HTML-FromText-2.05.tar.gz



From dwalluck at fedoraproject.org  Fri Sep  5 17:14:34 2008
From: dwalluck at fedoraproject.org (David Walluck)
Date: Fri,  5 Sep 2008 17:14:34 +0000 (UTC)
Subject: rpms/tomcat6/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tomcat6-6.0-bootstrap-MANIFEST.MF.patch, 1.1,
	1.2 tomcat6-6.0-tomcat-users-webapp.patch, 1.1,
	1.2 tomcat6-6.0.wrapper, 1.1, 1.2 tomcat6.spec, 1.2, 1.3
Message-ID: <20080905171434.78E9570121@cvs1.fedora.phx.redhat.com>

Author: dwalluck

Update of /cvs/pkgs/rpms/tomcat6/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19003

Modified Files:
	.cvsignore sources tomcat6-6.0-bootstrap-MANIFEST.MF.patch 
	tomcat6-6.0-tomcat-users-webapp.patch tomcat6-6.0.wrapper 
	tomcat6.spec 
Log Message:
- 6.0.18
- Resolves: CVE-2008-1232, CVE-2008-1947, CVE-2008-2370, CVE-2008-2938
- fix definition of java.security.policy with d%%{name} start-security
- don't pass $CATALINA_OPTS with d%%{name} stop
- redefine tempdir and workdir for tmpwatch workaround
- change eclipse-ecj references to ecj



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat6/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2008 22:37:26 -0000	1.2
+++ .cvsignore	5 Sep 2008 17:14:04 -0000	1.3
@@ -1 +1 @@
-apache-tomcat-6.0.16-src.tar.gz
+apache-tomcat-6.0.18-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat6/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2008 22:37:26 -0000	1.2
+++ sources	5 Sep 2008 17:14:04 -0000	1.3
@@ -1 +1 @@
-b2e42e8a875339e655d92975729717e5  apache-tomcat-6.0.16-src.tar.gz
+9bdbb1c1d79302c80057a70b18fe6721  apache-tomcat-6.0.18-src.tar.gz

tomcat6-6.0-bootstrap-MANIFEST.MF.patch:

Index: tomcat6-6.0-bootstrap-MANIFEST.MF.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat6/devel/tomcat6-6.0-bootstrap-MANIFEST.MF.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat6-6.0-bootstrap-MANIFEST.MF.patch	7 Apr 2008 22:37:26 -0000	1.1
+++ tomcat6-6.0-bootstrap-MANIFEST.MF.patch	5 Sep 2008 17:14:04 -0000	1.2
@@ -1,5 +1,5 @@
---- apache-tomcat-6.0.16-src/res/bootstrap.jar.manifest.orig	2007-06-21 11:02:18.000000000 -0400
-+++ apache-tomcat-6.0.16-src/res/bootstrap.jar.manifest	2007-06-21 11:02:26.000000000 -0400
+--- res/bootstrap.jar.manifest.orig	2007-06-21 11:02:18.000000000 -0400
++++ res/bootstrap.jar.manifest	2007-06-21 11:02:26.000000000 -0400
 @@ -1,5 +1,4 @@
  Manifest-Version: 1.0
  Main-Class: org.apache.catalina.startup.Bootstrap

tomcat6-6.0-tomcat-users-webapp.patch:

Index: tomcat6-6.0-tomcat-users-webapp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat6/devel/tomcat6-6.0-tomcat-users-webapp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat6-6.0-tomcat-users-webapp.patch	7 Apr 2008 22:37:26 -0000	1.1
+++ tomcat6-6.0-tomcat-users-webapp.patch	5 Sep 2008 17:14:04 -0000	1.2
@@ -1,5 +1,5 @@
---- apache-tomcat-6.0.16-src/conf/tomcat-users.xml~	2008-01-28 17:41:06.000000000 -0500
-+++ apache-tomcat-6.0.16-src/conf/tomcat-users.xml	2008-03-07 19:40:07.000000000 -0500
+--- conf/tomcat-users.xml~	2008-01-28 17:41:06.000000000 -0500
++++ conf/tomcat-users.xml	2008-03-07 19:40:07.000000000 -0500
 @@ -23,4 +23,9 @@
    <user username="both" password="tomcat" roles="tomcat,role1"/>
    <user username="role1" password="tomcat" roles="role1"/>


Index: tomcat6-6.0.wrapper
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat6/devel/tomcat6-6.0.wrapper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat6-6.0.wrapper	7 Apr 2008 22:37:26 -0000	1.1
+++ tomcat6-6.0.wrapper	5 Sep 2008 17:14:04 -0000	1.2
@@ -48,7 +48,7 @@
     -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \
     -Djava.io.tmpdir="$CATALINA_TMPDIR" \
     -Djava.security.manager \
-    -Djava.security.policy="${CATALINA_BASE}/conf/catalina.policy" \
+    -Djava.security.policy=="${CATALINA_BASE}/conf/catalina.policy" \
     -Djava.util.logging.config.file="${CATALINA_BASE}/conf/logging.properties" \
     -Djava.util.logging.manager="org.apache.juli.ClassLoaderLogManager" \
     org.apache.catalina.startup.Bootstrap start \
@@ -57,7 +57,7 @@
       echo $! > $CATALINA_PID
     fi
 elif [ "$1" = "stop" ]; then
-  ${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \
+  ${JAVACMD} $JAVA_OPTS \
     -classpath "$CLASSPATH" \
     -Dcatalina.base="$CATALINA_BASE" \
     -Dcatalina.home="$CATALINA_HOME" \


Index: tomcat6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat6/devel/tomcat6.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tomcat6.spec	10 Jul 2008 19:42:58 -0000	1.2
+++ tomcat6.spec	5 Sep 2008 17:14:04 -0000	1.3
@@ -31,9 +31,9 @@
 %define section free
 
 %define jspspec 2.1
-%define macro_version 16
 %define major_version 6
 %define minor_version 0
+%define micro_version 18
 %define packdname apache-tomcat-%{version}-src
 %define servletspec 2.5
 %define tcuid 91
@@ -45,13 +45,13 @@
 %define homedir %{_datadir}/%{name}
 %define libdir %{_javadir}/%{name}
 %define logdir %{_var}/log/%{name}
-%define tempdir %{_var}/tmp/%{name}
-%define workdir %{_var}/cache/%{name}
+%define tempdir %{_var}/cache/%{name}/temp
+%define workdir %{_var}/cache/%{name}/work
 
 Name: tomcat6
 Epoch: 0
-Version: %{major_version}.%{minor_version}.%{macro_version}
-Release: 1.8%{?dist}
+Version: %{major_version}.%{minor_version}.%{micro_version}
+Release: 1.1%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group: Networking/Daemons
@@ -72,18 +72,18 @@
 
 BuildRequires: ant
 BuildRequires: ant-trax
-BuildRequires: eclipse-ecj >= 0:3.2.2
+BuildRequires: ecj
 BuildRequires: findutils
 BuildRequires: jakarta-commons-collections
 BuildRequires: jakarta-commons-daemon
-BuildRequires: java-devel >= 0:1.6.0
+BuildRequires: java-1.6.0-devel
 BuildRequires: jpackage-utils >= 0:1.7.0
 BuildRequires: junit
 Requires(pre): shadow-utils
 Requires(pre): shadow-utils
 Requires: jakarta-commons-daemon
 Requires: jakarta-commons-logging
-Requires: java >= 0:1.6.0
+Requires: java-1.6.0
 Requires: procps
 Requires: %{name}-lib = %{epoch}:%{version}-%{release}
 Requires(post): chkconfig
@@ -107,7 +107,7 @@
 Requires: %{name} = %{epoch}:%{version}-%{release}
 
 %description admin-webapps
-The host-manager and manager web applications for Apache Tomcat
+The host-manager and manager web applications for Apache Tomcat.
 
 %package docs-webapp
 Group: System Environment/Applications
@@ -115,14 +115,14 @@
 Requires: %{name} = %{epoch}:%{version}-%{release}
 
 %description docs-webapp
-The docs web application for Apache Tomcat
+The docs web application for Apache Tomcat.
 
 %package javadoc
 Group: Documentation
 Summary: Javadoc generated documentation for Apache Tomcat
 
 %description javadoc
-Javadoc generated documentation for Apache Tomcat
+Javadoc generated documentation for Apache Tomcat.
 
 %package jsp-%{jspspec}-api
 Group: Internet/WWW/Dynamic Content
@@ -134,21 +134,21 @@
 Requires(postun): chkconfig
 
 %description jsp-%{jspspec}-api
-Apache Tomcat JSP API implementation classes
+Apache Tomcat JSP API implementation classes.
 
 %package lib
 Group: Development/Compilers
 Summary: Libraries needed to run the Tomcat Web container
 Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
 Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
-Requires(post): eclipse-ecj >= 0:3.2.2
+Requires(post): ecj
 Requires(post): jakarta-commons-collections-tomcat5
 Requires(post): jakarta-commons-dbcp-tomcat5
 Requires(post): jakarta-commons-pool-tomcat5
 Requires(preun): coreutils
 
 %description lib
-Libraries needed to run the Tomcat Web container
+Libraries needed to run the Tomcat Web container.
 
 %package servlet-%{servletspec}-api
 Group: Internet/WWW/Dynamic Content
@@ -160,7 +160,7 @@
 Requires(postun): chkconfig
 
 %description servlet-%{servletspec}-api
-Apache Tomcat Servlet API implementation classes
+Apache Tomcat Servlet API implementation classes.
 
 %package webapps
 Group: System Environment/Applications
@@ -169,15 +169,17 @@
 Requires(post): jakarta-taglibs-standard >= 0:1.1
 
 %description webapps
-The ROOT and examples web applications for Apache Tomcat
+The ROOT and examples web applications for Apache Tomcat.
 
 %prep
 %setup -q -c -T -a 0
 # remove pre-built binaries and windows files
-find . \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \
-          -name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t %{__rm} -f
+find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \
+          -name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t %{__rm}
+pushd %{packdname}
 %patch0 -p0
 %patch1 -p0
+popd
 
 %build
 export CLASSPATH=
@@ -193,19 +195,19 @@
         -Dcommons-collections.jar="$(build-classpath commons-collections)" \
         -Dcommons-daemon.jar="$(build-classpath commons-daemon)" \
         -Dcommons-daemon.jsvc.tar.gz="HACK" \
-        -Djasper-jdt.jar="$(build-classpath eclipse-ecj)" \
-        -Djdt.jar="$(build-classpath eclipse-ecj)" \
+        -Djasper-jdt.jar="$(build-classpath ecj)" \
+        -Djdt.jar="$(build-classpath ecj)" \
         -Dtomcat-dbcp.jar="HACK" \
         -Dtomcat-native.tar.gz="HACK" \
         -Dversion="%{version}" \
-        -Dversion.build="%{macro_version}"
+        -Dversion.build="%{micro_version}"
     # javadoc generation
     %{ant} -f dist.xml dist-prepare
     %{ant} -f dist.xml dist-source
     %{ant} -f dist.xml dist-javadoc
     # remove some jars that we'll replace with symlinks later
     %{__rm} output/build/bin/commons-daemon.jar \
-            output/build/lib/eclipse-ecj.jar
+            output/build/lib/ecj.jar
     # remove the cruft we created
     %{__rm} output/build/bin/HACK \
             output/build/bin/tomcat-native.tar.gz \
@@ -244,8 +246,6 @@
     %{__cp} -a lib/*.jar ${RPM_BUILD_ROOT}%{libdir}
     %{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir}
 popd
-# remove admin webapp directory since it is not shipped and not available
-%{__rm} -r ${RPM_BUILD_ROOT}%{appdir}/ROOT/admin
 # javadoc
 pushd %{packdname}/output/dist/webapps
     %{__cp} -a docs/api/* ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}
@@ -338,7 +338,7 @@
 
 %post lib
 %{_bindir}/build-jar-repository %{libdir} commons-collections-tomcat5 \
-    commons-dbcp-tomcat5 commons-pool-tomcat5 eclipse-ecj 2>&1
+    commons-dbcp-tomcat5 commons-pool-tomcat5 ecj 2>&1
 
 %post servlet-%{servletspec}-api
 %{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \
@@ -361,7 +361,7 @@
     %{__rm} -f %{libdir}/\[commons-collections-tomcat5\].jar \
         %{libdir}/\[commons-dbcp-tomcat5\].jar \
         %{libdir}/\[commons-pool-tomcat5\].jar \
-        %{libdir}/\[eclipse-ecj\].jar >/dev/null 2>&1
+        %{libdir}/\[ecj\].jar >/dev/null 2>&1
 fi
 
 %postun jsp-%{jspspec}-api
@@ -434,6 +434,14 @@
 %{appdir}/sample
 
 %changelog
+* Tue Aug 26 2008 David Walluck <dwalluck at redhat.com> 0:6.0.18-1.1
+- 6.0.18
+- Resolves: CVE-2008-1232, CVE-2008-1947, CVE-2008-2370, CVE-2008-2938
+- fix definition of java.security.policy with d%%{name} start-security
+- don't pass $CATALINA_OPTS with d%%{name} stop
+- redefine tempdir and workdir for tmpwatch workaround
+- change eclipse-ecj references to ecj
+
 * Thu Jul 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:6.0.16-1.8
 - drop repotag
 



From victorv at fedoraproject.org  Fri Sep  5 17:25:03 2008
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Fri,  5 Sep 2008 17:25:03 +0000 (UTC)
Subject: rpms/netbeans-resolver/devel import.log, NONE,
	1.1 netbeans-resolver-6.1.patch, NONE,
	1.1 netbeans-resolver.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080905172503.E108D70121@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/netbeans-resolver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21470/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log netbeans-resolver-6.1.patch netbeans-resolver.spec 
Log Message:
Initial version



--- NEW FILE import.log ---
netbeans-resolver-6_1-5_fc10:HEAD:netbeans-resolver-6.1-5.fc10.src.rpm:1220635445

netbeans-resolver-6.1.patch:

--- NEW FILE netbeans-resolver-6.1.patch ---
diff -Nur xml-commons-resolver-1.1/resolver.xml xml-commons-resolver-1.1.new/resolver.xml
--- xml-commons-resolver-1.1/resolver.xml	2003-11-04 21:56:18.000000000 +0300
+++ xml-commons-resolver-1.1.new/resolver.xml	2008-07-12 01:20:42.000000000 +0400
@@ -83,7 +83,7 @@
 
    <echo message="Compiling..." />
 
-   <javac srcdir="${src.dir}" destdir="${build.classes.dir}">
+   <javac srcdir="${src.dir}" destdir="${build.classes.dir}" source="1.4" debug="on">
      <!-- <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.1/src/org/apache/xml/resolver/Catalog.java xml-commons-resolver-1.1.new/src/org/apache/xml/resolver/Catalog.java
--- xml-commons-resolver-1.1/src/org/apache/xml/resolver/Catalog.java	2003-11-04 21:56:16.000000000 +0300
+++ xml-commons-resolver-1.1.new/src/org/apache/xml/resolver/Catalog.java	2008-07-12 01:38:28.000000000 +0400
@@ -64,6 +64,7 @@
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Vector;
+import java.util.Iterator;
 import java.net.URL;
 import java.net.MalformedURLException;
 import org.apache.xml.resolver.CatalogManager;
@@ -1164,7 +1165,22 @@
     }
   }
 
-
+  /**
+   * 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.1/src/org/apache/xml/resolver/CatalogManager.java xml-commons-resolver-1.1.new/src/org/apache/xml/resolver/CatalogManager.java
--- xml-commons-resolver-1.1/src/org/apache/xml/resolver/CatalogManager.java	2003-11-04 21:56:16.000000000 +0300
+++ xml-commons-resolver-1.1.new/src/org/apache/xml/resolver/CatalogManager.java	2008-07-12 01:47:35.000000000 +0400
@@ -249,7 +249,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;
 
@@ -276,13 +280,14 @@
    * resources from it.
    */
   private synchronized void readProperties() {
+    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);
+	  debug.message(2, "Cannot find "+propertyFile);
 	  // there's no reason to give this warning more than once
 	  ignoreMissingProperties = true;
 	}
diff -Nur xml-commons-resolver-1.1/src/org/apache/xml/resolver/tools/CatalogResolver.java xml-commons-resolver-1.1.new/src/org/apache/xml/resolver/tools/CatalogResolver.java
--- xml-commons-resolver-1.1/src/org/apache/xml/resolver/tools/CatalogResolver.java	2003-11-04 21:56:16.000000000 +0300
+++ xml-commons-resolver-1.1.new/src/org/apache/xml/resolver/tools/CatalogResolver.java	2008-07-12 02:34:22.000000000 +0400
@@ -223,30 +223,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", resolved);
-	return null;
-      }
     }
 
     return null;


--- NEW FILE netbeans-resolver.spec ---
%define patched_resolver_ver 1.1
%define patched_resolver xml-commons-resolver-%{patched_resolver_ver}

Name:    netbeans-resolver
Version: 6.1
Release: 5%{?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

# see http://hg.netbeans._org/main/file/721f72486327/o.apache.xml.resolver/external/readme.txt
Patch0: %{name}-%{version}.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: ant
BuildRequires: dos2unix

Requires: jpackage-utils
Requires: java >= 1:1.6.0

%description
Resolver subproject of xml-commons, version %{patched_resolver_ver} with 
a patch for NetBeans.

%prep
%setup -q -n %{patched_resolver}
# remove all binary libs and prebuilt javadocs
find . -name "*.jar" -exec rm -f {} \;
%{__rm} -rf docs

%patch0 -p1 -b .sav

dos2unix -k KEYS
dos2unix -k LICENSE.resolver.txt

%build
%{ant} -f resolver.xml jar

%install
%{__rm} -rf %{buildroot}

# JARs
%{__mkdir_p} %{buildroot}%{_javadir}
%{__cp} -p build/resolver.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_javadir}/*
%doc LICENSE.resolver.txt KEYS

%changelog
* Fri Sep 05 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-5
- The description is formatted
- The license viersion is fixed

* Fri Aug 22 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-4
- The dos2unix package is added as the build requirements

* Fri Aug 22 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-3
- Redundant distribution tag is removed
- Redundant user-defined macros are removed
- java-devel is specified in BuildRequires insead of java-1.6.0-openjdk
- An epoch of 1 is included in the requirements for the Java versions
- The %%{buildroot} is used everywhere instead of $RPM_BUILD_ROOT
- The canonical RPM macros are used instead of the commands ant and rm
- The -k option is used for the dos2unix commands
- More correct source URL is used, i.e not a mirror

* Fri Aug 15 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-2
- Docummentaion is added
- Appropriate value of the Group Tag are chosen from the official list

* Fri Jun 06 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-1
- Initial version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-resolver/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:40:08 -0000	1.1
+++ .cvsignore	5 Sep 2008 17:24:33 -0000	1.2
@@ -0,0 +1 @@
+xml-commons-resolver-1.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-resolver/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:40:08 -0000	1.1
+++ sources	5 Sep 2008 17:24:33 -0000	1.2
@@ -0,0 +1 @@
+3843a1350ee040c1f68074e6878b4fb1  xml-commons-resolver-1.1.zip



From lucilanga at fedoraproject.org  Fri Sep  5 17:43:43 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Fri,  5 Sep 2008 17:43:43 +0000 (UTC)
Subject: rpms/qrq/devel qrq-0.1.4-makefile.patch, NONE, 1.1 qrq.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080905174343.52A5070121@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/qrq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25759

Modified Files:
	.cvsignore sources 
Added Files:
	qrq-0.1.4-makefile.patch qrq.spec 
Log Message:
initial import

qrq-0.1.4-makefile.patch:

--- NEW FILE qrq-0.1.4-makefile.patch ---
--- qrq-0.1.4/Makefile	2008-06-22 22:27:57.000000000 +0300
+++ qrq-0.1.4-mod/Makefile	2008-09-03 21:33:00.000000000 +0300
@@ -73,12 +73,12 @@
 	install -d -v               $(DESTDIR)/share/qrq/
 	install -d -v               $(DESTDIR)/share/man/man1/
 	install -d -v               $(DESTDIR)/bin/
-	install -s -m 0755 qrq      $(DESTDIR)/bin/
-	install    -m 0755 qrqscore $(DESTDIR)/bin/
-	install    -m 0644 qrq.1    $(DESTDIR)/share/man/man1/
-	install    -m 0644 callbase $(DESTDIR)/share/qrq/
-	install    -m 0644 qrqrc    $(DESTDIR)/share/qrq/
-	install    -m 0644 toplist  $(DESTDIR)/share/qrq/
+	install -p -m 0755 qrq      $(DESTDIR)/bin/
+	install -p -m 0755 qrqscore $(DESTDIR)/bin/
+	install -p -m 0644 qrq.1    $(DESTDIR)/share/man/man1/
+	install -p -m 0644 callbase $(DESTDIR)/share/qrq/
+	install -p -m 0644 qrqrc    $(DESTDIR)/share/qrq/
+	install -p -m 0644 toplist  $(DESTDIR)/share/qrq/
 
 	
 uninstall:


--- NEW FILE qrq.spec ---
Name:           qrq
Version:        0.1.4
Release:        3%{?dist}
Summary:        Morse telegraphy trainer

Group:          Applications/Communications
License:        GPLv2+
URL:            http://fkurz.net/ham/qrq.html
Source0:        http://fkurz.net/ham/qrq/qrq-%{version}.tar.gz
#Fix DESTDIR, Don't strip, preserve timestamps
Patch0:         qrq-0.1.4-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ncurses-devel
#Requires:       

%description
qrq is an open source morse telegraphy trainer for Linux and Unix operating
systems, similar to the classic DOS version of Rufz by DL4MM.

It's not intended for learning telegraphy, but to improve the ability to
copy callsigns at high speeds, as needed for example for Contesting. 

%prep
%setup -q
%patch0 -p1

%build
make CFLAGS="%{optflags}" %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}%{_prefix} OSX_BUNDLE=NO


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING README
%{_bindir}/qrq
%{_bindir}/qrqscore
%{_mandir}/man?/*
%{_datadir}/qrq

%changelog
* Thu Sep 04 2008 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-3
- fix CFLAGS

* Wed Sep 03 2008 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-2
- misc cleanups
- new upstream 0.1.4

* Mon Jan 07 2008 Robet 'Bob' Jensen - 0.1.3-1
- Version Update
* Mon Dec 10 2007 Sindre Pedersen Bj??rdal - 0.1.2-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qrq/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 17:01:36 -0000	1.1
+++ .cvsignore	5 Sep 2008 17:43:12 -0000	1.2
@@ -0,0 +1 @@
+qrq-0.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qrq/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 17:01:36 -0000	1.1
+++ sources	5 Sep 2008 17:43:12 -0000	1.2
@@ -0,0 +1 @@
+398b7368e10617deeba8e0e159755d7e  qrq-0.1.4.tar.gz



From cwickert at fedoraproject.org  Fri Sep  5 18:00:48 2008
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  5 Sep 2008 18:00:48 +0000 (UTC)
Subject: rpms/xfce-mcs-plugins-extra/devel import.log, NONE,
	1.1 xfce-mcs-plugins-extra-2.0-volman.patch, NONE,
	1.1 xfce-mcs-plugins-extra.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080905180048.2D5A670126@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce-mcs-plugins-extra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29623/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xfce-mcs-plugins-extra-2.0-volman.patch 
	xfce-mcs-plugins-extra.spec 
Log Message:
Initial import of xfce-mcs-plugins-extra. Review was at
https://bugzilla.redhat.com/show_bug.cgi?id=455989



--- NEW FILE import.log ---
xfce-mcs-plugins-extra-2_0-2_fc10:HEAD:xfce-mcs-plugins-extra-2.0-2.fc10.src.rpm:1220637559

xfce-mcs-plugins-extra-2.0-volman.patch:

--- NEW FILE xfce-mcs-plugins-extra-2.0-volman.patch ---
diff -dur xfce-mcs-plugins-extra-2.0.orig/config.h.in xfce-mcs-plugins-extra-2.0/config.h.in
--- xfce-mcs-plugins-extra-2.0.orig/config.h.in	2008-03-28 21:59:17.000000000 +0100
+++ xfce-mcs-plugins-extra-2.0/config.h.in	2008-09-04 23:18:48.000000000 +0200
@@ -86,3 +86,6 @@
 
 /* Version number of package */
 #undef VERSION
+
+/* Define the full thunar volman settings path */
+#undef VOLMAN_PATH
Nur in xfce-mcs-plugins-extra-2.0: config.h.in.orig.
diff -dur xfce-mcs-plugins-extra-2.0.orig/configure.in xfce-mcs-plugins-extra-2.0/configure.in
--- xfce-mcs-plugins-extra-2.0.orig/configure.in	2008-03-28 21:58:28.000000000 +0100
+++ xfce-mcs-plugins-extra-2.0/configure.in	2008-09-04 23:18:50.000000000 +0200
@@ -79,6 +79,17 @@
 AC_SUBST(VOLMAN_PLUGIN_DIR)
 AM_CONDITIONAL([BUILD_VOLMAN_PLUGIN], [test "x$build_volman_plugin" = "xyes"])
 
+dnl
+dnl give the thunar-volman path
+dnl
+AC_ARG_WITH([volman],
+    [AC_HELP_STRING([--with-volman=FULLPATH],
+        [Specify thunar-volman settings path (default=/usr/lib/thunar-volman/thunar-volman-settings)])],
+    [VOLMAN_PATH="$withval"],
+    [VOLMAN_PATH="/usr/lib/thunar-volman/thunar-volman-settings"])
+AC_DEFINE_UNQUOTED([VOLMAN_PATH], ["${VOLMAN_PATH}"], [Define the full thunar volman settings path])
+
+
 AC_OUTPUT([
 Makefile
 src/Makefile
Nur in xfce-mcs-plugins-extra-2.0: configure.in.orig.
diff -dur xfce-mcs-plugins-extra-2.0.orig/src/volman/volman.c xfce-mcs-plugins-extra-2.0/src/volman/volman.c
--- xfce-mcs-plugins-extra-2.0.orig/src/volman/volman.c	2008-03-28 21:58:28.000000000 +0100
+++ xfce-mcs-plugins-extra-2.0/src/volman/volman.c	2008-09-04 23:18:51.000000000 +0200
@@ -32,7 +32,7 @@
 #include <libxfce4mcs/mcs-manager.h>
 #include <xfce-mcs-manager/manager-plugin.h>
 
-#define EXE "/usr/lib/thunar-volman/thunar-volman-settings"
+#define EXE VOLMAN_PATH
 #define ICON "gnome-dev-removable"
 
 /* static prototypes */
Nur in xfce-mcs-plugins-extra-2.0/src/volman: volman.c.orig.


--- NEW FILE xfce-mcs-plugins-extra.spec ---
Name:           xfce-mcs-plugins-extra
Version:        2.0
Release:        2%{?dist}
Summary:        Extra plugins for the Xfce mcs manager

Group:          User Interface/Desktops
License:        GPLv2
URL:            https://launchpad.net/xfce-mcs-plugins-extra
Source0:        http://archive.ubuntu.com/ubuntu/pool/universe/x/%{name}/%{name}_2.0.orig.tar.gz
Patch0:         %{name}-2.0-volman.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  xfce-mcs-manager-devel  >= 4.4.0, xfce4-dev-tools
BuildRequires:  gettext, perl(XML::Parser)
Requires:       xfce-mcs-manager >= 4.4.0, xfce4-session, xfdesktop, thunar-volman
# this one is optional, everything is detected at runtime
#Requires:       scim

%description
This packages provides additional configuration items to be included in the 
Xfce settings manager:
- Autostarted applications
- Menu editor
- Removable drives and media
- SCIM input method


%prep
%setup -q
%patch0 -p1 -b .volman

%build
xdt-autogen
%configure --disable-static --with-gnu-ld --with-volman=%{_libexecdir}/thunar-volman-settings
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*plugin.la
%find_lang %{name}


%post
killall -HUP xfce-mcs-manager > /dev/null || :


%postun
killall -HUP xfce-mcs-manager > /dev/null || :
#pkill -USR1 -f xfce-mcs-manager || true


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{_libdir}/xfce4/mcs-plugins/*_plugin.so


%changelog
* Sun Sep 04 2008 Christoph Wickert <fedora christoph-wickert de> - 2.0-2
- Change License tag to GPLv2
- Configure with --with-gnu-ld
- Patch out hardcoded path of thunar-volman-settings

* Sat Jul 19 2008 Christoph Wickert <fedora christoph-wickert de> - 2.0-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce-mcs-plugins-extra/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:37:52 -0000	1.1
+++ .cvsignore	5 Sep 2008 18:00:17 -0000	1.2
@@ -0,0 +1 @@
+xfce-mcs-plugins-extra_2.0.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce-mcs-plugins-extra/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:37:52 -0000	1.1
+++ sources	5 Sep 2008 18:00:17 -0000	1.2
@@ -0,0 +1 @@
+979e6f001c60b47aa52fc628c7ec5ef1  xfce-mcs-plugins-extra_2.0.orig.tar.gz



From spot at fedoraproject.org  Fri Sep  5 18:02:01 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  5 Sep 2008 18:02:01 +0000 (UTC)
Subject: rpms/squirrelmail/devel squirrelmail-1.4.15-tr-fix.patch, NONE,
	1.1 .cvsignore, 1.21, 1.22 sources, 1.21,
	1.22 squirrelmail-1.4.6-japanese-multibyte-view-body.patch, 1.2,
	1.3 squirrelmail-1.4.6-japanese-multibyte-view-text.patch, 1.3,
	1.4 squirrelmail.spec, 1.56, 1.57
Message-ID: <20080905180201.3BC4370121@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/squirrelmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30357

Modified Files:
	.cvsignore sources 
	squirrelmail-1.4.6-japanese-multibyte-view-body.patch 
	squirrelmail-1.4.6-japanese-multibyte-view-text.patch 
	squirrelmail.spec 
Added Files:
	squirrelmail-1.4.15-tr-fix.patch 
Log Message:
fix license, update to 1.4.15

squirrelmail-1.4.15-tr-fix.patch:

--- NEW FILE squirrelmail-1.4.15-tr-fix.patch ---
diff -up squirrelmail-1.4.15/locale_tempdir/locale/tr_TR/LC_MESSAGES/squirrelmail.po.BAD squirrelmail-1.4.15/locale_tempdir/locale/tr_TR/LC_MESSAGES/squirrelmail.po
--- squirrelmail-1.4.15/locale_tempdir/locale/tr_TR/LC_MESSAGES/squirrelmail.po.BAD	2008-09-05 13:51:40.000000000 -0400
+++ squirrelmail-1.4.15/locale_tempdir/locale/tr_TR/LC_MESSAGES/squirrelmail.po	2008-09-05 13:53:32.000000000 -0400
@@ -130,6 +130,10 @@ msgstr "Se?ili ??eyi d?zenle"
 msgid "Delete selected"
 msgstr "Se?ili ??eyi sil"
 
+#, fuzzy
+msgid "Compose to selected"
+msgstr "Se?ili ??eyi sil"
+
 msgid "sort by nickname"
 msgstr "rumuza g?re s?rala"
 
@@ -705,7 +709,8 @@ msgstr "Okundu:"
 msgid "Your message"
 msgstr "Sizin mesaj?n?z"
 
-msgid "Sent:"
+#, fuzzy
+msgid "Sent"
 msgstr "G?nderildi:"
 
 #, php-format
@@ -907,10 +912,12 @@ msgstr "Veritaban? hatas?: %s"
 msgid "Address book is read-only"
 msgstr "Adres defteri salt okunur durumda"
 
+#. i18n: don't use html formating in translation
 #, php-format
 msgid "User \"%s\" already exists"
 msgstr "\"%s\" kullan?c?s? zaten var"
 
+#. i18n: don't use html formating in translation
 #, php-format
 msgid "User \"%s\" does not exist"
 msgstr "\"%s\" kullan?c?s? yok"
@@ -984,6 +991,9 @@ msgstr "G?r?nt?le"
 msgid "View Business Card"
 msgstr "?? Kart?n? G?r?nt?le"
 
+msgid "Your session has expired, but will be resumed after logging in again."
+msgstr ""
+
 msgid "Sunday"
 msgstr "Pazar"
 
@@ -1351,9 +1361,11 @@ msgstr "T?m?n? B?rak"
 msgid "Select All"
 msgstr "T?m?n? Se?"
 
+#, php-format
 msgid "Viewing Messages: %s to %s (%s total)"
 msgstr "G?r?nt?lenen Mesajlar: %s ile %s aras? (toplam %s)"
 
+#, php-format
 msgid "Viewing Message: %s (%s total)"
 msgstr "G?r?nt?lenen Mesaj: %s (toplam %s)"
 
@@ -1399,15 +1411,25 @@ msgstr "sec_remove_tr_TR.png"
 msgid "This external link will open in a new window"
 msgstr "Bu d?? link yeni bir pencerede a??lacakt?r"
 
+#, php-format
 msgid "Option Type '%s' Not Found"
 msgstr "'%s' Se?enek Tipi Bulunamad?"
 
+#, fuzzy
+msgid "Delete Selected"
+msgstr "Se?ili ??eyi sil"
+
+#, fuzzy, php-format
+msgid "Edit List Layout Type '%s' Not Found"
+msgstr "'%s' Se?enek Tipi Bulunamad?"
+
 msgid "Current Folder"
 msgstr "G?r?nt?lenen Klas?r"
 
 msgid "Compose"
 msgstr "Mesaj Yaz"
 
+#, php-format
 msgid "Error creating directory %s."
 msgstr "%s dizini olu?turulurken hata olu?tu."
 
@@ -1562,7 +1584,8 @@ msgstr "Ba?l?klar ve mesaj g?vdesi aras?
 msgid "After message body"
 msgstr "Mesaj g?vdesinden sonra"
 
-msgid "Addressbook Display Format"
+#, fuzzy
+msgid "Address Book Display Format"
 msgstr "Adres Defteri G?r?n?m Bi?imi"
 
 msgid "Javascript"
@@ -1571,15 +1594,26 @@ msgstr "Javascript"
 msgid "HTML"
 msgstr "HTML"
 
+msgid "Format of Addresses Added From Address Book"
+msgstr ""
+
+msgid "No prefix/Address only"
+msgstr ""
+
+#, fuzzy
+msgid "Nickname and address"
+msgstr "?sim ve Adres Se?enekleri"
+
+#, fuzzy
+msgid "Full name and address"
+msgstr "?sim ve Adres Se?enekleri"
+
 msgid "Show HTML Version by Default"
 msgstr "Varsay?lan olarak HTML G?ster"
 
 msgid "Enable Forward as Attachment"
 msgstr "Eklenti Olarak ?let Se?ene?ini Etkinle?tir"
 
-msgid "Include CCs when Forwarding Messages"
-msgstr "Mesajlar? ?letirken Cc'leri Silme"
-
 msgid "Include Me in CC when I Reply All"
 msgstr "Herkese Cevap Yazd???mda Beni Cc'ye Ekle"
 
@@ -1982,6 +2016,12 @@ msgstr "SMTP do?rulama yok"
 msgid "Login (plain text)"
 msgstr "Login (d?z yaz?)"
 
+msgid "Custom SMTP AUTH username"
+msgstr ""
+
+msgid "Custom SMTP AUTH password"
+msgstr ""
+
 msgid "POP3 Before SMTP?"
 msgstr "SMTP'den ?nce POP3"
 
@@ -2231,6 +2271,10 @@ msgid ""
 msgstr ""
 "Bu mod?l SquirrelMail'in ana yap?land?rmas?n? uzaktan y?netmenizi sa?lar."
 
+#, fuzzy
+msgid "Plugin is not enabled"
+msgstr "Eklenti devde d???."
+
 msgid "Submit a Bug Report"
 msgstr "Bir Hata Raporu G?nder"
 
@@ -2314,7 +2358,8 @@ msgstr "Hata Raporu Formuna Ba?la"
 msgid "Bug"
 msgstr "Hata"
 
-msgid "Bug Reports:"
+#, fuzzy
+msgid "Bug Reports"
 msgstr "Hata Raporlar?:"
 
 msgid "Show button in toolbar"
@@ -2756,7 +2801,8 @@ msgstr "%s bulunamad?."
 msgid "Today's Fortune"
 msgstr "G?n?n Fal?"
 
-msgid "Fortunes:"
+#, fuzzy
+msgid "Fortunes"
 msgstr "Fallar:"
 
 msgid "Show fortunes at top of mailbox"
@@ -2826,33 +2872,21 @@ msgstr "Liste Sahibi ?le Temas Kur"
 msgid "Mailing List"
 msgstr "Mesaj Listesi"
 
-msgid "POP3 connect:"
-msgstr "POP3 ba?lant?s?:"
-
 msgid "No server specified"
 msgstr "Sunucu tan?mlanmad?"
 
 msgid "Error "
 msgstr "Hata "
 
-msgid "POP3 user:"
-msgstr "POP3 kullan?c?s?:"
-
 msgid "no login ID submitted"
 msgstr "kullan?c? ad? verilmedi"
 
 msgid "connection not established"
 msgstr "ba?lant? kurulmad?"
 
-msgid "POP3 pass:"
-msgstr "POP3 ?ifresi:"
-
 msgid "No password submitted"
 msgstr "?ifre verilmedi"
 
-msgid "POP3 apop:"
-msgstr "POP3 apop:"
-
 msgid "No connection to server"
 msgstr "Sunucuya ba?lant? yok"
 
@@ -2868,45 +2902,15 @@ msgstr "durdur"
 msgid "apop authentication failed"
 msgstr "apop do?rulamas? ba?ar?s?z oldu"
 
-msgid "POP3 login:"
-msgstr "POP3 login:"
-
-msgid "POP3 top:"
-msgstr "POP3 top:"
-
-msgid "POP3 pop_list:"
-msgstr "POP3 pop_list:"
-
 msgid "Premature end of list"
 msgstr "Premat?re liste sonu"
 
-msgid "POP3 get:"
-msgstr "POP3 al:"
-
-msgid "POP3 last:"
-msgstr "POP3 son:"
-
-msgid "POP3 reset:"
-msgstr "POP3 reset:"
-
-msgid "POP3 send_cmd:"
-msgstr "POP3 send_cmd:"
-
 msgid "Empty command string"
 msgstr "Bo? komut giri?i"
 
-msgid "POP3 quit:"
-msgstr "POP3 ??k??:"
-
 msgid "connection does not exist"
 msgstr "ba?lant? mevcut de?il"
 
-msgid "POP3 uidl:"
-msgstr "POP3 uidl:"
-
-msgid "POP3 delete:"
-msgstr "POP3 sil:"
-
 msgid "No msg number submitted"
 msgstr "Mesaj numaras? girilmedi"
 
@@ -3164,12 +3168,11 @@ msgstr ""
 msgid "Count only messages that are RECENT"
 msgstr "Sadece YEN? mesajlar? say"
 
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "Selecting the %s option will change the title in some browsers to let you "
-"know when you have new mail (requires JavaScript, and only works in IE but "
-"you won't see errors with other browsers). This will always tell you if you "
-"have new mail, even if you have %s enabled."
+"know when you have new mail (requires JavaScript). This will always tell you "
+"if you have new mail, even if you have %s enabled."
 msgstr ""
 "%s se?ene?i baz? taray?c?larda yeni mesaj ald???n?z? belirtmek i?in ba?l???n "
 "de?i?mesini sa?lar (JavaScript gerektirir ve sadece IE ile ?al???r fakat "
@@ -3210,6 +3213,17 @@ msgstr "(hi?biri)"
 msgid "requires JavaScript to work"
 msgstr "?al??mak i?in JavaScript gerektirir"
 
+#, fuzzy
+msgid "Width of popup window:"
+msgstr "Yaz?m Penceresinin Geni?li?i"
+
+msgid "If set to 0, reverts to default value"
+msgstr ""
+
+#, fuzzy
+msgid "Height of popup window:"
+msgstr "Yaz?m Penceresinin Y?ksekli?i"
+
 msgid "Try"
 msgstr "Dene"
 
@@ -3546,9 +3560,6 @@ msgstr "Bu, ki?isel s?zl?k dosyan?z? sil
 msgid "Error Decrypting Dictionary"
 msgstr "S?zl?k ?ifresi ??z?l?rken Hata Oldu"
 
-msgid "Cute."
-msgstr "Sevimli."
-
 #, php-format
 msgid "Could not run the spellchecker command (%s)."
 msgstr "Yaz?m kontrol komutu ?al??t?r?lamad? (%s)."
@@ -3838,6 +3849,9 @@ msgstr ""
 msgid "SquirrelSpell Initiating"
 msgstr "SquirrelSpell Ba?l?yor"
 
+msgid ", "
+msgstr ""
+
 #, php-format
 msgid "Settings adjusted to: %s with %s as default dictionary."
 msgstr "Ayarlar ??yle yap?ld?: Varsay?lan s?zl?k olarak %s ile %s."
@@ -4084,3 +4098,51 @@ msgstr "Da??t?lmayan Mesaj Ba?l?klar?"
 
 msgid "This image has been removed for security reasons"
 msgstr "Bu resim g?venlik nedenleriyle kald?r?lm??t?r"
+
+#~ msgid "Include CCs when Forwarding Messages"
+#~ msgstr "Mesajlar? ?letirken Cc'leri Silme"
+
+#~ msgid "POP3 connect:"
+#~ msgstr "POP3 ba?lant?s?:"
+
+#~ msgid "POP3 user:"
+#~ msgstr "POP3 kullan?c?s?:"
+
+#~ msgid "POP3 pass:"
+#~ msgstr "POP3 ?ifresi:"
+
+#~ msgid "POP3 apop:"
+#~ msgstr "POP3 apop:"
+
+#~ msgid "POP3 login:"
+#~ msgstr "POP3 login:"
+
+#~ msgid "POP3 top:"
+#~ msgstr "POP3 top:"
+
+#~ msgid "POP3 pop_list:"
+#~ msgstr "POP3 pop_list:"
+
+#~ msgid "POP3 get:"
+#~ msgstr "POP3 al:"
+
+#~ msgid "POP3 last:"
+#~ msgstr "POP3 son:"
+
+#~ msgid "POP3 reset:"
+#~ msgstr "POP3 reset:"
+
+#~ msgid "POP3 send_cmd:"
+#~ msgstr "POP3 send_cmd:"
+
+#~ msgid "POP3 quit:"
+#~ msgstr "POP3 ??k??:"
+
+#~ msgid "POP3 uidl:"
+#~ msgstr "POP3 uidl:"
+
+#~ msgid "POP3 delete:"
+#~ msgstr "POP3 sil:"
+
+#~ msgid "Cute."
+#~ msgstr "Sevimli."


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squirrelmail/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	14 Dec 2007 22:02:14 -0000	1.21
+++ .cvsignore	5 Sep 2008 18:01:30 -0000	1.22
@@ -1,2 +1,2 @@
-squirrelmail-1.4.13.tar.bz2
-all_locales-1.4.9-20070106.tar.bz2
+squirrelmail-1.4.15.tar.bz2
+all_locales-1.4.13-20071220.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squirrelmail/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	14 Dec 2007 22:02:14 -0000	1.21
+++ sources	5 Sep 2008 18:01:30 -0000	1.22
@@ -1,2 +1,2 @@
-1a1bdad6245aaabcdd23d9402acb388e  squirrelmail-1.4.13.tar.bz2
-eaa0e8835b8d7d451500aad907c22e24  all_locales-1.4.9-20070106.tar.bz2
+22164ce827edafd0afd65763d2a0f096  squirrelmail-1.4.15.tar.bz2
+c6463312afcd602ae60fd8f388dfb8c2  all_locales-1.4.13-20071220.tar.bz2

squirrelmail-1.4.6-japanese-multibyte-view-body.patch:

Index: squirrelmail-1.4.6-japanese-multibyte-view-body.patch
===================================================================
RCS file: /cvs/pkgs/rpms/squirrelmail/devel/squirrelmail-1.4.6-japanese-multibyte-view-body.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- squirrelmail-1.4.6-japanese-multibyte-view-body.patch	9 Jul 2006 20:50:24 -0000	1.2
+++ squirrelmail-1.4.6-japanese-multibyte-view-body.patch	5 Sep 2008 18:01:30 -0000	1.3
@@ -1,26 +1,26 @@
-diff -ruNp squirrelmail-1.4.6.org/functions/mime.php squirrelmail-1.4.6/functions/mime.php
---- squirrelmail-1.4.6.org/functions/mime.php	2006-06-29 08:23:58.000000000 +0900
-+++ squirrelmail-1.4.6/functions/mime.php	2006-06-29 08:34:26.000000000 +0900
-@@ -353,8 +353,20 @@ function formatBody($imap_stream, $messa
-                 $body = charset_decode($body_message->header->getParameter('charset'),$body,false,true);
+diff -up squirrelmail-1.4.13/functions/mime.php.BAD squirrelmail-1.4.13/functions/mime.php
+--- squirrelmail-1.4.13/functions/mime.php.BAD	2008-09-05 12:24:10.000000000 -0400
++++ squirrelmail-1.4.13/functions/mime.php	2008-09-05 12:24:36.000000000 -0400
+@@ -361,8 +361,20 @@ function formatBody($imap_stream, $messa
+                 $body = magicHTML($body, $id, $message, $mailbox);
              }
          } else {
 -            translateText($body, $wrap_at,
 -                    $body_message->header->getParameter('charset'));
-+	    if($squirrelmail_language != 'ja_JP'){
-+		    translateText($body, $wrap_at,
-+				  $body_message->header->getParameter('charset'));
-+	    } else {
-+		    if($body_message->header->encoding == 'base64' ||
-+		       $body_message->header->encoding == 'quoted-printable' ||
-+		       $body_message->header->encoding == 'quoted_printable'){
-+			    translateText($body, $wrap_at, $default_charset);
-+		    } else {
-+			    // it may never call here.
-+			    translateText($body, $wrap_at,
-+					  $body_message->header->getParameter('charset'));
-+		    }
-+	    }
++           if($squirrelmail_language != 'ja_JP'){
++                   translateText($body, $wrap_at,
++                                 $body_message->header->getParameter('charset'));
++           } else {
++                   if($body_message->header->encoding == 'base64' ||
++                      $body_message->header->encoding == 'quoted-printable' ||
++                      $body_message->header->encoding == 'quoted_printable'){
++                           translateText($body, $wrap_at, $default_charset);
++                   } else {
++                           // it may never call here.
++                           translateText($body, $wrap_at,
++                                         $body_message->header->getParameter('charset'));
++                   }
++           }
          }
  
          // if this is the clean display (i.e. printer friendly), stop here.

squirrelmail-1.4.6-japanese-multibyte-view-text.patch:

Index: squirrelmail-1.4.6-japanese-multibyte-view-text.patch
===================================================================
RCS file: /cvs/pkgs/rpms/squirrelmail/devel/squirrelmail-1.4.6-japanese-multibyte-view-text.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- squirrelmail-1.4.6-japanese-multibyte-view-text.patch	17 Apr 2007 16:52:44 -0000	1.3
+++ squirrelmail-1.4.6-japanese-multibyte-view-text.patch	5 Sep 2008 18:01:30 -0000	1.4
@@ -1,17 +1,16 @@
-diff -ruNp squirrelmail-1.4.6.org/src/view_text.php squirrelmail-1.4.6/src/view_text.php
---- squirrelmail-1.4.6.org/src/view_text.php	2006-02-04 07:27:55.000000000 +0900
-+++ squirrelmail-1.4.6/src/view_text.php	2006-06-29 08:30:04.000000000 +0900
-@@ -81,7 +81,17 @@ if ($type1 == 'html' || (isset($override
-     if (! empty($charset))
-         $body = charset_decode($charset,$body,false,true);
+diff -up squirrelmail-1.4.13/src/view_text.php.BAD squirrelmail-1.4.13/src/view_text.php
+--- squirrelmail-1.4.13/src/view_text.php.BAD	2008-09-05 12:22:02.000000000 -0400
++++ squirrelmail-1.4.13/src/view_text.php	2008-09-05 12:23:20.000000000 -0400
+@@ -84,7 +84,17 @@ if ($type1 == 'html' || (isset($override
+     $body = magicHTML( $body, $passed_id, $message, $mailbox);
  } else {
      $ishtml = FALSE;
 -    translateText($body, $wrap_at, $charset);
 +    if($squirrelmail_language != 'ja_JP'){
 +        translateText($body, $wrap_at, $charset);
 +    } else {
-+        if($encoding == 'base64' || $encoding == 'quoted-printable' || 
-+	   $encoding == 'quoted_printable'){
++        if($encoding == 'base64' || $encoding == 'quoted-printable' ||
++          $encoding == 'quoted_printable'){
 +           translateText($body, $wrap_at, $default_charset);
 +        } else {
 +            // it may never call here.


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- squirrelmail.spec	14 Dec 2007 22:02:14 -0000	1.56
+++ squirrelmail.spec	5 Sep 2008 18:01:30 -0000	1.57
@@ -5,23 +5,25 @@
 
 Summary: SquirrelMail webmail client
 Name: squirrelmail
-Version: 1.4.13
+Version: 1.4.15
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
 Source0: http://prdownloads.sourceforge.net/squirrelmail/%{name}-%{version}.tar.bz2
 Source1: squirrelmail.conf
 Source2: squirrelmail-splash-fedora.png
 Source3: squirrelmail-splash-rhel.png
-Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.9-20070106.tar.bz2
+Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.13-20071220.tar.bz2
 Source5: config_local.php
 Patch1:  squirrelmail-1.4.6-zenkaku-subject-convert.patch
 #Patch2:  squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch
 Patch3:  squirrelmail-1.4.6-japanese-multibyte-view-text.patch
 Patch4:  squirrelmail-1.4.6-japanese-multibyte-view-body.patch
 #Patch5:  squirrelmail-1.4.7-ja-translate.patch
-Patch6:  squirrelmail-1.4.9a-id_plural.patch
+#Patch6:  squirrelmail-1.4.9a-id_plural.patch
+# Taken from upstream
+Patch7:  squirrelmail-1.4.15-tr-fix.patch
 # CVE-2006-6142
 #Patch100:  squirrelmail-1.4.8-CVE-2006-6142-draft_composesess.patch
 #Patch101:  squirrelmail-1.4.8-CVE-2006-6142-mailto.patch
@@ -57,7 +59,8 @@
 mkdir locale_tempdir
 cd locale_tempdir
 tar xfj %SOURCE4
-%patch6 -p2
+#%patch6 -p2
+%patch7 -p2
 
 %build
 rm -f plugins/make_archive.pl
@@ -258,6 +261,10 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4.15-1
+- fix license tag
+- update to 1.4.15
+
 * Fri Dec 14 2007 Kevin Fenzi <kevin at tummy.com> - 1.4.13-1
 - upgrade to new upstream 1.4.13
 - note that this package was never vulnerable to CVE-2007-6348



From pkgdb at fedoraproject.org  Fri Sep  5 18:02:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 18:02:19 +0000
Subject: [pkgdb] perl-Class-MethodMaker ownership updated
Message-ID: <20080905180219.AB4B3208771@bastion.fedora.phx.redhat.com>

Package perl-Class-MethodMaker in Fedora 3 was orphaned by dgregor

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Fri Sep  5 18:02:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 18:02:32 +0000
Subject: [pkgdb] perl-Class-MethodMaker ownership updated
Message-ID: <20080905180232.4929220876B@bastion.fedora.phx.redhat.com>

Package perl-Class-MethodMaker in Fedora EPEL 5 was orphaned by dgregor

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Fri Sep  5 18:02:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 18:02:29 +0000
Subject: [pkgdb] perl-Class-MethodMaker ownership updated
Message-ID: <20080905180230.0882B208769@bastion.fedora.phx.redhat.com>

Package perl-Class-MethodMaker in Fedora EPEL 4 was orphaned by dgregor

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Fri Sep  5 18:02:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 18:02:37 +0000
Subject: [pkgdb] perl-Class-MethodMaker ownership updated
Message-ID: <20080905180238.1115F208771@bastion.fedora.phx.redhat.com>

Package perl-Class-MethodMaker in Fedora 9 was orphaned by dgregor

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Fri Sep  5 18:02:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 18:02:35 +0000
Subject: [pkgdb] perl-Class-MethodMaker ownership updated
Message-ID: <20080905180236.0FF3020876F@bastion.fedora.phx.redhat.com>

Package perl-Class-MethodMaker in Fedora 8 was orphaned by dgregor

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Fri Sep  5 18:03:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 18:03:30 +0000
Subject: [pkgdb] perl-Config-Record ownership updated
Message-ID: <20080905180330.4517920876B@bastion.fedora.phx.redhat.com>

Package perl-Config-Record in Fedora devel was orphaned by dgregor

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-Record



From pkgdb at fedoraproject.org  Fri Sep  5 18:03:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 18:03:37 +0000
Subject: [pkgdb] perl-Config-Record ownership updated
Message-ID: <20080905180337.7A08020876E@bastion.fedora.phx.redhat.com>

Package perl-Config-Record in Fedora 8 was orphaned by dgregor

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-Record



From dbhole at fedoraproject.org  Fri Sep  5 18:03:49 2008
From: dbhole at fedoraproject.org (Deepak Bhole)
Date: Fri,  5 Sep 2008 18:03:49 +0000 (UTC)
Subject: rpms/jgroups/devel jgroups.spec,1.20,1.21
Message-ID: <20080905180349.09D8170121@cvs1.fedora.phx.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/jgroups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30978/devel

Modified Files:
	jgroups.spec 
Log Message:

Fix bouncycastle classpath




Index: jgroups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jgroups/devel/jgroups.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jgroups.spec	9 Jul 2008 20:05:49 -0000	1.20
+++ jgroups.spec	5 Sep 2008 18:03:18 -0000	1.21
@@ -43,7 +43,7 @@
 
 Name:		jgroups
 Version:	2.2.9.2
-Release:	4.5%{?dist}
+Release:	4.6%{?dist}
 Epoch:		0
 Summary:	Toolkit for reliable multicast communication.
 License:	LGPLv2+
@@ -61,6 +61,7 @@
 Requires:	xalan-j2
 Requires:	bouncycastle
 BuildRequires:	ant >= 0:1.6
+BuildRequires:  ant-trax
 BuildRequires:	bsh
 BuildRequires:	concurrent
 BuildRequires:	jakarta-commons-logging
@@ -127,7 +128,6 @@
 %patch0 -b .sav
 
 %build
-export OPT_JAR_LIST="ant-launcher ant/ant-junit junit"
 pushd lib
 ln -sf $(build-classpath bsh) .
 ln -sf $(build-classpath commons-logging) .
@@ -142,7 +142,7 @@
 %else
 export ANT_OPTS="-Djava.net.preferIPv4Stack=true"
 # Added gcj-endorsed/bc-prov to build the encrypt test
-export CLASSPATH=$CLASSPATH:`build-classpath xalan-j2 xalan-j2-serializer gcj-endorsed/bc-prov`
+export CLASSPATH=$CLASSPATH:`build-classpath xalan-j2 xalan-j2-serializer bcprov`
 ant jar javadoc jboss-service jgroups-service unittests testreport
 %endif
 
@@ -226,6 +226,9 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul  9 2008 Deepak Bhole <dbhole at redhat.com> 2.2.9.2-4.6
+- Fix bouncycastle classpath
+
 * Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:2.2.9.2-4.5
 - drop repotag
 



From pkgdb at fedoraproject.org  Fri Sep  5 18:03:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 18:03:39 +0000
Subject: [pkgdb] perl-Config-Record ownership updated
Message-ID: <20080905180339.1A229208D07@bastion.fedora.phx.redhat.com>

Package perl-Config-Record in Fedora 9 was orphaned by dgregor

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-Record



From dbhole at fedoraproject.org  Fri Sep  5 18:05:29 2008
From: dbhole at fedoraproject.org (Deepak Bhole)
Date: Fri,  5 Sep 2008 18:05:29 +0000 (UTC)
Subject: rpms/maven2/devel maven2.spec,1.13,1.14
Message-ID: <20080905180529.1D61E70121@cvs1.fedora.phx.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/maven2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31371

Modified Files:
	maven2.spec 
Log Message:

Fallback to gcj build




Index: maven2.spec
===================================================================
RCS file: /cvs/extras/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- maven2.spec	13 Aug 2008 19:31:39 -0000	1.13
+++ maven2.spec	5 Sep 2008 18:04:58 -0000	1.14
@@ -50,7 +50,7 @@
 
 Name:           %{name}
 Version:        %{maven_version}
-Release:        10.14%{?dist}
+Release:        10.15%{?dist}
 Epoch:          0
 Summary:        Java project management and project comprehension tool
 
@@ -113,7 +113,6 @@
 Patch10:         %{name}-MNG-3118.patch
 
 BuildRequires:    jpackage-utils >= 0:1.7.2
-BuildRequires:    java-devel >= 1.6.0
 BuildRequires:    /bin/ls,/usr/bin/head,/usr/bin/find,/usr/bin/awk,/bin/grep,/bin/sed
 
 BuildRequires:    ant >= 1.6.5
@@ -2298,6 +2297,9 @@
 %endif
 
 %changelog
+* Fri Sep 05 2008 Deepak Bhole <dbhole at redhat.com> 2.0.4-10.15
+- Fall back to gcj build
+
 * Wed Aug 13 2008 Deepak Bhole <dbhole at redhat.com> 2.0.4-10.14
 - Build with IcedTea
 



From pkgdb at fedoraproject.org  Fri Sep  5 18:02:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 18:02:15 +0000
Subject: [pkgdb] perl-Class-MethodMaker ownership updated
Message-ID: <20080905180215.F423F20876E@bastion.fedora.phx.redhat.com>

Package perl-Class-MethodMaker in Fedora 7 was orphaned by dgregor

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Fri Sep  5 18:02:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 18:02:10 +0000
Subject: [pkgdb] perl-Class-MethodMaker ownership updated
Message-ID: <20080905180210.3967520876B@bastion.fedora.phx.redhat.com>

Package perl-Class-MethodMaker in Fedora devel was orphaned by dgregor

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pbrobinson at fedoraproject.org  Fri Sep  5 18:08:33 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  5 Sep 2008 18:08:33 +0000 (UTC)
Subject: rpms/gupnp-av/devel gupnp-av.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080905180833.071AD70121@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-av/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32487/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gupnp-av.spec import.log 
Log Message:
- Initial cvs import



--- NEW FILE gupnp-av.spec ---
Name:           gupnp-av
Version:        0.2.1
Release:        3%{?dist}
Summary:        GUPnP-AV is a collection of helpers for building UPnP AV applications

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.gupnp.org/
Source0:        http://www.gupnp.org/sources/gupnp-av/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: glib2-devel
BuildRequires: libxml2-devel
BuildRequires: libsoup-devel
BuildRequires: gssdp-devel
BuildRequires: gupnp-devel

%description
GUPnP is an object-oriented open source framework for creating UPnP
devices and control points, written in C using GObject and libsoup.
The GUPnP API is intended to be easy to use, efficient and flexible.

GUPnP-AV is a collection of helpers for building AV (audio/video) 
applications using GUPnP.

%package devel
Summary: Development package for gupnp-av
Group: Development/Libraries
Requires: gupnp-av = %{version}-%{release}
Requires: pkgconfig
Requires: gtk-doc

%description devel
Files for development with gupnp-av.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/libgupnp-av-1.0.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/libgupnp-av-1.0.so.1
%{_libdir}/libgupnp-av-1.0.so.1.0.0

%files devel
%defattr(-,root,root,-)
%{_datadir}/gtk-doc/html/gupnp-av/
%{_includedir}/gupnp-av-1.0/libgupnp-av
%{_libdir}/pkgconfig/gupnp-av-1.0.pc
%{_libdir}/libgupnp-av-1.0.so

%changelog
* Fri Aug 29 2008 Peter Robinson <pbrobinson at gmail.com> 0.2.1-3
- Some spec file cleanups

* Tue Jun 17 2008 Peter Robinson <pbrobinson at gmail.com> 0.2.1-2
- Fix build on rawhide

* Tue Jun 17 2008 Peter Robinson <pbrobinson at gmail.com> 0.2.1-1
- Initial release


--- NEW FILE import.log ---
gupnp-av-0_2_1-3_fc9:HEAD:gupnp-av-0.2.1-3.fc9.src.rpm:1220638049


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 17:03:10 -0000	1.1
+++ .cvsignore	5 Sep 2008 18:08:02 -0000	1.2
@@ -0,0 +1 @@
+gupnp-av-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 17:03:10 -0000	1.1
+++ sources	5 Sep 2008 18:08:02 -0000	1.2
@@ -0,0 +1 @@
+af9898820fe57b93387d17f32121367d  gupnp-av-0.2.1.tar.gz



From lucilanga at fedoraproject.org  Fri Sep  5 18:09:48 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Fri,  5 Sep 2008 18:09:48 +0000 (UTC)
Subject: rpms/qrq/F-8 qrq-0.1.4-makefile.patch, NONE, 1.1 qrq.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080905180948.25DFA70121@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/qrq/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv387

Modified Files:
	.cvsignore sources 
Added Files:
	qrq-0.1.4-makefile.patch qrq.spec 
Log Message:
initial import

qrq-0.1.4-makefile.patch:

--- NEW FILE qrq-0.1.4-makefile.patch ---
--- qrq-0.1.4/Makefile	2008-06-22 22:27:57.000000000 +0300
+++ qrq-0.1.4-mod/Makefile	2008-09-03 21:33:00.000000000 +0300
@@ -73,12 +73,12 @@
 	install -d -v               $(DESTDIR)/share/qrq/
 	install -d -v               $(DESTDIR)/share/man/man1/
 	install -d -v               $(DESTDIR)/bin/
-	install -s -m 0755 qrq      $(DESTDIR)/bin/
-	install    -m 0755 qrqscore $(DESTDIR)/bin/
-	install    -m 0644 qrq.1    $(DESTDIR)/share/man/man1/
-	install    -m 0644 callbase $(DESTDIR)/share/qrq/
-	install    -m 0644 qrqrc    $(DESTDIR)/share/qrq/
-	install    -m 0644 toplist  $(DESTDIR)/share/qrq/
+	install -p -m 0755 qrq      $(DESTDIR)/bin/
+	install -p -m 0755 qrqscore $(DESTDIR)/bin/
+	install -p -m 0644 qrq.1    $(DESTDIR)/share/man/man1/
+	install -p -m 0644 callbase $(DESTDIR)/share/qrq/
+	install -p -m 0644 qrqrc    $(DESTDIR)/share/qrq/
+	install -p -m 0644 toplist  $(DESTDIR)/share/qrq/
 
 	
 uninstall:


--- NEW FILE qrq.spec ---
Name:           qrq
Version:        0.1.4
Release:        3%{?dist}
Summary:        Morse telegraphy trainer

Group:          Applications/Communications
License:        GPLv2+
URL:            http://fkurz.net/ham/qrq.html
Source0:        http://fkurz.net/ham/qrq/qrq-%{version}.tar.gz
#Fix DESTDIR, Don't strip, preserve timestamps
Patch0:         qrq-0.1.4-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ncurses-devel
#Requires:       

%description
qrq is an open source morse telegraphy trainer for Linux and Unix operating
systems, similar to the classic DOS version of Rufz by DL4MM.

It's not intended for learning telegraphy, but to improve the ability to
copy callsigns at high speeds, as needed for example for Contesting. 

%prep
%setup -q
%patch0 -p1

%build
make CFLAGS="%{optflags}" %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}%{_prefix} OSX_BUNDLE=NO


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING README
%{_bindir}/qrq
%{_bindir}/qrqscore
%{_mandir}/man?/*
%{_datadir}/qrq

%changelog
* Thu Sep 04 2008 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-3
- fix CFLAGS

* Wed Sep 03 2008 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-2
- misc cleanups
- new upstream 0.1.4

* Mon Jan 07 2008 Robet 'Bob' Jensen - 0.1.3-1
- Version Update
* Mon Dec 10 2007 Sindre Pedersen Bj??rdal - 0.1.2-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qrq/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 17:01:36 -0000	1.1
+++ .cvsignore	5 Sep 2008 18:09:17 -0000	1.2
@@ -0,0 +1 @@
+qrq-0.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qrq/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 17:01:36 -0000	1.1
+++ sources	5 Sep 2008 18:09:17 -0000	1.2
@@ -0,0 +1 @@
+398b7368e10617deeba8e0e159755d7e  qrq-0.1.4.tar.gz



From limb at fedoraproject.org  Fri Sep  5 18:13:55 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri,  5 Sep 2008 18:13:55 +0000 (UTC)
Subject: rpms/gnubg/devel .cvsignore, 1.4, 1.5 gnubg.spec, 1.18, 1.19 sources,
	1.4, 1.5
Message-ID: <20080905181355.8798D70121@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gnubg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1527

Modified Files:
	.cvsignore gnubg.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnubg/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Feb 2007 20:13:45 -0000	1.4
+++ .cvsignore	5 Sep 2008 18:13:25 -0000	1.5
@@ -1 +1 @@
-gnubg-source-MAIN-20061119.tar.gz
+gnubg-0.9.0-1.tar.gz


Index: gnubg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnubg/devel/gnubg.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnubg.spec	9 Feb 2008 04:37:37 -0000	1.18
+++ gnubg.spec	5 Sep 2008 18:13:25 -0000	1.19
@@ -2,9 +2,10 @@
 License:       GPLv2
 Group:         Amusements/Games
 Summary:       A backgammon game and analyser
-Version:       20061119
-Release:       14%{?dist}
-Source0:       http://www.gnubg.org/media/sources/%{name}-source-MAIN-%{version}.tar.gz
+Epoch:         1
+Version:       0.9.0.1
+Release:       1%{?dist}
+Source0:       http://gnubg.org/media/sources/gnubg-0.9.0-1.tar.gz
 Source1:       gnubg.weights
 Source2:       gnubg.desktop
 Source3:       gnubg.png
@@ -51,8 +52,10 @@
 %prep
 %setup -qn %{name}
 # convert man page from ISO-8859-1 to UTF8
-/usr/bin/iconv -f ISO-8859-1 -t UTF8 gnubg.6 > gnubg.6.tmp 
-/bin/mv gnubg.6.tmp gnubg.6
+#/usr/bin/iconv -f ISO-8859-1 -t UTF8 gnubg.6 > gnubg.6.tmp 
+#/bin/mv gnubg.6.tmp gnubg.6
+/usr/bin/iconv -f ISO-8859-1 -t UTF8 ChangeLog > ChangeLog.tmp 
+/bin/mv ChangeLog.tmp ChangeLog
 
 # running autogen, sources are nightly CVS tarballs not
 # containing configure
@@ -61,9 +64,9 @@
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 %configure --with-python \
-	--without-gdbm \
-	--without-guile \
-	--without-timecontrol
+        --without-gdbm \
+        --without-guile \
+        --without-timecontrol
 make
 
 %install
@@ -118,12 +121,13 @@
 %{_bindir}/gnubg
 %{_bindir}/makebearoff
 %{_bindir}/makehyper
-%{_infodir}/gnubg.info.gz
+%{_bindir}/makeweights
+#%{_infodir}/gnubg.info.gz
 %dir %{_datadir}/gnubg
 %{_datadir}/gnubg/met
 %{_datadir}/gnubg/doc
 %{_datadir}/gnubg/boards.xml
-%{_datadir}/gnubg/gnubg.game.sql
+#%{_datadir}/gnubg/gnubg.game.sql
 #%{_datadir}/gnubg/gnubg.gtkrc
 %{_datadir}/gnubg/gnubg_os0.bd
 %{_datadir}/gnubg/gnubg.weights
@@ -139,8 +143,14 @@
 %{_datadir}/gnubg/gnubg.wd
 %{_datadir}/gnubg/scripts/
 %{_datadir}/gnubg/flags/
+%{_datadir}/gnubg/gnubg.png
+%{_datadir}/gnubg/gnubg.sql
+%{_datadir}/gnubg/gnubg.svg
+%{_datadir}/gnubg/gnubg_ts0.bd
 
 %changelog
+* Fri Sep 05 2008 Jon Ciesla <limb at jcomserv.net> - 1:0.9.0.1-1
+- Update to latest version, BZ 461281.
 * Fri Feb 08 2008 Jon Ciesla <limb at jcomserv.net> - 20061119-14
 - GCC 4.3 rebuild.
 * Thu Aug 16 2007 Jon Ciesla <limb at jcomserv.net> - 20061119-13


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnubg/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Feb 2007 20:13:45 -0000	1.4
+++ sources	5 Sep 2008 18:13:25 -0000	1.5
@@ -1 +1 @@
-e326528df95bdb68345c435d8df141a2  gnubg-source-MAIN-20061119.tar.gz
+5ede44ec371a0a6501751126f73ae662  gnubg-0.9.0-1.tar.gz



From pbrobinson at fedoraproject.org  Fri Sep  5 18:15:12 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  5 Sep 2008 18:15:12 +0000 (UTC)
Subject: rpms/gupnp/F-9 gupnp.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080905181512.B71C470121@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1671/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	gupnp.spec import.log 
Log Message:
- Initial CVS import



--- NEW FILE gupnp.spec ---
Name:           gupnp
Version:        0.12.2
Release:        1%{?dist}
Summary:        GUPnP is an framework for creating UPnP devices & control points

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.gupnp.org/
Source0:        http://www.gupnp.org/sources/gupnp/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: libxml2-devel
BuildRequires: gssdp-devel >= 0.6
BuildRequires: glib2-devel
BuildRequires: libsoup-devel
BuildRequires: libxml2-devel
BuildRequires: e2fsprogs-devel

Requires: dbus

%description
GUPnP is an object-oriented open source framework for creating UPnP 
devices and control points, written in C using GObject and libsoup. 
The GUPnP API is intended to be easy to use, efficient and flexible. 

%package devel
Summary: Development package for gupnp
Group: Development/Libraries
Requires: gupnp = %{version}-%{release}
Requires: pkgconfig
Requires: gtk-doc

%description devel
Files for development with gupnp.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/libgupnp-1.0.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/libgupnp-1.0.so.2
%{_libdir}/libgupnp-1.0.so.2.0.0
%{_bindir}/gupnp-binding-tool

%files devel
%defattr(-,root,root,-)
%{_datadir}/gtk-doc/html/gupnp
%{_libdir}/pkgconfig/gupnp-1.0.pc
%{_libdir}/libgupnp-1.0.so
%{_includedir}/gupnp-1.0

%changelog
* Sun Aug 31 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.2-1
- New upstream release

* Thu Aug 28 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.1-7
- Yet again. Interesting it builds fine in mock and not koji

* Thu Aug 28 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.1-6
- Once more with feeling

* Thu Aug 28 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.1-5
- Second go

* Thu Aug 28 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.1-4
- Fix build on rawhide

* Wed Aug 13 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.1-3
- Fix changelog entries

* Wed Aug 13 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.1-2
- Fix a compile issue on rawhide

* Mon Jun 16 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.1-1
- Initial release


--- NEW FILE import.log ---
gupnp-0_12_2-1_fc9:F-9:gupnp-0.12.2-1.fc9.src.rpm:1220638261


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Aug 2008 17:32:18 -0000	1.1
+++ .cvsignore	5 Sep 2008 18:14:42 -0000	1.2
@@ -0,0 +1 @@
+gupnp-0.12.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Aug 2008 17:32:18 -0000	1.1
+++ sources	5 Sep 2008 18:14:42 -0000	1.2
@@ -0,0 +1 @@
+5350f5f28fb3742779702a496ab75d72  gupnp-0.12.2.tar.gz



From lucilanga at fedoraproject.org  Fri Sep  5 18:16:53 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Fri,  5 Sep 2008 18:16:53 +0000 (UTC)
Subject: rpms/qrq/F-9 qrq-0.1.4-makefile.patch, NONE, 1.1 qrq.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080905181653.72EEA70121@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/qrq/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2606

Modified Files:
	.cvsignore sources 
Added Files:
	qrq-0.1.4-makefile.patch qrq.spec 
Log Message:
initial import

qrq-0.1.4-makefile.patch:

--- NEW FILE qrq-0.1.4-makefile.patch ---
--- qrq-0.1.4/Makefile	2008-06-22 22:27:57.000000000 +0300
+++ qrq-0.1.4-mod/Makefile	2008-09-03 21:33:00.000000000 +0300
@@ -73,12 +73,12 @@
 	install -d -v               $(DESTDIR)/share/qrq/
 	install -d -v               $(DESTDIR)/share/man/man1/
 	install -d -v               $(DESTDIR)/bin/
-	install -s -m 0755 qrq      $(DESTDIR)/bin/
-	install    -m 0755 qrqscore $(DESTDIR)/bin/
-	install    -m 0644 qrq.1    $(DESTDIR)/share/man/man1/
-	install    -m 0644 callbase $(DESTDIR)/share/qrq/
-	install    -m 0644 qrqrc    $(DESTDIR)/share/qrq/
-	install    -m 0644 toplist  $(DESTDIR)/share/qrq/
+	install -p -m 0755 qrq      $(DESTDIR)/bin/
+	install -p -m 0755 qrqscore $(DESTDIR)/bin/
+	install -p -m 0644 qrq.1    $(DESTDIR)/share/man/man1/
+	install -p -m 0644 callbase $(DESTDIR)/share/qrq/
+	install -p -m 0644 qrqrc    $(DESTDIR)/share/qrq/
+	install -p -m 0644 toplist  $(DESTDIR)/share/qrq/
 
 	
 uninstall:


--- NEW FILE qrq.spec ---
Name:           qrq
Version:        0.1.4
Release:        3%{?dist}
Summary:        Morse telegraphy trainer

Group:          Applications/Communications
License:        GPLv2+
URL:            http://fkurz.net/ham/qrq.html
Source0:        http://fkurz.net/ham/qrq/qrq-%{version}.tar.gz
#Fix DESTDIR, Don't strip, preserve timestamps
Patch0:         qrq-0.1.4-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ncurses-devel
#Requires:       

%description
qrq is an open source morse telegraphy trainer for Linux and Unix operating
systems, similar to the classic DOS version of Rufz by DL4MM.

It's not intended for learning telegraphy, but to improve the ability to
copy callsigns at high speeds, as needed for example for Contesting. 

%prep
%setup -q
%patch0 -p1

%build
make CFLAGS="%{optflags}" %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}%{_prefix} OSX_BUNDLE=NO


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING README
%{_bindir}/qrq
%{_bindir}/qrqscore
%{_mandir}/man?/*
%{_datadir}/qrq

%changelog
* Thu Sep 04 2008 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-3
- fix CFLAGS

* Wed Sep 03 2008 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-2
- misc cleanups
- new upstream 0.1.4

* Mon Jan 07 2008 Robet 'Bob' Jensen - 0.1.3-1
- Version Update
* Mon Dec 10 2007 Sindre Pedersen Bj??rdal - 0.1.2-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qrq/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 17:01:36 -0000	1.1
+++ .cvsignore	5 Sep 2008 18:16:23 -0000	1.2
@@ -0,0 +1 @@
+qrq-0.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qrq/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 17:01:36 -0000	1.1
+++ sources	5 Sep 2008 18:16:23 -0000	1.2
@@ -0,0 +1 @@
+398b7368e10617deeba8e0e159755d7e  qrq-0.1.4.tar.gz



From sgrubb at fedoraproject.org  Fri Sep  5 18:25:42 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri,  5 Sep 2008 18:25:42 +0000 (UTC)
Subject: rpms/libprelude/devel .cvsignore, 1.11, 1.12 libprelude.spec, 1.27, 
	1.28 sources, 1.12, 1.13 libprelude-0.9.20-libtool.patch, 1.1, NONE
Message-ID: <20080905182542.B271E70121@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4444

Modified Files:
	.cvsignore libprelude.spec sources 
Removed Files:
	libprelude-0.9.20-libtool.patch 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Sep 2008 18:16:05 -0000	1.11
+++ .cvsignore	5 Sep 2008 18:25:12 -0000	1.12
@@ -6,3 +6,4 @@
 libprelude-0.9.18.1.tar.gz
 libprelude-0.9.19.tar.gz
 libprelude-0.9.20.tar.gz
+libprelude-0.9.20.1.tar.gz


Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libprelude.spec	4 Sep 2008 18:41:59 -0000	1.27
+++ libprelude.spec	5 Sep 2008 18:25:12 -0000	1.28
@@ -4,18 +4,20 @@
 
 
 Name:		libprelude
-Version:	0.9.20
-Release:	2%{?dist}
+Version:	0.9.20.1
+Release:	1%{?dist}
 Summary:	The prelude library        
 Group:		System Environment/Libraries 
 License:	GPLv2+
 URL:		http://prelude-ids.org/
 Source0:	http://www.prelude-ids.org/download/releases/%{name}/%{name}-%{version}.tar.gz
-Patch1:         libprelude-0.9.20-libtool.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gnutls-devel, python-devel, ruby, ruby-devel, lua-devel
-BuildRequires:	swig chrpath valgrind 
+BuildRequires:	swig chrpath 
+%ifnarch ppc ppc64
+BuildRequires:	valgrind 
+%endif
 
 %description
 The Prelude Library is a collection of generic functions providing
@@ -75,7 +77,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %configure	--disable-static \
@@ -156,8 +157,9 @@
 %{ruby_sitearch}/PreludeEasy.so
 
 %changelog
-* Wed Sep 03 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.20-2
-- Get rid of rpath and enable test suite
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Sep 2008 18:16:05 -0000	1.12
+++ sources	5 Sep 2008 18:25:12 -0000	1.13
@@ -1 +1 @@
-09526a1422d547313a1983779cc5ed20  libprelude-0.9.20.tar.gz
+e95aad53a4ea49a529dca31921470a1c  libprelude-0.9.20.1.tar.gz


--- libprelude-0.9.20-libtool.patch DELETED ---



From cwickert at fedoraproject.org  Fri Sep  5 18:27:41 2008
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  5 Sep 2008 18:27:41 +0000 (UTC)
Subject: rpms/xfce-mcs-plugins-extra/F-8
	xfce-mcs-plugins-extra-2.0-volman.patch, NONE,
	1.1 xfce-mcs-plugins-extra.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080905182741.CAD8970121@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce-mcs-plugins-extra/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5050/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	xfce-mcs-plugins-extra-2.0-volman.patch 
	xfce-mcs-plugins-extra.spec 
Log Message:
* Sun Sep 04 2008 Christoph Wickert <fedora christoph-wickert de> - 2.0-2
- Change License tag to GPLv2
- Configure with --with-gnu-ld
- Patch out hardcoded path of thunar-volman-settings


xfce-mcs-plugins-extra-2.0-volman.patch:

--- NEW FILE xfce-mcs-plugins-extra-2.0-volman.patch ---
diff -dur xfce-mcs-plugins-extra-2.0.orig/config.h.in xfce-mcs-plugins-extra-2.0/config.h.in
--- xfce-mcs-plugins-extra-2.0.orig/config.h.in	2008-03-28 21:59:17.000000000 +0100
+++ xfce-mcs-plugins-extra-2.0/config.h.in	2008-09-04 23:18:48.000000000 +0200
@@ -86,3 +86,6 @@
 
 /* Version number of package */
 #undef VERSION
+
+/* Define the full thunar volman settings path */
+#undef VOLMAN_PATH
Nur in xfce-mcs-plugins-extra-2.0: config.h.in.orig.
diff -dur xfce-mcs-plugins-extra-2.0.orig/configure.in xfce-mcs-plugins-extra-2.0/configure.in
--- xfce-mcs-plugins-extra-2.0.orig/configure.in	2008-03-28 21:58:28.000000000 +0100
+++ xfce-mcs-plugins-extra-2.0/configure.in	2008-09-04 23:18:50.000000000 +0200
@@ -79,6 +79,17 @@
 AC_SUBST(VOLMAN_PLUGIN_DIR)
 AM_CONDITIONAL([BUILD_VOLMAN_PLUGIN], [test "x$build_volman_plugin" = "xyes"])
 
+dnl
+dnl give the thunar-volman path
+dnl
+AC_ARG_WITH([volman],
+    [AC_HELP_STRING([--with-volman=FULLPATH],
+        [Specify thunar-volman settings path (default=/usr/lib/thunar-volman/thunar-volman-settings)])],
+    [VOLMAN_PATH="$withval"],
+    [VOLMAN_PATH="/usr/lib/thunar-volman/thunar-volman-settings"])
+AC_DEFINE_UNQUOTED([VOLMAN_PATH], ["${VOLMAN_PATH}"], [Define the full thunar volman settings path])
+
+
 AC_OUTPUT([
 Makefile
 src/Makefile
Nur in xfce-mcs-plugins-extra-2.0: configure.in.orig.
diff -dur xfce-mcs-plugins-extra-2.0.orig/src/volman/volman.c xfce-mcs-plugins-extra-2.0/src/volman/volman.c
--- xfce-mcs-plugins-extra-2.0.orig/src/volman/volman.c	2008-03-28 21:58:28.000000000 +0100
+++ xfce-mcs-plugins-extra-2.0/src/volman/volman.c	2008-09-04 23:18:51.000000000 +0200
@@ -32,7 +32,7 @@
 #include <libxfce4mcs/mcs-manager.h>
 #include <xfce-mcs-manager/manager-plugin.h>
 
-#define EXE "/usr/lib/thunar-volman/thunar-volman-settings"
+#define EXE VOLMAN_PATH
 #define ICON "gnome-dev-removable"
 
 /* static prototypes */
Nur in xfce-mcs-plugins-extra-2.0/src/volman: volman.c.orig.


--- NEW FILE xfce-mcs-plugins-extra.spec ---
Name:           xfce-mcs-plugins-extra
Version:        2.0
Release:        2%{?dist}
Summary:        Extra plugins for the Xfce mcs manager

Group:          User Interface/Desktops
License:        GPLv2
URL:            https://launchpad.net/xfce-mcs-plugins-extra
Source0:        http://archive.ubuntu.com/ubuntu/pool/universe/x/%{name}/%{name}_2.0.orig.tar.gz
Patch0:         %{name}-2.0-volman.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  xfce-mcs-manager-devel  >= 4.4.0, xfce4-dev-tools
BuildRequires:  gettext, perl(XML::Parser)
Requires:       xfce-mcs-manager >= 4.4.0, xfce4-session, xfdesktop, thunar-volman
# this one is optional, everything is detected at runtime
#Requires:       scim

%description
This packages provides additional configuration items to be included in the 
Xfce settings manager:
- Autostarted applications
- Menu editor
- Removable drives and media
- SCIM input method


%prep
%setup -q
%patch0 -p1 -b .volman

%build
xdt-autogen
%configure --disable-static --with-gnu-ld --with-volman=%{_libexecdir}/thunar-volman-settings
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*plugin.la
%find_lang %{name}


%post
killall -HUP xfce-mcs-manager > /dev/null || :


%postun
killall -HUP xfce-mcs-manager > /dev/null || :
#pkill -USR1 -f xfce-mcs-manager || true


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{_libdir}/xfce4/mcs-plugins/*_plugin.so


%changelog
* Sun Sep 04 2008 Christoph Wickert <fedora christoph-wickert de> - 2.0-2
- Change License tag to GPLv2
- Configure with --with-gnu-ld
- Patch out hardcoded path of thunar-volman-settings

* Sat Jul 19 2008 Christoph Wickert <fedora christoph-wickert de> - 2.0-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce-mcs-plugins-extra/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:37:52 -0000	1.1
+++ .cvsignore	5 Sep 2008 18:27:11 -0000	1.2
@@ -0,0 +1 @@
+xfce-mcs-plugins-extra_2.0.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce-mcs-plugins-extra/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:37:52 -0000	1.1
+++ sources	5 Sep 2008 18:27:11 -0000	1.2
@@ -0,0 +1 @@
+979e6f001c60b47aa52fc628c7ec5ef1  xfce-mcs-plugins-extra_2.0.orig.tar.gz



From cwickert at fedoraproject.org  Fri Sep  5 18:27:42 2008
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  5 Sep 2008 18:27:42 +0000 (UTC)
Subject: rpms/xfce-mcs-plugins-extra/F-9
	xfce-mcs-plugins-extra-2.0-volman.patch, NONE,
	1.1 xfce-mcs-plugins-extra.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080905182742.0D18D70125@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce-mcs-plugins-extra/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5050/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	xfce-mcs-plugins-extra-2.0-volman.patch 
	xfce-mcs-plugins-extra.spec 
Log Message:
* Sun Sep 04 2008 Christoph Wickert <fedora christoph-wickert de> - 2.0-2
- Change License tag to GPLv2
- Configure with --with-gnu-ld
- Patch out hardcoded path of thunar-volman-settings


xfce-mcs-plugins-extra-2.0-volman.patch:

--- NEW FILE xfce-mcs-plugins-extra-2.0-volman.patch ---
diff -dur xfce-mcs-plugins-extra-2.0.orig/config.h.in xfce-mcs-plugins-extra-2.0/config.h.in
--- xfce-mcs-plugins-extra-2.0.orig/config.h.in	2008-03-28 21:59:17.000000000 +0100
+++ xfce-mcs-plugins-extra-2.0/config.h.in	2008-09-04 23:18:48.000000000 +0200
@@ -86,3 +86,6 @@
 
 /* Version number of package */
 #undef VERSION
+
+/* Define the full thunar volman settings path */
+#undef VOLMAN_PATH
Nur in xfce-mcs-plugins-extra-2.0: config.h.in.orig.
diff -dur xfce-mcs-plugins-extra-2.0.orig/configure.in xfce-mcs-plugins-extra-2.0/configure.in
--- xfce-mcs-plugins-extra-2.0.orig/configure.in	2008-03-28 21:58:28.000000000 +0100
+++ xfce-mcs-plugins-extra-2.0/configure.in	2008-09-04 23:18:50.000000000 +0200
@@ -79,6 +79,17 @@
 AC_SUBST(VOLMAN_PLUGIN_DIR)
 AM_CONDITIONAL([BUILD_VOLMAN_PLUGIN], [test "x$build_volman_plugin" = "xyes"])
 
+dnl
+dnl give the thunar-volman path
+dnl
+AC_ARG_WITH([volman],
+    [AC_HELP_STRING([--with-volman=FULLPATH],
+        [Specify thunar-volman settings path (default=/usr/lib/thunar-volman/thunar-volman-settings)])],
+    [VOLMAN_PATH="$withval"],
+    [VOLMAN_PATH="/usr/lib/thunar-volman/thunar-volman-settings"])
+AC_DEFINE_UNQUOTED([VOLMAN_PATH], ["${VOLMAN_PATH}"], [Define the full thunar volman settings path])
+
+
 AC_OUTPUT([
 Makefile
 src/Makefile
Nur in xfce-mcs-plugins-extra-2.0: configure.in.orig.
diff -dur xfce-mcs-plugins-extra-2.0.orig/src/volman/volman.c xfce-mcs-plugins-extra-2.0/src/volman/volman.c
--- xfce-mcs-plugins-extra-2.0.orig/src/volman/volman.c	2008-03-28 21:58:28.000000000 +0100
+++ xfce-mcs-plugins-extra-2.0/src/volman/volman.c	2008-09-04 23:18:51.000000000 +0200
@@ -32,7 +32,7 @@
 #include <libxfce4mcs/mcs-manager.h>
 #include <xfce-mcs-manager/manager-plugin.h>
 
-#define EXE "/usr/lib/thunar-volman/thunar-volman-settings"
+#define EXE VOLMAN_PATH
 #define ICON "gnome-dev-removable"
 
 /* static prototypes */
Nur in xfce-mcs-plugins-extra-2.0/src/volman: volman.c.orig.


--- NEW FILE xfce-mcs-plugins-extra.spec ---
Name:           xfce-mcs-plugins-extra
Version:        2.0
Release:        2%{?dist}
Summary:        Extra plugins for the Xfce mcs manager

Group:          User Interface/Desktops
License:        GPLv2
URL:            https://launchpad.net/xfce-mcs-plugins-extra
Source0:        http://archive.ubuntu.com/ubuntu/pool/universe/x/%{name}/%{name}_2.0.orig.tar.gz
Patch0:         %{name}-2.0-volman.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  xfce-mcs-manager-devel  >= 4.4.0, xfce4-dev-tools
BuildRequires:  gettext, perl(XML::Parser)
Requires:       xfce-mcs-manager >= 4.4.0, xfce4-session, xfdesktop, thunar-volman
# this one is optional, everything is detected at runtime
#Requires:       scim

%description
This packages provides additional configuration items to be included in the 
Xfce settings manager:
- Autostarted applications
- Menu editor
- Removable drives and media
- SCIM input method


%prep
%setup -q
%patch0 -p1 -b .volman

%build
xdt-autogen
%configure --disable-static --with-gnu-ld --with-volman=%{_libexecdir}/thunar-volman-settings
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*plugin.la
%find_lang %{name}


%post
killall -HUP xfce-mcs-manager > /dev/null || :


%postun
killall -HUP xfce-mcs-manager > /dev/null || :
#pkill -USR1 -f xfce-mcs-manager || true


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{_libdir}/xfce4/mcs-plugins/*_plugin.so


%changelog
* Sun Sep 04 2008 Christoph Wickert <fedora christoph-wickert de> - 2.0-2
- Change License tag to GPLv2
- Configure with --with-gnu-ld
- Patch out hardcoded path of thunar-volman-settings

* Sat Jul 19 2008 Christoph Wickert <fedora christoph-wickert de> - 2.0-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce-mcs-plugins-extra/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:37:52 -0000	1.1
+++ .cvsignore	5 Sep 2008 18:27:11 -0000	1.2
@@ -0,0 +1 @@
+xfce-mcs-plugins-extra_2.0.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce-mcs-plugins-extra/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:37:52 -0000	1.1
+++ sources	5 Sep 2008 18:27:11 -0000	1.2
@@ -0,0 +1 @@
+979e6f001c60b47aa52fc628c7ec5ef1  xfce-mcs-plugins-extra_2.0.orig.tar.gz



From gemi at fedoraproject.org  Fri Sep  5 18:28:18 2008
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Fri,  5 Sep 2008 18:28:18 +0000 (UTC)
Subject: rpms/scons/devel .cvsignore, 1.9, 1.10 scons.spec, 1.18,
	1.19 sources, 1.9, 1.10
Message-ID: <20080905182818.A24BD70121@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/scons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5212

Modified Files:
	.cvsignore scons.spec sources 
Log Message:
new release 1.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scons/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Aug 2008 19:34:33 -0000	1.9
+++ .cvsignore	5 Sep 2008 18:27:48 -0000	1.10
@@ -1 +1 @@
-scons-0.98.5.tar.gz
+scons-1.0.0.d20080826.tar.gz


Index: scons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scons/devel/scons.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- scons.spec	3 Aug 2008 19:34:33 -0000	1.18
+++ scons.spec	5 Sep 2008 18:27:48 -0000	1.19
@@ -1,13 +1,13 @@
 Name:           scons
-Version:        0.98.5
-Release:        1%{?dist}
+Version:        1.0.0
+Release:        1.d20080826%{?dist}
 
 Summary:        An Open Source software construction tool
 
 Group:          Development/Tools
 License:        MIT
 URL:            http://www.scons.org
-Source:         http://prdownloads.sourceforge.net/scons/scons-%{version}.tar.gz
+Source:         http://prdownloads.sourceforge.net/scons/scons-%{version}.d20080826.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -31,7 +31,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n scons-%{version}.d20080826
 sed -i 's|/usr/bin/env python|/usr/bin/python|' script/*
 
 
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Fri Sep  5 2008 Gerard Milmeister <gemi at bluewin.ch> - 1.0.0-1.d20080826
+- new release 1.0.0
+
 * Sun Aug  3 2008 Gerard Milmeister <gemi at bluewin.ch> - 0.98.5-1
 - new release 0.98.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scons/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Aug 2008 19:34:33 -0000	1.9
+++ sources	5 Sep 2008 18:27:48 -0000	1.10
@@ -1 +1 @@
-640dfc99a29523a06dbeaac299a3e0a0  scons-0.98.5.tar.gz
+65ebd68e4d2e0c619850c9f9469de767  scons-1.0.0.d20080826.tar.gz



From pkgdb at fedoraproject.org  Fri Sep  5 18:29:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 18:29:51 +0000
Subject: [pkgdb] perl-Class-MethodMaker ownership updated
Message-ID: <20080905182951.C094020876F@bastion.fedora.phx.redhat.com>

Package perl-Class-MethodMaker in Fedora devel was orphaned by berrange

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Fri Sep  5 18:29:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 18:29:46 +0000
Subject: [pkgdb] perl-Class-MethodMaker ownership updated
Message-ID: <20080905182946.613CE20876A@bastion.fedora.phx.redhat.com>

Package perl-Class-MethodMaker in Fedora devel is now owned by berrange

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Fri Sep  5 18:29:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 18:29:56 +0000
Subject: [pkgdb] perl-Class-MethodMaker ownership updated
Message-ID: <20080905182956.957C7208D07@bastion.fedora.phx.redhat.com>

Package perl-Class-MethodMaker in Fedora devel is now owned by berrange

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Fri Sep  5 18:30:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 18:30:20 +0000
Subject: [pkgdb] perl-Class-MethodMaker ownership updated
Message-ID: <20080905183020.DF6B720876E@bastion.fedora.phx.redhat.com>

Package perl-Class-MethodMaker in Fedora 8 is now owned by berrange

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Fri Sep  5 18:30:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 18:30:23 +0000
Subject: [pkgdb] perl-Class-MethodMaker ownership updated
Message-ID: <20080905183023.239E5208D07@bastion.fedora.phx.redhat.com>

Package perl-Class-MethodMaker in Fedora 9 is now owned by berrange

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From toshio at fedoraproject.org  Fri Sep  5 18:57:37 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri,  5 Sep 2008 18:57:37 +0000 (UTC)
Subject: rpms/qa-assistant/F-8 qa-assistant.spec,1.12,1.13
Message-ID: <20080905185737.A656D70121@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/qa-assistant/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10118/F-8

Modified Files:
	qa-assistant.spec 
Log Message:
* Build and license fixes from devel.  Not rebuilt at this time.



Index: qa-assistant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qa-assistant/F-8/qa-assistant.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qa-assistant.spec	1 Sep 2006 05:33:12 -0000	1.12
+++ qa-assistant.spec	5 Sep 2008 18:57:07 -0000	1.13
@@ -1,9 +1,10 @@
 Name:           qa-assistant
 Version:        0.4.90.5
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Graphical quality assurance report generator
 Group:          Development/Tools
-License:        GPL
+# Only file with versioning is src/gnomeglade.py
+License:        GPLv2+
 URL:            http://developer.berlios.de/projects/qa-assistant/
 Source0:        http://download.berlios.de/qa-assistant/qa-assistant-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,7 +18,7 @@
 BuildRequires:  pygtk2-devel >= 2.4.0
 BuildRequires:  pkgconfig
 BuildRequires:  gtk2-devel
-BuildRequires:  gnome-python2 >= 2.10.0
+BuildRequires:  gnome-python2-devel >= 2.10.0
 Requires:       libxml2-python
 Requires:       gnome-python2
 Requires:       gnome-python2-gconf
@@ -135,6 +136,12 @@
 %{_datadir}/xml/%{name}
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.90.5-4
+- fix BR
+
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.90.5-3
+- fix license tag
+
 * Thu Aug 31 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.4.90.5-2
 - No longer %%ghost .pyo files.
 - Switch to disabling installing the schema into GConf via a configure



From toshio at fedoraproject.org  Fri Sep  5 18:57:37 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri,  5 Sep 2008 18:57:37 +0000 (UTC)
Subject: rpms/qa-assistant/F-9 qa-assistant.spec,1.12,1.13
Message-ID: <20080905185737.C12B870126@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/qa-assistant/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10118/F-9

Modified Files:
	qa-assistant.spec 
Log Message:
* Build and license fixes from devel.  Not rebuilt at this time.



Index: qa-assistant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qa-assistant/F-9/qa-assistant.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qa-assistant.spec	1 Sep 2006 05:33:12 -0000	1.12
+++ qa-assistant.spec	5 Sep 2008 18:57:07 -0000	1.13
@@ -1,9 +1,10 @@
 Name:           qa-assistant
 Version:        0.4.90.5
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Graphical quality assurance report generator
 Group:          Development/Tools
-License:        GPL
+# Only file with versioning is src/gnomeglade.py
+License:        GPLv2+
 URL:            http://developer.berlios.de/projects/qa-assistant/
 Source0:        http://download.berlios.de/qa-assistant/qa-assistant-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,7 +18,7 @@
 BuildRequires:  pygtk2-devel >= 2.4.0
 BuildRequires:  pkgconfig
 BuildRequires:  gtk2-devel
-BuildRequires:  gnome-python2 >= 2.10.0
+BuildRequires:  gnome-python2-devel >= 2.10.0
 Requires:       libxml2-python
 Requires:       gnome-python2
 Requires:       gnome-python2-gconf
@@ -135,6 +136,12 @@
 %{_datadir}/xml/%{name}
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.90.5-4
+- fix BR
+
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.90.5-3
+- fix license tag
+
 * Thu Aug 31 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.4.90.5-2
 - No longer %%ghost .pyo files.
 - Switch to disabling installing the schema into GConf via a configure



From wtogami at fedoraproject.org  Fri Sep  5 19:01:14 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri,  5 Sep 2008 19:01:14 +0000 (UTC)
Subject: fedora-release RPM-GPG-KEY-fedora-8-and-9-primary, NONE,
	1.1.2.2 RPM-GPG-KEY-fedora-test-8-and-9-primary, NONE, 1.1.2.2
Message-ID: <20080905190115.04F9A70121@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/fedora/fedora-release
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11032

Added Files:
      Tag: F-9
	RPM-GPG-KEY-fedora-8-and-9-primary 
	RPM-GPG-KEY-fedora-test-8-and-9-primary 
Log Message:
Add new keys for F8 and F9.



--- NEW FILE RPM-GPG-KEY-fedora-8-and-9-primary ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.9 (GNU/Linux)

mQGiBEi11ZYRBACjAKCM0ckAnqEZWP/z96Bb4c6WH252/2JJiC8BWw20hBhJ0CT1
Jzfg6rhpFsB1Hv8/yFbV2bMKzHP5QySMkJ7Jp/mlDMwj0mx5dGoxshSED40E4b1h
ZRkuvyVKKn4IKE9vIhl1nhudwSIjsoYD3wH2wbE2CHVg/kB4vuBaP5WPSwCgndSE
sAssoEObir4Ndq/gep6jFjEEAI53sM8u2PQ9inKNXrkuw+GCUMXChk/zhZhmdyDx
cySIgy17X17/jF+TnXsCSXTo87Oz9X4BAk+fzHPKqTLm0/RjjuQd1DwNxsVkPbQJ
QqnIFwfnSZmVcfbZ0u/KLaSUPwi3PjzzBI4L8fsTwspZmpuipRM/pCh1tbOo3Lbq
WqSyA/9wlKJ11Ycvr/yZYlbqipKC4hFJnu4y/DD2xwBMNT5vkQeQNRlLh8smqmMf
FNoCUPwGSiuYG2wP1OLX6EG6uCVStjcvWvONtCKgG4TdsfPv4tMPO1dtnK97CVjz
10HJ5qC5WxLNqQY5U5jRnOyzq4yE3cakXk5shLsT/ch5lffPErQrRmVkb3JhICg4
IGFuZCA5KSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPohgBBMRAgAgBQJItdWW
AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQYq7D3G3yGW8mgACfaXJGS96k
+ggwwo0A4GC7iH6T1awAn12SDBWY8X1wq45trdHGRLig68C0uQQNBEi11ZYQEADB
hyS3+Fgz+qLPlYe8Ic47435mwDzUeCFnNO+yA3c1OD1PE5OVi4Fco/pHUfMkMSFo
p0FM6iCkudzGQKWgmlJ8TTsMK20VAXTcUBzksOx9WJBSIHVGnAVSuMb+S5Rclma1
tiEbpNRkEFcUKRz85XDD5s072F1tY31yOObptzFbRi5m8fZvJXlFNkmkp/si70SN
ZcyMFwXEiPDPmnauAkZfD+rJ7c19C/MlQ0HI3IATxp3DfCCnN7FcTRPvieFUYoq/
z/cjOQioliAhZE0zMJtiY+YEuxL65d/zj536kMmO6v9d31n1GPGD5XS3HGK2jHbw
MCDKzGVJTFpT7K3jb2ZJ7H7MRJ+bbEgPBMZiFiUml+wbTsEempLrK2fkFxqIfrpl
DuGxgBVqyydfC/nnaiBR6pjeKV2veNbAL6f+G3SaQ0LykreiZB/CDfLFJQBE7M6T
5wGIF1WPCmsekkQyPUUbWpxtdmECepOAOETgGpzoySyNf0V4WRTfHLXYRYbplPzD
qPdRSba5kmrhmFBXimHrybvjH8n4Z+s33dbJigjv1L/XDhxL1QZfUBZr+u6LNDKQ
BNdb/1o7op1kcJ1dPqd5nNAMwbvAkTEnvsdPPuBg7rAju3lV5i7ZbMRVHwuhHjBt
BMBcZt5PBr9IianAqxE6eGJyWkSuY7i2Ig/1+pcvBwADBQ/+IOXV47IbdrfgUgv9
MYlnlk4GBUz1lIRoZzyzsRiRsWNqN8BNtnZe1IGgc/5G3sIOLYJ+XNSAOphLkLxb
WXsNDkRt64Z+ZmjOlqW34TxyEyzeJLZC8cL2Zu8U61oPT27LFe929AJD1CdzeEZT
qd2gfxm7JEw2Vxb76f299qhe/ubgd6VaG+WaNBx9yFdUNAB/oK3arGL0LxUR5j87
CAafpqjNQteZmd6yJ5dJAkwlJ1RXJaOMOdE0V/ARsV38cxNce31dazbmf01QGhxW
IZBmAdoqeoykCQ/rIwN7WakwxHf/lz522qa0E4RQ8niKktdHK26goQ3H6nQcbS6i
DgHckODOm3ZO4NTwRPM0UhFw663cQt289xdODJWCdb4P17AV3oqCUJBf82PbHIhD
I5fZTp2Bgn2Gu2WseNqQJQCq+S2uXUxxqMiBWaOk8+8i9aMdBZkTHn8KIfhrdSW3
gbpyIWITDY5KQqJy9AQk3NfTkavMZy09q5mUD5Tiw+X75Taj8IbZJMuO2AsEUvFX
rLBuY7FyLX0gyq6no44Enhsq5H9/1yx1EIAx1pgYyPW+0IIPdGHFW33yKHfbo8wf
2MITxZpd3eaNifBfO3iGOAOJAFYAO7wXeHHX43Syyj5KGlOAdaX7Dp4gU8nGTeFi
2B7oYh0vSvB7F/6Tu/mHilzenzeISQQYEQIACQUCSLXVlgIbDAAKCRBirsPcbfIZ
b+s6AJ9MxzebTDyCoSGb17gmU23fAk72XwCgmdn5nV35GD8LYcojs8O7HXPfLrk=
=Bp6s
-----END PGP PUBLIC KEY BLOCK-----


--- NEW FILE RPM-GPG-KEY-fedora-test-8-and-9-primary ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.9 (GNU/Linux)

mQGiBEi12pURBACCiC3NeEdXbE1AY59iPwsgmcjOBivSe3nhU90AnLjg2qvaizqa
420fbq1bNlQvU83+C7ZP2FJ5pVLYQBKHGIP9VTbZL1yIp5DZdvpd1PDdjJPep2fV
1y8Iozd694ujn1DVG2utnpXhnJxzXmXsoFMu2xGvV+sTKQSS8vJJc9Eq2wCgvvZ+
FTtk2lbaCmgTVZpFIeCEOUED/AwvjJjDy846GI+H5o+J9Rbtcp2mWNqaIF8DRfGA
JfbH9H14Q/4WW75Y+HNoSVWTiZeLJspHR5yUqsU30D+fFi7I9HdKJWWMEAk5sATe
znIGTPvMaBFomRT+Mm/ugkgZPpAwBNbxapCEH8U2qF2c5he9pGvyWwWsMydEaffX
9DrNA/421ns/pPoL7EYOhWsvuC8Te+LVNkfC3beLpYSEcQcu0rsCSuy0+t98zbCY
UKUE+rTWAveaMdFA0o9it/fUVRzNAkX62Zg8aNLAtkAurjqxwqJ6QdMydNqrQBXA
P3GLZoKg+YveEEx8jxZ4tC1Z3VWHzXSzO4ej30Cl1Ae2aN1LMrQzRmVkb3JhICg4
IGFuZCA5IHRlc3RpbmcpIDxmZWRvcmFAZmVkb3JhcHJvamVjdC5vcmc+iGAEExEC
ACAFAki12pUCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRCOaTtN35sK6a0G
AKC33X7/usCOS6uHj2OiBxQwLY7++wCgvG5hzgNys5cfbzp2YAgPoTVzXEm5BA0E
SLXalRAQAJHPSkzNsHStgqXLojWIYlnSCiGtmpEZentHpPrw653cOhCQ4VGk9YhA
eSgTIE9hBav2zNR/lHLRvAIIGvAqCF3QcVJgWR/A6MeWbysZhlRnLGJXGJMDceO8
D8jno6ngh0nzenQiB4S4Vpa/PEzh9tEzZ33ktRHJUTKrtCO5r1haLAGp6csh2pa7
Mfu3jFBKwFwTkwyUE+odadtQBZAIu4ZnSFqpX5JXfHdjn/GbzlpJ8UsSPFAy7wZ1
VSl65g+j6TADUtL2wPB1GxIJSs7kVvM5YwyddXeVOrpJwD3ayNSGzqnL1rqL3ZNn
Ho6NIc2dMouwx3EPvrGt/j3xqCQej2+63r8d9qLdOtvvTcJnlDIYR61+EKBKYugN
CVmcztNa8N44P3mHFX2zWbURYSEiCL8H8K6esPB1a82eOGpP+hnDc+BwoLMniDb9
SIwsRtxhyGmHUnP0h+HyRbC9ykveeoqA0Viyvs0qicd6lIhMtaA8RXmiv/PkEzX8
QqhH+zU1G7M5dH8qN9mJ7zJ4jB0y5WkoHXwIhPjzgKERMmvh1Cepr1CyKxP+HoVz
MexUf7bfV4e874Dnqgsga5OS5l53NQj7lp1A41lehVgPxFP5Z11NsmJY4Vzwk2Yc
Twt0IKLa7jSI/NoWpjU4ooAcg/klVNf2CQEVFUPpG0BTSaflV2yrAAMFD/oCBJuM
GSSzYwFmwVTfLgjCAs8e12wc02I1BslWC+hNmn6O+5Vc9W7bpphZfX5SWuiRRh7E
uEW5m1jJ/79W31g6DX64e4JJ3nIU5At1KdDWwZL8KDTHeHMHci7yZ5BdXT0yfG9g
fjFtNeK6McbDeLJFIB8kFMoEjjU+RuUPZ8fli7EbY5ij2Yi9XuKMbbOK0nBLJmxh
KyXtMxlcYZo4Kr/k7XJY4yPZIYSITNfQaekzkStxbPMevgh5x7rT5XOz7c8/NI3n
s+aifWxlerjP9Ls+OQHyF+fU+9XymN7+PI8UwQjTSC0p7THz52zMYgJ0Rz4oPbwZ
aR9C+w/fnNF4k/wIpDWwv0yrxbG6pGrlMLGT9m2pUdwJWg+3jVMx3PlgAcNPXUyu
64GhIneaqFQj1Mqy3+GCYr5wHSkRJRmxaMcbwGC4890tbfbS6bLKPYAtM7AthRUL
Pkt6de/CdJOK8gQjc27rPCxzEEil28xijpa4XGOp0P5nk8BL4Bp2g2iJnh6xJJrN
OY6UH2ZGRFl1cv8/sDBVMc/KfXaDgMh8fDhYkzRPkLPKdicdDRGUYXtmNf1NurT8
W12YKqlj9C28mv6rLesHAGT1lIfkwvcbg/dE539c6VHg05DdfsD05io4WvMf9iy/
DfIiGqnRvoXvfvrVi5Y4AMAkJKNydxa47b3wG4hIBBgRAgAJBQJItdqVAhsMAAoJ
EI5pO03fmwrp7Q8An1wCbS0WAB+U3TZVA/z+U4yhcv08AJUQGF9I7RlUxkOPAwGE
X3ofpIDE
=yrQo
-----END PGP PUBLIC KEY BLOCK-----



From toshio at fedoraproject.org  Fri Sep  5 19:03:36 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri,  5 Sep 2008 19:03:36 +0000 (UTC)
Subject: rpms/qa-assistant/devel dead.package, NONE, 1.1 .cvsignore, 1.4,
	NONE Makefile, 1.2, NONE qa-assistant.spec, 1.14, NONE sources,
	1.4, NONE test, 1.3, NONE
Message-ID: <20080905190337.045D270125@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/qa-assistant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11762

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile qa-assistant.spec sources test 
Log Message:
Retire package.



--- NEW FILE dead.package ---
I am upstream for this package and don't have time to work on it.  Retiring
unless someone else wants to take over upstream development.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- qa-assistant.spec DELETED ---


--- sources DELETED ---


--- test DELETED ---



From kengert at fedoraproject.org  Fri Sep  5 19:04:31 2008
From: kengert at fedoraproject.org (Kai Engert)
Date: Fri,  5 Sep 2008 19:04:31 +0000 (UTC)
Subject: rpms/nss/F-9 nss.spec,1.47,1.48
Message-ID: <20080905190431.A23D270125@cvs1.fedora.phx.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nss/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12064

Modified Files:
	nss.spec 
Log Message:
* Fri Sep 05 2008 Kai Engert <kengert at redhat.com> - 3.12.1.1-1
- Update to NSS_3_12_1_RC2



Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/F-9/nss.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- nss.spec	22 Aug 2008 22:29:14 -0000	1.47
+++ nss.spec	5 Sep 2008 19:04:01 -0000	1.48
@@ -3,7 +3,7 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.12.1.0
+Version:          3.12.1.1
 Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
@@ -440,6 +440,8 @@
 
 
 %changelog
+* Fri Sep 05 2008 Kai Engert <kengert at redhat.com> - 3.12.1.1-1
+- Update to NSS_3_12_1_RC2
 * Fri Aug 22 2008 Kai Engert <kaie at redhat.com> - 3.12.1.0-1
 - NSS 3.12.1 RC1
 * Fri Aug 22 2008 Kai Engert <kengert at redhat.com> - 3.12.0.3-0.9.2



From kengert at fedoraproject.org  Fri Sep  5 19:07:13 2008
From: kengert at fedoraproject.org (Kai Engert)
Date: Fri,  5 Sep 2008 19:07:13 +0000 (UTC)
Subject: rpms/nss/F-9 .cvsignore,1.19,1.20 sources,1.20,1.21
Message-ID: <20080905190713.AB40370121@cvs1.fedora.phx.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nss/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12761

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Sep 05 2008 Kai Engert <kengert at redhat.com> - 3.12.1.1-1
- Update to NSS_3_12_1_RC2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/F-9/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	22 Aug 2008 22:29:14 -0000	1.19
+++ .cvsignore	5 Sep 2008 19:06:43 -0000	1.20
@@ -1,2 +1,2 @@
 nss-pem-20080124.tar.bz2
-nss-3.12.1.0-stripped.tar.bz2
+nss-3.12.1.1-stripped.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	22 Aug 2008 22:29:14 -0000	1.20
+++ sources	5 Sep 2008 19:06:43 -0000	1.21
@@ -1,2 +1,2 @@
 084675e4f793ed82e1ba78f76745ada8  nss-pem-20080124.tar.bz2
-ad0cb75c59fb65b35dcd24d726d77372  nss-3.12.1.0-stripped.tar.bz2
+e552cacadaca6e858184720e4e643b2d  nss-3.12.1.1-stripped.tar.bz2



From kengert at fedoraproject.org  Fri Sep  5 19:09:55 2008
From: kengert at fedoraproject.org (Kai Engert)
Date: Fri,  5 Sep 2008 19:09:55 +0000 (UTC)
Subject: rpms/nss/F-8 .cvsignore, 1.13, 1.14 nss.spec, 1.34, 1.35 sources,
	1.14, 1.15
Message-ID: <20080905190955.D16FF70121@cvs1.fedora.phx.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nss/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13533

Modified Files:
	.cvsignore nss.spec sources 
Log Message:
* Fri Sep 05 2008 Kai Engert <kengert at redhat.com> - 3.12.1.1-1
- Update to NSS_3_12_1_RC2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/F-8/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	22 Aug 2008 22:36:59 -0000	1.13
+++ .cvsignore	5 Sep 2008 19:09:25 -0000	1.14
@@ -1,2 +1,2 @@
 nss-pem-20080124.tar.bz2
-nss-3.12.1.0-stripped.tar.bz2
+nss-3.12.1.1-stripped.tar.bz2


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/F-8/nss.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- nss.spec	22 Aug 2008 22:36:59 -0000	1.34
+++ nss.spec	5 Sep 2008 19:09:25 -0000	1.35
@@ -3,7 +3,7 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.12.1.0
+Version:          3.12.1.1
 Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
@@ -428,6 +428,8 @@
 
 
 %changelog
+* Fri Sep 05 2008 Kai Engert <kengert at redhat.com> - 3.12.1.1-1
+- Update to NSS_3_12_1_RC2
 * Fri Aug 22 2008 Kai Engert <kaie at redhat.com> - 3.12.1.0-1
 - NSS 3.12.1 RC1
 * Fri Aug 22 2008 Kai Engert <kengert at redhat.com> - 3.12.0.3-0.8.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/F-8/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	22 Aug 2008 22:36:59 -0000	1.14
+++ sources	5 Sep 2008 19:09:25 -0000	1.15
@@ -1,2 +1,2 @@
 084675e4f793ed82e1ba78f76745ada8  nss-pem-20080124.tar.bz2
-ad0cb75c59fb65b35dcd24d726d77372  nss-3.12.1.0-stripped.tar.bz2
+e552cacadaca6e858184720e4e643b2d  nss-3.12.1.1-stripped.tar.bz2



From rjones at fedoraproject.org  Fri Sep  5 19:10:25 2008
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri,  5 Sep 2008 19:10:25 +0000 (UTC)
Subject: rpms/ocaml-reins/devel import.log, NONE, 1.1 ocaml-reins.spec, NONE,
	1.1 reins-destdir-debian.patch, NONE,
	1.1 reins-install-cmi-debian.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080905191025.395D470121@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-reins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13722/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ocaml-reins.spec reins-destdir-debian.patch 
	reins-install-cmi-debian.patch 
Log Message:
Initial import.



--- NEW FILE import.log ---
ocaml-reins-0_1a-2_fc10:HEAD:ocaml-reins-0.1a-2.fc10.src.rpm:1220641770


--- NEW FILE ocaml-reins.spec ---
%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%define debug_package %{nil}

Name:           ocaml-reins
Version:        0.1a
Release:        2%{?dist}
Summary:        Library of OCaml persistent data structures

Group:          Development/Libraries
License:        LGPLv2 with exceptions
URL:            http://ocaml-reins.sourceforge.net/
Source0:        http://garr.dl.sourceforge.net/sourceforge/ocaml-reins/ocaml-reins-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:         reins-destdir-debian.patch
Patch1:         reins-install-cmi-debian.patch

BuildRequires:  ocaml >= 3.10.0
BuildRequires:  ocaml-findlib-devel
BuildRequires:  ocaml-ocamldoc
BuildRequires:  ocaml-omake
BuildRequires:  ocaml-ounit-devel

%define _use_internal_dependency_generator 0
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh


%description
Reins is a collection of persistent data structures for OCaml.

In addition to providing a large collection of data structures, the
O'Caml Reins project also includes several features that I hope will
make developing O'Caml applications easier such as a random testing
framework and a collection of "standard" modules.

Current features:

* List data types:
   o Single linked lists (compatible with the standard library type)
   o O(1) catenable lists
   o Acyclic double linked lists
   o Random access lists with O(1) hd/cons/tl and O(log i) lookup/update
     for i'th element
* Double ended queues
* Sets/Maps:
   o AVL
   o Red/Black
   o Big-endian Patricia
   o Splay
* Heaps:
   o Binomial
   o Skew Binomial
* Zipper style cursor interfaces
* Persistent, bi-directional cursor based iterators (currently only
  for lists and sets)
* All standard types hoisted into the module level (Int, Bool, etc...)
* A collection of functor combinators to minimize boilerplate (e.g.,
  constructing compare or to_string functions)
* Quickcheck testing framework
   o Each structure provides a gen function that can generate a random
     instance of itself
* Completely safe code. No -unsafe or references to Obj.*
* Consistent function signatures. For instance, all fold functions take
  the accumulator in the same position.
* All operations use no more than O(log n) stack space (except for a
  few operations on splay trees which currently have O(log n) expected
  time, but O(n) worst case)


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}


%description    devel
The %{name}-devel package contains libraries and signature files for
developing applications that use %{name}.


%prep
%setup -q
%patch0 -p1
%patch1 -p1


%build
export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
omake --config
omake doc


%install
rm -rf $RPM_BUILD_ROOT
export DESTDIR=$RPM_BUILD_ROOT
export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
omake install


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING LGPL-2.1
%{_libdir}/ocaml/reins
%if %opt
%exclude %{_libdir}/ocaml/reins/*.a
%exclude %{_libdir}/ocaml/reins/*.cmxa
%exclude %{_libdir}/ocaml/reins/*.cmx
%endif
%exclude %{_libdir}/ocaml/reins/*.mli


%files devel
%defattr(-,root,root,-)
%doc AUTHORS COPYING LGPL-2.1 doc/html
%if %opt
%{_libdir}/ocaml/reins/*.a
%{_libdir}/ocaml/reins/*.cmxa
%{_libdir}/ocaml/reins/*.cmx
%endif
%{_libdir}/ocaml/reins/*.mli


%changelog
* Wed Sep  3 2008 Richard W.M. Jones <rjones at redhat.com> - 0.1a-2
- Use normal versioning scheme.

* Sat Aug 30 2008 Richard W.M. Jones <rjones at redhat.com> - 0.1-0.1.a
- Initial RPM release.

reins-destdir-debian.patch:

--- NEW FILE reins-destdir-debian.patch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 10_DESTDIR.dpatch by Mike Furr <mfurr at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad ocaml-reins-0.1a~/config.omake ocaml-reins-0.1a/config.omake
--- ocaml-reins-0.1a~/config.omake	2007-10-02 18:09:15.312445370 -0400
+++ ocaml-reins-0.1a/config.omake	2007-10-02 18:09:24.105535886 -0400
@@ -7,7 +7,12 @@
 	  exit 1
 	OCAMLDEP_MODULES_ENABLED = $(OCAMLDEP_MODULES_AVAILABLE)
 	OCAMLDEP=$(OCAMLDEP_MODULES)
-	PREFIX=$(shell ocamlc -where)
+	if $(not $(defined PREFIX))
+	  PREFIX=$(shell ocamlc -where)
+	  export
+	if $(defined-env OCAMLFIND_DESTDIR)
+	  PREFIX = $(getenv OCAMLFIND_DESTDIR)
+	  export
 	VERSION=0.1a
 	ConfMsgChecking(oUnit)
 	OUNIT_DIR=$(shell ocamlfind query oUnit)

reins-install-cmi-debian.patch:

--- NEW FILE reins-install-cmi-debian.patch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 20_INSTALL_CMI.dpatch by Mike Furr <mfurr at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad ocaml-reins-0.1a~/src/OMakefile ocaml-reins-0.1a/src/OMakefile
--- ocaml-reins-0.1a~/src/OMakefile	2007-10-02 17:26:23.000000000 -0400
+++ ocaml-reins-0.1a/src/OMakefile	2007-10-02 17:26:54.705359854 -0400
@@ -52,5 +52,5 @@
 
 install: META $(REINS_LIB)
 	mkdir -p $(PREFIX)/reins
-	ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) \
+	ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) reins.cmi \
 	  $(filter-exists $(addsuffix .mli, $(FILES)))


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-reins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:59:57 -0000	1.1
+++ .cvsignore	5 Sep 2008 19:09:54 -0000	1.2
@@ -0,0 +1 @@
+ocaml-reins-0.1a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-reins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:59:57 -0000	1.1
+++ sources	5 Sep 2008 19:09:54 -0000	1.2
@@ -0,0 +1 @@
+696fa73fcce636f8710b7a83be613383  ocaml-reins-0.1a.tar.gz



From rstrode at fedoraproject.org  Fri Sep  5 19:12:32 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri,  5 Sep 2008 19:12:32 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec,1.46,1.47 sources,1.18,1.19
Message-ID: <20080905191232.CA27570121@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14342

Modified Files:
	plymouth.spec sources 
Log Message:
- Try to support multiple serial consoles better
  (bug 460565)



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- plymouth.spec	5 Sep 2008 15:29:22 -0000	1.46
+++ plymouth.spec	5 Sep 2008 19:12:02 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: Plymouth Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.6.0
-Release: 0.2008.09.05.1%{?dist}
+Release: 0.2008.09.05.2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -226,6 +226,10 @@
 %{_libdir}/plymouth/spinfinity.so
 
 %changelog
+* Fri Sep  5 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.05.2
+- Try to support multiple serial consoles better
+  (bug 460565)
+
 * Fri Sep  5 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.05.1
 - Fix some confusion with password handling in details plugin
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	5 Sep 2008 15:29:23 -0000	1.18
+++ sources	5 Sep 2008 19:12:02 -0000	1.19
@@ -1 +1 @@
-67a3e4a19ebf0c802d43d12a11fd8e9c  plymouth-0.6.0.tar.bz2
+22495d5143d21e11e6bb0948429bc47f  plymouth-0.6.0.tar.bz2



From spot at fedoraproject.org  Fri Sep  5 19:16:15 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  5 Sep 2008 19:16:15 +0000 (UTC)
Subject: rpms/sshfp/devel sshfp.spec,1.4,1.5
Message-ID: <20080905191615.164A870121@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sshfp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15243

Modified Files:
	sshfp.spec 
Log Message:
fix license


Index: sshfp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sshfp/devel/sshfp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sshfp.spec	15 May 2007 21:15:44 -0000	1.4
+++ sshfp.spec	5 Sep 2008 19:15:44 -0000	1.5
@@ -1,8 +1,8 @@
 Summary: Generate SSHFP DNS records from knownhosts files or ssh-keyscan
 Name: sshfp
 Version: 1.1.3
-Release: 1%{?dist}
-License: GPL
+Release: 2%{?dist}
+License: GPLv2
 Url: http://www.xelerance.com/software/%{name}
 Source: ftp://ftp.xelerance.com/%{name}/%{name}-%{version}.tar.gz
 Group: Applications/Internet
@@ -40,6 +40,9 @@
 %doc %{_mandir}/man1/*
 
 %changelog
+* Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.3-2
+- fix license tag (man page says v2+, but code says v2)
+
 * Mon May 15 2007 Paul Wouters <paul at xelerance.com> - 1.1.3-1
 - Upgraded to 1.1.3
 



From toshio at fedoraproject.org  Fri Sep  5 19:20:09 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri,  5 Sep 2008 19:20:09 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.87,1.88
Message-ID: <20080905192009.4E11470121@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16117

Modified Files:
	comps-f10.xml.in 
Log Message:
Remove qa-assistant.



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- comps-f10.xml.in	5 Sep 2008 01:20:52 -0000	1.87
+++ comps-f10.xml.in	5 Sep 2008 19:19:38 -0000	1.88
@@ -3437,7 +3437,6 @@
       <packagereq type="optional">openoffice.org-testtools</packagereq>
       <packagereq type="optional">openoffice.org-voikko</packagereq>
       <packagereq type="optional">pybliographer</packagereq>
-      <packagereq type="optional">qa-assistant</packagereq>
       <packagereq type="optional">qcad</packagereq>
       <packagereq type="optional">referencer</packagereq>
       <packagereq type="optional">revelation</packagereq>



From spot at fedoraproject.org  Fri Sep  5 19:22:28 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  5 Sep 2008 19:22:28 +0000 (UTC)
Subject: rpms/stardict-dic-en/devel stardict-dic-en.spec,1.1,1.2
Message-ID: <20080905192228.C7FB170121@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/stardict-dic-en/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16596

Modified Files:
	stardict-dic-en.spec 
Log Message:
fix license


Index: stardict-dic-en.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-en/devel/stardict-dic-en.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stardict-dic-en.spec	4 Jul 2007 03:31:28 -0000	1.1
+++ stardict-dic-en.spec	5 Sep 2008 19:21:58 -0000	1.2
@@ -1,9 +1,10 @@
 Name: stardict-dic-en
 Summary: English(en) dictionaries for StarDict
 Version: 2.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/System
-License: GPL
+# Only attribution is on download page, no version given.
+License: GPL+
 URL: http://stardict.sourceforge.net
 
 Source0: http://downloads.sourceforge.net/stardict/stardict-dictd_www.dict.org_wn-2.4.2.tar.bz2
@@ -38,6 +39,9 @@
 %{_datadir}/stardict/dic/*
 
 %changelog
+* Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-4
+- fix license tag
+
 * Wed Jun 27 2007 Hu Zheng <zhu at redhat.com> - 2.4.2-3
 - Separate spec files for each language's dictionaries.
 



From kengert at fedoraproject.org  Fri Sep  5 19:25:28 2008
From: kengert at fedoraproject.org (Kai Engert)
Date: Fri,  5 Sep 2008 19:25:28 +0000 (UTC)
Subject: rpms/nss/devel .cvsignore, 1.19, 1.20 nss.spec, 1.51, 1.52 sources, 
	1.20, 1.21
Message-ID: <20080905192528.0A7AF70121@cvs1.fedora.phx.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17413

Modified Files:
	.cvsignore nss.spec sources 
Log Message:
* Fri Sep 05 2008 Kai Engert <kengert at redhat.com> - 3.12.1.1-2
- Update to NSS_3_12_1_RC2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	22 Aug 2008 21:48:09 -0000	1.19
+++ .cvsignore	5 Sep 2008 19:24:57 -0000	1.20
@@ -1,2 +1,2 @@
 nss-pem-20080124.tar.bz2
-nss-3.12.1.0-stripped.tar.bz2
+nss-3.12.1.1-stripped.tar.bz2


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- nss.spec	22 Aug 2008 21:48:09 -0000	1.51
+++ nss.spec	5 Sep 2008 19:24:57 -0000	1.52
@@ -3,7 +3,7 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.12.1.0
+Version:          3.12.1.1
 Release:          2%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
@@ -442,6 +442,8 @@
 
 
 %changelog
+* Fri Sep 05 2008 Kai Engert <kengert at redhat.com> - 3.12.1.1-2
+- Update to NSS_3_12_1_RC2
 * Fri Aug 22 2008 Kai Engert <kaie at redhat.com> - 3.12.1.0-2
 - NSS 3.12.1 RC1
 * Fri Aug 15 2008 Kai Engert <kaie at redhat.com> - 3.12.0.3-7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	22 Aug 2008 21:48:09 -0000	1.20
+++ sources	5 Sep 2008 19:24:57 -0000	1.21
@@ -1,2 +1,2 @@
 084675e4f793ed82e1ba78f76745ada8  nss-pem-20080124.tar.bz2
-ad0cb75c59fb65b35dcd24d726d77372  nss-3.12.1.0-stripped.tar.bz2
+e552cacadaca6e858184720e4e643b2d  nss-3.12.1.1-stripped.tar.bz2



From pkgdb at fedoraproject.org  Fri Sep  5 19:28:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 19:28:58 +0000
Subject: [pkgdb] ocaml-reins (Fedora, 9) updated by tibbs
Message-ID: <20080905192859.3283520876E@bastion.fedora.phx.redhat.com>

tibbs added a Fedora 9 branch for ocaml-reins
tibbs has set commit to Approved for uberpackager on ocaml-reins (Fedora 9)
tibbs has set build to Approved for uberpackager on ocaml-reins (Fedora 9)
tibbs has set checkout to Approved for uberpackager on ocaml-reins (Fedora 9)
tibbs changed owner of ocaml-reins in Fedora 9 to rjones
tibbs Approved packager for commit access on ocaml-reins (Fedora 9)
tibbs Approved uberpackager for commit access on ocaml-reins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-reins



From spot at fedoraproject.org  Fri Sep  5 19:34:45 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  5 Sep 2008 19:34:45 +0000 (UTC)
Subject: rpms/stardict-dic-ja/devel stardict-dic-ja.spec,1.1,1.2
Message-ID: <20080905193445.47EBC70121@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/stardict-dic-ja/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19762

Modified Files:
	stardict-dic-ja.spec 
Log Message:
fix license


Index: stardict-dic-ja.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-ja/devel/stardict-dic-ja.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stardict-dic-ja.spec	4 Jul 2007 05:17:01 -0000	1.1
+++ stardict-dic-ja.spec	5 Sep 2008 19:34:14 -0000	1.2
@@ -1,9 +1,12 @@
 Name: stardict-dic-ja
 Summary: Japanese(ja) dictionaries for StarDict
 Version: 2.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/System
-License: GPL
+# Upstream calls this the "EDRDG" license
+# but it is just CC-BY-SA
+# http://www.edrdg.org/edrdg/newlic.html
+License: CC-BY-SA
 URL: http://stardict.sourceforge.net
 
 Source0: http://downloads.sourceforge.net/stardict/stardict-edict-2.4.2.tar.bz2
@@ -42,6 +45,9 @@
 %{_datadir}/stardict/dic/*
 
 %changelog
+* Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-4
+- fix license tag
+
 * Wed Jun 27 2007 Hu Zheng <zhu at redhat.com> - 2.4.2-3
 - Separate spec files for each language's dictionaries.
 



From mschwendt at fedoraproject.org  Fri Sep  5 19:36:01 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  5 Sep 2008 19:36:01 +0000 (UTC)
Subject: rpms/ladspa/devel .cvsignore, 1.2, 1.3 ladspa.spec, 1.15,
	1.16 sources, 1.2, 1.3 ladspa-1.12-gcc41.patch, 1.1, NONE
Message-ID: <20080905193601.977AE70126@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/ladspa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20307

Modified Files:
	.cvsignore ladspa.spec sources 
Removed Files:
	ladspa-1.12-gcc41.patch 
Log Message:
* Fri Sep  5 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.13-1
- link with build-id to fix rawhide build
- upgrade to 1.13 (GCC4 build-fix and string fixes) (#449542)
- add -plugindir patch so listplugin and friends will work by default
  (Anthony Green #324741)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ladspa/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:40:09 -0000	1.2
+++ .cvsignore	5 Sep 2008 19:35:30 -0000	1.3
@@ -1 +1 @@
-ladspa_sdk_1.12.tgz
+ladspa_sdk_1.13.tgz


Index: ladspa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ladspa/devel/ladspa.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ladspa.spec	5 Aug 2008 20:00:57 -0000	1.15
+++ ladspa.spec	5 Sep 2008 19:35:30 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           ladspa
-Version:        1.12
-Release:        10%{?dist}
+Version:        1.13
+Release:        1%{?dist}
 
 Summary:        LADSPA SDK, example plug-ins and tools
 
@@ -8,7 +8,7 @@
 License:        LGPLv2+
 URL:            http://www.ladspa.org/
 Source:         http://www.ladspa.org/download/%{name}_sdk_%{version}.tgz
-Patch:          ladspa-1.12-gcc41.patch
+Patch1:         ladspa-1.13-plugindir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl
@@ -38,9 +38,9 @@
 
 %prep
 %setup -q -n ladspa_sdk
-%patch -p1
+%patch1 -p0 -b .plugindir
 # respect RPM_OPT_FLAGS
-perl -pi -e 's/^(CFLAGS.*)-O3(.*)/$1\$\(RPM_OPT_FLAGS\)$2/' src/makefile
+perl -pi -e 's/^(CFLAGS.*)-O3(.*)/$1\$\(RPM_OPT_FLAGS\)$2 -DPLUGINDIR=\$\(PLUGINDIR\)/' src/makefile
 
 # fix links to the header file in the docs
 cd doc
@@ -49,7 +49,7 @@
 
 %build
 cd src
-make targets %{?_smp_mflags}
+PLUGINDIR=\\\"%{_libdir}/ladspa\\\" make targets %{?_smp_mflags} LD="ld --build-id"
 
 #make test
 #make check
@@ -96,6 +96,12 @@
 
 
 %changelog
+* Fri Sep  5 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.13-1
+- link with build-id to fix rawhide build
+- upgrade to 1.13 (GCC4 build-fix and string fixes) (#449542)
+- add -plugindir patch so listplugin and friends will work by default
+  (Anthony Green #324741)
+
 * Tue Aug  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.12-10
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ladspa/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:40:09 -0000	1.2
+++ sources	5 Sep 2008 19:35:31 -0000	1.3
@@ -1 +1 @@
-dbd63dd701d80b152943073c84565c14  ladspa_sdk_1.12.tgz
+671be3e1021d0722cadc7fb27054628e  ladspa_sdk_1.13.tgz


--- ladspa-1.12-gcc41.patch DELETED ---



From mdehaan at fedoraproject.org  Fri Sep  5 19:36:56 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  5 Sep 2008 19:36:56 +0000 (UTC)
Subject: rpms/cobbler/EL-4 .cvsignore, 1.39, 1.40 cobbler.spec, 1.49,
	1.50 sources, 1.47, 1.48
Message-ID: <20080905193656.38F1270126@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20600/EL-4

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	2 Sep 2008 14:39:19 -0000	1.39
+++ .cvsignore	5 Sep 2008 19:36:25 -0000	1.40
@@ -36,3 +36,4 @@
 cobbler-1.0.3.tar.gz
 cobbler-1.2.0.tar.gz
 cobbler-1.2.1.tar.gz
+cobbler-1.2.2.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- cobbler.spec	2 Sep 2008 14:39:19 -0000	1.49
+++ cobbler.spec	5 Sep 2008 19:36:25 -0000	1.50
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.1
+Version: 1.2.2
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -156,7 +156,6 @@
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers/add/distro
-%dir /var/lib/cobbler/triggers/add/distro
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
 %dir /var/lib/cobbler/triggers/add/profile
@@ -218,6 +217,9 @@
 
 %changelog
 
+* Fri Sep 05 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.2-1
+- Upstream changes (see CHANGELOG)
+
 * Tue Sep 02 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.1-1
 - Upstream changes (see CHANGELOG)
 - Package unowned directories


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	2 Sep 2008 14:39:19 -0000	1.47
+++ sources	5 Sep 2008 19:36:25 -0000	1.48
@@ -3,3 +3,4 @@
 95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
 2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
+df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz



From mdehaan at fedoraproject.org  Fri Sep  5 19:36:57 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  5 Sep 2008 19:36:57 +0000 (UTC)
Subject: rpms/cobbler/EL-5 .cvsignore, 1.43, 1.44 cobbler.spec, 1.51,
	1.52 sources, 1.50, 1.51
Message-ID: <20080905193657.0520770126@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20600/EL-5

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	2 Sep 2008 14:39:19 -0000	1.43
+++ .cvsignore	5 Sep 2008 19:36:26 -0000	1.44
@@ -40,3 +40,4 @@
 cobbler-1.0.3.tar.gz
 cobbler-1.2.0.tar.gz
 cobbler-1.2.1.tar.gz
+cobbler-1.2.2.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- cobbler.spec	2 Sep 2008 14:39:20 -0000	1.51
+++ cobbler.spec	5 Sep 2008 19:36:26 -0000	1.52
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.1
+Version: 1.2.2
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -156,7 +156,6 @@
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers/add/distro
-%dir /var/lib/cobbler/triggers/add/distro
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
 %dir /var/lib/cobbler/triggers/add/profile
@@ -218,6 +217,9 @@
 
 %changelog
 
+* Fri Sep 05 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.2-1
+- Upstream changes (see CHANGELOG)
+
 * Tue Sep 02 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.1-1
 - Upstream changes (see CHANGELOG)
 - Package unowned directories


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	2 Sep 2008 14:39:20 -0000	1.50
+++ sources	5 Sep 2008 19:36:26 -0000	1.51
@@ -3,3 +3,4 @@
 95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
 2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
+df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz



From mdehaan at fedoraproject.org  Fri Sep  5 19:36:57 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  5 Sep 2008 19:36:57 +0000 (UTC)
Subject: rpms/cobbler/F-7 .cvsignore, 1.39, 1.40 cobbler.spec, 1.49,
	1.50 sources, 1.47, 1.48
Message-ID: <20080905193657.86D8870126@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20600/F-7

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	2 Sep 2008 14:39:20 -0000	1.39
+++ .cvsignore	5 Sep 2008 19:36:26 -0000	1.40
@@ -36,3 +36,4 @@
 cobbler-1.0.3.tar.gz
 cobbler-1.2.0.tar.gz
 cobbler-1.2.1.tar.gz
+cobbler-1.2.2.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/cobbler.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- cobbler.spec	2 Sep 2008 14:39:20 -0000	1.49
+++ cobbler.spec	5 Sep 2008 19:36:27 -0000	1.50
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.1
+Version: 1.2.2
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -156,7 +156,6 @@
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers/add/distro
-%dir /var/lib/cobbler/triggers/add/distro
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
 %dir /var/lib/cobbler/triggers/add/profile
@@ -218,6 +217,9 @@
 
 %changelog
 
+* Fri Sep 05 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.2-1
+- Upstream changes (see CHANGELOG)
+
 * Tue Sep 02 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.1-1
 - Upstream changes (see CHANGELOG)
 - Package unowned directories


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	2 Sep 2008 14:39:20 -0000	1.47
+++ sources	5 Sep 2008 19:36:27 -0000	1.48
@@ -3,3 +3,4 @@
 95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
 2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
+df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz



From mdehaan at fedoraproject.org  Fri Sep  5 19:36:58 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  5 Sep 2008 19:36:58 +0000 (UTC)
Subject: rpms/cobbler/F-8 .cvsignore, 1.39, 1.40 cobbler.spec, 1.48,
	1.49 sources, 1.47, 1.48
Message-ID: <20080905193658.622F370126@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20600/F-8

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	2 Sep 2008 14:39:20 -0000	1.39
+++ .cvsignore	5 Sep 2008 19:36:27 -0000	1.40
@@ -36,3 +36,4 @@
 cobbler-1.0.3.tar.gz
 cobbler-1.2.0.tar.gz
 cobbler-1.2.1.tar.gz
+cobbler-1.2.2.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/cobbler.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- cobbler.spec	2 Sep 2008 14:39:20 -0000	1.48
+++ cobbler.spec	5 Sep 2008 19:36:27 -0000	1.49
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.1
+Version: 1.2.2
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -156,7 +156,6 @@
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers/add/distro
-%dir /var/lib/cobbler/triggers/add/distro
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
 %dir /var/lib/cobbler/triggers/add/profile
@@ -218,6 +217,9 @@
 
 %changelog
 
+* Fri Sep 05 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.2-1
+- Upstream changes (see CHANGELOG)
+
 * Tue Sep 02 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.1-1
 - Upstream changes (see CHANGELOG)
 - Package unowned directories


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	2 Sep 2008 14:39:20 -0000	1.47
+++ sources	5 Sep 2008 19:36:27 -0000	1.48
@@ -3,3 +3,4 @@
 95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
 2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
+df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz



From mdehaan at fedoraproject.org  Fri Sep  5 19:36:59 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  5 Sep 2008 19:36:59 +0000 (UTC)
Subject: rpms/cobbler/devel .cvsignore, 1.39, 1.40 cobbler.spec, 1.53,
	1.54 sources, 1.48, 1.49
Message-ID: <20080905193659.9E8C470126@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20600/devel

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	2 Sep 2008 14:39:20 -0000	1.39
+++ .cvsignore	5 Sep 2008 19:36:29 -0000	1.40
@@ -36,3 +36,4 @@
 cobbler-1.0.3.tar.gz
 cobbler-1.2.0.tar.gz
 cobbler-1.2.1.tar.gz
+cobbler-1.2.2.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- cobbler.spec	2 Sep 2008 14:39:20 -0000	1.53
+++ cobbler.spec	5 Sep 2008 19:36:29 -0000	1.54
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.1
+Version: 1.2.2
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -156,7 +156,6 @@
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers/add/distro
-%dir /var/lib/cobbler/triggers/add/distro
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
 %dir /var/lib/cobbler/triggers/add/profile
@@ -218,6 +217,9 @@
 
 %changelog
 
+* Fri Sep 05 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.2-1
+- Upstream changes (see CHANGELOG)
+
 * Tue Sep 02 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.1-1
 - Upstream changes (see CHANGELOG)
 - Package unowned directories


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	2 Sep 2008 14:39:21 -0000	1.48
+++ sources	5 Sep 2008 19:36:29 -0000	1.49
@@ -3,3 +3,4 @@
 95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
 2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
+df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz



From mdehaan at fedoraproject.org  Fri Sep  5 19:36:59 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  5 Sep 2008 19:36:59 +0000 (UTC)
Subject: rpms/cobbler/F-9 .cvsignore, 1.39, 1.40 cobbler.spec, 1.51,
	1.52 sources, 1.46, 1.47
Message-ID: <20080905193659.05F7370126@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20600/F-9

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	2 Sep 2008 14:39:20 -0000	1.39
+++ .cvsignore	5 Sep 2008 19:36:28 -0000	1.40
@@ -36,3 +36,4 @@
 cobbler-1.0.3.tar.gz
 cobbler-1.2.0.tar.gz
 cobbler-1.2.1.tar.gz
+cobbler-1.2.2.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/cobbler.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- cobbler.spec	2 Sep 2008 14:39:20 -0000	1.51
+++ cobbler.spec	5 Sep 2008 19:36:28 -0000	1.52
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.1
+Version: 1.2.2
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -156,7 +156,6 @@
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers/add/distro
-%dir /var/lib/cobbler/triggers/add/distro
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
 %dir /var/lib/cobbler/triggers/add/profile
@@ -218,6 +217,9 @@
 
 %changelog
 
+* Fri Sep 05 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.2-1
+- Upstream changes (see CHANGELOG)
+
 * Tue Sep 02 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.1-1
 - Upstream changes (see CHANGELOG)
 - Package unowned directories


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	2 Sep 2008 14:39:20 -0000	1.46
+++ sources	5 Sep 2008 19:36:28 -0000	1.47
@@ -3,3 +3,4 @@
 95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
 2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
+df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz



From notting at fedoraproject.org  Fri Sep  5 19:40:12 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri,  5 Sep 2008 19:40:12 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth-0.5.0-textbar-hotness.patch, 1.2,
	1.3 plymouth.spec, 1.47, 1.48
Message-ID: <20080905194012.23ABA70121@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21744

Modified Files:
	plymouth-0.5.0-textbar-hotness.patch plymouth.spec 
Log Message:
Put /etc/system-release on the initrd, and read that instead of hardcoding
'Fedora 10'.


plymouth-0.5.0-textbar-hotness.patch:

Index: plymouth-0.5.0-textbar-hotness.patch
===================================================================
RCS file: /cvs/extras/rpms/plymouth/devel/plymouth-0.5.0-textbar-hotness.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plymouth-0.5.0-textbar-hotness.patch	27 Aug 2008 16:16:22 -0000	1.2
+++ plymouth-0.5.0-textbar-hotness.patch	5 Sep 2008 19:39:41 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up plymouth-0.5.0/src/libplybootsplash/ply-text-pulser.c.jx plymouth-0.5.0/src/libplybootsplash/ply-text-pulser.c
---- plymouth-0.5.0/src/libplybootsplash/ply-text-pulser.c.jx	2008-06-30 17:51:25.000000000 -0400
-+++ plymouth-0.5.0/src/libplybootsplash/ply-text-pulser.c	2008-08-12 12:44:42.000000000 -0400
-@@ -50,7 +50,7 @@
+diff -up plymouth-0.6.0/src/libplybootsplash/ply-text-pulser.c.textbar plymouth-0.6.0/src/libplybootsplash/ply-text-pulser.c
+--- plymouth-0.6.0/src/libplybootsplash/ply-text-pulser.c.textbar	2008-08-19 15:14:04.000000000 -0400
++++ plymouth-0.6.0/src/libplybootsplash/ply-text-pulser.c	2008-09-05 15:21:28.000000000 -0400
+@@ -50,11 +50,14 @@
  #include <linux/kd.h>
  
  #ifndef FRAMES_PER_SECOND
@@ -10,7 +10,14 @@
  #endif
  
  #define NUMBER_OF_INDICATOR_COLUMNS 6
-@@ -75,13 +75,11 @@ ply_text_pulser_new (void)
+ 
++#define OS_STRING " "
++char *os_string = OS_STRING;
++
+ struct _ply_text_pulser
+ {
+   ply_event_loop_t *loop;
+@@ -75,13 +78,11 @@ ply_text_pulser_new (void)
  
    pulser = calloc (1, sizeof (ply_text_pulser_t));
  
@@ -26,11 +33,10 @@
  
    return pulser;
  }
-@@ -95,42 +93,71 @@ ply_text_pulser_free (ply_text_pulser_t 
-   free (pulser);
+@@ -96,41 +97,95 @@ ply_text_pulser_free (ply_text_pulser_t 
  }
  
--static void
+ static void
 -draw_trough (ply_text_pulser_t *pulser,
 -             int                column,
 -             int                row)
@@ -45,6 +51,31 @@
 -  memset (bytes, ' ', pulser->number_of_columns);
 -  write (STDOUT_FILENO, bytes, pulser->number_of_columns);
 -  free (bytes);
++get_os_string (void)
++{
++   int fd;
++   char *buf, *pos, *pos2;
++   struct stat sbuf;
++   
++   fd = open("/etc/system-release", O_RDONLY);
++   if (fd == -1) return;
++   if (fstat(fd, &sbuf) == -1) return;
++   buf = calloc(sbuf.st_size + 1, sizeof(char));
++   read(fd, buf, sbuf.st_size);
++   close(fd);
++   
++   pos = strstr(buf, " release ");
++   if (!pos) goto out;
++   pos2 = strstr(pos, " (");
++   if (!pos2) goto out;
++   *pos = '\0';
++   pos+= 9;
++   *pos2 = '\0';
++   asprintf(&os_string," %s %s", buf, pos);
++out:
++   free(buf);
++}
++
 +/* Hi Will! */
 +static double
 +woodsify(double time, double estimate)
@@ -53,14 +84,13 @@
  }
  
 +#define STARTUP_TIME 20.0
-+#define OS_STRING " Fedora 10"
 +
  static void
  animate_at_time (ply_text_pulser_t *pulser,
                   double             time)
  {
 -  ply_window_set_mode (pulser->window, PLY_WINDOW_MODE_TEXT);
-+    int i, width = pulser->number_of_columns - 2 - strlen(OS_STRING);
++    int i, width = pulser->number_of_columns - 2 - strlen(os_string);
 +    double brown_fraction, blue_fraction, white_fraction;
 +
 +    ply_window_set_mode (pulser->window, PLY_WINDOW_MODE_TEXT);
@@ -88,6 +118,8 @@
 -  draw_trough (pulser, pulser->column, pulser->row);
 +	write (STDOUT_FILENO, " ", strlen (" "));
 +    }
++
++    ply_window_set_background_color (pulser->window, PLY_WINDOW_COLOR_BLACK);
  
 -  ply_window_set_text_cursor_position (pulser->window,
 -                                       pulser->column + pulser->spinner_position,
@@ -100,8 +132,6 @@
 -  ply_window_set_background_color (pulser->window, PLY_WINDOW_COLOR_GREEN);
 -  write (STDOUT_FILENO, "      ", strlen ("      "));
 -  ply_window_set_background_color (pulser->window, PLY_WINDOW_COLOR_DEFAULT);
-+    ply_window_set_background_color (pulser->window, PLY_WINDOW_COLOR_BLACK);
-+
 +    if (brown_fraction > 0.5) {
 +	if (white_fraction > 0.875)
 +	    ply_window_set_foreground_color (pulser->window,
@@ -118,7 +148,7 @@
 +					    pulser->row);
 +
 +
-+	write (STDOUT_FILENO, OS_STRING, strlen(OS_STRING));
++	write (STDOUT_FILENO, os_string, strlen(os_string));
 +	
 +	ply_window_set_foreground_color (pulser->window,
 +					 PLY_WINDOW_COLOR_DEFAULT);
@@ -126,7 +156,7 @@
  }
  
  static void
-@@ -161,9 +188,7 @@ on_timeout (ply_text_pulser_t *pulser)
+@@ -161,9 +216,7 @@ on_timeout (ply_text_pulser_t *pulser)
  bool
  ply_text_pulser_start (ply_text_pulser_t  *pulser,
                         ply_event_loop_t   *loop,
@@ -137,7 +167,7 @@
  {
    assert (pulser != NULL);
    assert (pulser->loop == NULL);
-@@ -171,8 +196,10 @@ ply_text_pulser_start (ply_text_pulser_t
+@@ -171,10 +224,14 @@ ply_text_pulser_start (ply_text_pulser_t
    pulser->loop = loop;
    pulser->window = window;
  
@@ -149,10 +179,14 @@
 +  pulser->column = 2;
  
    pulser->start_time = ply_get_timestamp ();
++  
++  get_os_string ();
  
-diff -up plymouth-0.5.0/src/libplybootsplash/ply-text-pulser.h.jx plymouth-0.5.0/src/libplybootsplash/ply-text-pulser.h
---- plymouth-0.5.0/src/libplybootsplash/ply-text-pulser.h.jx	2008-06-21 23:48:59.000000000 -0400
-+++ plymouth-0.5.0/src/libplybootsplash/ply-text-pulser.h	2008-08-12 12:36:51.000000000 -0400
+   ply_event_loop_watch_for_timeout (pulser->loop,
+                                     1.0 / FRAMES_PER_SECOND,
+diff -up plymouth-0.6.0/src/libplybootsplash/ply-text-pulser.h.textbar plymouth-0.6.0/src/libplybootsplash/ply-text-pulser.h
+--- plymouth-0.6.0/src/libplybootsplash/ply-text-pulser.h.textbar	2008-08-19 15:14:04.000000000 -0400
++++ plymouth-0.6.0/src/libplybootsplash/ply-text-pulser.h	2008-09-05 15:19:22.000000000 -0400
 @@ -38,9 +38,7 @@ void ply_text_pulser_free (ply_text_puls
  bool ply_text_pulser_load (ply_text_pulser_t *pulser);
  bool ply_text_pulser_start (ply_text_pulser_t  *pulser,
@@ -164,9 +198,9 @@
  void ply_text_pulser_stop (ply_text_pulser_t *pulser);
  
  int ply_text_pulser_get_number_of_rows (ply_text_pulser_t *pulser);
-diff -up plymouth-0.5.0/src/splash-plugins/text/plugin.c.jx plymouth-0.5.0/src/splash-plugins/text/plugin.c
---- plymouth-0.5.0/src/plugins/splash/text/plugin.c.jx	2008-07-29 15:15:51.000000000 -0400
-+++ plymouth-0.5.0/src/plugins/splash/text/plugin.c	2008-08-12 12:36:51.000000000 -0400
+diff -up plymouth-0.6.0/src/plugins/splash/text/plugin.c.textbar plymouth-0.6.0/src/plugins/splash/text/plugin.c
+--- plymouth-0.6.0/src/plugins/splash/text/plugin.c.textbar	2008-08-27 10:57:18.000000000 -0400
++++ plymouth-0.6.0/src/plugins/splash/text/plugin.c	2008-09-05 15:19:22.000000000 -0400
 @@ -105,28 +105,33 @@ start_animation (ply_boot_splash_plugin_
    assert (plugin->loop != NULL);
  
@@ -210,3 +244,14 @@
  }
  
  static void
+diff -up plymouth-0.6.0/scripts/plymouth-populate-initrd.in.foo plymouth-0.6.0/scripts/plymouth-populate-initrd.in
+--- plymouth-0.6.0/scripts/plymouth-populate-initrd.in.foo	2008-09-05 15:23:17.000000000 -0400
++++ plymouth-0.6.0/scripts/plymouth-populate-initrd.in	2008-09-05 15:23:51.000000000 -0400
+@@ -60,6 +60,7 @@ inst ${BINDIR}/plymouth $INITRDDIR
+ inst ${LIBDIR}/plymouth/text.so $INITRDDIR
+ inst ${LIBDIR}/plymouth/details.so $INITRDDIR
+ inst ${PLYMOUTH_LOGO_FILE} $INITRDDIR
++inst /etc/system-release $INITRDDIR
+ mkdir -p ${INITRDDIR}${DATADIR}/plymouth
+ 
+ PLUGIN_NAME=$(plymouth-set-default-plugin)


Index: plymouth.spec
===================================================================
RCS file: /cvs/extras/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- plymouth.spec	5 Sep 2008 19:12:02 -0000	1.47
+++ plymouth.spec	5 Sep 2008 19:39:41 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: Plymouth Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.6.0
-Release: 0.2008.09.05.2%{?dist}
+Release: 0.2008.09.05.3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -226,6 +226,9 @@
 %{_libdir}/plymouth/spinfinity.so
 
 %changelog
+* Fri Sep  5 2008 Bill Nottingham <notting at redhat.com> 0.6.0-0.2008.09.05.3
+- make the text plugin use the system release info rather than a hardcoded 'Fedora 10'
+
 * Fri Sep  5 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.05.2
 - Try to support multiple serial consoles better
   (bug 460565)



From limb at fedoraproject.org  Fri Sep  5 19:47:05 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri,  5 Sep 2008 19:47:05 +0000 (UTC)
Subject: rpms/gnubg/devel gnubg-0.9.0-1-neuralnet-arch.patch, NONE,
	1.1 gnubg.spec, 1.19, 1.20
Message-ID: <20080905194705.4761C70121@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gnubg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23173

Modified Files:
	gnubg.spec 
Added Files:
	gnubg-0.9.0-1-neuralnet-arch.patch 
Log Message:
Disable sse test for all non i386 arches.


gnubg-0.9.0-1-neuralnet-arch.patch:

--- NEW FILE gnubg-0.9.0-1-neuralnet-arch.patch ---
--- lib/neuralnet.c	2008-09-05 14:20:49.000000000 -0500
+++ lib/neuralnet.c	2008-09-05 14:20:49.000000000 -0500
@@ -613,7 +613,7 @@
 }
 #if USE_SSE_VECTORIZE
 
-#if defined(_MSC_VER) || defined(DISABLE_SSE_TEST) || __x86_64
+#if defined(_MSC_VER) || defined(DISABLE_SSE_TEST) || __x86_64 || __ppc || __ppc64
 
 int SSE_Supported()
 {


Index: gnubg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnubg/devel/gnubg.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnubg.spec	5 Sep 2008 18:13:25 -0000	1.19
+++ gnubg.spec	5 Sep 2008 19:46:34 -0000	1.20
@@ -9,6 +9,7 @@
 Source1:       gnubg.weights
 Source2:       gnubg.desktop
 Source3:       gnubg.png
+Patch0:        gnubg-0.9.0-1-neuralnet-arch.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n ) 
 URL:           http://www.gnubg.org
 BuildRequires: gtk2-devel
@@ -57,6 +58,8 @@
 /usr/bin/iconv -f ISO-8859-1 -t UTF8 ChangeLog > ChangeLog.tmp 
 /bin/mv ChangeLog.tmp ChangeLog
 
+%patch0 -p0
+
 # running autogen, sources are nightly CVS tarballs not
 # containing configure
 ./autogen.sh



From pkgdb at fedoraproject.org  Fri Sep  5 19:50:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 19:50:49 +0000
Subject: [pkgdb] xml-commons-resolver: dbhole has requested commit
Message-ID: <20080905195049.B383420876C@bastion.fedora.phx.redhat.com>

dbhole has requested the commit acl on xml-commons-resolver (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xml-commons-resolver



From pkgdb at fedoraproject.org  Fri Sep  5 19:51:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 19:51:16 +0000
Subject: [pkgdb] xml-commons-resolver had acl change status
Message-ID: <20080905195116.E3E7220876C@bastion.fedora.phx.redhat.com>

tibbs has set the commit acl on xml-commons-resolver (Fedora devel) to Approved for dbhole

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xml-commons-resolver



From sandeen at fedoraproject.org  Fri Sep  5 20:02:05 2008
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Fri,  5 Sep 2008 20:02:05 +0000 (UTC)
Subject: rpms/xfsprogs/devel .cvsignore, 1.16, 1.17 sources, 1.17,
	1.18 xfsprogs.spec, 1.40, 1.41
Message-ID: <20080905200205.76F3770121@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/xfsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26337

Modified Files:
	.cvsignore sources xfsprogs.spec 
Log Message:
* Fri Sep 05 2008 Eric Sandeen <sandeen at redhat.com> 2.10.1-1
- Update to xfsprogs 2.10.1
- Add ASCII case-insensitive support to xfsprogs.
- xfs_repair fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	23 Apr 2008 16:38:21 -0000	1.16
+++ .cvsignore	5 Sep 2008 20:01:35 -0000	1.17
@@ -1 +1 @@
-xfsprogs_2.9.8-1.tar.gz
+xfsprogs_2.10.1-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	23 Apr 2008 16:38:21 -0000	1.17
+++ sources	5 Sep 2008 20:01:35 -0000	1.18
@@ -1 +1 @@
-f32ab3282c3e02ce25128f7a6c2d5157  xfsprogs_2.9.8-1.tar.gz
+8f0410aa8cfea0936969a3aab447009c  xfsprogs_2.10.1-1.tar.gz


Index: xfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xfsprogs.spec	4 Jun 2008 17:56:27 -0000	1.40
+++ xfsprogs.spec	5 Sep 2008 20:01:35 -0000	1.41
@@ -1,7 +1,7 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
-Version:	2.9.8
-Release:	3%{?dist}
+Version:	2.10.1
+Release:	1%{?dist}
 # Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
 # in source, with no mention of version.
 # doc/COPYING file specifies what is GPL and what is LGPL
@@ -110,6 +110,11 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Sep 05 2008 Eric Sandeen <sandeen at redhat.com> 2.10.1-1
+- Update to xfsprogs 2.10.1
+- Add ASCII case-insensitive support to xfsprogs.
+- xfs_repair fixes
+
 * Wed Jun 04 2008 Dennis Gilmore <dennis at ausil.us> 2.9.8-3
 - sparc32 is built using the sparcv9 variant 
 



From gemi at fedoraproject.org  Fri Sep  5 20:06:42 2008
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Fri,  5 Sep 2008 20:06:42 +0000 (UTC)
Subject: rpms/erlang/devel erlang.spec,1.30,1.31 otp-sslrpath.patch,1.1,1.2
Message-ID: <20080905200642.B4F1470121@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/erlang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27522

Modified Files:
	erlang.spec otp-sslrpath.patch 
Log Message:
fixed sslrpath patch


Index: erlang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/devel/erlang.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- erlang.spec	17 Jul 2008 20:13:32 -0000	1.30
+++ erlang.spec	5 Sep 2008 20:06:12 -0000	1.31
@@ -3,7 +3,7 @@
 
 Name:           erlang
 Version:        %{ver}
-Release:        %{rel}.2%{?dist}
+Release:        %{rel}.3%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
@@ -117,6 +117,9 @@
 
 
 %changelog
+* Fri Sep  5 2008 Gerard Milmeister <gemi at bluewin.ch> - R12B-3.3%{?dist}
+- fixed sslrpath patch
+
 * Thu Jul 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> - R12B-3.2
 - fix license tag
 

otp-sslrpath.patch:

Index: otp-sslrpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/devel/otp-sslrpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- otp-sslrpath.patch	17 Feb 2006 23:32:19 -0000	1.1
+++ otp-sslrpath.patch	5 Sep 2008 20:06:12 -0000	1.2
@@ -1,7 +1,8 @@
---- otp_src_R10B-9/lib/ssl/c_src/Makefile.in.sslrpath	2005-12-29 00:49:17.000000000 +0100
-+++ otp_src_R10B-9/lib/ssl/c_src/Makefile.in	2005-12-29 00:50:15.000000000 +0100
-@@ -95,7 +95,7 @@
- endif
+diff -up otp_src_R12B-3/lib/ssl/c_src/Makefile.in.sslrpath otp_src_R12B-3/lib/ssl/c_src/Makefile.in
+--- otp_src_R12B-3/lib/ssl/c_src/Makefile.in.sslrpath	2008-09-05 22:01:58.000000000 +0200
++++ otp_src_R12B-3/lib/ssl/c_src/Makefile.in	2008-09-05 22:02:34.000000000 +0200
+@@ -102,7 +102,7 @@ else
+ SSL_MAKEFILE =
  endif
  
 -CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@



From dbhole at fedoraproject.org  Fri Sep  5 20:10:02 2008
From: dbhole at fedoraproject.org (Deepak Bhole)
Date: Fri,  5 Sep 2008 20:10:02 +0000 (UTC)
Subject: rpms/xml-commons-resolver/devel
	xml-commons-resolver-src-version.patch, NONE,
	1.1 xml-commons-resolver.spec, 1.17, 1.18
Message-ID: <20080905201002.F194A70121@cvs1.fedora.phx.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/xml-commons-resolver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28522

Modified Files:
	xml-commons-resolver.spec 
Added Files:
	xml-commons-resolver-src-version.patch 
Log Message:

- Build with IcedTea to escape sinjdoc issues



xml-commons-resolver-src-version.patch:

--- NEW FILE xml-commons-resolver-src-version.patch ---
diff -up ./resolver.xml.sav ./resolver.xml
--- ./resolver.xml.sav	2008-09-05 16:06:29.000000000 -0400
+++ ./resolver.xml	2008-09-05 16:08:16.000000000 -0400
@@ -83,7 +83,7 @@ Also, you may need to adjust src/documen
 
    <echo message="Compiling..." />
 
-   <javac srcdir="${src.dir}" destdir="${build.classes.dir}">
+   <javac srcdir="${src.dir}" destdir="${build.classes.dir}" 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"/>
@@ -143,7 +143,8 @@ Also, you may need to adjust src/documen
                    use="true"
 		   windowtitle="${name.resolver} API"
 		   doctitle="${name.resolver}"
-		   bottom="${copyright.message}">
+		   bottom="${copyright.message}"
+           source="1.4">
             <package name="org.apache.xml.resolver"/>
             <package name="org.apache.xml.resolver.helpers"/>
             <package name="org.apache.xml.resolver.readers"/>


Index: xml-commons-resolver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xml-commons-resolver/devel/xml-commons-resolver.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xml-commons-resolver.spec	10 Jul 2008 20:42:24 -0000	1.17
+++ xml-commons-resolver.spec	5 Sep 2008 20:09:32 -0000	1.18
@@ -7,7 +7,7 @@
 
 Name:           xml-commons-resolver
 Version:        1.1
-Release: 	2.13%{?dist}
+Release: 	2.14%{?dist}
 Epoch:          0
 Summary:        Resolver subproject of xml-commons.
 License:        ASL 1.1
@@ -16,8 +16,12 @@
 Source1:        xml-commons-resolver-resolver.sh
 Source2:        xml-commons-resolver-xread.sh
 Source3:        xml-commons-resolver-xparse.sh
+
+Patch0:			%{name}-src-version.patch
+
 Requires:       jaxp_parser_impl
 Requires:	xml-commons-apis
+BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5
 #BuildRequires:  %{_bindir}/xsltproc
@@ -49,6 +53,9 @@
 
 %prep
 %setup -q
+
+%patch0
+
 # remove all binary libs and prebuilt javadocs
 find . -name "*.jar" -exec rm -f {} \;
 rm -rf docs
@@ -135,6 +142,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Sep 05 2008 Deepak Bhole <dbhole at redhat.com> 1.1-2.14
+- Build with IcedTea to escape sinjdoc issues
+
 * Thu Jul 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:1.1-2.13
 - drop repotag
 - fix license tag



From till at fedoraproject.org  Fri Sep  5 20:11:03 2008
From: till at fedoraproject.org (Till Maas)
Date: Fri,  5 Sep 2008 20:11:03 +0000 (UTC)
Subject: rpms/pam_mount/devel pam_mount.spec,1.40,1.41
Message-ID: <20080905201103.723D570121@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28891

Modified Files:
	pam_mount.spec 
Log Message:
* Fri Sep 05 2008 Till Maas <opensource at till.name> - 0.47-1
- Update to new version that includes a security fix:
  https://sourceforge.net/project/shownotes.php?release_id=624240
- Add lzma BR and unpack source manually
- Update libHX requirements
- add new binary



Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- pam_mount.spec	5 Sep 2008 11:46:03 -0000	1.40
+++ pam_mount.spec	5 Sep 2008 20:10:33 -0000	1.41
@@ -78,6 +78,7 @@
 %config(noreplace) %{_sysconfdir}/security/pam_mount.conf.xml
 /%{_lib}/security/pam_mount.so
 %{_sbindir}/pmvarrun
+%{_sbindir}/mount.encfs13
 %{_bindir}/autoehd
 %{_bindir}/convert_pam_mount_conf.pl
 %{_bindir}/mkehd
@@ -97,6 +98,7 @@
   https://sourceforge.net/project/shownotes.php?release_id=624240
 - Add lzma BR and unpack source manually
 - Update libHX requirements
+- add new binary
 
 * Mon Jun 23 2008 Till Maas <opensource at till.name> - 0.41-2
 - Add patch to fix <or> handling in config file, reference:



From till at fedoraproject.org  Fri Sep  5 20:16:50 2008
From: till at fedoraproject.org (Till Maas)
Date: Fri,  5 Sep 2008 20:16:50 +0000 (UTC)
Subject: rpms/pam_mount/devel pam_mount.spec,1.41,1.42
Message-ID: <20080905201650.0E26370121@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29936

Modified Files:
	pam_mount.spec 
Log Message:
* Fri Sep 05 2008 Till Maas <opensource at till.name> - 0.47-1
- Update to new version that includes a security fix:
  https://sourceforge.net/project/shownotes.php?release_id=624240
- Add lzma BR and unpack source manually
- Update libHX requirements
- add new binary



Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- pam_mount.spec	5 Sep 2008 20:10:33 -0000	1.41
+++ pam_mount.spec	5 Sep 2008 20:16:19 -0000	1.42
@@ -78,7 +78,6 @@
 %config(noreplace) %{_sysconfdir}/security/pam_mount.conf.xml
 /%{_lib}/security/pam_mount.so
 %{_sbindir}/pmvarrun
-%{_sbindir}/mount.encfs13
 %{_bindir}/autoehd
 %{_bindir}/convert_pam_mount_conf.pl
 %{_bindir}/mkehd
@@ -87,6 +86,7 @@
 %{_bindir}/pmt-fd0ssh
 %{_bindir}/pmt-ofl
 /sbin/mount.crypt
+/sbin/mount.encfs13
 /sbin/umount.crypt
 %{_mandir}/man?/*
 %{_localstatedir}/run/pam_mount



From spot at fedoraproject.org  Fri Sep  5 20:18:29 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  5 Sep 2008 20:18:29 +0000 (UTC)
Subject: rpms/ss5/devel .cvsignore,1.2,1.3 sources,1.2,1.3 ss5.spec,1.7,1.8
Message-ID: <20080905201829.D397C70121@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ss5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30264

Modified Files:
	.cvsignore sources ss5.spec 
Log Message:
fix license tag, update to 3.6.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ss5/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2006 18:23:26 -0000	1.2
+++ .cvsignore	5 Sep 2008 20:17:59 -0000	1.3
@@ -1 +1 @@
-ss5-3.5.9-1.tar.gz
+ss5-3.6.4-3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ss5/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2006 18:23:26 -0000	1.2
+++ sources	5 Sep 2008 20:17:59 -0000	1.3
@@ -1 +1 @@
-c75ec9a9b3060cc5bfc58343da6a05e8  ss5-3.5.9-1.tar.gz
+9d9b27a538747d397fadf4bd2b897f6f  ss5-3.6.4-3.tar.gz


Index: ss5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ss5/devel/ss5.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ss5.spec	19 Feb 2008 15:24:04 -0000	1.7
+++ ss5.spec	5 Sep 2008 20:17:59 -0000	1.8
@@ -1,24 +1,25 @@
 Summary: Socks Server 5 
 Name: ss5
-Version: 3.5.9
-Release: 7
-License: GPL 
+Version: 3.6.4
+Release: 1%{?dist}
+License: GPLv2+
 Group: Applications/Internet
 URL: http://sourceforge.net/projects/ss5
-Source: http://prdownloads.sourceforge.net/ss5/ss5-3.5.9-1.tar.gz
+Source: http://prdownloads.sourceforge.net/ss5/ss5-%{version}-3.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openldap-devel pam-devel
+Requires(post): chkconfig
+Requires(preun): chkconfig, initscripts
 
 %description
 ss5 is a socks server, which supports both SOCKS4 and SOCKS5 protocols,
 that runs on Linux/Solaris platforms. 
 
 %prep
-%setup
+%setup -q
 
 %build
-
-./configure --with-libpath=%{_libdir} 
+%configure --with-libpath=%{_libdir} 
 make %{?_smp_mflags}
 
 %install
@@ -41,26 +42,28 @@
 fi
 
 %files
-%defattr(755,root,root)
+%defattr(755,root,root,-)
 %{_sbindir}/ss5
 %{_initrddir}/ss5
 %{_libdir}/ss5/
 
-%defattr(644,root,root)
+%defattr(644,root,root,-)
 %dir %{_docdir}/ss5
 %{_docdir}/ss5/License
 %{_docdir}/ss5/README.pam
 %dir %{_docdir}/ss5/examples
 %{_docdir}/ss5/examples/ss5.pam
 %{_docdir}/ss5/README.ldap
+%{_docdir}/ss5/README.balamgr
+%{_docdir}/ss5/README.statmgr
 %{_docdir}/ss5/examples/slapd.conf
 %{_docdir}/ss5/examples/entries.ldif
 
 %{_mandir}/man1/ss5.1.gz
 %{_mandir}/man5/ss5.passwd.5.gz
-%{_mandir}/man5/ss5.peers.5.gz
 %{_mandir}/man5/ss5.conf.5.gz
 %{_mandir}/man5/ss5.pam.5.gz
+%{_mandir}/man5/ss5.ha.5.gz
 
 %defattr(755,root,root)
 %{_localstatedir}/log/ss5
@@ -70,8 +73,13 @@
 %config(noreplace) %{_sysconfdir}/opt/ss5/ss5.conf
 %config(noreplace) %{_sysconfdir}/opt/ss5/ss5.passwd
 %config(noreplace) %{_sysconfdir}/pam.d/ss5
+%doc ChangeLog
 
 %changelog
+* Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.6.4-1
+- fix license tag
+- update to 3.6.4
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.5.9-7
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Fri Sep  5 20:23:00 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  5 Sep 2008 20:23:00 +0000 (UTC)
Subject: rpms/stardict-dic-ru/devel stardict-dic-ru.spec,1.1,1.2
Message-ID: <20080905202300.3B62570121@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/stardict-dic-ru/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31139

Modified Files:
	stardict-dic-ru.spec 
Log Message:
fix license


Index: stardict-dic-ru.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-ru/devel/stardict-dic-ru.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stardict-dic-ru.spec	4 Jul 2007 05:27:47 -0000	1.1
+++ stardict-dic-ru.spec	5 Sep 2008 20:22:29 -0000	1.2
@@ -1,9 +1,10 @@
 Name: stardict-dic-ru
 Summary: Russian(ru) dictionaries for StarDict
 Version: 2.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/System
-License: GPL
+# Only license attribution is website.
+License: GPL+
 URL: http://stardict.sourceforge.net
 
 Source0: http://downloads.sourceforge.net/stardict/stardict-mueller7-2.4.2.tar.bz2
@@ -38,6 +39,9 @@
 %{_datadir}/stardict/dic/*
 
 %changelog
+* Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-4
+- fix license tag
+
 * Wed Jun 27 2007 Hu Zheng <zhu at redhat.com> - 2.4.2-3
 - Separate spec files for each language's dictionaries.
 



From jorton at fedoraproject.org  Fri Sep  5 20:23:25 2008
From: jorton at fedoraproject.org (Joe Orton)
Date: Fri,  5 Sep 2008 20:23:25 +0000 (UTC)
Subject: rpms/webalizer/devel .cvsignore, 1.5, 1.6 sources, 1.4,
	1.5 webalizer.spec, 1.34, 1.35
Message-ID: <20080905202325.E434270121@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/webalizer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31248

Modified Files:
	.cvsignore sources webalizer.spec 
Log Message:
* Fri Sep  5 2008 Joe Orton <jorton at redhat.com> 2.20_01-1
- update to 2.20_01



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/webalizer/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Jan 2007 11:22:23 -0000	1.5
+++ .cvsignore	5 Sep 2008 20:22:55 -0000	1.6
@@ -2,3 +2,4 @@
 clog
 *.src.rpm
 x86_64
+webalizer-2.20-01-src.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/webalizer/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2004 14:18:31 -0000	1.4
+++ sources	5 Sep 2008 20:22:55 -0000	1.5
@@ -1 +1 @@
-26d0a3c142423678daed2d6f579525d8  webalizer-2.01-10-src.tar.bz2
+9a5e39b4f0e229a279d58f93b2fac28b  webalizer-2.20-01-src.tgz


Index: webalizer.spec
===================================================================
RCS file: /cvs/extras/rpms/webalizer/devel/webalizer.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- webalizer.spec	14 Jul 2008 14:11:26 -0000	1.34
+++ webalizer.spec	5 Sep 2008 20:22:55 -0000	1.35
@@ -6,8 +6,8 @@
 Name: webalizer
 Summary: A flexible Web server log file analysis program
 Group: Applications/Internet
-Version: 2.01_10
-Release: 37
+Version: 2.20_01
+Release: 1
 URL: http://www.mrunix.net/webalizer/
 License: GPLv2+
 Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlevel}-src.tar.bz2
@@ -109,6 +109,9 @@
 %attr(-, webalizer, root) %{_localstatedir}/www/usage/*.png
 
 %changelog
+* Fri Sep  5 2008 Joe Orton <jorton at redhat.com> 2.20_01-1
+- update to 2.20_01
+
 * Mon Jul 14 2008 Joe Orton <jorton at redhat.com> 2.01_10-37
 - rebuild for new BDB
 



From caolanm at fedoraproject.org  Fri Sep  5 20:33:20 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  5 Sep 2008 20:33:20 +0000 (UTC)
Subject: rpms/liblayout/devel import.log, NONE,
	1.1 liblayout-0.2.9-depends.patch, NONE, 1.1 liblayout.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080905203320.92A9270121@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/liblayout/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1713/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log liblayout-0.2.9-depends.patch liblayout.spec 
Log Message:



--- NEW FILE import.log ---
liblayout-0_2_9-1_fc9:HEAD:liblayout-0.2.9-1.fc9.src.rpm:1220646853

liblayout-0.2.9-depends.patch:

--- NEW FILE liblayout-0.2.9-depends.patch ---
--- liblayout-0.2.9.orig/build.properties	2008-05-07 18:28:57.000000000 +0100
+++ liblayout-0.2.9/build.properties	2008-05-07 18:31:48.000000000 +0100
@@ -38,15 +38,15 @@
 #  Used libraries ...
 
 # JFree.org/JFreeReport libraries
-jcommon-jar-file=jcommon-1.0.10.jar
-flute-jar-file=flute-1.3-jfree-20061107.jar
-libloader-jar-file=libloader-0.3.6.jar
-librepository-jar-file=librepository-0.1.4.jar
-libxml-jar-file=libxml-0.9.9.jar
+jcommon-jar-file=jcommon.jar
+flute-jar-file=flute.jar
+libloader-jar-file=libloader.jar
+librepository-jar-file=librepository.jar
+libxml-jar-file=libxml.jar
 #
 # One of these is required.
 libfonts-core-jar-file=libfonts-core-0.3.3.jar
-libfonts-jar-file=libfonts-0.3.3.jar
+libfonts-jar-file=libfonts.jar
 
 
 # 3rd party libraries ..
@@ -60,7 +60,7 @@
 libfonts-itext-jar-file=libfonts-itext-0.3.3.jar
 
 # Needed for XML parser. Not needed it JDK 1.4 or newer is used.  
-jaxp-jar-file=gnujaxp.jar
+jaxp-jar-file=jaxp.jar
 
 ##############################################################
 #
@@ -68,4 +68,4 @@
 liblayout-bundle-file=${liblayout.name}-${liblayout.version}-bundle.jar
 liblayout-jar-file=${liblayout.name}-${liblayout.version}.jar
 liblayout-core-jar-file=${liblayout.name}-core-${liblayout.version}.jar
-module-output-pdf-jar-file=${liblayout.name}-module-output-pdf-${liblayout.version}.jar
\ No newline at end of file
+module-output-pdf-jar-file=${liblayout.name}-module-output-pdf-${liblayout.version}.jar


--- NEW FILE liblayout.spec ---
# Use rpmbuild --without gcj to disable native bits
%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name: liblayout
Version: 0.2.9
Release: 1%{?dist}
Summary: CSS based layouting framework
License: LGPLv2+
Group: System Environment/Libraries
Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.tar.gz
URL: http://reporting.pentaho.org/
BuildRequires: ant, java-devel, jpackage-utils, jcommon, flute, libloader
BuildRequires: librepository, pentaho-libxml, libfonts, sac
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: java, jpackage-utils, jcommon, flute, libloader >= 0.3.7
Requires: librepository >= 0.1.6, libfonts >= 0.3.4, sac, xml-commons-apis
Requires: pentaho-libxml
%if %{with_gcj}
BuildRequires: java-gcj-compat-devel >= 1.0.31
Requires(post): java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch: noarch
%endif
Patch1: liblayout-0.2.9-depends.patch

%description
LibLayout is a layouting framework. It is based on the Cascading StyleSheets
standard. The layouting expects to receive its content as a DOM structure
(although it does not rely on the W3C-DOM API).

%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils

%description javadoc
Javadoc for %{name}.

%prep
%setup -q
%patch1 -p1 -b .depends
find . -name "*.jar" -exec rm -f {} \;
build-jar-repository -s -p lib jcommon flute libloader librepository libxml libfonts sac jaxp

%build
ant compile javadoc
for file in README.txt licence-LGPL.txt ChangeLog.txt; do
    tr -d '\r' < $file > $file.new
    mv $file.new $file
done

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(0644,root,root,0755)
%doc licence-LGPL.txt README.txt ChangeLog.txt
%{_javadir}/*.jar
%if %{with_gcj}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}

%changelog
* Wed May 07 2008 Caolan McNamara <caolanm at redhat.com> 0.2.9-1
- initial fedora import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liblayout/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:53:55 -0000	1.1
+++ .cvsignore	5 Sep 2008 20:32:50 -0000	1.2
@@ -0,0 +1 @@
+liblayout-0.2.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liblayout/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:53:55 -0000	1.1
+++ sources	5 Sep 2008 20:32:50 -0000	1.2
@@ -0,0 +1 @@
+94e31e264321b74442d68cdc9f46bf19  liblayout-0.2.9.tar.gz



From till at fedoraproject.org  Fri Sep  5 20:34:38 2008
From: till at fedoraproject.org (Till Maas)
Date: Fri,  5 Sep 2008 20:34:38 +0000 (UTC)
Subject: rpms/pam_mount/F-9 .cvsignore, 1.12, 1.13 pam_mount.spec, 1.35,
	1.36 sources, 1.15,
	1.16 pam_mount-0.41-missing_initialization_or.patch, 1.1, NONE
Message-ID: <20080905203438.DD06A70121@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2137

Modified Files:
	.cvsignore pam_mount.spec sources 
Removed Files:
	pam_mount-0.41-missing_initialization_or.patch 
Log Message:
* Fri Sep 05 2008 Till Maas <opensource at till.name> - 0.47-1
- Update to new version that includes a security fix:
  https://sourceforge.net/project/shownotes.php?release_id=624240
- Add lzma BR and unpack source manually
- Update libHX requirements
- add new binary



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	24 Feb 2008 21:33:12 -0000	1.12
+++ .cvsignore	5 Sep 2008 20:34:08 -0000	1.13
@@ -1 +1 @@
-pam_mount-0.33.tar.bz2
+pam_mount-0.47.tar.lzma


Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/F-9/pam_mount.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- pam_mount.spec	23 Jun 2008 12:34:32 -0000	1.35
+++ pam_mount.spec	5 Sep 2008 20:34:08 -0000	1.36
@@ -1,24 +1,22 @@
 Name:           pam_mount
-Version:        0.41
-Release:        2%{?dist}
+Version:        0.47
+Release:        1%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
 Group:          System Environment/Base
 # The library and binary are LGPLv2+, the scripts are GPLv2+
 License:        LGPLv2+ and GPLv2+
 URL:            http://pam-mount.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.bz2
-# from Upstream:
-# http://dev.medozas.de/gitweb.cgi?p=pam_mount;a=blobdiff;f=src/rdconf1.c;h=593ae9dd68f159be374a43a8eda706f1f40897a2;hp=e743d48232695b6e1b4a7b9b4edb2793d1b87fab;hb=3760bbe48ae89398d5ee895034e9ee7cf3cd0d84;hpb=464d1c0a1b9e0f2f696ae423c91ddfaf9797bac6
-Patch0:         pam_mount-0.41-missing_initialization_or.patch
+Source0:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.lzma
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel, pam-devel, openssl-devel
 BuildRequires:  libxml2-devel
-BuildRequires:  libHX-devel >= 1.18
+BuildRequires:  libHX-devel >= 1.23
+BuildRequires:  lzma
 Requires:       pam, lsof
 Requires:       psmisc
-Requires:       libHX >= 1.18
+Requires:       libHX >= 1.23
 Requires(post):  perl(XML::Writer)
 
 
@@ -42,8 +40,8 @@
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .missing_initialization_or
+%setup -q -T -c
+lzma -c -d %SOURCE0 | tar -xvvf - -C ..
 
 
 %build
@@ -53,7 +51,6 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT V=verbose
 
@@ -87,13 +84,22 @@
 %{_bindir}/mount_ehd
 %{_bindir}/passwdehd
 %{_bindir}/pmt-fd0ssh
+%{_bindir}/pmt-ofl
 /sbin/mount.crypt
+/sbin/mount.encfs13
 /sbin/umount.crypt
 %{_mandir}/man?/*
 %{_localstatedir}/run/pam_mount
 
 
 %changelog
+* Fri Sep 05 2008 Till Maas <opensource at till.name> - 0.47-1
+- Update to new version that includes a security fix:
+  https://sourceforge.net/project/shownotes.php?release_id=624240
+- Add lzma BR and unpack source manually
+- Update libHX requirements
+- add new binary
+
 * Mon Jun 23 2008 Till Maas <opensource at till.name> - 0.41-2
 - Add patch to fix <or> handling in config file, reference:
   Red Hat Bugzilla #448485 comment 9


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	17 Jun 2008 09:48:29 -0000	1.15
+++ sources	5 Sep 2008 20:34:08 -0000	1.16
@@ -1 +1 @@
-0fd2ad3ea0ac111934816960134baf8b  pam_mount-0.41.tar.bz2
+5ef5d12af86a3fe61d1bb0d557f034ac  pam_mount-0.47.tar.lzma


--- pam_mount-0.41-missing_initialization_or.patch DELETED ---



From caolanm at fedoraproject.org  Fri Sep  5 20:38:13 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  5 Sep 2008 20:38:13 +0000 (UTC)
Subject: rpms/pentaho-reporting-flow-engine/devel import.log, NONE,
	1.1 pentaho-reporting-flow-engine-0.9.3-depends.patch, NONE,
	1.1 pentaho-reporting-flow-engine.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080905203813.B9C2770121@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/pentaho-reporting-flow-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3060/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pentaho-reporting-flow-engine-0.9.3-depends.patch 
	pentaho-reporting-flow-engine.spec 
Log Message:



--- NEW FILE import.log ---
pentaho-reporting-flow-engine-0_9_3-2_fc9:HEAD:pentaho-reporting-flow-engine-0.9.3-2.fc9.src.rpm:1220647135

pentaho-reporting-flow-engine-0.9.3-depends.patch:

--- NEW FILE pentaho-reporting-flow-engine-0.9.3-depends.patch ---
--- pentaho-reporting-flow-engine-0.9.3.orig/build.properties	2008-05-07 17:15:09.000000000 +0100
+++ pentaho-reporting-flow-engine-0.9.3/build.properties	2008-05-07 17:15:02.000000000 +0100
@@ -40,17 +40,17 @@
 #  Used libraries ...
 
 # Used by: core libraries
-jcommon-jar-file=jcommon-1.0.10.jar
-jcommon-serializer-jar-file=jcommon-serializer-0.1.0.jar
-libfonts-jar-file=libfonts-0.3.3.jar
-libfonts-core-jar-file=libfonts-0.3.3.jar
-libfonts-itext-jar-file=libfonts-0.3.3.jar
-liblayout-jar-file=liblayout-0.2.9.jar
-libloader-jar-file=libloader-0.3.6.jar
-libxml-jar-file=libxml-0.9.9.jar
-libformula-jar-file=libformula-0.1.14.jar
-librepository-jar-file=librepository-0.1.4.jar
-flute-jar-file=flute-1.3-jfree-20061107.jar
+jcommon-jar-file=jcommon.jar
+jcommon-serializer-jar-file=jcommon-serializer.jar
+libfonts-jar-file=libfonts.jar
+libfonts-core-jar-file=libfonts.jar
+libfonts-itext-jar-file=libfonts.jar
+liblayout-jar-file=liblayout.jar
+libloader-jar-file=libloader.jar
+libxml-jar-file=libxml.jar
+libformula-jar-file=libformula.jar
+librepository-jar-file=librepository.jar
+flute-jar-file=flute.jar
 
 #
 # Optional libraries
@@ -59,7 +59,7 @@
 oscache-jar-file=optional/oscache-2.3-compat.jar
 
 # Used by: module-parser
-jaxp-jar-file=gnujaxp.jar
+jaxp-jar-file=jaxp.jar
 sac-jar-file=sac.jar
 
 # Used by: output-pdf


--- NEW FILE pentaho-reporting-flow-engine.spec ---
# Use rpmbuild --without gcj to disable native bits
%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name: pentaho-reporting-flow-engine
Version: 0.9.3
Release: 2%{?dist}
Summary: Pentaho Flow Reporting Engine
License: LGPLv2+
Group: System Environment/Libraries
Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.tar.gz
URL: http://reporting.pentaho.org/
BuildRequires: ant, java-devel, jpackage-utils, jcommon, jcommon-serializer
BuildRequires: libloader, libfonts, pentaho-libxml, xml-commons-apis
BuildRequires: librepository, sac, flute, liblayout, libformula
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: java, jpackage-utils, jcommon, jcommon-serializer, libfonts >= 0.3.4
Requires: pentaho-libxml, libformula >= 0.1.18, librepository >= 0.1.6
Requires: sac, flute, liblayout >= 0.2.9
%if %{with_gcj}
BuildRequires: java-gcj-compat-devel >= 1.0.31
Requires(post): java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch: noarch
%endif
Patch1: pentaho-reporting-flow-engine-0.9.3-depends.patch

%description
Pentaho Reporting Flow Engine is a free Java report library, formerly
known as 'JFreeReport'

%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils

%description javadoc
Javadoc for %{name}.

%prep
%setup -q
%patch1 -p1 -b .depends
find . -name "*.jar" -exec rm -f {} \;
build-jar-repository -s -p lib jcommon jcommon-serializer libloader libfonts \
    libxml jaxp libformula librepository sac flute liblayout

%build
ant compile javadoc

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(0644,root,root,0755)
%doc licence-LGPL.txt README.txt ChangeLog.txt
%{_javadir}/*.jar
%if %{with_gcj}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}

%changelog
* Fri Sep 05 2008 Caolan McNamara <caolanm at redhat.com> 0.9.3-2
- wrong liblayout version required

* Wed May 07 2008 Caolan McNamara <caolanm at redhat.com> 0.9.3-1
- initial fedora import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pentaho-reporting-flow-engine/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:56:25 -0000	1.1
+++ .cvsignore	5 Sep 2008 20:37:43 -0000	1.2
@@ -0,0 +1 @@
+pentaho-reporting-flow-engine-0.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pentaho-reporting-flow-engine/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:56:25 -0000	1.1
+++ sources	5 Sep 2008 20:37:43 -0000	1.2
@@ -0,0 +1 @@
+247d05bdb543043a1c58ba7763c55bb5  pentaho-reporting-flow-engine-0.9.3.tar.gz



From till at fedoraproject.org  Fri Sep  5 20:46:43 2008
From: till at fedoraproject.org (Till Maas)
Date: Fri,  5 Sep 2008 20:46:43 +0000 (UTC)
Subject: rpms/pam_mount/F-8 .cvsignore, 1.10, 1.11 pam_mount.spec, 1.27,
	1.28 sources, 1.11, 1.12
Message-ID: <20080905204643.63BCF70121@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5281

Modified Files:
	.cvsignore pam_mount.spec sources 
Log Message:
* Fri Sep 05 2008 Till Maas <opensource at till.name> - 0.47-1
- Update to new version that includes a security fix:
  https://sourceforge.net/project/shownotes.php?release_id=624240
- Add lzma BR and unpack source manually
- Update libHX requirements
- add new binary



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/F-8/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Oct 2007 15:26:42 -0000	1.10
+++ .cvsignore	5 Sep 2008 20:46:12 -0000	1.11
@@ -1 +1 @@
-pam_mount-0.29.tar.bz2
+pam_mount-0.47.tar.lzma


Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/F-8/pam_mount.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- pam_mount.spec	10 Oct 2007 15:35:59 -0000	1.27
+++ pam_mount.spec	5 Sep 2008 20:46:13 -0000	1.28
@@ -1,5 +1,5 @@
 Name:           pam_mount
-Version:        0.29
+Version:        0.47
 Release:        1%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
@@ -7,88 +7,75 @@
 # The library and binary are LGPLv2+, the scripts are GPLv2+
 License:        LGPLv2+ and GPLv2+
 URL:            http://pam-mount.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.bz2
-
-
+Source0:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.lzma
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel, pam-devel, openssl-devel
 BuildRequires:  libxml2-devel
-BuildRequires:  libHX-devel
+BuildRequires:  libHX-devel >= 1.23
+BuildRequires:  lzma
 Requires:       pam, lsof
 Requires:       psmisc
-Requires(pre):  perl(XML::Writer)
+Requires:       libHX >= 1.23
+Requires(post):  perl(XML::Writer)
 
 
 %description
-This module is aimed at environments with SMB (Samba or Windows NT) 
-or NCP (Netware or Mars-NWE) servers that Unix users wish to access 
-transparently. It facilitates access to private volumes of these types 
-well. The module also supports mounting home directories using 
-loopback encrypted filesystems. The module was originally written for 
-use on the GNU/Linux operating system but has since been modified to 
-work on several flavors of BSD.
-
- o Every user can access his own volumes
-
- o The user needs to type the password just once (at login)
-
- o The mounting process is transparent to the users
-
- o There is no need to keep the login passwords in any additional file
-
- o The volumes are unmounted upon logout, so it saves system resources, 
- avoiding the need of listing every every possibly useful remote 
- volume in /etc/fstab or in an automount/supermount config file. This 
- is also necessary for securing encrypted filesystems.
-
-Pam_mount "understands" SMB, NCP, and any type of filesystem that can 
-be mounted using the standard mount command. If someone has a 
-particular need for a different filesystem, feel free to ask me to 
-include it and send me patches.
-
-If you intend to use pam_mount to protect volumes on your computer 
-using an encrypted filesystem system, please know that there are many 
-other issues you need to consider in order to protect your data. 
-For example, you probably want to disable or encrypt your swap 
-partition (the cryptoswap can help you do this). Don't assume a 
-system is secure without carefully considering potential threats.
+This module is aimed at environments with central file servers that a
+user wishes to mount on login and unmount on logout, such as
+(semi-)diskless stations where many users can logon.
+
+The module also supports mounting local filesystems of any kind the
+normal mount utility supports, with extra code to make sure certain
+volumes are set up properly because often they need more than just a
+mount call, such as encrypted volumes. This includes SMB/CIFS, NCP,
+davfs2, FUSE, losetup crypto, dm-crypt/cryptsetup and truecrypt.
+
+If you intend to use pam_mount to protect volumes on your computer
+using an encrypted filesystem system, please know that there are many
+other issues you need to consider in order to protect your data.  For
+example, you probably want to disable or encrypt your swap partition.
+Don't assume a system is secure without carefully considering
+potential threats.
+
 
 %prep
-%setup -q
+%setup -q -T -c
+lzma -c -d %SOURCE0 | tar -xvvf - -C ..
 
 
 %build
-%configure --with-slibdir=/%{_lib} --with-selinux
-make %{?_smp_mflags}
+%configure --with-slibdir=/%{_lib}
+make %{?_smp_mflags} V=verbose
 
 
 %install
-rm -rf %{buildroot}
-mkdir %{buildroot}
-make install DESTDIR=%{buildroot}
-
-install -p scripts/convert_pam_mount_conf.pl %{buildroot}/%{_bindir}
-rm -f %{buildroot}/%{_lib}/security/*.{a,la}
+rm -rf $RPM_BUILD_ROOT
+
+make install DESTDIR=$RPM_BUILD_ROOT V=verbose
+
+install -p scripts/convert_pam_mount_conf.pl $RPM_BUILD_ROOT/%{_bindir}
+rm -f $RPM_BUILD_ROOT/%{_lib}/security/*.{a,la}
 
 
-%pre
-if [ -e %{_sysconfdir}/security/pam_mount.conf \
-     -a ! -e %{_sysconfdir}/security/pam_mount.conf.xml ]; then
-        convert_pam_mount_conf.pl <%{_sysconfdir}/security/pam_mount.conf \
-                     >%{_sysconfdir}/security/pam_mount.conf.xml;
-fi
+%post
+if [ -e %{_sysconfdir}/security/pam_mount.conf ]; then
+    convert_pam_mount_conf.pl <%{_sysconfdir}/security/pam_mount.conf \
+                              >%{_sysconfdir}/security/pam_mount.conf.xml;
+fi;
 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %defattr(-,root,root,-)
 %doc doc/bugs.txt doc/changelog.txt doc/faq.txt doc/options.txt doc/pam_mount.txt doc/todo.txt
+%doc config/pam_mount.conf.xml
 %doc LICENSE.GPL2 LICENSE.GPL3
 %doc LICENSE.LGPL2 LICENSE.LGPL3
+%config(noreplace) %{_sysconfdir}/security/pam_mount.conf.xml
 /%{_lib}/security/pam_mount.so
 %{_sbindir}/pmvarrun
 %{_bindir}/autoehd
@@ -96,15 +83,58 @@
 %{_bindir}/mkehd
 %{_bindir}/mount_ehd
 %{_bindir}/passwdehd
+%{_bindir}/pmt-fd0ssh
+%{_bindir}/pmt-ofl
 /sbin/mount.crypt
+/sbin/mount.encfs13
 /sbin/umount.crypt
 %{_mandir}/man?/*
-%config(noreplace) %{_sysconfdir}/security/pam_mount.conf.xml
-%policy %{_sysconfdir}/selinux/strict/src/policy/macros/pam_mount_macros.te
-%policy %{_sysconfdir}/selinux/strict/src/policy/file_contexts/misc/pam_mount.fc
+%{_localstatedir}/run/pam_mount
 
 
 %changelog
+* Fri Sep 05 2008 Till Maas <opensource at till.name> - 0.47-1
+- Update to new version that includes a security fix:
+  https://sourceforge.net/project/shownotes.php?release_id=624240
+- Add lzma BR and unpack source manually
+- Update libHX requirements
+- add new binary
+
+* Mon Jun 23 2008 Till Maas <opensource at till.name> - 0.41-2
+- Add patch to fix <or> handling in config file, reference:
+  Red Hat Bugzilla #448485 comment 9
+  http://sourceforge.net/tracker/index.php?func=detail&aid=1974442&group_id=41452&atid=430593
+  comment from 2008-06-19 10:29
+
+* Tue Jun 17 2008 Till Maas <opensource till name> - 0.41-1
+- Update to new version
+
+* Wed Jun 11 2008 Till Maas <opensource till name> - 0.40-1
+- Update to new version
+- set make variable V for full compiler commandline
+
+* Mon May 05 2008 Till Maas <opensource till name> - 0.35-1
+- Update to new version
+- Use $RPM_BUILD_ROOT instead of %%{buildroot}
+- Update description
+- create and own %%{_localstatedir}/run/pam_mount
+
+* Sun Feb 24 2008 Till Maas <opensource till name> - 0.33-1
+- update to new version
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.32-3
+- Autorebuild for GCC 4.3
+
+* Mon Jan 07 2008 Till Maas <opensource till name> - 0.32-2
+- fix config conversion scriptlet
+
+* Mon Jan 07 2008 Till Maas <opensource till name> - 0.32-1
+- update to new version
+- add default/example config to %%doc
+
+* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 0.29-2
+ - Rebuild for deps
+
 * Wed Oct 10 2007 Till Maas <opensource till name> - 0.29-1
 - bump to new version
 - remove uneeded patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/F-8/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	10 Oct 2007 15:26:42 -0000	1.11
+++ sources	5 Sep 2008 20:46:13 -0000	1.12
@@ -1 +1 @@
-70be864effaeec1b57b491e91ddb57b0  pam_mount-0.29.tar.bz2
+5ef5d12af86a3fe61d1bb0d557f034ac  pam_mount-0.47.tar.lzma



From spot at fedoraproject.org  Fri Sep  5 21:03:28 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  5 Sep 2008 21:03:28 +0000 (UTC)
Subject: rpms/stardict-dic-en/devel stardict-dic-en.spec,1.2,1.3
Message-ID: <20080905210328.0663B70121@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/stardict-dic-en/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8011

Modified Files:
	stardict-dic-en.spec 
Log Message:
fix license tag


Index: stardict-dic-en.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-en/devel/stardict-dic-en.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stardict-dic-en.spec	5 Sep 2008 19:21:58 -0000	1.2
+++ stardict-dic-en.spec	5 Sep 2008 21:02:57 -0000	1.3
@@ -1,10 +1,13 @@
 Name: stardict-dic-en
 Summary: English(en) dictionaries for StarDict
 Version: 2.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Applications/System
-# Only attribution is on download page, no version given.
-License: GPL+
+License: MIT
+# The WordNet dictionary lives here:
+# http://wordnet.princeton.edu
+# Here is the license of that dictionary (MIT)
+# http://wordnet.princeton.edu/license
 URL: http://stardict.sourceforge.net
 
 Source0: http://downloads.sourceforge.net/stardict/stardict-dictd_www.dict.org_wn-2.4.2.tar.bz2
@@ -39,6 +42,9 @@
 %{_datadir}/stardict/dic/*
 
 %changelog
+* Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-5
+- use correct license tag
+
 * Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-4
 - fix license tag
 



From pkgdb at fedoraproject.org  Fri Sep  5 21:05:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 21:05:16 +0000
Subject: [pkgdb] alt-ergo was added for amdunn
Message-ID: <20080905210517.1E46720876D@bastion.fedora.phx.redhat.com>

kevin has added Package alt-ergo with summary Alt-Ergo automatic theorem prover
kevin has approved Package alt-ergo
kevin has added a Fedora devel branch for alt-ergo with an owner of amdunn
kevin has approved alt-ergo in Fedora devel
kevin has approved Package alt-ergo
kevin has set commit to Approved for packager on alt-ergo (Fedora devel)
kevin has set build to Approved for packager on alt-ergo (Fedora devel)
kevin has set checkout to Approved for packager on alt-ergo (Fedora devel)
kevin has set commit to Approved for uberpackager on alt-ergo (Fedora devel)
kevin has set build to Approved for uberpackager on alt-ergo (Fedora devel)
kevin has set checkout to Approved for uberpackager on alt-ergo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alt-ergo



From pkgdb at fedoraproject.org  Fri Sep  5 21:05:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 21:05:19 +0000
Subject: [pkgdb] alt-ergo (Fedora, 8) updated by kevin
Message-ID: <20080905210520.0725A208771@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for alt-ergo
kevin has set commit to Approved for uberpackager on alt-ergo (Fedora 8)
kevin has set build to Approved for uberpackager on alt-ergo (Fedora 8)
kevin has set checkout to Approved for uberpackager on alt-ergo (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alt-ergo



From pkgdb at fedoraproject.org  Fri Sep  5 21:05:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 21:05:19 +0000
Subject: [pkgdb] alt-ergo (Fedora, 9) updated by kevin
Message-ID: <20080905210520.27750208D1E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for alt-ergo
kevin has set commit to Approved for uberpackager on alt-ergo (Fedora 9)
kevin has set build to Approved for uberpackager on alt-ergo (Fedora 9)
kevin has set checkout to Approved for uberpackager on alt-ergo (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alt-ergo



From kevin at fedoraproject.org  Fri Sep  5 21:05:33 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 21:05:33 +0000 (UTC)
Subject: rpms/alt-ergo - New directory
Message-ID: <20080905210533.2794970121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alt-ergo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBY8582/rpms/alt-ergo

Log Message:
Directory /cvs/extras/rpms/alt-ergo added to the repository




From kevin at fedoraproject.org  Fri Sep  5 21:05:33 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 21:05:33 +0000 (UTC)
Subject: rpms/alt-ergo/devel - New directory
Message-ID: <20080905210533.6DFEE70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alt-ergo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBY8582/rpms/alt-ergo/devel

Log Message:
Directory /cvs/extras/rpms/alt-ergo/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  5 21:05:34 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 21:05:34 +0000 (UTC)
Subject: rpms/alt-ergo Makefile,NONE,1.1
Message-ID: <20080905210534.5EE7A70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alt-ergo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBY8582/rpms/alt-ergo

Added Files:
	Makefile 
Log Message:
Setup of module alt-ergo


--- NEW FILE Makefile ---
# Top level Makefile for module alt-ergo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  5 21:05:34 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 21:05:34 +0000 (UTC)
Subject: rpms/alt-ergo/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080905210534.A126770121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alt-ergo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBY8582/rpms/alt-ergo/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module alt-ergo


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: alt-ergo
# $Id: Makefile,v 1.1 2008/09/05 21:05:34 kevin Exp $
NAME := alt-ergo
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  5 21:06:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 21:06:40 +0000
Subject: [pkgdb] rubygem-cobbler was added for mcpierce
Message-ID: <20080905210640.EF76F20876C@bastion.fedora.phx.redhat.com>

kevin has added Package rubygem-cobbler with summary Provides Ruby bindings to interact with a Cobbler server
kevin has approved Package rubygem-cobbler
kevin has added a Fedora devel branch for rubygem-cobbler with an owner of mcpierce
kevin has approved rubygem-cobbler in Fedora devel
kevin has approved Package rubygem-cobbler
kevin has set commit to Approved for packager on rubygem-cobbler (Fedora devel)
kevin has set build to Approved for packager on rubygem-cobbler (Fedora devel)
kevin has set checkout to Approved for packager on rubygem-cobbler (Fedora devel)
kevin has set commit to Approved for uberpackager on rubygem-cobbler (Fedora devel)
kevin has set build to Approved for uberpackager on rubygem-cobbler (Fedora devel)
kevin has set checkout to Approved for uberpackager on rubygem-cobbler (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From kevin at fedoraproject.org  Fri Sep  5 21:06:56 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 21:06:56 +0000 (UTC)
Subject: rpms/rubygem-cobbler - New directory
Message-ID: <20080905210656.25A6470121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rubygem-cobbler
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgc9138/rpms/rubygem-cobbler

Log Message:
Directory /cvs/extras/rpms/rubygem-cobbler added to the repository




From kevin at fedoraproject.org  Fri Sep  5 21:06:56 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 21:06:56 +0000 (UTC)
Subject: rpms/rubygem-cobbler/devel - New directory
Message-ID: <20080905210656.6252B70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rubygem-cobbler/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgc9138/rpms/rubygem-cobbler/devel

Log Message:
Directory /cvs/extras/rpms/rubygem-cobbler/devel added to the repository




From kevin at fedoraproject.org  Fri Sep  5 21:06:57 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 21:06:57 +0000 (UTC)
Subject: rpms/rubygem-cobbler Makefile,NONE,1.1
Message-ID: <20080905210657.5EBDB70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rubygem-cobbler
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgc9138/rpms/rubygem-cobbler

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-cobbler


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-cobbler
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep  5 21:06:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 05 Sep 2008 21:06:44 +0000
Subject: [pkgdb] rubygem-cobbler (Fedora, 9) updated by kevin
Message-ID: <20080905210644.7FB7F2082B8@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for rubygem-cobbler
kevin has set commit to Approved for uberpackager on rubygem-cobbler (Fedora 9)
kevin has set build to Approved for uberpackager on rubygem-cobbler (Fedora 9)
kevin has set checkout to Approved for uberpackager on rubygem-cobbler (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From kevin at fedoraproject.org  Fri Sep  5 21:06:57 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  5 Sep 2008 21:06:57 +0000 (UTC)
Subject: rpms/rubygem-cobbler/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080905210657.9AF5C70121@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rubygem-cobbler/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgc9138/rpms/rubygem-cobbler/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-cobbler


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-cobbler
# $Id: Makefile,v 1.1 2008/09/05 21:06:57 kevin Exp $
NAME := rubygem-cobbler
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From ertzing at fedoraproject.org  Fri Sep  5 21:15:52 2008
From: ertzing at fedoraproject.org (Ralf Ertzinger)
Date: Fri,  5 Sep 2008 21:15:52 +0000 (UTC)
Subject: rpms/libfwbuilder/devel .cvsignore, 1.13, 1.14 libfwbuilder.spec,
	1.26, 1.27 sources, 1.13, 1.14
Message-ID: <20080905211552.495EF70121@cvs1.fedora.phx.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/libfwbuilder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11528

Modified Files:
	.cvsignore libfwbuilder.spec sources 
Log Message:
* Fri Sep 05 2008 Ralf Ertzinger <ralf at skytale.net> 3.0.0-1
- Update to 3.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	3 Jan 2008 14:53:29 -0000	1.13
+++ .cvsignore	5 Sep 2008 21:15:20 -0000	1.14
@@ -1 +1 @@
-libfwbuilder-2.1.16.tar.gz
+libfwbuilder-3.0.0.tar.gz


Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libfwbuilder.spec	5 Apr 2008 15:19:22 -0000	1.26
+++ libfwbuilder.spec	5 Sep 2008 21:15:21 -0000	1.27
@@ -1,7 +1,7 @@
 Name:           libfwbuilder
 Summary:        Firewall Builder API
-Version:        2.1.16
-Release:        3%{?dist}
+Version:        3.0.0
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://www.fwbuilder.org/
@@ -10,11 +10,9 @@
 
 Patch0:         libfwbuilder-2.1.14-gcc43.patch
 
-BuildRequires:  qt3-devel
+BuildRequires:  qt4-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  gawk
-#BuildRequires:  openssl-devel
-#BuildRequires:  net-snmp-devel
 
 %description
 Firewall Builder API library and compiler framework
@@ -41,22 +39,18 @@
 
 %files  devel
 %defattr(-, root, root)
-%{_bindir}/libfwbuilder-config-2.1
-%dir %{_includedir}/fwb-2.1/
-%{_includedir}/fwb-2.1/fwbuilder
-%{_includedir}/fwb-2.1/fwcompiler
+%{_bindir}/libfwbuilder-config-3
+%{_includedir}/fwb-3
 
 
 %prep
 %setup -q
 
 # Fix regressions due to stricter GCC 4.3 checking
-%patch0 -p1 -b .gcc43
+# %patch0 -p1 -b .gcc43
 
 
 %build
-[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-
 %configure \
     --enable-auto-docdir \
     --with-templatedir=%{_datadir}/libfwbuilder \
@@ -67,9 +61,8 @@
 
 
 %install
-[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 rm -rf $RPM_BUILD_ROOT
-make DDIR=$RPM_BUILD_ROOT install
+make install INSTALL_ROOT=$RPM_BUILD_ROOT
 # prevent including twice the doc
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
 
@@ -84,6 +77,9 @@
 
 
 %changelog
+* Fri Sep 05 2008 Ralf Ertzinger <ralf at skytale.net> 3.0.0-1
+- Update to 3.0.0
+
 * Sat Apr 05 2008 Ralf Ertzinger <ralf at skytale.net> 2.1.16-3
 - Change BuildRequires to qt3-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	3 Jan 2008 14:53:29 -0000	1.13
+++ sources	5 Sep 2008 21:15:21 -0000	1.14
@@ -1 +1 @@
-d00ff0e61e2012478f58475d27d001a9  libfwbuilder-2.1.16.tar.gz
+993aa8d0838bf7f915ad3dbfcc03d161  libfwbuilder-3.0.0.tar.gz



From spot at fedoraproject.org  Fri Sep  5 21:20:39 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  5 Sep 2008 21:20:39 +0000 (UTC)
Subject: rpms/stardict-dic-ru/devel License-Mueller7.txt, NONE,
	1.1 stardict-dic-ru.spec, 1.2, 1.3
Message-ID: <20080905212039.6CFB270121@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/stardict-dic-ru/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12707

Modified Files:
	stardict-dic-ru.spec 
Added Files:
	License-Mueller7.txt 
Log Message:
fix license tag


--- NEW FILE License-Mueller7.txt ---

  Description of Mueller Dictionary (7 Edition) distributed under GNU GPL.
                                      
   Copyright agreement is provided in first line of the dictionary file:
   
     (C) V.K.Mueller English-Russian Dictionary, 7 Edition;
   
     "State Publishing House of Foreign and National Dictionaries" Moscow
   1961;
   
     Free Electronic Version by S.Starostin 1996
   starling.rinet.ru/download/dict.exe;
   
     Electronic Version by E.S.Cymbalyuk 1999 under GNU GPL, ver. 1.2,
   see latest version on www.chat.ru/~mueller_dic or
   www.geocities.com/mueller_dic
   
   You may download original DOS-version of the Mueller dictionary (7
   Edition) for DOS from www-page of Sergei Starostin. According to the
   extracurial compromise between company "ABBYY" and publishing house
   "Russky Yazyk", publishing house "Russky Yazyk" has copyrights on
   editions of Mueller dictionary published after 1961 only. Thus the
   content of Mueller dictionary published before 1961 is in public
   domain. S.Starostin, as the author of the first electronic version of
   Mueller dictionary, kindly allowed me to use his code one for any
   purpose.
   
     You can use my electronic version of Mueller dictionary under GNU
   GPL.
   
   The Russian Scientific-Technical Center "Informregistr" has registered
   the Electronic Version of Mueller Dictionary (7 Edition) on February
   29, 2000. The number of State registration is 0320000030.
   
   Short description of dictionary format is provided in the second line
   of the dictionary file:
   
     Dictionary Format: A dictionary article concerning a dictionary word
   is implemented as a single line.
   
     Two blank symbols separate an English word from its translation.
   
     Russian characters are encoded according to koi8-r coding table.
   
     A stress in a Russian word is coded by a capital letter.
   
     Transcription in IPA is shown in square brackets.
   
     Different meanings of the same word are indexed by Latin or Arabic
   numerals preceded by symbol "_", for example, _I-_VII, 1.-6., 1>-34>,
   A>-I>.
   
     A functional label is preceded by the symbol "_" and terminated by
   the symbol "." or ":".
   
   This dictionary is arranged as a single, plain-text file. After
   multiple requests, I have inserted a delimiter in word article --
   tandem of two blank symbols. This delimiter subdivides a word article
   into two parts where the first part is the word itself, and the other
   is the translation of the word. Besides, I employ the auxiliary symbol
   "_" because it was not used in the original text of the dictionary and
   it plays no specific role in Unix regular expressions.
   
   There are some comment about functional labels. A English label word
   tags the translated word as grammar "part of speech", a Russian one
   --- as used in the different sphere of knowledge. All label words are
   ended with point or colon. List of label words and abbreviations are
   added to the dictionary file beginning after second line. Latin
   numerals signifying different meanings of the translated word are
   began from symbol "_" also. Word article may be subdivided on the
   sense section with "number+point" or/and "Russian letter+>" (I change
   ")" on ">" for more accurate work of formating).
   
   In the primary S.Starostin's version of dictionary, accents in Russian
   words are encoded by special way. In my version all stressed letters
   in Russian words are turned on capital letters. There is version of my
   dictionary without accents in Russian words also.
   
   Transcription is rounded by square brackets. Transcription symbols
   correspond to the IPA (International Phonetic Alphabet) standard.
   Basic English phonetic symbols are:
   "a" from "man" --- Q, 81
   "w" --- W
   "a" from "past" --- A, 65
   ":" from a: in "past" --- 249, 0xF9
   "e" from "her" --- 171, 0xAB
   "e" first from diphthong in "care" --- E, 69
   "o" from "wash" --- 141, 0x8D
   "a" from "son" --- 195, 0xC3
   "i" short "i", from "ink" --- I
   "i" long "i", from "machine" --- i
   "'" stress by the voice --- 200, 0xC8
   "," fall of the voice --- 199, 0xC7
   "k" --- H
   "z" --- Z, 90
   "ng" --- N, 78
   "sh" --- S, 83
   "th" with voice --- D, 68
   "th" without voice --- T, 84
   The majority of small English letters don't change place in coding
   table. The main trouble of IPA coding table is impossible to make
   common font for Russian and English and phonetic symbols (may be
   UNICODE only). In other hand, unfortunately, IPA has some other
   symbols on place "-", "(", ")" and it's necessary to exclude ones from
   transcription (although, they are used in mix with transcription
   symbols in the ordinary paper dictionaries).
   
   You may download the dictionary (version 1.2) altogether with hash
   file: in tar.bzip2 file, and tar-bzip2ed file with accent in Russian
   words. The size of each packet is 1.9 MB.
   
   recode_dic.c.gz --- C program for recoding dictionary between various
   russian coding tables. Transcription in square brackets keeps
   changeless.
   
   Please, send notes and suggestions to Eugene Cymbalyuk by e-mail:
   mueller_dic at koi.chat.ru.


Index: stardict-dic-ru.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-ru/devel/stardict-dic-ru.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stardict-dic-ru.spec	5 Sep 2008 20:22:29 -0000	1.2
+++ stardict-dic-ru.spec	5 Sep 2008 21:20:09 -0000	1.3
@@ -1,13 +1,15 @@
 Name: stardict-dic-ru
 Summary: Russian(ru) dictionaries for StarDict
 Version: 2.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Applications/System
-# Only license attribution is website.
+# Derived from:
+# http://www.geocities.com/mueller_dic/
 License: GPL+
 URL: http://stardict.sourceforge.net
 
 Source0: http://downloads.sourceforge.net/stardict/stardict-mueller7-2.4.2.tar.bz2
+Source1: License-Mueller7.txt
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
@@ -23,6 +25,7 @@
 %prep
 %setup -c -T -n %{name}-%{version}
 %setup -q -n %{name}-%{version} -D -T -a 0
+cp %{SOURCE1} .
 
 %build
 
@@ -36,9 +39,13 @@
 
 %files
 %defattr(-,root,root,-)
+%doc License-Mueller7.txt
 %{_datadir}/stardict/dic/*
 
 %changelog
+* Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-5
+- Really fix license tag, include documentation
+
 * Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-4
 - fix license tag
 



From mstone at fedoraproject.org  Fri Sep  5 21:27:12 2008
From: mstone at fedoraproject.org (Michael Stone)
Date: Fri,  5 Sep 2008 21:27:12 +0000 (UTC)
Subject: rpms/rainbow/F-9 .cvsignore, 1.9, 1.10 rainbow.spec, 1.9,
	1.10 sources, 1.9, 1.10
Message-ID: <20080905212712.6EDDB70121@cvs1.fedora.phx.redhat.com>

Author: mstone

Update of /cvs/pkgs/rpms/rainbow/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14006

Modified Files:
	.cvsignore rainbow.spec sources 
Log Message:
- Michael Stone (1):
    Move the permissions.info file into the activity directory.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	2 Sep 2008 22:05:20 -0000	1.9
+++ .cvsignore	5 Sep 2008 21:26:41 -0000	1.10
@@ -1 +1 @@
-rainbow-0.7.20.tar.bz2
+rainbow-0.7.21.tar.bz2


Index: rainbow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/F-9/rainbow.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rainbow.spec	2 Sep 2008 22:05:20 -0000	1.9
+++ rainbow.spec	5 Sep 2008 21:26:42 -0000	1.10
@@ -3,7 +3,7 @@
 %{!?python_version: %define python_version %(%{__python} -c "import sys; print sys.version[0:3]")}
 
 Name:           rainbow
-Version:        0.7.20
+Version:        0.7.21
 Release:        1%{?dist}
 Summary:        The OLPC security service
 
@@ -81,6 +81,10 @@
 %{python_sitelib}/%{name}-%{version}-py%{python_version}.egg-info/*
 
 %changelog
+* Fri Sep 05 2008 Michael Stone <michael at laptop.org> - 0.7.21-1.olpc3
+- Michael Stone (1):
+    Move the permissions.info file into the activity directory.
+
 * Tue Sep 02 2008 Michael Stone <michael at laptop.org> - 0.7.20-1.olpc3
 - Michael Stone (6):
     dlo#7921: Read ~/.i18n and set $LANG before importing gtk.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	2 Sep 2008 22:05:20 -0000	1.9
+++ sources	5 Sep 2008 21:26:42 -0000	1.10
@@ -1 +1 @@
-8a4306c406045f89640c248191b9af06  rainbow-0.7.20.tar.bz2
+139df3c1f397ed9ac735af9695863956  rainbow-0.7.21.tar.bz2



From slankes at fedoraproject.org  Fri Sep  5 21:42:32 2008
From: slankes at fedoraproject.org (Sven Lankes)
Date: Fri,  5 Sep 2008 21:42:32 +0000 (UTC)
Subject: rpms/svnmailer/devel svnmailer.spec,1.5,1.6
Message-ID: <20080905214232.2F47170121@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/svnmailer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16343

Modified Files:
	svnmailer.spec 
Log Message:
* Sat Sep 5 2008 Sven Lankes <sven at lank.es> 1.0.8-6
- Fix license tag
- Correct patch invocation



Index: svnmailer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/svnmailer/devel/svnmailer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- svnmailer.spec	8 Apr 2008 10:54:22 -0000	1.5
+++ svnmailer.spec	5 Sep 2008 21:42:01 -0000	1.6
@@ -2,11 +2,11 @@
 
 Name:           svnmailer
 Version:        1.0.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Tool to post subversion repository commit information
 
 Group:          Development/Tools
-License:        Apache Software License
+License:        ASL 2.0
 URL:            http://opensource.perlig.de/svnmailer/
 Source0:        http://storage.perlig.de/svnmailer/svnmailer-%{version}.tar.bz2
 Patch0:		svnmailer-multipart.patch
@@ -30,7 +30,7 @@
 
 %prep
 %setup -q
-%patch -b .multi
+%patch0 -b .multi
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -64,6 +64,10 @@
 %doc docs/*
 
 %changelog
+* Sat Sep 5 2008 Sven Lankes <sven at lank.es> 1.0.8-6
+- Fix license tag
+- Correct patch invocation
+
 * Tue Apr 8 2008 Michael Fleming <mfleming+rpm at enlartenment.com> 1.0.8-5
 - Update Requires (remove obsolete abi() generation)
 - Add patch to fix crash when sending multipart messages (bz# 438112)



From cwickert at fedoraproject.org  Fri Sep  5 21:42:45 2008
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  5 Sep 2008 21:42:45 +0000 (UTC)
Subject: rpms/xfce4-battery-plugin/devel xfce4-battery-plugin.spec, 1.15,
	1.16 xfce4-battery-plugin-0.5.0-acpi.patch, 1.1,
	NONE xfce4-battery-plugin-0.5.0-lower-acpi-polling.patch, 1.1,
	NONE xfce4-battery-plugin-0.5.0-use-sysfs.patch, 1.1, NONE
Message-ID: <20080905214245.226A370121@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-battery-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16517

Modified Files:
	xfce4-battery-plugin.spec 
Removed Files:
	xfce4-battery-plugin-0.5.0-acpi.patch 
	xfce4-battery-plugin-0.5.0-lower-acpi-polling.patch 
	xfce4-battery-plugin-0.5.0-use-sysfs.patch 
Log Message:
* Sat Apr 05 2008 Christoph Wickert <fedora christoph-wickert de> - 0.5.0-4
- Fix for kernel 2.6.24  (bugzilla.xfce.org #3938)
- Lower acpi polling. (bugzilla.xfce.org #2948)
- Rebuild with gcc 4.3.0



Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-battery-plugin/devel/xfce4-battery-plugin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xfce4-battery-plugin.spec	5 Apr 2008 15:41:02 -0000	1.15
+++ xfce4-battery-plugin.spec	5 Sep 2008 21:42:14 -0000	1.16
@@ -1,16 +1,13 @@
 Name:		xfce4-battery-plugin
-Version:	0.5.0
-Release:	4%{?dist}
+Version:	0.5.1
+Release:	1%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-0.5.0-acpi.patch
-Patch1:		%{name}-0.5.0-fix-ftbfs-2.6.24.patch
-Patch2:		%{name}-0.5.0-lower-acpi-polling.patch
-#Patch3:		%{name}-0.5.0-use-sysfs.patch
+Patch0:		%{name}-0.5.0-fix-ftbfs-2.6.24.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel
@@ -22,10 +19,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .acpi
-%patch1 -p1 -b .2.6.24
-%patch2 -p0 -b .lower-acpi-polling
-#%patch3 -p0 -b .use-sysfs
+%patch0 -p1 -b .2.6.24
 
 %build
 %configure --disable-static
@@ -56,6 +50,11 @@
 %{_datadir}/icons/hicolor/scalable/devices/battery.svg
 
 %changelog
+* Fri Sep 05 2008 Christoph Wickert <fedora christoph-wickert de> - 0.5.1-1
+- Update to 0.5.1
+- Remove acpi.patch (included upstream)
+- Remove lower-acpi-polling.patch (upstream use different values)
+
 * Sat Apr 05 2008 Christoph Wickert <fedora christoph-wickert de> - 0.5.0-4
 - Fix for kernel 2.6.24  (bugzilla.xfce.org #3938)
 - Lower acpi polling. (bugzilla.xfce.org #2948)


--- xfce4-battery-plugin-0.5.0-acpi.patch DELETED ---


--- xfce4-battery-plugin-0.5.0-lower-acpi-polling.patch DELETED ---


--- xfce4-battery-plugin-0.5.0-use-sysfs.patch DELETED ---



From spot at fedoraproject.org  Fri Sep  5 21:55:26 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  5 Sep 2008 21:55:26 +0000 (UTC)
Subject: rpms/stardict-dic-zh_CN/devel stardict-dic-zh_CN.spec,1.1,1.2
Message-ID: <20080905215526.9322A70121@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/stardict-dic-zh_CN/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18654

Modified Files:
	stardict-dic-zh_CN.spec 
Log Message:
fix license tag, remove files for which we have no permission


Index: stardict-dic-zh_CN.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-zh_CN/devel/stardict-dic-zh_CN.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stardict-dic-zh_CN.spec	4 Jul 2007 08:49:49 -0000	1.1
+++ stardict-dic-zh_CN.spec	5 Sep 2008 21:54:56 -0000	1.2
@@ -1,17 +1,28 @@
 Name: stardict-dic-zh_CN
 Summary: Simplified Chinese(zh_CN) dictionaries for StarDict
 Version: 2.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/System
-License: GPL
+License: GPL+
 URL: http://stardict.sourceforge.net
 
-Source0: http://downloads.sourceforge.net/stardict/stardict-cdict-gb-2.4.2.tar.bz2
-Source1: http://downloads.sourceforge.net/stardict/stardict-cedict-gb-2.4.2.tar.bz2
-Source2: http://downloads.sourceforge.net/stardict/stardict-langdao-ce-gb-2.4.2.tar.bz2
-Source3: http://downloads.sourceforge.net/stardict/stardict-langdao-ec-gb-2.4.2.tar.bz2
-Source4: http://downloads.sourceforge.net/stardict/stardict-oxford-gb-2.4.2.tar.bz2
+# Hi. Are you adding a dictionary here? Please be sure we have a clear license for it.
+# The stardict page is _NOT_ a trusted source for licensing.
+# Not sure? Don't include it, or email fedora-legal at redhat.com first.
+
+# Cannot find licensing.
+# Source0: http://downloads.sourceforge.net/stardict/stardict-cdict-gb-2.4.2.tar.bz2
+# CEDICT license is non-free
+# Source1: http://downloads.sourceforge.net/stardict/stardict-cedict-gb-2.4.2.tar.bz2
+# Cannot find licensing
+# Source2: http://downloads.sourceforge.net/stardict/stardict-langdao-ce-gb-2.4.2.tar.bz2
+# Source3: http://downloads.sourceforge.net/stardict/stardict-langdao-ec-gb-2.4.2.tar.bz2
+# Almost certainly not used with permission.
+# Source4: http://downloads.sourceforge.net/stardict/stardict-oxford-gb-2.4.2.tar.bz2
+# From upstream stardict, okay.
 Source5: http://downloads.sourceforge.net/stardict/stardict-stardict1.3-2.4.2.tar.bz2
+# From http://ftp.cdut.edu.cn/pub/linux/system/chinese/xdict/xdict.README
+# GPL+
 Source6: http://downloads.sourceforge.net/stardict/stardict-xdict-ce-gb-2.4.2.tar.bz2
 Source7: http://downloads.sourceforge.net/stardict/stardict-xdict-ec-gb-2.4.2.tar.bz2
 
@@ -23,17 +34,16 @@
 %description
 Simplified Chinese(zh_CN) dictionaries for StarDict.
 These dictionaries are included currently:
-cdict-gb, cedict-gb, langdao-ce-gb, langdao-ec-gb,
-oxford-gb, stardict1.3, xdict-ce-gb, xdict-ec-gb.
+stardict1.3, xdict-ce-gb, xdict-ec-gb.
 You can download more at: http://stardict.sourceforge.net
 
 %prep
 %setup -c -T -n %{name}-%{version}
-%setup -q -n %{name}-%{version} -D -T -a 0
-%setup -q -n %{name}-%{version} -D -T -a 1
-%setup -q -n %{name}-%{version} -D -T -a 2
-%setup -q -n %{name}-%{version} -D -T -a 3
-%setup -q -n %{name}-%{version} -D -T -a 4
+# %%setup -q -n %{name}-%{version} -D -T -a 0
+# %%setup -q -n %{name}-%{version} -D -T -a 1
+# %%setup -q -n %{name}-%{version} -D -T -a 2
+# %%setup -q -n %{name}-%{version} -D -T -a 3
+# %%setup -q -n %{name}-%{version} -D -T -a 4
 %setup -q -n %{name}-%{version} -D -T -a 5
 %setup -q -n %{name}-%{version} -D -T -a 6
 %setup -q -n %{name}-%{version} -D -T -a 7
@@ -53,6 +63,10 @@
 %{_datadir}/stardict/dic/*
 
 %changelog
+* Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-4
+- fix license tag
+- remove dictionaries for which the licensing is unclear (or outright forbidden)
+
 * Wed Jun 27 2007 Hu Zheng <zhu at redhat.com> - 2.4.2-3
 - Separate spec files for each language's dictionaries.
 



From spot at fedoraproject.org  Fri Sep  5 22:02:47 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  5 Sep 2008 22:02:47 +0000 (UTC)
Subject: rpms/stardict-dic-zh_TW/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 stardict-dic-zh_TW.spec, 1.1, 1.2
Message-ID: <20080905220247.A60A370121@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/stardict-dic-zh_TW/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20086

Modified Files:
	.cvsignore sources stardict-dic-zh_TW.spec 
Log Message:
fix license tag


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-zh_TW/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Jul 2007 09:58:57 -0000	1.2
+++ .cvsignore	5 Sep 2008 22:02:17 -0000	1.3
@@ -1,5 +1,2 @@
-stardict-cdict-big5-2.4.2.tar.bz2
-stardict-cedict-big5-2.4.2.tar.bz2
-stardict-langdao-ce-big5-2.4.2.tar.bz2
-stardict-langdao-ec-big5-2.4.2.tar.bz2
-stardict-oxford-big5-2.4.2.tar.bz2
+stardict-xdict-ce-big5-2.4.2.tar.bz2
+stardict-xdict-ec-big5-2.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-zh_TW/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jul 2007 09:58:57 -0000	1.2
+++ sources	5 Sep 2008 22:02:17 -0000	1.3
@@ -1,5 +1,2 @@
-0349198b9dfcecd9a0f505512bb21d8b  stardict-cdict-big5-2.4.2.tar.bz2
-80b13d05bd5e975c35afcf4a13113673  stardict-cedict-big5-2.4.2.tar.bz2
-50b9423fa578988b5b0544c5b663058a  stardict-langdao-ce-big5-2.4.2.tar.bz2
-61ceeec1b056a171645af723d3e956fe  stardict-langdao-ec-big5-2.4.2.tar.bz2
-e54da1d0759ce59f8fbddff7979e9300  stardict-oxford-big5-2.4.2.tar.bz2
+5a1866fd879c9b02c45d5eab18d5c356  stardict-xdict-ce-big5-2.4.2.tar.bz2
+ab714bb56eb0901357704ef9ec796047  stardict-xdict-ec-big5-2.4.2.tar.bz2


Index: stardict-dic-zh_TW.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-zh_TW/devel/stardict-dic-zh_TW.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stardict-dic-zh_TW.spec	4 Jul 2007 09:58:57 -0000	1.1
+++ stardict-dic-zh_TW.spec	5 Sep 2008 22:02:17 -0000	1.2
@@ -1,16 +1,28 @@
 Name: stardict-dic-zh_TW
 Summary: Traditional Chinese(zh_TW) dictionaries for StarDict
 Version: 2.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/System
-License: GPL
+License: GPL+
 URL: http://stardict.sourceforge.net
 
-Source0: http://downloads.sourceforge.net/stardict/stardict-cdict-big5-2.4.2.tar.bz2
-Source1: http://downloads.sourceforge.net/stardict/stardict-cedict-big5-2.4.2.tar.bz2
-Source2: http://downloads.sourceforge.net/stardict/stardict-langdao-ce-big5-2.4.2.tar.bz2
-Source3: http://downloads.sourceforge.net/stardict/stardict-langdao-ec-big5-2.4.2.tar.bz2
-Source4: http://downloads.sourceforge.net/stardict/stardict-oxford-big5-2.4.2.tar.bz2
+# Hi. Are you adding a dictionary here?	Please be sure we have a clear license for it.
+# The stardict page is _NOT_ a trusted source for licensing.
+# Not sure? Don't include it, or email fedora-legal at redhat.com first.
+
+# Cannot find licensing.
+# Source0: http://downloads.sourceforge.net/stardict/stardict-cdict-big5-2.4.2.tar.bz2
+# CEDICT license is non-free.
+# Source1: http://downloads.sourceforge.net/stardict/stardict-cedict-big5-2.4.2.tar.bz2
+# Cannot find licensing
+# Source2: http://downloads.sourceforge.net/stardict/stardict-langdao-ce-big5-2.4.2.tar.bz2
+# Source3: http://downloads.sourceforge.net/stardict/stardict-langdao-ec-big5-2.4.2.tar.bz2
+# Almost certainly not used with permission.
+# Source4: http://downloads.sourceforge.net/stardict/stardict-oxford-big5-2.4.2.tar.bz2
+# From http://ftp.cdut.edu.cn/pub/linux/system/chinese/xdict/xdict.README
+# GPL+
+Source5: http://prdownloads.sourceforge.net/stardict/stardict-xdict-ec-big5-2.4.2.tar.bz2
+Source6: http://prdownloads.sourceforge.net/stardict/stardict-xdict-ce-big5-2.4.2.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
@@ -20,17 +32,18 @@
 %description
 Traditional Chinese(zh_TW) dictionaries for StarDict.
 These dictionaries are included currently:
-cdict-big5, cedict-big5, langdao-ce-big5, langdao-ec-big5,
-oxford-big5.
+xdict-ce-big5, xdict-ec-big5.
 You can download more at: http://stardict.sourceforge.net
 
 %prep
 %setup -c -T -n %{name}-%{version}
-%setup -q -n %{name}-%{version} -D -T -a 0
-%setup -q -n %{name}-%{version} -D -T -a 1
-%setup -q -n %{name}-%{version} -D -T -a 2
-%setup -q -n %{name}-%{version} -D -T -a 3
-%setup -q -n %{name}-%{version} -D -T -a 4
+# %%setup -q -n %{name}-%{version} -D -T -a 0
+# %%setup -q -n %{name}-%{version} -D -T -a 1
+# %%setup -q -n %{name}-%{version} -D -T -a 2
+# %%setup -q -n %{name}-%{version} -D -T -a 3
+# %%setup -q -n %{name}-%{version} -D -T -a 4
+%setup -q -n %{name}-%{version} -D -T -a 5
+%setup -q -n %{name}-%{version} -D -T -a 6
 
 %build
 
@@ -47,6 +60,11 @@
 %{_datadir}/stardict/dic/*
 
 %changelog
+* Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-4
+- remove files for which licensing is unclear (or bad)
+- add xdict files (we know they are good)
+- fix license tag
+
 * Wed Jun 27 2007 Hu Zheng <zhu at redhat.com> - 2.4.2-3
 - Separate spec files for each language's dictionaries.
 



From jakub at fedoraproject.org  Fri Sep  5 22:16:28 2008
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri,  5 Sep 2008 22:16:28 +0000 (UTC)
Subject: rpms/gcc/devel gcc43-altivec-tests.patch, NONE,
	1.1 gcc43-libtool-no-rpath.patch, NONE, 1.1 gcc43.spec, 1.41, 1.42
Message-ID: <20080905221628.20D6770121@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22610

Modified Files:
	gcc43.spec 
Added Files:
	gcc43-altivec-tests.patch gcc43-libtool-no-rpath.patch 
Log Message:
4.3.2-3

gcc43-altivec-tests.patch:

--- NEW FILE gcc43-altivec-tests.patch ---
2008-08-26  Janis Johnson  <janis187 at us.ibm.com>

	* g++.dg/ext/altivec-3.C: Move AltiVec code out of main.

2008-04-04  Janis Johnson  <janis187 at us.ibm.com>

	* gcc.dg/var-expand3.c: Skip for powerpc-linux if not on AltiVec HW.

--- gcc/testsuite/g++.dg/ext/altivec-3.C	(revision 139609)
+++ gcc/testsuite/g++.dg/ext/altivec-3.C	(revision 139610)
@@ -120,16 +120,19 @@ void baz2 (int i, ... )
     CHECK_INVARIANT (vec_all_eq (vxi.v, vx_g.v));
 }
 
-int main(void)
+void main1(void)
 {
     CHECK_INVARIANT (sizeof(struct foo) == 8 && sizeof(struct vfoo) == 48);
 
-    altivec_check();
-
     bar(i_1, x_g, (short)i_2, (float)d_2, ld_1, (char)i_1, d_3);
     baz(i_1, v_g, i_1, vx_g, i_1, v2_g, i_1, vx2_g); 
     quux(i_1, v_g, v_g);
     baz2(i_1, vx_g);
-    
+}
+
+int main(void)
+{
+    altivec_check();
+    main1();
     return 0;
 }
--- gcc/testsuite/gcc.dg/var-expand3.c	(revision 133910)
+++ gcc/testsuite/gcc.dg/var-expand3.c	(revision 133911)
@@ -1,4 +1,4 @@
-/* { dg-do run { target { powerpc*-*-* && powerpc_altivec_ok } } }} */
+/* { dg-do run { target { powerpc*-*-* && vmx_hw } } }} */
 /* { dg-options "-O2 -funroll-loops -ffast-math -fvariable-expansion-in-unroller -maltivec -fdump-rtl-loop2" } */
 
 #include "altivec.h"

gcc43-libtool-no-rpath.patch:

--- NEW FILE gcc43-libtool-no-rpath.patch ---
libtool sucks.
--- ltmain.sh.jj	2007-12-07 14:53:21.000000000 +0100
+++ ltmain.sh	2008-09-05 21:51:48.000000000 +0200
@@ -5394,6 +5394,7 @@ EOF
 	  rpath="$finalize_rpath"
 	  test "$mode" != relink && rpath="$compile_rpath$rpath"
 	  for libdir in $rpath; do
+	    case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
 	    if test -n "$hardcode_libdir_flag_spec"; then
 	      if test -n "$hardcode_libdir_separator"; then
 		if test -z "$hardcode_libdirs"; then
@@ -6071,6 +6072,7 @@ EOF
       rpath=
       hardcode_libdirs=
       for libdir in $compile_rpath $finalize_rpath; do
+	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
 	if test -n "$hardcode_libdir_flag_spec"; then
 	  if test -n "$hardcode_libdir_separator"; then
 	    if test -z "$hardcode_libdirs"; then
@@ -6120,6 +6122,7 @@ EOF
       rpath=
       hardcode_libdirs=
       for libdir in $finalize_rpath; do
+	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
 	if test -n "$hardcode_libdir_flag_spec"; then
 	  if test -n "$hardcode_libdir_separator"; then
 	    if test -z "$hardcode_libdirs"; then


Index: gcc43.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc43.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gcc43.spec	5 Sep 2008 08:43:54 -0000	1.41
+++ gcc43.spec	5 Sep 2008 22:15:57 -0000	1.42
@@ -51,7 +51,7 @@
 %define fastjar_ver 0.95
 Source4: http://download.savannah.nongnu.org/releases/fastjar/fastjar-%{fastjar_ver}.tar.gz
 URL: http://gcc.gnu.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n))
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Need binutils with -pie support >= 2.14.90.0.4-4
 # Need binutils which can omit dot symbols and overlap .opd on ppc64 >= 2.15.91.0.2-4
 # Need binutils which handle -msecure-plt on ppc >= 2.16.91.0.2-2
@@ -152,6 +152,8 @@
 Patch16: gcc43-libgomp-omp_h-multilib.patch
 Patch17: gcc43-x86_64-va_start.patch
 Patch18: gcc43-pr37189.patch
+Patch19: gcc43-altivec-tests.patch
+Patch20: gcc43-libtool-no-rpath.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -454,6 +456,8 @@
 %patch16 -p0 -b .libgomp-omp_h-multilib~
 %patch17 -p0 -b .x86_64-va_start~
 %patch18 -p0 -b .pr37189~
+%patch19 -p0 -b .altivec-tests~
+%patch20 -p0 -b .libtool-no-rpath~
 
 tar xzf %{SOURCE4}
 
@@ -1702,6 +1706,12 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Sat Sep  6 2008 Jakub Jelinek <jakub at redhat.com> 4.3.2-3
+- don't run tests that require Altivec hw on non-Altivec powerpcs
+- make sure none of libgcj binaries/libraries contains /usr/%{lib} in
+  RPATH
+- fix up BuildRoot
+
 * Fri Sep  5 2008 Jakub Jelinek <jakub at redhat.com> 4.3.2-2
 - update from gcc-4_3-branch
   - PRs c++/37348, c/37261, fortran/36371, fortran/37193, middle-end/36449,



From jakub at fedoraproject.org  Fri Sep  5 22:21:20 2008
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri,  5 Sep 2008 22:21:20 +0000 (UTC)
Subject: rpms/gcc/devel gcc43.spec,1.42,1.43
Message-ID: <20080905222120.80C0270121@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23558

Modified Files:
	gcc43.spec 
Log Message:
4.3.2-3


Index: gcc43.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc43.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gcc43.spec	5 Sep 2008 22:15:57 -0000	1.42
+++ gcc43.spec	5 Sep 2008 22:20:50 -0000	1.43
@@ -3,7 +3,7 @@
 %define gcc_version 4.3.2
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%define gcc_release 2
+%define gcc_release 3
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1



From transif at fedoraproject.org  Fri Sep  5 22:21:41 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Fri,  5 Sep 2008 22:21:41 +0000 (UTC)
Subject: comps/po lv.po,1.11,1.12
Message-ID: <20080905222141.0664270121@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23673/po

Modified Files:
	lv.po 
Log Message:
    2008-09-05  Janis Ozolins <jonhij at gmail.com> (via johnij at fedoraproject.org)
    
      * po/lv.po: Fixed faults, updated translation to Latvian
    



Index: lv.po
===================================================================
RCS file: /cvs/pkgs/comps/po/lv.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lv.po	17 Jul 2008 18:31:24 -0000	1.11
+++ lv.po	5 Sep 2008 22:21:10 -0000	1.12
@@ -3,19 +3,19 @@
 # This file is distributed under the same license as the lv package.
 # Gatis Kalnins <gatis.kalnins at metatrons.lv>, 2006.
 # Janis Ozolins <johnij at fedoraproject.org, 2008.
-#
-#
+# 
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: lv\n"
+"Project-Id-Version: lv 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-17 14:29-0400\n"
-"PO-Revision-Date: 2008-07-04 20:18+0100\n"
+"POT-Creation-Date: 2008-09-05 13:25+0000\n"
+"PO-Revision-Date: 2008-09-05 23:09+0100\n"
 "Last-Translator: Janis Ozolins <johnij at fedoraproject.org>\n"
 "Language-Team: Latvian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bit"
 
 #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1
@@ -70,17 +70,17 @@
 #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
 #: ../comps-f10.xml.in.h:11
 msgid "Base"
-msgstr "Pamatsist??ma"
+msgstr "B??ze"
 
 #: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
 #: ../comps-f10.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7
 msgid "Base System"
-msgstr "Pamatsist??ma"
+msgstr "B??zes sist??ma"
 
 #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
 #: ../comps-f10.xml.in.h:13
 msgid "Basic support for the Ruby programming language."
-msgstr "Programm????anas valodas Ruby pamatatbalsts"
+msgstr "Pamata atbalsts Ruby programm????anas valodai."
 
 #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
 #: ../comps-f10.xml.in.h:14
@@ -99,15 +99,13 @@
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
 #: ../comps-f10.xml.in.h:17
-#, fuzzy
 msgid "Bhutanese Support"
-msgstr "????nie??u valodas atbalsts"
+msgstr ""
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
 #: ../comps-f10.xml.in.h:18
-#, fuzzy
 msgid "Bosnian Support"
-msgstr "Igau??u valodas atbalsts"
+msgstr "Bosnie??u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
 #: ../comps-f10.xml.in.h:19
@@ -117,7 +115,7 @@
 #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
 #: ../comps-f10.xml.in.h:20
 msgid "Breton Support"
-msgstr "Breta??as valodas atbalsts"
+msgstr "Breto??u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
 #: ../comps-f10.xml.in.h:22
@@ -127,7 +125,7 @@
 #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
 #: ../comps-f10.xml.in.h:23
 msgid "Catalan Support"
-msgstr "Katalonie??u valodas atbalsts"
+msgstr "Katal????u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
 #: ../comps-f10.xml.in.h:24
@@ -172,12 +170,12 @@
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
 #: ../comps-f10.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
-msgstr "Darbvirsma"
+msgstr "Darbvirsmu vides"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
 #: ../comps-f10.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
-msgstr "Darbvirsma"
+msgstr "Darbvirsmu vides"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
 #: ../comps-f10.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11
@@ -202,7 +200,7 @@
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
 #: ../comps-f10.xml.in.h:38
 msgid "Dutch Support"
-msgstr "D????u valodas atbalsts"
+msgstr "Holandie??u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:38
 msgid "Eclipse"
@@ -251,13 +249,12 @@
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48
 #: ../comps-f10.xml.in.h:48
 msgid "Faeroese Support"
-msgstr "Fareru valodas atbalsts"
+msgstr "Far??ru valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
 #: ../comps-f10.xml.in.h:50 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19
-#, fuzzy
 msgid "Fedora Packager"
-msgstr "Eclipse"
+msgstr "Fedoras pakot??js"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
 #: ../comps-f10.xml.in.h:51
@@ -280,13 +277,13 @@
 "From CD recording to playing audio CDs and multimedia files, this package "
 "group allows you to work with sound and video on the system."
 msgstr ""
-"No CD ierakst????anas l??dz MP3 form??ta atska??o??anai; ???? pakot??u grupa satur "
-"programmas darbam ar ska??u un video."
+"No CD ierakst????anas l??dz audio CD un multim??diju atska??o??anai; ???? pakot??u "
+"grupa satur programmas darbam ar ska??u un video."
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
 #: ../comps-f10.xml.in.h:57 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21
 msgid "GNOME Desktop Environment"
-msgstr "GNOME Darbvirsma"
+msgstr "GNOME Darbvirsmas vide"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58
 #: ../comps-f10.xml.in.h:58 ../comps-el4.xml.in.h:21 ../comps-el5.xml.in.h:22
@@ -310,7 +307,7 @@
 #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61
 #: ../comps-f10.xml.in.h:61
 msgid "Galician Support"
-msgstr "Gal??cie??u valodas atbalsts"
+msgstr "Galisie??u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62
 #: ../comps-f10.xml.in.h:62 ../comps-el5.xml.in.h:24
@@ -319,9 +316,8 @@
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
 #: ../comps-f10.xml.in.h:63
-#, fuzzy
 msgid "Georgian Support"
-msgstr "V??cu valodas atbalsts"
+msgstr "Gruz??nu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
 #: ../comps-f10.xml.in.h:64
@@ -331,7 +327,7 @@
 #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65
 #: ../comps-f10.xml.in.h:65 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25
 msgid "Graphical Internet"
-msgstr "Interneta grafisk?? re????ma r??ki"
+msgstr "Grafiskais internets"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66
 #: ../comps-f10.xml.in.h:66 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26
@@ -346,7 +342,7 @@
 #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68
 #: ../comps-f10.xml.in.h:68
 msgid "Gujarati Support"
-msgstr "Gujarati valodas atbalsts"
+msgstr "Gud??aratu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69
 #: ../comps-f10.xml.in.h:69 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27
@@ -356,7 +352,7 @@
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70
 #: ../comps-f10.xml.in.h:71 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28
 msgid "Hebrew Support"
-msgstr "Ebreju valodas atbalsts"
+msgstr "Senebreju valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71
 #: ../comps-f10.xml.in.h:72
@@ -371,7 +367,7 @@
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73
 #: ../comps-f10.xml.in.h:74
 msgid "Icelandic Support"
-msgstr "Islandie??u valodas atbalsts"
+msgstr "??slandie??u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74
 #: ../comps-f10.xml.in.h:75
@@ -389,19 +385,17 @@
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
 #: ../comps-f10.xml.in.h:79
-#, fuzzy
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr ""
-"Uzst??diet ????s pakotnes, ja v??laties nodarboties ar GTK+ un GNOME programmu "
-"izstr??di."
+"Uzst??diet ????s pakotnes, ja v??laties izstr??d??t GTK+ un XFCE grafiskos "
+"izstr??d??jumus."
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
 #: ../comps-f10.xml.in.h:80 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
-msgstr ""
-"Uzst??diet ????s pakotnes, ja v??laties nodarboties ar QT un KDE programmu "
+msgstr "Uzst??diet ????s pakotnes, ja v??laties nodarboties ar QT un KDE programmu "
 "izstr??di."
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
@@ -421,9 +415,8 @@
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
 #: ../comps-f10.xml.in.h:84
-#, fuzzy
 msgid "Inuktitut Support"
-msgstr "Zulu valodas atbalsts"
+msgstr "Inu??tu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
 #: ../comps-f10.xml.in.h:85
@@ -472,13 +465,12 @@
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
 #: ../comps-f10.xml.in.h:93
 msgid "Kannada Support"
-msgstr "Kan??die??u valodas atbalsts"
+msgstr "Kannadu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
 #: ../comps-f10.xml.in.h:95
-#, fuzzy
 msgid "Khmer Support"
-msgstr "V??cu valodas atbalsts"
+msgstr "Khmeru valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
 #: ../comps-f10.xml.in.h:96
@@ -492,9 +484,8 @@
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:95
 #: ../comps-f10.xml.in.h:98
-#, fuzzy
 msgid "Lao Support"
-msgstr "Tajie??u valodas atbalsts"
+msgstr "Laosie??u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:96
 #: ../comps-f10.xml.in.h:99
@@ -534,18 +525,17 @@
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:106
 #: ../comps-f10.xml.in.h:109
 msgid "Malayalam Support"
-msgstr "Malajalamie??u valodas atbalsts"
+msgstr "Malajalu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:107
 #: ../comps-f10.xml.in.h:110
-#, fuzzy
 msgid "Maori Support"
-msgstr "Marati valodas atbalsts"
+msgstr "Maoru valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:108
 #: ../comps-f10.xml.in.h:111
 msgid "Marathi Support"
-msgstr "Marati valodas atbalsts"
+msgstr "Marathu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:110
 #: ../comps-f10.xml.in.h:113
@@ -553,147 +543,146 @@
 msgstr "MySQL datu b??ze"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:112
-#: ../comps-f10.xml.in.h:115 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
+#: ../comps-f10.xml.in.h:116 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "T??kla serveri"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:116 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
+#: ../comps-f10.xml.in.h:117 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "Zi??u serveris"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:115
-#: ../comps-f10.xml.in.h:118
+#: ../comps-f10.xml.in.h:119
 msgid "Northern Sotho Support"
-msgstr "Northern Sotho Support"
+msgstr "Zieme??sotu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:119
+#: ../comps-f10.xml.in.h:120
 msgid "Norwegian Support"
 msgstr "Norv????u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:120 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
+#: ../comps-f10.xml.in.h:121 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "Birojs/Ra??o??ana"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:119
-#: ../comps-f10.xml.in.h:122
+#: ../comps-f10.xml.in.h:123
 msgid "Oriya Support"
-msgstr "Oriya Support"
+msgstr "Oriju valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:123 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
+#: ../comps-f10.xml.in.h:124 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
-msgstr "Pakotnes, kas nodro??ina programmu izstr??des procesu."
+msgstr ""
+"Pakotnes, kas nodro??ina programmu izstr??des procesu."
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:124
+#: ../comps-f10.xml.in.h:125
 msgid "Persian Support"
 msgstr "Persie??u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:125
+#: ../comps-f10.xml.in.h:126
 msgid "Polish Support"
 msgstr "Po??u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:126
+#: ../comps-f10.xml.in.h:127
 msgid "Portuguese Support"
 msgstr "Portug????u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:127
+#: ../comps-f10.xml.in.h:128
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL datu b??ze"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:128
+#: ../comps-f10.xml.in.h:129
 msgid "Printing Support"
-msgstr "Drukas sist??ma"
+msgstr "Druk????anas atbalsts"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:129
+#: ../comps-f10.xml.in.h:130
 msgid "Punjabi Support"
-msgstr "Pend??abie??u valodas atbalsts"
+msgstr "Pand??abu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:130
+#: ../comps-f10.xml.in.h:131
 msgid "Romanian Support"
 msgstr "Rom????u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:131
+#: ../comps-f10.xml.in.h:132
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:132
+#: ../comps-f10.xml.in.h:133
 msgid "Russian Support"
 msgstr "Krievu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:132
-#: ../comps-f10.xml.in.h:135
-#, fuzzy
+#: ../comps-f10.xml.in.h:136
 msgid "Samoan Support"
-msgstr "V??cu valodas atbalsts"
+msgstr "Samo????u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:136
+#: ../comps-f10.xml.in.h:137
 msgid "Serbian Support"
 msgstr "Serbu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:137
+#: ../comps-f10.xml.in.h:138
 msgid "Server Configuration Tools"
 msgstr "Servera iestat????anas r??ki"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:138 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
+#: ../comps-f10.xml.in.h:139 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "Serveri"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:139 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
+#: ../comps-f10.xml.in.h:140 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
 msgid ""
 "Simple window managers that aren't part of a larger desktop environment."
 msgstr "Vienk??r??i logu p??rvaldnieki, kas nav darba virsmu vides da??a."
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:140
+#: ../comps-f10.xml.in.h:141
 msgid "Sinhala Support"
-msgstr "Sinhala Support"
+msgstr "Sing????u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:141
+#: ../comps-f10.xml.in.h:142
 msgid "Slovak Support"
 msgstr "Slov??ku valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:142
+#: ../comps-f10.xml.in.h:143
 msgid "Slovenian Support"
 msgstr "Slov????u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:143
+#: ../comps-f10.xml.in.h:144
 msgid "Smallest possible installation"
 msgstr "Vismaz??k?? iesp??jam?? instal??cija"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:144 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
+#: ../comps-f10.xml.in.h:145 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
-msgstr "Programmas, kas tiek izmantotas t??kla serveriem"
+msgstr "Str??d??jo??iem t??kla serveriem lietot?? programmat??ra"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:145
-#, fuzzy
+#: ../comps-f10.xml.in.h:146
 msgid "Somali Support"
-msgstr "Swati atbalsts"
+msgstr "Som????u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:146
+#: ../comps-f10.xml.in.h:147
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -702,136 +691,138 @@
 "tekstus. Ietver Emacs un Vi."
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:147 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
+#: ../comps-f10.xml.in.h:148 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "Ska??a un video"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:148
+#: ../comps-f10.xml.in.h:149
 msgid "Southern Ndebele Support"
-msgstr "Dienvidu Ndebele atbalsts"
+msgstr "Dienvidndebelu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:149
+#: ../comps-f10.xml.in.h:150
 msgid "Southern Sotho Support"
-msgstr "Dienvidu Sotho atbalsts"
+msgstr "Dienvidsotu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:150
+#: ../comps-f10.xml.in.h:151
 msgid "Spanish Support"
 msgstr "Sp????u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:151 ../comps-el4.xml.in.h:46
+#: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
-msgstr "Izstr??des programmu atbalsts darbam ar Java programm????anas valodu"
+msgstr "Atbalsts programmu izstr??d????anai Java programm????anas valod??."
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:47
+#: ../comps-f10.xml.in.h:153 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
-msgstr "Atbalsts Javas valod?? rakst??to programmu start????anai"
+msgstr "Atbalsts Java programm????anas valod?? rakst??t??m str??d??jo????m programm??m."
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:153
+#: ../comps-f10.xml.in.h:154
 msgid "Swati Support"
-msgstr "Swati atbalsts"
+msgstr "Svatu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:154
+#: ../comps-f10.xml.in.h:155
 msgid "Swedish Support"
 msgstr "Zviedru valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:155 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
+#: ../comps-f10.xml.in.h:156 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "Sist??mas r??ki"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:156
-#, fuzzy
+#: ../comps-f10.xml.in.h:157
 msgid "Tagalog Support"
-msgstr "Tamilu valodas atbalsts"
+msgstr "Tagalu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:158
+#: ../comps-f10.xml.in.h:159
 msgid "Tamil Support"
 msgstr "Tamilu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:159
+#: ../comps-f10.xml.in.h:160
 msgid "Telugu Support"
 msgstr "Telugu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:160 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
+#: ../comps-f10.xml.in.h:161 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "Interneta teksta re????ma r??ki"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:161
+#: ../comps-f10.xml.in.h:162
 msgid "Thai Support"
-msgstr "Tajie??u valodas atbalsts"
+msgstr "Taju valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:143
 msgid "The Eclipse Integrated Development Environment."
 msgstr "Integr??t?? izstr??des vide Eclipse"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:162 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
+#: ../comps-f10.xml.in.h:163 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
-msgstr ""
-"Grupa ietver biroja programmas, PDF form??ta dat??u las????anas programmas utt."
+msgstr "Grupa ietver biroja programmas, PDF form??ta dat??u las????anas programmas utt."
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:163
+#: ../comps-f10.xml.in.h:164
 msgid ""
 "The packages in this group are core libraries needed to develop applications."
-msgstr "???? grupa ietver bibliotekas, kas nepiecie??amas programmu izstr??dei."
+msgstr ""
+"???? grupa ietver bibliotekas, kas nepiecie??amas programmu izstr??dei."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:164 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
+#: ../comps-f10.xml.in.h:165 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "????s pakotnes dod iesp??ju iestat??t IMAP vai SMTP pasta serveri."
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:165
+#: ../comps-f10.xml.in.h:166
 msgid ""
 "These packages allow you to develop applications for the X Window System."
-msgstr "????s pakotnes dod iesp??ju izstr??d??t programmas X Window sist??mai."
+msgstr ""
+"????s pakotnes dod iesp??ju izstr??d??t programmas X Window sist??mai."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:166 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
+#: ../comps-f10.xml.in.h:167 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
 msgid ""
 "These packages are helpful when developing web applications or web pages."
-msgstr "????s pakotnes noder izstr??d??jot web programmas vai web-lapas."
+msgstr ""
+"????s pakotnes noder izstr??d??jot web programmas vai web-lapas."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:167
+#: ../comps-f10.xml.in.h:168
 msgid ""
 "These packages include network-based servers such as DHCP, Kerberos and NIS."
-msgstr "????s pakotnes ietver t??dus t??kla servisus k?? DHCP, Kerberos un NIS."
+msgstr ""
+"????s pakotnes ietver t??dus t??kla servisus k?? DHCP, Kerberos un NIS."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:168
+#: ../comps-f10.xml.in.h:169
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
 msgstr ""
-"????s pakotnes ietver t??dus novecoju??us t??kla protokolus k?? rsh un telnet."
+"????s pakotnes ietver serverus novecoju??iem t??kla protokoliem t??diem k?? rsh "
+"un telnet."
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:169
-#, fuzzy
+#: ../comps-f10.xml.in.h:170
 msgid "These packages provide a virtualization environment."
-msgstr "????s pakotnes nodro??ina savietojam??bu ar iepriek????j??m versij??m."
+msgstr "????s pakotnes nodro??ina virtualiz??cijas vidi."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:170
+#: ../comps-f10.xml.in.h:171
 msgid "These packages provide compatibility with previous releases."
 msgstr "????s pakotnes nodro??ina savietojam??bu ar iepriek????j??m versij??m."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:171
+#: ../comps-f10.xml.in.h:172
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -840,7 +831,7 @@
 "meto??u) atbalstu"
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:172
+#: ../comps-f10.xml.in.h:173
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -849,17 +840,17 @@
 "HTML, PDF, Postscript un teksta form??t??."
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:173 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
+#: ../comps-f10.xml.in.h:174 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
-msgstr "??ie r??ki ??auj datoru izmantot k?? interneta serveri."
+msgstr "??ie r??ki Jums ??auj darbin??t web serveri uz sist??mas."
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:174 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
+#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
-msgstr "??ie r??ki ??auj datoru izmantot k?? FTP serveri."
+msgstr "??ie r??ki ??auj darbin??t FTP serveri uz sist??mas."
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
+#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -868,18 +859,17 @@
 "python un atk????dot??jus."
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
+#: ../comps-f10.xml.in.h:177 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "??ie r??ki dod iesp??ju izmantot datoru k?? zi??u serveri."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:177
+#: ../comps-f10.xml.in.h:178
 msgid "This group contains all of Red Hat's custom server configuration tools."
-msgstr ""
-"???? grupa ietver komp??nijas RedHat izstr??d??tos servera administr????anas r??kus."
+msgstr "???? grupa ietver RedHat izstr??d??tos servera administr????anas r??kus."
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:178
+#: ../comps-f10.xml.in.h:179
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -888,12 +878,12 @@
 "mar??rut??t??ju/ugunssienu izveidei."
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
+#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "???? grupa ietver grafiskus e-pasta, interneta un ??ata klientus."
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
+#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -901,12 +891,12 @@
 "???? grupa ietver programmas matem??tisku un citu zin??tnisku apr????inu veik??anai."
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
+#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "???? grupa ietver programmas darbam ar grafiku un skeneriem."
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
+#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -915,7 +905,7 @@
 "programmu izmanto??anai nav nepiecie??ams uzst??d??t X Window sist??mu."
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
+#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -925,19 +915,21 @@
 "un tml."
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
+#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of tools and resources of Armenian environments."
-msgstr "???? grupa ir Arm????u vides r??ku un resursu kolekcija."
+msgstr ""
+"???? grupa ir r??ku un resursu kolekcija.Arm????u videi."
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
+#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
 msgid ""
 "This group is a collection of tools for various hardware specific utilities."
 msgstr ""
+"???? grupa ir r??ku kolekcija priek?? ier????u specifiskiem apr??kojumiem."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
+#: ../comps-f10.xml.in.h:187 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
 "client for connecting to SMB shares and tools to monitor network traffic."
@@ -946,13 +938,14 @@
 "piek??uvei SMB serveriem un t??kla trafika nov??ro??anai."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:187
+#: ../comps-f10.xml.in.h:188
 msgid ""
 "This package group allows you to run a DNS name server (BIND) on the system."
-msgstr "????s grupas pakotnes ??aus Jums uzst??d??t iestat??t DNS serveri BIND."
+msgstr ""
+"????s grupas pakotnes ??aus Jums uzst??d??t iestat??t DNS serveri BIND."
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:188
+#: ../comps-f10.xml.in.h:189
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -961,135 +954,132 @@
 "Windows (tm) sist??m??m."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:189
+#: ../comps-f10.xml.in.h:190
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "???? grupa satur pakotnes, kas noder MySQL izmanto??anas laik??."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:190
+#: ../comps-f10.xml.in.h:191
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "???? grupa satur pakotnes, kas noder PostgreSQL izmanto??anas laik??."
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:191
+#: ../comps-f10.xml.in.h:192
 msgid "Tibetan Support"
 msgstr "Tibetie??u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:192
-#, fuzzy
+#: ../comps-f10.xml.in.h:193
 msgid "Tonga Support"
-msgstr "Tsonga valodas atbalsts"
+msgstr "Tongie??u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:193 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
+#: ../comps-f10.xml.in.h:194 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
-msgstr ""
+msgstr "Fedoras pakot??jam nepiecie??amie r??ki un util??tas"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:194
+#: ../comps-f10.xml.in.h:195
 msgid "Tsonga Support"
-msgstr "Tsonga valodas atbalsts"
+msgstr "Congu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:195
+#: ../comps-f10.xml.in.h:196
 msgid "Tswana Support"
-msgstr "Tswana Support"
+msgstr "Cvanu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:196
+#: ../comps-f10.xml.in.h:197
 msgid "Turkish Support"
 msgstr "Turku valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:197
+#: ../comps-f10.xml.in.h:198
 msgid "Ukrainian Support"
 msgstr "Ukrai??u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:198
-#, fuzzy
+#: ../comps-f10.xml.in.h:199
 msgid "Urdu Support"
-msgstr "Zulu valodas atbalsts"
+msgstr "Urdu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:199 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
+#: ../comps-f10.xml.in.h:200 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "Da????das sist??mas pamatda??as"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:200 ../comps-el5.xml.in.h:72
+#: ../comps-f10.xml.in.h:201 ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "Da????di veidi, lai atsl??bin??tos un pavad??tu br??vo laiku."
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:201
+#: ../comps-f10.xml.in.h:202
 msgid "Venda Support"
-msgstr "Venda atbalsts"
+msgstr "Vendu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:202
+#: ../comps-f10.xml.in.h:203
 msgid "Vietnamese Support"
 msgstr "Vjetnamie??u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:203
+#: ../comps-f10.xml.in.h:204
 msgid "Virtualization"
 msgstr "Virtualiz??cija"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:201
-#: ../comps-f10.xml.in.h:205 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
-#, fuzzy
+#: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
-msgstr "Programm????ana"
+msgstr "Web att??st??ba"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
+#: ../comps-f10.xml.in.h:207 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
-msgstr "Interneta serveris"
+msgstr "Web serveris"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:207
+#: ../comps-f10.xml.in.h:208
 msgid "Welsh Support"
 msgstr "Velsie??u valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:208 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
+#: ../comps-f10.xml.in.h:209 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "Logu p??rvaldnieki"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:209
+#: ../comps-f10.xml.in.h:210
 msgid "Windows File Server"
 msgstr "Windows dat??u serveris"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:210
+#: ../comps-f10.xml.in.h:211
 msgid "X Software Development"
 msgstr "X programmu izstr??de"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:211 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
+#: ../comps-f10.xml.in.h:212 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X Window sist??ma"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:212
+#: ../comps-f10.xml.in.h:213
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:213
+#: ../comps-f10.xml.in.h:214
 msgid "XFCE Software Development"
 msgstr "XFCE programmat??ras izstr??de"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:214
+#: ../comps-f10.xml.in.h:215
 msgid "Xhosa Support"
-msgstr "Xhosa atbalsts"
+msgstr "Khosu valodas atbalsts"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:215
+#: ../comps-f10.xml.in.h:216
 msgid "Zulu Support"
 msgstr "Zulu valodas atbalsts"
 
@@ -1107,7 +1097,7 @@
 
 #: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54
 msgid "Fonts packages for rendering text on the desktop."
-msgstr ""
+msgstr "Fontu pakas teksta render????anai uz darba virsmas."
 
 #: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
 msgid "Integrated Development Environments based on Eclipse."
@@ -1115,57 +1105,51 @@
 
 #: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:100
 msgid "Legacy Fonts"
-msgstr ""
+msgstr "Legacy fonti"
 
 #: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:105
-#, fuzzy
 msgid "Low Saxon Support"
-msgstr "Tajie??u valodas atbalsts"
+msgstr "Lejassak??u atbalsts"
 
 #: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:112
 msgid "Mongolian Support"
 msgstr "Mongo??u valodas atbalsts"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:114
-#, fuzzy
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:115
 msgid "Nepali Support"
-msgstr "Beng????u valodas atbalsts"
+msgstr "Nep????ie??u valodas atbalsts"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:121
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:122
 msgid "Older bitmap and vector fonts packages"
-msgstr ""
+msgstr "Veco bitmap un vector fontu pakas"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44
 msgid "Esperanto Support"
 msgstr "Esperanto valodas atbalsts"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashubian Support"
-msgstr "Igau??u valodas atbalsts"
+msgstr "Ka??ubu valodas atbalsts"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:106
 msgid "Macedonian Support"
 msgstr "Ma??edonie??u valodas atbalsts"
 
-#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:117
-#, fuzzy
+#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:118
 msgid "Northern Sami Support"
-msgstr "Northern Sotho Support"
+msgstr "Zieme??s??mu valodas atbalsts"
 
-#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:133
-#, fuzzy
+#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:134
 msgid "SUGAR Desktop Environment"
-msgstr "Darbvirsma"
+msgstr "SUGAR darbvirsmas vide"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:134
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:135
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
-msgstr ""
+msgstr "SUGAR ir darbavirmas vide, kas izstr??d??ta priek?? OLPC XO."
 
-#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:204
-#, fuzzy
+#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:205
 msgid "Walloon Support"
-msgstr "Tajie??u valodas atbalsts"
+msgstr "Valo??u valodas atbalsts"
 
 #: ../comps-f10.xml.in.h:70
 msgid "Haskell"
@@ -1177,12 +1161,16 @@
 
 #: ../comps-f10.xml.in.h:77
 msgid "Input method packages for the input of international text."
-msgstr ""
+msgstr "Ievades meto??u pakas starptautisko tekstu ievad????anai."
 
-#: ../comps-f10.xml.in.h:157
+#: ../comps-f10.xml.in.h:114
 #, fuzzy
+msgid "Myanmar (Burmese) Support"
+msgstr "Birmie??u valodas atbalsts"
+
+#: ../comps-f10.xml.in.h:158
 msgid "Tajik Support"
-msgstr "Tajie??u valodas atbalsts"
+msgstr "Tad??iku valodas atbalsts"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1235,17 +1223,19 @@
 #: ../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 "Ar??bu vides r??ku un resursu kolekcija."
+msgstr "???? grupa ir r??ku un resursu kolekcija Ar??bu videi."
 
 #: ../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 ""
+"???? grupa ir r??ku un resursu kolekcija Senebreju videi."
 
 #: ../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 "Jap????u vides r??ku un resursu kolekcija."
+msgstr ""
+"???? grupa ir r??ku un resursu kolekcija Jap????u videi."
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
 msgid "XEmacs"
@@ -1254,7 +1244,8 @@
 #: ../comps-el5.xml.in.h:65
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
-msgstr "??ehu vides r??ku un resursu kolekcija."
+msgstr ""
+"???? grupa ir r??ku un resursu kolekcija ??ehu videi."
 
 #~ msgid "British Support"
 #~ msgstr "Britu ang??u valodas atbalsts"



From awjb at fedoraproject.org  Fri Sep  5 22:21:40 2008
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri,  5 Sep 2008 22:21:40 +0000 (UTC)
Subject: rpms/scribus/devel .cvsignore, 1.16, 1.17 scribus.spec, 1.32,
	1.33 sources, 1.16, 1.17
Message-ID: <20080905222140.88DA770121@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/scribus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23618

Modified Files:
	.cvsignore scribus.spec sources 
Log Message:
- new snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	27 Jul 2008 09:04:46 -0000	1.16
+++ .cvsignore	5 Sep 2008 22:21:10 -0000	1.17
@@ -1 +1 @@
-scribus-svn-12419.tar.bz2
+scribus-svn-12516.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- scribus.spec	27 Jul 2008 09:04:46 -0000	1.32
+++ scribus.spec	5 Sep 2008 22:21:10 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.3.5
-Release:	0.3.12419svn%{?dist}
+Release:	0.4.12516svn%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -161,6 +161,10 @@
  
 
 %changelog
+* Fri Sep 05 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.3.5-0.4.12516svn
+- new svn snapshot
+
 * Sun Jul 27 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.3.5-0.3.12419svn
 - new svn snapshot


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	27 Jul 2008 09:04:46 -0000	1.16
+++ sources	5 Sep 2008 22:21:10 -0000	1.17
@@ -1 +1 @@
-ecd5b92b5d4c59ca2818672714bcd0e7  scribus-svn-12419.tar.bz2
+521c659bee0d94b334180572ab1f9e8d  scribus-svn-12516.tar.bz2



From awjb at fedoraproject.org  Fri Sep  5 22:24:56 2008
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri,  5 Sep 2008 22:24:56 +0000 (UTC)
Subject: rpms/wine/F-8 .cvsignore, 1.62, 1.63 sources, 1.63,
	1.64 wine-desktop-mime.patch, 1.1, 1.2 wine.spec, 1.86, 1.87
Message-ID: <20080905222456.739A570121@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24420/F-8

Modified Files:
	.cvsignore sources wine-desktop-mime.patch wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-8/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore	29 Jul 2008 19:31:55 -0000	1.62
+++ .cvsignore	5 Sep 2008 22:24:26 -0000	1.63
@@ -1 +1 @@
-wine-1.1.2-fe.tar.bz2
+wine-1.1.4-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-8/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	29 Jul 2008 19:31:55 -0000	1.63
+++ sources	5 Sep 2008 22:24:26 -0000	1.64
@@ -1 +1 @@
-0c2bd312ed15b4ff15fef18794803c7e  wine-1.1.2-fe.tar.bz2
+9d1a87a5de2f9e10cb2b7c14ebe25f7f  wine-1.1.4-fe.tar.bz2

wine-desktop-mime.patch:

Index: wine-desktop-mime.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-8/wine-desktop-mime.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-desktop-mime.patch	17 Jun 2008 19:11:16 -0000	1.1
+++ wine-desktop-mime.patch	5 Sep 2008 22:24:26 -0000	1.2
@@ -1,9 +1,9 @@
---- tools/wine.desktop.orig	2008-06-17 11:21:52.000000000 +0200
-+++ tools/wine.desktop	2008-06-17 11:23:16.000000000 +0200
-@@ -8,5 +8,5 @@
- Name[ru]=Wine ???????????????? Windows
- Name[fr]=??mulateur Windows Wine
+--- tools/wine.desktop.orig	2008-07-28 20:36:29.000000000 +0200
++++ tools/wine.desktop	2008-07-28 20:36:43.000000000 +0200
+@@ -16,5 +16,5 @@
+ Name[nb]=Wine Programlaster for Windowsapplikasjoner
+ Name[nn]=Wine Programlaster for Windowsapplikasjoner
  Exec=wine start /unix %f
--MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;application/x-executable;
-+MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;
+-MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;application/x-executable;application/x-msi;
++MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;application/x-msi;
  NoDisplay=true


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-8/wine.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- wine.spec	29 Jul 2008 19:31:55 -0000	1.86
+++ wine.spec	5 Sep 2008 22:24:26 -0000	1.87
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	1.1.2
+Version:	1.1.4
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -45,10 +45,8 @@
 
 # explain how to use wine with pulseaudio
 Source402:      README-FEDORA-PULSEAUDIO
-Patch402:       wine-alsa-pulseaudio.patch
 
 
-Patch0:         wine-prefixfonts.patch
 Patch1:         wine-rpath.patch
 # fix #448338
 Patch2:         wine-desktop-mime.patch
@@ -223,20 +221,18 @@
 
 %prep
 %setup -q -n %{name}-%{version}-fe
-#%patch0
 %patch1
 %patch2
 %patch400
-%patch402 -p1
 
 %build
 # work around gcc bug see #440139
 # this affects more then just dlls/user32/menu.c
-#%if %{?fedora} > 8
-#export CFLAGS="$RPM_OPT_FLAGS -fno-tree-fre -fno-tree-pre"
-#%else
+%if %{?fedora} > 8
+export CFLAGS="$RPM_OPT_FLAGS -fno-tree-fre -fno-tree-pre"
+%else
 export CFLAGS="$RPM_OPT_FLAGS"
-#%endif
+%endif
 
 %configure \
 	--sysconfdir=%{_sysconfdir}/wine --disable-static \
@@ -580,6 +576,7 @@
 %{_libdir}/wine/msi.dll.so
 %{_libdir}/wine/msimtf.dll.so
 %{_libdir}/wine/msimg32.dll.so
+%{_libdir}/wine/msisip.dll.so
 %{_libdir}/wine/msisys.ocx.so
 %{_libdir}/wine/msnet32.dll.so
 %{_libdir}/wine/mssip32.dll.so
@@ -839,6 +836,15 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Fri Sep 05 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.4-1
+- version upgrade
+- drop wine-prefixfonts.patch (#460745)
+
+* Fri Aug 29 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.3-1
+- version upgrade
+
 * Sun Jul 27 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.2-1
 - version upgrade (#455960, #456831)



From awjb at fedoraproject.org  Fri Sep  5 22:24:56 2008
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri,  5 Sep 2008 22:24:56 +0000 (UTC)
Subject: rpms/wine/F-9 .cvsignore, 1.62, 1.63 sources, 1.63,
	1.64 wine-desktop-mime.patch, 1.1, 1.2 wine.spec, 1.88, 1.89
Message-ID: <20080905222456.BD42470121@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24420/F-9

Modified Files:
	.cvsignore sources wine-desktop-mime.patch wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-9/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore	29 Jul 2008 19:31:55 -0000	1.62
+++ .cvsignore	5 Sep 2008 22:24:26 -0000	1.63
@@ -1 +1 @@
-wine-1.1.2-fe.tar.bz2
+wine-1.1.4-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-9/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	29 Jul 2008 19:31:55 -0000	1.63
+++ sources	5 Sep 2008 22:24:26 -0000	1.64
@@ -1 +1 @@
-0c2bd312ed15b4ff15fef18794803c7e  wine-1.1.2-fe.tar.bz2
+9d1a87a5de2f9e10cb2b7c14ebe25f7f  wine-1.1.4-fe.tar.bz2

wine-desktop-mime.patch:

Index: wine-desktop-mime.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-9/wine-desktop-mime.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-desktop-mime.patch	17 Jun 2008 19:11:55 -0000	1.1
+++ wine-desktop-mime.patch	5 Sep 2008 22:24:26 -0000	1.2
@@ -1,9 +1,9 @@
---- tools/wine.desktop.orig	2008-06-17 11:21:52.000000000 +0200
-+++ tools/wine.desktop	2008-06-17 11:23:16.000000000 +0200
-@@ -8,5 +8,5 @@
- Name[ru]=Wine ???????????????? Windows
- Name[fr]=??mulateur Windows Wine
+--- tools/wine.desktop.orig	2008-07-28 20:36:29.000000000 +0200
++++ tools/wine.desktop	2008-07-28 20:36:43.000000000 +0200
+@@ -16,5 +16,5 @@
+ Name[nb]=Wine Programlaster for Windowsapplikasjoner
+ Name[nn]=Wine Programlaster for Windowsapplikasjoner
  Exec=wine start /unix %f
--MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;application/x-executable;
-+MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;
+-MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;application/x-executable;application/x-msi;
++MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;application/x-msi;
  NoDisplay=true


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-9/wine.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- wine.spec	29 Jul 2008 19:31:55 -0000	1.88
+++ wine.spec	5 Sep 2008 22:24:26 -0000	1.89
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	1.1.2
+Version:	1.1.4
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -45,10 +45,8 @@
 
 # explain how to use wine with pulseaudio
 Source402:      README-FEDORA-PULSEAUDIO
-Patch402:       wine-alsa-pulseaudio.patch
 
 
-Patch0:         wine-prefixfonts.patch
 Patch1:         wine-rpath.patch
 # fix #448338
 Patch2:         wine-desktop-mime.patch
@@ -223,20 +221,18 @@
 
 %prep
 %setup -q -n %{name}-%{version}-fe
-#%patch0
 %patch1
 %patch2
 %patch400
-%patch402 -p1
 
 %build
 # work around gcc bug see #440139
 # this affects more then just dlls/user32/menu.c
-#%if %{?fedora} > 8
-#export CFLAGS="$RPM_OPT_FLAGS -fno-tree-fre -fno-tree-pre"
-#%else
+%if %{?fedora} > 8
+export CFLAGS="$RPM_OPT_FLAGS -fno-tree-fre -fno-tree-pre"
+%else
 export CFLAGS="$RPM_OPT_FLAGS"
-#%endif
+%endif
 
 %configure \
 	--sysconfdir=%{_sysconfdir}/wine --disable-static \
@@ -580,6 +576,7 @@
 %{_libdir}/wine/msi.dll.so
 %{_libdir}/wine/msimtf.dll.so
 %{_libdir}/wine/msimg32.dll.so
+%{_libdir}/wine/msisip.dll.so
 %{_libdir}/wine/msisys.ocx.so
 %{_libdir}/wine/msnet32.dll.so
 %{_libdir}/wine/mssip32.dll.so
@@ -839,6 +836,15 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Fri Sep 05 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.4-1
+- version upgrade
+- drop wine-prefixfonts.patch (#460745)
+
+* Fri Aug 29 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.3-1
+- version upgrade
+
 * Sun Jul 27 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.2-1
 - version upgrade (#455960, #456831)



From awjb at fedoraproject.org  Fri Sep  5 22:24:57 2008
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri,  5 Sep 2008 22:24:57 +0000 (UTC)
Subject: rpms/wine/devel .cvsignore, 1.62, 1.63 sources, 1.63, 1.64 wine.spec,
	1.88, 1.89
Message-ID: <20080905222457.1058B70121@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24420/devel

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore	29 Jul 2008 19:31:56 -0000	1.62
+++ .cvsignore	5 Sep 2008 22:24:26 -0000	1.63
@@ -1 +1 @@
-wine-1.1.2-fe.tar.bz2
+wine-1.1.4-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	29 Jul 2008 19:31:56 -0000	1.63
+++ sources	5 Sep 2008 22:24:26 -0000	1.64
@@ -1 +1 @@
-0c2bd312ed15b4ff15fef18794803c7e  wine-1.1.2-fe.tar.bz2
+9d1a87a5de2f9e10cb2b7c14ebe25f7f  wine-1.1.4-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- wine.spec	29 Jul 2008 19:31:56 -0000	1.88
+++ wine.spec	5 Sep 2008 22:24:26 -0000	1.89
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	1.1.2
+Version:	1.1.4
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -45,10 +45,8 @@
 
 # explain how to use wine with pulseaudio
 Source402:      README-FEDORA-PULSEAUDIO
-Patch402:       wine-alsa-pulseaudio.patch
 
 
-Patch0:         wine-prefixfonts.patch
 Patch1:         wine-rpath.patch
 # fix #448338
 Patch2:         wine-desktop-mime.patch
@@ -223,20 +221,18 @@
 
 %prep
 %setup -q -n %{name}-%{version}-fe
-#%patch0
 %patch1
 %patch2
 %patch400
-%patch402 -p1
 
 %build
 # work around gcc bug see #440139
 # this affects more then just dlls/user32/menu.c
-#%if %{?fedora} > 8
-#export CFLAGS="$RPM_OPT_FLAGS -fno-tree-fre -fno-tree-pre"
-#%else
+%if %{?fedora} > 8
+export CFLAGS="$RPM_OPT_FLAGS -fno-tree-fre -fno-tree-pre"
+%else
 export CFLAGS="$RPM_OPT_FLAGS"
-#%endif
+%endif
 
 %configure \
 	--sysconfdir=%{_sysconfdir}/wine --disable-static \
@@ -580,6 +576,7 @@
 %{_libdir}/wine/msi.dll.so
 %{_libdir}/wine/msimtf.dll.so
 %{_libdir}/wine/msimg32.dll.so
+%{_libdir}/wine/msisip.dll.so
 %{_libdir}/wine/msisys.ocx.so
 %{_libdir}/wine/msnet32.dll.so
 %{_libdir}/wine/mssip32.dll.so
@@ -839,6 +836,15 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Fri Sep 05 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.4-1
+- version upgrade
+- drop wine-prefixfonts.patch (#460745)
+
+* Fri Aug 29 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.3-1
+- version upgrade
+
 * Sun Jul 27 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.2-1
 - version upgrade (#455960, #456831)



From ausil at fedoraproject.org  Fri Sep  5 22:27:23 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri,  5 Sep 2008 22:27:23 +0000 (UTC)
Subject: rpms/fedora-release/OLPC-3 fedora-release.spec,1.68,1.69
Message-ID: <20080905222723.AA8A870121@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/fedora-release/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25073

Modified Files:
	fedora-release.spec 
Log Message:
update olpc branch to match fedora's updates 



Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/OLPC-3/fedora-release.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- fedora-release.spec	30 Jun 2008 23:15:49 -0000	1.68
+++ fedora-release.spec	5 Sep 2008 22:26:53 -0000	1.69
@@ -1,18 +1,17 @@
 %define release_name Joyride
 %define dist_version 3
 
-Summary:	OLPC release files
+Summary:	Fedora release files
 Name:		fedora-release
 Version:	9
-Release:	1.1
+Release:	3.1
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://laptop.org
 Source:		%{name}-%{version}.tar.gz
-Obsoletes:	redhat-release
-Provides:	redhat-release
+Provides:	redhat-release = %{version}-%{release}
 Provides:	system-release = %{version}-%{release}
-Requires:	fedora-release-notes >= 8
+#Requires:	fedora-release-notes >= 9
 # We require release notes to make sure that they don't get dropped during
 # upgrades, and just because we always want the release notes available
 # instead of explicitly asked for
@@ -31,20 +30,31 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc
-echo "OLPC release %{version} (%{release_name})" > $RPM_BUILD_ROOT/etc/olpc-release
+echo "8.2" > $RPM_BUILD_ROOT/etc/olpc-release
+echo "OLPC release %{version} (%{release_name})" > $RPM_BUILD_ROOT/etc/fedora-release
 echo "cpe://o:olpc_project:olpc:%{version}" > $RPM_BUILD_ROOT/etc/system-release-cpe
-cp -p $RPM_BUILD_ROOT/etc/olpc-release $RPM_BUILD_ROOT/etc/issue
+cp -p $RPM_BUILD_ROOT/etc/fedora-release $RPM_BUILD_ROOT/etc/issue
 echo "Kernel \r on an \m (\l)" >> $RPM_BUILD_ROOT/etc/issue
 cp -p $RPM_BUILD_ROOT/etc/issue $RPM_BUILD_ROOT/etc/issue.net
 echo >> $RPM_BUILD_ROOT/etc/issue
-ln -s olpc-release $RPM_BUILD_ROOT/etc/fedora-release
-ln -s olpc-release $RPM_BUILD_ROOT/etc/redhat-release
-ln -s olpc-release $RPM_BUILD_ROOT/etc/system-release
+ln -s fedora-release $RPM_BUILD_ROOT/etc/redhat-release
+ln -s fedora-release $RPM_BUILD_ROOT/etc/system-release
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
-for file in RPM-GPG-KEY* ; do
-	install -m 644 $file $RPM_BUILD_ROOT/etc/pki/rpm-gpg
+
+install -m 644 RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
+
+# Install all the keys, link the primary keys to primary arch files
+# and to compat generic location
+pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
+for arch in i386 x86_64 ppc ppc64
+  do
+  ln -s RPM-GPG-KEY-fedora-primary RPM-GPG-KEY-fedora-$arch
+  ln -s RPM-GPG-KEY-fedora-test-primary RPM-GPG-KEY-fedora-test-$arch
 done
+ln -s RPM-GPG-KEY-fedora-primary RPM-GPG-KEY-fedora
+ln -s RPM-GPG-KEY-fedora-test-primary RPM-GPG-KEY-fedora-test
+popd
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
 for file in fedora*repo ; do
@@ -74,10 +84,10 @@
 %defattr(-,root,root,-)
 %doc GPL 
 %config %attr(0644,root,root) /etc/olpc-release
-/etc/fedora-release
+%config %attr(0644,root,root) /etc/fedora-release
 /etc/redhat-release
 /etc/system-release
-/etc/system-release-cpe
+%config %attr(0644,root,root) /etc/system-release-cpe
 %dir /etc/yum.repos.d
 %config(noreplace) /etc/yum.repos.d/*
 %config(noreplace) %attr(0644,root,root) /etc/issue
@@ -89,11 +99,23 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
-* Mon Jun 30 2008 Dennis Gilmore <dennis at laptop.org> - 9-1.1
-- update releasever to 9
+* Fri Sep 05 2008 C. Scott Ananian <cscott at laptop.org> - 9-3.1
+- OLPC-local changes.
+
+* Wed Jun 25 2008 Jesse Keating <jkeating at redhat.com> - 9-3
+- Add ia64 key
+- Fix config file markings
+- Stop using download.fedora.redhat.com in favor of download.fedoraproject.org
+- Reference GPG keys by arch
+
+* Tue May 06 2008 Jesse Keating <jkeating at redhat.com> - 9-2
+- Update compose files with changes needed during release candidates
+
+* Thu May 01 2008 Jesse Keating <jkeating at redhat.com> - 9-1
+- Make the final package, set the release name.
 
-* Mon Apr 14 2008 Dennis Gilmore <dennis at laptop.org> - 8.93-2
-- setup for olpc
+* Tue Apr 22 2008 Jesse Keating <jkeating at redhat.com> - 9-0.1.rc
+- Make version 9 for yum, rpm version clearly a pre-release.
 
 * Fri Apr 11 2008 Jesse Keating <jkeating at redhat.com> - 8.93-1
 - Update for preview release



From jakub at fedoraproject.org  Fri Sep  5 22:45:59 2008
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri,  5 Sep 2008 22:45:59 +0000 (UTC)
Subject: rpms/gcc/devel gcc43-altivec-tests.patch,1.1,1.2
Message-ID: <20080905224559.14AFA70121@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28466

Modified Files:
	gcc43-altivec-tests.patch 
Log Message:
4.3.2-3

gcc43-altivec-tests.patch:

Index: gcc43-altivec-tests.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc43-altivec-tests.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc43-altivec-tests.patch	5 Sep 2008 22:15:57 -0000	1.1
+++ gcc43-altivec-tests.patch	5 Sep 2008 22:45:28 -0000	1.2
@@ -37,6 +37,6 @@
 @@ -1,4 +1,4 @@
 -/* { dg-do run { target { powerpc*-*-* && powerpc_altivec_ok } } }} */
 +/* { dg-do run { target { powerpc*-*-* && vmx_hw } } }} */
- /* { dg-options "-O2 -funroll-loops -ffast-math -fvariable-expansion-in-unroller -maltivec -fdump-rtl-loop2" } */
+ /* { dg-options "-O2 -funroll-loops -ffast-math -fvariable-expansion-in-unroller -maltivec -dL" } */
  
  #include "altivec.h"



From orion at fedoraproject.org  Fri Sep  5 23:05:30 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri,  5 Sep 2008 23:05:30 +0000 (UTC)
Subject: rpms/plplot/devel .cvsignore, 1.12, 1.13 plplot.spec, 1.56,
	1.57 sources, 1.12, 1.13
Message-ID: <20080905230530.13B0070121@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31433

Modified Files:
	.cvsignore plplot.spec sources 
Log Message:
* Fri Sep 5 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.9.0-2.svn8752
- Update to svn revision 8752
- Add new gnome-python2 BRs
- Update build_doc BRs
- Add ocaml sub-package for OCaml interface
- Enable "D" interface.
- Re-enable psttfc test, disable perl and compare tests



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	11 Feb 2008 03:08:11 -0000	1.12
+++ .cvsignore	5 Sep 2008 23:04:59 -0000	1.13
@@ -1 +1,2 @@
 plplot-5.9.0.tar.gz
+plplot-5.9.0-svn8752.patch


Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- plplot.spec	4 Mar 2008 19:59:26 -0000	1.56
+++ plplot.spec	5 Sep 2008 23:04:59 -0000	1.57
@@ -1,17 +1,18 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?octave_api: %define octave_api %(octave-config -p API_VERSION || echo 0)}
-%{!?build_doc:%define build_doc 0}
+%{!?build_doc:%define build_doc 1}
 %{!?with_octave:%define with_octave 1}
 
 Name:           plplot
 Version:        5.9.0
-Release:        1%{?dist}
+Release:        2.svn8752%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
 License:        LGPLv2+
 URL:            http://plplot.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
+Patch0:         plplot-5.9.0-svn8752.patch
 Patch1:         plplot-5.8.0-multiarch.patch
 Patch2:         plplot-5.7.4-info.patch
 Patch6:         plplot-5.7.3-jni.patch
@@ -39,6 +40,7 @@
 BuildRequires:  itcl-devel, itk-devel
 BuildRequires:  python-devel, pygtk2-devel, numpy
 BuildRequires:  libgnomeui-devel, libgnomeprintui22-devel, gnome-python2-devel
+BuildRequires:  gnome-python2-canvas, gnome-python2-gnome
 BuildRequires:  perl(XML::DOM), lasi-devel, wxGTK-devel, agg-devel
 BuildRequires:  freefont
 BuildRequires:  perl(PDL::Graphics::PLplot)
@@ -46,8 +48,9 @@
 BuildRequires:  svgalib-devel
 %endif
 %if %{build_doc}
-BuildRequires:  docbook2X
+BuildRequires:  texlive, texinfo, openjade, jadetex, docbook2X, docbook-style-dsssl
 %endif
+BuildRequires:  ocaml, ocaml-findlib, ocaml-camlidl-devel
 Requires(post): /sbin/ldconfig
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -162,6 +165,26 @@
 %{summary}.
 
 
+%package        ocaml
+Summary:        Functions for scientific plotting with OCaml
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Provides:       ocaml-plplot = %{version}-%{release}
+
+%description    ocaml
+%{summary}.
+
+
+%package        ocaml-devel
+Summary:        Development files for PLplot OCaml
+Group:          Development/Libraries
+Requires:       %{name}-ocaml = %{version}-%{release}
+Provides:       ocaml-plplot-devel = %{version}-%{release}
+
+%description    ocaml-devel
+%{summary}.
+
+
 %if %{with_octave}
 %package        octave
 Summary:        Functions for scientific plotting with Octave
@@ -225,6 +248,9 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .svn
+#Needed because of svn patch
+chmod +x plplot_test/*.sh* examples/tcl/x??
 %patch1 -p1 -b .multiarch
 %patch2 -p1 -b .orig
 %patch6 -p1 -b .jni
@@ -240,6 +266,9 @@
 unset TERM
 %cmake .. \
 	%{build_ada} \
+	-DENABLE_d:BOOL=ON \
+	-DENABLE_ocaml:BOOL=ON \
+	-DOCAML_INSTALL_DIR:PATH=`ocamlc -where` \
 	%{build_octave} \
 	-DENABLE_pdl:BOOL=ON \
 	-DHAVE_PTHREAD:BOOL=ON \
@@ -264,11 +293,14 @@
 	-DPLD_xterm:BOOL=ON \
 	-DPLD_wxwidgets:BOOL=ON \
 %if %{build_doc}
+	-DXML_DECL:FILEPATH=/usr/share/sgml/xml.dcl \
 	-DBUILD_DOC:BOOL=ON \
 %else
 	-DPREBUILT_DOC:BOOL=ON \
 %endif
 	-DBUILD_TEST:BOOL=ON
+# --debug-output --debug-trycompile \
+#
 make %{?_smp_flags} VERBOSE=1
 
 
@@ -276,7 +308,7 @@
 rm -rf $RPM_BUILD_ROOT
 cd fedora
 make install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT/%{_docdir}/plplot $RPM_BUILD_ROOT/%{_docdir}/plplot-%{version}
+mv $RPM_BUILD_ROOT%{_docdir}/plplot $RPM_BUILD_ROOT%{_docdir}/plplot-%{version}
 
 # Fix up tclIndex files so they are the same on all builds
 for file in $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/*/tclIndex
@@ -291,8 +323,12 @@
 cd fedora
 #Hack
 export ITCL_LIBRARY=%{_libdir}/tcl8.5/itcl3.4
-# Exclude psttfc test for now
-ctest -V -E psttfc
+# Exclude perl and compare tests for now, and ocaml from ppc64
+%ifarch ppc64
+ctest -V -E 'compare|ocaml|perl'
+%else
+ctest -V -E 'compare|perl'
+%endif
 
 
 %clean
@@ -336,6 +372,37 @@
 %{_bindir}/plpr
 %{_bindir}/pltek
 %{_bindir}/pstex2eps
+%{python_sitearch}/_plplotcmodule.so
+%{python_sitearch}/plplot.py*
+%{python_sitearch}/plplot_widgetmodule.so
+%{python_sitearch}/plplotc.py*
+%{python_sitearch}/plplotcanvas.py*
+%{_infodir}/plplotdoc.info*
+%{_mandir}/man1/plm2gif.1.gz
+%{_mandir}/man1/plpr.1.gz
+%{_mandir}/man1/pltek.1.gz
+%{_mandir}/man1/pstex2eps.1.gz
+%dir %{_datadir}/plplot%{version}
+%{_datadir}/plplot%{version}/*.map
+%{_datadir}/plplot%{version}/*.fnt
+%{_datadir}/plplot%{version}/pkgIndex.tcl
+%{_datadir}/plplot%{version}/tcl/
+%dir %{_datadir}/plplot%{version}/examples
+%{_datadir}/plplot%{version}/examples/python/
+%{_datadir}/plplot%{version}/examples/test_python.sh
+%{_datadir}/plplot%{version}/examples/test_tcl.sh
+%{_datadir}/plplot%{version}/examples/plplot-test.sh
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libcsirocsa.so.*
+%{_libdir}/libcsironn.so.*
+%{_libdir}/libplplotcxxd.so.*
+%{_libdir}/libplplotd.so.*
+%{_libdir}/libplplotf77cd.so.*
+%{_libdir}/libplplotf77d.so.*
+%{_libdir}/libplplotf95cd.so.*
+%{_libdir}/libplplotf95d.so.*
 %dir %{_libdir}/plplot%{version}
 %dir %{_libdir}/plplot%{version}/driversd
 %{_libdir}/plplot%{version}/driversd/cairo.rc
@@ -378,37 +445,6 @@
 %{_libdir}/plplot%{version}/driversd/xfig.so
 %{_libdir}/plplot%{version}/driversd/xwin.rc
 %{_libdir}/plplot%{version}/driversd/xwin.so
-%{python_sitearch}/_plplotcmodule.so
-%{python_sitearch}/plplot.py*
-%{python_sitearch}/plplot_widgetmodule.so
-%{python_sitearch}/plplotc.py*
-%{python_sitearch}/plplotcanvas.py*
-%{_infodir}/plplotdoc.info*
-%{_mandir}/man1/plm2gif.1.gz
-%{_mandir}/man1/plpr.1.gz
-%{_mandir}/man1/pltek.1.gz
-%{_mandir}/man1/pstex2eps.1.gz
-%dir %{_datadir}/plplot%{version}
-%{_datadir}/plplot%{version}/*.map
-%{_datadir}/plplot%{version}/*.fnt
-%{_datadir}/plplot%{version}/pkgIndex.tcl
-%{_datadir}/plplot%{version}/tcl/
-%dir %{_datadir}/plplot%{version}/examples
-%{_datadir}/plplot%{version}/examples/python/
-%{_datadir}/plplot%{version}/examples/test_python.sh
-%{_datadir}/plplot%{version}/examples/test_tcl.sh
-%{_datadir}/plplot%{version}/examples/plplot-test.sh
-
-%files libs
-%defattr(-,root,root,-)
-%{_libdir}/libcsirocsa.so.*
-%{_libdir}/libcsironn.so.*
-%{_libdir}/libplplotcxxd.so.*
-%{_libdir}/libplplotd.so.*
-%{_libdir}/libplplotf77cd.so.*
-%{_libdir}/libplplotf77d.so.*
-%{_libdir}/libplplotf95cd.so.*
-%{_libdir}/libplplotf95d.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -430,11 +466,13 @@
 %{_datadir}/plplot%{version}/examples/lena.pgm
 %{_datadir}/plplot%{version}/examples/c/
 %{_datadir}/plplot%{version}/examples/c++/
+%{_datadir}/plplot%{version}/examples/d/
 %{_datadir}/plplot%{version}/examples/f77/
 %{_datadir}/plplot%{version}/examples/f95/
 %{_datadir}/plplot%{version}/examples/Makefile
 %{_datadir}/plplot%{version}/examples/test_c.sh
 %{_datadir}/plplot%{version}/examples/test_cxx.sh
+%{_datadir}/plplot%{version}/examples/test_diff.sh
 %{_datadir}/plplot%{version}/examples/test_f77.sh
 %{_datadir}/plplot%{version}/examples/test_f95.sh
 %{_mandir}/man3/pl*.3*
@@ -481,6 +519,22 @@
 %{_datadir}/plplot%{version}/examples/java/
 %{_datadir}/plplot%{version}/examples/test_java.sh
 
+%files ocaml
+%defattr(-,root,root,-)
+%dir %{_libdir}/ocaml/plplot/
+%{_libdir}/ocaml/plplot/META
+%{_libdir}/ocaml/plplot/*.cma
+%{_libdir}/ocaml/plplot/*.cmi
+%{_libdir}/ocaml/stublibs/*
+%{_datadir}/plplot%{version}/examples/ocaml/
+%{_datadir}/plplot%{version}/examples/test_ocaml.sh
+
+%files ocaml-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/plplotd-ocaml.pc
+%{_libdir}/ocaml/plplot/*.a
+%{_libdir}/ocaml/plplot/*.cmxa
+
 %if %{with_octave}
 %files octave
 %defattr(-,root,root,-)
@@ -530,6 +584,14 @@
 
 
 %changelog
+* Fri Sep 5 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.9.0-2.svn8752
+- Update to svn revision 8752
+- Add new gnome-python2 BRs
+- Update build_doc BRs
+- Add ocaml sub-package for OCaml interface
+- Enable "D" interface.
+- Re-enable psttfc test, disable perl and compare tests
+
 * Wed Feb 27 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.9.0-1
 - Update to 5.9.0
 - Re-enable smp builds


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	11 Feb 2008 03:08:12 -0000	1.12
+++ sources	5 Sep 2008 23:04:59 -0000	1.13
@@ -1 +1,2 @@
 bfaeba7a5f1ef83edc3787af04694539  plplot-5.9.0.tar.gz
+bb9c3727abd620637056fa6565547558  plplot-5.9.0-svn8752.patch



From rrankin at fedoraproject.org  Fri Sep  5 23:35:23 2008
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Fri,  5 Sep 2008 23:35:23 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.88,1.89
Message-ID: <20080905233524.09E7470121@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3497

Modified Files:
	comps-f10.xml.in 
Log Message:
Add denemo



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- comps-f10.xml.in	5 Sep 2008 19:19:38 -0000	1.88
+++ comps-f10.xml.in	5 Sep 2008 23:34:52 -0000	1.89
@@ -3798,6 +3798,7 @@
       <packagereq type="optional">cdrskin</packagereq>
       <packagereq type="optional">cowbell</packagereq>
       <packagereq type="optional">csound-gui</packagereq>
+      <packagereq type="optional">denemo</packagereq>
       <packagereq type="optional">dvdauthor</packagereq>
       <packagereq type="optional">dvdisaster</packagereq>
       <packagereq type="optional">dvgrab</packagereq>



From mclasen at fedoraproject.org  Sat Sep  6 00:08:53 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  6 Sep 2008 00:08:53 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel keyboard-layout-variants.patch,
	NONE, 1.1 gnome-settings-daemon.spec, 1.52, 1.53
Message-ID: <20080906000853.26AC870127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9310

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	keyboard-layout-variants.patch 
Log Message:
try harder to keep gdms keyboard layout


keyboard-layout-variants.patch:

--- NEW FILE keyboard-layout-variants.patch ---
--- gnome-settings-daemon-2.23.91/plugins/keyboard/gsd-keyboard-xkb.c	2008-09-05 18:49:58.000000000 -0400
+++ hacked/plugins/keyboard/gsd-keyboard-xkb.c	2008-09-05 18:48:11.000000000 -0400
@@ -172,7 +172,9 @@
                          GSList *l;
                          int i;
                          for (i = 0, l = current_kbd_config.layouts_variants; l; i++, l = l->next) {
-                                 if (strcmp (gdm_keyboard_layout, l->data) == 0) {
+                                 char *lv = l->data;
+                                 size_t len = strlen (gdm_keyboard_layout);
+                                 if (strncmp (lv, gdm_keyboard_layout, len) == 0 && (lv[len] == '\0' || lv[len] == '\t')) {
                                         xkl_engine_lock_group (current_config.engine, i);
                                         break;
                                  }


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gnome-settings-daemon.spec	4 Sep 2008 19:36:21 -0000	1.52
+++ gnome-settings-daemon.spec	6 Sep 2008 00:08:22 -0000	1.53
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.23.91
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -34,6 +34,8 @@
 Patch2:         gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
 Patch6:		gnome-settings-daemon-2.23.4-drop-sample-cache.patch
 Patch7:		gnome-settings-daemon-2.23.91-fnf7-cycle.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=551062 
+Patch11:	keyboard-layout-variants.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -56,6 +58,7 @@
 %patch2 -p1 -b .ignore-layout-if-using-evdev
 %patch6 -p1 -b .drop-sample-cache
 %patch7 -p1 -b .fnf7-cycle
+%patch11 -p1 -b .keyboard-layout-variants
 
 %build
 aclocal
@@ -155,6 +158,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Fri Sep  5 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-5
+- Try harder to use the keyboard layout that gdm tells us
+
 * Tue Sep 04 2008 Soren Sandmann <sandmann at redhat.com> - 2.23.91-4
 - Use the fn-F7 key, not the F7 key.
 



From bpepple at fedoraproject.org  Sat Sep  6 00:21:37 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat,  6 Sep 2008 00:21:37 +0000 (UTC)
Subject: rpms/brutus-keyring/devel .cvsignore, 1.2, 1.3 brutus-keyring.spec, 
	1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20080906002137.5681E70125@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/brutus-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13157

Modified Files:
	.cvsignore brutus-keyring.spec sources 
Log Message:
* Fri Sep  5 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.9.30-1
* Update to 0.9.30.
- Update license tag.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/brutus-keyring/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jul 2007 15:31:34 -0000	1.2
+++ .cvsignore	6 Sep 2008 00:21:06 -0000	1.3
@@ -1 +1 @@
-brutus-keyring-0.9.0.tar.gz
+brutus-keyring-0.9.30.tar.gz


Index: brutus-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brutus-keyring/devel/brutus-keyring.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- brutus-keyring.spec	18 Feb 2008 21:28:31 -0000	1.4
+++ brutus-keyring.spec	6 Sep 2008 00:21:06 -0000	1.5
@@ -1,12 +1,12 @@
 Name:            brutus-keyring
-Version:         0.9.0
-Release:         7%{?dist}
+Version:         0.9.30
+Release:         1%{?dist}
 Summary:         Small keyring daemon
 
-License:         GPLv2+
+License:         GPLv3+
 Group:           Applications/System
 URL:             http://trac.brutus.net/brutus-keyring/
-Source0:         http://www.omesc.com/sites/default/files/downloads/dist/%{name}/Fedora%207/SOURCES/%{name}-%{version}.tar.gz
+Source0:         http://www.omesc.com/sites/default/files/downloads/dist/%{name}/Rawhide/SOURCES/%{name}-%{version}.tar.gz
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:   ORBit2-devel >= 2.14.1
@@ -71,10 +71,10 @@
 rm -rf %{buildroot}
 
 
-%post devel -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
 
-%postun devel -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
 %files
@@ -82,16 +82,20 @@
 %doc COPYING README AUTHORS ChangeLog docs/brutus-keyring-guide
 %{_bindir}/brutus-keyringd
 %{_bindir}/%{name}-client
+%{_libdir}/libBrutusKeyringd*
 
 %files devel
 %defattr(-,root,root,-)
 %doc docs/brutus-keyring-devel-guide
-%{_includedir}/%{name}-1.0/*
-%{_libdir}/libBrutusKeyringd*
+%{_includedir}/%{name}-1.0/
 %{_libdir}/pkgconfig/libBrutusKeyringd*
 %{_datadir}/idl/%{name}/
 
 %changelog
+* Fri Sep  5 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.9.30-1
+* Update to 0.9.30.
+- Update license tag.
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.0-7
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/brutus-keyring/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jul 2007 15:31:34 -0000	1.2
+++ sources	6 Sep 2008 00:21:06 -0000	1.3
@@ -1 +1 @@
-f732941468746d414fd5cd6333a75b18  brutus-keyring-0.9.0.tar.gz
+7db957f018ada20d83e145d394616f85  brutus-keyring-0.9.30.tar.gz



From cwickert at fedoraproject.org  Sat Sep  6 01:00:13 2008
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  6 Sep 2008 01:00:13 +0000 (UTC)
Subject: rpms/xfce4-battery-plugin/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20080906010013.7377E70125@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-battery-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19954

Modified Files:
	.cvsignore sources 
Log Message:
upload new source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-battery-plugin/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Jan 2007 10:59:35 -0000	1.5
+++ .cvsignore	6 Sep 2008 00:59:41 -0000	1.6
@@ -1 +1 @@
-xfce4-battery-plugin-0.5.0.tar.bz2
+xfce4-battery-plugin-0.5.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-battery-plugin/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Jan 2007 10:59:35 -0000	1.5
+++ sources	6 Sep 2008 00:59:41 -0000	1.6
@@ -1 +1 @@
-c1d923bb90b79087ca7044bcc24bab5a  xfce4-battery-plugin-0.5.0.tar.bz2
+d8a666d85bb3c1dd007b547de4dd7037  xfce4-battery-plugin-0.5.1.tar.bz2



From mclasen at fedoraproject.org  Sat Sep  6 01:25:13 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  6 Sep 2008 01:25:13 +0000 (UTC)
Subject: rpms/xdg-user-dirs-gtk/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xdg-user-dirs-gtk.spec, 1.10, 1.11 kde.patch, 1.2,
	NONE specialcase-en.patch, 1.1, NONE
Message-ID: <20080906012513.DB0C270125@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/xdg-user-dirs-gtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23823

Modified Files:
	.cvsignore sources xdg-user-dirs-gtk.spec 
Removed Files:
	kde.patch specialcase-en.patch 
Log Message:
0.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xdg-user-dirs-gtk/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Feb 2008 14:04:43 -0000	1.7
+++ .cvsignore	6 Sep 2008 01:24:42 -0000	1.8
@@ -1 +1 @@
-xdg-user-dirs-gtk-0.7.tar.bz2
+xdg-user-dirs-gtk-0.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xdg-user-dirs-gtk/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Feb 2008 14:04:43 -0000	1.7
+++ sources	6 Sep 2008 01:24:43 -0000	1.8
@@ -1 +1 @@
-dcd034be77af257fa3d89178f12598a4  xdg-user-dirs-gtk-0.7.tar.bz2
+9f860d836234938c6f54e6e4248a8594  xdg-user-dirs-gtk-0.8.tar.bz2


Index: xdg-user-dirs-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-user-dirs-gtk/devel/xdg-user-dirs-gtk.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xdg-user-dirs-gtk.spec	12 Aug 2008 14:03:55 -0000	1.10
+++ xdg-user-dirs-gtk.spec	6 Sep 2008 01:24:43 -0000	1.11
@@ -1,16 +1,12 @@
 Name:		xdg-user-dirs-gtk
-Version:	0.7
-Release:	2%{?dist}
+Version:	0.8
+Release:	1%{?dist}
 Summary:	Gnome integration of special directories
 
 Group:		User Interface/Desktops
 License:	GPL+
 URL:		http://freedesktop.org/wiki/Software/xdg-user-dirs
 Source0:	http://download.gnome.org/sources/xdg-user-dirs-gtk/%{version}/%{name}-%{version}.tar.bz2
-Patch0:         kde.patch
-# Where is these patches, not in cvs? /Alex
-#Patch2:		polish.patch
-#Patch3:		content-hint.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gettext, gtk2-devel, pkgconfig, perl-XML-Parser, xdg-user-dirs
@@ -23,9 +19,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .kde
-#%patch2 -p1 -b .polish
-#%patch3 -p1 -b .content-hint
 
 %build
 %configure
@@ -48,6 +41,9 @@
 %config(noreplace) %{_sysconfdir}/xdg/autostart/user-dirs-update-gtk.desktop
 
 %changelog
+* Fri Sep  5 2008 Matthias Clasen  <mclasen at redhat.com> - 0.8-1
+- Update to 0.8
+ 
 * Tue Aug 12 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7-2
 - Fix license tag.
 


--- kde.patch DELETED ---


--- specialcase-en.patch DELETED ---



From salimma at fedoraproject.org  Sat Sep  6 01:48:15 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat,  6 Sep 2008 01:48:15 +0000 (UTC)
Subject: rpms/qsynth/devel .cvsignore, 1.2, 1.3 qsynth.spec, 1.5, 1.6 sources,
	1.2, 1.3 qsynth.desktop, 1.1, NONE
Message-ID: <20080906014815.6456E70125@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/qsynth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27528

Modified Files:
	.cvsignore qsynth.spec sources 
Removed Files:
	qsynth.desktop 
Log Message:
* Fri Sep  5 2008 Michel Salim <salimma at fedoraproject.org> - 0.3.3-1
- Update to 0.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Jul 2006 22:14:13 -0000	1.2
+++ .cvsignore	6 Sep 2008 01:47:44 -0000	1.3
@@ -1 +1 @@
-qsynth-0.2.5.tar.gz
+qsynth-0.3.3.tar.gz


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/devel/qsynth.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qsynth.spec	3 Sep 2008 19:34:21 -0000	1.5
+++ qsynth.spec	6 Sep 2008 01:47:45 -0000	1.6
@@ -2,11 +2,13 @@
 
 Summary: Qt based Fluidsynth GUI front end
 Name: qsynth
-Version: 0.2.5
-Release: 8%{?dist}
+Version: 0.3.3
+Release: 1%{?dist}
 URL: http://qsynth.sourceforge.net
-Source0: http://dl.sf.net/sourceforge/qsynth/qsynth-%{version}.tar.gz
-Source1: qsynth.desktop
+Source0: http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
+#Source1: qsynth.desktop
+# Fedora qt4 binaries have -qt4 suffix
+Patch0:	 qsynth-0.3.3-qt4.patch
 License: GPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -16,7 +18,7 @@
 
 %description
 QSynth is a fluidsynth GUI front-end application written in C++ around
-the Qt3 toolkit using Qt Designer. Eventually it may evolve into a
+the Qt4 toolkit using Qt Designer. Eventually it may evolve into a
 softsynth management application allowing the user to control and
 manage a variety of command line softsynth but for the moment it wraps
 the excellent FluidSynth. FluidSynth is a command line software
@@ -24,6 +26,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .qt4
 
 %build
 %configure
@@ -33,43 +36,34 @@
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 
-# move icon to the proper freedesktop location
-%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
-%{__mv} %{buildroot}%{_datadir}/icons/qsynth.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
-
 # desktop file categories
-BASE="X-Fedora Application AudioVideo"
-XTRA="X-Jack X-Synthesis"
+#BASE="X-Fedora Application AudioVideo"
+#XTRA="X-Jack X-Synthesis"
 
 %{__mkdir} -p %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor %{desktop_vendor} \
+  --delete-original		     
   --dir %{buildroot}%{_datadir}/applications    \
-  `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
-  %{SOURCE1}
+  %{buildroot}%{_datadir}/applications/qsynth.desktop
+
 
 %clean
 %{__rm} -rf %{buildroot}
 
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/qsynth
-%{_datadir}/icons/hicolor/32x32/apps/qsynth.png
+%{_datadir}/pixmaps/qsynth.png
+%{_datadir}/locale/qsynth_*.qm
 %{_datadir}/applications/%{desktop_vendor}-qsynth.desktop
 
+
 %changelog
+* Fri Sep  5 2008 Michel Salim <salimma at fedoraproject.org> - 0.3.3-1
+- Update to 0.3.3
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.5-8
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Jul 2006 22:14:13 -0000	1.2
+++ sources	6 Sep 2008 01:47:45 -0000	1.3
@@ -1 +1 @@
-24a1ce00876a79a409fa28d0e8b3221f  qsynth-0.2.5.tar.gz
+648c49d8935814be03f4001f42b169cf  qsynth-0.3.3.tar.gz


--- qsynth.desktop DELETED ---



From amdunn at fedoraproject.org  Sat Sep  6 01:57:20 2008
From: amdunn at fedoraproject.org (Alan Dunn)
Date: Sat,  6 Sep 2008 01:57:20 +0000 (UTC)
Subject: rpms/alt-ergo/devel README.alt-ergo, NONE, 1.1 alt-ergo.spec, NONE, 
	1.1 import.log, NONE, 1.1 swap0_why.why, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080906015720.AB6CA70125@cvs1.fedora.phx.redhat.com>

Author: amdunn

Update of /cvs/pkgs/rpms/alt-ergo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29283/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.alt-ergo alt-ergo.spec import.log swap0_why.why 
Log Message:
Initial commit for devel branch.



--- NEW FILE README.alt-ergo ---
Fedora alt-ergo package:

Contains the main program alt-ergo.

Consider visiting the main Alt-Ergo site - http://alt-ergo.lri.fr -
for more documentation as it becomes available and a number of
examples of usage. Any current documentation (save the man page) is
generated by the package maintainer.

--- NEW FILE alt-ergo.spec ---
# rpmlint "no-binary" error is not really an error - see:
# https://www.redhat.com/archives/fedora-packaging/2008-August/msg00017.html
# and ocaml-ocamlgraph spec file for a discussion of this issue.

# The following are necessary for alt-ergo to depend on the correct
# version of ocaml-ocamlgraph

%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%define debug_package %{nil}
%define _use_internal_dependency_generator 0
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh

Name:		alt-ergo
Version:	0.8
Release:	3%{?dist}
Summary:	Alt-Ergo automatic theorem prover

# Note: rpmlint invalid-license warning is incorrect - I had the
# CeCILL-C license reviewed by Fedora legal, and it is now present on
# http://fedoraproject.org/wiki/Licensing

Group:		Applications/Engineering
License:	CeCILL-C
URL:		http://alt-ergo.lri.fr
Source0:	http://alt-ergo.lri.fr/http/alt-ergo-0.8.tar.gz
Source1:	swap0_why.why
Source2:	README.alt-ergo
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	ocaml, ocaml-ocamlgraph-devel, prelink

%if 0%{?fedora} < 9
# There's no ocaml for ppc64 in Fedora <= 8
# bz# (will be changed when exists as a module):
ExcludeArch: ppc64
%endif

%description

Alt-Ergo is an automated theorem prover implemented in OCaml. It is
based on CC(X) - a congruence closure algorithm parameterized by an
equational theory X. This algorithm is reminiscent of the Shostak
algorithm. Currently CC(X) is instantiated by the theory of linear
arithmetics. Alt-Ergo also contains a home made SAT-solver and an
instantiation mechanism by which it fully supports quantifiers.

%prep
%setup -q

cp -p %{SOURCE1} %{SOURCE2} .

%build
# Avoid a Makefile patch by just adding this empty file, and thus autoconf
# doesn't complain (better than ignoring all status from configure)
touch version.sh.in
./configure --prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_datadir} --mandir=%{_mandir}

%if ! %{opt}
%define opt_option OCAMLBEST=byte OCAMLC=ocamlc OCAMLLEX=ocamllex
%else
%define opt_option OCAMLBEST=opt OCAMLOPT=ocamlopt.opt
%endif

make %{opt_option}

mv CeCILL-C CeCILL-C.iso8859
iconv -f ISO-8859-1 -t UTF-8 < CeCILL-C.iso8859 > CeCILL-C
rm CeCILL-C.iso8859

%if %{opt}
strip ./alt-ergo.opt
execstack -c ./alt-ergo.opt
%endif

# Test alt-ergo on fairly trivial why file - generated from why example swap0.mlw w/why v2.14
%check
%if %opt
%define altergo ./alt-ergo.opt
%else
%define altergo ./alt-ergo.byte
%endif
%{altergo} swap0_why.why

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_bindir}
make %{opt_option} BINDIR=%{buildroot}%{_bindir} LIBDIR=%{buildroot}%{_datadir} MANDIR=%{buildroot}%{_mandir} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_datadir}/%{name}
%{_mandir}/man1/alt-ergo.1.gz
%doc README.alt-ergo COPYING CeCILL-C CHANGES

%changelog
* Fri Sep 05 2008 Alan Dunn <amdunn at gmail.com> 0.8-3
- Fixed BuildRequires to add prelink (for execstack).
* Tue Aug 26 2008 Alan Dunn <amdunn at gmail.com> 0.8-2
- Fixed BuildRequires to add ocaml-ocamlgraph-devel instead of
  ocaml-ocamlgraph, made other minor changes.
* Mon Aug 25 2008 Alan Dunn <amdunn at gmail.com> 0.8-1
- Initial Fedora RPM version.


--- NEW FILE import.log ---
alt-ergo-0_8-3_fc9:HEAD:alt-ergo-0.8-3.fc9.src.rpm:1220665880


--- NEW FILE swap0_why.why ---
logic eq_unit : unit, unit -> prop

logic neq_unit : unit, unit -> prop

logic eq_bool : bool, bool -> prop

logic neq_bool : bool, bool -> prop

logic bool_and : bool, bool -> bool

logic bool_or : bool, bool -> bool

logic bool_xor : bool, bool -> bool

logic bool_not : bool -> bool

axiom bool_and_def:
  (forall a:bool.
    (forall b:bool.
      ((bool_and(a, b) = true) <-> ((a = true) and (b = true)))))

axiom bool_or_def:
  (forall a:bool.
    (forall b:bool. ((bool_or(a, b) = true) <-> ((a = true) or (b = true)))))

axiom bool_xor_def:
  (forall a:bool. (forall b:bool. ((bool_xor(a, b) = true) <-> (a <> b))))

axiom bool_not_def: (forall a:bool. ((bool_not(a) = true) <-> (a = false)))

logic ite : bool, 'a1, 'a1 -> 'a1

axiom ite_true: (forall x:'a1. (forall y:'a1. (ite(true, x, y) = x)))

axiom ite_false: (forall x:'a1. (forall y:'a1. (ite(false, x, y) = y)))

logic add_int : int, int -> int

logic sub_int : int, int -> int

logic mul_int : int, int -> int

logic div_int : int, int -> int

logic mod_int : int, int -> int

logic neg_int : int -> int

logic lt_int : int, int -> prop

logic le_int : int, int -> prop

logic gt_int : int, int -> prop

logic ge_int : int, int -> prop

logic eq_int : int, int -> prop

logic neq_int : int, int -> prop

logic lt_int_bool : int, int -> bool

logic le_int_bool : int, int -> bool

logic gt_int_bool : int, int -> bool

logic ge_int_bool : int, int -> bool

logic eq_int_bool : int, int -> bool

logic neq_int_bool : int, int -> bool

axiom lt_int_bool_axiom:
  (forall x:int. (forall y:int. ((lt_int_bool(x, y) = true) <-> (x < y))))

axiom le_int_bool_axiom:
  (forall x:int. (forall y:int. ((le_int_bool(x, y) = true) <-> (x <= y))))

axiom gt_int_bool_axiom:
  (forall x:int. (forall y:int. ((gt_int_bool(x, y) = true) <-> (x > y))))

axiom ge_int_bool_axiom:
  (forall x:int. (forall y:int. ((ge_int_bool(x, y) = true) <-> (x >= y))))

axiom eq_int_bool_axiom:
  (forall x:int. (forall y:int. ((eq_int_bool(x, y) = true) <-> (x = y))))

axiom neq_int_bool_axiom:
  (forall x:int. (forall y:int. ((neq_int_bool(x, y) = true) <-> (x <> y))))

logic add_real : real, real -> real

logic sub_real : real, real -> real

logic mul_real : real, real -> real

logic div_real : real, real -> real

logic pow_real : real, real -> real

logic neg_real : real -> real

logic abs_real : real -> real

logic sqrt_real : real -> real

logic real_of_int : int -> real

logic int_of_real : real -> int

logic lt_real : real, real -> prop

logic le_real : real, real -> prop

logic gt_real : real, real -> prop

logic ge_real : real, real -> prop

logic eq_real : real, real -> prop

logic neq_real : real, real -> prop

logic lt_real_bool : real, real -> bool

logic le_real_bool : real, real -> bool

logic gt_real_bool : real, real -> bool

logic ge_real_bool : real, real -> bool

logic eq_real_bool : real, real -> bool

logic neq_real_bool : real, real -> bool

axiom lt_real_bool_axiom:
  (forall x:real. (forall y:real. ((lt_real_bool(x, y) = true) <-> (x < y))))

axiom le_real_bool_axiom:
  (forall x:real.
    (forall y:real. ((le_real_bool(x, y) = true) <-> (x <= y))))

axiom gt_real_bool_axiom:
  (forall x:real. (forall y:real. ((gt_real_bool(x, y) = true) <-> (x > y))))

axiom ge_real_bool_axiom:
  (forall x:real.
    (forall y:real. ((ge_real_bool(x, y) = true) <-> (x >= y))))

axiom eq_real_bool_axiom:
  (forall x:real. (forall y:real. ((eq_real_bool(x, y) = true) <-> (x = y))))

axiom neq_real_bool_axiom:
  (forall x:real.
    (forall y:real. ((neq_real_bool(x, y) = true) <-> (x <> y))))

logic int_max : int, int -> int

logic int_min : int, int -> int

logic real_max : real, real -> real

logic real_min : real, real -> real

predicate zwf_zero(a: int, b: int) = ((0 <= b) and (a < b))

type 'a farray

logic access : 'a1 farray, int -> 'a1

logic update : 'a1 farray, int, 'a1 -> 'a1 farray

axiom access_update:
  (forall a:'a1 farray.
    (forall i:int. (forall v:'a1. (access(update(a, i, v), i) = v))))

axiom access_update_neq:
  (forall a:'a1 farray.
    (forall i:int.
      (forall j:int.
        (forall v:'a1.
          ((i <> j) -> (access(update(a, i, v), j) = access(a, j)))))))

logic array_length : 'a1 farray -> int

predicate sorted_array(t: int farray, i: int, j: int) =
  (forall k1:int.
    (forall k2:int.
      ((((i <= k1) and (k1 <= k2)) and (k2 <= j)) -> (access(t,
       k1) <= access(t, k2)))))

predicate exchange(a1: 'a1 farray, a2: 'a1 farray, i: int, j: int) =
  ((array_length(a1) = array_length(a2)) and
   ((access(a1, i) = access(a2, j)) and
    ((access(a2, i) = access(a1, j)) and
     (forall k:int.
       (((k <> i) and (k <> j)) -> (access(a1, k) = access(a2, k)))))))

logic permut : 'a1 farray, 'a1 farray, int, int -> prop

axiom permut_refl:
  (forall t:'a1 farray. (forall l:int. (forall u:int. permut(t, t, l, u))))

axiom permut_sym:
  (forall t1:'a1 farray.
    (forall t2:'a1 farray.
      (forall l:int.
        (forall u:int. (permut(t1, t2, l, u) -> permut(t2, t1, l, u))))))

axiom permut_trans:
  (forall t1:'a1 farray.
    (forall t2:'a1 farray.
      (forall t3:'a1 farray.
        (forall l:int.
          (forall u:int.
            (permut(t1, t2, l, u) ->
             (permut(t2, t3, l, u) -> permut(t1, t3, l, u))))))))

axiom permut_exchange:
  (forall a1:'a1 farray.
    (forall a2:'a1 farray.
      (forall l:int.
        (forall u:int.
          (forall i:int.
            (forall j:int.
              (((l <= i) and (i <= u)) ->
               (((l <= j) and (j <= u)) ->
                (exchange(a1, a2, i, j) -> permut(a1, a2, l, u))))))))))

axiom exchange_upd:
  (forall a:'a1 farray.
    (forall i:int.
      (forall j:int. exchange(a, update(update(a, i, access(a, j)), j,
        access(a, i)), i, j))))

axiom permut_weakening:
  (forall a1:'a1 farray.
    (forall a2:'a1 farray.
      (forall l1:int.
        (forall r1:int.
          (forall l2:int.
            (forall r2:int.
              ((((l1 <= l2) and (l2 <= r2)) and (r2 <= r1)) ->
               (permut(a1, a2, l2, r2) -> permut(a1, a2, l1, r1)))))))))

axiom permut_eq:
  (forall a1:'a1 farray.
    (forall a2:'a1 farray.
      (forall l:int.
        (forall u:int.
          ((l <= u) ->
           (permut(a1, a2, l, u) ->
            (forall i:int.
              (((i < l) or (u < i)) -> (access(a2, i) = access(a1, i))))))))))

predicate permutation(a1: 'a1 farray, a2: 'a1 farray) = permut(a1, a2, 0,
  (array_length(a1) - 1))

axiom array_length_update:
  (forall a:'a1 farray.
    (forall i:int.
      (forall v:'a1. (array_length(update(a, i, v)) = array_length(a)))))

axiom permut_array_length:
  (forall a1:'a1 farray.
    (forall a2:'a1 farray.
      (forall l:int.
        (forall u:int.
          (permut(a1, a2, l, u) -> (array_length(a1) = array_length(a2)))))))

goal swap1_po_1:
  forall x0:int.
  forall y:int.
  forall x:int.
  (x = y) ->
  forall y0:int.
  (y0 = x0) ->
  ((x = y) and (y0 = x0))

goal swap2_po_1:
  forall x0:int.
  forall y:int.
  forall x:int.
  (x = y) ->
  forall y0:int.
  (y0 = x0) ->
  ((x = y) and (y0 = x0))

goal swap3_po_1:
  forall a0:int.
  forall b:int.
  forall a:int.
  (a = b) ->
  forall b0:int.
  (b0 = a0) ->
  ((a = b) and (b0 = a0))

goal call_swap3_y_x_po_1:
  forall x0:int.
  forall y0:int.
  forall x:int.
  forall y:int.
  ((y = x0) and (x = y0)) ->
  ((x = y0) and (y = x0))

goal swap4_po_1:
  forall a:int.
  forall b:int.
  forall tmp:int.
  (tmp = a) ->
  forall a0:int.
  (a0 = b) ->
  forall b0:int.
  (b0 = tmp) ->
  ((a0 = b) and (b0 = a))

goal call_swap4_x_y_po_1:
  forall x:int.
  forall y:int.
  (x = 3) ->
  forall x0:int.
  forall y0:int.
  ((x0 = y) and (y0 = x)) ->
  (y0 = 3)

goal call_swap4_y_x_po_1:
  forall x:int.
  forall y:int.
  (x = 3) ->
  forall x0:int.
  forall y0:int.
  ((y0 = x) and (x0 = y)) ->
  (y0 = 3)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alt-ergo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 21:05:34 -0000	1.1
+++ .cvsignore	6 Sep 2008 01:56:50 -0000	1.2
@@ -0,0 +1 @@
+alt-ergo-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alt-ergo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 21:05:34 -0000	1.1
+++ sources	6 Sep 2008 01:56:50 -0000	1.2
@@ -0,0 +1 @@
+ce8e9fbe24c0c2d7328b4b70ac0c2f9e  alt-ergo-0.8.tar.gz



From amdunn at fedoraproject.org  Sat Sep  6 01:58:57 2008
From: amdunn at fedoraproject.org (Alan Dunn)
Date: Sat,  6 Sep 2008 01:58:57 +0000 (UTC)
Subject: rpms/alt-ergo/F-9 README.alt-ergo, NONE, 1.1 alt-ergo.spec, NONE,
	1.1 import.log, NONE, 1.1 swap0_why.why, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080906015857.B221B70125@cvs1.fedora.phx.redhat.com>

Author: amdunn

Update of /cvs/pkgs/rpms/alt-ergo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29830/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	README.alt-ergo alt-ergo.spec import.log swap0_why.why 
Log Message:
Initial commit for F-9 branch.



--- NEW FILE README.alt-ergo ---
Fedora alt-ergo package:

Contains the main program alt-ergo.

Consider visiting the main Alt-Ergo site - http://alt-ergo.lri.fr -
for more documentation as it becomes available and a number of
examples of usage. Any current documentation (save the man page) is
generated by the package maintainer.

--- NEW FILE alt-ergo.spec ---
# rpmlint "no-binary" error is not really an error - see:
# https://www.redhat.com/archives/fedora-packaging/2008-August/msg00017.html
# and ocaml-ocamlgraph spec file for a discussion of this issue.

# The following are necessary for alt-ergo to depend on the correct
# version of ocaml-ocamlgraph

%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%define debug_package %{nil}
%define _use_internal_dependency_generator 0
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh

Name:		alt-ergo
Version:	0.8
Release:	3%{?dist}
Summary:	Alt-Ergo automatic theorem prover

# Note: rpmlint invalid-license warning is incorrect - I had the
# CeCILL-C license reviewed by Fedora legal, and it is now present on
# http://fedoraproject.org/wiki/Licensing

Group:		Applications/Engineering
License:	CeCILL-C
URL:		http://alt-ergo.lri.fr
Source0:	http://alt-ergo.lri.fr/http/alt-ergo-0.8.tar.gz
Source1:	swap0_why.why
Source2:	README.alt-ergo
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	ocaml, ocaml-ocamlgraph-devel, prelink

%if 0%{?fedora} < 9
# There's no ocaml for ppc64 in Fedora <= 8
# bz# (will be changed when exists as a module):
ExcludeArch: ppc64
%endif

%description

Alt-Ergo is an automated theorem prover implemented in OCaml. It is
based on CC(X) - a congruence closure algorithm parameterized by an
equational theory X. This algorithm is reminiscent of the Shostak
algorithm. Currently CC(X) is instantiated by the theory of linear
arithmetics. Alt-Ergo also contains a home made SAT-solver and an
instantiation mechanism by which it fully supports quantifiers.

%prep
%setup -q

cp -p %{SOURCE1} %{SOURCE2} .

%build
# Avoid a Makefile patch by just adding this empty file, and thus autoconf
# doesn't complain (better than ignoring all status from configure)
touch version.sh.in
./configure --prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_datadir} --mandir=%{_mandir}

%if ! %{opt}
%define opt_option OCAMLBEST=byte OCAMLC=ocamlc OCAMLLEX=ocamllex
%else
%define opt_option OCAMLBEST=opt OCAMLOPT=ocamlopt.opt
%endif

make %{opt_option}

mv CeCILL-C CeCILL-C.iso8859
iconv -f ISO-8859-1 -t UTF-8 < CeCILL-C.iso8859 > CeCILL-C
rm CeCILL-C.iso8859

%if %{opt}
strip ./alt-ergo.opt
execstack -c ./alt-ergo.opt
%endif

# Test alt-ergo on fairly trivial why file - generated from why example swap0.mlw w/why v2.14
%check
%if %opt
%define altergo ./alt-ergo.opt
%else
%define altergo ./alt-ergo.byte
%endif
%{altergo} swap0_why.why

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_bindir}
make %{opt_option} BINDIR=%{buildroot}%{_bindir} LIBDIR=%{buildroot}%{_datadir} MANDIR=%{buildroot}%{_mandir} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_datadir}/%{name}
%{_mandir}/man1/alt-ergo.1.gz
%doc README.alt-ergo COPYING CeCILL-C CHANGES

%changelog
* Fri Sep 05 2008 Alan Dunn <amdunn at gmail.com> 0.8-3
- Fixed BuildRequires to add prelink (for execstack).
* Tue Aug 26 2008 Alan Dunn <amdunn at gmail.com> 0.8-2
- Fixed BuildRequires to add ocaml-ocamlgraph-devel instead of
  ocaml-ocamlgraph, made other minor changes.
* Mon Aug 25 2008 Alan Dunn <amdunn at gmail.com> 0.8-1
- Initial Fedora RPM version.


--- NEW FILE import.log ---
alt-ergo-0_8-3_fc9:F-9:alt-ergo-0.8-3.fc9.src.rpm:1220666017


--- NEW FILE swap0_why.why ---
logic eq_unit : unit, unit -> prop

logic neq_unit : unit, unit -> prop

logic eq_bool : bool, bool -> prop

logic neq_bool : bool, bool -> prop

logic bool_and : bool, bool -> bool

logic bool_or : bool, bool -> bool

logic bool_xor : bool, bool -> bool

logic bool_not : bool -> bool

axiom bool_and_def:
  (forall a:bool.
    (forall b:bool.
      ((bool_and(a, b) = true) <-> ((a = true) and (b = true)))))

axiom bool_or_def:
  (forall a:bool.
    (forall b:bool. ((bool_or(a, b) = true) <-> ((a = true) or (b = true)))))

axiom bool_xor_def:
  (forall a:bool. (forall b:bool. ((bool_xor(a, b) = true) <-> (a <> b))))

axiom bool_not_def: (forall a:bool. ((bool_not(a) = true) <-> (a = false)))

logic ite : bool, 'a1, 'a1 -> 'a1

axiom ite_true: (forall x:'a1. (forall y:'a1. (ite(true, x, y) = x)))

axiom ite_false: (forall x:'a1. (forall y:'a1. (ite(false, x, y) = y)))

logic add_int : int, int -> int

logic sub_int : int, int -> int

logic mul_int : int, int -> int

logic div_int : int, int -> int

logic mod_int : int, int -> int

logic neg_int : int -> int

logic lt_int : int, int -> prop

logic le_int : int, int -> prop

logic gt_int : int, int -> prop

logic ge_int : int, int -> prop

logic eq_int : int, int -> prop

logic neq_int : int, int -> prop

logic lt_int_bool : int, int -> bool

logic le_int_bool : int, int -> bool

logic gt_int_bool : int, int -> bool

logic ge_int_bool : int, int -> bool

logic eq_int_bool : int, int -> bool

logic neq_int_bool : int, int -> bool

axiom lt_int_bool_axiom:
  (forall x:int. (forall y:int. ((lt_int_bool(x, y) = true) <-> (x < y))))

axiom le_int_bool_axiom:
  (forall x:int. (forall y:int. ((le_int_bool(x, y) = true) <-> (x <= y))))

axiom gt_int_bool_axiom:
  (forall x:int. (forall y:int. ((gt_int_bool(x, y) = true) <-> (x > y))))

axiom ge_int_bool_axiom:
  (forall x:int. (forall y:int. ((ge_int_bool(x, y) = true) <-> (x >= y))))

axiom eq_int_bool_axiom:
  (forall x:int. (forall y:int. ((eq_int_bool(x, y) = true) <-> (x = y))))

axiom neq_int_bool_axiom:
  (forall x:int. (forall y:int. ((neq_int_bool(x, y) = true) <-> (x <> y))))

logic add_real : real, real -> real

logic sub_real : real, real -> real

logic mul_real : real, real -> real

logic div_real : real, real -> real

logic pow_real : real, real -> real

logic neg_real : real -> real

logic abs_real : real -> real

logic sqrt_real : real -> real

logic real_of_int : int -> real

logic int_of_real : real -> int

logic lt_real : real, real -> prop

logic le_real : real, real -> prop

logic gt_real : real, real -> prop

logic ge_real : real, real -> prop

logic eq_real : real, real -> prop

logic neq_real : real, real -> prop

logic lt_real_bool : real, real -> bool

logic le_real_bool : real, real -> bool

logic gt_real_bool : real, real -> bool

logic ge_real_bool : real, real -> bool

logic eq_real_bool : real, real -> bool

logic neq_real_bool : real, real -> bool

axiom lt_real_bool_axiom:
  (forall x:real. (forall y:real. ((lt_real_bool(x, y) = true) <-> (x < y))))

axiom le_real_bool_axiom:
  (forall x:real.
    (forall y:real. ((le_real_bool(x, y) = true) <-> (x <= y))))

axiom gt_real_bool_axiom:
  (forall x:real. (forall y:real. ((gt_real_bool(x, y) = true) <-> (x > y))))

axiom ge_real_bool_axiom:
  (forall x:real.
    (forall y:real. ((ge_real_bool(x, y) = true) <-> (x >= y))))

axiom eq_real_bool_axiom:
  (forall x:real. (forall y:real. ((eq_real_bool(x, y) = true) <-> (x = y))))

axiom neq_real_bool_axiom:
  (forall x:real.
    (forall y:real. ((neq_real_bool(x, y) = true) <-> (x <> y))))

logic int_max : int, int -> int

logic int_min : int, int -> int

logic real_max : real, real -> real

logic real_min : real, real -> real

predicate zwf_zero(a: int, b: int) = ((0 <= b) and (a < b))

type 'a farray

logic access : 'a1 farray, int -> 'a1

logic update : 'a1 farray, int, 'a1 -> 'a1 farray

axiom access_update:
  (forall a:'a1 farray.
    (forall i:int. (forall v:'a1. (access(update(a, i, v), i) = v))))

axiom access_update_neq:
  (forall a:'a1 farray.
    (forall i:int.
      (forall j:int.
        (forall v:'a1.
          ((i <> j) -> (access(update(a, i, v), j) = access(a, j)))))))

logic array_length : 'a1 farray -> int

predicate sorted_array(t: int farray, i: int, j: int) =
  (forall k1:int.
    (forall k2:int.
      ((((i <= k1) and (k1 <= k2)) and (k2 <= j)) -> (access(t,
       k1) <= access(t, k2)))))

predicate exchange(a1: 'a1 farray, a2: 'a1 farray, i: int, j: int) =
  ((array_length(a1) = array_length(a2)) and
   ((access(a1, i) = access(a2, j)) and
    ((access(a2, i) = access(a1, j)) and
     (forall k:int.
       (((k <> i) and (k <> j)) -> (access(a1, k) = access(a2, k)))))))

logic permut : 'a1 farray, 'a1 farray, int, int -> prop

axiom permut_refl:
  (forall t:'a1 farray. (forall l:int. (forall u:int. permut(t, t, l, u))))

axiom permut_sym:
  (forall t1:'a1 farray.
    (forall t2:'a1 farray.
      (forall l:int.
        (forall u:int. (permut(t1, t2, l, u) -> permut(t2, t1, l, u))))))

axiom permut_trans:
  (forall t1:'a1 farray.
    (forall t2:'a1 farray.
      (forall t3:'a1 farray.
        (forall l:int.
          (forall u:int.
            (permut(t1, t2, l, u) ->
             (permut(t2, t3, l, u) -> permut(t1, t3, l, u))))))))

axiom permut_exchange:
  (forall a1:'a1 farray.
    (forall a2:'a1 farray.
      (forall l:int.
        (forall u:int.
          (forall i:int.
            (forall j:int.
              (((l <= i) and (i <= u)) ->
               (((l <= j) and (j <= u)) ->
                (exchange(a1, a2, i, j) -> permut(a1, a2, l, u))))))))))

axiom exchange_upd:
  (forall a:'a1 farray.
    (forall i:int.
      (forall j:int. exchange(a, update(update(a, i, access(a, j)), j,
        access(a, i)), i, j))))

axiom permut_weakening:
  (forall a1:'a1 farray.
    (forall a2:'a1 farray.
      (forall l1:int.
        (forall r1:int.
          (forall l2:int.
            (forall r2:int.
              ((((l1 <= l2) and (l2 <= r2)) and (r2 <= r1)) ->
               (permut(a1, a2, l2, r2) -> permut(a1, a2, l1, r1)))))))))

axiom permut_eq:
  (forall a1:'a1 farray.
    (forall a2:'a1 farray.
      (forall l:int.
        (forall u:int.
          ((l <= u) ->
           (permut(a1, a2, l, u) ->
            (forall i:int.
              (((i < l) or (u < i)) -> (access(a2, i) = access(a1, i))))))))))

predicate permutation(a1: 'a1 farray, a2: 'a1 farray) = permut(a1, a2, 0,
  (array_length(a1) - 1))

axiom array_length_update:
  (forall a:'a1 farray.
    (forall i:int.
      (forall v:'a1. (array_length(update(a, i, v)) = array_length(a)))))

axiom permut_array_length:
  (forall a1:'a1 farray.
    (forall a2:'a1 farray.
      (forall l:int.
        (forall u:int.
          (permut(a1, a2, l, u) -> (array_length(a1) = array_length(a2)))))))

goal swap1_po_1:
  forall x0:int.
  forall y:int.
  forall x:int.
  (x = y) ->
  forall y0:int.
  (y0 = x0) ->
  ((x = y) and (y0 = x0))

goal swap2_po_1:
  forall x0:int.
  forall y:int.
  forall x:int.
  (x = y) ->
  forall y0:int.
  (y0 = x0) ->
  ((x = y) and (y0 = x0))

goal swap3_po_1:
  forall a0:int.
  forall b:int.
  forall a:int.
  (a = b) ->
  forall b0:int.
  (b0 = a0) ->
  ((a = b) and (b0 = a0))

goal call_swap3_y_x_po_1:
  forall x0:int.
  forall y0:int.
  forall x:int.
  forall y:int.
  ((y = x0) and (x = y0)) ->
  ((x = y0) and (y = x0))

goal swap4_po_1:
  forall a:int.
  forall b:int.
  forall tmp:int.
  (tmp = a) ->
  forall a0:int.
  (a0 = b) ->
  forall b0:int.
  (b0 = tmp) ->
  ((a0 = b) and (b0 = a))

goal call_swap4_x_y_po_1:
  forall x:int.
  forall y:int.
  (x = 3) ->
  forall x0:int.
  forall y0:int.
  ((x0 = y) and (y0 = x)) ->
  (y0 = 3)

goal call_swap4_y_x_po_1:
  forall x:int.
  forall y:int.
  (x = 3) ->
  forall x0:int.
  forall y0:int.
  ((y0 = x) and (x0 = y)) ->
  (y0 = 3)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alt-ergo/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 21:05:34 -0000	1.1
+++ .cvsignore	6 Sep 2008 01:58:27 -0000	1.2
@@ -0,0 +1 @@
+alt-ergo-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alt-ergo/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 21:05:34 -0000	1.1
+++ sources	6 Sep 2008 01:58:27 -0000	1.2
@@ -0,0 +1 @@
+ce8e9fbe24c0c2d7328b4b70ac0c2f9e  alt-ergo-0.8.tar.gz



From amdunn at fedoraproject.org  Sat Sep  6 02:00:27 2008
From: amdunn at fedoraproject.org (Alan Dunn)
Date: Sat,  6 Sep 2008 02:00:27 +0000 (UTC)
Subject: rpms/alt-ergo/F-8 README.alt-ergo, NONE, 1.1 alt-ergo.spec, NONE,
	1.1 import.log, NONE, 1.1 swap0_why.why, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080906020027.1D1F770125@cvs1.fedora.phx.redhat.com>

Author: amdunn

Update of /cvs/pkgs/rpms/alt-ergo/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30431/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	README.alt-ergo alt-ergo.spec import.log swap0_why.why 
Log Message:
Initial commit for F-8 branch.



--- NEW FILE README.alt-ergo ---
Fedora alt-ergo package:

Contains the main program alt-ergo.

Consider visiting the main Alt-Ergo site - http://alt-ergo.lri.fr -
for more documentation as it becomes available and a number of
examples of usage. Any current documentation (save the man page) is
generated by the package maintainer.

--- NEW FILE alt-ergo.spec ---
# rpmlint "no-binary" error is not really an error - see:
# https://www.redhat.com/archives/fedora-packaging/2008-August/msg00017.html
# and ocaml-ocamlgraph spec file for a discussion of this issue.

# The following are necessary for alt-ergo to depend on the correct
# version of ocaml-ocamlgraph

%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%define debug_package %{nil}
%define _use_internal_dependency_generator 0
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh

Name:		alt-ergo
Version:	0.8
Release:	3%{?dist}
Summary:	Alt-Ergo automatic theorem prover

# Note: rpmlint invalid-license warning is incorrect - I had the
# CeCILL-C license reviewed by Fedora legal, and it is now present on
# http://fedoraproject.org/wiki/Licensing

Group:		Applications/Engineering
License:	CeCILL-C
URL:		http://alt-ergo.lri.fr
Source0:	http://alt-ergo.lri.fr/http/alt-ergo-0.8.tar.gz
Source1:	swap0_why.why
Source2:	README.alt-ergo
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	ocaml, ocaml-ocamlgraph-devel, prelink

%if 0%{?fedora} < 9
# There's no ocaml for ppc64 in Fedora <= 8
# bz# (will be changed when exists as a module):
ExcludeArch: ppc64
%endif

%description

Alt-Ergo is an automated theorem prover implemented in OCaml. It is
based on CC(X) - a congruence closure algorithm parameterized by an
equational theory X. This algorithm is reminiscent of the Shostak
algorithm. Currently CC(X) is instantiated by the theory of linear
arithmetics. Alt-Ergo also contains a home made SAT-solver and an
instantiation mechanism by which it fully supports quantifiers.

%prep
%setup -q

cp -p %{SOURCE1} %{SOURCE2} .

%build
# Avoid a Makefile patch by just adding this empty file, and thus autoconf
# doesn't complain (better than ignoring all status from configure)
touch version.sh.in
./configure --prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_datadir} --mandir=%{_mandir}

%if ! %{opt}
%define opt_option OCAMLBEST=byte OCAMLC=ocamlc OCAMLLEX=ocamllex
%else
%define opt_option OCAMLBEST=opt OCAMLOPT=ocamlopt.opt
%endif

make %{opt_option}

mv CeCILL-C CeCILL-C.iso8859
iconv -f ISO-8859-1 -t UTF-8 < CeCILL-C.iso8859 > CeCILL-C
rm CeCILL-C.iso8859

%if %{opt}
strip ./alt-ergo.opt
execstack -c ./alt-ergo.opt
%endif

# Test alt-ergo on fairly trivial why file - generated from why example swap0.mlw w/why v2.14
%check
%if %opt
%define altergo ./alt-ergo.opt
%else
%define altergo ./alt-ergo.byte
%endif
%{altergo} swap0_why.why

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_bindir}
make %{opt_option} BINDIR=%{buildroot}%{_bindir} LIBDIR=%{buildroot}%{_datadir} MANDIR=%{buildroot}%{_mandir} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_datadir}/%{name}
%{_mandir}/man1/alt-ergo.1.gz
%doc README.alt-ergo COPYING CeCILL-C CHANGES

%changelog
* Fri Sep 05 2008 Alan Dunn <amdunn at gmail.com> 0.8-3
- Fixed BuildRequires to add prelink (for execstack).
* Tue Aug 26 2008 Alan Dunn <amdunn at gmail.com> 0.8-2
- Fixed BuildRequires to add ocaml-ocamlgraph-devel instead of
  ocaml-ocamlgraph, made other minor changes.
* Mon Aug 25 2008 Alan Dunn <amdunn at gmail.com> 0.8-1
- Initial Fedora RPM version.


--- NEW FILE import.log ---
alt-ergo-0_8-3_fc8:F-8:alt-ergo-0.8-3.fc8.src.rpm:1220666121


--- NEW FILE swap0_why.why ---
logic eq_unit : unit, unit -> prop

logic neq_unit : unit, unit -> prop

logic eq_bool : bool, bool -> prop

logic neq_bool : bool, bool -> prop

logic bool_and : bool, bool -> bool

logic bool_or : bool, bool -> bool

logic bool_xor : bool, bool -> bool

logic bool_not : bool -> bool

axiom bool_and_def:
  (forall a:bool.
    (forall b:bool.
      ((bool_and(a, b) = true) <-> ((a = true) and (b = true)))))

axiom bool_or_def:
  (forall a:bool.
    (forall b:bool. ((bool_or(a, b) = true) <-> ((a = true) or (b = true)))))

axiom bool_xor_def:
  (forall a:bool. (forall b:bool. ((bool_xor(a, b) = true) <-> (a <> b))))

axiom bool_not_def: (forall a:bool. ((bool_not(a) = true) <-> (a = false)))

logic ite : bool, 'a1, 'a1 -> 'a1

axiom ite_true: (forall x:'a1. (forall y:'a1. (ite(true, x, y) = x)))

axiom ite_false: (forall x:'a1. (forall y:'a1. (ite(false, x, y) = y)))

logic add_int : int, int -> int

logic sub_int : int, int -> int

logic mul_int : int, int -> int

logic div_int : int, int -> int

logic mod_int : int, int -> int

logic neg_int : int -> int

logic lt_int : int, int -> prop

logic le_int : int, int -> prop

logic gt_int : int, int -> prop

logic ge_int : int, int -> prop

logic eq_int : int, int -> prop

logic neq_int : int, int -> prop

logic lt_int_bool : int, int -> bool

logic le_int_bool : int, int -> bool

logic gt_int_bool : int, int -> bool

logic ge_int_bool : int, int -> bool

logic eq_int_bool : int, int -> bool

logic neq_int_bool : int, int -> bool

axiom lt_int_bool_axiom:
  (forall x:int. (forall y:int. ((lt_int_bool(x, y) = true) <-> (x < y))))

axiom le_int_bool_axiom:
  (forall x:int. (forall y:int. ((le_int_bool(x, y) = true) <-> (x <= y))))

axiom gt_int_bool_axiom:
  (forall x:int. (forall y:int. ((gt_int_bool(x, y) = true) <-> (x > y))))

axiom ge_int_bool_axiom:
  (forall x:int. (forall y:int. ((ge_int_bool(x, y) = true) <-> (x >= y))))

axiom eq_int_bool_axiom:
  (forall x:int. (forall y:int. ((eq_int_bool(x, y) = true) <-> (x = y))))

axiom neq_int_bool_axiom:
  (forall x:int. (forall y:int. ((neq_int_bool(x, y) = true) <-> (x <> y))))

logic add_real : real, real -> real

logic sub_real : real, real -> real

logic mul_real : real, real -> real

logic div_real : real, real -> real

logic pow_real : real, real -> real

logic neg_real : real -> real

logic abs_real : real -> real

logic sqrt_real : real -> real

logic real_of_int : int -> real

logic int_of_real : real -> int

logic lt_real : real, real -> prop

logic le_real : real, real -> prop

logic gt_real : real, real -> prop

logic ge_real : real, real -> prop

logic eq_real : real, real -> prop

logic neq_real : real, real -> prop

logic lt_real_bool : real, real -> bool

logic le_real_bool : real, real -> bool

logic gt_real_bool : real, real -> bool

logic ge_real_bool : real, real -> bool

logic eq_real_bool : real, real -> bool

logic neq_real_bool : real, real -> bool

axiom lt_real_bool_axiom:
  (forall x:real. (forall y:real. ((lt_real_bool(x, y) = true) <-> (x < y))))

axiom le_real_bool_axiom:
  (forall x:real.
    (forall y:real. ((le_real_bool(x, y) = true) <-> (x <= y))))

axiom gt_real_bool_axiom:
  (forall x:real. (forall y:real. ((gt_real_bool(x, y) = true) <-> (x > y))))

axiom ge_real_bool_axiom:
  (forall x:real.
    (forall y:real. ((ge_real_bool(x, y) = true) <-> (x >= y))))

axiom eq_real_bool_axiom:
  (forall x:real. (forall y:real. ((eq_real_bool(x, y) = true) <-> (x = y))))

axiom neq_real_bool_axiom:
  (forall x:real.
    (forall y:real. ((neq_real_bool(x, y) = true) <-> (x <> y))))

logic int_max : int, int -> int

logic int_min : int, int -> int

logic real_max : real, real -> real

logic real_min : real, real -> real

predicate zwf_zero(a: int, b: int) = ((0 <= b) and (a < b))

type 'a farray

logic access : 'a1 farray, int -> 'a1

logic update : 'a1 farray, int, 'a1 -> 'a1 farray

axiom access_update:
  (forall a:'a1 farray.
    (forall i:int. (forall v:'a1. (access(update(a, i, v), i) = v))))

axiom access_update_neq:
  (forall a:'a1 farray.
    (forall i:int.
      (forall j:int.
        (forall v:'a1.
          ((i <> j) -> (access(update(a, i, v), j) = access(a, j)))))))

logic array_length : 'a1 farray -> int

predicate sorted_array(t: int farray, i: int, j: int) =
  (forall k1:int.
    (forall k2:int.
      ((((i <= k1) and (k1 <= k2)) and (k2 <= j)) -> (access(t,
       k1) <= access(t, k2)))))

predicate exchange(a1: 'a1 farray, a2: 'a1 farray, i: int, j: int) =
  ((array_length(a1) = array_length(a2)) and
   ((access(a1, i) = access(a2, j)) and
    ((access(a2, i) = access(a1, j)) and
     (forall k:int.
       (((k <> i) and (k <> j)) -> (access(a1, k) = access(a2, k)))))))

logic permut : 'a1 farray, 'a1 farray, int, int -> prop

axiom permut_refl:
  (forall t:'a1 farray. (forall l:int. (forall u:int. permut(t, t, l, u))))

axiom permut_sym:
  (forall t1:'a1 farray.
    (forall t2:'a1 farray.
      (forall l:int.
        (forall u:int. (permut(t1, t2, l, u) -> permut(t2, t1, l, u))))))

axiom permut_trans:
  (forall t1:'a1 farray.
    (forall t2:'a1 farray.
      (forall t3:'a1 farray.
        (forall l:int.
          (forall u:int.
            (permut(t1, t2, l, u) ->
             (permut(t2, t3, l, u) -> permut(t1, t3, l, u))))))))

axiom permut_exchange:
  (forall a1:'a1 farray.
    (forall a2:'a1 farray.
      (forall l:int.
        (forall u:int.
          (forall i:int.
            (forall j:int.
              (((l <= i) and (i <= u)) ->
               (((l <= j) and (j <= u)) ->
                (exchange(a1, a2, i, j) -> permut(a1, a2, l, u))))))))))

axiom exchange_upd:
  (forall a:'a1 farray.
    (forall i:int.
      (forall j:int. exchange(a, update(update(a, i, access(a, j)), j,
        access(a, i)), i, j))))

axiom permut_weakening:
  (forall a1:'a1 farray.
    (forall a2:'a1 farray.
      (forall l1:int.
        (forall r1:int.
          (forall l2:int.
            (forall r2:int.
              ((((l1 <= l2) and (l2 <= r2)) and (r2 <= r1)) ->
               (permut(a1, a2, l2, r2) -> permut(a1, a2, l1, r1)))))))))

axiom permut_eq:
  (forall a1:'a1 farray.
    (forall a2:'a1 farray.
      (forall l:int.
        (forall u:int.
          ((l <= u) ->
           (permut(a1, a2, l, u) ->
            (forall i:int.
              (((i < l) or (u < i)) -> (access(a2, i) = access(a1, i))))))))))

predicate permutation(a1: 'a1 farray, a2: 'a1 farray) = permut(a1, a2, 0,
  (array_length(a1) - 1))

axiom array_length_update:
  (forall a:'a1 farray.
    (forall i:int.
      (forall v:'a1. (array_length(update(a, i, v)) = array_length(a)))))

axiom permut_array_length:
  (forall a1:'a1 farray.
    (forall a2:'a1 farray.
      (forall l:int.
        (forall u:int.
          (permut(a1, a2, l, u) -> (array_length(a1) = array_length(a2)))))))

goal swap1_po_1:
  forall x0:int.
  forall y:int.
  forall x:int.
  (x = y) ->
  forall y0:int.
  (y0 = x0) ->
  ((x = y) and (y0 = x0))

goal swap2_po_1:
  forall x0:int.
  forall y:int.
  forall x:int.
  (x = y) ->
  forall y0:int.
  (y0 = x0) ->
  ((x = y) and (y0 = x0))

goal swap3_po_1:
  forall a0:int.
  forall b:int.
  forall a:int.
  (a = b) ->
  forall b0:int.
  (b0 = a0) ->
  ((a = b) and (b0 = a0))

goal call_swap3_y_x_po_1:
  forall x0:int.
  forall y0:int.
  forall x:int.
  forall y:int.
  ((y = x0) and (x = y0)) ->
  ((x = y0) and (y = x0))

goal swap4_po_1:
  forall a:int.
  forall b:int.
  forall tmp:int.
  (tmp = a) ->
  forall a0:int.
  (a0 = b) ->
  forall b0:int.
  (b0 = tmp) ->
  ((a0 = b) and (b0 = a))

goal call_swap4_x_y_po_1:
  forall x:int.
  forall y:int.
  (x = 3) ->
  forall x0:int.
  forall y0:int.
  ((x0 = y) and (y0 = x)) ->
  (y0 = 3)

goal call_swap4_y_x_po_1:
  forall x:int.
  forall y:int.
  (x = 3) ->
  forall x0:int.
  forall y0:int.
  ((y0 = x) and (x0 = y)) ->
  (y0 = 3)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alt-ergo/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 21:05:34 -0000	1.1
+++ .cvsignore	6 Sep 2008 01:59:56 -0000	1.2
@@ -0,0 +1 @@
+alt-ergo-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alt-ergo/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 21:05:34 -0000	1.1
+++ sources	6 Sep 2008 01:59:56 -0000	1.2
@@ -0,0 +1 @@
+ce8e9fbe24c0c2d7328b4b70ac0c2f9e  alt-ergo-0.8.tar.gz



From mclasen at fedoraproject.org  Sat Sep  6 02:11:32 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  6 Sep 2008 02:11:32 +0000 (UTC)
Subject: rpms/libxklavier/devel vnc-bug.patch, NONE, 1.1 .cvsignore, 1.16,
	1.17 libxklavier.spec, 1.39, 1.40 sources, 1.16, 1.17
Message-ID: <20080906021132.2470A70125@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libxklavier/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32168

Modified Files:
	.cvsignore libxklavier.spec sources 
Added Files:
	vnc-bug.patch 
Log Message:
3.7


vnc-bug.patch:

--- NEW FILE vnc-bug.patch ---
diff -up libxklavier-3.6/libxklavier/xklavier_util.c.vnc-bug libxklavier-3.6/libxklavier/xklavier_util.c
--- libxklavier-3.6/libxklavier/xklavier_util.c.vnc-bug	2008-03-01 16:42:49.000000000 -0500
+++ libxklavier-3.6/libxklavier/xklavier_util.c	2008-08-30 12:43:27.000000000 -0400
@@ -118,7 +118,10 @@ xkl_get_debug_window_title(XklEngine * e
 	static gchar sname[33];
 	gchar *name;
 	strcpy(sname, "NULL");
-	if (win != (Window) NULL) {
+
+	if (win == (Window *) PointerRoot) {
+		strcpy(sname, "ROOT");
+	} else if (win != (Window *) None) {
 		name = xkl_engine_get_window_title(engine, win);
 		if (name != NULL) {
 			snprintf(sname, sizeof(sname), "%.32s", name);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxklavier/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	1 May 2008 01:52:34 -0000	1.16
+++ .cvsignore	6 Sep 2008 02:11:01 -0000	1.17
@@ -1 +1 @@
-libxklavier-3.6.tar.bz2
+libxklavier-3.7.tar.bz2


Index: libxklavier.spec
===================================================================
RCS file: /cvs/extras/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libxklavier.spec	27 Jun 2008 14:15:11 -0000	1.39
+++ libxklavier.spec	6 Sep 2008 02:11:01 -0000	1.40
@@ -1,7 +1,7 @@
 Summary:	library providing high-level API for X Keyboard Extension
 Name:		libxklavier
-Version:	3.6
-Release: 	2%{?dist}
+Version:	3.7
+Release: 	1%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL: http://gswitchit.sourceforge.net/
@@ -12,11 +12,9 @@
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel >= 2.6.0
 BuildRequires: iso-codes-devel
-Source: http://download.gnome.org/sources/libxklavier/3.6/libxklavier-3.6.tar.bz2
+Source: http://download.gnome.org/sources/libxklavier/3.7/libxklavier-3.7.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-Patch0: libxklavier-2.1-vnc-bug.patch
-
 %description
 libxklavier is a library providing high-level API for X Keyboard Extension
 known as XKB. This library is intended to support XFree86 and other
@@ -36,7 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .vnc-bug
 
 %build
 
@@ -72,6 +69,9 @@
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Fri Sep  5 2008 Matthias Clasen <mclasen at redhat.com> - 3.7-1
+- Update to 3.7
+
 * Fri Jun 27 2008 Ray Strode <rstrode at redhat.com> - 3.6-2
 - Apply upstream patch to fix libxklavier crash (bug 452966)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxklavier/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	1 May 2008 01:52:34 -0000	1.16
+++ sources	6 Sep 2008 02:11:01 -0000	1.17
@@ -1 +1 @@
-eff30f70e4c082e2aa6a0fbecc15253b  libxklavier-3.6.tar.bz2
+ee167645becd11309d64c6ff3a1600ff  libxklavier-3.7.tar.bz2



From orion at fedoraproject.org  Sat Sep  6 02:50:08 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Sat,  6 Sep 2008 02:50:08 +0000 (UTC)
Subject: rpms/plplot/devel plplot.spec,1.57,1.58
Message-ID: <20080906025008.5E07E70125@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7331

Modified Files:
	plplot.spec 
Log Message:
Exclude ppc ocaml test.



Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- plplot.spec	5 Sep 2008 23:04:59 -0000	1.57
+++ plplot.spec	6 Sep 2008 02:49:38 -0000	1.58
@@ -323,8 +323,8 @@
 cd fedora
 #Hack
 export ITCL_LIBRARY=%{_libdir}/tcl8.5/itcl3.4
-# Exclude perl and compare tests for now, and ocaml from ppc64
-%ifarch ppc64
+# Exclude perl and compare tests for now, and ocaml from ppc/ppc64
+%ifarch ppc ppc64
 ctest -V -E 'compare|ocaml|perl'
 %else
 ctest -V -E 'compare|perl'



From orion at fedoraproject.org  Sat Sep  6 03:40:33 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Sat,  6 Sep 2008 03:40:33 +0000 (UTC)
Subject: rpms/gdl/devel gdl.spec,1.36,1.37
Message-ID: <20080906034033.C554770125@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16819

Modified Files:
	gdl.spec 
Log Message:
* Fri Sep  5 2008 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.rc1.4
- Add a requires on plplot to pull in drivers (bug#458277)



Index: gdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gdl.spec	16 May 2008 17:52:26 -0000	1.36
+++ gdl.spec	6 Sep 2008 03:40:03 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           gdl
 Version:        0.9
-Release:        0.rc1.3%{?dist}
+Release:        0.rc1.4%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
@@ -21,6 +21,9 @@
 BuildRequires:  python-devel, python-numarray, python-matplotlib
 BuildRequires:  fftw-devel, hdf-devel, proj-devel
 
+# Needed to pull in drivers
+Requires:       plplot
+
 
 %description
 A free IDL (Interactive Data Language) compatible incremental compiler
@@ -72,6 +75,9 @@
 
 
 %changelog
+* Fri Sep  5 2008 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.rc1.4
+- Add a requires on plplot to pull in drivers (bug#458277)
+
 * Fri May 16 2008 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.rc1.3
 - Update to latest cvs
 - Add patch to handle new ImageMagick



From orion at fedoraproject.org  Sat Sep  6 03:44:33 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Sat,  6 Sep 2008 03:44:33 +0000 (UTC)
Subject: rpms/gdl/F-9 gdl.spec,1.34,1.35
Message-ID: <20080906034433.F246B70125@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gdl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17692

Modified Files:
	gdl.spec 
Log Message:
* Fri Sep  5 2008 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.rc1.4
- Add a requires on plplot to pull in drivers (bug#458277)



Index: gdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/F-9/gdl.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gdl.spec	6 Apr 2008 05:13:25 -0000	1.34
+++ gdl.spec	6 Sep 2008 03:44:03 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           gdl
 Version:        0.9
-Release:        0.rc1.1%{?dist}
+Release:        0.rc1.2%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
@@ -10,8 +10,8 @@
 Source1:        gdl.csh
 Source2:        gdl.sh
 Patch0:         gdl-0.9rc1-automake.patch
-Patch1:		gdl-0.9pre5-ppc64.patch
-Patch2:		gdl-0.9pre6-gcc43.patch
+Patch1:         gdl-0.9pre5-ppc64.patch
+Patch2:         gdl-0.9pre6-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  readline-devel, ncurses-devel
@@ -20,6 +20,9 @@
 BuildRequires:  python-devel, python-numarray, python-matplotlib
 BuildRequires:  fftw-devel, hdf-devel, proj-devel
 
+# Needed to pull in drivers
+Requires:       plplot
+
 
 %description
 A free IDL (Interactive Data Language) compatible incremental compiler
@@ -70,6 +73,9 @@
 
 
 %changelog
+* Fri Sep  5 2008 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.rc1.2
+- Add a requires on plplot to pull in drivers (bug#458277)
+
 * Sat Apr  5 2008 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.rc1.1
 - Update to 0.9rc1
 



From salimma at fedoraproject.org  Sat Sep  6 03:57:02 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat,  6 Sep 2008 03:57:02 +0000 (UTC)
Subject: rpms/qsynth/F-9 qsynth-0.3.3-qt4.patch, NONE, 1.1 .cvsignore, 1.2, 
	1.3 qsynth.spec, 1.4, 1.5 sources, 1.2, 1.3 qsynth.desktop, 1.1,
	NONE
Message-ID: <20080906035702.E313A70125@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/qsynth/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19645/F-9

Modified Files:
	.cvsignore qsynth.spec sources 
Added Files:
	qsynth-0.3.3-qt4.patch 
Removed Files:
	qsynth.desktop 
Log Message:
- Fix desktop file and AUTHORS; commit to F-9 branch



qsynth-0.3.3-qt4.patch:

--- NEW FILE qsynth-0.3.3-qt4.patch ---
--- qsynth-0.3.3/configure.qt4	2008-07-10 13:13:33.000000000 -0400
+++ qsynth-0.3.3/configure	2008-09-05 19:16:02.000000000 -0400
@@ -3859,7 +3859,7 @@
 
 # Check for Qt qmake utility.
 # Extract the first word of "qmake", so it can be a program name with args.
-set dummy qmake; ac_word=$2
+set dummy qmake-qt4; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_ac_qmake+set}" = set; then
@@ -3908,7 +3908,7 @@
 
 # Check for Qt moc utility.
 # Extract the first word of "moc", so it can be a program name with args.
-set dummy moc; ac_word=$2
+set dummy moc-qt4; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_ac_moc+set}" = set; then
@@ -3957,7 +3957,7 @@
 
 # Check for Qt uic utility.
 # Extract the first word of "uic", so it can be a program name with args.
-set dummy uic; ac_word=$2
+set dummy uic-qt4; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_ac_uic+set}" = set; then
@@ -4006,7 +4006,7 @@
 
 # Check for Qt lupdate utility.
 # Extract the first word of "lupdate", so it can be a program name with args.
-set dummy lupdate; ac_word=$2
+set dummy lupdate-qt4; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_ac_lupdate+set}" = set; then
@@ -4055,7 +4055,7 @@
 
 # Check for Qt lrelease utility.
 # Extract the first word of "lrelease", so it can be a program name with args.
-set dummy lrelease; ac_word=$2
+set dummy lrelease-qt4; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_ac_lrelease+set}" = set; then


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Jul 2006 22:14:13 -0000	1.2
+++ .cvsignore	6 Sep 2008 03:56:32 -0000	1.3
@@ -1 +1 @@
-qsynth-0.2.5.tar.gz
+qsynth-0.3.3.tar.gz


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-9/qsynth.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qsynth.spec	19 Feb 2008 15:59:43 -0000	1.4
+++ qsynth.spec	6 Sep 2008 03:56:32 -0000	1.5
@@ -2,12 +2,14 @@
 
 Summary: Qt based Fluidsynth GUI front end
 Name: qsynth
-Version: 0.2.5
-Release: 7%{?dist}
+Version: 0.3.3
+Release: 1%{?dist}
 URL: http://qsynth.sourceforge.net
-Source0: http://dl.sf.net/sourceforge/qsynth/qsynth-%{version}.tar.gz
-Source1: qsynth.desktop
-License: GPL
+Source0: http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
+#Source1: qsynth.desktop
+# Fedora qt4 binaries have -qt4 suffix
+Patch0:	 qsynth-0.3.3-qt4.patch
+License: GPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: hicolor-icon-theme
@@ -16,7 +18,7 @@
 
 %description
 QSynth is a fluidsynth GUI front-end application written in C++ around
-the Qt3 toolkit using Qt Designer. Eventually it may evolve into a
+the Qt4 toolkit using Qt Designer. Eventually it may evolve into a
 softsynth management application allowing the user to control and
 manage a variety of command line softsynth but for the moment it wraps
 the excellent FluidSynth. FluidSynth is a command line software
@@ -24,52 +26,53 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .qt4
+iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS
+
 
 %build
 %configure
 %{__make} %{?_smp_mflags}
 
+
 %install
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 
-# move icon to the proper freedesktop location
-%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
-%{__mv} %{buildroot}%{_datadir}/icons/qsynth.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
-
 # desktop file categories
-BASE="X-Fedora Application AudioVideo"
-XTRA="X-Jack X-Synthesis"
+INCORRECT="Applications Multimedia MIDI JACK ALSA"
+BASE="Audio"
+XTRA="X-MIDI X-Jack X-Alsa X-Synthesis"
 
 %{__mkdir} -p %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor %{desktop_vendor} \
+  --delete-original \
   --dir %{buildroot}%{_datadir}/applications    \
+  `for c in ${INCORRECT} ; do echo "--remove-category $c " ; done` \
   `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
-  %{SOURCE1}
+  %{buildroot}%{_datadir}/applications/qsynth.desktop
+
 
 %clean
 %{__rm} -rf %{buildroot}
 
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/qsynth
-%{_datadir}/icons/hicolor/32x32/apps/qsynth.png
+%{_datadir}/pixmaps/qsynth.png
+%{_datadir}/locale/qsynth_*.qm
 %{_datadir}/applications/%{desktop_vendor}-qsynth.desktop
 
+
 %changelog
+* Fri Sep  5 2008 Michel Salim <salimma at fedoraproject.org> - 0.3.3-1
+- Update to 0.3.3
+
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.5-8
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2.5-7
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Jul 2006 22:14:13 -0000	1.2
+++ sources	6 Sep 2008 03:56:32 -0000	1.3
@@ -1 +1 @@
-24a1ce00876a79a409fa28d0e8b3221f  qsynth-0.2.5.tar.gz
+648c49d8935814be03f4001f42b169cf  qsynth-0.3.3.tar.gz


--- qsynth.desktop DELETED ---



From salimma at fedoraproject.org  Sat Sep  6 03:57:02 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat,  6 Sep 2008 03:57:02 +0000 (UTC)
Subject: rpms/qsynth/devel qsynth.spec,1.6,1.7
Message-ID: <20080906035703.000ED70126@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/qsynth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19645/devel

Modified Files:
	qsynth.spec 
Log Message:
- Fix desktop file and AUTHORS; commit to F-9 branch




Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/devel/qsynth.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qsynth.spec	6 Sep 2008 01:47:45 -0000	1.6
+++ qsynth.spec	6 Sep 2008 03:56:32 -0000	1.7
@@ -27,23 +27,29 @@
 %prep
 %setup -q
 %patch0 -p1 -b .qt4
+iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS
+
 
 %build
 %configure
 %{__make} %{?_smp_mflags}
 
+
 %install
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 
 # desktop file categories
-#BASE="X-Fedora Application AudioVideo"
-#XTRA="X-Jack X-Synthesis"
+INCORRECT="Applications Multimedia MIDI JACK ALSA"
+BASE="Audio"
+XTRA="X-MIDI X-Jack X-Alsa X-Synthesis"
 
 %{__mkdir} -p %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor %{desktop_vendor} \
-  --delete-original		     
+  --delete-original \
   --dir %{buildroot}%{_datadir}/applications    \
+  `for c in ${INCORRECT} ; do echo "--remove-category $c " ; done` \
+  `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
   %{buildroot}%{_datadir}/applications/qsynth.desktop
 
 



From salimma at fedoraproject.org  Sat Sep  6 03:58:02 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat,  6 Sep 2008 03:58:02 +0000 (UTC)
Subject: rpms/qsynth/devel qsynth-0.3.3-qt4.patch,NONE,1.1
Message-ID: <20080906035802.8B65B70125@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/qsynth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20114/devel

Added Files:
	qsynth-0.3.3-qt4.patch 
Log Message:
Commit qt4 patch to -devel branch


qsynth-0.3.3-qt4.patch:

--- NEW FILE qsynth-0.3.3-qt4.patch ---
--- qsynth-0.3.3/configure.qt4	2008-07-10 13:13:33.000000000 -0400
+++ qsynth-0.3.3/configure	2008-09-05 19:16:02.000000000 -0400
@@ -3859,7 +3859,7 @@
 
 # Check for Qt qmake utility.
 # Extract the first word of "qmake", so it can be a program name with args.
-set dummy qmake; ac_word=$2
+set dummy qmake-qt4; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_ac_qmake+set}" = set; then
@@ -3908,7 +3908,7 @@
 
 # Check for Qt moc utility.
 # Extract the first word of "moc", so it can be a program name with args.
-set dummy moc; ac_word=$2
+set dummy moc-qt4; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_ac_moc+set}" = set; then
@@ -3957,7 +3957,7 @@
 
 # Check for Qt uic utility.
 # Extract the first word of "uic", so it can be a program name with args.
-set dummy uic; ac_word=$2
+set dummy uic-qt4; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_ac_uic+set}" = set; then
@@ -4006,7 +4006,7 @@
 
 # Check for Qt lupdate utility.
 # Extract the first word of "lupdate", so it can be a program name with args.
-set dummy lupdate; ac_word=$2
+set dummy lupdate-qt4; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_ac_lupdate+set}" = set; then
@@ -4055,7 +4055,7 @@
 
 # Check for Qt lrelease utility.
 # Extract the first word of "lrelease", so it can be a program name with args.
-set dummy lrelease; ac_word=$2
+set dummy lrelease-qt4; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_ac_lrelease+set}" = set; then



From wtogami at fedoraproject.org  Sat Sep  6 04:01:21 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Sat,  6 Sep 2008 04:01:21 +0000 (UTC)
Subject: fedora-release fedora-updates-newkey.repo, NONE,
	1.1.2.1 fedora-updates-testing-newkey.repo, NONE,
	1.1.2.1 fedora-release.spec, 1.58.2.5, 1.58.2.6
Message-ID: <20080906040121.0613570125@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/fedora/fedora-release
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20854

Modified Files:
      Tag: F-9
	fedora-release.spec 
Added Files:
      Tag: F-9
	fedora-updates-newkey.repo fedora-updates-testing-newkey.repo 
Log Message:
transition state between old and new key



--- NEW FILE fedora-updates-newkey.repo ---
[updates]
name=Fedora $releasever - $basearch - Updates Newkey
failovermethod=priority
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch.newkey/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever.newkey&arch=$basearch
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-8-and-9-$basearch

[updates-debuginfo]
name=Fedora $releasever - $basearch - Updates - Debug Newkey
failovermethod=priority
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch.newkey/debug/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever.newkey&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-8-and-9-$basearch

[updates-source]
name=Fedora $releasever - Updates Source Newkey
failovermethod=priority
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/SRPMS.newkey/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f$releasever.newkey&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-8-and-9-$basearch


--- NEW FILE fedora-updates-testing-newkey.repo ---
[updates-testing]
name=Fedora $releasever - $basearch - Test Updates Newkey
failovermethod=priority
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch.newkey/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever.newkey&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-8-and-9-$basearch

[updates-testing-debuginfo]
name=Fedora $releasever - $basearch - Test Updates Debug Newkey
failovermethod=priority
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch.newkey/debug/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f$releasever.newkey&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-8-and-9-$basearch

[updates-testing-source]
name=Fedora $releasever - Test Updates Source Newkey
failovermethod=priority
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/SRPMS.newkey/
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f$releasever.newkey&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-8-and-9-$basearch


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.58.2.5
retrieving revision 1.58.2.6
diff -u -r1.58.2.5 -r1.58.2.6
--- fedora-release.spec	25 Jun 2008 21:38:28 -0000	1.58.2.5
+++ fedora-release.spec	6 Sep 2008 04:01:20 -0000	1.58.2.6
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	9
-Release:	3
+Release:	3.transitiontest1
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -53,6 +53,14 @@
 done
 ln -s RPM-GPG-KEY-fedora-primary RPM-GPG-KEY-fedora
 ln -s RPM-GPG-KEY-fedora-test-primary RPM-GPG-KEY-fedora-test
+# Do the same for newkey
+for arch in i386 x86_64 ppc ppc64
+  do
+  ln -s RPM-GPG-KEY-fedora-8-and-9-primary      RPM-GPG-KEY-fedora-8-and-9-$arch
+  ln -s RPM-GPG-KEY-fedora-test-8-and-9-primary RPM-GPG-KEY-fedora-test-8-and-9-$arch
+done
+ln -s RPM-GPG-KEY-fedora-8-and-9-primary      RPM-GPG-KEY-fedora-8-and-9
+ln -s RPM-GPG-KEY-fedora-test-8-and-9-primary RPM-GPG-KEY-fedora-test-8-and-9
 popd
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
@@ -96,6 +104,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Fri Sep 05 2008 Warren Togami <wtogami at redhat.com> - 9-3.transitiontest1
+- transition state between old and new key
+
 * Wed Jun 25 2008 Jesse Keating <jkeating at redhat.com> - 9-3
 - Add ia64 key
 - Fix config file markings



From wtogami at fedoraproject.org  Sat Sep  6 04:08:46 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Sat,  6 Sep 2008 04:08:46 +0000 (UTC)
Subject: fedora-release fedora-updates-newkey.repo, 1.1.2.1,
	1.1.2.2 fedora-updates-testing-newkey.repo, 1.1.2.1, 1.1.2.2
Message-ID: <20080906040846.759C670125@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/fedora/fedora-release
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22070

Modified Files:
      Tag: F-9
	fedora-updates-newkey.repo fedora-updates-testing-newkey.repo 
Log Message:
Forgot to update the section names.



Index: fedora-updates-newkey.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/Attic/fedora-updates-newkey.repo,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- fedora-updates-newkey.repo	6 Sep 2008 04:01:20 -0000	1.1.2.1
+++ fedora-updates-newkey.repo	6 Sep 2008 04:08:46 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-[updates]
+[updates-newkey]
 name=Fedora $releasever - $basearch - Updates Newkey
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch.newkey/
@@ -7,7 +7,7 @@
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-8-and-9-$basearch
 
-[updates-debuginfo]
+[updates-newkey-debuginfo]
 name=Fedora $releasever - $basearch - Updates - Debug Newkey
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch.newkey/debug/
@@ -16,7 +16,7 @@
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-8-and-9-$basearch
 
-[updates-source]
+[updates-newkey-source]
 name=Fedora $releasever - Updates Source Newkey
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/SRPMS.newkey/


Index: fedora-updates-testing-newkey.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/Attic/fedora-updates-testing-newkey.repo,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- fedora-updates-testing-newkey.repo	6 Sep 2008 04:01:20 -0000	1.1.2.1
+++ fedora-updates-testing-newkey.repo	6 Sep 2008 04:08:46 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-[updates-testing]
+[updates-testing-newkey]
 name=Fedora $releasever - $basearch - Test Updates Newkey
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch.newkey/
@@ -7,7 +7,7 @@
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-8-and-9-$basearch
 
-[updates-testing-debuginfo]
+[updates-testing-newkey-debuginfo]
 name=Fedora $releasever - $basearch - Test Updates Debug Newkey
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch.newkey/debug/
@@ -16,7 +16,7 @@
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-8-and-9-$basearch
 
-[updates-testing-source]
+[updates-testing-newkey-source]
 name=Fedora $releasever - Test Updates Source Newkey
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/SRPMS.newkey/



From orion at fedoraproject.org  Sat Sep  6 04:18:19 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Sat,  6 Sep 2008 04:18:19 +0000 (UTC)
Subject: rpms/gdl/devel gdl-0.9rc1-gcc43.patch, NONE, 1.1 gdl.spec, 1.37,
	1.38 gdl-0.9pre6-gcc43.patch, 1.2, NONE
Message-ID: <20080906041819.77E1170125@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23682

Modified Files:
	gdl.spec 
Added Files:
	gdl-0.9rc1-gcc43.patch 
Removed Files:
	gdl-0.9pre6-gcc43.patch 
Log Message:
Re-sync gcc43 patch


gdl-0.9rc1-gcc43.patch:

--- NEW FILE gdl-0.9rc1-gcc43.patch ---
--- gdl-0.9rc1/src/antlr/TreeParser.cpp.gcc43	2008-04-03 16:09:26.000000000 -0600
+++ gdl-0.9rc1/src/antlr/TreeParser.cpp	2008-09-05 22:06:20.000000000 -0600
@@ -8,6 +8,7 @@
 #include "antlr/TreeParser.hpp"
 #include "antlr/ASTNULLType.hpp"
 #include "antlr/MismatchedTokenException.hpp"
+#include <cstdlib>
 #include <iostream>
 #include <stdio.h>
 
--- gdl-0.9rc1/src/antlr/CharScanner.hpp.gcc43	2008-09-05 22:06:20.000000000 -0600
+++ gdl-0.9rc1/src/antlr/CharScanner.hpp	2008-09-05 22:06:20.000000000 -0600
@@ -14,6 +14,8 @@
 #include <cstring>
 #include <cstdlib>
 
+#include <cstdlib>
+#include <cstring>
 #include <map>
 
 #ifdef HAS_NOT_CCTYPE_H
--- gdl-0.9rc1/src/antlr/Parser.cpp.gcc43	2008-04-03 16:09:26.000000000 -0600
+++ gdl-0.9rc1/src/antlr/Parser.cpp	2008-09-05 22:06:20.000000000 -0600
@@ -11,6 +11,7 @@
 #include "antlr/TokenBuffer.hpp"
 #include "antlr/MismatchedTokenException.hpp"
 //#include "antlr/ASTFactory.hpp"
+#include <cstdlib>
 #include <iostream>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
--- gdl-0.9rc1/src/basic_pro.cpp.gcc43	2008-09-05 22:06:20.000000000 -0600
+++ gdl-0.9rc1/src/basic_pro.cpp	2008-09-05 22:06:20.000000000 -0600
@@ -19,6 +19,7 @@
 
 #include <string>
 #include <fstream>
+#include <iterator>
 #include <memory>
 #include <set>
 #include <iterator>


Index: gdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gdl.spec	6 Sep 2008 03:40:03 -0000	1.37
+++ gdl.spec	6 Sep 2008 04:17:49 -0000	1.38
@@ -11,7 +11,7 @@
 Source2:        gdl.sh
 Patch0:         gdl-0.9rc1-cvs.patch
 Patch1:         gdl-0.9pre5-ppc64.patch
-Patch2:         gdl-0.9pre6-gcc43.patch
+Patch2:         gdl-0.9rc1-gcc43.patch
 Patch3:         gdl-0.9rc1-magick.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 


--- gdl-0.9pre6-gcc43.patch DELETED ---



From rakesh at fedoraproject.org  Sat Sep  6 06:56:32 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat,  6 Sep 2008 06:56:32 +0000 (UTC)
Subject: rpms/coredumper/devel coredumper-remove_linux_dirent_h.patch, NONE, 
	1.1 coredumper.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080906065632.8B3CB70125@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/coredumper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18348/devel

Modified Files:
	.cvsignore sources 
Added Files:
	coredumper-remove_linux_dirent_h.patch coredumper.spec 
	import.log 
Log Message:
initial package import


coredumper-remove_linux_dirent_h.patch:

--- NEW FILE coredumper-remove_linux_dirent_h.patch ---
Common subdirectories: coredumper-1.2.1.org/src/google and coredumper-1.2.1/src/google
diff -u coredumper-1.2.1.org/src/linux_syscall_support_unittest.cc coredumper-1.2.1/src/linux_syscall_support_unittest.cc
--- coredumper-1.2.1.org/src/linux_syscall_support_unittest.cc	2008-08-31 23:57:40.000000000 +0530
+++ coredumper-1.2.1/src/linux_syscall_support_unittest.cc	2008-08-31 23:58:45.000000000 +0530
@@ -62,7 +62,6 @@
 #include <asm/posix_types.h>
 #include <asm/types.h>
 #include <errno.h>
-#include <linux/dirent.h>
 #include <linux/types.h>
 #include <linux/unistd.h>
 #include <signal.h>
@@ -91,8 +90,6 @@
   // there are a small number of data structures (e.g "struct
   // kernel_old_sigaction") that we cannot test at all, as glibc does
   // not have any definitions for them.
-  CHECK(sizeof(struct dirent64)  == sizeof(struct kernel_dirent64));
-  CHECK(sizeof(struct dirent)    == sizeof(struct kernel_dirent));
   CHECK(sizeof(struct iovec)     == sizeof(struct kernel_iovec));
   CHECK(sizeof(struct msghdr)    == sizeof(struct kernel_msghdr));
   CHECK(sizeof(struct pollfd)    == sizeof(struct kernel_pollfd));
diff -u coredumper-1.2.1.org/src/linuxthreads.c coredumper-1.2.1/src/linuxthreads.c
--- coredumper-1.2.1.org/src/linuxthreads.c	2008-08-31 23:57:40.000000000 +0530
+++ coredumper-1.2.1/src/linuxthreads.c	2008-08-31 23:59:06.000000000 +0530
@@ -49,7 +49,6 @@
 #include <asm/fcntl.h>
 #include <asm/posix_types.h>
 #include <asm/types.h>
-#include <linux/dirent.h>
 
 #include "linux_syscall_support.h"
 #include "thread_lister.h"


--- NEW FILE coredumper.spec ---
Name:           coredumper
Version:        1.2.1
Release:        6%{?dist}
Summary:        Library to create core dumps

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:         coredumper-remove_linux_dirent_h.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  binutils, gdb

# Primary Architectures with exclude arch bug number
ExcludeArch:    ia64  #462342
ExcludeArch:    ppc   #461340
ExcludeArch:    ppc64 #461341

# Secondary Architectures
ExcludeArch:    s390, sparc, alpha

%description
The coredumper library can be compiled into applications to create
core dumps of the running program -- without terminating. It supports
both single- and multi-threaded core dumps, even if the kernel does
not natively support multi-threaded core files.

%package devel
Summary:        Development files for %{name}
Group:          Development/Libraries

Requires:       %{name} = %{version}-%{release}

%description devel
This package contains development files for %{name}.

%prep
%setup -q

%patch0 -p1 -b .remove_linux_dirent_h

%build
%configure --enable-static=no

# Omit unused direct shared library dependencies.
sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool

make %{?_smp_mflags}

%check
make check

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name "*.la" -delete

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING
%doc AUTHORS
%doc ChangeLog
%{_libdir}/libcoredumper.so.*

%files devel
%defattr(-,root,root,-)
%doc README
%doc examples
%{_libdir}/libcoredumper.so
%{_mandir}/man3/*
%dir %{_includedir}/google
%{_includedir}/google/*.h

%changelog
* Sat Sep 06 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.1-6
- updated exclude arch field with bug numbers.
- included secondary archs

* Mon Sep 01 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.1-5
- upstream fixed dirent.h problem (applied patch)

* Sun Aug 25 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.1-4
- patch for replacing dirent.h

* Sun Aug 24 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.1-3
- fixed buildrequires

* Sun Aug 24 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.1-2
- added %%check section, moved README to devel
- mv header files back to google directory

* Thu Aug 07 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.1-1
- Initial build


--- NEW FILE import.log ---
coredumper-1_2_1-6_fc9:HEAD:coredumper-1.2.1-6.fc9.src.rpm:1220683353


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/coredumper/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:26:40 -0000	1.1
+++ .cvsignore	6 Sep 2008 06:56:02 -0000	1.2
@@ -0,0 +1 @@
+coredumper-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/coredumper/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:26:40 -0000	1.1
+++ sources	6 Sep 2008 06:56:02 -0000	1.2
@@ -0,0 +1 @@
+05b88bb36c4ba41df4c7d99169b795eb  coredumper-1.2.1.tar.gz



From rakesh at fedoraproject.org  Sat Sep  6 06:56:19 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat,  6 Sep 2008 06:56:19 +0000 (UTC)
Subject: rpms/txt2rss/devel import.log, NONE, 1.1 txt2rss-conf-path.patch,
	NONE, 1.1 txt2rss-license-block.patch, NONE, 1.1 txt2rss.1, NONE,
	1.1 txt2rss.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080906065619.3084A70125@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/txt2rss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18060/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log txt2rss-conf-path.patch txt2rss-license-block.patch 
	txt2rss.1 txt2rss.spec 
Log Message:
initial package import



--- NEW FILE import.log ---
txt2rss-0_1-3_fc9:HEAD:txt2rss-0.1-3.fc9.src.rpm:1220683340

txt2rss-conf-path.patch:

--- NEW FILE txt2rss-conf-path.patch ---
--- txt2rss.org	2008-09-02 19:58:34.000000000 +0530
+++ txt2rss	2008-09-02 20:08:50.000000000 +0530
@@ -82,8 +82,8 @@
 ### MAIN ###
 # if configfile exist, export variables, else exit!
 # Reading configuration file
-if [ -e "txt2rss.conf" ]; then
-	. txt2rss.conf
+if [ -e "/etc/txt2rss/txt2rss.conf" ]; then
+	. /etc/txt2rss/txt2rss.conf
 	export TITLE=$TITLE
 	export LINK=$LINK
 	export DESCRIPTION=$DESCRIPTION

txt2rss-license-block.patch:

--- NEW FILE txt2rss-license-block.patch ---
--- txt2rss.org	2008-08-28 00:25:39.000000000 +0530
+++ txt2rss	2008-08-28 00:41:00.000000000 +0530
@@ -1,11 +1,21 @@
 #!/bin/bash
-
-#############################################################
-# txt2rss - convert a simple txt file to a rss feed file    #
-# Authors:                                                  #
-# Carlos Roberto do Nascimento Costa (crncosta at gmail.com)   #
-# Paulo Ricardo Paz Vital (pvital at gmail.com                 #
-#############################################################
+#
+# txt2rss - convert a simple txt file to a rss feed file
+# Authors:   
+# Carlos Roberto do Nascimento Costa (crncosta at gmail.com)
+# Paulo Ricardo Paz Vital (pvital 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 version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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/>.  
 
 genDescription(){
     LINES=$@


--- NEW FILE txt2rss.1 ---
.TH "txt2rss" 1
.SH NAME
txt2rss \- convert a simple txt file to a rss feed file
.SH SYNOPSIS
.B txt2rss
\fItxt-file \fIoutput-file
.SH DESCRIPTION
txt2rss is a shell script that parses a simple txt file (in a simple
format) and convert it to RSS feed file. Simple to use and intuitive,
      You need to set up a config file (/etc/txt2rss/txt2rss.conf)
with parameter like webmaster's name, link of the site and others,
after you just call the script with txt-file and output-file.

.SH "AUTHORS"
Carlos Roberto do Nascimento Costa <crncosta AT gmail.com> &
.br
Paulo Ricardo Paz Vital <pvital AT gmail.com>
.SH REPORTING BUGS
Bugs should be reported to http://code.google.com/p/txt2rss/issues/list 




--- NEW FILE txt2rss.spec ---
Name:           txt2rss
Version:        0.1
Release:        3%{?dist}
Summary:        Convert from txt to rss

Group:          Applications/Internet
License:        GPLv3
URL:            http://code.google.com/p/%{name}/
Source0:        http://%{name}.googlecode.com/files/%{name}-01.tar.bz2
Source1:        txt2rss.1
Patch0:         txt2rss-license-block.patch
Patch1:         txt2rss-conf-path.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

%description
txt2rss is a shell script that parses a simple txt file (in a simple
format) and convert it to RSS feed file. Simple to use and intuitive,
you need to set up a config file with parameter like webmaster's name,
link of the site and others, after you just call the script with
options like <input file> and a <output file>.

%prep
%setup -q -c %{name}
%patch0 -p0 -b .license-block
%patch1 -p0 -b .conf-path

%build
# Empty build

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/

mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 feed.css $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
install -m 644 news.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/

mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc news.txt feed.css
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf


%changelog
* Tue Sep 02 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-3
- man page, fixed conf file path

* Thu Aug 14 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-2
- applied license block patch

* Thu Aug 14 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/txt2rss/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:38:55 -0000	1.1
+++ .cvsignore	6 Sep 2008 06:55:48 -0000	1.2
@@ -0,0 +1 @@
+txt2rss-01.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/txt2rss/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:38:55 -0000	1.1
+++ sources	6 Sep 2008 06:55:48 -0000	1.2
@@ -0,0 +1 @@
+2dfc9784b25d6a481bc48aaab3644b5a  txt2rss-01.tar.bz2



From rakesh at fedoraproject.org  Sat Sep  6 06:58:47 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat,  6 Sep 2008 06:58:47 +0000 (UTC)
Subject: rpms/coredumper/devel import.log,1.1,1.2
Message-ID: <20080906065847.0A18670125@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/coredumper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18935/devel

Modified Files:
	import.log 
Log Message:
initial package import



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/coredumper/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Sep 2008 06:56:02 -0000	1.1
+++ import.log	6 Sep 2008 06:58:16 -0000	1.2
@@ -1 +1,2 @@
 coredumper-1_2_1-6_fc9:HEAD:coredumper-1.2.1-6.fc9.src.rpm:1220683353
+coredumper-1_2_1-6_fc9:HEAD:coredumper-1.2.1-6.fc9.src.rpm:1220683564



From rakesh at fedoraproject.org  Sat Sep  6 07:00:04 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat,  6 Sep 2008 07:00:04 +0000 (UTC)
Subject: rpms/txt2rss/F-8 import.log, NONE, 1.1 txt2rss-conf-path.patch, NONE,
	1.1 txt2rss-license-block.patch, NONE, 1.1 txt2rss.1, NONE,
	1.1 txt2rss.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080906070004.CEA0C70125@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/txt2rss/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19279/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log txt2rss-conf-path.patch txt2rss-license-block.patch 
	txt2rss.1 txt2rss.spec 
Log Message:
initial package import



--- NEW FILE import.log ---
txt2rss-0_1-3_fc9:F-8:txt2rss-0.1-3.fc9.src.rpm:1220683658

txt2rss-conf-path.patch:

--- NEW FILE txt2rss-conf-path.patch ---
--- txt2rss.org	2008-09-02 19:58:34.000000000 +0530
+++ txt2rss	2008-09-02 20:08:50.000000000 +0530
@@ -82,8 +82,8 @@
 ### MAIN ###
 # if configfile exist, export variables, else exit!
 # Reading configuration file
-if [ -e "txt2rss.conf" ]; then
-	. txt2rss.conf
+if [ -e "/etc/txt2rss/txt2rss.conf" ]; then
+	. /etc/txt2rss/txt2rss.conf
 	export TITLE=$TITLE
 	export LINK=$LINK
 	export DESCRIPTION=$DESCRIPTION

txt2rss-license-block.patch:

--- NEW FILE txt2rss-license-block.patch ---
--- txt2rss.org	2008-08-28 00:25:39.000000000 +0530
+++ txt2rss	2008-08-28 00:41:00.000000000 +0530
@@ -1,11 +1,21 @@
 #!/bin/bash
-
-#############################################################
-# txt2rss - convert a simple txt file to a rss feed file    #
-# Authors:                                                  #
-# Carlos Roberto do Nascimento Costa (crncosta at gmail.com)   #
-# Paulo Ricardo Paz Vital (pvital at gmail.com                 #
-#############################################################
+#
+# txt2rss - convert a simple txt file to a rss feed file
+# Authors:   
+# Carlos Roberto do Nascimento Costa (crncosta at gmail.com)
+# Paulo Ricardo Paz Vital (pvital 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 version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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/>.  
 
 genDescription(){
     LINES=$@


--- NEW FILE txt2rss.1 ---
.TH "txt2rss" 1
.SH NAME
txt2rss \- convert a simple txt file to a rss feed file
.SH SYNOPSIS
.B txt2rss
\fItxt-file \fIoutput-file
.SH DESCRIPTION
txt2rss is a shell script that parses a simple txt file (in a simple
format) and convert it to RSS feed file. Simple to use and intuitive,
      You need to set up a config file (/etc/txt2rss/txt2rss.conf)
with parameter like webmaster's name, link of the site and others,
after you just call the script with txt-file and output-file.

.SH "AUTHORS"
Carlos Roberto do Nascimento Costa <crncosta AT gmail.com> &
.br
Paulo Ricardo Paz Vital <pvital AT gmail.com>
.SH REPORTING BUGS
Bugs should be reported to http://code.google.com/p/txt2rss/issues/list 




--- NEW FILE txt2rss.spec ---
Name:           txt2rss
Version:        0.1
Release:        3%{?dist}
Summary:        Convert from txt to rss

Group:          Applications/Internet
License:        GPLv3
URL:            http://code.google.com/p/%{name}/
Source0:        http://%{name}.googlecode.com/files/%{name}-01.tar.bz2
Source1:        txt2rss.1
Patch0:         txt2rss-license-block.patch
Patch1:         txt2rss-conf-path.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

%description
txt2rss is a shell script that parses a simple txt file (in a simple
format) and convert it to RSS feed file. Simple to use and intuitive,
you need to set up a config file with parameter like webmaster's name,
link of the site and others, after you just call the script with
options like <input file> and a <output file>.

%prep
%setup -q -c %{name}
%patch0 -p0 -b .license-block
%patch1 -p0 -b .conf-path

%build
# Empty build

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/

mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 feed.css $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
install -m 644 news.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/

mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc news.txt feed.css
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf


%changelog
* Tue Sep 02 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-3
- man page, fixed conf file path

* Thu Aug 14 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-2
- applied license block patch

* Thu Aug 14 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/txt2rss/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:38:55 -0000	1.1
+++ .cvsignore	6 Sep 2008 06:59:34 -0000	1.2
@@ -0,0 +1 @@
+txt2rss-01.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/txt2rss/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:38:55 -0000	1.1
+++ sources	6 Sep 2008 06:59:34 -0000	1.2
@@ -0,0 +1 @@
+2dfc9784b25d6a481bc48aaab3644b5a  txt2rss-01.tar.bz2



From rakesh at fedoraproject.org  Sat Sep  6 07:00:27 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat,  6 Sep 2008 07:00:27 +0000 (UTC)
Subject: rpms/coredumper/F-8 coredumper-remove_linux_dirent_h.patch, NONE,
	1.1 coredumper.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080906070027.C2E7C70125@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/coredumper/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19260/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	coredumper-remove_linux_dirent_h.patch coredumper.spec 
	import.log 
Log Message:
initial package import


coredumper-remove_linux_dirent_h.patch:

--- NEW FILE coredumper-remove_linux_dirent_h.patch ---
Common subdirectories: coredumper-1.2.1.org/src/google and coredumper-1.2.1/src/google
diff -u coredumper-1.2.1.org/src/linux_syscall_support_unittest.cc coredumper-1.2.1/src/linux_syscall_support_unittest.cc
--- coredumper-1.2.1.org/src/linux_syscall_support_unittest.cc	2008-08-31 23:57:40.000000000 +0530
+++ coredumper-1.2.1/src/linux_syscall_support_unittest.cc	2008-08-31 23:58:45.000000000 +0530
@@ -62,7 +62,6 @@
 #include <asm/posix_types.h>
 #include <asm/types.h>
 #include <errno.h>
-#include <linux/dirent.h>
 #include <linux/types.h>
 #include <linux/unistd.h>
 #include <signal.h>
@@ -91,8 +90,6 @@
   // there are a small number of data structures (e.g "struct
   // kernel_old_sigaction") that we cannot test at all, as glibc does
   // not have any definitions for them.
-  CHECK(sizeof(struct dirent64)  == sizeof(struct kernel_dirent64));
-  CHECK(sizeof(struct dirent)    == sizeof(struct kernel_dirent));
   CHECK(sizeof(struct iovec)     == sizeof(struct kernel_iovec));
   CHECK(sizeof(struct msghdr)    == sizeof(struct kernel_msghdr));
   CHECK(sizeof(struct pollfd)    == sizeof(struct kernel_pollfd));
diff -u coredumper-1.2.1.org/src/linuxthreads.c coredumper-1.2.1/src/linuxthreads.c
--- coredumper-1.2.1.org/src/linuxthreads.c	2008-08-31 23:57:40.000000000 +0530
+++ coredumper-1.2.1/src/linuxthreads.c	2008-08-31 23:59:06.000000000 +0530
@@ -49,7 +49,6 @@
 #include <asm/fcntl.h>
 #include <asm/posix_types.h>
 #include <asm/types.h>
-#include <linux/dirent.h>
 
 #include "linux_syscall_support.h"
 #include "thread_lister.h"


--- NEW FILE coredumper.spec ---
Name:           coredumper
Version:        1.2.1
Release:        6%{?dist}
Summary:        Library to create core dumps

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:         coredumper-remove_linux_dirent_h.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  binutils, gdb

# Primary Architectures with exclude arch bug number
ExcludeArch:    ia64  #462342
ExcludeArch:    ppc   #461340
ExcludeArch:    ppc64 #461341

# Secondary Architectures
ExcludeArch:    s390, sparc, alpha

%description
The coredumper library can be compiled into applications to create
core dumps of the running program -- without terminating. It supports
both single- and multi-threaded core dumps, even if the kernel does
not natively support multi-threaded core files.

%package devel
Summary:        Development files for %{name}
Group:          Development/Libraries

Requires:       %{name} = %{version}-%{release}

%description devel
This package contains development files for %{name}.

%prep
%setup -q

%patch0 -p1 -b .remove_linux_dirent_h

%build
%configure --enable-static=no

# Omit unused direct shared library dependencies.
sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool

make %{?_smp_mflags}

%check
make check

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name "*.la" -delete

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING
%doc AUTHORS
%doc ChangeLog
%{_libdir}/libcoredumper.so.*

%files devel
%defattr(-,root,root,-)
%doc README
%doc examples
%{_libdir}/libcoredumper.so
%{_mandir}/man3/*
%dir %{_includedir}/google
%{_includedir}/google/*.h

%changelog
* Sat Sep 06 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.1-6
- updated exclude arch field with bug numbers.
- included secondary archs

* Mon Sep 01 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.1-5
- upstream fixed dirent.h problem (applied patch)

* Sun Aug 25 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.1-4
- patch for replacing dirent.h

* Sun Aug 24 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.1-3
- fixed buildrequires

* Sun Aug 24 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.1-2
- added %%check section, moved README to devel
- mv header files back to google directory

* Thu Aug 07 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.1-1
- Initial build


--- NEW FILE import.log ---
coredumper-1_2_1-6_fc9:F-8:coredumper-1.2.1-6.fc9.src.rpm:1220683657


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/coredumper/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:26:40 -0000	1.1
+++ .cvsignore	6 Sep 2008 06:59:57 -0000	1.2
@@ -0,0 +1 @@
+coredumper-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/coredumper/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:26:40 -0000	1.1
+++ sources	6 Sep 2008 06:59:57 -0000	1.2
@@ -0,0 +1 @@
+05b88bb36c4ba41df4c7d99169b795eb  coredumper-1.2.1.tar.gz



From rakesh at fedoraproject.org  Sat Sep  6 07:08:57 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat,  6 Sep 2008 07:08:57 +0000 (UTC)
Subject: rpms/txt2rss/F-9 import.log, NONE, 1.1 txt2rss-conf-path.patch, NONE,
	1.1 txt2rss-license-block.patch, NONE, 1.1 txt2rss.1, NONE,
	1.1 txt2rss.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080906070857.D2FA070125@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/txt2rss/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21716/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log txt2rss-conf-path.patch txt2rss-license-block.patch 
	txt2rss.1 txt2rss.spec 
Log Message:
initial package import



--- NEW FILE import.log ---
txt2rss-0_1-3_fc9:F-9:txt2rss-0.1-3.fc9.src.rpm:1220684212

txt2rss-conf-path.patch:

--- NEW FILE txt2rss-conf-path.patch ---
--- txt2rss.org	2008-09-02 19:58:34.000000000 +0530
+++ txt2rss	2008-09-02 20:08:50.000000000 +0530
@@ -82,8 +82,8 @@
 ### MAIN ###
 # if configfile exist, export variables, else exit!
 # Reading configuration file
-if [ -e "txt2rss.conf" ]; then
-	. txt2rss.conf
+if [ -e "/etc/txt2rss/txt2rss.conf" ]; then
+	. /etc/txt2rss/txt2rss.conf
 	export TITLE=$TITLE
 	export LINK=$LINK
 	export DESCRIPTION=$DESCRIPTION

txt2rss-license-block.patch:

--- NEW FILE txt2rss-license-block.patch ---
--- txt2rss.org	2008-08-28 00:25:39.000000000 +0530
+++ txt2rss	2008-08-28 00:41:00.000000000 +0530
@@ -1,11 +1,21 @@
 #!/bin/bash
-
-#############################################################
-# txt2rss - convert a simple txt file to a rss feed file    #
-# Authors:                                                  #
-# Carlos Roberto do Nascimento Costa (crncosta at gmail.com)   #
-# Paulo Ricardo Paz Vital (pvital at gmail.com                 #
-#############################################################
+#
+# txt2rss - convert a simple txt file to a rss feed file
+# Authors:   
+# Carlos Roberto do Nascimento Costa (crncosta at gmail.com)
+# Paulo Ricardo Paz Vital (pvital 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 version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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/>.  
 
 genDescription(){
     LINES=$@


--- NEW FILE txt2rss.1 ---
.TH "txt2rss" 1
.SH NAME
txt2rss \- convert a simple txt file to a rss feed file
.SH SYNOPSIS
.B txt2rss
\fItxt-file \fIoutput-file
.SH DESCRIPTION
txt2rss is a shell script that parses a simple txt file (in a simple
format) and convert it to RSS feed file. Simple to use and intuitive,
      You need to set up a config file (/etc/txt2rss/txt2rss.conf)
with parameter like webmaster's name, link of the site and others,
after you just call the script with txt-file and output-file.

.SH "AUTHORS"
Carlos Roberto do Nascimento Costa <crncosta AT gmail.com> &
.br
Paulo Ricardo Paz Vital <pvital AT gmail.com>
.SH REPORTING BUGS
Bugs should be reported to http://code.google.com/p/txt2rss/issues/list 




--- NEW FILE txt2rss.spec ---
Name:           txt2rss
Version:        0.1
Release:        3%{?dist}
Summary:        Convert from txt to rss

Group:          Applications/Internet
License:        GPLv3
URL:            http://code.google.com/p/%{name}/
Source0:        http://%{name}.googlecode.com/files/%{name}-01.tar.bz2
Source1:        txt2rss.1
Patch0:         txt2rss-license-block.patch
Patch1:         txt2rss-conf-path.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

%description
txt2rss is a shell script that parses a simple txt file (in a simple
format) and convert it to RSS feed file. Simple to use and intuitive,
you need to set up a config file with parameter like webmaster's name,
link of the site and others, after you just call the script with
options like <input file> and a <output file>.

%prep
%setup -q -c %{name}
%patch0 -p0 -b .license-block
%patch1 -p0 -b .conf-path

%build
# Empty build

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/

mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 feed.css $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
install -m 644 news.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/

mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc news.txt feed.css
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf


%changelog
* Tue Sep 02 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-3
- man page, fixed conf file path

* Thu Aug 14 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-2
- applied license block patch

* Thu Aug 14 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/txt2rss/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:38:55 -0000	1.1
+++ .cvsignore	6 Sep 2008 07:08:27 -0000	1.2
@@ -0,0 +1 @@
+txt2rss-01.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/txt2rss/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:38:55 -0000	1.1
+++ sources	6 Sep 2008 07:08:27 -0000	1.2
@@ -0,0 +1 @@
+2dfc9784b25d6a481bc48aaab3644b5a  txt2rss-01.tar.bz2



From rakesh at fedoraproject.org  Sat Sep  6 07:09:08 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat,  6 Sep 2008 07:09:08 +0000 (UTC)
Subject: rpms/coredumper/F-9 coredumper-remove_linux_dirent_h.patch, NONE,
	1.1 coredumper.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080906070908.42CF570125@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/coredumper/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21681/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	coredumper-remove_linux_dirent_h.patch coredumper.spec 
	import.log 
Log Message:
initial package import


coredumper-remove_linux_dirent_h.patch:

--- NEW FILE coredumper-remove_linux_dirent_h.patch ---
Common subdirectories: coredumper-1.2.1.org/src/google and coredumper-1.2.1/src/google
diff -u coredumper-1.2.1.org/src/linux_syscall_support_unittest.cc coredumper-1.2.1/src/linux_syscall_support_unittest.cc
--- coredumper-1.2.1.org/src/linux_syscall_support_unittest.cc	2008-08-31 23:57:40.000000000 +0530
+++ coredumper-1.2.1/src/linux_syscall_support_unittest.cc	2008-08-31 23:58:45.000000000 +0530
@@ -62,7 +62,6 @@
 #include <asm/posix_types.h>
 #include <asm/types.h>
 #include <errno.h>
-#include <linux/dirent.h>
 #include <linux/types.h>
 #include <linux/unistd.h>
 #include <signal.h>
@@ -91,8 +90,6 @@
   // there are a small number of data structures (e.g "struct
   // kernel_old_sigaction") that we cannot test at all, as glibc does
   // not have any definitions for them.
-  CHECK(sizeof(struct dirent64)  == sizeof(struct kernel_dirent64));
-  CHECK(sizeof(struct dirent)    == sizeof(struct kernel_dirent));
   CHECK(sizeof(struct iovec)     == sizeof(struct kernel_iovec));
   CHECK(sizeof(struct msghdr)    == sizeof(struct kernel_msghdr));
   CHECK(sizeof(struct pollfd)    == sizeof(struct kernel_pollfd));
diff -u coredumper-1.2.1.org/src/linuxthreads.c coredumper-1.2.1/src/linuxthreads.c
--- coredumper-1.2.1.org/src/linuxthreads.c	2008-08-31 23:57:40.000000000 +0530
+++ coredumper-1.2.1/src/linuxthreads.c	2008-08-31 23:59:06.000000000 +0530
@@ -49,7 +49,6 @@
 #include <asm/fcntl.h>
 #include <asm/posix_types.h>
 #include <asm/types.h>
-#include <linux/dirent.h>
 
 #include "linux_syscall_support.h"
 #include "thread_lister.h"


--- NEW FILE coredumper.spec ---
Name:           coredumper
Version:        1.2.1
Release:        6%{?dist}
Summary:        Library to create core dumps

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:         coredumper-remove_linux_dirent_h.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  binutils, gdb

# Primary Architectures with exclude arch bug number
ExcludeArch:    ia64  #462342
ExcludeArch:    ppc   #461340
ExcludeArch:    ppc64 #461341

# Secondary Architectures
ExcludeArch:    s390, sparc, alpha

%description
The coredumper library can be compiled into applications to create
core dumps of the running program -- without terminating. It supports
both single- and multi-threaded core dumps, even if the kernel does
not natively support multi-threaded core files.

%package devel
Summary:        Development files for %{name}
Group:          Development/Libraries

Requires:       %{name} = %{version}-%{release}

%description devel
This package contains development files for %{name}.

%prep
%setup -q

%patch0 -p1 -b .remove_linux_dirent_h

%build
%configure --enable-static=no

# Omit unused direct shared library dependencies.
sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool

make %{?_smp_mflags}

%check
make check

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name "*.la" -delete

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING
%doc AUTHORS
%doc ChangeLog
%{_libdir}/libcoredumper.so.*

%files devel
%defattr(-,root,root,-)
%doc README
%doc examples
%{_libdir}/libcoredumper.so
%{_mandir}/man3/*
%dir %{_includedir}/google
%{_includedir}/google/*.h

%changelog
* Sat Sep 06 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.1-6
- updated exclude arch field with bug numbers.
- included secondary archs

* Mon Sep 01 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.1-5
- upstream fixed dirent.h problem (applied patch)

* Sun Aug 25 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.1-4
- patch for replacing dirent.h

* Sun Aug 24 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.1-3
- fixed buildrequires

* Sun Aug 24 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.1-2
- added %%check section, moved README to devel
- mv header files back to google directory

* Thu Aug 07 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.1-1
- Initial build


--- NEW FILE import.log ---
coredumper-1_2_1-6_fc9:F-9:coredumper-1.2.1-6.fc9.src.rpm:1220684195


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/coredumper/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:26:40 -0000	1.1
+++ .cvsignore	6 Sep 2008 07:08:38 -0000	1.2
@@ -0,0 +1 @@
+coredumper-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/coredumper/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:26:40 -0000	1.1
+++ sources	6 Sep 2008 07:08:38 -0000	1.2
@@ -0,0 +1 @@
+05b88bb36c4ba41df4c7d99169b795eb  coredumper-1.2.1.tar.gz



From rakesh at fedoraproject.org  Sat Sep  6 07:11:03 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat,  6 Sep 2008 07:11:03 +0000 (UTC)
Subject: rpms/ctemplate/devel ctemplate.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080906071103.AA13170125@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ctemplate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22321/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ctemplate.spec import.log 
Log Message:
initial package import



--- NEW FILE ctemplate.spec ---
Name:           ctemplate
Version:        0.91
Release:        2%{?dist}
Summary:        A simple but powerful template language for C++

Group:          Development/Tools
License:        BSD
URL:            http://code.google.com/p/google-ctemplate/
Source0:        http://google-ctemplate.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  chrpath

%description
CTemplate is a simple but powerful template language for C++. It
emphasizes separating logic from presentation: it is impossible to
embed application logic in this template language.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q

%build
%configure --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|^PTHREAD_LIBS = |PTHREAD_LIBS = -lpthread|g' Makefile

# Omit unused direct shared library dependencies.
sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool

make %{?_smp_mflags}

%check
make check

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
mv $RPM_BUILD_ROOT%{_includedir}/google/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/

find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'

# Remove rpaths.
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libctemplate_nothreads.so.0.0.0
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libctemplate.so.0.0.0
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/make_tpl_varnames_h
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/diff_tpl_auto_escape

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING INSTALL README
%doc doc/designstyle.css
%{_bindir}/diff_tpl_auto_escape
%{_bindir}/make_tpl_varnames_h
%{_bindir}/template-converter
%{_libdir}/libctemplate_nothreads.so.*
%{_libdir}/libctemplate.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/*.html
%{_libdir}/libctemplate_nothreads.so
%{_libdir}/libctemplate.so
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/*.h

%changelog
* Wed Sep 03 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.91-2
- Added %%check section to run tests

* Sun Aug 24 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.91-1
- Update to 0.91 & removed missing header files patch

* Fri Aug 22 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.90-2
- fix undefined-non-weak-symbol & rpath issue

* Thu Aug 14 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.90-1
-Initial build


--- NEW FILE import.log ---
ctemplate-0_91-2_fc10:HEAD:ctemplate-0.91-2.fc10.src.rpm:1220684308


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:57:52 -0000	1.1
+++ .cvsignore	6 Sep 2008 07:10:33 -0000	1.2
@@ -0,0 +1 @@
+ctemplate-0.91.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:57:52 -0000	1.1
+++ sources	6 Sep 2008 07:10:33 -0000	1.2
@@ -0,0 +1 @@
+0270ab187e32f31cd759736049d4d1bb  ctemplate-0.91.tar.gz



From rakesh at fedoraproject.org  Sat Sep  6 07:13:53 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat,  6 Sep 2008 07:13:53 +0000 (UTC)
Subject: rpms/ctemplate/F-8 ctemplate.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080906071353.1D88070125@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ctemplate/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23207/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	ctemplate.spec import.log 
Log Message:
initial package import



--- NEW FILE ctemplate.spec ---
Name:           ctemplate
Version:        0.91
Release:        2%{?dist}
Summary:        A simple but powerful template language for C++

Group:          Development/Tools
License:        BSD
URL:            http://code.google.com/p/google-ctemplate/
Source0:        http://google-ctemplate.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  chrpath

%description
CTemplate is a simple but powerful template language for C++. It
emphasizes separating logic from presentation: it is impossible to
embed application logic in this template language.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q

%build
%configure --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|^PTHREAD_LIBS = |PTHREAD_LIBS = -lpthread|g' Makefile

# Omit unused direct shared library dependencies.
sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool

make %{?_smp_mflags}

%check
make check

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
mv $RPM_BUILD_ROOT%{_includedir}/google/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/

find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'

# Remove rpaths.
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libctemplate_nothreads.so.0.0.0
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libctemplate.so.0.0.0
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/make_tpl_varnames_h
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/diff_tpl_auto_escape

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING INSTALL README
%doc doc/designstyle.css
%{_bindir}/diff_tpl_auto_escape
%{_bindir}/make_tpl_varnames_h
%{_bindir}/template-converter
%{_libdir}/libctemplate_nothreads.so.*
%{_libdir}/libctemplate.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/*.html
%{_libdir}/libctemplate_nothreads.so
%{_libdir}/libctemplate.so
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/*.h

%changelog
* Wed Sep 03 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.91-2
- Added %%check section to run tests

* Sun Aug 24 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.91-1
- Update to 0.91 & removed missing header files patch

* Fri Aug 22 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.90-2
- fix undefined-non-weak-symbol & rpath issue

* Thu Aug 14 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.90-1
-Initial build


--- NEW FILE import.log ---
ctemplate-0_91-2_fc10:F-8:ctemplate-0.91-2.fc10.src.rpm:1220684515


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:57:52 -0000	1.1
+++ .cvsignore	6 Sep 2008 07:13:22 -0000	1.2
@@ -0,0 +1 @@
+ctemplate-0.91.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:57:52 -0000	1.1
+++ sources	6 Sep 2008 07:13:22 -0000	1.2
@@ -0,0 +1 @@
+0270ab187e32f31cd759736049d4d1bb  ctemplate-0.91.tar.gz



From rakesh at fedoraproject.org  Sat Sep  6 07:17:11 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat,  6 Sep 2008 07:17:11 +0000 (UTC)
Subject: rpms/ctemplate/F-9 ctemplate.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080906071711.1166170125@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ctemplate/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23965/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	ctemplate.spec import.log 
Log Message:
initial package import



--- NEW FILE ctemplate.spec ---
Name:           ctemplate
Version:        0.91
Release:        2%{?dist}
Summary:        A simple but powerful template language for C++

Group:          Development/Tools
License:        BSD
URL:            http://code.google.com/p/google-ctemplate/
Source0:        http://google-ctemplate.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  chrpath

%description
CTemplate is a simple but powerful template language for C++. It
emphasizes separating logic from presentation: it is impossible to
embed application logic in this template language.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q

%build
%configure --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|^PTHREAD_LIBS = |PTHREAD_LIBS = -lpthread|g' Makefile

# Omit unused direct shared library dependencies.
sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool

make %{?_smp_mflags}

%check
make check

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
mv $RPM_BUILD_ROOT%{_includedir}/google/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/

find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'

# Remove rpaths.
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libctemplate_nothreads.so.0.0.0
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libctemplate.so.0.0.0
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/make_tpl_varnames_h
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/diff_tpl_auto_escape

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING INSTALL README
%doc doc/designstyle.css
%{_bindir}/diff_tpl_auto_escape
%{_bindir}/make_tpl_varnames_h
%{_bindir}/template-converter
%{_libdir}/libctemplate_nothreads.so.*
%{_libdir}/libctemplate.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/*.html
%{_libdir}/libctemplate_nothreads.so
%{_libdir}/libctemplate.so
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/*.h

%changelog
* Wed Sep 03 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.91-2
- Added %%check section to run tests

* Sun Aug 24 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.91-1
- Update to 0.91 & removed missing header files patch

* Fri Aug 22 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.90-2
- fix undefined-non-weak-symbol & rpath issue

* Thu Aug 14 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.90-1
-Initial build


--- NEW FILE import.log ---
ctemplate-0_91-2_fc10:F-9:ctemplate-0.91-2.fc10.src.rpm:1220684676


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:57:52 -0000	1.1
+++ .cvsignore	6 Sep 2008 07:16:40 -0000	1.2
@@ -0,0 +1 @@
+ctemplate-0.91.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:57:52 -0000	1.1
+++ sources	6 Sep 2008 07:16:40 -0000	1.2
@@ -0,0 +1 @@
+0270ab187e32f31cd759736049d4d1bb  ctemplate-0.91.tar.gz



From awjb at fedoraproject.org  Sat Sep  6 07:19:29 2008
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sat,  6 Sep 2008 07:19:29 +0000 (UTC)
Subject: rpms/scribus/devel scribus.spec,1.33,1.34
Message-ID: <20080906071929.A5BCF70125@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/scribus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24650

Modified Files:
	scribus.spec 
Log Message:
- fix spec file



Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- scribus.spec	5 Sep 2008 22:21:10 -0000	1.33
+++ scribus.spec	6 Sep 2008 07:18:59 -0000	1.34
@@ -7,8 +7,8 @@
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.scribus.net/
-# obtained via svn co -r 12419 svn://scribus.info/Scribus/trunk/Scribus
-Source0:        scribus-svn-12419.tar.bz2
+# obtained via svn co -r 12516 svn://scribus.info/Scribus/trunk/Scribus
+Source0:        scribus-svn-12516.tar.bz2
 Source1:        scribus.xml
 Source2:	scribus.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From abompard at fedoraproject.org  Sat Sep  6 07:42:55 2008
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sat,  6 Sep 2008 07:42:55 +0000 (UTC)
Subject: rpms/grisbi/devel grisbi.spec,1.18,1.19
Message-ID: <20080906074255.B331C70125@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/grisbi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28726

Modified Files:
	grisbi.spec 
Log Message:
* Sat Sep 06 2008 Aurelien Bompard <abompard at fedoraproject.org> 0.5.9-6
- use texlive instead of tetex



Index: grisbi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grisbi/devel/grisbi.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- grisbi.spec	18 Feb 2008 18:14:55 -0000	1.18
+++ grisbi.spec	6 Sep 2008 07:42:25 -0000	1.19
@@ -1,7 +1,7 @@
 %define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help
 Name:		grisbi
 Version:	0.5.9
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Personal finances manager
 
 Group:		Applications/Productivity
@@ -17,7 +17,7 @@
 BuildRequires:	desktop-file-utils, libofx-devel >= 0.7.0
 Requires:	xdg-utils
 # for report generation
-Requires:	tetex-unicode, tetex-dvips
+Requires:	texlive-texmf-latex, texlive-dvips
 
 %description
 Grisbi is a very functional personal financial management program
@@ -114,6 +114,9 @@
 %ghost %{_datadir}/doc/%{name}/help/fr/grisbi-manuel.html
 
 %changelog
+* Sat Sep 06 2008 Aurelien Bompard <abompard at fedoraproject.org> 0.5.9-6
+- use texlive instead of tetex
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.9-5
 - Autorebuild for GCC 4.3
 



From awjb at fedoraproject.org  Sat Sep  6 07:50:28 2008
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sat,  6 Sep 2008 07:50:28 +0000 (UTC)
Subject: rpms/aterm/F-9 aterm-stropts.patch,NONE,1.1 aterm.spec,1.18,1.19
Message-ID: <20080906075028.0B63770125@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/aterm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30040/F-9

Modified Files:
	aterm.spec 
Added Files:
	aterm-stropts.patch 
Log Message:
- fix #440779


aterm-stropts.patch:

--- NEW FILE aterm-stropts.patch ---
--- src/command.c.orig	2008-09-06 09:10:26.000000000 +0200
+++ src/command.c	2008-09-06 09:40:00.000000000 +0200
@@ -89,7 +89,7 @@
 # include <grp.h>
 #endif
 
-#if defined (__svr4__) || defined (__lnx21__)
+#if 0
 # include <sys/resource.h>	/* for struct rlimit */
 # include <sys/stropts.h>	/* for I_PUSH */
 # define _NEW_TTY_CTRL		/* to get proper defines in <termios.h> */
@@ -672,7 +672,7 @@
 	print_error("can't open slave tty %s", ttydev);
 	exit(EXIT_FAILURE);
     }
-#if defined (__svr4__) || defined (__lnx21__)
+#if 0
 /*
  * Push STREAMS modules:
  *    ptem: pseudo-terminal hardware emulation module.


Index: aterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aterm/F-9/aterm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- aterm.spec	11 Feb 2008 16:06:12 -0000	1.18
+++ aterm.spec	6 Sep 2008 07:49:57 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           aterm
 Version:        1.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Afterstep XVT, VT102 emulator for the X Window system
 Group:          User Interface/X
@@ -9,6 +9,7 @@
 Source0:        ftp://ftp.afterstep.org/apps/aterm/aterm-1.0.1.tar.bz2
 Source1:        aterm.desktop
 Patch0:         aterm-debuginfo.patch
+Patch1:         aterm-stropts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  desktop-file-utils
@@ -28,6 +29,7 @@
 %prep
 %setup -q
 %patch0
+%patch1
 
 %build
 %configure --enable-fading --enable-background-image \
@@ -65,6 +67,9 @@
 
 
 %changelog
+* Sat Sep 06 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 1.0.1-3
+- fix #440779
+
 * Mon Feb 11 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 1.0.1-2
 - Rebuilt for gcc43
 



From awjb at fedoraproject.org  Sat Sep  6 07:50:28 2008
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sat,  6 Sep 2008 07:50:28 +0000 (UTC)
Subject: rpms/aterm/devel aterm-stropts.patch,NONE,1.1 aterm.spec,1.18,1.19
Message-ID: <20080906075028.3968370125@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/aterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30040/devel

Modified Files:
	aterm.spec 
Added Files:
	aterm-stropts.patch 
Log Message:
- fix #440779


aterm-stropts.patch:

--- NEW FILE aterm-stropts.patch ---
--- src/command.c.orig	2008-09-06 09:10:26.000000000 +0200
+++ src/command.c	2008-09-06 09:40:00.000000000 +0200
@@ -89,7 +89,7 @@
 # include <grp.h>
 #endif
 
-#if defined (__svr4__) || defined (__lnx21__)
+#if 0
 # include <sys/resource.h>	/* for struct rlimit */
 # include <sys/stropts.h>	/* for I_PUSH */
 # define _NEW_TTY_CTRL		/* to get proper defines in <termios.h> */
@@ -672,7 +672,7 @@
 	print_error("can't open slave tty %s", ttydev);
 	exit(EXIT_FAILURE);
     }
-#if defined (__svr4__) || defined (__lnx21__)
+#if 0
 /*
  * Push STREAMS modules:
  *    ptem: pseudo-terminal hardware emulation module.


Index: aterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aterm/devel/aterm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- aterm.spec	11 Feb 2008 16:06:12 -0000	1.18
+++ aterm.spec	6 Sep 2008 07:49:57 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           aterm
 Version:        1.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Afterstep XVT, VT102 emulator for the X Window system
 Group:          User Interface/X
@@ -9,6 +9,7 @@
 Source0:        ftp://ftp.afterstep.org/apps/aterm/aterm-1.0.1.tar.bz2
 Source1:        aterm.desktop
 Patch0:         aterm-debuginfo.patch
+Patch1:         aterm-stropts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  desktop-file-utils
@@ -28,6 +29,7 @@
 %prep
 %setup -q
 %patch0
+%patch1
 
 %build
 %configure --enable-fading --enable-background-image \
@@ -65,6 +67,9 @@
 
 
 %changelog
+* Sat Sep 06 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 1.0.1-3
+- fix #440779
+
 * Mon Feb 11 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 1.0.1-2
 - Rebuilt for gcc43
 



From abompard at fedoraproject.org  Sat Sep  6 08:10:12 2008
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sat,  6 Sep 2008 08:10:12 +0000 (UTC)
Subject: rpms/grisbi/devel grisbi-0.5.9-xdgopen.patch, NONE, 1.1 grisbi.spec,
	1.19, 1.20 grisbi-0.5.5-htmlview.diff, 1.2, NONE
Message-ID: <20080906081012.7641C70125@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/grisbi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1478

Modified Files:
	grisbi.spec 
Added Files:
	grisbi-0.5.9-xdgopen.patch 
Removed Files:
	grisbi-0.5.5-htmlview.diff 
Log Message:
* Sat Sep 06 2008 Aurelien Bompard <abompard at fedoraproject.org> 0.5.9-7
- rediff patch0


grisbi-0.5.9-xdgopen.patch:

--- NEW FILE grisbi-0.5.9-xdgopen.patch ---
diff -up ./src/constants.h.xdgopen ./src/constants.h
--- ./src/constants.h.xdgopen	2005-02-13 14:36:45.000000000 +0100
+++ ./src/constants.h	2008-09-06 10:05:57.000000000 +0200
@@ -113,7 +113,7 @@
 #endif
 
 /* quelques chaines de configuration*/
-#define ETAT_WWW_BROWSER "mozilla"
+#define ETAT_WWW_BROWSER "xdg-open"
 
 /* To be portable on little screen like Zaurus */
 #define LOWEST_RESOLUTION 639


Index: grisbi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grisbi/devel/grisbi.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- grisbi.spec	6 Sep 2008 07:42:25 -0000	1.19
+++ grisbi.spec	6 Sep 2008 08:09:42 -0000	1.20
@@ -1,7 +1,7 @@
 %define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help
 Name:		grisbi
 Version:	0.5.9
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Personal finances manager
 
 Group:		Applications/Productivity
@@ -9,7 +9,7 @@
 URL:		http://www.grisbi.org
 Source0:	http://dl.sf.net/grisbi/%{name}-%{version}.tar.bz2
 Source1:	%{name}.desktop
-Patch0:		%{name}-0.5.5-htmlview.diff
+Patch0:		grisbi-0.5.9-xdgopen.patch
 Patch1:     grisbi-0.5.9-check.g_free.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,7 +33,7 @@
 
 %prep
 %setup -q
-%patch0
+%patch0 -p0 -b .xdgopen
 %patch1 -p1 -b .check-g_free
 
 %build
@@ -114,6 +114,9 @@
 %ghost %{_datadir}/doc/%{name}/help/fr/grisbi-manuel.html
 
 %changelog
+* Sat Sep 06 2008 Aurelien Bompard <abompard at fedoraproject.org> 0.5.9-7
+- rediff patch0
+
 * Sat Sep 06 2008 Aurelien Bompard <abompard at fedoraproject.org> 0.5.9-6
 - use texlive instead of tetex
 


--- grisbi-0.5.5-htmlview.diff DELETED ---



From awjb at fedoraproject.org  Sat Sep  6 08:12:18 2008
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sat,  6 Sep 2008 08:12:18 +0000 (UTC)
Subject: rpms/fluxbox/F-8 .cvsignore, 1.10, 1.11 fluxbox.spec, 1.26,
	1.27 sources, 1.10, 1.11
Message-ID: <20080906081218.4804270125@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/fluxbox/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1881/F-8

Modified Files:
	.cvsignore fluxbox.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fluxbox/F-8/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	8 Oct 2007 21:52:52 -0000	1.10
+++ .cvsignore	6 Sep 2008 08:11:47 -0000	1.11
@@ -1 +1 @@
-fluxbox-1.0.0.tar.bz2
+fluxbox-1.1.0.1.tar.bz2


Index: fluxbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fluxbox/F-8/fluxbox.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- fluxbox.spec	3 Jan 2008 11:32:53 -0000	1.26
+++ fluxbox.spec	6 Sep 2008 08:11:47 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           fluxbox
-Version:        1.0.0
-Release:        2%{?dist}
+Version:        1.1.0.1
+Release:        1%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -8,10 +8,11 @@
 License:        MIT
 URL:            http://fluxbox.sourceforge.net
 
-Source0:        http://download.sourceforge.net/fluxbox/fluxbox-1.0.0.tar.bz2
+Source0:        http://download.sourceforge.net/fluxbox/fluxbox-1.1.0.1.tar.bz2
 Source3:        fluxbox.desktop
 Source4:        fluxbox-xdg-menu.py
 Patch0:         fluxbox-startfluxbox-pulseaudio.patch
+Patch1:         fluxbox-gcc43.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 BuildRequires:  imlib2-devel
@@ -52,6 +53,7 @@
 %prep
 %setup -q
 %patch0
+%patch1 -p1 -b .gcc43
 
 %build
 %configure      --enable-xft \
@@ -88,6 +90,7 @@
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 %{_bindir}/*
 %{_mandir}/man1/*
+%{_mandir}/man5/*
 %{_datadir}/%{name}
 %{_datadir}/xsessions/fluxbox.desktop
 
@@ -96,6 +99,23 @@
 %{_sysconfdir}/fluxbox-pulseaudio
 
 %changelog
+* Sat Sep 06 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.0.1-1
+- version upgrade
+
+* Wed Sep 03 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.0-1
+- version upgrade
+
+* Thu Mar 27 2008 Christopher Aillon <caillon at redhat.com> - 1.0.0-5
+- Fix the build against GCC 4.3
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.0-4
+- Autorebuild for GCC 4.3
+
+* Mon Feb 11 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 1.0.0-3
+- Rebuilt for gcc43
+
 * Thu Jan 03 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.0.0-2
 - add subpage -pulseaudio to fix #388971: fluxbox fails to start pulseaudio


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fluxbox/F-8/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	8 Oct 2007 21:52:52 -0000	1.10
+++ sources	6 Sep 2008 08:11:47 -0000	1.11
@@ -1 +1 @@
-990e276ead0d04421dce4080f485caca  fluxbox-1.0.0.tar.bz2
+421366dbb21592196b5dde6c8ea11229  fluxbox-1.1.0.1.tar.bz2



From awjb at fedoraproject.org  Sat Sep  6 08:12:19 2008
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sat,  6 Sep 2008 08:12:19 +0000 (UTC)
Subject: rpms/fluxbox/devel .cvsignore, 1.10, 1.11 fluxbox.spec, 1.29,
	1.30 sources, 1.10, 1.11
Message-ID: <20080906081219.9965370127@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/fluxbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1881/devel

Modified Files:
	.cvsignore fluxbox.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fluxbox/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	8 Oct 2007 21:52:52 -0000	1.10
+++ .cvsignore	6 Sep 2008 08:11:48 -0000	1.11
@@ -1 +1 @@
-fluxbox-1.0.0.tar.bz2
+fluxbox-1.1.0.1.tar.bz2


Index: fluxbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fluxbox/devel/fluxbox.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- fluxbox.spec	27 Mar 2008 05:24:49 -0000	1.29
+++ fluxbox.spec	6 Sep 2008 08:11:48 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           fluxbox
-Version:        1.0.0
-Release:        5%{?dist}
+Version:        1.1.0.1
+Release:        1%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -8,7 +8,7 @@
 License:        MIT
 URL:            http://fluxbox.sourceforge.net
 
-Source0:        http://download.sourceforge.net/fluxbox/fluxbox-1.0.0.tar.bz2
+Source0:        http://download.sourceforge.net/fluxbox/fluxbox-1.1.0.1.tar.bz2
 Source3:        fluxbox.desktop
 Source4:        fluxbox-xdg-menu.py
 Patch0:         fluxbox-startfluxbox-pulseaudio.patch
@@ -90,6 +90,7 @@
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 %{_bindir}/*
 %{_mandir}/man1/*
+%{_mandir}/man5/*
 %{_datadir}/%{name}
 %{_datadir}/xsessions/fluxbox.desktop
 
@@ -98,6 +99,14 @@
 %{_sysconfdir}/fluxbox-pulseaudio
 
 %changelog
+* Sat Sep 06 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.0.1-1
+- version upgrade
+
+* Wed Sep 03 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.0-1
+- version upgrade
+
 * Thu Mar 27 2008 Christopher Aillon <caillon at redhat.com> - 1.0.0-5
 - Fix the build against GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fluxbox/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	8 Oct 2007 21:52:52 -0000	1.10
+++ sources	6 Sep 2008 08:11:48 -0000	1.11
@@ -1 +1 @@
-990e276ead0d04421dce4080f485caca  fluxbox-1.0.0.tar.bz2
+421366dbb21592196b5dde6c8ea11229  fluxbox-1.1.0.1.tar.bz2



From awjb at fedoraproject.org  Sat Sep  6 08:12:19 2008
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sat,  6 Sep 2008 08:12:19 +0000 (UTC)
Subject: rpms/fluxbox/F-9 .cvsignore, 1.10, 1.11 fluxbox.spec, 1.29,
	1.30 sources, 1.10, 1.11
Message-ID: <20080906081219.A78C270125@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/fluxbox/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1881/F-9

Modified Files:
	.cvsignore fluxbox.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fluxbox/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	8 Oct 2007 21:52:52 -0000	1.10
+++ .cvsignore	6 Sep 2008 08:11:48 -0000	1.11
@@ -1 +1 @@
-fluxbox-1.0.0.tar.bz2
+fluxbox-1.1.0.1.tar.bz2


Index: fluxbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fluxbox/F-9/fluxbox.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- fluxbox.spec	27 Mar 2008 05:24:49 -0000	1.29
+++ fluxbox.spec	6 Sep 2008 08:11:48 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           fluxbox
-Version:        1.0.0
-Release:        5%{?dist}
+Version:        1.1.0.1
+Release:        1%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -8,7 +8,7 @@
 License:        MIT
 URL:            http://fluxbox.sourceforge.net
 
-Source0:        http://download.sourceforge.net/fluxbox/fluxbox-1.0.0.tar.bz2
+Source0:        http://download.sourceforge.net/fluxbox/fluxbox-1.1.0.1.tar.bz2
 Source3:        fluxbox.desktop
 Source4:        fluxbox-xdg-menu.py
 Patch0:         fluxbox-startfluxbox-pulseaudio.patch
@@ -90,6 +90,7 @@
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 %{_bindir}/*
 %{_mandir}/man1/*
+%{_mandir}/man5/*
 %{_datadir}/%{name}
 %{_datadir}/xsessions/fluxbox.desktop
 
@@ -98,6 +99,14 @@
 %{_sysconfdir}/fluxbox-pulseaudio
 
 %changelog
+* Sat Sep 06 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.0.1-1
+- version upgrade
+
+* Wed Sep 03 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.0-1
+- version upgrade
+
 * Thu Mar 27 2008 Christopher Aillon <caillon at redhat.com> - 1.0.0-5
 - Fix the build against GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fluxbox/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	8 Oct 2007 21:52:52 -0000	1.10
+++ sources	6 Sep 2008 08:11:48 -0000	1.11
@@ -1 +1 @@
-990e276ead0d04421dce4080f485caca  fluxbox-1.0.0.tar.bz2
+421366dbb21592196b5dde6c8ea11229  fluxbox-1.1.0.1.tar.bz2



From airlied at fedoraproject.org  Sat Sep  6 08:29:48 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Sat,  6 Sep 2008 08:29:48 +0000 (UTC)
Subject: rpms/kernel/devel config-powerpc32-generic, 1.21, 1.22 kernel.spec, 
	1.932, 1.933
Message-ID: <20080906082948.7362670125@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5148

Modified Files:
	config-powerpc32-generic kernel.spec 
Log Message:
* Sat Sep 06 2008 Dave Airlie <airlied at redhat.com>
- powerpc build broken disable FSL_UPM



Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc32-generic,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- config-powerpc32-generic	5 Sep 2008 06:06:18 -0000	1.21
+++ config-powerpc32-generic	6 Sep 2008 08:29:17 -0000	1.22
@@ -176,4 +176,5 @@
 
 # CONFIG_USB_MUSB_HDRC is not set
 
-CONFIG_MTD_NAND_FSL_UPM=m
+# broke build at 305/308
+# CONFIG_MTD_NAND_FSL_UPM is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.932
retrieving revision 1.933
diff -u -r1.932 -r1.933
--- kernel.spec	5 Sep 2008 09:45:16 -0000	1.932
+++ kernel.spec	6 Sep 2008 08:29:17 -0000	1.933
@@ -1747,6 +1747,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sat Sep 06 2008 Dave Airlie <airlied at redhat.com>
+- powerpc build broken disable FSL_UPM
+
 * Fri Sep  5 2008 Roland McGrath <roland at redhat.com>
 - 2.6.27-rc5-git7
 - utrace kerneldoc fixups



From awjb at fedoraproject.org  Sat Sep  6 08:30:04 2008
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sat,  6 Sep 2008 08:30:04 +0000 (UTC)
Subject: rpms/fluxbox/F-8 fluxbox-gcc43.patch,NONE,1.1
Message-ID: <20080906083004.1B0DD70125@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/fluxbox/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5323

Added Files:
	fluxbox-gcc43.patch 
Log Message:
- add patch


fluxbox-gcc43.patch:

--- NEW FILE fluxbox-gcc43.patch ---
diff -up fluxbox-1.0.0/src/main.cc.gcc43 fluxbox-1.0.0/src/main.cc
--- fluxbox-1.0.0/src/main.cc.gcc43	2008-03-27 01:19:22.000000000 -0400
+++ fluxbox-1.0.0/src/main.cc	2008-03-27 01:20:15.000000000 -0400
@@ -49,6 +49,7 @@
 #include <fstream>
 #include <stdexcept>
 #include <typeinfo>
+#include <cstring>
 
 using std::cout;
 using std::cerr;



From awjb at fedoraproject.org  Sat Sep  6 08:32:01 2008
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sat,  6 Sep 2008 08:32:01 +0000 (UTC)
Subject: rpms/libopensync/devel libopensync.spec,1.23,1.24
Message-ID: <20080906083201.7AE5270125@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/libopensync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5765

Modified Files:
	libopensync.spec 
Log Message:
- upgrade for new swig version



Index: libopensync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync/devel/libopensync.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libopensync.spec	11 Feb 2008 16:27:18 -0000	1.23
+++ libopensync.spec	6 Sep 2008 08:31:31 -0000	1.24
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Name:           libopensync
 Version:        0.36
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -46,7 +46,7 @@
 cd build
 %cmake -DOPENSYNC_LIBEXEC_DIR=%{_libexecdir} \
     -DCMAKE_SKIP_RPATH=YES \
-    -DSWIG_DIR=/usr/share/swig/1.3.33/ ../
+    -DSWIG_DIR=/usr/share/swig/1.3.35/ ../
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
@@ -91,6 +91,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Sep 06 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.36-3
+- upgrade for new swig
+
 * Mon Feb 11 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.36-2
 - Rebuilt for gcc43
 



From rhughes at fedoraproject.org  Sat Sep  6 08:39:46 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Sat,  6 Sep 2008 08:39:46 +0000 (UTC)
Subject: rpms/PackageKit/F-9 pk-ship-yum-install-signature.patch, NONE,
	1.1 PackageKit.spec, 1.50, 1.51
Message-ID: <20080906083946.51DD570125@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7384

Modified Files:
	PackageKit.spec 
Added Files:
	pk-ship-yum-install-signature.patch 
Log Message:
* Sat Sep 06 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.4-8
- Backport a patch from stable so we include install-signature.py
  I really can't work out how this was dropped from 0.1.x to 0.2.x


pk-ship-yum-install-signature.patch:

--- NEW FILE pk-ship-yum-install-signature.patch ---
commit c9a6f2b80949242de5fd05392d93998883041cec
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Aug 8 07:59:40 2008 +0100

    yum: ship install-signature.py -- I can't work out how this was missed

diff --git a/backends/yum/helpers/Makefile.am b/backends/yum/helpers/Makefile.am
index ae73353..d853800 100644
--- a/backends/yum/helpers/Makefile.am
+++ b/backends/yum/helpers/Makefile.am
@@ -23,6 +23,7 @@ dist_helper_DATA = 			\
 	resolve.py			\
 	update-packages.py		\
 	install-files.py		\
+	install-signature.py		\
 	refresh-cache.py		\
 	what-provides.py		\
 	update-system.py		\


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-9/PackageKit.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- PackageKit.spec	27 Aug 2008 12:59:26 -0000	1.50
+++ PackageKit.spec	6 Sep 2008 08:39:15 -0000	1.51
@@ -8,7 +8,7 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.2.4
-Release:   7%{?dist}
+Release:   8%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -29,6 +29,8 @@
 Patch5:    pk-handle-restart-x64.patch
 # upstream, 065caf0fe65ec143e18972400405ca407354afb4
 Patch6:    pk-dont-stop-at-first-package.patch
+# upstream, c9a6f2b80949242de5fd05392d93998883041cec
+Patch7:    pk-ship-yum-install-signature.patch
 
 Requires: dbus >= %{dbus_version}
 Requires: PackageKit-libs = %{version}-%{release}
@@ -119,6 +121,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %configure --enable-yum --enable-yum2 --with-default-backend=yum --disable-local
@@ -215,6 +218,10 @@
 %{_includedir}/*
 
 %changelog
+* Sat Sep 06 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.4-8
+- Backport a patch from stable so we include install-signature.py
+  I really can't work out how this was dropped from 0.1.x to 0.2.x
+
 * Wed Aug 27 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.4-7
 - Fix resolving 64 bit packages on multiarch machines.
 - Fixes rh#447957



From mschwendt at fedoraproject.org  Sat Sep  6 09:20:19 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat,  6 Sep 2008 09:20:19 +0000 (UTC)
Subject: rpms/gai-pal/devel gai-pal.spec,1.20,1.21
Message-ID: <20080906092019.11AD870125@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/gai-pal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13957

Modified Files:
	gai-pal.spec 
Log Message:
* Sat Sep  6 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7-15
- apply first patch as patch0



Index: gai-pal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gai-pal/devel/gai-pal.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gai-pal.spec	19 Feb 2008 23:14:14 -0000	1.20
+++ gai-pal.spec	6 Sep 2008 09:19:48 -0000	1.21
@@ -3,7 +3,7 @@
 Summary:	GAI Pal applet
 Name:		gai-pal
 Version:	0.7
-Release:        14%{?dist}
+Release:	15%{?dist}
 Source0:	%{name}-%{version}.tar.bz2
 Patch0:		gai-pal-0.7-xosd-empty-msg.patch
 Patch1:		gai-pal-0.7-typo.patch
@@ -22,7 +22,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b .xosd-empty-msg
+%patch0 -p1 -b .xosd-empty-msg
 %patch1 -p1 -b .typo
 %patch2 -p1 -b .nostrip
 %patch3 -p1 -b .fonts
@@ -49,24 +49,27 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Sat Sep  6 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7-15
+- apply first patch as patch0
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.7-14
 - Autorebuild for GCC 4.3
 
 * Fri Jan 18 2008 Michel Salim <michel.sylvan at gmail.com> - 0.7-13
 - Rebuild for Fedora 9 (development tree)
 
-* Mon Oct 15 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.7-12
+* Mon Oct 15 2007 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7-12
 - set large font to size 24 instead of 26
 - empty stdout of fortune program must not crash xosd either
 - clarify licence: GPLv2
 
-* Thu May 24 2007 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu May 24 2007 Michael Schwendt <mschwendt at fedoraproject.org>
 - substitute /lib/ with /%%_lib/ not just for x86_64 (fixes ppc64 build)
 
-* Mon Oct 02 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.7-11
+* Mon Oct 02 2006 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7-11
 - rebuilt
 
-* Tue Sep 19 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Tue Sep 19 2006 Michael Schwendt <mschwendt at fedoraproject.org>
 - rebuilt
 
 * Sat Mar  4 2006 Michel Salim <michel.salim at gmail.com> - 0.7-9
@@ -75,16 +78,16 @@
 * Sun Feb 12 2006 Michel Salim <michel.salim at gmail.com> - 0.7-8
 - rebuild against new gtk2 and gtkglext
 
-* Wed Aug 17 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.7-7
+* Wed Aug 17 2005 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7-7
 - rebuilt
 
-* Mon May  9 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.7-6
+* Mon May  9 2005 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7-6
 - Create debuginfo package, disable stripping via patch.
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Fri Apr  7 2005 Michael Schwendt <mschwendt at fedoraproject.org>
 - rebuilt
 
-* Sun Feb 27 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.7-4
+* Sun Feb 27 2005 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7-4
 - BR xosd-devel
 - fix xosd crash if fortune program missing or message is empty
 - fix message in fortune preferences window



From rhughes at fedoraproject.org  Sat Sep  6 09:49:48 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Sat,  6 Sep 2008 09:49:48 +0000 (UTC)
Subject: rpms/PackageKit/F-9 .cvsignore, 1.25, 1.26 PackageKit.spec, 1.51,
	1.52 sources, 1.26, 1.27
Message-ID: <20080906094948.B4CDF70125@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19350

Modified Files:
	.cvsignore PackageKit.spec sources 
Log Message:
* Sat Sep 06 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.5-1
- New upstream version, only bugfixes.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-9/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	31 Jul 2008 16:42:45 -0000	1.25
+++ .cvsignore	6 Sep 2008 09:49:18 -0000	1.26
@@ -1 +1 @@
-PackageKit-0.2.4.tar.gz
+PackageKit-0.2.5.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-9/PackageKit.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- PackageKit.spec	6 Sep 2008 08:39:15 -0000	1.51
+++ PackageKit.spec	6 Sep 2008 09:49:18 -0000	1.52
@@ -7,31 +7,14 @@
 
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
-Version:   0.2.4
-Release:   8%{?dist}
+Version:   0.2.5
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# upstream, 8ea1106a44568132947e29b75788d724827cf0e5
-Patch0:    pk-network-fallback-use-zero-destination.patch
-# upstream, 85e73bb7d478160990acbc30da620d05386072cf
-Patch1:    pk-yum-api-broken-fingerprint-now-function.patch
-# upstream, 328202d5a5ecffe30acb9c670cd25faeb6ec944d
-Patch2:    pk-test-local-files-correctly.patch
-# upstream, ddce1f9332b6c4ff8d852379e1faab4b9ebc6a81
-Patch3:    pk-check-what-requires-search-string.patch
-# upstream, 4fd7836ea13774c1c9fddde4ef6b782af8b0bd7b
-Patch4:    pk-dont-blacklist-apostrophes.patch
-# upstream, d7eb3b7b4c8af84d82c42a727d08bc4adf722d6d
-Patch5:    pk-handle-restart-x64.patch
-# upstream, 065caf0fe65ec143e18972400405ca407354afb4
-Patch6:    pk-dont-stop-at-first-package.patch
-# upstream, c9a6f2b80949242de5fd05392d93998883041cec
-Patch7:    pk-ship-yum-install-signature.patch
-
 Requires: dbus >= %{dbus_version}
 Requires: PackageKit-libs = %{version}-%{release}
 Requires: yum-packagekit = %{version}-%{release}
@@ -114,14 +97,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
 %configure --enable-yum --enable-yum2 --with-default-backend=yum --disable-local
@@ -218,6 +193,9 @@
 %{_includedir}/*
 
 %changelog
+* Sat Sep 06 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.5-1
+- New upstream version, only bugfixes.
+
 * Sat Sep 06 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.4-8
 - Backport a patch from stable so we include install-signature.py
   I really can't work out how this was dropped from 0.1.x to 0.2.x


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-9/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	31 Jul 2008 16:42:45 -0000	1.26
+++ sources	6 Sep 2008 09:49:18 -0000	1.27
@@ -1 +1 @@
-87bf41fd021077c93549d47de6d5fe07  PackageKit-0.2.4.tar.gz
+dc86dfa60b48e58a3a3aa91a355b2edf  PackageKit-0.2.5.tar.gz



From rhughes at fedoraproject.org  Sat Sep  6 09:52:12 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Sat,  6 Sep 2008 09:52:12 +0000 (UTC)
Subject: rpms/gnome-packagekit/F-9 .cvsignore, 1.20,
	1.21 gnome-packagekit.spec, 1.48, 1.49 sources, 1.22, 1.23
Message-ID: <20080906095212.6A93070125@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19840

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Log Message:
* Sat Sep 06 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.5-1
- New upstream version, only bugfixes.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	31 Jul 2008 16:42:50 -0000	1.20
+++ .cvsignore	6 Sep 2008 09:51:41 -0000	1.21
@@ -1 +1 @@
-gnome-packagekit-0.2.4.tar.gz
+gnome-packagekit-0.2.5.tar.gz


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/gnome-packagekit.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gnome-packagekit.spec	4 Aug 2008 19:14:53 -0000	1.48
+++ gnome-packagekit.spec	6 Sep 2008 09:51:42 -0000	1.49
@@ -3,8 +3,8 @@
 
 Summary:   GNOME PackageKit Client
 Name:      gnome-packagekit
-Version:   0.2.4
-Release:   2%{?dist}
+Version:   0.2.5
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
@@ -60,7 +60,6 @@
 
 %prep
 %setup -q
-#%setup -q -n %{name}-%{version}-%{?alphatag}
 %patch0 -p1
 
 %build
@@ -145,6 +144,9 @@
 %{_datadir}/applications/gpk-*.desktop
 
 %changelog
+* Sat Sep 06 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.5-1
+- New upstream version, only bugfixes.
+
 * Mon Aug 04 2008 Robin Norwood <rnorwood at redhat.com> - 0.2.4-2
 - Fix Source0 URL.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	31 Jul 2008 16:42:50 -0000	1.22
+++ sources	6 Sep 2008 09:51:42 -0000	1.23
@@ -1 +1 @@
-c55b2eb9eb17156df69ed781360afeaa  gnome-packagekit-0.2.4.tar.gz
+05b03bd236a5bda56ea85122f356a68f  gnome-packagekit-0.2.5.tar.gz



From pknirsch at fedoraproject.org  Sat Sep  6 09:54:35 2008
From: pknirsch at fedoraproject.org (Phil Knirsch)
Date: Sat,  6 Sep 2008 09:54:35 +0000 (UTC)
Subject: rpms/filesystem/devel filesystem.spec,1.49,1.50
Message-ID: <20080906095435.6CF6770125@cvs1.fedora.phx.redhat.com>

Author: pknirsch

Update of /cvs/pkgs/rpms/filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20317

Modified Files:
	filesystem.spec 
Log Message:
- Added augeas lenses dir



Index: filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filesystem/devel/filesystem.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- filesystem.spec	24 Jun 2008 13:23:16 -0000	1.49
+++ filesystem.spec	6 Sep 2008 09:54:05 -0000	1.50
@@ -1,6 +1,6 @@
 Summary: The basic directory layout for a Linux system
 Name: filesystem
-Version: 2.4.18
+Version: 2.4.19
 Release: 1%{?dist}
 License: Public Domain
 URL: https://fedorahosted.org/filesystem
@@ -32,7 +32,7 @@
         bin boot dev \
         etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,xinetd.d,skel,sysconfig,pki,fonts/conf.d} \
         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,X11},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,desktop-directories,dict,doc,empty,fonts,games,gnome,icons,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},src,src/kernels} \
+        usr/{bin,etc,games,include,%{_lib}/{games,sse2,tls,X11},lib/{games,locale,X11},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,desktop-directories,dict,doc,empty,fonts,games,gnome,icons,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},src,src/kernels} \
         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
@@ -100,6 +100,7 @@
 /usr/sbin
 %dir /usr/share
 /usr/share/applications
+/usr/share/augeas
 /usr/share/desktop-directories
 /usr/share/dict
 /usr/share/doc
@@ -140,6 +141,9 @@
 /var/yp
 
 %changelog
+* Sat Sep 06 2008 Phil Knirsch <pknirsch at redhat.com> - 2.4.19-1
+- Added augeas lenses dir (#461317)
+
 * Tue Jun 24 2008 Phil Knirsch <pknirsch at redhat.com> - 2.4.18-1
 - Added comment with raw format lang-exception URL
 



From pknirsch at fedoraproject.org  Sat Sep  6 10:08:07 2008
From: pknirsch at fedoraproject.org (Phil Knirsch)
Date: Sat,  6 Sep 2008 10:08:07 +0000 (UTC)
Subject: rpms/filesystem/devel filesystem.spec,1.50,1.51
Message-ID: <20080906100807.79E6270125@cvs1.fedora.phx.redhat.com>

Author: pknirsch

Update of /cvs/pkgs/rpms/filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22712

Modified Files:
	filesystem.spec 
Log Message:
- Small specfile fix



Index: filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filesystem/devel/filesystem.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- filesystem.spec	6 Sep 2008 09:54:05 -0000	1.50
+++ filesystem.spec	6 Sep 2008 10:07:37 -0000	1.51
@@ -24,7 +24,7 @@
 
 %install
 rm -rf %{buildroot}
-mkdir %{buildroot}
+mkdir -p %{buildroot}
 
 cd %{buildroot}
 
@@ -143,6 +143,7 @@
 %changelog
 * Sat Sep 06 2008 Phil Knirsch <pknirsch at redhat.com> - 2.4.19-1
 - Added augeas lenses dir (#461317)
+- Small specfile fix
 
 * Tue Jun 24 2008 Phil Knirsch <pknirsch at redhat.com> - 2.4.18-1
 - Added comment with raw format lang-exception URL



From sharkcz at fedoraproject.org  Sat Sep  6 10:11:23 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sat,  6 Sep 2008 10:11:23 +0000 (UTC)
Subject: rpms/tailor/F-7 tailor.spec,1.2,1.3
Message-ID: <20080906101123.E4E8A70125@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/tailor/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23701/F-7

Modified Files:
	tailor.spec 
Log Message:
 - rename Patch: to Patch0:


Index: tailor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tailor/F-7/tailor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tailor.spec	25 Oct 2007 15:29:57 -0000	1.2
+++ tailor.spec	6 Sep 2008 10:10:53 -0000	1.3
@@ -16,7 +16,7 @@
 %endif
 Requires:	python-vcpx = %{version}-%{release}
 BuildArch:	noarch
-Patch:		tailor-test.patch
+Patch0:		tailor-test.patch
 
 %description
 Tailor is a tool to migrate changesets between CVS, Subversion, git,



From sharkcz at fedoraproject.org  Sat Sep  6 10:11:24 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sat,  6 Sep 2008 10:11:24 +0000 (UTC)
Subject: rpms/tailor/F-8 tailor.spec,1.9,1.10
Message-ID: <20080906101124.0F54D70125@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/tailor/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23701/F-8

Modified Files:
	tailor.spec 
Log Message:
 - rename Patch: to Patch0:


Index: tailor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tailor/F-8/tailor.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tailor.spec	7 Jun 2008 12:01:59 -0000	1.9
+++ tailor.spec	6 Sep 2008 10:10:53 -0000	1.10
@@ -12,7 +12,7 @@
 BuildRequires:	python-devel
 Requires:	python-vcpx = %{version}-%{release}
 BuildArch:	noarch
-Patch:		tailor-test.patch
+Patch0:		tailor-test.patch
 
 %description
 Tailor is a tool to migrate changesets between CVS, Subversion, git,



From sharkcz at fedoraproject.org  Sat Sep  6 10:11:24 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sat,  6 Sep 2008 10:11:24 +0000 (UTC)
Subject: rpms/tailor/F-9 tailor.spec,1.9,1.10
Message-ID: <20080906101124.4A1C570125@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/tailor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23701/F-9

Modified Files:
	tailor.spec 
Log Message:
 - rename Patch: to Patch0:


Index: tailor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tailor/F-9/tailor.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tailor.spec	7 Jun 2008 11:59:57 -0000	1.9
+++ tailor.spec	6 Sep 2008 10:10:54 -0000	1.10
@@ -12,7 +12,7 @@
 BuildRequires:	python-devel
 Requires:	python-vcpx = %{version}-%{release}
 BuildArch:	noarch
-Patch:		tailor-test.patch
+Patch0:		tailor-test.patch
 
 %description
 Tailor is a tool to migrate changesets between CVS, Subversion, git,



From sharkcz at fedoraproject.org  Sat Sep  6 10:11:24 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sat,  6 Sep 2008 10:11:24 +0000 (UTC)
Subject: rpms/tailor/devel tailor.spec,1.9,1.10
Message-ID: <20080906101124.82C5C70125@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/tailor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23701/devel

Modified Files:
	tailor.spec 
Log Message:
 - rename Patch: to Patch0:


Index: tailor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tailor/devel/tailor.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tailor.spec	7 Jun 2008 11:56:33 -0000	1.9
+++ tailor.spec	6 Sep 2008 10:10:54 -0000	1.10
@@ -12,7 +12,7 @@
 BuildRequires:	python-devel
 Requires:	python-vcpx = %{version}-%{release}
 BuildArch:	noarch
-Patch:		tailor-test.patch
+Patch0:		tailor-test.patch
 
 %description
 Tailor is a tool to migrate changesets between CVS, Subversion, git,



From caolanm at fedoraproject.org  Sat Sep  6 10:19:50 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat,  6 Sep 2008 10:19:50 +0000 (UTC)
Subject: rpms/icu/devel icu.spec,1.79,1.80
Message-ID: <20080906101950.5122270125@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/icu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25048

Modified Files:
	icu.spec 
Log Message:
Resolves: rhbz#461348 wrong icu-config


Index: icu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu/devel/icu.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- icu.spec	26 Aug 2008 12:02:38 -0000	1.79
+++ icu.spec	6 Sep 2008 10:19:20 -0000	1.80
@@ -1,6 +1,6 @@
 Name:      icu
 Version:   4.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT
@@ -73,7 +73,7 @@
 make -C source install DESTDIR=$RPM_BUILD_ROOT
 make -C source install-doc docdir=__docs
 chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.*
-cp -p %{PATCH2} $RPM_BUILD_ROOT%{_bindir}/%{name}-config
+cp -p %{PATCH1} $RPM_BUILD_ROOT%{_bindir}/%{name}-config
 chmod a+x $RPM_BUILD_ROOT%{_bindir}/%{name}-config
 sed -i s/\\\$\(THREADSCXXFLAGS\)// $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc
 sed -i s/\\\$\(THREADSCPPFLAGS\)/-D_REENTRANT/ $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc
@@ -132,6 +132,9 @@
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Sat Sep 06 2008 Caolan McNamara <caolanm at redhat.com> - 4.0-3
+- Resolves: rhbz#461348 wrong icu-config
+
 * Tue Aug 26 2008 Caolan McNamara <caolanm at redhat.com> - 4.0-2
 - Resolves: rhbz#459698 drop Malayalam patches. Note test with Rachana/Meera
   instead of Lohit Malayalam before filing bugs against icu wrt.



From harald at fedoraproject.org  Sat Sep  6 10:24:46 2008
From: harald at fedoraproject.org (Harald Hoyer)
Date: Sat,  6 Sep 2008 10:24:46 +0000 (UTC)
Subject: rpms/readahead/devel readahead-1.4.5-usr.patch, 1.1,
	1.2 readahead.spec, 1.48, 1.49
Message-ID: <20080906102446.39FC170125@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/readahead/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26227

Modified Files:
	readahead-1.4.5-usr.patch readahead.spec 
Log Message:
* Sat Sep 06 2008 Harald Hoyer <harald at redhat.com> 1.4.5-3
- marked /etc/sysconfig/readahead as a config file
- removed noreplace from /etc/readahead.conf
- fixed /etc/readahead.conf for /sbin/readahead


readahead-1.4.5-usr.patch:

Index: readahead-1.4.5-usr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/readahead-1.4.5-usr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- readahead-1.4.5-usr.patch	1 Sep 2008 14:41:20 -0000	1.1
+++ readahead-1.4.5-usr.patch	6 Sep 2008 10:24:45 -0000	1.2
@@ -1,6 +1,16 @@
+diff -up readahead-1.4.5/scripts/readahead-collector.event.usr readahead-1.4.5/scripts/readahead-collector.event
+--- readahead-1.4.5/scripts/readahead-collector.event.usr	2008-08-14 08:04:21.000000000 +0200
++++ readahead-1.4.5/scripts/readahead-collector.event	2008-09-06 11:14:50.000000000 +0200
+@@ -41,5 +41,5 @@ post-stop script
+ 	done
+ 	# process lists
+ 	/etc/cron.daily/readahead.cron
+-	:
++	exit 0
+ end script
 diff -up readahead-1.4.5/scripts/readahead.cron.usr readahead-1.4.5/scripts/readahead.cron
 --- readahead-1.4.5/scripts/readahead.cron.usr	2008-08-14 08:04:26.000000000 +0200
-+++ readahead-1.4.5/scripts/readahead.cron	2008-09-01 16:35:52.000000000 +0200
++++ readahead-1.4.5/scripts/readahead.cron	2008-09-06 11:14:50.000000000 +0200
 @@ -11,7 +11,7 @@ renice +19 -p $$ >/dev/null 2>&1
  ionice -c3 -p $$ >/dev/null 2>&1
  
@@ -10,9 +20,18 @@
  READAHEAD_BASE="/etc/readahead.d"
  
  for LTYPE in $TYPES; do
+diff -up readahead-1.4.5/scripts/readahead-disable-services.event.usr readahead-1.4.5/scripts/readahead-disable-services.event
+--- readahead-1.4.5/scripts/readahead-disable-services.event.usr	2008-08-14 08:04:21.000000000 +0200
++++ readahead-1.4.5/scripts/readahead-disable-services.event	2008-09-06 11:14:50.000000000 +0200
+@@ -17,4 +17,5 @@ script
+ 			touch /var/lock/subsys/delay-$runlevel-$service
+ 		fi
+ 	done
++	exit 0
+ end script
 diff -up readahead-1.4.5/scripts/readahead.event.usr readahead-1.4.5/scripts/readahead.event
 --- readahead-1.4.5/scripts/readahead.event.usr	2008-08-14 08:04:21.000000000 +0200
-+++ readahead-1.4.5/scripts/readahead.event	2008-09-01 16:39:22.000000000 +0200
++++ readahead-1.4.5/scripts/readahead.event	2008-09-06 11:14:50.000000000 +0200
 @@ -11,7 +11,16 @@ console output
  script
  	. /etc/sysconfig/readahead
@@ -31,3 +50,15 @@
  end script
  
  
+diff -up readahead-1.4.5/src/readahead.conf.usr readahead-1.4.5/src/readahead.conf
+--- readahead-1.4.5/src/readahead.conf.usr	2008-08-14 08:04:21.000000000 +0200
++++ readahead-1.4.5/src/readahead.conf	2008-09-06 11:14:50.000000000 +0200
+@@ -18,7 +18,7 @@ RAC_INITPATH="/sbin/init"
+ RAC_LISTSPATH="/etc/readahead.d/custom.%s"
+ 
+ # Ignore syscalls from:
+-RAC_EXECIGN="/usr/sbin/readahead"
++RAC_EXECIGN="/sbin/readahead"
+ 
+ # Exclude dirs
+ RAC_EXCLUDE="/proc /sys /dev /var/log /var/run /var/lock /home /tmp /var/tmp /media"


Index: readahead.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/readahead.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- readahead.spec	3 Sep 2008 14:25:49 -0000	1.48
+++ readahead.spec	6 Sep 2008 10:24:45 -0000	1.49
@@ -1,7 +1,7 @@
 Summary:        Read a preset list of files into memory
 Name:           readahead
 Version:        1.4.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -68,16 +68,21 @@
 %doc COPYING README lists/README.lists
 %{_sysconfdir}/cron.daily/readahead.cron
 %{_sysconfdir}/cron.monthly/readahead-monthly.cron
-%config(noreplace) %{_sysconfdir}/readahead.conf
+%config %{_sysconfdir}/readahead.conf
 %dir %{_sysconfdir}/readahead.d
 %{_sysconfdir}/event.d/readahead-collector.event
 %{_sysconfdir}/event.d/readahead-disable-services.event
 %{_sysconfdir}/event.d/readahead.event
-%{_sysconfdir}/sysconfig/readahead
+%config(noreplace) %{_sysconfdir}/sysconfig/readahead
 /sbin/readahead
 /sbin/readahead-collector
 
 %changelog
+* Sat Sep 06 2008 Harald Hoyer <harald at redhat.com> 1.4.5-3
+- marked /etc/sysconfig/readahead as a config file
+- removed noreplace from /etc/readahead.conf
+- fixed /etc/readahead.conf for /sbin/readahead
+
 * Wed Sep 03 2008 Harald Hoyer <harald at redhat.com> 1.4.5-2
 - fixed compiling agaings audit-libs-devel-1.4.5
 



From gemi at fedoraproject.org  Sat Sep  6 11:34:49 2008
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat,  6 Sep 2008 11:34:49 +0000 (UTC)
Subject: rpms/genius/devel .cvsignore, 1.5, 1.6 genius.spec, 1.8, 1.9 sources,
	1.5, 1.6
Message-ID: <20080906113449.CEFBC70125@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/genius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4035

Modified Files:
	.cvsignore genius.spec sources 
Log Message:
new release 1.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/genius/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Jan 2008 22:15:55 -0000	1.5
+++ .cvsignore	6 Sep 2008 11:34:18 -0000	1.6
@@ -1 +1 @@
-genius-1.0.2.tar.bz2
+genius-1.0.3.tar.bz2


Index: genius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/genius/devel/genius.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- genius.spec	19 Feb 2008 03:33:42 -0000	1.8
+++ genius.spec	6 Sep 2008 11:34:18 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           genius
-Version:        1.0.2
-Release:        3%{?dist}
+Version:        1.0.3
+Release:        1%{?dist}
 Summary:        An arbitrary precision integer and multiple precision floatingpoint calculator
 
 Group:          Applications/Engineering
@@ -126,6 +126,9 @@
 
 
 %changelog
+* Sat Sep  6 2008 Gerard Milmeister <gemi at bluewin.ch> - 1.0.3-1
+- new release 1.0.3
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.2-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/genius/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Jan 2008 22:15:55 -0000	1.5
+++ sources	6 Sep 2008 11:34:18 -0000	1.6
@@ -1 +1 @@
-7c948e3426c4aaaa9bac8267094ce53d  genius-1.0.2.tar.bz2
+9500bf293016de90aff838a3ae31339f  genius-1.0.3.tar.bz2



From pkgdb at fedoraproject.org  Sat Sep  6 11:37:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 11:37:21 +0000
Subject: [pkgdb] gai-pal ownership updated
Message-ID: <20080906113721.959AA20876A@bastion.fedora.phx.redhat.com>

Package gai-pal in Fedora devel is now owned by mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gai-pal



From pkgdb at fedoraproject.org  Sat Sep  6 11:37:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 11:37:29 +0000
Subject: [pkgdb] gai-pal ownership updated
Message-ID: <20080906113729.6D03B20876F@bastion.fedora.phx.redhat.com>

Package gai-pal in Fedora 8 is now owned by mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gai-pal



From pkgdb at fedoraproject.org  Sat Sep  6 11:37:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 11:37:48 +0000
Subject: [pkgdb] gai-pal ownership updated
Message-ID: <20080906113748.AF9FC20876A@bastion.fedora.phx.redhat.com>

Package gai-pal in Fedora 9 is now owned by mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gai-pal



From pkgdb at fedoraproject.org  Sat Sep  6 11:38:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 11:38:29 +0000
Subject: [pkgdb] gai ownership updated
Message-ID: <20080906113830.A80472082B8@bastion.fedora.phx.redhat.com>

Package gai in Fedora devel is now owned by mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gai



From pkgdb at fedoraproject.org  Sat Sep  6 11:38:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 11:38:35 +0000
Subject: [pkgdb] gai ownership updated
Message-ID: <20080906113835.A064A20876C@bastion.fedora.phx.redhat.com>

Package gai in Fedora 8 is now owned by mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gai



From pkgdb at fedoraproject.org  Sat Sep  6 11:38:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 11:38:43 +0000
Subject: [pkgdb] gai ownership updated
Message-ID: <20080906113843.6117D2082B8@bastion.fedora.phx.redhat.com>

Package gai in Fedora 9 is now owned by mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gai



From pkgdb at fedoraproject.org  Sat Sep  6 11:42:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 11:42:23 +0000
Subject: [pkgdb] libgcrypt1 had group_acl changed
Message-ID: <20080906114229.463202082B8@bastion.fedora.phx.redhat.com>

mschwendt has set the commit acl on libgcrypt1 (Fedora 9) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt1



From pkgdb at fedoraproject.org  Sat Sep  6 11:42:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 11:42:29 +0000
Subject: [pkgdb] libgcrypt1 had group_acl changed
Message-ID: <20080906114229.C8EAD20876C@bastion.fedora.phx.redhat.com>

mschwendt has set the commit acl on libgcrypt1 (Fedora 5) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt1



From pkgdb at fedoraproject.org  Sat Sep  6 11:42:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 11:42:36 +0000
Subject: [pkgdb] libgcrypt1 had group_acl changed
Message-ID: <20080906114236.B825420876F@bastion.fedora.phx.redhat.com>

mschwendt has set the commit acl on libgcrypt1 (Fedora 4) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt1



From pkgdb at fedoraproject.org  Sat Sep  6 11:42:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 11:42:56 +0000
Subject: [pkgdb] libgcrypt1 had group_acl changed
Message-ID: <20080906114256.BD5F420876A@bastion.fedora.phx.redhat.com>

mschwendt has set the commit acl on libgcrypt1 (Fedora devel) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt1



From pkgdb at fedoraproject.org  Sat Sep  6 11:43:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 11:43:02 +0000
Subject: [pkgdb] libgcrypt1 had group_acl changed
Message-ID: <20080906114302.12DFF2082B8@bastion.fedora.phx.redhat.com>

mschwendt has set the commit acl on libgcrypt1 (Fedora 2) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt1



From pkgdb at fedoraproject.org  Sat Sep  6 11:43:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 11:43:09 +0000
Subject: [pkgdb] libgcrypt1 had group_acl changed
Message-ID: <20080906114309.838A920876A@bastion.fedora.phx.redhat.com>

mschwendt has set the commit acl on libgcrypt1 (Fedora 3) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt1



From dtimms at fedoraproject.org  Sat Sep  6 11:58:37 2008
From: dtimms at fedoraproject.org (David Timms)
Date: Sat,  6 Sep 2008 11:58:37 +0000 (UTC)
Subject: rpms/pyvnc2swf/devel import.log, NONE,
	1.1 pyvnc2swf.0.9.3.exit_after_usage.diff, NONE,
	1.1 pyvnc2swf.desktop, NONE, 1.1 pyvnc2swf.png, NONE,
	1.1 pyvnc2swf.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080906115837.A719370125@cvs1.fedora.phx.redhat.com>

Author: dtimms

Update of /cvs/pkgs/rpms/pyvnc2swf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7559/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pyvnc2swf.0.9.3.exit_after_usage.diff 
	pyvnc2swf.desktop pyvnc2swf.png pyvnc2swf.spec 
Log Message:
Initial import of pyvnc2swf into fedora



--- NEW FILE import.log ---
pyvnc2swf-0_9_3-4_fc9:HEAD:pyvnc2swf-0.9.3-4.fc9.src.rpm:1220702218

pyvnc2swf.0.9.3.exit_after_usage.diff:

--- NEW FILE pyvnc2swf.0.9.3.exit_after_usage.diff ---
--- pyvnc2swf-0.9.3/pyvnc2swf/edit.py	2007-03-31 14:02:15.000000000 +1000
+++ /usr/lib/python2.5/site-packages/pyvnc2swf/edit.py	2008-06-21 21:32:22.000000000 +1000
@@ -123,7 +123,7 @@
     -l: disable loop.
     -z: make the movie scalable.
     '''
-    return 100
+    sys.exit(0)
   try:
     (opts, args) = getopt.getopt(argv, 'dr:o:t:VcHa:S:C:B:K:f:F:R:s:blz')
   except getopt.GetoptError:


--- NEW FILE pyvnc2swf.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Vnc2swf Screen Recorder
Name[en_GB]=Swfdec Flash Player
Comment=Record VNC sessions to flash files
Comment[en_GB]=Record VNC sessions to flash files
Exec=/usr/lib/python2.5/site-packages/pyvnc2swf/vnc2swf.py
Icon=pyvnc2swf
Terminal=false
Type=Application
StartupNotify=true
Categories=GNOME;GTK;AudioVideo;Video;Player;
X-Desktop-File-Install-Version=0.15
Name[en_AU]=Vnc2swf Screen Recorder


--- NEW FILE pyvnc2swf.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary: Vnc screen recorder
Name: pyvnc2swf
Version: 0.9.3
Release: 4%{?dist}
License: GPLv2+
Group:   System Environment/Base
URL:     http://www.unixuser.org/~euske/vnc2swf/pyvnc2swf.html
Source0: http://www.unixuser.org/~euske/vnc2swf/%{name}-%{version}.tar.gz
# This desktop icon is a combination of the icons for vnc viewer, swfdec 
#   player, screenshot, and an arrow from gthumb.
Source1: %{name}.png
# This desktop file was created by hand.
Source2: %{name}.desktop
Patch0: %{name}.0.9.3.exit_after_usage.diff

BuildArch: noarch
BuildRequires: python
BuildRequires: desktop-file-utils
Requires: pygame
Requires: tkinter
Requires: hicolor-icon-theme
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Vnc2swf is a cross-platform screen recording tool creating ShockWave Flash
(swf) format media.


%prep
%setup -q
%patch0 -p1


%build
# included make is for the author to make web releases of the application.


%install
%{__rm} -rf %{buildroot}
mkdir -p %{buildroot}%{python_sitelib}/pyvnc2swf
install -p -m 0755 pyvnc2swf/* %{buildroot}%{python_sitelib}/pyvnc2swf
%{__rm} %{buildroot}%{python_sitelib}/pyvnc2swf/play.py

mkdir -p %{buildroot}%{_bindir}
install -m 755 bin/recordwin.sh %{buildroot}%{_bindir}

# create symlinks in /usr/bin for easy access to the cli tools
## rpmlint generates W: dangling-relative-symlink
## cd %{buildroot}%{python_sitelib}/pyvnc2swf/
## ln -s vnc2swf.py ../../../../bin/vnc2swf

cd %{buildroot}%{_bindir}
ln -s ../..%{python_sitelib}/pyvnc2swf/vnc2swf.py vnc2swf
ln -s ../..%{python_sitelib}/pyvnc2swf/edit.py vnc2swf-edit

## or is it better to just use the actual path ?
## ln -s vnc2swf ../lib/python2.5/site-packages/pyvnc2swf/vnc2swf.py

mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/
install -p -m 644 %{SOURCE1} \
        %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/

mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor fedora \
    --dir %{buildroot}%{_datadir}/applications %{SOURCE2}


%clean
%{__rm} -rf %{buildroot}


%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-, root, root, -)
%doc README.txt LICENCE.TXT docs/*.html
%{python_sitelib}/pyvnc2swf
#%{python_sitelib}/*
%{_bindir}/vnc2swf*
%{_bindir}/recordwin.sh
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png

# x11vnc is required for this so exclude it for now.
%exclude %{_bindir}/recordwin.sh

%changelog
* Sat Aug 16 2008 David Timms <iinet.net.au @ dtimms> 0.9.3-4
- fix rpmlint W: symlink-should-be-relative
- mod to use file exclude for the recordwin scripts

* Wed Jul 16 2008 David Timms <iinet.net.au @ dtimms> 0.9.3-3
- del preun symbolic link removes - already done by files section
- add Requires hicolor-icon-theme, so that icon dir is owned correctly
- fix license tag to GPLv2+ since sources say: or later version
- fix some comments spelling

* Sat Jun 21 2008 David Timms <iinet.net.au @ dtimms> 0.9.3-2
- del bash wrapper scripts, create symlinks instead.
- fix the python_sitelib generation
- del play.py from package, since it requires pymedia libary
- del recordwin.sh from package, since it requires x11vnc

* Fri Jun 13 2008 David Timms <iinet.net.au @ dtimms> 0.9.3-1
- del explicit python requires; rpm picks this up automatically
- add Requires: pygame
- add wrapper scripts for vnc2swf.py, edit.py and play.py

* Sun May 25 2008 David Timms <iinet.net.au @ dtimms> 0.9.3-0.2
- add BR desktop-file-utils since it now installs the desktop file and icon.

* Sat May 24 2008 David Timms <iinet.net.au @ dtimms> 0.9.3-0.1
- initial package for fedora.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyvnc2swf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:42:41 -0000	1.1
+++ .cvsignore	6 Sep 2008 11:58:07 -0000	1.2
@@ -0,0 +1 @@
+pyvnc2swf-0.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyvnc2swf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:42:41 -0000	1.1
+++ sources	6 Sep 2008 11:58:07 -0000	1.2
@@ -0,0 +1 @@
+e871d134420867438cadd1f6320072f0  pyvnc2swf-0.9.3.tar.gz



From dtimms at fedoraproject.org  Sat Sep  6 12:27:13 2008
From: dtimms at fedoraproject.org (David Timms)
Date: Sat,  6 Sep 2008 12:27:13 +0000 (UTC)
Subject: rpms/pyvnc2swf/F-9 pyvnc2swf.0.9.3.exit_after_usage.diff, NONE,
	1.1 pyvnc2swf.desktop, NONE, 1.1 pyvnc2swf.png, NONE,
	1.1 pyvnc2swf.spec, NONE, 1.1
Message-ID: <20080906122713.123B570125@cvs1.fedora.phx.redhat.com>

Author: dtimms

Update of /cvs/pkgs/rpms/pyvnc2swf/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10300

Added Files:
	pyvnc2swf.0.9.3.exit_after_usage.diff pyvnc2swf.desktop 
	pyvnc2swf.png pyvnc2swf.spec 
Log Message:
Initial import 4 f9 updates


pyvnc2swf.0.9.3.exit_after_usage.diff:

--- NEW FILE pyvnc2swf.0.9.3.exit_after_usage.diff ---
--- pyvnc2swf-0.9.3/pyvnc2swf/edit.py	2007-03-31 14:02:15.000000000 +1000
+++ /usr/lib/python2.5/site-packages/pyvnc2swf/edit.py	2008-06-21 21:32:22.000000000 +1000
@@ -123,7 +123,7 @@
     -l: disable loop.
     -z: make the movie scalable.
     '''
-    return 100
+    sys.exit(0)
   try:
     (opts, args) = getopt.getopt(argv, 'dr:o:t:VcHa:S:C:B:K:f:F:R:s:blz')
   except getopt.GetoptError:


--- NEW FILE pyvnc2swf.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Vnc2swf Screen Recorder
Name[en_GB]=Swfdec Flash Player
Comment=Record VNC sessions to flash files
Comment[en_GB]=Record VNC sessions to flash files
Exec=/usr/lib/python2.5/site-packages/pyvnc2swf/vnc2swf.py
Icon=pyvnc2swf
Terminal=false
Type=Application
StartupNotify=true
Categories=GNOME;GTK;AudioVideo;Video;Player;
X-Desktop-File-Install-Version=0.15
Name[en_AU]=Vnc2swf Screen Recorder


--- NEW FILE pyvnc2swf.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary: Vnc screen recorder
Name: pyvnc2swf
Version: 0.9.3
Release: 4%{?dist}
License: GPLv2+
Group:   System Environment/Base
URL:     http://www.unixuser.org/~euske/vnc2swf/pyvnc2swf.html
Source0: http://www.unixuser.org/~euske/vnc2swf/%{name}-%{version}.tar.gz
# This desktop icon is a combination of the icons for vnc viewer, swfdec 
#   player, screenshot, and an arrow from gthumb.
Source1: %{name}.png
# This desktop file was created by hand.
Source2: %{name}.desktop
Patch0: %{name}.0.9.3.exit_after_usage.diff

BuildArch: noarch
BuildRequires: python
BuildRequires: desktop-file-utils
Requires: pygame
Requires: tkinter
Requires: hicolor-icon-theme
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Vnc2swf is a cross-platform screen recording tool creating ShockWave Flash
(swf) format media.


%prep
%setup -q
%patch0 -p1


%build
# included make is for the author to make web releases of the application.


%install
%{__rm} -rf %{buildroot}
mkdir -p %{buildroot}%{python_sitelib}/pyvnc2swf
install -p -m 0755 pyvnc2swf/* %{buildroot}%{python_sitelib}/pyvnc2swf
%{__rm} %{buildroot}%{python_sitelib}/pyvnc2swf/play.py

mkdir -p %{buildroot}%{_bindir}
install -m 755 bin/recordwin.sh %{buildroot}%{_bindir}

# create symlinks in /usr/bin for easy access to the cli tools
## rpmlint generates W: dangling-relative-symlink
## cd %{buildroot}%{python_sitelib}/pyvnc2swf/
## ln -s vnc2swf.py ../../../../bin/vnc2swf

cd %{buildroot}%{_bindir}
ln -s ../..%{python_sitelib}/pyvnc2swf/vnc2swf.py vnc2swf
ln -s ../..%{python_sitelib}/pyvnc2swf/edit.py vnc2swf-edit

## or is it better to just use the actual path ?
## ln -s vnc2swf ../lib/python2.5/site-packages/pyvnc2swf/vnc2swf.py

mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/
install -p -m 644 %{SOURCE1} \
        %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/

mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor fedora \
    --dir %{buildroot}%{_datadir}/applications %{SOURCE2}


%clean
%{__rm} -rf %{buildroot}


%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-, root, root, -)
%doc README.txt LICENCE.TXT docs/*.html
%{python_sitelib}/pyvnc2swf
#%{python_sitelib}/*
%{_bindir}/vnc2swf*
%{_bindir}/recordwin.sh
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png

# x11vnc is required for this so exclude it for now.
%exclude %{_bindir}/recordwin.sh

%changelog
* Sat Aug 16 2008 David Timms <iinet.net.au @ dtimms> 0.9.3-4
- fix rpmlint W: symlink-should-be-relative
- mod to use file exclude for the recordwin scripts

* Wed Jul 16 2008 David Timms <iinet.net.au @ dtimms> 0.9.3-3
- del preun symbolic link removes - already done by files section
- add Requires hicolor-icon-theme, so that icon dir is owned correctly
- fix license tag to GPLv2+ since sources say: or later version
- fix some comments spelling

* Sat Jun 21 2008 David Timms <iinet.net.au @ dtimms> 0.9.3-2
- del bash wrapper scripts, create symlinks instead.
- fix the python_sitelib generation
- del play.py from package, since it requires pymedia libary
- del recordwin.sh from package, since it requires x11vnc

* Fri Jun 13 2008 David Timms <iinet.net.au @ dtimms> 0.9.3-1
- del explicit python requires; rpm picks this up automatically
- add Requires: pygame
- add wrapper scripts for vnc2swf.py, edit.py and play.py

* Sun May 25 2008 David Timms <iinet.net.au @ dtimms> 0.9.3-0.2
- add BR desktop-file-utils since it now installs the desktop file and icon.

* Sat May 24 2008 David Timms <iinet.net.au @ dtimms> 0.9.3-0.1
- initial package for fedora.




From airlied at fedoraproject.org  Sat Sep  6 12:33:51 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Sat,  6 Sep 2008 12:33:51 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-fix-lirc-ppc64.patch, NONE,
	1.1 kernel.spec, 1.933, 1.934
Message-ID: <20080906123351.9620F70125@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11150

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-fix-lirc-ppc64.patch 
Log Message:
* Sat Sep 06 2008 Dave Airlie <airlied at redhat.com>
- fix lirc on powerpc64 - its Saturday goddamit.


linux-2.6-fix-lirc-ppc64.patch:

--- NEW FILE linux-2.6-fix-lirc-ppc64.patch ---
diff -up linux-2.6.26.noarch/drivers/input/lirc/Kconfig.dave linux-2.6.26.noarch/drivers/input/lirc/Kconfig
--- linux-2.6.26.noarch/drivers/input/lirc/Kconfig.dave	2008-09-06 22:29:43.000000000 +1000
+++ linux-2.6.26.noarch/drivers/input/lirc/Kconfig	2008-09-06 22:29:54.000000000 +1000
@@ -71,7 +71,7 @@ config LIRC_IT87
 config LIRC_ITE8709
 	tristate "ITE8709 CIR Port Receiver"
 	default m
-	depends on LIRC_DEV
+	depends on LIRC_DEV && PNP
 	help
 	  Driver for the ITE8709 IR Receiver
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.933
retrieving revision 1.934
diff -u -r1.933 -r1.934
--- kernel.spec	6 Sep 2008 08:29:17 -0000	1.933
+++ kernel.spec	6 Sep 2008 12:33:20 -0000	1.934
@@ -605,6 +605,7 @@
 Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch
 Patch1400: linux-2.6-smarter-relatime.patch
 Patch1515: linux-2.6-lirc.patch
+Patch1516: linux-2.6-fix-lirc-ppc64.patch
 
 # nouveau + drm fixes
 Patch1811: drm-modesetting-radeon.patch
@@ -1144,6 +1145,7 @@
 
 # http://www.lirc.org/
 ApplyPatch linux-2.6-lirc.patch
+ApplyPatch linux-2.6-fix-lirc-ppc64.patch
 
 ApplyPatch linux-2.6-e1000-ich9.patch
 
@@ -1748,6 +1750,9 @@
 
 %changelog
 * Sat Sep 06 2008 Dave Airlie <airlied at redhat.com>
+- fix lirc on powerpc64 - its Saturday goddamit.
+
+* Sat Sep 06 2008 Dave Airlie <airlied at redhat.com>
 - powerpc build broken disable FSL_UPM
 
 * Fri Sep  5 2008 Roland McGrath <roland at redhat.com>



From dtimms at fedoraproject.org  Sat Sep  6 12:37:53 2008
From: dtimms at fedoraproject.org (David Timms)
Date: Sat,  6 Sep 2008 12:37:53 +0000 (UTC)
Subject: rpms/pyvnc2swf/F-8 pyvnc2swf.0.9.3.exit_after_usage.diff, NONE,
	1.1 pyvnc2swf.desktop, NONE, 1.1 pyvnc2swf.png, NONE,
	1.1 pyvnc2swf.spec, NONE, 1.1
Message-ID: <20080906123753.3096F70125@cvs1.fedora.phx.redhat.com>

Author: dtimms

Update of /cvs/pkgs/rpms/pyvnc2swf/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11855

Added Files:
	pyvnc2swf.0.9.3.exit_after_usage.diff pyvnc2swf.desktop 
	pyvnc2swf.png pyvnc2swf.spec 
Log Message:
Initial import into f8


pyvnc2swf.0.9.3.exit_after_usage.diff:

--- NEW FILE pyvnc2swf.0.9.3.exit_after_usage.diff ---
--- pyvnc2swf-0.9.3/pyvnc2swf/edit.py	2007-03-31 14:02:15.000000000 +1000
+++ /usr/lib/python2.5/site-packages/pyvnc2swf/edit.py	2008-06-21 21:32:22.000000000 +1000
@@ -123,7 +123,7 @@
     -l: disable loop.
     -z: make the movie scalable.
     '''
-    return 100
+    sys.exit(0)
   try:
     (opts, args) = getopt.getopt(argv, 'dr:o:t:VcHa:S:C:B:K:f:F:R:s:blz')
   except getopt.GetoptError:


--- NEW FILE pyvnc2swf.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Vnc2swf Screen Recorder
Name[en_GB]=Swfdec Flash Player
Comment=Record VNC sessions to flash files
Comment[en_GB]=Record VNC sessions to flash files
Exec=/usr/lib/python2.5/site-packages/pyvnc2swf/vnc2swf.py
Icon=pyvnc2swf
Terminal=false
Type=Application
StartupNotify=true
Categories=GNOME;GTK;AudioVideo;Video;Player;
X-Desktop-File-Install-Version=0.15
Name[en_AU]=Vnc2swf Screen Recorder


--- NEW FILE pyvnc2swf.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary: Vnc screen recorder
Name: pyvnc2swf
Version: 0.9.3
Release: 4%{?dist}
License: GPLv2+
Group:   System Environment/Base
URL:     http://www.unixuser.org/~euske/vnc2swf/pyvnc2swf.html
Source0: http://www.unixuser.org/~euske/vnc2swf/%{name}-%{version}.tar.gz
# This desktop icon is a combination of the icons for vnc viewer, swfdec 
#   player, screenshot, and an arrow from gthumb.
Source1: %{name}.png
# This desktop file was created by hand.
Source2: %{name}.desktop
Patch0: %{name}.0.9.3.exit_after_usage.diff

BuildArch: noarch
BuildRequires: python
BuildRequires: desktop-file-utils
Requires: pygame
Requires: tkinter
Requires: hicolor-icon-theme
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Vnc2swf is a cross-platform screen recording tool creating ShockWave Flash
(swf) format media.


%prep
%setup -q
%patch0 -p1


%build
# included make is for the author to make web releases of the application.


%install
%{__rm} -rf %{buildroot}
mkdir -p %{buildroot}%{python_sitelib}/pyvnc2swf
install -p -m 0755 pyvnc2swf/* %{buildroot}%{python_sitelib}/pyvnc2swf
%{__rm} %{buildroot}%{python_sitelib}/pyvnc2swf/play.py

mkdir -p %{buildroot}%{_bindir}
install -m 755 bin/recordwin.sh %{buildroot}%{_bindir}

# create symlinks in /usr/bin for easy access to the cli tools
## rpmlint generates W: dangling-relative-symlink
## cd %{buildroot}%{python_sitelib}/pyvnc2swf/
## ln -s vnc2swf.py ../../../../bin/vnc2swf

cd %{buildroot}%{_bindir}
ln -s ../..%{python_sitelib}/pyvnc2swf/vnc2swf.py vnc2swf
ln -s ../..%{python_sitelib}/pyvnc2swf/edit.py vnc2swf-edit

## or is it better to just use the actual path ?
## ln -s vnc2swf ../lib/python2.5/site-packages/pyvnc2swf/vnc2swf.py

mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/
install -p -m 644 %{SOURCE1} \
        %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/

mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor fedora \
    --dir %{buildroot}%{_datadir}/applications %{SOURCE2}


%clean
%{__rm} -rf %{buildroot}


%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-, root, root, -)
%doc README.txt LICENCE.TXT docs/*.html
%{python_sitelib}/pyvnc2swf
#%{python_sitelib}/*
%{_bindir}/vnc2swf*
%{_bindir}/recordwin.sh
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png

# x11vnc is required for this so exclude it for now.
%exclude %{_bindir}/recordwin.sh

%changelog
* Sat Aug 16 2008 David Timms <iinet.net.au @ dtimms> 0.9.3-4
- fix rpmlint W: symlink-should-be-relative
- mod to use file exclude for the recordwin scripts

* Wed Jul 16 2008 David Timms <iinet.net.au @ dtimms> 0.9.3-3
- del preun symbolic link removes - already done by files section
- add Requires hicolor-icon-theme, so that icon dir is owned correctly
- fix license tag to GPLv2+ since sources say: or later version
- fix some comments spelling

* Sat Jun 21 2008 David Timms <iinet.net.au @ dtimms> 0.9.3-2
- del bash wrapper scripts, create symlinks instead.
- fix the python_sitelib generation
- del play.py from package, since it requires pymedia libary
- del recordwin.sh from package, since it requires x11vnc

* Fri Jun 13 2008 David Timms <iinet.net.au @ dtimms> 0.9.3-1
- del explicit python requires; rpm picks this up automatically
- add Requires: pygame
- add wrapper scripts for vnc2swf.py, edit.py and play.py

* Sun May 25 2008 David Timms <iinet.net.au @ dtimms> 0.9.3-0.2
- add BR desktop-file-utils since it now installs the desktop file and icon.

* Sat May 24 2008 David Timms <iinet.net.au @ dtimms> 0.9.3-0.1
- initial package for fedora.




From jcollie at fedoraproject.org  Sat Sep  6 12:48:54 2008
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sat,  6 Sep 2008 12:48:54 +0000 (UTC)
Subject: rpms/asterisk/F-8 asterisk.spec,1.22,1.23
Message-ID: <20080906124854.D96CC70125@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13377

Modified Files:
	asterisk.spec 
Log Message:
* Sat Sep  6 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.21.2-3
- Bump release and rebuild to pick up new libpri



Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-8/asterisk.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- asterisk.spec	31 Jul 2008 00:19:33 -0000	1.22
+++ asterisk.spec	6 Sep 2008 12:48:24 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.4.21.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -315,7 +315,7 @@
 Requires: zaptel >= 1.4.11
 Requires(pre): %{_sbindir}/usermod
 BuildRequires: zaptel-devel >= 1.4.11
-BuildRequires: libpri-devel >= 1.4.6
+BuildRequires: libpri-devel >= 1.4.7
 
 %description zaptel
 Modules for Asterisk that use Zaptel.
@@ -901,6 +901,9 @@
 %{_libdir}/asterisk/modules/codec_zap.so
 
 %changelog
+* Sat Sep  6 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.21.2-3
+- Bump release and rebuild to pick up new libpri
+
 * Wed Jul 30 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.21.2-2
 - Bump release and rebuild to pick up new libpri.
 



From laxathom at fedoraproject.org  Sat Sep  6 13:26:51 2008
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Sat,  6 Sep 2008 13:26:51 +0000 (UTC)
Subject: rpms/g-wrap/devel g-wrap.spec,1.46,1.47 g-wrap-info.patch,1.3,NONE
Message-ID: <20080906132651.5110B70125@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/g-wrap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17896

Modified Files:
	g-wrap.spec 
Removed Files:
	g-wrap-info.patch 
Log Message:
remove outdated patch & rebuild for rawhide


Index: g-wrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- g-wrap.spec	19 Feb 2008 10:44:59 -0000	1.46
+++ g-wrap.spec	6 Sep 2008 13:26:21 -0000	1.47
@@ -1,13 +1,12 @@
 Name:            g-wrap
 Version:         1.9.9
-Release:         6%{?dist}
+Release:         7%{?dist}
 Summary:         A tool for creating Scheme interfaces to C libraries
 
 Group:           Development/Libraries
 License:         LGPLv2+
 URL:             http://www.nongnu.org/g-wrap
 Source:          http://savannah.nongnu.org/download/g-wrap/%{name}-%{version}.tar.gz
-Patch0:          g-wrap-info.patch
 #Patch1:          g-wrap-ffiexecstack.patch
 Patch2:          g-wrap-1.9.6-shaddup.patch
 #Patch3:          g-wrap-1.9.8-staticffi.patch
@@ -48,7 +47,6 @@
 %prep
 %setup -q
 
-%patch0 -p1 -b .info
 #disabled as they don't work with g-wrap-1.9.8
 #%patch1 -p1
 %patch2 -p1 -b .shaddup
@@ -129,6 +127,10 @@
 
 
 %changelog
+* Sat Sep 06 2008 Xavier Lamien <lxtnow[at]gmail.com> - 1.9.9-7
+- Remove out-dated patch -info.patch.
+- Rebuild for Rawhide bug #434278.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.9.9-6
 - Autorebuild for GCC 4.3
 


--- g-wrap-info.patch DELETED ---



From jnovy at fedoraproject.org  Sat Sep  6 13:36:44 2008
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Sat,  6 Sep 2008 13:36:44 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.5.90-patches.patch, NONE, 1.1 rpm.spec, 1.293, 
	1.294
Message-ID: <20080906133644.738A370125@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18808

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.5.90-patches.patch 
Log Message:
* Sat Sep 06 2008 Jindrich Novy <jnovy at redhat.com>
- fail hard if patch isn't found (#461347)


rpm-4.5.90-patches.patch:

--- NEW FILE rpm-4.5.90-patches.patch ---
commit ce1db5af7036df54a21abab9a5d70b06a821fff4
Author: Jindrich Novy <jnovy at redhat.com>
Date:   Sat Sep 6 15:30:40 2008 +0200

    Fail hard if patch isn't found (rhbz#461347)

diff --git a/build/parsePrep.c b/build/parsePrep.c
index fcc28c8..2be0693 100644
--- a/build/parsePrep.c
+++ b/build/parsePrep.c
@@ -538,7 +538,7 @@ int parsePrep(rpmSpec spec)
 	}
 	if (res && !spec->force) {
 	    /* fixup from RPMRC_FAIL do*Macro() codes for now */
-	    res = PART_ERROR; 
+	    nextPart = PART_ERROR; 
 	    goto exit;
 	}
     }


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- rpm.spec	1 Sep 2008 14:38:38 -0000	1.293
+++ rpm.spec	6 Sep 2008 13:36:14 -0000	1.294
@@ -18,7 +18,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.4
+Release: 0.%{snapver}.5
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -36,6 +36,7 @@
 Patch201: rpm-4.5.90-noarch-subpackages.patch
 Patch202: rpm-4.5.90-segfault.patch
 Patch203: rpm-4.5.90-macrofix.patch
+Patch204: rpm-4.5.90-patches.patch
 
 # These are not yet upstream
 Patch300: rpm-4.5.90-posttrans.patch
@@ -170,6 +171,7 @@
 %patch201 -p1 -b .noarch-subpackages
 %patch202 -p1 -b .segfault
 %patch203 -p1 -b .macrofix
+%patch204 -p1 -b .patches
 
 # needs a bit of upstream love first...
 #%patch300 -p1 -b .posttrans
@@ -348,6 +350,9 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Sat Sep 06 2008 Jindrich Novy <jnovy at redhat.com>
+- fail hard if patch isn't found (#461347)
+
 * Mon Sep 01 2008 Jindrich Novy <jnovy at redhat.com>
 - fix parsing of boolean expressions in spec (#456103)
   (unbreaks pam, jpilot and maybe other builds)



From epienbro at fedoraproject.org  Sat Sep  6 13:45:04 2008
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Sat,  6 Sep 2008 13:45:04 +0000 (UTC)
Subject: rpms/pan/F-9 .cvsignore,1.26,1.27 pan.spec,1.38,1.39
Message-ID: <20080906134504.161D770125@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/pan/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19577/F-9

Modified Files:
	.cvsignore pan.spec 
Log Message:
- Update to version 0.133 (fixes GCC 4.3 compilation problems, #433970)
- Remove upstreamed patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pan/F-9/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	13 Sep 2007 00:50:09 -0000	1.26
+++ .cvsignore	6 Sep 2008 13:44:33 -0000	1.27
@@ -1,2 +1 @@
-pan-0.132.tar.bz2
-body-pane.cc.diff
+pan-0.133.tar.bz2


Index: pan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pan/F-9/pan.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- pan.spec	18 Feb 2008 18:42:04 -0000	1.38
+++ pan.spec	6 Sep 2008 13:44:33 -0000	1.39
@@ -1,12 +1,11 @@
 Summary:	A GNOME/GTK+ news reader for X
 Name:		pan
-Version:	0.132
-Release:	3%{?dist}
+Version:	0.133
+Release:	1%{?dist}
 Epoch:		1
-License:	GPL
+License:	GPLv2
 Group:		Applications/Internet
 Source0:	http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2
-Patch0:		body-pane.cc.diff
 URL:		http://pan.rebelbase.com/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils
@@ -27,7 +26,6 @@
 
 %prep
 %setup -q
-%patch0 -b .pixbuf
 
 sed -i -e 's|StartupNotify=false|StartupNotify=true|' %{name}.desktop.in
 
@@ -61,6 +59,13 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sat Sep 6 2008 Erik van Pienbroek <info at nntpgrab.nl> - 1:0.133-1
+- Update to version 0.133 (fixes GCC 4.3 compilation problems)
+- Remove upstreamed patch
+
+* Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.132-4
+- fix license tag
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:0.132-3
 - Autorebuild for GCC 4.3
 



From epienbro at fedoraproject.org  Sat Sep  6 13:45:04 2008
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Sat,  6 Sep 2008 13:45:04 +0000 (UTC)
Subject: rpms/pan/devel .cvsignore, 1.26, 1.27 pan.spec, 1.39, 1.40 sources, 
	1.26, 1.27
Message-ID: <20080906134504.419B670125@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/pan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19577/devel

Modified Files:
	.cvsignore pan.spec sources 
Log Message:
- Update to version 0.133 (fixes GCC 4.3 compilation problems, #433970)
- Remove upstreamed patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pan/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	13 Sep 2007 00:50:09 -0000	1.26
+++ .cvsignore	6 Sep 2008 13:44:34 -0000	1.27
@@ -1,2 +1 @@
-pan-0.132.tar.bz2
-body-pane.cc.diff
+pan-0.133.tar.bz2


Index: pan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pan/devel/pan.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- pan.spec	21 May 2008 16:47:25 -0000	1.39
+++ pan.spec	6 Sep 2008 13:44:34 -0000	1.40
@@ -1,12 +1,11 @@
 Summary:	A GNOME/GTK+ news reader for X
 Name:		pan
-Version:	0.132
-Release:	4%{?dist}
+Version:	0.133
+Release:	1%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		Applications/Internet
 Source0:	http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2
-Patch0:		body-pane.cc.diff
 URL:		http://pan.rebelbase.com/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils
@@ -27,7 +26,6 @@
 
 %prep
 %setup -q
-%patch0 -b .pixbuf
 
 sed -i -e 's|StartupNotify=false|StartupNotify=true|' %{name}.desktop.in
 
@@ -61,6 +59,10 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sat Sep 6 2008 Erik van Pienbroek <info at nntpgrab.nl> - 1:0.133-1
+- Update to version 0.133 (fixes GCC 4.3 compilation problems)
+- Remove upstreamed patch
+
 * Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.132-4
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pan/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	13 Sep 2007 00:50:09 -0000	1.26
+++ sources	6 Sep 2008 13:44:34 -0000	1.27
@@ -1,2 +1 @@
-2c337dbd5105b7772a4326d549a45638  pan-0.132.tar.bz2
-dc39d58b91409753512f1dc3bd00c077  body-pane.cc.diff
+ca165da8557605d89d327cff78891b89  pan-0.133.tar.bz2



From epienbro at fedoraproject.org  Sat Sep  6 14:00:49 2008
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Sat,  6 Sep 2008 14:00:49 +0000 (UTC)
Subject: rpms/pan/F-9 sources,1.26,1.27
Message-ID: <20080906140049.1D29570125@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/pan/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21230

Modified Files:
	sources 
Log Message:
Forgot to update the sources file for F-9



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pan/F-9/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	13 Sep 2007 00:50:09 -0000	1.26
+++ sources	6 Sep 2008 14:00:18 -0000	1.27
@@ -1,2 +1 @@
-2c337dbd5105b7772a4326d549a45638  pan-0.132.tar.bz2
-dc39d58b91409753512f1dc3bd00c077  body-pane.cc.diff
+ca165da8557605d89d327cff78891b89  pan-0.133.tar.bz2



From ertzing at fedoraproject.org  Sat Sep  6 14:12:20 2008
From: ertzing at fedoraproject.org (Ralf Ertzinger)
Date: Sat,  6 Sep 2008 14:12:20 +0000 (UTC)
Subject: rpms/libfwbuilder/devel libfwbuilder.spec,1.27,1.28
Message-ID: <20080906141220.DE17770125@cvs1.fedora.phx.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/libfwbuilder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22192

Modified Files:
	libfwbuilder.spec 
Log Message:
* Sat Sep 06 2008 Ralf Ertzinger <ralf at skytale.net> 3.0.0-1
- Move .so files to -devel subpackage
- Use full URL in Source:
  (thanks to Till Maas for the hints)



Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libfwbuilder.spec	5 Sep 2008 21:15:21 -0000	1.27
+++ libfwbuilder.spec	6 Sep 2008 14:11:50 -0000	1.28
@@ -1,11 +1,11 @@
 Name:           libfwbuilder
 Summary:        Firewall Builder API
 Version:        3.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://www.fwbuilder.org/
-Source:         %{name}-%{version}.tar.gz
+Source:         http://downloads.sourceforge.net/fwbuilder/%{name}-%{version}.tar.gz
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 
 Patch0:         libfwbuilder-2.1.14-gcc43.patch
@@ -23,7 +23,6 @@
 %dir %{_datadir}/libfwbuilder
 %{_datadir}/libfwbuilder/*
 %{_libdir}/*.so.*
-%{_libdir}/*.so
 
 
 %package devel
@@ -39,6 +38,7 @@
 
 %files  devel
 %defattr(-, root, root)
+%{_libdir}/*.so
 %{_bindir}/libfwbuilder-config-3
 %{_includedir}/fwb-3
 
@@ -77,6 +77,11 @@
 
 
 %changelog
+* Sat Sep 06 2008 Ralf Ertzinger <ralf at skytale.net> 3.0.0-1
+- Move .so files to -devel subpackage
+- Use full URL in Source:
+  (thanks to Till Maas for the hints)
+
 * Fri Sep 05 2008 Ralf Ertzinger <ralf at skytale.net> 3.0.0-1
 - Update to 3.0.0
 



From laxathom at fedoraproject.org  Sat Sep  6 14:13:39 2008
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Sat,  6 Sep 2008 14:13:39 +0000 (UTC)
Subject: rpms/guile-gnome-platform/devel guile-gnome-platform.spec,1.2,1.3
Message-ID: <20080906141339.5277770125@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/guile-gnome-platform/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22612

Modified Files:
	guile-gnome-platform.spec 
Log Message:
rebuild for rawhide


Index: guile-gnome-platform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guile-gnome-platform/devel/guile-gnome-platform.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- guile-gnome-platform.spec	19 Feb 2008 10:51:52 -0000	1.2
+++ guile-gnome-platform.spec	6 Sep 2008 14:13:09 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           guile-gnome-platform
 Version:        2.15.93
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Guile wrapper collection for the GNOME library stack
 
 Group:          Applications/System
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Sat Sep 06 2008 Xavier Lamien <lxtnow[at]gmail.com> - 2.15.93-8
+- Rebuild for rawhide.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.15.93-7
 - Autorebuild for GCC 4.3
 



From salimma at fedoraproject.org  Sat Sep  6 14:14:29 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat,  6 Sep 2008 14:14:29 +0000 (UTC)
Subject: rpms/Django/EL-4 .cvsignore, 1.7, 1.8 Django.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <20080906141429.EEA4470125@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/Django/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22730/EL-4

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
* Sat Sep  6 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-1
- Update to final 1.0 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Sep 2008 02:04:42 -0000	1.7
+++ .cvsignore	6 Sep 2008 14:13:59 -0000	1.8
@@ -1 +1 @@
-Django-0.96.3.tar.gz
+Django-1.0.tar.gz


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/Django.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Django.spec	3 Sep 2008 02:39:13 -0000	1.11
+++ Django.spec	6 Sep 2008 14:13:59 -0000	1.12
@@ -1,10 +1,10 @@
 %{!?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 mainver 0.96
+%define mainver 1.0
 
 Name:           Django
-Version:        %{mainver}.3
+Version:        %{mainver}
 Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
@@ -27,11 +27,11 @@
 
 
 %package doc
-Summary:  Documentation for Django
-Group:    Documentation
-Requires: %{name} = %{version}-%{release}
-Provides:  %{name}-docs = %{version}-%{release}
-Obsoletes: %{name}-docs < %{version}-%{release}
+Summary:        Documentation for Django
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-docs = %{version}-%{release}
+Obsoletes:      %{name}-docs < %{version}-%{release}
 
 %description doc
 This package contains the documentation for the Django high-level
@@ -58,6 +58,7 @@
 pushd $RPM_BUILD_ROOT%{python_sitelib}/django
 chmod +x conf/project_template/manage.py
 cd bin
+chmod +x profiling/gather_profile_stats.py
 chmod +x {{compile,make,unique}-messages,daily_cleanup,django-admin}.py
 popd
 
@@ -79,9 +80,18 @@
 %doc docs/*
 
 %changelog
-* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 0.96.3-1
+* Sat Sep  6 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-1
+- Update to final 1.0 release
+
+* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-0.1.rc1%{?dist}
 - CSRF security update: bz#460966
 
+* Wed Aug 27 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-0.1.beta2
+- Update to 1.0 beta2
+
+* Sat Aug 23 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-0.1.beta1
+- Update to 1.0 beta1
+
 * Mon May 19 2008 Michel Salim <salimma at fedoraproject.org> - 0.96.2-1
 - XSS security update: CVE-2008-2302 (bz# 442757-60)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Sep 2008 02:04:42 -0000	1.7
+++ sources	6 Sep 2008 14:13:59 -0000	1.8
@@ -1 +1 @@
-ee36233367d2abc5b058a3a84a4447cf  Django-0.96.3.tar.gz
+84d0490e4126f31d1c23f640e1e86f2f  Django-1.0.tar.gz



From salimma at fedoraproject.org  Sat Sep  6 14:14:30 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat,  6 Sep 2008 14:14:30 +0000 (UTC)
Subject: rpms/Django/EL-5 .cvsignore, 1.7, 1.8 Django.spec, 1.6, 1.7 sources,
	1.7, 1.8
Message-ID: <20080906141430.2D58A70125@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/Django/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22730/EL-5

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
* Sat Sep  6 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-1
- Update to final 1.0 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Sep 2008 02:04:42 -0000	1.7
+++ .cvsignore	6 Sep 2008 14:13:59 -0000	1.8
@@ -1 +1 @@
-Django-0.96.3.tar.gz
+Django-1.0.tar.gz


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/Django.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Django.spec	3 Sep 2008 02:04:42 -0000	1.6
+++ Django.spec	6 Sep 2008 14:13:59 -0000	1.7
@@ -1,10 +1,10 @@
 %{!?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 mainver 0.96
+%define mainver 1.0
 
 Name:           Django
-Version:        %{mainver}.3
+Version:        %{mainver}
 Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
@@ -27,11 +27,11 @@
 
 
 %package doc
-Summary:  Documentation for Django
-Group:    Documentation
-Requires: %{name} = %{version}-%{release}
-Provides:  %{name}-docs = %{version}-%{release}
-Obsoletes: %{name}-docs < %{version}-%{release}
+Summary:        Documentation for Django
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-docs = %{version}-%{release}
+Obsoletes:      %{name}-docs < %{version}-%{release}
 
 %description doc
 This package contains the documentation for the Django high-level
@@ -58,6 +58,7 @@
 pushd $RPM_BUILD_ROOT%{python_sitelib}/django
 chmod +x conf/project_template/manage.py
 cd bin
+chmod +x profiling/gather_profile_stats.py
 chmod +x {{compile,make,unique}-messages,daily_cleanup,django-admin}.py
 popd
 
@@ -80,9 +81,18 @@
 %doc docs/*
 
 %changelog
-* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 0.96.3-1
+* Sat Sep  6 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-1
+- Update to final 1.0 release
+
+* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-0.1.rc1%{?dist}
 - CSRF security update: bz#460966
 
+* Wed Aug 27 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-0.1.beta2
+- Update to 1.0 beta2
+
+* Sat Aug 23 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-0.1.beta1
+- Update to 1.0 beta1
+
 * Mon May 19 2008 Michel Salim <salimma at fedoraproject.org> - 0.96.2-1
 - XSS security update: CVE-2008-2302 (bz# 442757-60)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Sep 2008 02:04:42 -0000	1.7
+++ sources	6 Sep 2008 14:13:59 -0000	1.8
@@ -1 +1 @@
-ee36233367d2abc5b058a3a84a4447cf  Django-0.96.3.tar.gz
+84d0490e4126f31d1c23f640e1e86f2f  Django-1.0.tar.gz



From salimma at fedoraproject.org  Sat Sep  6 14:14:30 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat,  6 Sep 2008 14:14:30 +0000 (UTC)
Subject: rpms/Django/F-7 .cvsignore, 1.7, 1.8 Django.spec, 1.9, 1.10 sources,
	1.7, 1.8
Message-ID: <20080906141430.7956C70125@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/Django/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22730/F-7

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
* Sat Sep  6 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-1
- Update to final 1.0 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Sep 2008 02:04:43 -0000	1.7
+++ .cvsignore	6 Sep 2008 14:14:00 -0000	1.8
@@ -1 +1 @@
-Django-0.96.3.tar.gz
+Django-1.0.tar.gz


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-7/Django.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Django.spec	19 May 2008 20:01:45 -0000	1.9
+++ Django.spec	6 Sep 2008 14:14:00 -0000	1.10
@@ -1,10 +1,10 @@
 %{!?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 mainver 0.96
+%define mainver 1.0
 
 Name:           Django
-Version:        %{mainver}.2
+Version:        %{mainver}
 Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
@@ -27,11 +27,11 @@
 
 
 %package doc
-Summary:  Documentation for Django
-Group:    Documentation
-Requires: %{name} = %{version}-%{release}
-Provides:  %{name}-docs = %{version}-%{release}
-Obsoletes: %{name}-docs < %{version}-%{release}
+Summary:        Documentation for Django
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-docs = %{version}-%{release}
+Obsoletes:      %{name}-docs < %{version}-%{release}
 
 %description doc
 This package contains the documentation for the Django high-level
@@ -58,6 +58,7 @@
 pushd $RPM_BUILD_ROOT%{python_sitelib}/django
 chmod +x conf/project_template/manage.py
 cd bin
+chmod +x profiling/gather_profile_stats.py
 chmod +x {{compile,make,unique}-messages,daily_cleanup,django-admin}.py
 popd
 
@@ -80,6 +81,18 @@
 %doc docs/*
 
 %changelog
+* Sat Sep  6 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-1
+- Update to final 1.0 release
+
+* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-0.1.rc1%{?dist}
+- CSRF security update: bz#460966
+
+* Wed Aug 27 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-0.1.beta2
+- Update to 1.0 beta2
+
+* Sat Aug 23 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-0.1.beta1
+- Update to 1.0 beta1
+
 * Mon May 19 2008 Michel Salim <salimma at fedoraproject.org> - 0.96.2-1
 - XSS security update: CVE-2008-2302 (bz# 442757-60)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Sep 2008 02:04:43 -0000	1.7
+++ sources	6 Sep 2008 14:14:00 -0000	1.8
@@ -1 +1 @@
-ee36233367d2abc5b058a3a84a4447cf  Django-0.96.3.tar.gz
+84d0490e4126f31d1c23f640e1e86f2f  Django-1.0.tar.gz



From salimma at fedoraproject.org  Sat Sep  6 14:14:30 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat,  6 Sep 2008 14:14:30 +0000 (UTC)
Subject: rpms/Django/F-9 .cvsignore, 1.7, 1.8 Django.spec, 1.11, 1.12 sources,
	1.7, 1.8
Message-ID: <20080906141430.F21C670125@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/Django/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22730/F-9

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
* Sat Sep  6 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-1
- Update to final 1.0 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Sep 2008 02:04:43 -0000	1.7
+++ .cvsignore	6 Sep 2008 14:14:00 -0000	1.8
@@ -1 +1 @@
-Django-0.96.3.tar.gz
+Django-1.0.tar.gz


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-9/Django.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Django.spec	3 Sep 2008 02:04:43 -0000	1.11
+++ Django.spec	6 Sep 2008 14:14:00 -0000	1.12
@@ -1,10 +1,10 @@
 %{!?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 mainver 0.96
+%define mainver 1.0
 
 Name:           Django
-Version:        %{mainver}.3
+Version:        %{mainver}
 Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
@@ -27,11 +27,11 @@
 
 
 %package doc
-Summary:  Documentation for Django
-Group:    Documentation
-Requires: %{name} = %{version}-%{release}
-Provides:  %{name}-docs = %{version}-%{release}
-Obsoletes: %{name}-docs < %{version}-%{release}
+Summary:        Documentation for Django
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-docs = %{version}-%{release}
+Obsoletes:      %{name}-docs < %{version}-%{release}
 
 %description doc
 This package contains the documentation for the Django high-level
@@ -58,6 +58,7 @@
 pushd $RPM_BUILD_ROOT%{python_sitelib}/django
 chmod +x conf/project_template/manage.py
 cd bin
+chmod +x profiling/gather_profile_stats.py
 chmod +x {{compile,make,unique}-messages,daily_cleanup,django-admin}.py
 popd
 
@@ -80,9 +81,18 @@
 %doc docs/*
 
 %changelog
-* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 0.96.3-1
+* Sat Sep  6 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-1
+- Update to final 1.0 release
+
+* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-0.1.rc1%{?dist}
 - CSRF security update: bz#460966
 
+* Wed Aug 27 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-0.1.beta2
+- Update to 1.0 beta2
+
+* Sat Aug 23 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-0.1.beta1
+- Update to 1.0 beta1
+
 * Mon May 19 2008 Michel Salim <salimma at fedoraproject.org> - 0.96.2-1
 - XSS security update: CVE-2008-2302 (bz# 442757-60)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Sep 2008 02:04:43 -0000	1.7
+++ sources	6 Sep 2008 14:14:00 -0000	1.8
@@ -1 +1 @@
-ee36233367d2abc5b058a3a84a4447cf  Django-0.96.3.tar.gz
+84d0490e4126f31d1c23f640e1e86f2f  Django-1.0.tar.gz



From salimma at fedoraproject.org  Sat Sep  6 14:14:30 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat,  6 Sep 2008 14:14:30 +0000 (UTC)
Subject: rpms/Django/F-8 .cvsignore, 1.7, 1.8 Django.spec, 1.10, 1.11 sources,
	1.7, 1.8
Message-ID: <20080906141430.B796970125@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/Django/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22730/F-8

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
* Sat Sep  6 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-1
- Update to final 1.0 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Sep 2008 02:04:43 -0000	1.7
+++ .cvsignore	6 Sep 2008 14:14:00 -0000	1.8
@@ -1 +1 @@
-Django-0.96.3.tar.gz
+Django-1.0.tar.gz


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-8/Django.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Django.spec	3 Sep 2008 02:04:43 -0000	1.10
+++ Django.spec	6 Sep 2008 14:14:00 -0000	1.11
@@ -1,10 +1,10 @@
 %{!?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 mainver 0.96
+%define mainver 1.0
 
 Name:           Django
-Version:        %{mainver}.3
+Version:        %{mainver}
 Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
@@ -27,11 +27,11 @@
 
 
 %package doc
-Summary:  Documentation for Django
-Group:    Documentation
-Requires: %{name} = %{version}-%{release}
-Provides:  %{name}-docs = %{version}-%{release}
-Obsoletes: %{name}-docs < %{version}-%{release}
+Summary:        Documentation for Django
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-docs = %{version}-%{release}
+Obsoletes:      %{name}-docs < %{version}-%{release}
 
 %description doc
 This package contains the documentation for the Django high-level
@@ -58,6 +58,7 @@
 pushd $RPM_BUILD_ROOT%{python_sitelib}/django
 chmod +x conf/project_template/manage.py
 cd bin
+chmod +x profiling/gather_profile_stats.py
 chmod +x {{compile,make,unique}-messages,daily_cleanup,django-admin}.py
 popd
 
@@ -80,9 +81,18 @@
 %doc docs/*
 
 %changelog
-* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 0.96.3-1
+* Sat Sep  6 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-1
+- Update to final 1.0 release
+
+* Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-0.1.rc1%{?dist}
 - CSRF security update: bz#460966
 
+* Wed Aug 27 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-0.1.beta2
+- Update to 1.0 beta2
+
+* Sat Aug 23 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-0.1.beta1
+- Update to 1.0 beta1
+
 * Mon May 19 2008 Michel Salim <salimma at fedoraproject.org> - 0.96.2-1
 - XSS security update: CVE-2008-2302 (bz# 442757-60)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Sep 2008 02:04:43 -0000	1.7
+++ sources	6 Sep 2008 14:14:00 -0000	1.8
@@ -1 +1 @@
-ee36233367d2abc5b058a3a84a4447cf  Django-0.96.3.tar.gz
+84d0490e4126f31d1c23f640e1e86f2f  Django-1.0.tar.gz



From salimma at fedoraproject.org  Sat Sep  6 14:14:31 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat,  6 Sep 2008 14:14:31 +0000 (UTC)
Subject: rpms/Django/devel .cvsignore, 1.9, 1.10 Django.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <20080906141431.4805270125@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/Django/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22730/devel

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
* Sat Sep  6 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-1
- Update to final 1.0 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Sep 2008 02:04:43 -0000	1.9
+++ .cvsignore	6 Sep 2008 14:14:00 -0000	1.10
@@ -1 +1 @@
-Django-1.0-rc_1.tar.gz
+Django-1.0.tar.gz


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/Django.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Django.spec	3 Sep 2008 02:04:43 -0000	1.13
+++ Django.spec	6 Sep 2008 14:14:01 -0000	1.14
@@ -2,18 +2,16 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 %define mainver 1.0
-%define prerel  rc
-%define prever  1
 
 Name:           Django
 Version:        %{mainver}
-Release:        0.1.%{prerel}%{prever}%{?dist}
+Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.djangoproject.com/
-Source0:        http://media.djangoproject.com/releases/%{mainver}/Django-%{version}-%{prerel}_%{prever}.tar.gz
+Source0:        http://media.djangoproject.com/releases/%{mainver}/Django-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -41,7 +39,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{prerel}_%{prever}
+%setup -q
 
 
 %build
@@ -83,6 +81,9 @@
 %doc docs/*
 
 %changelog
+* Sat Sep  6 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-1
+- Update to final 1.0 release
+
 * Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-0.1.rc1%{?dist}
 - CSRF security update: bz#460966
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Sep 2008 02:04:43 -0000	1.9
+++ sources	6 Sep 2008 14:14:01 -0000	1.10
@@ -1 +1 @@
-df9db6ee729137ec66cb3e21ffd3ba60  Django-1.0-rc_1.tar.gz
+84d0490e4126f31d1c23f640e1e86f2f  Django-1.0.tar.gz



From pbrobinson at fedoraproject.org  Sat Sep  6 14:29:28 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  6 Sep 2008 14:29:28 +0000 (UTC)
Subject: rpms/gssdp/F-8 gssdp.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080906142928.9FB2070125@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gssdp/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24329/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	gssdp.spec import.log 
Log Message:
- Initial F-8 cvs import



--- NEW FILE gssdp.spec ---
Name:           gssdp
Version:        0.6.2
Release:        1%{?dist}
Summary:        GSSDP implements resource discovery and announcement over SSDP

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.gupnp.org/
Source0:        http://www.gupnp.org/sources/gssdp/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: pkgconfig
BuildRequires: libsoup-devel >= 2.4

BuildRequires: dbus-glib-devel
BuildRequires: glib2-devel
BuildRequires: libxml2-devel
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
BuildRequires: NetworkManager-devel
BuildRequires: libglade2-devel

Requires: dbus

%description
GSSDP implements resource discovery and announcement over SSDP and is part 
of gUPnP.  GUPnP is an object-oriented open source framework for creating 
UPnP devices and control points, written in C using GObject and libsoup. The 
GUPnP API is intended to be easy to use, efficient and flexible. GSSDP 
implements resource discovery and announcement over SSDP.

%package devel
Summary: Development package for gssdp
Group: Development/Libraries
Requires: gssdp = %{version}-%{release}
Requires: pkgconfig
Requires: gtk-doc

%description devel
Files for development with gssdp.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/libgssdp-1.0.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README NEWS
%dir %{_datadir}/gssdp
%{_bindir}/gssdp-device-sniffer
%{_libdir}/libgssdp-1.0.so.1
%{_libdir}/libgssdp-1.0.so.1.0.0
%{_datadir}/gssdp/gssdp-device-sniffer.glade

%files devel
%defattr(-,root,root,-)
%{_datadir}/gtk-doc/html/gssdp
%{_libdir}/libgssdp-1.0.so
%{_libdir}/pkgconfig/gssdp-1.0.pc
%{_includedir}/gssdp-1.0

%changelog
* Sun Aug 31 2008 Peter Robinson <pbrobinson at gmail.com> 0.6.2-1
- New upstream version

* Tue Aug 26 2008 Peter Robinson <pbrobinson at gmail.com> 0.6.1-4
- Move glade files from devel to main rpm

* Tue Aug 12 2008 Peter Robinson <pbrobinson at gmail.com> 0.6.1-3
- Patch to fix the build in rawhide

* Fri Aug 8 2008 Peter Robinson <pbrobinson at gmail.com> 0.6.1-2
- Updates based on feedback

* Mon May 19 2008 Peter Robinson <pbrobinson at gmail.com> 0.6.1-1
- Initial package 


--- NEW FILE import.log ---
gssdp-0_6_2-1_fc9:F-8:gssdp-0.6.2-1.fc9.src.rpm:1220711194


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gssdp/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Aug 2008 17:18:58 -0000	1.1
+++ .cvsignore	6 Sep 2008 14:28:58 -0000	1.2
@@ -0,0 +1 @@
+gssdp-0.6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gssdp/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Aug 2008 17:18:58 -0000	1.1
+++ sources	6 Sep 2008 14:28:58 -0000	1.2
@@ -0,0 +1 @@
+aac3f73343a82db7a9acd5233ab32719  gssdp-0.6.2.tar.gz



From pbrobinson at fedoraproject.org  Sat Sep  6 14:33:11 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  6 Sep 2008 14:33:11 +0000 (UTC)
Subject: rpms/gupnp/F-8 gupnp.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080906143311.1B03770125@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25127/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	gupnp.spec import.log 
Log Message:
- Initial F-8 cvs import



--- NEW FILE gupnp.spec ---
Name:           gupnp
Version:        0.12.2
Release:        1%{?dist}
Summary:        GUPnP is an framework for creating UPnP devices & control points

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.gupnp.org/
Source0:        http://www.gupnp.org/sources/gupnp/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: libxml2-devel
BuildRequires: gssdp-devel >= 0.6
BuildRequires: glib2-devel
BuildRequires: libsoup-devel
BuildRequires: libxml2-devel
BuildRequires: e2fsprogs-devel

Requires: dbus

%description
GUPnP is an object-oriented open source framework for creating UPnP 
devices and control points, written in C using GObject and libsoup. 
The GUPnP API is intended to be easy to use, efficient and flexible. 

%package devel
Summary: Development package for gupnp
Group: Development/Libraries
Requires: gupnp = %{version}-%{release}
Requires: pkgconfig
Requires: gtk-doc

%description devel
Files for development with gupnp.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/libgupnp-1.0.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/libgupnp-1.0.so.2
%{_libdir}/libgupnp-1.0.so.2.0.0
%{_bindir}/gupnp-binding-tool

%files devel
%defattr(-,root,root,-)
%{_datadir}/gtk-doc/html/gupnp
%{_libdir}/pkgconfig/gupnp-1.0.pc
%{_libdir}/libgupnp-1.0.so
%{_includedir}/gupnp-1.0

%changelog
* Sun Aug 31 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.2-1
- New upstream release

* Thu Aug 28 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.1-7
- Yet again. Interesting it builds fine in mock and not koji

* Thu Aug 28 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.1-6
- Once more with feeling

* Thu Aug 28 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.1-5
- Second go

* Thu Aug 28 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.1-4
- Fix build on rawhide

* Wed Aug 13 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.1-3
- Fix changelog entries

* Wed Aug 13 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.1-2
- Fix a compile issue on rawhide

* Mon Jun 16 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.1-1
- Initial release


--- NEW FILE import.log ---
gupnp-0_12_2-1_fc9:F-8:gupnp-0.12.2-1.fc9.src.rpm:1220711523


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Aug 2008 17:32:18 -0000	1.1
+++ .cvsignore	6 Sep 2008 14:32:40 -0000	1.2
@@ -0,0 +1 @@
+gupnp-0.12.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Aug 2008 17:32:18 -0000	1.1
+++ sources	6 Sep 2008 14:32:40 -0000	1.2
@@ -0,0 +1 @@
+5350f5f28fb3742779702a496ab75d72  gupnp-0.12.2.tar.gz



From pbrobinson at fedoraproject.org  Sat Sep  6 14:35:28 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  6 Sep 2008 14:35:28 +0000 (UTC)
Subject: rpms/gupnp-av/F-9 gupnp-av.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080906143528.8E07F70125@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-av/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25649/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	gupnp-av.spec import.log 
Log Message:
- Initial F-9 cvs import



--- NEW FILE gupnp-av.spec ---
Name:           gupnp-av
Version:        0.2.1
Release:        3%{?dist}
Summary:        GUPnP-AV is a collection of helpers for building UPnP AV applications

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.gupnp.org/
Source0:        http://www.gupnp.org/sources/gupnp-av/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: glib2-devel
BuildRequires: libxml2-devel
BuildRequires: libsoup-devel
BuildRequires: gssdp-devel
BuildRequires: gupnp-devel

%description
GUPnP is an object-oriented open source framework for creating UPnP
devices and control points, written in C using GObject and libsoup.
The GUPnP API is intended to be easy to use, efficient and flexible.

GUPnP-AV is a collection of helpers for building AV (audio/video) 
applications using GUPnP.

%package devel
Summary: Development package for gupnp-av
Group: Development/Libraries
Requires: gupnp-av = %{version}-%{release}
Requires: pkgconfig
Requires: gtk-doc

%description devel
Files for development with gupnp-av.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/libgupnp-av-1.0.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/libgupnp-av-1.0.so.1
%{_libdir}/libgupnp-av-1.0.so.1.0.0

%files devel
%defattr(-,root,root,-)
%{_datadir}/gtk-doc/html/gupnp-av/
%{_includedir}/gupnp-av-1.0/libgupnp-av
%{_libdir}/pkgconfig/gupnp-av-1.0.pc
%{_libdir}/libgupnp-av-1.0.so

%changelog
* Fri Aug 29 2008 Peter Robinson <pbrobinson at gmail.com> 0.2.1-3
- Some spec file cleanups

* Tue Jun 17 2008 Peter Robinson <pbrobinson at gmail.com> 0.2.1-2
- Fix build on rawhide

* Tue Jun 17 2008 Peter Robinson <pbrobinson at gmail.com> 0.2.1-1
- Initial release


--- NEW FILE import.log ---
gupnp-av-0_2_1-3_fc9:F-9:gupnp-av-0.2.1-3.fc9.src.rpm:1220711646


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 17:03:10 -0000	1.1
+++ .cvsignore	6 Sep 2008 14:34:58 -0000	1.2
@@ -0,0 +1 @@
+gupnp-av-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 17:03:10 -0000	1.1
+++ sources	6 Sep 2008 14:34:58 -0000	1.2
@@ -0,0 +1 @@
+af9898820fe57b93387d17f32121367d  gupnp-av-0.2.1.tar.gz



From gemi at fedoraproject.org  Sat Sep  6 14:37:33 2008
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat,  6 Sep 2008 14:37:33 +0000 (UTC)
Subject: rpms/genius/devel genius.spec,1.9,1.10
Message-ID: <20080906143733.E263F70125@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/genius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25908

Modified Files:
	genius.spec 
Log Message:



Index: genius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/genius/devel/genius.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- genius.spec	6 Sep 2008 11:34:18 -0000	1.9
+++ genius.spec	6 Sep 2008 14:37:03 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           genius
 Version:        1.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An arbitrary precision integer and multiple precision floatingpoint calculator
 
 Group:          Applications/Engineering
@@ -68,7 +68,7 @@
 rm -f $RPM_BUILD_ROOT%{_datadir}/genius/plugins/test.plugin
 rm -rf $RPM_BUILD_ROOT%{_datadir}/application-registry
 rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
-rm -rf $RPM_BUILD_ROOT%{_datadir}/mime/{subclasses,text,XMLnamespaces,aliases,globs,magic,mime.cache}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/mime/{subclasses,text,XMLnamespaces,aliases,globs,magic,mime.cache,icons,generic-icons,treemagic,types,globs2}
 rm -rf $RPM_BUILD_ROOT/var
 desktop-file-install \
     --vendor fedora \



From ertzing at fedoraproject.org  Sat Sep  6 14:46:44 2008
From: ertzing at fedoraproject.org (Ralf Ertzinger)
Date: Sat,  6 Sep 2008 14:46:44 +0000 (UTC)
Subject: rpms/fwbuilder/devel .cvsignore, 1.14, 1.15 fwbuilder.spec, 1.26,
	1.27 sources, 1.14, 1.15
Message-ID: <20080906144644.15FA970125@cvs1.fedora.phx.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/fwbuilder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26708

Modified Files:
	.cvsignore fwbuilder.spec sources 
Log Message:
* Sat Sep 06 2008 Ralf Ertzinger <ralf at skytale.net> 3.0.0-1
- Update to 3.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	3 Jan 2008 15:52:50 -0000	1.14
+++ .cvsignore	6 Sep 2008 14:46:13 -0000	1.15
@@ -1 +1 @@
-fwbuilder-2.1.16.tar.gz
+fwbuilder-3.0.0.tar.gz


Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- fwbuilder.spec	25 Mar 2008 15:04:35 -0000	1.26
+++ fwbuilder.spec	6 Sep 2008 14:46:13 -0000	1.27
@@ -1,19 +1,19 @@
 Name:           fwbuilder
 Summary:        Firewall Builder
-Version:        2.1.16
-Release:        2%{?dist}
+Version:        3.0.0
+Release:        1%{?dist}
 
 License:        GPLv2+
 Group:          Applications/System
 URL:            http://www.fwbuilder.org/
-Source:         %{name}-%{version}.tar.gz
+Source:         http://downloads.sourceforge.net/fwbuilder/%{name}-%{version}.tar.gz
 Source1:        fwbuilder.desktop
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 Requires:       libfwbuilder = %{version}
 
 Patch0:         fwbuilder-2.1.14-gcc43.patch
 
-BuildRequires:  qt3-devel
+BuildRequires:  qt4-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libfwbuilder-devel = %{version}
 BuildRequires:  gawk
@@ -33,12 +33,10 @@
 %setup -q
 
 # Fix regressions due to stricter GCC 4.3 checking
-%patch0 -p1 -b .gcc43
+# %patch0 -p1 -b .gcc43
 
 
 %build
-[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-
 %configure \
     --with-templatedir=%{_datadir}/fwbuilder \
     --disable-dependency-tracking
@@ -46,12 +44,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-make DDIR=$RPM_BUILD_ROOT STRIPPROG=/bin/true install
+make install INSTALL_ROOT=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
 
 # Add an icon for the menu system
-install -Dpm 644 src/gui/icons/firewall_64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/fwbuilder.png
+install -Dpm 644 src/gui/Icons/firewall_64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/fwbuilder.png
 
 # Add menu entry
 desktop-file-install --vendor fedora               \
@@ -75,7 +72,6 @@
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/fwbuilder.png
 %{_bindir}/fwbuilder
-%{_bindir}/fwblookup
 %{_bindir}/fwbedit
 %doc doc/AUTHORS
 %doc doc/COPYING
@@ -83,10 +79,8 @@
 %doc doc/ChangeLog
 %doc doc/PatchAcceptancePolicy.txt
 %doc doc/README.floppyfw
-%doc doc/ReleaseNotes_*.txt
 %doc doc/ReleaseNotes_*.html
 %{_mandir}/man1/fwbuilder.1*
-%{_mandir}/man1/fwblookup.1*
 %{_mandir}/man1/fwbedit.1*
 
 
@@ -149,7 +143,28 @@
 %doc doc/README.ipt
 %{_mandir}/man1/fwb_ipt.1*
 
+
+%package cisco
+Summary:  Policy Compiler for Cisco routers/firewalls
+Group:    Applications/System
+Requires: %{name} = %{version}-%{release}
+
+%description cisco
+Policy compiler for Cisco routers/firewalls
+
+%files cisco
+%defattr(-,root,root)
+%{_bindir}/fwb_iosacl
+%{_bindir}/fwb_pix
+%doc doc/README.iosacl
+%doc doc/README.pix
+%{_mandir}/man1/fwb_iosacl.1*
+%{_mandir}/man1/fwb_pix.1*
+
 %changelog
+* Sat Sep 06 2008 Ralf Ertzinger <ralf at skytale.net> 3.0.0-1
+- Update to 3.0.0
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.1.16-2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	3 Jan 2008 15:52:50 -0000	1.14
+++ sources	6 Sep 2008 14:46:13 -0000	1.15
@@ -1 +1 @@
-bb8b0c12f213dbfadb9fc43b53ed6785  fwbuilder-2.1.16.tar.gz
+f1032f4ebc8263224d7e829a204e8d5e  fwbuilder-3.0.0.tar.gz



From pkgdb at fedoraproject.org  Sat Sep  6 14:52:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 14:52:54 +0000
Subject: [pkgdb] opal: pbrobinson has requested watchbugzilla
Message-ID: <20080906145254.A4BEA20876C@bastion.fedora.phx.redhat.com>

pbrobinson has requested the watchbugzilla acl on opal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opal



From pkgdb at fedoraproject.org  Sat Sep  6 14:52:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 14:52:54 +0000
Subject: [pkgdb] opal: pbrobinson has requested watchcommits
Message-ID: <20080906145254.DEE8320876F@bastion.fedora.phx.redhat.com>

pbrobinson has requested the watchcommits acl on opal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opal



From pkgdb at fedoraproject.org  Sat Sep  6 14:52:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 14:52:58 +0000
Subject: [pkgdb] opal: pbrobinson has requested commit
Message-ID: <20080906145258.AF391208D07@bastion.fedora.phx.redhat.com>

pbrobinson has requested the commit acl on opal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opal



From pkgdb at fedoraproject.org  Sat Sep  6 14:53:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 14:53:04 +0000
Subject: [pkgdb] opal: pbrobinson has requested approveacls
Message-ID: <20080906145304.25B13208D7C@bastion.fedora.phx.redhat.com>

pbrobinson has requested the approveacls acl on opal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opal



From pkgdb at fedoraproject.org  Sat Sep  6 14:53:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 14:53:35 +0000
Subject: [pkgdb] ekiga: pbrobinson has requested watchbugzilla
Message-ID: <20080906145335.4F65F20876C@bastion.fedora.phx.redhat.com>

pbrobinson has requested the watchbugzilla acl on ekiga (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ekiga



From pkgdb at fedoraproject.org  Sat Sep  6 14:53:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 14:53:40 +0000
Subject: [pkgdb] ekiga: pbrobinson has requested commit
Message-ID: <20080906145340.5B1C320876F@bastion.fedora.phx.redhat.com>

pbrobinson has requested the commit acl on ekiga (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ekiga



From pkgdb at fedoraproject.org  Sat Sep  6 14:53:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 14:53:39 +0000
Subject: [pkgdb] ekiga: pbrobinson has requested watchcommits
Message-ID: <20080906145340.C8D8D208D07@bastion.fedora.phx.redhat.com>

pbrobinson has requested the watchcommits acl on ekiga (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ekiga



From pkgdb at fedoraproject.org  Sat Sep  6 14:53:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 14:53:41 +0000
Subject: [pkgdb] ekiga: pbrobinson has requested approveacls
Message-ID: <20080906145341.36F54208D7C@bastion.fedora.phx.redhat.com>

pbrobinson has requested the approveacls acl on ekiga (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ekiga



From pbrobinson at fedoraproject.org  Sat Sep  6 14:55:44 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  6 Sep 2008 14:55:44 +0000 (UTC)
Subject: rpms/gupnp-av/F-8 gupnp-av.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080906145544.EB8E070125@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-av/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26761/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	gupnp-av.spec import.log 
Log Message:
- Initial cvs F-8 commit



--- NEW FILE gupnp-av.spec ---
Name:           gupnp-av
Version:        0.2.1
Release:        3%{?dist}
Summary:        GUPnP-AV is a collection of helpers for building UPnP AV applications

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.gupnp.org/
Source0:        http://www.gupnp.org/sources/gupnp-av/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: glib2-devel
BuildRequires: libxml2-devel
BuildRequires: libsoup-devel
BuildRequires: gssdp-devel
BuildRequires: gupnp-devel

%description
GUPnP is an object-oriented open source framework for creating UPnP
devices and control points, written in C using GObject and libsoup.
The GUPnP API is intended to be easy to use, efficient and flexible.

GUPnP-AV is a collection of helpers for building AV (audio/video) 
applications using GUPnP.

%package devel
Summary: Development package for gupnp-av
Group: Development/Libraries
Requires: gupnp-av = %{version}-%{release}
Requires: pkgconfig
Requires: gtk-doc

%description devel
Files for development with gupnp-av.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/libgupnp-av-1.0.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/libgupnp-av-1.0.so.1
%{_libdir}/libgupnp-av-1.0.so.1.0.0

%files devel
%defattr(-,root,root,-)
%{_datadir}/gtk-doc/html/gupnp-av/
%{_includedir}/gupnp-av-1.0/libgupnp-av
%{_libdir}/pkgconfig/gupnp-av-1.0.pc
%{_libdir}/libgupnp-av-1.0.so

%changelog
* Fri Aug 29 2008 Peter Robinson <pbrobinson at gmail.com> 0.2.1-3
- Some spec file cleanups

* Tue Jun 17 2008 Peter Robinson <pbrobinson at gmail.com> 0.2.1-2
- Fix build on rawhide

* Tue Jun 17 2008 Peter Robinson <pbrobinson at gmail.com> 0.2.1-1
- Initial release


--- NEW FILE import.log ---
gupnp-av-0_2_1-3_fc9:F-8:gupnp-av-0.2.1-3.fc9.src.rpm:1220712357


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 17:03:10 -0000	1.1
+++ .cvsignore	6 Sep 2008 14:55:14 -0000	1.2
@@ -0,0 +1 @@
+gupnp-av-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 17:03:10 -0000	1.1
+++ sources	6 Sep 2008 14:55:14 -0000	1.2
@@ -0,0 +1 @@
+af9898820fe57b93387d17f32121367d  gupnp-av-0.2.1.tar.gz



From ertzing at fedoraproject.org  Sat Sep  6 15:18:50 2008
From: ertzing at fedoraproject.org (Ralf Ertzinger)
Date: Sat,  6 Sep 2008 15:18:50 +0000 (UTC)
Subject: rpms/audacious/devel audacious.spec,1.39,1.40
Message-ID: <20080906151850.0B19A70125@cvs1.fedora.phx.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28799

Modified Files:
	audacious.spec 
Log Message:
* Sat Sep 06 2008 Ralf Ertzinger <ralf at skytale.met> 1.5.1-3
- Remove libSAD headers from devel package, they were not meant
  to be public



Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- audacious.spec	27 Jun 2008 19:55:45 -0000	1.39
+++ audacious.spec	6 Sep 2008 15:18:19 -0000	1.40
@@ -2,7 +2,7 @@
 
 Name:           audacious
 Version:        1.5.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A GTK2 based media player similar to xmms
 
 Group:          Applications/Multimedia
@@ -150,6 +150,7 @@
 mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/audacious.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+rm -rf $RPM_BUILD_ROOT%{_includedir}/libSAD
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -195,10 +196,13 @@
 %{_includedir}/audacious
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
-%{_includedir}/libSAD
 
 
 %changelog
+* Sat Sep 06 2008 Ralf Ertzinger <ralf at skytale.met> 1.5.1-3
+- Remove libSAD headers from devel package, they were not meant
+  to be public
+
 * Fri Jun 27 2008 Ralf Ertzinger <ralf at skytale.net> 1.5.1-2
 - Add Requires: dbus-glib-devel to audacious-devel
 



From laxathom at fedoraproject.org  Sat Sep  6 15:37:24 2008
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Sat,  6 Sep 2008 15:37:24 +0000 (UTC)
Subject: rpms/ntfs-config/devel ntfs-config.spec,1.10,1.11
Message-ID: <20080906153724.0BB3170125@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/ntfs-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30089

Modified Files:
	ntfs-config.spec 
Log Message:
rebuild for FTBFS


Index: ntfs-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntfs-config/devel/ntfs-config.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ntfs-config.spec	11 Aug 2008 20:30:34 -0000	1.10
+++ ntfs-config.spec	6 Sep 2008 15:36:53 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:		ntfs-config
 Version:	1.0.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A front-end to Enable/disable NTFS write support
 
 Group:		Applications/System          
@@ -53,6 +53,10 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -Dm 644"
 
+pushd data/pam
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
+
 desktop-file-install					\
 	--vendor ""					\
 	--dir $RPM_BUILD_ROOT/%{_datadir}/applications	\
@@ -81,7 +85,7 @@
 #Remove unneeded file.
 rm -f $RPM_BUILD_ROOT%{_bindir}/consolehelper
 
-#Fix missing consolehelper link
+#Fix consolehelper link
 ln -sf consolehelper $RPM_BUILD_ROOT%{_bindir}/%{name}-root
 
 %find_lang %{name}
@@ -107,6 +111,9 @@
 
 
 %changelog
+* Sat Sep 06 2008 Xavier Lamien <lxtnow at gmail.com> - 1.0.1-2
+- Rebuild for rawhide bug #449585.
+
 * Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-1
 - fix license tag
 - update to 1.0.1



From mpg at fedoraproject.org  Sat Sep  6 15:47:32 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Sat,  6 Sep 2008 15:47:32 +0000 (UTC)
Subject: rpms/hulahop/OLPC-3 .cvsignore, 1.5, 1.6 hulahop.spec, 1.11,
	1.12 sources, 1.6, 1.7
Message-ID: <20080906154732.0DE4370125@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/hulahop/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30710

Modified Files:
	.cvsignore hulahop.spec sources 
Log Message:
* Sat Sep  6 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.4.5-1
- Update to 0.4.5
- Setup vendor




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/OLPC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Aug 2008 12:12:52 -0000	1.5
+++ .cvsignore	6 Sep 2008 15:47:01 -0000	1.6
@@ -1 +1 @@
-hulahop-0.4.4.tar.bz2
+hulahop-0.4.5.tar.bz2


Index: hulahop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/OLPC-3/hulahop.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- hulahop.spec	28 Aug 2008 12:12:52 -0000	1.11
+++ hulahop.spec	6 Sep 2008 15:47:01 -0000	1.12
@@ -1,7 +1,7 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 
 Name: hulahop
-Version: 0.4.4
+Version: 0.4.5
 Release: 1%{?dist}
 Summary: A pygtk widget for embedding mozilla
 
@@ -30,6 +30,11 @@
 %prep
 %setup -q
 
+cat >> data/prefs.js << EOF
+pref("general.useragent.vendor", "Fedora");
+pref("general.useragent.vendorSub", "%{version}-%{release}");
+EOF
+
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -50,6 +55,10 @@
 %{python_sitelib}/*
 
 %changelog
+* Sat Sep  6 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.4.5-1
+- Update to 0.4.5
+- Setup vendor
+
 * Thu Aug 28 2008 Simon Schampijer <simon at laptop.org> - 0.4.4-1
 - Update the profile dependent on version changes 5428
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/OLPC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Aug 2008 12:12:52 -0000	1.6
+++ sources	6 Sep 2008 15:47:01 -0000	1.7
@@ -1 +1 @@
-0ea28aa02d747f3a82b08b8e6cdd650f  hulahop-0.4.4.tar.bz2
+f1d023e6482392052104321aaa873bfc  hulahop-0.4.5.tar.bz2



From mtasaka at fedoraproject.org  Sat Sep  6 16:06:29 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat,  6 Sep 2008 16:06:29 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.287, 1.288 jd.spec, 1.325, 1.326 sources, 
	1.288, 1.289
Message-ID: <20080906160629.B12BF70125@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32221/F-9

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Sep  7 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2316
- revert default browser setting



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- .cvsignore	1 Sep 2008 15:12:05 -0000	1.287
+++ .cvsignore	6 Sep 2008 16:05:59 -0000	1.288
@@ -1 +1 @@
-jd-2.0.1-beta080901.tgz
+jd-2.0.1-svn2316_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- jd.spec	1 Sep 2008 15:41:13 -0000	1.325
+++ jd.spec	6 Sep 2008 16:05:59 -0000	1.326
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.1
-%define         strtag        beta080901
+%define         strtag        svn2316_trunk
 %define         repoid        32731
 # Define this if this is pre-version
 %define         pre_release   1
@@ -52,7 +52,6 @@
 URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
-Patch0:		jd-svn2312-set-Fedora-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -75,7 +74,6 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-%patch0 -p0 -b .default
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %if 0%{?fedora} >= 10
@@ -136,6 +134,10 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Sep  7 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2316
+- revert default browser setting
+
 * Tue Sep  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.beta080901
 - 2.0.1 beta 080901
 - Change default config in Fedora


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- sources	1 Sep 2008 15:12:05 -0000	1.288
+++ sources	6 Sep 2008 16:05:59 -0000	1.289
@@ -1 +1 @@
-62f4aa7c0cf038d867d2948152d72ffb  jd-2.0.1-beta080901.tgz
+6f1daa0ee2b773d6dc70fcf77aa16936  jd-2.0.1-svn2316_trunk.tgz



From mtasaka at fedoraproject.org  Sat Sep  6 16:06:29 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat,  6 Sep 2008 16:06:29 +0000 (UTC)
Subject: rpms/jd/F-8 .cvsignore, 1.280, 1.281 jd.spec, 1.314, 1.315 sources, 
	1.281, 1.282
Message-ID: <20080906160629.91CFB70125@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32221/F-8

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Sep  7 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2316
- revert default browser setting



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- .cvsignore	1 Sep 2008 15:12:05 -0000	1.280
+++ .cvsignore	6 Sep 2008 16:05:59 -0000	1.281
@@ -1 +1 @@
-jd-2.0.1-beta080901.tgz
+jd-2.0.1-svn2316_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- jd.spec	1 Sep 2008 15:41:13 -0000	1.314
+++ jd.spec	6 Sep 2008 16:05:59 -0000	1.315
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.1
-%define         strtag        beta080901
+%define         strtag        svn2316_trunk
 %define         repoid        32731
 # Define this if this is pre-version
 %define         pre_release   1
@@ -52,7 +52,6 @@
 URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
-Patch0:		jd-svn2312-set-Fedora-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -75,7 +74,6 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-%patch0 -p0 -b .default
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %if 0%{?fedora} >= 10
@@ -136,6 +134,10 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Sep  7 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2316
+- revert default browser setting
+
 * Tue Sep  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.beta080901
 - 2.0.1 beta 080901
 - Change default config in Fedora


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/sources,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -r1.281 -r1.282
--- sources	1 Sep 2008 15:12:05 -0000	1.281
+++ sources	6 Sep 2008 16:05:59 -0000	1.282
@@ -1 +1 @@
-62f4aa7c0cf038d867d2948152d72ffb  jd-2.0.1-beta080901.tgz
+6f1daa0ee2b773d6dc70fcf77aa16936  jd-2.0.1-svn2316_trunk.tgz



From mpg at fedoraproject.org  Sat Sep  6 16:06:35 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Sat,  6 Sep 2008 16:06:35 +0000 (UTC)
Subject: rpms/sugar/OLPC-3 .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 sugar.spec, 1.18, 1.19
Message-ID: <20080906160635.1FCDF70125@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32243

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Sat Sep  6 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.3-1
- #8300 Shell _launchers are leaked
- #7856 notify::active behaviour change
- #8250 Invalid POT for "Copyright and License" of control panel




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	6 Aug 2008 18:28:01 -0000	1.15
+++ .cvsignore	6 Sep 2008 16:06:04 -0000	1.16
@@ -1 +1 @@
-sugar-0.81.8-git0e744d9629.tar.bz2
+sugar-0.82.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Aug 2008 18:28:01 -0000	1.15
+++ sources	6 Sep 2008 16:06:04 -0000	1.16
@@ -1 +1 @@
-1944497eb8028f1100c1d38258c4df74  sugar-0.81.8-git0e744d9629.tar.bz2
+ac790847c2701ebe8858111ac171fe64  sugar-0.82.3.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sugar.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sugar.spec	6 Aug 2008 18:28:01 -0000	1.18
+++ sugar.spec	6 Sep 2008 16:06:04 -0000	1.19
@@ -1,17 +1,17 @@
-%define commitid 0e744d9629
-%define alphatag 20080806git%{commitid}
+%define commitid 454def195d
+%define alphatag 20080822git%{commitid}
 
 Summary: OLPC desktop environment
 Name: sugar
-Version: 0.81.8
-#Release: 1%{?dist}
-Release: 3.%{alphatag}%{?dist}
+Version: 0.82.3
+Release: 1%{?dist}
+#Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/sugar
 # cd sugar
 # git-checkout %{commitid}
-Source0: %{name}-%{version}-git%{commitid}.tar.bz2
-#Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2
+#Source0: %{name}-%{version}-git%{commitid}.tar.bz2
+Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2
 License: GPL/LGPL
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,6 +28,8 @@
 Requires: gnome-python2-libwnck
 Requires: matchbox-window-manager
 Requires: numpy
+Requires: python-telepathy
+Requires: gstreamer-python
 
 %description
 
@@ -92,12 +94,53 @@
 %{_bindir}/sugar-emulator
 
 %changelog
-* Wed Aug 06 2008 Simon Schampijer <simon at laptop.org> - 0.81.8-3.20080806git0e744d9629
+* Sat Sep  6 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.3-1
+- #8300 Shell _launchers are leaked
+- #7856 notify::active behaviour change
+- #8250 Invalid POT for "Copyright and License" of control panel
+
+* Wed Sep  3 2008 Jeremy Katz <katzj at redhat.com> - 0.82.2-2
+- Require gstreamer-python and telepathy-python (rhbz#447589)
+
+* Fri Aug 29 2008 Simon Schampijer <simon at laptop.org> - 0.82.2-1
+- 6929 Control panel: include copyright/licensing info in about dialogue 
+- Fix some launcher issues
+
+* Thu Aug 28 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.82.1-1
+- #2866 Network Manager GUI doesn't report success or failure
+- #3993 The color of network icon in Home view becomes white after restarting Sugar.
+- #2866 Network Manager GUI doesn't report success or failure
+- #7988 Sugar control panel doesn't have a language entry for kreyol
+- #7823 Non-modal alerts in CP remain when they shouldn't
+- #7733 Cannot install Wikipedia-10.xo
+- #7356 regression in activity view performance.
+- #7660 XO Neighborhood icon drawing & erase glitches
+- #6605 Screen rotates clockwise, while rotation button shows counter clockwise arrows
+- #7877 Control Panel / Data & Time: Selecting timezone by typing locks up UI
+- #7965 Mirror activities list in RTL locales
+- #7220 Mark newly downloaded activities as favorites by default
+- #7874 Search entry in Home focuses list view when cleared
+- #7971 CP fails to validate all settings correctly
+- #7970 Some CP modules set needs_restart to False when they shouldn't
+- #7764 Reset Registration with school servers - short term solution
+- #7823 Non-modal alerts in CP remain when they shouldn't
+- #7874 Search entry in Home focuses list view when cleared
+- #7730 Clicking on Speaker icon should Mute/Unmute Sound
+- #4656 Non-olpc buddies not shown in the meshview (using salut)
+- #7873 Search entry in Home should be focused implicitly
+
+* Fri Aug 22 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.0-2.20080822git454def195d
+- Fix #6605 #7877 #7965 #7220 #7874 #7971 #7970 #7764 #7823 #7841
+
+* Thu Aug 07 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.0-1
+- Mirror the intro screen in rtl. Patch by Khaled Kosny Fix #3108
+- #7740 react gracefully to dbus services being restarted
 - Fix case when already registered 7836
-
-* Wed Aug 06 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.81.8-2.20080806git0fc57309f3
-- 7495 open cp software-updater on first boot after an update
-- 7357 use ohm for dcon freeze and brightness
+- Redirect keyboard brightness and DCON freeze requests to OHM #7357
+- open cp software-updater on first boot after an update 7495
+- Activate threads support 7486
+- added languages Norwegian and Slovenian
+- translation updates
 
 * Fri Aug 01 2008 Simon Schampijer <simon at laptop.org> - 0.81.8-1
 - 7248 Speaker device has inconsistent behavior



From mtasaka at fedoraproject.org  Sat Sep  6 16:06:29 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat,  6 Sep 2008 16:06:29 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.287, 1.288 jd.spec, 1.333, 1.334 sources,
	1.288, 1.289
Message-ID: <20080906160629.F400370125@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32221/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Sep  7 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2316
- revert default browser setting



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- .cvsignore	1 Sep 2008 15:12:05 -0000	1.287
+++ .cvsignore	6 Sep 2008 16:05:59 -0000	1.288
@@ -1 +1 @@
-jd-2.0.1-beta080901.tgz
+jd-2.0.1-svn2316_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -r1.333 -r1.334
--- jd.spec	1 Sep 2008 15:41:14 -0000	1.333
+++ jd.spec	6 Sep 2008 16:05:59 -0000	1.334
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.1
-%define         strtag        beta080901
+%define         strtag        svn2316_trunk
 %define         repoid        32731
 # Define this if this is pre-version
 %define         pre_release   1
@@ -52,7 +52,6 @@
 URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
-Patch0:		jd-svn2312-set-Fedora-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -75,7 +74,6 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-%patch0 -p0 -b .default
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %if 0%{?fedora} >= 10
@@ -136,6 +134,10 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Sep  7 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2316
+- revert default browser setting
+
 * Tue Sep  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.beta080901
 - 2.0.1 beta 080901
 - Change default config in Fedora


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- sources	1 Sep 2008 15:12:05 -0000	1.288
+++ sources	6 Sep 2008 16:05:59 -0000	1.289
@@ -1 +1 @@
-62f4aa7c0cf038d867d2948152d72ffb  jd-2.0.1-beta080901.tgz
+6f1daa0ee2b773d6dc70fcf77aa16936  jd-2.0.1-svn2316_trunk.tgz



From mpg at fedoraproject.org  Sat Sep  6 16:10:55 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Sat,  6 Sep 2008 16:10:55 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 sugar.spec, 1.21, 1.22
Message-ID: <20080906161056.019F370125@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv507

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Sat Sep  6 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.3-1
- #8300 Shell _launchers are leaked
- #7856 notify::active behaviour change
- #8250 Invalid POT for "Copyright and License" of control panel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Aug 2008 00:36:25 -0000	1.15
+++ .cvsignore	6 Sep 2008 16:10:25 -0000	1.16
@@ -1 +1 @@
-sugar-0.82.2.tar.bz2
+sugar-0.82.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	30 Aug 2008 00:36:25 -0000	1.15
+++ sources	6 Sep 2008 16:10:25 -0000	1.16
@@ -1 +1 @@
-b84f1a988dbe1c0579b683005f6e05c6  sugar-0.82.2.tar.bz2
+ac790847c2701ebe8858111ac171fe64  sugar-0.82.3.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sugar.spec	4 Sep 2008 02:58:48 -0000	1.21
+++ sugar.spec	6 Sep 2008 16:10:25 -0000	1.22
@@ -3,8 +3,8 @@
 
 Summary: OLPC desktop environment
 Name: sugar
-Version: 0.82.2
-Release: 2%{?dist}
+Version: 0.82.3
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/sugar
@@ -94,6 +94,11 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Sat Sep  6 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.3-1
+- #8300 Shell _launchers are leaked
+- #7856 notify::active behaviour change
+- #8250 Invalid POT for "Copyright and License" of control panel
+
 * Wed Sep  3 2008 Jeremy Katz <katzj at redhat.com> - 0.82.2-2
 - Require gstreamer-python and telepathy-python (rhbz#447589)
 



From pvrabec at fedoraproject.org  Sat Sep  6 16:14:10 2008
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Sat,  6 Sep 2008 16:14:10 +0000 (UTC)
Subject: rpms/sectool/devel sectool-0.8.6-fixDEP.patch, NONE,
	1.1 sectool.spec, 1.15, 1.16
Message-ID: <20080906161410.6249A70125@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/sectool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv858

Modified Files:
	sectool.spec 
Added Files:
	sectool-0.8.6-fixDEP.patch 
Log Message:
fix selinux DEPS, quick workaround



sectool-0.8.6-fixDEP.patch:

--- NEW FILE sectool-0.8.6-fixDEP.patch ---
diff -up sectool-0.8.6/tests/09_selinux.dsc.fixDEP sectool-0.8.6/tests/09_selinux.dsc
--- sectool-0.8.6/tests/09_selinux.dsc.fixDEP	2008-09-06 18:09:50.000000000 +0200
+++ sectool-0.8.6/tests/09_selinux.dsc	2008-09-06 18:10:20.000000000 +0200
@@ -5,7 +5,8 @@ DESCRIPTION="Checks if you have SELinux 
 NEED_DATA_DIR=1
 LEVELS="2 3 4 5"
 GROUPS="selinux"
-DEPS="getenforce libselinux-python"
+DEPS="getenforce"
+REQUIRES="libselinux-python"
 AUTHOR="Lukas Kuklinek <lkukline at redhat.com>"
 
 [DEFAULT]


Index: sectool.spec
===================================================================
RCS file: /cvs/extras/rpms/sectool/devel/sectool.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sectool.spec	5 Sep 2008 15:31:54 -0000	1.15
+++ sectool.spec	6 Sep 2008 16:13:40 -0000	1.16
@@ -1,9 +1,10 @@
 Summary: A security audit system and intrusion detection system
 Name: sectool
 Version: 0.8.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart
 Source0: %{name}-%{version}.tar.bz2
+Patch0: sectool-0.8.6-fixDEP.patch
 License: GPLv2+
 Group: Applications/System
 Requires: gettext coreutils  libselinux
@@ -31,6 +32,7 @@
 
 %prep
 %setup -q
+%patch0  -p1 -b .fixDEP.patch
 
 %build
 make %{?_smp_mflags}
@@ -93,6 +95,9 @@
 
 
 %changelog
+* Sat Sep 06 2008 Peter Vrabec <pvrabec at redhat.com> - 0.8.6-2
+- fix selinux DEPS, quick workaround
+
 * Fri Sep 05 2008 Peter Vrabec <pvrabec at redhat.com> - 0.8.6-1
 - upgrade, see changelog
 



From ertzing at fedoraproject.org  Sat Sep  6 16:16:11 2008
From: ertzing at fedoraproject.org (Ralf Ertzinger)
Date: Sat,  6 Sep 2008 16:16:11 +0000 (UTC)
Subject: rpms/audacious-plugins/devel audacious-plugins-1.5.1-libmtp.patch, 
	NONE, 1.1 audacious-plugins.spec, 1.31, 1.32
Message-ID: <20080906161611.6683770125@cvs1.fedora.phx.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1159

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-libmtp.patch 
Log Message:
* Sat Sep 06 2008 Ralf Ertzinger <ralf at skytale.net> 1.5.1-2
- Incorporate libmtp patch by Linus Walleij (BZ#459293)


audacious-plugins-1.5.1-libmtp.patch:

--- NEW FILE audacious-plugins-1.5.1-libmtp.patch ---
diff -ur audacious-plugins-fedora-1.5.1-orig/src/mtp_up/mtp.c audacious-plugins-fedora-1.5.1/src/mtp_up/mtp.c
--- audacious-plugins-fedora-1.5.1-orig/src/mtp_up/mtp.c	2008-08-17 21:29:48.000000000 +0200
+++ audacious-plugins-fedora-1.5.1/src/mtp_up/mtp.c	2008-08-17 22:35:10.000000000 +0200
@@ -192,12 +192,12 @@
 
     g_free(from_path);
     g_free(tmp);
-    parent_id = mtp_device->default_music_folder;
+    gentrack->parent_id = mtp_device->default_music_folder;
 
 #if DEBUG
     g_print("Uploading track '%s'\n",filename);
 #endif
-    ret = LIBMTP_Send_Track_From_File(mtp_device, filename , gentrack, NULL , NULL, parent_id);
+    ret = LIBMTP_Send_Track_From_File(mtp_device, filename , gentrack, NULL , NULL);
     LIBMTP_destroy_track_t(gentrack);
     if (ret == 0) 
         g_print("Track upload finished!\n");


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- audacious-plugins.spec	8 Jun 2008 15:37:59 -0000	1.31
+++ audacious-plugins.spec	6 Sep 2008 16:15:41 -0000	1.32
@@ -2,7 +2,7 @@
 
 Name:           audacious-plugins
 Version:        1.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Plugins for the Audacious media player
 
 Group:          Applications/Multimedia
@@ -17,6 +17,7 @@
 Patch0:         audacious-plugins-1.2.2-cddb-buffer.patch
 Patch1:         audacious-plugins-1.4.1-neon-locking.patch
 Patch2:         audacious-plugins-1.4.4-gcc43.patch
+Patch3:         audacious-plugins-1.5.1-libmtp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  audacious-devel >= %{aud_ver}, esound-devel >= 0.2, libvorbis-devel >= 1.0
@@ -149,6 +150,9 @@
 # Fix regressions due to stricter GCC 4.3 checking
 # %patch2 -p1 -b .gcc43
 
+# Use libmtp 0.3
+%patch3 -p1 -b .libmtp
+
 perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in
 
 %build
@@ -245,6 +249,9 @@
 
 
 %changelog
+* Sat Sep 06 2008 Ralf Ertzinger <ralf at skytale.net> 1.5.1-2
+- Incorporate libmtp patch by Linus Walleij (BZ#459293)
+
 * Sun Jun 08 2008 Ralf Ertzinger <ralf at skytale.net> 1.5.1-1
 - Update to 1.5.1
 



From mpg at fedoraproject.org  Sat Sep  6 16:21:17 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Sat,  6 Sep 2008 16:21:17 +0000 (UTC)
Subject: rpms/hulahop/OLPC-3 hulahop.spec,1.12,1.13
Message-ID: <20080906162117.DEFB770125@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/hulahop/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1713

Modified Files:
	hulahop.spec 
Log Message:
* Sat Sep  6 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.4.5-1
- Switch vendor to OLPC




Index: hulahop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/OLPC-3/hulahop.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- hulahop.spec	6 Sep 2008 15:47:01 -0000	1.12
+++ hulahop.spec	6 Sep 2008 16:20:47 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name: hulahop
 Version: 0.4.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A pygtk widget for embedding mozilla
 
 Group: System Environment/Libraries
@@ -31,8 +31,9 @@
 %setup -q
 
 cat >> data/prefs.js << EOF
-pref("general.useragent.vendor", "Fedora");
+pref("general.useragent.vendor", "OLPC");
 pref("general.useragent.vendorSub", "%{version}-%{release}");
+pref("general.useragent.vendorComment", "XO");
 EOF
 
 %build
@@ -56,6 +57,9 @@
 
 %changelog
 * Sat Sep  6 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.4.5-1
+- Switch vendor to OLPC
+
+* Sat Sep  6 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.4.5-1
 - Update to 0.4.5
 - Setup vendor
 



From pkgdb at fedoraproject.org  Sat Sep  6 16:24:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 16:24:35 +0000
Subject: [pkgdb] ekiga had acl change status
Message-ID: <20080906162435.96DDD20876E@bastion.fedora.phx.redhat.com>

veillard has set the watchbugzilla acl on ekiga (Fedora devel) to Approved for pbrobinson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ekiga



From pkgdb at fedoraproject.org  Sat Sep  6 16:24:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 16:24:38 +0000
Subject: [pkgdb] ekiga had acl change status
Message-ID: <20080906162438.51ADD208771@bastion.fedora.phx.redhat.com>

veillard has set the watchcommits acl on ekiga (Fedora devel) to Approved for pbrobinson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ekiga



From pkgdb at fedoraproject.org  Sat Sep  6 16:24:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 16:24:44 +0000
Subject: [pkgdb] ekiga had acl change status
Message-ID: <20080906162444.1C244208D0F@bastion.fedora.phx.redhat.com>

veillard has set the commit acl on ekiga (Fedora devel) to Approved for pbrobinson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ekiga



From pkgdb at fedoraproject.org  Sat Sep  6 16:24:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 16:24:51 +0000
Subject: [pkgdb] ekiga had acl change status
Message-ID: <20080906162451.60FFC20876D@bastion.fedora.phx.redhat.com>

veillard has set the approveacls acl on ekiga (Fedora devel) to Approved for pbrobinson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ekiga



From pkgdb at fedoraproject.org  Sat Sep  6 16:25:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 16:25:33 +0000
Subject: [pkgdb] opal had acl change status
Message-ID: <20080906162533.355E220876D@bastion.fedora.phx.redhat.com>

veillard has set the watchbugzilla acl on opal (Fedora devel) to Approved for pbrobinson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opal



From pkgdb at fedoraproject.org  Sat Sep  6 16:25:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 16:25:37 +0000
Subject: [pkgdb] opal had acl change status
Message-ID: <20080906162537.B9C6B208770@bastion.fedora.phx.redhat.com>

veillard has set the watchcommits acl on opal (Fedora devel) to Approved for pbrobinson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opal



From pkgdb at fedoraproject.org  Sat Sep  6 16:25:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 16:25:40 +0000
Subject: [pkgdb] opal had acl change status
Message-ID: <20080906162540.3006C208D07@bastion.fedora.phx.redhat.com>

veillard has set the commit acl on opal (Fedora devel) to Approved for pbrobinson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opal



From pkgdb at fedoraproject.org  Sat Sep  6 16:25:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 16:25:42 +0000
Subject: [pkgdb] opal had acl change status
Message-ID: <20080906162542.650CE208D0F@bastion.fedora.phx.redhat.com>

veillard has set the approveacls acl on opal (Fedora devel) to Approved for pbrobinson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opal



From mnowak at fedoraproject.org  Sat Sep  6 16:38:37 2008
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Sat,  6 Sep 2008 16:38:37 +0000 (UTC)
Subject: rpms/python-id3/devel python-id3-setup-license.patch, NONE,
	1.1 python-id3.spec, 1.5, 1.6
Message-ID: <20080906163837.0D30770125@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/python-id3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3091

Modified Files:
	python-id3.spec 
Added Files:
	python-id3-setup-license.patch 
Log Message:
- bundled sample app id3-tagger.py as a %%doc
- explicitly set %%defattr(0644,root,root,0755) because of id3-tagger.py 
  being executable
- installed EGG info + patch to include it's GPLv2+ license in proper field
- BuildRequires: python-setuptools-devel
- package conforms to https://fedoraproject.org/wiki/Packaging/Python/Eggs
- README is now UTF-8



python-id3-setup-license.patch:

--- NEW FILE python-id3-setup-license.patch ---
--- setup.py	2008-09-06 18:23:05.334357941 +0200
+++ setup.py.new	2008-09-06 18:22:04.976358336 +0200
@@ -13,6 +13,7 @@ setup (# Distribution meta-data
        author = "Ben Gertzfield",
        author_email = "che at debian.org",
        url = "http://id3-py.sourceforge.net/",
+       license = "GPLv2+",
 
        # Description of the modules and packages in the distribution
        py_modules = ['ID3']


Index: python-id3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-id3/devel/python-id3.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-id3.spec	3 Sep 2008 16:58:01 -0000	1.5
+++ python-id3.spec	6 Sep 2008 16:38:06 -0000	1.6
@@ -2,17 +2,19 @@
 
 Name:           python-id3
 Version:        1.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        ID3 tag library for Python
 
 Group:          Development/Libraries
 License:        GPLv2+
-URL:            http://id3-py.sourceforge.net/
-Source0:        http://dl.sourceforge.net/id3-py/id3-py_%{version}.tar.gz
+URL:            http://id3-py.sourceforge.net
+Source:         http://dl.sourceforge.net/id3-py/id3-py_%{version}.tar.gz
+Patch:          python-id3-setup-license.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel
+BuildRequires:  python-setuptools-devel
 Provides:       id3-py = %{version}-%{release}
 Obsoletes:      id3-py < 1.2-8
 
@@ -24,23 +26,20 @@
 
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q -n id3-py-%{version}
+%patch0
 
 
 %build
-%{__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 --skip-build --root $RPM_BUILD_ROOT
+%{__install} -d -m 0755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+%{__install} -p -m 0644 id3-tagger.py $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/id3-tagger.py
+iconv -f ISO-8859-1 -t UTF8 README -o README
 
 
 %clean
@@ -48,12 +47,24 @@
 
 
 %files
-%defattr(-,root,root,-)
-%doc CHANGES COPYING README
-%{python_sitelib}/ID3.py*
+%defattr(0644,root,root,0755)
+%doc CHANGES COPYING README id3-tagger.py
+%{python_sitelib}/ID3.py
+%{python_sitelib}/ID3.pyc
+%{python_sitelib}/ID3.pyo
+%{python_sitelib}/*egg-info
 
 
 %changelog
+* Sat Sep 06 2008 Michal Nowak <mnowak at redhat.com> - 1.2-11
+- bundled sample app id3-tagger.py as a %%doc
+- explicitly set %%defattr(0644,root,root,0755) because of id3-tagger.py 
+  being executable
+- installed EGG info + patch to include it's GPLv2+ license in proper field
+- BuildRequires: python-setuptools-devel
+- package conforms to https://fedoraproject.org/wiki/Packaging/Python/Eggs
+- README is now UTF-8
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2-10
 - fix license tag
 



From mnowak at fedoraproject.org  Sat Sep  6 16:48:49 2008
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Sat,  6 Sep 2008 16:48:49 +0000 (UTC)
Subject: rpms/python-id3/devel import.log,NONE,1.1
Message-ID: <20080906164849.892B070125@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/python-id3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3981/devel

Added Files:
	import.log 
Log Message:
python-id3-1.2-11



--- NEW FILE import.log ---
python-id3-1_2-11_fc9:HEAD:python-id3-1.2-11.fc9.src.rpm:1220719709



From mnowak at fedoraproject.org  Sat Sep  6 16:51:57 2008
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Sat,  6 Sep 2008 16:51:57 +0000 (UTC)
Subject: rpms/python-id3/devel sources,1.2,1.3
Message-ID: <20080906165157.2D03370125@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/python-id3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4232

Modified Files:
	sources 
Log Message:
python-id3-setup-license.patch



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-id3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Aug 2006 20:16:39 -0000	1.2
+++ sources	6 Sep 2008 16:51:26 -0000	1.3
@@ -1 +1,2 @@
 de0bd6053dda674967dacb6492a90c69  id3-py_1.2.tar.gz
+ca997a5982da2141f3889f8ac62e47ec  python-id3-setup-license.patch



From mnowak at fedoraproject.org  Sat Sep  6 16:58:10 2008
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Sat,  6 Sep 2008 16:58:10 +0000 (UTC)
Subject: rpms/python-id3/devel import.log,1.1,1.2 sources,1.3,1.4
Message-ID: <20080906165810.AEDAE70125@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/python-id3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4890/devel

Modified Files:
	import.log sources 
Log Message:
- removed patch python-id3-setup-license.patch




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-id3/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Sep 2008 16:48:49 -0000	1.1
+++ import.log	6 Sep 2008 16:57:40 -0000	1.2
@@ -1 +1,2 @@
 python-id3-1_2-11_fc9:HEAD:python-id3-1.2-11.fc9.src.rpm:1220719709
+python-id3-1_2-11_fc9:HEAD:python-id3-1.2-11.fc9.src.rpm:1220720203


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-id3/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Sep 2008 16:51:26 -0000	1.3
+++ sources	6 Sep 2008 16:57:40 -0000	1.4
@@ -1,2 +1 @@
 de0bd6053dda674967dacb6492a90c69  id3-py_1.2.tar.gz
-ca997a5982da2141f3889f8ac62e47ec  python-id3-setup-license.patch



From mnowak at fedoraproject.org  Sat Sep  6 17:00:19 2008
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Sat,  6 Sep 2008 17:00:19 +0000 (UTC)
Subject: rpms/python-id3/devel import.log, 1.2, 1.3 python-id3.spec, 1.6,
	1.7 python-id3-setup-license.patch, 1.1, NONE
Message-ID: <20080906170019.3C8C170125@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/python-id3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5276/devel

Modified Files:
	import.log python-id3.spec 
Removed Files:
	python-id3-setup-license.patch 
Log Message:
- removed patch python-id3-setup-license.patch




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-id3/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	6 Sep 2008 16:57:40 -0000	1.2
+++ import.log	6 Sep 2008 16:59:48 -0000	1.3
@@ -1,2 +1,3 @@
 python-id3-1_2-11_fc9:HEAD:python-id3-1.2-11.fc9.src.rpm:1220719709
 python-id3-1_2-11_fc9:HEAD:python-id3-1.2-11.fc9.src.rpm:1220720203
+python-id3-1_2-12_fc9:HEAD:python-id3-1.2-12.fc9.src.rpm:1220720363


Index: python-id3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-id3/devel/python-id3.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-id3.spec	6 Sep 2008 16:38:06 -0000	1.6
+++ python-id3.spec	6 Sep 2008 16:59:48 -0000	1.7
@@ -2,14 +2,13 @@
 
 Name:           python-id3
 Version:        1.2
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        ID3 tag library for Python
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://id3-py.sourceforge.net
 Source:         http://dl.sourceforge.net/id3-py/id3-py_%{version}.tar.gz
-Patch:          python-id3-setup-license.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -27,7 +26,6 @@
 
 %prep
 %setup -q -n id3-py-%{version}
-%patch0
 
 
 %build
@@ -56,6 +54,9 @@
 
 
 %changelog
+* Sat Sep 06 2008 Michal Nowak <mnowak at redhat.com> - 1.2-12
+- removed patch python-id3-setup-license.patch
+
 * Sat Sep 06 2008 Michal Nowak <mnowak at redhat.com> - 1.2-11
 - bundled sample app id3-tagger.py as a %%doc
 - explicitly set %%defattr(0644,root,root,0755) because of id3-tagger.py 


--- python-id3-setup-license.patch DELETED ---



From allisson at fedoraproject.org  Sat Sep  6 17:27:57 2008
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Sat,  6 Sep 2008 17:27:57 +0000 (UTC)
Subject: rpms/amora/devel import.log, NONE, 1.1 .cvsignore, 1.2,
	1.3 amora.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20080906172757.AA8C870125@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/amora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7614/devel

Modified Files:
	.cvsignore amora.spec sources 
Added Files:
	import.log 
Log Message:

Update to 1.1



--- NEW FILE import.log ---
amora-1_1-1_fc9:HEAD:amora-1.1-1.fc9.src.rpm:1220722039


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amora/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jan 2008 21:12:07 -0000	1.2
+++ .cvsignore	6 Sep 2008 17:27:27 -0000	1.3
@@ -1 +1 @@
-amora-server-1.0svn.tar.gz
+amora-server-1.1.tar.gz


Index: amora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amora/devel/amora.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- amora.spec	18 Feb 2008 19:11:32 -0000	1.2
+++ amora.spec	6 Sep 2008 17:27:27 -0000	1.3
@@ -1,15 +1,15 @@
 Name:           amora
-Version:        1.0
-Release:        2%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        A mobile remote assistant
 
 Group:          Applications/Communications
 License:        GPLv2+
 URL:            http://code.google.com/p/amora
-Source0:        http://amora.googlecode.com/files/amora-server-%{version}svn.tar.gz
+Source0:        http://amora.googlecode.com/files/amora-server-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libX11 libXtst-devel bluez-libs-devel imlib2-devel
+BuildRequires:  libX11 libXtst-devel bluez-libs-devel imlib2-devel dbus-devel
 #Requires:       
 
 %description
@@ -26,7 +26,7 @@
 http://code.google.com/p/amora/
 
 %prep
-%setup -q -n amora-server-%{version}svn
+%setup -q -n amora-server-%{version}
 
 
 %build
@@ -46,13 +46,18 @@
 %defattr(-,root,root,-)
 %doc README COPYING
 %{_bindir}/amorad
-%{_mandir}/man1/amora.1.gz
+%{_mandir}/man7/amora.7.gz
+%{_mandir}/man8/amorad.8.gz
 
 %changelog
+
+* Sat Sep  6 2008 Allisson Azevedo <allisson at gmail.com> 1.1-1
+- Update to 1.1
+- Added dbus-devel in BuildRequires
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0-2
 - Autorebuild for GCC 4.3
 
-
 * Tue Jan 15 2008 Allisson Azevedo <allisson at gmail.com> 1.0-1
 - Update to 1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amora/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jan 2008 21:12:07 -0000	1.2
+++ sources	6 Sep 2008 17:27:27 -0000	1.3
@@ -1 +1 @@
-39738c99dba04f8f75069d0539a3141b  amora-server-1.0svn.tar.gz
+274d53f40feabb09563eb90ae1c1b38f  amora-server-1.1.tar.gz



From allisson at fedoraproject.org  Sat Sep  6 17:44:03 2008
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Sat,  6 Sep 2008 17:44:03 +0000 (UTC)
Subject: rpms/amora/F-8 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 amora.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080906174403.11F9C70125@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/amora/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9274/F-8

Modified Files:
	.cvsignore amora.spec sources 
Added Files:
	import.log 
Log Message:

Update to 1.1



--- NEW FILE import.log ---
amora-1_1-1_fc9:F-8:amora-1.1-1.fc9.src.rpm:1220723005


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amora/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jan 2008 21:03:37 -0000	1.2
+++ .cvsignore	6 Sep 2008 17:43:32 -0000	1.3
@@ -1 +1 @@
-amora-server-1.0svn.tar.gz
+amora-server-1.1.tar.gz


Index: amora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amora/F-8/amora.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amora.spec	17 Jan 2008 21:03:37 -0000	1.1
+++ amora.spec	6 Sep 2008 17:43:32 -0000	1.2
@@ -1,15 +1,15 @@
 Name:           amora
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        A mobile remote assistant
 
 Group:          Applications/Communications
 License:        GPLv2+
 URL:            http://code.google.com/p/amora
-Source0:        http://amora.googlecode.com/files/amora-server-%{version}svn.tar.gz
+Source0:        http://amora.googlecode.com/files/amora-server-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libX11 libXtst-devel bluez-libs-devel imlib2-devel
+BuildRequires:  libX11 libXtst-devel bluez-libs-devel imlib2-devel dbus-devel
 #Requires:       
 
 %description
@@ -26,7 +26,7 @@
 http://code.google.com/p/amora/
 
 %prep
-%setup -q -n amora-server-%{version}svn
+%setup -q -n amora-server-%{version}
 
 
 %build
@@ -46,10 +46,15 @@
 %defattr(-,root,root,-)
 %doc README COPYING
 %{_bindir}/amorad
-%{_mandir}/man1/amora.1.gz
+%{_mandir}/man7/amora.7.gz
+%{_mandir}/man8/amorad.8.gz
 
 %changelog
 
+* Sat Sep  6 2008 Allisson Azevedo <allisson at gmail.com> 1.1-1
+- Update to 1.1
+- Added dbus-devel in BuildRequires
+
 * Tue Jan 15 2008 Allisson Azevedo <allisson at gmail.com> 1.0-1
 - Update to 1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amora/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jan 2008 21:03:37 -0000	1.2
+++ sources	6 Sep 2008 17:43:32 -0000	1.3
@@ -1 +1 @@
-39738c99dba04f8f75069d0539a3141b  amora-server-1.0svn.tar.gz
+274d53f40feabb09563eb90ae1c1b38f  amora-server-1.1.tar.gz



From allisson at fedoraproject.org  Sat Sep  6 17:52:08 2008
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Sat,  6 Sep 2008 17:52:08 +0000 (UTC)
Subject: rpms/amora/F-9 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 amora.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20080906175208.4F24A70125@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/amora/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9982/F-9

Modified Files:
	.cvsignore amora.spec sources 
Added Files:
	import.log 
Log Message:

Update to 1.1



--- NEW FILE import.log ---
amora-1_1-1_fc9:F-9:amora-1.1-1.fc9.src.rpm:1220723479


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amora/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jan 2008 21:12:07 -0000	1.2
+++ .cvsignore	6 Sep 2008 17:51:38 -0000	1.3
@@ -1 +1 @@
-amora-server-1.0svn.tar.gz
+amora-server-1.1.tar.gz


Index: amora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amora/F-9/amora.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- amora.spec	18 Feb 2008 19:11:32 -0000	1.2
+++ amora.spec	6 Sep 2008 17:51:38 -0000	1.3
@@ -1,15 +1,15 @@
 Name:           amora
-Version:        1.0
-Release:        2%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        A mobile remote assistant
 
 Group:          Applications/Communications
 License:        GPLv2+
 URL:            http://code.google.com/p/amora
-Source0:        http://amora.googlecode.com/files/amora-server-%{version}svn.tar.gz
+Source0:        http://amora.googlecode.com/files/amora-server-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libX11 libXtst-devel bluez-libs-devel imlib2-devel
+BuildRequires:  libX11 libXtst-devel bluez-libs-devel imlib2-devel dbus-devel
 #Requires:       
 
 %description
@@ -26,7 +26,7 @@
 http://code.google.com/p/amora/
 
 %prep
-%setup -q -n amora-server-%{version}svn
+%setup -q -n amora-server-%{version}
 
 
 %build
@@ -46,13 +46,18 @@
 %defattr(-,root,root,-)
 %doc README COPYING
 %{_bindir}/amorad
-%{_mandir}/man1/amora.1.gz
+%{_mandir}/man7/amora.7.gz
+%{_mandir}/man8/amorad.8.gz
 
 %changelog
+
+* Sat Sep  6 2008 Allisson Azevedo <allisson at gmail.com> 1.1-1
+- Update to 1.1
+- Added dbus-devel in BuildRequires
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0-2
 - Autorebuild for GCC 4.3
 
-
 * Tue Jan 15 2008 Allisson Azevedo <allisson at gmail.com> 1.0-1
 - Update to 1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amora/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jan 2008 21:12:07 -0000	1.2
+++ sources	6 Sep 2008 17:51:38 -0000	1.3
@@ -1 +1 @@
-39738c99dba04f8f75069d0539a3141b  amora-server-1.0svn.tar.gz
+274d53f40feabb09563eb90ae1c1b38f  amora-server-1.1.tar.gz



From spot at fedoraproject.org  Sat Sep  6 18:14:53 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 18:14:53 +0000 (UTC)
Subject: rpms/stardict-dic-zh_CN/F-8 sources, 1.2,
	1.3 stardict-dic-zh_CN.spec, 1.1, 1.2
Message-ID: <20080906181453.DE41D70125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/stardict-dic-zh_CN/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11599/F-8

Modified Files:
	sources stardict-dic-zh_CN.spec 
Log Message:
fix licensing issues on all branches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-zh_CN/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jul 2007 08:49:49 -0000	1.2
+++ sources	6 Sep 2008 18:14:23 -0000	1.3
@@ -1,8 +1,3 @@
-68e539f362de416490b78fed97aba780  stardict-cdict-gb-2.4.2.tar.bz2
-d8db9bdbf0dd4856d03e04d3f73d9c5a  stardict-cedict-gb-2.4.2.tar.bz2
-8e9700798a0ffeed23207b7cf2592246  stardict-langdao-ce-gb-2.4.2.tar.bz2
-41a71f5b3952709746dd7e52cf155b8b  stardict-langdao-ec-gb-2.4.2.tar.bz2
-c175f9bcb88e7513380ad05b291a8a03  stardict-oxford-gb-2.4.2.tar.bz2
 4467d7941f9388f0e01ee3025c400b5c  stardict-stardict1.3-2.4.2.tar.bz2
 745727367e22ab9740256ceaf16cb83d  stardict-xdict-ce-gb-2.4.2.tar.bz2
 364bcecc126d6d8560728dc487ea9eaf  stardict-xdict-ec-gb-2.4.2.tar.bz2


Index: stardict-dic-zh_CN.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-zh_CN/F-8/stardict-dic-zh_CN.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stardict-dic-zh_CN.spec	4 Jul 2007 08:49:49 -0000	1.1
+++ stardict-dic-zh_CN.spec	6 Sep 2008 18:14:23 -0000	1.2
@@ -1,17 +1,28 @@
 Name: stardict-dic-zh_CN
 Summary: Simplified Chinese(zh_CN) dictionaries for StarDict
 Version: 2.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/System
-License: GPL
+License: GPL+
 URL: http://stardict.sourceforge.net
 
-Source0: http://downloads.sourceforge.net/stardict/stardict-cdict-gb-2.4.2.tar.bz2
-Source1: http://downloads.sourceforge.net/stardict/stardict-cedict-gb-2.4.2.tar.bz2
-Source2: http://downloads.sourceforge.net/stardict/stardict-langdao-ce-gb-2.4.2.tar.bz2
-Source3: http://downloads.sourceforge.net/stardict/stardict-langdao-ec-gb-2.4.2.tar.bz2
-Source4: http://downloads.sourceforge.net/stardict/stardict-oxford-gb-2.4.2.tar.bz2
+# Hi. Are you adding a dictionary here? Please be sure we have a clear license for it.
+# The stardict page is _NOT_ a trusted source for licensing.
+# Not sure? Don't include it, or email fedora-legal at redhat.com first.
+
+# Cannot find licensing.
+# Source0: http://downloads.sourceforge.net/stardict/stardict-cdict-gb-2.4.2.tar.bz2
+# CEDICT license is non-free
+# Source1: http://downloads.sourceforge.net/stardict/stardict-cedict-gb-2.4.2.tar.bz2
+# Cannot find licensing
+# Source2: http://downloads.sourceforge.net/stardict/stardict-langdao-ce-gb-2.4.2.tar.bz2
+# Source3: http://downloads.sourceforge.net/stardict/stardict-langdao-ec-gb-2.4.2.tar.bz2
+# Almost certainly not used with permission.
+# Source4: http://downloads.sourceforge.net/stardict/stardict-oxford-gb-2.4.2.tar.bz2
+# From upstream stardict, okay.
 Source5: http://downloads.sourceforge.net/stardict/stardict-stardict1.3-2.4.2.tar.bz2
+# From http://ftp.cdut.edu.cn/pub/linux/system/chinese/xdict/xdict.README
+# GPL+
 Source6: http://downloads.sourceforge.net/stardict/stardict-xdict-ce-gb-2.4.2.tar.bz2
 Source7: http://downloads.sourceforge.net/stardict/stardict-xdict-ec-gb-2.4.2.tar.bz2
 
@@ -23,17 +34,16 @@
 %description
 Simplified Chinese(zh_CN) dictionaries for StarDict.
 These dictionaries are included currently:
-cdict-gb, cedict-gb, langdao-ce-gb, langdao-ec-gb,
-oxford-gb, stardict1.3, xdict-ce-gb, xdict-ec-gb.
+stardict1.3, xdict-ce-gb, xdict-ec-gb.
 You can download more at: http://stardict.sourceforge.net
 
 %prep
 %setup -c -T -n %{name}-%{version}
-%setup -q -n %{name}-%{version} -D -T -a 0
-%setup -q -n %{name}-%{version} -D -T -a 1
-%setup -q -n %{name}-%{version} -D -T -a 2
-%setup -q -n %{name}-%{version} -D -T -a 3
-%setup -q -n %{name}-%{version} -D -T -a 4
+# %%setup -q -n %{name}-%{version} -D -T -a 0
+# %%setup -q -n %{name}-%{version} -D -T -a 1
+# %%setup -q -n %{name}-%{version} -D -T -a 2
+# %%setup -q -n %{name}-%{version} -D -T -a 3
+# %%setup -q -n %{name}-%{version} -D -T -a 4
 %setup -q -n %{name}-%{version} -D -T -a 5
 %setup -q -n %{name}-%{version} -D -T -a 6
 %setup -q -n %{name}-%{version} -D -T -a 7
@@ -53,6 +63,10 @@
 %{_datadir}/stardict/dic/*
 
 %changelog
+* Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-4
+- fix license tag
+- remove dictionaries for which the licensing is unclear (or outright forbidden)
+
 * Wed Jun 27 2007 Hu Zheng <zhu at redhat.com> - 2.4.2-3
 - Separate spec files for each language's dictionaries.
 



From spot at fedoraproject.org  Sat Sep  6 18:14:54 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 18:14:54 +0000 (UTC)
Subject: rpms/stardict-dic-zh_CN/F-9 sources, 1.2,
	1.3 stardict-dic-zh_CN.spec, 1.1, 1.2
Message-ID: <20080906181454.0C4E270125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/stardict-dic-zh_CN/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11599/F-9

Modified Files:
	sources stardict-dic-zh_CN.spec 
Log Message:
fix licensing issues on all branches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-zh_CN/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jul 2007 08:49:49 -0000	1.2
+++ sources	6 Sep 2008 18:14:23 -0000	1.3
@@ -1,8 +1,3 @@
-68e539f362de416490b78fed97aba780  stardict-cdict-gb-2.4.2.tar.bz2
-d8db9bdbf0dd4856d03e04d3f73d9c5a  stardict-cedict-gb-2.4.2.tar.bz2
-8e9700798a0ffeed23207b7cf2592246  stardict-langdao-ce-gb-2.4.2.tar.bz2
-41a71f5b3952709746dd7e52cf155b8b  stardict-langdao-ec-gb-2.4.2.tar.bz2
-c175f9bcb88e7513380ad05b291a8a03  stardict-oxford-gb-2.4.2.tar.bz2
 4467d7941f9388f0e01ee3025c400b5c  stardict-stardict1.3-2.4.2.tar.bz2
 745727367e22ab9740256ceaf16cb83d  stardict-xdict-ce-gb-2.4.2.tar.bz2
 364bcecc126d6d8560728dc487ea9eaf  stardict-xdict-ec-gb-2.4.2.tar.bz2


Index: stardict-dic-zh_CN.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-zh_CN/F-9/stardict-dic-zh_CN.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stardict-dic-zh_CN.spec	4 Jul 2007 08:49:49 -0000	1.1
+++ stardict-dic-zh_CN.spec	6 Sep 2008 18:14:23 -0000	1.2
@@ -1,17 +1,28 @@
 Name: stardict-dic-zh_CN
 Summary: Simplified Chinese(zh_CN) dictionaries for StarDict
 Version: 2.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/System
-License: GPL
+License: GPL+
 URL: http://stardict.sourceforge.net
 
-Source0: http://downloads.sourceforge.net/stardict/stardict-cdict-gb-2.4.2.tar.bz2
-Source1: http://downloads.sourceforge.net/stardict/stardict-cedict-gb-2.4.2.tar.bz2
-Source2: http://downloads.sourceforge.net/stardict/stardict-langdao-ce-gb-2.4.2.tar.bz2
-Source3: http://downloads.sourceforge.net/stardict/stardict-langdao-ec-gb-2.4.2.tar.bz2
-Source4: http://downloads.sourceforge.net/stardict/stardict-oxford-gb-2.4.2.tar.bz2
+# Hi. Are you adding a dictionary here? Please be sure we have a clear license for it.
+# The stardict page is _NOT_ a trusted source for licensing.
+# Not sure? Don't include it, or email fedora-legal at redhat.com first.
+
+# Cannot find licensing.
+# Source0: http://downloads.sourceforge.net/stardict/stardict-cdict-gb-2.4.2.tar.bz2
+# CEDICT license is non-free
+# Source1: http://downloads.sourceforge.net/stardict/stardict-cedict-gb-2.4.2.tar.bz2
+# Cannot find licensing
+# Source2: http://downloads.sourceforge.net/stardict/stardict-langdao-ce-gb-2.4.2.tar.bz2
+# Source3: http://downloads.sourceforge.net/stardict/stardict-langdao-ec-gb-2.4.2.tar.bz2
+# Almost certainly not used with permission.
+# Source4: http://downloads.sourceforge.net/stardict/stardict-oxford-gb-2.4.2.tar.bz2
+# From upstream stardict, okay.
 Source5: http://downloads.sourceforge.net/stardict/stardict-stardict1.3-2.4.2.tar.bz2
+# From http://ftp.cdut.edu.cn/pub/linux/system/chinese/xdict/xdict.README
+# GPL+
 Source6: http://downloads.sourceforge.net/stardict/stardict-xdict-ce-gb-2.4.2.tar.bz2
 Source7: http://downloads.sourceforge.net/stardict/stardict-xdict-ec-gb-2.4.2.tar.bz2
 
@@ -23,17 +34,16 @@
 %description
 Simplified Chinese(zh_CN) dictionaries for StarDict.
 These dictionaries are included currently:
-cdict-gb, cedict-gb, langdao-ce-gb, langdao-ec-gb,
-oxford-gb, stardict1.3, xdict-ce-gb, xdict-ec-gb.
+stardict1.3, xdict-ce-gb, xdict-ec-gb.
 You can download more at: http://stardict.sourceforge.net
 
 %prep
 %setup -c -T -n %{name}-%{version}
-%setup -q -n %{name}-%{version} -D -T -a 0
-%setup -q -n %{name}-%{version} -D -T -a 1
-%setup -q -n %{name}-%{version} -D -T -a 2
-%setup -q -n %{name}-%{version} -D -T -a 3
-%setup -q -n %{name}-%{version} -D -T -a 4
+# %%setup -q -n %{name}-%{version} -D -T -a 0
+# %%setup -q -n %{name}-%{version} -D -T -a 1
+# %%setup -q -n %{name}-%{version} -D -T -a 2
+# %%setup -q -n %{name}-%{version} -D -T -a 3
+# %%setup -q -n %{name}-%{version} -D -T -a 4
 %setup -q -n %{name}-%{version} -D -T -a 5
 %setup -q -n %{name}-%{version} -D -T -a 6
 %setup -q -n %{name}-%{version} -D -T -a 7
@@ -53,6 +63,10 @@
 %{_datadir}/stardict/dic/*
 
 %changelog
+* Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-4
+- fix license tag
+- remove dictionaries for which the licensing is unclear (or outright forbidden)
+
 * Wed Jun 27 2007 Hu Zheng <zhu at redhat.com> - 2.4.2-3
 - Separate spec files for each language's dictionaries.
 



From spot at fedoraproject.org  Sat Sep  6 18:14:54 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 18:14:54 +0000 (UTC)
Subject: rpms/stardict-dic-zh_CN/devel sources,1.2,1.3
Message-ID: <20080906181454.3AA9C70125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/stardict-dic-zh_CN/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11599/devel

Modified Files:
	sources 
Log Message:
fix licensing issues on all branches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-zh_CN/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jul 2007 08:49:49 -0000	1.2
+++ sources	6 Sep 2008 18:14:24 -0000	1.3
@@ -1,8 +1,3 @@
-68e539f362de416490b78fed97aba780  stardict-cdict-gb-2.4.2.tar.bz2
-d8db9bdbf0dd4856d03e04d3f73d9c5a  stardict-cedict-gb-2.4.2.tar.bz2
-8e9700798a0ffeed23207b7cf2592246  stardict-langdao-ce-gb-2.4.2.tar.bz2
-41a71f5b3952709746dd7e52cf155b8b  stardict-langdao-ec-gb-2.4.2.tar.bz2
-c175f9bcb88e7513380ad05b291a8a03  stardict-oxford-gb-2.4.2.tar.bz2
 4467d7941f9388f0e01ee3025c400b5c  stardict-stardict1.3-2.4.2.tar.bz2
 745727367e22ab9740256ceaf16cb83d  stardict-xdict-ce-gb-2.4.2.tar.bz2
 364bcecc126d6d8560728dc487ea9eaf  stardict-xdict-ec-gb-2.4.2.tar.bz2



From spot at fedoraproject.org  Sat Sep  6 18:16:33 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 18:16:33 +0000 (UTC)
Subject: rpms/stardict-dic-zh_TW/F-8 sources, 1.2,
	1.3 stardict-dic-zh_TW.spec, 1.1, 1.2
Message-ID: <20080906181633.D991870125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/stardict-dic-zh_TW/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11801/F-8

Modified Files:
	sources stardict-dic-zh_TW.spec 
Log Message:
fix on all branches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-zh_TW/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jul 2007 09:58:57 -0000	1.2
+++ sources	6 Sep 2008 18:16:03 -0000	1.3
@@ -1,5 +1,2 @@
-0349198b9dfcecd9a0f505512bb21d8b  stardict-cdict-big5-2.4.2.tar.bz2
-80b13d05bd5e975c35afcf4a13113673  stardict-cedict-big5-2.4.2.tar.bz2
-50b9423fa578988b5b0544c5b663058a  stardict-langdao-ce-big5-2.4.2.tar.bz2
-61ceeec1b056a171645af723d3e956fe  stardict-langdao-ec-big5-2.4.2.tar.bz2
-e54da1d0759ce59f8fbddff7979e9300  stardict-oxford-big5-2.4.2.tar.bz2
+5a1866fd879c9b02c45d5eab18d5c356  stardict-xdict-ce-big5-2.4.2.tar.bz2
+ab714bb56eb0901357704ef9ec796047  stardict-xdict-ec-big5-2.4.2.tar.bz2


Index: stardict-dic-zh_TW.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-zh_TW/F-8/stardict-dic-zh_TW.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stardict-dic-zh_TW.spec	4 Jul 2007 09:58:57 -0000	1.1
+++ stardict-dic-zh_TW.spec	6 Sep 2008 18:16:03 -0000	1.2
@@ -1,16 +1,28 @@
 Name: stardict-dic-zh_TW
 Summary: Traditional Chinese(zh_TW) dictionaries for StarDict
 Version: 2.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/System
-License: GPL
+License: GPL+
 URL: http://stardict.sourceforge.net
 
-Source0: http://downloads.sourceforge.net/stardict/stardict-cdict-big5-2.4.2.tar.bz2
-Source1: http://downloads.sourceforge.net/stardict/stardict-cedict-big5-2.4.2.tar.bz2
-Source2: http://downloads.sourceforge.net/stardict/stardict-langdao-ce-big5-2.4.2.tar.bz2
-Source3: http://downloads.sourceforge.net/stardict/stardict-langdao-ec-big5-2.4.2.tar.bz2
-Source4: http://downloads.sourceforge.net/stardict/stardict-oxford-big5-2.4.2.tar.bz2
+# Hi. Are you adding a dictionary here?	Please be sure we have a clear license for it.
+# The stardict page is _NOT_ a trusted source for licensing.
+# Not sure? Don't include it, or email fedora-legal at redhat.com first.
+
+# Cannot find licensing.
+# Source0: http://downloads.sourceforge.net/stardict/stardict-cdict-big5-2.4.2.tar.bz2
+# CEDICT license is non-free.
+# Source1: http://downloads.sourceforge.net/stardict/stardict-cedict-big5-2.4.2.tar.bz2
+# Cannot find licensing
+# Source2: http://downloads.sourceforge.net/stardict/stardict-langdao-ce-big5-2.4.2.tar.bz2
+# Source3: http://downloads.sourceforge.net/stardict/stardict-langdao-ec-big5-2.4.2.tar.bz2
+# Almost certainly not used with permission.
+# Source4: http://downloads.sourceforge.net/stardict/stardict-oxford-big5-2.4.2.tar.bz2
+# From http://ftp.cdut.edu.cn/pub/linux/system/chinese/xdict/xdict.README
+# GPL+
+Source5: http://prdownloads.sourceforge.net/stardict/stardict-xdict-ec-big5-2.4.2.tar.bz2
+Source6: http://prdownloads.sourceforge.net/stardict/stardict-xdict-ce-big5-2.4.2.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
@@ -20,17 +32,18 @@
 %description
 Traditional Chinese(zh_TW) dictionaries for StarDict.
 These dictionaries are included currently:
-cdict-big5, cedict-big5, langdao-ce-big5, langdao-ec-big5,
-oxford-big5.
+xdict-ce-big5, xdict-ec-big5.
 You can download more at: http://stardict.sourceforge.net
 
 %prep
 %setup -c -T -n %{name}-%{version}
-%setup -q -n %{name}-%{version} -D -T -a 0
-%setup -q -n %{name}-%{version} -D -T -a 1
-%setup -q -n %{name}-%{version} -D -T -a 2
-%setup -q -n %{name}-%{version} -D -T -a 3
-%setup -q -n %{name}-%{version} -D -T -a 4
+# %%setup -q -n %{name}-%{version} -D -T -a 0
+# %%setup -q -n %{name}-%{version} -D -T -a 1
+# %%setup -q -n %{name}-%{version} -D -T -a 2
+# %%setup -q -n %{name}-%{version} -D -T -a 3
+# %%setup -q -n %{name}-%{version} -D -T -a 4
+%setup -q -n %{name}-%{version} -D -T -a 5
+%setup -q -n %{name}-%{version} -D -T -a 6
 
 %build
 
@@ -47,6 +60,11 @@
 %{_datadir}/stardict/dic/*
 
 %changelog
+* Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-4
+- remove files for which licensing is unclear (or bad)
+- add xdict files (we know they are good)
+- fix license tag
+
 * Wed Jun 27 2007 Hu Zheng <zhu at redhat.com> - 2.4.2-3
 - Separate spec files for each language's dictionaries.
 



From spot at fedoraproject.org  Sat Sep  6 18:16:34 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 18:16:34 +0000 (UTC)
Subject: rpms/stardict-dic-zh_TW/F-9 sources, 1.2,
	1.3 stardict-dic-zh_TW.spec, 1.1, 1.2
Message-ID: <20080906181634.26FD970125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/stardict-dic-zh_TW/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11801/F-9

Modified Files:
	sources stardict-dic-zh_TW.spec 
Log Message:
fix on all branches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-zh_TW/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jul 2007 09:58:57 -0000	1.2
+++ sources	6 Sep 2008 18:16:03 -0000	1.3
@@ -1,5 +1,2 @@
-0349198b9dfcecd9a0f505512bb21d8b  stardict-cdict-big5-2.4.2.tar.bz2
-80b13d05bd5e975c35afcf4a13113673  stardict-cedict-big5-2.4.2.tar.bz2
-50b9423fa578988b5b0544c5b663058a  stardict-langdao-ce-big5-2.4.2.tar.bz2
-61ceeec1b056a171645af723d3e956fe  stardict-langdao-ec-big5-2.4.2.tar.bz2
-e54da1d0759ce59f8fbddff7979e9300  stardict-oxford-big5-2.4.2.tar.bz2
+5a1866fd879c9b02c45d5eab18d5c356  stardict-xdict-ce-big5-2.4.2.tar.bz2
+ab714bb56eb0901357704ef9ec796047  stardict-xdict-ec-big5-2.4.2.tar.bz2


Index: stardict-dic-zh_TW.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-zh_TW/F-9/stardict-dic-zh_TW.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stardict-dic-zh_TW.spec	4 Jul 2007 09:58:57 -0000	1.1
+++ stardict-dic-zh_TW.spec	6 Sep 2008 18:16:03 -0000	1.2
@@ -1,16 +1,28 @@
 Name: stardict-dic-zh_TW
 Summary: Traditional Chinese(zh_TW) dictionaries for StarDict
 Version: 2.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/System
-License: GPL
+License: GPL+
 URL: http://stardict.sourceforge.net
 
-Source0: http://downloads.sourceforge.net/stardict/stardict-cdict-big5-2.4.2.tar.bz2
-Source1: http://downloads.sourceforge.net/stardict/stardict-cedict-big5-2.4.2.tar.bz2
-Source2: http://downloads.sourceforge.net/stardict/stardict-langdao-ce-big5-2.4.2.tar.bz2
-Source3: http://downloads.sourceforge.net/stardict/stardict-langdao-ec-big5-2.4.2.tar.bz2
-Source4: http://downloads.sourceforge.net/stardict/stardict-oxford-big5-2.4.2.tar.bz2
+# Hi. Are you adding a dictionary here?	Please be sure we have a clear license for it.
+# The stardict page is _NOT_ a trusted source for licensing.
+# Not sure? Don't include it, or email fedora-legal at redhat.com first.
+
+# Cannot find licensing.
+# Source0: http://downloads.sourceforge.net/stardict/stardict-cdict-big5-2.4.2.tar.bz2
+# CEDICT license is non-free.
+# Source1: http://downloads.sourceforge.net/stardict/stardict-cedict-big5-2.4.2.tar.bz2
+# Cannot find licensing
+# Source2: http://downloads.sourceforge.net/stardict/stardict-langdao-ce-big5-2.4.2.tar.bz2
+# Source3: http://downloads.sourceforge.net/stardict/stardict-langdao-ec-big5-2.4.2.tar.bz2
+# Almost certainly not used with permission.
+# Source4: http://downloads.sourceforge.net/stardict/stardict-oxford-big5-2.4.2.tar.bz2
+# From http://ftp.cdut.edu.cn/pub/linux/system/chinese/xdict/xdict.README
+# GPL+
+Source5: http://prdownloads.sourceforge.net/stardict/stardict-xdict-ec-big5-2.4.2.tar.bz2
+Source6: http://prdownloads.sourceforge.net/stardict/stardict-xdict-ce-big5-2.4.2.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
@@ -20,17 +32,18 @@
 %description
 Traditional Chinese(zh_TW) dictionaries for StarDict.
 These dictionaries are included currently:
-cdict-big5, cedict-big5, langdao-ce-big5, langdao-ec-big5,
-oxford-big5.
+xdict-ce-big5, xdict-ec-big5.
 You can download more at: http://stardict.sourceforge.net
 
 %prep
 %setup -c -T -n %{name}-%{version}
-%setup -q -n %{name}-%{version} -D -T -a 0
-%setup -q -n %{name}-%{version} -D -T -a 1
-%setup -q -n %{name}-%{version} -D -T -a 2
-%setup -q -n %{name}-%{version} -D -T -a 3
-%setup -q -n %{name}-%{version} -D -T -a 4
+# %%setup -q -n %{name}-%{version} -D -T -a 0
+# %%setup -q -n %{name}-%{version} -D -T -a 1
+# %%setup -q -n %{name}-%{version} -D -T -a 2
+# %%setup -q -n %{name}-%{version} -D -T -a 3
+# %%setup -q -n %{name}-%{version} -D -T -a 4
+%setup -q -n %{name}-%{version} -D -T -a 5
+%setup -q -n %{name}-%{version} -D -T -a 6
 
 %build
 
@@ -47,6 +60,11 @@
 %{_datadir}/stardict/dic/*
 
 %changelog
+* Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-4
+- remove files for which licensing is unclear (or bad)
+- add xdict files (we know they are good)
+- fix license tag
+
 * Wed Jun 27 2007 Hu Zheng <zhu at redhat.com> - 2.4.2-3
 - Separate spec files for each language's dictionaries.
 



From spot at fedoraproject.org  Sat Sep  6 18:23:01 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 18:23:01 +0000 (UTC)
Subject: rpms/sugar/devel sugar.spec,1.22,1.23
Message-ID: <20080906182301.66EA970125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12491

Modified Files:
	sugar.spec 
Log Message:
fix license tag


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sugar.spec	6 Sep 2008 16:10:25 -0000	1.22
+++ sugar.spec	6 Sep 2008 18:22:31 -0000	1.23
@@ -4,7 +4,7 @@
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.82.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/sugar
@@ -12,7 +12,7 @@
 # git-checkout %{commitid}
 #Source0: %{name}-%{version}-git%{commitid}.tar.bz2
 Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2
-License: GPL/LGPL
+License: GPLv2+
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -94,6 +94,9 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.82.3-2
+- fix license tag
+
 * Sat Sep  6 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.3-1
 - #8300 Shell _launchers are leaked
 - #7856 notify::active behaviour change



From spot at fedoraproject.org  Sat Sep  6 18:27:36 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 18:27:36 +0000 (UTC)
Subject: rpms/stellarium/devel stellarium.spec,1.47,1.48
Message-ID: <20080906182736.2880870125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/stellarium/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13167

Modified Files:
	stellarium.spec 
Log Message:
fix license tag


Index: stellarium.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- stellarium.spec	11 Feb 2008 15:51:11 -0000	1.47
+++ stellarium.spec	6 Sep 2008 18:27:05 -0000	1.48
@@ -1,10 +1,10 @@
 Name:           stellarium
 Version:        0.9.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
-License:        GPLv2
+License:        GPLv2+
 URL:            http://stellarium.free.fr/
 Source0:        http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
@@ -36,7 +36,7 @@
 %package doc
 Summary:   	The user guide about Stellarium
 Group:		Documentation
-License:	GPL
+License:	GFDL
 %description doc
 The user guide for stellarium writeen by Matthew Gates. It shouuld 
 contains everythings you want to know about Stellarium.
@@ -89,6 +89,9 @@
 %doc COPYING stellarium_user_guide-0.9.0-1.pdf
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.1-7
+- fix license tag
+
 * Mon Feb 11 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.1-6
 - Fix gcc-4.3 related issues
 



From spot at fedoraproject.org  Sat Sep  6 18:44:07 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 18:44:07 +0000 (UTC)
Subject: rpms/sugar-artwork/devel sugar-artwork.spec,1.9,1.10
Message-ID: <20080906184407.8853470125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sugar-artwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15005

Modified Files:
	sugar-artwork.spec 
Log Message:
fix license tag


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sugar-artwork.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sugar-artwork.spec	30 Aug 2008 00:31:28 -0000	1.9
+++ sugar-artwork.spec	6 Sep 2008 18:43:37 -0000	1.10
@@ -4,7 +4,7 @@
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
 Version: 0.82.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/artwork
@@ -13,7 +13,7 @@
 #Source0: %{name}-%{version}-git%{commitid}.tar.bz2
 Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 
 Group: User Interface/Desktops
-License: GPL
+License: LGPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel >= 2.9.0
@@ -62,6 +62,9 @@
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.82.1-2
+- fix license tag
+
 * Thu Aug 28 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.1-1
 - #4312 need volume button icons for totem player
 - #7939 Missing stock icons



From rishi at fedoraproject.org  Sat Sep  6 18:45:04 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat,  6 Sep 2008 18:45:04 +0000 (UTC)
Subject: rpms/bouml/F-8 .cvsignore, 1.15, 1.16 bouml.spec, 1.18, 1.19 sources,
	1.17, 1.18
Message-ID: <20080906184504.6180770125@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/bouml/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15310

Modified Files:
	.cvsignore bouml.spec sources 
Log Message:
* Sat Sep 06 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.5-1
- Version bump to 4.5. Closes Red Hat Bugzilla bug #460528.
- Previous releases can not read a project saved with this version, but
  projects made by previous releases can be read.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-8/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	15 Jun 2008 10:18:28 -0000	1.15
+++ .cvsignore	6 Sep 2008 18:44:34 -0000	1.16
@@ -1 +1 @@
-bouml_4.3.5.tar.gz
+bouml_4.5.tar.gz


Index: bouml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-8/bouml.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bouml.spec	15 Jun 2008 10:18:28 -0000	1.18
+++ bouml.spec	6 Sep 2008 18:44:34 -0000	1.19
@@ -5,12 +5,12 @@
 
 Summary:	UML2 tool box to specify and generate code in C++, Java, IDL, PHP and Python
 Name:		bouml
-Version:	4.3.5
+Version:	4.5
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://bouml.free.fr/
-Source0:	http://bouml.free.fr/%{name}_%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/bouml/%{name}_%{version}.tar.gz
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -110,6 +110,11 @@
 %{_libdir}/%{name}/*
 
 %changelog
+* Sat Sep 06 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.5-1
+- Version bump to 4.5. Closes Red Hat Bugzilla bug #460528.
+- Previous releases can not read a project saved with this version, but
+  projects made by previous releases can be read.
+
 * Sun Jun 15 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.3.5-1
 - Version bump to 4.3.5. Closes Red Hat Bugzilla bug #448520.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-8/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	15 Jun 2008 10:18:28 -0000	1.17
+++ sources	6 Sep 2008 18:44:34 -0000	1.18
@@ -1 +1 @@
-b4ebb5af8d6bf46183695a65c698f001  bouml_4.3.5.tar.gz
+335263f8370790b3221bb697889a839d  bouml_4.5.tar.gz



From spot at fedoraproject.org  Sat Sep  6 18:45:31 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 18:45:31 +0000 (UTC)
Subject: rpms/sugar-datastore/devel sugar-datastore.spec,1.6,1.7
Message-ID: <20080906184531.99F4470125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sugar-datastore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15409

Modified Files:
	sugar-datastore.spec 
Log Message:
fix license tag


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sugar-datastore.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sugar-datastore.spec	8 Jul 2008 15:03:10 -0000	1.6
+++ sugar-datastore.spec	6 Sep 2008 18:44:59 -0000	1.7
@@ -2,11 +2,11 @@
 
 Name: sugar-datastore
 Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Sugar Datastore
 
 Group: Development/Libraries
-License: GPL
+License: GPLv2+
 URL: http://dev.laptop.org/
 Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,6 +49,9 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.8.3-2
+- fix license tag
+
 * Tue Jul 08 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.8.3-1
 - Update to 0.8.3
 



From rishi at fedoraproject.org  Sat Sep  6 18:46:50 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat,  6 Sep 2008 18:46:50 +0000 (UTC)
Subject: rpms/bouml/F-9 .cvsignore, 1.15, 1.16 bouml.spec, 1.20, 1.21 sources,
	1.17, 1.18
Message-ID: <20080906184650.1AADD70125@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/bouml/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15889

Modified Files:
	.cvsignore bouml.spec sources 
Log Message:
* Sat Sep 06 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.5-1
- Version bump to 4.5. Closes Red Hat Bugzilla bug #460528.
- Previous releases can not read a project saved with this version, but
  projects made by previous releases can be read.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-9/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	15 Jun 2008 10:23:37 -0000	1.15
+++ .cvsignore	6 Sep 2008 18:46:19 -0000	1.16
@@ -1 +1 @@
-bouml_4.3.5.tar.gz
+bouml_4.5.tar.gz


Index: bouml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-9/bouml.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bouml.spec	15 Jun 2008 10:23:37 -0000	1.20
+++ bouml.spec	6 Sep 2008 18:46:19 -0000	1.21
@@ -5,12 +5,12 @@
 
 Summary:	UML2 tool box to specify and generate code in C++, Java, IDL, PHP and Python
 Name:		bouml
-Version:	4.3.5
+Version:	4.5
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://bouml.free.fr/
-Source0:	http://bouml.free.fr/%{name}_%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/bouml/%{name}_%{version}.tar.gz
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -110,6 +110,11 @@
 %{_libdir}/%{name}/*
 
 %changelog
+* Sat Sep 06 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.5-1
+- Version bump to 4.5. Closes Red Hat Bugzilla bug #460528.
+- Previous releases can not read a project saved with this version, but
+  projects made by previous releases can be read.
+
 * Sun Jun 15 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.3.5-1
 - Version bump to 4.3.5. Closes Red Hat Bugzilla bug #448520.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-9/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	15 Jun 2008 10:23:37 -0000	1.17
+++ sources	6 Sep 2008 18:46:19 -0000	1.18
@@ -1 +1 @@
-b4ebb5af8d6bf46183695a65c698f001  bouml_4.3.5.tar.gz
+335263f8370790b3221bb697889a839d  bouml_4.5.tar.gz



From spot at fedoraproject.org  Sat Sep  6 18:49:39 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 18:49:39 +0000 (UTC)
Subject: rpms/supervisor/devel supervisor.spec,1.2,1.3
Message-ID: <20080906184939.5405470125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/supervisor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16476

Modified Files:
	supervisor.spec 
Log Message:
fix license tag


Index: supervisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supervisor/devel/supervisor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- supervisor.spec	7 Jan 2008 23:27:06 -0000	1.2
+++ supervisor.spec	6 Sep 2008 18:49:09 -0000	1.3
@@ -2,9 +2,9 @@
 Summary:  A System for Allowing the Control of Process State on UNIX
 Name: supervisor
 Version: 2.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
-License: ZPL/BSD
+License: ZPLv2.1 and BSD and MIT
 Group: System Environment/Base
 URL: http://www.plope.com/software/supervisor2/
 Source: http://www.plope.com/software/supervisor2/%{name}-%{version}.tar.gz
@@ -69,6 +69,9 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/supervisor
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1-5
+- fix license tag
+
 * Mon Jan 07 2008 Toshio Kuratomi <toshio at fedoraproject.org>  2.1-4
 - Include egginfo files when python generates them.
 



From rishi at fedoraproject.org  Sat Sep  6 18:51:43 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat,  6 Sep 2008 18:51:43 +0000 (UTC)
Subject: rpms/bouml/devel .cvsignore, 1.15, 1.16 bouml.spec, 1.21,
	1.22 sources, 1.17, 1.18
Message-ID: <20080906185143.CD3AA70125@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/bouml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17025

Modified Files:
	.cvsignore bouml.spec sources 
Log Message:
* Sat Sep 06 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.5-1
- Version bump to 4.5. Closes Red Hat Bugzilla bug #460528.
- Previous releases can not read a project saved with this version, but
  projects made by previous releases can be read.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	15 Jun 2008 10:27:22 -0000	1.15
+++ .cvsignore	6 Sep 2008 18:51:13 -0000	1.16
@@ -1 +1 @@
-bouml_4.3.5.tar.gz
+bouml_4.5.tar.gz


Index: bouml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/bouml.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bouml.spec	15 Jun 2008 10:27:22 -0000	1.21
+++ bouml.spec	6 Sep 2008 18:51:13 -0000	1.22
@@ -5,12 +5,12 @@
 
 Summary:	UML2 tool box to specify and generate code in C++, Java, IDL, PHP and Python
 Name:		bouml
-Version:	4.3.5
+Version:	4.5
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://bouml.free.fr/
-Source0:	http://bouml.free.fr/%{name}_%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/bouml/%{name}_%{version}.tar.gz
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -110,6 +110,11 @@
 %{_libdir}/%{name}/*
 
 %changelog
+* Sat Sep 06 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.5-1
+- Version bump to 4.5. Closes Red Hat Bugzilla bug #460528.
+- Previous releases can not read a project saved with this version, but
+  projects made by previous releases can be read.
+
 * Sun Jun 15 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.3.5-1
 - Version bump to 4.3.5. Closes Red Hat Bugzilla bug #448520.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	15 Jun 2008 10:27:22 -0000	1.17
+++ sources	6 Sep 2008 18:51:13 -0000	1.18
@@ -1 +1 @@
-b4ebb5af8d6bf46183695a65c698f001  bouml_4.3.5.tar.gz
+335263f8370790b3221bb697889a839d  bouml_4.5.tar.gz



From spot at fedoraproject.org  Sat Sep  6 18:55:53 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 18:55:53 +0000 (UTC)
Subject: rpms/svrcore/devel svrcore.spec,1.3,1.4
Message-ID: <20080906185553.E0D9970125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/svrcore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17941

Modified Files:
	svrcore.spec 
Log Message:
fix license tag


Index: svrcore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/svrcore/devel/svrcore.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- svrcore.spec	19 Feb 2008 21:47:57 -0000	1.3
+++ svrcore.spec	6 Sep 2008 18:55:23 -0000	1.4
@@ -4,8 +4,8 @@
 Summary:          Secure PIN handling using NSS crypto
 Name:             svrcore
 Version:          4.0.4
-Release:          2%{?dist}
-License:          MPL/GPL/LGPL
+Release:          3%{?dist}
+License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/
 Group:            Development/Libraries
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,6 +74,9 @@
 %{_includedir}/svrcore.h
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.0.4-3
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 4.0.4-2
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Sat Sep  6 18:57:52 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 18:57:52 +0000 (UTC)
Subject: rpms/switchdesk/devel switchdesk.spec,1.35,1.36
Message-ID: <20080906185752.DE79070125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/switchdesk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18429

Modified Files:
	switchdesk.spec 
Log Message:
fix license tag


Index: switchdesk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/switchdesk/devel/switchdesk.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- switchdesk.spec	10 Mar 2008 13:37:38 -0000	1.35
+++ switchdesk.spec	6 Sep 2008 18:57:22 -0000	1.36
@@ -1,9 +1,9 @@
 Name: switchdesk
 Summary: A desktop environment switcher for GNOME, KDE and AnotherLevel.
 Version: 4.0.9
-Release: 2
+Release: 3
 Source: %{name}-%{version}-%{release}.tar.bz2
-License: GPL
+License: GPLv2+
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -73,6 +73,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.9-3
+- fix license tag
+
 * Mon Mar 10 2008 Than Ngo <than at redhat.com> 4.0.9-2
 - update po files
 



From spot at fedoraproject.org  Sat Sep  6 19:05:45 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 19:05:45 +0000 (UTC)
Subject: rpms/symlinks/devel symlinks-LICENSE.txt, NONE, 1.1 symlinks.spec, 
	1.17, 1.18
Message-ID: <20080906190545.907E370125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/symlinks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20372

Modified Files:
	symlinks.spec 
Added Files:
	symlinks-LICENSE.txt 
Log Message:
fix license tag


--- NEW FILE symlinks-LICENSE.txt ---
From: http://packages.debian.org/changelogs/pool/main/s/symlinks/symlinks_1.2-4.2/symlinks.copyright

Copyright (c) Mark Lord, freely distributable

License clarification as found in Debian Bug #273338:

Hi,

My "symlinks" utility pre-dates the "open source licensing" fad
by a number of years.  Just to clarify, this is 100% freeware,
written entirely by myself.  The intent is to use it to detect
missing/obsolete symlink targets on an installed distro, before
creating the "gold" (or "final") release discs.

Use and distribute and modify as you (or anyone else) sees fit.
There have no formal restrictions or requirements whatsoever
regarding distribution of either binaries or source code,
whether modified or original.

Cheers
--
Mark Lord
Real-Time Remedies Inc.
mlord at pobox.com



Index: symlinks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/symlinks/devel/symlinks.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- symlinks.spec	11 Feb 2008 16:28:35 -0000	1.17
+++ symlinks.spec	6 Sep 2008 19:05:15 -0000	1.18
@@ -2,10 +2,12 @@
 Name: symlinks
 URL: ftp://metalab.unc.edu/pub/Linux/utils/file/
 Version: 1.2
-Release: 31%{?dist}
+Release: 32%{?dist}
 Group: Applications/System
-License: distributable
-Source: ftp://metalab.unc.edu/pub/Linux/utils/file/%{name}-%{version}.tar.gz
+License: Copyright only
+Source0: ftp://metalab.unc.edu/pub/Linux/utils/file/%{name}-%{version}.tar.gz
+# Taken from http://packages.debian.org/changelogs/pool/main/s/symlinks/symlinks_1.2-4.2/symlinks.copyright
+Source1: symlinks-LICENSE.txt
 Patch0: symlinks-1.2-nostatic.patch
 Patch1: symlinks-1.2-fixman.patch
 Patch2: symlinks-1.2-short.patch
@@ -22,9 +24,10 @@
 
 %prep
 %setup -q
-%patch -p1 -b .nostatic
+%patch0 -p1 -b .nostatic
 %patch1 -p1 -b .fixman
 %patch2 -p1
+cp %{SOURCE1} .
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS)" %{?_smp_mflags}
@@ -41,10 +44,14 @@
 
 %files
 %defattr(-,root,root,-)
+%doc symlinks-LICENSE.txt
 %{_bindir}/symlinks
 %{_mandir}/man8/symlinks.8*
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.2-32
+- fix license tag
+
 * Mon Feb 11 2008 Tim Waugh <twaugh at redhat.com> 1.2-31
 - Rebuild for GCC 4.3.
 



From spot at fedoraproject.org  Sat Sep  6 19:12:32 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 19:12:32 +0000 (UTC)
Subject: rpms/synce-trayicon/devel synce-trayicon.spec,1.16,1.17
Message-ID: <20080906191232.3E9CD70125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/synce-trayicon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21742

Modified Files:
	synce-trayicon.spec 
Log Message:
fix license tag


Index: synce-trayicon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synce-trayicon/devel/synce-trayicon.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- synce-trayicon.spec	18 Jun 2008 11:09:15 -0000	1.16
+++ synce-trayicon.spec	6 Sep 2008 19:12:01 -0000	1.17
@@ -1,12 +1,13 @@
 Name:           synce-trayicon
 Version:        0.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tray icon for use with gnome and synce
 
 Group:          Applications/Communications
-License:        GPL
+# Most of the code is MIT, except for src/eggtrayicon.c (LGPLv2+)
+License:        LGPLv2+
 URL:            http://synce.sourceforge.net/
-Source0:        http://dl.sf.net/synce/synce-trayicon-0.11.tar.gz
+Source0:        http://dl.sf.net/synce/synce-trayicon-%{version}.tar.gz
 Source1:        synce-trayicon.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +70,9 @@
 %{_mandir}/man1/synce-trayicon.1.gz
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.11-2
+- fix license tag
+
 * Wed Jun 18 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 0.11-1
 - version upgrade



From spot at fedoraproject.org  Sat Sep  6 19:13:57 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 19:13:57 +0000 (UTC)
Subject: rpms/sysconftool/devel sysconftool.spec,1.3,1.4
Message-ID: <20080906191357.4EB5670125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sysconftool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22154

Modified Files:
	sysconftool.spec 
Log Message:
fix license tag


Index: sysconftool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysconftool/devel/sysconftool.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sysconftool.spec	18 Sep 2006 17:33:42 -0000	1.3
+++ sysconftool.spec	6 Sep 2008 19:13:26 -0000	1.4
@@ -2,8 +2,9 @@
 Summary(pl):	Makra dla aclocal do instalacji plik??w konfiguracyjnych
 Name:		sysconftool
 Version:	0.15
-Release:	3%{?dist}
-License:	GPL
+Release:	4%{?dist}
+# No version specified.
+License:	GPL+
 Group:		Development/Tools
 Source0:	http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
 URL:		http://www.courier-mta.org/sysconftool/
@@ -59,6 +60,9 @@
 %{_datadir}/aclocal/sysconftool.m4
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.15-4
+- fix license tag
+
 * Mon Sep 18 2006 Dominik Mierzejewski <rpm at greysector.net> 0.15-3
 - mass rebuild
 - simplify autotools invocation



From spot at fedoraproject.org  Sat Sep  6 19:15:44 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 19:15:44 +0000 (UTC)
Subject: rpms/syslinux/devel syslinux.spec,1.53,1.54
Message-ID: <20080906191544.8AE9170125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/syslinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22652

Modified Files:
	syslinux.spec 
Log Message:
fix license tag


Index: syslinux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslinux/devel/syslinux.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- syslinux.spec	25 Feb 2008 18:42:02 -0000	1.53
+++ syslinux.spec	6 Sep 2008 19:15:14 -0000	1.54
@@ -2,8 +2,8 @@
 Name: syslinux
 Version: 3.61
 %define tarball_version 3.61
-Release: 2%{?dist}
-License: GPL
+Release: 3%{?dist}
+License: GPLv2+
 Group: Applications/System
 URL: http://syslinux.zytor.com/
 Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.bz2
@@ -96,6 +96,9 @@
 %{_datadir}/syslinux/
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.61-3
+- fix license tag
+
 * Mon Feb 25 2008 Peter Jones <pjones at redhat.com> - 3.61-2
 - Remove 16bpp patch, hpa says that's there to cover a bug that's fixed.
 - Remove x86_64 patch; building without it works now.



From spot at fedoraproject.org  Sat Sep  6 19:18:13 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 19:18:13 +0000 (UTC)
Subject: rpms/syslog-ng/devel syslog-ng.spec,1.35,1.36
Message-ID: <20080906191813.DCAE670125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/syslog-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23273

Modified Files:
	syslog-ng.spec 
Log Message:
fix license tag


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/devel/syslog-ng.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- syslog-ng.spec	31 Jan 2008 14:06:17 -0000	1.35
+++ syslog-ng.spec	6 Sep 2008 19:17:43 -0000	1.36
@@ -10,11 +10,11 @@
 
 Name:             syslog-ng
 Version:          2.0.8
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Syslog replacement daemon
 
 Group:            System Environment/Daemons
-License:          GPL
+License:          GPLv2
 URL:              http://www.balabit.com/products/syslog-ng/
 Source0:          http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/syslog-ng-%{version}.tar.gz
 Source1:          syslog.log
@@ -176,6 +176,9 @@
 
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-2
+- fix license tag
+
 * Thu Jan 31 2008 Douglas E. Warner <silfreed at silfreed.net> 2.0.8-1
 - updated to 2.0.8
 - removed logrotate patch



From spot at fedoraproject.org  Sat Sep  6 19:21:04 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 19:21:04 +0000 (UTC)
Subject: rpms/sysreport/devel sysreport.spec,1.42,1.43
Message-ID: <20080906192104.23A0470125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/sysreport/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23965

Modified Files:
	sysreport.spec 
Log Message:
fix license tag


Index: sysreport.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysreport/devel/sysreport.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sysreport.spec	19 Nov 2007 15:04:20 -0000	1.42
+++ sysreport.spec	6 Sep 2008 19:20:33 -0000	1.43
@@ -1,11 +1,14 @@
 Summary: Gathers system hardware and configuration information.
 Name: sysreport
 Version: 1.4.4
-Release: 1
+Release: 2
 URL: http://www.redhat.com/support
 Group: Development/Debuggers
 Source0: %{name}-%{version}-%{release}.tar.bz2
-License: GPL
+# No version given, not even COPYING.
+# Only license attribution is included spec file, but since
+# Red Hat is the copyright holder, we can safely assume it is correct.
+License: GPL+
 BuildArchitectures: noarch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: bash gawk grep sed mktemp procps
@@ -32,16 +35,19 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README RFC Changelog
-%dir /usr/share/sysreport
-%attr(0744,root,root) /usr/sbin/sysreport
-%attr(0744,root,root) /usr/share/sysreport/sysreport-fdisk
-%attr(0744,root,root) /usr/share/sysreport/functions
-%attr(0644,root,root) /usr/share/sysreport/text.xsl
+%dir %{_datadir}/%{name}
+%attr(0744,root,root) %{_sbindir}/%{name}
+%attr(0744,root,root) %{_datadir}/%{name}/sysreport-fdisk
+%attr(0744,root,root) %{_datadir}/%{name}/functions
+%attr(0644,root,root) %{_datadir}/%{name}/text.xsl
 %{_mandir}/man1/*
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4.4-2
+- fix license tag
+
 * Mon Nov 19 2007 Than Ngo <than at redhat.com> - 1.4.4-1
 - Resolves: bz220509, don't load iptables modules arbitrarily
 - Resolves: bz141325, use lvmdump to gather lvm2 information



From spot at fedoraproject.org  Sat Sep  6 19:23:05 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 19:23:05 +0000 (UTC)
Subject: rpms/system-config-boot/devel system-config-boot.spec,1.24,1.25
Message-ID: <20080906192305.DD64870125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/system-config-boot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24473

Modified Files:
	system-config-boot.spec 
Log Message:
fix license tag


Index: system-config-boot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/devel/system-config-boot.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- system-config-boot.spec	8 Apr 2008 10:51:00 -0000	1.24
+++ system-config-boot.spec	6 Sep 2008 19:22:35 -0000	1.25
@@ -4,9 +4,9 @@
 Summary: A graphical interface for configuring the boot loader
 Name: system-config-boot
 Version: 0.2.20
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/boot
-License: GPL
+License: GPLv2+
 ExclusiveOS: Linux
 Group: Applications/System 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,9 +26,9 @@
 
 %prep
 %setup -q
-%configure
 
 %build
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -53,7 +53,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING
 %attr(0755,root,root) /usr/bin/system-config-boot
 %attr(0755,root,root) /usr/sbin/system-config-boot
@@ -65,6 +65,9 @@
 %attr(0644,root,root) %config(noreplace) /etc/pam.d/system-config-boot
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.20-2
+- fix license tag
+
 * Tue Apr 08 2008 Harald Hoyer <harald at redhat.com> - 0.2.20-1
 - translation update
 



From spot at fedoraproject.org  Sat Sep  6 19:28:01 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 19:28:01 +0000 (UTC)
Subject: rpms/system-config-cluster/devel system-config-cluster.spec, 1.14, 
	1.15
Message-ID: <20080906192801.8B3F270125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/system-config-cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25592

Modified Files:
	system-config-cluster.spec 
Log Message:
fix license tag


Index: system-config-cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-cluster/devel/system-config-cluster.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- system-config-cluster.spec	8 Apr 2008 21:17:35 -0000	1.14
+++ system-config-cluster.spec	6 Sep 2008 19:27:31 -0000	1.15
@@ -1,11 +1,11 @@
 # -*- RPM-SPEC -*-
-Summary: system-config-cluster is a utility which allows you to manage cluster configuration in a graphical setting.
+Summary: A utility for managing cluster configuration in a graphical setting
 Name: system-config-cluster
 Version: 1.0.53
-Release: 1.0
+Release: 2
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
-License: GPL
+License: GPLv2
 Group: Applications/System
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -16,18 +16,19 @@
 BuildRequires: perl(XML::Parser) gettext
 
 %description
-system-config-cluster is a utility which allows you to manage cluster configuuration in a graphical setting.
+system-config-cluster is a utility which allows you to manage cluster 
+configuration in a graphical setting.
 
 %prep
 %setup -q
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+make DESTDIR=%{buildroot} install
 
 #Uncomment this when translations are done
 #%find_lang %name
@@ -51,6 +52,9 @@
 %config %{_sysconfdir}/security/console.apps/system-config-cluster
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.53-2
+- fix license tag
+
 * Tue Apr 8 2008 Jim Parsons <jparsons at redhat.com> 1.0.53-1.0
   - Fix for fedora 212477, finally
   - Fedora build 



From spot at fedoraproject.org  Sat Sep  6 19:34:15 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 19:34:15 +0000 (UTC)
Subject: rpms/system-config-httpd/devel system-config-httpd.spec,1.18,1.19
Message-ID: <20080906193415.EE53770125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/system-config-httpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27305

Modified Files:
	system-config-httpd.spec 
Log Message:
fix license tag


Index: system-config-httpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-httpd/devel/system-config-httpd.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- system-config-httpd.spec	20 Jul 2007 15:54:54 -0000	1.18
+++ system-config-httpd.spec	6 Sep 2008 19:33:45 -0000	1.19
@@ -1,14 +1,14 @@
 Summary: Apache configuration tool
 Name: system-config-httpd
 Version: 1.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 5
 URL: http://www.redhat.com/
 Source0: system-config-httpd-%{version}.tar.gz
-License: GPL
+License: GPLv2+
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: alchemist, alchemist-devel, python >= 2.2, python-devel >= 2.2
+BuildRequires: alchemist-devel, python >= 2.2, python-devel >= 2.2
 BuildRequires: libglade2-devel, gettext, intltool >= 0.17
 BuildArch: noarch
 Requires: python >= 2.2, alchemist, libglade2, pygtk2-libglade, pygtk2
@@ -25,13 +25,14 @@
 %prep
 %setup -q -n system-config-httpd-%{version}
 
+%build
 %define _target_platform        %{nil}   
 %configure 
 %undefine       _target_platform  
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install
 
 %find_lang system-config-httpd
 
@@ -73,6 +74,9 @@
 %dir /var/cache/alchemist/apache
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 5:1.4.4-2
+- fix license tag
+
 * Fri Jul 20 2007 Phil Knirsch <pknirsch at redhat.com> 1.4.4-1
 - Removed obsolete apacheconf.pot file
 - Fixed small bug in acinclude.m4



From lyosnorezel at fedoraproject.org  Sat Sep  6 19:35:06 2008
From: lyosnorezel at fedoraproject.org (Lyos Gemini Norezel)
Date: Sat,  6 Sep 2008 19:35:06 +0000 (UTC)
Subject: rpms/darkgarden-fonts/devel darkgarden-fonts.spec,1.2,1.3
Message-ID: <20080906193506.EE43270125@cvs1.fedora.phx.redhat.com>

Author: lyosnorezel

Update of /cvs/pkgs/rpms/darkgarden-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27287

Modified Files:
	darkgarden-fonts.spec 
Log Message:



Index: darkgarden-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/darkgarden-fonts/devel/darkgarden-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- darkgarden-fonts.spec	2 Aug 2008 09:52:24 -0000	1.2
+++ darkgarden-fonts.spec	6 Sep 2008 19:34:36 -0000	1.3
@@ -5,7 +5,7 @@
 
 Name:		%{fontname}-fonts
 Version:	1.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Dark Garden is a decorative outline font of unusual shape
 
 Group:		User Interface/X



From spot at fedoraproject.org  Sat Sep  6 19:35:36 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 19:35:36 +0000 (UTC)
Subject: rpms/system-switch-java/devel system-switch-java.spec,1.14,1.15
Message-ID: <20080906193536.B1F1B70125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/system-switch-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27769

Modified Files:
	system-switch-java.spec 
Log Message:
fix license tag


Index: system-switch-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-switch-java/devel/system-switch-java.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- system-switch-java.spec	3 Jul 2008 22:49:49 -0000	1.14
+++ system-switch-java.spec	6 Sep 2008 19:35:06 -0000	1.15
@@ -1,12 +1,12 @@
 Name: system-switch-java
 Version: 1.1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A tool for changing the default Java toolset
 
 %define url https://fedorahosted.org
 
 Group: Applications/System
-License: GPL
+License: GPLv2+
 URL: %{url}/%{name}
 Source0: %{url}/releases/s/y/system-switch-java/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 %config(noreplace) /etc/security/console.apps/%{name}
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.3-2
+- fix license tag
+
 * Thu Jul  3 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.1.3-1
 - Import system-switch-java 1.1.3.
 - Remove desktop file patch.



From cweyl at fedoraproject.org  Sat Sep  6 19:40:44 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  6 Sep 2008 19:40:44 +0000 (UTC)
Subject: rpms/perl-Class-MOP/devel .cvsignore, 1.16, 1.17 perl-Class-MOP.spec,
	1.19, 1.20 sources, 1.16, 1.17
Message-ID: <20080906194044.3363370125@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-serv29312

Modified Files:
	.cvsignore perl-Class-MOP.spec sources 
Log Message:
* Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.65-1
- update to 0.65
- adjust br's



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	5 Aug 2008 06:57:47 -0000	1.16
+++ .cvsignore	6 Sep 2008 19:40:13 -0000	1.17
@@ -1 +1 @@
-Class-MOP-0.64.tar.gz
+Class-MOP-0.65.tar.gz


Index: perl-Class-MOP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/perl-Class-MOP.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- perl-Class-MOP.spec	5 Aug 2008 06:57:47 -0000	1.19
+++ perl-Class-MOP.spec	6 Sep 2008 19:40:13 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           perl-Class-MOP
-Version:        0.64
+Version:        0.65
 Release:        1%{?dist}
 Summary:        Metaobject programming model for Perl
 License:        GPL+ or Artistic
@@ -15,7 +15,9 @@
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(MRO::Compat)   >= 0.05
 BuildRequires:  perl(Sub::Identify) >= 0.03
-BuildRequires:  perl(Sub::Name)     >= 0.02
+# building w/XS, not needed
+#BuildRequires:  perl(Sub::Name)     >= 0.04
+#BuildRequires:  perl(Devel::GlobalDestruction)
 # test
 BuildRequires:  perl(Algorithm::C3)
 BuildRequires:  perl(Class::C3)
@@ -81,6 +83,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.65-1
+- update to 0.65
+- adjust br's
+
 * Mon Aug 04 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.64-1
 - update to 0.64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	5 Aug 2008 06:57:47 -0000	1.16
+++ sources	6 Sep 2008 19:40:13 -0000	1.17
@@ -1 +1 @@
-230363674c5edffe8e67248afb9fdc35  Class-MOP-0.64.tar.gz
+cce3daec0ec83c0061b40d40ddcf8dcf  Class-MOP-0.65.tar.gz



From spot at fedoraproject.org  Sat Sep  6 19:41:42 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 19:41:42 +0000 (UTC)
Subject: rpms/system-switch-mail/devel system-switch-mail.spec,1.19,1.20
Message-ID: <20080906194142.8927E70125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/system-switch-mail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29691

Modified Files:
	system-switch-mail.spec 
Log Message:
fix license tag


Index: system-switch-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-switch-mail/devel/system-switch-mail.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- system-switch-mail.spec	11 Mar 2008 18:11:29 -0000	1.19
+++ system-switch-mail.spec	6 Sep 2008 19:41:12 -0000	1.20
@@ -1,9 +1,9 @@
 Summary: The Mail Transport Agent Switcher
 Name: system-switch-mail
 Version: 0.5.26
-Release: 2
-Source0: %{name}-%{version}-%{release}.tar.bz2
-License: GPL
+Release: 3
+Source0: %{name}-%{version}-2.tar.bz2
+License: GPLv2+
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,15 +43,17 @@
 Mail Transport Agent Switcher.
 
 %prep
-%setup -q -n %{name}-%{version}-%{release}
+# This is why you should not embed the package release in
+# the source tarball. :P
+%setup -q -n %{name}-%{version}-2
 
 %build
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 
-%makeinstall
+make DESTDIR=%{buildroot} mandir=%{_mandir} sysconfdir=%{_sysconfdir} install
 
 %find_lang %{name}
 
@@ -59,7 +61,7 @@
 rm -rf %{buildroot}
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/*
 %{_sbindir}/*
 %dir %{_datadir}/%{name}
@@ -70,7 +72,7 @@
 %config(noreplace) /etc/security/console.apps/%{name}*
 
 %files gnome
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 %{_datadir}/%{name}/switchmail_gui.py*
@@ -78,6 +80,9 @@
 %{_datadir}/%{name}/switchmail.glade
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.26-3
+- fix license tag
+
 * Tue Mar 11 2008 Than Ngo <than at redhat.com> 0.5.26-2
 - fix permission of po files (bz#436888)
 - update po files



From cweyl at fedoraproject.org  Sat Sep  6 19:46:00 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  6 Sep 2008 19:46:00 +0000 (UTC)
Subject: rpms/perl-Moose/devel .cvsignore, 1.19, 1.20 perl-Moose.spec, 1.24, 
	1.25 sources, 1.19, 1.20
Message-ID: <20080906194600.600A670125@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31085

Modified Files:
	.cvsignore perl-Moose.spec sources 
Log Message:
* Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.57-1
- update to 0.57



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	18 Jul 2008 21:16:09 -0000	1.19
+++ .cvsignore	6 Sep 2008 19:45:29 -0000	1.20
@@ -1 +1 @@
-Moose-0.54.tar.gz
+Moose-0.57.tar.gz


Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- perl-Moose.spec	18 Jul 2008 21:16:09 -0000	1.24
+++ perl-Moose.spec	6 Sep 2008 19:45:30 -0000	1.25
@@ -1,13 +1,14 @@
 Name:           perl-Moose
-Version:        0.54
+Version:        0.57
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Moose/
 # source tends to flip between these three authors
+Source0:        http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Moose-%{version}.tar.gz
 #Source0:        http://search.cpan.org/CPAN/authors/id/S/SA/SARTAK/Moose-%{version}.tar.gz
-Source0:        http://search.cpan.org/CPAN/authors/id/S/ST/STEVAN/Moose-%{version}.tar.gz
+#Source0:        http://search.cpan.org/CPAN/authors/id/S/ST/STEVAN/Moose-%{version}.tar.gz
 #Source0:        http://search.cpan.org/CPAN/authors/id/G/GR/GRODITI/Moose-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -17,9 +18,10 @@
 BuildRequires:  perl(Test::More)         >= 0.62
 BuildRequires:  perl(ExtUtils::MakeMaker)
 # cpan
-BuildRequires:  perl(Class::MOP)         >= 0.55
+BuildRequires:  perl(Class::MOP)         >= 0.65
 BuildRequires:  perl(Module::Build) 
 BuildRequires:  perl(Filter::Simple) 
+BuildRequires:  perl(List::MoreUtils)
 BuildRequires:  perl(Sub::Exporter)      >= 0.954
 BuildRequires:  perl(Sub::Install)       >= 0.92
 BuildRequires:  perl(Test::Exception)    >= 0.21
@@ -107,6 +109,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.57-1
+- update to 0.57
+
 * Fri Jul 18 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.54-1
 - update to 0.54
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	18 Jul 2008 21:16:09 -0000	1.19
+++ sources	6 Sep 2008 19:45:30 -0000	1.20
@@ -1 +1 @@
-53b5cddeb1e287b29f87966c9ad3e433  Moose-0.54.tar.gz
+624b995525536edd1b3d4b39bdcafb77  Moose-0.57.tar.gz



From lyosnorezel at fedoraproject.org  Sat Sep  6 19:48:00 2008
From: lyosnorezel at fedoraproject.org (Lyos Gemini Norezel)
Date: Sat,  6 Sep 2008 19:48:00 +0000 (UTC)
Subject: rpms/thibault-fonts/devel thibault-fonts.spec,1.1,1.2
Message-ID: <20080906194800.63F5870125@cvs1.fedora.phx.redhat.com>

Author: lyosnorezel

Update of /cvs/pkgs/rpms/thibault-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31652

Modified Files:
	thibault-fonts.spec 
Log Message:
* Sat Sep 06 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com> 0.1-2
- Rebuild for new fontforge release.




Index: thibault-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thibault-fonts/devel/thibault-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thibault-fonts.spec	2 Aug 2008 07:41:04 -0000	1.1
+++ thibault-fonts.spec	6 Sep 2008 19:47:30 -0000	1.2
@@ -8,7 +8,7 @@
 
 Name:		%{fontname}-fonts
 Version:	0.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Thibault.org font collection
 
 Group:		User Interface/X
@@ -186,7 +186,10 @@
 
 %changelog
 #thibault
-* Fri Jul 18 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com> 0.1-1
+* Sat Sep 06 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com> 0.1-2
+- Rebuild for new fontforge release.
+
+* Fri Jul 18 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com>
 - Fixed minor issues found during review. 
 
 * Mon Jul 15 2008 Matt Domsch <mdomsch at fedoraproject.org>



From lyosnorezel at fedoraproject.org  Sat Sep  6 20:01:45 2008
From: lyosnorezel at fedoraproject.org (Lyos Gemini Norezel)
Date: Sat,  6 Sep 2008 20:01:45 +0000 (UTC)
Subject: rpms/darkgarden-fonts/devel darkgarden-fonts.spec,1.3,1.4
Message-ID: <20080906200145.4BFF970125@cvs1.fedora.phx.redhat.com>

Author: lyosnorezel

Update of /cvs/pkgs/rpms/darkgarden-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3180

Modified Files:
	darkgarden-fonts.spec 
Log Message:
* Sat Sep 06 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com> 1.1-4
- rebuild with new release of fontforge.




Index: darkgarden-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/darkgarden-fonts/devel/darkgarden-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- darkgarden-fonts.spec	6 Sep 2008 19:34:36 -0000	1.3
+++ darkgarden-fonts.spec	6 Sep 2008 20:01:15 -0000	1.4
@@ -5,7 +5,7 @@
 
 Name:		%{fontname}-fonts
 Version:	1.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Dark Garden is a decorative outline font of unusual shape
 
 Group:		User Interface/X
@@ -66,6 +66,8 @@
 %config(noreplace) %{fontconfdir}/%{conf1}
 
 %changelog
+* Sat Sep 06 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com> 1.1-4
+- rebuild with new release of fontforge.
 * Sat Aug 02 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com> 1.1-2
 - initial import
 - bumped release number



From spot at fedoraproject.org  Sat Sep  6 21:03:31 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 21:03:31 +0000 (UTC)
Subject: rpms/whysynth-dssi/devel whysynth-dssi.spec,1.5,1.6
Message-ID: <20080906210331.9786570125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/whysynth-dssi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21438

Modified Files:
	whysynth-dssi.spec 
Log Message:
fix license tag


Index: whysynth-dssi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/whysynth-dssi/devel/whysynth-dssi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- whysynth-dssi.spec	8 Jul 2008 13:26:04 -0000	1.5
+++ whysynth-dssi.spec	6 Sep 2008 21:03:01 -0000	1.6
@@ -1,12 +1,12 @@
 Summary:      DSSI software synthesizer plugin
 Name:         whysynth-dssi
 Version:      20080412
-Release:      1%{?dist}
+Release:      2%{?dist}
 URL:          http://home.jps.net/~musound/whysynth.html
 Source0:      http://home.jps.net/~musound/whysynth-20080412.tar.bz2
 Source1:      whysynth-48.png
 Source2:      whysynth.desktop
-License:      GPL
+License:      GPLv2+
 Group:        Applications/Multimedia
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -68,6 +68,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/whysynth.png
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 20080412-2
+- fix license tag
+
 * Tue Jul 07 2008 Anthony Green <green at redhat.com> 20080412-1
 - Upgrade sources.  Add COPYING-patches.
 



From spot at fedoraproject.org  Sat Sep  6 21:07:44 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 21:07:44 +0000 (UTC)
Subject: rpms/wifi-radar/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 wifi-radar.spec, 1.3, 1.4
Message-ID: <20080906210744.C514A70125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/wifi-radar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23184

Modified Files:
	.cvsignore sources wifi-radar.spec 
Log Message:
fix license tag, update to 1.9.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wifi-radar/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2006 06:58:31 -0000	1.2
+++ .cvsignore	6 Sep 2008 21:07:14 -0000	1.3
@@ -1 +1 @@
-wifi-radar-1.9.6.tar.bz2
+wifi-radar-1.9.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wifi-radar/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2006 06:58:31 -0000	1.2
+++ sources	6 Sep 2008 21:07:14 -0000	1.3
@@ -1 +1 @@
-4ab4cc22d68dd0655ab28b75c7aa6248  wifi-radar-1.9.6.tar.bz2
+fdcf862da67e0624dcca5d71d12caddf  wifi-radar-1.9.9.tar.bz2


Index: wifi-radar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wifi-radar/devel/wifi-radar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wifi-radar.spec	17 Sep 2006 16:30:11 -0000	1.3
+++ wifi-radar.spec	6 Sep 2008 21:07:14 -0000	1.4
@@ -1,8 +1,9 @@
 Name:		wifi-radar
 Summary:	A utility for managing WiFi profiles
-Version:	1.9.6
-Release:	3%{?dist}
-License:	GPL
+Version:	1.9.9
+Release:	1%{?dist}
+# No version given.
+License:	GPL+
 Group:		Applications/Internet
 URL:		http://wifi-radar.systemimager.org/
 Source0:	http://wifi-radar.systemimager.org/pub/wifi-radar-%{version}.tar.bz2
@@ -21,7 +22,7 @@
 %setup -q
 
 %build
-%__make
+%__make %{?_smp_mflags}
 
 %install
 # An empty config file
@@ -77,9 +78,13 @@
 %attr(0644,root,root) %{_datadir}/pixmaps/*
 %attr(0644,root,root) %{_datadir}/applications/fedora-wifi-radar.desktop
 %defattr(0644,root,root,0755)
-%doc AUTHORS ChangeLog COPYING DEVELOPER_GUIDELINES README TODO
+%doc COPYING DEVELOPER_GUIDELINES README TODO
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.9.9-1
+- fix license tag
+- update to 1.9.9
+
 * Sun Sep 17 2006 Ian Pilcher <i.pilcher at comcast.net> 1.9.6-3
 - Bump release for FC6 rebuild
 - Fix dates in previous changelog entries (It's 2006, duh!)



From spot at fedoraproject.org  Sat Sep  6 21:17:36 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 21:17:36 +0000 (UTC)
Subject: rpms/windowlab/devel dead.package, NONE, 1.1 sources, 1.2,
	NONE windowlab-1.34-nostrip.patch, 1.1,
	NONE windowlab-1.34-pathfixes.patch, 1.1,
	NONE windowlab-1.34-xsessions.patch, 1.1, NONE windowlab.desktop,
	1.1, NONE windowlab.spec, 1.2, NONE
Message-ID: <20080906211736.D753070125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/windowlab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26376

Added Files:
	dead.package 
Removed Files:
	sources windowlab-1.34-nostrip.patch 
	windowlab-1.34-pathfixes.patch windowlab-1.34-xsessions.patch 
	windowlab.desktop windowlab.spec 
Log Message:
make this package dead for license reasons


--- NEW FILE dead.package ---
This package was already orphaned, but for anyone thinking of reviving, please note: there is a licensing problem.
This codebase is GPLv2+, but it is derived from 9wm, which is under a non-free license (and the copyright holder
for 9wm is deceased).

Tom "spot" Callaway <tcallawa at redhat.com>, Sat Sep 6, 2008


--- sources DELETED ---


--- windowlab-1.34-nostrip.patch DELETED ---


--- windowlab-1.34-pathfixes.patch DELETED ---


--- windowlab-1.34-xsessions.patch DELETED ---


--- windowlab.desktop DELETED ---


--- windowlab.spec DELETED ---



From spot at fedoraproject.org  Sat Sep  6 21:20:28 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 21:20:28 +0000 (UTC)
Subject: rpms/wings/devel wings.spec,1.9,1.10
Message-ID: <20080906212028.8974270125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/wings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27131

Modified Files:
	wings.spec 
Log Message:
fix license tag


Index: wings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wings/devel/wings.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wings.spec	27 Mar 2008 15:24:26 -0000	1.9
+++ wings.spec	6 Sep 2008 21:19:58 -0000	1.10
@@ -1,10 +1,10 @@
 Name:           wings
 Version:        0.99.02
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        3D Subdivision Modeler
 
 Group:          Applications/Multimedia
-License:        Distributable
+License:        MIT
 URL:            http://www.wings3d.com
 Source0:	http://prdownloads.sourceforge.net/wings/wings-%{version}.tar.bz2
 Source1:	http://prdownloads.sourceforge.net/wings/wings3d_manual1.6.1.pdf
@@ -134,6 +134,9 @@
 
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.99.02-2
+- fix license tag
+
 * Thu Mar 27 2008 Gerard Milmeister <gemi at bluewin.ch> - 0.99.02-1
 - new releae 0.99.02
 



From spot at fedoraproject.org  Sat Sep  6 21:21:28 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 21:21:28 +0000 (UTC)
Subject: rpms/wmctrl/devel wmctrl.spec,1.2,1.3
Message-ID: <20080906212128.75ED470125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/wmctrl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27586

Modified Files:
	wmctrl.spec 
Log Message:
fix license tag


Index: wmctrl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wmctrl/devel/wmctrl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wmctrl.spec	19 Feb 2008 02:47:23 -0000	1.2
+++ wmctrl.spec	6 Sep 2008 21:20:58 -0000	1.3
@@ -1,10 +1,10 @@
 Name:           wmctrl
 Version:        1.07
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A command line tool to interact with an X Window Manager
 
 Group:          User Interface/X
-License:        GPL
+License:        GPLv2+
 URL:            http://sweb.cz/tripie/utils/wmctrl
 Source0:        http://sweb.cz/tripie/utils/wmctrl/dist/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.07-4
+- fix license tag
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.07-3
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Sat Sep  6 21:23:14 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 21:23:14 +0000 (UTC)
Subject: rpms/wordtrans/devel wordtrans.spec,1.34,1.35
Message-ID: <20080906212314.E328F70125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/wordtrans/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28281

Modified Files:
	wordtrans.spec 
Log Message:
fix license tag


Index: wordtrans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wordtrans/devel/wordtrans.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- wordtrans.spec	16 Feb 2008 19:53:17 -0000	1.34
+++ wordtrans.spec	6 Sep 2008 21:22:44 -0000	1.35
@@ -10,9 +10,9 @@
 URL: http://wordtrans.sourceforge.net
 Summary: Multi Language Word Translator for Linux
 Version: 1.1
-Release: 0.5.pre13%{?dist}
+Release: 0.6.pre13%{?dist}
 Epoch: 1
-License: GPL
+License: GPLv2+
 Source: http://wordtrans.sourceforge.net/%{name}_%{iversion}.tar.gz
 Source1: ger-eng.txt
 Source2: http://www.aracnet.com/~tyler/IDP/files/French.txt
@@ -280,6 +280,9 @@
 /var/www/wordtrans
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-0.6.pre13
+- fix license tag
+
 * Sat Feb 16 2008 Than Ngo <than at redhat.com> 1.1-0.5.pre13
 - rebuilt against gcc 4.3
 



From spot at fedoraproject.org  Sat Sep  6 21:24:30 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 21:24:30 +0000 (UTC)
Subject: rpms/ws-commons-util/devel ws-commons-util.spec,1.7,1.8
Message-ID: <20080906212430.1975870125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ws-commons-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28816

Modified Files:
	ws-commons-util.spec 
Log Message:
fix license tag


Index: ws-commons-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ws-commons-util/devel/ws-commons-util.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ws-commons-util.spec	19 Feb 2008 04:20:19 -0000	1.7
+++ ws-commons-util.spec	6 Sep 2008 21:23:59 -0000	1.8
@@ -1,10 +1,10 @@
 Name:           ws-commons-util
 Version:        1.0.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Common utilities from the Apache Web Services Project 
 
 Group:          System Environment/Libraries
-License:        Apache Software License
+License:        ASL 2.0
 URL:            http://apache.osuosl.org/ws/commons/util/
 Source0:        http://apache.osuosl.org/ws/commons/util/sources/ws-commons-util-1.0.1-src.tar.gz
 Patch0:         %{name}-addosgimanifest.patch
@@ -85,6 +85,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-8
+- fix license tag
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.1-7
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Sat Sep  6 21:26:11 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 21:26:11 +0000 (UTC)
Subject: rpms/wuja/devel wuja.spec,1.4,1.5
Message-ID: <20080906212611.33DD370125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/wuja/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29514

Modified Files:
	wuja.spec 
Log Message:
fix license tag


Index: wuja.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wuja/devel/wuja.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wuja.spec	4 Apr 2008 16:34:45 -0000	1.4
+++ wuja.spec	6 Sep 2008 21:25:40 -0000	1.5
@@ -2,11 +2,11 @@
 
 Name: wuja
 Version: 0.0.8
-Release:        3%{?dist}
+Release: 4%{?dist}
 Summary: Gnome desktop applet for integration with Google Calendar
 
 Group: Applications/Internet
-License: GPL
+License: GPLv2+
 URL: http://dangerouslyinc.com/wuja
 Source0: http://dangerouslyinc.com/files/wuja/wuja-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.0.8-4
+- fix license tag
+
 * Fri Apr 04 2008 Devan Goodwin <dgoodwin at dangerouslyinc.com> 0.0.8-3
 - Minor fix for missing egg info file.
 



From spot at fedoraproject.org  Sat Sep  6 21:27:20 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 21:27:20 +0000 (UTC)
Subject: rpms/wxGTK/devel wxGTK.spec,1.39,1.40
Message-ID: <20080906212720.87F7370125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/wxGTK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29994

Modified Files:
	wxGTK.spec 
Log Message:
fix license tag


Index: wxGTK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/devel/wxGTK.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- wxGTK.spec	31 Jul 2008 17:10:53 -0000	1.39
+++ wxGTK.spec	6 Sep 2008 21:26:50 -0000	1.40
@@ -6,12 +6,12 @@
 
 Name:           wxGTK
 Version:        2.8.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
 # change to be "wxWidgets License" once that is approved by OSI.)
-License:        wxWidgets Library Licence
+License:        wxWidgets
 Group:          System Environment/Libraries
 URL:            http://www.wxwidgets.org/
 Source0:        http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
@@ -262,6 +262,9 @@
 
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.8-2
+- fix license tag
+
 * Thu Jul 31 2008 Dan Horak <dan[at]danny.cz> - 2.8.8-1
 - update to 2.8.8 (rh bug #457406)
 



From spot at fedoraproject.org  Sat Sep  6 21:33:22 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 21:33:22 +0000 (UTC)
Subject: rpms/wxPython/devel wxPython.spec,1.26,1.27
Message-ID: <20080906213322.1777470125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/wxPython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31924

Modified Files:
	wxPython.spec 
Log Message:
fix license tag


Index: wxPython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/devel/wxPython.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- wxPython.spec	31 Jul 2008 18:15:34 -0000	1.26
+++ wxPython.spec	6 Sep 2008 21:32:51 -0000	1.27
@@ -5,12 +5,12 @@
 
 Name:           wxPython
 Version:        2.8.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        GUI toolkit for the Python programming language
 
 Group:          Development/Languages
-License:        LGPL
+License:        LGPLv2+ and wxWidgets 
 URL:            http://www.wxpython.org/
 Source0:        http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.8.0-2
+- fix license tag
+
 * Thu Jul 31 2008 Matthew Miller <mattdm at mattdm.org> - 2.8.8.0-1
 - update to 2.8.8.0 (bug #457408)
 - a fix for bug #450073 is included in the upstream release, so



From spot at fedoraproject.org  Sat Sep  6 21:34:30 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 21:34:30 +0000 (UTC)
Subject: rpms/xalan-j2/devel xalan-j2.spec,1.57,1.58
Message-ID: <20080906213430.64BCD70125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xalan-j2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32452

Modified Files:
	xalan-j2.spec 
Log Message:
fix license tag


Index: xalan-j2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xalan-j2/devel/xalan-j2.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- xalan-j2.spec	10 Jul 2008 20:34:54 -0000	1.57
+++ xalan-j2.spec	6 Sep 2008 21:34:00 -0000	1.58
@@ -37,12 +37,12 @@
 
 Name:           xalan-j2
 Version:        2.7.0
-Release:        7.3%{?dist}
+Release:        7.4%{?dist}
 Epoch:          0
 Summary:        Java XSLT processor
 # samples/servlet/ApplyXSLTException.java is ASL 1.1
 # src/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java is W3C
-License:        ASL 1.1 and ASL 2.0 and W3c
+License:        ASL 1.1 and ASL 2.0 and W3C
 #Source0:        http://www.apache.org/dist/xml/xalan-j/xalan-j_2_7_0-src.tar.gz
 Source0:        xalan-j_%{cvs_version}-src-RHsemiCLEAN.tar.gz
 Patch0:         %{name}-noxsltcdeps.patch
@@ -344,6 +344,9 @@
 %endif
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0:2.7.0-7.4
+- fix license tag
+
 * Thu Jul 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:2.7.0-7.3
 - drop repotag
 - fix license tag



From spot at fedoraproject.org  Sat Sep  6 21:38:25 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 21:38:25 +0000 (UTC)
Subject: rpms/xastir/devel xastir.spec,1.7,1.8
Message-ID: <20080906213825.E39A770125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xastir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1486

Modified Files:
	xastir.spec 
Log Message:
fix license tag


Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xastir.spec	28 Aug 2008 16:35:38 -0000	1.7
+++ xastir.spec	6 Sep 2008 21:37:55 -0000	1.8
@@ -1,35 +1,22 @@
-Summary   : Amateur Station Tracking and Reporting system for amateur radio
-Name      : xastir
-Version   : 1.9.2
-Release   : 9%{?dist}
-License   : GPLv2
-Group     : Applications/Internet
-Source0   : http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
-Source1   : %{name}.desktop
-Source2   : %{name}.png
-Patch0    : xastir-1.9.2-libdir.patch
-Patch1    : xastir-1.9.2-IM.patch
-Patch2    : xastir-1.9.2-wget.patch
-URL       : http://www.xastir.org
-BuildRoot : %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires : wget
-BuildRequires : wget
-BuildRequires : lesstif-devel
-BuildRequires : libXt-devel
-BuildRequires : festival
-BuildRequires : ImageMagick-devel
-BuildRequires : dos2unix
-BuildRequires : libax25-devel
-BuildRequires : curl-devel
-BuildRequires : pcre-devel
-BuildRequires : proj-devel
-BuildRequires : python
-BuildRequires : shapelib-devel
-BuildRequires : gpsman
-BuildRequires : gdal-devel
-BuildRequires : db4-devel
-BuildRequires : festival
-BuildRequires : desktop-file-utils
+Summary: Amateur Station Tracking and Reporting system for amateur radio
+Name:    xastir
+Version: 1.9.2
+Release: 10%{?dist}
+License: GPLv2+
+Group:   Applications/Internet
+Source0: http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
+Source1: %{name}.desktop
+Source2: %{name}.png
+Patch0:  xastir-1.9.2-libdir.patch
+Patch1:  xastir-1.9.2-IM.patch
+Patch2:  xastir-1.9.2-wget.patch
+URL:     http://www.xastir.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+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
 
 %description
 Xastir is a graphical application that interfaces HAM radio
@@ -105,6 +92,10 @@
 %doc README.MAPS README.win32 UPGRADE
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.9.2-10
+- fix license tag
+- fix spec up so it doesn't confuse license checking script
+
 * Thu Aug 28 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.2-9
 - drop uneeded and potential risky files
 



From ndim at fedoraproject.org  Sat Sep  6 21:38:41 2008
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Sat,  6 Sep 2008 21:38:41 +0000 (UTC)
Subject: rpms/xorg-x11-drv-radeonhd/devel .cvsignore, 1.35, 1.36 sources,
	1.35, 1.36 xorg-x11-drv-radeonhd-README.fedora, 1.33,
	1.34 xorg-x11-drv-radeonhd.spec, 1.46, 1.47
Message-ID: <20080906213841.A383170125@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1654

Modified Files:
	.cvsignore sources xorg-x11-drv-radeonhd-README.fedora 
	xorg-x11-drv-radeonhd.spec 
Log Message:
* Sat Sep 06 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.1-3.8.20080906git
- New snapshot (upstream commit f1c6cc865d8d0703478c3eedea2e706e911f9965):
  Upstream has merged their QnD and AtomBIOS branches to master a
  few weeks time ago, so there are way too many changes to list here.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	24 Jul 2008 12:27:03 -0000	1.35
+++ .cvsignore	6 Sep 2008 21:38:11 -0000	1.36
@@ -1 +1 @@
-xf86-video-radeonhd-1.2.1-20080724git.tar.bz2
+xf86-video-radeonhd-1.2.1-20080906git.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	24 Jul 2008 12:27:03 -0000	1.35
+++ sources	6 Sep 2008 21:38:11 -0000	1.36
@@ -1 +1 @@
-47660263832de3cb0e8227b8ff36be69  xf86-video-radeonhd-1.2.1-20080724git.tar.bz2
+6b3c10064385e3eea1af16c1b723b640  xf86-video-radeonhd-1.2.1-20080906git.tar.bz2


Index: xorg-x11-drv-radeonhd-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-README.fedora,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xorg-x11-drv-radeonhd-README.fedora	24 Jul 2008 12:27:03 -0000	1.33
+++ xorg-x11-drv-radeonhd-README.fedora	6 Sep 2008 21:38:11 -0000	1.34
@@ -11,7 +11,7 @@
 we are packaging development snapshots of upstream's git repository
 here.
 
-Latest upstream commit: 31e46386293fd0c54c99328eee3cfe7b49584f9d
+Latest upstream commit: f1c6cc865d8d0703478c3eedea2e706e911f9965
 
 
 Contents


Index: xorg-x11-drv-radeonhd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xorg-x11-drv-radeonhd.spec	24 Jul 2008 12:27:03 -0000	1.46
+++ xorg-x11-drv-radeonhd.spec	6 Sep 2008 21:38:11 -0000	1.47
@@ -20,8 +20,8 @@
 %endif
 
 %if %{snapshot}
-%define date 20080724
-%define git_commit 31e46386293fd0c54c99328eee3cfe7b49584f9d
+%define date 20080906
+%define git_commit f1c6cc865d8d0703478c3eedea2e706e911f9965
 %define alphatag .%{date}git
 %define tarball %{tarname}-%{version}-%{date}git
 %define ship_utils 1
@@ -33,7 +33,7 @@
 Summary:       Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets
 Name:          xorg-x11-drv-radeonhd
 Version:       1.2.1
-Release:       3.7%{?alphatag}%{?dist}
+Release:       3.8%{?alphatag}%{?dist}
 
 License:       MIT
 Group:         User Interface/X Hardware Support
@@ -164,6 +164,11 @@
 %endif
 
 %changelog
+* Sat Sep 06 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.1-3.8.20080906git
+- New snapshot (upstream commit f1c6cc865d8d0703478c3eedea2e706e911f9965):
+  Upstream has merged their QnD and AtomBIOS branches to master a
+  few weeks time ago, so there are way too many changes to list here.
+
 * Thu Jul 24 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.1-3.7.20080724git
 - New snapshot (upstream commit 31e46386293fd0c54c99328eee3cfe7b49584f9d):
   - 31e46386: Connectors: Increase the number of available connectors to 6.



From airlied at fedoraproject.org  Sat Sep  6 21:39:18 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Sat,  6 Sep 2008 21:39:18 +0000 (UTC)
Subject: rpms/kernel/devel drm-modesetting-radeon.patch, 1.21,
	1.22 kernel.spec, 1.934, 1.935
Message-ID: <20080906213918.3A68070125@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1603

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Sun Sep 07 2008 Dave Airlie <airlied at redhat.com>
- disable radeon verbose debugging. doh.


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- drm-modesetting-radeon.patch	5 Sep 2008 06:29:56 -0000	1.21
+++ drm-modesetting-radeon.patch	6 Sep 2008 21:39:17 -0000	1.22
@@ -34080,15 +34080,6 @@
  	if ( sarea_priv->last_dispatch >= RADEON_MAX_VB_AGE ) {		\
  		int __ret = radeon_do_cp_idle( dev_priv );		\
  		if ( __ret ) return __ret;				\
-@@ -1330,7 +1488,7 @@ do {									\
-  * Ring control
-  */
- 
--#define RADEON_VERBOSE	0
-+#define RADEON_VERBOSE	1
- 
- #define RING_LOCALS	int write, _nr; unsigned int mask; u32 *ring;
- 
 @@ -1408,4 +1566,142 @@ do {									\
  	write &= mask;						\
  } while (0)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.934
retrieving revision 1.935
diff -u -r1.934 -r1.935
--- kernel.spec	6 Sep 2008 12:33:20 -0000	1.934
+++ kernel.spec	6 Sep 2008 21:39:17 -0000	1.935
@@ -1749,6 +1749,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sun Sep 07 2008 Dave Airlie <airlied at redhat.com>
+- disable radeon verbose debugging. doh.
+
 * Sat Sep 06 2008 Dave Airlie <airlied at redhat.com>
 - fix lirc on powerpc64 - its Saturday goddamit.
 



From spot at fedoraproject.org  Sat Sep  6 21:41:03 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 21:41:03 +0000 (UTC)
Subject: rpms/xemacs-packages-extra/devel xemacs-packages-extra.spec, 1.5,
	1.6
Message-ID: <20080906214103.6A1DD70125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xemacs-packages-extra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2757

Modified Files:
	xemacs-packages-extra.spec 
Log Message:
fix license tag


Index: xemacs-packages-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/devel/xemacs-packages-extra.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xemacs-packages-extra.spec	18 Jun 2008 20:48:50 -0000	1.5
+++ xemacs-packages-extra.spec	6 Sep 2008 21:40:33 -0000	1.6
@@ -3,11 +3,11 @@
 
 Name:           xemacs-packages-extra
 Version:        20070427
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Collection of XEmacs lisp packages
 
 Group:          Applications/Editors
-License:        GPL
+License:        GPLv2+
 URL:            http://www.xemacs.org/Documentation/packageGuide.html
 # Tarball created with Source99
 Source0:        %{name}-%{version}.tar.bz2
@@ -234,6 +234,9 @@
 
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 20070427-3
+- fix license tag
+
 * Wed Jun 18 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20070427-2
 - Apply upstream security fix for CVE-2008-2142 (#446069).
 



From spot at fedoraproject.org  Sat Sep  6 21:42:48 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 21:42:48 +0000 (UTC)
Subject: rpms/xl2tpd/devel xl2tpd.spec,1.13,1.14
Message-ID: <20080906214248.8A10D70125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xl2tpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3455

Modified Files:
	xl2tpd.spec 
Log Message:
fix license tag


Index: xl2tpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xl2tpd/devel/xl2tpd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xl2tpd.spec	19 Feb 2008 20:17:37 -0000	1.13
+++ xl2tpd.spec	6 Sep 2008 21:42:18 -0000	1.14
@@ -1,8 +1,9 @@
 Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
 Name: xl2tpd
 Version: 1.1.12
-Release: 2%{?dist}
-License: GPL
+Release: 3%{?dist}
+# No version specified.
+License: GPL+
 Url: http://www.xelerance.com/software/xl2tpd/
 Group: System Environment/Daemons
 Source0: http://www.xelerance.com/software/xl2tpd/xl2tpd-%{version}.tar.gz
@@ -76,6 +77,9 @@
 %dir %{_localstatedir}/run/xl2tpd
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.1.12-3
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1.12-2
 - Autorebuild for GCC 4.3
 



From airlied at fedoraproject.org  Sat Sep  6 21:48:08 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Sat,  6 Sep 2008 21:48:08 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-fix-pipe-config.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.108, 1.109
Message-ID: <20080906214808.F12CB70125@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-serv5178

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-fix-pipe-config.patch 
Log Message:
* Fri Sep 05 2008 Dave Airlie <airlied at redhat.com> 6.9.0-9
- add fix for pipe register emits on r300


radeon-fix-pipe-config.patch:

--- NEW FILE radeon-fix-pipe-config.patch ---
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index 30a5756..ef8b4a5 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -440,7 +440,8 @@ void RADEONEngineInit(ScrnInfoPtr pScrn)
 	    
 	    OUTREG(R300_GB_TILE_CONFIG, gb_tile_config);
 	    OUTREG(RADEON_WAIT_UNTIL, RADEON_WAIT_2D_IDLECLEAN | RADEON_WAIT_3D_IDLECLEAN);
-	    OUTREG(R300_DST_PIPE_CONFIG, INREG(R300_DST_PIPE_CONFIG) | R300_PIPE_AUTO_CONFIG);
+	    if (info->ChipFamily >= CHIP_FAMILY_R420)
+	    	OUTREG(R300_DST_PIPE_CONFIG, INREG(R300_DST_PIPE_CONFIG) | R300_PIPE_AUTO_CONFIG);
 	    OUTREG(R300_RB2D_DSTCACHE_MODE, (INREG(R300_RB2D_DSTCACHE_MODE) |
 					     R300_DC_AUTOFLUSH_ENABLE |
 					     R300_DC_DC_DISABLE_IGNORE_PE));
diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
index 15a3beb..aab42d0 100644
--- a/src/radeon_commonfuncs.c
+++ b/src/radeon_commonfuncs.c
@@ -61,6 +61,7 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
     info->texW[0] = info->texH[0] = info->texW[1] = info->texH[1] = 1;
 
     if (IS_R300_3D || IS_R500_3D) {
+	int size;
 
 	if (!info->new_cs) {
 	    BEGIN_ACCEL(3);
@@ -80,10 +81,12 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
 	case 1: gb_tile_config |= R300_PIPE_COUNT_RV350; break;
 	}
 
-	BEGIN_ACCEL(5);
+	size = (info->ChipFamily >= CHIP_FAMILY_R420) ? 5 : 4;
+	BEGIN_ACCEL(size);
 	OUT_ACCEL_REG(R300_GB_TILE_CONFIG, gb_tile_config);
 	OUT_ACCEL_REG(RADEON_WAIT_UNTIL, RADEON_WAIT_2D_IDLECLEAN | RADEON_WAIT_3D_IDLECLEAN);
-	OUT_ACCEL_REG(R300_DST_PIPE_CONFIG, R300_PIPE_AUTO_CONFIG);
+	if (info->ChipFamily >= CHIP_FAMILY_R420)
+	    OUT_ACCEL_REG(R300_DST_PIPE_CONFIG, R300_PIPE_AUTO_CONFIG);
 	OUT_ACCEL_REG(R300_GB_SELECT, 0);
 	OUT_ACCEL_REG(R300_GB_ENABLE, 0);
 	FINISH_ACCEL();


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.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- xorg-x11-drv-ati.spec	5 Sep 2008 06:35:27 -0000	1.108
+++ xorg-x11-drv-ati.spec	6 Sep 2008 21:47:38 -0000	1.109
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -17,6 +17,7 @@
 Patch0:	    radeon-6.9.0-to-git.patch
 Patch1:     radeon-modeset.patch
 Patch2:     radeon-suspend-fix.patch
+Patch3:	    radeon-fix-pipe-config.patch
 
 ExcludeArch: s390 s390x
 
@@ -38,6 +39,7 @@
 %patch0 -p1 -b .git
 %patch1 -p1 -b .modeset
 %patch2 -p1 -b .suspend
+%patch3 -p1 -b .pipe-config
 
 %build
 autoreconf
@@ -69,6 +71,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Sep 05 2008 Dave Airlie <airlied at redhat.com> 6.9.0-9
+- add fix for pipe register emits on r300
+
 * Fri Sep 05 2008 Dave Airlie <airlied at redhat.com> 6.9.0-8
 - fix suspend/resume support - needs new pinning API
 



From spot at fedoraproject.org  Sat Sep  6 21:48:42 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 21:48:42 +0000 (UTC)
Subject: rpms/xmlrpc-c/devel xmlrpc-c.spec,1.29,1.30
Message-ID: <20080906214842.D54F270125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xmlrpc-c/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5381

Modified Files:
	xmlrpc-c.spec 
Log Message:
fix license tag


Index: xmlrpc-c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlrpc-c/devel/xmlrpc-c.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xmlrpc-c.spec	21 Jun 2008 14:26:59 -0000	1.29
+++ xmlrpc-c.spec	6 Sep 2008 21:48:12 -0000	1.30
@@ -5,8 +5,10 @@
 Summary:	A lightweight RPC library based on XML and HTTP
 Name:		xmlrpc-c
 Version:	1.14.8
-Release:	%release_func 1
-License:	BSD/PSF -- see COPYING
+Release:	%release_func 2
+# See COPYING for details.
+# The Python 1.5.2 license used by a few files is just BSD.
+License:	BSD and MIT
 Group:		System Environment/Libraries
 URL:	 	http://xmlrpc-c.sourceforge.net/
 %{!?advanced_branch:Source0:	http://dl.sourceforge.net/sourceforge/xmlrpc-c/xmlrpc-%version.tgz}
@@ -124,6 +126,9 @@
 
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.14.8-2
+- fix license tag
+
 * Sat Jun 21 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.14.8-1
 - updated to 1.14.8
 



From spot at fedoraproject.org  Sat Sep  6 21:52:57 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 21:52:57 +0000 (UTC)
Subject: rpms/xpp3/devel xpp3.spec,1.1,1.2
Message-ID: <20080906215257.B877670125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xpp3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6791

Modified Files:
	xpp3.spec 
Log Message:
fix license tag


Index: xpp3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpp3/devel/xpp3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xpp3.spec	12 Mar 2007 16:27:11 -0000	1.1
+++ xpp3.spec	6 Sep 2008 21:52:27 -0000	1.2
@@ -33,9 +33,9 @@
 Summary:        XML Pull Parser
 Name:           xpp3
 Version:        1.1.3.8
-Release:        1jpp.1%{?dist}
+Release:        1.2%{?dist}
 Epoch:          0
-License:        Apache-style
+License:        ASL 1.1 
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html
 Group:          Text Processing/Markup/XML
 Source0:        http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz
@@ -131,6 +131,10 @@
 %doc %{_javadocdir}/*
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:1.1.3.8-1.2
+- fix license tag
+- drop jpp tag
+
 * Mon Feb 12 2007 Fernando Nasser <fnasser at redhat.com> - 0:1.1.3.8-1jpp.1
 - Import
 - Fix per Fedora spec



From spot at fedoraproject.org  Sat Sep  6 22:02:26 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat,  6 Sep 2008 22:02:26 +0000 (UTC)
Subject: rpms/yasm/devel yasm.spec,1.17,1.18
Message-ID: <20080906220226.BE8B370125@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/yasm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9786

Modified Files:
	yasm.spec 
Log Message:
fix license tag


Index: yasm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yasm/devel/yasm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- yasm.spec	21 May 2008 09:04:49 -0000	1.17
+++ yasm.spec	6 Sep 2008 22:01:56 -0000	1.18
@@ -1,9 +1,9 @@
 Summary: Complete rewrite of the NASM assembler
 Name: yasm
 Version: 0.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 # See COPYING for the detail, there is quite a lot!
-License: BSD and (Artistic or GPLv2+ or LGPLv2+) and LGPLv2
+License: BSD and (GPLv2+ or Artistic or LGPLv2+) and LGPLv2
 Group: Development/Languages
 URL: http://www.tortall.net/projects/yasm/
 Source: http://www.tortall.net/projects/yasm/releases/yasm-%{version}.tar.gz
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.7.1-2
+- fix license tag so that it doesn't trigger a false positive on the check script
+
 * Tue May 20 2008 Matthias Saou <http://freshrpms.net/> 0.7.1-1
 - Update to 0.7.1.
 



From walters at fedoraproject.org  Sat Sep  6 22:13:52 2008
From: walters at fedoraproject.org (Colin Walters)
Date: Sat,  6 Sep 2008 22:13:52 +0000 (UTC)
Subject: rpms/jna/devel jna-3.0.4-structure-handle-null.patch, NONE,
	1.1 jna-3.0.4-structure-reason.patch, NONE, 1.1 jna.spec, 1.5, 1.6
Message-ID: <20080906221352.73E8170125@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/jna/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13135

Modified Files:
	jna.spec 
Added Files:
	jna-3.0.4-structure-handle-null.patch 
	jna-3.0.4-structure-reason.patch 
Log Message:
* Sat Sep 06 2008 Colin Walters <walters at redhat.com> - 3.0.4-3.svn630
- A few more patches for JGIR


jna-3.0.4-structure-handle-null.patch:

--- NEW FILE jna-3.0.4-structure-handle-null.patch ---
diff -ur jna-3.0.4-svn630/src/com/sun/jna/Structure.java jna-3.0.4-svn630.orig/src/com/sun/jna/Structure.java
--- jna-3.0.4-svn630/src/com/sun/jna/Structure.java	2008-09-05 21:49:16.000000000 -0400
+++ jna-3.0.4-svn630.orig/src/com/sun/jna/Structure.java	2008-09-06 17:43:34.000000000 -0400
@@ -612,28 +612,28 @@
 
         // Set the value at the offset according to its type
         if (nativeType == boolean.class || nativeType == Boolean.class) {
-            memory.setInt(offset, Boolean.TRUE.equals(value) ? -1 : 0);
+            memory.setInt(offset, (value != null && Boolean.TRUE.equals(value)) ? -1 : 0);
         }
         else if (nativeType == byte.class || nativeType == Byte.class) {
-            memory.setByte(offset, ((Byte)value).byteValue());
+            memory.setByte(offset, value != null ? ((Byte)value).byteValue() : 0);
         }
         else if (nativeType == short.class || nativeType == Short.class) {
-            memory.setShort(offset, ((Short)value).shortValue());
+            memory.setShort(offset, value != null ? ((Short)value).shortValue() : 0);
         }
         else if (nativeType == char.class || nativeType == Character.class) {
-            memory.setChar(offset, ((Character)value).charValue());
+            memory.setChar(offset, value != null ? ((Character)value).charValue() : '\0');
         }
         else if (nativeType == int.class || nativeType == Integer.class) {
-            memory.setInt(offset, ((Integer)value).intValue());
+            memory.setInt(offset, value != null ? ((Integer)value).intValue() : 0);
         }
         else if (nativeType == long.class || nativeType == Long.class) {
-            memory.setLong(offset, ((Long)value).longValue());
+            memory.setLong(offset, value != null ? ((Long)value).longValue() : 0);
         }
         else if (nativeType == float.class || nativeType == Float.class) {
-            memory.setFloat(offset, ((Float)value).floatValue());
+            memory.setFloat(offset, value != null ? ((Float)value).floatValue() : 0.0f);
         }
         else if (nativeType == double.class || nativeType == Double.class) {
-            memory.setDouble(offset, ((Double)value).doubleValue());
+            memory.setDouble(offset, value != null ? ((Double)value).doubleValue() : 0.0);
         }
         else if (nativeType == Pointer.class) {
             memory.setPointer(offset, (Pointer)value);

jna-3.0.4-structure-reason.patch:

--- NEW FILE jna-3.0.4-structure-reason.patch ---
diff -ur jna-3.0.4-svn630/src/com/sun/jna/Structure.java jna-3.0.4-svn630.orig/src/com/sun/jna/Structure.java
--- jna-3.0.4-svn630/src/com/sun/jna/Structure.java	2008-07-31 13:44:21.000000000 -0400
+++ jna-3.0.4-svn630.orig/src/com/sun/jna/Structure.java	2008-09-05 21:47:51.000000000 -0400
@@ -126,8 +126,16 @@
     }
 
     protected Structure(int size, int alignment) {
+	this(size, alignment, null);
+    }
+
+    protected Structure(TypeMapper mapper) {
+	this(CALCULATE_SIZE, ALIGN_DEFAULT, mapper);
+    }
+
+    protected Structure(int size, int alignment, TypeMapper mapper) {
         setAlignType(alignment);
-        setTypeMapper(null);
+        setTypeMapper(mapper);
         allocateMemory(size);
     }
 
@@ -974,7 +982,8 @@
         }
         catch(IllegalArgumentException e) {
             throw new IllegalArgumentException("The type \"" + type.getName()
-                                               + "\" is not supported as a structure field");
+                                               + "\" is not supported as a structure field: "
+					       + e.getMessage());
         }
     }
 
diff -ur jna-3.0.4-svn630/src/com/sun/jna/Union.java jna-3.0.4-svn630.orig/src/com/sun/jna/Union.java
--- jna-3.0.4-svn630/src/com/sun/jna/Union.java	2008-07-31 13:44:21.000000000 -0400
+++ jna-3.0.4-svn630.orig/src/com/sun/jna/Union.java	2008-09-05 21:47:18.000000000 -0400
@@ -39,6 +39,11 @@
     protected Union(int size, int alignType) {
         super(size, alignType);
     }
+
+    protected Union(TypeMapper mapper) {
+	super(mapper);
+    }
+
     /** Indicates which field will be used to write to native memory. 
      * @throws IllegalArgumentException if the type does not correspond to 
      * any declared union field.


Index: jna.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jna/devel/jna.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jna.spec	4 Sep 2008 19:00:45 -0000	1.5
+++ jna.spec	6 Sep 2008 22:13:22 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           jna
 Version:        3.0.4
-Release:        2.svn630%{?dist}
+Release:        3.svn630%{?dist}
 Summary:        Pure Java access to native libraries
 
 Group:          Development/Libraries
@@ -18,8 +18,12 @@
 Patch2:         jna-3.0.4-nomixedjar.patch
 # https://jna.dev.java.net/issues/show_bug.cgi?id=84
 Patch3:         jna-3.0.4-callbacks-typemappers.patch
-# https://jna.dev.java.net/issues/show_bug.cgi?id=XXX
+# https://jna.dev.java.net/issues/show_bug.cgi?id=85
 Patch4:         jna-3.0.4-callbacks-methodname.patch
+# https://jna.dev.java.net/issues/show_bug.cgi?id=86
+Patch5:         jna-3.0.4-structure-reason.patch 
+# https://jna.dev.java.net/issues/show_bug.cgi?id=87
+Patch6:         jna-3.0.4-structure-handle-null.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  java-devel >= 1.6 ant jpackage-utils ant-nodeps
@@ -53,6 +57,8 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 # all java binaries must be removed from the sources
 find . -name '*.jar' -exec rm -f '{}' \;
@@ -109,6 +115,9 @@
 
 
 %changelog
+* Sat Sep 06 2008 Colin Walters <walters at redhat.com> - 3.0.4-3.svn630
+- A few more patches for JGIR
+
 * Thu Sep 04 2008 Colin Walters <walters at redhat.com> - 3.0.4-2.svn630
 - Add two (sent upstream) patches that I need for JGIR
 



From cweyl at fedoraproject.org  Sat Sep  6 22:22:04 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  6 Sep 2008 22:22:04 +0000 (UTC)
Subject: rpms/perl-Moose/devel perl-Moose.spec,1.25,1.26
Message-ID: <20080906222204.E6A2F70125@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15889

Modified Files:
	perl-Moose.spec 
Log Message:
* Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.57-2
- add additional test BR's



Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- perl-Moose.spec	6 Sep 2008 19:45:30 -0000	1.25
+++ perl-Moose.spec	6 Sep 2008 22:21:34 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           perl-Moose
 Version:        0.57
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -45,6 +45,9 @@
 BuildRequires:  perl(Declare::Constraints::Simple)
 # optional test #8 (as of 0.20)
 BuildRequires:  perl(Module::Refresh)
+# optional tests #9 (as of 0.57)
+BuildRequires:  perl(Test::Warn)
+BuildRequires:  perl(Test::Output)
 
 
 %description
@@ -109,6 +112,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.57-2
+- add additional test BR's
+
 * Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.57-1
 - update to 0.57
 



From cweyl at fedoraproject.org  Sat Sep  6 23:27:19 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  6 Sep 2008 23:27:19 +0000 (UTC)
Subject: rpms/perl-MooseX-AttributeHelpers/devel .cvsignore, 1.5,
	1.6 perl-MooseX-AttributeHelpers.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20080906232720.03F2870125@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-AttributeHelpers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3008

Modified Files:
	.cvsignore perl-MooseX-AttributeHelpers.spec sources 
Log Message:
* Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
- update to 0.13
- note BR on Moose is now at 0.56 and is not optional :)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Jul 2008 01:01:46 -0000	1.5
+++ .cvsignore	6 Sep 2008 23:26:49 -0000	1.6
@@ -1 +1 @@
-MooseX-AttributeHelpers-0.12.tar.gz
+MooseX-AttributeHelpers-0.13.tar.gz


Index: perl-MooseX-AttributeHelpers.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/devel/perl-MooseX-AttributeHelpers.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-MooseX-AttributeHelpers.spec	1 Jul 2008 03:24:25 -0000	1.7
+++ perl-MooseX-AttributeHelpers.spec	6 Sep 2008 23:26:49 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-AttributeHelpers
-Version:        0.12
-Release:        2%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        Extended Moose attribute interfaces
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -11,7 +11,7 @@
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Moose)           >= 0.45
+BuildRequires:  perl(Moose)           >= 0.56
 BuildRequires:  perl(Test::Exception) >= 0.21
 BuildRequires:  perl(Test::More)      >= 0.62
 # optional tests
@@ -64,6 +64,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
+- update to 0.13
+- note BR on Moose is now at 0.56 and is not optional :)
+
 * Mon Jun 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.12-2
 - ...and fix filtering.  heh.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Jul 2008 01:01:46 -0000	1.5
+++ sources	6 Sep 2008 23:26:49 -0000	1.6
@@ -1 +1 @@
-c9dafb95089f40957d6bc99839de107f  MooseX-AttributeHelpers-0.12.tar.gz
+9c19d0960987967ab2c398307e8b4a09  MooseX-AttributeHelpers-0.13.tar.gz



From pkgdb at fedoraproject.org  Sat Sep  6 23:45:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:45:22 +0000
Subject: [pkgdb] akode: tuxbrewr has requested watchbugzilla
Message-ID: <20080906234522.B97CC20876D@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on akode (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akode



From pkgdb at fedoraproject.org  Sat Sep  6 23:45:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:45:29 +0000
Subject: [pkgdb] akode: tuxbrewr has requested watchcommits
Message-ID: <20080906234529.9A522208770@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on akode (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akode



From pkgdb at fedoraproject.org  Sat Sep  6 23:45:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:45:44 +0000
Subject: [pkgdb] akode: tuxbrewr has requested watchbugzilla
Message-ID: <20080906234544.222C5208771@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on akode (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akode



From pkgdb at fedoraproject.org  Sat Sep  6 23:45:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:45:46 +0000
Subject: [pkgdb] akode: tuxbrewr has requested watchcommits
Message-ID: <20080906234546.9554020876F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on akode (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akode



From pkgdb at fedoraproject.org  Sat Sep  6 23:48:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:48:33 +0000
Subject: [pkgdb] amarok: tuxbrewr has requested watchbugzilla
Message-ID: <20080906234833.88FAF20876D@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on amarok (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From pkgdb at fedoraproject.org  Sat Sep  6 23:48:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:48:48 +0000
Subject: [pkgdb] amarok: tuxbrewr has requested watchbugzilla
Message-ID: <20080906234848.6422F20876F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on amarok (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From pkgdb at fedoraproject.org  Sat Sep  6 23:50:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:50:14 +0000
Subject: [pkgdb] arts: tuxbrewr has requested watchbugzilla
Message-ID: <20080906235015.3620C20876F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on arts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arts



From pkgdb at fedoraproject.org  Sat Sep  6 23:50:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:50:22 +0000
Subject: [pkgdb] arts: tuxbrewr has requested watchcommits
Message-ID: <20080906235022.3BC38208D0F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on arts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arts



From pkgdb at fedoraproject.org  Sat Sep  6 23:50:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:50:24 +0000
Subject: [pkgdb] arts: tuxbrewr has requested watchbugzilla
Message-ID: <20080906235024.2B07B208D9A@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on arts (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arts



From pkgdb at fedoraproject.org  Sat Sep  6 23:50:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:50:31 +0000
Subject: [pkgdb] arts: tuxbrewr has requested watchcommits
Message-ID: <20080906235031.80DBD208770@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on arts (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arts



From pkgdb at fedoraproject.org  Sat Sep  6 23:57:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:57:35 +0000
Subject: [pkgdb] digikam: tuxbrewr has requested watchbugzilla
Message-ID: <20080906235735.CFDC520876D@bastion.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  Sat Sep  6 23:57:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:57:39 +0000
Subject: [pkgdb] digikam: tuxbrewr has requested watchcommits
Message-ID: <20080906235739.39C13208771@bastion.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  Sat Sep  6 23:57:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:57:47 +0000
Subject: [pkgdb] digikam: tuxbrewr has requested watchbugzilla
Message-ID: <20080906235747.B138A20876D@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on digikam (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Sat Sep  6 23:58:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:58:59 +0000
Subject: [pkgdb] digikamimageplugins: tuxbrewr has requested watchbugzilla
Message-ID: <20080906235859.F2A5920876E@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on digikamimageplugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/digikamimageplugins



From pkgdb at fedoraproject.org  Sat Sep  6 23:59:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:59:01 +0000
Subject: [pkgdb] digikamimageplugins: tuxbrewr has requested watchcommits
Message-ID: <20080906235901.98DFF208771@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on digikamimageplugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/digikamimageplugins



From pkgdb at fedoraproject.org  Sat Sep  6 23:59:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:59:06 +0000
Subject: [pkgdb] digikamimageplugins: tuxbrewr has requested watchcommits
Message-ID: <20080906235906.4EA21208D1E@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on digikamimageplugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/digikamimageplugins



From pkgdb at fedoraproject.org  Sat Sep  6 23:59:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:59:10 +0000
Subject: [pkgdb] digikamimageplugins: tuxbrewr has requested watchbugzilla
Message-ID: <20080906235911.1EE65208D97@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on digikamimageplugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/digikamimageplugins



From pkgdb at fedoraproject.org  Sat Sep  6 23:59:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:59:54 +0000
Subject: [pkgdb] dragonplayer: tuxbrewr has requested watchbugzilla
Message-ID: <20080906235954.AED00208770@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on dragonplayer (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dragonplayer



From pkgdb at fedoraproject.org  Sat Sep  6 23:59:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:59:57 +0000
Subject: [pkgdb] dragonplayer: tuxbrewr has requested watchcommits
Message-ID: <20080906235957.D8AC5208D98@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on dragonplayer (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dragonplayer



From pkgdb at fedoraproject.org  Sun Sep  7 00:00:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 00:00:08 +0000
Subject: [pkgdb] dragonplayer: tuxbrewr has requested watchbugzilla
Message-ID: <20080907000009.0B19A208D9E@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on dragonplayer (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dragonplayer



From pkgdb at fedoraproject.org  Sun Sep  7 00:00:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 00:00:15 +0000
Subject: [pkgdb] dragonplayer: tuxbrewr has requested watchcommits
Message-ID: <20080907000015.D1B9A208770@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on dragonplayer (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dragonplayer



From pkgdb at fedoraproject.org  Sun Sep  7 00:00:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 00:00:40 +0000
Subject: [pkgdb] extragear-plasma: tuxbrewr has requested watchbugzilla
Message-ID: <20080907000040.D9F05208D0F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on extragear-plasma (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/extragear-plasma



From pkgdb at fedoraproject.org  Sun Sep  7 00:00:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 00:00:45 +0000
Subject: [pkgdb] extragear-plasma: tuxbrewr has requested watchcommits
Message-ID: <20080907000045.50E65208D9A@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on extragear-plasma (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/extragear-plasma



From pkgdb at fedoraproject.org  Sun Sep  7 00:00:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 00:00:51 +0000
Subject: [pkgdb] extragear-plasma: tuxbrewr has requested watchbugzilla
Message-ID: <20080907000051.4C369208D9F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on extragear-plasma (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/extragear-plasma



From pkgdb at fedoraproject.org  Sun Sep  7 00:00:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 00:00:55 +0000
Subject: [pkgdb] extragear-plasma: tuxbrewr has requested watchcommits
Message-ID: <20080907000055.20AAC208DAB@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on extragear-plasma (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/extragear-plasma



From pkgdb at fedoraproject.org  Sat Sep  6 23:57:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 06 Sep 2008 23:57:51 +0000
Subject: [pkgdb] digikam: tuxbrewr has requested watchcommits
Message-ID: <20080906235751.7CBDE208D1E@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on digikam (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From belegdol at fedoraproject.org  Sun Sep  7 00:18:08 2008
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Sun,  7 Sep 2008 00:18:08 +0000 (UTC)
Subject: rpms/goffice/devel .cvsignore, 1.8, 1.9 goffice.spec, 1.18,
	1.19 sources, 1.8, 1.9
Message-ID: <20080907001808.3D48770126@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/goffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18633

Modified Files:
	.cvsignore goffice.spec sources 
Log Message:
* Sun Sep  7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.6.5-1
- Updated to 0.6.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Aug 2008 09:45:39 -0000	1.8
+++ .cvsignore	7 Sep 2008 00:17:37 -0000	1.9
@@ -1 +1 @@
-goffice-0.6.4.tar.bz2
+goffice-0.6.5.tar.bz2


Index: goffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/devel/goffice.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- goffice.spec	27 Aug 2008 09:45:39 -0000	1.18
+++ goffice.spec	7 Sep 2008 00:17:37 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           goffice         
-Version:        0.6.4
+Version:        0.6.5
 Release:        1%{?dist}
 Summary:        Goffice support libraries
 Group:          System Environment/Libraries
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.6.5-1
+- Updated to 0.6.5
+
 * Wed Aug 27 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.6.4-1
 - Updated to 0.6.4
 - BuildRequires: pcre-devel only on Fedora < 9


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Aug 2008 09:45:39 -0000	1.8
+++ sources	7 Sep 2008 00:17:37 -0000	1.9
@@ -1 +1 @@
-21a02662eda3812a551bd5bf2d95dbbf  goffice-0.6.4.tar.bz2
+ab0cf11995b7750f26112669cedf6707  goffice-0.6.5.tar.bz2



From belegdol at fedoraproject.org  Sun Sep  7 00:32:08 2008
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Sun,  7 Sep 2008 00:32:08 +0000 (UTC)
Subject: rpms/goffice/devel goffice.spec,1.19,1.20
Message-ID: <20080907003208.AEAF070126@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/goffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23116

Modified Files:
	goffice.spec 
Log Message:
Updated gtk docs location


Index: goffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/devel/goffice.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- goffice.spec	7 Sep 2008 00:17:37 -0000	1.19
+++ goffice.spec	7 Sep 2008 00:31:38 -0000	1.20
@@ -73,12 +73,13 @@
 %{_includedir}/libgoffice-0.6/
 %{_libdir}/pkgconfig/libgoffice-0.6.pc
 %{_libdir}/*.so
-%{_datadir}/gtk-doc/html/goffice/
+%{_datadir}/gtk-doc/html/goffice-0.6/
 
 
 %changelog
 * Sun Sep  7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.6.5-1
 - Updated to 0.6.5
+- Development docs are now in goffice-0.6
 
 * Wed Aug 27 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.6.4-1
 - Updated to 0.6.4



From jwilson at fedoraproject.org  Sun Sep  7 01:51:24 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Sun,  7 Sep 2008 01:51:24 +0000 (UTC)
Subject: rpms/rrdtool/devel .cvsignore, 1.28, 1.29 rrdtool.spec, 1.68,
	1.69 sources, 1.31, 1.32
Message-ID: <20080907015124.70BEF70126@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/rrdtool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13416

Modified Files:
	.cvsignore rrdtool.spec sources 
Log Message:
* Sat Sep 06 2008 Jarod Wilson <jwilson at redhat.com> 1.3.2-1
- Update to rrdtool 1.3.2
  * fixes a data corruption bug when rrd wraps around
  * make imginfo behave the same as docs say it does
  * fixes for numerous memory leaks



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	12 Aug 2008 13:37:26 -0000	1.28
+++ .cvsignore	7 Sep 2008 01:50:54 -0000	1.29
@@ -1,3 +1,4 @@
 php4-r1190.tar.gz
 rrdtool-1.3.0.tar.gz
 rrdtool-1.3.1.tar.gz
+rrdtool-1.3.2.tar.gz


Index: rrdtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/rrdtool.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- rrdtool.spec	12 Aug 2008 13:37:26 -0000	1.68
+++ rrdtool.spec	7 Sep 2008 01:50:54 -0000	1.69
@@ -8,7 +8,7 @@
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.3.1
+Version: 1.3.2
 Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Databases
@@ -327,6 +327,12 @@
 %endif
 
 %changelog
+* Sat Sep 06 2008 Jarod Wilson <jwilson at redhat.com> 1.3.2-1
+- Update to rrdtool 1.3.2
+  * fixes a data corruption bug when rrd wraps around
+  * make imginfo behave the same as docs say it does
+  * fixes for numerous memory leaks
+
 * Tue Aug 12 2008 Jarod Wilson <jwilson at redhat.com> 1.3.1-1
 - Update to rrdtool 1.3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	12 Aug 2008 13:37:26 -0000	1.31
+++ sources	7 Sep 2008 01:50:54 -0000	1.32
@@ -1,2 +1,2 @@
 28074a9c368af013462631959ab90558  php4-r1190.tar.gz
-ae0eb2465581574ed6355d378c96a17e  rrdtool-1.3.1.tar.gz
+c3ace16b360547fe2de1bef8390a6fcc  rrdtool-1.3.2.tar.gz



From jwilson at fedoraproject.org  Sun Sep  7 02:37:43 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Sun,  7 Sep 2008 02:37:43 +0000 (UTC)
Subject: rpms/rrdtool/F-9 .cvsignore, 1.24, 1.25 rrdtool.spec, 1.64,
	1.65 sources, 1.27, 1.28
Message-ID: <20080907023743.9A83870126@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/rrdtool/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26129

Modified Files:
	.cvsignore rrdtool.spec sources 
Log Message:
* Sat Sep 06 2008 Jarod Wilson <jwilson at redhat.com> 1.3.2-1
- Update to rrdtool 1.3.2
  * fixes a data corruption bug when rrd wraps around
  * make imginfo behave the same as docs say it does
  * fixes for numerous memory leaks



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-9/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	26 Aug 2008 18:37:31 -0000	1.24
+++ .cvsignore	7 Sep 2008 02:37:13 -0000	1.25
@@ -1,3 +1,4 @@
 php4-r1190.tar.gz
 rrdtool-1.3.0.tar.gz
 rrdtool-1.3.1.tar.gz
+rrdtool-1.3.2.tar.gz


Index: rrdtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-9/rrdtool.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- rrdtool.spec	26 Aug 2008 18:37:31 -0000	1.64
+++ rrdtool.spec	7 Sep 2008 02:37:13 -0000	1.65
@@ -8,7 +8,7 @@
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.3.1
+Version: 1.3.2
 Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Databases
@@ -327,6 +327,12 @@
 %endif
 
 %changelog
+* Sat Sep 06 2008 Jarod Wilson <jwilson at redhat.com> 1.3.2-1
+- Update to rrdtool 1.3.2
+  * fixes a data corruption bug when rrd wraps around
+  * make imginfo behave the same as docs say it does
+  * fixes for numerous memory leaks
+
 * Tue Aug 12 2008 Jarod Wilson <jwilson at redhat.com> 1.3.1-1
 - Update to rrdtool 1.3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-9/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	26 Aug 2008 18:37:31 -0000	1.27
+++ sources	7 Sep 2008 02:37:13 -0000	1.28
@@ -1,2 +1,2 @@
 28074a9c368af013462631959ab90558  php4-r1190.tar.gz
-ae0eb2465581574ed6355d378c96a17e  rrdtool-1.3.1.tar.gz
+c3ace16b360547fe2de1bef8390a6fcc  rrdtool-1.3.2.tar.gz



From jwilson at fedoraproject.org  Sun Sep  7 02:50:46 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Sun,  7 Sep 2008 02:50:46 +0000 (UTC)
Subject: rpms/rrdtool/F-8 .cvsignore, 1.22, 1.23 rrdtool.spec, 1.57,
	1.58 sources, 1.27, 1.28
Message-ID: <20080907025046.2856070126@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/rrdtool/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30052

Modified Files:
	.cvsignore rrdtool.spec sources 
Log Message:
* Sat Sep 06 2008 Jarod Wilson <jwilson at redhat.com> 1.3.2-1
- Update to rrdtool 1.3.2
  * fixes a data corruption bug when rrd wraps around
  * make imginfo behave the same as docs say it does
  * fixes for numerous memory leaks



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-8/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	26 Aug 2008 19:00:02 -0000	1.22
+++ .cvsignore	7 Sep 2008 02:50:15 -0000	1.23
@@ -1,3 +1,4 @@
 php4-r1190.tar.gz
 rrdtool-1.3.0.tar.gz
 rrdtool-1.3.1.tar.gz
+rrdtool-1.3.2.tar.gz


Index: rrdtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-8/rrdtool.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- rrdtool.spec	26 Aug 2008 19:09:38 -0000	1.57
+++ rrdtool.spec	7 Sep 2008 02:50:15 -0000	1.58
@@ -8,7 +8,7 @@
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.3.1
+Version: 1.3.2
 Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Databases
@@ -300,6 +300,7 @@
 %defattr(-,root,root,-)
 %doc bindings/python/AUTHORS bindings/python/COPYING bindings/python/README
 %{python_sitearch}/rrdtoolmodule.so
+%{python_sitearch}/py_rrdtool-*.egg-info
 %endif
 
 %if %{with_php}
@@ -326,6 +327,12 @@
 %endif
 
 %changelog
+* Sat Sep 06 2008 Jarod Wilson <jwilson at redhat.com> 1.3.2-1
+- Update to rrdtool 1.3.2
+  * fixes a data corruption bug when rrd wraps around
+  * make imginfo behave the same as docs say it does
+  * fixes for numerous memory leaks
+
 * Tue Aug 12 2008 Jarod Wilson <jwilson at redhat.com> 1.3.1-1
 - Update to rrdtool 1.3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-8/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	26 Aug 2008 19:00:03 -0000	1.27
+++ sources	7 Sep 2008 02:50:15 -0000	1.28
@@ -1,2 +1,2 @@
 28074a9c368af013462631959ab90558  php4-r1190.tar.gz
-ae0eb2465581574ed6355d378c96a17e  rrdtool-1.3.1.tar.gz
+c3ace16b360547fe2de1bef8390a6fcc  rrdtool-1.3.2.tar.gz



From jwilson at fedoraproject.org  Sun Sep  7 03:01:38 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Sun,  7 Sep 2008 03:01:38 +0000 (UTC)
Subject: rpms/rrdtool/F-8 rrdtool.spec,1.58,1.59
Message-ID: <20080907030138.500F170126@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/rrdtool/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv482

Modified Files:
	rrdtool.spec 
Log Message:
keep forgetting about that damned egg...


Index: rrdtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-8/rrdtool.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- rrdtool.spec	7 Sep 2008 02:50:15 -0000	1.58
+++ rrdtool.spec	7 Sep 2008 03:01:08 -0000	1.59
@@ -300,7 +300,6 @@
 %defattr(-,root,root,-)
 %doc bindings/python/AUTHORS bindings/python/COPYING bindings/python/README
 %{python_sitearch}/rrdtoolmodule.so
-%{python_sitearch}/py_rrdtool-*.egg-info
 %endif
 
 %if %{with_php}



From ssp at fedoraproject.org  Sun Sep  7 03:02:49 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Sun,  7 Sep 2008 03:02:49 +0000 (UTC)
Subject: rpms/pixman/devel .cvsignore, 1.12, 1.13 pixman.spec, 1.18,
	1.19 sources, 1.12, 1.13
Message-ID: <20080907030249.6E54570126@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/pixman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv941

Modified Files:
	.cvsignore pixman.spec sources 
Log Message:
Upgrade to 0.11.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Jul 2008 20:47:22 -0000	1.12
+++ .cvsignore	7 Sep 2008 03:02:19 -0000	1.13
@@ -4,3 +4,4 @@
 pixman-0.11.4.tar.gz
 pixman-0.11.6.tar.gz
 pixman-0.11.8.tar.gz
+pixman-0.11.10.tar.gz


Index: pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/pixman.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pixman.spec	17 Jul 2008 20:47:22 -0000	1.18
+++ pixman.spec	7 Sep 2008 03:02:19 -0000	1.19
@@ -2,7 +2,7 @@
 %define gitrev 8ff7213f39edc1b2b8b60d6b0cc5d5f14ca1928d
 
 Name:           pixman
-Version:        0.11.8
+Version:        0.11.10
 Release:        1%{?dist}
 Summary:        Pixel manipulation library
 
@@ -61,6 +61,9 @@
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
+* Sat Sep 6 2008 Soren Sandmann <sandmann at redhat.com> 0.11.10-1
+- Upgrade to 0.11.10. Drop altivec patch.
+
 * Thu Jul 17 2008 Soren Sandmann <sandmann at redhat.com> 0.11.8-1
 - Upgrade to 0.11.8. Drop altivec patch.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Jul 2008 20:47:22 -0000	1.12
+++ sources	7 Sep 2008 03:02:19 -0000	1.13
@@ -1,2 +1,3 @@
 1b404bb31bf419a86531927492b5b95d  pixman-0.11.6.tar.gz
 7b5db768c51337b5e5e954fc9c961cd3  pixman-0.11.8.tar.gz
+a0406c1fa7abd3b2c61d07e7d33d27c7  pixman-0.11.10.tar.gz



From rrankin at fedoraproject.org  Sun Sep  7 03:03:37 2008
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Sun,  7 Sep 2008 03:03:37 +0000 (UTC)
Subject: rpms/gpsim/F-9 gpsim-0.22.0-gccfix.patch, NONE, 1.1 gpsim.spec, 1.17,
	1.18
Message-ID: <20080907030337.1DC6670126@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/gpsim/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv354

Modified Files:
	gpsim.spec 
Added Files:
	gpsim-0.22.0-gccfix.patch 
Log Message:
Update patch for gcc 4.3.0


gpsim-0.22.0-gccfix.patch:

--- NEW FILE gpsim-0.22.0-gccfix.patch ---
diff --git a/cli/cmd_clear.cc b/cli/cmd_clear.cc
index e9a64db..e836053 100644
--- a/cli/cmd_clear.cc
+++ b/cli/cmd_clear.cc
@@ -25,6 +25,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "command.h"
 #include "cmd_clear.h"
+#include <typeinfo>
 
 #include "../src/pic-processor.h"
 
diff --git a/cli/cmd_x.cc b/cli/cmd_x.cc
index 4ab5f88..37645a4 100644
--- a/cli/cmd_x.cc
+++ b/cli/cmd_x.cc
@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #include <iostream>
 #include <iomanip>
 #include <string>
+#include <typeinfo>
 
 
 #include "command.h"
diff --git a/gui/gui_regwin.cc b/gui/gui_regwin.cc
index fc74be5..0a2d8ae 100644
--- a/gui/gui_regwin.cc
+++ b/gui/gui_regwin.cc
@@ -19,6 +19,7 @@ along with gpsim; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#include <typeinfo>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gui/gui_src.cc b/gui/gui_src.cc
index 5e569a0..adcbd0e 100644
--- a/gui/gui_src.cc
+++ b/gui/gui_src.cc
@@ -19,6 +19,8 @@ along with gpsim; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#include <typeinfo>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/gui/gui_stack.cc b/gui/gui_stack.cc
index b318a85..2428615 100644
--- a/gui/gui_stack.cc
+++ b/gui/gui_stack.cc
@@ -19,6 +19,8 @@ along with gpsim; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#include <typeinfo>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/gui/gui_symbols.cc b/gui/gui_symbols.cc
index 303233c..f0cc1d2 100644
--- a/gui/gui_symbols.cc
+++ b/gui/gui_symbols.cc
@@ -19,6 +19,8 @@ along with gpsim; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#include <typeinfo>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/gui/settings_exdbm.cc b/gui/settings_exdbm.cc
index d5e3399..e2e3c3c 100644
--- a/gui/settings_exdbm.cc
+++ b/gui/settings_exdbm.cc
@@ -19,6 +19,7 @@ along with gpsim; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#include <stdlib.h>
 #include "settings_exdbm.h"
 
 
diff --git a/modules/switch.cc b/modules/switch.cc
index 2f40394..3de822c 100644
--- a/modules/switch.cc
+++ b/modules/switch.cc
@@ -43,6 +43,7 @@ Boston, MA 02111-1307, USA.  */
 #include <assert.h>
 #include <string>
 #include <iostream>
+#include <typeinfo>
 #include <math.h>
 
 #include "../config.h"    // get the definition for HAVE_GUI
diff --git a/src/gpsim_object.cc b/src/gpsim_object.cc
index cdb2ae0..70503fc 100644
--- a/src/gpsim_object.cc
+++ b/src/gpsim_object.cc
@@ -23,6 +23,7 @@ Boston, MA 02111-1307, USA.  */
 #include <typeinfo>
 #include <stdio.h>
 #include <ctype.h>
+#include <string.h>
 #include "gpsim_object.h"
 
 //========================================================================
diff --git a/src/modules.cc b/src/modules.cc
index bef4f13..c564175 100644
--- a/src/modules.cc
+++ b/src/modules.cc
@@ -19,6 +19,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
+#include <typeinfo>
+
 #include "modules.h"
 
 #include <stdio.h>
diff --git a/src/modules.h b/src/modules.h
index 8ba2e47..05a24db 100644
--- a/src/modules.h
+++ b/src/modules.h
@@ -37,6 +37,9 @@ Boston, MA 02111-1307, USA.  */
 #include <vector>
 #include <assert.h>
 
+#include <string.h>
+#include <stdlib.h>
+
 #include "gpsim_object.h"
 #include "gpsim_classes.h"
 
diff --git a/src/operator.cc b/src/operator.cc
index 945fcc0..ecc6b2a 100644
--- a/src/operator.cc
+++ b/src/operator.cc
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <typeinfo>
 
 #include "operator.h"
 #include "errors.h"
diff --git a/src/processor.cc b/src/processor.cc
index d73b3aa..504602c 100644
--- a/src/processor.cc
+++ b/src/processor.cc
@@ -36,6 +36,7 @@ Boston, MA 02111-1307, USA.  */
 #include <iostream>
 #include <iomanip>
 #include <string>
+#include <typeinfo>
 
 #include "../config.h"
 #include "gpsim_def.h"
diff --git a/src/processor.h b/src/processor.h
index 9a67aad..2374c02 100644
--- a/src/processor.h
+++ b/src/processor.h
@@ -395,7 +395,7 @@ public:
   /// (for those processors that support interrupts), the processor is
   /// in a different 'state' then when the interrupt flag is cleared.
 
-  list<ProgramMemoryAccess *> pma_context;
+  std::list<ProgramMemoryAccess *> pma_context;
 
   /// Tracing
   /// The readTT and writeTT are TraceType objects for tracing
diff --git a/src/program_files.cc b/src/program_files.cc
index 355406b..68c0187 100644
--- a/src/program_files.cc
+++ b/src/program_files.cc
@@ -1,3 +1,4 @@
+#include <cstring>
 #include "exports.h"
 #include "program_files.h"
 #include "pic-processor.h"
diff --git a/src/symbol.cc b/src/symbol.cc
index 1b7ea17..fb29d56 100644
--- a/src/symbol.cc
+++ b/src/symbol.cc
@@ -34,6 +34,7 @@ Boston, MA 02111-1307, USA.  */
 #include <string>
 #include <vector>
 #include <algorithm>
+#include <typeinfo>
 
 #include "../config.h"
 #include "14bit-processors.h"
diff --git a/src/value.cc b/src/value.cc
index 0cbfd51..5f5477f 100644
--- a/src/value.cc
+++ b/src/value.cc
@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #include <stdio.h>
 #include <iostream>
 #include <iomanip>
+#include <typeinfo>
 
 #include "processor.h"
 
diff --git a/src/value.h b/src/value.h
index 922365a..cb91063 100644
--- a/src/value.h
+++ b/src/value.h
@@ -23,6 +23,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "gpsim_object.h"
 #include <glib.h>
+#include <string.h>
 
 class Processor;
 class Module;


Index: gpsim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsim/F-9/gpsim.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gpsim.spec	19 Feb 2008 01:36:17 -0000	1.17
+++ gpsim.spec	7 Sep 2008 03:03:06 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		gpsim
 Version:	0.22.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)
 
@@ -8,6 +8,7 @@
 License:	GPLv2+
 URL:		http://www.dattalo.com/gnupic/gpsim.html
 Source:		http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
+Patch0:		%{name}-%{version}-gccfix.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel, popt-devel
@@ -43,6 +44,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -80,6 +82,9 @@
 %{_includedir}/*
 
 %changelog
+* Sun Sep 07 2008 Roy Rankin <rrankin at ihug.com.au> - 0.22.0-7
+Patch for gcc 4.3.0
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.22.0-6
 - Autorebuild for GCC 4.3
 



From dtimms at fedoraproject.org  Sun Sep  7 04:10:53 2008
From: dtimms at fedoraproject.org (David Timms)
Date: Sun,  7 Sep 2008 04:10:53 +0000 (UTC)
Subject: rpms/pyvnc2swf/F-8 sources,1.1,1.2
Message-ID: <20080907041053.99DAA70126@cvs1.fedora.phx.redhat.com>

Author: dtimms

Update of /cvs/pkgs/rpms/pyvnc2swf/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19823

Modified Files:
	sources 
Log Message:
update sources to include the main upstream archive



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyvnc2swf/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:42:41 -0000	1.1
+++ sources	7 Sep 2008 04:10:23 -0000	1.2
@@ -0,0 +1 @@
+e871d134420867438cadd1f6320072f0  pyvnc2swf-0.9.3.tar.gz



From allisson at fedoraproject.org  Sun Sep  7 04:13:51 2008
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Sun,  7 Sep 2008 04:13:51 +0000 (UTC)
Subject: rpms/clutter/devel clutter-0.8.0-clutter-fixed.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 clutter.spec, 1.10, 1.11 import.log,
	1.1, 1.2 sources, 1.9, 1.10
Message-ID: <20080907041351.97D1370126@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/clutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21018/devel

Modified Files:
	.cvsignore clutter.spec import.log sources 
Added Files:
	clutter-0.8.0-clutter-fixed.patch 
Log Message:

Update to 0.8.0


clutter-0.8.0-clutter-fixed.patch:

--- NEW FILE clutter-0.8.0-clutter-fixed.patch ---
diff -up clutter-0.8.0/clutter/clutter-fixed.c.orig clutter-0.8.0/clutter/clutter-fixed.c
--- clutter-0.8.0/clutter/clutter-fixed.c.orig	2008-09-06 16:37:07.000000000 -0300
+++ clutter-0.8.0/clutter/clutter-fixed.c	2008-09-06 16:37:27.000000000 -0300
@@ -23,6 +23,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#define G_IMPLEMENT_INLINES
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -30,7 +32,6 @@
 #include <glib-object.h>
 #include <gobject/gvaluecollector.h>
 
-#define G_IMPLEMENTS_INLINES
 #include "clutter-fixed.h"
 #include "clutter-private.h"
 
diff -up clutter-0.8.0/clutter/clutter-fixed.h.orig clutter-0.8.0/clutter/clutter-fixed.h


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Jun 2008 14:34:05 -0000	1.9
+++ .cvsignore	7 Sep 2008 04:13:21 -0000	1.10
@@ -1 +1 @@
-clutter-0.6.4.tar.gz
+clutter-0.8.0.tar.gz


Index: clutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/clutter.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- clutter.spec	14 Jun 2008 14:34:05 -0000	1.10
+++ clutter.spec	7 Sep 2008 04:13:21 -0000	1.11
@@ -1,16 +1,17 @@
 Name:           clutter
-Version:        0.6.4
+Version:        0.8.0
 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.6/%{name}-%{version}.tar.gz
+Source0:        http://www.clutter-project.org/sources/%{name}/0.8/%{name}-%{version}.tar.gz
+Patch0:         clutter-0.8.0-clutter-fixed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  glib2-devel  mesa-libGL-devel gtk2-devel 
-BuildRequires:  pkgconfig pango-devel
+BuildRequires:  glib2-devel mesa-libGL-devel gtk2-devel pkgconfig pango-devel
+BuildRequires:  libXdamage-devel gettext gtk-doc
 
 %description
 Clutter is an open source software library for creating fast, 
@@ -29,16 +30,14 @@
 Header files and libraries for building a extension library for the
 clutter
 
-
 %prep
 %setup -q
-
+%patch0 -p1 -b .orig
 
 %build
-%configure
+%configure --enable-gtk-doc
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 #make DESTDIR=$RPM_BUILD_ROOT install
@@ -54,20 +53,24 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %exclude %{_libdir}/*.la
-%{_libdir}/libclutter-glx-0.6.so.0
-%{_libdir}/libclutter-glx-0.6.so.0.*
-
+%{_libdir}/libclutter-glx-0.8.so.0
+%{_libdir}/libclutter-glx-0.8.so.0.*
 
 %files devel
 %defattr(-, root, root)
 %{_includedir}/*
-%{_libdir}/libclutter-glx-0.6.so
-%{_libdir}/pkgconfig/clutter-0.6.pc
-%{_libdir}/pkgconfig/clutter-glx-0.6.pc
-%{_libdir}/pkgconfig/clutter-x11-0.6.pc
+%{_libdir}/libclutter-glx-0.8.so
+%{_libdir}/pkgconfig/clutter-0.8.pc
+%{_libdir}/pkgconfig/clutter-glx-0.8.pc
+%{_libdir}/pkgconfig/clutter-x11-0.8.pc
+%{_datadir}/gtk-doc/html/clutter
+%exclude %{_datadir}/gtk-doc/html/cogl
 
 %changelog
 
+* Sat Sep  6 2008 Allisson Azevedo <allisson at gmail.com> 0.8.0-1
+- Update to 0.8.0
+
 * Sat Jun 14 2008 Allisson Azevedo <allisson at gmail.com> 0.6.4-1
 - Update to 0.6.4
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Jun 2008 14:34:05 -0000	1.1
+++ import.log	7 Sep 2008 04:13:21 -0000	1.2
@@ -1 +1,2 @@
 clutter-0_6_4-1_fc9:HEAD:clutter-0.6.4-1.fc9.src.rpm:1213453978
+clutter-0_8_0-1_fc9:HEAD:clutter-0.8.0-1.fc9.src.rpm:1220760678


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Jun 2008 14:34:05 -0000	1.9
+++ sources	7 Sep 2008 04:13:21 -0000	1.10
@@ -1 +1 @@
-d28dec49517475c2ea0de884d7b87268  clutter-0.6.4.tar.gz
+ec7be7de08d7d52660231566a14df5c0  clutter-0.8.0.tar.gz



From dcantrel at fedoraproject.org  Sun Sep  7 08:51:21 2008
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sun,  7 Sep 2008 08:51:21 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.563, 1.564 anaconda.spec, 1.705, 
	1.706 sources, 1.697, 1.698
Message-ID: <20080907085122.4D6F270126@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3764

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Sat Sep 06 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.32-1
- Use struct audit_reply instead of struct auditd_reply_list (dcantrell)

* Sat Sep 06 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.31-1
- Use --service=NAME in firewall.py when calling lokkit (dcantrell)
- Make NM work for the DHCP case, at least (dcbw) (#461071). (clumens)
- Sleep a little after dbus to give it time before HAL connects. (clumens)
- Add libsqlite to the initrd, which is needed by NSS libs. (clumens)
- Add more dlopen()ed libraries to the initrd. (clumens)
- Fix various problems with the exn saving UI (#461129). (clumens)
- Fail gracefully if we can't talk to NetworkManager over DBus. (dcantrell)
- Reword text for easy of translating plurals (#460728). (clumens)
- Make sure /bin/sh is linked to /bin/bash (dcantrell)
- Do not include /usr/lib/gconv in install.img (dcantrell)
- Add /etc/NetworkManager/dispatcher.d to the install.img. (clumens)
- Remove last vestiges of rhpxl and pirut. (clumens)
- Only one list of packages in upd-instroot, thanks. (clumens)
- Add xrandr back into the install.img (#458738). (clumens)
- Add a couple more directories to search paths. (clumens)
- Do repo setup and sack setup as separate steps. (clumens)
- Fix a typo that was causing repos in the kickstart file to be skipped
  (#451020). (clumens)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.563
retrieving revision 1.564
diff -u -r1.563 -r1.564
--- .cvsignore	29 Aug 2008 20:19:33 -0000	1.563
+++ .cvsignore	7 Sep 2008 08:50:49 -0000	1.564
@@ -1 +1 @@
-anaconda-11.4.1.30.tar.bz2
+anaconda-11.4.1.32.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.705
retrieving revision 1.706
diff -u -r1.705 -r1.706
--- anaconda.spec	29 Aug 2008 20:19:33 -0000	1.705
+++ anaconda.spec	7 Sep 2008 08:50:49 -0000	1.706
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.4.1.30
+Version: 11.4.1.32
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -29,7 +29,6 @@
 %define syscfgdatever 1.9.0
 %define pythonpyblockver 0.24-1
 %define libbdevidver 5.1.2-1
-%define rhpxlver 0.25
 %define desktopfileutilsver 0.8
 %define e2fsver 1.41.0
 %define nmver 0.7.0
@@ -108,7 +107,6 @@
 Requires: lvm2
 Requires: util-linux-ng
 %ifnarch s390 s390x ppc64
-Requires: rhpxl >= %{rhpxlver}
 Requires: system-config-keyboard
 %endif
 Requires: hal, dbus-python
@@ -220,6 +218,29 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Sat Sep 06 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.32-1
+- Use struct audit_reply instead of struct auditd_reply_list (dcantrell)
+
+* Sat Sep 06 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.31-1
+- Use --service=NAME in firewall.py when calling lokkit (dcantrell)
+- Make NM work for the DHCP case, at least (dcbw) (#461071). (clumens)
+- Sleep a little after dbus to give it time before HAL connects. (clumens)
+- Add libsqlite to the initrd, which is needed by NSS libs. (clumens)
+- Add more dlopen()ed libraries to the initrd. (clumens)
+- Fix various problems with the exn saving UI (#461129). (clumens)
+- Fail gracefully if we can't talk to NetworkManager over DBus. (dcantrell)
+- Reword text for easy of translating plurals (#460728). (clumens)
+- Make sure /bin/sh is linked to /bin/bash (dcantrell)
+- Do not include /usr/lib/gconv in install.img (dcantrell)
+- Add /etc/NetworkManager/dispatcher.d to the install.img. (clumens)
+- Remove last vestiges of rhpxl and pirut. (clumens)
+- Only one list of packages in upd-instroot, thanks. (clumens)
+- Add xrandr back into the install.img (#458738). (clumens)
+- Add a couple more directories to search paths. (clumens)
+- Do repo setup and sack setup as separate steps. (clumens)
+- Fix a typo that was causing repos in the kickstart file to be skipped
+  (#451020). (clumens)
+
 * Fri Aug 29 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.30-1
 - Fix a traceback with unencrypted autopart. (dlehman)
 - doLoggingSetup has grown some new arguments (#460654). (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.697
retrieving revision 1.698
diff -u -r1.697 -r1.698
--- sources	29 Aug 2008 20:19:33 -0000	1.697
+++ sources	7 Sep 2008 08:50:49 -0000	1.698
@@ -1 +1 @@
-9bab4743f94201d0a4ddd66979fa6f80  anaconda-11.4.1.30.tar.bz2
+5645069302e98bc7e65ded673b6725ea  anaconda-11.4.1.32.tar.bz2



From mbroz at fedoraproject.org  Sun Sep  7 08:55:22 2008
From: mbroz at fedoraproject.org (Milan Broz)
Date: Sun,  7 Sep 2008 08:55:22 +0000 (UTC)
Subject: rpms/cryptsetup-luks/devel cryptsetup-fix-fd.patch, NONE,
	1.1 cryptsetup-remove-udev.patch, NONE, 1.1 cryptsetup-luks.spec,
	1.60, 1.61
Message-ID: <20080907085522.1D35770126@cvs1.fedora.phx.redhat.com>

Author: mbroz

Update of /cvs/pkgs/rpms/cryptsetup-luks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4962

Modified Files:
	cryptsetup-luks.spec 
Added Files:
	cryptsetup-fix-fd.patch cryptsetup-remove-udev.patch 
Log Message:
Fix close of zero decriptor.
Fix udevsettle delays - use temporary crypt device remapping.



cryptsetup-fix-fd.patch:

--- NEW FILE cryptsetup-fix-fd.patch ---
Close file descriptor even if it is 0.
--- cryptsetup-1.0.6.old/luks/keyencryption.c	2008-01-25 23:00:30.000000000 +0100
+++ cryptsetup-1.0.6/luks/keyencryption.c	2008-09-06 14:24:21.000000000 +0200
@@ -97,12 +97,13 @@ static int clear_mapping(const char *nam
 /* I miss closures in C! */
 static struct setup_backend *cleaner_backend=NULL;
 static const char *cleaner_name=NULL; 
-static int devfd=0;
+static int devfd=-1;
 
 static void sigint_handler(int sig)
 {
-        if(devfd)
+        if(devfd >= 0)
                 close(devfd);
+        devfd = -1;
         if(cleaner_backend && cleaner_name) 
                 clear_mapping(cleaner_name, cleaner_backend);
         signal(SIGINT, SIG_DFL);
@@ -160,7 +161,7 @@ static int LUKS_endec_template(char *src
 	r = 0;
  out3:
 	close(devfd);
-	devfd = 0;
+	devfd = -1;
  out2:
 	clear_mapping(name,backend);
  out1:

cryptsetup-remove-udev.patch:

--- NEW FILE cryptsetup-remove-udev.patch ---
Replace udevsettle with remmaping to error target.

--- cryptsetup-1.0.6.old/lib/internal.h	2007-10-25 09:11:19.000000000 +0200
+++ cryptsetup-1.0.6/lib/internal.h	2008-09-06 14:27:41.000000000 +0200
@@ -40,7 +40,7 @@ struct setup_backend {
 			          const char *key);
 	int		(*status)(int details, struct crypt_options *options,
 			          char **key);
-	int		(*remove)(struct crypt_options *options);
+	int		(*remove)(int force, struct crypt_options *options);
 
 	const char *	(*dir)(void);
 };
--- cryptsetup-1.0.6.old/lib/libdevmapper.c	2007-10-25 09:11:19.000000000 +0200
+++ cryptsetup-1.0.6/lib/libdevmapper.c	2008-09-06 14:28:56.000000000 +0200
@@ -17,13 +17,7 @@
 #define DEVICE_DIR	"/dev"
 
 #define	CRYPT_TARGET	"crypt"
-
-#define UDEVSETTLE	"/sbin/udevsettle"
-
-static void run_udevsettle(void)
-{
-	system(UDEVSETTLE);
-}
+#define RETRY_COUNT	5
 
 static void set_dm_error(int level, const char *file, int line,
                          const char *f, ...)
@@ -50,16 +44,6 @@ static void dm_exit(void)
 	dm_lib_release();
 }
 
-static void flush_dm_workqueue(void)
-{
-	/* 
-	 * Unfortunately this is the only way to trigger libdevmapper's
-	 * update_nodes function 
-	 */ 
-	dm_exit(); 
-	dm_init();
-}
-
 static char *__lookup_dev(char *path, dev_t dev)
 {
 	struct dirent *entry;
@@ -152,6 +136,89 @@ out:
 	return params;
 }
 
+/* DM helpers */
+static int _dm_simple(int task, const char *name)
+{
+	int r = 0;
+	struct dm_task *dmt;
+
+	if (!(dmt = dm_task_create(task)))
+		return 0;
+
+	if (!dm_task_set_name(dmt, name))
+		goto out;
+
+	r = dm_task_run(dmt);
+
+      out:
+	dm_task_destroy(dmt);
+	return r;
+}
+
+static int _error_device(struct crypt_options *options)
+{
+	struct dm_task *dmt;
+	int r = 0;
+
+	if (!(dmt = dm_task_create(DM_DEVICE_RELOAD)))
+		return 0;
+
+	if (!dm_task_set_name(dmt, options->name))
+		goto error;
+
+	if (!dm_task_add_target(dmt, UINT64_C(0), options->size, "error", ""))
+		goto error;
+
+	if (!dm_task_set_ro(dmt))
+		goto error;
+
+	if (!dm_task_no_open_count(dmt))
+		goto error;
+
+	if (!dm_task_run(dmt))
+		goto error;
+
+	if (!_dm_simple(DM_DEVICE_RESUME, options->name)) {
+		_dm_simple(DM_DEVICE_CLEAR, options->name);
+		goto error;
+	}
+
+	r = 1;
+
+error:
+	dm_task_destroy(dmt);
+	return r;
+}
+
+static int _dm_remove(struct crypt_options *options, int force)
+{
+	int r = -EINVAL;
+	int retries = force ? RETRY_COUNT : 1;
+
+	/* If force flag is set, replace device with error, read-only target.
+	 * it should stop processes from reading it and also removed underlying
+	 * device from mapping, so it is usable again.
+	 * Force flag should be used only for temporary devices, which are
+	 * intended to work inside cryptsetup only!
+	 * Anyway, if some process try to read temporary cryptsetup device,
+	 * it is bug - no other process should try touch it (e.g. udev).
+	 */
+	if (force) {
+		 _error_device(options);
+		retries = RETRY_COUNT;
+	}
+
+	do {
+		r = _dm_simple(DM_DEVICE_REMOVE, options->name) ? 0 : -EINVAL;
+		if (--retries)
+			sleep(1);
+	} while (r == -EINVAL && retries);
+
+	dm_task_update_nodes();
+
+	return r;
+}
+
 static int dm_create_device(int reload, struct crypt_options *options,
                             const char *key)
 {
@@ -191,24 +258,14 @@ static int dm_create_device(int reload, 
 	if (dmi.read_only)
 		options->flags |= CRYPT_FLAG_READONLY;
 
-	/* run udevsettle to avoid a race in libdevmapper causing busy dm devices */
-	run_udevsettle();
-
 	r = 0;
-	
 out:
 	if (r < 0 && !reload) {
 		char *error = (char *)get_error();
 		if (error)
 			error = strdup(error);
-		if (dmt)
-			dm_task_destroy(dmt);
 
-		if (!(dmt = dm_task_create(DM_DEVICE_REMOVE)))
-			goto out_restore_error;
-		if (!dm_task_set_name(dmt, options->name))
-			goto out_restore_error;
-		if (!dm_task_run(dmt))
+		if (!_dm_remove(options, 0))
 			goto out_restore_error;
 
 out_restore_error:
@@ -224,7 +281,7 @@ out_no_removal:
 		dm_task_destroy(dmt);
 	if(dmt_query)
 		dm_task_destroy(dmt_query);
-	flush_dm_workqueue();
+	dm_task_update_nodes();
 	return r;
 }
 
@@ -352,25 +409,12 @@ out:
 	return r;
 }
 
-static int dm_remove_device(struct crypt_options *options)
+static int dm_remove_device(int force, struct crypt_options *options)
 {
-	struct dm_task *dmt;
-	int r = -EINVAL;
+	if (!options || !options->name)
+		return -EINVAL;
 
-	if (!(dmt = dm_task_create(DM_DEVICE_REMOVE)))
-		goto out;
-	if (!dm_task_set_name(dmt, options->name))
-		goto out;
-	if (!dm_task_run(dmt))
-		goto out;
-
-	r = 0;
-
-out:	
-	if (dmt)
-		dm_task_destroy(dmt);
-	flush_dm_workqueue();
-	return r;
+	return _dm_remove(options, force);;
 }
 
 
--- cryptsetup-1.0.6.old/lib/setup.c	2008-09-06 14:20:24.000000000 +0200
+++ cryptsetup-1.0.6/lib/setup.c	2008-09-06 14:27:41.000000000 +0200
@@ -369,7 +369,7 @@ static int __crypt_remove_device(int arg
 		return -EBUSY;
 	}
 
-	return backend->remove(options);
+	return backend->remove(0, options);
 }
 
 static int __crypt_luks_format(int arg, struct setup_backend *backend, struct crypt_options *options)
--- cryptsetup-1.0.6.old/luks/keyencryption.c	2008-09-06 14:24:21.000000000 +0200
+++ cryptsetup-1.0.6/luks/keyencryption.c	2008-09-06 14:27:41.000000000 +0200
@@ -50,10 +50,8 @@ static int setup_mapping(const char *cip
 			 const char *key, size_t keyLength, 
 			 unsigned int sector, size_t srcLength, 
 			 struct setup_backend *backend,
-			 int mode)
+			 int mode, struct crypt_options *options)
 {
-	struct crypt_options k;
-	struct crypt_options *options = &k;
 	int device_sector_size = sector_size_for_device(device);
 	int r;
 
@@ -87,16 +85,14 @@ static int setup_mapping(const char *cip
 	return r;
 }
 
-static int clear_mapping(const char *name, struct setup_backend *backend)
+static int clear_mapping(struct crypt_options *options, struct setup_backend *backend)
 {
-	struct crypt_options options;
-	options.name=name;
-	return backend->remove(&options);
+	return backend->remove(1, options);
 }
 
 /* I miss closures in C! */
 static struct setup_backend *cleaner_backend=NULL;
-static const char *cleaner_name=NULL; 
+static struct crypt_options *cleaner_options = NULL;
 static int devfd=-1;
 
 static void sigint_handler(int sig)
@@ -104,8 +100,8 @@ static void sigint_handler(int sig)
         if(devfd >= 0)
                 close(devfd);
         devfd = -1;
-        if(cleaner_backend && cleaner_name) 
-                clear_mapping(cleaner_name, cleaner_backend);
+        if(cleaner_backend && cleaner_options)
+                clear_mapping(cleaner_options, cleaner_backend);
         signal(SIGINT, SIG_DFL);
         kill(getpid(), SIGINT);
 }
@@ -120,6 +116,7 @@ static int LUKS_endec_template(char *src
 			       ssize_t (*func)(int, void *, size_t),
 			       int mode)
 {
+	struct crypt_options options = {0};
 	char *name = NULL;
 	char *fullpath = NULL;
 	char *dmCipherSpec = NULL;
@@ -138,10 +135,11 @@ static int LUKS_endec_template(char *src
         }
 	
 	signal(SIGINT, sigint_handler);
-	cleaner_name = name;
+	options.name = name;
+	cleaner_options = &options;
 	cleaner_backend = backend;
 
-	r = setup_mapping(dmCipherSpec,name,device,hdr->payloadOffset,key,keyLength,sector,srcLength,backend,mode);
+	r = setup_mapping(dmCipherSpec,name,device,hdr->payloadOffset,key,keyLength,sector,srcLength,backend,mode,&options);
 	if(r < 0) {
 		if(!get_error())
 			set_error("Failed to setup dm-crypt key mapping.\nCheck kernel for support for the %s cipher spec and verify that %s contains at least %d sectors",
@@ -163,10 +161,10 @@ static int LUKS_endec_template(char *src
 	close(devfd);
 	devfd = -1;
  out2:
-	clear_mapping(name,backend);
+	clear_mapping(&options,backend);
  out1:
 	signal(SIGINT, SIG_DFL);
-	cleaner_name = NULL;
+	cleaner_options = NULL;
 	cleaner_backend = NULL;
 	free(dmCipherSpec);
 	free(fullpath); 


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- cryptsetup-luks.spec	28 May 2008 13:26:25 -0000	1.60
+++ cryptsetup-luks.spec	7 Sep 2008 08:54:51 -0000	1.61
@@ -3,16 +3,20 @@
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
 Version: 1.0.6
-Release: 3%{?devrelease:.%{devrelease}}%{?dist}
+Release: 4%{?devrelease:.%{devrelease}}%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://luks.endorphin.org/
 Source: http://luks.endorphin.org/source/cryptsetup-%{version}%{?devrelease:-%{devrelease}}.tar.bz2
 # 2008-04-15: sent to upstream via personal e-mail to Clemens Fruhwirth
-Patch: cryptsetup-prompt.patch
+Patch0: cryptsetup-prompt.patch
 # 2008-05-28: sent to upstream via newsgroup:
 # http://permalink.gmane.org/gmane.linux.kernel.device-mapper.dm-crypt/2735
 Patch1: cryptsetup-luks-1.0.6-duplicate_sentence.patch
+# http://permalink.gmane.org/gmane.linux.kernel.device-mapper.dm-crypt/2803
+Patch2: cryptsetup-fix-fd.patch
+# http://permalink.gmane.org/gmane.linux.kernel.device-mapper.dm-crypt/2804
+Patch3: cryptsetup-remove-udev.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel
 BuildRequires: libgpg-error-devel, e2fsprogs-devel, libsepol-devel
@@ -40,8 +44,10 @@
 
 %prep
 %setup -q -n cryptsetup-%{version}%{?devrelease:-%{devrelease}}
-%patch -p1 -b .prompt
+%patch0 -p1 -b .prompt
 %patch1 -p1 -b .duplicate_sentence
+%patch2 -p1 -b .fd
+%patch3 -p1 -b .udev
 iconv -f latin1 -t utf8 ChangeLog > ChangeLog.new
 mv -f ChangeLog.new ChangeLog 
 
@@ -86,6 +92,10 @@
 
 
 %changelog
+* Sat Sep 06 2008 Milan Broz <mbroz at redhat.com> - 1.0.6-4
+- Fix close of zero decriptor.
+- Fix udevsettle delays - use temporary crypt device remapping.
+
 * Wed May 28 2008 Till Maas <opensource till name> - 1.0.6-3
 - remove a duplicate sentence from the manpage (RH #448705)
 - add patch metadata about upstream status



From pkgdb at fedoraproject.org  Sun Sep  7 09:07:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:07:07 +0000
Subject: [pkgdb] docker: n3lson has requested watchbugzilla
Message-ID: <20080907090707.C9FC120876A@bastion.fedora.phx.redhat.com>

n3lson has requested the watchbugzilla acl on docker (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/docker



From pkgdb at fedoraproject.org  Sun Sep  7 09:32:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:32:16 +0000
Subject: [pkgdb] akode had acl change status
Message-ID: <20080907093216.ED43D20876B@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on akode (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akode



From pkgdb at fedoraproject.org  Sun Sep  7 09:32:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:32:20 +0000
Subject: [pkgdb] akode had acl change status
Message-ID: <20080907093221.2E29620876F@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on akode (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akode



From pkgdb at fedoraproject.org  Sun Sep  7 09:32:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:32:22 +0000
Subject: [pkgdb] akode had acl change status
Message-ID: <20080907093222.EE3DE208D97@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on akode (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akode



From pkgdb at fedoraproject.org  Sun Sep  7 09:32:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:32:21 +0000
Subject: [pkgdb] akode had acl change status
Message-ID: <20080907093221.D1592208D0F@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on akode (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akode



From pkgdb at fedoraproject.org  Sun Sep  7 09:32:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:32:43 +0000
Subject: [pkgdb] extragear-plasma had acl change status
Message-ID: <20080907093243.5596420876B@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on extragear-plasma (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/extragear-plasma



From pkgdb at fedoraproject.org  Sun Sep  7 09:32:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:32:45 +0000
Subject: [pkgdb] extragear-plasma had acl change status
Message-ID: <20080907093245.EBFF7208D99@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on extragear-plasma (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/extragear-plasma



From pkgdb at fedoraproject.org  Sun Sep  7 09:32:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:32:47 +0000
Subject: [pkgdb] extragear-plasma had acl change status
Message-ID: <20080907093247.7A229208DA0@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on extragear-plasma (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/extragear-plasma



From pkgdb at fedoraproject.org  Sun Sep  7 09:32:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:32:47 +0000
Subject: [pkgdb] extragear-plasma had acl change status
Message-ID: <20080907093247.90D33208DA4@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on extragear-plasma (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/extragear-plasma



From pkgdb at fedoraproject.org  Sun Sep  7 09:33:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:33:05 +0000
Subject: [pkgdb] dragonplayer had acl change status
Message-ID: <20080907093306.3026520876D@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on dragonplayer (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dragonplayer



From pkgdb at fedoraproject.org  Sun Sep  7 09:33:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:33:07 +0000
Subject: [pkgdb] dragonplayer had acl change status
Message-ID: <20080907093307.A61B4208DAD@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on dragonplayer (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dragonplayer



From pkgdb at fedoraproject.org  Sun Sep  7 09:33:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:33:10 +0000
Subject: [pkgdb] dragonplayer had acl change status
Message-ID: <20080907093310.EEF85208DB5@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on dragonplayer (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dragonplayer



From pkgdb at fedoraproject.org  Sun Sep  7 09:33:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:33:11 +0000
Subject: [pkgdb] dragonplayer had acl change status
Message-ID: <20080907093312.4CBB5208DBC@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on dragonplayer (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dragonplayer



From pkgdb at fedoraproject.org  Sun Sep  7 09:33:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:33:21 +0000
Subject: [pkgdb] digikamimageplugins had acl change status
Message-ID: <20080907093321.BDECA208D07@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on digikamimageplugins (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/digikamimageplugins



From pkgdb at fedoraproject.org  Sun Sep  7 09:33:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:33:21 +0000
Subject: [pkgdb] digikamimageplugins had acl change status
Message-ID: <20080907093321.EA83F208D9B@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on digikamimageplugins (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/digikamimageplugins



From pkgdb at fedoraproject.org  Sun Sep  7 09:33:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:33:25 +0000
Subject: [pkgdb] digikamimageplugins had acl change status
Message-ID: <20080907093325.4E44D208DC3@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on digikamimageplugins (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/digikamimageplugins



From pkgdb at fedoraproject.org  Sun Sep  7 09:33:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:33:26 +0000
Subject: [pkgdb] digikamimageplugins had acl change status
Message-ID: <20080907093326.BB0D1208DA1@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on digikamimageplugins (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/digikamimageplugins



From pkgdb at fedoraproject.org  Sun Sep  7 09:37:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:37:41 +0000
Subject: [pkgdb] akonadi: rdieter has requested watchbugzilla
Message-ID: <20080907093741.4D92220876D@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on akonadi (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 09:37:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:37:43 +0000
Subject: [pkgdb] akonadi: rdieter has requested watchcommits
Message-ID: <20080907093743.A9183208D0F@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on akonadi (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 09:37:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:37:44 +0000
Subject: [pkgdb] akonadi: rdieter has requested commit
Message-ID: <20080907093744.CDF05208D97@bastion.fedora.phx.redhat.com>

rdieter has requested the commit acl on akonadi (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 09:37:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:37:45 +0000
Subject: [pkgdb] akonadi: rdieter has requested approveacls
Message-ID: <20080907093745.D6083208D9B@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on akonadi (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 09:37:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:37:53 +0000
Subject: [pkgdb] akonadi: rdieter has requested watchcommits
Message-ID: <20080907093753.6F106208D9F@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on akonadi (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 09:37:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:37:54 +0000
Subject: [pkgdb] akonadi: rdieter has requested commit
Message-ID: <20080907093754.7CE6C208DA3@bastion.fedora.phx.redhat.com>

rdieter has requested the commit acl on akonadi (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 09:37:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:37:58 +0000
Subject: [pkgdb] akonadi: rdieter has requested approveacls
Message-ID: <20080907093759.03AD420876E@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on akonadi (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 09:37:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:37:59 +0000
Subject: [pkgdb] akonadi: rdieter has requested watchbugzilla
Message-ID: <20080907093759.250CC208DA7@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on akonadi (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 09:38:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:38:06 +0000
Subject: [pkgdb] akonadi: rdieter has requested watchcommits
Message-ID: <20080907093806.6B8E3208D0F@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on akonadi (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 09:38:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:38:07 +0000
Subject: [pkgdb] akonadi: rdieter has requested commit
Message-ID: <20080907093807.4DD1C208DAC@bastion.fedora.phx.redhat.com>

rdieter has requested the commit acl on akonadi (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 09:38:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:38:08 +0000
Subject: [pkgdb] akonadi: rdieter has requested watchbugzilla
Message-ID: <20080907093808.5D1FD208D7C@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on akonadi (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 09:38:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 09:38:08 +0000
Subject: [pkgdb] akonadi: rdieter has requested approveacls
Message-ID: <20080907093808.B2537208DB2@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on akonadi (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From jwrdegoede at fedoraproject.org  Sun Sep  7 10:02:46 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun,  7 Sep 2008 10:02:46 +0000 (UTC)
Subject: rpms/camstream/devel camstream-0.26.3-libv4l.patch, NONE,
	1.1 camstream.spec, 1.19, 1.20
Message-ID: <20080907100246.20EEE70126@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/camstream/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25501

Modified Files:
	camstream.spec 
Added Files:
	camstream-0.26.3-libv4l.patch 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> - 0.26.3-15
- Fix FTBFS (bug 434345)
- Patch to use libv4l for support for more webcams


camstream-0.26.3-libv4l.patch:

--- NEW FILE camstream-0.26.3-libv4l.patch ---
diff -ur camstream-0.26.3/camstream/Makefile.in camstream-0.26.3.new/camstream/Makefile.in
--- camstream-0.26.3/camstream/Makefile.in	2008-09-05 17:11:56.000000000 +0200
+++ camstream-0.26.3.new/camstream/Makefile.in	2008-09-05 17:11:22.000000000 +0200
@@ -100,10 +100,10 @@
 
 # The programs
 camstream:	$(STREAMOBJS) $(SUBS)
-	$(CXX) -o $@ $(LDFLAGS) $(STREAMOBJS) $(SUBS) $(MLIBS) $(LIBS)
+	$(CXX) -o $@ $(LDFLAGS) $(STREAMOBJS) $(SUBS) $(MLIBS) $(LIBS) -lv4l1
 
 caminfo:	$(INFOOBJS) $(SUBS)
-	$(CXX) -o $@ $(LDFLAGS) $(INFOOBJS) $(SUBS)  $(MLIBS) $(LIBS)
+	$(CXX) -o $@ $(LDFLAGS) $(INFOOBJS) $(SUBS)  $(MLIBS) $(LIBS) -lv4l1
 
 ftpput:		$(FTPOBJS) $(SUBS)
 	$(CXX) -o $@ $(LDFLAGS) $(FTPOBJS) $(SUBS) $(MLIBS) $(LIBS)
Only in camstream-0.26.3.new/camstream: Makefile.in~
diff -ur camstream-0.26.3/camstream/devices/VideoDevice.cc camstream-0.26.3.new/camstream/devices/VideoDevice.cc
--- camstream-0.26.3/camstream/devices/VideoDevice.cc	2003-11-22 03:49:27.000000000 +0100
+++ camstream-0.26.3.new/camstream/devices/VideoDevice.cc	2008-09-05 17:07:18.000000000 +0200
@@ -12,6 +12,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <libv4l1.h>
+
 #undef TRACE_VIDEODEV_READ
 #define TRACE_VIDEODEV_MEM
 
@@ -87,9 +89,9 @@
    pNullImage = new QImage();
    
    // Do a small test
-   CamFD = ::open((const char *)node_name, O_RDONLY);
+   CamFD = v4l1_open((const char *)node_name, O_RDONLY);
    if (CamFD >= 0) {
-     if (ioctl(CamFD, VIDIOCGCAP, &vcap) < 0) {
+     if (v4l1_ioctl(CamFD, VIDIOCGCAP, &vcap) < 0) {
        qDebug("CVideoDevice::CVideoDevice() could not query capabilities; is this really a video device?");
      }
      else {
@@ -116,7 +118,7 @@
             AudioInputs.insert(i, new CVideoAudioInput(this, i));
        }
      }
-     ::close(CamFD);
+     v4l1_close(CamFD);
    }
    else 
      if (errno == EBUSY)
@@ -135,7 +137,7 @@
      qWarning("Warning: CVideoDevice `%s' was destroyed when it was in use more than once.", (const char *)NodeName);
    CleanUp();
    if (CamFD >= 0) {
-     close(CamFD);
+     v4l1_close(CamFD);
      emit Closed();
    }
 
@@ -167,7 +169,7 @@
      return;
    }
    
-   if (ioctl(CamFD, VIDIOCGPICT, &VPic) < 0) {
+   if (v4l1_ioctl(CamFD, VIDIOCGPICT, &VPic) < 0) {
      qDebug("CVideoDevice::Init: could not get picture parameters. (duh?)");
      return;
    }
@@ -175,7 +177,7 @@
 
    HasFramerate = FALSE;
    memset(&vwin, 0, sizeof(struct video_window));
-   if (ioctl(CamFD, VIDIOCGWIN, &vwin) == 0) {
+   if (v4l1_ioctl(CamFD, VIDIOCGWIN, &vwin) == 0) {
 #if defined(PWC_FPS_SHIFT)
      if ((vwin.flags & PWC_FPS_FRMASK) >> PWC_FPS_SHIFT) {
        HasFramerate = TRUE;
@@ -191,7 +193,7 @@
    VMBuf.size = 0;
    VMBuf.frames = 0;
    vid_io_buffer_size = 0;
-   if (ioctl(CamFD, VIDIOCGMBUF, &VMBuf) == 0) {
+   if (v4l1_ioctl(CamFD, VIDIOCGMBUF, &VMBuf) == 0) {
 qDebug("Using mmap(), VMBuf.size = %d", VMBuf.size);
      vid_io_buffer_size = VMBuf.size;
      if (Buffers > 0) {
@@ -211,7 +213,7 @@
    
    /* See if we can actually mmap() the memory */
    if (VMBuf.size > 0) {
-     vid_io_buffer = (uchar *)mmap(NULL, vid_io_buffer_size, PROT_READ, MAP_SHARED, CamFD, 0);
+     vid_io_buffer = (uchar *)v4l1_mmap(NULL, vid_io_buffer_size, PROT_READ, MAP_SHARED, CamFD, 0);
      if (vid_io_buffer == (uchar *)-1) {
        qWarning("CVideoDevice::Init(): mmap() failed (%d). Falling back to non-mmap()ed mode.", errno);
        VMBuf.size = 0;
@@ -248,7 +250,7 @@
 {
    if (VMBuf.size > 0) {
      MSync(); // Just to make sure
-     munmap(vid_io_buffer, vid_io_buffer_size);
+     v4l1_munmap(vid_io_buffer, vid_io_buffer_size);
      VMBuf.size = 0;
    }
    else
@@ -268,10 +270,10 @@
 {
    VPic.palette = pal;
    VPic.depth = depth;
-   if (ioctl(CamFD, VIDIOCSPICT, &VPic) < 0)
+   if (v4l1_ioctl(CamFD, VIDIOCSPICT, &VPic) < 0)
      return FALSE;
    /* Sigh. It was to be expected. The OV511 and IBMCam don't pay attention to the palette field */
-   if (ioctl(CamFD, VIDIOCGPICT, &VPic) < 0)
+   if (v4l1_ioctl(CamFD, VIDIOCGPICT, &VPic) < 0)
      return FALSE;
    if (VPic.palette == pal) {
      Palette = pal;
@@ -350,7 +352,7 @@
 #ifdef TRACE_VIDEODEV_READ
    qDebug("CVideoDevice::MCapture(): buffer %d, format %d, size (%dx%d)", buf, Palette, image_w, image_h);
 #endif  
-   if (ioctl(CamFD, VIDIOCMCAPTURE, &vm) < 0) {
+   if (v4l1_ioctl(CamFD, VIDIOCMCAPTURE, &vm) < 0) {
      perror("CVideoDevice::MCapture() ioctl");
      return -errno;
    }
@@ -368,7 +370,7 @@
 #ifdef TRACE_VIDEODEV_READ
    qDebug("CVideoDevice::MSync()   : buffer %d", CurBuffer);
 #endif  
-   if (ioctl(CamFD, VIDIOCSYNC, &CurBuffer) < 0) {
+   if (v4l1_ioctl(CamFD, VIDIOCSYNC, &CurBuffer) < 0) {
      perror("CVideoDevice::MSync() ioctl");
      return -errno;
    }
@@ -580,7 +582,7 @@
      qWarning("Warning: VideoDevice already opened ?!?!");
      return 0;
    }
-   CamFD = ::open(NodeName, O_RDONLY);
+   CamFD = v4l1_open(NodeName, O_RDONLY);
    if (CamFD < 0) {
      Opened = 0;
      return -errno;
@@ -619,7 +621,7 @@
        delete pImageSocket;
        pImageSocket = NULL;
        CleanUp();
-       close(CamFD);
+       v4l1_close(CamFD);
        CamFD = -1;
        emit Closed();
      }
@@ -753,7 +755,7 @@
 
    image_w = 0;
    image_h = 0;
-   if (CamFD >= 0 && ioctl(CamFD, VIDIOCGWIN, &vwin) == 0) {
+   if (CamFD >= 0 && v4l1_ioctl(CamFD, VIDIOCGWIN, &vwin) == 0) {
      image_w = vwin.width;
      image_h = vwin.height;
    }
@@ -803,7 +805,7 @@
 printf("CVideoDevice::SetSize(%d, %d)\n", width, height);
    if (CamFD < 0 || width > max_w || height > max_h)
      return FALSE;
-   if (ioctl(CamFD, VIDIOCGWIN, &vwin) < 0) {
+   if (v4l1_ioctl(CamFD, VIDIOCGWIN, &vwin) < 0) {
      perror("GWIN: ");
      return FALSE;
    }
@@ -813,7 +815,7 @@
    vwin.width = width;
    vwin.height = height;
    vwin.clipcount = 0;
-   if (ioctl(CamFD, VIDIOCSWIN, &vwin) < 0) {
+   if (v4l1_ioctl(CamFD, VIDIOCSWIN, &vwin) < 0) {
      perror("SWIN");
    }
    else {
@@ -867,7 +869,7 @@
    if (CamFD < 0)
      return -1;
    if (HasFramerate) {
-     if (ioctl(CamFD, VIDIOCGWIN, &vwin) < 0)
+     if (v4l1_ioctl(CamFD, VIDIOCGWIN, &vwin) < 0)
        return -1;
 #if defined(PWC_FPS_SHIFT)       
      return (vwin.flags & PWC_FPS_FRMASK) >> PWC_FPS_SHIFT;
@@ -890,7 +892,7 @@
 {
    struct video_window vwin;
 qDebug("CVideoDevice::SetFramerate(%d)", fps);
-   if (CamFD < 0 || ioctl(CamFD, VIDIOCGWIN, &vwin) < 0)
+   if (CamFD < 0 || v4l1_ioctl(CamFD, VIDIOCGWIN, &vwin) < 0)
      return FALSE;
 
    if (HasFramerate) {
@@ -904,7 +906,7 @@
      vwin.flags = (vwin.flags & ~PWC_FPS_MASK) | (FrameRate << PWC_FPS_SHIFT);
 //qDebug("Setting framerate -> 0x%x\n", vwin.flags);
 #endif     
-     if (ioctl(CamFD, VIDIOCSWIN, &vwin) < 0)
+     if (v4l1_ioctl(CamFD, VIDIOCSWIN, &vwin) < 0)
        return FALSE;
 //     MCapture(CurBuffer); // Try to grab new frame
    }
@@ -1010,8 +1012,8 @@
    ret = FALSE;
    if (CamFD >= 0 && (number >= 0 && number < (int)VideoInputs.count())) {
      arg.channel = number;
-     if (ioctl(CamFD, VIDIOCGCHAN, &arg) == 0) {
-       if (ioctl(CamFD, VIDIOCSCHAN, &arg) == 0) {
+     if (v4l1_ioctl(CamFD, VIDIOCGCHAN, &arg) == 0) {
+       if (v4l1_ioctl(CamFD, VIDIOCSCHAN, &arg) == 0) {
          CurrentVideoInput = number;
          emit ChangedVideoInput(number);
          ret = TRUE;
@@ -1074,9 +1076,9 @@
    
    if (CamFD >= 0 && (number >= 0 && number < (int)AudioInputs.count())) {
      va.audio = number;
-     if (ioctl(CamFD, VIDIOCGAUDIO, &va) == 0) {
+     if (v4l1_ioctl(CamFD, VIDIOCGAUDIO, &va) == 0) {
        va.audio = number;
-       if (ioctl(CamFD, VIDIOCSAUDIO, &va) == 0) {
+       if (v4l1_ioctl(CamFD, VIDIOCSAUDIO, &va) == 0) {
          CurrentAudioInput = number;
          // FIXME emit ChangedAudioInput(number)
          ret = TRUE;
@@ -1117,7 +1119,7 @@
      return FALSE;
 
    VPic.brightness = val & 0xffff;
-   if (ioctl(CamFD, VIDIOCSPICT, &VPic) < 0)
+   if (v4l1_ioctl(CamFD, VIDIOCSPICT, &VPic) < 0)
      return FALSE;
    return TRUE;
 }
@@ -1147,7 +1149,7 @@
      return FALSE;
 
    VPic.contrast = val & 0xffff;
-   if (ioctl(CamFD, VIDIOCSPICT, &VPic) < 0)
+   if (v4l1_ioctl(CamFD, VIDIOCSPICT, &VPic) < 0)
      return FALSE;
    return TRUE;
 }
@@ -1181,7 +1183,7 @@
      return FALSE;
 
    VPic.hue = val & 0xffff;
-   if (ioctl(CamFD, VIDIOCSPICT, &VPic) < 0)
+   if (v4l1_ioctl(CamFD, VIDIOCSPICT, &VPic) < 0)
      return FALSE;
    return TRUE;
 }
@@ -1217,7 +1219,7 @@
      return FALSE;
 
    VPic.colour = val & 0xffff;
-   if (ioctl(CamFD, VIDIOCSPICT, &VPic) < 0)
+   if (v4l1_ioctl(CamFD, VIDIOCSPICT, &VPic) < 0)
      return FALSE;
    return TRUE;
 }
@@ -1253,7 +1255,7 @@
      return FALSE;
 
    VPic.whiteness = val & 0xffff;
-   if (ioctl(CamFD, VIDIOCSPICT, &VPic) < 0)
+   if (v4l1_ioctl(CamFD, VIDIOCSPICT, &VPic) < 0)
      return FALSE;
    return TRUE;
 }
@@ -1286,7 +1288,7 @@
        MCapture((CurBuffer + 1) % Buffers); 
    }
    else {
-     if (read(CamFD, src, vid_io_image_size) < 0)
+     if (v4l1_read(CamFD, src, vid_io_image_size) < 0)
        return -errno;
    }
    
Only in camstream-0.26.3.new/camstream/devices: VideoDevice.cc~
diff -ur camstream-0.26.3/camstream/gui/VideoSettingsDlg.cc camstream-0.26.3.new/camstream/gui/VideoSettingsDlg.cc
--- camstream-0.26.3/camstream/gui/VideoSettingsDlg.cc	2002-05-01 02:23:21.000000000 +0200
+++ camstream-0.26.3.new/camstream/gui/VideoSettingsDlg.cc	2008-09-05 17:07:28.000000000 +0200
@@ -14,6 +14,8 @@
 #include <qslider.h>
 #include <qtabwidget.h>
 
+#include <libv4l1.h>
+
 #include "VideoDeviceInput.h"
 #include "VideoSettingsDlg.h" 
 #include "pwc-ioctl.h"
@@ -125,7 +127,7 @@
      struct pwc_probe probe;
 
      memset(&probe, 0, sizeof(probe));
-     if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCPROBE, &probe) == 0) {
+     if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCPROBE, &probe) == 0) {
        if (vidname == probe.name)
          IsPhilips = TRUE;
      }
@@ -138,7 +140,7 @@
      qDebug("Philips webcam detected, enabling extensions");
      PhilipsTab->show();
 
-     if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCGAGC, &agc) < 0) {
+     if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCGAGC, &agc) < 0) {
        qDebug("No VIDIOCPWCGAGC");
        AGCBox->setEnabled(FALSE);
        AGCValue->setEnabled(FALSE);
@@ -148,7 +150,7 @@
        AGCValue->setValue(abs(agc) / 256);
      }
 
-     if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCGCONTOUR, &contour) < 0) {
+     if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCGCONTOUR, &contour) < 0) {
        qDebug("No VIDIOCPWCGCONTOUR");
        ContourBox->setEnabled(FALSE);
        ContourValue->setEnabled(FALSE);
@@ -159,14 +161,14 @@
          ContourValue->setValue(contour / 256);
      }
 
-     if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCGBACKLIGHT, &backlight) < 0) {
+     if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCGBACKLIGHT, &backlight) < 0) {
        qDebug("No VIDIOCPWCGBACKLIGHT");
        BacklightBox->setEnabled(FALSE);
      }
      else
        BacklightBox->setChecked(backlight != 0);
 
-     if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCGFLICKER, &flicker) < 0) {
+     if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCGFLICKER, &flicker) < 0) {
        qDebug("No VIDIOCPWCGFLICKER");
        FlickerBox->setEnabled(FALSE);
      }
@@ -176,21 +178,21 @@
      ShutterBox->setChecked(TRUE);
 
 
-     if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCGDYNNOISE, &dynnoise) < 0) {
+     if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCGDYNNOISE, &dynnoise) < 0) {
        qDebug("No VIDIOCPWCGDYNNOISE");
        m_NoiseReduction->setEnabled(FALSE);
      }
      else
        m_NoiseReduction->setCurrentItem(dynnoise);
 
-     if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCGCQUAL, &compr) < 0) {
+     if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCGCQUAL, &compr) < 0) {
        qDebug("VIDIOCPWCGCQUAL failed");
        m_CompressionSelection->setEnabled(FALSE);
      }
      else
        m_CompressionSelection->setCurrentItem(compr);
 
-     if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCGAWB, &wb) < 0) {
+     if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCGAWB, &wb) < 0) {
        m_WhiteBalance->setEnabled(FALSE);
        m_RedDial->setEnabled(FALSE);
        m_BlueDial->setEnabled(FALSE);
@@ -200,7 +202,7 @@
        m_WhiteBalance->setCurrentItem(wb.mode);
        ChangedWB(wb.mode);
      }
-     if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCGAWBSPEED, &wbs) < 0) {
+     if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCGAWBSPEED, &wbs) < 0) {
        m_WBSpeed->setEnabled(FALSE);
        m_WBDelay->setEnabled(FALSE);
      }
@@ -309,12 +311,12 @@
 
    if (IsPhilips) {
      if (AGCBox->isChecked()) {
-       if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCGAGC, &agc) == 0) {
+       if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCGAGC, &agc) == 0) {
          AGCValue->setValue(-agc / 256);
        }
      }
      if (m_WBMode == PWC_WB_AUTO) {
-       if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCGAWB, &wb) == 0) {
+       if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCGAWB, &wb) == 0) {
          m_RedDial->setValue(wb.read_red / 256);
          m_BlueDial->setValue(wb.read_blue / 256);
        }
@@ -553,7 +555,7 @@
    AGCValue->setEnabled(!on);
    if (on) {
      int agc = -1;
-     if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCSAGC, &agc) < 0)
+     if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCSAGC, &agc) < 0)
        perror("VIDIOCPWCSAGC");
    }
 }
@@ -564,7 +566,7 @@
 
    if (!AGCBox->isChecked()) {
      agc = value * 256;
-     ioctl(pVideo->GetDescriptor(), VIDIOCPWCSAGC, &agc);
+     v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCSAGC, &agc);
    }
 }
 
@@ -576,7 +578,7 @@
      ShutterValue->show();
    if (on) {
      int speed = -1;
-     if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCSSHUTTER, &speed) < 0)
+     if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCSSHUTTER, &speed) < 0)
        perror("VIDIOCPWCSSHUTTER");
    }
 }
@@ -587,7 +589,7 @@
 
    if (!ShutterBox->isChecked()) {
      speed = value * 256;
-     if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCSSHUTTER, &speed) < 0)
+     if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCSSHUTTER, &speed) < 0)
        perror("VIDIOCPWCSSHUTTER");
    }
 }
@@ -600,7 +602,7 @@
      ContourValue->show();
    if (on) {
      int contour = -1;
-     if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCSCONTOUR, &contour) < 0)
+     if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCSCONTOUR, &contour) < 0)
        perror("VIDIOCPWCSCONTOUR");
    }
 }
@@ -611,7 +613,7 @@
 
    if (!ContourBox->isChecked()) {
      contour = value * 256;
-     if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCSCONTOUR, &contour) < 0)
+     if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCSCONTOUR, &contour) < 0)
        perror("VIDIOCPWCSCONTOUR");
    }
 }
@@ -620,7 +622,7 @@
 {
    int backlight;
    backlight = on ? 1 : 0;
-   if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCSBACKLIGHT, &backlight) < 0)
+   if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCSBACKLIGHT, &backlight) < 0)
      perror("VIDIOCPWCSBACKLIGHT");
 }
 
@@ -628,36 +630,36 @@
 {
    int flicker;
    flicker = on ? 1 : 0;
-   if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCSFLICKER, &flicker) < 0)
+   if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCSFLICKER, &flicker) < 0)
      perror("VIDIOCPWCSFLICKER");
 }
 
 
 void CVideoSettingsDlg::ChangedNoise(int noise)
 {
-   if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCSDYNNOISE, &noise) < 0)
+   if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCSDYNNOISE, &noise) < 0)
      perror("VIDIOCPWCSDYNNOISE");
 }
 
 void CVideoSettingsDlg::ChangedCompression(int compression)
 {
-   if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCSCQUAL, &compression) < 0)
+   if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCSCQUAL, &compression) < 0)
      perror("VIDIOCPWCSCQUAL");
 }
 
 void CVideoSettingsDlg::ClickedSaveUser()
 {
-   ioctl(pVideo->GetDescriptor(), VIDIOCPWCSUSER);
+   v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCSUSER);
 }
 
 void CVideoSettingsDlg::ClickedRestoreUser()
 {
-   ioctl(pVideo->GetDescriptor(), VIDIOCPWCRUSER);
+   v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCRUSER);
 }
 
 void CVideoSettingsDlg::ClickedRestoreFactory()
 {
-   ioctl(pVideo->GetDescriptor(), VIDIOCPWCFACTORY);
+   v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCFACTORY);
 }
 
 /**
@@ -676,7 +678,7 @@
    wb.mode = m_WBMode;
    wb.manual_red = m_RedDial->value() * 256;
    wb.manual_blue = m_BlueDial->value() * 256;
-   ioctl(pVideo->GetDescriptor(), VIDIOCPWCSAWB, &wb);
+   v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCSAWB, &wb);
    
    if (m_WBMode == PWC_WB_MANUAL || m_WBMode == PWC_WB_AUTO) {
      m_RedDial->show();
@@ -688,7 +690,7 @@
        m_BlueDial->setValue(wb.manual_blue / 256);
      }
      else {
-       if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCGAWB, &wb) < 0)
+       if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCGAWB, &wb) < 0)
          perror("VIDIOCPWCGAWB 3");
        m_RedDial->setValue(wb.read_red / 256);
        m_BlueDial->setValue(wb.read_blue / 256);
@@ -707,7 +709,7 @@
    wb.mode = m_WBMode;
    wb.manual_red = m_RedDial->value() * 256;
    wb.manual_blue = m_BlueDial->value() * 256;
-   ioctl(pVideo->GetDescriptor(), VIDIOCPWCSAWB, &wb);
+   v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCSAWB, &wb);
 }
 
 void CVideoSettingsDlg::MovedBlue(int blue)
@@ -717,7 +719,7 @@
    wb.mode = m_WBMode;
    wb.manual_red = m_RedDial->value() * 256;
    wb.manual_blue = m_BlueDial->value() * 256;
-   ioctl(pVideo->GetDescriptor(), VIDIOCPWCSAWB, &wb);
+   v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCSAWB, &wb);
 }
 
 void CVideoSettingsDlg::MovedWBSpeed(int speed)
@@ -728,7 +730,7 @@
    wbs.control_speed = (255 - speed) << 8;
    wbs.control_delay = 0;
 
-   if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCSAWBSPEED, &wbs) < 0)
+   if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCSAWBSPEED, &wbs) < 0)
      perror("VIDIOCPWCSAWBSPEED speed");
 }
 
@@ -739,7 +741,7 @@
    wbs.control_speed = 0;
    wbs.control_delay = delay << 8;
 
-   if (ioctl(pVideo->GetDescriptor(), VIDIOCPWCSAWBSPEED, &wbs) < 0)
+   if (v4l1_ioctl(pVideo->GetDescriptor(), VIDIOCPWCSAWBSPEED, &wbs) < 0)
      perror("VIDIOCPWCSAWBSPEED delay");
 }
 
Only in camstream-0.26.3.new/camstream/gui: VideoSettingsDlg.cc~
diff -up ./camstream-0.26.3/camstream/lib/FTPClient.cc~ ./camstream-0.26.3/camstream/lib/FTPClient.cc
--- camstream-0.26.3/camstream/lib/FTPClient.cc~	2008-09-05 18:00:15.000000000 +0200
+++ camstream-0.26.3/camstream/lib/FTPClient.cc	2008-09-05 18:00:15.000000000 +0200
@@ -231,7 +231,7 @@ int CFTPClient::SetupLocal(const QString
      ::close(LocalFileFD);
    }
    if (write)
-     LocalFileFD = ::open((const char *)filename, O_WRONLY | O_CREAT);
+     LocalFileFD = ::open((const char *)filename, O_WRONLY | O_CREAT, 0644);
    else
      LocalFileFD = ::open((const char *)filename, O_RDONLY);
 qDebug("CFTPClient::SetupLocal() Opened local file fd [%d].", LocalFileFD);


Index: camstream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/camstream/devel/camstream.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- camstream.spec	15 Jul 2008 14:19:57 -0000	1.19
+++ camstream.spec	7 Sep 2008 10:02:15 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           camstream
 Version:        0.26.3
-Release:        14%{?dist}
+Release:        15%{?dist}
 
 Summary:        Set of programs to make use of your webcam
 
@@ -13,9 +13,10 @@
 Patch0:         camstream-makefiles.patch
 Patch1:         camstream-0.26.3-linkage.patch
 Patch2:         camstream-0.26.3-x86_64-asm.patch
+Patch3:         camstream-0.26.3-libv4l.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt3-devel, autoconf, desktop-file-utils
+BuildRequires:  qt3-devel, autoconf, desktop-file-utils, libv4l-devel
 ExclusiveArch:  %{ix86} x86_64 
 
 %description
@@ -32,6 +33,7 @@
 %ifarch x86_64
 %patch2 -p1
 %endif
+%patch3 -p1
 
 
 %build
@@ -91,6 +93,10 @@
 
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> - 0.26.3-15
+- Fix FTBFS (bug 434345)
+- Patch to use libv4l for support for more webcams
+
 * Tue Jul 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.26.3-14
 - fix license tag
 



From ixs at fedoraproject.org  Sun Sep  7 10:04:40 2008
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Sun,  7 Sep 2008 10:04:40 +0000 (UTC)
Subject: rpms/mod_suphp/devel mod_suphp.spec,1.16,1.17
Message-ID: <20080907100440.49A9E70126@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/mod_suphp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26376

Modified Files:
	mod_suphp.spec 
Log Message:
* Sun Sep 07 2008 Andreas Thienemann <andreas at bawue.net> - 0.6.3-3
- Fix conditionals, fix FTBFS #449578



Index: mod_suphp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_suphp/devel/mod_suphp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mod_suphp.spec	11 Aug 2008 15:19:33 -0000	1.16
+++ mod_suphp.spec	7 Sep 2008 10:04:09 -0000	1.17
@@ -1,17 +1,17 @@
 # Depending on what version of Fedora we're on, use a different php binary, different apr
 # and also different handler.
 %if 0%{?fedora}
-   %if "%{fedora}" >= "5"
+   %if 0%{fedora} >= 5
       %define php /usr/bin/php-cgi
       %define handler php5-script
       %define apr /usr/bin/apr-1-config
    %endif
-   %if "%{fedora}" == "4"
+   %if 0%{fedora} == 4
       %define php /usr/bin/php-cgi
       %define handler x-httpd-php
       %define apr /usr/bin/apr-config
    %endif
-   %if "%{fedora}" <= "3"
+   %if 0%{fedora} <= 3
       %define php /usr/bin/php
       %define handler x-httpd-php
       %define apr /usr/bin/apr-config
@@ -115,6 +115,9 @@
 
 
 %changelog
+* Sun Sep 07 2008 Andreas Thienemann <andreas at bawue.net> - 0.6.3-3
+- Fix conditionals, fix FTBFS #449578
+
 * Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.3-2
 - fix license tag
 



From ixs at fedoraproject.org  Sun Sep  7 10:08:00 2008
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Sun,  7 Sep 2008 10:08:00 +0000 (UTC)
Subject: rpms/mod_suphp/devel mod_suphp.spec,1.17,1.18
Message-ID: <20080907100800.A5ADD70126@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/mod_suphp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27883

Modified Files:
	mod_suphp.spec 
Log Message:
* Sun Sep 07 2008 Andreas Thienemann <andreas at bawue.net> - 0.6.3-3
- Fix conditionals, fix FTBFS #449578



Index: mod_suphp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_suphp/devel/mod_suphp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_suphp.spec	7 Sep 2008 10:04:09 -0000	1.17
+++ mod_suphp.spec	7 Sep 2008 10:07:30 -0000	1.18
@@ -25,7 +25,7 @@
 Summary: An apache2 module for executing PHP scripts with the permissions of their owners
 Name: mod_suphp
 Version: 0.6.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz



From pkgdb at fedoraproject.org  Sun Sep  7 10:29:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 10:29:24 +0000
Subject: [pkgdb] digikam had acl change status
Message-ID: <20080907102924.6011220876C@bastion.fedora.phx.redhat.com>

mgarski has set the watchbugzilla acl on digikam (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Sun Sep  7 10:29:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 10:29:26 +0000
Subject: [pkgdb] digikam had acl change status
Message-ID: <20080907102926.719B8208770@bastion.fedora.phx.redhat.com>

mgarski has set the watchcommits acl on digikam (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Sun Sep  7 10:29:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 10:29:36 +0000
Subject: [pkgdb] digikam had acl change status
Message-ID: <20080907102936.8772620876C@bastion.fedora.phx.redhat.com>

mgarski has set the watchbugzilla acl on digikam (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Sun Sep  7 10:29:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 10:29:38 +0000
Subject: [pkgdb] digikam had acl change status
Message-ID: <20080907102939.0D238208D1E@bastion.fedora.phx.redhat.com>

mgarski has set the watchcommits acl on digikam (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From mschwendt at fedoraproject.org  Sun Sep  7 10:36:42 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun,  7 Sep 2008 10:36:42 +0000 (UTC)
Subject: extras-buildsys/utils user-manager.py,1.3.8.2,1.3.8.3
Message-ID: <20080907103642.D359370129@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3239/utils

Modified Files:
      Tag: Plague-0_4_5
	user-manager.py 
Log Message:
fix mod_user for sqlite2/3 api


Index: user-manager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/user-manager.py,v
retrieving revision 1.3.8.2
retrieving revision 1.3.8.3
diff -u -r1.3.8.2 -r1.3.8.3
--- user-manager.py	4 Sep 2008 17:19:09 -0000	1.3.8.2
+++ user-manager.py	7 Sep 2008 10:36:42 -0000	1.3.8.3
@@ -147,6 +147,7 @@
         if not item:
             raise UserManagerException("User %s doesn't exist." % email)
 
+        item = ResultSet(item, self.curs.description)
         own_jobs = item['own_jobs']
         job_admin = item['job_admin']
         user_admin = item['user_admin']



From mschwendt at fedoraproject.org  Sun Sep  7 10:37:12 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun,  7 Sep 2008 10:37:12 +0000 (UTC)
Subject: extras-buildsys ChangeLog,1.126.2.44.2.1.2.20,1.126.2.44.2.1.2.21
Message-ID: <20080907103712.6B91670129@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3239

Modified Files:
      Tag: Plague-0_4_5
	ChangeLog 
Log Message:
fix mod_user for sqlite2/3 api


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.44.2.1.2.20
retrieving revision 1.126.2.44.2.1.2.21
diff -u -r1.126.2.44.2.1.2.20 -r1.126.2.44.2.1.2.21
--- ChangeLog	5 Sep 2008 09:32:42 -0000	1.126.2.44.2.1.2.20
+++ ChangeLog	7 Sep 2008 10:36:41 -0000	1.126.2.44.2.1.2.21
@@ -1,3 +1,8 @@
+2008-09-07  Michael Schwendt <mschwendt at fedoraproject.org>
+
+	* utils/user-manager.py
+	  - Fix mod_user for SQLite2/SQLite3 API.
+
 2008-09-04  Michael Schwendt <mschwendt at fedoraproject.org>
 
 	* Release of 0.4.5.3



From mschwendt at fedoraproject.org  Sun Sep  7 10:48:47 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun,  7 Sep 2008 10:48:47 +0000 (UTC)
Subject: rpms/plague/devel plague-0.4.5.3-mod_user.patch, NONE,
	1.1 plague.spec, 1.37, 1.38
Message-ID: <20080907104847.07E5870126@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6875/devel

Modified Files:
	plague.spec 
Added Files:
	plague-0.4.5.3-mod_user.patch 
Log Message:
* Sun Sep  7 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-2
- fix mod_user in plague-user-manager for sqlite2/3


plague-0.4.5.3-mod_user.patch:

--- NEW FILE plague-0.4.5.3-mod_user.patch ---
diff -Nur plague-0.4.5.3-orig/utils/user-manager.py plague-0.4.5.3/utils/user-manager.py
--- plague-0.4.5.3-orig/utils/user-manager.py	2008-09-05 11:17:27.000000000 +0200
+++ plague-0.4.5.3/utils/user-manager.py	2008-09-07 12:34:59.000000000 +0200
@@ -147,6 +147,7 @@
         if not item:
             raise UserManagerException("User %s doesn't exist." % email)
 
+        item = ResultSet(item, self.curs.description)
         own_jobs = item['own_jobs']
         job_admin = item['job_admin']
         user_admin = item['user_admin']


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/plague.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- plague.spec	5 Sep 2008 09:45:06 -0000	1.37
+++ plague.spec	7 Sep 2008 10:48:16 -0000	1.38
@@ -3,11 +3,12 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.5.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 #Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
 Source: %{name}-%{version}.tar.bz2
+Patch0: plague-0.4.5.3-mod_user.patch
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
@@ -79,6 +80,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .user_mod
 
 
 %build
@@ -165,6 +167,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-2
+- fix mod_user in plague-user-manager for sqlite2/3
+
 * Fri Sep  5 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-1
 - update to 0.4.5.3 for sqlite2 compatibility fixes for Fedora
 - merge fedora pkg spec changes



From mschwendt at fedoraproject.org  Sun Sep  7 10:48:47 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun,  7 Sep 2008 10:48:47 +0000 (UTC)
Subject: rpms/plague/F-9 plague-0.4.5.3-mod_user.patch, NONE, 1.1 plague.spec,
	1.36, 1.37
Message-ID: <20080907104847.397CF70126@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6875/F-9

Modified Files:
	plague.spec 
Added Files:
	plague-0.4.5.3-mod_user.patch 
Log Message:
* Sun Sep  7 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-2
- fix mod_user in plague-user-manager for sqlite2/3


plague-0.4.5.3-mod_user.patch:

--- NEW FILE plague-0.4.5.3-mod_user.patch ---
diff -Nur plague-0.4.5.3-orig/utils/user-manager.py plague-0.4.5.3/utils/user-manager.py
--- plague-0.4.5.3-orig/utils/user-manager.py	2008-09-05 11:17:27.000000000 +0200
+++ plague-0.4.5.3/utils/user-manager.py	2008-09-07 12:34:59.000000000 +0200
@@ -147,6 +147,7 @@
         if not item:
             raise UserManagerException("User %s doesn't exist." % email)
 
+        item = ResultSet(item, self.curs.description)
         own_jobs = item['own_jobs']
         job_admin = item['job_admin']
         user_admin = item['user_admin']


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-9/plague.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- plague.spec	5 Sep 2008 09:45:07 -0000	1.36
+++ plague.spec	7 Sep 2008 10:48:16 -0000	1.37
@@ -3,11 +3,12 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.5.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 #Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
 Source: %{name}-%{version}.tar.bz2
+Patch0: plague-0.4.5.3-mod_user.patch
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
@@ -79,6 +80,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .user_mod
 
 
 %build
@@ -165,6 +167,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-2
+- fix mod_user in plague-user-manager for sqlite2/3
+
 * Fri Sep  5 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-1
 - update to 0.4.5.3 for sqlite2 compatibility fixes for Fedora
 - merge fedora pkg spec changes



From mschwendt at fedoraproject.org  Sun Sep  7 10:48:47 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun,  7 Sep 2008 10:48:47 +0000 (UTC)
Subject: rpms/plague/F-8 plague-0.4.5.3-mod_user.patch, NONE, 1.1 plague.spec,
	1.36, 1.37
Message-ID: <20080907104847.819CD70126@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6875/F-8

Modified Files:
	plague.spec 
Added Files:
	plague-0.4.5.3-mod_user.patch 
Log Message:
* Sun Sep  7 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-2
- fix mod_user in plague-user-manager for sqlite2/3


plague-0.4.5.3-mod_user.patch:

--- NEW FILE plague-0.4.5.3-mod_user.patch ---
diff -Nur plague-0.4.5.3-orig/utils/user-manager.py plague-0.4.5.3/utils/user-manager.py
--- plague-0.4.5.3-orig/utils/user-manager.py	2008-09-05 11:17:27.000000000 +0200
+++ plague-0.4.5.3/utils/user-manager.py	2008-09-07 12:34:59.000000000 +0200
@@ -147,6 +147,7 @@
         if not item:
             raise UserManagerException("User %s doesn't exist." % email)
 
+        item = ResultSet(item, self.curs.description)
         own_jobs = item['own_jobs']
         job_admin = item['job_admin']
         user_admin = item['user_admin']


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-8/plague.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- plague.spec	5 Sep 2008 09:45:07 -0000	1.36
+++ plague.spec	7 Sep 2008 10:48:17 -0000	1.37
@@ -3,11 +3,12 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.5.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 #Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
 Source: %{name}-%{version}.tar.bz2
+Patch0: plague-0.4.5.3-mod_user.patch
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
@@ -79,6 +80,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .user_mod
 
 
 %build
@@ -165,6 +167,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-2
+- fix mod_user in plague-user-manager for sqlite2/3
+
 * Fri Sep  5 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-1
 - update to 0.4.5.3 for sqlite2 compatibility fixes for Fedora
 - merge fedora pkg spec changes



From jwrdegoede at fedoraproject.org  Sun Sep  7 11:17:50 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun,  7 Sep 2008 11:17:50 +0000 (UTC)
Subject: rpms/gyachi/devel gyachi-1.1.46-libv4l.patch, NONE, 1.1 gyachi.spec,
	1.18, 1.19
Message-ID: <20080907111752.1033A70126@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/gyachi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15710

Modified Files:
	gyachi.spec 
Added Files:
	gyachi-1.1.46-libv4l.patch 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> - 1.1.46-10
- Patch to use libv4l for support for more webcams


gyachi-1.1.46-libv4l.patch:

--- NEW FILE gyachi-1.1.46-libv4l.patch ---
diff -up gyachi-1.1.46/webcam/Makefile.am.foo gyachi-1.1.46/webcam/Makefile.am
--- gyachi-1.1.46/webcam/Makefile.am.foo	2008-05-18 15:36:30.000000000 +0200
+++ gyachi-1.1.46/webcam/Makefile.am	2008-09-07 09:59:03.000000000 +0200
@@ -16,7 +16,7 @@ gyachi_upload_SOURCES = gyacheupload-mai
                         gyacheupload.h
 
 gyachi_webcam_LDADD = @GYACHI_LIB@ @GTK_LIBS@ @JASPER_LIBS@ $(INTLLIBS)
-gyachi_upload_LDADD = @GYACHI_LIB@ @GTK_LIBS@ @GTHREAD_LIBS@ @JASPER_LIBS@ $(INTLLIBS)
+gyachi_upload_LDADD = @GYACHI_LIB@ @GTK_LIBS@ @GTHREAD_LIBS@ @JASPER_LIBS@ $(INTLLIBS) -lv4l1
 
 # Required for localization
 localedir = $(datadir)/locale
diff -up gyachi-1.1.46/webcam/gyacheupload-v4l.c.foo gyachi-1.1.46/webcam/gyacheupload-v4l.c
--- gyachi-1.1.46/webcam/gyacheupload-v4l.c.foo	2008-07-20 14:47:31.000000000 +0200
+++ gyachi-1.1.46/webcam/gyacheupload-v4l.c	2008-09-07 09:57:39.000000000 +0200
@@ -73,8 +73,10 @@
 
 #ifdef V4L2
 #	include <linux/videodev2.h>
+#	include <libv4l2.h>
 #else
 #	include <linux/videodev.h>
+#	include <libv4l1.h>
 #endif
 
 #include "gyacheupload.h"
@@ -410,12 +410,12 @@ int grab_init() {
 	unsigned int min;
 	unsigned int i;
 	
-        if ((grab_fd = open(v_device,O_RDWR | O_NONBLOCK, 0)) == -1 ) {
+        if ((grab_fd = v4l2_open(v_device,O_RDWR | O_NONBLOCK, 0)) == -1 ) {
 		show_error_dialog("Could not open Video4Linux device.\nThe device may already be in use.");
 		return 0; 
 	}
 	
-	if (ioctl(grab_fd,VIDIOC_QUERYCAP,&grab_cap) == -1) {
+	if (v4l2_ioctl(grab_fd,VIDIOC_QUERYCAP,&grab_cap) == -1) {
 		show_error_dialog("An error occurred at 'ioctl VIDIOC_QUERYCAP'.\nNot a V4L2 device.");
 		return 0; 
 	}
@@ -445,7 +445,7 @@ int grab_init() {
         grab_fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_RGB24;
         grab_fmt.fmt.pix.field       = V4L2_FIELD_INTERLACED;
 
-        if (ioctl (grab_fd, VIDIOC_S_FMT, &grab_fmt) == -1) {
+        if (v4l2_ioctl (grab_fd, VIDIOC_S_FMT, &grab_fmt) == -1) {
 			show_error_dialog("Fatal: video format not supported by grab device\n");
 			return 0;
 		}
@@ -454,7 +454,7 @@ int grab_init() {
 
 //		CLEAR(grab_fmt);
 //        grab_fmt.type                = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-//        if (ioctl (grab_fd, VIDIOC_G_FMT, &grab_fmt) == -1) {
+//        if (v4l2_ioctl (grab_fd, VIDIOC_G_FMT, &grab_fmt) == -1) {
 //			show_error_dialog("Could not get format information of grab device\n");
 //			return 0;
 //		}
@@ -482,7 +482,7 @@ int grab_init() {
         req.type                = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         req.memory              = V4L2_MEMORY_MMAP;
 
-	if (ioctl (grab_fd, VIDIOC_REQBUFS, &req) == -1) {
+	if (v4l2_ioctl (grab_fd, VIDIOC_REQBUFS, &req) == -1) {
 			show_error_dialog("Fatal: memory mapping not supported by grab device\n");
 			return 0;
 		}
@@ -506,14 +506,14 @@ int grab_init() {
                 buf.memory      = V4L2_MEMORY_MMAP;
                 buf.index       = n_buffers;
 
-                if (ioctl (grab_fd, VIDIOC_QUERYBUF, &buf) == -1) {
+                if (v4l2_ioctl (grab_fd, VIDIOC_QUERYBUF, &buf) == -1) {
 					show_error_dialog("VIDIOC_QUERYBUF\n");
 					return 0;
 				}
 				
                 buffers[n_buffers].length = buf.length;
                 buffers[n_buffers].start =
-                        mmap (NULL /* start anywhere */,
+                        v4l2_mmap (NULL /* start anywhere */,
                               buf.length,
                               PROT_READ | PROT_WRITE /* required */,
                               MAP_SHARED /* recommended */,
@@ -537,7 +537,7 @@ int grab_init() {
         		buf.memory      = V4L2_MEMORY_MMAP;
         		buf.index       = i;
 
-        		if (ioctl (grab_fd, VIDIOC_QBUF, &buf) == -1) {
+        		if (v4l2_ioctl (grab_fd, VIDIOC_QBUF, &buf) == -1) {
 					show_error_dialog("VIDIOC_QBUF\n");
 					return(0);
 				}
@@ -546,7 +546,7 @@ int grab_init() {
 		
 		type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
-		if (ioctl (grab_fd, VIDIOC_STREAMON, &type) == -1) {
+		if (v4l2_ioctl (grab_fd, VIDIOC_STREAMON, &type) == -1) {
 			show_error_dialog("VIDIOC_STREAMON\n");
 			return(0);
 		}
@@ -559,18 +559,18 @@ void cleanup_v4l() {
 
 	cam_is_open=0;
 	type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-	if (ioctl (grab_fd, VIDIOC_STREAMOFF, &type)) {
+	if (v4l2_ioctl (grab_fd, VIDIOC_STREAMOFF, &type)) {
 		show_error_dialog("VIDIOC_STREAMOFF\n");
 		return;
 	}
 
-	for (i = 0; i < n_buffers; ++i) munmap (buffers[i].start, buffers[i].length);
+	for (i = 0; i < n_buffers; ++i) v4l1_munmap (buffers[i].start, buffers[i].length);
 	free (buffers);
 
 	if (v_device) {free (v_device); v_device=NULL;}
 	if (pnm_buf) {free(pnm_buf); pnm_buf=NULL;}
 	if (grab_fd>-1) {
-		close (grab_fd);
+		v4l2_close (grab_fd);
 		grab_fd=-1;
 	}
 }
@@ -579,7 +579,7 @@ int get_control_v4l2(unsigned int id) {
 	struct v4l2_queryctrl grab_ctrl;
 
 	grab_ctrl.id = id;
-	if (ioctl(grab_fd,VIDIOC_QUERYCTRL,&grab_ctrl) != -1) {
+	if (v4l2_ioctl(grab_fd,VIDIOC_QUERYCTRL,&grab_ctrl) != -1) {
 		fprintf(stderr, "ctrl %i:%s min:%i max:%i def:%i\n", id, grab_ctrl.name, grab_ctrl.minimum, grab_ctrl.maximum,
 		grab_ctrl.default_value);
 		return(0);
@@ -593,7 +593,7 @@ void set_v4l2control(unsigned int id, in
     if(!get_control_v4l2(id)) {
 	propcontrol.id = id;
     	propcontrol.value= value;
-    	ioctl (grab_fd, VIDIOC_S_CTRL, &propcontrol);
+    	v4l2_ioctl (grab_fd, VIDIOC_S_CTRL, &propcontrol);
     }
 }
 
@@ -613,7 +613,7 @@ unsigned char* grab_one(int *width, int 
     buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
     buf.memory = V4L2_MEMORY_MMAP;
 
-    if (ioctl (grab_fd, VIDIOC_DQBUF, &buf) == -1) {
+    if (v4l2_ioctl (grab_fd, VIDIOC_DQBUF, &buf) == -1) {
     	switch (errno) {
         	case EAGAIN:
 				return rgb_buf;
@@ -627,7 +627,7 @@ unsigned char* grab_one(int *width, int 
 			
 	grab_data=buffers[buf.index].start;
 
-	if (ioctl (grab_fd, VIDIOC_QBUF, &buf) == -1) {
+	if (v4l2_ioctl (grab_fd, VIDIOC_QBUF, &buf) == -1) {
 		show_error_dialog("VIDIOC_QBUF\n");
 		return;
 	}
@@ -675,12 +675,12 @@ unsigned char* grab_one(int *width, int 
 
 // Here begin functions for the Video4Linux Api 1
 int grab_init() {
-	if ((grab_fd = open(v_device,O_RDWR)) == -1 ) {
+	if ((grab_fd = v4l1_open(v_device,O_RDWR)) == -1 ) {
 	show_error_dialog("Could not open Video4Linux device.\nThe device may already be in use.");
 	return 0; 
 	}
 
-	if (ioctl(grab_fd,VIDIOCGCAP,&grab_cap) == -1) {
+	if (v4l1_ioctl(grab_fd,VIDIOCGCAP,&grab_cap) == -1) {
 	show_error_dialog("An error occurred at 'ioctl VIDIOCGCAP'.\nWrong device.");
 	return 0; 
 	}
@@ -706,7 +706,7 @@ int grab_init() {
 	strncpy(webcam_description, grab_cap.name ,28);
 	strcat(webcam_description, " V4L1");
 
-	if (ioctl (grab_fd, VIDIOCGPICT, &grab_pic) == -1) {
+	if (v4l1_ioctl (grab_fd, VIDIOCGPICT, &grab_pic) == -1) {
 		show_error_dialog("Error getting picture information.");
 		return 0; 
 	}
@@ -714,13 +714,13 @@ int grab_init() {
 	set_picture();
 
 	// Find out how many buffers are available
-	if(ioctl(grab_fd, VIDIOCGMBUF, &grab_mbuf) < 0)	{
+	if(v4l1_ioctl(grab_fd, VIDIOCGMBUF, &grab_mbuf) < 0)	{
 		show_error_dialog("Error while querying mmap-buffers.");
         return 0;
 	}
 	
 	/* mmap all available buffers. */
-	grab_data = mmap(0, grab_mbuf.size, PROT_READ | PROT_WRITE, MAP_SHARED, grab_fd, 0);
+	grab_data = v4l1_mmap(0, grab_mbuf.size, PROT_READ | PROT_WRITE, MAP_SHARED, grab_fd, 0);
 	if(grab_data == MAP_FAILED) {
 		show_error_dialog("Error mmap'ing all available buffers.");
 		return 0;
@@ -734,7 +734,7 @@ int grab_init() {
 	grab_size = x * y * w;
 	
 	/* Request the maximum number of frames the device can handle. */
-	if(ioctl(grab_fd, VIDIOCMCAPTURE, &grab_buf) < 0) {
+	if(v4l1_ioctl(grab_fd, VIDIOCMCAPTURE, &grab_buf) < 0) {
 		show_error_dialog("Error while capturing initial image.");
 		return 0;
 	}
@@ -748,9 +748,9 @@ void cleanup_v4l() {
 	if (v_device) {free (v_device); v_device=NULL;}
 	if (pnm_buf) {free(pnm_buf); pnm_buf=NULL;}
 	if (grab_fd>-1) {
-		close (grab_fd);
+		v4l1_munmap(grab_data, grab_mbuf.size);
+		v4l1_close (grab_fd);
 		grab_fd=-1;
-		munmap(grab_data, grab_mbuf.size);
 	}
 }
 
@@ -770,7 +770,7 @@ void set_picture() {
 		grab_pic.palette = wpalette[grab_palette].palette;
 		grab_pic.depth   = wpalette[grab_palette].depth;
 
-		if(!ioctl(grab_fd, VIDIOCSPICT, &grab_pic))
+		if(!v4l1_ioctl(grab_fd, VIDIOCSPICT, &grab_pic))
 		{
 			return;
 		}
@@ -785,12 +785,12 @@ unsigned char* grab_one(int *width, int 
 	set_picture();
 	
 	/* Wait for the frame to be captured. */
-	if(ioctl(grab_fd, VIDIOCSYNC, &grab_buf) < 0) {
+	if(v4l1_ioctl(grab_fd, VIDIOCSYNC, &grab_buf) < 0) {
 		show_error_dialog("An error occurred at 'ioctl VIDIOCSYNC'.");
 		return NULL;
 	}
 	
-	if(ioctl(grab_fd, VIDIOCMCAPTURE, &grab_buf) < 0) {
+	if(v4l1_ioctl(grab_fd, VIDIOCMCAPTURE, &grab_buf) < 0) {
 		show_error_dialog("Error while capturing an image.");
 		return NULL;
 	}


Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/devel/gyachi.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gyachi.spec	29 Aug 2008 18:06:50 -0000	1.18
+++ gyachi.spec	7 Sep 2008 11:17:19 -0000	1.19
@@ -17,7 +17,7 @@
 
 Name:		gyachi
 Version:	1.1.46
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
 Group:		Applications/Internet
@@ -25,6 +25,7 @@
 URL:		http://gyachi.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 #Patch0:	configure.patch
+Patch1:         gyachi-1.1.46-libv4l.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -179,6 +180,7 @@
 %prep
 %setup -q
 #%patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -285,6 +287,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> - 1.1.46-10
+- Patch to use libv4l for support for more webcams
+
 * Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.1.46-9
 - include %%_libdir/gyachi directory
 - include recre8 theme directory



From dtimms at fedoraproject.org  Sun Sep  7 11:38:06 2008
From: dtimms at fedoraproject.org (David Timms)
Date: Sun,  7 Sep 2008 11:38:06 +0000 (UTC)
Subject: rpms/pyvnc2swf/F-8 .cvsignore,1.1,1.2
Message-ID: <20080907113806.55B8470126@cvs1.fedora.phx.redhat.com>

Author: dtimms

Update of /cvs/pkgs/rpms/pyvnc2swf/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19574

Modified Files:
	.cvsignore 
Log Message:
add missed cvsignore



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyvnc2swf/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:42:41 -0000	1.1
+++ .cvsignore	7 Sep 2008 11:37:35 -0000	1.2
@@ -0,0 +1 @@
+pyvnc2swf-0.9.3.tar.gz



From mnowak at fedoraproject.org  Sun Sep  7 11:38:35 2008
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Sun,  7 Sep 2008 11:38:35 +0000 (UTC)
Subject: rpms/python-id3/F-9 import.log,NONE,1.1 python-id3.spec,1.4,1.5
Message-ID: <20080907113835.C9F6670126@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/python-id3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19935/F-9

Modified Files:
	python-id3.spec 
Added Files:
	import.log 
Log Message:
python-id3-1.2-12



--- NEW FILE import.log ---
python-id3-1_2-12_fc9:F-9:python-id3-1.2-12.fc9.src.rpm:1220787454


Index: python-id3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-id3/F-9/python-id3.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-id3.spec	2 Feb 2007 13:56:56 -0000	1.4
+++ python-id3.spec	7 Sep 2008 11:38:05 -0000	1.5
@@ -2,17 +2,18 @@
 
 Name:           python-id3
 Version:        1.2
-Release:        9%{?dist}
+Release:        12%{?dist}
 Summary:        ID3 tag library for Python
 
 Group:          Development/Libraries
-License:        GPL
-URL:            http://id3-py.sourceforge.net/
-Source0:        http://dl.sourceforge.net/id3-py/id3-py_%{version}.tar.gz
+License:        GPLv2+
+URL:            http://id3-py.sourceforge.net
+Source:         http://dl.sourceforge.net/id3-py/id3-py_%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel
+BuildRequires:  python-setuptools-devel
 Provides:       id3-py = %{version}-%{release}
 Obsoletes:      id3-py < 1.2-8
 
@@ -24,30 +25,19 @@
 
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q -n id3-py-%{version}
 
 
 %build
-%{__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 --skip-build --root $RPM_BUILD_ROOT
+%{__install} -d -m 0755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+%{__install} -p -m 0644 id3-tagger.py $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/id3-tagger.py
+iconv -f ISO-8859-1 -t UTF8 README -o README
 
 
 %clean
@@ -55,12 +45,30 @@
 
 
 %files
-%defattr(-,root,root,-)
-%doc CHANGES COPYING README
-%{python_sitelib}/ID3.py*
+%defattr(0644,root,root,0755)
+%doc CHANGES COPYING README id3-tagger.py
+%{python_sitelib}/ID3.py
+%{python_sitelib}/ID3.pyc
+%{python_sitelib}/ID3.pyo
+%{python_sitelib}/*egg-info
 
 
 %changelog
+* Sat Sep 06 2008 Michal Nowak <mnowak at redhat.com> - 1.2-12
+- removed patch python-id3-setup-license.patch
+
+* Sat Sep 06 2008 Michal Nowak <mnowak at redhat.com> - 1.2-11
+- bundled sample app id3-tagger.py as a %%doc
+- explicitly set %%defattr(0644,root,root,0755) because of id3-tagger.py 
+  being executable
+- installed EGG info + patch to include it's GPLv2+ license in proper field
+- BuildRequires: python-setuptools-devel
+- package conforms to https://fedoraproject.org/wiki/Packaging/Python/Eggs
+- README is now UTF-8
+
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2-10
+- fix license tag
+
 * Sat Dec 23 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.2-9
 - Rebuild with Python 2.5.
 - BuildRequires: python-devel is now necessary for a successful build.



From jwrdegoede at fedoraproject.org  Sun Sep  7 12:12:32 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun,  7 Sep 2008 12:12:32 +0000 (UTC)
Subject: rpms/ClanLib06/devel ClanLib-0.6.5-suse.patch, 1.1,
	1.2 ClanLib-0.6.5-tolua++.patch, 1.1, 1.2 ClanLib06.spec, 1.12, 1.13
Message-ID: <20080907121232.D2F5470126@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/ClanLib06/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30439

Modified Files:
	ClanLib-0.6.5-suse.patch ClanLib-0.6.5-tolua++.patch 
	ClanLib06.spec 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.6.5-13
- Fix patch fuzz build failure


ClanLib-0.6.5-suse.patch:

Index: ClanLib-0.6.5-suse.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ClanLib06/devel/ClanLib-0.6.5-suse.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClanLib-0.6.5-suse.patch	24 Jul 2006 14:03:00 -0000	1.1
+++ ClanLib-0.6.5-suse.patch	7 Sep 2008 12:12:32 -0000	1.2
@@ -1,67 +1,33 @@
---- ClanLib-0.6.5/configure.in.suse	2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/configure.in	2006-07-20 12:41:47.000000000 +0200
-@@ -217,7 +217,7 @@
- 
- CHECK_LIB(GL,Setup/Tests/opengl.cpp, OPENGL=enabled, OPENGL=disabled, [$x_libraries -lGL -lGLU -lpthread])
- CHECK_LIB(mikmod,Setup/Tests/mikmod.cpp, mikmod=enabled, mikmod=disabled, [$x_libraries -lmikmod])
--CHECK_LIB(png,Setup/Tests/png.cpp, png=enabled, png=disabled, [$x_libraries -lpng])
-+CHECK_LIB(png,Setup/Tests/png.cpp, png=enabled, png=disabled, [$x_libraries -lpng -lz])
- CHECK_LIB(jpeg,Setup/Tests/jpeg.cpp, jpeg=enabled, jpeg=disabled, [$x_libraries -ljpeg])
- dnl hack force lua
- lua=enabled
---- ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in.suse	2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in	2006-07-20 12:41:38.000000000 +0200
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.app.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.app.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.app.in.foo	2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.app.in	2008-09-07 13:39:37.000000000 +0200
 @@ -5,14 +5,14 @@
- clanSmallJPEG: Libs/libclanSmallJPEG.so Libs/libclanSmallJPEG.a
+ clanApp: Libs/libclanApp.so Libs/libclanApp.a
  
- installSmallJPEG: clanSmallJPEG
--	@for i in `find Sources/API/SmallJPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
--	@for i in `find Sources/API/SmallJPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
--	@install -m 0644 Sources/API/jpeg.h $(INC_PREFIX)/ClanLib/jpeg.h
+ installApp: clanApp
+-	@for i in `find Sources/API/Application -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+-	@for i in `find Sources/API/Application -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+-	@install -m 0644 Sources/API/application.h $(INC_PREFIX)/ClanLib/application.h
 -	@install -d $(LIB_PREFIX)
--	@install Libs/libclanSmallJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
--	@install Libs/libclanSmallJPEG.a $(LIB_PREFIX)
--	@ln -s -f libclanSmallJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanSmallJPEG.so.$(D_VERSION_MAJOR)
--	@ln -s -f libclanSmallJPEG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanSmallJPEG.so
-+	@for i in `find Sources/API/SmallJPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+	@for i in `find Sources/API/SmallJPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+	@install -m 0644 Sources/API/jpeg.h $(DESTDIR)$(INC_PREFIX)/ClanLib/jpeg.h
+-	@install Libs/libclanApp.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
+-	@install Libs/libclanApp.a $(LIB_PREFIX)
+-	@ln -s -f libclanApp.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanApp.so.$(D_VERSION_MAJOR)
+-	@ln -s -f libclanApp.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanApp.so
++	@for i in `find Sources/API/Application -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++	@for i in `find Sources/API/Application -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++	@install -m 0644 Sources/API/application.h $(DESTDIR)$(INC_PREFIX)/ClanLib/application.h
 +	@install -d $(DESTDIR)$(LIB_PREFIX)
-+	@install Libs/libclanSmallJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
-+	@install Libs/libclanSmallJPEG.a $(DESTDIR)$(LIB_PREFIX)
-+	@ln -s -f libclanSmallJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanSmallJPEG.so.$(D_VERSION_MAJOR)
-+	@ln -s -f libclanSmallJPEG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanSmallJPEG.so
- 
- 
- OBJF_LIB_SMALLJPEG = \
---- ClanLib-0.6.5/Setup/Unix/Makefile.gui.in.suse	2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.gui.in	2006-07-20 12:41:38.000000000 +0200
-@@ -5,14 +5,14 @@
- clanGUI: Libs/libclanGUI.so Libs/libclanGUI.a
++	@install Libs/libclanApp.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
++	@install Libs/libclanApp.a $(DESTDIR)$(LIB_PREFIX)
++	@ln -s -f libclanApp.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanApp.so.$(D_VERSION_MAJOR)
++	@ln -s -f libclanApp.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanApp.so
  
- installGUI: clanGUI
--	@for i in `find Sources/API/GUI -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
--	@for i in `find Sources/API/GUI -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
--	@install -m 0644 Sources/API/gui.h $(INC_PREFIX)/ClanLib/gui.h
--	@install -d $(LIB_PREFIX)
--	@install Libs/libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
--	@install Libs/libclanGUI.a $(LIB_PREFIX)
--	@ln -s -f libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanGUI.so.$(D_VERSION_MAJOR)
--	@ln -s -f libclanGUI.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanGUI.so
-+	@for i in `find Sources/API/GUI -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+	@for i in `find Sources/API/GUI -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+	@install -m 0644 Sources/API/gui.h $(DESTDIR)$(INC_PREFIX)/ClanLib/gui.h
-+	@install -d $(DESTDIR)$(LIB_PREFIX)
-+	@install Libs/libclanGUI.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
-+	@install Libs/libclanGUI.a $(DESTDIR)$(LIB_PREFIX)
-+	@ln -s -f libclanGUI.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanGUI.so.$(D_VERSION_MAJOR)
-+	@ln -s -f libclanGUI.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanGUI.so
  
- OBJF_LIB_GUI = \
- 	Libs/Intermediate/button.o \
---- ClanLib-0.6.5/Setup/Unix/Makefile.conf.in.suse	2006-07-20 12:41:38.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.conf.in	2006-07-20 12:48:21.000000000 +0200
-@@ -13,7 +13,7 @@
+ OBJF_LIB_App = Libs/Intermediate/clanapp.o
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.conf.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.conf.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.conf.in.foo	2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.conf.in	2008-09-07 13:39:37.000000000 +0200
+@@ -13,7 +13,7 @@ INC_PREFIX    = @includedir@
  BIN_PREFIX    = @bindir@
  TARGET_PREFIX = @libdir@/ClanLib
  MAN_PREFIX    = @mandir@
@@ -70,7 +36,7 @@
  INCLUDE_DIRS  = -I Sources @x_includes@ @extra_includes@
  
  COMP_OPTIONS  = -Wall $(INCLUDE_DIRS) -fPIC -DNOCONTROLS -D__int64=int64_t @DEFS@ @comp_mode@ @directfb_cflags@
-@@ -34,19 +34,19 @@
+@@ -34,19 +34,19 @@ Libs/Intermediate/%.o : %.cpp
  	@echo "Compiling $<"
  	- at if [ ! -d Libs ]; then mkdir Libs; fi
  	- at if [ ! -d Libs/Intermediate ]; then mkdir Libs/Intermediate; fi
@@ -93,8 +59,9 @@
  
  build_info:
  	@echo Compile command .cpp = $(CXX_COMMAND)
---- ClanLib-0.6.5/Setup/Unix/Makefile.core.in.suse	2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.core.in	2006-07-20 12:47:40.000000000 +0200
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.core.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.core.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.core.in.foo	2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.core.in	2008-09-07 13:39:37.000000000 +0200
 @@ -5,21 +5,21 @@
  clanCore: build_info Libs/libclanCore.so Libs/libclanCore.a
  
@@ -132,83 +99,9 @@
  
  OBJF_CORE_GENERIC = \
  	Libs/Intermediate/cl_assert.o \
---- ClanLib-0.6.5/Setup/Unix/Makefile.sound.in.suse	2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.sound.in	2006-07-20 12:41:38.000000000 +0200
-@@ -4,14 +4,14 @@
- clanSound: Libs/libclanSound.so Libs/libclanSound.a
- 
- installSound: clanSound
--	@for i in `find Sources/API/Sound -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
--	@for i in `find Sources/API/Sound -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
--	@install -m 0644 Sources/API/sound.h $(INC_PREFIX)/ClanLib/sound.h
--	@install -d $(LIB_PREFIX)
--	@install Libs/libclanSound.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
--	@install Libs/libclanSound.a $(LIB_PREFIX)
--	@ln -s -f libclanSound.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanSound.so.$(D_VERSION_MAJOR)
--	@ln -s -f libclanSound.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanSound.so
-+	@for i in `find Sources/API/Sound -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+	@for i in `find Sources/API/Sound -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+	@install -m 0644 Sources/API/sound.h $(DESTDIR)$(INC_PREFIX)/ClanLib/sound.h
-+	@install -d $(DESTDIR)$(LIB_PREFIX)
-+	@install Libs/libclanSound.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
-+	@install Libs/libclanSound.a $(DESTDIR)$(LIB_PREFIX)
-+	@ln -s -f libclanSound.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanSound.so.$(D_VERSION_MAJOR)
-+	@ln -s -f libclanSound.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanSound.so
- 
- OBJF_SOUND_GENERIC = \
- 	Libs/Intermediate/sound.o \
---- ClanLib-0.6.5/Setup/Unix/Makefile.app.in.suse	2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.app.in	2006-07-20 12:41:38.000000000 +0200
-@@ -5,14 +5,14 @@
- clanApp: Libs/libclanApp.so Libs/libclanApp.a
- 
- installApp: clanApp
--	@for i in `find Sources/API/Application -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
--	@for i in `find Sources/API/Application -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
--	@install -m 0644 Sources/API/application.h $(INC_PREFIX)/ClanLib/application.h
--	@install -d $(LIB_PREFIX)
--	@install Libs/libclanApp.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
--	@install Libs/libclanApp.a $(LIB_PREFIX)
--	@ln -s -f libclanApp.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanApp.so.$(D_VERSION_MAJOR)
--	@ln -s -f libclanApp.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanApp.so
-+	@for i in `find Sources/API/Application -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+	@for i in `find Sources/API/Application -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+	@install -m 0644 Sources/API/application.h $(DESTDIR)$(INC_PREFIX)/ClanLib/application.h
-+	@install -d $(DESTDIR)$(LIB_PREFIX)
-+	@install Libs/libclanApp.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
-+	@install Libs/libclanApp.a $(DESTDIR)$(LIB_PREFIX)
-+	@ln -s -f libclanApp.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanApp.so.$(D_VERSION_MAJOR)
-+	@ln -s -f libclanApp.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanApp.so
- 
- 
- OBJF_LIB_App = Libs/Intermediate/clanapp.o
---- ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in.suse	2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in	2006-07-20 12:41:38.000000000 +0200
-@@ -5,14 +5,14 @@
- clanTTF: Libs/libclanTTF.so Libs/libclanTTF.a
- 
- installTTF: clanTTF
--	@for i in `find Sources/API/TTF -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
--	@for i in `find Sources/API/TTF -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
--	@install -m 0644 Sources/API/ttf.h $(INC_PREFIX)/ClanLib/ttf.h
--	@install -d $(LIB_PREFIX)
--	@install Libs/libclanTTF.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
--	@install Libs/libclanTTF.a $(LIB_PREFIX)
--	@ln -s -f libclanTTF.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanTTF.so.$(D_VERSION_MAJOR)
--	@ln -s -f libclanTTF.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanTTF.so
-+	@for i in `find Sources/API/TTF -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+	@for i in `find Sources/API/TTF -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+	@install -m 0644 Sources/API/ttf.h $(DESTDIR)$(INC_PREFIX)/ClanLib/ttf.h
-+	@install -d $(DESTDIR)$(LIB_PREFIX)
-+	@install Libs/libclanTTF.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
-+	@install Libs/libclanTTF.a $(DESTDIR)$(LIB_PREFIX)
-+	@ln -s -f libclanTTF.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanTTF.so.$(D_VERSION_MAJOR)
-+	@ln -s -f libclanTTF.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanTTF.so
- 
- 
- OBJF_LIB_TTF = \
---- ClanLib-0.6.5/Setup/Unix/Makefile.display.in.suse	2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.display.in	2006-07-20 12:41:38.000000000 +0200
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.display.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.display.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.display.in.foo	2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.display.in	2008-09-07 13:39:37.000000000 +0200
 @@ -4,14 +4,14 @@
  clanDisplay: Libs/libclanDisplay.so Libs/libclanDisplay.a
  
@@ -232,8 +125,9 @@
  
  
  OBJF_DISP_GENERIC = \
---- ClanLib-0.6.5/Setup/Unix/Makefile.gl.in.suse	2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.gl.in	2006-07-20 12:41:38.000000000 +0200
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.gl.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.gl.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.gl.in.foo	2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.gl.in	2008-09-07 13:39:37.000000000 +0200
 @@ -5,14 +5,14 @@
  clanGL: Libs/libclanGL.so Libs/libclanGL.a
  
@@ -257,33 +151,61 @@
  
  OBJF_LIB_GL = Libs/Intermediate/texture_gl.o \
  		Libs/Intermediate/opengl.o \
---- ClanLib-0.6.5/Setup/Unix/Makefile.network.in.suse	2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.network.in	2006-07-20 12:41:38.000000000 +0200
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.gui.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.gui.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.gui.in.foo	2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.gui.in	2008-09-07 13:39:37.000000000 +0200
 @@ -5,14 +5,14 @@
- clanNetwork: Libs/libclanNetwork.so Libs/libclanNetwork.a
+ clanGUI: Libs/libclanGUI.so Libs/libclanGUI.a
  
- installNetwork: clanNetwork
--	@for i in `find Sources/API/Network -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
--	@for i in `find Sources/API/Network -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
--	@install -m 0644 Sources/API/network.h $(INC_PREFIX)/ClanLib/network.h
+ installGUI: clanGUI
+-	@for i in `find Sources/API/GUI -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+-	@for i in `find Sources/API/GUI -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+-	@install -m 0644 Sources/API/gui.h $(INC_PREFIX)/ClanLib/gui.h
 -	@install -d $(LIB_PREFIX)
--	@install Libs/libclanNetwork.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
--	@install Libs/libclanNetwork.a $(LIB_PREFIX)
--	@ln -s -f libclanNetwork.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanNetwork.so.$(D_VERSION_MAJOR)
--	@ln -s -f libclanNetwork.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanNetwork.so
-+	@for i in `find Sources/API/Network -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+	@for i in `find Sources/API/Network -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+	@install -m 0644 Sources/API/network.h $(DESTDIR)$(INC_PREFIX)/ClanLib/network.h
+-	@install Libs/libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
+-	@install Libs/libclanGUI.a $(LIB_PREFIX)
+-	@ln -s -f libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanGUI.so.$(D_VERSION_MAJOR)
+-	@ln -s -f libclanGUI.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanGUI.so
++	@for i in `find Sources/API/GUI -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++	@for i in `find Sources/API/GUI -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++	@install -m 0644 Sources/API/gui.h $(DESTDIR)$(INC_PREFIX)/ClanLib/gui.h
 +	@install -d $(DESTDIR)$(LIB_PREFIX)
-+	@install Libs/libclanNetwork.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
-+	@install Libs/libclanNetwork.a $(DESTDIR)$(LIB_PREFIX)
-+	@ln -s -f libclanNetwork.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanNetwork.so.$(D_VERSION_MAJOR)
-+	@ln -s -f libclanNetwork.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanNetwork.so
++	@install Libs/libclanGUI.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
++	@install Libs/libclanGUI.a $(DESTDIR)$(LIB_PREFIX)
++	@ln -s -f libclanGUI.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanGUI.so.$(D_VERSION_MAJOR)
++	@ln -s -f libclanGUI.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanGUI.so
  
- OBJF_LIB_NETWORK = Libs/Intermediate/netcomputer.o \
- 	Libs/Intermediate/browse_client.o \
---- ClanLib-0.6.5/Setup/Unix/Makefile.lua.in.suse	2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.lua.in	2006-07-20 12:41:38.000000000 +0200
+ OBJF_LIB_GUI = \
+ 	Libs/Intermediate/button.o \
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in.foo	2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in	2008-09-07 13:39:37.000000000 +0200
+@@ -5,14 +5,14 @@
+ clanJPEG: Libs/libclanJPEG.so Libs/libclanJPEG.a
+ 
+ installJPEG: clanJPEG
+-	@for i in `find Sources/API/JPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+-	@for i in `find Sources/API/JPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+-	@install -m 0644 Sources/API/jpeg.h $(INC_PREFIX)/ClanLib/jpeg.h
+-	@install -d $(LIB_PREFIX)
+-	@install Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
+-	@install Libs/libclanJPEG.a $(LIB_PREFIX)
+-	@ln -s -f libclanJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanJPEG.so.$(D_VERSION_MAJOR)
+-	@ln -s -f libclanJPEG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanJPEG.so
++	@for i in `find Sources/API/JPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++	@for i in `find Sources/API/JPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++	@install -m 0644 Sources/API/jpeg.h $(DESTDIR)$(INC_PREFIX)/ClanLib/jpeg.h
++	@install -d $(DESTDIR)$(LIB_PREFIX)
++	@install Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
++	@install Libs/libclanJPEG.a $(DESTDIR)$(LIB_PREFIX)
++	@ln -s -f libclanJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanJPEG.so.$(D_VERSION_MAJOR)
++	@ln -s -f libclanJPEG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanJPEG.so
+ 
+ 
+ OBJF_LIB_JPEG = \
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.lua.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.lua.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.lua.in.foo	2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.lua.in	2008-09-07 13:39:37.000000000 +0200
 @@ -5,14 +5,14 @@
  clanLua: Libs/libclanLua.so Libs/libclanLua.a
  
@@ -307,33 +229,9 @@
  
  OBJF_LIB_LUA = \
  	Libs/Intermediate/clanbindings.o 
---- ClanLib-0.6.5/Setup/Unix/Makefile.png.in.suse	2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.png.in	2006-07-20 12:41:38.000000000 +0200
-@@ -5,14 +5,14 @@
- clanPNG: Libs/libclanPNG.so Libs/libclanPNG.a
- 
- installPNG: clanPNG
--	@for i in `find Sources/API/PNG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
--	@for i in `find Sources/API/PNG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
--	@install -m 0644 Sources/API/png.h $(INC_PREFIX)/ClanLib/png.h
--	@install -d $(LIB_PREFIX)
--	@install Libs/libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
--	@install Libs/libclanPNG.a $(LIB_PREFIX)
--	@ln -s -f libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanPNG.so.$(D_VERSION_MAJOR)
--	@ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanPNG.so
-+	@for i in `find Sources/API/PNG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+	@for i in `find Sources/API/PNG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+	@install -m 0644 Sources/API/png.h $(DESTDIR)$(INC_PREFIX)/ClanLib/png.h
-+	@install -d $(DESTDIR)$(LIB_PREFIX)
-+	@install Libs/libclanPNG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
-+	@install Libs/libclanPNG.a $(DESTDIR)$(LIB_PREFIX)
-+	@ln -s -f libclanPNG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanPNG.so.$(D_VERSION_MAJOR)
-+	@ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanPNG.so
- 
- 
- OBJF_LIB_PNG = \
---- ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in.suse	2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in	2006-07-20 12:41:38.000000000 +0200
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in.foo	2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in	2008-09-07 13:39:37.000000000 +0200
 @@ -5,14 +5,14 @@
  clanMikMod: Libs/libclanMikMod.so Libs/libclanMikMod.a
  
@@ -357,8 +255,9 @@
  
  OBJF_LIB_MIKMOD = \
  	Libs/Intermediate/resourcetype_module.o \
---- ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in.suse	2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in	2006-07-20 12:41:38.000000000 +0200
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in.foo	2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in	2008-09-07 13:39:37.000000000 +0200
 @@ -5,14 +5,14 @@
  clanMPEG: Libs/libclanMPEG.so Libs/libclanMPEG.a
  
@@ -382,262 +281,270 @@
  
  OBJF_LIB_MPEG =	\
  	Libs/Intermediate/mpeg_soundprovider.o
---- ClanLib-0.6.5/Setup/Unix/Makefile.signals.in.suse	2001-03-17 00:56:33.000000000 +0100
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.signals.in	2006-07-20 12:41:38.000000000 +0200
-@@ -5,6 +5,6 @@
- clanSignals:
- 
- installSignals: clanSignals
--	@for i in `find Sources/API/Signals -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
--	@for i in `find Sources/API/Signals -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
--	@install -m 0644 Sources/API/signals.h $(INC_PREFIX)/ClanLib/signals.h
-+	@for i in `find Sources/API/Signals -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+	@for i in `find Sources/API/Signals -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+	@install -m 0644 Sources/API/signals.h $(DESTDIR)$(INC_PREFIX)/ClanLib/signals.h
---- ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in.suse	2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in	2006-07-20 12:41:38.000000000 +0200
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.network.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.network.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.network.in.foo	2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.network.in	2008-09-07 13:39:37.000000000 +0200
 @@ -5,14 +5,14 @@
- clanVorbis: Libs/libclanVorbis.so Libs/libclanVorbis.a
+ clanNetwork: Libs/libclanNetwork.so Libs/libclanNetwork.a
  
- installVorbis: clanVorbis
--	@for i in `find Sources/API/Vorbis -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
--	@for i in `find Sources/API/Vorbis -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
--	@install -m 0644 Sources/API/vorbis.h $(INC_PREFIX)/ClanLib/vorbis.h
+ installNetwork: clanNetwork
+-	@for i in `find Sources/API/Network -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+-	@for i in `find Sources/API/Network -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+-	@install -m 0644 Sources/API/network.h $(INC_PREFIX)/ClanLib/network.h
 -	@install -d $(LIB_PREFIX)
--	@install Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
--	@install Libs/libclanVorbis.a $(LIB_PREFIX)
--	@ln -s -f libclanVorbis.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanVorbis.so.$(D_VERSION_MAJOR)
--	@ln -s -f libclanVorbis.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanVorbis.so
-+	@for i in `find Sources/API/Vorbis -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+	@for i in `find Sources/API/Vorbis -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+	@install -m 0644 Sources/API/vorbis.h $(DESTDIR)$(INC_PREFIX)/ClanLib/vorbis.h
+-	@install Libs/libclanNetwork.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
+-	@install Libs/libclanNetwork.a $(LIB_PREFIX)
+-	@ln -s -f libclanNetwork.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanNetwork.so.$(D_VERSION_MAJOR)
+-	@ln -s -f libclanNetwork.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanNetwork.so
++	@for i in `find Sources/API/Network -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++	@for i in `find Sources/API/Network -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++	@install -m 0644 Sources/API/network.h $(DESTDIR)$(INC_PREFIX)/ClanLib/network.h
 +	@install -d $(DESTDIR)$(LIB_PREFIX)
-+	@install Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
-+	@install Libs/libclanVorbis.a $(DESTDIR)$(LIB_PREFIX)
-+	@ln -s -f libclanVorbis.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanVorbis.so.$(D_VERSION_MAJOR)
-+	@ln -s -f libclanVorbis.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanVorbis.so
++	@install Libs/libclanNetwork.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
++	@install Libs/libclanNetwork.a $(DESTDIR)$(LIB_PREFIX)
++	@ln -s -f libclanNetwork.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanNetwork.so.$(D_VERSION_MAJOR)
++	@ln -s -f libclanNetwork.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanNetwork.so
  
- OBJF_LIB_VORBIS = \
- 	Libs/Intermediate/vorbis_soundprovider_generic.o \
---- ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in.suse	2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in	2006-07-20 12:41:38.000000000 +0200
+ OBJF_LIB_NETWORK = Libs/Intermediate/netcomputer.o \
+ 	Libs/Intermediate/browse_client.o \
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.png.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.png.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.png.in.foo	2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.png.in	2008-09-07 13:39:37.000000000 +0200
 @@ -5,14 +5,14 @@
- clanJPEG: Libs/libclanJPEG.so Libs/libclanJPEG.a
+ clanPNG: Libs/libclanPNG.so Libs/libclanPNG.a
  
- installJPEG: clanJPEG
--	@for i in `find Sources/API/JPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
--	@for i in `find Sources/API/JPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+ installPNG: clanPNG
+-	@for i in `find Sources/API/PNG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+-	@for i in `find Sources/API/PNG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+-	@install -m 0644 Sources/API/png.h $(INC_PREFIX)/ClanLib/png.h
+-	@install -d $(LIB_PREFIX)
+-	@install Libs/libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
+-	@install Libs/libclanPNG.a $(LIB_PREFIX)
+-	@ln -s -f libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanPNG.so.$(D_VERSION_MAJOR)
+-	@ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanPNG.so
++	@for i in `find Sources/API/PNG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++	@for i in `find Sources/API/PNG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++	@install -m 0644 Sources/API/png.h $(DESTDIR)$(INC_PREFIX)/ClanLib/png.h
++	@install -d $(DESTDIR)$(LIB_PREFIX)
++	@install Libs/libclanPNG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
++	@install Libs/libclanPNG.a $(DESTDIR)$(LIB_PREFIX)
++	@ln -s -f libclanPNG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanPNG.so.$(D_VERSION_MAJOR)
++	@ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanPNG.so
+ 
+ 
+ OBJF_LIB_PNG = \
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.signals.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.signals.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.signals.in.foo	2001-03-17 00:56:33.000000000 +0100
++++ ClanLib-0.6.5/Setup/Unix/Makefile.signals.in	2008-09-07 13:39:37.000000000 +0200
+@@ -5,6 +5,6 @@
+ clanSignals:
+ 
+ installSignals: clanSignals
+-	@for i in `find Sources/API/Signals -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+-	@for i in `find Sources/API/Signals -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+-	@install -m 0644 Sources/API/signals.h $(INC_PREFIX)/ClanLib/signals.h
++	@for i in `find Sources/API/Signals -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++	@for i in `find Sources/API/Signals -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++	@install -m 0644 Sources/API/signals.h $(DESTDIR)$(INC_PREFIX)/ClanLib/signals.h
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in.foo	2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in	2008-09-07 13:39:37.000000000 +0200
+@@ -5,14 +5,14 @@
+ clanSmallJPEG: Libs/libclanSmallJPEG.so Libs/libclanSmallJPEG.a
+ 
+ installSmallJPEG: clanSmallJPEG
+-	@for i in `find Sources/API/SmallJPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+-	@for i in `find Sources/API/SmallJPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
 -	@install -m 0644 Sources/API/jpeg.h $(INC_PREFIX)/ClanLib/jpeg.h
 -	@install -d $(LIB_PREFIX)
--	@install Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
--	@install Libs/libclanJPEG.a $(LIB_PREFIX)
--	@ln -s -f libclanJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanJPEG.so.$(D_VERSION_MAJOR)
--	@ln -s -f libclanJPEG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanJPEG.so
-+	@for i in `find Sources/API/JPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+	@for i in `find Sources/API/JPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
+-	@install Libs/libclanSmallJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
+-	@install Libs/libclanSmallJPEG.a $(LIB_PREFIX)
+-	@ln -s -f libclanSmallJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanSmallJPEG.so.$(D_VERSION_MAJOR)
+-	@ln -s -f libclanSmallJPEG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanSmallJPEG.so
++	@for i in `find Sources/API/SmallJPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++	@for i in `find Sources/API/SmallJPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
 +	@install -m 0644 Sources/API/jpeg.h $(DESTDIR)$(INC_PREFIX)/ClanLib/jpeg.h
 +	@install -d $(DESTDIR)$(LIB_PREFIX)
-+	@install Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
-+	@install Libs/libclanJPEG.a $(DESTDIR)$(LIB_PREFIX)
-+	@ln -s -f libclanJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanJPEG.so.$(D_VERSION_MAJOR)
-+	@ln -s -f libclanJPEG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanJPEG.so
++	@install Libs/libclanSmallJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
++	@install Libs/libclanSmallJPEG.a $(DESTDIR)$(LIB_PREFIX)
++	@ln -s -f libclanSmallJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanSmallJPEG.so.$(D_VERSION_MAJOR)
++	@ln -s -f libclanSmallJPEG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanSmallJPEG.so
  
  
- OBJF_LIB_JPEG = \
---- ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h.suse	2001-09-08 21:24:20.000000000 +0200
-+++ ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h	2006-07-20 12:41:47.000000000 +0200
-@@ -20,14 +20,20 @@
- #ifndef header_network_delivery_pipe
- #define header_network_delivery_pipe
+ OBJF_LIB_SMALLJPEG = \
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.sound.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.sound.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.sound.in.foo	2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.sound.in	2008-09-07 13:39:37.000000000 +0200
+@@ -4,14 +4,14 @@
+ clanSound: Libs/libclanSound.so Libs/libclanSound.a
  
-+#ifndef WIN32
-+#include <cerrno>
-+#include <cstring>
-+#else
-+#include <errno.h>
-+#include <string.h>
-+#endif
-+
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <arpa/inet.h>
- #include <netinet/in.h>
- #include <unistd.h>
--#include <errno.h>
--#include <string.h>
- #include <list>
+ installSound: clanSound
+-	@for i in `find Sources/API/Sound -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+-	@for i in `find Sources/API/Sound -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+-	@install -m 0644 Sources/API/sound.h $(INC_PREFIX)/ClanLib/sound.h
+-	@install -d $(LIB_PREFIX)
+-	@install Libs/libclanSound.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
+-	@install Libs/libclanSound.a $(LIB_PREFIX)
+-	@ln -s -f libclanSound.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanSound.so.$(D_VERSION_MAJOR)
+-	@ln -s -f libclanSound.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanSound.so
++	@for i in `find Sources/API/Sound -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++	@for i in `find Sources/API/Sound -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++	@install -m 0644 Sources/API/sound.h $(DESTDIR)$(INC_PREFIX)/ClanLib/sound.h
++	@install -d $(DESTDIR)$(LIB_PREFIX)
++	@install Libs/libclanSound.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
++	@install Libs/libclanSound.a $(DESTDIR)$(LIB_PREFIX)
++	@ln -s -f libclanSound.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanSound.so.$(D_VERSION_MAJOR)
++	@ln -s -f libclanSound.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanSound.so
  
- #include "Network/Generic/network_delivery_impl.h"
---- ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h.suse	2001-11-01 21:27:57.000000000 +0100
-+++ ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h	2006-07-20 12:41:47.000000000 +0200
-@@ -20,18 +20,19 @@
+ OBJF_SOUND_GENERIC = \
+ 	Libs/Intermediate/sound.o \
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in.foo	2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in	2008-09-07 13:39:37.000000000 +0200
+@@ -5,14 +5,14 @@
+ clanTTF: Libs/libclanTTF.so Libs/libclanTTF.a
  
- #ifdef WIN32
- 	#include <windows.h>
-+	#include <string.h>
- #else
-+	#include <cstring>
-+	#include <cerrno>
- 	#include <sys/time.h>
- 	#include <sys/types.h>
- 	#include <sys/socket.h>
- 	#include <arpa/inet.h>
- 	#include <netinet/in.h>
- 	#include <unistd.h>
--	#include <errno.h>
- 	#include <fcntl.h>
- #endif
+ installTTF: clanTTF
+-	@for i in `find Sources/API/TTF -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+-	@for i in `find Sources/API/TTF -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+-	@install -m 0644 Sources/API/ttf.h $(INC_PREFIX)/ClanLib/ttf.h
+-	@install -d $(LIB_PREFIX)
+-	@install Libs/libclanTTF.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
+-	@install Libs/libclanTTF.a $(LIB_PREFIX)
+-	@ln -s -f libclanTTF.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanTTF.so.$(D_VERSION_MAJOR)
+-	@ln -s -f libclanTTF.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanTTF.so
++	@for i in `find Sources/API/TTF -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++	@for i in `find Sources/API/TTF -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++	@install -m 0644 Sources/API/ttf.h $(DESTDIR)$(INC_PREFIX)/ClanLib/ttf.h
++	@install -d $(DESTDIR)$(LIB_PREFIX)
++	@install Libs/libclanTTF.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
++	@install Libs/libclanTTF.a $(DESTDIR)$(LIB_PREFIX)
++	@ln -s -f libclanTTF.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanTTF.so.$(D_VERSION_MAJOR)
++	@ln -s -f libclanTTF.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanTTF.so
  
--#include <string.h>
- #include <list>
- #include <queue>
  
---- ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h.suse	2001-09-08 21:12:52.000000000 +0200
-+++ ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h	2006-07-20 12:41:47.000000000 +0200
-@@ -23,7 +23,12 @@
- #define XMD_H
- #endif
+ OBJF_LIB_TTF = \
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in.foo	2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in	2008-09-07 13:39:37.000000000 +0200
+@@ -5,14 +5,14 @@
+ clanVorbis: Libs/libclanVorbis.so Libs/libclanVorbis.a
+ 
+ installVorbis: clanVorbis
+-	@for i in `find Sources/API/Vorbis -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+-	@for i in `find Sources/API/Vorbis -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+-	@install -m 0644 Sources/API/vorbis.h $(INC_PREFIX)/ClanLib/vorbis.h
+-	@install -d $(LIB_PREFIX)
+-	@install Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
+-	@install Libs/libclanVorbis.a $(LIB_PREFIX)
+-	@ln -s -f libclanVorbis.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanVorbis.so.$(D_VERSION_MAJOR)
+-	@ln -s -f libclanVorbis.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanVorbis.so
++	@for i in `find Sources/API/Vorbis -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++	@for i in `find Sources/API/Vorbis -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++	@install -m 0644 Sources/API/vorbis.h $(DESTDIR)$(INC_PREFIX)/ClanLib/vorbis.h
++	@install -d $(DESTDIR)$(LIB_PREFIX)
++	@install Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
++	@install Libs/libclanVorbis.a $(DESTDIR)$(LIB_PREFIX)
++	@ln -s -f libclanVorbis.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanVorbis.so.$(D_VERSION_MAJOR)
++	@ln -s -f libclanVorbis.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanVorbis.so
+ 
+ OBJF_LIB_VORBIS = \
+ 	Libs/Intermediate/vorbis_soundprovider_generic.o \
+diff -up ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h.foo ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h
+--- ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h.foo	2001-12-11 21:44:18.000000000 +0100
++++ ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h	2008-09-07 13:39:37.000000000 +0200
+@@ -23,7 +23,11 @@
  
-+#ifndef WIN32
-+#include <cstdio>
-+#else
- #include <stdio.h>
-+#endif
-+
- extern "C"
- {
- 	#include <jpeglib.h>
---- ClanLib-0.6.5/Sources/GUI/component_manager_generic.h.suse	2002-01-08 11:17:25.000000000 +0100
-+++ ClanLib-0.6.5/Sources/GUI/component_manager_generic.h	2006-07-20 12:41:47.000000000 +0200
-@@ -14,7 +14,11 @@
  #include <string>
  #include <stack>
- #include <vector>
 +#ifndef WIN32
 +#include <cstdio>
 +#else
  #include <stdio.h>
 +#endif
  
- #include "API/GUI/component_manager.h"
- #include "API/GUI/stylemanager.h"
---- ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h.suse	2001-12-11 21:44:20.000000000 +0100
-+++ ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h	2006-07-20 12:41:47.000000000 +0200
-@@ -22,7 +22,12 @@
- #ifndef header_streamed_mikmod_sample
- #define header_streamed_mikmod_sample
+ //: Inputsource reading from file.
+ class CL_InputSource_File : public CL_InputSource
+diff -up ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h.foo ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h
+--- ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h.foo	2001-12-11 21:44:18.000000000 +0100
++++ ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h	2008-09-07 13:39:37.000000000 +0200
+@@ -22,7 +22,11 @@
+ #include "outputsource.h"
  
-+#ifndef WIN32
-+#include <cstdlib>
-+#else
- #include <stdlib.h>
-+#endif
-+
- #include "../core.h"
- #include "../Sound/stream_soundprovider.h"
- #include "../Sound/soundbuffer.h"
---- ClanLib-0.6.5/Sources/API/GUI/component_options.h.suse	2002-02-20 08:47:11.000000000 +0100
-+++ ClanLib-0.6.5/Sources/API/GUI/component_options.h	2006-07-20 12:41:47.000000000 +0200
-@@ -23,7 +23,12 @@
- #include "../Core/System/error.h"
- #include <map>
  #include <string>
-+
 +#ifndef WIN32
 +#include <cstdio>
 +#else
  #include <stdio.h>
 +#endif
  
- #ifdef WIN32
- #define snprintf _snprintf
---- ClanLib-0.6.5/Sources/API/GUI/gui_manager.h.suse	2002-01-30 14:17:16.000000000 +0100
-+++ ClanLib-0.6.5/Sources/API/GUI/gui_manager.h	2006-07-20 12:41:47.000000000 +0200
-@@ -19,7 +19,11 @@
- #ifndef header_gui_manager
- #define header_gui_manager
+ //: Outputsource writing to file.
+ class CL_OutputSource_File : public CL_OutputSource
+diff -up ClanLib-0.6.5/Sources/API/Core/Math/math.h.foo ClanLib-0.6.5/Sources/API/Core/Math/math.h
+--- ClanLib-0.6.5/Sources/API/Core/Math/math.h.foo	2001-09-06 20:52:05.000000000 +0200
++++ ClanLib-0.6.5/Sources/API/Core/Math/math.h	2008-09-07 13:39:37.000000000 +0200
+@@ -16,7 +16,11 @@
+ #ifndef header_math
+ #define header_math
  
 +#ifndef WIN32
-+#include <cstddef>
++#include <cmath>
 +#else
- #include <stddef.h>
+ #include <math.h>
 +#endif
  
- #include "component.h"
- 
---- ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h.suse	2001-09-22 17:52:18.000000000 +0200
-+++ ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h	2006-07-20 12:41:47.000000000 +0200
-@@ -19,7 +19,11 @@
- #ifndef header_soundbuffer_session
- #define header_soundbuffer_session
+ #ifndef PI
+ #ifndef M_PI
+diff -up ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h.foo ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h
+--- ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h.foo	2001-09-22 17:52:11.000000000 +0200
++++ ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h	2008-09-07 13:39:37.000000000 +0200
+@@ -81,7 +81,7 @@ public:
+ 	static void die(bool a, const char *file, int line, const char *func, const char *assert_str);
  
-+#ifndef WIN32
-+#include <cstdlib>
-+#else
- #include <stdlib.h>
-+#endif
+ 	//: Writes an info statements on the specified channel.
+-	//: <p>Don't callthis one directly, instead use the cl_info macro.
++	//: <p>Don't call this one directly, instead use the cl_info macro.
+ 	//:  For example: cl_info(info_network, "MyClass::my_funx - Hello World.");</p>
+ 	//- channel - Channel to use. (Use the ErrorChannels enum's)
+ 	//- text - text to print.
+diff -up ClanLib-0.6.5/Sources/API/Core/System/clanstring.h.foo ClanLib-0.6.5/Sources/API/Core/System/clanstring.h
+--- ClanLib-0.6.5/Sources/API/Core/System/clanstring.h.foo	2002-02-20 09:06:28.000000000 +0100
++++ ClanLib-0.6.5/Sources/API/Core/System/clanstring.h	2008-09-07 13:39:37.000000000 +0200
+@@ -21,11 +21,19 @@
  
- class CL_SoundCard;
- class CL_SoundPlayBackDesc;
---- ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h.suse	2001-12-11 21:44:21.000000000 +0100
-+++ ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h	2006-07-20 12:41:47.000000000 +0200
-@@ -22,7 +22,12 @@
- #ifndef header_streamed_wave_sample
- #define header_streamed_wave_sample
+ #include <string>
  
 +#ifndef WIN32
++#include <cstdio>
 +#include <cstdlib>
++#include <cstring>
++#include <cstdio>
 +#else
+ #include <stdio.h>
  #include <stdlib.h>
+ #include <string.h>
+-#include <iostream>
+ #include <stdio.h>
 +#endif
 +
- #include "../../Core/IOData/inputsource.h"
- #include "../stream_soundprovider.h"
- #include "../soundbuffer.h"
---- ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h.suse	2001-12-11 21:44:21.000000000 +0100
-+++ ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h	2006-07-20 12:41:47.000000000 +0200
-@@ -22,7 +22,12 @@
- #ifndef header_streamed_raw_sample
- #define header_streamed_raw_sample
- 
-+#ifndef WIN32
-+#include <cstdlib>
-+#else
- #include <stdlib.h>
-+#endif
-+
- #include "../stream_soundprovider.h"
- #include "../soundbuffer.h"
- 
---- ClanLib-0.6.5/Sources/API/Sound/sound.h.suse	2002-06-13 16:43:17.000000000 +0200
-+++ ClanLib-0.6.5/Sources/API/Sound/sound.h	2006-07-20 12:41:47.000000000 +0200
-@@ -20,7 +20,11 @@
- #define header_sound
- 
- #include <vector>
-+#ifndef WIN32
-+#include <cstdlib>
-+#else
- #include <stdlib.h>
-+#endif
- #include "soundbuffer.h"
- #include "../Core/System/cl_assert.h"
- 
---- ClanLib-0.6.5/Sources/API/efence.h.suse	2001-09-06 20:52:04.000000000 +0200
-+++ ClanLib-0.6.5/Sources/API/efence.h	2006-07-20 12:41:47.000000000 +0200
-@@ -23,7 +23,7 @@
++#include <iostream>
  
  #ifndef WIN32
+ #include <cctype>
+@@ -53,7 +61,8 @@ extern char *fcvt (double, int, int *, i
+ #include "../Resources/resource_manager.h"
+ #include "error.h"
  
--#include <stdlib.h>
-+#include <cstdlib>
+-using namespace std;
++//this should *never* appear in a header
++//using namespace std;
  
- void *operator new(size_t size)
- {
---- ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h.suse	2001-11-01 14:56:50.000000000 +0100
-+++ ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h	2006-07-20 12:41:38.000000000 +0200
-@@ -167,24 +167,24 @@
+ //: Clan String Class
+ class CL_String
+diff -up ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h.foo ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h
+--- ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h.foo	2001-11-01 14:56:50.000000000 +0100
++++ ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h	2008-09-07 13:39:37.000000000 +0200
+@@ -167,24 +167,24 @@ public:
  			case 15:
  			case 16:
  				{
@@ -668,94 +575,56 @@
  					}
  				}
  				return;
---- ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h.suse	2001-09-22 17:52:11.000000000 +0200
-+++ ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h	2006-07-20 12:41:47.000000000 +0200
-@@ -81,7 +81,7 @@
- 	static void die(bool a, const char *file, int line, const char *func, const char *assert_str);
- 
- 	//: Writes an info statements on the specified channel.
--	//: <p>Don't callthis one directly, instead use the cl_info macro.
-+	//: <p>Don't call this one directly, instead use the cl_info macro.
- 	//:  For example: cl_info(info_network, "MyClass::my_funx - Hello World.");</p>
- 	//- channel - Channel to use. (Use the ErrorChannels enum's)
- 	//- text - text to print.
---- ClanLib-0.6.5/Sources/API/Core/System/clanstring.h.suse	2002-02-20 09:06:28.000000000 +0100
-+++ ClanLib-0.6.5/Sources/API/Core/System/clanstring.h	2006-07-20 12:41:47.000000000 +0200
-@@ -21,11 +21,19 @@
- 
+diff -up ClanLib-0.6.5/Sources/API/GUI/component_options.h.foo ClanLib-0.6.5/Sources/API/GUI/component_options.h
+--- ClanLib-0.6.5/Sources/API/GUI/component_options.h.foo	2002-02-20 08:47:11.000000000 +0100
++++ ClanLib-0.6.5/Sources/API/GUI/component_options.h	2008-09-07 13:39:37.000000000 +0200
+@@ -23,7 +23,12 @@
+ #include "../Core/System/error.h"
+ #include <map>
  #include <string>
- 
++
 +#ifndef WIN32
 +#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
-+#include <cstdio>
 +#else
  #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <iostream>
- #include <stdio.h>
 +#endif
-+
-+#include <iostream>
- 
- #ifndef WIN32
- #include <cctype>
-@@ -53,7 +61,8 @@
- #include "../Resources/resource_manager.h"
- #include "error.h"
- 
--using namespace std;
-+//this should *never* appear in a header
-+//using namespace std;
  
- //: Clan String Class
- class CL_String
---- ClanLib-0.6.5/Sources/API/Core/Math/math.h.suse	2001-09-06 20:52:05.000000000 +0200
-+++ ClanLib-0.6.5/Sources/API/Core/Math/math.h	2006-07-20 12:41:47.000000000 +0200
-@@ -16,7 +16,11 @@
- #ifndef header_math
- #define header_math
+ #ifdef WIN32
+ #define snprintf _snprintf
+diff -up ClanLib-0.6.5/Sources/API/GUI/gui_manager.h.foo ClanLib-0.6.5/Sources/API/GUI/gui_manager.h
+--- ClanLib-0.6.5/Sources/API/GUI/gui_manager.h.foo	2002-01-30 14:17:16.000000000 +0100
++++ ClanLib-0.6.5/Sources/API/GUI/gui_manager.h	2008-09-07 13:39:37.000000000 +0200
+@@ -19,7 +19,11 @@
+ #ifndef header_gui_manager
+ #define header_gui_manager
  
 +#ifndef WIN32
-+#include <cmath>
++#include <cstddef>
 +#else
- #include <math.h>
+ #include <stddef.h>
 +#endif
  
- #ifndef PI
- #ifndef M_PI
---- ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h.suse	2001-12-11 21:44:18.000000000 +0100
-+++ ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h	2006-07-20 12:41:47.000000000 +0200
-@@ -22,7 +22,11 @@
- #include "outputsource.h"
- 
- #include <string>
-+#ifndef WIN32
-+#include <cstdio>
-+#else
- #include <stdio.h>
-+#endif
+ #include "component.h"
  
- //: Outputsource writing to file.
- class CL_OutputSource_File : public CL_OutputSource
---- ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h.suse	2001-12-11 21:44:18.000000000 +0100
-+++ ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h	2006-07-20 12:41:47.000000000 +0200
-@@ -23,7 +23,11 @@
+diff -up ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h.foo ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h
+--- ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h.foo	2001-12-11 21:44:20.000000000 +0100
++++ ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h	2008-09-07 13:39:37.000000000 +0200
+@@ -22,7 +22,12 @@
+ #ifndef header_streamed_mikmod_sample
+ #define header_streamed_mikmod_sample
  
- #include <string>
- #include <stack>
 +#ifndef WIN32
-+#include <cstdio>
++#include <cstdlib>
 +#else
- #include <stdio.h>
+ #include <stdlib.h>
 +#endif
- 
- //: Inputsource reading from file.
- class CL_InputSource_File : public CL_InputSource
---- ClanLib-0.6.5/Sources/API/Signals/slot.h.suse	2001-09-22 17:52:17.000000000 +0200
-+++ ClanLib-0.6.5/Sources/API/Signals/slot.h	2006-07-20 12:41:47.000000000 +0200
++
+ #include "../core.h"
+ #include "../Sound/stream_soundprovider.h"
+ #include "../Sound/soundbuffer.h"
+diff -up ClanLib-0.6.5/Sources/API/Signals/slot.h.foo ClanLib-0.6.5/Sources/API/Signals/slot.h
+--- ClanLib-0.6.5/Sources/API/Signals/slot.h.foo	2001-09-22 17:52:17.000000000 +0200
++++ ClanLib-0.6.5/Sources/API/Signals/slot.h	2008-09-07 13:39:37.000000000 +0200
 @@ -20,7 +20,11 @@
  #define header_slot
  
@@ -768,235 +637,160 @@
  
  //: Slot class
  class CL_Slot
---- ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp.suse	2002-02-16 17:10:41.000000000 +0100
-+++ ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp	2006-07-20 12:41:47.000000000 +0200
-@@ -363,7 +363,8 @@
- 
- void (*CL_GLX_DisplayCard::get_proc_address(const std::string& function_name))()
- {
--	return glXGetProcAddressARB((GLubyte*)function_name.c_str());
-+	return glXGetProcAddress(reinterpret_cast<GLubyte*>(
-+			const_cast<char *>(function_name.c_str())));
- }
- 
- 
---- ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp.suse	2002-08-14 15:58:29.000000000 +0200
-+++ ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp	2006-07-20 12:41:38.000000000 +0200
-@@ -27,6 +27,7 @@
- #include "API/Core/System/error.h"
- #include "API/Sound/SoundProviders/static_provider_raw.h"
- #include "API/Sound/SoundProviders/static_provider_wave.h"
-+#include "API/Core/IOData/cl_endian.h"
+diff -up ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h.foo ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h
+--- ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h.foo	2001-12-11 21:44:21.000000000 +0100
++++ ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h	2008-09-07 13:39:37.000000000 +0200
+@@ -22,7 +22,12 @@
+ #ifndef header_streamed_raw_sample
+ #define header_streamed_raw_sample
  
- CL_SoundBuffer *CL_Sample::create(const std::string &sample_id, CL_InputSourceProvider *provider)
- {
---- ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp.suse	2002-08-14 16:00:13.000000000 +0200
-+++ ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp	2006-07-20 12:41:38.000000000 +0200
-@@ -22,6 +22,7 @@
++#ifndef WIN32
++#include <cstdlib>
++#else
+ #include <stdlib.h>
++#endif
++
+ #include "../stream_soundprovider.h"
+ #include "../soundbuffer.h"
  
- #include "API/Core/System/cl_assert.h"
- #include "API/Core/System/error.h"
-+#include "API/Core/IOData/cl_endian.h"
- #include "API/Core/IOData/inputsource.h"
- #include "API/Core/IOData/inputsource_provider.h"
- #include "API/Sound/SoundProviders/stream_provider_wave.h"
-@@ -118,10 +119,13 @@
- //	cl_assert(!(memcmp(temp, "data", 4)));
+diff -up ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h.foo ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h
+--- ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h.foo	2001-12-11 21:44:21.000000000 +0100
++++ ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h	2008-09-07 13:39:37.000000000 +0200
+@@ -22,7 +22,12 @@
+ #ifndef header_streamed_wave_sample
+ #define header_streamed_wave_sample
  
- 	sample_size = input->read_uint32();
-+	SWAP_IF_BIG(format.nSamplesPerSec);
- 	sample_freq = format.nSamplesPerSec;
++#ifndef WIN32
++#include <cstdlib>
++#else
+ #include <stdlib.h>
++#endif
++
+ #include "../../Core/IOData/inputsource.h"
+ #include "../stream_soundprovider.h"
+ #include "../soundbuffer.h"
+diff -up ClanLib-0.6.5/Sources/API/Sound/sound.h.foo ClanLib-0.6.5/Sources/API/Sound/sound.h
+--- ClanLib-0.6.5/Sources/API/Sound/sound.h.foo	2002-06-13 16:43:17.000000000 +0200
++++ ClanLib-0.6.5/Sources/API/Sound/sound.h	2008-09-07 13:39:37.000000000 +0200
+@@ -20,7 +20,11 @@
+ #define header_sound
  
-+	SWAP_IF_BIG(format.nAvgBytesPerSec);
- 	int bytes_per_sample = format.nAvgBytesPerSec / format.nSamplesPerSec;
+ #include <vector>
++#ifndef WIN32
++#include <cstdlib>
++#else
+ #include <stdlib.h>
++#endif
+ #include "soundbuffer.h"
+ #include "../Core/System/cl_assert.h"
  
-+	SWAP_IF_BIG(format.nChannels);
- 	if (format.nChannels == 2 && bytes_per_sample == 4) sample_format = sf_16bit_signed_stereo;
- 	else if (format.nChannels == 2 && bytes_per_sample == 2) sample_format = sf_8bit_signed_stereo;
- 	else if (format.nChannels == 1 && bytes_per_sample == 2) sample_format = sf_16bit_signed;
---- ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h.suse	2001-04-20 14:54:18.000000000 +0200
-+++ ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h	2006-07-20 12:41:47.000000000 +0200
-@@ -22,6 +22,15 @@
- #ifndef MAIN_H
- #define MAIN_H
+diff -up ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h.foo ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h
+--- ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h.foo	2001-09-22 17:52:18.000000000 +0200
++++ ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h	2008-09-07 13:39:37.000000000 +0200
+@@ -19,7 +19,11 @@
+ #ifndef header_soundbuffer_session
+ #define header_soundbuffer_session
  
 +#ifndef WIN32
 +#include <cstdlib>
-+#include <cstdio>
-+#include <cmath>
-+#include <cstring>
-+#include <cctype>
-+#include <csetjmp>
-+#include <cassert>
 +#else
  #include <stdlib.h>
- #include <stdio.h>
- #include <math.h>
-@@ -29,6 +38,7 @@
- #include <ctype.h>
- #include <setjmp.h>
- #include <assert.h>
 +#endif
  
- typedef   signed char  schar;       /*  8 bits     */
- typedef unsigned char  uchar;       /*  8 bits     */
---- ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp.suse	2001-03-06 16:09:19.000000000 +0100
-+++ ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp	2006-07-20 12:41:38.000000000 +0200
-@@ -153,15 +153,12 @@
+ class CL_SoundCard;
+ class CL_SoundPlayBackDesc;
+diff -up ClanLib-0.6.5/Sources/API/efence.h.foo ClanLib-0.6.5/Sources/API/efence.h
+--- ClanLib-0.6.5/Sources/API/efence.h.foo	2001-09-06 20:52:04.000000000 +0200
++++ ClanLib-0.6.5/Sources/API/efence.h	2008-09-07 13:39:37.000000000 +0200
+@@ -23,7 +23,7 @@
  
- unsigned int CL_Target_XImage_Std::get_pitch() const
- {
--	int bytes_per_pixel = (get_depth()+7)/8;
--
--	return m_width*bytes_per_pixel;
-+	return m_pitch;
- }
- 	
- unsigned int CL_Target_XImage_Std::get_depth() const
+ #ifndef WIN32
+ 
+-#include <stdlib.h>
++#include <cstdlib>
+ 
+ void *operator new(size_t size)
  {
--	int hack = (m_visual_info.bits_per_rgb+7)/8;
--	return hack*8;
-+	return m_depth;
- }
+diff -up ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp.foo ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp
+--- ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp.foo	2002-01-10 11:23:30.000000000 +0100
++++ ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp	2008-09-07 13:39:37.000000000 +0200
+@@ -13,6 +13,7 @@
+         ------------------------------------------------------------------------
+ */
  
- unsigned int CL_Target_XImage_Std::get_red_mask() const
---- ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp.suse	2002-04-04 03:16:11.000000000 +0200
-+++ ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp	2006-07-20 12:41:38.000000000 +0200
-@@ -51,12 +51,32 @@
++#include <cassert>
+ #include <API/Core/System/error.h>
+ #include <iostream>
+ #include <libgen.h>
+diff -up ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h.foo ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h
+--- ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h.foo	2002-01-10 00:45:16.000000000 +0100
++++ ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h	2008-09-07 13:39:37.000000000 +0200
+@@ -21,7 +21,11 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <dirent.h>
+-#include <stdio.h>
++#ifndef WIN32
++#include <cstdio>
++#else
++#include <cstdio>
++#endif
+ #include <unistd.h>
  
- 	if (!mode_set) // save original mode
- 	{
-+	        XF86VidModeModeLine l;
- 		memset(&orig_mode, 0, sizeof(orig_mode));
- 		memset(&orig_view, 0, sizeof(orig_view));
-+		memset(&l, 0, sizeof(l));
+ class CL_DirectoryScanner_Unix : public CL_DirectoryScanner_Generic
+diff -up ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h.foo ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h
+--- ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h.foo	2000-05-03 20:29:00.000000000 +0200
++++ ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h	2008-09-07 13:39:37.000000000 +0200
+@@ -435,6 +435,7 @@ private:
  
- 		// Get mode info. (missing XF86VidModeGetModeInfo)
--		XF86VidModeModeLine *l = (XF86VidModeModeLine*)((char*) &orig_mode + sizeof orig_mode.dotclock);
--		cl_assert(XF86VidModeGetModeLine(dpy, scr, (int*) &orig_mode.dotclock, l) == True);
-+		//  XF86VidModeModeLine *l = (XF86VidModeModeLine*)((char*) &orig_mode + sizeof orig_mode.dotclock);
-+		//  there is a problem with alignment on 64bit platforms
-+		
-+		
-+		cl_assert(XF86VidModeGetModeLine(dpy, scr, (int*) &orig_mode.dotclock, &l) == True);
-+
-+		
-+		// this should be ok on all platforms
-+		orig_mode.hdisplay = l.hdisplay;
-+		orig_mode.hsyncstart = l.hsyncstart;
-+		orig_mode.hsyncend = l.hsyncend;
-+		orig_mode.htotal = l.htotal;
-+		orig_mode.hskew = l.hskew;
-+		orig_mode.vdisplay = l.vdisplay;
-+		orig_mode.vsyncstart = l.vsyncstart;
-+		orig_mode.vsyncend = l.vsyncend;
-+		orig_mode.vtotal = l.vtotal;
-+		orig_mode.flags = l.flags;
-+		orig_mode.privsize = l.privsize;
-+		orig_mode.c_private = l.c_private;
- 
- 		// Get the viewport position.
- 		cl_assert(XF86VidModeGetViewPort(dpy, scr, &orig_view.x, &orig_view.y) == True);
---- ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp.suse	2002-02-18 23:47:37.000000000 +0100
-+++ ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp	2006-07-20 12:41:38.000000000 +0200
-@@ -713,13 +713,13 @@
- 				}
- 			}
- 		}
--	
-+		break;	
- 	case 2:
- 		{
- 			register unsigned short _color = (unsigned short) color;
- 			int skip = dest_pitch - delta_x * 2;
- 			// the blitter probes if it can perform a memset (when hi and lo byte of _color are equal)
--			if ((_color & 0x00FF) != (_color & 0xFF00))
-+			if ((_color & 0x00FF) != ((_color & 0xFF00) >> 8))
- 			{
- 				for (unsigned int y = 0; y < delta_y; y++)
- 				{
-@@ -758,8 +758,8 @@
- 				for (unsigned int x = 0; x < delta_x; x++)
- 				{
- 					*(dest++) = color & 0x0000FF;
--					*(dest++) = color & 0x00FF00;
--					*(dest++) = color & 0xFF0000;
-+					*(dest++) = (color & 0x00FF00) >> 8;
-+					*(dest++) = (color & 0xFF0000) >> 16;
- 				}
- 				dest += skip;
- 			}
---- ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h.suse	2001-09-02 19:33:37.000000000 +0200
-+++ ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h	2006-07-20 12:41:47.000000000 +0200
-@@ -107,14 +107,14 @@
- 		{
- 			T a = alpha_data[x];
- 			T destval = dst_data[x];
--			T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a];	//(((destval&rmask)>>rstart)*a)>>8;
--			T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a];	//(((destval&gmask)>>gstart)*a)>>8;
--			T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a];	//(((destval&bmask)>>bstart)*a)>>8;
-+			T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a];	//(((destval&rmask)>>rstart)*a)>>8;
-+			T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a];	//(((destval&gmask)>>gstart)*a)>>8;
-+			T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a];	//(((destval&bmask)>>bstart)*a)>>8;
+ class FileConfig : public BaseConfig
+ {
++protected: class ConfigGroup; /* prototype for later definition */
+ public:
+   /** @name Constructors and destructor */
+   //@{
+@@ -527,7 +528,6 @@ public:
  
- 			T amix = 
--				(r<<rstart) +
--				(g<<gstart) + 
--				(b<<bstart);
-+				(r<<this->rstart) +
-+				(g<<this->gstart) + 
-+				(b<<this->bstart);
+ //protected: --- if FileConfig::ConfigEntry is not public, functions in
+ //               ConfigGroup such as Find/AddEntry can't return ConfigEntry*!
+-  class ConfigGroup;
+   class ConfigEntry
+   {
+   private:
+diff -up ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp.foo ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp
+--- ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp.foo	2002-02-26 21:38:11.000000000 +0100
++++ ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp	2008-09-07 13:39:37.000000000 +0200
+@@ -17,12 +17,12 @@
+ #ifdef USE_DIRECTFB
  
- 			dst_data[x] = amix + *(src_data++);
- 		}
-@@ -151,13 +151,13 @@
- 		{
- 			T a = alpha_data[x];
- 			T destval = dst_buf[x];
--			T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a];
--			T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a];
--			T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a];
-+			T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a];
-+			T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a];
-+			T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a];
- 			T amix = 
--				(r<<rstart) +
--				(g<<gstart) + 
--				(b<<bstart);
-+				(r<<this->rstart) +
-+				(g<<this->gstart) + 
-+				(b<<this->bstart);
- 			dst_buf[x] = amix + *(src_data++);
- 		}
- 		memcpy(dst_data, dst_buf, sizeof(T)*rep);
---- ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h.suse	2001-04-12 21:58:17.000000000 +0200
-+++ ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h	2006-07-20 12:41:47.000000000 +0200
-@@ -20,7 +20,11 @@
- #define header_blitters
  
- class CL_Target;
-+#ifndef WIN32
+-#include <stdlib.h>
+-#include <stdio.h>
+-#include <string.h>
+-#include <iostream>
 +#include <cstdlib>
-+#else
- #include <stdlib.h>
-+#endif
- #include "API/Display/Display/cliprect.h"
- /*
- #include "API/Display/Display/surfaceprovider.h"
---- ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp.suse	2001-09-02 04:24:43.000000000 +0200
-+++ ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp	2006-07-20 12:41:38.000000000 +0200
-@@ -278,7 +278,7 @@
- 	unsigned int dest_pitch = target->get_pitch();
++#include <cstdio>
++#include <cstring>
++#include <cmath>
  
- 	unsigned char *dest = (unsigned char *) target->get_data();
--	dest += x*sizeof(T) + (y-1)*dest_pitch;
-+	dest += x*sizeof(T) + y*dest_pitch - dest_pitch;
+-#include <math.h>
++#include <iostream>
  
- //	T *dd;
- 	
---- ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp.suse	2002-02-26 21:38:11.000000000 +0100
-+++ ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp	2006-07-20 12:41:38.000000000 +0200
-@@ -104,7 +104,7 @@
+ #include <API/Display/Display/mousecursor.h>
+ #include <API/Display/Display/cliprect.h>
+@@ -177,7 +177,7 @@ void CL_DirectFB_DisplayCard::set_videom
+ 
+       if (fullscreen)
+ 	{
+-	  cerr << "CL_DirectFB_DisplayCard: Falling back to DFSCL_NORMAL" << endl;
++	  std::cerr << "CL_DirectFB_DisplayCard: Falling back to DFSCL_NORMAL" << std::endl;
+ 	  dfb->SetCooperativeLevel (dfb, DFSCL_NORMAL);
+ 	  ret = dfb->SetVideoMode (dfb, get_width(), get_height(), bpp);
+ 	}
+diff -up ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp.foo ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp
+--- ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp.foo	2002-02-26 21:38:11.000000000 +0100
++++ ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp	2008-09-07 13:39:37.000000000 +0200
+@@ -104,7 +104,7 @@ unsigned int CL_Target_DirectFB::get_num
  
  unsigned int CL_Target_DirectFB::get_width() const
  {
@@ -1005,7 +799,7 @@
  
    surface->GetSize (surface, &width, NULL);
  
-@@ -113,7 +113,7 @@
+@@ -113,7 +113,7 @@ unsigned int CL_Target_DirectFB::get_wid
  
  unsigned int CL_Target_DirectFB::get_height() const
  {
@@ -1014,7 +808,7 @@
  
    surface->GetSize (surface, NULL, &height);
  
-@@ -147,7 +147,7 @@
+@@ -147,7 +147,7 @@ unsigned int CL_Target_DirectFB::get_red
      {
      case DSPF_A8:
        return 0;
@@ -1023,7 +817,7 @@
        return 0x007c00;
      case DSPF_RGB16:
        return 0x00f800;
-@@ -170,7 +170,7 @@
+@@ -170,7 +170,7 @@ unsigned int CL_Target_DirectFB::get_gre
      {
      case DSPF_A8:
        return 0;
@@ -1032,7 +826,7 @@
        return 0x0003e0;
      case DSPF_RGB16:
        return 0x0007e0;
-@@ -193,7 +193,7 @@
+@@ -193,7 +193,7 @@ unsigned int CL_Target_DirectFB::get_blu
      {
      case DSPF_A8:
        return 0;
@@ -1041,7 +835,7 @@
      case DSPF_RGB16:
        return 0x00001f;
      case DSPF_RGB24:
-@@ -215,7 +215,7 @@
+@@ -215,7 +215,7 @@ unsigned int CL_Target_DirectFB::get_alp
      {
      case DSPF_A8:
        return 0xff;
@@ -1050,7 +844,7 @@
      case DSPF_RGB16:
      case DSPF_RGB24:
      case DSPF_RGB32:
-@@ -263,7 +263,7 @@
+@@ -263,7 +263,7 @@ void CL_Target_DirectFB::Flip (DFBRegion
  
  void CL_Target_DirectFB::Clear (float r, float g, float b, float a)
  {
@@ -1059,75 +853,333 @@
  
    surface->GetSize (surface, &width, &height);
  
---- ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp.suse	2002-02-26 21:38:11.000000000 +0100
-+++ ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp	2006-07-20 12:41:47.000000000 +0200
-@@ -17,12 +17,12 @@
- #ifdef USE_DIRECTFB
+diff -up ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h.foo ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h
+--- ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h.foo	2001-09-02 19:33:37.000000000 +0200
++++ ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h	2008-09-07 13:39:37.000000000 +0200
+@@ -107,14 +107,14 @@ public:
+ 		{
+ 			T a = alpha_data[x];
+ 			T destval = dst_data[x];
+-			T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a];	//(((destval&rmask)>>rstart)*a)>>8;
+-			T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a];	//(((destval&gmask)>>gstart)*a)>>8;
+-			T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a];	//(((destval&bmask)>>bstart)*a)>>8;
++			T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a];	//(((destval&rmask)>>rstart)*a)>>8;
++			T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a];	//(((destval&gmask)>>gstart)*a)>>8;
++			T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a];	//(((destval&bmask)>>bstart)*a)>>8;
  
+ 			T amix = 
+-				(r<<rstart) +
+-				(g<<gstart) + 
+-				(b<<bstart);
++				(r<<this->rstart) +
++				(g<<this->gstart) + 
++				(b<<this->bstart);
  
--#include <stdlib.h>
--#include <stdio.h>
--#include <string.h>
--#include <iostream>
+ 			dst_data[x] = amix + *(src_data++);
+ 		}
+@@ -151,13 +151,13 @@ public:
+ 		{
+ 			T a = alpha_data[x];
+ 			T destval = dst_buf[x];
+-			T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a];
+-			T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a];
+-			T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a];
++			T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a];
++			T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a];
++			T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a];
+ 			T amix = 
+-				(r<<rstart) +
+-				(g<<gstart) + 
+-				(b<<bstart);
++				(r<<this->rstart) +
++				(g<<this->gstart) + 
++				(b<<this->bstart);
+ 			dst_buf[x] = amix + *(src_data++);
+ 		}
+ 		memcpy(dst_data, dst_buf, sizeof(T)*rep);
+diff -up ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp.foo ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp
+--- ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp.foo	2001-09-02 04:24:43.000000000 +0200
++++ ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp	2008-09-07 13:39:37.000000000 +0200
+@@ -278,7 +278,7 @@ void SubBlitter_Transparent<T>::blt_nocl
+ 	unsigned int dest_pitch = target->get_pitch();
+ 
+ 	unsigned char *dest = (unsigned char *) target->get_data();
+-	dest += x*sizeof(T) + (y-1)*dest_pitch;
++	dest += x*sizeof(T) + y*dest_pitch - dest_pitch;
+ 
+ //	T *dd;
+ 	
+diff -up ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h.foo ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h
+--- ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h.foo	2001-04-12 21:58:17.000000000 +0200
++++ ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h	2008-09-07 13:39:37.000000000 +0200
+@@ -20,7 +20,11 @@
+ #define header_blitters
+ 
+ class CL_Target;
++#ifndef WIN32
 +#include <cstdlib>
-+#include <cstdio>
-+#include <cstring>
-+#include <cmath>
++#else
+ #include <stdlib.h>
++#endif
+ #include "API/Display/Display/cliprect.h"
+ /*
+ #include "API/Display/Display/surfaceprovider.h"
+diff -up ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp.foo ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp
+--- ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp.foo	2002-02-18 23:47:37.000000000 +0100
++++ ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp	2008-09-07 13:39:37.000000000 +0200
+@@ -713,13 +713,13 @@ void cl_fill_rect_opaque(
+ 				}
+ 			}
+ 		}
+-	
++		break;	
+ 	case 2:
+ 		{
+ 			register unsigned short _color = (unsigned short) color;
+ 			int skip = dest_pitch - delta_x * 2;
+ 			// the blitter probes if it can perform a memset (when hi and lo byte of _color are equal)
+-			if ((_color & 0x00FF) != (_color & 0xFF00))
++			if ((_color & 0x00FF) != ((_color & 0xFF00) >> 8))
+ 			{
+ 				for (unsigned int y = 0; y < delta_y; y++)
+ 				{
+@@ -758,8 +758,8 @@ void cl_fill_rect_opaque(
+ 				for (unsigned int x = 0; x < delta_x; x++)
+ 				{
+ 					*(dest++) = color & 0x0000FF;
+-					*(dest++) = color & 0x00FF00;
+-					*(dest++) = color & 0xFF0000;
++					*(dest++) = (color & 0x00FF00) >> 8;
++					*(dest++) = (color & 0xFF0000) >> 16;
+ 				}
+ 				dest += skip;
+ 			}
+diff -up ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp.foo ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp
+--- ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp.foo	2001-03-06 16:09:19.000000000 +0100
++++ ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp	2008-09-07 13:39:37.000000000 +0200
+@@ -153,15 +153,12 @@ unsigned int CL_Target_XImage_Std::get_h
  
--#include <math.h>
-+#include <iostream>
+ unsigned int CL_Target_XImage_Std::get_pitch() const
+ {
+-	int bytes_per_pixel = (get_depth()+7)/8;
+-
+-	return m_width*bytes_per_pixel;
++	return m_pitch;
+ }
+ 	
+ unsigned int CL_Target_XImage_Std::get_depth() const
+ {
+-	int hack = (m_visual_info.bits_per_rgb+7)/8;
+-	return hack*8;
++	return m_depth;
+ }
  
- #include <API/Display/Display/mousecursor.h>
- #include <API/Display/Display/cliprect.h>
-@@ -177,7 +177,7 @@
+ unsigned int CL_Target_XImage_Std::get_red_mask() const
+diff -up ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp.foo ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp
+--- ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp.foo	2002-04-04 03:16:11.000000000 +0200
++++ ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp	2008-09-07 13:39:37.000000000 +0200
+@@ -51,12 +51,32 @@ void CL_X11Resolution::set_mode(int widt
  
-       if (fullscreen)
+ 	if (!mode_set) // save original mode
  	{
--	  cerr << "CL_DirectFB_DisplayCard: Falling back to DFSCL_NORMAL" << endl;
-+	  std::cerr << "CL_DirectFB_DisplayCard: Falling back to DFSCL_NORMAL" << std::endl;
- 	  dfb->SetCooperativeLevel (dfb, DFSCL_NORMAL);
- 	  ret = dfb->SetVideoMode (dfb, get_width(), get_height(), bpp);
- 	}
---- ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h.suse	2000-05-03 20:29:00.000000000 +0200
-+++ ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h	2006-07-20 12:41:47.000000000 +0200
-@@ -435,6 +435,7 @@
++	        XF86VidModeModeLine l;
+ 		memset(&orig_mode, 0, sizeof(orig_mode));
+ 		memset(&orig_view, 0, sizeof(orig_view));
++		memset(&l, 0, sizeof(l));
  
- class FileConfig : public BaseConfig
+ 		// Get mode info. (missing XF86VidModeGetModeInfo)
+-		XF86VidModeModeLine *l = (XF86VidModeModeLine*)((char*) &orig_mode + sizeof orig_mode.dotclock);
+-		cl_assert(XF86VidModeGetModeLine(dpy, scr, (int*) &orig_mode.dotclock, l) == True);
++		//  XF86VidModeModeLine *l = (XF86VidModeModeLine*)((char*) &orig_mode + sizeof orig_mode.dotclock);
++		//  there is a problem with alignment on 64bit platforms
++		
++		
++		cl_assert(XF86VidModeGetModeLine(dpy, scr, (int*) &orig_mode.dotclock, &l) == True);
++
++		
++		// this should be ok on all platforms
++		orig_mode.hdisplay = l.hdisplay;
++		orig_mode.hsyncstart = l.hsyncstart;
++		orig_mode.hsyncend = l.hsyncend;
++		orig_mode.htotal = l.htotal;
++		orig_mode.hskew = l.hskew;
++		orig_mode.vdisplay = l.vdisplay;
++		orig_mode.vsyncstart = l.vsyncstart;
++		orig_mode.vsyncend = l.vsyncend;
++		orig_mode.vtotal = l.vtotal;
++		orig_mode.flags = l.flags;
++		orig_mode.privsize = l.privsize;
++		orig_mode.c_private = l.c_private;
+ 
+ 		// Get the viewport position.
+ 		cl_assert(XF86VidModeGetViewPort(dpy, scr, &orig_view.x, &orig_view.y) == True);
+diff -up ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp.foo ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp
+--- ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp.foo	2002-02-16 17:10:41.000000000 +0100
++++ ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp	2008-09-07 13:39:37.000000000 +0200
+@@ -363,7 +363,8 @@ void CL_GLX_DisplayCard::keep_alive()
+ 
+ void (*CL_GLX_DisplayCard::get_proc_address(const std::string& function_name))()
  {
-+protected: class ConfigGroup; /* prototype for later definition */
- public:
-   /** @name Constructors and destructor */
-   //@{
-@@ -527,7 +528,6 @@
+-	return glXGetProcAddressARB((GLubyte*)function_name.c_str());
++	return glXGetProcAddress(reinterpret_cast<GLubyte*>(
++			const_cast<char *>(function_name.c_str())));
+ }
  
- //protected: --- if FileConfig::ConfigEntry is not public, functions in
- //               ConfigGroup such as Find/AddEntry can't return ConfigEntry*!
--  class ConfigGroup;
-   class ConfigEntry
-   {
-   private:
---- ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp.suse	2002-01-10 11:23:30.000000000 +0100
-+++ ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp	2006-07-20 12:41:57.000000000 +0200
-@@ -13,6 +13,7 @@
-         ------------------------------------------------------------------------
- */
  
-+#include <cassert>
- #include <API/Core/System/error.h>
- #include <iostream>
- #include <libgen.h>
---- ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h.suse	2002-01-10 00:45:16.000000000 +0100
-+++ ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h	2006-07-20 12:41:47.000000000 +0200
-@@ -21,7 +21,11 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <dirent.h>
--#include <stdio.h>
+diff -up ClanLib-0.6.5/Sources/GUI/component_manager_generic.h.foo ClanLib-0.6.5/Sources/GUI/component_manager_generic.h
+--- ClanLib-0.6.5/Sources/GUI/component_manager_generic.h.foo	2002-01-08 11:17:25.000000000 +0100
++++ ClanLib-0.6.5/Sources/GUI/component_manager_generic.h	2008-09-07 13:39:37.000000000 +0200
+@@ -14,7 +14,11 @@
+ #include <string>
+ #include <stack>
+ #include <vector>
 +#ifndef WIN32
 +#include <cstdio>
 +#else
+ #include <stdio.h>
++#endif
+ 
+ #include "API/GUI/component_manager.h"
+ #include "API/GUI/stylemanager.h"
+diff -up ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h.foo ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h
+--- ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h.foo	2001-09-08 21:12:52.000000000 +0200
++++ ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h	2008-09-07 13:39:37.000000000 +0200
+@@ -23,7 +23,12 @@
+ #define XMD_H
+ #endif
+ 
++#ifndef WIN32
 +#include <cstdio>
++#else
+ #include <stdio.h>
++#endif
++
+ extern "C"
+ {
+ 	#include <jpeglib.h>
+diff -up ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h.foo ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h
+--- ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h.foo	2001-11-01 21:27:57.000000000 +0100
++++ ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h	2008-09-07 13:39:37.000000000 +0200
+@@ -20,18 +20,19 @@
+ 
+ #ifdef WIN32
+ 	#include <windows.h>
++	#include <string.h>
+ #else
++	#include <cstring>
++	#include <cerrno>
+ 	#include <sys/time.h>
+ 	#include <sys/types.h>
+ 	#include <sys/socket.h>
+ 	#include <arpa/inet.h>
+ 	#include <netinet/in.h>
+ 	#include <unistd.h>
+-	#include <errno.h>
+ 	#include <fcntl.h>
+ #endif
+ 
+-#include <string.h>
+ #include <list>
+ #include <queue>
+ 
+diff -up ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h.foo ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h
+--- ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h.foo	2001-09-08 21:24:20.000000000 +0200
++++ ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h	2008-09-07 13:39:37.000000000 +0200
+@@ -20,14 +20,20 @@
+ #ifndef header_network_delivery_pipe
+ #define header_network_delivery_pipe
+ 
++#ifndef WIN32
++#include <cerrno>
++#include <cstring>
++#else
++#include <errno.h>
++#include <string.h>
 +#endif
++
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <netinet/in.h>
  #include <unistd.h>
+-#include <errno.h>
+-#include <string.h>
+ #include <list>
  
- class CL_DirectoryScanner_Unix : public CL_DirectoryScanner_Generic
+ #include "Network/Generic/network_delivery_impl.h"
+diff -up ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h.foo ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h
+--- ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h.foo	2001-04-20 14:54:18.000000000 +0200
++++ ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h	2008-09-07 13:39:37.000000000 +0200
+@@ -22,6 +22,15 @@
+ #ifndef MAIN_H
+ #define MAIN_H
+ 
++#ifndef WIN32
++#include <cstdlib>
++#include <cstdio>
++#include <cmath>
++#include <cstring>
++#include <cctype>
++#include <csetjmp>
++#include <cassert>
++#else
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <math.h>
+@@ -29,6 +38,7 @@
+ #include <ctype.h>
+ #include <setjmp.h>
+ #include <assert.h>
++#endif
+ 
+ typedef   signed char  schar;       /*  8 bits     */
+ typedef unsigned char  uchar;       /*  8 bits     */
+diff -up ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp.foo ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp
+--- ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp.foo	2002-08-14 15:58:29.000000000 +0200
++++ ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp	2008-09-07 13:39:37.000000000 +0200
+@@ -27,6 +27,7 @@
+ #include "API/Core/System/error.h"
+ #include "API/Sound/SoundProviders/static_provider_raw.h"
+ #include "API/Sound/SoundProviders/static_provider_wave.h"
++#include "API/Core/IOData/cl_endian.h"
+ 
+ CL_SoundBuffer *CL_Sample::create(const std::string &sample_id, CL_InputSourceProvider *provider)
+ {
+diff -up ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp.foo ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp
+--- ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp.foo	2002-08-14 16:00:13.000000000 +0200
++++ ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp	2008-09-07 13:39:37.000000000 +0200
+@@ -22,6 +22,7 @@
+ 
+ #include "API/Core/System/cl_assert.h"
+ #include "API/Core/System/error.h"
++#include "API/Core/IOData/cl_endian.h"
+ #include "API/Core/IOData/inputsource.h"
+ #include "API/Core/IOData/inputsource_provider.h"
+ #include "API/Sound/SoundProviders/stream_provider_wave.h"
+@@ -118,10 +119,13 @@ CL_Streamed_WaveSample_Session::CL_Strea
+ //	cl_assert(!(memcmp(temp, "data", 4)));
+ 
+ 	sample_size = input->read_uint32();
++	SWAP_IF_BIG(format.nSamplesPerSec);
+ 	sample_freq = format.nSamplesPerSec;
+ 
++	SWAP_IF_BIG(format.nAvgBytesPerSec);
+ 	int bytes_per_sample = format.nAvgBytesPerSec / format.nSamplesPerSec;
+ 
++	SWAP_IF_BIG(format.nChannels);
+ 	if (format.nChannels == 2 && bytes_per_sample == 4) sample_format = sf_16bit_signed_stereo;
+ 	else if (format.nChannels == 2 && bytes_per_sample == 2) sample_format = sf_8bit_signed_stereo;
+ 	else if (format.nChannels == 1 && bytes_per_sample == 2) sample_format = sf_16bit_signed;
+diff -up ClanLib-0.6.5/configure.in.foo ClanLib-0.6.5/configure.in
+--- ClanLib-0.6.5/configure.in.foo	2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/configure.in	2008-09-07 13:39:37.000000000 +0200
+@@ -217,7 +217,7 @@ dnl CHECK_LIB(ggi,Setup/Tests/ggi.cpp, G
+ 
+ CHECK_LIB(GL,Setup/Tests/opengl.cpp, OPENGL=enabled, OPENGL=disabled, [$x_libraries -lGL -lGLU -lpthread])
+ CHECK_LIB(mikmod,Setup/Tests/mikmod.cpp, mikmod=enabled, mikmod=disabled, [$x_libraries -lmikmod])
+-CHECK_LIB(png,Setup/Tests/png.cpp, png=enabled, png=disabled, [$x_libraries -lpng])
++CHECK_LIB(png,Setup/Tests/png.cpp, png=enabled, png=disabled, [$x_libraries -lpng -lz])
+ CHECK_LIB(jpeg,Setup/Tests/jpeg.cpp, jpeg=enabled, jpeg=disabled, [$x_libraries -ljpeg])
+ for lib in lua40 lua; do
+ 	dnl setting back OLDLIBS is needed because of the break

ClanLib-0.6.5-tolua++.patch:

Index: ClanLib-0.6.5-tolua++.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ClanLib06/devel/ClanLib-0.6.5-tolua++.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClanLib-0.6.5-tolua++.patch	24 Jul 2006 14:03:00 -0000	1.1
+++ ClanLib-0.6.5-tolua++.patch	7 Sep 2008 12:12:32 -0000	1.2
@@ -1,21 +1,7 @@
---- ClanLib-0.6.5/configure.in~	2006-07-19 22:01:47.000000000 +0200
-+++ ClanLib-0.6.5/configure.in	2006-07-19 22:01:47.000000000 +0200
-@@ -219,10 +219,8 @@
- CHECK_LIB(mikmod,Setup/Tests/mikmod.cpp, mikmod=enabled, mikmod=disabled, [$x_libraries -lmikmod])
- CHECK_LIB(png,Setup/Tests/png.cpp, png=enabled, png=disabled, [$x_libraries -lpng])
- CHECK_LIB(jpeg,Setup/Tests/jpeg.cpp, jpeg=enabled, jpeg=disabled, [$x_libraries -ljpeg])
--for lib in lua40 lua; do
--	dnl setting back OLDLIBS is needed because of the break
--	CHECK_LIB($lib, Setup/Tests/lua.cpp, [ lua=enabled; LIBS="$OLDLIBS"; break ], lua=disabled, [ $x_libraries ])
--done
-+dnl hack force lua
-+lua=enabled
- CHECK_LIB(vorbis,Setup/Tests/vorbis.cpp, VORBIS=enabled, VORBIS=disabled, [$x_libraries -lvorbis])
- for lib in Xxf86vm_pic Xxf86vm; do
- 	dnl setting back OLDLIBS is needed because of the break
---- ClanLib-0.6.5.orig/Sources/API/Lua/lua.h	2001-09-22 17:52:16.000000000 +0200
-+++ ClanLib-0.6.5/Sources/API/Lua/lua.h	2006-07-19 22:34:06.000000000 +0200
-@@ -47,9 +47,9 @@
+diff -up ClanLib-0.6.5/Sources/API/Lua/lua.h.bar ClanLib-0.6.5/Sources/API/Lua/lua.h
+--- ClanLib-0.6.5/Sources/API/Lua/lua.h.bar	2001-09-22 17:52:16.000000000 +0200
++++ ClanLib-0.6.5/Sources/API/Lua/lua.h	2008-09-07 13:42:06.000000000 +0200
+@@ -47,9 +47,9 @@ public:
  	//: Init
  	static void init()
  	{
@@ -27,7 +13,7 @@
  		initialized=true;
  	}
  
-@@ -65,32 +65,32 @@
+@@ -65,32 +65,32 @@ public:
  	static int dofile (char *filename)
  	{ 
  		cl_assert(initialized);
@@ -65,3 +51,19 @@
  	}
  };
  #endif
+diff -up ClanLib-0.6.5/configure.in.bar ClanLib-0.6.5/configure.in
+--- ClanLib-0.6.5/configure.in.bar	2008-09-07 13:39:37.000000000 +0200
++++ ClanLib-0.6.5/configure.in	2008-09-07 13:42:06.000000000 +0200
+@@ -219,10 +219,8 @@ CHECK_LIB(GL,Setup/Tests/opengl.cpp, OPE
+ CHECK_LIB(mikmod,Setup/Tests/mikmod.cpp, mikmod=enabled, mikmod=disabled, [$x_libraries -lmikmod])
+ CHECK_LIB(png,Setup/Tests/png.cpp, png=enabled, png=disabled, [$x_libraries -lpng -lz])
+ CHECK_LIB(jpeg,Setup/Tests/jpeg.cpp, jpeg=enabled, jpeg=disabled, [$x_libraries -ljpeg])
+-for lib in lua40 lua; do
+-	dnl setting back OLDLIBS is needed because of the break
+-	CHECK_LIB($lib, Setup/Tests/lua.cpp, [ lua=enabled; LIBS="$OLDLIBS"; break ], lua=disabled, [ $x_libraries ])
+-done
++dnl hack force lua
++lua=enabled
+ CHECK_LIB(vorbis,Setup/Tests/vorbis.cpp, VORBIS=enabled, VORBIS=disabled, [$x_libraries -lvorbis])
+ for lib in Xxf86vm_pic Xxf86vm; do
+ 	dnl setting back OLDLIBS is needed because of the break


Index: ClanLib06.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ClanLib06/devel/ClanLib06.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ClanLib06.spec	2 Mar 2008 21:51:03 -0000	1.12
+++ ClanLib06.spec	7 Sep 2008 12:12:32 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:        Version 0.6 of this Cross platform C++ game library
 Name:           ClanLib06
 Version:        0.6.5
-Release:        12%{?dist}
+Release:        13%{?dist}
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://www.clanlib.org/
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.6.5-13
+- Fix patch fuzz build failure
+
 * Sun Mar  2 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.5-12
 - Add support for audio output through alsa (original ClanLib only supports
   OSS??), this also adds support for using pulseaudio through alsa



From jwrdegoede at fedoraproject.org  Sun Sep  7 12:14:39 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun,  7 Sep 2008 12:14:39 +0000 (UTC)
Subject: rpms/gyachi/devel gyachi.spec,1.19,1.20
Message-ID: <20080907121439.4258670126@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/gyachi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31068

Modified Files:
	gyachi.spec 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> - 1.1.46-10
- Patch to use libv4l for support for more webcams



Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/devel/gyachi.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gyachi.spec	7 Sep 2008 11:17:19 -0000	1.19
+++ gyachi.spec	7 Sep 2008 12:14:08 -0000	1.20
@@ -47,6 +47,7 @@
 BuildRequires:	openssl-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	jasper-devel >= 1.701.0
+BuildRequires:	libv4l-devel
 
 Requires:	gtk2
 #jasper >= 1.701 needed for memory leak fix.



From jwrdegoede at fedoraproject.org  Sun Sep  7 12:27:41 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun,  7 Sep 2008 12:27:41 +0000 (UTC)
Subject: rpms/MagicPoint/devel MagicPoint.spec, 1.8,
	1.9 magicpoint-1.10a-longline.patch, 1.3, 1.4
Message-ID: <20080907122741.1B93970126@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/MagicPoint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2829

Modified Files:
	MagicPoint.spec magicpoint-1.10a-longline.patch 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 1.11b-7
- Fix patch fuzz build failure



Index: MagicPoint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MagicPoint/devel/MagicPoint.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MagicPoint.spec	30 Mar 2008 20:19:52 -0000	1.8
+++ MagicPoint.spec	7 Sep 2008 12:27:10 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           MagicPoint
 Version:        1.11b
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        X based presentation software
 Group:          Applications/Productivity
 License:        BSD
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 1.11b-7
+- Fix patch fuzz build failure
+
 * Sun Mar 30 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.11b-6
 - Fix missing prototype compiler warnings
 

magicpoint-1.10a-longline.patch:

Index: magicpoint-1.10a-longline.patch
===================================================================
RCS file: /cvs/pkgs/rpms/MagicPoint/devel/magicpoint-1.10a-longline.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- magicpoint-1.10a-longline.patch	21 Oct 2006 14:39:38 -0000	1.3
+++ magicpoint-1.10a-longline.patch	7 Sep 2008 12:27:10 -0000	1.4
@@ -1,7 +1,7 @@
-diff -ruN magicpoint-1.10a.orig/draw.c magicpoint-1.10a/draw.c
---- magicpoint-1.10a.orig/draw.c	2003-05-14 16:45:35.000000000 +0900
-+++ magicpoint-1.10a/draw.c	2003-08-20 19:02:19.000000000 +0900
-@@ -4504,6 +4504,7 @@
+diff -up magicpoint-1.11b/draw.c.foo magicpoint-1.11b/draw.c
+--- magicpoint-1.11b/draw.c.foo	2008-09-07 14:22:22.000000000 +0200
++++ magicpoint-1.11b/draw.c	2008-09-07 14:22:33.000000000 +0200
+@@ -4691,6 +4691,7 @@ xft_draw_fragment(state, p, len, registr
  	char buf16[1024], *p16;
  	char out16[1024], *o16;
  	int ileft, oleft;
@@ -9,7 +9,7 @@
  #ifdef HAVE_ICONV
  	static iconv_t icv[3];
  #endif
-@@ -4569,6 +4570,29 @@
+@@ -4759,6 +4760,29 @@ xft_draw_fragment(state, p, len, registr
  		if (isspace(*(p + len -1))) {
  		    XftTextExtents8(display, xft_font, (XftChar8 *)p, len -1, &extents);
  			if (state->width - state->leftfillpos / 2 - state->linewidth >= extents.xOff) goto nofolding;
@@ -39,9 +39,9 @@
  		}
  
  		draw_line_end(state); 
-@@ -4588,9 +4612,20 @@
- 	if (obj_new_xftfont(state, state->linewidth, 0, p, len, 
- 				fontname, registry, char_size[caching], charset16, xft_font)){
+@@ -4778,9 +4802,20 @@ nofolding:
+ 	if (obj_new_xftfont(state, state->linewidth, state->charoff, p, len, fontname,
+ 	    registry, char_size[caching], charset16, xft_font)) {
  		state->linewidth += extents.xOff;
 +		if (forcefolding == 1) {
 +			draw_line_end (state);
@@ -59,5 +59,5 @@
  		return NULL; 
 +	}
  }
+ 
  static int
- obj_new_xftfont(state, x, y, p, len, fontname, registry, size, charset16, xft_font)



From ixs at fedoraproject.org  Sun Sep  7 12:43:27 2008
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Sun,  7 Sep 2008 12:43:27 +0000 (UTC)
Subject: rpms/bitbake/devel bitbake.spec,1.8,1.9
Message-ID: <20080907124327.201D370126@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/bitbake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7738

Modified Files:
	bitbake.spec 
Log Message:
* Sun Sep 07 2008 Andreas Thienemann <andreas at bawue.net> - 1.8.10-1
- Updated to 1.8.10
- Include .egg
- Fix FTBFS #440562



Index: bitbake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bitbake/devel/bitbake.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bitbake.spec	14 Jul 2008 20:30:50 -0000	1.8
+++ bitbake.spec	7 Sep 2008 12:42:56 -0000	1.9
@@ -2,14 +2,14 @@
 
 Summary: BitBake build tool
 Name: bitbake
-Version: 1.8.8
-Release: 2%{?dist}
+Version: 1.8.10
+Release: 1%{?dist}
 License: GPLv2
 Group: Development/Tools
 Source0: http://download.berlios.de/bitbake/bitbake-%{version}.tar.gz
 URL: http://developer.berlios.de/projects/bitbake/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: python-devel, xmlto, lynx
+BuildRequires: python-devel, xmlto-tex, lynx
 BuildArch: noarch
 
 %description
@@ -44,10 +44,14 @@
 %{_bindir}/bbimage
 %{_bindir}/bitbake
 %{_datadir}/bitbake/
-%{python_sitelib}/bb/
-
+%{python_sitelib}/*
 
 %changelog
+* Sun Sep 07 2008 Andreas Thienemann <andreas at bawue.net> - 1.8.10-1
+- Updated to 1.8.10
+- Include .egg
+- Fix FTBFS #440562
+
 * Mon Jul 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.8.8-2
 - fix license tag
 



From ixs at fedoraproject.org  Sun Sep  7 12:51:17 2008
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Sun,  7 Sep 2008 12:51:17 +0000 (UTC)
Subject: rpms/bitbake/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <20080907125117.84A4D70126@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/bitbake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10107

Modified Files:
	.cvsignore sources 
Log Message:
* Sun Sep 07 2008 Andreas Thienemann <andreas at bawue.net> - 1.8.10-1
- Updated to 1.8.10
- Include .egg
- Fix FTBFS #440562



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bitbake/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	31 Aug 2007 12:00:15 -0000	1.7
+++ .cvsignore	7 Sep 2008 12:50:47 -0000	1.8
@@ -1 +1,2 @@
 bitbake-1.8.8.tar.gz
+bitbake-1.8.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bitbake/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Aug 2007 12:00:15 -0000	1.7
+++ sources	7 Sep 2008 12:50:47 -0000	1.8
@@ -1 +1,2 @@
 58d92e3507af3e8b02cfddf8ee5f5a09  bitbake-1.8.8.tar.gz
+f85df86d3204e7f94aa46039c08b2635  bitbake-1.8.10.tar.gz



From whot at fedoraproject.org  Sun Sep  7 12:51:34 2008
From: whot at fedoraproject.org (Peter Hutterer)
Date: Sun,  7 Sep 2008 12:51:34 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/devel 10-synaptics.fdi, 1.1,
	1.2 xorg-x11-drv-synaptics.spec, 1.4, 1.5
Message-ID: <20080907125134.1620F70126@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9739

Modified Files:
	10-synaptics.fdi xorg-x11-drv-synaptics.spec 
Log Message:
* Sun Sep 7 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.0-5
- update fdi file to support "appletouch" devices.




Index: 10-synaptics.fdi
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/10-synaptics.fdi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 10-synaptics.fdi	12 Aug 2008 06:11:49 -0000	1.1
+++ 10-synaptics.fdi	7 Sep 2008 12:51:03 -0000	1.2
@@ -8,6 +8,9 @@
       <match key="info.product" contains="AlpsPS/2 ALPS">
 	<merge key="input.x11_driver" type="string">synaptics</merge>
       </match>
+      <match key="info.product" contains="appletouch">
+          <merge key="input.x11_driver" type="string">synaptics</merge>
+      </match>
     </match>
   </device>
 </deviceinfo>


Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-drv-synaptics.spec	2 Sep 2008 10:59:10 -0000	1.4
+++ xorg-x11-drv-synaptics.spec	7 Sep 2008 12:51:03 -0000	1.5
@@ -5,7 +5,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 synaptics input driver
 Version:        0.15.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -96,6 +96,9 @@
 %doc COPYING README
 
 %changelog
+* Sun Sep 7 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.0-5
+- update fdi file to support "appletouch" devices.
+
 * Tue Sep 2 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.0-4
 - xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch: force a click if
   middle button emulation times out during ReadInput cycle. RH #233717.



From jwrdegoede at fedoraproject.org  Sun Sep  7 13:04:29 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun,  7 Sep 2008 13:04:29 +0000 (UTC)
Subject: rpms/ClanLib06/devel ClanLib06.spec,1.13,1.14
Message-ID: <20080907130429.692CD70126@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/ClanLib06/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14599

Modified Files:
	ClanLib06.spec 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.6.5-13
- Fix patch fuzz build failure



Index: ClanLib06.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ClanLib06/devel/ClanLib06.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ClanLib06.spec	7 Sep 2008 12:12:32 -0000	1.13
+++ ClanLib06.spec	7 Sep 2008 13:03:59 -0000	1.14
@@ -61,6 +61,7 @@
 %ifarch %{ix86}
 ARCH_CONFIG_FLAGS=--enable-asm386
 %endif
+cp -a -f /usr/lib/rpm/redhat/config.sub .
 %configure --disable-dependency-tracking --disable-debug --enable-dyn \
   --disable-directfb $ARCH_CONFIG_FLAGS
 tolua++ -o Sources/Lua/clanbindings.cpp Sources/Lua/clanbindings.pkg



From rrankin at fedoraproject.org  Sun Sep  7 13:05:49 2008
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Sun,  7 Sep 2008 13:05:49 +0000 (UTC)
Subject: rpms/gpsim/F-9 gpsim-0.22.0-acinclude.patch, NONE, 1.1 gpsim.spec, 
	1.18, 1.19
Message-ID: <20080907130549.DBAE170126@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/gpsim/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14912

Modified Files:
	gpsim.spec 
Added Files:
	gpsim-0.22.0-acinclude.patch 
Log Message:
Fix PPC build


gpsim-0.22.0-acinclude.patch:

--- NEW FILE gpsim-0.22.0-acinclude.patch ---
--- gpsim-0.22.0/acinclude.m4.debug	2006-11-02 14:43:21.000000000 +0900
+++ gpsim-0.22.0/acinclude.m4	2008-09-07 14:57:46.000000000 +0900
@@ -54,18 +54,6 @@
 dnl AC_CHECK_FUNC(rl_completion_append_character, [wi_cv_lib_readline=yes],[
 dnl 	wi_cv_lib_readline=no;wi_cv_lib_readline_result="no (it is present but too old to use)"
 dnl ])
-	AC_TRY_LINK([
-		/* includes */
-	],[
-		/* function-body */
-		readline(0);
-		rl_completion_append_character(0);
-	],[
-		wi_cv_lib_readline=yes
-	],[
-		wi_cv_lib_readline=no
-		wi_cv_lib_readline_result="no (it is present but too old to use)"
-	])
 
 if test "$wi_cv_lib_readline" = no ; then
 	LIBREADLINE=""


Index: gpsim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsim/F-9/gpsim.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gpsim.spec	7 Sep 2008 03:03:06 -0000	1.18
+++ gpsim.spec	7 Sep 2008 13:05:19 -0000	1.19
@@ -9,9 +9,12 @@
 URL:		http://www.dattalo.com/gnupic/gpsim.html
 Source:		http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
 Patch0:		%{name}-%{version}-gccfix.patch
+Patch1:         %{name}-%{version}-acinclude.patch
+
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel, popt-devel
+BuildRequires:	autoconf
 
 %description
 gpsim is a simulator for Microchip (TM) PIC (TM) microcontrollers.
@@ -45,6 +48,8 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+autoconf
 
 %build
 %configure



From jwrdegoede at fedoraproject.org  Sun Sep  7 13:11:09 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun,  7 Sep 2008 13:11:09 +0000 (UTC)
Subject: rpms/TnL/devel TnL-070909-system-boost.patch, 1.1, 1.2 TnL.spec, 1.8,
	1.9
Message-ID: <20080907131109.83C2C70126@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/TnL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16905

Modified Files:
	TnL-070909-system-boost.patch TnL.spec 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 071111-7
- Fix patch fuzz build failure


TnL-070909-system-boost.patch:

Index: TnL-070909-system-boost.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TnL/devel/TnL-070909-system-boost.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TnL-070909-system-boost.patch	4 Oct 2007 10:07:47 -0000	1.1
+++ TnL-070909-system-boost.patch	7 Sep 2008 13:10:38 -0000	1.2
@@ -1,18 +1,7 @@
-diff -up TnL-source-070909/configure.in~ TnL-source-070909/configure.in
---- TnL-source-070909/configure.in~	2007-09-13 21:45:55.000000000 +0200
-+++ TnL-source-070909/configure.in	2007-09-13 21:45:55.000000000 +0200
-@@ -157,7 +157,6 @@ AC_CONFIG_FILES([
- Makefile
- scripts/Makefile
- src/Makefile
--src/boost/Makefile
- src/interfaces/Makefile
- src/modules/Makefile
- src/modules/LoDTerrain/Makefile
-diff -up TnL-source-070909/configure~ TnL-source-070909/configure
---- TnL-source-070909/configure~	2007-09-13 21:45:49.000000000 +0200
-+++ TnL-source-070909/configure	2007-09-13 21:45:49.000000000 +0200
-@@ -5653,7 +5653,7 @@ done
+diff -up TnL-source-071111/configure.foo TnL-source-071111/configure
+--- TnL-source-071111/configure.foo	2008-09-07 15:08:34.000000000 +0200
++++ TnL-source-071111/configure	2008-09-07 15:08:44.000000000 +0200
+@@ -5752,7 +5752,7 @@ done
  
  
  
@@ -21,7 +10,7 @@
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -6243,7 +6243,6 @@ do
+@@ -6342,7 +6342,6 @@ do
      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
      "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
      "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
@@ -29,24 +18,35 @@
      "src/interfaces/Makefile") CONFIG_FILES="$CONFIG_FILES src/interfaces/Makefile" ;;
      "src/modules/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/Makefile" ;;
      "src/modules/LoDTerrain/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/LoDTerrain/Makefile" ;;
-diff -up TnL-source-070909/src/Makefile.in~ TnL-source-070909/src/Makefile.in
---- TnL-source-070909/src/Makefile.in~	2007-09-14 07:08:48.000000000 +0200
-+++ TnL-source-070909/src/Makefile.in	2007-09-14 07:08:48.000000000 +0200
-@@ -211,7 +211,7 @@ target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--SUBDIRS = modules boost interfaces
-+SUBDIRS = modules interfaces
- tnl_bin_SOURCES = game.cc game.h tnl.h \
-                         Factory.h \
-                         initControls.cc \
-diff -up TnL-source-070909/src/Makefile.am~ TnL-source-070909/src/Makefile.am
---- TnL-source-070909/src/Makefile.am~	2007-09-14 07:08:29.000000000 +0200
-+++ TnL-source-070909/src/Makefile.am	2007-09-14 07:08:29.000000000 +0200
+diff -up TnL-source-071111/configure.in.foo TnL-source-071111/configure.in
+--- TnL-source-071111/configure.in.foo	2008-09-07 15:08:34.000000000 +0200
++++ TnL-source-071111/configure.in	2008-09-07 15:08:44.000000000 +0200
+@@ -153,7 +153,6 @@ AC_CONFIG_FILES([
+ Makefile
+ scripts/Makefile
+ src/Makefile
+-src/boost/Makefile
+ src/interfaces/Makefile
+ src/modules/Makefile
+ src/modules/LoDTerrain/Makefile
+diff -up TnL-source-071111/src/Makefile.am.foo TnL-source-071111/src/Makefile.am
+--- TnL-source-071111/src/Makefile.am.foo	2008-09-07 15:08:34.000000000 +0200
++++ TnL-source-071111/src/Makefile.am	2008-09-07 15:08:44.000000000 +0200
 @@ -1,4 +1,4 @@
 -SUBDIRS = modules boost interfaces
 +SUBDIRS = modules interfaces
  
  bin_PROGRAMS = tnl-bin
  
+diff -up TnL-source-071111/src/Makefile.in.foo TnL-source-071111/src/Makefile.in
+--- TnL-source-071111/src/Makefile.in.foo	2008-09-07 15:08:34.000000000 +0200
++++ TnL-source-071111/src/Makefile.in	2008-09-07 15:08:44.000000000 +0200
+@@ -214,7 +214,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-SUBDIRS = modules boost interfaces
++SUBDIRS = modules interfaces
+ tnl_bin_SOURCES = game.cc game.h tnl.h \
+                         glew.c glew.h \
+                         CEGUIEventFilter.cc CEGUIEventFilter.h \


Index: TnL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TnL/devel/TnL.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TnL.spec	11 Jul 2008 06:40:54 -0000	1.8
+++ TnL.spec	7 Sep 2008 13:10:39 -0000	1.9
@@ -7,7 +7,7 @@
 
 Name:           TnL
 Version:        071111
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Thunder & Lightning - A futuristic action flight simulator game
 Group:          Amusements/Games
 License:        GPL+
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 071111-7
+- Fix patch fuzz build failure
+
 * Fri Jul 11 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 071111-6
 - Rebuild for new cegui
 



From whot at fedoraproject.org  Sun Sep  7 13:14:48 2008
From: whot at fedoraproject.org (Peter Hutterer)
Date: Sun,  7 Sep 2008 13:14:48 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/F-9 10-synaptics.fdi, 1.1,
	1.2 xorg-x11-drv-synaptics.spec, 1.2, 1.3
Message-ID: <20080907131448.43C7670126@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18283

Modified Files:
	10-synaptics.fdi xorg-x11-drv-synaptics.spec 
Log Message:
* Sun Sep 7 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.0-3
- update fdi file to support "appletouch" devices.




Index: 10-synaptics.fdi
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-9/10-synaptics.fdi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 10-synaptics.fdi	12 Aug 2008 06:51:25 -0000	1.1
+++ 10-synaptics.fdi	7 Sep 2008 13:14:17 -0000	1.2
@@ -8,6 +8,9 @@
       <match key="info.product" contains="AlpsPS/2 ALPS">
 	<merge key="input.x11_driver" type="string">synaptics</merge>
       </match>
+      <match key="info.product" contains="appletouch">
+          <merge key="input.x11_driver" type="string">synaptics</merge>
+      </match>
     </match>
   </device>
 </deviceinfo>


Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-9/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-drv-synaptics.spec	25 Aug 2008 09:04:39 -0000	1.2
+++ xorg-x11-drv-synaptics.spec	7 Sep 2008 13:14:17 -0000	1.3
@@ -5,7 +5,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 synaptics input driver
 Version:        0.15.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -92,6 +92,9 @@
 %doc COPYING README
 
 %changelog
+* Sun Sep 7 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.0-3
+- update fdi file to support "appletouch" devices.
+
 * Mon Aug 25 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.15.0-2
 - Enable tapping RH #439386
 



From jwrdegoede at fedoraproject.org  Sun Sep  7 13:15:48 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun,  7 Sep 2008 13:15:48 +0000 (UTC)
Subject: rpms/abuse/devel abuse.spec, 1.8, 1.9 abuse_sdl-0.7.0-fixes.patch,
	1.2, 1.3
Message-ID: <20080907131548.EDD3470126@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/abuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18901

Modified Files:
	abuse.spec abuse_sdl-0.7.0-fixes.patch 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.7.1-2
- Fix patch fuzz build failure



Index: abuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abuse/devel/abuse.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- abuse.spec	4 Mar 2008 09:41:07 -0000	1.8
+++ abuse.spec	7 Sep 2008 13:15:18 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           abuse
 Version:        0.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The classic Crack-Dot-Com game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.7.1-2
+- Fix patch fuzz build failure
+
 * Mon Mar  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.1-1
 - Upstream is alive again, new upstream release 0.7.1, yeah!
 

abuse_sdl-0.7.0-fixes.patch:

Index: abuse_sdl-0.7.0-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/abuse/devel/abuse_sdl-0.7.0-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- abuse_sdl-0.7.0-fixes.patch	4 Mar 2008 09:41:07 -0000	1.2
+++ abuse_sdl-0.7.0-fixes.patch	7 Sep 2008 13:15:18 -0000	1.3
@@ -1,6 +1,7 @@
---- abuse-0.7.1/src/stack.hpp.fix	2008-03-02 15:23:26.000000000 +0100
-+++ abuse-0.7.1/src/stack.hpp	2008-03-03 22:24:25.000000000 +0100
-@@ -25,7 +25,12 @@ template<class T> class grow_stack      
+diff -up abuse-0.7.1/src/stack.hpp.foo abuse-0.7.1/src/stack.hpp
+--- abuse-0.7.1/src/stack.hpp.foo	2008-09-07 15:14:12.000000000 +0200
++++ abuse-0.7.1/src/stack.hpp	2008-09-07 15:14:18.000000000 +0200
+@@ -25,8 +25,13 @@ template<class T> class grow_stack      
    long son;
    long smax;
  



From jwrdegoede at fedoraproject.org  Sun Sep  7 13:29:06 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun,  7 Sep 2008 13:29:06 +0000 (UTC)
Subject: rpms/alex4/devel alex4-allegro-4.2.patch, 1.1,
	1.2 alex4-dot-files-endian-clean.patch, 1.1,
	1.2 alex4-fsf-address.patch, 1.1, 1.2 alex4.spec, 1.6, 1.7
Message-ID: <20080907132906.B556970126@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/alex4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23634

Modified Files:
	alex4-allegro-4.2.patch alex4-dot-files-endian-clean.patch 
	alex4-fsf-address.patch alex4.spec 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 1.0-7
- Fix patch fuzz build failure


alex4-allegro-4.2.patch:

Index: alex4-allegro-4.2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alex4/devel/alex4-allegro-4.2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alex4-allegro-4.2.patch	30 Jan 2008 14:42:31 -0000	1.1
+++ alex4-allegro-4.2.patch	7 Sep 2008 13:29:06 -0000	1.2
@@ -403,4 +403,4 @@
 +		rest(0);
  		
  		// draw 
- 		frame_count ++;
\ No newline at end of file
+ 		frame_count ++;

alex4-dot-files-endian-clean.patch:

Index: alex4-dot-files-endian-clean.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alex4/devel/alex4-dot-files-endian-clean.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alex4-dot-files-endian-clean.patch	30 Jan 2008 14:42:31 -0000	1.1
+++ alex4-dot-files-endian-clean.patch	7 Sep 2008 13:29:06 -0000	1.2
@@ -97,4 +97,4 @@
 +        o->one_hundred = pack_igetl(fp);
  }
  
- // resets all data
\ No newline at end of file
+ // resets all data

alex4-fsf-address.patch:

Index: alex4-fsf-address.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alex4/devel/alex4-fsf-address.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alex4-fsf-address.patch	30 Jan 2008 14:42:31 -0000	1.1
+++ alex4-fsf-address.patch	7 Sep 2008 13:29:06 -0000	1.2
@@ -12,4 +12,4 @@
 +St, Fifth Floor, Boston, MA 02110-1301, USA.
  
  
- COMPILING
\ No newline at end of file
+ COMPILING


Index: alex4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alex4/devel/alex4.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alex4.spec	19 Feb 2008 07:49:28 -0000	1.6
+++ alex4.spec	7 Sep 2008 13:29:06 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           alex4
 Version:        1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Alex the Allegator 4 - Platform game
 Group:          Amusements/Games
 License:        GPL+
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 1.0-7
+- Fix patch fuzz build failure
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0-6
 - Autorebuild for GCC 4.3
 



From dtimms at fedoraproject.org  Sun Sep  7 13:31:48 2008
From: dtimms at fedoraproject.org (David Timms)
Date: Sun,  7 Sep 2008 13:31:48 +0000 (UTC)
Subject: rpms/pyvnc2swf/F-9 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20080907133148.6762070126@cvs1.fedora.phx.redhat.com>

Author: dtimms

Update of /cvs/pkgs/rpms/pyvnc2swf/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24322

Modified Files:
	.cvsignore sources 
Log Message:
fix cvsignore, sources missed in initial checkin of devel copy.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyvnc2swf/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:42:41 -0000	1.1
+++ .cvsignore	7 Sep 2008 13:31:18 -0000	1.2
@@ -0,0 +1 @@
+pyvnc2swf-0.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyvnc2swf/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:42:41 -0000	1.1
+++ sources	7 Sep 2008 13:31:18 -0000	1.2
@@ -0,0 +1 @@
+e871d134420867438cadd1f6320072f0  pyvnc2swf-0.9.3.tar.gz



From belegdol at fedoraproject.org  Sun Sep  7 13:44:39 2008
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Sun,  7 Sep 2008 13:44:39 +0000 (UTC)
Subject: rpms/gnome-chemistry-utils/devel .cvsignore, 1.10,
	1.11 gnome-chemistry-utils.spec, 1.20, 1.21 sources, 1.10, 1.11
Message-ID: <20080907134439.9D6AF70129@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28898

Modified Files:
	.cvsignore gnome-chemistry-utils.spec sources 
Log Message:
* Sun Sep  7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.90-1
- Updated to 0.9.90
- Replaced the firefox/xulrunner conditional with gecko-devel
- Provide and obsolete gchempaint
- Dropped the rpath killer for the time being
- Dropped the -devel subpackage since it is not needed any more



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	19 Mar 2008 22:43:37 -0000	1.10
+++ .cvsignore	7 Sep 2008 13:44:09 -0000	1.11
@@ -1 +1 @@
-gnome-chemistry-utils-0.8.7.tar.bz2
+gnome-chemistry-utils-0.9.90.tar.bz2


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/gnome-chemistry-utils.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnome-chemistry-utils.spec	7 Jul 2008 10:06:20 -0000	1.20
+++ gnome-chemistry-utils.spec	7 Sep 2008 13:44:09 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           gnome-chemistry-utils
-Version:        0.8.7
-Release:        2%{?dist}
+Version:        0.9.90
+Release:        1%{?dist}
 Summary:        A set of chemical utilities
 
 Group:          Applications/Engineering
@@ -14,20 +14,17 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen
 BuildRequires:  gettext
+BuildRequires:  gecko-devel
 BuildRequires:  gnome-doc-utils
-BuildRequires:  goffice04-devel
+BuildRequires:  goffice-devel
 BuildRequires:  gtkglext-devel
+BuildRequires:  intltool
 BuildRequires:  kdelibs3
 BuildRequires:  libgnomeprintui22-devel
 BuildRequires:  man
 BuildRequires:  openbabel-devel >= 2.1.0
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  scrollkeeper
-%if 0%{?fedora} >= 9
-BuildRequires:  xulrunner-devel
-%else
-BuildRequires:  firefox-devel
-%endif
 
 Requires:       chemical-mime-data
 
@@ -38,31 +35,20 @@
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
-%description
-This package is a set of chemical utils. Four programs are available:
-* A 3D molecular structure viewer (GChem3DViewer).
-* A Chemical calculator (GChemCalc).
-* A periodic table of the elements application (GChemTable).
-* A crystalline structure editor (GCrystal).
+Provides:       gchempaint
 
-%package        devel
-Summary:        Development package for %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       goffice04-devel
-Requires:       gtkglext-devel
-Requires:       libgnomeprintui22-devel
-Requires:       libgnomeui-devel
-Requires:       openbabel-devel
-Requires:       pkgconfig
+Obsoletes:      gchempaint
+Obsoletes:      gchempaint-devel
+Obsoletes:      gnome-chemistry-utils-devel
 
-%description    devel
-This package is a set of chemical utils. Four programs are available:
-* A 3D molecular structure viewer (GChem3DViewer).
+%description
+This package is a set of chemical utils. Several programs are available:
+* A 3D molecular structure viewer (GChem3D).
 * A Chemical calculator (GChemCalc).
+* A 2D structure editor (GChemPaint).
 * A periodic table of the elements application (GChemTable).
 * A crystalline structure editor (GCrystal).
-This package contains development files for %{name}
+* A spectra viewer (GSpectrum).
 
 %package        mozplugin
 Summary:        Development package for %{name}
@@ -88,8 +74,8 @@
            --disable-schemas-install \
            --disable-scrollkeeper \
            --with-mozilla-libdir=%{_libdir}/mozilla
-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' libtool
+#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 
@@ -98,8 +84,8 @@
 make INSTALL="install -p" install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-install --vendor=fedora \
        --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-       $RPM_BUILD_ROOT%{_datadir}/applications/{gchem3d-viewer,gchemcalc,gchemtable,gcrystal}.desktop
-%find_lang gchemutils
+       $RPM_BUILD_ROOT%{_datadir}/applications/{gchem3d,gchemcalc,gchempaint,gchemtable,gcrystal,gspectrum}-0.10.desktop
+%find_lang gchemutils-0.10
 
 #kill libtool archives
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@@ -116,7 +102,7 @@
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gcrystal.schemas >/dev/null || :
+      %{_sysconfdir}/gconf/schemas/{gchempaint,gchempaint-arrows,gchemutils,gcrystal}.schemas >/dev/null || :
     # If the schema file has ever been renamed::
     #gconftool-2 --makefile-uninstall-rule \
     #  %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :
@@ -126,14 +112,14 @@
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/gcrystal.schemas > /dev/null || :
+  %{_sysconfdir}/gconf/schemas/{gchempaint,gchempaint-arrows,gchemutils,gcrystal}.schemas > /dev/null || :
 update-desktop-database &> /dev/null ||:
 update-mime-database %{_datadir}/mime &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
-scrollkeeper-update -q -o %{_datadir}/omf/{gchem3d-viewer,gchemcalc,gchemtable,gcrystal} || :
+scrollkeeper-update -q -o %{_datadir}/omf/{gchem3d,gchemcalc,gchempaint,gchemtable,gcrystal,gspectrum}-0.10 || :
 /sbin/ldconfig
 
 
@@ -156,45 +142,62 @@
 /sbin/ldconfig
 
 
-%files -f gchemutils.lang
+%files -f gchemutils-0.10.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
+%{_sysconfdir}/gconf/schemas/gchempaint.schemas
+%{_sysconfdir}/gconf/schemas/gchempaint-arrows.schemas
+%{_sysconfdir}/gconf/schemas/gchemutils.schemas
 %{_sysconfdir}/gconf/schemas/gcrystal.schemas
-%{_bindir}/gchem3d-viewer
+%{_bindir}/gchem3d
+%{_bindir}/gchem3d-0.10
 %{_bindir}/gchemcalc
+%{_bindir}/gchemcalc-0.10
+%{_bindir}/gchempaint
+%{_bindir}/gchempaint-0.10
 %{_bindir}/gchemtable
+%{_bindir}/gchemtable-0.10
 %{_bindir}/gcrystal
-%{_libdir}/libgcu.so.*
+%{_bindir}/gcrystal-0.10
+%{_bindir}/gspectrum
+%{_bindir}/gspectrum-0.10
+%{_libdir}/gchemutils
+%{_libdir}/goffice/0.6.5/plugins/gchemutils
+%{_libdir}/libgchempaint-0.10.so*
+%{_libdir}/libgcpcanvas-0.10.so*
+%{_libdir}/libgcu-0.10.so*
 %{_libexecdir}/chem-viewer
-%{_datadir}/applications/fedora-gchem3d-viewer.desktop
-%{_datadir}/applications/fedora-gchemcalc.desktop
-%{_datadir}/applications/fedora-gchemtable.desktop
-%{_datadir}/applications/fedora-gcrystal.desktop
+%{_datadir}/applications/fedora-gchem3d-0.10.desktop
+%{_datadir}/applications/fedora-gchemcalc-0.10.desktop
+%{_datadir}/applications/fedora-gchempaint-0.10.desktop
+%{_datadir}/applications/fedora-gchemtable-0.10.desktop
+%{_datadir}/applications/fedora-gcrystal-0.10.desktop
+%{_datadir}/applications/fedora-gspectrum-0.10.desktop
 %{_datadir}/gchemutils
-%{_datadir}/gnome/help/gchem3d-viewer
-%{_datadir}/gnome/help/gchemcalc
-%{_datadir}/gnome/help/gchemtable
-%{_datadir}/gnome/help/gcrystal
+%{_datadir}/gnome-chemistry-utils
+%{_datadir}/gnome/help/gchem3d-0.10
+%{_datadir}/gnome/help/gchemcalc-0.10
+%{_datadir}/gnome/help/gchempaint-0.10
+%{_datadir}/gnome/help/gchemtable-0.10
+%{_datadir}/gnome/help/gcrystal-0.10
+%{_datadir}/gnome/help/gspectrum-0.10
 %{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/hicolor/*/mimetypes/gnome-mime-application-x-gchempaint.png
 %{_datadir}/icons/hicolor/*/mimetypes/gnome-mime-application-x-gcrystal.png
-%{_mandir}/man1/gchem3d-viewer.1*
+%{_mandir}/man1/gchem3d.1*
 %{_mandir}/man1/gchemcalc.1*
+%{_mandir}/man1/gchempaint.1*
 %{_mandir}/man1/gchemtable.1*
 %{_mandir}/man1/gcrystal.1*
-%{_mandir}/man3/libgcu.3*
+%{_mandir}/man1/gspectrum.1*
 %{_datadir}/mime/packages/gchemutils.xml
 %{_datadir}/mimelnk
-%{_datadir}/omf/gchem3d-viewer
-%{_datadir}/omf/gchemcalc
-%{_datadir}/omf/gchemtable
-%{_datadir}/omf/gcrystal
-
-%files devel
-%defattr(-,root,root,-)
-%doc docs/reference/html
-%{_includedir}/gcu
-%{_libdir}/libgcu.so
-%{_libdir}/pkgconfig/gcu.pc
+%{_datadir}/omf/gchem3d-0.10
+%{_datadir}/omf/gchemcalc-0.10
+%{_datadir}/omf/gchempaint-0.10
+%{_datadir}/omf/gchemtable-0.10
+%{_datadir}/omf/gcrystal-0.10
+%{_datadir}/omf/gspectrum-0.10
 
 %files mozplugin
 %defattr(-,root,root,-)
@@ -202,6 +205,13 @@
 
 
 %changelog
+* Sun Sep  7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.90-1
+- Updated to 0.9.90
+- Replaced the firefox/xulrunner conditional with gecko-devel
+- Provide and obsolete gchempaint
+- Dropped the rpath killer for the time being
+- Dropped the -devel subpackage since it is not needed any more
+
 * Mon Jul  7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.7-2
 - Rebuilt for new openbabel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	19 Mar 2008 22:43:37 -0000	1.10
+++ sources	7 Sep 2008 13:44:09 -0000	1.11
@@ -1 +1 @@
-011344eef28cdf188c54247fa3a65448  gnome-chemistry-utils-0.8.7.tar.bz2
+732b27240da772dab26f6b8808a95cdd  gnome-chemistry-utils-0.9.90.tar.bz2



From pkgdb at fedoraproject.org  Sun Sep  7 13:49:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:49:32 +0000
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <20080907134932.99D9220876F@bastion.fedora.phx.redhat.com>

mnowak has set the watchbugzilla acl on eclipse-pydev (Fedora 9) to Approved for bkonrath

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:49:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:49:48 +0000
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <20080907134948.4E56020876F@bastion.fedora.phx.redhat.com>

mnowak has set the watchbugzilla acl on eclipse-pydev (Fedora 9) to Approved for jjohnstn

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:49:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:49:52 +0000
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <20080907134952.945D7208771@bastion.fedora.phx.redhat.com>

mnowak has set the watchbugzilla acl on eclipse-pydev (Fedora 9) to Approved for mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:49:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:49:56 +0000
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <20080907134956.77DB3208D07@bastion.fedora.phx.redhat.com>

mnowak has set the watchcommits acl on eclipse-pydev (Fedora 9) to Approved for mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:49:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:49:59 +0000
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <20080907134959.81185208D7C@bastion.fedora.phx.redhat.com>

mnowak has set the watchcommits acl on eclipse-pydev (Fedora 9) to Approved for jjohnstn

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:50:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:50:18 +0000
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <20080907135018.4CD86208DA0@bastion.fedora.phx.redhat.com>

mnowak has set the commit acl on eclipse-pydev (Fedora 9) to Approved for overholt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:50:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:50:24 +0000
Subject: [pkgdb] eclipse-pydev: mnowak has requested approveacls
Message-ID: <20080907135024.3D38320876F@bastion.fedora.phx.redhat.com>

mnowak has requested the approveacls acl on eclipse-pydev (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:50:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:50:32 +0000
Subject: [pkgdb] eclipse-pydev: mnowak has given up approveacls
Message-ID: <20080907135032.41AD920876E@bastion.fedora.phx.redhat.com>

mnowak has given up the approveacls acl on eclipse-pydev (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:50:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:50:49 +0000
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <20080907135049.5D612208770@bastion.fedora.phx.redhat.com>

mnowak has set the commit acl on eclipse-pydev (Fedora 9) to Approved for mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:50:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:50:54 +0000
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <20080907135055.0833C208D07@bastion.fedora.phx.redhat.com>

mnowak has set the commit acl on eclipse-pydev (Fedora 9) to Approved for jjohnstn

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:50:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:50:59 +0000
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <20080907135059.986DF208D1E@bastion.fedora.phx.redhat.com>

mnowak has set the watchcommits acl on eclipse-pydev (Fedora 9) to Approved for bkonrath

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:51:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:51:14 +0000
Subject: [pkgdb] eclipse-pydev ownership updated
Message-ID: <20080907135114.7EFE920876F@bastion.fedora.phx.redhat.com>

Package eclipse-pydev in Fedora 8 is now owned by mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:51:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:51:33 +0000
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <20080907135133.2D0CE20876F@bastion.fedora.phx.redhat.com>

mnowak has set the watchbugzilla acl on eclipse-pydev (Fedora 8) to Approved for jjohnstn

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:51:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:51:40 +0000
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <20080907135140.1DB42208D07@bastion.fedora.phx.redhat.com>

mnowak has set the watchbugzilla acl on eclipse-pydev (Fedora 8) to Approved for mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:51:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:51:41 +0000
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <20080907135141.4608E208D7C@bastion.fedora.phx.redhat.com>

mnowak has set the watchcommits acl on eclipse-pydev (Fedora 8) to Approved for jjohnstn

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:51:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:51:42 +0000
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <20080907135142.B8222208D98@bastion.fedora.phx.redhat.com>

mnowak has set the watchcommits acl on eclipse-pydev (Fedora 8) to Approved for mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:51:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:51:45 +0000
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <20080907135145.9DF71208770@bastion.fedora.phx.redhat.com>

mnowak has set the commit acl on eclipse-pydev (Fedora 8) to Approved for jjohnstn

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:51:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:51:47 +0000
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <20080907135147.E6B59208D9A@bastion.fedora.phx.redhat.com>

mnowak has set the commit acl on eclipse-pydev (Fedora 8) to Approved for mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:52:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:52:02 +0000
Subject: [pkgdb] eclipse-pydev ownership updated
Message-ID: <20080907135202.8E2CF208D0F@bastion.fedora.phx.redhat.com>

Package eclipse-pydev in Fedora devel is now owned by mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:52:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:52:06 +0000
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <20080907135206.D7AA4208D97@bastion.fedora.phx.redhat.com>

mnowak has set the watchbugzilla acl on eclipse-pydev (Fedora devel) to Approved for jjohnstn

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:52:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:52:10 +0000
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <20080907135210.D6E79208D9B@bastion.fedora.phx.redhat.com>

mnowak has set the watchcommits acl on eclipse-pydev (Fedora devel) to Approved for jjohnstn

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From pkgdb at fedoraproject.org  Sun Sep  7 13:52:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 13:52:12 +0000
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <20080907135212.5C7ED208D9F@bastion.fedora.phx.redhat.com>

mnowak has set the commit acl on eclipse-pydev (Fedora devel) to Approved for jjohnstn

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From trasher at fedoraproject.org  Sun Sep  7 14:17:44 2008
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Sun,  7 Sep 2008 14:17:44 +0000 (UTC)
Subject: rpms/eric/devel .cvsignore, 1.11, 1.12 eric.spec, 1.29, 1.30 sources,
	1.12, 1.13
Message-ID: <20080907141744.B2BE370126@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/eric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6027

Modified Files:
	.cvsignore eric.spec sources 
Log Message:
4.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	15 Aug 2008 16:59:51 -0000	1.11
+++ .cvsignore	7 Sep 2008 14:17:14 -0000	1.12
@@ -1,7 +1,7 @@
-eric4-4.2.0.tar.gz
-eric4-i18n-cs-4.2.0.tar.gz
-eric4-i18n-de-4.2.0.tar.gz
-eric4-i18n-es-4.2.0.tar.gz
-eric4-i18n-fr-4.2.0.tar.gz
-eric4-i18n-ru-4.2.0.tar.gz
-eric4-i18n-tr-4.2.0.tar.gz
+eric4-4.2.1.tar.gz
+eric4-i18n-cs-4.2.1.tar.gz
+eric4-i18n-de-4.2.1.tar.gz
+eric4-i18n-es-4.2.1.tar.gz
+eric4-i18n-fr-4.2.1.tar.gz
+eric4-i18n-ru-4.2.1.tar.gz
+eric4-i18n-tr-4.2.1.tar.gz


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- eric.spec	23 Aug 2008 21:01:47 -0000	1.29
+++ eric.spec	7 Sep 2008 14:17:14 -0000	1.30
@@ -7,8 +7,8 @@
 
 Name:    eric
 Summary: Python IDE
-Version: 4.2.0
-Release: 2%{?dist}
+Version: 4.2.1
+Release: 1%{?dist}
 
 License: GPL+
 Group:   Development/Tools
@@ -145,6 +145,9 @@
 
 
 %changelog
+* Sun Sep 7 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 4.2.1-1
+- 4.2.1
+
 * Fri Aug 15 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 4.2.0-2
 - %%{buildir} was contained in one file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	15 Aug 2008 16:59:51 -0000	1.12
+++ sources	7 Sep 2008 14:17:14 -0000	1.13
@@ -1,7 +1,7 @@
-893ba74b5e53ac0677a132078a4bcb46  eric4-4.2.0.tar.gz
-b6ece32cbe82b1485518482203cf3a60  eric4-i18n-cs-4.2.0.tar.gz
-41d5ea6de4e5e323ed1c53d9366d7d3a  eric4-i18n-de-4.2.0.tar.gz
-6df33bada6eb930919e31f75ee8a3be8  eric4-i18n-es-4.2.0.tar.gz
-a37cacc03884d3afdee4ba8c55caefd4  eric4-i18n-fr-4.2.0.tar.gz
-161cf85b58b40fbc88f1a19a70149f55  eric4-i18n-ru-4.2.0.tar.gz
-c4f5e1be85e689b4d8ce18cb37eb2e09  eric4-i18n-tr-4.2.0.tar.gz
+b2a9edb6c44319f3f96afba32be337bb  eric4-4.2.1.tar.gz
+637ce2a08d360ae82d283a0c76000b85  eric4-i18n-cs-4.2.1.tar.gz
+d336411c95534a01718abd932c3289fa  eric4-i18n-de-4.2.1.tar.gz
+df5bbbfedf7b10ed7359884845e98235  eric4-i18n-es-4.2.1.tar.gz
+d8b6d0b94816ca5b5752ef6cdc682254  eric4-i18n-fr-4.2.1.tar.gz
+5f87a9a4920086b8ef1dc7152f4ac582  eric4-i18n-ru-4.2.1.tar.gz
+a4c55068b7c44d20906aabd223680453  eric4-i18n-tr-4.2.1.tar.gz



From jwrdegoede at fedoraproject.org  Sun Sep  7 14:38:35 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun,  7 Sep 2008 14:38:35 +0000 (UTC)
Subject: rpms/clonekeen/devel clonekeen.spec,1.4,1.5
Message-ID: <20080907143835.24F7470126@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/clonekeen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12533

Modified Files:
	clonekeen.spec 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.8.3-5
- Fix patch build failure



Index: clonekeen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clonekeen/devel/clonekeen.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- clonekeen.spec	3 Apr 2008 11:20:09 -0000	1.4
+++ clonekeen.spec	7 Sep 2008 14:38:04 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           clonekeen
 Version:        0.8.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        "Commander Keen: Invasion of the Vorticons" clone
 Group:          Amusements/Games
 License:        GPLv2+
@@ -45,7 +45,7 @@
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1
-%patch3 -p1 -z '~'
+%patch3 -p1
 cp -a %{SOURCE2} %{SOURCE3} .
 rm src/scale2x/*.o
 sed -i 's/\r//g' readme.txt src/changelog.txt
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.8.3-5
+- Fix patch build failure
+
 * Thu Apr  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.3-4
 - Fix missing prototype compiler warnings
 



From jwrdegoede at fedoraproject.org  Sun Sep  7 14:46:25 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun,  7 Sep 2008 14:46:25 +0000 (UTC)
Subject: rpms/kbilliards/devel kbilliards.spec,1.6,1.7 sqrtl.patch,1.1,1.2
Message-ID: <20080907144625.3DCD270126@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/kbilliards/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14836

Modified Files:
	kbilliards.spec sqrtl.patch 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.8.7b-8
- Fix patch fuzz build failure



Index: kbilliards.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kbilliards/devel/kbilliards.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kbilliards.spec	19 Feb 2008 08:41:03 -0000	1.6
+++ kbilliards.spec	7 Sep 2008 14:45:54 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           kbilliards
 Version:        0.8.7b
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A Fun Billiards Simulator Game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.8.7b-8
+- Fix patch fuzz build failure
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.8.7b-7
 - Autorebuild for GCC 4.3
 

sqrtl.patch:

Index: sqrtl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kbilliards/devel/sqrtl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sqrtl.patch	23 Feb 2007 13:38:51 -0000	1.1
+++ sqrtl.patch	7 Sep 2008 14:45:54 -0000	1.2
@@ -1,6 +1,7 @@
---- src/aiplayer.cpp
-+++ src/aiplayer.cpp
-@@ -160,12 +160,12 @@
+diff -up kbilliards-0.8.7b/src/aiplayer.cpp.foo kbilliards-0.8.7b/src/aiplayer.cpp
+--- kbilliards-0.8.7b/src/aiplayer.cpp.foo	2008-09-07 16:43:45.000000000 +0200
++++ kbilliards-0.8.7b/src/aiplayer.cpp	2008-09-07 16:43:53.000000000 +0200
+@@ -160,12 +160,12 @@ void AIplayer::stroke()
  
                                //determine approximate power
  
@@ -15,9 +16,10 @@
  
                                if ( cos != 0 ) {
                                     power2 = v2/cos ;
---- src/ball.cpp
-+++ src/ball.cpp
-@@ -214,8 +214,8 @@
+diff -up kbilliards-0.8.7b/src/ball.cpp.foo kbilliards-0.8.7b/src/ball.cpp
+--- kbilliards-0.8.7b/src/ball.cpp.foo	2008-09-07 16:43:45.000000000 +0200
++++ kbilliards-0.8.7b/src/ball.cpp	2008-09-07 16:43:53.000000000 +0200
+@@ -214,8 +214,8 @@ double Ball::BallCPrediction(Ball *B) {
      if ( my_sqrt < 0 )
          return -1;
  
@@ -26,5 +28,5 @@
 +    result1=( ( -b - sqrt(my_sqrt) ) / (2*a) );
 +    result2=( ( -b + sqrt(my_sqrt) ) / (2*a) );
  
+ /*
      if ( ( result1 > result2 )&&( ((result1 < 1)&&(result1 > 0))||((result2 < 1)&&(result2 > 0)) ))
-         cout<<"result1="<<result1<<" < result2="<<result2<<endl;



From pkgdb at fedoraproject.org  Sun Sep  7 14:51:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 14:51:44 +0000
Subject: [pkgdb] arts had acl change status
Message-ID: <20080907145144.78DDA208771@bastion.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on arts (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arts



From pkgdb at fedoraproject.org  Sun Sep  7 14:51:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 14:51:46 +0000
Subject: [pkgdb] arts had acl change status
Message-ID: <20080907145146.9D5F0208D97@bastion.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on arts (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arts



From pkgdb at fedoraproject.org  Sun Sep  7 14:51:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 14:51:50 +0000
Subject: [pkgdb] arts had acl change status
Message-ID: <20080907145150.CD8AC208D9B@bastion.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on arts (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arts



From pkgdb at fedoraproject.org  Sun Sep  7 14:51:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 14:51:52 +0000
Subject: [pkgdb] arts had acl change status
Message-ID: <20080907145152.BF319208DA1@bastion.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on arts (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arts



From pkgdb at fedoraproject.org  Sun Sep  7 14:53:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 14:53:22 +0000
Subject: [pkgdb] akonadi had acl change status
Message-ID: <20080907145322.7354920876E@bastion.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on akonadi (Fedora devel) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 14:53:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 14:53:27 +0000
Subject: [pkgdb] akonadi had acl change status
Message-ID: <20080907145329.6AC77208D0F@bastion.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on akonadi (Fedora devel) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 14:53:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 14:53:31 +0000
Subject: [pkgdb] akonadi had acl change status
Message-ID: <20080907145331.5C73C208D98@bastion.fedora.phx.redhat.com>

kkofler has set the commit acl on akonadi (Fedora devel) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 14:53:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 14:53:33 +0000
Subject: [pkgdb] akonadi had acl change status
Message-ID: <20080907145333.D87BC208D9A@bastion.fedora.phx.redhat.com>

kkofler has set the approveacls acl on akonadi (Fedora devel) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 14:53:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 14:53:38 +0000
Subject: [pkgdb] akonadi had acl change status
Message-ID: <20080907145338.28613208D9F@bastion.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on akonadi (Fedora 9) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 14:53:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 14:53:40 +0000
Subject: [pkgdb] akonadi had acl change status
Message-ID: <20080907145340.4D639208DA3@bastion.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on akonadi (Fedora 9) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 14:53:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 14:53:44 +0000
Subject: [pkgdb] akonadi had acl change status
Message-ID: <20080907145345.271AB208DAB@bastion.fedora.phx.redhat.com>

kkofler has set the approveacls acl on akonadi (Fedora 9) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 14:53:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 14:53:42 +0000
Subject: [pkgdb] akonadi had acl change status
Message-ID: <20080907145342.CFC02208DA7@bastion.fedora.phx.redhat.com>

kkofler has set the commit acl on akonadi (Fedora 9) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 14:53:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 14:53:51 +0000
Subject: [pkgdb] akonadi had acl change status
Message-ID: <20080907145351.4CB26208D07@bastion.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on akonadi (Fedora 8) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 14:53:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 14:53:53 +0000
Subject: [pkgdb] akonadi had acl change status
Message-ID: <20080907145353.B4F72208DAE@bastion.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on akonadi (Fedora 8) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 14:53:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 14:53:58 +0000
Subject: [pkgdb] akonadi had acl change status
Message-ID: <20080907145358.98194208D97@bastion.fedora.phx.redhat.com>

kkofler has set the commit acl on akonadi (Fedora 8) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sun Sep  7 14:54:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 14:54:01 +0000
Subject: [pkgdb] akonadi had acl change status
Message-ID: <20080907145401.C9F5C208DB1@bastion.fedora.phx.redhat.com>

kkofler has set the approveacls acl on akonadi (Fedora 8) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From jwrdegoede at fedoraproject.org  Sun Sep  7 14:54:58 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun,  7 Sep 2008 14:54:58 +0000 (UTC)
Subject: rpms/kbilliards/devel kbilliards.spec,1.7,1.8
Message-ID: <20080907145458.90D8D70126@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/kbilliards/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17821

Modified Files:
	kbilliards.spec 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.8.7b-8
- Fix patch fuzz build failure



Index: kbilliards.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kbilliards/devel/kbilliards.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kbilliards.spec	7 Sep 2008 14:45:54 -0000	1.7
+++ kbilliards.spec	7 Sep 2008 14:54:28 -0000	1.8
@@ -20,7 +20,7 @@
 
 %prep
 %setup -q
-%patch0 -p0 -z .sqrtl
+%patch0 -p1 -z .sqrtl
 %patch1 -p0 -z .warn
 %patch2 -p1 -z .destdir
 %patch3 -p1 -z .gcc43



From jwrdegoede at fedoraproject.org  Sun Sep  7 14:55:35 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun,  7 Sep 2008 14:55:35 +0000 (UTC)
Subject: rpms/libvorbis/devel libvorbis-1.0-m4.patch, 1.2, 1.3 libvorbis.spec,
	1.31, 1.32
Message-ID: <20080907145535.C2E9D70126@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/libvorbis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18099

Modified Files:
	libvorbis-1.0-m4.patch libvorbis.spec 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> -1:1.2.0-5
- Fix patch fuzz build failure


libvorbis-1.0-m4.patch:

Index: libvorbis-1.0-m4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvorbis/devel/libvorbis-1.0-m4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libvorbis-1.0-m4.patch	9 Sep 2004 07:52:14 -0000	1.2
+++ libvorbis-1.0-m4.patch	7 Sep 2008 14:55:05 -0000	1.3
@@ -1,6 +1,28 @@
---- libvorbis-1.0/vorbis.m4.m4-patch	2002-07-09 09:08:57.000000000 -0400
-+++ libvorbis-1.0/vorbis.m4	2003-02-21 09:46:34.000000000 -0500
-@@ -20,7 +20,7 @@
+diff -up libvorbis-1.2.0/configure.foo libvorbis-1.2.0/configure
+--- libvorbis-1.2.0/configure.foo	2008-09-07 16:51:15.000000000 +0200
++++ libvorbis-1.2.0/configure	2008-09-07 16:51:24.000000000 +0200
+@@ -19936,7 +19936,7 @@ fi
+   elif test "x$ogg_prefix" != "x" ; then
+     OGG_LIBS="-L$ogg_prefix/lib"
+   elif test "x$prefix" != "xNONE" ; then
+-    OGG_LIBS="-L$prefix/lib"
++    OGG_LIBS="-L$libdir"
+   fi
+ 
+   OGG_LIBS="$OGG_LIBS -logg"
+@@ -19946,7 +19946,7 @@ fi
+   elif test "x$ogg_prefix" != "x" ; then
+     OGG_CFLAGS="-I$ogg_prefix/include"
+   elif test "x$prefix" != "xNONE"; then
+-    OGG_CFLAGS="-I$prefix/include"
++    OGG_CFLAGS=""
+   fi
+ 
+   { echo "$as_me:$LINENO: checking for Ogg" >&5
+diff -up libvorbis-1.2.0/vorbis.m4.foo libvorbis-1.2.0/vorbis.m4
+--- libvorbis-1.2.0/vorbis.m4.foo	2008-09-07 16:51:15.000000000 +0200
++++ libvorbis-1.2.0/vorbis.m4	2008-09-07 16:51:24.000000000 +0200
+@@ -20,7 +20,7 @@ AC_ARG_ENABLE(vorbistest, [  --disable-v
    elif test "x$vorbis_prefix" != "x" ; then
      VORBIS_LIBS="-L$vorbis_prefix/lib"
    elif test "x$prefix" != "xNONE"; then
@@ -9,7 +31,7 @@
    fi
  
    VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm"
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ AC_ARG_ENABLE(vorbistest, [  --disable-v
    elif test "x$vorbis_prefix" != "x" ; then
      VORBIS_CFLAGS="-I$vorbis_prefix/include"
    elif test "x$prefix" != "xNONE"; then
@@ -18,23 +40,3 @@
    fi
  
  
---- libvorbis-1.0/configure.m4-patch	2002-07-19 08:26:08.000000000 -0400
-+++ libvorbis-1.0/configure	2003-02-21 09:46:22.000000000 -0500
-@@ -5704,7 +5704,7 @@
-   elif test "x$ogg_prefix" != "x" ; then
-     OGG_LIBS="-L$ogg_prefix/lib"
-   elif test "x$prefix" != "xNONE" ; then
--    OGG_LIBS="-L$prefix/lib"
-+    OGG_LIBS="-L$libdir"
-   fi
- 
-   OGG_LIBS="$OGG_LIBS -logg"
-@@ -5714,7 +5714,7 @@
-   elif test "x$ogg_prefix" != "x" ; then
-     OGG_CFLAGS="-I$ogg_prefix/include"
-   elif test "x$prefix" != "xNONE"; then
--    OGG_CFLAGS="-I$prefix/include"
-+    OGG_CFLAGS=""
-   fi
- 
-   echo $ac_n "checking for Ogg""... $ac_c" 1>&6


Index: libvorbis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvorbis/devel/libvorbis.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libvorbis.spec	14 May 2008 09:38:36 -0000	1.31
+++ libvorbis.spec	7 Sep 2008 14:55:05 -0000	1.32
@@ -1,7 +1,7 @@
 Summary:	The Vorbis General Audio Compression Codec.
 Name:		libvorbis
 Version:	1.2.0
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Epoch:		1
 Group:		System Environment/Libraries
 License:	BSD
@@ -91,6 +91,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> -1:1.2.0-5
+- Fix patch fuzz build failure
+
 * Wed May 14 2008 Jindrich Novy <jnovy at redhat.com> - 1:1.2.0-4
 - fix CVE-2008-1420, CVE-2008-1419, CVE-2008-1423 (#446344)
 



From spot at fedoraproject.org  Sun Sep  7 15:02:18 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun,  7 Sep 2008 15:02:18 +0000 (UTC)
Subject: rpms/xmms-skins/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xmms-skins.spec, 1.1, 1.2
Message-ID: <20080907150218.ABBC970126@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xmms-skins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21538

Modified Files:
	.cvsignore sources xmms-skins.spec 
Log Message:
fix license tag, remove skins with questionable licensing


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmms-skins/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Apr 2005 20:10:22 -0000	1.2
+++ .cvsignore	7 Sep 2008 15:01:48 -0000	1.3
@@ -1 +1,7 @@
-xmmsskins-1.0.tar.gz
+arctic_Xmms.zip
+BlueSteel.zip
+BrushedMetal_Xmms.zip
+ColderXMMS.tar.gz
+Cyrus-XMMS.zip
+GTK+.zip
+Marble.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmms-skins/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Apr 2005 20:10:22 -0000	1.2
+++ sources	7 Sep 2008 15:01:48 -0000	1.3
@@ -1 +1,7 @@
-f625e06f82d8132209ed947c6d8502a4  xmmsskins-1.0.tar.gz
+2eef6028cb492eb6c61e3d4833f050d1  arctic_Xmms.zip
+43d156cc949decf3a12c0152f6ba683c  BlueSteel.zip
+4dd99515b7bda4286c80637ce4ee25f0  BrushedMetal_Xmms.zip
+6eeb93f95d6f18b632556712891e4560  ColderXMMS.tar.gz
+2a2d45538fd2b2d809bed4dee9529a4c  Cyrus-XMMS.zip
+b184bd452ee51ff14e0a60b0eba6c36b  GTK+.zip
+2a4040a1f07b89e708e5e9ea808045ae  Marble.zip


Index: xmms-skins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmms-skins/devel/xmms-skins.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmms-skins.spec	15 Apr 2005 20:10:22 -0000	1.1
+++ xmms-skins.spec	7 Sep 2008 15:01:48 -0000	1.2
@@ -1,12 +1,68 @@
 Summary: Skins for the X MultiMedia System
 Name: xmms-skins
 Version: 1.2.10
-Release: 15
+Release: 16
 Epoch: 1
-License: GPL
+License: MIT and GPL+ and Copyright only
 Group: Applications/Multimedia
 URL: http://www.xmms.org/
-Source: xmmsskins-1.0.tar.gz
+# Yes, this is painful, but I need to do it for license tracking.
+# Emailed author
+# Source0: http://xmms.org/files/Skins/AbsoluteE_Xmms.zip
+# GPL, according to author created Freshmeat page:
+# http://themes.freshmeat.net/projects/arctic_/
+Source1: http://xmms.org/files/Skins/arctic_Xmms.zip
+# No idea who made these. No License.
+# Source2: http://xmms.org/files/Skins/blackstar.zip
+# Source3: http://xmms.org/files/Skins/BlackXMMS.zip
+# Source4: http://xmms.org/files/Skins/BlueIce.zip
+# MIT (derived from Enlightenment theme)
+# See: http://www.erat.org/
+Source5: http://xmms.org/files/Skins/BlueSteel.zip
+# MIT (derived from Enlightenment theme)
+Source6: http://xmms.org/files/Skins/BrushedMetal_Xmms.zip
+# Derived from this work, where the author explicitly says not to redistribute.
+# http://www.beyondconvention.com/ohussain/_oldsite/themes/chaos_README.txt
+# Source7: http://xmms.org/files/Skins/chaos_XMMS.zip
+# Copyright only
+Source8: http://xmms.org/files/Skins/ColderXMMS.tar.gz
+# Emailed author asking about license
+# Source9: http://xmms.org/files/Skins/Covenant.zip
+# GPL, according to freshmeat page created by author:
+# http://freshmeat.net/projects/cyrus/
+Source10: http://xmms.org/files/Skins/Cyrus-XMMS.zip
+# Emailed author
+# Source11: http://xmms.org/files/Skins/detone_blue.zip
+# Source12: http://xmms.org/files/Skins/detone_green.zip
+# Emailed author
+# Source13: http://xmms.org/files/Skins/fyre.zip
+# GPL+
+Source14: http://xmms.org/files/Skins/GTK+.zip
+# Emailed author
+# Source15: http://xmms.org/files/Skins/Inverse.zip
+# Derived from E theme, which is under GPL
+# http://ftp.univie.ac.at/pub/FreeBSD/ports/local-distfiles/vanilla/Marble.etheme
+Source16: http://xmms.org/files/Skins/Marble.zip
+# No idea who made this. No License.
+# Source17: http://xmms.org/files/Skins/Panic.zip
+# Emailed author
+# Source18: http://xmms.org/files/Skins/sinistar.zip
+# Emailed author
+# Source19: http://xmms.org/files/Skins/titanium.zip
+# Emailed author
+# Source20: http://xmms.org/files/Skins/Ultrafina-pw.zip
+# Source21: http://xmms.org/files/Skins/UltrafinaSE.zip
+# Source22: http://xmms.org/files/Skins/Ultrafina.zip
+# Same author as Covenant skin (if he replies, I will ask about this one)
+# Source23: http://xmms.org/files/Skins/Vulcan.zip
+# Cannot find active email for Christopher Allen (copyright holder)
+# http://web.archive.org/web/20050212133801/ruah.dyndns.org/~cpcallen/
+# Source24: http://xmms.org/files/Skins/XawMMS.zip
+# Same author as Covenant skin (if he replies, I will ask about	this one)
+# Source25: http://xmms.org/files/Skins/xmms-256.zip
+# No idea who made these. No License.
+# Source26: http://xmms.org/files/Skins/XMMS-Green.zip
+# Source27: http://xmms.org/files/Skins/X-Tra.zip
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 Requires: xmms
@@ -18,7 +74,8 @@
 
 
 %prep
-%setup -c %{name}-%{release}
+%setup -q -T -c -n %{name}-%{version}
+cp %{SOURCE1} %{SOURCE5} %{SOURCE6} %{SOURCE8} %{SOURCE10} %{SOURCE14} %{SOURCE16} .
 
 
 %build
@@ -40,6 +97,9 @@
 
 
 %changelog
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1:1.2.10-16
+- fix license tag, remove skins where licensing is unclear
+
 * Thu Apr 14 2005 Matthias Saou <http://freshrpms.net/> 1:1.2.10-15
 - Split off xmms-skins sub-package of xmms to its own package.
 - Become "noarch" at last, fixes #65614.



From jwrdegoede at fedoraproject.org  Sun Sep  7 15:02:35 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun,  7 Sep 2008 15:02:35 +0000 (UTC)
Subject: rpms/pioneers/devel pioneers-0.12.1-sanitize.patch, 1.1,
	1.2 pioneers.spec, 1.5, 1.6
Message-ID: <20080907150235.5763170126@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/pioneers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21742

Modified Files:
	pioneers-0.12.1-sanitize.patch pioneers.spec 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.12.2-2
- Fix patch fuzz build failure


pioneers-0.12.1-sanitize.patch:

Index: pioneers-0.12.1-sanitize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pioneers/devel/pioneers-0.12.1-sanitize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pioneers-0.12.1-sanitize.patch	28 Apr 2008 11:46:43 -0000	1.1
+++ pioneers-0.12.1-sanitize.patch	7 Sep 2008 15:02:05 -0000	1.2
@@ -1,12 +1,12 @@
-diff -U0 pioneers-0.12.1/ChangeLog.sanitize pioneers-0.12.1/ChangeLog
---- pioneers-0.12.1/ChangeLog.sanitize	2008-04-27 23:00:50.000000000 +0200
-+++ pioneers-0.12.1/ChangeLog	2008-04-28 13:13:30.000000000 +0200
-@@ -3697 +3697 @@
+diff -U0 pioneers-0.12.2/ChangeLog.foo pioneers-0.12.2/ChangeLog
+--- pioneers-0.12.2/ChangeLog.foo	2008-05-01 21:04:37.000000000 +0200
++++ pioneers-0.12.2/ChangeLog	2008-09-07 17:01:15.000000000 +0200
+@@ -3711 +3711 @@
 -	* One of the official rule variants for Settlers of Catan is
 +	* One of the official rule variants is
-diff -up pioneers-0.12.1/README.sanitize pioneers-0.12.1/README
---- pioneers-0.12.1/README.sanitize	2007-12-16 20:10:47.000000000 +0100
-+++ pioneers-0.12.1/README	2008-04-28 13:13:30.000000000 +0200
+diff -up pioneers-0.12.2/README.foo pioneers-0.12.2/README
+--- pioneers-0.12.2/README.foo	2007-12-16 20:10:47.000000000 +0100
++++ pioneers-0.12.2/README	2008-09-07 17:01:15.000000000 +0200
 @@ -1,8 +1,8 @@
  Pioneers
  
@@ -19,9 +19,9 @@
  
  Playing the Game
  ================
-diff -up pioneers-0.12.1/client/gtk/gui.c.sanitize pioneers-0.12.1/client/gtk/gui.c
---- pioneers-0.12.1/client/gtk/gui.c.sanitize	2008-04-27 22:40:58.000000000 +0200
-+++ pioneers-0.12.1/client/gtk/gui.c	2008-04-28 13:13:30.000000000 +0200
+diff -up pioneers-0.12.2/client/gtk/gui.c.foo pioneers-0.12.2/client/gtk/gui.c
+--- pioneers-0.12.2/client/gtk/gui.c.foo	2008-05-01 21:05:57.000000000 +0200
++++ pioneers-0.12.2/client/gtk/gui.c	2008-09-07 17:01:15.000000000 +0200
 @@ -55,14 +55,12 @@ enum {
  	TRADE_PAGE,		/* trading interface */
  	QUOTE_PAGE,		/* submit quotes page */
@@ -119,9 +119,9 @@
  
  	panel = chat_build_panel();
  	frontend_gui_register(panel, GUI_DISCONNECT, NULL);
-diff -up pioneers-0.12.1/client/gtk/offline.c.sanitize pioneers-0.12.1/client/gtk/offline.c
---- pioneers-0.12.1/client/gtk/offline.c.sanitize	2008-04-27 22:40:58.000000000 +0200
-+++ pioneers-0.12.1/client/gtk/offline.c	2008-04-28 13:13:30.000000000 +0200
+diff -up pioneers-0.12.2/client/gtk/offline.c.foo pioneers-0.12.2/client/gtk/offline.c
+--- pioneers-0.12.2/client/gtk/offline.c.foo	2008-05-01 21:05:57.000000000 +0200
++++ pioneers-0.12.2/client/gtk/offline.c	2008-09-07 17:01:15.000000000 +0200
 @@ -88,7 +88,6 @@ static void frontend_offline_gui(GuiEven
  				   && !connectable);
  		break;
@@ -130,9 +130,9 @@
  		gui_set_net_status(_("Connecting"));
  
  		connectable = FALSE;
-diff -up pioneers-0.12.1/client/help/C/pioneers-C.omf.sanitize pioneers-0.12.1/client/help/C/pioneers-C.omf
---- pioneers-0.12.1/client/help/C/pioneers-C.omf.sanitize	2007-12-16 20:10:46.000000000 +0100
-+++ pioneers-0.12.1/client/help/C/pioneers-C.omf	2008-04-28 13:13:30.000000000 +0200
+diff -up pioneers-0.12.2/client/help/C/pioneers-C.omf.foo pioneers-0.12.2/client/help/C/pioneers-C.omf
+--- pioneers-0.12.2/client/help/C/pioneers-C.omf.foo	2007-12-16 20:10:46.000000000 +0100
++++ pioneers-0.12.2/client/help/C/pioneers-C.omf	2008-09-07 17:01:15.000000000 +0200
 @@ -17,8 +17,8 @@
      <version identifier="1.0" date="2003-10-07" description="Updated to full OMF format"/>
      <subject category="GNOME|Games"/>
@@ -144,9 +144,9 @@
      </description>
      <type>
       user's guide
-diff -up pioneers-0.12.1/client/help/C/pioneers.xml.sanitize pioneers-0.12.1/client/help/C/pioneers.xml
---- pioneers-0.12.1/client/help/C/pioneers.xml.sanitize	2008-04-27 22:40:58.000000000 +0200
-+++ pioneers-0.12.1/client/help/C/pioneers.xml	2008-04-28 13:13:30.000000000 +0200
+diff -up pioneers-0.12.2/client/help/C/pioneers.xml.foo pioneers-0.12.2/client/help/C/pioneers.xml
+--- pioneers-0.12.2/client/help/C/pioneers.xml.foo	2008-04-27 22:40:58.000000000 +0200
++++ pioneers-0.12.2/client/help/C/pioneers.xml	2008-09-07 17:01:15.000000000 +0200
 @@ -58,10 +58,11 @@
      <simplesect id="Authors">
        <title>Authors and History</title>
@@ -173,9 +173,9 @@
          To be continued...
        </para>
      </simplesect>
-diff -up pioneers-0.12.1/common/gtk/aboutbox.c.sanitize pioneers-0.12.1/common/gtk/aboutbox.c
---- pioneers-0.12.1/common/gtk/aboutbox.c.sanitize	2008-04-27 22:40:55.000000000 +0200
-+++ pioneers-0.12.1/common/gtk/aboutbox.c	2008-04-28 13:13:30.000000000 +0200
+diff -up pioneers-0.12.2/common/gtk/aboutbox.c.foo pioneers-0.12.2/common/gtk/aboutbox.c
+--- pioneers-0.12.2/common/gtk/aboutbox.c.foo	2008-05-01 21:05:56.000000000 +0200
++++ pioneers-0.12.2/common/gtk/aboutbox.c	2008-09-07 17:01:15.000000000 +0200
 @@ -37,10 +37,9 @@ static GtkWidget *about = NULL;	/* The a
  
  void aboutbox_display(const gchar * title, const gchar ** authors)
@@ -211,9 +211,9 @@
  	gtk_text_buffer_insert_with_tags_by_name(buffer, &iter,
  						 _("Version:"), -1,
  						 "bold", NULL);
-diff -up pioneers-0.12.1/docs/pioneers-meta-server.6.sanitize pioneers-0.12.1/docs/pioneers-meta-server.6
---- pioneers-0.12.1/docs/pioneers-meta-server.6.sanitize	2008-04-27 22:40:55.000000000 +0200
-+++ pioneers-0.12.1/docs/pioneers-meta-server.6	2008-04-28 13:13:30.000000000 +0200
+diff -up pioneers-0.12.2/docs/pioneers-meta-server.6.foo pioneers-0.12.2/docs/pioneers-meta-server.6
+--- pioneers-0.12.2/docs/pioneers-meta-server.6.foo	2008-04-27 22:40:55.000000000 +0200
++++ pioneers-0.12.2/docs/pioneers-meta-server.6	2008-09-07 17:01:15.000000000 +0200
 @@ -8,8 +8,10 @@ pioneers-meta-server \- meta game server
  
  .SH DESCRIPTION
@@ -227,9 +227,9 @@
  provides a piece of network infrastructure that helps match pioneers clients to
  pioneers servers. Casual players of pioneers probably do not need to run this
  program.
-diff -up pioneers-0.12.1/docs/pioneers-server-console.6.sanitize pioneers-0.12.1/docs/pioneers-server-console.6
---- pioneers-0.12.1/docs/pioneers-server-console.6.sanitize	2007-12-16 20:10:31.000000000 +0100
-+++ pioneers-0.12.1/docs/pioneers-server-console.6	2008-04-28 13:13:30.000000000 +0200
+diff -up pioneers-0.12.2/docs/pioneers-server-console.6.foo pioneers-0.12.2/docs/pioneers-server-console.6
+--- pioneers-0.12.2/docs/pioneers-server-console.6.foo	2007-12-16 20:10:31.000000000 +0100
++++ pioneers-0.12.2/docs/pioneers-server-console.6	2008-09-07 17:01:15.000000000 +0200
 @@ -48,8 +48,9 @@ This manual page documents briefly the
  command.
  .PP
@@ -242,9 +242,9 @@
  model for networked play of between two and eight players.  This program
  provides a console-only server that \fBpioneers\fP clients can connect
  to.
-diff -up pioneers-0.12.1/docs/pioneers-server-gtk.6.sanitize pioneers-0.12.1/docs/pioneers-server-gtk.6
---- pioneers-0.12.1/docs/pioneers-server-gtk.6.sanitize	2007-12-16 20:10:31.000000000 +0100
-+++ pioneers-0.12.1/docs/pioneers-server-gtk.6	2008-04-28 13:13:30.000000000 +0200
+diff -up pioneers-0.12.2/docs/pioneers-server-gtk.6.foo pioneers-0.12.2/docs/pioneers-server-gtk.6
+--- pioneers-0.12.2/docs/pioneers-server-gtk.6.foo	2007-12-16 20:10:31.000000000 +0100
++++ pioneers-0.12.2/docs/pioneers-server-gtk.6	2008-09-07 17:01:15.000000000 +0200
 @@ -12,8 +12,9 @@ This manual page documents briefly the
  command.
  .PP
@@ -257,9 +257,9 @@
  model for networked play of between two and eight players.  This program
  provides a GUI-configurable stand-alone server which you connect to
  from 
-diff -up pioneers-0.12.1/docs/pioneers.6.sanitize pioneers-0.12.1/docs/pioneers.6
---- pioneers-0.12.1/docs/pioneers.6.sanitize	2007-12-16 20:10:31.000000000 +0100
-+++ pioneers-0.12.1/docs/pioneers.6	2008-04-28 13:13:30.000000000 +0200
+diff -up pioneers-0.12.2/docs/pioneers.6.foo pioneers-0.12.2/docs/pioneers.6
+--- pioneers-0.12.2/docs/pioneers.6.foo	2007-12-16 20:10:31.000000000 +0100
++++ pioneers-0.12.2/docs/pioneers.6	2008-09-07 17:01:15.000000000 +0200
 @@ -1,6 +1,6 @@
  .TH pioneers 6 "April 9, 2006" "pioneers"
  .SH NAME
@@ -280,9 +280,9 @@
  model for networked play of between two and eight players.  You will
  need to connect to a machine running either \fBpioneers-server-gtk\fP
  or \fBpioneers-server-console\fP to play.  An AI client, \fBpioneersai\fP,
-diff -up pioneers-0.12.1/docs/pioneersai.6.sanitize pioneers-0.12.1/docs/pioneersai.6
---- pioneers-0.12.1/docs/pioneersai.6.sanitize	2007-12-16 20:10:31.000000000 +0100
-+++ pioneers-0.12.1/docs/pioneersai.6	2008-04-28 13:13:30.000000000 +0200
+diff -up pioneers-0.12.2/docs/pioneersai.6.foo pioneers-0.12.2/docs/pioneersai.6
+--- pioneers-0.12.2/docs/pioneersai.6.foo	2007-12-16 20:10:31.000000000 +0100
++++ pioneers-0.12.2/docs/pioneersai.6	2008-09-07 17:01:15.000000000 +0200
 @@ -26,8 +26,9 @@ This manual page documents briefly the
  command.
  .PP
@@ -295,9 +295,9 @@
  implementation that can take part in Pioneers games.
  
  .SH OPTIONS
-diff -up pioneers-0.12.1/po/af.po.sanitize pioneers-0.12.1/po/af.po
---- pioneers-0.12.1/po/af.po.sanitize	2008-04-27 22:41:06.000000000 +0200
-+++ pioneers-0.12.1/po/af.po	2008-04-28 13:13:30.000000000 +0200
+diff -up pioneers-0.12.2/po/af.po.foo pioneers-0.12.2/po/af.po
+--- pioneers-0.12.2/po/af.po.foo	2008-05-01 20:50:15.000000000 +0200
++++ pioneers-0.12.2/po/af.po	2008-09-07 17:01:15.000000000 +0200
 @@ -2122,14 +2122,6 @@ msgid ""
  "Total: %d"
  msgstr ""
@@ -313,9 +313,9 @@
  #: ../common/gtk/aboutbox.c:78
  msgid "Version:"
  msgstr "Weergawe:"
-diff -up pioneers-0.12.1/po/cs.po.sanitize pioneers-0.12.1/po/cs.po
---- pioneers-0.12.1/po/cs.po.sanitize	2008-04-28 13:15:17.000000000 +0200
-+++ pioneers-0.12.1/po/cs.po	2008-04-28 13:15:33.000000000 +0200
+diff -up pioneers-0.12.2/po/cs.po.foo pioneers-0.12.2/po/cs.po
+--- pioneers-0.12.2/po/cs.po.foo	2008-05-01 20:50:15.000000000 +0200
++++ pioneers-0.12.2/po/cs.po	2008-09-07 17:01:15.000000000 +0200
 @@ -2120,14 +2120,6 @@ msgstr ""
  "Maxim??ln?? bonus za objeven?? ostrov??: %d\n"
  "Celkem: %d"
@@ -331,10 +331,10 @@
  #: ../common/gtk/aboutbox.c:78
  msgid "Version:"
  msgstr "Verze:"
-diff -up pioneers-0.12.1/po/da.po.sanitize pioneers-0.12.1/po/da.po
---- pioneers-0.12.1/po/da.po.sanitize	2008-04-27 22:41:07.000000000 +0200
-+++ pioneers-0.12.1/po/da.po	2008-04-28 13:13:30.000000000 +0200
-@@ -2128,14 +2128,6 @@ msgstr ""
+diff -up pioneers-0.12.2/po/da.po.foo pioneers-0.12.2/po/da.po
+--- pioneers-0.12.2/po/da.po.foo	2008-05-01 20:50:15.000000000 +0200
++++ pioneers-0.12.2/po/da.po	2008-09-07 17:01:15.000000000 +0200
+@@ -2125,14 +2125,6 @@ msgstr ""
  "Maksimal bonus for opdagelse af ??er: %d\n"
  "Total: %d"
  
@@ -347,12 +347,12 @@
 -"Settlers og Catan br??dtspil.\n"
 -
  #: ../common/gtk/aboutbox.c:78
- #, fuzzy
  msgid "Version:"
-diff -up pioneers-0.12.1/po/de.po.sanitize pioneers-0.12.1/po/de.po
---- pioneers-0.12.1/po/de.po.sanitize	2008-04-27 22:41:07.000000000 +0200
-+++ pioneers-0.12.1/po/de.po	2008-04-28 13:13:30.000000000 +0200
-@@ -2132,14 +2132,6 @@ msgstr ""
+ msgstr "Version:"
+diff -up pioneers-0.12.2/po/de.po.foo pioneers-0.12.2/po/de.po
+--- pioneers-0.12.2/po/de.po.foo	2008-05-01 20:50:15.000000000 +0200
++++ pioneers-0.12.2/po/de.po	2008-09-07 17:01:16.000000000 +0200
+@@ -2134,14 +2134,6 @@ msgstr ""
  "Gr????ter Insel-Entdeckungs-Bonus: %d\n"
  "Gesamt: %d"
  
@@ -367,9 +367,9 @@
  #: ../common/gtk/aboutbox.c:78
  #, fuzzy
  msgid "Version:"
-diff -up pioneers-0.12.1/po/es.po.sanitize pioneers-0.12.1/po/es.po
---- pioneers-0.12.1/po/es.po.sanitize	2008-04-27 22:41:07.000000000 +0200
-+++ pioneers-0.12.1/po/es.po	2008-04-28 13:13:30.000000000 +0200
+diff -up pioneers-0.12.2/po/es.po.foo pioneers-0.12.2/po/es.po
+--- pioneers-0.12.2/po/es.po.foo	2008-05-01 20:50:15.000000000 +0200
++++ pioneers-0.12.2/po/es.po	2008-09-07 17:01:16.000000000 +0200
 @@ -2126,14 +2126,6 @@ msgid ""
  "Total: %d"
  msgstr ""
@@ -385,9 +385,9 @@
  #: ../common/gtk/aboutbox.c:78
  #, fuzzy
  msgid "Version:"
-diff -up pioneers-0.12.1/po/fr.po.sanitize pioneers-0.12.1/po/fr.po
---- pioneers-0.12.1/po/fr.po.sanitize	2008-04-27 22:41:07.000000000 +0200
-+++ pioneers-0.12.1/po/fr.po	2008-04-28 13:13:30.000000000 +0200
+diff -up pioneers-0.12.2/po/fr.po.foo pioneers-0.12.2/po/fr.po
+--- pioneers-0.12.2/po/fr.po.foo	2008-05-01 20:50:15.000000000 +0200
++++ pioneers-0.12.2/po/fr.po	2008-09-07 17:01:16.000000000 +0200
 @@ -2135,14 +2135,6 @@ msgstr ""
  "Bonus maximum pour la d??couverte d'iles : %d\n"
  "Total : %d"
@@ -403,9 +403,9 @@
  #: ../common/gtk/aboutbox.c:78
  msgid "Version:"
  msgstr "Version :"
-diff -up pioneers-0.12.1/po/hu.po.sanitize pioneers-0.12.1/po/hu.po
---- pioneers-0.12.1/po/hu.po.sanitize	2008-04-27 22:41:08.000000000 +0200
-+++ pioneers-0.12.1/po/hu.po	2008-04-28 13:13:30.000000000 +0200
+diff -up pioneers-0.12.2/po/hu.po.foo pioneers-0.12.2/po/hu.po
+--- pioneers-0.12.2/po/hu.po.foo	2008-05-01 20:50:15.000000000 +0200
++++ pioneers-0.12.2/po/hu.po	2008-09-07 17:01:16.000000000 +0200
 @@ -2134,14 +2134,6 @@ msgstr ""
  "Maximum sziget felfedez??s b??nusz: %d\n"
  "??sszesen: %d"
@@ -421,9 +421,9 @@
  #: ../common/gtk/aboutbox.c:78
  msgid "Version:"
  msgstr "Verzi??:"
-diff -up pioneers-0.12.1/po/it.po.sanitize pioneers-0.12.1/po/it.po
---- pioneers-0.12.1/po/it.po.sanitize	2008-04-27 22:41:08.000000000 +0200
-+++ pioneers-0.12.1/po/it.po	2008-04-28 13:13:30.000000000 +0200
+diff -up pioneers-0.12.2/po/it.po.foo pioneers-0.12.2/po/it.po
+--- pioneers-0.12.2/po/it.po.foo	2008-05-01 20:50:15.000000000 +0200
++++ pioneers-0.12.2/po/it.po	2008-09-07 17:01:16.000000000 +0200
 @@ -2127,14 +2127,6 @@ msgstr ""
  "Massimo bonus per scoperta isole: %d\n"
  "Totale: %d"
@@ -439,9 +439,9 @@
  #: ../common/gtk/aboutbox.c:78
  msgid "Version:"
  msgstr "Versione:"
-diff -up pioneers-0.12.1/po/ja.po.sanitize pioneers-0.12.1/po/ja.po
---- pioneers-0.12.1/po/ja.po.sanitize	2008-04-27 22:41:08.000000000 +0200
-+++ pioneers-0.12.1/po/ja.po	2008-04-28 13:13:30.000000000 +0200
+diff -up pioneers-0.12.2/po/ja.po.foo pioneers-0.12.2/po/ja.po
+--- pioneers-0.12.2/po/ja.po.foo	2008-05-01 20:50:15.000000000 +0200
++++ pioneers-0.12.2/po/ja.po	2008-09-07 17:01:16.000000000 +0200
 @@ -2125,14 +2125,6 @@ msgstr ""
  "??????????????????????????????: %d\n"
  "??????: %d"
@@ -457,9 +457,9 @@
  #: ../common/gtk/aboutbox.c:78
  #, fuzzy
  msgid "Version:"
-diff -up pioneers-0.12.1/po/nl.po.sanitize pioneers-0.12.1/po/nl.po
---- pioneers-0.12.1/po/nl.po.sanitize	2008-04-27 22:41:08.000000000 +0200
-+++ pioneers-0.12.1/po/nl.po	2008-04-28 13:13:30.000000000 +0200
+diff -up pioneers-0.12.2/po/nl.po.foo pioneers-0.12.2/po/nl.po
+--- pioneers-0.12.2/po/nl.po.foo	2008-05-01 20:50:15.000000000 +0200
++++ pioneers-0.12.2/po/nl.po	2008-09-07 17:01:16.000000000 +0200
 @@ -2126,14 +2126,6 @@ msgstr ""
  "Hoogste aantal ontdekkingspunten: %d\n"
  "Totaal: %d"
@@ -475,10 +475,10 @@
  #: ../common/gtk/aboutbox.c:78
  msgid "Version:"
  msgstr "Versie:"
-diff -up pioneers-0.12.1/po/pt.po.sanitize pioneers-0.12.1/po/pt.po
---- pioneers-0.12.1/po/pt.po.sanitize	2008-04-27 22:41:08.000000000 +0200
-+++ pioneers-0.12.1/po/pt.po	2008-04-28 13:13:30.000000000 +0200
-@@ -2123,14 +2123,6 @@ msgstr ""
+diff -up pioneers-0.12.2/po/pt.po.foo pioneers-0.12.2/po/pt.po
+--- pioneers-0.12.2/po/pt.po.foo	2008-05-01 20:50:15.000000000 +0200
++++ pioneers-0.12.2/po/pt.po	2008-09-07 17:01:16.000000000 +0200
+@@ -2121,14 +2121,6 @@ msgstr ""
  "Maior b??nus de descoberta de ilha: %d\n"
  "Total: %d"
  
@@ -493,9 +493,9 @@
  #: ../common/gtk/aboutbox.c:78
  msgid "Version:"
  msgstr "Vers??o:"
-diff -up pioneers-0.12.1/po/sv.po.sanitize pioneers-0.12.1/po/sv.po
---- pioneers-0.12.1/po/sv.po.sanitize	2008-04-27 22:41:09.000000000 +0200
-+++ pioneers-0.12.1/po/sv.po	2008-04-28 13:13:30.000000000 +0200
+diff -up pioneers-0.12.2/po/sv.po.foo pioneers-0.12.2/po/sv.po
+--- pioneers-0.12.2/po/sv.po.foo	2008-05-01 20:50:15.000000000 +0200
++++ pioneers-0.12.2/po/sv.po	2008-09-07 17:01:16.000000000 +0200
 @@ -2124,14 +2124,6 @@ msgstr ""
  "Maximal uppt??cktsbonus f??r ??ar: %d\n"
  "Totalt: %d"


Index: pioneers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pioneers/devel/pioneers.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pioneers.spec	2 May 2008 11:18:39 -0000	1.5
+++ pioneers.spec	7 Sep 2008 15:02:05 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           pioneers
 Version:        0.12.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Turnbased board strategy game (colonize an island)
 Group:          Amusements/Games
 License:        GPLv2+
@@ -109,6 +109,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.12.2-2
+- Fix patch fuzz build failure
+
 * Fri May  2 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.12.2-1
 - New upstream release 0.12.2
 



From spot at fedoraproject.org  Sun Sep  7 15:03:49 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun,  7 Sep 2008 15:03:49 +0000 (UTC)
Subject: rpms/svnkit/devel svnkit.spec,1.7,1.8
Message-ID: <20080907150349.C7AA570126@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/svnkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22671

Modified Files:
	svnkit.spec 
Log Message:
fix license tag


Index: svnkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/svnkit/devel/svnkit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- svnkit.spec	19 Feb 2008 22:19:26 -0000	1.7
+++ svnkit.spec	7 Sep 2008 15:03:19 -0000	1.8
@@ -3,12 +3,12 @@
 
 Name:           svnkit
 Version:        1.1.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
 # License located at http://tmate.org/svn/license.html
-License:        TMate License
+License:        TMate
 URL:            http://www.svnkit.com/
 Source0:        http://www.svnkit.com/org.tmatesoft.svn_%{version}.src.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.4-4
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1.4-3
 - Autorebuild for GCC 4.3
 



From scop at fedoraproject.org  Sun Sep  7 15:19:07 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun,  7 Sep 2008 15:19:07 +0000 (UTC)
Subject: rpms/vdr/devel vdr-halt.local.sh, NONE, 1.1 .cvsignore, 1.15,
	1.16 sources, 1.15, 1.16 vdr-README.package, 1.5,
	1.6 vdr-shutdown.sh, 1.4, 1.5 vdr.spec, 1.27,
	1.28 MainMenuHooks-v1_0.patch, 1.2, NONE timercmd-0.1_1.6.0.diff,
	1.1, NONE vdr-1.6.0-1.diff, 1.1,
	NONE vdr-timer-info-0.5-1.5.15.diff, 1.1, NONE
Message-ID: <20080907151907.0515670126@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27618

Modified Files:
	.cvsignore sources vdr-README.package vdr-shutdown.sh vdr.spec 
Added Files:
	vdr-halt.local.sh 
Removed Files:
	MainMenuHooks-v1_0.patch timercmd-0.1_1.6.0.diff 
	vdr-1.6.0-1.diff vdr-timer-info-0.5-1.5.15.diff 
Log Message:
* Sun Sep  7 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-4
- Apply upstream 1.6.0-2 maintenance patch.
- Update shutdown/wakeup functionality for F-9+ ACPI wakeup.
- Install halt.local script (vdr-halt.local.sh) instead of embedding it
  in README-package.  It still needs to be inserted to (or installed/symlinked
  as) /sbin/halt.local.
- Convert remaining docs to UTF-8.
- Set expected fuzz factor when applying patches.

Non-%changelog: Move some unmodified upstream patches to lookaside cache.



--- NEW FILE vdr-halt.local.sh ---
#!/bin/bash

# Modify /sbin/halt.local to call this script.  For more information,
# see /usr/share/doc/vdr*/README.package
#
# If /sbin/halt.local does not exist, something like the following shell
# script should work.  Remember to make it executable.
# 
# #!/bin/sh
# /usr/lib/vdr/bin/vdr-halt.local.sh

wakeupfile=/var/lib/vdr/next-wakeup
sysfsalarm=/sys/class/rtc/rtc0/wakealarm
procalarm=/proc/acpi/alarm

trap "rm -f $wakeupfile" EXIT

if [ -s "$wakeupfile" ] ; then
    seconds=$(cat "$wakeupfile")
    datestr=$(date -d "1970-01-01 UTC $seconds sec" +"%Y-%m-%d %H:%M:%S")
    if [ -w "$sysfsalarm" ] ; then
        echo "Setting ACPI wakeup for next VDR timer (via sysfs): $datestr"
        echo 0          > "$sysfsalarm"
        echo "$seconds" > "$sysfsalarm"
    elif [ -w "$procalarm" ] ; then
        echo "Setting ACPI wakeup for next VDR timer (via /proc): $datestr"
        echo "$datestr" > "$procalarm"
    fi
fi


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	10 May 2008 16:19:36 -0000	1.15
+++ .cvsignore	7 Sep 2008 15:18:36 -0000	1.16
@@ -2,3 +2,8 @@
 vdr-1.6.0.tar.bz2
 vdr-1.6.0-ttxtsubs-0.0.5.diff.gz
 vdr-1.6.0-liemikuutio-1.21.diff.gz
+MainMenuHooks-v1_0.patch
+timercmd-0.1_1.6.0.diff
+vdr-1.6.0-1.diff
+vdr-1.6.0-2.diff
+vdr-timer-info-0.5-1.5.15.diff


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	10 May 2008 16:19:36 -0000	1.15
+++ sources	7 Sep 2008 15:18:36 -0000	1.16
@@ -2,3 +2,8 @@
 76f4ebe6525a35e33313d27a3f8e80c0  vdr-1.6.0.tar.bz2
 2e994fcf18766fed279e2a8f2a70e717  vdr-1.6.0-ttxtsubs-0.0.5.diff.gz
 f254c57830efc0f19c06c11f302c1195  vdr-1.6.0-liemikuutio-1.21.diff.gz
+f48d3f58168f89240f08162e366ac2d3  MainMenuHooks-v1_0.patch
+e9b82b88c1fa21b6fa9734ca240f6192  timercmd-0.1_1.6.0.diff
+4a6be2d47afa3a275837f1703c4df77b  vdr-1.6.0-1.diff
+875b66a90d1c6f2e25aa1221b319136b  vdr-1.6.0-2.diff
+92ee6cdf60b795d9fbcf4fdcafe401b4  vdr-timer-info-0.5-1.5.15.diff


Index: vdr-README.package
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr-README.package,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vdr-README.package	17 Mar 2008 20:11:41 -0000	1.5
+++ vdr-README.package	7 Sep 2008 15:18:36 -0000	1.6
@@ -75,20 +75,13 @@
 to the vdr user so it can carry out these tasks.
 
 To use the ACPI alarm feature present in many recent systems, adding a
-script like this to /sbin/halt.local (remember to make it executable!)
-will cause the system to wake up at the time set by the above
-vdr-shutdown.sh, allowing one to shut down the system without having
-to manually start it for the next timed recording.  /sbin/halt.local,
-if it exists, is automatically executed by the system shutdown/reboot
-scripts at appropriate time.
-
-    #!/bin/bash
-    wakeupfile=/var/lib/vdr/acpi-wakeup
-    trap "rm -f $wakeupfile" EXIT
-    if [ -s $wakeupfile -a -w /proc/acpi/alarm ] ; then
-        echo -n "Setting ACPI wakeup for next VDR timer: " ; cat $wakeupfile
-        cat $wakeupfile > /proc/acpi/alarm
-    fi
+script like the supplied halt.local (see same directory as this file)
+to /sbin/halt.local (remember to make it executable!)  will cause the
+system to wake up at the time set by the above vdr-shutdown.sh,
+allowing one to shut down the system without having to manually start
+it for the next timed recording.  /sbin/halt.local, if it exists, is
+automatically executed by the system shutdown/reboot scripts at
+appropriate time.
 
 Organizing recordings
 ---------------------


Index: vdr-shutdown.sh
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr-shutdown.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vdr-shutdown.sh	7 Apr 2008 19:31:02 -0000	1.4
+++ vdr-shutdown.sh	7 Sep 2008 15:18:36 -0000	1.5
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # To enable this script, pass it to vdr with the -s option, eg.
 # "-s vdr-shutdown.sh" (sans quotes) in VDR_OPTIONS in /etc/sysconfig/vdr.
@@ -13,11 +13,11 @@
 
 mins=${WAKEUP_BEFORE_RECORDING:-10}
 
-file=/var/lib/vdr/acpi-wakeup
-rm -f $file
+wakeupfile=/var/lib/vdr/next-wakeup
+rm -f $wakeupfile
 
-if [ ${1:-0} -gt 0 -a -e /proc/acpi/alarm ] ; then
-    date -d "1970-01-01 UTC $1 sec -$mins min" +"%Y-%m-%d %H:%M:%S" > $file
+if [ ${1:-0} -gt 0 ] ; then
+    echo $(( $1 - $mins * 60 )) > $wakeupfile
 fi
 
 # In order to make this work, the vdr user needs to be allowed to run


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- vdr.spec	10 May 2008 16:19:36 -0000	1.27
+++ vdr.spec	7 Sep 2008 15:18:36 -0000	1.28
@@ -21,7 +21,7 @@
 
 Name:           vdr
 Version:        1.6.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -38,7 +38,6 @@
 # TODO
 Source8:        %{name}.consoleperms
 Source9:        %{name}-config.sh
-# TODO
 Source10:       %{name}-README.package
 Source11:       %{name}-skincurses.conf
 Source12:       %{name}-sky.conf
@@ -46,6 +45,7 @@
 Source14:       %{name}-shutdown.sh
 Source15:       %{name}-moveto.sh
 Source16:       %{name}-CHANGES.package.old
+Source17:       %{name}-halt.local.sh
 # TODO
 Patch0:         %{name}-channel+epg.patch
 # TODO
@@ -58,7 +58,7 @@
 Patch6:         %{name}-1.5.18-syncearly.patch
 Patch7:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-ttxtsubs-0.0.5.diff.gz
 Patch8:         %{name}-1.6.0-man-section.patch
-# Patch8: http://www.udo-richter.de/vdr/files/vdr-1.5.13-hlcutter-0.2.0.diff
+# 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
@@ -73,6 +73,7 @@
 Patch16:        %{name}-1.6.0-dxr3-subtitles.patch
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -149,18 +150,18 @@
 #patch0 -p1
 %patch1 -p1
 # TODO: does not apply
-#patch -i debian/patches/02_plugin_missing.dpatch
+#patch -F 0 -i debian/patches/02_plugin_missing.dpatch
 # sort_options would be nice, but it conflicts with channel+epg which is nicer
-#patch -i debian/patches/02_sort_options.dpatch
-patch -i debian/patches/06_recording_scan_speedup.dpatch
-patch -i debian/patches/07_blockify_define.dpatch
-patch -i debian/patches/10_livelock.dpatch
-patch -i debian/patches/11_atsc.dpatch
+#patch -F 0 -i debian/patches/02_sort_options.dpatch
+patch -F 0 -i debian/patches/06_recording_scan_speedup.dpatch
+patch -F 2 -i debian/patches/07_blockify_define.dpatch
+patch -F 0 -i debian/patches/10_livelock.dpatch
+patch -F 0 -i debian/patches/11_atsc.dpatch
 echo "DEFINES += -DHAVE_ATSC" >> Makefile
-patch -i debian/patches/19_debian_osdbase_maxitems.dpatch
-# TODO: does not apply, check upstream:
+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 -i debian/patches/opt-20_suspend.dpatch
+#patch -F 0 -i debian/patches/opt-20_suspend.dpatch
 %patch2 -p1
 %patch3 -p1
 sed \
@@ -169,25 +170,26 @@
   -e 's|__PLUGINDIR__|%{plugindir}|' \
   -e 's|__VARDIR__|%{vardir}|'       \
   -e 's|__VIDEODIR__|%{videodir}|'   \
-  %{PATCH4} | patch -p1
+  %{PATCH4} | patch -p1 -F 1
 %patch5 -p1
 %patch6 -p0
 %patch7 -p1
 %patch8 -p1
-%patch9 -p0
+%patch9 -p0 -F 1
 # TODO: does not apply
 #patch10 -p0
-%patch11 -p1
+%patch11 -p1 -F 2
 # timer-info patch needs to come before timercmd patch to avoid conflicts
 %patch17 -p1
-%patch12 -p1
+%patch12 -p1 -F 2
 %patch13 -p1
-%patch14 -p0
+%patch14 -p0 -F 2
 %patch15 -p0
 %patch16 -p0
 %patch18 -p1
+%patch19 -p1
 
-for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 ; do
+for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 README.timer-info ; do
   iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
 done
 
@@ -323,6 +325,10 @@
 sed -e 's|/var/lib/vdr/|%{vardir}/|' < %{SOURCE14} \
   > $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-shutdown.sh
 chmod 755 $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-shutdown.sh
+sed -e 's|/var/lib/vdr/|%{vardir}/|' \
+    -e 's|/usr/lib/vdr/bin/|%{plugindir}/bin/|' < %{SOURCE17} \
+  > $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-halt.local.sh
+chmod 755 $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-halt.local.sh
 sed -e 's|/srv/vdr|%{videodir}|' -e 's|/etc/vdr/|%{configdir}/|' \
   < %{SOURCE15} > $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-moveto.sh
 chmod 755 $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-moveto.sh
@@ -332,7 +338,7 @@
 install -dm 755 $RPM_BUILD_ROOT%{datadir}/logos
 install -dm 755 $RPM_BUILD_ROOT%{rundir}
 install -dm 755 $RPM_BUILD_ROOT%{vardir}
-touch $RPM_BUILD_ROOT%{vardir}/acpi-wakeup
+touch $RPM_BUILD_ROOT%{vardir}/next-wakeup
 
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 sed -e 's/VDR_GROUP/%{vdr_group}/' < %{SOURCE4} \
@@ -427,6 +433,7 @@
 %{_sbindir}/vdr
 %dir %{plugindir}/
 %dir %{plugindir}/bin/
+%{plugindir}/bin/%{name}-halt.local.sh
 %{plugindir}/bin/%{name}-moveto.sh
 %{plugindir}/bin/%{name}-shutdown.sh
 %{datadir}/
@@ -437,7 +444,7 @@
 %dir %{videodir}/
 %ghost %{videodir}/.update
 %dir %{audiodir}/
-%ghost %{vardir}/acpi-wakeup
+%ghost %{vardir}/next-wakeup
 %ghost %{vardir}/themes/*.theme
 %ghost %{cachedir}/epg.data
 %defattr(-,%{vdr_user},root,-)
@@ -489,6 +496,15 @@
 %endif # plugins
 
 %changelog
+* Sun Sep  7 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-4
+- Apply upstream 1.6.0-2 maintenance patch.
+- Update shutdown/wakeup functionality for F-9+ ACPI wakeup.
+- Install halt.local script (vdr-halt.local.sh) instead of embedding it
+  in README-package.  It still needs to be inserted to (or installed/symlinked
+  as) /sbin/halt.local.
+- Convert remaining docs to UTF-8.
+- Set expected fuzz factor when applying patches.
+
 * Sat May 10 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-3
 - Update liemikuutio patch to 1.21.
 - Change timercmd patch to the one shipped with epgsearch 0.9.24.


--- MainMenuHooks-v1_0.patch DELETED ---


--- timercmd-0.1_1.6.0.diff DELETED ---


--- vdr-1.6.0-1.diff DELETED ---


--- vdr-timer-info-0.5-1.5.15.diff DELETED ---



From spot at fedoraproject.org  Sun Sep  7 15:20:28 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun,  7 Sep 2008 15:20:28 +0000 (UTC)
Subject: rpms/t1utils/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 t1utils.spec, 1.15, 1.16
Message-ID: <20080907152028.C3FDC70126@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/t1utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28249

Modified Files:
	.cvsignore sources t1utils.spec 
Log Message:
fix license tag, update to 1.33


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/t1utils/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:24:18 -0000	1.2
+++ .cvsignore	7 Sep 2008 15:19:58 -0000	1.3
@@ -1 +1 @@
-t1utils-1.32.tar.gz
+t1utils-1.33.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/t1utils/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:24:18 -0000	1.2
+++ sources	7 Sep 2008 15:19:58 -0000	1.3
@@ -1 +1 @@
-733892543a5b852b7e5d87bc58117f53  t1utils-1.32.tar.gz
+a8d9dad4eab239357dd045275770eb8f  t1utils-1.33.tar.gz


Index: t1utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/t1utils/devel/t1utils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- t1utils.spec	19 Feb 2008 05:49:39 -0000	1.15
+++ t1utils.spec	7 Sep 2008 15:19:58 -0000	1.16
@@ -1,13 +1,14 @@
 Name:		t1utils
-Version:	1.32
-Release:        10%{?dist}
+Version:	1.33
+Release:	1%{?dist}
 
 Summary:	Collection of Type 1 and 2 font manipulation utilities
 
 Group:		Applications/Publishing
-License:	Click, GPLv2+, MIT
+# The Click license is an MIT variant.
+License:	MIT
 URL:		http://www.lcdf.org/~eddietwo/type/
-Source0:	http://www.lcdf.org/~eddietwo/type/t1utils-1.32.tar.gz
+Source0:	http://www.lcdf.org/~eddietwo/type/t1utils-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -19,7 +20,8 @@
 
 %prep
 %setup -q
-
+iconv -f iso-8859-1 -t utf-8 -o NEWS{.utf8,}
+mv NEWS{.utf8,}
 
 %build
 %configure
@@ -28,7 +30,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install
 
 
 %clean
@@ -43,6 +45,10 @@
 
 
 %changelog
+* Sun Sep  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.33-1
+- fix license tag
+- update to 1.33
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.32-10
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Sun Sep  7 15:24:02 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun,  7 Sep 2008 15:24:02 +0000 (UTC)
Subject: rpms/taarich/devel taarich.spec,1.7,1.8
Message-ID: <20080907152402.F36BC70126@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/taarich/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29498

Modified Files:
	taarich.spec 
Log Message:
fix license tag


Index: taarich.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taarich/devel/taarich.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- taarich.spec	19 Feb 2008 00:18:08 -0000	1.7
+++ taarich.spec	7 Sep 2008 15:23:32 -0000	1.8
@@ -2,10 +2,10 @@
 Summary(he): ???????????? ???????????? ???????????? ??????????, ?????????? ??????????, ???????????? ??????.
 Name: taarich
 Version: 1.20051120
-Release: 9%{?dist}
+Release: 10%{?dist}
 URL: ftp://ftp.math.technion.ac.il/calendar/gauss/
 Source0: gauss-%{version}.tar.gz
-License: MIT-style
+License: BSD
 Group: Applications/Text
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,6 +45,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.20051120-10
+- fix license tag
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.20051120-9
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Sun Sep  7 15:29:44 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun,  7 Sep 2008 15:29:44 +0000 (UTC)
Subject: rpms/tango-icon-theme/devel tango-icon-theme.spec,1.5,1.6
Message-ID: <20080907152944.C208170126@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tango-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31260

Modified Files:
	tango-icon-theme.spec 
Log Message:
fix license tag


Index: tango-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tango-icon-theme/devel/tango-icon-theme.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tango-icon-theme.spec	9 Sep 2007 18:00:31 -0000	1.5
+++ tango-icon-theme.spec	7 Sep 2008 15:29:14 -0000	1.6
@@ -1,15 +1,15 @@
 Name:		tango-icon-theme
 Version:	0.8.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Icons from Tango Project
 Summary(pl):	Ikony Projektu Tango
 Summary(es):	Iconos del Proyecto Tango
 
-License:	Creative Commons Attribution Share-Alike
+License:	CC-BY-SA
 Group:		User Interface/Desktops
-URL:		http://tango-project.org/
+URL:		http://tango.freedesktop.org/Tango_Desktop_Project
 
-Source0:	http://tango-project.org/releases/%{name}-%{version}.tar.gz
+Source0:	http://tango.freedesktop.org/releases/%{name}-%{version}.tar.gz
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.8.1-2
+- fix license tag
+
 * Sun Sep 09 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.1-1
 - Update to new upstream release (0.8.1)
 
@@ -90,4 +93,4 @@
 - Changed the license name
 
 * Thu Jul 27 2006 Piotr Dr??g <raven at pmail dot pl> - 0.7.2-1
-- Initial RPM release
\ No newline at end of file
+- Initial RPM release



From spot at fedoraproject.org  Sun Sep  7 15:31:32 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun,  7 Sep 2008 15:31:32 +0000 (UTC)
Subject: rpms/tango-icon-theme-extras/devel tango-icon-theme-extras.spec, 1.1,
	1.2
Message-ID: <20080907153132.AB80A70126@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tango-icon-theme-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31857

Modified Files:
	tango-icon-theme-extras.spec 
Log Message:
fix license tag


Index: tango-icon-theme-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tango-icon-theme-extras/devel/tango-icon-theme-extras.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tango-icon-theme-extras.spec	30 Jan 2007 02:14:58 -0000	1.1
+++ tango-icon-theme-extras.spec	7 Sep 2008 15:31:02 -0000	1.2
@@ -1,13 +1,13 @@
 Name:		tango-icon-theme-extras
 Version:	0.1.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Extra Icons from the Tango Project
 
-License:	Creative Commons Attribution Share-Alike
+License:	CC-BY-SA
 Group:		User Interface/Desktops
-URL:		http://tango-project.org/
+URL:		http://tango.freedesktop.org/Tango_Desktop_Project
 
-Source0:	http://tango-project.org/releases/%{name}-%{version}.tar.gz
+Source0:	http://tango.freedesktop.org/releases/%{name}-%{version}.tar.gz
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.1.0-2
+- fix license tag
+
 * Sat Jan 13 2007 Peter Gordon <peter at thecodergeek.com> - 0.1.0-1
 - Initial packaging for Fedora Extras, based heavily on the tango-icon-theme
-  spec already in Extras (created by Piotr Dr??g).
\ No newline at end of file
+  spec already in Extras (created by Piotr Dr??g).



From allisson at fedoraproject.org  Sun Sep  7 15:37:03 2008
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Sun,  7 Sep 2008 15:37:03 +0000 (UTC)
Subject: rpms/clutter-cairo/devel import.log, NONE, 1.1 .cvsignore, 1.2,
	1.3 clutter-cairo.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080907153703.1446470126@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/clutter-cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1039/devel

Modified Files:
	.cvsignore clutter-cairo.spec sources 
Added Files:
	import.log 
Log Message:

Update to 0.8.2



--- NEW FILE import.log ---
clutter-cairo-0_8_2-1_fc9:HEAD:clutter-cairo-0.8.2-1.fc9.src.rpm:1220801788


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-cairo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 May 2008 03:07:51 -0000	1.2
+++ .cvsignore	7 Sep 2008 15:36:32 -0000	1.3
@@ -1 +1 @@
-clutter-cairo-0.6.2.tar.gz
+clutter-cairo-0.8.2.tar.gz


Index: clutter-cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-cairo/devel/clutter-cairo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clutter-cairo.spec	26 May 2008 03:07:51 -0000	1.1
+++ clutter-cairo.spec	7 Sep 2008 15:36:32 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           clutter-cairo
-Version:        0.6.2
+Version:        0.8.2
 Release:        1%{?dist}
 Summary:        A basic Cairo clutter widget
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://www.clutter-project.org
-Source0:        http://www.clutter-project.org/sources/%{name}/0.6/%{name}-%{version}.tar.gz
+Source0:        http://www.clutter-project.org/sources/%{name}/0.8/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cairo-devel clutter-devel 
@@ -45,18 +45,21 @@
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README
 %exclude %{_libdir}/*.la
-%{_libdir}/libclutter-cairo-0.6.so.0
-%{_libdir}/libclutter-cairo-0.6.so.0.601.1
+%{_libdir}/libclutter-cairo-0.8.so.0
+%{_libdir}/libclutter-cairo-0.8.so.0.*
 
 
 %files devel
 %defattr(-,root,root,-)
-%doc examples/clock.c examples/flowers.c
-%{_libdir}/pkgconfig/clutter-cairo-0.6.pc
-%{_libdir}/libclutter-cairo-0.6.so
-%{_includedir}/clutter-0.6/clutter-cairo
+%doc examples/clock.c examples/flowers.c examples/bubbles.c
+%{_libdir}/pkgconfig/clutter-cairo-0.8.pc
+%{_libdir}/libclutter-cairo-0.8.so
+%{_includedir}/clutter-0.8/clutter-cairo
 
 %changelog
 
+* Sat Sep  6 2008 Allisson Azevedo <allisson at gmail.com> 0.8.2-1
+- Update to 0.8.2
+
 * Sat May 24 2008 Allisson Azevedo <allisson at gmail.com> 0.6.2-1
 - Initial RPM release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-cairo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 May 2008 03:07:51 -0000	1.2
+++ sources	7 Sep 2008 15:36:32 -0000	1.3
@@ -1 +1 @@
-15fa0ba0adfbee223ec32667adb1f3af  clutter-cairo-0.6.2.tar.gz
+c3bfae082d007be37d9725e5e7b4a30b  clutter-cairo-0.8.2.tar.gz



From pkgdb at fedoraproject.org  Sun Sep  7 15:46:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 15:46:20 +0000
Subject: [pkgdb] amarok had acl change status
Message-ID: <20080907154620.418DB20876E@bastion.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on amarok (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From pkgdb at fedoraproject.org  Sun Sep  7 15:46:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 15:46:44 +0000
Subject: [pkgdb] amarok had acl change status
Message-ID: <20080907154644.2215520876E@bastion.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on amarok (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From belegdol at fedoraproject.org  Sun Sep  7 15:53:22 2008
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Sun,  7 Sep 2008 15:53:22 +0000 (UTC)
Subject: rpms/gnome-chemistry-utils/devel
	gnome-chemistry-utils-0.9.90-readint32.patch, NONE,
	1.1 gnome-chemistry-utils.spec, 1.21, 1.22
Message-ID: <20080907155322.3800870126@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6155

Modified Files:
	gnome-chemistry-utils.spec 
Added Files:
	gnome-chemistry-utils-0.9.90-readint32.patch 
Log Message:
* Sun Sep  7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.90-2
- Patched the ppc build failure, thanks to Tom Callaway


gnome-chemistry-utils-0.9.90-readint32.patch:

--- NEW FILE gnome-chemistry-utils-0.9.90-readint32.patch ---
--- plugins/loaders/cdx/cdx.cc.readint32	2008-09-07 17:46:04.000000000 +0200
+++ plugins/loaders/cdx/cdx.cc	2008-09-07 17:46:34.000000000 +0200
@@ -58,7 +58,7 @@
 #define READINT16(input,i) \
 	bool res = gsf_input_read (input, 2, (guint8*) buffer), \
 	(guint16) i = buffer[0] + buffer[1] << 8, res
-#define READINT32(input,buf,i) \
+#define READINT32(input,i) \
 	bool res = gsf_input_read (input, 4, (guint8*) buffer), \
 	(guint32) i = buffer[0] + buffer[1] << 8 + buffer[2] << 16 + buffer[3] << 24, res
 #endif


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/gnome-chemistry-utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnome-chemistry-utils.spec	7 Sep 2008 13:44:09 -0000	1.21
+++ gnome-chemistry-utils.spec	7 Sep 2008 15:52:51 -0000	1.22
@@ -1,12 +1,13 @@
 Name:           gnome-chemistry-utils
 Version:        0.9.90
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A set of chemical utilities
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://www.nongnu.org/gchemutils/
 Source0:        http://download.savannah.nongnu.org/releases/gchemutils/%{name}-%{version}.tar.bz2
+Patch0:         gnome-chemistry-utils-0.9.90-readint32.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bodr
@@ -67,6 +68,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .readint32
 
 
 %build
@@ -205,6 +207,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.90-2
+- Patched the ppc build failure, thanks to Tom Callaway
+
 * Sun Sep  7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.90-1
 - Updated to 0.9.90
 - Replaced the firefox/xulrunner conditional with gecko-devel



From scop at fedoraproject.org  Sun Sep  7 16:22:40 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun,  7 Sep 2008 16:22:40 +0000 (UTC)
Subject: rpms/vdr/devel vdr.spec,1.28,1.29
Message-ID: <20080907162240.0EBC770126@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11909

Modified Files:
	vdr.spec 
Log Message:
* Sun Sep  7 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-5
- Work around Fedora buildsys not coping with "%patch -F" (infrastructure
  ticket #817).



Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- vdr.spec	7 Sep 2008 15:18:36 -0000	1.28
+++ vdr.spec	7 Sep 2008 16:22:09 -0000	1.29
@@ -21,7 +21,7 @@
 
 Name:           vdr
 Version:        1.6.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -175,15 +175,15 @@
 %patch6 -p0
 %patch7 -p1
 %patch8 -p1
-%patch9 -p0 -F 1
+patch -p0 -F 1 -i %{PATCH9}
 # TODO: does not apply
 #patch10 -p0
-%patch11 -p1 -F 2
+patch -p1 -F 2 -i %{PATCH11}
 # timer-info patch needs to come before timercmd patch to avoid conflicts
 %patch17 -p1
-%patch12 -p1 -F 2
+patch -p1 -F 2 -i %{PATCH12}
 %patch13 -p1
-%patch14 -p0 -F 2
+patch -p0 -F 2 -i %{PATCH14}
 %patch15 -p0
 %patch16 -p0
 %patch18 -p1
@@ -496,6 +496,10 @@
 %endif # plugins
 
 %changelog
+* Sun Sep  7 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-5
+- Work around Fedora buildsys not coping with "%%patch -F" (infrastructure
+  ticket #817).
+
 * Sun Sep  7 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-4
 - Apply upstream 1.6.0-2 maintenance patch.
 - Update shutdown/wakeup functionality for F-9+ ACPI wakeup.



From mschwendt at fedoraproject.org  Sun Sep  7 17:05:46 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun,  7 Sep 2008 17:05:46 +0000 (UTC)
Subject: extras-buildsys/www job.psp,1.12.6.1,1.12.6.2
Message-ID: <20080907170546.A5E6A70126@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/www
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17290/www

Modified Files:
      Tag: Plague-0_4_5
	job.psp 
Log Message:
some compatibility changes for MySQL 5


Index: job.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v
retrieving revision 1.12.6.1
retrieving revision 1.12.6.2
diff -u -r1.12.6.1 -r1.12.6.2
--- job.psp	31 Jan 2008 14:30:14 -0000	1.12.6.1
+++ job.psp	7 Sep 2008 17:05:46 -0000	1.12.6.2
@@ -36,8 +36,8 @@
     <p><h2>The server could not process the request.</h2><br>Error was:&nbsp;&nbsp;<%=msg%></p>
 <%
     else:
-        if job.has_key('version') and job.has_key('release'):
-            title = "%s-%s-%s" % (job['package'], job['version'], job['release'])
+        if job.has_key('rpm_version') and job.has_key('rpm_release'):
+            title = "%s-%s-%s" % (job['package'], job['rpm_version'], job['rpm_release'])
         else:
             title = job['package']
         # endif



From mschwendt at fedoraproject.org  Sun Sep  7 17:06:16 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun,  7 Sep 2008 17:06:16 +0000 (UTC)
Subject: extras-buildsys ChangeLog,1.126.2.44.2.1.2.21,1.126.2.44.2.1.2.22
Message-ID: <20080907170616.1C55370126@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17290

Modified Files:
      Tag: Plague-0_4_5
	ChangeLog 
Log Message:
some compatibility changes for MySQL 5


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.44.2.1.2.21
retrieving revision 1.126.2.44.2.1.2.22
diff -u -r1.126.2.44.2.1.2.21 -r1.126.2.44.2.1.2.22
--- ChangeLog	7 Sep 2008 10:36:41 -0000	1.126.2.44.2.1.2.21
+++ ChangeLog	7 Sep 2008 17:05:45 -0000	1.126.2.44.2.1.2.22
@@ -1,5 +1,14 @@
 2008-09-07  Michael Schwendt <mschwendt at fedoraproject.org>
 
+	* www/job.psp, server/DBManager.py, server/BuildMaster.py,
+	* server/PackageJob.py, server/UserInterface.py
+	  - Prefix jobs table columns "epoch", "version", "release"
+	    with "rpm_" because RELEASE is a new reserved keyword in
+	    MySQL 5 and the quote character differs from Postgresql.
+	
+	    At startup, DBManager alters the table automatically
+	    for compatibility with existing databases.
+	
 	* utils/user-manager.py
 	  - Fix mod_user for SQLite2/SQLite3 API.
 



From mschwendt at fedoraproject.org  Sun Sep  7 17:06:16 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun,  7 Sep 2008 17:06:16 +0000 (UTC)
Subject: extras-buildsys/server BuildMaster.py, 1.35.2.1.4.2,
	1.35.2.1.4.3 DBManager.py, 1.1.2.2.4.2,
	1.1.2.2.4.3 PackageJob.py, 1.31.2.10.4.6,
	1.31.2.10.4.7 UserInterface.py, 1.58.2.2.4.4, 1.58.2.2.4.5
Message-ID: <20080907170616.72ADA70126@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/server
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17290/server

Modified Files:
      Tag: Plague-0_4_5
	BuildMaster.py DBManager.py PackageJob.py UserInterface.py 
Log Message:
some compatibility changes for MySQL 5


Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.35.2.1.4.2
retrieving revision 1.35.2.1.4.3
diff -u -r1.35.2.1.4.2 -r1.35.2.1.4.3
--- BuildMaster.py	4 Sep 2008 02:14:20 -0000	1.35.2.1.4.2
+++ BuildMaster.py	7 Sep 2008 17:05:46 -0000	1.35.2.1.4.3
@@ -237,9 +237,9 @@
 
     def _write_job_status_to_db(self, uid, attrdict):
         sql = "status='%s'" % attrdict['status']
-        if attrdict.has_key('epoch') and attrdict.has_key('version') and attrdict.has_key('release'):
-            sql = sql + ", epoch='%s', version='%s', release='%s'" % (attrdict['epoch'],
-                    attrdict['version'], attrdict['release'])
+        if attrdict.has_key('rpm_epoch') and attrdict.has_key('rpm_version') and attrdict.has_key('rpm_release'):
+            sql = sql + ", rpm_epoch='%s', rpm_version='%s', rpm_release='%s'" % (attrdict['rpm_epoch'],
+                    attrdict['rpm_version'], attrdict['rpm_release'])
         if attrdict.has_key('result_msg'):
             import urllib
             sql = sql + ", result_msg='%s'" % (urllib.quote(attrdict['result_msg']))


Index: DBManager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/DBManager.py,v
retrieving revision 1.1.2.2.4.2
retrieving revision 1.1.2.2.4.3
diff -u -r1.1.2.2.4.2 -r1.1.2.2.4.3
--- DBManager.py	4 Sep 2008 02:14:20 -0000	1.1.2.2.4.2
+++ DBManager.py	7 Sep 2008 17:05:46 -0000	1.1.2.2.4.3
@@ -293,11 +293,11 @@
     def __init__(self, cfg):
         self._cfg = cfg
         try:
-            engine = self._cfg.get_str("Database", "engine")
-            self._db_engine_class = db_engines[engine]
+            self.engine = self._cfg.get_str("Database", "engine")
+            self._db_engine_class = db_engines[self.engine]
         except KeyError:
             print "Error: unrecognized database engine '%s'.  Must be " \
-                    "one of: %s" % (engine, db_engines.keys())
+                    "one of: %s" % (self.engine, db_engines.keys())
             os._exit(1)
 
         if not self._db_engine_class:
@@ -305,7 +305,7 @@
                     "Perhaps you need the python module for it?" % engine
             os._exit(1)
 
-        print "Using database engine %s." % engine
+        print "Using database engine %s." % self.engine
 
         # Make sure our database structure is what we want
         dbcx = self.dbcx()
@@ -347,9 +347,9 @@
                     'endtime BIGINT, '              \
                     'status VARCHAR(20), '          \
                     'result VARCHAR(15), '          \
-                    'epoch VARCHAR(4), '            \
-                    'version VARCHAR(25), '         \
-                    'release VARCHAR(25), '         \
+                    'rpm_epoch VARCHAR(4), '        \
+                    'rpm_version VARCHAR(25), '     \
+                    'rpm_release VARCHAR(25), '     \
                     'archlist VARCHAR(75), '        \
                     'result_msg TEXT'               \
                     ')' % uid_type)
@@ -358,6 +358,22 @@
                 print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
                 os._exit(1)
 
+        # Rename columns in jobs table, because `RELEASE` is a new
+        # reserved keyword in MySQL 5, and the quote character is
+        # different for Postgresql.
+        for i in range(len(curs.description)):
+            if curs.description[i][0].upper() == 'RELEASE':
+                if self.engine == 'mysql':
+                    curs.execute('ALTER TABLE jobs CHANGE `release` rpm_release VARCHAR(25);')
+                    curs.execute('ALTER TABLE jobs CHANGE `version` rpm_version VARCHAR(25);')
+                    curs.execute('ALTER TABLE jobs CHANGE `epoch` rpm_epoch VARCHAR(4);')
+                else:
+                    curs.execute('ALTER TABLE jobs CHANGE release rpm_release VARCHAR(25);')
+                    curs.execute('ALTER TABLE jobs CHANGE version rpm_version VARCHAR(25);')
+                    curs.execute('ALTER TABLE jobs CHANGE epoch rpm_epoch VARCHAR(4);')
+                dbcx.commit()
+                break
+
         # Create the archjobs table
         try:
             curs.execute('SELECT * FROM archjobs LIMIT 4')


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.31.2.10.4.6
retrieving revision 1.31.2.10.4.7
diff -u -r1.31.2.10.4.6 -r1.31.2.10.4.7
--- PackageJob.py	5 Sep 2008 09:32:43 -0000	1.31.2.10.4.6
+++ PackageJob.py	7 Sep 2008 17:05:46 -0000	1.31.2.10.4.7
@@ -172,9 +172,9 @@
             attrdict['status'] = copy.copy(stage)
             attrdict['result'] = copy.copy(self.result)
             if self.name and self.epoch and self.ver and self.release:
-                attrdict['epoch'] = self.epoch
-                attrdict['version'] = self.ver
-                attrdict['release'] = self.release
+                attrdict['rpm_epoch'] = self.epoch
+                attrdict['rpm_version'] = self.ver
+                attrdict['rpm_release'] = self.release
             if result_msg:
                 attrdict['result_msg'] = result_msg
 


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.58.2.2.4.4
retrieving revision 1.58.2.2.4.5
diff -u -r1.58.2.2.4.4 -r1.58.2.2.4.5
--- UserInterface.py	4 Sep 2008 21:02:28 -0000	1.58.2.2.4.4
+++ UserInterface.py	7 Sep 2008 17:05:46 -0000	1.58.2.2.4.5
@@ -376,7 +376,7 @@
             return (-1, "Error: Invalid job UID.", {})
 
         sql = 'SELECT uid, username, package, source, target_distro, target_target, ' \
-                'target_repo, starttime, endtime, status, epoch, version, release,  ' \
+                'target_repo, starttime, endtime, status, rpm_epoch, rpm_version, rpm_release,  ' \
                 'archlist, result_msg FROM jobs WHERE uid=%d' % uid
 
         # Run the query for the job
@@ -401,15 +401,15 @@
         jobrec['starttime'] = job['starttime']
         jobrec['endtime'] = job['endtime']
         jobrec['status'] = job['status']
-        if job['epoch'] and job['version'] and job['release']:
-            jobrec['epoch'] = job['epoch']
-            jobrec['version'] = job['version']
-            jobrec['release'] = job['release']
+        if job['rpm_epoch'] and job['rpm_version'] and job['rpm_release']:
+            jobrec['rpm_epoch'] = job['rpm_epoch']
+            jobrec['rpm_version'] = job['rpm_version']
+            jobrec['rpm_release'] = job['rpm_release']
             base_url = self._cfg.get_str("UI", "log_url")
             target_str = "%s-%s-%s" % (jobrec['target_distro'], jobrec['target_target'], jobrec['target_repo'])
             log_url = PackageJob.make_job_log_url(base_url, target_str,
-                        str(uid), jobrec['package'], jobrec['version'],
-                        jobrec['release'])
+                        str(uid), jobrec['package'], jobrec['rpm_version'],
+                        jobrec['rpm_release'])
             if log_url and len(log_url):
                 jobrec['log_url'] = log_url
         if job['result_msg']:



From jcollie at fedoraproject.org  Sun Sep  7 17:24:18 2008
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sun,  7 Sep 2008 17:24:18 +0000 (UTC)
Subject: rpms/callweaver/F-8 callweaver.spec,1.6,1.7
Message-ID: <20080907172418.1837D70126@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/callweaver/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18561

Modified Files:
	callweaver.spec 
Log Message:
* Sun Sep  7 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2-0.4.rc4.20070822
- Bump release and rebuild to pick up new libpri.



Index: callweaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/callweaver/F-8/callweaver.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- callweaver.spec	28 Aug 2007 17:07:50 -0000	1.6
+++ callweaver.spec	7 Sep 2008 17:23:47 -0000	1.7
@@ -7,7 +7,7 @@
 
 Name:		callweaver
 Version:	1.2
-Release:	0.3.rc4.20070822%{?dist}
+Release:	0.4.rc4.20070822%{?dist}
 Summary:	The Truly Open Source PBX
 
 Group:		Applications/Internet
@@ -25,7 +25,7 @@
 BuildRequires:	unixODBC-devel openssl-devel speex-devel alsa-lib-devel
 BuildRequires:	isdn4k-utils-devel libcap-devel sqlite-devel mysql-devel
 BuildRequires:	postgresql-devel readline-devel %{?with_misdn:mISDN-devel}
-BuildRequires:	popt %{?with_zaptel:zaptel-devel libpri-devel}
+BuildRequires:	popt %{?with_zaptel:zaptel-devel libpri-devel >= 1.4.7}
 
 Requires:	/sbin/chkconfig
 Obsoletes:	openpbx < 1.2-5
@@ -375,6 +375,9 @@
 %{_sbindir}/eogi*
 
 %changelog
+* Sun Sep  7 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2-0.4.rc4.20070822
+- Bump release and rebuild to pick up new libpri.
+
 * Thu Aug 23 2007 David Woodhouse <dwmw2 at infradead.org> 1.2-0.3.rc4.20070822
 - Handle open() being a macro
 



From allisson at fedoraproject.org  Sun Sep  7 17:54:39 2008
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Sun,  7 Sep 2008 17:54:39 +0000 (UTC)
Subject: rpms/clutter-gtk/devel import.log, NONE, 1.1 .cvsignore, 1.5,
	1.6 clutter-gtk.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20080907175439.760C870126@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/clutter-gtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20499/devel

Modified Files:
	.cvsignore clutter-gtk.spec sources 
Added Files:
	import.log 
Log Message:

Update to 0.8.1



--- NEW FILE import.log ---
clutter-gtk-0_8_1-1_fc9:HEAD:clutter-gtk-0.8.1-1.fc9.src.rpm:1220810052


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gtk/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Jun 2008 17:30:27 -0000	1.5
+++ .cvsignore	7 Sep 2008 17:54:09 -0000	1.6
@@ -1 +1 @@
-clutter-gtk-0.6.1.tar.gz
+clutter-gtk-0.8.1.tar.gz


Index: clutter-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gtk/devel/clutter-gtk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- clutter-gtk.spec	27 Jun 2008 17:30:27 -0000	1.5
+++ clutter-gtk.spec	7 Sep 2008 17:54:09 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           clutter-gtk
-Version:        0.6.1
+Version:        0.8.1
 Release:        1%{?dist}
 Summary:        A basic GTK clutter widget
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://www.clutter-project.org
-Source0:        http://www.clutter-project.org/sources/%{name}/0.6/%{name}-%{version}.tar.gz
+Source0:        http://www.clutter-project.org/sources/%{name}/0.8/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel clutter-devel       
@@ -58,11 +58,15 @@
 %files devel
 %defattr(-,root,root,-)
 %doc
-%{_libdir}/pkgconfig/clutter-gtk-0.6.pc
+%{_libdir}/pkgconfig/clutter-gtk-0.8.pc
 %{_libdir}/*.so
-%{_includedir}/clutter-0.6/clutter-gtk
+%{_includedir}/clutter-0.8/clutter-gtk
 
 %changelog
+
+* Sat Sep  6 2008 Allisson Azevedo <allisson at gmail.com> 0.8.1-1
+- Update to 0.8.1
+
 * Thu Jun 26 2008 Colin Walters <walters at redhat.com> 0.6.1-1
 - Update to 0.6.1 so we can make tweet go
 - Loosen files globs so we don't have to touch them every version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gtk/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Jun 2008 17:30:27 -0000	1.5
+++ sources	7 Sep 2008 17:54:09 -0000	1.6
@@ -1 +1 @@
-580a920643571aca88f7bca113ad1ef0  clutter-gtk-0.6.1.tar.gz
+1fea21affb3a74014fc0b4270b67ed2d  clutter-gtk-0.8.1.tar.gz



From cebbert at fedoraproject.org  Sun Sep  7 18:01:36 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun,  7 Sep 2008 18:01:36 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc5-git9.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.916, 1.917 kernel.spec, 1.935, 1.936 linux-2.6-utrace.patch,
	1.96, 1.97 sources, 1.879, 1.880 upstream, 1.792,
	1.793 linux-2.6-x86-io-delay-add-hp-f700-quirk.patch, 1.1,
	NONE patch-2.6.27-rc5-git7.bz2.sign, 1.1, NONE
Message-ID: <20080907180136.40E5B70126@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21224

Modified Files:
	.cvsignore kernel.spec linux-2.6-utrace.patch sources upstream 
Added Files:
	patch-2.6.27-rc5-git9.bz2.sign 
Removed Files:
	linux-2.6-x86-io-delay-add-hp-f700-quirk.patch 
	patch-2.6.27-rc5-git7.bz2.sign 
Log Message:
2.6.27-rc5-git9


--- NEW FILE patch-2.6.27-rc5-git9.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIw8L5yGugalF9Dw4RAr02AJ49eBnrZxFDN99e8aqW1YGBuIwP6ACghzh5
aqdfExmRULNB6TUwB6kV4NE=
=lcBB
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.916
retrieving revision 1.917
diff -u -r1.916 -r1.917
--- .cvsignore	5 Sep 2008 09:45:16 -0000	1.916
+++ .cvsignore	7 Sep 2008 18:01:05 -0000	1.917
@@ -5,4 +5,4 @@
 kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc5.bz2
-patch-2.6.27-rc5-git7.bz2
+patch-2.6.27-rc5-git9.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.935
retrieving revision 1.936
diff -u -r1.935 -r1.936
--- kernel.spec	6 Sep 2008 21:39:17 -0000	1.935
+++ kernel.spec	7 Sep 2008 18:01:05 -0000	1.936
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 5
 # The git snapshot level
-%define gitrev 7
+%define gitrev 9
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -555,7 +555,6 @@
 Patch41: linux-2.6-sysrq-c.patch
 Patch42: linux-2.6-x86-tune-generic.patch
 Patch75: linux-2.6-x86-debug-boot.patch
-Patch80: linux-2.6-x86-io-delay-add-hp-f700-quirk.patch
 
 Patch140: linux-2.6-ps3-ehci-iso.patch
 Patch141: linux-2.6-ps3-storage-alias.patch
@@ -1007,8 +1006,6 @@
 # x86(-64)
 # Compile 686 kernels tuned for Pentium4.
 ApplyPatch linux-2.6-x86-tune-generic.patch
-# add io delay quirk for presario f700
-ApplyPatch linux-2.6-x86-io-delay-add-hp-f700-quirk.patch
 
 #
 # PowerPC
@@ -1749,6 +1746,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sun Sep 07 2008 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.27-rc5-git9
+
 * Sun Sep 07 2008 Dave Airlie <airlied at redhat.com>
 - disable radeon verbose debugging. doh.
 

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- linux-2.6-utrace.patch	5 Sep 2008 09:45:16 -0000	1.96
+++ linux-2.6-utrace.patch	7 Sep 2008 18:01:05 -0000	1.97
@@ -619,19 +619,6 @@
  	task_lock(p);
  	if (p->files)
  		fdt = files_fdtable(p->files);
-diff --git a/include/asm-generic/syscall.h b/include/asm-generic/syscall.h
-index abcf34c..ea8087b 100644  
---- a/include/asm-generic/syscall.h
-+++ b/include/asm-generic/syscall.h
-@@ -126,7 +126,7 @@ void syscall_get_arguments(struct task_s
-  * @args:	array of argument values to store
-  *
-  * Changes @n arguments to the system call starting with the @i'th argument.
-- * @n'th argument to @val.  Argument @i gets value @args[0], and so on.
-+ * Argument @i gets value @args[0], and so on.
-  * An arch inline version is probably optimal when @i and @n are constants.
-  *
-  * It's only valid to call this when @task is stopped for tracing on
 diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
 index ea7416c..06eaace 100644  
 --- a/include/linux/ptrace.h
@@ -782,15 +769,6 @@
  	ptrace_init_task(child, (clone_flags & CLONE_PTRACE) || trace);
  }
  
-@@ -272,7 +291,7 @@ static inline void tracehook_finish_clon
-  * tracehook_report_clone_complete().  This must prevent the child from
-  * self-reaping if tracehook_report_clone_complete() uses the @child
-  * pointer; otherwise it might have died and been released by the time
-- * tracehook_report_report_clone_complete() is called.
-+ * tracehook_report_clone_complete() is called.
-  *
-  * Called with no locks held, but the child cannot run until this returns.
-  */
 @@ -280,6 +299,8 @@ static inline void tracehook_report_clon
  					  unsigned long clone_flags,
  					  pid_t pid, struct task_struct *child)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.879
retrieving revision 1.880
diff -u -r1.879 -r1.880
--- sources	5 Sep 2008 09:45:16 -0000	1.879
+++ sources	7 Sep 2008 18:01:05 -0000	1.880
@@ -1,3 +1,3 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 d91adda8bcf04852048b8eab06eeae3d  patch-2.6.27-rc5.bz2
-064b47baf6ae8ecb15c96f2b38b62f4b  patch-2.6.27-rc5-git7.bz2
+2f39bf914e672751f59d0cb062be1b66  patch-2.6.27-rc5-git9.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.792
retrieving revision 1.793
diff -u -r1.792 -r1.793
--- upstream	5 Sep 2008 09:45:16 -0000	1.792
+++ upstream	7 Sep 2008 18:01:05 -0000	1.793
@@ -1,3 +1,3 @@
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc5.bz2
-patch-2.6.27-rc5-git7.bz2
+patch-2.6.27-rc5-git9.bz2


--- linux-2.6-x86-io-delay-add-hp-f700-quirk.patch DELETED ---


--- patch-2.6.27-rc5-git7.bz2.sign DELETED ---



From allisson at fedoraproject.org  Sun Sep  7 18:13:19 2008
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Sun,  7 Sep 2008 18:13:19 +0000 (UTC)
Subject: rpms/clutter-gst/devel import.log, NONE, 1.1 .cvsignore, 1.4,
	1.5 clutter-gst.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20080907181319.9344E70126@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/clutter-gst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22101/devel

Modified Files:
	.cvsignore clutter-gst.spec sources 
Added Files:
	import.log 
Log Message:

Update to 0.8.0



--- NEW FILE import.log ---
clutter-gst-0_8_0-1_fc9:HEAD:clutter-gst-0.8.0-1.fc9.src.rpm:1220811149


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gst/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Feb 2008 01:09:21 -0000	1.4
+++ .cvsignore	7 Sep 2008 18:12:49 -0000	1.5
@@ -1 +1 @@
-clutter-gst-0.6.1.tar.gz
+clutter-gst-0.8.0.tar.gz


Index: clutter-gst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gst/devel/clutter-gst.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- clutter-gst.spec	23 Feb 2008 01:09:21 -0000	1.4
+++ clutter-gst.spec	7 Sep 2008 18:12:49 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           clutter-gst
-Version:        0.6.1
+Version:        0.8.0
 Release:        1%{?dist}
 Summary:        ClutterMedia interface to GStreamer
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://www.clutter-project.org
-Source0:        http://www.clutter-project.org/sources/%{name}/0.6/%{name}-%{version}.tar.gz
+Source0:        http://www.clutter-project.org/sources/%{name}/0.8/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  clutter-devel gstreamer-plugins-base-devel gstreamer-devel 
@@ -45,20 +45,23 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
-%exclude %{_libdir}/libclutter-gst-0.6.la
-%{_libdir}/libclutter-gst-0.6.so.0
-%{_libdir}/libclutter-gst-0.6.so.0.601.0
+%exclude %{_libdir}/libclutter-gst-0.8.la
+%{_libdir}/libclutter-gst-0.8.so.0
+%{_libdir}/libclutter-gst-0.8.so.0.*
 %{_datadir}/gtk-doc/html/clutter-gst
 
 %files devel
 %defattr(-,root,root,-)
 %doc
 %{_includedir}/*
-%{_libdir}/pkgconfig/clutter-gst-0.6.pc
-%{_libdir}/libclutter-gst-0.6.so
+%{_libdir}/pkgconfig/clutter-gst-0.8.pc
+%{_libdir}/libclutter-gst-0.8.so
 
 %changelog
 
+* Sat Sep  6 2008 Allisson Azevedo <allisson at gmail.com> 0.8.0-1
+- Update to 0.8.0
+
 * Fri Feb 22 2008 Allisson Azevedo <allisson at gmail.com> 0.6.1-1
 - Update to 0.6.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gst/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Feb 2008 01:09:21 -0000	1.4
+++ sources	7 Sep 2008 18:12:49 -0000	1.5
@@ -1 +1 @@
-cdee16fa97ed109a6850ecbbcfff9aea  clutter-gst-0.6.1.tar.gz
+9ebf9bbe406757472952743ca01870f3  clutter-gst-0.8.0.tar.gz



From lucilanga at fedoraproject.org  Sun Sep  7 18:37:43 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun,  7 Sep 2008 18:37:43 +0000 (UTC)
Subject: rpms/xastir/devel xastir-1.9.2-libdir.patch, 1.2, 1.3 xastir.spec,
	1.8, 1.9 xastir-1.9.2-IM.patch, 1.1, NONE xastir-1.9.2-wget.patch,
	1.1, NONE
Message-ID: <20080907183743.ABF0070126@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24033

Modified Files:
	xastir-1.9.2-libdir.patch xastir.spec 
Removed Files:
	xastir-1.9.2-IM.patch xastir-1.9.2-wget.patch 
Log Message:
* Sun Sep 07 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.4-1
- new upstream 1.9.4
- drop wget and IM patch (fixed upstream)

xastir-1.9.2-libdir.patch:

Index: xastir-1.9.2-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir-1.9.2-libdir.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xastir-1.9.2-libdir.patch	16 May 2008 05:24:57 -0000	1.2
+++ xastir-1.9.2-libdir.patch	7 Sep 2008 18:37:43 -0000	1.3
@@ -1,5 +1,5 @@
---- xastir-1.9.2/scripts/Makefile.am	2007-01-03 21:40:49.000000000 +0200
-+++ xastir-1.9.2-mod/scripts/Makefile.am	2008-05-16 08:05:53.000000000 +0300
+--- xastir-1.9.4/scripts/Makefile.am	2007-01-03 21:40:49.000000000 +0200
++++ xastir-1.9.4-mod/scripts/Makefile.am	2008-05-16 08:05:53.000000000 +0300
 @@ -3,7 +3,7 @@
  # Copyright (C) 2000-2007  The Xastir Group
  #


Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xastir.spec	6 Sep 2008 21:37:55 -0000	1.8
+++ xastir.spec	7 Sep 2008 18:37:43 -0000	1.9
@@ -1,15 +1,13 @@
 Summary: Amateur Station Tracking and Reporting system for amateur radio
 Name:    xastir
-Version: 1.9.2
-Release: 10%{?dist}
+Version: 1.9.4
+Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/Internet
 Source0: http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
 Source1: %{name}.desktop
 Source2: %{name}.png
-Patch0:  xastir-1.9.2-libdir.patch
-Patch1:  xastir-1.9.2-IM.patch
-Patch2:  xastir-1.9.2-wget.patch
+Patch0:  xastir-1.9.4-libdir.patch
 URL:     http://www.xastir.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: wget
@@ -28,8 +26,6 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .libdir
-%patch1 -p1 -b .IM
-%patch2 -p1 -b .wget
 
 %build
 #./bootstrap.sh
@@ -92,6 +88,10 @@
 %doc README.MAPS README.win32 UPGRADE
 
 %changelog
+* Sun Sep 07 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.4-1
+- new upstream 1.9.4
+- drop wget and IM patch (fixed upstream)
+
 * Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.9.2-10
 - fix license tag
 - fix spec up so it doesn't confuse license checking script


--- xastir-1.9.2-IM.patch DELETED ---


--- xastir-1.9.2-wget.patch DELETED ---



From lucilanga at fedoraproject.org  Sun Sep  7 18:38:51 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun,  7 Sep 2008 18:38:51 +0000 (UTC)
Subject: rpms/xastir/devel xastir-1.9.4-libdir.patch, NONE,
	1.1 xastir-1.9.2-libdir.patch, 1.3, NONE
Message-ID: <20080907183851.65E0670126@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24148

Added Files:
	xastir-1.9.4-libdir.patch 
Removed Files:
	xastir-1.9.2-libdir.patch 
Log Message:
* Sun Sep 07 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.4-1
- new upstream 1.9.4
- drop wget and IM patch (fixed upstream)

xastir-1.9.4-libdir.patch:

--- NEW FILE xastir-1.9.4-libdir.patch ---
--- xastir-1.9.2/scripts/Makefile.am	2007-01-03 21:40:49.000000000 +0200
+++ xastir-1.9.2-mod/scripts/Makefile.am	2008-05-16 08:05:53.000000000 +0300
@@ -3,7 +3,7 @@
 # Copyright (C) 2000-2007  The Xastir Group
 #
 
-pkglib_SCRIPTS = \
+pkgdata_SCRIPTS = \
     Coordinate.pm \
     coord-convert.pl \
     fcc-get \
@@ -34,7 +34,7 @@
     Xastir_tigerpoly.py
 
 
-EXTRA_DIST = $(pkglib_SCRIPTS)
+EXTRA_DIST = $(pkgdata_SCRIPTS)
 
 
 


--- xastir-1.9.2-libdir.patch DELETED ---



From pkgdb at fedoraproject.org  Sun Sep  7 18:47:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:47:22 +0000
Subject: [pkgdb] mars-sim: mmahut has requested watchbugzilla
Message-ID: <20080907184722.5924820876B@bastion.fedora.phx.redhat.com>

mmahut has requested the watchbugzilla acl on mars-sim (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mars-sim



From pkgdb at fedoraproject.org  Sun Sep  7 18:47:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:47:25 +0000
Subject: [pkgdb] mars-sim: mmahut has requested watchcommits
Message-ID: <20080907184725.36F38208770@bastion.fedora.phx.redhat.com>

mmahut has requested the watchcommits acl on mars-sim (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mars-sim



From pkgdb at fedoraproject.org  Sun Sep  7 18:47:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:47:29 +0000
Subject: [pkgdb] mars-sim: mmahut has requested commit
Message-ID: <20080907184729.25F1D208D0F@bastion.fedora.phx.redhat.com>

mmahut has requested the commit acl on mars-sim (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mars-sim



From pkgdb at fedoraproject.org  Sun Sep  7 18:47:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:47:31 +0000
Subject: [pkgdb] mars-sim: mmahut has requested approveacls
Message-ID: <20080907184731.A7E66208D98@bastion.fedora.phx.redhat.com>

mmahut has requested the approveacls acl on mars-sim (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mars-sim



From pkgdb at fedoraproject.org  Sun Sep  7 18:47:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:47:34 +0000
Subject: [pkgdb] mars-sim: mmahut has requested watchbugzilla
Message-ID: <20080907184734.C57F920876B@bastion.fedora.phx.redhat.com>

mmahut has requested the watchbugzilla acl on mars-sim (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mars-sim



From pkgdb at fedoraproject.org  Sun Sep  7 18:47:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:47:35 +0000
Subject: [pkgdb] mars-sim: mmahut has requested watchcommits
Message-ID: <20080907184736.02D3C208D9C@bastion.fedora.phx.redhat.com>

mmahut has requested the watchcommits acl on mars-sim (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mars-sim



From pkgdb at fedoraproject.org  Sun Sep  7 18:47:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:47:37 +0000
Subject: [pkgdb] mars-sim: mmahut has requested commit
Message-ID: <20080907184737.D21E3208DA0@bastion.fedora.phx.redhat.com>

mmahut has requested the commit acl on mars-sim (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mars-sim



From lucilanga at fedoraproject.org  Sun Sep  7 18:47:55 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun,  7 Sep 2008 18:47:55 +0000 (UTC)
Subject: rpms/xastir/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20080907184755.3646F70126@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24781

Modified Files:
	.cvsignore sources 
Log Message:
* Sun Sep 07 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.4-1
- new upstream 1.9.4
- drop wget and IM patch (fixed upstream)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Mar 2008 08:16:26 -0000	1.2
+++ .cvsignore	7 Sep 2008 18:47:24 -0000	1.3
@@ -1 +1 @@
-xastir-1.9.2.tar.gz
+xastir-1.9.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Mar 2008 08:16:26 -0000	1.2
+++ sources	7 Sep 2008 18:47:24 -0000	1.3
@@ -1 +1 @@
-8608afa8f8f0c441a37ba72aeeccdcac  xastir-1.9.2.tar.gz
+415a19df810d0b28ac61aa444c3e7e0a  xastir-1.9.4.tar.gz



From pkgdb at fedoraproject.org  Sun Sep  7 18:47:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:47:41 +0000
Subject: [pkgdb] mars-sim: mmahut has requested approveacls
Message-ID: <20080907184741.38917208DA4@bastion.fedora.phx.redhat.com>

mmahut has requested the approveacls acl on mars-sim (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mars-sim



From pkgdb at fedoraproject.org  Sun Sep  7 18:48:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:48:28 +0000
Subject: [pkgdb] ds9: mmahut has requested watchbugzilla
Message-ID: <20080907184828.B2AA9208D07@bastion.fedora.phx.redhat.com>

mmahut has requested the watchbugzilla acl on ds9 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ds9



From pkgdb at fedoraproject.org  Sun Sep  7 18:48:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:48:31 +0000
Subject: [pkgdb] ds9: mmahut has requested watchcommits
Message-ID: <20080907184831.267D0208D1E@bastion.fedora.phx.redhat.com>

mmahut has requested the watchcommits acl on ds9 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ds9



From pkgdb at fedoraproject.org  Sun Sep  7 18:48:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:48:36 +0000
Subject: [pkgdb] ds9: mmahut has requested commit
Message-ID: <20080907184836.16322208D99@bastion.fedora.phx.redhat.com>

mmahut has requested the commit acl on ds9 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ds9



From pkgdb at fedoraproject.org  Sun Sep  7 18:49:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:49:03 +0000
Subject: [pkgdb] ds9: mmahut has requested approveacls
Message-ID: <20080907184903.1E6FE20876B@bastion.fedora.phx.redhat.com>

mmahut has requested the approveacls acl on ds9 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ds9



From pkgdb at fedoraproject.org  Sun Sep  7 18:49:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:49:27 +0000
Subject: [pkgdb] wcstools: mmahut has requested watchcommits
Message-ID: <20080907184927.0AADB208771@bastion.fedora.phx.redhat.com>

mmahut has requested the watchcommits acl on wcstools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wcstools



From pkgdb at fedoraproject.org  Sun Sep  7 18:49:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:49:26 +0000
Subject: [pkgdb] wcstools: mmahut has requested watchbugzilla
Message-ID: <20080907184926.4F6BE20876C@bastion.fedora.phx.redhat.com>

mmahut has requested the watchbugzilla acl on wcstools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wcstools



From pkgdb at fedoraproject.org  Sun Sep  7 18:49:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:49:28 +0000
Subject: [pkgdb] wcstools: mmahut has requested commit
Message-ID: <20080907184928.279F0208D1E@bastion.fedora.phx.redhat.com>

mmahut has requested the commit acl on wcstools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wcstools



From pkgdb at fedoraproject.org  Sun Sep  7 18:49:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:49:33 +0000
Subject: [pkgdb] wcstools: mmahut has requested approveacls
Message-ID: <20080907184933.5026C208D98@bastion.fedora.phx.redhat.com>

mmahut has requested the approveacls acl on wcstools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wcstools



From pkgdb at fedoraproject.org  Sun Sep  7 18:49:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:49:35 +0000
Subject: [pkgdb] wcstools: mmahut has requested watchbugzilla
Message-ID: <20080907184935.8D9E820876C@bastion.fedora.phx.redhat.com>

mmahut has requested the watchbugzilla acl on wcstools (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wcstools



From pkgdb at fedoraproject.org  Sun Sep  7 18:49:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:49:37 +0000
Subject: [pkgdb] wcstools: mmahut has requested watchcommits
Message-ID: <20080907184937.ACDE4208771@bastion.fedora.phx.redhat.com>

mmahut has requested the watchcommits acl on wcstools (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wcstools



From pkgdb at fedoraproject.org  Sun Sep  7 18:49:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:49:41 +0000
Subject: [pkgdb] wcstools: mmahut has requested approveacls
Message-ID: <20080907184941.98786208DA0@bastion.fedora.phx.redhat.com>

mmahut has requested the approveacls acl on wcstools (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wcstools



From pkgdb at fedoraproject.org  Sun Sep  7 18:49:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:49:39 +0000
Subject: [pkgdb] wcstools: mmahut has requested commit
Message-ID: <20080907184939.49FDE208D9C@bastion.fedora.phx.redhat.com>

mmahut has requested the commit acl on wcstools (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wcstools



From pkgdb at fedoraproject.org  Sun Sep  7 18:51:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:51:51 +0000
Subject: [pkgdb] sextractor: mmahut has requested watchbugzilla
Message-ID: <20080907185151.4FDDC20876B@bastion.fedora.phx.redhat.com>

mmahut has requested the watchbugzilla acl on sextractor (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sextractor



From pkgdb at fedoraproject.org  Sun Sep  7 18:51:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:51:53 +0000
Subject: [pkgdb] sextractor: mmahut has requested watchcommits
Message-ID: <20080907185153.1E54D208770@bastion.fedora.phx.redhat.com>

mmahut has requested the watchcommits acl on sextractor (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sextractor



From pkgdb at fedoraproject.org  Sun Sep  7 18:51:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:51:54 +0000
Subject: [pkgdb] sextractor: mmahut has requested commit
Message-ID: <20080907185154.481AA208D0F@bastion.fedora.phx.redhat.com>

mmahut has requested the commit acl on sextractor (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sextractor



From pkgdb at fedoraproject.org  Sun Sep  7 18:52:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:52:00 +0000
Subject: [pkgdb] sextractor: mmahut has requested approveacls
Message-ID: <20080907185200.4B58D208D97@bastion.fedora.phx.redhat.com>

mmahut has requested the approveacls acl on sextractor (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sextractor



From pkgdb at fedoraproject.org  Sun Sep  7 18:52:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:52:17 +0000
Subject: [pkgdb] boinc-client: mmahut has requested watchbugzilla
Message-ID: <20080907185217.75F9820876A@bastion.fedora.phx.redhat.com>

mmahut has requested the watchbugzilla acl on boinc-client (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boinc-client



From pkgdb at fedoraproject.org  Sun Sep  7 18:52:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:52:19 +0000
Subject: [pkgdb] boinc-client: mmahut has requested watchcommits
Message-ID: <20080907185219.49FAA20876F@bastion.fedora.phx.redhat.com>

mmahut has requested the watchcommits acl on boinc-client (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boinc-client



From pkgdb at fedoraproject.org  Sun Sep  7 18:52:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:52:20 +0000
Subject: [pkgdb] boinc-client: mmahut has requested commit
Message-ID: <20080907185220.E8A89208D07@bastion.fedora.phx.redhat.com>

mmahut has requested the commit acl on boinc-client (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boinc-client



From pkgdb at fedoraproject.org  Sun Sep  7 18:52:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:52:24 +0000
Subject: [pkgdb] boinc-client: mmahut has requested approveacls
Message-ID: <20080907185223.F2A85208D9B@bastion.fedora.phx.redhat.com>

mmahut has requested the approveacls acl on boinc-client (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boinc-client



From pkgdb at fedoraproject.org  Sun Sep  7 18:52:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:52:31 +0000
Subject: [pkgdb] cpl: mmahut has requested watchbugzilla
Message-ID: <20080907185231.8EF45208D1E@bastion.fedora.phx.redhat.com>

mmahut has requested the watchbugzilla acl on cpl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpl



From pkgdb at fedoraproject.org  Sun Sep  7 18:52:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:52:33 +0000
Subject: [pkgdb] cpl: mmahut has requested watchcommits
Message-ID: <20080907185233.90B3D208D98@bastion.fedora.phx.redhat.com>

mmahut has requested the watchcommits acl on cpl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpl



From pkgdb at fedoraproject.org  Sun Sep  7 18:52:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:52:37 +0000
Subject: [pkgdb] cpl: mmahut has requested commit
Message-ID: <20080907185237.BC75520876B@bastion.fedora.phx.redhat.com>

mmahut has requested the commit acl on cpl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpl



From pkgdb at fedoraproject.org  Sun Sep  7 18:52:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:52:40 +0000
Subject: [pkgdb] cpl: mmahut has requested approveacls
Message-ID: <20080907185241.1824A208770@bastion.fedora.phx.redhat.com>

mmahut has requested the approveacls acl on cpl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpl



From pkgdb at fedoraproject.org  Sun Sep  7 18:53:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:53:14 +0000
Subject: [pkgdb] python-numdisplay: mmahut has requested watchcommits
Message-ID: <20080907185315.0186D208D7C@bastion.fedora.phx.redhat.com>

mmahut has requested the watchcommits acl on python-numdisplay (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-numdisplay



From pkgdb at fedoraproject.org  Sun Sep  7 18:53:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:53:16 +0000
Subject: [pkgdb] python-numdisplay: mmahut has requested commit
Message-ID: <20080907185316.8ABB3208D99@bastion.fedora.phx.redhat.com>

mmahut has requested the commit acl on python-numdisplay (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-numdisplay



From pkgdb at fedoraproject.org  Sun Sep  7 18:53:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:53:18 +0000
Subject: [pkgdb] python-numdisplay: mmahut has requested approveacls
Message-ID: <20080907185318.1D75D208D9F@bastion.fedora.phx.redhat.com>

mmahut has requested the approveacls acl on python-numdisplay (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-numdisplay



From pkgdb at fedoraproject.org  Sun Sep  7 18:53:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:53:16 +0000
Subject: [pkgdb] python-numdisplay: mmahut has requested watchbugzilla
Message-ID: <20080907185317.968CD208D9C@bastion.fedora.phx.redhat.com>

mmahut has requested the watchbugzilla acl on python-numdisplay (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-numdisplay



From pkgdb at fedoraproject.org  Sun Sep  7 18:53:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:53:22 +0000
Subject: [pkgdb] python-numdisplay: mmahut has requested watchbugzilla
Message-ID: <20080907185323.0806220876C@bastion.fedora.phx.redhat.com>

mmahut has requested the watchbugzilla acl on python-numdisplay (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-numdisplay



From pkgdb at fedoraproject.org  Sun Sep  7 18:53:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:53:24 +0000
Subject: [pkgdb] python-numdisplay: mmahut has requested watchcommits
Message-ID: <20080907185324.DDB3F208DA1@bastion.fedora.phx.redhat.com>

mmahut has requested the watchcommits acl on python-numdisplay (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-numdisplay



From pkgdb at fedoraproject.org  Sun Sep  7 18:53:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:53:29 +0000
Subject: [pkgdb] python-numdisplay: mmahut has requested approveacls
Message-ID: <20080907185329.6D652208DA8@bastion.fedora.phx.redhat.com>

mmahut has requested the approveacls acl on python-numdisplay (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-numdisplay



From pkgdb at fedoraproject.org  Sun Sep  7 18:53:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 18:53:30 +0000
Subject: [pkgdb] python-numdisplay: mmahut has requested commit
Message-ID: <20080907185330.E4D0D208D07@bastion.fedora.phx.redhat.com>

mmahut has requested the commit acl on python-numdisplay (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-numdisplay



From lucilanga at fedoraproject.org  Sun Sep  7 18:55:46 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun,  7 Sep 2008 18:55:46 +0000 (UTC)
Subject: rpms/xastir/devel xastir-1.9.4-libdir.patch,1.1,1.2
Message-ID: <20080907185546.464ED70128@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25434

Modified Files:
	xastir-1.9.4-libdir.patch 
Log Message:
* Sun Sep 07 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.4-1
- new upstream 1.9.4
- drop wget and IM patch (fixed upstream)

xastir-1.9.4-libdir.patch:

Index: xastir-1.9.4-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir-1.9.4-libdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xastir-1.9.4-libdir.patch	7 Sep 2008 18:38:51 -0000	1.1
+++ xastir-1.9.4-libdir.patch	7 Sep 2008 18:55:45 -0000	1.2
@@ -1,5 +1,5 @@
---- xastir-1.9.2/scripts/Makefile.am	2007-01-03 21:40:49.000000000 +0200
-+++ xastir-1.9.2-mod/scripts/Makefile.am	2008-05-16 08:05:53.000000000 +0300
+--- xastir-1.9.4/scripts/Makefile.am	2007-01-03 21:40:49.000000000 +0200
++++ xastir-1.9.4-mod/scripts/Makefile.am	2008-05-16 08:05:53.000000000 +0300
 @@ -3,7 +3,7 @@
  # Copyright (C) 2000-2007  The Xastir Group
  #



From pkgdb at fedoraproject.org  Sun Sep  7 19:12:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:12:05 +0000
Subject: [pkgdb] python-numdisplay had acl change status
Message-ID: <20080907191206.3FE4820876E@bastion.fedora.phx.redhat.com>

sergiopr has set the watchcommits acl on python-numdisplay (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-numdisplay



From pkgdb at fedoraproject.org  Sun Sep  7 19:12:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:12:09 +0000
Subject: [pkgdb] python-numdisplay had acl change status
Message-ID: <20080907191209.3AE93208771@bastion.fedora.phx.redhat.com>

sergiopr has set the watchbugzilla acl on python-numdisplay (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-numdisplay



From pkgdb at fedoraproject.org  Sun Sep  7 19:12:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:12:12 +0000
Subject: [pkgdb] python-numdisplay had acl change status
Message-ID: <20080907191212.7002D208D1E@bastion.fedora.phx.redhat.com>

sergiopr has set the commit acl on python-numdisplay (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-numdisplay



From pkgdb at fedoraproject.org  Sun Sep  7 19:12:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:12:15 +0000
Subject: [pkgdb] python-numdisplay had acl change status
Message-ID: <20080907191215.4BE05208D98@bastion.fedora.phx.redhat.com>

sergiopr has set the approveacls acl on python-numdisplay (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-numdisplay



From pkgdb at fedoraproject.org  Sun Sep  7 19:12:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:12:24 +0000
Subject: [pkgdb] python-numdisplay had acl change status
Message-ID: <20080907191225.10E4D208D99@bastion.fedora.phx.redhat.com>

sergiopr has set the watchbugzilla acl on python-numdisplay (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-numdisplay



From pkgdb at fedoraproject.org  Sun Sep  7 19:12:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:12:27 +0000
Subject: [pkgdb] python-numdisplay had acl change status
Message-ID: <20080907191227.93937208D9C@bastion.fedora.phx.redhat.com>

sergiopr has set the watchcommits acl on python-numdisplay (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-numdisplay



From pkgdb at fedoraproject.org  Sun Sep  7 19:12:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:12:28 +0000
Subject: [pkgdb] python-numdisplay had acl change status
Message-ID: <20080907191228.A5EB8208DA0@bastion.fedora.phx.redhat.com>

sergiopr has set the commit acl on python-numdisplay (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-numdisplay



From pkgdb at fedoraproject.org  Sun Sep  7 19:12:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:12:33 +0000
Subject: [pkgdb] python-numdisplay had acl change status
Message-ID: <20080907191234.E62DD208D07@bastion.fedora.phx.redhat.com>

sergiopr has set the approveacls acl on python-numdisplay (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-numdisplay



From pkgdb at fedoraproject.org  Sun Sep  7 19:12:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:12:59 +0000
Subject: [pkgdb] cpl had acl change status
Message-ID: <20080907191259.F30DC208D99@bastion.fedora.phx.redhat.com>

sergiopr has set the watchbugzilla acl on cpl (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpl



From pkgdb at fedoraproject.org  Sun Sep  7 19:13:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:13:02 +0000
Subject: [pkgdb] cpl had acl change status
Message-ID: <20080907191302.32AFE208DA1@bastion.fedora.phx.redhat.com>

sergiopr has set the watchcommits acl on cpl (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpl



From pkgdb at fedoraproject.org  Sun Sep  7 19:13:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:13:04 +0000
Subject: [pkgdb] cpl had acl change status
Message-ID: <20080907191304.72DAE208D9F@bastion.fedora.phx.redhat.com>

sergiopr has set the commit acl on cpl (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpl



From pkgdb at fedoraproject.org  Sun Sep  7 19:13:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:13:04 +0000
Subject: [pkgdb] cpl had acl change status
Message-ID: <20080907191305.20D21208DA2@bastion.fedora.phx.redhat.com>

sergiopr has set the approveacls acl on cpl (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpl



From pkgdb at fedoraproject.org  Sun Sep  7 19:13:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:13:27 +0000
Subject: [pkgdb] sextractor had acl change status
Message-ID: <20080907191328.12820208771@bastion.fedora.phx.redhat.com>

sergiopr has set the watchbugzilla acl on sextractor (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sextractor



From pkgdb at fedoraproject.org  Sun Sep  7 19:13:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:13:28 +0000
Subject: [pkgdb] sextractor had acl change status
Message-ID: <20080907191328.1CD7D208D1E@bastion.fedora.phx.redhat.com>

sergiopr has set the watchcommits acl on sextractor (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sextractor



From pkgdb at fedoraproject.org  Sun Sep  7 19:13:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:13:28 +0000
Subject: [pkgdb] sextractor had acl change status
Message-ID: <20080907191328.8D624208D98@bastion.fedora.phx.redhat.com>

sergiopr has set the commit acl on sextractor (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sextractor



From pkgdb at fedoraproject.org  Sun Sep  7 19:13:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:13:29 +0000
Subject: [pkgdb] sextractor had acl change status
Message-ID: <20080907191329.204D0208DA6@bastion.fedora.phx.redhat.com>

sergiopr has set the approveacls acl on sextractor (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sextractor



From pkgdb at fedoraproject.org  Sun Sep  7 19:13:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:13:41 +0000
Subject: [pkgdb] wcstools had acl change status
Message-ID: <20080907191341.79515208D9E@bastion.fedora.phx.redhat.com>

sergiopr has set the watchbugzilla acl on wcstools (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wcstools



From pkgdb at fedoraproject.org  Sun Sep  7 19:13:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:13:42 +0000
Subject: [pkgdb] wcstools had acl change status
Message-ID: <20080907191342.94C36208DA9@bastion.fedora.phx.redhat.com>

sergiopr has set the watchcommits acl on wcstools (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wcstools



From pkgdb at fedoraproject.org  Sun Sep  7 19:13:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:13:45 +0000
Subject: [pkgdb] wcstools had acl change status
Message-ID: <20080907191345.B0A15208DAC@bastion.fedora.phx.redhat.com>

sergiopr has set the commit acl on wcstools (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wcstools



From pkgdb at fedoraproject.org  Sun Sep  7 19:13:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:13:47 +0000
Subject: [pkgdb] wcstools had acl change status
Message-ID: <20080907191347.419BB208DAE@bastion.fedora.phx.redhat.com>

sergiopr has set the approveacls acl on wcstools (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wcstools



From pkgdb at fedoraproject.org  Sun Sep  7 19:13:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:13:51 +0000
Subject: [pkgdb] wcstools had acl change status
Message-ID: <20080907191351.26374208DAF@bastion.fedora.phx.redhat.com>

sergiopr has set the watchbugzilla acl on wcstools (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wcstools



From pkgdb at fedoraproject.org  Sun Sep  7 19:13:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:13:51 +0000
Subject: [pkgdb] wcstools had acl change status
Message-ID: <20080907191352.0DAE2208DB5@bastion.fedora.phx.redhat.com>

sergiopr has set the commit acl on wcstools (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wcstools



From pkgdb at fedoraproject.org  Sun Sep  7 19:13:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:13:51 +0000
Subject: [pkgdb] wcstools had acl change status
Message-ID: <20080907191351.EC750208DB2@bastion.fedora.phx.redhat.com>

sergiopr has set the watchcommits acl on wcstools (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wcstools



From pkgdb at fedoraproject.org  Sun Sep  7 19:13:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:13:56 +0000
Subject: [pkgdb] wcstools had acl change status
Message-ID: <20080907191357.1E262208DB7@bastion.fedora.phx.redhat.com>

sergiopr has set the approveacls acl on wcstools (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wcstools



From pkgdb at fedoraproject.org  Sun Sep  7 19:14:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:14:04 +0000
Subject: [pkgdb] ds9 had acl change status
Message-ID: <20080907191404.3497B208DB8@bastion.fedora.phx.redhat.com>

sergiopr has set the watchbugzilla acl on ds9 (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ds9



From pkgdb at fedoraproject.org  Sun Sep  7 19:14:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:14:05 +0000
Subject: [pkgdb] ds9 had acl change status
Message-ID: <20080907191405.44A19208DBC@bastion.fedora.phx.redhat.com>

sergiopr has set the watchcommits acl on ds9 (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ds9



From pkgdb at fedoraproject.org  Sun Sep  7 19:14:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:14:06 +0000
Subject: [pkgdb] ds9 had acl change status
Message-ID: <20080907191406.45AFC208DBF@bastion.fedora.phx.redhat.com>

sergiopr has set the commit acl on ds9 (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ds9



From pkgdb at fedoraproject.org  Sun Sep  7 19:14:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 19:14:12 +0000
Subject: [pkgdb] ds9 had acl change status
Message-ID: <20080907191412.69944208D0F@bastion.fedora.phx.redhat.com>

sergiopr has set the approveacls acl on ds9 (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ds9



From caolanm at fedoraproject.org  Sun Sep  7 19:27:28 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun,  7 Sep 2008 19:27:28 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1640,1.1641
Message-ID: <20080907192728.1B5477012A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27456

Modified Files:
	openoffice.org.spec 
Log Message:
next candidate


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1640
retrieving revision 1.1641
diff -u -r1.1640 -r1.1641
--- openoffice.org.spec	5 Sep 2008 15:04:06 -0000	1.1640
+++ openoffice.org.spec	7 Sep 2008 19:26:57 -0000	1.1641
@@ -1397,8 +1397,7 @@
 rm -rf $RPM_BUILD_ROOT
 source Linux*Env.Set.sh
 #figure out the icon version
-export LONGICON`grep "PRODUCTVERSION[ ]*=[ ]*" sysui/desktop/productversion.mk | sed -e "s/ //g"`
-export ICONPRODUCTVERSION=${LONGICONPRODUCTVERSION/./}
+export `grep "^PRODUCTVERSIONSHORT =" desktop/productversion.mk | sed -e "s/ //g"`
 unset HAVE_LD_HASH_STYLE
 #don't duplicate english helpcontent about the place
 unset DEFAULT_TO_ENGLISH_FOR_PACKING
@@ -1870,9 +1869,7 @@
 chmod u+w *.desktop
 for file in *.desktop; do
     # rhbz#156067 don't version the icons
-    sed -i -e "s/$ICONPRODUCTVERSION//g" $file
-    # rhbz#156677 remove the version from Name=
-    sed -i -e "s/$LONGICONPRODUCTVERSION //g" $file
+    sed -i -e "s/$PRODUCTVERSIONSHORT//g" $file
 done
 echo "StartupNotify=true" >> base.desktop
 echo "StartupNotify=true" >> calc.desktop
@@ -1901,25 +1898,25 @@
 #get rid of the gnome icons and other unneeded files
 rm -rf icons/gnome applications mime application-registry
 # rhbz#156067 don't version the icons
-find . -name "*.desktop" -exec sed -i -e s/$ICONPRODUCTVERSION//g {} \;
-find . -name "*officeorg$ICONPRODUCTVERSION*" -exec bash -c \
-  "mv \$1 \`echo \$1 | sed s/officeorg$ICONPRODUCTVERSION/officeorg/\`" -- {} \;
-find . -name "*office.org$LONGICONPRODUCTVERSION*" -exec bash -c \
-  "mv \$1 \`echo \$1 | sed s/.org$LONGICONPRODUCTVERSION/.org/\`" -- {} \;
+find . -name "*.desktop" -exec sed -i -e s/$PRODUCTVERSIONSHORT//g {} \;
+find . -name "*officeorg$PRODUCTVERSIONSHORT*" -exec bash -c \
+  "mv \$1 \`echo \$1 | sed s/officeorg$PRODUCTVERSIONSHORT/officeorg/\`" -- {} \;
+find . -name "*office.org$PRODUCTVERSIONSHORT*" -exec bash -c \
+  "mv \$1 \`echo \$1 | sed s/.org$PRODUCTVERSIONSHORT/.org/\`" -- {} \;
 find . -type l -print -exec ls -lag '{}' \; | gawk '{q="'\''" ; file=$0 ; \
     getline; \
     split($0, ls, " -> "); \
     link=ls[2]; \
-    gsub(ENVIRON["ICONPRODUCTVERSION"], "", link) ; \
+    gsub(ENVIRON["PRODUCTVERSIONSHORT"], "", link) ; \
     if ( link != ls[2] ) system("rm " q file q"; ln -s "q link q" "q file q); \
  }'
-sed -i -e s/openofficeorg$ICONPRODUCTVERSION/openofficeorg/g \
+sed -i -e s/openofficeorg$PRODUCTVERSIONSHORT/openofficeorg/g \
   ./mime-info/openoffice.org.keys
-sed -i -e s/openoffice.org$LONGICONPRODUCTVERSION/openoffice.org/g \
+sed -i -e s/openoffice.org$PRODUCTVERSIONSHORT/openofficeorg/g/openoffice.org/g \
   ./mime-info/openoffice.org.keys
-sed -i -e s/brofficeorg$ICONPRODUCTVERSION/brofficeorg/g \
+sed -i -e s/brofficeorg$PRODUCTVERSIONSHORT/brofficeorg/g \
   ./mime-info/broffice.org.keys
-sed -i -e s/broffice.org$LONGICONPRODUCTVERSION/broffice.org/g \
+sed -i -e s/broffice.org$PRODUCTVERSIONSHORT/openofficeorg/g/broffice.org/g \
   ./mime-info/broffice.org.keys
 #relocate the rest of them
 cp -r icons $RPM_BUILD_ROOT/%{_datadir}
@@ -1935,9 +1932,7 @@
 chmod u+w *.desktop
 for file in *.desktop; do
     # rhbz#156067 don't version the icons
-    sed -i -e "s/$ICONPRODUCTVERSION//g" $file
-    # rhbz#156677 remove the version from Name=
-    sed -i -e "s/$LONGICONPRODUCTVERSION //g" $file
+    sed -i -e "s/$PRODUCTVERSIONSHORT//g" $file
     # use broffice.org launcher
     sed -i -e "s/openoffice/broffice/g" $file
 done
@@ -3648,7 +3643,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Sep 05 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-5.1
+* Sun Sep 07 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-5.1
 - next candidate
 
 * Thu Sep 04 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-4.2



From kkofler at fedoraproject.org  Sun Sep  7 19:31:55 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  7 Sep 2008 19:31:55 +0000 (UTC)
Subject: rpms/gpsim/devel gpsim-0.22.0-gcc43.patch, NONE, 1.1 gpsim.spec,
	1.17, 1.18 gpsim-0.21.11.happy_gcc, 1.3,
	NONE gpsim-0.21.11.ktechlab.patch, 1.1, NONE
Message-ID: <20080907193155.B1F4570126@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/gpsim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27978/devel

Modified Files:
	gpsim.spec 
Added Files:
	gpsim-0.22.0-gcc43.patch 
Removed Files:
	gpsim-0.21.11.happy_gcc gpsim-0.21.11.ktechlab.patch 
Log Message:
* Sun Sep 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.22.0-7
- Fix build with GCC 4.3 (#434061), patch by Vasile Gaburici, simpler fix for
  the "list" name conflict from the Debian patch

gpsim-0.22.0-gcc43.patch:

--- NEW FILE gpsim-0.22.0-gcc43.patch ---
diff -up gpsim-0.22.0/cli/cmd_clear.cc.std gpsim-0.22.0/cli/cmd_clear.cc
--- gpsim-0.22.0/cli/cmd_clear.cc.std	2008-09-06 16:13:58.000000000 +0300
+++ gpsim-0.22.0/cli/cmd_clear.cc	2008-09-06 16:14:13.000000000 +0300
@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #include <iostream>
 #include <iomanip>
 #include <string>
+#include <typeinfo>
 
 #include "command.h"
 #include "cmd_clear.h"
diff -up gpsim-0.22.0/cli/cmd_x.cc.std gpsim-0.22.0/cli/cmd_x.cc
--- gpsim-0.22.0/cli/cmd_x.cc.std	2008-09-06 16:18:07.000000000 +0300
+++ gpsim-0.22.0/cli/cmd_x.cc	2008-09-06 16:18:24.000000000 +0300
@@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #include <iostream>
 #include <iomanip>
 #include <string>
-
+#include <typeinfo>
 
 #include "command.h"
 #include "cmd_x.h"
diff -up gpsim-0.22.0/gui/gui_regwin.cc.std gpsim-0.22.0/gui/gui_regwin.cc
--- gpsim-0.22.0/gui/gui_regwin.cc.std	2008-09-06 16:22:59.000000000 +0300
+++ gpsim-0.22.0/gui/gui_regwin.cc	2008-09-06 16:24:07.000000000 +0300
@@ -24,6 +24,8 @@ Boston, MA 02111-1307, USA.  */
 #include <stdlib.h>
 #include <errno.h>
 
+#include <typeinfo>
+
 #include "../config.h"
 #ifdef HAVE_GUI
 
diff -up gpsim-0.22.0/gui/gui_src.cc.std gpsim-0.22.0/gui/gui_src.cc
--- gpsim-0.22.0/gui/gui_src.cc.std	2008-09-06 16:25:21.000000000 +0300
+++ gpsim-0.22.0/gui/gui_src.cc	2008-09-06 16:25:35.000000000 +0300
@@ -23,6 +23,8 @@ Boston, MA 02111-1307, USA.  */
 #include <stdlib.h>
 #include <errno.h>
 
+#include <typeinfo>
+
 #include "../config.h"
 #ifdef HAVE_GUI
 
diff -up gpsim-0.22.0/gui/gui_stack.cc.std gpsim-0.22.0/gui/gui_stack.cc
--- gpsim-0.22.0/gui/gui_stack.cc.std	2008-09-06 16:28:38.000000000 +0300
+++ gpsim-0.22.0/gui/gui_stack.cc	2008-09-06 16:29:33.000000000 +0300
@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <typeinfo>
 
 #include "../config.h"
 #ifdef HAVE_GUI
diff -up gpsim-0.22.0/gui/gui_symbols.cc.std gpsim-0.22.0/gui/gui_symbols.cc
--- gpsim-0.22.0/gui/gui_symbols.cc.std	2008-09-06 16:26:48.000000000 +0300
+++ gpsim-0.22.0/gui/gui_symbols.cc	2008-09-06 16:27:19.000000000 +0300
@@ -23,6 +23,8 @@ Boston, MA 02111-1307, USA.  */
 #include <stdlib.h>
 #include <errno.h>
 
+#include <typeinfo>
+
 #include "../config.h"
 #ifdef HAVE_GUI
 
diff -up gpsim-0.22.0/gui/settings_exdbm.cc.std gpsim-0.22.0/gui/settings_exdbm.cc
--- gpsim-0.22.0/gui/settings_exdbm.cc.std	2008-09-06 16:30:43.000000000 +0300
+++ gpsim-0.22.0/gui/settings_exdbm.cc	2008-09-06 16:32:10.000000000 +0300
@@ -20,7 +20,7 @@ the Free Software Foundation, 59 Temple 
 Boston, MA 02111-1307, USA.  */
 
 #include "settings_exdbm.h"
-
+#include <cstdlib>
 
 SettingsEXdbm::SettingsEXdbm(const char *appl_name)
 {
diff -up gpsim-0.22.0/modules/switch.cc.std gpsim-0.22.0/modules/switch.cc
--- gpsim-0.22.0/modules/switch.cc.std	2008-09-06 17:50:46.000000000 +0300
+++ gpsim-0.22.0/modules/switch.cc	2008-09-06 17:51:04.000000000 +0300
@@ -30,6 +30,7 @@ Boston, MA 02111-1307, USA.  */
 /* IN_MODULE should be defined for modules */
 #define IN_MODULE
 
+#include <typeinfo>
 #include <time.h>
 #include <stdio.h>
 
diff -up gpsim-0.22.0/src/gpsim_object.cc.std gpsim-0.22.0/src/gpsim_object.cc
--- gpsim-0.22.0/src/gpsim_object.cc.std	2008-09-06 16:40:43.000000000 +0300
+++ gpsim-0.22.0/src/gpsim_object.cc	2008-09-06 16:41:11.000000000 +0300
@@ -21,6 +21,7 @@ Boston, MA 02111-1307, USA.  */
 
 
 #include <typeinfo>
+#include <cstring>
 #include <stdio.h>
 #include <ctype.h>
 #include "gpsim_object.h"
diff -up gpsim-0.22.0/src/modules.cc.std gpsim-0.22.0/src/modules.cc
--- gpsim-0.22.0/src/modules.cc.std	2008-09-06 16:44:14.000000000 +0300
+++ gpsim-0.22.0/src/modules.cc	2008-09-06 16:44:50.000000000 +0300
@@ -25,6 +25,7 @@ Boston, MA 02111-1307, USA.  */
 #include <ctype.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <typeinfo>
 #include <string>
 #include <list>
 #include <vector>
diff -up gpsim-0.22.0/src/modules.h.std gpsim-0.22.0/src/modules.h
--- gpsim-0.22.0/src/modules.h.std	2008-09-06 16:20:22.000000000 +0300
+++ gpsim-0.22.0/src/modules.h	2008-09-06 16:33:47.000000000 +0300
@@ -35,6 +35,8 @@ Boston, MA 02111-1307, USA.  */
 #include <string>
 #include <map>
 #include <vector>
+#include <cstdlib>
+#include <cstring>
 #include <assert.h>
 
 #include "gpsim_object.h"
diff -up gpsim-0.22.0/src/operator.cc.std gpsim-0.22.0/src/operator.cc
--- gpsim-0.22.0/src/operator.cc.std	2008-09-06 17:04:45.000000000 +0300
+++ gpsim-0.22.0/src/operator.cc	2008-09-06 17:20:15.000000000 +0300
@@ -1,3 +1,4 @@
+#include <typeinfo>
 #include <iostream>
 
 #include "operator.h"
diff -up gpsim-0.22.0/src/processor.cc.std gpsim-0.22.0/src/processor.cc
--- gpsim-0.22.0/src/processor.cc.std	2008-09-06 16:48:42.000000000 +0300
+++ gpsim-0.22.0/src/processor.cc	2008-09-06 16:49:08.000000000 +0300
@@ -26,6 +26,7 @@ Boston, MA 02111-1307, USA.  */
 
 */
 
+#include <typeinfo>
 #include <stdio.h>
 #ifdef _WIN32
 #include "uxtime.h"
diff -u --recursive gpsim-0.22.0-orig/src/processor.h gpsim-0.22.0/src/processor.h
--- gpsim-0.22.0-orig/src/processor.h	2006-10-18 20:16:30.000000000 -0400
+++ gpsim-0.22.0/src/processor.h	2008-05-29 22:04:31.000000000 -0400
@@ -395,7 +395,7 @@
   /// (for those processors that support interrupts), the processor is
   /// in a different 'state' then when the interrupt flag is cleared.
 
-  list<ProgramMemoryAccess *> pma_context;
+  std::list<ProgramMemoryAccess *> pma_context;
 
   /// Tracing
   /// The readTT and writeTT are TraceType objects for tracing
diff -up gpsim-0.22.0/src/symbol.cc.std gpsim-0.22.0/src/symbol.cc
--- gpsim-0.22.0/src/symbol.cc.std	2008-09-06 16:50:23.000000000 +0300
+++ gpsim-0.22.0/src/symbol.cc	2008-09-06 16:51:18.000000000 +0300
@@ -27,6 +27,7 @@ Boston, MA 02111-1307, USA.  */
 //
 #include "symbol.h"
 
+#include <typeinfo>
 #include <iostream>
 #include <iomanip>
 #include <sstream>
diff -up gpsim-0.22.0/src/value.cc.std gpsim-0.22.0/src/value.cc
--- gpsim-0.22.0/src/value.cc.std	2008-09-06 17:20:33.000000000 +0300
+++ gpsim-0.22.0/src/value.cc	2008-09-06 17:20:43.000000000 +0300
@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #include <stdio.h>
 #include <iostream>
 #include <iomanip>
+#include <typeinfo>
 
 #include "processor.h"
 
diff -up gpsim-0.22.0/src/value.h.std gpsim-0.22.0/src/value.h
--- gpsim-0.22.0/src/value.h.std	2008-09-06 15:58:38.000000000 +0300
+++ gpsim-0.22.0/src/value.h	2008-09-06 16:08:24.000000000 +0300
@@ -21,6 +21,7 @@ Boston, MA 02111-1307, USA.  */
 #ifndef __VALUE_H__
 #define __VALUE_H__
 
+#include <cstring>
 #include "gpsim_object.h"
 #include <glib.h>
 


Index: gpsim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsim/devel/gpsim.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gpsim.spec	19 Feb 2008 01:36:17 -0000	1.17
+++ gpsim.spec	7 Sep 2008 19:31:25 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		gpsim
 Version:	0.22.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)
 
@@ -8,6 +8,7 @@
 License:	GPLv2+
 URL:		http://www.dattalo.com/gnupic/gpsim.html
 Source:		http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
+Patch0:		gpsim-0.22.0-gcc43.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel, popt-devel
@@ -43,6 +44,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gcc43
 
 %build
 %configure
@@ -80,6 +82,10 @@
 %{_includedir}/*
 
 %changelog
+* Sun Sep 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.22.0-7
+- Fix build with GCC 4.3 (#434061), patch by Vasile Gaburici, simpler fix for
+  the "list" name conflict from the Debian patch
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.22.0-6
 - Autorebuild for GCC 4.3
 


--- gpsim-0.21.11.happy_gcc DELETED ---


--- gpsim-0.21.11.ktechlab.patch DELETED ---



From kkofler at fedoraproject.org  Sun Sep  7 19:45:26 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  7 Sep 2008 19:45:26 +0000 (UTC)
Subject: rpms/gpsim/devel gpsim-0.22.0-acinclude.patch, NONE, 1.1 gpsim.spec,
	1.18, 1.19
Message-ID: <20080907194526.E91C670126@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/gpsim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28881/devel

Modified Files:
	gpsim.spec 
Added Files:
	gpsim-0.22.0-acinclude.patch 
Log Message:
- PPC build fix (acinclude readline problem) by Mamoru Tasaka

gpsim-0.22.0-acinclude.patch:

--- NEW FILE gpsim-0.22.0-acinclude.patch ---
--- gpsim-0.22.0/acinclude.m4.debug	2006-11-02 14:43:21.000000000 +0900
+++ gpsim-0.22.0/acinclude.m4	2008-09-07 14:57:46.000000000 +0900
@@ -54,18 +54,6 @@
 dnl AC_CHECK_FUNC(rl_completion_append_character, [wi_cv_lib_readline=yes],[
 dnl 	wi_cv_lib_readline=no;wi_cv_lib_readline_result="no (it is present but too old to use)"
 dnl ])
-	AC_TRY_LINK([
-		/* includes */
-	],[
-		/* function-body */
-		readline(0);
-		rl_completion_append_character(0);
-	],[
-		wi_cv_lib_readline=yes
-	],[
-		wi_cv_lib_readline=no
-		wi_cv_lib_readline_result="no (it is present but too old to use)"
-	])
 
 if test "$wi_cv_lib_readline" = no ; then
 	LIBREADLINE=""


Index: gpsim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsim/devel/gpsim.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gpsim.spec	7 Sep 2008 19:31:25 -0000	1.18
+++ gpsim.spec	7 Sep 2008 19:44:56 -0000	1.19
@@ -9,9 +9,11 @@
 URL:		http://www.dattalo.com/gnupic/gpsim.html
 Source:		http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
 Patch0:		gpsim-0.22.0-gcc43.patch
+Patch1:		gpsim-0.22.0-acinclude.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel, popt-devel
+BuildRequires:	autoconf
 
 %description
 gpsim is a simulator for Microchip (TM) PIC (TM) microcontrollers.
@@ -45,6 +47,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .gcc43
+%patch1 -p1 -b .acinclude
+autoconf
 
 %build
 %configure
@@ -85,6 +89,7 @@
 * Sun Sep 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.22.0-7
 - Fix build with GCC 4.3 (#434061), patch by Vasile Gaburici, simpler fix for
   the "list" name conflict from the Debian patch
+- PPC build fix (acinclude readline problem) by Mamoru Tasaka
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.22.0-6
 - Autorebuild for GCC 4.3



From pgordon at fedoraproject.org  Sun Sep  7 19:51:34 2008
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Sun,  7 Sep 2008 19:51:34 +0000 (UTC)
Subject: rpms/deluge/devel .cvsignore, 1.39, 1.40 deluge.spec, 1.62,
	1.63 sources, 1.39, 1.40
Message-ID: <20080907195134.3DA8D70126@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29413

Modified Files:
	.cvsignore deluge.spec sources 
Log Message:
Upgrade to 1.0.0 RC8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	23 Aug 2008 02:19:21 -0000	1.39
+++ .cvsignore	7 Sep 2008 19:51:03 -0000	1.40
@@ -1 +1 @@
-deluge-0.9.07.tar.bz2
+deluge-0.9.08.tar.bz2


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- deluge.spec	23 Aug 2008 02:19:21 -0000	1.62
+++ deluge.spec	7 Sep 2008 19:51:03 -0000	1.63
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		deluge
-Version:	0.9.07
+Version:	0.9.08
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
@@ -70,9 +70,6 @@
 ## this time.
 CFLAGS="%{optflags}" %{__python} setup.py build
 
-## Finally, make the state_upgrade script executable...
-chmod a+x deluge/scripts/state_upgrade.py
-
 
 %install
 rm -rf %{buildroot}
@@ -92,8 +89,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog deluge/scripts/state_upgrade.py deluge/ui/webui/LICENSE
-%doc deluge/ui/webui/TODO
+%doc deluge/ui/webui/LICENSE deluge/ui/webui/TODO
 %{python_sitearch}/%{name}/
 %{python_sitearch}/%{name}-%{version}-py2.5.egg-info
 %{_bindir}/%{name}
@@ -121,7 +117,13 @@
 
 
 %changelog
-* Wed Aug 13 2008 Peter Gordon <peter at thecodergeek.com> - 0.9.06-1
+* Sun Sep 07 2008 Peter Gordon <peter at thecodergeek.com> - 0.9.08-1
+- Update to new upstream release candidate (1.0.0 RC8)
+- Drop state_upgrade script from the documentation. (This is now handled
+  automatically.)
+- Fix version in previous %%changelog entry.
+
+* Wed Aug 13 2008 Peter Gordon <peter at thecodergeek.com> - 0.9.07-1
 - Update to new upstream release candidate (1.0.0 RC7)
 - Drop desktop file icon name hack (fixed upstream).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	23 Aug 2008 02:19:21 -0000	1.39
+++ sources	7 Sep 2008 19:51:03 -0000	1.40
@@ -1 +1 @@
-df4ae706d6b3701541a82403538c25e7  deluge-0.9.07.tar.bz2
+747ef3ef80fa1138f0521ed5edc95184  deluge-0.9.08.tar.bz2



From vpv at fedoraproject.org  Sun Sep  7 20:01:04 2008
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Sun,  7 Sep 2008 20:01:04 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.89,1.90
Message-ID: <20080907200104.0BC4270126@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30379

Modified Files:
	comps-f10.xml.in 
Log Message:
Add mozvoikko as optional to Finnish support


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- comps-f10.xml.in	5 Sep 2008 23:34:52 -0000	1.89
+++ comps-f10.xml.in	7 Sep 2008 20:00:33 -0000	1.90
@@ -1342,6 +1342,7 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-voikko</packagereq>
       <packagereq type="default">enchant-voikko</packagereq>
       <packagereq type="optional">tmispell-voikko</packagereq>
+      <packagereq type="optional">mozvoikko</packagereq>
     </packagelist>
   </group>
   <group>



From robert at fedoraproject.org  Sun Sep  7 20:03:16 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  7 Sep 2008 20:03:16 +0000 (UTC)
Subject: rpms/bitlbee/EL-4 .cvsignore, 1.6, 1.7 bitlbee.spec, 1.6,
	1.7 sources, 1.6, 1.7 bitlbee-1.2.2-gaccess.patch, 1.1, NONE
Message-ID: <20080907200316.0A1A770126@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30711/EL-4

Modified Files:
	.cvsignore bitlbee.spec sources 
Removed Files:
	bitlbee-1.2.2-gaccess.patch 
Log Message:
Upgrade to 1.2.3 (#461424)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/EL-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Aug 2008 18:37:26 -0000	1.6
+++ .cvsignore	7 Sep 2008 20:02:45 -0000	1.7
@@ -1 +1 @@
-bitlbee-1.2.2.tar.gz
+bitlbee-1.2.3.tar.gz


Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/EL-4/bitlbee.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bitlbee.spec	27 Aug 2008 18:37:27 -0000	1.6
+++ bitlbee.spec	7 Sep 2008 20:02:45 -0000	1.7
@@ -1,6 +1,6 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
-Version:           1.2.2
+Version:           1.2.3
 Release:           1%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
@@ -8,7 +8,6 @@
 Source0:           http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
 Source1:           bitlbee.xinetd
 Patch0:            bitlbee-1.2.2-libresolv.patch
-Patch1:            bitlbee-1.2.2-gaccess.patch
 Requires:          xinetd
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
@@ -28,7 +27,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .libresolv
-%patch1 -p1 -b .gaccess
 
 perl -pi.make -e '
                 s|\$\(BINDIR\)|\$(sbindir)|g;
@@ -97,6 +95,9 @@
 %attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name}
 
 %changelog
+* Sun Sep 07 2008 Robert Scheck <robert at fedoraproject.org> 1.2.3-1
+- Upgrade to 1.2.3 (#461424)
+
 * Wed Aug 27 2008 Robert Scheck <robert at fedoraproject.org> 1.2.2-1
 - Upgrade to 1.2.2 (#460355)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/EL-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Aug 2008 18:37:27 -0000	1.6
+++ sources	7 Sep 2008 20:02:45 -0000	1.7
@@ -1 +1 @@
-d657a2d66f4098804e6b8f181cc0e852  bitlbee-1.2.2.tar.gz
+2b1674d98804970809de3da3edf0bed2  bitlbee-1.2.3.tar.gz


--- bitlbee-1.2.2-gaccess.patch DELETED ---



From robert at fedoraproject.org  Sun Sep  7 20:03:16 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  7 Sep 2008 20:03:16 +0000 (UTC)
Subject: rpms/bitlbee/EL-5 .cvsignore, 1.6, 1.7 bitlbee.spec, 1.6,
	1.7 sources, 1.6, 1.7 bitlbee-1.2.2-gaccess.patch, 1.1, NONE
Message-ID: <20080907200316.305FE70126@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30711/EL-5

Modified Files:
	.cvsignore bitlbee.spec sources 
Removed Files:
	bitlbee-1.2.2-gaccess.patch 
Log Message:
Upgrade to 1.2.3 (#461424)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Aug 2008 18:37:27 -0000	1.6
+++ .cvsignore	7 Sep 2008 20:02:45 -0000	1.7
@@ -1 +1 @@
-bitlbee-1.2.2.tar.gz
+bitlbee-1.2.3.tar.gz


Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/EL-5/bitlbee.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bitlbee.spec	27 Aug 2008 18:37:27 -0000	1.6
+++ bitlbee.spec	7 Sep 2008 20:02:45 -0000	1.7
@@ -1,6 +1,6 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
-Version:           1.2.2
+Version:           1.2.3
 Release:           1%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
@@ -8,7 +8,6 @@
 Source0:           http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
 Source1:           bitlbee.xinetd
 Patch0:            bitlbee-1.2.2-libresolv.patch
-Patch1:            bitlbee-1.2.2-gaccess.patch
 Requires:          xinetd
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
@@ -28,7 +27,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .libresolv
-%patch1 -p1 -b .gaccess
 
 perl -pi.make -e '
                 s|\$\(BINDIR\)|\$(sbindir)|g;
@@ -97,6 +95,9 @@
 %attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name}
 
 %changelog
+* Sun Sep 07 2008 Robert Scheck <robert at fedoraproject.org> 1.2.3-1
+- Upgrade to 1.2.3 (#461424)
+
 * Wed Aug 27 2008 Robert Scheck <robert at fedoraproject.org> 1.2.2-1
 - Upgrade to 1.2.2 (#460355)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Aug 2008 18:37:27 -0000	1.6
+++ sources	7 Sep 2008 20:02:45 -0000	1.7
@@ -1 +1 @@
-d657a2d66f4098804e6b8f181cc0e852  bitlbee-1.2.2.tar.gz
+2b1674d98804970809de3da3edf0bed2  bitlbee-1.2.3.tar.gz


--- bitlbee-1.2.2-gaccess.patch DELETED ---



From robert at fedoraproject.org  Sun Sep  7 20:03:16 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  7 Sep 2008 20:03:16 +0000 (UTC)
Subject: rpms/bitlbee/F-9 .cvsignore, 1.6, 1.7 bitlbee.spec, 1.7, 1.8 sources,
	1.6, 1.7 bitlbee-1.2.2-gaccess.patch, 1.1, NONE
Message-ID: <20080907200316.B103B70126@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30711/F-9

Modified Files:
	.cvsignore bitlbee.spec sources 
Removed Files:
	bitlbee-1.2.2-gaccess.patch 
Log Message:
Upgrade to 1.2.3 (#461424)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Aug 2008 18:37:28 -0000	1.6
+++ .cvsignore	7 Sep 2008 20:02:46 -0000	1.7
@@ -1 +1 @@
-bitlbee-1.2.2.tar.gz
+bitlbee-1.2.3.tar.gz


Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-9/bitlbee.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bitlbee.spec	27 Aug 2008 18:37:28 -0000	1.7
+++ bitlbee.spec	7 Sep 2008 20:02:46 -0000	1.8
@@ -1,6 +1,6 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
-Version:           1.2.2
+Version:           1.2.3
 Release:           1%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
@@ -8,7 +8,6 @@
 Source0:           http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
 Source1:           bitlbee.xinetd
 Patch0:            bitlbee-1.2.2-libresolv.patch
-Patch1:            bitlbee-1.2.2-gaccess.patch
 Requires:          xinetd
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
@@ -28,7 +27,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .libresolv
-%patch1 -p1 -b .gaccess
 
 perl -pi.make -e '
                 s|\$\(BINDIR\)|\$(sbindir)|g;
@@ -97,6 +95,9 @@
 %attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name}
 
 %changelog
+* Sun Sep 07 2008 Robert Scheck <robert at fedoraproject.org> 1.2.3-1
+- Upgrade to 1.2.3 (#461424)
+
 * Wed Aug 27 2008 Robert Scheck <robert at fedoraproject.org> 1.2.2-1
 - Upgrade to 1.2.2 (#460355)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Aug 2008 18:37:28 -0000	1.6
+++ sources	7 Sep 2008 20:02:46 -0000	1.7
@@ -1 +1 @@
-d657a2d66f4098804e6b8f181cc0e852  bitlbee-1.2.2.tar.gz
+2b1674d98804970809de3da3edf0bed2  bitlbee-1.2.3.tar.gz


--- bitlbee-1.2.2-gaccess.patch DELETED ---



From robert at fedoraproject.org  Sun Sep  7 20:03:16 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  7 Sep 2008 20:03:16 +0000 (UTC)
Subject: rpms/bitlbee/F-8 .cvsignore, 1.6, 1.7 bitlbee.spec, 1.6, 1.7 sources,
	1.6, 1.7 bitlbee-1.2.2-gaccess.patch, 1.1, NONE
Message-ID: <20080907200316.764C470126@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30711/F-8

Modified Files:
	.cvsignore bitlbee.spec sources 
Removed Files:
	bitlbee-1.2.2-gaccess.patch 
Log Message:
Upgrade to 1.2.3 (#461424)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-8/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Aug 2008 18:37:28 -0000	1.6
+++ .cvsignore	7 Sep 2008 20:02:46 -0000	1.7
@@ -1 +1 @@
-bitlbee-1.2.2.tar.gz
+bitlbee-1.2.3.tar.gz


Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-8/bitlbee.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bitlbee.spec	27 Aug 2008 18:37:28 -0000	1.6
+++ bitlbee.spec	7 Sep 2008 20:02:46 -0000	1.7
@@ -1,6 +1,6 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
-Version:           1.2.2
+Version:           1.2.3
 Release:           1%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
@@ -8,7 +8,6 @@
 Source0:           http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
 Source1:           bitlbee.xinetd
 Patch0:            bitlbee-1.2.2-libresolv.patch
-Patch1:            bitlbee-1.2.2-gaccess.patch
 Requires:          xinetd
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
@@ -28,7 +27,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .libresolv
-%patch1 -p1 -b .gaccess
 
 perl -pi.make -e '
                 s|\$\(BINDIR\)|\$(sbindir)|g;
@@ -97,6 +95,9 @@
 %attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name}
 
 %changelog
+* Sun Sep 07 2008 Robert Scheck <robert at fedoraproject.org> 1.2.3-1
+- Upgrade to 1.2.3 (#461424)
+
 * Wed Aug 27 2008 Robert Scheck <robert at fedoraproject.org> 1.2.2-1
 - Upgrade to 1.2.2 (#460355)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Aug 2008 18:37:28 -0000	1.6
+++ sources	7 Sep 2008 20:02:46 -0000	1.7
@@ -1 +1 @@
-d657a2d66f4098804e6b8f181cc0e852  bitlbee-1.2.2.tar.gz
+2b1674d98804970809de3da3edf0bed2  bitlbee-1.2.3.tar.gz


--- bitlbee-1.2.2-gaccess.patch DELETED ---



From robert at fedoraproject.org  Sun Sep  7 20:03:16 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  7 Sep 2008 20:03:16 +0000 (UTC)
Subject: rpms/bitlbee/devel .cvsignore, 1.6, 1.7 bitlbee.spec, 1.7,
	1.8 sources, 1.6, 1.7 bitlbee-1.2.2-gaccess.patch, 1.1, NONE
Message-ID: <20080907200316.E5F9B70126@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30711/devel

Modified Files:
	.cvsignore bitlbee.spec sources 
Removed Files:
	bitlbee-1.2.2-gaccess.patch 
Log Message:
Upgrade to 1.2.3 (#461424)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Aug 2008 18:37:28 -0000	1.6
+++ .cvsignore	7 Sep 2008 20:02:46 -0000	1.7
@@ -1 +1 @@
-bitlbee-1.2.2.tar.gz
+bitlbee-1.2.3.tar.gz


Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/devel/bitlbee.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bitlbee.spec	27 Aug 2008 18:37:28 -0000	1.7
+++ bitlbee.spec	7 Sep 2008 20:02:46 -0000	1.8
@@ -1,6 +1,6 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
-Version:           1.2.2
+Version:           1.2.3
 Release:           1%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
@@ -8,7 +8,6 @@
 Source0:           http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
 Source1:           bitlbee.xinetd
 Patch0:            bitlbee-1.2.2-libresolv.patch
-Patch1:            bitlbee-1.2.2-gaccess.patch
 Requires:          xinetd
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
@@ -28,7 +27,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .libresolv
-%patch1 -p1 -b .gaccess
 
 perl -pi.make -e '
                 s|\$\(BINDIR\)|\$(sbindir)|g;
@@ -97,6 +95,9 @@
 %attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name}
 
 %changelog
+* Sun Sep 07 2008 Robert Scheck <robert at fedoraproject.org> 1.2.3-1
+- Upgrade to 1.2.3 (#461424)
+
 * Wed Aug 27 2008 Robert Scheck <robert at fedoraproject.org> 1.2.2-1
 - Upgrade to 1.2.2 (#460355)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Aug 2008 18:37:28 -0000	1.6
+++ sources	7 Sep 2008 20:02:46 -0000	1.7
@@ -1 +1 @@
-d657a2d66f4098804e6b8f181cc0e852  bitlbee-1.2.2.tar.gz
+2b1674d98804970809de3da3edf0bed2  bitlbee-1.2.3.tar.gz


--- bitlbee-1.2.2-gaccess.patch DELETED ---



From s4504kr at fedoraproject.org  Sun Sep  7 20:06:36 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Sun,  7 Sep 2008 20:06:36 +0000 (UTC)
Subject: rpms/highlight/devel .cvsignore, 1.18, 1.19 highlight.spec, 1.32,
	1.33 sources, 1.19, 1.20 highlight-2.6.11-gcc43.patch, 1.1, NONE
Message-ID: <20080907200636.604E770126@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31474

Modified Files:
	.cvsignore highlight.spec sources 
Removed Files:
	highlight-2.6.11-gcc43.patch 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	17 Jul 2008 15:31:25 -0000	1.18
+++ .cvsignore	7 Sep 2008 20:06:05 -0000	1.19
@@ -1 +1 @@
-highlight-2.6.11.tar.gz
+highlight-2.6.12.tar.gz


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- highlight.spec	17 Jul 2008 15:31:25 -0000	1.32
+++ highlight.spec	7 Sep 2008 20:06:06 -0000	1.33
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.6.11
+Version:	2.6.12
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -9,7 +9,8 @@
 URL:		http://www.andre-simon.de/
 Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
 Patch1:		highlight-2.6.11-makefile.patch
-Patch3:         highlight-2.6.11-gcc43.patch
+
+BuildRequires:	wxGTK-devel
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -24,7 +25,6 @@
 %prep
 %setup -q
 %patch1 -p1 -b .mak
-%patch3 -p1 -b .gcc43
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Mon Aug 18 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.12-1
+- New upstream release
+
 * Thu Jul 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.11-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	17 Jul 2008 15:31:25 -0000	1.19
+++ sources	7 Sep 2008 20:06:06 -0000	1.20
@@ -1 +1 @@
-9bc25b076d90b5e0be5df5617e753fc9  highlight-2.6.11.tar.gz
+5ab9c50e537c199f359a7d9610aacc7f  highlight-2.6.12.tar.gz


--- highlight-2.6.11-gcc43.patch DELETED ---



From s4504kr at fedoraproject.org  Sun Sep  7 20:14:49 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Sun,  7 Sep 2008 20:14:49 +0000 (UTC)
Subject: rpms/blender/devel blender.spec,1.81,1.82 sources,1.17,1.18
Message-ID: <20080907201449.9E20070126@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32263

Modified Files:
	blender.spec sources 
Log Message:
New upstream release


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- blender.spec	14 Aug 2008 15:44:37 -0000	1.81
+++ blender.spec	7 Sep 2008 20:14:19 -0000	1.82
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.47
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -12,11 +12,11 @@
 URL:            http://www.blender.org
 # During a Legel issue (#239476) the package contains a cusromized
 # source package created as fellow.
-# svn co https://svn.blender.org/svnroot/bf-blender/tags/blender-2-47-release
-# cd blender-2-47-release/extern
-# rm -rf blender/extern/ffmpeg
+# wget http://download.blender.org/sorce/blender-2.47.tar.gz
+# cd blender-2-47/extern
+# rm -rf ffmpeg libmp3lame
 # cd ../..
-# tar -zcf blender-2.47-noffmpeg.tar.gz blender-2-47-release/
+# tar -zcf blender-2.47-noffmpeg.tar.gz blender-2-47/
 Source0:	blender-%{version}-noffmpeg.tar.gz
 Source1:        http://bane.servebeer.com/programming/blender/import-3ds-0.7.py
 Source2:        http://bane.servebeer.com/programming/blender/export-3ds-0.71.py


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	14 Aug 2008 15:44:37 -0000	1.17
+++ sources	7 Sep 2008 20:14:19 -0000	1.18
@@ -1 +1 @@
-8e5dae5caf72eff6b74cf64c4a7643c0  blender-2.47-noffmpeg.tar.gz
+d4b24d8fed319096802c817a496f60e3  blender-2.47-noffmpeg.tar.gz



From pawsa at fedoraproject.org  Sun Sep  7 20:16:41 2008
From: pawsa at fedoraproject.org (Pawel Salek)
Date: Sun,  7 Sep 2008 20:16:41 +0000 (UTC)
Subject: rpms/balsa/devel .cvsignore, 1.27, 1.28 balsa.spec, 1.41,
	1.42 sources, 1.27, 1.28
Message-ID: <20080907201641.2871B70126@cvs1.fedora.phx.redhat.com>

Author: pawsa

Update of /cvs/pkgs/rpms/balsa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32592

Modified Files:
	.cvsignore balsa.spec sources 
Log Message:
- update to upstream 2.3.26.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/balsa/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	18 Jun 2008 16:43:52 -0000	1.27
+++ .cvsignore	7 Sep 2008 20:16:10 -0000	1.28
@@ -1 +1 @@
-balsa-2.3.25.tar.bz2
+balsa-2.3.26.tar.bz2


Index: balsa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- balsa.spec	14 Jul 2008 20:13:12 -0000	1.41
+++ balsa.spec	7 Sep 2008 20:16:10 -0000	1.42
@@ -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.3.25
-Release:        2%{?dist}
+Version:        2.3.26
+Release:        1%{?dist}
 Summary:        Mail Client
 
 Group:          Applications/Internet
@@ -50,7 +50,7 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf "$RPM_BUILD_ROOT"
 make install DESTDIR="$RPM_BUILD_ROOT"
 
 desktop-file-install $RPM_BUILD_ROOT%{_datadir}/applications/balsa.desktop \
@@ -59,6 +59,7 @@
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
         --copy-name-to-generic-name \
         --delete-original
+
 %find_lang %{name}
 
 %clean
@@ -101,6 +102,9 @@
 
 
 %changelog
+* Sun Sep 07 2008 Pawel Salek <pawsa at theochem.kth.se> - 2.3.26-1
+- update to upstream 2.3.26.
+
 * Mon Jul 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.3.25-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/balsa/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	18 Jun 2008 16:43:52 -0000	1.27
+++ sources	7 Sep 2008 20:16:10 -0000	1.28
@@ -1 +1 @@
-4885dcc60ca36b19a9a247c8f12d9af4  balsa-2.3.25.tar.bz2
+e2d59f88ab0c39ba49dac09a47531b70  balsa-2.3.26.tar.bz2



From pgordon at fedoraproject.org  Sun Sep  7 20:21:11 2008
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Sun,  7 Sep 2008 20:21:11 +0000 (UTC)
Subject: rpms/empathy pkg.acl,1.1,NONE
Message-ID: <20080907202111.6779E70126@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/empathy
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv773

Removed Files:
	pkg.acl 
Log Message:
Remove pkg.acl


--- pkg.acl DELETED ---



From pkgdb at fedoraproject.org  Sun Sep  7 20:27:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:27:05 +0000
Subject: [pkgdb] guidance-power-manager: tuxbrewr has requested watchbugzilla
Message-ID: <20080907202705.30D49208D07@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on guidance-power-manager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guidance-power-manager



From pkgdb at fedoraproject.org  Sun Sep  7 20:27:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:27:06 +0000
Subject: [pkgdb] guidance-power-manager: tuxbrewr has requested watchcommits
Message-ID: <20080907202706.559E7208D7C@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on guidance-power-manager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guidance-power-manager



From pkgdb at fedoraproject.org  Sun Sep  7 20:27:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:27:12 +0000
Subject: [pkgdb] guidance-power-manager: tuxbrewr has requested watchbugzilla
Message-ID: <20080907202712.C56DF20876F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on guidance-power-manager (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guidance-power-manager



From pkgdb at fedoraproject.org  Sun Sep  7 20:27:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:27:15 +0000
Subject: [pkgdb] guidance-power-manager: tuxbrewr has requested watchcommits
Message-ID: <20080907202715.6B339208D98@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on guidance-power-manager (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guidance-power-manager



From pkgdb at fedoraproject.org  Sun Sep  7 20:27:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:27:52 +0000
Subject: [pkgdb] k3b: tuxbrewr has requested watchbugzilla
Message-ID: <20080907202752.9A497208771@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on k3b (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/k3b



From pkgdb at fedoraproject.org  Sun Sep  7 20:27:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:27:54 +0000
Subject: [pkgdb] k3b: tuxbrewr has requested watchcommits
Message-ID: <20080907202754.3D0B5208D7C@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on k3b (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/k3b



From pkgdb at fedoraproject.org  Sun Sep  7 20:28:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:28:04 +0000
Subject: [pkgdb] k3b: tuxbrewr has requested watchbugzilla
Message-ID: <20080907202804.7D1F0208D99@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on k3b (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/k3b



From pkgdb at fedoraproject.org  Sun Sep  7 20:28:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:28:10 +0000
Subject: [pkgdb] k3b: tuxbrewr has requested watchcommits
Message-ID: <20080907202810.996BC208D07@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on k3b (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/k3b



From pkgdb at fedoraproject.org  Sun Sep  7 20:28:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:28:39 +0000
Subject: [pkgdb] k3b-extras: tuxbrewr has requested watchbugzilla
Message-ID: <20080907202839.E50FA208D0F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on k3b-extras (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/k3b-extras



From pkgdb at fedoraproject.org  Sun Sep  7 20:28:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:28:45 +0000
Subject: [pkgdb] k3b-extras: tuxbrewr has requested watchcommits
Message-ID: <20080907202845.18CCF208D07@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on k3b-extras (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/k3b-extras



From pkgdb at fedoraproject.org  Sun Sep  7 20:28:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:28:53 +0000
Subject: [pkgdb] k3b-extras: tuxbrewr has requested watchbugzilla
Message-ID: <20080907202853.9F7FD20876C@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on k3b-extras (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/k3b-extras



From pkgdb at fedoraproject.org  Sun Sep  7 20:28:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:28:57 +0000
Subject: [pkgdb] k3b-extras: tuxbrewr has requested watchcommits
Message-ID: <20080907202857.38178208D0F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on k3b-extras (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/k3b-extras



From s4504kr at fedoraproject.org  Sun Sep  7 20:29:15 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Sun,  7 Sep 2008 20:29:15 +0000 (UTC)
Subject: rpms/blender/devel blender.spec,1.82,1.83
Message-ID: <20080907202915.E475F70128@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1290

Modified Files:
	blender.spec 
Log Message:
Revoke changes for prerelease


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- blender.spec	7 Sep 2008 20:14:19 -0000	1.82
+++ blender.spec	7 Sep 2008 20:28:45 -0000	1.83
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.47
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -72,7 +72,7 @@
 available.
 
 %prep
-%setup -q -n blender-2-47-release
+%setup -q 
 %patch1 -p1 -b .org
 %patch2 -p1 -b .bid
 
@@ -179,6 +179,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Sun Sep  7 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.47-3
+- Fix prerelease SPEC file
+
 * Thu Aug 14 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.47-1
 - New upstream release
 



From pkgdb at fedoraproject.org  Sun Sep  7 20:29:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:29:35 +0000
Subject: [pkgdb] kaffeine: tuxbrewr has requested watchbugzilla
Message-ID: <20080907202935.1E3CD208D07@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kaffeine (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaffeine



From pkgdb at fedoraproject.org  Sun Sep  7 20:29:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:29:38 +0000
Subject: [pkgdb] kaffeine: tuxbrewr has requested watchcommits
Message-ID: <20080907202940.243B1208D9A@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kaffeine (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaffeine



From pkgdb at fedoraproject.org  Sun Sep  7 20:29:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:29:46 +0000
Subject: [pkgdb] kaffeine: tuxbrewr has requested watchbugzilla
Message-ID: <20080907202946.7266A20876C@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kaffeine (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaffeine



From pkgdb at fedoraproject.org  Sun Sep  7 20:29:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:29:48 +0000
Subject: [pkgdb] kaffeine: tuxbrewr has requested watchcommits
Message-ID: <20080907202948.55EEF208D9E@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kaffeine (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaffeine



From pkgdb at fedoraproject.org  Sun Sep  7 20:31:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:31:41 +0000
Subject: [pkgdb] kaider: tuxbrewr has requested watchbugzilla
Message-ID: <20080907203141.B73FA20876F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kaider (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaider



From pkgdb at fedoraproject.org  Sun Sep  7 20:31:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:31:43 +0000
Subject: [pkgdb] kaider: tuxbrewr has requested watchcommits
Message-ID: <20080907203143.A846B208D1E@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kaider (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaider



From pkgdb at fedoraproject.org  Sun Sep  7 20:31:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:31:47 +0000
Subject: [pkgdb] kaider: tuxbrewr has requested watchbugzilla
Message-ID: <20080907203147.DD062208D9C@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kaider (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaider



From pkgdb at fedoraproject.org  Sun Sep  7 20:31:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:31:52 +0000
Subject: [pkgdb] kaider: tuxbrewr has requested watchcommits
Message-ID: <20080907203152.72343208DA3@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kaider (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaider



From pkgdb at fedoraproject.org  Sun Sep  7 20:32:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:32:25 +0000
Subject: [pkgdb] kasablanca: tuxbrewr has requested watchbugzilla
Message-ID: <20080907203225.ECB88208D0F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kasablanca (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kasablanca



From pkgdb at fedoraproject.org  Sun Sep  7 20:32:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:32:28 +0000
Subject: [pkgdb] kasablanca: tuxbrewr has requested watchcommits
Message-ID: <20080907203228.8CFA9208D97@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kasablanca (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kasablanca



From pkgdb at fedoraproject.org  Sun Sep  7 20:32:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:32:37 +0000
Subject: [pkgdb] kasablanca: tuxbrewr has requested watchbugzilla
Message-ID: <20080907203237.2EC41208D9B@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kasablanca (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kasablanca



From pkgdb at fedoraproject.org  Sun Sep  7 20:32:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:32:38 +0000
Subject: [pkgdb] kasablanca: tuxbrewr has requested watchcommits
Message-ID: <20080907203238.EA0F2208D9F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kasablanca (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kasablanca



From pkgdb at fedoraproject.org  Sun Sep  7 20:33:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:33:29 +0000
Subject: [pkgdb] kcemirror: tuxbrewr has requested watchbugzilla
Message-ID: <20080907203330.4FADC208D98@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kcemirror (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcemirror



From pkgdb at fedoraproject.org  Sun Sep  7 20:33:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:33:33 +0000
Subject: [pkgdb] kcemirror: tuxbrewr has requested watchcommits
Message-ID: <20080907203333.387B2208D9A@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kcemirror (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcemirror



From pkgdb at fedoraproject.org  Sun Sep  7 20:33:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:33:42 +0000
Subject: [pkgdb] kcemirror: tuxbrewr has requested watchbugzilla
Message-ID: <20080907203342.58A66208DA0@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kcemirror (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcemirror



From pkgdb at fedoraproject.org  Sun Sep  7 20:33:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:33:46 +0000
Subject: [pkgdb] kcemirror: tuxbrewr has requested watchcommits
Message-ID: <20080907203346.C5F97208D1E@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kcemirror (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcemirror



From pkgdb at fedoraproject.org  Sun Sep  7 20:34:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:34:34 +0000
Subject: [pkgdb] kchmviewer: tuxbrewr has requested watchbugzilla
Message-ID: <20080907203434.36502208771@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kchmviewer (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From pkgdb at fedoraproject.org  Sun Sep  7 20:34:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:34:35 +0000
Subject: [pkgdb] kchmviewer: tuxbrewr has requested watchcommits
Message-ID: <20080907203435.E3F1D208D98@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kchmviewer (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From pkgdb at fedoraproject.org  Sun Sep  7 20:35:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:35:07 +0000
Subject: [pkgdb] kchmviewer: tuxbrewr has requested watchbugzilla
Message-ID: <20080907203508.1B33C20876E@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kchmviewer (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From pkgdb at fedoraproject.org  Sun Sep  7 20:35:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:35:09 +0000
Subject: [pkgdb] kchmviewer: tuxbrewr has requested watchcommits
Message-ID: <20080907203510.0125D208D0F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kchmviewer (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From pkgdb at fedoraproject.org  Sun Sep  7 20:37:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:37:08 +0000
Subject: [pkgdb] kcoloredit: tuxbrewr has requested watchbugzilla
Message-ID: <20080907203708.610FA20876D@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kcoloredit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcoloredit



From pkgdb at fedoraproject.org  Sun Sep  7 20:37:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:37:12 +0000
Subject: [pkgdb] kcoloredit: tuxbrewr has requested watchcommits
Message-ID: <20080907203712.172BC208D7C@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kcoloredit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcoloredit



From pkgdb at fedoraproject.org  Sun Sep  7 20:37:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:37:16 +0000
Subject: [pkgdb] kcoloredit: tuxbrewr has requested watchbugzilla
Message-ID: <20080907203717.077C4208D9F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kcoloredit (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcoloredit



From pkgdb at fedoraproject.org  Sun Sep  7 20:37:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:37:19 +0000
Subject: [pkgdb] kcoloredit: tuxbrewr has requested watchcommits
Message-ID: <20080907203719.C4DD5208DAB@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kcoloredit (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcoloredit



From pkgdb at fedoraproject.org  Sun Sep  7 20:38:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:38:06 +0000
Subject: [pkgdb] kdeaccessibility: tuxbrewr has requested watchbugzilla
Message-ID: <20080907203806.91222208D98@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdeaccessibility (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Sun Sep  7 20:38:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:38:09 +0000
Subject: [pkgdb] kdeaccessibility: tuxbrewr has requested watchcommits
Message-ID: <20080907203809.AC0A8208D9E@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdeaccessibility (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Sun Sep  7 20:38:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:38:17 +0000
Subject: [pkgdb] kdeaccessibility: tuxbrewr has requested watchbugzilla
Message-ID: <20080907203818.08566208DA3@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdeaccessibility (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Sun Sep  7 20:38:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:38:23 +0000
Subject: [pkgdb] kdeaccessibility: tuxbrewr has requested watchcommits
Message-ID: <20080907203823.7FBE7208DA8@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdeaccessibility (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From rrankin at fedoraproject.org  Sun Sep  7 20:39:59 2008
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Sun,  7 Sep 2008 20:39:59 +0000 (UTC)
Subject: rpms/gpsim/F-9 gpsim.spec,1.19,1.20
Message-ID: <20080907204000.0439470126@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/gpsim/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2325

Modified Files:
	gpsim.spec 
Log Message:
Patch for PPC build



Index: gpsim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsim/F-9/gpsim.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gpsim.spec	7 Sep 2008 13:05:19 -0000	1.19
+++ gpsim.spec	7 Sep 2008 20:39:29 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		gpsim
 Version:	0.22.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)
 
@@ -87,6 +87,9 @@
 %{_includedir}/*
 
 %changelog
+* Mon Sep 08 2008 Roy Rankin <rrankin at ihug.com.au> - 0.22.0-8
+Patch for PPC build
+
 * Sun Sep 07 2008 Roy Rankin <rrankin at ihug.com.au> - 0.22.0-7
 Patch for gcc 4.3.0
 



From pkgdb at fedoraproject.org  Sun Sep  7 20:40:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:40:04 +0000
Subject: [pkgdb] kdeaddons: tuxbrewr has requested watchbugzilla
Message-ID: <20080907204004.AEECC208770@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdeaddons (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaddons



From pkgdb at fedoraproject.org  Sun Sep  7 20:40:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:40:06 +0000
Subject: [pkgdb] kdeaddons: tuxbrewr has requested watchcommits
Message-ID: <20080907204006.8E9F2208D0F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdeaddons (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaddons



From pkgdb at fedoraproject.org  Sun Sep  7 20:40:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:40:20 +0000
Subject: [pkgdb] kdeaddons: tuxbrewr has requested watchbugzilla
Message-ID: <20080907204020.211A8208D7C@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdeaddons (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaddons



From pkgdb at fedoraproject.org  Sun Sep  7 20:40:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:40:22 +0000
Subject: [pkgdb] kdeaddons: tuxbrewr has requested watchcommits
Message-ID: <20080907204022.2F76B208D9A@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdeaddons (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaddons



From pkgdb at fedoraproject.org  Sun Sep  7 20:42:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:42:05 +0000
Subject: [pkgdb] kdeadmin: tuxbrewr has requested watchbugzilla
Message-ID: <20080907204205.714EB20876E@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdeadmin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From mclasen at fedoraproject.org  Sun Sep  7 20:42:10 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  7 Sep 2008 20:42:10 +0000 (UTC)
Subject: rpms/gcalctool/devel .cvsignore, 1.47, 1.48 gcalctool.spec, 1.72,
	1.73 sources, 1.48, 1.49
Message-ID: <20080907204210.BAB7670126@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gcalctool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2629

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	2 Sep 2008 23:31:39 -0000	1.47
+++ .cvsignore	7 Sep 2008 20:41:40 -0000	1.48
@@ -1 +1 @@
-gcalctool-5.23.91.tar.bz2
+gcalctool-5.23.92.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- gcalctool.spec	2 Sep 2008 23:31:39 -0000	1.72
+++ gcalctool.spec	7 Sep 2008 20:41:40 -0000	1.73
@@ -1,5 +1,5 @@
 Name:           gcalctool
-Version:        5.23.91
+Version:        5.23.92
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Matthias Clasen <mclasen at redhat.com> - 5.23.92-1
+- Update to 5.23.92
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 5.23.91-1
 - Update to 5.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	2 Sep 2008 23:31:39 -0000	1.48
+++ sources	7 Sep 2008 20:41:40 -0000	1.49
@@ -1 +1 @@
-2643852ed7956e7c5e6a6cfb88df26fe  gcalctool-5.23.91.tar.bz2
+06ef5f50a9c442b02dbacdf3a6ba901b  gcalctool-5.23.92.tar.bz2



From pkgdb at fedoraproject.org  Sun Sep  7 20:42:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:42:08 +0000
Subject: [pkgdb] kdeadmin: tuxbrewr has requested watchcommits
Message-ID: <20080907204208.80FED208D0F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdeadmin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Sun Sep  7 20:42:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:42:14 +0000
Subject: [pkgdb] kdeadmin: tuxbrewr has requested watchbugzilla
Message-ID: <20080907204214.BE380208D99@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdeadmin (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Sun Sep  7 20:42:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:42:16 +0000
Subject: [pkgdb] kdeadmin: tuxbrewr has requested watchcommits
Message-ID: <20080907204217.12571208D9C@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdeadmin (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Sun Sep  7 20:42:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:42:49 +0000
Subject: [pkgdb] kdeartwork: tuxbrewr has requested watchbugzilla
Message-ID: <20080907204249.718BD208771@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdeartwork (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Sun Sep  7 20:42:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:42:51 +0000
Subject: [pkgdb] kdeartwork: tuxbrewr has requested watchcommits
Message-ID: <20080907204251.BDA85208D7C@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdeartwork (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Sun Sep  7 20:42:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:42:57 +0000
Subject: [pkgdb] kdeartwork: tuxbrewr has requested watchbugzilla
Message-ID: <20080907204257.734A7208D9B@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdeartwork (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Sun Sep  7 20:43:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:43:02 +0000
Subject: [pkgdb] kdeartwork: tuxbrewr has requested watchcommits
Message-ID: <20080907204302.E1F40208D9F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdeartwork (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Sun Sep  7 20:43:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:43:29 +0000
Subject: [pkgdb] kdeartwork-extras: tuxbrewr has requested watchbugzilla
Message-ID: <20080907204329.C611E208771@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdeartwork-extras (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork-extras



From pkgdb at fedoraproject.org  Sun Sep  7 20:43:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:43:31 +0000
Subject: [pkgdb] kdeartwork-extras: tuxbrewr has requested watchcommits
Message-ID: <20080907204331.CF3E8208D1E@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdeartwork-extras (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork-extras



From pkgdb at fedoraproject.org  Sun Sep  7 20:43:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:43:43 +0000
Subject: [pkgdb] kdeartwork-extras: tuxbrewr has given up watchcommits
Message-ID: <20080907204343.9BF8B208D98@bastion.fedora.phx.redhat.com>

tuxbrewr has given up the watchcommits acl on kdeartwork-extras (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork-extras



From pkgdb at fedoraproject.org  Sun Sep  7 20:43:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 20:43:46 +0000
Subject: [pkgdb] kdeartwork-extras: tuxbrewr has requested watchcommits
Message-ID: <20080907204346.533B2208D9B@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdeartwork-extras (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork-extras



From mclasen at fedoraproject.org  Sun Sep  7 20:52:28 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  7 Sep 2008 20:52:28 +0000 (UTC)
Subject: rpms/poppler/devel .cvsignore, 1.30, 1.31 poppler.spec, 1.74,
	1.75 sources, 1.31, 1.32
Message-ID: <20080907205228.2878D70126@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/poppler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3430

Modified Files:
	.cvsignore poppler.spec sources 
Log Message:
0.8.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poppler/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	23 Aug 2008 04:03:47 -0000	1.30
+++ .cvsignore	7 Sep 2008 20:51:57 -0000	1.31
@@ -1 +1 @@
-poppler-0.8.6.tar.gz
+poppler-0.8.7.tar.gz


Index: poppler.spec
===================================================================
RCS file: /cvs/extras/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- poppler.spec	23 Aug 2008 04:03:47 -0000	1.74
+++ poppler.spec	7 Sep 2008 20:51:57 -0000	1.75
@@ -2,7 +2,7 @@
 
 Summary: PDF rendering library
 Name: poppler
-Version: 0.8.6
+Version: 0.8.7
 Release: 1%{?dist}
 License: GPLv2 and Redistributable, no modification permitted
 # the code is GPLv2
@@ -199,6 +199,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep  7 2008 Matthias Clasen <mclasen at redhat.com> - 0.8.7-1
+- Update to 0.8.7
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 0.8.6-1
 - Update to 0.8.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poppler/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	23 Aug 2008 04:03:47 -0000	1.31
+++ sources	7 Sep 2008 20:51:57 -0000	1.32
@@ -1,3 +1,3 @@
-6f2f5761ea06074d581951014b646372  poppler-0.8.6.tar.gz
+9af81429d6f8639c357a5eed25583365  poppler-0.8.7.tar.gz
 b7f98e84a4d2a2c794271d746ec7ee0b  poppler-data-0.2.0.tar.gz
 



From mclasen at fedoraproject.org  Sun Sep  7 21:15:38 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  7 Sep 2008 21:15:38 +0000 (UTC)
Subject: rpms/gnome-system-monitor/F-9 .cvsignore, 1.66,
	1.67 gnome-system-monitor.spec, 1.122, 1.123 sources, 1.66, 1.67
Message-ID: <20080907211538.B3F0770126@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-system-monitor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4959

Modified Files:
	.cvsignore gnome-system-monitor.spec sources 
Log Message:
2.22.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/F-9/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore	1 Jul 2008 15:20:56 -0000	1.66
+++ .cvsignore	7 Sep 2008 21:15:08 -0000	1.67
@@ -1 +1 @@
-gnome-system-monitor-2.22.3.tar.bz2
+gnome-system-monitor-2.22.4.tar.bz2


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/F-9/gnome-system-monitor.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- gnome-system-monitor.spec	1 Jul 2008 15:30:49 -0000	1.122
+++ gnome-system-monitor.spec	7 Sep 2008 21:15:08 -0000	1.123
@@ -12,7 +12,7 @@
 
 Summary: Simple process monitor
 Name: gnome-system-monitor
-Version: 2.22.3
+Version: 2.22.4
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -124,6 +124,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.4-1
+- Update to 2.22.4
+
 * Tue Jul  1 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.3-1
 - Update to 2.22.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/F-9/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	1 Jul 2008 15:20:56 -0000	1.66
+++ sources	7 Sep 2008 21:15:08 -0000	1.67
@@ -1 +1 @@
-06a162294f63cc7c931f78b73d4043b7  gnome-system-monitor-2.22.3.tar.bz2
+ac14b969d88446a88bbadf9d53007b58  gnome-system-monitor-2.22.4.tar.bz2



From denis at fedoraproject.org  Sun Sep  7 21:18:02 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Sun,  7 Sep 2008 21:18:02 +0000 (UTC)
Subject: rpms/cluttermm/devel .cvsignore, 1.2, 1.3 cluttermm.spec, 1.1,
	1.2 sources, 1.2, 1.3 cluttermm-0.5.1-apiver.patch, 1.1, NONE
Message-ID: <20080907211802.AF9EA70126@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/cluttermm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5322

Modified Files:
	.cvsignore cluttermm.spec sources 
Removed Files:
	cluttermm-0.5.1-apiver.patch 
Log Message:
- Update to upstream 0.7.3
- Cairo and gtk parts are forked into their own tarballs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluttermm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jun 2008 05:58:14 -0000	1.2
+++ .cvsignore	7 Sep 2008 21:17:32 -0000	1.3
@@ -1 +1 @@
-cluttermm-0.5.1.tar.bz2
+cluttermm-0.7.3.tar.bz2


Index: cluttermm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluttermm/devel/cluttermm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cluttermm.spec	6 Jun 2008 05:58:14 -0000	1.1
+++ cluttermm.spec	7 Sep 2008 21:17:32 -0000	1.2
@@ -1,20 +1,18 @@
 Name:           cluttermm
-Version:        0.5.1
-Release:        2%{?dist}
+Version:        0.7.3
+Release:        1%{?dist}
 
 Summary:        C++ wrapper for clutter library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.gtkmm.org/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/cluttermm/0.5/%{name}-%{version}.tar.bz2
-Patch0:         cluttermm-0.5.1-apiver.patch
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/cluttermm/0.7/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gtkmm24-devel >= 2.10.9
 BuildRequires: clutter-devel
-BuildRequires: clutter-cairo-devel
-BuildRequires: clutter-gtk-devel
+BuildRequires: glibmm24-devel >= 2.14
+BuildRequires: pangomm-devel >= 2.12
 BuildRequires: cairomm-devel
 BuildRequires: doxygen graphviz
 
@@ -37,53 +35,8 @@
 developing gstreamermm applications.
 
 
-%package cairo
-Summary:   C++ wrapper for clutter-cairo library
-Group:     Development/Languages
-Requires:  %{name} = %{version}-%{release}
-
-
-%description cairo
-This provides C++ bindings for the clutter-cairo library.
-
-
-%package cairo-devel
-Summary:   Cluttermm-cairo development environment
-Group:     Development/Libraries
-Requires:  %{name}-cairo = %{version}-%{release}
-Requires:  cluttermm-devel cairomm-devel pkgconfig
-
-
-%description cairo-devel
-Header files and libraries for building applications using the
-clutter-cairo C++ bindings.
-
-
-%package gtk
-Summary:   C++ wrapper for clutter-gtk library
-Group:     Development/Languages
-Requires:  %{name} = %{version}-%{release}
-
-
-%description gtk
-This provides C++ bindings for the clutter-gtk library
-
-
-%package gtk-devel
-Summary:   Cluttermm-gtk development environment
-Group:     Development/Libraries
-Requires:  %{name}-gtk = %{version}-%{release}
-Requires:  cluttermm-devel pkgconfig
-
-
-%description gtk-devel
-Header files and libraries for building applications using the
-clutter-gtk C++ bindings.
-
-
 %prep
 %setup -q
-%patch0 -p1 -b .apiver
 
 
 %build
@@ -96,9 +49,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 # Remove files related to code generation
-rm -rf $RPM_BUILD_ROOT%{_libdir}/cluttermm-0.6
-rm -rf $RPM_BUILD_ROOT%{_libdir}/cluttermm-cairo-0.6
-rm -rf $RPM_BUILD_ROOT%{_libdir}/cluttermm-gtk-0.6
+rm -rf $RPM_BUILD_ROOT%{_libdir}/cluttermm-0.8
 
 
 %clean
@@ -106,56 +57,30 @@
 
 
 %post -p /sbin/ldconfig
-%post cairo -p /sbin/ldconfig
-%post gtk -p /sbin/ldconfig
 
 
 %postun -p /sbin/ldconfig
-%postun cairo -p /sbin/ldconfig
-%postun gtk -p /sbin/ldconfig
 
 
 %files
 %defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{_libdir}/libcluttermm-0.6.so.*
+%{_libdir}/libcluttermm-0.8.so.*
 
 
 %files devel
 %defattr(-, root, root, -)
 %doc docs/reference/html/ examples/test-actors.cc
-%{_includedir}/cluttermm-0.6
-%{_libdir}/libcluttermm-0.6.so
-%{_libdir}/pkgconfig/cluttermm-0.6.pc
-
-
-%files cairo
-%defattr(-, root, root, -)
-%{_libdir}/libcluttermm-cairo-*.so.*
-
-
-%files cairo-devel
-%defattr(-, root, root, -)
-%doc examples/simple-cairo.cc examples/flowers.cc
-%{_includedir}/cluttermm-cairo-0.6
-%{_libdir}/libcluttermm-cairo-*.so
-%{_libdir}/pkgconfig/cluttermm-cairo-0.6.pc
-
-
-%files gtk
-%defattr(-, root, root, -)
-%{_libdir}/libcluttermm-gtk-*.so.*
-
-
-%files gtk-devel
-%defattr(-, root, root, -)
-%doc examples/embed-gtk.cc
-%{_includedir}/cluttermm-gtk-0.6
-%{_libdir}/libcluttermm-gtk-*.so
-%{_libdir}/pkgconfig/cluttermm-gtk-0.6.pc
+%{_includedir}/cluttermm-0.8
+%{_libdir}/libcluttermm-0.8.so
+%{_libdir}/pkgconfig/cluttermm-0.8.pc
 
 
 %changelog
+* Sun Sep  7 2008 Denis Leroy <denis at poolshark.org> - 0.7.3-1
+- Update to upstream 0.7.3
+- Cairo and gtk parts are forked into their own tarballs
+
 * Tue Jun  3 2008 Denis Leroy <denis at poolshark.org> - 0.5.1-2
 - fixed gtkmm BR
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluttermm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jun 2008 05:58:14 -0000	1.2
+++ sources	7 Sep 2008 21:17:32 -0000	1.3
@@ -1 +1 @@
-74ea582eccf312885bd190758018b5a2  cluttermm-0.5.1.tar.bz2
+4084298f0650b095f49e0f9b8355914a  cluttermm-0.7.3.tar.bz2


--- cluttermm-0.5.1-apiver.patch DELETED ---



From smilner at fedoraproject.org  Sun Sep  7 21:22:12 2008
From: smilner at fedoraproject.org (Steve Milner)
Date: Sun,  7 Sep 2008 21:22:12 +0000 (UTC)
Subject: rpms/python-virtualenv/devel import.log, NONE,
	1.1 python-virtualenv.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080907212212.4670570126@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-virtualenv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6519/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-virtualenv.spec 
Log Message:
Import of virtualenv source and spec.



--- NEW FILE import.log ---
python-virtualenv-1_2-1_fc9:HEAD:python-virtualenv-1.2-1.fc9.src.rpm:1220822452


--- NEW FILE python-virtualenv.spec ---
# sitelib for noarch packages
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-virtualenv
Version:        1.2
Release:        1%{?dist}
Summary:        Tool to create isolated Python environments

Group:          Development/Languages
License:        MIT
URL:            http://pypi.python.org/pypi/virtualenv
Source0:        http://pypi.python.org/packages/source/v/virtualenv/virtualenv-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, python-setuptools-devel


%description
virtualenv is a tool to create isolated Python environments. virtualenv
is a successor to workingenv, and an extension of virtual-python. It is
written by Ian Bicking, and sponsored by the Open Planning Project. It is
licensed under an MIT-style permissive license.


%prep
%setup -q -n virtualenv-%{version}
%{__sed} -i -e "s|#!/usr/bin/env python||" virtualenv.py 


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs/index.txt docs/license.txt PKG-INFO
# For noarch packages: sitelib
%{python_sitelib}/*
%attr(755,root,root) %{_bindir}/virtualenv
%exclude %{python_sitelib}/support-files


%changelog
* Sat Aug 30 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.2-1
- Updated for upstream release

* Fri Aug 29 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.1-3
- Updated from review notes

* Thu Aug 28 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.1-2
- Updated from review notes

* Tue Aug 26 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.1-1
- Initial Version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:29:55 -0000	1.1
+++ .cvsignore	7 Sep 2008 21:21:41 -0000	1.2
@@ -0,0 +1 @@
+virtualenv-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:29:55 -0000	1.1
+++ sources	7 Sep 2008 21:21:42 -0000	1.2
@@ -0,0 +1 @@
+7ad454e52f025cad631d03331ade4aaf  virtualenv-1.2.tar.gz



From pkgdb at fedoraproject.org  Sun Sep  7 21:28:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 21:28:14 +0000
Subject: [pkgdb] boinc-client had acl change status
Message-ID: <20080907212814.D849820876C@bastion.fedora.phx.redhat.com>

mjakubicek has set the watchbugzilla acl on boinc-client (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boinc-client



From pkgdb at fedoraproject.org  Sun Sep  7 21:28:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 21:28:17 +0000
Subject: [pkgdb] boinc-client had acl change status
Message-ID: <20080907212817.7C1D8208770@bastion.fedora.phx.redhat.com>

mjakubicek has set the watchcommits acl on boinc-client (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boinc-client



From pkgdb at fedoraproject.org  Sun Sep  7 21:28:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 21:28:31 +0000
Subject: [pkgdb] boinc-client had acl change status
Message-ID: <20080907212832.4F83F20876C@bastion.fedora.phx.redhat.com>

mjakubicek has set the approveacls acl on boinc-client (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boinc-client



From pkgdb at fedoraproject.org  Sun Sep  7 21:28:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 07 Sep 2008 21:28:25 +0000
Subject: [pkgdb] boinc-client had acl change status
Message-ID: <20080907212825.39D85208D0F@bastion.fedora.phx.redhat.com>

mjakubicek has set the commit acl on boinc-client (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boinc-client



From mschwendt at fedoraproject.org  Sun Sep  7 21:53:06 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun,  7 Sep 2008 21:53:06 +0000 (UTC)
Subject: extras-buildsys/server BuildMaster.py,1.35.2.1.4.3,1.35.2.1.4.4
Message-ID: <20080907215306.B575370126@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/server
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9457/server

Modified Files:
      Tag: Plague-0_4_5
	BuildMaster.py 
Log Message:
add an optional periodic database ping to keep e.g. mysql connection alive


Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.35.2.1.4.3
retrieving revision 1.35.2.1.4.4
diff -u -r1.35.2.1.4.3 -r1.35.2.1.4.4
--- BuildMaster.py	7 Sep 2008 17:05:46 -0000	1.35.2.1.4.3
+++ BuildMaster.py	7 Sep 2008 21:53:06 -0000	1.35.2.1.4.4
@@ -27,6 +27,19 @@
 from plague import DebugUtils
 
 
+class PeriodicJob():  # this is reused also by external patches
+    def __init__(self, interval = 0, func = None):
+        self.interval = interval
+        self.next = time.time()
+        self.func = func
+
+    def run(self):
+        if self.interval > 0 and time.time() > self.next:
+            self.next = time.time()+self.interval;
+            if self.func:
+                self.func()
+
+
 class BuildMaster(threading.Thread):
 
     MAX_CHECKOUT_JOBS = 5
@@ -65,12 +78,23 @@
         self._building_jobs = {}
         self._building_jobs_lock = threading.Lock()
 
+        self._db_ping_interval = 3600
+        if self._cfg.has_option('Database','ping_interval'):
+            self._db_ping_interval = self._cfg.get_int('Database','ping_interval')
+        self._db_ping_job = PeriodicJob(self._db_ping_interval,self._ping_db)
+
         threading.Thread.__init__(self)
         self.setName("BuildMaster")
 
     def _cleanup(self):
         del self._cursor, self._dbcx
 
+    def _ping_db(self):
+        try:
+            self._cursor.execute('SELECT uid FROM jobs LIMIT 1')
+        except StandardError, e:
+            print "DB Error: could not access jobs database. Reason: '%s'" % e
+
     def _requeue_interrupted_jobs(self):
         """ Restart interrupted jobs from our db. """
         self._cursor.execute("SELECT uid FROM jobs WHERE (status!='needsign' AND status!='failed' AND status!='finished') ORDER BY uid")
@@ -421,4 +445,6 @@
             while not self._have_work() and time.time() <= last_time + 5:
                 time.sleep(0.25)
 
+            self._db_ping_job.run()
+
         self._cleanup()



From mschwendt at fedoraproject.org  Sun Sep  7 21:53:36 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun,  7 Sep 2008 21:53:36 +0000 (UTC)
Subject: extras-buildsys ChangeLog,1.126.2.44.2.1.2.22,1.126.2.44.2.1.2.23
Message-ID: <20080907215336.7A98B70126@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9457

Modified Files:
      Tag: Plague-0_4_5
	ChangeLog 
Log Message:
add an optional periodic database ping to keep e.g. mysql connection alive


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.44.2.1.2.22
retrieving revision 1.126.2.44.2.1.2.23
diff -u -r1.126.2.44.2.1.2.22 -r1.126.2.44.2.1.2.23
--- ChangeLog	7 Sep 2008 17:05:45 -0000	1.126.2.44.2.1.2.22
+++ ChangeLog	7 Sep 2008 21:53:06 -0000	1.126.2.44.2.1.2.23
@@ -1,5 +1,10 @@
 2008-09-07  Michael Schwendt <mschwendt at fedoraproject.org>
 
+	* server/BuildMaster.py
+	  - Ping the database periodically. Configurable via option
+	    "ping_interval" (seconds) in section "Database".
+	    This is cheap way to work around MySQL idle disconnect.
+
 	* www/job.psp, server/DBManager.py, server/BuildMaster.py,
 	* server/PackageJob.py, server/UserInterface.py
 	  - Prefix jobs table columns "epoch", "version", "release"



From mschwendt at fedoraproject.org  Sun Sep  7 21:54:08 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun,  7 Sep 2008 21:54:08 +0000 (UTC)
Subject: extras-buildsys ChangeLog,1.126.2.44.2.1.2.23,1.126.2.44.2.1.2.24
Message-ID: <20080907215408.BB75770126@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9520

Modified Files:
      Tag: Plague-0_4_5
	ChangeLog 
Log Message:



Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.44.2.1.2.23
retrieving revision 1.126.2.44.2.1.2.24
diff -u -r1.126.2.44.2.1.2.23 -r1.126.2.44.2.1.2.24
--- ChangeLog	7 Sep 2008 21:53:06 -0000	1.126.2.44.2.1.2.23
+++ ChangeLog	7 Sep 2008 21:54:08 -0000	1.126.2.44.2.1.2.24
@@ -3,7 +3,7 @@
 	* server/BuildMaster.py
 	  - Ping the database periodically. Configurable via option
 	    "ping_interval" (seconds) in section "Database".
-	    This is cheap way to work around MySQL idle disconnect.
+	    This is a cheap way to work around MySQL idle disconnect.
 
 	* www/job.psp, server/DBManager.py, server/BuildMaster.py,
 	* server/PackageJob.py, server/UserInterface.py



From mschwendt at fedoraproject.org  Sun Sep  7 22:00:28 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun,  7 Sep 2008 22:00:28 +0000 (UTC)
Subject: extras-buildsys/server BuildMaster.py,1.35.2.1.4.4,1.35.2.1.4.5
Message-ID: <20080907220028.0D78370126@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/server
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9875/server

Modified Files:
      Tag: Plague-0_4_5
	BuildMaster.py 
Log Message:



Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.35.2.1.4.4
retrieving revision 1.35.2.1.4.5
diff -u -r1.35.2.1.4.4 -r1.35.2.1.4.5
--- BuildMaster.py	7 Sep 2008 21:53:06 -0000	1.35.2.1.4.4
+++ BuildMaster.py	7 Sep 2008 22:00:27 -0000	1.35.2.1.4.5
@@ -53,9 +53,9 @@
         self._cfg = cfg
 
         self._repos = {}
-        repodir = self._cfg.get_str("Directories", "repo_dir")
+        self._repodir = self._cfg.get_str("Directories", "repo_dir")
         for target_cfg in self._cfg.targets():
-            repo = Repo.Repo(target_cfg, repodir, builder_manager)
+            repo = Repo.Repo(target_cfg, self._repodir, builder_manager)
             target_str = target_cfg.target_string()
             self._repos[target_str] = repo
             repo.start()



From mschwendt at fedoraproject.org  Sun Sep  7 22:00:57 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun,  7 Sep 2008 22:00:57 +0000 (UTC)
Subject: extras-buildsys ChangeLog,1.126.2.44.2.1.2.24,1.126.2.44.2.1.2.25
Message-ID: <20080907220057.D365E70126@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9875

Modified Files:
      Tag: Plague-0_4_5
	ChangeLog 
Log Message:



Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.44.2.1.2.24
retrieving revision 1.126.2.44.2.1.2.25
diff -u -r1.126.2.44.2.1.2.24 -r1.126.2.44.2.1.2.25
--- ChangeLog	7 Sep 2008 21:54:08 -0000	1.126.2.44.2.1.2.24
+++ ChangeLog	7 Sep 2008 22:00:27 -0000	1.126.2.44.2.1.2.25
@@ -4,6 +4,7 @@
 	  - Ping the database periodically. Configurable via option
 	    "ping_interval" (seconds) in section "Database".
 	    This is a cheap way to work around MySQL idle disconnect.
+	  - Make repodir a member (_repodir).
 
 	* www/job.psp, server/DBManager.py, server/BuildMaster.py,
 	* server/PackageJob.py, server/UserInterface.py



From mdehaan at fedoraproject.org  Sun Sep  7 22:10:30 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Sun,  7 Sep 2008 22:10:30 +0000 (UTC)
Subject: rpms/cobbler/EL-4 .cvsignore, 1.40, 1.41 cobbler.spec, 1.50,
	1.51 sources, 1.48, 1.49
Message-ID: <20080907221030.DA9B870126@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10763/EL-4

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	5 Sep 2008 19:36:25 -0000	1.40
+++ .cvsignore	7 Sep 2008 22:10:00 -0000	1.41
@@ -37,3 +37,4 @@
 cobbler-1.2.0.tar.gz
 cobbler-1.2.1.tar.gz
 cobbler-1.2.2.tar.gz
+cobbler-1.2.3.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- cobbler.spec	5 Sep 2008 19:36:25 -0000	1.50
+++ cobbler.spec	7 Sep 2008 22:10:00 -0000	1.51
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.2
+Version: 1.2.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -217,6 +217,9 @@
 
 %changelog
 
+* Sun Sep 07 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.3-1
+- Upstream changes (see CHANGELOG)
+
 * Fri Sep 05 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.2-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	5 Sep 2008 19:36:25 -0000	1.48
+++ sources	7 Sep 2008 22:10:00 -0000	1.49
@@ -4,3 +4,4 @@
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
 2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
 df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz
+dac86d3a02e677da597a7ac00c51c889  cobbler-1.2.3.tar.gz



From mdehaan at fedoraproject.org  Sun Sep  7 22:10:31 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Sun,  7 Sep 2008 22:10:31 +0000 (UTC)
Subject: rpms/cobbler/EL-5 .cvsignore, 1.44, 1.45 cobbler.spec, 1.52,
	1.53 sources, 1.51, 1.52
Message-ID: <20080907221031.033F870126@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10763/EL-5

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	5 Sep 2008 19:36:26 -0000	1.44
+++ .cvsignore	7 Sep 2008 22:10:00 -0000	1.45
@@ -41,3 +41,4 @@
 cobbler-1.2.0.tar.gz
 cobbler-1.2.1.tar.gz
 cobbler-1.2.2.tar.gz
+cobbler-1.2.3.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- cobbler.spec	5 Sep 2008 19:36:26 -0000	1.52
+++ cobbler.spec	7 Sep 2008 22:10:00 -0000	1.53
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.2
+Version: 1.2.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -217,6 +217,9 @@
 
 %changelog
 
+* Sun Sep 07 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.3-1
+- Upstream changes (see CHANGELOG)
+
 * Fri Sep 05 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.2-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	5 Sep 2008 19:36:26 -0000	1.51
+++ sources	7 Sep 2008 22:10:00 -0000	1.52
@@ -4,3 +4,4 @@
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
 2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
 df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz
+dac86d3a02e677da597a7ac00c51c889  cobbler-1.2.3.tar.gz



From mdehaan at fedoraproject.org  Sun Sep  7 22:10:31 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Sun,  7 Sep 2008 22:10:31 +0000 (UTC)
Subject: rpms/cobbler/F-9 .cvsignore, 1.40, 1.41 cobbler.spec, 1.52,
	1.53 sources, 1.47, 1.48
Message-ID: <20080907221031.9E66570126@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10763/F-9

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	5 Sep 2008 19:36:28 -0000	1.40
+++ .cvsignore	7 Sep 2008 22:10:01 -0000	1.41
@@ -37,3 +37,4 @@
 cobbler-1.2.0.tar.gz
 cobbler-1.2.1.tar.gz
 cobbler-1.2.2.tar.gz
+cobbler-1.2.3.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/cobbler.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- cobbler.spec	5 Sep 2008 19:36:28 -0000	1.52
+++ cobbler.spec	7 Sep 2008 22:10:01 -0000	1.53
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.2
+Version: 1.2.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -217,6 +217,9 @@
 
 %changelog
 
+* Sun Sep 07 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.3-1
+- Upstream changes (see CHANGELOG)
+
 * Fri Sep 05 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.2-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	5 Sep 2008 19:36:28 -0000	1.47
+++ sources	7 Sep 2008 22:10:01 -0000	1.48
@@ -4,3 +4,4 @@
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
 2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
 df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz
+dac86d3a02e677da597a7ac00c51c889  cobbler-1.2.3.tar.gz



From mdehaan at fedoraproject.org  Sun Sep  7 22:10:31 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Sun,  7 Sep 2008 22:10:31 +0000 (UTC)
Subject: rpms/cobbler/F-7 .cvsignore, 1.40, 1.41 cobbler.spec, 1.50,
	1.51 sources, 1.48, 1.49
Message-ID: <20080907221031.3397C70126@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10763/F-7

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	5 Sep 2008 19:36:26 -0000	1.40
+++ .cvsignore	7 Sep 2008 22:10:00 -0000	1.41
@@ -37,3 +37,4 @@
 cobbler-1.2.0.tar.gz
 cobbler-1.2.1.tar.gz
 cobbler-1.2.2.tar.gz
+cobbler-1.2.3.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/cobbler.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- cobbler.spec	5 Sep 2008 19:36:27 -0000	1.50
+++ cobbler.spec	7 Sep 2008 22:10:01 -0000	1.51
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.2
+Version: 1.2.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -217,6 +217,9 @@
 
 %changelog
 
+* Sun Sep 07 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.3-1
+- Upstream changes (see CHANGELOG)
+
 * Fri Sep 05 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.2-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	5 Sep 2008 19:36:27 -0000	1.48
+++ sources	7 Sep 2008 22:10:01 -0000	1.49
@@ -4,3 +4,4 @@
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
 2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
 df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz
+dac86d3a02e677da597a7ac00c51c889  cobbler-1.2.3.tar.gz



From mdehaan at fedoraproject.org  Sun Sep  7 22:10:31 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Sun,  7 Sep 2008 22:10:31 +0000 (UTC)
Subject: rpms/cobbler/devel .cvsignore, 1.40, 1.41 cobbler.spec, 1.54,
	1.55 sources, 1.49, 1.50
Message-ID: <20080907221031.D52C470126@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10763/devel

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	5 Sep 2008 19:36:29 -0000	1.40
+++ .cvsignore	7 Sep 2008 22:10:01 -0000	1.41
@@ -37,3 +37,4 @@
 cobbler-1.2.0.tar.gz
 cobbler-1.2.1.tar.gz
 cobbler-1.2.2.tar.gz
+cobbler-1.2.3.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- cobbler.spec	5 Sep 2008 19:36:29 -0000	1.54
+++ cobbler.spec	7 Sep 2008 22:10:01 -0000	1.55
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.2
+Version: 1.2.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -217,6 +217,9 @@
 
 %changelog
 
+* Sun Sep 07 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.3-1
+- Upstream changes (see CHANGELOG)
+
 * Fri Sep 05 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.2-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	5 Sep 2008 19:36:29 -0000	1.49
+++ sources	7 Sep 2008 22:10:01 -0000	1.50
@@ -4,3 +4,4 @@
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
 2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
 df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz
+dac86d3a02e677da597a7ac00c51c889  cobbler-1.2.3.tar.gz



From mdehaan at fedoraproject.org  Sun Sep  7 22:10:31 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Sun,  7 Sep 2008 22:10:31 +0000 (UTC)
Subject: rpms/cobbler/F-8 .cvsignore, 1.40, 1.41 cobbler.spec, 1.49,
	1.50 sources, 1.48, 1.49
Message-ID: <20080907221031.6B51070126@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10763/F-8

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	5 Sep 2008 19:36:27 -0000	1.40
+++ .cvsignore	7 Sep 2008 22:10:01 -0000	1.41
@@ -37,3 +37,4 @@
 cobbler-1.2.0.tar.gz
 cobbler-1.2.1.tar.gz
 cobbler-1.2.2.tar.gz
+cobbler-1.2.3.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/cobbler.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- cobbler.spec	5 Sep 2008 19:36:27 -0000	1.49
+++ cobbler.spec	7 Sep 2008 22:10:01 -0000	1.50
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.2
+Version: 1.2.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -217,6 +217,9 @@
 
 %changelog
 
+* Sun Sep 07 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.3-1
+- Upstream changes (see CHANGELOG)
+
 * Fri Sep 05 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.2-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	5 Sep 2008 19:36:27 -0000	1.48
+++ sources	7 Sep 2008 22:10:01 -0000	1.49
@@ -4,3 +4,4 @@
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
 2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
 df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz
+dac86d3a02e677da597a7ac00c51c889  cobbler-1.2.3.tar.gz



From mschwendt at fedoraproject.org  Sun Sep  7 22:16:43 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun,  7 Sep 2008 22:16:43 +0000 (UTC)
Subject: extras-buildsys ChangeLog, 1.126.2.44.2.1.2.25,
	1.126.2.44.2.1.2.26 plague.spec, 1.27.2.5.2.1.2.6, 1.27.2.5.2.1.2.7
Message-ID: <20080907221643.51B1770126@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11590

Modified Files:
      Tag: Plague-0_4_5
	ChangeLog plague.spec 
Log Message:
tag 0.4.5.4


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.44.2.1.2.25
retrieving revision 1.126.2.44.2.1.2.26
diff -u -r1.126.2.44.2.1.2.25 -r1.126.2.44.2.1.2.26
--- ChangeLog	7 Sep 2008 22:00:27 -0000	1.126.2.44.2.1.2.25
+++ ChangeLog	7 Sep 2008 22:16:43 -0000	1.126.2.44.2.1.2.26
@@ -1,5 +1,7 @@
 2008-09-07  Michael Schwendt <mschwendt at fedoraproject.org>
 
+	* Release of 0.4.5.4
+
 	* server/BuildMaster.py
 	  - Ping the database periodically. Configurable via option
 	    "ping_interval" (seconds) in section "Database".


Index: plague.spec
===================================================================
RCS file: /cvs/fedora/extras-buildsys/plague.spec,v
retrieving revision 1.27.2.5.2.1.2.6
retrieving revision 1.27.2.5.2.1.2.7
diff -u -r1.27.2.5.2.1.2.6 -r1.27.2.5.2.1.2.7
--- plague.spec	5 Sep 2008 09:32:42 -0000	1.27.2.5.2.1.2.6
+++ plague.spec	7 Sep 2008 22:16:43 -0000	1.27.2.5.2.1.2.7
@@ -2,7 +2,7 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.3
+Version: 0.4.5.4
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools



From makghosh at fedoraproject.org  Sun Sep  7 22:27:13 2008
From: makghosh at fedoraproject.org (Arindam Ghosh)
Date: Sun,  7 Sep 2008 22:27:13 +0000 (UTC)
Subject: rpms/qps/devel import.log, NONE, 1.1 .cvsignore, 1.14, 1.15 qps.spec,
	1.16, 1.17 sources, 1.14, 1.15
Message-ID: <20080907222713.96BBF70126@cvs1.fedora.phx.redhat.com>

Author: makghosh

Update of /cvs/pkgs/rpms/qps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12340/devel

Modified Files:
	.cvsignore qps.spec sources 
Added Files:
	import.log 
Log Message:
qps-1.10.2 uploaded in devel branch



--- NEW FILE import.log ---
qps-1_10_2-1_fc9:HEAD:qps-1.10.2-1.fc9.src.rpm:1220826298


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qps/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	19 Mar 2007 17:29:49 -0000	1.14
+++ .cvsignore	7 Sep 2008 22:26:43 -0000	1.15
@@ -1 +1 @@
-qps-1.9.19b.tar.bz2
+qps-1.10.2.tar.bz2


Index: qps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qps/devel/qps.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- qps.spec	3 Sep 2008 19:28:50 -0000	1.16
+++ qps.spec	7 Sep 2008 22:26:43 -0000	1.17
@@ -1,29 +1,53 @@
 Name:           qps
-Version:        1.9.19
-Release:        0.4.b%{?dist}
-Summary:        Visual process status monitor
+Version:        1.10.2
+Release:        1%{?dist}
+Summary:        Visual process manager
 
 Group:          Applications/System
-# No version specified.
-License:        GPL+
+License:        GPLv2+
 URL:            http://qps.kldp.net/
-Source0:        http://kldp.net/frs/download.php/3839/qps-1.9.19b.tar.bz2
+Source0:        http://kldp.net/frs/download.php/4776/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  qt-devel
+BuildRequires:  qt4-devel >= 4.3.0
+
 
 %description
-Qps is a GUI version of "ps" or "top".
+Qps is a visual process manager, an X11 version of "top" or "ps" that
+displays processes in a window and lets you sort and manipulate them.
+
+Qps can:
+  o  Change nice value of a process.
+  o  Alter the scheduling policy and soft realtime priority of a process.
+  o  Display the TCP/UDP sockets used by a process, and names of the
+     connected hosts (Linux only).
+  o  Display the memory mappings of the process (which files and shared
+     libraries are loaded   where).
+  o  Display the open files of a process, and the state of unix domain sockets.
+  o  Kill or send any other signal to selected processes.
+  o  Display the load average as a graph, and use this as its icon when
+     iconified.
+  o  Show (as graph or numbers) current CPU, memory and swap usage.
+  o  Sort the process table on any attribute (size, cpu usage, owner etc).
+  o  On SMP systems running Linux 2.6 or later (or Solaris), display cpu usage
+     for each processor, and which CPU a process is running on.
+  o  Display the environment variables of any process.
+  o  Show the process table in tree form, showing the parent-child
+     relationship.
+  o  Execute user-defined commands on selected processes.
+
 
 
 %prep
-%setup -q -n qps-1.9.19b
+%setup -q
 
+iconv --from-code ISO88591 --to-code UTF8 ./CHANGES \
+--output CHANGES.utf-8 && mv CHANGES.utf-8 ./CHANGES
+ 
 
 %build
-unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
-qmake
+qmake-qt4
 make %{?_smp_mflags}
 
 
@@ -32,10 +56,12 @@
 install -D -p -m 0755 qps %{buildroot}%{_bindir}/qps
 install -D -p -m 0644 qps.1 %{buildroot}%{_mandir}/man1/qps.1
 install -D -p -m 0644 icon/icon.xpm %{buildroot}%{_datadir}/pixmaps/qps.xpm
+install -D -p -m 0644 qps.desktop %{buildroot}%{_datadir}/applications/qps.desktop
 
 desktop-file-install --vendor=fedora \
         --remove-category=Application \
-        --dir %{buildroot}%{_datadir}/applications qps.desktop
+        --dir %{buildroot}%{_datadir}/applications \
+        %{buildroot}%{_datadir}/applications/qps.desktop
 
 
 %clean
@@ -46,13 +72,18 @@
 %defattr(-,root,root,-)
 %doc CHANGES COPYING
 %{_bindir}/qps
-%{_datadir}/applications/*qps.desktop
+%{_datadir}/applications/*
 %{_datadir}/pixmaps/qps.xpm
 %{_mandir}/man1/qps.1*
 
 
 %changelog
-* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.9.19-0.4.b
+* Sat Sep 6 2008 Arindam Ghosh <makghosh at fedoraproject.org> - 1.10.2-1
+- new upstream release
+- fix gcc4.3 mass-rebuild failure
+- updated license tag
+
+* Wed Sep 3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.9.19-0.4.b
 - fix license tag
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.9.19-0.3.b
@@ -64,47 +95,3 @@
 * Mon Mar  5 2007 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.19-0.1.a
 - Update to 1.9.19a
 
-* Thu Oct  5 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.18.6-1
-- Update to 1.9.18.6
-
-* Mon Aug 28 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.18.5-1
-- Update to 1.9.18.5
-- Fix mixed-use-of-spaces-and-tabs rpmlint warning
-
-* Sat Jul  1 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.17-1
-- Update to 1.9.17
-
-* Mon May 29 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.16-1
-- Update to 1.9.16
-- Turn on optflags
-- Change e-mail address in ChangeLog entries
-
-* Tue Apr 11 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.15-1
-- Update to 1.9.15
-
-* Wed Mar 22 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.14-1
-- Update to 1.9.14
-
-* Thu Mar  9 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.13-1
-- Update to 1.9.13
-
-* Wed Feb 22 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.12-1
-- Update to 1.9.12
-- Drop gcc41.patch (pushed upstream)
-
-* Tue Feb 14 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.11-2.2
-- Rebuild for Fedora Extras 5
-
-* Sun Dec 18 2005 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.11-2.1
-- Fix compilation with GCC 4.1
-- Use funny release tag because tarball name contains `-' character
-- Add COPYING file
-
-* Sat Nov 12 2005 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.11-2
-- Increase release tag (always do `cvs ci' before `make tag' ;) )
-
-* Sat Nov 12 2005 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.11-1
-- Update to 1.9.11.
-
-* Thu Aug 25 2005 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.10-1
-- Initial RPM release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qps/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	19 Mar 2007 17:29:49 -0000	1.14
+++ sources	7 Sep 2008 22:26:43 -0000	1.15
@@ -1 +1 @@
-a3bbdce2f45a6f2bd79fc46349f58463  qps-1.9.19b.tar.bz2
+28ca5babd8190f2693e6d233938b6d93  qps-1.10.2.tar.bz2



From makghosh at fedoraproject.org  Sun Sep  7 22:30:11 2008
From: makghosh at fedoraproject.org (Arindam Ghosh)
Date: Sun,  7 Sep 2008 22:30:11 +0000 (UTC)
Subject: rpms/qps/F-9 import.log, NONE, 1.1 .cvsignore, 1.14, 1.15 qps.spec, 
	1.15, 1.16 sources, 1.14, 1.15
Message-ID: <20080907223011.3B7E470126@cvs1.fedora.phx.redhat.com>

Author: makghosh

Update of /cvs/pkgs/rpms/qps/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12645/F-9

Modified Files:
	.cvsignore qps.spec sources 
Added Files:
	import.log 
Log Message:
qps-1.10.2 uploaded in F-9 branch



--- NEW FILE import.log ---
qps-1_10_2-1_fc9:F-9:qps-1.10.2-1.fc9.src.rpm:1220826515


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qps/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	19 Mar 2007 17:29:49 -0000	1.14
+++ .cvsignore	7 Sep 2008 22:29:40 -0000	1.15
@@ -1 +1 @@
-qps-1.9.19b.tar.bz2
+qps-1.10.2.tar.bz2


Index: qps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qps/F-9/qps.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qps.spec	19 Feb 2008 13:01:08 -0000	1.15
+++ qps.spec	7 Sep 2008 22:29:40 -0000	1.16
@@ -1,28 +1,53 @@
 Name:           qps
-Version:        1.9.19
-Release:        0.3.b%{?dist}
-Summary:        Visual process status monitor
+Version:        1.10.2
+Release:        1%{?dist}
+Summary:        Visual process manager
 
 Group:          Applications/System
-License:        GPL
+License:        GPLv2+
 URL:            http://qps.kldp.net/
-Source0:        http://kldp.net/frs/download.php/3839/qps-1.9.19b.tar.bz2
+Source0:        http://kldp.net/frs/download.php/4776/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  qt-devel
+BuildRequires:  qt4-devel >= 4.3.0
+
 
 %description
-Qps is a GUI version of "ps" or "top".
+Qps is a visual process manager, an X11 version of "top" or "ps" that
+displays processes in a window and lets you sort and manipulate them.
+
+Qps can:
+  o  Change nice value of a process.
+  o  Alter the scheduling policy and soft realtime priority of a process.
+  o  Display the TCP/UDP sockets used by a process, and names of the
+     connected hosts (Linux only).
+  o  Display the memory mappings of the process (which files and shared
+     libraries are loaded   where).
+  o  Display the open files of a process, and the state of unix domain sockets.
+  o  Kill or send any other signal to selected processes.
+  o  Display the load average as a graph, and use this as its icon when
+     iconified.
+  o  Show (as graph or numbers) current CPU, memory and swap usage.
+  o  Sort the process table on any attribute (size, cpu usage, owner etc).
+  o  On SMP systems running Linux 2.6 or later (or Solaris), display cpu usage
+     for each processor, and which CPU a process is running on.
+  o  Display the environment variables of any process.
+  o  Show the process table in tree form, showing the parent-child
+     relationship.
+  o  Execute user-defined commands on selected processes.
+
 
 
 %prep
-%setup -q -n qps-1.9.19b
+%setup -q
 
+iconv --from-code ISO88591 --to-code UTF8 ./CHANGES \
+--output CHANGES.utf-8 && mv CHANGES.utf-8 ./CHANGES
+ 
 
 %build
-unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
-qmake
+qmake-qt4
 make %{?_smp_mflags}
 
 
@@ -31,10 +56,12 @@
 install -D -p -m 0755 qps %{buildroot}%{_bindir}/qps
 install -D -p -m 0644 qps.1 %{buildroot}%{_mandir}/man1/qps.1
 install -D -p -m 0644 icon/icon.xpm %{buildroot}%{_datadir}/pixmaps/qps.xpm
+install -D -p -m 0644 qps.desktop %{buildroot}%{_datadir}/applications/qps.desktop
 
 desktop-file-install --vendor=fedora \
         --remove-category=Application \
-        --dir %{buildroot}%{_datadir}/applications qps.desktop
+        --dir %{buildroot}%{_datadir}/applications \
+        %{buildroot}%{_datadir}/applications/qps.desktop
 
 
 %clean
@@ -45,12 +72,20 @@
 %defattr(-,root,root,-)
 %doc CHANGES COPYING
 %{_bindir}/qps
-%{_datadir}/applications/*qps.desktop
+%{_datadir}/applications/*
 %{_datadir}/pixmaps/qps.xpm
 %{_mandir}/man1/qps.1*
 
 
 %changelog
+* Sat Sep 6 2008 Arindam Ghosh <makghosh at fedoraproject.org> - 1.10.2-1
+- new upstream release
+- fix gcc4.3 mass-rebuild failure
+- updated license tag
+
+* Wed Sep 3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.9.19-0.4.b
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.9.19-0.3.b
 - Autorebuild for GCC 4.3
 
@@ -60,47 +95,3 @@
 * Mon Mar  5 2007 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.19-0.1.a
 - Update to 1.9.19a
 
-* Thu Oct  5 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.18.6-1
-- Update to 1.9.18.6
-
-* Mon Aug 28 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.18.5-1
-- Update to 1.9.18.5
-- Fix mixed-use-of-spaces-and-tabs rpmlint warning
-
-* Sat Jul  1 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.17-1
-- Update to 1.9.17
-
-* Mon May 29 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.16-1
-- Update to 1.9.16
-- Turn on optflags
-- Change e-mail address in ChangeLog entries
-
-* Tue Apr 11 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.15-1
-- Update to 1.9.15
-
-* Wed Mar 22 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.14-1
-- Update to 1.9.14
-
-* Thu Mar  9 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.13-1
-- Update to 1.9.13
-
-* Wed Feb 22 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.12-1
-- Update to 1.9.12
-- Drop gcc41.patch (pushed upstream)
-
-* Tue Feb 14 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.11-2.2
-- Rebuild for Fedora Extras 5
-
-* Sun Dec 18 2005 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.11-2.1
-- Fix compilation with GCC 4.1
-- Use funny release tag because tarball name contains `-' character
-- Add COPYING file
-
-* Sat Nov 12 2005 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.11-2
-- Increase release tag (always do `cvs ci' before `make tag' ;) )
-
-* Sat Nov 12 2005 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.11-1
-- Update to 1.9.11.
-
-* Thu Aug 25 2005 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.10-1
-- Initial RPM release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qps/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	19 Mar 2007 17:29:49 -0000	1.14
+++ sources	7 Sep 2008 22:29:40 -0000	1.15
@@ -1 +1 @@
-a3bbdce2f45a6f2bd79fc46349f58463  qps-1.9.19b.tar.bz2
+28ca5babd8190f2693e6d233938b6d93  qps-1.10.2.tar.bz2



From makghosh at fedoraproject.org  Sun Sep  7 22:32:36 2008
From: makghosh at fedoraproject.org (Arindam Ghosh)
Date: Sun,  7 Sep 2008 22:32:36 +0000 (UTC)
Subject: rpms/qps/F-8 import.log, NONE, 1.1 .cvsignore, 1.14, 1.15 qps.spec, 
	1.14, 1.15 sources, 1.14, 1.15
Message-ID: <20080907223236.CD07070126@cvs1.fedora.phx.redhat.com>

Author: makghosh

Update of /cvs/pkgs/rpms/qps/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12959/F-8

Modified Files:
	.cvsignore qps.spec sources 
Added Files:
	import.log 
Log Message:
qps-1.10.2 uploaded in F-8 branch



--- NEW FILE import.log ---
qps-1_10_2-1_fc9:F-8:qps-1.10.2-1.fc9.src.rpm:1220826667


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qps/F-8/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	19 Mar 2007 17:29:49 -0000	1.14
+++ .cvsignore	7 Sep 2008 22:32:06 -0000	1.15
@@ -1 +1 @@
-qps-1.9.19b.tar.bz2
+qps-1.10.2.tar.bz2


Index: qps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qps/F-8/qps.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- qps.spec	19 Mar 2007 17:29:49 -0000	1.14
+++ qps.spec	7 Sep 2008 22:32:06 -0000	1.15
@@ -1,28 +1,53 @@
 Name:           qps
-Version:        1.9.19
-Release:        0.2.b%{?dist}
-Summary:        Visual process status monitor
+Version:        1.10.2
+Release:        1%{?dist}
+Summary:        Visual process manager
 
 Group:          Applications/System
-License:        GPL
+License:        GPLv2+
 URL:            http://qps.kldp.net/
-Source0:        http://kldp.net/frs/download.php/3839/qps-1.9.19b.tar.bz2
+Source0:        http://kldp.net/frs/download.php/4776/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  qt-devel
+BuildRequires:  qt4-devel >= 4.3.0
+
 
 %description
-Qps is a GUI version of "ps" or "top".
+Qps is a visual process manager, an X11 version of "top" or "ps" that
+displays processes in a window and lets you sort and manipulate them.
+
+Qps can:
+  o  Change nice value of a process.
+  o  Alter the scheduling policy and soft realtime priority of a process.
+  o  Display the TCP/UDP sockets used by a process, and names of the
+     connected hosts (Linux only).
+  o  Display the memory mappings of the process (which files and shared
+     libraries are loaded   where).
+  o  Display the open files of a process, and the state of unix domain sockets.
+  o  Kill or send any other signal to selected processes.
+  o  Display the load average as a graph, and use this as its icon when
+     iconified.
+  o  Show (as graph or numbers) current CPU, memory and swap usage.
+  o  Sort the process table on any attribute (size, cpu usage, owner etc).
+  o  On SMP systems running Linux 2.6 or later (or Solaris), display cpu usage
+     for each processor, and which CPU a process is running on.
+  o  Display the environment variables of any process.
+  o  Show the process table in tree form, showing the parent-child
+     relationship.
+  o  Execute user-defined commands on selected processes.
+
 
 
 %prep
-%setup -q -n qps-1.9.19b
+%setup -q
 
+iconv --from-code ISO88591 --to-code UTF8 ./CHANGES \
+--output CHANGES.utf-8 && mv CHANGES.utf-8 ./CHANGES
+ 
 
 %build
-unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
-qmake
+qmake-qt4
 make %{?_smp_mflags}
 
 
@@ -31,10 +56,12 @@
 install -D -p -m 0755 qps %{buildroot}%{_bindir}/qps
 install -D -p -m 0644 qps.1 %{buildroot}%{_mandir}/man1/qps.1
 install -D -p -m 0644 icon/icon.xpm %{buildroot}%{_datadir}/pixmaps/qps.xpm
+install -D -p -m 0644 qps.desktop %{buildroot}%{_datadir}/applications/qps.desktop
 
 desktop-file-install --vendor=fedora \
         --remove-category=Application \
-        --dir %{buildroot}%{_datadir}/applications qps.desktop
+        --dir %{buildroot}%{_datadir}/applications \
+        %{buildroot}%{_datadir}/applications/qps.desktop
 
 
 %clean
@@ -45,59 +72,26 @@
 %defattr(-,root,root,-)
 %doc CHANGES COPYING
 %{_bindir}/qps
-%{_datadir}/applications/*qps.desktop
+%{_datadir}/applications/*
 %{_datadir}/pixmaps/qps.xpm
 %{_mandir}/man1/qps.1*
 
 
 %changelog
+* Sat Sep 6 2008 Arindam Ghosh <makghosh at fedoraproject.org> - 1.10.2-1
+- new upstream release
+- fix gcc4.3 mass-rebuild failure
+- updated license tag
+
+* Wed Sep 3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.9.19-0.4.b
+- fix license tag
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.9.19-0.3.b
+- Autorebuild for GCC 4.3
+
 * Mon Mar 19 2007 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.19-0.2.b
 - Update to 1.9.9b
 
 * Mon Mar  5 2007 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.19-0.1.a
 - Update to 1.9.19a
 
-* Thu Oct  5 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.18.6-1
-- Update to 1.9.18.6
-
-* Mon Aug 28 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.18.5-1
-- Update to 1.9.18.5
-- Fix mixed-use-of-spaces-and-tabs rpmlint warning
-
-* Sat Jul  1 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.17-1
-- Update to 1.9.17
-
-* Mon May 29 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.16-1
-- Update to 1.9.16
-- Turn on optflags
-- Change e-mail address in ChangeLog entries
-
-* Tue Apr 11 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.15-1
-- Update to 1.9.15
-
-* Wed Mar 22 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.14-1
-- Update to 1.9.14
-
-* Thu Mar  9 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.13-1
-- Update to 1.9.13
-
-* Wed Feb 22 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.12-1
-- Update to 1.9.12
-- Drop gcc41.patch (pushed upstream)
-
-* Tue Feb 14 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.11-2.2
-- Rebuild for Fedora Extras 5
-
-* Sun Dec 18 2005 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.11-2.1
-- Fix compilation with GCC 4.1
-- Use funny release tag because tarball name contains `-' character
-- Add COPYING file
-
-* Sat Nov 12 2005 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.11-2
-- Increase release tag (always do `cvs ci' before `make tag' ;) )
-
-* Sat Nov 12 2005 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.11-1
-- Update to 1.9.11.
-
-* Thu Aug 25 2005 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.10-1
-- Initial RPM release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qps/F-8/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	19 Mar 2007 17:29:49 -0000	1.14
+++ sources	7 Sep 2008 22:32:06 -0000	1.15
@@ -1 +1 @@
-a3bbdce2f45a6f2bd79fc46349f58463  qps-1.9.19b.tar.bz2
+28ca5babd8190f2693e6d233938b6d93  qps-1.10.2.tar.bz2



From mbooth at fedoraproject.org  Sun Sep  7 23:00:33 2008
From: mbooth at fedoraproject.org (Mat Booth)
Date: Sun,  7 Sep 2008 23:00:33 +0000 (UTC)
Subject: rpms/eclipse-phpeclipse/devel eclipse-phpeclipse.spec,1.6,1.7
Message-ID: <20080907230033.5631870126@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-phpeclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15267

Modified Files:
	eclipse-phpeclipse.spec 
Log Message:
* Wed Jul 30 2008 Andrew Overholt <overholt at redhat.com> 1.2.0-0.3.svn1573
- Update for building against Eclipse SDK 3.4.




Index: eclipse-phpeclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-phpeclipse.spec	29 Jun 2008 18:30:45 -0000	1.6
+++ eclipse-phpeclipse.spec	7 Sep 2008 23:00:03 -0000	1.7
@@ -1,9 +1,9 @@
-%define eclipse_base     %{_datadir}/eclipse
+%define eclipse_base     %{_libdir}/eclipse
 %define gcj_support      1
 
 Name:      eclipse-phpeclipse
 Version:   1.2.0
-Release:   0.2.svn1573%{?dist}
+Release:   0.3.svn1573%{?dist}
 Summary:   PHP Eclipse plugin
 Group:     Development/Tools
 License:   CPL
@@ -35,10 +35,10 @@
 %endif
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
-BuildRequires:    eclipse-pde >= 1:3.3
+BuildRequires:    eclipse-pde >= 3.4
 Requires:         java
 Requires:         jpackage-utils
-Requires:         eclipse-platform >= 1:3.3
+Requires:         eclipse-platform >= 3.4
 Requires:         php >= 5
 Requires:         httpd
 
@@ -96,14 +96,19 @@
 
 %install
 rm -rf %{buildroot}
-install -d -m 755 %{buildroot}%{eclipse_base}
-unzip -q -d %{buildroot}%{eclipse_base}/.. build/rpmBuild/net.sourceforge.phpeclipse.feature.zip
-unzip -q -d %{buildroot}%{eclipse_base}/.. build/rpmBuild/net.sourceforge.phpeclipse.debug.feature.zip
-unzip -q -d %{buildroot}%{eclipse_base}/.. build/rpmBuild/net.sourceforge.phpeclipse.xdebug.feature.zip
+installDir=%{buildroot}%{_datadir}/eclipse/dropins/phpeclipse
+debugInstallDir=%{buildroot}%{_datadir}/eclipse/dropins/phpeclipse-debug
+xdebugInstallDir=%{buildroot}%{_datadir}/eclipse/dropins/phpeclipse-xdebug
+install -d -m 755 $installDir
+install -d -m 755 $debugInstallDir
+install -d -m 755 $xdebugInstallDir
+unzip -q -d $installDir build/rpmBuild/net.sourceforge.phpeclipse.feature.zip
+unzip -q -d $debugInstallDir build/rpmBuild/net.sourceforge.phpeclipse.debug.feature.zip
+unzip -q -d $xdebugInstallDir build/rpmBuild/net.sourceforge.phpeclipse.xdebug.feature.zip
 
 # need to recreate the symlinks to libraries that were setup in "prep"
 # because for some reason the ant copy task doesn't preserve them
-pushd %{buildroot}%{eclipse_base}/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
+pushd $installDir/eclipse/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
 rm *.jar
 build-jar-repository -s -p . xml-commons-apis
 popd
@@ -122,37 +127,18 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{eclipse_base}/features/net.sourceforge.phpeclipse.feature_*/cpl-v10.html
-
-# main feature
-%{eclipse_base}/features/net.sourceforge.phpeclipse.feature_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.core_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.externaltools_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.help_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.phphelp_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.phpmanual_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.smarty.ui_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.ui_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.webbrowser_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.xml.core_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.xml.ui_*
-
-# debug features
-%{eclipse_base}/features/net.sourceforge.phpeclipse.debug.feature_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.debug.core_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.debug.ui_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.launching_*
-%{eclipse_base}/features/net.sourceforge.phpeclipse.xdebug.feature_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.xdebug.core_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.xdebug.ui_*
-
+%doc net.sourceforge.phpeclipse.feature/cpl-v10.html
+%{_datadir}/eclipse/dropins/phpeclipse
+%{_datadir}/eclipse/dropins/phpeclipse-debug
+%{_datadir}/eclipse/dropins/phpeclipse-xdebug
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt at redhat.com> 1.2.0-0.3.svn1573
+- Update for building against Eclipse SDK 3.4.
+
 * Sun Jun 29 2008 Mat Booth <fedora at matbooth.co.uk> 1.2.0-0.2.svn1573
 - Add patch for Show External Preview functionality.
 - Add patch for Use External PHP Parser functionality.



From pkgdb at fedoraproject.org  Mon Sep  8 00:17:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:17:41 +0000
Subject: [pkgdb] kdeartwork-extras had acl change status
Message-ID: <20080908001741.444D320876E@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeartwork-extras (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork-extras



From pkgdb at fedoraproject.org  Mon Sep  8 00:17:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:17:51 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080908001751.7C59F208D97@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeartwork (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Mon Sep  8 00:17:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:17:51 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080908001751.95482208D9B@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeartwork (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Mon Sep  8 00:17:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:17:54 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080908001754.B2610208D9E@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeartwork (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Mon Sep  8 00:17:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:17:57 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080908001757.3F1FA208DA3@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeartwork (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:00 +0000
Subject: [pkgdb] kdeadmin had acl change status
Message-ID: <20080908001800.25459208DA7@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeadmin (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:03 +0000
Subject: [pkgdb] kdeadmin had acl change status
Message-ID: <20080908001803.D951A208DAB@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeadmin (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:06 +0000
Subject: [pkgdb] kdeadmin had acl change status
Message-ID: <20080908001806.5C3EC208D07@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdeadmin (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:12 +0000
Subject: [pkgdb] kdeadmin had acl change status
Message-ID: <20080908001812.5264A208DAF@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdeadmin (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:13 +0000
Subject: [pkgdb] kdeadmin had acl change status
Message-ID: <20080908001813.BB4CC208DB3@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdeadmin (Fedora 8) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:15 +0000
Subject: [pkgdb] kdeadmin had acl change status
Message-ID: <20080908001815.4E898208DB6@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdeadmin (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:17 +0000
Subject: [pkgdb] kdeadmin had acl change status
Message-ID: <20080908001817.5AF95208D9A@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeadmin (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:21 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080908001821.AAF9B208DBB@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdeaddons (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaddons



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:23 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080908001823.35457208DC0@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeaddons (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaddons



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:22 +0000
Subject: [pkgdb] kdeadmin had acl change status
Message-ID: <20080908001823.7CD5F208DC5@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeadmin (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:24 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080908001824.4B1E5208DCA@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeaddons (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaddons



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:26 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080908001826.31B8B208DCE@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdeaddons (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaddons



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:30 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080908001830.6D0F0208D9B@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdeaddons (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaddons



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:31 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080908001831.B8D24208DD1@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdeaddons (Fedora 8) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaddons



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:31 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080908001831.F4164208DD6@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeaddons (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaddons



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:33 +0000
Subject: [pkgdb] kdeaddons had acl change status
Message-ID: <20080908001833.5821D208DDD@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeaddons (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaddons



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:41 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20080908001841.8497D208DA2@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeaccessibility (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:43 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20080908001843.2F39C208DE3@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeaccessibility (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From mmcgrath at fedoraproject.org  Mon Sep  8 00:18:44 2008
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon,  8 Sep 2008 00:18:44 +0000 (UTC)
Subject: rpms/smolt/devel smolt.spec,1.52,1.53
Message-ID: <20080908001844.08AE170128@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/smolt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1121

Modified Files:
	smolt.spec 
Log Message:
fixing dep issues


Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- smolt.spec	4 Sep 2008 20:18:32 -0000	1.52
+++ smolt.spec	8 Sep 2008 00:18:13 -0000	1.53
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
 Version: 1.1.1.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://hosted.fedoraproject.org/projects/smolt
@@ -35,6 +35,7 @@
 Requires: python-genshi
 Requires: python-crypto
 Requires: TurboGears mx
+Requires: python-turboflot
 
 %description server
 The Fedora hardware profiler is a server-client system that does a hardware
@@ -47,7 +48,7 @@
 %package firstboot
 Summary: Fedora hardware profile firstboot
 Group: Applications/Internet
-Requires: smolt = %{version}-%{release}, python-turboflot
+Requires: smolt = %{version}-%{release}
 
 %description firstboot
 This provides firstboot integration for smolt.  It has been broken into a
@@ -171,6 +172,9 @@
 %{_bindir}/smoltGui
 
 %changelog
+* Sun Sep  7 2008 Mike McGrath <mmcgrath at redhat.com> 1.1.1.1-6
+- Added turboflot to server, removed from firstboot
+
 * Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.1.1.1-5
 - fix license tag
 



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:47 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20080908001847.C844D208DE9@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeaccessibility (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:48 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20080908001848.8393B208DEE@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeaccessibility (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:52 +0000
Subject: [pkgdb] kcoloredit had acl change status
Message-ID: <20080908001852.206CE208DA7@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kcoloredit (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcoloredit



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:52 +0000
Subject: [pkgdb] kcoloredit had acl change status
Message-ID: <20080908001852.CB538208DF5@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kcoloredit (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcoloredit



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:54 +0000
Subject: [pkgdb] kcoloredit had acl change status
Message-ID: <20080908001854.8CC0B208DFC@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kcoloredit (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcoloredit



From pkgdb at fedoraproject.org  Mon Sep  8 00:18:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:18:56 +0000
Subject: [pkgdb] kcoloredit had acl change status
Message-ID: <20080908001856.3B7CD208E04@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kcoloredit (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcoloredit



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:08 +0000
Subject: [pkgdb] kcoloredit had group_acl changed
Message-ID: <20080908001908.4004E208DAB@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kcoloredit (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcoloredit



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:09 +0000
Subject: [pkgdb] kcoloredit had group_acl changed
Message-ID: <20080908001909.40471208E0D@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kcoloredit (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcoloredit



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:17 +0000
Subject: [pkgdb] kdeaccessibility had group_acl changed
Message-ID: <20080908001917.824F2208D0F@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeaccessibility (Fedora 7) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:22 +0000
Subject: [pkgdb] kdeaccessibility had group_acl changed
Message-ID: <20080908001922.5AF75208E13@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeaccessibility (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:22 +0000
Subject: [pkgdb] kdeaccessibility had group_acl changed
Message-ID: <20080908001922.7C882208E15@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeaccessibility (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:25 +0000
Subject: [pkgdb] kdeaddons had group_acl changed
Message-ID: <20080908001925.94F8A208DB1@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeaddons (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaddons



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:25 +0000
Subject: [pkgdb] kdeaddons had group_acl changed
Message-ID: <20080908001925.9F18F208E19@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeaddons (Fedora 7) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaddons



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:26 +0000
Subject: [pkgdb] kdeaddons had group_acl changed
Message-ID: <20080908001926.D1177208E1E@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeaddons (Fedora 8) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaddons



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:28 +0000
Subject: [pkgdb] kdeaddons had group_acl changed
Message-ID: <20080908001928.8D098208E22@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeaddons (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeaddons



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:34 +0000
Subject: [pkgdb] kdeadmin had group_acl changed
Message-ID: <20080908001934.E0078208DB4@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeadmin (Fedora 7) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:35 +0000
Subject: [pkgdb] kdeadmin had group_acl changed
Message-ID: <20080908001935.38DDE208E27@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeadmin (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:35 +0000
Subject: [pkgdb] kdeadmin had group_acl changed
Message-ID: <20080908001935.D25A3208E2A@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeadmin (Fedora 8) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:39 +0000
Subject: [pkgdb] kdeadmin had group_acl changed
Message-ID: <20080908001939.8DC17208E2E@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeadmin (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:42 +0000
Subject: [pkgdb] kdeartwork had group_acl changed
Message-ID: <20080908001942.C6180208E32@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeartwork (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:44 +0000
Subject: [pkgdb] kdeartwork had group_acl changed
Message-ID: <20080908001944.152C0208E35@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeartwork (Fedora 7) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:46 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080908001946.A5EC7208D99@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdeartwork (Fedora 8) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:48 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080908001948.5541D208E38@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdeartwork (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:48 +0000
Subject: [pkgdb] kdeartwork had group_acl changed
Message-ID: <20080908001948.A8404208E3C@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeartwork (Fedora 8) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:50 +0000
Subject: [pkgdb] kdeartwork had group_acl changed
Message-ID: <20080908001950.66B8F208E41@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeartwork (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:52 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080908001953.5B977208E45@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdeartwork (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Mon Sep  8 00:19:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:19:56 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20080908001956.2E98E208E49@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdeartwork (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Mon Sep  8 00:20:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:20:03 +0000
Subject: [pkgdb] kchmviewer had acl change status
Message-ID: <20080908002003.C70BD208E4B@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kchmviewer (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From pkgdb at fedoraproject.org  Mon Sep  8 00:20:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:20:03 +0000
Subject: [pkgdb] kchmviewer had acl change status
Message-ID: <20080908002004.06304208E50@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kchmviewer (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From pkgdb at fedoraproject.org  Mon Sep  8 00:20:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:20:26 +0000
Subject: [pkgdb] kcemirror had acl change status
Message-ID: <20080908002026.C2A80208DC2@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kcemirror (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcemirror



From pkgdb at fedoraproject.org  Mon Sep  8 00:20:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:20:30 +0000
Subject: [pkgdb] kcemirror had acl change status
Message-ID: <20080908002031.1E94C208DC7@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kcemirror (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcemirror



From pkgdb at fedoraproject.org  Mon Sep  8 00:20:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:20:34 +0000
Subject: [pkgdb] kcemirror had acl change status
Message-ID: <20080908002034.EEDBC208E52@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kcemirror (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcemirror



From pkgdb at fedoraproject.org  Mon Sep  8 00:20:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:20:35 +0000
Subject: [pkgdb] kcemirror had acl change status
Message-ID: <20080908002036.0D3D3208E57@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kcemirror (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcemirror



From pkgdb at fedoraproject.org  Mon Sep  8 00:20:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:20:42 +0000
Subject: [pkgdb] kasablanca had acl change status
Message-ID: <20080908002042.CEAC5208DCC@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kasablanca (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kasablanca



From pkgdb at fedoraproject.org  Mon Sep  8 00:20:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:20:43 +0000
Subject: [pkgdb] kasablanca had acl change status
Message-ID: <20080908002043.1082B208DCF@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kasablanca (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kasablanca



From pkgdb at fedoraproject.org  Mon Sep  8 00:20:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:20:47 +0000
Subject: [pkgdb] kasablanca had acl change status
Message-ID: <20080908002047.27231208E5C@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kasablanca (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kasablanca



From pkgdb at fedoraproject.org  Mon Sep  8 00:20:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:20:48 +0000
Subject: [pkgdb] kasablanca had acl change status
Message-ID: <20080908002048.1EF8D208E5F@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kasablanca (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kasablanca



From pkgdb at fedoraproject.org  Mon Sep  8 00:20:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:20:52 +0000
Subject: [pkgdb] kaider had acl change status
Message-ID: <20080908002052.B2095208E64@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kaider (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaider



From pkgdb at fedoraproject.org  Mon Sep  8 00:20:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:20:52 +0000
Subject: [pkgdb] kaider had acl change status
Message-ID: <20080908002052.CE089208E67@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kaider (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaider



From pkgdb at fedoraproject.org  Mon Sep  8 00:21:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:21:00 +0000
Subject: [pkgdb] kaider had acl change status
Message-ID: <20080908002100.5E1BE208E6D@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kaider (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaider



From pkgdb at fedoraproject.org  Mon Sep  8 00:21:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:21:00 +0000
Subject: [pkgdb] kaider had acl change status
Message-ID: <20080908002100.96D41208E74@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kaider (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaider



From pkgdb at fedoraproject.org  Mon Sep  8 00:21:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:21:05 +0000
Subject: [pkgdb] k3b-extras had acl change status
Message-ID: <20080908002105.97B40208DD2@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on k3b-extras (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/k3b-extras



From pkgdb at fedoraproject.org  Mon Sep  8 00:21:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:21:07 +0000
Subject: [pkgdb] k3b-extras had acl change status
Message-ID: <20080908002107.8D603208DD5@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on k3b-extras (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/k3b-extras



From pkgdb at fedoraproject.org  Mon Sep  8 00:21:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:21:10 +0000
Subject: [pkgdb] k3b-extras had acl change status
Message-ID: <20080908002110.5A61C208E7B@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on k3b-extras (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/k3b-extras



From pkgdb at fedoraproject.org  Mon Sep  8 00:21:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:21:11 +0000
Subject: [pkgdb] k3b-extras had acl change status
Message-ID: <20080908002111.31877208E7F@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on k3b-extras (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/k3b-extras



From pkgdb at fedoraproject.org  Mon Sep  8 00:21:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:21:15 +0000
Subject: [pkgdb] k3b had acl change status
Message-ID: <20080908002115.B514C208DD8@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on k3b (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/k3b



From pkgdb at fedoraproject.org  Mon Sep  8 00:21:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:21:17 +0000
Subject: [pkgdb] k3b had acl change status
Message-ID: <20080908002117.DE79D2D0023@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on k3b (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/k3b



From pkgdb at fedoraproject.org  Mon Sep  8 00:21:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:21:19 +0000
Subject: [pkgdb] k3b had acl change status
Message-ID: <20080908002119.963622D0028@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on k3b (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/k3b



From pkgdb at fedoraproject.org  Mon Sep  8 00:21:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:21:21 +0000
Subject: [pkgdb] k3b had acl change status
Message-ID: <20080908002121.1D2122D002B@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on k3b (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/k3b



From pkgdb at fedoraproject.org  Mon Sep  8 00:21:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:21:24 +0000
Subject: [pkgdb] guidance-power-manager had acl change status
Message-ID: <20080908002124.13C112D002F@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on guidance-power-manager (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guidance-power-manager



From pkgdb at fedoraproject.org  Mon Sep  8 00:21:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:21:24 +0000
Subject: [pkgdb] guidance-power-manager had acl change status
Message-ID: <20080908002124.F3D642E0003@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on guidance-power-manager (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guidance-power-manager



From pkgdb at fedoraproject.org  Mon Sep  8 00:21:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:21:28 +0000
Subject: [pkgdb] guidance-power-manager had acl change status
Message-ID: <20080908002128.9E3B9208D9F@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on guidance-power-manager (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guidance-power-manager



From pkgdb at fedoraproject.org  Mon Sep  8 00:21:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:21:29 +0000
Subject: [pkgdb] guidance-power-manager had acl change status
Message-ID: <20080908002129.DE8062E0007@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on guidance-power-manager (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guidance-power-manager



From kkofler at fedoraproject.org  Mon Sep  8 00:32:54 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon,  8 Sep 2008 00:32:54 +0000 (UTC)
Subject: rpms/kaider/F-9 dead.package, NONE, 1.1 .cvsignore, 1.4, NONE branch,
	1.1, NONE kaider.spec, 1.6, NONE sources, 1.4, NONE
Message-ID: <20080908003254.0E39370128@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kaider/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4726/F-9

Added Files:
	dead.package 
Removed Files:
	.cvsignore branch kaider.spec sources 
Log Message:
Mark as dead in F-9 too now that 4.1 is stable.


--- NEW FILE dead.package ---
Kaider is now part of kdesdk under the new name "Lokalize" (since KDE 4.1).

--- .cvsignore DELETED ---


--- branch DELETED ---


--- kaider.spec DELETED ---


--- sources DELETED ---



From airlied at fedoraproject.org  Mon Sep  8 00:35:15 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon,  8 Sep 2008 00:35:15 +0000 (UTC)
Subject: rpms/kernel/devel drm-modesetting-radeon.patch, 1.22,
	1.23 kernel.spec, 1.936, 1.937
Message-ID: <20080908003515.5749A70128@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5244

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Mon Sep 08 2008 Dave Airlie <airlied at redhat.com>
- disable VGA bashing in radeon - make text reserve larger.


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- drm-modesetting-radeon.patch	6 Sep 2008 21:39:17 -0000	1.22
+++ drm-modesetting-radeon.patch	8 Sep 2008 00:35:14 -0000	1.23
@@ -1,3 +1,21 @@
+commit 563e90db2ca306fe0dee104703a48b5bc5d7fd93
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Sep 8 10:27:48 2008 +1000
+
+    radeon: disable debugging that sneaky itself on
+
+commit aa65ff0b4b4e5309a5df36886170b97780245d53
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Sep 8 10:20:44 2008 +1000
+
+    radeon: make text reserve 256k
+
+commit 65e46dddb8d5626c7299b22ee775a2592cbcca1b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Sep 8 10:11:27 2008 +1000
+
+    radeon: don't disable VGA bits it breaks X later
+
 commit 7111e3e07597d2eaeea9e39e22e9228458eb615b
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Sep 5 11:26:55 2008 +1000
@@ -33512,7 +33530,7 @@
  }
  
 diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
-index 0993816..e35122e 100644
+index 0993816..c7a565c 100644
 --- a/drivers/gpu/drm/radeon/radeon_drv.h
 +++ b/drivers/gpu/drm/radeon/radeon_drv.h
 @@ -34,6 +34,8 @@
@@ -36346,10 +36364,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
 new file mode 100644
-index 0000000..f4a0a6c
+index 0000000..12a0358
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_gem.c
-@@ -0,0 +1,1387 @@
+@@ -0,0 +1,1382 @@
 +/*
 + * Copyright 2008 Red Hat Inc.
 + *
@@ -37062,11 +37080,6 @@
 +	u32 mem_size, aper_size;
 +	u32 tmp;
 +
-+	/* turn off VGA IO bits */
-+	tmp = RADEON_READ(RADEON_CONFIG_CNTL);
-+	tmp |= (1 << 9);
-+	RADEON_WRITE(RADEON_CONFIG_CNTL, tmp);
-+
 +	dev_priv->mc_fb_location = radeon_read_fb_location(dev_priv);
 +	radeon_read_agp_location(dev_priv, &dev_priv->mc_agp_loc_lo, &dev_priv->mc_agp_loc_hi);
 +
@@ -37161,7 +37174,7 @@
 +	
 +	radeon_init_memory_map(dev);
 +
-+#define VRAM_RESERVE_TEXT (64*1024)
++#define VRAM_RESERVE_TEXT (256*1024) /* need to reserve 256 for text mode for now */
 +	dev_priv->mm.vram_visible -= VRAM_RESERVE_TEXT;
 +	pg_offset = VRAM_RESERVE_TEXT >> PAGE_SHIFT;
 +	drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, pg_offset, /*dev_priv->mm.vram_offset >> PAGE_SHIFT,*/


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.936
retrieving revision 1.937
diff -u -r1.936 -r1.937
--- kernel.spec	7 Sep 2008 18:01:05 -0000	1.936
+++ kernel.spec	8 Sep 2008 00:35:14 -0000	1.937
@@ -1746,6 +1746,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Sep 08 2008 Dave Airlie <airlied at redhat.com>
+- disable VGA bashing in radeon - make text reserve larger.
+
 * Sun Sep 07 2008 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.27-rc5-git9
 



From kkofler at fedoraproject.org  Mon Sep  8 00:36:17 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon,  8 Sep 2008 00:36:17 +0000 (UTC)
Subject: rpms/dragonplayer/F-9 dead.package, NONE, 1.1 .cvsignore, 1.4,
	NONE dragonplayer.spec, 1.10, NONE sources, 1.4, NONE
Message-ID: <20080908003617.DC5AF70128@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/dragonplayer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5731/F-9

Added Files:
	dead.package 
Removed Files:
	.cvsignore dragonplayer.spec sources 
Log Message:
Mark as dead in F-9 too now that 4.1 is stable (now part of kdemultimedia).


--- NEW FILE dead.package ---
Dragon Player is now part of kdemultimedia (since KDE 4.1).

--- .cvsignore DELETED ---


--- dragonplayer.spec DELETED ---


--- sources DELETED ---



From pkgdb at fedoraproject.org  Mon Sep  8 00:17:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 00:17:42 +0000
Subject: [pkgdb] kdeartwork-extras had acl change status
Message-ID: <20080908001742.B109E208D07@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeartwork-extras (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork-extras



From kkofler at fedoraproject.org  Mon Sep  8 00:38:37 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon,  8 Sep 2008 00:38:37 +0000 (UTC)
Subject: rpms/okteta/F-9 dead.package, NONE, 1.1 .cvsignore, 1.7,
	NONE okteta-0.1-beta2-cmakelists.patch, 1.1,
	NONE okteta-0.1-beta2-kde40.patch, 1.1, NONE okteta.spec, 1.11,
	NONE sources, 1.7, NONE
Message-ID: <20080908003837.ECD7C7012C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/okteta/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6492/F-9

Added Files:
	dead.package 
Removed Files:
	.cvsignore okteta-0.1-beta2-cmakelists.patch 
	okteta-0.1-beta2-kde40.patch okteta.spec sources 
Log Message:
Mark as dead in F-9 too now that 4.1 is stable (now part of kdeutils).


--- NEW FILE dead.package ---
Okteta is now part of kdeutils (since KDE 4.1).

--- .cvsignore DELETED ---


--- okteta-0.1-beta2-cmakelists.patch DELETED ---


--- okteta-0.1-beta2-kde40.patch DELETED ---


--- okteta.spec DELETED ---


--- sources DELETED ---



From transif at fedoraproject.org  Mon Sep  8 00:40:56 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Mon,  8 Sep 2008 00:40:56 +0000 (UTC)
Subject: comps/po ko.po,1.14,1.15
Message-ID: <20080908004056.3349370128@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7036/po

Modified Files:
	ko.po 
Log Message:
    2008-09-08  Eun-Ju KIm <eukim at redhat.com> (via eukim at fedoraproject.org)
    
      * po/ko.po: Updated Korean translation. 
    



Index: ko.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ko.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ko.po	5 Sep 2008 03:30:33 -0000	1.14
+++ ko.po	8 Sep 2008 00:40:25 -0000	1.15
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-02 01:21+0000\n"
-"PO-Revision-Date: 2008-09-02 16:01+1000\n"
+"POT-Creation-Date: 2008-09-07 17:21+0000\n"
+"PO-Revision-Date: 2008-09-08 10:35+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,7 @@
 "Plural-Forms:  nplurals=2; plural=(n!=1);\n\n"
 "\n"
 "\n"
+"\n"
 
 #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1
@@ -128,82 +129,82 @@
 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-f10.xml.in.h:23
 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-f10.xml.in.h:24
 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-f10.xml.in.h:25
 msgid "Clustering"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26
-#: ../comps-f10.xml.in.h:27
+#: ../comps-f10.xml.in.h:26
 msgid "Clustering Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27
-#: ../comps-f10.xml.in.h:28
+#: ../comps-f10.xml.in.h:27
 msgid "Core"
 msgstr "??????"
 
 #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28
-#: ../comps-f10.xml.in.h:29
+#: ../comps-f10.xml.in.h:28
 msgid "Croatian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29
-#: ../comps-f10.xml.in.h:30 ../comps-el5.xml.in.h:8
+#: ../comps-f10.xml.in.h:29 ../comps-el5.xml.in.h:8
 msgid "Czech Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30
-#: ../comps-f10.xml.in.h:31
+#: ../comps-f10.xml.in.h:30
 msgid "DNS Name Server"
 msgstr "DNS ?????? ??????"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31
-#: ../comps-f10.xml.in.h:32
+#: ../comps-f10.xml.in.h:31
 msgid "Danish Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
-#: ../comps-f10.xml.in.h:33 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9
+#: ../comps-f10.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
-#: ../comps-f10.xml.in.h:34 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10
+#: ../comps-f10.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
-#: ../comps-f10.xml.in.h:35 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11
+#: ../comps-f10.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35
-#: ../comps-f10.xml.in.h:36
+#: ../comps-f10.xml.in.h:35
 msgid "Development Libraries"
 msgstr "????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36
-#: ../comps-f10.xml.in.h:37 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12
+#: ../comps-f10.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37
-#: ../comps-f10.xml.in.h:38
+#: ../comps-f10.xml.in.h:37
 msgid "Dial-up Networking Support"
 msgstr "???????????? ???????????? ??????"
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
-#: ../comps-f10.xml.in.h:39
+#: ../comps-f10.xml.in.h:38
 msgid "Dutch Support"
 msgstr "??????????????? ??????"
 
@@ -212,72 +213,72 @@
 msgstr "Eclipse"
 
 #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39
-#: ../comps-f10.xml.in.h:40 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14
+#: ../comps-f10.xml.in.h:39 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40
-#: ../comps-f10.xml.in.h:41 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15
+#: ../comps-f10.xml.in.h:40 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "????????? ??????????????? "
 
 #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41
-#: ../comps-f10.xml.in.h:42 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16
+#: ../comps-f10.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "????????? ?????? ????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
-#: ../comps-f10.xml.in.h:43 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
+#: ../comps-f10.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43
-#: ../comps-f10.xml.in.h:44
+#: ../comps-f10.xml.in.h:43
 msgid "English (UK) Support"
 msgstr "?????? (?????????) ??????"
 
 #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45
-#: ../comps-f10.xml.in.h:46
+#: ../comps-f10.xml.in.h:45
 msgid "Estonian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46
-#: ../comps-f10.xml.in.h:47
+#: ../comps-f10.xml.in.h:46
 msgid "Ethiopic Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47
-#: ../comps-f10.xml.in.h:48 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18
+#: ../comps-f10.xml.in.h:47 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18
 msgid "FTP Server"
 msgstr "FTP ??????"
 
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48
-#: ../comps-f10.xml.in.h:49
+#: ../comps-f10.xml.in.h:48
 msgid "Faeroese Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
-#: ../comps-f10.xml.in.h:51 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19
+#: ../comps-f10.xml.in.h:50 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19
 msgid "Fedora Packager"
 msgstr "Fedora Packager"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
-#: ../comps-f10.xml.in.h:52
+#: ../comps-f10.xml.in.h:51
 msgid "Filipino Support"
 msgstr "???????????? ?????? "
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52
-#: ../comps-f10.xml.in.h:53
+#: ../comps-f10.xml.in.h:52
 msgid "Finnish Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55
-#: ../comps-f10.xml.in.h:56
+#: ../comps-f10.xml.in.h:55
 msgid "French Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56
-#: ../comps-f10.xml.in.h:57 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20
+#: ../comps-f10.xml.in.h:56 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
 "group allows you to work with sound and video on the system."
@@ -286,17 +287,17 @@
 "???????????? ????????? ???????????? ????????? ????????? ???????????? ??? ????????????."
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
-#: ../comps-f10.xml.in.h:58 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21
+#: ../comps-f10.xml.in.h:57 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ???????????? ??????"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58
-#: ../comps-f10.xml.in.h:59 ../comps-el4.xml.in.h:21 ../comps-el5.xml.in.h:22
+#: ../comps-f10.xml.in.h:58 ../comps-el4.xml.in.h:21 ../comps-el5.xml.in.h:22
 msgid "GNOME Software Development"
 msgstr "GNOME ??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59
-#: ../comps-f10.xml.in.h:60
+#: ../comps-f10.xml.in.h:59
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -305,153 +306,153 @@
 "????????? ?????? ????????? ????????? ????????? ????????????."
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60
-#: ../comps-f10.xml.in.h:61
+#: ../comps-f10.xml.in.h:60
 msgid "Gaelic Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61
-#: ../comps-f10.xml.in.h:62
+#: ../comps-f10.xml.in.h:61
 msgid "Galician Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62
-#: ../comps-f10.xml.in.h:63 ../comps-el5.xml.in.h:24
+#: ../comps-f10.xml.in.h:62 ../comps-el5.xml.in.h:24
 msgid "Games and Entertainment"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
-#: ../comps-f10.xml.in.h:64
+#: ../comps-f10.xml.in.h:63
 msgid "Georgian Support"
 msgstr "??????????????? ?????? "
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
-#: ../comps-f10.xml.in.h:65
+#: ../comps-f10.xml.in.h:64
 msgid "German Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65
-#: ../comps-f10.xml.in.h:66 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25
+#: ../comps-f10.xml.in.h:65 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25
 msgid "Graphical Internet"
 msgstr "????????? ?????????"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66
-#: ../comps-f10.xml.in.h:67 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26
+#: ../comps-f10.xml.in.h:66 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26
 msgid "Graphics"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67
-#: ../comps-f10.xml.in.h:68
+#: ../comps-f10.xml.in.h:67
 msgid "Greek Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68
-#: ../comps-f10.xml.in.h:69
+#: ../comps-f10.xml.in.h:68
 msgid "Gujarati Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69
-#: ../comps-f10.xml.in.h:70 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27
+#: ../comps-f10.xml.in.h:69 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27
 msgid "Hardware Support"
 msgstr "???????????? ?????? "
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70
-#: ../comps-f10.xml.in.h:72 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28
+#: ../comps-f10.xml.in.h:71 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28
 msgid "Hebrew Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71
-#: ../comps-f10.xml.in.h:73
+#: ../comps-f10.xml.in.h:72
 msgid "Hindi Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72
-#: ../comps-f10.xml.in.h:74
+#: ../comps-f10.xml.in.h:73
 msgid "Hungarian Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73
-#: ../comps-f10.xml.in.h:75
+#: ../comps-f10.xml.in.h:74
 msgid "Icelandic Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74
-#: ../comps-f10.xml.in.h:76
+#: ../comps-f10.xml.in.h:75
 msgid "Indonesian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75
-#: ../comps-f10.xml.in.h:79 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29
+#: ../comps-f10.xml.in.h:78 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
 msgstr "GTK+??? GNOME??? ????????? ?????? ??????????????? ?????????????????? ??? ???????????? ??????????????????."
 
 #: ../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-f10.xml.in.h:79
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr "GTK+??? GNOME??? ????????? ?????? ??????????????? ?????????????????? ??? ???????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
-#: ../comps-f10.xml.in.h:81 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
+#: ../comps-f10.xml.in.h:80 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "QT??? KDE??? ????????? ?????? ??????????????? ?????????????????? ??? ???????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
-#: ../comps-f10.xml.in.h:82
+#: ../comps-f10.xml.in.h:81
 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-el4.xml.in.h:29 ../comps-el5.xml.in.h:31
+#: ../comps-f10.xml.in.h:82 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31
 msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr ""
 "?????? ????????? (X) ????????? ?????????????????? ?????????????????? ??? ????????? ????????? ???????????????"
 "???."
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
-#: ../comps-f10.xml.in.h:85
+#: ../comps-f10.xml.in.h:84
 msgid "Inuktitut Support"
 msgstr "??????????????? ??????  "
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
-#: ../comps-f10.xml.in.h:86
+#: ../comps-f10.xml.in.h:85
 msgid "Irish Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83
-#: ../comps-f10.xml.in.h:87
+#: ../comps-f10.xml.in.h:86
 msgid "Italian Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84
-#: ../comps-f10.xml.in.h:88 ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:32
+#: ../comps-f10.xml.in.h:87 ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:32
 msgid "Japanese Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85
-#: ../comps-f10.xml.in.h:89 ../comps-el4.xml.in.h:31
+#: ../comps-f10.xml.in.h:88 ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "Java"
 
 #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86
-#: ../comps-f10.xml.in.h:90 ../comps-el4.xml.in.h:32
+#: ../comps-f10.xml.in.h:89 ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "Java ????????? ??????"
 
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
-#: ../comps-f10.xml.in.h:91 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33
+#: ../comps-f10.xml.in.h:90 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K ???????????? ??????)"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88
-#: ../comps-f10.xml.in.h:92 ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:34
+#: ../comps-f10.xml.in.h:91 ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:34
 msgid "KDE Software Development"
 msgstr "KDE ??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89
-#: ../comps-f10.xml.in.h:93
+#: ../comps-f10.xml.in.h:92
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -460,82 +461,82 @@
 "?????? ?????? ????????? ????????? ????????? ????????????."
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
-#: ../comps-f10.xml.in.h:94
+#: ../comps-f10.xml.in.h:93
 msgid "Kannada Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:96
+#: ../comps-f10.xml.in.h:95
 msgid "Khmer Support"
 msgstr "???????????? ?????? "
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:97
+#: ../comps-f10.xml.in.h:96
 msgid "Korean Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:94
-#: ../comps-f10.xml.in.h:98
+#: ../comps-f10.xml.in.h:97
 msgid "Languages"
 msgstr "?????? ??????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:99
+#: ../comps-f10.xml.in.h:98
 msgid "Lao Support"
 msgstr "????????? ?????? "
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:100
+#: ../comps-f10.xml.in.h:99
 msgid "Latvian Support"
 msgstr "??????????????? ??????  "
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:98
-#: ../comps-f10.xml.in.h:102
+#: ../comps-f10.xml.in.h:101
 msgid "Legacy Network Server"
 msgstr "????????? ???????????? ??????"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:103
+#: ../comps-f10.xml.in.h:102
 msgid "Legacy Software Development"
 msgstr "????????? ??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:104
+#: ../comps-f10.xml.in.h:103
 msgid "Legacy Software Support"
 msgstr "????????? ??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:105
+#: ../comps-f10.xml.in.h:104
 msgid "Lithuanian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:104
-#: ../comps-f10.xml.in.h:108 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
+#: ../comps-f10.xml.in.h:107 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "?????? ??????"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:109
+#: ../comps-f10.xml.in.h:108
 msgid "Malay Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:110
+#: ../comps-f10.xml.in.h:109
 msgid "Malayalam Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:111
+#: ../comps-f10.xml.in.h:110
 msgid "Maori Support"
 msgstr "???????????? ??????  "
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:112
+#: ../comps-f10.xml.in.h:111
 msgid "Marathi Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:110
-#: ../comps-f10.xml.in.h:114
+#: ../comps-f10.xml.in.h:113
 msgid "MySQL Database"
 msgstr "MySQL ??????????????????"
 
@@ -1070,31 +1071,31 @@
 msgid "Buildsystem building group"
 msgstr "?????? ????????? ?????? ?????? "
 
-#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50
+#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
-#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54
+#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53
 msgid "Fonts"
 msgstr "?????? "
 
-#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55
+#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "???????????? ????????? ????????? ????????? ??? ?????? ????????? "
 
-#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84
+#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "Eclipse ?????? ?????? ?????? ?????? "
 
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:101
+#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:100
 msgid "Legacy Fonts"
 msgstr "????????? ?????? "
 
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:106
+#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:105
 msgid "Low Saxon Support"
 msgstr "?????? ????????? ?????? "
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:113
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:112
 msgid "Mongolian Support"
 msgstr "????????? ??????  "
 
@@ -1106,15 +1107,15 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr "?????? ????????? ??? ?????? ?????? ????????? "
 
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45
+#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44
 msgid "Esperanto Support"
 msgstr "?????????????????? ?????? "
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:94
 msgid "Kashubian Support"
 msgstr "??????????????? ??????  "
 
-#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:107
+#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:106
 msgid "Macedonian Support"
 msgstr "?????????????????? ??????     "
 
@@ -1134,22 +1135,22 @@
 msgid "Walloon Support"
 msgstr "????????? ??????   "
 
-#: ../comps-f10.xml.in.h:23
-msgid "Burmese Support"
-msgstr "????????? ??????   "
-
-#: ../comps-f10.xml.in.h:71
+#: ../comps-f10.xml.in.h:70
 msgid "Haskell"
 msgstr "????????? "
 
-#: ../comps-f10.xml.in.h:77
+#: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
 msgstr "?????? ?????? "
 
-#: ../comps-f10.xml.in.h:78
+#: ../comps-f10.xml.in.h:77
 msgid "Input method packages for the input of international text."
 msgstr "?????? ????????? ????????? ?????? ?????? ?????? ?????????  "
 
+#: ../comps-f10.xml.in.h:114
+msgid "Myanmar (Burmese) Support"
+msgstr "????????? (?????????) ??????   "
+
 #: ../comps-f10.xml.in.h:158
 msgid "Tajik Support"
 msgstr "????????? ??????  "



From kkofler at fedoraproject.org  Mon Sep  8 00:42:24 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon,  8 Sep 2008 00:42:24 +0000 (UTC)
Subject: rpms/ksirk/F-9 dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE ksirk-1.7-desktop.patch, 1.1, NONE ksirk-1.7-gcc43.patch,
	1.1, NONE ksirk.spec, 1.5, NONE sources, 1.2, NONE
Message-ID: <20080908004224.9061970128@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/ksirk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7561/F-9

Added Files:
	dead.package 
Removed Files:
	.cvsignore ksirk-1.7-desktop.patch ksirk-1.7-gcc43.patch 
	ksirk.spec sources 
Log Message:
Mark as dead in F-9 too now that 4.1 is stable (now part of kdegames).


--- NEW FILE dead.package ---
Ksirk is now part of kdegames (since KDE 4.1).

--- .cvsignore DELETED ---


--- ksirk-1.7-desktop.patch DELETED ---


--- ksirk-1.7-gcc43.patch DELETED ---


--- ksirk.spec DELETED ---


--- sources DELETED ---



From cwickert at fedoraproject.org  Mon Sep  8 02:06:57 2008
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon,  8 Sep 2008 02:06:57 +0000 (UTC)
Subject: rpms/xfce4-dev-tools/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xfce4-dev-tools.spec, 1.5, 1.6
Message-ID: <20080908020657.F0A5470128@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-serv24338

Modified Files:
	.cvsignore sources xfce4-dev-tools.spec 
Log Message:
* Mon Sep 08 2008 Christoph Wickert <fedora christoph-wickert de> - 4.4.0.1-1
- Update to 4.4.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jan 2007 12:47:40 -0000	1.4
+++ .cvsignore	8 Sep 2008 02:06:27 -0000	1.5
@@ -1 +1 @@
-xfce4-dev-tools-4.4.0.tar.bz2
+xfce4-dev-tools-4.4.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jan 2007 12:47:40 -0000	1.4
+++ sources	8 Sep 2008 02:06:27 -0000	1.5
@@ -1 +1 @@
-db31d1ad47a96ebb7c8b69e0ee38f336  xfce4-dev-tools-4.4.0.tar.bz2
+7d09d161efc7ef86b3b48791d98c8ae8  xfce4-dev-tools-4.4.0.1.tar.bz2


Index: xfce4-dev-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/devel/xfce4-dev-tools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-dev-tools.spec	12 Aug 2008 13:45:06 -0000	1.5
+++ xfce4-dev-tools.spec	8 Sep 2008 02:06:27 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		xfce4-dev-tools
-Version:	4.4.0
-Release:	2%{?dist}
+Version:	4.4.0.1
+Release:	1%{?dist}
 Summary:	Xfce developer tools
 
 Group:		Development/Tools
@@ -37,11 +37,15 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog HACKING NEWS README
 %{_bindir}/xdt-autogen
+%{_bindir}/xdt-commit
 %dir %{_datadir}/xfce4
 %{_datadir}/xfce4/dev-tools/
 %{_datadir}/aclocal/*
 
 %changelog
+* Mon Sep 08 2008 Christoph Wickert <fedora christoph-wickert de> - 4.4.0.1-1
+- Update to 4.4.0.1
+
 * Tue Aug 12 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 4.4.0-2
 - Fix license tag.
 



From cwickert at fedoraproject.org  Mon Sep  8 02:11:22 2008
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon,  8 Sep 2008 02:11:22 +0000 (UTC)
Subject: rpms/xfce4-dev-tools/F-8 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xfce4-dev-tools.spec, 1.4, 1.5
Message-ID: <20080908021122.1C5FE7012C@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-dev-tools/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25318/F-8

Modified Files:
	.cvsignore sources xfce4-dev-tools.spec 
Log Message:
* Mon Sep 08 2008 Christoph Wickert <fedora christoph-wickert de> - 4.4.0.1-1
- Update to 4.4.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jan 2007 12:47:40 -0000	1.4
+++ .cvsignore	8 Sep 2008 02:10:51 -0000	1.5
@@ -1 +1 @@
-xfce4-dev-tools-4.4.0.tar.bz2
+xfce4-dev-tools-4.4.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jan 2007 12:47:40 -0000	1.4
+++ sources	8 Sep 2008 02:10:51 -0000	1.5
@@ -1 +1 @@
-db31d1ad47a96ebb7c8b69e0ee38f336  xfce4-dev-tools-4.4.0.tar.bz2
+7d09d161efc7ef86b3b48791d98c8ae8  xfce4-dev-tools-4.4.0.1.tar.bz2


Index: xfce4-dev-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/F-8/xfce4-dev-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-dev-tools.spec	22 Jan 2007 12:47:40 -0000	1.4
+++ xfce4-dev-tools.spec	8 Sep 2008 02:10:51 -0000	1.5
@@ -1,10 +1,10 @@
 Name:		xfce4-dev-tools
-Version:	4.4.0
+Version:	4.4.0.1
 Release:	1%{?dist}
 Summary:	Xfce developer tools
 
 Group:		Development/Tools
-License:	GPL
+License:	GPLv2+
 URL:		http://xfce.org/~benny/projects/xfce4-dev-tools/
 Source0: 	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,11 +37,18 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog HACKING NEWS README
 %{_bindir}/xdt-autogen
+%{_bindir}/xdt-commit
 %dir %{_datadir}/xfce4
 %{_datadir}/xfce4/dev-tools/
 %{_datadir}/aclocal/*
 
 %changelog
+* Mon Sep 08 2008 Christoph Wickert <fedora christoph-wickert de> - 4.4.0.1-1
+- Update to 4.4.0.1
+
+* Tue Aug 12 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 4.4.0-2
+- Fix license tag.
+
 * Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 4.4.0-1
 - Update to 4.4.0.
 



From cwickert at fedoraproject.org  Mon Sep  8 02:11:21 2008
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon,  8 Sep 2008 02:11:21 +0000 (UTC)
Subject: rpms/xfce4-dev-tools/F-9 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xfce4-dev-tools.spec, 1.4, 1.5
Message-ID: <20080908021122.02B4C7012C@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-dev-tools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25318/F-9

Modified Files:
	.cvsignore sources xfce4-dev-tools.spec 
Log Message:
* Mon Sep 08 2008 Christoph Wickert <fedora christoph-wickert de> - 4.4.0.1-1
- Update to 4.4.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jan 2007 12:47:40 -0000	1.4
+++ .cvsignore	8 Sep 2008 02:10:51 -0000	1.5
@@ -1 +1 @@
-xfce4-dev-tools-4.4.0.tar.bz2
+xfce4-dev-tools-4.4.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jan 2007 12:47:40 -0000	1.4
+++ sources	8 Sep 2008 02:10:51 -0000	1.5
@@ -1 +1 @@
-db31d1ad47a96ebb7c8b69e0ee38f336  xfce4-dev-tools-4.4.0.tar.bz2
+7d09d161efc7ef86b3b48791d98c8ae8  xfce4-dev-tools-4.4.0.1.tar.bz2


Index: xfce4-dev-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/F-9/xfce4-dev-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-dev-tools.spec	22 Jan 2007 12:47:40 -0000	1.4
+++ xfce4-dev-tools.spec	8 Sep 2008 02:10:51 -0000	1.5
@@ -1,10 +1,10 @@
 Name:		xfce4-dev-tools
-Version:	4.4.0
+Version:	4.4.0.1
 Release:	1%{?dist}
 Summary:	Xfce developer tools
 
 Group:		Development/Tools
-License:	GPL
+License:	GPLv2+
 URL:		http://xfce.org/~benny/projects/xfce4-dev-tools/
 Source0: 	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,11 +37,18 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog HACKING NEWS README
 %{_bindir}/xdt-autogen
+%{_bindir}/xdt-commit
 %dir %{_datadir}/xfce4
 %{_datadir}/xfce4/dev-tools/
 %{_datadir}/aclocal/*
 
 %changelog
+* Mon Sep 08 2008 Christoph Wickert <fedora christoph-wickert de> - 4.4.0.1-1
+- Update to 4.4.0.1
+
+* Tue Aug 12 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 4.4.0-2
+- Fix license tag.
+
 * Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 4.4.0-1
 - Update to 4.4.0.
 



From cweyl at fedoraproject.org  Mon Sep  8 02:18:43 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 02:18:43 +0000 (UTC)
Subject: rpms/perl-SQL-Translator/devel .cvsignore, 1.3,
	1.4 perl-SQL-Translator.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20080908021843.73E8A70128@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-serv27369

Modified Files:
	.cvsignore perl-SQL-Translator.spec sources 
Log Message:
* Sun Sep 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.9001-1
- update to 0.9001
- add new BR: perl(Digest::SHA1) >= 2.00



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Translator/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Mar 2008 16:02:56 -0000	1.3
+++ .cvsignore	8 Sep 2008 02:18:12 -0000	1.4
@@ -1 +1 @@
-SQL-Translator-0.09000.tar.gz
+SQL-Translator-0.09001.tar.gz


Index: perl-SQL-Translator.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Translator/devel/perl-SQL-Translator.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-SQL-Translator.spec	21 Mar 2008 16:02:56 -0000	1.4
+++ perl-SQL-Translator.spec	8 Sep 2008 02:18:13 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-SQL-Translator
-Version:        0.09000
+Version:        0.09001
 Release:        1%{?dist}
 Summary:        Manipulate structured data definitions (SQL and more)
 # see, e.g., lib/SQL/Translator.pm
@@ -25,6 +25,7 @@
 BuildRequires:  perl(Class::Data::Inheritable)  >= 0.02
 BuildRequires:  perl(Class::MakeMethods) 
 BuildRequires:  perl(DBI)
+BuildRequires:  perl(Digest::SHA1)              >= 2.00
 BuildRequires:  perl(GD) 
 BuildRequires:  perl(Graph::Directed) 
 BuildRequires:  perl(GraphViz) 
@@ -109,6 +110,10 @@
 %{_mandir}/man[13]/*
 
 %changelog
+* Sun Sep 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.9001-1
+- update to 0.9001
+- add new BR: perl(Digest::SHA1) >= 2.00
+
 * Wed Mar 19 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.09000-1
 - update to 0.09000
 - expose more core BR's


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Translator/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Mar 2008 16:02:56 -0000	1.3
+++ sources	8 Sep 2008 02:18:13 -0000	1.4
@@ -1 +1 @@
-976c480c6196895f8498e8f33495da3f  SQL-Translator-0.09000.tar.gz
+323ae358c3b468b0686b4ddad8703944  SQL-Translator-0.09001.tar.gz



From cweyl at fedoraproject.org  Mon Sep  8 02:32:47 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 02:32:47 +0000 (UTC)
Subject: rpms/perl-SQL-Translator/F-9 perl-SQL-Translator.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20080908023247.6A66170128@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Translator/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30441

Modified Files:
	perl-SQL-Translator.spec sources 
Log Message:
* Sun Sep 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.9001-1
- update to 0.9001
- add new BR: perl(Digest::SHA1) >= 2.00



Index: perl-SQL-Translator.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Translator/F-9/perl-SQL-Translator.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-SQL-Translator.spec	21 Mar 2008 16:02:56 -0000	1.4
+++ perl-SQL-Translator.spec	8 Sep 2008 02:32:17 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-SQL-Translator
-Version:        0.09000
+Version:        0.09001
 Release:        1%{?dist}
 Summary:        Manipulate structured data definitions (SQL and more)
 # see, e.g., lib/SQL/Translator.pm
@@ -25,6 +25,7 @@
 BuildRequires:  perl(Class::Data::Inheritable)  >= 0.02
 BuildRequires:  perl(Class::MakeMethods) 
 BuildRequires:  perl(DBI)
+BuildRequires:  perl(Digest::SHA1)              >= 2.00
 BuildRequires:  perl(GD) 
 BuildRequires:  perl(Graph::Directed) 
 BuildRequires:  perl(GraphViz) 
@@ -109,6 +110,10 @@
 %{_mandir}/man[13]/*
 
 %changelog
+* Sun Sep 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.9001-1
+- update to 0.9001
+- add new BR: perl(Digest::SHA1) >= 2.00
+
 * Wed Mar 19 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.09000-1
 - update to 0.09000
 - expose more core BR's


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Translator/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Mar 2008 16:02:56 -0000	1.3
+++ sources	8 Sep 2008 02:32:17 -0000	1.4
@@ -1 +1 @@
-976c480c6196895f8498e8f33495da3f  SQL-Translator-0.09000.tar.gz
+323ae358c3b468b0686b4ddad8703944  SQL-Translator-0.09001.tar.gz



From cweyl at fedoraproject.org  Mon Sep  8 02:37:24 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 02:37:24 +0000 (UTC)
Subject: rpms/perl-Text-SimpleTable/devel simpletable.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 perl-Text-SimpleTable.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20080908023724.2A1DE70128@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-serv31662

Modified Files:
	.cvsignore perl-Text-SimpleTable.spec sources 
Added Files:
	simpletable.patch 
Log Message:
* Sun Sep 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
- update to 0.05
- add patch from CPAN RT#22371
- change to ExtUtils::MakeMaker incantations


simpletable.patch:

--- NEW FILE simpletable.patch ---
=== Changes
==================================================================
--- Changes	(revision 13598)
+++ Changes	(local)
@@ -1,5 +1,8 @@
 Tis file documents the revision history for Perl extension Text::SimpleTable.
 
+0.04  2006-10-19
+        - Added horizontal rule (hr) method
+
 0.03  2006-01-17 22:00:00
         - Fixed bug where text items of '0' were not displayed.
 
=== lib/Text/SimpleTable.pm
==================================================================
--- lib/Text/SimpleTable.pm	(revision 13598)
+++ lib/Text/SimpleTable.pm	(local)
@@ -96,6 +96,17 @@
     return $self;
 }
 
+=item $table->hr
+
+=cut
+
+sub hr {
+    my ( $self ) = @_;
+    for( 0..@{ $self->{columns} } - 1 ) {
+        push @{ $self->{columns}->[ $_ ]->[ 1 ] }, undef;
+    }
+}
+
 =item $table->row( @texts )
 
 =cut
@@ -127,6 +138,28 @@
     return $self;
 }
 
+sub _draw_hr {
+    my $self    = shift;
+    my $columns = @{ $self->{columns} } - 1;
+    my $output  = '';
+
+    for my $j ( 0 .. $columns ) {
+        my $column = $self->{columns}->[$j];
+        my $width  = $column->[0];
+        my $text   = $MIDDLE_BORDER x $width;
+        if ( ( $j == 0 ) && ( $columns == 0 ) ) {
+            $text = "$MIDDLE_LEFT$text$MIDDLE_RIGHT";
+        }
+        elsif ( $j == 0 ) { $text = "$MIDDLE_LEFT$text$MIDDLE_SEPARATOR" }
+        elsif ( $j == $columns ) { $text = "$text$MIDDLE_RIGHT" }
+        else { $text = "$text$MIDDLE_SEPARATOR" }
+        $output .= $text;
+    }
+    $output .= "\n";
+
+    return $output;
+}
+
 =item $table->draw
 
 =cut
@@ -179,25 +212,18 @@
         }
 
         # Title separator
-        for my $j ( 0 .. $columns ) {
-            my $column = $self->{columns}->[$j];
-            my $width  = $column->[0];
-            my $text   = $MIDDLE_BORDER x $width;
-            if ( ( $j == 0 ) && ( $columns == 0 ) ) {
-                $text = "$MIDDLE_LEFT$text$MIDDLE_RIGHT";
-            }
-            elsif ( $j == 0 ) { $text = "$MIDDLE_LEFT$text$MIDDLE_SEPARATOR" }
-            elsif ( $j == $columns ) { $text = "$text$MIDDLE_RIGHT" }
-            else { $text = "$text$MIDDLE_SEPARATOR" }
-            $output .= $text;
-        }
-        $output .= "\n";
-
+        $output .= $self->_draw_hr;
     }
 
     # Rows
     for my $i ( 0 .. $rows ) {
 
+        # Check for horizontal rule
+        if( !grep { defined $self->{columns}->[$_]->[1]->[$i] } 0..$columns ) {
+             $output .= $self->_draw_hr;
+             next;
+        }
+
         for my $j ( 0 .. $columns ) {
             my $column = $self->{columns}->[$j];
             my $width  = $column->[0];
=== t/04tables.t
==================================================================
--- t/04tables.t	(revision 13598)
+++ t/04tables.t	(local)
@@ -1,4 +1,4 @@
-use Test::More tests => 4;
+use Test::More tests => 5;
 
 use_ok('Text::SimpleTable');
 
@@ -44,3 +44,21 @@
 | orks! |
 '-------'
 EOF
+
+my $t4 = Text::SimpleTable->new(5);
+$t4->row('Everything works!');
+$t4->hr;
+$t4->row('Everything works!');
+is( $t4->draw, <<"EOF");
+.-------.
+| Ever- |
+| ythi- |
+| ng w- |
+| orks! |
++-------+
+| Ever- |
+| ythi- |
+| ng w- |
+| orks! |
+'-------'
+EOF


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-SimpleTable/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 May 2007 14:56:05 -0000	1.2
+++ .cvsignore	8 Sep 2008 02:36:53 -0000	1.3
@@ -1 +1 @@
-Text-SimpleTable-0.03.tar.gz
+Text-SimpleTable-0.05.tar.gz


Index: perl-Text-SimpleTable.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-SimpleTable/devel/perl-Text-SimpleTable.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Text-SimpleTable.spec	5 Mar 2008 15:19:58 -0000	1.3
+++ perl-Text-SimpleTable.spec	8 Sep 2008 02:36:53 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Text-SimpleTable
-Version:        0.03
-Release:        3%{?dist}
+Version:        0.05
+Release:        1%{?dist}
 Summary:        Simple Eyecandy ASCII Tables
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -10,13 +10,15 @@
 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(Test::More)
-# cpan
-BuildRequires:  perl(Module::Build)
+BuildRequires:  perl(ExtUtils::MakeMaker)
 # testing
+BuildRequires:  perl(Test::More)
 #BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 
 %description
@@ -24,22 +26,24 @@
 
 %prep
 %setup -q -n Text-SimpleTable-%{version}
+%patch0
 
 %build
-%{__perl} Build.PL installdirs=vendor
-./Build
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+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} -depth -type d -exec rmdir {} 2>/dev/null \;
 
 %{_fixperms} %{buildroot}/*
 
 %check
 #export TEST_POD=1
-./Build test
+make test
 
 %clean
 rm -rf %{buildroot}
@@ -51,6 +55,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
+- update to 0.05
+- add patch from CPAN RT#22371
+- change to ExtUtils::MakeMaker incantations
+
 * Wed Mar 05 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.03-3
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-SimpleTable/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 May 2007 14:56:05 -0000	1.2
+++ sources	8 Sep 2008 02:36:53 -0000	1.3
@@ -1 +1 @@
-7eaf266174d4bf2b66f98db28c291b15  Text-SimpleTable-0.03.tar.gz
+90f884fec82f85df903ad7934b5351a6  Text-SimpleTable-0.05.tar.gz



From pkgdb at fedoraproject.org  Mon Sep  8 02:38:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 02:38:36 +0000
Subject: [pkgdb] subversion: endo69 has requested watchcommits
Message-ID: <20080908023836.ED9F720876E@bastion.fedora.phx.redhat.com>

endo69 has requested the watchcommits acl on subversion (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From pkgdb at fedoraproject.org  Mon Sep  8 02:38:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 02:38:41 +0000
Subject: [pkgdb] subversion: endo69 has given up watchcommits
Message-ID: <20080908023841.9388D208D07@bastion.fedora.phx.redhat.com>

endo69 has given up the watchcommits acl on subversion (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From pkgdb at fedoraproject.org  Mon Sep  8 02:39:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 02:39:02 +0000
Subject: [pkgdb] subversion: endo69 has requested watchbugzilla
Message-ID: <20080908023902.459C920876E@bastion.fedora.phx.redhat.com>

endo69 has requested the watchbugzilla acl on subversion (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From pkgdb at fedoraproject.org  Mon Sep  8 02:40:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 02:40:17 +0000
Subject: [pkgdb] subversion: endo69 has given up watchbugzilla
Message-ID: <20080908024017.E5D6C20876F@bastion.fedora.phx.redhat.com>

endo69 has given up the watchbugzilla acl on subversion (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From pkgdb at fedoraproject.org  Mon Sep  8 02:40:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 02:40:28 +0000
Subject: [pkgdb] subversion: endo69 has requested watchbugzilla
Message-ID: <20080908024029.0F84A20876F@bastion.fedora.phx.redhat.com>

endo69 has requested the watchbugzilla acl on subversion (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From pkgdb at fedoraproject.org  Mon Sep  8 02:40:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 02:40:35 +0000
Subject: [pkgdb] subversion: endo69 has given up watchbugzilla
Message-ID: <20080908024035.2302D208D0F@bastion.fedora.phx.redhat.com>

endo69 has given up the watchbugzilla acl on subversion (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From pgordon at fedoraproject.org  Mon Sep  8 02:41:35 2008
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Mon,  8 Sep 2008 02:41:35 +0000 (UTC)
Subject: rpms/epiphany-extensions/devel .cvsignore, 1.26,
	1.27 epiphany-extensions.spec, 1.47, 1.48 sources, 1.26,
	1.27 epiphany-extensions-2.22_23-api.diff, 1.2, NONE
Message-ID: <20080908024135.1FE6C70128@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/epiphany-extensions/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv391

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Removed Files:
	epiphany-extensions-2.22_23-api.diff 
Log Message:
Update to new upstream release (2.23.91); drop 2.22->2.23 API bumps (applied upstream).


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	7 Apr 2008 16:45:50 -0000	1.26
+++ .cvsignore	8 Sep 2008 02:41:04 -0000	1.27
@@ -1 +1 @@
-epiphany-extensions-2.22.1.tar.bz2
+epiphany-extensions-2.23.91.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- epiphany-extensions.spec	27 Jul 2008 04:17:14 -0000	1.47
+++ epiphany-extensions.spec	8 Sep 2008 02:41:04 -0000	1.48
@@ -3,8 +3,8 @@
 %global gecko_version       1.9.0.1
 
 Name:           epiphany-extensions
-Version:        %{ephy_major}.0
-Release:        0.1%{?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
@@ -13,26 +13,21 @@
 Group:          Applications/Internet
 URL:            http://www.gnome.org/projects/epiphany/extensions
 
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/2.22/%{name}-2.22.1.tar.bz2
-
-## Upstream bug report: http://bugzilla.gnome.org/show_bug.cgi?id=544928
-Patch0: 	%{name}-2.22_23-api.diff
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/%{ephy_major}/%{name}-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  epiphany-devel >= %{ephy_min_version}
-BuildRequires:  perl(XML::Parser)
-BuildRequires:  gettext
-BuildRequires:  libtool
-BuildRequires:  opensp-devel
-BuildRequires:  pcre-devel
+BuildRequires:	epiphany-devel >= %{ephy_min_version}
+BuildRequires:	perl(XML::Parser)
+BuildRequires:	gettext
+BuildRequires:	intltool
+BuildRequires:	libtool
+BuildRequires:	opensp-devel
+BuildRequires:	pcre-devel
 ## gecko-devel is not strictly required, as epiphany-devel pulls it in.
 ## BuildRequire it anyway so we fail if not building against the version
 ## we are expecting to.
 BuildRequires:  gecko-devel-unstable = %{gecko_version}
-## We need the following for recreating the internal build-system after
-## patching...
-BuildRequires:	gnome-common
 
 Requires:       epiphany >= %{ephy_min_version}
 Requires:       gecko-libs = %{gecko_version}
@@ -53,12 +48,10 @@
 
 
 %prep
-%setup -qn "%{name}-2.22.1"
-%patch0 -b _2.23-api-build-scripts
+%setup -q
 
 
 %build
-autoreconf
 %configure --disable-scrollkeeper   		\
            --with-gecko=libxul-embedding	\
            --with-extensions=really-all
@@ -120,6 +113,11 @@
 
 
 %changelog
+* Sun Sep 07 2008 Peter Gordon <peter at thecodergeek.com> - 2.23.91-1
+- Update to new upstream release (2.23.91)
+- Drop fixes for Ephy 2.23 API bump (applied upstream):
+  - 2.22_23-api.diff
+
 * Sat Jul 26 2008 Peter Gordon <peter at thecodergeek.com> - 2.23.0-0.1
 - Adapt internal build scripts so that the Extensions are built against and
   run with Ephy 2.23/2.24: 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	7 Apr 2008 16:45:50 -0000	1.26
+++ sources	8 Sep 2008 02:41:04 -0000	1.27
@@ -1 +1 @@
-2ecdaf6aed4f9daec3225f4aa40c6efc  epiphany-extensions-2.22.1.tar.bz2
+e650ec33d428e9b5e91441b11c0fbf61  epiphany-extensions-2.23.91.tar.bz2


--- epiphany-extensions-2.22_23-api.diff DELETED ---



From pkgdb at fedoraproject.org  Mon Sep  8 02:42:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 02:42:02 +0000
Subject: [pkgdb] subversion: endo69 has requested watchbugzilla
Message-ID: <20080908024202.0830620876F@bastion.fedora.phx.redhat.com>

endo69 has requested the watchbugzilla acl on subversion (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From pkgdb at fedoraproject.org  Mon Sep  8 02:42:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 02:42:04 +0000
Subject: [pkgdb] subversion: endo69 has given up watchbugzilla
Message-ID: <20080908024204.87715208D07@bastion.fedora.phx.redhat.com>

endo69 has given up the watchbugzilla acl on subversion (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From pkgdb at fedoraproject.org  Mon Sep  8 02:42:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 02:42:07 +0000
Subject: [pkgdb] subversion: endo69 has requested watchbugzilla
Message-ID: <20080908024207.4B368208D7C@bastion.fedora.phx.redhat.com>

endo69 has requested the watchbugzilla acl on subversion (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From pkgdb at fedoraproject.org  Mon Sep  8 02:42:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 02:42:08 +0000
Subject: [pkgdb] subversion: endo69 has requested watchcommits
Message-ID: <20080908024208.BDBF4208D9A@bastion.fedora.phx.redhat.com>

endo69 has requested the watchcommits acl on subversion (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From cweyl at fedoraproject.org  Mon Sep  8 02:55:32 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 02:55:32 +0000 (UTC)
Subject: rpms/perl-Text-SimpleTable/devel perl-Text-SimpleTable.spec, 1.4,
	1.5
Message-ID: <20080908025532.89E6F70128@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-serv4041

Modified Files:
	perl-Text-SimpleTable.spec 
Log Message:
* Sun Sep 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.05-2
- let's try this again, with patch fuzz = 2



Index: perl-Text-SimpleTable.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-SimpleTable/devel/perl-Text-SimpleTable.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Text-SimpleTable.spec	8 Sep 2008 02:36:53 -0000	1.4
+++ perl-Text-SimpleTable.spec	8 Sep 2008 02:55:02 -0000	1.5
@@ -1,3 +1,5 @@
+%define _default_patch_fuzz 2
+
 Name:           perl-Text-SimpleTable
 Version:        0.05
 Release:        1%{?dist}
@@ -55,6 +57,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.05-2
+- let's try this again, with patch fuzz = 2
+
 * Sun Sep 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
 - update to 0.05
 - add patch from CPAN RT#22371



From cweyl at fedoraproject.org  Mon Sep  8 02:56:58 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 02:56:58 +0000 (UTC)
Subject: rpms/perl-Text-SimpleTable/devel perl-Text-SimpleTable.spec, 1.5,
	1.6
Message-ID: <20080908025658.C870270128@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-serv4466

Modified Files:
	perl-Text-SimpleTable.spec 
Log Message:
* Sun Sep 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.05-2
- let's try this again, with patch fuzz = 2



Index: perl-Text-SimpleTable.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-SimpleTable/devel/perl-Text-SimpleTable.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Text-SimpleTable.spec	8 Sep 2008 02:55:02 -0000	1.5
+++ perl-Text-SimpleTable.spec	8 Sep 2008 02:56:28 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           perl-Text-SimpleTable
 Version:        0.05
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple Eyecandy ASCII Tables
 License:        GPL+ or Artistic
 Group:          Development/Libraries



From cweyl at fedoraproject.org  Mon Sep  8 03:17:32 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 03:17:32 +0000 (UTC)
Subject: rpms/perl-POE/devel .cvsignore, 1.8, 1.9 perl-POE.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <20080908031732.4E71870128@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10341

Modified Files:
	.cvsignore perl-POE.spec sources 
Log Message:
* Sun Sep 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.003-1
- update to 1.003
- filter provides, too



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Mar 2008 16:19:13 -0000	1.8
+++ .cvsignore	8 Sep 2008 03:17:02 -0000	1.9
@@ -1 +1 @@
-POE-0.9999.tar.gz
+POE-1.003.tar.gz


Index: perl-POE.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE/devel/perl-POE.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-POE.spec	4 Mar 2008 16:19:13 -0000	1.12
+++ perl-POE.spec	8 Sep 2008 03:17:02 -0000	1.13
@@ -1,5 +1,5 @@
 Name:      perl-POE
-Version:   0.9999 
+Version:   1.003
 Release:   1%{?dist}
 Summary:   POE - portable multitasking and networking framework for Perl 
 
@@ -64,7 +64,7 @@
 # Filter unwanted Requires:
 cat << \EOF > %{name}-req
 #!/bin/sh
-%{__perl_requires} $* |\
+%{__perl_requires} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'`
   sed -e '/perl(Tk)/d; /perl(Test::More)/d; /perl(lib)/d'
 EOF
 
@@ -72,6 +72,17 @@
 chmod +x %{__perl_requires}
 
 
+# Filter unwanted Provides:
+cat << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'` |\
+  sed -e '/^perl(POE::Kernel)$/d; /^perl(POE::Loop::Tk)$/d'
+EOF
+
+%define __perl_provides %{_builddir}/POE-%{version}/%{name}-prov
+chmod +x %{__perl_provides}
+
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor --default
 
@@ -94,7 +105,6 @@
 %check
 # these tests fails under plague.  Not quite sure why....
 mv t/90_regression/rt1648-tied-stderr.t .
-mv t/30_loops/50_tk/wheel_run.t .
 
 # enable POD tests
 #export POE_TEST_POD=1
@@ -106,7 +116,6 @@
 make test
 
 mv rt1648-tied-stderr.t t/90_regression/
-mv wheel_run.t t/30_loops/50_tk/
 
 %clean
 rm -rf %{buildroot}
@@ -120,6 +129,13 @@
 
 
 %changelog
+* Sun Sep 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.003-1
+- update to 1.003
+- filter provides, too
+
+* Mon Jun 16 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.0002-1
+- update to 1.0002
+
 * Tue Mar  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.9999-1
 - update to 0.9999
 - don't filter out POE::Kernel, POE::Loop::Tk (it actually is provided)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Mar 2008 16:19:13 -0000	1.8
+++ sources	8 Sep 2008 03:17:02 -0000	1.9
@@ -1 +1 @@
-6672a43075cd597ed1011db5b45f1f1d  POE-0.9999.tar.gz
+b75c10096c802e0c823c4e554b9135c6  POE-1.003.tar.gz



From cweyl at fedoraproject.org  Mon Sep  8 03:23:52 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 03:23:52 +0000 (UTC)
Subject: rpms/perl-JSON-XS/devel .cvsignore, 1.7, 1.8 perl-JSON-XS.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <20080908032352.0935F70128@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-JSON-XS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12244

Modified Files:
	.cvsignore perl-JSON-XS.spec sources 
Log Message:
* Sun Sep 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.2222-1
- update to the increasingly silly version of 2.2222
- update files to include bin



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-JSON-XS/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Jun 2008 03:19:47 -0000	1.7
+++ .cvsignore	8 Sep 2008 03:23:21 -0000	1.8
@@ -1 +1 @@
-JSON-XS-2.21.tar.gz
+JSON-XS-2.2222.tar.gz


Index: perl-JSON-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-JSON-XS/devel/perl-JSON-XS.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-JSON-XS.spec	26 Jun 2008 03:19:47 -0000	1.10
+++ perl-JSON-XS.spec	8 Sep 2008 03:23:21 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-JSON-XS
-Version:        2.21
+Version:        2.2222
 Release:        1%{?dist}
 Summary:        JSON serialising/deserialising, done correctly and fast
 License:        GPL+ or Artistic 
@@ -51,11 +51,16 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes COPYING README t/ eg/
-%{perl_vendorarch}/auto/*
-%{perl_vendorarch}/JSON*
-%{_mandir}/man3/*
+%{perl_vendorarch}/*
+%exclude %dir %{perl_vendorarch}/auto
+%{_bindir}/*
+%{_mandir}/man[13]/*
 
 %changelog
+* Sun Sep 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.2222-1
+- update to the increasingly silly version of 2.2222
+- update files to include bin
+
 * Wed Jun 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.21-1
 - update to 2.21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-JSON-XS/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Jun 2008 03:19:47 -0000	1.7
+++ sources	8 Sep 2008 03:23:21 -0000	1.8
@@ -1 +1 @@
-84b9f126d07ae1fa647fac9f1cc6617e  JSON-XS-2.21.tar.gz
+86e31c3f45f6400dd612b74f4e5c3623  JSON-XS-2.2222.tar.gz



From mtasaka at fedoraproject.org  Mon Sep  8 03:40:43 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  8 Sep 2008 03:40:43 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.288, 1.289 jd.spec, 1.326, 1.327 sources, 
	1.289, 1.290
Message-ID: <20080908034043.A30087012B@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17328/F-9

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Sep  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2319
- revert default browser setting



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- .cvsignore	6 Sep 2008 16:05:59 -0000	1.288
+++ .cvsignore	8 Sep 2008 03:40:13 -0000	1.289
@@ -1 +1 @@
-jd-2.0.1-svn2316_trunk.tgz
+jd-2.0.1-svn2319_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- jd.spec	6 Sep 2008 16:05:59 -0000	1.326
+++ jd.spec	8 Sep 2008 03:40:13 -0000	1.327
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.1
-%define         strtag        svn2316_trunk
+%define         strtag        svn2319_trunk
 %define         repoid        32731
 # Define this if this is pre-version
 %define         pre_release   1
@@ -134,8 +134,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Sep  7 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2316
+* Mon Sep  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2319
 - revert default browser setting
 
 * Tue Sep  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.beta080901


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- sources	6 Sep 2008 16:05:59 -0000	1.289
+++ sources	8 Sep 2008 03:40:13 -0000	1.290
@@ -1 +1 @@
-6f1daa0ee2b773d6dc70fcf77aa16936  jd-2.0.1-svn2316_trunk.tgz
+c7ecf6f3a652f19b15329307b0172aa0  jd-2.0.1-svn2319_trunk.tgz



From mtasaka at fedoraproject.org  Mon Sep  8 03:40:43 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  8 Sep 2008 03:40:43 +0000 (UTC)
Subject: rpms/jd/F-8 .cvsignore, 1.281, 1.282 jd.spec, 1.315, 1.316 sources, 
	1.282, 1.283
Message-ID: <20080908034043.6ED0E70128@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17328/F-8

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Sep  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2319
- revert default browser setting



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -r1.281 -r1.282
--- .cvsignore	6 Sep 2008 16:05:59 -0000	1.281
+++ .cvsignore	8 Sep 2008 03:40:13 -0000	1.282
@@ -1 +1 @@
-jd-2.0.1-svn2316_trunk.tgz
+jd-2.0.1-svn2319_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- jd.spec	6 Sep 2008 16:05:59 -0000	1.315
+++ jd.spec	8 Sep 2008 03:40:13 -0000	1.316
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.1
-%define         strtag        svn2316_trunk
+%define         strtag        svn2319_trunk
 %define         repoid        32731
 # Define this if this is pre-version
 %define         pre_release   1
@@ -134,8 +134,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Sep  7 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2316
+* Mon Sep  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2319
 - revert default browser setting
 
 * Tue Sep  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.beta080901


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/sources,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- sources	6 Sep 2008 16:05:59 -0000	1.282
+++ sources	8 Sep 2008 03:40:13 -0000	1.283
@@ -1 +1 @@
-6f1daa0ee2b773d6dc70fcf77aa16936  jd-2.0.1-svn2316_trunk.tgz
+c7ecf6f3a652f19b15329307b0172aa0  jd-2.0.1-svn2319_trunk.tgz



From mtasaka at fedoraproject.org  Mon Sep  8 03:40:43 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  8 Sep 2008 03:40:43 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.288, 1.289 jd.spec, 1.334, 1.335 sources,
	1.289, 1.290
Message-ID: <20080908034043.E489B70128@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17328/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Sep  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2319
- revert default browser setting



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- .cvsignore	6 Sep 2008 16:05:59 -0000	1.288
+++ .cvsignore	8 Sep 2008 03:40:13 -0000	1.289
@@ -1 +1 @@
-jd-2.0.1-svn2316_trunk.tgz
+jd-2.0.1-svn2319_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -r1.334 -r1.335
--- jd.spec	6 Sep 2008 16:05:59 -0000	1.334
+++ jd.spec	8 Sep 2008 03:40:13 -0000	1.335
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.1
-%define         strtag        svn2316_trunk
+%define         strtag        svn2319_trunk
 %define         repoid        32731
 # Define this if this is pre-version
 %define         pre_release   1
@@ -134,8 +134,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Sep  7 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2316
+* Mon Sep  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2319
 - revert default browser setting
 
 * Tue Sep  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.beta080901


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- sources	6 Sep 2008 16:05:59 -0000	1.289
+++ sources	8 Sep 2008 03:40:13 -0000	1.290
@@ -1 +1 @@
-6f1daa0ee2b773d6dc70fcf77aa16936  jd-2.0.1-svn2316_trunk.tgz
+c7ecf6f3a652f19b15329307b0172aa0  jd-2.0.1-svn2319_trunk.tgz



From mclasen at fedoraproject.org  Mon Sep  8 03:51:55 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 03:51:55 +0000 (UTC)
Subject: rpms/gnome-keyring/devel .cvsignore, 1.47, 1.48 gnome-keyring.spec, 
	1.93, 1.94 sources, 1.47, 1.48
Message-ID: <20080908035155.BAC8070128@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21568

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	4 Sep 2008 05:00:02 -0000	1.47
+++ .cvsignore	8 Sep 2008 03:51:25 -0000	1.48
@@ -1 +1 @@
-gnome-keyring-2.23.91.tar.bz2
+gnome-keyring-2.23.92.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- gnome-keyring.spec	4 Sep 2008 05:18:31 -0000	1.93
+++ gnome-keyring.spec	8 Sep 2008 03:51:25 -0000	1.94
@@ -7,7 +7,7 @@
 
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
-Version: 2.23.91
+Version: 2.23.92
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
@@ -136,6 +136,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	4 Sep 2008 05:00:02 -0000	1.47
+++ sources	8 Sep 2008 03:51:25 -0000	1.48
@@ -1 +1 @@
-dcbdfd69bae4fb133ac9ba9b9846f8aa  gnome-keyring-2.23.91.tar.bz2
+a7f81563bd0d0ecf68c160544c7dd0b3  gnome-keyring-2.23.92.tar.bz2



From mclasen at fedoraproject.org  Mon Sep  8 03:57:07 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 03:57:07 +0000 (UTC)
Subject: rpms/seahorse/devel .cvsignore, 1.17, 1.18 seahorse.spec, 1.48,
	1.49 sources, 1.19, 1.20
Message-ID: <20080908035707.0FFE170128@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/seahorse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23443

Modified Files:
	.cvsignore seahorse.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	4 Sep 2008 05:23:05 -0000	1.17
+++ .cvsignore	8 Sep 2008 03:56:36 -0000	1.18
@@ -1 +1 @@
-seahorse-2.23.91.tar.bz2
+seahorse-2.23.92.tar.bz2


Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- seahorse.spec	4 Sep 2008 05:23:05 -0000	1.48
+++ seahorse.spec	8 Sep 2008 03:56:36 -0000	1.49
@@ -1,5 +1,5 @@
 Name: 		seahorse
-Version: 	2.23.91
+Version: 	2.23.92
 Release:        1%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
@@ -142,6 +142,9 @@
 %{_libdir}/pkgconfig/cryptui-0.0.pc
 
 %changelog
+* Sun Sep  7 2008 Matthias Clasen <mclasen at redhat.com> 2.23.92-1
+- Update to 2.23.92
+
 * Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	4 Sep 2008 05:23:05 -0000	1.19
+++ sources	8 Sep 2008 03:56:36 -0000	1.20
@@ -1 +1 @@
-e4949546bdf97ce26c334afab6c62365  seahorse-2.23.91.tar.bz2
+4980542dcd6fcbe1d3a180c5cf3592f3  seahorse-2.23.92.tar.bz2



From mclasen at fedoraproject.org  Mon Sep  8 04:03:50 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 04:03:50 +0000 (UTC)
Subject: rpms/seahorse-plugins/devel .cvsignore, 1.3,
	1.4 seahorse-plugins.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20080908040350.8FE1270128@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/seahorse-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25950

Modified Files:
	.cvsignore seahorse-plugins.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Sep 2008 06:10:59 -0000	1.3
+++ .cvsignore	8 Sep 2008 04:03:20 -0000	1.4
@@ -1 +1 @@
-seahorse-plugins-2.23.91.tar.bz2
+seahorse-plugins-2.23.92.tar.bz2


Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/devel/seahorse-plugins.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- seahorse-plugins.spec	4 Sep 2008 06:10:59 -0000	1.3
+++ seahorse-plugins.spec	8 Sep 2008 04:03:20 -0000	1.4
@@ -1,5 +1,5 @@
 Name: 		seahorse-plugins
-Version: 	2.23.91
+Version: 	2.23.92
 Release:        1%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
 Group: 		User Interface/Desktops
@@ -171,6 +171,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> 2.23.92-1
+- Update to 2.23.92
+
 * Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Sep 2008 06:10:59 -0000	1.3
+++ sources	8 Sep 2008 04:03:20 -0000	1.4
@@ -1 +1 @@
-585371c1302077894e514b6305c82acd  seahorse-plugins-2.23.91.tar.bz2
+7bc684df26243936091e07b19540bc42  seahorse-plugins-2.23.92.tar.bz2



From pkgdb at fedoraproject.org  Mon Sep  8 04:11:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 04:11:45 +0000
Subject: [pkgdb] nted was added for ndim
Message-ID: <20080908041145.A21E120876F@bastion.fedora.phx.redhat.com>

kevin has added Package nted with summary Musical score editor
kevin has approved Package nted
kevin has added a Fedora devel branch for nted with an owner of ndim
kevin has approved nted in Fedora devel
kevin has approved Package nted
kevin has set commit to Approved for packager on nted (Fedora devel)
kevin has set build to Approved for packager on nted (Fedora devel)
kevin has set checkout to Approved for packager on nted (Fedora devel)
kevin has set commit to Approved for uberpackager on nted (Fedora devel)
kevin has set build to Approved for uberpackager on nted (Fedora devel)
kevin has set checkout to Approved for uberpackager on nted (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nted



From pkgdb at fedoraproject.org  Mon Sep  8 04:11:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 04:11:52 +0000
Subject: [pkgdb] nted (Fedora, 9) updated by kevin
Message-ID: <20080908041154.4FD13208D0F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for nted
kevin has set commit to Approved for uberpackager on nted (Fedora 9)
kevin has set build to Approved for uberpackager on nted (Fedora 9)
kevin has set checkout to Approved for uberpackager on nted (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nted



From kevin at fedoraproject.org  Mon Sep  8 04:12:12 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 04:12:12 +0000 (UTC)
Subject: rpms/nted - New directory
Message-ID: <20080908041212.3186370128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/nted
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse29338/rpms/nted

Log Message:
Directory /cvs/extras/rpms/nted added to the repository




From kevin at fedoraproject.org  Mon Sep  8 04:12:12 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 04:12:12 +0000 (UTC)
Subject: rpms/nted/devel - New directory
Message-ID: <20080908041212.65DCB70128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/nted/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse29338/rpms/nted/devel

Log Message:
Directory /cvs/extras/rpms/nted/devel added to the repository




From kevin at fedoraproject.org  Mon Sep  8 04:12:13 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 04:12:13 +0000 (UTC)
Subject: rpms/nted Makefile,NONE,1.1
Message-ID: <20080908041213.401B170128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/nted
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse29338/rpms/nted

Added Files:
	Makefile 
Log Message:
Setup of module nted


--- NEW FILE Makefile ---
# Top level Makefile for module nted
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  8 04:12:13 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 04:12:13 +0000 (UTC)
Subject: rpms/nted/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20080908041213.74EB070128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/nted/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse29338/rpms/nted/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nted


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: nted
# $Id: Makefile,v 1.1 2008/09/08 04:12:13 kevin Exp $
NAME := nted
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  8 04:12:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 04:12:58 +0000
Subject: [pkgdb] beep was added for ndim
Message-ID: <20080908041258.B6F8820876F@bastion.fedora.phx.redhat.com>

kevin has added Package beep with summary Beep the PC speaker any number of ways
kevin has approved Package beep
kevin has added a Fedora devel branch for beep with an owner of ndim
kevin has approved beep in Fedora devel
kevin has approved Package beep
kevin has set commit to Approved for packager on beep (Fedora devel)
kevin has set build to Approved for packager on beep (Fedora devel)
kevin has set checkout to Approved for packager on beep (Fedora devel)
kevin has set commit to Approved for uberpackager on beep (Fedora devel)
kevin has set build to Approved for uberpackager on beep (Fedora devel)
kevin has set checkout to Approved for uberpackager on beep (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beep



From pkgdb at fedoraproject.org  Mon Sep  8 04:13:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 04:13:04 +0000
Subject: [pkgdb] beep (Fedora, 8) updated by kevin
Message-ID: <20080908041304.A1BE3208771@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for beep
kevin has set commit to Approved for uberpackager on beep (Fedora 8)
kevin has set build to Approved for uberpackager on beep (Fedora 8)
kevin has set checkout to Approved for uberpackager on beep (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beep



From kevin at fedoraproject.org  Mon Sep  8 04:13:20 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 04:13:20 +0000 (UTC)
Subject: rpms/beep - New directory
Message-ID: <20080908041320.21A5870128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/beep
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu29876/rpms/beep

Log Message:
Directory /cvs/extras/rpms/beep added to the repository




From pkgdb at fedoraproject.org  Mon Sep  8 04:13:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 04:13:04 +0000
Subject: [pkgdb] beep (Fedora, 9) updated by kevin
Message-ID: <20080908041304.AD7E6208D1E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for beep
kevin has set commit to Approved for uberpackager on beep (Fedora 9)
kevin has set build to Approved for uberpackager on beep (Fedora 9)
kevin has set checkout to Approved for uberpackager on beep (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beep



From kevin at fedoraproject.org  Mon Sep  8 04:13:20 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 04:13:20 +0000 (UTC)
Subject: rpms/beep/devel - New directory
Message-ID: <20080908041320.5D99970128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/beep/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu29876/rpms/beep/devel

Log Message:
Directory /cvs/extras/rpms/beep/devel added to the repository




From kevin at fedoraproject.org  Mon Sep  8 04:13:21 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 04:13:21 +0000 (UTC)
Subject: rpms/beep Makefile,NONE,1.1
Message-ID: <20080908041321.394A570128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/beep
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu29876/rpms/beep

Added Files:
	Makefile 
Log Message:
Setup of module beep


--- NEW FILE Makefile ---
# Top level Makefile for module beep
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  8 04:13:21 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 04:13:21 +0000 (UTC)
Subject: rpms/beep/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20080908041321.78A7470128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/beep/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu29876/rpms/beep/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module beep


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: beep
# $Id: Makefile,v 1.1 2008/09/08 04:13:21 kevin Exp $
NAME := beep
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  8 04:14:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 04:14:01 +0000
Subject: [pkgdb] python-id3 (Fedora EPEL, 5) updated by kevin
Message-ID: <20080908041401.9290820876F@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-id3
kevin has set commit to Approved for uberpackager on python-id3 (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on python-id3 (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on python-id3 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-id3



From pkgdb at fedoraproject.org  Mon Sep  8 04:14:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 04:14:01 +0000
Subject: [pkgdb] python-id3 (Fedora EPEL, 4) updated by kevin
Message-ID: <20080908041401.A8B89208D1E@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for python-id3
kevin has set commit to Approved for uberpackager on python-id3 (Fedora EPEL 4)
kevin has set build to Approved for uberpackager on python-id3 (Fedora EPEL 4)
kevin has set checkout to Approved for uberpackager on python-id3 (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-id3



From pkgdb at fedoraproject.org  Mon Sep  8 04:14:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 04:14:01 +0000
Subject: [pkgdb] python-id3 (Fedora, 8) updated by kevin
Message-ID: <20080908041401.B2879208D98@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for python-id3
kevin has set commit to Approved for uberpackager on python-id3 (Fedora 8)
kevin has set build to Approved for uberpackager on python-id3 (Fedora 8)
kevin has set checkout to Approved for uberpackager on python-id3 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-id3



From pkgdb at fedoraproject.org  Mon Sep  8 04:15:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 04:15:29 +0000
Subject: [pkgdb] itzam-core was added for mnagy
Message-ID: <20080908041529.9E87220876E@bastion.fedora.phx.redhat.com>

kevin has added Package itzam-core with summary Library for creating and manipulating keyed-access database files
kevin has approved Package itzam-core
kevin has added a Fedora devel branch for itzam-core with an owner of mnagy
kevin has approved itzam-core in Fedora devel
kevin has approved Package itzam-core
kevin has set commit to Approved for packager on itzam-core (Fedora devel)
kevin has set build to Approved for packager on itzam-core (Fedora devel)
kevin has set checkout to Approved for packager on itzam-core (Fedora devel)
kevin has set commit to Approved for uberpackager on itzam-core (Fedora devel)
kevin has set build to Approved for uberpackager on itzam-core (Fedora devel)
kevin has set checkout to Approved for uberpackager on itzam-core (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/itzam-core



From pkgdb at fedoraproject.org  Mon Sep  8 04:15:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 04:15:31 +0000
Subject: [pkgdb] itzam-core (Fedora, 8) updated by kevin
Message-ID: <20080908041531.6E26D208D0F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for itzam-core
kevin has set commit to Approved for uberpackager on itzam-core (Fedora 8)
kevin has set build to Approved for uberpackager on itzam-core (Fedora 8)
kevin has set checkout to Approved for uberpackager on itzam-core (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/itzam-core



From pkgdb at fedoraproject.org  Mon Sep  8 04:15:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 04:15:31 +0000
Subject: [pkgdb] itzam-core (Fedora EPEL, 5) updated by kevin
Message-ID: <20080908041531.824FB208D99@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for itzam-core
kevin has set commit to Approved for uberpackager on itzam-core (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on itzam-core (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on itzam-core (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/itzam-core



From pkgdb at fedoraproject.org  Mon Sep  8 04:15:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 04:15:31 +0000
Subject: [pkgdb] itzam-core (Fedora, 9) updated by kevin
Message-ID: <20080908041531.7988D208D97@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for itzam-core
kevin has set commit to Approved for uberpackager on itzam-core (Fedora 9)
kevin has set build to Approved for uberpackager on itzam-core (Fedora 9)
kevin has set checkout to Approved for uberpackager on itzam-core (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/itzam-core



From kevin at fedoraproject.org  Mon Sep  8 04:15:43 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 04:15:43 +0000 (UTC)
Subject: rpms/itzam-core - New directory
Message-ID: <20080908041543.219D370128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/itzam-core
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN30982/rpms/itzam-core

Log Message:
Directory /cvs/extras/rpms/itzam-core added to the repository




From kevin at fedoraproject.org  Mon Sep  8 04:15:43 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 04:15:43 +0000 (UTC)
Subject: rpms/itzam-core/devel - New directory
Message-ID: <20080908041543.53FE870128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/itzam-core/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN30982/rpms/itzam-core/devel

Log Message:
Directory /cvs/extras/rpms/itzam-core/devel added to the repository




From kevin at fedoraproject.org  Mon Sep  8 04:15:44 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 04:15:44 +0000 (UTC)
Subject: rpms/itzam-core Makefile,NONE,1.1
Message-ID: <20080908041544.2E79070128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/itzam-core
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN30982/rpms/itzam-core

Added Files:
	Makefile 
Log Message:
Setup of module itzam-core


--- NEW FILE Makefile ---
# Top level Makefile for module itzam-core
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Sep  8 04:15:44 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 04:15:44 +0000 (UTC)
Subject: rpms/itzam-core/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080908041544.655D970128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/itzam-core/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN30982/rpms/itzam-core/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module itzam-core


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: itzam-core
# $Id: Makefile,v 1.1 2008/09/08 04:15:44 kevin Exp $
NAME := itzam-core
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  8 04:16:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 04:16:38 +0000
Subject: [pkgdb] messiggy was added for mnagy
Message-ID: <20080908041638.9AB3020876E@bastion.fedora.phx.redhat.com>

kevin has added Package messiggy with summary Database of celestial objects
kevin has approved Package messiggy
kevin has added a Fedora devel branch for messiggy with an owner of mnagy
kevin has approved messiggy in Fedora devel
kevin has approved Package messiggy
kevin has set commit to Approved for packager on messiggy (Fedora devel)
kevin has set build to Approved for packager on messiggy (Fedora devel)
kevin has set checkout to Approved for packager on messiggy (Fedora devel)
kevin has set commit to Approved for uberpackager on messiggy (Fedora devel)
kevin has set build to Approved for uberpackager on messiggy (Fedora devel)
kevin has set checkout to Approved for uberpackager on messiggy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/messiggy



From pkgdb at fedoraproject.org  Mon Sep  8 04:16:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 04:16:40 +0000
Subject: [pkgdb] messiggy (Fedora, 8) updated by kevin
Message-ID: <20080908041640.F1FF6208D07@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for messiggy
kevin has set commit to Approved for uberpackager on messiggy (Fedora 8)
kevin has set build to Approved for uberpackager on messiggy (Fedora 8)
kevin has set checkout to Approved for uberpackager on messiggy (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/messiggy



From pkgdb at fedoraproject.org  Mon Sep  8 04:16:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 04:16:40 +0000
Subject: [pkgdb] messiggy (Fedora EPEL, 5) updated by kevin
Message-ID: <20080908041641.0E50C208D7C@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for messiggy
kevin has set commit to Approved for uberpackager on messiggy (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on messiggy (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on messiggy (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/messiggy



From pkgdb at fedoraproject.org  Mon Sep  8 04:16:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 04:16:40 +0000
Subject: [pkgdb] messiggy (Fedora, 9) updated by kevin
Message-ID: <20080908041641.18736208D9A@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for messiggy
kevin has set commit to Approved for uberpackager on messiggy (Fedora 9)
kevin has set build to Approved for uberpackager on messiggy (Fedora 9)
kevin has set checkout to Approved for uberpackager on messiggy (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/messiggy



From kevin at fedoraproject.org  Mon Sep  8 04:16:54 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 04:16:54 +0000 (UTC)
Subject: rpms/messiggy - New directory
Message-ID: <20080908041654.2CF727012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/messiggy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb31815/rpms/messiggy

Log Message:
Directory /cvs/extras/rpms/messiggy added to the repository




From kevin at fedoraproject.org  Mon Sep  8 04:16:54 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 04:16:54 +0000 (UTC)
Subject: rpms/messiggy/devel - New directory
Message-ID: <20080908041654.6B3C77012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/messiggy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb31815/rpms/messiggy/devel

Log Message:
Directory /cvs/extras/rpms/messiggy/devel added to the repository




From kevin at fedoraproject.org  Mon Sep  8 04:16:55 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 04:16:55 +0000 (UTC)
Subject: rpms/messiggy Makefile,NONE,1.1
Message-ID: <20080908041655.7DAED7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/messiggy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb31815/rpms/messiggy

Added Files:
	Makefile 
Log Message:
Setup of module messiggy


--- NEW FILE Makefile ---
# Top level Makefile for module messiggy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  8 04:16:55 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 04:16:55 +0000 (UTC)
Subject: rpms/messiggy/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080908041655.BF3857012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/messiggy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb31815/rpms/messiggy/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module messiggy


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: messiggy
# $Id: Makefile,v 1.1 2008/09/08 04:16:55 kevin Exp $
NAME := messiggy
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From huzaifas at fedoraproject.org  Mon Sep  8 04:21:07 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon,  8 Sep 2008 04:21:07 +0000 (UTC)
Subject: rpms/labrea/F-9 import.log, NONE, 1.1 labrea.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080908042107.2756170128@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/labrea/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1109/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log labrea.spec 
Log Message:
Initial Import


--- NEW FILE import.log ---
labrea-2_5_1-2_fc10:F-9:labrea-2.5.1-2.fc10.src.rpm:1220833268


--- NEW FILE labrea.spec ---
%define download_name   labrea-2.5-stable-1


Name:             labrea
Version:          2.5.1
Release:          2%{?dist}
Summary:          Tarpit (slow to a crawl) worms and port scanners
Group:            Applications/Productivity
License:          GPLv2
URL:              http://sourceforge.net/projects/labrea/
Source:           http://downloads.sourceforge.net/labrea/%{download_name}.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires:    libpcap-devel
BuildRequires:    libdnet-devel

%description
Intrusion detection "sticky" honey pot technology using virtual 
servers to detect and trap worms, hackers, and other malware. 


%prep
%setup -q -n %{download_name}


%build
%configure 
make %{?_smp_mflags}


%install 
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"


%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root,-)
%doc COPYING INSTALL NEWS README TODO AUTHORS ChangeLog
%config(noreplace) %{_sysconfdir}/labrea.conf
%{_mandir}/man1/labrea.1.gz
%{_mandir}/man5/labrea.conf.5.gz
%{_sbindir}/labrea



%changelog
* Thu Sep 4 2008 Huzaifa Sidhpurwala  <huzaifas at redhat.com> 2.5.1-2
- Small changes to satisfy the packaging standads

* Thu Sep 4 2008 Huzaifa Sidhpurwala  <huzaifas at redhat.com> 2.5.1-0
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/labrea/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:53:06 -0000	1.1
+++ .cvsignore	8 Sep 2008 04:20:36 -0000	1.2
@@ -0,0 +1 @@
+labrea-2.5-stable-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/labrea/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:53:06 -0000	1.1
+++ sources	8 Sep 2008 04:20:36 -0000	1.2
@@ -0,0 +1 @@
+e76d506e82b60cc5477ccee1b3368cda  labrea-2.5-stable-1.tar.gz



From awjb at fedoraproject.org  Mon Sep  8 04:27:54 2008
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon,  8 Sep 2008 04:27:54 +0000 (UTC)
Subject: rpms/libetpan/devel .cvsignore, 1.14, 1.15 libetpan.spec, 1.24,
	1.25 sources, 1.14, 1.15 libetpan-mailimf.patch, 1.1, NONE
Message-ID: <20080908042754.A9FD570128@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/libetpan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3788

Modified Files:
	.cvsignore libetpan.spec sources 
Removed Files:
	libetpan-mailimf.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libetpan/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	17 Jun 2008 11:51:33 -0000	1.14
+++ .cvsignore	8 Sep 2008 04:27:24 -0000	1.15
@@ -1 +1 @@
-libetpan-0.54.tar.gz
+libetpan-0.56.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libetpan/devel/libetpan.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libetpan.spec	17 Jun 2008 11:51:33 -0000	1.24
+++ libetpan.spec	8 Sep 2008 04:27:24 -0000	1.25
@@ -1,5 +1,5 @@
 Name:           libetpan
-Version:        0.54
+Version:        0.56
 Release:        1%{?dist}
 Summary: Portable, efficient middleware for different kinds of mail access
 
@@ -8,12 +8,12 @@
 URL:            http://www.etpan.org/
 Source0:        http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         libetpan-multiarch.patch
-Patch1:         libetpan-mailimf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  db4-devel
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  openssl-devel
+BuildRequires:  libtool
 
 %description
 The purpose of this mail library is to provide a portable, efficient middleware
@@ -35,21 +35,18 @@
 %prep
 %setup -q
 %patch0
-pushd ./src/low-level/imf/
-%patch1
-popd
 
 %build
 %configure --disable-static --with-gnutls=no
-make %{?_smp_mflags}
+make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.13.0.0
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.{,l}a
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.13.1.1
 
 touch -r ChangeLog $RPM_BUILD_ROOT%{_bindir}/libetpan-config
 
@@ -73,6 +70,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Sep 08 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.56-1
+- version upgrade
+
 * Tue Jun 17 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 0.54-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libetpan/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	17 Jun 2008 11:51:33 -0000	1.14
+++ sources	8 Sep 2008 04:27:24 -0000	1.15
@@ -1 +1 @@
-0214de45b1b92277fbfc6c9a00af5316  libetpan-0.54.tar.gz
+3f0c0ca0c45c0bd78070c066ae53d417  libetpan-0.56.tar.gz


--- libetpan-mailimf.patch DELETED ---



From huzaifas at fedoraproject.org  Mon Sep  8 04:28:02 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon,  8 Sep 2008 04:28:02 +0000 (UTC)
Subject: rpms/labrea/F-8 import.log, NONE, 1.1 labrea.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080908042802.09FA070128@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/labrea/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3891/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log labrea.spec 
Log Message:
Initial Import


--- NEW FILE import.log ---
labrea-2_5_1-2_fc10:F-8:labrea-2.5.1-2.fc10.src.rpm:1220833650


--- NEW FILE labrea.spec ---
%define download_name   labrea-2.5-stable-1


Name:             labrea
Version:          2.5.1
Release:          2%{?dist}
Summary:          Tarpit (slow to a crawl) worms and port scanners
Group:            Applications/Productivity
License:          GPLv2
URL:              http://sourceforge.net/projects/labrea/
Source:           http://downloads.sourceforge.net/labrea/%{download_name}.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires:    libpcap-devel
BuildRequires:    libdnet-devel

%description
Intrusion detection "sticky" honey pot technology using virtual 
servers to detect and trap worms, hackers, and other malware. 


%prep
%setup -q -n %{download_name}


%build
%configure 
make %{?_smp_mflags}


%install 
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"


%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root,-)
%doc COPYING INSTALL NEWS README TODO AUTHORS ChangeLog
%config(noreplace) %{_sysconfdir}/labrea.conf
%{_mandir}/man1/labrea.1.gz
%{_mandir}/man5/labrea.conf.5.gz
%{_sbindir}/labrea



%changelog
* Thu Sep 4 2008 Huzaifa Sidhpurwala  <huzaifas at redhat.com> 2.5.1-2
- Small changes to satisfy the packaging standads

* Thu Sep 4 2008 Huzaifa Sidhpurwala  <huzaifas at redhat.com> 2.5.1-0
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/labrea/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:53:06 -0000	1.1
+++ .cvsignore	8 Sep 2008 04:27:31 -0000	1.2
@@ -0,0 +1 @@
+labrea-2.5-stable-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/labrea/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:53:06 -0000	1.1
+++ sources	8 Sep 2008 04:27:31 -0000	1.2
@@ -0,0 +1 @@
+e76d506e82b60cc5477ccee1b3368cda  labrea-2.5-stable-1.tar.gz



From huzaifas at fedoraproject.org  Mon Sep  8 04:32:07 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon,  8 Sep 2008 04:32:07 +0000 (UTC)
Subject: rpms/labrea/devel import.log, NONE, 1.1 labrea.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080908043207.7782D70128@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/labrea/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5607/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log labrea.spec 
Log Message:
Initial Import


--- NEW FILE import.log ---
labrea-2_5_1-2_fc10:HEAD:labrea-2.5.1-2.fc10.src.rpm:1220833882


--- NEW FILE labrea.spec ---
%define download_name   labrea-2.5-stable-1


Name:             labrea
Version:          2.5.1
Release:          2%{?dist}
Summary:          Tarpit (slow to a crawl) worms and port scanners
Group:            Applications/Productivity
License:          GPLv2
URL:              http://sourceforge.net/projects/labrea/
Source:           http://downloads.sourceforge.net/labrea/%{download_name}.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires:    libpcap-devel
BuildRequires:    libdnet-devel

%description
Intrusion detection "sticky" honey pot technology using virtual 
servers to detect and trap worms, hackers, and other malware. 


%prep
%setup -q -n %{download_name}


%build
%configure 
make %{?_smp_mflags}


%install 
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"


%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root,-)
%doc COPYING INSTALL NEWS README TODO AUTHORS ChangeLog
%config(noreplace) %{_sysconfdir}/labrea.conf
%{_mandir}/man1/labrea.1.gz
%{_mandir}/man5/labrea.conf.5.gz
%{_sbindir}/labrea



%changelog
* Thu Sep 4 2008 Huzaifa Sidhpurwala  <huzaifas at redhat.com> 2.5.1-2
- Small changes to satisfy the packaging standads

* Thu Sep 4 2008 Huzaifa Sidhpurwala  <huzaifas at redhat.com> 2.5.1-0
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/labrea/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 16:53:06 -0000	1.1
+++ .cvsignore	8 Sep 2008 04:31:37 -0000	1.2
@@ -0,0 +1 @@
+labrea-2.5-stable-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/labrea/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:53:06 -0000	1.1
+++ sources	8 Sep 2008 04:31:37 -0000	1.2
@@ -0,0 +1 @@
+e76d506e82b60cc5477ccee1b3368cda  labrea-2.5-stable-1.tar.gz



From pgordon at fedoraproject.org  Mon Sep  8 05:08:42 2008
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Mon,  8 Sep 2008 05:08:42 +0000 (UTC)
Subject: rpms/midori/devel midori.spec,1.7,1.8
Message-ID: <20080908050842.5E9BE70128@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17848/devel

Modified Files:
	midori.spec 
Log Message:
Switch to WAF build system; the legacy autotools stuff is broken.





From airlied at fedoraproject.org  Mon Sep  8 05:16:09 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon,  8 Sep 2008 05:16:09 +0000 (UTC)
Subject: rpms/xorg-x11-drv-i810/devel i830-render-init-no-map.patch, NONE,
	1.1 xorg-x11-drv-i810.spec, 1.103, 1.104
Message-ID: <20080908051609.4560170128@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20216

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	i830-render-init-no-map.patch 
Log Message:
* Mon Sep 08 2008 Dave Airlie <airlied at redhat.com> 2.4.2-4
- Add patch from fd.o bug 17341 to fix problems on intel EXA


i830-render-init-no-map.patch:

--- NEW FILE i830-render-init-no-map.patch ---
diff --git a/src/i965_render.c b/src/i965_render.c
index a4334c6..7dee5f3 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -1450,7 +1450,7 @@ gen4_render_state_init(ScrnInfoPtr pScrn)
 
     render_state->card_state_offset = pI830->gen4_render_state_mem->offset;
 
-    if (pI830->gen4_render_state_mem->bo) {
+    if (pI830->use_drm_mode) {
 	ret = dri_bo_map(pI830->gen4_render_state_mem->bo, 1);
 	if (ret) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
@@ -1474,7 +1474,7 @@ gen4_render_state_cleanup(ScrnInfoPtr pScrn)
 {
     I830Ptr pI830 = I830PTR(pScrn);
 
-    if (pI830->gen4_render_state_mem->bo) {
+    if (pI830->use_drm_mode) {
 	dri_bo_unmap(pI830->gen4_render_state_mem->bo);
 	dri_bo_unreference(pI830->gen4_render_state_mem->bo);
     }


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- xorg-x11-drv-i810.spec	3 Sep 2008 09:00:06 -0000	1.103
+++ xorg-x11-drv-i810.spec	8 Sep 2008 05:15:38 -0000	1.104
@@ -6,7 +6,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.4.2
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -24,6 +24,8 @@
 Patch3: intel-2.1.1-fix-xv-reset.patch
 Patch4: intel-fix-flip.patch
 Patch5: intel-fix-irq.patch
+# fd.o bug 17341
+Patch6: i830-render-init-no-map.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -57,6 +59,7 @@
 %patch3 -p1 -b .xvfix
 %patch4 -p1 -b .fixflip
 %patch5 -p1 -b .irqfix
+%patch6 -p1 -b .exafix
 
 %build
 
@@ -99,6 +102,9 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Mon Sep 08 2008 Dave Airlie <airlied at redhat.com> 2.4.2-4
+- Add patch from fd.o bug 17341 to fix problems on intel EXA
+
 * Wed Sep 03 2008 Dave Airlie <airlied at redhat.com> 2.4.2-3
 - intel-fix-irq.patch - Don't die on irq handler failure
 - I think krh DRI2 patches broke it.



From pkgdb at fedoraproject.org  Mon Sep  8 05:23:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 05:23:27 +0000
Subject: [pkgdb] system-switch-java ownership updated
Message-ID: <20080908052327.8A46120876F@bastion.fedora.phx.redhat.com>

Package system-switch-java in Fedora devel is now owned by dbhole

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-switch-java



From pkgdb at fedoraproject.org  Mon Sep  8 05:23:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 05:23:55 +0000
Subject: [pkgdb] system-switch-java: dbhole has requested commit
Message-ID: <20080908052355.1B54220876F@bastion.fedora.phx.redhat.com>

dbhole has requested the commit acl on system-switch-java (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-switch-java



From pkgdb at fedoraproject.org  Mon Sep  8 05:23:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 05:23:41 +0000
Subject: [pkgdb] system-switch-java: dbhole has requested commit
Message-ID: <20080908052341.65987208770@bastion.fedora.phx.redhat.com>

dbhole has requested the commit acl on system-switch-java (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-switch-java



From pkgdb at fedoraproject.org  Mon Sep  8 05:24:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 05:24:00 +0000
Subject: [pkgdb] system-switch-java: dbhole has requested approveacls
Message-ID: <20080908052400.22BCC208D0F@bastion.fedora.phx.redhat.com>

dbhole has requested the approveacls acl on system-switch-java (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-switch-java



From pkgdb at fedoraproject.org  Mon Sep  8 05:24:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 05:24:02 +0000
Subject: [pkgdb] system-switch-java: dbhole has requested approveacls
Message-ID: <20080908052402.86BF4208771@bastion.fedora.phx.redhat.com>

dbhole has requested the approveacls acl on system-switch-java (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-switch-java



From pgordon at fedoraproject.org  Mon Sep  8 05:25:20 2008
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Mon,  8 Sep 2008 05:25:20 +0000 (UTC)
Subject: rpms/midori/devel midori.spec,1.8,1.9
Message-ID: <20080908052520.873D170128@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23547/devel

Modified Files:
	midori.spec 
Log Message:
Oops; forgot the scriplets...


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/midori.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- midori.spec	8 Sep 2008 05:08:42 -0000	1.8
+++ midori.spec	8 Sep 2008 05:24:50 -0000	1.9
@@ -66,6 +66,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
+
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+fi
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
@@ -77,6 +91,9 @@
 
 
 %changelog
+* Sun Sep 07 2008 Peter Gordon <peter at thecodergeek.com> - 0.0.20-2
+- Add scriplets for GTK+ icon cache.
+
 * Sun Sep 07 2008 Peter Gordon <peter at thecodergeek.com> - 0.0.20-1
 - Update to new upstream release (0.0.20): adds support for single instances,
   some userscripts and Greasemonkey scripting, zooming and printing, as well as



From pgordon at fedoraproject.org  Mon Sep  8 05:29:11 2008
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Mon,  8 Sep 2008 05:29:11 +0000 (UTC)
Subject: rpms/midori/devel midori.spec,1.9,1.10
Message-ID: <20080908052911.0CEED70128@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24852/devel

Modified Files:
	midori.spec 
Log Message:
Oops; forgot the scriplets...


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/midori.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- midori.spec	8 Sep 2008 05:24:50 -0000	1.9
+++ midori.spec	8 Sep 2008 05:28:40 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		midori
 Version:	0.0.20
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
 Group:		Applications/Internet



From pkgdb at fedoraproject.org  Mon Sep  8 05:29:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 05:29:09 +0000
Subject: [pkgdb] system-switch-java had acl change status
Message-ID: <20080908052909.9E34C208771@bastion.fedora.phx.redhat.com>

dbhole has set the commit acl on system-switch-java (Fedora devel) to Approved for dbhole

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-switch-java



From pkgdb at fedoraproject.org  Mon Sep  8 05:29:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 05:29:15 +0000
Subject: [pkgdb] system-switch-java had acl change status
Message-ID: <20080908052915.54113208D1E@bastion.fedora.phx.redhat.com>

dbhole has set the approveacls acl on system-switch-java (Fedora devel) to Approved for dbhole

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-switch-java



From airlied at fedoraproject.org  Mon Sep  8 05:46:07 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon,  8 Sep 2008 05:46:07 +0000 (UTC)
Subject: rpms/xorg-x11-drv-i810/devel xorg-x11-drv-i810.spec,1.104,1.105
Message-ID: <20080908054607.B984B70128@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30627

Modified Files:
	xorg-x11-drv-i810.spec 
Log Message:
* Mon Sep 08 2008 Dave Airlie <airlied at redhat.com> 2.4.2-4
- Add patch from fd.o bug 17341 to fix problems on intel EXA



Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- xorg-x11-drv-i810.spec	8 Sep 2008 05:15:38 -0000	1.104
+++ xorg-x11-drv-i810.spec	8 Sep 2008 05:45:37 -0000	1.105
@@ -22,7 +22,7 @@
 
 Patch1: intel-2.4.2-git-diffs.patch
 Patch3: intel-2.1.1-fix-xv-reset.patch
-Patch4: intel-fix-flip.patch
+#Patch4: intel-fix-flip.patch
 Patch5: intel-fix-irq.patch
 # fd.o bug 17341
 Patch6: i830-render-init-no-map.patch
@@ -57,7 +57,7 @@
 %setup -q -n xf86-video-intel-%{version}
 %patch1 -p1 -b .gitupdate
 %patch3 -p1 -b .xvfix
-%patch4 -p1 -b .fixflip
+#patch4 -p1 -b .fixflip
 %patch5 -p1 -b .irqfix
 %patch6 -p1 -b .exafix
 



From jwrdegoede at fedoraproject.org  Mon Sep  8 06:59:33 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon,  8 Sep 2008 06:59:33 +0000 (UTC)
Subject: rpms/openmsx/devel openmsx-0.6.1-flavour.patch, 1.1,
	1.2 openmsx.spec, 1.5, 1.6
Message-ID: <20080908065933.D11D070128@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/openmsx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25021

Modified Files:
	openmsx-0.6.1-flavour.patch openmsx.spec 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.6.3-4
- Fix patch fuzz build failure


openmsx-0.6.1-flavour.patch:

Index: openmsx-0.6.1-flavour.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openmsx/devel/openmsx-0.6.1-flavour.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openmsx-0.6.1-flavour.patch	28 Aug 2007 19:41:35 -0000	1.1
+++ openmsx-0.6.1-flavour.patch	8 Sep 2008 06:59:32 -0000	1.2
@@ -1,6 +1,17 @@
---- openmsx-0.6.1/build/cpu-x86.mk.orig	2006-07-23 19:50:57.000000000 +0100
-+++ openmsx-0.6.1/build/cpu-x86.mk	2006-08-06 18:30:46.000000000 +0100
-@@ -9,7 +9,7 @@
+diff -up openmsx-0.6.3/build/cpu-ppc.mk.foo openmsx-0.6.3/build/cpu-ppc.mk
+--- openmsx-0.6.3/build/cpu-ppc.mk.foo	2007-12-09 22:09:11.000000000 +0100
++++ openmsx-0.6.3/build/cpu-ppc.mk	2008-09-08 08:53:33.000000000 +0200
+@@ -6,5 +6,5 @@
+ BIG_ENDIAN:=true
+ 
+ # Default build flavour.
+-OPENMSX_FLAVOUR?=ppc
++OPENMSX_FLAVOUR?=rpm
+ 
+diff -up openmsx-0.6.3/build/cpu-x86.mk.foo openmsx-0.6.3/build/cpu-x86.mk
+--- openmsx-0.6.3/build/cpu-x86.mk.foo	2007-12-09 22:09:11.000000000 +0100
++++ openmsx-0.6.3/build/cpu-x86.mk	2008-09-08 08:53:33.000000000 +0200
+@@ -12,7 +12,7 @@ UNALIGNED_MEMORY_ACCESS:=true
  ifeq ($(filter darwin%,$(OPENMSX_TARGET_OS)),)
  # To run openMSX with decent speed, at least a Pentium 2 class machine
  # is needed, so let's optimise for that.
@@ -9,19 +20,11 @@
  else
  # The system headers of OS X use SSE features, which are not available on
  # i686, so we only use the generic optimisation flags instead.
---- openmsx-0.6.1/build/cpu-ppc.mk.orig	2004-07-10 16:25:01.000000000 +0100
-+++ openmsx-0.6.1/build/cpu-ppc.mk	2006-08-13 16:07:26.000000000 +0100
-@@ -6,5 +6,5 @@
- BIG_ENDIAN:=true
- 
- # Default build flavour.
--OPENMSX_FLAVOUR?=ppc
-+OPENMSX_FLAVOUR?=rpm
- 
---- openmsx-0.6.1/build/cpu-x86_64.mk.orig	2004-10-09 07:32:02.000000000 +0100
-+++ openmsx-0.6.1/build/cpu-x86_64.mk	2006-08-13 16:07:38.000000000 +0100
-@@ -6,5 +6,5 @@
- BIG_ENDIAN:=false
+diff -up openmsx-0.6.3/build/cpu-x86_64.mk.foo openmsx-0.6.3/build/cpu-x86_64.mk
+--- openmsx-0.6.3/build/cpu-x86_64.mk.foo	2007-12-09 22:09:11.000000000 +0100
++++ openmsx-0.6.3/build/cpu-x86_64.mk	2008-09-08 08:53:33.000000000 +0200
+@@ -9,5 +9,5 @@ BIG_ENDIAN:=false
+ UNALIGNED_MEMORY_ACCESS:=true
  
  # Default build flavour.
 -OPENMSX_FLAVOUR?=opt


Index: openmsx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openmsx/devel/openmsx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openmsx.spec	19 Feb 2008 16:49:55 -0000	1.5
+++ openmsx.spec	8 Sep 2008 06:59:33 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           openmsx
 Version:        0.6.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        An emulator for the MSX home computer system
 Group:          Applications/Emulators
 License:        GPL+
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.6.3-4
+- Fix patch fuzz build failure
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.6.3-3
 - Autorebuild for GCC 4.3
 



From bagnara at fedoraproject.org  Mon Sep  8 07:16:53 2008
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Mon,  8 Sep 2008 07:16:53 +0000 (UTC)
Subject: rpms/ppl/devel ppl.spec,1.10,1.11
Message-ID: <20080908071653.7928C70128@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31172

Modified Files:
	ppl.spec 
Log Message:
Added Requires /sbin/ldconfig.



Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ppl.spec	13 Feb 2008 18:28:16 -0000	1.10
+++ ppl.spec	8 Sep 2008 07:16:22 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		ppl
 Version:	0.9
-Release:	19%{?dist}
+Release:	20%{?dist}
 
 Summary:	The Parma Polyhedra Library: a library of numerical abstractions
 Group:		Development/Libraries
@@ -16,6 +16,8 @@
 Patch3:		ppl-0.9-cstdlib.patch
 #Icon:
 #Requires:
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 BuildRequires:	gmp-devel >= 4.1.3
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 #Prefix:	/usr
@@ -133,6 +135,8 @@
 %package pwl
 Summary:	The Parma Watchdog Library: a C++ library for watchdog timers
 Group:		Development/Libraries
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 %description pwl
 The Parma Watchdog Library (PWL) provides support for multiple,
 concurrent watchdog timers on systems providing setitimer(2).  This
@@ -313,6 +317,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Mon May 19 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-20
+- Added Requires /sbin/ldconfig.
+
 * Wed Feb 13 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-19
 - Include a patch to supply a missing inclusions of <cstdlib>.
 



From ndim at fedoraproject.org  Mon Sep  8 07:23:20 2008
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Mon,  8 Sep 2008 07:23:20 +0000 (UTC)
Subject: rpms/beep/devel beep-1.2.2-install-fixes.patch, NONE, 1.1 beep.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080908072320.6A21770128@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/beep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1471/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beep-1.2.2-install-fixes.patch beep.spec import.log 
Log Message:
beep-1.2.2-3 import


beep-1.2.2-install-fixes.patch:

--- NEW FILE beep-1.2.2-install-fixes.patch ---
diff --git a/Makefile b/Makefile
index 5856f9f..32bfb6b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,26 @@
 CC=gcc
 FLAGS=-Wall
 EXEC_NAME=beep
-INSTALL_DIR=/usr/bin
+BIN_DIR=/usr/bin
 MAN_FILE=beep.1.gz
-MAN_DIR=/usr/man/man1
+MAN_DIR=/usr/share/man/man1
 
-default : beep
+.PHONY: all
+all: $(EXEC_NAME)
 
-clean : 
+.PHONY: clean
+clean:
 	rm ${EXEC_NAME}
 
-beep : beep.c
-	${CC} ${FLAGS} -o ${EXEC_NAME} beep.c
+$(EXEC_NAME): beep.c
+	$(CC) $(FLAGS) $(CFLAGS) -o $(EXEC_NAME) $<
 
-install : 
-	cp ${EXEC_NAME} ${INSTALL_DIR}
-	rm -f /usr/man/man1/beep.1.bz2
-	cp ${MAN_FILE} ${MAN_DIR}
+install:
+	install -m 0755 -d $(DESTDIR)$(BIN_DIR)
+	install -m 0755 -d $(DESTDIR)$(MAN_DIR)
+	install -m 0755 -p $(EXEC_NAME) $(DESTDIR)$(BIN_DIR)/
+	install -m 0644 -p $(MAN_FILE)  $(DESTDIR)$(MAN_DIR)/
+
+uninstall:
+	rm -f $(DESTDIR)$(BIN_DIR)/$(EXEC_NAME)
+	rm -f $(DESTDIR)$(MAN_DIR)/$(MAN_FILE)


--- NEW FILE beep.spec ---
Summary:        Beep the PC speaker any number of ways
Name:           beep
Version:        1.2.2
Release:        3%{?dist}

Group:          Applications/System
License:        GPLv2+
URL:            http://www.johnath.com/beep/
Source0:        http://www.johnath.com/beep/%{name}-%{version}.tar.gz
Patch0:         beep-1.2.2-install-fixes.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  glibc-kernheaders


%description
Beep allows the user to control the PC speaker with precision,
allowing different sounds to indicate different events. While it
can be run quite happily on the commandline, it's intended place
of residence is within shell/perl scripts, notifying the user when
something interesting occurs. Of course, it has no notion of
what's interesting, but it's real good at that notifying part.


%prep
%setup -q
%patch0 -p1 -b .install-fixes


%build
make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING CREDITS README
%attr(0755,root,root) %{_bindir}/beep
%{_mandir}/man1/beep.1.gz


%changelog
* Sun Sep  7 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.2-3
- Initial package for submission to Fedora


--- NEW FILE import.log ---
beep-1_2_2-3_fc9:HEAD:beep-1.2.2-3.fc9.src.rpm:1220858472


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beep/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 04:13:21 -0000	1.1
+++ .cvsignore	8 Sep 2008 07:22:49 -0000	1.2
@@ -0,0 +1 @@
+beep-1.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beep/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 04:13:21 -0000	1.1
+++ sources	8 Sep 2008 07:22:50 -0000	1.2
@@ -0,0 +1 @@
+d541419fd7e5642952d7b48cbb40c712  beep-1.2.2.tar.gz



From ndim at fedoraproject.org  Mon Sep  8 07:23:30 2008
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Mon,  8 Sep 2008 07:23:30 +0000 (UTC)
Subject: rpms/nted/devel import.log, NONE, 1.1 nted.desktop, NONE,
	1.1 nted.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080908072330.B51E070128@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1512/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log nted.desktop nted.spec 
Log Message:
nted-1.0.7-2 import



--- NEW FILE import.log ---
nted-1_0_7-2_fc9:HEAD:nted-1.0.7-2.fc9.src.rpm:1220858521


--- NEW FILE nted.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=NtEd
GenericName=Score editor
GenericName[de]=Partitureditor
GenericName[fr]=??diteur de partition
GenericName[it]=Redattore di spartiti
Comment=Edit musical scores
Comment[de]=Bearbeitet (musikal.) Partituren
Comment[fr]=??dite des partitions musicales
Comment[it]=Redige spartiti musicali
Exec=nted
Icon=nted
StartupNotify=true
Terminal=false
Type=Application
Categories=Audio;AudioVideo;Midi;Music;Publishing



--- NEW FILE nted.spec ---
Name:           nted
Version:        1.0.7
Release:        2%{?dist}
Summary:        Musical score editor
Summary(de):    Partitureditor

Group:          Applications/Publishing
# Program source is GPLv2+, HTML manuals are GFDL 1.2+.
License:        GPLv2+ and GFDL
URL:            http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml
Source0:        http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted-%{version}.tar.gz
Source1:        nted.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel alsa-lib-devel
BuildRequires:  gettext kdesdk yelp xmlto desktop-file-utils

%description
NtEd is a GTK score editor. It intends to be really WYSIWYG: what you
see on the screen is exactly what you get on printer output. It
supports up to 4 voices per staff, drum notes, 5 lyrics lines,
N-Tuplets, context changes, repeats with alternatives, configurable
music instruments per staff, MIDI and Postscript export, MusicXML
import. Scores can be played through the ALSA sequencer.


%description(de)
NtEd ist ein GTK-Partitureditor. Er soll das WYSIWYG-Prinzip
vollst??ndig umsetzen: Was man auf dem Bildschirm sieht, sieht genau so
aus wie das, was man aus dem Drucker erh??lt.

NtEd unterst??tzt bis zu 4 Stimmen pro Notenzeile, Schlagzeugnoten, 5
Strophenzeilen, N-Tolen, Wiederholungen mit Alternativen, einstellbare
Musikinstrumente pro Notensystem, MIDI- und PostScript-Export,
MusicXML-Import.

Partituren k??nnen ??ber den ALSA-Sequencer abgespielt werden.


%prep
%setup -q


%build
%configure --docdir='%{_docdir}/%{name}-%{version}'
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
mv %{buildroot}%{_docdir}/%{name}-%{version} docs
# Upstream desktop file contains some blank keys and is not spec-compliant
rm %{buildroot}%{_datadir}/applications/nted.desktop
desktop-file-install --vendor="fedora" \
  --dir=%{buildroot}%{_datadir}/applications \
  %{SOURCE1}
%find_lang %{name}


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING docs/*
%{_bindir}/nted
%{_datadir}/applications/fedora-nted.desktop
%{_datadir}/pixmaps/nted.png
%{_datadir}/nted
%{_mandir}/*/*


%changelog
* Sun Sep  7 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.0.7-2
- Consistently use %%{buildroot} instead of $RPM_BUILD_ROOT
- Ship upstream's now correct COPYING file.
- Ship all docs disregarding the languages.

* Sun Sep  7 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.0.7-1
- Update to nted-1.0.7
- Remove all patches (all adopted by upstream now)
- Consistently use --docdir, %%docdir

* Sun Jun  8 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.24.1-1
- Update to 0.24.1

* Sun Jun  8 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.22.3-2.4
- Temporary test build
- Add GFDL to licenses
- Add lang(de) variants for Summary and Description
- Have nted look for html docs in correct place

* Tue Jun  3 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.22.3-2
- Use compiler flags
- Fix compilation warnings
- Reorganize documentation files

* Fri Apr 25 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.22.3-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 04:12:13 -0000	1.1
+++ .cvsignore	8 Sep 2008 07:23:00 -0000	1.2
@@ -0,0 +1 @@
+nted-1.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 04:12:13 -0000	1.1
+++ sources	8 Sep 2008 07:23:00 -0000	1.2
@@ -0,0 +1 @@
+4613ef2b9a63c237375893fc12aae130  nted-1.0.7.tar.gz



From ndim at fedoraproject.org  Mon Sep  8 07:29:24 2008
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Mon,  8 Sep 2008 07:29:24 +0000 (UTC)
Subject: rpms/nted/F-9 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20080908072924.DFA1070128@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4814

Modified Files:
	.cvsignore sources 
Log Message:
* Sun Sep  7 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.0.7-2
- Consistently use %{buildroot} instead of $RPM_BUILD_ROOT
- Ship upstream's now correct COPYING file.
- Ship all docs disregarding the languages.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 04:12:13 -0000	1.1
+++ .cvsignore	8 Sep 2008 07:28:54 -0000	1.2
@@ -0,0 +1 @@
+nted-1.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 04:12:13 -0000	1.1
+++ sources	8 Sep 2008 07:28:54 -0000	1.2
@@ -0,0 +1 @@
+4613ef2b9a63c237375893fc12aae130  nted-1.0.7.tar.gz



From ndim at fedoraproject.org  Mon Sep  8 07:32:20 2008
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Mon,  8 Sep 2008 07:32:20 +0000 (UTC)
Subject: rpms/nted/F-9 nted.desktop,NONE,1.1 nted.spec,NONE,1.1
Message-ID: <20080908073220.4953470128@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6350

Added Files:
	nted.desktop nted.spec 
Log Message:
* Sun Sep  7 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.0.7-2
- Consistently use %{buildroot} instead of $RPM_BUILD_ROOT
- Ship upstream's now correct COPYING file.
- Ship all docs disregarding the languages.



--- NEW FILE nted.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=NtEd
GenericName=Score editor
GenericName[de]=Partitureditor
GenericName[fr]=??diteur de partition
GenericName[it]=Redattore di spartiti
Comment=Edit musical scores
Comment[de]=Bearbeitet (musikal.) Partituren
Comment[fr]=??dite des partitions musicales
Comment[it]=Redige spartiti musicali
Exec=nted
Icon=nted
StartupNotify=true
Terminal=false
Type=Application
Categories=Audio;AudioVideo;Midi;Music;Publishing



--- NEW FILE nted.spec ---
Name:           nted
Version:        1.0.7
Release:        2%{?dist}
Summary:        Musical score editor
Summary(de):    Partitureditor

Group:          Applications/Publishing
# Program source is GPLv2+, HTML manuals are GFDL 1.2+.
License:        GPLv2+ and GFDL
URL:            http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml
Source0:        http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted-%{version}.tar.gz
Source1:        nted.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel alsa-lib-devel
BuildRequires:  gettext kdesdk yelp xmlto desktop-file-utils

%description
NtEd is a GTK score editor. It intends to be really WYSIWYG: what you
see on the screen is exactly what you get on printer output. It
supports up to 4 voices per staff, drum notes, 5 lyrics lines,
N-Tuplets, context changes, repeats with alternatives, configurable
music instruments per staff, MIDI and Postscript export, MusicXML
import. Scores can be played through the ALSA sequencer.


%description(de)
NtEd ist ein GTK-Partitureditor. Er soll das WYSIWYG-Prinzip
vollst??ndig umsetzen: Was man auf dem Bildschirm sieht, sieht genau so
aus wie das, was man aus dem Drucker erh??lt.

NtEd unterst??tzt bis zu 4 Stimmen pro Notenzeile, Schlagzeugnoten, 5
Strophenzeilen, N-Tolen, Wiederholungen mit Alternativen, einstellbare
Musikinstrumente pro Notensystem, MIDI- und PostScript-Export,
MusicXML-Import.

Partituren k??nnen ??ber den ALSA-Sequencer abgespielt werden.


%prep
%setup -q


%build
%configure --docdir='%{_docdir}/%{name}-%{version}'
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
mv %{buildroot}%{_docdir}/%{name}-%{version} docs
# Upstream desktop file contains some blank keys and is not spec-compliant
rm %{buildroot}%{_datadir}/applications/nted.desktop
desktop-file-install --vendor="fedora" \
  --dir=%{buildroot}%{_datadir}/applications \
  %{SOURCE1}
%find_lang %{name}


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING docs/*
%{_bindir}/nted
%{_datadir}/applications/fedora-nted.desktop
%{_datadir}/pixmaps/nted.png
%{_datadir}/nted
%{_mandir}/*/*


%changelog
* Sun Sep  7 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.0.7-2
- Consistently use %%{buildroot} instead of $RPM_BUILD_ROOT
- Ship upstream's now correct COPYING file.
- Ship all docs disregarding the languages.

* Sun Sep  7 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.0.7-1
- Update to nted-1.0.7
- Remove all patches (all adopted by upstream now)
- Consistently use --docdir, %%docdir

* Sun Jun  8 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.24.1-1
- Update to 0.24.1

* Sun Jun  8 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.22.3-2.4
- Temporary test build
- Add GFDL to licenses
- Add lang(de) variants for Summary and Description
- Have nted look for html docs in correct place

* Tue Jun  3 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.22.3-2
- Use compiler flags
- Fix compilation warnings
- Reorganize documentation files

* Fri Apr 25 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.22.3-1
- Initial package




From ndim at fedoraproject.org  Mon Sep  8 07:32:50 2008
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Mon,  8 Sep 2008 07:32:50 +0000 (UTC)
Subject: rpms/beep/F-8 beep-1.2.2-install-fixes.patch, NONE, 1.1 beep.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080908073250.2F03070128@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/beep/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6349

Modified Files:
	.cvsignore sources 
Added Files:
	beep-1.2.2-install-fixes.patch beep.spec 
Log Message:
* Sun Sep  7 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.2-3
- Initial package for submission to Fedora


beep-1.2.2-install-fixes.patch:

--- NEW FILE beep-1.2.2-install-fixes.patch ---
diff --git a/Makefile b/Makefile
index 5856f9f..32bfb6b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,26 @@
 CC=gcc
 FLAGS=-Wall
 EXEC_NAME=beep
-INSTALL_DIR=/usr/bin
+BIN_DIR=/usr/bin
 MAN_FILE=beep.1.gz
-MAN_DIR=/usr/man/man1
+MAN_DIR=/usr/share/man/man1
 
-default : beep
+.PHONY: all
+all: $(EXEC_NAME)
 
-clean : 
+.PHONY: clean
+clean:
 	rm ${EXEC_NAME}
 
-beep : beep.c
-	${CC} ${FLAGS} -o ${EXEC_NAME} beep.c
+$(EXEC_NAME): beep.c
+	$(CC) $(FLAGS) $(CFLAGS) -o $(EXEC_NAME) $<
 
-install : 
-	cp ${EXEC_NAME} ${INSTALL_DIR}
-	rm -f /usr/man/man1/beep.1.bz2
-	cp ${MAN_FILE} ${MAN_DIR}
+install:
+	install -m 0755 -d $(DESTDIR)$(BIN_DIR)
+	install -m 0755 -d $(DESTDIR)$(MAN_DIR)
+	install -m 0755 -p $(EXEC_NAME) $(DESTDIR)$(BIN_DIR)/
+	install -m 0644 -p $(MAN_FILE)  $(DESTDIR)$(MAN_DIR)/
+
+uninstall:
+	rm -f $(DESTDIR)$(BIN_DIR)/$(EXEC_NAME)
+	rm -f $(DESTDIR)$(MAN_DIR)/$(MAN_FILE)


--- NEW FILE beep.spec ---
Summary:        Beep the PC speaker any number of ways
Name:           beep
Version:        1.2.2
Release:        3%{?dist}

Group:          Applications/System
License:        GPLv2+
URL:            http://www.johnath.com/beep/
Source0:        http://www.johnath.com/beep/%{name}-%{version}.tar.gz
Patch0:         beep-1.2.2-install-fixes.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  glibc-kernheaders


%description
Beep allows the user to control the PC speaker with precision,
allowing different sounds to indicate different events. While it
can be run quite happily on the commandline, it's intended place
of residence is within shell/perl scripts, notifying the user when
something interesting occurs. Of course, it has no notion of
what's interesting, but it's real good at that notifying part.


%prep
%setup -q
%patch0 -p1 -b .install-fixes


%build
make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING CREDITS README
%attr(0755,root,root) %{_bindir}/beep
%{_mandir}/man1/beep.1.gz


%changelog
* Sun Sep  7 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.2-3
- Initial package for submission to Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beep/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 04:13:21 -0000	1.1
+++ .cvsignore	8 Sep 2008 07:32:19 -0000	1.2
@@ -0,0 +1 @@
+beep-1.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beep/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 04:13:21 -0000	1.1
+++ sources	8 Sep 2008 07:32:19 -0000	1.2
@@ -0,0 +1 @@
+d541419fd7e5642952d7b48cbb40c712  beep-1.2.2.tar.gz



From ndim at fedoraproject.org  Mon Sep  8 07:32:50 2008
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Mon,  8 Sep 2008 07:32:50 +0000 (UTC)
Subject: rpms/beep/F-9 beep-1.2.2-install-fixes.patch, NONE, 1.1 beep.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080908073250.6AF3A70128@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/beep/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6394

Modified Files:
	.cvsignore sources 
Added Files:
	beep-1.2.2-install-fixes.patch beep.spec 
Log Message:
* Sun Sep  7 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.2-3
- Initial package for submission to Fedora


beep-1.2.2-install-fixes.patch:

--- NEW FILE beep-1.2.2-install-fixes.patch ---
diff --git a/Makefile b/Makefile
index 5856f9f..32bfb6b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,26 @@
 CC=gcc
 FLAGS=-Wall
 EXEC_NAME=beep
-INSTALL_DIR=/usr/bin
+BIN_DIR=/usr/bin
 MAN_FILE=beep.1.gz
-MAN_DIR=/usr/man/man1
+MAN_DIR=/usr/share/man/man1
 
-default : beep
+.PHONY: all
+all: $(EXEC_NAME)
 
-clean : 
+.PHONY: clean
+clean:
 	rm ${EXEC_NAME}
 
-beep : beep.c
-	${CC} ${FLAGS} -o ${EXEC_NAME} beep.c
+$(EXEC_NAME): beep.c
+	$(CC) $(FLAGS) $(CFLAGS) -o $(EXEC_NAME) $<
 
-install : 
-	cp ${EXEC_NAME} ${INSTALL_DIR}
-	rm -f /usr/man/man1/beep.1.bz2
-	cp ${MAN_FILE} ${MAN_DIR}
+install:
+	install -m 0755 -d $(DESTDIR)$(BIN_DIR)
+	install -m 0755 -d $(DESTDIR)$(MAN_DIR)
+	install -m 0755 -p $(EXEC_NAME) $(DESTDIR)$(BIN_DIR)/
+	install -m 0644 -p $(MAN_FILE)  $(DESTDIR)$(MAN_DIR)/
+
+uninstall:
+	rm -f $(DESTDIR)$(BIN_DIR)/$(EXEC_NAME)
+	rm -f $(DESTDIR)$(MAN_DIR)/$(MAN_FILE)


--- NEW FILE beep.spec ---
Summary:        Beep the PC speaker any number of ways
Name:           beep
Version:        1.2.2
Release:        3%{?dist}

Group:          Applications/System
License:        GPLv2+
URL:            http://www.johnath.com/beep/
Source0:        http://www.johnath.com/beep/%{name}-%{version}.tar.gz
Patch0:         beep-1.2.2-install-fixes.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  glibc-kernheaders


%description
Beep allows the user to control the PC speaker with precision,
allowing different sounds to indicate different events. While it
can be run quite happily on the commandline, it's intended place
of residence is within shell/perl scripts, notifying the user when
something interesting occurs. Of course, it has no notion of
what's interesting, but it's real good at that notifying part.


%prep
%setup -q
%patch0 -p1 -b .install-fixes


%build
make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING CREDITS README
%attr(0755,root,root) %{_bindir}/beep
%{_mandir}/man1/beep.1.gz


%changelog
* Sun Sep  7 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.2-3
- Initial package for submission to Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beep/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 04:13:21 -0000	1.1
+++ .cvsignore	8 Sep 2008 07:32:20 -0000	1.2
@@ -0,0 +1 @@
+beep-1.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beep/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 04:13:21 -0000	1.1
+++ sources	8 Sep 2008 07:32:20 -0000	1.2
@@ -0,0 +1 @@
+d541419fd7e5642952d7b48cbb40c712  beep-1.2.2.tar.gz



From desi at fedoraproject.org  Mon Sep  8 07:48:48 2008
From: desi at fedoraproject.org (Desislav Georgiev Georgiev)
Date: Mon,  8 Sep 2008 07:48:48 +0000 (UTC)
Subject: rpms/cwrite/F-9 import.log, NONE, 1.1 cwrite.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <20080908074848.4664470128@cvs1.fedora.phx.redhat.com>

Author: desi

Update of /cvs/pkgs/rpms/cwrite/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12904/F-9

Modified Files:
	cwrite.spec sources 
Added Files:
	import.log 
Log Message:



--- NEW FILE import.log ---
cwrite-0_1_24-2_fc9:F-9:cwrite-0.1.24-2.fc9.src.rpm:1220860036


Index: cwrite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cwrite/F-9/cwrite.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cwrite.spec	19 Feb 2008 01:23:55 -0000	1.3
+++ cwrite.spec	8 Sep 2008 07:48:17 -0000	1.4
@@ -8,8 +8,8 @@
 Source:  http://file047p.mylivepage.com/chunk47/1204371/988/%{name}-%{version}.tar.gz
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:   texinfo, ncurses-devel, groff
-Requires(post):  /sbin/install-info
-Requires(preun): /sbin/install-info
+Requires(post):  /sbin/install-info, /bin/sh
+Requires(preun): /sbin/install-info, /bin/sh
 
 %description
 A new text editor for the console.
@@ -55,9 +55,6 @@
 #rm -rf %{buildroot}
 
 %changelog
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.24-2
-- Autorebuild for GCC 4.3
-
 * Mon Dec 31 2007 Desislav Georgiev <cwrite at mail.ru> - 0.1.24-1
 - changlog correction
 - description improved


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cwrite/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Jan 2008 09:20:05 -0000	1.3
+++ sources	8 Sep 2008 07:48:17 -0000	1.4
@@ -1 +1 @@
-d01a4417885e028df818ddec5b2e66e4  cwrite-0.1.24.tar.gz
+802c14baaceb33b6f8584505005d67ce  cwrite-0.1.24.tar.gz



From caolanm at fedoraproject.org  Mon Sep  8 07:53:58 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  8 Sep 2008 07:53:58 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1641,1.1642
Message-ID: <20080908075358.ECEA070128@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14959

Modified Files:
	openoffice.org.spec 
Log Message:
prefix


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1641
retrieving revision 1.1642
diff -u -r1.1641 -r1.1642
--- openoffice.org.spec	7 Sep 2008 19:26:57 -0000	1.1641
+++ openoffice.org.spec	8 Sep 2008 07:53:27 -0000	1.1642
@@ -1397,7 +1397,7 @@
 rm -rf $RPM_BUILD_ROOT
 source Linux*Env.Set.sh
 #figure out the icon version
-export `grep "^PRODUCTVERSIONSHORT =" desktop/productversion.mk | sed -e "s/ //g"`
+export `grep "^PRODUCTVERSIONSHORT =" sysui/desktop/productversion.mk | sed -e "s/ //g"`
 unset HAVE_LD_HASH_STYLE
 #don't duplicate english helpcontent about the place
 unset DEFAULT_TO_ENGLISH_FOR_PACKING



From bagnara at fedoraproject.org  Mon Sep  8 08:00:17 2008
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Mon,  8 Sep 2008 08:00:17 +0000 (UTC)
Subject: rpms/ppl/devel ppl.spec,1.11,1.12
Message-ID: <20080908080017.0890770128@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17256

Modified Files:
	ppl.spec 
Log Message:
Fixed the SWI-Prolog interface dependencies.



Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ppl.spec	8 Sep 2008 07:16:22 -0000	1.11
+++ ppl.spec	8 Sep 2008 07:59:46 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		ppl
 Version:	0.9
-Release:	20%{?dist}
+Release:	21%{?dist}
 
 Summary:	The Parma Polyhedra Library: a library of numerical abstractions
 Group:		Development/Libraries
@@ -83,27 +83,23 @@
 of the Parma Polyhedra Library.
 %endif
 
-%ifnarch ppc64
 %package swiprolog
 Summary:	The SWI-Prolog interface of the Parma Polyhedra Library
 Group:		Development/Libraries
-BuildRequires:	pl >= 5.6.0
+BuildRequires:	pl-devel >= 5.6.57-2
 Requires:	ppl = %{version}-%{release}, ppl-pwl = %{version}-%{release}, pl >= 5.6.0
 %description swiprolog
 This package adds SWI-Prolog support to the Parma Polyhedra Library.
 Install this package if you want to use the library in SWI Prolog programs.
-%endif
 
-%ifnarch ppc64
 %package swiprolog-static
 Summary:	The static archive for the SWI-Prolog interface of the Parma Polyhedra Library
 Group:		Development/Libraries
-BuildRequires:	pl >= 5.6.0
+BuildRequires:	pl-devel >= 5.6.57-2, pl-static >= 5.6.57-2
 Requires:	ppl-swiprolog = %{version}-%{release}
 %description swiprolog-static
 This package contains the static archive for the SWI-Prolog interface
 of the Parma Polyhedra Library.
-%endif
 
 %package yap
 Summary:	The YAP Prolog interface of the Parma Polyhedra Library
@@ -260,20 +256,16 @@
 %{_libdir}/%{name}/libppl_gprolog.a
 %endif
 
-%ifnarch ppc64
 %files swiprolog
 %defattr(-,root,root,-)
 %doc interfaces/Prolog/SWI/README.swiprolog
 %{_bindir}/ppl_pl
 %{_libdir}/%{name}/libppl_swiprolog.so
 %{_libdir}/%{name}/ppl_swiprolog.pl
-%endif
 
-%ifnarch ppc64
 %files swiprolog-static
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libppl_swiprolog.a
-%endif
 
 %files yap
 %defattr(-,root,root,-)
@@ -317,6 +309,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-21
+- Fixed the SWI-Prolog interface dependencies.
+
 * Mon May 19 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-20
 - Added Requires /sbin/ldconfig.
 



From phuang at fedoraproject.org  Mon Sep  8 08:05:10 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon,  8 Sep 2008 08:05:10 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.8, 1.9 ibus.spec, 1.11, 1.12 sources, 
	1.9, 1.10 xinput-ibus, 1.1, 1.2
Message-ID: <20080908080510.53D0F70128@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19006

Modified Files:
	.cvsignore ibus.spec sources xinput-ibus 
Log Message:
Update to 0.1.1.20080908


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	31 Aug 2008 23:47:31 -0000	1.8
+++ .cvsignore	8 Sep 2008 08:04:39 -0000	1.9
@@ -1 +1 @@
-ibus-0.1.1.20080901.tar.gz
+ibus-0.1.1.20080908.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ibus.spec	31 Aug 2008 23:47:31 -0000	1.11
+++ ibus.spec	8 Sep 2008 08:04:39 -0000	1.12
@@ -1,9 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define mod_path ibus-0.1
 Name:       ibus
-Version:    0.1.1.20080901
+Version:    0.1.1.20080908
 Release:    1%{?dist}
-Summary:    Input Bus for Linux OS
+Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
@@ -25,12 +25,12 @@
 Requires:   pyxdg
 
 %description
-IBus means the Input Bus. It is a new input framework for Linux OS. It provides
+IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides
 full featured and user friendly input method user interface. It also may help
 developers to develop input method easily.
 
 %package gtk
-Summary:    IBus im module for gtk2
+Summary:    iBus im module for gtk2
 Group:      System Environment/Libraries
 Requires:   %{name} = %{version}-%{release}
 
@@ -38,7 +38,7 @@
 This package contains ibus im module for gtk2
 
 %package qt
-Summary:    IBus im module for qt4
+Summary:    iBus im module for qt4
 Group:      System Environment/Libraries
 Requires:   %{name} = %{version}-%{release}
 
@@ -120,6 +120,9 @@
 %{_libdir}/qt4/plugins/inputmethods/libibus.so
 
 %changelog
+* Mon Sep 08 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080908-1
+- Update to 0.1.1.20080908.
+
 * Mon Sep 01 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
 - Update to 0.1.1.20080901.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	31 Aug 2008 23:47:31 -0000	1.9
+++ sources	8 Sep 2008 08:04:39 -0000	1.10
@@ -1 +1 @@
-879cec0b159bc5e0340edea128139688  ibus-0.1.1.20080901.tar.gz
+610aedfc52826222a61420592bb1c22e  ibus-0.1.1.20080908.tar.gz


Index: xinput-ibus
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/xinput-ibus,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xinput-ibus	10 Aug 2008 11:32:49 -0000	1.1
+++ xinput-ibus	8 Sep 2008 08:04:39 -0000	1.2
@@ -1,8 +1,7 @@
 XIM=ibus
-# define a fake XIM program
-XIM_PROGRAM="/bin/sleep"
-XIM_ARGS="0xffffffff"
+XIM_PROGRAM="/usr/bin/ibus"
+# XIM_ARGS="0xffffffff"
 PREFERENCE_PROGRAM=/usr/bin/ibus-setup
-SHORT_DESC="IBus"
+SHORT_DESC="iBus"
 GTK_IM_MODULE=ibus
 QT_IM_MODULE=ibus



From phuang at fedoraproject.org  Mon Sep  8 08:14:17 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon,  8 Sep 2008 08:14:17 +0000 (UTC)
Subject: rpms/ibus/F-9 .cvsignore, 1.5, 1.6 ibus.spec, 1.7, 1.8 sources, 1.7,
	1.8 xinput-ibus, 1.1, 1.2
Message-ID: <20080908081417.D870F70128@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22142

Modified Files:
	.cvsignore ibus.spec sources xinput-ibus 
Log Message:
Update to 0.1.1.20080908


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Aug 2008 23:56:34 -0000	1.5
+++ .cvsignore	8 Sep 2008 08:13:47 -0000	1.6
@@ -1 +1 @@
-ibus-0.1.1.20080901.tar.gz
+ibus-0.1.1.20080908.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/ibus.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ibus.spec	31 Aug 2008 23:56:34 -0000	1.7
+++ ibus.spec	8 Sep 2008 08:13:47 -0000	1.8
@@ -1,9 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define mod_path ibus-0.1
 Name:       ibus
-Version:    0.1.1.20080901
+Version:    0.1.1.20080908
 Release:    1%{?dist}
-Summary:    Input Bus for Linux OS
+Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
@@ -25,12 +25,12 @@
 Requires:   pyxdg
 
 %description
-IBus means the Input Bus. It is a new input framework for Linux OS. It provides
+IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides
 full featured and user friendly input method user interface. It also may help
 developers to develop input method easily.
 
 %package gtk
-Summary:    IBus im module for gtk2
+Summary:    iBus im module for gtk2
 Group:      System Environment/Libraries
 Requires:   %{name} = %{version}-%{release}
 
@@ -38,7 +38,7 @@
 This package contains ibus im module for gtk2
 
 %package qt
-Summary:    IBus im module for qt4
+Summary:    iBus im module for qt4
 Group:      System Environment/Libraries
 Requires:   %{name} = %{version}-%{release}
 
@@ -120,6 +120,9 @@
 %{_libdir}/qt4/plugins/inputmethods/libibus.so
 
 %changelog
+* Mon Sep 08 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080908-1
+- Update to 0.1.1.20080908.
+
 * Mon Sep 01 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
 - Update to 0.1.1.20080901.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Aug 2008 23:56:34 -0000	1.7
+++ sources	8 Sep 2008 08:13:47 -0000	1.8
@@ -1 +1 @@
-879cec0b159bc5e0340edea128139688  ibus-0.1.1.20080901.tar.gz
+610aedfc52826222a61420592bb1c22e  ibus-0.1.1.20080908.tar.gz


Index: xinput-ibus
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/xinput-ibus,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xinput-ibus	10 Aug 2008 13:20:05 -0000	1.1
+++ xinput-ibus	8 Sep 2008 08:13:47 -0000	1.2
@@ -1,8 +1,7 @@
 XIM=ibus
-# define a fake XIM program
-XIM_PROGRAM="/bin/sleep"
-XIM_ARGS="0xffffffff"
+XIM_PROGRAM="/usr/bin/ibus"
+# XIM_ARGS="0xffffffff"
 PREFERENCE_PROGRAM=/usr/bin/ibus-setup
-SHORT_DESC="IBus"
+SHORT_DESC="iBus"
 GTK_IM_MODULE=ibus
 QT_IM_MODULE=ibus



From desi at fedoraproject.org  Mon Sep  8 08:23:26 2008
From: desi at fedoraproject.org (Desislav Georgiev Georgiev)
Date: Mon,  8 Sep 2008 08:23:26 +0000 (UTC)
Subject: rpms/cwrite/F-9 cwrite.spec,1.4,1.5 import.log,1.1,1.2
Message-ID: <20080908082326.72C9070128@cvs1.fedora.phx.redhat.com>

Author: desi

Update of /cvs/pkgs/rpms/cwrite/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25015/F-9

Modified Files:
	cwrite.spec import.log 
Log Message:



Index: cwrite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cwrite/F-9/cwrite.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cwrite.spec	8 Sep 2008 07:48:17 -0000	1.4
+++ cwrite.spec	8 Sep 2008 08:22:56 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: A new text editor for the console
 Name:    cwrite
 Version: 0.1.24
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group:   Applications/Editors
 URL:     http://cwrite-editor.hoter.ru


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/cwrite/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Sep 2008 07:48:17 -0000	1.1
+++ import.log	8 Sep 2008 08:22:56 -0000	1.2
@@ -1 +1,2 @@
 cwrite-0_1_24-2_fc9:F-9:cwrite-0.1.24-2.fc9.src.rpm:1220860036
+cwrite-0_1_24-3_fc9:F-9:cwrite-0.1.24-3.fc9.src.rpm:1220862142



From bagnara at fedoraproject.org  Mon Sep  8 08:26:07 2008
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Mon,  8 Sep 2008 08:26:07 +0000 (UTC)
Subject: rpms/ppl/devel ppl-0.9-swiprolog.patch,NONE,1.1 ppl.spec,1.12,1.13
Message-ID: <20080908082607.1F91670128@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26062

Modified Files:
	ppl.spec 
Added Files:
	ppl-0.9-swiprolog.patch 
Log Message:
Implemented a workaround to cope with the new location of SWI-Prolog.h.


ppl-0.9-swiprolog.patch:

--- NEW FILE ppl-0.9-swiprolog.patch ---
diff -ur ppl-0.9/m4/ac_check_swi_prolog.m4 ppl-0.9-patched/m4/ac_check_swi_prolog.m4
--- ppl-0.9/m4/ac_check_swi_prolog.m4	2006-01-18 16:30:03.000000000 +0100
+++ ppl-0.9-patched/m4/ac_check_swi_prolog.m4	2008-09-08 10:22:10.000000000 +0200
@@ -41,7 +41,7 @@
 
   dnl Additional version checks could be inserted here, if necessary.
 
-  SWI_PROLOG_INCLUDE_OPTIONS="-I${swi_prolog_base}/include"
+  SWI_PROLOG_INCLUDE_OPTIONS="-I${swi_prolog_base}/include -I/usr/include/pl"
   ac_save_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="$CPPFLAGS $SWI_PROLOG_INCLUDE_OPTIONS"
   AC_LANG_PUSH(C++)


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ppl.spec	8 Sep 2008 07:59:46 -0000	1.12
+++ ppl.spec	8 Sep 2008 08:25:36 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		ppl
 Version:	0.9
-Release:	21%{?dist}
+Release:	22%{?dist}
 
 Summary:	The Parma Polyhedra Library: a library of numerical abstractions
 Group:		Development/Libraries
@@ -14,6 +14,7 @@
 Patch1:		ppl-0.9-configure.patch
 Patch2:		ppl-0.9-makefiles.patch
 Patch3:		ppl-0.9-cstdlib.patch
+Patch4:		ppl-0.9-swiprolog.patch
 #Icon:
 #Requires:
 Requires(post): /sbin/ldconfig
@@ -162,6 +163,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 CPPFLAGS="-I%{_includedir}/glpk"
@@ -309,6 +311,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-22
+- Implemented a workaround to cope with the new location of SWI-Prolog.h.
+
 * Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-21
 - Fixed the SWI-Prolog interface dependencies.
 



From twaugh at fedoraproject.org  Mon Sep  8 08:48:37 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  8 Sep 2008 08:48:37 +0000 (UTC)
Subject: rpms/unix2dos/devel unix2dos.spec,1.26,1.27
Message-ID: <20080908084837.806B970128@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/unix2dos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1290

Modified Files:
	unix2dos.spec 
Log Message:
* Mon Sep  8 2008 Tim Waugh <twaugh at redhat.com> 2.2-31
- Explicitly apply patch0.



Index: unix2dos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unix2dos/devel/unix2dos.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- unix2dos.spec	13 Feb 2008 10:57:24 -0000	1.26
+++ unix2dos.spec	8 Sep 2008 08:48:06 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: UNIX to DOS text file format converter
 Name: unix2dos
 Version: 2.2
-Release: 30%{?dist}
+Release: 31%{?dist}
 License: Distributable
 Group: Applications/Text
 Source: unix2dos-2.2.src.tar.gz
@@ -14,7 +14,7 @@
 
 %prep
 %setup -q -c
-%patch -p1 -b .sec
+%patch0 -p1 -b .sec
 %patch1 -p1 -b .segf
 %patch2 -p1 -b .man
 %patch3 -p1 -b .mode
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tim Waugh <twaugh at redhat.com> 2.2-31
+- Explicitly apply patch0.
+
 * Wed Feb 13 2008 Tim Waugh <twaugh at redhat.com> 2.2-30
 - Rebuild for GCC 4.3.
 



From twaugh at fedoraproject.org  Mon Sep  8 08:51:08 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  8 Sep 2008 08:51:08 +0000 (UTC)
Subject: rpms/unix2dos/devel unix2dos-2.2-manpage.patch, 1.1,
	1.2 unix2dos.spec, 1.27, 1.28
Message-ID: <20080908085108.7545E70128@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/unix2dos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2231

Modified Files:
	unix2dos-2.2-manpage.patch unix2dos.spec 
Log Message:
* Mon Sep  8 2008 Tim Waugh <twaugh at redhat.com> 2.2-31
- Fixed grammar in man page (bug #460731).


unix2dos-2.2-manpage.patch:

Index: unix2dos-2.2-manpage.patch
===================================================================
RCS file: /cvs/pkgs/rpms/unix2dos/devel/unix2dos-2.2-manpage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unix2dos-2.2-manpage.patch	9 Sep 2004 13:46:08 -0000	1.1
+++ unix2dos-2.2-manpage.patch	8 Sep 2008 08:50:37 -0000	1.2
@@ -1,6 +1,7 @@
---- unix2dos-2.2/unix2dos.1.man	Thu Jan 17 17:25:08 2002
-+++ unix2dos-2.2/unix2dos.1	Thu Jan 17 17:25:35 2002
-@@ -16,7 +16,7 @@
+diff -up unix2dos-2.2/unix2dos.1.man unix2dos-2.2/unix2dos.1
+--- unix2dos-2.2/unix2dos.1.man	1995-03-30 17:03:22.000000000 +0100
++++ unix2dos-2.2/unix2dos.1	2008-09-08 09:49:19.000000000 +0100
+@@ -16,7 +16,7 @@ Options:
  .SH DESCRIPTION
  
  .PP
@@ -9,7 +10,7 @@
  files in UNIX format to DOS format.
  
  .SH OPTIONS
-@@ -40,7 +40,7 @@
+@@ -40,7 +40,7 @@ Prints version information.
  
  .TP
  .B \-c --convmode convmode
@@ -18,7 +19,16 @@
  
  .TP
  .B \-o --oldfile file ...
-@@ -71,9 +71,9 @@
+@@ -51,7 +51,7 @@ default to run in this mode. Wildcard na
+ .B \-n --newfile infile outfile ...
+ New file mode. Convert the infile and write output to outfile. File names
+ must be given in pairs and wildcard names should NOT be used or you WILL 
+-lost your files. 
++lose your files. 
+ 
+ .SH EXAMPLES
+ 
+@@ -71,9 +71,9 @@ Convert and replace a.txt. Convert and r
  Convert and replace a.txt in ASCII conversion mode.
  Convert and replace b.txt in ISO conversion mode.
  .IP


Index: unix2dos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unix2dos/devel/unix2dos.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- unix2dos.spec	8 Sep 2008 08:48:06 -0000	1.27
+++ unix2dos.spec	8 Sep 2008 08:50:37 -0000	1.28
@@ -45,6 +45,7 @@
 
 %changelog
 * Mon Sep  8 2008 Tim Waugh <twaugh at redhat.com> 2.2-31
+- Fixed grammar in man page (bug #460731).
 - Explicitly apply patch0.
 
 * Wed Feb 13 2008 Tim Waugh <twaugh at redhat.com> 2.2-30



From twaugh at fedoraproject.org  Mon Sep  8 08:57:31 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  8 Sep 2008 08:57:31 +0000 (UTC)
Subject: rpms/unix2dos/devel unix2dos-preserve-file-modes.patch, NONE,
	1.1 unix2dos.spec, 1.28, 1.29
Message-ID: <20080908085731.5040370128@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/unix2dos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4095

Modified Files:
	unix2dos.spec 
Added Files:
	unix2dos-preserve-file-modes.patch 
Log Message:
* Mon Sep  8 2008 Tim Waugh <twaugh at redhat.com> 2.2-31
- Preserve file modes (bug #437469).


unix2dos-preserve-file-modes.patch:

--- NEW FILE unix2dos-preserve-file-modes.patch ---
diff -up unix2dos-2.2/unix2dos.c~ unix2dos-2.2/unix2dos.c
--- unix2dos-2.2/unix2dos.c~	2008-03-03 13:16:34.000000000 +0000
+++ unix2dos-2.2/unix2dos.c	2008-03-03 13:22:10.000000000 +0000
@@ -244,10 +244,11 @@ int ConvertUnixToDosNewFile(char *ipInFN
   char *TempPath;
   struct stat StatBuf;
   struct utimbuf UTimeBuf;
+  mode_t mask;
   int fd;
 
   /* retrieve ipInFN file date stamp */
-  if ((ipFlag->KeepDate) && stat(ipInFN, &StatBuf))
+  if (stat(ipInFN, &StatBuf))
     RetVal = -1;
 
   if((fd = MakeTempFileFrom (ipOutFN, &TempPath)) < 0) {
@@ -271,6 +272,12 @@ int ConvertUnixToDosNewFile(char *ipInFN
     RetVal = -1;
   }
 
+  /* preserve original mode as modified by umask */
+  mask = umask(0);
+  umask(mask);
+  if (!RetVal && fchmod(fd, StatBuf.st_mode & ~mask))
+      RetVal = -1;
+
   /* conversion sucessful? */
   if ((!RetVal) && (ConvertUnixToDos(InF, TempF, ipFlag)))
     RetVal = -1;


Index: unix2dos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unix2dos/devel/unix2dos.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- unix2dos.spec	8 Sep 2008 08:50:37 -0000	1.28
+++ unix2dos.spec	8 Sep 2008 08:57:00 -0000	1.29
@@ -10,6 +10,7 @@
 Patch2: unix2dos-2.2-manpage.patch
 Patch3: unix2dos-2.2-mode.patch
 Patch4: unix2dos-2.2-tmppath.patch
+Patch5: unix2dos-preserve-file-modes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %prep
@@ -19,6 +20,7 @@
 %patch2 -p1 -b .man
 %patch3 -p1 -b .mode
 %patch4 -p1 -b .tmppath
+%patch5 -p1 -b .preserve-file-modes
 perl -pi -e "s/^#endif.*/#endif/g;s/^#else.*/#else/g" *.[ch]
 
 %description
@@ -45,6 +47,7 @@
 
 %changelog
 * Mon Sep  8 2008 Tim Waugh <twaugh at redhat.com> 2.2-31
+- Preserve file modes (bug #437469).
 - Fixed grammar in man page (bug #460731).
 - Explicitly apply patch0.
 



From twaugh at fedoraproject.org  Mon Sep  8 09:01:04 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  8 Sep 2008 09:01:04 +0000 (UTC)
Subject: rpms/dos2unix/devel dos2unix-manpage.patch, NONE, 1.1 dos2unix.spec,
	1.31, 1.32
Message-ID: <20080908090104.915C570128@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/dos2unix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5712

Modified Files:
	dos2unix.spec 
Added Files:
	dos2unix-manpage.patch 
Log Message:
* Mon Sep  8 2008 Tim Waugh <twaugh at redhat.com> 3.1-33
- Fixed manpage grammar (bug #460731).


dos2unix-manpage.patch:

--- NEW FILE dos2unix-manpage.patch ---
diff -up dos2unix-3.1/dos2unix.1.manpage dos2unix-3.1/dos2unix.1
--- dos2unix-3.1/dos2unix.1.manpage	2008-09-08 09:58:46.000000000 +0100
+++ dos2unix-3.1/dos2unix.1	2008-09-08 09:58:56.000000000 +0100
@@ -52,7 +52,7 @@ default to run in this mode. Wildcard na
 .B \-n \-\-newfile infile outfile ...
 New file mode. Convert the infile and write output to outfile. File names
 must be given in pairs and wildcard names should NOT be used or you WILL 
-lost your files. 
+lose your files. 
 
 .SH "EXAMPLES"
 .LP 


Index: dos2unix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dos2unix/devel/dos2unix.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- dos2unix.spec	14 Apr 2008 16:15:41 -0000	1.31
+++ dos2unix.spec	8 Sep 2008 09:00:34 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: Text file format converter
 Name: dos2unix
 Version: 3.1
-Release: 32%{?dist}
+Release: 33%{?dist}
 Group: Applications/Text
 License: BSD
 Source: %{name}-%{version}.tar.bz2
@@ -13,6 +13,7 @@
 Patch5: dos2unix-3.1-tmppath.patch
 Patch6: dos2unix-c-missing-arg.patch
 Patch7: dos2unix-missing-proto.patch
+Patch8: dos2unix-manpage.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,6 +30,7 @@
 %patch5 -p1 -b .tmppath
 %patch6 -p1 -b .c-missing-arg
 %patch7 -p1 -b .missing-proto
+%patch8 -p1 -b .manpage
 
 for I in *.[ch]; do
 	sed -e 's,#endif.*,#endif,g' -e 's,#else.*,#else,g' $I > $I.new
@@ -60,6 +62,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Sep  8 2008 Tim Waugh <twaugh at redhat.com> 3.1-33
+- Fixed manpage grammar (bug #460731).
+
 * Mon Apr 14 2008 Tim Waugh <twaugh at redhat.com> 3.1-32
 - Adjust license tag (bug #225706).
 - Fix missing prototype (bug #225706).



From twaugh at fedoraproject.org  Mon Sep  8 09:15:52 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  8 Sep 2008 09:15:52 +0000 (UTC)
Subject: rpms/unix2dos/devel unix2dos-2.2-mode.patch, 1.1,
	1.2 unix2dos-2.2-tmppath.patch, 1.2, 1.3 unix2dos.spec, 1.29, 1.30
Message-ID: <20080908091552.BF92670128@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/unix2dos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10537

Modified Files:
	unix2dos-2.2-mode.patch unix2dos-2.2-tmppath.patch 
	unix2dos.spec 
Log Message:
* Mon Sep  8 2008 Tim Waugh <twaugh at redhat.com> 2.2-31
- Removed patch fuzz.


unix2dos-2.2-mode.patch:

Index: unix2dos-2.2-mode.patch
===================================================================
RCS file: /cvs/pkgs/rpms/unix2dos/devel/unix2dos-2.2-mode.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unix2dos-2.2-mode.patch	11 Oct 2004 13:26:12 -0000	1.1
+++ unix2dos-2.2-mode.patch	8 Sep 2008 09:15:22 -0000	1.2
@@ -1,6 +1,7 @@
---- unix2dos-2.2/unix2dos.c.mode	2004-10-11 14:20:07.194483616 +0100
-+++ unix2dos-2.2/unix2dos.c	2004-10-11 14:20:30.752966221 +0100
-@@ -292,11 +292,14 @@
+diff -up unix2dos-2.2/unix2dos.c.mode unix2dos-2.2/unix2dos.c
+--- unix2dos-2.2/unix2dos.c.mode	2008-09-08 10:13:39.000000000 +0100
++++ unix2dos-2.2/unix2dos.c	2008-09-08 10:13:39.000000000 +0100
+@@ -292,11 +292,14 @@ int ConvertUnixToDosOldFile(char* ipInFN
    char TempPath[16];
    struct stat StatBuf;
    struct utimbuf UTimeBuf;
@@ -16,7 +17,7 @@
  
    strcpy (TempPath, "./u2dtmpXXXXXX");
    if((fd=mkstemp (TempPath)) < 0) {
-@@ -304,6 +307,9 @@
+@@ -304,6 +307,9 @@ int ConvertUnixToDosOldFile(char* ipInFN
        RetVal = -1;
    }
  
@@ -25,4 +26,4 @@
 +
  #ifdef DEBUG
    fprintf(stderr, "unix2dos: using %s as temp file\n", TempPath);
- #endif
+ #endif DEBUG    

unix2dos-2.2-tmppath.patch:

Index: unix2dos-2.2-tmppath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/unix2dos/devel/unix2dos-2.2-tmppath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unix2dos-2.2-tmppath.patch	13 Apr 2005 11:22:54 -0000	1.2
+++ unix2dos-2.2-tmppath.patch	8 Sep 2008 09:15:22 -0000	1.3
@@ -1,5 +1,6 @@
---- unix2dos-2.2/unix2dos.c.tmppath	2004-10-20 16:10:06.941343976 +0200
-+++ unix2dos-2.2/unix2dos.c	2004-10-20 16:17:52.199613968 +0200
+diff -up unix2dos-2.2/unix2dos.c.tmppath unix2dos-2.2/unix2dos.c
+--- unix2dos-2.2/unix2dos.c.tmppath	2008-09-08 10:14:30.000000000 +0100
++++ unix2dos-2.2/unix2dos.c	2008-09-08 10:14:30.000000000 +0100
 @@ -57,7 +57,10 @@
  
  #ifdef __MSDOS__
@@ -11,7 +12,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-@@ -195,6 +198,40 @@
+@@ -195,6 +198,40 @@ int ConvertUnixToDos(FILE* ipInF, FILE* 
  }
  
  
@@ -52,7 +53,7 @@
  /* convert file ipInFN to DOS format text and write to file ipOutFN
   * RetVal: 0 if success
   *         -1 otherwise
-@@ -204,7 +241,7 @@
+@@ -204,7 +241,7 @@ int ConvertUnixToDosNewFile(char *ipInFN
    int RetVal = 0;
    FILE *InF = NULL;
    FILE *TempF = NULL;
@@ -61,7 +62,8 @@
    struct stat StatBuf;
    struct utimbuf UTimeBuf;
    int fd;
-@@ -214,7 +251,6 @@
+@@ -213,8 +250,7 @@ int ConvertUnixToDosNewFile(char *ipInFN
+   if ((ipFlag->KeepDate) && stat(ipInFN, &StatBuf))
      RetVal = -1;
  
 -  strcpy (TempPath, "./u2dtmpXXXXXX");
@@ -70,7 +72,7 @@
  	  perror("Can't open output temp file");
  	  RetVal = -1;
    }
-@@ -231,6 +267,7 @@
+@@ -231,6 +267,7 @@ int ConvertUnixToDosNewFile(char *ipInFN
    if ((!RetVal) && (InF) && ((TempF=OpenOutFile(fd)) == NULL))
    {
      fclose (InF);
@@ -78,7 +80,7 @@
      RetVal = -1;
    }
  
-@@ -265,9 +302,6 @@
+@@ -265,9 +302,6 @@ int ConvertUnixToDosNewFile(char *ipInFN
    /* can rename temp file to out file? */
    if (!RetVal)
    {
@@ -88,7 +90,7 @@
      if ((rename(TempPath, ipOutFN) == -1) && (!ipFlag->Quiet))
      {
        fprintf(stderr, "unix2dos: problems renaming '%s' to '%s'\n", TempPath, ipOutFN);
-@@ -275,6 +309,7 @@
+@@ -275,6 +309,7 @@ int ConvertUnixToDosNewFile(char *ipInFN
        RetVal = -1;
      }
    }
@@ -96,7 +98,7 @@
  
    return RetVal;
  }
-@@ -289,7 +324,7 @@
+@@ -289,7 +324,7 @@ int ConvertUnixToDosOldFile(char* ipInFN
    int RetVal = 0;
    FILE *InF = NULL;
    FILE *TempF = NULL;
@@ -105,7 +107,7 @@
    struct stat StatBuf;
    struct utimbuf UTimeBuf;
    mode_t mode = S_IRUSR | S_IWUSR;
-@@ -301,8 +336,7 @@
+@@ -301,8 +336,7 @@ int ConvertUnixToDosOldFile(char* ipInFN
    else
      mode = StatBuf.st_mode;
  
@@ -115,7 +117,7 @@
        perror("Can't open output temp file");
        RetVal = -1;
    }
-@@ -322,6 +356,7 @@
+@@ -322,6 +356,7 @@ int ConvertUnixToDosOldFile(char* ipInFN
    if ((!RetVal) && (InF) && ((TempF=OpenOutFile(fd)) == NULL))
    {
      fclose (InF);
@@ -123,7 +125,7 @@
      RetVal = -1;
    }
  
-@@ -349,10 +384,6 @@
+@@ -349,10 +384,6 @@ int ConvertUnixToDosOldFile(char* ipInFN
        RetVal = -1;
    }
  
@@ -134,7 +136,7 @@
    /* any error? */
    if ((RetVal) && (unlink(TempPath)))
      RetVal = -1;
-@@ -367,6 +398,7 @@
+@@ -367,6 +398,7 @@ int ConvertUnixToDosOldFile(char* ipInFN
      }
      RetVal = -1;
    }


Index: unix2dos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unix2dos/devel/unix2dos.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- unix2dos.spec	8 Sep 2008 08:57:00 -0000	1.29
+++ unix2dos.spec	8 Sep 2008 09:15:22 -0000	1.30
@@ -47,6 +47,7 @@
 
 %changelog
 * Mon Sep  8 2008 Tim Waugh <twaugh at redhat.com> 2.2-31
+- Removed patch fuzz.
 - Preserve file modes (bug #437469).
 - Fixed grammar in man page (bug #460731).
 - Explicitly apply patch0.



From twaugh at fedoraproject.org  Mon Sep  8 09:18:26 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  8 Sep 2008 09:18:26 +0000 (UTC)
Subject: rpms/dos2unix/devel dos2unix-preserve-file-modes.patch, NONE,
	1.1 dos2unix.spec, 1.32, 1.33
Message-ID: <20080908091826.BE8C570128@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/dos2unix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11617

Modified Files:
	dos2unix.spec 
Added Files:
	dos2unix-preserve-file-modes.patch 
Log Message:
* Mon Sep  8 2008 Tim Waugh <twaugh at redhat.com> 3.1-33
- Preserve file modes (bug #437465).


dos2unix-preserve-file-modes.patch:

--- NEW FILE dos2unix-preserve-file-modes.patch ---
diff -up dos2unix-3.1/dos2unix.c.preserve-file-modes dos2unix-3.1/dos2unix.c
--- dos2unix-3.1/dos2unix.c.preserve-file-modes	2008-09-08 09:58:05.000000000 +0100
+++ dos2unix-3.1/dos2unix.c	2008-09-08 10:16:04.000000000 +0100
@@ -320,9 +320,10 @@ int ConvertDosToUnixNewFile(char *ipInFN
   struct stat StatBuf;
   struct utimbuf UTimeBuf;
   int fd;
+  mode_t mask;
 
   /* retrieve ipInFN file date stamp */
-  if ((ipFlag->KeepDate) && stat(ipInFN, &StatBuf))
+  if (stat(ipInFN, &StatBuf))
     RetVal = -1;
 
   if((fd = MakeTempFileFrom(ipOutFN, &TempPath))<0) {
@@ -346,6 +347,12 @@ int ConvertDosToUnixNewFile(char *ipInFN
     RetVal = -1;
   }
 
+  /* preserve original mode as modified by umask */
+  mask = umask(0);
+  umask(mask);
+  if (!RetVal && fchmod(fd, StatBuf.st_mode & ~mask))
+    RetVal = -1;
+
   /* conversion sucessful? */
   if ((!RetVal) && (ConvertDosToUnix(InF, TempF, ipFlag)))
     RetVal = -1;


Index: dos2unix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dos2unix/devel/dos2unix.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- dos2unix.spec	8 Sep 2008 09:00:34 -0000	1.32
+++ dos2unix.spec	8 Sep 2008 09:17:56 -0000	1.33
@@ -14,6 +14,7 @@
 Patch6: dos2unix-c-missing-arg.patch
 Patch7: dos2unix-missing-proto.patch
 Patch8: dos2unix-manpage.patch
+Patch9: dos2unix-preserve-file-modes.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,6 +32,7 @@
 %patch6 -p1 -b .c-missing-arg
 %patch7 -p1 -b .missing-proto
 %patch8 -p1 -b .manpage
+%patch9 -p1 -b .preserve-file-modes
 
 for I in *.[ch]; do
 	sed -e 's,#endif.*,#endif,g' -e 's,#else.*,#else,g' $I > $I.new
@@ -63,6 +65,7 @@
 
 %changelog
 * Mon Sep  8 2008 Tim Waugh <twaugh at redhat.com> 3.1-33
+- Preserve file modes (bug #437465).
 - Fixed manpage grammar (bug #460731).
 
 * Mon Apr 14 2008 Tim Waugh <twaugh at redhat.com> 3.1-32



From mschwendt at fedoraproject.org  Mon Sep  8 09:44:21 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon,  8 Sep 2008 09:44:21 +0000 (UTC)
Subject: rpms/plague/devel .cvsignore, 1.15, 1.16 plague.spec, 1.38,
	1.39 sources, 1.29, 1.30 plague-0.4.5.3-mod_user.patch, 1.1, NONE
Message-ID: <20080908094421.9D22F70128@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19475

Modified Files:
	.cvsignore plague.spec sources 
Removed Files:
	plague-0.4.5.3-mod_user.patch 
Log Message:
* Sun Sep 07 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.4-1
- update to 0.4.5.4 to make it work with MySQL 5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	5 Sep 2008 09:45:06 -0000	1.15
+++ .cvsignore	8 Sep 2008 09:43:50 -0000	1.16
@@ -1,2 +1,2 @@
-plague-0.4.5.3.tar.bz2
-plague-0.4.5.3.tar.bz2.asc
+plague-0.4.5.4.tar.bz2.asc
+plague-0.4.5.4.tar.bz2


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/plague.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- plague.spec	7 Sep 2008 10:48:16 -0000	1.38
+++ plague.spec	8 Sep 2008 09:43:50 -0000	1.39
@@ -2,13 +2,12 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.3
-Release: 2%{?dist}
+Version: 0.4.5.4
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 #Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
 Source: %{name}-%{version}.tar.bz2
-Patch0: plague-0.4.5.3-mod_user.patch
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
@@ -80,7 +79,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .user_mod
 
 
 %build
@@ -167,6 +165,9 @@
 
 
 %changelog
+* Sun Sep 07 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.4-1
+- update to 0.4.5.4 to make it work with MySQL 5
+
 * Sun Sep  7 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-2
 - fix mod_user in plague-user-manager for sqlite2/3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	5 Sep 2008 09:45:06 -0000	1.29
+++ sources	8 Sep 2008 09:43:50 -0000	1.30
@@ -1,2 +1,2 @@
-f9206fd27a4dbfba267eb149c1ed2a59  plague-0.4.5.3.tar.bz2
-285927a5b904db9f039958792de254fd  plague-0.4.5.3.tar.bz2.asc
+d36e365db56ebecb04ef6a8aaa7e8c54  plague-0.4.5.4.tar.bz2.asc
+9378f9f0344cd8ffb474c9e6af4b3cc4  plague-0.4.5.4.tar.bz2


--- plague-0.4.5.3-mod_user.patch DELETED ---



From tbzatek at fedoraproject.org  Mon Sep  8 09:53:43 2008
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon,  8 Sep 2008 09:53:43 +0000 (UTC)
Subject: rpms/xdg-user-dirs-gtk/devel xdg-user-dirs-gtk.spec,1.11,1.12
Message-ID: <20080908095343.1847470128@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/xdg-user-dirs-gtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22511

Modified Files:
	xdg-user-dirs-gtk.spec 
Log Message:
* Mon Sep  8 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.8-2
- Require intltool



Index: xdg-user-dirs-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-user-dirs-gtk/devel/xdg-user-dirs-gtk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xdg-user-dirs-gtk.spec	6 Sep 2008 01:24:43 -0000	1.11
+++ xdg-user-dirs-gtk.spec	8 Sep 2008 09:53:12 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		xdg-user-dirs-gtk
 Version:	0.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Gnome integration of special directories
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gettext, gtk2-devel, pkgconfig, perl-XML-Parser, xdg-user-dirs
+BuildRequires:	intltool
 Requires:	xdg-user-dirs
 
 %description
@@ -41,6 +42,9 @@
 %config(noreplace) %{_sysconfdir}/xdg/autostart/user-dirs-update-gtk.desktop
 
 %changelog
+* Mon Sep  8 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.8-2
+- Require intltool
+
 * Fri Sep  5 2008 Matthias Clasen  <mclasen at redhat.com> - 0.8-1
 - Update to 0.8
  



From transif at fedoraproject.org  Mon Sep  8 09:54:45 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Mon,  8 Sep 2008 09:54:45 +0000 (UTC)
Subject: comps/po fr.po,1.13,1.14
Message-ID: <20080908095445.5F85A70128@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22951/po

Modified Files:
	fr.po 
Log Message:
    2008-09-08  Michael Ughetto <telimektar1er at gmail.com> (via
telimekt at fedoraproject.org)
    
      * po/fr.po: French translation updated
    



Index: fr.po
===================================================================
RCS file: /cvs/pkgs/comps/po/fr.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fr.po	20 Jul 2008 16:54:33 -0000	1.13
+++ fr.po	8 Sep 2008 09:54:14 -0000	1.14
@@ -1,25 +1,27 @@
-# translation of comps.HEAD.po to french
-# translation of fr.po to
-# This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+# French translation of comps
+# This file is distributed under the same license as the comps package.
+# Copyright (C) 2006-2008 Fedora Project.
 #
 # Audrey Simons <asimons at redhat.com>, 2003, 2004.
 # Thomas Canniot <mrtom at fedoraproject.org>, 2006, 2007, 2008.
 # Damien Durand <splinux at fedoraproject.org>, 2006.
 # Decroux Fabien <fdecroux at redhat.com>, 2006.
 # Gauthier Ancelin <gauthier.ancelin at laposte.net>, 2008.
+# Micha??l Ughetto <telimektar1er at gmail.com>, 2008.
+# Robert-Andr?? Mauchin <zebob.m at pengzone.org>, 2008
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-12 21:03+0000\n"
-"PO-Revision-Date: 2008-07-02 22:15+0200\n"
-"Last-Translator: Gauthier Ancelin <gauthier.ancelin at laposte.net>\n"
-"Language-Team: french <fedora-trans-fr at redhat.com>\n"
+"POT-Creation-Date: 2008-08-31 19:27+0000\n"
+"PO-Revision-Date: 2008-09-01 02:01+0200\n"
+"Last-Translator: Robert-Andr?? Mauchin <zebob.m at pengzone.org>\n"
+"Language-Team: Fedora French <fedora-trans-fr at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Content-Transfer-Encoding: 8bit"
+"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
@@ -49,7 +51,7 @@
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
 #: ../comps-f10.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
-msgstr "Applications pour ex??cuter une vari??t?? de t??ches"
+msgstr "Applications pour effectuer une vari??t?? de t??ches"
 
 #: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
 #: ../comps-f10.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
@@ -69,7 +71,7 @@
 #: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
 #: ../comps-f10.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
-msgstr "Authoring et Publishing"
+msgstr "Cr??ation et ??dition"
 
 #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
 #: ../comps-f10.xml.in.h:11
@@ -139,12 +141,12 @@
 #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
 #: ../comps-f10.xml.in.h:25
 msgid "Clustering"
-msgstr "Clustering"
+msgstr "Syst??mes en grappe"
 
 #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26
 #: ../comps-f10.xml.in.h:26
 msgid "Clustering Support"
-msgstr "Prise en charge du clustering"
+msgstr "Prise en charge des syst??mes en grappe"
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27
 #: ../comps-f10.xml.in.h:27
@@ -174,12 +176,12 @@
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
 #: ../comps-f10.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
-msgstr "Environnement de bureau"
+msgstr "Environnements de bureau"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
 #: ../comps-f10.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
-msgstr "Environnement de bureau"
+msgstr "Environnements de bureau"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
 #: ../comps-f10.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11
@@ -199,7 +201,7 @@
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37
 #: ../comps-f10.xml.in.h:37
 msgid "Dial-up Networking Support"
-msgstr "Prise en charge de l'acc??s distant au r??seau"
+msgstr "Prise en charge de l'acc??s au r??seau par connexion t??l??phonique"
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
 #: ../comps-f10.xml.in.h:38
@@ -228,7 +230,7 @@
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
 #: ../comps-f10.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
-msgstr "Ing??nierie et Scientifique"
+msgstr "Ing??nierie et scientifique"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43
 #: ../comps-f10.xml.in.h:43
@@ -281,9 +283,9 @@
 "From CD recording to playing audio CDs and multimedia files, this package "
 "group allows you to work with sound and video on the system."
 msgstr ""
-"Ce groupe de paquets vous permet de travailler sur votre syst??me avec du "
-"son et des images, de l'enregistrement de CD-ROM ?? la lecture de CD audio et "
-"de fichiers multim??dia."
+"Ce groupe de paquets vous permet de travailler sur votre syst??me avec du son "
+"et des vid??os, de l'enregistrement de CD-ROM ?? la lecture de CD audio et de "
+"fichiers multim??dia."
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
 #: ../comps-f10.xml.in.h:57 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21
@@ -302,7 +304,7 @@
 "desktop, system icons, and a graphical file manager."
 msgstr ""
 "GNOME est une interface utilisateur graphique puissante qui comprend un "
-"tableau de bord, un bureau, des ic??nes de syst??me et un gestionnaire de "
+"tableau de bord, un bureau, des ic??nes syst??me et un gestionnaire de "
 "fichiers graphique."
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60
@@ -318,7 +320,7 @@
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62
 #: ../comps-f10.xml.in.h:62 ../comps-el5.xml.in.h:24
 msgid "Games and Entertainment"
-msgstr "Jeux et Divertissements"
+msgstr "Jeux et divertissements"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
 #: ../comps-f10.xml.in.h:63
@@ -356,32 +358,32 @@
 msgstr "Prise en charge du mat??riel"
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70
-#: ../comps-f10.xml.in.h:70 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28
+#: ../comps-f10.xml.in.h:71 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28
 msgid "Hebrew Support"
 msgstr "Prise en charge de l'h??breu"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71
-#: ../comps-f10.xml.in.h:71
+#: ../comps-f10.xml.in.h:72
 msgid "Hindi Support"
 msgstr "Prise en charge de l'hindi"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72
-#: ../comps-f10.xml.in.h:72
+#: ../comps-f10.xml.in.h:73
 msgid "Hungarian Support"
 msgstr "Prise en charge du hongrois"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73
-#: ../comps-f10.xml.in.h:73
+#: ../comps-f10.xml.in.h:74
 msgid "Icelandic Support"
 msgstr "Prise en charge de l'islandais"
 
 #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74
-#: ../comps-f10.xml.in.h:74
+#: ../comps-f10.xml.in.h:75
 msgid "Indonesian Support"
 msgstr "Prise en charge de l'indon??sien"
 
 #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75
-#: ../comps-f10.xml.in.h:77 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29
+#: ../comps-f10.xml.in.h:78 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
@@ -390,7 +392,7 @@
 "GNOME."
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
-#: ../comps-f10.xml.in.h:78
+#: ../comps-f10.xml.in.h:79
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
@@ -399,297 +401,302 @@
 "XFCE."
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
-#: ../comps-f10.xml.in.h:79 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
+#: ../comps-f10.xml.in.h:80 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr ""
-"Installer ces paquets pour d??velopper les applications graphiques QT et "
-"KDE."
+"Installer ces paquets pour d??velopper les applications graphiques QT et KDE."
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
-#: ../comps-f10.xml.in.h:80
-msgid "Install these tools to enable the system to print or act as a print server."
+#: ../comps-f10.xml.in.h:81
+msgid ""
+"Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "Installer ces outils pour habiliter le syst??me ?? imprimer ou agir comme un "
 "serveur d'impression."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
-#: ../comps-f10.xml.in.h:81 ../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."
+#: ../comps-f10.xml.in.h:82 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31
+msgid ""
+"Install this group of packages to use the base graphical (X) user interface."
 msgstr ""
 "Installer ce groupe de paquets pour utiliser l'interface utilisateur "
 "graphique de base (X)."
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
-#: ../comps-f10.xml.in.h:83
+#: ../comps-f10.xml.in.h:84
 msgid "Inuktitut Support"
 msgstr "Prise en charge de l'inuktitut "
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
-#: ../comps-f10.xml.in.h:84
+#: ../comps-f10.xml.in.h:85
 msgid "Irish Support"
 msgstr "Prise en charge de l'irlandais"
 
 #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83
-#: ../comps-f10.xml.in.h:85
+#: ../comps-f10.xml.in.h:86
 msgid "Italian Support"
 msgstr "Prise en charge de l'italien"
 
 #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84
-#: ../comps-f10.xml.in.h:86 ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:32
+#: ../comps-f10.xml.in.h:87 ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:32
 msgid "Japanese Support"
 msgstr "Prise en charge du japonais"
 
 #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85
-#: ../comps-f10.xml.in.h:87 ../comps-el4.xml.in.h:31
+#: ../comps-f10.xml.in.h:88 ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "Java"
 
 #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86
-#: ../comps-f10.xml.in.h:88 ../comps-el4.xml.in.h:32
+#: ../comps-f10.xml.in.h:89 ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "D??veloppement Java"
 
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
-#: ../comps-f10.xml.in.h:89 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33
+#: ../comps-f10.xml.in.h:90 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33
 msgid "KDE (K Desktop Environment)"
 msgstr "Environnement de bureau KDE"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88
-#: ../comps-f10.xml.in.h:90 ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:34
+#: ../comps-f10.xml.in.h:91 ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:34
 msgid "KDE Software Development"
 msgstr "D??veloppement de logiciel KDE"
 
 #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89
-#: ../comps-f10.xml.in.h:91
+#: ../comps-f10.xml.in.h:92
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
 msgstr ""
 "KDE est une interface utilisateur graphique puissante comprenant un tableau "
-"de bord, un bureau, des ic??nes de syst??me et un gestionnaire de fichiers "
+"de bord, un bureau, des ic??nes syst??me ?? utiliser avec et un gestionnaire de fichiers "
 "graphique."
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
-#: ../comps-f10.xml.in.h:92
+#: ../comps-f10.xml.in.h:93
 msgid "Kannada Support"
 msgstr "Prise en charge du kannada"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:94
+#: ../comps-f10.xml.in.h:95
 msgid "Khmer Support"
 msgstr "Prise en charge du khmer"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:95
+#: ../comps-f10.xml.in.h:96
 msgid "Korean Support"
 msgstr "Prise en charge du cor??en"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:94
-#: ../comps-f10.xml.in.h:96
+#: ../comps-f10.xml.in.h:97
 msgid "Languages"
 msgstr "Langues"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:97
+#: ../comps-f10.xml.in.h:98
 msgid "Lao Support"
 msgstr "Prise en charge du lao"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:98
+#: ../comps-f10.xml.in.h:99
 msgid "Latvian Support"
 msgstr "Prise en charge du letton"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:98
-#: ../comps-f10.xml.in.h:100
+#: ../comps-f10.xml.in.h:101
 msgid "Legacy Network Server"
 msgstr "Serveur de r??seau h??rit??"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:101
+#: ../comps-f10.xml.in.h:102
 msgid "Legacy Software Development"
-msgstr "D??veloppement du logiciel h??rit??"
+msgstr "D??veloppement de logiciel ancien"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:102
+#: ../comps-f10.xml.in.h:103
 msgid "Legacy Software Support"
-msgstr "Prise en charge du logiciel h??rit??"
+msgstr "Prise en charge du logiciel ancien"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:103
+#: ../comps-f10.xml.in.h:104
 msgid "Lithuanian Support"
 msgstr "Prise en charge du lituanien"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:104
-#: ../comps-f10.xml.in.h:106 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
+#: ../comps-f10.xml.in.h:107 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "Serveur de messagerie"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:107
+#: ../comps-f10.xml.in.h:108
 msgid "Malay Support"
 msgstr "Prise en charge du malais"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:108
+#: ../comps-f10.xml.in.h:109
 msgid "Malayalam Support"
 msgstr "Prise en charge du malay??lam"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:109
+#: ../comps-f10.xml.in.h:110
 msgid "Maori Support"
 msgstr "Prise en charge du m??ori"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:110
+#: ../comps-f10.xml.in.h:111
 msgid "Marathi Support"
 msgstr "Prise en charge du marathi"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:110
-#: ../comps-f10.xml.in.h:112
+#: ../comps-f10.xml.in.h:113
 msgid "MySQL Database"
 msgstr "Base de donn??es MySQL"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:112
-#: ../comps-f10.xml.in.h:114 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
+#: ../comps-f10.xml.in.h:115 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "Serveurs de r??seau"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:115 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
+#: ../comps-f10.xml.in.h:116 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "Serveur de news"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:115
-#: ../comps-f10.xml.in.h:117
+#: ../comps-f10.xml.in.h:118
 msgid "Northern Sotho Support"
-msgstr "Prise en charge du sotho du Nord"
+msgstr "Prise en charge du sotho du nord"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:118
+#: ../comps-f10.xml.in.h:119
 msgid "Norwegian Support"
 msgstr "Prise en charge du norv??gien"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:119 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
+#: ../comps-f10.xml.in.h:120 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
-msgstr "Bureau/Productivit??"
+msgstr "Bureautique/Productivit??"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:119
-#: ../comps-f10.xml.in.h:121
+#: ../comps-f10.xml.in.h:122
 msgid "Oriya Support"
 msgstr "Prise en charge de l'oriya"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:122 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
+#: ../comps-f10.xml.in.h:123 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
-msgstr "Paquets qui offrent des fonctions de d??veloppement et de cr??ation d'applications."
+msgstr ""
+"Paquets qui offrent des fonctions de d??veloppement et de cr??ation "
+"d'applications."
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:123
+#: ../comps-f10.xml.in.h:124
 msgid "Persian Support"
 msgstr "Prise en charge du perse"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:124
+#: ../comps-f10.xml.in.h:125
 msgid "Polish Support"
 msgstr "Prise en charge du polonais"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:125
+#: ../comps-f10.xml.in.h:126
 msgid "Portuguese Support"
 msgstr "Prise en charge du portugais"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:126
+#: ../comps-f10.xml.in.h:127
 msgid "PostgreSQL Database"
 msgstr "Base de donn??es PostgreSQL"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:127
+#: ../comps-f10.xml.in.h:128
 msgid "Printing Support"
 msgstr "Prise en charge de l'impression"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:128
+#: ../comps-f10.xml.in.h:129
 msgid "Punjabi Support"
 msgstr "Prise en charge du panj??b??"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:129
+#: ../comps-f10.xml.in.h:130
 msgid "Romanian Support"
 msgstr "Prise en charge du roumain"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:130
+#: ../comps-f10.xml.in.h:131
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:131
+#: ../comps-f10.xml.in.h:132
 msgid "Russian Support"
 msgstr "Prise en charge du russe"
 
-#: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:130
-#: ../comps-f10.xml.in.h:132
+#: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:132
+#: ../comps-f10.xml.in.h:135
 msgid "Samoan Support"
 msgstr "Prise en charge du samoan"
 
-#: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:131
-#: ../comps-f10.xml.in.h:133
+#: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:133
+#: ../comps-f10.xml.in.h:136
 msgid "Serbian Support"
 msgstr "Prise en charge du serbe"
 
-#: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:132
-#: ../comps-f10.xml.in.h:134
+#: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:134
+#: ../comps-f10.xml.in.h:137
 msgid "Server Configuration Tools"
-msgstr "Outils de configuration de serveur"
+msgstr "Outils de configuration de serveurs"
 
-#: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:135 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
+#: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:135
+#: ../comps-f10.xml.in.h:138 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "Serveurs"
 
-#: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:136 ../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."
+#: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
+#: ../comps-f10.xml.in.h:139 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
+msgid ""
+"Simple window managers that aren't part of a larger desktop environment."
 msgstr ""
 "Simples gestionnaires de fen??tres n'appartenant ?? aucun environnement de "
 "bureau."
 
-#: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:137
+#: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:137
+#: ../comps-f10.xml.in.h:140
 msgid "Sinhala Support"
 msgstr "Prise en charge du sinhala"
 
-#: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:138
+#: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:138
+#: ../comps-f10.xml.in.h:141
 msgid "Slovak Support"
 msgstr "Prise en charge du slovaque"
 
-#: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:139
+#: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:139
+#: ../comps-f10.xml.in.h:142
 msgid "Slovenian Support"
 msgstr "Prise en charge du slov??ne"
 
-#: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:140
+#: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:140
+#: ../comps-f10.xml.in.h:143
 msgid "Smallest possible installation"
 msgstr "Plus petite installation possible"
 
-#: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:141 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
+# running = verbe ici
+#: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:141
+#: ../comps-f10.xml.in.h:144 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
-msgstr "Logiciels utilis??s pour serveurs de r??seau actifs"
+msgstr "Logiciels utilis??s pour ex??cuter des serveurs r??seau"
 
-#: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:142
+#: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:142
+#: ../comps-f10.xml.in.h:145
 msgid "Somali Support"
 msgstr "Prise en charge du somalien"
 
-#: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:143
+#: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:143
+#: ../comps-f10.xml.in.h:146
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -697,75 +704,75 @@
 "Parfois appel??s ??diteurs de texte, ces programmes vous permettent de cr??er "
 "et d'??diter des fichiers texte. Ils comprennent Emacs et Vi."
 
-#: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:144 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
+#: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:144
+#: ../comps-f10.xml.in.h:147 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "Son et vid??o"
 
-#: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:145
+#: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:145
+#: ../comps-f10.xml.in.h:148
 msgid "Southern Ndebele Support"
 msgstr "Prise en charge du nd??b??l?? du sud"
 
-#: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:146
+#: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:146
+#: ../comps-f10.xml.in.h:149
 msgid "Southern Sotho Support"
-msgstr "Prise en charge du sotho du Sud"
+msgstr "Prise en charge du sotho du sud"
 
-#: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:147
+#: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:147
+#: ../comps-f10.xml.in.h:150
 msgid "Spanish Support"
 msgstr "Prise en charge de l'espagnol"
 
-#: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:148 ../comps-el4.xml.in.h:46
+#: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:148
+#: ../comps-f10.xml.in.h:151 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr ""
 "Prise en charge du d??veloppement d'applications en langage de programmation "
 "Java"
 
-#: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:149 ../comps-el4.xml.in.h:47
+#: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:149
+#: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "Prise en charge de l'ex??cution d'applications ??crites en langage Java"
 
-#: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:150
+#: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:150
+#: ../comps-f10.xml.in.h:153
 msgid "Swati Support"
 msgstr "Prise en charge du swati"
 
-#: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:151
+#: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:151
+#: ../comps-f10.xml.in.h:154
 msgid "Swedish Support"
 msgstr "Prise en charge du su??dois"
 
-#: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
+#: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:152
+#: ../comps-f10.xml.in.h:155 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "Outils syst??me"
 
-#: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:153
+#: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:153
+#: ../comps-f10.xml.in.h:156
 msgid "Tagalog Support"
 msgstr "Prise en charge du tagalog"
 
-#: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:154
+#: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:154
+#: ../comps-f10.xml.in.h:158
 msgid "Tamil Support"
-msgstr "Prise en charge du tamil"
+msgstr "Prise en charge du tamoul"
 
-#: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:155
+#: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:155
+#: ../comps-f10.xml.in.h:159
 msgid "Telugu Support"
 msgstr "Prise en charge du t??lougou"
 
-#: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:156 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
+#: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:156
+#: ../comps-f10.xml.in.h:160 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "Internet bas?? sur du texte"
 
-#: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:157
+#: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:157
+#: ../comps-f10.xml.in.h:161
 msgid "Thai Support"
 msgstr "Prise en charge du tha??"
 
@@ -773,75 +780,85 @@
 msgid "The Eclipse Integrated Development Environment."
 msgstr "L'environnement de d??veloppement int??gr?? Eclipse."
 
-#: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:158 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
+#: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:158
+#: ../comps-f10.xml.in.h:162 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr ""
-"Les applications comprennent des suites bureautiques, des afficheurs PDF et "
+"Les applications comprennent des suites bureautiques, des visionneurs PDF et "
 "bien plus encore."
 
-#: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:159
-msgid "The packages in this group are core libraries needed to develop applications."
-msgstr "Les paquets de ce groupe sont des biblioth??ques centrales n??cessaires au d??veloppement d'applications."
+#: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
+#: ../comps-f10.xml.in.h:163
+msgid ""
+"The packages in this group are core libraries needed to develop applications."
+msgstr ""
+"Les paquets de ce groupe sont des biblioth??ques centrales n??cessaires au "
+"d??veloppement d'applications."
 
-#: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:160 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
+#: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:160
+#: ../comps-f10.xml.in.h:164 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr ""
-"Ces paquets vous permettent de configurer un serveur de messagerie IMAP "
-"ou SMTP."
+"Ces paquets vous permettent de configurer un serveur de messagerie IMAP ou "
+"SMTP."
 
-#: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:161
-msgid "These packages allow you to develop applications for the X Window System."
+#: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
+#: ../comps-f10.xml.in.h:165
+msgid ""
+"These packages allow you to develop applications for the X Window System."
 msgstr ""
-"Ces paquets vous permettent de d??velopper des applications pour le "
-"syst??me X Window."
+"Ces paquets vous permettent de d??velopper des applications pour le syst??me X "
+"Window."
 
-#: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:162 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid "These packages are helpful when developing web applications or web pages."
+#: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:162
+#: ../comps-f10.xml.in.h:166 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
+msgid ""
+"These packages are helpful when developing web applications or web pages."
 msgstr ""
 "Ces paquets sont utiles pour d??velopper des applications web ou des pages "
 "web."
 
-#: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:163
-msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
+#: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:163
+#: ../comps-f10.xml.in.h:167
+msgid ""
+"These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
-"Ces paquets comprennent des serveurs bas??s sur le r??seau comme DHCP, "
+"Ces paquets comprennent des serveurs concernant le r??seau comme DHCP, "
 "Kerberos et NIS."
 
-#: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:164
+#: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:164
+#: ../comps-f10.xml.in.h:168
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
 msgstr ""
-"Ces paquets comprennent des serveurs pour d'anciens protocoles r??seau "
-"comme rsh et telnet."
+"Ces paquets comprennent des serveurs pour d'anciens protocoles r??seau comme "
+"rsh et telnet."
 
-#: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:165
+#: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165
+#: ../comps-f10.xml.in.h:169
 msgid "These packages provide a virtualization environment."
 msgstr "Ces paquets offrent un environnement de virtualisation."
 
-#: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:166
+#: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:166
+#: ../comps-f10.xml.in.h:170
 msgid "These packages provide compatibility with previous releases."
-msgstr "Ces paquets offrent une prise en charge de la compatibilit?? avec les versions pr??c??dentes."
+msgstr ""
+"Ces paquets offrent une prise en charge de la compatibilit?? avec les "
+"versions pr??c??dentes."
 
-#: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:167
-#, fuzzy
+#: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:167
+#: ../comps-f10.xml.in.h:171
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
-msgstr "Ces paquets fournissent la prise en charge de la compatibilit?? pour diff??rentes localisations y compris des polices de caract??res et des m??thodes de saisie."
+msgstr ""
+"Ces paquets fournissent la prise en charge de la compatibilit?? pour "
+"diff??rentes localisations y compris des polices de caract??res et des "
+"m??thodes de saisie."
 
-#: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:168
+#: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:168
+#: ../comps-f10.xml.in.h:172
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -849,18 +866,18 @@
 "Ces outils vous permettent de cr??er de la documentation au format DocBook et "
 "de la convertir en format HTML, PDF, Postscript et texte."
 
-#: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:169 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
+#: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:169
+#: ../comps-f10.xml.in.h:173 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "Ces outils vous permettent d'ex??cuter un serveur Web sur le syst??me."
 
-#: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:170 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
+#: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:170
+#: ../comps-f10.xml.in.h:174 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "Ces outils vous permettent d'ex??cuter un serveur FTP sur le syst??me. "
 
-#: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:171 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
+#: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:171
+#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -868,235 +885,239 @@
 "Ces outils comprennent des outils de d??veloppement m??moire comme automake, "
 "gcc, perl, python, ainsi que des d??bogueurs."
 
-#: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:172 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
+#: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:172
+#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr ""
-"Ce groupe vous permet de configurer le syst??me comme un serveur de groupes "
-"de nouvelles."
+"Ce groupe vous permet de configurer le syst??me comme un serveur de news."
 
-#: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:173
+#: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:173
+#: ../comps-f10.xml.in.h:177
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr ""
 "Ce groupe contient tous les outils de configuration du serveur personnalis?? "
 "de Red Hat."
 
-#: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:174
+#: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:174
+#: ../comps-f10.xml.in.h:178
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
-msgstr "Ce groupe inclut un ensemble minimum de paquets. Utile pour cr??er une machine d??di??e au routage et/ou pare-feu, par exemple."
+msgstr ""
+"Ce groupe inclut un ensemble minimum de paquets. Utile pour cr??er de petites "
+"machines d??di??es au routage et/ou pare-feu, par exemple."
 
-#: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
+#: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:175
+#: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr ""
-"Ce groupe comprend le courrier ??lectronique graphique, Web et les clients de "
+"Ce groupe comprend des clients graphiques de messagerie, de Web et de "
 "conversation."
 
-#: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
+#: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:176
+#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
 msgstr ""
-"Ce groupe comprend les paquets pour ex??cuter des calculs math??matiques et "
-"scientifiques, le tra??age et la conversion des unit??s."
+"Ce groupe comprend les paquets pour effectuer des calculs math??matiques et "
+"scientifiques, des cr??ations de diagrammes et des conversions d'unit??s."
 
-#: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:177 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
+#: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:177
+#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr ""
-"Ce groupe comprend des paquets qui vous aident ?? manipuler et scanner des "
+"Ce groupe comprend des paquets qui vous aident ?? manipuler et num??riser des "
 "images."
 
-#: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:178 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
+#: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:178
+#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
 msgstr ""
-"Ce groupe contient une messagerie ??lectronique en modalit?? texte et des "
-"clients de conversation. Ces applications ne n??cessitent pas le syst??me X "
-"Window."
+"Ce groupe contient des clients de messagerie, de Web et de discussion en mode "
+"texte. Ces applications ne n??cessitent pas le syst??me X Window."
 
-#: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
+#: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:179
+#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
 msgstr ""
-"Ce groupe est un ensemble d'outils d'administration graphique pour le "
-"syst??me, ainsi que pour la gestion des comptes utilisateurs et la "
+"Ce groupe est un ensemble d'outils graphiques d'administration pour le "
+"syst??me, comme pour la gestion des comptes utilisateurs et la "
 "configuration du mat??riel syst??me."
 
-#: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:180 ../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."
+#: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
+#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
+msgid ""
+"This group is a collection of tools and resources of Armenian environments."
 msgstr ""
 "Ce groupe comprend un ensemble d'outils et de ressources pour les "
 "environnements en arm??nien."
 
-#: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:181 ../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."
+#: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:181
+#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
+msgid ""
+"This group is a collection of tools for various hardware specific utilities."
 msgstr "Ce groupe comprend un ensemble d'outils pour du mat??riel sp??cifique."
 
-#: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
+#: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:182
+#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
 "client for connecting to SMB shares and tools to monitor network traffic."
 msgstr ""
-"Ce groupe est un ensemble de diff??rents outils pour le syst??me, ainsi qu'un "
-"client pour la connexion aux parts SMB et d'outils permettant de g??rer le "
-"trafic dans le r??seau."
-
-#: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:183
-msgid "This package group allows you to run a DNS name server (BIND) on the system."
+"Ce groupe est un ensemble de diff??rents outils pour le syst??me, tels un "
+"client pour la connexion aux partages SMB et des outils permettant de surveiller le "
+"trafic du r??seau."
+
+#: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
+#: ../comps-f10.xml.in.h:187
+msgid ""
+"This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
 "Ce groupe de paquets vous permet d'ex??cuter un serveur de noms DNS (BIND) "
 "sur le syst??me."
 
-#: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:184
+#: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:184
+#: ../comps-f10.xml.in.h:188
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
 msgstr ""
-"Ce groupe de paquets vous permet de partager des fichiers entre les "
-"syst??mes Linux et Windows (tm)."
+"Ce groupe de paquets vous permet de partager des fichiers entre les syst??mes "
+"Linux et Microsoft Windows (tm)."
 
-#: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:185
+#: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:185
+#: ../comps-f10.xml.in.h:189
 msgid "This package group contains packages useful for use with MySQL."
-msgstr "Ce groupe contient des paquets utiles lors de l'utilisation de MySQL."
+msgstr "Ce groupe contient des paquets utiles ?? utiliser avec MySQL."
 
-#: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:186
+#: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:186
+#: ../comps-f10.xml.in.h:190
 msgid "This package group includes packages useful for use with Postgresql."
-msgstr "Ce groupe comprend des paquets utiles lors de l'utilisation de Postgresql."
+msgstr ""
+"Ce groupe comprend des paquets utiles ?? utiliser avec Postgresql."
 
-#: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:187
+#: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:187
+#: ../comps-f10.xml.in.h:191
 msgid "Tibetan Support"
-msgstr "Prise en charge du tib??tin"
+msgstr "Prise en charge du tib??tain"
 
-#: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:188
+#: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:188
+#: ../comps-f10.xml.in.h:192
 msgid "Tonga Support"
 msgstr "Prise en charge du tongien"
 
-#: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:189 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
+#: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:189
+#: ../comps-f10.xml.in.h:193 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Outils et utilitaires n??cessaires ?? un empaqueteur Fedora"
 
-#: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:190
+#: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:190
+#: ../comps-f10.xml.in.h:194
 msgid "Tsonga Support"
 msgstr "Prise en charge du tsonga"
 
-#: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:191
+#: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:191
+#: ../comps-f10.xml.in.h:195
 msgid "Tswana Support"
 msgstr "Prise en charge du tswana"
 
-#: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:192
+#: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:192
+#: ../comps-f10.xml.in.h:196
 msgid "Turkish Support"
 msgstr "Prise en charge du turc"
 
-#: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:193
+#: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:193
+#: ../comps-f10.xml.in.h:197
 msgid "Ukrainian Support"
 msgstr "Prise en charge de l'ukrainien"
 
-#: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:194
+#: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:194
+#: ../comps-f10.xml.in.h:198
 msgid "Urdu Support"
 msgstr "Prise en charge de l'ourdou"
 
-#: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:195 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
+#: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:195
+#: ../comps-f10.xml.in.h:199 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "Divers composants du syst??me de base."
 
-#: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:196 ../comps-el5.xml.in.h:72
+#: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:196
+#: ../comps-f10.xml.in.h:200 ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "Diff??rentes mani??res de vous relaxer et de passer le temps."
 
-#: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:197
+#: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:197
+#: ../comps-f10.xml.in.h:201
 msgid "Venda Support"
 msgstr "Prise en charge du venda"
 
-#: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:198
+#: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:198
+#: ../comps-f10.xml.in.h:202
 msgid "Vietnamese Support"
 msgstr "Prise en charge du vietnamien"
 
-#: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:199
+#: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:199
+#: ../comps-f10.xml.in.h:203
 msgid "Virtualization"
 msgstr "Virtualisation"
 
-#: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:201 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
+#: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:201
+#: ../comps-f10.xml.in.h:205 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "D??veloppement web"
 
-#: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:200
-#: ../comps-f10.xml.in.h:202 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
+#: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:202
+#: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "Serveur Web"
 
-#: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:201
-#: ../comps-f10.xml.in.h:203
+#: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:203
+#: ../comps-f10.xml.in.h:207
 msgid "Welsh Support"
 msgstr "Prise en charge du gallois"
 
-#: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:204 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
+#: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:204
+#: ../comps-f10.xml.in.h:208 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "Gestionnaire de fen??tres"
 
-#: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:205
+#: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:205
+#: ../comps-f10.xml.in.h:209
 msgid "Windows File Server"
 msgstr "Serveur de fichiers Windows"
 
-#: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:206
+#: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:206
+#: ../comps-f10.xml.in.h:210
 msgid "X Software Development"
 msgstr "D??veloppement du logiciel X"
 
-#: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:207 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
+#: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:207
+#: ../comps-f10.xml.in.h:211 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "Syst??me X Window"
 
-#: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:208
+#: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:208
+#: ../comps-f10.xml.in.h:212
 msgid "XFCE"
 msgstr "XFCE"
 
-#: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:209
+#: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:209
+#: ../comps-f10.xml.in.h:213
 msgid "XFCE Software Development"
 msgstr "D??veloppement du logiciel XFCE"
 
-#: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:210
+#: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:210
+#: ../comps-f10.xml.in.h:214
 msgid "Xhosa Support"
 msgstr "Prise en charge du xhosa"
 
-#: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:211
+#: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:211
+#: ../comps-f10.xml.in.h:215
 msgid "Zulu Support"
 msgstr "Prise en charge du zoulou"
 
@@ -1116,27 +1137,27 @@
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "Paquets de polices de caract??res pour afficher du texte sur le bureau."
 
-#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:82
+#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "Les environnements de d??veloppement int??gr??s bas??s sur Eclipse."
 
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:99
+#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:100
 msgid "Legacy Fonts"
 msgstr "Anciennes polices de caract??res"
 
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:104
+#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:105
 msgid "Low Saxon Support"
 msgstr "Prise en charge du bas-allemand"
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:111
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:112
 msgid "Mongolian Support"
 msgstr "Prise en charge du mongol"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:113
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:114
 msgid "Nepali Support"
 msgstr "Prise en charge du n??palais"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:120
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:121
 msgid "Older bitmap and vector fonts packages"
 msgstr "Anciens paquets de polices de caract??res vectorielles et matricielles"
 
@@ -1144,30 +1165,46 @@
 msgid "Esperanto Support"
 msgstr "Prise en charge de l'esp??ranto"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:93
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:94
 msgid "Kashubian Support"
 msgstr "Prise en charge du kachoube"
 
-#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:105
+#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:106
 msgid "Macedonian Support"
 msgstr "Prise en charge du mac??donien"
 
-#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:116
+#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:117
 msgid "Northern Sami Support"
-msgstr "Prise en charge du same du Nord"
+msgstr "Prise en charge du same du nord"
 
-#: ../comps-f9.xml.in.h:198 ../comps-f10.xml.in.h:200
+#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:133
+msgid "SUGAR Desktop Environment"
+msgstr "Environnement de bureau SUGAR"
+
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:134
+msgid "SUGAR is the desktop environment developed for the OLPC XO."
+msgstr "SUGAR est l'environnement de bureau d??velopp?? pour l'OLPC XO."
+
+#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:204
 msgid "Walloon Support"
 msgstr "Prise en charge du wallon"
 
-#: ../comps-f10.xml.in.h:75
+#: ../comps-f10.xml.in.h:70
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
 msgstr "M??thodes de saisie"
 
-#: ../comps-f10.xml.in.h:76
+#: ../comps-f10.xml.in.h:77
 msgid "Input method packages for the input of international text."
 msgstr "Paquets de m??thodes de saisie de textes internationaux."
 
+#: ../comps-f10.xml.in.h:157
+msgid "Tajik Support"
+msgstr "Prise en charge du tadjik"
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Applications pour t??ches diverses"
@@ -1182,7 +1219,7 @@
 "desktop, system icons, and a graphical file manager."
 msgstr ""
 "GNOME est une interface utilisateur graphique puissante qui comprend un "
-"tableau de bord, un bureau, des ic??nes de syst??me et un gestionnaire de "
+"tableau de bord, un bureau, des ic??nes syst??me et un gestionnaire de "
 "fichiers graphique."
 
 #: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
@@ -1191,7 +1228,7 @@
 "system icons, and a graphical file manager."
 msgstr ""
 "KDE est une interface utilisateur graphique puissante comprenant un tableau "
-"de bord, un bureau, des ic??nes de syst??me et un gestionnaire de fichiers "
+"de bord, un bureau, des ic??nes syst??me et un gestionnaire de fichiers "
 "graphique."
 
 #: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
@@ -1221,19 +1258,22 @@
 "sp??cifiques"
 
 #: ../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 ""
 "Ce groupe comprend un ensemble d'outils et de ressources pour les "
 "environnements en arabe."
 
 #: ../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 ""
 "Ce groupe comprend un ensemble d'outils et de ressources pour les "
-"environnements en h??bra??que."
+"environnements en h??breu."
 
 #: ../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 ""
 "Ce groupe comprend un ensemble d'outils et de ressources pour les "
 "environnements en japonais."
@@ -1243,7 +1283,8 @@
 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 ""
 "Ce groupe comprend un ensemble d'outils et de ressources pour les "
 "environnements en tch??que."



From pnemade at fedoraproject.org  Mon Sep  8 09:55:10 2008
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Mon,  8 Sep 2008 09:55:10 +0000 (UTC)
Subject: rpms/hunspell-bn/devel .cvsignore, 1.2, 1.3 hunspell-bn.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <20080908095510.646B570128@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hunspell-bn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23109

Modified Files:
	.cvsignore hunspell-bn.spec sources 
Log Message:

* Mon Sep 08 2008 Parag <pnemade at redhat.com> - 20080201-1
- update to latest release.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-bn/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jan 2008 06:32:06 -0000	1.2
+++ .cvsignore	8 Sep 2008 09:54:40 -0000	1.3
@@ -1 +1,2 @@
 bn-demo.tar.gz
+hunspell-bn-BD-0.02.tar.bz2


Index: hunspell-bn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-bn/devel/hunspell-bn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hunspell-bn.spec	4 Sep 2008 05:35:10 -0000	1.2
+++ hunspell-bn.spec	8 Sep 2008 09:54:40 -0000	1.3
@@ -1,10 +1,13 @@
+%define upstreamid 20080201
+%define upstreamver 0.02
+
 Name: hunspell-bn
 Summary: Bengali hunspell dictionaries
-Version: 20050726
-Release: 3%{?dist}
-Source: http://hunspell.sourceforge.net/bn-demo.tar.gz
+Version: %{upstreamid}
+Release: 1%{?dist}
+Source: http://www.ankur.org.bd/downloads/spell_check/hunspell/%{name}-BD-%{upstreamver}.tar.bz2
 Group: Applications/Text
-URL: http://hunspell.sourceforge.net
+URL: http://ankur.org.bd/wiki/Documentation#OpenOffice.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPLv2+
 BuildArch: noarch
@@ -15,24 +18,23 @@
 Bengali hunspell dictionaries.
 
 %prep
-%setup -q -c -n bn-demo
-iconv -f ISO-8859-1 -t UTF-8 bn/Copyright > bn/Copyright.utf8
-mv bn/Copyright.utf8 bn/Copyright
+%setup -q -n %{name}-BD-%{upstreamver}
+chmod -x *
+iconv -f ISO-8859-1 -t UTF-8 Copyright > Copyright.utf8
+mv Copyright.utf8 Copyright
 
 %build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-mv bn/bn.dic bn/bn_IN.dic
-mv bn/bn.aff bn/bn_IN.aff
-cp -p bn/*.dic bn/*.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
+cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
 
 pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/
-bn_IN_aliases="bn_BD"
-for lang in $bn_IN_aliases; do
-        ln -s bn_IN.aff $lang.aff
-        ln -s bn_IN.dic $lang.dic
+bn_BD_aliases="bn_IN"
+for lang in $bn_BD_aliases; do
+        ln -s bn_BD.aff $lang.aff
+        ln -s bn_BD.dic $lang.dic
 done
 popd
 
@@ -41,10 +43,13 @@
 
 %files
 %defattr(-,root,root,-)
-%doc bn/README bn/COPYING bn/Copyright
+%doc README COPYING Copyright
 %{_datadir}/myspell/*
 
 %changelog
+* Mon Sep 08 2008 Parag <pnemade at redhat.com> - 20080201-1
+- update to latest release.
+
 * Tue Sep 02 2008 Caol??n McNamara <caolanm at redhat.com> - 20050726-3
 - add bn_BD alias
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-bn/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jan 2008 06:32:06 -0000	1.2
+++ sources	8 Sep 2008 09:54:40 -0000	1.3
@@ -1 +1 @@
-1b0780225cae4128843cf8bb48ae78c8  bn-demo.tar.gz
+87e98f516e85501245b8cf2efc6dee24  hunspell-bn-BD-0.02.tar.bz2



From jwrdegoede at fedoraproject.org  Mon Sep  8 10:17:33 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon,  8 Sep 2008 10:17:33 +0000 (UTC)
Subject: rpms/xgalaxy/devel xgalaxy-2.0.34-xgalaxy.patch, 1.3,
	1.4 xgalaxy.spec, 1.8, 1.9
Message-ID: <20080908101733.A9B0170128@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/xgalaxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31638

Modified Files:
	xgalaxy-2.0.34-xgalaxy.patch xgalaxy.spec 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 2.0.34-9
- Fix patch fuzz build failure


xgalaxy-2.0.34-xgalaxy.patch:

Index: xgalaxy-2.0.34-xgalaxy.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xgalaxy/devel/xgalaxy-2.0.34-xgalaxy.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xgalaxy-2.0.34-xgalaxy.patch	31 May 2006 20:42:33 -0000	1.3
+++ xgalaxy-2.0.34-xgalaxy.patch	8 Sep 2008 10:17:02 -0000	1.4
@@ -1,6 +1,32 @@
---- xgalaga-2.0.34/images.c.xgalaxy	2006-05-31 22:24:50.000000000 +0200
-+++ xgalaga-2.0.34/images.c	2006-05-31 22:24:50.000000000 +0200
-@@ -6786,54 +6786,108 @@
+diff -up xgalaga-2.0.34/README.foo xgalaga-2.0.34/README
+--- xgalaga-2.0.34/README.foo	2008-09-08 08:50:19.000000000 +0200
++++ xgalaga-2.0.34/README	2008-09-08 08:50:32.000000000 +0200
+@@ -44,9 +44,9 @@ Command line options:
+   <anything else>      print usage and version.
+ 
+ Basic instructions:
+-  It's Galaga, you know how to play Galaga, stop bothering me.
+-  (Ship follows the mouse, button fires.  Auto-fire by holding it
+-   down, so no-one accuses me of breaking their mouse!)
++  It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga,
++  stop bothering me. (Ship follows the mouse, button fires.  Auto-fire by
++  holding it down, so no-one accuses me of breaking their mouse!)
+ 
+ Keyboard commands:
+ 
+@@ -73,7 +73,7 @@ it takes care of every aspect of the X i
+ games written quickly and painlessly.
+ 
+ Credits:
+-   Galaga code: 
++   XGalaxy code: 
+             Joe Rumsey (mrogre at mediaone.net)
+    X interface:
+             Bill Dyess(dyessww at eng.auburn.edu), 
+diff -up xgalaga-2.0.34/images.c.foo xgalaga-2.0.34/images.c
+--- xgalaga-2.0.34/images.c.foo	2008-09-08 08:50:19.000000000 +0200
++++ xgalaga-2.0.34/images.c	2008-09-08 08:50:32.000000000 +0200
+@@ -6786,54 +6786,108 @@ static char * shield_xpm[] = {
  /* XPM */
  static char * title_xpm[] = {
  /* width height ncolors chars_per_pixel */
@@ -155,33 +181,10 @@
  
  /* keep sorted (for bsearch) [BDyess] */
  static W_Image imagearray[] = {
---- xgalaga-2.0.34/README.xgalaxy	2006-05-31 22:24:51.000000000 +0200
-+++ xgalaga-2.0.34/README	2006-05-31 22:24:51.000000000 +0200
-@@ -44,9 +44,9 @@
-   <anything else>      print usage and version.
- 
- Basic instructions:
--  It's Galaga, you know how to play Galaga, stop bothering me.
--  (Ship follows the mouse, button fires.  Auto-fire by holding it
--   down, so no-one accuses me of breaking their mouse!)
-+  It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga,
-+  stop bothering me. (Ship follows the mouse, button fires.  Auto-fire by
-+  holding it down, so no-one accuses me of breaking their mouse!)
- 
- Keyboard commands:
- 
-@@ -73,7 +73,7 @@
- games written quickly and painlessly.
- 
- Credits:
--   Galaga code: 
-+   XGalaxy code: 
-             Joe Rumsey (mrogre at mediaone.net)
-    X interface:
-             Bill Dyess(dyessww at eng.auburn.edu), 
---- xgalaga-2.0.34/main.c.xgalaxy	2006-05-31 22:25:01.000000000 +0200
-+++ xgalaga-2.0.34/main.c	2006-05-31 22:26:42.000000000 +0200
-@@ -97,15 +97,15 @@
+diff -up xgalaga-2.0.34/main.c.foo xgalaga-2.0.34/main.c
+--- xgalaga-2.0.34/main.c.foo	2008-09-08 08:50:19.000000000 +0200
++++ xgalaga-2.0.34/main.c	2008-09-08 08:50:32.000000000 +0200
+@@ -97,15 +97,15 @@ Command line options:\n\
  -window              Start in windowed mode instead of fullscreen\n\
  -winsize <WxH>       Window size (default 468 x 596)\n\
  -b                   turn buffered mode off, use this if it runs\n\
@@ -202,8 +205,9 @@
  \n\
  Keyboard commands:\n\
  \n\
---- xgalaga-2.0.34/xgal.6x.xgalaxy	2006-05-31 22:24:51.000000000 +0200
-+++ xgalaga-2.0.34/xgal.6x	2006-05-31 22:24:51.000000000 +0200
+diff -up xgalaga-2.0.34/xgal.6x.foo xgalaga-2.0.34/xgal.6x
+--- xgalaga-2.0.34/xgal.6x.foo	2008-09-08 08:50:19.000000000 +0200
++++ xgalaga-2.0.34/xgal.6x	2008-09-08 08:50:32.000000000 +0200
 @@ -1,6 +1,6 @@
 -.TH XGALAGA 6x "23 April 2003" "2.0.34"
 +.TH XGALAXY 6 "23 April 2003" "2.0.34"
@@ -212,8 +216,8 @@
 +xgalaga \- X11 Galaga like game
  .SH SYNOPSIS
  .B xgalaga
- [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-level lvl]
-@@ -11,9 +11,9 @@
+ [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b]
+@@ -11,9 +11,9 @@ xgalaga \- X11 version of the famous Gal
  [-window] [-winsize widthxheight] [-b] [-noclipmask] [-nouseor] [-nostars]
  .SH INSTRUCTIONS
  .LP
@@ -226,7 +230,7 @@
  .P
  The xgalaga-hyperspace version features some new weapons and different
  gameplay.
-@@ -80,7 +80,7 @@
+@@ -80,7 +80,7 @@ x - use your shields (xgalaga-hyperspace
  .TP 8
  alt-enter - Toggle full screen node.
  .SH "SEE ALSO"


Index: xgalaxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xgalaxy/devel/xgalaxy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xgalaxy.spec	19 Feb 2008 09:53:03 -0000	1.8
+++ xgalaxy.spec	8 Sep 2008 10:17:02 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           xgalaxy
 Version:        2.0.34
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Galaxian / Galaga like game with powerups
 Group:          Amusements/Games
 License:        GPL+
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 2.0.34-9
+- Fix patch fuzz build failure
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0.34-8
 - Autorebuild for GCC 4.3
 



From pkgdb at fedoraproject.org  Mon Sep  8 10:33:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 10:33:10 +0000
Subject: [pkgdb] subversion had acl change status
Message-ID: <20080908103310.41D0D20876F@bastion.fedora.phx.redhat.com>

jorton has set the watchbugzilla acl on subversion (Fedora devel) to Approved for endo69

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From pkgdb at fedoraproject.org  Mon Sep  8 10:33:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 10:33:13 +0000
Subject: [pkgdb] subversion had acl change status
Message-ID: <20080908103313.E51D0208D1E@bastion.fedora.phx.redhat.com>

jorton has set the watchcommits acl on subversion (Fedora devel) to Approved for endo69

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From pkgdb at fedoraproject.org  Mon Sep  8 10:33:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 10:33:23 +0000
Subject: [pkgdb] subversion had acl change status
Message-ID: <20080908103323.3264C208D7C@bastion.fedora.phx.redhat.com>

jorton has set the watchcommits acl on subversion (Fedora 9) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From pkgdb at fedoraproject.org  Mon Sep  8 10:33:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 10:33:23 +0000
Subject: [pkgdb] subversion had acl change status
Message-ID: <20080908103323.9A1C7208D99@bastion.fedora.phx.redhat.com>

jorton has set the watchbugzilla acl on subversion (Fedora 9) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From pkgdb at fedoraproject.org  Mon Sep  8 10:33:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 10:33:29 +0000
Subject: [pkgdb] subversion had acl change status
Message-ID: <20080908103329.B40D3208D9C@bastion.fedora.phx.redhat.com>

jorton has set the watchcommits acl on subversion (Fedora 9) to Obsolete for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From pkgdb at fedoraproject.org  Mon Sep  8 10:33:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 10:33:31 +0000
Subject: [pkgdb] subversion had acl change status
Message-ID: <20080908103331.75A18208DA1@bastion.fedora.phx.redhat.com>

jorton has set the watchcommits acl on subversion (Fedora 9) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From pkgdb at fedoraproject.org  Mon Sep  8 10:33:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 10:33:50 +0000
Subject: [pkgdb] subversion had acl change status
Message-ID: <20080908103351.2A3A220876F@bastion.fedora.phx.redhat.com>

jorton has set the commit acl on subversion (Fedora devel) to Denied for lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From pkgdb at fedoraproject.org  Mon Sep  8 10:34:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 10:34:02 +0000
Subject: [pkgdb] subversion had acl change status
Message-ID: <20080908103402.24CFF208D7C@bastion.fedora.phx.redhat.com>

jorton has set the commit acl on subversion (Fedora 9) to Denied for lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From caolanm at fedoraproject.org  Mon Sep  8 11:00:03 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  8 Sep 2008 11:00:03 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1642,1.1643
Message-ID: <20080908110003.6785170128@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15335

Modified Files:
	openoffice.org.spec 
Log Message:
sigh


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1642
retrieving revision 1.1643
diff -u -r1.1642 -r1.1643
--- openoffice.org.spec	8 Sep 2008 07:53:27 -0000	1.1642
+++ openoffice.org.spec	8 Sep 2008 10:59:31 -0000	1.1643
@@ -1912,11 +1912,11 @@
  }'
 sed -i -e s/openofficeorg$PRODUCTVERSIONSHORT/openofficeorg/g \
   ./mime-info/openoffice.org.keys
-sed -i -e s/openoffice.org$PRODUCTVERSIONSHORT/openofficeorg/g/openoffice.org/g \
+sed -i -e s/openoffice.org$PRODUCTVERSIONSHORT/openoffice.org/g \
   ./mime-info/openoffice.org.keys
 sed -i -e s/brofficeorg$PRODUCTVERSIONSHORT/brofficeorg/g \
   ./mime-info/broffice.org.keys
-sed -i -e s/broffice.org$PRODUCTVERSIONSHORT/openofficeorg/g/broffice.org/g \
+sed -i -e s/broffice.org$PRODUCTVERSIONSHORT/broffice.org/g \
   ./mime-info/broffice.org.keys
 #relocate the rest of them
 cp -r icons $RPM_BUILD_ROOT/%{_datadir}



From tmraz at fedoraproject.org  Mon Sep  8 11:02:14 2008
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon,  8 Sep 2008 11:02:14 +0000 (UTC)
Subject: rpms/pam/devel Linux-PAM-1.0.2.tar.bz2.sign, NONE,
	1.1 pam-1.0.1-cracklib-try-first-pass.patch, NONE,
	1.1 pam-1.0.1-tally-fail-close.patch, NONE, 1.1 .cvsignore, 1.50,
	1.51 pam.spec, 1.182, 1.183 sources, 1.52,
	1.53 Linux-PAM-1.0.1.tar.bz2.sign, 1.1,
	NONE pam-0.99.3.0-cracklib-try-first-pass.patch, 1.1,
	NONE pam-0.99.3.0-tally-fail-close.patch, 1.2,
	NONE pam-0.99.8.1-dbpam.patch, 1.1,
	NONE pam-1.0.1-selinux-restore-execcon.patch, 1.1, NONE
Message-ID: <20080908110214.6CBF370128@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16300

Modified Files:
	.cvsignore pam.spec sources 
Added Files:
	Linux-PAM-1.0.2.tar.bz2.sign 
	pam-1.0.1-cracklib-try-first-pass.patch 
	pam-1.0.1-tally-fail-close.patch 
Removed Files:
	Linux-PAM-1.0.1.tar.bz2.sign 
	pam-0.99.3.0-cracklib-try-first-pass.patch 
	pam-0.99.3.0-tally-fail-close.patch pam-0.99.8.1-dbpam.patch 
	pam-1.0.1-selinux-restore-execcon.patch 
Log Message:
* Mon Sep  8 2008 Tomas Mraz <tmraz at redhat.com> 1.0.2-1
- pam_loginuid: uids are unsigned (#460241)
- new minor upstream release
- use external db4
- drop tests for not pulling in libpthread (as NPTL should
  be safe)



--- NEW FILE Linux-PAM-1.0.2.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIt8Q3yGugalF9Dw4RAnJQAJ9hxQ8qCSTFxs0hKZnT1iuPIld0VwCfV4pa
mxTaEK08wwAQ2bYjsDhh01s=
=rPNX
-----END PGP SIGNATURE-----

pam-1.0.1-cracklib-try-first-pass.patch:

--- NEW FILE pam-1.0.1-cracklib-try-first-pass.patch ---
diff -up Linux-PAM-1.0.1/modules/pam_cracklib/pam_cracklib.c.try-first-pass Linux-PAM-1.0.1/modules/pam_cracklib/pam_cracklib.c
--- Linux-PAM-1.0.1/modules/pam_cracklib/pam_cracklib.c.try-first-pass	2008-03-05 21:21:38.000000000 +0100
+++ Linux-PAM-1.0.1/modules/pam_cracklib/pam_cracklib.c	2008-09-05 21:35:18.000000000 +0200
@@ -98,6 +98,7 @@ struct cracklib_options {
 	int oth_credit;
         int min_class;
 	int use_authtok;
+	int try_first_pass;
 	char prompt_type[BUFSIZ];
         const char *cracklib_dictpath;
 };
@@ -169,6 +170,10 @@ _pam_parse (pam_handle_t *pamh, struct c
                      opt->min_class = 4 ;
 	 } else if (!strncmp(*argv,"use_authtok",11)) {
 		 opt->use_authtok = 1;
+	 } else if (!strncmp(*argv,"use_first_pass",14)) {
+		 opt->use_authtok = 1;
+	 } else if (!strncmp(*argv,"try_first_pass",14)) {
+		 opt->try_first_pass = 1;
 	 } else if (!strncmp(*argv,"dictpath=",9)) {
 	     opt->cracklib_dictpath = *argv+9;
 	     if (!*(opt->cracklib_dictpath)) {
@@ -619,7 +624,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand
          * set PAM_AUTHTOK and return
          */
 
-	if (options.use_authtok == 1) {
+	if (options.use_authtok == 1 || options.try_first_pass == 1) {
 	    const void *item = NULL;
 
 	    retval = pam_get_item(pamh, PAM_AUTHTOK, &item);
@@ -630,11 +635,13 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand
 	    } else if (item != NULL) {      /* we have a password! */
 		token1 = x_strdup(item);
 		item = NULL;
+		options.use_authtok = 1;    /* don't ask for the password again */
 	    } else {
 		retval = PAM_AUTHTOK_RECOVERY_ERR;         /* didn't work */
 	    }
-
-	} else {
+	}
+	
+	if (options.use_authtok != 1) {
             /* Prepare to ask the user for the first time */
             resp = NULL;
 	    retval = pam_prompt (pamh, PAM_PROMPT_ECHO_OFF, &resp,

pam-1.0.1-tally-fail-close.patch:

--- NEW FILE pam-1.0.1-tally-fail-close.patch ---
diff -up Linux-PAM-1.0.1/modules/pam_tally/pam_tally.c.fail-close Linux-PAM-1.0.1/modules/pam_tally/pam_tally.c
--- Linux-PAM-1.0.1/modules/pam_tally/pam_tally.c.fail-close	2007-11-20 11:58:11.000000000 +0100
+++ Linux-PAM-1.0.1/modules/pam_tally/pam_tally.c	2008-09-05 21:54:31.000000000 +0200
@@ -325,6 +325,7 @@ get_tally(pam_handle_t *pamh, tally_t *t
       }
       lstat_ret = fstat(fileno(*TALLY),&fileinfo);
       fclose(*TALLY);
+      *TALLY = NULL;
     }
 
     if ( lstat_ret ) {
@@ -355,6 +356,7 @@ get_tally(pam_handle_t *pamh, tally_t *t
     if ( fseeko( *TALLY, (off_t) uid * sizeof(struct faillog), SEEK_SET ) ) {
           pam_syslog(pamh, LOG_ALERT, "fseek failed for %s", filename);
           fclose(*TALLY);
+          *TALLY = NULL;
           return PAM_AUTH_ERR;
     }
 
@@ -403,6 +405,7 @@ set_tally(pam_handle_t *pamh, tally_t ta
     }
 
     if ( fclose(*TALLY) ) {
+      *TALLY = NULL;
       pam_syslog(pamh, LOG_ALERT, "update (fclose) failed for %s", filename);
       return PAM_AUTH_ERR;
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	9 Jul 2008 12:27:35 -0000	1.50
+++ .cvsignore	8 Sep 2008 11:01:43 -0000	1.51
@@ -1,5 +1,4 @@
 *.src.rpm
 *.tar.bz2
 pam-redhat-0.99.9-1.tar.bz2
-Linux-PAM-1.0.1.tar.bz2
-db-4.7.25.tar.gz
+Linux-PAM-1.0.2.tar.bz2


Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- pam.spec	9 Jul 2008 12:27:35 -0000	1.182
+++ pam.spec	8 Sep 2008 11:01:44 -0000	1.183
@@ -1,11 +1,9 @@
-%define db_version 4.7.25
-%define db_conflicting_version 4.8.0
 %define pam_redhat_version 0.99.9-1
 
 Summary: A security tool which provides authentication for applications
 Name: pam
-Version: 1.0.1
-Release: 5%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
 # The library is BSD licensed with option to relicense as GPLv2+ - this option is redundant
 # as the BSD license allows that anyway. pam_timestamp and pam_console modules are GPLv2+,
 # pam_rhosts_auth module is BSD with advertising
@@ -14,7 +12,6 @@
 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
-Source4: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
 Source5: other.pamd
 Source6: system-auth.pamd
 Source7: config-util.pamd
@@ -23,15 +20,13 @@
 Source10: config-util.5
 Source11: 90-nproc.conf
 Patch1:  pam-0.99.7.0-redhat-modules.patch
-Patch4:  pam-0.99.8.1-dbpam.patch
 Patch5:  pam-1.0.1-autoreconf.patch
 Patch10: pam-1.0.0-sepermit-screensaver.patch
-Patch11: pam-1.0.1-selinux-restore-execcon.patch
 Patch12: pam-1.0.0-selinux-env-params.patch
 Patch21: pam-0.99.10.0-unix-audit-failed.patch
 Patch22: pam-1.0.1-unix-prompts.patch
-Patch31: pam-0.99.3.0-cracklib-try-first-pass.patch
-Patch32: pam-0.99.3.0-tally-fail-close.patch
+Patch31: pam-1.0.1-cracklib-try-first-pass.patch
+Patch32: pam-1.0.1-tally-fail-close.patch
 Patch41: pam-1.0.1-namespace-create.patch
 
 %define _sbindir /sbin
@@ -64,19 +59,13 @@
 %endif
 BuildRequires: glibc >= 2.3.90-37
 Requires: glibc >= 2.3.90-37
+BuildRequires: db4-devel
 # Following deps are necessary only to build the pam library documentation.
 BuildRequires: linuxdoc-tools, w3m, libxslt
 BuildRequires: docbook-style-xsl, docbook-dtds
 
 URL: http://www.us.kernel.org/pub/linux/libs/pam/index.html
 
-# We internalize libdb to get a non-threaded copy, but we should at least try
-# to coexist with the system's copy of libdb, which will be used to make the
-# files for use by pam_userdb (either by db_load or Perl's DB_File module).
-# The non-threaded db4 is necessary so we do not break single threaded
-# services when they call pam_userdb.so module.
-Conflicts: db4 >= %{db_conflicting_version}
-
 %description
 PAM (Pluggable Authentication Modules) is a system security tool that
 allows system administrators to set authentication policy without
@@ -95,16 +84,14 @@
 PAM-aware applications and modules for use with PAM.
 
 %prep
-%setup -q -n Linux-PAM-%{version} -a 2 -a 4
+%setup -q -n Linux-PAM-%{version} -a 2
 
 # Add custom modules.
 mv pam-redhat-%{pam_redhat_version}/* modules
 
 %patch1 -p1 -b .redhat-modules
-%patch4 -p1 -b .dbpam
 %patch5 -p1 -b .autoreconf
 %patch10 -p1 -b .screensaver
-%patch11 -p1 -b .restore-execcon
 %patch12 -p0 -b .env-params
 %patch21 -p1 -b .audit-failed
 %patch22 -p1 -b .prompts
@@ -115,48 +102,16 @@
 autoreconf
 
 %build
-CFLAGS="-fPIC $RPM_OPT_FLAGS" ; export CFLAGS
-
-topdir=`pwd`/pam-instroot
-test -d ${topdir}         || mkdir ${topdir}
-test -d ${topdir}/include || mkdir ${topdir}/include
-test -d ${topdir}/%{_lib} || mkdir ${topdir}/%{_lib}
-
-pushd db-%{db_version}/build_unix
-echo db_cv_mutex=UNIX/fcntl > config.cache
-../dist/configure -C \
-	--disable-compat185 \
-	--disable-cxx \
-	--disable-diagnostic \
-	--disable-dump185 \
-	--disable-java \
-	--disable-rpc \
-	--disable-tcl \
-	--disable-shared \
-	--with-pic \
-	--with-uniquename=_pam \
-	--with-mutex="UNIX/fcntl" \
-	--prefix=${topdir} \
-	--includedir=${topdir}/include \
-	--libdir=${topdir}/%{_lib}
-make
-make install
-popd
-
-CPPFLAGS=-I${topdir}/include ; export CPPFLAGS
-export LIBNAME="%{_lib}"
-LDFLAGS=-L${topdir}/%{_lib} ; export LDFLAGS
 %configure \
 	--libdir=/%{_lib} \
 	--includedir=%{_includedir}/security \
-	--enable-isadir=../..%{_moduledir} \
 %if ! %{WITH_SELINUX}
 	--disable-selinux \
 %endif
 %if ! %{WITH_AUDIT}
 	--disable-audit \
 %endif
-	--with-db-uniquename=_pam
+	--enable-isadir=../..%{_moduledir}
 make
 # we do not use _smp_mflags because the build of sources in yacc/flex fails
 
@@ -242,14 +197,6 @@
 		echo ERROR module: ${module} cannot be loaded.
 		exit 1
 	fi
-# And for good measure, make sure that none of the modules pull in threading
-# libraries, which if loaded in a non-threaded application, can cause Very
-# Bad Things to happen.
-	if env LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_lib} \
-	       LD_PRELOAD=$RPM_BUILD_ROOT%{_libdir}/libpam.so ldd -r ${module} | fgrep -q libpthread ; then
-		echo ERROR module: ${module} pulls threading libraries.
-		exit 1
-	fi
 done
 
 %clean
@@ -380,6 +327,13 @@
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Mon Sep  8 2008 Tomas Mraz <tmraz at redhat.com> 1.0.2-1
+- pam_loginuid: uids are unsigned (#460241)
+- new minor upstream release
+- use external db4
+- drop tests for not pulling in libpthread (as NPTL should
+  be safe)
+
 * Wed Jul  9 2008 Tomas Mraz <tmraz at redhat.com> 1.0.1-5
 - update internal db4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	9 Jul 2008 12:27:35 -0000	1.52
+++ sources	8 Sep 2008 11:01:44 -0000	1.53
@@ -1,3 +1,2 @@
 26152d9c691715756b514dbf9cab9cd8  pam-redhat-0.99.9-1.tar.bz2
-1c75f81bd44c5da93014992820917847  Linux-PAM-1.0.1.tar.bz2
-ec2b87e833779681a0c3a814aa71359e  db-4.7.25.tar.gz
+fc5e35645b75befae28c88b711b28ffb  Linux-PAM-1.0.2.tar.bz2


--- Linux-PAM-1.0.1.tar.bz2.sign DELETED ---


--- pam-0.99.3.0-cracklib-try-first-pass.patch DELETED ---


--- pam-0.99.3.0-tally-fail-close.patch DELETED ---


--- pam-0.99.8.1-dbpam.patch DELETED ---


--- pam-1.0.1-selinux-restore-execcon.patch DELETED ---



From mbarnes at fedoraproject.org  Mon Sep  8 11:14:47 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon,  8 Sep 2008 11:14:47 +0000 (UTC)
Subject: rpms/gtkhtml3/devel .cvsignore, 1.80, 1.81 gtkhtml3.spec, 1.131,
	1.132 sources, 1.80,
	1.81 gtkhtml-3.23.91-compiler-warnings.patch, 1.1, NONE
Message-ID: <20080908111447.C5C1370128@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20765

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Removed Files:
	gtkhtml-3.23.91-compiler-warnings.patch 
Log Message:

* Mon Sep 08 2008 Matthew Barnes <mbarnes at redhat.com> - 3.23.92-1.fc10
- Update to 3.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- .cvsignore	1 Sep 2008 12:49:24 -0000	1.80
+++ .cvsignore	8 Sep 2008 11:14:16 -0000	1.81
@@ -1 +1 @@
-gtkhtml-3.23.91.tar.bz2
+gtkhtml-3.23.92.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- gtkhtml3.spec	1 Sep 2008 12:49:24 -0000	1.131
+++ gtkhtml3.spec	8 Sep 2008 11:14:16 -0000	1.132
@@ -9,7 +9,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.23.91
+Version: 3.23.92
 Release: 1%{?dist}
 License: LGPLv2+ and GPLv2
 Group: System Environment/Libraries
@@ -22,9 +22,6 @@
 # Remove gnome-common macros from configure.in.
 Patch1: gtkhtml-3.13.1-no-gnome-common.patch
 
-# Get -Werror to work
-Patch2: gtkhtml-3.23.91-compiler-warnings.patch
-
 ### Dependencies ###
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -62,7 +59,6 @@
 %prep
 %setup -q -n gtkhtml-%{version}
 %patch1 -p1 -b .no-gnome-common
-%patch2 -p1 -b .compiler-warnings
 
 %build
 
@@ -127,6 +123,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep 08 2008 Matthew Barnes <mbarnes at redhat.com> - 3.23.92-1.fc10
+- Update to 3.23.92
+
 * Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 3.23.91-1.fc10
 - Update to 3.23.91
 - Add -Werror to CFLAGS.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	1 Sep 2008 12:49:24 -0000	1.80
+++ sources	8 Sep 2008 11:14:16 -0000	1.81
@@ -1 +1 @@
-3629ec4287a1778a9640cc3fe98c33cb  gtkhtml-3.23.91.tar.bz2
+0081e3df67b5a39becf75334d819e8c0  gtkhtml-3.23.92.tar.bz2


--- gtkhtml-3.23.91-compiler-warnings.patch DELETED ---



From karsten at fedoraproject.org  Mon Sep  8 11:19:22 2008
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon,  8 Sep 2008 11:19:22 +0000 (UTC)
Subject: rpms/vim/devel 7.2.007,NONE,1.1
Message-ID: <20080908111922.5802570128@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22852

Added Files:
	7.2.007 
Log Message:
- patchlevel 007


--- NEW FILE 7.2.007 ---
To: vim-dev at vim.org
Subject: Patch 7.2.007 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.007 (extra)
Problem:    Minor issues for VMS.
Solution:   Minor fixes for VMS.  Add float support. (Zoltan Arpadffy)
Files:	    runtime/doc/os_vms.txt, src/os_vms_conf.h, src/Make_vms.mms,
	    src/testdir/Make_vms.mms, src/testdir/test30.in,
	    src/testdir/test54.in


*** ../vim-7.2.006/runtime/doc/os_vms.txt	Sat Aug  9 19:36:50 2008
--- runtime/doc/os_vms.txt	Tue Aug 19 06:29:31 2008
***************
*** 1,4 ****
! *os_vms.txt*    For Vim version 7.2.  Last change: 2006 Nov 18
  
  
  		  VIM REFERENCE MANUAL
--- 1,4 ----
! *os_vms.txt*    For Vim version 7.2.  Last change: 2008 Aug 19
  
  
  		  VIM REFERENCE MANUAL
***************
*** 312,318 ****
  
  8. Useful notes						*vms-notes*
  
! 8.1 backspace/delete
  8.2 Filters
  8.3 VMS file version numbers
  8.4 Directory conversion
--- 312,318 ----
  
  8. Useful notes						*vms-notes*
  
! 8.1 Backspace/delete
  8.2 Filters
  8.3 VMS file version numbers
  8.4 Directory conversion
***************
*** 326,333 ****
  8.12 diff-mode
  8.13 Allow '$' in C keywords
  8.14 VIMTUTOR for beginners
  
! 8.1 backspace/delete
  
  There are backspace/delete key inconsistencies with VMS.
  :fixdel doesn't do the trick, but the solution is: >
--- 326,335 ----
  8.12 diff-mode
  8.13 Allow '$' in C keywords
  8.14 VIMTUTOR for beginners
+ 8.15 Slow start in console mode issue 
+ 8.16 Common VIM directory - different architectures 
  
! 8.1 Backspace/delete
  
  There are backspace/delete key inconsistencies with VMS.
  :fixdel doesn't do the trick, but the solution is: >
***************
*** 663,674 ****
  
  (Thomas.R.Wyant III, Vim 6.1)
  
  ==============================================================================
  
  9. VMS related changes					*vms-changes*
  
! Version 7
  - Improved low level char input (affects just console mode)
  
  Version 6.4 (2005 Oct 15)
  - GTKLIB and Vim build on IA64
--- 665,794 ----
  
  (Thomas.R.Wyant III, Vim 6.1)
  
+ 8.14 Slow start in console mode issue
+ 
+ As GUI/GTK Vim works equally well in console mode, many administartors
+ deploy those executables system wide.
+ Unfortunately, on a remote slow connections GUI/GTK executables behave rather
+ slow when user wants to run Vim just in the console mode - because of X environment detection timeout.
+ 
+ Luckily, there is a simple solution for that. Administrators need to deploy
+ both GUI/GTK build and just console build executables, like below: >
+ 
+     |- vim72
+     |----- doc
+     |----- syntax        
+        vimrc    (system rc files)
+        gvimrc
+        gvim.exe (the remaned GUI or GTK built vim.exe)      
+        vim.exe  (the console only executable) 
+ 
+ Define system symbols like below in for ex in LOGIN.COM or SYLOGIN.COM: >
+ 
+ 	$ define/nolog VIM RF10:[UTIL.VIM72] ! where you VIM directory is
+ 	$ vi*m  :== mcr VIM:VIM.EXE
+ 	$ gvi*m :== mcr VIM:GVIM.EXE
+ 	$ ! or you can try to spawn with
+ 	$ gv*im :== spawn/nowait/input=NLA0 mcr VIM:GVIM.EXE -g -GEOMETRY 80x40
+ 
+ 
+ Like this, users that do not have X environment and want to use Vim just in 
+ console mode can avoid performance problems.
+ 
+ (Zoltan Arpadffy, Vim 7.2)
+ 
+ 8.15 Common VIM directory - different architectures
+ 
+ In a cluster that contains nodes with different architectures like below:
+ 
+ $show cluster
+ View of Cluster from system ID 11655  node: TOR                                                                     18-AUG-2008 11:58:31
+ +---------------------------------+
+ ?        SYSTEMS        ? MEMBERS ?
+ +-----------------------+---------?
+ ?  NODE  ?   SOFTWARE   ?  STATUS ?
+ +--------+--------------+---------?
+ ? TOR    ? VMS V7.3-2   ? MEMBER  ?
+ ? TITAN2 ? VMS V8.3     ? MEMBER  ?
+ ? ODIN   ? VMS V7.3-2   ? MEMBER  ?
+ +---------------------------------+
+ 
+ It is convinient to have a common VIM directory but execute different
+ executables. 
+ There are more solutions for this problem:
+ 
+ solution 1. all executables in the same directory with different names
+ This is easily done with the following script that can be added
+ to the login.com or sylogin.com: >
+ 
+ 	$ if f$getsyi("NODE_HWTYPE") .eqs. "VAX"
+ 	$ then
+ 	$       say "VAX platform"
+ 	$       vi*m:== mcr vim:VIM.EXE_VAX
+ 	$ endif
+ 	$ if f$getsyi("NODE_HWTYPE") .eqs. "ALPH"
+ 	$ then
+ 	$       say "ALPHA platform"
+ 	$       vi*m :== mcr vim:VIM.EXE_AXP
+ 	$ endif
+ 	$ if f$getsyi("ARCH_NAME") .eqs. "IA64"
+ 	$ then
+ 	$      say "IA64 platform"
+ 	$      vi*m :== mcr vim:VIM.EXE_IA64
+ 	$ endif
+ 
+ solution 2. different directories: >
+ 
+ 	$ if f$getsyi("NODE_HWTYPE") .eqs. "VAX"
+ 	$ then
+ 	$       say "VAX platform"
+ 	$       define/nolog VIM RF10:[UTIL.VAX_EXE] ! VAX executables
+ 	$ endif
+ 	$ if f$getsyi("NODE_HWTYPE") .eqs. "ALPH"
+ 	$ then
+ 	$       say "ALPHA platform"
+ 	$       define/nolog VIM RF10:[UTIL.AXP_EXE] ! AXP executables
+ 	$ endif
+ 	$ if f$getsyi("ARCH_NAME") .eqs. "IA64"
+ 	$ then
+ 	$      say "IA64 platform"
+ 	$      define/nolog VIM RF10:[UTIL.IA64_EXE] ! IA64 executables
+ 	$ endif
+         $! VIMRUNTIME must be defined in order to find runtime files
+ 	$ define/nolog VIMRUNTIME RF10:[UTIL.VIM72]
+ 
+ A good examle for this approach is the [GNU]gnu_tools.com script from GNU_TOOLS.ZIP
+ package downloadable from http://www.polarhome.com/vim/
+ 
+ (Zoltan Arpadffy, Vim 7.2)
+ 
  ==============================================================================
  
  9. VMS related changes					*vms-changes*
  
! Recent changes
! - The following plugins are included into VMS runtime: 
!   genutils 2.4, multiselect 2.2, multvals 3.1, selectbuf 4.3,
!   bufexplorer 7.1.7, taglist 4.5
! - minor changes in vimrc (just in VMS runtime) 
! - make_vms.mms - HUGE model is the default
! - [TESTDIR]make_vms.mms include as many tests possible
! - modify test30 and test54 for VMS
! - enable FLOAT feature in VMS port
! - os_vms.txt updated  
! 
! Version 7.2 (2008 Aug 9)
! - VCF files write corrected
! - CTAGS 5.7 included
! - corrected make_vms.mms (on VAX gave syntax error) 
! 
! Version 7.1 (2007 Jun 15)
! - create TAGS file from menu 
! 
! Version 7 (2006 May 8)
  - Improved low level char input (affects just console mode)
+ - Fixed plugin bug
+ - CTAGS 5.6 included
  
  Version 6.4 (2005 Oct 15)
  - GTKLIB and Vim build on IA64
***************
*** 806,811 ****
--- 926,932 ----
  
  OpenVMS documentation and executables are maintained by:
  Zoltan Arpadffy <arpadffy at polarhome.com>
+ OpenVMS Vim page: http://www.polarhome.com/vim/
  
  This document uses parts and remarks from earlier authors and contributors
  of OS_VMS.TXT:
*** ../vim-7.2.006/src/os_vms_conf.h	Thu May 10 19:26:17 2007
--- src/os_vms_conf.h	Sat Aug 16 05:09:17 2008
***************
*** 114,119 ****
--- 114,121 ----
  #define HAVE_PUTENV
  #define HAVE_SETENV
  #define HAVE_SETJMP_H
+ #define HAVE_MATH_H
+ #define HAVE_FLOAT_FUNCS
  
  #undef	HAVE_DIRENT_H
  #undef	HAVE_SYS_NDIR_H
*** ../vim-7.2.006/src/Make_vms.mms	Mon Oct 29 22:38:54 2007
--- src/Make_vms.mms	Sat Aug 16 05:17:41 2008
***************
*** 2,8 ****
  # Makefile for Vim on OpenVMS
  #
  # Maintainer:   Zoltan Arpadffy <arpadffy at polarhome.com>
! # Last change:  2007 Oct 22
  #
  # This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64
  # with MMS and MMK
--- 2,8 ----
  # Makefile for Vim on OpenVMS
  #
  # Maintainer:   Zoltan Arpadffy <arpadffy at polarhome.com>
! # Last change:  2008 Aug 16
  #
  # This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64
  # with MMS and MMK
***************
*** 36,42 ****
  # BIG    - Many features enabled, as rich as possible. (default)
  # HUGE   - All possible featues enabled.
  # Please select one of these alternatives above.
! MODEL = BIG
  
  # GUI or terminal mode executable.
  # Comment out if you want just the character terminal mode only.
--- 36,42 ----
  # BIG    - Many features enabled, as rich as possible. (default)
  # HUGE   - All possible featues enabled.
  # Please select one of these alternatives above.
! MODEL = HUGE
  
  # GUI or terminal mode executable.
  # Comment out if you want just the character terminal mode only.
*** ../vim-7.2.006/src/testdir/Make_vms.mms	Wed Jun 25 00:34:23 2008
--- src/testdir/Make_vms.mms	Tue Aug 19 06:28:07 2008
***************
*** 4,12 ****
  # Authors:	Zoltan Arpadffy, <arpadffy at polarhome.com>
  #		Sandor Kopanyi,  <sandor.kopanyi at mailbox.hu>
  #
! # Last change:  2008 Jun 19
  #
! # This has been tested on VMS 6.2 to 7.2 on DEC Alpha and VAX.
  # Edit the lines in the Configuration section below to select.
  #
  # Execute with:
--- 4,12 ----
  # Authors:	Zoltan Arpadffy, <arpadffy at polarhome.com>
  #		Sandor Kopanyi,  <sandor.kopanyi at mailbox.hu>
  #
! # Last change:  2008 Aug 19
  #
! # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
  # Edit the lines in the Configuration section below to select.
  #
  # Execute with:
***************
*** 32,37 ****
--- 32,46 ----
  # and directory handling.
  # WANT_UNIX = YES
  
+ # Comment out if you want to run Win32 specific tests as well, but please
+ # be aware, that on OpenVMS will fail, because of cat, rm, etc commands
+ # and directory handling.
+ # WANT_WIN = YES
+ 
+ # Comment out if you want to run spell checker tests. 
+ # They fail because VMS does not support file names.
+ # WANT_SPELL = YES
+ 
  # Comment out if you have gzip on your system
  # HAVE_GZIP = YES
  
***************
*** 53,64 ****
  	 test13.out test14.out test15.out test17.out \
  	 test18.out test19.out test20.out test21.out test22.out \
  	 test23.out test24.out test26.out \
! 	 test28.out test29.out test31.out test32.out \
  	 test33.out test34.out test35.out test36.out test37.out \
  	 test38.out test39.out test40.out test41.out test42.out \
  	 test43.out test44.out test45.out test46.out \
  	 test48.out test51.out test53.out test54.out test55.out \
! 	 test56.out test57.out test58.out test59.out test60.out \
  	 test61.out test62.out test63.out test64.out test65.out
  
  .IFDEF WANT_GUI
--- 62,73 ----
  	 test13.out test14.out test15.out test17.out \
  	 test18.out test19.out test20.out test21.out test22.out \
  	 test23.out test24.out test26.out \
! 	 test28.out test29.out test30.out test31.out test32.out \
  	 test33.out test34.out test35.out test36.out test37.out \
  	 test38.out test39.out test40.out test41.out test42.out \
  	 test43.out test44.out test45.out test46.out \
  	 test48.out test51.out test53.out test54.out test55.out \
! 	 test56.out test57.out test60.out \
  	 test61.out test62.out test63.out test64.out test65.out
  
  .IFDEF WANT_GUI
***************
*** 67,73 ****
  .ENDIF
  
  .IFDEF WANT_UNIX
! SCRIPT_UNIX = test10.out test12.out test25.out test27.out test30.out test49.out
  .ENDIF
  
  .IFDEF HAVE_GZIP
--- 76,90 ----
  .ENDIF
  
  .IFDEF WANT_UNIX
! SCRIPT_UNIX = test10.out test12.out test25.out test27.out test49.out
! .ENDIF
! 
! .IFDEF WANT_WIN
! SCRIPT_WIN = test50.out test52.out
! .ENDIF
! 
! .IFDEF WANT_SPELL
! SCRIPT_SPELL = test58.out test59.out 
  .ENDIF
  
  .IFDEF HAVE_GZIP
***************
*** 84,94 ****
  	-@ write sys$output "                "$*" "
  	-@ write sys$output "-----------------------------------------------"
  	-@ create/term/wait mcr $(VIMPROG) $(GUI_OPTION) -u vms.vim --noplugin -s dotest.in $*.in
! 	-@ if "''F$SEARCH("test.out.*")'" .NES. "" then differences test.out $*.ok;
  	-@ if "''F$SEARCH("test.out.*")'" .NES. "" then rename test.out $*.out
  	-@ if "''F$SEARCH("Xdotest.*")'"  .NES. "" then delete/noconfirm/nolog Xdotest.*.*
  
! all : clean nolog $(SCRIPT) $(SCRIPT_GUI) $(SCRIPT_UNIX) $(SCRIPT_GZIP) $(SCRIPT_GDIFF)
  	-@ write sys$output " "
  	-@ write sys$output "-----------------------------------------------"
  	-@ write sys$output "                All done"
--- 101,111 ----
  	-@ write sys$output "                "$*" "
  	-@ write sys$output "-----------------------------------------------"
  	-@ create/term/wait mcr $(VIMPROG) $(GUI_OPTION) -u vms.vim --noplugin -s dotest.in $*.in
! 	-@ if "''F$SEARCH("test.out.*")'" .NES. "" then differences /par test.out $*.ok;
  	-@ if "''F$SEARCH("test.out.*")'" .NES. "" then rename test.out $*.out
  	-@ if "''F$SEARCH("Xdotest.*")'"  .NES. "" then delete/noconfirm/nolog Xdotest.*.*
  
! all : clean nolog $(SCRIPT) $(SCRIPT_GUI) $(SCRIPT_UNIX) $(SCRIPT_WIN) $(SCRIPT_SPELL) $(SCRIPT_GZIP) $(SCRIPT_GDIFF) 
  	-@ write sys$output " "
  	-@ write sys$output "-----------------------------------------------"
  	-@ write sys$output "                All done"
***************
*** 113,118 ****
--- 130,137 ----
  	-@ write sys$output "MAKE_VMS.MMS options:"
  	-@ write sys$output "   WANT_GUI  = ""$(WANT_GUI)"" "
  	-@ write sys$output "   WANT_UNIX = ""$(WANT_UNIX)"" "
+ 	-@ write sys$output "   WANT_WIN  = ""$(WANT_WIN)"" "
+ 	-@ write sys$output "   WANT_SPELL= ""$(WANT_SPELL)"" "
  	-@ write sys$output "   HAVE_GZIP = ""$(HAVE_GZIP)"" "
  	-@ write sys$output "   HAVE_GDIFF= ""$(HAVE_GDIFF)"" "
  	-@ write sys$output "Default vimrc file is VMS.VIM:
***************
*** 122,126 ****
--- 141,153 ----
  clean :
  	-@ if "''F$SEARCH("*.out")'"     .NES. "" then delete/noconfirm/nolog *.out.*
  	-@ if "''F$SEARCH("test.log")'"  .NES. "" then delete/noconfirm/nolog test.log.*
+ 	-@ if "''F$SEARCH("test.ok")'"   .NES. "" then delete/noconfirm/nolog test.ok.*
  	-@ if "''F$SEARCH("Xdotest.*")'" .NES. "" then delete/noconfirm/nolog Xdotest.*.*
  	-@ if "''F$SEARCH("*.*_sw*")'"   .NES. "" then delete/noconfirm/nolog *.*_sw*.*
+ 	-@ if "''F$SEARCH("*.failed")'"  .NES. "" then delete/noconfirm/nolog *.failed.*
+ 	-@ if "''F$SEARCH("*.rej")'"     .NES. "" then delete/noconfirm/nolog *.rej.*
+ 	-@ if "''F$SEARCH("tiny.vim")'"  .NES. "" then delete/noconfirm/nolog tiny.vim.*
+ 	-@ if "''F$SEARCH("small.vim")'" .NES. "" then delete/noconfirm/nolog small.vim.*
+ 	-@ if "''F$SEARCH("mbyte.vim")'" .NES. "" then delete/noconfirm/nolog mbyte.vim.*
+ 	-@ if "''F$SEARCH("viminfo.*")'" .NES. "" then delete/noconfirm/nolog viminfo.*.*
+ 
*** ../vim-7.2.006/src/testdir/test30.in	Sun Jul 13 19:17:14 2008
--- src/testdir/test30.in	Sat Aug 16 04:59:37 2008
***************
*** 24,33 ****
  :set nobin eol
  :bwipe XXUnix XXDos XXMac
  :" create mixed format files
! :!cat XXUnix XXDos >XXUxDs
! :!cat XXUnix XXMac >XXUxMac
! :!cat XXDos XXMac >XXDosMac
! :!cat XXUnix XXDos XXMac >XXUxDsMc
  :"
  :" try reading and writing with 'fileformats' empty
  :set fileformat=unix
--- 24,40 ----
  :set nobin eol
  :bwipe XXUnix XXDos XXMac
  :" create mixed format files
! :if has("vms")
! : !copy XXUnix,XXDos XXUxDs.
! : !copy XXUnix,XXMac XXUxMac.
! : !copy XXDos,XXMac  XXDosMac.
! : !copy XXUnix,XXDos,XXMac XXUxDsMc.
! :else
! : !cat XXUnix XXDos >XXUxDs
! : !cat XXUnix XXMac >XXUxMac
! : !cat XXDos XXMac >XXDosMac
! : !cat XXUnix XXDos XXMac >XXUxDsMc
! :endif
  :"
  :" try reading and writing with 'fileformats' empty
  :set fileformat=unix
*** ../vim-7.2.006/src/testdir/test54.in	Sun Jan  2 12:43:19 2005
--- src/testdir/test54.in	Tue Aug 19 06:26:55 2008
***************
*** 3,10 ****
  STARTTEST
  :so small.vim
  :e xx
! :!rm -f test.out
! :au BufLeave <buffer> :!echo buffer-local autommand in %>> test.out
  :e somefile           " here, autocommand for xx shall write test.out 
  :                     " but autocommand shall not apply to buffer named <buffer>
  :bwipe xx             " here, autocommand shall be auto-deleted
--- 3,15 ----
  STARTTEST
  :so small.vim
  :e xx
! :if has("vms")
! : !del test.out.*
! : au BufLeave <buffer> :!write sys$output "buffer-local autommand in %" > test.out
! :else
! : !rm -f test.out
! : au BufLeave <buffer> :!echo buffer-local autommand in %>> test.out
! :endif
  :e somefile           " here, autocommand for xx shall write test.out 
  :                     " but autocommand shall not apply to buffer named <buffer>
  :bwipe xx             " here, autocommand shall be auto-deleted
*** ../vim-7.2.006/src/version.c	Mon Aug 25 05:03:29 2008
--- src/version.c	Mon Sep  1 16:46:50 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     7,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
8. Don't use any punctuation marks.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Mon Sep  8 11:19:27 2008
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon,  8 Sep 2008 11:19:27 +0000 (UTC)
Subject: rpms/vim/devel 7.2.008,NONE,1.1
Message-ID: <20080908111927.DD39870128@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22919

Added Files:
	7.2.008 
Log Message:
- patchlevel 008


--- NEW FILE 7.2.008 ---
To: vim-dev at vim.org
Subject: Patch 7.2.008
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.008
Problem:    With a BufHidden autocommand that invokes ":bunload" the window
	    count for a buffer can be wrong. (Bob Hiestand)
Solution:   Don't call enter_buffer() when already in that buffer.
Files:	    src/buffer.c


*** ../vim-7.2.007/src/buffer.c	Wed Aug  6 18:32:40 2008
--- src/buffer.c	Mon Sep  1 14:25:45 2008
***************
*** 1351,1361 ****
  	}
      }
  #ifdef FEAT_AUTOCMD
  # ifdef FEAT_EVAL
!     /* An autocommand may have deleted buf or aborted the script processing! */
!     if (buf_valid(buf) && !aborting())
  # else
!     if (buf_valid(buf))	    /* an autocommand may have deleted buf! */
  # endif
  #endif
  	enter_buffer(buf);
--- 1351,1362 ----
  	}
      }
  #ifdef FEAT_AUTOCMD
+     /* An autocommand may have deleted "buf", already entered it (e.g., when
+      * it did ":bunload") or aborted the script processing! */
  # ifdef FEAT_EVAL
!     if (buf_valid(buf) && buf != curbuf && !aborting())
  # else
!     if (buf_valid(buf) && buf != curbuf)
  # endif
  #endif
  	enter_buffer(buf);
*** ../vim-7.2.007/src/version.c	Mon Sep  1 16:50:09 2008
--- src/version.c	Mon Sep  1 17:31:28 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     8,
  /**/

-- 
If Pacman had affected us as kids we'd be running around in dark rooms,
munching pills and listening to repetitive music.
                       -- Marcus Brigstocke

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Mon Sep  8 11:19:33 2008
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon,  8 Sep 2008 11:19:33 +0000 (UTC)
Subject: rpms/vim/devel 7.2.009,NONE,1.1
Message-ID: <20080908111933.3B88670128@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22971

Added Files:
	7.2.009 
Log Message:
- patchlevel 009


--- NEW FILE 7.2.009 ---
To: vim-dev at vim.org
Subject: Patch 7.2.009
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.009
Problem:    Can't compile with Perl 5.10 on MS-Windows. (Cesar Romani)
Solution:   Add the Perl_sv_free2 function for dynamic loading. (Dan Sharp)
Files:	    src/if_perl.xs


*** ../vim-7.2.008/src/if_perl.xs	Thu Jul 24 16:24:15 2008
--- src/if_perl.xs	Mon Sep  1 14:58:37 2008
***************
*** 136,141 ****
--- 136,144 ----
  #  define Perl_newXS_flags dll_Perl_newXS_flags
  #endif
  # define Perl_sv_free dll_Perl_sv_free
+ # if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
+ #  define Perl_sv_free2 dll_Perl_sv_free2
+ # endif
  # define Perl_sv_isa dll_Perl_sv_isa
  # define Perl_sv_magic dll_Perl_sv_magic
  # define Perl_sv_setiv dll_Perl_sv_setiv
***************
*** 268,273 ****
--- 271,277 ----
  static void (*boot_DynaLoader)_((pTHX_ CV*));
  
  #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
+ static void (*Perl_sv_free2)(pTHX_ SV*);
  static void (*Perl_sys_init3)(int* argc, char*** argv, char*** env);
  static void (*Perl_sys_term)(void);
  static SV** (*Perl_ISv_ptr)(register PerlInterpreter*);
***************
*** 367,372 ****
--- 371,377 ----
      {"Perl_TXpv_ptr", (PERL_PROC*)&Perl_TXpv_ptr},
      {"Perl_Tna_ptr", (PERL_PROC*)&Perl_Tna_ptr},
  #else
+     {"Perl_sv_free2", (PERL_PROC*)&Perl_sv_free2},
      {"Perl_sys_init3", (PERL_PROC*)&Perl_sys_init3},
      {"Perl_sys_term", (PERL_PROC*)&Perl_sys_term},
      {"Perl_ISv_ptr", (PERL_PROC*)&Perl_ISv_ptr},
*** ../vim-7.2.008/src/version.c	Mon Sep  1 17:32:40 2008
--- src/version.c	Mon Sep  1 17:55:24 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     9,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
11. Specify that your drive-through order is "to go".

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Mon Sep  8 11:19:38 2008
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon,  8 Sep 2008 11:19:38 +0000 (UTC)
Subject: rpms/vim/devel 7.2.010,NONE,1.1
Message-ID: <20080908111938.AEA6770128@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23041

Added Files:
	7.2.010 
Log Message:
- patchlevel 010


--- NEW FILE 7.2.010 ---
To: vim-dev at vim.org
Subject: Patch 7.2.010
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.010
Problem:    When using "K" in Visual mode not all characters are properly
	    escaped. (Ben Schmidt)
Solution:   Use a function with the functionality of shellescape(). (Jan
	    Minar)
Files:	    src/mbyte.c, src/misc2.c, src/normal.c


*** ../vim-7.2.009/src/mbyte.c	Wed Aug  6 18:45:36 2008
--- src/mbyte.c	Wed Sep  3 22:34:48 2008
***************
*** 2540,2546 ****
      return (int)(p - q);
  }
  
- #if defined(FEAT_EVAL) || defined(PROTO)
  /*
   * Copy a character from "*fp" to "*tp" and advance the pointers.
   */
--- 2540,2545 ----
***************
*** 2555,2561 ****
      *tp += l;
      *fp += l;
  }
- #endif
  
  /*
   * Return the offset from "p" to the first byte of a character.  When "p" is
--- 2554,2559 ----
*** ../vim-7.2.009/src/misc2.c	Thu Jul 24 20:28:58 2008
--- src/misc2.c	Wed Sep  3 22:05:21 2008
***************
*** 1257,1263 ****
      return escaped_string;
  }
  
- #if !defined(BACKSLASH_IN_FILENAME) || defined(FEAT_EVAL) || defined(PROTO)
  /*
   * Return TRUE when 'shell' has "csh" in the tail.
   */
--- 1257,1262 ----
***************
*** 1266,1274 ****
  {
      return (strstr((char *)gettail(p_sh), "csh") != NULL);
  }
- #endif
  
- #if defined(FEAT_EVAL) || defined(PROTO)
  /*
   * Escape "string" for use as a shell argument with system().
   * This uses single quotes, except when we know we need to use double qoutes
--- 1265,1271 ----
***************
*** 1391,1397 ****
  
      return escaped_string;
  }
- #endif
  
  /*
   * Like vim_strsave(), but make all characters uppercase.
--- 1388,1393 ----
*** ../vim-7.2.009/src/normal.c	Thu Jul 31 22:03:54 2008
--- src/normal.c	Sat Sep  6 15:06:07 2008
***************
*** 5469,5474 ****
--- 5469,5479 ----
  		STRCPY(buf, "he! ");
  	    else
  	    {
+ 		/* An external command will probably use an argument starting
+ 		 * with "-" as an option.  To avoid trouble we skip the "-". */
+ 		while (*ptr == '-')
+ 		    ++ptr;
+ 
  		/* When a count is given, turn it into a range.  Is this
  		 * really what we want? */
  		isman = (STRCMP(kp, "man") == 0);
***************
*** 5511,5547 ****
      /*
       * Now grab the chars in the identifier
       */
!     if (cmdchar == '*')
! 	aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\");
!     else if (cmdchar == '#')
! 	aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\");
!     else if (cmdchar == 'K' && !kp_help)
! 	aux_ptr = (char_u *)" \t\\\"|!";
!     else
! 	/* Don't escape spaces and Tabs in a tag with a backslash */
! 	aux_ptr = (char_u *)"\\|\"";
! 
!     p = buf + STRLEN(buf);
!     while (n-- > 0)
!     {
! 	/* put a backslash before \ and some others */
! 	if (vim_strchr(aux_ptr, *ptr) != NULL)
! 	    *p++ = '\\';
! #ifdef FEAT_MBYTE
! 	/* When current byte is a part of multibyte character, copy all bytes
! 	 * of that character. */
! 	if (has_mbyte)
  	{
! 	    int i;
! 	    int len = (*mb_ptr2len)(ptr) - 1;
! 
! 	    for (i = 0; i < len && n >= 1; ++i, --n)
! 		*p++ = *ptr++;
  	}
  #endif
! 	*p++ = *ptr++;
      }
-     *p = NUL;
  
      /*
       * Execute the command.
--- 5516,5572 ----
      /*
       * Now grab the chars in the identifier
       */
!     if (cmdchar == 'K' && !kp_help)
!     {
! 	/* Escape the argument properly for a shell command */
! 	p = vim_strsave_shellescape(ptr, TRUE);
! 	if (p == NULL)
  	{
! 	    vim_free(buf);
! 	    return;
  	}
+ 	buf = (char_u *)vim_realloc(buf, STRLEN(buf) + STRLEN(p) + 1);
+ 	if (buf == NULL)
+ 	{
+ 	    vim_free(buf);
+ 	    vim_free(p);
+ 	    return;
+ 	}
+ 	STRCAT(buf, p);
+ 	vim_free(p);
+     }
+     else
+     {
+ 	if (cmdchar == '*')
+ 	    aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\");
+ 	else if (cmdchar == '#')
+ 	    aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\");
+ 	else
+ 	    /* Don't escape spaces and Tabs in a tag with a backslash */
+ 	    aux_ptr = (char_u *)"\\|\"\n*?[";
+ 
+ 	p = buf + STRLEN(buf);
+ 	while (n-- > 0)
+ 	{
+ 	    /* put a backslash before \ and some others */
+ 	    if (vim_strchr(aux_ptr, *ptr) != NULL)
+ 		*p++ = '\\';
+ #ifdef FEAT_MBYTE
+ 	    /* When current byte is a part of multibyte character, copy all
+ 	     * bytes of that character. */
+ 	    if (has_mbyte)
+ 	    {
+ 		int i;
+ 		int len = (*mb_ptr2len)(ptr) - 1;
+ 
+ 		for (i = 0; i < len && n >= 1; ++i, --n)
+ 		    *p++ = *ptr++;
+ 	    }
  #endif
! 	    *p++ = *ptr++;
! 	}
! 	*p = NUL;
      }
  
      /*
       * Execute the command.
*** ../vim-7.2.009/src/version.c	Mon Sep  1 17:56:05 2008
--- src/version.c	Sat Sep  6 16:26:42 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     10,
  /**/

-- 
Q. What happens to programmers when they die?
A: MS-Windows programmers are reinstalled.  C++ programmers become undefined,
   anyone who refers to them will die as well.  Java programmers reincarnate
   after being garbage collected.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Mon Sep  8 11:19:44 2008
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon,  8 Sep 2008 11:19:44 +0000 (UTC)
Subject: rpms/vim/devel 7.2.011,NONE,1.1
Message-ID: <20080908111944.06B8C70128@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23109

Added Files:
	7.2.011 
Log Message:
- patchlevel 011


--- NEW FILE 7.2.011 ---
To: vim-dev at vim.org
Subject: Patch 7.2.011
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.011
Problem:    Get an error when inserting a float value from the expression
	    register.
Solution:   Convert the Float to a String automatically in the same place
	    where a List would be converted to a String.
Files:	    src/eval.c


*** ../vim-7.2.010/src/eval.c	Mon Aug 25 04:48:21 2008
--- src/eval.c	Sun Sep  7 13:50:38 2008
***************
*** 1256,1278 ****
  
  /*
   * Top level evaluation function, returning a string.
   * Return pointer to allocated memory, or NULL for failure.
   */
      char_u *
! eval_to_string(arg, nextcmd, dolist)
      char_u	*arg;
      char_u	**nextcmd;
!     int		dolist;		/* turn List into sequence of lines */
  {
      typval_T	tv;
      char_u	*retval;
      garray_T	ga;
  
      if (eval0(arg, &tv, nextcmd, TRUE) == FAIL)
  	retval = NULL;
      else
      {
! 	if (dolist && tv.v_type == VAR_LIST)
  	{
  	    ga_init2(&ga, (int)sizeof(char), 80);
  	    if (tv.vval.v_list != NULL)
--- 1256,1281 ----
  
  /*
   * Top level evaluation function, returning a string.
+  * When "convert" is TRUE convert a List into a sequence of lines and convert
+  * a Float to a String.
   * Return pointer to allocated memory, or NULL for failure.
   */
      char_u *
! eval_to_string(arg, nextcmd, convert)
      char_u	*arg;
      char_u	**nextcmd;
!     int		convert;
  {
      typval_T	tv;
      char_u	*retval;
      garray_T	ga;
+     char_u	numbuf[NUMBUFLEN];
  
      if (eval0(arg, &tv, nextcmd, TRUE) == FAIL)
  	retval = NULL;
      else
      {
! 	if (convert && tv.v_type == VAR_LIST)
  	{
  	    ga_init2(&ga, (int)sizeof(char), 80);
  	    if (tv.vval.v_list != NULL)
***************
*** 1280,1285 ****
--- 1283,1295 ----
  	    ga_append(&ga, NUL);
  	    retval = (char_u *)ga.ga_data;
  	}
+ #ifdef FEAT_FLOAT
+ 	else if (convert && tv.v_type == VAR_FLOAT)
+ 	{
+ 	    vim_snprintf((char *)numbuf, NUMBUFLEN, "%g", tv.vval.v_float);
+ 	    retval = vim_strsave(numbuf);
+ 	}
+ #endif
  	else
  	    retval = vim_strsave(get_tv_string(&tv));
  	clear_tv(&tv);
*** ../vim-7.2.010/src/version.c	Sat Sep  6 16:44:06 2008
--- src/version.c	Sun Sep  7 13:52:00 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     11,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
34. You laugh at people with 14400 baud modems.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Mon Sep  8 11:20:35 2008
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon,  8 Sep 2008 11:20:35 +0000 (UTC)
Subject: rpms/vim/devel 7.2.012, NONE, 1.1 README.patches, 1.110,
	1.111 vim.spec, 1.218, 1.219
Message-ID: <20080908112035.D16B770128@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23259

Modified Files:
	README.patches vim.spec 
Added Files:
	7.2.012 
Log Message:
- patchlevel 012


--- NEW FILE 7.2.012 ---
To: vim-dev at vim.org
Subject: Patch 7.2.012
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.012
Problem:    Compiler warnings when building with startup timing.
Solution:   Add type casts.
Files:	    src/ex_cmds2.c


*** ../vim-7.2.011/src/ex_cmds2.c	Sun Jul 13 19:36:09 2008
--- src/ex_cmds2.c	Tue Sep  2 11:14:41 2008
***************
*** 3145,3152 ****
  	verbose_leave();
      }
  #ifdef STARTUPTIME
!     vim_snprintf(IObuff, IOSIZE, "sourcing %s", fname);
!     time_msg(IObuff, &tv_start);
      time_pop(&tv_rel);
  #endif
  
--- 3145,3152 ----
  	verbose_leave();
      }
  #ifdef STARTUPTIME
!     vim_snprintf((char *)IObuff, IOSIZE, "sourcing %s", fname);
!     time_msg((char *)IObuff, &tv_start);
      time_pop(&tv_rel);
  #endif
  
*** ../vim-7.2.011/src/version.c	Sun Sep  7 13:54:31 2008
--- src/version.c	Sun Sep  7 15:49:00 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     12,
  /**/

-- 
He who laughs last, thinks slowest.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


Index: README.patches
===================================================================
RCS file: /cvs/extras/rpms/vim/devel/README.patches,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- README.patches	25 Aug 2008 08:38:15 -0000	1.110
+++ README.patches	8 Sep 2008 11:20:05 -0000	1.111
@@ -29,5 +29,12 @@
   1462  7.2.002  leaking memory when displaying menus
   3663  7.2.003  typo in translated message, message not translated
   3413  7.2.004  Cscope help message is not translated
-  4638  7.2.005  profiling: Using pointer instead of value, allocating zero bytes, memory not freed
+  4638  7.2.005  a few problems when profiling
   1552  7.2.006  HTML files are not recognized by contents
+ 16735  7.2.007  (extra) minor issues for VMS
+  1947  7.2.008  wrong window count when using :bunload in a BufHidden autocmd
+  2245  7.2.009  can't compile with Perl 5.10 on MS-aindows
+  5415  7.2.010  "K" in Visual mode does not properly escape all characters
+  2873  7.2.011  error when inserting a float value from expression register
+  1444  7.2.012  compiler warnings when building with startup timing
+  4157  7.2.013  hang when waiting for X selection, consuming lots of CPU time


Index: vim.spec
===================================================================
RCS file: /cvs/extras/rpms/vim/devel/vim.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- vim.spec	25 Aug 2008 08:38:15 -0000	1.218
+++ vim.spec	8 Sep 2008 11:20:05 -0000	1.219
@@ -18,7 +18,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim72%{?beta}
-%define patchlevel 006
+%define patchlevel 012
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -62,6 +62,12 @@
 Patch004: 7.2.004
 Patch005: 7.2.005
 Patch006: 7.2.006
+Patch007: 7.2.007
+Patch008: 7.2.008
+Patch009: 7.2.009
+Patch010: 7.2.010
+Patch011: 7.2.011
+Patch012: 7.2.012
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -200,6 +206,12 @@
 %patch004 -p0
 %patch005 -p0
 %patch006 -p0
+%patch007 -p0
+%patch008 -p0
+%patch009 -p0
+%patch010 -p0
+%patch011 -p0
+%patch012 -p0
 
 # install spell files
 %if %{withvimspell}
@@ -618,6 +630,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Mon Sep 08 2008 Karsten Hopp <karsten at redhat.com> 7.2.012-1
+- patchlevel 12
+
 * Mon Aug 25 2008 Karsten Hopp <karsten at redhat.com> 7.2.006-1
 - patchlevel 6
 



From karsten at fedoraproject.org  Mon Sep  8 11:23:32 2008
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon,  8 Sep 2008 11:23:32 +0000 (UTC)
Subject: rpms/vim/devel 7.2.013,NONE,1.1 vim.spec,1.219,1.220
Message-ID: <20080908112332.EEB4A70128@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24408

Modified Files:
	vim.spec 
Added Files:
	7.2.013 
Log Message:
- patchlevel 013


--- NEW FILE 7.2.013 ---
To: vim-dev at vim.org
Subject: Patch 7.2.013
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.013
Problem:    While waiting for the X selection Vim consumes a lot of CPU time
	    and hangs until a response is received.
Solution:   Sleep a bit when the selection event hasn't been received yet.
	    Time out after a couple of seconds to avoid a hang when the
	    selection owner isn't responding.
Files:	    src/ui.c


*** ../vim-7.2.012/src/ui.c	Mon Jul 14 21:47:49 2008
--- src/ui.c	Sun Sep  7 16:54:35 2008
***************
*** 2110,2115 ****
--- 2110,2117 ----
      int		i;
      int		nbytes = 0;
      char_u	*buffer;
+     time_t	start_time;
+     int		timed_out = FALSE;
  
      for (i =
  #ifdef FEAT_MBYTE
***************
*** 2129,2134 ****
--- 2131,2137 ----
  	    case 3:  type = text_atom;		break;
  	    default: type = XA_STRING;
  	}
+ 	success = FALSE;
  	XtGetSelectionValue(myShell, cbd->sel_atom, type,
  	    clip_x11_request_selection_cb, (XtPointer)&success, CurrentTime);
  
***************
*** 2141,2167 ****
  	 * characters, then they will appear before the one that requested the
  	 * paste!  Don't worry, we will catch up with any other events later.
  	 */
  	for (;;)
  	{
  	    if (XCheckTypedEvent(dpy, SelectionNotify, &event))
  		break;
  	    if (XCheckTypedEvent(dpy, SelectionRequest, &event))
  		/* We may get a SelectionRequest here and if we don't handle
  		 * it we hang.  KDE klipper does this, for example. */
  		XtDispatchEvent(&event);
  
  	    /* Do we need this?  Probably not. */
  	    XSync(dpy, False);
  
! 	    /* Bernhard Walle solved a slow paste response in an X terminal by
! 	     * adding: usleep(10000); here. */
  	}
  
- 	/* this is where clip_x11_request_selection_cb() is actually called */
- 	XtDispatchEvent(&event);
- 
  	if (success)
  	    return;
      }
  
      /* Final fallback position - use the X CUT_BUFFER0 store */
--- 2144,2189 ----
  	 * characters, then they will appear before the one that requested the
  	 * paste!  Don't worry, we will catch up with any other events later.
  	 */
+ 	start_time = time(NULL);
  	for (;;)
  	{
  	    if (XCheckTypedEvent(dpy, SelectionNotify, &event))
+ 	    {
+ 		/* this is where clip_x11_request_selection_cb() is actually
+ 		 * called */
+ 		XtDispatchEvent(&event);
  		break;
+ 	    }
  	    if (XCheckTypedEvent(dpy, SelectionRequest, &event))
  		/* We may get a SelectionRequest here and if we don't handle
  		 * it we hang.  KDE klipper does this, for example. */
  		XtDispatchEvent(&event);
  
+ 	    /* Time out after 2 to 3 seconds to avoid that we hang when the
+ 	     * other process doesn't respond.  Note that the SelectionNotify
+ 	     * event may still come later when the selection owner comes back
+ 	     * to life and the text gets inserted unexpectedly (by xterm).
+ 	     * Don't know how to avoid that :-(. */
+ 	    if (time(NULL) > start_time + 2)
+ 	    {
+ 		timed_out = TRUE;
+ 		break;
+ 	    }
+ 
  	    /* Do we need this?  Probably not. */
  	    XSync(dpy, False);
  
! 	    /* Wait for 1 msec to avoid that we eat up all CPU time. */
! 	    ui_delay(1L, TRUE);
  	}
  
  	if (success)
  	    return;
+ 
+ 	/* don't do a retry with another type after timing out, otherwise we
+ 	 * hang for 15 seconds. */
+ 	if (timed_out)
+ 	    break;
      }
  
      /* Final fallback position - use the X CUT_BUFFER0 store */
*** ../vim-7.2.012/src/version.c	Sun Sep  7 15:49:45 2008
--- src/version.c	Sun Sep  7 21:45:55 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     13,
  /**/

-- 
The users that I support would double-click on a landmine to find out
what happens.				-- A system administrator

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


Index: vim.spec
===================================================================
RCS file: /cvs/extras/rpms/vim/devel/vim.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- vim.spec	8 Sep 2008 11:20:05 -0000	1.219
+++ vim.spec	8 Sep 2008 11:23:02 -0000	1.220
@@ -18,7 +18,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim72%{?beta}
-%define patchlevel 012
+%define patchlevel 013
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -68,6 +68,7 @@
 Patch010: 7.2.010
 Patch011: 7.2.011
 Patch012: 7.2.012
+Patch013: 7.2.013
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -212,6 +213,7 @@
 %patch010 -p0
 %patch011 -p0
 %patch012 -p0
+%patch013 -p0
 
 # install spell files
 %if %{withvimspell}
@@ -630,8 +632,8 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
-* Mon Sep 08 2008 Karsten Hopp <karsten at redhat.com> 7.2.012-1
-- patchlevel 12
+* Mon Sep 08 2008 Karsten Hopp <karsten at redhat.com> 7.2.013-1
+- patchlevel 13
 
 * Mon Aug 25 2008 Karsten Hopp <karsten at redhat.com> 7.2.006-1
 - patchlevel 6



From rhughes at fedoraproject.org  Mon Sep  8 11:23:29 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  8 Sep 2008 11:23:29 +0000 (UTC)
Subject: rpms/PackageKit/devel PackageKit.spec,1.46,1.47
Message-ID: <20080908112329.9E2DE70128@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24356

Modified Files:
	PackageKit.spec 
Log Message:
* Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.1-4
- Split out a -docs subpackage, which shaves of 324Kb of docs from
  the main package



Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- PackageKit.spec	28 Aug 2008 08:12:00 -0000	1.46
+++ PackageKit.spec	8 Sep 2008 11:22:59 -0000	1.47
@@ -8,7 +8,7 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.1
-Release:   3%{?dist}
+Release:   4%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -49,11 +49,19 @@
 BuildRequires: xulrunner-devel
 BuildRequires: libarchive-devel
 
-%description 
+%description
 PackageKit is a D-Bus abstraction layer that allows the session user
 to manage packages in a secure way using a cross-distro,
 cross-architecture API.
 
+%package docs
+Summary: Documentation for PackageKit
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description docs
+API docs for PackageKit.
+
 %package -n udev-packagekit
 Summary: Tell PackageKit to install firmware that udev requires
 Group: System Environment/Base
@@ -157,7 +165,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README AUTHORS NEWS COPYING 
+%doc README AUTHORS NEWS COPYING
 %dir %{_datadir}/PackageKit
 %dir %{_datadir}/PackageKit/helpers
 %dir %{_sysconfdir}/PackageKit
@@ -171,7 +179,6 @@
 %config %{_sysconfdir}/dbus-1/system.d/*
 %{_datadir}/PackageKit/helpers/*
 %{_datadir}/man/man1/*.1.gz
-%{_datadir}/gtk-doc/html/PackageKit
 %{_datadir}/PolicyKit/policy/*.policy
 %{_datadir}/mime/packages/packagekit-*.xml
 %{_sbindir}/packagekitd
@@ -189,6 +196,11 @@
 %{_libdir}/pm-utils/sleep.d/95packagekit
 %{_libexecdir}/*py*
 
+%files docs
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_datadir}/gtk-doc/html/PackageKit
+
 %files -n yum-packagekit
 %defattr(-, root, root)
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/refresh-packagekit.conf
@@ -201,7 +213,7 @@
 
 %files libs
 %defattr(-,root,root,-)
-%doc README AUTHORS NEWS COPYING 
+%doc README AUTHORS NEWS COPYING
 %dir %{_libdir}/packagekit-backend
 %{_libdir}/*packagekit*.so.*
 %{_libdir}/packagekit-backend/*.so
@@ -224,6 +236,10 @@
 %{_includedir}/*
 
 %changelog
+* Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.1-4
+- Split out a -docs subpackage, which shaves of 324Kb of docs from
+  the main package
+
 * Thu Aug 28 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.1-3
 - The browser plugin file list was misordered in the merge, resulting
   in empty PackageKit-devel package.



From mbarnes at fedoraproject.org  Mon Sep  8 11:24:19 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon,  8 Sep 2008 11:24:19 +0000 (UTC)
Subject: rpms/evolution-data-server/devel .cvsignore, 1.92,
	1.93 evolution-data-server.spec, 1.233, 1.234 sources, 1.92,
	1.93 evolution-data-server-2.23.91-compiler-warnings.patch, 1.1, NONE
Message-ID: <20080908112419.6E38C70128@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-serv24576

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Removed Files:
	evolution-data-server-2.23.91-compiler-warnings.patch 
Log Message:

* Mon Sep 08 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.92-1.fc10
- Update to 2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- .cvsignore	1 Sep 2008 13:12:53 -0000	1.92
+++ .cvsignore	8 Sep 2008 11:23:48 -0000	1.93
@@ -1 +1 @@
-evolution-data-server-2.23.91.tar.bz2
+evolution-data-server-2.23.92.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- evolution-data-server.spec	1 Sep 2008 13:12:53 -0000	1.233
+++ evolution-data-server.spec	8 Sep 2008 11:23:49 -0000	1.234
@@ -28,7 +28,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.23.91
+Version: 2.23.92
 Release: 1%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
@@ -51,8 +51,6 @@
 # RH bug #243296
 Patch13: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
-Patch14: evolution-data-server-2.23.91-compiler-warnings.patch
-
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -131,7 +129,6 @@
 %patch11 -p1 -b .fix-ldap-query
 %patch12 -p1 -b .camel-folder-summary-crash
 %patch13 -p1 -b .fix-64bit-acinclude
-%patch14 -p1 -b .compiler-warnings
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -377,6 +374,9 @@
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Sep 08 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.92-1.fc10
+- Update to 2.23.92
+
 * Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.91-1.fc10
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- sources	1 Sep 2008 13:12:53 -0000	1.92
+++ sources	8 Sep 2008 11:23:49 -0000	1.93
@@ -1 +1 @@
-c5c7dc31421f33f6665e66661599cae0  evolution-data-server-2.23.91.tar.bz2
+f534bd9b2111efb76d95e3b625273851  evolution-data-server-2.23.92.tar.bz2


--- evolution-data-server-2.23.91-compiler-warnings.patch DELETED ---



From rhughes at fedoraproject.org  Mon Sep  8 11:24:42 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  8 Sep 2008 11:24:42 +0000 (UTC)
Subject: rpms/PackageKit/devel PackageKit.spec,1.47,1.48
Message-ID: <20080908112442.5E4C570128@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24861

Modified Files:
	PackageKit.spec 
Log Message:
* Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.1-5
- Don't explicitly BR libarchive to silence rpmlint



Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- PackageKit.spec	8 Sep 2008 11:22:59 -0000	1.47
+++ PackageKit.spec	8 Sep 2008 11:24:12 -0000	1.48
@@ -8,7 +8,7 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.1
-Release:   4%{?dist}
+Release:   5%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -25,7 +25,6 @@
 Requires: PackageKit-libs = %{version}-%{release}
 Requires: yum-packagekit = %{version}-%{release}
 Requires: yum >= 3.2.6
-Requires: libarchive
 Requires: shared-mime-info
 Requires: python-sqlite2
 
@@ -236,6 +235,9 @@
 %{_includedir}/*
 
 %changelog
+* Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.1-5
+- Don't explicitly BR libarchive to silence rpmlint
+
 * Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.1-4
 - Split out a -docs subpackage, which shaves of 324Kb of docs from
   the main package



From rhughes at fedoraproject.org  Mon Sep  8 11:28:38 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  8 Sep 2008 11:28:38 +0000 (UTC)
Subject: rpms/PackageKit/devel PackageKit.spec,1.48,1.49
Message-ID: <20080908112838.5458970128@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26358

Modified Files:
	PackageKit.spec 
Log Message:
* Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.1-6
- Own /var/cache/PackageKit and /var/cache/PackageKit/downloads
- Fix up some other rpmlint warnings for docs and config(noreplace)



Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- PackageKit.spec	8 Sep 2008 11:24:12 -0000	1.48
+++ PackageKit.spec	8 Sep 2008 11:28:08 -0000	1.49
@@ -8,7 +8,7 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.1
-Release:   5%{?dist}
+Release:   6%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -171,6 +171,8 @@
 %dir %{_localstatedir}/lib/PackageKit
 %dir %{python_sitelib}/packagekit
 %dir %{_localstatedir}/run/PackageKit
+%dir %{_localstatedir}/cache/PackageKit
+%dir %{_localstatedir}/cache/PackageKit/downloads
 %{python_sitelib}/packagekit/*py*
 %dir %{_sysconfdir}/bash_completion.d
 %config %{_sysconfdir}/bash_completion.d/pk-completion.bash
@@ -202,11 +204,13 @@
 
 %files -n yum-packagekit
 %defattr(-, root, root)
+%doc README AUTHORS NEWS COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/refresh-packagekit.conf
 /usr/lib/yum-plugins/refresh-packagekit.*
 
 %files -n udev-packagekit
 %defattr(-, root, root)
+%doc README AUTHORS NEWS COPYING
 %{_sysconfdir}/udev/rules.d/*.rules
 /lib/udev/*.sh
 
@@ -219,22 +223,29 @@
 
 %files cron
 %defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
 %config %{_sysconfdir}/cron.daily/packagekit-background.cron
-%config %{_sysconfdir}/sysconfig/packagekit-background
+%config(noreplace) %{_sysconfdir}/sysconfig/packagekit-background
 
 %files browser-plugin
 %defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
 %dir %{_libdir}/mozilla
 %dir %{_libdir}/mozilla/plugins
 %{_libdir}/mozilla/plugins/packagekit-plugin.so
 
 %files devel
 %defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
 
 %changelog
+* Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.1-6
+- Own /var/cache/PackageKit and /var/cache/PackageKit/downloads
+- Fix up some other rpmlint warnings for docs and config(noreplace)
+
 * Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.1-5
 - Don't explicitly BR libarchive to silence rpmlint
 



From awjb at fedoraproject.org  Mon Sep  8 11:34:19 2008
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon,  8 Sep 2008 11:34:19 +0000 (UTC)
Subject: rpms/claws-mail/devel .cvsignore, 1.19, 1.20 claws-mail.spec, 1.36, 
	1.37 sources, 1.19, 1.20
Message-ID: <20080908113419.7564570128@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28589

Modified Files:
	.cvsignore claws-mail.spec sources 
Log Message:
- upgrade to latest cvs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	30 Jun 2008 20:54:14 -0000	1.19
+++ .cvsignore	8 Sep 2008 11:33:49 -0000	1.20
@@ -1 +1 @@
-claws-mail-3.5.0.tar.bz2
+claws-mail-3.5.0cvs92.tar.bz2


Index: claws-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/devel/claws-mail.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- claws-mail.spec	9 Jul 2008 21:11:00 -0000	1.36
+++ claws-mail.spec	8 Sep 2008 11:33:49 -0000	1.37
@@ -1,11 +1,11 @@
 Name:           claws-mail
-Version:        3.5.0
-Release:        2%{?dist}
+Version:        3.5.1
+Release:        0.1.92cvs%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPLv3+
 URL:            http://claws-mail.org
-Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-3.5.0.tar.bz2
+Source0:        http://www.claws-mail.org/snapshots/claws-mail-3.5.0cvs92.tar.bz2
 Source1:        claws-mail.desktop
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -23,7 +23,7 @@
 BuildRequires:  desktop-file-utils startup-notification-devel
 BuildRequires:  pkgconfig
 BuildRequires:  gettext-devel
-BuildRequires:  libetpan-devel >= 0.51
+BuildRequires:  libetpan-devel >= 0.55
 BuildRequires:  compface-devel
 BuildRequires:  perl
 BuildRequires:  libtool
@@ -101,7 +101,7 @@
 %{summary}
 
 %prep
-%setup -q
+%setup -q -n %{name}-3.5.0cvs92
 
 %build
 %configure --enable-openssl --enable-ipv6 \
@@ -141,8 +141,8 @@
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
-%{__install} %{_builddir}/%{name}-%{version}/claws-mail.png \
-${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
+%{__install} %{_builddir}/%{name}-3.5.0cvs92/*.png \
+${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
 
 # we include the manual in the doc section
 %{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/claws-mail


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	30 Jun 2008 20:54:14 -0000	1.19
+++ sources	8 Sep 2008 11:33:49 -0000	1.20
@@ -1 +1 @@
-597a9a0b9d113325de6fd01500c0af98  claws-mail-3.5.0.tar.bz2
+875f613cf327e2dbd2424772a2f4526f  claws-mail-3.5.0cvs92.tar.bz2



From hadess at fedoraproject.org  Mon Sep  8 11:48:13 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  8 Sep 2008 11:48:13 +0000 (UTC)
Subject: rpms/sound-juicer/devel .cvsignore, 1.47, 1.48 sound-juicer.spec,
	1.101, 1.102 sources, 1.49, 1.50
Message-ID: <20080908114814.0852B70128@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/sound-juicer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1797

Modified Files:
	.cvsignore sound-juicer.spec sources 
Log Message:
* Mon Sep 08 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.3-1
- Update to 2.23.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	23 Aug 2008 00:31:10 -0000	1.47
+++ .cvsignore	8 Sep 2008 11:47:43 -0000	1.48
@@ -1 +1 @@
-sound-juicer-2.23.2.tar.bz2
+sound-juicer-2.23.3.tar.bz2


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- sound-juicer.spec	23 Aug 2008 00:31:10 -0000	1.101
+++ sound-juicer.spec	8 Sep 2008 11:47:43 -0000	1.102
@@ -11,7 +11,7 @@
 
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
-Version:	2.23.2
+Version:	2.23.3
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
@@ -119,6 +119,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Sep 08 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.3-1
+- Update to 2.23.3
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.2-1
 - Update to 2.23.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	23 Aug 2008 00:31:10 -0000	1.49
+++ sources	8 Sep 2008 11:47:43 -0000	1.50
@@ -1 +1 @@
-bc44327beb59c13e6c3c2c2f6ac03420  sound-juicer-2.23.2.tar.bz2
+5507bcdc6051d520c6a7aa150c2f48ba  sound-juicer-2.23.3.tar.bz2



From rdieter at fedoraproject.org  Mon Sep  8 11:57:22 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  8 Sep 2008 11:57:22 +0000 (UTC)
Subject: rpms/gc/devel gc-7.1-dont_add_byte.patch, NONE, 1.1 gc.spec, 1.32,
	1.33
Message-ID: <20080908115722.3046670128@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/gc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5201

Modified Files:
	gc.spec 
Added Files:
	gc-7.1-dont_add_byte.patch 
Log Message:
* Mon Sep 08 2008 Rex Dieter <rdieter at fedoraproject.org> 7.1-3
- upstream DONT_ADD_BYTE_AT_END patch
- spec cosmetics


gc-7.1-dont_add_byte.patch:

--- NEW FILE gc-7.1-dont_add_byte.patch ---
diff -up gc-7.1/thread_local_alloc.c.dont_add_byte gc-7.1/thread_local_alloc.c
--- gc-7.1/thread_local_alloc.c.dont_add_byte	2007-10-24 19:22:37.000000000 -0500
+++ gc-7.1/thread_local_alloc.c	2008-09-08 06:53:20.000000000 -0500
@@ -291,14 +291,16 @@ void GC_mark_thread_local_fls_for(GC_tlf
     ptr_t q;
     int j;
     
-    for (j = 1; j < TINY_FREELISTS; ++j) {
+    for (j = 0; j < TINY_FREELISTS; ++j) {
       q = p -> ptrfree_freelists[j];
       if ((word)q > HBLKSIZE) GC_set_fl_marks(q);
       q = p -> normal_freelists[j];
       if ((word)q > HBLKSIZE) GC_set_fl_marks(q);
 #     ifdef GC_GCJ_SUPPORT
-        q = p -> gcj_freelists[j];
-        if ((word)q > HBLKSIZE) GC_set_fl_marks(q);
+      if (j > 0) {
+         q = p -> gcj_freelists[j];
+         if ((word)q > HBLKSIZE) GC_set_fl_marks(q);
+      }
 #     endif /* GC_GCJ_SUPPORT */
     }
 }


Index: gc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gc/devel/gc.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gc.spec	13 Jul 2008 00:27:02 -0000	1.32
+++ gc.spec	8 Sep 2008 11:56:51 -0000	1.33
@@ -10,7 +10,11 @@
 Source0: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# To be more backward-compatible abi-wise, TODO: upstream ml reference
 Patch1: gc-7.0-gcinit.patch
+## upstream patches
+# http://www.hpl.hp.com/hosted/linux/mail-archives/gc/2008-May/002206.html
+Patch100: gc-7.1-dont_add_byte.patch
 
 BuildRequires: automake libtool 
 
@@ -41,6 +45,8 @@
 %patch1 -p1 -b .gcinit
 %endif
 
+%patch100 -p1 -b .dont_add_byte
+
 # refresh auto*/libtool to purge rpaths
 rm -f libtool libtool.m4
 libtoolize --force
@@ -63,15 +69,15 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT 
+make install DESTDIR=%{buildroot} 
 
-install -p -D -m644 doc/gc.man	$RPM_BUILD_ROOT%{_mandir}/man3/gc.3
+install -p -D -m644 doc/gc.man	%{buildroot}%{_mandir}/man3/gc.3
 
 ## Unpackaged files
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gc
-rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -rf %{buildroot}%{_datadir}/gc
+rm -f  %{buildroot}%{_libdir}/lib*.la
 
 
 %check
@@ -79,7 +85,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post   -p /sbin/ldconfig
@@ -105,6 +111,10 @@
 
 
 %changelog
+* Mon Sep 08 2008 Rex Dieter <rdieter at fedoraproject.org> 7.1-3
+- upstream DONT_ADD_BYTE_AT_END patch
+- spec cosmetics
+
 * Sat Jul 12 2008 Rex Dieter <rdieter at fedoraproject.org> 7.1-2
 - --enable-large-config (#453972)
 



From limb at fedoraproject.org  Mon Sep  8 12:02:05 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon,  8 Sep 2008 12:02:05 +0000 (UTC)
Subject: rpms/gnubg/devel gnubg-0.9.0-1-neuralnet-arch.patch,1.1,1.2
Message-ID: <20080908120205.7CED570128@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gnubg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6715

Modified Files:
	gnubg-0.9.0-1-neuralnet-arch.patch 
Log Message:
If at first you don't succeed. . .buy me a ppc host to test on? ;)


gnubg-0.9.0-1-neuralnet-arch.patch:

Index: gnubg-0.9.0-1-neuralnet-arch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnubg/devel/gnubg-0.9.0-1-neuralnet-arch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnubg-0.9.0-1-neuralnet-arch.patch	5 Sep 2008 19:46:34 -0000	1.1
+++ gnubg-0.9.0-1-neuralnet-arch.patch	8 Sep 2008 12:01:35 -0000	1.2
@@ -1,11 +1,98 @@
---- lib/neuralnet.c	2008-09-05 14:20:49.000000000 -0500
-+++ lib/neuralnet.c	2008-09-05 14:20:49.000000000 -0500
-@@ -613,7 +613,7 @@
+--- lib/neuralnet.c	2007-12-19 00:20:04.000000000 -0600
++++ lib/neuralnet.c	2008-09-05 15:24:09.000000000 -0500
+@@ -611,15 +611,16 @@
+     
+     return 0;
  }
++/*
  #if USE_SSE_VECTORIZE
  
--#if defined(_MSC_VER) || defined(DISABLE_SSE_TEST) || __x86_64
-+#if defined(_MSC_VER) || defined(DISABLE_SSE_TEST) || __x86_64 || __ppc || __ppc64
- 
+ #if defined(_MSC_VER) || defined(DISABLE_SSE_TEST) || __x86_64
+-
++*/
  int SSE_Supported()
  {
+ 	return 1;
+ }
+-
++/*
+ #else
+ 
+ static int CheckSSE(void)
+@@ -636,7 +637,9 @@
+ #else
+ 
+ 	asm (
++*/	
+ 		/* Check if cpuid is supported (can bit 21 of flags be changed) */
++/*
+ 		"mov $1, %%eax\n\t"
+ 		"shl $21, %%eax\n\t"
+ 		"mov %%eax, %%edx\n\t"
+@@ -653,33 +656,45 @@
+ 		"xor %%ecx, %%eax\n\t"
+ 		"test %%edx, %%eax\n\t"
+ 		"jnz 1f\n\t"
++*/		
+ 		/* Failed (non-pentium compatible machine) */
++/*
+ 		"mov $-1, %%ebx\n\t"
+ 		"jp 4f\n\t"
+ 
+ "1:"
++*/
+ 		/* Check feature test is supported */
++/*
+ 		"mov $0, %%eax\n\t"
+ 		"cpuid\n\t"
+ 		"cmp $1, %%eax\n\t"
+ 		"jge 2f\n\t"
++*/		
+ 		/* Unlucky - somehow cpuid 1 isn't supported */
++/*
+ 		"mov $-2, %%ebx\n\t"
+ 		"jp 4f\n\t"
+ 
+ "2:"
++*/
+ 		/* Check if sse is supported (bit 25 in edx from cpuid 1) */
++/*
+ 		"mov $1, %%eax\n\t"
+ 		"cpuid\n\t"
+ 		"mov $1, %%eax\n\t"
+ 		"shl $25, %%eax\n\t"
+ 		"test %%eax, %%edx\n\t"
+ 		"jnz 3f\n\t"
++*/		
+ 		/* Not supported */
++/*
+ 		"mov $0, %%ebx\n\t"
+ 		"jp 4f\n\t"
+ "3:"
++*/
+ 		/* Supported */
++/*		
+ 		"mov $1, %%ebx\n\t"
+ "4:"
+ 
+@@ -695,10 +710,14 @@
+ 		printf("No sse cpuid check available\n");
+ 		break;
+ 	case 0:
++*/	
+ 		/* No SSE support */
++/*
+ 		break;
+ 	case 1:
++*/	
+ 		/* SSE support */
++/*
+ 		return 1;
+ 	default:
+ 		printf("Unknown return testing for SSE\n");
+@@ -719,3 +738,4 @@
+ 
+ #endif
+ #endif
++*/
+\ No newline at end of file



From rdieter at fedoraproject.org  Mon Sep  8 12:14:57 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  8 Sep 2008 12:14:57 +0000 (UTC)
Subject: rpms/gc/devel gc.spec,1.33,1.34
Message-ID: <20080908121457.BAA5870128@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/gc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11063

Modified Files:
	gc.spec 
Log Message:
release++



Index: gc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gc/devel/gc.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gc.spec	8 Sep 2008 11:56:51 -0000	1.33
+++ gc.spec	8 Sep 2008 12:14:27 -0000	1.34
@@ -3,7 +3,7 @@
 Name:    gc	
 Version: 7.1
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	



From rhughes at fedoraproject.org  Mon Sep  8 12:29:50 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  8 Sep 2008 12:29:50 +0000 (UTC)
Subject: rpms/PackageKit/devel PackageKit.spec,1.49,1.50
Message-ID: <20080908122951.1514970128@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15738

Modified Files:
	PackageKit.spec 
Log Message:
* Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.1-7
- Enable the smart backend as it's nearly as complete as the yum backend
- Disable the yum2 backend (0.3.2 will have a dispatcher instead)
- Add subpackages yum and smart, and pull the former in as a dep by default



Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- PackageKit.spec	8 Sep 2008 11:28:08 -0000	1.49
+++ PackageKit.spec	8 Sep 2008 12:29:19 -0000	1.50
@@ -8,7 +8,7 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.1
-Release:   6%{?dist}
+Release:   7%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -24,7 +24,7 @@
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-libs = %{version}-%{release}
 Requires: yum-packagekit = %{version}-%{release}
-Requires: yum >= 3.2.6
+Requires: PackageKit-yum = %{version}-%{release}
 Requires: shared-mime-info
 Requires: python-sqlite2
 
@@ -53,6 +53,24 @@
 to manage packages in a secure way using a cross-distro,
 cross-architecture API.
 
+%package yum
+Summary: PackageKit YUM backend
+Group: System Environment/Libraries
+Requires: yum >= 3.2.6
+Requires: %{name} = %{version}-%{release}
+
+%description yum
+A backend for PackageKit to enable yum functionality.
+
+%package smart
+Summary: PackageKit SMART backend
+Group: System Environment/Libraries
+Requires: smart
+Requires: %{name} = %{version}-%{release}
+
+%description smart
+A backend for PackageKit to enable SMART functionality.
+
 %package docs
 Summary: Documentation for PackageKit
 Group: Development/Libraries
@@ -129,7 +147,7 @@
 %patch1 -p1
 
 %build
-%configure --enable-yum --enable-yum2 --with-default-backend=yum --disable-local
+%configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
 
 make %{?_smp_mflags}
 
@@ -143,8 +161,6 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/packagekit-plugin.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/packagekit-plugin.la
-
-chmod 755 $RPM_BUILD_ROOT%{_libexecdir}/yumDBUSBackend.py
 chmod 755 $RPM_BUILD_ROOT%{_libexecdir}/PackageKitDbusTest.py
 
 %find_lang %name
@@ -178,7 +194,8 @@
 %config %{_sysconfdir}/bash_completion.d/pk-completion.bash
 %config(noreplace) %{_sysconfdir}/PackageKit/PackageKit.conf
 %config %{_sysconfdir}/dbus-1/system.d/*
-%{_datadir}/PackageKit/helpers/*
+%dir %{_datadir}/PackageKit/helpers/test_spawn
+%{_datadir}/PackageKit/helpers/test_spawn/*
 %{_datadir}/man/man1/*.1.gz
 %{_datadir}/PolicyKit/policy/*.policy
 %{_datadir}/mime/packages/packagekit-*.xml
@@ -190,7 +207,8 @@
 %{_libexecdir}/pk-import-*
 %{_libexecdir}/pk-generate-*
 %exclude %{_libdir}/libpackagekit*.so.*
-%exclude %{_libdir}/packagekit-backend/*.so
+%{_libdir}/packagekit-backend/libpk_backend_dummy.so
+%{_libdir}/packagekit-backend/libpk_backend_test_*.so
 %ghost %verify(not md5 size mtime) %{_localstatedir}/lib/PackageKit/transactions.db
 %ghost %verify(not md5 size mtime) %{_localstatedir}/run/PackageKit/job_count.dat
 %{_datadir}/dbus-1/system-services/*.service
@@ -202,6 +220,20 @@
 %doc README AUTHORS NEWS COPYING
 %{_datadir}/gtk-doc/html/PackageKit
 
+%files smart
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_libdir}/packagekit-backend/libpk_backend_smart.so
+%dir %{_datadir}/PackageKit/helpers/smart
+%{_datadir}/PackageKit/helpers/smart/*
+
+%files yum
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_libdir}/packagekit-backend/libpk_backend_yum.so
+%dir %{_datadir}/PackageKit/helpers/yum
+%{_datadir}/PackageKit/helpers/yum/*
+
 %files -n yum-packagekit
 %defattr(-, root, root)
 %doc README AUTHORS NEWS COPYING
@@ -219,7 +251,6 @@
 %doc README AUTHORS NEWS COPYING
 %dir %{_libdir}/packagekit-backend
 %{_libdir}/*packagekit*.so.*
-%{_libdir}/packagekit-backend/*.so
 
 %files cron
 %defattr(-,root,root,-)
@@ -242,6 +273,11 @@
 %{_includedir}/*
 
 %changelog
+* Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.1-7
+- Enable the smart backend as it's nearly as complete as the yum backend
+- Disable the yum2 backend (0.3.2 will have a dispatcher instead)
+- Add subpackages yum and smart, and pull the former in as a dep by default
+
 * Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.1-6
 - Own /var/cache/PackageKit and /var/cache/PackageKit/downloads
 - Fix up some other rpmlint warnings for docs and config(noreplace)



From berrange at fedoraproject.org  Mon Sep  8 12:32:43 2008
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Mon,  8 Sep 2008 12:32:43 +0000 (UTC)
Subject: rpms/gtk-vnc/F-9 gtk-vnc.spec,1.18,1.19 sources,1.8,1.9
Message-ID: <20080908123243.C82EB70128@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/gtk-vnc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16745

Modified Files:
	gtk-vnc.spec sources 
Log Message:
Update to gtk-vnc 0.3.7 to fix crash (rhbz #461359)


Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-9/gtk-vnc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gtk-vnc.spec	28 Aug 2008 21:51:08 -0000	1.18
+++ gtk-vnc.spec	8 Sep 2008 12:32:13 -0000	1.19
@@ -6,8 +6,8 @@
 
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
-Version: 0.3.6
-Release: 2%{?dist}
+Version: 0.3.7
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -122,6 +122,9 @@
 %endif
 
 %changelog
+* Mon Sep  8 2008 Daniel P. Berrange <berrange at redhat.com> - 0.3.7-1.fc9
+- Update to 0.3.7 release for crash fix (rhbz #461359)
+
 * Thu Aug 28 2008 Daniel P. Berrange <berrange at redhat.com> - 0.3.6-2.fc9
 - Fix key/mouse event propagation (rhbz #454627)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Jun 2008 21:39:14 -0000	1.8
+++ sources	8 Sep 2008 12:32:13 -0000	1.9
@@ -1 +1 @@
-64650dff4850e1ca3158a3288c0e6c86  gtk-vnc-0.3.6.tar.gz
+41c613be4b554b71d63d30f844d60add  gtk-vnc-0.3.7.tar.gz



From lucilanga at fedoraproject.org  Mon Sep  8 12:33:43 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon,  8 Sep 2008 12:33:43 +0000 (UTC)
Subject: rpms/xastir/devel xastir-1.9.4-libdir.patch, 1.2, 1.3 xastir.spec,
	1.9, 1.10
Message-ID: <20080908123343.9A3F370128@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17285

Modified Files:
	xastir-1.9.4-libdir.patch xastir.spec 
Log Message:
* Mon Sep 08 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.4-2
- update Build requires

xastir-1.9.4-libdir.patch:

Index: xastir-1.9.4-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir-1.9.4-libdir.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xastir-1.9.4-libdir.patch	7 Sep 2008 18:55:45 -0000	1.2
+++ xastir-1.9.4-libdir.patch	8 Sep 2008 12:33:43 -0000	1.3
@@ -1,14 +1,14 @@
---- xastir-1.9.4/scripts/Makefile.am	2007-01-03 21:40:49.000000000 +0200
-+++ xastir-1.9.4-mod/scripts/Makefile.am	2008-05-16 08:05:53.000000000 +0300
+--- xastir-1.9.4/scripts/Makefile.am	2008-06-24 18:48:59.000000000 +0300
++++ xastir-1.9.4-mod/scripts/Makefile.am	2008-09-08 11:59:39.000000000 +0300
 @@ -3,7 +3,7 @@
- # Copyright (C) 2000-2007  The Xastir Group
+ # Copyright (C) 2000-2008  The Xastir Group
  #
  
 -pkglib_SCRIPTS = \
 +pkgdata_SCRIPTS = \
      Coordinate.pm \
      coord-convert.pl \
-     fcc-get \
+     get-fcc-rac.pl \
 @@ -34,7 +34,7 @@
      Xastir_tigerpoly.py
  


Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xastir.spec	7 Sep 2008 18:37:43 -0000	1.9
+++ xastir.spec	8 Sep 2008 12:33:43 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Amateur Station Tracking and Reporting system for amateur radio
 Name:    xastir
 Version: 1.9.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:   Applications/Internet
 Source0: http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
@@ -14,7 +14,7 @@
 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
+BuildRequires: desktop-file-utils, xorg-x11-utils
 
 %description
 Xastir is a graphical application that interfaces HAM radio
@@ -88,6 +88,9 @@
 %doc README.MAPS README.win32 UPGRADE
 
 %changelog
+* Mon Sep 08 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.4-2
+- update Build requires
+
 * Sun Sep 07 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.4-1
 - new upstream 1.9.4
 - drop wget and IM patch (fixed upstream)



From mbarnes at fedoraproject.org  Mon Sep  8 12:42:21 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon,  8 Sep 2008 12:42:21 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.97, 1.98 evolution.spec, 1.353, 
	1.354 sources, 1.97, 1.98
Message-ID: <20080908124221.5874570128@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20423

Modified Files:
	.cvsignore evolution.spec sources 
Log Message:

* Mon Sep 08 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.92-1.fc10
- Update to 2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- .cvsignore	1 Sep 2008 13:30:13 -0000	1.97
+++ .cvsignore	8 Sep 2008 12:41:50 -0000	1.98
@@ -1 +1 @@
-evolution-2.23.91.tar.bz2
+evolution-2.23.92.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- evolution.spec	1 Sep 2008 13:30:13 -0000	1.353
+++ evolution.spec	8 Sep 2008 12:41:50 -0000	1.354
@@ -44,7 +44,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.23.91
+Version: 2.23.92
 Release: 1%{?dist}
 License: GPLv2 and GFDL
 Group: Applications/Productivity
@@ -652,6 +652,9 @@
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
 %changelog
+* Mon Sep 08 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.92-1.fc10
+- Update to 2.23.92
+
 * Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.91-1.fc10
 - Update to 2.23.91
 - Bump eds_version to 2.23.91


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- sources	1 Sep 2008 13:30:13 -0000	1.97
+++ sources	8 Sep 2008 12:41:50 -0000	1.98
@@ -1 +1 @@
-016dcb4db0d44ee3ca7ff4238a94ead8  evolution-2.23.91.tar.bz2
+f8bb33328b2e2d9fb3d3ff474e8ed1f8  evolution-2.23.92.tar.bz2



From ltinkl at fedoraproject.org  Mon Sep  8 12:42:23 2008
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon,  8 Sep 2008 12:42:23 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.1.1-kutils-fixes.patch, NONE,
	1.1 kdelibs.spec, 1.347, 1.348
Message-ID: <20080908124223.A3E3B70128@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20583

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.1-kutils-fixes.patch 
Log Message:
kutils fixes, mostly in plugin selector


kdelibs-4.1.1-kutils-fixes.patch:

--- NEW FILE kdelibs-4.1.1-kutils-fixes.patch ---
Index: kutils/kpluginselector.cpp
===================================================================
--- kutils/kpluginselector.cpp	(revision 856658)
+++ kutils/kpluginselector.cpp	(revision 856659)
@@ -410,7 +410,8 @@
 
         if (!pluginEntryList.contains(pluginEntry) && !listToAdd.contains(pluginEntry) &&
              (!pluginInfo.property("X-KDE-PluginInfo-Category").isValid() ||
-              !pluginInfo.property("X-KDE-PluginInfo-Category").toString().compare(categoryKey, Qt::CaseInsensitive))) {
+              !pluginInfo.property("X-KDE-PluginInfo-Category").toString().compare(categoryKey, Qt::CaseInsensitive)) &&
+            !pluginInfo.service()->noDisplay()) {
             listToAdd << pluginEntry;
 
             if (!pluginSelector_d->showIcons && !pluginInfo.icon().isEmpty()) {
Index: kutils/kpluginselector.cpp
===================================================================
--- kutils/kpluginselector.cpp	(revision 856718)
+++ kutils/kpluginselector.cpp	(revision 856719)
@@ -411,7 +411,7 @@
         if (!pluginEntryList.contains(pluginEntry) && !listToAdd.contains(pluginEntry) &&
              (!pluginInfo.property("X-KDE-PluginInfo-Category").isValid() ||
               !pluginInfo.property("X-KDE-PluginInfo-Category").toString().compare(categoryKey, Qt::CaseInsensitive)) &&
-            !pluginInfo.service()->noDisplay()) {
+            (pluginInfo.service().isNull() || !pluginInfo.service()->noDisplay())) {
             listToAdd << pluginEntry;
 
             if (!pluginSelector_d->showIcons && !pluginInfo.icon().isEmpty()) {
Index: kutils/kcmoduleproxy.cpp
===================================================================
--- kutils/kcmoduleproxy.cpp	(revision 857917)
+++ kutils/kcmoduleproxy.cpp	(revision 857918)
@@ -228,7 +228,7 @@
     Q_Q(KCModuleProxy);
     changed = c;
     emit q->changed(c);
-    emit q->changed(this);
+    emit q->changed(q);
 }
 
 void KCModuleProxyPrivate::_k_moduleDestroyed()


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- kdelibs.spec	3 Sep 2008 10:51:21 -0000	1.347
+++ kdelibs.spec	8 Sep 2008 12:41:53 -0000	1.348
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -84,6 +84,7 @@
 Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
 Patch101: kdelibs-4.1.1-kde#856379-cookiejar.patch
 Patch102: kdelibs-4.1.1-kde#856403-urlnav.patch
+Patch103: kdelibs-4.1.1-kutils-fixes.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -213,6 +214,7 @@
 %patch100 -p0 -b .kde#169447-khtml-regression
 %patch101 -p0 -b .kde#856379-cookiejar
 %patch102 -p0 -b .kde#856403-urlnav
+%patch103 -p0 -b .kutils-fixes
 
 %build
 
@@ -373,6 +375,9 @@
 
 
 %changelog
+* Mon Sep 08 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-6
+- fix crashes in plugin selector
+
 * Wed Sep 03 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-5
 - fixed crash on setting cookies on empty domains (like the file
   system), KDE bug #170147



From mbarnes at fedoraproject.org  Mon Sep  8 12:42:25 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon,  8 Sep 2008 12:42:25 +0000 (UTC)
Subject: rpms/evolution-exchange/devel .cvsignore, 1.28,
	1.29 evolution-exchange.spec, 1.39, 1.40 sources, 1.28,
	1.29 evolution-exchange-2.21.91-no-gnuc-pretty-function.patch,
	1.1, NONE evolution-exchange-2.23.91-compiler-warnings.patch,
	1.1, NONE
Message-ID: <20080908124225.90B5B70128@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20498

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Removed Files:
	evolution-exchange-2.21.91-no-gnuc-pretty-function.patch 
	evolution-exchange-2.23.91-compiler-warnings.patch 
Log Message:

* Mon Sep 08 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.92-1.fc10
- Update to 2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	1 Sep 2008 12:52:33 -0000	1.28
+++ .cvsignore	8 Sep 2008 12:41:55 -0000	1.29
@@ -1 +1 @@
-evolution-exchange-2.23.91.tar.bz2
+evolution-exchange-2.23.92.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- evolution-exchange.spec	1 Sep 2008 12:52:33 -0000	1.39
+++ evolution-exchange.spec	8 Sep 2008 12:41:55 -0000	1.40
@@ -22,7 +22,7 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.23.91
+Version: 2.23.92
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Productivity
@@ -44,9 +44,6 @@
 # GNOME bug #443022
 Patch13: evolution-exchange-2.11.2-fix-library-order.patch
 
-# Get -Werror to work
-Patch14: evolution-exchange-2.23.91-compiler-warnings.patch
-
 ### Dependencies ###
 
 Requires: gnutls
@@ -78,7 +75,6 @@
 %patch11 -p1 -b .fix-64bit-acinclude.m4
 %patch12 -p1 -b .no_gnome_common
 %patch13 -p1 -b .fix-library-order
-%patch14 -p1 -b .compiler-warnings
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
@@ -155,6 +151,9 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Mon Sep 08 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.92-1.fc10
+- Update to 2.23.92
+
 * Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.91-1.fc10
 - Update to 2.23.91
 - Add -Werror to CFLAGS.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	1 Sep 2008 12:52:33 -0000	1.28
+++ sources	8 Sep 2008 12:41:55 -0000	1.29
@@ -1 +1 @@
-7b5cfd121b84c49ca7a16052c945cd64  evolution-exchange-2.23.91.tar.bz2
+6e54f778da43161211aea70f1d9becff  evolution-exchange-2.23.92.tar.bz2


--- evolution-exchange-2.21.91-no-gnuc-pretty-function.patch DELETED ---


--- evolution-exchange-2.23.91-compiler-warnings.patch DELETED ---



From limb at fedoraproject.org  Mon Sep  8 12:49:17 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon,  8 Sep 2008 12:49:17 +0000 (UTC)
Subject: rpms/gnubg/devel gnubg-0.9.0.1-disable_sse.patch, NONE,
	1.1 gnubg.spec, 1.20, 1.21
Message-ID: <20080908124917.D3A7B70128@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gnubg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23186

Modified Files:
	gnubg.spec 
Added Files:
	gnubg-0.9.0.1-disable_sse.patch 
Log Message:
A more elegant solution.


gnubg-0.9.0.1-disable_sse.patch:

--- NEW FILE gnubg-0.9.0.1-disable_sse.patch ---
--- configure.in	2008-09-08 07:21:20.000000000 -0500
+++ configure.in	2008-09-08 07:21:20.000000000 -0500
@@ -234,15 +234,17 @@
 
 SSE_CFLAGS=''
 AC_ARG_ENABLE( sse, [  --enable-sse=TYPE  enable SSE for newer cpus(TYPE=yes,no,cputest, default cputest)], ssecpu=$enableval, ssecpu=cputest)
-if test "$ssecpu" != "no"; then
-        AC_DEFINE(USE_SSE_VECTORIZE,1,Define if you want to compile with SSE support)
-        if test "$ssecpu" = "yes"; then
-                AC_DEFINE(DISABLE_SSE_TEST, 1, Define if you want to disable the SSE cpu test)
-        fi
-        if test x"$GCC" = xyes; then
-                SSE_CFLAGS="-msse"
-        fi
-fi
+dnl if test "$ssecpu" != "no"; then
+dnl        AC_DEFINE(USE_SSE_VECTORIZE,1,Define if you want to compile with SSE support)
+dnl        if test "$ssecpu" = "yes"; then
+dnl                AC_DEFINE(DISABLE_SSE_TEST, 1, Define if you want to disable the SSE cpu test)
+dnl        fi
+dnl        if test x"$GCC" = xyes; then
+dnl                SSE_CFLAGS="-msse"
+dnl        fi
+dnlfi
+AC_DEFINE(USE_SSE_VECTORIZE,0,DisableSSE)
+AC_DEFINE(DISABLE_SSE_TEST,1,DisableSSE)
 
 AC_SUBST(SSE_CFLAGS)
 


Index: gnubg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnubg/devel/gnubg.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnubg.spec	5 Sep 2008 19:46:34 -0000	1.20
+++ gnubg.spec	8 Sep 2008 12:48:47 -0000	1.21
@@ -9,7 +9,7 @@
 Source1:       gnubg.weights
 Source2:       gnubg.desktop
 Source3:       gnubg.png
-Patch0:        gnubg-0.9.0-1-neuralnet-arch.patch
+Patch0:        gnubg-0.9.0.1-disable_sse.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n ) 
 URL:           http://www.gnubg.org
 BuildRequires: gtk2-devel



From mkasik at fedoraproject.org  Mon Sep  8 12:52:37 2008
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Mon,  8 Sep 2008 12:52:37 +0000 (UTC)
Subject: rpms/gtk2/F-9 cups-unix-domain-socket.patch, 1.1, 1.2 gtk2.spec,
	1.296, 1.297
Message-ID: <20080908125237.AC42C70128@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/gtk2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24499

Modified Files:
	cups-unix-domain-socket.patch gtk2.spec 
Log Message:
* Mon Sep  8 2008 Marek Kasik <mkasik at redhat.com> - 2.12.11-3
- Add a comment of the Unix domain socket connection with CUPS
  and a little modification of the previous patch


cups-unix-domain-socket.patch:

Index: cups-unix-domain-socket.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-9/cups-unix-domain-socket.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-unix-domain-socket.patch	4 Sep 2008 13:20:04 -0000	1.1
+++ cups-unix-domain-socket.patch	8 Sep 2008 12:52:37 -0000	1.2
@@ -1,5 +1,5 @@
---- modules/printbackends/cups/gtkprintbackendcups.c	2008-09-03 16:58:29.000000000 +0200
-+++ modules/printbackends/cups/gtkprintbackendcups.c	2008-09-03 16:57:39.000000000 +0200
+--- modules/printbackends/cups/gtkprintbackendcups.c	2008-09-08 12:07:55.000000000 +0200
++++ modules/printbackends/cups/gtkprintbackendcups.c	2008-09-08 13:11:58.000000000 +0200
 @@ -1181,6 +1181,7 @@ cups_request_printer_list_cb (GtkPrintBa
  	  char hostname[HTTP_MAX_URI];	/* Hostname */
  	  char resource[HTTP_MAX_URI];	/* Resource name */
@@ -8,20 +8,24 @@
  	  
            list_has_changed = TRUE;
  	  cups_printer = gtk_printer_cups_new (printer_name, backend);
-@@ -1227,8 +1228,14 @@ cups_request_printer_list_cb (GtkPrintBa
+@@ -1227,9 +1228,20 @@ cups_request_printer_list_cb (GtkPrintBa
              }
  
  	  gethostname (uri, sizeof (uri));
--	  if (strcasecmp (uri, hostname) == 0)
--	    strcpy (hostname, "localhost");
 +	  cups_server = g_strdup (cupsServer());
 +
-+	  if ((strcasecmp (uri, hostname) == 0) ||
-+	      ((strstr (hostname, "localhost") != NULL) &&
-+	       (cups_server[0] == '/')))
+ 	  if (strcasecmp (uri, hostname) == 0)
+ 	    strcpy (hostname, "localhost");
+ 
++          /* if the cups server is local and listening at a unix domain socket 
++           * then use the socket connection
++           */
++	  if ((strstr (hostname, "localhost") != NULL) &&
++	      (cups_server[0] == '/'))
 +	    strcpy (hostname, cups_server);
 +
 +	  g_free (cups_server);
- 
++
  	  cups_printer->hostname = g_strdup (hostname);
  	  cups_printer->port = port;
+ 	  


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-9/gtk2.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- gtk2.spec	4 Sep 2008 13:20:04 -0000	1.296
+++ gtk2.spec	8 Sep 2008 12:52:37 -0000	1.297
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2
@@ -329,6 +329,10 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Mon Sep  8 2008 Marek Kasik <mkasik at redhat.com> - 2.12.11-3
+- Add a comment of the Unix domain socket connection with CUPS
+  and a little modification of the previous patch
+
 * Thu Sep  4 2008 Marek Kasik <mkasik at redhat.com> - 2.12.11-2
 - Add ability to comunicate with CUPS through Unix domain socket
 - Resolves: #455742



From berrange at fedoraproject.org  Mon Sep  8 13:03:05 2008
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Mon,  8 Sep 2008 13:03:05 +0000 (UTC)
Subject: rpms/gtk-vnc/F-9 gtk-vnc.spec, 1.19,
	1.20 gtk-vnc-0.3.6-event-handlers.patch, 1.1, NONE
Message-ID: <20080908130306.01E6270128@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/gtk-vnc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27774

Modified Files:
	gtk-vnc.spec 
Removed Files:
	gtk-vnc-0.3.6-event-handlers.patch 
Log Message:
Remove obsolete patch


Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-9/gtk-vnc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gtk-vnc.spec	8 Sep 2008 12:32:13 -0000	1.19
+++ gtk-vnc.spec	8 Sep 2008 13:02:35 -0000	1.20
@@ -11,7 +11,6 @@
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch1: %{name}-%{version}-event-handlers.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gtk-vnc.sf.net/
 BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel
@@ -68,7 +67,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %if %{with_plugin}


--- gtk-vnc-0.3.6-event-handlers.patch DELETED ---



From langel at fedoraproject.org  Mon Sep  8 13:03:54 2008
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon,  8 Sep 2008 13:03:54 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-9 java-1.6.0-openjdk.spec,1.53,1.54
Message-ID: <20080908130354.66F1370128@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28110

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.18.b09
- Added rhino requirement.
- Resolves: rhbz#461336




Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/java-1.6.0-openjdk.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- java-1.6.0-openjdk.spec	16 Jul 2008 16:10:25 -0000	1.53
+++ java-1.6.0-openjdk.spec	8 Sep 2008 13:03:24 -0000	1.54
@@ -225,6 +225,7 @@
 # cacerts build requirement.
 BuildRequires: openssl
 
+Requires: rhino
 Requires: libjpeg = 6b
 # Require jpackage-utils for ant.
 Requires: jpackage-utils >= 1.7.3-1jpp.3
@@ -927,6 +928,10 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.18.b09
+- Added rhino requirement.
+- Resolves: rhbz#461336
+
 * Wed Jul 16 2008 Dennis Gilmore <dennis at ausil.us> - 1:1.6.0-0.17.b09
 - bump the release to sync all arches
 



From ltinkl at fedoraproject.org  Mon Sep  8 13:04:03 2008
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon,  8 Sep 2008 13:04:03 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.1.1-kde#858160-vfat.patch, NONE,
	1.1 kdelibs-4.1.1-kdeui-widgets-fixes.patch, NONE,
	1.1 kdelibs.spec, 1.348, 1.349
Message-ID: <20080908130403.48B3570128@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28173

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.1-kde#858160-vfat.patch 
	kdelibs-4.1.1-kdeui-widgets-fixes.patch 
Log Message:
more fixes


kdelibs-4.1.1-kde#858160-vfat.patch:

--- NEW FILE kdelibs-4.1.1-kde#858160-vfat.patch ---
Index: solid/solid/backends/hal/halstorageaccess.cpp
===================================================================
--- solid/solid/backends/hal/halstorageaccess.cpp	(revision 858159)
+++ solid/solid/backends/hal/halstorageaccess.cpp	(revision 858160)
@@ -19,6 +19,7 @@
 
 #include "halstorageaccess.h"
 
+#include <QtCore/QLocale>
 #include <QtCore/QDebug>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusInterface>
@@ -233,6 +234,38 @@
     if (halOptions.contains("uid=")) {
         options << "uid="+QString::number(::getuid());
     }
+    //respect windows-enforced charsets for fat
+    if ( m_device->property("volume.fstype").toString()=="vfat" && halOptions.contains("codepage=") ) {
+        options << "iocharset=utf8";
+        switch (QLocale::system().language()) {
+        case QLocale::Russian:
+        case QLocale::Ukrainian:
+            options << "codepage=1251";
+            break;
+        case QLocale::Hebrew:
+            options << "codepage=1255";
+            break;
+        case QLocale::Turkish:
+            options << "codepage=1254";
+        case QLocale::Greek:
+            options << "codepage=1253";
+        case QLocale::Arabic:
+            options << "codepage=1256";
+        case QLocale::German:
+        case QLocale::Italian:
+        case QLocale::Spanish:
+        case QLocale::Portuguese:
+        case QLocale::French:
+        case QLocale::Dutch:
+        case QLocale::Danish:
+        case QLocale::Swedish:
+        case QLocale::Norwegian:
+        case QLocale::Icelandic:
+            options << "codepage=1255";
+        default:
+            options.removeLast();
+        }
+    }
 
     msg << "" << "" << options;
 

kdelibs-4.1.1-kdeui-widgets-fixes.patch:

--- NEW FILE kdelibs-4.1.1-kdeui-widgets-fixes.patch ---
Index: kdeui/widgets/krichtextedit.cpp
===================================================================
--- kdeui/widgets/krichtextedit.cpp	(revision 857817)
+++ kdeui/widgets/krichtextedit.cpp	(revision 857818)
@@ -492,7 +492,7 @@
     static QString evilline = "<p style=\" margin-top:0px; margin-bottom:0px; "
                       "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
                       "text-indent:0px; -qt-user-state:0;\">";
-        
+
     QString result;
     QStringList lines = toHtml().split("\n");
     foreach(QString tempLine, lines ) {
@@ -507,6 +507,33 @@
             result += tempLine;
         }
     }
+
+    // ### HACK to fix bug 86925: A completely empty line is ignored in HTML-mode
+    int offset = 0;
+    QRegExp paragraphFinder("<p.*>(.*)</p>");
+    QRegExp paragraphEnd("</p>");
+    paragraphFinder.setMinimal(true);
+
+    while (offset != -1) {
+
+        // Find the next paragraph
+        offset = paragraphFinder.indexIn(result, offset);
+
+        if (offset != -1) {
+
+            // If the text in the paragraph is empty, add a &nbsp there.
+            if (paragraphFinder.capturedTexts().size() == 2 &&
+                paragraphFinder.capturedTexts()[1].isEmpty()) {
+                int end = paragraphEnd.indexIn(result, offset);
+                Q_ASSERT(end != -1 && end > offset);
+                result.replace(end, paragraphEnd.pattern().length(), "<br></p>");
+            }
+
+            // Avoid finding the same match again
+            offset++;
+        }
+    }
+
     return result;
 }
 
Index: kdeui/fonts/kfontchooser.cpp
===================================================================
--- kdeui/fonts/kfontchooser.cpp	(revision 858147)
+++ kdeui/fonts/kfontchooser.cpp	(revision 858148)
@@ -444,6 +444,10 @@
     QPalette pal = d->sampleEdit->palette();
     pal.setColor( QPalette::Active, QPalette::Text, col );
     d->sampleEdit->setPalette( pal );
+    QTextCursor cursor = d->sampleEdit->textCursor();
+    d->sampleEdit->selectAll();
+    d->sampleEdit->setTextColor( col );
+    d->sampleEdit->setTextCursor( cursor );
 }
 
 QColor KFontChooser::color() const
Index: kdeui/widgets/khelpmenu.cpp
===================================================================
--- kdeui/widgets/khelpmenu.cpp	(revision 858312)
+++ kdeui/widgets/khelpmenu.cpp	(revision 858313)
@@ -162,6 +162,7 @@
       d->mWhatsThisAction = new KAction(KIcon("help-contextual"), i18n( "What's &This" ), d->mMenu);
       d->mWhatsThisAction->setShortcut(Qt::SHIFT + Qt::Key_F1);
       connect(d->mWhatsThisAction, SIGNAL(triggered(bool)), this, SLOT(contextHelpActivated()));
+      d->mMenu->addAction(d->mWhatsThisAction);
       need_separator = true;
     }
Index: kdeui/widgets/ktabwidget.cpp
===================================================================
--- kdeui/widgets/ktabwidget.cpp	(revision 858490)
+++ kdeui/widgets/ktabwidget.cpp	(revision 858491)
@@ -281,14 +281,22 @@
 
 QString KTabWidget::tabText( int index ) const
 {
-  if ( d->m_automaticResizeTabs ) {
-    if ( index >= 0 && index < count() )
-      return d->m_tabNames[ index ];
+    if ( d->m_automaticResizeTabs ) {
+        if (index >= 0 && index < count()) {
+            if (index >= d->m_tabNames.count()) {
+                // Ooops, the tab exists, but tabInserted wasn't called yet.
+                // This can happen when inserting the first tab,
+                // and calling tabText from slotCurrentChanged,
+                // see KTabWidget_UnitTest.
+                const_cast<KTabWidget*>(this)->tabInserted(index);
+            }
+            return d->m_tabNames[ index ];
+        }
+        else
+            return QString();
+    }
     else
-      return QString();
-  }
-  else
-    return QTabWidget::tabText( index );
+        return QTabWidget::tabText( index );
 }
 
 void KTabWidget::setTabText( int index, const QString &text )
Index: kdeui/widgets/ktabwidget.h
===================================================================
--- kdeui/widgets/ktabwidget.h	(revision 858490)
+++ kdeui/widgets/ktabwidget.h	(revision 858491)
@@ -187,7 +187,7 @@
      * Removes the widget, reimplemented for
      * internal reasons (keeping labels in sync).
      */
-    virtual void removeTab(int index);
+    virtual void removeTab(int index); // but it's not virtual in QTabWidget...
 
     /**
      * If \a enable is true, tab reordering with middle button will be enabled.


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- kdelibs.spec	8 Sep 2008 12:41:53 -0000	1.348
+++ kdelibs.spec	8 Sep 2008 13:03:32 -0000	1.349
@@ -85,6 +85,8 @@
 Patch101: kdelibs-4.1.1-kde#856379-cookiejar.patch
 Patch102: kdelibs-4.1.1-kde#856403-urlnav.patch
 Patch103: kdelibs-4.1.1-kutils-fixes.patch
+Patch104: kdelibs-4.1.1-kdeui-widgets-fixes.patch
+Patch105: kdelibs-4.1.1-kde#858160-vfat.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -215,6 +217,8 @@
 %patch101 -p0 -b .kde#856379-cookiejar
 %patch102 -p0 -b .kde#856403-urlnav
 %patch103 -p0 -b .kutils-fixes
+%patch104 -p0 -b .kdeui-widgets-fixes
+%patch105 -p0 -b .kde#858160-vfat
 
 %build
 
@@ -377,6 +381,8 @@
 %changelog
 * Mon Sep 08 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-6
 - fix crashes in plugin selector
+- fix problems in various kdeui widgets
+- fix code page selection for vfat volumes in Solid
 
 * Wed Sep 03 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-5
 - fixed crash on setting cookies on empty domains (like the file



From langel at fedoraproject.org  Mon Sep  8 13:07:48 2008
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon,  8 Sep 2008 13:07:48 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel .cvsignore, 1.38,
	1.39 java-1.6.0-openjdk-makefile.patch, 1.8,
	1.9 java-1.6.0-openjdk-optflags.patch, 1.10,
	1.11 java-1.6.0-openjdk.spec, 1.69, 1.70 sources, 1.38, 1.39
Message-ID: <20080908130748.B4C5C70128@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-serv29418

Modified Files:
	.cvsignore java-1.6.0-openjdk-makefile.patch 
	java-1.6.0-openjdk-optflags.patch java-1.6.0-openjdk.spec 
	sources 
Log Message:
* Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.20.b11
- Added rhino requirement.
- Resolves: rhbz#461336




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	5 Aug 2008 13:56:48 -0000	1.38
+++ .cvsignore	8 Sep 2008 13:07:18 -0000	1.39
@@ -2,5 +2,3 @@
 mauve_tests
 java-access-bridge-1.23.0.tar.gz
 openjdk-6-src-b11-10_jul_2008-fedora.tar.gz
-
-icedtea6-1.3-63c7ccd8da7f0e7c8e5a1e3c8dc3389efcd74223.tar.gz

java-1.6.0-openjdk-makefile.patch:

Index: java-1.6.0-openjdk-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk-makefile.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- java-1.6.0-openjdk-makefile.patch	5 Aug 2008 14:45:33 -0000	1.8
+++ java-1.6.0-openjdk-makefile.patch	8 Sep 2008 13:07:18 -0000	1.9
@@ -17,22 +17,3 @@
  	mkdir -p stamps ; \
  	rm -f stamps/patch.stamp.tmp ; \
  	touch stamps/patch.stamp.tmp ; \
---- makein	2008-08-05 10:44:14.000000000 -0400
-+++ Makefile.in	2008-08-05 10:44:53.000000000 -0400
-@@ -963,7 +963,6 @@
- 	  mkdir openjdk ; \
- 	  $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
- 	  chmod -R ug+w openjdk ; \
--	  sh $(srcdir)/fsg.sh ; \
- 	fi
- @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@	if ! test -d cacao ; \
- @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@	then \
-@@ -991,7 +990,7 @@
- clean-extract:
- 	rm -f stamps/extract.stamp
- 
--stamps/patch.stamp: stamps/patch-fsg.stamp
-+stamps/patch.stamp: stamps/extract.stamp
- 	mkdir -p stamps ; \
- 	rm -f stamps/patch.stamp.tmp ; \
- 	touch stamps/patch.stamp.tmp ; \

java-1.6.0-openjdk-optflags.patch:

Index: java-1.6.0-openjdk-optflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk-optflags.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- java-1.6.0-openjdk-optflags.patch	5 Aug 2008 14:20:12 -0000	1.10
+++ java-1.6.0-openjdk-optflags.patch	8 Sep 2008 13:07:18 -0000	1.11
@@ -10,72 +10,3 @@
  FIND_TOOL([MAKE], [make])
  FIND_TOOL([GZIP], [gzip])
  FIND_TOOL([ANT], [ant])
---- configorig	2008-08-05 10:16:22.000000000 -0400
-+++ configure	2008-08-05 10:16:33.000000000 -0400
-@@ -704,6 +704,7 @@
- CXXDEPMODE
- am__fastdepCXX_TRUE
- am__fastdepCXX_FALSE
-+ALT_OPT_CFLAGS
- MAKE
- GZIP
- ANT
-@@ -4200,6 +4201,9 @@
- 
- 
- 
-+ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
-+
-+
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}make", so it can be a program name with args.
- set dummy ${ac_tool_prefix}make; ac_word=$2
-@@ -13479,6 +13483,7 @@
- CXXDEPMODE!$CXXDEPMODE$ac_delim
- am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
- am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-+ALT_OPT_CFLAGS!$ALT_OPT_CFLAGS$ac_delim
- MAKE!$MAKE$ac_delim
- GZIP!$GZIP$ac_delim
- ANT!$ANT$ac_delim
-@@ -13486,7 +13491,6 @@
- PATCH!$PATCH$ac_delim
- TAR!$TAR$ac_delim
- CHMOD!$CHMOD$ac_delim
--MD5SUM!$MD5SUM$ac_delim
- _ACEOF
- 
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -13528,6 +13532,7 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
-+MD5SUM!$MD5SUM$ac_delim
- WGET!$WGET$ac_delim
- ZIP!$ZIP$ac_delim
- UNZIP!$UNZIP$ac_delim
-@@ -13624,7 +13629,6 @@
- X11_LIBS!$X11_LIBS$ac_delim
- XINERAMA_CFLAGS!$XINERAMA_CFLAGS$ac_delim
- XINERAMA_LIBS!$XINERAMA_LIBS$ac_delim
--LIBPNG_CFLAGS!$LIBPNG_CFLAGS$ac_delim
- _ACEOF
- 
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -13666,6 +13670,7 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
-+LIBPNG_CFLAGS!$LIBPNG_CFLAGS$ac_delim
- LIBPNG_LIBS!$LIBPNG_LIBS$ac_delim
- XTST_CFLAGS!$XTST_CFLAGS$ac_delim
- XTST_LIBS!$XTST_LIBS$ac_delim
-@@ -13691,7 +13696,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 24; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5


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.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- java-1.6.0-openjdk.spec	5 Aug 2008 13:56:48 -0000	1.69
+++ java-1.6.0-openjdk.spec	8 Sep 2008 13:07:18 -0000	1.70
@@ -4,10 +4,10 @@
 %define gcjbootstrap 0
 
 # If runtests is 0 test suites will not be run.
-%define runtests 1
+%define runtests 0
 
 %define icedteaver 1.3
-%define icedteasnapshot -63c7ccd8da7f0e7c8e5a1e3c8dc3389efcd74223
+%define icedteasnapshot -94838da771970032c91d65eb2588e2f916055aad
 %define openjdkver b11
 %define openjdkdate 10_jul_2008
 
@@ -194,6 +194,7 @@
 BuildRequires: libffi-devel
 %endif
 
+Requires: rhino
 Requires: libjpeg = 6b
 %if 0%{?fedora} > 9
 # Require /etc/pki/java/cacerts.
@@ -355,6 +356,7 @@
 %ifarch sparc64
 export ARCH_DATA_MODEL=64
 %endif
+./autogen.sh
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
@@ -901,6 +903,10 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.20.b11
+- Added rhino requirement.
+- Resolves: rhbz#461336
+
 * Tue Aug 05 2008 Lillian Angel <langel at redhat.com> 1:1.6.0-0.20.b11
 - Updated icedteasnapshot.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	5 Aug 2008 13:56:48 -0000	1.38
+++ sources	8 Sep 2008 13:07:18 -0000	1.39
@@ -2,4 +2,3 @@
 7a0c160c03012cd40957a7a112e25038  mauve_tests
 1db4280d3228f20ad39ad22382ce2b00  java-access-bridge-1.23.0.tar.gz
 0997dea46b42ed9bbebff8cbe5f70aa0  openjdk-6-src-b11-10_jul_2008-fedora.tar.gz
-4c94a16c43c7fd5e1e764bd1b40b7fa0  icedtea6-1.3-63c7ccd8da7f0e7c8e5a1e3c8dc3389efcd74223.tar.gz



From spot at fedoraproject.org  Mon Sep  8 13:19:38 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 13:19:38 +0000 (UTC)
Subject: rpms/tclabc/devel tclabc.spec,1.5,1.6
Message-ID: <20080908131938.0E87070128@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tclabc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1124

Modified Files:
	tclabc.spec 
Log Message:
fix license tag


Index: tclabc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tclabc/devel/tclabc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tclabc.spec	22 Feb 2008 23:19:31 -0000	1.5
+++ tclabc.spec	8 Sep 2008 13:19:07 -0000	1.6
@@ -1,14 +1,13 @@
 Name:           tclabc
 Version:        1.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Tcl interface and a Tk GUI to the ABC notation
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2+
 URL:            http://moinejf.free.fr
 Source0:        http://moinejf.free.fr/tclabc-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  tk
 BuildRequires:  tk-devel
 BuildRequires:	alsa-lib-devel
 Requires:       tk
@@ -49,6 +48,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.1.0-2
+- fix license tag
+
 * Sat Feb 23 2008 Gerard Milmeister <gemi at bluewin.ch> - 1.1.0-1
 - new release 1.1.0
 



From spot at fedoraproject.org  Mon Sep  8 13:21:02 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 13:21:02 +0000 (UTC)
Subject: rpms/tcptraceroute/devel tcptraceroute.spec,1.6,1.7
Message-ID: <20080908132102.9D76070128@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcptraceroute/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1710

Modified Files:
	tcptraceroute.spec 
Log Message:
fix license tag


Index: tcptraceroute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcptraceroute/devel/tcptraceroute.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tcptraceroute.spec	20 Feb 2008 00:25:56 -0000	1.6
+++ tcptraceroute.spec	8 Sep 2008 13:20:32 -0000	1.7
@@ -1,10 +1,10 @@
 Name:           tcptraceroute
 Version:        1.5
-Release:        0.5.beta7%{?dist}
+Release:        0.6.beta7%{?dist}
 Summary:        A traceroute implementation using TCP packets
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2+
 URL:            http://michael.toren.net/code/tcptraceroute/
 Source0:        http://michael.toren.net/code/tcptraceroute/%{name}-%{version}beta7.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,6 +46,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-0.6.beta7
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.5-0.5.beta7
 - Autorebuild for GCC 4.3
 



From limb at fedoraproject.org  Mon Sep  8 13:25:42 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon,  8 Sep 2008 13:25:42 +0000 (UTC)
Subject: rpms/gnubg/F-9 gnubg-0.9.0.1-disable_sse.patch, NONE, 1.1 gnubg.spec,
	1.18, 1.19 sources, 1.4, 1.5
Message-ID: <20080908132542.2703E70128@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gnubg/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3387

Modified Files:
	gnubg.spec sources 
Added Files:
	gnubg-0.9.0.1-disable_sse.patch 
Log Message:
New upstream.


gnubg-0.9.0.1-disable_sse.patch:

--- NEW FILE gnubg-0.9.0.1-disable_sse.patch ---
--- configure.in	2008-09-08 07:21:20.000000000 -0500
+++ configure.in	2008-09-08 07:21:20.000000000 -0500
@@ -234,15 +234,17 @@
 
 SSE_CFLAGS=''
 AC_ARG_ENABLE( sse, [  --enable-sse=TYPE  enable SSE for newer cpus(TYPE=yes,no,cputest, default cputest)], ssecpu=$enableval, ssecpu=cputest)
-if test "$ssecpu" != "no"; then
-        AC_DEFINE(USE_SSE_VECTORIZE,1,Define if you want to compile with SSE support)
-        if test "$ssecpu" = "yes"; then
-                AC_DEFINE(DISABLE_SSE_TEST, 1, Define if you want to disable the SSE cpu test)
-        fi
-        if test x"$GCC" = xyes; then
-                SSE_CFLAGS="-msse"
-        fi
-fi
+dnl if test "$ssecpu" != "no"; then
+dnl        AC_DEFINE(USE_SSE_VECTORIZE,1,Define if you want to compile with SSE support)
+dnl        if test "$ssecpu" = "yes"; then
+dnl                AC_DEFINE(DISABLE_SSE_TEST, 1, Define if you want to disable the SSE cpu test)
+dnl        fi
+dnl        if test x"$GCC" = xyes; then
+dnl                SSE_CFLAGS="-msse"
+dnl        fi
+dnlfi
+AC_DEFINE(USE_SSE_VECTORIZE,0,DisableSSE)
+AC_DEFINE(DISABLE_SSE_TEST,1,DisableSSE)
 
 AC_SUBST(SSE_CFLAGS)
 


Index: gnubg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnubg/F-9/gnubg.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnubg.spec	9 Feb 2008 04:37:37 -0000	1.18
+++ gnubg.spec	8 Sep 2008 13:25:11 -0000	1.19
@@ -2,12 +2,14 @@
 License:       GPLv2
 Group:         Amusements/Games
 Summary:       A backgammon game and analyser
-Version:       20061119
-Release:       14%{?dist}
-Source0:       http://www.gnubg.org/media/sources/%{name}-source-MAIN-%{version}.tar.gz
+Epoch:         1
+Version:       0.9.0.1
+Release:       1%{?dist}
+Source0:       http://gnubg.org/media/sources/gnubg-0.9.0-1.tar.gz
 Source1:       gnubg.weights
 Source2:       gnubg.desktop
 Source3:       gnubg.png
+Patch0:        gnubg-0.9.0.1-disable_sse.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n ) 
 URL:           http://www.gnubg.org
 BuildRequires: gtk2-devel
@@ -51,8 +53,12 @@
 %prep
 %setup -qn %{name}
 # convert man page from ISO-8859-1 to UTF8
-/usr/bin/iconv -f ISO-8859-1 -t UTF8 gnubg.6 > gnubg.6.tmp 
-/bin/mv gnubg.6.tmp gnubg.6
+#/usr/bin/iconv -f ISO-8859-1 -t UTF8 gnubg.6 > gnubg.6.tmp 
+#/bin/mv gnubg.6.tmp gnubg.6
+/usr/bin/iconv -f ISO-8859-1 -t UTF8 ChangeLog > ChangeLog.tmp 
+/bin/mv ChangeLog.tmp ChangeLog
+
+%patch0 -p0
 
 # running autogen, sources are nightly CVS tarballs not
 # containing configure
@@ -61,9 +67,9 @@
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 %configure --with-python \
-	--without-gdbm \
-	--without-guile \
-	--without-timecontrol
+        --without-gdbm \
+        --without-guile \
+        --without-timecontrol
 make
 
 %install
@@ -118,12 +124,13 @@
 %{_bindir}/gnubg
 %{_bindir}/makebearoff
 %{_bindir}/makehyper
-%{_infodir}/gnubg.info.gz
+%{_bindir}/makeweights
+#%{_infodir}/gnubg.info.gz
 %dir %{_datadir}/gnubg
 %{_datadir}/gnubg/met
 %{_datadir}/gnubg/doc
 %{_datadir}/gnubg/boards.xml
-%{_datadir}/gnubg/gnubg.game.sql
+#%{_datadir}/gnubg/gnubg.game.sql
 #%{_datadir}/gnubg/gnubg.gtkrc
 %{_datadir}/gnubg/gnubg_os0.bd
 %{_datadir}/gnubg/gnubg.weights
@@ -139,8 +146,14 @@
 %{_datadir}/gnubg/gnubg.wd
 %{_datadir}/gnubg/scripts/
 %{_datadir}/gnubg/flags/
+%{_datadir}/gnubg/gnubg.png
+%{_datadir}/gnubg/gnubg.sql
+%{_datadir}/gnubg/gnubg.svg
+%{_datadir}/gnubg/gnubg_ts0.bd
 
 %changelog
+* Fri Sep 05 2008 Jon Ciesla <limb at jcomserv.net> - 1:0.9.0.1-1
+- Update to latest version, BZ 461281.
 * Fri Feb 08 2008 Jon Ciesla <limb at jcomserv.net> - 20061119-14
 - GCC 4.3 rebuild.
 * Thu Aug 16 2007 Jon Ciesla <limb at jcomserv.net> - 20061119-13


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnubg/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Feb 2007 20:13:45 -0000	1.4
+++ sources	8 Sep 2008 13:25:11 -0000	1.5
@@ -1 +1 @@
-e326528df95bdb68345c435d8df141a2  gnubg-source-MAIN-20061119.tar.gz
+5ede44ec371a0a6501751126f73ae662  gnubg-0.9.0-1.tar.gz



From spot at fedoraproject.org  Mon Sep  8 13:33:11 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 13:33:11 +0000 (UTC)
Subject: rpms/tenr-de-styles-pkg/devel tenr-de-styles-pkg.spec,1.2,1.3
Message-ID: <20080908133311.7A5BD70128@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tenr-de-styles-pkg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6034

Modified Files:
	tenr-de-styles-pkg.spec 
Log Message:
fix license tag


Index: tenr-de-styles-pkg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tenr-de-styles-pkg/devel/tenr-de-styles-pkg.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tenr-de-styles-pkg.spec	15 Dec 2006 05:30:15 -0000	1.2
+++ tenr-de-styles-pkg.spec	8 Sep 2008 13:32:41 -0000	1.3
@@ -1,10 +1,10 @@
 Name:           tenr-de-styles-pkg
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A collection of styles for fluxbox
 
 Group:          Amusements/Graphics
-License:        Creative Commons Attribution-ShareAlike 2.5
+License:        CC-BY-SA
 URL:            http://tenr.de
 Source0:        http://tenr.de/files/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,6 +41,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-2
+- fix license tag
+
 * Thu Dec 14 2006 Michael Rice <errr[AT]errr-online.com> - 1.1-1
 - Version bump, which added over 100 new styles
 - add chmod command for dirs and files that keep getting packaged wrong



From spot at fedoraproject.org  Mon Sep  8 13:40:26 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 13:40:26 +0000 (UTC)
Subject: rpms/testoob/devel testoob.spec,1.2,1.3
Message-ID: <20080908134026.A8D7B70128@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/testoob/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8723

Modified Files:
	testoob.spec 
Log Message:
fix license tag


Index: testoob.spec
===================================================================
RCS file: /cvs/pkgs/rpms/testoob/devel/testoob.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- testoob.spec	4 Apr 2008 19:59:48 -0000	1.2
+++ testoob.spec	8 Sep 2008 13:39:56 -0000	1.3
@@ -2,11 +2,11 @@
 
 Name: testoob
 Version: 1.13
-Release:        4%{?dist}
+Release: 5%{?dist}
 Summary: Advanced unit testing framework for Python
 
 Group: Development/Tools
-License: Apache Software License
+License: ASL 2.0
 URL: http://testoob.sourceforge.net/
 Source0: http://easynews.dl.sourceforge.net/sourceforge/testoob/testoob-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.13-5
+- fix license tag
+
 * Sun Jun 17 2007 Devan Goodwin <dgoodwin at dangerouslyinc.com> 1.13-4
 - Adding requires for python-4Suite-XML for html output.
 



From harald at fedoraproject.org  Mon Sep  8 13:41:23 2008
From: harald at fedoraproject.org (Harald Hoyer)
Date: Mon,  8 Sep 2008 13:41:23 +0000 (UTC)
Subject: rpms/readahead/devel .cvsignore, 1.7, 1.8 readahead.spec, 1.49,
	1.50 sources, 1.10, 1.11
Message-ID: <20080908134123.D1B4570128@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/readahead/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9252

Modified Files:
	.cvsignore readahead.spec sources 
Log Message:
* Mon Sep 08 2008 Harald Hoyer <harald at redhat.com> 1.4.6-1
- fixed the selinux=off case



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Aug 2008 10:03:07 -0000	1.7
+++ .cvsignore	8 Sep 2008 13:40:53 -0000	1.8
@@ -3,3 +3,4 @@
 default.later
 readahead-1.4.5-20080815.tar.bz2
 readahead-1.4.5.tar.bz2
+readahead-1.4.6.tar.bz2


Index: readahead.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/readahead.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- readahead.spec	6 Sep 2008 10:24:45 -0000	1.49
+++ readahead.spec	8 Sep 2008 13:40:53 -0000	1.50
@@ -1,15 +1,13 @@
 Summary:        Read a preset list of files into memory
 Name:           readahead
-Version:        1.4.5
-Release:        3%{?dist}
+Version:        1.4.6
+Release:        1%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
 Source0:        readahead-%{version}.tar.bz2
 Source1:        default.early
 Source2:        default.later
-Patch: 		readahead-1.4.5-usr.patch
-Patch2: 	readahead-1.4.5-audit_reply_list.patch
 
 URL:            https://hosted.fedoraproject.org/projects/readahead
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,8 +25,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .usr
-%patch2 -p1 -b .audit_reply_list
 
 cp -f -t ./lists/ %{SOURCE1}
 cp -f -t ./lists/ %{SOURCE2}
@@ -45,8 +41,6 @@
 # remove default lists
 rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/readahead.d/default.*
 
-mv ${RPM_BUILD_ROOT}/%{_sbindir}/readahead ${RPM_BUILD_ROOT}//sbin/readahead
-
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -78,6 +72,9 @@
 /sbin/readahead-collector
 
 %changelog
+* Mon Sep 08 2008 Harald Hoyer <harald at redhat.com> 1.4.6-1
+- fixed the selinux=off case
+
 * Sat Sep 06 2008 Harald Hoyer <harald at redhat.com> 1.4.5-3
 - marked /etc/sysconfig/readahead as a config file
 - removed noreplace from /etc/readahead.conf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	28 Aug 2008 10:03:07 -0000	1.10
+++ sources	8 Sep 2008 13:40:53 -0000	1.11
@@ -1,3 +1,3 @@
 c49d5a223ff93931aee751cbe491e533  default.early
 2407fd6d06720de9e6b12ab41a9e96e4  default.later
-72dc975951dcab92a9e7b6611cd1c154  readahead-1.4.5.tar.bz2
+b55f51d81218a52095e373963304da02  readahead-1.4.6.tar.bz2



From bagnara at fedoraproject.org  Mon Sep  8 13:42:19 2008
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Mon,  8 Sep 2008 13:42:19 +0000 (UTC)
Subject: rpms/ppl/devel ppl-0.9-swiprolog.patch,1.1,1.2 ppl.spec,1.13,1.14
Message-ID: <20080908134219.1663970128@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9757

Modified Files:
	ppl-0.9-swiprolog.patch ppl.spec 
Log Message:
Fixed ppl-0.9-swiprolog.patch.


ppl-0.9-swiprolog.patch:

Index: ppl-0.9-swiprolog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl-0.9-swiprolog.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ppl-0.9-swiprolog.patch	8 Sep 2008 08:25:36 -0000	1.1
+++ ppl-0.9-swiprolog.patch	8 Sep 2008 13:42:18 -0000	1.2
@@ -1,12 +1,12 @@
-diff -ur ppl-0.9/m4/ac_check_swi_prolog.m4 ppl-0.9-patched/m4/ac_check_swi_prolog.m4
---- ppl-0.9/m4/ac_check_swi_prolog.m4	2006-01-18 16:30:03.000000000 +0100
-+++ ppl-0.9-patched/m4/ac_check_swi_prolog.m4	2008-09-08 10:22:10.000000000 +0200
-@@ -41,7 +41,7 @@
+diff -ur ppl-0.9/configure ppl-0.9-patched/configure
+--- ppl-0.9/configure	2006-03-12 09:11:32.000000000 +0100
++++ ppl-0.9-patched/configure	2008-09-08 15:38:34.000000000 +0200
+@@ -14929,7 +14929,7 @@
+   swi_prolog_version=`$swi_prolog -dump-runtime-variables | grep PLVERSION= | sed 's/PLVERSION="\(.*\)";/\1/'`
  
-   dnl Additional version checks could be inserted here, if necessary.
  
 -  SWI_PROLOG_INCLUDE_OPTIONS="-I${swi_prolog_base}/include"
 +  SWI_PROLOG_INCLUDE_OPTIONS="-I${swi_prolog_base}/include -I/usr/include/pl"
    ac_save_CPPFLAGS="$CPPFLAGS"
    CPPFLAGS="$CPPFLAGS $SWI_PROLOG_INCLUDE_OPTIONS"
-   AC_LANG_PUSH(C++)
+   ac_ext=cc


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ppl.spec	8 Sep 2008 08:25:36 -0000	1.13
+++ ppl.spec	8 Sep 2008 13:42:18 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		ppl
 Version:	0.9
-Release:	22%{?dist}
+Release:	23%{?dist}
 
 Summary:	The Parma Polyhedra Library: a library of numerical abstractions
 Group:		Development/Libraries
@@ -311,6 +311,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-23
+- Fixed ppl-0.9-swiprolog.patch.
+
 * Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-22
 - Implemented a workaround to cope with the new location of SWI-Prolog.h.
 



From pkgdb at fedoraproject.org  Mon Sep  8 13:43:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 13:43:07 +0000
Subject: [pkgdb] readahead: harald has requested watchcommits
Message-ID: <20080908134307.EAA5420876E@bastion.fedora.phx.redhat.com>

harald has requested the watchcommits acl on readahead (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/readahead



From pkgdb at fedoraproject.org  Mon Sep  8 13:43:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 13:43:09 +0000
Subject: [pkgdb] readahead: harald has requested watchbugzilla
Message-ID: <20080908134309.2ABA3208D07@bastion.fedora.phx.redhat.com>

harald has requested the watchbugzilla acl on readahead (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/readahead



From pkgdb at fedoraproject.org  Mon Sep  8 13:43:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 13:43:21 +0000
Subject: [pkgdb] readahead had acl change status
Message-ID: <20080908134321.26F73208D9B@bastion.fedora.phx.redhat.com>

harald has set the watchcommits acl on readahead (Fedora devel) to Approved for harald

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/readahead



From pkgdb at fedoraproject.org  Mon Sep  8 13:43:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 13:43:17 +0000
Subject: [pkgdb] readahead had acl change status
Message-ID: <20080908134318.6DB2B208D98@bastion.fedora.phx.redhat.com>

harald has set the watchbugzilla acl on readahead (Fedora devel) to Approved for harald

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/readahead



From rstrode at fedoraproject.org  Mon Sep  8 13:45:32 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon,  8 Sep 2008 13:45:32 +0000 (UTC)
Subject: rpms/plymouth/devel serial-again.patch, NONE, 1.1 plymouth.spec,
	1.48, 1.49
Message-ID: <20080908134532.ECD1370128@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11123

Modified Files:
	plymouth.spec 
Added Files:
	serial-again.patch 
Log Message:
- More serial console fixes (bug 460565 again)


serial-again.patch:

--- NEW FILE serial-again.patch ---
diff --git a/src/main.c b/src/main.c
index 71508c4..ca5f21c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -498,12 +498,15 @@ check_for_serial_console (state_t *state)
       free (state->console);
       state->console = strdup (console_key + strlen (" console="));
 
-      remaining_command_line = console_key + strlen (state->console) + strlen (" console=");
+      remaining_command_line = console_key + strlen (" console=");
 
       end = strpbrk (state->console, " \n\t\v,");
 
       if (end != NULL)
-        *end = '\0';
+        {
+          *end = '\0';
+          remaining_command_line += end - console;
+        }
     }
 }
 


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- plymouth.spec	5 Sep 2008 19:39:41 -0000	1.48
+++ plymouth.spec	8 Sep 2008 13:45:02 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: Plymouth Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.6.0
-Release: 0.2008.09.05.3%{?dist}
+Release: 0.2008.09.05.4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -9,6 +9,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: plymouth-0.5.0-textbar-hotness.patch
+Patch1: serial-again.patch
 
 Obsoletes: rhgb < 1:10.0.0
 Provides: rhgb = 1:10.0.0
@@ -106,6 +107,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .textbar
+%patch1 -p1 -b .serial-again
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -226,6 +228,9 @@
 %{_libdir}/plymouth/spinfinity.so
 
 %changelog
+* Mon Sep  8 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.05.4
+- More serial console fixes (bug 460565 again)
+
 * Fri Sep  5 2008 Bill Nottingham <notting at redhat.com> 0.6.0-0.2008.09.05.3
 - make the text plugin use the system release info rather than a hardcoded 'Fedora 10'
 



From rstrode at fedoraproject.org  Mon Sep  8 13:52:17 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon,  8 Sep 2008 13:52:17 +0000 (UTC)
Subject: rpms/plymouth/devel serial-again.patch,1.1,1.2
Message-ID: <20080908135217.EDEF770128@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13612

Modified Files:
	serial-again.patch 
Log Message:
fix typo in patch


serial-again.patch:

Index: serial-again.patch
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/serial-again.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- serial-again.patch	8 Sep 2008 13:45:02 -0000	1.1
+++ serial-again.patch	8 Sep 2008 13:51:47 -0000	1.2
@@ -15,7 +15,7 @@
 -        *end = '\0';
 +        {
 +          *end = '\0';
-+          remaining_command_line += end - console;
++          remaining_command_line += end - state->console;
 +        }
      }
  }



From cwickert at fedoraproject.org  Mon Sep  8 13:57:34 2008
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon,  8 Sep 2008 13:57:34 +0000 (UTC)
Subject: rpms/lostirc/devel lostirc-0.4.6-FTBFS.patch, NONE, 1.1 lostirc.spec,
	1.7, 1.8
Message-ID: <20080908135734.C9C0270128@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lostirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15646

Modified Files:
	lostirc.spec 
Added Files:
	lostirc-0.4.6-FTBFS.patch 
Log Message:
* Mon Sep  8 2008 Christoph Wickert <fedora at christoph-wickert.de> - 0.4.6-6
- Fix FTBFS bug (#440921)


lostirc-0.4.6-FTBFS.patch:

--- NEW FILE lostirc-0.4.6-FTBFS.patch ---
--- lostirc-0.4.6.orig/src/libirc/Parser.cpp
+++ lostirc-0.4.6/src/libirc/Parser.cpp
@@ -21,6 +21,7 @@
 #include <vector>
 #include <algorithm>
 #include <cassert>
+#include <ctime>
 #include "Parser.h"
 #include "Utils.h"
 #include "Channel.h"
--- lostirc-0.4.6.orig/src/libirc/ConfigValue.h
+++ lostirc-0.4.6/src/libirc/ConfigValue.h
@@ -28,12 +28,13 @@
 public:
     virtual Glib::ustring getString() = 0;
     virtual baseConfigValue& operator=(const Glib::ustring&) = 0;
+    virtual ~baseConfigValue() { }
 };
 
 template<typename T>
 class ConfigValue : public baseConfigValue
 {
-    T value;
+  T value;
 
 public:
     ConfigValue() { }
--- lostirc-0.4.6.orig/src/libirc/Socket.cpp
+++ lostirc-0.4.6/src/libirc/Socket.cpp
@@ -27,6 +27,7 @@
 
 #include <iostream>
 #include <string>
+#include <cstring>
 #include <cerrno>
 #include <cstdio>
 #include <glibmm/main.h>
@@ -324,7 +325,7 @@
         if (new_retval != -1) {
             bytes_read += new_retval;
             if (bytes_read != size_to_be_read) {
-                on_error(_("An error occured while reading from pipe (Internal error 2)"));
+                on_error(_("An error occurred while reading from pipe (Internal error 2)"));
             } else {
                 // copy the struct we received into the sockaddr member
                 memcpy(static_cast<void*>(&sockaddr.sin_addr),
@@ -334,7 +335,7 @@
                 on_host_resolved();
             }
         } else {
-            on_error(_("An error occured while reading from pipe (Internal error 3)"));
+            on_error(_("An error occurred while reading from pipe (Internal error 3)"));
         }
 
     } else {
--- lostirc-0.4.6.orig/src/libirc/FrontEnd.h
+++ lostirc-0.4.6/src/libirc/FrontEnd.h
@@ -93,7 +93,7 @@
     virtual void newDCC(DCC *dcc) = 0;
     virtual void dccStatusChanged(DCC *dcc) = 0;
     virtual void localeError(bool tried_custom_encoding) = 0;
-
+    virtual ~FrontEnd() { }
 };
 
 
--- lostirc-0.4.6.orig/src/gtkmm/MainNotebook.h
+++ lostirc-0.4.6/src/gtkmm/MainNotebook.h
@@ -30,6 +30,8 @@
 public:
     MainNotebook();
 
+    virtual bool on_key_press_event(GdkEventKey* e);
+
     Tab* addTab(Tab::Type type, const Glib::ustring& name, ServerConnection *conn);
     Tab* getCurrent(ServerConnection *conn = 0);
     Tab* findTab(const Glib::ustring& name, ServerConnection *conn, bool findInActive = false);
--- lostirc-0.4.6.orig/src/gtkmm/MainNotebook.cpp
+++ lostirc-0.4.6/src/gtkmm/MainNotebook.cpp
@@ -230,3 +230,8 @@
         tab->getText().setFont(_fontdesc);
     }
 }
+
+bool MainNotebook::on_key_press_event(GdkEventKey* e)
+{
+    return true;
+}
--- lostirc-0.4.6.orig/src/gtkmm/MainWindow.cpp
+++ lostirc-0.4.6/src/gtkmm/MainWindow.cpp
@@ -23,6 +23,7 @@
 #include <gtkmm/box.h>
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/actiongroup.h>
+#include <gtk/gtkaccelmap.h>
 #include <gdk/gdkkeysyms.h>
 #include <sigc++/retype_return.h>
 #include "DCCList.h"
@@ -54,6 +55,7 @@
           move(x, y);
     
     setupMenus();
+    gtk_accel_map_load ((App->home + "/.lostirc/accel.scm").c_str ());
     initializeTagTable();
     Gtk::VBox *vbox = manage(new Gtk::VBox());
 
@@ -99,6 +101,7 @@
         _app.options.window_y = y;
     }
 
+    gtk_accel_map_save ((App->home + "/.lostirc/accel.scm").c_str ());
     AppWin = 0;
 }
 
@@ -307,7 +310,7 @@
 {
     Glib::ustring msg;
     if (!tried_custom_encoding) {
-        msg = _("Locale conversion error. An error occured while converting text from UTF-8 to your current locale.\n\nThis is most likely because your locale is set to a value which doesn't support the character(s) converting to.\n\nIf you believe this is a bug, please report it to the application author.");
+        msg = _("Locale conversion error. An error occurred while converting text from UTF-8 to your current locale.\n\nThis is most likely because your locale is set to a value which doesn't support the character(s) converting to.\n\nIf you believe this is a bug, please report it to the application author.");
 
         char *locale = std::getenv("LANG");
         if (locale != NULL) {
@@ -315,7 +318,7 @@
             msg += locale;
         }
     } else {
-        msg = _("Encoding conversion error. An error occured while converting text from UTF-8 to the user-defined encoding.\n\nThis is most likely because the encoding you have chosen doesn't support the character(s) converting to.\n\nIf you believe this is a bug, please report it to the application author.");
+        msg = _("Encoding conversion error. An error occurred while converting text from UTF-8 to the user-defined encoding.\n\nThis is most likely because the encoding you have chosen doesn't support the character(s) converting to.\n\nIf you believe this is a bug, please report it to the application author.");
 
         msg += _("\n\nI was trying to convert to: ");
         msg += App->options.encoding;


Index: lostirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lostirc/devel/lostirc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lostirc.spec	7 Aug 2008 17:45:43 -0000	1.7
+++ lostirc.spec	8 Sep 2008 13:57:04 -0000	1.8
@@ -1,12 +1,13 @@
 Name:           lostirc
 Version:        0.4.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Simple IRC client for X11
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://lostirc.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         lostirc-0.4.6-FTBFS.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkmm24-devel, gettext, desktop-file-utils
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .ftbfs
 
 
 %build
@@ -53,6 +55,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Christoph Wickert <fedora at christoph-wickert.de> - 0.4.6-6
+- Fix FTBFS bug (#440921)
+
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.6-5
 - fix license tag
 



From simo at fedoraproject.org  Mon Sep  8 13:58:21 2008
From: simo at fedoraproject.org (Simo Sorce)
Date: Mon,  8 Sep 2008 13:58:21 +0000 (UTC)
Subject: rpms/rsync/F-9 .cvsignore, 1.31, 1.32 rsync.spec, 1.59, 1.60 sources,
	1.31, 1.32
Message-ID: <20080908135821.A0F4A70128@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/rsync/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15970

Modified Files:
	.cvsignore rsync.spec sources 
Log Message:
* Mon Sep  8 2008 Simo Sorce <ssorce at redhat.com> 3.0.4-0.fc9
- New upstream bugfix release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/F-9/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	30 Jun 2008 13:52:21 -0000	1.31
+++ .cvsignore	8 Sep 2008 13:57:51 -0000	1.32
@@ -1,2 +1,2 @@
-rsync-3.0.3.tar.gz
-rsync-patches-3.0.3.tar.gz
+rsync-3.0.4.tar.gz
+rsync-patches-3.0.4.tar.gz


Index: rsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/F-9/rsync.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- rsync.spec	30 Jun 2008 13:52:21 -0000	1.59
+++ rsync.spec	8 Sep 2008 13:57:51 -0000	1.60
@@ -1,6 +1,6 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
-Version: 3.0.3
+Version: 3.0.4
 Release: 0%{?dist}
 Group: Applications/Internet
 # TAG: for pre versions use
@@ -63,6 +63,9 @@
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Mon Sep  8 2008 Simo Sorce <ssorce at redhat.com> 3.0.4-0.fc9
+- New upstream bugfix release
+
 * Mon Jun 30 2008 Simo Sorce <ssorce at redhat.com> 3.0.3-0.fc9
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/F-9/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	30 Jun 2008 13:52:21 -0000	1.31
+++ sources	8 Sep 2008 13:57:51 -0000	1.32
@@ -1,2 +1,2 @@
-16d41aab9ece435198af222c5415a304  rsync-3.0.3.tar.gz
-ff814658791187a5f32c1a145714db43  rsync-patches-3.0.3.tar.gz
+2b2d159c9bd1b5f8adfd8b13da3a1f3f  rsync-3.0.4.tar.gz
+a7697d7002f7789faede7109b420b94c  rsync-patches-3.0.4.tar.gz



From spot at fedoraproject.org  Mon Sep  8 13:59:20 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 13:59:20 +0000 (UTC)
Subject: rpms/tetex-bytefield/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 tetex-bytefield.spec, 1.6, 1.7
Message-ID: <20080908135920.37FB670128@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tetex-bytefield/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16529

Modified Files:
	.cvsignore sources tetex-bytefield.spec 
Log Message:
fix license tag


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-bytefield/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Aug 2005 20:10:25 -0000	1.3
+++ .cvsignore	8 Sep 2008 13:58:49 -0000	1.4
@@ -1 +1 @@
-bytefield-1.2a.zip
+bytefield.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-bytefield/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Aug 2005 20:10:25 -0000	1.3
+++ sources	8 Sep 2008 13:58:49 -0000	1.4
@@ -1 +1 @@
-6b1ca98e58d7389e1f0a85c20b9a79c3  bytefield-1.2a.zip
+4b1e7a723832701351a441ace8ab754b  bytefield.zip


Index: tetex-bytefield.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-bytefield/devel/tetex-bytefield.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tetex-bytefield.spec	10 Sep 2006 17:48:48 -0000	1.6
+++ tetex-bytefield.spec	8 Sep 2008 13:58:49 -0000	1.7
@@ -6,15 +6,15 @@
 
 Name:           tetex-%{texpkg}
 Version:        1.2a
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Create illustrations for network protocol specifications
 
 Group:          Applications/Publishing
-License:        LaTeX Project Public License
+License:        LPPL
 URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/bytefield.html
 # DANTE generates CTAN packages zipfiles on-the-fly
-# ftp://ftp.dante.de/tex-archive/macros/latex/contrib/bytefield.zip
-Source0:        bytefield-1.2a.zip
+# Downloaded Mon Sep 8 2008
+Source0:        ftp://ftp.dante.de/tex-archive/macros/latex/contrib/bytefield.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -62,6 +62,10 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2a-4
+- fix license tag
+- update source (no version change)
+
 * Sun Sep 10 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.2a-3
 - Rebuild for FC6.
 



From mlichvar at fedoraproject.org  Mon Sep  8 14:00:10 2008
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Mon,  8 Sep 2008 14:00:10 +0000 (UTC)
Subject: rpms/slang/devel slang-2.1.4-makefile.patch, NONE, 1.1 .cvsignore, 
	1.13, 1.14 slang.spec, 1.51, 1.52 sources, 1.13,
	1.14 slang-2.1.3-makefile.patch, 1.1, NONE
Message-ID: <20080908140010.D6B4370128@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/slang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16944

Modified Files:
	.cvsignore slang.spec sources 
Added Files:
	slang-2.1.4-makefile.patch 
Removed Files:
	slang-2.1.3-makefile.patch 
Log Message:
- update to 2.1.4


slang-2.1.4-makefile.patch:

--- NEW FILE slang-2.1.4-makefile.patch ---
diff -up slang-2.1.4/autoconf/Makefile.in.makefile slang-2.1.4/autoconf/Makefile.in
--- slang-2.1.4/autoconf/Makefile.in.makefile	2008-09-06 06:29:27.000000000 +0200
+++ slang-2.1.4/autoconf/Makefile.in	2008-09-08 13:18:42.000000000 +0200
@@ -32,8 +32,7 @@ help:
 	@echo "make check : Build the library and run the regression tests"
 static: makefiles
 	cd src; $(MAKE) static
-	cd slsh; $(MAKE) all
-elf: makefiles
+elf: makefiles static
 	cd src; $(MAKE) elf
 	cd slsh; $(MAKE) all
 	cd modules; $(MAKE) all
diff -up slang-2.1.4/modules/Makefile.in.makefile slang-2.1.4/modules/Makefile.in
--- slang-2.1.4/modules/Makefile.in.makefile	2008-08-25 01:57:48.000000000 +0200
+++ slang-2.1.4/modules/Makefile.in	2008-09-08 13:18:42.000000000 +0200
@@ -53,7 +53,7 @@ SOCKET_LIBS = @X_EXTRA_LIBS@
 MODULE_INSTALL_DIR = @libdir@/slang/v at slang_major_version@/modules
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@
-INSTALL_MODULE	= @INSTALL_MODULE@
+INSTALL_MODULE	= @INSTALL@
 MKINSDIR	= ../autoconf/mkinsdir.sh
 SLSH_DIR	= $(prefix)/share/slsh
 CMAPS_DIR	= $(SLSH_DIR)/cmaps
@@ -67,7 +67,7 @@ DEST_SLSH_DIR	= $(DESTDIR)$(SLSH_DIR)
 DEST_CMAPSDIR	= $(DESTDIR)$(CMAPS_DIR)
 DEST_HELPDIR	= $(DESTDIR)$(HELP_DIR)
 #---------------------------------------------------------------------------
-RPATH = @RPATH@
+RPATH =
 
 LIBS = $(LDFLAGS) $(RPATH) $(SLANG_LIB) $(DL_LIB) @M_LIB@
 #LIBS = $(RPATH) $(DL_LIB) @M_LIB@
diff -up slang-2.1.4/slsh/Makefile.in.makefile slang-2.1.4/slsh/Makefile.in
--- slang-2.1.4/slsh/Makefile.in.makefile	2008-08-25 01:57:48.000000000 +0200
+++ slang-2.1.4/slsh/Makefile.in	2008-09-08 13:21:35.000000000 +0200
@@ -15,7 +15,7 @@ SLANG_SRCINC	= -I at SRCDIR@
 SLANG_SRCLIB	= -L at ELFDIR@
 #---------------------------------------------------------------------------
 OTHER_LIBS	= @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@
-RPATH		= @RPATH@
+RPATH		=
 #----------------------------------------------------------------------------
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@
@@ -64,7 +64,7 @@ DEST_SLSH_DOC_DIR= $(DESTDIR)$(SLSH_DOC_
 #----------------------------------------------------------------------------
 @SET_MAKE@
 SHELL = /bin/sh
-INST_LIBS = $(RPATH) $(SLANG_INST_LIB) $(DEST_LIB_DIR) -lslang $(READLINE_LIB) $(OTHER_LIBS)
+INST_LIBS = $(RPATH) $(DEST_LIB_DIR) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
 DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
  -DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
  -DSLSH_PATH_ENV='$(SLSH_PATH_ENV)' 
diff -up slang-2.1.4/src/Makefile.in.makefile slang-2.1.4/src/Makefile.in
--- slang-2.1.4/src/Makefile.in.makefile	2008-09-06 06:16:22.000000000 +0200
+++ slang-2.1.4/src/Makefile.in	2008-09-08 13:18:42.000000000 +0200
@@ -139,17 +139,21 @@ UPDATE_VERSION_SCRIPT = $(HOME)/bin/upda
 # Rules
 #---------------------------------------------------------------------------
 all: static elf
-static: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
-elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB)
+static: $(OBJDIR)/stamp $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
+elf: $(ELFDIR)/stamp $(CONFIG_H) $(ELFDIR_ELF_LIB)
 
-$(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)
+$(OBJS): $(OBJDIR)/stamp
+
+$(ELFOBJS): $(ELFDIR)/stamp
+
+$(OBJDIR_NORMAL_LIB): $(CONFIG_H) $(OBJS)
 	-$(RM) $(OBJDIR_NORMAL_LIB)
 	cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES)
 	$(RANLIB) $(OBJDIR_NORMAL_LIB)
 	@echo ""
 	@echo $(NORMAL_LIB) created in $(OBJDIR)
 
-$(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
+$(ELFDIR_ELF_LIB): $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
 	-$(RM) $(ELFDIR_ELF_LIB)
 	cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_BUILD_NAME) $(OFILES) $(LDFLAGS) $(ELF_DEP_LIBS)
 	if [ $(ELFLIB_MAJOR) != $(ELFLIB_BUILD_NAME) ]; then \
@@ -160,10 +164,12 @@ $(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H)
 	@echo $(ELFLIB_BUILD_NAME) created in $(ELFDIR).
 	@echo The link $(ELFLIB) to $(ELFLIB_BUILD_NAME) was also created.
 	@echo ""
-$(OBJDIR) :
+$(OBJDIR)/stamp :
 	-$(MKDIR) $(OBJDIR)
-$(ELFDIR) :
+	touch $(OBJDIR)/stamp
+$(ELFDIR)/stamp :
 	-$(MKDIR) $(ELFDIR)
+	touch $(ELFDIR)/stamp
 $(CONFIG_H) : sysconf.h
 	-$(CP) sysconf.h $(CONFIG_H)
 
@@ -194,9 +200,9 @@ install-elf-and-links:
 	-$(RM) $(DEST_LIBDIR)/$(ELFLIB)
 	-$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
 	@echo installing $(ELFLIB_BUILD_NAME) in $(DEST_LIBDIR)
-	$(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
+	$(INSTALL) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
 	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB_MAJOR)
-	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB)
+	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
 	@echo ""
 	@echo $(ELFLIB_BUILD_NAME) created in $(DEST_LIBDIR).
 	@echo The links $(ELFLIB) and $(ELFLIB_MAJOR) to $(ELFLIB_BUILD_NAME) were also created.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 Nov 2007 16:08:12 -0000	1.13
+++ .cvsignore	8 Sep 2008 13:59:40 -0000	1.14
@@ -1 +1 @@
-slang-2.1.3.tar.bz2
+slang-2.1.4.tar.bz2


Index: slang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/slang.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- slang.spec	19 Feb 2008 14:13:37 -0000	1.51
+++ slang.spec	8 Sep 2008 13:59:40 -0000	1.52
@@ -1,11 +1,11 @@
 Summary: The shared library for the S-Lang extension language
 Name: slang
-Version: 2.1.3
-Release: 3%{?dist}
+Version: 2.1.4
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Source: ftp://space.mit.edu/pub/davis/slang/v2.1/%{name}-%{version}.tar.bz2
-Patch1: slang-2.1.3-makefile.patch
+Patch1: slang-2.1.4-makefile.patch
 Patch2: slang-nointerlibc2.patch
 URL: http://www.jedsoft.org/slang/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,7 +60,12 @@
 %patch2 -p1 -b .nointerlibc2
 
 %build
-%configure --includedir=%{_includedir}/slang
+%configure \
+	--includedir=%{_includedir}/slang \
+	--with-{pcre,onig,png}lib=%{_libdir} \
+	--with-{pcre,onig,png}inc=%{_includedir} \
+;
+
 make %{?_smp_mflags} install_doc_dir=%{_docdir}/%{name}-%{version}
 
 %install
@@ -78,7 +83,7 @@
 
 %files
 %defattr(-,root,root)
-%doc COPYING doc/README changes.txt doc/*/slang*.txt doc/*.txt
+%doc COPYING NEWS doc/README changes.txt doc/*/slang*.txt doc/*.txt
 %{_libdir}/libslang*.so.*
 
 %files slsh
@@ -101,6 +106,9 @@
 %{_libdir}/libslang*.a
 
 %changelog
+* Mon Sep 08 2008 Miroslav Lichvar <mlichvar at redhat.com> - 2.1.4-1
+- update to 2.1.4
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.1.3-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 Nov 2007 16:08:12 -0000	1.13
+++ sources	8 Sep 2008 13:59:40 -0000	1.14
@@ -1 +1 @@
-0e4ae3aac75441eaa230bceb7811f088  slang-2.1.3.tar.bz2
+1299d5d3317e2aa7e2d75c8ce889474c  slang-2.1.4.tar.bz2


--- slang-2.1.3-makefile.patch DELETED ---



From simo at fedoraproject.org  Mon Sep  8 14:02:01 2008
From: simo at fedoraproject.org (Simo Sorce)
Date: Mon,  8 Sep 2008 14:02:01 +0000 (UTC)
Subject: rpms/rsync/devel .cvsignore, 1.31, 1.32 rsync.spec, 1.59,
	1.60 sources, 1.31, 1.32
Message-ID: <20080908140201.6D2AF70128@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/rsync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18028

Modified Files:
	.cvsignore rsync.spec sources 
Log Message:
* Mon Sep  8 2008 Simo Sorce <ssorce at redhat.com> 3.0.4-0.fc10
- New upstream bugfix release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	30 Jun 2008 13:57:14 -0000	1.31
+++ .cvsignore	8 Sep 2008 14:01:31 -0000	1.32
@@ -1,2 +1,2 @@
-rsync-3.0.3.tar.gz
-rsync-patches-3.0.3.tar.gz
+rsync-3.0.4.tar.gz
+rsync-patches-3.0.4.tar.gz


Index: rsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/devel/rsync.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- rsync.spec	30 Jun 2008 13:57:14 -0000	1.59
+++ rsync.spec	8 Sep 2008 14:01:31 -0000	1.60
@@ -1,6 +1,6 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
-Version: 3.0.3
+Version: 3.0.4
 Release: 0%{?dist}
 Group: Applications/Internet
 # TAG: for pre versions use
@@ -63,6 +63,9 @@
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Mon Sep  8 2008 Simo Sorce <ssorce at redhat.com> 3.0.4-0.fc10
+- New upstream bugfix release
+
 * Mon Jun 30 2008 Simo Sorce <ssorce at redhat.com> 3.0.3-0.fc10
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	30 Jun 2008 13:57:14 -0000	1.31
+++ sources	8 Sep 2008 14:01:31 -0000	1.32
@@ -1,2 +1,2 @@
-16d41aab9ece435198af222c5415a304  rsync-3.0.3.tar.gz
-ff814658791187a5f32c1a145714db43  rsync-patches-3.0.3.tar.gz
+2b2d159c9bd1b5f8adfd8b13da3a1f3f  rsync-3.0.4.tar.gz
+a7697d7002f7789faede7109b420b94c  rsync-patches-3.0.4.tar.gz



From spot at fedoraproject.org  Mon Sep  8 14:10:24 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 14:10:24 +0000 (UTC)
Subject: rpms/tetex-font-cm-lgc/devel tetex-font-cm-lgc.spec,1.13,1.14
Message-ID: <20080908141024.3494F70128@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tetex-font-cm-lgc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22076

Modified Files:
	tetex-font-cm-lgc.spec 
Log Message:
fix license tag


Index: tetex-font-cm-lgc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-font-cm-lgc/devel/tetex-font-cm-lgc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tetex-font-cm-lgc.spec	4 Jan 2008 12:30:47 -0000	1.13
+++ tetex-font-cm-lgc.spec	8 Sep 2008 14:10:23 -0000	1.14
@@ -6,10 +6,11 @@
 
 Name:           tetex-font-cm-lgc
 Version:        0.5
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        CM-LGC Type1 fonts for LaTeX
 Group:          Applications/Publishing
-License:        GPL
+# Font exception
+License:        GPLv2+ with exceptions
 URL:            http://www.ctan.org/tex-archive/fonts/ps-type1/cm-lgc
 Source0:        cm-lgc-%{ctan_date}.zip
 # upstream source - unversioned zip file
@@ -85,6 +86,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5-10
+- fix license tag
+
 * Fri Jan  4 2008 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.5-9
 - Drop -fonts requires.
 



From harald at fedoraproject.org  Mon Sep  8 14:13:17 2008
From: harald at fedoraproject.org (Harald Hoyer)
Date: Mon,  8 Sep 2008 14:13:17 +0000 (UTC)
Subject: rpms/system-config-boot/devel .cvsignore, 1.17, 1.18 sources, 1.17, 
	1.18 system-config-boot.spec, 1.25, 1.26
Message-ID: <20080908141317.9E73070128@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/system-config-boot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23269

Modified Files:
	.cvsignore sources system-config-boot.spec 
Log Message:
* Mon Sep 08 2008 Harald Hoyer <harald at redhat.com> - 0.2.21-1
- removed .png from icon entry in the desktop file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	8 Apr 2008 10:51:00 -0000	1.17
+++ .cvsignore	8 Sep 2008 14:12:47 -0000	1.18
@@ -1 +1 @@
-system-config-boot-0.2.20.tar.gz
+system-config-boot-0.2.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	8 Apr 2008 10:51:00 -0000	1.17
+++ sources	8 Sep 2008 14:12:47 -0000	1.18
@@ -1 +1 @@
-9c9fc05cab6bd6744170b0e3567e3742  system-config-boot-0.2.20.tar.gz
+6fa8057ccb2f94e03145bb96bacfd773  system-config-boot-0.2.21.tar.gz


Index: system-config-boot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/devel/system-config-boot.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- system-config-boot.spec	6 Sep 2008 19:22:35 -0000	1.25
+++ system-config-boot.spec	8 Sep 2008 14:12:47 -0000	1.26
@@ -3,10 +3,10 @@
 
 Summary: A graphical interface for configuring the boot loader
 Name: system-config-boot
-Version: 0.2.20
-Release: 2%{?dist}
+Version: 0.2.21
+Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/boot
-License: GPLv2+
+License: GPLv2
 ExclusiveOS: Linux
 Group: Applications/System 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,7 +18,7 @@
 ExclusiveArch: %{ix86} x86_64
 Obsoletes: redhat-config-boot < 0.2
 Provides: redhat-config-boot = %{version}
-BuildRequires: python >= 0:2.2 gettext glib2-devel desktop-file-utils perl-XML-Parser
+BuildRequires: python >= 0:2.2 gettext glib2-devel desktop-file-utils perl-XML-Parser intltool
 
 %description
 system-config-boot is a graphical user interface that allows 
@@ -65,8 +65,11 @@
 %attr(0644,root,root) %config(noreplace) /etc/pam.d/system-config-boot
 
 %changelog
+* Mon Sep 08 2008 Harald Hoyer <harald at redhat.com> - 0.2.21-1
+- removed .png from icon entry in the desktop file
+
 * Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.20-2
-- fix license tag
+- fix license tag, %%configure and %%files
 
 * Tue Apr 08 2008 Harald Hoyer <harald at redhat.com> - 0.2.20-1
 - translation update



From spot at fedoraproject.org  Mon Sep  8 14:17:20 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 14:17:20 +0000 (UTC)
Subject: rpms/tetex-fonts-hebrew/devel tetex-fonts-hebrew.spec,1.4,1.5
Message-ID: <20080908141720.3527970128@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tetex-fonts-hebrew/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24957

Modified Files:
	tetex-fonts-hebrew.spec 
Log Message:
fix license tag


Index: tetex-fonts-hebrew.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-fonts-hebrew/devel/tetex-fonts-hebrew.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tetex-fonts-hebrew.spec	1 Dec 2007 14:37:10 -0000	1.4
+++ tetex-fonts-hebrew.spec	8 Sep 2008 14:16:49 -0000	1.5
@@ -1,10 +1,11 @@
 Summary: Culmus Hebrew fonts support for tetex
 Name: tetex-fonts-hebrew
 Version: 0.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 URL: http://culmus.sf.net
 Source: tetex-fonts-hebrew-%{version}.tar.gz
-License: GPL
+# No version specified.
+License: GPL+
 Group: Applications/Text
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tetex, tetex-afm, fonts-hebrew
@@ -58,6 +59,9 @@
 /usr/bin/texhash
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.1-9
+- fix license tag
+
 * Sat Dec  1 2007 Dan Kenigsberg <danken at cs.technion.ac.il> 0.1-8
 - Link to newly-named culmus-fonts. Bug #391161
 * Sat Sep 16 2006 Dan Kenigsberg <danken at cs.technion.ac.il> 0.1-7



From bagnara at fedoraproject.org  Mon Sep  8 14:19:16 2008
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Mon,  8 Sep 2008 14:19:16 +0000 (UTC)
Subject: rpms/ppl/devel ppl-0.9-swiprolog.patch,1.2,1.3 ppl.spec,1.14,1.15
Message-ID: <20080908141916.8DE8270128@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26096

Modified Files:
	ppl-0.9-swiprolog.patch ppl.spec 
Log Message:
Changed ppl-0.9-swiprolog.patch so as to invoke `plld' with
the `-v' option.


ppl-0.9-swiprolog.patch:

Index: ppl-0.9-swiprolog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl-0.9-swiprolog.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ppl-0.9-swiprolog.patch	8 Sep 2008 13:42:18 -0000	1.2
+++ ppl-0.9-swiprolog.patch	8 Sep 2008 14:19:16 -0000	1.3
@@ -10,3 +10,33 @@
    ac_save_CPPFLAGS="$CPPFLAGS"
    CPPFLAGS="$CPPFLAGS $SWI_PROLOG_INCLUDE_OPTIONS"
    ac_ext=cc
+diff -ur ppl-0.9/interfaces/Prolog/SWI/Makefile.in ppl-0.9-patched/interfaces/Prolog/SWI/Makefile.in
+--- ppl-0.9/interfaces/Prolog/SWI/Makefile.in	2006-03-12 09:11:44.000000000 +0100
++++ ppl-0.9-patched/interfaces/Prolog/SWI/Makefile.in	2008-09-08 16:16:05.000000000 +0200
+@@ -728,7 +728,7 @@
+ # Notice: we are linking statically until we understand whether
+ # and if libtool and plld can interoperate.
+ @BUILD_SWI_PROLOG_INTERFACE_TRUE at ppl_pl$(EXEEXT): ppl_swiprolog.o ppl_pl.o | libppl_swiprolog.la
+- at BUILD_SWI_PROLOG_INTERFACE_TRUE@	plld -cc $(CC) -c++ $(CXX) -ld $(CXX) \
++ at BUILD_SWI_PROLOG_INTERFACE_TRUE@	plld -v -cc $(CC) -c++ $(CXX) -ld $(CXX) \
+ @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-ld-options`echo '' $(AM_CXXFLAGS) $(CXXFLAGS) | tr " " ","` \
+ @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-o $@ $+ \
+ @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-L$(top_builddir)/src/.libs -lppl \
+@@ -736,7 +736,7 @@
+ @BUILD_SWI_PROLOG_INTERFACE_TRUE@		@extra_libraries@
+ 
+ @BUILD_SWI_PROLOG_INTERFACE_TRUE at pl_clpq$(EXEEXT): ppl_swiprolog.o pl_clpq.o pl_clpq.pl ../tests/clpq.pl | libppl_swiprolog.la 
+- at BUILD_SWI_PROLOG_INTERFACE_TRUE@	plld -cc $(CC) -c++ $(CXX) -ld $(CXX) \
++ at BUILD_SWI_PROLOG_INTERFACE_TRUE@	plld -v -cc $(CC) -c++ $(CXX) -ld $(CXX) \
+ @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-ld-options`echo '' $(AM_CXXFLAGS) $(CXXFLAGS) | tr " " ","` \
+ @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-o $@ $+ \
+ @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-L$(top_builddir)/src/.libs -lppl \
+@@ -744,7 +744,7 @@
+ @BUILD_SWI_PROLOG_INTERFACE_TRUE@		@extra_libraries@
+ 
+ @BUILD_SWI_PROLOG_INTERFACE_TRUE at pl_clpq2$(EXEEXT): ppl_swiprolog.o pl_clpq.o pl_clpq.pl ../tests/clpq2.pl | libppl_swiprolog.la 
+- at BUILD_SWI_PROLOG_INTERFACE_TRUE@	plld -cc $(CC) -c++ $(CXX) -ld $(CXX) \
++ at BUILD_SWI_PROLOG_INTERFACE_TRUE@	plld -v -cc $(CC) -c++ $(CXX) -ld $(CXX) \
+ @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-ld-options`echo '' $(AM_CXXFLAGS) $(CXXFLAGS) | tr " " ","` \
+ @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-o $@ $+ \
+ @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-L$(top_builddir)/src/.libs -lppl \


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ppl.spec	8 Sep 2008 13:42:18 -0000	1.14
+++ ppl.spec	8 Sep 2008 14:19:16 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		ppl
 Version:	0.9
-Release:	23%{?dist}
+Release:	24%{?dist}
 
 Summary:	The Parma Polyhedra Library: a library of numerical abstractions
 Group:		Development/Libraries
@@ -311,6 +311,10 @@
 rm -rf %{buildroot}
 
 %changelog
+* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-24
+- Changed ppl-0.9-swiprolog.patch so as to invoke `plld' with
+  the `-v' option.
+
 * Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-23
 - Fixed ppl-0.9-swiprolog.patch.
 



From mdehaan at fedoraproject.org  Mon Sep  8 14:19:33 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon,  8 Sep 2008 14:19:33 +0000 (UTC)
Subject: rpms/cobbler/EL-5 .cvsignore, 1.45, 1.46 cobbler.spec, 1.53,
	1.54 sources, 1.52, 1.53
Message-ID: <20080908141933.E8ABA70128@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25648/EL-5

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.4, which is a rebuild of the previous release to remove cli_report.py




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	7 Sep 2008 22:10:00 -0000	1.45
+++ .cvsignore	8 Sep 2008 14:19:03 -0000	1.46
@@ -42,3 +42,4 @@
 cobbler-1.2.1.tar.gz
 cobbler-1.2.2.tar.gz
 cobbler-1.2.3.tar.gz
+cobbler-1.2.4.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- cobbler.spec	7 Sep 2008 22:10:00 -0000	1.53
+++ cobbler.spec	8 Sep 2008 14:19:03 -0000	1.54
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.3
+Version: 1.2.4
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -217,6 +217,9 @@
 
 %changelog
 
+* Mon Sep 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.4-1
+- Rebuild
+
 * Sun Sep 07 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.3-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	7 Sep 2008 22:10:00 -0000	1.52
+++ sources	8 Sep 2008 14:19:03 -0000	1.53
@@ -4,4 +4,5 @@
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
 2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
 df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz
-dac86d3a02e677da597a7ac00c51c889  cobbler-1.2.3.tar.gz
+394072caed01acc1f01d5289b9c396a1  cobbler-1.2.3.tar.gz
+4586e811e587c929edfc5675d8c018c8  cobbler-1.2.4.tar.gz



From mdehaan at fedoraproject.org  Mon Sep  8 14:19:34 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon,  8 Sep 2008 14:19:34 +0000 (UTC)
Subject: rpms/cobbler/F-7 .cvsignore, 1.41, 1.42 cobbler.spec, 1.51,
	1.52 sources, 1.49, 1.50
Message-ID: <20080908141934.3EC0370128@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25648/F-7

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.4, which is a rebuild of the previous release to remove cli_report.py




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	7 Sep 2008 22:10:00 -0000	1.41
+++ .cvsignore	8 Sep 2008 14:19:03 -0000	1.42
@@ -38,3 +38,4 @@
 cobbler-1.2.1.tar.gz
 cobbler-1.2.2.tar.gz
 cobbler-1.2.3.tar.gz
+cobbler-1.2.4.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/cobbler.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- cobbler.spec	7 Sep 2008 22:10:01 -0000	1.51
+++ cobbler.spec	8 Sep 2008 14:19:03 -0000	1.52
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.3
+Version: 1.2.4
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -217,6 +217,9 @@
 
 %changelog
 
+* Mon Sep 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.4-1
+- Rebuild
+
 * Sun Sep 07 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.3-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	7 Sep 2008 22:10:01 -0000	1.49
+++ sources	8 Sep 2008 14:19:03 -0000	1.50
@@ -4,4 +4,5 @@
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
 2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
 df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz
-dac86d3a02e677da597a7ac00c51c889  cobbler-1.2.3.tar.gz
+394072caed01acc1f01d5289b9c396a1  cobbler-1.2.3.tar.gz
+4586e811e587c929edfc5675d8c018c8  cobbler-1.2.4.tar.gz



From mdehaan at fedoraproject.org  Mon Sep  8 14:19:34 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon,  8 Sep 2008 14:19:34 +0000 (UTC)
Subject: rpms/cobbler/F-8 .cvsignore, 1.41, 1.42 cobbler.spec, 1.50,
	1.51 sources, 1.49, 1.50
Message-ID: <20080908141934.8E0DE70128@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25648/F-8

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.4, which is a rebuild of the previous release to remove cli_report.py




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	7 Sep 2008 22:10:01 -0000	1.41
+++ .cvsignore	8 Sep 2008 14:19:04 -0000	1.42
@@ -38,3 +38,4 @@
 cobbler-1.2.1.tar.gz
 cobbler-1.2.2.tar.gz
 cobbler-1.2.3.tar.gz
+cobbler-1.2.4.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/cobbler.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- cobbler.spec	7 Sep 2008 22:10:01 -0000	1.50
+++ cobbler.spec	8 Sep 2008 14:19:04 -0000	1.51
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.3
+Version: 1.2.4
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -217,6 +217,9 @@
 
 %changelog
 
+* Mon Sep 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.4-1
+- Rebuild
+
 * Sun Sep 07 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.3-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	7 Sep 2008 22:10:01 -0000	1.49
+++ sources	8 Sep 2008 14:19:04 -0000	1.50
@@ -4,4 +4,5 @@
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
 2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
 df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz
-dac86d3a02e677da597a7ac00c51c889  cobbler-1.2.3.tar.gz
+394072caed01acc1f01d5289b9c396a1  cobbler-1.2.3.tar.gz
+4586e811e587c929edfc5675d8c018c8  cobbler-1.2.4.tar.gz



From mdehaan at fedoraproject.org  Mon Sep  8 14:19:35 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon,  8 Sep 2008 14:19:35 +0000 (UTC)
Subject: rpms/cobbler/F-9 .cvsignore, 1.41, 1.42 cobbler.spec, 1.53,
	1.54 sources, 1.48, 1.49
Message-ID: <20080908141935.27E6870128@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25648/F-9

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.4, which is a rebuild of the previous release to remove cli_report.py




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	7 Sep 2008 22:10:01 -0000	1.41
+++ .cvsignore	8 Sep 2008 14:19:04 -0000	1.42
@@ -38,3 +38,4 @@
 cobbler-1.2.1.tar.gz
 cobbler-1.2.2.tar.gz
 cobbler-1.2.3.tar.gz
+cobbler-1.2.4.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/cobbler.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- cobbler.spec	7 Sep 2008 22:10:01 -0000	1.53
+++ cobbler.spec	8 Sep 2008 14:19:04 -0000	1.54
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.3
+Version: 1.2.4
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -217,6 +217,9 @@
 
 %changelog
 
+* Mon Sep 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.4-1
+- Rebuild
+
 * Sun Sep 07 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.3-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	7 Sep 2008 22:10:01 -0000	1.48
+++ sources	8 Sep 2008 14:19:04 -0000	1.49
@@ -4,4 +4,5 @@
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
 2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
 df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz
-dac86d3a02e677da597a7ac00c51c889  cobbler-1.2.3.tar.gz
+394072caed01acc1f01d5289b9c396a1  cobbler-1.2.3.tar.gz
+4586e811e587c929edfc5675d8c018c8  cobbler-1.2.4.tar.gz



From mdehaan at fedoraproject.org  Mon Sep  8 14:19:33 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon,  8 Sep 2008 14:19:33 +0000 (UTC)
Subject: rpms/cobbler/EL-4 .cvsignore, 1.41, 1.42 cobbler.spec, 1.51,
	1.52 sources, 1.49, 1.50
Message-ID: <20080908141933.A09FC70128@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25648/EL-4

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.4, which is a rebuild of the previous release to remove cli_report.py




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	7 Sep 2008 22:10:00 -0000	1.41
+++ .cvsignore	8 Sep 2008 14:19:03 -0000	1.42
@@ -38,3 +38,4 @@
 cobbler-1.2.1.tar.gz
 cobbler-1.2.2.tar.gz
 cobbler-1.2.3.tar.gz
+cobbler-1.2.4.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- cobbler.spec	7 Sep 2008 22:10:00 -0000	1.51
+++ cobbler.spec	8 Sep 2008 14:19:03 -0000	1.52
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.3
+Version: 1.2.4
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -217,6 +217,9 @@
 
 %changelog
 
+* Mon Sep 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.4-1
+- Rebuild
+
 * Sun Sep 07 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.3-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	7 Sep 2008 22:10:00 -0000	1.49
+++ sources	8 Sep 2008 14:19:03 -0000	1.50
@@ -5,3 +5,4 @@
 2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
 df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz
 dac86d3a02e677da597a7ac00c51c889  cobbler-1.2.3.tar.gz
+4586e811e587c929edfc5675d8c018c8  cobbler-1.2.4.tar.gz



From mdehaan at fedoraproject.org  Mon Sep  8 14:19:35 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon,  8 Sep 2008 14:19:35 +0000 (UTC)
Subject: rpms/cobbler/devel .cvsignore, 1.41, 1.42 cobbler.spec, 1.55,
	1.56 sources, 1.50, 1.51
Message-ID: <20080908141935.6DDB070128@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25648/devel

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.4, which is a rebuild of the previous release to remove cli_report.py




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	7 Sep 2008 22:10:01 -0000	1.41
+++ .cvsignore	8 Sep 2008 14:19:05 -0000	1.42
@@ -38,3 +38,4 @@
 cobbler-1.2.1.tar.gz
 cobbler-1.2.2.tar.gz
 cobbler-1.2.3.tar.gz
+cobbler-1.2.4.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- cobbler.spec	7 Sep 2008 22:10:01 -0000	1.55
+++ cobbler.spec	8 Sep 2008 14:19:05 -0000	1.56
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.3
+Version: 1.2.4
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -217,6 +217,9 @@
 
 %changelog
 
+* Mon Sep 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.4-1
+- Rebuild
+
 * Sun Sep 07 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.3-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	7 Sep 2008 22:10:01 -0000	1.50
+++ sources	8 Sep 2008 14:19:05 -0000	1.51
@@ -4,4 +4,5 @@
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
 2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
 df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz
-dac86d3a02e677da597a7ac00c51c889  cobbler-1.2.3.tar.gz
+394072caed01acc1f01d5289b9c396a1  cobbler-1.2.3.tar.gz
+4586e811e587c929edfc5675d8c018c8  cobbler-1.2.4.tar.gz



From jwrdegoede at fedoraproject.org  Mon Sep  8 14:20:40 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon,  8 Sep 2008 14:20:40 +0000 (UTC)
Subject: rpms/scorched3d/devel scorched3d-syslibs.patch, 1.6,
	1.7 scorched3d.spec, 1.31, 1.32 scorched3d-41.1-64bit.patch, 1.1, NONE
Message-ID: <20080908142040.545DF70128@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/scorched3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27073

Modified Files:
	scorched3d-syslibs.patch scorched3d.spec 
Removed Files:
	scorched3d-41.1-64bit.patch 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 41.3-3
- Fix patch fuzz build failure


scorched3d-syslibs.patch:

Index: scorched3d-syslibs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scorched3d/devel/scorched3d-syslibs.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scorched3d-syslibs.patch	6 Nov 2007 21:31:37 -0000	1.6
+++ scorched3d-syslibs.patch	8 Sep 2008 14:20:40 -0000	1.7
@@ -1,6 +1,18 @@
-diff -up scorched/src/XML/XMLParser.h.syslibs scorched/src/XML/XMLParser.h
---- scorched/src/XML/XMLParser.h.syslibs	2006-05-01 01:42:52.000000000 +0200
-+++ scorched/src/XML/XMLParser.h	2007-10-31 20:45:00.000000000 +0100
+diff -up scorched/src/GLEXT/GLState.h.foo scorched/src/GLEXT/GLState.h
+--- scorched/src/GLEXT/GLState.h.foo	2008-09-08 16:15:45.000000000 +0200
++++ scorched/src/GLEXT/GLState.h	2008-09-08 16:15:53.000000000 +0200
+@@ -23,7 +23,7 @@
+ 
+ #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
+ 
+-#include "glew.h"
++#include <GL/glew.h>
+ 
+ class GLState  
+ {
+diff -up scorched/src/XML/XMLParser.h.foo scorched/src/XML/XMLParser.h
+--- scorched/src/XML/XMLParser.h.foo	2008-09-08 16:15:45.000000000 +0200
++++ scorched/src/XML/XMLParser.h	2008-09-08 16:15:53.000000000 +0200
 @@ -21,7 +21,7 @@
  #if !defined(__INCLUDE_XMLParserh_INCLUDE__)
  #define __INCLUDE_XMLParserh_INCLUDE__
@@ -10,21 +22,21 @@
  #include <XML/XMLNode.h>
  
  class XMLParser
-diff -up scorched/src/scorcheds/Makefile.am.syslibs scorched/src/scorcheds/Makefile.am
---- scorched/src/scorcheds/Makefile.am.syslibs	2007-10-31 11:12:14.000000000 +0100
-+++ scorched/src/scorcheds/Makefile.am	2007-10-31 20:45:00.000000000 +0100
-@@ -113,7 +113,6 @@ scorched3ds_SOURCES = \
+diff -up scorched/src/scorched/Makefile.am.foo scorched/src/scorched/Makefile.am
+--- scorched/src/scorched/Makefile.am.foo	2008-09-08 16:15:45.000000000 +0200
++++ scorched/src/scorched/Makefile.am	2008-09-08 16:15:53.000000000 +0200
+@@ -63,7 +63,6 @@ scorched3d_SOURCES = \
  	../common/ProgressCounter.h \
  	../common/RandomGenerator.cpp \
  	../common/RandomGenerator.h \
 -	../common/snprintf.c \
- 	../common/SplineCurve.cpp \
- 	../common/SplineCurve.h \
- 	../common/SplinePath.cpp \
-@@ -347,29 +346,14 @@ scorched3ds_SOURCES = \
- 	../net/NetServerUDP.h \
- 	../net/NetServerUDPDestination.cpp \
- 	../net/NetServerUDPDestination.h \
+ 	../common/Vector.cpp \
+ 	../common/Vector.h \
+ 	../common/Vector4.cpp \
+@@ -78,29 +77,14 @@ scorched3d_SOURCES = \
+ 	../net/NetInterface.h \
+ 	../net/UniqueIdStore.cpp \
+ 	../net/UniqueIdStore.h \
 -	../XML/ascii.h \
 -	../XML/asciitab.h \
 -	../XML/expat.h \
@@ -48,52 +60,46 @@
  	../XML/XMLStringBuffer.h \
 -	../XML/xmltok.c \
 -	../XML/xmltok.h \
- 	../engine/Action.cpp \
- 	../engine/Action.h \
- 	../engine/ActionController.cpp \
-@@ -790,5 +774,5 @@ scorched3ds_SOURCES = \
- 	../movement/TargetMovementEntrySpline.h
+ 	../tankai/TankAINames.cpp \
+ 	../tankai/TankAINames.h \
+ 	../landscapedef/LandscapeDefinitionsBase.cpp \
+@@ -122,5 +106,5 @@ scorched3d_SOURCES = \
+ 	../wxdialogs/SettingsDialog.h
  
- AM_CPPFLAGS = -I../porting -I.. -DS3D_SERVER=1 @SDL_CFLAGS@ @MYSQL_CFLAGS@
--LDADD = @SDL_LIBS@ @MYSQL_LIBS@
-+LDADD = @SDL_LIBS@ @MYSQL_LIBS@ -lexpat
+ AM_CPPFLAGS = -I../porting -I.. @WX_CFLAGS@ @FT2_CFLAGS@ @SDL_CFLAGS@
+-LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@
++LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@ -lexpat
  
-diff -up scorched/src/scorcheds/Makefile.in.syslibs scorched/src/scorcheds/Makefile.in
---- scorched/src/scorcheds/Makefile.in.syslibs	2007-10-31 11:20:54.000000000 +0100
-+++ scorched/src/scorcheds/Makefile.in	2007-10-31 20:46:32.000000000 +0100
-@@ -72,7 +72,7 @@ am_scorched3ds_OBJECTS = AddTarget.$(OBJ
- 	OptionsGame.$(OBJEXT) OptionsMasterListServer.$(OBJEXT) \
- 	OptionsParameters.$(OBJEXT) OptionsScorched.$(OBJEXT) \
- 	OptionsTransient.$(OBJEXT) ProgressCounter.$(OBJEXT) \
--	RandomGenerator.$(OBJEXT) snprintf.$(OBJEXT) \
-+	RandomGenerator.$(OBJEXT) \
- 	SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \
- 	StatsLogger.$(OBJEXT) StatsLoggerDatabase.$(OBJEXT) \
- 	StatsLoggerFile.$(OBJEXT) StatsLoggerMySQL.$(OBJEXT) \
-@@ -140,9 +140,8 @@ am_scorched3ds_OBJECTS = AddTarget.$(OBJ
- 	NetOptions.$(OBJEXT) NetServerTCP.$(OBJEXT) \
- 	NetServerTCPProtocol.$(OBJEXT) NetServerTCPRead.$(OBJEXT) \
- 	NetServerUDP.$(OBJEXT) NetServerUDPDestination.$(OBJEXT) \
--	XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) xmlparse.$(OBJEXT) \
--	XMLParser.$(OBJEXT) xmlrole.$(OBJEXT) \
--	XMLStringBuffer.$(OBJEXT) xmltok.$(OBJEXT) Action.$(OBJEXT) \
-+	XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) \
-+	XMLStringBuffer.$(OBJEXT) Action.$(OBJEXT) \
- 	ActionController.$(OBJEXT) ActionReferenced.$(OBJEXT) \
- 	EventContainer.$(OBJEXT) GameState.$(OBJEXT) \
- 	GameStateI.$(OBJEXT) GameStateStimulusI.$(OBJEXT) \
-@@ -511,7 +510,6 @@ scorched3ds_SOURCES = \
+diff -up scorched/src/scorched/Makefile.in.foo scorched/src/scorched/Makefile.in
+--- scorched/src/scorched/Makefile.in.foo	2008-09-08 16:15:45.000000000 +0200
++++ scorched/src/scorched/Makefile.in	2008-09-08 16:15:53.000000000 +0200
+@@ -62,12 +62,11 @@ am_scorched3d_OBJECTS = main.$(OBJEXT) S
+ 	OptionEntry.$(OBJEXT) OptionsGame.$(OBJEXT) \
+ 	OptionsMasterListServer.$(OBJEXT) OptionsParameters.$(OBJEXT) \
+ 	ProgressCounter.$(OBJEXT) RandomGenerator.$(OBJEXT) \
+-	snprintf.$(OBJEXT) Vector.$(OBJEXT) Vector4.$(OBJEXT) \
++	Vector.$(OBJEXT) Vector4.$(OBJEXT) \
+ 	VectorLib.$(OBJEXT) NetBuffer.$(OBJEXT) \
+ 	NetBufferPool.$(OBJEXT) NetInterface.$(OBJEXT) \
+ 	UniqueIdStore.$(OBJEXT) XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) \
+-	xmlparse.$(OBJEXT) XMLParser.$(OBJEXT) xmlrole.$(OBJEXT) \
+-	XMLStringBuffer.$(OBJEXT) xmltok.$(OBJEXT) \
++	XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \
+ 	TankAINames.$(OBJEXT) LandscapeDefinitionsBase.$(OBJEXT) \
+ 	CreateDialogs.$(OBJEXT) DialogUtils.$(OBJEXT) \
+ 	DisplayDialog.$(OBJEXT) KeyDialog.$(OBJEXT) \
+@@ -289,7 +288,6 @@ scorched3d_SOURCES = \
  	../common/ProgressCounter.h \
  	../common/RandomGenerator.cpp \
  	../common/RandomGenerator.h \
 -	../common/snprintf.c \
- 	../common/SplineCurve.cpp \
- 	../common/SplineCurve.h \
- 	../common/SplinePath.cpp \
-@@ -745,29 +743,14 @@ scorched3ds_SOURCES = \
- 	../net/NetServerUDP.h \
- 	../net/NetServerUDPDestination.cpp \
- 	../net/NetServerUDPDestination.h \
+ 	../common/Vector.cpp \
+ 	../common/Vector.h \
+ 	../common/Vector4.cpp \
+@@ -304,29 +302,14 @@ scorched3d_SOURCES = \
+ 	../net/NetInterface.h \
+ 	../net/UniqueIdStore.cpp \
+ 	../net/UniqueIdStore.h \
 -	../XML/ascii.h \
 -	../XML/asciitab.h \
 -	../XML/expat.h \
@@ -117,20 +123,20 @@
  	../XML/XMLStringBuffer.h \
 -	../XML/xmltok.c \
 -	../XML/xmltok.h \
- 	../engine/Action.cpp \
- 	../engine/Action.h \
- 	../engine/ActionController.cpp \
-@@ -1188,7 +1171,7 @@ scorched3ds_SOURCES = \
- 	../movement/TargetMovementEntrySpline.h
+ 	../tankai/TankAINames.cpp \
+ 	../tankai/TankAINames.h \
+ 	../landscapedef/LandscapeDefinitionsBase.cpp \
+@@ -348,7 +331,7 @@ scorched3d_SOURCES = \
+ 	../wxdialogs/SettingsDialog.h
  
- AM_CPPFLAGS = -I../porting -I.. -DS3D_SERVER=1 @SDL_CFLAGS@ @MYSQL_CFLAGS@
--LDADD = @SDL_LIBS@ @MYSQL_LIBS@
-+LDADD = @SDL_LIBS@ @MYSQL_LIBS@ -lexpat
+ AM_CPPFLAGS = -I../porting -I.. @WX_CFLAGS@ @FT2_CFLAGS@ @SDL_CFLAGS@
+-LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@
++LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@ -lexpat
  all: all-am
  
  .SUFFIXES:
-@@ -1639,10 +1622,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.tab.Po at am__quote@
+@@ -466,10 +449,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLStringBuffer.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fixed.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/snprintf.Po at am__quote@
@@ -140,7 +146,7 @@
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -1658,62 +1637,6 @@ distclean-compile:
+@@ -485,62 +464,6 @@ distclean-compile:
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
@@ -203,19 +209,19 @@
  .cpp.o:
  @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
  @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-diff -up scorched/src/scorched/Makefile.am.syslibs scorched/src/scorched/Makefile.am
---- scorched/src/scorched/Makefile.am.syslibs	2007-10-14 23:05:52.000000000 +0200
-+++ scorched/src/scorched/Makefile.am	2007-10-31 20:45:00.000000000 +0100
-@@ -63,7 +63,6 @@ scorched3d_SOURCES = \
- 	../common/ProgressCounter.h \
- 	../common/RandomGenerator.cpp \
+diff -up scorched/src/scorchedc/Makefile.am.foo scorched/src/scorchedc/Makefile.am
+--- scorched/src/scorchedc/Makefile.am.foo	2008-09-08 16:15:45.000000000 +0200
++++ scorched/src/scorchedc/Makefile.am	2008-09-08 16:15:53.000000000 +0200
+@@ -123,7 +123,6 @@ scorched3dc_SOURCES = \
  	../common/RandomGenerator.h \
+ 	../common/sha2.cpp \
+ 	../common/sha2.h \
 -	../common/snprintf.c \
- 	../common/Vector.cpp \
- 	../common/Vector.h \
- 	../common/Vector4.cpp \
-@@ -78,29 +77,14 @@ scorched3d_SOURCES = \
- 	../net/NetInterface.h \
+ 	../common/SplineCurve.cpp \
+ 	../common/SplineCurve.h \
+ 	../common/SplinePath.cpp \
+@@ -374,29 +373,14 @@ scorched3dc_SOURCES = \
+ 	../net/SecureID.h \
  	../net/UniqueIdStore.cpp \
  	../net/UniqueIdStore.h \
 -	../XML/ascii.h \
@@ -241,44 +247,65 @@
  	../XML/XMLStringBuffer.h \
 -	../XML/xmltok.c \
 -	../XML/xmltok.h \
- 	../tankai/TankAINames.cpp \
- 	../tankai/TankAINames.h \
- 	../landscapedef/LandscapeDefinitionsBase.cpp \
-@@ -122,5 +106,5 @@ scorched3d_SOURCES = \
- 	../wxdialogs/SettingsDialog.h
+ 	../engine/Action.cpp \
+ 	../engine/Action.h \
+ 	../engine/ActionController.cpp \
+@@ -792,7 +776,6 @@ scorched3dc_SOURCES = \
+ 	../GLEXT/GLConsoleRules.h \
+ 	../GLEXT/GLDynamicVertexArray.cpp \
+ 	../GLEXT/GLDynamicVertexArray.h \
+-	../GLEXT/glew.c \
+ 	../GLEXT/GLFont2d.cpp \
+ 	../GLEXT/GLFont2d.h \
+ 	../GLEXT/GLFrameBufferObject.cpp \
+@@ -1378,5 +1361,5 @@ scorched3dc_SOURCES = \
+ 	../GLSL/GLSLShaderSetup.h
  
- AM_CPPFLAGS = -I../porting -I.. @WX_CFLAGS@ @FT2_CFLAGS@ @SDL_CFLAGS@
--LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@
-+LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@ -lexpat
+ AM_CPPFLAGS = -I../porting -I.. @FFTW_CFLAGS@ @AL_CFLAGS@ @FT2_CFLAGS@ @OGG_CFLAGS@ @SDL_CFLAGS@
+-LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@
++LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@ -lGLEW -lexpat
  
-diff -up scorched/src/scorched/Makefile.in.syslibs scorched/src/scorched/Makefile.in
---- scorched/src/scorched/Makefile.in.syslibs	2007-10-31 11:20:47.000000000 +0100
-+++ scorched/src/scorched/Makefile.in	2007-10-31 20:45:00.000000000 +0100
-@@ -62,12 +62,11 @@ am_scorched3d_OBJECTS = main.$(OBJEXT) S
- 	OptionEntry.$(OBJEXT) OptionsGame.$(OBJEXT) \
- 	OptionsMasterListServer.$(OBJEXT) OptionsParameters.$(OBJEXT) \
- 	ProgressCounter.$(OBJEXT) RandomGenerator.$(OBJEXT) \
--	snprintf.$(OBJEXT) Vector.$(OBJEXT) Vector4.$(OBJEXT) \
-+	Vector.$(OBJEXT) Vector4.$(OBJEXT) \
- 	VectorLib.$(OBJEXT) NetBuffer.$(OBJEXT) \
- 	NetBufferPool.$(OBJEXT) NetInterface.$(OBJEXT) \
- 	UniqueIdStore.$(OBJEXT) XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) \
--	xmlparse.$(OBJEXT) XMLParser.$(OBJEXT) xmlrole.$(OBJEXT) \
--	XMLStringBuffer.$(OBJEXT) xmltok.$(OBJEXT) \
-+	XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \
- 	TankAINames.$(OBJEXT) LandscapeDefinitionsBase.$(OBJEXT) \
- 	CreateDialogs.$(OBJEXT) DialogUtils.$(OBJEXT) \
- 	DisplayDialog.$(OBJEXT) KeyDialog.$(OBJEXT) \
-@@ -289,7 +288,6 @@ scorched3d_SOURCES = \
- 	../common/ProgressCounter.h \
- 	../common/RandomGenerator.cpp \
+diff -up scorched/src/scorchedc/Makefile.in.foo scorched/src/scorchedc/Makefile.in
+--- scorched/src/scorchedc/Makefile.in.foo	2008-09-08 16:15:45.000000000 +0200
++++ scorched/src/scorchedc/Makefile.in	2008-09-08 16:15:53.000000000 +0200
+@@ -74,7 +74,7 @@ am_scorched3dc_OBJECTS = AddTarget.$(OBJ
+ 	OptionsGame.$(OBJEXT) OptionsMasterListServer.$(OBJEXT) \
+ 	OptionsParameters.$(OBJEXT) OptionsScorched.$(OBJEXT) \
+ 	OptionsTransient.$(OBJEXT) ProgressCounter.$(OBJEXT) \
+-	RandomGenerator.$(OBJEXT) sha2.$(OBJEXT) snprintf.$(OBJEXT) \
++	RandomGenerator.$(OBJEXT) sha2.$(OBJEXT) \
+ 	SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \
+ 	StatsLogger.$(OBJEXT) StatsLoggerFile.$(OBJEXT) \
+ 	ToolTip.$(OBJEXT) Triangle.$(OBJEXT) Vector.$(OBJEXT) \
+@@ -148,8 +148,7 @@ am_scorched3dc_OBJECTS = AddTarget.$(OBJ
+ 	NetServerTCPProtocol.$(OBJEXT) NetServerTCPRead.$(OBJEXT) \
+ 	NetServerUDP.$(OBJEXT) NetServerUDPDestination.$(OBJEXT) \
+ 	SecureID.$(OBJEXT) UniqueIdStore.$(OBJEXT) XMLFile.$(OBJEXT) \
+-	XMLNode.$(OBJEXT) xmlparse.$(OBJEXT) XMLParser.$(OBJEXT) \
+-	xmlrole.$(OBJEXT) XMLStringBuffer.$(OBJEXT) xmltok.$(OBJEXT) \
++	XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \
+ 	Action.$(OBJEXT) ActionController.$(OBJEXT) \
+ 	ActionReferenced.$(OBJEXT) EventContainer.$(OBJEXT) \
+ 	GameState.$(OBJEXT) GameStateI.$(OBJEXT) \
+@@ -247,7 +246,7 @@ am_scorched3dc_OBJECTS = AddTarget.$(OBJ
+ 	GLConsoleRuleFnIAdapter.$(OBJEXT) \
+ 	GLConsoleRuleMethod.$(OBJEXT) \
+ 	GLConsoleRuleMethodIAdapter.$(OBJEXT) GLConsoleRules.$(OBJEXT) \
+-	GLDynamicVertexArray.$(OBJEXT) glew.$(OBJEXT) \
++	GLDynamicVertexArray.$(OBJEXT) \
+ 	GLFont2d.$(OBJEXT) GLFrameBufferObject.$(OBJEXT) \
+ 	GLGlobalState.$(OBJEXT) GLImage.$(OBJEXT) \
+ 	GLImageFactory.$(OBJEXT) GLImageHandle.$(OBJEXT) \
+@@ -669,7 +668,6 @@ scorched3dc_SOURCES = \
  	../common/RandomGenerator.h \
+ 	../common/sha2.cpp \
+ 	../common/sha2.h \
 -	../common/snprintf.c \
- 	../common/Vector.cpp \
- 	../common/Vector.h \
- 	../common/Vector4.cpp \
-@@ -304,29 +302,14 @@ scorched3d_SOURCES = \
- 	../net/NetInterface.h \
+ 	../common/SplineCurve.cpp \
+ 	../common/SplineCurve.h \
+ 	../common/SplinePath.cpp \
+@@ -920,29 +918,14 @@ scorched3dc_SOURCES = \
+ 	../net/SecureID.h \
  	../net/UniqueIdStore.cpp \
  	../net/UniqueIdStore.h \
 -	../XML/ascii.h \
@@ -304,22 +331,33 @@
  	../XML/XMLStringBuffer.h \
 -	../XML/xmltok.c \
 -	../XML/xmltok.h \
- 	../tankai/TankAINames.cpp \
- 	../tankai/TankAINames.h \
- 	../landscapedef/LandscapeDefinitionsBase.cpp \
-@@ -348,7 +331,7 @@ scorched3d_SOURCES = \
- 	../wxdialogs/SettingsDialog.h
+ 	../engine/Action.cpp \
+ 	../engine/Action.h \
+ 	../engine/ActionController.cpp \
+@@ -1338,7 +1321,6 @@ scorched3dc_SOURCES = \
+ 	../GLEXT/GLConsoleRules.h \
+ 	../GLEXT/GLDynamicVertexArray.cpp \
+ 	../GLEXT/GLDynamicVertexArray.h \
+-	../GLEXT/glew.c \
+ 	../GLEXT/GLFont2d.cpp \
+ 	../GLEXT/GLFont2d.h \
+ 	../GLEXT/GLFrameBufferObject.cpp \
+@@ -1924,7 +1906,7 @@ scorched3dc_SOURCES = \
+ 	../GLSL/GLSLShaderSetup.h
  
- AM_CPPFLAGS = -I../porting -I.. @WX_CFLAGS@ @FT2_CFLAGS@ @SDL_CFLAGS@
--LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@
-+LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@ -lexpat
+ AM_CPPFLAGS = -I../porting -I.. @FFTW_CFLAGS@ @AL_CFLAGS@ @FT2_CFLAGS@ @OGG_CFLAGS@ @SDL_CFLAGS@
+-LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@
++LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@ -lGLEW -lexpat
  all: all-am
  
  .SUFFIXES:
-@@ -466,10 +449,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLStringBuffer.Po at am__quote@
+@@ -2664,13 +2646,8 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.lex.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.tab.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fixed.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/glew.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sha2.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/snprintf.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlparse.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlrole.Po at am__quote@
@@ -327,7 +365,7 @@
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -485,62 +464,6 @@ distclean-compile:
+@@ -2686,76 +2663,6 @@ distclean-compile:
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
@@ -387,24 +425,38 @@
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 - at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
 -
+-glew.o: ../GLEXT/glew.c
+- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glew.o -MD -MP -MF $(DEPDIR)/glew.Tpo -c -o glew.o `test -f '../GLEXT/glew.c' || echo '$(srcdir)/'`../GLEXT/glew.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/glew.Tpo $(DEPDIR)/glew.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../GLEXT/glew.c' object='glew.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glew.o `test -f '../GLEXT/glew.c' || echo '$(srcdir)/'`../GLEXT/glew.c
+-
+-glew.obj: ../GLEXT/glew.c
+- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glew.obj -MD -MP -MF $(DEPDIR)/glew.Tpo -c -o glew.obj `if test -f '../GLEXT/glew.c'; then $(CYGPATH_W) '../GLEXT/glew.c'; else $(CYGPATH_W) '$(srcdir)/../GLEXT/glew.c'; fi`
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/glew.Tpo $(DEPDIR)/glew.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../GLEXT/glew.c' object='glew.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glew.obj `if test -f '../GLEXT/glew.c'; then $(CYGPATH_W) '../GLEXT/glew.c'; else $(CYGPATH_W) '$(srcdir)/../GLEXT/glew.c'; fi`
+-
  .cpp.o:
  @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
  @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-diff -up scorched/src/scorchedc/Makefile.am.syslibs scorched/src/scorchedc/Makefile.am
---- scorched/src/scorchedc/Makefile.am.syslibs	2007-10-31 11:12:14.000000000 +0100
-+++ scorched/src/scorchedc/Makefile.am	2007-10-31 20:45:00.000000000 +0100
-@@ -123,7 +123,6 @@ scorched3dc_SOURCES = \
+diff -up scorched/src/scorcheds/Makefile.am.foo scorched/src/scorcheds/Makefile.am
+--- scorched/src/scorcheds/Makefile.am.foo	2008-09-08 16:15:45.000000000 +0200
++++ scorched/src/scorcheds/Makefile.am	2008-09-08 16:15:53.000000000 +0200
+@@ -113,7 +113,6 @@ scorched3ds_SOURCES = \
+ 	../common/ProgressCounter.h \
+ 	../common/RandomGenerator.cpp \
  	../common/RandomGenerator.h \
- 	../common/sha2.cpp \
- 	../common/sha2.h \
 -	../common/snprintf.c \
  	../common/SplineCurve.cpp \
  	../common/SplineCurve.h \
  	../common/SplinePath.cpp \
-@@ -358,29 +357,14 @@ scorched3dc_SOURCES = \
- 	../net/SecureID.h \
- 	../net/UniqueIdStore.cpp \
- 	../net/UniqueIdStore.h \
+@@ -363,29 +362,14 @@ scorched3ds_SOURCES = \
+ 	../net/NetServerUDP.h \
+ 	../net/NetServerUDPDestination.cpp \
+ 	../net/NetServerUDPDestination.h \
 -	../XML/ascii.h \
 -	../XML/asciitab.h \
 -	../XML/expat.h \
@@ -431,64 +483,49 @@
  	../engine/Action.cpp \
  	../engine/Action.h \
  	../engine/ActionController.cpp \
-@@ -776,7 +760,6 @@ scorched3dc_SOURCES = \
- 	../GLEXT/GLConsoleRules.h \
- 	../GLEXT/GLDynamicVertexArray.cpp \
- 	../GLEXT/GLDynamicVertexArray.h \
--	../GLEXT/glew.c \
- 	../GLEXT/GLFont2d.cpp \
- 	../GLEXT/GLFont2d.h \
- 	../GLEXT/GLFrameBufferObject.cpp \
-@@ -1346,5 +1329,5 @@ scorched3dc_SOURCES = \
- 	../GLSL/GLSLShaderSetup.h
+@@ -806,5 +790,5 @@ scorched3ds_SOURCES = \
+ 	../movement/TargetMovementEntrySpline.h
  
- AM_CPPFLAGS = -I../porting -I.. @FFTW_CFLAGS@ @AL_CFLAGS@ @FT2_CFLAGS@ @OGG_CFLAGS@ @SDL_CFLAGS@
--LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@
-+LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@ -lGLEW -lexpat
+ AM_CPPFLAGS = -I../porting -I.. -DS3D_SERVER=1 @SDL_CFLAGS@ @MYSQL_CFLAGS@
+-LDADD = @SDL_LIBS@ @MYSQL_LIBS@
++LDADD = @SDL_LIBS@ @MYSQL_LIBS@ -lexpat
  
-diff -up scorched/src/scorchedc/Makefile.in.syslibs scorched/src/scorchedc/Makefile.in
---- scorched/src/scorchedc/Makefile.in.syslibs	2007-10-31 11:20:51.000000000 +0100
-+++ scorched/src/scorchedc/Makefile.in	2007-10-31 20:47:06.000000000 +0100
-@@ -74,7 +74,7 @@ am_scorched3dc_OBJECTS = AddTarget.$(OBJ
+diff -up scorched/src/scorcheds/Makefile.in.foo scorched/src/scorcheds/Makefile.in
+--- scorched/src/scorcheds/Makefile.in.foo	2008-09-08 16:15:45.000000000 +0200
++++ scorched/src/scorcheds/Makefile.in	2008-09-08 16:15:53.000000000 +0200
+@@ -72,7 +72,7 @@ am_scorched3ds_OBJECTS = AddTarget.$(OBJ
  	OptionsGame.$(OBJEXT) OptionsMasterListServer.$(OBJEXT) \
  	OptionsParameters.$(OBJEXT) OptionsScorched.$(OBJEXT) \
  	OptionsTransient.$(OBJEXT) ProgressCounter.$(OBJEXT) \
--	RandomGenerator.$(OBJEXT) sha2.$(OBJEXT) snprintf.$(OBJEXT) \
-+	RandomGenerator.$(OBJEXT) sha2.$(OBJEXT) \
+-	RandomGenerator.$(OBJEXT) snprintf.$(OBJEXT) \
++	RandomGenerator.$(OBJEXT) \
  	SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \
- 	StatsLogger.$(OBJEXT) StatsLoggerFile.$(OBJEXT) \
- 	ToolTip.$(OBJEXT) Triangle.$(OBJEXT) Vector.$(OBJEXT) \
-@@ -142,8 +142,7 @@ am_scorched3dc_OBJECTS = AddTarget.$(OBJ
+ 	StatsLogger.$(OBJEXT) StatsLoggerDatabase.$(OBJEXT) \
+ 	StatsLoggerFile.$(OBJEXT) StatsLoggerMySQL.$(OBJEXT) \
+@@ -146,9 +146,8 @@ am_scorched3ds_OBJECTS = AddTarget.$(OBJ
+ 	NetServerTCP2.$(OBJEXT) NetServerTCP2Destination.$(OBJEXT) \
  	NetServerTCPProtocol.$(OBJEXT) NetServerTCPRead.$(OBJEXT) \
  	NetServerUDP.$(OBJEXT) NetServerUDPDestination.$(OBJEXT) \
- 	SecureID.$(OBJEXT) UniqueIdStore.$(OBJEXT) XMLFile.$(OBJEXT) \
--	XMLNode.$(OBJEXT) xmlparse.$(OBJEXT) XMLParser.$(OBJEXT) \
--	xmlrole.$(OBJEXT) XMLStringBuffer.$(OBJEXT) xmltok.$(OBJEXT) \
-+	XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \
- 	Action.$(OBJEXT) ActionController.$(OBJEXT) \
- 	ActionReferenced.$(OBJEXT) EventContainer.$(OBJEXT) \
- 	GameState.$(OBJEXT) GameStateI.$(OBJEXT) \
-@@ -241,7 +240,7 @@ am_scorched3dc_OBJECTS = AddTarget.$(OBJ
- 	GLConsoleRuleFnIAdapter.$(OBJEXT) \
- 	GLConsoleRuleMethod.$(OBJEXT) \
- 	GLConsoleRuleMethodIAdapter.$(OBJEXT) GLConsoleRules.$(OBJEXT) \
--	GLDynamicVertexArray.$(OBJEXT) glew.$(OBJEXT) \
-+	GLDynamicVertexArray.$(OBJEXT) \
- 	GLFont2d.$(OBJEXT) GLFrameBufferObject.$(OBJEXT) \
- 	GLGlobalState.$(OBJEXT) GLImage.$(OBJEXT) \
- 	GLImageFactory.$(OBJEXT) GLImageHandle.$(OBJEXT) \
-@@ -656,7 +655,6 @@ scorched3dc_SOURCES = \
+-	XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) xmlparse.$(OBJEXT) \
+-	XMLParser.$(OBJEXT) xmlrole.$(OBJEXT) \
+-	XMLStringBuffer.$(OBJEXT) xmltok.$(OBJEXT) Action.$(OBJEXT) \
++	XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) \
++	XMLStringBuffer.$(OBJEXT) Action.$(OBJEXT) \
+ 	ActionController.$(OBJEXT) ActionReferenced.$(OBJEXT) \
+ 	EventContainer.$(OBJEXT) GameState.$(OBJEXT) \
+ 	GameStateI.$(OBJEXT) GameStateStimulusI.$(OBJEXT) \
+@@ -517,7 +516,6 @@ scorched3ds_SOURCES = \
+ 	../common/ProgressCounter.h \
+ 	../common/RandomGenerator.cpp \
  	../common/RandomGenerator.h \
- 	../common/sha2.cpp \
- 	../common/sha2.h \
 -	../common/snprintf.c \
  	../common/SplineCurve.cpp \
  	../common/SplineCurve.h \
  	../common/SplinePath.cpp \
-@@ -891,29 +889,14 @@ scorched3dc_SOURCES = \
- 	../net/SecureID.h \
- 	../net/UniqueIdStore.cpp \
- 	../net/UniqueIdStore.h \
+@@ -767,29 +765,14 @@ scorched3ds_SOURCES = \
+ 	../net/NetServerUDP.h \
+ 	../net/NetServerUDPDestination.cpp \
+ 	../net/NetServerUDPDestination.h \
 -	../XML/ascii.h \
 -	../XML/asciitab.h \
 -	../XML/expat.h \
@@ -515,30 +552,19 @@
  	../engine/Action.cpp \
  	../engine/Action.h \
  	../engine/ActionController.cpp \
-@@ -1309,7 +1292,6 @@ scorched3dc_SOURCES = \
- 	../GLEXT/GLConsoleRules.h \
- 	../GLEXT/GLDynamicVertexArray.cpp \
- 	../GLEXT/GLDynamicVertexArray.h \
--	../GLEXT/glew.c \
- 	../GLEXT/GLFont2d.cpp \
- 	../GLEXT/GLFont2d.h \
- 	../GLEXT/GLFrameBufferObject.cpp \
-@@ -1879,7 +1861,7 @@ scorched3dc_SOURCES = \
- 	../GLSL/GLSLShaderSetup.h
+@@ -1210,7 +1193,7 @@ scorched3ds_SOURCES = \
+ 	../movement/TargetMovementEntrySpline.h
  
- AM_CPPFLAGS = -I../porting -I.. @FFTW_CFLAGS@ @AL_CFLAGS@ @FT2_CFLAGS@ @OGG_CFLAGS@ @SDL_CFLAGS@
--LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@
-+LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@ -lGLEW -lexpat
+ AM_CPPFLAGS = -I../porting -I.. -DS3D_SERVER=1 @SDL_CFLAGS@ @MYSQL_CFLAGS@
+-LDADD = @SDL_LIBS@ @MYSQL_LIBS@
++LDADD = @SDL_LIBS@ @MYSQL_LIBS@ -lexpat
  all: all-am
  
  .SUFFIXES:
-@@ -2603,13 +2585,8 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.lex.Po at am__quote@
+@@ -1669,10 +1652,6 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.tab.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fixed.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/glew.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sha2.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/snprintf.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlparse.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlrole.Po at am__quote@
@@ -546,7 +572,7 @@
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -2625,76 +2602,6 @@ distclean-compile:
+@@ -1688,62 +1667,6 @@ distclean-compile:
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
@@ -606,32 +632,6 @@
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 - at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
 -
--glew.o: ../GLEXT/glew.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glew.o -MD -MP -MF $(DEPDIR)/glew.Tpo -c -o glew.o `test -f '../GLEXT/glew.c' || echo '$(srcdir)/'`../GLEXT/glew.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/glew.Tpo $(DEPDIR)/glew.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../GLEXT/glew.c' object='glew.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glew.o `test -f '../GLEXT/glew.c' || echo '$(srcdir)/'`../GLEXT/glew.c
--
--glew.obj: ../GLEXT/glew.c
-- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glew.obj -MD -MP -MF $(DEPDIR)/glew.Tpo -c -o glew.obj `if test -f '../GLEXT/glew.c'; then $(CYGPATH_W) '../GLEXT/glew.c'; else $(CYGPATH_W) '$(srcdir)/../GLEXT/glew.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/glew.Tpo $(DEPDIR)/glew.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../GLEXT/glew.c' object='glew.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glew.obj `if test -f '../GLEXT/glew.c'; then $(CYGPATH_W) '../GLEXT/glew.c'; else $(CYGPATH_W) '$(srcdir)/../GLEXT/glew.c'; fi`
--
  .cpp.o:
  @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
  @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-diff -up scorched/src/GLEXT/GLState.h.syslibs scorched/src/GLEXT/GLState.h
---- scorched/src/GLEXT/GLState.h.syslibs	2007-10-20 19:54:40.000000000 +0200
-+++ scorched/src/GLEXT/GLState.h	2007-10-31 20:45:00.000000000 +0100
-@@ -24,7 +24,7 @@
- #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
- #undef __MACH__
- 
--#include "glew.h"
-+#include <GL/glew.h>
- 
- class GLState  
- {


Index: scorched3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- scorched3d.spec	19 Feb 2008 09:36:37 -0000	1.31
+++ scorched3d.spec	8 Sep 2008 14:20:40 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           scorched3d
 Version:        41.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPLv2+
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 41.3-3
+- Fix patch fuzz build failure
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 41.3-2
 - Autorebuild for GCC 4.3
 


--- scorched3d-41.1-64bit.patch DELETED ---



From spot at fedoraproject.org  Mon Sep  8 14:21:32 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 14:21:32 +0000 (UTC)
Subject: rpms/tetex-perltex/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 tetex-perltex.spec, 1.4, 1.5
Message-ID: <20080908142132.D267470128@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tetex-perltex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27337

Modified Files:
	.cvsignore sources tetex-perltex.spec 
Log Message:
fix license tag, update to 1.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-perltex/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Jun 2006 15:17:38 -0000	1.3
+++ .cvsignore	8 Sep 2008 14:21:02 -0000	1.4
@@ -1 +1 @@
-perltex-1.3.zip
+perltex.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-perltex/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Jun 2006 15:17:38 -0000	1.3
+++ sources	8 Sep 2008 14:21:02 -0000	1.4
@@ -1 +1 @@
-cfe5040321072bf5d7c22ee1405164b6  perltex-1.3.zip
+161f3ff6e88c53a7e8111bb2f3729c9f  perltex.zip


Index: tetex-perltex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-perltex/devel/tetex-perltex.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tetex-perltex.spec	27 Jun 2006 15:17:38 -0000	1.4
+++ tetex-perltex.spec	8 Sep 2008 14:21:02 -0000	1.5
@@ -5,16 +5,16 @@
 %define texpkgdoc   %{_texmf}/doc/latex/%{texpkg}
 
 Name:           tetex-%{texpkg}
-Version:        1.3
+Version:        1.7
 Release:        1%{?dist}
 Summary:        Define LaTeX macros in terms of Perl code
 
 Group:          Applications/Publishing
-License:        LaTeX Project Public License
+License:        LPPL
 URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/perltex.html
 # DANTE generates CTAN packages zip archives on-the-fly.
-#   ftp://ftp.dante.de/tex-archive/macros/latex/contrib/perltex.zip
-Source0:        perltex-%{version}.zip
+# Downloaded on Mon Sep 8 2008
+Source0:        ftp://ftp.dante.de/tex-archive/macros/latex/contrib/perltex.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -66,6 +66,10 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7-1
+- fix license tag
+- update to 1.7
+
 * Tue Jun 27 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.3-1
 - Update to 1.3.
 



From dwalsh at fedoraproject.org  Mon Sep  8 14:21:50 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  8 Sep 2008 14:21:50 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch,1.204,1.205
Message-ID: <20080908142150.4C82170128@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27729

Modified Files:
	policy-20071130.patch 
Log Message:
* Tue Sep 2 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-89
- Fix init script paths


policy-20071130.patch:

Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- policy-20071130.patch	4 Sep 2008 20:59:27 -0000	1.204
+++ policy-20071130.patch	8 Sep 2008 14:21:48 -0000	1.205
@@ -8274,7 +8274,7 @@
  # /emul
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.3.1/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/kernel/files.if	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/kernel/files.if	2008-09-08 09:36:03.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -8552,7 +8552,7 @@
  	')
  ')
  
-@@ -4756,3 +4927,53 @@
+@@ -4756,3 +4927,71 @@
  
  	allow $1 { file_type -security_file_type }:dir manage_dir_perms;
  ')
@@ -8606,6 +8606,24 @@
 +       filetrans_pattern($1,root_t,default_t,dir)
 +')
 +
++########################################
++## <summary>
++##	manage generic symbolic links
++##	in the /var/run directory.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`files_manage_generic_pids_symlinks',`
++	gen_require(`
++		type var_run_t;
++	')
++
++	manage_lnk_files_pattern($1,var_run_t,var_run_t)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.3.1/policy/modules/kernel/files.te
 --- nsaserefpolicy/policy/modules/kernel/files.te	2008-06-12 23:38:02.000000000 -0400
 +++ serefpolicy-3.3.1/policy/modules/kernel/files.te	2008-09-04 16:31:45.000000000 -0400
@@ -10354,7 +10372,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.3.1/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/apache.te	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/apache.te	2008-09-05 14:43:04.000000000 -0400
 @@ -20,6 +20,8 @@
  # Declarations
  #
@@ -10593,7 +10611,7 @@
  tunable_policy(`httpd_can_network_relay',`
  	# allow httpd to work as a relay
  	corenet_tcp_connect_gopher_port(httpd_t)
-@@ -382,12 +458,22 @@
+@@ -382,12 +458,26 @@
  	corenet_sendrecv_http_cache_client_packets(httpd_t)
  ')
  
@@ -10604,24 +10622,28 @@
 +	filetrans_pattern(httpd_sys_script_t,httpd_sys_content_t,httpd_sys_content_rw_t, { file dir lnk_file })
 +	can_exec(httpd_sys_script_t, httpd_sys_content_t)
 +')
-+
-+tunable_policy(`allow_httpd_sys_script_anon_write',`
-+	miscfiles_manage_public_files(httpd_sys_script_t)
-+') 
  
 -	manage_dirs_pattern(httpd_t,httpdcontent,httpdcontent)
 -	manage_files_pattern(httpd_t,httpdcontent,httpdcontent)
 -	manage_lnk_files_pattern(httpd_t,httpdcontent,httpdcontent)
++tunable_policy(`allow_httpd_sys_script_anon_write',`
++	miscfiles_manage_public_files(httpd_sys_script_t)
++') 
++
 +tunable_policy(`httpd_enable_cgi && httpd_unified && httpd_builtin_scripting',`
 +	domtrans_pattern(httpd_t, httpd_sys_content_t, httpd_sys_script_t)
 +	filetrans_pattern(httpd_t, httpd_sys_content_t, httpd_sys_content_rw_t, { file dir lnk_file })
 +	manage_dirs_pattern(httpd_t, httpdcontent, httpd_sys_content_rw_t)
 +	manage_files_pattern(httpd_t, httpdcontent, httpd_sys_content_rw_t)
 +	manage_lnk_files_pattern(httpd_t, httpdcontent, httpd_sys_content_rw_t)
++
++	manage_dirs_pattern(httpd_t, httpdcontent, httpdcontent)
++	manage_files_pattern(httpd_t, httpdcontent, httpdcontent)
++	manage_lnk_files_pattern(httpd_t, httpdcontent, httpdcontent)
  ')
  
  tunable_policy(`httpd_enable_ftp_server',`
-@@ -399,11 +485,21 @@
+@@ -399,11 +489,21 @@
  	fs_read_nfs_symlinks(httpd_t)
  ')
  
@@ -10643,7 +10665,7 @@
  tunable_policy(`httpd_ssi_exec',`
  	corecmd_shell_domtrans(httpd_t,httpd_sys_script_t)
  	allow httpd_sys_script_t httpd_t:fd use;
-@@ -437,8 +533,13 @@
+@@ -437,8 +537,13 @@
  ')
  
  optional_policy(`
@@ -10659,7 +10681,7 @@
  ')
  
  optional_policy(`
-@@ -450,19 +551,13 @@
+@@ -450,19 +555,13 @@
  ')
  
  optional_policy(`
@@ -10680,7 +10702,7 @@
  ')
  
  optional_policy(`
-@@ -472,13 +567,22 @@
+@@ -472,13 +571,22 @@
  	openca_kill(httpd_t)
  ')
  
@@ -10707,7 +10729,7 @@
  ')
  
  optional_policy(`
-@@ -486,6 +590,7 @@
+@@ -486,6 +594,7 @@
  ')
  
  optional_policy(`
@@ -10715,7 +10737,7 @@
  	snmp_dontaudit_read_snmp_var_lib_files(httpd_t)
  	snmp_dontaudit_write_snmp_var_lib_files(httpd_t)
  ')
-@@ -521,6 +626,22 @@
+@@ -521,6 +630,22 @@
  	userdom_use_sysadm_terms(httpd_helper_t)
  ')
  
@@ -10738,7 +10760,7 @@
  ########################################
  #
  # Apache PHP script local policy
-@@ -550,18 +671,26 @@
+@@ -550,18 +675,26 @@
  
  fs_search_auto_mountpoints(httpd_php_t)
  
@@ -10768,7 +10790,7 @@
  ')
  
  ########################################
-@@ -585,6 +714,8 @@
+@@ -585,6 +718,8 @@
  manage_files_pattern(httpd_suexec_t,httpd_suexec_tmp_t,httpd_suexec_tmp_t)
  files_tmp_filetrans(httpd_suexec_t, httpd_suexec_tmp_t, { file dir })
  
@@ -10777,7 +10799,7 @@
  kernel_read_kernel_sysctls(httpd_suexec_t)
  kernel_list_proc(httpd_suexec_t)
  kernel_read_proc_symlinks(httpd_suexec_t)
-@@ -593,9 +724,7 @@
+@@ -593,9 +728,7 @@
  
  fs_search_auto_mountpoints(httpd_suexec_t)
  
@@ -10788,7 +10810,7 @@
  
  files_read_etc_files(httpd_suexec_t)
  files_read_usr_files(httpd_suexec_t)
-@@ -628,6 +757,7 @@
+@@ -628,6 +761,7 @@
  	corenet_sendrecv_all_client_packets(httpd_suexec_t)
  ')
  
@@ -10796,7 +10818,7 @@
  tunable_policy(`httpd_enable_cgi && httpd_unified',`
  	domtrans_pattern(httpd_suexec_t, httpdcontent, httpd_sys_script_t)
  ')
-@@ -638,6 +768,12 @@
+@@ -638,6 +772,12 @@
  	fs_exec_nfs_files(httpd_suexec_t)
  ')
  
@@ -10809,7 +10831,7 @@
  tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
  	fs_read_cifs_files(httpd_suexec_t)
  	fs_read_cifs_symlinks(httpd_suexec_t)
-@@ -655,10 +791,6 @@
+@@ -655,10 +795,6 @@
  	dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write };
  ')
  
@@ -10820,7 +10842,7 @@
  ########################################
  #
  # Apache system script local policy
-@@ -668,7 +800,8 @@
+@@ -668,7 +804,8 @@
  
  dontaudit httpd_sys_script_t httpd_config_t:dir search;
  
@@ -10830,7 +10852,7 @@
  
  allow httpd_sys_script_t squirrelmail_spool_t:dir list_dir_perms;
  read_files_pattern(httpd_sys_script_t,squirrelmail_spool_t,squirrelmail_spool_t)
-@@ -682,15 +815,44 @@
+@@ -682,15 +819,44 @@
  # Should we add a boolean?
  apache_domtrans_rotatelogs(httpd_sys_script_t)
  
@@ -10842,15 +10864,15 @@
  
 -tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
 +tunable_policy(`httpd_use_nfs', `
- 	fs_read_nfs_files(httpd_sys_script_t)
- 	fs_read_nfs_symlinks(httpd_sys_script_t)
- ')
- 
-+tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs', `
 +	fs_read_nfs_files(httpd_sys_script_t)
 +	fs_read_nfs_symlinks(httpd_sys_script_t)
 +')
 +
++tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs', `
+ 	fs_read_nfs_files(httpd_sys_script_t)
+ 	fs_read_nfs_symlinks(httpd_sys_script_t)
+ ')
+ 
 +tunable_policy(`httpd_enable_cgi && httpd_can_network_connect',`
 +	allow httpd_sys_script_t self:tcp_socket create_stream_socket_perms;
 +	allow httpd_sys_script_t self:udp_socket create_socket_perms;
@@ -10876,7 +10898,7 @@
  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)
-@@ -703,6 +865,10 @@
+@@ -703,6 +869,10 @@
  optional_policy(`
  	mysql_stream_connect(httpd_sys_script_t)
  	mysql_rw_db_sockets(httpd_sys_script_t)
@@ -10887,7 +10909,7 @@
  ')
  
  ########################################
-@@ -724,3 +890,68 @@
+@@ -724,3 +894,71 @@
  logging_search_logs(httpd_rotatelogs_t)
  
  miscfiles_read_localization(httpd_rotatelogs_t)
@@ -10939,6 +10961,9 @@
 +
 +tunable_policy(`httpd_enable_cgi && httpd_unified',`
 +	can_exec(httpd_user_script_t, httpd_user_content_t)
++	manage_dirs_pattern(httpd_sys_script_t, httpdcontent, httpdcontent)
++	manage_files_pattern(httpd_sys_script_t, httpdcontent, httpdcontent)
++	manage_lnk_files_pattern(httpd_sys_script_t, httpdcontent, httpdcontent)
 +')
 +
 +# allow accessing files/dirs below the users home dir
@@ -18060,7 +18085,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.te serefpolicy-3.3.1/policy/modules/services/kerneloops.te
 --- nsaserefpolicy/policy/modules/services/kerneloops.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/kerneloops.te	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/kerneloops.te	2008-09-08 08:38:57.000000000 -0400
 @@ -0,0 +1,57 @@
 +policy_module(kerneloops,1.0.0)
 +
@@ -18082,7 +18107,7 @@
 +# kerneloops local policy
 +#
 +allow kerneloops_t self:capability sys_nice;
-+allow kerneloops_t self:process { setsched getsched };
++allow kerneloops_t self:process { setsched getsched signal };
 +
 +# Init script handling
 +domain_use_interactive_fds(kerneloops_t)
@@ -21195,6 +21220,17 @@
 +optional_policy(`
 +	unconfined_ptrace(polkit_resolve_t)
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portmap.te serefpolicy-3.3.1/policy/modules/services/portmap.te
+--- nsaserefpolicy/policy/modules/services/portmap.te	2008-06-12 23:38:01.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/portmap.te	2008-09-05 15:18:22.000000000 -0400
+@@ -41,6 +41,7 @@
+ manage_files_pattern(portmap_t,portmap_var_run_t,portmap_var_run_t)
+ files_pid_filetrans(portmap_t,portmap_var_run_t,file)
+ 
++kernel_read_system_state(portmap_t)
+ kernel_read_kernel_sysctls(portmap_t)
+ kernel_list_proc(portmap_t)
+ kernel_read_proc_symlinks(portmap_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portslave.te serefpolicy-3.3.1/policy/modules/services/portslave.te
 --- nsaserefpolicy/policy/modules/services/portslave.te	2008-06-12 23:38:01.000000000 -0400
 +++ serefpolicy-3.3.1/policy/modules/services/portslave.te	2008-09-04 16:31:45.000000000 -0400
@@ -31803,7 +31839,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.3.1/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/init.te	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/system/init.te	2008-09-08 09:34:54.000000000 -0400
 @@ -10,6 +10,20 @@
  # Declarations
  #
@@ -31957,7 +31993,17 @@
  
  manage_dirs_pattern(initrc_t,initrc_state_t,initrc_state_t)
  manage_files_pattern(initrc_t,initrc_state_t,initrc_state_t)
-@@ -257,7 +296,7 @@
+@@ -212,7 +251,8 @@
+ manage_fifo_files_pattern(initrc_t,initrc_state_t,initrc_state_t)
+ 
+ allow initrc_t initrc_var_run_t:file manage_file_perms;
+-files_pid_filetrans(initrc_t,initrc_var_run_t,file)
++files_pid_filetrasn(initrc_t,initrc_var_run_t,file)
++files_manage_generic_pids_symlinks(initrc_t)
+ 
+ can_exec(initrc_t,initrc_tmp_t)
+ allow initrc_t initrc_tmp_t:file manage_file_perms;
+@@ -257,7 +297,7 @@
  dev_read_sound_mixer(initrc_t)
  dev_write_sound_mixer(initrc_t)
  dev_setattr_all_chr_files(initrc_t)
@@ -31966,7 +32012,7 @@
  dev_delete_lvm_control_dev(initrc_t)
  dev_manage_generic_symlinks(initrc_t)
  dev_manage_generic_files(initrc_t)
-@@ -283,7 +322,6 @@
+@@ -283,7 +323,6 @@
  mls_process_read_up(initrc_t)
  mls_process_write_down(initrc_t)
  mls_rangetrans_source(initrc_t)
@@ -31974,7 +32020,7 @@
  
  selinux_get_enforce_mode(initrc_t)
  
-@@ -496,6 +534,31 @@
+@@ -496,6 +535,31 @@
  	')
  ')
  
@@ -32006,7 +32052,7 @@
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -554,16 +617,12 @@
+@@ -554,16 +618,12 @@
  	dbus_read_config(initrc_t)
  
  	optional_policy(`
@@ -32027,7 +32073,7 @@
  ')
  
  optional_policy(`
-@@ -639,12 +698,6 @@
+@@ -639,12 +699,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -32040,7 +32086,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -705,6 +758,9 @@
+@@ -705,6 +759,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -32050,7 +32096,7 @@
  ')
  
  optional_policy(`
-@@ -717,9 +773,11 @@
+@@ -717,9 +774,11 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -32065,7 +32111,7 @@
  ')
  
  optional_policy(`
-@@ -738,6 +796,11 @@
+@@ -738,6 +797,11 @@
  	uml_setattr_util_sockets(initrc_t)
  ')
  
@@ -32077,7 +32123,7 @@
  optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -752,6 +815,10 @@
+@@ -752,6 +816,10 @@
  ')
  
  optional_policy(`
@@ -32088,7 +32134,7 @@
  	vmware_read_system_config(initrc_t)
  	vmware_append_system_config(initrc_t)
  ')
-@@ -774,3 +841,4 @@
+@@ -774,3 +842,4 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -32215,7 +32261,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.3.1/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/libraries.fc	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/system/libraries.fc	2008-09-08 09:14:37.000000000 -0400
 @@ -69,8 +69,10 @@
  ifdef(`distro_gentoo',`
  # despite the extensions, they are actually libs
@@ -32275,7 +32321,16 @@
  /usr/lib(64)?/.*/libflashplayer\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/local/(.*/)?libflashplayer\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  HOME_DIR/.*/plugins/nprhapengine\.so.* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -287,11 +294,15 @@
+@@ -263,6 +270,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)
+ 
++/usr/lib(64)?/(virtualbox(-ose)?/)?(components/)?VBox.*\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++
+ # Java, Sun Microsystems (JPackage SRPM)
+ /usr/(.*/)?jre.*/.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/local/(.*/)?jre.*/.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -287,11 +296,15 @@
  /usr/lib/acroread/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/acroread/.+\.api		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/acroread/(.*/)?ADMPlugin\.apl	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -32291,7 +32346,7 @@
  /var/ftp/lib(64)?(/.*)?				gen_context(system_u:object_r:lib_t,s0)
  /var/ftp/lib(64)?/ld[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
  
-@@ -304,3 +315,13 @@
+@@ -304,3 +317,13 @@
  /var/spool/postfix/lib(64)?(/.*)? 		gen_context(system_u:object_r:lib_t,s0)
  /var/spool/postfix/usr(/.*)?			gen_context(system_u:object_r:lib_t,s0)
  /var/spool/postfix/lib(64)?/ld.*\.so.*	--	gen_context(system_u:object_r:ld_so_t,s0)



From pkgdb at fedoraproject.org  Mon Sep  8 14:22:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:22:51 +0000
Subject: [pkgdb] xorg-x11-apps: ajax has requested approveacls
Message-ID: <20080908142251.A33DB208D1E@bastion.fedora.phx.redhat.com>

ajax has requested the approveacls 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 Sep  8 14:23:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:23:32 +0000
Subject: [pkgdb] libgda: denis has requested watchbugzilla
Message-ID: <20080908142332.4DA7D208771@bastion.fedora.phx.redhat.com>

denis has requested the watchbugzilla acl on libgda (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:23:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:23:32 +0000
Subject: [pkgdb] libgda: denis has requested watchcommits
Message-ID: <20080908142332.9DB1C208D1E@bastion.fedora.phx.redhat.com>

denis has requested the watchcommits acl on libgda (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:23:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:23:36 +0000
Subject: [pkgdb] libgda: denis has requested approveacls
Message-ID: <20080908142336.5D9A7208D98@bastion.fedora.phx.redhat.com>

denis has requested the approveacls acl on libgda (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:23:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:23:38 +0000
Subject: [pkgdb] libgda: denis has requested commit
Message-ID: <20080908142338.673BF208D9C@bastion.fedora.phx.redhat.com>

denis has requested the commit acl on libgda (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:23:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:23:43 +0000
Subject: [pkgdb] libgda: denis has requested watchbugzilla
Message-ID: <20080908142343.78413208770@bastion.fedora.phx.redhat.com>

denis has requested the watchbugzilla acl on libgda (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:23:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:23:45 +0000
Subject: [pkgdb] libgda: denis has requested watchcommits
Message-ID: <20080908142345.F2EF6208DA1@bastion.fedora.phx.redhat.com>

denis has requested the watchcommits acl on libgda (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:23:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:23:48 +0000
Subject: [pkgdb] libgda: denis has requested commit
Message-ID: <20080908142348.28604208DA5@bastion.fedora.phx.redhat.com>

denis has requested the commit acl on libgda (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:23:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:23:53 +0000
Subject: [pkgdb] libgda: denis has requested approveacls
Message-ID: <20080908142353.BC4F6208771@bastion.fedora.phx.redhat.com>

denis has requested the approveacls acl on libgda (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:24:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:24:01 +0000
Subject: [pkgdb] libgda: denis has requested watchbugzilla
Message-ID: <20080908142401.519CD208DA7@bastion.fedora.phx.redhat.com>

denis has requested the watchbugzilla acl on libgda (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:24:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:24:04 +0000
Subject: [pkgdb] libgda: denis has requested watchcommits
Message-ID: <20080908142404.93E31208D97@bastion.fedora.phx.redhat.com>

denis has requested the watchcommits acl on libgda (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:24:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:24:08 +0000
Subject: [pkgdb] libgda: denis has requested commit
Message-ID: <20080908142408.2B4AF208DA8@bastion.fedora.phx.redhat.com>

denis has requested the commit acl on libgda (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:24:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:24:11 +0000
Subject: [pkgdb] libgda: denis has requested approveacls
Message-ID: <20080908142411.A12B7208DAC@bastion.fedora.phx.redhat.com>

denis has requested the approveacls acl on libgda (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:24:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:24:19 +0000
Subject: [pkgdb] libgda: denis has requested watchbugzilla
Message-ID: <20080908142420.096F1208770@bastion.fedora.phx.redhat.com>

denis has requested the watchbugzilla acl on libgda (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:24:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:24:22 +0000
Subject: [pkgdb] libgda: denis has requested watchcommits
Message-ID: <20080908142422.B90D9208DAF@bastion.fedora.phx.redhat.com>

denis has requested the watchcommits acl on libgda (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From spot at fedoraproject.org  Mon Sep  8 14:24:25 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 14:24:25 +0000 (UTC)
Subject: rpms/tetex-prosper/devel tetex-prosper.spec,1.3,1.4
Message-ID: <20080908142425.6350A70128@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tetex-prosper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28838

Modified Files:
	tetex-prosper.spec 
Log Message:
fix license tag


Index: tetex-prosper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-prosper/devel/tetex-prosper.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tetex-prosper.spec	20 Sep 2006 07:46:05 -0000	1.3
+++ tetex-prosper.spec	8 Sep 2008 14:23:55 -0000	1.4
@@ -10,11 +10,11 @@
 
 Name:           tetex-%{texpkg}
 Version:        1.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        LaTeX class for writing transparencies
 
 Group:          Applications/Publishing
-License:        LaTeX Project Public License
+License:        LPPL
 URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/prosper.html
 Source0:        prosper-%{version}-%{ctandate}.zip
 # ctan generated source
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5-4
+- fix license tag
+
 * Wed Sep 20 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> - 1.5-3
 - mass rebuild
 - fix directory ownership somewhat



From pkgdb at fedoraproject.org  Mon Sep  8 14:24:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:24:27 +0000
Subject: [pkgdb] libgda: denis has requested commit
Message-ID: <20080908142428.02359208DB2@bastion.fedora.phx.redhat.com>

denis has requested the commit acl on libgda (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:24:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:24:30 +0000
Subject: [pkgdb] libgda: denis has requested approveacls
Message-ID: <20080908142430.BFC6B208DA4@bastion.fedora.phx.redhat.com>

denis has requested the approveacls acl on libgda (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:24:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:24:57 +0000
Subject: [pkgdb] libgnomedb: denis has requested watchbugzilla
Message-ID: <20080908142458.07AEE208D98@bastion.fedora.phx.redhat.com>

denis has requested the watchbugzilla acl on libgnomedb (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:24:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:24:59 +0000
Subject: [pkgdb] libgnomedb: denis has requested watchcommits
Message-ID: <20080908142459.EA022208DA7@bastion.fedora.phx.redhat.com>

denis has requested the watchcommits acl on libgnomedb (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:25:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:25:10 +0000
Subject: [pkgdb] libgnomedb: denis has requested approveacls
Message-ID: <20080908142510.BAE5F208DA9@bastion.fedora.phx.redhat.com>

denis has requested the approveacls acl on libgnomedb (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:25:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:25:03 +0000
Subject: [pkgdb] libgnomedb: denis has requested commit
Message-ID: <20080908142504.16980208DB9@bastion.fedora.phx.redhat.com>

denis has requested the commit acl on libgnomedb (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:25:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:25:18 +0000
Subject: [pkgdb] libgnomedb: denis has requested watchbugzilla
Message-ID: <20080908142518.AA5B3208DAD@bastion.fedora.phx.redhat.com>

denis has requested the watchbugzilla acl on libgnomedb (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:25:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:25:21 +0000
Subject: [pkgdb] libgnomedb: denis has requested watchcommits
Message-ID: <20080908142521.5FCB8208DBB@bastion.fedora.phx.redhat.com>

denis has requested the watchcommits acl on libgnomedb (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:25:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:25:22 +0000
Subject: [pkgdb] libgnomedb: denis has requested commit
Message-ID: <20080908142522.E2AAC208DBD@bastion.fedora.phx.redhat.com>

denis has requested the commit acl on libgnomedb (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:25:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:25:25 +0000
Subject: [pkgdb] libgnomedb: denis has requested approveacls
Message-ID: <20080908142528.BD268208D9A@bastion.fedora.phx.redhat.com>

denis has requested the approveacls acl on libgnomedb (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:25:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:25:30 +0000
Subject: [pkgdb] libgnomedb: denis has requested watchbugzilla
Message-ID: <20080908142530.ABB63208DAE@bastion.fedora.phx.redhat.com>

denis has requested the watchbugzilla acl on libgnomedb (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:25:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:25:33 +0000
Subject: [pkgdb] libgnomedb: denis has requested watchcommits
Message-ID: <20080908142533.881DD208DC0@bastion.fedora.phx.redhat.com>

denis has requested the watchcommits acl on libgnomedb (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:25:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:25:39 +0000
Subject: [pkgdb] libgnomedb: denis has requested commit
Message-ID: <20080908142539.357762D0027@bastion.fedora.phx.redhat.com>

denis has requested the commit acl on libgnomedb (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:25:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:25:42 +0000
Subject: [pkgdb] libgnomedb: denis has requested approveacls
Message-ID: <20080908142542.30433208DB1@bastion.fedora.phx.redhat.com>

denis has requested the approveacls acl on libgnomedb (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:25:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:25:46 +0000
Subject: [pkgdb] libgnomedb: denis has requested watchbugzilla
Message-ID: <20080908142546.17F012D002A@bastion.fedora.phx.redhat.com>

denis has requested the watchbugzilla acl on libgnomedb (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:25:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:25:48 +0000
Subject: [pkgdb] libgnomedb: denis has requested watchcommits
Message-ID: <20080908142548.9C969208DB3@bastion.fedora.phx.redhat.com>

denis has requested the watchcommits acl on libgnomedb (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:25:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:25:51 +0000
Subject: [pkgdb] libgnomedb: denis has requested commit
Message-ID: <20080908142551.32F18208DA2@bastion.fedora.phx.redhat.com>

denis has requested the commit acl on libgnomedb (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:25:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:25:55 +0000
Subject: [pkgdb] libgnomedb: denis has requested approveacls
Message-ID: <20080908142556.015F8208DC6@bastion.fedora.phx.redhat.com>

denis has requested the approveacls acl on libgnomedb (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:25:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:25:58 +0000
Subject: [pkgdb] xorg-x11-apps had acl change status
Message-ID: <20080908142559.1DD86208DC8@bastion.fedora.phx.redhat.com>

ausil has set the approveacls acl on xorg-x11-apps (Fedora devel) to Approved for ajax

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-apps



From pkgdb at fedoraproject.org  Mon Sep  8 14:26:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:26:32 +0000
Subject: [pkgdb] xorg-x11-apps had acl change status
Message-ID: <20080908142632.D25C72D0036@bastion.fedora.phx.redhat.com>

ausil has set the approveacls acl on xorg-x11-apps (Fedora 7) to Approved for ajax

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-apps



From pkgdb at fedoraproject.org  Mon Sep  8 14:26:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:26:38 +0000
Subject: [pkgdb] xorg-x11-apps had acl change status
Message-ID: <20080908142638.53871208DA6@bastion.fedora.phx.redhat.com>

ausil has set the approveacls acl on xorg-x11-apps (Fedora 8) to Approved for ajax

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-apps



From pkgdb at fedoraproject.org  Mon Sep  8 14:26:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:26:45 +0000
Subject: [pkgdb] xorg-x11-apps had acl change status
Message-ID: <20080908142645.6B7B5208DAD@bastion.fedora.phx.redhat.com>

ausil has set the approveacls acl on xorg-x11-apps (Fedora 9) to Approved for ajax

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-apps



From mcpierce at fedoraproject.org  Mon Sep  8 14:27:53 2008
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Mon,  8 Sep 2008 14:27:53 +0000 (UTC)
Subject: rpms/rubygem-cobbler/devel rubygem-cobbler.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080908142753.620B770128@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-cobbler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30066

Modified Files:
	.cvsignore sources 
Added Files:
	rubygem-cobbler.spec 
Log Message:
First official build for Fedora.



--- NEW FILE rubygem-cobbler.spec ---
# Generated from cobbler-0.0.1.gem by gem2rpm -*- rpm-spec -*-
%define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define gemname cobbler
%define geminstdir %{gemdir}/gems/%{gemname}-%{version}
%define installroot %{buildroot}%{geminstdir}

Summary: 	An interface for interacting with a Cobbler server
Name: 		rubygem-%{gemname}
Version: 	0.1.0
Release: 	1%{?dist}
Group: 		Development/Languages
License: 	LGPLv2+
URL: 		http://cobbler.et.redhat.com/
Source0: 	http://fedorapeople.org/~mcpierce/%{gemname}-%{version}.gem
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: 	rubygems
BuildRequires:  ruby-flexmock
BuildRequires: 	rubygems
BuildRequires:  rubygem-rake
BuildArch: 	noarch
Provides: 	rubygem(%{gemname}) = %{version}

%description
Provides Ruby bindings to interact with a Cobbler server.

%prep

%build

%check 

cd %{installroot}

rake test

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} --force %{SOURCE0}

chmod +x %{installroot}/examples/create_system.rb
chmod +x %{installroot}/examples/has_distro.rb
chmod +x %{installroot}/examples/has_image.rb
chmod +x %{installroot}/examples/has_profile.rb
chmod +x %{installroot}/examples/has_system.rb
chmod +x %{installroot}/examples/list_distros.rb
chmod +x %{installroot}/examples/list_images.rb
chmod +x %{installroot}/examples/list_profiles.rb
chmod +x %{installroot}/examples/list_systems.rb
chmod +x %{installroot}/examples/remove_distro.rb
chmod +x %{installroot}/examples/remove_image.rb
chmod +x %{installroot}/examples/remove_profile.rb
chmod +x %{installroot}/examples/remove_system.rb

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%{gemdir}/gems/%{gemname}-%{version}/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%doc %{geminstdir}/COPYING 
%doc %{geminstdir}/NEWS 
%doc %{geminstdir}/README

%{geminstdir}/config/cobbler.yml


%changelog
* Mon Sep 08 2008 Darryl Pierce <dpierce at redhat.com> - 0.1.0-1
- First official build for Fedora.

* Fri Sep 05 2008 Darryl Pierce <dpierce at redhat.com> - 0.0.2-4
- Bad BuildRequires slipped into the last version.

* Wed Sep 03 2008 Darryl Pierce <dpierce at redhat.com> - 0.0.2-3
- Added a build requirement for rubygem-rake.

* Tue Aug 26 2008 Darryl Pierce <dpierce at redhat.com> - 0.0.2-2
- Fixed the licensing in each source module to show the code is released under
  LGPLv2.1.
- Added %check to the spec file to run tests prior to creating the RPM.

* Thu Aug 21 2008 Darryl Pierce <dpierce at redhat.com> - 0.0.2-1
- Added a call to update prior to saving or updating a system. If the update
  fails, then an Exception is raised.

* Wed Aug 13 2008 Darryl Pierce <dpierce at redhat.com> - 0.0.1-3
- Added caching for the auth_token to prevent extraneous calls to login.
- Reworked and refined how cobbler_collection fields are processed, adding 
  support for both array and has properties.
- Rewrote the documentation for Cobbler::Base to make it easier to understand
  how to extend it to support other Cobbler types.
- Refactored the examples to clean up the code.

* Wed Aug 13 2008 Darryl Pierce <dpierce at redhat.com> - 0.0.1-2
- Removed markup of cobbler.yml and a config file. Fixed a few small bugs 
  in the code for using it as a gem.

* Mon Aug 04 2008 Darryl Pierce <dpierce at redhat.com> - 0.0.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cobbler/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 21:06:57 -0000	1.1
+++ .cvsignore	8 Sep 2008 14:27:22 -0000	1.2
@@ -0,0 +1 @@
+cobbler-0.0.2.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cobbler/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 21:06:57 -0000	1.1
+++ sources	8 Sep 2008 14:27:23 -0000	1.2
@@ -0,0 +1 @@
+f52e571d0e004935f4a1c95749ef37ca  cobbler-0.0.2.gem



From mcpierce at fedoraproject.org  Mon Sep  8 14:32:51 2008
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Mon,  8 Sep 2008 14:32:51 +0000 (UTC)
Subject: rpms/rubygem-cobbler/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20080908143252.04EA170128@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-cobbler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32184

Modified Files:
	.cvsignore sources 
Log Message:
Pushing the soures.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cobbler/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Sep 2008 14:27:22 -0000	1.2
+++ .cvsignore	8 Sep 2008 14:32:21 -0000	1.3
@@ -1 +1 @@
-cobbler-0.0.2.gem
+cobbler-0.1.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cobbler/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2008 14:27:23 -0000	1.2
+++ sources	8 Sep 2008 14:32:21 -0000	1.3
@@ -1 +1 @@
-f52e571d0e004935f4a1c95749ef37ca  cobbler-0.0.2.gem
+17638005f28adaa7bed19cd4a04ccd74  cobbler-0.1.0.gem



From spot at fedoraproject.org  Mon Sep  8 14:30:27 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 14:30:27 +0000 (UTC)
Subject: rpms/thewidgetfactory/devel thewidgetfactory.spec,1.8,1.9
Message-ID: <20080908143027.08FA970128@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/thewidgetfactory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31212

Modified Files:
	thewidgetfactory.spec 
Log Message:
fix license tag


Index: thewidgetfactory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thewidgetfactory/devel/thewidgetfactory.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- thewidgetfactory.spec	23 Feb 2008 09:59:59 -0000	1.8
+++ thewidgetfactory.spec	8 Sep 2008 14:29:56 -0000	1.9
@@ -1,10 +1,11 @@
 Name:           thewidgetfactory
 Version:        0.2.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A tool for previewing GTK widgets
 
 Group:          Development/Tools
-License:        GPL 
+# No version specified.
+License:        GPL+
 URL:            http://www.stellingwerff.com/?page_id=10 
 Source0:        http://www.stellingwerff.com/TheWidgetFactory/%{name}-%{version}.tar.gz
 Source1:        thewidgetfactory.desktop 
@@ -46,6 +47,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.1-8
+- fix license tag
+
 * Fri Feb 22 2008 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.2.1-7
 - Added libcap-devel for dependancy
 



From orion at fedoraproject.org  Mon Sep  8 14:40:23 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon,  8 Sep 2008 14:40:23 +0000 (UTC)
Subject: rpms/cmake/devel cmake.spec,1.41,1.42
Message-ID: <20080908144023.C537F70128@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2543

Modified Files:
	cmake.spec 
Log Message:
* Mon Sep 8 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-0.rc3.1
- Update to 2.6.2-RC-2
- Drop parens patch fixed upstream



Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- cmake.spec	2 Sep 2008 21:52:56 -0000	1.41
+++ cmake.spec	8 Sep 2008 14:39:53 -0000	1.42
@@ -1,20 +1,20 @@
 # Set to bcond_without or use --with bootstrap if bootstrapping a new release
 # or architecture
 %bcond_with bootstrap
+# Set to RC version if building RC, else %{nil}
+%define rcver -RC-3
 
 Name:           cmake
-Version:        2.6.1
-Release:        3%{?dist}
+Version:        2.6.2
+Release:        0.rc3.1%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://www.cmake.org
-Source0:        http://www.cmake.org/files/v2.6/cmake-%{version}.tar.gz
+Source0:        http://www.cmake.org/files/v2.6/cmake-%{version}%{rcver}.tar.gz
 Source2:        macros.cmake
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#See http://public.kitware.com/Bug/view.php?id=7392
-Patch1:         cmake-2.6.1-parens.patch   
 
 BuildRequires:  ncurses-devel, libX11-devel
 BuildRequires:  qt4-devel, desktop-file-utils
@@ -42,8 +42,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch1 -p1 -b .parens
+%setup -q -n %{name}-%{version}%{rcver}
 # Fixup permissions
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
@@ -114,6 +113,10 @@
 
 
 %changelog
+* Mon Sep 8 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-0.rc3.1
+- Update to 2.6.2-RC-2
+- Drop parens patch fixed upstream
+
 * Tue Sep 2 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.1-3
 - Drop jni patch, applied upstream.
 



From jwrdegoede at fedoraproject.org  Mon Sep  8 14:45:14 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon,  8 Sep 2008 14:45:14 +0000 (UTC)
Subject: rpms/vegastrike/devel vegastrike-0.4.2-vssetup-fix.patch, 1.3,
	1.4 vegastrike.spec, 1.12, 1.13
Message-ID: <20080908144514.5A34270128@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/vegastrike/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4249

Modified Files:
	vegastrike-0.4.2-vssetup-fix.patch vegastrike.spec 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.5.0-4
- Fix patch fuzz build failure


vegastrike-0.4.2-vssetup-fix.patch:

Index: vegastrike-0.4.2-vssetup-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vegastrike/devel/vegastrike-0.4.2-vssetup-fix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vegastrike-0.4.2-vssetup-fix.patch	7 May 2008 05:30:12 -0000	1.3
+++ vegastrike-0.4.2-vssetup-fix.patch	8 Sep 2008 14:44:43 -0000	1.4
@@ -1,11 +1,12 @@
---- vegastrike-0.4.1.orig/setup/src/include/display_gtk.cpp	2003-09-19 17:31:02.000000000 -0400
-+++ vegastrike-0.4.1/setup/src/include/display_gtk.cpp	2004-01-12 13:02:19.000000000 -0500
-@@ -56,7 +56,7 @@
+diff -up vegastrike-source-0.5.0/setup/src/include/display_gtk.cpp.foo vegastrike-source-0.5.0/setup/src/include/display_gtk.cpp
+--- vegastrike-source-0.5.0/setup/src/include/display_gtk.cpp.foo	2008-09-08 16:42:15.000000000 +0200
++++ vegastrike-source-0.5.0/setup/src/include/display_gtk.cpp	2008-09-08 16:42:21.000000000 +0200
+@@ -66,7 +66,7 @@ void myexit(int exitval){
  #ifdef _WIN32
  	int err=(int)ShellExecute(NULL,"open","documentation\\readme.txt","","",1);
  #else
 -	execlp("less", "less","readme.txt", NULL); //Will this work in Linux?
 +	execlp("xdg-open", "xdg-open", "/usr/share/vegastrike/documentation/readme.txt", NULL);
  #endif
- 	gtk_exit(exitval);
+ 	exit(0);//exitval);
  }


Index: vegastrike.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vegastrike/devel/vegastrike.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vegastrike.spec	2 Jul 2008 12:24:49 -0000	1.12
+++ vegastrike.spec	8 Sep 2008 14:44:43 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           vegastrike
 Version:        0.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        3D OpenGL spaceflight simulator
 Group:          Amusements/Games
 License:        GPLv2+
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.5.0-4
+- Fix patch fuzz build failure
+
 * Wed Jul  2 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5.0-3
 - Rebuild for new ogre
 



From mcpierce at fedoraproject.org  Mon Sep  8 14:48:23 2008
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Mon,  8 Sep 2008 14:48:23 +0000 (UTC)
Subject: rpms/rubygem-cobbler/F-9 rubygem-cobbler.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080908144823.8837070128@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-cobbler/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5554

Modified Files:
	.cvsignore sources 
Added Files:
	rubygem-cobbler.spec 
Log Message:
First official build for Fedora 9.



--- NEW FILE rubygem-cobbler.spec ---
# Generated from cobbler-0.0.1.gem by gem2rpm -*- rpm-spec -*-
%define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define gemname cobbler
%define geminstdir %{gemdir}/gems/%{gemname}-%{version}
%define installroot %{buildroot}%{geminstdir}

Summary: 	An interface for interacting with a Cobbler server
Name: 		rubygem-%{gemname}
Version: 	0.1.0
Release: 	1%{?dist}
Group: 		Development/Languages
License: 	LGPLv2+
URL: 		http://cobbler.et.redhat.com/
Source0: 	http://fedorapeople.org/~mcpierce/%{gemname}-%{version}.gem
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: 	rubygems
BuildRequires:  ruby-flexmock
BuildRequires: 	rubygems
BuildRequires:  rubygem-rake
BuildArch: 	noarch
Provides: 	rubygem(%{gemname}) = %{version}

%description
Provides Ruby bindings to interact with a Cobbler server.

%prep

%build

%check 

cd %{installroot}

rake test

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} --force %{SOURCE0}

chmod +x %{installroot}/examples/create_system.rb
chmod +x %{installroot}/examples/has_distro.rb
chmod +x %{installroot}/examples/has_image.rb
chmod +x %{installroot}/examples/has_profile.rb
chmod +x %{installroot}/examples/has_system.rb
chmod +x %{installroot}/examples/list_distros.rb
chmod +x %{installroot}/examples/list_images.rb
chmod +x %{installroot}/examples/list_profiles.rb
chmod +x %{installroot}/examples/list_systems.rb
chmod +x %{installroot}/examples/remove_distro.rb
chmod +x %{installroot}/examples/remove_image.rb
chmod +x %{installroot}/examples/remove_profile.rb
chmod +x %{installroot}/examples/remove_system.rb

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%{gemdir}/gems/%{gemname}-%{version}/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%doc %{geminstdir}/COPYING 
%doc %{geminstdir}/NEWS 
%doc %{geminstdir}/README

%{geminstdir}/config/cobbler.yml


%changelog
* Mon Sep 08 2008 Darryl Pierce <dpierce at redhat.com> - 0.1.0-1
- First official build for Fedora.

* Fri Sep 05 2008 Darryl Pierce <dpierce at redhat.com> - 0.0.2-4
- Bad BuildRequires slipped into the last version.

* Wed Sep 03 2008 Darryl Pierce <dpierce at redhat.com> - 0.0.2-3
- Added a build requirement for rubygem-rake.

* Tue Aug 26 2008 Darryl Pierce <dpierce at redhat.com> - 0.0.2-2
- Fixed the licensing in each source module to show the code is released under
  LGPLv2.1.
- Added %check to the spec file to run tests prior to creating the RPM.

* Thu Aug 21 2008 Darryl Pierce <dpierce at redhat.com> - 0.0.2-1
- Added a call to update prior to saving or updating a system. If the update
  fails, then an Exception is raised.

* Wed Aug 13 2008 Darryl Pierce <dpierce at redhat.com> - 0.0.1-3
- Added caching for the auth_token to prevent extraneous calls to login.
- Reworked and refined how cobbler_collection fields are processed, adding 
  support for both array and has properties.
- Rewrote the documentation for Cobbler::Base to make it easier to understand
  how to extend it to support other Cobbler types.
- Refactored the examples to clean up the code.

* Wed Aug 13 2008 Darryl Pierce <dpierce at redhat.com> - 0.0.1-2
- Removed markup of cobbler.yml and a config file. Fixed a few small bugs 
  in the code for using it as a gem.

* Mon Aug 04 2008 Darryl Pierce <dpierce at redhat.com> - 0.0.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cobbler/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 21:06:57 -0000	1.1
+++ .cvsignore	8 Sep 2008 14:47:52 -0000	1.2
@@ -0,0 +1 @@
+cobbler-0.1.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cobbler/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 21:06:57 -0000	1.1
+++ sources	8 Sep 2008 14:47:53 -0000	1.2
@@ -0,0 +1 @@
+17638005f28adaa7bed19cd4a04ccd74  cobbler-0.1.0.gem



From bagnara at fedoraproject.org  Mon Sep  8 14:49:52 2008
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Mon,  8 Sep 2008 14:49:52 +0000 (UTC)
Subject: rpms/ppl/F-9 ppl-0.9-swiprolog.patch,NONE,1.1 ppl.spec,1.11,1.12
Message-ID: <20080908144952.2F5E770128@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6161

Modified Files:
	ppl.spec 
Added Files:
	ppl-0.9-swiprolog.patch 
Log Message:
Implemented a workaround to cope with the new location of SWI-Prolog.h.
Fixed the SWI-Prolog interface dependencies.


ppl-0.9-swiprolog.patch:

--- NEW FILE ppl-0.9-swiprolog.patch ---
diff -ur ppl-0.9/configure ppl-0.9-patched/configure
--- ppl-0.9/configure	2006-03-12 09:11:32.000000000 +0100
+++ ppl-0.9-patched/configure	2008-09-08 15:38:34.000000000 +0200
@@ -14929,7 +14929,7 @@
   swi_prolog_version=`$swi_prolog -dump-runtime-variables | grep PLVERSION= | sed 's/PLVERSION="\(.*\)";/\1/'`
 
 
-  SWI_PROLOG_INCLUDE_OPTIONS="-I${swi_prolog_base}/include"
+  SWI_PROLOG_INCLUDE_OPTIONS="-I${swi_prolog_base}/include -I/usr/include/pl"
   ac_save_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="$CPPFLAGS $SWI_PROLOG_INCLUDE_OPTIONS"
   ac_ext=cc
diff -ur ppl-0.9/interfaces/Prolog/SWI/Makefile.in ppl-0.9-patched/interfaces/Prolog/SWI/Makefile.in
--- ppl-0.9/interfaces/Prolog/SWI/Makefile.in	2006-03-12 09:11:44.000000000 +0100
+++ ppl-0.9-patched/interfaces/Prolog/SWI/Makefile.in	2008-09-08 16:16:05.000000000 +0200
@@ -728,7 +728,7 @@
 # Notice: we are linking statically until we understand whether
 # and if libtool and plld can interoperate.
 @BUILD_SWI_PROLOG_INTERFACE_TRUE at ppl_pl$(EXEEXT): ppl_swiprolog.o ppl_pl.o | libppl_swiprolog.la
- at BUILD_SWI_PROLOG_INTERFACE_TRUE@	plld -cc $(CC) -c++ $(CXX) -ld $(CXX) \
+ at BUILD_SWI_PROLOG_INTERFACE_TRUE@	plld -v -cc $(CC) -c++ $(CXX) -ld $(CXX) \
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-ld-options`echo '' $(AM_CXXFLAGS) $(CXXFLAGS) | tr " " ","` \
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-o $@ $+ \
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-L$(top_builddir)/src/.libs -lppl \
@@ -736,7 +736,7 @@
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		@extra_libraries@
 
 @BUILD_SWI_PROLOG_INTERFACE_TRUE at pl_clpq$(EXEEXT): ppl_swiprolog.o pl_clpq.o pl_clpq.pl ../tests/clpq.pl | libppl_swiprolog.la 
- at BUILD_SWI_PROLOG_INTERFACE_TRUE@	plld -cc $(CC) -c++ $(CXX) -ld $(CXX) \
+ at BUILD_SWI_PROLOG_INTERFACE_TRUE@	plld -v -cc $(CC) -c++ $(CXX) -ld $(CXX) \
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-ld-options`echo '' $(AM_CXXFLAGS) $(CXXFLAGS) | tr " " ","` \
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-o $@ $+ \
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-L$(top_builddir)/src/.libs -lppl \
@@ -744,7 +744,7 @@
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		@extra_libraries@
 
 @BUILD_SWI_PROLOG_INTERFACE_TRUE at pl_clpq2$(EXEEXT): ppl_swiprolog.o pl_clpq.o pl_clpq.pl ../tests/clpq2.pl | libppl_swiprolog.la 
- at BUILD_SWI_PROLOG_INTERFACE_TRUE@	plld -cc $(CC) -c++ $(CXX) -ld $(CXX) \
+ at BUILD_SWI_PROLOG_INTERFACE_TRUE@	plld -v -cc $(CC) -c++ $(CXX) -ld $(CXX) \
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-ld-options`echo '' $(AM_CXXFLAGS) $(CXXFLAGS) | tr " " ","` \
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-o $@ $+ \
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-L$(top_builddir)/src/.libs -lppl \


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-9/ppl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ppl.spec	19 May 2008 16:18:36 -0000	1.11
+++ ppl.spec	8 Sep 2008 14:49:21 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		ppl
 Version:	0.9
-Release:	20%{?dist}
+Release:	24%{?dist}
 
 Summary:	The Parma Polyhedra Library: a library of numerical abstractions
 Group:		Development/Libraries
@@ -14,6 +14,7 @@
 Patch1:		ppl-0.9-configure.patch
 Patch2:		ppl-0.9-makefiles.patch
 Patch3:		ppl-0.9-cstdlib.patch
+Patch4:		ppl-0.9-swiprolog.patch
 #Icon:
 #Requires:
 Requires(post): /sbin/ldconfig
@@ -83,27 +84,23 @@
 of the Parma Polyhedra Library.
 %endif
 
-%ifnarch ppc64
 %package swiprolog
 Summary:	The SWI-Prolog interface of the Parma Polyhedra Library
 Group:		Development/Libraries
-BuildRequires:	pl >= 5.6.0
+BuildRequires:	pl-devel >= 5.6.57-2
 Requires:	ppl = %{version}-%{release}, ppl-pwl = %{version}-%{release}, pl >= 5.6.0
 %description swiprolog
 This package adds SWI-Prolog support to the Parma Polyhedra Library.
 Install this package if you want to use the library in SWI Prolog programs.
-%endif
 
-%ifnarch ppc64
 %package swiprolog-static
 Summary:	The static archive for the SWI-Prolog interface of the Parma Polyhedra Library
 Group:		Development/Libraries
-BuildRequires:	pl >= 5.6.0
+BuildRequires:	pl-devel >= 5.6.57-2, pl-static >= 5.6.57-2
 Requires:	ppl-swiprolog = %{version}-%{release}
 %description swiprolog-static
 This package contains the static archive for the SWI-Prolog interface
 of the Parma Polyhedra Library.
-%endif
 
 %package yap
 Summary:	The YAP Prolog interface of the Parma Polyhedra Library
@@ -166,6 +163,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 CPPFLAGS="-I%{_includedir}/glpk"
@@ -260,20 +258,16 @@
 %{_libdir}/%{name}/libppl_gprolog.a
 %endif
 
-%ifnarch ppc64
 %files swiprolog
 %defattr(-,root,root,-)
 %doc interfaces/Prolog/SWI/README.swiprolog
 %{_bindir}/ppl_pl
 %{_libdir}/%{name}/libppl_swiprolog.so
 %{_libdir}/%{name}/ppl_swiprolog.pl
-%endif
 
-%ifnarch ppc64
 %files swiprolog-static
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libppl_swiprolog.a
-%endif
 
 %files yap
 %defattr(-,root,root,-)
@@ -317,6 +311,19 @@
 rm -rf %{buildroot}
 
 %changelog
+* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-24
+- Changed ppl-0.9-swiprolog.patch so as to invoke `plld' with
+  the `-v' option.
+
+* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-23
+- Fixed ppl-0.9-swiprolog.patch.
+
+* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-22
+- Implemented a workaround to cope with the new location of SWI-Prolog.h.
+
+* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-21
+- Fixed the SWI-Prolog interface dependencies.
+
 * Mon May 19 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-20
 - Added Requires /sbin/ldconfig.
 



From mdehaan at fedoraproject.org  Mon Sep  8 14:50:28 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon,  8 Sep 2008 14:50:28 +0000 (UTC)
Subject: rpms/cobbler/EL-4 sources,1.50,1.51
Message-ID: <20080908145028.496E270128@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6544/EL-4

Modified Files:
	sources 
Log Message:
Clean up sources




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	8 Sep 2008 14:19:03 -0000	1.50
+++ sources	8 Sep 2008 14:49:57 -0000	1.51
@@ -1,8 +1 @@
-2ca6fd737b4c47e7a986cc99bafa1d60  cobbler-1.0.1.tar.gz
-a5ab7e39d616e3a13269b6fe088aec4c  cobbler-1.0.2.tar.gz
-95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
-7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
-2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
-df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz
-dac86d3a02e677da597a7ac00c51c889  cobbler-1.2.3.tar.gz
 4586e811e587c929edfc5675d8c018c8  cobbler-1.2.4.tar.gz



From mdehaan at fedoraproject.org  Mon Sep  8 14:50:28 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon,  8 Sep 2008 14:50:28 +0000 (UTC)
Subject: rpms/cobbler/EL-5 sources,1.53,1.54
Message-ID: <20080908145028.C7FC570128@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6544/EL-5

Modified Files:
	sources 
Log Message:
Clean up sources




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	8 Sep 2008 14:19:03 -0000	1.53
+++ sources	8 Sep 2008 14:49:58 -0000	1.54
@@ -1,8 +1 @@
-2ca6fd737b4c47e7a986cc99bafa1d60  cobbler-1.0.1.tar.gz
-a5ab7e39d616e3a13269b6fe088aec4c  cobbler-1.0.2.tar.gz
-95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
-7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
-2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
-df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz
-394072caed01acc1f01d5289b9c396a1  cobbler-1.2.3.tar.gz
 4586e811e587c929edfc5675d8c018c8  cobbler-1.2.4.tar.gz



From mdehaan at fedoraproject.org  Mon Sep  8 14:50:29 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon,  8 Sep 2008 14:50:29 +0000 (UTC)
Subject: rpms/cobbler/F-8 sources,1.50,1.51
Message-ID: <20080908145029.9FDC170128@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6544/F-8

Modified Files:
	sources 
Log Message:
Clean up sources




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	8 Sep 2008 14:19:04 -0000	1.50
+++ sources	8 Sep 2008 14:49:59 -0000	1.51
@@ -1,8 +1 @@
-2ca6fd737b4c47e7a986cc99bafa1d60  cobbler-1.0.1.tar.gz
-a5ab7e39d616e3a13269b6fe088aec4c  cobbler-1.0.2.tar.gz
-95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
-7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
-2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
-df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz
-394072caed01acc1f01d5289b9c396a1  cobbler-1.2.3.tar.gz
 4586e811e587c929edfc5675d8c018c8  cobbler-1.2.4.tar.gz



From mdehaan at fedoraproject.org  Mon Sep  8 14:50:30 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon,  8 Sep 2008 14:50:30 +0000 (UTC)
Subject: rpms/cobbler/F-9 sources,1.49,1.50
Message-ID: <20080908145030.0DEC270128@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6544/F-9

Modified Files:
	sources 
Log Message:
Clean up sources




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	8 Sep 2008 14:19:04 -0000	1.49
+++ sources	8 Sep 2008 14:49:59 -0000	1.50
@@ -1,8 +1 @@
-2ca6fd737b4c47e7a986cc99bafa1d60  cobbler-1.0.1.tar.gz
-a5ab7e39d616e3a13269b6fe088aec4c  cobbler-1.0.2.tar.gz
-95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
-7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
-2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
-df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz
-394072caed01acc1f01d5289b9c396a1  cobbler-1.2.3.tar.gz
 4586e811e587c929edfc5675d8c018c8  cobbler-1.2.4.tar.gz



From mdehaan at fedoraproject.org  Mon Sep  8 14:50:29 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon,  8 Sep 2008 14:50:29 +0000 (UTC)
Subject: rpms/cobbler/F-7 sources,1.50,1.51
Message-ID: <20080908145029.34D4970128@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6544/F-7

Modified Files:
	sources 
Log Message:
Clean up sources




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	8 Sep 2008 14:19:03 -0000	1.50
+++ sources	8 Sep 2008 14:49:58 -0000	1.51
@@ -1,8 +1 @@
-2ca6fd737b4c47e7a986cc99bafa1d60  cobbler-1.0.1.tar.gz
-a5ab7e39d616e3a13269b6fe088aec4c  cobbler-1.0.2.tar.gz
-95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
-7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
-2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
-df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz
-394072caed01acc1f01d5289b9c396a1  cobbler-1.2.3.tar.gz
 4586e811e587c929edfc5675d8c018c8  cobbler-1.2.4.tar.gz



From mdehaan at fedoraproject.org  Mon Sep  8 14:50:30 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon,  8 Sep 2008 14:50:30 +0000 (UTC)
Subject: rpms/cobbler/devel sources,1.51,1.52
Message-ID: <20080908145030.6F48070128@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6544/devel

Modified Files:
	sources 
Log Message:
Clean up sources




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	8 Sep 2008 14:19:05 -0000	1.51
+++ sources	8 Sep 2008 14:50:00 -0000	1.52
@@ -1,8 +1 @@
-2ca6fd737b4c47e7a986cc99bafa1d60  cobbler-1.0.1.tar.gz
-a5ab7e39d616e3a13269b6fe088aec4c  cobbler-1.0.2.tar.gz
-95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
-7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
-2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz
-df2cd962e28c6a434b45152c47b19ead  cobbler-1.2.2.tar.gz
-394072caed01acc1f01d5289b9c396a1  cobbler-1.2.3.tar.gz
 4586e811e587c929edfc5675d8c018c8  cobbler-1.2.4.tar.gz



From pkgdb at fedoraproject.org  Mon Sep  8 14:51:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:51:18 +0000
Subject: [pkgdb] libgda had acl change status
Message-ID: <20080908145118.74E17208D7C@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on libgda (Fedora devel) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:51:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:51:19 +0000
Subject: [pkgdb] libgda had acl change status
Message-ID: <20080908145119.791DC208771@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on libgda (Fedora devel) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:51:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:51:23 +0000
Subject: [pkgdb] libgda had acl change status
Message-ID: <20080908145123.68DC2208D0F@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on libgda (Fedora devel) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:51:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:51:25 +0000
Subject: [pkgdb] libgda had acl change status
Message-ID: <20080908145125.C609D208D9A@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on libgda (Fedora devel) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:51:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:51:26 +0000
Subject: [pkgdb] libgda had acl change status
Message-ID: <20080908145126.400CB208DA2@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on libgda (Fedora 7) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From jwrdegoede at fedoraproject.org  Mon Sep  8 14:28:11 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon,  8 Sep 2008 14:28:11 +0000 (UTC)
Subject: rpms/supertuxkart/devel supertuxkart-fhs.patch, 1.2,
	1.3 supertuxkart.spec, 1.9, 1.10
Message-ID: <20080908142811.3D77D70128@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/supertuxkart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30315

Modified Files:
	supertuxkart-fhs.patch supertuxkart.spec 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.5-2
- Fix patch fuzz build failure


supertuxkart-fhs.patch:

Index: supertuxkart-fhs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/supertuxkart/devel/supertuxkart-fhs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- supertuxkart-fhs.patch	15 Aug 2007 12:13:32 -0000	1.2
+++ supertuxkart-fhs.patch	8 Sep 2008 14:27:40 -0000	1.3
@@ -1,16 +1,6 @@
---- supertuxkart-0.2/src/Makefile.in.aap	2006-09-24 21:20:26.000000000 +0200
-+++ supertuxkart-0.2/src/Makefile.in	2006-09-24 21:20:37.000000000 +0200
-@@ -220,7 +220,7 @@
- noinst_LIBRARIES = libstatic_ssg.a
- libstatic_ssg_a_SOURCES = static_ssg.cpp static_ssg.hpp
- libstatic_ssg_a_CXXFLAGS = @NOREGMOVE@
--AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/games/@PACKAGE@/\""
-+AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/@PACKAGE@/\""
- supertuxkart_SOURCES = main.cpp  			\
- 	material.cpp		   material.hpp           	\
- 	material_manager.cpp	   material_manager.hpp    	\
---- supertuxkart-0.3/src/Makefile.am~	2007-08-15 12:00:45.000000000 +0200
-+++ supertuxkart-0.3/src/Makefile.am	2007-08-15 12:00:45.000000000 +0200
+diff -up supertuxkart-0.5/src/Makefile.am.foo supertuxkart-0.5/src/Makefile.am
+--- supertuxkart-0.5/src/Makefile.am.foo	2008-09-08 16:25:21.000000000 +0200
++++ supertuxkart-0.5/src/Makefile.am	2008-09-08 16:25:26.000000000 +0200
 @@ -23,7 +23,7 @@ noinst_LIBRARIES         =  libstatic_ss
  libstatic_ssg_a_SOURCES  = static_ssg.cpp static_ssg.hpp
  libstatic_ssg_a_CXXFLAGS = @NOREGMOVE@
@@ -19,4 +9,16 @@
 +AM_CPPFLAGS=-DSUPERTUXKART_DATADIR="\"$(datadir)/@PACKAGE@/\""
  
  supertuxkart_SOURCES =             main.cpp  			\
+ 	actionmap.cpp		   actionmap.hpp		\
+diff -up supertuxkart-0.5/src/Makefile.in.foo supertuxkart-0.5/src/Makefile.in
+--- supertuxkart-0.5/src/Makefile.in.foo	2008-09-08 16:25:21.000000000 +0200
++++ supertuxkart-0.5/src/Makefile.in	2008-09-08 16:25:26.000000000 +0200
+@@ -267,7 +267,7 @@ top_srcdir = @top_srcdir@
+ noinst_LIBRARIES = libstatic_ssg.a
+ libstatic_ssg_a_SOURCES = static_ssg.cpp static_ssg.hpp
+ libstatic_ssg_a_CXXFLAGS = @NOREGMOVE@
+-AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/games/@PACKAGE@/\""
++AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/@PACKAGE@/\""
+ supertuxkart_SOURCES = main.cpp  			\
+ 	actionmap.cpp		   actionmap.hpp		\
  	material.cpp		   material.hpp           	\


Index: supertuxkart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supertuxkart/devel/supertuxkart.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- supertuxkart.spec	9 Jun 2008 18:24:14 -0000	1.9
+++ supertuxkart.spec	8 Sep 2008 14:27:40 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           supertuxkart
 Version:        0.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Kids 3D go-kart racing game featuring Tux
 Group:          Amusements/Games
 License:        GPLv2+
@@ -104,6 +104,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.5-2
+- Fix patch fuzz build failure
+
 * Tue Jun  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5-1
 - New upstream release 0.5
 



From pkgdb at fedoraproject.org  Mon Sep  8 14:51:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:51:27 +0000
Subject: [pkgdb] libgda had acl change status
Message-ID: <20080908145127.65431208DA6@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on libgda (Fedora 7) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From s4504kr at fedoraproject.org  Mon Sep  8 14:51:29 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon,  8 Sep 2008 14:51:29 +0000 (UTC)
Subject: rpms/blender/F-9 blender.spec,1.79,1.80 sources,1.14,1.15
Message-ID: <20080908145129.10F1270128@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7046

Modified Files:
	blender.spec sources 
Log Message:
New upstream release


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/F-9/blender.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- blender.spec	19 May 2008 17:47:29 -0000	1.79
+++ blender.spec	8 Sep 2008 14:50:58 -0000	1.80
@@ -1,10 +1,9 @@
-
 %define blenderlib %{_datadir}/blender
 %define plugins %{_libdir}/blender/plugins
 
 Name:           blender
-Version:        2.46
-Release: 	1%{?dist}.1
+Version:        2.47
+Release: 	1%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -13,10 +12,11 @@
 URL:            http://www.blender.org
 # During a Legel issue (#239476) the package contains a cusromized
 # source package created as fellow.
-# wget http://download.blender.org/source/blender-%{version}.tar.gz
-# tar -zxv blender-%{version}.tar.gz
-# rm -rf blender-%{version}/extern/ffmpeg
-# tar -zcf blender-%{version}-noffmpeg.tar.gz blender-%{version}/
+# wget http://download.blender.org/sorce/blender-2.47.tar.gz
+# cd blender-2-47/extern
+# rm -rf ffmpeg libmp3lame
+# cd ../..
+# tar -zcf blender-2.47-noffmpeg.tar.gz blender-2-47/
 Source0:	blender-%{version}-noffmpeg.tar.gz
 Source1:        http://bane.servebeer.com/programming/blender/import-3ds-0.7.py
 Source2:        http://bane.servebeer.com/programming/blender/export-3ds-0.71.py
@@ -179,14 +179,23 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
-* Mon May 19 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.46-1.1
+* Thu Aug 14 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.47-1
 - New upstream release
 
-* Wed May  7 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.45-14
-- Fix CVE-2008-1103 (#444535)
+* Tue Aug 12 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.47-0.2
+- New upstream release (blender-2.47rc)
+
+* Mon May 19 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.46-1
+- New upstream release
+
+* Wed May  7 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.46-0.3.1
+- Some fixes for CVE-2008-1003
+
+* Tue May  6 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.46-0.3
+- Release Canditate for 2.46
 
 * Sun Apr 27 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.45-13
-- More generic patch to solve scons issue
+- More generic patch for scons issue
 
 * Thu Apr 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.45-12
 - Fix odd scons compatibility issue


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	19 May 2008 17:12:49 -0000	1.14
+++ sources	8 Sep 2008 14:50:58 -0000	1.15
@@ -1 +1 @@
-9ec37f0c4ea1d17c619963036bf846e8  blender-2.46-noffmpeg.tar.gz
+d4b24d8fed319096802c817a496f60e3  blender-2.47-noffmpeg.tar.gz



From pkgdb at fedoraproject.org  Mon Sep  8 14:51:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:51:29 +0000
Subject: [pkgdb] libgda had acl change status
Message-ID: <20080908145129.6E46C208DAA@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on libgda (Fedora 7) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:51:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:51:32 +0000
Subject: [pkgdb] libgda had acl change status
Message-ID: <20080908145132.2CA3E208DAC@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on libgda (Fedora 7) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:51:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:51:44 +0000
Subject: [pkgdb] libgda had acl change status
Message-ID: <20080908145144.F4129208D1E@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on libgda (Fedora 8) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:51:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:51:45 +0000
Subject: [pkgdb] libgda had acl change status
Message-ID: <20080908145146.092CB208770@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on libgda (Fedora 8) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:51:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:51:48 +0000
Subject: [pkgdb] libgda had acl change status
Message-ID: <20080908145148.8E5BF208D0F@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on libgda (Fedora 8) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:51:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:51:50 +0000
Subject: [pkgdb] libgda had acl change status
Message-ID: <20080908145150.97C53208DB0@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on libgda (Fedora 8) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:52:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:52:20 +0000
Subject: [pkgdb] libgda had acl change status
Message-ID: <20080908145220.CF8EC208D9E@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on libgda (Fedora 9) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:52:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:52:21 +0000
Subject: [pkgdb] libgda had acl change status
Message-ID: <20080908145222.A1FF0208DA3@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on libgda (Fedora 9) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:52:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:52:22 +0000
Subject: [pkgdb] libgda had acl change status
Message-ID: <20080908145222.CE4D2208DA6@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on libgda (Fedora 9) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:52:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:52:32 +0000
Subject: [pkgdb] libgda had acl change status
Message-ID: <20080908145233.2A228208DA9@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on libgda (Fedora 9) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:52:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:52:53 +0000
Subject: [pkgdb] libgda ownership updated
Message-ID: <20080908145253.A747D208D1E@bastion.fedora.phx.redhat.com>

Package libgda in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:52:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:52:57 +0000
Subject: [pkgdb] libgda ownership updated
Message-ID: <20080908145257.45E42208DAE@bastion.fedora.phx.redhat.com>

Package libgda in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:53:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:53:08 +0000
Subject: [pkgdb] libgda ownership updated
Message-ID: <20080908145308.59B51208D0F@bastion.fedora.phx.redhat.com>

Package libgda in Fedora 4 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:53:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:53:10 +0000
Subject: [pkgdb] libgda ownership updated
Message-ID: <20080908145310.CC502208D99@bastion.fedora.phx.redhat.com>

Package libgda in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:53:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:53:16 +0000
Subject: [pkgdb] libgda ownership updated
Message-ID: <20080908145317.D0A17208D9F@bastion.fedora.phx.redhat.com>

Package libgda in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:53:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:53:20 +0000
Subject: [pkgdb] libgda ownership updated
Message-ID: <20080908145320.566D5208DA0@bastion.fedora.phx.redhat.com>

Package libgda in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:53:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:53:26 +0000
Subject: [pkgdb] libgda ownership updated
Message-ID: <20080908145326.4047A208D9E@bastion.fedora.phx.redhat.com>

Package libgda in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From orion at fedoraproject.org  Mon Sep  8 14:55:03 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon,  8 Sep 2008 14:55:03 +0000 (UTC)
Subject: rpms/cmake/devel .cvsignore,1.21,1.22 sources,1.21,1.22
Message-ID: <20080908145503.7AC8070128@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8425

Modified Files:
	.cvsignore sources 
Log Message:
Check in the source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	5 Aug 2008 19:43:33 -0000	1.21
+++ .cvsignore	8 Sep 2008 14:54:32 -0000	1.22
@@ -1 +1 @@
-cmake-2.6.1.tar.gz
+cmake-2.6.2-RC-3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	5 Aug 2008 19:43:33 -0000	1.21
+++ sources	8 Sep 2008 14:54:33 -0000	1.22
@@ -1 +1 @@
-6717f4bc3cfcced4172ad98660ce7599  cmake-2.6.1.tar.gz
+336aab65ac95b5a3b15a6e0becbbbb65  cmake-2.6.2-RC-3.tar.gz



From pkgdb at fedoraproject.org  Mon Sep  8 14:55:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:55:13 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080908145513.946BE208D98@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on libgnomedb (Fedora devel) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:55:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:55:17 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080908145518.27564208D9A@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on libgnomedb (Fedora devel) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:55:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:55:18 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080908145518.4887B208D9F@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on libgnomedb (Fedora devel) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:55:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:55:23 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080908145524.2F9F2208DA3@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on libgnomedb (Fedora devel) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:55:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:55:30 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080908145530.CAD2A208DA5@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on libgnomedb (Fedora 8) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:55:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:55:33 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080908145533.9BE69208D97@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on libgnomedb (Fedora 8) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:55:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:55:34 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080908145534.7CDAF208DA8@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on libgnomedb (Fedora 8) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:55:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:55:35 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080908145535.AE74A208DAB@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on libgnomedb (Fedora 8) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:55:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:55:40 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080908145541.28CC5208DAF@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on libgnomedb (Fedora 9) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:55:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:55:43 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080908145543.EA0FF208D9A@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on libgnomedb (Fedora 9) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:55:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:55:42 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080908145544.54AB52D0021@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on libgnomedb (Fedora 9) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:55:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:55:44 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080908145544.D2B9A2D0025@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on libgnomedb (Fedora 9) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:56:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:56:00 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080908145601.11335208D9C@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on libgnomedb (Fedora EPEL 5) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:56:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:56:01 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080908145601.60BD82E0002@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on libgnomedb (Fedora EPEL 5) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:56:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:56:01 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080908145601.F25482E0005@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on libgnomedb (Fedora EPEL 5) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:56:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:56:02 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080908145602.F16FF2E0008@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on libgnomedb (Fedora EPEL 5) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:56:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:56:05 +0000
Subject: [pkgdb] libgnomedb ownership updated
Message-ID: <20080908145606.1C3862E000B@bastion.fedora.phx.redhat.com>

Package libgnomedb in Fedora EPEL 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:56:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:56:09 +0000
Subject: [pkgdb] libgnomedb ownership updated
Message-ID: <20080908145609.79FBD2E0014@bastion.fedora.phx.redhat.com>

Package libgnomedb in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:56:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:56:12 +0000
Subject: [pkgdb] libgnomedb ownership updated
Message-ID: <20080908145613.041D2208D7C@bastion.fedora.phx.redhat.com>

Package libgnomedb in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:56:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:56:17 +0000
Subject: [pkgdb] libgnomedb ownership updated
Message-ID: <20080908145618.08B342E0012@bastion.fedora.phx.redhat.com>

Package libgnomedb in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:56:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:56:16 +0000
Subject: [pkgdb] libgnomedb ownership updated
Message-ID: <20080908145617.3B70C2E0010@bastion.fedora.phx.redhat.com>

Package libgnomedb in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:56:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:56:21 +0000
Subject: [pkgdb] libgnomedb ownership updated
Message-ID: <20080908145621.B527D2E0016@bastion.fedora.phx.redhat.com>

Package libgnomedb in Fedora 4 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:56:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:56:23 +0000
Subject: [pkgdb] libgnomedb ownership updated
Message-ID: <20080908145623.DD1572E0018@bastion.fedora.phx.redhat.com>

Package libgnomedb in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:56:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:56:26 +0000
Subject: [pkgdb] libgnomedb ownership updated
Message-ID: <20080908145626.5F4222E001C@bastion.fedora.phx.redhat.com>

Package libgnomedb in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From allisson at fedoraproject.org  Mon Sep  8 14:56:43 2008
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Mon,  8 Sep 2008 14:56:43 +0000 (UTC)
Subject: rpms/tcputils/devel tcputils.spec,1.2,1.3
Message-ID: <20080908145643.DB25A70128@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/tcputils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9173

Modified Files:
	tcputils.spec 
Log Message:
Rebuild for F-10


Index: tcputils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcputils/devel/tcputils.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tcputils.spec	18 Feb 2008 19:20:14 -0000	1.2
+++ tcputils.spec	8 Sep 2008 14:56:13 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           tcputils
 Version:        0.6.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Utilities for TCP programming in shell-scripts
 
 Group:          Development/Tools
@@ -51,10 +51,13 @@
 
 
 %changelog
+
+* Sat Sep  6 2008 Allisson Azevedo <allisson at gmail.com> 0.6.2-4
+- Rebuild for F-10
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.6.2-3
 - Autorebuild for GCC 4.3
 
-
 * Fri Oct 19 2007 Allisson Azevedo <allisson at gmail.com> 0.6.2-2
 - Keep timestamps on man files
 



From pkgdb at fedoraproject.org  Mon Sep  8 14:57:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:57:20 +0000
Subject: [pkgdb] arj ownership updated
Message-ID: <20080908145720.60A1A2D0025@bastion.fedora.phx.redhat.com>

Package arj in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 14:57:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:57:23 +0000
Subject: [pkgdb] arj ownership updated
Message-ID: <20080908145723.4F44A208D9C@bastion.fedora.phx.redhat.com>

Package arj in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 14:57:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:57:24 +0000
Subject: [pkgdb] arj ownership updated
Message-ID: <20080908145724.964B02E001E@bastion.fedora.phx.redhat.com>

Package arj in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 14:57:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:57:32 +0000
Subject: [pkgdb] arj ownership updated
Message-ID: <20080908145732.E32C0208D9E@bastion.fedora.phx.redhat.com>

Package arj in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 14:57:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:57:42 +0000
Subject: [pkgdb] arj ownership updated
Message-ID: <20080908145742.98F81208DAC@bastion.fedora.phx.redhat.com>

Package arj in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 14:57:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:57:43 +0000
Subject: [pkgdb] arj ownership updated
Message-ID: <20080908145743.437D1208DAF@bastion.fedora.phx.redhat.com>

Package arj in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 14:58:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:58:33 +0000
Subject: [pkgdb] rpc2 ownership updated
Message-ID: <20080908145833.CF251208DB4@bastion.fedora.phx.redhat.com>

Package rpc2 in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 14:58:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:58:36 +0000
Subject: [pkgdb] rpc2 ownership updated
Message-ID: <20080908145836.2F1F82E0005@bastion.fedora.phx.redhat.com>

Package rpc2 in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 14:58:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:58:36 +0000
Subject: [pkgdb] libgda ownership updated
Message-ID: <20080908145836.978522E0006@bastion.fedora.phx.redhat.com>

Package libgda in Fedora devel is now owned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:58:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:58:39 +0000
Subject: [pkgdb] rpc2 ownership updated
Message-ID: <20080908145839.7820A2E0009@bastion.fedora.phx.redhat.com>

Package rpc2 in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 14:59:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:59:01 +0000
Subject: [pkgdb] libgda ownership updated
Message-ID: <20080908145901.6ECE620876E@bastion.fedora.phx.redhat.com>

Package libgda in Fedora 8 is now owned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:58:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:58:55 +0000
Subject: [pkgdb] libgda ownership updated
Message-ID: <20080908145855.54D88208DA2@bastion.fedora.phx.redhat.com>

Package libgda in Fedora 9 is now owned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Mon Sep  8 14:59:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:59:09 +0000
Subject: [pkgdb] libgnomedb ownership updated
Message-ID: <20080908145909.B1BDA208DA8@bastion.fedora.phx.redhat.com>

Package libgnomedb in Fedora devel is now owned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:59:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:59:17 +0000
Subject: [pkgdb] libgnomedb ownership updated
Message-ID: <20080908145917.AA128208DB9@bastion.fedora.phx.redhat.com>

Package libgnomedb in Fedora 9 is now owned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:59:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:59:15 +0000
Subject: [pkgdb] libgnomedb ownership updated
Message-ID: <20080908145915.C6448208DAB@bastion.fedora.phx.redhat.com>

Package libgnomedb in Fedora 8 is now owned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:59:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:59:21 +0000
Subject: [pkgdb] rvm ownership updated
Message-ID: <20080908145921.627852D0023@bastion.fedora.phx.redhat.com>

Package rvm in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 14:59:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:59:21 +0000
Subject: [pkgdb] libgnomedb ownership updated
Message-ID: <20080908145921.CCF842D0024@bastion.fedora.phx.redhat.com>

Package libgnomedb in Fedora EPEL 5 is now owned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Mon Sep  8 14:59:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:59:21 +0000
Subject: [pkgdb] rvm ownership updated
Message-ID: <20080908145921.C33F62D0027@bastion.fedora.phx.redhat.com>

Package rvm in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 14:59:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 14:59:27 +0000
Subject: [pkgdb] rvm ownership updated
Message-ID: <20080908145927.C67222D002C@bastion.fedora.phx.redhat.com>

Package rvm in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 15:06:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:06:35 +0000
Subject: [pkgdb] tinyxml ownership updated
Message-ID: <20080908150635.37ECB208771@bastion.fedora.phx.redhat.com>

Package tinyxml in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tinyxml



From pkgdb at fedoraproject.org  Mon Sep  8 15:06:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:06:38 +0000
Subject: [pkgdb] tinyxml ownership updated
Message-ID: <20080908150638.47EA6208D0F@bastion.fedora.phx.redhat.com>

Package tinyxml in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tinyxml



From pkgdb at fedoraproject.org  Mon Sep  8 15:08:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:08:31 +0000
Subject: [pkgdb] tinyxml ownership updated
Message-ID: <20080908150831.AA68B20876F@bastion.fedora.phx.redhat.com>

Package tinyxml in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tinyxml



From pkgdb at fedoraproject.org  Mon Sep  8 15:08:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:08:34 +0000
Subject: [pkgdb] tinyxml ownership updated
Message-ID: <20080908150834.30CDF208771@bastion.fedora.phx.redhat.com>

Package tinyxml in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tinyxml



From pkgdb at fedoraproject.org  Mon Sep  8 15:08:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:08:46 +0000
Subject: [pkgdb] lwp ownership updated
Message-ID: <20080908150846.D75A7208D07@bastion.fedora.phx.redhat.com>

Package lwp in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 15:08:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:08:49 +0000
Subject: [pkgdb] lwp ownership updated
Message-ID: <20080908150849.C8C77208D7C@bastion.fedora.phx.redhat.com>

Package lwp in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 15:08:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:08:51 +0000
Subject: [pkgdb] lwp ownership updated
Message-ID: <20080908150851.4C6E4208D9A@bastion.fedora.phx.redhat.com>

Package lwp in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 15:09:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:09:39 +0000
Subject: [pkgdb] mediatomb (Fedora EPEL, 5) updated by kevin
Message-ID: <20080908150939.62B2C208D7C@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mediatomb
kevin has set commit to Approved for uberpackager on mediatomb (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on mediatomb (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on mediatomb (Fedora EPEL 5)
kevin changed owner of mediatomb in Fedora EPEL 5 to iburrell
kevin approved watchbugzilla on mediatomb (Fedora EPEL 5) for mwiriadi
kevin approved watchcommits on mediatomb (Fedora EPEL 5) for mwiriadi

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediatomb



From pkgdb at fedoraproject.org  Mon Sep  8 15:09:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:09:43 +0000
Subject: [pkgdb] anaconda (Fedora, 9) updated by katzj
Message-ID: <20080908150945.CD336208D1E@bastion.fedora.phx.redhat.com>

katzj approved watchbugzilla on anaconda (Fedora 9) for clumens
katzj approved watchcommits on anaconda (Fedora 9) for clumens
katzj approved commit on anaconda (Fedora 9) for clumens
katzj approved build on anaconda (Fedora 9) for clumens
katzj approved approveacls on anaconda (Fedora 9) for clumens

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Mon Sep  8 15:09:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:09:43 +0000
Subject: [pkgdb] anaconda (Fedora, devel) updated by katzj
Message-ID: <20080908150948.05B57208D99@bastion.fedora.phx.redhat.com>

katzj approved watchbugzilla on anaconda (Fedora devel) for clumens
katzj approved watchcommits on anaconda (Fedora devel) for clumens
katzj approved commit on anaconda (Fedora devel) for clumens
katzj approved build on anaconda (Fedora devel) for clumens
katzj approved approveacls on anaconda (Fedora devel) for clumens

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Mon Sep  8 15:09:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:09:43 +0000
Subject: [pkgdb] anaconda (Fedora, 8) updated by katzj
Message-ID: <20080908150948.A3342208D9E@bastion.fedora.phx.redhat.com>

katzj approved watchbugzilla on anaconda (Fedora 8) for clumens
katzj approved watchcommits on anaconda (Fedora 8) for clumens
katzj approved commit on anaconda (Fedora 8) for clumens
katzj approved build on anaconda (Fedora 8) for clumens
katzj approved approveacls on anaconda (Fedora 8) for clumens

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Mon Sep  8 15:10:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:10:09 +0000
Subject: [pkgdb] libao ownership updated
Message-ID: <20080908151010.0E3F5208D07@bastion.fedora.phx.redhat.com>

Package libao in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libao



From pkgdb at fedoraproject.org  Mon Sep  8 15:10:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:10:18 +0000
Subject: [pkgdb] libao ownership updated
Message-ID: <20080908151018.C9CD8208D9A@bastion.fedora.phx.redhat.com>

Package libao in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libao



From pkgdb at fedoraproject.org  Mon Sep  8 15:10:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:10:25 +0000
Subject: [pkgdb] libao ownership updated
Message-ID: <20080908151025.5D4F7208DBA@bastion.fedora.phx.redhat.com>

Package libao in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libao



From pkgdb at fedoraproject.org  Mon Sep  8 15:10:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:10:36 +0000
Subject: [pkgdb] libao ownership updated
Message-ID: <20080908151037.4B2282D002D@bastion.fedora.phx.redhat.com>

Package libao in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libao



From pkgdb at fedoraproject.org  Mon Sep  8 15:10:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:10:42 +0000
Subject: [pkgdb] libogg ownership updated
Message-ID: <20080908151042.E7E872D003F@bastion.fedora.phx.redhat.com>

Package libogg in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libogg



From pkgdb at fedoraproject.org  Mon Sep  8 15:10:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:10:54 +0000
Subject: [pkgdb] libogg ownership updated
Message-ID: <20080908151054.4D110208D97@bastion.fedora.phx.redhat.com>

Package libogg in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libogg



From pkgdb at fedoraproject.org  Mon Sep  8 15:10:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:10:55 +0000
Subject: [pkgdb] libogg ownership updated
Message-ID: <20080908151055.E275F2D0062@bastion.fedora.phx.redhat.com>

Package libogg in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libogg



From pkgdb at fedoraproject.org  Mon Sep  8 15:11:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:11:01 +0000
Subject: [pkgdb] libogg ownership updated
Message-ID: <20080908151101.B01EF2D0070@bastion.fedora.phx.redhat.com>

Package libogg in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libogg



From pkgdb at fedoraproject.org  Mon Sep  8 15:12:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:12:50 +0000
Subject: [pkgdb] arj ownership updated
Message-ID: <20080908151251.87A07208D9F@bastion.fedora.phx.redhat.com>

Package arj in Fedora devel is now owned by robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:13:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:13:03 +0000
Subject: [pkgdb] arj ownership updated
Message-ID: <20080908151303.BD9AE208DA8@bastion.fedora.phx.redhat.com>

Package arj in Fedora 9 is now owned by robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:13:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:13:07 +0000
Subject: [pkgdb] arj ownership updated
Message-ID: <20080908151307.0BFDE208DA7@bastion.fedora.phx.redhat.com>

Package arj in Fedora 8 is now owned by robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:14:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:14:23 +0000
Subject: [pkgdb] netbeans-platform8 was added for victorv
Message-ID: <20080908151424.D11BB208DAD@bastion.fedora.phx.redhat.com>

kevin has added Package netbeans-platform8 with summary NetBeans 6.1 Platform 8
kevin has approved Package netbeans-platform8
kevin has added a Fedora devel branch for netbeans-platform8 with an owner of victorv
kevin has approved netbeans-platform8 in Fedora devel
kevin has approved Package netbeans-platform8
kevin has set commit to Approved for packager on netbeans-platform8 (Fedora devel)
kevin has set build to Approved for packager on netbeans-platform8 (Fedora devel)
kevin has set checkout to Approved for packager on netbeans-platform8 (Fedora devel)
kevin has set commit to Approved for uberpackager on netbeans-platform8 (Fedora devel)
kevin has set build to Approved for uberpackager on netbeans-platform8 (Fedora devel)
kevin has set checkout to Approved for uberpackager on netbeans-platform8 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netbeans-platform8



From kevin at fedoraproject.org  Mon Sep  8 15:14:38 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:14:38 +0000 (UTC)
Subject: rpms/netbeans-platform8 - New directory
Message-ID: <20080908151438.4117970128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/netbeans-platform8
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN16169/rpms/netbeans-platform8

Log Message:
Directory /cvs/extras/rpms/netbeans-platform8 added to the repository




From kevin at fedoraproject.org  Mon Sep  8 15:14:38 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:14:38 +0000 (UTC)
Subject: rpms/netbeans-platform8/devel - New directory
Message-ID: <20080908151438.7FCA770128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/netbeans-platform8/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN16169/rpms/netbeans-platform8/devel

Log Message:
Directory /cvs/extras/rpms/netbeans-platform8/devel added to the repository




From kevin at fedoraproject.org  Mon Sep  8 15:14:39 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:14:39 +0000 (UTC)
Subject: rpms/netbeans-platform8 Makefile,NONE,1.1
Message-ID: <20080908151439.A650170128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/netbeans-platform8
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN16169/rpms/netbeans-platform8

Added Files:
	Makefile 
Log Message:
Setup of module netbeans-platform8


--- NEW FILE Makefile ---
# Top level Makefile for module netbeans-platform8
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  8 15:14:40 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:14:40 +0000 (UTC)
Subject: rpms/netbeans-platform8/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20080908151440.0E69F70128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/netbeans-platform8/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN16169/rpms/netbeans-platform8/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module netbeans-platform8


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: netbeans-platform8
# $Id: Makefile,v 1.1 2008/09/08 15:14:39 kevin Exp $
NAME := netbeans-platform8
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  8 15:15:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:15:40 +0000
Subject: [pkgdb] arj: lyosnorezel has requested watchbugzilla
Message-ID: <20080908151540.F07162D002C@bastion.fedora.phx.redhat.com>

lyosnorezel has requested the watchbugzilla acl on arj (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:15:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:15:41 +0000
Subject: [pkgdb] arj: lyosnorezel has requested watchcommits
Message-ID: <20080908151541.F3CF32D002F@bastion.fedora.phx.redhat.com>

lyosnorezel has requested the watchcommits acl on arj (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:15:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:15:45 +0000
Subject: [pkgdb] arj: lyosnorezel has requested approveacls
Message-ID: <20080908151545.5DE5C2D0033@bastion.fedora.phx.redhat.com>

lyosnorezel has requested the approveacls acl on arj (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:15:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:15:45 +0000
Subject: [pkgdb] arj: lyosnorezel has requested commit
Message-ID: <20080908151545.DE9052D0036@bastion.fedora.phx.redhat.com>

lyosnorezel has requested the commit acl on arj (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:15:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:15:47 +0000
Subject: [pkgdb] arj had acl change status
Message-ID: <20080908151547.6B30E2D0038@bastion.fedora.phx.redhat.com>

robert has set the watchbugzilla acl on arj (Fedora devel) to Obsolete for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:15:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:15:53 +0000
Subject: [pkgdb] arj had acl change status
Message-ID: <20080908151553.ED333208DBC@bastion.fedora.phx.redhat.com>

robert has set the watchcommits acl on arj (Fedora devel) to Obsolete for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:15:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:15:56 +0000
Subject: [pkgdb] arj had acl change status
Message-ID: <20080908151557.008902D003E@bastion.fedora.phx.redhat.com>

robert has set the commit acl on arj (Fedora devel) to Obsolete for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:16:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:16:00 +0000
Subject: [pkgdb] arj had acl change status
Message-ID: <20080908151601.1A1032D003F@bastion.fedora.phx.redhat.com>

robert has set the approveacls acl on arj (Fedora devel) to Obsolete for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:16:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:16:05 +0000
Subject: [pkgdb] arj: robert has requested commit
Message-ID: <20080908151605.518E82D0043@bastion.fedora.phx.redhat.com>

robert has requested the commit acl on arj (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:16:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:16:03 +0000
Subject: [pkgdb] arj: robert has requested approveacls
Message-ID: <20080908151603.883472D0041@bastion.fedora.phx.redhat.com>

robert has requested the approveacls acl on arj (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:16:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:16:09 +0000
Subject: [pkgdb] arj had acl change status
Message-ID: <20080908151610.0ED222D0045@bastion.fedora.phx.redhat.com>

robert has set the commit acl on arj (Fedora devel) to Obsolete for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:16:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:16:13 +0000
Subject: [pkgdb] arj had acl change status
Message-ID: <20080908151613.6F1082D0047@bastion.fedora.phx.redhat.com>

robert has set the approveacls acl on arj (Fedora devel) to Obsolete for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:16:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:16:17 +0000
Subject: [pkgdb] perl-RPC-XML (Fedora, 8) updated by kevin
Message-ID: <20080908151617.482BF2D004D@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for perl-RPC-XML
kevin has set commit to Approved for uberpackager on perl-RPC-XML (Fedora 8)
kevin has set build to Approved for uberpackager on perl-RPC-XML (Fedora 8)
kevin has set checkout to Approved for uberpackager on perl-RPC-XML (Fedora 8)
kevin approved watchbugzilla on perl-RPC-XML (Fedora 8) for perl-sig
kevin approved watchcommits on perl-RPC-XML (Fedora 8) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-RPC-XML



From pkgdb at fedoraproject.org  Mon Sep  8 15:16:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:16:15 +0000
Subject: [pkgdb] perl-RPC-XML was added for cweyl
Message-ID: <20080908151615.70DF12D0049@bastion.fedora.phx.redhat.com>

kevin has added Package perl-RPC-XML with summary Set of classes for core data, message and XML handling
kevin has approved Package perl-RPC-XML
kevin has added a Fedora devel branch for perl-RPC-XML with an owner of cweyl
kevin has approved perl-RPC-XML in Fedora devel
kevin has approved Package perl-RPC-XML
kevin has set commit to Approved for packager on perl-RPC-XML (Fedora devel)
kevin has set build to Approved for packager on perl-RPC-XML (Fedora devel)
kevin has set checkout to Approved for packager on perl-RPC-XML (Fedora devel)
kevin has set commit to Approved for uberpackager on perl-RPC-XML (Fedora devel)
kevin has set build to Approved for uberpackager on perl-RPC-XML (Fedora devel)
kevin has set checkout to Approved for uberpackager on perl-RPC-XML (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-RPC-XML



From pkgdb at fedoraproject.org  Mon Sep  8 15:16:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:16:17 +0000
Subject: [pkgdb] perl-RPC-XML (Fedora, 9) updated by kevin
Message-ID: <20080908151617.5B4C02D004F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-RPC-XML
kevin has set commit to Approved for uberpackager on perl-RPC-XML (Fedora 9)
kevin has set build to Approved for uberpackager on perl-RPC-XML (Fedora 9)
kevin has set checkout to Approved for uberpackager on perl-RPC-XML (Fedora 9)
kevin approved watchbugzilla on perl-RPC-XML (Fedora 9) for perl-sig
kevin approved watchcommits on perl-RPC-XML (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-RPC-XML



From pkgdb at fedoraproject.org  Mon Sep  8 15:16:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:16:17 +0000
Subject: [pkgdb] perl-RPC-XML (Fedora, devel) updated by kevin
Message-ID: <20080908151617.649132D0052@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-RPC-XML (Fedora devel) for perl-sig
kevin approved watchcommits on perl-RPC-XML (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-RPC-XML



From pkgdb at fedoraproject.org  Mon Sep  8 15:16:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:16:19 +0000
Subject: [pkgdb] arj had acl change status
Message-ID: <20080908151619.38EA42D0056@bastion.fedora.phx.redhat.com>

robert has set the watchcommits acl on arj (Fedora devel) to Obsolete for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:16:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:16:22 +0000
Subject: [pkgdb] arj: robert has requested watchcommits
Message-ID: <20080908151622.77F792D0058@bastion.fedora.phx.redhat.com>

robert has requested the watchcommits acl on arj (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:16:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:16:27 +0000
Subject: [pkgdb] arj: robert has requested watchbugzilla
Message-ID: <20080908151627.CB3132D005D@bastion.fedora.phx.redhat.com>

robert has requested the watchbugzilla acl on arj (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From kevin at fedoraproject.org  Mon Sep  8 15:16:29 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:16:29 +0000 (UTC)
Subject: rpms/perl-RPC-XML - New directory
Message-ID: <20080908151629.25F2E70128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-RPC-XML
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr16906/rpms/perl-RPC-XML

Log Message:
Directory /cvs/extras/rpms/perl-RPC-XML added to the repository




From kevin at fedoraproject.org  Mon Sep  8 15:16:30 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:16:30 +0000 (UTC)
Subject: rpms/perl-RPC-XML Makefile,NONE,1.1
Message-ID: <20080908151630.7A1FC70128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-RPC-XML
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr16906/rpms/perl-RPC-XML

Added Files:
	Makefile 
Log Message:
Setup of module perl-RPC-XML


--- NEW FILE Makefile ---
# Top level Makefile for module perl-RPC-XML
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  8 15:16:29 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:16:29 +0000 (UTC)
Subject: rpms/perl-RPC-XML/devel - New directory
Message-ID: <20080908151629.67CC770128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-RPC-XML/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr16906/rpms/perl-RPC-XML/devel

Log Message:
Directory /cvs/extras/rpms/perl-RPC-XML/devel added to the repository




From kevin at fedoraproject.org  Mon Sep  8 15:16:30 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:16:30 +0000 (UTC)
Subject: rpms/perl-RPC-XML/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080908151630.C54D070128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-RPC-XML/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr16906/rpms/perl-RPC-XML/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-RPC-XML


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-RPC-XML
# $Id: Makefile,v 1.1 2008/09/08 15:16:30 kevin Exp $
NAME := perl-RPC-XML
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  8 15:16:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:16:30 +0000
Subject: [pkgdb] arj had acl change status
Message-ID: <20080908151630.BCACE2D0066@bastion.fedora.phx.redhat.com>

robert has set the watchbugzilla acl on arj (Fedora devel) to Obsolete for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:17:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:17:19 +0000
Subject: [pkgdb] uriparser was added for rakesh
Message-ID: <20080908151719.DC0DD208D99@bastion.fedora.phx.redhat.com>

kevin has added Package uriparser with summary URI parsing library - RFC 3986
kevin has approved Package uriparser
kevin has added a Fedora devel branch for uriparser with an owner of rakesh
kevin has approved uriparser in Fedora devel
kevin has approved Package uriparser
kevin has set commit to Approved for packager on uriparser (Fedora devel)
kevin has set build to Approved for packager on uriparser (Fedora devel)
kevin has set checkout to Approved for packager on uriparser (Fedora devel)
kevin has set commit to Approved for uberpackager on uriparser (Fedora devel)
kevin has set build to Approved for uberpackager on uriparser (Fedora devel)
kevin has set checkout to Approved for uberpackager on uriparser (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/uriparser



From pkgdb at fedoraproject.org  Mon Sep  8 15:17:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:17:21 +0000
Subject: [pkgdb] uriparser (Fedora, 8) updated by kevin
Message-ID: <20080908151721.E1E0D208D9A@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for uriparser
kevin has set commit to Approved for uberpackager on uriparser (Fedora 8)
kevin has set build to Approved for uberpackager on uriparser (Fedora 8)
kevin has set checkout to Approved for uberpackager on uriparser (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/uriparser



From pkgdb at fedoraproject.org  Mon Sep  8 15:17:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:17:21 +0000
Subject: [pkgdb] uriparser (Fedora, 9) updated by kevin
Message-ID: <20080908151721.F0909208D9E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for uriparser
kevin has set commit to Approved for uberpackager on uriparser (Fedora 9)
kevin has set build to Approved for uberpackager on uriparser (Fedora 9)
kevin has set checkout to Approved for uberpackager on uriparser (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/uriparser



From s4504kr at fedoraproject.org  Mon Sep  8 15:17:33 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon,  8 Sep 2008 15:17:33 +0000 (UTC)
Subject: rpms/blender/F-8 blender.spec,1.78,1.79 sources,1.14,1.15
Message-ID: <20080908151733.B8DDA7012A@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17225

Modified Files:
	blender.spec sources 
Log Message:
New upstream release


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/F-8/blender.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- blender.spec	20 May 2008 14:14:27 -0000	1.78
+++ blender.spec	8 Sep 2008 15:17:03 -0000	1.79
@@ -1,10 +1,9 @@
-
 %define blenderlib %{_datadir}/blender
 %define plugins %{_libdir}/blender/plugins
 
 Name:           blender
-Version:        2.46
-Release: 	1%{?dist}.1
+Version:        2.47
+Release: 	1%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -13,10 +12,11 @@
 URL:            http://www.blender.org
 # During a Legel issue (#239476) the package contains a cusromized
 # source package created as fellow.
-# wget http://download.blender.org/source/blender-%{version}.tar.gz
-# tar -zxv blender-%{version}.tar.gz
-# rm -rf blender-%{version}/extern/ffmpeg
-# tar -zcf blender-%{version}-noffmpeg.tar.gz blender-%{version}/
+# wget http://download.blender.org/sorce/blender-2.47.tar.gz
+# cd blender-2-47/extern
+# rm -rf ffmpeg libmp3lame
+# cd ../..
+# tar -zcf blender-2.47-noffmpeg.tar.gz blender-2-47/
 Source0:	blender-%{version}-noffmpeg.tar.gz
 Source1:        http://bane.servebeer.com/programming/blender/import-3ds-0.7.py
 Source2:        http://bane.servebeer.com/programming/blender/export-3ds-0.71.py
@@ -179,17 +179,23 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
-* Tue May 20 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.46-1.1
-- Add forgotten file
+* Thu Aug 14 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.47-1
+- New upstream release
+
+* Tue Aug 12 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.47-0.2
+- New upstream release (blender-2.47rc)
 
 * Mon May 19 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.46-1
 - New upstream release
 
-* Wed May  7 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.45-14
-- Fix CVE-2008-1103 (#444535)
+* Wed May  7 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.46-0.3.1
+- Some fixes for CVE-2008-1003
+
+* Tue May  6 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.46-0.3
+- Release Canditate for 2.46
 
 * Sun Apr 27 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.45-13
-- More generic patch to solve scons issue
+- More generic patch for scons issue
 
 * Thu Apr 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.45-12
 - Fix odd scons compatibility issue


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/F-8/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	19 May 2008 18:17:52 -0000	1.14
+++ sources	8 Sep 2008 15:17:03 -0000	1.15
@@ -1 +1 @@
-9ec37f0c4ea1d17c619963036bf846e8  blender-2.46-noffmpeg.tar.gz
+d4b24d8fed319096802c817a496f60e3  blender-2.47-noffmpeg.tar.gz



From kevin at fedoraproject.org  Mon Sep  8 15:17:43 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:17:43 +0000 (UTC)
Subject: rpms/uriparser - New directory
Message-ID: <20080908151743.296EA7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/uriparser
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz17565/rpms/uriparser

Log Message:
Directory /cvs/extras/rpms/uriparser added to the repository




From kevin at fedoraproject.org  Mon Sep  8 15:17:43 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:17:43 +0000 (UTC)
Subject: rpms/uriparser/devel - New directory
Message-ID: <20080908151743.6EF6E7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/uriparser/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz17565/rpms/uriparser/devel

Log Message:
Directory /cvs/extras/rpms/uriparser/devel added to the repository




From kevin at fedoraproject.org  Mon Sep  8 15:17:44 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:17:44 +0000 (UTC)
Subject: rpms/uriparser Makefile,NONE,1.1
Message-ID: <20080908151744.913B77012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/uriparser
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz17565/rpms/uriparser

Added Files:
	Makefile 
Log Message:
Setup of module uriparser


--- NEW FILE Makefile ---
# Top level Makefile for module uriparser
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  8 15:17:45 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:17:45 +0000 (UTC)
Subject: rpms/uriparser/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080908151745.21F437012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/uriparser/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz17565/rpms/uriparser/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module uriparser


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: uriparser
# $Id: Makefile,v 1.1 2008/09/08 15:17:44 kevin Exp $
NAME := uriparser
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  8 15:18:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:18:06 +0000
Subject: [pkgdb] arj had acl change status
Message-ID: <20080908151806.ECAEB208DA4@bastion.fedora.phx.redhat.com>

robert has set the watchcommits acl on arj (Fedora devel) to Obsolete for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:18:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:18:10 +0000
Subject: [pkgdb] hunspell-is was added for caolanm
Message-ID: <20080908151810.25CE3208DA7@bastion.fedora.phx.redhat.com>

kevin has added Package hunspell-is with summary Icelandic dictionaries for hunspell
kevin has approved Package hunspell-is
kevin has added a Fedora devel branch for hunspell-is with an owner of caolanm
kevin has approved hunspell-is in Fedora devel
kevin has approved Package hunspell-is
kevin has set commit to Approved for packager on hunspell-is (Fedora devel)
kevin has set build to Approved for packager on hunspell-is (Fedora devel)
kevin has set checkout to Approved for packager on hunspell-is (Fedora devel)
kevin has set commit to Approved for uberpackager on hunspell-is (Fedora devel)
kevin has set build to Approved for uberpackager on hunspell-is (Fedora devel)
kevin has set checkout to Approved for uberpackager on hunspell-is (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-is



From kevin at fedoraproject.org  Mon Sep  8 15:18:21 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:18:21 +0000 (UTC)
Subject: rpms/hunspell-is - New directory
Message-ID: <20080908151821.291D77012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-is
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf18066/rpms/hunspell-is

Log Message:
Directory /cvs/extras/rpms/hunspell-is added to the repository




From kevin at fedoraproject.org  Mon Sep  8 15:18:21 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:18:21 +0000 (UTC)
Subject: rpms/hunspell-is/devel - New directory
Message-ID: <20080908151821.68DA47012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-is/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf18066/rpms/hunspell-is/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-is/devel added to the repository




From kevin at fedoraproject.org  Mon Sep  8 15:18:23 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:18:23 +0000 (UTC)
Subject: rpms/hunspell-is/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080908151823.083DC7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-is/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf18066/rpms/hunspell-is/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-is


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-is
# $Id: Makefile,v 1.1 2008/09/08 15:18:22 kevin Exp $
NAME := hunspell-is
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Sep  8 15:18:22 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:18:22 +0000 (UTC)
Subject: rpms/hunspell-is Makefile,NONE,1.1
Message-ID: <20080908151822.7DEEE7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-is
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf18066/rpms/hunspell-is

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-is


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-is
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From allisson at fedoraproject.org  Mon Sep  8 15:18:26 2008
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Mon,  8 Sep 2008 15:18:26 +0000 (UTC)
Subject: rpms/keyjnote/devel keyjnote.spec,1.8,1.9
Message-ID: <20080908151826.A28627012B@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/keyjnote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17876

Modified Files:
	keyjnote.spec 
Log Message:
Rebuild for F-10


Index: keyjnote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/keyjnote/devel/keyjnote.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- keyjnote.spec	23 Feb 2008 01:41:02 -0000	1.8
+++ keyjnote.spec	8 Sep 2008 15:17:56 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           keyjnote
 Version:        0.10.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A program that displays presentation slides
 
 Group:          Applications/Productivity
@@ -39,6 +39,9 @@
 
 %changelog
 
+* Sat Sep  6 2008 Allisson Azevedo <allisson at gmail.com> 0.10.2-2
+- Rebuild for F-10
+
 * Thu Feb 21 2008 Allisson Azevedo <allisson at gmail.com> 0.10.2-1
 - Update to 0.10.2
 



From pkgdb at fedoraproject.org  Mon Sep  8 15:18:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:18:51 +0000
Subject: [pkgdb] libassetml ownership updated
Message-ID: <20080908151851.BFD41208DB4@bastion.fedora.phx.redhat.com>

Package libassetml in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libassetml



From pkgdb at fedoraproject.org  Mon Sep  8 15:18:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:18:55 +0000
Subject: [pkgdb] libassetml ownership updated
Message-ID: <20080908151856.08AFF208DB5@bastion.fedora.phx.redhat.com>

Package libassetml in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libassetml



From pkgdb at fedoraproject.org  Mon Sep  8 15:19:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:19:27 +0000
Subject: [pkgdb] bin2iso ownership updated
Message-ID: <20080908151927.252A42E0008@bastion.fedora.phx.redhat.com>

Package bin2iso in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bin2iso



From pkgdb at fedoraproject.org  Mon Sep  8 15:19:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:19:31 +0000
Subject: [pkgdb] bin2iso ownership updated
Message-ID: <20080908151931.95D8C2E000E@bastion.fedora.phx.redhat.com>

Package bin2iso in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bin2iso



From pkgdb at fedoraproject.org  Mon Sep  8 15:19:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:19:32 +0000
Subject: [pkgdb] bin2iso ownership updated
Message-ID: <20080908151932.CFF372E0012@bastion.fedora.phx.redhat.com>

Package bin2iso in Fedora 1 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bin2iso



From pkgdb at fedoraproject.org  Mon Sep  8 15:19:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:19:40 +0000
Subject: [pkgdb] bin2iso ownership updated
Message-ID: <20080908151940.26DEA2E0018@bastion.fedora.phx.redhat.com>

Package bin2iso in Fedora 2 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bin2iso



From pkgdb at fedoraproject.org  Mon Sep  8 15:19:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:19:38 +0000
Subject: [pkgdb] bin2iso ownership updated
Message-ID: <20080908151938.649082E0015@bastion.fedora.phx.redhat.com>

Package bin2iso in Fedora 3 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bin2iso



From pkgdb at fedoraproject.org  Mon Sep  8 15:19:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:19:44 +0000
Subject: [pkgdb] bin2iso ownership updated
Message-ID: <20080908151944.3B8402E001A@bastion.fedora.phx.redhat.com>

Package bin2iso in Fedora 4 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bin2iso



From pkgdb at fedoraproject.org  Mon Sep  8 15:19:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:19:50 +0000
Subject: [pkgdb] bin2iso ownership updated
Message-ID: <20080908151950.1E26F2E001F@bastion.fedora.phx.redhat.com>

Package bin2iso in Red Hat Linux 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bin2iso



From pkgdb at fedoraproject.org  Mon Sep  8 15:19:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:19:44 +0000
Subject: [pkgdb] bin2iso ownership updated
Message-ID: <20080908151944.71BA22E001C@bastion.fedora.phx.redhat.com>

Package bin2iso in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bin2iso



From pkgdb at fedoraproject.org  Mon Sep  8 15:19:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:19:52 +0000
Subject: [pkgdb] bin2iso ownership updated
Message-ID: <20080908151952.922B52E0022@bastion.fedora.phx.redhat.com>

Package bin2iso in Red Hat Linux 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bin2iso



From pkgdb at fedoraproject.org  Mon Sep  8 15:19:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:19:51 +0000
Subject: [pkgdb] bin2iso ownership updated
Message-ID: <20080908151951.53E822E0020@bastion.fedora.phx.redhat.com>

Package bin2iso in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bin2iso



From pkgdb at fedoraproject.org  Mon Sep  8 15:19:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:19:55 +0000
Subject: [pkgdb] bin2iso ownership updated
Message-ID: <20080908151956.1E10A2E0025@bastion.fedora.phx.redhat.com>

Package bin2iso in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bin2iso



From pkgdb at fedoraproject.org  Mon Sep  8 15:20:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:20:15 +0000
Subject: [pkgdb] perl-namespace-clean was added for cweyl
Message-ID: <20080908152015.94B47208DC4@bastion.fedora.phx.redhat.com>

kevin has added Package perl-namespace-clean with summary Keep your namespace tidy
kevin has approved Package perl-namespace-clean
kevin has added a Fedora devel branch for perl-namespace-clean with an owner of cweyl
kevin has approved perl-namespace-clean in Fedora devel
kevin has approved Package perl-namespace-clean
kevin has set commit to Approved for packager on perl-namespace-clean (Fedora devel)
kevin has set build to Approved for packager on perl-namespace-clean (Fedora devel)
kevin has set checkout to Approved for packager on perl-namespace-clean (Fedora devel)
kevin has set commit to Approved for uberpackager on perl-namespace-clean (Fedora devel)
kevin has set build to Approved for uberpackager on perl-namespace-clean (Fedora devel)
kevin has set checkout to Approved for uberpackager on perl-namespace-clean (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-namespace-clean



From pkgdb at fedoraproject.org  Mon Sep  8 15:20:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:20:18 +0000
Subject: [pkgdb] perl-namespace-clean (Fedora, 8) updated by kevin
Message-ID: <20080908152018.149972E002A@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for perl-namespace-clean
kevin has set commit to Approved for uberpackager on perl-namespace-clean (Fedora 8)
kevin has set build to Approved for uberpackager on perl-namespace-clean (Fedora 8)
kevin has set checkout to Approved for uberpackager on perl-namespace-clean (Fedora 8)
kevin approved watchbugzilla on perl-namespace-clean (Fedora 8) for perl-sig
kevin approved watchcommits on perl-namespace-clean (Fedora 8) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-namespace-clean



From pkgdb at fedoraproject.org  Mon Sep  8 15:20:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:20:18 +0000
Subject: [pkgdb] perl-namespace-clean (Fedora, devel) updated by kevin
Message-ID: <20080908152018.1F30A2E002D@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-namespace-clean (Fedora devel) for perl-sig
kevin approved watchcommits on perl-namespace-clean (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-namespace-clean



From pkgdb at fedoraproject.org  Mon Sep  8 15:20:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:20:18 +0000
Subject: [pkgdb] perl-namespace-clean (Fedora, 9) updated by kevin
Message-ID: <20080908152018.27D3D2E0030@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-namespace-clean
kevin has set commit to Approved for uberpackager on perl-namespace-clean (Fedora 9)
kevin has set build to Approved for uberpackager on perl-namespace-clean (Fedora 9)
kevin has set checkout to Approved for uberpackager on perl-namespace-clean (Fedora 9)
kevin approved watchbugzilla on perl-namespace-clean (Fedora 9) for perl-sig
kevin approved watchcommits on perl-namespace-clean (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-namespace-clean



From kevin at fedoraproject.org  Mon Sep  8 15:20:34 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:20:34 +0000 (UTC)
Subject: rpms/perl-namespace-clean - New directory
Message-ID: <20080908152034.29CD770128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-namespace-clean
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF19383/rpms/perl-namespace-clean

Log Message:
Directory /cvs/extras/rpms/perl-namespace-clean added to the repository




From kevin at fedoraproject.org  Mon Sep  8 15:20:34 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:20:34 +0000 (UTC)
Subject: rpms/perl-namespace-clean/devel - New directory
Message-ID: <20080908152034.6DBFC70128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-namespace-clean/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF19383/rpms/perl-namespace-clean/devel

Log Message:
Directory /cvs/extras/rpms/perl-namespace-clean/devel added to the repository




From kevin at fedoraproject.org  Mon Sep  8 15:20:35 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:20:35 +0000 (UTC)
Subject: rpms/perl-namespace-clean/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080908152035.F311F70128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-namespace-clean/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF19383/rpms/perl-namespace-clean/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-namespace-clean


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-namespace-clean
# $Id: Makefile,v 1.1 2008/09/08 15:20:35 kevin Exp $
NAME := perl-namespace-clean
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Sep  8 15:20:35 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:20:35 +0000 (UTC)
Subject: rpms/perl-namespace-clean Makefile,NONE,1.1
Message-ID: <20080908152035.7D58F70128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-namespace-clean
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF19383/rpms/perl-namespace-clean

Added Files:
	Makefile 
Log Message:
Setup of module perl-namespace-clean


--- NEW FILE Makefile ---
# Top level Makefile for module perl-namespace-clean
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep  8 15:20:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:20:56 +0000
Subject: [pkgdb] arj had acl change status
Message-ID: <20080908152056.C94C3208DCA@bastion.fedora.phx.redhat.com>

robert has set the watchbugzilla acl on arj (Fedora devel) to Approved for lyosnorezel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:21:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:21:01 +0000
Subject: [pkgdb] perl-Tie-ToObject was added for cweyl
Message-ID: <20080908152101.4BB59208DCF@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Tie-ToObject with summary Tie to an existing object
kevin has approved Package perl-Tie-ToObject
kevin has added a Fedora devel branch for perl-Tie-ToObject with an owner of cweyl
kevin has approved perl-Tie-ToObject in Fedora devel
kevin has approved Package perl-Tie-ToObject
kevin has set commit to Approved for packager on perl-Tie-ToObject (Fedora devel)
kevin has set build to Approved for packager on perl-Tie-ToObject (Fedora devel)
kevin has set checkout to Approved for packager on perl-Tie-ToObject (Fedora devel)
kevin has set commit to Approved for uberpackager on perl-Tie-ToObject (Fedora devel)
kevin has set build to Approved for uberpackager on perl-Tie-ToObject (Fedora devel)
kevin has set checkout to Approved for uberpackager on perl-Tie-ToObject (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Tie-ToObject



From pkgdb at fedoraproject.org  Mon Sep  8 15:21:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:21:02 +0000
Subject: [pkgdb] perl-Tie-ToObject (Fedora, 8) updated by kevin
Message-ID: <20080908152102.DCBBD208DD7@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for perl-Tie-ToObject
kevin has set commit to Approved for uberpackager on perl-Tie-ToObject (Fedora 8)
kevin has set build to Approved for uberpackager on perl-Tie-ToObject (Fedora 8)
kevin has set checkout to Approved for uberpackager on perl-Tie-ToObject (Fedora 8)
kevin approved watchbugzilla on perl-Tie-ToObject (Fedora 8) for perl-sig
kevin approved watchcommits on perl-Tie-ToObject (Fedora 8) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Tie-ToObject



From pkgdb at fedoraproject.org  Mon Sep  8 15:21:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:21:02 +0000
Subject: [pkgdb] perl-Tie-ToObject (Fedora, 9) updated by kevin
Message-ID: <20080908152103.26377208DD9@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Tie-ToObject
kevin has set commit to Approved for uberpackager on perl-Tie-ToObject (Fedora 9)
kevin has set build to Approved for uberpackager on perl-Tie-ToObject (Fedora 9)
kevin has set checkout to Approved for uberpackager on perl-Tie-ToObject (Fedora 9)
kevin approved watchbugzilla on perl-Tie-ToObject (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Tie-ToObject (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Tie-ToObject



From pkgdb at fedoraproject.org  Mon Sep  8 15:21:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:21:02 +0000
Subject: [pkgdb] perl-Tie-ToObject (Fedora, devel) updated by kevin
Message-ID: <20080908152103.32454208DDE@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Tie-ToObject (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Tie-ToObject (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Tie-ToObject



From pkgdb at fedoraproject.org  Mon Sep  8 15:21:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:21:05 +0000
Subject: [pkgdb] arj had acl change status
Message-ID: <20080908152105.650A3208DD6@bastion.fedora.phx.redhat.com>

robert has set the watchcommits acl on arj (Fedora devel) to Approved for lyosnorezel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:21:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:21:08 +0000
Subject: [pkgdb] arj had acl change status
Message-ID: <20080908152108.CF8C82D0021@bastion.fedora.phx.redhat.com>

robert has set the commit acl on arj (Fedora devel) to Approved for lyosnorezel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From kevin at fedoraproject.org  Mon Sep  8 15:21:21 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:21:21 +0000 (UTC)
Subject: rpms/perl-Tie-ToObject - New directory
Message-ID: <20080908152121.26BAD70128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Tie-ToObject
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ19808/rpms/perl-Tie-ToObject

Log Message:
Directory /cvs/extras/rpms/perl-Tie-ToObject added to the repository




From pkgdb at fedoraproject.org  Mon Sep  8 15:21:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:21:11 +0000
Subject: [pkgdb] arj had acl change status
Message-ID: <20080908152111.F40E52D0023@bastion.fedora.phx.redhat.com>

robert has set the approveacls acl on arj (Fedora devel) to Approved for lyosnorezel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From kevin at fedoraproject.org  Mon Sep  8 15:21:21 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:21:21 +0000 (UTC)
Subject: rpms/perl-Tie-ToObject/devel - New directory
Message-ID: <20080908152121.61B1F70128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Tie-ToObject/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ19808/rpms/perl-Tie-ToObject/devel

Log Message:
Directory /cvs/extras/rpms/perl-Tie-ToObject/devel added to the repository




From kevin at fedoraproject.org  Mon Sep  8 15:21:22 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:21:22 +0000 (UTC)
Subject: rpms/perl-Tie-ToObject Makefile,NONE,1.1
Message-ID: <20080908152122.71F4670128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Tie-ToObject
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ19808/rpms/perl-Tie-ToObject

Added Files:
	Makefile 
Log Message:
Setup of module perl-Tie-ToObject


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Tie-ToObject
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  8 15:21:22 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:21:22 +0000 (UTC)
Subject: rpms/perl-Tie-ToObject/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20080908152122.B603B70128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Tie-ToObject/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ19808/rpms/perl-Tie-ToObject/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Tie-ToObject


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Tie-ToObject
# $Id: Makefile,v 1.1 2008/09/08 15:21:22 kevin Exp $
NAME := perl-Tie-ToObject
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  8 15:21:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:21:28 +0000
Subject: [pkgdb] arj had acl change status
Message-ID: <20080908152128.6D411208DB0@bastion.fedora.phx.redhat.com>

robert has set the watchbugzilla acl on arj (Fedora 8) to Obsolete for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:21:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:21:31 +0000
Subject: [pkgdb] arj had acl change status
Message-ID: <20080908152131.AA224208DDB@bastion.fedora.phx.redhat.com>

robert has set the watchcommits acl on arj (Fedora 8) to Obsolete for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:21:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:21:37 +0000
Subject: [pkgdb] arj: robert has requested watchbugzilla
Message-ID: <20080908152137.63F59208DB1@bastion.fedora.phx.redhat.com>

robert has requested the watchbugzilla acl on arj (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:21:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:21:40 +0000
Subject: [pkgdb] arj: robert has given up commit
Message-ID: <20080908152140.EA89F208DE0@bastion.fedora.phx.redhat.com>

robert has given up the commit acl on arj (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:21:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:21:39 +0000
Subject: [pkgdb] arj: robert has requested watchcommits
Message-ID: <20080908152139.4B47D208DB3@bastion.fedora.phx.redhat.com>

robert has requested the watchcommits acl on arj (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:21:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:21:42 +0000
Subject: [pkgdb] arj: robert has given up approveacls
Message-ID: <20080908152142.78D3F208DE4@bastion.fedora.phx.redhat.com>

robert has given up the approveacls acl on arj (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:21:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:21:50 +0000
Subject: [pkgdb] pl: bagnara has requested watchbugzilla
Message-ID: <20080908152150.70B22208DB8@bastion.fedora.phx.redhat.com>

bagnara has requested the watchbugzilla acl on pl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pl



From pkgdb at fedoraproject.org  Mon Sep  8 15:21:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:21:53 +0000
Subject: [pkgdb] pl: bagnara has requested watchcommits
Message-ID: <20080908152153.837A4208DE5@bastion.fedora.phx.redhat.com>

bagnara has requested the watchcommits acl on pl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pl



From pkgdb at fedoraproject.org  Mon Sep  8 15:21:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:21:54 +0000
Subject: [pkgdb] arj: robert has given up watchbugzilla
Message-ID: <20080908152155.196A9208DE7@bastion.fedora.phx.redhat.com>

robert has given up the watchbugzilla acl on arj (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:21:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:21:56 +0000
Subject: [pkgdb] arj: robert has given up commit
Message-ID: <20080908152156.BEC79208DE9@bastion.fedora.phx.redhat.com>

robert has given up the commit acl on arj (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:21:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:21:56 +0000
Subject: [pkgdb] arj: robert has given up watchcommits
Message-ID: <20080908152157.3D4EB208DEF@bastion.fedora.phx.redhat.com>

robert has given up the watchcommits acl on arj (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:22:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:22:02 +0000
Subject: [pkgdb] arj: robert has given up approveacls
Message-ID: <20080908152202.84656208DEA@bastion.fedora.phx.redhat.com>

robert has given up the approveacls acl on arj (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From s4504kr at fedoraproject.org  Mon Sep  8 15:22:11 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon,  8 Sep 2008 15:22:11 +0000 (UTC)
Subject: rpms/gresolver/devel gresolver-0.0.5-makefile.patch, NONE,
	1.1 gresolver.desktop, NONE, 1.1 gresolver.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080908152211.740E170128@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/gresolver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19713/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gresolver-0.0.5-makefile.patch gresolver.desktop 
	gresolver.spec import.log 
Log Message:

Initional cvs import.


gresolver-0.0.5-makefile.patch:

--- NEW FILE gresolver-0.0.5-makefile.patch ---
diff -up gresolver-0.0.5/Makefile.in.mk gresolver-0.0.5/Makefile.in
--- gresolver-0.0.5/Makefile.in.mk	2008-08-13 17:39:46.000000000 +0200
+++ gresolver-0.0.5/Makefile.in	2008-08-13 17:39:57.000000000 +0200
@@ -12,7 +12,7 @@ build:
 
 install:
 	-mkdir -p "$(prefix)/bin" "$(prefix)/share/$(name)" "$(prefix)/share/pixmaps" "$(prefix)/share/applications"
-	-mkdir -p "$(prefix)/share/locale/en/LC_MESSAGES"
+#	-mkdir -p "$(prefix)/share/locale/en/LC_MESSAGES"
 	install -m 0755 $(name) "$(prefix)/bin/"
 	install -m 0644 $(name).png "$(prefix)/share/pixmaps/"
 	install -m 0644 $(name).glade "$(prefix)/share/$(name)/"


--- NEW FILE gresolver.desktop ---
[Desktop Entry]
Version=1.0
Type=Application
Exec=gresolver
Terminal=false
StartupNotify=true
Name=DNS Query Tool
Name[en_GB]=DNS Query Tool
Comment=Perform advanced DNS queries
Comment[en_GB]=Perform advanced DNS queries
Icon=gresolver
Categories=Network;


--- NEW FILE gresolver.spec ---
Summary:	Graphical DNS query tool
Name:		gresolver
Version:	0.0.5
Release:	3%{?dist}

Group:		Applications/System
License:	GPLv2+ or Artistic
URL:		http://jodrell.net/projects/gresolver

Source: 	http://jodrell.net/files/%{name}/%{name}-%{version}.tar.gz
Source1:	gresolver.desktop
Patch1:		gresolver-0.0.5-makefile.patch

BuildRoot: 	%{_tmppath}/root-%{name}-%{version}-%(%{__id_u} -n)

BuildArch: 	noarch
BuildRequires: 	desktop-file-utils
Requires: 	gtk2 >= 2.6.0, perl >= 5.8.0, bind-utils > 9

%description
GResolver is a graphical DNS query tool. It allows system administrators
to quickly and easily make the most common DNS queries without constructing 
lengthy 'dig' commands.

%prep
%setup -q
%patch1 -p1
./configure --prefix=%{_prefix}

%build
sed -e 's|@PREFIX@|%{_prefix}|g' <%{name}.pl >%{name}

%install
rm -rf %{buildroot}
make install prefix=%{buildroot}%{_prefix}

rm %{buildroot}%{_datadir}/applications/gresolver.desktop

desktop-file-install --vendor fedora \
  --dir %{buildroot}%{_datadir}/applications \
  %{SOURCE1}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc COPYING ChangeLog
%{_bindir}/*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/%{name}/

%changelog
* Thu Aug 14 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.0.5-3
- Fix %%file section

* Wed Aug 13 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.0.5-2
- Use 'make install' instead of %%makeinstall
- Correcting Reqs.
- Eliminate the need of perl as BR.
- Remove empty dirs

* Mon Jul  7 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.0.5-1
- Initional Fedora package




--- NEW FILE import.log ---
gresolver-0_0_5-3_fc9:HEAD:gresolver-0.0.5-3.fc9.src.rpm:1220887228


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gresolver/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Aug 2008 17:24:33 -0000	1.1
+++ .cvsignore	8 Sep 2008 15:21:41 -0000	1.2
@@ -0,0 +1 @@
+gresolver-0.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gresolver/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Aug 2008 17:24:33 -0000	1.1
+++ sources	8 Sep 2008 15:21:41 -0000	1.2
@@ -0,0 +1 @@
+092adb0206423118357a93ce3f14afb1  gresolver-0.0.5.tar.gz



From pkgdb at fedoraproject.org  Mon Sep  8 15:22:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:22:11 +0000
Subject: [pkgdb] pthsem was added for ixs
Message-ID: <20080908152214.827F8208DF0@bastion.fedora.phx.redhat.com>

kevin has added Package pthsem with summary The GNU Portable Threads library extended with semaphore support
kevin has approved Package pthsem
kevin has added a Fedora devel branch for pthsem with an owner of ixs
kevin has approved pthsem in Fedora devel
kevin has approved Package pthsem
kevin has set commit to Approved for packager on pthsem (Fedora devel)
kevin has set build to Approved for packager on pthsem (Fedora devel)
kevin has set checkout to Approved for packager on pthsem (Fedora devel)
kevin has set commit to Approved for uberpackager on pthsem (Fedora devel)
kevin has set build to Approved for uberpackager on pthsem (Fedora devel)
kevin has set checkout to Approved for uberpackager on pthsem (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pthsem



From pkgdb at fedoraproject.org  Mon Sep  8 15:22:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:22:13 +0000
Subject: [pkgdb] pthsem (Fedora, 9) updated by kevin
Message-ID: <20080908152215.00649208DF2@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for pthsem
kevin has set commit to Approved for uberpackager on pthsem (Fedora 9)
kevin has set build to Approved for uberpackager on pthsem (Fedora 9)
kevin has set checkout to Approved for uberpackager on pthsem (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pthsem



From pkgdb at fedoraproject.org  Mon Sep  8 15:22:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:22:15 +0000
Subject: [pkgdb] pl: bagnara has requested commit
Message-ID: <20080908152217.93AEA208DF7@bastion.fedora.phx.redhat.com>

bagnara has requested the commit acl on pl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pl



From kevin at fedoraproject.org  Mon Sep  8 15:22:23 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:22:23 +0000 (UTC)
Subject: rpms/pthsem - New directory
Message-ID: <20080908152223.212BD70128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pthsem
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO20347/rpms/pthsem

Log Message:
Directory /cvs/extras/rpms/pthsem added to the repository




From kevin at fedoraproject.org  Mon Sep  8 15:22:23 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:22:23 +0000 (UTC)
Subject: rpms/pthsem/devel - New directory
Message-ID: <20080908152223.555B67012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pthsem/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO20347/rpms/pthsem/devel

Log Message:
Directory /cvs/extras/rpms/pthsem/devel added to the repository




From kevin at fedoraproject.org  Mon Sep  8 15:22:24 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:22:24 +0000 (UTC)
Subject: rpms/pthsem Makefile,NONE,1.1
Message-ID: <20080908152224.6317370128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pthsem
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO20347/rpms/pthsem

Added Files:
	Makefile 
Log Message:
Setup of module pthsem


--- NEW FILE Makefile ---
# Top level Makefile for module pthsem
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  8 15:22:24 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:22:24 +0000 (UTC)
Subject: rpms/pthsem/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080908152224.9B60B7012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pthsem/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO20347/rpms/pthsem/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pthsem


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pthsem
# $Id: Makefile,v 1.1 2008/09/08 15:22:24 kevin Exp $
NAME := pthsem
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  8 15:22:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:22:36 +0000
Subject: [pkgdb] pl: bagnara has requested watchbugzilla
Message-ID: <20080908152238.599E4208E00@bastion.fedora.phx.redhat.com>

bagnara has requested the watchbugzilla acl on pl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pl



From pkgdb at fedoraproject.org  Mon Sep  8 15:22:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:22:39 +0000
Subject: [pkgdb] pl: bagnara has requested watchcommits
Message-ID: <20080908152241.6E347208E02@bastion.fedora.phx.redhat.com>

bagnara has requested the watchcommits acl on pl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pl



From pkgdb at fedoraproject.org  Mon Sep  8 15:22:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:22:42 +0000
Subject: [pkgdb] pl: bagnara has requested commit
Message-ID: <20080908152248.28AFB2D0034@bastion.fedora.phx.redhat.com>

bagnara has requested the commit acl on pl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pl



From pkgdb at fedoraproject.org  Mon Sep  8 15:22:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:22:53 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20080908152256.985892E0007@bastion.fedora.phx.redhat.com>

clumens has set the watchbugzilla acl on anaconda (Fedora devel) to Approved for dcantrel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Mon Sep  8 15:22:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:22:57 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20080908152309.2B75A2E001F@bastion.fedora.phx.redhat.com>

clumens has set the approveacls acl on anaconda (Fedora devel) to Approved for dcantrel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Mon Sep  8 15:22:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:22:55 +0000
Subject: [pkgdb] arj had acl change status
Message-ID: <20080908152257.AC35A2E000D@bastion.fedora.phx.redhat.com>

robert has set the watchcommits acl on arj (Fedora 8) to Obsolete for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:22:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:22:57 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20080908152300.C72772E0012@bastion.fedora.phx.redhat.com>

clumens has set the commit acl on anaconda (Fedora devel) to Approved for dcantrel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Mon Sep  8 15:22:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:22:55 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20080908152307.4FE8A2E001D@bastion.fedora.phx.redhat.com>

clumens has set the watchcommits acl on anaconda (Fedora devel) to Approved for dcantrel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Mon Sep  8 15:23:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:23:15 +0000
Subject: [pkgdb] perl-DBIx-Class-Schema-Loader summary updated by kevin
Message-ID: <20080908152315.AE9EC2E0017@bastion.fedora.phx.redhat.com>

kevin set package perl-DBIx-Class-Schema-Loader summary to Dynamic definition of a DBIx::Class::Schema

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Class-Schema-Loader



From pkgdb at fedoraproject.org  Mon Sep  8 15:23:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:23:03 +0000
Subject: [pkgdb] arj had acl change status
Message-ID: <20080908152312.7556B2D0037@bastion.fedora.phx.redhat.com>

robert has set the watchbugzilla acl on arj (Fedora 8) to Obsolete for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:23:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:23:15 +0000
Subject: [pkgdb] perl-DBIx-Class-Schema-Loader (Fedora, 8) updated by kevin
Message-ID: <20080908152319.969A42E0044@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-DBIx-Class-Schema-Loader in Fedora 8 to cweyl
kevin approved watchbugzilla on perl-DBIx-Class-Schema-Loader (Fedora 8) for perl-sig
kevin approved watchcommits on perl-DBIx-Class-Schema-Loader (Fedora 8) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Class-Schema-Loader



From pkgdb at fedoraproject.org  Mon Sep  8 15:23:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:23:17 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20080908152323.2D1DB2E0048@bastion.fedora.phx.redhat.com>

clumens has set the watchbugzilla acl on anaconda (Fedora 8) to Approved for dcantrel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Mon Sep  8 15:23:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:23:21 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20080908152322.CDFDB2E0047@bastion.fedora.phx.redhat.com>

clumens has set the watchcommits acl on anaconda (Fedora 8) to Approved for dcantrel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Mon Sep  8 15:23:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:23:15 +0000
Subject: [pkgdb] perl-DBIx-Class-Schema-Loader (Fedora, 9) updated by kevin
Message-ID: <20080908152316.E0C3D2E003E@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-DBIx-Class-Schema-Loader in Fedora 9 to cweyl
kevin approved watchbugzilla on perl-DBIx-Class-Schema-Loader (Fedora 9) for perl-sig
kevin approved watchcommits on perl-DBIx-Class-Schema-Loader (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Class-Schema-Loader



From pkgdb at fedoraproject.org  Mon Sep  8 15:23:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:23:15 +0000
Subject: [pkgdb] perl-DBIx-Class-Schema-Loader (Fedora,
	devel) updated by kevin
Message-ID: <20080908152317.522502E003F@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-DBIx-Class-Schema-Loader in Fedora devel to cweyl
kevin approved watchbugzilla on perl-DBIx-Class-Schema-Loader (Fedora devel) for perl-sig
kevin approved watchcommits on perl-DBIx-Class-Schema-Loader (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Class-Schema-Loader



From pkgdb at fedoraproject.org  Mon Sep  8 15:23:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:23:20 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20080908152324.F28C22E003C@bastion.fedora.phx.redhat.com>

clumens has set the commit acl on anaconda (Fedora 8) to Approved for dcantrel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Mon Sep  8 15:23:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:23:23 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20080908152325.1D8992D0039@bastion.fedora.phx.redhat.com>

clumens has set the approveacls acl on anaconda (Fedora 8) to Approved for dcantrel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Mon Sep  8 15:23:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:23:26 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20080908152326.ECC832E0028@bastion.fedora.phx.redhat.com>

clumens has set the watchbugzilla acl on anaconda (Fedora 9) to Approved for dcantrel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Mon Sep  8 15:23:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:23:28 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20080908152328.C88442E0046@bastion.fedora.phx.redhat.com>

clumens has set the commit acl on anaconda (Fedora 9) to Approved for dcantrel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Mon Sep  8 15:23:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:23:31 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20080908152333.9B00E2E004E@bastion.fedora.phx.redhat.com>

clumens has set the approveacls acl on anaconda (Fedora 9) to Approved for dcantrel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Mon Sep  8 15:23:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:23:32 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20080908152343.7B3D72E0029@bastion.fedora.phx.redhat.com>

clumens has set the watchcommits acl on anaconda (Fedora 9) to Approved for dcantrel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Mon Sep  8 15:24:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:24:04 +0000
Subject: [pkgdb] arj had acl change status
Message-ID: <20080908152404.26D362E005A@bastion.fedora.phx.redhat.com>

robert has set the watchcommits acl on arj (Fedora 8) to Obsolete for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:24:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:24:09 +0000
Subject: [pkgdb] arj had acl change status
Message-ID: <20080908152409.1FA74208DBD@bastion.fedora.phx.redhat.com>

robert has set the watchbugzilla acl on arj (Fedora 8) to Obsolete for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 15:24:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:24:31 +0000
Subject: [pkgdb] yap: bagnara has requested watchbugzilla
Message-ID: <20080908152431.B0F602E0033@bastion.fedora.phx.redhat.com>

bagnara has requested the watchbugzilla acl on yap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yap



From pkgdb at fedoraproject.org  Mon Sep  8 15:24:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:24:32 +0000
Subject: [pkgdb] yap: bagnara has requested commit
Message-ID: <20080908152433.5A3A52E0037@bastion.fedora.phx.redhat.com>

bagnara has requested the commit acl on yap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yap



From pkgdb at fedoraproject.org  Mon Sep  8 15:24:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:24:37 +0000
Subject: [pkgdb] yap: bagnara has requested watchcommits
Message-ID: <20080908152437.D5CD52E005C@bastion.fedora.phx.redhat.com>

bagnara has requested the watchcommits acl on yap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yap



From pkgdb at fedoraproject.org  Mon Sep  8 15:25:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:25:00 +0000
Subject: [pkgdb] yap: bagnara has requested watchbugzilla
Message-ID: <20080908152500.EFB8E208D99@bastion.fedora.phx.redhat.com>

bagnara has requested the watchbugzilla acl on yap (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yap



From pkgdb at fedoraproject.org  Mon Sep  8 15:25:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:25:03 +0000
Subject: [pkgdb] yap: bagnara has requested watchcommits
Message-ID: <20080908152503.24983208D9F@bastion.fedora.phx.redhat.com>

bagnara has requested the watchcommits acl on yap (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yap



From pkgdb at fedoraproject.org  Mon Sep  8 15:25:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:25:05 +0000
Subject: [pkgdb] yap: bagnara has requested commit
Message-ID: <20080908152505.A32B5208DC6@bastion.fedora.phx.redhat.com>

bagnara has requested the commit acl on yap (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yap



From pkgdb at fedoraproject.org  Mon Sep  8 15:25:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:25:16 +0000
Subject: [pkgdb] libtheora ownership updated
Message-ID: <20080908152516.1320F208DC8@bastion.fedora.phx.redhat.com>

Package libtheora in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtheora



From pkgdb at fedoraproject.org  Mon Sep  8 15:25:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:25:25 +0000
Subject: [pkgdb] libtheora ownership updated
Message-ID: <20080908152525.7AF2A2E006A@bastion.fedora.phx.redhat.com>

Package libtheora in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtheora



From pkgdb at fedoraproject.org  Mon Sep  8 15:25:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:25:34 +0000
Subject: [pkgdb] perl-Module-Install-ExtraTests was added for cweyl
Message-ID: <20080908152534.A99992E008F@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Module-Install-ExtraTests with summary Ignorable, contextual test support for Module::Install
kevin has approved Package perl-Module-Install-ExtraTests
kevin has added a Fedora devel branch for perl-Module-Install-ExtraTests with an owner of cweyl
kevin has approved perl-Module-Install-ExtraTests in Fedora devel
kevin has approved Package perl-Module-Install-ExtraTests
kevin has set commit to Approved for packager on perl-Module-Install-ExtraTests (Fedora devel)
kevin has set build to Approved for packager on perl-Module-Install-ExtraTests (Fedora devel)
kevin has set checkout to Approved for packager on perl-Module-Install-ExtraTests (Fedora devel)
kevin has set commit to Approved for uberpackager on perl-Module-Install-ExtraTests (Fedora devel)
kevin has set build to Approved for uberpackager on perl-Module-Install-ExtraTests (Fedora devel)
kevin has set checkout to Approved for uberpackager on perl-Module-Install-ExtraTests (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Install-ExtraTests



From pkgdb at fedoraproject.org  Mon Sep  8 15:25:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:25:38 +0000
Subject: [pkgdb] libtheora ownership updated
Message-ID: <20080908152538.6B3792E0098@bastion.fedora.phx.redhat.com>

Package libtheora in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtheora



From pkgdb at fedoraproject.org  Mon Sep  8 15:25:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:25:40 +0000
Subject: [pkgdb] perl-Module-Install-ExtraTests (Fedora, 8) updated by kevin
Message-ID: <20080908152540.A0C4D2E00AA@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for perl-Module-Install-ExtraTests
kevin has set commit to Approved for uberpackager on perl-Module-Install-ExtraTests (Fedora 8)
kevin has set build to Approved for uberpackager on perl-Module-Install-ExtraTests (Fedora 8)
kevin has set checkout to Approved for uberpackager on perl-Module-Install-ExtraTests (Fedora 8)
kevin approved watchbugzilla on perl-Module-Install-ExtraTests (Fedora 8) for perl-sig
kevin approved watchcommits on perl-Module-Install-ExtraTests (Fedora 8) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Install-ExtraTests



From pkgdb at fedoraproject.org  Mon Sep  8 15:25:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:25:40 +0000
Subject: [pkgdb] perl-Module-Install-ExtraTests (Fedora,
	devel) updated by kevin
Message-ID: <20080908152540.A8F6F2E00AD@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Module-Install-ExtraTests (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Module-Install-ExtraTests (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Install-ExtraTests



From pkgdb at fedoraproject.org  Mon Sep  8 15:25:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:25:57 +0000
Subject: [pkgdb] gprolog: bagnara has requested watchcommits
Message-ID: <20080908152557.8E9D42E00C4@bastion.fedora.phx.redhat.com>

bagnara has requested the watchcommits acl on gprolog (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gprolog



From pkgdb at fedoraproject.org  Mon Sep  8 15:25:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:25:59 +0000
Subject: [pkgdb] gprolog: bagnara has requested commit
Message-ID: <20080908152559.BAC382E00C0@bastion.fedora.phx.redhat.com>

bagnara has requested the commit acl on gprolog (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gprolog



From pkgdb at fedoraproject.org  Mon Sep  8 15:26:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:26:03 +0000
Subject: [pkgdb] libvorbis ownership updated
Message-ID: <20080908152603.241B22E00C7@bastion.fedora.phx.redhat.com>

Package libvorbis in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvorbis



From pkgdb at fedoraproject.org  Mon Sep  8 15:26:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:26:05 +0000
Subject: [pkgdb] libvorbis ownership updated
Message-ID: <20080908152605.A90E5208DAB@bastion.fedora.phx.redhat.com>

Package libvorbis in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvorbis



From pkgdb at fedoraproject.org  Mon Sep  8 15:26:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:26:08 +0000
Subject: [pkgdb] gprolog: bagnara has requested watchbugzilla
Message-ID: <20080908152608.EA4C82E00DF@bastion.fedora.phx.redhat.com>

bagnara has requested the watchbugzilla acl on gprolog (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gprolog



From pkgdb at fedoraproject.org  Mon Sep  8 15:26:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:26:13 +0000
Subject: [pkgdb] gprolog: bagnara has requested watchcommits
Message-ID: <20080908152613.730A62E00DE@bastion.fedora.phx.redhat.com>

bagnara has requested the watchcommits acl on gprolog (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gprolog



From pkgdb at fedoraproject.org  Mon Sep  8 15:26:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:26:15 +0000
Subject: [pkgdb] gprolog: bagnara has requested commit
Message-ID: <20080908152615.92F6B2E00E3@bastion.fedora.phx.redhat.com>

bagnara has requested the commit acl on gprolog (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gprolog



From pkgdb at fedoraproject.org  Mon Sep  8 15:26:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:26:17 +0000
Subject: [pkgdb] libvorbis ownership updated
Message-ID: <20080908152617.D80672E00E6@bastion.fedora.phx.redhat.com>

Package libvorbis in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvorbis



From pkgdb at fedoraproject.org  Mon Sep  8 15:26:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:26:19 +0000
Subject: [pkgdb] libvorbis ownership updated
Message-ID: <20080908152619.3C6F82E00FB@bastion.fedora.phx.redhat.com>

Package libvorbis in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvorbis



From pkgdb at fedoraproject.org  Mon Sep  8 15:26:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:26:31 +0000
Subject: [pkgdb] perl-Class-Method-Modifiers was added for cweyl
Message-ID: <20080908152631.B036B2E011C@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Class-Method-Modifiers with summary Provides Moose-like method modifiers
kevin has approved Package perl-Class-Method-Modifiers
kevin has added a Fedora devel branch for perl-Class-Method-Modifiers with an owner of cweyl
kevin has approved perl-Class-Method-Modifiers in Fedora devel
kevin has approved Package perl-Class-Method-Modifiers
kevin has set commit to Approved for packager on perl-Class-Method-Modifiers (Fedora devel)
kevin has set build to Approved for packager on perl-Class-Method-Modifiers (Fedora devel)
kevin has set checkout to Approved for packager on perl-Class-Method-Modifiers (Fedora devel)
kevin has set commit to Approved for uberpackager on perl-Class-Method-Modifiers (Fedora devel)
kevin has set build to Approved for uberpackager on perl-Class-Method-Modifiers (Fedora devel)
kevin has set checkout to Approved for uberpackager on perl-Class-Method-Modifiers (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-Method-Modifiers



From pkgdb at fedoraproject.org  Mon Sep  8 15:26:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:26:33 +0000
Subject: [pkgdb] perl-Class-Method-Modifiers (Fedora, 8) updated by kevin
Message-ID: <20080908152633.4254C2E0120@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for perl-Class-Method-Modifiers
kevin has set commit to Approved for uberpackager on perl-Class-Method-Modifiers (Fedora 8)
kevin has set build to Approved for uberpackager on perl-Class-Method-Modifiers (Fedora 8)
kevin has set checkout to Approved for uberpackager on perl-Class-Method-Modifiers (Fedora 8)
kevin approved watchbugzilla on perl-Class-Method-Modifiers (Fedora 8) for perl-sig
kevin approved watchcommits on perl-Class-Method-Modifiers (Fedora 8) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-Method-Modifiers



From pkgdb at fedoraproject.org  Mon Sep  8 15:26:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:26:33 +0000
Subject: [pkgdb] perl-Class-Method-Modifiers (Fedora, 9) updated by kevin
Message-ID: <20080908152633.490422E0123@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Class-Method-Modifiers
kevin has set commit to Approved for uberpackager on perl-Class-Method-Modifiers (Fedora 9)
kevin has set build to Approved for uberpackager on perl-Class-Method-Modifiers (Fedora 9)
kevin has set checkout to Approved for uberpackager on perl-Class-Method-Modifiers (Fedora 9)
kevin approved watchbugzilla on perl-Class-Method-Modifiers (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Class-Method-Modifiers (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-Method-Modifiers



From pkgdb at fedoraproject.org  Mon Sep  8 15:26:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:26:33 +0000
Subject: [pkgdb] perl-Class-Method-Modifiers (Fedora, devel) updated by kevin
Message-ID: <20080908152633.4F6012E0126@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Class-Method-Modifiers (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Class-Method-Modifiers (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-Method-Modifiers



From kevin at fedoraproject.org  Mon Sep  8 15:26:49 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:26:49 +0000 (UTC)
Subject: rpms/perl-Class-Method-Modifiers - New directory
Message-ID: <20080908152649.326D270128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Class-Method-Modifiers
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn22259/rpms/perl-Class-Method-Modifiers

Log Message:
Directory /cvs/extras/rpms/perl-Class-Method-Modifiers added to the repository




From kevin at fedoraproject.org  Mon Sep  8 15:26:49 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:26:49 +0000 (UTC)
Subject: rpms/perl-Class-Method-Modifiers/devel - New directory
Message-ID: <20080908152649.7EB0C70128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Class-Method-Modifiers/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn22259/rpms/perl-Class-Method-Modifiers/devel

Log Message:
Directory /cvs/extras/rpms/perl-Class-Method-Modifiers/devel added to the repository




From pkgdb at fedoraproject.org  Mon Sep  8 15:26:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:26:46 +0000
Subject: [pkgdb] rpc2 ownership updated
Message-ID: <20080908152647.0F32C208DB1@bastion.fedora.phx.redhat.com>

Package rpc2 in Fedora devel is now owned by agoode

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From kevin at fedoraproject.org  Mon Sep  8 15:26:50 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:26:50 +0000 (UTC)
Subject: rpms/perl-Class-Method-Modifiers Makefile,NONE,1.1
Message-ID: <20080908152650.B617170128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Class-Method-Modifiers
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn22259/rpms/perl-Class-Method-Modifiers

Added Files:
	Makefile 
Log Message:
Setup of module perl-Class-Method-Modifiers


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Class-Method-Modifiers
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  8 15:26:51 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:26:51 +0000 (UTC)
Subject: rpms/perl-Class-Method-Modifiers/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080908152651.1B01D70128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Class-Method-Modifiers/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn22259/rpms/perl-Class-Method-Modifiers/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-Method-Modifiers


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Class-Method-Modifiers
# $Id: Makefile,v 1.1 2008/09/08 15:26:50 kevin Exp $
NAME := perl-Class-Method-Modifiers
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  8 15:26:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:26:51 +0000
Subject: [pkgdb] rpc2 ownership updated
Message-ID: <20080908152652.021F42E0141@bastion.fedora.phx.redhat.com>

Package rpc2 in Fedora 9 is now owned by agoode

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 15:26:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:26:55 +0000
Subject: [pkgdb] rpc2 ownership updated
Message-ID: <20080908152655.DC5962E0144@bastion.fedora.phx.redhat.com>

Package rpc2 in Fedora 8 is now owned by agoode

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 15:27:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:27:03 +0000
Subject: [pkgdb] rpc2 had acl change status
Message-ID: <20080908152703.3DDF62E0148@bastion.fedora.phx.redhat.com>

agoode has set the approveacls acl on rpc2 (Fedora 9) to Approved for agoode

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 15:27:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:27:31 +0000
Subject: [pkgdb] rvm ownership updated
Message-ID: <20080908152731.7C21C2E014D@bastion.fedora.phx.redhat.com>

Package rvm in Fedora devel is now owned by agoode

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 15:25:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:25:30 +0000
Subject: [pkgdb] libtheora ownership updated
Message-ID: <20080908152530.C76DF2E007F@bastion.fedora.phx.redhat.com>

Package libtheora in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtheora



From pkgdb at fedoraproject.org  Mon Sep  8 15:18:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:18:57 +0000
Subject: [pkgdb] libassetml ownership updated
Message-ID: <20080908151857.582E8208DB7@bastion.fedora.phx.redhat.com>

Package libassetml in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libassetml



From pkgdb at fedoraproject.org  Mon Sep  8 15:25:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:25:52 +0000
Subject: [pkgdb] gprolog: bagnara has requested watchbugzilla
Message-ID: <20080908152552.6CD4F2E00B6@bastion.fedora.phx.redhat.com>

bagnara has requested the watchbugzilla acl on gprolog (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gprolog



From kevin at fedoraproject.org  Mon Sep  8 15:25:53 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:25:53 +0000 (UTC)
Subject: rpms/perl-Module-Install-ExtraTests - New directory
Message-ID: <20080908152553.25D3970128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Module-Install-ExtraTests
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy21799/rpms/perl-Module-Install-ExtraTests

Log Message:
Directory /cvs/extras/rpms/perl-Module-Install-ExtraTests added to the repository




From pkgdb at fedoraproject.org  Mon Sep  8 15:27:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:27:35 +0000
Subject: [pkgdb] rvm ownership updated
Message-ID: <20080908152735.A4F9B2E0150@bastion.fedora.phx.redhat.com>

Package rvm in Fedora 9 is now owned by agoode

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From kevin at fedoraproject.org  Mon Sep  8 15:25:53 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:25:53 +0000 (UTC)
Subject: rpms/perl-Module-Install-ExtraTests/devel - New directory
Message-ID: <20080908152553.6427970128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Module-Install-ExtraTests/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy21799/rpms/perl-Module-Install-ExtraTests/devel

Log Message:
Directory /cvs/extras/rpms/perl-Module-Install-ExtraTests/devel added to the repository




From pkgdb at fedoraproject.org  Mon Sep  8 15:27:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:27:36 +0000
Subject: [pkgdb] rvm ownership updated
Message-ID: <20080908152736.E3EAA208DB8@bastion.fedora.phx.redhat.com>

Package rvm in Fedora 8 is now owned by agoode

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 15:25:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:25:40 +0000
Subject: [pkgdb] perl-Module-Install-ExtraTests (Fedora, 9) updated by kevin
Message-ID: <20080908152540.B19782E00B0@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Module-Install-ExtraTests
kevin has set commit to Approved for uberpackager on perl-Module-Install-ExtraTests (Fedora 9)
kevin has set build to Approved for uberpackager on perl-Module-Install-ExtraTests (Fedora 9)
kevin has set checkout to Approved for uberpackager on perl-Module-Install-ExtraTests (Fedora 9)
kevin approved watchbugzilla on perl-Module-Install-ExtraTests (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Module-Install-ExtraTests (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Install-ExtraTests



From kevin at fedoraproject.org  Mon Sep  8 15:25:54 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:25:54 +0000 (UTC)
Subject: rpms/perl-Module-Install-ExtraTests Makefile,NONE,1.1
Message-ID: <20080908152554.7757B70128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Module-Install-ExtraTests
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy21799/rpms/perl-Module-Install-ExtraTests

Added Files:
	Makefile 
Log Message:
Setup of module perl-Module-Install-ExtraTests


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Module-Install-ExtraTests
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep  8 15:27:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:27:59 +0000
Subject: [pkgdb] lwp ownership updated
Message-ID: <20080908152800.049862D0024@bastion.fedora.phx.redhat.com>

Package lwp in Fedora devel is now owned by agoode

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 15:28:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:28:03 +0000
Subject: [pkgdb] lwp ownership updated
Message-ID: <20080908152803.2818C2E0154@bastion.fedora.phx.redhat.com>

Package lwp in Fedora 9 is now owned by agoode

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From s4504kr at fedoraproject.org  Mon Sep  8 15:28:04 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon,  8 Sep 2008 15:28:04 +0000 (UTC)
Subject: rpms/gresolver/F-9 gresolver-0.0.5-makefile.patch, NONE,
	1.1 gresolver.desktop, NONE, 1.1 gresolver.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20080908152804.57B6270128@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/gresolver/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22702

Modified Files:
	sources 
Added Files:
	gresolver-0.0.5-makefile.patch gresolver.desktop 
	gresolver.spec 
Log Message:
Initional release

gresolver-0.0.5-makefile.patch:

--- NEW FILE gresolver-0.0.5-makefile.patch ---
diff -up gresolver-0.0.5/Makefile.in.mk gresolver-0.0.5/Makefile.in
--- gresolver-0.0.5/Makefile.in.mk	2008-08-13 17:39:46.000000000 +0200
+++ gresolver-0.0.5/Makefile.in	2008-08-13 17:39:57.000000000 +0200
@@ -12,7 +12,7 @@ build:
 
 install:
 	-mkdir -p "$(prefix)/bin" "$(prefix)/share/$(name)" "$(prefix)/share/pixmaps" "$(prefix)/share/applications"
-	-mkdir -p "$(prefix)/share/locale/en/LC_MESSAGES"
+#	-mkdir -p "$(prefix)/share/locale/en/LC_MESSAGES"
 	install -m 0755 $(name) "$(prefix)/bin/"
 	install -m 0644 $(name).png "$(prefix)/share/pixmaps/"
 	install -m 0644 $(name).glade "$(prefix)/share/$(name)/"


--- NEW FILE gresolver.desktop ---
[Desktop Entry]
Version=1.0
Type=Application
Exec=gresolver
Terminal=false
StartupNotify=true
Name=DNS Query Tool
Name[en_GB]=DNS Query Tool
Comment=Perform advanced DNS queries
Comment[en_GB]=Perform advanced DNS queries
Icon=gresolver
Categories=Network;


--- NEW FILE gresolver.spec ---
Summary:	Graphical DNS query tool
Name:		gresolver
Version:	0.0.5
Release:	3%{?dist}

Group:		Applications/System
License:	GPLv2+ or Artistic
URL:		http://jodrell.net/projects/gresolver

Source: 	http://jodrell.net/files/%{name}/%{name}-%{version}.tar.gz
Source1:	gresolver.desktop
Patch1:		gresolver-0.0.5-makefile.patch

BuildRoot: 	%{_tmppath}/root-%{name}-%{version}-%(%{__id_u} -n)

BuildArch: 	noarch
BuildRequires: 	desktop-file-utils
Requires: 	gtk2 >= 2.6.0, perl >= 5.8.0, bind-utils > 9

%description
GResolver is a graphical DNS query tool. It allows system administrators
to quickly and easily make the most common DNS queries without constructing 
lengthy 'dig' commands.

%prep
%setup -q
%patch1 -p1
./configure --prefix=%{_prefix}

%build
sed -e 's|@PREFIX@|%{_prefix}|g' <%{name}.pl >%{name}

%install
rm -rf %{buildroot}
make install prefix=%{buildroot}%{_prefix}

rm %{buildroot}%{_datadir}/applications/gresolver.desktop

desktop-file-install --vendor fedora \
  --dir %{buildroot}%{_datadir}/applications \
  %{SOURCE1}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc COPYING ChangeLog
%{_bindir}/*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/%{name}/

%changelog
* Thu Aug 14 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.0.5-3
- Fix %%file section

* Wed Aug 13 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.0.5-2
- Use 'make install' instead of %%makeinstall
- Correcting Reqs.
- Eliminate the need of perl as BR.
- Remove empty dirs

* Mon Jul  7 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.0.5-1
- Initional Fedora package




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gresolver/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Aug 2008 17:24:33 -0000	1.1
+++ sources	8 Sep 2008 15:27:34 -0000	1.2
@@ -0,0 +1 @@
+092adb0206423118357a93ce3f14afb1  gresolver-0.0.5.tar.gz



From pkgdb at fedoraproject.org  Mon Sep  8 15:28:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:28:08 +0000
Subject: [pkgdb] lwp ownership updated
Message-ID: <20080908152808.C596C2E0158@bastion.fedora.phx.redhat.com>

Package lwp in Fedora 8 is now owned by agoode

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From kevin at fedoraproject.org  Mon Sep  8 15:25:54 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 15:25:54 +0000 (UTC)
Subject: rpms/perl-Module-Install-ExtraTests/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080908152554.D76C670128@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Module-Install-ExtraTests/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy21799/rpms/perl-Module-Install-ExtraTests/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Module-Install-ExtraTests


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Module-Install-ExtraTests
# $Id: Makefile,v 1.1 2008/09/08 15:25:54 kevin Exp $
NAME := perl-Module-Install-ExtraTests
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  8 15:30:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:30:34 +0000
Subject: [pkgdb] id3lib ownership updated
Message-ID: <20080908153034.63EA82D003C@bastion.fedora.phx.redhat.com>

Package id3lib in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3lib



From pkgdb at fedoraproject.org  Mon Sep  8 15:30:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:30:39 +0000
Subject: [pkgdb] id3lib ownership updated
Message-ID: <20080908153039.2BDBF2D0040@bastion.fedora.phx.redhat.com>

Package id3lib in Fedora 1 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3lib



From pkgdb at fedoraproject.org  Mon Sep  8 15:30:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:30:41 +0000
Subject: [pkgdb] id3lib ownership updated
Message-ID: <20080908153041.D93EA2D0042@bastion.fedora.phx.redhat.com>

Package id3lib in Fedora 2 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3lib



From pkgdb at fedoraproject.org  Mon Sep  8 15:30:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:30:42 +0000
Subject: [pkgdb] id3lib ownership updated
Message-ID: <20080908153042.695422D0044@bastion.fedora.phx.redhat.com>

Package id3lib in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3lib



From pkgdb at fedoraproject.org  Mon Sep  8 15:30:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:30:43 +0000
Subject: [pkgdb] id3lib ownership updated
Message-ID: <20080908153043.B3B222D0047@bastion.fedora.phx.redhat.com>

Package id3lib in Fedora 3 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3lib



From pkgdb at fedoraproject.org  Mon Sep  8 15:30:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:30:45 +0000
Subject: [pkgdb] id3lib ownership updated
Message-ID: <20080908153045.688CD2D0048@bastion.fedora.phx.redhat.com>

Package id3lib in Fedora 4 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3lib



From pkgdb at fedoraproject.org  Mon Sep  8 15:30:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:30:49 +0000
Subject: [pkgdb] id3lib ownership updated
Message-ID: <20080908153049.0AE082D004A@bastion.fedora.phx.redhat.com>

Package id3lib in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3lib



From pkgdb at fedoraproject.org  Mon Sep  8 15:30:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:30:51 +0000
Subject: [pkgdb] id3lib ownership updated
Message-ID: <20080908153051.BF7CB2D0050@bastion.fedora.phx.redhat.com>

Package id3lib in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3lib



From pkgdb at fedoraproject.org  Mon Sep  8 15:30:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:30:53 +0000
Subject: [pkgdb] id3lib ownership updated
Message-ID: <20080908153054.65F372D0052@bastion.fedora.phx.redhat.com>

Package id3lib in Red Hat Linux 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3lib



From pkgdb at fedoraproject.org  Mon Sep  8 15:31:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:31:00 +0000
Subject: [pkgdb] id3lib ownership updated
Message-ID: <20080908153100.E1E8B2D0054@bastion.fedora.phx.redhat.com>

Package id3lib in Red Hat Linux 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3lib



From pkgdb at fedoraproject.org  Mon Sep  8 15:31:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:31:03 +0000
Subject: [pkgdb] id3lib ownership updated
Message-ID: <20080908153104.102CC2D0057@bastion.fedora.phx.redhat.com>

Package id3lib in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3lib



From pkgdb at fedoraproject.org  Mon Sep  8 15:31:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:31:07 +0000
Subject: [pkgdb] id3lib ownership updated
Message-ID: <20080908153107.ADC882D005A@bastion.fedora.phx.redhat.com>

Package id3lib in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3lib



From pkgdb at fedoraproject.org  Mon Sep  8 15:32:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:32:25 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20080908153225.4A329208770@bastion.fedora.phx.redhat.com>

Package ksensors in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Mon Sep  8 15:32:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:32:25 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20080908153225.5177C2D0067@bastion.fedora.phx.redhat.com>

Package ksensors in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Mon Sep  8 15:32:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:32:27 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20080908153227.223752D006A@bastion.fedora.phx.redhat.com>

Package ksensors in Fedora 2 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Mon Sep  8 15:32:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:32:31 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20080908153231.C6CA12D006C@bastion.fedora.phx.redhat.com>

Package ksensors in Fedora 1 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksensors



From rhughes at fedoraproject.org  Mon Sep  8 15:34:48 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  8 Sep 2008 15:34:48 +0000 (UTC)
Subject: rpms/gnome-packagekit/devel .cvsignore, 1.25,
	1.26 gnome-packagekit.spec, 1.43, 1.44 sources, 1.25, 1.26
Message-ID: <20080908153448.82EC270128@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25495

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Log Message:
* Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.2-1
- Update to newest upstream version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	27 Aug 2008 13:17:25 -0000	1.25
+++ .cvsignore	8 Sep 2008 15:34:18 -0000	1.26
@@ -1 +1 @@
-gnome-packagekit-0.3.1.tar.gz
+gnome-packagekit-0.3.2.tar.gz


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gnome-packagekit.spec	28 Aug 2008 08:11:58 -0000	1.43
+++ gnome-packagekit.spec	8 Sep 2008 15:34:18 -0000	1.44
@@ -1,10 +1,10 @@
 %define dbus_version            0.61
-%define packagekit_version      0.3.1
+%define packagekit_version      0.3.2
 
 Summary:   GNOME PackageKit Client
 Name:      gnome-packagekit
-Version:   0.3.1
-Release:   3%{?dist}
+Version:   0.3.2
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
@@ -143,6 +143,9 @@
 %{_datadir}/applications/gpk-*.desktop
 
 %changelog
+* Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.2-1
+- Update to newest upstream version.
+
 * Thu Aug 28 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.1-3
 - Bump because the PackageKit-devel rpm was empty.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	27 Aug 2008 13:17:25 -0000	1.25
+++ sources	8 Sep 2008 15:34:18 -0000	1.26
@@ -1 +1 @@
-69ae3c788c413a48a5af1b969260bdef  gnome-packagekit-0.3.1.tar.gz
+3444847773c43318b84cc6358f1741f5  gnome-packagekit-0.3.2.tar.gz



From s4504kr at fedoraproject.org  Mon Sep  8 15:35:00 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon,  8 Sep 2008 15:35:00 +0000 (UTC)
Subject: rpms/gresolver/F-8 gresolver-0.0.5-makefile.patch, NONE,
	1.1 gresolver.desktop, NONE, 1.1 gresolver.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20080908153500.2989170128@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/gresolver/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25635

Modified Files:
	sources 
Added Files:
	gresolver-0.0.5-makefile.patch gresolver.desktop 
	gresolver.spec 
Log Message:
Initional release

gresolver-0.0.5-makefile.patch:

--- NEW FILE gresolver-0.0.5-makefile.patch ---
diff -up gresolver-0.0.5/Makefile.in.mk gresolver-0.0.5/Makefile.in
--- gresolver-0.0.5/Makefile.in.mk	2008-08-13 17:39:46.000000000 +0200
+++ gresolver-0.0.5/Makefile.in	2008-08-13 17:39:57.000000000 +0200
@@ -12,7 +12,7 @@ build:
 
 install:
 	-mkdir -p "$(prefix)/bin" "$(prefix)/share/$(name)" "$(prefix)/share/pixmaps" "$(prefix)/share/applications"
-	-mkdir -p "$(prefix)/share/locale/en/LC_MESSAGES"
+#	-mkdir -p "$(prefix)/share/locale/en/LC_MESSAGES"
 	install -m 0755 $(name) "$(prefix)/bin/"
 	install -m 0644 $(name).png "$(prefix)/share/pixmaps/"
 	install -m 0644 $(name).glade "$(prefix)/share/$(name)/"


--- NEW FILE gresolver.desktop ---
[Desktop Entry]
Version=1.0
Type=Application
Exec=gresolver
Terminal=false
StartupNotify=true
Name=DNS Query Tool
Name[en_GB]=DNS Query Tool
Comment=Perform advanced DNS queries
Comment[en_GB]=Perform advanced DNS queries
Icon=gresolver
Categories=Network;


--- NEW FILE gresolver.spec ---
Summary:	Graphical DNS query tool
Name:		gresolver
Version:	0.0.5
Release:	3%{?dist}

Group:		Applications/System
License:	GPLv2+ or Artistic
URL:		http://jodrell.net/projects/gresolver

Source: 	http://jodrell.net/files/%{name}/%{name}-%{version}.tar.gz
Source1:	gresolver.desktop
Patch1:		gresolver-0.0.5-makefile.patch

BuildRoot: 	%{_tmppath}/root-%{name}-%{version}-%(%{__id_u} -n)

BuildArch: 	noarch
BuildRequires: 	desktop-file-utils
Requires: 	gtk2 >= 2.6.0, perl >= 5.8.0, bind-utils > 9

%description
GResolver is a graphical DNS query tool. It allows system administrators
to quickly and easily make the most common DNS queries without constructing 
lengthy 'dig' commands.

%prep
%setup -q
%patch1 -p1
./configure --prefix=%{_prefix}

%build
sed -e 's|@PREFIX@|%{_prefix}|g' <%{name}.pl >%{name}

%install
rm -rf %{buildroot}
make install prefix=%{buildroot}%{_prefix}

rm %{buildroot}%{_datadir}/applications/gresolver.desktop

desktop-file-install --vendor fedora \
  --dir %{buildroot}%{_datadir}/applications \
  %{SOURCE1}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc COPYING ChangeLog
%{_bindir}/*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/%{name}/

%changelog
* Thu Aug 14 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.0.5-3
- Fix %%file section

* Wed Aug 13 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.0.5-2
- Use 'make install' instead of %%makeinstall
- Correcting Reqs.
- Eliminate the need of perl as BR.
- Remove empty dirs

* Mon Jul  7 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.0.5-1
- Initional Fedora package




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gresolver/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Aug 2008 17:24:33 -0000	1.1
+++ sources	8 Sep 2008 15:34:29 -0000	1.2
@@ -0,0 +1 @@
+092adb0206423118357a93ce3f14afb1  gresolver-0.0.5.tar.gz



From rhughes at fedoraproject.org  Mon Sep  8 15:35:05 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  8 Sep 2008 15:35:05 +0000 (UTC)
Subject: rpms/PackageKit/devel .cvsignore, 1.26, 1.27 PackageKit.spec, 1.50, 
	1.51 sources, 1.27, 1.28
Message-ID: <20080908153505.3820370128@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25686

Modified Files:
	.cvsignore PackageKit.spec sources 
Log Message:
* Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.2-1
- New upstream version
- This is the first release with the dispatcher functionality that allows
  backend reuse. This speeds up packagekitd to native speeds when doing
  repeated similar transactions from the same session and locale.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	27 Aug 2008 13:12:35 -0000	1.26
+++ .cvsignore	8 Sep 2008 15:34:34 -0000	1.27
@@ -1 +1 @@
-PackageKit-0.3.1.tar.gz
+PackageKit-0.3.2.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- PackageKit.spec	8 Sep 2008 12:29:19 -0000	1.50
+++ PackageKit.spec	8 Sep 2008 15:34:34 -0000	1.51
@@ -7,19 +7,14 @@
 
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
-Version:   0.3.1
-Release:   7%{?dist}
+Version:   0.3.2
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# upstream, c71eaadafd4115f0d8cf1c39c882f678ce1f004a
-Patch0:    pk-fix-pkcon-filters.patch
-# upstream, 962d677afcd9a9cfed9f08b4c862b7e3bb175a8c
-Patch1:    pk-fix-multiarch-resolve.patch
-
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-libs = %{version}-%{release}
@@ -143,8 +138,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -273,6 +266,12 @@
 %{_includedir}/*
 
 %changelog
+* Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.2-1
+- New upstream version
+- This is the first release with the dispatcher functionality that allows
+  backend reuse. This speeds up packagekitd to native speeds when doing
+  repeated similar transactions from the same session and locale.
+
 * Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.1-7
 - Enable the smart backend as it's nearly as complete as the yum backend
 - Disable the yum2 backend (0.3.2 will have a dispatcher instead)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	27 Aug 2008 13:12:35 -0000	1.27
+++ sources	8 Sep 2008 15:34:34 -0000	1.28
@@ -1 +1 @@
-e7586a3560e76966d2968946fbe7f846  PackageKit-0.3.1.tar.gz
+ecf46fb214287c5ffbcdbe3b13901ffe  PackageKit-0.3.2.tar.gz



From cweyl at fedoraproject.org  Mon Sep  8 15:39:57 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 15:39:57 +0000 (UTC)
Subject: rpms/perl-RPC-XML/devel README.license, NONE, 1.1 import.log, NONE, 
	1.1 perl-RPC-XML.spec, NONE, 1.1 tests.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080908153957.1094670128@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-RPC-XML/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28353/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.license import.log perl-RPC-XML.spec tests.patch 
Log Message:
initial import



--- NEW FILE README.license ---
Date: Tue, 04 Mar 2008 07:39:56 -0800
From: "Randy J. Ray" <rjray at blackperl.com>
To: Nick B <nsboyle at gmail.com>
Subject: Re: Fedora package for RPC-XML

Consider this confirmation that you may distribute it under the Artistic 
License 2.0, as specified at 
http://www.opensource.org/licenses/artistic-license-2.0.php

I am in the process of revising the licensing on all of my modules to be 
dual-licensed under the above and also LGPL 2.1 as specified at 
http://www.opensource.org/licenses/lgpl-2.1.php

However, because of other patches that have to be applied, integrated and 
tested, it may be some time before a new RPC-XML release is made. Please take 
this message as explicit permission to package and release under the licensing 
terms you require. Thank you.

Randy
-- 
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
Randy J. Ray        Sunnyvale, CA    http://www.rjray.org   rjray at blackperl.com

Silicon Valley Scale Modelers: http://www.svsm.org

###############################################################################

Date: Tue, 4 Mar 2008 09:09:04 -0500
From: "Nick B" <nsboyle at gmail.com>
To: rjray at blackperl.com
Subject: Fedora package for RPC-XML

Randy,

I've submitted a review request for RPC-XML with the Fedora project,
for inclusion in the official repository
(https://bugzilla.redhat.com/show_bug.cgi?id=435835).

There is one minor obstacle I've encountered in putting together the
package; here is your licensing specification from XML.pm:

# Copying and distribution are permitted under the terms of the Artistic
# License as distributed with Perl versions 5.005 and later. See
# http://www.opensource.org/licenses/artistic-license.php

The link above is broken, and the sentence is open to interpretation
over whether your intent is to have it licensed under the original
Artistic license (1.0), or the current (2.0).  The former, 1.0, is
unfortunately incompatible with Fedora's guidelines regarding
licensing.  I had originally interpreted "and later" to implicitly
mean the later versions of licenses to go along with the later
versions of Perl, but it was suggested that I should confirm with you
first.

I can package it under 2.0, but I need your confirmation via e-mail
that this is okay.  Let me know your thoughts on this.


Thanks,

Nick


--- NEW FILE import.log ---
perl-RPC-XML-0_60-2_fc9:HEAD:perl-RPC-XML-0.60-2.fc9.src.rpm:1220888359


--- NEW FILE perl-RPC-XML.spec ---
%define real_name RPC-XML

Name:    perl-RPC-XML
Version: 0.60
Release: 2%{dist}
Summary: Set of classes for core data, message and XML handling

Group:   Development/Libraries
License: Artistic 2.0 or LGPLv2
URL:     http://search.cpan.org/dist/RPC-XML/

Source0:   http://www.cpan.org/modules/by-module/RPC/%{real_name}-%{version}.tar.gz
Source1:   README.license
Patch0:    tests.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
BuildArch: noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(LWP)
BuildRequires: perl(Test::More)
BuildRequires: perl(XML::Parser)
# optional tests
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)

%package -n perl-Apache-RPC
Summary: Companion packages for RPC::XML tuned for mod_perl environments
Group:   Development/Libraries


%description
The RPC::XML package is an implementation of XML-RPC. The module provides
classes for sample client and server implementations, a server designed as an
Apache location-handler, and a suite of data-manipulation classes that are 
used by them.

%description -n perl-Apache-RPC
This package contains Apache::RPC::Server and Apache::RPC::Status, useful for
running RPC::XML under mod_perl.


%prep
%setup -qn %{real_name}-%{version}
%patch0
cp -p %{SOURCE1} .

chmod -c -x t/* 

#Filter unwanted Provides:
#  RPC::XML::Method creates two entries for some reason?
cat << \EOF > %{real_name}-prov
#!/bin/sh
%{__perl_provides} $* |\
  %{__sed} -e '/perl(RPC::XML::Method)$/d'
EOF

%define __perl_provides %{_builddir}/%{real_name}-%{version}/%{real_name}-prov
chmod +x %{__perl_provides}

%build
perl Makefile.PL INSTALLDIRS="vendor" PREFIX="%{_prefix}"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc ChangeLog README etc/*.dtd README.license ex/ methods/ t/
%{_mandir}/man3/RPC*
%{_mandir}/man1/*
%{_bindir}/make_method
%{perl_vendorlib}/RPC
%{perl_vendorlib}/auto/*

%files -n perl-Apache-RPC
%defattr(-,root,root,-)
%doc README.apache2 README.license
%{_mandir}/man3/Apache*
%{perl_vendorlib}/Apache

%changelog
* Tue Aug 26 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.60-2
- quiesce offending test

* Sat Aug 23 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.60-1
- even more spec cleanups :-)
- update licensing

* Fri Jul 04 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.60-0.1
- update to 0.60
- spec file cleanups

* Sun Mar 16 2008 Nicholas Boyle <nsboyle at gmail.com> - 0.59-5
- Added BuildRequires for Test::More and XML::Parser

* Sun Mar 16 2008 Nicholas Boyle <nsboyle at gmail.com> - 0.59-4
- Created subpackage perl-Apache-RPC to allow RPC-XML to work without
  requiring mod_perl
- Manpages now installed as regular files, instead of docs
- Removed explicit perl_archlib and perl_vendorarch definitions

* Fri Mar 07 2008 Nicholas Boyle <nsboyle at gmail.com> - 0.59-3
- Added README.license to clarify licensing

* Sat Mar 01 2008 Nicholas Boyle <nsboyle at gmail.com> - 0.59-2
- Initial Fedora packaging

* Mon Sep 18 2006 Dries Verachtert <dries at ulyssis.org> - 0.59-1
- Updated to release 0.59.

* Wed Mar 22 2006 Dries Verachtert <dries at ulyssis.org> - 0.58-1.2
- Rebuild for Fedora Core 5.

* Wed Jun  8 2005 Dries Verachtert <dries at ulyssis.org> - 0.58-1
- Updated to release 0.58.

* Sat Jan  1 2005 Dries Verachtert <dries at ulyssis.org> - 0.57-1
- Initial package.

tests.patch:

--- NEW FILE tests.patch ---
--- t/40_server.t.orig	2008-08-26 18:13:03.857320619 -0700
+++ t/40_server.t	2008-08-26 18:38:25.243322216 -0700
@@ -55,8 +55,12 @@
 $srv = RPC::XML::Server->new(no_default => 1,
                              host => 'localhost', port => $port);
 isa_ok($srv, 'RPC::XML::Server', '$srv<2>');
-is($srv->url, "http://localhost:$port/",
-   'RPC::XML::Server::url method (set)'); # This should be non-null this time
+TODO: {
+    local $TODO = 'Flaky test often fails depending on /etc/hosts';
+    is($srv->url, "http://localhost:$port/",
+        'RPC::XML::Server::url method (set)'); 
+        # This should be non-null this time
+}
 # Test some of the simpler cases of add_method and get_method
 $res = $srv->add_method({ name      => 'perl.test.suite.test1',
                           signature => [ 'int' ],


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-RPC-XML/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 15:16:30 -0000	1.1
+++ .cvsignore	8 Sep 2008 15:39:26 -0000	1.2
@@ -0,0 +1 @@
+RPC-XML-0.60.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-RPC-XML/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 15:16:30 -0000	1.1
+++ sources	8 Sep 2008 15:39:26 -0000	1.2
@@ -0,0 +1 @@
+82bf481396e5ad5cc63c1e70483dd904  RPC-XML-0.60.tar.gz



From cweyl at fedoraproject.org  Mon Sep  8 15:40:53 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 15:40:53 +0000 (UTC)
Subject: rpms/perl-RPC-XML/devel perl-RPC-XML.spec,1.1,1.2
Message-ID: <20080908154053.3C43E70128@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-RPC-XML/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29082

Modified Files:
	perl-RPC-XML.spec 
Log Message:
release bump


Index: perl-RPC-XML.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-RPC-XML/devel/perl-RPC-XML.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-RPC-XML.spec	8 Sep 2008 15:39:26 -0000	1.1
+++ perl-RPC-XML.spec	8 Sep 2008 15:40:22 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:    perl-RPC-XML
 Version: 0.60
-Release: 2%{dist}
+Release:        3%{?dist}
 Summary: Set of classes for core data, message and XML handling
 
 Group:   Development/Libraries
@@ -91,6 +91,9 @@
 %{perl_vendorlib}/Apache
 
 %changelog
+* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.60-3
+- bump
+
 * Tue Aug 26 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.60-2
 - quiesce offending test
 



From cweyl at fedoraproject.org  Mon Sep  8 15:41:37 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 15:41:37 +0000 (UTC)
Subject: rpms/perl-RPC-XML/F-8 README.license, NONE, 1.1 import.log, NONE,
	1.1 perl-RPC-XML.spec, NONE, 1.1 tests.patch, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20080908154137.6515770128@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-RPC-XML/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29657

Modified Files:
	sources 
Added Files:
	README.license import.log perl-RPC-XML.spec tests.patch 
Log Message:
pseudo-branch of perl-RPC-XML to F-8


--- NEW FILE README.license ---
Date: Tue, 04 Mar 2008 07:39:56 -0800
From: "Randy J. Ray" <rjray at blackperl.com>
To: Nick B <nsboyle at gmail.com>
Subject: Re: Fedora package for RPC-XML

Consider this confirmation that you may distribute it under the Artistic 
License 2.0, as specified at 
http://www.opensource.org/licenses/artistic-license-2.0.php

I am in the process of revising the licensing on all of my modules to be 
dual-licensed under the above and also LGPL 2.1 as specified at 
http://www.opensource.org/licenses/lgpl-2.1.php

However, because of other patches that have to be applied, integrated and 
tested, it may be some time before a new RPC-XML release is made. Please take 
this message as explicit permission to package and release under the licensing 
terms you require. Thank you.

Randy
-- 
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
Randy J. Ray        Sunnyvale, CA    http://www.rjray.org   rjray at blackperl.com

Silicon Valley Scale Modelers: http://www.svsm.org

###############################################################################

Date: Tue, 4 Mar 2008 09:09:04 -0500
From: "Nick B" <nsboyle at gmail.com>
To: rjray at blackperl.com
Subject: Fedora package for RPC-XML

Randy,

I've submitted a review request for RPC-XML with the Fedora project,
for inclusion in the official repository
(https://bugzilla.redhat.com/show_bug.cgi?id=435835).

There is one minor obstacle I've encountered in putting together the
package; here is your licensing specification from XML.pm:

# Copying and distribution are permitted under the terms of the Artistic
# License as distributed with Perl versions 5.005 and later. See
# http://www.opensource.org/licenses/artistic-license.php

The link above is broken, and the sentence is open to interpretation
over whether your intent is to have it licensed under the original
Artistic license (1.0), or the current (2.0).  The former, 1.0, is
unfortunately incompatible with Fedora's guidelines regarding
licensing.  I had originally interpreted "and later" to implicitly
mean the later versions of licenses to go along with the later
versions of Perl, but it was suggested that I should confirm with you
first.

I can package it under 2.0, but I need your confirmation via e-mail
that this is okay.  Let me know your thoughts on this.


Thanks,

Nick


--- NEW FILE import.log ---
perl-RPC-XML-0_60-2_fc9:HEAD:perl-RPC-XML-0.60-2.fc9.src.rpm:1220888359


--- NEW FILE perl-RPC-XML.spec ---
%define real_name RPC-XML

Name:    perl-RPC-XML
Version: 0.60
Release:        3%{?dist}
Summary: Set of classes for core data, message and XML handling

Group:   Development/Libraries
License: Artistic 2.0 or LGPLv2
URL:     http://search.cpan.org/dist/RPC-XML/

Source0:   http://www.cpan.org/modules/by-module/RPC/%{real_name}-%{version}.tar.gz
Source1:   README.license
Patch0:    tests.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
BuildArch: noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(LWP)
BuildRequires: perl(Test::More)
BuildRequires: perl(XML::Parser)
# optional tests
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)

%package -n perl-Apache-RPC
Summary: Companion packages for RPC::XML tuned for mod_perl environments
Group:   Development/Libraries


%description
The RPC::XML package is an implementation of XML-RPC. The module provides
classes for sample client and server implementations, a server designed as an
Apache location-handler, and a suite of data-manipulation classes that are 
used by them.

%description -n perl-Apache-RPC
This package contains Apache::RPC::Server and Apache::RPC::Status, useful for
running RPC::XML under mod_perl.


%prep
%setup -qn %{real_name}-%{version}
%patch0
cp -p %{SOURCE1} .

chmod -c -x t/* 

#Filter unwanted Provides:
#  RPC::XML::Method creates two entries for some reason?
cat << \EOF > %{real_name}-prov
#!/bin/sh
%{__perl_provides} $* |\
  %{__sed} -e '/perl(RPC::XML::Method)$/d'
EOF

%define __perl_provides %{_builddir}/%{real_name}-%{version}/%{real_name}-prov
chmod +x %{__perl_provides}

%build
perl Makefile.PL INSTALLDIRS="vendor" PREFIX="%{_prefix}"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc ChangeLog README etc/*.dtd README.license ex/ methods/ t/
%{_mandir}/man3/RPC*
%{_mandir}/man1/*
%{_bindir}/make_method
%{perl_vendorlib}/RPC
%{perl_vendorlib}/auto/*

%files -n perl-Apache-RPC
%defattr(-,root,root,-)
%doc README.apache2 README.license
%{_mandir}/man3/Apache*
%{perl_vendorlib}/Apache

%changelog
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.60-3
- bump

* Tue Aug 26 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.60-2
- quiesce offending test

* Sat Aug 23 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.60-1
- even more spec cleanups :-)
- update licensing

* Fri Jul 04 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.60-0.1
- update to 0.60
- spec file cleanups

* Sun Mar 16 2008 Nicholas Boyle <nsboyle at gmail.com> - 0.59-5
- Added BuildRequires for Test::More and XML::Parser

* Sun Mar 16 2008 Nicholas Boyle <nsboyle at gmail.com> - 0.59-4
- Created subpackage perl-Apache-RPC to allow RPC-XML to work without
  requiring mod_perl
- Manpages now installed as regular files, instead of docs
- Removed explicit perl_archlib and perl_vendorarch definitions

* Fri Mar 07 2008 Nicholas Boyle <nsboyle at gmail.com> - 0.59-3
- Added README.license to clarify licensing

* Sat Mar 01 2008 Nicholas Boyle <nsboyle at gmail.com> - 0.59-2
- Initial Fedora packaging

* Mon Sep 18 2006 Dries Verachtert <dries at ulyssis.org> - 0.59-1
- Updated to release 0.59.

* Wed Mar 22 2006 Dries Verachtert <dries at ulyssis.org> - 0.58-1.2
- Rebuild for Fedora Core 5.

* Wed Jun  8 2005 Dries Verachtert <dries at ulyssis.org> - 0.58-1
- Updated to release 0.58.

* Sat Jan  1 2005 Dries Verachtert <dries at ulyssis.org> - 0.57-1
- Initial package.

tests.patch:

--- NEW FILE tests.patch ---
--- t/40_server.t.orig	2008-08-26 18:13:03.857320619 -0700
+++ t/40_server.t	2008-08-26 18:38:25.243322216 -0700
@@ -55,8 +55,12 @@
 $srv = RPC::XML::Server->new(no_default => 1,
                              host => 'localhost', port => $port);
 isa_ok($srv, 'RPC::XML::Server', '$srv<2>');
-is($srv->url, "http://localhost:$port/",
-   'RPC::XML::Server::url method (set)'); # This should be non-null this time
+TODO: {
+    local $TODO = 'Flaky test often fails depending on /etc/hosts';
+    is($srv->url, "http://localhost:$port/",
+        'RPC::XML::Server::url method (set)'); 
+        # This should be non-null this time
+}
 # Test some of the simpler cases of add_method and get_method
 $res = $srv->add_method({ name      => 'perl.test.suite.test1',
                           signature => [ 'int' ],


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-RPC-XML/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 15:16:30 -0000	1.1
+++ sources	8 Sep 2008 15:41:06 -0000	1.2
@@ -0,0 +1 @@
+82bf481396e5ad5cc63c1e70483dd904  RPC-XML-0.60.tar.gz



From s4504kr at fedoraproject.org  Mon Sep  8 15:42:42 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon,  8 Sep 2008 15:42:42 +0000 (UTC)
Subject: rpms/highlight/F-9 highlight.spec,1.32,1.33 sources,1.19,1.20
Message-ID: <20080908154242.EFF1970128@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30282

Modified Files:
	highlight.spec sources 
Log Message:
New upstream release


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-9/highlight.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- highlight.spec	17 Jul 2008 15:39:58 -0000	1.32
+++ highlight.spec	8 Sep 2008 15:42:12 -0000	1.33
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.6.11
+Version:	2.6.12
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -9,7 +9,8 @@
 URL:		http://www.andre-simon.de/
 Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
 Patch1:		highlight-2.6.11-makefile.patch
-Patch3:         highlight-2.6.11-gcc43.patch
+
+BuildRequires:	wxGTK-devel
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -24,7 +25,6 @@
 %prep
 %setup -q
 %patch1 -p1 -b .mak
-%patch3 -p1 -b .gcc43
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Mon Aug 18 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.12-1
+- New upstream release
+
 * Thu Jul 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.11-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-9/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	17 Jul 2008 15:39:58 -0000	1.19
+++ sources	8 Sep 2008 15:42:12 -0000	1.20
@@ -1 +1 @@
-9bc25b076d90b5e0be5df5617e753fc9  highlight-2.6.11.tar.gz
+5ab9c50e537c199f359a7d9610aacc7f  highlight-2.6.12.tar.gz



From s4504kr at fedoraproject.org  Mon Sep  8 15:44:44 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon,  8 Sep 2008 15:44:44 +0000 (UTC)
Subject: rpms/highlight/F-8 highlight.spec,1.29,1.30 sources,1.18,1.19
Message-ID: <20080908154444.8E2D670128@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31061

Modified Files:
	highlight.spec sources 
Log Message:
New upstream release


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-8/highlight.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- highlight.spec	17 Jul 2008 15:44:23 -0000	1.29
+++ highlight.spec	8 Sep 2008 15:44:14 -0000	1.30
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.6.11
+Version:	2.6.12
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -9,7 +9,8 @@
 URL:		http://www.andre-simon.de/
 Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
 Patch1:		highlight-2.6.11-makefile.patch
-Patch3:         highlight-2.6.11-gcc43.patch
+
+BuildRequires:	wxGTK-devel
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -24,7 +25,6 @@
 %prep
 %setup -q
 %patch1 -p1 -b .mak
-%patch3 -p1 -b .gcc43
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Mon Aug 18 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.12-1
+- New upstream release
+
 * Thu Jul 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.11-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-8/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	17 Jul 2008 15:44:23 -0000	1.18
+++ sources	8 Sep 2008 15:44:14 -0000	1.19
@@ -1 +1 @@
-9bc25b076d90b5e0be5df5617e753fc9  highlight-2.6.11.tar.gz
+5ab9c50e537c199f359a7d9610aacc7f  highlight-2.6.12.tar.gz



From pkgdb at fedoraproject.org  Mon Sep  8 15:48:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:48:34 +0000
Subject: [pkgdb] gprolog had acl change status
Message-ID: <20080908154834.E5F8B208DA4@bastion.fedora.phx.redhat.com>

s4504kr has set the watchcommits acl on gprolog (Fedora devel) to Approved for bagnara

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gprolog



From ausil at fedoraproject.org  Mon Sep  8 15:48:54 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon,  8 Sep 2008 15:48:54 +0000 (UTC)
Subject: common Makefile.common,1.110,1.111
Message-ID: <20080908154854.1A16D70128@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32713

Modified Files:
	Makefile.common 
Log Message:
remove force-tag



Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- Makefile.common	13 Aug 2008 21:02:19 -0000	1.110
+++ Makefile.common	8 Sep 2008 15:48:23 -0000	1.111
@@ -183,7 +183,7 @@
 PREP_ARCHES	= $(addprefix prep-,$(ARCHES))
 
 ## list all our bogus targets
-.PHONY :: $(ARCHES) sources uploadsource upload export check build-check plague koji build cvsurl chain-build test-srpm srpm tag force-tag verrel new clean patch prep compile install install-short compile-short FORCE local scratch-build scratch-build-% 
+.PHONY :: $(ARCHES) sources uploadsource upload export check build-check plague koji build cvsurl chain-build test-srpm srpm tag verrel new clean patch prep compile install install-short compile-short FORCE local scratch-build scratch-build-% 
 
 # The TARGETS define is meant for local module targets that should be
 # made in addition to the SOURCEFILES whenever needed
@@ -407,9 +407,6 @@
 	@echo "Tagged with: $(TAG)"
 	@echo
 
-force-tag: $(SPECFILE) $(COMMON_DIR)/branches
-	@$(MAKE) tag TAG_OPTS="-F $(TAG_OPTS)"
-
 define find-user
 if [ `cat CVS/Root |grep -c [^:]@` -ne 0 ]; then cat CVS/Root  |cut -d @ -f 1 |  sed 's/:.*://' ; else echo $(USER); fi
 endef



From pkgdb at fedoraproject.org  Mon Sep  8 15:48:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:48:38 +0000
Subject: [pkgdb] gprolog had acl change status
Message-ID: <20080908154838.43A59208DA7@bastion.fedora.phx.redhat.com>

s4504kr has set the commit acl on gprolog (Fedora devel) to Approved for bagnara

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gprolog



From pkgdb at fedoraproject.org  Mon Sep  8 15:48:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 15:48:41 +0000
Subject: [pkgdb] gprolog had acl change status
Message-ID: <20080908154841.78974208DAB@bastion.fedora.phx.redhat.com>

s4504kr has set the watchbugzilla acl on gprolog (Fedora devel) to Approved for bagnara

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gprolog



From mcepl at fedoraproject.org  Mon Sep  8 15:51:31 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Mon,  8 Sep 2008 15:51:31 +0000 (UTC)
Subject: rpms/JSDoc/devel JSDoc.spec,1.3,1.4
Message-ID: <20080908155131.D9EB370128@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/JSDoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1578

Modified Files:
	JSDoc.spec 
Log Message:
fix bug 454075 -- add compatibility Requires


Index: JSDoc.spec
===================================================================
RCS file: /cvs/extras/rpms/JSDoc/devel/JSDoc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JSDoc.spec	14 Jul 2008 15:39:44 -0000	1.3
+++ JSDoc.spec	8 Sep 2008 15:51:01 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           JSDoc
 Version:        1.10.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Produces javadoc-style documentation from JavaScript sourcefiles
 Group:          Development/Tools
 # No license attribution in code, only COPYING.
@@ -12,6 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(HTML::Template)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 A script that produces javadoc-style documentation from
@@ -55,6 +56,9 @@
 %{_datadir}/jsdoc
 
 %changelog
+* Mon Sep 08 2008 Mat??j Cepl <mcepl at redhat.com> 1.10.2-6
+- add compatibility perl requirements (Close: bug 454075).
+
 * Mon Jul 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.10.2-5
 - fix license tag
 



From wtogami at fedoraproject.org  Mon Sep  8 15:51:33 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon,  8 Sep 2008 15:51:33 +0000 (UTC)
Subject: rpms/fedora-release/F-8 fedora-release.spec, 1.67, 1.68 sources,
	1.55, 1.56
Message-ID: <20080908155133.72C1570128@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/fedora-release/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1551

Modified Files:
	fedora-release.spec sources 
Log Message:
transition into new key for Fedora 8 and 9



Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/F-8/fedora-release.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- fedora-release.spec	12 Dec 2007 21:23:44 -0000	1.67
+++ fedora-release.spec	8 Sep 2008 15:51:03 -0000	1.68
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	8
-Release:	5
+Release:	6.transition
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -84,6 +84,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Mon Sep 08 2008 Warren Togami <wtogami at redhat.com> - 8-6
+- transition into new key for Fedora 8 and 9
+
 * Wed Dec 12 2007 Jesse Keating <jkeating at redhat.com> - 8-5
 - Change the urls in the compose configs to point to Fedora 8, not rawhide.
 - Remove the "core" from updates-testing-source


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/F-8/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	12 Dec 2007 21:23:44 -0000	1.55
+++ sources	8 Sep 2008 15:51:03 -0000	1.56
@@ -1 +1 @@
-d2721417f5ebaac10712e69a7864183d  fedora-release-8.tar.gz
+61e7b697df96552c92be69287bd185c2  fedora-release-8.tar.gz



From mcepl at fedoraproject.org  Mon Sep  8 15:55:25 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Mon,  8 Sep 2008 15:55:25 +0000 (UTC)
Subject: rpms/JSDoc/F-9 JSDoc.spec,1.2,1.3
Message-ID: <20080908155525.EC46A700FD@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/JSDoc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3053

Modified Files:
	JSDoc.spec 
Log Message:
fix bug 454075 -- add compatibility Requires


Index: JSDoc.spec
===================================================================
RCS file: /cvs/extras/rpms/JSDoc/F-9/JSDoc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JSDoc.spec	25 Jul 2007 12:35:30 -0000	1.2
+++ JSDoc.spec	8 Sep 2008 15:54:55 -0000	1.3
@@ -1,9 +1,9 @@
 Name:           JSDoc
 Version:        1.10.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Produces javadoc-style documentation from JavaScript sourcefiles
 Group:          Development/Tools
-License:        GPL
+License:        GPL+
 URL:            http://jsdoc.sourceforge.net
 Source0:        http://downloads.sourceforge.net/jsdoc/%{name}-%{version}.tgz
 Source1:        %{name}-COPYING.txt.gz
@@ -11,6 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(HTML::Template)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 A script that produces javadoc-style documentation from
@@ -54,6 +55,9 @@
 %{_datadir}/jsdoc
 
 %changelog
+* Mon Sep 08 2008 Mat??j Cepl <mcepl at redhat.com> 1.10.2-5.fc9
+- adding perl compatiblity Requires (close bug 454075).
+
 * Sun Jul  1 2007 Matej Cepl <mcepl at redhat.com> - 1.10.2-4
 - Administrative increase of the release in order to overcome screwed up tagging in Fedora CVS.
 



From mschwendt at fedoraproject.org  Mon Sep  8 15:56:39 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon,  8 Sep 2008 15:56:39 +0000 (UTC)
Subject: extras-buildsys/server DBManager.py,1.1.2.2.4.3,1.1.2.2.4.4
Message-ID: <20080908155639.0FE14700FD@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/server
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3818/server

Modified Files:
      Tag: Plague-0_4_5
	DBManager.py 
Log Message:
release 0.4.5.5 : db engine init fixes


Index: DBManager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/DBManager.py,v
retrieving revision 1.1.2.2.4.3
retrieving revision 1.1.2.2.4.4
diff -u -r1.1.2.2.4.3 -r1.1.2.2.4.4
--- DBManager.py	7 Sep 2008 17:05:46 -0000	1.1.2.2.4.3
+++ DBManager.py	8 Sep 2008 15:56:38 -0000	1.1.2.2.4.4
@@ -302,7 +302,7 @@
 
         if not self._db_engine_class:
             print "Error: database engine '%s' could not be loaded.  " \
-                    "Perhaps you need the python module for it?" % engine
+                    "Perhaps you need the python module for it?" % self.engine
             os._exit(1)
 
         print "Using database engine %s." % self.engine
@@ -361,7 +361,7 @@
         # Rename columns in jobs table, because `RELEASE` is a new
         # reserved keyword in MySQL 5, and the quote character is
         # different for Postgresql.
-        for i in range(len(curs.description)):
+        for i in range(len(curs.description or [])):
             if curs.description[i][0].upper() == 'RELEASE':
                 if self.engine == 'mysql':
                     curs.execute('ALTER TABLE jobs CHANGE `release` rpm_release VARCHAR(25);')



From mcpierce at fedoraproject.org  Mon Sep  8 15:56:49 2008
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Mon,  8 Sep 2008 15:56:49 +0000 (UTC)
Subject: rpms/rubygem-cobbler/devel rubygem-cobbler.spec,1.1,1.2
Message-ID: <20080908155649.5BE32700FD@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-cobbler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3490

Modified Files:
	rubygem-cobbler.spec 
Log Message:
Fix for missing gem in the build environment. The tag was made before the sources
were uploaded, so bumping release numbers was the only way around the problem.



Index: rubygem-cobbler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cobbler/devel/rubygem-cobbler.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rubygem-cobbler.spec	8 Sep 2008 14:27:23 -0000	1.1
+++ rubygem-cobbler.spec	8 Sep 2008 15:56:18 -0000	1.2
@@ -8,7 +8,7 @@
 Summary: 	An interface for interacting with a Cobbler server
 Name: 		rubygem-%{gemname}
 Version: 	0.1.0
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Group: 		Development/Languages
 License: 	LGPLv2+
 URL: 		http://cobbler.et.redhat.com/
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Mon Sep 08 2008 Darryl Pierce <dpierce at redhat.com> - 0.1.0-2
+- Fix for broken build that was not finding the gem.
+
 * Mon Sep 08 2008 Darryl Pierce <dpierce at redhat.com> - 0.1.0-1
 - First official build for Fedora.
 



From mschwendt at fedoraproject.org  Mon Sep  8 15:57:08 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon,  8 Sep 2008 15:57:08 +0000 (UTC)
Subject: extras-buildsys ChangeLog, 1.126.2.44.2.1.2.26,
	1.126.2.44.2.1.2.27 plague.spec, 1.27.2.5.2.1.2.7, 1.27.2.5.2.1.2.8
Message-ID: <20080908155708.CE334700FD@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3818

Modified Files:
      Tag: Plague-0_4_5
	ChangeLog plague.spec 
Log Message:
release 0.4.5.5 : db engine init fixes


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.44.2.1.2.26
retrieving revision 1.126.2.44.2.1.2.27
diff -u -r1.126.2.44.2.1.2.26 -r1.126.2.44.2.1.2.27
--- ChangeLog	7 Sep 2008 22:16:43 -0000	1.126.2.44.2.1.2.26
+++ ChangeLog	8 Sep 2008 15:56:38 -0000	1.126.2.44.2.1.2.27
@@ -1,3 +1,11 @@
+2008-09-08  Michael Schwendt <mschwendt at fedoraproject.org>
+
+	* Release of 0.4.5.5
+	
+	* server/DBManager.py
+	  - Fix column rename if no tables exist.
+	  - Fix traceback in db engine not found error message.
+
 2008-09-07  Michael Schwendt <mschwendt at fedoraproject.org>
 
 	* Release of 0.4.5.4


Index: plague.spec
===================================================================
RCS file: /cvs/fedora/extras-buildsys/plague.spec,v
retrieving revision 1.27.2.5.2.1.2.7
retrieving revision 1.27.2.5.2.1.2.8
diff -u -r1.27.2.5.2.1.2.7 -r1.27.2.5.2.1.2.8
--- plague.spec	7 Sep 2008 22:16:43 -0000	1.27.2.5.2.1.2.7
+++ plague.spec	8 Sep 2008 15:56:38 -0000	1.27.2.5.2.1.2.8
@@ -2,7 +2,7 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.4
+Version: 0.4.5.5
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools



From mschwendt at fedoraproject.org  Mon Sep  8 16:01:13 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon,  8 Sep 2008 16:01:13 +0000 (UTC)
Subject: rpms/plague/devel .cvsignore, 1.16, 1.17 plague.spec, 1.39,
	1.40 sources, 1.30, 1.31
Message-ID: <20080908160113.EA67B700FD@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5328

Modified Files:
	.cvsignore plague.spec sources 
Log Message:
* Mon Sep  8 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.5-1
- update to 0.4.5.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	8 Sep 2008 09:43:50 -0000	1.16
+++ .cvsignore	8 Sep 2008 16:00:43 -0000	1.17
@@ -1,2 +1,2 @@
-plague-0.4.5.4.tar.bz2.asc
-plague-0.4.5.4.tar.bz2
+plague-0.4.5.5.tar.bz2
+plague-0.4.5.5.tar.bz2.asc


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/plague.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- plague.spec	8 Sep 2008 09:43:50 -0000	1.39
+++ plague.spec	8 Sep 2008 16:00:43 -0000	1.40
@@ -2,7 +2,7 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.4
+Version: 0.4.5.5
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.5-1
+- update to 0.4.5.5
+
 * Sun Sep 07 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.4-1
 - update to 0.4.5.4 to make it work with MySQL 5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	8 Sep 2008 09:43:50 -0000	1.30
+++ sources	8 Sep 2008 16:00:43 -0000	1.31
@@ -1,2 +1,2 @@
-d36e365db56ebecb04ef6a8aaa7e8c54  plague-0.4.5.4.tar.bz2.asc
-9378f9f0344cd8ffb474c9e6af4b3cc4  plague-0.4.5.4.tar.bz2
+0c8a5cffe1352c5f5dbde2c9b35a9189  plague-0.4.5.5.tar.bz2
+768e60b5fcc71fde881e86da23abfddf  plague-0.4.5.5.tar.bz2.asc



From pkgdb at fedoraproject.org  Mon Sep  8 16:03:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:03:14 +0000
Subject: [pkgdb] tinyxml ownership updated
Message-ID: <20080908160314.EA60220876E@bastion.fedora.phx.redhat.com>

Package tinyxml in Fedora devel is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tinyxml



From pkgdb at fedoraproject.org  Mon Sep  8 16:03:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:03:24 +0000
Subject: [pkgdb] tinyxml ownership updated
Message-ID: <20080908160325.08588208D0F@bastion.fedora.phx.redhat.com>

Package tinyxml in Fedora 9 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tinyxml



From pkgdb at fedoraproject.org  Mon Sep  8 16:03:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:03:20 +0000
Subject: [pkgdb] tinyxml ownership updated
Message-ID: <20080908160320.6089A208771@bastion.fedora.phx.redhat.com>

Package tinyxml in Fedora 8 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tinyxml



From wtogami at fedoraproject.org  Mon Sep  8 16:04:17 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon,  8 Sep 2008 16:04:17 +0000 (UTC)
Subject: rpms/fedora-release/F-9 fedora-release.spec,1.70,1.71
Message-ID: <20080908160417.9B76E700FD@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/fedora-release/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6410

Modified Files:
	fedora-release.spec 
Log Message:
transition state between old and new key



Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/F-9/fedora-release.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- fedora-release.spec	25 Jun 2008 21:53:52 -0000	1.70
+++ fedora-release.spec	8 Sep 2008 16:03:47 -0000	1.71
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	9
-Release:	3
+Release:	4.transition
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -53,6 +53,14 @@
 done
 ln -s RPM-GPG-KEY-fedora-primary RPM-GPG-KEY-fedora
 ln -s RPM-GPG-KEY-fedora-test-primary RPM-GPG-KEY-fedora-test
+# Do the same for newkey
+for arch in i386 x86_64 ppc ppc64
+  do
+  ln -s RPM-GPG-KEY-fedora-8-and-9-primary      RPM-GPG-KEY-fedora-8-and-9-$arch
+  ln -s RPM-GPG-KEY-fedora-test-8-and-9-primary RPM-GPG-KEY-fedora-test-8-and-9-$arch
+done
+ln -s RPM-GPG-KEY-fedora-8-and-9-primary      RPM-GPG-KEY-fedora-8-and-9
+ln -s RPM-GPG-KEY-fedora-test-8-and-9-primary RPM-GPG-KEY-fedora-test-8-and-9
 popd
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
@@ -96,6 +104,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Fri Sep 05 2008 Warren Togami <wtogami at redhat.com> - 9-4.transition
+- transition state between old and new key
+
 * Wed Jun 25 2008 Jesse Keating <jkeating at redhat.com> - 9-3
 - Add ia64 key
 - Fix config file markings



From pkgdb at fedoraproject.org  Mon Sep  8 16:04:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:04:40 +0000
Subject: [pkgdb] arj had group_acl changed
Message-ID: <20080908160440.B2BCD208D0F@bastion.fedora.phx.redhat.com>

robert has set the commit acl on arj (Fedora EPEL 4) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 16:04:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:04:34 +0000
Subject: [pkgdb] arj had group_acl changed
Message-ID: <20080908160434.854B2208770@bastion.fedora.phx.redhat.com>

robert has set the commit acl on arj (Fedora devel) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 16:04:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:04:41 +0000
Subject: [pkgdb] arj had group_acl changed
Message-ID: <20080908160441.B688A208D97@bastion.fedora.phx.redhat.com>

robert has set the commit acl on arj (Fedora EPEL 5) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 16:04:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:04:43 +0000
Subject: [pkgdb] arj had group_acl changed
Message-ID: <20080908160443.EAB92208D9A@bastion.fedora.phx.redhat.com>

robert has set the commit acl on arj (Fedora 8) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Mon Sep  8 16:04:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:04:47 +0000
Subject: [pkgdb] arj had group_acl changed
Message-ID: <20080908160447.4C90120876E@bastion.fedora.phx.redhat.com>

robert has set the commit acl on arj (Fedora 9) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From mschwendt at fedoraproject.org  Mon Sep  8 16:05:13 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon,  8 Sep 2008 16:05:13 +0000 (UTC)
Subject: rpms/plague/EL-5 .cvsignore, 1.12, 1.13 plague.spec, 1.31,
	1.32 sources, 1.28, 1.29
Message-ID: <20080908160513.BE1F9700FD@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6943/EL-5

Modified Files:
	.cvsignore plague.spec sources 
Log Message:
sync with rawhide, 0.4.5.5-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plague/EL-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	5 Sep 2008 09:45:07 -0000	1.12
+++ .cvsignore	8 Sep 2008 16:04:43 -0000	1.13
@@ -1,2 +1,2 @@
-plague-0.4.5.3.tar.bz2
-plague-0.4.5.3.tar.bz2.asc
+plague-0.4.5.5.tar.bz2
+plague-0.4.5.5.tar.bz2.asc


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/EL-5/plague.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- plague.spec	5 Sep 2008 09:45:07 -0000	1.31
+++ plague.spec	8 Sep 2008 16:04:43 -0000	1.32
@@ -2,7 +2,7 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.3
+Version: 0.4.5.5
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -165,6 +165,15 @@
 
 
 %changelog
+* Mon Sep  8 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.5-1
+- update to 0.4.5.5
+
+* Sun Sep 07 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.4-1
+- update to 0.4.5.4 to make it work with MySQL 5
+
+* Sun Sep  7 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-2
+- fix mod_user in plague-user-manager for sqlite2/3
+
 * Fri Sep  5 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-1
 - update to 0.4.5.3 for sqlite2 compatibility fixes for Fedora
 - merge fedora pkg spec changes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/EL-5/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	5 Sep 2008 09:45:07 -0000	1.28
+++ sources	8 Sep 2008 16:04:43 -0000	1.29
@@ -1,2 +1,2 @@
-f9206fd27a4dbfba267eb149c1ed2a59  plague-0.4.5.3.tar.bz2
-285927a5b904db9f039958792de254fd  plague-0.4.5.3.tar.bz2.asc
+0c8a5cffe1352c5f5dbde2c9b35a9189  plague-0.4.5.5.tar.bz2
+768e60b5fcc71fde881e86da23abfddf  plague-0.4.5.5.tar.bz2.asc



From mschwendt at fedoraproject.org  Mon Sep  8 16:05:13 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon,  8 Sep 2008 16:05:13 +0000 (UTC)
Subject: rpms/plague/F-9 .cvsignore, 1.12, 1.13 plague.spec, 1.37,
	1.38 sources, 1.29, 1.30 plague-0.4.5.3-mod_user.patch, 1.1, NONE
Message-ID: <20080908160513.0268D700FD@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6943/F-9

Modified Files:
	.cvsignore plague.spec sources 
Removed Files:
	plague-0.4.5.3-mod_user.patch 
Log Message:
sync with rawhide, 0.4.5.5-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	5 Sep 2008 09:45:07 -0000	1.12
+++ .cvsignore	8 Sep 2008 16:04:42 -0000	1.13
@@ -1,2 +1,2 @@
-plague-0.4.5.3.tar.bz2
-plague-0.4.5.3.tar.bz2.asc
+plague-0.4.5.5.tar.bz2
+plague-0.4.5.5.tar.bz2.asc


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-9/plague.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- plague.spec	7 Sep 2008 10:48:16 -0000	1.37
+++ plague.spec	8 Sep 2008 16:04:42 -0000	1.38
@@ -2,13 +2,12 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.3
-Release: 2%{?dist}
+Version: 0.4.5.5
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 #Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
 Source: %{name}-%{version}.tar.bz2
-Patch0: plague-0.4.5.3-mod_user.patch
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
@@ -80,7 +79,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .user_mod
 
 
 %build
@@ -167,6 +165,12 @@
 
 
 %changelog
+* Mon Sep  8 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.5-1
+- update to 0.4.5.5
+
+* Sun Sep 07 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.4-1
+- update to 0.4.5.4 to make it work with MySQL 5
+
 * Sun Sep  7 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-2
 - fix mod_user in plague-user-manager for sqlite2/3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-9/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	5 Sep 2008 09:45:07 -0000	1.29
+++ sources	8 Sep 2008 16:04:42 -0000	1.30
@@ -1,2 +1,2 @@
-f9206fd27a4dbfba267eb149c1ed2a59  plague-0.4.5.3.tar.bz2
-285927a5b904db9f039958792de254fd  plague-0.4.5.3.tar.bz2.asc
+0c8a5cffe1352c5f5dbde2c9b35a9189  plague-0.4.5.5.tar.bz2
+768e60b5fcc71fde881e86da23abfddf  plague-0.4.5.5.tar.bz2.asc


--- plague-0.4.5.3-mod_user.patch DELETED ---



From mschwendt at fedoraproject.org  Mon Sep  8 16:05:13 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon,  8 Sep 2008 16:05:13 +0000 (UTC)
Subject: rpms/plague/F-8 .cvsignore, 1.12, 1.13 plague.spec, 1.37,
	1.38 sources, 1.29, 1.30 plague-0.4.5.3-mod_user.patch, 1.1, NONE
Message-ID: <20080908160513.59B3D700FD@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6943/F-8

Modified Files:
	.cvsignore plague.spec sources 
Removed Files:
	plague-0.4.5.3-mod_user.patch 
Log Message:
sync with rawhide, 0.4.5.5-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-8/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	5 Sep 2008 09:45:07 -0000	1.12
+++ .cvsignore	8 Sep 2008 16:04:42 -0000	1.13
@@ -1,2 +1,2 @@
-plague-0.4.5.3.tar.bz2
-plague-0.4.5.3.tar.bz2.asc
+plague-0.4.5.5.tar.bz2
+plague-0.4.5.5.tar.bz2.asc


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-8/plague.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- plague.spec	7 Sep 2008 10:48:17 -0000	1.37
+++ plague.spec	8 Sep 2008 16:04:43 -0000	1.38
@@ -2,13 +2,12 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.3
-Release: 2%{?dist}
+Version: 0.4.5.5
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 #Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
 Source: %{name}-%{version}.tar.bz2
-Patch0: plague-0.4.5.3-mod_user.patch
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
@@ -80,7 +79,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .user_mod
 
 
 %build
@@ -167,6 +165,12 @@
 
 
 %changelog
+* Mon Sep  8 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.5-1
+- update to 0.4.5.5
+
+* Sun Sep 07 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.4-1
+- update to 0.4.5.4 to make it work with MySQL 5
+
 * Sun Sep  7 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.3-2
 - fix mod_user in plague-user-manager for sqlite2/3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-8/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	5 Sep 2008 09:45:07 -0000	1.29
+++ sources	8 Sep 2008 16:04:43 -0000	1.30
@@ -1,2 +1,2 @@
-f9206fd27a4dbfba267eb149c1ed2a59  plague-0.4.5.3.tar.bz2
-285927a5b904db9f039958792de254fd  plague-0.4.5.3.tar.bz2.asc
+0c8a5cffe1352c5f5dbde2c9b35a9189  plague-0.4.5.5.tar.bz2
+768e60b5fcc71fde881e86da23abfddf  plague-0.4.5.5.tar.bz2.asc


--- plague-0.4.5.3-mod_user.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Sep  8 16:05:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:05:18 +0000
Subject: [pkgdb] libogg ownership updated
Message-ID: <20080908160518.7F488208D9E@bastion.fedora.phx.redhat.com>

Package libogg in Fedora devel is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libogg



From pkgdb at fedoraproject.org  Mon Sep  8 16:05:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:05:28 +0000
Subject: [pkgdb] libogg ownership updated
Message-ID: <20080908160528.3F0CA208DB3@bastion.fedora.phx.redhat.com>

Package libogg in Fedora 8 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libogg



From pkgdb at fedoraproject.org  Mon Sep  8 16:05:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:05:34 +0000
Subject: [pkgdb] libogg ownership updated
Message-ID: <20080908160534.47610208DBA@bastion.fedora.phx.redhat.com>

Package libogg in Fedora 9 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libogg



From pkgdb at fedoraproject.org  Mon Sep  8 16:06:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:06:15 +0000
Subject: [pkgdb] libao ownership updated
Message-ID: <20080908160615.679FC208DA2@bastion.fedora.phx.redhat.com>

Package libao in Fedora devel is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libao



From pkgdb at fedoraproject.org  Mon Sep  8 16:06:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:06:29 +0000
Subject: [pkgdb] libao ownership updated
Message-ID: <20080908160629.62B13208DAC@bastion.fedora.phx.redhat.com>

Package libao in Fedora 8 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libao



From pkgdb at fedoraproject.org  Mon Sep  8 16:06:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:06:35 +0000
Subject: [pkgdb] libao ownership updated
Message-ID: <20080908160635.6E58F208DC4@bastion.fedora.phx.redhat.com>

Package libao in Fedora 9 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libao



From rdieter at fedoraproject.org  Mon Sep  8 16:13:30 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  8 Sep 2008 16:13:30 +0000 (UTC)
Subject: rpms/qt/devel qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch, 
	NONE, 1.1 qt-x11-opensource-src-4.2.2-multilib-optflags.patch,
	NONE, 1.1 .cvsignore, 1.37, 1.38 qt.spec, 1.207, 1.208 sources,
	1.38, 1.39 qt-x11-opensource-src-4.2.2-multilib.patch, 1.1, NONE
Message-ID: <20080908161330.46142700FD@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10159

Modified Files:
	.cvsignore qt.spec sources 
Added Files:
	qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch 
	qt-x11-opensource-src-4.2.2-multilib-optflags.patch 
Removed Files:
	qt-x11-opensource-src-4.2.2-multilib.patch 
Log Message:
* Mon Sep 08 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.4.1-3
- apply QMAKEPATH portion of multilib patch only if needed
- qt-copy-patches-20080908


qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch:

--- NEW FILE qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch ---
--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf	2007-02-26 15:01:02.000000000 -0600
@@ -14,6 +14,8 @@
 QMAKE_CFLAGS		= -m64
 QMAKE_LFLAGS		= -m64
 
+QMAKE_CFLAGS_RELEASE	+= -O2
+
 include(../common/g++.conf)
 include(../common/linux.conf)
 
--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf	2007-02-26 15:01:34.000000000 -0600
@@ -11,6 +11,8 @@
 QMAKE_CFLAGS		= -m32
 QMAKE_LFLAGS		= -m32
 
+QMAKE_CFLAGS_RELEASE	+= -O2
+
 include(../common/g++.conf)
 include(../common/linux.conf)
 load(qt_config)
--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf	2007-02-26 15:01:26.000000000 -0600
@@ -8,6 +8,8 @@
 QT			+= core gui
 QMAKE_INCREMENTAL_STYLE = sublib
 
+QMAKE_CFLAGS_RELEASE	+= -O2
+
 include(../common/g++.conf)
 include(../common/linux.conf)
 load(qt_config)
--- qt-x11-opensource-src-4.2.2/qmake/project.cpp.QMAKEPATH	2006-11-27 11:26:03.000000000 -0600
+++ qt-x11-opensource-src-4.2.2/qmake/project.cpp	2007-02-26 13:45:39.000000000 -0600
@@ -498,6 +498,7 @@
             ret << ((*it) + concat);
     }
     ret << QLibraryInfo::location(QLibraryInfo::DataPath) + concat;
+    ret << QLibraryInfo::location(QLibraryInfo::PrefixPath) + concat;
 
     return ret;
 }

qt-x11-opensource-src-4.2.2-multilib-optflags.patch:

--- NEW FILE qt-x11-opensource-src-4.2.2-multilib-optflags.patch ---
--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf	2007-02-26 15:01:02.000000000 -0600
@@ -14,6 +14,8 @@
 QMAKE_CFLAGS		= -m64
 QMAKE_LFLAGS		= -m64
 
+QMAKE_CFLAGS_RELEASE	+= -O2
+
 include(../common/g++.conf)
 include(../common/linux.conf)
 
--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf	2007-02-26 15:01:34.000000000 -0600
@@ -11,6 +11,8 @@
 QMAKE_CFLAGS		= -m32
 QMAKE_LFLAGS		= -m32
 
+QMAKE_CFLAGS_RELEASE	+= -O2
+
 include(../common/g++.conf)
 include(../common/linux.conf)
 load(qt_config)
--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf	2007-02-26 15:01:26.000000000 -0600
@@ -8,6 +8,8 @@
 QT			+= core gui
 QMAKE_INCREMENTAL_STYLE = sublib
 
+QMAKE_CFLAGS_RELEASE	+= -O2
+
 include(../common/g++.conf)
 include(../common/linux.conf)
 load(qt_config)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	6 Aug 2008 13:16:13 -0000	1.37
+++ .cvsignore	8 Sep 2008 16:12:59 -0000	1.38
@@ -1,4 +1,4 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.4.1.tar.bz2
-qt-copy-patches-20080805svn.tar.bz2
+qt-copy-patches-20080908svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- qt.spec	6 Aug 2008 13:10:37 -0000	1.207
+++ qt.spec	8 Sep 2008 16:12:59 -0000	1.208
@@ -9,7 +9,7 @@
 Name:    qt4
 %endif
 Version: 4.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -30,7 +30,8 @@
 Source5: qconfig-multilib.h
 
 # multilib hacks 
-Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
+Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch
+Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch
 Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch
 # kill hardcoded font substitutions (#447298)
 Patch8: qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch
@@ -40,7 +41,7 @@
 Patch10: qt-x11-opensource-src-4.4.1-systray.patch
 
 ## qt-copy patches
-%define qt_copy 20080805
+%define qt_copy 20080908
 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}}
@@ -269,12 +270,19 @@
 %setup -q -n qt-x11-opensource-src-%{version}%{?pre} %{?qt_copy:-a 2}
 
 %if 0%{?qt_copy:1}
+# Mac(?)-specific, doesn't apply
+echo "0242" >> patches/DISABLED
+# already(?) applied to 4.4.1
+echo "0244" >> patches/DISABLED
 test -x apply_patches && ./apply_patches
 %endif
 
 # don't use -b on mkspec files, else they get installed too.
 # multilib hacks no longer required
 %patch2 -p1
+%if "%{_qt4_datadir}" != "%{_qt4_prefix}"
+%patch3 -p1 -b .multilib-QMAKEPATH
+%endif
 %patch5 -p1 -b .bz#437440-as_IN-437440
 %patch8 -p1 -b .font-aliases
 %patch9 -p1 -b .qgtkstyle
@@ -726,6 +734,10 @@
 
 
 %changelog
+* Mon Sep 08 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.4.1-3
+- apply QMAKEPATH portion of multilib patch only if needed
+- qt-copy-patches-20080908
+
 * Wed Aug 06 2008 Than Ngo <than at redhat.com> -  4.4.1-2
 - fix license tag
 - fix Obsoletes: qt-sqlite (missing epoch)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	5 Aug 2008 13:16:19 -0000	1.38
+++ sources	8 Sep 2008 16:12:59 -0000	1.39
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 a94a6f5ef01598bb9980891f2515ff45  qt-x11-opensource-src-4.4.1.tar.bz2
-21597a6486886398a7b771d240ad346b  qt-copy-patches-20080805svn.tar.bz2
+ab07c997ab770a4b2c5f8838b7fb4a0e  qt-copy-patches-20080908svn.tar.bz2


--- qt-x11-opensource-src-4.2.2-multilib.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Sep  8 16:15:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:15:30 +0000
Subject: [pkgdb] xorg-x11-apps had acl change status
Message-ID: <20080908161531.29481208D07@bastion.fedora.phx.redhat.com>

ajax has set the watchcommits acl on xorg-x11-apps (Fedora devel) to Approved for whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-apps



From pkgdb at fedoraproject.org  Mon Sep  8 16:15:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:15:32 +0000
Subject: [pkgdb] xorg-x11-apps had acl change status
Message-ID: <20080908161533.30B00208D9C@bastion.fedora.phx.redhat.com>

ajax has set the commit acl on xorg-x11-apps (Fedora devel) to Approved for whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-apps



From pkgdb at fedoraproject.org  Mon Sep  8 16:15:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:15:33 +0000
Subject: [pkgdb] xorg-x11-apps had group_acl changed
Message-ID: <20080908161533.9C3FB208DA1@bastion.fedora.phx.redhat.com>

ajax has set the commit acl on xorg-x11-apps (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-apps



From mclasen at fedoraproject.org  Mon Sep  8 16:15:34 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 16:15:34 +0000 (UTC)
Subject: rpms/devhelp/devel .cvsignore, 1.19, 1.20 devhelp.spec, 1.91,
	1.92 sources, 1.19, 1.20
Message-ID: <20080908161534.18A90700FD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/devhelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11092

Modified Files:
	.cvsignore devhelp.spec sources 
Log Message:
0.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/devhelp/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	26 May 2008 16:28:09 -0000	1.19
+++ .cvsignore	8 Sep 2008 16:15:03 -0000	1.20
@@ -1 +1 @@
-devhelp-0.19.1.tar.bz2
+devhelp-0.20.tar.bz2


Index: devhelp.spec
===================================================================
RCS file: /cvs/extras/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- devhelp.spec	23 Jul 2008 20:58:10 -0000	1.91
+++ devhelp.spec	8 Sep 2008 16:15:03 -0000	1.92
@@ -6,14 +6,13 @@
 ### Abstract ###
 
 Name: devhelp
-Version: 0.19.1
-Release: 3%{?dist}
+Version: 0.20
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API document browser
 URL: http://developer.imendio.com/projects/devhelp
-Source: http://download.gnome.org/sources/devhelp/0.19/devhelp-%{version}.tar.bz2
-Patch:  devhelp-0.19-xulrunner.patch
+Source: http://download.gnome.org/sources/devhelp/0.20/devhelp-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/devhelp-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ### Dependencies ###
@@ -51,7 +50,6 @@
 
 %prep
 %setup -q -n devhelp-%{version}
-%patch -p1 -b .xulrunner
 
 %build
 %configure --disable-static
@@ -135,6 +133,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 0.20-1
+- Update to 0.20
+
 * Wed Jul 23 2008 Christopher Aillon <caillon at redhat.com> - 0.19.1-3
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/devhelp/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	26 May 2008 16:28:09 -0000	1.19
+++ sources	8 Sep 2008 16:15:03 -0000	1.20
@@ -1 +1 @@
-6c12a272a94ac9cfc1dc6234590b46d8  devhelp-0.19.1.tar.bz2
+ce24246fc62a8bf146205584aa7e4eea  devhelp-0.20.tar.bz2



From caolanm at fedoraproject.org  Mon Sep  8 16:16:59 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  8 Sep 2008 16:16:59 +0000 (UTC)
Subject: rpms/hunspell-is/devel hunspell-is.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080908161659.41193700FD@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-is/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11663/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-is.spec import.log 
Log Message:



--- NEW FILE hunspell-is.spec ---
Name: hunspell-is
Summary: Icelandic hunspell dictionaries
%define upstreamid 20060928
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://hunspell.sourceforge.net/is_IS.zip
Group: Applications/Text
URL: http://wiki.services.openoffice.org/wiki/Dictionaries#Icelandic_.28Iceland.29
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv2+
BuildArch: noarch

Requires: hunspell

%description
Icelandic hunspell dictionaries.

%prep
%setup -q -c -n hunspell-is

%build
chmod -x *
iconv -f ISO-8859-1 -t UTF-8 README_is_IS.txt > README_is_IS.txt.new
mv -f README_is_IS.txt.new README_is_IS.txt

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_is_IS.txt
%{_datadir}/myspell/*

%changelog
* Wed Sep 03 2006 Caolan McNamara <caolanm at redhat.com> - 0.20060928-1
- initial version


--- NEW FILE import.log ---
hunspell-is-0_20060928-1_fc9:HEAD:hunspell-is-0.20060928-1.fc9.src.rpm:1220890538


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-is/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 15:18:22 -0000	1.1
+++ .cvsignore	8 Sep 2008 16:16:28 -0000	1.2
@@ -0,0 +1 @@
+is_IS.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-is/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 15:18:22 -0000	1.1
+++ sources	8 Sep 2008 16:16:28 -0000	1.2
@@ -0,0 +1 @@
+81ed5481a9ceaf10923d92c37d303a43  is_IS.zip



From pkgdb at fedoraproject.org  Mon Sep  8 16:20:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:20:04 +0000
Subject: [pkgdb] childsplay: pbrady has requested watchbugzilla
Message-ID: <20080908162004.453F0208770@bastion.fedora.phx.redhat.com>

pbrady has requested the watchbugzilla acl on childsplay (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay



From pkgdb at fedoraproject.org  Mon Sep  8 16:20:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:20:10 +0000
Subject: [pkgdb] childsplay: pbrady has requested watchcommits
Message-ID: <20080908162010.6444C208D0F@bastion.fedora.phx.redhat.com>

pbrady has requested the watchcommits acl on childsplay (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay



From pkgdb at fedoraproject.org  Mon Sep  8 16:20:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:20:16 +0000
Subject: [pkgdb] childsplay: pbrady has requested commit
Message-ID: <20080908162017.8C4F6208D97@bastion.fedora.phx.redhat.com>

pbrady has requested the commit acl on childsplay (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay



From pkgdb at fedoraproject.org  Mon Sep  8 16:20:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:20:18 +0000
Subject: [pkgdb] childsplay: pbrady has requested approveacls
Message-ID: <20080908162018.6C075208D9A@bastion.fedora.phx.redhat.com>

pbrady has requested the approveacls acl on childsplay (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay



From pkgdb at fedoraproject.org  Mon Sep  8 16:21:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:21:38 +0000
Subject: [pkgdb] childsplay_plugins: pbrady has requested watchbugzilla
Message-ID: <20080908162138.651C0208771@bastion.fedora.phx.redhat.com>

pbrady has requested the watchbugzilla acl on childsplay_plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay_plugins



From pkgdb at fedoraproject.org  Mon Sep  8 16:21:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:21:40 +0000
Subject: [pkgdb] childsplay_plugins: pbrady has requested watchcommits
Message-ID: <20080908162140.D71E0208D0F@bastion.fedora.phx.redhat.com>

pbrady has requested the watchcommits acl on childsplay_plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay_plugins



From pkgdb at fedoraproject.org  Mon Sep  8 16:21:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:21:43 +0000
Subject: [pkgdb] childsplay_plugins: pbrady has requested commit
Message-ID: <20080908162143.AEAB5208D97@bastion.fedora.phx.redhat.com>

pbrady has requested the commit acl on childsplay_plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay_plugins



From pkgdb at fedoraproject.org  Mon Sep  8 16:21:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:21:46 +0000
Subject: [pkgdb] childsplay_plugins: pbrady has requested approveacls
Message-ID: <20080908162146.3A66D208D9A@bastion.fedora.phx.redhat.com>

pbrady has requested the approveacls acl on childsplay_plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay_plugins



From mclasen at fedoraproject.org  Mon Sep  8 16:24:06 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 16:24:06 +0000 (UTC)
Subject: rpms/gnome-utils/devel .cvsignore, 1.65, 1.66 gnome-utils.spec,
	1.167, 1.168 sources, 1.69, 1.70
Message-ID: <20080908162406.A50C3700FD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14497

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	27 Aug 2008 00:52:44 -0000	1.65
+++ .cvsignore	8 Sep 2008 16:23:36 -0000	1.66
@@ -1 +1 @@
-gnome-utils-2.23.90.tar.bz2
+gnome-utils-2.23.92.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- gnome-utils.spec	28 Aug 2008 05:02:10 -0000	1.167
+++ gnome-utils.spec	8 Sep 2008 16:23:36 -0000	1.168
@@ -9,7 +9,7 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.23.90
+Version:        2.23.92
 Release:        2%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
@@ -26,8 +26,6 @@
 Patch2:		logview-versions-crash.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=497490
 Patch3:		logview-versions-format.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=549667
-Patch4:		shape-crash.patch
 
 BuildRequires:  gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: 	glib2-devel >= %{glib2_version}
@@ -86,7 +84,6 @@
 %patch1 -p1 -b .logview-scroll
 %patch2 -p1 -b .versions-crash
 %patch3 -p1 -b .versions-format
-%patch4 -p1 -b .shape-crash
 
 # Hide from menus
 pushd gsearchtool
@@ -246,6 +243,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.92-1
+- Update to 2.23.92
+
 * Thu Aug 28 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.90-2
 - Fix a crash in gnome-screenshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	27 Aug 2008 00:52:44 -0000	1.69
+++ sources	8 Sep 2008 16:23:36 -0000	1.70
@@ -1 +1 @@
-822db91884c507b8917b78026b9a8bec  gnome-utils-2.23.90.tar.bz2
+9f623f2a167a1daf989fe3907397d8f8  gnome-utils-2.23.92.tar.bz2



From mclasen at fedoraproject.org  Mon Sep  8 16:26:57 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 16:26:57 +0000 (UTC)
Subject: rpms/devhelp/devel devhelp.spec,1.92,1.93
Message-ID: <20080908162657.8CA02700FD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/devhelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15549

Modified Files:
	devhelp.spec 
Log Message:
specify --with-gecko



Index: devhelp.spec
===================================================================
RCS file: /cvs/extras/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- devhelp.spec	8 Sep 2008 16:15:03 -0000	1.92
+++ devhelp.spec	8 Sep 2008 16:26:27 -0000	1.93
@@ -52,7 +52,7 @@
 %setup -q -n devhelp-%{version}
 
 %build
-%configure --disable-static
+%configure --disable-static --with-gecko=libxul-embedding
 make %{?_smp_mflags}
 
 %install



From mclasen at fedoraproject.org  Mon Sep  8 16:34:35 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 16:34:35 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel .cvsignore, 1.17,
	1.18 gnome-settings-daemon.spec, 1.53, 1.54 sources, 1.18, 1.19
Message-ID: <20080908163435.D1F90700FD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18687

Modified Files:
	.cvsignore gnome-settings-daemon.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-settings-daemon/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	28 Aug 2008 13:34:23 -0000	1.17
+++ .cvsignore	8 Sep 2008 16:34:05 -0000	1.18
@@ -1 +1 @@
-gnome-settings-daemon-2.23.91.tar.bz2
+gnome-settings-daemon-2.23.92.tar.bz2


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnome-settings-daemon.spec	6 Sep 2008 00:08:22 -0000	1.53
+++ gnome-settings-daemon.spec	8 Sep 2008 16:34:05 -0000	1.54
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
-Version:	2.23.91
-Release:	5%{?dist}
+Version:	2.23.92
+Release:	1%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -34,8 +34,6 @@
 Patch2:         gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
 Patch6:		gnome-settings-daemon-2.23.4-drop-sample-cache.patch
 Patch7:		gnome-settings-daemon-2.23.91-fnf7-cycle.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=551062 
-Patch11:	keyboard-layout-variants.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -58,7 +56,6 @@
 %patch2 -p1 -b .ignore-layout-if-using-evdev
 %patch6 -p1 -b .drop-sample-cache
 %patch7 -p1 -b .fnf7-cycle
-%patch11 -p1 -b .keyboard-layout-variants
 
 %build
 aclocal
@@ -158,6 +155,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Fri Sep  5 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-5
 - Try harder to use the keyboard layout that gdm tells us
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-settings-daemon/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	1 Sep 2008 14:53:45 -0000	1.18
+++ sources	8 Sep 2008 16:34:05 -0000	1.19
@@ -1 +1 @@
-8acc32ab48b3038461ac1dfddffbaa4d  gnome-settings-daemon-2.23.91.tar.bz2
+6027af9d6792c61ebca2adc6e94473da  gnome-settings-daemon-2.23.92.tar.bz2



From victorv at fedoraproject.org  Mon Sep  8 16:36:23 2008
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Mon,  8 Sep 2008 16:36:23 +0000 (UTC)
Subject: rpms/netbeans-platform8/devel import.log, NONE,
	1.1 netbeans-platform8-6.1-build_bootstrap.patch, NONE,
	1.1 netbeans-platform8-6.1-properties.patch, NONE,
	1.1 netbeans-platform8-6.1-win_launcher.patch, NONE,
	1.1 netbeans-platform8.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080908163623.6DB79700FD@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/netbeans-platform8/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19573/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log netbeans-platform8-6.1-build_bootstrap.patch 
	netbeans-platform8-6.1-properties.patch 
	netbeans-platform8-6.1-win_launcher.patch 
	netbeans-platform8.spec 
Log Message:
Initial version



--- NEW FILE import.log ---
netbeans-platform8-6_1-4_fc10:HEAD:netbeans-platform8-6.1-4.fc10.src.rpm:1220891703

netbeans-platform8-6.1-build_bootstrap.patch:

--- NEW FILE netbeans-platform8-6.1-build_bootstrap.patch ---
diff -Nur -x '*.orig' -x '*~' libnb-platform8-6.1/o.n.bootstrap/build.xml libnb-platform8-6.1.new/o.n.bootstrap/build.xml
--- libnb-platform8-6.1/o.n.bootstrap/build.xml	2008-05-28 16:48:49.000000000 +0400
+++ libnb-platform8-6.1.new/o.n.bootstrap/build.xml	2008-05-28 16:51:27.000000000 +0400
@@ -65,7 +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/" />
         <fixcrlf srcdir="${cluster}/lib" eol="lf">
             <include name="**/*.sh"/>
             <include name="**/ide.cfg"/>

netbeans-platform8-6.1-properties.patch:

--- NEW FILE netbeans-platform8-6.1-properties.patch ---
diff -Nur -x '*.orig' -x '*~' libnb-platform8-6.1/o.jdesktop.layout/nbproject/project.properties libnb-platform8-6.1.new/o.jdesktop.layout/nbproject/project.properties
--- libnb-platform8-6.1/o.jdesktop.layout/nbproject/project.properties	2008-05-28 16:49:43.000000000 +0400
+++ libnb-platform8-6.1.new/o.jdesktop.layout/nbproject/project.properties	2008-05-28 16:54:32.000000000 +0400
@@ -39,6 +39,6 @@
 
 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

netbeans-platform8-6.1-win_launcher.patch:

--- NEW FILE netbeans-platform8-6.1-win_launcher.patch ---
diff -Nur netbeans-6.1-200805300101-platform-src/apisupport.harness/release/suite.xml netbeans-6.1-200805300101-platform-src.new/apisupport.harness/release/suite.xml
--- netbeans-6.1-200805300101-platform-src/apisupport.harness/release/suite.xml	2008-05-30 03:09:00.000000000 +0400
+++ netbeans-6.1-200805300101-platform-src.new/apisupport.harness/release/suite.xml	2008-07-21 19:30:55.000000000 +0400
@@ -195,8 +195,10 @@
         <mkdir dir="${build.launcher.dir}/etc"/>
         <mkdir dir="${build.launcher.dir}/bin"/>
 
+<!--
         <copy file="${harness.dir}/launchers/app.exe" tofile="${build.launcher.dir}/bin/${app.name}.exe"/>
         <copy file="${harness.dir}/launchers/app_w.exe" tofile="${build.launcher.dir}/bin/${app.name}_w.exe"/>
+!-->
         <copy file="${harness.dir}/launchers/app.sh" tofile="${build.launcher.dir}/bin/${app.name}"/>
         <copy file="${harness.dir}/etc/app.conf" tofile="${build.launcher.dir}/etc/${app.name}.conf"/>
         <echo message="${app.name}" file="${build.launcher.dir}/etc/${app.name}.clusters"/>


--- NEW FILE netbeans-platform8.spec ---
%define nb_             netbeans
%define nb_ver          6.1
%define nb_release_time 200805300101
%define nb_home         %{_datadir}/%{nb_}
%define nb_dir          %{nb_home}/%{nb_ver}

%define nb_platform_ver 8
%define nb_platform     platform%{nb_platform_ver}
%define nb_platform_dir %{nb_home}/%{nb_platform}

%define nb_harness      harness
%define nb_harness_dir  %{nb_home}/%{nb_harness}

%define nb_javadoc      javadoc
%define nb_javadoc_dir  %{_javadocdir}/%{nb_}-%{nb_platform}

%define compiler_opt    -Dbuild.compiler.deprecation=false -Dbuild.compiler.debug=false
%define jdk_opt         -Dpermit.jdk6.builds=true
%define verify_opt      -Dverify.checkout=false
%define ant_nb_opt      %{ant} %{jdk_opt} %{compiler_opt} %{verify_opt}

%define nb_javadoc_site http://bits.netbeans.org/%{nb_ver}/javadoc

# Prevents use of autoupdate on the specified directory.
# %1 the directory being prevented for autoupdate.
%define noautoupdate()    echo > %1/.noautoupdate

# Remove artifacts created by the noautoupdate macro.
# %1 the directory has been prevented for autoupdate.
%define rm_noautoupdate() %{__rm} -rf %1/.noautoupdate

Name:         %{nb_}-%{nb_platform}
Version:      %{nb_ver}
Release:      4%{?dist}
Summary:      NetBeans Platform %{nb_platform_ver}
Group:        Development/Libraries
License:      GPLv2 with exceptions or CDDL
URL:          http://platform.netbeans.org
Distribution: %{nb_}-%{nb_ver}

Source0: http://download.netbeans.org/%{nb_}/%{nb_ver}/final/zip/%{nb_}-%{nb_ver}-%{nb_release_time}-platform-src.zip

Patch0: %{name}-%{version}-build_bootstrap.patch
Patch1: %{name}-%{version}-properties.patch
# Issue http://www.netbeans.org/issues/show_bug.cgi?id=134544
Patch2: %{name}-%{version}-win_launcher.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

BuildRequires: jpackage-utils
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant >= 1.7.0
BuildRequires: ant-junit >= 1.7.0
BuildRequires: ant-nodeps >= 1.7.0
BuildRequires: ant-trax >= 1.7.0
BuildRequires: junit >= 3.8.2
BuildRequires: swing-layout >= 0:1.0
BuildRequires: javahelp2 >= 2.0.05
BuildRequires: jna >= 3.0.2

Requires: jpackage-utils
Requires: java >= 1:1.6.0
Requires: swing-layout >= 1.0
Requires: javahelp2 >= 2.0.05
Requires: jna >= 3.0.2

Provides: libnb-%{nb_platform} = %{version}

%description
NetBeans Platform is a framework for development of 
Rich Client Swing Applications. It contains powerful
module system and a set of modules providing various
functionalities needed for simplification of 
development of modular desktop applications.

%package %{nb_javadoc}
Summary: Javadoc documentation for NetBeans Platform %{nb_platform_ver}
Group: Documentation
%description %{nb_javadoc}
NetBeans Platform is a set of modules, each providing
their own APIs and working together or in a standalone
mode. This package provides one master 
javadoc to all of them.

%package %{nb_harness}
Summary: Build harness for NetBeans Platform %{nb_platform_ver}
Group: Development/Libraries
Requires: jpackage-utils
Requires: java >= 1:1.6.0
Requires: ant >= 1.7.0
Requires: %{name} = %{version}-%{release}
Requires: javahelp2 >= 2.0.05
Provides: libnb-%{nb_platform}-devel = %{version}
%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 

find . -type d | xargs -t chmod 755
find . -type f -exec chmod 644 {} ";"
find . -type f \( -iname "*.jar" -o -iname "*.zip" \) | xargs -t %{__rm} -f
find . -type f \( -iname "*.exe" \) | xargs -t %{__rm} -f

# As of Java 6, JSR 223 is included in the JRE.
# Generate the stub jar file, so there is something in jsr223 API module
%{__mkdir_p} libs.jsr223/src/javax/script
echo "package javax.script; class empty { }" > libs.jsr223/src/javax/script/empty.java
%{__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

%patch0 -p1
%patch1 -p1
%patch2 -p1

%build

# build platform
%{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

# 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} \
   -Dallmodules= \
   -Dcluster.config=platform \
   -Dconfig.javadoc.cluster=platform8 \
   -Dconfig.javadoc.netbeans=\
openide.util,openide.actions,openide.options,openide.awt,\
openide.dialogs,openide.nodes,openide.explorer,openide.filesystems,openide.modules,\
openide.text,openide.windows,openide.loaders,openide.io,queries,\
o.n.api.progress,settings,javahelp,openide.execution,\
sendopts,options.api,editor.mimelookup \
   -Djavadoc.docs.org-netbeans-api-java=%{nb_javadoc_site}/org-netbeans-api-java/ \
   -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_harness}/jsearch-2.0_05.jar

# clean up stub jars
%{__rm} -f nbbuild/netbeans/%{nb_platform}/modules/ext/script-api.jar

%install

%{__rm} -rf %{buildroot}

# install platform
%{__mkdir_p} %{buildroot}%{nb_platform_dir}
%{__cp} -pr nbbuild/netbeans/%{nb_platform}/* %{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

# install harness
%{__mkdir_p} %{buildroot}%{nb_harness_dir}
%{__cp} -pr nbbuild/netbeans/%{nb_harness}/* %{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

# install javadoc
%{__mkdir_p} %{buildroot}%{nb_javadoc_dir}
%{__cp} -pr nbbuild/build/javadoc/* %{buildroot}%{nb_javadoc_dir}

%clean
%{__rm} -rf %{buildroot}

%post
%noautoupdate %{nb_platform_dir}

%preun
%rm_noautoupdate %{nb_platform_dir}

%post %{nb_harness}
%noautoupdate %{nb_harness_dir}

%preun %{nb_harness}
%rm_noautoupdate %{nb_harness_dir}

%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
%dir %{nb_platform_dir}/
%{nb_platform_dir}/config
%{nb_platform_dir}/core
%dir %{nb_platform_dir}/lib
%{nb_platform_dir}/lib/boot.jar
%attr(755, root, root) %{nb_platform_dir}/lib/nbexec
%{nb_platform_dir}/lib/org-openide-modules.jar
%{nb_platform_dir}/lib/org-openide-util.jar
%{nb_platform_dir}/modules
%{nb_platform_dir}/update_tracking

%files %{nb_harness}
%defattr(-,root,root,-)
%dir %{nb_harness_dir}/
%{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}/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}/tasks.jar

%files %{nb_javadoc}
%defattr(-,root,root,-)
%doc %{nb_javadoc_dir}/

%changelog
* Mon Sep 08 2008 Victor Vasilyev <victor.vasilyev at sun.com> 6.1-4
- Linking to the external JARs is moved to the %%install script from the %%post scripts
- Canonical value for %%defattr is used

* Thu Sep 04 2008 Victor Vasilyev <victor.vasilyev at sun.com> 6.1-3
- The %%{buildroot} is used everywhere instead of $RPM_BUILD_ROOT
- The java, java-devel and jpackage-utils requirenments are used

* Thu Aug 07 2008 Victor Vasilyev <victor.vasilyev at sun.com> 6.1-2
- Suppress rpmlint warnings about hidden .noautoupdate files
- Appropriate values of Group Tags are chosen from the official list
- Avoid dangling symlinks after %%install
* Fri Jun 06 2008 Victor Vasilyev <victor.vasilyev at sun.com> 6.1-1
- Initial version of the platform 8 package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform8/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 15:14:39 -0000	1.1
+++ .cvsignore	8 Sep 2008 16:35:52 -0000	1.2
@@ -0,0 +1 @@
+netbeans-6.1-200805300101-platform-src.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform8/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 15:14:39 -0000	1.1
+++ sources	8 Sep 2008 16:35:53 -0000	1.2
@@ -0,0 +1 @@
+2cf27211aadb754e5d8f91cb62c01251  netbeans-6.1-200805300101-platform-src.zip



From caolanm at fedoraproject.org  Mon Sep  8 16:36:41 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  8 Sep 2008 16:36:41 +0000 (UTC)
Subject: rpms/hunspell-da/devel .cvsignore, 1.13, 1.14 hunspell-da.spec, 1.13,
	1.14 sources, 1.13, 1.14
Message-ID: <20080908163641.E3263700FD@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-da/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19874

Modified Files:
	.cvsignore hunspell-da.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-da/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	7 Aug 2008 16:06:05 -0000	1.13
+++ .cvsignore	8 Sep 2008 16:36:11 -0000	1.14
@@ -1 +1 @@
-myspell-da-1.7.23.tar.bz2
+myspell-da-1.7.24.tar.bz2


Index: hunspell-da.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-da/devel/hunspell-da.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- hunspell-da.spec	7 Aug 2008 16:06:05 -0000	1.13
+++ hunspell-da.spec	8 Sep 2008 16:36:11 -0000	1.14
@@ -1,6 +1,6 @@
 Name: hunspell-da
 Summary: Danish hunspell dictionaries
-Version: 1.7.23
+Version: 1.7.24
 Release: 1%{?dist}
 Source: http://da.speling.org/filer/myspell-da-%{version}.tar.bz2
 Group: Applications/Text
@@ -33,6 +33,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Mon Sep 08 2008 Caolan McNamara <caolanm at redhat.com> - 1.7.24-1
+- latest version
+
 * Thu Aug 07 2008 Caolan McNamara <caolanm at redhat.com> - 1.7.23-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-da/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	7 Aug 2008 16:06:05 -0000	1.13
+++ sources	8 Sep 2008 16:36:11 -0000	1.14
@@ -1 +1 @@
-9bed9f1c7129aad4d6c8464502757562  myspell-da-1.7.23.tar.bz2
+7e8c9a45ea631ef7e95dab019b81aef9  myspell-da-1.7.24.tar.bz2



From caolanm at fedoraproject.org  Mon Sep  8 16:37:17 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  8 Sep 2008 16:37:17 +0000 (UTC)
Subject: rpms/hunspell-fo/devel .cvsignore, 1.3, 1.4 hunspell-fo.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <20080908163717.141E8700FD@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-fo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20185

Modified Files:
	.cvsignore hunspell-fo.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-fo/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Jul 2008 11:14:55 -0000	1.3
+++ .cvsignore	8 Sep 2008 16:36:46 -0000	1.4
@@ -1 +1 @@
-myspell-fo-0.2.33.tar.gz
+myspell-fo-0.2.34.tar.gz


Index: hunspell-fo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-fo/devel/hunspell-fo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hunspell-fo.spec	7 Jul 2008 11:14:55 -0000	1.2
+++ hunspell-fo.spec	8 Sep 2008 16:36:46 -0000	1.3
@@ -1,6 +1,6 @@
 Name: hunspell-fo
 Summary: Faroese hunspell dictionaries
-Version: 0.2.33
+Version: 0.2.34
 Release: 1%{?dist}
 Source: http://fo.speling.org/filer/myspell-fo-%{version}.tar.gz
 Group: Applications/Text
@@ -37,6 +37,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Mon Sep 08 2008 Caolan McNamara <caolanm at redhat.com> - 0.2.34-1
+- latest version
+
 * Mon Jul 07 2008 Caolan McNamara <caolanm at redhat.com> - 0.2.33-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-fo/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Jul 2008 11:14:55 -0000	1.3
+++ sources	8 Sep 2008 16:36:46 -0000	1.4
@@ -1 +1 @@
-aeae38b2557a45b432f3dbfb64b05882  myspell-fo-0.2.33.tar.gz
+256aebbeee63e1e93194e8b7ed2d8ed5  myspell-fo-0.2.34.tar.gz



From kkofler at fedoraproject.org  Mon Sep  8 16:10:12 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon,  8 Sep 2008 16:10:12 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs.spec, 1.349,
	1.350 kdelibs-4.1.1-kde#858160-vfat.patch, 1.1, NONE
Message-ID: <20080908161012.E5D92700FD@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8936/F-9

Modified Files:
	kdelibs.spec 
Removed Files:
	kdelibs-4.1.1-kde#858160-vfat.patch 
Log Message:
rm kdelibs-4.1.1-kde#858160-vfat.patch for now, that patch needs fixing upstream: http://bugs.kde.org/show_bug.cgi?id=161673#c12


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -r1.349 -r1.350
--- kdelibs.spec	8 Sep 2008 13:03:32 -0000	1.349
+++ kdelibs.spec	8 Sep 2008 16:09:42 -0000	1.350
@@ -86,7 +86,6 @@
 Patch102: kdelibs-4.1.1-kde#856403-urlnav.patch
 Patch103: kdelibs-4.1.1-kutils-fixes.patch
 Patch104: kdelibs-4.1.1-kdeui-widgets-fixes.patch
-Patch105: kdelibs-4.1.1-kde#858160-vfat.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -218,7 +217,6 @@
 %patch102 -p0 -b .kde#856403-urlnav
 %patch103 -p0 -b .kutils-fixes
 %patch104 -p0 -b .kdeui-widgets-fixes
-%patch105 -p0 -b .kde#858160-vfat
 
 %build
 
@@ -382,7 +380,6 @@
 * Mon Sep 08 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-6
 - fix crashes in plugin selector
 - fix problems in various kdeui widgets
-- fix code page selection for vfat volumes in Solid
 
 * Wed Sep 03 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-5
 - fixed crash on setting cookies on empty domains (like the file


--- kdelibs-4.1.1-kde#858160-vfat.patch DELETED ---



From rdieter at fedoraproject.org  Mon Sep  8 16:41:48 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  8 Sep 2008 16:41:48 +0000 (UTC)
Subject: rpms/qt/devel qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch, 
	1.1, 1.2
Message-ID: <20080908164148.8E716700FD@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22336

Modified Files:
	qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch 
Log Message:
fix QMAKEPATH patch


qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch:

Index: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch	8 Sep 2008 16:12:59 -0000	1.1
+++ qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch	8 Sep 2008 16:41:47 -0000	1.2
@@ -1,36 +1,3 @@
---- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
-+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf	2007-02-26 15:01:02.000000000 -0600
-@@ -14,6 +14,8 @@
- QMAKE_CFLAGS		= -m64
- QMAKE_LFLAGS		= -m64
- 
-+QMAKE_CFLAGS_RELEASE	+= -O2
-+
- include(../common/g++.conf)
- include(../common/linux.conf)
- 
---- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
-+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf	2007-02-26 15:01:34.000000000 -0600
-@@ -11,6 +11,8 @@
- QMAKE_CFLAGS		= -m32
- QMAKE_LFLAGS		= -m32
- 
-+QMAKE_CFLAGS_RELEASE	+= -O2
-+
- include(../common/g++.conf)
- include(../common/linux.conf)
- load(qt_config)
---- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
-+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf	2007-02-26 15:01:26.000000000 -0600
-@@ -8,6 +8,8 @@
- QT			+= core gui
- QMAKE_INCREMENTAL_STYLE = sublib
- 
-+QMAKE_CFLAGS_RELEASE	+= -O2
-+
- include(../common/g++.conf)
- include(../common/linux.conf)
- load(qt_config)
 --- qt-x11-opensource-src-4.2.2/qmake/project.cpp.QMAKEPATH	2006-11-27 11:26:03.000000000 -0600
 +++ qt-x11-opensource-src-4.2.2/qmake/project.cpp	2007-02-26 13:45:39.000000000 -0600
 @@ -498,6 +498,7 @@



From nsantos at fedoraproject.org  Mon Sep  8 16:42:46 2008
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Mon,  8 Sep 2008 16:42:46 +0000 (UTC)
Subject: rpms/amqp/devel .cvsignore, 1.4, 1.5 amqp.spec, 1.8, 1.9 sources,
	1.7, 1.8
Message-ID: <20080908164246.DE43D700FD@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/amqp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22657

Modified Files:
	.cvsignore amqp.spec sources 
Log Message:
Update for Fedora 10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amqp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Jun 2008 15:56:46 -0000	1.4
+++ .cvsignore	8 Sep 2008 16:42:16 -0000	1.5
@@ -1 +1 @@
-amqp-1.0.666398.tar.gz
+amqp-1.0.693140.tar.gz


Index: amqp.spec
===================================================================
RCS file: /cvs/extras/rpms/amqp/devel/amqp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- amqp.spec	14 Jul 2008 19:47:49 -0000	1.8
+++ amqp.spec	8 Sep 2008 16:42:16 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           amqp
-Version:        1.0.666398
-Release:        6%{?dist}
+Version:        1.0.693140
+Release:        1%{?dist}
 Epoch:          0
 Summary:        The AMQP specification
 
@@ -39,6 +39,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Nuno Santos <nsantos at redhat.com> - 0:1.0.693140-1
+- Update for Fedora 10
+
 * Mon Jul 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0:1.0.666398-6
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amqp/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jun 2008 15:53:49 -0000	1.7
+++ sources	8 Sep 2008 16:42:16 -0000	1.8
@@ -1 +1 @@
-57672c3da1d1c8dc4f3cc72ca15dc1a1  amqp-1.0.666398.tar.gz
+d520dad6a7270aa04aaaadfb95dfc446  amqp-1.0.693140.tar.gz



From pawsa at fedoraproject.org  Mon Sep  8 16:46:58 2008
From: pawsa at fedoraproject.org (Pawel Salek)
Date: Mon,  8 Sep 2008 16:46:58 +0000 (UTC)
Subject: rpms/balsa/devel balsa.spec,1.42,1.43
Message-ID: <20080908164658.5A3BF700FD@cvs1.fedora.phx.redhat.com>

Author: pawsa

Update of /cvs/pkgs/rpms/balsa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24024

Modified Files:
	balsa.spec 
Log Message:
- Use deprecated GTK+ interface until upstream fixes their bugs.



Index: balsa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- balsa.spec	7 Sep 2008 20:16:10 -0000	1.42
+++ balsa.spec	8 Sep 2008 16:46:27 -0000	1.43
@@ -2,7 +2,7 @@
 
 Name:           balsa
 Version:        2.3.26
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Mail Client
 
 Group:          Applications/Internet
@@ -42,6 +42,8 @@
 %prep
 %setup -q
 
+perl -pi -e 's,-DGTK_DISABLE_DEPRECATED,,g' libbalsa/Makefile.in libinit_balsa/Makefile.in src/Makefile.in
+
 %build
 
 %configure %{config_opts}
@@ -102,6 +104,9 @@
 
 
 %changelog
+* Sun Sep 08 2008 Pawel Salek <pawsa at theochem.kth.se> - 2.3.26-2
+- Use deprecated GTK+ interface until upstream fixes their bugs.
+
 * Sun Sep 07 2008 Pawel Salek <pawsa at theochem.kth.se> - 2.3.26-1
 - update to upstream 2.3.26.
 



From mclasen at fedoraproject.org  Mon Sep  8 16:48:18 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 16:48:18 +0000 (UTC)
Subject: rpms/at-spi/devel .cvsignore, 1.52, 1.53 at-spi.spec, 1.96,
	1.97 sources, 1.52, 1.53
Message-ID: <20080908164818.899E9700FD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24669

Modified Files:
	.cvsignore at-spi.spec sources 
Log Message:
1.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	2 Sep 2008 23:00:24 -0000	1.52
+++ .cvsignore	8 Sep 2008 16:47:48 -0000	1.53
@@ -1 +1 @@
-at-spi-1.23.91.tar.bz2
+at-spi-1.23.92.tar.bz2


Index: at-spi.spec
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- at-spi.spec	5 Sep 2008 16:50:40 -0000	1.96
+++ at-spi.spec	8 Sep 2008 16:47:48 -0000	1.97
@@ -9,8 +9,8 @@
 
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
-Version: 1.23.91
-Release: 3%{?dist}
+Version: 1.23.92
+Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://download.gnome.org/sources/at-spi/1.23/%{name}-%{version}.tar.bz2
 
@@ -39,8 +39,6 @@
 BuildRequires: libXt-devel 
 
 Patch2: at-spi-silence-no-event-spew.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=548782
-Patch3: liyuan-greeter-crash.patch
 
 %description
 at-spi allows assistive technologies to access GTK-based
@@ -77,7 +75,6 @@
 %prep
 %setup -q
 %patch2 -p1 -b .spew
-%patch3 -p1 -b .greeter-crash
 
 
 %build
@@ -124,6 +121,10 @@
 
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 1.23.92-1
+- Update to 1.23.92
+- Drop upstreamed patch
+
 * Fri Sep  5 2008 Matthias Clasen <mclasen at redhat.com> - 1.23.91-3
 - Fix an evo crash caused by the greeter crash fix
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	2 Sep 2008 23:00:25 -0000	1.52
+++ sources	8 Sep 2008 16:47:48 -0000	1.53
@@ -1 +1 @@
-83ebbb0f8c441278af47919a011a09d8  at-spi-1.23.91.tar.bz2
+e1c7bbf6eb19b9ca9c509acb238e5c56  at-spi-1.23.92.tar.bz2



From mclasen at fedoraproject.org  Mon Sep  8 16:48:57 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 16:48:57 +0000 (UTC)
Subject: rpms/devhelp/devel devhelp.spec,1.93,1.94
Message-ID: <20080908164857.BC7D5700FD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/devhelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24884

Modified Files:
	devhelp.spec 
Log Message:
fix gecko requires



Index: devhelp.spec
===================================================================
RCS file: /cvs/extras/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- devhelp.spec	8 Sep 2008 16:26:27 -0000	1.93
+++ devhelp.spec	8 Sep 2008 16:48:27 -0000	1.94
@@ -26,7 +26,7 @@
 ### Build Dependencies ###
 
 BuildRequires: desktop-file-utils >= 0.3
-BuildRequires: gecko-devel = %{gecko_version}
+BuildRequires: gecko-devel-unstable = %{gecko_version}
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: libgnomeui-devel >= 2.2.0



From pkgdb at fedoraproject.org  Mon Sep  8 16:50:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:50:51 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20080908165052.0A8C520876E@bastion.fedora.phx.redhat.com>

Package ksensors in Fedora devel is now owned by lyosnorezel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Mon Sep  8 16:53:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:53:47 +0000
Subject: [pkgdb] libtheora ownership updated
Message-ID: <20080908165347.12893208D0F@bastion.fedora.phx.redhat.com>

Package libtheora in Fedora devel is now owned by lyosnorezel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtheora



From pkgdb at fedoraproject.org  Mon Sep  8 16:54:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:54:02 +0000
Subject: [pkgdb] libvorbis ownership updated
Message-ID: <20080908165402.6AA9C208D0F@bastion.fedora.phx.redhat.com>

Package libvorbis in Fedora devel is now owned by lyosnorezel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvorbis



From pkgdb at fedoraproject.org  Mon Sep  8 16:55:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:55:17 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has requested commit
Message-ID: <20080908165518.734E2208D9B@bastion.fedora.phx.redhat.com>

mdehaan has requested the commit acl on rubygem-cobbler (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 16:55:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:55:18 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has requested watchcommits
Message-ID: <20080908165519.BAC27208DA1@bastion.fedora.phx.redhat.com>

mdehaan has requested the watchcommits acl on rubygem-cobbler (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 16:55:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:55:19 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has requested watchbugzilla
Message-ID: <20080908165520.2686D208D9F@bastion.fedora.phx.redhat.com>

mdehaan has requested the watchbugzilla acl on rubygem-cobbler (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 16:55:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:55:18 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has requested watchcommits
Message-ID: <20080908165520.69CB6208DA3@bastion.fedora.phx.redhat.com>

mdehaan has requested the watchcommits acl on rubygem-cobbler (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 16:55:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:55:21 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has requested approveacls
Message-ID: <20080908165521.D1EB8208DA6@bastion.fedora.phx.redhat.com>

mdehaan has requested the approveacls acl on rubygem-cobbler (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 16:55:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:55:21 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has requested watchbugzilla
Message-ID: <20080908165522.27254208DA9@bastion.fedora.phx.redhat.com>

mdehaan has requested the watchbugzilla acl on rubygem-cobbler (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 16:55:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:55:22 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has requested approveacls
Message-ID: <20080908165522.96151208DAC@bastion.fedora.phx.redhat.com>

mdehaan has requested the approveacls acl on rubygem-cobbler (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 16:55:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 16:55:22 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has requested commit
Message-ID: <20080908165522.D9AAE208DAF@bastion.fedora.phx.redhat.com>

mdehaan has requested the commit acl on rubygem-cobbler (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From veillard at fedoraproject.org  Mon Sep  8 16:56:22 2008
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon,  8 Sep 2008 16:56:22 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-0.4.4-boot-cdrom.patch,1.1,NONE
Message-ID: <20080908165622.0C840700FD@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27752

Removed Files:
	libvirt-0.4.4-boot-cdrom.patch 
Log Message:
removing old patch, daniel



--- libvirt-0.4.4-boot-cdrom.patch DELETED ---



From veillard at fedoraproject.org  Mon Sep  8 16:56:13 2008
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon,  8 Sep 2008 16:56:13 +0000 (UTC)
Subject: rpms/libvirt/devel .cvsignore, 1.31, 1.32 libvirt.spec, 1.94,
	1.95 sources, 1.31, 1.32
Message-ID: <20080908165613.F1DE9700FD@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27361

Modified Files:
	.cvsignore libvirt.spec sources 
Log Message:
New upstream version, daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	25 Jun 2008 09:06:35 -0000	1.31
+++ .cvsignore	8 Sep 2008 16:55:43 -0000	1.32
@@ -3,6 +3,3 @@
 i686
 x86_64
 libvirt-*.tar.gz
-libvirt-0.4.2.tar.gz
-libvirt-0.4.3.tar.gz
-libvirt-0.4.4.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- libvirt.spec	7 Aug 2008 17:24:05 -0000	1.94
+++ libvirt.spec	8 Sep 2008 16:55:43 -0000	1.95
@@ -3,6 +3,8 @@
 %define with_xen       1
 %define with_xen_proxy 1
 %define with_qemu      1
+%define with_openvz    1
+%define with_lxc       1
 %define with_polkit    0
 
 # Xen is available only on i386 x86_64 ia64
@@ -27,13 +29,12 @@
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.4.4
-Release: 3%{?dist}%{?extra_release}
+Version: 0.4.5
+Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
-Patch1: %{name}-%{version}-boot-cdrom.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
 Requires: libxml2
@@ -54,6 +55,9 @@
 %endif
 # For mount/umount in FS driver
 BuildRequires: util-linux
+# For showmount in FS driver (netfs discovery)
+BuildRequires: nfs-utils
+Requires: nfs-utils
 %if %{with_qemu}
 # From QEMU RPMs
 Requires: /usr/bin/qemu-img
@@ -73,6 +77,7 @@
 BuildRequires: xen-devel
 %endif
 BuildRequires: libxml2-devel
+BuildRequires: xhtml1-dtds
 BuildRequires: readline-devel
 BuildRequires: ncurses-devel
 BuildRequires: gettext
@@ -142,7 +147,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %if ! %{with_xen}
@@ -153,12 +157,22 @@
 %define _without_qemu --without-qemu
 %endif
 
+%if ! %{with_openvz}
+%define _without_openvz --without-openvz
+%endif
+
+%if ! %{with_lxc}
+%define _without_lxc --without-lxc
+%endif
+
 %configure %{?_without_xen} \
            %{?_without_qemu} \
+           %{?_without_openvz} \
+           %{?_without_lxc} \
            --with-init-script=redhat \
            --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
            --with-remote-file=%{_localstatedir}/run/libvirtd.pid
-make
+make %{?_smp_mflags}
 
 %install
 rm -fr %{buildroot}
@@ -241,14 +255,21 @@
 %dir %{_localstatedir}/lib/libvirt/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
+%{_datadir}/augeas/lenses/libvirtd.aug
+%{_datadir}/augeas/lenses/libvirtd_qemu.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
 %if %{with_polkit}
-%{_datadir}/PolicyKit/policy/libvirtd.policy
+%{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
 %endif
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
 %if %{with_xen_proxy}
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
 %endif
 %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
+%if %{with_lxc}
+%attr(0755, root, root) %{_libexecdir}/libvirt_lxc
+%endif
 %attr(0755, root, root) %{_sbindir}/libvirtd
 %doc docs/*.rng
 %doc docs/*.xml
@@ -281,6 +302,9 @@
 %doc docs/examples/python
 
 %changelog
+* Mon Sep  8 2008 Daniel Veillard <veillard at redhat.com> - 0.4.5-1.fc10
+- upstream release 0.4.5
+- update
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.4-3.fc10
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	25 Jun 2008 09:06:35 -0000	1.31
+++ sources	8 Sep 2008 16:55:43 -0000	1.32
@@ -1 +1 @@
-9407900dc16e0ba9ea3eec3cf0a56674  libvirt-0.4.4.tar.gz
+dcb590a6202c332907eae7b44e47ca4b  libvirt-0.4.5.tar.gz



From steve at fedoraproject.org  Mon Sep  8 16:57:24 2008
From: steve at fedoraproject.org (Steven Pritchard)
Date: Mon,  8 Sep 2008 16:57:24 +0000 (UTC)
Subject: rpms/perl-DateTime/devel .cvsignore, 1.22, 1.23 perl-DateTime.spec, 
	1.29, 1.30 sources, 1.22, 1.23
Message-ID: <20080908165724.DFBA6700FD@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-DateTime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28211

Modified Files:
	.cvsignore perl-DateTime.spec sources 
Log Message:
Update to DateTime::TimeZone 0.7904.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	15 Jul 2008 20:38:00 -0000	1.22
+++ .cvsignore	8 Sep 2008 16:56:54 -0000	1.23
@@ -1,3 +1,3 @@
 DateTime-0.4304.tar.gz
 DateTime-Locale-0.41.tar.gz
-DateTime-TimeZone-0.78.tar.gz
+DateTime-TimeZone-0.7904.tar.gz


Index: perl-DateTime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime/devel/perl-DateTime.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- perl-DateTime.spec	15 Jul 2008 20:38:00 -0000	1.29
+++ perl-DateTime.spec	8 Sep 2008 16:56:54 -0000	1.30
@@ -1,9 +1,9 @@
-%define DTTimeZone_version 0.78
+%define DTTimeZone_version 0.7904
 %define DTLocale_version 0.41
 
 Name:           perl-DateTime
 Version:        0.4304
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Summary:        Date and time objects
 License:        GPL+ or Artistic
@@ -148,8 +148,11 @@
 %{perl_vendorarch}/DateTime*.pm
 
 %changelog
+* Mon Sep 08 2008 Steven Pritchard <steve at kspei.com> 1:0.4304-2
+- Update to DateTime::TimeZone 0.7904.
+
 * Tue Jul 15 2008 Steven Pritchard <steve at kspei.com> 1:0.4304-1
-- Update to 0.4304.
+- Update to DateTime 0.4304.
 - Update to DateTime::TimeZone 0.78.
 - Update to DateTime::Locale 0.41.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	15 Jul 2008 20:38:00 -0000	1.22
+++ sources	8 Sep 2008 16:56:54 -0000	1.23
@@ -1,3 +1,3 @@
 33c766671222805b9f1b67844a04d4ad  DateTime-0.4304.tar.gz
 cc27842a44c234c10296aa769080bb02  DateTime-Locale-0.41.tar.gz
-ffc89c93c3e1a9fe0501b5b5e3347e3f  DateTime-TimeZone-0.78.tar.gz
+a2b177ebd0702d25f7d591fc2974ba79  DateTime-TimeZone-0.7904.tar.gz



From nsantos at fedoraproject.org  Mon Sep  8 16:57:24 2008
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Mon,  8 Sep 2008 16:57:24 +0000 (UTC)
Subject: rpms/qpidc/devel .cvsignore, 1.6, 1.7 qpidc.spec, 1.34, 1.35 sources,
	1.22, 1.23
Message-ID: <20080908165724.6A760700FD@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28192

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
update for Fedora 10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Jun 2008 17:43:47 -0000	1.6
+++ .cvsignore	8 Sep 2008 16:56:54 -0000	1.7
@@ -1 +1 @@
-qpidc-0.2.667603.tar.gz
+qpidc-0.3.693140.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- qpidc.spec	3 Sep 2008 19:27:21 -0000	1.34
+++ qpidc.spec	8 Sep 2008 16:56:54 -0000	1.35
@@ -4,11 +4,11 @@
 # svn revision: $Rev: 654927 $
 #
 %define qpidd qpidd
-%define svnrev 667603
+%define svnrev 693140
 
 Name:           qpidc
-Version:        0.2.%{svnrev}
-Release:        3%{?dist}
+Version:        0.3.%{svnrev}
+Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -214,6 +214,9 @@
 /sbin/ldconfig
 
 %changelog
+* Mon Sep  8 2008 Nuno Santos <nsantos at redhat.com> - 0.3.693140-1
+- Update for Fedora 10
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.667603-3
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	1 Jul 2008 20:50:00 -0000	1.22
+++ sources	8 Sep 2008 16:56:54 -0000	1.23
@@ -1 +1 @@
-c364b9f0d4d5277dfa32448575f89ff8  qpidc-0.2.667603.tar.gz
+ebb62fc8ad2143ae7a2cc9a104f5eff1  qpidc-0.3.693140.tar.gz



From mclasen at fedoraproject.org  Mon Sep  8 17:00:28 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 17:00:28 +0000 (UTC)
Subject: rpms/mousetweaks/devel .cvsignore, 1.9, 1.10 mousetweaks.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <20080908170028.1933D700FD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/mousetweaks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27732

Modified Files:
	.cvsignore mousetweaks.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mousetweaks/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	2 Sep 2008 23:16:02 -0000	1.9
+++ .cvsignore	8 Sep 2008 16:59:57 -0000	1.10
@@ -1 +1 @@
-mousetweaks-2.23.91.tar.bz2
+mousetweaks-2.23.92.tar.bz2


Index: mousetweaks.spec
===================================================================
RCS file: /cvs/extras/rpms/mousetweaks/devel/mousetweaks.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mousetweaks.spec	2 Sep 2008 23:29:22 -0000	1.13
+++ mousetweaks.spec	8 Sep 2008 16:59:57 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		mousetweaks
-Version:	2.23.91
+Version:	2.23.92
 Release:	1%{?dist}
 Summary:	Mouse accessibility support for the GNOME desktop
 Group:		User Interface/Desktops
@@ -93,6 +93,9 @@
 %doc %{_mandir}/man1/*
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mousetweaks/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	2 Sep 2008 23:16:02 -0000	1.9
+++ sources	8 Sep 2008 16:59:57 -0000	1.10
@@ -1 +1 @@
-3805fdd9bd4723f740b48a62ee333a7a  mousetweaks-2.23.91.tar.bz2
+47f82d4994088f70711d7229b4b660c2  mousetweaks-2.23.92.tar.bz2



From pkgdb at fedoraproject.org  Mon Sep  8 17:00:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:00:43 +0000
Subject: [pkgdb] cobbler had group_acl changed
Message-ID: <20080908170043.DEE8920876D@bastion.fedora.phx.redhat.com>

mdehaan has set the commit acl on cobbler (Fedora EPEL 4) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 17:00:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:00:44 +0000
Subject: [pkgdb] cobbler had group_acl changed
Message-ID: <20080908170044.AC386208D1E@bastion.fedora.phx.redhat.com>

mdehaan has set the commit acl on cobbler (Fedora devel) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 17:00:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:00:47 +0000
Subject: [pkgdb] cobbler had group_acl changed
Message-ID: <20080908170047.1F52D208D98@bastion.fedora.phx.redhat.com>

mdehaan has set the commit acl on cobbler (Fedora EPEL 5) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 17:00:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:00:48 +0000
Subject: [pkgdb] cobbler had group_acl changed
Message-ID: <20080908170048.CF2CF208771@bastion.fedora.phx.redhat.com>

mdehaan has set the commit acl on cobbler (Fedora 7) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 17:00:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:00:50 +0000
Subject: [pkgdb] cobbler had group_acl changed
Message-ID: <20080908170050.9D7A6208D9A@bastion.fedora.phx.redhat.com>

mdehaan has set the commit acl on cobbler (Fedora 6) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 17:00:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:00:49 +0000
Subject: [pkgdb] cobbler had group_acl changed
Message-ID: <20080908170051.159EA208D9B@bastion.fedora.phx.redhat.com>

mdehaan has set the commit acl on cobbler (Fedora 5) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 17:00:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:00:52 +0000
Subject: [pkgdb] cobbler had group_acl changed
Message-ID: <20080908170053.1278C208D9C@bastion.fedora.phx.redhat.com>

mdehaan has set the commit acl on cobbler (Fedora 9) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 17:01:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:01:03 +0000
Subject: [pkgdb] coda: nhorman has requested watchbugzilla
Message-ID: <20080908170103.B6AF8208D7C@bastion.fedora.phx.redhat.com>

nhorman has requested the watchbugzilla acl on coda (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:00:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:00:58 +0000
Subject: [pkgdb] cobbler had group_acl changed
Message-ID: <20080908170058.A0846208D9E@bastion.fedora.phx.redhat.com>

mdehaan has set the commit acl on cobbler (Fedora 8) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 17:01:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:01:07 +0000
Subject: [pkgdb] coda: nhorman has requested commit
Message-ID: <20080908170107.8FA05208DA3@bastion.fedora.phx.redhat.com>

nhorman has requested the commit acl on coda (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:01:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:01:07 +0000
Subject: [pkgdb] coda: nhorman has requested watchcommits
Message-ID: <20080908170107.A0DBB208DA6@bastion.fedora.phx.redhat.com>

nhorman has requested the watchcommits acl on coda (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:01:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:01:08 +0000
Subject: [pkgdb] coda: nhorman has requested approveacls
Message-ID: <20080908170108.63903208DAA@bastion.fedora.phx.redhat.com>

nhorman has requested the approveacls acl on coda (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:01:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:01:08 +0000
Subject: [pkgdb] coda: nhorman has requested watchbugzilla
Message-ID: <20080908170108.E5328208DAE@bastion.fedora.phx.redhat.com>

nhorman has requested the watchbugzilla acl on coda (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:01:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:01:10 +0000
Subject: [pkgdb] coda: nhorman has requested commit
Message-ID: <20080908170110.AD23C208DB1@bastion.fedora.phx.redhat.com>

nhorman has requested the commit acl on coda (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:01:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:01:14 +0000
Subject: [pkgdb] coda: nhorman has requested watchcommits
Message-ID: <20080908170114.F07CE208DB0@bastion.fedora.phx.redhat.com>

nhorman has requested the watchcommits acl on coda (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:01:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:01:15 +0000
Subject: [pkgdb] coda: nhorman has requested watchbugzilla
Message-ID: <20080908170115.446B6208DB5@bastion.fedora.phx.redhat.com>

nhorman has requested the watchbugzilla acl on coda (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:01:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:01:15 +0000
Subject: [pkgdb] coda: nhorman has requested approveacls
Message-ID: <20080908170115.6AA1D208DB9@bastion.fedora.phx.redhat.com>

nhorman has requested the approveacls acl on coda (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:01:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:01:16 +0000
Subject: [pkgdb] coda: nhorman has requested commit
Message-ID: <20080908170116.47232208DBD@bastion.fedora.phx.redhat.com>

nhorman has requested the commit acl on coda (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:01:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:01:16 +0000
Subject: [pkgdb] coda: nhorman has requested watchcommits
Message-ID: <20080908170117.4CB12208DC1@bastion.fedora.phx.redhat.com>

nhorman has requested the watchcommits acl on coda (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:01:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:01:17 +0000
Subject: [pkgdb] coda: nhorman has requested approveacls
Message-ID: <20080908170117.89706208DC5@bastion.fedora.phx.redhat.com>

nhorman has requested the approveacls acl on coda (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:01:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:01:40 +0000
Subject: [pkgdb] rubygem-cobbler had group_acl changed
Message-ID: <20080908170140.ED2D1208D9E@bastion.fedora.phx.redhat.com>

mcpierce has set the commit acl on rubygem-cobbler (Fedora 9) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 17:01:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:01:43 +0000
Subject: [pkgdb] rubygem-cobbler had group_acl changed
Message-ID: <20080908170143.44486208DA1@bastion.fedora.phx.redhat.com>

mcpierce has set the commit acl on rubygem-cobbler (Fedora devel) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 17:02:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:02:42 +0000
Subject: [pkgdb] rvm: nhorman has requested watchcommits
Message-ID: <20080908170242.1C85A208D9A@bastion.fedora.phx.redhat.com>

nhorman has requested the watchcommits acl on rvm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:02:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:02:43 +0000
Subject: [pkgdb] rvm: nhorman has requested commit
Message-ID: <20080908170243.1B716208DAC@bastion.fedora.phx.redhat.com>

nhorman has requested the commit acl on rvm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:02:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:02:48 +0000
Subject: [pkgdb] rvm: nhorman has requested watchbugzilla
Message-ID: <20080908170248.892DD208DB0@bastion.fedora.phx.redhat.com>

nhorman has requested the watchbugzilla acl on rvm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:02:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:02:48 +0000
Subject: [pkgdb] rvm: nhorman has requested approveacls
Message-ID: <20080908170248.CDC9E208DB4@bastion.fedora.phx.redhat.com>

nhorman has requested the approveacls acl on rvm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:02:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:02:58 +0000
Subject: [pkgdb] rvm: nhorman has requested watchbugzilla
Message-ID: <20080908170258.91AFB208DB9@bastion.fedora.phx.redhat.com>

nhorman has requested the watchbugzilla acl on rvm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:02:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:02:58 +0000
Subject: [pkgdb] rvm: nhorman has requested watchcommits
Message-ID: <20080908170259.1346E208DBC@bastion.fedora.phx.redhat.com>

nhorman has requested the watchcommits acl on rvm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:03:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:03:02 +0000
Subject: [pkgdb] rvm: nhorman has requested approveacls
Message-ID: <20080908170302.215A3208DBF@bastion.fedora.phx.redhat.com>

nhorman has requested the approveacls acl on rvm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:03:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:03:02 +0000
Subject: [pkgdb] rvm: nhorman has requested commit
Message-ID: <20080908170302.C43A6208DCB@bastion.fedora.phx.redhat.com>

nhorman has requested the commit acl on rvm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:03:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:03:07 +0000
Subject: [pkgdb] rvm: nhorman has requested watchbugzilla
Message-ID: <20080908170307.8AED6208DCF@bastion.fedora.phx.redhat.com>

nhorman has requested the watchbugzilla acl on rvm (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:03:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:03:07 +0000
Subject: [pkgdb] rvm: nhorman has requested watchcommits
Message-ID: <20080908170307.AEC2E208DD2@bastion.fedora.phx.redhat.com>

nhorman has requested the watchcommits acl on rvm (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:03:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:03:10 +0000
Subject: [pkgdb] rvm: nhorman has requested commit
Message-ID: <20080908170310.3E56F208DD5@bastion.fedora.phx.redhat.com>

nhorman has requested the commit acl on rvm (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:03:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:03:11 +0000
Subject: [pkgdb] rvm: nhorman has requested approveacls
Message-ID: <20080908170311.62BD7208DC4@bastion.fedora.phx.redhat.com>

nhorman has requested the approveacls acl on rvm (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:03:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:03:27 +0000
Subject: [pkgdb] lwp: nhorman has requested watchcommits
Message-ID: <20080908170328.0247F208D1E@bastion.fedora.phx.redhat.com>

nhorman has requested the watchcommits acl on lwp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:03:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:03:28 +0000
Subject: [pkgdb] lwp: nhorman has requested watchbugzilla
Message-ID: <20080908170328.77609208DC5@bastion.fedora.phx.redhat.com>

nhorman has requested the watchbugzilla acl on lwp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:03:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:03:28 +0000
Subject: [pkgdb] lwp: nhorman has requested commit
Message-ID: <20080908170328.B1F71208DD7@bastion.fedora.phx.redhat.com>

nhorman has requested the commit acl on lwp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:03:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:03:35 +0000
Subject: [pkgdb] lwp: nhorman has requested approveacls
Message-ID: <20080908170335.BA7A6208D9E@bastion.fedora.phx.redhat.com>

nhorman has requested the approveacls acl on lwp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:03:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:03:35 +0000
Subject: [pkgdb] lwp: nhorman has requested watchbugzilla
Message-ID: <20080908170336.0783D208DDA@bastion.fedora.phx.redhat.com>

nhorman has requested the watchbugzilla acl on lwp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:03:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:03:36 +0000
Subject: [pkgdb] lwp: nhorman has requested watchcommits
Message-ID: <20080908170336.9D929208DDF@bastion.fedora.phx.redhat.com>

nhorman has requested the watchcommits acl on lwp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:03:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:03:37 +0000
Subject: [pkgdb] lwp: nhorman has requested commit
Message-ID: <20080908170337.B7551208DE0@bastion.fedora.phx.redhat.com>

nhorman has requested the commit acl on lwp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:03:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:03:38 +0000
Subject: [pkgdb] lwp: nhorman has requested approveacls
Message-ID: <20080908170338.40D16208DE4@bastion.fedora.phx.redhat.com>

nhorman has requested the approveacls acl on lwp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:03:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:03:39 +0000
Subject: [pkgdb] lwp: nhorman has requested watchbugzilla
Message-ID: <20080908170339.7C061208DE7@bastion.fedora.phx.redhat.com>

nhorman has requested the watchbugzilla acl on lwp (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:03:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:03:40 +0000
Subject: [pkgdb] lwp: nhorman has requested commit
Message-ID: <20080908170340.5FE8E208DEA@bastion.fedora.phx.redhat.com>

nhorman has requested the commit acl on lwp (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:03:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:03:45 +0000
Subject: [pkgdb] lwp: nhorman has requested watchcommits
Message-ID: <20080908170345.E1D53208DA3@bastion.fedora.phx.redhat.com>

nhorman has requested the watchcommits acl on lwp (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:03:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:03:47 +0000
Subject: [pkgdb] lwp: nhorman has requested approveacls
Message-ID: <20080908170347.BF0EE208DEC@bastion.fedora.phx.redhat.com>

nhorman has requested the approveacls acl on lwp (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:03:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:03:54 +0000
Subject: [pkgdb] rubygem-activeldap had group_acl changed
Message-ID: <20080908170354.7CE27208DA7@bastion.fedora.phx.redhat.com>

mcpierce has set the commit acl on rubygem-activeldap (Fedora 9) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-activeldap



From pkgdb at fedoraproject.org  Mon Sep  8 17:04:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:04:03 +0000
Subject: [pkgdb] rubygem-activeldap had group_acl changed
Message-ID: <20080908170403.50E0B208DA4@bastion.fedora.phx.redhat.com>

mcpierce has set the commit acl on rubygem-activeldap (Fedora 8) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-activeldap



From pkgdb at fedoraproject.org  Mon Sep  8 17:04:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:04:10 +0000
Subject: [pkgdb] rpc2: nhorman has requested watchbugzilla
Message-ID: <20080908170410.F2F8E208DC8@bastion.fedora.phx.redhat.com>

nhorman has requested the watchbugzilla acl on rpc2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:04:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:04:03 +0000
Subject: [pkgdb] rubygem-activeldap had group_acl changed
Message-ID: <20080908170403.5EA17208DC7@bastion.fedora.phx.redhat.com>

mcpierce has set the commit acl on rubygem-activeldap (Fedora devel) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-activeldap



From pkgdb at fedoraproject.org  Mon Sep  8 17:04:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:04:13 +0000
Subject: [pkgdb] rpc2: nhorman has requested watchcommits
Message-ID: <20080908170413.E2A85208DEF@bastion.fedora.phx.redhat.com>

nhorman has requested the watchcommits acl on rpc2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:04:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:04:13 +0000
Subject: [pkgdb] rpc2: nhorman has requested approveacls
Message-ID: <20080908170413.EA580208DF2@bastion.fedora.phx.redhat.com>

nhorman has requested the approveacls acl on rpc2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:04:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:04:15 +0000
Subject: [pkgdb] rpc2: nhorman has requested watchbugzilla
Message-ID: <20080908170416.3A721208DAA@bastion.fedora.phx.redhat.com>

nhorman has requested the watchbugzilla acl on rpc2 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:04:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:04:17 +0000
Subject: [pkgdb] rpc2: nhorman has requested watchcommits
Message-ID: <20080908170417.03B43208DF5@bastion.fedora.phx.redhat.com>

nhorman has requested the watchcommits acl on rpc2 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:04:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:04:22 +0000
Subject: [pkgdb] rpc2: nhorman has requested commit
Message-ID: <20080908170422.8708F208DAD@bastion.fedora.phx.redhat.com>

nhorman has requested the commit acl on rpc2 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:04:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:04:22 +0000
Subject: [pkgdb] rpc2: nhorman has requested approveacls
Message-ID: <20080908170422.B9ED5208DF9@bastion.fedora.phx.redhat.com>

nhorman has requested the approveacls acl on rpc2 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:04:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:04:23 +0000
Subject: [pkgdb] rpc2: nhorman has requested watchbugzilla
Message-ID: <20080908170423.534D3208DFC@bastion.fedora.phx.redhat.com>

nhorman has requested the watchbugzilla acl on rpc2 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:04:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:04:24 +0000
Subject: [pkgdb] rpc2: nhorman has requested watchcommits
Message-ID: <20080908170424.B0B84208DFF@bastion.fedora.phx.redhat.com>

nhorman has requested the watchcommits acl on rpc2 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:04:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:04:26 +0000
Subject: [pkgdb] rpc2: nhorman has requested commit
Message-ID: <20080908170426.E54E9208E01@bastion.fedora.phx.redhat.com>

nhorman has requested the commit acl on rpc2 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:04:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:04:33 +0000
Subject: [pkgdb] rpc2: nhorman has requested approveacls
Message-ID: <20080908170433.83E38208DB0@bastion.fedora.phx.redhat.com>

nhorman has requested the approveacls acl on rpc2 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:04:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:04:39 +0000
Subject: [pkgdb] rubygem-rubyforge had group_acl changed
Message-ID: <20080908170439.B9BD52D0020@bastion.fedora.phx.redhat.com>

mcpierce has set the commit acl on rubygem-rubyforge (Fedora 9) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-rubyforge



From pkgdb at fedoraproject.org  Mon Sep  8 17:04:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:04:40 +0000
Subject: [pkgdb] rubygem-rubyforge had group_acl changed
Message-ID: <20080908170440.415892D0023@bastion.fedora.phx.redhat.com>

mcpierce has set the commit acl on rubygem-rubyforge (Fedora devel) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-rubyforge



From pkgdb at fedoraproject.org  Mon Sep  8 17:04:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:04:42 +0000
Subject: [pkgdb] rubygem-rubyforge had group_acl changed
Message-ID: <20080908170442.7E4E72D0024@bastion.fedora.phx.redhat.com>

mcpierce has set the commit acl on rubygem-rubyforge (Fedora 8) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-rubyforge



From pkgdb at fedoraproject.org  Mon Sep  8 17:05:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:05:09 +0000
Subject: [pkgdb] rubygem-hoe had group_acl changed
Message-ID: <20080908170509.64F75208DB7@bastion.fedora.phx.redhat.com>

mcpierce has set the commit acl on rubygem-hoe (Fedora 8) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-hoe



From pkgdb at fedoraproject.org  Mon Sep  8 17:05:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:05:10 +0000
Subject: [pkgdb] rubygem-hoe had group_acl changed
Message-ID: <20080908170510.77E872D0029@bastion.fedora.phx.redhat.com>

mcpierce has set the commit acl on rubygem-hoe (Fedora 9) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-hoe



From nsantos at fedoraproject.org  Mon Sep  8 17:05:33 2008
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Mon,  8 Sep 2008 17:05:33 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.35,1.36
Message-ID: <20080908170533.5CB37700FD@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31202

Modified Files:
	qpidc.spec 
Log Message:
add python BuildRequires


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- qpidc.spec	8 Sep 2008 16:56:54 -0000	1.35
+++ qpidc.spec	8 Sep 2008 17:05:03 -0000	1.36
@@ -25,6 +25,7 @@
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: ruby
+BuildRequires: python
 
 Requires: boost
 



From pkgdb at fedoraproject.org  Mon Sep  8 17:05:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:05:12 +0000
Subject: [pkgdb] rubygem-hoe had group_acl changed
Message-ID: <20080908170512.4D72C2D002B@bastion.fedora.phx.redhat.com>

mcpierce has set the commit acl on rubygem-hoe (Fedora devel) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-hoe



From pkgdb at fedoraproject.org  Mon Sep  8 17:06:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:06:50 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20080908170650.A19BB2D0030@bastion.fedora.phx.redhat.com>

mcpierce has set the watchbugzilla acl on rubygem-cobbler (Fedora devel) to Approved for mdehaan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 17:06:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:06:50 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20080908170650.CB3FE2D0033@bastion.fedora.phx.redhat.com>

mcpierce has set the commit acl on rubygem-cobbler (Fedora devel) to Approved for mdehaan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 17:06:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:06:51 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20080908170651.A819A2D0035@bastion.fedora.phx.redhat.com>

mcpierce has set the watchcommits acl on rubygem-cobbler (Fedora devel) to Approved for mdehaan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 17:06:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:06:53 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20080908170653.9E00E2D003D@bastion.fedora.phx.redhat.com>

mcpierce has set the watchbugzilla acl on rubygem-cobbler (Fedora 9) to Approved for mdehaan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 17:06:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:06:52 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20080908170652.2878F2D0039@bastion.fedora.phx.redhat.com>

mcpierce has set the approveacls acl on rubygem-cobbler (Fedora devel) to Approved for mdehaan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 17:06:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:06:54 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20080908170654.A9F442D0040@bastion.fedora.phx.redhat.com>

mcpierce has set the watchcommits acl on rubygem-cobbler (Fedora 9) to Approved for mdehaan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 17:06:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:06:56 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20080908170656.2E0592D0042@bastion.fedora.phx.redhat.com>

mcpierce has set the commit acl on rubygem-cobbler (Fedora 9) to Approved for mdehaan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 17:07:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:07:00 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20080908170700.499452D0043@bastion.fedora.phx.redhat.com>

mcpierce has set the approveacls acl on rubygem-cobbler (Fedora 9) to Approved for mdehaan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Mon Sep  8 17:12:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:12:48 +0000
Subject: [pkgdb] Io-language: salimma has requested watchbugzilla
Message-ID: <20080908171248.652C4208D1E@bastion.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on Io-language (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Mon Sep  8 17:12:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:12:49 +0000
Subject: [pkgdb] Io-language: salimma has requested watchcommits
Message-ID: <20080908171249.35573208D98@bastion.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on Io-language (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Mon Sep  8 17:12:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:12:51 +0000
Subject: [pkgdb] Io-language: salimma has requested commit
Message-ID: <20080908171251.15E2F208D9B@bastion.fedora.phx.redhat.com>

salimma has requested the commit acl on Io-language (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Mon Sep  8 17:12:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:12:56 +0000
Subject: [pkgdb] Io-language: salimma has requested approveacls
Message-ID: <20080908171256.750C3208D9C@bastion.fedora.phx.redhat.com>

salimma has requested the approveacls acl on Io-language (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Mon Sep  8 17:17:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:17:40 +0000
Subject: [pkgdb] rvm had acl change status
Message-ID: <20080908171740.B509E20876F@bastion.fedora.phx.redhat.com>

agoode has set the watchbugzilla acl on rvm (Fedora devel) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:17:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:17:41 +0000
Subject: [pkgdb] rvm had acl change status
Message-ID: <20080908171741.C2E2F208D0F@bastion.fedora.phx.redhat.com>

agoode has set the watchcommits acl on rvm (Fedora devel) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:17:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:17:42 +0000
Subject: [pkgdb] rvm had acl change status
Message-ID: <20080908171743.09E62208D97@bastion.fedora.phx.redhat.com>

agoode has set the commit acl on rvm (Fedora devel) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:17:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:17:48 +0000
Subject: [pkgdb] rvm had acl change status
Message-ID: <20080908171748.C4A20208D9C@bastion.fedora.phx.redhat.com>

agoode has set the approveacls acl on rvm (Fedora devel) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:17:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:17:50 +0000
Subject: [pkgdb] rvm had acl change status
Message-ID: <20080908171750.3AA47208DA0@bastion.fedora.phx.redhat.com>

agoode has set the watchbugzilla acl on rvm (Fedora 9) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:17:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:17:51 +0000
Subject: [pkgdb] rvm had acl change status
Message-ID: <20080908171751.30660208DA3@bastion.fedora.phx.redhat.com>

agoode has set the watchcommits acl on rvm (Fedora 9) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:17:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:17:52 +0000
Subject: [pkgdb] rvm had acl change status
Message-ID: <20080908171752.C9B0C208DA4@bastion.fedora.phx.redhat.com>

agoode has set the commit acl on rvm (Fedora 9) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:17:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:17:53 +0000
Subject: [pkgdb] rvm had acl change status
Message-ID: <20080908171753.B067F208DA7@bastion.fedora.phx.redhat.com>

agoode has set the approveacls acl on rvm (Fedora 9) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:17:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:17:55 +0000
Subject: [pkgdb] rvm had acl change status
Message-ID: <20080908171755.C6343208DAA@bastion.fedora.phx.redhat.com>

agoode has set the watchbugzilla acl on rvm (Fedora 8) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:17:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:17:58 +0000
Subject: [pkgdb] rvm had acl change status
Message-ID: <20080908171758.4BE14208DAD@bastion.fedora.phx.redhat.com>

agoode has set the commit acl on rvm (Fedora 8) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:18:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:18:00 +0000
Subject: [pkgdb] rvm had acl change status
Message-ID: <20080908171800.86A23208DB0@bastion.fedora.phx.redhat.com>

agoode has set the watchcommits acl on rvm (Fedora 8) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:18:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:18:01 +0000
Subject: [pkgdb] rvm had acl change status
Message-ID: <20080908171801.8D3F7208DB3@bastion.fedora.phx.redhat.com>

agoode has set the approveacls acl on rvm (Fedora 8) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rvm



From pkgdb at fedoraproject.org  Mon Sep  8 17:18:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:18:25 +0000
Subject: [pkgdb] coda had acl change status
Message-ID: <20080908171825.355BD208D98@bastion.fedora.phx.redhat.com>

agoode has set the watchbugzilla acl on coda (Fedora devel) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:18:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:18:28 +0000
Subject: [pkgdb] coda had acl change status
Message-ID: <20080908171828.571D1208D9C@bastion.fedora.phx.redhat.com>

agoode has set the watchcommits acl on coda (Fedora devel) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:18:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:18:28 +0000
Subject: [pkgdb] coda had acl change status
Message-ID: <20080908171828.8CE42208DB4@bastion.fedora.phx.redhat.com>

agoode has set the commit acl on coda (Fedora devel) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:18:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:18:28 +0000
Subject: [pkgdb] coda had acl change status
Message-ID: <20080908171828.ABF87208DB8@bastion.fedora.phx.redhat.com>

agoode has set the approveacls acl on coda (Fedora devel) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:18:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:18:29 +0000
Subject: [pkgdb] coda had acl change status
Message-ID: <20080908171829.ECF96208DBC@bastion.fedora.phx.redhat.com>

agoode has set the watchbugzilla acl on coda (Fedora 9) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:18:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:18:31 +0000
Subject: [pkgdb] coda had acl change status
Message-ID: <20080908171831.821C5208DC0@bastion.fedora.phx.redhat.com>

agoode has set the watchcommits acl on coda (Fedora 9) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:18:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:18:33 +0000
Subject: [pkgdb] coda had acl change status
Message-ID: <20080908171833.CBCC8208DC4@bastion.fedora.phx.redhat.com>

agoode has set the approveacls acl on coda (Fedora 9) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:18:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:18:36 +0000
Subject: [pkgdb] coda had acl change status
Message-ID: <20080908171836.C5B76208DC9@bastion.fedora.phx.redhat.com>

agoode has set the watchbugzilla acl on coda (Fedora 8) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:18:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:18:36 +0000
Subject: [pkgdb] coda had acl change status
Message-ID: <20080908171837.269F9208DCB@bastion.fedora.phx.redhat.com>

agoode has set the watchcommits acl on coda (Fedora 8) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:18:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:18:38 +0000
Subject: [pkgdb] coda had acl change status
Message-ID: <20080908171839.F2B6C20876E@bastion.fedora.phx.redhat.com>

agoode has set the commit acl on coda (Fedora 8) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:18:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:18:39 +0000
Subject: [pkgdb] coda had acl change status
Message-ID: <20080908171840.0D24F208DA3@bastion.fedora.phx.redhat.com>

agoode has set the approveacls acl on coda (Fedora 8) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:18:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:18:38 +0000
Subject: [pkgdb] coda had acl change status
Message-ID: <20080908171840.E3A36208DCF@bastion.fedora.phx.redhat.com>

agoode has set the commit acl on coda (Fedora 9) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Mon Sep  8 17:18:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:18:56 +0000
Subject: [pkgdb] lwp had acl change status
Message-ID: <20080908171856.C6CAD208DA8@bastion.fedora.phx.redhat.com>

agoode has set the watchbugzilla acl on lwp (Fedora devel) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:18:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:18:57 +0000
Subject: [pkgdb] lwp had acl change status
Message-ID: <20080908171857.73261208DD8@bastion.fedora.phx.redhat.com>

agoode has set the watchcommits acl on lwp (Fedora devel) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:18:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:18:58 +0000
Subject: [pkgdb] lwp had acl change status
Message-ID: <20080908171859.28FD9208DDB@bastion.fedora.phx.redhat.com>

agoode has set the commit acl on lwp (Fedora devel) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:00 +0000
Subject: [pkgdb] lwp had acl change status
Message-ID: <20080908171900.91E38208DAC@bastion.fedora.phx.redhat.com>

agoode has set the watchbugzilla acl on lwp (Fedora 9) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:03 +0000
Subject: [pkgdb] lwp had acl change status
Message-ID: <20080908171903.B9C85208DDD@bastion.fedora.phx.redhat.com>

agoode has set the watchcommits acl on lwp (Fedora 9) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:05 +0000
Subject: [pkgdb] lwp had acl change status
Message-ID: <20080908171905.8D65A208DE0@bastion.fedora.phx.redhat.com>

agoode has set the approveacls acl on lwp (Fedora 9) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:06 +0000
Subject: [pkgdb] lwp had acl change status
Message-ID: <20080908171906.EA553208DE4@bastion.fedora.phx.redhat.com>

agoode has set the approveacls acl on lwp (Fedora devel) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:07 +0000
Subject: [pkgdb] lwp had acl change status
Message-ID: <20080908171908.84EB4208DE9@bastion.fedora.phx.redhat.com>

agoode has set the watchbugzilla acl on lwp (Fedora 8) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:07 +0000
Subject: [pkgdb] lwp had acl change status
Message-ID: <20080908171909.19297208DEB@bastion.fedora.phx.redhat.com>

agoode has set the commit acl on lwp (Fedora 9) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:09 +0000
Subject: [pkgdb] lwp had acl change status
Message-ID: <20080908171909.2D260208DEE@bastion.fedora.phx.redhat.com>

agoode has set the commit acl on lwp (Fedora 8) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:11 +0000
Subject: [pkgdb] lwp had acl change status
Message-ID: <20080908171911.23E51208DF0@bastion.fedora.phx.redhat.com>

agoode has set the approveacls acl on lwp (Fedora 8) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:14 +0000
Subject: [pkgdb] lwp had acl change status
Message-ID: <20080908171914.ACBC2208DB2@bastion.fedora.phx.redhat.com>

agoode has set the watchcommits acl on lwp (Fedora 8) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lwp



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:42 +0000
Subject: [pkgdb] rpc2 had acl change status
Message-ID: <20080908171942.2E67E208D97@bastion.fedora.phx.redhat.com>

agoode has set the watchcommits acl on rpc2 (Fedora devel) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:43 +0000
Subject: [pkgdb] rpc2 had acl change status
Message-ID: <20080908171943.86BB3208D9B@bastion.fedora.phx.redhat.com>

agoode has set the watchbugzilla acl on rpc2 (Fedora devel) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:43 +0000
Subject: [pkgdb] rpc2 had acl change status
Message-ID: <20080908171943.AB4CB208DF2@bastion.fedora.phx.redhat.com>

agoode has set the commit acl on rpc2 (Fedora devel) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:45 +0000
Subject: [pkgdb] rpc2 had acl change status
Message-ID: <20080908171946.1795C208D9F@bastion.fedora.phx.redhat.com>

agoode has set the approveacls acl on rpc2 (Fedora devel) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:46 +0000
Subject: [pkgdb] rpc2 had acl change status
Message-ID: <20080908171946.7DE7C208DF3@bastion.fedora.phx.redhat.com>

agoode has set the watchbugzilla acl on rpc2 (Fedora 9) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:48 +0000
Subject: [pkgdb] rpc2 had acl change status
Message-ID: <20080908171949.299E5208DF8@bastion.fedora.phx.redhat.com>

agoode has set the watchcommits acl on rpc2 (Fedora 9) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:49 +0000
Subject: [pkgdb] rpc2 had acl change status
Message-ID: <20080908171949.82590208DFB@bastion.fedora.phx.redhat.com>

agoode has set the approveacls acl on rpc2 (Fedora 9) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:53 +0000
Subject: [pkgdb] rpc2 had acl change status
Message-ID: <20080908171953.ECE72208E02@bastion.fedora.phx.redhat.com>

agoode has set the commit acl on rpc2 (Fedora 8) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:52 +0000
Subject: [pkgdb] rpc2 had acl change status
Message-ID: <20080908171952.9B2FE208DFF@bastion.fedora.phx.redhat.com>

agoode has set the watchbugzilla acl on rpc2 (Fedora 8) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:55 +0000
Subject: [pkgdb] rpc2 had acl change status
Message-ID: <20080908171955.AD3FA208E05@bastion.fedora.phx.redhat.com>

agoode has set the commit acl on rpc2 (Fedora 9) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:55 +0000
Subject: [pkgdb] rpc2 had acl change status
Message-ID: <20080908171955.F3084208E07@bastion.fedora.phx.redhat.com>

agoode has set the watchcommits acl on rpc2 (Fedora 8) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From pkgdb at fedoraproject.org  Mon Sep  8 17:19:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:19:55 +0000
Subject: [pkgdb] rpc2 had acl change status
Message-ID: <20080908171956.1ADA8208E0A@bastion.fedora.phx.redhat.com>

agoode has set the approveacls acl on rpc2 (Fedora 8) to Approved for nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpc2



From rakesh at fedoraproject.org  Mon Sep  8 17:26:42 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon,  8 Sep 2008 17:26:42 +0000 (UTC)
Subject: rpms/uriparser/devel import.log, NONE, 1.1 uriparser.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080908172643.0E154700FD@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/uriparser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7460/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log uriparser.spec 
Log Message:
initial package import



--- NEW FILE import.log ---
uriparser-0_7_1-6_fc10:HEAD:uriparser-0.7.1-6.fc10.src.rpm:1220894085


--- NEW FILE uriparser.spec ---
Name:           uriparser
Version:        0.7.1
Release:        6%{?dist}
Summary:        URI parsing library - RFC 3986

Group:          System Environment/Libraries
License:        BSD
URL:            http://%{name}.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  doxygen, graphviz
%description
Uriparser is a strictly RFC 3986 compliant URI parsing library written
in C. uriparser is cross-platform, fast, supports Unicode and is
licensed under the New BSD license.

%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
sed -i 's/\r//' THANKS
sed -i 's/\r//' COPYING
iconv -f iso-8859-1 -t utf-8 -o THANKS{.utf8,}
mv THANKS{.utf8,}

%build
%configure --disable-static
make %{?_smp_mflags}

# doc folder has separate configure file
cd doc;
# fix for automated autotool calls
touch aclocal.m4 configure Makefile.in
%configure; make %{?_smp_mflags}

%check
make check

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

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 THANKS AUTHORS COPYING ChangeLog
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/html
%{_includedir}/*
%{_libdir}/*.so

%changelog
* Sat Sep 06 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.7.1-6
- changed document file handling in spec, used better method - %%doc

* Fri Sep 05 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.7.1-5
- fixed group, removed redundant args for %%setup
- included ChangeLog, fixed html folder path in %%files
- fixed automated autotool calls

* Sat Aug 23 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.7.1-4
- changed name according to naming guidelines

* Sat Aug 23 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.7.1-3
- fixed buildrequires tag

* Sun Aug 10 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.7.1-2
- added documentation

* Sat Aug 9 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.7.1-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uriparser/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 15:17:44 -0000	1.1
+++ .cvsignore	8 Sep 2008 17:26:10 -0000	1.2
@@ -0,0 +1 @@
+uriparser-0.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uriparser/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 15:17:44 -0000	1.1
+++ sources	8 Sep 2008 17:26:11 -0000	1.2
@@ -0,0 +1 @@
+a0e04bcdec4083f24448e3aa28490ae9  uriparser-0.7.1.tar.gz



From rakesh at fedoraproject.org  Mon Sep  8 17:28:37 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon,  8 Sep 2008 17:28:37 +0000 (UTC)
Subject: rpms/uriparser/F-9 import.log, NONE, 1.1 uriparser.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080908172837.5DC45700FD@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/uriparser/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8337/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log uriparser.spec 
Log Message:
initial package import



--- NEW FILE import.log ---
uriparser-0_7_1-6_fc10:F-9:uriparser-0.7.1-6.fc10.src.rpm:1220894197


--- NEW FILE uriparser.spec ---
Name:           uriparser
Version:        0.7.1
Release:        6%{?dist}
Summary:        URI parsing library - RFC 3986

Group:          System Environment/Libraries
License:        BSD
URL:            http://%{name}.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  doxygen, graphviz
%description
Uriparser is a strictly RFC 3986 compliant URI parsing library written
in C. uriparser is cross-platform, fast, supports Unicode and is
licensed under the New BSD license.

%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
sed -i 's/\r//' THANKS
sed -i 's/\r//' COPYING
iconv -f iso-8859-1 -t utf-8 -o THANKS{.utf8,}
mv THANKS{.utf8,}

%build
%configure --disable-static
make %{?_smp_mflags}

# doc folder has separate configure file
cd doc;
# fix for automated autotool calls
touch aclocal.m4 configure Makefile.in
%configure; make %{?_smp_mflags}

%check
make check

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

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 THANKS AUTHORS COPYING ChangeLog
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/html
%{_includedir}/*
%{_libdir}/*.so

%changelog
* Sat Sep 06 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.7.1-6
- changed document file handling in spec, used better method - %%doc

* Fri Sep 05 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.7.1-5
- fixed group, removed redundant args for %%setup
- included ChangeLog, fixed html folder path in %%files
- fixed automated autotool calls

* Sat Aug 23 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.7.1-4
- changed name according to naming guidelines

* Sat Aug 23 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.7.1-3
- fixed buildrequires tag

* Sun Aug 10 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.7.1-2
- added documentation

* Sat Aug 9 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.7.1-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uriparser/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 15:17:44 -0000	1.1
+++ .cvsignore	8 Sep 2008 17:28:06 -0000	1.2
@@ -0,0 +1 @@
+uriparser-0.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uriparser/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 15:17:44 -0000	1.1
+++ sources	8 Sep 2008 17:28:07 -0000	1.2
@@ -0,0 +1 @@
+a0e04bcdec4083f24448e3aa28490ae9  uriparser-0.7.1.tar.gz



From rakesh at fedoraproject.org  Mon Sep  8 17:29:51 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon,  8 Sep 2008 17:29:51 +0000 (UTC)
Subject: rpms/uriparser/F-8 import.log, NONE, 1.1 uriparser.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080908172951.6EB41700FD@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/uriparser/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8741/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log uriparser.spec 
Log Message:
initial package import



--- NEW FILE import.log ---
uriparser-0_7_1-6_fc10:F-8:uriparser-0.7.1-6.fc10.src.rpm:1220894258


--- NEW FILE uriparser.spec ---
Name:           uriparser
Version:        0.7.1
Release:        6%{?dist}
Summary:        URI parsing library - RFC 3986

Group:          System Environment/Libraries
License:        BSD
URL:            http://%{name}.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  doxygen, graphviz
%description
Uriparser is a strictly RFC 3986 compliant URI parsing library written
in C. uriparser is cross-platform, fast, supports Unicode and is
licensed under the New BSD license.

%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
sed -i 's/\r//' THANKS
sed -i 's/\r//' COPYING
iconv -f iso-8859-1 -t utf-8 -o THANKS{.utf8,}
mv THANKS{.utf8,}

%build
%configure --disable-static
make %{?_smp_mflags}

# doc folder has separate configure file
cd doc;
# fix for automated autotool calls
touch aclocal.m4 configure Makefile.in
%configure; make %{?_smp_mflags}

%check
make check

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

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 THANKS AUTHORS COPYING ChangeLog
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/html
%{_includedir}/*
%{_libdir}/*.so

%changelog
* Sat Sep 06 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.7.1-6
- changed document file handling in spec, used better method - %%doc

* Fri Sep 05 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.7.1-5
- fixed group, removed redundant args for %%setup
- included ChangeLog, fixed html folder path in %%files
- fixed automated autotool calls

* Sat Aug 23 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.7.1-4
- changed name according to naming guidelines

* Sat Aug 23 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.7.1-3
- fixed buildrequires tag

* Sun Aug 10 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.7.1-2
- added documentation

* Sat Aug 9 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.7.1-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uriparser/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 15:17:44 -0000	1.1
+++ .cvsignore	8 Sep 2008 17:29:21 -0000	1.2
@@ -0,0 +1 @@
+uriparser-0.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uriparser/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 15:17:44 -0000	1.1
+++ sources	8 Sep 2008 17:29:21 -0000	1.2
@@ -0,0 +1 @@
+a0e04bcdec4083f24448e3aa28490ae9  uriparser-0.7.1.tar.gz



From limb at fedoraproject.org  Mon Sep  8 17:30:26 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon,  8 Sep 2008 17:30:26 +0000 (UTC)
Subject: rpms/lilypond/devel .cvsignore, 1.19, 1.20 lilypond.spec, 1.25,
	1.26 sources, 1.19, 1.20
Message-ID: <20080908173026.58852700FD@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/lilypond/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9108

Modified Files:
	.cvsignore lilypond.spec sources 
Log Message:
New upstream, builds in rawhide mock.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	20 Sep 2007 13:39:23 -0000	1.19
+++ .cvsignore	8 Sep 2008 17:29:55 -0000	1.20
@@ -1 +1 @@
-lilypond-2.10.33.tar.gz
+lilypond-2.11.57.tar.gz


Index: lilypond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond/devel/lilypond.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- lilypond.spec	27 Aug 2008 18:00:43 -0000	1.25
+++ lilypond.spec	8 Sep 2008 17:29:55 -0000	1.26
@@ -1,13 +1,12 @@
 Name:		lilypond
-Version:	2.10.33
-Release:	4%{?dist}
+Version:	2.11.57
+Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
 License:	GPLv2
 URL:		http://www.lilypond.org
 Source0:	http://download.linuxaudio.org/lilypond/sources/v2.10/%{name}-%{version}.tar.gz
-Patch1:		%{name}-gcc43.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	ghostscript >= 8.15
@@ -30,7 +29,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .gcc43
 
 
 %build
@@ -94,6 +92,9 @@
 
 
 %changelog
+* Mon Sep 08 2008 Jon Ciesla <limb at jcomserv.net> - 2.11.57-1
+- Upgrade to new upstream.
+
 * Wed Aug 27 2008 Jon Ciesla <limb at jcomserv.net> - 2.10.33-4
 - Spec cleanup, fix for BZ 456842, vim file locations.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	20 Sep 2007 13:39:23 -0000	1.19
+++ sources	8 Sep 2008 17:29:56 -0000	1.20
@@ -1 +1 @@
-86a67fcc404e942be723f8a72988b286  lilypond-2.10.33.tar.gz
+99e04dcebcf513506ca631630a6c7cd7  lilypond-2.11.57.tar.gz



From pkgdb at fedoraproject.org  Mon Sep  8 17:31:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:31:53 +0000
Subject: [pkgdb] libtheora ownership updated
Message-ID: <20080908173153.2D3A0208771@bastion.fedora.phx.redhat.com>

Package libtheora in Fedora 9 is now owned by lyosnorezel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtheora



From pkgdb at fedoraproject.org  Mon Sep  8 17:32:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:32:05 +0000
Subject: [pkgdb] libvorbis ownership updated
Message-ID: <20080908173205.32FA4208DA7@bastion.fedora.phx.redhat.com>

Package libvorbis in Fedora 9 is now owned by lyosnorezel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvorbis



From pkgdb at fedoraproject.org  Mon Sep  8 17:35:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:35:16 +0000
Subject: [pkgdb] id3lib ownership updated
Message-ID: <20080908173516.1573F20876E@bastion.fedora.phx.redhat.com>

Package id3lib in Fedora devel is now owned by lyosnorezel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3lib



From pkgdb at fedoraproject.org  Mon Sep  8 17:35:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 17:35:43 +0000
Subject: [pkgdb] id3lib ownership updated
Message-ID: <20080908173543.A67FE208770@bastion.fedora.phx.redhat.com>

Package id3lib in Fedora 9 is now owned by lyosnorezel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3lib



From bpepple at fedoraproject.org  Mon Sep  8 17:38:24 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon,  8 Sep 2008 17:38:24 +0000 (UTC)
Subject: rpms/swfdec/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 swfdec.spec, 1.14, 1.15
Message-ID: <20080908173824.8766E700FD@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/swfdec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11384

Modified Files:
	.cvsignore sources swfdec.spec 
Log Message:
* Mon Sep  8 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.8.0-1
- Update to 0.8.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/swfdec/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	31 Jul 2008 01:34:54 -0000	1.10
+++ .cvsignore	8 Sep 2008 17:37:54 -0000	1.11
@@ -1 +1 @@
-swfdec-0.7.4.tar.gz
+swfdec-0.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/swfdec/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	31 Jul 2008 01:34:54 -0000	1.10
+++ sources	8 Sep 2008 17:37:54 -0000	1.11
@@ -1 +1 @@
-08fcda4a46454bfc66b97fba2d385f8c  swfdec-0.7.4.tar.gz
+ce3002fc5d8ace9ce34ce960c0cc3c06  swfdec-0.8.0.tar.gz


Index: swfdec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/swfdec/devel/swfdec.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- swfdec.spec	31 Jul 2008 01:34:54 -0000	1.14
+++ swfdec.spec	8 Sep 2008 17:37:54 -0000	1.15
@@ -1,10 +1,10 @@
-%define	major_version	0.7
+%define	major_version	0.8
 %define liboil_version	0.3.1
 %define	gtk2_version	2.8.0
 %define pango_version	1.16
 
 Name:		swfdec
-Version:	%{major_version}.4
+Version:	%{major_version}.0
 Release:	1%{?dist}
 Summary:	Flash animation rendering library
 
@@ -148,6 +148,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.8.0-1
+- Update to 0.8.0.
+
 * Wed Jul 30 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.4-1
 - Update to 0.7.4.
 



From transif at fedoraproject.org  Mon Sep  8 17:45:32 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Mon,  8 Sep 2008 17:45:32 +0000 (UTC)
Subject: comps/po fi.po,1.15,1.16
Message-ID: <20080908174532.C4133700FD@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13095/po

Modified Files:
	fi.po 
Log Message:
    2008-09-08  Ville-Pekka Vainio <vpivaini at cs.helsinki.fi> (via
vpv at fedoraproject.org)
    
      * po/fi.po: Updated Finnish translation
    



Index: fi.po
===================================================================
RCS file: /cvs/pkgs/comps/po/fi.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fi.po	17 Jul 2008 18:31:24 -0000	1.15
+++ fi.po	8 Sep 2008 17:45:02 -0000	1.16
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: fi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-17 14:29-0400\n"
-"PO-Revision-Date: 2008-05-25 18:57+0300\n"
+"POT-Creation-Date: 2008-08-30 19:28+0000\n"
+"PO-Revision-Date: 2008-08-31 01:08+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"
@@ -1149,13 +1149,12 @@
 msgstr "Pohjoissaamen kielituki"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:133
-#, fuzzy
 msgid "SUGAR Desktop Environment"
-msgstr "Ty??p??yt??ymp??rist??t"
+msgstr "SUGAR-ty??p??yt??ymp??rist??"
 
 #: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:134
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
-msgstr ""
+msgstr "SUGAR on OLCP XO:lle kehitetty ty??p??yt??ymp??rist??."
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:204
 msgid "Walloon Support"
@@ -1163,7 +1162,7 @@
 
 #: ../comps-f10.xml.in.h:70
 msgid "Haskell"
-msgstr ""
+msgstr "Haskell"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
@@ -1174,9 +1173,8 @@
 msgstr "Sy??tt??menetelm??paketteja kansainv??lisen tekstin sy??tt??miseen."
 
 #: ../comps-f10.xml.in.h:157
-#, fuzzy
 msgid "Tajik Support"
-msgstr "Thain kielituki"
+msgstr "Tad??ikin kielituki"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"



From dwalsh at fedoraproject.org  Mon Sep  8 17:48:32 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  8 Sep 2008 17:48:32 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.387,
	1.388 policycoreutils.spec, 1.551, 1.552
Message-ID: <20080908174832.19F14700FD@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13794

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Sep 8 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-3
- Fix fixfiles to correct unlabeled_t files and remove .? files


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- policycoreutils-rhat.patch	3 Sep 2008 21:46:03 -0000	1.387
+++ policycoreutils-rhat.patch	8 Sep 2008 17:47:59 -0000	1.388
@@ -69,6 +69,24 @@
  	strings_list_print(list1);
  	strings_list_free(list);
  	strings_list_free(list1);
+diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.55/scripts/fixfiles
+--- nsapolicycoreutils/scripts/fixfiles	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.55/scripts/fixfiles	2008-09-08 13:45:29.000000000 -0400
+@@ -141,12 +141,13 @@
+ rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-*
+ find /tmp -context "*:file_t*" -exec chcon -t tmp_t {} \;
+ find /var/tmp -context "*:file_t*" -exec chcon -t tmp_t {} \;
++find /var/tmp -context "*:unlabeled_t*" -exec chcon -t tmp_t {} \;
+ exit $?
+ }
+ 
+ fullrelabel() {
+     logit "Cleaning out /tmp"
+-    rm -rf /tmp/.??* /tmp/*
++    rm -rf /tmp/.[^.]* /tmp/*
+     LogReadOnly
+     restore
+ }
 diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.55/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2008-08-28 09:34:24.000000000 -0400
 +++ policycoreutils-2.0.55/semanage/semanage	2008-08-29 14:34:58.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.551
retrieving revision 1.552
diff -u -r1.551 -r1.552
--- policycoreutils.spec	3 Sep 2008 21:46:04 -0000	1.551
+++ policycoreutils.spec	8 Sep 2008 17:48:01 -0000	1.552
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.55
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Mon Sep 8 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-3
+- Fix fixfiles to correct unlabeled_t files and remove .? files
+
 * Wed Sep 3 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-2
 - Add glob support to restorecond so it can check every file in the homedir
 



From nsantos at fedoraproject.org  Mon Sep  8 17:49:54 2008
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Mon,  8 Sep 2008 17:49:54 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.36,1.37
Message-ID: <20080908174954.9A410700FD@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14204

Modified Files:
	qpidc.spec 
Log Message:
add qmf subpackage


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- qpidc.spec	8 Sep 2008 17:05:03 -0000	1.36
+++ qpidc.spec	8 Sep 2008 17:49:24 -0000	1.37
@@ -4,10 +4,13 @@
 # svn revision: $Rev: 654927 $
 #
 %define qpidd qpidd
+%define qmf qmf
 %define svnrev 693140
 
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Name:           qpidc
-Version:        0.3.%{svnrev}
+Version: 	0.3.%{?svnrev}
 Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
@@ -19,7 +22,6 @@
 ExclusiveArch: i386 i686 x86_64
 
 BuildRequires: boost-devel
-BuildRequires: cppunit-devel
 BuildRequires: doxygen
 BuildRequires: e2fsprogs-devel
 BuildRequires: libtool
@@ -83,6 +85,22 @@
 Libraries and header files for developing extensions to the
 Qpid broker daemon.
 
+%package -n %{qmf}
+Summary: The QPID Management Framework
+Group: System Environment/Daemons
+Requires: %name = %version-%release
+
+%description -n %{qmf}
+An extensible managememt framework layered on QPID messaging.
+
+%package -n %{qmf}-devel
+Summary: Header files and tools for developing QMF extensions
+Group: Development/System
+Requires: %{qmf} = %version-%release
+
+%description -n %{qmf}-devel
+Header files and code-generation tools needed for developers of QMF-managed components.
+
 %package perftest
 Summary: Simple benchmarking tools
 Group: System Environment/Tools
@@ -94,13 +112,18 @@
 %pre
 getent group qpidd >/dev/null || groupadd -r qpidd
 getent passwd qpidd >/dev/null || \
-  useradd -r -m -g qpidd -d %{_localstatedir}/lib/qpidd -s /sbin/nologin \
+  useradd -r -M -g qpidd -d %{_localstatedir}/lib/qpidd -s /sbin/nologin \
     -c "Owner of Qpidd Daemons" qpidd
 exit 0
 
 %prep
 %setup -q
 
+%define perftests "perftest topic_listener topic_publisher latencytest \
+  client_test fanout_perftest multiq_perftest python_tests quick_perftest \
+  quick_topictest run_federation_tests run_perftest run_test run-unit-tests \
+  shared_perftest start_broker stop_broker topic_perftest topictest txtest"
+
 %build
 CXXFLAGS="%{optflags} -DNDEBUG -O3" \
 %configure --disable-static --without-cpg --without-graphviz --without-help2man
@@ -109,7 +132,9 @@
 rm docs/api/html/installdox
 # Make perftest utilities
 pushd src/tests
-make perftest topic_listener topic_publisher latencytest
+for ptest in %{perftests}; do
+  make $ptest
+done
 popd
 
 %install
@@ -122,10 +147,9 @@
 install -d -m0755 %{buildroot}/var/run/qpidd
 # Install perftest utilities
 pushd %{_builddir}/%{name}-%{version}/src/tests/
-libtool --mode=install install -m755 perftest %{buildroot}/%_bindir
-libtool --mode=install install -m755 topic_listener %{buildroot}/%_bindir
-libtool --mode=install install -m755 topic_publisher %{buildroot}/%_bindir
-libtool --mode=install install -m755 latencytest %{buildroot}/%_bindir
+for ptest in %{perftests}; do
+  libtool --mode=install install -m755 $ptest %{buildroot}/%_bindir
+done
 popd
 rm -f %{buildroot}%_libdir/*.a
 rm -f %{buildroot}%_libdir/*.l
@@ -156,10 +180,9 @@
 %_includedir/qpid/sys
 %_includedir/qpid/log
 %_includedir/qpid/management
+%_includedir/qpid/agent
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
-%_bindir/managementgen
-%_datadir/managementgen
 %doc docs/api/html
 
 %files -n %{qpidd}
@@ -168,6 +191,8 @@
 %_libdir/libqpidbroker.so.0.1.0
 %_libdir/libqpidcluster.so.0
 %_libdir/libqpidcluster.so.0.1.0
+%_libdir/libqpidacl.so.0
+%_libdir/libqpidacl.so.0.1.0
 %_sbindir/%{qpidd}
 %config(noreplace) %_sysconfdir/qpidd.conf
 %config(noreplace) %_sysconfdir/sasl2/qpidd.conf
@@ -180,17 +205,46 @@
 
 %files -n %{qpidd}-devel
 %defattr(-,root,root,-)
-%doc rpm/README.qpidd-devel
+#%doc rpm/README.qpidd-devel
 %defattr(-,root,root,-)
 %_libdir/libqpidbroker.so
 %_libdir/libqpidcluster.so
+%_libdir/libqpidacl.so
 %_includedir/qpid/broker
 
+%files -n %{qmf}
+%defattr(-,root,root,-)
+%_libdir/libqmfagent.so.0
+%_libdir/libqmfagent.so.0.1.0
+
+%files -n %{qmf}-devel
+%defattr(-,root,root,-)
+%_libdir/libqmfagent.so
+%_bindir/qmf-gen
+%{python_sitelib}/qmf
+
 %files perftest
+%defattr(755,root,root,-)
 %_bindir/perftest
 %_bindir/topic_listener
 %_bindir/topic_publisher
 %_bindir/latencytest
+%_bindir/client_test
+%_bindir/fanout_perftest
+%_bindir/multiq_perftest
+%_bindir/python_tests
+%_bindir/quick_perftest
+%_bindir/quick_topictest
+%_bindir/run-unit-tests
+%_bindir/run_federation_tests
+%_bindir/run_perftest
+%_bindir/run_test
+%_bindir/shared_perftest
+%_bindir/start_broker
+%_bindir/stop_broker
+%_bindir/topic_perftest
+%_bindir/topictest
+%_bindir/txtest
 
 %post -p /sbin/ldconfig
 
@@ -218,11 +272,22 @@
 * Mon Sep  8 2008 Nuno Santos <nsantos at redhat.com> - 0.3.693140-1
 - Update for Fedora 10
 
-* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.667603-3
-- fix license tag
+* Wed Aug 21 2008 Justin Ross <jross at redhat.com> - 0.2.687156-1
+- Update to source revision 687156 of the qpid.0-10 branch
+
+* Wed Aug 14 2008 Justin Ross <jross at redhat.com> - 0.2.685273-1
+- Update to source revision 685273 of the qpid.0-10 branch
+
+* Wed Aug  6 2008 Justin Ross <jross at redhat.com> - 0.2.683301-1
+- Update to source revision 683301 of the qpid.0-10 branch
+
+* Thu Jul 15 2008 Justin Ross <jross at redhat.com> - 0.2.676581-1
+- Update to source revision 676581 of the qpid.0-10 branch
+- Work around home dir creation problem
+- Use a license string that rpmlint likes
 
-* Tue Jul  7 2008 Nuno Santos <nsantos at redhat.com> - 0.2.667603-2
-- MRG GA release
+* Thu Jul 10 2008 Nuno Santos <nsantos at redhat.com> - 0.2.667603-3
+- BZ453818: added additional tests to -perftest
 
 * Thu Jun 13 2008 Justin Ross <jross at redhat.com> - 0.2.667603-1
 - Update to source revision 667603



From jjohnstn at fedoraproject.org  Mon Sep  8 17:58:29 2008
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Mon,  8 Sep 2008 17:58:29 +0000 (UTC)
Subject: rpms/eclipse-cdt/devel eclipse-cdt-autotools-plugin.patch, NONE,
	1.1 eclipse-cdt.spec, 1.106, 1.107
Message-ID: <20080908175829.BBAAB700FD@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16560

Modified Files:
	eclipse-cdt.spec 
Added Files:
	eclipse-cdt-autotools-plugin.patch 
Log Message:

* Thu Sep 04 2008 Jeff Johnston <jjohnstn at redhat.com> 5.0.0-5
- Fix for autotools plugin referencing invalid build nature.
- Resolves #461201



eclipse-cdt-autotools-plugin.patch:

--- NEW FILE eclipse-cdt-autotools-plugin.patch ---
diff -up ./plugin.xml.fix ./plugin.xml
--- ./plugin.xml.fix	2008-09-04 16:09:17.000000000 -0400
+++ ./plugin.xml	2008-09-04 16:09:34.000000000 -0400
@@ -754,7 +754,7 @@
          name="%AutotoolsNature.name"
          point="org.eclipse.core.resources.natures">
       <requires-nature
-            id="org.eclipse.cdt.managedbuilder.core.mangedBuildNature">
+            id="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
       </requires-nature>
       <runtime>
          <run


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- eclipse-cdt.spec	28 Aug 2008 16:48:24 -0000	1.106
+++ eclipse-cdt.spec	8 Sep 2008 17:57:59 -0000	1.107
@@ -20,7 +20,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -54,6 +54,9 @@
 # Script to run the tests in Xvnc
 Source5: %{name}-runtests.sh
 
+# Fix autotools plugin to reference correct project nature.
+Patch5: %{name}-autotools-plugin.patch
+
 # Don't run the tests as part of the build.  We'll do this ourselves.
 Patch4: %{name}-no-tests-%{version}.patch
 
@@ -200,8 +203,12 @@
 
 ## Autotools stuff
 mkdir autotools
+
 pushd autotools
 tar -xzf %{SOURCE1}
+pushd com.redhat.eclipse.cdt.autotools
+%patch5
+popd
 popd
 
 ## Cppunit stuff
@@ -517,6 +524,10 @@
 %endif
 
 %changelog
+* Thu Sep 04 2008 Jeff Johnston <jjohnstn at redhat.com> 5.0.0-5
+- Fix for autotools plugin referencing invalid build nature.
+- Resolves #461201
+
 * Wed Aug 20 2008 Andrew Overholt <overholt at redhat.com> 5.0.0-4
 - Add building and running of tests
 - Remove LexerTests until 5.0.1



From rhughes at fedoraproject.org  Mon Sep  8 18:03:49 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  8 Sep 2008 18:03:49 +0000 (UTC)
Subject: rpms/gnome-packagekit/F-9 gnome-packagekit-fix-gtype.patch, NONE,
	1.1 gnome-packagekit.spec, 1.49, 1.50
Message-ID: <20080908180349.6E0FD700FD@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18167

Modified Files:
	gnome-packagekit.spec 
Added Files:
	gnome-packagekit-fix-gtype.patch 
Log Message:
* Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.5-2
- Fix a critical GType initialisation problem.


gnome-packagekit-fix-gtype.patch:

--- NEW FILE gnome-packagekit-fix-gtype.patch ---
commit 88f211513ef1e2eeec0f1d080eb3e17866bd833b
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Sep 8 18:53:10 2008 +0100

    bugfix: fix a crash in the GType initialisation due to compiling with LibGBus

diff --git a/libgbus/libgbus.c b/libgbus/libgbus.c
index ce91b6b..58b7cdf 100644
--- a/libgbus/libgbus.c
+++ b/libgbus/libgbus.c
@@ -53,7 +53,7 @@ enum {
 
 static guint	     signals [LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (LibGBus, libgbus, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GpkGBus, libgbus, G_TYPE_OBJECT)
 
 /**
  * name_owner_changed_cb:
diff --git a/libgbus/libgbus.h b/libgbus/libgbus.h
index 78697ab..b47ca26 100644
--- a/libgbus/libgbus.h
+++ b/libgbus/libgbus.h
@@ -50,6 +50,9 @@ typedef struct
 	void		(* connection_replaced)	(LibGBus	*watch);
 } LibGBusClass;
 
+typedef LibGBus GpkGBus;
+typedef LibGBusClass GpkGBusClass;
+
 typedef enum {
         LIBGBUS_SESSION,
         LIBGBUS_SYSTEM


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/gnome-packagekit.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gnome-packagekit.spec	6 Sep 2008 09:51:42 -0000	1.49
+++ gnome-packagekit.spec	8 Sep 2008 18:03:19 -0000	1.50
@@ -4,16 +4,16 @@
 Summary:   GNOME PackageKit Client
 Name:      gnome-packagekit
 Version:   0.2.5
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
-#Source0:   http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}-%{?alphatag}.tar.gz
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
 Source1:   system-install-packages
 Source2:   system-install-packages.1.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:    gnome-packagekit-enable-kde.patch
+Patch1:    gnome-packagekit-fix-gtype.patch
 
 Requires:  gtk2 >= 2.12.0
 Requires:  gnome-icon-theme
@@ -61,6 +61,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-scrollkeeper --disable-schemas-install
@@ -144,6 +145,9 @@
 %{_datadir}/applications/gpk-*.desktop
 
 %changelog
+* Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.5-2
+- Fix a critical GType initialisation problem.
+
 * Sat Sep 06 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.5-1
 - New upstream version, only bugfixes.
 



From cweyl at fedoraproject.org  Mon Sep  8 18:08:11 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 18:08:11 +0000 (UTC)
Subject: rpms/perl-RPC-XML/F-9 README.license, NONE, 1.1 perl-RPC-XML.spec, 
	NONE, 1.1 tests.patch, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080908180811.7D023700FD@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-RPC-XML/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19449

Modified Files:
	sources 
Added Files:
	README.license perl-RPC-XML.spec tests.patch 
Log Message:
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.60-3
- bump



--- NEW FILE README.license ---
Date: Tue, 04 Mar 2008 07:39:56 -0800
From: "Randy J. Ray" <rjray at blackperl.com>
To: Nick B <nsboyle at gmail.com>
Subject: Re: Fedora package for RPC-XML

Consider this confirmation that you may distribute it under the Artistic 
License 2.0, as specified at 
http://www.opensource.org/licenses/artistic-license-2.0.php

I am in the process of revising the licensing on all of my modules to be 
dual-licensed under the above and also LGPL 2.1 as specified at 
http://www.opensource.org/licenses/lgpl-2.1.php

However, because of other patches that have to be applied, integrated and 
tested, it may be some time before a new RPC-XML release is made. Please take 
this message as explicit permission to package and release under the licensing 
terms you require. Thank you.

Randy
-- 
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
Randy J. Ray        Sunnyvale, CA    http://www.rjray.org   rjray at blackperl.com

Silicon Valley Scale Modelers: http://www.svsm.org

###############################################################################

Date: Tue, 4 Mar 2008 09:09:04 -0500
From: "Nick B" <nsboyle at gmail.com>
To: rjray at blackperl.com
Subject: Fedora package for RPC-XML

Randy,

I've submitted a review request for RPC-XML with the Fedora project,
for inclusion in the official repository
(https://bugzilla.redhat.com/show_bug.cgi?id=435835).

There is one minor obstacle I've encountered in putting together the
package; here is your licensing specification from XML.pm:

# Copying and distribution are permitted under the terms of the Artistic
# License as distributed with Perl versions 5.005 and later. See
# http://www.opensource.org/licenses/artistic-license.php

The link above is broken, and the sentence is open to interpretation
over whether your intent is to have it licensed under the original
Artistic license (1.0), or the current (2.0).  The former, 1.0, is
unfortunately incompatible with Fedora's guidelines regarding
licensing.  I had originally interpreted "and later" to implicitly
mean the later versions of licenses to go along with the later
versions of Perl, but it was suggested that I should confirm with you
first.

I can package it under 2.0, but I need your confirmation via e-mail
that this is okay.  Let me know your thoughts on this.


Thanks,

Nick


--- NEW FILE perl-RPC-XML.spec ---
%define real_name RPC-XML

Name:    perl-RPC-XML
Version: 0.60
Release:        3%{?dist}
Summary: Set of classes for core data, message and XML handling

Group:   Development/Libraries
License: Artistic 2.0 or LGPLv2
URL:     http://search.cpan.org/dist/RPC-XML/

Source0:   http://www.cpan.org/modules/by-module/RPC/%{real_name}-%{version}.tar.gz
Source1:   README.license
Patch0:    tests.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
BuildArch: noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(LWP)
BuildRequires: perl(Test::More)
BuildRequires: perl(XML::Parser)
# optional tests
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)

%package -n perl-Apache-RPC
Summary: Companion packages for RPC::XML tuned for mod_perl environments
Group:   Development/Libraries


%description
The RPC::XML package is an implementation of XML-RPC. The module provides
classes for sample client and server implementations, a server designed as an
Apache location-handler, and a suite of data-manipulation classes that are 
used by them.

%description -n perl-Apache-RPC
This package contains Apache::RPC::Server and Apache::RPC::Status, useful for
running RPC::XML under mod_perl.


%prep
%setup -qn %{real_name}-%{version}
%patch0
cp -p %{SOURCE1} .

chmod -c -x t/* 

#Filter unwanted Provides:
#  RPC::XML::Method creates two entries for some reason?
cat << \EOF > %{real_name}-prov
#!/bin/sh
%{__perl_provides} $* |\
  %{__sed} -e '/perl(RPC::XML::Method)$/d'
EOF

%define __perl_provides %{_builddir}/%{real_name}-%{version}/%{real_name}-prov
chmod +x %{__perl_provides}

%build
perl Makefile.PL INSTALLDIRS="vendor" PREFIX="%{_prefix}"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc ChangeLog README etc/*.dtd README.license ex/ methods/ t/
%{_mandir}/man3/RPC*
%{_mandir}/man1/*
%{_bindir}/make_method
%{perl_vendorlib}/RPC
%{perl_vendorlib}/auto/*

%files -n perl-Apache-RPC
%defattr(-,root,root,-)
%doc README.apache2 README.license
%{_mandir}/man3/Apache*
%{perl_vendorlib}/Apache

%changelog
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.60-3
- bump

* Tue Aug 26 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.60-2
- quiesce offending test

* Sat Aug 23 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.60-1
- even more spec cleanups :-)
- update licensing

* Fri Jul 04 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.60-0.1
- update to 0.60
- spec file cleanups

* Sun Mar 16 2008 Nicholas Boyle <nsboyle at gmail.com> - 0.59-5
- Added BuildRequires for Test::More and XML::Parser

* Sun Mar 16 2008 Nicholas Boyle <nsboyle at gmail.com> - 0.59-4
- Created subpackage perl-Apache-RPC to allow RPC-XML to work without
  requiring mod_perl
- Manpages now installed as regular files, instead of docs
- Removed explicit perl_archlib and perl_vendorarch definitions

* Fri Mar 07 2008 Nicholas Boyle <nsboyle at gmail.com> - 0.59-3
- Added README.license to clarify licensing

* Sat Mar 01 2008 Nicholas Boyle <nsboyle at gmail.com> - 0.59-2
- Initial Fedora packaging

* Mon Sep 18 2006 Dries Verachtert <dries at ulyssis.org> - 0.59-1
- Updated to release 0.59.

* Wed Mar 22 2006 Dries Verachtert <dries at ulyssis.org> - 0.58-1.2
- Rebuild for Fedora Core 5.

* Wed Jun  8 2005 Dries Verachtert <dries at ulyssis.org> - 0.58-1
- Updated to release 0.58.

* Sat Jan  1 2005 Dries Verachtert <dries at ulyssis.org> - 0.57-1
- Initial package.

tests.patch:

--- NEW FILE tests.patch ---
--- t/40_server.t.orig	2008-08-26 18:13:03.857320619 -0700
+++ t/40_server.t	2008-08-26 18:38:25.243322216 -0700
@@ -55,8 +55,12 @@
 $srv = RPC::XML::Server->new(no_default => 1,
                              host => 'localhost', port => $port);
 isa_ok($srv, 'RPC::XML::Server', '$srv<2>');
-is($srv->url, "http://localhost:$port/",
-   'RPC::XML::Server::url method (set)'); # This should be non-null this time
+TODO: {
+    local $TODO = 'Flaky test often fails depending on /etc/hosts';
+    is($srv->url, "http://localhost:$port/",
+        'RPC::XML::Server::url method (set)'); 
+        # This should be non-null this time
+}
 # Test some of the simpler cases of add_method and get_method
 $res = $srv->add_method({ name      => 'perl.test.suite.test1',
                           signature => [ 'int' ],


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-RPC-XML/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 15:16:30 -0000	1.1
+++ sources	8 Sep 2008 18:07:41 -0000	1.2
@@ -0,0 +1 @@
+82bf481396e5ad5cc63c1e70483dd904  RPC-XML-0.60.tar.gz



From langel at fedoraproject.org  Mon Sep  8 18:09:54 2008
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon,  8 Sep 2008 18:09:54 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-9 java-1.6.0-openjdk-hotspot.patch, NONE, 
	1.1 java-1.6.0-openjdk.spec, 1.54, 1.55
Message-ID: <20080908180954.85D8A700FD@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20155

Modified Files:
	java-1.6.0-openjdk.spec 
Added Files:
	java-1.6.0-openjdk-hotspot.patch 
Log Message:
* Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.18.b09
- Added hotspot patch (Patch11) to fix eclipse crashing bug.
- Resolves: rhbz#460205



java-1.6.0-openjdk-hotspot.patch:

--- NEW FILE java-1.6.0-openjdk-hotspot.patch ---
--- openjdk/hotspot/src/share/vm/opto/cfgnode.cpp.orig	2008-06-08 15:15:19.000000000 +0200
+++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp	2008-06-08 15:16:06.000000000 +0200
@@ -1551,45 +1551,6 @@
     if (opt != NULL)  return opt;
   }
 
-  if (in(1) != NULL && in(1)->Opcode() == Op_AddP && can_reshape) {
-    // Try to undo Phi of AddP:
-    //   (Phi (AddP base base y) (AddP base2 base2 y))
-    // becomes:
-    //   newbase := (Phi base base2)
-    //   (AddP newbase newbase y)
-    //
-    // This occurs as a result of unsuccessful split_thru_phi and
-    // interferes with taking advantage of addressing modes.  See the
-    // clone_shift_expressions code in matcher.cpp
-    Node* addp = in(1);
-    const Type* type = addp->in(AddPNode::Base)->bottom_type();
-    Node* y = addp->in(AddPNode::Offset);
-    if (y != NULL && addp->in(AddPNode::Base) == addp->in(AddPNode::Address)) {
-      // make sure that all the inputs are similar to the first one,
-      // i.e. AddP with base == address and same offset as first AddP
-      bool doit = true;
-      for (uint i = 2; i < req(); i++) {
-        if (in(i) == NULL ||
-            in(i)->Opcode() != Op_AddP ||
-            in(i)->in(AddPNode::Base) != in(i)->in(AddPNode::Address) ||
-            in(i)->in(AddPNode::Offset) != y) {
-          doit = false;
-          break;
-        }
-        // Accumulate type for resulting Phi
-        type = type->meet(in(i)->in(AddPNode::Base)->bottom_type());
-      }
-      if (doit) {
-        Node* base = new (phase->C, in(0)->req()) PhiNode(in(0), type, NULL);
-        for (uint i = 1; i < req(); i++) {
-          base->init_req(i, in(i)->in(AddPNode::Base));
-        }
-        phase->is_IterGVN()->register_new_node_with_optimizer(base);
-        return new (phase->C, 4) AddPNode(base, base, y);
-      }
-    }
-  }
-
   // Split phis through memory merges, so that the memory merges will go away.
   // Piggy-back this transformation on the search for a unique input....
   // It will be as if the merged memory is the unique value of the phi.


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/java-1.6.0-openjdk.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- java-1.6.0-openjdk.spec	8 Sep 2008 13:03:24 -0000	1.54
+++ java-1.6.0-openjdk.spec	8 Sep 2008 18:09:24 -0000	1.55
@@ -174,6 +174,7 @@
 Patch8:   java-1.6.0-openjdk-6607339.patch
 Patch9:   java-1.6.0-openjdk-6661918.patch
 Patch10:  java-1.6.0-openjdk-6685178.patch
+Patch11:  java-1.6.0-openjdk-hotspot.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -394,6 +395,7 @@
 patch -l -p0 < %{PATCH9}
 %endif
 patch -l -p0 < %{PATCH10}
+patch -l -p0 < %{PATCH11}
 make
 
 # Build cacerts file.
@@ -929,6 +931,10 @@
 
 %changelog
 * Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.18.b09
+- Added hotspot patch (Patch11) to fix eclipse crashing bug.
+- Resolves: rhbz#460205
+
+* Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.18.b09
 - Added rhino requirement.
 - Resolves: rhbz#461336
 



From dwalsh at fedoraproject.org  Mon Sep  8 18:10:08 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  8 Sep 2008 18:10:08 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.388,
	1.389 policycoreutils.spec, 1.552, 1.553
Message-ID: <20080908181008.E44BD700FD@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20253

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Sep 8 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-4
- Fix fixfiles to correct unlabeled_t files and remove .? files


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- policycoreutils-rhat.patch	8 Sep 2008 17:47:59 -0000	1.388
+++ policycoreutils-rhat.patch	8 Sep 2008 18:09:36 -0000	1.389
@@ -71,19 +71,22 @@
  	strings_list_free(list1);
 diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.55/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/scripts/fixfiles	2008-09-08 13:45:29.000000000 -0400
-@@ -141,12 +141,13 @@
++++ policycoreutils-2.0.55/scripts/fixfiles	2008-09-08 14:08:57.000000000 -0400
+@@ -139,14 +139,14 @@
+ LogReadOnly
+ ${SETFILES} -q ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
  rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-*
- find /tmp -context "*:file_t*" -exec chcon -t tmp_t {} \;
- find /var/tmp -context "*:file_t*" -exec chcon -t tmp_t {} \;
-+find /var/tmp -context "*:unlabeled_t*" -exec chcon -t tmp_t {} \;
+-find /tmp -context "*:file_t*" -exec chcon -t tmp_t {} \;
+-find /var/tmp -context "*:file_t*" -exec chcon -t tmp_t {} \;
++find /tmp \( -context "*:file_t*" -o -context "*:unlabeled_t*" \) -exec chcon -t tmp_t {} \;
++find /var/tmp \( -context "*:file_t*" -o -context "*:unlabeled_t*" \) -exec chcon -t tmp_t {} \;
  exit $?
  }
  
  fullrelabel() {
      logit "Cleaning out /tmp"
 -    rm -rf /tmp/.??* /tmp/*
-+    rm -rf /tmp/.[^.]* /tmp/*
++    find /tmp/ -mindepth 1 -print0 | xargs -0 /bin/rm -f
      LogReadOnly
      restore
  }


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.552
retrieving revision 1.553
diff -u -r1.552 -r1.553
--- policycoreutils.spec	8 Sep 2008 17:48:01 -0000	1.552
+++ policycoreutils.spec	8 Sep 2008 18:09:38 -0000	1.553
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.55
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,7 +192,7 @@
 fi
 
 %changelog
-* Mon Sep 8 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-3
+* Mon Sep 8 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-4
 - Fix fixfiles to correct unlabeled_t files and remove .? files
 
 * Wed Sep 3 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-2



From langel at fedoraproject.org  Mon Sep  8 18:10:51 2008
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon,  8 Sep 2008 18:10:51 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-9 java-1.6.0-openjdk.spec,1.55,1.56
Message-ID: <20080908181051.E63EA700FD@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20551

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
Updated release.




Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/java-1.6.0-openjdk.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- java-1.6.0-openjdk.spec	8 Sep 2008 18:09:24 -0000	1.55
+++ java-1.6.0-openjdk.spec	8 Sep 2008 18:10:21 -0000	1.56
@@ -134,7 +134,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.17.%{openjdkver}%{?dist}
+Release: 0.18.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a



From pkgdb at fedoraproject.org  Mon Sep  8 18:11:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 18:11:28 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20080908181128.592AB208D0F@bastion.fedora.phx.redhat.com>

Package ksensors in Fedora devel was orphaned by lyosnorezel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Mon Sep  8 18:11:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 18:11:35 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20080908181135.E3BDB208D97@bastion.fedora.phx.redhat.com>

Package ksensors in Fedora devel is now owned by lyosnorezel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksensors



From lutter at fedoraproject.org  Mon Sep  8 18:17:14 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Mon,  8 Sep 2008 18:17:14 +0000 (UTC)
Subject: rpms/facter/EL-4 .cvsignore, 1.6, 1.7 facter.spec, 1.7, 1.8 sources,
	1.6, 1.7
Message-ID: <20080908181714.7DB22700FD@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/facter/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22376/EL-4

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/facter/EL-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Jul 2008 20:28:28 -0000	1.6
+++ .cvsignore	8 Sep 2008 18:16:44 -0000	1.7
@@ -1 +1 @@
-facter-1.5.0.tgz
+facter-1.5.1.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/facter/EL-4/facter.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- facter.spec	17 Jul 2008 20:28:28 -0000	1.7
+++ facter.spec	8 Sep 2008 18:16:44 -0000	1.8
@@ -5,8 +5,8 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.0
-Release: 2%{?dist}
+Version: 1.5.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
@@ -36,7 +36,7 @@
 
 %install
 rm -rf %{buildroot}
-mkdir %{buildroot}
+mkdir -p %{buildroot}
 
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter
@@ -64,6 +64,12 @@
 
 
 %changelog
+* Mon Sep  8 2008 David Lutterkort <dlutter at redhat.com> - 1.5.1-1
+- New version
+
+* Thu Jul 17 2008 David Lutterkort <dlutter at redhat.com> - 1.5.0-3
+- Change 'mkdir' in install to 'mkdir -p'
+
 * Thu Jul 17 2008 David Lutterkort <dlutter at redhat.com> - 1.5.0-2
 - Remove files that were listed twice in files section
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/facter/EL-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Jul 2008 20:28:28 -0000	1.6
+++ sources	8 Sep 2008 18:16:44 -0000	1.7
@@ -1 +1 @@
-91353915fee1c22c9016ffed115f0abd  facter-1.5.0.tgz
+cf836b3b378006fdefdf5716e6d2957a  facter-1.5.1.tgz



From lutter at fedoraproject.org  Mon Sep  8 18:17:14 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Mon,  8 Sep 2008 18:17:14 +0000 (UTC)
Subject: rpms/facter/F-8 .cvsignore, 1.7, 1.8 facter.spec, 1.8, 1.9 sources, 
	1.7, 1.8
Message-ID: <20080908181714.F04DE700FD@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/facter/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22376/F-8

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/facter/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Jul 2008 20:28:57 -0000	1.7
+++ .cvsignore	8 Sep 2008 18:16:44 -0000	1.8
@@ -1 +1 @@
-facter-1.5.0.tgz
+facter-1.5.1.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/facter/F-8/facter.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- facter.spec	17 Jul 2008 20:28:57 -0000	1.8
+++ facter.spec	8 Sep 2008 18:16:44 -0000	1.9
@@ -5,8 +5,8 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.0
-Release: 2%{?dist}
+Version: 1.5.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
@@ -36,7 +36,7 @@
 
 %install
 rm -rf %{buildroot}
-mkdir %{buildroot}
+mkdir -p %{buildroot}
 
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter
@@ -64,6 +64,12 @@
 
 
 %changelog
+* Mon Sep  8 2008 David Lutterkort <dlutter at redhat.com> - 1.5.1-1
+- New version
+
+* Thu Jul 17 2008 David Lutterkort <dlutter at redhat.com> - 1.5.0-3
+- Change 'mkdir' in install to 'mkdir -p'
+
 * Thu Jul 17 2008 David Lutterkort <dlutter at redhat.com> - 1.5.0-2
 - Remove files that were listed twice in files section
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/facter/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Jul 2008 20:28:57 -0000	1.7
+++ sources	8 Sep 2008 18:16:44 -0000	1.8
@@ -1 +1 @@
-91353915fee1c22c9016ffed115f0abd  facter-1.5.0.tgz
+cf836b3b378006fdefdf5716e6d2957a  facter-1.5.1.tgz



From lutter at fedoraproject.org  Mon Sep  8 18:17:14 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Mon,  8 Sep 2008 18:17:14 +0000 (UTC)
Subject: rpms/facter/EL-5 .cvsignore, 1.7, 1.8 facter.spec, 1.8, 1.9 sources,
	1.7, 1.8
Message-ID: <20080908181714.B8058700FD@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/facter/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22376/EL-5

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/facter/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Jul 2008 20:28:30 -0000	1.7
+++ .cvsignore	8 Sep 2008 18:16:44 -0000	1.8
@@ -1 +1 @@
-facter-1.5.0.tgz
+facter-1.5.1.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/facter/EL-5/facter.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- facter.spec	17 Jul 2008 20:28:30 -0000	1.8
+++ facter.spec	8 Sep 2008 18:16:44 -0000	1.9
@@ -5,8 +5,8 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.0
-Release: 2%{?dist}
+Version: 1.5.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
@@ -36,7 +36,7 @@
 
 %install
 rm -rf %{buildroot}
-mkdir %{buildroot}
+mkdir -p %{buildroot}
 
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter
@@ -64,6 +64,12 @@
 
 
 %changelog
+* Mon Sep  8 2008 David Lutterkort <dlutter at redhat.com> - 1.5.1-1
+- New version
+
+* Thu Jul 17 2008 David Lutterkort <dlutter at redhat.com> - 1.5.0-3
+- Change 'mkdir' in install to 'mkdir -p'
+
 * Thu Jul 17 2008 David Lutterkort <dlutter at redhat.com> - 1.5.0-2
 - Remove files that were listed twice in files section
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/facter/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Jul 2008 20:28:30 -0000	1.7
+++ sources	8 Sep 2008 18:16:44 -0000	1.8
@@ -1 +1 @@
-91353915fee1c22c9016ffed115f0abd  facter-1.5.0.tgz
+cf836b3b378006fdefdf5716e6d2957a  facter-1.5.1.tgz



From lutter at fedoraproject.org  Mon Sep  8 18:17:15 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Mon,  8 Sep 2008 18:17:15 +0000 (UTC)
Subject: rpms/facter/F-9 .cvsignore, 1.7, 1.8 facter.spec, 1.8, 1.9 sources, 
	1.7, 1.8
Message-ID: <20080908181715.2E92B700FD@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/facter/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22376/F-9

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/facter/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Jul 2008 20:29:18 -0000	1.7
+++ .cvsignore	8 Sep 2008 18:16:44 -0000	1.8
@@ -1 +1 @@
-facter-1.5.0.tgz
+facter-1.5.1.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/facter/F-9/facter.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- facter.spec	17 Jul 2008 20:29:18 -0000	1.8
+++ facter.spec	8 Sep 2008 18:16:44 -0000	1.9
@@ -5,8 +5,8 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.0
-Release: 2%{?dist}
+Version: 1.5.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
@@ -36,7 +36,7 @@
 
 %install
 rm -rf %{buildroot}
-mkdir %{buildroot}
+mkdir -p %{buildroot}
 
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter
@@ -64,6 +64,12 @@
 
 
 %changelog
+* Mon Sep  8 2008 David Lutterkort <dlutter at redhat.com> - 1.5.1-1
+- New version
+
+* Thu Jul 17 2008 David Lutterkort <dlutter at redhat.com> - 1.5.0-3
+- Change 'mkdir' in install to 'mkdir -p'
+
 * Thu Jul 17 2008 David Lutterkort <dlutter at redhat.com> - 1.5.0-2
 - Remove files that were listed twice in files section
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/facter/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Jul 2008 20:29:18 -0000	1.7
+++ sources	8 Sep 2008 18:16:44 -0000	1.8
@@ -1 +1 @@
-91353915fee1c22c9016ffed115f0abd  facter-1.5.0.tgz
+cf836b3b378006fdefdf5716e6d2957a  facter-1.5.1.tgz



From lutter at fedoraproject.org  Mon Sep  8 18:17:15 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Mon,  8 Sep 2008 18:17:15 +0000 (UTC)
Subject: rpms/facter/devel .cvsignore, 1.7, 1.8 facter.spec, 1.9,
	1.10 sources, 1.7, 1.8
Message-ID: <20080908181715.64468700FD@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/facter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22376/devel

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/facter/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Jul 2008 20:29:40 -0000	1.7
+++ .cvsignore	8 Sep 2008 18:16:45 -0000	1.8
@@ -1 +1 @@
-facter-1.5.0.tgz
+facter-1.5.1.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/facter/devel/facter.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- facter.spec	17 Jul 2008 20:48:56 -0000	1.9
+++ facter.spec	8 Sep 2008 18:16:45 -0000	1.10
@@ -5,8 +5,8 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.0
-Release: 3%{?dist}
+Version: 1.5.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 David Lutterkort <dlutter at redhat.com> - 1.5.1-1
+- New version
+
 * Thu Jul 17 2008 David Lutterkort <dlutter at redhat.com> - 1.5.0-3
 - Change 'mkdir' in install to 'mkdir -p'
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/facter/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Jul 2008 20:29:40 -0000	1.7
+++ sources	8 Sep 2008 18:16:45 -0000	1.8
@@ -1 +1 @@
-91353915fee1c22c9016ffed115f0abd  facter-1.5.0.tgz
+cf836b3b378006fdefdf5716e6d2957a  facter-1.5.1.tgz



From cweyl at fedoraproject.org  Mon Sep  8 18:29:33 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 18:29:33 +0000 (UTC)
Subject: rpms/perl-Class-Method-Modifiers/devel import.log, NONE,
	1.1 perl-Class-Method-Modifiers.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080908182933.3C363700FD@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-Method-Modifiers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25173/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Class-Method-Modifiers.spec 
Log Message:
initial import



--- NEW FILE import.log ---
perl-Class-Method-Modifiers-1_01-1_fc9:HEAD:perl-Class-Method-Modifiers-1.01-1.fc9.src.rpm:1220898535


--- NEW FILE perl-Class-Method-Modifiers.spec ---

Name:       perl-Class-Method-Modifiers 
Version:    1.01 
Release:    1%{?dist}
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Provides Moose-like method modifiers 
Source:     http://search.cpan.org/CPAN/authors/id/S/SA/SARTAK/Class-Method-Modifiers-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Class-Method-Modifiers
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(MRO::Compat)
# testing
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::More)


%description
Method modifiers are a powerful feature from the CLOS (Common Lisp Object
System) world.

In its most basic form, a method modifier is just a method that calls
'$self->SUPER::foo(@_)'. I for one have trouble remembering that exact
invocation, so my classes seldom re-dispatch to their base classes. Very
bad!

'Class::Method::Modifiers' provides three modifiers: 'before', 'around',
and 'after'. 'before' and 'after' are run just before and after the method
they modify, but can not really affect that original method. 'around' is
run in place of the original method, with a hook to easily call that
original method. See the 'MODIFIERS' section for more details on how the
particular modifiers work.

%prep
%setup -q -n Class-Method-Modifiers-%{version}

find t/ -type f -exec perl -pi -e 's|^#!perl|#!/usr/bin/perl|' {} +

%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 t/
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.01-1
- initial Fedora packaging
- generated with cpan2dist (CPANPLUS::Dist::Fedora version 0.0.1)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Method-Modifiers/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 15:26:50 -0000	1.1
+++ .cvsignore	8 Sep 2008 18:29:01 -0000	1.2
@@ -0,0 +1 @@
+Class-Method-Modifiers-1.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Method-Modifiers/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 15:26:50 -0000	1.1
+++ sources	8 Sep 2008 18:29:01 -0000	1.2
@@ -0,0 +1 @@
+f0398c468025d21493745619b1114a46  Class-Method-Modifiers-1.01.tar.gz



From pgordon at fedoraproject.org  Mon Sep  8 18:33:10 2008
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Mon,  8 Sep 2008 18:33:10 +0000 (UTC)
Subject: rpms/midori/F-9 .cvsignore, 1.3, 1.4 midori.spec, 1.4, 1.5 sources, 
	1.3, 1.4
Message-ID: <20080908183310.C52EC700FD@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26209/F-9

Modified Files:
	.cvsignore midori.spec sources 
Log Message:
Update to 0.0.20; fix License tag; add icon cache scriptlets.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 May 2008 22:44:07 -0000	1.3
+++ .cvsignore	8 Sep 2008 18:32:40 -0000	1.4
@@ -1 +1 @@
-midori-0.0.18.tar.gz
+midori-0.0.20.tar.bz2


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-9/midori.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- midori.spec	25 May 2008 22:44:07 -0000	1.4
+++ midori.spec	8 Sep 2008 18:32:40 -0000	1.5
@@ -1,29 +1,28 @@
-## Dependency: WebKit SVN 29723+
-## This is the EVR for its sufficient Fedora package.
-%global	webkit_min_version	1.0.0-0.8.svn31787
-
 Name:		midori
-Version:	0.0.18
+Version:	0.0.20
 Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
 Group:		Applications/Internet
-License:	LGPLv2.1+
+License:	LGPLv2+
 URL:		http://software.twotoasts.de/?page=midori
 
-Source0:	http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
+BuildRequires:	gtksourceview2-devel
+BuildRequires:	intltool
 BuildRequires:	libsexy-devel
+BuildRequires:	librsvg2
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
 BuildRequires:	perl(XML::Parser)
-BuildRequires:	WebKit-gtk-devel >= %{webkit_min_version}  
-
-Requires:	WebKit-gtk >= %{webkit_min_version}
+BuildRequires:	unique-devel
+BuildRequires:	waf
+BuildRequires:	WebKit-gtk-devel
 
 %description
 Midori is a lightweight web browser, and has many features expected of a
@@ -42,17 +41,19 @@
 
 %prep
 %setup -q
-chmod a-x src/main.c
+## Use the system-provided waf, instead of the in-tarball copy.
+rm -rf waf
 
 
 %build
-%configure
-make %{?_smp_mflags}
+export CFLAGS="%{optflags}"
+waf --prefix=%{_usr} configure
+waf %{?_smp_mflags} build
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+waf --destdir=%{buildroot} install
 %find_lang %{name}
 desktop-file-install					\
 	--vendor fedora					\
@@ -65,14 +66,39 @@
 rm -rf %{buildroot}
 
 
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+fi
+
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+fi
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/midori
 %{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/*/*/apps/%{name}.*
+%{_datadir}/icons/*/*/categories/extension.*
+%{_datadir}/icons/*/*/status/news-feed.*
 
 
 %changelog
+* Mon Sep 08 2008 Peter Gordon <peter at thecodergeek.com> - 0.0.20-1
+- Update to new upstream release (0.0.20): adds support for single instances,
+  some userscripts and Greasemonkey scripting, zooming and printing, as well as
+  enhanced news feed detection and session-saving (among other improvements).
+- Switch to WAF build system.
+- Add scriplets for GTK+ icon cache.
+- fix license tag (thanks to Tom Callaway)
+
 * Sat May 24 2008 Peter Gordon <peter at thecodergeek.com> - 0.0.18-1
 - Update to new upstream release (0.0.18), adds some translations and
   a lot of bug-fixes.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 May 2008 22:44:07 -0000	1.3
+++ sources	8 Sep 2008 18:32:40 -0000	1.4
@@ -1 +1 @@
-aa9c10bbf6fe3502a65633c4fac0fb80  midori-0.0.18.tar.gz
+d27799c093b13e124eb7c0f479ea26c0  midori-0.0.20.tar.bz2



From ovasik at fedoraproject.org  Mon Sep  8 18:34:58 2008
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon,  8 Sep 2008 18:34:58 +0000 (UTC)
Subject: rpms/docbook-utils/devel docbook2man-spec.pl, NONE,
	1.1 docbook-utils.spec, 1.28, 1.29
Message-ID: <20080908183458.0EA15700FD@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26689

Modified Files:
	docbook-utils.spec 
Added Files:
	docbook2man-spec.pl 
Log Message:
ship new version of docbook2man-spec.pl to avoid issues with the old one (#460921)


***** Error reading new file: [Errno 2] No such file or directory: 'docbook2man-spec.pl'

Index: docbook-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/devel/docbook-utils.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- docbook-utils.spec	22 Nov 2007 15:09:12 -0000	1.28
+++ docbook-utils.spec	8 Sep 2008 18:34:27 -0000	1.29
@@ -1,12 +1,12 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 13%{?dist}
+Release: 14%{?dist}
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents
 URL: ftp://sources.redhat.com/pub/docbook-tools/new-trials/
 
-License: GPL+
+License: GPLv2+
 
 Requires: docbook-style-dsssl >= 1.72
 Requires: docbook-dtds
@@ -21,6 +21,9 @@
 Source0: ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/%{name}-%{version}.tar.gz
 Source1: db2html
 Source2: gdp-both.dsl
+#We will ship newer version of docbook2man-spec.pl for better handling of docbook2man conversion
+#You could check it at http://sourceforge.net/projects/docbook2x/
+Source3: docbook2man-spec.pl
 
 Obsoletes: stylesheets <= %{version}-%{release} 
 Provides: stylesheets = %{version}-%{release}
@@ -74,6 +77,7 @@
 rm -f $RPM_BUILD_ROOT%{_bindir}/db2html
 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/db2html
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/utils-%{version}/docbook-utils.dsl
+install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/utils-%{version}/helpers/docbook2man-spec.pl
 
 rm -rf $RPM_BUILD_ROOT/tmp
 
@@ -122,6 +126,12 @@
 %{_mandir}/*/docbook2ps.*
 
 %changelog 
+* Mon Sep 08 2008 Ondrej Vasik <ovasik at redhat.com> 0.6-14-14
+- ship new version of docbook2man-spec.pl to avoid issues 
+  with the old one
+- dropped funcsynopsis patch - docbook2man-spec.pl from 
+  tarball used no longer
+
 * Thu Nov 22 2007 Ondrej Vasik <ovasik at redhat.com> 0.6.14-13
 - fix of w3m params while converting to txt
 



From cweyl at fedoraproject.org  Mon Sep  8 18:35:21 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 18:35:21 +0000 (UTC)
Subject: rpms/perl-Class-Method-Modifiers/devel
	perl-Class-Method-Modifiers.spec, 1.1, 1.2
Message-ID: <20080908183521.8CEA2700FD@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-Method-Modifiers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26920

Modified Files:
	perl-Class-Method-Modifiers.spec 
Log Message:
release bump


Index: perl-Class-Method-Modifiers.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Method-Modifiers/devel/perl-Class-Method-Modifiers.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Method-Modifiers.spec	8 Sep 2008 18:29:01 -0000	1.1
+++ perl-Class-Method-Modifiers.spec	8 Sep 2008 18:34:51 -0000	1.2
@@ -1,7 +1,7 @@
 
 Name:       perl-Class-Method-Modifiers 
 Version:    1.01 
-Release:    1%{?dist}
+Release:        2%{?dist}
 License:    GPL+ or Artistic
 Group:      Development/Libraries
 Summary:    Provides Moose-like method modifiers 
@@ -65,6 +65,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.01-2
+- bump
+
 * Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.01-1
 - initial Fedora packaging
 - generated with cpan2dist (CPANPLUS::Dist::Fedora version 0.0.1)



From cweyl at fedoraproject.org  Mon Sep  8 18:36:02 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 18:36:02 +0000 (UTC)
Subject: rpms/perl-Class-Method-Modifiers/F-8 import.log, NONE,
	1.1 perl-Class-Method-Modifiers.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080908183602.DD936700FD@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-Method-Modifiers/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27236

Modified Files:
	sources 
Added Files:
	import.log perl-Class-Method-Modifiers.spec 
Log Message:
pseudo-branch of perl-Class-Method-Modifiers to F-8


--- NEW FILE import.log ---
perl-Class-Method-Modifiers-1_01-1_fc9:HEAD:perl-Class-Method-Modifiers-1.01-1.fc9.src.rpm:1220898535


--- NEW FILE perl-Class-Method-Modifiers.spec ---

Name:       perl-Class-Method-Modifiers 
Version:    1.01 
Release:        2%{?dist}
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Provides Moose-like method modifiers 
Source:     http://search.cpan.org/CPAN/authors/id/S/SA/SARTAK/Class-Method-Modifiers-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Class-Method-Modifiers
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(MRO::Compat)
# testing
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::More)


%description
Method modifiers are a powerful feature from the CLOS (Common Lisp Object
System) world.

In its most basic form, a method modifier is just a method that calls
'$self->SUPER::foo(@_)'. I for one have trouble remembering that exact
invocation, so my classes seldom re-dispatch to their base classes. Very
bad!

'Class::Method::Modifiers' provides three modifiers: 'before', 'around',
and 'after'. 'before' and 'after' are run just before and after the method
they modify, but can not really affect that original method. 'around' is
run in place of the original method, with a hook to easily call that
original method. See the 'MODIFIERS' section for more details on how the
particular modifiers work.

%prep
%setup -q -n Class-Method-Modifiers-%{version}

find t/ -type f -exec perl -pi -e 's|^#!perl|#!/usr/bin/perl|' {} +

%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 t/
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.01-2
- bump

* Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.01-1
- initial Fedora packaging
- generated with cpan2dist (CPANPLUS::Dist::Fedora version 0.0.1)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Method-Modifiers/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 15:26:50 -0000	1.1
+++ sources	8 Sep 2008 18:35:32 -0000	1.2
@@ -0,0 +1 @@
+f0398c468025d21493745619b1114a46  Class-Method-Modifiers-1.01.tar.gz



From limb at fedoraproject.org  Mon Sep  8 18:42:39 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon,  8 Sep 2008 18:42:39 +0000 (UTC)
Subject: rpms/lilypond/F-9 lilypond.spec,1.24,1.25
Message-ID: <20080908184239.BD644700FD@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/lilypond/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28976

Modified Files:
	lilypond.spec 
Log Message:
Fix for 456842.



Index: lilypond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond/F-9/lilypond.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- lilypond.spec	8 Apr 2008 04:32:53 -0000	1.24
+++ lilypond.spec	8 Sep 2008 18:42:09 -0000	1.25
@@ -1,16 +1,16 @@
 Name:		lilypond
 Version:	2.10.33
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
 License:	GPLv2
 URL:		http://www.lilypond.org
 Source0:	http://download.linuxaudio.org/lilypond/sources/v2.10/%{name}-%{version}.tar.gz
-Patch1:         %{name}-gcc43.patch
+Patch1:		%{name}-gcc43.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       ghostscript >= 8.15
+Requires:	ghostscript >= 8.15
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -42,7 +42,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT package_infodir=%{_infodir} \
-	vimdir=%{_datadir}/vim/vim70
+	vimdir=%{_datadir}/vim/vim71
 
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/python/midi.so
 
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Wed Aug 27 2008 Jon Ciesla <limb at jcomserv.net> - 2.10.33-4
+- Spec cleanup, fix for BZ 456842, vim file locations.
+
 * Mon Apr  7 2008 Christopher Aillon <caillon at redhat.com> - 2.10.33-3
 - Fix the build against GCC 4.3; simply missing some #includes
 



From pkgdb at fedoraproject.org  Mon Sep  8 18:45:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 18:45:05 +0000
Subject: [pkgdb] cryptsetup-luks ownership updated
Message-ID: <20080908184505.2A2CE20876F@bastion.fedora.phx.redhat.com>

Package cryptsetup-luks in Fedora devel was orphaned by pjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks



From pkgdb at fedoraproject.org  Mon Sep  8 18:45:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 18:45:08 +0000
Subject: [pkgdb] cryptsetup-luks ownership updated
Message-ID: <20080908184508.6C92B208D98@bastion.fedora.phx.redhat.com>

Package cryptsetup-luks in Fedora 7 was orphaned by pjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks



From pkgdb at fedoraproject.org  Mon Sep  8 18:45:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 18:45:11 +0000
Subject: [pkgdb] cryptsetup-luks ownership updated
Message-ID: <20080908184511.6E511208DA0@bastion.fedora.phx.redhat.com>

Package cryptsetup-luks in Fedora 8 was orphaned by pjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks



From pkgdb at fedoraproject.org  Mon Sep  8 18:45:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 18:45:14 +0000
Subject: [pkgdb] cryptsetup-luks ownership updated
Message-ID: <20080908184514.ED59E20876B@bastion.fedora.phx.redhat.com>

Package cryptsetup-luks in Fedora 9 was orphaned by pjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks



From langel at fedoraproject.org  Mon Sep  8 18:47:32 2008
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon,  8 Sep 2008 18:47:32 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-9 java-1.6.0-openjdk-hotspot-ppc.patch,
	NONE, 1.1 java-1.6.0-openjdk.spec, 1.56, 1.57
Message-ID: <20080908184732.276F1700FD@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30285

Modified Files:
	java-1.6.0-openjdk.spec 
Added Files:
	java-1.6.0-openjdk-hotspot-ppc.patch 
Log Message:
* Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.18.b09
- Added hotspot patch for ppc.



java-1.6.0-openjdk-hotspot-ppc.patch:

--- NEW FILE java-1.6.0-openjdk-hotspot-ppc.patch ---
--- openjdk/hotspot/src/share/vm/opto/cfgnode.cpp.orig	2008-06-08 15:15:19.000000000 +0200
+++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp	2008-06-08 15:16:06.000000000 +0200
@@ -1551,45 +1551,6 @@
     if (opt != NULL)  return opt;
   }
 
-  if (in(1) != NULL && in(1)->Opcode() == Op_AddP && can_reshape) {
-    // Try to undo Phi of AddP:
-    //   (Phi (AddP base base y) (AddP base2 base2 y))
-    // becomes:
-    //   newbase := (Phi base base2)
-    //   (AddP newbase newbase y)
-    //
-    // This occurs as a result of unsuccessful split_thru_phi and
-    // interferes with taking advantage of addressing modes.  See the
-    // clone_shift_expressions code in matcher.cpp
-    Node* addp = in(1);
-    const Type* type = addp->in(AddPNode::Base)->bottom_type();
-    Node* y = addp->in(AddPNode::Offset);
-    if (y != NULL && addp->in(AddPNode::Base) == addp->in(AddPNode::Address)) {
-      // make sure that all the inputs are similar to the first one,
-      // i.e. AddP with base == address and same offset as first AddP
-      bool doit = true;
-      for (uint i = 2; i < req(); i++) {
-        if (in(i) == NULL ||
-            in(i)->Opcode() != Op_AddP ||
-            in(i)->in(AddPNode::Base) != in(i)->in(AddPNode::Address) ||
-            in(i)->in(AddPNode::Offset) != y) {
-          doit = false;
-          break;
-        }
-        // Accumulate type for resulting Phi
-        type = type->meet(in(i)->in(AddPNode::Base)->bottom_type());
-      }
-      if (doit) {
-        Node* base = new (phase->C, in(0)->req()) PhiNode(in(0), type, NULL);
-        for (uint i = 1; i < req(); i++) {
-          base->init_req(i, in(i)->in(AddPNode::Base));
-        }
-        phase->is_IterGVN()->register_new_node_with_optimizer(base);
-        return new (phase->C, 4) AddPNode(base, base, y);
-      }
-    }
-  }
-
   // Split phis through memory merges, so that the memory merges will go away.
   // Piggy-back this transformation on the search for a unique input....
   // It will be as if the merged memory is the unique value of the phi.


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/java-1.6.0-openjdk.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- java-1.6.0-openjdk.spec	8 Sep 2008 18:10:21 -0000	1.56
+++ java-1.6.0-openjdk.spec	8 Sep 2008 18:47:01 -0000	1.57
@@ -175,6 +175,8 @@
 Patch9:   java-1.6.0-openjdk-6661918.patch
 Patch10:  java-1.6.0-openjdk-6685178.patch
 Patch11:  java-1.6.0-openjdk-hotspot.patch
+Patch12:  java-1.6.0-openjdk-hotspot-ppc.patch
+Patch12:  java-1.6.0-openjdk-hotspot-ppc.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -393,9 +395,12 @@
 patch -l -p0 < %{PATCH8}
 %ifarch %{jit_arches}
 patch -l -p0 < %{PATCH9}
+patch -l -p0 < %{PATCH11}
 %endif
 patch -l -p0 < %{PATCH10}
-patch -l -p0 < %{PATCH11}
+%ifnarch %{jit_arches}
+patch -l -p0 < %{PATCH12}
+%endif
 make
 
 # Build cacerts file.
@@ -931,6 +936,9 @@
 
 %changelog
 * Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.18.b09
+- Added hotspot patch for ppc.
+
+* Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.18.b09
 - Added hotspot patch (Patch11) to fix eclipse crashing bug.
 - Resolves: rhbz#460205
 



From cebbert at fedoraproject.org  Mon Sep  8 18:52:42 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon,  8 Sep 2008 18:52:42 +0000 (UTC)
Subject: rpms/kernel/F-9 patch-2.6.26.5.bz2.sign, NONE, 1.1 .cvsignore, 1.825,
	1.826 kernel.spec, 1.757, 1.758 sources, 1.786, 1.787 upstream,
	1.705, 1.706 patch-2.6.26.3.bz2.sign, 1.1,
	NONE patch-2.6.26.4-rc1, 1.1, NONE
Message-ID: <20080908185242.AB1C9700FD@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31889

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.26.5.bz2.sign 
Removed Files:
	patch-2.6.26.3.bz2.sign patch-2.6.26.4-rc1 
Log Message:
Linux 2.6.26.5


--- NEW FILE patch-2.6.26.5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIxWVzyGugalF9Dw4RAt8dAJ9AVInVmmicxOBW74pKASVVZxvchgCfVeew
QUrz1ZEO4uDcBBbsp+gM+co=
=GWKo
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.825
retrieving revision 1.826
diff -u -r1.825 -r1.826
--- .cvsignore	22 Aug 2008 18:16:25 -0000	1.825
+++ .cvsignore	8 Sep 2008 18:52:11 -0000	1.826
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.26
 linux-2.6.26.tar.bz2
-patch-2.6.26.3.bz2
+patch-2.6.26.5.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.757
retrieving revision 1.758
diff -u -r1.757 -r1.758
--- kernel.spec	4 Sep 2008 01:57:33 -0000	1.757
+++ kernel.spec	8 Sep 2008 18:52:11 -0000	1.758
@@ -31,7 +31,7 @@
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 # Do we have a 2.6.21.y update to apply?
-%define stable_update 3
+%define stable_update 5
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -554,7 +554,7 @@
 %endif
 
 # stable release candidate
-Patch03: patch-2.6.26.4-rc1
+#Patch03: patch-2.6.26.4-rc1
 
 # we always need nonintconfig, even for -vanilla kernels
 Patch06: linux-2.6-build-nonintconfig.patch
@@ -985,7 +985,7 @@
 %endif
 
 # stable release candidate
-ApplyPatch patch-2.6.26.4-rc1
+#ApplyPatch patch-2.6.26.4-rc1
 
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
 # also gives a list of missing options at the end. Useful for automated
@@ -1822,6 +1822,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Mon Sep 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-31
+- Linux 2.6.26.5
+
 * Wed Sep 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.3-30
 - Linux 2.6.26.4-rc1
   Dropped patches:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.786
retrieving revision 1.787
diff -u -r1.786 -r1.787
--- sources	22 Aug 2008 18:16:26 -0000	1.786
+++ sources	8 Sep 2008 18:52:12 -0000	1.787
@@ -1,2 +1,2 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
-556282beb8feabee2972e1971984f6dd  patch-2.6.26.3.bz2
+2bceb4747e65394d34066f3db778fd0f  patch-2.6.26.5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.705
retrieving revision 1.706
diff -u -r1.705 -r1.706
--- upstream	22 Aug 2008 18:16:26 -0000	1.705
+++ upstream	8 Sep 2008 18:52:12 -0000	1.706
@@ -1,2 +1,2 @@
 linux-2.6.26.tar.bz2
-patch-2.6.26.3.bz2
+patch-2.6.26.5.bz2


--- patch-2.6.26.3.bz2.sign DELETED ---


--- patch-2.6.26.4-rc1 DELETED ---



From pkgdb at fedoraproject.org  Mon Sep  8 18:52:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 18:52:44 +0000
Subject: [pkgdb] cryptsetup-luks ownership updated
Message-ID: <20080908185244.D07A220876F@bastion.fedora.phx.redhat.com>

Package cryptsetup-luks in Fedora devel is now owned by mbroz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks



From pkgdb at fedoraproject.org  Mon Sep  8 18:53:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 18:53:00 +0000
Subject: [pkgdb] cryptsetup-luks ownership updated
Message-ID: <20080908185300.8938B20876E@bastion.fedora.phx.redhat.com>

Package cryptsetup-luks in Fedora 8 is now owned by mbroz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks



From whot at fedoraproject.org  Mon Sep  8 18:53:08 2008
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon,  8 Sep 2008 18:53:08 +0000 (UTC)
Subject: rpms/xorg-x11-apps/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 xorg-x11-apps.spec, 1.28, 1.29
Message-ID: <20080908185308.D5D1E700FD@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-serv31914

Modified Files:
	.cvsignore sources xorg-x11-apps.spec 
Log Message:
* Tue Sep 9 2008 Peter Hutterer <peter.hutterer at redhat.com> 7.3-5
- Add xinput tool.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	24 Sep 2007 19:35:59 -0000	1.9
+++ .cvsignore	8 Sep 2008 18:52:38 -0000	1.10
@@ -15,3 +15,4 @@
 xwud-1.0.1.tar.bz2
 xconsole-1.0.3.tar.bz2
 xmessage-1.0.2.tar.bz2
+xinput-1.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 Sep 2007 19:35:59 -0000	1.9
+++ sources	8 Sep 2008 18:52:38 -0000	1.10
@@ -15,3 +15,4 @@
 6e3c5d0297d88e890b6f5df31f73dd60  xwud-1.0.1.tar.bz2
 0e1a3110bebabecc2897d67a973526b0  xconsole-1.0.3.tar.bz2
 b4b561ef11fd184989a6062962e86748  xmessage-1.0.2.tar.bz2
+977d657e8d7b59f7d82c98ebef444b28  xinput-1.3.0.tar.bz2


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xorg-x11-apps.spec	15 Jul 2008 17:33:35 -0000	1.28
+++ xorg-x11-apps.spec	8 Sep 2008 18:52:38 -0000	1.29
@@ -5,7 +5,7 @@
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
 Version: 7.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -31,6 +31,7 @@
 Source14: ftp://ftp.x.org/pub/individual/app/xlogo-1.0.1.tar.bz2
 Source15: ftp://ftp.x.org/pub/individual/app/xmag-1.0.2.tar.bz2
 Source16: ftp://ftp.x.org/pub/individual/app/xmessage-1.0.2.tar.bz2
+Source17: ftp://ftp.x.org/pub/individual/app/xinput-1.3.0.tar.bz2
 
 Patch0: x11perf-1.4.1-x11perf-datadir-cleanups.patch
 Patch1: luit-1.0.1-locale.alias-datadir.patch
@@ -57,11 +58,12 @@
 BuildRequires: libXcursor-devel
 BuildRequires: libpng-devel
 BuildRequires: libXfixes-devel
+BuildRequires: libXi-devel
 
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
 Provides: luit oclock x11perf xbiff xclipboard xclock xconsole xcursorgen
-Provides: xeyes xkill xload xlogo xmag xmessage xpr xwd xwud
+Provides: xeyes xkill xload xlogo xmag xmessage xpr xwd xwud xinput
 
 # NOTE: xwd, xwud, luit used to be in these.
 Obsoletes: XFree86, xorg-x11
@@ -71,7 +73,7 @@
 A collection of common X Window System applications.
 
 %prep
-%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16
+%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17
 %patch0 -p0 -b .x11perf-datadir-cleanups
 %patch1 -p0 -b .locale.alias-datadir
 %patch2 -p0 -b .streams-me-softer
@@ -126,6 +128,7 @@
 %{_bindir}/xcutsel
 %{_bindir}/xdpr
 %{_bindir}/xeyes
+%{_bindir}/xinput
 %{_bindir}/xkill
 %{_bindir}/xload
 %{_bindir}/xlogo
@@ -165,6 +168,7 @@
 %{_mandir}/man1/xcutsel.1*
 %{_mandir}/man1/xdpr.1*
 %{_mandir}/man1/xeyes.1*
+%{_mandir}/man1/xinput.1*
 %{_mandir}/man1/xkill.1*
 %{_mandir}/man1/xload.1*
 %{_mandir}/man1/xlogo.1*
@@ -175,6 +179,9 @@
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Tue Sep 9 2008 Peter Hutterer <peter.hutterer at redhat.com> 7.3-5
+- Add xinput tool.
+
 * Tue Jul 15 2008 Adam Jackson <ajax at redhat.com> 7.3-4
 - Fix license tag.
 



From pkgdb at fedoraproject.org  Mon Sep  8 18:53:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 18:53:12 +0000
Subject: [pkgdb] cryptsetup-luks ownership updated
Message-ID: <20080908185312.15FF220876B@bastion.fedora.phx.redhat.com>

Package cryptsetup-luks in Fedora 9 is now owned by mbroz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks



From cebbert at fedoraproject.org  Mon Sep  8 18:53:24 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon,  8 Sep 2008 18:53:24 +0000 (UTC)
Subject: rpms/kernel/F-8 patch-2.6.26.5.bz2.sign, NONE, 1.1 .cvsignore, 1.735,
	1.736 kernel.spec, 1.525, 1.526 sources, 1.696, 1.697 upstream,
	1.616, 1.617 patch-2.6.26.3.bz2.sign, 1.1,
	NONE patch-2.6.26.4-rc1, 1.1, NONE
Message-ID: <20080908185324.65320700FD@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32140

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.26.5.bz2.sign 
Removed Files:
	patch-2.6.26.3.bz2.sign patch-2.6.26.4-rc1 
Log Message:
Linux 2.6.26.5


--- NEW FILE patch-2.6.26.5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIxWVzyGugalF9Dw4RAt8dAJ9AVInVmmicxOBW74pKASVVZxvchgCfVeew
QUrz1ZEO4uDcBBbsp+gM+co=
=GWKo
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/.cvsignore,v
retrieving revision 1.735
retrieving revision 1.736
diff -u -r1.735 -r1.736
--- .cvsignore	24 Aug 2008 05:05:18 -0000	1.735
+++ .cvsignore	8 Sep 2008 18:52:52 -0000	1.736
@@ -3,4 +3,4 @@
 temp-*
 kernel-2.6.26
 linux-2.6.26.tar.bz2
-patch-2.6.26.3.bz2
+patch-2.6.26.5.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -r1.525 -r1.526
--- kernel.spec	4 Sep 2008 02:03:09 -0000	1.525
+++ kernel.spec	8 Sep 2008 18:52:53 -0000	1.526
@@ -33,7 +33,7 @@
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 # Do we have a 2.6.21.y update to apply?
-%define stable_update 3
+%define stable_update 5
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -557,7 +557,7 @@
 %endif
 
 # -stable RC
-Patch02: patch-2.6.26.4-rc1
+#Patch02: patch-2.6.26.4-rc1
 
 # we also need compile fixes for -vanilla
 Patch07: linux-2.6-compile-fixes.patch
@@ -959,7 +959,7 @@
 %endif
 
 # -stable RC
-ApplyPatch patch-2.6.26.4-rc1
+#ApplyPatch patch-2.6.26.4-rc1
 
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
 # also gives a list of missing options at the end. Useful for automated
@@ -1814,6 +1814,9 @@
 
 
 %changelog
+* Mon Sep 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-16
+- Linux 2.6.26.5
+
 * Wed Sep 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.3-15
 - Linux 2.6.26.4-rc1
   Dropped patches:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/sources,v
retrieving revision 1.696
retrieving revision 1.697
diff -u -r1.696 -r1.697
--- sources	24 Aug 2008 05:05:18 -0000	1.696
+++ sources	8 Sep 2008 18:52:53 -0000	1.697
@@ -1,2 +1,2 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
-556282beb8feabee2972e1971984f6dd  patch-2.6.26.3.bz2
+2bceb4747e65394d34066f3db778fd0f  patch-2.6.26.5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/upstream,v
retrieving revision 1.616
retrieving revision 1.617
diff -u -r1.616 -r1.617
--- upstream	24 Aug 2008 05:05:18 -0000	1.616
+++ upstream	8 Sep 2008 18:52:54 -0000	1.617
@@ -1,2 +1,2 @@
 linux-2.6.26.tar.bz2
-patch-2.6.26.3.bz2
+patch-2.6.26.5.bz2


--- patch-2.6.26.3.bz2.sign DELETED ---


--- patch-2.6.26.4-rc1 DELETED ---



From limb at fedoraproject.org  Mon Sep  8 18:54:25 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon,  8 Sep 2008 18:54:25 +0000 (UTC)
Subject: rpms/lilypond/F-9 lilypond.spec,1.25,1.26 sources,1.19,1.20
Message-ID: <20080908185425.21BE8700FD@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/lilypond/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32368

Modified Files:
	lilypond.spec sources 
Log Message:
Bump to newest upstream.



Index: lilypond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond/F-9/lilypond.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- lilypond.spec	8 Sep 2008 18:42:09 -0000	1.25
+++ lilypond.spec	8 Sep 2008 18:53:54 -0000	1.26
@@ -1,13 +1,12 @@
 Name:		lilypond
-Version:	2.10.33
-Release:	4%{?dist}
+Version:	2.11.57
+Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
 License:	GPLv2
 URL:		http://www.lilypond.org
 Source0:	http://download.linuxaudio.org/lilypond/sources/v2.10/%{name}-%{version}.tar.gz
-Patch1:		%{name}-gcc43.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	ghostscript >= 8.15
@@ -30,7 +29,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .gcc43
 
 
 %build
@@ -94,6 +92,9 @@
 
 
 %changelog
+* Mon Sep 08 2008 Jon Ciesla <limb at jcomserv.net> - 2.11.57-1
+- Upgrade to new upstream.
+
 * Wed Aug 27 2008 Jon Ciesla <limb at jcomserv.net> - 2.10.33-4
 - Spec cleanup, fix for BZ 456842, vim file locations.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond/F-9/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	20 Sep 2007 13:39:23 -0000	1.19
+++ sources	8 Sep 2008 18:53:54 -0000	1.20
@@ -1 +1 @@
-86a67fcc404e942be723f8a72988b286  lilypond-2.10.33.tar.gz
+99e04dcebcf513506ca631630a6c7cd7  lilypond-2.11.57.tar.gz



From pkgdb at fedoraproject.org  Mon Sep  8 19:01:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 19:01:07 +0000
Subject: [pkgdb] cryptsetup-luks had acl change status
Message-ID: <20080908190107.BB2CD208771@bastion.fedora.phx.redhat.com>

pjones has set the commit acl on cryptsetup-luks (Fedora 8) to Obsolete for till

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks



From langel at fedoraproject.org  Mon Sep  8 19:06:29 2008
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon,  8 Sep 2008 19:06:29 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-9 java-1.6.0-openjdk.spec,1.57,1.58
Message-ID: <20080908190629.D5AD0700FD@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2617

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.18.b09
- Moved hotspot patch to only be applied to jit_arches.




Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/java-1.6.0-openjdk.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- java-1.6.0-openjdk.spec	8 Sep 2008 18:47:01 -0000	1.57
+++ java-1.6.0-openjdk.spec	8 Sep 2008 19:05:59 -0000	1.58
@@ -175,8 +175,6 @@
 Patch9:   java-1.6.0-openjdk-6661918.patch
 Patch10:  java-1.6.0-openjdk-6685178.patch
 Patch11:  java-1.6.0-openjdk-hotspot.patch
-Patch12:  java-1.6.0-openjdk-hotspot-ppc.patch
-Patch12:  java-1.6.0-openjdk-hotspot-ppc.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -398,9 +396,6 @@
 patch -l -p0 < %{PATCH11}
 %endif
 patch -l -p0 < %{PATCH10}
-%ifnarch %{jit_arches}
-patch -l -p0 < %{PATCH12}
-%endif
 make
 
 # Build cacerts file.
@@ -936,7 +931,7 @@
 
 %changelog
 * Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.18.b09
-- Added hotspot patch for ppc.
+- Moved hotspot patch to only be applied to jit_arches.
 
 * Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.18.b09
 - Added hotspot patch (Patch11) to fix eclipse crashing bug.



From langel at fedoraproject.org  Mon Sep  8 19:07:18 2008
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon,  8 Sep 2008 19:07:18 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-9 java-1.6.0-openjdk-hotspot-ppc.patch,
	1.1, NONE
Message-ID: <20080908190718.04C85700FD@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3042

Removed Files:
	java-1.6.0-openjdk-hotspot-ppc.patch 
Log Message:
Removed patch




--- java-1.6.0-openjdk-hotspot-ppc.patch DELETED ---



From nsantos at fedoraproject.org  Mon Sep  8 19:15:07 2008
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Mon,  8 Sep 2008 19:15:07 +0000 (UTC)
Subject: rpms/python-qpid/devel .cvsignore, 1.4, 1.5 python-qpid.spec, 1.8, 
	1.9 sources, 1.8, 1.9
Message-ID: <20080908191507.3A1F9700FD@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/python-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4410

Modified Files:
	.cvsignore python-qpid.spec sources 
Log Message:
update for Fedora 10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Jun 2008 17:23:16 -0000	1.4
+++ .cvsignore	8 Sep 2008 19:14:36 -0000	1.5
@@ -1 +1 @@
-python-qpid-0.2.668378.tar.gz
+python-qpid-0.3.693140.tar.gz


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/python-qpid.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-qpid.spec	3 Sep 2008 18:44:03 -0000	1.8
+++ python-qpid.spec	8 Sep 2008 19:14:36 -0000	1.9
@@ -1,14 +1,14 @@
 Name:           python-qpid
-Version:        0.2.668378
-Release:        2%{?dist}
+Version:        0.3.693140
+Release:        1%{?dist}
 Summary:        Python language client for AMQP
 
 Group:          Development/Python
 License:        ASL 2.0
 URL:            http://incubator.apache.org/qpid
 Source0:        %{name}-%{version}.tar.gz
-# svn export -r<rev> http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/python python-qpid-0.2.<rev>
-# tar czf python-qpid-0.2.<rev>.tar.gz python-qpid-0.2.<rev>
+# svn export -r<rev> http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/python python-qpid-0.3.<rev>
+# tar czf python-qpid-0.3.<rev>.tar.gz python-qpid-0.3.<rev>
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -16,7 +16,7 @@
 BuildRequires:  python-devel
 
 Requires:       python
-Requires:       amqp >= 1.0.666398-5
+Requires:       amqp >= 1.0.693140-1
 
 %description
 The Apache Qpid project's Python language client for AMQP.
@@ -69,6 +69,9 @@
 %doc LICENSE.txt NOTICE.txt README.txt doc/test-requirements.txt
 
 %changelog
+* Mon Sep  8 2008 Nuno Santos <nsantos at redhat.com> - 0.3.693140-1
+- Update for Fedora 10
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.668378-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Jun 2008 17:23:16 -0000	1.8
+++ sources	8 Sep 2008 19:14:36 -0000	1.9
@@ -1 +1 @@
-353510fe956b293cc2da59ae761e18be  python-qpid-0.2.668378.tar.gz
+cea9170f05b27141eb98544ed3d7a225  python-qpid-0.3.693140.tar.gz



From cweyl at fedoraproject.org  Mon Sep  8 19:18:49 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 19:18:49 +0000 (UTC)
Subject: rpms/perl-Class-Method-Modifiers/F-8
	perl-Class-Method-Modifiers.spec, 1.1, 1.2
Message-ID: <20080908191849.B96A2700FD@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-Method-Modifiers/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5272

Modified Files:
	perl-Class-Method-Modifiers.spec 
Log Message:
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.01-3
- remove MM version qualifier (F-8's is older)



Index: perl-Class-Method-Modifiers.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Method-Modifiers/F-8/perl-Class-Method-Modifiers.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Method-Modifiers.spec	8 Sep 2008 18:35:32 -0000	1.1
+++ perl-Class-Method-Modifiers.spec	8 Sep 2008 19:18:19 -0000	1.2
@@ -1,7 +1,7 @@
 
 Name:       perl-Class-Method-Modifiers 
 Version:    1.01 
-Release:        2%{?dist}
+Release:    3%{?dist}
 License:    GPL+ or Artistic
 Group:      Development/Libraries
 Summary:    Provides Moose-like method modifiers 
@@ -11,7 +11,7 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 
-BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
+BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(MRO::Compat)
 # testing
 BuildRequires: perl(Test::Exception)
@@ -65,6 +65,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.01-3
+- remove MM version qualifier (F-8's is older)
+
 * Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.01-2
 - bump
 



From ajax at fedoraproject.org  Mon Sep  8 19:21:17 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon,  8 Sep 2008 19:21:17 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-6.9.0-fb-size.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.109, 1.110
Message-ID: <20080908192117.E918E700FD@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-serv5817

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.9.0-fb-size.patch 
Log Message:
* Mon Sep 08 2008 Adam Jackson <ajax at redhat.com> 6.9.0-10
- radeon-6.9.0-fb-size.patch: Yet more lame heuristics to preallocate a
  usable framebuffer for laptops. (#458864)


radeon-6.9.0-fb-size.patch:

--- NEW FILE radeon-6.9.0-fb-size.patch ---
diff -up xf86-video-ati-6.9.0/src/radeon_driver.c.jx xf86-video-ati-6.9.0/src/radeon_driver.c
--- xf86-video-ati-6.9.0/src/radeon_driver.c.jx	2008-09-08 14:17:30.000000000 -0400
+++ xf86-video-ati-6.9.0/src/radeon_driver.c	2008-09-08 14:44:15.000000000 -0400
@@ -2713,6 +2713,7 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in
     xf86Int10InfoPtr  pInt10 = NULL;
     void *int10_save = NULL;
     const char *s;
+    int crtc_min_X = 320, crtc_min_Y = 200;
     int crtc_max_X, crtc_max_Y;
     RADEONEntPtr pRADEONEnt;
     DevUnion* pPriv;
@@ -2936,19 +2937,25 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in
 	     * note that these aren't really the CRTC limits, they're just
 	     * heuristics until we have a better memory manager.
 	     */
-	    if (pScrn->videoRam <= 16384) {
+	    if (pScrn->videoRam <= 32768) {
 		crtc_max_X = 1600;
 		crtc_max_Y = 1200;
-	    } else if (IS_R300_VARIANT) {
-		crtc_max_X = 2560;
-		crtc_max_Y = 1200;
-	    } else if (IS_AVIVO_VARIANT) {
-		crtc_max_X = 2560;
-		crtc_max_Y = 1600;
+	    } else if (pScrn->videoRam <= 65536) {
+		crtc_min_X = 3360;
+		crtc_min_Y = 1050;
+		crtc_max_X = 3968;
+		crtc_max_Y = 1440;
 	    } else {
-		crtc_max_X = 2048;
-		crtc_max_Y = 1200;
-	}
+		crtc_min_X = 3840;
+		crtc_min_Y = 1200;
+		if (IS_AVIVO_VARIANT) {
+		    crtc_max_X = 5120;
+		    crtc_max_Y = 1600;
+		} else {
+		    crtc_max_X = 3968;
+		    crtc_max_Y = 1440;
+		}
+	    }
 	}
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Max desktop size set to %dx%d\n",
 		   crtc_max_X, crtc_max_Y);
@@ -2959,7 +2966,7 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in
 		   "reduce the desktop size by adjusting the Virtual line to your xorg.conf\n");
 	
     /*xf86CrtcSetSizeRange (pScrn, 320, 200, info->MaxSurfaceWidth, info->MaxLines);*/
-	xf86CrtcSetSizeRange (pScrn, 320, 200, crtc_max_X, crtc_max_Y);
+	xf86CrtcSetSizeRange (pScrn, crtc_min_X, crtc_min_Y, crtc_max_X, crtc_max_Y);
 	
 	RADEONPreInitDDC(pScrn);
 


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.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- xorg-x11-drv-ati.spec	6 Sep 2008 21:47:38 -0000	1.109
+++ xorg-x11-drv-ati.spec	8 Sep 2008 19:20:47 -0000	1.110
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   9%{?dist}
+Release:   10%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -18,6 +18,7 @@
 Patch1:     radeon-modeset.patch
 Patch2:     radeon-suspend-fix.patch
 Patch3:	    radeon-fix-pipe-config.patch
+Patch4:	    radeon-6.9.0-fb-size.patch
 
 ExcludeArch: s390 s390x
 
@@ -40,6 +41,7 @@
 %patch1 -p1 -b .modeset
 %patch2 -p1 -b .suspend
 %patch3 -p1 -b .pipe-config
+%patch4 -p1 -b .fb-size
 
 %build
 autoreconf
@@ -71,6 +73,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Mon Sep 08 2008 Adam Jackson <ajax at redhat.com> 6.9.0-10
+- radeon-6.9.0-fb-size.patch: Yet more lame heuristics to preallocate a
+  usable framebuffer for laptops. (#458864)
+
 * Fri Sep 05 2008 Dave Airlie <airlied at redhat.com> 6.9.0-9
 - add fix for pipe register emits on r300
 



From dwalsh at fedoraproject.org  Mon Sep  8 19:26:18 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  8 Sep 2008 19:26:18 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch,1.205,1.206
Message-ID: <20080908192618.35FAA700FD@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6779

Modified Files:
	policy-20071130.patch 
Log Message:
* Tue Sep 2 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-89
- Fix init script paths


policy-20071130.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.205 -r 1.206 policy-20071130.patch
Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- policy-20071130.patch	8 Sep 2008 14:21:48 -0000	1.205
+++ policy-20071130.patch	8 Sep 2008 19:25:46 -0000	1.206
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.3.1/Makefile
 --- nsaserefpolicy/Makefile	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/Makefile	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/Makefile	2008-09-08 11:45:12.000000000 -0400
 @@ -235,7 +235,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -56,7 +56,7 @@
  	$(verbose) $(INSTALL) -m 644 $< $@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.3.1/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/Rules.modular	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/Rules.modular	2008-09-08 11:45:12.000000000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -88,7 +88,7 @@
  $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.monolithic serefpolicy-3.3.1/Rules.monolithic
 --- nsaserefpolicy/Rules.monolithic	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/Rules.monolithic	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/Rules.monolithic	2008-09-08 11:45:12.000000000 -0400
 @@ -96,7 +96,7 @@
  #
  # Load the binary policy
@@ -100,13 +100,13 @@
  	@touch $(tmpdir)/load
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context	2008-09-08 11:45:12.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts	2008-09-08 11:45:12.000000000 -0400
 @@ -0,0 +1,6 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -116,7 +116,7 @@
 +guest_r:guest_t:s0		guest_r:guest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts	2008-09-08 11:45:12.000000000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
  system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -132,7 +132,7 @@
 +system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-mcs/staff_u_default_contexts	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/staff_u_default_contexts	2008-09-08 11:45:12.000000000 -0400
 @@ -5,6 +5,8 @@
  system_r:xdm_t:s0		staff_r:staff_t:s0
  staff_r:staff_su_t:s0		staff_r:staff_t:s0
@@ -144,7 +144,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-08 11:45:12.000000000 -0400
 @@ -0,0 +1,11 @@
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0
 +system_r:initrc_t:s0		unconfined_r:unconfined_t:s0
@@ -159,7 +159,7 @@
 +system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts	2008-09-08 11:45:12.000000000 -0400
 @@ -5,4 +5,5 @@
  system_r:xdm_t:s0		user_r:user_t:s0
  user_r:user_su_t:s0		user_r:user_t:s0
@@ -169,13 +169,13 @@
 +user_r:user_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context	2008-09-08 11:45:12.000000000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/x_contexts serefpolicy-3.3.1/config/appconfig-mcs/x_contexts
 --- nsaserefpolicy/config/appconfig-mcs/x_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts	2008-09-08 11:45:12.000000000 -0400
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -367,7 +367,7 @@
 +event *					system_u:object_r:default_xevent_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts	2008-09-08 11:45:12.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -378,7 +378,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts	2008-09-08 11:45:12.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -386,7 +386,7 @@
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/x_contexts serefpolicy-3.3.1/config/appconfig-mls/x_contexts
 --- nsaserefpolicy/config/appconfig-mls/x_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts	2008-09-08 11:45:12.000000000 -0400
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -578,7 +578,7 @@
 +event *					system_u:object_r:default_xevent_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts	2008-09-08 11:45:12.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -586,7 +586,7 @@
 +system_r:crond_t	guest_r:guest_crond_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts	2008-09-08 11:45:12.000000000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t	unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t
  system_r:local_login_t  unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
@@ -602,7 +602,7 @@
 +system_r:sshd_t	unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/x_contexts serefpolicy-3.3.1/config/appconfig-standard/x_contexts
 --- nsaserefpolicy/config/appconfig-standard/x_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts	2008-09-08 11:45:12.000000000 -0400
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -794,7 +794,7 @@
 +event *					system_u:object_r:default_xevent_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts	2008-09-08 11:45:12.000000000 -0400
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -803,7 +803,7 @@
 +system_r:xdm_t		xguest_r:xguest_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-3.3.1/man/man8/ftpd_selinux.8
 --- nsaserefpolicy/man/man8/ftpd_selinux.8	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/man/man8/ftpd_selinux.8	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/man/man8/ftpd_selinux.8	2008-09-08 11:45:12.000000000 -0400
 @@ -1,52 +1,65 @@
 -.TH  "ftpd_selinux"  "8"  "17 Jan 2005" "dwalsh at redhat.com" "ftpd Selinux Policy documentation"
 +.TH  "ftpd_selinux"  "8"  "17 Jan 2005" "dwalsh at redhat.com" "ftpd SELinux policy documentation"
@@ -911,7 +911,7 @@
 +selinux(8), ftpd(8), setsebool(8), semanage(8), restorecon(8)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.3.1/man/man8/httpd_selinux.8
 --- nsaserefpolicy/man/man8/httpd_selinux.8	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/man/man8/httpd_selinux.8	2008-09-04 16:31:44.000000000 -0400
++++ serefpolicy-3.3.1/man/man8/httpd_selinux.8	2008-09-08 11:45:12.000000000 -0400
 @@ -22,23 +22,19 @@
  .EX
  httpd_sys_content_t 
@@ -943,7 +943,7 @@
  .EE 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.3.1/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/flask/access_vectors	2008-09-04 16:31:52.000000000 -0400
++++ serefpolicy-3.3.1/policy/flask/access_vectors	2008-09-08 11:45:12.000000000 -0400
 @@ -407,141 +407,159 @@
  #
  # SE-X Windows stuff
@@ -1178,7 +1178,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/security_classes serefpolicy-3.3.1/policy/flask/security_classes
 --- nsaserefpolicy/policy/flask/security_classes	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/flask/security_classes	2008-09-04 16:31:53.000000000 -0400
++++ serefpolicy-3.3.1/policy/flask/security_classes	2008-09-08 11:45:12.000000000 -0400
 @@ -50,21 +50,19 @@
  # passwd/chfn/chsh
[...4995 lines suppressed...]
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/auditadm.fc serefpolicy-3.3.1/policy/modules/users/auditadm.fc
 --- nsaserefpolicy/policy/modules/users/auditadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/auditadm.fc	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/auditadm.fc	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1 @@
 +# No auditadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/auditadm.if serefpolicy-3.3.1/policy/modules/users/auditadm.if
 --- nsaserefpolicy/policy/modules/users/auditadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/auditadm.if	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/auditadm.if	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for auditadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/auditadm.te serefpolicy-3.3.1/policy/modules/users/auditadm.te
 --- nsaserefpolicy/policy/modules/users/auditadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/auditadm.te	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/auditadm.te	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1,25 @@
 +policy_module(auditadm,1.0.1)
 +gen_require(`
@@ -40522,17 +40553,17 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.3.1/policy/modules/users/guest.fc
 --- nsaserefpolicy/policy/modules/users/guest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/guest.fc	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/guest.fc	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1 @@
 +# No guest file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.3.1/policy/modules/users/guest.if
 --- nsaserefpolicy/policy/modules/users/guest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/guest.if	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/guest.if	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for guest user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.3.1/policy/modules/users/guest.te
 --- nsaserefpolicy/policy/modules/users/guest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/guest.te	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/guest.te	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1,31 @@
 +policy_module(guest,1.0.1)
 +userdom_restricted_user_template(guest)
@@ -40567,17 +40598,17 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.3.1/policy/modules/users/logadm.fc
 --- nsaserefpolicy/policy/modules/users/logadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.fc	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/logadm.fc	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1 @@
 +# No logadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.3.1/policy/modules/users/logadm.if
 --- nsaserefpolicy/policy/modules/users/logadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.if	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/logadm.if	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for logadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.3.1/policy/modules/users/logadm.te
 --- nsaserefpolicy/policy/modules/users/logadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.te	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/logadm.te	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1,11 @@
 +policy_module(logadm,1.0.0)
 +
@@ -40592,22 +40623,22 @@
 +logging_admin(logadm_t, logadm_r, { logadm_devpts_t logadm_tty_device_t })
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.3.1/policy/modules/users/metadata.xml
 --- nsaserefpolicy/policy/modules/users/metadata.xml	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/metadata.xml	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/metadata.xml	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1 @@
 +<summary>Policy modules for users</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.fc serefpolicy-3.3.1/policy/modules/users/secadm.fc
 --- nsaserefpolicy/policy/modules/users/secadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.fc	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/secadm.fc	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1 @@
 +# No secadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.if serefpolicy-3.3.1/policy/modules/users/secadm.if
 --- nsaserefpolicy/policy/modules/users/secadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.if	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/secadm.if	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for secadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.te serefpolicy-3.3.1/policy/modules/users/secadm.te
 --- nsaserefpolicy/policy/modules/users/secadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.te	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/secadm.te	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1,39 @@
 +policy_module(secadm,1.0.1)
 +gen_require(`
@@ -40650,17 +40681,17 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.fc serefpolicy-3.3.1/policy/modules/users/staff.fc
 --- nsaserefpolicy/policy/modules/users/staff.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/staff.fc	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/staff.fc	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1 @@
 +# No staff file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.if serefpolicy-3.3.1/policy/modules/users/staff.if
 --- nsaserefpolicy/policy/modules/users/staff.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/staff.if	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/staff.if	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for staff user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.te serefpolicy-3.3.1/policy/modules/users/staff.te
 --- nsaserefpolicy/policy/modules/users/staff.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/staff.te	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/staff.te	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1,30 @@
 +policy_module(staff,1.0.1)
 +userdom_admin_login_user_template(staff)
@@ -40694,17 +40725,17 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.fc serefpolicy-3.3.1/policy/modules/users/user.fc
 --- nsaserefpolicy/policy/modules/users/user.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/user.fc	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/user.fc	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1 @@
 +# No user file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.if serefpolicy-3.3.1/policy/modules/users/user.if
 --- nsaserefpolicy/policy/modules/users/user.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/user.if	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/user.if	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for user user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.te serefpolicy-3.3.1/policy/modules/users/user.te
 --- nsaserefpolicy/policy/modules/users/user.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/user.te	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/user.te	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1,18 @@
 +policy_module(user,1.0.1)
 +userdom_unpriv_user_template(user)
@@ -40726,17 +40757,17 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.3.1/policy/modules/users/webadm.fc
 --- nsaserefpolicy/policy/modules/users/webadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.fc	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/webadm.fc	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1 @@
 +# No webadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.3.1/policy/modules/users/webadm.if
 --- nsaserefpolicy/policy/modules/users/webadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.if	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/webadm.if	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for webadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.3.1/policy/modules/users/webadm.te
 --- nsaserefpolicy/policy/modules/users/webadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.te	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/webadm.te	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1,41 @@
 +policy_module(webadm,1.0.0)
 +
@@ -40781,17 +40812,17 @@
 +userdom_role_change_template(staff, webadm)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.fc serefpolicy-3.3.1/policy/modules/users/xguest.fc
 --- nsaserefpolicy/policy/modules/users/xguest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.fc	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/xguest.fc	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1 @@
 +# No xguest file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.if serefpolicy-3.3.1/policy/modules/users/xguest.if
 --- nsaserefpolicy/policy/modules/users/xguest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.if	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/xguest.if	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for xguest user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.te serefpolicy-3.3.1/policy/modules/users/xguest.te
 --- nsaserefpolicy/policy/modules/users/xguest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.te	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/xguest.te	2008-09-08 11:45:13.000000000 -0400
 @@ -0,0 +1,69 @@
 +policy_module(xguest,1.0.1)
 +
@@ -40864,7 +40895,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.3.1/policy/support/file_patterns.spt
 --- nsaserefpolicy/policy/support/file_patterns.spt	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/support/file_patterns.spt	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/support/file_patterns.spt	2008-09-08 11:45:13.000000000 -0400
 @@ -537,3 +537,23 @@
  	allow $1 $2:dir rw_dir_perms;
  	type_transition $1 $2:$4 $3;
@@ -40891,7 +40922,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.3.1/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt	2008-09-08 11:45:13.000000000 -0400
 @@ -315,3 +315,13 @@
  #
  define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }')
@@ -40908,7 +40939,7 @@
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.3.1/policy/users
 --- nsaserefpolicy/policy/users	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/users	2008-09-04 16:31:45.000000000 -0400
++++ serefpolicy-3.3.1/policy/users	2008-09-08 11:45:13.000000000 -0400
 @@ -16,7 +16,7 @@
  # and a user process should never be assigned the system user
  # identity.



From ajax at fedoraproject.org  Mon Sep  8 19:30:37 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon,  8 Sep 2008 19:30:37 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nv/devel nv-2.1.12-fb-size.patch, NONE,
	1.1 xorg-x11-drv-nv.spec, 1.73, 1.74
Message-ID: <20080908193037.C3CA77012C@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-serv8068

Modified Files:
	xorg-x11-drv-nv.spec 
Added Files:
	nv-2.1.12-fb-size.patch 
Log Message:
* Mon Sep 08 2008 Adam Jackson <ajax at redhat.com> 2.1.12-2
- nv-2.1.12-fb-size.patch: Yet more lame heuristics to preallocate a usable
  framebuffer for laptops. (#458864)


nv-2.1.12-fb-size.patch:

--- NEW FILE nv-2.1.12-fb-size.patch ---
diff -up xf86-video-nv-2.1.12/src/g80_driver.c.jx xf86-video-nv-2.1.12/src/g80_driver.c
--- xf86-video-nv-2.1.12/src/g80_driver.c.jx	2008-09-08 15:26:55.000000000 -0400
+++ xf86-video-nv-2.1.12/src/g80_driver.c	2008-09-08 15:28:40.000000000 -0400
@@ -446,7 +446,10 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
     }
 
     xf86CrtcConfigInit(pScrn, &randr12_screen_funcs);
-    xf86CrtcSetSizeRange(pScrn, 320, 200, 8192, 8192);
+    if (pScrn->videoRam >= 32768)
+	xf86CrtcSetSizeRange(pScrn, 3840, 1200, 8192, 8192);
+    else
+	xf86CrtcSetSizeRange(pScrn, 320, 200, 8192, 8192);
 
     if(!xf86LoadSubModule(pScrn, "i2c")) goto fail;
     if(!xf86LoadSubModule(pScrn, "ddc")) goto fail;


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.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- xorg-x11-drv-nv.spec	28 Aug 2008 19:23:11 -0000	1.73
+++ xorg-x11-drv-nv.spec	8 Sep 2008 19:30:07 -0000	1.74
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.12
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -30,6 +30,7 @@
 Patch5:	    nv-2.1.6-starvation.patch
 Patch6:	    nv-2.1.6-panel-fix.patch
 Patch7:	    nv-save-rom.patch
+Patch8:	    nv-2.1.12-fb-size.patch
 
 %description 
 X.Org X11 nv video driver.
@@ -43,6 +44,7 @@
 %patch5 -p1 -b .starve
 %patch6 -p1 -b .panel
 %patch7 -p1 -b .save-rom
+%patch8 -p1 -b .fb-size
 
 %build
 %configure --disable-static
@@ -69,6 +71,10 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Mon Sep 08 2008 Adam Jackson <ajax at redhat.com> 2.1.12-2
+- nv-2.1.12-fb-size.patch: Yet more lame heuristics to preallocate a usable
+  framebuffer for laptops. (#458864)
+
 * Thu Aug 28 2008 Adam Jackson <ajax at redhat.com> 2.1.12-1
 - nv 2.1.12
 



From ajax at fedoraproject.org  Mon Sep  8 19:41:33 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon,  8 Sep 2008 19:41:33 +0000 (UTC)
Subject: rpms/xorg-x11-drv-i810/devel intel-2.4.2-fb-size.patch, NONE,
	1.1 xorg-x11-drv-i810.spec, 1.105, 1.106
Message-ID: <20080908194133.1BC3F700FD@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10617

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-2.4.2-fb-size.patch 
Log Message:
* Mon Sep 08 2008 Adam Jackson <ajax at redhat.com> 2.4.2-5
- intel-2.4.2-fb-size.patch: Yet more lame heuristics to preallocate a
  usable framebuffer for laptops. (#458864)


intel-2.4.2-fb-size.patch:

--- NEW FILE intel-2.4.2-fb-size.patch ---
diff -up xf86-video-intel-2.4.2/src/i830_driver.c.jx xf86-video-intel-2.4.2/src/i830_driver.c
--- xf86-video-intel-2.4.2/src/i830_driver.c.jx	2008-09-08 15:36:41.000000000 -0400
+++ xf86-video-intel-2.4.2/src/i830_driver.c	2008-09-08 15:40:53.000000000 -0400
@@ -1461,6 +1461,7 @@ I830PreInitCrtcConfig(ScrnInfoPtr pScrn)
 {
     xf86CrtcConfigPtr   xf86_config;
     I830Ptr pI830 = I830PTR(pScrn);
+    int min_width, min_height;
     int max_width, max_height;
 
     if (pI830->use_drm_mode)
@@ -1475,14 +1476,20 @@ I830PreInitCrtcConfig(ScrnInfoPtr pScrn)
 
     /* See i830_exa.c comments for why we limit the framebuffer size like this.
      */
+    min_width = 320;
+    min_height = 200;
     if (IS_I965G(pI830)) {
+	if (pScrn->videoRam >= 65536) {
+	    min_width = 3840;
+	    min_height = 1200;
+	}
 	max_width = 8192;
 	max_height = 8192;
     } else {
 	max_width = 2048;
 	max_height = 2048;
     }
-    xf86CrtcSetSizeRange (pScrn, 320, 200, max_width, max_height);
+    xf86CrtcSetSizeRange (pScrn, min_width, min_height, max_width, max_height);
 }
 
 static Bool


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- xorg-x11-drv-i810.spec	8 Sep 2008 05:45:37 -0000	1.105
+++ xorg-x11-drv-i810.spec	8 Sep 2008 19:41:02 -0000	1.106
@@ -6,7 +6,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.4.2
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -26,6 +26,7 @@
 Patch5: intel-fix-irq.patch
 # fd.o bug 17341
 Patch6: i830-render-init-no-map.patch
+Patch7: intel-2.4.2-fb-size.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -60,6 +61,7 @@
 #patch4 -p1 -b .fixflip
 %patch5 -p1 -b .irqfix
 %patch6 -p1 -b .exafix
+%patch7 -p1 -b .fb-size
 
 %build
 
@@ -102,6 +104,10 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Mon Sep 08 2008 Adam Jackson <ajax at redhat.com> 2.4.2-5
+- intel-2.4.2-fb-size.patch: Yet more lame heuristics to preallocate a
+  usable framebuffer for laptops. (#458864)
+
 * Mon Sep 08 2008 Dave Airlie <airlied at redhat.com> 2.4.2-4
 - Add patch from fd.o bug 17341 to fix problems on intel EXA
 



From wtogami at fedoraproject.org  Mon Sep  8 19:44:19 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon,  8 Sep 2008 19:44:19 +0000 (UTC)
Subject: rpms/fedora-release/F-9 fedora-release.spec, 1.71, 1.72 sources,
	1.58, 1.59
Message-ID: <20080908194419.5FDA1700FD@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/fedora-release/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11195

Modified Files:
	fedora-release.spec sources 
Log Message:
actually include the new keys and .repo files



Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/F-9/fedora-release.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- fedora-release.spec	8 Sep 2008 16:03:47 -0000	1.71
+++ fedora-release.spec	8 Sep 2008 19:43:48 -0000	1.72
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	9
-Release:	4.transition
+Release:	5.transition
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -104,7 +104,7 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
-* Fri Sep 05 2008 Warren Togami <wtogami at redhat.com> - 9-4.transition
+* Mon Sep 08 2008 Warren Togami <wtogami at redhat.com> - 9-5.transition
 - transition state between old and new key
 
 * Wed Jun 25 2008 Jesse Keating <jkeating at redhat.com> - 9-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/F-9/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	25 Jun 2008 21:53:52 -0000	1.58
+++ sources	8 Sep 2008 19:43:49 -0000	1.59
@@ -1 +1 @@
-d3037f3460e9ce7288263cf8f2b90053  fedora-release-9.tar.gz
+06b8fcead95435ca7c8e2c10da0cba7d  fedora-release-9.tar.gz



From mclasen at fedoraproject.org  Mon Sep  8 19:46:16 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 19:46:16 +0000 (UTC)
Subject: rpms/vinagre/devel .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 vinagre.spec, 1.30, 1.31
Message-ID: <20080908194616.A1F1D700FD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11785

Modified Files:
	.cvsignore sources vinagre.spec 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vinagre/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	3 Sep 2008 00:59:18 -0000	1.14
+++ .cvsignore	8 Sep 2008 19:45:46 -0000	1.15
@@ -1 +1 @@
-vinagre-2.23.91.tar.bz2
+vinagre-2.23.92.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vinagre/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	3 Sep 2008 00:59:18 -0000	1.14
+++ sources	8 Sep 2008 19:45:46 -0000	1.15
@@ -1 +1 @@
-257a7d5f23d74a591a3a4469012d2301  vinagre-2.23.91.tar.bz2
+0cf798ece1936d52fe78b53d94cfb3e8  vinagre-2.23.92.tar.bz2


Index: vinagre.spec
===================================================================
RCS file: /cvs/extras/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- vinagre.spec	3 Sep 2008 00:59:18 -0000	1.30
+++ vinagre.spec	8 Sep 2008 19:45:46 -0000	1.31
@@ -1,5 +1,5 @@
 Name:		vinagre
-Version:	2.23.91
+Version:	2.23.92
 Release:	1%{?dist}
 Summary:	VNC client for the GNOME desktop
 
@@ -101,6 +101,9 @@
 %doc README NEWS COPYING AUTHORS
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 



From anyremote at fedoraproject.org  Mon Sep  8 19:46:38 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Mon,  8 Sep 2008 19:46:38 +0000 (UTC)
Subject: rpms/kanyremote/F-9 .cvsignore, 1.5, 1.6 import.log, 1.1,
	1.2 kanyremote.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20080908194638.0F771700FD@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11907/F-9

Modified Files:
	.cvsignore import.log kanyremote.spec sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Aug 2008 18:36:40 -0000	1.5
+++ .cvsignore	8 Sep 2008 19:46:07 -0000	1.6
@@ -1 +1 @@
-kanyremote-5.1.tar.gz
+kanyremote-5.2.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Aug 2008 18:36:40 -0000	1.1
+++ import.log	8 Sep 2008 19:46:07 -0000	1.2
@@ -1 +1,2 @@
 kanyremote-5_1-1_fc9:F-9:kanyremote-5.1-1.fc9.src.rpm:1219602985
+kanyremote-5_2_1-1_fc9:F-9:kanyremote-5.2.1-1.fc9.src.rpm:1220903172


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/kanyremote.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kanyremote.spec	24 Aug 2008 18:36:40 -0000	1.4
+++ kanyremote.spec	8 Sep 2008 19:46:07 -0000	1.5
@@ -1,11 +1,11 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
-Version: 5.1
+Version: 5.2.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
-Requires: PyKDE >= 3.16, PyQt >= 3.17, pybluez >= 0.9.1, anyremote >= 4.4
+Requires: PyKDE >= 3.16, PyQt >= 3.17, pybluez >= 0.9.1, anyremote >= 4.8
 BuildRequires: desktop-file-utils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://anyremote.sourceforge.net/
@@ -31,25 +31,32 @@
   --delete-original                             \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
   $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Mon Sep 8 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.2.1-1
+- Small bugfixes.
+
+* Thu Sep 4 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.2-1
+- Added "Details" field to the main window.
+  Added French translation.
+
 * Tue Aug 19 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.1-1
-Fixed crash on startup issue.
-Added Czech  (thanks to Tomas Kaluza) and  Dutch (thanks to Geert Vanhaute)
-translations.
+- Fixed crash on startup issue.
+  Added Czech and  Dutch translations.
 
 * Mon Jul 21 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.0-1
-Internationalization support.
-Added Austrian, Brazilian Portuguese, German, Hungarian, Spanish, Italian, 
-Polish and Russian translation.
+- Internationalization support.
+  Added Austrian, Brazilian Portuguese, German, Hungarian, Spanish, Italian, 
+  Polish and Russian translation.
 
 * Sun May 25 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.9-1
 - Bugfixes and enhancements to better support anyremote-J2ME client v4.6 and
-anyremote2html v0.5.
+  anyremote2html v0.5.
 
 * Sat Apr 20 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.8-1
 - Some small enhancements. Spec file correction.
@@ -69,7 +76,7 @@
 * Mon Feb 15 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.5-1.fc8
 - Motorola RIZR Z3 support enhanced
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
@@ -78,14 +85,3 @@
 %{_datadir}/pixmaps/%{name}_light.png  
 %{_datadir}/pixmaps/%{name}.png
 %{_defaultdocdir}/%{name}
-%{_datadir}/locale/cs_CZ/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/de_AT/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/de_DE/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/es_ES/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/hu_HU/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/it_IT/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/nl_NL/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/pl_PL/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/pt_BR/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/ru_RU/LC_MESSAGES/kanyremote.mo
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Aug 2008 18:36:40 -0000	1.5
+++ sources	8 Sep 2008 19:46:07 -0000	1.6
@@ -1 +1 @@
-9796de1d7b72a1ddb90396ed858ab746  kanyremote-5.1.tar.gz
+a2d2b647ef1eff46ab5a28ca4373dad0  kanyremote-5.2.1.tar.gz



From anyremote at fedoraproject.org  Mon Sep  8 19:46:57 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Mon,  8 Sep 2008 19:46:57 +0000 (UTC)
Subject: rpms/ganyremote/F-9 .cvsignore, 1.5, 1.6 ganyremote.spec, 1.4,
	1.5 import.log, 1.1, 1.2 sources, 1.6, 1.7
Message-ID: <20080908194657.4D7DC700FD@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/ganyremote/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12049/F-9

Modified Files:
	.cvsignore ganyremote.spec import.log sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Aug 2008 18:41:01 -0000	1.5
+++ .cvsignore	8 Sep 2008 19:46:26 -0000	1.6
@@ -1 +1 @@
-ganyremote-5.1.tar.gz
+ganyremote-5.2.1.tar.gz


Index: ganyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-9/ganyremote.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ganyremote.spec	24 Aug 2008 18:41:01 -0000	1.4
+++ ganyremote.spec	8 Sep 2008 19:46:26 -0000	1.5
@@ -1,12 +1,12 @@
 Summary: GTK frontend for anyRemote
 Name: ganyremote
-Version: 5.1
+Version: 5.2.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
 URL: http://anyremote.sourceforge.net/
-Requires: pygtk2 >= 2.10, pybluez >= 0.9.1, bluez-utils >= 3.20, anyremote >= 4.4
+Requires: pygtk2 >= 2.10, pybluez >= 0.9.1, bluez-utils >= 3.20, anyremote >= 4.8
 BuildRequires: desktop-file-utils, gettext-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -31,31 +31,37 @@
   --delete-original                             \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
   $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
-
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Mon Sep 8 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.2.1-1
+- Small bugfixes.
+
+* Thu Sep 4 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.2-1
+- Added "Details" field to the main window.
+  Added French translation.
+
 * Tue Aug 19 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.1-1
-Added Czech  (thanks to Tomas Kaluza) and  Dutch (thanks to Geert Vanhaute)
-translations.
+- Added Czech and  Dutch translations.
 
 * Mon Jul 21 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.0-1
-Fixed to work properly under RHEL4. Internationalization support.
-Added Austrian, Brazilian Portuguese, German, Hungarian, Spanish, Italian, 
-Polish and Russian translation.
+- Fixed to work properly under RHEL4. Internationalization support.
+  Added Austrian, Brazilian Portuguese, German, Hungarian, Spanish, Italian, 
+  Polish and Russian translation.
 
 * Sun Jun 29 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.0-1
-Small enhancements
+- Small enhancements
 
 * Sun May 25 2008 Mikhail Fedotov <anyremote at mail.ru> - 3.0-1
-Bugfixes and enhancements to better support anyremote-J2ME client v4.6 and
-anyremote2html v0.5.
+- Bugfixes and enhancements to better support anyremote-J2ME client v4.6 and
+  anyremote2html v0.5.
 
 * Sun Apr 20 2008 Mikhail Fedotov <anyremote at mail.ru> - 2.8-2.fc8
-Spec file correction.
+- Spec file correction.
 
 * Sat Apr 19 2008 Mikhail Fedotov <anyremote at mail.ru> - 2.8-1.fc8
 - Some small enhancements. Spec file correction.
@@ -72,7 +78,7 @@
 * Mon Feb 15 2008 Mikhail Fedotov <anyremote at mail.ru> - 2.6-1.fc8
 - Motorola RIZR Z3 support enhanced
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
@@ -81,13 +87,3 @@
 %{_datadir}/pixmaps/%{name}_light.png  
 %{_datadir}/pixmaps/%{name}.png
 %{_defaultdocdir}/%{name}
-%{_datadir}/locale/cs_CZ/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/de_AT/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/de_DE/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/es_ES/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/hu_HU/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/it_IT/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/nl_NL/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/pl_PL/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/pt_BR/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/ru_RU/LC_MESSAGES/ganyremote.mo


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Aug 2008 18:41:01 -0000	1.1
+++ import.log	8 Sep 2008 19:46:26 -0000	1.2
@@ -1 +1,2 @@
 ganyremote-5_1-1_fc9:F-9:ganyremote-5.1-1.fc9.src.rpm:1219603064
+ganyremote-5_2_1-1_fc9:F-9:ganyremote-5.2.1-1.fc9.src.rpm:1220903161


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Aug 2008 18:41:01 -0000	1.6
+++ sources	8 Sep 2008 19:46:26 -0000	1.7
@@ -1 +1 @@
-8a9cdabbdf366fc49310d2e8b8bc8396  ganyremote-5.1.tar.gz
+beea475d0caf27f3c4ee2666ac32b0e0  ganyremote-5.2.1.tar.gz



From anyremote at fedoraproject.org  Mon Sep  8 19:47:36 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Mon,  8 Sep 2008 19:47:36 +0000 (UTC)
Subject: rpms/ganyremote/devel .cvsignore, 1.5, 1.6 ganyremote.spec, 1.4,
	1.5 import.log, 1.1, 1.2 sources, 1.6, 1.7
Message-ID: <20080908194736.5CE38700FD@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/ganyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12403/devel

Modified Files:
	.cvsignore ganyremote.spec import.log sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Aug 2008 18:50:23 -0000	1.5
+++ .cvsignore	8 Sep 2008 19:47:06 -0000	1.6
@@ -1 +1 @@
-ganyremote-5.1.tar.gz
+ganyremote-5.2.1.tar.gz


Index: ganyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/devel/ganyremote.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ganyremote.spec	24 Aug 2008 18:50:23 -0000	1.4
+++ ganyremote.spec	8 Sep 2008 19:47:06 -0000	1.5
@@ -1,12 +1,12 @@
 Summary: GTK frontend for anyRemote
 Name: ganyremote
-Version: 5.1
+Version: 5.2.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
 URL: http://anyremote.sourceforge.net/
-Requires: pygtk2 >= 2.10, pybluez >= 0.9.1, bluez-utils >= 3.20, anyremote >= 4.4
+Requires: pygtk2 >= 2.10, pybluez >= 0.9.1, bluez-utils >= 3.20, anyremote >= 4.8
 BuildRequires: desktop-file-utils, gettext-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -31,31 +31,37 @@
   --delete-original                             \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
   $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
-
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Mon Sep 8 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.2.1-1
+- Small bugfixes.
+
+* Thu Sep 4 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.2-1
+- Added "Details" field to the main window.
+  Added French translation.
+
 * Tue Aug 19 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.1-1
-Added Czech  (thanks to Tomas Kaluza) and  Dutch (thanks to Geert Vanhaute)
-translations.
+- Added Czech and  Dutch translations.
 
 * Mon Jul 21 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.0-1
-Fixed to work properly under RHEL4. Internationalization support.
-Added Austrian, Brazilian Portuguese, German, Hungarian, Spanish, Italian, 
-Polish and Russian translation.
+- Fixed to work properly under RHEL4. Internationalization support.
+  Added Austrian, Brazilian Portuguese, German, Hungarian, Spanish, Italian, 
+  Polish and Russian translation.
 
 * Sun Jun 29 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.0-1
-Small enhancements
+- Small enhancements
 
 * Sun May 25 2008 Mikhail Fedotov <anyremote at mail.ru> - 3.0-1
-Bugfixes and enhancements to better support anyremote-J2ME client v4.6 and
-anyremote2html v0.5.
+- Bugfixes and enhancements to better support anyremote-J2ME client v4.6 and
+  anyremote2html v0.5.
 
 * Sun Apr 20 2008 Mikhail Fedotov <anyremote at mail.ru> - 2.8-2.fc8
-Spec file correction.
+- Spec file correction.
 
 * Sat Apr 19 2008 Mikhail Fedotov <anyremote at mail.ru> - 2.8-1.fc8
 - Some small enhancements. Spec file correction.
@@ -72,7 +78,7 @@
 * Mon Feb 15 2008 Mikhail Fedotov <anyremote at mail.ru> - 2.6-1.fc8
 - Motorola RIZR Z3 support enhanced
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
@@ -81,13 +87,3 @@
 %{_datadir}/pixmaps/%{name}_light.png  
 %{_datadir}/pixmaps/%{name}.png
 %{_defaultdocdir}/%{name}
-%{_datadir}/locale/cs_CZ/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/de_AT/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/de_DE/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/es_ES/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/hu_HU/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/it_IT/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/nl_NL/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/pl_PL/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/pt_BR/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/ru_RU/LC_MESSAGES/ganyremote.mo


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Aug 2008 18:50:23 -0000	1.1
+++ import.log	8 Sep 2008 19:47:06 -0000	1.2
@@ -1 +1,2 @@
 ganyremote-5_1-1_fc9:HEAD:ganyremote-5.1-1.fc9.src.rpm:1219603799
+ganyremote-5_2_1-1_fc9:HEAD:ganyremote-5.2.1-1.fc9.src.rpm:1220903230


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Aug 2008 18:50:23 -0000	1.6
+++ sources	8 Sep 2008 19:47:06 -0000	1.7
@@ -1 +1 @@
-8a9cdabbdf366fc49310d2e8b8bc8396  ganyremote-5.1.tar.gz
+beea475d0caf27f3c4ee2666ac32b0e0  ganyremote-5.2.1.tar.gz



From anyremote at fedoraproject.org  Mon Sep  8 19:48:13 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Mon,  8 Sep 2008 19:48:13 +0000 (UTC)
Subject: rpms/kanyremote/devel .cvsignore, 1.5, 1.6 import.log, 1.1,
	1.2 kanyremote.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20080908194813.84D0E700FD@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12714/devel

Modified Files:
	.cvsignore import.log kanyremote.spec sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Aug 2008 18:48:13 -0000	1.5
+++ .cvsignore	8 Sep 2008 19:47:43 -0000	1.6
@@ -1 +1 @@
-kanyremote-5.1.tar.gz
+kanyremote-5.2.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Aug 2008 18:48:13 -0000	1.1
+++ import.log	8 Sep 2008 19:47:43 -0000	1.2
@@ -1 +1,2 @@
 kanyremote-5_1-1_fc9:HEAD:kanyremote-5.1-1.fc9.src.rpm:1219603691
+kanyremote-5_2_1-1_fc9:HEAD:kanyremote-5.2.1-1.fc9.src.rpm:1220903267


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/kanyremote.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kanyremote.spec	24 Aug 2008 18:48:13 -0000	1.4
+++ kanyremote.spec	8 Sep 2008 19:47:43 -0000	1.5
@@ -1,11 +1,11 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
-Version: 5.1
+Version: 5.2.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
-Requires: PyKDE >= 3.16, PyQt >= 3.17, pybluez >= 0.9.1, anyremote >= 4.4
+Requires: PyKDE >= 3.16, PyQt >= 3.17, pybluez >= 0.9.1, anyremote >= 4.8
 BuildRequires: desktop-file-utils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://anyremote.sourceforge.net/
@@ -31,25 +31,32 @@
   --delete-original                             \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
   $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Mon Sep 8 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.2.1-1
+- Small bugfixes.
+
+* Thu Sep 4 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.2-1
+- Added "Details" field to the main window.
+  Added French translation.
+
 * Tue Aug 19 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.1-1
-Fixed crash on startup issue.
-Added Czech  (thanks to Tomas Kaluza) and  Dutch (thanks to Geert Vanhaute)
-translations.
+- Fixed crash on startup issue.
+  Added Czech and  Dutch translations.
 
 * Mon Jul 21 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.0-1
-Internationalization support.
-Added Austrian, Brazilian Portuguese, German, Hungarian, Spanish, Italian, 
-Polish and Russian translation.
+- Internationalization support.
+  Added Austrian, Brazilian Portuguese, German, Hungarian, Spanish, Italian, 
+  Polish and Russian translation.
 
 * Sun May 25 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.9-1
 - Bugfixes and enhancements to better support anyremote-J2ME client v4.6 and
-anyremote2html v0.5.
+  anyremote2html v0.5.
 
 * Sat Apr 20 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.8-1
 - Some small enhancements. Spec file correction.
@@ -69,7 +76,7 @@
 * Mon Feb 15 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.5-1.fc8
 - Motorola RIZR Z3 support enhanced
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
@@ -78,14 +85,3 @@
 %{_datadir}/pixmaps/%{name}_light.png  
 %{_datadir}/pixmaps/%{name}.png
 %{_defaultdocdir}/%{name}
-%{_datadir}/locale/cs_CZ/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/de_AT/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/de_DE/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/es_ES/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/hu_HU/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/it_IT/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/nl_NL/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/pl_PL/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/pt_BR/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/ru_RU/LC_MESSAGES/kanyremote.mo
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Aug 2008 18:48:13 -0000	1.5
+++ sources	8 Sep 2008 19:47:43 -0000	1.6
@@ -1 +1 @@
-9796de1d7b72a1ddb90396ed858ab746  kanyremote-5.1.tar.gz
+a2d2b647ef1eff46ab5a28ca4373dad0  kanyremote-5.2.1.tar.gz



From mclasen at fedoraproject.org  Mon Sep  8 19:48:41 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 19:48:41 +0000 (UTC)
Subject: rpms/file-roller/devel .cvsignore, 1.76, 1.77 file-roller.spec,
	1.130, 1.131 sources, 1.76, 1.77
Message-ID: <20080908194841.82E39700FD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12902

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- .cvsignore	3 Sep 2008 01:32:43 -0000	1.76
+++ .cvsignore	8 Sep 2008 19:48:11 -0000	1.77
@@ -1 +1 @@
-file-roller-2.23.91.tar.bz2
+file-roller-2.23.92.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- file-roller.spec	3 Sep 2008 01:32:43 -0000	1.130
+++ file-roller.spec	8 Sep 2008 19:48:11 -0000	1.131
@@ -10,7 +10,7 @@
 
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
-Version:	2.23.91
+Version:	2.23.92
 Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
@@ -128,6 +128,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- sources	3 Sep 2008 01:32:43 -0000	1.76
+++ sources	8 Sep 2008 19:48:11 -0000	1.77
@@ -1 +1 @@
-c18d39e47b0ee1c80ac49709e8b20eef  file-roller-2.23.91.tar.bz2
+fe64e84b19fcb245a2c08f73ba978677  file-roller-2.23.92.tar.bz2



From slankes at fedoraproject.org  Mon Sep  8 19:48:44 2008
From: slankes at fedoraproject.org (Sven Lankes)
Date: Mon,  8 Sep 2008 19:48:44 +0000 (UTC)
Subject: rpms/merkaartor/F-9 merkaartor.desktop, NONE, 1.1 merkaartor.spec, 
	NONE, 1.1 merkaartor.xpm, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080908194844.C4701700FD@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12805

Modified Files:
	sources 
Added Files:
	merkaartor.desktop merkaartor.spec merkaartor.xpm 
Log Message:
Add F-9 version now that qt 4.4 is available for F9



--- NEW FILE merkaartor.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Merkaartor
GenericName=OpenStreetMap Editor
Comment=Open .gpx files
Exec=merkaartor
Icon=merkaartor
Terminal=false
Type=Application
Categories=Graphics;



--- NEW FILE merkaartor.spec ---
Name:           merkaartor
Version:        0.11
Release:        1%{?dist}
Summary:        QT-Based OpenStreetMap editor

Group:          Applications/Productivity
License:        GPLv2
URL:            http://www.irule.be/bvh/c++/merkaartor/ 
Source0:        http://www.irule.be/pipe/Merkaartor-0.11.tar.bz2
Source1:        %{name}.desktop
Source2:        %{name}.xpm
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt4-devel >= 4.4
BuildRequires:  desktop-file-utils

%description
Merkaartor is a small editor for OpenStreetMap available under the
GNU General Public License and developed  using the Qt toolkit.

It has some unique features like anti-aliased displaying,
transparent display of map features like roads and curved roads.

%prep
%setup -q -n %{name}
sed -i 's/CONFIG += debug/CONFIG += release/' Merkaartor.pro
chmod 644 LICENSE
find -name "*.[ch]" -exec %{__chmod} -x '{}' \;   
find -name "*.cpp" -exec %{__chmod} -x '{}' \; 

%build
lrelease-qt4 Merkaartor.pro
qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 NOWEBKIT=1
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make INSTALL_ROOT=${RPM_BUILD_ROOT} install
install -p -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.xpm  
desktop-file-install --vendor="fedora" \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} 

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_datadir}/merkaartor/translations/%{name}_*.qm
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}.xpm
%doc AUTHORS CHANGELOG HACKING LICENSE



%changelog
* Wed Aug 06 2008 Sven Lankes <sven at lank.es> - 0.11-1
- final 0.11 release 
- Updated versioning scheme - 0.x 

* Mon Jul 28 2008 slankes <sven at lank.es> - 0.0.11-0.1.rc1
- update to release candidate

* Thu Jul 24 2008 slankes <sven at lank.es> - 0.0.10-7
- fix executable source-files

* Wed Jun 25 2008 slankes <sven at lank.es> - 0.0.10-6
- remove superfluous make install from specfile
- tune requires/buildrequires

* Sat Jun 14 2008 slankes <sven at lank.es> - 0.0.10-5
- Remove unneeded buildrequires
- SPEC-Cleanup

* Sun May 18 2008 slankes <sven at lank.es> - 0.0.10-4
- Build in release mode instead of debug. This (among other things) makes merkaartor honour the rpm optflags) 

* Thu May  8 2008 slankes <sven at lank.es> - 0.0.10-3
- Preserve timestamps 

* Sun May  4 2008 slankes <sven at lank.es> - 0.0.10-2
- First package version



--- NEW FILE merkaartor.xpm ---
/* XPM */
static char * Merkaartor_xpm[] = {
"24 24 482 2",
"  	c #AC9744",
". 	c #877119",
"+ 	c #756110",
"@ 	c #735F11",
"# 	c #64530F",
"$ 	c #8B751F",
"% 	c #5F4F0E",
"& 	c #332A09",
"* 	c #141002",
"= 	c #151100",
"- 	c #342A02",
"; 	c #70622A",
"> 	c #74662F",
", 	c #574C20",
"' 	c #524513",
") 	c #524616",
"! 	c #54491E",
"~ 	c #685A1F",
"{ 	c #7E6A1E",
"] 	c #695918",
"^ 	c #756420",
"/ 	c #796515",
"( 	c #7B6616",
"_ 	c #A59556",
": 	c #7E6E2F",
"< 	c #705C0B",
"[ 	c #7C660D",
"} 	c #665309",
"| 	c #594703",
"1 	c #241D00",
"2 	c #171200",
"3 	c #181300",
"4 	c #2F2707",
"5 	c #4B3E0C",
"6 	c #92813D",
"7 	c #C3B26B",
"8 	c #A89856",
"9 	c #968649",
"0 	c #7F7037",
"a 	c #382D00",
"b 	c #120F00",
"c 	c #0D0A00",
"d 	c #261E00",
"e 	c #3D3100",
"f 	c #473902",
"g 	c #7D670D",
"h 	c #715C06",
"i 	c #776C3F",
"j 	c #7C6D30",
"k 	c #705D10",
"l 	c #6C590F",
"m 	c #453701",
"n 	c #0E0B00",
"o 	c #251E01",
"p 	c #705F1F",
"q 	c #C1AE67",
"r 	c #BBA85B",
"s 	c #AC9641",
"t 	c #BEAB61",
"u 	c #C6B571",
"v 	c #483B08",
"w 	c #BBA85D",
"x 	c #7F6F32",
"y 	c #433600",
"z 	c #2D2400",
"A 	c #0F0C00",
"B 	c #1D1800",
"C 	c #493C08",
"D 	c #423501",
"E 	c #6B5603",
"F 	c #8C7B36",
"G 	c #7E6D2A",
"H 	c #4D3E02",
"I 	c #473903",
"J 	c #231C00",
"K 	c #110D00",
"L 	c #4D3F05",
"M 	c #9A8531",
"N 	c #C1AF66",
"O 	c #BDAB61",
"P 	c #A69240",
"Q 	c #9C8B49",
"R 	c #A39354",
"S 	c #897B42",
"T 	c #94833E",
"U 	c #93823D",
"V 	c #8B7D45",
"W 	c #514412",
"X 	c #786725",
"Y 	c #5B4D16",
"Z 	c #100C00",
"` 	c #110E00",
" .	c #4E3F05",
"..	c #5B4902",
"+.	c #7F6F2E",
"@.	c #847332",
"#.	c #3A2F01",
"$.	c #221B00",
"%.	c #120E00",
"&.	c #1C1600",
"*.	c #2F2600",
"=.	c #2E2500",
"-.	c #2E2501",
";.	c #2C2300",
">.	c #352B00",
",.	c #1F1800",
"'.	c #211A00",
").	c #292100",
"!.	c #1E1800",
"~.	c #211B04",
"{.	c #181301",
"].	c #1E1803",
"^.	c #141000",
"/.	c #322A0A",
"(.	c #604F09",
"_.	c #927E30",
":.	c #978335",
"<.	c #554504",
"[.	c #0C0900",
"}.	c #171300",
"|.	c #392E02",
"1.	c #312701",
"2.	c #1A1501",
"3.	c #61531B",
"4.	c #AD9A51",
"5.	c #AF9A49",
"6.	c #816B13",
"7.	c #5B4900",
"8.	c #413400",
"9.	c #282000",
"0.	c #735F0E",
"a.	c #3D3105",
"b.	c #2A2100",
"c.	c #978330",
"d.	c #9B8634",
"e.	c #2F2601",
"f.	c #0A0800",
"g.	c #191400",
"h.	c #161200",
"i.	c #4F4108",
"j.	c #9F8933",
"k.	c #BFAD63",
"l.	c #BBA960",
"m.	c #AB9748",
"n.	c #5E4E0B",
"o.	c #1D1700",
"p.	c #100D00",
"q.	c #56460A",
"r.	c #7C660C",
"s.	c #504104",
"t.	c #110D01",
"u.	c #98853C",
"v.	c #201900",
"w.	c #312802",
"x.	c #403407",
"y.	c #B4A04F",
"z.	c #C3B169",
"A.	c #C5B46E",
"B.	c #C9B977",
"C.	c #7D6918",
"D.	c #292000",
"E.	c #493C09",
"F.	c #312700",
"G.	c #130F00",
"H.	c #54460C",
"I.	c #765F08",
"J.	c #6B5602",
"K.	c #140F00",
"L.	c #5C522A",
"M.	c #91803C",
"N.	c #302602",
"O.	c #887113",
"P.	c #403509",
"Q.	c #3D3102",
"R.	c #807238",
"S.	c #B2A260",
"T.	c #908042",
"U.	c #594E27",
"V.	c #604F08",
"W.	c #473900",
"X.	c #1A1400",
"Y.	c #423503",
"Z.	c #735E09",
"`.	c #745F08",
" +	c #4E3E01",
".+	c #1A1500",
"++	c #49411F",
"@+	c #86783F",
"#+	c #2E2400",
"$+	c #635109",
"%+	c #8C761C",
"&+	c #937D27",
"*+	c #5F4F10",
"=+	c #302703",
"-+	c #857844",
";+	c #52471A",
">+	c #2C2509",
",+	c #3C3000",
"'+	c #382C00",
")+	c #2A2101",
"!+	c #241C00",
"~+	c #211A01",
"{+	c #4B3C01",
"]+	c #7E670B",
"^+	c #745E06",
"/+	c #584702",
"(+	c #514823",
"_+	c #7A6B32",
":+	c #322800",
"<+	c #6A5608",
"[+	c #988125",
"}+	c #947C1C",
"|+	c #A18A2F",
"1+	c #AD994B",
"2+	c #B19F59",
"3+	c #7E6A1B",
"4+	c #B9A657",
"5+	c #AB9950",
"6+	c #7C6A23",
"7+	c #4B3C00",
"8+	c #796823",
"9+	c #403404",
"0+	c #887424",
"a+	c #8B730F",
"b+	c #886F0F",
"c+	c #7A6308",
"d+	c #735D05",
"e+	c #423500",
"f+	c #463C12",
"g+	c #917E32",
"h+	c #483A01",
"i+	c #877012",
"j+	c #8B7419",
"k+	c #9E862A",
"l+	c #A48D32",
"m+	c #BEAC61",
"n+	c #AF9B4E",
"o+	c #C7B673",
"p+	c #BBAA65",
"q+	c #6C5A13",
"r+	c #614E02",
"s+	c #7B6C30",
"t+	c #8F7A23",
"u+	c #927917",
"v+	c #876E0B",
"w+	c #856D10",
"x+	c #745E05",
"y+	c #3F350C",
"z+	c #887735",
"A+	c #251E00",
"B+	c #594805",
"C+	c #8F7717",
"D+	c #9E8629",
"E+	c #A18A2E",
"F+	c #9C852C",
"G+	c #8D7B34",
"H+	c #504416",
"I+	c #766628",
"J+	c #AC9A51",
"K+	c #5A4A0A",
"L+	c #624F04",
"M+	c #584703",
"N+	c #5D4C08",
"O+	c #957E22",
"P+	c #8D7411",
"Q+	c #846B0A",
"R+	c #7D6609",
"S+	c #574603",
"T+	c #4F4316",
"U+	c #766831",
"V+	c #584805",
"W+	c #897113",
"X+	c #927A1B",
"Y+	c #977F1F",
"Z+	c #675613",
"`+	c #4A3C05",
" @	c #4F4210",
".@	c #534719",
"+@	c #544407",
"@@	c #5C4A04",
"#@	c #483A00",
"$@	c #40350B",
"%@	c #968026",
"&@	c #887010",
"*@	c #9A8223",
"=@	c #947C1A",
"-@	c #886F0C",
";@	c #856D0C",
">@	c #5D4B03",
",@	c #594C1C",
"'@	c #8C7E46",
")@	c #1B1600",
"!@	c #5C4B0A",
"~@	c #967E1E",
"{@	c #322907",
"]@	c #665924",
"^@	c #695B22",
"/@	c #372E0B",
"(@	c #403300",
"_@	c #231D04",
":@	c #AB9952",
"<@	c #9B852D",
"[@	c #866E12",
"}@	c #998020",
"|@	c #8C7411",
"1@	c #8C7310",
"2@	c #80690D",
"3@	c #41360C",
"4@	c #80733E",
"5@	c #342A00",
"6@	c #7F6912",
"7@	c #9B8326",
"8@	c #998124",
"9@	c #8F7718",
"0@	c #5D4B05",
"a@	c #A6944C",
"b@	c #6E6026",
"c@	c #302600",
"d@	c #5C5021",
"e@	c #9D893B",
"f@	c #6D590D",
"g@	c #282104",
"h@	c #796410",
"i@	c #937A1A",
"j@	c #7D6504",
"k@	c #5A4903",
"l@	c #53481A",
"m@	c #867942",
"n@	c #2D2608",
"o@	c #816C16",
"p@	c #9E8628",
"q@	c #91791A",
"r@	c #A18B36",
"s@	c #776006",
"t@	c #90791E",
"u@	c #443702",
"v@	c #7E6B20",
"w@	c #A29150",
"x@	c #BAA75B",
"y@	c #A48F3D",
"z@	c #362B00",
"A@	c #0C0A00",
"B@	c #483A02",
"C@	c #927A1A",
"D@	c #564503",
"E@	c #524615",
"F@	c #887D50",
"G@	c #473E1A",
"H@	c #B19E55",
"I@	c #B7A354",
"J@	c #806F28",
"K@	c #382E03",
"L@	c #7F6E2E",
"M@	c #836C0F",
"N@	c #806A10",
"O@	c #75600D",
"P@	c #937D26",
"Q@	c #6D5807",
"R@	c #1C1703",
"S@	c #C3B26C",
"T@	c #B8A558",
"U@	c #A38D37",
"V@	c #2C2403",
"W@	c #4C3E02",
"X@	c #66571B",
"Y@	c #A9995A",
"Z@	c #BBA85E",
"`@	c #BAA658",
" #	c #BEAB60",
".#	c #635315",
"+#	c #695818",
"@#	c #715D0F",
"##	c #8A7212",
"$#	c #715D0C",
"%#	c #6B580D",
"&#	c #7C660E",
"*#	c #41391A",
"=#	c #C3B16B",
"-#	c #856F19",
";#	c #0B0900",
">#	c #0F0B00",
",#	c #453B15",
"'#	c #BFAD65",
")#	c #BBA85A",
"!#	c #BDAA5D",
"~#	c #B5A153",
"{#	c #5F5117",
"]#	c #B9A556",
"^#	c #806C1B",
"/#	c #8B782D",
"(#	c #87721E",
"_#	c #4D3E05",
":#	c #221D0B",
"<#	c #6C5F29",
"[#	c #B9A75E",
"}#	c #604F0D",
"|#	c #433707",
"1#	c #272002",
"2#	c #292102",
"3#	c #54491D",
"4#	c #261F06",
"5#	c #3D3411",
"6#	c #BFAC64",
"7#	c #B9A555",
"8#	c #BDAA5E",
"9#	c #917F35",
"0#	c #76682C",
"a#	c #BFAC61",
"b#	c #857226",
"c#	c #846D15",
"d#	c #433705",
"e#	c #705B06",
"f#	c #4D4213",
"g#	c #7F7034",
"h#	c #685818",
"i#	c #A59141",
"j#	c #B8A559",
"k#	c #635418",
"l#	c #94864C",
"m#	c #C6B570",
"n#	c #AA9645",
"o#	c #453B16",
"p#	c #B0A061",
"q#	c #B6A250",
"r#	c #766729",
"s#	c #1D1703",
"t#	c #BFAD64",
"u#	c #BFAD62",
"v#	c #C0AD63",
"w#	c #7E6B1D",
"x#	c #7B650E",
"y#	c #6D5F28",
"z#	c #8C7B39",
"A#	c #C1B06C",
"B#	c #C8B774",
"C#	c #CABA79",
"D#	c #AF9B4D",
"E#	c #C0AE68",
"F#	c #CAB978",
"G#	c #C0AE67",
"H#	c #5B4C0F",
"I#	c #4B4220",
"J#	c #A19257",
"K#	c #AB9641",
"L#	c #38300D",
"M#	c #221C04",
"N#	c #BFAD66",
"O#	c #C2AF66",
"P#	c #C3B168",
"Q#	c #A7954E",
"R#	c #908040",
"S#	c #C7B571",
"T#	c #CEBE80",
"U#	c #CDBD7F",
"V#	c #CEBF82",
"W#	c #CBBC7C",
"X#	c #C7B672",
"Y#	c #C9B877",
"Z#	c #B19D4D",
"`#	c #6D5A0D",
" $	c #403819",
".$	c #9E8E50",
"+$	c #8E7A2E",
"@$	c #AD9844",
"#$	c #302702",
"$$	c #3A310D",
"%$	c #C3B16A",
"&$	c #C4B26B",
"*$	c #C5B36D",
"=$	c #BBA75B",
"-$	c #3A2F02",
";$	c #6F612A",
">$	c #CEBF81",
",$	c #CDBD7E",
"'$	c #C9B978",
")$	c #695C2B",
"!$	c #816F29",
"~$	c #CAB977",
"{$	c #C6B572",
"]$	c #937F2F",
"^$	c #5C4B06",
"/$	c #6F6230",
"  . + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( _ ",
": < [ } | 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i ",
"j k l m 3 n o p q r s t u v w x y z A B C D E F ",
"G H I J K L M N O P Q R S T U V W X Y Z `  ...+.",
"@.#.$.%.2 &.*.=.-.=.;.z >.,.'.).!.~.{.].^./.(._.",
":.<.[.}.,.|.1.2.3.4.5.6.7.8.9.3 ` c #.0.a.A b.c.",
"d.e.f.c 3 g.h.i.j.k.l.m.n.).o.2 p.%.q.r.s.'.t.+.",
"u.v.n A w.x.K - y.z.A.B.C.=.D.E.F.G.H.I.J.=.K.L.",
"M.1 ^.=.N.O.P.Q.R.S.T.U.V.W.x.b.X.n Y.Z.`. +.+++",
"@+1 K #+$+%+&+*+=+-+;+>+,+'+)+!+~+K {+]+^+/+J (+",
"_+:+&.*.<+[+}+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+f+",
"g+y o.h+i+j+k+l+m+n+k.o+p+q+r+s+W.t+u+v+w+x+7+y+",
"z+A+2 B+C+D+E+F+G+H+I+J+K+L+M+&.N+O+u+P+Q+R+S+T+",
"U+2 '.V+W+X+Y+Z+`+ @. at +@@@#@;.$@%@&@*@=@-@;@>@,@",
"'@A+)@!@~@k+Y+w.{@]@^@/@b.(@_@:@<@[@}@|@1 at 2@S+3@",
"4 at 1 5 at 6@7 at 8@9 at r+0@a at b@c at 5@g.d at w e at f@g at h@i at j@k at l@",
"m at g.n@o at p@q at r@s at t@{+u at v@3 K w at x@y at z@A at p.B@C at D@E@",
"F at G@H at I@J at K@L at M@N at O@P at Q@!.R at S@T at U@^.c [.A at V@W at X@",
"Y at Z@`@ #.#[ +#@###$#%#&#).*#=#p+-#%.%.K ;#>#g.,#",
"'#)#!#~#{#]#^#B@/#(#_#B@!.:#<#[#}#|#1#2#3#4#d 5#",
"6#7#8#9#0#N a#b#c#0+d#e#9.f#g#h#i#j#k#l#m#n#1.o#",
"p#q#8#r#s#t#u#v#w#x#9.e.y#z#A#B#C#D#E#F#G#=#H#I#",
"J#K#N L#M#N#O#P#Q#e.2#R#S#T#U#V#W#U+X#C#Y#Z#`# $",
".$+$@$#$$$%$&$*$=$-$;$u X#>$,$'$)$!$~$U#{$]$^$/$"};


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Jul 2008 16:54:37 -0000	1.1
+++ sources	8 Sep 2008 19:48:14 -0000	1.2
@@ -0,0 +1 @@
+338b9c5563199be3b2282bdf550ae407  Merkaartor-0.11.tar.bz2



From anyremote at fedoraproject.org  Mon Sep  8 19:58:48 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Mon,  8 Sep 2008 19:58:48 +0000 (UTC)
Subject: rpms/ganyremote/F-8 import.log, NONE, 1.1 .cvsignore, 1.4,
	1.5 ganyremote.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20080908195848.1D003700FD@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/ganyremote/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15111/F-8

Modified Files:
	.cvsignore ganyremote.spec sources 
Added Files:
	import.log 
Log Message:
build


--- NEW FILE import.log ---
ganyremote-5_2_1-1_fc9:F-8:ganyremote-5.2.1-1.fc9.src.rpm:1220903676


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Jul 2008 21:46:44 -0000	1.4
+++ .cvsignore	8 Sep 2008 19:58:17 -0000	1.5
@@ -1 +1 @@
-ganyremote-5.0.tar.gz
+ganyremote-5.2.1.tar.gz


Index: ganyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-8/ganyremote.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ganyremote.spec	24 Jul 2008 21:46:44 -0000	1.3
+++ ganyremote.spec	8 Sep 2008 19:58:17 -0000	1.4
@@ -1,12 +1,12 @@
 Summary: GTK frontend for anyRemote
 Name: ganyremote
-Version: 5.0
+Version: 5.2.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
 URL: http://anyremote.sourceforge.net/
-Requires: pygtk2 >= 2.10, pybluez >= 0.9.1, bluez-utils >= 3.20, anyremote >= 4.4
+Requires: pygtk2 >= 2.10, pybluez >= 0.9.1, bluez-utils >= 3.20, anyremote >= 4.8
 BuildRequires: desktop-file-utils, gettext-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -31,27 +31,37 @@
   --delete-original                             \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
   $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
-
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Mon Sep 8 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.2.1-1
+- Small bugfixes.
+
+* Thu Sep 4 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.2-1
+- Added "Details" field to the main window.
+  Added French translation.
+
+* Tue Aug 19 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.1-1
+- Added Czech and  Dutch translations.
+
 * Mon Jul 21 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.0-1
-Fixed to work properly under RHEL4. Internationalization support.
-Added Austrian, Brazilian Portuguese, German, Hungarian, Spanish, Italian, 
-Polish and Russian translation.
+- Fixed to work properly under RHEL4. Internationalization support.
+  Added Austrian, Brazilian Portuguese, German, Hungarian, Spanish, Italian, 
+  Polish and Russian translation.
 
 * Sun Jun 29 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.0-1
-Small enhancements
+- Small enhancements
 
 * Sun May 25 2008 Mikhail Fedotov <anyremote at mail.ru> - 3.0-1
-Bugfixes and enhancements to better support anyremote-J2ME client v4.6 and
-anyremote2html v0.5.
+- Bugfixes and enhancements to better support anyremote-J2ME client v4.6 and
+  anyremote2html v0.5.
 
 * Sun Apr 20 2008 Mikhail Fedotov <anyremote at mail.ru> - 2.8-2.fc8
-Spec file correction.
+- Spec file correction.
 
 * Sat Apr 19 2008 Mikhail Fedotov <anyremote at mail.ru> - 2.8-1.fc8
 - Some small enhancements. Spec file correction.
@@ -68,7 +78,7 @@
 * Mon Feb 15 2008 Mikhail Fedotov <anyremote at mail.ru> - 2.6-1.fc8
 - Motorola RIZR Z3 support enhanced
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
@@ -77,11 +87,3 @@
 %{_datadir}/pixmaps/%{name}_light.png  
 %{_datadir}/pixmaps/%{name}.png
 %{_defaultdocdir}/%{name}
-%{_datadir}/locale/de_AT/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/de_DE/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/es_ES/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/it_IT/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/hu_HU/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/pl_PL/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/pt_BR/LC_MESSAGES/ganyremote.mo
-%{_datadir}/locale/ru_RU/LC_MESSAGES/ganyremote.mo


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Jul 2008 21:46:44 -0000	1.4
+++ sources	8 Sep 2008 19:58:17 -0000	1.5
@@ -1 +1 @@
-9b0273e65724bd9369df9c2fe541bf37  ganyremote-5.0.tar.gz
+beea475d0caf27f3c4ee2666ac32b0e0  ganyremote-5.2.1.tar.gz



From anyremote at fedoraproject.org  Mon Sep  8 20:01:02 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Mon,  8 Sep 2008 20:01:02 +0000 (UTC)
Subject: rpms/kanyremote/F-8 import.log, NONE, 1.1 .cvsignore, 1.4,
	1.5 kanyremote.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20080908200102.1C0927012A@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15865/F-8

Modified Files:
	.cvsignore kanyremote.spec sources 
Added Files:
	import.log 
Log Message:
build


--- NEW FILE import.log ---
kanyremote-5_2_1-1_fc9:F-8:kanyremote-5.2.1-1.fc9.src.rpm:1220903994


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Jul 2008 21:50:34 -0000	1.4
+++ .cvsignore	8 Sep 2008 20:00:31 -0000	1.5
@@ -1 +1 @@
-kanyremote-5.0.tar.gz
+kanyremote-5.2.1.tar.gz


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-8/kanyremote.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kanyremote.spec	24 Jul 2008 21:50:34 -0000	1.3
+++ kanyremote.spec	8 Sep 2008 20:00:31 -0000	1.4
@@ -1,11 +1,11 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
-Version: 5.0
+Version: 5.2.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
-Requires: PyKDE >= 3.16, PyQt >= 3.17, pybluez >= 0.9.1, anyremote >= 4.4
+Requires: PyKDE >= 3.16, PyQt >= 3.17, pybluez >= 0.9.1, anyremote >= 4.8
 BuildRequires: desktop-file-utils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://anyremote.sourceforge.net/
@@ -31,19 +31,32 @@
   --delete-original                             \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
   $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+
+* Mon Sep 8 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.2.1-1
+- Small bugfixes.
+
+* Thu Sep 4 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.2-1
+- Added "Details" field to the main window.
+  Added French translation.
+
+* Tue Aug 19 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.1-1
+- Fixed crash on startup issue.
+  Added Czech and  Dutch translations.
+
 * Mon Jul 21 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.0-1
-Internationalization support.
-Added Austrian, Brazilian Portuguese, German, Hungarian, Spanish, Italian, 
-Polish and Russian translation.
+- Internationalization support.
+  Added Austrian, Brazilian Portuguese, German, Hungarian, Spanish, Italian, 
+  Polish and Russian translation.
 
 * Sun May 25 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.9-1
 - Bugfixes and enhancements to better support anyremote-J2ME client v4.6 and
-anyremote2html v0.5.
+  anyremote2html v0.5.
 
 * Sat Apr 20 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.8-1
 - Some small enhancements. Spec file correction.
@@ -63,7 +76,7 @@
 * Mon Feb 15 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.5-1.fc8
 - Motorola RIZR Z3 support enhanced
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
@@ -72,12 +85,3 @@
 %{_datadir}/pixmaps/%{name}_light.png  
 %{_datadir}/pixmaps/%{name}.png
 %{_defaultdocdir}/%{name}
-%{_datadir}/locale/de_AT/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/de_DE/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/es_ES/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/it_IT/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/hu_HU/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/pl_PL/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/pt_BR/LC_MESSAGES/kanyremote.mo
-%{_datadir}/locale/ru_RU/LC_MESSAGES/kanyremote.mo
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Jul 2008 21:50:34 -0000	1.4
+++ sources	8 Sep 2008 20:00:31 -0000	1.5
@@ -1 +1 @@
-be26667d5e7442c5b74ebf8ceaa5a9ec  kanyremote-5.0.tar.gz
+5893683d6cd5d5cc4994edb0a3532c73  kanyremote-5.2.1.tar.gz



From whot at fedoraproject.org  Mon Sep  8 20:03:07 2008
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon,  8 Sep 2008 20:03:07 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/devel
	xf86-input-synaptics-0.15.0-preprobe.patch, NONE,
	1.1 10-synaptics.fdi, 1.2,
	1.3 xf86-input-synaptics-0.15.0-edges.patch, 1.1,
	1.2 xorg-x11-drv-synaptics.spec, 1.5, 1.6
Message-ID: <20080908200307.B260E700FD@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16605

Modified Files:
	10-synaptics.fdi xf86-input-synaptics-0.15.0-edges.patch 
	xorg-x11-drv-synaptics.spec 
Added Files:
	xf86-input-synaptics-0.15.0-preprobe.patch 
Log Message:
* Mon Sep 8 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.0-6
- xf86-input-synaptics-0.15.0-edges.patch: updated to improve edge calculation
  and acceleration factors.
- xf86-input-synaptics-0.15.0-preprobe patch: pre-probe eventcomm devices for
  axis ranges if specifed with Device option.
- update fdi file to support "bcm5974" devices.



xf86-input-synaptics-0.15.0-preprobe.patch:

--- NEW FILE xf86-input-synaptics-0.15.0-preprobe.patch ---
>From 123bc4814c32ecc285d58731ef6e774d2a65994e Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at redhat.com>
Date: Mon, 8 Sep 2008 23:07:35 +0930
Subject: [PATCH] Pre-probe the device (eventcomm only).

For auto-dev, we'd probe the device node and get the axis ranges. If we
specify the device however we didn't. As a result, the automatic edge and
accel detection didn't apply.

Pre-probing the device fixes this issue.
---
 src/alpscomm.c  |    3 ++-
 src/eventcomm.c |   28 +++++++++++++++++++++++++++-
 src/ps2comm.c   |    3 ++-
 src/psmcomm.c   |    3 ++-
 src/synaptics.c |    5 +++--
 src/synproto.h  |    1 +
 6 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/alpscomm.c b/src/alpscomm.c
index 4f19d04..0b93fef 100644
--- a/src/alpscomm.c
+++ b/src/alpscomm.c
@@ -262,5 +262,6 @@ struct SynapticsProtocolOperations alps_proto_operations = {
     ALPSDeviceOffHook,
     ALPSQueryHardware,
     ALPSReadHwState,
-    ALPSAutoDevProbe
+    ALPSAutoDevProbe,
+    NULL /* ProbeDevice */
 };
diff --git a/src/eventcomm.c b/src/eventcomm.c
index 14c9cab..789d1d5 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -298,6 +298,31 @@ EventReadHwState(LocalDevicePtr local, struct SynapticsHwInfo *synhw,
     return FALSE;
 }
 
+/**
+ * Probe the given device name for axis ranges, if appropriate.
+ */
+static Bool
+EventProbeDevice(LocalDevicePtr local, char* device)
+{
+    int fd;
+
+    SYSCALL(fd = open(device, O_RDONLY));
+    if (fd < 0)
+        goto out;
+
+    if (!event_query_is_touchpad(fd))
+        goto out;
+
+    event_query_axis_ranges(fd, local);
+
+out:
+    if (fd >= 0)
+        SYSCALL(close(fd));
+
+    /* Always return TRUE, PreInit will complain for us if necessary */
+    return TRUE;
+}
+
 static Bool
 EventAutoDevProbe(LocalDevicePtr local)
 {
@@ -354,5 +379,6 @@ struct SynapticsProtocolOperations event_proto_operations = {
     EventDeviceOffHook,
     EventQueryHardware,
     EventReadHwState,
-    EventAutoDevProbe
+    EventAutoDevProbe,
+    EventProbeDevice
 };
diff --git a/src/ps2comm.c b/src/ps2comm.c
index 32e3dc9..cc2a202 100644
--- a/src/ps2comm.c
+++ b/src/ps2comm.c
@@ -758,5 +758,6 @@ struct SynapticsProtocolOperations psaux_proto_operations = {
     PS2DeviceOffHook,
     PS2QueryHardware,
     PS2ReadHwState,
-    PS2AutoDevProbe
+    PS2AutoDevProbe,
+    NULL /* ProbeDevice */
 };
diff --git a/src/psmcomm.c b/src/psmcomm.c
index 95364ab..c36bed3 100644
--- a/src/psmcomm.c
+++ b/src/psmcomm.c
@@ -177,5 +177,6 @@ struct SynapticsProtocolOperations psm_proto_operations = {
     PSMDeviceOffHook,
     PSMQueryHardware,
     PSMReadHwState,
-    PSMAutoDevProbe
+    PSMAutoDevProbe,
+    NULL /* ProbeDevice */
 };
diff --git a/src/synaptics.c b/src/synaptics.c
index 6d55f9a..3f603fc 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -171,8 +171,9 @@ SetDeviceAndProtocol(LocalDevicePtr local)
 	xf86SetStrOption(local->options, "Device", device);
     }
     if (device && strstr(device, "/dev/input/event")) {
-	/* trust the device name if we've been given one */
-	proto = SYN_PROTO_EVENT;
+        if (event_proto_operations.ProbeDevice &&
+            event_proto_operations.ProbeDevice(local, device))
+            proto = SYN_PROTO_EVENT;
     } else {
 	str_par = xf86FindOptionValue(local->options, "Protocol");
 	if (str_par && !strcmp(str_par, "psaux")) {
diff --git a/src/synproto.h b/src/synproto.h
index d5ae8f9..246adbd 100644
--- a/src/synproto.h
+++ b/src/synproto.h
@@ -96,6 +96,7 @@ struct SynapticsProtocolOperations {
 			struct SynapticsProtocolOperations *proto_ops,
 			struct CommData *comm, struct SynapticsHwState *hwRet);
     Bool (*AutoDevProbe)(LocalDevicePtr local);
+    Bool (*ProbeDevice)(LocalDevicePtr local, char* name);
 };
 
 extern struct SynapticsProtocolOperations psaux_proto_operations;
-- 
1.6.0.1



Index: 10-synaptics.fdi
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/10-synaptics.fdi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 10-synaptics.fdi	7 Sep 2008 12:51:03 -0000	1.2
+++ 10-synaptics.fdi	8 Sep 2008 20:02:37 -0000	1.3
@@ -11,6 +11,9 @@
       <match key="info.product" contains="appletouch">
           <merge key="input.x11_driver" type="string">synaptics</merge>
       </match>
+      <match key="info.product" contains="bcm5974">
+          <merge key="input.x11_driver" type="string">synaptics</merge>
+      </match>
     </match>
   </device>
 </deviceinfo>

xf86-input-synaptics-0.15.0-edges.patch:

Index: xf86-input-synaptics-0.15.0-edges.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/xf86-input-synaptics-0.15.0-edges.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xf86-input-synaptics-0.15.0-edges.patch	28 Aug 2008 13:26:26 -0000	1.1
+++ xf86-input-synaptics-0.15.0-edges.patch	8 Sep 2008 20:02:37 -0000	1.2
@@ -1,20 +1,18 @@
-From fb5d8d6adea29f3b7131e3f4897d9c45572c33be Mon Sep 17 00:00:00 2001
+From af9e8eb1795135cad8368fc20625e78b73e3d3ce Mon Sep 17 00:00:00 2001
 From: Peter Hutterer <peter.hutterer at redhat.com>
-Date: Thu, 28 Aug 2008 21:58:01 +0930
-Subject: [PATCH] Leave 5% on each side for edge detection.
+Date: Mon, 8 Sep 2008 21:23:46 +0930
+Subject: [PATCH] Improve edge autodetection and accel.
 
-Edge detection only works if the coordinates are < or > than the configured
-edge. Let's move all edges in by 5% from the autodetected ranges to ease edge
-detection.
-
-Conflicts:
-
-	src/synapticsstr.h
+The synaptics spec specifies "typical axis ranges" for synaptics devices.
+Based on these typical ranges, calculate edge coordinates and apply the same
+proportions to the device at hand.
+Based on the hard-coded ranges and acceleration, calculate accel for
+autodetected ranges in the same proportions.
 ---
- src/eventcomm.c |   12 ++++++------
- src/synaptics.c |   27 +++++++++++++++++----------
+ src/eventcomm.c |   12 ++++----
+ src/synaptics.c |   81 ++++++++++++++++++++++++++++++++++++++++++-------------
  src/synaptics.h |    1 +
- 3 files changed, 24 insertions(+), 16 deletions(-)
+ 3 files changed, 69 insertions(+), 25 deletions(-)
 
 diff --git a/src/eventcomm.c b/src/eventcomm.c
 index 3d3e6cf..14c9cab 100644
@@ -57,37 +55,36 @@
  	xf86Msg(X_ERROR, "%s: failed to query axis range (%s)\n", local->name,
  		strerror(errno));
 diff --git a/src/synaptics.c b/src/synaptics.c
-index de9fc1a..50ebec6 100644
+index f1fc42c..f20e259 100644
 --- a/src/synaptics.c
 +++ b/src/synaptics.c
-@@ -294,6 +294,7 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+@@ -294,6 +294,10 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
      char *repeater;
      pointer opts;
      int status;
-+    int ewidth, eheight; /* edge width/height */
++    float minSpeed, maxSpeed;
++    int horizScrollDelta, vertScrollDelta,
++        edgeMotionMinSpeed, edgeMotionMaxSpeed;
++    int l, r, t, b; /* left, right, top, bottom */
  
      /* allocate memory for SynapticsPrivateRec */
      priv = xcalloc(1, sizeof(SynapticsPrivate));
-@@ -336,13 +337,13 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+@@ -336,14 +340,6 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
  
      xf86OptionListReport(opts);
  
 -    /* set hard-coded axis ranges before querying the device.
-+    /* set default axis ranges before querying the device.
-      * These defaults are overwritten with the ones provided by the device
-      * during SetDeviceAndProtocol (if applicable). */
+-     * These defaults are overwritten with the ones provided by the device
+-     * during SetDeviceAndProtocol (if applicable). */
 -    priv->synpara_default.left_edge   = 1900;
 -    priv->synpara_default.right_edge  = 5400;
 -    priv->synpara_default.top_edge    = 1900;
 -    priv->synpara_default.bottom_edge = 4000;
-+    priv->minx = 1900;
-+    priv->maxx = 5400;
-+    priv->miny = 1900;
-+    priv->maxy = 4000;
- 
+-
      SetDeviceAndProtocol(local);
  
-@@ -370,11 +371,17 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+     /* open the touchpad device */
+@@ -370,11 +366,58 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
      /* read the parameters */
      pars = &priv->synpara_default;
      pars->version = (PACKAGE_VERSION_MAJOR*10000+PACKAGE_VERSION_MINOR*100+PACKAGE_VERSION_PATCHLEVEL);
@@ -97,24 +94,98 @@
 -    pars->top_edge = xf86SetIntOption(opts, "TopEdge", pars->top_edge);
 -    pars->bottom_edge = xf86SetIntOption(opts, "BottomEdge", pars->bottom_edge);
 +
++    /* The synaptics specs specify typical edge widths of 4% on x, and 5.4% on
++     * y (page 7) [Synaptics TouchPad Interfacing Guide, 510-000080 - A
++     * Second Edition, http://www.synaptics.com/support/dev_support.cfm, 8 Sep
++     * 2008]
++     * If the range was autodetected, apply these edge widths to all four
++     * sides.
++     */
++    if (priv->maxx && priv->maxy)
++    {
++        int width, height;
++        int ewidth, eheight; /* edge width/height */
++
++        width = abs(priv->maxx - priv->minx);
++        height = abs(priv->maxy - priv->miny);
++        ewidth = width * .04;
++        eheight = height * .055;
++
++        l = priv->minx + ewidth;
++        r = priv->maxx - ewidth;
++        t = priv->miny + eheight;
++        b = priv->maxy - eheight;
++
++        /* Default min/max speed are 0.09/0.18. Assuming we have a device that
++         * reports height 3040 (typical y range in synaptics specs) this gives
++         * us the same result. */
++        minSpeed = 273.0/height;
++        maxSpeed = 547.0/height;
++
++        /* Again, based on typical x/y range and defaults */
++        horizScrollDelta = width * .025;
++        vertScrollDelta = height * .04;
++        edgeMotionMinSpeed = 1;
++        edgeMotionMaxSpeed = width * .1;
++    } else {
++        l = 1900;
++        r = 5400;
++        t = 1900;
++        b = 4000;
++        minSpeed = 0.09;
++        maxSpeed = 0.18;
++
++        horizScrollDelta = 100;
++        vertScrollDelta = 100;
++        edgeMotionMinSpeed = 1;
++        edgeMotionMaxSpeed = 400;
++    }
 +
-+    /* 5% on each side is reserved for edge detection, unless the user
-+     * explicitly specifed an edge range */
-+    ewidth = abs(priv->maxx - priv->minx) * .05;
-+    eheight = abs(priv->maxy - priv->miny) * .05;
-+
-+    pars->left_edge = xf86SetIntOption(opts, "LeftEdge", priv->minx + ewidth);
-+    pars->right_edge = xf86SetIntOption(opts, "RightEdge", priv->maxx - ewidth);
-+    pars->top_edge = xf86SetIntOption(opts, "TopEdge", priv->miny + ewidth);
-+    pars->bottom_edge = xf86SetIntOption(opts, "BottomEdge", priv->maxy - eheight);
++    pars->left_edge = xf86SetIntOption(opts, "LeftEdge", l);
++    pars->right_edge = xf86SetIntOption(opts, "RightEdge", r);
++    pars->top_edge = xf86SetIntOption(opts, "TopEdge", t);
++    pars->bottom_edge = xf86SetIntOption(opts, "BottomEdge", b);
  
      pars->finger_low = xf86SetIntOption(opts, "FingerLow", 25);
      pars->finger_high = xf86SetIntOption(opts, "FingerHigh", 30);
+@@ -386,8 +429,8 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+     pars->fast_taps = xf86SetIntOption(opts, "FastTaps", FALSE);
+     pars->emulate_mid_button_time = xf86SetIntOption(opts, "EmulateMidButtonTime", 75);
+     pars->emulate_twofinger_z = xf86SetIntOption(opts, "EmulateTwoFingerMinZ", 257);
+-    pars->scroll_dist_vert = xf86SetIntOption(opts, "VertScrollDelta", 100);
+-    pars->scroll_dist_horiz = xf86SetIntOption(opts, "HorizScrollDelta", 100);
++    pars->scroll_dist_vert = xf86SetIntOption(opts, "VertScrollDelta", horizScrollDelta);
++    pars->scroll_dist_horiz = xf86SetIntOption(opts, "HorizScrollDelta", vertScrollDelta);
+     pars->scroll_edge_vert = xf86SetBoolOption(opts, "VertEdgeScroll", TRUE);
+     pars->scroll_edge_horiz = xf86SetBoolOption(opts, "HorizEdgeScroll", TRUE);
+     pars->scroll_edge_corner = xf86SetBoolOption(opts, "CornerCoasting", FALSE);
+@@ -395,8 +438,8 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+     pars->scroll_twofinger_horiz = xf86SetBoolOption(opts, "HorizTwoFingerScroll", FALSE);
+     pars->edge_motion_min_z = xf86SetIntOption(opts, "EdgeMotionMinZ", 30);
+     pars->edge_motion_max_z = xf86SetIntOption(opts, "EdgeMotionMaxZ", 160);
+-    pars->edge_motion_min_speed = xf86SetIntOption(opts, "EdgeMotionMinSpeed", 1);
+-    pars->edge_motion_max_speed = xf86SetIntOption(opts, "EdgeMotionMaxSpeed", 400);
++    pars->edge_motion_min_speed = xf86SetIntOption(opts, "EdgeMotionMinSpeed", edgeMotionMinSpeed);
++    pars->edge_motion_max_speed = xf86SetIntOption(opts, "EdgeMotionMaxSpeed", edgeMotionMaxSpeed);
+     pars->edge_motion_use_always = xf86SetBoolOption(opts, "EdgeMotionUseAlways", FALSE);
+     repeater = xf86SetStrOption(opts, "Repeater", NULL);
+     pars->updown_button_scrolling = xf86SetBoolOption(opts, "UpDownScrolling", TRUE);
+@@ -428,8 +471,8 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+     pars->press_motion_min_z = xf86SetIntOption(opts, "PressureMotionMinZ", pars->edge_motion_min_z);
+     pars->press_motion_max_z = xf86SetIntOption(opts, "PressureMotionMaxZ", pars->edge_motion_max_z);
+ 
+-    pars->min_speed = synSetFloatOption(opts, "MinSpeed", 0.09);
+-    pars->max_speed = synSetFloatOption(opts, "MaxSpeed", 0.18);
++    pars->min_speed = synSetFloatOption(opts, "MinSpeed", minSpeed);
++    pars->max_speed = synSetFloatOption(opts, "MaxSpeed", maxSpeed);
+     pars->accl = synSetFloatOption(opts, "AccelFactor", 0.0015);
+     pars->trackstick_speed = synSetFloatOption(opts, "TrackstickSpeed", 40);
+     pars->scroll_dist_circ = synSetFloatOption(opts, "CircScrollDelta", 0.1);
 diff --git a/src/synaptics.h b/src/synaptics.h
-index d1f8772..a24f8b6 100644
+index 9d040dd..afd093a 100644
 --- a/src/synaptics.h
 +++ b/src/synaptics.h
-@@ -270,6 +270,7 @@ typedef struct _SynapticsPrivateRec
+@@ -272,6 +272,7 @@ typedef struct _SynapticsPrivateRec
      int prev_z;				/* previous z value, for palm detection */
      int avg_width;			/* weighted average of previous fingerWidth values */
  
@@ -123,5 +194,5 @@
  
  
 -- 
-1.5.6.4
+1.6.0.1
 


Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-synaptics.spec	7 Sep 2008 12:51:03 -0000	1.5
+++ xorg-x11-drv-synaptics.spec	8 Sep 2008 20:02:37 -0000	1.6
@@ -5,7 +5,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 synaptics input driver
 Version:        0.15.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -16,6 +16,7 @@
 Patch1:		 xf86-input-synaptics-0.15.0-tap.patch
 Patch2:		 xf86-input-synaptics-0.15.0-edges.patch
 Patch3:		 xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch
+Patch4:		 xf86-input-synaptics-0.15.0-preprobe.patch
 ExcludeArch:    s390 s390x
 
 BuildRequires:  libtool pkgconfig
@@ -63,6 +64,7 @@
 %patch1 -p1 -b .tap
 %patch2 -p1 -b .edges
 %patch3 -p1 -b .dont-lose-buttonup
+%patch4 -p1 -b .preprobe
 
 %build
 autoreconf -v --install --force || exit 1
@@ -96,6 +98,13 @@
 %doc COPYING README
 
 %changelog
+* Mon Sep 8 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.0-6
+- xf86-input-synaptics-0.15.0-edges.patch: updated to improve edge calculation
+  and acceleration factors.
+- xf86-input-synaptics-0.15.0-preprobe patch: pre-probe eventcomm devices for
+  axis ranges if specifed with Device option.
+- update fdi file to support "bcm5974" devices.
+
 * Sun Sep 7 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.0-5
 - update fdi file to support "appletouch" devices.
 



From anyremote at fedoraproject.org  Mon Sep  8 20:03:21 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Mon,  8 Sep 2008 20:03:21 +0000 (UTC)
Subject: rpms/kanyremote/devel import.log,1.3,1.4
Message-ID: <20080908200321.E31DB700FD@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16877/devel

Modified Files:
	import.log 
Log Message:
build


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Sep 2008 19:59:33 -0000	1.3
+++ import.log	8 Sep 2008 20:02:51 -0000	1.4
@@ -1,3 +1,4 @@
 kanyremote-5_1-1_fc9:HEAD:kanyremote-5.1-1.fc9.src.rpm:1219603691
 kanyremote-5_2_1-1_fc9:HEAD:kanyremote-5.2.1-1.fc9.src.rpm:1220903267
 kanyremote-5_2_1-1_fc9:HEAD:kanyremote-5.2.1-1.fc9.src.rpm:1220903980
+kanyremote-5_2_1-1_fc9:HEAD:kanyremote-5.2.1-1.fc9.src.rpm:1220904171



From kevin at fedoraproject.org  Mon Sep  8 20:07:00 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 20:07:00 +0000 (UTC)
Subject: rpms/rdiff-backup/devel sources, 1.8, 1.9 .cvsignore, 1.7,
	1.8 rdiff-backup.spec, 1.21, 1.22
Message-ID: <20080908200700.B40FB700FD@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rdiff-backup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18031

Modified Files:
	sources .cvsignore rdiff-backup.spec 
Log Message:
Update to 1.2.1



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Aug 2008 02:37:17 -0000	1.8
+++ sources	8 Sep 2008 20:06:30 -0000	1.9
@@ -1 +1 @@
-65597d2d1ce12efe9ab2fa20cd029e0c  rdiff-backup-1.2.0.tar.gz
+7f71157161e510a9302abe130801c067  rdiff-backup-1.2.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Aug 2008 02:37:17 -0000	1.7
+++ .cvsignore	8 Sep 2008 20:06:30 -0000	1.8
@@ -1 +1 @@
-rdiff-backup-1.2.0.tar.gz
+rdiff-backup-1.2.1.tar.gz


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/rdiff-backup.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rdiff-backup.spec	12 Aug 2008 02:45:02 -0000	1.21
+++ rdiff-backup.spec	8 Sep 2008 20:06:30 -0000	1.22
@@ -1,6 +1,6 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Version: 1.2.0
+Version: 1.2.1
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1%{?dist}
@@ -53,9 +53,12 @@
 %{python_sitearch}/rdiff_backup/*.pyc
 %{python_sitearch}/rdiff_backup/*.so
 %{python_sitearch}/rdiff_backup/*.pyo
-%{python_sitearch}/rdiff_backup-1.2.0-py2.5.egg-info
+%{python_sitearch}/rdiff_backup-%{version}-py2.5.egg-info
 
 %changelog
+* Mon Sep 08 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.1-1
+- Update to 1.2.1
+
 * Mon Aug 11 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.0-1
 - Update to 1.2.0
 



From anyremote at fedoraproject.org  Mon Sep  8 20:00:04 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Mon,  8 Sep 2008 20:00:04 +0000 (UTC)
Subject: rpms/kanyremote/devel import.log,1.2,1.3 sources,1.6,1.7
Message-ID: <20080908200004.0CC33700FD@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15570/devel

Modified Files:
	import.log sources 
Log Message:
build


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Sep 2008 19:47:43 -0000	1.2
+++ import.log	8 Sep 2008 19:59:33 -0000	1.3
@@ -1,2 +1,3 @@
 kanyremote-5_1-1_fc9:HEAD:kanyremote-5.1-1.fc9.src.rpm:1219603691
 kanyremote-5_2_1-1_fc9:HEAD:kanyremote-5.2.1-1.fc9.src.rpm:1220903267
+kanyremote-5_2_1-1_fc9:HEAD:kanyremote-5.2.1-1.fc9.src.rpm:1220903980


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Sep 2008 19:47:43 -0000	1.6
+++ sources	8 Sep 2008 19:59:33 -0000	1.7
@@ -1 +1 @@
-a2d2b647ef1eff46ab5a28ca4373dad0  kanyremote-5.2.1.tar.gz
+5893683d6cd5d5cc4994edb0a3532c73  kanyremote-5.2.1.tar.gz



From slankes at fedoraproject.org  Mon Sep  8 20:01:43 2008
From: slankes at fedoraproject.org (Sven Lankes)
Date: Mon,  8 Sep 2008 20:01:43 +0000 (UTC)
Subject: rpms/merkaartor/F-9 merkaartor.spec,1.1,1.2
Message-ID: <20080908200143.226767012B@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15713

Modified Files:
	merkaartor.spec 
Log Message:
use _current_ specfile for F-9 build - includes dir-ownership fix



Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-9/merkaartor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- merkaartor.spec	8 Sep 2008 19:48:14 -0000	1.1
+++ merkaartor.spec	8 Sep 2008 20:01:12 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           merkaartor
 Version:        0.11
-Release:        1%{?dist}
-Summary:        QT-Based OpenStreetMap editor
+Release:        2%{?dist}
+Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
 License:        GPLv2
@@ -48,6 +48,8 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
+%dir %{_datadir}/merkaartor
+%dir %{_datadir}/merkaartor/translations
 %{_datadir}/merkaartor/translations/%{name}_*.qm
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.xpm
@@ -56,6 +58,9 @@
 
 
 %changelog
+* Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.11-2
+- include unowned directories
+
 * Wed Aug 06 2008 Sven Lankes <sven at lank.es> - 0.11-1
 - final 0.11 release 
 - Updated versioning scheme - 0.x 



From anyremote at fedoraproject.org  Mon Sep  8 20:07:53 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Mon,  8 Sep 2008 20:07:53 +0000 (UTC)
Subject: rpms/kanyremote/F-9 import.log, 1.2, 1.3 kanyremote.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20080908200753.5E2D1700FD@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18372/F-9

Modified Files:
	import.log kanyremote.spec sources 
Log Message:
build


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Sep 2008 19:46:07 -0000	1.2
+++ import.log	8 Sep 2008 20:07:22 -0000	1.3
@@ -1,2 +1,3 @@
 kanyremote-5_1-1_fc9:F-9:kanyremote-5.1-1.fc9.src.rpm:1219602985
 kanyremote-5_2_1-1_fc9:F-9:kanyremote-5.2.1-1.fc9.src.rpm:1220903172
+kanyremote-5_2_1-2_fc9:F-9:kanyremote-5.2.1-2.fc9.src.rpm:1220904450


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/kanyremote.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kanyremote.spec	8 Sep 2008 19:46:07 -0000	1.5
+++ kanyremote.spec	8 Sep 2008 20:07:23 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
 Version: 5.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Sep 2008 19:46:07 -0000	1.6
+++ sources	8 Sep 2008 20:07:23 -0000	1.7
@@ -1 +1 @@
-a2d2b647ef1eff46ab5a28ca4373dad0  kanyremote-5.2.1.tar.gz
+d77a8dcbd7ae36fea43a522c3ba1d514  kanyremote-5.2.1.tar.gz



From anyremote at fedoraproject.org  Mon Sep  8 20:07:57 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Mon,  8 Sep 2008 20:07:57 +0000 (UTC)
Subject: rpms/kanyremote/devel import.log, 1.4, 1.5 kanyremote.spec, 1.5,
	1.6 sources, 1.7, 1.8
Message-ID: <20080908200757.7E91A700FD@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18412/devel

Modified Files:
	import.log kanyremote.spec sources 
Log Message:
build


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Sep 2008 20:02:51 -0000	1.4
+++ import.log	8 Sep 2008 20:07:26 -0000	1.5
@@ -2,3 +2,4 @@
 kanyremote-5_2_1-1_fc9:HEAD:kanyremote-5.2.1-1.fc9.src.rpm:1220903267
 kanyremote-5_2_1-1_fc9:HEAD:kanyremote-5.2.1-1.fc9.src.rpm:1220903980
 kanyremote-5_2_1-1_fc9:HEAD:kanyremote-5.2.1-1.fc9.src.rpm:1220904171
+kanyremote-5_2_1-2_fc9:HEAD:kanyremote-5.2.1-2.fc9.src.rpm:1220904451


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/kanyremote.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kanyremote.spec	8 Sep 2008 19:47:43 -0000	1.5
+++ kanyremote.spec	8 Sep 2008 20:07:27 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
 Version: 5.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Sep 2008 19:59:33 -0000	1.7
+++ sources	8 Sep 2008 20:07:27 -0000	1.8
@@ -1 +1 @@
-5893683d6cd5d5cc4994edb0a3532c73  kanyremote-5.2.1.tar.gz
+d77a8dcbd7ae36fea43a522c3ba1d514  kanyremote-5.2.1.tar.gz



From mclasen at fedoraproject.org  Mon Sep  8 20:10:47 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 20:10:47 +0000 (UTC)
Subject: rpms/pango/devel .cvsignore, 1.78, 1.79 pango.spec, 1.143,
	1.144 sources, 1.78, 1.79
Message-ID: <20080908201047.84201700FD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18933

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
1.21.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- .cvsignore	26 Aug 2008 22:02:54 -0000	1.78
+++ .cvsignore	8 Sep 2008 20:10:17 -0000	1.79
@@ -1 +1 @@
-pango-1.21.5.tar.bz2
+pango-1.21.6.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/pango.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- pango.spec	26 Aug 2008 22:02:54 -0000	1.143
+++ pango.spec	8 Sep 2008 20:10:17 -0000	1.144
@@ -8,7 +8,7 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.21.5
+Version: 1.21.6
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -218,6 +218,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 1.21.6-1
+- Update to 1.21.6
+
 * Mon Aug 26 2008 Behdad Esfahbod <besfahbo at redhat.com> - 1.21.5-1
 - Update to 1.21.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- sources	26 Aug 2008 22:02:54 -0000	1.78
+++ sources	8 Sep 2008 20:10:17 -0000	1.79
@@ -1 +1 @@
-9ceac82a22f0d18d54e444efb184fab3  pango-1.21.5.tar.bz2
+db7b24c685d488dd9d06b66b42faed50  pango-1.21.6.tar.bz2



From mclasen at fedoraproject.org  Mon Sep  8 20:13:20 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 20:13:20 +0000 (UTC)
Subject: rpms/gnome-themes/devel .cvsignore, 1.64, 1.65 gnome-themes.spec,
	1.116, 1.117 sources, 1.69, 1.70
Message-ID: <20080908201320.C11AF700FD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-themes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19905

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	2 Sep 2008 23:53:02 -0000	1.64
+++ .cvsignore	8 Sep 2008 20:12:50 -0000	1.65
@@ -1 +1 @@
-gnome-themes-2.23.91.tar.bz2
+gnome-themes-2.23.92.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- gnome-themes.spec	2 Sep 2008 23:53:02 -0000	1.116
+++ gnome-themes.spec	8 Sep 2008 20:12:50 -0000	1.117
@@ -1,6 +1,6 @@
 Summary: Themes collection for GNOME
 Name: gnome-themes
-Version: 2.23.91
+Version: 2.23.92
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/gnome-themes/
 Source: http://download.gnome.org/sources/gnome-themes/2.23/%{name}-%{version}.tar.bz2
@@ -94,6 +94,9 @@
 %doc AUTHORS COPYING NEWS README
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	2 Sep 2008 23:53:02 -0000	1.69
+++ sources	8 Sep 2008 20:12:50 -0000	1.70
@@ -1 +1 @@
-e05b69e2bddcabf2d487bd2752715e25  gnome-themes-2.23.91.tar.bz2
+464c6cf494fb8a6cd8416ba8c7209ff8  gnome-themes-2.23.92.tar.bz2



From kevin at fedoraproject.org  Mon Sep  8 20:15:00 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 20:15:00 +0000 (UTC)
Subject: rpms/rdiff-backup/F-9 sources, 1.8, 1.9 .cvsignore, 1.7,
	1.8 rdiff-backup.spec, 1.20, 1.21
Message-ID: <20080908201500.B862E700FD@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rdiff-backup/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20324

Modified Files:
	sources .cvsignore rdiff-backup.spec 
Log Message:
Update to 1.2.1



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Aug 2008 04:39:58 -0000	1.8
+++ sources	8 Sep 2008 20:14:30 -0000	1.9
@@ -1 +1 @@
-65597d2d1ce12efe9ab2fa20cd029e0c  rdiff-backup-1.2.0.tar.gz
+7f71157161e510a9302abe130801c067  rdiff-backup-1.2.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Aug 2008 04:39:58 -0000	1.7
+++ .cvsignore	8 Sep 2008 20:14:30 -0000	1.8
@@ -1 +1 @@
-rdiff-backup-1.2.0.tar.gz
+rdiff-backup-1.2.1.tar.gz


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-9/rdiff-backup.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rdiff-backup.spec	14 Aug 2008 04:39:58 -0000	1.20
+++ rdiff-backup.spec	8 Sep 2008 20:14:30 -0000	1.21
@@ -1,6 +1,6 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Version: 1.2.0
+Version: 1.2.1
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1%{?dist}
@@ -53,9 +53,12 @@
 %{python_sitearch}/rdiff_backup/*.pyc
 %{python_sitearch}/rdiff_backup/*.so
 %{python_sitearch}/rdiff_backup/*.pyo
-%{python_sitearch}/rdiff_backup-1.2.0-py2.5.egg-info
+%{python_sitearch}/rdiff_backup-%{version}-py2.5.egg-info
 
 %changelog
+* Mon Sep 08 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.1-1
+- Update to 1.2.1
+
 * Mon Aug 11 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.0-1
 - Update to 1.2.0
 



From mclasen at fedoraproject.org  Mon Sep  8 20:18:00 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 20:18:00 +0000 (UTC)
Subject: rpms/orca/devel .cvsignore, 1.38, 1.39 orca.spec, 1.64, 1.65 sources,
	1.39, 1.40
Message-ID: <20080908201800.4239A700FD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/orca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20975

Modified Files:
	.cvsignore orca.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	3 Sep 2008 00:29:02 -0000	1.38
+++ .cvsignore	8 Sep 2008 20:17:29 -0000	1.39
@@ -1 +1 @@
-orca-2.23.91.tar.bz2
+orca-2.23.92.tar.bz2


Index: orca.spec
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/orca.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- orca.spec	3 Sep 2008 00:29:02 -0000	1.64
+++ orca.spec	8 Sep 2008 20:17:29 -0000	1.65
@@ -17,7 +17,7 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.23.91
+Version:	2.23.92
 Release: 	1%{?dist}
 Summary:	Flexible, extensible, and powerful assistive technology
 
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	3 Sep 2008 00:29:02 -0000	1.39
+++ sources	8 Sep 2008 20:17:29 -0000	1.40
@@ -1 +1 @@
-bfe93e7e9f4b89c90943faced977f3fb  orca-2.23.91.tar.bz2
+d190ebd8a1f2cddd987de63e673d0a60  orca-2.23.92.tar.bz2



From mclasen at fedoraproject.org  Mon Sep  8 20:23:34 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 20:23:34 +0000 (UTC)
Subject: rpms/vino/devel .cvsignore, 1.37, 1.38 sources, 1.37, 1.38 vino.spec,
	1.79, 1.80
Message-ID: <20080908202334.5B10A700FD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/vino/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22229

Modified Files:
	.cvsignore sources vino.spec 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vino/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	3 Sep 2008 02:11:17 -0000	1.37
+++ .cvsignore	8 Sep 2008 20:23:03 -0000	1.38
@@ -1 +1 @@
-vino-2.23.91.tar.bz2
+vino-2.23.92.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vino/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	3 Sep 2008 02:11:17 -0000	1.37
+++ sources	8 Sep 2008 20:23:03 -0000	1.38
@@ -1 +1 @@
-229d79e0fd64e87a7ce8b9cf5a9d453d  vino-2.23.91.tar.bz2
+1920426523584fb2453004ee088fe28c  vino-2.23.92.tar.bz2


Index: vino.spec
===================================================================
RCS file: /cvs/extras/rpms/vino/devel/vino.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- vino.spec	3 Sep 2008 02:23:47 -0000	1.79
+++ vino.spec	8 Sep 2008 20:23:03 -0000	1.80
@@ -8,7 +8,7 @@
 
 Summary: A remote desktop system for GNOME
 Name: vino
-Version: 2.23.91
+Version: 2.23.92
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/vino/2.23/%{name}-%{version}.tar.bz2
@@ -107,6 +107,9 @@
 %{_datadir}/gnome/autostart/vino-server.desktop
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 



From kevin at fedoraproject.org  Mon Sep  8 20:24:29 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 20:24:29 +0000 (UTC)
Subject: rpms/rdiff-backup/F-8 sources, 1.8, 1.9 .cvsignore, 1.7,
	1.8 rdiff-backup.spec, 1.18, 1.19
Message-ID: <20080908202429.A3F46700FD@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rdiff-backup/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22490

Modified Files:
	sources .cvsignore rdiff-backup.spec 
Log Message:
Update to 1.2.1



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-8/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Aug 2008 04:49:12 -0000	1.8
+++ sources	8 Sep 2008 20:23:59 -0000	1.9
@@ -1 +1 @@
-65597d2d1ce12efe9ab2fa20cd029e0c  rdiff-backup-1.2.0.tar.gz
+7f71157161e510a9302abe130801c067  rdiff-backup-1.2.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Aug 2008 04:49:12 -0000	1.7
+++ .cvsignore	8 Sep 2008 20:23:59 -0000	1.8
@@ -1 +1 @@
-rdiff-backup-1.2.0.tar.gz
+rdiff-backup-1.2.1.tar.gz


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-8/rdiff-backup.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rdiff-backup.spec	14 Aug 2008 04:49:12 -0000	1.18
+++ rdiff-backup.spec	8 Sep 2008 20:23:59 -0000	1.19
@@ -1,6 +1,6 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Version: 1.2.0
+Version: 1.2.1
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1%{?dist}
@@ -55,6 +55,9 @@
 %{python_sitearch}/rdiff_backup/*.pyo
 
 %changelog
+* Mon Sep 08 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.1-1
+- Update to 1.2.1
+
 * Mon Aug 11 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.0-1
 - Update to 1.2.0
 



From mclasen at fedoraproject.org  Mon Sep  8 20:28:46 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 20:28:46 +0000 (UTC)
Subject: rpms/gtksourceview2/devel .cvsignore, 1.17, 1.18 gtksourceview2.spec,
	1.19, 1.20 sources, 1.17, 1.18
Message-ID: <20080908202846.8EFD0700FD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtksourceview2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23327

Modified Files:
	.cvsignore gtksourceview2.spec sources 
Log Message:
2.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	3 Sep 2008 02:27:30 -0000	1.17
+++ .cvsignore	8 Sep 2008 20:28:16 -0000	1.18
@@ -1 +1 @@
-gtksourceview-2.3.2.tar.bz2
+gtksourceview-2.3.3.tar.bz2


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/gtksourceview2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gtksourceview2.spec	3 Sep 2008 02:27:30 -0000	1.19
+++ gtksourceview2.spec	8 Sep 2008 20:28:16 -0000	1.20
@@ -5,7 +5,7 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview2
-Version: 2.3.2
+Version: 2.3.3
 Release: 1%{?dist} 
 License: LGPLv2+ and GPLv2+
 # the library itself is LGPL, some .lang files are GPL
@@ -81,6 +81,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.3.3-1
+- Update to 2.3.3
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.3.2-1
 - Update to 2.3.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	3 Sep 2008 02:27:30 -0000	1.17
+++ sources	8 Sep 2008 20:28:16 -0000	1.18
@@ -1 +1 @@
-93bb6f41c1ad8d73ff40e94328770870  gtksourceview-2.3.2.tar.bz2
+0586cd267ad5478771d65ff16074a87a  gtksourceview-2.3.3.tar.bz2



From robert at fedoraproject.org  Mon Sep  8 20:34:26 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon,  8 Sep 2008 20:34:26 +0000 (UTC)
Subject: rpms/arj/EL-4 .cvsignore,1.2,1.3 arj.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <20080908203426.BC753700FD@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/arj/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24760/EL-4

Modified Files:
	.cvsignore arj.spec sources 
Log Message:
- Added patch to refer to original author in the manual page
- Added patch to support parallel builds in upstream Makefile



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arj/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2006 05:11:27 -0000	1.2
+++ .cvsignore	8 Sep 2008 20:33:56 -0000	1.3
@@ -1,2 +1,2 @@
 arj-3.10.22.tar.gz
-arj_3.10.22-2.diff.gz
+arj_3.10.22-6.diff.gz


Index: arj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arj/EL-4/arj.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- arj.spec	30 Aug 2008 14:13:26 -0000	1.4
+++ arj.spec	8 Sep 2008 20:33:56 -0000	1.5
@@ -1,74 +1,76 @@
-Name:           arj
-Version:        3.10.22
-Release:        5%{?dist}
-Summary:        Archiver for .arj files
-Group:          Applications/Archiving
-License:        GPL+
-URL:            http://arj.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# unarj.* from Debian.
-Source1:        unarj.sh
-Source2:        unarj.1
-Patch0:         http://ftp.debian.org/debian/pool/main/a/%{name}/%{name}_%{version}-2.diff.gz
-Patch1:         arj-3.10.22-missing-protos.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  autoconf
-Provides:       unarj = %{version}-%{release}
-Obsoletes:      unarj < 3
+Summary:	Archiver for .arj files
+Name:		arj
+Version:	3.10.22
+Release:	6%{?dist}
+License:	GPL+
+Group:		Applications/Archiving
+URL:		http://arj.sourceforge.net/
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# unarj.* from Debian
+Source1:	unarj.sh
+Source2:	unarj.1
+Patch0:		http://ftp.debian.org/debian/pool/main/a/%{name}/%{name}_%{version}-6.diff.gz
+Patch1:		arj-3.10.22-missing-protos.patch
+BuildRequires:	autoconf
+Provides:	unarj = %{version}-%{release}
+Obsoletes:	unarj < 3
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-This package is an open source version of the arj archiver.  This
-version has been created with the intent to preserve maximum
-compatibility and retain the feature set of original ARJ archiver as
-provided by ARJ Software, Inc.
-
+This package is an open source version of the arj archiver. It has
+been created with the intent to preserve maximum compatibility and
+retain the feature set of original ARJ archiver as provided by ARJ
+Software, Inc.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+
 for i in debian/patches/00*.patch; do
   patch -p1 < $i
 done
-%patch1 -p1
+
 pushd gnu
   autoconf
 popd
 
-
 %build
 pushd gnu
   %configure
 popd
-# no %{?_smp_mflags}, arj is not parallel build clean, no stripping please
-make ADD_LDFLAGS=""
 
+# Disable binary strippings
+make %{?_smp_mflags} ADD_LDFLAGS=""
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-# rm the register remainders of arj's sharewares time
-rm $RPM_BUILD_ROOT%{_bindir}/arj-register
-rm $RPM_BUILD_ROOT%{_mandir}/man1/arj-register.1*
-install -Dpm 644 resource/rearj.cfg.example \
-  $RPM_BUILD_ROOT%{_sysconfdir}/rearj.cfg
+make DESTDIR=$RPM_BUILD_ROOT install
+
+install -Dpm 644 resource/rearj.cfg.example $RPM_BUILD_ROOT%{_sysconfdir}/rearj.cfg
 install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/unarj
 install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/unarj.1
 
+# remove the register remainders of arj's sharewares time
+rm -f $RPM_BUILD_ROOT%{_bindir}/arj-register
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/arj-register.1*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %doc ChangeLog* doc/COPYING doc/rev_hist.txt
 %config(noreplace) %{_sysconfdir}/rearj.cfg
 %{_bindir}/*arj*
 %{_libdir}/arj/
 %{_mandir}/man1/*arj*1.*
 
-
 %changelog
+* Mon Sep 08 2008 Robert Scheck <robert at fedoraproject.org> 3.10.22-6
+- Added patch to refer to original author in the manual page
+- Added patch to support parallel builds in upstream Makefile
+
 * Sat Aug 30 2008 Robert Scheck <robert at fedoraproject.org> 3.10.22-5
 - Corrected from %%patch to %%patch0 to make rpm > 4.4 happy
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arj/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2006 05:11:27 -0000	1.2
+++ sources	8 Sep 2008 20:33:56 -0000	1.3
@@ -1,2 +1,2 @@
 f263bf3cf6d42a8b7e85b4fb514336d3  arj-3.10.22.tar.gz
-48d2275b8a8e6e5adaead8916d008fd3  arj_3.10.22-2.diff.gz
+a34dbdd46d09248b4fd03d7d4faf3e30  arj_3.10.22-6.diff.gz



From robert at fedoraproject.org  Mon Sep  8 20:34:27 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon,  8 Sep 2008 20:34:27 +0000 (UTC)
Subject: rpms/arj/EL-5 .cvsignore,1.2,1.3 arj.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20080908203427.20363700FD@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/arj/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24760/EL-5

Modified Files:
	.cvsignore arj.spec sources 
Log Message:
- Added patch to refer to original author in the manual page
- Added patch to support parallel builds in upstream Makefile



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arj/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2006 05:11:27 -0000	1.2
+++ .cvsignore	8 Sep 2008 20:33:56 -0000	1.3
@@ -1,2 +1,2 @@
 arj-3.10.22.tar.gz
-arj_3.10.22-2.diff.gz
+arj_3.10.22-6.diff.gz


Index: arj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arj/EL-5/arj.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- arj.spec	30 Aug 2008 14:13:26 -0000	1.3
+++ arj.spec	8 Sep 2008 20:33:56 -0000	1.4
@@ -1,74 +1,76 @@
-Name:           arj
-Version:        3.10.22
-Release:        5%{?dist}
-Summary:        Archiver for .arj files
-Group:          Applications/Archiving
-License:        GPL+
-URL:            http://arj.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# unarj.* from Debian.
-Source1:        unarj.sh
-Source2:        unarj.1
-Patch0:         http://ftp.debian.org/debian/pool/main/a/%{name}/%{name}_%{version}-2.diff.gz
-Patch1:         arj-3.10.22-missing-protos.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  autoconf
-Provides:       unarj = %{version}-%{release}
-Obsoletes:      unarj < 3
+Summary:	Archiver for .arj files
+Name:		arj
+Version:	3.10.22
+Release:	6%{?dist}
+License:	GPL+
+Group:		Applications/Archiving
+URL:		http://arj.sourceforge.net/
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# unarj.* from Debian
+Source1:	unarj.sh
+Source2:	unarj.1
+Patch0:		http://ftp.debian.org/debian/pool/main/a/%{name}/%{name}_%{version}-6.diff.gz
+Patch1:		arj-3.10.22-missing-protos.patch
+BuildRequires:	autoconf
+Provides:	unarj = %{version}-%{release}
+Obsoletes:	unarj < 3
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-This package is an open source version of the arj archiver.  This
-version has been created with the intent to preserve maximum
-compatibility and retain the feature set of original ARJ archiver as
-provided by ARJ Software, Inc.
-
+This package is an open source version of the arj archiver. It has
+been created with the intent to preserve maximum compatibility and
+retain the feature set of original ARJ archiver as provided by ARJ
+Software, Inc.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+
 for i in debian/patches/00*.patch; do
   patch -p1 < $i
 done
-%patch1 -p1
+
 pushd gnu
   autoconf
 popd
 
-
 %build
 pushd gnu
   %configure
 popd
-# no %{?_smp_mflags}, arj is not parallel build clean, no stripping please
-make ADD_LDFLAGS=""
 
+# Disable binary strippings
+make %{?_smp_mflags} ADD_LDFLAGS=""
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-# rm the register remainders of arj's sharewares time
-rm $RPM_BUILD_ROOT%{_bindir}/arj-register
-rm $RPM_BUILD_ROOT%{_mandir}/man1/arj-register.1*
-install -Dpm 644 resource/rearj.cfg.example \
-  $RPM_BUILD_ROOT%{_sysconfdir}/rearj.cfg
+make DESTDIR=$RPM_BUILD_ROOT install
+
+install -Dpm 644 resource/rearj.cfg.example $RPM_BUILD_ROOT%{_sysconfdir}/rearj.cfg
 install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/unarj
 install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/unarj.1
 
+# remove the register remainders of arj's sharewares time
+rm -f $RPM_BUILD_ROOT%{_bindir}/arj-register
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/arj-register.1*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %doc ChangeLog* doc/COPYING doc/rev_hist.txt
 %config(noreplace) %{_sysconfdir}/rearj.cfg
 %{_bindir}/*arj*
 %{_libdir}/arj/
 %{_mandir}/man1/*arj*1.*
 
-
 %changelog
+* Mon Sep 08 2008 Robert Scheck <robert at fedoraproject.org> 3.10.22-6
+- Added patch to refer to original author in the manual page
+- Added patch to support parallel builds in upstream Makefile
+
 * Sat Aug 30 2008 Robert Scheck <robert at fedoraproject.org> 3.10.22-5
 - Corrected from %%patch to %%patch0 to make rpm > 4.4 happy
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arj/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2006 05:11:27 -0000	1.2
+++ sources	8 Sep 2008 20:33:56 -0000	1.3
@@ -1,2 +1,2 @@
 f263bf3cf6d42a8b7e85b4fb514336d3  arj-3.10.22.tar.gz
-48d2275b8a8e6e5adaead8916d008fd3  arj_3.10.22-2.diff.gz
+a34dbdd46d09248b4fd03d7d4faf3e30  arj_3.10.22-6.diff.gz



From robert at fedoraproject.org  Mon Sep  8 20:34:27 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon,  8 Sep 2008 20:34:27 +0000 (UTC)
Subject: rpms/arj/F-9 .cvsignore,1.2,1.3 arj.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <20080908203427.BABA2700FD@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/arj/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24760/F-9

Modified Files:
	.cvsignore arj.spec sources 
Log Message:
- Added patch to refer to original author in the manual page
- Added patch to support parallel builds in upstream Makefile



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arj/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2006 05:11:27 -0000	1.2
+++ .cvsignore	8 Sep 2008 20:33:57 -0000	1.3
@@ -1,2 +1,2 @@
 arj-3.10.22.tar.gz
-arj_3.10.22-2.diff.gz
+arj_3.10.22-6.diff.gz


Index: arj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arj/F-9/arj.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- arj.spec	31 Mar 2008 13:37:51 -0000	1.4
+++ arj.spec	8 Sep 2008 20:33:57 -0000	1.5
@@ -1,74 +1,79 @@
-Name:           arj
-Version:        3.10.22
-Release:        4%{?dist}
-Summary:        Archiver for .arj files
-Group:          Applications/Archiving
-License:        GPL+
-URL:            http://arj.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# unarj.* from Debian.
-Source1:        unarj.sh
-Source2:        unarj.1
-Patch0:         http://ftp.debian.org/debian/pool/main/a/%{name}/%{name}_%{version}-2.diff.gz
-Patch1:         arj-3.10.22-missing-protos.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  autoconf
-Provides:       unarj = %{version}-%{release}
-Obsoletes:      unarj < 3
+Summary:	Archiver for .arj files
+Name:		arj
+Version:	3.10.22
+Release:	6%{?dist}
+License:	GPL+
+Group:		Applications/Archiving
+URL:		http://arj.sourceforge.net/
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# unarj.* from Debian
+Source1:	unarj.sh
+Source2:	unarj.1
+Patch0:		http://ftp.debian.org/debian/pool/main/a/%{name}/%{name}_%{version}-6.diff.gz
+Patch1:		arj-3.10.22-missing-protos.patch
+BuildRequires:	autoconf
+Provides:	unarj = %{version}-%{release}
+Obsoletes:	unarj < 3
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-This package is an open source version of the arj archiver.  This
-version has been created with the intent to preserve maximum
-compatibility and retain the feature set of original ARJ archiver as
-provided by ARJ Software, Inc.
-
+This package is an open source version of the arj archiver. It has
+been created with the intent to preserve maximum compatibility and
+retain the feature set of original ARJ archiver as provided by ARJ
+Software, Inc.
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
+
 for i in debian/patches/00*.patch; do
   patch -p1 < $i
 done
-%patch1 -p1
+
 pushd gnu
   autoconf
 popd
 
-
 %build
 pushd gnu
   %configure
 popd
-# no %{?_smp_mflags}, arj is not parallel build clean, no stripping please
-make ADD_LDFLAGS=""
 
+# Disable binary strippings
+make %{?_smp_mflags} ADD_LDFLAGS=""
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-# rm the register remainders of arj's sharewares time
-rm $RPM_BUILD_ROOT%{_bindir}/arj-register
-rm $RPM_BUILD_ROOT%{_mandir}/man1/arj-register.1*
-install -Dpm 644 resource/rearj.cfg.example \
-  $RPM_BUILD_ROOT%{_sysconfdir}/rearj.cfg
+make DESTDIR=$RPM_BUILD_ROOT install
+
+install -Dpm 644 resource/rearj.cfg.example $RPM_BUILD_ROOT%{_sysconfdir}/rearj.cfg
 install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/unarj
 install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/unarj.1
 
+# remove the register remainders of arj's sharewares time
+rm -f $RPM_BUILD_ROOT%{_bindir}/arj-register
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/arj-register.1*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %doc ChangeLog* doc/COPYING doc/rev_hist.txt
 %config(noreplace) %{_sysconfdir}/rearj.cfg
 %{_bindir}/*arj*
 %{_libdir}/arj/
 %{_mandir}/man1/*arj*1.*
 
-
 %changelog
+* Mon Sep 08 2008 Robert Scheck <robert at fedoraproject.org> 3.10.22-6
+- Added patch to refer to original author in the manual page
+- Added patch to support parallel builds in upstream Makefile
+
+* Sat Aug 30 2008 Robert Scheck <robert at fedoraproject.org> 3.10.22-5
+- Corrected from %%patch to %%patch0 to make rpm > 4.4 happy
+
 * Mon Mar 31 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.10.22-4
 - Fix missing prototype compiler warnings
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arj/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2006 05:11:27 -0000	1.2
+++ sources	8 Sep 2008 20:33:57 -0000	1.3
@@ -1,2 +1,2 @@
 f263bf3cf6d42a8b7e85b4fb514336d3  arj-3.10.22.tar.gz
-48d2275b8a8e6e5adaead8916d008fd3  arj_3.10.22-2.diff.gz
+a34dbdd46d09248b4fd03d7d4faf3e30  arj_3.10.22-6.diff.gz



From robert at fedoraproject.org  Mon Sep  8 20:34:27 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon,  8 Sep 2008 20:34:27 +0000 (UTC)
Subject: rpms/arj/F-8 .cvsignore,1.2,1.3 arj.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20080908203427.6B387700FD@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/arj/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24760/F-8

Modified Files:
	.cvsignore arj.spec sources 
Log Message:
- Added patch to refer to original author in the manual page
- Added patch to support parallel builds in upstream Makefile



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arj/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2006 05:11:27 -0000	1.2
+++ .cvsignore	8 Sep 2008 20:33:57 -0000	1.3
@@ -1,2 +1,2 @@
 arj-3.10.22.tar.gz
-arj_3.10.22-2.diff.gz
+arj_3.10.22-6.diff.gz


Index: arj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arj/F-8/arj.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- arj.spec	3 Aug 2007 19:19:06 -0000	1.2
+++ arj.spec	8 Sep 2008 20:33:57 -0000	1.3
@@ -1,72 +1,85 @@
-Name:           arj
-Version:        3.10.22
-Release:        1%{?dist}
-Summary:        Archiver for .arj files
-Group:          Applications/Archiving
-License:        GPL+
-URL:            http://arj.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
-# unarj.* from Debian.
-Source1:        unarj.sh
-Source2:        unarj.1
-Patch0:         http://ftp.debian.org/debian/pool/main/a/%{name}/%{name}_%{version}-2.diff.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  autoconf
-Provides:       unarj = %{version}-%{release}
-Obsoletes:      unarj < 3
+Summary:	Archiver for .arj files
+Name:		arj
+Version:	3.10.22
+Release:	6%{?dist}
+License:	GPL+
+Group:		Applications/Archiving
+URL:		http://arj.sourceforge.net/
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# unarj.* from Debian
+Source1:	unarj.sh
+Source2:	unarj.1
+Patch0:		http://ftp.debian.org/debian/pool/main/a/%{name}/%{name}_%{version}-6.diff.gz
+Patch1:		arj-3.10.22-missing-protos.patch
+BuildRequires:	autoconf
+Provides:	unarj = %{version}-%{release}
+Obsoletes:	unarj < 3
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-This package is an open source version of the arj archiver.  This
-version has been created with the intent to preserve maximum
-compatibility and retain the feature set of original ARJ archiver as
-provided by ARJ Software, Inc.
-
+This package is an open source version of the arj archiver. It has
+been created with the intent to preserve maximum compatibility and
+retain the feature set of original ARJ archiver as provided by ARJ
+Software, Inc.
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
+
 for i in debian/patches/00*.patch; do
   patch -p1 < $i
 done
+
 pushd gnu
   autoconf
 popd
 
-
 %build
 pushd gnu
   %configure
 popd
-# no %{?_smp_mflags}, arj is not parallel build clean, no stripping please
-make ADD_LDFLAGS=""
 
+# Disable binary strippings
+make %{?_smp_mflags} ADD_LDFLAGS=""
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-# rm the register remainders of arj's sharewares time
-rm $RPM_BUILD_ROOT%{_bindir}/arj-register
-rm $RPM_BUILD_ROOT%{_mandir}/man1/arj-register.1*
-install -Dpm 644 resource/rearj.cfg.example \
-  $RPM_BUILD_ROOT%{_sysconfdir}/rearj.cfg
+make DESTDIR=$RPM_BUILD_ROOT install
+
+install -Dpm 644 resource/rearj.cfg.example $RPM_BUILD_ROOT%{_sysconfdir}/rearj.cfg
 install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/unarj
 install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/unarj.1
 
+# remove the register remainders of arj's sharewares time
+rm -f $RPM_BUILD_ROOT%{_bindir}/arj-register
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/arj-register.1*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %doc ChangeLog* doc/COPYING doc/rev_hist.txt
 %config(noreplace) %{_sysconfdir}/rearj.cfg
 %{_bindir}/*arj*
 %{_libdir}/arj/
 %{_mandir}/man1/*arj*1.*
 
-
 %changelog
+* Mon Sep 08 2008 Robert Scheck <robert at fedoraproject.org> 3.10.22-6
+- Added patch to refer to original author in the manual page
+- Added patch to support parallel builds in upstream Makefile
+
+* Sat Aug 30 2008 Robert Scheck <robert at fedoraproject.org> 3.10.22-5
+- Corrected from %%patch to %%patch0 to make rpm > 4.4 happy
+
+* Mon Mar 31 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.10.22-4
+- Fix missing prototype compiler warnings
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.10.22-3
+- Autorebuild for GCC 4.3
+
 * Fri Aug  3 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 3.10.22-2
 - Update License tag for new Licensing Guidelines compliance
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arj/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2006 05:11:27 -0000	1.2
+++ sources	8 Sep 2008 20:33:57 -0000	1.3
@@ -1,2 +1,2 @@
 f263bf3cf6d42a8b7e85b4fb514336d3  arj-3.10.22.tar.gz
-48d2275b8a8e6e5adaead8916d008fd3  arj_3.10.22-2.diff.gz
+a34dbdd46d09248b4fd03d7d4faf3e30  arj_3.10.22-6.diff.gz



From robert at fedoraproject.org  Mon Sep  8 20:34:28 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon,  8 Sep 2008 20:34:28 +0000 (UTC)
Subject: rpms/arj/devel .cvsignore,1.2,1.3 arj.spec,1.5,1.6 sources,1.2,1.3
Message-ID: <20080908203428.3EB15700FD@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/arj/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24760/devel

Modified Files:
	.cvsignore arj.spec sources 
Log Message:
- Added patch to refer to original author in the manual page
- Added patch to support parallel builds in upstream Makefile



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arj/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2006 05:11:27 -0000	1.2
+++ .cvsignore	8 Sep 2008 20:33:57 -0000	1.3
@@ -1,2 +1,2 @@
 arj-3.10.22.tar.gz
-arj_3.10.22-2.diff.gz
+arj_3.10.22-6.diff.gz


Index: arj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arj/devel/arj.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- arj.spec	30 Aug 2008 14:01:08 -0000	1.5
+++ arj.spec	8 Sep 2008 20:33:57 -0000	1.6
@@ -1,74 +1,76 @@
-Name:           arj
-Version:        3.10.22
-Release:        5%{?dist}
-Summary:        Archiver for .arj files
-Group:          Applications/Archiving
-License:        GPL+
-URL:            http://arj.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# unarj.* from Debian.
-Source1:        unarj.sh
-Source2:        unarj.1
-Patch0:         http://ftp.debian.org/debian/pool/main/a/%{name}/%{name}_%{version}-2.diff.gz
-Patch1:         arj-3.10.22-missing-protos.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  autoconf
-Provides:       unarj = %{version}-%{release}
-Obsoletes:      unarj < 3
+Summary:	Archiver for .arj files
+Name:		arj
+Version:	3.10.22
+Release:	6%{?dist}
+License:	GPL+
+Group:		Applications/Archiving
+URL:		http://arj.sourceforge.net/
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# unarj.* from Debian
+Source1:	unarj.sh
+Source2:	unarj.1
+Patch0:		http://ftp.debian.org/debian/pool/main/a/%{name}/%{name}_%{version}-6.diff.gz
+Patch1:		arj-3.10.22-missing-protos.patch
+BuildRequires:	autoconf
+Provides:	unarj = %{version}-%{release}
+Obsoletes:	unarj < 3
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-This package is an open source version of the arj archiver.  This
-version has been created with the intent to preserve maximum
-compatibility and retain the feature set of original ARJ archiver as
-provided by ARJ Software, Inc.
-
+This package is an open source version of the arj archiver. It has
+been created with the intent to preserve maximum compatibility and
+retain the feature set of original ARJ archiver as provided by ARJ
+Software, Inc.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+
 for i in debian/patches/00*.patch; do
   patch -p1 < $i
 done
-%patch1 -p1
+
 pushd gnu
   autoconf
 popd
 
-
 %build
 pushd gnu
   %configure
 popd
-# no %{?_smp_mflags}, arj is not parallel build clean, no stripping please
-make ADD_LDFLAGS=""
 
+# Disable binary strippings
+make %{?_smp_mflags} ADD_LDFLAGS=""
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-# rm the register remainders of arj's sharewares time
-rm $RPM_BUILD_ROOT%{_bindir}/arj-register
-rm $RPM_BUILD_ROOT%{_mandir}/man1/arj-register.1*
-install -Dpm 644 resource/rearj.cfg.example \
-  $RPM_BUILD_ROOT%{_sysconfdir}/rearj.cfg
+make DESTDIR=$RPM_BUILD_ROOT install
+
+install -Dpm 644 resource/rearj.cfg.example $RPM_BUILD_ROOT%{_sysconfdir}/rearj.cfg
 install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/unarj
 install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/unarj.1
 
+# remove the register remainders of arj's sharewares time
+rm -f $RPM_BUILD_ROOT%{_bindir}/arj-register
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/arj-register.1*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %doc ChangeLog* doc/COPYING doc/rev_hist.txt
 %config(noreplace) %{_sysconfdir}/rearj.cfg
 %{_bindir}/*arj*
 %{_libdir}/arj/
 %{_mandir}/man1/*arj*1.*
 
-
 %changelog
+* Mon Sep 08 2008 Robert Scheck <robert at fedoraproject.org> 3.10.22-6
+- Added patch to refer to original author in the manual page
+- Added patch to support parallel builds in upstream Makefile
+
 * Sat Aug 30 2008 Robert Scheck <robert at fedoraproject.org> 3.10.22-5
 - Corrected from %%patch to %%patch0 to make rpm > 4.4 happy
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arj/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2006 05:11:27 -0000	1.2
+++ sources	8 Sep 2008 20:33:57 -0000	1.3
@@ -1,2 +1,2 @@
 f263bf3cf6d42a8b7e85b4fb514336d3  arj-3.10.22.tar.gz
-48d2275b8a8e6e5adaead8916d008fd3  arj_3.10.22-2.diff.gz
+a34dbdd46d09248b4fd03d7d4faf3e30  arj_3.10.22-6.diff.gz



From robert at fedoraproject.org  Mon Sep  8 20:38:40 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon,  8 Sep 2008 20:38:40 +0000 (UTC)
Subject: rpms/arj/F-8 arj-3.10.22-missing-protos.patch,NONE,1.1
Message-ID: <20080908203840.C4C73700FD@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/arj/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25864

Added Files:
	arj-3.10.22-missing-protos.patch 
Log Message:
Add missing file...


arj-3.10.22-missing-protos.patch:

--- NEW FILE arj-3.10.22-missing-protos.patch ---
diff -up arj-3.10.22/environ.c~ arj-3.10.22/environ.c
--- arj-3.10.22/environ.c~	2008-03-31 15:19:36.000000000 +0200
+++ arj-3.10.22/environ.c	2008-03-31 15:19:36.000000000 +0200
@@ -12,6 +12,8 @@
 #include <conio.h>
 #include <io.h>
 #include <process.h>
+#else
+#include <sys/wait.h>
 #endif
 
 #include <fcntl.h>
diff -up arj-3.10.22/arjsfx.c~ arj-3.10.22/arjsfx.c
--- arj-3.10.22/arjsfx.c~	2008-03-31 15:17:45.000000000 +0200
+++ arj-3.10.22/arjsfx.c	2008-03-31 15:17:45.000000000 +0200
@@ -5,6 +5,7 @@
  *
  */
 
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <signal.h>
 
diff -up arj-3.10.22/arj.c~ arj-3.10.22/arj.c
--- arj-3.10.22/arj.c~	2008-03-31 15:17:14.000000000 +0200
+++ arj-3.10.22/arj.c	2008-03-31 15:17:14.000000000 +0200
@@ -5,6 +5,7 @@
  *
  */
 
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <signal.h>
 



From cweyl at fedoraproject.org  Mon Sep  8 20:40:09 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 20:40:09 +0000 (UTC)
Subject: rpms/perl-Class-Method-Modifiers/F-9
	perl-Class-Method-Modifiers.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080908204009.B9DD0700FD@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-Method-Modifiers/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26121

Modified Files:
	sources 
Added Files:
	perl-Class-Method-Modifiers.spec 
Log Message:
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.01-3
- remove MM version qualifier (F-8's is older)



--- NEW FILE perl-Class-Method-Modifiers.spec ---

Name:       perl-Class-Method-Modifiers 
Version:    1.01 
Release:    3%{?dist}
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Provides Moose-like method modifiers 
Source:     http://search.cpan.org/CPAN/authors/id/S/SA/SARTAK/Class-Method-Modifiers-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Class-Method-Modifiers
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(MRO::Compat)
# testing
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::More)


%description
Method modifiers are a powerful feature from the CLOS (Common Lisp Object
System) world.

In its most basic form, a method modifier is just a method that calls
'$self->SUPER::foo(@_)'. I for one have trouble remembering that exact
invocation, so my classes seldom re-dispatch to their base classes. Very
bad!

'Class::Method::Modifiers' provides three modifiers: 'before', 'around',
and 'after'. 'before' and 'after' are run just before and after the method
they modify, but can not really affect that original method. 'around' is
run in place of the original method, with a hook to easily call that
original method. See the 'MODIFIERS' section for more details on how the
particular modifiers work.

%prep
%setup -q -n Class-Method-Modifiers-%{version}

find t/ -type f -exec perl -pi -e 's|^#!perl|#!/usr/bin/perl|' {} +

%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 t/
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.01-3
- remove MM version qualifier (F-8's is older)

* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.01-2
- bump

* Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.01-1
- initial Fedora packaging
- generated with cpan2dist (CPANPLUS::Dist::Fedora version 0.0.1)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Method-Modifiers/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 15:26:50 -0000	1.1
+++ sources	8 Sep 2008 20:39:39 -0000	1.2
@@ -0,0 +1 @@
+f0398c468025d21493745619b1114a46  Class-Method-Modifiers-1.01.tar.gz



From transif at fedoraproject.org  Mon Sep  8 20:52:51 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Mon,  8 Sep 2008 20:52:51 +0000 (UTC)
Subject: comps/po nl.po,1.14,1.15
Message-ID: <20080908205251.B4490700FD@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28447/po

Modified Files:
	nl.po 
Log Message:
    2008-09-08  Peter van Egdom <p.van.egdom at gmail.com> (via
peterve at fedoraproject.org)
    
      * po/nl.po: Updated Dutch translation.
    



Index: nl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/nl.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nl.po	17 Jul 2008 21:58:36 -0000	1.14
+++ nl.po	8 Sep 2008 20:52:20 -0000	1.15
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-17 19:10+0000\n"
-"PO-Revision-Date: 2008-07-17 22:16+0200\n"
+"POT-Creation-Date: 2008-09-08 17:23+0000\n"
+"PO-Revision-Date: 2008-09-08 22:40+0200\n"
 "Last-Translator: Peter van Egdom <p.van.egdom at gmail.com>\n"
 "Language-Team: Dutch <fedora-trans-list at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -547,37 +547,37 @@
 msgstr "MySQL database"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:112
-#: ../comps-f10.xml.in.h:115 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
+#: ../comps-f10.xml.in.h:116 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "Netwerkservers"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:116 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
+#: ../comps-f10.xml.in.h:117 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "Nieuwsserver"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:115
-#: ../comps-f10.xml.in.h:118
+#: ../comps-f10.xml.in.h:119
 msgid "Northern Sotho Support"
 msgstr "Ondersteuning voor Noord-Sotho"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:119
+#: ../comps-f10.xml.in.h:120
 msgid "Norwegian Support"
 msgstr "Ondersteuning voor Noors"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:120 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
+#: ../comps-f10.xml.in.h:121 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "Kantoor/productiviteit"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:119
-#: ../comps-f10.xml.in.h:122
+#: ../comps-f10.xml.in.h:123
 msgid "Oriya Support"
 msgstr "Ondersteuning voor Oriya"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:123 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
+#: ../comps-f10.xml.in.h:124 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
@@ -586,72 +586,72 @@
 "toepassingen."
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:124
+#: ../comps-f10.xml.in.h:125
 msgid "Persian Support"
 msgstr "Ondersteuning voor Perzisch"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:125
+#: ../comps-f10.xml.in.h:126
 msgid "Polish Support"
 msgstr "Ondersteuning voor Pools"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:126
+#: ../comps-f10.xml.in.h:127
 msgid "Portuguese Support"
 msgstr "Ondersteuning voor Portugees"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:127
+#: ../comps-f10.xml.in.h:128
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL database"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:128
+#: ../comps-f10.xml.in.h:129
 msgid "Printing Support"
 msgstr "Printerondersteuning"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:129
+#: ../comps-f10.xml.in.h:130
 msgid "Punjabi Support"
 msgstr "Ondersteuning voor Punjabi"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:130
+#: ../comps-f10.xml.in.h:131
 msgid "Romanian Support"
 msgstr "Ondersteuning voor Roemeens"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:131
+#: ../comps-f10.xml.in.h:132
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:132
+#: ../comps-f10.xml.in.h:133
 msgid "Russian Support"
 msgstr "Ondersteuning voor Russisch"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:132
-#: ../comps-f10.xml.in.h:135
+#: ../comps-f10.xml.in.h:136
 msgid "Samoan Support"
 msgstr "Ondersteuning voor Samoaans"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:136
+#: ../comps-f10.xml.in.h:137
 msgid "Serbian Support"
 msgstr "Ondersteuning voor Servisch"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:137
+#: ../comps-f10.xml.in.h:138
 msgid "Server Configuration Tools"
 msgstr "Configuratiehulpmiddelen voor server"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:138 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
+#: ../comps-f10.xml.in.h:139 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "Servers"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:139 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
+#: ../comps-f10.xml.in.h:140 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
 msgid ""
 "Simple window managers that aren't part of a larger desktop environment."
 msgstr ""
@@ -659,37 +659,37 @@
 "werkomgeving."
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:140
+#: ../comps-f10.xml.in.h:141
 msgid "Sinhala Support"
 msgstr "Ondersteuning voor Sinhala"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:141
+#: ../comps-f10.xml.in.h:142
 msgid "Slovak Support"
 msgstr "Ondersteuning voor Slowaaks"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:142
+#: ../comps-f10.xml.in.h:143
 msgid "Slovenian Support"
 msgstr "Ondersteuning voor Sloveens"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:143
+#: ../comps-f10.xml.in.h:144
 msgid "Smallest possible installation"
 msgstr "Kleinst mogelijke installatie"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:144 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
+#: ../comps-f10.xml.in.h:145 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "Software gebruikt voor het uitvoeren van netwerkservers"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:145
+#: ../comps-f10.xml.in.h:146
 msgid "Somali Support"
 msgstr "Ondersteuning voor Somalisch"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:146
+#: ../comps-f10.xml.in.h:147
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -698,76 +698,76 @@
 "tekstbestanden aanmaken en bewerken. Emacs en Vi zijn hierbij inbegrepen."
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:147 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
+#: ../comps-f10.xml.in.h:148 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "Geluid en video"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:148
+#: ../comps-f10.xml.in.h:149
 msgid "Southern Ndebele Support"
 msgstr "Ondersteuning voor Zuid-Ndebele"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:149
+#: ../comps-f10.xml.in.h:150
 msgid "Southern Sotho Support"
 msgstr "Ondersteuning voor Zuid-Sotho"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:150
+#: ../comps-f10.xml.in.h:151
 msgid "Spanish Support"
 msgstr "Ondersteuning voor Spaans"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:151 ../comps-el4.xml.in.h:46
+#: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr ""
 "Ondersteuning voor het ontwikkelen van programma's in de programmeertaal "
 "Java."
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:47
+#: ../comps-f10.xml.in.h:153 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr ""
 "Ondersteuning voor het uitvoeren van programma's die in de programmeertaal "
 "Java zijn ontwikkeld."
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:153
+#: ../comps-f10.xml.in.h:154
 msgid "Swati Support"
 msgstr "Ondersteuning voor Swati"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:154
+#: ../comps-f10.xml.in.h:155
 msgid "Swedish Support"
 msgstr "Ondersteuning voor Zweeds"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:155 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
+#: ../comps-f10.xml.in.h:156 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "Systeemgereedschappen"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:156
+#: ../comps-f10.xml.in.h:157
 msgid "Tagalog Support"
 msgstr "Ondersteuning voor Tagalog"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:158
+#: ../comps-f10.xml.in.h:159
 msgid "Tamil Support"
 msgstr "Ondersteuning voor Tamil"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:159
+#: ../comps-f10.xml.in.h:160
 msgid "Telugu Support"
 msgstr "Ondersteuning voor Telugu"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:160 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
+#: ../comps-f10.xml.in.h:161 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "Tekstgebaseerd internet"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:161
+#: ../comps-f10.xml.in.h:162
 msgid "Thai Support"
 msgstr "Ondersteuning voor Thai"
 
@@ -776,12 +776,12 @@
 msgstr "De Eclipse Integrated Development Environment."
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:162 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
+#: ../comps-f10.xml.in.h:163 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "Deze toepassingen omvatten office-pakketten, PDF-bekijkers en meer."
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:163
+#: ../comps-f10.xml.in.h:164
 msgid ""
 "The packages in this group are core libraries needed to develop applications."
 msgstr ""
@@ -789,19 +789,19 @@
 "ontwikkeling van toepassingen."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:164 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
+#: ../comps-f10.xml.in.h:165 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "Met deze pakketten kunt u een IMAP of SMTP e-mailserver configureren."
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:165
+#: ../comps-f10.xml.in.h:166
 msgid ""
 "These packages allow you to develop applications for the X Window System."
 msgstr ""
 "Met deze pakketten kunt u toepassingen voor het X Window systeem ontwikkelen."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:166 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
+#: ../comps-f10.xml.in.h:167 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
 msgid ""
 "These packages are helpful when developing web applications or web pages."
 msgstr ""
@@ -809,14 +809,14 @@
 "webpagina's."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:167
+#: ../comps-f10.xml.in.h:168
 msgid ""
 "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
 "Deze pakketten bevatten netwerkgebaseerde servers als DHCP, Kerberos en NIS."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:168
+#: ../comps-f10.xml.in.h:169
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -825,17 +825,17 @@
 "telnet."
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:169
+#: ../comps-f10.xml.in.h:170
 msgid "These packages provide a virtualization environment."
 msgstr "Deze pakketten bieden een virtualisatieomgeving."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:170
+#: ../comps-f10.xml.in.h:171
 msgid "These packages provide compatibility with previous releases."
 msgstr "Deze pakketten bieden compatibiliteit met voorgaande versies."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:171
+#: ../comps-f10.xml.in.h:172
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -844,7 +844,7 @@
 "inclusief lettertypen en invoermethoden."
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:172
+#: ../comps-f10.xml.in.h:173
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -853,17 +853,17 @@
 "deze omzetten naar HTML, PDF, Postscript en tekst."
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:173 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
+#: ../comps-f10.xml.in.h:174 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "Met deze hulpmiddelen kunt u een webserver op het systeem draaien."
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:174 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
+#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "Met deze hulpmiddelen kunt u een FTP-server op het systeem draaien."
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
+#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -872,17 +872,17 @@
 "gcc, perl, python en debuggers."
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
+#: ../comps-f10.xml.in.h:177 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "Met deze groep kunt u het systeem als nieuwsserver configureren."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:177
+#: ../comps-f10.xml.in.h:178
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "Deze groep bevat Red Hat's eigen hulpmiddelen voor serverconfiguratie."
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:178
+#: ../comps-f10.xml.in.h:179
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -891,12 +891,12 @@
 "handig zijn voor het maken van router/firewall machines."
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
+#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "Deze groep bevat grafische e-mail-, web- en chat-programma's."
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
+#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -905,13 +905,13 @@
 "wetenschappelijke berekeningen/ontwerpen en het omzetten van maten."
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
+#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr ""
 "Deze groep bevat pakketten waarmee u afbeeldingen kunt inscannen en bewerken."
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
+#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -920,7 +920,7 @@
 "toepassingen vereisen geen X Window systeem."
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
+#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -930,7 +930,7 @@
 "systeemhardware te kunnen configureren."
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
+#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of tools and resources of Armenian environments."
 msgstr ""
@@ -938,7 +938,7 @@
 "omgevingen."
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
+#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
 msgid ""
 "This group is a collection of tools for various hardware specific utilities."
 msgstr ""
@@ -946,7 +946,7 @@
 "specifieke gereedschappen."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
+#: ../comps-f10.xml.in.h:187 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
 "client for connecting to SMB shares and tools to monitor network traffic."
@@ -956,14 +956,14 @@
 "hulpmiddelen voor het bekijken van netwerkverkeer."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:187
+#: ../comps-f10.xml.in.h:188
 msgid ""
 "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
 "Met deze pakketgroep kunt u een DNS-naamserver (BIND) op het systeem draaien."
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:188
+#: ../comps-f10.xml.in.h:189
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -972,135 +972,135 @@
 "Windows(tm) systemen."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:189
+#: ../comps-f10.xml.in.h:190
 msgid "This package group contains packages useful for use with MySQL."
 msgstr ""
 "Deze pakketgroep bevat pakketten die nuttig zijn voor gebruik met MySQL."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:190
+#: ../comps-f10.xml.in.h:191
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr ""
 "Deze pakketgroep bevat pakketten die nuttig zijn voor gebruik met Postgresql."
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:191
+#: ../comps-f10.xml.in.h:192
 msgid "Tibetan Support"
 msgstr "Ondersteuning voor Tibetaans"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:192
+#: ../comps-f10.xml.in.h:193
 msgid "Tonga Support"
 msgstr "Ondersteuning voor Tonga"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:193 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
+#: ../comps-f10.xml.in.h:194 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Benodigde hulpmiddelen voor een Fedora pakketsamensteller"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:194
+#: ../comps-f10.xml.in.h:195
 msgid "Tsonga Support"
 msgstr "Ondersteuning voor Tsonga"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:195
+#: ../comps-f10.xml.in.h:196
 msgid "Tswana Support"
 msgstr "Ondersteuning voor Tswana"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:196
+#: ../comps-f10.xml.in.h:197
 msgid "Turkish Support"
 msgstr "Ondersteuning voor Turks"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:197
+#: ../comps-f10.xml.in.h:198
 msgid "Ukrainian Support"
 msgstr "Ondersteuning voor Oekra??ens"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:198
+#: ../comps-f10.xml.in.h:199
 msgid "Urdu Support"
 msgstr "Ondersteuning voor Urdu"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:199 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
+#: ../comps-f10.xml.in.h:200 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "Verschillende kerndelen van het systeem."
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:200 ../comps-el5.xml.in.h:72
+#: ../comps-f10.xml.in.h:201 ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr ""
 "Verschillende mogelijkheden om te ontspannen en uw vrije tijd te besteden."
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:201
+#: ../comps-f10.xml.in.h:202
 msgid "Venda Support"
 msgstr "Ondersteuning voor Venda"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:202
+#: ../comps-f10.xml.in.h:203
 msgid "Vietnamese Support"
 msgstr "Ondersteuning voor Vietnamees"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:203
+#: ../comps-f10.xml.in.h:204
 msgid "Virtualization"
 msgstr "Virtualisatie"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:201
-#: ../comps-f10.xml.in.h:205 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
+#: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "Webontwikkeling"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
+#: ../comps-f10.xml.in.h:207 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "Webserver"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:207
+#: ../comps-f10.xml.in.h:208
 msgid "Welsh Support"
 msgstr "Ondersteuning voor Welsh"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:208 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
+#: ../comps-f10.xml.in.h:209 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "Window managers"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:209
+#: ../comps-f10.xml.in.h:210
 msgid "Windows File Server"
 msgstr "Windows-bestandsserver"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:210
+#: ../comps-f10.xml.in.h:211
 msgid "X Software Development"
 msgstr "X-softwareontwikkeling"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:211 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
+#: ../comps-f10.xml.in.h:212 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X Window systeem"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:212
+#: ../comps-f10.xml.in.h:213
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:213
+#: ../comps-f10.xml.in.h:214
 msgid "XFCE Software Development"
 msgstr "XFCE-softwareontwikkeling"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:214
+#: ../comps-f10.xml.in.h:215
 msgid "Xhosa Support"
 msgstr "Ondersteuning voor Xhosa"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:215
+#: ../comps-f10.xml.in.h:216
 msgid "Zulu Support"
 msgstr "Ondersteuning voor Zoeloe"
 
@@ -1136,11 +1136,11 @@
 msgid "Mongolian Support"
 msgstr "Ondersteuning voor Mongools"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:114
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:115
 msgid "Nepali Support"
 msgstr "Ondersteuning voor Nepalees"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:121
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:122
 msgid "Older bitmap and vector fonts packages"
 msgstr "Oudere bitmap en vector-lettertypen pakketten"
 
@@ -1156,19 +1156,19 @@
 msgid "Macedonian Support"
 msgstr "Ondersteuning voor Macedonisch"
 
-#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:117
+#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:118
 msgid "Northern Sami Support"
 msgstr "Ondersteuning voor Noord-Samisch"
 
-#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:133
+#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:134
 msgid "SUGAR Desktop Environment"
 msgstr "SUGAR-werkomgeving"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:134
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:135
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR is de werkomgeving ontwikkeld voor de OLPC XO."
 
-#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:204
+#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:205
 msgid "Walloon Support"
 msgstr "Ondersteuning voor Waals"
 
@@ -1184,7 +1184,11 @@
 msgid "Input method packages for the input of international text."
 msgstr "Invoermethode pakketten voor het invoeren van internationale tekst."
 
-#: ../comps-f10.xml.in.h:157
+#: ../comps-f10.xml.in.h:114
+msgid "Myanmar (Burmese) Support"
+msgstr "Ondersteuning voor Myanmarees (Birmees)"
+
+#: ../comps-f10.xml.in.h:158
 msgid "Tajik Support"
 msgstr "Ondersteuning voor Tajiki"
 



From dwalsh at fedoraproject.org  Mon Sep  8 20:55:16 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  8 Sep 2008 20:55:16 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.95,
	1.96 policy-20080710.patch, 1.27, 1.28 selinux-policy.spec,
	1.703, 1.704
Message-ID: <20080908205516.8B511700FD@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28767

Modified Files:
	modules-targeted.conf policy-20080710.patch 
	selinux-policy.spec 
Log Message:
* Fri Sep 5 2008 Dan Walsh <dwalsh at redhat.com> 3.5.7-1
- Remove gamin policy



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- modules-targeted.conf	3 Sep 2008 20:05:26 -0000	1.95
+++ modules-targeted.conf	8 Sep 2008 20:54:44 -0000	1.96
@@ -278,13 +278,6 @@
 cyphesis = module
 
 # Layer: services
-# Module: gamin
-#
-#  FAM File Alteration Monitor API
-# 
-gamin = module
-
-# Layer: services
 # Module: cyrus
 #
 # Cyrus is an IMAP service intended to be run on sealed servers

policy-20080710.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.27 -r 1.28 policy-20080710.patch
Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- policy-20080710.patch	4 Sep 2008 20:59:27 -0000	1.27
+++ policy-20080710.patch	8 Sep 2008 20:54:44 -0000	1.28
@@ -1,6 +1,6 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.6/Makefile
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.7/Makefile
 --- nsaserefpolicy/Makefile	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.5.6/Makefile	2008-09-03 15:55:22.000000000 -0400
++++ serefpolicy-3.5.7/Makefile	2008-09-08 10:19:44.000000000 -0400
 @@ -311,20 +311,22 @@
  
  # parse-rolemap modulename,outputfile
@@ -45,9 +45,9 @@
  $(appdir)/%: $(appconf)/%
  	@mkdir -p $(appdir)
  	$(verbose) $(INSTALL) -m 644 $< $@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.6/Rules.modular
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.7/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.5.6/Rules.modular	2008-09-03 15:55:22.000000000 -0400
++++ serefpolicy-3.5.7/Rules.modular	2008-09-08 10:19:44.000000000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -77,9 +77,9 @@
  
  $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy
  $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.6/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.5.7/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.6/config/appconfig-mcs/default_contexts	2008-09-03 15:55:22.000000000 -0400
++++ serefpolicy-3.5.7/config/appconfig-mcs/default_contexts	2008-09-08 10:19:44.000000000 -0400
 @@ -1,15 +0,0 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -96,15 +96,15 @@
 -
 -user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.6/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.5.7/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.6/config/appconfig-mcs/failsafe_context	2008-09-03 15:55:22.000000000 -0400
++++ serefpolicy-3.5.7/config/appconfig-mcs/failsafe_context	2008-09-08 10:19:44.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.6/config/appconfig-mcs/guest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.7/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.6/config/appconfig-mcs/guest_u_default_contexts	2008-09-03 15:55:22.000000000 -0400
++++ serefpolicy-3.5.7/config/appconfig-mcs/guest_u_default_contexts	2008-09-08 10:19:44.000000000 -0400
 @@ -0,0 +1,6 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -112,9 +112,9 @@
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
 +system_r:initrc_su_t:s0		guest_r:guest_t:s0
 +guest_r:guest_t:s0		guest_r:guest_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.5.6/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.5.7/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.6/config/appconfig-mcs/root_default_contexts	2008-09-03 15:55:22.000000000 -0400
++++ serefpolicy-3.5.7/config/appconfig-mcs/root_default_contexts	2008-09-08 10:19:44.000000000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
  system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -128,9 +128,9 @@
  #
 -#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 +system_r:sshd_t:s0		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/staff_u_default_contexts serefpolicy-3.5.6/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.5.7/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.6/config/appconfig-mcs/staff_u_default_contexts	2008-09-03 15:55:22.000000000 -0400
++++ serefpolicy-3.5.7/config/appconfig-mcs/staff_u_default_contexts	2008-09-08 10:19:44.000000000 -0400
 @@ -5,6 +5,8 @@
  system_r:xdm_t:s0		staff_r:staff_t:s0
  staff_r:staff_su_t:s0		staff_r:staff_t:s0
@@ -140,9 +140,9 @@
  sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
  sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.6/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.5.7/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.6/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-03 15:55:22.000000000 -0400
++++ serefpolicy-3.5.7/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-08 10:19:44.000000000 -0400
 @@ -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
@@ -150,9 +150,9 @@
 +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/user_u_default_contexts serefpolicy-3.5.6/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.5.7/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.6/config/appconfig-mcs/user_u_default_contexts	2008-09-03 15:55:22.000000000 -0400
++++ serefpolicy-3.5.7/config/appconfig-mcs/user_u_default_contexts	2008-09-08 10:19:44.000000000 -0400
 @@ -5,4 +5,5 @@
  system_r:xdm_t:s0		user_r:user_t:s0
  user_r:user_su_t:s0		user_r:user_t:s0
@@ -160,15 +160,15 @@
 -
 +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/userhelper_context serefpolicy-3.5.6/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.5.7/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.6/config/appconfig-mcs/userhelper_context	2008-09-03 15:55:22.000000000 -0400
++++ serefpolicy-3.5.7/config/appconfig-mcs/userhelper_context	2008-09-08 10:19:44.000000000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.6/config/appconfig-mcs/xguest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.7/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.6/config/appconfig-mcs/xguest_u_default_contexts	2008-09-03 15:55:22.000000000 -0400
++++ serefpolicy-3.5.7/config/appconfig-mcs/xguest_u_default_contexts	2008-09-08 10:19:44.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -177,25 +177,25 @@
 +system_r:xdm_t		xguest_r:xguest_t:s0
 +system_r:initrc_su_t:s0	xguest_r:xguest_t:s0
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.6/config/appconfig-mls/guest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.7/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.6/config/appconfig-mls/guest_u_default_contexts	2008-09-03 15:55:22.000000000 -0400
++++ serefpolicy-3.5.7/config/appconfig-mls/guest_u_default_contexts	2008-09-08 10:19:44.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
 +system_r:sshd_t:s0		guest_r:guest_t:s0
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.6/config/appconfig-standard/guest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.7/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.6/config/appconfig-standard/guest_u_default_contexts	2008-09-03 15:55:22.000000000 -0400
++++ serefpolicy-3.5.7/config/appconfig-standard/guest_u_default_contexts	2008-09-08 10:19:44.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
 +system_r:sshd_t		guest_r:guest_t
 +system_r:crond_t	guest_r:guest_crond_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.5.6/config/appconfig-standard/root_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.5.7/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.6/config/appconfig-standard/root_default_contexts	2008-09-03 15:55:22.000000000 -0400
++++ serefpolicy-3.5.7/config/appconfig-standard/root_default_contexts	2008-09-08 10:19:44.000000000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t	unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t
  system_r:local_login_t  unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
@@ -209,18 +209,18 @@
  #
 -#system_r:sshd_t	unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
 +system_r:sshd_t	unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.6/config/appconfig-standard/xguest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.7/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.6/config/appconfig-standard/xguest_u_default_contexts	2008-09-03 15:55:22.000000000 -0400
++++ serefpolicy-3.5.7/config/appconfig-standard/xguest_u_default_contexts	2008-09-08 10:19:44.000000000 -0400
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
 +system_r:sshd_t		xguest_r:xguest_t
 +system_r:crond_t	xguest_r:xguest_crond_t
 +system_r:xdm_t		xguest_r:xguest_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.5.6/policy/global_tunables
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.5.7/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.6/policy/global_tunables	2008-09-03 15:55:22.000000000 -0400
++++ serefpolicy-3.5.7/policy/global_tunables	2008-09-08 10:19:44.000000000 -0400
 @@ -34,7 +34,7 @@
  
  ## <desc>
@@ -259,9 +259,9 @@
 +gen_tunable(allow_console_login,false)
 +
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.5.6/policy/modules/admin/alsa.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.5.7/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/admin/alsa.te	2008-09-03 15:55:22.000000000 -0400
++++ serefpolicy-3.5.7/policy/modules/admin/alsa.te	2008-09-08 10:19:44.000000000 -0400
 @@ -51,6 +51,8 @@
  
  auth_use_nsswitch(alsa_t)
@@ -271,9 +271,9 @@
  libs_use_ld_so(alsa_t)
  libs_use_shared_libs(alsa_t)
  
[...5903 lines suppressed...]
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.6/policy/modules/system/sysnetwork.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.7/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/sysnetwork.fc	2008-09-03 15:55:23.000000000 -0400
++++ serefpolicy-3.5.7/policy/modules/system/sysnetwork.fc	2008-09-08 10:19:45.000000000 -0400
 @@ -57,3 +57,5 @@
  ifdef(`distro_gentoo',`
  /var/lib/dhcpc(/.*)?		gen_context(system_u:object_r:dhcpc_state_t,s0)
  ')
 +
 +/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.5.6/policy/modules/system/sysnetwork.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.5.7/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/sysnetwork.if	2008-09-03 15:55:23.000000000 -0400
++++ serefpolicy-3.5.7/policy/modules/system/sysnetwork.if	2008-09-08 10:19:45.000000000 -0400
 @@ -553,6 +553,7 @@
  		type net_conf_t;
  	')
@@ -31907,9 +32107,9 @@
 +
 +	role_transition $1 dhcpc_exec_t system_r;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.6/policy/modules/system/sysnetwork.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.7/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2008-08-11 11:23:34.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/sysnetwork.te	2008-09-03 15:55:23.000000000 -0400
++++ serefpolicy-3.5.7/policy/modules/system/sysnetwork.te	2008-09-08 10:19:45.000000000 -0400
 @@ -20,6 +20,10 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -32091,9 +32291,9 @@
  	kernel_read_xen_state(ifconfig_t)
  	kernel_write_xen_state(ifconfig_t)
  	xen_append_log(ifconfig_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.6/policy/modules/system/udev.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.7/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/udev.if	2008-09-03 15:55:23.000000000 -0400
++++ serefpolicy-3.5.7/policy/modules/system/udev.if	2008-09-08 10:19:45.000000000 -0400
 @@ -96,6 +96,24 @@
  
  ########################################
@@ -32147,9 +32347,9 @@
 -	allow $1 udev_tdb_t:file rw_file_perms;
 +	allow $1 udev_tbl_t:file rw_file_perms;
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.6/policy/modules/system/udev.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.7/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/udev.te	2008-09-03 15:55:23.000000000 -0400
++++ serefpolicy-3.5.7/policy/modules/system/udev.te	2008-09-08 10:19:45.000000000 -0400
 @@ -83,6 +83,7 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
@@ -32205,9 +32405,9 @@
 +optional_policy(`
  	xserver_read_xdm_pid(udev_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.6/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.5.7/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/unconfined.fc	2008-09-03 15:55:23.000000000 -0400
++++ serefpolicy-3.5.7/policy/modules/system/unconfined.fc	2008-09-08 10:19:45.000000000 -0400
 @@ -2,15 +2,11 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -32246,9 +32446,9 @@
 +/usr/libexec/ghc-[^/]+/ghc-.*  --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 +
 +/opt/real/(.*/)?realplay\.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.5.6/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.5.7/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/unconfined.if	2008-09-03 15:55:23.000000000 -0400
++++ serefpolicy-3.5.7/policy/modules/system/unconfined.if	2008-09-08 10:19:45.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -32592,9 +32792,9 @@
 +	userdom_role_change_template(unconfined, $1)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.6/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.5.7/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-09-03 07:59:15.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/unconfined.te	2008-09-03 15:55:23.000000000 -0400
++++ serefpolicy-3.5.7/policy/modules/system/unconfined.te	2008-09-08 10:19:45.000000000 -0400
 @@ -1,40 +1,80 @@
  
 -policy_module(unconfined, 2.3.1)
@@ -32929,9 +33129,9 @@
 +# Allow SELinux aware applications to request rpm_script execution
 +rpm_transition_script(unconfined_notrans_t)
 +domain_ptrace_all_domains(unconfined_notrans_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.6/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.5.7/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/userdomain.fc	2008-09-03 15:55:23.000000000 -0400
++++ serefpolicy-3.5.7/policy/modules/system/userdomain.fc	2008-09-08 10:19:45.000000000 -0400
 @@ -1,4 +1,5 @@
 -HOME_DIR	-d	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
 -HOME_DIR/.+		gen_context(system_u:object_r:ROLE_home_t,s0)
@@ -32942,9 +33142,9 @@
 +HOME_DIR/.+		gen_context(system_u:object_r:user_home_t,s0)
 +/tmp/gconfd-USER -d	gen_context(system_u:object_r:user_tmp_t,s0)
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.5.6/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.5.7/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/userdomain.if	2008-09-03 15:55:23.000000000 -0400
++++ serefpolicy-3.5.7/policy/modules/system/userdomain.if	2008-09-08 10:19:45.000000000 -0400
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -35504,9 +35704,9 @@
 +
 +	dontaudit $1 user_home_t:file unlink;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.6/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.5.7/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/userdomain.te	2008-09-03 15:55:23.000000000 -0400
++++ serefpolicy-3.5.7/policy/modules/system/userdomain.te	2008-09-08 10:19:45.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -35621,9 +35821,9 @@
 +	manage_fifo_files_pattern(privhome, cifs_t, cifs_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.6/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.5.7/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/xen.fc	2008-09-03 15:55:23.000000000 -0400
++++ serefpolicy-3.5.7/policy/modules/system/xen.fc	2008-09-08 10:19:45.000000000 -0400
 @@ -20,6 +20,7 @@
  /var/run/xenconsoled\.pid --	gen_context(system_u:object_r:xenconsoled_var_run_t,s0)
  /var/run/xend(/.*)?		gen_context(system_u:object_r:xend_var_run_t,s0)
@@ -35632,9 +35832,9 @@
  /var/run/xenstore\.pid	--	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  /var/run/xenstored(/.*)?	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.6/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.5.7/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/xen.if	2008-09-03 15:55:23.000000000 -0400
++++ serefpolicy-3.5.7/policy/modules/system/xen.if	2008-09-08 10:19:45.000000000 -0400
 @@ -167,11 +167,14 @@
  #
  interface(`xen_stream_connect',`
@@ -35676,9 +35876,9 @@
 +	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.5.6/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.5.7/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.6/policy/modules/system/xen.te	2008-09-03 15:55:23.000000000 -0400
++++ serefpolicy-3.5.7/policy/modules/system/xen.te	2008-09-08 10:19:45.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -35915,9 +36115,9 @@
 +optional_policy(`
 +	unconfined_domain(xend_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.6/policy/support/file_patterns.spt
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.7/policy/support/file_patterns.spt
 --- nsaserefpolicy/policy/support/file_patterns.spt	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.6/policy/support/file_patterns.spt	2008-09-03 15:55:23.000000000 -0400
++++ serefpolicy-3.5.7/policy/support/file_patterns.spt	2008-09-08 10:19:45.000000000 -0400
 @@ -537,3 +537,18 @@
  	allow $1 $2:dir rw_dir_perms;
  	type_transition $1 $2:$4 $3;
@@ -35937,9 +36137,9 @@
 +        relabel_sock_files_pattern($1,$2,$2)
 +
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.6/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.5.7/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.6/policy/support/obj_perm_sets.spt	2008-09-03 15:55:23.000000000 -0400
++++ serefpolicy-3.5.7/policy/support/obj_perm_sets.spt	2008-09-08 10:19:45.000000000 -0400
 @@ -316,3 +316,13 @@
  #
  define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }')
@@ -35954,9 +36154,9 @@
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
 +
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.6/policy/users
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.7/policy/users
 --- nsaserefpolicy/policy/users	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.6/policy/users	2008-09-03 15:55:23.000000000 -0400
++++ serefpolicy-3.5.7/policy/users	2008-09-08 10:19:45.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.703
retrieving revision 1.704
diff -u -r1.703 -r1.704
--- selinux-policy.spec	4 Sep 2008 20:59:27 -0000	1.703
+++ selinux-policy.spec	8 Sep 2008 20:54:45 -0000	1.704
@@ -16,8 +16,8 @@
 %define CHECKPOLICYVER 2.0.16-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.5.6
-Release: 2%{?dist}
+Version: 3.5.7
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -290,6 +290,7 @@
 restorecon -R /root /var/log /var/run 2> /dev/null
 else
 semodule -s targeted -r moilscanner 2>/dev/null
+semodule -s targeted -r gamin 2>/dev/null
 %loadpolicy targeted
 %relabel targeted
 fi
@@ -380,6 +381,9 @@
 %endif
 
 %changelog
+* Fri Sep 5 2008 Dan Walsh <dwalsh at redhat.com> 3.5.7-1
+- Remove gamin policy
+
 * Thu Sep 4 2008 Dan Walsh <dwalsh at redhat.com> 3.5.6-2
 - Add tinyxs-max file system support
 



From spot at fedoraproject.org  Mon Sep  8 20:58:50 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 20:58:50 +0000 (UTC)
Subject: rpms/themes-backgrounds-gnome/devel
	themes-backgrounds-gnome.xml-0.4, 
	NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 themes-backgrounds-gnome.spec, 1.14,
	1.15 themes-backgrounds-gnome.xml, 1.1, 1.2
Message-ID: <20080908205850.391F3700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/themes-backgrounds-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29498

Modified Files:
	.cvsignore sources themes-backgrounds-gnome.spec 
	themes-backgrounds-gnome.xml 
Added Files:
	themes-backgrounds-gnome.xml-0.4 
Log Message:
fix licensing


--- NEW FILE themes-backgrounds-gnome.xml-0.4 ---
<?xml version="1.0"?>
<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
<wallpapers>
  <wallpaper>
    <name>GNOME-Dagg_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Dagg_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Brazil.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Brazil.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-RedFlower_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-RedFlower_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-ThePeninsula_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-ThePeninsula_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-H2gnOme.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-H2gnOme.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-PoppySeed_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-PoppySeed_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-TreeFace_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-TreeFace_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-GettingBusy_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-GettingBusy_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Diken_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Diken_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-LiquidAmethyst.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-LiquidAmethyst.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Petrklic_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Petrklic_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GreenThirst_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GreenThirst_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-FlowerMacro1_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-FlowerMacro1_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Orangenavy.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Orangenavy.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Iceland_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Iceland_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GNOMELand_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GNOMELand_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Sand_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Sand_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Superclean_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Superclean_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Transparent_1280x1024.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Transparent_1280x1024.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-MnchenBotanischerGarten_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-MnchenBotanischerGarten_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-CityPlosion_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-CityPlosion_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-OrangeGnomeMail_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-OrangeGnomeMail_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>Penguingang_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/Penguingang_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-YellowCosmos.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-YellowCosmos.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-PebbleBeach_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-PebbleBeach_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-RightFoot_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-RightFoot_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-MarigoldMacro_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-MarigoldMacro_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-MolvenoFlower_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-MolvenoFlower_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-RustyPipes_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-RustyPipes_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-November_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-November_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-SunsetOverCoalOil_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-SunsetOverCoalOil_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Sella_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Sella_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Blue_Motion_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Blue_Motion_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GnomeOrb_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GnomeOrb_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Heaven-CampD_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Heaven-CampD_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-WinterInFinland_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-WinterInFinland_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-WaspOn_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-WaspOn_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GNOMEInXalapaVeracruzMexico_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GNOMEInXalapaVeracruzMexico_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GnomeGallery_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GnomeGallery_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-PieceOfSky_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-PieceOfSky_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Glassy_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Glassy_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-CloudsInTheSky_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-CloudsInTheSky_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-RealShoot_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-RealShoot_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-DrinkItClean02_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-DrinkItClean02_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Nature_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Nature_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-ForMilk01_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-ForMilk01_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-DesktopForNuts_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-DesktopForNuts_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-MykonosSky_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-MykonosSky_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-ColorfulLines_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-ColorfulLines_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Mountains_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Mountains_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-MauiView1_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-MauiView1_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-SouthwestSunset_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-SouthwestSunset_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-Mraky_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-Mraky_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-OrangeMoss_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-OrangeMoss_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Simple.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Simple.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-FlowerBlueScan_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-FlowerBlueScan_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GNOMESomewhere_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GNOMESomewhere_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Happygnome_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Happygnome_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-FlowerMacro2_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-FlowerMacro2_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-HeronIslandSunset_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-HeronIslandSunset_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Orange.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Orange.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-FencedView_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-FencedView_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Moss_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Moss_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Gel.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Gel.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GNOMERisingSun_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GNOMERisingSun_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-FreshFlower_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-FreshFlower_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Waterlily_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Waterlily_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-GreenField_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-GreenField_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-MetallicBall_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-MetallicBall_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-RensowFenster_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-RensowFenster_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Crob_1024x768.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Crob_1024x768.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-MagnesiumPunchout_perspective_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-MagnesiumPunchout_perspective_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-IceChapel_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-IceChapel_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Lava.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Lava.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Grass_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Grass_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Stone_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Stone_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-GaloppingHorses_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-GaloppingHorses_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-SmallDuckie_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-SmallDuckie_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-SunsetNearPocinovice_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-SunsetNearPocinovice_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Smoer_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Smoer_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-ReindeerFur_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-ReindeerFur_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Leaves_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Leaves_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-WinterAlsaceFrance_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-WinterAlsaceFrance_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-ChatsworthFlower_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-ChatsworthFlower_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-LonelyTree_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-LonelyTree_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-AutumnTree_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-AutumnTree_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-TreeFern_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-TreeFern_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-FluidCode_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-FluidCode_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-BlueScape_1024x768.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-BlueScape_1024x768.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-FloridaFlower_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-FloridaFlower_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-YellowLichen_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-YellowLichen_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-NesstovRectimn_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-NesstovRectimn_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GNOMEFlowers_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GNOMEFlowers_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-NearSmrzovice_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-NearSmrzovice_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-SnowBench_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-SnowBench_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
</wallpapers>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/themes-backgrounds-gnome/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Jan 2006 09:29:07 -0000	1.3
+++ .cvsignore	8 Sep 2008 20:58:19 -0000	1.4
@@ -1 +1 @@
-themes-backgrounds-gnome-0.4.tar.bz2
+themes-backgrounds-gnome-0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/themes-backgrounds-gnome/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Jan 2006 09:29:07 -0000	1.3
+++ sources	8 Sep 2008 20:58:19 -0000	1.4
@@ -1 +1 @@
-be0978e025cbf6a2a60f55eadcaf30cf  themes-backgrounds-gnome-0.4.tar.bz2
+f565ba06bc85f889d4bb6e86b5c2c1e8  themes-backgrounds-gnome-0.5.tar.bz2


Index: themes-backgrounds-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/themes-backgrounds-gnome/devel/themes-backgrounds-gnome.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- themes-backgrounds-gnome.spec	15 Sep 2006 06:11:02 -0000	1.14
+++ themes-backgrounds-gnome.spec	8 Sep 2008 20:58:19 -0000	1.15
@@ -1,11 +1,14 @@
 Summary:        Assorted Backgrounds from art.gnome.org
 Name:           themes-backgrounds-gnome
-Version:        0.4
-Release:        6%{?dist}
-License:        GPL
+Version:        0.5
+Release:        1%{?dist}
+# See LICENSING.txt for details and attribution
+License:        GPL+ and LGPL+ and CC-BY and CC-BY-SA and CC-BY-ND and Public Domain
 Group:          User Interface/Desktops
 URL:            http://art.gnome.org
-Source0:        themes-backgrounds-gnome-0.4.tar.bz2
+# All of the files in this package (except LICENSING.txt) came from
+# http://art.gnome.org. The tarball just makes it more convenient.
+Source0:        themes-backgrounds-gnome-%{version}.tar.bz2
 Source1:        themes-backgrounds-gnome.xml
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -30,10 +33,15 @@
 
 %files
 %defattr(-,root,root,-)
+%doc LICENSING.txt
 %{_datadir}/backgrounds/images/themes-backgrounds-gnome
 %{_datadir}/gnome-background-properties/themes-backgrounds-gnome.xml
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5-1
+- massive licensing audit, some files removed, licensing attribution done 
+  properly
+
 * Mon Sep 11 2006 Chris Chabot <chabotc at xs4all.nl> - 0.4-6
 - FC6 rebuild v2
 


Index: themes-backgrounds-gnome.xml
===================================================================
RCS file: /cvs/pkgs/rpms/themes-backgrounds-gnome/devel/themes-backgrounds-gnome.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- themes-backgrounds-gnome.xml	29 Jan 2006 09:29:07 -0000	1.1
+++ themes-backgrounds-gnome.xml	8 Sep 2008 20:58:19 -0000	1.2
@@ -10,14 +10,6 @@
     <scolor>#000000</scolor>
   </wallpaper>
   <wallpaper>
-    <name>GNOME-Brazil.jpg</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Brazil.jpg</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
     <name>NATURE-RedFlower_1600x1200.jpg</name>
     <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-RedFlower_1600x1200.jpg</filename>
     <options>stretched</options>
@@ -58,14 +50,6 @@
     <scolor>#000000</scolor>
   </wallpaper>
   <wallpaper>
-    <name>OTHER-GettingBusy_1600x1200.jpg</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-GettingBusy_1600x1200.jpg</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
     <name>NATURE-Diken_1600x1200.jpg</name>
     <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Diken_1600x1200.jpg</filename>
     <options>stretched</options>
@@ -74,14 +58,6 @@
     <scolor>#000000</scolor>
   </wallpaper>
   <wallpaper>
-    <name>GNOME-LiquidAmethyst.png</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-LiquidAmethyst.png</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
     <name>NATURE-Petrklic_1600x1200.jpg</name>
     <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Petrklic_1600x1200.jpg</filename>
     <options>stretched</options>
@@ -146,46 +122,6 @@
     <scolor>#000000</scolor>
   </wallpaper>
   <wallpaper>
-    <name>GNOME-Transparent_1280x1024.png</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Transparent_1280x1024.png</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
-    <name>NATURE-MnchenBotanischerGarten_1600x1200.jpg</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-MnchenBotanischerGarten_1600x1200.jpg</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
-    <name>GNOME-CityPlosion_1600x1200.jpg</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-CityPlosion_1600x1200.jpg</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
-    <name>GNOME-OrangeGnomeMail_1600x1200.jpg</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-OrangeGnomeMail_1600x1200.jpg</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
-    <name>Penguingang_1600x1200.jpg</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/Penguingang_1600x1200.jpg</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
     <name>GNOME-YellowCosmos.jpg</name>
     <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-YellowCosmos.jpg</filename>
     <options>stretched</options>
@@ -258,14 +194,6 @@
     <scolor>#000000</scolor>
   </wallpaper>
   <wallpaper>
-    <name>GNOME-Blue_Motion_1280x1024.jpg</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Blue_Motion_1280x1024.jpg</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
     <name>GNOME-GnomeOrb_1600x1200.jpg</name>
     <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GnomeOrb_1600x1200.jpg</filename>
     <options>stretched</options>
@@ -274,22 +202,6 @@
     <scolor>#000000</scolor>
   </wallpaper>
   <wallpaper>
-    <name>GNOME-Heaven-CampD_1280x1024.jpg</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Heaven-CampD_1280x1024.jpg</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
-    <name>GNOME-WinterInFinland_1600x1200.jpg</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-WinterInFinland_1600x1200.jpg</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
     <name>NATURE-WaspOn_1600x1200.jpg</name>
     <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-WaspOn_1600x1200.jpg</filename>
     <options>stretched</options>
@@ -370,14 +282,6 @@
     <scolor>#000000</scolor>
   </wallpaper>
   <wallpaper>
-    <name>GNOME-DesktopForNuts_1600x1200.jpg</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-DesktopForNuts_1600x1200.jpg</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
     <name>OTHER-MykonosSky_1600x1200.jpg</name>
     <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-MykonosSky_1600x1200.jpg</filename>
     <options>stretched</options>
@@ -394,14 +298,6 @@
     <scolor>#000000</scolor>
   </wallpaper>
   <wallpaper>
-    <name>GNOME-Mountains_1280x1024.jpg</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Mountains_1280x1024.jpg</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
     <name>NATURE-MauiView1_1600x1200.jpg</name>
     <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-MauiView1_1600x1200.jpg</filename>
     <options>stretched</options>
@@ -434,22 +330,6 @@
     <scolor>#000000</scolor>
   </wallpaper>
   <wallpaper>
-    <name>GNOME-Simple.jpg</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Simple.jpg</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
-    <name>GNOME-FlowerBlueScan_1280x1024.jpg</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-FlowerBlueScan_1280x1024.jpg</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
     <name>GNOME-GNOMESomewhere_1600x1200.png</name>
     <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GNOMESomewhere_1600x1200.png</filename>
     <options>stretched</options>
@@ -506,14 +386,6 @@
     <scolor>#000000</scolor>
   </wallpaper>
   <wallpaper>
-    <name>GNOME-Gel.jpg</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Gel.jpg</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
     <name>GNOME-GNOMERisingSun_1600x1200.jpg</name>
     <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GNOMERisingSun_1600x1200.jpg</filename>
     <options>stretched</options>
@@ -522,14 +394,6 @@
     <scolor>#000000</scolor>
   </wallpaper>
   <wallpaper>
-    <name>NATURE-FreshFlower_1600x1200.jpg</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-FreshFlower_1600x1200.jpg</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
     <name>NATURE-Waterlily_1600x1200.jpg</name>
     <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Waterlily_1600x1200.jpg</filename>
     <options>stretched</options>
@@ -570,14 +434,6 @@
     <scolor>#000000</scolor>
   </wallpaper>
   <wallpaper>
-    <name>GNOME-MagnesiumPunchout_perspective_1280x1024.jpg</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-MagnesiumPunchout_perspective_1280x1024.jpg</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
     <name>NATURE-IceChapel_1600x1200.jpg</name>
     <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-IceChapel_1600x1200.jpg</filename>
     <options>stretched</options>
@@ -618,14 +474,6 @@
     <scolor>#000000</scolor>
   </wallpaper>
   <wallpaper>
-    <name>NATURE-SmallDuckie_1600x1200.jpg</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-SmallDuckie_1600x1200.jpg</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
     <name>NATURE-SunsetNearPocinovice_1600x1200.jpg</name>
     <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-SunsetNearPocinovice_1600x1200.jpg</filename>
     <options>stretched</options>
@@ -642,22 +490,6 @@
     <scolor>#000000</scolor>
   </wallpaper>
   <wallpaper>
-    <name>OTHER-ReindeerFur_1600x1200.jpg</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-ReindeerFur_1600x1200.jpg</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
-    <name>NATURE-Leaves_1600x1200.jpg</name>
-    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Leaves_1600x1200.jpg</filename>
-    <options>stretched</options>
-    <shade_type>solid</shade_type>
-    <pcolor>#FFFFFF</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
     <name>NATURE-WinterAlsaceFrance_1600x1200.jpg</name>
     <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-WinterAlsaceFrance_1600x1200.jpg</filename>
     <options>stretched</options>



From dwalsh at fedoraproject.org  Mon Sep  8 20:59:25 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  8 Sep 2008 20:59:25 +0000 (UTC)
Subject: rpms/selinux-policy/F-8 policy-20070703.patch, 1.222,
	1.223 selinux-policy.spec, 1.642, 1.643
Message-ID: <20080908205925.059B8700FD@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29783

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Tue Aug 26 2008 Dan Walsh <dwalsh at redhat.com> 3.0.8-115
- Remove definition for /var/run/mod_fcgid(/.*)?	


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-8/policy-20070703.patch,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- policy-20070703.patch	12 Aug 2008 20:14:56 -0000	1.222
+++ policy-20070703.patch	8 Sep 2008 20:59:24 -0000	1.223
@@ -6893,7 +6893,7 @@
  dev_read_rand(amavis_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.0.8/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2008-06-12 23:37:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/apache.fc	2008-06-12 23:37:58.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/apache.fc	2008-08-26 20:36:50.000000000 -0400
 @@ -3,12 +3,13 @@
  /etc/apache(2)?(/.*)?			gen_context(system_u:object_r:httpd_config_t,s0)
  /etc/apache-ssl(2)?(/.*)?		gen_context(system_u:object_r:httpd_config_t,s0)
@@ -6955,12 +6955,11 @@
  ifdef(`distro_debian', `
  /var/log/horde2(/.*)?			gen_context(system_u:object_r:httpd_log_t,s0)
  ')
-@@ -65,11 +71,24 @@
+@@ -65,11 +71,23 @@
  /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_fcgid(/.*)?		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)
@@ -9205,7 +9204,7 @@
 -') dnl end TODO
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.0.8/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2008-06-12 23:37:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/cups.fc	2008-07-30 11:33:25.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/cups.fc	2008-09-08 11:56:44.000000000 -0400
 @@ -8,24 +8,28 @@
  /etc/cups/ppd/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/ppds\.dat	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
@@ -9249,7 +9248,13 @@
  
  /var/cache/alchemist/printconf.* gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /var/cache/foomatic(/.*)? 	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
-@@ -51,4 +55,8 @@
+@@ -46,9 +50,14 @@
+ /var/log/turboprint_cups\.log.* -- gen_context(system_u:object_r:cupsd_log_t,s0)
+ 
+ /var/run/cups(/.*)?		gen_context(system_u:object_r:cupsd_var_run_t,s0)
++/var/ccpd(/.*)?			gen_context(system_u:object_r:cupsd_var_run_t,s0)
+ /var/run/hp.*\.pid	--	gen_context(system_u:object_r:hplip_var_run_t,s0)
+ /var/run/hp.*\.port	--	gen_context(system_u:object_r:hplip_var_run_t,s0)
  /var/run/ptal-printd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
  /var/run/ptal-mlcd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
  
@@ -9269,7 +9274,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.0.8/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2008-06-12 23:37:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/cups.te	2008-06-12 23:37:58.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/cups.te	2008-09-08 11:56:57.000000000 -0400
 @@ -48,9 +48,8 @@
  type hplip_t;
  type hplip_exec_t;
@@ -9309,8 +9314,11 @@
  allow cupsd_t cupsd_exec_t:lnk_file read;
  
  manage_files_pattern(cupsd_t,cupsd_log_t,cupsd_log_t)
-@@ -122,13 +121,14 @@
+@@ -120,15 +119,17 @@
+ allow cupsd_t cupsd_var_run_t:dir setattr;
+ manage_files_pattern(cupsd_t,cupsd_var_run_t,cupsd_var_run_t)
  manage_sock_files_pattern(cupsd_t,cupsd_var_run_t,cupsd_var_run_t)
++manage_fifo_files_pattern(cupsd_t,cupsd_var_run_t,cupsd_var_run_t)
  files_pid_filetrans(cupsd_t,cupsd_var_run_t,file)
  
 -read_files_pattern(cupsd_t,hplip_etc_t,hplip_etc_t)
@@ -9326,7 +9334,7 @@
  kernel_read_system_state(cupsd_t)
  kernel_read_network_state(cupsd_t)
  kernel_read_all_sysctls(cupsd_t)
-@@ -150,21 +150,27 @@
+@@ -150,21 +151,27 @@
  corenet_tcp_bind_reserved_port(cupsd_t)
  corenet_dontaudit_tcp_bind_all_reserved_ports(cupsd_t)
  corenet_tcp_connect_all_ports(cupsd_t)
@@ -9355,7 +9363,7 @@
  mls_file_downgrade(cupsd_t)
  mls_file_write_all_levels(cupsd_t)
  mls_file_read_all_levels(cupsd_t)
-@@ -174,6 +180,7 @@
+@@ -174,6 +181,7 @@
  term_search_ptys(cupsd_t)
  
  auth_domtrans_chk_passwd(cupsd_t)
@@ -9363,7 +9371,7 @@
  auth_dontaudit_read_pam_pid(cupsd_t)
  
  # Filter scripts may be shell scripts, and may invoke progs like /bin/mktemp
-@@ -187,7 +194,7 @@
+@@ -187,7 +195,7 @@
  # read python modules
  files_read_usr_files(cupsd_t)
  # for /var/lib/defoma
@@ -9372,7 +9380,7 @@
  files_list_world_readable(cupsd_t)
  files_read_world_readable_files(cupsd_t)
  files_read_world_readable_symlinks(cupsd_t)
-@@ -196,12 +203,9 @@
+@@ -196,12 +204,9 @@
  files_read_var_symlinks(cupsd_t)
  # for /etc/printcap
  files_dontaudit_write_etc_files(cupsd_t)
@@ -9386,7 +9394,7 @@
  
  init_exec_script_files(cupsd_t)
  
-@@ -220,18 +224,41 @@
+@@ -220,18 +225,41 @@
  seutil_read_config(cupsd_t)
  
  sysnet_read_config(cupsd_t)
@@ -9428,7 +9436,7 @@
  	apm_domtrans_client(cupsd_t)
  ')
  
-@@ -263,16 +290,16 @@
+@@ -263,16 +291,16 @@
  ')
  
  optional_policy(`
@@ -9449,7 +9457,7 @@
  	seutil_sigchld_newrole(cupsd_t)
  ')
  
-@@ -331,6 +358,7 @@
+@@ -331,6 +359,7 @@
  dev_read_sysfs(cupsd_config_t)
  dev_read_urand(cupsd_config_t)
  dev_read_rand(cupsd_config_t)
@@ -9457,7 +9465,7 @@
  
  fs_getattr_all_fs(cupsd_config_t)
  fs_search_auto_mountpoints(cupsd_config_t)
-@@ -356,6 +384,7 @@
+@@ -356,6 +385,7 @@
  logging_send_syslog_msg(cupsd_config_t)
  
  miscfiles_read_localization(cupsd_config_t)
@@ -9465,7 +9473,7 @@
  
  seutil_dontaudit_search_config(cupsd_config_t)
  
-@@ -377,6 +406,14 @@
+@@ -377,6 +407,14 @@
  ')
  
  optional_policy(`
@@ -9480,7 +9488,7 @@
  	cron_system_entry(cupsd_config_t, cupsd_config_exec_t)
  ')
  
-@@ -393,6 +430,7 @@
+@@ -393,6 +431,7 @@
  optional_policy(`
  	hal_domtrans(cupsd_config_t)
  	hal_read_tmp_files(cupsd_config_t)
@@ -9488,7 +9496,7 @@
  ')
  
  optional_policy(`
-@@ -482,6 +520,8 @@
+@@ -482,6 +521,8 @@
  
  files_read_etc_files(cupsd_lpd_t)
  
@@ -9497,7 +9505,7 @@
  libs_use_ld_so(cupsd_lpd_t)
  libs_use_shared_libs(cupsd_lpd_t)
  
-@@ -489,22 +529,12 @@
+@@ -489,22 +530,12 @@
  
  miscfiles_read_localization(cupsd_lpd_t)
  
@@ -9520,7 +9528,7 @@
  ########################################
  #
  # HPLIP local policy
-@@ -522,14 +552,12 @@
+@@ -522,14 +553,12 @@
  allow hplip_t self:udp_socket create_socket_perms;
  allow hplip_t self:rawip_socket create_socket_perms;
  
@@ -9539,7 +9547,7 @@
  
  manage_files_pattern(hplip_t,hplip_var_run_t,hplip_var_run_t)
  files_pid_filetrans(hplip_t,hplip_var_run_t,file)
-@@ -560,7 +588,7 @@
+@@ -560,7 +589,7 @@
  dev_read_urand(hplip_t)
  dev_read_rand(hplip_t)
  dev_rw_generic_usb_dev(hplip_t)
@@ -9548,7 +9556,7 @@
  
  fs_getattr_all_fs(hplip_t)
  fs_search_auto_mountpoints(hplip_t)
-@@ -587,7 +615,7 @@
+@@ -587,7 +616,7 @@
  userdom_dontaudit_search_sysadm_home_dirs(hplip_t)
  userdom_dontaudit_search_all_users_home_content(hplip_t)
  
@@ -9557,7 +9565,7 @@
  
  optional_policy(`
  	seutil_sigchld_newrole(hplip_t)
-@@ -668,3 +696,15 @@
+@@ -668,3 +697,15 @@
  optional_policy(`
  	udev_read_db(ptal_t)
  ')
@@ -11826,7 +11834,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.0.8/policy/modules/services/mailman.te
 --- nsaserefpolicy/policy/modules/services/mailman.te	2008-06-12 23:37:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/mailman.te	2008-06-12 23:37:58.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/mailman.te	2008-08-28 09:25:27.000000000 -0400
 @@ -55,6 +55,8 @@
  	apache_use_fds(mailman_cgi_t)
  	apache_dontaudit_append_log(mailman_cgi_t)
@@ -11840,7 +11848,7 @@
  #
  
  allow mailman_mail_t self:unix_dgram_socket create_socket_perms;
-+allow mailman_mail_t self:process signal;
++allow mailman_mail_t self:process { signal signull };
 +allow mailman_mail_t initrc_t:process signal;
 +allow mailman_mail_t self:capability { setuid setgid };
 +
@@ -19381,7 +19389,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.0.8/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2008-06-12 23:37:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.te	2008-07-24 06:57:59.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.te	2008-08-29 12:42:00.000000000 -0400
 @@ -1,4 +1,4 @@
 -
 +	
@@ -19453,7 +19461,7 @@
 +userdom_write_unpriv_users_tmp_files(pam_t)
 +userdom_unlink_unpriv_users_tmp_files(pam_t)
 +userdom_dontaudit_read_unpriv_users_home_content_files(pam_t)
-+userdom_dontaudit_write_user_home_content_files(user, pam_t)
++userdom_dontaudit_write_unpriv_user_home_content_files(pam_t)
 +userdom_append_unpriv_users_home_content_files(pam_t)
 +userdom_dontaudit_read_user_tmp_files(user, pam_t)
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-8/selinux-policy.spec,v
retrieving revision 1.642
retrieving revision 1.643
diff -u -r1.642 -r1.643
--- selinux-policy.spec	12 Aug 2008 20:17:47 -0000	1.642
+++ selinux-policy.spec	8 Sep 2008 20:59:24 -0000	1.643
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 114%{?dist}
+Release: 115%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -381,6 +381,9 @@
 %endif
 
 %changelog
+* Tue Aug 26 2008 Dan Walsh <dwalsh at redhat.com> 3.0.8-115
+- Remove definition for /var/run/mod_fcgid(/.*)?	
+
 * Tue Aug 12 2008 Dan Walsh <dwalsh at redhat.com> 3.0.8-114
 - Allow bluetooth to read hwdate
 



From dwalsh at fedoraproject.org  Mon Sep  8 21:02:12 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  8 Sep 2008 21:02:12 +0000 (UTC)
Subject: rpms/selinux-policy/devel .cvsignore, 1.146, 1.147 sources, 1.161,
	1.162
Message-ID: <20080908210212.B7D3E700FD@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30380

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Sep 5 2008 Dan Walsh <dwalsh at redhat.com> 3.5.7-1
- Remove gamin policy



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- .cvsignore	3 Sep 2008 20:16:35 -0000	1.146
+++ .cvsignore	8 Sep 2008 21:01:42 -0000	1.147
@@ -148,3 +148,4 @@
 serefpolicy-3.5.4.tgz
 serefpolicy-3.5.5.tgz
 serefpolicy-3.5.6.tgz
+serefpolicy-3.5.7.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- sources	3 Sep 2008 20:16:35 -0000	1.161
+++ sources	8 Sep 2008 21:01:42 -0000	1.162
@@ -1 +1 @@
-3df6acf59f55a2b00b7757111baf474d  serefpolicy-3.5.6.tgz
+08cbc69d40ae75771c6201f2812a2eba  serefpolicy-3.5.7.tgz



From dwalsh at fedoraproject.org  Mon Sep  8 21:03:51 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  8 Sep 2008 21:03:51 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.389,
	1.390 policycoreutils.spec, 1.553, 1.554
Message-ID: <20080908210351.7FD0E7012B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30911

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Sep 8 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-5
- Add node support to semanage


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- policycoreutils-rhat.patch	8 Sep 2008 18:09:36 -0000	1.389
+++ policycoreutils-rhat.patch	8 Sep 2008 21:03:49 -0000	1.390
@@ -92,7 +92,7 @@
  }
 diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.55/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/semanage/semanage	2008-08-29 14:34:58.000000000 -0400
++++ policycoreutils-2.0.55/semanage/semanage	2008-09-08 14:46:57.000000000 -0400
 @@ -20,7 +20,7 @@
  #                                        02111-1307  USA
  #
@@ -102,25 +102,18 @@
  import seobject
  import selinux
  PROGNAME="policycoreutils"
-@@ -43,13 +43,14 @@
+@@ -43,7 +43,9 @@
  if __name__ == '__main__':
  
  	def usage(message = ""):
 -		print _("""
--semanage {boolean|login|user|port|interface|node|fcontext|translation} -{l|D} [-n]
 +               raise ValueError(_("""
 +semanage [ -S store ] -i [ input_file | - ]
 +
-+semanage {boolean|login|user|port|interface|fcontext|translation} -{l|D} [-n] 
+ semanage {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 translation -{a|d|m} [-T] level
- semanage boolean -{d|m} [--on|--off|-1|-0] -F boolean | boolean_file
-@@ -60,6 +61,7 @@
+@@ -60,6 +62,7 @@
  	-a, --add        Add a OBJECT record NAME
  	-d, --delete     Delete a OBJECT record NAME
  	-m, --modify     Modify a OBJECT record NAME
@@ -128,17 +121,7 @@
  	-l, --list       List the OBJECTS
  	-C, --locallist  List OBJECTS local customizations
  	-D, --deleteall  Remove all OBJECTS local customizations
-@@ -81,8 +83,7 @@
- 		-p (named pipe) 
- 
-         -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
-+	-p, --proto      Port protocol (tcp or udp)
- 	-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")
-@@ -91,9 +92,8 @@
+@@ -91,9 +94,8 @@
  	-s, --seuser     SELinux User Name
  	-t, --type       SELinux Type for the object
  	-r, --range      MLS/MCS Security Range (MLS/MCS Systems only)
@@ -150,18 +133,7 @@
  		
  	def errorExit(error):
  		sys.stderr.write("%s: " % sys.argv[0])
-@@ -111,9 +111,7 @@
- 		valid_option["port"] = []
- 		valid_option["port"] += valid_everyone + [ '-t', '--type', '-r', '--range', '-p', '--proto' ]
- 		valid_option["interface"] = []
--		valid_option["interface"] += valid_everyone + [ '-t', '--type', '-r', '--range']
--		valid_option["node"] = []
--		valid_option["node"] += valid_everyone + [ '-M', '--mask', '-t', '--type', '-r', '--range', '-p', '--protocol']
-+		valid_option["interface"] += valid_everyone + [ '-t', '--type', '-r', '--range'] 
- 		valid_option["fcontext"] = []
- 		valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser',  '-t', '--type', '-r', '--range'] 
- 		valid_option["translation"] = []
-@@ -124,16 +122,56 @@
+@@ -124,12 +126,53 @@
  		valid_option["permissive"] += [ '-a', '--add', '-d', '--delete', '-l', '--list', '-h', '--help', '-n', '--noheading', '-D', '--deleteall' ]
  		return valid_option
  
@@ -221,11 +193,7 @@
  		serange = ""
  		port = ""
  		proto = ""
--		mask = ""
- 		selevel = ""
- 		setype = ""
- 		ftype = ""
-@@ -151,24 +189,23 @@
+@@ -151,24 +194,23 @@
  		locallist = False
  		use_file = False
                  store = ""
@@ -243,7 +211,7 @@
  
  		gopts, cmds = getopt.getopt(args,
 -					    '01adf:lhmnp:s:FCDR:L:r:t:T:P:S:M:',
-+					    '01adf:i:lhmnp:s:FCDR:L:r:t:T:P:S:',
++					    '01adf:i:lhmnp:s:FCDR:L:r:t:T:P:S:M:',
  					    ['add',
  					     'delete',
  					     'deleteall',
@@ -254,17 +222,16 @@
  					     'list', 
  					     'modify',
  					     'noheading',
-@@ -183,8 +220,7 @@
- 					     'roles=',
+@@ -184,7 +226,7 @@
  					     'type=',
  					     'trans=',
--					     'prefix=',
+ 					     'prefix=',
 -                         'mask='
-+					     'prefix='
++                                             'mask='
  					     ])
  		for o, a in gopts:
  			if o not in option_dict[object]:
-@@ -193,16 +229,16 @@
+@@ -193,16 +235,16 @@
  		for o,a in gopts:
  			if o == "-a" or o == "--add":
  				if modify or delete:
@@ -284,7 +251,7 @@
  				deleteall = True
  			if o == "-f"  or o == "--ftype":
  				ftype=a
-@@ -211,7 +247,7 @@
+@@ -211,7 +253,7 @@
  				use_file = True
  
  			if o == "-h" or o == "--help":
@@ -293,7 +260,7 @@
  
  			if o == "-n" or o == "--noheading":
  				heading = False
-@@ -221,7 +257,7 @@
+@@ -221,7 +263,7 @@
  
  			if o == "-m"or o == "--modify":
  				if delete or add:
@@ -302,7 +269,7 @@
  				modify = True
  				
  			if o == "-S" or o == '--store':
-@@ -229,7 +265,7 @@
+@@ -229,7 +271,7 @@
  
  			if o == "-r" or o == '--range':
  				if is_mls_enabled == 0:
@@ -311,7 +278,7 @@
  				serange = a
  
  			if o == "-l" or o == "--list":
-@@ -237,7 +273,7 @@
+@@ -237,7 +279,7 @@
  
  			if o == "-L" or o == '--level':
  				if is_mls_enabled == 0:
@@ -320,27 +287,16 @@
  				selevel = a
  
  			if o == "-p" or o == '--proto':
-@@ -252,9 +288,6 @@
- 			if o == "-s" or o == "--seuser":
- 				seuser = a
- 
--			if o == "-M" or o == '--mask':
--				mask = a
--
- 			if o == "-t" or o == "--type":
- 				setype = a
+@@ -280,7 +322,7 @@
  
-@@ -277,9 +310,6 @@
- 		
- 		if object == "interface":
- 			OBJECT = seobject.interfaceRecords(store)
--
--		if object == "node":
--			OBJECT = seobject.nodeRecords(store)
- 		
+ 		if object == "node":
+ 			OBJECT = seobject.nodeRecords(store)
+-		
++
  		if object == "fcontext":
  			OBJECT = seobject.fcontextRecords(store)
-@@ -298,14 +328,14 @@
+ 		
+@@ -298,14 +340,14 @@
                                 OBJECT.list(heading, locallist, use_file)
  			else:
                                 OBJECT.list(heading, locallist)
@@ -358,7 +314,7 @@
                          
                  target = cmds[0]
  
-@@ -317,10 +347,7 @@
+@@ -317,10 +359,7 @@
  				OBJECT.add(target, setrans)
  
  			if object == "user":
@@ -370,15 +326,7 @@
  
  			if object == "port":
  				OBJECT.add(target, proto, serange, setype)
-@@ -328,15 +355,12 @@
- 			if object == "interface":
- 				OBJECT.add(target, serange, setype)
- 
--			if object == "node":
--				OBJECT.add(target, mask, proto, serange, setype)
--
- 			if object == "fcontext":
- 				OBJECT.add(target, setype, ftype, serange, seuser)
+@@ -336,7 +375,7 @@
  			if object == "permissive":
  				OBJECT.add(target)
  
@@ -387,13 +335,7 @@
  			
  		if modify:
  			if object == "boolean":
-@@ -358,13 +382,10 @@
- 			if object == "interface":
- 				OBJECT.modify(target, serange, setype)
- 
--			if object == "node":
--				OBJECT.modify(target, mask, proto, serange, setype)
--
+@@ -364,7 +403,7 @@
  			if object == "fcontext":
  				OBJECT.modify(target, setype, ftype, serange, seuser)
  
@@ -402,13 +344,7 @@
  
  		if delete:
  			if object == "port":
-@@ -373,22 +394,72 @@
- 			elif object == "fcontext":
- 				OBJECT.delete(target, ftype)
- 
--			elif object == "node":
--				OBJECT.delete(target, mask, proto)
--
+@@ -379,16 +418,69 @@
  			else:
  				OBJECT.delete(target)
  
@@ -483,39 +419,9 @@
  		errorExit(error.args[1])
 -	except KeyboardInterrupt, error:
 -		sys.exit(0)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.55/semanage/semanage.8
---- nsapolicycoreutils/semanage/semanage.8	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/semanage/semanage.8	2008-08-29 14:34:58.000000000 -0400
-@@ -3,7 +3,7 @@
- semanage \- SELinux Policy Management tool
- 
- .SH "SYNOPSIS"
--.B semanage {boolean|login|user|port|interface|node|fcontext|translation} \-{l|D} [\-n] [\-S store]
-+.B semanage {boolean|login|user|port|interface|fcontext|translation} \-{l|D} [\-n] [\-S store] 
- .br
- .B semanage boolean \-{d|m} [\-\-on|\-\-off|\-1|\-0] -F boolean | boolean_file
- .br
-@@ -15,8 +15,6 @@
- .br
- .B semanage interface \-{a|d|m} [\-tr] interface_spec
- .br
--.B semanage node -{a|d|m} [-tr] [ -p protocol ] [-M netmask] address
--.br
- .B semanage fcontext \-{a|d|m} [\-frst] file_spec
- .br
- .B semanage permissive \-{a|d} type
-@@ -80,7 +78,7 @@
- Do not print heading when listing OBJECTS.
- .TP
- .I                \-p, \-\-proto
--Protocol for the specified port (tcp|udp) or internet protocol version for the specified node (ipv4|ipv6).
-+Protocol for the specified port (tcp|udp).
- .TP
- .I                \-r, \-\-range      
- MLS/MCS Security Range (MLS/MCS Systems only)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.55/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/semanage/seobject.py	2008-08-29 14:34:58.000000000 -0400
++++ policycoreutils-2.0.55/semanage/seobject.py	2008-09-08 15:02:04.000000000 -0400
 @@ -26,7 +26,6 @@
  PROGNAME="policycoreutils"
  import sepolgen.module as module
@@ -1088,25 +994,30 @@
 -			(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)
--			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)
 +                if prefix == "" and len(roles) == 0  and serange == "" and selevel == "":
 +                       if is_mls_enabled == 1:
 +                              raise ValueError(_("Requires prefix, roles, level or range"))
 +                       else:
 +                              raise ValueError(_("Requires prefix or roles"))
  
--			(rc,u) = semanage_user_query(self.sh, k)
+-			(rc,exists) = semanage_user_exists(self.sh, k)
 -			if rc < 0:
--				raise ValueError(_("Could not query user for %s") % name)
+-				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,k) = semanage_user_key_create(self.sh, name)
 +                if rc < 0:
 +                       raise ValueError(_("Could not create a key for %s") % name)
  
+-			(rc,u) = semanage_user_query(self.sh, k)
+-			if rc < 0:
+-				raise ValueError(_("Could not query user for %s") % name)
++                (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)
+ 
 -			oldserange = semanage_user_get_mlsrange(u)
 -			(rc, rlist) = semanage_user_get_roles(self.sh, u)
 -			if rc >= 0:
@@ -1129,22 +1040,13 @@
 -                               for r in roles:
 -                                      if r not in rlist:
 -                                             semanage_user_add_role(self.sh, u, r)
-+                (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 = semanage_begin_transaction(self.sh)
--			if rc < 0:
--				raise ValueError(_("Could not start semanage transaction"))
 +                (rc,u) = semanage_user_query(self.sh, k)
 +                if rc < 0:
 +                       raise ValueError(_("Could not query user for %s") % name)
  
--			rc = semanage_user_modify_local(self.sh, k, u)
+-			rc = semanage_begin_transaction(self.sh)
 -			if rc < 0:
--				raise ValueError(_("Could not modify SELinux user %s") % name)
+-				raise ValueError(_("Could not start semanage transaction"))
 +                oldserange = semanage_user_get_mlsrange(u)
 +                (rc, rlist) = semanage_user_get_roles(self.sh, u)
 +                if rc >= 0:
@@ -1168,6 +1070,10 @@
 +                              if r not in rlist:
 +                                     semanage_user_add_role(self.sh, u, r)
  
+-			rc = semanage_user_modify_local(self.sh, k, u)
+-			if rc < 0:
+-				raise ValueError(_("Could not modify SELinux user %s") % name)
+-
 -			rc = semanage_commit(self.sh)
 -			if rc < 0:
 -				raise ValueError(_("Could not modify SELinux user %s") % name)
@@ -1372,236 +1278,101 @@
  	def get_all(self, locallist = 0):
  		ddict = {}
                  if locallist:
-@@ -1031,236 +1007,11 @@
- 				rec += ", %s" % p
- 			print rec
- 
--class nodeRecords(semanageRecords):
--       def __init__(self, store = ""):
--               semanageRecords.__init__(self,store)
--
+@@ -1035,7 +1011,7 @@
+        def __init__(self, store = ""):
+                semanageRecords.__init__(self,store)
+ 
 -       def add(self, addr, mask, proto, serange, ctype):
--               if addr == "":
--                       raise ValueError(_("Node Address is required"))
--
--               if mask == "":
--                       raise ValueError(_("Node Netmask is required"))
--
--	       if proto == "ipv4":
--                       proto = 0
--               elif proto == "ipv6":
--                       proto = 1
--               else:
--                      raise ValueError(_("Unknown or missing protocol"))
--
--
--               if is_mls_enabled == 1:
--                       if serange == "":
--                               serange = "s0"
--                       else:
--                               serange = untranslate(serange)
--
--               if ctype == "":
--                       raise ValueError(_("SELinux Type is required"))
--
--               (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)
--               if exists:
--                       raise ValueError(_("Addr %s already defined") % addr)
--
--               (rc,node) = semanage_node_create(self.sh)
--               if rc < 0:
--                       raise ValueError(_("Could not create addr for %s") % addr)
--
--               rc = semanage_node_set_addr(self.sh, node, proto, addr)
--               (rc, con) = semanage_context_create(self.sh)
--               if rc < 0:
--                       raise ValueError(_("Could not create context for %s") % addr)
--
--               rc = semanage_node_set_mask(self.sh, node, proto, mask)
--               if rc < 0:
--                       raise ValueError(_("Could not set mask for %s") % addr)
--
--
--               rc = semanage_context_set_user(self.sh, con, "system_u")
--               if rc < 0:
--                       raise ValueError(_("Could not set user in addr context for %s") % addr)
--
--               rc = semanage_context_set_role(self.sh, con, "object_r")
--               if rc < 0:
--                       raise ValueError(_("Could not set role in addr context for %s") % addr)
--
--               rc = semanage_context_set_type(self.sh, con, ctype)
--               if rc < 0:
--                       raise ValueError(_("Could not set type in addr context for %s") % addr)
--
--               if serange != "":
--                       rc = semanage_context_set_mls(self.sh, con, serange)
--                       if rc < 0:
--                               raise ValueError(_("Could not set mls fields in addr context for %s") % addr)
--
--               rc = semanage_node_set_con(self.sh, node, con)
--               if rc < 0:
--                       raise ValueError(_("Could not set addr context for %s") % addr)
--
++       def __add(self, addr, mask, proto, serange, ctype):
+                if addr == "":
+                        raise ValueError(_("Node Address is required"))
+ 
+@@ -1104,23 +1080,20 @@
+                if rc < 0:
+                        raise ValueError(_("Could not set addr context for %s") % addr)
+ 
 -               rc = semanage_begin_transaction(self.sh)
 -               if rc < 0:
 -                       raise ValueError(_("Could not start semanage transaction"))
 -
--               rc = semanage_node_modify_local(self.sh, k, node)
--               if rc < 0:
--                       raise ValueError(_("Could not add addr %s") % addr)
--
+                rc = semanage_node_modify_local(self.sh, k, node)
+                if rc < 0:
+                        raise ValueError(_("Could not add addr %s") % addr)
+ 
 -               rc = semanage_commit(self.sh)
 -               if rc < 0:
 -                       raise ValueError(_("Could not add addr %s") % addr)
 -
--               semanage_context_free(con)
--               semanage_node_key_free(k)
--               semanage_node_free(node)
--
+                semanage_context_free(con)
+                semanage_node_key_free(k)
+                semanage_node_free(node)
+ 
 -       def modify(self, addr, mask, proto, serange, setype):
--               if addr == "":
--                       raise ValueError(_("Node Address is required"))
--
--               if mask == "":
--                       raise ValueError(_("Node Netmask is required"))
--               if proto == "ipv4":
--                       proto = 0
--               elif proto == "ipv6":
--                       proto = 1
--	       else:
--		      raise ValueError(_("Unknown or missing protocol"))
--
--
--               if serange == "" and setype == "":
--                       raise ValueError(_("Requires setype or serange"))
--
--               (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)
--               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)
--               if rc < 0:
--                       raise ValueError(_("Could not query addr %s") % addr)
--
--               con = semanage_node_get_con(node)
--
--               if serange != "":
--                       semanage_context_set_mls(self.sh, con, untranslate(serange))
--               if setype != "":
--                       semanage_context_set_type(self.sh, con, setype)
--
++       def add(self, addr, mask, proto, serange, ctype):
++                self.begin()
++                self.__add(self, addr, mask, proto, serange, ctype)
++                self.commit()
++
++       def __modify(self, addr, mask, proto, serange, setype):
+                if addr == "":
+                        raise ValueError(_("Node Address is required"))
+ 
+@@ -1158,22 +1131,19 @@
+                if setype != "":
+                        semanage_context_set_type(self.sh, con, setype)
+ 
 -               rc = semanage_begin_transaction(self.sh)
 -               if rc < 0:
 -                       raise ValueError(_("Could not start semanage transaction"))
 -
--               rc = semanage_node_modify_local(self.sh, k, node)
--               if rc < 0:
--                       raise ValueError(_("Could not modify addr %s") % addr)
--
+                rc = semanage_node_modify_local(self.sh, k, node)
+                if rc < 0:
+                        raise ValueError(_("Could not modify addr %s") % addr)
+ 
 -               rc = semanage_commit(self.sh)
 -               if rc < 0:
 -                       raise ValueError(_("Could not modify addr %s") % addr)
 -
--               semanage_node_key_free(k)
--               semanage_node_free(node)
--
+                semanage_node_key_free(k)
+                semanage_node_free(node)
+ 
 -       def delete(self, addr, mask, proto):
--               if addr == "":
--                       raise ValueError(_("Node Address is required"))
--
--               if mask == "":
--                       raise ValueError(_("Node Netmask is required"))
--
--	       if proto == "ipv4":
--                       proto = 0
--               elif proto == "ipv6":
--                       proto = 1
--               else:
--                      raise ValueError(_("Unknown or missing protocol"))
--
--               (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)
--               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)
--               if rc < 0:
--                       raise ValueError(_("Could not check if addr %s is defined") % addr)
--               if not exists:
--                       raise ValueError(_("Addr %s is defined in policy, cannot be deleted") % addr)
--
++       def modify(self, addr, mask, proto, serange, setype):
++                self.begin()
++                self.__modify(addr, mask, proto, serange, setype)
++                self.commit()
++
++       def __delete(self, addr, mask, proto):
+                if addr == "":
+                        raise ValueError(_("Node Address is required"))
+ 
+@@ -1203,20 +1173,17 @@
+                if not exists:
+                        raise ValueError(_("Addr %s is defined in policy, cannot be deleted") % addr)
+ 
 -               rc = semanage_begin_transaction(self.sh)
 -               if rc < 0:
 -                       raise ValueError(_("Could not start semanage transaction"))
 -
--               rc = semanage_node_del_local(self.sh, k)
--               if rc < 0:
--                       raise ValueError(_("Could not delete addr %s") % addr)
--
+                rc = semanage_node_del_local(self.sh, k)
+                if rc < 0:
+                        raise ValueError(_("Could not delete addr %s") % addr)
+ 
 -               rc = semanage_commit(self.sh)
 -               if rc < 0:
 -                       raise ValueError(_("Could not delete addr %s") % addr)
 -
--               semanage_node_key_free(k)
--
--       def get_all(self, locallist = 0):
--               ddict = {}
--	       if locallist :
--			(rc, self.ilist) = semanage_node_list_local(self.sh)
--	       else:
--	                (rc, self.ilist) = semanage_node_list(self.sh)
--               if rc < 0:
--                       raise ValueError(_("Could not list addrs"))
--
--               for node in self.ilist:
--                       con = semanage_node_get_con(node)
--                       addr = semanage_node_get_addr(self.sh, node)
--                       mask = semanage_node_get_mask(self.sh, node)
--                       proto = semanage_node_get_proto(node)
--		       if proto == 0:
--				proto = "ipv4"
--		       elif proto == 1:
--				proto = "ipv6"
--                       ddict[(addr[1], mask[1], proto)] = (semanage_context_get_user(con), semanage_context_get_role(con), semanage_context_get_type(con), semanage_context_get_mls(con))
--
--               return ddict
--
--       def list(self, heading = 1, locallist = 0):
--               if heading:
--                       print "%-18s %-18s %-5s %-5s\n" % ("IP Address", "Netmask", "Protocol", "Context")
--               ddict = self.get_all(locallist)
--               keys = ddict.keys()
--               keys.sort()
--               if is_mls_enabled:
--			for k in keys:
--				val = ''
--				for fields in k:
--					val = val + '\t' + str(fields)
--                                print "%-18s %-18s %-5s %s:%s:%s:%s " % (k[0],k[1],k[2],ddict[k][0], ddict[k][1],ddict[k][2], translate(ddict[k][3], False))
--               else:
--                       for k in keys:
--                               print "%-18s %-18s %-5s %s:%s:%s " % (k[0],k[1],k[2],ddict[k][0], ddict[k][1],ddict[k][2])
--
--
- class interfaceRecords(semanageRecords):
+                semanage_node_key_free(k)
+ 
++       def delete(self, addr, mask, proto):
++              self.begin()
++              self.__delete(addr, mask, proto)
++              self.commit()
++		
+        def get_all(self, locallist = 0):
+                ddict = {}
+ 	       if locallist :
+@@ -1260,7 +1227,7 @@
  	def __init__(self, store = ""):
  		semanageRecords.__init__(self, store)
  
@@ -1610,7 +1381,7 @@
  		if is_mls_enabled == 1:
  			if serange == "":
  				serange = "s0"
-@@ -1314,23 +1065,20 @@
+@@ -1314,23 +1281,20 @@
  		if rc < 0:
  			raise ValueError(_("Could not set message context for %s") % interface)
  
@@ -1640,7 +1411,7 @@
  		if serange == "" and setype == "":
  			raise ValueError(_("Requires setype or serange"))
  
-@@ -1355,22 +1103,19 @@
+@@ -1355,22 +1319,19 @@
  		if setype != "":
  			semanage_context_set_type(self.sh, con, setype)
  
@@ -1669,7 +1440,7 @@
  		(rc,k) = semanage_iface_key_create(self.sh, interface)
  		if rc < 0:
  			raise ValueError(_("Could not create key for %s") % interface)
-@@ -1387,20 +1132,17 @@
+@@ -1387,20 +1348,17 @@
  		if not exists:
  			raise ValueError(_("Interface %s is defined in policy, cannot be deleted") % interface)
  
@@ -1695,7 +1466,7 @@
  	def get_all(self, locallist = 0):
  		ddict = {}
                  if locallist:
-@@ -1459,7 +1201,7 @@
+@@ -1459,7 +1417,7 @@
                 if target == "" or target.find("\n") >= 0:
                        raise ValueError(_("Invalid file specification"))
                        
@@ -1704,7 +1475,7 @@
                  self.validate(target)
  
  		if is_mls_enabled == 1:
-@@ -1500,24 +1242,22 @@
+@@ -1500,24 +1458,21 @@
  
  		semanage_fcontext_set_type(fcontext, file_types[ftype])
  
@@ -1726,7 +1497,6 @@
  		semanage_fcontext_free(fcontext)
  
 -	def modify(self, target, setype, ftype, serange, seuser):
-+
 +	def add(self, target, type, ftype = "", serange = "", seuser = "system_u"):
 +                self.begin()
 +                self.__add(target, type, ftype, serange, seuser)
@@ -1736,7 +1506,7 @@
  		if serange == "" and setype == "" and seuser == "":
  			raise ValueError(_("Requires setype, serange or seuser"))
                  self.validate(target)
-@@ -1558,29 +1298,25 @@
+@@ -1558,29 +1513,25 @@
                         if rc < 0:
                                raise ValueError(_("Could not set file context for %s") % target)
                         
@@ -1773,7 +1543,7 @@
  
  		for fcontext in flist:
                         target = semanage_fcontext_get_expr(fcontext)
-@@ -1595,11 +1331,9 @@
+@@ -1595,11 +1546,9 @@
                                raise ValueError(_("Could not delete the file context %s") % target)
                         semanage_fcontext_key_free(k)
  	
@@ -1787,7 +1557,7 @@
  		(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)
-@@ -1616,20 +1350,17 @@
+@@ -1616,20 +1565,17 @@
  			else:
  				raise ValueError(_("File context for %s is not defined") % target)
  
@@ -1813,7 +1583,7 @@
  	def get_all(self, locallist = 0):
  		l = []
                  if locallist:
-@@ -1711,9 +1442,8 @@
+@@ -1711,9 +1657,8 @@
  
  	def modify(self, name, value=None, use_file=False):
                  
@@ -1825,7 +1595,7 @@
                  if use_file:
                         fd = open(name)
                         for b in fd.read().split("\n"):
-@@ -1723,18 +1453,16 @@
+@@ -1723,18 +1668,16 @@
  
                                try:
                                       boolname, val = b.split("=")
@@ -1847,7 +1617,7 @@
  
                  (rc,k) = semanage_bool_key_create(self.sh, name)
                  if rc < 0:
-@@ -1751,42 +1479,30 @@
+@@ -1751,42 +1694,30 @@
  		if not exists:
  			raise ValueError(_("Boolean %s is defined in policy, cannot be deleted") % name)
  


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -r1.553 -r1.554
--- policycoreutils.spec	8 Sep 2008 18:09:38 -0000	1.553
+++ policycoreutils.spec	8 Sep 2008 21:03:51 -0000	1.554
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.55
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Mon Sep 8 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-5
+- Add node support to semanage
+
 * Mon Sep 8 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-4
 - Fix fixfiles to correct unlabeled_t files and remove .? files
 



From kevin at fedoraproject.org  Mon Sep  8 21:11:41 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 21:11:41 +0000 (UTC)
Subject: rpms/munin/F-9 sources, 1.3, 1.4 .cvsignore, 1.3, 1.4 munin.spec,
	1.14, 1.15
Message-ID: <20080908211141.8C6A8700FD@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32535

Modified Files:
	sources .cvsignore munin.spec 
Log Message:
Move Munin/Plugin.pm to the node subpackage (fixes #457403)
Apply postfix patch (fixes #454159)
Add perl version dep and remove unneeded perl-HTML-Template (fixes #453923)
Upgrade to 1.2.6



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/munin/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Oct 2006 21:48:04 -0000	1.3
+++ sources	8 Sep 2008 21:11:11 -0000	1.4
@@ -1 +1 @@
-e863d11693c02bde1c593a6c701e64fd  munin_1.2.5.tar.gz
+45f84d58f80642ce914f147232f0d396  munin_1.2.6.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/munin/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Oct 2006 21:48:04 -0000	1.3
+++ .cvsignore	8 Sep 2008 21:11:11 -0000	1.4
@@ -1 +1 @@
-munin_1.2.5.tar.gz
+munin_1.2.6.tar.gz


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/F-9/munin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- munin.spec	20 May 2008 18:17:44 -0000	1.14
+++ munin.spec	8 Sep 2008 21:11:11 -0000	1.15
@@ -1,6 +1,6 @@
 Name:      munin
-Version:   1.2.5
-Release:   5%{?dist}
+Version:   1.2.6
+Release:   3%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -14,16 +14,17 @@
 Source3: munin-node.logrotate
 Source4: munin.logrotate
 Source5: nf_conntrack
-Patch0: munin-1.2.4-cron.patch
+Source6: munin-1.2.6-postfix-config
 Patch1: munin-1.2.4-conf.patch
 Patch2: munin-1.2.5-nf-conntrack.patch
 Patch3: munin-1.2.5-amp-degree.patch
+Patch4: munin-1.2.6-ntp_offset.patch
 BuildArchitectures: noarch
-Requires: perl-HTML-Template
 Requires: perl-Net-Server perl-Net-SNMP
 Requires: rrdtool
 Requires: logrotate
 Requires(pre): shadow-utils
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Munin is a highly flexible and powerful solution used to create graphs of
@@ -49,6 +50,7 @@
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description node
 Munin is a highly flexible and powerful solution used to create graphs of
@@ -73,10 +75,10 @@
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 
@@ -137,6 +139,13 @@
 install -m 0644 %{SOURCE4} %{buildroot}/etc/logrotate.d/munin
 # install config for nf_conntrack
 install -m 0644 %{SOURCE5} %{buildroot}/etc/munin/plugin-conf.d/nf_conntrack
+# install config for postfix under fedora
+install -m 0644 %{SOURCE6} %{buildroot}/etc/munin/plugin-conf.d/postfix
+
+# fix MUNIN_LIBDIR issue. 
+sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/ps_
+sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/multips
+sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/df_abs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -153,7 +162,7 @@
 
 %post node
 /sbin/chkconfig --add munin-node
-/usr/sbin/munin-node-configure --shell | sh
+/usr/sbin/munin-node-configure --shell 2> /dev/null | sh >& /dev/null || :
 
 %preun node
 test "$1" != 0 || %{_initrddir}/munin-node stop &>/dev/null || :
@@ -173,6 +182,7 @@
 %defattr(-, root, root)
 %doc %{_docdir}/%{name}-%{version}/
 %{_bindir}/munin-cron
+%{_bindir}/munindoc
 %dir %{_datadir}/munin
 %{_datadir}/munin/munin-graph
 %{_datadir}/munin/munin-html
@@ -180,6 +190,7 @@
 %{_datadir}/munin/munin-update
 %{_datadir}/munin/VeraMono.ttf
 %{perl_vendorlib}/Munin.pm
+%dir %{perl_vendorlib}/Munin
 /var/www/html/munin/cgi/munin-cgi-graph
 %dir /etc/munin/templates
 %dir /etc/munin
@@ -209,7 +220,9 @@
 %config(noreplace) /etc/munin/plugin-conf.d/sendmail
 %config(noreplace) /etc/munin/plugin-conf.d/hddtemp_smartctl
 %config(noreplace) /etc/munin/plugin-conf.d/nf_conntrack
+%config(noreplace) /etc/munin/plugin-conf.d/postfix
 %config(noreplace) /etc/logrotate.d/munin-node
+%{perl_vendorlib}/Munin/Plugin.pm
 /etc/rc.d/init.d/munin-node
 %{_sbindir}/munin-run
 %{_sbindir}/munin-node
@@ -228,6 +241,16 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Mon Aug 11 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.6-3
+- Move Munin/Plugin.pm to the node subpackage (fixes #457403)
+
+* Sat Jul 12 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.6-2
+- Apply postfix patch (fixes #454159)
+- Add perl version dep and remove unneeded perl-HTML-Template (fixes #453923)
+
+* Fri Jun 20 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.6-1
+- Upgrade to 1.2.6
+
 * Tue May 20 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.5-5
 - Rebuild for new perl
 



From spot at fedoraproject.org  Mon Sep  8 21:13:40 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 21:13:40 +0000 (UTC)
Subject: rpms/tinyfugue/devel tinyfugue.spec,1.8,1.9
Message-ID: <20080908211340.D31E6700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tinyfugue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv476

Modified Files:
	tinyfugue.spec 
Log Message:
fix license tag


Index: tinyfugue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tinyfugue/devel/tinyfugue.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tinyfugue.spec	19 Feb 2008 23:34:36 -0000	1.8
+++ tinyfugue.spec	8 Sep 2008 21:13:10 -0000	1.9
@@ -2,11 +2,11 @@
 
 Name:    tinyfugue
 Version: 5.0
-Release: 0.8.b8%{?dist}
+Release: 0.9.b8%{?dist}
 Summary: A MU* client
 
 Group:   Applications/Internet
-License: GPL
+License: GPLv2+
 URL:     http://tinyfugue.sourceforge.net/
 Source:  http://dl.sourceforge.net/tinyfugue/tf-%{packageversion}.tar.gz
 Patch0:  tf-50b7.build.patch
@@ -47,6 +47,9 @@
 %{_mandir}/man1/tf.1*
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.0-0.9.b8
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 5.0-0.8.b8
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Mon Sep  8 21:14:41 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 21:14:41 +0000 (UTC)
Subject: rpms/tinyca2/devel tinyca2.spec,1.2,1.3
Message-ID: <20080908211441.A103A700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tinyca2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv824

Modified Files:
	tinyca2.spec 
Log Message:
fix licensing


Index: tinyca2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tinyca2/devel/tinyca2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyca2.spec	12 Nov 2006 11:45:53 -0000	1.2
+++ tinyca2.spec	8 Sep 2008 21:14:11 -0000	1.3
@@ -4,11 +4,11 @@
 
 Name:		tinyca2
 Version:	0.7.5
-Release:	%release_func 3
+Release:	%release_func 4
 Summary:	Simple graphical userinterface to manage a small CA
 
 Group:		Applications/Productivity
-License:	GPL
+License:	GPLv2+
 URL:		http://tinyca.sm-zone.net/
 Source0:	http://tinyca.sm-zone.net/%name-%version.tar.bz2
 BuildRoot:	%_tmppath/%name-%version-%release-root
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.7.5-4
+- fix license tag
+
 * Sun Nov 12 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.7.5-3
 - initial Fedora package (review #213600)
 - removed the 'X-Fedora' category from the desktop file



From cweyl at fedoraproject.org  Mon Sep  8 21:15:07 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 21:15:07 +0000 (UTC)
Subject: rpms/perl-Class-Method-Modifiers/devel
	perl-Class-Method-Modifiers.spec, 1.2, 1.3
Message-ID: <20080908211507.1D450700FD@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-Method-Modifiers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv987

Modified Files:
	perl-Class-Method-Modifiers.spec 
Log Message:
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.01-3
- remove MM version qualifier (F-8's is older)



Index: perl-Class-Method-Modifiers.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Method-Modifiers/devel/perl-Class-Method-Modifiers.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-Method-Modifiers.spec	8 Sep 2008 18:34:51 -0000	1.2
+++ perl-Class-Method-Modifiers.spec	8 Sep 2008 21:14:36 -0000	1.3
@@ -1,7 +1,7 @@
 
 Name:       perl-Class-Method-Modifiers 
 Version:    1.01 
-Release:        2%{?dist}
+Release:    3%{?dist}
 License:    GPL+ or Artistic
 Group:      Development/Libraries
 Summary:    Provides Moose-like method modifiers 
@@ -11,7 +11,7 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 
-BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
+BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(MRO::Compat)
 # testing
 BuildRequires: perl(Test::Exception)
@@ -65,6 +65,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.01-3
+- remove MM version qualifier (F-8's is older)
+
 * Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.01-2
 - bump
 



From spot at fedoraproject.org  Mon Sep  8 21:16:42 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 21:16:42 +0000 (UTC)
Subject: rpms/tkcvs/devel tkcvs.spec,1.22,1.23
Message-ID: <20080908211642.1AA96700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tkcvs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1438

Modified Files:
	tkcvs.spec 
Log Message:
fix license tag


Index: tkcvs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tkcvs/devel/tkcvs.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- tkcvs.spec	24 Nov 2007 13:04:01 -0000	1.22
+++ tkcvs.spec	8 Sep 2008 21:16:11 -0000	1.23
@@ -1,11 +1,12 @@
 Name:		tkcvs
 Version:	8.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	TkCVS and TkDiff
 
 Group:		Development/Tools
-License:	GPL
+# No version specified.
+License:	GPL+
 URL:		http://www.twobarleycorns.net/tkcvs.html
 Source:		http://www.twobarleycorns.net/tkcvs_8_1.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -70,6 +71,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 8.1-2
+- fix license tag
+
 * Sat Nov 24 2007 Gerard Milmeister <gemi at bluewin.ch> - 8.1-1
 - new release 8.1
 



From kevin at fedoraproject.org  Mon Sep  8 21:17:11 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 21:17:11 +0000 (UTC)
Subject: rpms/munin/F-9 munin-1.2.6-ntp_offset.patch, NONE,
	1.1 munin-1.2.6-postfix-config, NONE, 1.1
Message-ID: <20080908211711.9A0EE700FD@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1765

Added Files:
	munin-1.2.6-ntp_offset.patch munin-1.2.6-postfix-config 
Log Message:
Add patches


munin-1.2.6-ntp_offset.patch:

--- NEW FILE munin-1.2.6-ntp_offset.patch ---
diff -Nur munin-1.2.6.orig/node/node.d/ntp_offset.in munin-1.2.6/node/node.d/ntp_offset.in
--- munin-1.2.6.orig/node/node.d/ntp_offset.in	2008-01-27 11:17:17.000000000 -0700
+++ munin-1.2.6/node/node.d/ntp_offset.in	2008-06-25 12:52:05.000000000 -0600
@@ -1,4 +1,4 @@
-#!@@GOODSH@@ -w
+#!@@GOODSH@@
 # -*- sh -*-
 #
 # Plugin to monitor NTP time offset.


--- NEW FILE munin-1.2.6-postfix-config ---
[postfix*]
user root
env.logfile maillog
env.logdir /var/log



From spot at fedoraproject.org  Mon Sep  8 21:19:45 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 21:19:45 +0000 (UTC)
Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.61,1.62
Message-ID: <20080908211945.334E4700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tog-pegasus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2181

Modified Files:
	tog-pegasus.spec 
Log Message:
fix licensing


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- tog-pegasus.spec	15 Jul 2008 12:37:43 -0000	1.61
+++ tog-pegasus.spec	8 Sep 2008 21:19:14 -0000	1.62
@@ -43,7 +43,7 @@
 %define _default_patch_fuzz 2
 
 Version: 		2.7.1
-Release: 		1%{?dist}
+Release: 		2%{?dist}
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -51,7 +51,7 @@
 Group:     		Systems Management/Base
 URL:       		http://www.openpegasus.org
 #
-License:   		Open Group Pegasus Open Source
+License:   		MIT
 #
 BuildRoot: 		%{_tmppath}/%{name}-%{version}-%{release}-%{_target_cpu}-%(%{__id} -u -n)
 #
@@ -448,6 +448,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:2.7.1-2
+- fix license tag
+
 * Tue Jul 15 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 2:2.7.1-1
 - Update to upstream version 2.7.1
 - Fix setElementAt() doesn't copy value of CMPI_char parameter



From spot at fedoraproject.org  Mon Sep  8 21:21:44 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 21:21:44 +0000 (UTC)
Subject: rpms/tomboy/devel tomboy.spec,1.85,1.86
Message-ID: <20080908212144.46537700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2625

Modified Files:
	tomboy.spec 
Log Message:
fix license tag


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- tomboy.spec	23 Aug 2008 05:06:01 -0000	1.85
+++ tomboy.spec	8 Sep 2008 21:21:13 -0000	1.86
@@ -1,11 +1,11 @@
 Name:           tomboy
 Version:        0.11.3
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix
 
 Group:          User Interface/Desktops
-License:        LGPL+ and GPLv2+ and MIT
-# Tomboy itself is LGPL+
+License:        LGPLv2+ and GPLv2+ and MIT
+# Tomboy itself is LGPLv2+
 # libtomboy contains GPL+ code
 # Mono.Addins is MIT
 URL:            http://www.beatniksoftware.com/tomboy/
@@ -119,6 +119,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.11.3-2
+- fix license tag
+
 * Sat Aug 23 2008 Matthias Clasen <mclasen at redhat.com> - 0.11.3-1 
 - Update to 0.11.3
 



From spot at fedoraproject.org  Mon Sep  8 21:23:23 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 21:23:23 +0000 (UTC)
Subject: rpms/tomoe/devel tomoe.spec,1.22,1.23
Message-ID: <20080908212323.A3095700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tomoe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3082

Modified Files:
	tomoe.spec 
Log Message:
fix license tag


Index: tomoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe/devel/tomoe.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- tomoe.spec	27 Feb 2008 09:10:59 -0000	1.22
+++ tomoe.spec	8 Sep 2008 21:22:53 -0000	1.23
@@ -3,11 +3,11 @@
 
 Name:           tomoe
 Version:        0.6.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Handwritten input system for Japanese and Chinese
 
 Group:          System Environment/Libraries
-License:        LGPL2+
+License:        LGPLv2+
 URL:            http://scim-imengine.sourceforge.jp/
 Source0:        http://downloads.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -96,6 +96,9 @@
 %endif
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.0-6
+- fix license tag
+
 * Wed Feb 27 2008 Jens Petersen <petersen at redhat.com> - 0.6.0-5
 - update license field from LGPL to LGPL2+
 



From spot at fedoraproject.org  Mon Sep  8 21:26:05 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 21:26:05 +0000 (UTC)
Subject: rpms/trac-git-plugin/devel trac-git-plugin.spec,1.4,1.5
Message-ID: <20080908212605.3CB53700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/trac-git-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3701

Modified Files:
	trac-git-plugin.spec 
Log Message:
fix license tag


Index: trac-git-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-git-plugin/devel/trac-git-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- trac-git-plugin.spec	17 May 2008 00:32:00 -0000	1.4
+++ trac-git-plugin.spec	8 Sep 2008 21:25:34 -0000	1.5
@@ -5,11 +5,11 @@
 
 Name:           trac-git-plugin
 Version:        0.0.1
-Release:        5.20070705svn%{svnrev}%{?dist}
+Release:        6.20070705svn%{svnrev}%{?dist}
 Summary:        GIT version control plugin for Trac
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2+
 URL:            http://trac-hacks.org/wiki/GitPlugin
 # Source comes from SVN right now: svn co -r %{svnrev} http://trac-hacks.org/svn/gitplugin; \
 #                                  cd gitplugin/0.10/; \
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.0.1-6.20070705svn1536
+- fix license tag
+
 * Fri May 16 2008 Jesse Keating <jkeating at redhat.com> - 0.0.1-5.20070705svn1536
 - Add patches from http://nanosleep.org/proj/trac-git-plugin
 



From spot at fedoraproject.org  Mon Sep  8 21:28:01 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 21:28:01 +0000 (UTC)
Subject: rpms/totem/devel totem.spec,1.198,1.199
Message-ID: <20080908212801.0885A700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3991

Modified Files:
	totem.spec 
Log Message:
fix license tag


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- totem.spec	1 Sep 2008 14:09:19 -0000	1.198
+++ totem.spec	8 Sep 2008 21:27:30 -0000	1.199
@@ -10,8 +10,8 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.23.91
-Release: 2%{?dist}
-License: GPLv2 with exception
+Release: 3%{?dist}
+License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/totem/
 Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/2.23/totem-%{version}.tar.bz2
@@ -412,6 +412,9 @@
 %endif
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.23.91-3
+- fix license tag
+
 * Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.91-2
 - Remove unneeded scrollkeeper BR (#460344)
 



From spot at fedoraproject.org  Mon Sep  8 21:30:27 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 21:30:27 +0000 (UTC)
Subject: rpms/trac-mercurial-plugin/devel trac-mercurial-plugin.spec, 1.2,
	1.3
Message-ID: <20080908213027.27660700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/trac-mercurial-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4413

Modified Files:
	trac-mercurial-plugin.spec 
Log Message:
fix license tag


Index: trac-mercurial-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-mercurial-plugin/devel/trac-mercurial-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trac-mercurial-plugin.spec	6 Jul 2007 03:26:29 -0000	1.2
+++ trac-mercurial-plugin.spec	8 Sep 2008 21:29:56 -0000	1.3
@@ -5,11 +5,12 @@
 
 Name:           trac-mercurial-plugin
 Version:        0.10.0.2
-Release:        3.20070705svn%{svnrev}%{?dist}
+Release:        4.20070705svn%{svnrev}%{?dist}
 Summary:        Mercurial plugin for Trac
 
 Group:          Applications/Internet
-License:        GPL
+# No version specified.
+License:        GPL+
 URL:            http://trac.edgewall.org/wiki/TracMercurial
 # Source comes from SVN right now: svn co -r %{svnrev} http://svn.edgewall.com/repos/trac/sandbox/mercurial-plugin/; \
 #                                  cd mercurial-plugin; \
@@ -54,6 +55,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10.0.2-4.20070705svn5798
+- fix license tag
+
 * Thu Jul 05 2007 Jesse Keating <jkeating at redhat.com> - 0.10.0.2-3.20070705svn5798
 - Require trac, python-setuptools as well
 



From kevin at fedoraproject.org  Mon Sep  8 21:36:42 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  8 Sep 2008 21:36:42 +0000 (UTC)
Subject: rpms/munin/F-8 munin-1.2.6-ntp_offset.patch, NONE,
	1.1 munin-1.2.6-postfix-config, NONE, 1.1 sources, 1.3,
	1.4 .cvsignore, 1.3, 1.4 munin.spec, 1.13, 1.14
Message-ID: <20080908213642.D068F700FD@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5560

Modified Files:
	sources .cvsignore munin.spec 
Added Files:
	munin-1.2.6-ntp_offset.patch munin-1.2.6-postfix-config 
Log Message:
Move Munin/Plugin.pm to the node subpackage (fixes #457403)
Apply postfix patch (fixes #454159)
Add perl version dep and remove unneeded perl-HTML-Template (fixes #453923)
Upgrade to 1.2.6


munin-1.2.6-ntp_offset.patch:

--- NEW FILE munin-1.2.6-ntp_offset.patch ---
diff -Nur munin-1.2.6.orig/node/node.d/ntp_offset.in munin-1.2.6/node/node.d/ntp_offset.in
--- munin-1.2.6.orig/node/node.d/ntp_offset.in	2008-01-27 11:17:17.000000000 -0700
+++ munin-1.2.6/node/node.d/ntp_offset.in	2008-06-25 12:52:05.000000000 -0600
@@ -1,4 +1,4 @@
-#!@@GOODSH@@ -w
+#!@@GOODSH@@
 # -*- sh -*-
 #
 # Plugin to monitor NTP time offset.


--- NEW FILE munin-1.2.6-postfix-config ---
[postfix*]
user root
env.logfile maillog
env.logdir /var/log


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/munin/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Oct 2006 21:48:04 -0000	1.3
+++ sources	8 Sep 2008 21:36:12 -0000	1.4
@@ -1 +1 @@
-e863d11693c02bde1c593a6c701e64fd  munin_1.2.5.tar.gz
+45f84d58f80642ce914f147232f0d396  munin_1.2.6.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/munin/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Oct 2006 21:48:04 -0000	1.3
+++ .cvsignore	8 Sep 2008 21:36:12 -0000	1.4
@@ -1 +1 @@
-munin_1.2.5.tar.gz
+munin_1.2.6.tar.gz


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/F-8/munin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- munin.spec	28 Dec 2007 18:38:48 -0000	1.13
+++ munin.spec	8 Sep 2008 21:36:12 -0000	1.14
@@ -1,6 +1,6 @@
 Name:      munin
-Version:   1.2.5
-Release:   4%{?dist}
+Version:   1.2.6
+Release:   3%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -14,16 +14,17 @@
 Source3: munin-node.logrotate
 Source4: munin.logrotate
 Source5: nf_conntrack
-Patch0: munin-1.2.4-cron.patch
+Source6: munin-1.2.6-postfix-config
 Patch1: munin-1.2.4-conf.patch
 Patch2: munin-1.2.5-nf-conntrack.patch
 Patch3: munin-1.2.5-amp-degree.patch
+Patch4: munin-1.2.6-ntp_offset.patch
 BuildArchitectures: noarch
-Requires: perl-HTML-Template
 Requires: perl-Net-Server perl-Net-SNMP
 Requires: rrdtool
 Requires: logrotate
 Requires(pre): shadow-utils
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Munin is a highly flexible and powerful solution used to create graphs of
@@ -49,6 +50,7 @@
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description node
 Munin is a highly flexible and powerful solution used to create graphs of
@@ -73,10 +75,10 @@
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 
@@ -137,6 +139,13 @@
 install -m 0644 %{SOURCE4} %{buildroot}/etc/logrotate.d/munin
 # install config for nf_conntrack
 install -m 0644 %{SOURCE5} %{buildroot}/etc/munin/plugin-conf.d/nf_conntrack
+# install config for postfix under fedora
+install -m 0644 %{SOURCE6} %{buildroot}/etc/munin/plugin-conf.d/postfix
+
+# fix MUNIN_LIBDIR issue. 
+sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/ps_
+sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/multips
+sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/df_abs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -153,7 +162,7 @@
 
 %post node
 /sbin/chkconfig --add munin-node
-/usr/sbin/munin-node-configure --shell | sh
+/usr/sbin/munin-node-configure --shell 2> /dev/null | sh >& /dev/null || :
 
 %preun node
 test "$1" != 0 || %{_initrddir}/munin-node stop &>/dev/null || :
@@ -173,6 +182,7 @@
 %defattr(-, root, root)
 %doc %{_docdir}/%{name}-%{version}/
 %{_bindir}/munin-cron
+%{_bindir}/munindoc
 %dir %{_datadir}/munin
 %{_datadir}/munin/munin-graph
 %{_datadir}/munin/munin-html
@@ -180,6 +190,7 @@
 %{_datadir}/munin/munin-update
 %{_datadir}/munin/VeraMono.ttf
 %{perl_vendorlib}/Munin.pm
+%dir %{perl_vendorlib}/Munin
 /var/www/html/munin/cgi/munin-cgi-graph
 %dir /etc/munin/templates
 %dir /etc/munin
@@ -209,7 +220,9 @@
 %config(noreplace) /etc/munin/plugin-conf.d/sendmail
 %config(noreplace) /etc/munin/plugin-conf.d/hddtemp_smartctl
 %config(noreplace) /etc/munin/plugin-conf.d/nf_conntrack
+%config(noreplace) /etc/munin/plugin-conf.d/postfix
 %config(noreplace) /etc/logrotate.d/munin-node
+%{perl_vendorlib}/Munin/Plugin.pm
 /etc/rc.d/init.d/munin-node
 %{_sbindir}/munin-run
 %{_sbindir}/munin-node
@@ -228,6 +241,19 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Mon Aug 11 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.6-3
+- Move Munin/Plugin.pm to the node subpackage (fixes #457403)
+
+* Sat Jul 12 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.6-2
+- Apply postfix patch (fixes #454159)
+- Add perl version dep and remove unneeded perl-HTML-Template (fixes #453923)
+
+* Fri Jun 20 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.6-1
+- Upgrade to 1.2.6
+
+* Tue May 20 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.5-5
+- Rebuild for new perl
+
 * Wed Dec 26 2007 Kevin Fenzi <kevin at tummy.com> - 1.2.5-4
 - Add patch to fix ampersand and degrees in plugins (fixes #376441)
 



From cweyl at fedoraproject.org  Mon Sep  8 21:40:59 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 21:40:59 +0000 (UTC)
Subject: rpms/perl-namespace-clean/devel import.log, NONE,
	1.1 perl-namespace-clean.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080908214059.ECB3E700FD@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-namespace-clean/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6593/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-namespace-clean.spec 
Log Message:
initial commit



--- NEW FILE import.log ---
perl-namespace-clean-0_08-1_fc9:HEAD:perl-namespace-clean-0.08-1.fc9.src.rpm:1220910024


--- NEW FILE perl-namespace-clean.spec ---

Name:       perl-namespace-clean 
Version:    0.08 
Release:    1%{?dist}
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Keep your namespace tidy 
Source:     http://search.cpan.org/CPAN/authors/id/P/PH/PHAYLON/namespace-clean-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/namespace-clean
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(FindBin)
BuildRequires: perl(Scope::Guard) >= 0.02
BuildRequires: perl(Symbol)
BuildRequires: perl(Test::More) >= 0.62

%description
When you define a function, or import one, into a Perl package, it will
naturally also be available as a method. This does not per se cause
problems, but it can complicate subclassing and, for example, plugin
classes that are included via multiple inheritance by loading them as
base classes.

The 'namespace::clean' pragma will remove all previously declared or
imported symbols at the end of the current package's compile cycle.
Functions called in the package itself will still be bound by their
name, but they won't show up as methods on your class or instances.

%prep
%setup -q -n namespace-clean-%{version}

# note we first filter out the bits in _docdir...
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} `perl -p -e 's|%{_docdir}/%{name}-%{version}\S+||'`
EOF

%define __perl_provides %{_builddir}/namespace-clean-%{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}/namespace-clean-%{version}/%{name}-req
chmod +x %{__perl_requires}



%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 t/ 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.08-1
- initial Fedora packaging
- generated with cpan2dist (CPANPLUS::Dist::Fedora version 0.0.1)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-namespace-clean/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 15:20:35 -0000	1.1
+++ .cvsignore	8 Sep 2008 21:40:29 -0000	1.2
@@ -0,0 +1 @@
+namespace-clean-0.08.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-namespace-clean/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 15:20:35 -0000	1.1
+++ sources	8 Sep 2008 21:40:29 -0000	1.2
@@ -0,0 +1 @@
+9dc350acfbcffe1434027928f3497925  namespace-clean-0.08.tar.gz



From spot at fedoraproject.org  Mon Sep  8 21:41:52 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 21:41:52 +0000 (UTC)
Subject: rpms/transmission/devel transmission.spec,1.25,1.26
Message-ID: <20080908214152.AA9B5700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/transmission/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6866

Modified Files:
	transmission.spec 
Log Message:
fix license tag


Index: transmission.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/devel/transmission.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- transmission.spec	24 Aug 2008 13:16:58 -0000	1.25
+++ transmission.spec	8 Sep 2008 21:41:22 -0000	1.26
@@ -1,11 +1,12 @@
 
 Name:           transmission
 Version:        1.33
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A lightweight GTK+ BitTorrent client
 
 Group:          Applications/Internet
-License:        MIT, GPLv2+
+# See COPYING. This licensing situation is... special.
+License:        MIT and GPLv2
 URL:            http://www.transmissionbt.com/
 Source0:        http://download.m0k.org/transmission/files/transmission-%{version}.tar.bz2
 Patch2:         transmission-1.11-copt.patch
@@ -72,6 +73,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.33-2
+- fix license tag
+
 * Sun Aug 24 2008 Denis Leroy <denis at poolshark.org> - 1.33-1
 - Update to upstream 1.33
 - Now dual-licensed



From spot at fedoraproject.org  Mon Sep  8 21:45:48 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 21:45:48 +0000 (UTC)
Subject: rpms/transfig/devel transfig.3.2.4-pstex.patch, 1.1,
	1.2 transfig.spec, 1.28, 1.29
Message-ID: <20080908214548.5BDD4700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/transfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7681

Modified Files:
	transfig.3.2.4-pstex.patch transfig.spec 
Log Message:
fix license tag

transfig.3.2.4-pstex.patch:

Index: transfig.3.2.4-pstex.patch
===================================================================
RCS file: /cvs/pkgs/rpms/transfig/devel/transfig.3.2.4-pstex.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- transfig.3.2.4-pstex.patch	16 May 2006 10:56:38 -0000	1.1
+++ transfig.3.2.4-pstex.patch	8 Sep 2008 21:45:17 -0000	1.2
@@ -1,6 +1,7 @@
---- transfig.3.2.4/transfig/mkfile.c.orig	2006-05-16 12:53:15.000000000 +0200
-+++ transfig.3.2.4/transfig/mkfile.c	2006-05-16 12:54:23.000000000 +0200
-@@ -132,13 +132,13 @@
+diff -up transfig.3.2.5/transfig/mkfile.c.BAD transfig.3.2.5/transfig/mkfile.c
+--- transfig.3.2.5/transfig/mkfile.c.BAD	2008-09-08 17:29:10.000000000 -0400
++++ transfig.3.2.5/transfig/mkfile.c	2008-09-08 17:29:50.000000000 -0400
+@@ -138,13 +138,13 @@ makefile(mk, altfonts, arg_list)
  
  		/*
  		 * The makefile for the pstex need to update two files.
@@ -16,5 +17,5 @@
 +		puttarget(mk, i, "tex", "ps");
 +		fprintf(mk, "\tfig2dev -L pstex_t -p %s.ps ", i);
  		putoptions(mk, altfonts, a->f, a->s, a->m, a->o, i, "tex");
- 		needps = 1;
+ 		needeps = 1;
  		break;


Index: transfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transfig/devel/transfig.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- transfig.spec	19 Feb 2008 10:10:33 -0000	1.28
+++ transfig.spec	8 Sep 2008 21:45:17 -0000	1.29
@@ -1,9 +1,9 @@
 Summary: A utility for converting FIG files (made by xfig) to other formats.
 Name: transfig
 Version: 3.2.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
-License: distributable
+License: MIT
 Group: Applications/Multimedia
 Source: ftp://www-epb.lbl.gov/xfig/%{name}.%{version}.tar.gz
 
@@ -67,6 +67,9 @@
 %{_datadir}/fig2dev
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.2.5-3
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:3.2.5-2
 - Autorebuild for GCC 4.3
 



From cweyl at fedoraproject.org  Mon Sep  8 21:49:16 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 21:49:16 +0000 (UTC)
Subject: rpms/perl-namespace-clean/devel perl-namespace-clean.spec,1.1,1.2
Message-ID: <20080908214916.36CCA700FD@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-namespace-clean/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8458

Modified Files:
	perl-namespace-clean.spec 
Log Message:
release bump


Index: perl-namespace-clean.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-namespace-clean/devel/perl-namespace-clean.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-namespace-clean.spec	8 Sep 2008 21:40:29 -0000	1.1
+++ perl-namespace-clean.spec	8 Sep 2008 21:48:45 -0000	1.2
@@ -1,7 +1,7 @@
 
 Name:       perl-namespace-clean 
 Version:    0.08 
-Release:    1%{?dist}
+Release:        2%{?dist}
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
 Summary:    Keep your namespace tidy 
@@ -77,6 +77,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.08-2
+- bump
+
 * Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.08-1
 - initial Fedora packaging
 - generated with cpan2dist (CPANPLUS::Dist::Fedora version 0.0.1)



From spot at fedoraproject.org  Mon Sep  8 21:49:38 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 21:49:38 +0000 (UTC)
Subject: rpms/tripwire/devel tripwire.spec,1.15,1.16
Message-ID: <20080908214938.E4F6F700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tripwire/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8539

Modified Files:
	tripwire.spec 
Log Message:
fix license tag


Index: tripwire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tripwire/devel/tripwire.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- tripwire.spec	12 Feb 2008 05:56:44 -0000	1.15
+++ tripwire.spec	8 Sep 2008 21:49:08 -0000	1.16
@@ -3,10 +3,10 @@
 
 Name:		tripwire
 Version:	2.4.1.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	IDS (Intrusion Detection System)
 
-License:	GPL
+License:	GPLv2+
 Group:		Applications/System
 Source0:	http://download.sourceforge.net/tripwire/%{name}-%{version}-src.tar.bz2
 Source1:	tripwire.cron.in
@@ -146,6 +146,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.1.2-6
+- fix license tag
+
 * Mon Feb 11 2008 Brandon Holbrook <fedora at theholbrooks.org> 2.4.1.2-5
 - Rebuild for gcc-4.3
 



From cweyl at fedoraproject.org  Mon Sep  8 21:49:57 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 21:49:57 +0000 (UTC)
Subject: rpms/perl-namespace-clean/F-8 import.log, NONE,
	1.1 perl-namespace-clean.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080908214957.90A4C700FD@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-namespace-clean/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8782

Modified Files:
	sources 
Added Files:
	import.log perl-namespace-clean.spec 
Log Message:
pseudo-branch of perl-namespace-clean to F-8


--- NEW FILE import.log ---
perl-namespace-clean-0_08-1_fc9:HEAD:perl-namespace-clean-0.08-1.fc9.src.rpm:1220910024


--- NEW FILE perl-namespace-clean.spec ---

Name:       perl-namespace-clean 
Version:    0.08 
Release:        2%{?dist}
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Keep your namespace tidy 
Source:     http://search.cpan.org/CPAN/authors/id/P/PH/PHAYLON/namespace-clean-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/namespace-clean
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(FindBin)
BuildRequires: perl(Scope::Guard) >= 0.02
BuildRequires: perl(Symbol)
BuildRequires: perl(Test::More) >= 0.62

%description
When you define a function, or import one, into a Perl package, it will
naturally also be available as a method. This does not per se cause
problems, but it can complicate subclassing and, for example, plugin
classes that are included via multiple inheritance by loading them as
base classes.

The 'namespace::clean' pragma will remove all previously declared or
imported symbols at the end of the current package's compile cycle.
Functions called in the package itself will still be bound by their
name, but they won't show up as methods on your class or instances.

%prep
%setup -q -n namespace-clean-%{version}

# note we first filter out the bits in _docdir...
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} `perl -p -e 's|%{_docdir}/%{name}-%{version}\S+||'`
EOF

%define __perl_provides %{_builddir}/namespace-clean-%{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}/namespace-clean-%{version}/%{name}-req
chmod +x %{__perl_requires}



%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 t/ 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.08-2
- bump

* Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.08-1
- initial Fedora packaging
- generated with cpan2dist (CPANPLUS::Dist::Fedora version 0.0.1)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-namespace-clean/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 15:20:35 -0000	1.1
+++ sources	8 Sep 2008 21:49:27 -0000	1.2
@@ -0,0 +1 @@
+9dc350acfbcffe1434027928f3497925  namespace-clean-0.08.tar.gz



From spot at fedoraproject.org  Mon Sep  8 21:55:41 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 21:55:41 +0000 (UTC)
Subject: rpms/ttmkfdir/devel ttmkfdir.spec,1.29,1.30
Message-ID: <20080908215541.C1F30700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ttmkfdir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9978

Modified Files:
	ttmkfdir.spec 
Log Message:
fix license tag


Index: ttmkfdir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ttmkfdir/devel/ttmkfdir.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ttmkfdir.spec	27 Feb 2008 02:39:49 -0000	1.29
+++ ttmkfdir.spec	8 Sep 2008 21:55:11 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: Utility to create fonts.scale files for truetype fonts
 Name: ttmkfdir
 Version: 3.0.9
-Release: 26%{?dist}
+Release: 27%{?dist}
 Source0: %{name}-%{version}.tar.bz2
 Patch: ttmkfdir-3.0.9-cpp.patch
 Patch1: ttmkfdir-3.0.9-zlib.patch
@@ -13,7 +13,8 @@
 Patch7: ttmkfdir-3.0.9-encoding-dir.patch
 Patch8: ttmkfdir-3.0.9-font-scale.patch
 Patch9: ttmkfdir-3.0.9-bug434301.patch
-License: GPL
+# Only licensing attribution is in README, no version.
+License: LGPLv2+
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: freetype-devel >= 2.0
@@ -58,6 +59,9 @@
 %{_bindir}/ttmkfdir
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.0.9-27
+- fix license tag
+
 * Wed Feb 27 2008 Lingning Zhang <lizhang at redhat.com> - 3.0.9-26
 - fix bug434301.
 



From cweyl at fedoraproject.org  Mon Sep  8 21:55:38 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 21:55:38 +0000 (UTC)
Subject: rpms/perl-namespace-clean/F-9 perl-namespace-clean.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20080908215538.74709700FD@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-namespace-clean/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9942

Modified Files:
	sources 
Added Files:
	perl-namespace-clean.spec 
Log Message:
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.08-2
- bump



--- NEW FILE perl-namespace-clean.spec ---

Name:       perl-namespace-clean 
Version:    0.08 
Release:        2%{?dist}
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Keep your namespace tidy 
Source:     http://search.cpan.org/CPAN/authors/id/P/PH/PHAYLON/namespace-clean-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/namespace-clean
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(FindBin)
BuildRequires: perl(Scope::Guard) >= 0.02
BuildRequires: perl(Symbol)
BuildRequires: perl(Test::More) >= 0.62

%description
When you define a function, or import one, into a Perl package, it will
naturally also be available as a method. This does not per se cause
problems, but it can complicate subclassing and, for example, plugin
classes that are included via multiple inheritance by loading them as
base classes.

The 'namespace::clean' pragma will remove all previously declared or
imported symbols at the end of the current package's compile cycle.
Functions called in the package itself will still be bound by their
name, but they won't show up as methods on your class or instances.

%prep
%setup -q -n namespace-clean-%{version}

# note we first filter out the bits in _docdir...
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} `perl -p -e 's|%{_docdir}/%{name}-%{version}\S+||'`
EOF

%define __perl_provides %{_builddir}/namespace-clean-%{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}/namespace-clean-%{version}/%{name}-req
chmod +x %{__perl_requires}



%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 t/ 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.08-2
- bump

* Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.08-1
- initial Fedora packaging
- generated with cpan2dist (CPANPLUS::Dist::Fedora version 0.0.1)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-namespace-clean/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 15:20:35 -0000	1.1
+++ sources	8 Sep 2008 21:55:07 -0000	1.2
@@ -0,0 +1 @@
+9dc350acfbcffe1434027928f3497925  namespace-clean-0.08.tar.gz



From spot at fedoraproject.org  Mon Sep  8 21:57:39 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 21:57:39 +0000 (UTC)
Subject: rpms/turba/devel turba.spec,1.7,1.8
Message-ID: <20080908215739.A1920700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/turba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10531

Modified Files:
	turba.spec 
Log Message:
fix license tag


Index: turba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/turba/devel/turba.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- turba.spec	22 Jun 2008 04:20:49 -0000	1.7
+++ turba.spec	8 Sep 2008 21:57:09 -0000	1.8
@@ -1,11 +1,11 @@
 Name: 		turba
 Version:	2.2.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The Horde contact management application
 
 Source0:	ftp://ftp.horde.org/pub/%{name}/tarballs/%{name}-h3-%{version}.tar.gz
 Group:		Applications/Internet
-License:	Apache Software License 1.0
+License:	GPL+ and LGPL+ and ASL 1.0
 URL:		http://www.horde.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -80,6 +80,9 @@
 %{_datadir}/horde/%{name}
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.2.1-2
+- fix license tag
+
 * Wed Jun 22 2008 Nigel Jones <dev at nigelj.com> - 2.2.1-1
 - New Upstream (2.2.1) - Mainly security related changes
 



From cweyl at fedoraproject.org  Mon Sep  8 21:57:53 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 21:57:53 +0000 (UTC)
Subject: rpms/perl-Tie-ToObject/devel import.log, NONE,
	1.1 perl-Tie-ToObject.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080908215753.098DA700FD@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Tie-ToObject/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10655/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Tie-ToObject.spec 
Log Message:
initial commit



--- NEW FILE import.log ---
perl-Tie-ToObject-0_03-1_fc9:HEAD:perl-Tie-ToObject-0.03-1.fc9.src.rpm:1220911037


--- NEW FILE perl-Tie-ToObject.spec ---

Name:       perl-Tie-ToObject 
Version:    0.03 
Release:    1%{?dist}
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Tie to an existing object 
Source:     http://search.cpan.org/CPAN/authors/id/N/NU/NUFFIN/Tie-ToObject-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Tie-ToObject
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(Scalar::Util)
# tests
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::use::ok)
BuildRequires: perl(Tie::RefHash)


%description
While the perldoc/tie manpage allows tying to an arbitrary object, the
class in question must support this in it's implementation of 'TIEHASH',
'TIEARRAY' or whatever.

This class provides a very tie constructor that simply returns the object
it was given as it's first argument.

This way side effects of calling '$object->TIEHASH' are avoided.

%prep
%setup -q -n Tie-ToObject-%{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 t/  
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
- initial Fedora packaging
- generated with cpan2dist (CPANPLUS::Dist::Fedora version 0.0.1)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Tie-ToObject/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 15:21:22 -0000	1.1
+++ .cvsignore	8 Sep 2008 21:57:22 -0000	1.2
@@ -0,0 +1 @@
+Tie-ToObject-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Tie-ToObject/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 15:21:22 -0000	1.1
+++ sources	8 Sep 2008 21:57:22 -0000	1.2
@@ -0,0 +1 @@
+b4f434992c286d531f26893c78541456  Tie-ToObject-0.03.tar.gz



From jwilson at fedoraproject.org  Mon Sep  8 21:58:09 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon,  8 Sep 2008 21:58:09 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.937, 1.938 linux-2.6-lirc.patch,
	1.14, 1.15
Message-ID: <20080908215809.58DAA700FD@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10742

Modified Files:
	kernel.spec linux-2.6-lirc.patch 
Log Message:
* Mon Sep 08 2008 Jarod Wilson <jarod at redhat.com>
- Dave's lirc patch merged for upstream submission



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.937
retrieving revision 1.938
diff -u -r1.937 -r1.938
--- kernel.spec	8 Sep 2008 00:35:14 -0000	1.937
+++ kernel.spec	8 Sep 2008 21:57:38 -0000	1.938
@@ -604,7 +604,6 @@
 Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch
 Patch1400: linux-2.6-smarter-relatime.patch
 Patch1515: linux-2.6-lirc.patch
-Patch1516: linux-2.6-fix-lirc-ppc64.patch
 
 # nouveau + drm fixes
 Patch1811: drm-modesetting-radeon.patch
@@ -1142,7 +1141,6 @@
 
 # http://www.lirc.org/
 ApplyPatch linux-2.6-lirc.patch
-ApplyPatch linux-2.6-fix-lirc-ppc64.patch
 
 ApplyPatch linux-2.6-e1000-ich9.patch
 
@@ -1746,6 +1744,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Sep 08 2008 Jarod Wilson <jarod at redhat.com>
+- Dave's lirc patch merged for upstream submission
+
 * Mon Sep 08 2008 Dave Airlie <airlied at redhat.com>
 - disable VGA bashing in radeon - make text reserve larger.
 

linux-2.6-lirc.patch:

Index: linux-2.6-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-lirc.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linux-2.6-lirc.patch	5 Sep 2008 05:02:59 -0000	1.14
+++ linux-2.6-lirc.patch	8 Sep 2008 21:57:38 -0000	1.15
@@ -1,9 +1,9 @@
 Linux Infrared Remote Control drivers
 
 Signed-off-by: Jarod Wilson <jarod at redhat.com>
+Signed-off-by: Janne Grunau <j at jannau.net>
 
 ---
-
  drivers/input/Kconfig                 |    2 +
  drivers/input/Makefile                |    2 +
  drivers/input/lirc/Kconfig            |  142 ++++
@@ -11,42 +11,70 @@
  drivers/input/lirc/commandir.c        |  982 +++++++++++++++++++++++
  drivers/input/lirc/commandir.h        |   68 ++
  drivers/input/lirc/lirc.h             |  103 +++
- drivers/input/lirc/lirc_atiusb.c      | 1313 +++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_atiusb.c      | 1321 +++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_bt829.c       |  388 +++++++++
- drivers/input/lirc/lirc_cmdir.c       |  600 ++++++++++++++
+ drivers/input/lirc/lirc_cmdir.c       |  596 ++++++++++++++
  drivers/input/lirc/lirc_cmdir.h       |   25 +
- drivers/input/lirc/lirc_dev.c         |  812 +++++++++++++++++++
+ drivers/input/lirc/lirc_dev.c         |  809 +++++++++++++++++++
  drivers/input/lirc/lirc_dev.h         |  262 ++++++
- drivers/input/lirc/lirc_i2c.c         |  643 +++++++++++++++
- drivers/input/lirc/lirc_igorplugusb.c |  611 ++++++++++++++
+ drivers/input/lirc/lirc_i2c.c         |  639 +++++++++++++++
+ drivers/input/lirc/lirc_igorplugusb.c |  619 +++++++++++++++
  drivers/input/lirc/lirc_imon.c        | 1280 ++++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_it87.c        | 1004 +++++++++++++++++++++++
+ drivers/input/lirc/lirc_it87.c        |  999 +++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 +++
- drivers/input/lirc/lirc_ite8709.c     |  548 +++++++++++++
- drivers/input/lirc/lirc_mceusb.c      |  884 +++++++++++++++++++++
- drivers/input/lirc/lirc_mceusb2.c     | 1117 ++++++++++++++++++++++++++
- drivers/input/lirc/lirc_parallel.c    |  732 +++++++++++++++++
+ drivers/input/lirc/lirc_ite8709.c     |  545 +++++++++++++
+ drivers/input/lirc/lirc_mceusb.c      |  890 +++++++++++++++++++++
+ drivers/input/lirc/lirc_mceusb2.c     | 1119 ++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_parallel.c    |  728 +++++++++++++++++
  drivers/input/lirc/lirc_parallel.h    |   26 +
- drivers/input/lirc/lirc_sasem.c       |  967 +++++++++++++++++++++++
- drivers/input/lirc/lirc_serial.c      | 1316 +++++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_sir.c         | 1306 ++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_sasem.c       |  969 +++++++++++++++++++++++
+ drivers/input/lirc/lirc_serial.c      | 1312 +++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_sir.c         | 1302 ++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_streamzap.c   |  795 +++++++++++++++++++
- drivers/input/lirc/lirc_ttusbir.c     |  394 ++++++++++
- drivers/input/lirc/lirc_zilog.c       | 1397 +++++++++++++++++++++++++++++++++
- 29 files changed, 17860 insertions(+), 0 deletions(-)
+ drivers/input/lirc/lirc_ttusbir.c     |  400 ++++++++++
+ drivers/input/lirc/lirc_zilog.c       | 1395 +++++++++++++++++++++++++++++++++
+ 29 files changed, 17859 insertions(+), 0 deletions(-)
+ create mode 100644 drivers/input/lirc/Kconfig
+ create mode 100644 drivers/input/lirc/Makefile
+ create mode 100644 drivers/input/lirc/commandir.c
+ create mode 100644 drivers/input/lirc/commandir.h
+ create mode 100644 drivers/input/lirc/lirc.h
+ create mode 100644 drivers/input/lirc/lirc_atiusb.c
+ create mode 100644 drivers/input/lirc/lirc_bt829.c
+ create mode 100644 drivers/input/lirc/lirc_cmdir.c
+ create mode 100644 drivers/input/lirc/lirc_cmdir.h
+ create mode 100644 drivers/input/lirc/lirc_dev.c
+ create mode 100644 drivers/input/lirc/lirc_dev.h
+ create mode 100644 drivers/input/lirc/lirc_i2c.c
+ create mode 100644 drivers/input/lirc/lirc_igorplugusb.c
+ create mode 100644 drivers/input/lirc/lirc_imon.c
+ create mode 100644 drivers/input/lirc/lirc_it87.c
+ create mode 100644 drivers/input/lirc/lirc_it87.h
+ create mode 100644 drivers/input/lirc/lirc_ite8709.c
+ create mode 100644 drivers/input/lirc/lirc_mceusb.c
+ create mode 100644 drivers/input/lirc/lirc_mceusb2.c
+ create mode 100644 drivers/input/lirc/lirc_parallel.c
+ create mode 100644 drivers/input/lirc/lirc_parallel.h
+ create mode 100644 drivers/input/lirc/lirc_sasem.c
+ create mode 100644 drivers/input/lirc/lirc_serial.c
+ create mode 100644 drivers/input/lirc/lirc_sir.c
+ create mode 100644 drivers/input/lirc/lirc_streamzap.c
+ create mode 100644 drivers/input/lirc/lirc_ttusbir.c
+ create mode 100644 drivers/input/lirc/lirc_zilog.c
 
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
-index 5f9d860..747633c 100644
+index 5f9d860..2ba0904 100644
 --- a/drivers/input/Kconfig
 +++ b/drivers/input/Kconfig
-@@ -182,5 +182,7 @@ source "drivers/input/gameport/Kconfig"
+@@ -170,6 +170,8 @@ source "drivers/input/tablet/Kconfig"
  
- endmenu
+ source "drivers/input/touchscreen/Kconfig"
  
 +source "drivers/input/lirc/Kconfig"
 +
- endmenu
+ source "drivers/input/misc/Kconfig"
  
+ endif
 diff --git a/drivers/input/Makefile b/drivers/input/Makefile
 index 98c4f9a..6a1049b 100644
 --- a/drivers/input/Makefile
@@ -59,7 +87,7 @@
 +obj-$(CONFIG_INPUT_LIRC)       += lirc/
 diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
 new file mode 100644
-index 0000000..44ad7cb
+index 0000000..2297792
 --- /dev/null
 +++ b/drivers/input/lirc/Kconfig
 @@ -0,0 +1,142 @@
@@ -79,34 +107,34 @@
 +
 +config LIRC_DEV
 +	tristate "LIRC device loadable module support"
-+	default m
++	default n
 +	help
 +	  LIRC device loadable module support, required for most LIRC drivers
 +
 +config LIRC_ATIUSB
 +	tristate "ATI RF USB Receiver support"
-+	default m
++	default n
 +	depends on LIRC_DEV
 +	help
 +	  Driver for the ATI USB RF remote receiver
 +
 +config LIRC_BT829
 +        tristate "BT829 based hardware"
-+	default m
++	default n
 +	depends on LIRC_DEV
 +	help
 +	  Driver for the IR interface on BT829-based hardware
 +
 +config LIRC_CMDIR
 +	tristate "CommandIR USB Transceiver"
-+	default m
++	default n
 +	depends on LIRC_DEV
 +	help
 +	  Driver for the CommandIR USB Transceiver
 +
 +config LIRC_I2C
 +	tristate "I2C Based IR Receivers"
-+	default m
++	default n
 +	depends on LIRC_DEV
 +	help
 +	  Driver for I2C-based IR receivers, such as those commonly
@@ -114,100 +142,100 @@
 +
 +config LIRC_IGORPLUGUSB
 +	tristate "Igor Cesko's USB IR Receiver"
-+	default m
++	default n
 +	depends on LIRC_DEV
 +	help
 +	  Driver for Igor Cesko's USB IR Receiver
 +
 +config LIRC_IMON
 +	tristate "Soundgraph IMON Receiver"
-+	default m
++	default n
 +	depends on LIRC_DEV
 +	help
 +	  Driver for the Soundgraph IMON IR Receiver
 +
 +config LIRC_IT87
 +	tristate "ITE IT87XX CIR Port Receiver"
-+	default m
++	default n
 +	depends on LIRC_DEV
 +	help
 +	  Driver for the ITE IT87xx IR Receiver
 +
 +config LIRC_ITE8709
 +	tristate "ITE8709 CIR Port Receiver"
-+	default m
-+	depends on LIRC_DEV
++	default n
++	depends on LIRC_DEV && PNP
 +	help
 +	  Driver for the ITE8709 IR Receiver
 +
 +config LIRC_MCEUSB
 +	tristate "Microsoft Media Center Ed. Receiver, v1"
-+	default m
++	default n
 +	depends on LIRC_DEV
 +	help
 +	  Driver for the Microsoft Media Center Ed. Receiver, v1
 +
 +config LIRC_MCEUSB2
 +	tristate "Microsoft Media Center Ed. Receiver, v2"
-+	default m
++	default n
 +	depends on LIRC_DEV
 +	help
 +	  Driver for the Microsoft Media Center Ed. Receiver, v2
 +
-+config LIRC_ZILOG
-+	tristate "Zilog/Hauppauge IR Transmitter"
-+	default m
-+	depends on LIRC_DEV
-+	help
-+	  Driver for the Zilog/Hauppauge IR Transmitter, found on
-+	  PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards
-+
 +config LIRC_PARALLEL
 +	tristate "Homebrew Parallel Port Receiver"
-+	default m
++	default n
 +	depends on LIRC_DEV && !SMP
 +	help
 +	  Driver for Homebrew Parallel Port Receivers
 +
 +config LIRC_SASEM
 +	tristate "Sasem USB IR Remote"
-+	default m
++	default n
 +	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"
-+	default m
++	default n
 +	depends on LIRC_DEV
 +	help
 +	  Driver for Homebrew Serial Port Receivers
 +
 +config LIRC_SIR
 +	tristate "Built-in SIR IrDA port"
-+	default m
++	default n
 +	depends on LIRC_DEV
 +	help
 +	  Driver for the SIR IrDA port
 +
 +config LIRC_STREAMZAP
 +	tristate "Streamzap PC Receiver"
-+	default m
++	default n
 +	depends on LIRC_DEV
 +	help
 +	  Driver for the Streamzap PC Receiver
 +
 +config LIRC_TTUSBIR
 +	tristate "Technotrend USB IR Receiver"
-+	default m
++	default n
 +	depends on LIRC_DEV
 +	help
 +	  Driver for the Technotrend USB IR Receiver
 +
++config LIRC_ZILOG
++	tristate "Zilog/Hauppauge IR Transmitter"
++	default n
++	depends on LIRC_DEV
++	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..506285d
+index 0000000..044ea8e
 --- /dev/null
 +++ b/drivers/input/lirc/Makefile
 @@ -0,0 +1,25 @@
@@ -229,13 +257,13 @@
 +obj-$(CONFIG_LIRC_ITE8709)	+= lirc_ite8709.o
 +obj-$(CONFIG_LIRC_MCEUSB)	+= lirc_mceusb.o
 +obj-$(CONFIG_LIRC_MCEUSB2)	+= lirc_mceusb2.o
-+obj-$(CONFIG_LIRC_ZILOG)	+= lirc_zilog.o
 +obj-$(CONFIG_LIRC_PARALLEL)	+= lirc_parallel.o
 +obj-$(CONFIG_LIRC_SASEM)	+= lirc_sasem.o
 +obj-$(CONFIG_LIRC_SERIAL)	+= lirc_serial.o
 +obj-$(CONFIG_LIRC_SIR)		+= lirc_sir.o
 +obj-$(CONFIG_LIRC_STREAMZAP)	+= lirc_streamzap.o
 +obj-$(CONFIG_LIRC_TTUSBIR)	+= lirc_ttusbir.o
++obj-$(CONFIG_LIRC_ZILOG)	+= lirc_zilog.o
 diff --git a/drivers/input/lirc/commandir.c b/drivers/input/lirc/commandir.c
 new file mode 100644
 index 0000000..a05b0d6
@@ -1409,10 +1437,10 @@
 +#endif
 diff --git a/drivers/input/lirc/lirc_atiusb.c b/drivers/input/lirc/lirc_atiusb.c
 new file mode 100644
-index 0000000..b533000
+index 0000000..0e07204
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_atiusb.c
-@@ -0,0 +1,1313 @@
+@@ -0,0 +1,1321 @@
 +/* lirc_atiusb - USB remote support for LIRC
 + * (currently only supports X10 USB remotes)
 + * (supports ATI Remote Wonder and ATI Remote Wonder II, too)
@@ -1471,7 +1499,7 @@
 +#include "lirc.h"
 +#include "lirc_dev.h"
 +
-+#define DRIVER_VERSION		"$Revision$"
++#define DRIVER_VERSION		"1.71"
 +#define DRIVER_AUTHOR		"Paul Miller <pmiller9 at users.sourceforge.net>"
 +#define DRIVER_DESC		"USB remote driver for LIRC"
 +#define DRIVER_NAME		"lirc_atiusb"
@@ -2649,10 +2677,11 @@
 +	printk(KERN_INFO "\n" DRIVER_NAME ": " DRIVER_DESC " "
 +	       DRIVER_VERSION "\n");
 +	printk(DRIVER_NAME ": " DRIVER_AUTHOR "\n");
-+	dprintk(DRIVER_NAME ": debug mode enabled: "
-+		"$Id$\n");
++	dprintk(DRIVER_NAME ": debug mode enabled\n");
 +
++#ifdef MODULE
 +	request_module("lirc_dev");
++#endif
 +
 +	repeat_jiffies = repeat*HZ/100;
 +
@@ -2670,6 +2699,7 @@
 +	usb_deregister(&usb_remote_driver);
 +}
 +
++#ifdef MODULE
 +module_init(usb_remote_init);
 +module_exit(usb_remote_exit);
 +
@@ -2726,6 +2756,12 @@
 +module_param(mgradient, int, 0644);
 +MODULE_PARM_DESC(mgradient, "rw2 mouse: 1000*gradient from E to NE (default: "
 +		 "500 => .5 => ~27 degrees)");
++
++#else /* not MODULE */
++subsys_initcall(usb_remote_init);
++
++#endif /* MODULE */
++
 diff --git a/drivers/input/lirc/lirc_bt829.c b/drivers/input/lirc/lirc_bt829.c
 new file mode 100644
 index 0000000..01cbdfe
@@ -3122,10 +3158,10 @@
 + */
 diff --git a/drivers/input/lirc/lirc_cmdir.c b/drivers/input/lirc/lirc_cmdir.c
 new file mode 100644
-index 0000000..3ef3978
+index 0000000..1faa8e3
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_cmdir.c
-@@ -0,0 +1,600 @@
+@@ -0,0 +1,596 @@
 +/*
 + * lirc_cmdir.c - Driver for InnovationOne's COMMANDIR USB Transceiver
 + *
@@ -3150,10 +3186,6 @@
 + */
 +
 +
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
 +#include <linux/version.h>
 +
 +#include <linux/autoconf.h>
@@ -3759,10 +3791,10 @@
 +#endif
 diff --git a/drivers/input/lirc/lirc_dev.c b/drivers/input/lirc/lirc_dev.c
 new file mode 100644
-index 0000000..5ccb08e
+index 0000000..c8f325c
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_dev.c
-@@ -0,0 +1,812 @@
+@@ -0,0 +1,809 @@
 +/*
 + * LIRC base driver
 + *
@@ -3784,10 +3816,6 @@
 + *
 + */
 +
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
 +#include <linux/version.h>
 +
 +#include <linux/autoconf.h>
@@ -4535,8 +4563,6 @@
 +
 +/* ---------------------------------------------------------------------- */
 +
-+/* For now dont try to use it as a static version !  */
-+
 +#ifdef MODULE
 +
 +/*
@@ -4566,6 +4592,9 @@
 +module_param(debug, bool, 0644);
 +MODULE_PARM_DESC(debug, "Enable debugging messages");
 +
++#else /* not a MODULE */
++subsys_initcall(lirc_dev_init);
++
 +#endif /* MODULE */
 +
 +/*
@@ -4845,10 +4874,10 @@
 +#endif
 diff --git a/drivers/input/lirc/lirc_i2c.c b/drivers/input/lirc/lirc_i2c.c
 new file mode 100644
-index 0000000..5fd569e
+index 0000000..4714641
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_i2c.c
-@@ -0,0 +1,643 @@
+@@ -0,0 +1,639 @@
 +/*
 + * i2c IR lirc plugin for Hauppauge and Pixelview cards - new 2.3.x i2c stack
 + *
@@ -4886,10 +4915,6 @@
 + */
 +
 +
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
 +#include <linux/version.h>
 +#include <linux/module.h>
 +#include <linux/kmod.h>
@@ -5494,10 +5519,10 @@
 + */
 diff --git a/drivers/input/lirc/lirc_igorplugusb.c b/drivers/input/lirc/lirc_igorplugusb.c
 new file mode 100644
-index 0000000..6b3ac64
+index 0000000..ab9bdd6
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_igorplugusb.c
-@@ -0,0 +1,611 @@
+@@ -0,0 +1,619 @@
 +/* lirc_igorplugusb - USB remote support for LIRC
 + *
 + * Supports the standard homebrew IgorPlugUSB receiver with Igor's firmware.
@@ -6072,7 +6097,9 @@
 +	printk(DRIVER_NAME ": " DRIVER_AUTHOR "\n");
 +	dprintk(DRIVER_NAME ": debug mode enabled\n");
 +
++#ifdef MODULE
 +	request_module("lirc_dev");
++#endif
 +
 +	i = usb_register(&usb_remote_driver);
 +	if (i < 0) {
@@ -6088,6 +6115,7 @@
 +	usb_deregister(&usb_remote_driver);
 +}
 +
++#ifdef MODULE
 +module_init(usb_remote_init);
 +module_exit(usb_remote_exit);
 +
@@ -6102,6 +6130,11 @@
 +module_param(sample_rate, int, 0644);
 +MODULE_PARM_DESC(sample_rate, "Sampling rate in Hz (default: 100)");
 +
++#else /* not MODULE */
++subsys_initcall(usb_remote_driver);
++
++#endif /* MODULE */
++
 +/*
 + * Overrides for Emacs so that we follow Linus's tabbing style.
 + * ---------------------------------------------------------------------------
@@ -6111,7 +6144,7 @@
 + */
 diff --git a/drivers/input/lirc/lirc_imon.c b/drivers/input/lirc/lirc_imon.c
 new file mode 100644
-index 0000000..0c307ca
+index 0000000..bdfd953
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_imon.c
 @@ -0,0 +1,1280 @@
@@ -6159,10 +6192,6 @@
 + *
 + */
 +#include <linux/version.h>
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
 +#include <linux/autoconf.h>
 +
 +#include <linux/errno.h>
@@ -7391,16 +7420,20 @@
 +	info("module removed. Goodbye!");
 +}
 +
-+
++#ifdef MODULE
 +module_init(imon_init);
 +module_exit(imon_exit);
 +
++#else
++subsys_initcall(imon_init);
++
++#endif /* MODULE */
 diff --git a/drivers/input/lirc/lirc_it87.c b/drivers/input/lirc/lirc_it87.c
 new file mode 100644
-index 0000000..1e8a6d3
+index 0000000..0a64847
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_it87.c
-@@ -0,0 +1,1004 @@
+@@ -0,0 +1,999 @@
 +/*
 + * LIRC driver for ITE IT8712/IT8705 CIR port
 + *
@@ -7436,11 +7469,6 @@
 +
 +#include <linux/version.h>
 +#include <linux/module.h>
-+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
 +#include <linux/autoconf.h>
 +
 +
@@ -8529,10 +8557,10 @@
 +/********************************* ITE IT87xx ************************/
 diff --git a/drivers/input/lirc/lirc_ite8709.c b/drivers/input/lirc/lirc_ite8709.c
 new file mode 100644
-index 0000000..2e1c178
+index 0000000..d03ecf7
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_ite8709.c
-@@ -0,0 +1,548 @@
+@@ -0,0 +1,545 @@
 +/*
 + * LIRC driver for ITE8709 CIR port
 + *
@@ -8557,12 +8585,9 @@
 +#include <linux/version.h>
 +#include <linux/module.h>
 +
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
 +#include <linux/autoconf.h>
 +#include <linux/interrupt.h>
++#include <linux/delay.h>
 +
 +#include <linux/pnp.h>
 +#include <linux/io.h>
@@ -9083,10 +9108,10 @@
 + */
 diff --git a/drivers/input/lirc/lirc_mceusb.c b/drivers/input/lirc/lirc_mceusb.c
 new file mode 100644
-index 0000000..a4d335d
+index 0000000..f1874f3
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_mceusb.c
-@@ -0,0 +1,884 @@
+@@ -0,0 +1,890 @@
 +/*
 + * USB Microsoft IR Transceiver driver - 0.2
 + *
@@ -9961,6 +9986,7 @@
 +	usb_deregister(&mceusb_driver);
 +}
 +
++#ifdef MODULE
 +module_init(usb_mceusb_init);
 +module_exit(usb_mceusb_exit);
 +
@@ -9971,12 +9997,17 @@
 +
 +module_param(debug, int, 0644);
 +MODULE_PARM_DESC(debug, "Debug enabled or not");
++
++#else /* not MODULE */
++subsys_initcall(usb_mceusb_init);
++
++#endif /* MODULE */
 diff --git a/drivers/input/lirc/lirc_mceusb2.c b/drivers/input/lirc/lirc_mceusb2.c
 new file mode 100644
-index 0000000..659d363
+index 0000000..1e683d3
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_mceusb2.c
-@@ -0,0 +1,1117 @@
+@@ -0,0 +1,1119 @@
 +/*
 + * LIRC driver for Philips eHome USB Infrared Transceiver
 + * and the Microsoft MCE 2005 Remote Control
@@ -10033,7 +10064,7 @@
 +#include "lirc.h"
 +#include "lirc_dev.h"
 +
-+#define DRIVER_VERSION	"$Revision$"
++#define DRIVER_VERSION	"1.48"
 +#define DRIVER_AUTHOR	"Daniel Melander <lirc at rajidae.se>, " \
 +			"Martin Blatter <martin_a_blatter at yahoo.com>"
 +#define DRIVER_DESC	"Philips eHome USB IR Transceiver and Microsoft " \
@@ -11059,6 +11090,7 @@
 +	.id_table =	usb_remote_table
 +};
 +
++#ifdef MODULE
 +static int __init usb_remote_init(void)
 +{
 +	int i;
@@ -11094,12 +11126,13 @@
 +
 +module_param(debug, bool, 0644);
 +MODULE_PARM_DESC(debug, "Debug enabled or not");
++#endif /* MODULE */
 diff --git a/drivers/input/lirc/lirc_parallel.c b/drivers/input/lirc/lirc_parallel.c
 new file mode 100644
-index 0000000..78c165b
+index 0000000..912cad2
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_parallel.c
-@@ -0,0 +1,732 @@
+@@ -0,0 +1,728 @@
 +/****************************************************************************
 + ** lirc_parallel.c *********************************************************
 + ****************************************************************************
@@ -11129,10 +11162,6 @@
 + *************************       Includes        ***********************
 + ***********************************************************************/
 +
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
 +#include <linux/version.h>
 +
 +#include <linux/autoconf.h>
@@ -11866,10 +11895,10 @@
 +#endif
 diff --git a/drivers/input/lirc/lirc_sasem.c b/drivers/input/lirc/lirc_sasem.c
 new file mode 100644
-index 0000000..005a5e1
+index 0000000..003f492
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_sasem.c
-@@ -0,0 +1,967 @@
+@@ -0,0 +1,969 @@
 +/* lirc_sasem.c - USB remote support for LIRC
 + * Version 0.5
 + *
@@ -12812,6 +12841,7 @@
 +	up(&disconnect_sem);
 +}
 +
++#ifdef MODULE
 +static int __init sasem_init(void)
 +{
 +	int rc;
@@ -12837,12 +12867,13 @@
 +module_init(sasem_init);
 +module_exit(sasem_exit);
 +
++#endif /* MODULE */
 diff --git a/drivers/input/lirc/lirc_serial.c b/drivers/input/lirc/lirc_serial.c
 new file mode 100644
-index 0000000..f6533d5
+index 0000000..465edd9
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_serial.c
-@@ -0,0 +1,1316 @@
+@@ -0,0 +1,1312 @@
 +/****************************************************************************
 + ** lirc_serial.c ***********************************************************
 + ****************************************************************************
@@ -12893,10 +12924,6 @@
 +   Steve Davies <steve at daviesfam.org>  July 2001
 +*/
 +
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
 +#include <linux/version.h>
 +
 +#include <linux/autoconf.h>
@@ -14161,10 +14188,10 @@
 +#endif /* MODULE */
 diff --git a/drivers/input/lirc/lirc_sir.c b/drivers/input/lirc/lirc_sir.c
 new file mode 100644
-index 0000000..3e79c74
+index 0000000..ea192b2
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_sir.c
-@@ -0,0 +1,1306 @@
+@@ -0,0 +1,1302 @@
 +/*
 + * LIRC SIR driver, (C) 2000 Milan Pikula <www at fornax.sk>
 + *
@@ -14204,10 +14231,6 @@
 +#include <linux/version.h>
 +#include <linux/module.h>
 +
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
 +#include <linux/autoconf.h>
 +
 +#include <linux/module.h>
@@ -15473,7 +15496,7 @@
 +#endif /* MODULE */
 diff --git a/drivers/input/lirc/lirc_streamzap.c b/drivers/input/lirc/lirc_streamzap.c
 new file mode 100644
-index 0000000..d3e815f
+index 0000000..69865cb
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_streamzap.c
 @@ -0,0 +1,795 @@
@@ -15524,7 +15547,7 @@
 +#include "lirc.h"
 +#include "lirc_dev.h"
 +
-+#define DRIVER_VERSION	"$Revision$"
++#define DRIVER_VERSION	"1.28"
 +#define DRIVER_NAME	"lirc_streamzap"
 +#define DRIVER_DESC	"Streamzap Remote Control driver"
 +
@@ -16274,10 +16297,10 @@
 +#endif /* MODULE */
 diff --git a/drivers/input/lirc/lirc_ttusbir.c b/drivers/input/lirc/lirc_ttusbir.c
 new file mode 100644
-index 0000000..6e5b3d2
+index 0000000..9ed9c7b
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_ttusbir.c
-@@ -0,0 +1,394 @@
+@@ -0,0 +1,400 @@
 +/****************************************************************************
 + ** lirc_ttusbir.c ***********************************************************
 + ****************************************************************************
@@ -16670,16 +16693,22 @@
 +	usb_deregister(&driver);
 +}
 +
++#ifdef MODULE
 +module_init(ttusbir_init_module);
 +module_exit(ttusbir_exit_module);
++
++#else
++subsys_initcall(ttusbir_init_module);
++
++#endif /* MODULE */
 diff --git a/drivers/input/lirc/lirc_zilog.c b/drivers/input/lirc/lirc_zilog.c
 new file mode 100644
-index 0000000..e7816fc
+index 0000000..20e6b27
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_zilog.c
-@@ -0,0 +1,1397 @@
+@@ -0,0 +1,1395 @@
 +/*
-+ * i2c IR lirc plugin for Hauppauge PVR 150 card
++ * i2c IR lirc plugin for devices with zilog IR processors
 + *
 + * Copyright (c) 2000 Gerd Knorr <kraxel at goldbach.in-berlin.de>
 + * modified for PixelView (BT878P+W/FM) by
@@ -16695,6 +16724,8 @@
 + *      Thomas Reitmayr (treitmayr at yahoo.com)
 + * modified for Hauppauge PVR-150 IR TX device by
 + *      Mark Weaver <mark at npsl.co.uk>
++ * changed name from lirc_pvr150 to lirc_zilog, works on more than pvr-150
++ *	Jarod Wilson <jarod at redhat.com>
 + *
 + * parts are cut&pasted from the lirc_i2c.c driver
 + *
@@ -16715,10 +16746,6 @@
 + */
 +
 +
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
 +#include <linux/version.h>
 +#include <linux/module.h>
 +#include <linux/kmod.h>
@@ -16777,7 +16804,7 @@
 +/* Minor -> data mapping */
 +static struct IR *ir_devices[MAX_IRCTL_DEVICES];
 +
-+/* Block size for haup PVR-150 IR transmitter */
++/* Block size for IR transmitter */
 +#define TX_BLOCK_SIZE	99
 +
 +/* Hauppuage IR transmitter data */
@@ -17126,7 +17153,7 @@
 +	return -EFAULT;
 +}
 +
-+/* send a block of data to the IR TX device of the PVR-150 */
++/* send a block of data to the IR TX device */
 +static int send_data_block(struct IR *ir, unsigned char *data_block)
 +{
 +	int i, j, ret;
@@ -17151,7 +17178,7 @@
 +	return 0;
 +}
 +
-+/* send boot data to the IR TX device of the PVR-150 */
++/* send boot data to the IR TX device */
 +static int send_boot_data(struct IR *ir)
 +{
 +	int ret;
@@ -17204,12 +17231,11 @@
 +
 +		vfree(tx_data);
 +		tx_data = NULL;
-+		dprintk("successfully unloaded PVR-150 IR "
-+			"blaster firmware\n");
++		dprintk("successfully unloaded IR blaster firmware\n");
 +	}
 +}
 +
-+/* unload "firmware" for the IR TX device of the PVR-150 */
++/* unload "firmware" for the IR TX device */
 +static void fw_unload(void)
 +{
 +	mutex_lock(&tx_data_lock);
@@ -17217,7 +17243,7 @@
 +	mutex_unlock(&tx_data_lock);
 +}
 +
-+/* load "firmware" for the IR TX device of the PVR-150 */
++/* load "firmware" for the IR TX device */
 +static int fw_load(struct IR *ir)
 +{
 +	int ret;
@@ -17357,7 +17383,7 @@
 +	return ret;
 +}
 +
-+/* initialise the IR TX device of the PVR-150 */
++/* initialise the IR TX device */
 +static int tx_init(struct IR *ir)
 +{
 +	int ret;
@@ -17450,7 +17476,7 @@
 +	return ret ? ret : written;
 +}
 +
-+/* send a keypress to the IR TX device of the PVR-150 */
++/* send a keypress to the IR TX device */
 +static int send_code(struct IR *ir, unsigned int code, unsigned int key)
 +{
 +	unsigned char data_block[TX_BLOCK_SIZE];
@@ -17707,7 +17733,7 @@
 +	return 0;
 +}
 +
-+/* Open the IR device of the PVR-150.  Get hold of our IR structure and
++/* Open the IR device.  Get hold of our IR structure and
 +   stash it in private_data for the file */
 +static int open(struct inode *node, struct file *filep)
 +{
@@ -17740,7 +17766,7 @@
 +	return 0;
 +}
 +
-+/* Close the IR device of the PVR-150 */
++/* Close the IR device */
 +static int close(struct inode *node, struct file *filep)
 +{
 +	/* find our IR struct */
@@ -17989,9 +18015,10 @@
 +	    adap->id == I2C_HW_B_CX2341X) {
 +		int have_rx = 0, have_tx = 0;
 +
-+		/* The external IR receiver is at
-+		 * i2c address 0x71 on the PVR-150.
-+		 * The IR transmitter is at 0x70. */
++		/*
++		 * The external IR receiver is at i2c address 0x71.
++		 * The IR transmitter is at 0x70.
++		 */
 +		memset(&c, 0, sizeof(c));
 +		c.adapter = adap;
 +		c.addr = 0x70;



From cweyl at fedoraproject.org  Mon Sep  8 21:59:23 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 21:59:23 +0000 (UTC)
Subject: rpms/perl-Tie-ToObject/devel perl-Tie-ToObject.spec,1.1,1.2
Message-ID: <20080908215923.0FD49700FD@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Tie-ToObject/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11223

Modified Files:
	perl-Tie-ToObject.spec 
Log Message:
release bump


Index: perl-Tie-ToObject.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Tie-ToObject/devel/perl-Tie-ToObject.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Tie-ToObject.spec	8 Sep 2008 21:57:22 -0000	1.1
+++ perl-Tie-ToObject.spec	8 Sep 2008 21:58:52 -0000	1.2
@@ -1,7 +1,7 @@
 
 Name:       perl-Tie-ToObject 
 Version:    0.03 
-Release:    1%{?dist}
+Release:        2%{?dist}
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
 Summary:    Tie to an existing object 
@@ -58,6 +58,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-2
+- bump
+
 * Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
 - initial Fedora packaging
 - generated with cpan2dist (CPANPLUS::Dist::Fedora version 0.0.1)



From spot at fedoraproject.org  Mon Sep  8 21:59:27 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 21:59:27 +0000 (UTC)
Subject: rpms/tux/devel tux.spec,1.32,1.33
Message-ID: <20080908215927.DEED9700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11259

Modified Files:
	tux.spec 
Log Message:
fix license tag


Index: tux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tux/devel/tux.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- tux.spec	23 Aug 2006 09:35:38 -0000	1.32
+++ tux.spec	8 Sep 2008 21:58:57 -0000	1.33
@@ -5,9 +5,10 @@
 %define minor 2
 %define patchlevel 18
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: User-space component of TUX kernel-based threaded HTTP server
-License: GPL
+# No version specified, only attribution is in README
+License: GPL+
 Group: System Environment/Daemons
 Source: tux-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-root
@@ -73,6 +74,9 @@
 %doc tux.README NEWS SUCCESS gettuxconfig checkbindings demo.c demo.tux.so demo2.c demo2.tux.so demo3.c demo3.tux.so demo4.c demo4.tux.so demo5.tux.so samples/sample.log samples/sample.out docs/tux docs/TUXAPI*
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2.18-10
+- fix license tag
+
 * Wed Aug 23 2006 Ivana Varekova <varekova at redhat.com> - 3.2.18-9
 - remove tux.2 man page (moved to man-pages package)
 



From cweyl at fedoraproject.org  Mon Sep  8 22:00:03 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 22:00:03 +0000 (UTC)
Subject: rpms/perl-Tie-ToObject/F-8 import.log, NONE,
	1.1 perl-Tie-ToObject.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080908220003.A9BC9700FD@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Tie-ToObject/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11546

Modified Files:
	sources 
Added Files:
	import.log perl-Tie-ToObject.spec 
Log Message:
pseudo-branch of perl-Tie-ToObject to F-8


--- NEW FILE import.log ---
perl-Tie-ToObject-0_03-1_fc9:HEAD:perl-Tie-ToObject-0.03-1.fc9.src.rpm:1220911037


--- NEW FILE perl-Tie-ToObject.spec ---

Name:       perl-Tie-ToObject 
Version:    0.03 
Release:        2%{?dist}
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Tie to an existing object 
Source:     http://search.cpan.org/CPAN/authors/id/N/NU/NUFFIN/Tie-ToObject-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Tie-ToObject
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(Scalar::Util)
# tests
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::use::ok)
BuildRequires: perl(Tie::RefHash)


%description
While the perldoc/tie manpage allows tying to an arbitrary object, the
class in question must support this in it's implementation of 'TIEHASH',
'TIEARRAY' or whatever.

This class provides a very tie constructor that simply returns the object
it was given as it's first argument.

This way side effects of calling '$object->TIEHASH' are avoided.

%prep
%setup -q -n Tie-ToObject-%{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 t/  
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-2
- bump

* Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
- initial Fedora packaging
- generated with cpan2dist (CPANPLUS::Dist::Fedora version 0.0.1)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Tie-ToObject/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 15:21:22 -0000	1.1
+++ sources	8 Sep 2008 21:59:33 -0000	1.2
@@ -0,0 +1 @@
+b4f434992c286d531f26893c78541456  Tie-ToObject-0.03.tar.gz



From cweyl at fedoraproject.org  Mon Sep  8 22:03:03 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 22:03:03 +0000 (UTC)
Subject: rpms/perl-Tie-ToObject/F-9 import.log, NONE,
	1.1 perl-Tie-ToObject.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080908220303.9D461700FD@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Tie-ToObject/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12295

Modified Files:
	sources 
Added Files:
	import.log perl-Tie-ToObject.spec 
Log Message:
pseudo-branch of perl-Tie-ToObject to F-9


--- NEW FILE import.log ---
perl-Tie-ToObject-0_03-1_fc9:HEAD:perl-Tie-ToObject-0.03-1.fc9.src.rpm:1220911037


--- NEW FILE perl-Tie-ToObject.spec ---

Name:       perl-Tie-ToObject 
Version:    0.03 
Release:        2%{?dist}
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Tie to an existing object 
Source:     http://search.cpan.org/CPAN/authors/id/N/NU/NUFFIN/Tie-ToObject-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Tie-ToObject
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(Scalar::Util)
# tests
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::use::ok)
BuildRequires: perl(Tie::RefHash)


%description
While the perldoc/tie manpage allows tying to an arbitrary object, the
class in question must support this in it's implementation of 'TIEHASH',
'TIEARRAY' or whatever.

This class provides a very tie constructor that simply returns the object
it was given as it's first argument.

This way side effects of calling '$object->TIEHASH' are avoided.

%prep
%setup -q -n Tie-ToObject-%{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 t/  
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-2
- bump

* Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
- initial Fedora packaging
- generated with cpan2dist (CPANPLUS::Dist::Fedora version 0.0.1)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Tie-ToObject/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 15:21:22 -0000	1.1
+++ sources	8 Sep 2008 22:02:33 -0000	1.2
@@ -0,0 +1 @@
+b4f434992c286d531f26893c78541456  Tie-ToObject-0.03.tar.gz



From spot at fedoraproject.org  Mon Sep  8 22:07:58 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 22:07:58 +0000 (UTC)
Subject: rpms/tuxpaint/devel tuxpaint-utf8.patch, 1.1, 1.2 tuxpaint.spec,
	1.19, 1.20
Message-ID: <20080908220758.DB7D5700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tuxpaint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13663

Modified Files:
	tuxpaint-utf8.patch tuxpaint.spec 
Log Message:
fix license tag

tuxpaint-utf8.patch:

Index: tuxpaint-utf8.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tuxpaint/devel/tuxpaint-utf8.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tuxpaint-utf8.patch	30 Jan 2007 22:09:39 -0000	1.1
+++ tuxpaint-utf8.patch	8 Sep 2008 22:07:58 -0000	1.2
@@ -1,6 +1,7 @@
---- tuxpaint-0.9.16/src/manpage/tuxpaint.1.orig	2006-10-11 13:37:04.000000000 -0500
-+++ tuxpaint-0.9.16/src/manpage/tuxpaint.1	2007-01-30 13:23:42.000000000 -0600
-@@ -635,12 +635,12 @@
+diff -up tuxpaint-0.9.17/src/manpage/tuxpaint.1.orig tuxpaint-0.9.17/src/manpage/tuxpaint.1
+--- tuxpaint-0.9.17/src/manpage/tuxpaint.1.orig	2007-07-01 10:51:32.000000000 -0400
++++ tuxpaint-0.9.17/src/manpage/tuxpaint.1	2008-09-08 18:04:28.000000000 -0400
+@@ -679,12 +679,12 @@ Roland Illig,
  Juan Irigoien,
  Dmitriy Ivanov,
  Mogens Jaeger,
@@ -13,5 +14,5 @@
 -Amed ?. Jiyan,
 +Amed ??. Jiyan,
  Petri Jooste,
+ Richard June,
  Andrej Kacian,
- Kazuhiko,


Index: tuxpaint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxpaint/devel/tuxpaint.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tuxpaint.spec	20 Feb 2008 03:11:16 -0000	1.19
+++ tuxpaint.spec	8 Sep 2008 22:07:58 -0000	1.20
@@ -1,12 +1,12 @@
 Name:           tuxpaint
 Version:        0.9.17
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Epoch:          1
 Summary:        Drawing program designed for young children
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2+
 URL:            http://www.tuxpaint.org/
 Source0:        http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
@@ -84,6 +84,9 @@
 %{_mandir}/*/man1/*
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.9.17-4
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:0.9.17-3
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Mon Sep  8 22:11:30 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  8 Sep 2008 22:11:30 +0000 (UTC)
Subject: rpms/tuxtype2/devel tuxtype2.spec,1.10,1.11
Message-ID: <20080908221130.6DFB0700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tuxtype2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14558

Modified Files:
	tuxtype2.spec 
Log Message:
fix license tag


Index: tuxtype2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxtype2/devel/tuxtype2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tuxtype2.spec	20 Feb 2008 03:12:09 -0000	1.10
+++ tuxtype2.spec	8 Sep 2008 22:11:00 -0000	1.11
@@ -1,10 +1,10 @@
 Name:           tuxtype2
 Version:        1.5.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Tux Typing, an educational typing tutor for children
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://tuxtype.sourceforge.net/
 Source0:        http://dl.sf.net/tuxtype/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,6 +66,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5.3-4
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.5.3-3
 - Autorebuild for GCC 4.3
 



From cweyl at fedoraproject.org  Mon Sep  8 22:13:16 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  8 Sep 2008 22:13:16 +0000 (UTC)
Subject: rpms/perl-Module-Install-ExtraTests/devel import.log, NONE,
	1.1 perl-Module-Install-ExtraTests.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080908221316.5D5DD700FD@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Module-Install-ExtraTests/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15227/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Module-Install-ExtraTests.spec 
Log Message:
initial import



--- NEW FILE import.log ---
perl-Module-Install-ExtraTests-0_003-1_fc9:HEAD:perl-Module-Install-ExtraTests-0.003-1.fc9.src.rpm:1220911960


--- NEW FILE perl-Module-Install-ExtraTests.spec ---
Name:       perl-Module-Install-ExtraTests 
Version:    0.003 
Release:    1%{?dist}
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Ignorable, contextual test support for Module::Install
Source:     http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Module-Install-ExtraTests-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Module-Install-ExtraTests
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::Install)
BuildRequires: perl(Test::More)


%description
This allows extra_tests; to be declared in Makefile.PL, indicating that the 
test files found in the directory ./xt should be run only in certain 
instances:

  ./xt/author  - run when the tests are being run in an author's working copy
  ./xt/smoke   - run when the dist is being smoked (AUTOMATED_TESTING=1)
  ./xt/release - run during "make disttest"

%prep
%setup -q -n Module-Install-ExtraTests-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README t/ 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.003-1
- initial Fedora packaging
- generated with cpan2dist (CPANPLUS::Dist::Fedora version 0.0.1)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Install-ExtraTests/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 15:25:54 -0000	1.1
+++ .cvsignore	8 Sep 2008 22:12:46 -0000	1.2
@@ -0,0 +1 @@
+Module-Install-ExtraTests-0.003.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Install-ExtraTests/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 15:25:54 -0000	1.1
+++ sources	8 Sep 2008 22:12:46 -0000	1.2
@@ -0,0 +1 @@
+85ed92a32dcf588468b253d875ce3938  Module-Install-ExtraTests-0.003.tar.gz



From jkeating at fedoraproject.org  Mon Sep  8 22:14:33 2008
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Mon,  8 Sep 2008 22:14:33 +0000 (UTC)
Subject: rpms/tux/F-7 dead.package, NONE, 1.1 Makefile, 1.1, NONE branch, 1.1,
	NONE sources, 1.12, NONE tux-3.2.18-compile-fix.patch, 1.2,
	NONE tux-3.2.18-gcc34.patch, 1.1,
	NONE tux-3.2.18-man_remove.patch, 1.1,
	NONE tux-3.2.18-strncpy-warning.patch, 1.1, NONE tux.spec, 1.32, NONE
Message-ID: <20080908221433.50481700FD@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/tux/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15804/F-7

Added Files:
	dead.package 
Removed Files:
	Makefile branch sources tux-3.2.18-compile-fix.patch 
	tux-3.2.18-gcc34.patch tux-3.2.18-man_remove.patch 
	tux-3.2.18-strncpy-warning.patch tux.spec 
Log Message:
Kill this package.



--- NEW FILE dead.package ---
Package is dead, requires kernel stuff no longer in the kernel.


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- tux-3.2.18-compile-fix.patch DELETED ---


--- tux-3.2.18-gcc34.patch DELETED ---


--- tux-3.2.18-man_remove.patch DELETED ---


--- tux-3.2.18-strncpy-warning.patch DELETED ---


--- tux.spec DELETED ---



From jkeating at fedoraproject.org  Mon Sep  8 22:14:33 2008
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Mon,  8 Sep 2008 22:14:33 +0000 (UTC)
Subject: rpms/tux/F-9 dead.package, NONE, 1.1 Makefile, 1.2, NONE branch, 1.1,
	NONE sources, 1.12, NONE tux-3.2.18-compile-fix.patch, 1.2,
	NONE tux-3.2.18-gcc34.patch, 1.1,
	NONE tux-3.2.18-man_remove.patch, 1.1,
	NONE tux-3.2.18-strncpy-warning.patch, 1.1, NONE tux.spec, 1.32, NONE
Message-ID: <20080908221433.A13FD700FD@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/tux/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15804/F-9

Added Files:
	dead.package 
Removed Files:
	Makefile branch sources tux-3.2.18-compile-fix.patch 
	tux-3.2.18-gcc34.patch tux-3.2.18-man_remove.patch 
	tux-3.2.18-strncpy-warning.patch tux.spec 
Log Message:
Kill this package.



--- NEW FILE dead.package ---
Package is dead, requires kernel stuff no longer in the kernel.


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- tux-3.2.18-compile-fix.patch DELETED ---


--- tux-3.2.18-gcc34.patch DELETED ---


--- tux-3.2.18-man_remove.patch DELETED ---


--- tux-3.2.18-strncpy-warning.patch DELETED ---


--- tux.spec DELETED ---



From jkeating at fedoraproject.org  Mon Sep  8 22:14:33 2008
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Mon,  8 Sep 2008 22:14:33 +0000 (UTC)
Subject: rpms/tux/devel dead.package, NONE, 1.1 Makefile, 1.2, NONE sources, 
	1.12, NONE tux-3.2.18-compile-fix.patch, 1.2,
	NONE tux-3.2.18-gcc34.patch, 1.1,
	NONE tux-3.2.18-man_remove.patch, 1.1,
	NONE tux-3.2.18-strncpy-warning.patch, 1.1, NONE tux.spec, 1.33, NONE
Message-ID: <20080908221433.D5D95700FD@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/tux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15804/devel

Added Files:
	dead.package 
Removed Files:
	Makefile sources tux-3.2.18-compile-fix.patch 
	tux-3.2.18-gcc34.patch tux-3.2.18-man_remove.patch 
	tux-3.2.18-strncpy-warning.patch tux.spec 
Log Message:
Kill this package.



--- NEW FILE dead.package ---
Package is dead, requires kernel stuff no longer in the kernel.


--- Makefile DELETED ---


--- sources DELETED ---


--- tux-3.2.18-compile-fix.patch DELETED ---


--- tux-3.2.18-gcc34.patch DELETED ---


--- tux-3.2.18-man_remove.patch DELETED ---


--- tux-3.2.18-strncpy-warning.patch DELETED ---


--- tux.spec DELETED ---



From ingvar at fedoraproject.org  Mon Sep  8 22:29:00 2008
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Mon,  8 Sep 2008 22:29:00 +0000 (UTC)
Subject: rpms/varnish/devel varnish.endianfix.cs3170-3071.patch, NONE,
	1.1 varnish.spec, 1.11, 1.12
Message-ID: <20080908222900.C4F2A700FD@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18305

Modified Files:
	varnish.spec 
Added Files:
	varnish.endianfix.cs3170-3071.patch 
Log Message:
- Added a patch from r3171 that fixes an endian bug on ppc and ppc64
- Added a hack that changes the varnishtest ports for 64bits builds,
  so they can run in parallell with 32bits build on same build host



varnish.endianfix.cs3170-3071.patch:

--- NEW FILE varnish.endianfix.cs3170-3071.patch ---
Index: include/vrt.h
===================================================================
--- include/vrt.h	(revisjon 3169)
+++ include/vrt.h	(revisjon 3171)
@@ -154,6 +154,7 @@
 
 /* Simple stuff */
 int VRT_strcmp(const char *s1, const char *s2);
+void VRT_memmove(void *dst, const void *src, unsigned len);
 
 void VRT_ESI(struct sess *sp);
 void VRT_Rollback(struct sess *sp);
Index: lib/libvcl/vcc_fixed_token.c
===================================================================
--- lib/libvcl/vcc_fixed_token.c	(revisjon 3169)
+++ lib/libvcl/vcc_fixed_token.c	(revisjon 3171)
@@ -434,6 +434,7 @@
 	vsb_cat(sb, "\n");
 	vsb_cat(sb, "/* Simple stuff */\n");
 	vsb_cat(sb, "int VRT_strcmp(const char *s1, const char *s2);\n");
+	vsb_cat(sb, "void VRT_memmove(void *dst, const void *src, unsigned len);\n");
 	vsb_cat(sb, "\n");
 	vsb_cat(sb, "void VRT_ESI(struct sess *sp);\n");
 	vsb_cat(sb, "void VRT_Rollback(struct sess *sp);\n");
Index: lib/libvcl/vcc_acl.c
===================================================================
--- lib/libvcl/vcc_acl.c	(revisjon 3169)
+++ lib/libvcl/vcc_acl.c	(revisjon 3171)
@@ -328,23 +328,37 @@
 	int depth, l, m, i;
 	unsigned at[VRT_ACL_MAXADDR + 1];
 	const char *oc;
+	struct sockaddr sa;
 
 	Fh(tl, 0, "\nstatic int\n");
 	Fh(tl, 0, "match_acl_%s_%s(const struct sess *sp, const void *p)\n",
 	    pfx, acln);
 	Fh(tl, 0, "{\n");
-	Fh(tl, 0, "\tunsigned fam;\n");
 	Fh(tl, 0, "\tconst unsigned char *a;\n");
+	assert(sizeof (unsigned char) == 1);
+	assert(sizeof (unsigned short) == 2);
+	assert(sizeof (unsigned int) == 4);
+	if (sizeof sa.sa_family == 1)
+		Fh(tl, 0, "\tunsigned char fam;\n");
+	else if (sizeof sa.sa_family == 2)
+		Fh(tl, 0, "\tunsigned short fam;\n");
+	else if (sizeof sa.sa_family == 4)
+		Fh(tl, 0, "\tunsigned int fam;\n");
+	else
+		assert(0 == __LINE__);
+		
 	Fh(tl, 0, "\n");
 	Fh(tl, 0, "\ta = p;\n");
-	Fh(tl, 0, "\tfam = a[%d];\n", offsetof(struct sockaddr, sa_family));
+	Fh(tl, 0, "\tVRT_memmove(&fam, a + %d, sizeof fam);\n",
+	    offsetof(struct sockaddr, sa_family));
 	Fh(tl, 0, "\tif (fam == %d)\n", PF_INET);
 	Fh(tl, 0, "\t\ta += %d;\n", offsetof(struct sockaddr_in, sin_addr));
 	Fh(tl, 0, "\telse if (fam == %d)\n", PF_INET6);
 	Fh(tl, 0, "\t\ta += %d;\n", offsetof(struct sockaddr_in6, sin6_addr));
-	Fh(tl, 0, "\telse\n");
+	Fh(tl, 0, "\telse {\n");
+	Fh(tl, 0, "\t\tVRT_acl_log(sp, \"NO_FAM %s\");\n", acln);
 	Fh(tl, 0, "\t\treturn(0);\n");
-	Fh(tl, 0, "\n");
+	Fh(tl, 0, "\t}\n\n");
 	depth = -1;
 	oc = 0;
 	at[0] = 256;
Index: bin/varnishd/cache_vrt.c
===================================================================
--- bin/varnishd/cache_vrt.c	(revisjon 3169)
+++ bin/varnishd/cache_vrt.c	(revisjon 3171)
@@ -726,3 +726,10 @@
 	return (strcmp(s1, s2));
 }
 
+void
+VRT_memmove(void *dst, const void *src, unsigned len)
+{
+
+	(void)memmove(dst, src, len);
+}
+


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/devel/varnish.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- varnish.spec	2 Sep 2008 20:37:08 -0000	1.11
+++ varnish.spec	8 Sep 2008 22:28:30 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
 Version: 2.0
-Release: 0.7.beta1%{?dist}
+Release: 0.8.beta1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -12,6 +12,7 @@
 Patch1: varnish.coresize.patch
 Patch2: varnish.vcl_changes.patch
 Patch3: varnish.cs3157.patch
+Patch4: varnish.endianfix.cs3170-3071.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
@@ -73,11 +74,27 @@
 %patch1 -p0
 %patch2 -p0
 %patch3 -p0
+%patch4 -p0
 
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
 # ./autogen.sh
 
+# Hack to get 32- and 64-bits tests run concurrently on the same build machine
+case `uname -m` in
+	ppc64 | s390x | x86_64 | sparc64 )
+		sed -i ' 
+			s,9001,9011,g;
+			s,9080,9090,g; 
+			s,9081,9091,g; 
+			s,9082,9092,g; 
+			s,9180,9190,g;
+		' bin/varnishtest/*.c bin/varnishtest/tests/*vtc
+		;;
+	*)
+		;;
+esac
+
 mkdir examples
 cp bin/varnishd/default.vcl etc/zope-plone.vcl examples
 
@@ -210,6 +227,11 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Sep 09 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.8.beta1
+- Added a patch from r3171 that fixes an endian bug on ppc and ppc64
+- Added a hack that changes the varnishtest ports for 64bits builds,
+  so they can run in parallell with 32bits build on same build host
+
 * Tue Sep 02 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.7.beta1
 - Added a patch from r3156 and r3157, hiding a legit errno in make check
 



From pkgdb at fedoraproject.org  Mon Sep  8 22:36:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:36:11 +0000
Subject: [pkgdb] kdebase: tuxbrewr has requested watchbugzilla
Message-ID: <20080908223612.92C5B208D7C@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdebase (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Mon Sep  8 22:36:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:36:14 +0000
Subject: [pkgdb] kdebase: tuxbrewr has requested watchcommits
Message-ID: <20080908223614.46C5D208D9A@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdebase (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Mon Sep  8 22:36:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:36:27 +0000
Subject: [pkgdb] kdebase: tuxbrewr has requested watchbugzilla
Message-ID: <20080908223627.AA825208DA1@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdebase (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Mon Sep  8 22:36:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:36:30 +0000
Subject: [pkgdb] kdebase: tuxbrewr has requested watchcommits
Message-ID: <20080908223633.DB4D0208D98@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdebase (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Mon Sep  8 22:37:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:37:00 +0000
Subject: [pkgdb] kdebase3: tuxbrewr has requested watchbugzilla
Message-ID: <20080908223700.7939D208D1E@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdebase3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase3



From pkgdb at fedoraproject.org  Mon Sep  8 22:37:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:37:04 +0000
Subject: [pkgdb] kdebase3: tuxbrewr has requested watchcommits
Message-ID: <20080908223704.3D2BD208DA0@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdebase3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase3



From pkgdb at fedoraproject.org  Mon Sep  8 22:37:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:37:14 +0000
Subject: [pkgdb] kdebase3: tuxbrewr has requested watchbugzilla
Message-ID: <20080908223714.A79CE20876D@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdebase3 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase3



From pkgdb at fedoraproject.org  Mon Sep  8 22:37:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:37:19 +0000
Subject: [pkgdb] kdebase3: tuxbrewr has requested watchcommits
Message-ID: <20080908223719.67AEB208D1E@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdebase3 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase3



From pkgdb at fedoraproject.org  Mon Sep  8 22:38:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:38:04 +0000
Subject: [pkgdb] kdebase4: tuxbrewr has requested watchbugzilla
Message-ID: <20080908223804.DE5FA208DA2@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdebase4 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase4



From pkgdb at fedoraproject.org  Mon Sep  8 22:38:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:38:08 +0000
Subject: [pkgdb] kdebase4: tuxbrewr has requested watchcommits
Message-ID: <20080908223809.17CDD208DA9@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdebase4 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase4



From pkgdb at fedoraproject.org  Mon Sep  8 22:38:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:38:19 +0000
Subject: [pkgdb] kdebase4: tuxbrewr has requested watchbugzilla
Message-ID: <20080908223819.87435208D0F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdebase4 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase4



From pkgdb at fedoraproject.org  Mon Sep  8 22:38:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:38:21 +0000
Subject: [pkgdb] kdebase4: tuxbrewr has requested watchcommits
Message-ID: <20080908223821.BFE17208DA6@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdebase4 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase4



From pkgdb at fedoraproject.org  Mon Sep  8 22:38:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:38:48 +0000
Subject: [pkgdb] kdebase-runtime: tuxbrewr has requested watchbugzilla
Message-ID: <20080908223849.60FCD208D9F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdebase-runtime (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Mon Sep  8 22:38:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:38:53 +0000
Subject: [pkgdb] kdebase-runtime: tuxbrewr has requested watchcommits
Message-ID: <20080908223853.7A319208DA4@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdebase-runtime (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Mon Sep  8 22:39:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:39:00 +0000
Subject: [pkgdb] kdebase-runtime: tuxbrewr has requested watchbugzilla
Message-ID: <20080908223901.2E9C1208DA7@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdebase-runtime (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Mon Sep  8 22:39:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:39:03 +0000
Subject: [pkgdb] kdebase-runtime: tuxbrewr has requested watchcommits
Message-ID: <20080908223903.E0B83208DAB@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdebase-runtime (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Mon Sep  8 22:39:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:39:34 +0000
Subject: [pkgdb] kdebase-workspace: tuxbrewr has requested watchbugzilla
Message-ID: <20080908223934.C04D2208D9A@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdebase-workspace (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Mon Sep  8 22:39:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:39:37 +0000
Subject: [pkgdb] kdebase-workspace: tuxbrewr has requested watchcommits
Message-ID: <20080908223938.45878208DA0@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdebase-workspace (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Mon Sep  8 22:39:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:39:43 +0000
Subject: [pkgdb] kdebase-workspace: tuxbrewr has requested watchbugzilla
Message-ID: <20080908223944.0362B208DAD@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdebase-workspace (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Mon Sep  8 22:39:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:39:47 +0000
Subject: [pkgdb] kdebase-workspace: tuxbrewr has requested watchcommits
Message-ID: <20080908223947.3D18F208DB3@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdebase-workspace (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Mon Sep  8 22:40:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:40:48 +0000
Subject: [pkgdb] kdebindings: tuxbrewr has requested watchbugzilla
Message-ID: <20080908224048.5A282208DA0@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdebindings (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Mon Sep  8 22:40:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:40:50 +0000
Subject: [pkgdb] kdebindings: tuxbrewr has requested watchcommits
Message-ID: <20080908224050.DA4CE208DA5@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdebindings (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Mon Sep  8 22:41:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:41:01 +0000
Subject: [pkgdb] kdebindings: tuxbrewr has requested watchbugzilla
Message-ID: <20080908224102.46E71208DAC@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdebindings (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Mon Sep  8 22:41:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:41:04 +0000
Subject: [pkgdb] kdebindings: tuxbrewr has requested watchcommits
Message-ID: <20080908224104.A3B6E208DB0@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdebindings (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Mon Sep  8 22:41:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:41:42 +0000
Subject: [pkgdb] kdeedu: tuxbrewr has requested watchbugzilla
Message-ID: <20080908224142.3CDD3208D97@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdeedu (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Mon Sep  8 22:41:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:41:44 +0000
Subject: [pkgdb] kdeedu: tuxbrewr has requested watchcommits
Message-ID: <20080908224144.AE2FA208D9B@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdeedu (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Mon Sep  8 22:41:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:41:56 +0000
Subject: [pkgdb] kdeedu: tuxbrewr has requested watchbugzilla
Message-ID: <20080908224156.48881208DA1@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdeedu (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Mon Sep  8 22:41:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:41:59 +0000
Subject: [pkgdb] kdeedu: tuxbrewr has requested watchcommits
Message-ID: <20080908224159.077CC208DA5@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdeedu (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Mon Sep  8 22:42:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:42:51 +0000
Subject: [pkgdb] kde-filesystem: tuxbrewr has requested watchbugzilla
Message-ID: <20080908224251.3BC5C208D97@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kde-filesystem (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-filesystem



From pkgdb at fedoraproject.org  Mon Sep  8 22:42:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:42:58 +0000
Subject: [pkgdb] kde-filesystem: tuxbrewr has requested watchcommits
Message-ID: <20080908224258.2D57D208D9C@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kde-filesystem (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-filesystem



From pkgdb at fedoraproject.org  Mon Sep  8 22:43:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:43:04 +0000
Subject: [pkgdb] kde-filesystem: tuxbrewr has requested watchbugzilla
Message-ID: <20080908224304.3B1A9208DA3@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kde-filesystem (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-filesystem



From pkgdb at fedoraproject.org  Mon Sep  8 22:43:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:43:04 +0000
Subject: [pkgdb] kde-filesystem: tuxbrewr has requested watchcommits
Message-ID: <20080908224304.99E16208DA8@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kde-filesystem (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-filesystem



From pkgdb at fedoraproject.org  Mon Sep  8 22:43:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:43:37 +0000
Subject: [pkgdb] kdegames: tuxbrewr has requested watchcommits
Message-ID: <20080908224337.BDE6D208D0F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdegames (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Mon Sep  8 22:43:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:43:39 +0000
Subject: [pkgdb] kdegames: tuxbrewr has requested watchbugzilla
Message-ID: <20080908224339.55E21208D98@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdegames (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Mon Sep  8 22:43:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:43:55 +0000
Subject: [pkgdb] kdegames: tuxbrewr has requested watchbugzilla
Message-ID: <20080908224356.0A8A8208D9F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdegames (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Mon Sep  8 22:43:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:43:56 +0000
Subject: [pkgdb] kdegames: tuxbrewr has requested watchcommits
Message-ID: <20080908224356.793F7208DA3@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdegames (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Mon Sep  8 22:44:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:44:34 +0000
Subject: [pkgdb] kdegames3: tuxbrewr has requested watchbugzilla
Message-ID: <20080908224434.2394A208D98@bastion.fedora.phx.redhat.com>

tuxbrewr 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  Mon Sep  8 22:44:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:44:37 +0000
Subject: [pkgdb] kdegames3: tuxbrewr has requested watchcommits
Message-ID: <20080908224437.B8C8C208D9E@bastion.fedora.phx.redhat.com>

tuxbrewr 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  Mon Sep  8 22:44:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:44:45 +0000
Subject: [pkgdb] kdegames3: tuxbrewr has requested watchbugzilla
Message-ID: <20080908224446.0A2BC208DA7@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdegames3 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Mon Sep  8 22:44:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:44:54 +0000
Subject: [pkgdb] kdegames3: tuxbrewr has requested watchcommits
Message-ID: <20080908224454.3AE58208DA3@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdegames3 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Mon Sep  8 22:45:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:45:29 +0000
Subject: [pkgdb] kdegraphics: tuxbrewr has requested watchbugzilla
Message-ID: <20080908224529.93937208D9A@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdegraphics (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Mon Sep  8 22:45:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:45:29 +0000
Subject: [pkgdb] kdegraphics: tuxbrewr has requested watchcommits
Message-ID: <20080908224529.CBF27208D99@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdegraphics (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Mon Sep  8 22:45:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:45:39 +0000
Subject: [pkgdb] kdegraphics: tuxbrewr has requested watchcommits
Message-ID: <20080908224539.6988F208D07@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdegraphics (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Mon Sep  8 22:45:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 22:45:47 +0000
Subject: [pkgdb] kdegraphics: tuxbrewr has requested watchbugzilla
Message-ID: <20080908224547.8533F208D1E@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdegraphics (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From bpepple at fedoraproject.org  Mon Sep  8 22:59:50 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon,  8 Sep 2008 22:59:50 +0000 (UTC)
Subject: rpms/swfdec-gnome/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 swfdec-gnome.spec, 1.11, 1.12
Message-ID: <20080908225950.3BD2A700FD@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/swfdec-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23774

Modified Files:
	.cvsignore sources swfdec-gnome.spec 
Log Message:
* Mon Sep  8 2008 Brian Pepple <bpepple at fedoraproject.org> - 2.23.4-1
- Update to 2.23.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/swfdec-gnome/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	31 Jul 2008 03:32:30 -0000	1.8
+++ .cvsignore	8 Sep 2008 22:59:19 -0000	1.9
@@ -1 +1 @@
-swfdec-gnome-2.23.2.tar.bz2
+swfdec-gnome-2.23.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/swfdec-gnome/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	31 Jul 2008 03:32:30 -0000	1.8
+++ sources	8 Sep 2008 22:59:19 -0000	1.9
@@ -1 +1 @@
-f4bdda6cf589d9874d45b6acfc1ec2df  swfdec-gnome-2.23.2.tar.bz2
+edbb7a8fdafc5f1c71d91fbe130a18ee  swfdec-gnome-2.23.4.tar.bz2


Index: swfdec-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/swfdec-gnome/devel/swfdec-gnome.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- swfdec-gnome.spec	31 Jul 2008 03:32:30 -0000	1.11
+++ swfdec-gnome.spec	8 Sep 2008 22:59:19 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           swfdec-gnome
-Version:        2.23.2
+Version:        2.23.4
 Release:        1%{?dist}
 Summary:        Programs to integrate Flash into the GNOME desktop
 
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.12.0
-BuildRequires:	swfdec-gtk-devel >= 0.7.4
+BuildRequires:	swfdec-gtk-devel >= 0.8.0
 BuildRequires:	GConf2
 BuildRequires:  desktop-file-utils
 BuildRequires:	gettext
@@ -97,6 +97,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
 %changelog
+* Mon Sep  8 2008 Brian Pepple <bpepple at fedoraproject.org> - 2.23.4-1
+- Update to 2.23.4.
+
 * Wed Jul 30 2008 Brian Pepple <bpepple at fedoraproject.org> - 2.23.2-1
 - Update to 2.23.2.
 - Drop configure patch. Fixed upstream.



From nalin at fedoraproject.org  Mon Sep  8 23:05:38 2008
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon,  8 Sep 2008 23:05:38 +0000 (UTC)
Subject: rpms/libgcrypt/devel .cvsignore, 1.10, 1.11 libgcrypt.spec, 1.28,
	1.29 sources, 1.10, 1.11
Message-ID: <20080908230538.B47FE700FD@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/libgcrypt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25122

Modified Files:
	.cvsignore libgcrypt.spec sources 
Log Message:
update to 1.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	29 Apr 2008 18:05:46 -0000	1.10
+++ .cvsignore	8 Sep 2008 23:05:08 -0000	1.11
@@ -11,3 +11,5 @@
 libgcrypt-1.4.0.tar.bz2.sig
 libgcrypt-1.4.1.tar.bz2
 libgcrypt-1.4.1.tar.bz2.sig
+libgcrypt-1.4.2.tar.bz2
+libgcrypt-1.4.2.tar.bz2.sig


Index: libgcrypt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/devel/libgcrypt.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libgcrypt.spec	29 Apr 2008 18:05:46 -0000	1.28
+++ libgcrypt.spec	8 Sep 2008 23:05:08 -0000	1.29
@@ -1,5 +1,5 @@
 Name: libgcrypt
-Version: 1.4.1
+Version: 1.4.2
 Release: 1
 Source0: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2.sig
@@ -105,6 +105,7 @@
 %defattr(-,root,root)
 %{_bindir}/%{name}-config
 %{_bindir}/dumpsexp
+%{_bindir}/hmac256
 %{_includedir}/*
 %{_libdir}/*.so
 %{_datadir}/aclocal/*
@@ -113,6 +114,9 @@
 %{_infodir}/gcrypt.info*
 
 %changelog
+* Mon Sep  8 2008 Nalin Dahyabhai <nalin at redhat.com> 1.4.2-1
+- update to 1.4.2
+
 * Tue Apr 29 2008 Nalin Dahyabhai <nalin at redhat.com> 1.4.1-1
 - update to 1.4.1
 - bump libgpgerror-devel requirement to 1.4, matching the requirement enforced


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	29 Apr 2008 18:05:46 -0000	1.10
+++ sources	8 Sep 2008 23:05:08 -0000	1.11
@@ -1,2 +1,2 @@
-26703ecef4bbe113b8e6a87572b80b32  libgcrypt-1.4.1.tar.bz2
-c219822f4b88e59bb6773f99c9cd73c9  libgcrypt-1.4.1.tar.bz2.sig
+0d27005ff43ecf3d96ae02d99bf793ba  libgcrypt-1.4.2.tar.bz2
+3645b7f13ffaa953a4cbfa294fb1a2f0  libgcrypt-1.4.2.tar.bz2.sig



From belegdol at fedoraproject.org  Mon Sep  8 23:06:25 2008
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Mon,  8 Sep 2008 23:06:25 +0000 (UTC)
Subject: rpms/gnome-chemistry-utils/devel
	gnome-chemistry-utils-0.9.90-ppc.patch, NONE,
	1.1 gnome-chemistry-utils.spec, 1.22,
	1.23 gnome-chemistry-utils-0.9.90-readint32.patch, 1.1, NONE
Message-ID: <20080908230625.ADFFC700FD@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25308

Modified Files:
	gnome-chemistry-utils.spec 
Added Files:
	gnome-chemistry-utils-0.9.90-ppc.patch 
Removed Files:
	gnome-chemistry-utils-0.9.90-readint32.patch 
Log Message:
Really fix the compile problem

gnome-chemistry-utils-0.9.90-ppc.patch:

--- NEW FILE gnome-chemistry-utils-0.9.90-ppc.patch ---
Index: plugins/loaders/cdx/cdx.cc
===================================================================
--- plugins/loaders/cdx/cdx.cc	(r??vision 866)
+++ plugins/loaders/cdx/cdx.cc	(copie de travail)
@@ -54,13 +54,14 @@
 #define READINT16(input,i) gsf_input_read (input, 2, (guint8*) &i)
 #define READINT32(input,i) gsf_input_read (input, 4, (guint8*) &i)
 #else
-char *buffer[4];
+char buffer[4];
+bool readint_res;
 #define READINT16(input,i) \
-	bool res = gsf_input_read (input, 2, (guint8*) buffer), \
-	(guint16) i = buffer[0] + buffer[1] << 8, res
-#define READINT32(input,buf,i) \
-	bool res = gsf_input_read (input, 4, (guint8*) buffer), \
-	(guint32) i = buffer[0] + buffer[1] << 8 + buffer[2] << 16 + buffer[3] << 24, res
+	readint_res = gsf_input_read (input, 2, (guint8*) buffer), \
+	(guint16) i = buffer[0] + buffer[1] << 8, readint_res
+#define READINT32(input,i) \
+	readint_res = gsf_input_read (input, 4, (guint8*) buffer), \
+	(guint32) i = buffer[0] + buffer[1] << 8 + buffer[2] << 16 + buffer[3] << 24, readint_res
 #endif
 
 typedef struct {
@@ -160,7 +161,7 @@
 	if (!gsf_input_read (in, kCDX_HeaderLength, (guint8*) buf) || strncmp (buf, kCDX_HeaderString, kCDX_HeaderStringLen)) {
 		result = false;
 		code = 0;
-	} else if (!READINT16 (in, code)) {
+	} else if (!(READINT16 (in, code))) {
 		result = false;
 		code = 0;
 	}
@@ -216,7 +217,7 @@
 					break;
 				}
 				guint32 length;
-				if (!READINT32 (in,length)) {
+				if (!(READINT32 (in,length))) {
 					result = false;
 					break;
 				}
@@ -227,13 +228,13 @@
 			case kCDXProp_FontTable: {
 				// skip origin platform and read fonts number
 				guint16 nb;
-				if (gsf_input_seek (in, 2, G_SEEK_CUR) || !READINT16 (in,nb))
+				if (gsf_input_seek (in, 2, G_SEEK_CUR) || !(READINT16 (in,nb)))
 					return false;
 				CDXFont font;
 				for (int i = 0; i < nb; i++) {
-					if (!READINT16 (in,font.index) ||
-						!READINT16 (in,font.encoding) ||
-						!READINT16 (in,size))
+					if (!(READINT16 (in,font.index)) ||
+						!(READINT16 (in,font.encoding)) ||
+						!(READINT16 (in,size)))
 						return false;
 					gsf_input_read (in, size, (guint8*) buf);
 					buf[size] = 0;
@@ -246,11 +247,11 @@
 				colors.push_back ("red=\"1\" green=\"1\" blue=\"1\""); // white
 				colors.push_back ("red=\"0\" green=\"0\" blue=\"0\""); // black
 				unsigned nb = (size - 2) / 6;
-				if (!READINT16 (in,size) || size != nb)
+				if (!(READINT16 (in,size)) || size != nb)
 					return false;
 				guint16 red, blue, green;
 				for (unsigned i = 0; i < nb; i++) {
-				if (!READINT16 (in,red) || !READINT16 (in,green) || !READINT16 (in,blue))
+				if (!(READINT16 (in,red)) || !(READINT16 (in,green)) || !(READINT16 (in,blue)))
 					return false;
 					snprintf (buf, bufsize, "red=\"%g\" green=\"%g\" blue=\"%g\"", (double) red / 0xffff, (double) green / 0xffff, (double) blue / 0xffff);
 					colors.push_back (buf);
@@ -269,7 +270,7 @@
 		}
 		if (!result)
 			break;
-		if (!READINT16 (in,code)) {
+		if (!(READINT16 (in,code))) {
 			result = false;
 			break;
 		}
@@ -297,7 +298,7 @@
 	guint16 code;
 	if (gsf_input_seek (in, 4, G_SEEK_CUR)) //skip the id
 		return false;
-	if (!READINT16 (in,code))
+	if (!(READINT16 (in,code)))
 		return false;
 	while (code) {
 		if (code & kCDXTag_Object) {
@@ -310,7 +311,7 @@
 			if (size && !gsf_input_read (in, size, (guint8*) buf))
 				return false;
 		}
-		if (!READINT16 (in,code))
+		if (!(READINT16 (in,code)))
 			return false;
 	}
 	return true;
@@ -321,7 +322,7 @@
 	guint16 code;
 	if (gsf_input_seek (in, 4, G_SEEK_CUR)) //skip the id
 		return false;
-	if (!READINT16 (in,code))
+	if (!(READINT16 (in,code)))
 		return false;
 	while (code) {
 		if (code & kCDXTag_Object) {
@@ -353,7 +354,7 @@
 			if (size && !gsf_input_read (in, size, (guint8*) buf))
 				return false;
 		}
-		if (!READINT16 (in,code))
+		if (!(READINT16 (in,code)))
 			return false;
 	}
 	return true;
@@ -364,11 +365,11 @@
 	guint16 code;
 	Object *mol = Object::CreateObject ("molecule", parent);
 	guint32 Id;
-	if (!READINT32 (in,Id))
+	if (!(READINT32 (in,Id)))
 		return false;
 	snprintf (buf, bufsize, "m%d", Id);
 	mol->SetId (buf);
-	if (!READINT16 (in,code))
+	if (!(READINT16 (in,code)))
 		return false;
 	while (code) {
 		if (code & kCDXTag_Object) {
@@ -392,7 +393,7 @@
 			if (size && !gsf_input_read (in, size, (guint8*) buf))
 				return false;
 		}
-		if (!READINT16 (in,code))
+		if (!(READINT16 (in,code)))
 			return false;
 	}
 		static_cast <Molecule*> (mol)->UpdateCycles ();
@@ -408,11 +409,11 @@
 	guint32 Id;
 	int type = 0;
 	int Z = 6;
-	if (!READINT32 (in,Id))
+	if (!(READINT32 (in,Id)))
 		return false;
 	snprintf (buf, bufsize, "a%d", Id);
 	Atom->SetId (buf);
-	if (!READINT16 (in,code))
+	if (!(READINT16 (in,code)))
 		return false;
 	while (code) {
 		if (code & kCDXTag_Object) {
@@ -649,14 +650,14 @@
 			switch (code) {
 			case kCDXProp_2DPosition: {
 				gint32 x, y;
-				if (size != 8 || !READINT32 (in,y) || !READINT32 (in,x))
+				if (size != 8 || !(READINT32 (in,y)) || !(READINT32 (in,x)))
 					goto bad_exit;
 				snprintf (buf, bufsize, "%d %d", x, y);
 				Atom->SetProperty (GCU_PROP_POS2D, buf);
 				break;
 			}
 			case kCDXProp_Node_Element:
-				if (size != 2 || !READINT16 (in,size))
+				if (size != 2 || !(READINT16 (in,size)))
 					goto bad_exit;
 				Z = size;
 				snprintf (buf, bufsize, "%u", size);
@@ -670,7 +671,7 @@
 				Atom->SetProperty (GCU_PROP_ATOM_CHARGE, buf);
 				break;
 			case kCDXProp_Node_Type:
-				if (size != 2 || !READINT16 (in,type))
+				if (size != 2 || !(READINT16 (in,type)))
 					goto bad_exit;
 				if (type == 12) {
 					// convert the atom to a pseudo atom.
@@ -690,7 +691,7 @@
 					goto bad_exit;
 			}
 		}
-		if (!READINT16 (in,code))
+		if (!(READINT16 (in,code)))
 			goto bad_exit;
 	}
 	if (Doc)
@@ -707,12 +708,12 @@
 	guint16 code;
 	Object *Bond = Object::CreateObject ("bond", parent);
 	guint32 Id;
-	if (!READINT32 (in,Id))
+	if (!(READINT32 (in,Id)))
 		return false;
 	snprintf (buf, bufsize, "b%d", Id);
 	Bond->SetId (buf);
 	Bond->SetProperty (GCU_PROP_BOND_ORDER, "1");
-	if (!READINT16 (in,code))
+	if (!(READINT16 (in,code)))
 		return false;
 	while (code) {
 		if (code & kCDXTag_Object) {
@@ -724,21 +725,21 @@
 				return false;
 			switch (code) {
 			case kCDXProp_Bond_Begin: {
-				if (size != 4 || !READINT32 (in,Id))
+				if (size != 4 || !(READINT32 (in,Id)))
 					return false;
 				snprintf (buf, bufsize, "%u", Id);
 				Bond->SetProperty (GCU_PROP_BOND_BEGIN, buf);
 				break;
 			}
 			case kCDXProp_Bond_End: {
-				if (size != 4 || !READINT32 (in,Id))
+				if (size != 4 || !(READINT32 (in,Id)))
 					return false;
 				snprintf (buf, bufsize, "%u", Id);
 				Bond->SetProperty (GCU_PROP_BOND_END, buf);
 				break;
 			}
 			case kCDXProp_Bond_Order:
-				if (size != 2 || !READINT16 (in,size))
+				if (size != 2 || !(READINT16 (in,size)))
 					return false;
 				switch (size) {
 				case 2:
@@ -753,7 +754,7 @@
 				}
 				break;
 			case kCDXProp_Bond_Display:
-				if (size != 2 || !READINT16 (in,size))
+				if (size != 2 || !(READINT16 (in,size)))
 					return false;
 				switch (size) {
 				case 1:
@@ -785,7 +786,7 @@
 					return false;
 			}
 		}
-		if (!READINT16 (in,code))
+		if (!(READINT16 (in,code)))
 			return false;
 	}
 	return true;
@@ -805,11 +806,11 @@
 	Object *Text= Object::CreateObject ("text", parent);
 	guint32 Id;
 	guint8 TextAlign = 0xfe, TextJustify = 0xfe;
-	if (!READINT32 (in,Id))
+	if (!(READINT32 (in,Id)))
 		return false;
 	snprintf (buf, bufsize, "t%d", Id);
 	Text->SetId (buf);
-	if (!READINT16 (in,code))
+	if (!(READINT16 (in,code)))
 		return false;
 	while (code) {
 		if (code & kCDXTag_Object) {
@@ -824,9 +825,9 @@
 				if (size != 8)
 					return false;
 				gint32 x, y;
-				if (!READINT32 (in,y))
+				if (!(READINT32 (in,y)))
 					return false;
-				if (!READINT32 (in,x))
+				if (!(READINT32 (in,x)))
 					return false;
 				snprintf (buf, bufsize, "%d %d", x, y);
 				Text->SetProperty (GCU_PROP_POS2D, buf);
@@ -838,7 +839,7 @@
 				attribs attrs, attrs0;
 				attrs0.index = 0; // makes gcc happy
 				attrs0.face = 0; // ditto
-				if (!READINT16 (in,nb))
+				if (!(READINT16 (in,nb)))
 					return false;
 				list <attribs> attributes;
 				size -=2;
@@ -847,7 +848,7 @@
 					if (size < 10)
 						return false;
 					for (int j = 0; j < 5; j++)
-						if (!READINT16 (in,n[j]))
+						if (!(READINT16 (in,n[j])))
 							return false;
 					attributes.push_back (attrs);
 					size -= 10;
@@ -1012,7 +1013,7 @@
 					return false;
 			}
 		}
-		if (!READINT16 (in,code))
+		if (!(READINT16 (in,code)))
 			return false;
 	}
 	if (TextAlign == 0xfe)
@@ -1060,7 +1061,7 @@
 	Group->Lock ();
 	if (gsf_input_seek (in, 4, G_SEEK_CUR)) //skip the id
 		return false;
-	if (!READINT16 (in,code))
+	if (!(READINT16 (in,code)))
 		return false;
 	while (code) {
 		if (code & kCDXTag_Object) {
@@ -1084,7 +1085,7 @@
 			if (size && !gsf_input_read (in, size, (guint8*) buf))
 				return false;
 		}
-		if (!READINT16 (in,code))
+		if (!(READINT16 (in,code)))
 			return false;
 	}
 	Group->Lock (false);
@@ -1098,7 +1099,7 @@
 	guint32 Id;
 	guint16 type = 0xffff, arrow_type = 0xffff;
 	gint32 x0, y0, x1, y1;
-	if (!READINT32 (in,Id) || !READINT16 (in,code))
+	if (!(READINT32 (in,Id)) || !(READINT16 (in,code)))
 		return false;
 	while (code) {
 		if (code & kCDXTag_Object) {
@@ -1110,8 +1111,8 @@
 				return false;
 			switch (code) {
 			case kCDXProp_BoundingBox:
-				if (size != 16 || !READINT32 (in,y1) || !READINT32 (in,x1)
-					|| !READINT32 (in,y0) || !READINT32 (in,x0))
+				if (size != 16 || !(READINT32 (in,y1)) || !(READINT32 (in,x1))
+					|| !(READINT32 (in,y0)) || !(READINT32 (in,x0)))
 					return false;
 				break;
 			case kCDXProp_Graphic_Type:
@@ -1125,7 +1126,7 @@
 					return false;
 			}
 		}
-		if (!READINT16 (in,code))
+		if (!(READINT16 (in,code)))
 			return false;
 	}
 	if (type == 1) {
@@ -1164,7 +1165,7 @@
 guint16 CDXLoader::ReadSize  (GsfInput *in)
 {
 	guint16 size;
-	if (!READINT16 (in,size))
+	if (!(READINT16 (in,size)))
 		return 0xffff;
 	if ((unsigned) size + 1 > bufsize) {
 		do
@@ -1180,7 +1181,7 @@
 {
 	guint16 n[7];
 	for (int i = 0; i < 7; i++)
-		if (!READINT16 (in,n[i]))
+		if (!(READINT16 (in,n[i])))
 			return false;
 	GDate *date = g_date_new_dmy (n[2], (GDateMonth) n[1], n[0]);
 	g_date_strftime (buf, bufsize, "%m/%d/%Y", date);
@@ -1193,7 +1194,7 @@
 	guint16 code;
 	if (gsf_input_seek (in, 4, G_SEEK_CUR)) //skip the id
 		return false;
-	if (!READINT16 (in,code))
+	if (!(READINT16 (in,code)))
 		return false;
 	while (code) {
 		if (code & kCDXTag_Object) {
@@ -1218,7 +1219,7 @@
 			}*/
 			case kCDXProp_Text: {
 				guint16 nb;
-				if (!READINT16 (in,nb))
+				if (!(READINT16 (in,nb)))
 					return false;
 				size -=2;
 				for (int i =0; i < nb; i++) {
@@ -1226,7 +1227,7 @@
 						return false;
 					guint16 n[5];
 					for (int j = 0; j < 5; j++)
-						if (!READINT16 (in,n[j]))
+						if (!(READINT16 (in,n[j])))
 							return false;
 					size -= 10;
 				}
@@ -1242,7 +1243,7 @@
 					return false;
 			}
 		}
-		if (!READINT16 (in,code))
+		if (!(READINT16 (in,code)))
 			return false;
 	}
 	return true;


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/gnome-chemistry-utils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnome-chemistry-utils.spec	7 Sep 2008 15:52:51 -0000	1.22
+++ gnome-chemistry-utils.spec	8 Sep 2008 23:05:55 -0000	1.23
@@ -7,7 +7,7 @@
 License:        GPLv2+
 URL:            http://www.nongnu.org/gchemutils/
 Source0:        http://download.savannah.nongnu.org/releases/gchemutils/%{name}-%{version}.tar.bz2
-Patch0:         gnome-chemistry-utils-0.9.90-readint32.patch
+Patch0:         gnome-chemistry-utils-0.9.90-ppc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bodr
@@ -58,17 +58,19 @@
 Requires:       %{_libdir}/mozilla/plugins
 
 %description    mozplugin
-This package is a set of chemical utils. Four programs are available:
-* A 3D molecular structure viewer (GChem3DViewer).
+This package is a set of chemical utils. Several programs are available:
+* A 3D molecular structure viewer (GChem3D).
 * A Chemical calculator (GChemCalc).
+* A 2D structure editor (GChemPaint).
 * A periodic table of the elements application (GChemTable).
 * A crystalline structure editor (GCrystal).
+* A spectra viewer (GSpectrum).
 This package contains the mozilla plugin
 
 
 %prep
 %setup -q
-%patch0 -p0 -b .readint32
+%patch0 -p0 -b .ppc
 
 
 %build
@@ -208,7 +210,7 @@
 
 %changelog
 * Sun Sep  7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.90-2
-- Patched the ppc build failure, thanks to Tom Callaway
+- Patched the ppc build failure, thanks to Tom Callaway and Jean Br??fort
 
 * Sun Sep  7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.90-1
 - Updated to 0.9.90


--- gnome-chemistry-utils-0.9.90-readint32.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Sep  8 23:16:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:16:48 +0000
Subject: [pkgdb] facter: tmz has requested watchbugzilla
Message-ID: <20080908231648.121DB20876F@bastion.fedora.phx.redhat.com>

tmz has requested the watchbugzilla acl on facter (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:16:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:16:49 +0000
Subject: [pkgdb] facter: tmz has requested commit
Message-ID: <20080908231649.F2009208D07@bastion.fedora.phx.redhat.com>

tmz has requested the commit acl on facter (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:16:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:16:52 +0000
Subject: [pkgdb] facter: tmz has requested watchcommits
Message-ID: <20080908231652.E0531208D7C@bastion.fedora.phx.redhat.com>

tmz has requested the watchcommits acl on facter (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:17:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:17:07 +0000
Subject: [pkgdb] facter: tmz has requested watchcommits
Message-ID: <20080908231707.ED95D20876F@bastion.fedora.phx.redhat.com>

tmz has requested the watchcommits acl on facter (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:17:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:17:09 +0000
Subject: [pkgdb] facter: tmz has requested watchbugzilla
Message-ID: <20080908231709.F1146208D99@bastion.fedora.phx.redhat.com>

tmz has requested the watchbugzilla acl on facter (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:17:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:17:09 +0000
Subject: [pkgdb] facter: tmz has requested commit
Message-ID: <20080908231709.C8879208770@bastion.fedora.phx.redhat.com>

tmz has requested the commit acl on facter (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:17:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:17:17 +0000
Subject: [pkgdb] facter: tmz has requested watchbugzilla
Message-ID: <20080908231717.1F130208D9E@bastion.fedora.phx.redhat.com>

tmz has requested the watchbugzilla acl on facter (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:17:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:17:20 +0000
Subject: [pkgdb] facter: tmz has requested watchcommits
Message-ID: <20080908231720.86463208DA1@bastion.fedora.phx.redhat.com>

tmz has requested the watchcommits acl on facter (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:17:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:17:21 +0000
Subject: [pkgdb] facter: tmz has requested commit
Message-ID: <20080908231721.673E620876F@bastion.fedora.phx.redhat.com>

tmz has requested the commit acl on facter (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:17:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:17:44 +0000
Subject: [pkgdb] facter: tmz has requested watchcommits
Message-ID: <20080908231744.D3064208D0F@bastion.fedora.phx.redhat.com>

tmz has requested the watchcommits acl on facter (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:17:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:17:45 +0000
Subject: [pkgdb] facter: tmz has requested watchbugzilla
Message-ID: <20080908231745.64A47208D99@bastion.fedora.phx.redhat.com>

tmz has requested the watchbugzilla acl on facter (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:17:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:17:48 +0000
Subject: [pkgdb] facter: tmz has requested commit
Message-ID: <20080908231748.1BC11208D9C@bastion.fedora.phx.redhat.com>

tmz has requested the commit acl on facter (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From mclasen at fedoraproject.org  Mon Sep  8 23:20:51 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 23:20:51 +0000 (UTC)
Subject: rpms/gnome-backgrounds/devel .cvsignore, 1.13,
	1.14 gnome-backgrounds.spec, 1.19, 1.20 sources, 1.13, 1.14
Message-ID: <20080908232051.663E0700FD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28261

Modified Files:
	.cvsignore gnome-backgrounds.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	3 Sep 2008 01:57:41 -0000	1.13
+++ .cvsignore	8 Sep 2008 23:20:21 -0000	1.14
@@ -1 +1 @@
-gnome-backgrounds-2.23.91.tar.bz2
+gnome-backgrounds-2.23.92.tar.bz2


Index: gnome-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/gnome-backgrounds.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-backgrounds.spec	3 Sep 2008 01:57:41 -0000	1.19
+++ gnome-backgrounds.spec	8 Sep 2008 23:20:21 -0000	1.20
@@ -1,6 +1,6 @@
 Summary: Desktop backgrounds packaged with the GNOME desktop
 Name: gnome-backgrounds
-Version: 2.23.91
+Version: 2.23.92
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
@@ -51,6 +51,9 @@
 %{_datadir}/backgrounds/*
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	3 Sep 2008 01:57:41 -0000	1.13
+++ sources	8 Sep 2008 23:20:21 -0000	1.14
@@ -1 +1 @@
-c39409ede1e220470c7168dfdfd1c00b  gnome-backgrounds-2.23.91.tar.bz2
+c532820d4cabb5d2ba3406a18c70287d  gnome-backgrounds-2.23.92.tar.bz2



From mclasen at fedoraproject.org  Mon Sep  8 23:32:37 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 23:32:37 +0000 (UTC)
Subject: rpms/eel2/devel .cvsignore, 1.66, 1.67 eel2.spec, 1.94, 1.95 sources,
	1.66, 1.67
Message-ID: <20080908233237.4156B700FD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/eel2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30294

Modified Files:
	.cvsignore eel2.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eel2/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore	2 Sep 2008 07:58:40 -0000	1.66
+++ .cvsignore	8 Sep 2008 23:32:06 -0000	1.67
@@ -1 +1 @@
-eel-2.23.91.tar.bz2
+eel-2.23.92.tar.bz2


Index: eel2.spec
===================================================================
RCS file: /cvs/extras/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- eel2.spec	2 Sep 2008 07:58:40 -0000	1.94
+++ eel2.spec	8 Sep 2008 23:32:06 -0000	1.95
@@ -16,7 +16,7 @@
 
 Name:        eel2
 Summary:     Eazel Extensions Library
-Version:     2.23.91
+Version:     2.23.92
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       System Environment/Libraries
@@ -108,6 +108,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Tue Sep 02 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eel2/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	2 Sep 2008 07:58:40 -0000	1.66
+++ sources	8 Sep 2008 23:32:06 -0000	1.67
@@ -1 +1 @@
-b7beb56a8fc09485a47415e2049753cd  eel-2.23.91.tar.bz2
+630d8ff2a3bc9136c1ad3c91884a839e  eel-2.23.92.tar.bz2



From mclasen at fedoraproject.org  Mon Sep  8 23:37:54 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 23:37:54 +0000 (UTC)
Subject: rpms/libwnck/devel .cvsignore, 1.65, 1.66 libwnck.spec, 1.100,
	1.101 sources, 1.65, 1.66
Message-ID: <20080908233754.CD855700FD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libwnck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31323

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	3 Sep 2008 00:00:25 -0000	1.65
+++ .cvsignore	8 Sep 2008 23:37:24 -0000	1.66
@@ -1 +1 @@
-libwnck-2.23.91.tar.bz2
+libwnck-2.23.92.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- libwnck.spec	3 Sep 2008 00:00:26 -0000	1.100
+++ libwnck.spec	8 Sep 2008 23:37:24 -0000	1.101
@@ -5,7 +5,7 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.23.91
+Version: 2.23.92
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/libwnck/
 Source0: http://download.gnome.org/sources/libwnck/2.23/%{name}-%{version}.tar.bz2
@@ -93,6 +93,9 @@
 %doc %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	3 Sep 2008 00:00:26 -0000	1.65
+++ sources	8 Sep 2008 23:37:24 -0000	1.66
@@ -1 +1 @@
-2afd35e602844c3c859f3a41b701545d  libwnck-2.23.91.tar.bz2
+3924d0b346e9e361f19a8aadc6631c4f  libwnck-2.23.92.tar.bz2



From mccann at fedoraproject.org  Mon Sep  8 23:48:58 2008
From: mccann at fedoraproject.org (William Jon McCann)
Date: Mon,  8 Sep 2008 23:48:58 +0000 (UTC)
Subject: rpms/gnome-session/devel .cvsignore, 1.63, 1.64 gnome-session.spec, 
	1.188, 1.189 sources, 1.67, 1.68
Message-ID: <20080908234858.9F561700FD@cvs1.fedora.phx.redhat.com>

Author: mccann

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1038

Modified Files:
	.cvsignore gnome-session.spec sources 
Log Message:
- Update to 2.23.92




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	28 Aug 2008 14:10:27 -0000	1.63
+++ .cvsignore	8 Sep 2008 23:48:28 -0000	1.64
@@ -1 +1 @@
-gnome-session-2.23.91.tar.bz2
+gnome-session-2.23.92.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- gnome-session.spec	3 Sep 2008 03:45:18 -0000	1.188
+++ gnome-session.spec	8 Sep 2008 23:48:28 -0000	1.189
@@ -11,7 +11,7 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.23.91
+Version: 2.23.92
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2
@@ -168,6 +168,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Jon McCann  <jmccann at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Tue Sep  2 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	28 Aug 2008 14:10:28 -0000	1.67
+++ sources	8 Sep 2008 23:48:28 -0000	1.68
@@ -1 +1 @@
-d23b5c3ed59a6c66563329c1252cd3dd  gnome-session-2.23.91.tar.bz2
+cb7e32539a884ca77de6fa57ceab4546  gnome-session-2.23.92.tar.bz2



From mclasen at fedoraproject.org  Mon Sep  8 23:49:57 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 23:49:57 +0000 (UTC)
Subject: rpms/gnome-desktop/devel .cvsignore, 1.70, 1.71 gnome-desktop.spec, 
	1.162, 1.163 sources, 1.70, 1.71
Message-ID: <20080908234957.A61BE700FD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1351

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	3 Sep 2008 02:18:49 -0000	1.70
+++ .cvsignore	8 Sep 2008 23:49:27 -0000	1.71
@@ -1 +1 @@
-gnome-desktop-2.23.91.tar.bz2
+gnome-desktop-2.23.92.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- gnome-desktop.spec	4 Sep 2008 17:11:02 -0000	1.162
+++ gnome-desktop.spec	8 Sep 2008 23:49:27 -0000	1.163
@@ -11,8 +11,8 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.23.91
-Release: 4%{?dist}
+Version: 2.23.92
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.23/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -121,6 +121,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Thu Sep  4 2008 Soren Sandmann <sandmann at redhat.com> - 2.23.91-4
 - Fix bug 461152
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	3 Sep 2008 02:18:49 -0000	1.70
+++ sources	8 Sep 2008 23:49:27 -0000	1.71
@@ -1 +1 @@
-a07b31b16cf8f429a131c0fb1fc15d1c  gnome-desktop-2.23.91.tar.bz2
+6c1aba90eb57de56044669e6f9dbeb9c  gnome-desktop-2.23.92.tar.bz2



From pkgdb at fedoraproject.org  Mon Sep  8 23:58:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:58:28 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080908235828.53D3B208771@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on facter (Fedora devel) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:58:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:58:31 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080908235831.5B427208D97@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on facter (Fedora devel) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:58:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:58:33 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080908235833.8AAFE208D9A@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on facter (Fedora devel) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:58:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:58:36 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080908235837.0E895208D9E@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on facter (Fedora EPEL 5) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:58:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:58:38 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080908235838.E63802D0023@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on facter (Fedora EPEL 5) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:58:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:58:40 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080908235840.BD60E2D0025@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on facter (Fedora EPEL 5) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:58:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:58:45 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080908235845.4EB482D0028@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on facter (Fedora 8) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:58:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:58:46 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080908235846.DF6842D002B@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on facter (Fedora 8) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:58:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:58:48 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080908235850.6AA072E0003@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on facter (Fedora 8) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:58:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:58:50 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080908235850.BB647208771@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on facter (Fedora 9) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From mclasen at fedoraproject.org  Mon Sep  8 23:58:51 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  8 Sep 2008 23:58:51 +0000 (UTC)
Subject: rpms/gedit/devel .cvsignore, 1.78, 1.79 gedit.spec, 1.166,
	1.167 sources, 1.80, 1.81
Message-ID: <20080908235851.BF1E47012B@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2847

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- .cvsignore	3 Sep 2008 03:51:34 -0000	1.78
+++ .cvsignore	8 Sep 2008 23:58:21 -0000	1.79
@@ -1 +1 @@
-gedit-2.23.91.tar.bz2
+gedit-2.23.92.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- gedit.spec	3 Sep 2008 03:51:34 -0000	1.166
+++ gedit.spec	8 Sep 2008 23:58:21 -0000	1.167
@@ -17,7 +17,7 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
-Version: 	2.23.91
+Version: 	2.23.92
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.92-1
+- Update to 2.23.92
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	3 Sep 2008 03:51:34 -0000	1.80
+++ sources	8 Sep 2008 23:58:21 -0000	1.81
@@ -1 +1 @@
-041d69d83279b5eb015622847e660779  gedit-2.23.91.tar.bz2
+f3aca6ac9187a27ea89384c4054a1060  gedit-2.23.92.tar.bz2



From pkgdb at fedoraproject.org  Mon Sep  8 23:58:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:58:51 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080908235851.A550C208D0F@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on facter (Fedora 9) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Mon Sep  8 23:58:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 08 Sep 2008 23:58:53 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080908235853.825AC208D9F@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on facter (Fedora 9) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From mclasen at fedoraproject.org  Tue Sep  9 00:08:43 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  9 Sep 2008 00:08:43 +0000 (UTC)
Subject: rpms/gnome-media/devel .cvsignore, 1.44, 1.45 gnome-media.spec,
	1.138, 1.139 sources, 1.43, 1.44
Message-ID: <20080909000843.356157012D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4512

Modified Files:
	.cvsignore gnome-media.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-media/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	3 Sep 2008 01:09:06 -0000	1.44
+++ .cvsignore	9 Sep 2008 00:08:12 -0000	1.45
@@ -1 +1 @@
-gnome-media-2.23.91.tar.bz2
+gnome-media-2.23.92.tar.bz2


Index: gnome-media.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- gnome-media.spec	5 Sep 2008 02:16:20 -0000	1.138
+++ gnome-media.spec	9 Sep 2008 00:08:12 -0000	1.139
@@ -13,8 +13,8 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.23.91
-Release:        2%{?dist}
+Version:        2.23.92
+Release:        1%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.23/gnome-media-%{version}.tar.bz2
@@ -204,6 +204,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com>  2.23.92-1
+- Update to 2.23.92
+
 * Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com>  2.23.91-2
 - Fix a non-standard icon name
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-media/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	3 Sep 2008 01:09:06 -0000	1.43
+++ sources	9 Sep 2008 00:08:12 -0000	1.44
@@ -1 +1 @@
-cfa4a675b3cc24c79a8821ac712c0deb  gnome-media-2.23.91.tar.bz2
+49d30a2c182d626226999a2d54e1511d  gnome-media-2.23.92.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep  9 00:13:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:13:36 +0000
Subject: [pkgdb] opencv ownership updated
Message-ID: <20080909001336.32739208771@bastion.fedora.phx.redhat.com>

Package opencv in Fedora devel was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From transif at fedoraproject.org  Tue Sep  9 00:28:20 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Tue,  9 Sep 2008 00:28:20 +0000 (UTC)
Subject: comps/po de.po,1.21,1.22
Message-ID: <20080909002820.EEFC17012A@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7249/po

Modified Files:
	de.po 
Log Message:
    2008-09-09  Daniela Kugelmann <dkugelma at redhat.com> (via
dkugelma at fedoraproject.org)
    
      * po/de.po: Updated German translation.
    



Index: de.po
===================================================================
RCS file: /cvs/pkgs/comps/po/de.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- de.po	5 Sep 2008 05:40:18 -0000	1.21
+++ de.po	9 Sep 2008 00:27:50 -0000	1.22
@@ -14,8 +14,8 @@
 msgstr ""
 "Project-Id-Version: comps.HEAD.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-03 19:27+0000\n"
-"PO-Revision-Date: 2008-09-04 11:16+1000\n"
+"POT-Creation-Date: 2008-09-08 19:29+0000\n"
+"PO-Revision-Date: 2008-09-09 10:26+1000\n"
 "Last-Translator: Daniela Kugelmann <dkugelma at redhat.com >\n"
 "Language-Team: German <i18 at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -132,82 +132,82 @@
 msgstr "Unterst??tzung f??r Bulgarisch"
 
 #: ../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-f10.xml.in.h:23
 msgid "Catalan Support"
 msgstr "Unterst??tzung f??r Spanisch (Katalanien)"
 
 #: ../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-f10.xml.in.h:24
 msgid "Chinese Support"
 msgstr "Unterst??tzung f??r Chinesisch"
 
 #: ../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-f10.xml.in.h:25
 msgid "Clustering"
 msgstr "Clustering"
 
 #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26
-#: ../comps-f10.xml.in.h:27
+#: ../comps-f10.xml.in.h:26
 msgid "Clustering Support"
 msgstr "Unterst??tzung f??r Clustering"
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27
-#: ../comps-f10.xml.in.h:28
+#: ../comps-f10.xml.in.h:27
 msgid "Core"
 msgstr "Kern"
 
 #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28
-#: ../comps-f10.xml.in.h:29
+#: ../comps-f10.xml.in.h:28
 msgid "Croatian Support"
 msgstr "Unterst??tzung f??r Kroatisch"
 
 #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29
-#: ../comps-f10.xml.in.h:30 ../comps-el5.xml.in.h:8
+#: ../comps-f10.xml.in.h:29 ../comps-el5.xml.in.h:8
 msgid "Czech Support"
 msgstr "Unterst??tzung f??r Tschechisch"
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30
-#: ../comps-f10.xml.in.h:31
+#: ../comps-f10.xml.in.h:30
 msgid "DNS Name Server"
 msgstr "DNS-Nameserver"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31
-#: ../comps-f10.xml.in.h:32
+#: ../comps-f10.xml.in.h:31
 msgid "Danish Support"
 msgstr "Unterst??tzung f??r D??nisch"
 
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
-#: ../comps-f10.xml.in.h:33 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9
+#: ../comps-f10.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "Desktopumgebungen"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
-#: ../comps-f10.xml.in.h:34 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10
+#: ../comps-f10.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "Desktopumgebungen"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
-#: ../comps-f10.xml.in.h:35 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11
+#: ../comps-f10.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "Softwareentwicklung"
 
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35
-#: ../comps-f10.xml.in.h:36
+#: ../comps-f10.xml.in.h:35
 msgid "Development Libraries"
 msgstr "Entwicklungsbibliotheken"
 
 #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36
-#: ../comps-f10.xml.in.h:37 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12
+#: ../comps-f10.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "Entwicklungswerkzeuge"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37
-#: ../comps-f10.xml.in.h:38
+#: ../comps-f10.xml.in.h:37
 msgid "Dial-up Networking Support"
 msgstr "Unterst??tzung f??r DF??-Netzwerke"
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
-#: ../comps-f10.xml.in.h:39
+#: ../comps-f10.xml.in.h:38
 msgid "Dutch Support"
 msgstr "Unterst??tzung f??r Holl??ndisch"
 
@@ -216,73 +216,73 @@
 msgstr "Eclipse"
 
 #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39
-#: ../comps-f10.xml.in.h:40 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14
+#: ../comps-f10.xml.in.h:39 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "Editoren"
 
 #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40
-#: ../comps-f10.xml.in.h:41 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15
+#: ../comps-f10.xml.in.h:40 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "Bildungssoftware"
 
 #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41
-#: ../comps-f10.xml.in.h:42 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16
+#: ../comps-f10.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "Bildungssoftware f??r das Lernen"
 
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
-#: ../comps-f10.xml.in.h:43 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
+#: ../comps-f10.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "Ingenieurwesen und Wissenschaft"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43
-#: ../comps-f10.xml.in.h:44
+#: ../comps-f10.xml.in.h:43
 msgid "English (UK) Support"
 msgstr "Unterst??tzung f??r Englisch (UK)"
 
 #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45
-#: ../comps-f10.xml.in.h:46
+#: ../comps-f10.xml.in.h:45
 msgid "Estonian Support"
 msgstr "Unterst??tzung f??r Estnisch"
 
 #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46
-#: ../comps-f10.xml.in.h:47
+#: ../comps-f10.xml.in.h:46
 msgid "Ethiopic Support"
 msgstr "Unterst??tzung f??r ??thiopisch"
 
 #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47
-#: ../comps-f10.xml.in.h:48 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18
+#: ../comps-f10.xml.in.h:47 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18
 msgid "FTP Server"
 msgstr "FTP-Server"
 
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48
-#: ../comps-f10.xml.in.h:49
+#: ../comps-f10.xml.in.h:48
 msgid "Faeroese Support"
 msgstr "Unterst??tzung f??r F??r??erisch"
 
 # from Translator: Eclipse seems to be a proper name
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
-#: ../comps-f10.xml.in.h:51 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19
+#: ../comps-f10.xml.in.h:50 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19
 msgid "Fedora Packager"
 msgstr "Fedora-Paketierer"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
-#: ../comps-f10.xml.in.h:52
+#: ../comps-f10.xml.in.h:51
 msgid "Filipino Support"
 msgstr "Unterst??tzung f??r Philipinisch"
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52
-#: ../comps-f10.xml.in.h:53
+#: ../comps-f10.xml.in.h:52
 msgid "Finnish Support"
 msgstr "Unterst??tzung f??r Finnisch"
 
 #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55
-#: ../comps-f10.xml.in.h:56
+#: ../comps-f10.xml.in.h:55
 msgid "French Support"
 msgstr "Unterst??tzung f??r Franz??sisch"
 
 #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56
-#: ../comps-f10.xml.in.h:57 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20
+#: ../comps-f10.xml.in.h:56 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
 "group allows you to work with sound and video on the system."
@@ -292,17 +292,17 @@
 "Videofunktionen des Systems."
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
-#: ../comps-f10.xml.in.h:58 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21
+#: ../comps-f10.xml.in.h:57 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21
 msgid "GNOME Desktop Environment"
 msgstr "GNOME-Desktopumgebung"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58
-#: ../comps-f10.xml.in.h:59 ../comps-el4.xml.in.h:21 ../comps-el5.xml.in.h:22
+#: ../comps-f10.xml.in.h:58 ../comps-el4.xml.in.h:21 ../comps-el5.xml.in.h:22
 msgid "GNOME Software Development"
 msgstr "GNOME-Softwareentwicklung"
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59
-#: ../comps-f10.xml.in.h:60
+#: ../comps-f10.xml.in.h:59
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -311,82 +311,82 @@
 "Desktop, Systemsymbolen und grafischem Dateimanager."
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60
-#: ../comps-f10.xml.in.h:61
+#: ../comps-f10.xml.in.h:60
 msgid "Gaelic Support"
 msgstr "Unterst??tzung f??r G??lisch"
 
 #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61
-#: ../comps-f10.xml.in.h:62
+#: ../comps-f10.xml.in.h:61
 msgid "Galician Support"
 msgstr "Unterst??tzung f??r Galizisch"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62
-#: ../comps-f10.xml.in.h:63 ../comps-el5.xml.in.h:24
+#: ../comps-f10.xml.in.h:62 ../comps-el5.xml.in.h:24
 msgid "Games and Entertainment"
 msgstr "Spiele und Zeitvertreib"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
-#: ../comps-f10.xml.in.h:64
+#: ../comps-f10.xml.in.h:63
 msgid "Georgian Support"
 msgstr "Unterst??tzung f??r Georgisch"
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
-#: ../comps-f10.xml.in.h:65
+#: ../comps-f10.xml.in.h:64
 msgid "German Support"
 msgstr "Unterst??tzung f??r Deutsch"
 
 #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65
-#: ../comps-f10.xml.in.h:66 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25
+#: ../comps-f10.xml.in.h:65 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25
 msgid "Graphical Internet"
 msgstr "Grafische Internetprogramme"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66
-#: ../comps-f10.xml.in.h:67 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26
+#: ../comps-f10.xml.in.h:66 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26
 msgid "Graphics"
 msgstr "Grafik"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67
-#: ../comps-f10.xml.in.h:68
+#: ../comps-f10.xml.in.h:67
 msgid "Greek Support"
 msgstr "Unterst??tzung f??r Griechisch"
 
 #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68
-#: ../comps-f10.xml.in.h:69
+#: ../comps-f10.xml.in.h:68
 msgid "Gujarati Support"
 msgstr "Unterst??tzung f??r Gujarati"
 
 #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69
-#: ../comps-f10.xml.in.h:70 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27
+#: ../comps-f10.xml.in.h:69 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27
 msgid "Hardware Support"
 msgstr "Hardware-Unterst??tzung"
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70
-#: ../comps-f10.xml.in.h:72 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28
+#: ../comps-f10.xml.in.h:71 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28
 msgid "Hebrew Support"
 msgstr "Unterst??tzung f??r Hebr??isch"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71
-#: ../comps-f10.xml.in.h:73
+#: ../comps-f10.xml.in.h:72
 msgid "Hindi Support"
 msgstr "Unterst??tzung f??r Hindi"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72
-#: ../comps-f10.xml.in.h:74
+#: ../comps-f10.xml.in.h:73
 msgid "Hungarian Support"
 msgstr "Unterst??tzung f??r Ungarisch"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73
-#: ../comps-f10.xml.in.h:75
+#: ../comps-f10.xml.in.h:74
 msgid "Icelandic Support"
 msgstr "Unterst??tzung f??r Isl??ndisch"
 
 #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74
-#: ../comps-f10.xml.in.h:76
+#: ../comps-f10.xml.in.h:75
 msgid "Indonesian Support"
 msgstr "Unterst??tzung f??r Indonesisch"
 
 #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75
-#: ../comps-f10.xml.in.h:79 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29
+#: ../comps-f10.xml.in.h:78 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
@@ -395,7 +395,7 @@
 "zu entwickeln."
 
 #: ../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-f10.xml.in.h:79
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
@@ -404,68 +404,68 @@
 "entwickeln."
 
 #: ../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-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
+#: ../comps-f10.xml.in.h:80 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr ""
 "Installieren Sie diese Pakete, um grafische Anwendungen f??r QT und KDE zu "
 "entwickeln."
 
 #: ../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-f10.xml.in.h:81
 msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "Installieren Sie diese Programme, um es dem System zu erm??glichen zu drucken "
 "oder als Drucker-Server zu fungieren."
 
 #: ../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-el4.xml.in.h:29 ../comps-el5.xml.in.h:31
+#: ../comps-f10.xml.in.h:82 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31
 msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr ""
 "Installieren Sie diese Paketgruppe, um die grundlegende grafische "
 "Benutzeroberfl??che (X) zu verwenden."
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
-#: ../comps-f10.xml.in.h:85
+#: ../comps-f10.xml.in.h:84
 msgid "Inuktitut Support"
 msgstr "Unterst??tzung f??r Inuktitut"
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
-#: ../comps-f10.xml.in.h:86
+#: ../comps-f10.xml.in.h:85
 msgid "Irish Support"
 msgstr "Unterst??tzung f??r Irisch"
 
 #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83
-#: ../comps-f10.xml.in.h:87
+#: ../comps-f10.xml.in.h:86
 msgid "Italian Support"
 msgstr "Unterst??tzung f??r Italienisch"
 
 #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84
-#: ../comps-f10.xml.in.h:88 ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:32
+#: ../comps-f10.xml.in.h:87 ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:32
 msgid "Japanese Support"
 msgstr "Unterst??tzung f??r Japanisch"
 
 #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85
-#: ../comps-f10.xml.in.h:89 ../comps-el4.xml.in.h:31
+#: ../comps-f10.xml.in.h:88 ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "Java"
 
 #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86
-#: ../comps-f10.xml.in.h:90 ../comps-el4.xml.in.h:32
+#: ../comps-f10.xml.in.h:89 ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "Java-Softwareentwicklung"
 
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
-#: ../comps-f10.xml.in.h:91 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33
+#: ../comps-f10.xml.in.h:90 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K Desktop Environment)"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88
-#: ../comps-f10.xml.in.h:92 ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:34
+#: ../comps-f10.xml.in.h:91 ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:34
 msgid "KDE Software Development"
 msgstr "KDE-Softwareentwicklung"
 
 #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89
-#: ../comps-f10.xml.in.h:93
+#: ../comps-f10.xml.in.h:92
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -475,82 +475,82 @@
 
 # from Translator: Kannada are a sublanguage in India
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
-#: ../comps-f10.xml.in.h:94
+#: ../comps-f10.xml.in.h:93
 msgid "Kannada Support"
 msgstr "Unterst??tzung f??r Kannada (Indien)"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:96
+#: ../comps-f10.xml.in.h:95
 msgid "Khmer Support"
 msgstr "Unterst??tzung f??r Khmer"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:97
+#: ../comps-f10.xml.in.h:96
 msgid "Korean Support"
 msgstr "Unterst??tzung f??r Koreanisch"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:94
-#: ../comps-f10.xml.in.h:98
+#: ../comps-f10.xml.in.h:97
 msgid "Languages"
 msgstr "Sprachen"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:99
+#: ../comps-f10.xml.in.h:98
 msgid "Lao Support"
 msgstr "Unterst??tzung f??r Laotisch"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:100
+#: ../comps-f10.xml.in.h:99
 msgid "Latvian Support"
 msgstr "Unterst??tzung f??r Lettisch"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:98
-#: ../comps-f10.xml.in.h:102
+#: ../comps-f10.xml.in.h:101
 msgid "Legacy Network Server"
 msgstr "??ltere Netzwerk-Server"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:103
+#: ../comps-f10.xml.in.h:102
 msgid "Legacy Software Development"
 msgstr "??ltere Softwareentwicklung"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:104
+#: ../comps-f10.xml.in.h:103
 msgid "Legacy Software Support"
 msgstr "Unterst??tzung f??r ??ltere Software"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:105
+#: ../comps-f10.xml.in.h:104
 msgid "Lithuanian Support"
 msgstr "Unterst??tzung f??r Litauisch"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:104
-#: ../comps-f10.xml.in.h:108 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
+#: ../comps-f10.xml.in.h:107 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "Mail-Server"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:109
+#: ../comps-f10.xml.in.h:108
 msgid "Malay Support"
 msgstr "Unterst??tzung f??r Malaiisch"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:110
+#: ../comps-f10.xml.in.h:109
 msgid "Malayalam Support"
 msgstr "Unterst??tzung f??r Malayalam"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:111
+#: ../comps-f10.xml.in.h:110
 msgid "Maori Support"
 msgstr "Unterst??tzung f??r Maori"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:112
+#: ../comps-f10.xml.in.h:111
 msgid "Marathi Support"
 msgstr "Unterst??tzung f??r Marathi"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:110
-#: ../comps-f10.xml.in.h:114
+#: ../comps-f10.xml.in.h:113
 msgid "MySQL Database"
 msgstr "MySQL-Datenbank"
 
@@ -1104,31 +1104,31 @@
 msgid "Buildsystem building group"
 msgstr "Buildsystem Baugruppe"
 
-#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50
+#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
-#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54
+#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53
 msgid "Fonts"
 msgstr "Schriftarten"
 
-#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55
+#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "Schriftarten-Pakete zum Rendern von Text auf dem Desktop."
 
-#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84
+#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "Die auf Eclipse basierende integrierte Entwicklungsumgebung."
 
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:101
+#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:100
 msgid "Legacy Fonts"
 msgstr "??ltere Schriftarten"
 
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:106
+#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:105
 msgid "Low Saxon Support"
 msgstr "Unterst??tzung f??r Nieders??chsisch"
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:113
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:112
 msgid "Mongolian Support"
 msgstr "Unterst??tzung f??r Mongolisch"
 
@@ -1140,15 +1140,15 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr "??ltere Pakete mit Bitmap- und Vektor-Schriftarten"
 
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45
+#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44
 msgid "Esperanto Support"
 msgstr "Unterst??tzung f??r Esperanto"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:94
 msgid "Kashubian Support"
 msgstr "Unterst??tzung f??r Kashubisch"
 
-#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:107
+#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:106
 msgid "Macedonian Support"
 msgstr "Unterst??tzung f??r Mazedonisch"
 
@@ -1168,22 +1168,22 @@
 msgid "Walloon Support"
 msgstr "Unterst??tzung f??r Wallonisch"
 
-#: ../comps-f10.xml.in.h:23
-msgid "Burmese Support"
-msgstr "Unterst??tzung f??r Burmesisch"
-
-#: ../comps-f10.xml.in.h:71
+#: ../comps-f10.xml.in.h:70
 msgid "Haskell"
 msgstr "Haskell"
 
-#: ../comps-f10.xml.in.h:77
+#: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
 msgstr "Eingabemethoden"
 
-#: ../comps-f10.xml.in.h:78
+#: ../comps-f10.xml.in.h:77
 msgid "Input method packages for the input of international text."
 msgstr "Eingabemethoden-Paket f??r die Eingabe von internationalem Text."
 
+#: ../comps-f10.xml.in.h:114
+msgid "Myanmar (Burmese) Support"
+msgstr "Unterst??tzung f??r Burmesisch (Myanmar)"
+
 #: ../comps-f10.xml.in.h:158
 msgid "Tajik Support"
 msgstr "Unterst??tzung f??r Tajik"



From mclasen at fedoraproject.org  Tue Sep  9 00:38:40 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  9 Sep 2008 00:38:40 +0000 (UTC)
Subject: rpms/vte/devel .cvsignore, 1.69, 1.70 sources, 1.69, 1.70 vte.spec, 
	1.131, 1.132
Message-ID: <20080909003840.3B0F77012A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/vte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8190

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
0.17.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vte/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	14 Aug 2008 15:27:31 -0000	1.69
+++ .cvsignore	9 Sep 2008 00:38:09 -0000	1.70
@@ -1 +1 @@
-vte-0.17.2.tar.bz2
+vte-0.17.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vte/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	14 Aug 2008 15:27:31 -0000	1.69
+++ sources	9 Sep 2008 00:38:09 -0000	1.70
@@ -1 +1 @@
-515cd053e2c25423793ea4e057e3b018  vte-0.17.2.tar.bz2
+a0a84d0472854ebb428882f12a142efd  vte-0.17.3.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/extras/rpms/vte/devel/vte.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- vte.spec	14 Aug 2008 15:27:31 -0000	1.131
+++ vte.spec	9 Sep 2008 00:38:09 -0000	1.132
@@ -1,5 +1,5 @@
 Name: vte
-Version: 0.17.2
+Version: 0.17.3
 Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
@@ -105,6 +105,9 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 0.17.3-1
+- Update to 0.17.3
+
 * Thu Aug 14 2008 Behdad Esfahbod <besfahbo at redhat.com> 0.17.2-1
 - Update to 0.17.2
 



From pkgdb at fedoraproject.org  Tue Sep  9 00:41:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:41:47 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080909004147.2E2CA208771@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebase (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Tue Sep  9 00:41:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:41:49 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080909004149.96C21208D98@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebase (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Tue Sep  9 00:41:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:41:50 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080909004150.EE4D5208D9E@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebase (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Tue Sep  9 00:41:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:41:54 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080909004154.3903E208DA2@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebase (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Tue Sep  9 00:41:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:41:55 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080909004155.5621B208DA6@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebase (Fedora 8) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Tue Sep  9 00:41:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:41:58 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080909004158.BE587208DA9@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebase (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Tue Sep  9 00:41:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:41:58 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080909004159.DC144208DAD@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebase (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:00 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20080909004200.B513A208DB2@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebase (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:06 +0000
Subject: [pkgdb] kdebase3 had acl change status
Message-ID: <20080909004206.CD94B208DB5@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebase3 (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase3



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:08 +0000
Subject: [pkgdb] kdebase3 had acl change status
Message-ID: <20080909004208.27066208DBB@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebase3 (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase3



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:10 +0000
Subject: [pkgdb] kdebase3 had acl change status
Message-ID: <20080909004210.32979208D0F@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebase3 (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase3



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:10 +0000
Subject: [pkgdb] kdebase3 had acl change status
Message-ID: <20080909004210.69E79208DC4@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebase3 (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase3



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:15 +0000
Subject: [pkgdb] kdebase4 had acl change status
Message-ID: <20080909004215.3D220208DCB@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebase4 (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase4



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:17 +0000
Subject: [pkgdb] kdebase4 had acl change status
Message-ID: <20080909004217.D64AB208DD0@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebase4 (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase4



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:19 +0000
Subject: [pkgdb] kdebase4 had acl change status
Message-ID: <20080909004219.36039208DD5@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebase4 (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase4



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:20 +0000
Subject: [pkgdb] kdebase4 had acl change status
Message-ID: <20080909004220.DB5CE208DD9@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebase4 (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase4



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:23 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20080909004223.8B9B9208D98@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebase-runtime (Fedora devel) to Obsolete for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:24 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20080909004224.2C684208DE0@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebase-runtime (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:36 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20080909004236.2CC7D208D9F@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebase-runtime (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:39 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20080909004239.F210E208DE8@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebase-runtime (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:44 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20080909004244.B6A2F208DA3@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebase-runtime (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:46 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20080909004246.56160208DEC@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebase-workspace (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:46 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20080909004246.5D443208DF0@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebase-workspace (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:50 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20080909004250.93DFD208DF9@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebase-workspace (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:50 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20080909004253.08BF9208DFF@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebase-workspace (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:56 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080909004256.39A3A208DA6@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebindings (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:57 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080909004257.A8E16208E0A@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebindings (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Tue Sep  9 00:42:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:42:57 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080909004257.3D87B208E06@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebindings (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:02 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080909004302.EF59E208E10@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebindings (Fedora 8) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:06 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080909004306.7C98C208E12@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebindings (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:07 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080909004307.D217F208E14@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebindings (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:07 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080909004307.F3BE9208E18@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebindings (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:11 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20080909004311.7D62E208E1D@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeedu (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:10 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20080909004311.EFAC8208E22@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebindings (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:13 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20080909004313.E13ED208E26@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeedu (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:19 +0000
Subject: [pkgdb] kdeedu had group_acl changed
Message-ID: <20080909004319.B432C208DB1@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeedu (Fedora 7) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:18 +0000
Subject: [pkgdb] kdeedu had group_acl changed
Message-ID: <20080909004318.2783C208DB0@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeedu (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:24 +0000
Subject: [pkgdb] kdeedu had group_acl changed
Message-ID: <20080909004324.9D832208E2C@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeedu (Fedora 8) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:25 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20080909004325.EDA88208E30@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeedu (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:27 +0000
Subject: [pkgdb] kdeedu had group_acl changed
Message-ID: <20080909004327.6E163208E33@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeedu (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:30 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20080909004332.134A7208DB6@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeedu (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:32 +0000
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <20080909004332.296E1208E38@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kde-filesystem (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-filesystem



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:33 +0000
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <20080909004334.02768208E3D@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kde-filesystem (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-filesystem



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:38 +0000
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <20080909004338.E5AB1208E43@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kde-filesystem (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-filesystem



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:42 +0000
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <20080909004342.545C3208DBC@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kde-filesystem (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-filesystem



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:43 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20080909004343.30579208E48@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdegames (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:44 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20080909004344.84021208E4E@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdegames (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:45 +0000
Subject: [pkgdb] kdegames had group_acl changed
Message-ID: <20080909004345.ECC6A208E56@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdegames (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:45 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20080909004345.EBBB6208E55@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdegames (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:48 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20080909004348.71A72208E5B@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdegames (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:48 +0000
Subject: [pkgdb] kdegames had group_acl changed
Message-ID: <20080909004348.BF5A0208E5F@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdegames (Fedora 7) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:52 +0000
Subject: [pkgdb] kdegames had group_acl changed
Message-ID: <20080909004352.21902208D0F@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdegames (Fedora 8) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:53 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20080909004353.362D5208E61@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdegames (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:54 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20080909004354.51B26208E66@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdegames (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Tue Sep  9 00:43:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:43:56 +0000
Subject: [pkgdb] kdegames had group_acl changed
Message-ID: <20080909004356.2D982208E6C@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdegames (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Tue Sep  9 00:44:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:44:01 +0000
Subject: [pkgdb] kdegames3 had acl change status
Message-ID: <20080909004402.060A5208E71@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdegames3 (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Tue Sep  9 00:44:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:44:01 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20080909004402.10652208E75@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdegames (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Tue Sep  9 00:44:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:44:02 +0000
Subject: [pkgdb] kdegames3 had acl change status
Message-ID: <20080909004402.DC0E6208DC2@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdegames3 (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Tue Sep  9 00:44:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:44:02 +0000
Subject: [pkgdb] kdegames3 had acl change status
Message-ID: <20080909004403.069D7208E7B@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdegames3 (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Tue Sep  9 00:44:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:44:06 +0000
Subject: [pkgdb] kdegames3 had acl change status
Message-ID: <20080909004406.4C56B208E80@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdegames3 (Fedora 8) to Obsolete for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Tue Sep  9 00:44:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:44:09 +0000
Subject: [pkgdb] kdegames3 had acl change status
Message-ID: <20080909004409.5E311208E86@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdegames3 (Fedora 8) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Tue Sep  9 00:44:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:44:12 +0000
Subject: [pkgdb] kdegames3 had acl change status
Message-ID: <20080909004412.0B27A208E8B@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdegames3 (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Tue Sep  9 00:44:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:44:14 +0000
Subject: [pkgdb] kdegames3 had acl change status
Message-ID: <20080909004414.42C17208DC6@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdegames3 (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Tue Sep  9 00:44:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:44:16 +0000
Subject: [pkgdb] kdegames3 had acl change status
Message-ID: <20080909004416.63B8B208E90@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdegames3 (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Tue Sep  9 00:44:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:44:19 +0000
Subject: [pkgdb] kdegames3 had acl change status
Message-ID: <20080909004419.5572D208E96@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdegames3 (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Tue Sep  9 00:44:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:44:22 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20080909004422.CE5E5208E9C@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdegraphics (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Tue Sep  9 00:44:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:44:23 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20080909004423.BD975208EA1@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdegraphics (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Tue Sep  9 00:44:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:44:24 +0000
Subject: [pkgdb] kdegraphics had group_acl changed
Message-ID: <20080909004424.D1F09208DCA@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdegraphics (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Tue Sep  9 00:44:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:44:29 +0000
Subject: [pkgdb] kdegraphics had group_acl changed
Message-ID: <20080909004429.3251A208EA9@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdegraphics (Fedora 8) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Tue Sep  9 00:44:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:44:29 +0000
Subject: [pkgdb] kdegraphics had group_acl changed
Message-ID: <20080909004429.7117D208EAF@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdegraphics (Fedora 7) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Tue Sep  9 00:44:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:44:31 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20080909004431.8BF49208EB3@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdegraphics (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Tue Sep  9 00:44:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:44:32 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20080909004432.B526B208EB9@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdegraphics (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Tue Sep  9 00:44:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 00:44:34 +0000
Subject: [pkgdb] kdegraphics had group_acl changed
Message-ID: <20080909004434.2BD9B208EC0@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdegraphics (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From lennart at fedoraproject.org  Tue Sep  9 00:57:49 2008
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue,  9 Sep 2008 00:57:49 +0000 (UTC)
Subject: rpms/pulseaudio/devel pulseaudio.spec,1.49,1.50
Message-ID: <20080909005750.000E77012A@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10660

Modified Files:
	pulseaudio.spec 
Log Message:
Release 0.9.12


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- pulseaudio.spec	24 Jul 2008 13:46:25 -0000	1.49
+++ pulseaudio.spec	9 Sep 2008 00:57:19 -0000	1.50
@@ -2,7 +2,7 @@
 
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
-Version:	0.9.11
+Version:	0.9.12
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
@@ -20,7 +20,7 @@
 BuildRequires: libtool
 BuildRequires:	libXt-devel, xorg-x11-proto-devel
 BuildRequires: openssl-devel
-BuildRequires: gdbm-devel speex-devel
+BuildRequires: gdbm-devel speex-devel libasyncns-devel
 Requires:	%{name}-core-libs = %{version}-%{release}
 Obsoletes:	pulseaudio-devel
 #Patch2: 	pulseaudio-0.9.8-fix-sample-upload.patch
@@ -182,7 +182,7 @@
 
 %build
 %configure --disable-ltdl-install --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access
-make LIBTOOL=/usr/bin/libtool
+make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
 make doxygen
 
 %install
@@ -238,14 +238,15 @@
 %dir %{_sysconfdir}/pulse/
 %config(noreplace) %{_sysconfdir}/pulse/daemon.conf
 %config(noreplace) %{_sysconfdir}/pulse/default.pa
+%config(noreplace) %{_sysconfdir}/pulse/system.pa
 %config %{_sysconfdir}/xdg/autostart/pulseaudio.desktop
 %attr(4755,root,root) %{_bindir}/pulseaudio
-%attr(4755,root,root) %{_bindir}/start-pulseaudio-x11
+%{_bindir}/start-pulseaudio-x11
 %dir %{_libdir}/pulse-%{drvver}/
 %dir %{_libdir}/pulse-%{drvver}/modules/
 %{_libdir}/pulse-%{drvver}/modules/libalsa-util.so
-%{_libdir}/pulse-%{drvver}/modules/libauthkey-prop.so
 %{_libdir}/pulse-%{drvver}/modules/libauthkey.so
+%{_libdir}/pulse-%{drvver}/modules/libauth-cookie.so
 %{_libdir}/pulse-%{drvver}/modules/libcli.so
 %{_libdir}/pulse-%{drvver}/modules/libdbus-util.so
 %{_libdir}/pulse-%{drvver}/modules/libiochannel.so
@@ -304,6 +305,7 @@
 %{_libdir}/pulse-%{drvver}/modules/module-suspend-on-idle.so
 %{_libdir}/pulse-%{drvver}/modules/module-default-device-restore.so
 %{_libdir}/pulse-%{drvver}/modules/module-device-restore.so
+%{_libdir}/pulse-%{drvver}/modules/module-stream-restore.so
 %{_libdir}/pulse-%{drvver}/modules/module-ladspa-sink.so
 %{_libdir}/pulse-%{drvver}/modules/module-remap-sink.so
 %{_libdir}/pulse-%{drvver}/modules/module-always-sink.so
@@ -361,6 +363,7 @@
 %config(noreplace) %{_sysconfdir}/pulse/client.conf
 %{_libdir}/libpulse.so.*
 %{_libdir}/libpulse-simple.so.*
+%{_datadir}/locale/*
 
 %files core-libs
 %defattr(-,root,root)
@@ -407,6 +410,9 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Tue Sep 9 2008 Lennart Poettering <lpoetter at redhat.com> 0.9.12-1
+- Release 0.9.12
+
 * Thu Jul 24 2008 Lennart Poettering <lpoetter at redhat.com> 0.9.11-1
 - Final release 0.9.11
 



From mclasen at fedoraproject.org  Tue Sep  9 00:56:22 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  9 Sep 2008 00:56:22 +0000 (UTC)
Subject: rpms/nautilus/devel .cvsignore, 1.81, 1.82 nautilus.spec, 1.226,
	1.227 sources, 1.85, 1.86
Message-ID: <20080909005622.6EBA97012A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10480

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- .cvsignore	2 Sep 2008 08:11:59 -0000	1.81
+++ .cvsignore	9 Sep 2008 00:55:52 -0000	1.82
@@ -1 +1 @@
-nautilus-2.23.91.tar.bz2
+nautilus-2.23.92.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- nautilus.spec	2 Sep 2008 08:11:59 -0000	1.226
+++ nautilus.spec	9 Sep 2008 00:55:52 -0000	1.227
@@ -18,7 +18,7 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
-Version: 	2.23.91
+Version: 	2.23.92
 Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
@@ -99,9 +99,6 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=550009
-Patch20:	small-leaks.patch
-
 %description
 Nautilus integrates access to files, applications, media,
 Internet-based resources and the Web. Nautilus delivers a dynamic and
@@ -140,7 +137,6 @@
 %patch10 -p0 -b .gvfs-desktop-key
 %patch15 -p1 -b .xds
 %patch17 -p0 -b .symlink
-%patch20 -p0 -b .small-leaks
 
 %build
 
@@ -259,6 +255,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Tue Sep 02 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- sources	2 Sep 2008 08:11:59 -0000	1.85
+++ sources	9 Sep 2008 00:55:52 -0000	1.86
@@ -1 +1 @@
-21a456d9c7fed80a89b294dd5718a61c  nautilus-2.23.91.tar.bz2
+bb187a4352764067391b963aa153b72c  nautilus-2.23.92.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  9 00:58:47 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  9 Sep 2008 00:58:47 +0000 (UTC)
Subject: rpms/gnome-media/devel gnome-media.spec,1.139,1.140
Message-ID: <20080909005847.DEA577012A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10887

Modified Files:
	gnome-media.spec 
Log Message:
2.23.92



Index: gnome-media.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- gnome-media.spec	9 Sep 2008 00:08:12 -0000	1.139
+++ gnome-media.spec	9 Sep 2008 00:58:17 -0000	1.140
@@ -19,8 +19,6 @@
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.23/gnome-media-%{version}.tar.bz2
 Patch0:         gnome-media-2.13.5-hide-help-button.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=550931
-Patch1:		icon-names.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Obsoletes:      gnome
@@ -81,7 +79,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .hide-help-button
-%patch1 -p1 -b .icon-names
 
 %build
 # try to work around a problem where gst-inspect does 



From lennart at fedoraproject.org  Tue Sep  9 01:03:31 2008
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue,  9 Sep 2008 01:03:31 +0000 (UTC)
Subject: rpms/pulseaudio/devel .cvsignore,1.22,1.23 sources,1.24,1.25
Message-ID: <20080909010331.33A347012A@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11666

Modified Files:
	.cvsignore sources 
Log Message:
Release 0.9.12 -- add sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	24 Jul 2008 13:46:25 -0000	1.22
+++ .cvsignore	9 Sep 2008 01:03:00 -0000	1.23
@@ -1 +1 @@
-pulseaudio-0.9.11.tar.gz
+pulseaudio-0.9.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	24 Jul 2008 13:46:25 -0000	1.24
+++ sources	9 Sep 2008 01:03:00 -0000	1.25
@@ -1 +1 @@
-fa121f8e5dd4b98d65096de1b6c84021  pulseaudio-0.9.11.tar.gz
+b8851d52152c5c3b65f4f31ee1ab7631  pulseaudio-0.9.12.tar.gz



From cwickert at fedoraproject.org  Tue Sep  9 01:05:12 2008
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue,  9 Sep 2008 01:05:12 +0000 (UTC)
Subject: rpms/beldi/devel .cvsignore, 1.3, 1.4 beldi.spec, 1.2, 1.3 sources, 
	1.3, 1.4
Message-ID: <20080909010512.E72907012A@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/beldi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11811

Modified Files:
	.cvsignore beldi.spec sources 
Log Message:
* Tue Sep 09 2008 Christoph Wickert <fedora christoph-wickert de> 0.9.20-1
- Upgrade to 0.9.20



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beldi/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Aug 2008 22:04:51 -0000	1.3
+++ .cvsignore	9 Sep 2008 01:04:42 -0000	1.4
@@ -1 +1 @@
-beldi-0.9.18.tgz
+beldi-0.9.20.tgz


Index: beldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beldi/devel/beldi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beldi.spec	26 Aug 2008 22:04:51 -0000	1.2
+++ beldi.spec	9 Sep 2008 01:04:42 -0000	1.3
@@ -1,6 +1,6 @@
 Summary:	Belug Linux Distribution Burner
 Name:		beldi
-Version:	0.9.18
+Version:	0.9.20
 Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
@@ -50,6 +50,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Sep 09 2008 Christoph Wickert <fedora christoph-wickert de> 0.9.20-1
+- Upgrade to 0.9.20
+
 * Fri Aug 22 2008 Christoph Wickert <fedora christoph-wickert de> 0.9.18-1
 - Upgrade to 0.9.18
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beldi/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Aug 2008 22:04:51 -0000	1.3
+++ sources	9 Sep 2008 01:04:42 -0000	1.4
@@ -1 +1 @@
-94fa2a0989669e89219e728aa3ce201a  beldi-0.9.18.tgz
+9ecd63abe80986a1e4c482fe4ed4b00e  beldi-0.9.20.tgz



From lennart at fedoraproject.org  Tue Sep  9 01:12:13 2008
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue,  9 Sep 2008 01:12:13 +0000 (UTC)
Subject: rpms/pulseaudio/devel pulseaudio.spec,1.50,1.51
Message-ID: <20080909011213.84FE97012A@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12542

Modified Files:
	pulseaudio.spec 
Log Message:
Add intltool to deps


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- pulseaudio.spec	9 Sep 2008 00:57:19 -0000	1.50
+++ pulseaudio.spec	9 Sep 2008 01:11:43 -0000	1.51
@@ -3,7 +3,7 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.12
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -21,6 +21,7 @@
 BuildRequires:	libXt-devel, xorg-x11-proto-devel
 BuildRequires: openssl-devel
 BuildRequires: gdbm-devel speex-devel libasyncns-devel
+BuildRequires: intltool
 Requires:	%{name}-core-libs = %{version}-%{release}
 Obsoletes:	pulseaudio-devel
 #Patch2: 	pulseaudio-0.9.8-fix-sample-upload.patch
@@ -410,6 +411,9 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Tue Sep 9 2008 Lennart Poettering <lpoetter at redhat.com> 0.9.12-2
+- Add intltool to deps
+
 * Tue Sep 9 2008 Lennart Poettering <lpoetter at redhat.com> 0.9.12-1
 - Release 0.9.12
 



From mclasen at fedoraproject.org  Tue Sep  9 01:14:47 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  9 Sep 2008 01:14:47 +0000 (UTC)
Subject: rpms/gnome-menus/devel .cvsignore, 1.46, 1.47 gnome-menus.spec, 1.87,
	1.88 sources, 1.46, 1.47
Message-ID: <20080909011447.C1D2A7012A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-menus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13067

Modified Files:
	.cvsignore gnome-menus.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	3 Sep 2008 00:48:14 -0000	1.46
+++ .cvsignore	9 Sep 2008 01:14:17 -0000	1.47
@@ -1 +1 @@
-gnome-menus-2.23.91.tar.bz2
+gnome-menus-2.23.92.tar.bz2


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- gnome-menus.spec	3 Sep 2008 00:48:14 -0000	1.87
+++ gnome-menus.spec	9 Sep 2008 01:14:17 -0000	1.88
@@ -5,7 +5,7 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.23.91
+Version: 2.23.92
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -99,6 +99,9 @@
 %{_includedir}/gnome-menus
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	3 Sep 2008 00:48:14 -0000	1.46
+++ sources	9 Sep 2008 01:14:17 -0000	1.47
@@ -1 +1 @@
-33125708678e1fb5225e48d1f93f1ea9  gnome-menus-2.23.91.tar.bz2
+f8e5124ea3fe435aa4b8bf178957629e  gnome-menus-2.23.92.tar.bz2



From cwickert at fedoraproject.org  Tue Sep  9 01:17:52 2008
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue,  9 Sep 2008 01:17:52 +0000 (UTC)
Subject: rpms/beldi/F-9 .cvsignore, 1.3, 1.4 beldi.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20080909011752.94E597012E@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/beldi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13343/F-9

Modified Files:
	.cvsignore beldi.spec sources 
Log Message:
* Tue Sep 09 2008 Christoph Wickert <fedora christoph-wickert de> 0.9.20-1
- Upgrade to 0.9.20



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beldi/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Aug 2008 22:17:37 -0000	1.3
+++ .cvsignore	9 Sep 2008 01:17:22 -0000	1.4
@@ -1 +1 @@
-beldi-0.9.18.tgz
+beldi-0.9.20.tgz


Index: beldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beldi/F-9/beldi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beldi.spec	26 Aug 2008 22:17:37 -0000	1.2
+++ beldi.spec	9 Sep 2008 01:17:22 -0000	1.3
@@ -1,6 +1,6 @@
 Summary:	Belug Linux Distribution Burner
 Name:		beldi
-Version:	0.9.18
+Version:	0.9.20
 Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
@@ -50,6 +50,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Sep 09 2008 Christoph Wickert <fedora christoph-wickert de> 0.9.20-1
+- Upgrade to 0.9.20
+
 * Fri Aug 22 2008 Christoph Wickert <fedora christoph-wickert de> 0.9.18-1
 - Upgrade to 0.9.18
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beldi/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Aug 2008 22:17:37 -0000	1.3
+++ sources	9 Sep 2008 01:17:22 -0000	1.4
@@ -1 +1 @@
-94fa2a0989669e89219e728aa3ce201a  beldi-0.9.18.tgz
+9ecd63abe80986a1e4c482fe4ed4b00e  beldi-0.9.20.tgz



From cwickert at fedoraproject.org  Tue Sep  9 01:17:52 2008
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue,  9 Sep 2008 01:17:52 +0000 (UTC)
Subject: rpms/beldi/F-8 .cvsignore, 1.3, 1.4 beldi.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20080909011752.79B017012A@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/beldi/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13343/F-8

Modified Files:
	.cvsignore beldi.spec sources 
Log Message:
* Tue Sep 09 2008 Christoph Wickert <fedora christoph-wickert de> 0.9.20-1
- Upgrade to 0.9.20



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beldi/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Aug 2008 22:17:36 -0000	1.3
+++ .cvsignore	9 Sep 2008 01:17:22 -0000	1.4
@@ -1 +1 @@
-beldi-0.9.18.tgz
+beldi-0.9.20.tgz


Index: beldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beldi/F-8/beldi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beldi.spec	26 Aug 2008 22:17:36 -0000	1.2
+++ beldi.spec	9 Sep 2008 01:17:22 -0000	1.3
@@ -1,6 +1,6 @@
 Summary:	Belug Linux Distribution Burner
 Name:		beldi
-Version:	0.9.18
+Version:	0.9.20
 Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
@@ -50,6 +50,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Sep 09 2008 Christoph Wickert <fedora christoph-wickert de> 0.9.20-1
+- Upgrade to 0.9.20
+
 * Fri Aug 22 2008 Christoph Wickert <fedora christoph-wickert de> 0.9.18-1
 - Upgrade to 0.9.18
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beldi/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Aug 2008 22:17:36 -0000	1.3
+++ sources	9 Sep 2008 01:17:22 -0000	1.4
@@ -1 +1 @@
-94fa2a0989669e89219e728aa3ce201a  beldi-0.9.18.tgz
+9ecd63abe80986a1e4c482fe4ed4b00e  beldi-0.9.20.tgz



From mclasen at fedoraproject.org  Tue Sep  9 01:20:47 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  9 Sep 2008 01:20:47 +0000 (UTC)
Subject: rpms/libgweather/devel .cvsignore, 1.12, 1.13 libgweather.spec, 1.22,
	1.23 sources, 1.12, 1.13
Message-ID: <20080909012047.D7E5A7012A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgweather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13846

Modified Files:
	.cvsignore libgweather.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgweather/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Sep 2008 00:12:04 -0000	1.12
+++ .cvsignore	9 Sep 2008 01:20:17 -0000	1.13
@@ -1 +1 @@
-libgweather-2.23.91.tar.bz2
+libgweather-2.23.92.tar.bz2


Index: libgweather.spec
===================================================================
RCS file: /cvs/extras/rpms/libgweather/devel/libgweather.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libgweather.spec	3 Sep 2008 00:14:46 -0000	1.22
+++ libgweather.spec	9 Sep 2008 01:20:17 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           libgweather
-Version:        2.23.91
+Version:        2.23.92
 Release:        1%{?dist}
 Summary:        A library for weather information 
 
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> 2.23.92-1
+- Update to 2.23.92
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgweather/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Sep 2008 00:12:04 -0000	1.12
+++ sources	9 Sep 2008 01:20:17 -0000	1.13
@@ -1 +1 @@
-d4fb29abc1d3afc10c864376d1fd6732  libgweather-2.23.91.tar.bz2
+b316b1e153ca56afeaa80b1aa4f0fd94  libgweather-2.23.92.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep  9 01:21:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 01:21:04 +0000
Subject: [pkgdb] puppet: tmz has requested watchbugzilla
Message-ID: <20080909012104.D57C120876F@bastion.fedora.phx.redhat.com>

tmz has requested the watchbugzilla acl on puppet (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 01:21:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 01:21:05 +0000
Subject: [pkgdb] puppet: tmz has requested watchcommits
Message-ID: <20080909012105.DAD3D208D1E@bastion.fedora.phx.redhat.com>

tmz has requested the watchcommits acl on puppet (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 01:21:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 01:21:09 +0000
Subject: [pkgdb] puppet: tmz has requested commit
Message-ID: <20080909012109.2AA8A208D99@bastion.fedora.phx.redhat.com>

tmz has requested the commit acl on puppet (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 01:21:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 01:21:17 +0000
Subject: [pkgdb] puppet: tmz has requested watchbugzilla
Message-ID: <20080909012117.EE05420876F@bastion.fedora.phx.redhat.com>

tmz has requested the watchbugzilla acl on puppet (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 01:21:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 01:21:20 +0000
Subject: [pkgdb] puppet: tmz has requested watchcommits
Message-ID: <20080909012120.DFF52208DA0@bastion.fedora.phx.redhat.com>

tmz has requested the watchcommits acl on puppet (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 01:21:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 01:21:26 +0000
Subject: [pkgdb] puppet: tmz has requested watchbugzilla
Message-ID: <20080909012126.E8E5E208DA4@bastion.fedora.phx.redhat.com>

tmz has requested the watchbugzilla acl on puppet (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 01:21:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 01:21:28 +0000
Subject: [pkgdb] puppet: tmz has requested commit
Message-ID: <20080909012128.6AFD3208D1E@bastion.fedora.phx.redhat.com>

tmz has requested the commit acl on puppet (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 01:21:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 01:21:28 +0000
Subject: [pkgdb] puppet: tmz has requested watchcommits
Message-ID: <20080909012128.73B14208DA7@bastion.fedora.phx.redhat.com>

tmz has requested the watchcommits acl on puppet (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 01:21:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 01:21:30 +0000
Subject: [pkgdb] puppet: tmz has requested commit
Message-ID: <20080909012130.52D00208DA9@bastion.fedora.phx.redhat.com>

tmz has requested the commit acl on puppet (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 01:21:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 01:21:45 +0000
Subject: [pkgdb] puppet: tmz has requested watchbugzilla
Message-ID: <20080909012145.9E6AE208D98@bastion.fedora.phx.redhat.com>

tmz has requested the watchbugzilla acl on puppet (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 01:21:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 01:21:49 +0000
Subject: [pkgdb] puppet: tmz has requested commit
Message-ID: <20080909012149.BB79C208D9B@bastion.fedora.phx.redhat.com>

tmz has requested the commit acl on puppet (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 01:21:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 01:21:49 +0000
Subject: [pkgdb] puppet: tmz has requested watchcommits
Message-ID: <20080909012149.C202F208D9C@bastion.fedora.phx.redhat.com>

tmz has requested the watchcommits acl on puppet (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From mclasen at fedoraproject.org  Tue Sep  9 01:32:08 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  9 Sep 2008 01:32:08 +0000 (UTC)
Subject: rpms/libsoup/devel .cvsignore, 1.36, 1.37 libsoup.spec, 1.71,
	1.72 sources, 1.36, 1.37
Message-ID: <20080909013208.498277012A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libsoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14456

Modified Files:
	.cvsignore libsoup.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsoup/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	2 Sep 2008 03:34:57 -0000	1.36
+++ .cvsignore	9 Sep 2008 01:31:38 -0000	1.37
@@ -1 +1 @@
-libsoup-2.23.91.tar.bz2
+libsoup-2.23.92.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/extras/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- libsoup.spec	2 Sep 2008 03:34:58 -0000	1.71
+++ libsoup.spec	9 Sep 2008 01:31:38 -0000	1.72
@@ -3,7 +3,7 @@
 ### Abstract ###
 
 Name: libsoup
-Version: 2.23.91
+Version: 2.23.92
 Release: 1%{?dist}
 License: LGPLv2
 Group: Development/Libraries
@@ -80,6 +80,9 @@
 %{_datadir}/gtk-doc/html/%{name}-2.4
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsoup/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	2 Sep 2008 03:34:58 -0000	1.36
+++ sources	9 Sep 2008 01:31:38 -0000	1.37
@@ -1 +1 @@
-6faf7318735540265534ea786b2341dd  libsoup-2.23.91.tar.bz2
+d2cb29312ee513da196cc1a9538a1053  libsoup-2.23.92.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  9 01:36:07 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  9 Sep 2008 01:36:07 +0000 (UTC)
Subject: rpms/eog/devel .cvsignore, 1.68, 1.69 eog.spec, 1.120, 1.121 sources,
	1.68, 1.69
Message-ID: <20080909013607.334947012A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/eog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14725

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	3 Sep 2008 02:29:55 -0000	1.68
+++ .cvsignore	9 Sep 2008 01:35:36 -0000	1.69
@@ -1 +1 @@
-eog-2.23.91.tar.bz2
+eog-2.23.92.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/eog.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- eog.spec	3 Sep 2008 02:29:55 -0000	1.120
+++ eog.spec	9 Sep 2008 01:35:36 -0000	1.121
@@ -13,7 +13,7 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.23.91
+Version: 2.23.92
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source: http://download.gnome.org/sources/eog/2.23/%{name}-%{version}.tar.bz2
@@ -155,6 +155,9 @@
 %{_datadir}/gtk-doc/html/eog
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	3 Sep 2008 02:29:55 -0000	1.68
+++ sources	9 Sep 2008 01:35:36 -0000	1.69
@@ -1 +1 @@
-d2aeadd23d1873b1a0898ca72cec2840  eog-2.23.91.tar.bz2
+b9790f4beb1dda69d4e4182f5e3be63b  eog-2.23.92.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  9 01:41:18 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  9 Sep 2008 01:41:18 +0000 (UTC)
Subject: rpms/gnome-games/devel .cvsignore, 1.84, 1.85 gnome-games.spec,
	1.182, 1.183 sources, 1.89, 1.90
Message-ID: <20080909014118.11AF67012A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15024

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- .cvsignore	23 Aug 2008 04:25:08 -0000	1.84
+++ .cvsignore	9 Sep 2008 01:40:47 -0000	1.85
@@ -1 +1 @@
-gnome-games-2.23.90.tar.bz2
+gnome-games-2.23.92.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- gnome-games.spec	23 Aug 2008 04:25:08 -0000	1.182
+++ gnome-games.spec	9 Sep 2008 01:40:47 -0000	1.183
@@ -43,7 +43,7 @@
 
 Summary: GNOME games
 Name: gnome-games
-Version: 2.23.90
+Version: 2.23.92
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
@@ -344,6 +344,9 @@
 %{_datadir}/omf/*
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.92-1
+- Update to 2.23.92
+
 * Sat Aug 23 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.90-1
 - Update to 2.23.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/sources,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- sources	23 Aug 2008 04:25:08 -0000	1.89
+++ sources	9 Sep 2008 01:40:47 -0000	1.90
@@ -1 +1 @@
-baec1917e5649e7496e41f52f6b521a5  gnome-games-2.23.90.tar.bz2
+73071016b24cd4ced1cc78efe1b27c61  gnome-games-2.23.92.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  9 01:42:34 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  9 Sep 2008 01:42:34 +0000 (UTC)
Subject: rpms/gnome-panel/devel .cvsignore, 1.83, 1.84 gnome-panel.spec,
	1.316, 1.317 sources, 1.86, 1.87
Message-ID: <20080909014234.9D5167012A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15166

Modified Files:
	.cvsignore gnome-panel.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- .cvsignore	3 Sep 2008 03:26:30 -0000	1.83
+++ .cvsignore	9 Sep 2008 01:42:04 -0000	1.84
@@ -1 +1 @@
-gnome-panel-2.23.91.tar.bz2
+gnome-panel-2.23.92.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- gnome-panel.spec	3 Sep 2008 03:26:30 -0000	1.316
+++ gnome-panel.spec	9 Sep 2008 01:42:04 -0000	1.317
@@ -22,7 +22,7 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.23.91
+Version: 2.23.92
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar.bz2
@@ -346,6 +346,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Tue Sep  2 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- sources	3 Sep 2008 03:26:30 -0000	1.86
+++ sources	9 Sep 2008 01:42:04 -0000	1.87
@@ -1 +1 @@
-56b17e14666d80a02e48c6ef457dde7e  gnome-panel-2.23.91.tar.bz2
+8720f9b42692904ce7df371715248255  gnome-panel-2.23.92.tar.bz2



From mccann at fedoraproject.org  Tue Sep  9 01:45:12 2008
From: mccann at fedoraproject.org (William Jon McCann)
Date: Tue,  9 Sep 2008 01:45:12 +0000 (UTC)
Subject: rpms/gdm/devel .cvsignore, 1.70, 1.71 gdm.spec, 1.409, 1.410 sources,
	1.105, 1.106
Message-ID: <20080909014512.6D96E7012C@cvs1.fedora.phx.redhat.com>

Author: mccann

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15576

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:
- Update to 2.23.92-1




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	28 Aug 2008 13:41:05 -0000	1.70
+++ .cvsignore	9 Sep 2008 01:44:42 -0000	1.71
@@ -1 +1 @@
-gdm-2.23.91.tar.bz2
+gdm-2.23.92.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -r1.409 -r1.410
--- gdm.spec	28 Aug 2008 14:49:31 -0000	1.409
+++ gdm.spec	9 Sep 2008 01:44:42 -0000	1.410
@@ -15,8 +15,8 @@
 
 Summary: The GNOME Display Manager
 Name: gdm
-Version: 2.23.91
-Release: 0.20080828.2%{?dist}
+Version: 2.23.92
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -301,6 +301,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Mon Sep  8 2008 Jon McCann <jmccann at redhat.com> - 1:2.23.92-1
+- Update to 2.23.92-1
+
 * Thu Aug 28 2008 Jon McCann <jmccann at redhat.com> - 1:2.23.91-0.20080828.2
 - Update to non-broken snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/sources,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- sources	28 Aug 2008 14:49:32 -0000	1.105
+++ sources	9 Sep 2008 01:44:42 -0000	1.106
@@ -1 +1 @@
-fa303068a04d99f5054912d7037a8d37  gdm-2.23.91.tar.bz2
+5b2523ced7678632b79ee3780fc3e749  gdm-2.23.92.tar.bz2



From davej at fedoraproject.org  Tue Sep  9 01:48:06 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Tue,  9 Sep 2008 01:48:06 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc5-git10.bz2.sign, NONE,
	1.1 .cvsignore, 1.917, 1.918 kernel.spec, 1.938, 1.939 sources,
	1.880, 1.881 upstream, 1.793,
	1.794 patch-2.6.27-rc5-git9.bz2.sign, 1.1, NONE
Message-ID: <20080909014806.6741B7012A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16076

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.27-rc5-git10.bz2.sign 
Removed Files:
	patch-2.6.27-rc5-git9.bz2.sign 
Log Message:
2.6.27-rc5-git10


--- NEW FILE patch-2.6.27-rc5-git10.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIxbz9yGugalF9Dw4RAsi+AJ0b0Mh+460JvvLBiEsra6tOU2Ol9QCgisBR
N6KNanHN8t/93Ufgksq8BuY=
=rflE
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.917
retrieving revision 1.918
diff -u -r1.917 -r1.918
--- .cvsignore	7 Sep 2008 18:01:05 -0000	1.917
+++ .cvsignore	9 Sep 2008 01:47:35 -0000	1.918
@@ -5,4 +5,4 @@
 kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc5.bz2
-patch-2.6.27-rc5-git9.bz2
+patch-2.6.27-rc5-git10.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.938
retrieving revision 1.939
diff -u -r1.938 -r1.939
--- kernel.spec	8 Sep 2008 21:57:38 -0000	1.938
+++ kernel.spec	9 Sep 2008 01:47:35 -0000	1.939
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 5
 # The git snapshot level
-%define gitrev 9
+%define gitrev 10
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1744,6 +1744,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Sep 08 2008 Dave Jones <davej at redhat.com>
+- 2.6.27-rc5-git10
+
 * Mon Sep 08 2008 Jarod Wilson <jarod at redhat.com>
 - Dave's lirc patch merged for upstream submission
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.880
retrieving revision 1.881
diff -u -r1.880 -r1.881
--- sources	7 Sep 2008 18:01:05 -0000	1.880
+++ sources	9 Sep 2008 01:47:35 -0000	1.881
@@ -1,3 +1,2 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 d91adda8bcf04852048b8eab06eeae3d  patch-2.6.27-rc5.bz2
-2f39bf914e672751f59d0cb062be1b66  patch-2.6.27-rc5-git9.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.793
retrieving revision 1.794
diff -u -r1.793 -r1.794
--- upstream	7 Sep 2008 18:01:05 -0000	1.793
+++ upstream	9 Sep 2008 01:47:36 -0000	1.794
@@ -1,3 +1,3 @@
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc5.bz2
-patch-2.6.27-rc5-git9.bz2
+patch-2.6.27-rc5-git10.bz2


--- patch-2.6.27-rc5-git9.bz2.sign DELETED ---



From spot at fedoraproject.org  Tue Sep  9 02:49:06 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 02:49:06 +0000 (UTC)
Subject: rpms/tuxpaint-stamps/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tuxpaint-stamps.spec, 1.3, 1.4
Message-ID: <20080909024906.CEBE77012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tuxpaint-stamps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20052

Modified Files:
	.cvsignore sources tuxpaint-stamps.spec 
Log Message:
fix license tag, update to 2008.06.30


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tuxpaint-stamps/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Jul 2007 02:39:28 -0000	1.4
+++ .cvsignore	9 Sep 2008 02:48:36 -0000	1.5
@@ -1 +1 @@
-tuxpaint-stamps-2007.07.01.tar.gz
+tuxpaint-stamps-2008.06.30.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuxpaint-stamps/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Jul 2007 02:39:28 -0000	1.4
+++ sources	9 Sep 2008 02:48:36 -0000	1.5
@@ -1 +1 @@
-a7c141bbe146bdb31e6cbad3911ad9a4  tuxpaint-stamps-2007.07.01.tar.gz
+9c84055a582698587c085a0f5a9dab0a  tuxpaint-stamps-2008.06.30.tar.gz


Index: tuxpaint-stamps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxpaint-stamps/devel/tuxpaint-stamps.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tuxpaint-stamps.spec	8 Jul 2007 02:39:28 -0000	1.3
+++ tuxpaint-stamps.spec	9 Sep 2008 02:48:36 -0000	1.4
@@ -1,9 +1,9 @@
 Name:           tuxpaint-stamps
-Version:        2007.07.01
+Version:        2008.06.30
 Release:        1%{?dist}
 Summary:        Extra stamp files for tuxpaint
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPL+ and GFDL and CC-BY-SA and Public Domain
 URL:            http://www.tuxpaint.org/
 Source0:        http://dl.sourceforge.net/tuxpaint/tuxpaint-stamps-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,11 +20,6 @@
 %build
 (cd po && ./createpo.sh)
 (cd po && ./createtxt.sh)
-mv po/tuxpaint-stamps-en_gb.po po/tuxpaint-stamps-en_GB.po
-mv po/tuxpaint-stamps-zh_tw.po po/tuxpaint-stamps-zh_TW.po
-mv po/tuxpaint-stamps-zh_cn.po po/tuxpaint-stamps-zh_CN.po
-mv po/tuxpaint-stamps-pt_br.po po/tuxpaint-stamps-pt_BR.po
-mv po/tuxpaint-stamps-pt_pt.po po/tuxpaint-stamps-pt_PT.po
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -39,6 +34,9 @@
 done
 popd
 
+# License is bad on this file, Creative Commons Sampling Plus 1.0 is non-free.
+rm -rf $RPM_BUILD_ROOT%{_datadir}/tuxpaint/stamps/vehicles/emergency/firetruck.ogg
+
 %find_lang %{name}
 
 %clean
@@ -55,6 +53,10 @@
 %{_datadir}/tuxpaint/stamps/*
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2008.06.30-1
+- fix license tag
+- update to 2008.06.30.
+
 * Sat Jul 07 2007 Steven Pritchard <steve at kspei.com> 2007.07.01-1
 - Update to 2007.07.01.
 



From sandeen at fedoraproject.org  Tue Sep  9 02:51:02 2008
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Tue,  9 Sep 2008 02:51:02 +0000 (UTC)
Subject: rpms/fs_mark/devel .cvsignore, 1.3, 1.4 fs_mark.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20080909025102.F0CCC7012A@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/fs_mark/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20473

Modified Files:
	.cvsignore fs_mark.spec sources 
Log Message:
* Mon Sep 08 2008 Eric Sandeen <sandeen at redhat.com> 3.3-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fs_mark/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Jul 2008 16:30:03 -0000	1.3
+++ .cvsignore	9 Sep 2008 02:50:32 -0000	1.4
@@ -1 +1 @@
-fs_mark-3.2.tar.gz
+fs_mark.tgz


Index: fs_mark.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fs_mark/devel/fs_mark.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fs_mark.spec	18 Jul 2008 16:30:03 -0000	1.2
+++ fs_mark.spec	9 Sep 2008 02:50:32 -0000	1.3
@@ -1,12 +1,12 @@
 Name:		fs_mark
-Version:	3.2
-Release:	3%{?dist}
+Version:	3.3
+Release:	1%{?dist}
 Summary:	Benchmark synchronous/async file creation
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://sourceforge.net/projects/fsmark/
-Source0:	http://downloads.sourceforge.net/fsmark/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/fsmark/%{name}.tgz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:		nostatic
@@ -18,7 +18,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n fs_mark
 %patch0 -p1 
 
 %build
@@ -40,7 +40,10 @@
 
 
 %changelog
-* Fri Jul 18  2008 Eric Sandeen <sandeen at redhat.com> 3.2-3
+* Mon Sep 08 2008 Eric Sandeen <sandeen at redhat.com> 3.3-1
+- New upstream release
+
+* Fri Jul 18 2008 Eric Sandeen <sandeen at redhat.com> 3.2-3
 - Updated tarball from new sf.net home
 
 * Wed Jun 18 2008 Eric Sandeen <sandeen at redhat.com> 3.2-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fs_mark/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Jul 2008 16:30:03 -0000	1.3
+++ sources	9 Sep 2008 02:50:32 -0000	1.4
@@ -1 +1 @@
-340fc47d00a108754728cf2b6bd03895  fs_mark-3.2.tar.gz
+21e9619b6cea81b4ae869f1b773a8a81  fs_mark.tgz



From spot at fedoraproject.org  Tue Sep  9 02:52:28 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 02:52:28 +0000 (UTC)
Subject: rpms/tuxpaint/devel tuxpaint-0.9.20-fix-desktop-file.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tuxpaint.spec, 1.20, 1.21
Message-ID: <20080909025228.108EE7012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tuxpaint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20718

Modified Files:
	.cvsignore sources tuxpaint.spec 
Added Files:
	tuxpaint-0.9.20-fix-desktop-file.patch 
Log Message:
update to 0.9.20

tuxpaint-0.9.20-fix-desktop-file.patch:

--- NEW FILE tuxpaint-0.9.20-fix-desktop-file.patch ---
diff -up tuxpaint-0.9.20/src/tuxpaint.desktop.fixdesktopfile tuxpaint-0.9.20/src/tuxpaint.desktop
--- tuxpaint-0.9.20/src/tuxpaint.desktop.fixdesktopfile	2008-09-08 20:45:08.000000000 -0400
+++ tuxpaint-0.9.20/src/tuxpaint.desktop	2008-09-08 20:45:22.000000000 -0400
@@ -74,7 +74,7 @@ Type=Application
 Exec=tuxpaint
 Icon=tuxpaint
 Terminal=false
-Categories=Education; Art;
+Categories=Education;Graphics;
 GenericName=Drawing program
 GenericName[af]=Tekenprogram
 GenericName[ar]=???????????? ??????
diff -up tuxpaint-0.9.20/src/tuxpaint.desktop.in.fixdesktopfile tuxpaint-0.9.20/src/tuxpaint.desktop.in
--- tuxpaint-0.9.20/src/tuxpaint.desktop.in.fixdesktopfile	2008-04-03 12:48:50.000000000 -0400
+++ tuxpaint-0.9.20/src/tuxpaint.desktop.in	2008-09-08 20:45:30.000000000 -0400
@@ -5,6 +5,6 @@ Type=Application
 Exec=tuxpaint
 Icon=tuxpaint
 Terminal=false
-Categories=Education; Art;
+Categories=Education;Graphics;
 _GenericName=Drawing program
 _Comment=A drawing program for children.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tuxpaint/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Jul 2007 02:39:58 -0000	1.7
+++ .cvsignore	9 Sep 2008 02:51:57 -0000	1.8
@@ -1 +1 @@
-tuxpaint-0.9.17.tar.gz
+tuxpaint-0.9.20.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuxpaint/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Jul 2007 02:39:58 -0000	1.7
+++ sources	9 Sep 2008 02:51:57 -0000	1.8
@@ -1 +1 @@
-e98e4f1b3421ffcb0e1a1cbbf7c93dc4  tuxpaint-0.9.17.tar.gz
+87d335ee1193b516d3cd50546ce2bf1b  tuxpaint-0.9.20.tar.gz


Index: tuxpaint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxpaint/devel/tuxpaint.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- tuxpaint.spec	8 Sep 2008 22:07:58 -0000	1.20
+++ tuxpaint.spec	9 Sep 2008 02:51:57 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           tuxpaint
-Version:        0.9.17
-Release:        4%{?dist}
+Version:        0.9.20
+Release:        1%{?dist}
 
 Epoch:          1
 Summary:        Drawing program designed for young children
@@ -9,14 +9,15 @@
 License:        GPLv2+
 URL:            http://www.tuxpaint.org/
 Source0:        http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
-Source1:        %{name}.desktop
 Patch0:         tuxpaint-utf8.patch
+Patch1:         tuxpaint-0.9.20-fix-desktop-file.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel >= 1.2.4
 BuildRequires:  SDL_image-devel
 BuildRequires:  SDL_mixer-devel
 BuildRequires:  SDL_ttf-devel
+BuildRequires:  SDL_Pango-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  freetype-devel >= 2.0
 BuildRequires:  gettext
@@ -34,19 +35,30 @@
 (kids ages 3 and up). It has a simple, easy-to-use interface,
 fun sound effects, and a cartoon mascot who helps you along.
 
+%package devel
+Summary:	Development files for tuxpaint extensions/plugins
+Group:		Development/Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description devel
+Development files for tuxpaint extensions/plugins
+
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1 -b .fixdesktopfile
 
 sed -i -e '/\/gnome\/apps\/Graphics/d' Makefile
 find docs -type f -exec perl -pi -e 's/\r\n/\n/' {} \;
 find docs -type f -perm +100 -exec chmod a-x {} \;
 
+make PREFIX=/usr MAGIC_PREFIX=%{_libdir}/tuxpaint/plugins tp-magic-config
+
 %build
 make %{?_smp_mflags} \
     PREFIX=/usr \
-    ARCH_LINKS="$( libpng-config --libs )" \
-    CFLAGS="$RPM_OPT_FLAGS -I%{_libdir}/glib-2.0/include"
+    CFLAGS="$RPM_OPT_FLAGS" \
+    MAGIC_PREFIX=%{_libdir}/tuxpaint/plugins
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -56,14 +68,16 @@
     X11_ICON_PREFIX=$RPM_BUILD_ROOT%{_datadir}/pixmaps/ \
     GNOME_PREFIX=/usr \
     KDE_PREFIX="" \
-    KDE_ICON_PREFIX=/usr/share/icons
+    KDE_ICON_PREFIX=/usr/share/icons \
+    MAGIC_PREFIX=$RPM_BUILD_ROOT%{_libdir}/tuxpaint/plugins
 find $RPM_BUILD_ROOT -type d|xargs chmod 0755
 %find_lang %{name}
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
     --vendor fedora \
     --add-category KidsGame \
-    %{SOURCE1}
+    --delete-original \
+    $RPM_BUILD_ROOT%{_datadir}/applications/tuxpaint.desktop
 
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
@@ -80,10 +94,19 @@
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/*/*/apps/*
+%{_libdir}/%{name}/
 %{_mandir}/man1/*
 %{_mandir}/*/man1/*
 
+%files devel
+%defattr(-,root,root,-)
+%doc %{_datadir}/doc/%{name}-dev/
+%{_includedir}/tuxpaint/
+
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.9.20-1
+- update to 0.9.20
+
 * Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.9.17-4
 - fix license tag
 



From tagoh at fedoraproject.org  Tue Sep  9 02:55:42 2008
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Tue,  9 Sep 2008 02:55:42 +0000 (UTC)
Subject: rpms/VLGothic-fonts/devel .cvsignore, 1.4, 1.5 VLGothic-fonts.spec, 
	1.14, 1.15 sources, 1.10, 1.11
Message-ID: <20080909025542.3DA8B7012A@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/VLGothic-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21096

Modified Files:
	.cvsignore VLGothic-fonts.spec sources 
Log Message:
* Tue Sep  9 2008 Akira TAGOH <tagoh at redhat.com> - 20080908-1
- update to 20080908 release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Jul 2008 04:21:24 -0000	1.4
+++ .cvsignore	9 Sep 2008 02:55:11 -0000	1.5
@@ -1 +1,2 @@
 VLGothic-20080624.tar.bz2
+VLGothic-20080908.tar.bz2


Index: VLGothic-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/devel/VLGothic-fonts.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- VLGothic-fonts.spec	31 Jul 2008 04:21:24 -0000	1.14
+++ VLGothic-fonts.spec	9 Sep 2008 02:55:11 -0000	1.15
@@ -3,7 +3,7 @@
 %define fontconfdir %{_sysconfdir}/fonts/conf.d
 
 Name: %{fontname}-fonts
-Version: 20080624
+Version: 20080908
 Release: 1%{?dist}
 Summary: Japanese TrueType font
 
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Tue Sep  9 2008 Akira TAGOH <tagoh at redhat.com> - 20080908-1
+- update to 20080908 release.
+
 * Thu Jul 31 2008 Jens Petersen <petersen at redhat.com> - 20080624-1.fc10
 - update to 20080624 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	31 Jul 2008 04:21:24 -0000	1.10
+++ sources	9 Sep 2008 02:55:11 -0000	1.11
@@ -1 +1 @@
-d508d04eeac3d6c74eacfbc258c236b3  VLGothic-20080624.tar.bz2
+429cd76f7cb6635160da12e28460efef  VLGothic-20080908.tar.bz2



From spot at fedoraproject.org  Tue Sep  9 02:57:06 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 02:57:06 +0000 (UTC)
Subject: rpms/uisp/devel uisp.spec,1.2,1.3
Message-ID: <20080909025706.146897012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/uisp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21368

Modified Files:
	uisp.spec 
Log Message:
fix license tag


Index: uisp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uisp/devel/uisp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- uisp.spec	20 Feb 2008 05:51:49 -0000	1.2
+++ uisp.spec	9 Sep 2008 02:56:35 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           uisp
 Version:        20050207
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Universal In-System Programmer for Atmel AVR and 8051
 
 
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2+
 URL:            http://www.nongnu.org/uisp
 Source0:        http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
 Patch0:         uisp_Werror.patch
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 20050207-3
+- fix license tag
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 20050207-2
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Tue Sep  9 02:58:22 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 02:58:22 +0000 (UTC)
Subject: rpms/unix2dos/devel unix2dos.spec,1.30,1.31
Message-ID: <20080909025822.DEE247012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/unix2dos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21826

Modified Files:
	unix2dos.spec 
Log Message:
fix license tag


Index: unix2dos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unix2dos/devel/unix2dos.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- unix2dos.spec	8 Sep 2008 09:15:22 -0000	1.30
+++ unix2dos.spec	9 Sep 2008 02:57:52 -0000	1.31
@@ -1,8 +1,8 @@
 Summary: UNIX to DOS text file format converter
 Name: unix2dos
 Version: 2.2
-Release: 31%{?dist}
-License: Distributable
+Release: 32%{?dist}
+License: BSD
 Group: Applications/Text
 Source: unix2dos-2.2.src.tar.gz
 Patch0: unix2dos-mkstemp.patch
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2-32
+- fix license tag
+
 * Mon Sep  8 2008 Tim Waugh <twaugh at redhat.com> 2.2-31
 - Removed patch fuzz.
 - Preserve file modes (bug #437469).



From spot at fedoraproject.org  Tue Sep  9 02:59:19 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 02:59:19 +0000 (UTC)
Subject: rpms/uisp/devel uisp.spec,1.3,1.4
Message-ID: <20080909025919.DFCE87012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/uisp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22141

Modified Files:
	uisp.spec 
Log Message:
fix patch


Index: uisp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uisp/devel/uisp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- uisp.spec	9 Sep 2008 02:56:35 -0000	1.3
+++ uisp.spec	9 Sep 2008 02:58:49 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           uisp
 Version:        20050207
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Universal In-System Programmer for Atmel AVR and 8051
 
 
@@ -35,7 +35,7 @@
 
 %prep
 %setup -q
-%patch -p0
+%patch0 -p0
 
 %build
 %configure
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 20050207-4
+- fix patch
+
 * Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 20050207-3
 - fix license tag
 



From jjames at fedoraproject.org  Tue Sep  9 02:59:59 2008
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  9 Sep 2008 02:59:59 +0000 (UTC)
Subject: rpms/jsr-305/F-9 .cvsignore, 1.2, 1.3 jsr-305.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20080909025959.92A1A7012A@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/jsr-305/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22202/F-9

Modified Files:
	.cvsignore jsr-305.spec sources 
Log Message:
* Mon Sep  8 2008 Jerry James <loganjerry at gmail.com> - 0-0.1.20080824svn
- Update to 24 Aug 2008 snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jsr-305/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2008 18:02:07 -0000	1.2
+++ .cvsignore	9 Sep 2008 02:59:29 -0000	1.3
@@ -1 +1 @@
-jsr-305-0.1.20080721.tar.bz2
+jsr-305-0.1.20080824.tar.bz2


Index: jsr-305.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jsr-305/F-9/jsr-305.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jsr-305.spec	11 Aug 2008 18:02:07 -0000	1.1
+++ jsr-305.spec	9 Sep 2008 02:59:29 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           jsr-305
 Version:        0
-Release:        0.1.20080721svn%{?dist}
+Release:        0.1.20080824svn%{?dist}
 Summary:        Reference implementations and tests for JSR-305
 
 Group:          Development/Libraries/Java
@@ -13,11 +13,11 @@
 License:        BSD
 URL:            http://jsr-305.googlecode.com/
 # There has been no official release yet.  This is a snapshot of the Subversion
-# repository as of 21 Jul 2008.  Use the following commands to generate the
+# repository as of 24 Aug 2008.  Use the following commands to generate the
 # tarball:
-#   svn export -r 42 http://jsr-305.googlecode.com/svn/trunk jsr-305
-#   tar -cjvf jsr-305-0.1.20080721.tar.bz2 jsr-305
-Source0:        jsr-305-0.1.20080721.tar.bz2
+#   svn export -r 45 http://jsr-305.googlecode.com/svn/trunk jsr-305
+#   tar -cjvf jsr-305-0.1.20080824.tar.bz2 jsr-305
+Source0:        jsr-305-0.1.20080824.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  java-devel >= 1.5, jpackage-utils, maven2
@@ -117,6 +117,9 @@
 %{_javadocdir}/*
 
 %changelog
+* Mon Sep  8 2008 Jerry James <loganjerry at gmail.com> - 0-0.1.20080824svn
+- Update to 24 Aug 2008 snapshot
+
 * Mon Aug  4 2008 Jerry James <loganjerry at gmail.com> - 0-0.1.20080721svn
 - Update to 21 Jul 2008 snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jsr-305/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2008 18:02:07 -0000	1.2
+++ sources	9 Sep 2008 02:59:29 -0000	1.3
@@ -1 +1 @@
-49a8419ff7064dd1f814ea78096dcfba  jsr-305-0.1.20080721.tar.bz2
+30d1df258c43a8be057ba25c7fe3e68d  jsr-305-0.1.20080824.tar.bz2



From jjames at fedoraproject.org  Tue Sep  9 02:59:59 2008
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  9 Sep 2008 02:59:59 +0000 (UTC)
Subject: rpms/jsr-305/devel .cvsignore, 1.2, 1.3 jsr-305.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080909025959.C16307012A@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/jsr-305/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22202/devel

Modified Files:
	.cvsignore jsr-305.spec sources 
Log Message:
* Mon Sep  8 2008 Jerry James <loganjerry at gmail.com> - 0-0.1.20080824svn
- Update to 24 Aug 2008 snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jsr-305/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2008 17:59:28 -0000	1.2
+++ .cvsignore	9 Sep 2008 02:59:29 -0000	1.3
@@ -1 +1 @@
-jsr-305-0.1.20080721.tar.bz2
+jsr-305-0.1.20080824.tar.bz2


Index: jsr-305.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jsr-305/devel/jsr-305.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jsr-305.spec	11 Aug 2008 17:59:28 -0000	1.1
+++ jsr-305.spec	9 Sep 2008 02:59:29 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           jsr-305
 Version:        0
-Release:        0.1.20080721svn%{?dist}
+Release:        0.1.20080824svn%{?dist}
 Summary:        Reference implementations and tests for JSR-305
 
 Group:          Development/Libraries/Java
@@ -13,11 +13,11 @@
 License:        BSD
 URL:            http://jsr-305.googlecode.com/
 # There has been no official release yet.  This is a snapshot of the Subversion
-# repository as of 21 Jul 2008.  Use the following commands to generate the
+# repository as of 24 Aug 2008.  Use the following commands to generate the
 # tarball:
-#   svn export -r 42 http://jsr-305.googlecode.com/svn/trunk jsr-305
-#   tar -cjvf jsr-305-0.1.20080721.tar.bz2 jsr-305
-Source0:        jsr-305-0.1.20080721.tar.bz2
+#   svn export -r 45 http://jsr-305.googlecode.com/svn/trunk jsr-305
+#   tar -cjvf jsr-305-0.1.20080824.tar.bz2 jsr-305
+Source0:        jsr-305-0.1.20080824.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  java-devel >= 1.5, jpackage-utils, maven2
@@ -117,6 +117,9 @@
 %{_javadocdir}/*
 
 %changelog
+* Mon Sep  8 2008 Jerry James <loganjerry at gmail.com> - 0-0.1.20080824svn
+- Update to 24 Aug 2008 snapshot
+
 * Mon Aug  4 2008 Jerry James <loganjerry at gmail.com> - 0-0.1.20080721svn
 - Update to 21 Jul 2008 snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jsr-305/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2008 17:59:28 -0000	1.2
+++ sources	9 Sep 2008 02:59:29 -0000	1.3
@@ -1 +1 @@
-49a8419ff7064dd1f814ea78096dcfba  jsr-305-0.1.20080721.tar.bz2
+30d1df258c43a8be057ba25c7fe3e68d  jsr-305-0.1.20080824.tar.bz2



From spot at fedoraproject.org  Tue Sep  9 03:04:34 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 03:04:34 +0000 (UTC)
Subject: rpms/urw-fonts/devel urw-fonts.spec,1.31,1.32
Message-ID: <20080909030434.D2AA97012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/urw-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22870

Modified Files:
	urw-fonts.spec 
Log Message:
fix license tag


Index: urw-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/urw-fonts/devel/urw-fonts.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- urw-fonts.spec	11 Feb 2008 14:39:29 -0000	1.31
+++ urw-fonts.spec	9 Sep 2008 03:04:04 -0000	1.32
@@ -5,10 +5,12 @@
 Summary: Free versions of the 35 standard PostScript fonts.
 Name: urw-fonts
 Version: 2.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source: ftp://ftp.gnome.ru/fonts/urw/release/urw-fonts-%{filippov_version}.tar.bz2
 URL: ftp://ftp.gnome.ru/fonts/urw/release/
-License: GPL, URW holds copyright
+# URW holds copyright
+# No version specified
+License: GPL+
 Group: User Interface/X
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
@@ -71,6 +73,9 @@
 %{fontdir}/*.pfb
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.4-6
+- fix license tag
+
 * Mon Feb 11 2008 Than Ngo <than at redhat.com> 2.4-5
 - fix description
 



From mclasen at fedoraproject.org  Tue Sep  9 03:04:43 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  9 Sep 2008 03:04:43 +0000 (UTC)
Subject: rpms/gnome-games/devel ggz-api-changes.patch, NONE,
	1.1 gnome-games.spec, 1.183, 1.184
Message-ID: <20080909030443.EAE2C7012A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22856

Modified Files:
	gnome-games.spec 
Added Files:
	ggz-api-changes.patch 
Log Message:
adapt to ggz api changes


ggz-api-changes.patch:

--- NEW FILE ggz-api-changes.patch ---
diff -up gnome-games-2.23.92/dependencies/ggz-gtk/ggzclient.c.ggz-api-changes gnome-games-2.23.92/dependencies/ggz-gtk/ggzclient.c
--- gnome-games-2.23.92/dependencies/ggz-gtk/ggzclient.c.ggz-api-changes	2008-09-08 22:38:26.000000000 -0400
+++ gnome-games-2.23.92/dependencies/ggz-gtk/ggzclient.c	2008-09-08 22:39:02.000000000 -0400
@@ -227,7 +227,7 @@ static GGZHookReturn ggz_logged_in(GGZSe
 	ggzcore_server_add_event_hook(server, GGZ_ROOM_LIST,
 				      ggz_auto_join);
 	ggzcore_server_list_gametypes(server, 1);
-	ggzcore_server_list_rooms(server, -1, 1);
+	ggzcore_server_list_rooms(server, 1);
 
 
 	/* If this was a first-time login, get the password from the server */
@@ -309,8 +309,7 @@ static GGZHookReturn ggz_entered(GGZServ
 
 	/* Get player list */
 	/* FIXME: Player list should use the ggz update system */
-	ggzcore_room_list_tables(ggzcore_server_get_cur_room(server), -1,
-				 0);
+	ggzcore_room_list_tables(ggzcore_server_get_cur_room(server));
 	ggzcore_room_list_players(ggzcore_server_get_cur_room(server));
 
 


Index: gnome-games.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- gnome-games.spec	9 Sep 2008 01:40:47 -0000	1.183
+++ gnome-games.spec	9 Sep 2008 03:04:13 -0000	1.184
@@ -49,6 +49,8 @@
 License: GPLv2+ and GFDL
 Group: Amusements/Games
 Source: http://download.gnome.org/sources/gnome-games/2.23/gnome-games-%{version}.tar.bz2
+# http://bugzilla.gnome.org/show_bug.cgi?id=551455 
+Patch0: ggz-api-changes.patch
 Patch1: gnome-games-2.19.4-gnometris-rebrand.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -105,6 +107,7 @@
 Provides: glchess
 Obsoletes: glchess < 2.0
 
+
 %description
 
 The gnome-games package includes some small games that come with the
@@ -120,6 +123,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .ggz-api-changes
 # rebrand gnometris as some think the name is to similar to a trademark
 %patch1 -p1 -b .rebrand
 
@@ -346,6 +350,7 @@
 %changelog
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.92-1
 - Update to 2.23.92
+- Adapt to api changes in the ggz snapshot we ship
 
 * Sat Aug 23 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.90-1
 - Update to 2.23.90



From mtasaka at fedoraproject.org  Tue Sep  9 03:16:22 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  9 Sep 2008 03:16:22 +0000 (UTC)
Subject: rpms/cairo-dock/F-8 .cvsignore, 1.13, 1.14 cairo-dock.spec, 1.23,
	1.24 sources, 1.13, 1.14
Message-ID: <20080909031622.985977012A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23944/F-8

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.3-1
- 1.6.2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-8/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	4 Sep 2008 13:54:16 -0000	1.13
+++ .cvsignore	9 Sep 2008 03:15:52 -0000	1.14
@@ -1,3 +1,3 @@
-cairo-dock-1.6.2.2.tar.bz2
-cairo-dock-plugins-1.6.2.2.tar.bz2
-cairo-dock-themes-1.6.2.2.tar.bz2
+cairo-dock-1.6.2.3.tar.bz2
+cairo-dock-plugins-1.6.2.3.tar.bz2
+cairo-dock-themes-1.6.2.3.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-8/cairo-dock.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- cairo-dock.spec	4 Sep 2008 13:54:16 -0000	1.23
+++ cairo-dock.spec	9 Sep 2008 03:15:52 -0000	1.24
@@ -8,7 +8,7 @@
 %define		build_other	1
 
 %define		tarballver	svn1276_trunk
-%define		mainver		1.6.2.2
+%define		mainver		1.6.2.3
 %undefine		betaver
 %define		build_gecko	1
 
@@ -645,6 +645,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.3-1
+- 1.6.2.3
+
 * Thu Sep  4 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.2-1
 - 1.6.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-8/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	4 Sep 2008 13:54:16 -0000	1.13
+++ sources	9 Sep 2008 03:15:52 -0000	1.14
@@ -1,3 +1,3 @@
-53e5736f145fe936837bf7709af4713b  cairo-dock-1.6.2.2.tar.bz2
-81e899f6a4d0b2e9539392d8b5fec10f  cairo-dock-plugins-1.6.2.2.tar.bz2
-9d44ad771c71c5a7c6bc709aa5244370  cairo-dock-themes-1.6.2.2.tar.bz2
+15cfd709185dd9e3e94b981c51ae75a9  cairo-dock-1.6.2.3.tar.bz2
+afdab8b9778e25ead564b955caf57bdd  cairo-dock-plugins-1.6.2.3.tar.bz2
+09ff25bc173cbb50ae66b3ab4f1a52c5  cairo-dock-themes-1.6.2.3.tar.bz2



From mtasaka at fedoraproject.org  Tue Sep  9 03:16:22 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  9 Sep 2008 03:16:22 +0000 (UTC)
Subject: rpms/cairo-dock/F-9 .cvsignore, 1.13, 1.14 cairo-dock.spec, 1.19,
	1.20 sources, 1.13, 1.14
Message-ID: <20080909031622.B430D7012A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23944/F-9

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.3-1
- 1.6.2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	4 Sep 2008 13:54:17 -0000	1.13
+++ .cvsignore	9 Sep 2008 03:15:52 -0000	1.14
@@ -1,3 +1,3 @@
-cairo-dock-1.6.2.2.tar.bz2
-cairo-dock-plugins-1.6.2.2.tar.bz2
-cairo-dock-themes-1.6.2.2.tar.bz2
+cairo-dock-1.6.2.3.tar.bz2
+cairo-dock-plugins-1.6.2.3.tar.bz2
+cairo-dock-themes-1.6.2.3.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-9/cairo-dock.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- cairo-dock.spec	4 Sep 2008 13:54:17 -0000	1.19
+++ cairo-dock.spec	9 Sep 2008 03:15:52 -0000	1.20
@@ -8,7 +8,7 @@
 %define		build_other	1
 
 %define		tarballver	svn1276_trunk
-%define		mainver		1.6.2.2
+%define		mainver		1.6.2.3
 %undefine		betaver
 %define		build_gecko	1
 
@@ -645,6 +645,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.3-1
+- 1.6.2.3
+
 * Thu Sep  4 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.2-1
 - 1.6.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	4 Sep 2008 13:54:17 -0000	1.13
+++ sources	9 Sep 2008 03:15:52 -0000	1.14
@@ -1,3 +1,3 @@
-53e5736f145fe936837bf7709af4713b  cairo-dock-1.6.2.2.tar.bz2
-81e899f6a4d0b2e9539392d8b5fec10f  cairo-dock-plugins-1.6.2.2.tar.bz2
-9d44ad771c71c5a7c6bc709aa5244370  cairo-dock-themes-1.6.2.2.tar.bz2
+15cfd709185dd9e3e94b981c51ae75a9  cairo-dock-1.6.2.3.tar.bz2
+afdab8b9778e25ead564b955caf57bdd  cairo-dock-plugins-1.6.2.3.tar.bz2
+09ff25bc173cbb50ae66b3ab4f1a52c5  cairo-dock-themes-1.6.2.3.tar.bz2



From mtasaka at fedoraproject.org  Tue Sep  9 03:16:22 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  9 Sep 2008 03:16:22 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.62, 1.63 cairo-dock.spec, 1.78, 
	1.79 sources, 1.62, 1.63
Message-ID: <20080909031622.E96027012A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23944/devel

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.3-1
- 1.6.2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore	4 Sep 2008 13:54:18 -0000	1.62
+++ .cvsignore	9 Sep 2008 03:15:52 -0000	1.63
@@ -1,3 +1,3 @@
-cairo-dock-1.6.2.2.tar.bz2
-cairo-dock-plugins-1.6.2.2.tar.bz2
-cairo-dock-themes-1.6.2.2.tar.bz2
+cairo-dock-1.6.2.3.tar.bz2
+cairo-dock-plugins-1.6.2.3.tar.bz2
+cairo-dock-themes-1.6.2.3.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- cairo-dock.spec	4 Sep 2008 13:54:18 -0000	1.78
+++ cairo-dock.spec	9 Sep 2008 03:15:52 -0000	1.79
@@ -8,7 +8,7 @@
 %define		build_other	1
 
 %define		tarballver	svn1276_trunk
-%define		mainver		1.6.2.2
+%define		mainver		1.6.2.3
 %undefine		betaver
 %define		build_gecko	1
 
@@ -645,6 +645,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.3-1
+- 1.6.2.3
+
 * Thu Sep  4 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.2-1
 - 1.6.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	4 Sep 2008 13:54:18 -0000	1.62
+++ sources	9 Sep 2008 03:15:52 -0000	1.63
@@ -1,3 +1,3 @@
-53e5736f145fe936837bf7709af4713b  cairo-dock-1.6.2.2.tar.bz2
-81e899f6a4d0b2e9539392d8b5fec10f  cairo-dock-plugins-1.6.2.2.tar.bz2
-9d44ad771c71c5a7c6bc709aa5244370  cairo-dock-themes-1.6.2.2.tar.bz2
+15cfd709185dd9e3e94b981c51ae75a9  cairo-dock-1.6.2.3.tar.bz2
+afdab8b9778e25ead564b955caf57bdd  cairo-dock-plugins-1.6.2.3.tar.bz2
+09ff25bc173cbb50ae66b3ab4f1a52c5  cairo-dock-themes-1.6.2.3.tar.bz2



From mclasen at fedoraproject.org  Tue Sep  9 03:18:23 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  9 Sep 2008 03:18:23 +0000 (UTC)
Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.60,
	1.61 gnome-icon-theme.spec, 1.93, 1.94 sources, 1.63, 1.64
Message-ID: <20080909031823.9616F7012C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24149

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	2 Sep 2008 22:39:35 -0000	1.60
+++ .cvsignore	9 Sep 2008 03:17:53 -0000	1.61
@@ -1 +1 @@
-gnome-icon-theme-2.23.91.tar.bz2
+gnome-icon-theme-2.23.92.tar.bz2


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- gnome-icon-theme.spec	2 Sep 2008 22:39:35 -0000	1.93
+++ gnome-icon-theme.spec	9 Sep 2008 03:17:53 -0000	1.94
@@ -1,6 +1,6 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
-Version: 2.23.91
+Version: 2.23.92
 Release: 1%{?dist}
 Source0: http://download.gnome.org/sources/gnome-icon-theme/2.23/%{name}-%{version}.tar.bz2
 Source1: gnome-icon-theme-extra-device-icons-4.tar.bz2
@@ -100,6 +100,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	2 Sep 2008 22:39:35 -0000	1.63
+++ sources	9 Sep 2008 03:17:53 -0000	1.64
@@ -1,3 +1,3 @@
-f97e1e797a6d55d0c020f0f008329599  gnome-icon-theme-2.23.91.tar.bz2
+54d049c8ff7305571a33bbe50d903345  gnome-icon-theme-2.23.92.tar.bz2
 881e28a01badeead87578edd2d1bbc1c  gnome-icon-theme-extra-device-icons-4.tar.bz2
 



From spot at fedoraproject.org  Tue Sep  9 03:21:21 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 03:21:21 +0000 (UTC)
Subject: rpms/util-vserver/devel util-vserver.spec,1.39,1.40
Message-ID: <20080909032121.2746D7012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/util-vserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24938

Modified Files:
	util-vserver.spec 
Log Message:
fix license tag


Index: util-vserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- util-vserver.spec	21 Jun 2008 15:19:35 -0000	1.39
+++ util-vserver.spec	9 Sep 2008 03:20:50 -0000	1.40
@@ -27,8 +27,8 @@
 Summary:	Linux virtual server utilities
 Name:		util-vserver
 Version:	0.30.215
-Release:	%release_func 3
-License:	GPL
+Release:	%release_func 4
+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
@@ -365,6 +365,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.30.215-4
+- fix license tag
+
 * Sat Apr 19 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.215-3
 - reenabled %%check
 



From spot at fedoraproject.org  Tue Sep  9 02:55:46 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 02:55:46 +0000 (UTC)
Subject: rpms/ucblogo/devel ucblogo.spec,1.8,1.9
Message-ID: <20080909025546.1667D7012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ucblogo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21135

Modified Files:
	ucblogo.spec 
Log Message:
fix license tag


Index: ucblogo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ucblogo/devel/ucblogo.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ucblogo.spec	19 Feb 2008 03:52:48 -0000	1.8
+++ ucblogo.spec	9 Sep 2008 02:55:15 -0000	1.9
@@ -1,10 +1,10 @@
 Name:		ucblogo
 Version:	5.5
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	An interpreter for the Logo programming language
 
 Group: 		Development/Languages
-License:	GPL
+License:	GPLv2+
 Source: 	ftp://ftp.cs.berkeley.edu/pub/ucblogo/ucblogo-5.5.tar.gz
 Patch0:         ucblogo-5.5-ospeed.patch
 URL: 		http://www.cs.berkeley.edu/~bh
@@ -104,6 +104,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.5-11
+- fix license tag
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 5.5-10
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Tue Sep  9 03:23:54 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 03:23:54 +0000 (UTC)
Subject: rpms/viaideinfo/devel viaideinfo.spec,1.5,1.6
Message-ID: <20080909032354.4F5E67012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/viaideinfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25308

Modified Files:
	viaideinfo.spec 
Log Message:
fix license tag


Index: viaideinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viaideinfo/devel/viaideinfo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- viaideinfo.spec	19 Feb 2008 19:23:02 -0000	1.5
+++ viaideinfo.spec	9 Sep 2008 03:23:24 -0000	1.6
@@ -1,9 +1,9 @@
 Name:		viaideinfo
 Version:	0.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Displays the information of installed VIA IDE controllers 
 Group:		Applications/System
-License:	GPL
+License:	GPLv2+
 URL:		http://reactivated.net/software/viaideinfo
 
 Source0:	http://reactivated.net/software/viaideinfo/viaideinfo-%{version}.tar.gz
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5-3
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5-2
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Tue Sep  9 03:26:00 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 03:26:00 +0000 (UTC)
Subject: rpms/vim-vimoutliner/devel vim-vimoutliner.spec,1.2,1.3
Message-ID: <20080909032600.A0CBB7012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/vim-vimoutliner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25568

Modified Files:
	vim-vimoutliner.spec 
Log Message:
fix license tag


Index: vim-vimoutliner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vim-vimoutliner/devel/vim-vimoutliner.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vim-vimoutliner.spec	5 Apr 2007 15:51:49 -0000	1.2
+++ vim-vimoutliner.spec	9 Sep 2008 03:25:30 -0000	1.3
@@ -2,10 +2,11 @@
 
 Name:           vim-vimoutliner
 Version:        0.3.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Script for building an outline editor on top of Vim
 Group:          Applications/Editors
-License:        GPL
+# LICENSE says v2, but the code all says v2+
+License:        GPLv2+
 URL:            http://www.vimoutliner.org/
 Source0:        http://www.vimoutliner.org/files/vimoutliner-%{version}.tar.gz
 # the following two tarballs are from http://www.vimoutliner.org as well, but
@@ -91,6 +92,9 @@
 %{_mandir}/man1/*.1.gz
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.4-10
+- fix license tag
+
 * Tue Apr  3 2007 Matej Cepl <mcepl at redhat.com> - 0.3.4-9
 - changed BuildRoot to more sane value, now it is allowed.
 



From spot at fedoraproject.org  Tue Sep  9 03:28:05 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 03:28:05 +0000 (UTC)
Subject: rpms/vkeybd/devel vkeybd.spec,1.7,1.8
Message-ID: <20080909032805.456DD7012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/vkeybd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25869

Modified Files:
	vkeybd.spec 
Log Message:
fix license tag


Index: vkeybd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vkeybd/devel/vkeybd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vkeybd.spec	19 Feb 2008 04:18:34 -0000	1.7
+++ vkeybd.spec	9 Sep 2008 03:27:34 -0000	1.8
@@ -1,8 +1,8 @@
 Summary:      Virtual MIDI keyboard
 Name:         vkeybd
 Version:      0.1.17a
-Release:      7%{?dist}
-License:      GPL
+Release:      8%{?dist}
+License:      GPLv2+
 Group:        Applications/Multimedia
 URL:          http://www.alsa-project.org/~iwai/alsa.html
 Source0:      http://www.alsa-project.org/~iwai/vkeybd-0.1.17a.tar.bz2
@@ -79,6 +79,9 @@
 %{_datadir}/icons/hicolor/64x64/apps/vkeybd.png
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.1.17a-8
+- fix license tag
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.17a-7
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Tue Sep  9 03:29:40 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 03:29:40 +0000 (UTC)
Subject: rpms/vlock/devel vlock.spec,1.24,1.25
Message-ID: <20080909032940.A1D807012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/vlock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26125

Modified Files:
	vlock.spec 
Log Message:
fix license tag


Index: vlock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vlock/devel/vlock.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- vlock.spec	19 Feb 2008 10:38:55 -0000	1.24
+++ vlock.spec	9 Sep 2008 03:29:10 -0000	1.25
@@ -1,8 +1,9 @@
 Summary: A program which locks one or more virtual consoles
 Name: vlock
 Version: 1.3
-Release: 26%{?dist}
-License: GPL
+Release: 27%{?dist}
+# No version specified.
+License: GPL+
 Group: Applications/System
 Source: ftp://tsx-11.mit.edu:/pub/linux/sources/usr.bin/vlock-1.3.tar.gz
 
@@ -55,6 +56,9 @@
 %{_mandir}/man1/vlock.1*
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3-27
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3-26
 - Autorebuild for GCC 4.3
 



From ework at fedoraproject.org  Tue Sep  9 03:34:09 2008
From: ework at fedoraproject.org (Eric Work)
Date: Tue,  9 Sep 2008 03:34:09 +0000 (UTC)
Subject: rpms/gtkdatabox/devel gtkdatabox.spec, 1.15,
	1.16 gtkdatabox-0.9.0.0-gcallback.patch, 1.1, NONE
Message-ID: <20080909033409.876877012A@cvs1.fedora.phx.redhat.com>

Author: ework

Update of /cvs/pkgs/rpms/gtkdatabox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26768

Modified Files:
	gtkdatabox.spec 
Removed Files:
	gtkdatabox-0.9.0.0-gcallback.patch 
Log Message:
Updated to gtkdatabox 0.9.0.1



Index: gtkdatabox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkdatabox/devel/gtkdatabox.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gtkdatabox.spec	1 Sep 2008 20:16:25 -0000	1.15
+++ gtkdatabox.spec	9 Sep 2008 03:33:39 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           gtkdatabox
-Version:        0.9.0.0
+Version:        0.9.0.1
 Release:        1%{?dist}
 Summary:        GTK+ widget for fast data display
 Group:          System Environment/Libraries
@@ -7,7 +7,6 @@
 URL:            http://www.eudoxos.net/gtk/gtkdatabox
 Source:         http://www.eudoxos.net/gtk/gtkdatabox/download/%{name}-%{version}.tar.gz
 Patch0:         gtkdatabox-0.8.2.0-userpmoptflags.patch
-Patch1:         gtkdatabox-0.9.0.0-gcallback.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel, libglade2-devel, pkgconfig
 
@@ -22,13 +21,12 @@
 Requires:       gtk2-devel, libglade2-devel, pkgconfig
 
 %description    devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
+The %{name}-devel package contains libraries, header files, and documentation
+for developing applications that use %{name}.
 
 %prep
 %setup -q
 %patch0 -p1 -b .optflags
-%patch1 -p1 -b .gcallback
 
 %build
 %configure --disable-static --enable-libglade
@@ -60,6 +58,10 @@
 %{_datadir}/gtk-doc/html/gtkdatabox/
 
 %changelog
+* Mon Sep 08 2008 Eric Work <work.eric at gmail.com> 0.9.0.1-1
+- new upstream version
+- drop patch gcallback
+
 * Mon Sep 01 2008 Eric Work <work.eric at gmail.com> 0.9.0.0-1
 - new upstream version
 - new gtk-doc documentation


--- gtkdatabox-0.9.0.0-gcallback.patch DELETED ---



From ework at fedoraproject.org  Tue Sep  9 03:35:57 2008
From: ework at fedoraproject.org (Eric Work)
Date: Tue,  9 Sep 2008 03:35:57 +0000 (UTC)
Subject: rpms/gtkdatabox/devel .cvsignore,1.9,1.10 sources,1.9,1.10
Message-ID: <20080909033557.A81BB7012A@cvs1.fedora.phx.redhat.com>

Author: ework

Update of /cvs/pkgs/rpms/gtkdatabox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27014

Modified Files:
	.cvsignore sources 
Log Message:
Added gtkdatabox 0.9.0.1 sources, oops



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkdatabox/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	1 Sep 2008 20:16:25 -0000	1.9
+++ .cvsignore	9 Sep 2008 03:35:27 -0000	1.10
@@ -1 +1 @@
-gtkdatabox-0.9.0.0.tar.gz
+gtkdatabox-0.9.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkdatabox/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	1 Sep 2008 20:16:25 -0000	1.9
+++ sources	9 Sep 2008 03:35:27 -0000	1.10
@@ -1 +1 @@
-a8f88108e46be13f51cd5996c2f3413f  gtkdatabox-0.9.0.0.tar.gz
+cb62ac3ab2ddafa6cb1bcd3a55a1cc88  gtkdatabox-0.9.0.1.tar.gz



From spot at fedoraproject.org  Tue Sep  9 03:54:07 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 03:54:07 +0000 (UTC)
Subject: rpms/vsftpd/devel .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 vsftpd-2.0.1-build_ssl.patch, 1.1,
	1.2 vsftpd-2.0.3-daemonize_fds.patch, 1.1,
	1.2 vsftpd-2.0.5-bind_denied.patch, 1.1,
	1.2 vsftpd-2.0.5-write_race.patch, 1.1,
	1.2 vsftpd-close-std-fds.patch, 1.1, 1.2 vsftpd.spec, 1.82, 1.83
Message-ID: <20080909035407.DFE0D7012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/vsftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28582

Modified Files:
	.cvsignore sources vsftpd-2.0.1-build_ssl.patch 
	vsftpd-2.0.3-daemonize_fds.patch 
	vsftpd-2.0.5-bind_denied.patch vsftpd-2.0.5-write_race.patch 
	vsftpd-close-std-fds.patch vsftpd.spec 
Log Message:
fix license tag, update to 2.0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vsftpd/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	22 Feb 2008 12:04:21 -0000	1.13
+++ .cvsignore	9 Sep 2008 03:53:37 -0000	1.14
@@ -1 +1 @@
-vsftpd-2.0.6.tar.gz
+vsftpd-2.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vsftpd/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Feb 2008 12:04:21 -0000	1.13
+++ sources	9 Sep 2008 03:53:37 -0000	1.14
@@ -1 +1 @@
-f7a742690d7f86e356fb66d3840079c7  vsftpd-2.0.6.tar.gz
+3e39cb7b0bee306ad7df8e3552e15297  vsftpd-2.0.7.tar.gz

vsftpd-2.0.1-build_ssl.patch:

Index: vsftpd-2.0.1-build_ssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vsftpd/devel/vsftpd-2.0.1-build_ssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vsftpd-2.0.1-build_ssl.patch	9 Sep 2004 14:09:55 -0000	1.1
+++ vsftpd-2.0.1-build_ssl.patch	9 Sep 2008 03:53:37 -0000	1.2
@@ -1,8 +1,9 @@
---- vsftpd-2.0.1/builddefs.h-orig	2004-07-02 16:36:59.000000000 +0200
-+++ vsftpd-2.0.1/builddefs.h	2004-08-17 13:40:42.834402983 +0200
+diff -up vsftpd-2.0.6/builddefs.h.build_ssl vsftpd-2.0.6/builddefs.h
+--- vsftpd-2.0.6/builddefs.h.build_ssl	2008-09-08 23:28:16.000000000 -0400
++++ vsftpd-2.0.6/builddefs.h	2008-09-08 23:29:04.000000000 -0400
 @@ -3,7 +3,7 @@
  
- #undef VSF_BUILD_TCPWRAPPERS
+ #define VSF_BUILD_TCPWRAPPERS
  #define VSF_BUILD_PAM
 -#undef VSF_BUILD_SSL
 +#define VSF_BUILD_SSL

vsftpd-2.0.3-daemonize_fds.patch:

Index: vsftpd-2.0.3-daemonize_fds.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vsftpd/devel/vsftpd-2.0.3-daemonize_fds.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vsftpd-2.0.3-daemonize_fds.patch	4 Aug 2005 09:09:49 -0000	1.1
+++ vsftpd-2.0.3-daemonize_fds.patch	9 Sep 2008 03:53:37 -0000	1.2
@@ -1,27 +1,27 @@
-diff -u vsftpd-2.0.1.orig/standalone.c vsftpd-2.0.1/standalone.c
---- vsftpd-2.0.1.orig/standalone.c	2005-06-15 16:08:52.000000000 -0400
-+++ vsftpd-2.0.1/standalone.c	2005-06-15 16:06:26.000000000 -0400
-@@ -53,6 +53,7 @@
-       vsf_sysutil_exit(0);
-     }
+diff -up vsftpd-2.0.6/standalone.c.fds vsftpd-2.0.6/standalone.c
+--- vsftpd-2.0.6/standalone.c.fds	2008-09-08 23:29:23.000000000 -0400
++++ vsftpd-2.0.6/standalone.c	2008-09-08 23:30:16.000000000 -0400
+@@ -57,6 +57,7 @@ vsf_standalone_main(void)
+     vsf_sysutil_close_failok(1);
+     vsf_sysutil_close_failok(2);
      vsf_sysutil_make_session_leader();
 +    vsf_sysutil_reopen_standard_fds();
    }
    if (tunable_listen)
    {
-diff -u vsftpd-2.0.1.orig/sysutil.c vsftpd-2.0.1/sysutil.c
---- vsftpd-2.0.1.orig/sysutil.c	2005-06-15 16:08:52.000000000 -0400
-+++ vsftpd-2.0.1/sysutil.c	2005-06-15 16:03:25.000000000 -0400
-@@ -2357,6 +2357,44 @@
+diff -up vsftpd-2.0.6/sysutil.c.fds vsftpd-2.0.6/sysutil.c
+--- vsftpd-2.0.6/sysutil.c.fds	2008-09-08 23:29:23.000000000 -0400
++++ vsftpd-2.0.6/sysutil.c	2008-09-08 23:32:26.000000000 -0400
+@@ -2457,6 +2457,44 @@ vsf_sysutil_make_session_leader(void)
  }
  
  void
 +vsf_sysutil_reopen_standard_fds(void)
 +{
 +  /* This reopens STDIN, STDOUT and STDERR to /dev/null */
-+
++  
 +  int fd;
-+
++    
 +  if ( (fd = open("/dev/null", O_RDWR, 0)) == -1 )
 +  {
 +    goto error;
@@ -41,26 +41,26 @@
 +  {
 +    goto error;
 +  }
-+
++  
 +  if ( fd > 2 )
 +  {
 +    (void) close(fd);
 +  }
-+
++   
 +  return;
-+
++   
 +error:
 +  die("reopening standard file descriptors to /dev/null failed");
 +}
-+
++    
 +void
  vsf_sysutil_tzset(void)
  {
-   tzset();
-diff -u vsftpd-2.0.1.orig/sysutil.h vsftpd-2.0.1/sysutil.h
---- vsftpd-2.0.1.orig/sysutil.h	2004-06-04 06:11:52.000000000 -0400
-+++ vsftpd-2.0.1/sysutil.h	2005-06-15 16:03:54.000000000 -0400
-@@ -287,6 +287,7 @@
+   int retval;
+diff -up vsftpd-2.0.6/sysutil.h.fds vsftpd-2.0.6/sysutil.h
+--- vsftpd-2.0.6/sysutil.h.fds	2008-02-01 20:30:39.000000000 -0500
++++ vsftpd-2.0.6/sysutil.h	2008-09-08 23:29:24.000000000 -0400
+@@ -293,6 +293,7 @@ unsigned char vsf_sysutil_get_random_byt
  unsigned int vsf_sysutil_get_umask(void);
  void vsf_sysutil_set_umask(unsigned int umask);
  void vsf_sysutil_make_session_leader(void);

vsftpd-2.0.5-bind_denied.patch:

Index: vsftpd-2.0.5-bind_denied.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vsftpd/devel/vsftpd-2.0.5-bind_denied.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vsftpd-2.0.5-bind_denied.patch	17 Jan 2007 12:52:52 -0000	1.1
+++ vsftpd-2.0.5-bind_denied.patch	9 Sep 2008 03:53:37 -0000	1.2
@@ -1,8 +1,9 @@
---- vsftpd-2.0.5/postlogin.c.old	2007-01-17 12:22:10.000000000 +0100
-+++ vsftpd-2.0.5/postlogin.c	2007-01-17 12:20:33.000000000 +0100
-@@ -557,7 +557,8 @@
-     {
-       break;
+diff -up vsftpd-2.0.7/postlogin.c.bind_denied vsftpd-2.0.7/postlogin.c
+--- vsftpd-2.0.7/postlogin.c.bind_denied	2008-07-29 21:51:09.000000000 -0400
++++ vsftpd-2.0.7/postlogin.c	2008-09-08 23:39:28.000000000 -0400
+@@ -574,7 +574,8 @@ handle_pasv(struct vsf_session* p_sess, 
+         break;
+       }
      }
 -    if (vsf_sysutil_get_error() == kVSFSysUtilErrADDRINUSE)
 +    if ( (vsf_sysutil_get_error() == kVSFSysUtilErrADDRINUSE) ||
@@ -10,21 +11,10 @@
      {
        continue;
      }
---- vsftpd-2.0.5/sysutil.h.old	2007-01-17 12:22:10.000000000 +0100
-+++ vsftpd-2.0.5/sysutil.h	2007-01-17 12:20:52.000000000 +0100
-@@ -16,7 +16,8 @@
-   kVSFSysUtilErrNOSYS,
-   kVSFSysUtilErrINTR,
-   kVSFSysUtilErrINVAL,
--  kVSFSysUtilErrOPNOTSUPP
-+  kVSFSysUtilErrOPNOTSUPP,
-+  kVSFSysUtilErrEACCES
- };
- enum EVSFSysUtilError vsf_sysutil_get_error(void);
- 
---- vsftpd-2.0.5/sysutil.c.old	2007-01-17 12:22:10.000000000 +0100
-+++ vsftpd-2.0.5/sysutil.c	2007-01-17 12:20:22.000000000 +0100
-@@ -1553,6 +1553,9 @@
+diff -up vsftpd-2.0.7/sysutil.c.bind_denied vsftpd-2.0.7/sysutil.c
+--- vsftpd-2.0.7/sysutil.c.bind_denied	2008-09-08 23:38:10.000000000 -0400
++++ vsftpd-2.0.7/sysutil.c	2008-09-08 23:38:10.000000000 -0400
+@@ -1561,6 +1561,9 @@ vsf_sysutil_get_error(void)
      case EOPNOTSUPP:
        retval = kVSFSysUtilErrOPNOTSUPP;
        break;
@@ -34,3 +24,16 @@
    }
    return retval;
  }
+diff -up vsftpd-2.0.7/sysutil.h.bind_denied vsftpd-2.0.7/sysutil.h
+--- vsftpd-2.0.7/sysutil.h.bind_denied	2008-09-08 23:38:10.000000000 -0400
++++ vsftpd-2.0.7/sysutil.h	2008-09-08 23:38:10.000000000 -0400
+@@ -16,7 +16,8 @@ enum EVSFSysUtilError
+   kVSFSysUtilErrNOSYS,
+   kVSFSysUtilErrINTR,
+   kVSFSysUtilErrINVAL,
+-  kVSFSysUtilErrOPNOTSUPP
++  kVSFSysUtilErrOPNOTSUPP,
++  kVSFSysUtilErrEACCES
+ };
+ enum EVSFSysUtilError vsf_sysutil_get_error(void);
+ 

vsftpd-2.0.5-write_race.patch:

Index: vsftpd-2.0.5-write_race.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vsftpd/devel/vsftpd-2.0.5-write_race.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vsftpd-2.0.5-write_race.patch	30 Nov 2007 08:52:44 -0000	1.1
+++ vsftpd-2.0.5-write_race.patch	9 Sep 2008 03:53:37 -0000	1.2
@@ -1,27 +1,15 @@
-diff -up vsftpd-2.0.5/sysutil.h.write_race vsftpd-2.0.5/sysutil.h
---- vsftpd-2.0.5/sysutil.h.write_race	2007-11-21 08:48:28.000000000 +0100
-+++ vsftpd-2.0.5/sysutil.h	2007-11-21 08:48:28.000000000 +0100
-@@ -91,6 +91,8 @@ void vsf_sysutil_close(int fd);
- int vsf_sysutil_close_failok(int fd);
- int vsf_sysutil_unlink(const char* p_dead);
- int vsf_sysutil_write_access(const char* p_filename);
-+/* Trucate after open */
-+int vsf_sysutil_truncate(int fd, filesize_t length);
- 
- /* Reading and writing */
- void vsf_sysutil_lseek_to(const int fd, filesize_t seek_pos);
-diff -up vsftpd-2.0.5/postlogin.c.write_race vsftpd-2.0.5/postlogin.c
---- vsftpd-2.0.5/postlogin.c.write_race	2007-11-21 08:48:28.000000000 +0100
-+++ vsftpd-2.0.5/postlogin.c	2007-11-21 08:51:59.000000000 +0100
-@@ -953,6 +953,7 @@ handle_upload_common(struct vsf_session*
+diff -up vsftpd-2.0.7/postlogin.c.write_race vsftpd-2.0.7/postlogin.c
+--- vsftpd-2.0.7/postlogin.c.write_race	2008-09-08 23:39:58.000000000 -0400
++++ vsftpd-2.0.7/postlogin.c	2008-09-08 23:47:27.000000000 -0400
+@@ -982,6 +982,7 @@ handle_upload_common(struct vsf_session*
    struct vsf_transfer_ret trans_ret;
    int new_file_fd;
    int remote_fd;
 +  int truncit = 0;
+   int success = 0;
+   int created = 0;
    filesize_t offset = p_sess->restart_pos;
-   p_sess->restart_pos = 0;
-   if (!data_transfer_checks_ok(p_sess))
-@@ -987,7 +988,15 @@ handle_upload_common(struct vsf_session*
+@@ -1018,7 +1019,15 @@ handle_upload_common(struct vsf_session*
      /* For non-anonymous, allow open() to overwrite or append existing files */
      if (!is_append && offset == 0)
      {
@@ -38,7 +26,7 @@
      }
      else
      {
-@@ -1023,6 +1032,11 @@ handle_upload_common(struct vsf_session*
+@@ -1056,6 +1065,11 @@ handle_upload_common(struct vsf_session*
    if (tunable_lock_upload_files)
    {
      vsf_sysutil_lock_file_write(new_file_fd);
@@ -50,10 +38,10 @@
    }
    if (!is_append && offset != 0)
    {
-diff -up vsftpd-2.0.5/sysutil.c.write_race vsftpd-2.0.5/sysutil.c
---- vsftpd-2.0.5/sysutil.c.write_race	2007-11-21 08:48:28.000000000 +0100
-+++ vsftpd-2.0.5/sysutil.c	2007-11-21 08:48:28.000000000 +0100
-@@ -1196,6 +1196,12 @@ vsf_sysutil_close_failok(int fd)
+diff -up vsftpd-2.0.7/sysutil.c.write_race vsftpd-2.0.7/sysutil.c
+--- vsftpd-2.0.7/sysutil.c.write_race	2008-09-08 23:39:58.000000000 -0400
++++ vsftpd-2.0.7/sysutil.c	2008-09-08 23:39:58.000000000 -0400
+@@ -1200,6 +1200,12 @@ vsf_sysutil_close_failok(int fd)
  }
  
  int
@@ -66,3 +54,15 @@
  vsf_sysutil_unlink(const char* p_dead)
  {
    return unlink(p_dead);
+diff -up vsftpd-2.0.7/sysutil.h.write_race vsftpd-2.0.7/sysutil.h
+--- vsftpd-2.0.7/sysutil.h.write_race	2008-09-08 23:39:58.000000000 -0400
++++ vsftpd-2.0.7/sysutil.h	2008-09-08 23:39:58.000000000 -0400
+@@ -91,6 +91,8 @@ void vsf_sysutil_close(int fd);
+ int vsf_sysutil_close_failok(int fd);
+ int vsf_sysutil_unlink(const char* p_dead);
+ int vsf_sysutil_write_access(const char* p_filename);
++/* Trucate after open */
++int vsf_sysutil_truncate(int fd, filesize_t length);
+ 
+ /* Reading and writing */
+ void vsf_sysutil_lseek_to(const int fd, filesize_t seek_pos);

vsftpd-close-std-fds.patch:

Index: vsftpd-close-std-fds.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vsftpd/devel/vsftpd-close-std-fds.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vsftpd-close-std-fds.patch	9 Nov 2005 08:58:28 -0000	1.1
+++ vsftpd-close-std-fds.patch	9 Sep 2008 03:53:37 -0000	1.2
@@ -1,13 +1,13 @@
-diff -up vsftpd-2.0.1/standalone.c vsftpd-2.0.1.new/standalone.c
---- vsftpd-2.0.1/standalone.c	2005-10-24 11:49:43.478375564 +0100
-+++ vsftpd-2.0.1.new/standalone.c	2005-10-24 11:47:33.666544352 +0100
-@@ -126,6 +126,9 @@ vsf_standalone_main(void)
+diff -up vsftpd-2.0.7/standalone.c.close-fds vsftpd-2.0.7/standalone.c
+--- vsftpd-2.0.7/standalone.c.close-fds	2008-09-08 23:36:32.000000000 -0400
++++ vsftpd-2.0.7/standalone.c	2008-09-08 23:37:53.000000000 -0400
+@@ -131,6 +131,9 @@ vsf_standalone_main(void)
        die("could not bind listening IPv6 socket");
      }
    }
 +  vsf_sysutil_close(0);
 +  vsf_sysutil_close(1);
 +  vsf_sysutil_close(2);
-   vsf_sysutil_listen(listen_sock, VSFTP_LISTEN_BACKLOG);
-   vsf_sysutil_sockaddr_alloc(&p_accept_addr);
-   while (1)
+   retval = vsf_sysutil_listen(listen_sock, VSFTP_LISTEN_BACKLOG);
+   if (vsf_sysutil_retval_is_error(retval))
+   {


Index: vsftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- vsftpd.spec	1 Jul 2008 13:46:33 -0000	1.82
+++ vsftpd.spec	9 Sep 2008 03:53:37 -0000	1.83
@@ -2,9 +2,10 @@
 
 Summary: Very Secure Ftp Daemon
 Name: vsftpd
-Version: 2.0.6
-Release: 5%{?dist}
-License: GPL
+Version: 2.0.7
+Release: 1%{?dist}
+# OpenSSL link exception
+License: GPLv2 with exceptions
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/
 Source: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
@@ -111,7 +112,7 @@
 	%{?_smp_mflags}
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{vsftpd,pam.d,logrotate.d,rc.d/init.d}
@@ -130,7 +131,7 @@
 mkdir -p $RPM_BUILD_ROOT/%{_var}/ftp/pub
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add vsftpd
@@ -158,6 +159,10 @@
 %{_var}/ftp
 
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.7-1
+- fix license tag
+- update to 2.0.7
+
 * Fri Jun 20 2008 Dennis Gilmore <dennis at ausil.us> - 2.0.6-5
 - add sparc arches to -fPIE list
 



From pkgdb at fedoraproject.org  Tue Sep  9 03:57:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 03:57:46 +0000
Subject: [pkgdb] libgnomedb: huzaifas has requested watchbugzilla
Message-ID: <20080909035746.1DE53208770@bastion.fedora.phx.redhat.com>

huzaifas has requested the watchbugzilla acl on libgnomedb (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 03:57:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 03:57:46 +0000
Subject: [pkgdb] libgnomedb: huzaifas has requested watchcommits
Message-ID: <20080909035746.460C0208D7C@bastion.fedora.phx.redhat.com>

huzaifas has requested the watchcommits acl on libgnomedb (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 03:57:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 03:57:47 +0000
Subject: [pkgdb] libgnomedb: huzaifas has requested commit
Message-ID: <20080909035747.3FFF4208D99@bastion.fedora.phx.redhat.com>

huzaifas has requested the commit acl on libgnomedb (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 03:57:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 03:57:53 +0000
Subject: [pkgdb] libgnomedb: huzaifas has requested watchbugzilla
Message-ID: <20080909035753.158CC208DA0@bastion.fedora.phx.redhat.com>

huzaifas has requested the watchbugzilla acl on libgnomedb (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 03:57:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 03:57:48 +0000
Subject: [pkgdb] libgnomedb: huzaifas has requested approveacls
Message-ID: <20080909035748.4FA8D208D9C@bastion.fedora.phx.redhat.com>

huzaifas has requested the approveacls acl on libgnomedb (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 03:57:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 03:57:53 +0000
Subject: [pkgdb] libgnomedb: huzaifas has requested watchcommits
Message-ID: <20080909035753.46B2D208DA3@bastion.fedora.phx.redhat.com>

huzaifas has requested the watchcommits acl on libgnomedb (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 03:57:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 03:57:56 +0000
Subject: [pkgdb] libgnomedb: huzaifas has requested approveacls
Message-ID: <20080909035756.473B3208DA5@bastion.fedora.phx.redhat.com>

huzaifas has requested the approveacls acl on libgnomedb (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 03:57:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 03:57:59 +0000
Subject: [pkgdb] libgnomedb: huzaifas has requested watchbugzilla
Message-ID: <20080909035800.15B19208DAA@bastion.fedora.phx.redhat.com>

huzaifas has requested the watchbugzilla acl on libgnomedb (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 03:57:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 03:57:57 +0000
Subject: [pkgdb] libgnomedb: huzaifas has requested commit
Message-ID: <20080909035757.8906B208DA8@bastion.fedora.phx.redhat.com>

huzaifas has requested the commit acl on libgnomedb (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 03:58:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 03:58:00 +0000
Subject: [pkgdb] libgnomedb: huzaifas has requested watchcommits
Message-ID: <20080909035800.84258208DAD@bastion.fedora.phx.redhat.com>

huzaifas has requested the watchcommits acl on libgnomedb (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 03:58:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 03:58:02 +0000
Subject: [pkgdb] libgnomedb: huzaifas has requested approveacls
Message-ID: <20080909035802.76555208DB0@bastion.fedora.phx.redhat.com>

huzaifas has requested the approveacls acl on libgnomedb (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 03:58:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 03:58:02 +0000
Subject: [pkgdb] libgnomedb: huzaifas has requested commit
Message-ID: <20080909035802.D3883208DB3@bastion.fedora.phx.redhat.com>

huzaifas has requested the commit acl on libgnomedb (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From mtasaka at fedoraproject.org  Tue Sep  9 04:05:31 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  9 Sep 2008 04:05:31 +0000 (UTC)
Subject: rpms/jd/F-8 .cvsignore, 1.282, 1.283 jd.spec, 1.316, 1.317 sources, 
	1.283, 1.284
Message-ID: <20080909040531.3E8637012A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29290/F-8

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2322
- Set xdg-open as default browser now by configure option



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- .cvsignore	8 Sep 2008 03:40:13 -0000	1.282
+++ .cvsignore	9 Sep 2008 04:05:00 -0000	1.283
@@ -1 +1 @@
-jd-2.0.1-svn2319_trunk.tgz
+jd-2.0.1-svn2322_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- jd.spec	8 Sep 2008 03:40:13 -0000	1.316
+++ jd.spec	9 Sep 2008 04:05:00 -0000	1.317
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.1
-%define         strtag        svn2319_trunk
+%define         strtag        svn2322_trunk
 %define         repoid        32731
 # Define this if this is pre-version
 %define         pre_release   1
@@ -93,6 +93,7 @@
 
 %configure \
    --with-alsa \
+   --with-xdgopen \
 %if 0%{?_with_migemo} >= 1
    --with-migemo \
    --with-migemodict=%{migemo_dict}
@@ -134,6 +135,10 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2322
+- Set xdg-open as default browser now by configure option
+
 * Mon Sep  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 2319
 - revert default browser setting


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/sources,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- sources	8 Sep 2008 03:40:13 -0000	1.283
+++ sources	9 Sep 2008 04:05:00 -0000	1.284
@@ -1 +1 @@
-c7ecf6f3a652f19b15329307b0172aa0  jd-2.0.1-svn2319_trunk.tgz
+316d05b99267323262f2dac66e5e4b08  jd-2.0.1-svn2322_trunk.tgz



From mtasaka at fedoraproject.org  Tue Sep  9 04:05:31 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  9 Sep 2008 04:05:31 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.289, 1.290 jd.spec, 1.327, 1.328 sources, 
	1.290, 1.291
Message-ID: <20080909040531.64BBC7012A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29290/F-9

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2322
- Set xdg-open as default browser now by configure option



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- .cvsignore	8 Sep 2008 03:40:13 -0000	1.289
+++ .cvsignore	9 Sep 2008 04:05:01 -0000	1.290
@@ -1 +1 @@
-jd-2.0.1-svn2319_trunk.tgz
+jd-2.0.1-svn2322_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- jd.spec	8 Sep 2008 03:40:13 -0000	1.327
+++ jd.spec	9 Sep 2008 04:05:01 -0000	1.328
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.1
-%define         strtag        svn2319_trunk
+%define         strtag        svn2322_trunk
 %define         repoid        32731
 # Define this if this is pre-version
 %define         pre_release   1
@@ -93,6 +93,7 @@
 
 %configure \
    --with-alsa \
+   --with-xdgopen \
 %if 0%{?_with_migemo} >= 1
    --with-migemo \
    --with-migemodict=%{migemo_dict}
@@ -134,6 +135,10 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2322
+- Set xdg-open as default browser now by configure option
+
 * Mon Sep  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 2319
 - revert default browser setting


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- sources	8 Sep 2008 03:40:13 -0000	1.290
+++ sources	9 Sep 2008 04:05:01 -0000	1.291
@@ -1 +1 @@
-c7ecf6f3a652f19b15329307b0172aa0  jd-2.0.1-svn2319_trunk.tgz
+316d05b99267323262f2dac66e5e4b08  jd-2.0.1-svn2322_trunk.tgz



From mtasaka at fedoraproject.org  Tue Sep  9 04:05:31 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  9 Sep 2008 04:05:31 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.289, 1.290 jd.spec, 1.335, 1.336 sources,
	1.290, 1.291
Message-ID: <20080909040531.AAF3D7012A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29290/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2322
- Set xdg-open as default browser now by configure option



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- .cvsignore	8 Sep 2008 03:40:13 -0000	1.289
+++ .cvsignore	9 Sep 2008 04:05:01 -0000	1.290
@@ -1 +1 @@
-jd-2.0.1-svn2319_trunk.tgz
+jd-2.0.1-svn2322_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- jd.spec	8 Sep 2008 03:40:13 -0000	1.335
+++ jd.spec	9 Sep 2008 04:05:01 -0000	1.336
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.1
-%define         strtag        svn2319_trunk
+%define         strtag        svn2322_trunk
 %define         repoid        32731
 # Define this if this is pre-version
 %define         pre_release   1
@@ -93,6 +93,7 @@
 
 %configure \
    --with-alsa \
+   --with-xdgopen \
 %if 0%{?_with_migemo} >= 1
    --with-migemo \
    --with-migemodict=%{migemo_dict}
@@ -134,6 +135,10 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2322
+- Set xdg-open as default browser now by configure option
+
 * Mon Sep  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 2319
 - revert default browser setting


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- sources	8 Sep 2008 03:40:13 -0000	1.290
+++ sources	9 Sep 2008 04:05:01 -0000	1.291
@@ -1 +1 @@
-c7ecf6f3a652f19b15329307b0172aa0  jd-2.0.1-svn2319_trunk.tgz
+316d05b99267323262f2dac66e5e4b08  jd-2.0.1-svn2322_trunk.tgz



From cweyl at fedoraproject.org  Tue Sep  9 04:21:25 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  9 Sep 2008 04:21:25 +0000 (UTC)
Subject: rpms/perl-CGI-Ajax/devel .cvsignore, 1.2, 1.3 perl-CGI-Ajax.spec,
	1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20080909042125.B455B7012A@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CGI-Ajax/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30777

Modified Files:
	.cvsignore perl-CGI-Ajax.spec sources 
Log Message:
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.706-1
- update to 0.706



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Ajax/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Apr 2007 16:01:48 -0000	1.2
+++ .cvsignore	9 Sep 2008 04:20:55 -0000	1.3
@@ -1 +1 @@
-CGI-Ajax-0.701.tar.gz
+CGI-Ajax-0.706.tar.gz


Index: perl-CGI-Ajax.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Ajax/devel/perl-CGI-Ajax.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-CGI-Ajax.spec	7 Mar 2008 01:55:09 -0000	1.4
+++ perl-CGI-Ajax.spec	9 Sep 2008 04:20:55 -0000	1.5
@@ -1,11 +1,11 @@
 Name:           perl-CGI-Ajax
-Version:        0.701
-Release:        4%{?dist}
+Version:        0.706
+Release:        1%{?dist}
 Summary:        Perl-specific system for writing Asynchronous web applications
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/CGI-Ajax/
-Source0:        http://www.cpan.org/authors/id/B/BC/BCT/CGI-Ajax-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/B/BP/BPEDERSE/CGI-Ajax-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -56,8 +56,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.706-1
+- update to 0.706
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.701-4
-Rebuild for new perl
+- Rebuild for new perl
 
 * Tue Jan 08 2008 Ralf Cors??pius <rc040203 at freenet.de> 0.701-3
 - Update License-tag.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Ajax/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Apr 2007 16:01:48 -0000	1.2
+++ sources	9 Sep 2008 04:20:55 -0000	1.3
@@ -1 +1 @@
-e4922d9ea9e45c68387d3682a7adbacf  CGI-Ajax-0.701.tar.gz
+373485d25827a13b5328159f02fce199  CGI-Ajax-0.706.tar.gz



From mtasaka at fedoraproject.org  Tue Sep  9 05:14:58 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  9 Sep 2008 05:14:58 +0000 (UTC)
Subject: rpms/monafont/devel monafont.spec,1.1,1.2
Message-ID: <20080909051458.A14797012A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/monafont/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1732

Modified Files:
	monafont.spec 
Log Message:
* Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.90-5
- F-10: Rebuild for new VLGothic



Index: monafont.spec
===================================================================
RCS file: /cvs/extras/rpms/monafont/devel/monafont.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monafont.spec	4 Aug 2008 20:06:04 -0000	1.1
+++ monafont.spec	9 Sep 2008 05:14:25 -0000	1.2
@@ -12,7 +12,7 @@
 
 %if 0%{?fedora} >= 10
 %define		sazanami_ver		20040629
-%define		vlgothic_ver		20080624
+%define		vlgothic_ver		20080908
 %endif
 %if 0%{?fedora} == 9
 %define		sazanami_ver		20040629
@@ -35,7 +35,7 @@
 
 Name:		%{archivename}
 Version:	2.90
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Japanese font for text arts
 
 # monafont itself is under public domain
@@ -241,6 +241,9 @@
 
 
 %changelog
+* Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.90-5
+- F-10: Rebuild for new VLGothic
+
 * Tue Aug  5 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.90-4
 - Bump
 



From pkgdb at fedoraproject.org  Tue Sep  9 05:20:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:20:13 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20080909052014.0D1CD208770@bastion.fedora.phx.redhat.com>

Package ksensors in Fedora 3 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Tue Sep  9 05:20:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:20:14 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20080909052015.3CB6B208D0F@bastion.fedora.phx.redhat.com>

Package ksensors in Fedora 4 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Tue Sep  9 05:20:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:20:16 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20080909052016.5CD89208D7C@bastion.fedora.phx.redhat.com>

Package ksensors in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Tue Sep  9 05:20:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:20:19 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20080909052019.E0F46208D98@bastion.fedora.phx.redhat.com>

Package ksensors in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Tue Sep  9 05:20:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:20:22 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20080909052022.BAEF2208D9B@bastion.fedora.phx.redhat.com>

Package ksensors in Red Hat Linux 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Tue Sep  9 05:20:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:20:27 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20080909052027.64265208770@bastion.fedora.phx.redhat.com>

Package ksensors in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Tue Sep  9 05:20:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:20:29 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20080909052029.CB87B208D9E@bastion.fedora.phx.redhat.com>

Package ksensors in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksensors



From rrankin at fedoraproject.org  Tue Sep  9 05:23:48 2008
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Tue,  9 Sep 2008 05:23:48 +0000 (UTC)
Subject: rpms/gpsim/F-8 gpsim-0.22.0-acinclude.patch, NONE,
	1.1 gpsim-0.22.0-gccfix.patch, NONE, 1.1 gpsim.spec, 1.16,
	1.17 gpsim-0.21.11.happy_gcc, 1.3,
	NONE gpsim-0.21.11.ktechlab.patch, 1.1, NONE
Message-ID: <20080909052348.9CC307012A@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/gpsim/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2161

Modified Files:
	gpsim.spec 
Added Files:
	gpsim-0.22.0-acinclude.patch gpsim-0.22.0-gccfix.patch 
Removed Files:
	gpsim-0.21.11.happy_gcc gpsim-0.21.11.ktechlab.patch 
Log Message:
Changes for gcc 4.3 compatibility


gpsim-0.22.0-acinclude.patch:

--- NEW FILE gpsim-0.22.0-acinclude.patch ---
--- gpsim-0.22.0/acinclude.m4.debug	2006-11-02 14:43:21.000000000 +0900
+++ gpsim-0.22.0/acinclude.m4	2008-09-07 14:57:46.000000000 +0900
@@ -54,18 +54,6 @@
 dnl AC_CHECK_FUNC(rl_completion_append_character, [wi_cv_lib_readline=yes],[
 dnl 	wi_cv_lib_readline=no;wi_cv_lib_readline_result="no (it is present but too old to use)"
 dnl ])
-	AC_TRY_LINK([
-		/* includes */
-	],[
-		/* function-body */
-		readline(0);
-		rl_completion_append_character(0);
-	],[
-		wi_cv_lib_readline=yes
-	],[
-		wi_cv_lib_readline=no
-		wi_cv_lib_readline_result="no (it is present but too old to use)"
-	])
 
 if test "$wi_cv_lib_readline" = no ; then
 	LIBREADLINE=""

gpsim-0.22.0-gccfix.patch:

--- NEW FILE gpsim-0.22.0-gccfix.patch ---
diff --git a/cli/cmd_clear.cc b/cli/cmd_clear.cc
index e9a64db..e836053 100644
--- a/cli/cmd_clear.cc
+++ b/cli/cmd_clear.cc
@@ -25,6 +25,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "command.h"
 #include "cmd_clear.h"
+#include <typeinfo>
 
 #include "../src/pic-processor.h"
 
diff --git a/cli/cmd_x.cc b/cli/cmd_x.cc
index 4ab5f88..37645a4 100644
--- a/cli/cmd_x.cc
+++ b/cli/cmd_x.cc
@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #include <iostream>
 #include <iomanip>
 #include <string>
+#include <typeinfo>
 
 
 #include "command.h"
diff --git a/gui/gui_regwin.cc b/gui/gui_regwin.cc
index fc74be5..0a2d8ae 100644
--- a/gui/gui_regwin.cc
+++ b/gui/gui_regwin.cc
@@ -19,6 +19,7 @@ along with gpsim; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#include <typeinfo>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gui/gui_src.cc b/gui/gui_src.cc
index 5e569a0..adcbd0e 100644
--- a/gui/gui_src.cc
+++ b/gui/gui_src.cc
@@ -19,6 +19,8 @@ along with gpsim; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#include <typeinfo>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/gui/gui_stack.cc b/gui/gui_stack.cc
index b318a85..2428615 100644
--- a/gui/gui_stack.cc
+++ b/gui/gui_stack.cc
@@ -19,6 +19,8 @@ along with gpsim; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#include <typeinfo>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/gui/gui_symbols.cc b/gui/gui_symbols.cc
index 303233c..f0cc1d2 100644
--- a/gui/gui_symbols.cc
+++ b/gui/gui_symbols.cc
@@ -19,6 +19,8 @@ along with gpsim; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#include <typeinfo>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/gui/settings_exdbm.cc b/gui/settings_exdbm.cc
index d5e3399..e2e3c3c 100644
--- a/gui/settings_exdbm.cc
+++ b/gui/settings_exdbm.cc
@@ -19,6 +19,7 @@ along with gpsim; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#include <stdlib.h>
 #include "settings_exdbm.h"
 
 
diff --git a/modules/switch.cc b/modules/switch.cc
index 2f40394..3de822c 100644
--- a/modules/switch.cc
+++ b/modules/switch.cc
@@ -43,6 +43,7 @@ Boston, MA 02111-1307, USA.  */
 #include <assert.h>
 #include <string>
 #include <iostream>
+#include <typeinfo>
 #include <math.h>
 
 #include "../config.h"    // get the definition for HAVE_GUI
diff --git a/src/gpsim_object.cc b/src/gpsim_object.cc
index cdb2ae0..70503fc 100644
--- a/src/gpsim_object.cc
+++ b/src/gpsim_object.cc
@@ -23,6 +23,7 @@ Boston, MA 02111-1307, USA.  */
 #include <typeinfo>
 #include <stdio.h>
 #include <ctype.h>
+#include <string.h>
 #include "gpsim_object.h"
 
 //========================================================================
diff --git a/src/modules.cc b/src/modules.cc
index bef4f13..c564175 100644
--- a/src/modules.cc
+++ b/src/modules.cc
@@ -19,6 +19,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
+#include <typeinfo>
+
 #include "modules.h"
 
 #include <stdio.h>
diff --git a/src/modules.h b/src/modules.h
index 8ba2e47..05a24db 100644
--- a/src/modules.h
+++ b/src/modules.h
@@ -37,6 +37,9 @@ Boston, MA 02111-1307, USA.  */
 #include <vector>
 #include <assert.h>
 
+#include <string.h>
+#include <stdlib.h>
+
 #include "gpsim_object.h"
 #include "gpsim_classes.h"
 
diff --git a/src/operator.cc b/src/operator.cc
index 945fcc0..ecc6b2a 100644
--- a/src/operator.cc
+++ b/src/operator.cc
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <typeinfo>
 
 #include "operator.h"
 #include "errors.h"
diff --git a/src/processor.cc b/src/processor.cc
index d73b3aa..504602c 100644
--- a/src/processor.cc
+++ b/src/processor.cc
@@ -36,6 +36,7 @@ Boston, MA 02111-1307, USA.  */
 #include <iostream>
 #include <iomanip>
 #include <string>
+#include <typeinfo>
 
 #include "../config.h"
 #include "gpsim_def.h"
diff --git a/src/processor.h b/src/processor.h
index 9a67aad..2374c02 100644
--- a/src/processor.h
+++ b/src/processor.h
@@ -395,7 +395,7 @@ public:
   /// (for those processors that support interrupts), the processor is
   /// in a different 'state' then when the interrupt flag is cleared.
 
-  list<ProgramMemoryAccess *> pma_context;
+  std::list<ProgramMemoryAccess *> pma_context;
 
   /// Tracing
   /// The readTT and writeTT are TraceType objects for tracing
diff --git a/src/program_files.cc b/src/program_files.cc
index 355406b..68c0187 100644
--- a/src/program_files.cc
+++ b/src/program_files.cc
@@ -1,3 +1,4 @@
+#include <cstring>
 #include "exports.h"
 #include "program_files.h"
 #include "pic-processor.h"
diff --git a/src/symbol.cc b/src/symbol.cc
index 1b7ea17..fb29d56 100644
--- a/src/symbol.cc
+++ b/src/symbol.cc
@@ -34,6 +34,7 @@ Boston, MA 02111-1307, USA.  */
 #include <string>
 #include <vector>
 #include <algorithm>
+#include <typeinfo>
 
 #include "../config.h"
 #include "14bit-processors.h"
diff --git a/src/value.cc b/src/value.cc
index 0cbfd51..5f5477f 100644
--- a/src/value.cc
+++ b/src/value.cc
@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #include <stdio.h>
 #include <iostream>
 #include <iomanip>
+#include <typeinfo>
 
 #include "processor.h"
 
diff --git a/src/value.h b/src/value.h
index 922365a..cb91063 100644
--- a/src/value.h
+++ b/src/value.h
@@ -23,6 +23,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "gpsim_object.h"
 #include <glib.h>
+#include <string.h>
 
 class Processor;
 class Module;


Index: gpsim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsim/F-8/gpsim.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gpsim.spec	27 Sep 2007 15:23:41 -0000	1.16
+++ gpsim.spec	9 Sep 2008 05:23:18 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		gpsim
 Version:	0.22.0
-Release:	5%{?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)
 
@@ -8,9 +8,13 @@
 License:	GPLv2+
 URL:		http://www.dattalo.com/gnupic/gpsim.html
 Source:		http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
+Patch0:		%{name}-%{version}-gccfix.patch
+Patch1:         %{name}-%{version}-acinclude.patch
+
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel, popt-devel
+BuildRequires:	autoconf
 
 %description
 gpsim is a simulator for Microchip (TM) PIC (TM) microcontrollers.
@@ -43,6 +47,9 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+autoconf
 
 %build
 %configure
@@ -80,6 +87,15 @@
 %{_includedir}/*
 
 %changelog
+* Mon Sep 08 2008 Roy Rankin <rrankin at ihug.com.au> - 0.22.0-8
+Patch for PPC build
+
+* Sun Sep 07 2008 Roy Rankin <rrankin at ihug.com.au> - 0.22.0-7
+Patch for gcc 4.3.0
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.22.0-6
+- Autorebuild for GCC 4.3
+
 * Thu Sep 27 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.22.0-5
   - Add BR popt-devel
 


--- gpsim-0.21.11.happy_gcc DELETED ---


--- gpsim-0.21.11.ktechlab.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Sep  9 05:26:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:26:04 +0000
Subject: [pkgdb] i2c-tools ownership updated
Message-ID: <20080909052604.AD8F1208770@bastion.fedora.phx.redhat.com>

Package i2c-tools in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/i2c-tools



From pkgdb at fedoraproject.org  Tue Sep  9 05:26:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:26:10 +0000
Subject: [pkgdb] i2c-tools ownership updated
Message-ID: <20080909052610.94187208D0F@bastion.fedora.phx.redhat.com>

Package i2c-tools in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/i2c-tools



From pkgdb at fedoraproject.org  Tue Sep  9 05:26:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:26:18 +0000
Subject: [pkgdb] freetype1 ownership updated
Message-ID: <20080909052618.99650208D1E@bastion.fedora.phx.redhat.com>

Package freetype1 in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetype1



From pkgdb at fedoraproject.org  Tue Sep  9 05:26:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:26:23 +0000
Subject: [pkgdb] freetype1 ownership updated
Message-ID: <20080909052623.63907208D98@bastion.fedora.phx.redhat.com>

Package freetype1 in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetype1



From pkgdb at fedoraproject.org  Tue Sep  9 05:26:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:26:30 +0000
Subject: [pkgdb] freetype1 ownership updated
Message-ID: <20080909052630.9F29F208D9A@bastion.fedora.phx.redhat.com>

Package freetype1 in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetype1



From pkgdb at fedoraproject.org  Tue Sep  9 05:26:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:26:28 +0000
Subject: [pkgdb] freetype1 ownership updated
Message-ID: <20080909052628.77EC3208D99@bastion.fedora.phx.redhat.com>

Package freetype1 in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetype1



From pkgdb at fedoraproject.org  Tue Sep  9 05:26:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:26:36 +0000
Subject: [pkgdb] freetype1 ownership updated
Message-ID: <20080909052636.12EAC208DA0@bastion.fedora.phx.redhat.com>

Package freetype1 in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetype1



From pkgdb at fedoraproject.org  Tue Sep  9 05:30:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:30:15 +0000
Subject: [pkgdb] libXNVCtrl ownership updated
Message-ID: <20080909053015.72EBC208D0F@bastion.fedora.phx.redhat.com>

Package libXNVCtrl in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXNVCtrl



From pkgdb at fedoraproject.org  Tue Sep  9 05:30:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:30:18 +0000
Subject: [pkgdb] libXNVCtrl ownership updated
Message-ID: <20080909053018.EDAF9208D7C@bastion.fedora.phx.redhat.com>

Package libXNVCtrl in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXNVCtrl



From pkgdb at fedoraproject.org  Tue Sep  9 05:30:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:30:21 +0000
Subject: [pkgdb] libXNVCtrl ownership updated
Message-ID: <20080909053021.D7F64208D9A@bastion.fedora.phx.redhat.com>

Package libXNVCtrl in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXNVCtrl



From pkgdb at fedoraproject.org  Tue Sep  9 05:30:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:30:21 +0000
Subject: [pkgdb] libXNVCtrl ownership updated
Message-ID: <20080909053021.66854208D98@bastion.fedora.phx.redhat.com>

Package libXNVCtrl in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXNVCtrl



From pkgdb at fedoraproject.org  Tue Sep  9 05:30:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:30:28 +0000
Subject: [pkgdb] libXNVCtrl ownership updated
Message-ID: <20080909053028.BED03208770@bastion.fedora.phx.redhat.com>

Package libXNVCtrl in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXNVCtrl



From pkgdb at fedoraproject.org  Tue Sep  9 05:30:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:30:42 +0000
Subject: [pkgdb] libid3tag: jwrdegoede has given up watchbugzilla
Message-ID: <20080909053042.49A6A208D1E@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on libid3tag (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libid3tag



From pkgdb at fedoraproject.org  Tue Sep  9 05:30:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:30:44 +0000
Subject: [pkgdb] libid3tag: jwrdegoede has given up watchcommits
Message-ID: <20080909053044.BAF3C208D9E@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on libid3tag (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libid3tag



From pkgdb at fedoraproject.org  Tue Sep  9 05:30:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:30:44 +0000
Subject: [pkgdb] libid3tag: jwrdegoede has given up commit
Message-ID: <20080909053044.CB5AF208DA1@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on libid3tag (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libid3tag



From pkgdb at fedoraproject.org  Tue Sep  9 05:30:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:30:46 +0000
Subject: [pkgdb] libid3tag: jwrdegoede has given up commit
Message-ID: <20080909053046.AFD3C208D99@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on libid3tag (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libid3tag



From pkgdb at fedoraproject.org  Tue Sep  9 05:30:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:30:48 +0000
Subject: [pkgdb] libid3tag: jwrdegoede has given up watchbugzilla
Message-ID: <20080909053048.24531208DA6@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on libid3tag (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libid3tag



From pkgdb at fedoraproject.org  Tue Sep  9 05:30:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:30:46 +0000
Subject: [pkgdb] libid3tag: jwrdegoede has given up watchcommits
Message-ID: <20080909053047.345CC208DA3@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on libid3tag (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libid3tag



From pkgdb at fedoraproject.org  Tue Sep  9 05:31:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:31:07 +0000
Subject: [pkgdb] libid3tag: jwrdegoede has given up watchbugzilla
Message-ID: <20080909053107.97B24208D9C@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on libid3tag (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libid3tag



From pkgdb at fedoraproject.org  Tue Sep  9 05:31:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:31:07 +0000
Subject: [pkgdb] libid3tag: jwrdegoede has given up watchcommits
Message-ID: <20080909053107.EF997208DA8@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on libid3tag (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libid3tag



From pkgdb at fedoraproject.org  Tue Sep  9 05:31:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:31:09 +0000
Subject: [pkgdb] libid3tag: jwrdegoede has given up commit
Message-ID: <20080909053109.440CB208DA0@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on libid3tag (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libid3tag



From pkgdb at fedoraproject.org  Tue Sep  9 05:31:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:31:10 +0000
Subject: [pkgdb] libid3tag: jwrdegoede has given up watchcommits
Message-ID: <20080909053110.21719208DAB@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on libid3tag (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libid3tag



From pkgdb at fedoraproject.org  Tue Sep  9 05:31:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:31:10 +0000
Subject: [pkgdb] libid3tag: jwrdegoede has given up commit
Message-ID: <20080909053110.2C030208DAD@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on libid3tag (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libid3tag



From pkgdb at fedoraproject.org  Tue Sep  9 05:31:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:31:13 +0000
Subject: [pkgdb] libid3tag: jwrdegoede has given up watchbugzilla
Message-ID: <20080909053113.7AEFB2D0023@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on libid3tag (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libid3tag



From pkgdb at fedoraproject.org  Tue Sep  9 05:33:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:33:14 +0000
Subject: [pkgdb] theora-exp ownership updated
Message-ID: <20080909053314.91682208770@bastion.fedora.phx.redhat.com>

Package theora-exp in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/theora-exp



From pkgdb at fedoraproject.org  Tue Sep  9 05:33:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:33:15 +0000
Subject: [pkgdb] theora-exp ownership updated
Message-ID: <20080909053315.C4CF6208D0F@bastion.fedora.phx.redhat.com>

Package theora-exp in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/theora-exp



From pkgdb at fedoraproject.org  Tue Sep  9 05:33:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:33:18 +0000
Subject: [pkgdb] theora-exp ownership updated
Message-ID: <20080909053318.4894B208D7C@bastion.fedora.phx.redhat.com>

Package theora-exp in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/theora-exp



From pkgdb at fedoraproject.org  Tue Sep  9 05:33:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:33:19 +0000
Subject: [pkgdb] theora-exp ownership updated
Message-ID: <20080909053319.D51D4208D98@bastion.fedora.phx.redhat.com>

Package theora-exp in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/theora-exp



From pkgdb at fedoraproject.org  Tue Sep  9 05:33:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:33:24 +0000
Subject: [pkgdb] theora-exp ownership updated
Message-ID: <20080909053324.73F9F208DA3@bastion.fedora.phx.redhat.com>

Package theora-exp in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/theora-exp



From pkgdb at fedoraproject.org  Tue Sep  9 05:37:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:37:35 +0000
Subject: [pkgdb] coda ownership updated
Message-ID: <20080909053735.37E9C208D0F@bastion.fedora.phx.redhat.com>

Package coda in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Tue Sep  9 05:37:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:37:37 +0000
Subject: [pkgdb] coda ownership updated
Message-ID: <20080909053737.46379208D98@bastion.fedora.phx.redhat.com>

Package coda in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Tue Sep  9 05:37:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:37:42 +0000
Subject: [pkgdb] coda ownership updated
Message-ID: <20080909053742.1FA24208D9C@bastion.fedora.phx.redhat.com>

Package coda in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From cebbert at fedoraproject.org  Tue Sep  9 05:38:35 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue,  9 Sep 2008 05:38:35 +0000 (UTC)
Subject: rpms/kernel/F-9
	linux-2.6-x86-hpet-01-fix-moronic-32-64-bit-thinko.patch, NONE,
	1.1 linux-2.6-x86-hpet-02-read-back-compare-register.patch, NONE,
	1.1
	linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch,
	NONE, 1.1 linux-2.6-x86-hpet-04-workaround-sb700-bios.patch,
	NONE, 1.1 kernel.spec, 1.758, 1.759
Message-ID: <20080909053835.52AAD7012A@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2954

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-hpet-01-fix-moronic-32-64-bit-thinko.patch 
	linux-2.6-x86-hpet-02-read-back-compare-register.patch 
	linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch 
	linux-2.6-x86-hpet-04-workaround-sb700-bios.patch 
Log Message:
HPET fixes from 2.6.27

linux-2.6-x86-hpet-01-fix-moronic-32-64-bit-thinko.patch:

--- NEW FILE linux-2.6-x86-hpet-01-fix-moronic-32-64-bit-thinko.patch ---
From: Thomas Gleixner <tglx at linutronix.de>
Date: Sat, 6 Sep 2008 01:03:32 +0000 (+0200)
Subject: x86: HPET fix moronic 32/64bit thinko
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=f7676254f179eac6b5244a80195ec8ae0e9d4606

x86: HPET fix moronic 32/64bit thinko

We use the HPET only in 32bit mode because:
1) some HPETs are 32bit only
2) on i386 there is no way to read/write the HPET atomic 64bit wide

The HPET code unification done by the "moron of the year" did
not take into account that unsigned long is different on 32 and
64 bit.

This thinko results in a possible endless loop in the clockevents
code, when the return comparison fails due to the 64bit/332bit
unawareness.

unsigned long cnt = (u32) hpet_read() + delta can wrap over 32bit.
but the final compare will fail and return -ETIME causing endless
loops.

Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
---

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 2256315..801497a 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -270,15 +270,15 @@ static void hpet_legacy_set_mode(enum clock_event_mode mode,
 }
 
 static int hpet_legacy_next_event(unsigned long delta,
-			   struct clock_event_device *evt)
+				  struct clock_event_device *evt)
 {
-	unsigned long cnt;
+	u32 cnt;
 
 	cnt = hpet_readl(HPET_COUNTER);
-	cnt += delta;
+	cnt += (u32) delta;
 	hpet_writel(cnt, HPET_T0_CMP);
 
-	return ((long)(hpet_readl(HPET_COUNTER) - cnt ) > 0) ? -ETIME : 0;
+	return (s32)((u32)hpet_readl(HPET_COUNTER) - cnt) >= 0 ? -ETIME : 0;
 }
 
 /*

linux-2.6-x86-hpet-02-read-back-compare-register.patch:

--- NEW FILE linux-2.6-x86-hpet-02-read-back-compare-register.patch ---
From: Thomas Gleixner <tglx at linutronix.de>
Date: Sat, 6 Sep 2008 01:06:08 +0000 (+0200)
Subject: x86: HPET: read back compare register before reading counter
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=72d43d9bc9210d24d09202eaf219eac09e17b339

x86: HPET: read back compare register before reading counter

After fixing the u32 thinko I sill had occasional hickups on ATI chipsets
with small deltas. There seems to be a delay between writing the compare
register and the transffer to the internal register which triggers the
interrupt. Reading back the value makes sure, that it hit the internal
match register befor we compare against the counter value.

Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
---

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 801497a..73deaff 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -278,6 +278,13 @@ static int hpet_legacy_next_event(unsigned long delta,
 	cnt += (u32) delta;
 	hpet_writel(cnt, HPET_T0_CMP);
 
+	/*
+	 * We need to read back the CMP register to make sure that
+	 * what we wrote hit the chip before we compare it to the
+	 * counter.
+	 */
+	WARN_ON((u32)hpet_readl(HPET_T0_CMP) != cnt);
+
 	return (s32)((u32)hpet_readl(HPET_COUNTER) - cnt) >= 0 ? -ETIME : 0;
 }
 

linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch:

--- NEW FILE linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch ---
From: Thomas Gleixner <tglx at linutronix.de>
Date: Wed, 3 Sep 2008 21:37:24 +0000 (+0000)
Subject: HPET: make minimum reprogramming delta useful
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=7cfb0435330364f90f274a26ecdc5f47f738498c

HPET: make minimum reprogramming delta useful

The minimum reprogramming delta was hardcoded in HPET ticks,
which is stupid as it does not work with faster running HPETs.
The C1E idle patches made this prominent on AMD/RS690 chipsets,
where the HPET runs with 25MHz. Set it to 5us which seems to be
a reasonable value and fixes the problems on the bug reporters
machines. We have a further sanity check now in the clock events,
which increases the delta when it is not sufficient.

Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Tested-by: Luiz Fernando N. Capitulino <lcapitulino at mandriva.com.br>
Tested-by: Dmitry Nezhevenko <dion at inhex.net>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 59fd3b6..2256315 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -210,8 +210,8 @@ static void hpet_legacy_clockevent_register(void)
 	/* Calculate the min / max delta */
 	hpet_clockevent.max_delta_ns = clockevent_delta2ns(0x7FFFFFFF,
 							   &hpet_clockevent);
-	hpet_clockevent.min_delta_ns = clockevent_delta2ns(0x30,
-							   &hpet_clockevent);
+	/* 5 usec minimum reprogramming delta. */
+	hpet_clockevent.min_delta_ns = 5000;
 
 	/*
 	 * Start hpet with the boot cpu mask and make it

linux-2.6-x86-hpet-04-workaround-sb700-bios.patch:

--- NEW FILE linux-2.6-x86-hpet-04-workaround-sb700-bios.patch ---
From: Thomas Gleixner <tglx at linutronix.de>
Date: Thu, 14 Aug 2008 10:17:06 +0000 (+0200)
Subject: x86: hpet: workaround SB700 BIOS
X-Git-Tag: v2.6.27-rc4~52^2~17
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=a6825f1c1fa83b1e92b6715ee5771a4d6524d3b9

x86: hpet: workaround SB700 BIOS

AMD SB700 based systems with spread spectrum enabled use a SMM based
HPET emulation to provide proper frequency setting. The SMM code is
initialized with the first HPET register access and takes some time to
complete. During this time the config register reads 0xffffffff. We
check for max. 1000 loops whether the config register reads a non
0xffffffff value to make sure that HPET is up and running before we go
further. A counting loop is safe, as the HPET access takes thousands
of CPU cycles. On non SB700 based machines this check is only done
once and has no side effects.

Based on a quirk patch from: crane cai <crane.cai at amd.com>

Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
---

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index ad2b15a..59fd3b6 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -359,6 +359,7 @@ static int hpet_clocksource_register(void)
 int __init hpet_enable(void)
 {
 	unsigned long id;
+	int i;
 
 	if (!is_hpet_capable())
 		return 0;
@@ -369,6 +370,29 @@ int __init hpet_enable(void)
 	 * Read the period and check for a sane value:
 	 */
 	hpet_period = hpet_readl(HPET_PERIOD);
+
+	/*
+	 * AMD SB700 based systems with spread spectrum enabled use a
+	 * SMM based HPET emulation to provide proper frequency
+	 * setting. The SMM code is initialized with the first HPET
+	 * register access and takes some time to complete. During
+	 * this time the config register reads 0xffffffff. We check
+	 * for max. 1000 loops whether the config register reads a non
+	 * 0xffffffff value to make sure that HPET is up and running
+	 * before we go further. A counting loop is safe, as the HPET
+	 * access takes thousands of CPU cycles. On non SB700 based
+	 * machines this check is only done once and has no side
+	 * effects.
+	 */
+	for (i = 0; hpet_readl(HPET_CFG) == 0xFFFFFFFF; i++) {
+		if (i == 1000) {
+			printk(KERN_WARNING
+			       "HPET config register value = 0xFFFFFFFF. "
+			       "Disabling HPET\n");
+			goto out_nohpet;
+		}
+	}
+
 	if (hpet_period < HPET_MIN_PERIOD || hpet_period > HPET_MAX_PERIOD)
 		goto out_nohpet;
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.758
retrieving revision 1.759
diff -u -r1.758 -r1.759
--- kernel.spec	8 Sep 2008 18:52:11 -0000	1.758
+++ kernel.spec	9 Sep 2008 05:38:34 -0000	1.759
@@ -585,6 +585,11 @@
 Patch91: linux-2.6-x86-fix-oprofile-and-hibernation-issues.patch
 Patch92: linux-2.6-x86-32-amd-c1e-force-timer-broadcast-late.patch
 Patch93: linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch
+Patch94: linux-2.6-x86-hpet-01-fix-moronic-32-64-bit-thinko.patch
+Patch95: linux-2.6-x86-hpet-02-read-back-compare-register.patch
+Patch96: linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch
+Patch97: linux-2.6-x86-hpet-04-workaround-sb700-bios.patch
+
 
 # ppc
 Patch140: linux-2.6-ps3-ehci-iso.patch
@@ -1038,6 +1043,11 @@
 ApplyPatch linux-2.6-x86-32-amd-c1e-force-timer-broadcast-late.patch
 #
 ApplyPatch linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch
+# hpet fixes from 2.6.27
+ApplyPatch linux-2.6-x86-hpet-01-fix-moronic-32-64-bit-thinko.patch
+ApplyPatch linux-2.6-x86-hpet-02-read-back-compare-register.patch
+ApplyPatch linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch
+ApplyPatch linux-2.6-x86-hpet-04-workaround-sb700-bios.patch
 
 #
 # PowerPC
@@ -1822,6 +1832,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Mon Sep 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-32
+- HPET fixes from 2.6.27
+
 * Mon Sep 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-31
 - Linux 2.6.26.5
 



From pkgdb at fedoraproject.org  Tue Sep  9 05:41:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:41:16 +0000
Subject: [pkgdb] Io-language had acl change status
Message-ID: <20080909054116.8B117208771@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on Io-language (Fedora devel) to Approved for salimma

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Tue Sep  9 05:41:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:41:18 +0000
Subject: [pkgdb] Io-language had acl change status
Message-ID: <20080909054118.14BC3208D7C@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on Io-language (Fedora devel) to Approved for salimma

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Tue Sep  9 05:41:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:41:23 +0000
Subject: [pkgdb] Io-language had acl change status
Message-ID: <20080909054123.94FC4208D99@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on Io-language (Fedora devel) to Approved for salimma

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Tue Sep  9 05:41:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:41:23 +0000
Subject: [pkgdb] Io-language had acl change status
Message-ID: <20080909054123.A4659208D9C@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on Io-language (Fedora devel) to Approved for salimma

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Tue Sep  9 05:41:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:41:28 +0000
Subject: [pkgdb] Io-language ownership updated
Message-ID: <20080909054128.3B7AE208DA0@bastion.fedora.phx.redhat.com>

Package Io-language in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Tue Sep  9 05:41:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:41:26 +0000
Subject: [pkgdb] Io-language ownership updated
Message-ID: <20080909054126.AFC7C208D9F@bastion.fedora.phx.redhat.com>

Package Io-language in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Tue Sep  9 05:41:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:41:33 +0000
Subject: [pkgdb] Io-language ownership updated
Message-ID: <20080909054133.15895208DA1@bastion.fedora.phx.redhat.com>

Package Io-language in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Tue Sep  9 05:41:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:41:34 +0000
Subject: [pkgdb] Io-language ownership updated
Message-ID: <20080909054134.992D9208DA4@bastion.fedora.phx.redhat.com>

Package Io-language in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From cebbert at fedoraproject.org  Tue Sep  9 05:42:31 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue,  9 Sep 2008 05:42:31 +0000 (UTC)
Subject: rpms/kernel/F-8
	linux-2.6-x86-hpet-01-fix-moronic-32-64-bit-thinko.patch, NONE,
	1.1 linux-2.6-x86-hpet-02-read-back-compare-register.patch, NONE,
	1.1
	linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch,
	NONE, 1.1 linux-2.6-x86-hpet-04-workaround-sb700-bios.patch,
	NONE, 1.1 kernel.spec, 1.526, 1.527
Message-ID: <20080909054231.EA0797012A@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3186

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-hpet-01-fix-moronic-32-64-bit-thinko.patch 
	linux-2.6-x86-hpet-02-read-back-compare-register.patch 
	linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch 
	linux-2.6-x86-hpet-04-workaround-sb700-bios.patch 
Log Message:
HPET fixes from 2.6.27

linux-2.6-x86-hpet-01-fix-moronic-32-64-bit-thinko.patch:

--- NEW FILE linux-2.6-x86-hpet-01-fix-moronic-32-64-bit-thinko.patch ---
From: Thomas Gleixner <tglx at linutronix.de>
Date: Sat, 6 Sep 2008 01:03:32 +0000 (+0200)
Subject: x86: HPET fix moronic 32/64bit thinko
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=f7676254f179eac6b5244a80195ec8ae0e9d4606

x86: HPET fix moronic 32/64bit thinko

We use the HPET only in 32bit mode because:
1) some HPETs are 32bit only
2) on i386 there is no way to read/write the HPET atomic 64bit wide

The HPET code unification done by the "moron of the year" did
not take into account that unsigned long is different on 32 and
64 bit.

This thinko results in a possible endless loop in the clockevents
code, when the return comparison fails due to the 64bit/332bit
unawareness.

unsigned long cnt = (u32) hpet_read() + delta can wrap over 32bit.
but the final compare will fail and return -ETIME causing endless
loops.

Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
---

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 2256315..801497a 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -270,15 +270,15 @@ static void hpet_legacy_set_mode(enum clock_event_mode mode,
 }
 
 static int hpet_legacy_next_event(unsigned long delta,
-			   struct clock_event_device *evt)
+				  struct clock_event_device *evt)
 {
-	unsigned long cnt;
+	u32 cnt;
 
 	cnt = hpet_readl(HPET_COUNTER);
-	cnt += delta;
+	cnt += (u32) delta;
 	hpet_writel(cnt, HPET_T0_CMP);
 
-	return ((long)(hpet_readl(HPET_COUNTER) - cnt ) > 0) ? -ETIME : 0;
+	return (s32)((u32)hpet_readl(HPET_COUNTER) - cnt) >= 0 ? -ETIME : 0;
 }
 
 /*

linux-2.6-x86-hpet-02-read-back-compare-register.patch:

--- NEW FILE linux-2.6-x86-hpet-02-read-back-compare-register.patch ---
From: Thomas Gleixner <tglx at linutronix.de>
Date: Sat, 6 Sep 2008 01:06:08 +0000 (+0200)
Subject: x86: HPET: read back compare register before reading counter
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=72d43d9bc9210d24d09202eaf219eac09e17b339

x86: HPET: read back compare register before reading counter

After fixing the u32 thinko I sill had occasional hickups on ATI chipsets
with small deltas. There seems to be a delay between writing the compare
register and the transffer to the internal register which triggers the
interrupt. Reading back the value makes sure, that it hit the internal
match register befor we compare against the counter value.

Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
---

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 801497a..73deaff 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -278,6 +278,13 @@ static int hpet_legacy_next_event(unsigned long delta,
 	cnt += (u32) delta;
 	hpet_writel(cnt, HPET_T0_CMP);
 
+	/*
+	 * We need to read back the CMP register to make sure that
+	 * what we wrote hit the chip before we compare it to the
+	 * counter.
+	 */
+	WARN_ON((u32)hpet_readl(HPET_T0_CMP) != cnt);
+
 	return (s32)((u32)hpet_readl(HPET_COUNTER) - cnt) >= 0 ? -ETIME : 0;
 }
 

linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch:

--- NEW FILE linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch ---
From: Thomas Gleixner <tglx at linutronix.de>
Date: Wed, 3 Sep 2008 21:37:24 +0000 (+0000)
Subject: HPET: make minimum reprogramming delta useful
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=7cfb0435330364f90f274a26ecdc5f47f738498c

HPET: make minimum reprogramming delta useful

The minimum reprogramming delta was hardcoded in HPET ticks,
which is stupid as it does not work with faster running HPETs.
The C1E idle patches made this prominent on AMD/RS690 chipsets,
where the HPET runs with 25MHz. Set it to 5us which seems to be
a reasonable value and fixes the problems on the bug reporters
machines. We have a further sanity check now in the clock events,
which increases the delta when it is not sufficient.

Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Tested-by: Luiz Fernando N. Capitulino <lcapitulino at mandriva.com.br>
Tested-by: Dmitry Nezhevenko <dion at inhex.net>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 59fd3b6..2256315 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -210,8 +210,8 @@ static void hpet_legacy_clockevent_register(void)
 	/* Calculate the min / max delta */
 	hpet_clockevent.max_delta_ns = clockevent_delta2ns(0x7FFFFFFF,
 							   &hpet_clockevent);
-	hpet_clockevent.min_delta_ns = clockevent_delta2ns(0x30,
-							   &hpet_clockevent);
+	/* 5 usec minimum reprogramming delta. */
+	hpet_clockevent.min_delta_ns = 5000;
 
 	/*
 	 * Start hpet with the boot cpu mask and make it

linux-2.6-x86-hpet-04-workaround-sb700-bios.patch:

--- NEW FILE linux-2.6-x86-hpet-04-workaround-sb700-bios.patch ---
From: Thomas Gleixner <tglx at linutronix.de>
Date: Thu, 14 Aug 2008 10:17:06 +0000 (+0200)
Subject: x86: hpet: workaround SB700 BIOS
X-Git-Tag: v2.6.27-rc4~52^2~17
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=a6825f1c1fa83b1e92b6715ee5771a4d6524d3b9

x86: hpet: workaround SB700 BIOS

AMD SB700 based systems with spread spectrum enabled use a SMM based
HPET emulation to provide proper frequency setting. The SMM code is
initialized with the first HPET register access and takes some time to
complete. During this time the config register reads 0xffffffff. We
check for max. 1000 loops whether the config register reads a non
0xffffffff value to make sure that HPET is up and running before we go
further. A counting loop is safe, as the HPET access takes thousands
of CPU cycles. On non SB700 based machines this check is only done
once and has no side effects.

Based on a quirk patch from: crane cai <crane.cai at amd.com>

Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
---

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index ad2b15a..59fd3b6 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -359,6 +359,7 @@ static int hpet_clocksource_register(void)
 int __init hpet_enable(void)
 {
 	unsigned long id;
+	int i;
 
 	if (!is_hpet_capable())
 		return 0;
@@ -369,6 +370,29 @@ int __init hpet_enable(void)
 	 * Read the period and check for a sane value:
 	 */
 	hpet_period = hpet_readl(HPET_PERIOD);
+
+	/*
+	 * AMD SB700 based systems with spread spectrum enabled use a
+	 * SMM based HPET emulation to provide proper frequency
+	 * setting. The SMM code is initialized with the first HPET
+	 * register access and takes some time to complete. During
+	 * this time the config register reads 0xffffffff. We check
+	 * for max. 1000 loops whether the config register reads a non
+	 * 0xffffffff value to make sure that HPET is up and running
+	 * before we go further. A counting loop is safe, as the HPET
+	 * access takes thousands of CPU cycles. On non SB700 based
+	 * machines this check is only done once and has no side
+	 * effects.
+	 */
+	for (i = 0; hpet_readl(HPET_CFG) == 0xFFFFFFFF; i++) {
+		if (i == 1000) {
+			printk(KERN_WARNING
+			       "HPET config register value = 0xFFFFFFFF. "
+			       "Disabling HPET\n");
+			goto out_nohpet;
+		}
+	}
+
 	if (hpet_period < HPET_MIN_PERIOD || hpet_period > HPET_MAX_PERIOD)
 		goto out_nohpet;
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.526
retrieving revision 1.527
diff -u -r1.526 -r1.527
--- kernel.spec	8 Sep 2008 18:52:53 -0000	1.526
+++ kernel.spec	9 Sep 2008 05:42:01 -0000	1.527
@@ -583,6 +583,10 @@
 Patch91: linux-2.6-x86-fix-oprofile-and-hibernation-issues.patch
 Patch92: linux-2.6-x86-32-amd-c1e-force-timer-broadcast-late.patch
 Patch93: linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch
+Patch94: linux-2.6-x86-hpet-01-fix-moronic-32-64-bit-thinko.patch
+Patch95: linux-2.6-x86-hpet-02-read-back-compare-register.patch
+Patch96: linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch
+Patch97: linux-2.6-x86-hpet-04-workaround-sb700-bios.patch
 
 #ALSA
 
@@ -1018,6 +1022,11 @@
 ApplyPatch linux-2.6-x86-32-amd-c1e-force-timer-broadcast-late.patch
 #
 ApplyPatch linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch
+# hpet fixes from 2.6.27
+ApplyPatch linux-2.6-x86-hpet-01-fix-moronic-32-64-bit-thinko.patch
+ApplyPatch linux-2.6-x86-hpet-02-read-back-compare-register.patch
+ApplyPatch linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch
+ApplyPatch linux-2.6-x86-hpet-04-workaround-sb700-bios.patch
 
 #
 # PowerPC
@@ -1814,6 +1823,9 @@
 
 
 %changelog
+* Mon Sep 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-17
+- HPET fixes from 2.6.27
+
 * Mon Sep 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-16
 - Linux 2.6.26.5
 



From pkgdb at fedoraproject.org  Tue Sep  9 05:43:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:43:24 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909054324.4C2B020876F@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on puppet (Fedora devel) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 05:43:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:43:26 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909054326.7F34D208D1E@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on puppet (Fedora devel) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 05:43:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:43:27 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909054327.57427208D98@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on puppet (Fedora devel) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 05:43:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:43:30 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909054330.A827A208D9B@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on puppet (Fedora EPEL 5) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 05:43:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:43:37 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909054337.118F5208DA9@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on puppet (Fedora 8) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 05:43:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:43:36 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909054336.5C517208DA6@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on puppet (Fedora 8) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 05:43:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:43:32 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909054333.14D08208DA0@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on puppet (Fedora EPEL 5) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 05:43:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:43:34 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909054334.CAA85208DA4@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on puppet (Fedora 8) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 05:43:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:43:31 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909054331.8F696208D9E@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on puppet (Fedora EPEL 5) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 05:43:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:43:42 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909054342.EA58B208771@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on puppet (Fedora 9) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 05:43:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:43:39 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909054339.CE59B208DAC@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on puppet (Fedora 9) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 05:43:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:43:44 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909054344.CC4D4208D97@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on puppet (Fedora 9) to Approved for tmz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 05:43:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:43:53 +0000
Subject: [pkgdb] pinball ownership updated
Message-ID: <20080909054354.55B51208D98@bastion.fedora.phx.redhat.com>

Package pinball in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pinball



From pkgdb at fedoraproject.org  Tue Sep  9 05:43:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:43:55 +0000
Subject: [pkgdb] pinball ownership updated
Message-ID: <20080909054356.29E7C208D9B@bastion.fedora.phx.redhat.com>

Package pinball in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pinball



From pkgdb at fedoraproject.org  Tue Sep  9 05:43:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:43:59 +0000
Subject: [pkgdb] pinball ownership updated
Message-ID: <20080909054359.83746208DB5@bastion.fedora.phx.redhat.com>

Package pinball in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pinball



From pkgdb at fedoraproject.org  Tue Sep  9 05:43:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:43:56 +0000
Subject: [pkgdb] pinball ownership updated
Message-ID: <20080909054356.3C4D8208DB3@bastion.fedora.phx.redhat.com>

Package pinball in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pinball



From pkgdb at fedoraproject.org  Tue Sep  9 05:44:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:44:05 +0000
Subject: [pkgdb] pinball ownership updated
Message-ID: <20080909054405.7FEA3208D9F@bastion.fedora.phx.redhat.com>

Package pinball in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pinball



From pkgdb at fedoraproject.org  Tue Sep  9 05:44:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:44:05 +0000
Subject: [pkgdb] pinball ownership updated
Message-ID: <20080909054405.AA76A208DB7@bastion.fedora.phx.redhat.com>

Package pinball in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pinball



From pkgdb at fedoraproject.org  Tue Sep  9 05:44:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:44:38 +0000
Subject: [pkgdb] liquidwar ownership updated
Message-ID: <20080909054438.1E7F5208DA2@bastion.fedora.phx.redhat.com>

Package liquidwar in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/liquidwar



From pkgdb at fedoraproject.org  Tue Sep  9 05:44:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:44:38 +0000
Subject: [pkgdb] liquidwar ownership updated
Message-ID: <20080909054438.A24A9208771@bastion.fedora.phx.redhat.com>

Package liquidwar in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/liquidwar



From pkgdb at fedoraproject.org  Tue Sep  9 05:44:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:44:39 +0000
Subject: [pkgdb] liquidwar ownership updated
Message-ID: <20080909054440.439F1208DA4@bastion.fedora.phx.redhat.com>

Package liquidwar in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/liquidwar



From pkgdb at fedoraproject.org  Tue Sep  9 05:44:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:44:43 +0000
Subject: [pkgdb] liquidwar ownership updated
Message-ID: <20080909054443.2A4D3208DA7@bastion.fedora.phx.redhat.com>

Package liquidwar in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/liquidwar



From pkgdb at fedoraproject.org  Tue Sep  9 05:44:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:44:44 +0000
Subject: [pkgdb] liquidwar ownership updated
Message-ID: <20080909054444.10A85208DA8@bastion.fedora.phx.redhat.com>

Package liquidwar in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/liquidwar



From pkgdb at fedoraproject.org  Tue Sep  9 05:44:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:44:49 +0000
Subject: [pkgdb] liquidwar ownership updated
Message-ID: <20080909054449.445BD208DA9@bastion.fedora.phx.redhat.com>

Package liquidwar in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/liquidwar



From pkgdb at fedoraproject.org  Tue Sep  9 05:45:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:45:19 +0000
Subject: [pkgdb] pipenightdreams ownership updated
Message-ID: <20080909054519.70337208D9B@bastion.fedora.phx.redhat.com>

Package pipenightdreams in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pipenightdreams



From pkgdb at fedoraproject.org  Tue Sep  9 05:45:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:45:19 +0000
Subject: [pkgdb] pipenightdreams ownership updated
Message-ID: <20080909054519.A1145208D9C@bastion.fedora.phx.redhat.com>

Package pipenightdreams in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pipenightdreams



From pkgdb at fedoraproject.org  Tue Sep  9 05:45:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:45:21 +0000
Subject: [pkgdb] pipenightdreams ownership updated
Message-ID: <20080909054521.A261C208DB1@bastion.fedora.phx.redhat.com>

Package pipenightdreams in Fedora 4 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pipenightdreams



From pkgdb at fedoraproject.org  Tue Sep  9 05:45:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:45:21 +0000
Subject: [pkgdb] pipenightdreams ownership updated
Message-ID: <20080909054521.B43F3208DAE@bastion.fedora.phx.redhat.com>

Package pipenightdreams in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pipenightdreams



From pkgdb at fedoraproject.org  Tue Sep  9 05:45:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:45:25 +0000
Subject: [pkgdb] pipenightdreams ownership updated
Message-ID: <20080909054525.7D9BC208D9E@bastion.fedora.phx.redhat.com>

Package pipenightdreams in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pipenightdreams



From pkgdb at fedoraproject.org  Tue Sep  9 05:45:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:45:31 +0000
Subject: [pkgdb] pipenightdreams ownership updated
Message-ID: <20080909054531.3DF4B208DB0@bastion.fedora.phx.redhat.com>

Package pipenightdreams in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pipenightdreams



From pkgdb at fedoraproject.org  Tue Sep  9 05:45:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:45:32 +0000
Subject: [pkgdb] pipenightdreams ownership updated
Message-ID: <20080909054532.50868208DB4@bastion.fedora.phx.redhat.com>

Package pipenightdreams in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pipenightdreams



From pkgdb at fedoraproject.org  Tue Sep  9 05:47:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:47:31 +0000
Subject: [pkgdb] xgalaxy ownership updated
Message-ID: <20080909054731.A744F208770@bastion.fedora.phx.redhat.com>

Package xgalaxy in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xgalaxy



From pkgdb at fedoraproject.org  Tue Sep  9 05:47:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:47:33 +0000
Subject: [pkgdb] xgalaxy ownership updated
Message-ID: <20080909054733.28F68208D1E@bastion.fedora.phx.redhat.com>

Package xgalaxy in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xgalaxy



From pkgdb at fedoraproject.org  Tue Sep  9 05:47:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:47:37 +0000
Subject: [pkgdb] xgalaxy ownership updated
Message-ID: <20080909054737.398A2208D99@bastion.fedora.phx.redhat.com>

Package xgalaxy in Fedora 4 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xgalaxy



From pkgdb at fedoraproject.org  Tue Sep  9 05:47:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:47:38 +0000
Subject: [pkgdb] xgalaxy ownership updated
Message-ID: <20080909054738.95171208D9A@bastion.fedora.phx.redhat.com>

Package xgalaxy in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xgalaxy



From pkgdb at fedoraproject.org  Tue Sep  9 05:47:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:47:48 +0000
Subject: [pkgdb] xgalaxy ownership updated
Message-ID: <20080909054748.9C405208771@bastion.fedora.phx.redhat.com>

Package xgalaxy in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xgalaxy



From pkgdb at fedoraproject.org  Tue Sep  9 05:47:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:47:43 +0000
Subject: [pkgdb] xgalaxy ownership updated
Message-ID: <20080909054743.C379B208D9B@bastion.fedora.phx.redhat.com>

Package xgalaxy in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xgalaxy



From pkgdb at fedoraproject.org  Tue Sep  9 05:47:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:47:49 +0000
Subject: [pkgdb] xgalaxy ownership updated
Message-ID: <20080909054749.27CCA208D97@bastion.fedora.phx.redhat.com>

Package xgalaxy in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xgalaxy



From cweyl at fedoraproject.org  Tue Sep  9 05:48:23 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  9 Sep 2008 05:48:23 +0000 (UTC)
Subject: rpms/perl-Config-IniHash/devel .cvsignore, 1.2,
	1.3 perl-Config-IniHash.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20080909054823.57DC17012A@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Config-IniHash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3715

Modified Files:
	.cvsignore perl-Config-IniHash.spec sources 
Log Message:
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 3.00.00-1
- update to 3.00.00



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-IniHash/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Apr 2007 04:49:41 -0000	1.2
+++ .cvsignore	9 Sep 2008 05:47:53 -0000	1.3
@@ -1 +1 @@
-Config-IniHash-2.9.0.tar.gz
+Config-IniHash-3.00.00.tar.gz


Index: perl-Config-IniHash.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-IniHash/devel/perl-Config-IniHash.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Config-IniHash.spec	5 Mar 2008 16:50:52 -0000	1.3
+++ perl-Config-IniHash.spec	9 Sep 2008 05:47:53 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Config-IniHash
-Version:        2.9.0
-Release:        3%{?dist}
+Version:        3.00.00 
+Release:        1%{?dist}
 Summary:        Perl extension for reading and writing INI files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 3.00.00-1
+- update to 3.00.00
+
 * Wed Mar  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.9.0-3
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-IniHash/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Apr 2007 04:49:41 -0000	1.2
+++ sources	9 Sep 2008 05:47:53 -0000	1.3
@@ -1 +1 @@
-012e9bc3e320dcb031886a3ffcc19c09  Config-IniHash-2.9.0.tar.gz
+c53cbd0db1421c810400e1e8e095e0fc  Config-IniHash-3.00.00.tar.gz



From pkgdb at fedoraproject.org  Tue Sep  9 05:49:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:49:01 +0000
Subject: [pkgdb] scummvm ownership updated
Message-ID: <20080909054901.85D97208D1E@bastion.fedora.phx.redhat.com>

Package scummvm in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scummvm



From pkgdb at fedoraproject.org  Tue Sep  9 05:49:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:49:13 +0000
Subject: [pkgdb] scummvm ownership updated
Message-ID: <20080909054913.666CC208D99@bastion.fedora.phx.redhat.com>

Package scummvm in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scummvm



From pkgdb at fedoraproject.org  Tue Sep  9 05:49:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:49:08 +0000
Subject: [pkgdb] scummvm ownership updated
Message-ID: <20080909054908.2CDA7208D97@bastion.fedora.phx.redhat.com>

Package scummvm in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scummvm



From pkgdb at fedoraproject.org  Tue Sep  9 05:49:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:49:17 +0000
Subject: [pkgdb] scummvm ownership updated
Message-ID: <20080909054917.8BF90208D1E@bastion.fedora.phx.redhat.com>

Package scummvm in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scummvm



From pkgdb at fedoraproject.org  Tue Sep  9 05:49:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:49:19 +0000
Subject: [pkgdb] scummvm ownership updated
Message-ID: <20080909054919.F07A3208D7C@bastion.fedora.phx.redhat.com>

Package scummvm in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scummvm



From pkgdb at fedoraproject.org  Tue Sep  9 05:49:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:49:23 +0000
Subject: [pkgdb] scummvm ownership updated
Message-ID: <20080909054923.91C1E208DA0@bastion.fedora.phx.redhat.com>

Package scummvm in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scummvm



From pkgdb at fedoraproject.org  Tue Sep  9 05:51:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:51:58 +0000
Subject: [pkgdb] beneath-a-steel-sky ownership updated
Message-ID: <20080909055158.452FC20876F@bastion.fedora.phx.redhat.com>

Package beneath-a-steel-sky in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beneath-a-steel-sky



From pkgdb at fedoraproject.org  Tue Sep  9 05:51:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:51:58 +0000
Subject: [pkgdb] beneath-a-steel-sky ownership updated
Message-ID: <20080909055158.5EF39208771@bastion.fedora.phx.redhat.com>

Package beneath-a-steel-sky in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beneath-a-steel-sky



From pkgdb at fedoraproject.org  Tue Sep  9 05:52:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:52:03 +0000
Subject: [pkgdb] beneath-a-steel-sky ownership updated
Message-ID: <20080909055203.54905208D7C@bastion.fedora.phx.redhat.com>

Package beneath-a-steel-sky in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beneath-a-steel-sky



From pkgdb at fedoraproject.org  Tue Sep  9 05:52:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:52:05 +0000
Subject: [pkgdb] beneath-a-steel-sky ownership updated
Message-ID: <20080909055205.96FD9208D98@bastion.fedora.phx.redhat.com>

Package beneath-a-steel-sky in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beneath-a-steel-sky



From pkgdb at fedoraproject.org  Tue Sep  9 05:52:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:52:19 +0000
Subject: [pkgdb] lure ownership updated
Message-ID: <20080909055219.EC4A620876F@bastion.fedora.phx.redhat.com>

Package lure in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lure



From pkgdb at fedoraproject.org  Tue Sep  9 05:52:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:52:23 +0000
Subject: [pkgdb] lure ownership updated
Message-ID: <20080909055223.4D42A208771@bastion.fedora.phx.redhat.com>

Package lure in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lure



From pkgdb at fedoraproject.org  Tue Sep  9 05:52:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:52:25 +0000
Subject: [pkgdb] lure ownership updated
Message-ID: <20080909055225.DA17F208D7C@bastion.fedora.phx.redhat.com>

Package lure in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lure



From pkgdb at fedoraproject.org  Tue Sep  9 05:52:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:52:29 +0000
Subject: [pkgdb] flight-of-the-amazon-queen ownership updated
Message-ID: <20080909055229.B9D1F208D9B@bastion.fedora.phx.redhat.com>

Package flight-of-the-amazon-queen in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/flight-of-the-amazon-queen



From pkgdb at fedoraproject.org  Tue Sep  9 05:52:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:52:30 +0000
Subject: [pkgdb] flight-of-the-amazon-queen ownership updated
Message-ID: <20080909055230.1D6E4208D9E@bastion.fedora.phx.redhat.com>

Package flight-of-the-amazon-queen in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/flight-of-the-amazon-queen



From pkgdb at fedoraproject.org  Tue Sep  9 05:52:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:52:36 +0000
Subject: [pkgdb] flight-of-the-amazon-queen ownership updated
Message-ID: <20080909055236.5FCC0208770@bastion.fedora.phx.redhat.com>

Package flight-of-the-amazon-queen in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/flight-of-the-amazon-queen



From pkgdb at fedoraproject.org  Tue Sep  9 05:52:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:52:37 +0000
Subject: [pkgdb] flight-of-the-amazon-queen ownership updated
Message-ID: <20080909055237.81BCB208771@bastion.fedora.phx.redhat.com>

Package flight-of-the-amazon-queen in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/flight-of-the-amazon-queen



From pkgdb at fedoraproject.org  Tue Sep  9 05:53:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:53:22 +0000
Subject: [pkgdb] scummvm ownership updated
Message-ID: <20080909055322.6C561208D1E@bastion.fedora.phx.redhat.com>

Package scummvm in Fedora devel is now owned by lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scummvm



From pkgdb at fedoraproject.org  Tue Sep  9 05:53:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:53:27 +0000
Subject: [pkgdb] scummvm ownership updated
Message-ID: <20080909055327.6EBCD20876F@bastion.fedora.phx.redhat.com>

Package scummvm in Fedora 8 is now owned by lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scummvm



From pkgdb at fedoraproject.org  Tue Sep  9 05:53:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:53:30 +0000
Subject: [pkgdb] scummvm ownership updated
Message-ID: <20080909055330.0E62D208D9F@bastion.fedora.phx.redhat.com>

Package scummvm in Fedora 9 is now owned by lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scummvm



From pkgdb at fedoraproject.org  Tue Sep  9 05:54:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:54:36 +0000
Subject: [pkgdb] beneath-a-steel-sky ownership updated
Message-ID: <20080909055436.569FA208770@bastion.fedora.phx.redhat.com>

Package beneath-a-steel-sky in Fedora devel is now owned by lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beneath-a-steel-sky



From pkgdb at fedoraproject.org  Tue Sep  9 05:54:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:54:43 +0000
Subject: [pkgdb] beneath-a-steel-sky ownership updated
Message-ID: <20080909055443.26E63208D97@bastion.fedora.phx.redhat.com>

Package beneath-a-steel-sky in Fedora 9 is now owned by lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beneath-a-steel-sky



From pkgdb at fedoraproject.org  Tue Sep  9 05:54:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:54:39 +0000
Subject: [pkgdb] beneath-a-steel-sky ownership updated
Message-ID: <20080909055439.A2C5A208D1E@bastion.fedora.phx.redhat.com>

Package beneath-a-steel-sky in Fedora 8 is now owned by lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beneath-a-steel-sky



From pkgdb at fedoraproject.org  Tue Sep  9 05:55:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:55:19 +0000
Subject: [pkgdb] lure ownership updated
Message-ID: <20080909055519.6B29A208D1E@bastion.fedora.phx.redhat.com>

Package lure in Fedora devel is now owned by lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lure



From pkgdb at fedoraproject.org  Tue Sep  9 05:55:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:55:25 +0000
Subject: [pkgdb] lure ownership updated
Message-ID: <20080909055526.6A6C2208D97@bastion.fedora.phx.redhat.com>

Package lure in Fedora 8 is now owned by lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lure



From pkgdb at fedoraproject.org  Tue Sep  9 05:55:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:55:28 +0000
Subject: [pkgdb] lure ownership updated
Message-ID: <20080909055528.97808208D98@bastion.fedora.phx.redhat.com>

Package lure in Fedora 9 is now owned by lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lure



From pkgdb at fedoraproject.org  Tue Sep  9 05:55:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:55:59 +0000
Subject: [pkgdb] flight-of-the-amazon-queen ownership updated
Message-ID: <20080909055559.777B1208770@bastion.fedora.phx.redhat.com>

Package flight-of-the-amazon-queen in Fedora devel is now owned by lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/flight-of-the-amazon-queen



From pkgdb at fedoraproject.org  Tue Sep  9 05:56:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:56:03 +0000
Subject: [pkgdb] flight-of-the-amazon-queen ownership updated
Message-ID: <20080909055603.443BB208D1E@bastion.fedora.phx.redhat.com>

Package flight-of-the-amazon-queen in Fedora 8 is now owned by lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/flight-of-the-amazon-queen



From pkgdb at fedoraproject.org  Tue Sep  9 05:56:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:56:05 +0000
Subject: [pkgdb] flight-of-the-amazon-queen ownership updated
Message-ID: <20080909055605.9B85A208D7C@bastion.fedora.phx.redhat.com>

Package flight-of-the-amazon-queen in Fedora 9 is now owned by lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/flight-of-the-amazon-queen



From pkgdb at fedoraproject.org  Tue Sep  9 05:56:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:56:57 +0000
Subject: [pkgdb] childsplay_plugins had acl change status
Message-ID: <20080909055657.2F6F8208770@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on childsplay_plugins (Fedora devel) to Approved for pbrady

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay_plugins



From pkgdb at fedoraproject.org  Tue Sep  9 05:56:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:56:57 +0000
Subject: [pkgdb] childsplay_plugins had acl change status
Message-ID: <20080909055657.AA270208D7C@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on childsplay_plugins (Fedora devel) to Approved for pbrady

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay_plugins



From pkgdb at fedoraproject.org  Tue Sep  9 05:57:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:57:00 +0000
Subject: [pkgdb] childsplay_plugins had acl change status
Message-ID: <20080909055700.F3481208D99@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on childsplay_plugins (Fedora devel) to Approved for pbrady

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay_plugins



From pkgdb at fedoraproject.org  Tue Sep  9 05:57:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:57:01 +0000
Subject: [pkgdb] childsplay_plugins had acl change status
Message-ID: <20080909055701.BDDCF208D9C@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on childsplay_plugins (Fedora devel) to Approved for pbrady

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay_plugins



From pkgdb at fedoraproject.org  Tue Sep  9 05:57:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:57:10 +0000
Subject: [pkgdb] childsplay_plugins ownership updated
Message-ID: <20080909055710.6F1F0208D9F@bastion.fedora.phx.redhat.com>

Package childsplay_plugins in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay_plugins



From pkgdb at fedoraproject.org  Tue Sep  9 05:57:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:57:12 +0000
Subject: [pkgdb] childsplay_plugins ownership updated
Message-ID: <20080909055712.8362A208DA2@bastion.fedora.phx.redhat.com>

Package childsplay_plugins in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay_plugins



From pkgdb at fedoraproject.org  Tue Sep  9 05:57:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:57:20 +0000
Subject: [pkgdb] childsplay_plugins ownership updated
Message-ID: <20080909055720.C0066208771@bastion.fedora.phx.redhat.com>

Package childsplay_plugins in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay_plugins



From pkgdb at fedoraproject.org  Tue Sep  9 05:57:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:57:21 +0000
Subject: [pkgdb] childsplay_plugins ownership updated
Message-ID: <20080909055722.07B9E208D7C@bastion.fedora.phx.redhat.com>

Package childsplay_plugins in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay_plugins



From pkgdb at fedoraproject.org  Tue Sep  9 05:57:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:57:25 +0000
Subject: [pkgdb] childsplay_plugins ownership updated
Message-ID: <20080909055726.069E3208DA4@bastion.fedora.phx.redhat.com>

Package childsplay_plugins in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay_plugins



From pkgdb at fedoraproject.org  Tue Sep  9 05:57:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:57:27 +0000
Subject: [pkgdb] childsplay_plugins ownership updated
Message-ID: <20080909055727.8B704208DA7@bastion.fedora.phx.redhat.com>

Package childsplay_plugins in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay_plugins



From pkgdb at fedoraproject.org  Tue Sep  9 05:57:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:57:59 +0000
Subject: [pkgdb] childsplay had acl change status
Message-ID: <20080909055759.81836208D9A@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on childsplay (Fedora devel) to Approved for pbrady

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay



From pkgdb at fedoraproject.org  Tue Sep  9 05:58:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:58:00 +0000
Subject: [pkgdb] childsplay had acl change status
Message-ID: <20080909055800.9D6E6208D9E@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on childsplay (Fedora devel) to Approved for pbrady

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay



From pkgdb at fedoraproject.org  Tue Sep  9 05:58:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:58:00 +0000
Subject: [pkgdb] childsplay had acl change status
Message-ID: <20080909055801.69B9F208DA1@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on childsplay (Fedora devel) to Approved for pbrady

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay



From pkgdb at fedoraproject.org  Tue Sep  9 05:58:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:58:02 +0000
Subject: [pkgdb] childsplay had acl change status
Message-ID: <20080909055802.156C4208DA9@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on childsplay (Fedora devel) to Approved for pbrady

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay



From pkgdb at fedoraproject.org  Tue Sep  9 05:58:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:58:02 +0000
Subject: [pkgdb] childsplay ownership updated
Message-ID: <20080909055802.9D040208DAD@bastion.fedora.phx.redhat.com>

Package childsplay in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay



From pkgdb at fedoraproject.org  Tue Sep  9 05:58:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:58:10 +0000
Subject: [pkgdb] childsplay ownership updated
Message-ID: <20080909055810.6791E208DA5@bastion.fedora.phx.redhat.com>

Package childsplay in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay



From pkgdb at fedoraproject.org  Tue Sep  9 05:58:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:58:09 +0000
Subject: [pkgdb] childsplay ownership updated
Message-ID: <20080909055809.BC67C208D97@bastion.fedora.phx.redhat.com>

Package childsplay in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay



From pkgdb at fedoraproject.org  Tue Sep  9 05:58:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:58:04 +0000
Subject: [pkgdb] childsplay ownership updated
Message-ID: <20080909055804.51382208DAF@bastion.fedora.phx.redhat.com>

Package childsplay in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay



From pkgdb at fedoraproject.org  Tue Sep  9 05:58:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:58:16 +0000
Subject: [pkgdb] childsplay ownership updated
Message-ID: <20080909055816.33ECA208D98@bastion.fedora.phx.redhat.com>

Package childsplay in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay



From pkgdb at fedoraproject.org  Tue Sep  9 05:58:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:58:16 +0000
Subject: [pkgdb] childsplay ownership updated
Message-ID: <20080909055816.754B5208DB4@bastion.fedora.phx.redhat.com>

Package childsplay in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay



From pkgdb at fedoraproject.org  Tue Sep  9 06:01:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:01:41 +0000
Subject: [pkgdb] svgalib ownership updated
Message-ID: <20080909060142.64955208770@bastion.fedora.phx.redhat.com>

Package svgalib in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/svgalib



From pkgdb at fedoraproject.org  Tue Sep  9 06:01:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:01:46 +0000
Subject: [pkgdb] svgalib ownership updated
Message-ID: <20080909060146.785F5208D7C@bastion.fedora.phx.redhat.com>

Package svgalib in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/svgalib



From pkgdb at fedoraproject.org  Tue Sep  9 06:01:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:01:50 +0000
Subject: [pkgdb] svgalib ownership updated
Message-ID: <20080909060150.C120F208D99@bastion.fedora.phx.redhat.com>

Package svgalib in Fedora 4 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/svgalib



From pkgdb at fedoraproject.org  Tue Sep  9 06:01:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:01:52 +0000
Subject: [pkgdb] svgalib ownership updated
Message-ID: <20080909060152.C1FBD208D9C@bastion.fedora.phx.redhat.com>

Package svgalib in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/svgalib



From pkgdb at fedoraproject.org  Tue Sep  9 06:01:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:01:53 +0000
Subject: [pkgdb] svgalib ownership updated
Message-ID: <20080909060153.C80FA20876E@bastion.fedora.phx.redhat.com>

Package svgalib in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/svgalib



From cweyl at fedoraproject.org  Tue Sep  9 06:02:03 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  9 Sep 2008 06:02:03 +0000 (UTC)
Subject: rpms/perl-MooseX-Getopt/devel .cvsignore, 1.4,
	1.5 perl-MooseX-Getopt.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20080909060203.2D9FB7012A@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-serv4794

Modified Files:
	.cvsignore perl-MooseX-Getopt.spec sources 
Log Message:
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.15-1
- update to 0.15



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Getopt/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jun 2008 19:45:42 -0000	1.4
+++ .cvsignore	9 Sep 2008 06:01:32 -0000	1.5
@@ -1 +1 @@
-MooseX-Getopt-0.13.tar.gz
+MooseX-Getopt-0.15.tar.gz


Index: perl-MooseX-Getopt.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Getopt/devel/perl-MooseX-Getopt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-MooseX-Getopt.spec	10 Jul 2008 17:05:59 -0000	1.6
+++ perl-MooseX-Getopt.spec	9 Sep 2008 06:01:32 -0000	1.7
@@ -1,11 +1,11 @@
 Name:           perl-MooseX-Getopt
-Version:        0.13
-Release:        2%{?dist}
+Version:        0.15
+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/authors/id/S/ST/STEVAN/MooseX-Getopt-%{version}.tar.gz
+Source0:        http://www.cpan.org/modules/by-module/MooseX/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))
@@ -61,6 +61,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.15-1
+- update to 0.15
+
 * Thu Jul 10 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.13-2
 - tweak Getopt::Long dep to 2.35; passes tests just fine with 2.35, and that's
   what we have in F-8 perl


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Getopt/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jun 2008 19:45:42 -0000	1.4
+++ sources	9 Sep 2008 06:01:32 -0000	1.5
@@ -1 +1 @@
-9bf0e8de583eb5635540c16c37b4ec5b  MooseX-Getopt-0.13.tar.gz
+b3269f83b588f1bdcbe25ea450ec3b96  MooseX-Getopt-0.15.tar.gz



From pkgdb at fedoraproject.org  Tue Sep  9 06:02:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:02:20 +0000
Subject: [pkgdb] svgalib ownership updated
Message-ID: <20080909060220.3B570208D1E@bastion.fedora.phx.redhat.com>

Package svgalib in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/svgalib



From pkgdb at fedoraproject.org  Tue Sep  9 06:02:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:02:20 +0000
Subject: [pkgdb] svgalib ownership updated
Message-ID: <20080909060220.D6074208D98@bastion.fedora.phx.redhat.com>

Package svgalib in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/svgalib



From pkgdb at fedoraproject.org  Tue Sep  9 06:04:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:04:56 +0000
Subject: [pkgdb] enet ownership updated
Message-ID: <20080909060456.2EE2820876F@bastion.fedora.phx.redhat.com>

Package enet in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/enet



From pkgdb at fedoraproject.org  Tue Sep  9 06:04:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:04:57 +0000
Subject: [pkgdb] enet ownership updated
Message-ID: <20080909060457.43068208771@bastion.fedora.phx.redhat.com>

Package enet in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/enet



From pkgdb at fedoraproject.org  Tue Sep  9 06:04:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:04:57 +0000
Subject: [pkgdb] enet ownership updated
Message-ID: <20080909060457.6B6FC208D7C@bastion.fedora.phx.redhat.com>

Package enet in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/enet



From pkgdb at fedoraproject.org  Tue Sep  9 06:05:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:05:09 +0000
Subject: [pkgdb] freeimage ownership updated
Message-ID: <20080909060509.2036020876F@bastion.fedora.phx.redhat.com>

Package freeimage in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freeimage



From pkgdb at fedoraproject.org  Tue Sep  9 06:05:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:05:09 +0000
Subject: [pkgdb] freeimage ownership updated
Message-ID: <20080909060509.3D3CC208D9A@bastion.fedora.phx.redhat.com>

Package freeimage in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freeimage



From pkgdb at fedoraproject.org  Tue Sep  9 06:05:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:05:00 +0000
Subject: [pkgdb] enet ownership updated
Message-ID: <20080909060500.86553208D98@bastion.fedora.phx.redhat.com>

Package enet in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/enet



From pkgdb at fedoraproject.org  Tue Sep  9 06:05:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:05:13 +0000
Subject: [pkgdb] freeimage ownership updated
Message-ID: <20080909060513.4ED22208D9E@bastion.fedora.phx.redhat.com>

Package freeimage in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freeimage



From pkgdb at fedoraproject.org  Tue Sep  9 06:05:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:05:18 +0000
Subject: [pkgdb] gnucap ownership updated
Message-ID: <20080909060518.6FB7C208D9F@bastion.fedora.phx.redhat.com>

Package gnucap in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnucap



From pkgdb at fedoraproject.org  Tue Sep  9 06:05:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:05:19 +0000
Subject: [pkgdb] gnucap ownership updated
Message-ID: <20080909060519.278EE208771@bastion.fedora.phx.redhat.com>

Package gnucap in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnucap



From pkgdb at fedoraproject.org  Tue Sep  9 06:05:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:05:22 +0000
Subject: [pkgdb] gnucap ownership updated
Message-ID: <20080909060522.C1D7D208D7C@bastion.fedora.phx.redhat.com>

Package gnucap in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnucap



From pkgdb at fedoraproject.org  Tue Sep  9 06:05:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:05:24 +0000
Subject: [pkgdb] gnucap ownership updated
Message-ID: <20080909060525.21AB3208DA0@bastion.fedora.phx.redhat.com>

Package gnucap in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnucap



From pkgdb at fedoraproject.org  Tue Sep  9 06:05:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:05:27 +0000
Subject: [pkgdb] gnucap ownership updated
Message-ID: <20080909060527.E8204208DA2@bastion.fedora.phx.redhat.com>

Package gnucap in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnucap



From pkgdb at fedoraproject.org  Tue Sep  9 06:05:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:05:32 +0000
Subject: [pkgdb] gnucap ownership updated
Message-ID: <20080909060532.34DF220876F@bastion.fedora.phx.redhat.com>

Package gnucap in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnucap



From cweyl at fedoraproject.org  Tue Sep  9 06:06:26 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  9 Sep 2008 06:06:26 +0000 (UTC)
Subject: rpms/perl-MooseX-Getopt/F-9 perl-MooseX-Getopt.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20080909060626.B48607012A@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Getopt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5014

Modified Files:
	perl-MooseX-Getopt.spec sources 
Log Message:
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.15-1
- update to 0.15



Index: perl-MooseX-Getopt.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Getopt/F-9/perl-MooseX-Getopt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-MooseX-Getopt.spec	5 Mar 2008 15:04:28 -0000	1.4
+++ perl-MooseX-Getopt.spec	9 Sep 2008 06:05:56 -0000	1.5
@@ -1,20 +1,23 @@
 Name:           perl-MooseX-Getopt
-Version:        0.05
-Release:        2%{?dist}
+Version:        0.15
+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/authors/id/S/ST/STEVAN/MooseX-Getopt-%{version}.tar.gz
+Source0:        http://www.cpan.org/modules/by-module/MooseX/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(Module::Build)
-BuildRequires:  perl(Moose) >= 0.19
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Getopt::Long::Descriptive)
+# 2.35 is what we have in F-8 perl -- tests all pass
+BuildRequires:  perl(Getopt::Long)              >= 2.35
+BuildRequires:  perl(Moose)                     >= 0.43
 
 # tests...
-BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::More)      >= 0.62
 BuildRequires:  perl(Test::Exception) >= 0.21
 BuildRequires:  perl(Scalar::Util)
 
@@ -29,20 +32,24 @@
 %prep
 %setup -q -n MooseX-Getopt-%{version}
 
+perl -pi -e 's/2.37/2.35/' Makefile.PL
+
 %build
-%{__perl} Build.PL installdirs=vendor
-./Build
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 
-./Build install destdir=%{buildroot} create_packlist=0
-find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
 
 %{_fixperms} %{buildroot}/*
 
 %check
-./Build test
+make test
 
 %clean
 rm -rf %{buildroot}
@@ -54,6 +61,17 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.15-1
+- update to 0.15
+
+* Thu Jul 10 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.13-2
+- tweak Getopt::Long dep to 2.35; passes tests just fine with 2.35, and that's
+  what we have in F-8 perl
+
+* Sat Jun 28 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
+- update to 0.13
+- switch to Module::Install invocations, rather than Module::Build
+
 * Wed Mar 05 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.05-2
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Getopt/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Aug 2007 01:35:10 -0000	1.3
+++ sources	9 Sep 2008 06:05:56 -0000	1.4
@@ -1 +1 @@
-57f68a34f9e5fc60062ae108513a53b1  MooseX-Getopt-0.05.tar.gz
+b3269f83b588f1bdcbe25ea450ec3b96  MooseX-Getopt-0.15.tar.gz



From pkgdb at fedoraproject.org  Tue Sep  9 06:07:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:07:00 +0000
Subject: [pkgdb] feh ownership updated
Message-ID: <20080909060700.39FEC208771@bastion.fedora.phx.redhat.com>

Package feh in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/feh



From pkgdb at fedoraproject.org  Tue Sep  9 06:07:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:07:00 +0000
Subject: [pkgdb] feh ownership updated
Message-ID: <20080909060700.6B174208D7C@bastion.fedora.phx.redhat.com>

Package feh in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/feh



From pkgdb at fedoraproject.org  Tue Sep  9 06:07:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:07:02 +0000
Subject: [pkgdb] feh ownership updated
Message-ID: <20080909060702.E0644208D97@bastion.fedora.phx.redhat.com>

Package feh in Fedora 4 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/feh



From pkgdb at fedoraproject.org  Tue Sep  9 06:07:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:07:06 +0000
Subject: [pkgdb] feh ownership updated
Message-ID: <20080909060706.27D1E208D9B@bastion.fedora.phx.redhat.com>

Package feh in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/feh



From pkgdb at fedoraproject.org  Tue Sep  9 06:07:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:07:07 +0000
Subject: [pkgdb] feh ownership updated
Message-ID: <20080909060707.6A60C208D9C@bastion.fedora.phx.redhat.com>

Package feh in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/feh



From pkgdb at fedoraproject.org  Tue Sep  9 06:07:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:07:03 +0000
Subject: [pkgdb] feh ownership updated
Message-ID: <20080909060703.CBA3F208D99@bastion.fedora.phx.redhat.com>

Package feh in Fedora 3 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/feh



From pkgdb at fedoraproject.org  Tue Sep  9 06:07:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:07:12 +0000
Subject: [pkgdb] feh ownership updated
Message-ID: <20080909060712.1408C208770@bastion.fedora.phx.redhat.com>

Package feh in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/feh



From pkgdb at fedoraproject.org  Tue Sep  9 06:07:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:07:12 +0000
Subject: [pkgdb] feh ownership updated
Message-ID: <20080909060712.74B54208D9E@bastion.fedora.phx.redhat.com>

Package feh in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/feh



From cweyl at fedoraproject.org  Tue Sep  9 06:08:43 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  9 Sep 2008 06:08:43 +0000 (UTC)
Subject: rpms/perl-MRO-Compat/F-9 perl-MRO-Compat.spec, 1.4, 1.5 sources, 1.3,
	1.4
Message-ID: <20080909060843.0B5E27012A@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MRO-Compat/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5190

Modified Files:
	perl-MRO-Compat.spec sources 
Log Message:
* Sat Jun 28 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.09
- update to 0.09



Index: perl-MRO-Compat.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MRO-Compat/F-9/perl-MRO-Compat.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-MRO-Compat.spec	29 May 2008 06:51:23 -0000	1.4
+++ perl-MRO-Compat.spec	9 Sep 2008 06:08:12 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-MRO-Compat
-Version:        0.07
+Version:        0.09
 Release:        1%{?dist}
 Summary:        Mro::* interface compatibility for Perls < 5.9.5
 License:        GPL+ or Artistic
@@ -69,6 +69,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jun 28 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.09
+- update to 0.09
+
 * Wed May 28 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.07-1
 - update to 0.07
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MRO-Compat/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 May 2008 06:51:23 -0000	1.3
+++ sources	9 Sep 2008 06:08:12 -0000	1.4
@@ -1 +1 @@
-962156662457558d11f1f1d6daef615d  MRO-Compat-0.07.tar.gz
+49199d3a6a984c45ec24ae6fcaa8d9fd  MRO-Compat-0.09.tar.gz



From pkgdb at fedoraproject.org  Tue Sep  9 06:08:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:08:54 +0000
Subject: [pkgdb] tremulous-data ownership updated
Message-ID: <20080909060854.7F4CE208770@bastion.fedora.phx.redhat.com>

Package tremulous-data in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Tue Sep  9 06:08:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:08:54 +0000
Subject: [pkgdb] tremulous-data ownership updated
Message-ID: <20080909060855.3029220876E@bastion.fedora.phx.redhat.com>

Package tremulous-data in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Tue Sep  9 06:08:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:08:56 +0000
Subject: [pkgdb] tremulous-data ownership updated
Message-ID: <20080909060856.F1D2F208D7C@bastion.fedora.phx.redhat.com>

Package tremulous-data in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From cweyl at fedoraproject.org  Tue Sep  9 06:09:13 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  9 Sep 2008 06:09:13 +0000 (UTC)
Subject: rpms/perl-MRO-Compat/F-8 perl-MRO-Compat.spec, 1.2, 1.3 sources, 1.3,
	1.4
Message-ID: <20080909060913.EC5637012A@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MRO-Compat/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5245

Modified Files:
	perl-MRO-Compat.spec sources 
Log Message:
* Sat Jun 28 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.09
- update to 0.09



Index: perl-MRO-Compat.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MRO-Compat/F-8/perl-MRO-Compat.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-MRO-Compat.spec	29 May 2008 06:52:01 -0000	1.2
+++ perl-MRO-Compat.spec	9 Sep 2008 06:08:43 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-MRO-Compat
-Version:        0.07
+Version:        0.09
 Release:        1%{?dist}
 Summary:        Mro::* interface compatibility for Perls < 5.9.5
 License:        GPL+ or Artistic
@@ -69,6 +69,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jun 28 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.09
+- update to 0.09
+
 * Wed May 28 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.07-1
 - update to 0.07
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MRO-Compat/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 May 2008 06:52:01 -0000	1.3
+++ sources	9 Sep 2008 06:08:43 -0000	1.4
@@ -1 +1 @@
-962156662457558d11f1f1d6daef615d  MRO-Compat-0.07.tar.gz
+49199d3a6a984c45ec24ae6fcaa8d9fd  MRO-Compat-0.09.tar.gz



From pkgdb at fedoraproject.org  Tue Sep  9 06:09:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:09:02 +0000
Subject: [pkgdb] tremulous-data ownership updated
Message-ID: <20080909060902.4563B208D9A@bastion.fedora.phx.redhat.com>

Package tremulous-data in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Tue Sep  9 06:09:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:09:00 +0000
Subject: [pkgdb] tremulous-data ownership updated
Message-ID: <20080909060900.4F4DD208D98@bastion.fedora.phx.redhat.com>

Package tremulous-data in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Tue Sep  9 06:09:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:09:36 +0000
Subject: [pkgdb] svgalib ownership updated
Message-ID: <20080909060937.0F9B0208771@bastion.fedora.phx.redhat.com>

Package svgalib in Fedora devel is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/svgalib



From pkgdb at fedoraproject.org  Tue Sep  9 06:09:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:09:43 +0000
Subject: [pkgdb] svgalib ownership updated
Message-ID: <20080909060944.04160208D98@bastion.fedora.phx.redhat.com>

Package svgalib in Fedora 9 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/svgalib



From pkgdb at fedoraproject.org  Tue Sep  9 06:09:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:09:46 +0000
Subject: [pkgdb] svgalib ownership updated
Message-ID: <20080909060946.871A4208D9A@bastion.fedora.phx.redhat.com>

Package svgalib in Fedora 8 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/svgalib



From pkgdb at fedoraproject.org  Tue Sep  9 06:10:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:10:58 +0000
Subject: [pkgdb] enet ownership updated
Message-ID: <20080909061058.EBE9E208771@bastion.fedora.phx.redhat.com>

Package enet in Fedora devel is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/enet



From pkgdb at fedoraproject.org  Tue Sep  9 06:11:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:11:03 +0000
Subject: [pkgdb] enet ownership updated
Message-ID: <20080909061103.553C320876F@bastion.fedora.phx.redhat.com>

Package enet in Fedora 9 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/enet



From pkgdb at fedoraproject.org  Tue Sep  9 06:11:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:11:05 +0000
Subject: [pkgdb] enet ownership updated
Message-ID: <20080909061105.A65DA208D7C@bastion.fedora.phx.redhat.com>

Package enet in Fedora 8 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/enet



From pkgdb at fedoraproject.org  Tue Sep  9 06:11:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:11:40 +0000
Subject: [pkgdb] freeimage ownership updated
Message-ID: <20080909061140.C08C0208D7C@bastion.fedora.phx.redhat.com>

Package freeimage in Fedora 8 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freeimage



From pkgdb at fedoraproject.org  Tue Sep  9 06:11:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:11:35 +0000
Subject: [pkgdb] freeimage ownership updated
Message-ID: <20080909061136.29CD8208770@bastion.fedora.phx.redhat.com>

Package freeimage in Fedora devel is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freeimage



From pkgdb at fedoraproject.org  Tue Sep  9 06:12:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:12:27 +0000
Subject: [pkgdb] gnucap ownership updated
Message-ID: <20080909061227.8C81120876F@bastion.fedora.phx.redhat.com>

Package gnucap in Fedora 8 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnucap



From pkgdb at fedoraproject.org  Tue Sep  9 06:12:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:12:36 +0000
Subject: [pkgdb] gnucap ownership updated
Message-ID: <20080909061236.619EC208771@bastion.fedora.phx.redhat.com>

Package gnucap in Fedora 9 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnucap



From pkgdb at fedoraproject.org  Tue Sep  9 06:12:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:12:45 +0000
Subject: [pkgdb] gnucap ownership updated
Message-ID: <20080909061245.70C5620876F@bastion.fedora.phx.redhat.com>

Package gnucap in Fedora devel is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnucap



From cweyl at fedoraproject.org  Tue Sep  9 06:15:35 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  9 Sep 2008 06:15:35 +0000 (UTC)
Subject: rpms/perl-Locale-SubCountry/devel .cvsignore, 1.3,
	1.4 perl-Locale-SubCountry.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20080909061535.2C5297012A@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Locale-SubCountry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5821

Modified Files:
	.cvsignore perl-Locale-SubCountry.spec sources 
Log Message:
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.41-1
- update to 1.41
- chmod -x everything



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-SubCountry/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Dec 2006 16:20:54 -0000	1.3
+++ .cvsignore	9 Sep 2008 06:15:04 -0000	1.4
@@ -1 +1 @@
-Locale-SubCountry-1.38.tar.gz
+Locale-SubCountry-1.41.tar.gz


Index: perl-Locale-SubCountry.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-SubCountry/devel/perl-Locale-SubCountry.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Locale-SubCountry.spec	4 Mar 2008 19:26:03 -0000	1.5
+++ perl-Locale-SubCountry.spec	9 Sep 2008 06:15:04 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Locale-SubCountry
-Version:        1.38 
-Release:        2%{?dist}
+Version:        1.41
+Release:        1%{?dist}
 Summary:        ISO 3166-2 two letter subcountry codes
 
 Group:          Development/Libraries
@@ -25,17 +25,18 @@
 %prep
 %setup -q -n Locale-SubCountry-%{version}
 
-chmod -x examples/*
+find . -type f -exec chmod -c -x {} +
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 # make sure the man page is UTF-8...
-cd blib/man3
-iconv --from=ISO-8859-1 --to=UTF-8 Locale::SubCountry.3pm > new
-mv new Locale::SubCountry.3pm
-
+#cd blib/man3
+for i in Changes blib/man3/Locale::SubCountry.3pm ; do
+    iconv --from=ISO-8859-1 --to=UTF-8 $i > new
+    mv new $i
+done
 
 %install
 rm -rf %{buildroot}
@@ -63,6 +64,10 @@
 
 
 %changelog
+* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.41-1
+- update to 1.41
+- chmod -x everything
+
 * Tue Mar 04 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.38-2
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-SubCountry/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Dec 2006 16:20:54 -0000	1.3
+++ sources	9 Sep 2008 06:15:04 -0000	1.4
@@ -1 +1 @@
-fdd8540e52af7a17d1a72a04eee4d148  Locale-SubCountry-1.38.tar.gz
+44f6b0cc4b1ad5db591e45d1395d2d7f  Locale-SubCountry-1.41.tar.gz



From airlied at fedoraproject.org  Tue Sep  9 06:16:50 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  9 Sep 2008 06:16:50 +0000 (UTC)
Subject: rpms/kernel/devel drm-modesetting-i915.patch, NONE,
	1.1 config-generic, 
	1.165, 1.166 drm-modesetting-radeon.patch, 1.23,
	1.24 kernel.spec, 1.939, 1.940
Message-ID: <20080909061650.636727012A@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6028

Modified Files:
	config-generic drm-modesetting-radeon.patch kernel.spec 
Added Files:
	drm-modesetting-i915.patch 
Log Message:
* Tue Sep 09 2008 Dave Airlie <airlied at redhat.com>
- radeon - update modesetting bits - should fix r400
- add i915 modesetting bits - don't enable these by default yet


drm-modesetting-i915.patch:

--- NEW FILE drm-modesetting-i915.patch ---
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 649757f..a1ed52b 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -84,6 +84,15 @@ config DRM_I915
 
 endchoice
 
+config DRM_I915_KMS
+	bool "Enable modesetting on intel by default"
+	depends on DRM_I915
+	help
+	Choose this option if you want kernel modesetting enabled by default,
+	and you have a new enough userspace to support this. Running old
+	userspaces with this enabled will cause pain.
+
+
 config DRM_MGA
 	tristate "Matrox g200/g400"
 	depends on DRM
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
index 217ad7d..367c590 100644
--- a/drivers/gpu/drm/drm_mm.c
+++ b/drivers/gpu/drm/drm_mm.c
@@ -296,3 +296,4 @@ void drm_mm_takedown(struct drm_mm * mm)
 
 	drm_free(entry, sizeof(*entry), DRM_MEM_MM);
 }
+EXPORT_SYMBOL(drm_mm_takedown);
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 362d419..57aa9da 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -4,10 +4,15 @@
 
 ccflags-y := -Iinclude/drm
 i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o i915_init.o i915_opregion.o \
+	i915_suspend.o \
 	i915_gem.o \
 	i915_gem_debug.o \
 	i915_gem_proc.o \
-	i915_gem_tiling.o
+	i915_gem_tiling.o \
+	intel_display.o intel_crt.o intel_lvds.o intel_bios.o \
+	intel_sdvo.o intel_modes.o intel_i2c.o i915_init.o intel_fb.o \
+	intel_tv.o intel_dvo.o dvo_ch7xxx.o \
+	dvo_ch7017.o dvo_ivch.o dvo_tfp410.o dvo_sil164.o
 
 i915-$(CONFIG_COMPAT)   += i915_ioc32.o
 
diff --git a/drivers/gpu/drm/i915/dvo.h b/drivers/gpu/drm/i915/dvo.h
new file mode 100644
index 0000000..b122ea1
--- /dev/null
+++ b/drivers/gpu/drm/i915/dvo.h
@@ -0,0 +1,159 @@
+/*
+ * Copyright ?? 2006 Eric Anholt
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _INTEL_DVO_H 
+#define _INTEL_DVO_H 
+
+#include <linux/i2c.h>
+#include "drmP.h"
+#include "drm.h"
+#include "drm_crtc.h"
+#include "intel_drv.h"
+
+struct intel_dvo_device {
+	char *name;
+	int type;
+	/* DVOA/B/C output register */
+	u32 dvo_reg;
+	/* GPIO register used for i2c bus to control this device */
+	u32 gpio;
+	int slave_addr;
+	struct intel_i2c_chan *i2c_bus;
+
+	const struct intel_dvo_dev_ops *dev_ops;
+	void *dev_priv;
+
+	struct drm_display_mode *panel_fixed_mode;
+	bool panel_wants_dither;
+};
+
+struct intel_dvo_dev_ops {
+	/*
+	 * Initialize the device at startup time.
+	 * Returns NULL if the device does not exist.
+	 */
+	bool (*init)(struct intel_dvo_device *dvo,
+		     struct intel_i2c_chan *i2cbus);
+
+	/*
+	 * Called to allow the output a chance to create properties after the
+	 * RandR objects have been created.
+	 */
+	void (*create_resources)(struct intel_dvo_device *dvo);
+
+	/*
+	 * Turn on/off output or set intermediate power levels if available.
+	 *
+	 * Unsupported intermediate modes drop to the lower power setting.
+	 * If the  mode is DPMSModeOff, the output must be disabled,
+	 * as the DPLL may be disabled afterwards.
+	 */
+	void (*dpms)(struct intel_dvo_device *dvo, int mode);
+
+	/*
+	 * Saves the output's state for restoration on VT switch.
+	 */
+	void (*save)(struct intel_dvo_device *dvo);
+
+	/*
+	 * Restore's the output's state at VT switch.
+	 */
+	void (*restore)(struct intel_dvo_device *dvo);
+
+	/*
+	 * Callback for testing a video mode for a given output.
+	 *
+	 * This function should only check for cases where a mode can't
+	 * be supported on the output specifically, and not represent
+	 * generic CRTC limitations.
+	 *
+	 * \return MODE_OK if the mode is valid, or another MODE_* otherwise.
+	 */
+	int (*mode_valid)(struct intel_dvo_device *dvo,
+			  struct drm_display_mode *mode);
+
+	/*
+	 * Callback to adjust the mode to be set in the CRTC.
+	 *
+	 * This allows an output to adjust the clock or even the entire set of
+	 * timings, which is used for panels with fixed timings or for
+	 * buses with clock limitations.
+	 */
+	bool (*mode_fixup)(struct intel_dvo_device *dvo,
+			   struct drm_display_mode *mode,
+			   struct drm_display_mode *adjusted_mode);
+
+	/*
+	 * Callback for preparing mode changes on an output
+	 */
+	void (*prepare)(struct intel_dvo_device *dvo);
+
+	/*
+	 * Callback for committing mode changes on an output
+	 */
+	void (*commit)(struct intel_dvo_device *dvo);
+
+	/*
+	 * Callback for setting up a video mode after fixups have been made.
+	 *
+	 * This is only called while the output is disabled.  The dpms callback
+	 * must be all that's necessary for the output, to turn the output on
+	 * after this function is called.
+	 */
+	void (*mode_set)(struct intel_dvo_device *dvo,
+			 struct drm_display_mode *mode,
+			 struct drm_display_mode *adjusted_mode);
+
+	/*
+	 * Probe for a connected output, and return detect_status.
+	 */
+	enum drm_connector_status (*detect)(struct intel_dvo_device *dvo);
+
+	/**
+	 * Query the device for the modes it provides.
+	 *
+	 * This function may also update MonInfo, mm_width, and mm_height.
+	 *
+	 * \return singly-linked list of modes or NULL if no modes found.
+	 */
+	struct drm_display_mode *(*get_modes)(struct intel_dvo_device *dvo);
+
+#ifdef RANDR_12_INTERFACE
+	/**
+	 * Callback when an output's property has changed.
+	 */
[...12227 lines suppressed...]
@@ -406,6 +408,23 @@ struct drm_i915_gem_mmap {
 	uint64_t addr_ptr;
 };
 
+struct drm_i915_gem_mmap_gtt {
+	/** Handle for the object being mapped. */
+	uint32_t handle;
+	uint32_t pad;
+	/** Offset in the object to map. */
+	uint64_t offset;
+	/**
+	 * Length of data to map.
+	 *
+	 * The value will be page-aligned.
+	 */
+	uint64_t size;
+	/** Returned pointer the data was mapped at */
+	uint64_t addr_ptr;	/* void *, but pointers are not 32/64 compatible */
+	uint32_t flags;
+};
+
 struct drm_i915_gem_set_domain {
 	/** Handle for the object */
 	uint32_t handle;
diff --git a/mm/mmap.c b/mm/mmap.c
index 339cf5c..62f54fe 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1244,6 +1244,171 @@ unacct_error:
 	return error;
 }
 
+/**
+ * mmap_io_region - map an I/O region, creating a new VMA if necessary
+ * @file: file to account mapping against
+ * @addr: user address to map
+ * @len: size of mapping
+ * @flags: mmap flags
+ * @vm_flags: VM protection bits
+ * @pgoff: pfn of backing pages
+ * @accountable: account for these pages?
+ *
+ * Normally drivers can simply override ->mmap and use remap_pfn_range
+ * themselves, but if remapping needs to be done in other functions (say ioctl)
+ * some function has to provide VMA allocation & linking services, thus
+ * this function.
+ */
+unsigned long mmap_io_region(struct file *file, unsigned long addr,
+			     unsigned long len, unsigned long flags,
+			     unsigned int vm_flags, unsigned long pgoff,
+			     int accountable)
+{
+	struct mm_struct *mm = current->mm;
+	struct vm_area_struct *vma, *prev;
+	int correct_wcount = 0;
+	int error;
+	struct rb_node **rb_link, *rb_parent;
+	unsigned long charged = 0;
+	struct inode *inode =  file ? file->f_path.dentry->d_inode : NULL;
+
+	/* Clear old maps */
+	error = -ENOMEM;
+munmap_back:
+	vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
+	if (vma && vma->vm_start < addr + len) {
+		if (do_munmap(mm, addr, len))
+			return -ENOMEM;
+		goto munmap_back;
+	}
+
+	/* Check against address space limit. */
+	if (!may_expand_vm(mm, len >> PAGE_SHIFT))
+		return -ENOMEM;
+
+	if (flags & MAP_NORESERVE)
+		vm_flags |= VM_NORESERVE;
+
+	if (accountable && (!(flags & MAP_NORESERVE) ||
+			    sysctl_overcommit_memory == OVERCOMMIT_NEVER)) {
+		if (vm_flags & VM_SHARED) {
+			/* Check memory availability in shmem_file_setup? */
+			vm_flags |= VM_ACCOUNT;
+		} else if (vm_flags & VM_WRITE) {
+			/*
+			 * Private writable mapping: check memory availability
+			 */
+			charged = len >> PAGE_SHIFT;
+			if (security_vm_enough_memory(charged))
+				return -ENOMEM;
+			vm_flags |= VM_ACCOUNT;
+		}
+	}
+
+	printk(KERN_ERR "%s: using vma %p\n", __FUNCTION__, vma);
+
+	/*
+	 * Determine the object being mapped and call the appropriate
+	 * specific mapper. the address has already been validated, but
+	 * not unmapped, but the maps are removed from the list.
+	 */
+	vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
+	if (!vma) {
+		error = -ENOMEM;
+		goto unacct_error;
+	}
+
+	vma->vm_mm = mm;
+	vma->vm_start = addr;
+	vma->vm_end = addr + len;
+	vma->vm_flags = vm_flags;
+	vma->vm_page_prot = vm_get_page_prot(vm_flags);
+	vma->vm_pgoff = pgoff;
+
+	error = -EINVAL;
+	if (vm_flags & (VM_GROWSDOWN|VM_GROWSUP))
+		goto free_vma;
+	if (vm_flags & VM_DENYWRITE) {
+		error = deny_write_access(file);
+		if (error)
+			goto free_vma;
+		correct_wcount = 1;
+	}
+
+	get_file(file);
+	printk(KERN_ERR "remap_pfn_range(%p, 0x%lx, 0x%lx, 0x%lx, 0x%lx)\n",
+	       vma, vma->vm_start, vma->vm_pgoff, len, vma->vm_page_prot);
+	error = remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff, len,
+				vma->vm_page_prot);
+	if (error)
+		goto unmap_and_free_vma;
+	if (vm_flags & VM_EXECUTABLE)
+		added_exe_file_vma(mm);
+
+	/* We set VM_ACCOUNT in a shared mapping's vm_flags, to inform
+	 * shmem_zero_setup (perhaps called through /dev/zero's ->mmap)
+	 * that memory reservation must be checked; but that reservation
+	 * belongs to shared memory object, not to vma: so now clear it.
+	 */
+	if ((vm_flags & (VM_SHARED|VM_ACCOUNT)) == (VM_SHARED|VM_ACCOUNT))
+		vma->vm_flags &= ~VM_ACCOUNT;
+
+	/* Can addr have changed??
+	 *
+	 * Answer: Yes, several device drivers can do it in their
+	 *         f_op->mmap method. -DaveM
+	 */
+	addr = vma->vm_start;
+	pgoff = vma->vm_pgoff;
+	vm_flags = vma->vm_flags;
+
+	if (vma_wants_writenotify(vma))
+		vma->vm_page_prot = vm_get_page_prot(vm_flags & ~VM_SHARED);
+
+	if (file && vma_merge(mm, prev, addr, vma->vm_end,
+			vma->vm_flags, NULL, file, pgoff, vma_policy(vma))) {
+		mpol_put(vma_policy(vma));
+		kmem_cache_free(vm_area_cachep, vma);
+		fput(file);
+		if (vm_flags & VM_EXECUTABLE)
+			removed_exe_file_vma(mm);
+	} else {
+		vma_link(mm, vma, prev, rb_link, rb_parent);
+		file = vma->vm_file;
+	}
+
+	/* Once vma denies write, undo our temporary denial count */
+	if (correct_wcount)
+		atomic_inc(&inode->i_writecount);
+
+	mm->total_vm += len >> PAGE_SHIFT;
+	vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
+	if (vm_flags & VM_LOCKED) {
+		mm->locked_vm += len >> PAGE_SHIFT;
+		make_pages_present(addr, addr + len);
+	}
+	if ((flags & MAP_POPULATE) && !(flags & MAP_NONBLOCK))
+		make_pages_present(addr, addr + len);
+	return addr;
+
+unmap_and_free_vma:
+	if (correct_wcount)
+		atomic_inc(&inode->i_writecount);
+	vma->vm_file = NULL;
+	fput(file);
+
+	/* Undo any partial mapping done by a device driver. */
+	unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
+	charged = 0;
+free_vma:
+	kmem_cache_free(vm_area_cachep, vma);
+unacct_error:
+	if (charged)
+		vm_unacct_memory(charged);
+	return error;
+}
+EXPORT_SYMBOL(mmap_io_region);
+
 /* Get an address range which is currently unmapped.
  * For shmat() with addr=0.
  *


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- config-generic	5 Sep 2008 04:25:29 -0000	1.165
+++ config-generic	9 Sep 2008 06:16:19 -0000	1.166
@@ -2103,6 +2103,7 @@
 CONFIG_DRM_SIS=m
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
+CONFIG_DRM_I915_KMS=n
 CONFIG_DRM_VIA=m
 CONFIG_DRM_NOUVEAU=m
 

drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- drm-modesetting-radeon.patch	8 Sep 2008 00:35:14 -0000	1.23
+++ drm-modesetting-radeon.patch	9 Sep 2008 06:16:19 -0000	1.24
@@ -1,3 +1,21 @@
+commit dc35ec837f7a0ff258e6fde4326ccae7fd77650b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Sep 9 15:55:38 2008 +1000
+
+    radeon: sort out atom vs combios tables for r400 cards
+
+commit 3f4de41530215c5fe6a15b75defa1164615f4878
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Sep 8 11:37:26 2008 +1000
+
+    radeon: remove unneeded debugging
+
+commit 2a5b61e6726691102e075e07e6d9f8b1817b73d4
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Sep 8 11:25:12 2008 +1000
+
+    radeon: don't do full edid for detection purposes
+
 commit 563e90db2ca306fe0dee104703a48b5bc5d7fd93
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Sep 8 10:27:48 2008 +1000
@@ -27952,10 +27970,10 @@
  
 diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
 new file mode 100644
-index 0000000..10e3a77
+index 0000000..4d98cba
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_atombios.c
-@@ -0,0 +1,417 @@
+@@ -0,0 +1,453 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -28263,12 +28281,48 @@
 +	return true;
 +}
 +
++
++void radeon_atombios_get_tmds_info(struct radeon_encoder *encoder)
++{
++	struct drm_device *dev = encoder->base.dev;
++	struct drm_radeon_private *dev_priv = dev->dev_private;
++	struct radeon_mode_info *mode_info = &dev_priv->mode_info;
++	int index = GetIndexIntoMasterTable(DATA, TMDS_Info);
++	uint16_t data_offset;
++	struct _ATOM_TMDS_INFO *tmds_info;
++	uint8_t frev, crev;
++	uint16_t maxfreq;
++	int i;
++
++	atom_parse_data_header(mode_info->atom_context, index, NULL, &frev, &crev, &data_offset);
++
++	tmds_info = (struct _ATOM_TMDS_INFO *)(mode_info->atom_context->bios + data_offset);
++
++	maxfreq = le16_to_cpu(tmds_info->usMaxFrequency);
++	for (i = 0; i < 4; i++) {
++		encoder->tmds_pll[i].freq = le16_to_cpu(tmds_info->asMiscInfo[i].usFrequency);
++		encoder->tmds_pll[i].value = tmds_info->asMiscInfo[i].ucPLL_ChargePump & 0x3f;
++		encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_VCO_Gain & 0x3f << 6);
++		encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_DutyCycle & 0xf << 12);
++		encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_VoltageSwing & 0xf << 16);
++
++		DRM_DEBUG("TMDS PLL From BIOS %u %x\n",
++			  encoder->tmds_pll[i].freq,
++			   encoder->tmds_pll[i].value);
++
++		if (maxfreq == encoder->tmds_pll[i].freq) {
++			encoder->tmds_pll[i].freq = 0xffffffff;
++			break;
++		}
++	}
++}
++
 +union lvds_info {
 +	struct _ATOM_LVDS_INFO info;
 +	struct _ATOM_LVDS_INFO_V12 info_12;
 +};
 +
-+void radeon_get_lvds_info(struct radeon_encoder *encoder)
++void radeon_atombios_get_lvds_info(struct radeon_encoder *encoder)
 +{
 +	struct drm_device *dev = encoder->base.dev;
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
@@ -28821,10 +28875,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
 new file mode 100644
-index 0000000..200761e
+index 0000000..bca9e13
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_combios.c
-@@ -0,0 +1,1344 @@
+@@ -0,0 +1,1359 @@
 +/*
 + * Copyright 2004 ATI Technologies Inc., Markham, Ontario
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
@@ -28882,7 +28936,7 @@
 +	COMBIOS_CONNECTOR_INFO_TABLE,
 +	COMBIOS_DYN_CLK_1_TABLE,
 +	COMBIOS_RESERVED_MEM_TABLE,
-+	COMBIOS_EXT_TDMS_INFO_TABLE,
++	COMBIOS_EXT_TMDS_INFO_TABLE,
 +	COMBIOS_MEM_CLK_INFO_TABLE,
 +	COMBIOS_EXT_DAC_INFO_TABLE,
 +	COMBIOS_MISC_INFO_TABLE,
@@ -29044,7 +29098,7 @@
 +		if (check_offset)
 +			offset = check_offset;
 +		break;
-+	case COMBIOS_EXT_TDMS_INFO_TABLE:
++	case COMBIOS_EXT_TMDS_INFO_TABLE:
 +		check_offset = radeon_bios16(dev_priv, dev_priv->bios_header_start + 0x58);
 +		if (check_offset)
 +			offset = check_offset;
@@ -29594,6 +29648,21 @@
 +	return false;
 +}
 +
++bool radeon_combios_get_ext_tmds_info(struct radeon_encoder *encoder)
++{
++	struct drm_device *dev = encoder->base.dev;
++	struct drm_radeon_private *dev_priv = dev->dev_private;
++	uint16_t ext_tmds_info;
++	uint8_t ver;
++
++	ext_tmds_info = combios_get_table_offset(dev, COMBIOS_EXT_TMDS_INFO_TABLE);
++	if (ext_tmds_info) {
++		ver = radeon_bios8(dev_priv, ext_tmds_info);
++		DRM_INFO("External TMDS Table revision: %d\n", ver);
++		// TODO
++	}
++}
++
 +static void radeon_apply_legacy_quirks(struct drm_device *dev, int bios_index)
 +{
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
@@ -30171,10 +30240,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
 new file mode 100644
-index 0000000..5ce66d7
+index 0000000..f217fe7
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_connectors.c
-@@ -0,0 +1,377 @@
+@@ -0,0 +1,367 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -30340,18 +30409,16 @@
 +
 +static enum drm_connector_status radeon_vga_detect(struct drm_connector *connector)
 +{
-+	struct edid *edid;
 +	struct radeon_connector *radeon_connector = to_radeon_connector(connector);
 +	struct drm_encoder *encoder;
 +	struct drm_encoder_helper_funcs *encoder_funcs;
++	bool ret;
 +
 +	radeon_i2c_do_lock(radeon_connector, 1);
-+	edid = drm_get_edid(&radeon_connector->base, &radeon_connector->ddc_bus->adapter);
++	ret = radeon_ddc_probe(radeon_connector);
 +	radeon_i2c_do_lock(radeon_connector, 0);
-+	if (edid) {
-+		kfree(edid);
++	if (ret)
 +		return connector_status_connected;
-+	}
 +
 +	/* if EDID fails to a load detect */
 +	encoder = radeon_best_single_encoder(connector);
@@ -30377,27 +30444,19 @@
 +
 +static enum drm_connector_status radeon_dvi_detect(struct drm_connector *connector)
 +{
-+	struct edid *edid;
 +	struct radeon_connector *radeon_connector = to_radeon_connector(connector);
 +	struct drm_encoder *encoder;
 +	struct drm_encoder_helper_funcs *encoder_funcs;
 +	struct drm_mode_object *obj;
 +	int i;
 +	enum drm_connector_status ret;
++	bool dret;
 +
 +	radeon_i2c_do_lock(radeon_connector, 1);
-+	edid = drm_get_edid(&radeon_connector->base, &radeon_connector->ddc_bus->adapter);
++	dret = radeon_ddc_probe(radeon_connector);
 +	radeon_i2c_do_lock(radeon_connector, 0);
-+	if (edid) {
-+		/* if the monitor is digital - set the bits */
-+		if (edid->digital)
-+			radeon_connector->use_digital = 1;
-+		else
-+			radeon_connector->use_digital = 0;
-+
-+		kfree(edid);
++	if (dret)
 +		return connector_status_connected;
-+	}
 +
 +	for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
 +		if (connector->encoder_ids[i] == 0)
@@ -30553,7 +30612,7 @@
 +	return NULL;
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
-index 248ab4a..8994326 100644
+index 248ab4a..cc96220 100644
 --- a/drivers/gpu/drm/radeon/radeon_cp.c
 +++ b/drivers/gpu/drm/radeon/radeon_cp.c
 @@ -31,6 +31,7 @@
@@ -31303,7 +31362,7 @@
  	LOCK_TEST_WITH_RETURN(dev, file_priv);
  
  	return radeon_do_engine_reset(dev);
-@@ -1688,6 +1866,602 @@ int radeon_cp_buffers(struct drm_device *dev, void *data, struct drm_file *file_
+@@ -1688,6 +1866,600 @@ int radeon_cp_buffers(struct drm_device *dev, void *data, struct drm_file *file_
  	return ret;
  }
  
@@ -31773,11 +31832,9 @@
 +	}
 +	radeon_gart_flush(dev);
 +
-+	DRM_ERROR("microcode loading\n");
 +	radeon_cp_load_microcode(dev_priv);
 +	radeon_cp_init_ring_buffer(dev, dev_priv);
 +
-+	DRM_ERROR("engine init\n");
 +	radeon_do_engine_reset(dev);
 +
 +	radeon_do_cp_start(dev_priv);
@@ -31906,7 +31963,7 @@
  int radeon_driver_load(struct drm_device *dev, unsigned long flags)
  {
  	drm_radeon_private_t *dev_priv;
-@@ -1701,6 +2475,8 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -1701,6 +2473,8 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
  	dev->dev_private = (void *)dev_priv;
  	dev_priv->flags = flags;
  
@@ -31915,7 +31972,7 @@
  	switch (flags & RADEON_FAMILY_MASK) {
  	case CHIP_R100:
  	case CHIP_RV200:
-@@ -1720,18 +2496,119 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -1720,18 +2494,119 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
  		break;
  	}
  
@@ -32036,7 +32093,7 @@
  /* Create mappings for registers and framebuffer so userland doesn't necessarily
   * have to find them.
   */
-@@ -1743,19 +2620,6 @@ int radeon_driver_firstopen(struct drm_device *dev)
+@@ -1743,19 +2618,6 @@ int radeon_driver_firstopen(struct drm_device *dev)
  
  	dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE;
  
@@ -32056,7 +32113,7 @@
  	return 0;
  }
  
-@@ -1763,9 +2627,40 @@ int radeon_driver_unload(struct drm_device *dev)
+@@ -1763,9 +2625,40 @@ int radeon_driver_unload(struct drm_device *dev)
  {
  	drm_radeon_private_t *dev_priv = dev->dev_private;
  
@@ -32765,10 +32822,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
 new file mode 100644
-index 0000000..2e516a1
+index 0000000..a2cb66a
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -0,0 +1,645 @@
+@@ -0,0 +1,651 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -32802,6 +32859,7 @@
 +#include <asm/div64.h>
 +
 +#include "drm_crtc_helper.h"
++#include "drm_edid.h"
 +
 +int radeon_ddc_dump(struct drm_connector *connector);
 +
@@ -33076,6 +33134,11 @@
 +	edid = drm_get_edid(&radeon_connector->base, &radeon_connector->ddc_bus->adapter);
 +	radeon_i2c_do_lock(radeon_connector, 0);
 +	if (edid) {
++		/* update digital bits here */
++		if (edid->digital)
++			radeon_connector->use_digital = 1;
++		else
++			radeon_connector->use_digital = 0;
 +		drm_mode_connector_update_edid_property(&radeon_connector->base, edid);
 +		ret = drm_add_edid_modes(&radeon_connector->base, edid);
 +		kfree(edid);
@@ -34243,7 +34306,7 @@
  #endif				/* __RADEON_DRV_H__ */
 diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
 new file mode 100644
-index 0000000..e3a58c8
+index 0000000..e791ab7
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_encoders.c
 @@ -0,0 +1,1081 @@
@@ -34636,7 +34699,7 @@
 +
 +	/* TODO get the LVDS info from the BIOS for panel size etc. */
 +	/* get the lvds info from the bios */
-+	radeon_get_lvds_info(radeon_encoder);
++	radeon_atombios_get_lvds_info(radeon_encoder);
 +
 +	/* LVDS gets default RMX full scaling */
 +	radeon_encoder->rmx_type = RMX_FULL;
@@ -36364,10 +36427,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
 new file mode 100644
-index 0000000..12a0358
+index 0000000..382d348
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_gem.c
-@@ -0,0 +1,1382 @@
+@@ -0,0 +1,1381 @@
 +/*
 + * Copyright 2008 Red Hat Inc.
 + *
@@ -36982,7 +37045,6 @@
 +		if (!dev_priv->mm.pcie_table_backup)
 +			return -EINVAL;
 +
-+		DRM_ERROR("pcie table bo created %p, %x\n", dev_priv->mm.pcie_table.bo, dev_priv->mm.pcie_table.bo->offset);
 +		ret = drm_bo_kmap(dev_priv->mm.pcie_table.bo, 0, RADEON_PCIGART_TABLE_SIZE >> PAGE_SHIFT,
 +				  &dev_priv->mm.pcie_table.kmap);
 +		if (ret)
@@ -37752,10 +37814,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c
 new file mode 100644
-index 0000000..00fc7c0
+index 0000000..94a485b
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_i2c.c
-@@ -0,0 +1,163 @@
+@@ -0,0 +1,196 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -37785,6 +37847,38 @@
 +#include "radeon_drm.h"
 +#include "radeon_drv.h"
 +
++/**
++ * radeon_ddc_probe
++ *
++ */
++bool radeon_ddc_probe(struct radeon_connector *radeon_connector)
++{
++        u8 out_buf[] = { 0x0, 0x0};
++        u8 buf[2];
++        int ret;
++        struct i2c_msg msgs[] = {
++                {
++                        .addr = 0x50,
++                        .flags = 0,
++                        .len = 1,
++                        .buf = out_buf,
++                },
++                {
++                        .addr = 0x50,
++                        .flags = I2C_M_RD,
++                        .len = 1,
++                        .buf = buf,
++                }
++        };
++
++        ret = i2c_transfer(&radeon_connector->ddc_bus->adapter, msgs, 2);
++        if (ret == 2)
++                return true;
++
++        return false;
++}
++
++
 +void radeon_i2c_do_lock(struct radeon_connector *radeon_connector, int lock_state)
 +{
 +	struct drm_radeon_private *dev_priv = radeon_connector->base.dev->dev_private;
@@ -37919,6 +38013,7 @@
 +{
 +	return NULL;
 +}
++
 diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
 index ee40d19..4d16f4a 100644
 --- a/drivers/gpu/drm/radeon/radeon_irq.c
@@ -39000,10 +39095,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
 new file mode 100644
-index 0000000..0d6babb
+index 0000000..c80e0b5
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
-@@ -0,0 +1,1328 @@
+@@ -0,0 +1,1356 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -39275,16 +39370,20 @@
 +
 +static void radeon_legacy_lvds_prepare(struct drm_encoder *encoder)
 +{
++	struct drm_radeon_private *dev_priv = encoder->dev->dev_private;
 +	// fix me: atom/legacy r4xx
-+	radeon_combios_output_lock(encoder, true);
++	if (!dev_priv->is_atom_bios)
++		radeon_combios_output_lock(encoder, true);
 +	radeon_legacy_lvds_dpms(encoder, DRM_MODE_DPMS_OFF);
 +}
 +
 +static void radeon_legacy_lvds_commit(struct drm_encoder *encoder)
 +{
++	struct drm_radeon_private *dev_priv = encoder->dev->dev_private;
 +	radeon_legacy_lvds_dpms(encoder, DRM_MODE_DPMS_ON);
 +	// fix me: atom/legacy r4xx
-+	radeon_combios_output_lock(encoder, false);
++	if (!dev_priv->is_atom_bios)
++		radeon_combios_output_lock(encoder, false);
 +}
 +
 +static void radeon_legacy_lvds_mode_set(struct drm_encoder *encoder,
@@ -39367,6 +39466,7 @@
 +
 +struct drm_encoder *radeon_encoder_legacy_lvds_add(struct drm_device *dev, int bios_index)
 +{
++	struct drm_radeon_private *dev_priv = dev->dev_private;
 +	struct radeon_encoder *radeon_encoder;
 +	struct drm_encoder *encoder;
 +
@@ -39388,7 +39488,10 @@
 +	drm_encoder_helper_add(encoder, &radeon_legacy_lvds_helper_funcs);
 +
 +	/* get the lvds info from the bios */
-+	radeon_combios_get_lvds_info(radeon_encoder);
++	if (dev_priv->is_atom_bios)
++		radeon_atombios_get_lvds_info(radeon_encoder);
++	else
++		radeon_combios_get_lvds_info(radeon_encoder);
 +
 +	/* LVDS gets default RMX full scaling */
 +	radeon_encoder->rmx_type = RMX_FULL;
@@ -39463,16 +39566,20 @@
 +
 +static void radeon_legacy_primary_dac_prepare(struct drm_encoder *encoder)
 +{
++	struct drm_radeon_private *dev_priv = encoder->dev->dev_private;
 +	// fix me: atom/legacy r4xx
-+	radeon_combios_output_lock(encoder, true);
++	if (!dev_priv->is_atom_bios)
++		radeon_combios_output_lock(encoder, true);
 +	radeon_legacy_primary_dac_dpms(encoder, DRM_MODE_DPMS_OFF);
 +}
 +
 +static void radeon_legacy_primary_dac_commit(struct drm_encoder *encoder)
 +{
++	struct drm_radeon_private *dev_priv = encoder->dev->dev_private;
 +	radeon_legacy_primary_dac_dpms(encoder, DRM_MODE_DPMS_ON);
 +	// fix me: atom/legacy r4xx
-+	radeon_combios_output_lock(encoder, false);
++	if (!dev_priv->is_atom_bios)
++		radeon_combios_output_lock(encoder, false);
 +}
 +
 +static void radeon_legacy_primary_dac_mode_set(struct drm_encoder *encoder,
@@ -39609,6 +39716,7 @@
 +
 +struct drm_encoder *radeon_encoder_legacy_primary_dac_add(struct drm_device *dev, int bios_index, int has_tv)
 +{
++	struct drm_radeon_private *dev_priv = dev->dev_private;
 +	struct radeon_encoder *radeon_encoder;
 +	struct drm_encoder *encoder;
 +
@@ -39629,7 +39737,8 @@
 +	drm_encoder_helper_add(encoder, &radeon_legacy_primary_dac_helper_funcs);
 +
 +	/* get the primary dac bg/adj vals from bios tables */
-+	radeon_combios_get_primary_dac_info(radeon_encoder);
++	if (!dev_priv->is_atom_bios)
++		radeon_combios_get_primary_dac_info(radeon_encoder);
 +
 +	return encoder;
 +}
@@ -39687,16 +39796,20 @@
 +
 +static void radeon_legacy_tmds_int_prepare(struct drm_encoder *encoder)
 +{
++	struct drm_radeon_private *dev_priv = encoder->dev->dev_private;
 +	// fix me: atom/legacy r4xx
-+	radeon_combios_output_lock(encoder, true);
++	if (!dev_priv->is_atom_bios)
++		radeon_combios_output_lock(encoder, true);
 +	radeon_legacy_tmds_int_dpms(encoder, DRM_MODE_DPMS_OFF);
 +}
 +
 +static void radeon_legacy_tmds_int_commit(struct drm_encoder *encoder)
 +{
++	struct drm_radeon_private *dev_priv = encoder->dev->dev_private;
 +	radeon_legacy_tmds_int_dpms(encoder, DRM_MODE_DPMS_ON);
 +	// fix me: atom/legacy r4xx
-+	radeon_combios_output_lock(encoder, true);
++	if (!dev_priv->is_atom_bios)
++		radeon_combios_output_lock(encoder, true);
 +}
 +
 +static void radeon_legacy_tmds_int_mode_set(struct drm_encoder *encoder,
@@ -39800,6 +39913,7 @@
 +
 +struct drm_encoder *radeon_encoder_legacy_tmds_int_add(struct drm_device *dev, int bios_index)
 +{
++	struct drm_radeon_private *dev_priv = dev->dev_private;
 +	struct radeon_encoder *radeon_encoder;
 +	struct drm_encoder *encoder;
 +
@@ -39819,7 +39933,10 @@
 +
 +	drm_encoder_helper_add(encoder, &radeon_legacy_tmds_int_helper_funcs);
 +
-+	radeon_combios_get_tmds_info(radeon_encoder);
++	if (dev_priv->is_atom_bios)
++		radeon_atombios_get_tmds_info(radeon_encoder);
++	else
++		radeon_combios_get_tmds_info(radeon_encoder);
 +
 +	return encoder;
 +}
@@ -39878,16 +39995,20 @@
 +
 +static void radeon_legacy_tmds_ext_prepare(struct drm_encoder *encoder)
 +{
++	struct drm_radeon_private *dev_priv = encoder->dev->dev_private;
 +	// fix me: atom/legacy r4xx
-+	radeon_combios_output_lock(encoder, true);
++	if (!dev_priv->is_atom_bios)
++		radeon_combios_output_lock(encoder, true);
 +	radeon_legacy_tmds_ext_dpms(encoder, DRM_MODE_DPMS_OFF);
 +}
 +
 +static void radeon_legacy_tmds_ext_commit(struct drm_encoder *encoder)
 +{
++	struct drm_radeon_private *dev_priv = encoder->dev->dev_private;
 +	radeon_legacy_tmds_ext_dpms(encoder, DRM_MODE_DPMS_ON);
 +	// fix me: atom/legacy r4xx
-+	radeon_combios_output_lock(encoder, false);
++	if (!dev_priv->is_atom_bios)
++		radeon_combios_output_lock(encoder, false);
 +}
 +
 +static void radeon_legacy_tmds_ext_mode_set(struct drm_encoder *encoder,
@@ -39962,6 +40083,7 @@
 +
 +struct drm_encoder *radeon_encoder_legacy_tmds_ext_add(struct drm_device *dev, int bios_index)
 +{
++	struct drm_radeon_private *dev_priv = dev->dev_private;
 +	struct radeon_encoder *radeon_encoder;
 +	struct drm_encoder *encoder;
 +
@@ -39981,7 +40103,8 @@
 +
 +	drm_encoder_helper_add(encoder, &radeon_legacy_tmds_ext_helper_funcs);
 +
-+	//radeon_combios_get_tmds_info(radeon_encoder);
++	if (!dev_priv->is_atom_bios)
++		radeon_combios_get_ext_tmds_info(radeon_encoder);
 +	return encoder;
 +}
 +
@@ -40334,10 +40457,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
 new file mode 100644
-index 0000000..8236d1c
+index 0000000..ef268a2
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_mode.h
-@@ -0,0 +1,333 @@
+@@ -0,0 +1,337 @@
 +/*
 + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
 + *                VA Linux Systems Inc., Fremont, California.
@@ -40587,6 +40710,7 @@
 +						 struct radeon_i2c_bus_rec *rec,
 +						 const char *name);
 +extern void radeon_i2c_destroy(struct radeon_i2c_chan *i2c);
++extern bool radeon_ddc_probe(struct radeon_connector *radeon_connector);
 +extern int radeon_ddc_get_modes(struct radeon_connector *radeon_connector);
 +extern struct drm_connector *radeon_connector_add(struct drm_device *dev, int bios_index);
 +
@@ -40627,9 +40751,11 @@
 +
 +extern bool radeon_atom_get_clock_info(struct drm_device *dev);
 +extern bool radeon_combios_get_clock_info(struct drm_device *dev);
-+extern void radeon_get_lvds_info(struct radeon_encoder *encoder);
++extern void radeon_atombios_get_lvds_info(struct radeon_encoder *encoder);
++extern void radeon_atombios_get_tmds_info(struct radeon_encoder *encoder);
 +extern bool radeon_combios_get_lvds_info(struct radeon_encoder *encoder);
 +extern bool radeon_combios_get_tmds_info(struct radeon_encoder *encoder);
++extern bool radeon_combios_get_ext_tmds_info(struct radeon_encoder *encoder);
 +extern bool radeon_combios_get_tv_info(struct radeon_encoder *encoder);
 +extern bool radeon_combios_get_tv_dac_info(struct radeon_encoder *encoder);
 +extern bool radeon_combios_get_primary_dac_info(struct radeon_encoder *encoder);
@@ -40670,6 +40796,7 @@
 +void radeon_copy_fb(struct drm_device *dev, struct drm_gem_object *dst_obj);
 +void radeon_combios_asic_init(struct drm_device *dev);
 +extern int radeon_static_clocks_init(struct drm_device *dev);
++
 +#endif
 diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
 new file mode 100644


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.939
retrieving revision 1.940
diff -u -r1.939 -r1.940
--- kernel.spec	9 Sep 2008 01:47:35 -0000	1.939
+++ kernel.spec	9 Sep 2008 06:16:19 -0000	1.940
@@ -607,6 +607,7 @@
 
 # nouveau + drm fixes
 Patch1811: drm-modesetting-radeon.patch
+Patch1812: drm-modesetting-i915.patch
 Patch1813: drm-nouveau.patch
 
 # kludge to make ich9 e1000 work
@@ -1152,6 +1153,7 @@
 
 # Nouveau DRM + drm fixes
 ApplyPatch drm-modesetting-radeon.patch
+ApplyPatch drm-modesetting-i915.patch
 ApplyPatch drm-nouveau.patch
 
 # linux1394 git patches
@@ -1744,6 +1746,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Sep 09 2008 Dave Airlie <airlied at redhat.com>
+- radeon - update modesetting bits - should fix r400
+- add i915 modesetting bits - don't enable these by default yet
+
 * Mon Sep 08 2008 Dave Jones <davej at redhat.com>
 - 2.6.27-rc5-git10
 



From cweyl at fedoraproject.org  Tue Sep  9 06:19:54 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  9 Sep 2008 06:19:54 +0000 (UTC)
Subject: rpms/perl-Locale-SubCountry/F-9 perl-Locale-SubCountry.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20080909061954.B7B027012A@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Locale-SubCountry/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6379

Modified Files:
	perl-Locale-SubCountry.spec sources 
Log Message:
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.41-1
- update to 1.41
- chmod -x everything



Index: perl-Locale-SubCountry.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-SubCountry/F-9/perl-Locale-SubCountry.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Locale-SubCountry.spec	4 Mar 2008 19:26:03 -0000	1.5
+++ perl-Locale-SubCountry.spec	9 Sep 2008 06:19:24 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Locale-SubCountry
-Version:        1.38 
-Release:        2%{?dist}
+Version:        1.41
+Release:        1%{?dist}
 Summary:        ISO 3166-2 two letter subcountry codes
 
 Group:          Development/Libraries
@@ -25,17 +25,18 @@
 %prep
 %setup -q -n Locale-SubCountry-%{version}
 
-chmod -x examples/*
+find . -type f -exec chmod -c -x {} +
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 # make sure the man page is UTF-8...
-cd blib/man3
-iconv --from=ISO-8859-1 --to=UTF-8 Locale::SubCountry.3pm > new
-mv new Locale::SubCountry.3pm
-
+#cd blib/man3
+for i in Changes blib/man3/Locale::SubCountry.3pm ; do
+    iconv --from=ISO-8859-1 --to=UTF-8 $i > new
+    mv new $i
+done
 
 %install
 rm -rf %{buildroot}
@@ -63,6 +64,10 @@
 
 
 %changelog
+* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.41-1
+- update to 1.41
+- chmod -x everything
+
 * Tue Mar 04 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.38-2
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-SubCountry/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Dec 2006 16:20:54 -0000	1.3
+++ sources	9 Sep 2008 06:19:24 -0000	1.4
@@ -1 +1 @@
-fdd8540e52af7a17d1a72a04eee4d148  Locale-SubCountry-1.38.tar.gz
+44f6b0cc4b1ad5db591e45d1395d2d7f  Locale-SubCountry-1.41.tar.gz



From cweyl at fedoraproject.org  Tue Sep  9 06:20:10 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  9 Sep 2008 06:20:10 +0000 (UTC)
Subject: rpms/perl-Locale-SubCountry/F-8 perl-Locale-SubCountry.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20080909062010.E87977012A@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Locale-SubCountry/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6429

Modified Files:
	perl-Locale-SubCountry.spec sources 
Log Message:
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.41-1
- update to 1.41
- chmod -x everything



Index: perl-Locale-SubCountry.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-SubCountry/F-8/perl-Locale-SubCountry.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Locale-SubCountry.spec	5 Dec 2006 16:20:54 -0000	1.4
+++ perl-Locale-SubCountry.spec	9 Sep 2008 06:19:40 -0000	1.5
@@ -1,16 +1,15 @@
 Name:           perl-Locale-SubCountry
-Version:        1.38 
+Version:        1.41
 Release:        1%{?dist}
 Summary:        ISO 3166-2 two letter subcountry codes
 
 Group:          Development/Libraries
-License:        Artistic or GPL
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Locale-SubCountry
 Source0: http://search.cpan.org/CPAN/authors/id/K/KI/KIMRYAN/Locale-SubCountry-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch 
-BuildRequires:  perl
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -26,17 +25,18 @@
 %prep
 %setup -q -n Locale-SubCountry-%{version}
 
-chmod -x examples/*
+find . -type f -exec chmod -c -x {} +
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 # make sure the man page is UTF-8...
-cd blib/man3
-iconv --from=ISO-8859-1 --to=UTF-8 Locale::SubCountry.3pm > new
-mv new Locale::SubCountry.3pm
-
+#cd blib/man3
+for i in Changes blib/man3/Locale::SubCountry.3pm ; do
+    iconv --from=ISO-8859-1 --to=UTF-8 $i > new
+    mv new $i
+done
 
 %install
 rm -rf %{buildroot}
@@ -64,6 +64,13 @@
 
 
 %changelog
+* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.41-1
+- update to 1.41
+- chmod -x everything
+
+* Tue Mar 04 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.38-2
+- rebuild for new perl
+
 * Tue Dec 05 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.38-1
 - update to 1.38
 - minor specfile tweaks


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-SubCountry/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Dec 2006 16:20:54 -0000	1.3
+++ sources	9 Sep 2008 06:19:40 -0000	1.4
@@ -1 +1 @@
-fdd8540e52af7a17d1a72a04eee4d148  Locale-SubCountry-1.38.tar.gz
+44f6b0cc4b1ad5db591e45d1395d2d7f  Locale-SubCountry-1.41.tar.gz



From airlied at fedoraproject.org  Tue Sep  9 06:25:07 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  9 Sep 2008 06:25:07 +0000 (UTC)
Subject: rpms/kernel/devel .cvsignore,1.918,1.919 sources,1.881,1.882
Message-ID: <20080909062507.B2C117012C@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6863

Modified Files:
	.cvsignore sources 
Log Message:
fix davejs upload



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.918
retrieving revision 1.919
diff -u -r1.918 -r1.919
--- .cvsignore	9 Sep 2008 01:47:35 -0000	1.918
+++ .cvsignore	9 Sep 2008 06:24:37 -0000	1.919
@@ -1,8 +1,3 @@
-clog
-GNUmakefile
-kernel-2.6.*.config
-temp-*
-kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc5.bz2
 patch-2.6.27-rc5-git10.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.881
retrieving revision 1.882
diff -u -r1.881 -r1.882
--- sources	9 Sep 2008 01:47:35 -0000	1.881
+++ sources	9 Sep 2008 06:24:37 -0000	1.882
@@ -1,2 +1,3 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 d91adda8bcf04852048b8eab06eeae3d  patch-2.6.27-rc5.bz2
+a0ca52aef12c4c9f179017e39b8e918d  patch-2.6.27-rc5-git10.bz2



From pkgdb at fedoraproject.org  Tue Sep  9 06:26:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:26:30 +0000
Subject: [pkgdb] opencv ownership updated
Message-ID: <20080909062630.81AC9208D0F@bastion.fedora.phx.redhat.com>

Package opencv in Fedora devel is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:26:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:26:57 +0000
Subject: [pkgdb] opencv ownership updated
Message-ID: <20080909062657.87F16208771@bastion.fedora.phx.redhat.com>

Package opencv in Fedora 7 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:27:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:27:00 +0000
Subject: [pkgdb] opencv ownership updated
Message-ID: <20080909062700.DE38C208D7C@bastion.fedora.phx.redhat.com>

Package opencv in Fedora 4 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:27:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:27:20 +0000
Subject: [pkgdb] opencv: corsepiu has requested watchbugzilla
Message-ID: <20080909062721.17DB920876F@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchbugzilla acl on opencv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:27:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:27:25 +0000
Subject: [pkgdb] opencv: corsepiu has requested watchcommits
Message-ID: <20080909062725.C8B4A208D7C@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchcommits acl on opencv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:27:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:27:39 +0000
Subject: [pkgdb] opencv ownership updated
Message-ID: <20080909062739.41D68208D97@bastion.fedora.phx.redhat.com>

Package opencv in Fedora 5 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:27:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:27:44 +0000
Subject: [pkgdb] opencv ownership updated
Message-ID: <20080909062744.834EE208D7C@bastion.fedora.phx.redhat.com>

Package opencv in Fedora 6 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:27:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:27:56 +0000
Subject: [pkgdb] opencv: corsepiu has requested watchbugzilla
Message-ID: <20080909062757.1F73820876F@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchbugzilla acl on opencv (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:27:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:27:59 +0000
Subject: [pkgdb] opencv: corsepiu has requested watchcommits
Message-ID: <20080909062759.60E8D208D97@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchcommits acl on opencv (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:28:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:28:12 +0000
Subject: [pkgdb] opencv: corsepiu has requested watchbugzilla
Message-ID: <20080909062812.5097B208D1E@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchbugzilla acl on opencv (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:28:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:28:14 +0000
Subject: [pkgdb] opencv: corsepiu has requested watchcommits
Message-ID: <20080909062814.5E92A208D7C@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchcommits acl on opencv (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:29:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:29:27 +0000
Subject: [pkgdb] opencv had acl change status
Message-ID: <20080909062927.23E6E20876F@bastion.fedora.phx.redhat.com>

corsepiu has set the watchbugzilla acl on opencv (Fedora 8) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:29:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:29:30 +0000
Subject: [pkgdb] opencv had acl change status
Message-ID: <20080909062930.146A2208D0F@bastion.fedora.phx.redhat.com>

corsepiu has set the watchcommits acl on opencv (Fedora 8) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:29:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:29:34 +0000
Subject: [pkgdb] opencv ownership updated
Message-ID: <20080909062935.483D5208D97@bastion.fedora.phx.redhat.com>

Package opencv in Fedora 8 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:29:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:29:43 +0000
Subject: [pkgdb] opencv had acl change status
Message-ID: <20080909062943.EC872208D99@bastion.fedora.phx.redhat.com>

corsepiu has set the watchcommits acl on opencv (Fedora 9) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:29:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:29:40 +0000
Subject: [pkgdb] opencv had acl change status
Message-ID: <20080909062940.CC8C520876F@bastion.fedora.phx.redhat.com>

corsepiu has set the watchbugzilla acl on opencv (Fedora 9) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:29:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:29:49 +0000
Subject: [pkgdb] opencv ownership updated
Message-ID: <20080909062949.5C774208D9C@bastion.fedora.phx.redhat.com>

Package opencv in Fedora 9 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:31:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:31:21 +0000
Subject: [pkgdb] opencv had acl change status
Message-ID: <20080909063121.DDB66208771@bastion.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on opencv (Fedora devel) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:31:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:31:23 +0000
Subject: [pkgdb] opencv had acl change status
Message-ID: <20080909063124.2D6EF208D7C@bastion.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on opencv (Fedora devel) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:31:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:31:35 +0000
Subject: [pkgdb] opencv ownership updated
Message-ID: <20080909063135.B8F31208D98@bastion.fedora.phx.redhat.com>

Package opencv in Fedora 9 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Tue Sep  9 06:31:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:31:40 +0000
Subject: [pkgdb] opencv ownership updated
Message-ID: <20080909063140.F39F5208D9C@bastion.fedora.phx.redhat.com>

Package opencv in Fedora 8 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From transif at fedoraproject.org  Tue Sep  9 06:32:02 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Tue,  9 Sep 2008 06:32:02 +0000 (UTC)
Subject: comps/po ru.po,1.15,1.16
Message-ID: <20080909063202.8B5637012A@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7752/po

Modified Files:
	ru.po 
Log Message:
    2008-09-09  Yulia Poyarkova <ypoyarko at redhat.com> (via
ypoyarko at fedoraproject.org)
    
      * po/ru.po: Russian translation updated.
    



Index: ru.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ru.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ru.po	17 Jul 2008 18:31:24 -0000	1.15
+++ ru.po	9 Sep 2008 06:31:32 -0000	1.16
@@ -1,25 +1,26 @@
 # translation of comps.HEAD.ru.po to
+# This file is distributed under the same license as the comps package.
+# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER.
+#
+#
 # Leonid Kanter <leon at geon.donetsk.ua>, 2003.
 # Leonid Kanter <leon at asplinux.ru>, 2004, 2006.
 # Dmitri Alenitchev <alenitchev at nm.ru>, 2005.
 # Andrew Martynov <andrewm at inventa.ru>, 2004, 2005, 2006.
 # Yulia Poyarkova <ypoyarko at redhat.com>, 2006.
 # Yulia Poyarkova <yulia.poyarkova at redhat.com>, 2008.
-# This file is distributed under the same license as the comps package.
-# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER.
-#
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-17 14:29-0400\n"
-"PO-Revision-Date: 2008-05-05 11:55+0300\n"
+"POT-Creation-Date: 2008-09-09 03:30+0000\n"
+"PO-Revision-Date: 2008-09-09 16:30+1000\n"
 "Last-Translator: Yulia Poyarkova <yulia.poyarkova at redhat.com>\n"
-"Language-Team:  <ru at li.org>\n"
+"Language-Team: \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
@@ -385,16 +386,14 @@
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
-msgstr ""
-"???????????????????? ?????? ???????????? ?????? ???????????????????? ?????????????????????? ???????????????????? GTK+ ?? GNOME."
+msgstr "???????????????????? ?????? ???????????? ?????? ???????????????????? ?????????????????????? ???????????????????? GTK+ ?? GNOME."
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
 #: ../comps-f10.xml.in.h:79
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
-msgstr ""
-"???????????????????? ?????? ???????????? ?????? ???????????????????? ?????????????????????? ???????????????????? GTK+ ?? XFCE."
+msgstr "???????????????????? ?????? ???????????? ?????? ???????????????????? ?????????????????????? ???????????????????? GTK+ ?? XFCE."
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
 #: ../comps-f10.xml.in.h:80 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
@@ -403,16 +402,14 @@
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:81
-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:82 ../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)"
@@ -547,146 +544,144 @@
 msgstr "???????? ???????????? MySQL"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:112
-#: ../comps-f10.xml.in.h:115 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
+#: ../comps-f10.xml.in.h:116 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "?????????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:116 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
+#: ../comps-f10.xml.in.h:117 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "???????????? ????????????????"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:115
-#: ../comps-f10.xml.in.h:118
+#: ../comps-f10.xml.in.h:119
 msgid "Northern Sotho Support"
 msgstr "?????????????????? ?????????????????? ????????"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:119
+#: ../comps-f10.xml.in.h:120
 msgid "Norwegian Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:120 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
+#: ../comps-f10.xml.in.h:121 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "?????????????? ????????????????????"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:119
-#: ../comps-f10.xml.in.h:122
+#: ../comps-f10.xml.in.h:123
 msgid "Oriya Support"
 msgstr "?????????????????? ?????????? ??????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:123 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
+#: ../comps-f10.xml.in.h:124 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
 msgstr "????????????, ?????????????????????????????? ?????????????????????? ???????????????????? ?? ???????????? ????????????????????."
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:124
+#: ../comps-f10.xml.in.h:125
 msgid "Persian Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:125
+#: ../comps-f10.xml.in.h:126
 msgid "Polish Support"
 msgstr "?????????????????? ?????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:126
+#: ../comps-f10.xml.in.h:127
 msgid "Portuguese Support"
 msgstr "?????????????????? ???????????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:127
+#: ../comps-f10.xml.in.h:128
 msgid "PostgreSQL Database"
 msgstr "???????? ???????????? PostgreSQL"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:128
+#: ../comps-f10.xml.in.h:129
 msgid "Printing Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:129
+#: ../comps-f10.xml.in.h:130
 msgid "Punjabi Support"
 msgstr "?????????????????? ?????????? ????????????????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:130
+#: ../comps-f10.xml.in.h:131
 msgid "Romanian Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:131
+#: ../comps-f10.xml.in.h:132
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:132
+#: ../comps-f10.xml.in.h:133
 msgid "Russian Support"
 msgstr "?????????????????? ???????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:132
-#: ../comps-f10.xml.in.h:135
+#: ../comps-f10.xml.in.h:136
 msgid "Samoan Support"
 msgstr "?????????????????? ?????????? ??????????"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:136
+#: ../comps-f10.xml.in.h:137
 msgid "Serbian Support"
 msgstr "?????????????????? ?????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:137
+#: ../comps-f10.xml.in.h:138
 msgid "Server Configuration Tools"
 msgstr "???????????????? ?????????????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:138 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
+#: ../comps-f10.xml.in.h:139 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "??????????????"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:139 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
-msgstr ""
-"?????????????? ?????????????? ??????????????????, ???? ???????????????????? ???????????? ????????????-???????? ???????????????? ??????????."
+#: ../comps-f10.xml.in.h:140 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
+msgid "Simple window managers that aren't part of a larger desktop environment."
+msgstr "?????????????? ?????????????? ??????????????????, ???? ???????????????????? ???????????? ????????????-???????? ???????????????? ??????????."
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:140
+#: ../comps-f10.xml.in.h:141
 msgid "Sinhala Support"
 msgstr "?????????????????? ?????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:141
+#: ../comps-f10.xml.in.h:142
 msgid "Slovak Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:142
+#: ../comps-f10.xml.in.h:143
 msgid "Slovenian Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:143
+#: ../comps-f10.xml.in.h:144
 msgid "Smallest possible installation"
 msgstr "???????????????????? ?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:144 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
+#: ../comps-f10.xml.in.h:145 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "??????????????????, ???????????????????????? ?????? ?????????????? ?????????????? ????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:145
+#: ../comps-f10.xml.in.h:146
 msgid "Somali Support"
 msgstr "?????????????????? ?????????? ????????????"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:146
+#: ../comps-f10.xml.in.h:147
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -695,72 +690,72 @@
 "?????????????????????????? ????????????. ???????????????? Emacs ?? Vi."
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:147 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
+#: ../comps-f10.xml.in.h:148 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "???????? ?? ??????????"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:148
+#: ../comps-f10.xml.in.h:149
 msgid "Southern Ndebele Support"
 msgstr "?????????????????? ???????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:149
+#: ../comps-f10.xml.in.h:150
 msgid "Southern Sotho Support"
 msgstr "?????????????????? ???????????? ????????"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:150
+#: ../comps-f10.xml.in.h:151
 msgid "Spanish Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:151 ../comps-el4.xml.in.h:46
+#: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "?????????????????? ???????????????????? ???????????????? ???? ?????????? ???????????????????????????????? Java."
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:47
+#: ../comps-f10.xml.in.h:153 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "?????????????????? ?????????????? ????????????????, ???????????????????? ???? ?????????? ???????????????????????????????? Java."
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:153
+#: ../comps-f10.xml.in.h:154
 msgid "Swati Support"
 msgstr "?????????????????? ?????????? ??????????"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:154
+#: ../comps-f10.xml.in.h:155
 msgid "Swedish Support"
 msgstr "?????????????????? ?????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:155 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
+#: ../comps-f10.xml.in.h:156 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "?????????????????? ????????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:156
+#: ../comps-f10.xml.in.h:157
 msgid "Tagalog Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:158
+#: ../comps-f10.xml.in.h:159
 msgid "Tamil Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:159
+#: ../comps-f10.xml.in.h:160
 msgid "Telugu Support"
 msgstr "?????????????????? ?????????? ????????????"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:160 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
+#: ../comps-f10.xml.in.h:161 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "?????????????????? ???????????????? ????????????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:161
+#: ../comps-f10.xml.in.h:162
 msgid "Thai Support"
 msgstr "?????????????????? ???????????????? ??????????"
 
@@ -769,62 +764,56 @@
 msgstr "?????????????????????????????? ?????????? ???????????????????? Eclipse."
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:162 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
+#: ../comps-f10.xml.in.h:163 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr ""
 "?????? ???????????? ???????????????? ?? ???????? ?????????????? ????????????????????: ?????????????????? ????????????, ?????????????????? "
 "?????? ?????????????????? PDF ????????????, ?? ????????."
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:163
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+#: ../comps-f10.xml.in.h:164
+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:160
-#: ../comps-f10.xml.in.h:164 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
+#: ../comps-f10.xml.in.h:165 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "?????? ???????????? ?????????????????? ?????????????????? ???????????????? ???????????? IMAP ?????? SMTP."
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:165
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+#: ../comps-f10.xml.in.h:166
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr "?????? ???????????? ?????????????????? ?????????????????????????? ???????????????????? ?????? X Window System."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:166 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+#: ../comps-f10.xml.in.h:167 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr "?????? ???????????? ?????????????????? ?????????????????????????? ?????? ???????????????????? ?????? ?????? ????????????????."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:167
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
-msgstr ""
-"?????? ???????????? ???????????????? ?? ???????? ?????????? ?????????????? ??????????????, ?????? DHCP, Kerberos ?? NIS."
+#: ../comps-f10.xml.in.h:168
+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:164
-#: ../comps-f10.xml.in.h:168
+#: ../comps-f10.xml.in.h:169
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
-msgstr ""
-"?????? ???????????? ???????????????? ?????????????? ?????????? ???????????????????? ????????????????????, ?????? rsh ?? telnet."
+msgstr "?????? ???????????? ???????????????? ?????????????? ?????????? ???????????????????? ????????????????????, ?????? rsh ?? telnet."
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:169
+#: ../comps-f10.xml.in.h:170
 msgid "These packages provide a virtualization environment."
 msgstr "?????? ???????????? ???????????????????????? ?????????????????? ??????????????????????????."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:170
+#: ../comps-f10.xml.in.h:171
 msgid "These packages provide compatibility with previous releases."
 msgstr "?????? ???????????? ???????????????????????? ?????????????????????????? ?? ?????????????????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:171
+#: ../comps-f10.xml.in.h:172
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -833,7 +822,7 @@
 "???????????? ?? ?????????? ??????????."
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:172
+#: ../comps-f10.xml.in.h:173
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -842,17 +831,17 @@
 "?????????????????????????????? ?? HTML, PDF, Postscript ?? ??????????."
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:173 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
+#: ../comps-f10.xml.in.h:174 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "?????? ???????????????? ?????????????????? ???????????????????????? ?????????????? ?????? ??????-????????????"
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:174 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
+#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "?????? ???????????????? ?????????????????? ???????????????????????? ?????????????? ?????? ???????????? FTP."
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
+#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -861,19 +850,19 @@
 "perl, python ?? ??????????????????."
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
+#: ../comps-f10.xml.in.h:177 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "?????? ???????????? ?????????????????? ???????????????????????? ?????????????? ?????? ???????????? ????????????????."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:177
+#: ../comps-f10.xml.in.h:178
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr ""
 "?????? ???????????? ???????????????? ?? ???????? ?????? ???????????????? ?????????????????????????????????? ??????????????, "
 "???????????????????? ?? Red Hat."
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:178
+#: ../comps-f10.xml.in.h:179
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -882,12 +871,12 @@
 "???????????????? ?????????????????? ??????????????????????????????/?????????????? ??????????????."
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
+#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "?????? ???????????? ???????????????? ?????????????????????? ?????????????? ?????????????????????? ??????????, ?????? ?? ????????."
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
+#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -896,13 +885,12 @@
 "???????????????????? ?? ????????????????????????????."
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
+#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
-msgstr ""
-"?????? ???????????? ???????????????? ???????????????????? ?????????????????????? ?????? ???????????? ?? ???????????????? ?? ??????????????????."
+msgstr "?????? ???????????? ???????????????? ???????????????????? ?????????????????????? ?????? ???????????? ?? ???????????????? ?? ??????????????????."
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
+#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -912,7 +900,7 @@
 "Window System"
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
+#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -922,21 +910,19 @@
 "???????????????????? ????????????, ?? ????????."
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:184 ../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."
+#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "?????? ???????????? ???????????????? ?????????? ???????????? ?? ???????????????? ?????? ?????????????????? ??????????????????????."
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:185 ../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."
+#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
+msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr ""
 "?????? ???????????? ???????????????? ?????????? ???????????????????????? ?????? ?????????????????? ???????????? ???????????? ?? "
 "??????????????????????????."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
+#: ../comps-f10.xml.in.h:187 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
 "client for connecting to SMB shares and tools to monitor network traffic."
@@ -945,13 +931,12 @@
 "?????????????? ?? SMB ????????????????, ?? ?????????????????? ?????? ?????????????????????? ???????????????? ??????????????."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:187
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+#: ../comps-f10.xml.in.h:188
+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:184
-#: ../comps-f10.xml.in.h:188
+#: ../comps-f10.xml.in.h:189
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -960,132 +945,132 @@
 "MS Windows(tm)."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:189
+#: ../comps-f10.xml.in.h:190
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "?????? ???????????? ???????????????? ????????????, ???????????????? ?????? ?????????????????????????? ?? MySQL."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:190
+#: ../comps-f10.xml.in.h:191
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "?????? ???????????? ???????????????? ????????????, ???????????????? ?????? ?????????????????????????? ?? Postgresql."
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:191
+#: ../comps-f10.xml.in.h:192
 msgid "Tibetan Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:192
+#: ../comps-f10.xml.in.h:193
 msgid "Tonga Support"
 msgstr "?????????????????? ?????????? ??????????"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:193 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
+#: ../comps-f10.xml.in.h:194 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "?????????????????????? ?? ??????????????, ?????????????????????? ???????????????????? Fedora"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:194
+#: ../comps-f10.xml.in.h:195
 msgid "Tsonga Support"
 msgstr "?????????????????? ?????????? ????????????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:195
+#: ../comps-f10.xml.in.h:196
 msgid "Tswana Support"
 msgstr "?????????????????? ?????????? ????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:196
+#: ../comps-f10.xml.in.h:197
 msgid "Turkish Support"
 msgstr "?????????????????? ?????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:197
+#: ../comps-f10.xml.in.h:198
 msgid "Ukrainian Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:198
+#: ../comps-f10.xml.in.h:199
 msgid "Urdu Support"
 msgstr "?????????????????? ?????????? ????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:199 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
+#: ../comps-f10.xml.in.h:200 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "?????????????????? ???????????????? ???????????????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:200 ../comps-el5.xml.in.h:72
+#: ../comps-f10.xml.in.h:201 ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "?????????????????? ?????????????? ???????????????????????? ?? ???????????????? ?????????????????? ??????????."
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:201
+#: ../comps-f10.xml.in.h:202
 msgid "Venda Support"
 msgstr "?????????????????? ?????????? ??????????"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:202
+#: ../comps-f10.xml.in.h:203
 msgid "Vietnamese Support"
 msgstr "?????????????????? ???????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:203
+#: ../comps-f10.xml.in.h:204
 msgid "Virtualization"
 msgstr "??????????????????????????"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:201
-#: ../comps-f10.xml.in.h:205 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
+#: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "?????? ????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
+#: ../comps-f10.xml.in.h:207 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "??????-????????????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:207
+#: ../comps-f10.xml.in.h:208
 msgid "Welsh Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:208 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
+#: ../comps-f10.xml.in.h:209 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "?????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:209
+#: ../comps-f10.xml.in.h:210
 msgid "Windows File Server"
 msgstr "???????????????? ???????????? ?????? Windows"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:210
+#: ../comps-f10.xml.in.h:211
 msgid "X Software Development"
 msgstr "???????????????????? ???? ?????? X"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:211 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
+#: ../comps-f10.xml.in.h:212 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "?????????????? X Window"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:212
+#: ../comps-f10.xml.in.h:213
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:213
+#: ../comps-f10.xml.in.h:214
 msgid "XFCE Software Development"
 msgstr "???????????????????? ???? ?????? XFCE"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:214
+#: ../comps-f10.xml.in.h:215
 msgid "Xhosa Support"
 msgstr "?????????????????? ?????????? ????????"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:215
+#: ../comps-f10.xml.in.h:216
 msgid "Zulu Support"
 msgstr "?????????????????? ?????????? ????????"
 
@@ -1121,11 +1106,11 @@
 msgid "Mongolian Support"
 msgstr "?????????????????? ???????????????????????? ??????????"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:114
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:115
 msgid "Nepali Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:121
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:122
 msgid "Older bitmap and vector fonts packages"
 msgstr "?????????? ???????????? ???????????? ?? ???????????????????? ?? ???????????????????? ????????????????"
 
@@ -1141,39 +1126,41 @@
 msgid "Macedonian Support"
 msgstr "?????????????????? ???????????????????????? ??????????"
 
-#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:117
+#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:118
 msgid "Northern Sami Support"
 msgstr "?????????????????? ????????????-???????????????????? ??????????"
 
-#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:133
-#, fuzzy
+#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:134
 msgid "SUGAR Desktop Environment"
-msgstr "?????????????????????? ??????????"
+msgstr "?????????????????? ???????????????? ?????????? SUGAR"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:134
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:135
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
-msgstr ""
+msgstr "SUGAR ???????????????????????? ?????????? ?????????????????? ???????????????? ??????????, ?????????????????????????? ???????????????????? ?????? OLPC XO."
 
-#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:204
+#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:205
 msgid "Walloon Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f10.xml.in.h:70
 msgid "Haskell"
-msgstr ""
+msgstr "Haskell"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
-msgstr ""
+msgstr "???????????? ??????????"
 
 #: ../comps-f10.xml.in.h:77
 msgid "Input method packages for the input of international text."
-msgstr ""
+msgstr "???????????? ?????? ?????????? ???????????? ???? ?????????????????? ????????????."
 
-#: ../comps-f10.xml.in.h:157
-#, fuzzy
+#: ../comps-f10.xml.in.h:114
+msgid "Myanmar (Burmese) Support"
+msgstr "?????????????????? ?????????????????????? ??????????"
+
+#: ../comps-f10.xml.in.h:158
 msgid "Tajik Support"
-msgstr "?????????????????? ???????????????? ??????????"
+msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1224,20 +1211,17 @@
 msgstr "?????? ???????????? ???????????????? ?????????? ?????????????? ????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????? ???????????? ???????????????? ?????????? ???????????? ?? ???????????????? ?????? ???????????????? ??????????????????????."
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr ""
 "?????? ???????????? ???????????????? ?????????? ???????????? ?? ???????????????? ?????? ??????????????????, ???????????????????????? "
 "??????????."
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????? ???????????? ???????????????? ?????????? ???????????? ?? ???????????????? ?????? ???????????????? ??????????????????????."
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1245,6 +1229,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "?????? ???????????? ???????????????? ?????????? ???????????? ?? ???????????????? ?????? ?????????????? ??????????????????????."
+



From pkgdb at fedoraproject.org  Tue Sep  9 06:35:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:35:50 +0000
Subject: [pkgdb] childsplay ownership updated
Message-ID: <20080909063550.C812820876F@bastion.fedora.phx.redhat.com>

Package childsplay in Fedora devel is now owned by trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay



From pkgdb at fedoraproject.org  Tue Sep  9 06:35:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:35:58 +0000
Subject: [pkgdb] childsplay ownership updated
Message-ID: <20080909063558.A9FB2208D0F@bastion.fedora.phx.redhat.com>

Package childsplay in Fedora 8 is now owned by trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay



From pkgdb at fedoraproject.org  Tue Sep  9 06:36:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:36:02 +0000
Subject: [pkgdb] childsplay ownership updated
Message-ID: <20080909063602.4D9E020876D@bastion.fedora.phx.redhat.com>

Package childsplay in Fedora 9 is now owned by trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay



From pkgdb at fedoraproject.org  Tue Sep  9 06:36:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:36:11 +0000
Subject: [pkgdb] childsplay_plugins ownership updated
Message-ID: <20080909063611.8F0D0208D97@bastion.fedora.phx.redhat.com>

Package childsplay_plugins in Fedora devel is now owned by trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay_plugins



From pkgdb at fedoraproject.org  Tue Sep  9 06:36:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:36:18 +0000
Subject: [pkgdb] childsplay_plugins ownership updated
Message-ID: <20080909063618.D24D220876D@bastion.fedora.phx.redhat.com>

Package childsplay_plugins in Fedora 8 is now owned by trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay_plugins



From pkgdb at fedoraproject.org  Tue Sep  9 06:36:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:36:20 +0000
Subject: [pkgdb] childsplay_plugins ownership updated
Message-ID: <20080909063621.130EC208D1E@bastion.fedora.phx.redhat.com>

Package childsplay_plugins in Fedora 9 is now owned by trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay_plugins



From pkgdb at fedoraproject.org  Tue Sep  9 06:11:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:11:43 +0000
Subject: [pkgdb] freeimage ownership updated
Message-ID: <20080909061143.5850C208D98@bastion.fedora.phx.redhat.com>

Package freeimage in Fedora 9 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freeimage



From pkgdb at fedoraproject.org  Tue Sep  9 06:37:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:37:39 +0000
Subject: [pkgdb] postr: timlau has requested watchbugzilla
Message-ID: <20080909063740.0AFBF208771@bastion.fedora.phx.redhat.com>

timlau has requested the watchbugzilla acl on postr (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From pkgdb at fedoraproject.org  Tue Sep  9 06:37:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:37:43 +0000
Subject: [pkgdb] postr: timlau has requested commit
Message-ID: <20080909063743.93572208D99@bastion.fedora.phx.redhat.com>

timlau has requested the commit acl on postr (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From pkgdb at fedoraproject.org  Tue Sep  9 06:37:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:37:45 +0000
Subject: [pkgdb] postr: timlau has requested watchcommits
Message-ID: <20080909063745.DFE34208D9C@bastion.fedora.phx.redhat.com>

timlau has requested the watchcommits acl on postr (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From pkgdb at fedoraproject.org  Tue Sep  9 06:37:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:37:48 +0000
Subject: [pkgdb] postr: timlau has requested approveacls
Message-ID: <20080909063748.871B5208DA0@bastion.fedora.phx.redhat.com>

timlau has requested the approveacls acl on postr (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From cweyl at fedoraproject.org  Tue Sep  9 06:42:29 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  9 Sep 2008 06:42:29 +0000 (UTC)
Subject: rpms/perl-CGI-Ajax/F-9 perl-CGI-Ajax.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <20080909064229.3598E7012A@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CGI-Ajax/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8351

Modified Files:
	perl-CGI-Ajax.spec sources 
Log Message:
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.706-1
- update to 0.706



Index: perl-CGI-Ajax.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Ajax/F-9/perl-CGI-Ajax.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-CGI-Ajax.spec	7 Mar 2008 01:55:09 -0000	1.4
+++ perl-CGI-Ajax.spec	9 Sep 2008 06:41:58 -0000	1.5
@@ -1,11 +1,11 @@
 Name:           perl-CGI-Ajax
-Version:        0.701
-Release:        4%{?dist}
+Version:        0.706
+Release:        1%{?dist}
 Summary:        Perl-specific system for writing Asynchronous web applications
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/CGI-Ajax/
-Source0:        http://www.cpan.org/authors/id/B/BC/BCT/CGI-Ajax-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/B/BP/BPEDERSE/CGI-Ajax-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -56,8 +56,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.706-1
+- update to 0.706
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.701-4
-Rebuild for new perl
+- Rebuild for new perl
 
 * Tue Jan 08 2008 Ralf Cors??pius <rc040203 at freenet.de> 0.701-3
 - Update License-tag.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Ajax/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Apr 2007 16:01:48 -0000	1.2
+++ sources	9 Sep 2008 06:41:58 -0000	1.3
@@ -1 +1 @@
-e4922d9ea9e45c68387d3682a7adbacf  CGI-Ajax-0.701.tar.gz
+373485d25827a13b5328159f02fce199  CGI-Ajax-0.706.tar.gz



From cweyl at fedoraproject.org  Tue Sep  9 06:42:58 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  9 Sep 2008 06:42:58 +0000 (UTC)
Subject: rpms/perl-CGI-Ajax/F-8 perl-CGI-Ajax.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20080909064258.D56B87012A@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CGI-Ajax/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8451

Modified Files:
	perl-CGI-Ajax.spec sources 
Log Message:
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.706-1
- update to 0.706



Index: perl-CGI-Ajax.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Ajax/F-8/perl-CGI-Ajax.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-CGI-Ajax.spec	8 Jan 2008 17:52:40 -0000	1.3
+++ perl-CGI-Ajax.spec	9 Sep 2008 06:42:28 -0000	1.4
@@ -1,11 +1,11 @@
 Name:           perl-CGI-Ajax
-Version:        0.701
-Release:        3%{?dist}
+Version:        0.706
+Release:        1%{?dist}
 Summary:        Perl-specific system for writing Asynchronous web applications
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/CGI-Ajax/
-Source0:        http://www.cpan.org/authors/id/B/BC/BCT/CGI-Ajax-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/B/BP/BPEDERSE/CGI-Ajax-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -56,6 +56,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.706-1
+- update to 0.706
+
+* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.701-4
+- Rebuild for new perl
+
 * Tue Jan 08 2008 Ralf Cors??pius <rc040203 at freenet.de> 0.701-3
 - Update License-tag.
 - BR: perl(Test::More) (BZ 419631).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Ajax/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Apr 2007 16:01:48 -0000	1.2
+++ sources	9 Sep 2008 06:42:28 -0000	1.3
@@ -1 +1 @@
-e4922d9ea9e45c68387d3682a7adbacf  CGI-Ajax-0.701.tar.gz
+373485d25827a13b5328159f02fce199  CGI-Ajax-0.706.tar.gz



From airlied at fedoraproject.org  Tue Sep  9 06:44:46 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  9 Sep 2008 06:44:46 +0000 (UTC)
Subject: rpms/libdrm/devel libdrm-gtt-map-support-3.patch, NONE,
	1.1 libdrm.spec, 1.48, 1.49
Message-ID: <20080909064446.CA4E67012A@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8725

Modified Files:
	libdrm.spec 
Added Files:
	libdrm-gtt-map-support-3.patch 
Log Message:
* Tue Sep 09 2008 Dave Airlie <airlied at redhat.com> 2.4.0-0.20
- add gtt mapping for intel modesetting


libdrm-gtt-map-support-3.patch:

--- NEW FILE libdrm-gtt-map-support-3.patch ---
diff --git a/libdrm/intel/intel_bufmgr.h b/libdrm/intel/intel_bufmgr.h
index 4d33521..59def00 100644
--- a/libdrm/intel/intel_bufmgr.h
+++ b/libdrm/intel/intel_bufmgr.h
@@ -126,5 +126,7 @@ int intel_bo_set_tiling(dri_bo *buf, uint32_t *tiling_mode);
 
 int intel_bo_flink(dri_bo *buf, uint32_t *name);
 
+int dri_gem_bo_map_gtt(dri_bo *bo);
+
 #endif /* INTEL_BUFMGR_GEM_H */
 
diff --git a/libdrm/intel/intel_bufmgr_gem.c b/libdrm/intel/intel_bufmgr_gem.c
index af20efb..ba49b24 100644
--- a/libdrm/intel/intel_bufmgr_gem.c
+++ b/libdrm/intel/intel_bufmgr_gem.c
@@ -35,6 +35,7 @@
  */
 
 #include <xf86drm.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -42,6 +43,8 @@
 #include <assert.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include "errno.h"
 #include "dri_bufmgr.h"
@@ -370,6 +373,7 @@ intel_bo_gem_create_from_name(dri_bufmgr *bufmgr, const char *name,
     bo_gem->refcount = 1;
     bo_gem->validate_index = -1;
     bo_gem->gem_handle = open_arg.handle;
+    bo_gem->bo.handle = bo_gem->gem_handle;
 
     DBG("bo_create_from_handle: %d (%s)\n", handle, bo_gem->name);
 
@@ -517,6 +521,90 @@ dri_gem_bo_map(dri_bo *bo, int write_enable)
     return 0;
 }
 
+int
+dri_gem_bo_map_gtt(dri_bo *bo)
+{
+    dri_bufmgr_gem *bufmgr_gem;
+    dri_bo_gem *bo_gem = (dri_bo_gem *)bo;
+    struct drm_i915_gem_set_domain set_domain;
+    int ret;
+    int fd;
+
+    bufmgr_gem = (dri_bufmgr_gem *)bo->bufmgr;
+
+    /* Allow recursive mapping. Mesa may recursively map buffers with
+     * nested display loops.
+     */
+    if (!bo_gem->mapped) {
+
+	assert(bo->virtual == NULL);
+
+	DBG("bo_map_gtt: %d (%s)\n", bo_gem->gem_handle, bo_gem->name);
+
+	if (bo_gem->virtual == NULL) {
+		struct drm_i915_gem_mmap_gtt mmap_arg;
+
+		memset(&mmap_arg, 0, sizeof(mmap_arg));
+		mmap_arg.handle = bo_gem->gem_handle;
+		mmap_arg.offset = 0;
+		mmap_arg.size = bo->size;
+		ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_MMAP_GTT,
+			    &mmap_arg);
+		if (ret != 0) {
+			fprintf(stderr,
+				"%s:%d: Error mapping buffer %d (%s): %s .\n",
+				__FILE__, __LINE__,
+				bo_gem->gem_handle, bo_gem->name,
+				strerror(errno));
+			return ret;
+		}
+		bo_gem->virtual = (void *)(uintptr_t)mmap_arg.addr_ptr;
+	}
+#if 0
+	if (bo_gem->virtual == NULL) {
+		fd = open("/sys/devices/pci0000:00/0000:00:02.0/resource2_wc",
+			  O_RDWR);
+		if (fd == -1) {
+			fprintf(stderr, "failed to open GTT: %s\n",
+				strerror(errno));
+			return errno;
+		}
+
+		bo_gem->virtual = mmap(NULL, bo->size, PROT_READ | PROT_WRITE,
+				       MAP_SHARED, fd, bo->offset);
+		if (bo_gem->virtual == MAP_FAILED) {
+			fprintf(stderr, "failed to map GTT: %s\n",
+				strerror(errno));
+			return errno;
+		}
+		close(fd);
+	}
+#endif
+	bo->virtual = bo_gem->virtual;
+	bo_gem->swrast = 0;
+	bo_gem->mapped = 1;
+	DBG("bo_map: %d (%s) -> %p\n", bo_gem->gem_handle, bo_gem->name,
+	    bo_gem->virtual);
+    }
+
+    if (!bo_gem->swrast) {
+	set_domain.handle = bo_gem->gem_handle;
+	set_domain.read_domains = I915_GEM_DOMAIN_GTT;
+	set_domain.write_domain = I915_GEM_DOMAIN_GTT;
+	do {
+	    ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN,
+			&set_domain);
+	} while (ret == -1 && errno == EINTR);
+	if (ret != 0) {
+	    fprintf (stderr, "%s:%d: Error setting swrast %d: %s\n",
+		     __FILE__, __LINE__, bo_gem->gem_handle, strerror (errno));
+	}
+	bo_gem->swrast = 1;
+    }
+
+    return 0;
+}
+
 static int
 dri_gem_bo_unmap(dri_bo *bo)
 {
@@ -593,7 +681,7 @@ dri_gem_bo_get_subdata (dri_bo *bo, unsigned long offset,
     return 0;
 }
 
-static void
+void
 dri_gem_bo_wait_rendering(dri_bo *bo)
 {
     dri_bufmgr_gem *bufmgr_gem = (dri_bufmgr_gem *)bo->bufmgr;
diff -up libdrm-20080814/shared-core/i915_drm.h.da libdrm-20080814/shared-core/i915_drm.h
--- libdrm-20080814/shared-core/i915_drm.h.da	2008-09-09 16:43:43.000000000 +1000
+++ libdrm-20080814/shared-core/i915_drm.h	2008-09-09 16:43:45.000000000 +1000
@@ -99,7 +99,7 @@ typedef struct drm_i915_sarea {
 	int tex_size;
 	int log_tex_granularity;
 	int pitch;
-	int rotation;           /* 0, 90, 180 or 270 */
+	int rotation;	   /* 0, 90, 180 or 270 */
 	int rotated_offset;
 	int rotated_size;
 	int rotated_pitch;
@@ -149,8 +149,8 @@ typedef struct drm_i915_sarea {
 /* Flags for perf_boxes
  */
 #define I915_BOX_RING_EMPTY    0x1
-#define I915_BOX_FLIP          0x2
-#define I915_BOX_WAIT          0x4
+#define I915_BOX_FLIP	  0x2
+#define I915_BOX_WAIT	  0x4
 #define I915_BOX_TEXTURE_LOAD  0x8
 #define I915_BOX_LOST_CONTEXT  0x10
 
@@ -192,24 +192,25 @@ typedef struct drm_i915_sarea {
 #define DRM_I915_GEM_SW_FINISH	0x20
 #define DRM_I915_GEM_SET_TILING	0x21
 #define DRM_I915_GEM_GET_TILING	0x22
+#define DRM_I915_GEM_MMAP_GTT   0x23
 
 #define DRM_IOCTL_I915_INIT		DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
 #define DRM_IOCTL_I915_FLUSH		DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
 #define DRM_IOCTL_I915_FLIP		DRM_IOW( DRM_COMMAND_BASE + DRM_I915_FLIP, drm_i915_flip_t)
 #define DRM_IOCTL_I915_BATCHBUFFER	DRM_IOW( DRM_COMMAND_BASE + DRM_I915_BATCHBUFFER, drm_i915_batchbuffer_t)
-#define DRM_IOCTL_I915_IRQ_EMIT         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_IRQ_EMIT, drm_i915_irq_emit_t)
-#define DRM_IOCTL_I915_IRQ_WAIT         DRM_IOW( DRM_COMMAND_BASE + DRM_I915_IRQ_WAIT, drm_i915_irq_wait_t)
-#define DRM_IOCTL_I915_GETPARAM         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GETPARAM, drm_i915_getparam_t)
-#define DRM_IOCTL_I915_SETPARAM         DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SETPARAM, drm_i915_setparam_t)
-#define DRM_IOCTL_I915_ALLOC            DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_ALLOC, drm_i915_mem_alloc_t)
-#define DRM_IOCTL_I915_FREE             DRM_IOW( DRM_COMMAND_BASE + DRM_I915_FREE, drm_i915_mem_free_t)
-#define DRM_IOCTL_I915_INIT_HEAP        DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT_HEAP, drm_i915_mem_init_heap_t)
+#define DRM_IOCTL_I915_IRQ_EMIT	 DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_IRQ_EMIT, drm_i915_irq_emit_t)
+#define DRM_IOCTL_I915_IRQ_WAIT	 DRM_IOW( DRM_COMMAND_BASE + DRM_I915_IRQ_WAIT, drm_i915_irq_wait_t)
+#define DRM_IOCTL_I915_GETPARAM	 DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GETPARAM, drm_i915_getparam_t)
+#define DRM_IOCTL_I915_SETPARAM	 DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SETPARAM, drm_i915_setparam_t)
+#define DRM_IOCTL_I915_ALLOC	    DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_ALLOC, drm_i915_mem_alloc_t)
+#define DRM_IOCTL_I915_FREE	     DRM_IOW( DRM_COMMAND_BASE + DRM_I915_FREE, drm_i915_mem_free_t)
+#define DRM_IOCTL_I915_INIT_HEAP	DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT_HEAP, drm_i915_mem_init_heap_t)
 #define DRM_IOCTL_I915_CMDBUFFER	DRM_IOW( DRM_COMMAND_BASE + DRM_I915_CMDBUFFER, drm_i915_cmdbuffer_t)
 #define DRM_IOCTL_I915_DESTROY_HEAP	DRM_IOW( DRM_COMMAND_BASE + DRM_I915_DESTROY_HEAP, drm_i915_mem_destroy_heap_t)
 #define DRM_IOCTL_I915_SET_VBLANK_PIPE	DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
 #define DRM_IOCTL_I915_GET_VBLANK_PIPE	DRM_IOR( DRM_COMMAND_BASE + DRM_I915_GET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
 #define DRM_IOCTL_I915_VBLANK_SWAP	DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_VBLANK_SWAP, drm_i915_vblank_swap_t)
-#define DRM_IOCTL_I915_MMIO             DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_MMIO, drm_i915_mmio)
+#define DRM_IOCTL_I915_MMIO	     DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_MMIO, drm_i915_mmio)
 #define DRM_IOCTL_I915_EXECBUFFER	DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_EXECBUFFER, struct drm_i915_execbuffer)
 #define DRM_IOCTL_I915_GEM_INIT		DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_INIT, struct drm_i915_gem_init)
 #define DRM_IOCTL_I915_GEM_EXECBUFFER	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER, struct drm_i915_gem_execbuffer)
@@ -223,6 +224,7 @@ typedef struct drm_i915_sarea {
 #define DRM_IOCTL_I915_GEM_PREAD	DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_PREAD, struct drm_i915_gem_pread)
 #define DRM_IOCTL_I915_GEM_PWRITE	DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_PWRITE, struct drm_i915_gem_pwrite)
 #define DRM_IOCTL_I915_GEM_MMAP		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct drm_i915_gem_mmap)
+#define DRM_IOCTL_I915_GEM_MMAP_GTT     DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_GTT, struct drm_i915_gem_mmap_gtt)
 #define DRM_IOCTL_I915_GEM_SET_DOMAIN	DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SET_DOMAIN, struct drm_i915_gem_set_domain)
 #define DRM_IOCTL_I915_GEM_SW_FINISH	DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SW_FINISH, struct drm_i915_gem_sw_finish)
 #define DRM_IOCTL_I915_GEM_SET_TILING	DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_SET_TILING, struct drm_i915_gem_set_tiling)
@@ -276,11 +278,11 @@ typedef struct drm_i915_irq_wait {
 
 /* Ioctl to query kernel params:
  */
-#define I915_PARAM_IRQ_ACTIVE            1
+#define I915_PARAM_IRQ_ACTIVE	    1
 #define I915_PARAM_ALLOW_BATCHBUFFER     2
-#define I915_PARAM_LAST_DISPATCH         3
-#define I915_PARAM_CHIPSET_ID            4
-#define I915_PARAM_HAS_GEM               5
+#define I915_PARAM_LAST_DISPATCH	 3
+#define I915_PARAM_CHIPSET_ID	    4
+#define I915_PARAM_HAS_GEM	       5
 
 typedef struct drm_i915_getparam {
 	int param;
@@ -289,9 +291,9 @@ typedef struct drm_i915_getparam {
 
 /* Ioctl to set kernel params:
  */
-#define I915_SETPARAM_USE_MI_BATCHBUFFER_START            1
-#define I915_SETPARAM_TEX_LRU_LOG_GRANULARITY             2
-#define I915_SETPARAM_ALLOW_BATCHBUFFER                   3
+#define I915_SETPARAM_USE_MI_BATCHBUFFER_START	    1
+#define I915_SETPARAM_TEX_LRU_LOG_GRANULARITY	     2
+#define I915_SETPARAM_ALLOW_BATCHBUFFER		   3
 
 typedef struct drm_i915_setparam {
 	int param;
@@ -460,6 +462,25 @@ struct drm_i915_gem_set_domain {
 	uint32_t write_domain;
 };
 
+struct drm_i915_gem_mmap_gtt {
+	/** Handle for the object being mapped. */
+	uint32_t handle;
+	uint32_t pad;
+	/** Offset in the object to map. */
+	uint64_t offset;
+	/**
+	 * Length of data to map.
+	 *
+	 * The value will be page-aligned.
+	 */
+	uint64_t size;
+	/** Returned pointer the data was mapped at */
+	uint64_t addr_ptr;      /* void *, but pointers are not 32/64 compatible
+ */
+	uint32_t flags;
+};
+
+
 struct drm_i915_gem_sw_finish {
 	/** Handle for the object */
 	uint32_t handle;


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- libdrm.spec	14 Aug 2008 05:51:06 -0000	1.48
+++ libdrm.spec	9 Sep 2008 06:44:16 -0000	1.49
@@ -3,7 +3,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.0
-Release: 0.19%{?dist}
+Release: 0.20%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -14,6 +14,8 @@
 
 BuildRequires: pkgconfig automake autoconf libtool
 
+BuildRequires: kernel-headers >= 2.6.27-0.317.rc5.git10.fc10
+
 Source2: 91-drm-modeset.rules
 Source3: i915modeset
 
@@ -24,6 +26,7 @@
 Patch3: libdrm-make-dri-perms-okay.patch
 Patch4: libdrm-2.4.0-no-bc.patch
 Patch5: libdrm-wait-udev.patch
+Patch6: libdrm-gtt-map-support-3.patch
 
 %description
 Direct Rendering Manager runtime library
@@ -43,6 +46,7 @@
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
 %patch5 -p1 -b .udev-wait
+%patch6 -p1 -b .gttmap
 
 %build
 autoreconf -v --install || exit 1
@@ -91,6 +95,9 @@
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* Tue Sep 09 2008 Dave Airlie <airlied at redhat.com> 2.4.0-0.20
+- add gtt mapping for intel modesetting
+
 * Thu Aug 14 2008 Dave Airlie <airlied at redhat.com> 2.4.0-0.19
 - add back modesetting support - this is a snapshot from modesetting-gem
 - any bugs are in the other packages that fail to build



From timlau at fedoraproject.org  Tue Sep  9 06:48:08 2008
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Tue,  9 Sep 2008 06:48:08 +0000 (UTC)
Subject: rpms/postr/devel postr.spec,1.8,1.9
Message-ID: <20080909064808.0E14A7012A@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/postr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8949

Modified Files:
	postr.spec 
Log Message:
added missing gnome-python2-gconf requirement


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/devel/postr.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- postr.spec	17 May 2008 22:20:07 -0000	1.8
+++ postr.spec	9 Sep 2008 06:47:37 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           postr
 Version:        0.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
@@ -19,6 +19,8 @@
 Requires:       pygtk2
 Requires:       nautilus-python
 Requires:       hicolor-icon-theme
+Requires:	gnome-python2-gconf
+
 
 
 %description
@@ -69,6 +71,9 @@
 
 
 %changelog
+* Tue Sep 9 2008 Tim Lauridsen <timlau at fedoraproject.org> - 0.12-2
+- added missing gnome-python2-gconf requirement.
+
 * Sat May 18 2008 Trond Danielsen <trondd at fedoraproject.org> - 0.12-1
 - New upstream version
 



From pkgdb at fedoraproject.org  Tue Sep  9 06:48:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:48:49 +0000
Subject: [pkgdb] postr had acl change status
Message-ID: <20080909064849.8360520876F@bastion.fedora.phx.redhat.com>

trondd has set the watchbugzilla acl on postr (Fedora devel) to Approved for timlau

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From pkgdb at fedoraproject.org  Tue Sep  9 06:48:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:48:50 +0000
Subject: [pkgdb] postr had acl change status
Message-ID: <20080909064850.C450B208D1E@bastion.fedora.phx.redhat.com>

trondd has set the watchcommits acl on postr (Fedora devel) to Approved for timlau

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From pkgdb at fedoraproject.org  Tue Sep  9 06:48:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:48:52 +0000
Subject: [pkgdb] postr had acl change status
Message-ID: <20080909064852.8871F208D98@bastion.fedora.phx.redhat.com>

trondd has set the commit acl on postr (Fedora devel) to Approved for timlau

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From pkgdb at fedoraproject.org  Tue Sep  9 06:48:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:48:53 +0000
Subject: [pkgdb] postr had acl change status
Message-ID: <20080909064853.C5815208D9B@bastion.fedora.phx.redhat.com>

trondd has set the approveacls acl on postr (Fedora devel) to Approved for timlau

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From pkgdb at fedoraproject.org  Tue Sep  9 06:48:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:48:58 +0000
Subject: [pkgdb] postr ownership updated
Message-ID: <20080909064858.53682208DA0@bastion.fedora.phx.redhat.com>

Package postr in Fedora devel was orphaned by trondd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From pkgdb at fedoraproject.org  Tue Sep  9 06:48:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:48:58 +0000
Subject: [pkgdb] postr ownership updated
Message-ID: <20080909064858.F0B16208DA2@bastion.fedora.phx.redhat.com>

Package postr in Fedora EPEL 5 was orphaned by trondd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From pkgdb at fedoraproject.org  Tue Sep  9 06:49:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:49:02 +0000
Subject: [pkgdb] postr ownership updated
Message-ID: <20080909064902.6ECFA208DA4@bastion.fedora.phx.redhat.com>

Package postr in Fedora 6 was orphaned by trondd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From pkgdb at fedoraproject.org  Tue Sep  9 06:49:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:49:01 +0000
Subject: [pkgdb] postr ownership updated
Message-ID: <20080909064901.CF99A20876E@bastion.fedora.phx.redhat.com>

Package postr in Fedora 7 was orphaned by trondd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From pkgdb at fedoraproject.org  Tue Sep  9 06:49:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:49:04 +0000
Subject: [pkgdb] postr ownership updated
Message-ID: <20080909064904.B5F3C208DA7@bastion.fedora.phx.redhat.com>

Package postr in Fedora 8 was orphaned by trondd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From pkgdb at fedoraproject.org  Tue Sep  9 06:49:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:49:05 +0000
Subject: [pkgdb] postr ownership updated
Message-ID: <20080909064905.37016208DA9@bastion.fedora.phx.redhat.com>

Package postr in Fedora 9 was orphaned by trondd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From pkgdb at fedoraproject.org  Tue Sep  9 06:52:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:52:19 +0000
Subject: [pkgdb] sdcc ownership updated
Message-ID: <20080909065219.4B90D20876F@bastion.fedora.phx.redhat.com>

Package sdcc in Fedora devel was orphaned by trondd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sdcc



From pkgdb at fedoraproject.org  Tue Sep  9 06:52:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:52:19 +0000
Subject: [pkgdb] sdcc ownership updated
Message-ID: <20080909065219.B3DD1208D1E@bastion.fedora.phx.redhat.com>

Package sdcc in Fedora EPEL 5 was orphaned by trondd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sdcc



From pkgdb at fedoraproject.org  Tue Sep  9 06:52:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:52:21 +0000
Subject: [pkgdb] sdcc ownership updated
Message-ID: <20080909065221.4D16E208D98@bastion.fedora.phx.redhat.com>

Package sdcc in Fedora 7 was orphaned by trondd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sdcc



From pkgdb at fedoraproject.org  Tue Sep  9 06:52:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:52:23 +0000
Subject: [pkgdb] sdcc ownership updated
Message-ID: <20080909065224.0835B20876E@bastion.fedora.phx.redhat.com>

Package sdcc in Fedora 9 was orphaned by trondd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sdcc



From pkgdb at fedoraproject.org  Tue Sep  9 06:52:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:52:25 +0000
Subject: [pkgdb] sdcc ownership updated
Message-ID: <20080909065225.A0783208D9F@bastion.fedora.phx.redhat.com>

Package sdcc in Fedora 8 was orphaned by trondd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sdcc



From pkgdb at fedoraproject.org  Tue Sep  9 06:52:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:52:26 +0000
Subject: [pkgdb] sdcc ownership updated
Message-ID: <20080909065226.4515C208DA2@bastion.fedora.phx.redhat.com>

Package sdcc in Fedora 6 was orphaned by trondd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sdcc



From pkgdb at fedoraproject.org  Tue Sep  9 06:52:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:52:27 +0000
Subject: [pkgdb] sdcc ownership updated
Message-ID: <20080909065227.9C7BE208DA6@bastion.fedora.phx.redhat.com>

Package sdcc in Fedora 5 was orphaned by trondd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sdcc



From pkgdb at fedoraproject.org  Tue Sep  9 06:53:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:53:12 +0000
Subject: [pkgdb] perl-Class-MethodMaker: corsepiu has requested watchbugzilla
Message-ID: <20080909065312.D8166208D1E@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchbugzilla acl on perl-Class-MethodMaker (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Tue Sep  9 06:53:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:53:14 +0000
Subject: [pkgdb] perl-Class-MethodMaker: corsepiu has requested watchcommits
Message-ID: <20080909065314.3FBD2208D98@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchcommits acl on perl-Class-MethodMaker (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Tue Sep  9 06:53:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:53:26 +0000
Subject: [pkgdb] perl-Class-MethodMaker: corsepiu has requested watchbugzilla
Message-ID: <20080909065326.256E0208D99@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchbugzilla acl on perl-Class-MethodMaker (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Tue Sep  9 06:53:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:53:27 +0000
Subject: [pkgdb] perl-Class-MethodMaker: corsepiu has requested watchcommits
Message-ID: <20080909065327.65182208D9A@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchcommits acl on perl-Class-MethodMaker (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Tue Sep  9 06:53:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:53:33 +0000
Subject: [pkgdb] perl-Class-MethodMaker: corsepiu has requested watchbugzilla
Message-ID: <20080909065333.9D0FC208D9B@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchbugzilla acl on perl-Class-MethodMaker (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Tue Sep  9 06:53:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:53:34 +0000
Subject: [pkgdb] perl-Class-MethodMaker: corsepiu has requested watchcommits
Message-ID: <20080909065334.440B0208D9F@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchcommits acl on perl-Class-MethodMaker (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Tue Sep  9 06:55:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:55:13 +0000
Subject: [pkgdb] gedit-plugins ownership updated
Message-ID: <20080909065513.4473E20876E@bastion.fedora.phx.redhat.com>

Package gedit-plugins in Fedora devel was orphaned by trondd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Tue Sep  9 06:55:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:55:15 +0000
Subject: [pkgdb] gedit-plugins ownership updated
Message-ID: <20080909065515.DD78C208D1E@bastion.fedora.phx.redhat.com>

Package gedit-plugins in Fedora 7 was orphaned by trondd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Tue Sep  9 06:55:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:55:14 +0000
Subject: [pkgdb] gedit-plugins ownership updated
Message-ID: <20080909065514.46315208770@bastion.fedora.phx.redhat.com>

Package gedit-plugins in Fedora EPEL 5 was orphaned by trondd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Tue Sep  9 06:55:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:55:17 +0000
Subject: [pkgdb] gedit-plugins ownership updated
Message-ID: <20080909065517.63931208D97@bastion.fedora.phx.redhat.com>

Package gedit-plugins in Fedora 6 was orphaned by trondd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Tue Sep  9 06:55:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:55:18 +0000
Subject: [pkgdb] gedit-plugins ownership updated
Message-ID: <20080909065518.EA8F1208D99@bastion.fedora.phx.redhat.com>

Package gedit-plugins in Fedora 8 was orphaned by trondd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Tue Sep  9 06:55:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:55:22 +0000
Subject: [pkgdb] gedit-plugins ownership updated
Message-ID: <20080909065522.9BEC6208D9B@bastion.fedora.phx.redhat.com>

Package gedit-plugins in Fedora 9 was orphaned by trondd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From timlau at fedoraproject.org  Tue Sep  9 06:56:06 2008
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Tue,  9 Sep 2008 06:56:06 +0000 (UTC)
Subject: rpms/postr/devel .cvsignore, 1.7, 1.8 postr.spec, 1.9, 1.10 sources,
	1.7, 1.8
Message-ID: <20080909065606.636737012E@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/postr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9389

Modified Files:
	.cvsignore postr.spec sources 
Log Message:
new upstream release 0.12.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postr/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 May 2008 22:20:07 -0000	1.7
+++ .cvsignore	9 Sep 2008 06:55:36 -0000	1.8
@@ -1 +1 @@
-postr-0.12.tar.gz
+postr-0.12.2.tar.gz


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/devel/postr.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- postr.spec	9 Sep 2008 06:47:37 -0000	1.9
+++ postr.spec	9 Sep 2008 06:55:36 -0000	1.10
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           postr
-Version:        0.12
-Release:        2%{?dist}
+Version:        0.12.2
+Release:        1%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
@@ -71,7 +71,8 @@
 
 
 %changelog
-* Tue Sep 9 2008 Tim Lauridsen <timlau at fedoraproject.org> - 0.12-2
+* 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.
 
 * Sat May 18 2008 Trond Danielsen <trondd at fedoraproject.org> - 0.12-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postr/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 May 2008 22:20:07 -0000	1.7
+++ sources	9 Sep 2008 06:55:36 -0000	1.8
@@ -1 +1 @@
-00093709692848e8433605b241da1d33  postr-0.12.tar.gz
+0b823d94dd6a7e96fde94a2581aaf819  postr-0.12.2.tar.gz



From pkgdb at fedoraproject.org  Tue Sep  9 06:57:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:57:50 +0000
Subject: [pkgdb] gedit-plugins ownership updated
Message-ID: <20080909065750.AD76A20876F@bastion.fedora.phx.redhat.com>

Package gedit-plugins in Fedora devel is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Tue Sep  9 06:58:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:58:00 +0000
Subject: [pkgdb] gedit-plugins ownership updated
Message-ID: <20080909065800.A0775208D7C@bastion.fedora.phx.redhat.com>

Package gedit-plugins in Fedora 8 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Tue Sep  9 06:57:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 06:57:57 +0000
Subject: [pkgdb] gedit-plugins ownership updated
Message-ID: <20080909065757.773B1208D0F@bastion.fedora.phx.redhat.com>

Package gedit-plugins in Fedora 9 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Tue Sep  9 07:03:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:03:22 +0000
Subject: [pkgdb] sdcc ownership updated
Message-ID: <20080909070322.8E2FE208770@bastion.fedora.phx.redhat.com>

Package sdcc in Fedora devel is now owned by konradm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sdcc



From pkgdb at fedoraproject.org  Tue Sep  9 07:03:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:03:28 +0000
Subject: [pkgdb] sdcc ownership updated
Message-ID: <20080909070328.9FC20208D97@bastion.fedora.phx.redhat.com>

Package sdcc in Fedora EPEL 5 is now owned by konradm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sdcc



From pkgdb at fedoraproject.org  Tue Sep  9 07:03:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:03:34 +0000
Subject: [pkgdb] sdcc ownership updated
Message-ID: <20080909070334.82AB7208D99@bastion.fedora.phx.redhat.com>

Package sdcc in Fedora 9 is now owned by konradm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sdcc



From pkgdb at fedoraproject.org  Tue Sep  9 07:03:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:03:37 +0000
Subject: [pkgdb] sdcc ownership updated
Message-ID: <20080909070337.66C62208D9B@bastion.fedora.phx.redhat.com>

Package sdcc in Fedora 8 is now owned by konradm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sdcc



From timlau at fedoraproject.org  Tue Sep  9 07:04:42 2008
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Tue,  9 Sep 2008 07:04:42 +0000 (UTC)
Subject: rpms/postr/F-9 postr.spec,1.8,1.9 sources,1.7,1.8
Message-ID: <20080909070442.D187A7012A@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/postr/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10132

Modified Files:
	postr.spec sources 
Log Message:
new upstream release 0.12.2


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/F-9/postr.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- postr.spec	17 May 2008 22:22:12 -0000	1.8
+++ postr.spec	9 Sep 2008 07:04:12 -0000	1.9
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           postr
-Version:        0.12
+Version:        0.12.2
 Release:        1%{?dist}
 Summary:        Flickr uploader
 
@@ -19,6 +19,8 @@
 Requires:       pygtk2
 Requires:       nautilus-python
 Requires:       hicolor-icon-theme
+Requires:	gnome-python2-gconf
+
 
 
 %description
@@ -69,6 +71,10 @@
 
 
 %changelog
+* 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.
+
 * Sat May 18 2008 Trond Danielsen <trondd at fedoraproject.org> - 0.12-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postr/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 May 2008 22:22:12 -0000	1.7
+++ sources	9 Sep 2008 07:04:12 -0000	1.8
@@ -1 +1 @@
-00093709692848e8433605b241da1d33  postr-0.12.tar.gz
+0b823d94dd6a7e96fde94a2581aaf819  postr-0.12.2.tar.gz



From pkgdb at fedoraproject.org  Tue Sep  9 07:05:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:05:22 +0000
Subject: [pkgdb] tremulous-data ownership updated
Message-ID: <20080909070522.A768320876F@bastion.fedora.phx.redhat.com>

Package tremulous-data in Fedora devel is now owned by pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Tue Sep  9 07:05:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:05:30 +0000
Subject: [pkgdb] tremulous-data had acl change status
Message-ID: <20080909070530.2C1A7208D0F@bastion.fedora.phx.redhat.com>

pgordon has set the commit acl on tremulous-data (Fedora devel) to Obsolete for pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Tue Sep  9 07:05:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:05:31 +0000
Subject: [pkgdb] tremulous-data had acl change status
Message-ID: <20080909070532.06D20208D97@bastion.fedora.phx.redhat.com>

pgordon has set the watchcommits acl on tremulous-data (Fedora devel) to Obsolete for pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Tue Sep  9 07:05:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:05:33 +0000
Subject: [pkgdb] tremulous-data had acl change status
Message-ID: <20080909070533.31087208D99@bastion.fedora.phx.redhat.com>

pgordon has set the watchbugzilla acl on tremulous-data (Fedora devel) to Obsolete for pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Tue Sep  9 07:05:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:05:44 +0000
Subject: [pkgdb] tremulous-data ownership updated
Message-ID: <20080909070544.3F21220876F@bastion.fedora.phx.redhat.com>

Package tremulous-data in Fedora 8 is now owned by pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Tue Sep  9 07:05:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:05:48 +0000
Subject: [pkgdb] tremulous-data ownership updated
Message-ID: <20080909070548.C7631208D1E@bastion.fedora.phx.redhat.com>

Package tremulous-data in Fedora 9 is now owned by pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Tue Sep  9 07:05:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:05:52 +0000
Subject: [pkgdb] tremulous-data had acl change status
Message-ID: <20080909070552.3003A208D98@bastion.fedora.phx.redhat.com>

pgordon has set the commit acl on tremulous-data (Fedora 9) to Obsolete for pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Tue Sep  9 07:05:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:05:55 +0000
Subject: [pkgdb] tremulous-data had acl change status
Message-ID: <20080909070555.44D72208D9C@bastion.fedora.phx.redhat.com>

pgordon has set the watchbugzilla acl on tremulous-data (Fedora 9) to Obsolete for pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Tue Sep  9 07:05:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:05:54 +0000
Subject: [pkgdb] tremulous-data had acl change status
Message-ID: <20080909070555.72664208D9E@bastion.fedora.phx.redhat.com>

pgordon has set the watchcommits acl on tremulous-data (Fedora 9) to Obsolete for pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Tue Sep  9 07:05:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:05:56 +0000
Subject: [pkgdb] tremulous-data had acl change status
Message-ID: <20080909070556.38655208DA4@bastion.fedora.phx.redhat.com>

pgordon has set the watchbugzilla acl on tremulous-data (Fedora 8) to Obsolete for pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Tue Sep  9 07:05:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:05:57 +0000
Subject: [pkgdb] tremulous-data had acl change status
Message-ID: <20080909070557.40DAD208D99@bastion.fedora.phx.redhat.com>

pgordon has set the watchcommits acl on tremulous-data (Fedora 8) to Obsolete for pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Tue Sep  9 07:05:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:05:58 +0000
Subject: [pkgdb] tremulous-data had acl change status
Message-ID: <20080909070558.C7E91208770@bastion.fedora.phx.redhat.com>

pgordon has set the commit acl on tremulous-data (Fedora 8) to Obsolete for pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Tue Sep  9 07:06:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:06:07 +0000
Subject: [pkgdb] tremulous-data: pgordon has given up watchcommits
Message-ID: <20080909070607.CDDFC208D7C@bastion.fedora.phx.redhat.com>

pgordon has given up the watchcommits acl on tremulous-data (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Tue Sep  9 07:06:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:06:05 +0000
Subject: [pkgdb] tremulous-data: pgordon has given up watchbugzilla
Message-ID: <20080909070605.7E2FF208DA5@bastion.fedora.phx.redhat.com>

pgordon has given up the watchbugzilla acl on tremulous-data (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Tue Sep  9 07:06:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:06:09 +0000
Subject: [pkgdb] tremulous-data: pgordon has given up commit
Message-ID: <20080909070609.A131B208D9A@bastion.fedora.phx.redhat.com>

pgordon has given up the commit acl on tremulous-data (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Tue Sep  9 05:57:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 05:57:21 +0000
Subject: [pkgdb] childsplay_plugins ownership updated
Message-ID: <20080909055722.07B9E208D7C@bastion.fedora.phx.redhat.com>

Package childsplay_plugins in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/childsplay_plugins



From timlau at fedoraproject.org  Tue Sep  9 07:09:19 2008
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Tue,  9 Sep 2008 07:09:19 +0000 (UTC)
Subject: rpms/postr/F-8 postr.spec,1.9,1.10 sources,1.7,1.8
Message-ID: <20080909070919.37F437012A@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/postr/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10436

Modified Files:
	postr.spec sources 
Log Message:
new upstream release 0.12.2


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/F-8/postr.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- postr.spec	17 May 2008 22:34:24 -0000	1.9
+++ postr.spec	9 Sep 2008 07:08:48 -0000	1.10
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           postr
-Version:        0.12
-Release:        1%{?dist}.1
+Version:        0.12.2
+Release:        1%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
@@ -19,6 +19,8 @@
 Requires:       pygtk2
 Requires:       nautilus-python
 Requires:       hicolor-icon-theme
+Requires:	gnome-python2-gconf
+
 
 
 %description
@@ -65,9 +67,14 @@
 %{python_sitelib}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{python_sitelib}/Postr-%{version}-py2.5.egg-info
 
 
 %changelog
+* 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.
+
 * Sat May 18 2008 Trond Danielsen <trondd at fedoraproject.org> - 0.12-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postr/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 May 2008 22:23:57 -0000	1.7
+++ sources	9 Sep 2008 07:08:48 -0000	1.8
@@ -1 +1 @@
-00093709692848e8433605b241da1d33  postr-0.12.tar.gz
+0b823d94dd6a7e96fde94a2581aaf819  postr-0.12.2.tar.gz



From pkgdb at fedoraproject.org  Tue Sep  9 07:14:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:14:12 +0000
Subject: [pkgdb] postr ownership updated
Message-ID: <20080909071412.BDE3F20876F@bastion.fedora.phx.redhat.com>

Package postr in Fedora devel is now owned by timlau

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From pkgdb at fedoraproject.org  Tue Sep  9 07:14:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:14:34 +0000
Subject: [pkgdb] postr ownership updated
Message-ID: <20080909071434.D3C9C208770@bastion.fedora.phx.redhat.com>

Package postr in Fedora EPEL 5 is now owned by timlau

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From caolanm at fedoraproject.org  Tue Sep  9 07:18:06 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  9 Sep 2008 07:18:06 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1643,1.1644
Message-ID: <20080909071806.5086A7012A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10852

Modified Files:
	openoffice.org.spec 
Log Message:
probably help to spell Finnish correctly


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1643
retrieving revision 1.1644
diff -u -r1.1643 -r1.1644
--- openoffice.org.spec	8 Sep 2008 10:59:31 -0000	1.1643
+++ openoffice.org.spec	9 Sep 2008 07:17:35 -0000	1.1644
@@ -702,7 +702,7 @@
 Provides additional basque translations and resources for %{name}.
 
 %package langpack-fi_FI
-Summary: Finish language pack for %{name}
+Summary: Finnish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org-langpack-fi



From pkgdb at fedoraproject.org  Tue Sep  9 07:23:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:23:47 +0000
Subject: [pkgdb] feh ownership updated
Message-ID: <20080909072347.D3F3020876E@bastion.fedora.phx.redhat.com>

Package feh in Fedora devel is now owned by ivazquez

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/feh



From pkgdb at fedoraproject.org  Tue Sep  9 07:24:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:24:04 +0000
Subject: [pkgdb] feh ownership updated
Message-ID: <20080909072404.6FBD120876E@bastion.fedora.phx.redhat.com>

Package feh in Fedora 8 is now owned by ivazquez

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/feh



From pkgdb at fedoraproject.org  Tue Sep  9 07:24:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 07:24:07 +0000
Subject: [pkgdb] feh ownership updated
Message-ID: <20080909072407.67E28208771@bastion.fedora.phx.redhat.com>

Package feh in Fedora 9 is now owned by ivazquez

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/feh



From belegdol at fedoraproject.org  Tue Sep  9 08:08:31 2008
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Tue,  9 Sep 2008 08:08:31 +0000 (UTC)
Subject: rpms/gnome-chemistry-utils/devel
	gnome-chemistry-utils-0.9.90-ppc.patch, 1.1, 1.2
Message-ID: <20080909080831.EFF137012A@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15883

Modified Files:
	gnome-chemistry-utils-0.9.90-ppc.patch 
Log Message:
Commit the correct patch

gnome-chemistry-utils-0.9.90-ppc.patch:

Index: gnome-chemistry-utils-0.9.90-ppc.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/gnome-chemistry-utils-0.9.90-ppc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-chemistry-utils-0.9.90-ppc.patch	8 Sep 2008 23:05:55 -0000	1.1
+++ gnome-chemistry-utils-0.9.90-ppc.patch	9 Sep 2008 08:08:31 -0000	1.2
@@ -16,10 +16,10 @@
 -	bool res = gsf_input_read (input, 4, (guint8*) buffer), \
 -	(guint32) i = buffer[0] + buffer[1] << 8 + buffer[2] << 16 + buffer[3] << 24, res
 +	readint_res = gsf_input_read (input, 2, (guint8*) buffer), \
-+	(guint16) i = buffer[0] + buffer[1] << 8, readint_res
++	i = buffer[0] + (buffer[1] << 8), readint_res
 +#define READINT32(input,i) \
 +	readint_res = gsf_input_read (input, 4, (guint8*) buffer), \
-+	(guint32) i = buffer[0] + buffer[1] << 8 + buffer[2] << 16 + buffer[3] << 24, readint_res
++	i = buffer[0] + (buffer[1] << 8) + (buffer[2] << 16) + (buffer[3] << 24), readint_res
  #endif
  
  typedef struct {



From airlied at fedoraproject.org  Tue Sep  9 08:16:20 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  9 Sep 2008 08:16:20 +0000 (UTC)
Subject: rpms/xorg-x11-drv-i810/devel intel-2.4.2-fix-mode-typo.patch, NONE, 
	1.1 xorg-x11-drv-i810.spec, 1.106, 1.107
Message-ID: <20080909081620.6BB847012A@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16792

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-2.4.2-fix-mode-typo.patch 
Log Message:
* Tue Sep 09 2008 Dave Airlie <airlied at redhat.com> 2.4.2-6
- fix typo in drmmode display.c


intel-2.4.2-fix-mode-typo.patch:

--- NEW FILE intel-2.4.2-fix-mode-typo.patch ---
commit 0105e69edafc7c90de2dbda7c592868c4d570471
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Sep 9 18:08:08 2008 +1000

    intel: fix typo in drmmode dispaly

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 5154b42..680071a 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -505,7 +505,7 @@ const char *output_names[] = { "None",
 			       "DVI",
 			       "DVI",
 			       "DVI",
-			       "Composite"
+			       "Composite",
 			       "TV",
 			       "LVDS",
 			       "CTV",


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- xorg-x11-drv-i810.spec	8 Sep 2008 19:41:02 -0000	1.106
+++ xorg-x11-drv-i810.spec	9 Sep 2008 08:15:49 -0000	1.107
@@ -6,7 +6,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.4.2
-Release:   5%{?dist}
+Release:   6%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -27,6 +27,7 @@
 # fd.o bug 17341
 Patch6: i830-render-init-no-map.patch
 Patch7: intel-2.4.2-fb-size.patch
+Patch8: intel-2.4.2-fix-mode-typo.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -62,6 +63,7 @@
 %patch5 -p1 -b .irqfix
 %patch6 -p1 -b .exafix
 %patch7 -p1 -b .fb-size
+%patch8 -p1 -b .modename
 
 %build
 
@@ -104,6 +106,9 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Tue Sep 09 2008 Dave Airlie <airlied at redhat.com> 2.4.2-6
+- fix typo in drmmode display.c
+
 * Mon Sep 08 2008 Adam Jackson <ajax at redhat.com> 2.4.2-5
 - intel-2.4.2-fb-size.patch: Yet more lame heuristics to preallocate a
   usable framebuffer for laptops. (#458864)



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:01 +0000
Subject: [pkgdb] puppet: kanarip has requested watchbugzilla
Message-ID: <20080909081701.DDEA4208D0F@bastion.fedora.phx.redhat.com>

kanarip has requested the watchbugzilla acl on puppet (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:02 +0000
Subject: [pkgdb] puppet: kanarip has requested watchcommits
Message-ID: <20080909081703.20882208D1E@bastion.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on puppet (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:06 +0000
Subject: [pkgdb] puppet: kanarip has requested approveacls
Message-ID: <20080909081706.6CC63208D9B@bastion.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on puppet (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:03 +0000
Subject: [pkgdb] puppet: kanarip has requested commit
Message-ID: <20080909081703.85F42208D98@bastion.fedora.phx.redhat.com>

kanarip has requested the commit acl on puppet (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:11 +0000
Subject: [pkgdb] puppet: kanarip has requested watchbugzilla
Message-ID: <20080909081711.B2E6B208D9F@bastion.fedora.phx.redhat.com>

kanarip has requested the watchbugzilla acl on puppet (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:11 +0000
Subject: [pkgdb] puppet: kanarip has requested watchcommits
Message-ID: <20080909081711.EFDB1208DA2@bastion.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on puppet (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:13 +0000
Subject: [pkgdb] puppet: kanarip has requested approveacls
Message-ID: <20080909081713.DCFEE208DA5@bastion.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on puppet (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:14 +0000
Subject: [pkgdb] puppet: kanarip has requested commit
Message-ID: <20080909081715.46E37208DA8@bastion.fedora.phx.redhat.com>

kanarip has requested the commit acl on puppet (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:16 +0000
Subject: [pkgdb] puppet: kanarip has requested watchbugzilla
Message-ID: <20080909081716.5E33B208DAA@bastion.fedora.phx.redhat.com>

kanarip has requested the watchbugzilla acl on puppet (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:18 +0000
Subject: [pkgdb] puppet: kanarip has requested commit
Message-ID: <20080909081718.46D63208DAC@bastion.fedora.phx.redhat.com>

kanarip has requested the commit acl on puppet (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:18 +0000
Subject: [pkgdb] puppet: kanarip has requested watchcommits
Message-ID: <20080909081718.7782E208DAF@bastion.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on puppet (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:20 +0000
Subject: [pkgdb] puppet: kanarip has requested approveacls
Message-ID: <20080909081721.0451B208DB2@bastion.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on puppet (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:30 +0000
Subject: [pkgdb] puppet: kanarip has requested watchbugzilla
Message-ID: <20080909081730.5757120876F@bastion.fedora.phx.redhat.com>

kanarip has requested the watchbugzilla acl on puppet (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:30 +0000
Subject: [pkgdb] puppet: kanarip has requested watchcommits
Message-ID: <20080909081730.B1808208D7C@bastion.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on puppet (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:31 +0000
Subject: [pkgdb] puppet: kanarip has requested commit
Message-ID: <20080909081731.EFD9E208DB6@bastion.fedora.phx.redhat.com>

kanarip has requested the commit acl on puppet (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:33 +0000
Subject: [pkgdb] puppet: kanarip has requested approveacls
Message-ID: <20080909081733.E611B208DBB@bastion.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on puppet (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:37 +0000
Subject: [pkgdb] puppet: kanarip has requested watchbugzilla
Message-ID: <20080909081738.0DD33208DBF@bastion.fedora.phx.redhat.com>

kanarip has requested the watchbugzilla acl on puppet (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:39 +0000
Subject: [pkgdb] puppet: kanarip has requested watchcommits
Message-ID: <20080909081739.6E51A208DBC@bastion.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on puppet (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:40 +0000
Subject: [pkgdb] puppet: kanarip has requested commit
Message-ID: <20080909081740.E0371208D99@bastion.fedora.phx.redhat.com>

kanarip has requested the commit acl on puppet (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 08:17:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:17:43 +0000
Subject: [pkgdb] puppet: kanarip has requested approveacls
Message-ID: <20080909081743.C8110208DC1@bastion.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on puppet (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From harald at fedoraproject.org  Tue Sep  9 08:21:44 2008
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue,  9 Sep 2008 08:21:44 +0000 (UTC)
Subject: rpms/python-augeas/devel .cvsignore, 1.3, 1.4 python-augeas.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20080909082144.802647012A@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/python-augeas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17969

Modified Files:
	.cvsignore python-augeas.spec sources 
Log Message:
* Tue Sep 09 2008 Harald Hoyer <harald at redhat.com> 0.3.0-1
- version 0.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-augeas/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Jul 2008 11:44:24 -0000	1.3
+++ .cvsignore	9 Sep 2008 08:21:14 -0000	1.4
@@ -1 +1 @@
-python-augeas-0.2.1.tar.gz
+python-augeas-0.3.0.tar.gz


Index: python-augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-augeas/devel/python-augeas.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-augeas.spec	3 Jul 2008 11:54:50 -0000	1.3
+++ python-augeas.spec	9 Sep 2008 08:21:14 -0000	1.4
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		python-augeas
-Version:	0.2.1
+Version:	0.3.0
 Release:	1%{?dist}
 Summary:	Python bindings to augeas
 Group:		Development/Languages
@@ -42,6 +42,9 @@
 %{python_sitelib}/*augeas*.egg-info
 
 %changelog
+* Tue Sep 09 2008 Harald Hoyer <harald at redhat.com> 0.3.0-1
+- version 0.3.0
+
 * Thu Jul 03 2008 Harald Hoyer <harald at redhat.com> 0.2.1-1
 - version 0.2.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-augeas/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Jul 2008 11:44:24 -0000	1.3
+++ sources	9 Sep 2008 08:21:14 -0000	1.4
@@ -1 +1 @@
-91432c3b050ccd01fd7fa5d777fcdcbc  python-augeas-0.2.1.tar.gz
+428fb2a54dea896131dbae5af10fccac  python-augeas-0.3.0.tar.gz



From tsmetana at fedoraproject.org  Tue Sep  9 08:23:22 2008
From: tsmetana at fedoraproject.org (Tomas Smetana)
Date: Tue,  9 Sep 2008 08:23:22 +0000 (UTC)
Subject: rpms/nut/devel nut.spec,1.62,1.63
Message-ID: <20080909082322.3DF297012A@cvs1.fedora.phx.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/nut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18373

Modified Files:
	nut.spec 
Log Message:
fix group for hal subpackage


Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/nut.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- nut.spec	26 Aug 2008 07:23:53 -0000	1.62
+++ nut.spec	9 Sep 2008 08:22:51 -0000	1.63
@@ -94,7 +94,7 @@
 
 %package hal
 Summary:        UPS Monitoring Software
-Group:          Hardware/UPS
+Group:          Applications/System
 Requires:       hal
 Conflicts:      apcupsd, %{name}
 



From adrian at fedoraproject.org  Tue Sep  9 08:25:08 2008
From: adrian at fedoraproject.org (Adrian Reber)
Date: Tue,  9 Sep 2008 08:25:08 +0000 (UTC)
Subject: rpms/wordpress/devel .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 wordpress.spec, 1.22, 1.23
Message-ID: <20080909082508.BFE5D7012A@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18739

Modified Files:
	.cvsignore sources wordpress.spec 
Log Message:
* Tue Sep 09 2008 Adrian Reber <adrian at lisas.de> - 2.6.2-1
- updated to 2.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	24 Aug 2008 22:33:05 -0000	1.18
+++ .cvsignore	9 Sep 2008 08:24:38 -0000	1.19
@@ -1 +1 @@
-wordpress-2.6.1.tar.gz
+wordpress-2.6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	24 Aug 2008 22:33:05 -0000	1.18
+++ sources	9 Sep 2008 08:24:38 -0000	1.19
@@ -1 +1 @@
-0353f7690e7a3ebddd530b21cc980846  wordpress-2.6.1.tar.gz
+87cd53c95231774c95b8e116a50807d0  wordpress-2.6.2.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/wordpress.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- wordpress.spec	24 Aug 2008 22:33:05 -0000	1.22
+++ wordpress.spec	9 Sep 2008 08:24:38 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.6.1
+Version: 2.6.2
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: GPLv2
@@ -75,6 +75,9 @@
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Tue Sep 09 2008 Adrian Reber <adrian at lisas.de> - 2.6.2-1
+- updated to 2.6.2
+
 * Sun Aug 24 2008 Adrian Reber <adrian at lisas.de> - 2.6.1-1
 - updated to 2.6.1
 



From adrian at fedoraproject.org  Tue Sep  9 08:31:57 2008
From: adrian at fedoraproject.org (Adrian Reber)
Date: Tue,  9 Sep 2008 08:31:57 +0000 (UTC)
Subject: rpms/wordpress/F-8 .cvsignore, 1.16, 1.17 sources, 1.16,
	1.17 wordpress.spec, 1.20, 1.21
Message-ID: <20080909083157.C875C7012A@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20017

Modified Files:
	.cvsignore sources wordpress.spec 
Log Message:
* Tue Sep 09 2008 Adrian Reber <adrian at lisas.de> - 2.6.2-1
- updated to 2.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-8/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	28 Aug 2008 21:25:51 -0000	1.16
+++ .cvsignore	9 Sep 2008 08:31:27 -0000	1.17
@@ -1 +1 @@
-wordpress-2.6.1.tar.gz
+wordpress-2.6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-8/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	28 Aug 2008 21:25:51 -0000	1.16
+++ sources	9 Sep 2008 08:31:27 -0000	1.17
@@ -1 +1 @@
-0353f7690e7a3ebddd530b21cc980846  wordpress-2.6.1.tar.gz
+87cd53c95231774c95b8e116a50807d0  wordpress-2.6.2.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-8/wordpress.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wordpress.spec	28 Aug 2008 21:25:51 -0000	1.20
+++ wordpress.spec	9 Sep 2008 08:31:27 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.6.1
+Version: 2.6.2
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: GPLv2
@@ -75,6 +75,9 @@
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Tue Sep 09 2008 Adrian Reber <adrian at lisas.de> - 2.6.2-1
+- updated to 2.6.2
+
 * Sun Aug 24 2008 Adrian Reber <adrian at lisas.de> - 2.6.1-1
 - updated to 2.6.1
 



From adrian at fedoraproject.org  Tue Sep  9 08:33:37 2008
From: adrian at fedoraproject.org (Adrian Reber)
Date: Tue,  9 Sep 2008 08:33:37 +0000 (UTC)
Subject: rpms/wordpress/F-9 .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 wordpress.spec, 1.21, 1.22
Message-ID: <20080909083337.A97F27012A@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20455

Modified Files:
	.cvsignore sources wordpress.spec 
Log Message:
* Tue Sep 09 2008 Adrian Reber <adrian at lisas.de> - 2.6.2-1
- updated to 2.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-9/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	28 Aug 2008 21:19:34 -0000	1.17
+++ .cvsignore	9 Sep 2008 08:33:07 -0000	1.18
@@ -1 +1 @@
-wordpress-2.6.1.tar.gz
+wordpress-2.6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-9/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	28 Aug 2008 21:19:34 -0000	1.17
+++ sources	9 Sep 2008 08:33:07 -0000	1.18
@@ -1 +1 @@
-0353f7690e7a3ebddd530b21cc980846  wordpress-2.6.1.tar.gz
+87cd53c95231774c95b8e116a50807d0  wordpress-2.6.2.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-9/wordpress.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- wordpress.spec	28 Aug 2008 21:19:34 -0000	1.21
+++ wordpress.spec	9 Sep 2008 08:33:07 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.6.1
+Version: 2.6.2
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: GPLv2
@@ -75,6 +75,9 @@
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Tue Sep 09 2008 Adrian Reber <adrian at lisas.de> - 2.6.2-1
+- updated to 2.6.2
+
 * Sun Aug 24 2008 Adrian Reber <adrian at lisas.de> - 2.6.1-1
 - updated to 2.6.1
 



From adrian at fedoraproject.org  Tue Sep  9 08:35:21 2008
From: adrian at fedoraproject.org (Adrian Reber)
Date: Tue,  9 Sep 2008 08:35:21 +0000 (UTC)
Subject: rpms/wordpress/EL-5 .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 wordpress.spec, 1.23, 1.24
Message-ID: <20080909083521.3908E7012A@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20814

Modified Files:
	.cvsignore sources wordpress.spec 
Log Message:
* Tue Sep 09 2008 Adrian Reber <adrian at lisas.de> - 2.6.2-1
- updated to 2.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/EL-5/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	28 Aug 2008 21:38:17 -0000	1.17
+++ .cvsignore	9 Sep 2008 08:34:50 -0000	1.18
@@ -1 +1 @@
-wordpress-2.6.1.tar.gz
+wordpress-2.6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/EL-5/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	28 Aug 2008 21:38:18 -0000	1.17
+++ sources	9 Sep 2008 08:34:50 -0000	1.18
@@ -1 +1 @@
-0353f7690e7a3ebddd530b21cc980846  wordpress-2.6.1.tar.gz
+87cd53c95231774c95b8e116a50807d0  wordpress-2.6.2.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/EL-5/wordpress.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- wordpress.spec	28 Aug 2008 21:38:18 -0000	1.23
+++ wordpress.spec	9 Sep 2008 08:34:50 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.6.1
+Version: 2.6.2
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: GPLv2
@@ -75,6 +75,9 @@
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Tue Sep 09 2008 Adrian Reber <adrian at lisas.de> - 2.6.2-1
+- updated to 2.6.2
+
 * Sun Aug 24 2008 Adrian Reber <adrian at lisas.de> - 2.6.1-1
 - updated to 2.6.1
 



From belegdol at fedoraproject.org  Tue Sep  9 08:39:01 2008
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Tue,  9 Sep 2008 08:39:01 +0000 (UTC)
Subject: rpms/gchempaint/devel dead.package, NONE, 1.1 .cvsignore, 1.11,
	NONE Makefile, 1.1, NONE gchempaint.spec, 1.22, NONE sources,
	1.11, NONE
Message-ID: <20080909083901.7AB137012A@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gchempaint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21494

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gchempaint.spec sources 
Log Message:
GChemPaint is now a part of Gnome Chemistry Utils


--- NEW FILE dead.package ---
GChemPaint is now a part of Gnome Chemistry Utils.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gchempaint.spec DELETED ---


--- sources DELETED ---



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:00 +0000
Subject: [pkgdb] facter: kanarip has requested watchcommits
Message-ID: <20080909084100.F1CA520876F@bastion.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on facter (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:02 +0000
Subject: [pkgdb] facter: kanarip has requested watchbugzilla
Message-ID: <20080909084102.56C4E208D1E@bastion.fedora.phx.redhat.com>

kanarip has requested the watchbugzilla acl on facter (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:04 +0000
Subject: [pkgdb] facter: kanarip has requested approveacls
Message-ID: <20080909084104.D9329208D9B@bastion.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on facter (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:03 +0000
Subject: [pkgdb] facter: kanarip has requested commit
Message-ID: <20080909084103.208D7208D98@bastion.fedora.phx.redhat.com>

kanarip has requested the commit acl on facter (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:05 +0000
Subject: [pkgdb] facter: kanarip has requested watchbugzilla
Message-ID: <20080909084105.D55C3208D9F@bastion.fedora.phx.redhat.com>

kanarip has requested the watchbugzilla acl on facter (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:07 +0000
Subject: [pkgdb] facter: kanarip has requested commit
Message-ID: <20080909084107.BD2A3208DA2@bastion.fedora.phx.redhat.com>

kanarip has requested the commit acl on facter (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:08 +0000
Subject: [pkgdb] facter: kanarip has requested watchcommits
Message-ID: <20080909084109.0D72B208DA6@bastion.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on facter (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:09 +0000
Subject: [pkgdb] facter: kanarip has requested approveacls
Message-ID: <20080909084109.E2EC8208DA9@bastion.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on facter (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:30 +0000
Subject: [pkgdb] facter: kanarip has requested watchbugzilla
Message-ID: <20080909084130.9C7D420876F@bastion.fedora.phx.redhat.com>

kanarip has requested the watchbugzilla acl on facter (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:31 +0000
Subject: [pkgdb] facter: kanarip has requested watchcommits
Message-ID: <20080909084131.27EC9208D1E@bastion.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on facter (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:32 +0000
Subject: [pkgdb] facter: kanarip has requested commit
Message-ID: <20080909084132.333B0208DAF@bastion.fedora.phx.redhat.com>

kanarip has requested the commit acl on facter (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:31 +0000
Subject: [pkgdb] facter: kanarip has requested approveacls
Message-ID: <20080909084132.330C8208DAE@bastion.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on facter (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:40 +0000
Subject: [pkgdb] facter: kanarip has requested watchcommits
Message-ID: <20080909084140.87B5D208D9A@bastion.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on facter (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:39 +0000
Subject: [pkgdb] facter: kanarip has requested watchbugzilla
Message-ID: <20080909084140.A8E48208DB3@bastion.fedora.phx.redhat.com>

kanarip has requested the watchbugzilla acl on facter (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:42 +0000
Subject: [pkgdb] facter: kanarip has requested approveacls
Message-ID: <20080909084142.76905208DB7@bastion.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on facter (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:44 +0000
Subject: [pkgdb] facter: kanarip has requested commit
Message-ID: <20080909084144.5C637208DBB@bastion.fedora.phx.redhat.com>

kanarip has requested the commit acl on facter (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:45 +0000
Subject: [pkgdb] facter: kanarip has requested watchbugzilla
Message-ID: <20080909084145.B8751208DBE@bastion.fedora.phx.redhat.com>

kanarip has requested the watchbugzilla acl on facter (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:46 +0000
Subject: [pkgdb] facter: kanarip has requested watchcommits
Message-ID: <20080909084146.C6E85208DA1@bastion.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on facter (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:47 +0000
Subject: [pkgdb] facter: kanarip has requested commit
Message-ID: <20080909084148.4707F208D9F@bastion.fedora.phx.redhat.com>

kanarip has requested the commit acl on facter (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:41:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:41:51 +0000
Subject: [pkgdb] facter: kanarip has requested approveacls
Message-ID: <20080909084151.BA5D1208DC3@bastion.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on facter (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 08:45:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:45:04 +0000
Subject: [pkgdb] perl-Class-MethodMaker had acl change status
Message-ID: <20080909084504.5FC16208D7C@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on perl-Class-MethodMaker (Fedora devel) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Tue Sep  9 08:45:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:45:06 +0000
Subject: [pkgdb] perl-Class-MethodMaker had acl change status
Message-ID: <20080909084506.399AB208D97@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on perl-Class-MethodMaker (Fedora devel) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Tue Sep  9 08:45:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:45:34 +0000
Subject: [pkgdb] perl-Class-MethodMaker had acl change status
Message-ID: <20080909084534.5C276208770@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on perl-Class-MethodMaker (Fedora 8) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Tue Sep  9 08:45:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:45:35 +0000
Subject: [pkgdb] perl-Class-MethodMaker had acl change status
Message-ID: <20080909084535.F0F9D208D7C@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on perl-Class-MethodMaker (Fedora 8) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Tue Sep  9 08:45:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:45:38 +0000
Subject: [pkgdb] perl-Class-MethodMaker had acl change status
Message-ID: <20080909084538.61EF3208D9A@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on perl-Class-MethodMaker (Fedora 9) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Tue Sep  9 08:45:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:45:40 +0000
Subject: [pkgdb] perl-Class-MethodMaker had acl change status
Message-ID: <20080909084540.72B2F208D9B@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on perl-Class-MethodMaker (Fedora 9) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From pkgdb at fedoraproject.org  Tue Sep  9 08:49:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:49:18 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080909084918.D9C46208770@bastion.fedora.phx.redhat.com>

denis has set the watchbugzilla acl on libgnomedb (Fedora 8) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 08:49:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:49:21 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080909084921.EEA80208D7C@bastion.fedora.phx.redhat.com>

denis has set the watchcommits acl on libgnomedb (Fedora 8) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 08:49:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:49:26 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080909084926.A8663208D98@bastion.fedora.phx.redhat.com>

denis has set the commit acl on libgnomedb (Fedora 8) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 08:49:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:49:29 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080909084929.9DB2F208D9B@bastion.fedora.phx.redhat.com>

denis has set the approveacls acl on libgnomedb (Fedora 8) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 08:49:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:49:34 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080909084934.719E4208770@bastion.fedora.phx.redhat.com>

denis has set the watchbugzilla acl on libgnomedb (Fedora 9) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 08:49:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:49:37 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080909084937.1BE28208DA0@bastion.fedora.phx.redhat.com>

denis has set the watchcommits acl on libgnomedb (Fedora 9) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 08:49:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:49:54 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080909084954.82F5C208D99@bastion.fedora.phx.redhat.com>

denis has set the watchcommits acl on libgnomedb (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 08:49:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:49:56 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080909084956.893E4208D9C@bastion.fedora.phx.redhat.com>

denis has set the commit acl on libgnomedb (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 08:50:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:50:01 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080909085001.797FD208DA9@bastion.fedora.phx.redhat.com>

denis has set the approveacls acl on libgnomedb (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 08:56:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:56:00 +0000
Subject: [pkgdb] hunspell-gu was added for pnemade
Message-ID: <20080909085600.13E9C208771@bastion.fedora.phx.redhat.com>

petersen has added Package hunspell-gu with summary Gujarati hunspell dictionary
petersen has approved Package hunspell-gu
petersen has added a Fedora devel branch for hunspell-gu with an owner of pnemade
petersen has approved hunspell-gu in Fedora devel
petersen has approved Package hunspell-gu
petersen has set commit to Approved for packager on hunspell-gu (Fedora devel)
petersen has set build to Approved for packager on hunspell-gu (Fedora devel)
petersen has set checkout to Approved for packager on hunspell-gu (Fedora devel)
petersen has set commit to Approved for uberpackager on hunspell-gu (Fedora devel)
petersen has set build to Approved for uberpackager on hunspell-gu (Fedora devel)
petersen has set checkout to Approved for uberpackager on hunspell-gu (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-gu



From pkgdb at fedoraproject.org  Tue Sep  9 08:56:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:56:01 +0000
Subject: [pkgdb] hunspell-gu (Fedora, 9) updated by petersen
Message-ID: <20080909085601.0C332208D7C@bastion.fedora.phx.redhat.com>

petersen added a Fedora 9 branch for hunspell-gu
petersen has set commit to Approved for uberpackager on hunspell-gu (Fedora 9)
petersen has set build to Approved for uberpackager on hunspell-gu (Fedora 9)
petersen has set checkout to Approved for uberpackager on hunspell-gu (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-gu



From petersen at fedoraproject.org  Tue Sep  9 08:56:09 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue,  9 Sep 2008 08:56:09 +0000 (UTC)
Subject: rpms/hunspell-gu - New directory
Message-ID: <20080909085609.3468F7012A@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/hunspell-gu
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsW24077/rpms/hunspell-gu

Log Message:
Directory /cvs/extras/rpms/hunspell-gu added to the repository




From petersen at fedoraproject.org  Tue Sep  9 08:56:09 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue,  9 Sep 2008 08:56:09 +0000 (UTC)
Subject: rpms/hunspell-gu/devel - New directory
Message-ID: <20080909085609.72B117012A@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/hunspell-gu/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsW24077/rpms/hunspell-gu/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-gu/devel added to the repository




From petersen at fedoraproject.org  Tue Sep  9 08:56:10 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue,  9 Sep 2008 08:56:10 +0000 (UTC)
Subject: rpms/hunspell-gu Makefile,NONE,1.1
Message-ID: <20080909085610.66BC77012A@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/hunspell-gu
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsW24077/rpms/hunspell-gu

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-gu


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-gu
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Tue Sep  9 08:56:10 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue,  9 Sep 2008 08:56:10 +0000 (UTC)
Subject: rpms/hunspell-gu/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080909085610.A4CEC7012A@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/hunspell-gu/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsW24077/rpms/hunspell-gu/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-gu


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-gu
# $Id: Makefile,v 1.1 2008/09/09 08:56:10 petersen Exp $
NAME := hunspell-gu
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From caolanm at fedoraproject.org  Tue Sep  9 08:59:45 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  9 Sep 2008 08:59:45 +0000 (UTC)
Subject: rpms/hunspell/devel .cvsignore, 1.22, 1.23 hunspell.spec, 1.49,
	1.50 sources, 1.22, 1.23
Message-ID: <20080909085945.33FA17012A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24996

Modified Files:
	.cvsignore hunspell.spec sources 
Log Message:
add wordlist2hunspell


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	23 Aug 2008 18:54:33 -0000	1.22
+++ .cvsignore	9 Sep 2008 08:59:14 -0000	1.23
@@ -1,2 +1,3 @@
 ispellaff2myspell
+wordlist2hunspell
 hunspell-1.2.7.tar.gz


Index: hunspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/devel/hunspell.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- hunspell.spec	23 Aug 2008 18:54:33 -0000	1.49
+++ hunspell.spec	9 Sep 2008 08:59:14 -0000	1.50
@@ -1,9 +1,10 @@
 Name:      hunspell
 Summary:   Hunspell is a spell checker and morphological analyzer library
 Version:   1.2.7
-Release:   1%{?dist}
+Release:   2%{?dist}
 Source0:   http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz
 Source1:   http://people.debian.org/~agmartin/misc/ispellaff2myspell
+Source2:   http://people.redhat.com/caolanm/hunspell/wordlist2hunspell
 Group:     System Environment/Libraries
 URL:       http://hunspell.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,6 +59,7 @@
 mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell
 mv $RPM_BUILD_ROOT/%{_includedir}/*munch* $RPM_BUILD_ROOT/%{_includedir}/%{name}
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/ispellaff2myspell
+install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/wordlist2hunspell
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -88,12 +90,16 @@
 %{_bindir}/hzip
 %{_bindir}/hunzip
 %{_bindir}/ispellaff2myspell
+%{_bindir}/wordlist2hunspell
 %{_libdir}/pkgconfig/hunspell.pc
 %{_mandir}/man1/hunzip.1.gz
 %{_mandir}/man1/hzip.1.gz
 %{_mandir}/man3/hunspell.3.gz
 
 %changelog
+* Tue Sep 09 2008 Caolan McNamara <caolanm at redhat.com> - 1.2.7-2
+- add wordlist2hunspell
+
 * Sat Aug 23 2008 Caolan McNamara <caolanm at redhat.com> - 1.2.7-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	23 Aug 2008 18:54:33 -0000	1.22
+++ sources	9 Sep 2008 08:59:14 -0000	1.23
@@ -1,2 +1,3 @@
 1c5ea5ecd2481ddc116d65ea294acae3  ispellaff2myspell
+74ff5f41aaffbe5cda060ba67b179fed  wordlist2hunspell
 9a4f345c3cfaeb8e6306285488a3127a  hunspell-1.2.7.tar.gz



From pnemade at fedoraproject.org  Tue Sep  9 09:01:46 2008
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Tue,  9 Sep 2008 09:01:46 +0000 (UTC)
Subject: rpms/hunspell-gu/devel hunspell-gu.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080909090146.D85527012D@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hunspell-gu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25672/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-gu.spec import.log 
Log Message:

* Thu Sep 04 2008 Parag <pnemade at redhat.com> - 20061015-1
- Initial Fedora release





--- NEW FILE hunspell-gu.spec ---
Name: hunspell-gu
Summary: Gujarati hunspell dictionaries
Version: 20061015 
Release: 1%{?dist}
Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/gu_IN.zip
Group: Applications/Text
URL: http://wiki.services.openoffice.org/wiki/Dictionaries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPL+
BuildArch: noarch

Requires: hunspell

%description
Gujarati hunspell dictionaries.

%prep
%setup -q -c -n gu-IN

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_gu_IN.txt
%{_datadir}/myspell/*

%changelog
* Thu Sep 04 2008 Parag <pnemade at redhat.com> - 20061015-1
- Initial Fedora release


--- NEW FILE import.log ---
hunspell-gu-20061015-1_fc9:HEAD:hunspell-gu-20061015-1.fc9.src.rpm:1220950320


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-gu/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2008 08:56:10 -0000	1.1
+++ .cvsignore	9 Sep 2008 09:01:16 -0000	1.2
@@ -0,0 +1 @@
+gu_IN.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-gu/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2008 08:56:10 -0000	1.1
+++ sources	9 Sep 2008 09:01:16 -0000	1.2
@@ -0,0 +1 @@
+30b8978dad3daef98e1046c197f4cd1c  gu_IN.zip



From pkgdb at fedoraproject.org  Tue Sep  9 09:03:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:03:13 +0000
Subject: [pkgdb] libmatroska ownership updated
Message-ID: <20080909090314.0EAA0208770@bastion.fedora.phx.redhat.com>

Package libmatroska in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatroska



From pkgdb at fedoraproject.org  Tue Sep  9 09:03:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:03:18 +0000
Subject: [pkgdb] libmatroska ownership updated
Message-ID: <20080909090318.93EB1208D7C@bastion.fedora.phx.redhat.com>

Package libmatroska in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatroska



From pkgdb at fedoraproject.org  Tue Sep  9 09:03:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:03:24 +0000
Subject: [pkgdb] libmatroska ownership updated
Message-ID: <20080909090325.00B9E208D9A@bastion.fedora.phx.redhat.com>

Package libmatroska in Fedora 1 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatroska



From pkgdb at fedoraproject.org  Tue Sep  9 09:03:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:03:27 +0000
Subject: [pkgdb] libmatroska ownership updated
Message-ID: <20080909090327.86922208770@bastion.fedora.phx.redhat.com>

Package libmatroska in Fedora 2 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatroska



From pkgdb at fedoraproject.org  Tue Sep  9 09:03:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:03:39 +0000
Subject: [pkgdb] libmatroska ownership updated
Message-ID: <20080909090339.8ABD4208D0F@bastion.fedora.phx.redhat.com>

Package libmatroska in Fedora 3 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatroska



From pkgdb at fedoraproject.org  Tue Sep  9 09:03:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:03:56 +0000
Subject: [pkgdb] libmatroska ownership updated
Message-ID: <20080909090356.E3167208D7C@bastion.fedora.phx.redhat.com>

Package libmatroska in Fedora 4 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatroska



From pkgdb at fedoraproject.org  Tue Sep  9 09:04:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:04:02 +0000
Subject: [pkgdb] libmatroska ownership updated
Message-ID: <20080909090402.14DC5208D0F@bastion.fedora.phx.redhat.com>

Package libmatroska in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatroska



From pkgdb at fedoraproject.org  Tue Sep  9 09:04:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:04:48 +0000
Subject: [pkgdb] libmatroska ownership updated
Message-ID: <20080909090448.AD2E4208D0F@bastion.fedora.phx.redhat.com>

Package libmatroska in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatroska



From pkgdb at fedoraproject.org  Tue Sep  9 09:04:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:04:49 +0000
Subject: [pkgdb] libmatroska ownership updated
Message-ID: <20080909090449.518C2208D7C@bastion.fedora.phx.redhat.com>

Package libmatroska in Red Hat Linux 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatroska



From pkgdb at fedoraproject.org  Tue Sep  9 09:04:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:04:54 +0000
Subject: [pkgdb] libmatroska ownership updated
Message-ID: <20080909090454.884F4208D99@bastion.fedora.phx.redhat.com>

Package libmatroska in Red Hat Linux 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatroska



From pkgdb at fedoraproject.org  Tue Sep  9 09:04:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:04:55 +0000
Subject: [pkgdb] libmatroska ownership updated
Message-ID: <20080909090455.91EFC208D9B@bastion.fedora.phx.redhat.com>

Package libmatroska in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatroska



From pkgdb at fedoraproject.org  Tue Sep  9 09:04:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:04:58 +0000
Subject: [pkgdb] libmatroska ownership updated
Message-ID: <20080909090458.BB91E208770@bastion.fedora.phx.redhat.com>

Package libmatroska in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatroska



From pkgdb at fedoraproject.org  Tue Sep  9 08:49:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:49:43 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080909084943.21187208D0F@bastion.fedora.phx.redhat.com>

denis has set the approveacls acl on libgnomedb (Fedora 9) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 08:49:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:49:40 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080909084941.423D3208DA4@bastion.fedora.phx.redhat.com>

denis has set the commit acl on libgnomedb (Fedora 9) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Sep  9 08:49:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 08:49:49 +0000
Subject: [pkgdb] libgnomedb had acl change status
Message-ID: <20080909084949.2404B208D97@bastion.fedora.phx.redhat.com>

denis has set the watchbugzilla acl on libgnomedb (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From zprikryl at fedoraproject.org  Tue Sep  9 09:10:48 2008
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Tue,  9 Sep 2008 09:10:48 +0000 (UTC)
Subject: rpms/genromfs/devel genromfs-0.5.2-Makefile.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 genromfs.spec, 1.21, 1.22 sources, 1.3,
	1.4 genromfs-0.5.1.patch, 1.1, NONE
Message-ID: <20080909091048.E69C57012A@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/genromfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28124

Modified Files:
	.cvsignore genromfs.spec sources 
Added Files:
	genromfs-0.5.2-Makefile.patch 
Removed Files:
	genromfs-0.5.1.patch 
Log Message:
update to 0.5.2
update of a patch for Makefile


genromfs-0.5.2-Makefile.patch:

--- NEW FILE genromfs-0.5.2-Makefile.patch ---
--- genromfs-0.5.2/Makefile.zp	2008-09-09 11:04:53.000000000 +0200
+++ genromfs-0.5.2/Makefile	2008-09-09 11:05:06.000000000 +0200
@@ -49,11 +49,6 @@ install-bin:
 	install -m 755 genromfs $(PREFIX)$(bindir)/
 
 install-man:
-	# genromfs 0.5 installed the man page in this file,
-	# remove it before someone notices :)
-	if [ -f $(PREFIX)$(bindir)/man8 ]; then \
-		rm -f $(PREFIX)$(bindir)/man8; \
-	fi
 	mkdir -p $(PREFIX)$(mandir)/man8
 	install -m 644 genromfs.8 $(PREFIX)$(mandir)/man8/
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/genromfs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2004 05:05:01 -0000	1.3
+++ .cvsignore	9 Sep 2008 09:10:18 -0000	1.4
@@ -1 +1 @@
-genromfs-0.5.1.tar.gz
+genromfs-0.5.2.tar.gz


Index: genromfs.spec
===================================================================
RCS file: /cvs/extras/rpms/genromfs/devel/genromfs.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- genromfs.spec	6 Mar 2008 20:09:26 -0000	1.21
+++ genromfs.spec	9 Sep 2008 09:10:18 -0000	1.22
@@ -1,12 +1,12 @@
 Summary: Utility for creating romfs filesystems
 Name: genromfs
-Version: 0.5.1
-Release: 6
+Version: 0.5.2
+Release: 1
 License: GPLv2+
 Group: System Environment/Base
 URL: http://romfs.sourceforge.net/
 Source: http://downloads.sourceforge.net/romfs/%{name}-%{version}.tar.gz
-Patch: genromfs-0.5.1.patch
+Patch: genromfs-0.5.2-Makefile.patch
 ExclusiveOS: Linux
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,7 +20,7 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch -p1 -b .Makefile
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS"' -Wall -DVERSION=\"$(VERSION)\"' LDFLAGS="$RPM_OPT_FLAGS"
@@ -39,6 +39,10 @@
 %{_mandir}/man8/*
 
 %changelog
+* Tue Sep 09 2008 Zdenek Prikryl <zprikryl at redhat.com> - 0.5.2-1
+- update to 0.5.2
+- update of a patch for Makefile
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.1-6
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/genromfs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2004 05:05:01 -0000	1.3
+++ sources	9 Sep 2008 09:10:18 -0000	1.4
@@ -1 +1 @@
-fee69ecbf8f990fdb0ca0c7267c13e7e  genromfs-0.5.1.tar.gz
+2a91463c56f9e042edc330c063a0cf5a  genromfs-0.5.2.tar.gz


--- genromfs-0.5.1.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Sep  9 09:13:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:13:54 +0000
Subject: [pkgdb] aldrin ownership updated
Message-ID: <20080909091355.01CAB20876E@bastion.fedora.phx.redhat.com>

Package aldrin in Fedora devel was orphaned by akahl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aldrin



From pkgdb at fedoraproject.org  Tue Sep  9 09:13:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:13:59 +0000
Subject: [pkgdb] aldrin ownership updated
Message-ID: <20080909091359.592DB208D0F@bastion.fedora.phx.redhat.com>

Package aldrin in Fedora 7 was orphaned by akahl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aldrin



From pkgdb at fedoraproject.org  Tue Sep  9 09:14:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:14:01 +0000
Subject: [pkgdb] aldrin ownership updated
Message-ID: <20080909091401.6088A208D7C@bastion.fedora.phx.redhat.com>

Package aldrin in Fedora 8 was orphaned by akahl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aldrin



From pkgdb at fedoraproject.org  Tue Sep  9 09:14:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:14:03 +0000
Subject: [pkgdb] aldrin ownership updated
Message-ID: <20080909091403.AA75C208771@bastion.fedora.phx.redhat.com>

Package aldrin in Fedora 9 was orphaned by akahl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aldrin



From pkgdb at fedoraproject.org  Tue Sep  9 09:14:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:14:12 +0000
Subject: [pkgdb] libzzub ownership updated
Message-ID: <20080909091412.819BA208770@bastion.fedora.phx.redhat.com>

Package libzzub in Fedora 9 was orphaned by akahl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libzzub



From pkgdb at fedoraproject.org  Tue Sep  9 09:14:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:14:15 +0000
Subject: [pkgdb] libzzub ownership updated
Message-ID: <20080909091415.E6778208D1E@bastion.fedora.phx.redhat.com>

Package libzzub in Fedora 8 was orphaned by akahl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libzzub



From pkgdb at fedoraproject.org  Tue Sep  9 09:14:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:14:17 +0000
Subject: [pkgdb] libzzub ownership updated
Message-ID: <20080909091417.8BA13208D9B@bastion.fedora.phx.redhat.com>

Package libzzub in Fedora 7 was orphaned by akahl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libzzub



From pkgdb at fedoraproject.org  Tue Sep  9 09:14:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:14:19 +0000
Subject: [pkgdb] libzzub ownership updated
Message-ID: <20080909091419.F1711208D9E@bastion.fedora.phx.redhat.com>

Package libzzub in Fedora devel was orphaned by akahl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libzzub



From pkgdb at fedoraproject.org  Tue Sep  9 09:16:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:16:16 +0000
Subject: [pkgdb] libmatroska ownership updated
Message-ID: <20080909091616.0C2E7208D7C@bastion.fedora.phx.redhat.com>

Package libmatroska in Fedora 8 is now owned by mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatroska



From pkgdb at fedoraproject.org  Tue Sep  9 09:16:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:16:11 +0000
Subject: [pkgdb] libmatroska ownership updated
Message-ID: <20080909091612.0C212208771@bastion.fedora.phx.redhat.com>

Package libmatroska in Fedora devel is now owned by mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatroska



From pkgdb at fedoraproject.org  Tue Sep  9 09:16:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 09:16:21 +0000
Subject: [pkgdb] libmatroska ownership updated
Message-ID: <20080909091621.D93F7208D99@bastion.fedora.phx.redhat.com>

Package libmatroska in Fedora 9 is now owned by mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatroska



From transif at fedoraproject.org  Tue Sep  9 09:26:22 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Tue,  9 Sep 2008 09:26:22 +0000 (UTC)
Subject: comps/po ja.po,1.14,1.15
Message-ID: <20080909092622.4856F7012A@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1033/po

Modified Files:
	ja.po 
Log Message:
    2008-09-09  Noriko Mizumoto <noriko at redhat.com> (via
noriko at fedoraproject.org)
    
      * po/ja.po: translation completed 100%
    



Index: ja.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ja.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ja.po	17 Jul 2008 18:31:24 -0000	1.14
+++ ja.po	9 Sep 2008 09:25:51 -0000	1.15
@@ -4,17 +4,17 @@
 # Copyright (C) Red Hat Inc.2002
 #
 # James Hashida <khashida at redhat.com>, 2002.
-# Noriko Mizumoto <noriko at redhat.com>, 2003, 2006, 2007.
+# 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-17 14:29-0400\n"
-"PO-Revision-Date: 2008-04-14 16:52+1000\n"
-"Last-Translator: Kiyoto Hashida <khashida at redhat.com>\n"
-"Language-Team: Japanese <jp at li.org>\n"
+"POT-Creation-Date: 2008-09-09 03:30+0000\n"
+"PO-Revision-Date: 2008-09-09 19:23+1000\n"
+"Last-Translator: Noriko Mizumoto <noriko at redhat.com>\n"
+"Language-Team: Japanese <fedora-trans-ja at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -404,16 +404,14 @@
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:81
-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:82 ../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) ??????????????????????????????????????????????????????????????????????????????"
 "?????????????????????????????????????????????????????????"
@@ -548,147 +546,146 @@
 msgstr "MySQL ??????????????????"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:112
-#: ../comps-f10.xml.in.h:115 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
+#: ../comps-f10.xml.in.h:116 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:116 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
+#: ../comps-f10.xml.in.h:117 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:115
-#: ../comps-f10.xml.in.h:118
+#: ../comps-f10.xml.in.h:119
 msgid "Northern Sotho Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:119
+#: ../comps-f10.xml.in.h:120
 msgid "Norwegian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:120 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
+#: ../comps-f10.xml.in.h:121 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "Office/?????????"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:119
-#: ../comps-f10.xml.in.h:122
+#: ../comps-f10.xml.in.h:123
 msgid "Oriya Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:123 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
+#: ../comps-f10.xml.in.h:124 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:124
+#: ../comps-f10.xml.in.h:125
 msgid "Persian Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:125
+#: ../comps-f10.xml.in.h:126
 msgid "Polish Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:126
+#: ../comps-f10.xml.in.h:127
 msgid "Portuguese Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:127
+#: ../comps-f10.xml.in.h:128
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ??????????????????"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:128
+#: ../comps-f10.xml.in.h:129
 msgid "Printing Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:129
+#: ../comps-f10.xml.in.h:130
 msgid "Punjabi Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:130
+#: ../comps-f10.xml.in.h:131
 msgid "Romanian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:131
+#: ../comps-f10.xml.in.h:132
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:132
+#: ../comps-f10.xml.in.h:133
 msgid "Russian Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:132
-#: ../comps-f10.xml.in.h:135
+#: ../comps-f10.xml.in.h:136
 msgid "Samoan Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:136
+#: ../comps-f10.xml.in.h:137
 msgid "Serbian Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:137
+#: ../comps-f10.xml.in.h:138
 msgid "Server Configuration Tools"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:138 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
+#: ../comps-f10.xml.in.h:139 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:139 ../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."
+#: ../comps-f10.xml.in.h:140 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
+msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr ""
 "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 "??????"
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:140
+#: ../comps-f10.xml.in.h:141
 msgid "Sinhala Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:141
+#: ../comps-f10.xml.in.h:142
 msgid "Slovak Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:142
+#: ../comps-f10.xml.in.h:143
 msgid "Slovenian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:143
+#: ../comps-f10.xml.in.h:144
 msgid "Smallest possible installation"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:144 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
+#: ../comps-f10.xml.in.h:145 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:145
+#: ../comps-f10.xml.in.h:146
 msgid "Somali Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:146
+#: ../comps-f10.xml.in.h:147
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -697,72 +694,72 @@
 "???????????????????????????????????? Emacs ??? Vi ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:147 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
+#: ../comps-f10.xml.in.h:148 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:148
+#: ../comps-f10.xml.in.h:149
 msgid "Southern Ndebele Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:149
+#: ../comps-f10.xml.in.h:150
 msgid "Southern Sotho Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:150
+#: ../comps-f10.xml.in.h:151
 msgid "Spanish Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:151 ../comps-el4.xml.in.h:46
+#: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "Java ???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:47
+#: ../comps-f10.xml.in.h:153 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "Java ??????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:153
+#: ../comps-f10.xml.in.h:154
 msgid "Swati Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:154
+#: ../comps-f10.xml.in.h:155
 msgid "Swedish Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:155 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
+#: ../comps-f10.xml.in.h:156 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:156
+#: ../comps-f10.xml.in.h:157
 msgid "Tagalog Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:158
+#: ../comps-f10.xml.in.h:159
 msgid "Tamil Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:159
+#: ../comps-f10.xml.in.h:160
 msgid "Telugu Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:160 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
+#: ../comps-f10.xml.in.h:161 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "?????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:161
+#: ../comps-f10.xml.in.h:162
 msgid "Thai Support"
 msgstr "????????????????????????"
 
@@ -771,48 +768,43 @@
 msgstr "Eclipse ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:162 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
+#: ../comps-f10.xml.in.h:163 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr ""
 "????????????????????????????????????????????????????????????PDF ????????????????????????????????????????????????"
 "??????"
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:163
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+#: ../comps-f10.xml.in.h:164
+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:160
-#: ../comps-f10.xml.in.h:164 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
+#: ../comps-f10.xml.in.h:165 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "?????????????????????????????????IMAP ??? SMTP ?????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:165
-msgid ""
-"These packages allow you to develop applications for the X Window System."
-msgstr ""
-"?????????????????????????????? X Window System ??????????????????????????????????????????????????????"
+#: ../comps-f10.xml.in.h:166
+msgid "These packages allow you to develop applications for the X Window System."
+msgstr "?????????????????????????????? X Window System ??????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:166 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+#: ../comps-f10.xml.in.h:167 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:167
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+#: ../comps-f10.xml.in.h:168
+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:164
-#: ../comps-f10.xml.in.h:168
+#: ../comps-f10.xml.in.h:169
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -821,17 +813,17 @@
 "???????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:169
+#: ../comps-f10.xml.in.h:170
 msgid "These packages provide a virtualization environment."
 msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:170
+#: ../comps-f10.xml.in.h:171
 msgid "These packages provide compatibility with previous releases."
 msgstr "?????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:171
+#: ../comps-f10.xml.in.h:172
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -840,7 +832,7 @@
 "????????????????????????"
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:172
+#: ../comps-f10.xml.in.h:173
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -849,19 +841,17 @@
 "Postscript??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:173 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
+#: ../comps-f10.xml.in.h:174 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
-msgstr ""
-"?????????????????????????????????????????????????????? Web ???????????????????????????????????????????????????"
+msgstr "?????????????????????????????????????????????????????? Web ???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:174 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
+#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
-msgstr ""
-"?????????????????????????????????????????????????????? FTP ???????????????????????????????????????????????????"
+msgstr "?????????????????????????????????????????????????????? FTP ???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
+#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -870,21 +860,21 @@
 "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
+#: ../comps-f10.xml.in.h:177 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr ""
 "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 "??????"
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:177
+#: ../comps-f10.xml.in.h:178
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr ""
 "??????????????????????????????????????? Red Hat ????????????????????????????????????????????????????????????"
 "??????"
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:178
+#: ../comps-f10.xml.in.h:179
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -893,14 +883,14 @@
 "???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
+#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr ""
 "???????????????????????????????????????????????? Email???Web???????????????????????????????????????????????????"
 "?????????????????????"
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
+#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -909,13 +899,12 @@
 "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
+#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
-msgstr ""
-"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
+#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -924,7 +913,7 @@
 "??????????????????????????????????????????????????????????????? X Window System ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
+#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -933,20 +922,17 @@
 "?????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:184 ../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."
+#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "?????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
-msgid ""
-"This group is a collection of tools for various hardware specific utilities."
-msgstr ""
-"????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
+msgid "This group is a collection of tools for various hardware specific utilities."
+msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
+#: ../comps-f10.xml.in.h:187 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
 "client for connecting to SMB shares and tools to monitor network traffic."
@@ -955,15 +941,14 @@
 "?????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:187
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+#: ../comps-f10.xml.in.h:188
+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:184
-#: ../comps-f10.xml.in.h:188
+#: ../comps-f10.xml.in.h:189
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -972,136 +957,136 @@
 "??????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:189
+#: ../comps-f10.xml.in.h:190
 msgid "This package group contains packages useful for use with MySQL."
 msgstr ""
 "??????????????????????????????????????????MySQL ???????????????????????????????????????????????????????????????"
 "????????????"
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:190
+#: ../comps-f10.xml.in.h:191
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr ""
 "?????????????????????????????????????????? Postgresql ??????????????????????????????????????????????????????"
 "?????????????????????"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:191
+#: ../comps-f10.xml.in.h:192
 msgid "Tibetan Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:192
+#: ../comps-f10.xml.in.h:193
 msgid "Tonga Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:193 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
+#: ../comps-f10.xml.in.h:194 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Fedora ???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:194
+#: ../comps-f10.xml.in.h:195
 msgid "Tsonga Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:195
+#: ../comps-f10.xml.in.h:196
 msgid "Tswana Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:196
+#: ../comps-f10.xml.in.h:197
 msgid "Turkish Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:197
+#: ../comps-f10.xml.in.h:198
 msgid "Ukrainian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:198
+#: ../comps-f10.xml.in.h:199
 msgid "Urdu Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:199 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
+#: ../comps-f10.xml.in.h:200 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:200 ../comps-el5.xml.in.h:72
+#: ../comps-f10.xml.in.h:201 ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:201
+#: ../comps-f10.xml.in.h:202
 msgid "Venda Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:202
+#: ../comps-f10.xml.in.h:203
 msgid "Vietnamese Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:203
+#: ../comps-f10.xml.in.h:204
 msgid "Virtualization"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:201
-#: ../comps-f10.xml.in.h:205 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
+#: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
+#: ../comps-f10.xml.in.h:207 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "Web ????????????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:207
+#: ../comps-f10.xml.in.h:208
 msgid "Welsh Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:208 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
+#: ../comps-f10.xml.in.h:209 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:209
+#: ../comps-f10.xml.in.h:210
 msgid "Windows File Server"
 msgstr "Windows ????????????????????????"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:210
+#: ../comps-f10.xml.in.h:211
 msgid "X Software Development"
 msgstr "X ????????????????????????"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:211 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
+#: ../comps-f10.xml.in.h:212 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X Window System"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:212
+#: ../comps-f10.xml.in.h:213
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:213
+#: ../comps-f10.xml.in.h:214
 msgid "XFCE Software Development"
 msgstr "XFCE ????????????????????????"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:214
+#: ../comps-f10.xml.in.h:215
 msgid "Xhosa Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:215
+#: ../comps-f10.xml.in.h:216
 msgid "Zulu Support"
 msgstr "??????????????????????????????"
 
@@ -1137,64 +1122,61 @@
 msgid "Mongolian Support"
 msgstr "??????????????????????????????"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:114
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:115
 msgid "Nepali Support"
 msgstr "??????????????????????????????"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:121
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:122
 msgid "Older bitmap and vector fonts packages"
 msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44
-#, fuzzy
 msgid "Esperanto Support"
-msgstr "???????????????????????????"
+msgstr "????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashubian Support"
-msgstr "??????????????????????????????"
+msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:106
-#, fuzzy
 msgid "Macedonian Support"
-msgstr "??????????????????????????????"
+msgstr "?????????????????????????????????"
 
-#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:117
-#, fuzzy
+#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:118
 msgid "Northern Sami Support"
-msgstr "???????????????????????????"
+msgstr "?????????????????????????????????"
 
-#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:133
-#, fuzzy
+#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:134
 msgid "SUGAR Desktop Environment"
-msgstr "????????????????????????"
+msgstr "SUGAR ????????????????????????"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:134
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:135
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
-msgstr ""
+msgstr "SUGAR ??? OLPC XO ?????????????????????????????????????????????????????????"
 
-#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:204
-#, fuzzy
+#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:205
 msgid "Walloon Support"
-msgstr "????????????????????????"
+msgstr "???????????????????????????"
 
 #: ../comps-f10.xml.in.h:70
 msgid "Haskell"
-msgstr ""
+msgstr "Haskell"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
-msgstr ""
+msgstr "??????????????????"
 
 #: ../comps-f10.xml.in.h:77
 msgid "Input method packages for the input of international text."
-msgstr ""
+msgstr "????????????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f10.xml.in.h:157
-#, fuzzy
+#: ../comps-f10.xml.in.h:114
+msgid "Myanmar (Burmese) Support"
+msgstr "??????????????? (?????????) ??????????????????"
+
+#: ../comps-f10.xml.in.h:158
 msgid "Tajik Support"
-msgstr "????????????????????????"
+msgstr "???????????????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1245,18 +1227,15 @@
 msgstr "????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1264,69 +1243,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????"
 
-#~ msgid "British Support"
-#~ msgstr "????????????????????????"
-
-#~ msgid "Cluster Storage"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Clustering Support."
-#~ msgstr "??????????????????????????????????????????"
-
-#~ msgid "Libraries for applications built on older releases."
-#~ msgstr "????????????????????????????????????????????????????????????????????????????????????"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "?????????????????????????????????????????????"
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "???????????????????????????????????????????????????????????????????????????"
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "????????????????????? GFS ?????????????????????????????????????????????"
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "????????????????????? GFS ???????????????"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "??????????????????????????????????????????????????????????????????????????????????????????"
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "Java ?????????????????????????????????????????????"
-
-#~ msgid "Misc"
-#~ msgstr "Misc"
-
-#~ msgid "Misc packages"
-#~ msgstr "Misc ???????????????"
-
-#~ msgid "Multimedia"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "?????????????????????????????????????????????"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr "Red Hat Enterprise Linux ?????????????????????????????????????????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux Supplementary"
-#~ msgstr "Red Hat Enterprise Linux ??????"
-
-#~ msgid ""
-#~ "Components used for high performance networking and clustering, such as "
-#~ "Infiniband and RDMA."
-#~ msgstr ""
-#~ "Infiniband ??? RDMA ?????????????????????????????????????????????????????????????????????????????????"
-#~ "???????????? ?????????????????????????????????????????????"
-
-#~ msgid "OpenFabrics Enterprise Distribution"
-#~ msgstr "OpenFabrics Enterprise ?????????????????????????????????"
-
-#~ msgid "Virtualization Support."
-#~ msgstr "????????????????????????"



From pnemade at fedoraproject.org  Tue Sep  9 09:28:03 2008
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Tue,  9 Sep 2008 09:28:03 +0000 (UTC)
Subject: rpms/hunspell-gu/F-9 hunspell-gu.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20080909092803.0FDC77012A@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hunspell-gu/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1673

Modified Files:
	sources 
Added Files:
	hunspell-gu.spec 
Log Message:

* Thu Sep 04 2008 Parag <pnemade at redhat.com> - 20061015-1
- Initial Fedora release




--- NEW FILE hunspell-gu.spec ---
Name: hunspell-gu
Summary: Gujarati hunspell dictionaries
Version: 20061015 
Release: 1%{?dist}
Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/gu_IN.zip
Group: Applications/Text
URL: http://wiki.services.openoffice.org/wiki/Dictionaries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPL+
BuildArch: noarch

Requires: hunspell

%description
Gujarati hunspell dictionaries.

%prep
%setup -q -c -n gu-IN

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_gu_IN.txt
%{_datadir}/myspell/*

%changelog
* Thu Sep 04 2008 Parag <pnemade at redhat.com> - 20061015-1
- Initial Fedora release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-gu/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2008 08:56:10 -0000	1.1
+++ sources	9 Sep 2008 09:27:32 -0000	1.2
@@ -0,0 +1 @@
+30b8978dad3daef98e1046c197f4cd1c  gu_IN.zip



From hadess at fedoraproject.org  Tue Sep  9 09:34:24 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  9 Sep 2008 09:34:24 +0000 (UTC)
Subject: rpms/gvfs/devel .cvsignore, 1.23, 1.24 gvfs.spec, 1.68, 1.69 sources,
	1.23, 1.24
Message-ID: <20080909093424.5EA817012A@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4412

Modified Files:
	.cvsignore gvfs.spec sources 
Log Message:
* Tue Sep 09 2008 - Bastien Nocera <bnocera at redhat.com> - 0.99.7.1-1
- Update to 0.99.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	2 Sep 2008 08:21:25 -0000	1.23
+++ .cvsignore	9 Sep 2008 09:33:54 -0000	1.24
@@ -1 +1 @@
-gvfs-0.99.6.tar.bz2
+gvfs-0.99.7.1.tar.gz


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- gvfs.spec	2 Sep 2008 08:28:52 -0000	1.68
+++ gvfs.spec	9 Sep 2008 09:33:54 -0000	1.69
@@ -1,6 +1,6 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 0.99.6
+Version: 0.99.7.1
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -247,6 +247,9 @@
 
 
 %changelog
+* Tue Sep 09 2008 - Bastien Nocera <bnocera at redhat.com> - 0.99.7.1-1
+- Update to 0.99.7.1
+
 * Tue Sep  2 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.99.6-1
 - Update to 0.99.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	2 Sep 2008 08:21:25 -0000	1.23
+++ sources	9 Sep 2008 09:33:54 -0000	1.24
@@ -1 +1 @@
-dc009e9bcd868eb05c37561c56907c23  gvfs-0.99.6.tar.bz2
+42309331c1ee3282eab949a62875bc82  gvfs-0.99.7.1.tar.gz



From hadess at fedoraproject.org  Tue Sep  9 09:41:32 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  9 Sep 2008 09:41:32 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs.spec,1.69,1.70
Message-ID: <20080909094132.B797C7012A@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7509

Modified Files:
	gvfs.spec 
Log Message:
Fix source



Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- gvfs.spec	9 Sep 2008 09:33:54 -0000	1.69
+++ gvfs.spec	9 Sep 2008 09:41:02 -0000	1.70
@@ -5,7 +5,7 @@
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
-Source: http://download.gnome.org/sources/gvfs/0.99/gvfs-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gvfs/0.99/gvfs-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig
 BuildRequires: glib2-devel >= 2.17.4



From hadess at fedoraproject.org  Tue Sep  9 09:57:45 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  9 Sep 2008 09:57:45 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs.spec,1.70,1.71
Message-ID: <20080909095745.5D0F47012A@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13519

Modified Files:
	gvfs.spec 
Log Message:
* Tue Sep 09 2008 - Bastien Nocera <bnocera at redhat.com> - 0.99.7.1-2
- Somebody made the build system be obnoxious and point out my
  errors in obvious ways



Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- gvfs.spec	9 Sep 2008 09:41:02 -0000	1.70
+++ gvfs.spec	9 Sep 2008 09:57:15 -0000	1.71
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 0.99.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -247,6 +247,10 @@
 
 
 %changelog
+* Tue Sep 09 2008 - Bastien Nocera <bnocera at redhat.com> - 0.99.7.1-2
+- Somebody made the build system be obnoxious and point out my
+  errors in obvious ways
+
 * Tue Sep 09 2008 - Bastien Nocera <bnocera at redhat.com> - 0.99.7.1-1
 - Update to 0.99.7.1
 



From caolanm at fedoraproject.org  Tue Sep  9 10:22:05 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  9 Sep 2008 10:22:05 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1644,1.1645
Message-ID: <20080909102205.82AAF7012A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23316

Modified Files:
	openoffice.org.spec 
Log Message:
Gujarati now available


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1644
retrieving revision 1.1645
diff -u -r1.1644 -r1.1645
--- openoffice.org.spec	9 Sep 2008 07:17:35 -0000	1.1644
+++ openoffice.org.spec	9 Sep 2008 10:21:35 -0000	1.1645
@@ -749,6 +749,7 @@
 Summary: Gujarati language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-gu
 Requires: lohit-fonts-gujarati
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-gu_IN
@@ -760,7 +761,8 @@
 Summary: Punjabi language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: lohit-fonts-punjabi, hunspell-pa
+Requires: hunspell-pa
+Requires: lohit-fonts-punjabi
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-pa_IN
 
@@ -784,7 +786,8 @@
 Summary: Hindi language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: lohit-fonts-hindi, hunspell-hi
+Requires: hunspell-hi
+Requires: lohit-fonts-hindi
 Obsoletes: openoffice.org-langpack-hi-IN
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-hi_IN
@@ -1034,7 +1037,8 @@
 Summary: Tamil language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires:  lohit-fonts-tamil, hunspell-ta
+Requires:  hunspell-ta
+Requires:  lohit-fonts-tamil
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-ta_IN
 
@@ -1045,7 +1049,8 @@
 Summary: Thai language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: thaifonts-scalable, hunspell-th
+Requires: hunspell-th
+Requires: thaifonts-scalable
 Obsoletes: openoffice.org-langpack-th
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-th_TH
@@ -1162,7 +1167,8 @@
 Summary: Marathi language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: lohit-fonts-hindi, hunspell-mr
+Requires: hunspell-mr
+Requires: lohit-fonts-hindi
 Obsoletes: openoffice.org2-langpack-mr_IN
 
 %description langpack-mr_IN
@@ -1172,8 +1178,8 @@
 Summary: Malayalam language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: smc-fonts-meera
 Requires: hunspell-ml
+Requires: smc-fonts-meera
 Obsoletes: openoffice.org2-langpack-ml_IN
 
 %description langpack-ml_IN
@@ -1183,7 +1189,8 @@
 Summary: Oriya language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: lohit-fonts-oriya, hunspell-or
+Requires: hunspell-or
+Requires: lohit-fonts-oriya
 Obsoletes: openoffice.org2-langpack-or_IN
 
 %description langpack-or_IN



From pkgdb at fedoraproject.org  Tue Sep  9 10:14:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 10:14:52 +0000
Subject: [pkgdb] coda ownership updated
Message-ID: <20080909101452.D68C8208D99@bastion.fedora.phx.redhat.com>

Package coda in Fedora 8 is now owned by nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Tue Sep  9 10:14:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 10:14:51 +0000
Subject: [pkgdb] coda ownership updated
Message-ID: <20080909101451.61E7A208D7C@bastion.fedora.phx.redhat.com>

Package coda in Fedora 9 is now owned by nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From pkgdb at fedoraproject.org  Tue Sep  9 10:14:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 10:14:48 +0000
Subject: [pkgdb] coda ownership updated
Message-ID: <20080909101448.38162208771@bastion.fedora.phx.redhat.com>

Package coda in Fedora devel is now owned by nhorman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coda



From rrakus at fedoraproject.org  Tue Sep  9 11:20:43 2008
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Tue,  9 Sep 2008 11:20:43 +0000 (UTC)
Subject: rpms/system-config-kdump/devel
	system-config-kdump-1.0.14-fedora.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 sources, 1.3, 1.4 system-config-kdump.spec, 1.2, 1.3
Message-ID: <20080909112043.3FB3E7012A@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/system-config-kdump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12828

Modified Files:
	.cvsignore sources system-config-kdump.spec 
Added Files:
	system-config-kdump-1.0.14-fedora.patch 
Log Message:
Bump to version 1.0.14

system-config-kdump-1.0.14-fedora.patch:

--- NEW FILE system-config-kdump-1.0.14-fedora.patch ---
diff -up system-config-kdump-1.0.13/system-config-kdump.desktop.in.fedora system-config-kdump-1.0.13/system-config-kdump.desktop.in
--- system-config-kdump-1.0.13/system-config-kdump.desktop.in.fedora	2008-02-02 05:56:04.000000000 +0100
+++ system-config-kdump-1.0.13/system-config-kdump.desktop.in	2006-10-11 17:10:48.000000000 +0200
@@ -1,8 +1,8 @@
 [Desktop Entry]
 _Name=Kdump
 _Comment=Configure kernel crash dumps
-Categories=System;Settings;Application;GTK;
-Icon=system-config-kdump
+Categories=System;Application;SystemSetup;GTK;
+Icon=system-config-kdump.png
 Exec=/usr/bin/system-config-kdump
 Type=Application
 Terminal=false


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/system-config-kdump/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Feb 2008 23:36:04 -0000	1.3
+++ .cvsignore	9 Sep 2008 11:20:11 -0000	1.4
@@ -1 +1 @@
-system-config-kdump-1.0.13.tar.bz2
+system-config-kdump-1.0.14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-kdump/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Feb 2008 23:36:04 -0000	1.3
+++ sources	9 Sep 2008 11:20:11 -0000	1.4
@@ -1 +1 @@
-8e179c01a7c35bc8ddc5448a8ba190fc  system-config-kdump-1.0.13.tar.bz2
+92d526e53b588144d4740e199f42d113  system-config-kdump-1.0.14.tar.bz2


Index: system-config-kdump.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-kdump/devel/system-config-kdump.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- system-config-kdump.spec	18 Feb 2008 23:36:04 -0000	1.2
+++ system-config-kdump.spec	9 Sep 2008 11:20:11 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: A graphical interface for configuring kernel crash dumping
 Name: system-config-kdump
-Version: 1.0.13
-Release: 2%{?dist}
+Version: 1.0.14
+Release: 1%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPLv2+
 Group: System Environment/Base
@@ -18,6 +18,7 @@
 Requires: kexec-tools
 Requires(pre): gtk2 >= 2.8.20
 Requires(pre): hicolor-icon-theme
+Patch1: system-config-kdump-1.0.14-fedora.patch
 
 %description
 system-config-kdump is a graphical tool for configuring kernel crash
@@ -25,7 +26,7 @@
 
 %prep
 %setup -q
-
+%patch1 -p1 -b .fedora
 %build
 make
 
@@ -69,6 +70,9 @@
 %doc ChangeLog COPYING
 
 %changelog
+* Tue Sep 09 2008 Roman Rakus <rrakus at redhatm.com> 1.0.14-1
+- Bump to version 1.0.14
+
 * Fri Feb 01 2008 Dave Lehman <dlehman at redhat.com> 1.0.13-2%{?dist}
 - replace desktop file category "SystemSetup" with "Settings"
 



From pbrady at fedoraproject.org  Tue Sep  9 11:36:01 2008
From: pbrady at fedoraproject.org (=?utf-8?q?P=C3=A1draig_Brady?=)
Date: Tue,  9 Sep 2008 11:36:01 +0000 (UTC)
Subject: rpms/fslint/devel .cvsignore, 1.9, 1.10 fslint.spec, 1.15,
	1.16 sources, 1.9, 1.10
Message-ID: <20080909113601.32FA97012A@cvs1.fedora.phx.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18292

Modified Files:
	.cvsignore fslint.spec sources 
Log Message:
Update to 2.28


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	20 May 2008 21:35:17 -0000	1.9
+++ .cvsignore	9 Sep 2008 11:35:30 -0000	1.10
@@ -1 +1 @@
-fslint-2.26.tar.gz
+fslint-2.28.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/fslint.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fslint.spec	20 May 2008 21:35:17 -0000	1.15
+++ fslint.spec	9 Sep 2008 11:35:30 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           fslint
-Version:        2.26
+Version:        2.28
 Release:        1%{?dist}
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Tue Sep 09 2008 P??draig Brady <P at draigBrady.com> - 2.28-1
+- Update to 2.28
+
 * Tue May 20 2008 P??draig Brady <P at draigBrady.com> - 2.26-1
 - Update to 2.26
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 May 2008 21:35:17 -0000	1.9
+++ sources	9 Sep 2008 11:35:30 -0000	1.10
@@ -1 +1 @@
-edaee1b2514dbf190ecd8ba1d764f604  fslint-2.26.tar.gz
+e6a9946f7db9cbdb15f70a9fe79470fc  fslint-2.28.tar.gz



From rezso at fedoraproject.org  Tue Sep  9 11:48:34 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Tue,  9 Sep 2008 11:48:34 +0000 (UTC)
Subject: rpms/proj/devel import.log, NONE, 1.1 .cvsignore, 1.6, 1.7 proj.spec,
	1.15, 1.16 sources, 1.6, 1.7 proj.copyright, 1.1,
	NONE proj.copyright.patch, 1.1, NONE
Message-ID: <20080909114834.5FCC67012A@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/proj/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23602/devel

Modified Files:
	.cvsignore proj.spec sources 
Added Files:
	import.log 
Removed Files:
	proj.copyright proj.copyright.patch 
Log Message:
- new stable upstream
- new nad datumgrids
- drop debian license patch
- change homepage URLs
 ----------------------------------------------------------------------
 Modified Files:
 	devel/.cvsignore devel/proj.spec devel/sources 
 Added Files:
 	devel/import.log 
 Removed Files:
 	devel/proj.copyright devel/proj.copyright.patch 
 ----------------------------------------------------------------------



--- NEW FILE import.log ---
proj-4_6_1-1_fc10:HEAD:proj-4.6.1-1.fc10.src.rpm:1220960846


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proj/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Apr 2008 11:02:50 -0000	1.6
+++ .cvsignore	9 Sep 2008 11:48:03 -0000	1.7
@@ -1,2 +1,2 @@
-proj-datumgrid-1.3.zip
-proj-4.6.0.tar.gz
+proj-4.6.1.tar.gz
+proj-datumgrid-1.4.zip


Index: proj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proj/devel/proj.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- proj.spec	23 Apr 2008 11:02:50 -0000	1.15
+++ proj.spec	9 Sep 2008 11:48:04 -0000	1.16
@@ -1,15 +1,13 @@
-Name: proj
-Version: 4.6.0
-Release: 1%{?dist}
-Summary: Cartographic projection software (PROJ.4)
-
-Group: Applications/Engineering
-License: MIT
-URL: http://www.remotesensing.org/proj/
-Source0: ftp://ftp.remotesensing.org/pub/proj/proj-%{version}.tar.gz
-Source1: ftp://ftp.remotesensing.org/pub/proj/proj-datumgrid-1.3.zip
-Source2: http://packages.debian.org/changelogs/pool/main/p/proj/proj_4.4.8-3/proj.copyright
-Patch0: proj.copyright.patch
+Name:      proj
+Version:   4.6.1
+Release:   1%{?dist}
+Summary:   Cartographic projection software (PROJ.4)
+
+Group:     Applications/Engineering
+License:   MIT
+URL:       http://proj.osgeo.org
+Source0:   http://download.osgeo.org/proj/proj-%{version}.tar.gz
+Source1:   http://download.osgeo.org/proj/proj-datumgrid-1.4.zip
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libtool
@@ -46,11 +44,6 @@
 %prep
 %setup -q
 
-# Prepare copyright
-cp %{SOURCE2} ./
-%patch0 -p0 -b .buildroot
-cp proj.copyright COPYING
-
 # disable internal libtool to avoid hardcoded r-path
 for makefile in `find . -type f -name 'Makefile.in'`; do
 sed -i 's|@LIBTOOL@|%{_bindir}/libtool|g' $makefile
@@ -88,6 +81,7 @@
 # run tests for proj
 ./test27      $RPM_BUILD_ROOT%{_bindir}/%{name} || exit 0
 ./test83      $RPM_BUILD_ROOT%{_bindir}/%{name} || exit 0
+./testIGNF    $RPM_BUILD_ROOT%{_bindir}/%{name} || exit 0
 ./testntv2    $RPM_BUILD_ROOT%{_bindir}/%{name} || exit 0
 ./testvarious $RPM_BUILD_ROOT%{_bindir}/%{name} || exit 0
 popd
@@ -128,6 +122,12 @@
 %attr(0644,root,root) %{_datadir}/%{name}/epsg
 
 %changelog
+* Fri Sep 05 2008 Balint Cristian <rezso at rdsor.ro> - 4.6.1-1
+- new stable upstream
+- new nad datumgrids
+- drop debian license patch
+- change homepage URLs
+
 * Sun Apr 20 2008 Balint Cristian <rezso at rdsor.ro> - 4.6.0-1
 - new branch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proj/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Apr 2008 11:02:50 -0000	1.6
+++ sources	9 Sep 2008 11:48:04 -0000	1.7
@@ -1,2 +1,2 @@
-23a7ef9cd079c774f13d62375a4fe1e6  proj-datumgrid-1.3.zip
-975d9b5954869e53523726a9c0e0e070  proj-4.6.0.tar.gz
+7dbaab8431ad50c25669fd3fb28dc493  proj-4.6.1.tar.gz
+a975779e65f1125a28f55f9d18b4333d  proj-datumgrid-1.4.zip


--- proj.copyright DELETED ---


--- proj.copyright.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Sep  9 11:50:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 11:50:35 +0000
Subject: [pkgdb] pinball ownership updated
Message-ID: <20080909115035.F18C820876E@bastion.fedora.phx.redhat.com>

Package pinball in Fedora devel is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pinball



From pkgdb at fedoraproject.org  Tue Sep  9 11:50:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 11:50:39 +0000
Subject: [pkgdb] pinball ownership updated
Message-ID: <20080909115039.4C5C7208D1E@bastion.fedora.phx.redhat.com>

Package pinball in Fedora 8 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pinball



From pkgdb at fedoraproject.org  Tue Sep  9 11:50:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 11:50:41 +0000
Subject: [pkgdb] pinball ownership updated
Message-ID: <20080909115041.8E11D20876F@bastion.fedora.phx.redhat.com>

Package pinball in Fedora 9 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pinball



From pkgdb at fedoraproject.org  Tue Sep  9 11:51:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 11:51:09 +0000
Subject: [pkgdb] liquidwar ownership updated
Message-ID: <20080909115109.E63DA20876D@bastion.fedora.phx.redhat.com>

Package liquidwar in Fedora devel is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/liquidwar



From pkgdb at fedoraproject.org  Tue Sep  9 11:51:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 11:51:14 +0000
Subject: [pkgdb] liquidwar ownership updated
Message-ID: <20080909115114.24FCC208771@bastion.fedora.phx.redhat.com>

Package liquidwar in Fedora 8 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/liquidwar



From pkgdb at fedoraproject.org  Tue Sep  9 11:51:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 11:51:14 +0000
Subject: [pkgdb] liquidwar ownership updated
Message-ID: <20080909115114.7FAB1208D1E@bastion.fedora.phx.redhat.com>

Package liquidwar in Fedora 9 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/liquidwar



From pkgdb at fedoraproject.org  Tue Sep  9 11:51:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 11:51:38 +0000
Subject: [pkgdb] pipenightdreams ownership updated
Message-ID: <20080909115138.A1C7B20876D@bastion.fedora.phx.redhat.com>

Package pipenightdreams in Fedora devel is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pipenightdreams



From pkgdb at fedoraproject.org  Tue Sep  9 11:51:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 11:51:41 +0000
Subject: [pkgdb] pipenightdreams ownership updated
Message-ID: <20080909115141.84264208D1E@bastion.fedora.phx.redhat.com>

Package pipenightdreams in Fedora 8 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pipenightdreams



From pkgdb at fedoraproject.org  Tue Sep  9 11:51:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 11:51:42 +0000
Subject: [pkgdb] pipenightdreams ownership updated
Message-ID: <20080909115142.3FFDA208D97@bastion.fedora.phx.redhat.com>

Package pipenightdreams in Fedora 9 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pipenightdreams



From pkgdb at fedoraproject.org  Tue Sep  9 11:52:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 11:52:18 +0000
Subject: [pkgdb] xgalaxy ownership updated
Message-ID: <20080909115218.9248920876E@bastion.fedora.phx.redhat.com>

Package xgalaxy in Fedora devel is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xgalaxy



From pkgdb at fedoraproject.org  Tue Sep  9 11:52:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 11:52:21 +0000
Subject: [pkgdb] xgalaxy ownership updated
Message-ID: <20080909115221.2339E208D7C@bastion.fedora.phx.redhat.com>

Package xgalaxy in Fedora 8 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xgalaxy



From pkgdb at fedoraproject.org  Tue Sep  9 11:52:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 11:52:21 +0000
Subject: [pkgdb] xgalaxy ownership updated
Message-ID: <20080909115221.D9C6B208D99@bastion.fedora.phx.redhat.com>

Package xgalaxy in Fedora 9 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xgalaxy



From limb at fedoraproject.org  Tue Sep  9 11:56:42 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  9 Sep 2008 11:56:42 +0000 (UTC)
Subject: rpms/lilypond-doc/devel .cvsignore, 1.9, 1.10 lilypond-doc.spec, 1.8,
	1.9 sources, 1.9, 1.10
Message-ID: <20080909115642.97CCB7012A@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/lilypond-doc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26880

Modified Files:
	.cvsignore lilypond-doc.spec sources 
Log Message:
Updated to match lilypond.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond-doc/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Jan 2008 17:44:09 -0000	1.9
+++ .cvsignore	9 Sep 2008 11:56:12 -0000	1.10
@@ -1 +1 @@
-lilypond-2.10.33-1.documentation.tar.bz2
+lilypond-2.11.57-1.documentation.tar.bz2


Index: lilypond-doc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond-doc/devel/lilypond-doc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lilypond-doc.spec	3 Jan 2008 17:44:09 -0000	1.8
+++ lilypond-doc.spec	9 Sep 2008 11:56:12 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           lilypond-doc
-Version:        2.10.33
+Version:        2.11.57
 Release:        1%{?dist}
 Summary:        HTML documentation for LilyPond
 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Mon Sep 08 2008 Jon Ciesla <limb at jcomserv.net> 2.11.57-1
+- Update to 2.11.57.
+
 * Thu Jan  3 2008 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.33-1
 - Update to 2.10.33.
 - Compilation fails if the install section doesn't create $RPM_BUILD_ROOT.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond-doc/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Jan 2008 17:44:09 -0000	1.9
+++ sources	9 Sep 2008 11:56:12 -0000	1.10
@@ -1 +1 @@
-9dd76127afe9c4a8f10fa2910a375c53  lilypond-2.10.33-1.documentation.tar.bz2
+b387b6cdcc88887e38e7220e36d06552  lilypond-2.11.57-1.documentation.tar.bz2



From allisson at fedoraproject.org  Tue Sep  9 11:59:09 2008
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Tue,  9 Sep 2008 11:59:09 +0000 (UTC)
Subject: rpms/ruby-openid/devel import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 ruby-openid.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20080909115909.DF4887012A@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/ruby-openid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28017/devel

Modified Files:
	.cvsignore ruby-openid.spec sources 
Added Files:
	import.log 
Log Message:

Update to 2.1.2



--- NEW FILE import.log ---
ruby-openid-2_1_2-1_fc9:HEAD:ruby-openid-2.1.2-1.fc9.src.rpm:1220961512


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-openid/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 May 2008 00:05:11 -0000	1.3
+++ .cvsignore	9 Sep 2008 11:58:39 -0000	1.4
@@ -1 +1 @@
-ruby-openid-2.0.4.tar.bz2
+ruby-openid-2.1.2.tar.bz2


Index: ruby-openid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-openid/devel/ruby-openid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ruby-openid.spec	20 May 2008 00:05:11 -0000	1.2
+++ ruby-openid.spec	9 Sep 2008 11:58:39 -0000	1.3
@@ -2,7 +2,7 @@
 #%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 Name:           ruby-openid
-Version:        2.0.4
+Version:        2.1.2
 Release:        1%{?dist}
 Summary:        Ruby library for verifying and serving OpenID identities
 
@@ -74,6 +74,9 @@
 
 %changelog
 
+* Tue Sep  9 2008 Allisson Azevedo <allisson at gmail.com> 2.1.2-1
+- Update to 2.1.2
+
 * Mon May 19 2008 Allisson Azevedo <allisson at gmail.com> 2.0.4-1
 - Update to 2.0.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-openid/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 May 2008 00:05:11 -0000	1.3
+++ sources	9 Sep 2008 11:58:39 -0000	1.4
@@ -1 +1 @@
-f3338136545d5cf6d98fbdfb7c9d5080  ruby-openid-2.0.4.tar.bz2
+7586171b8eef8a0785871a8944e50396  ruby-openid-2.1.2.tar.bz2



From rbhalera at fedoraproject.org  Tue Sep  9 12:08:41 2008
From: rbhalera at fedoraproject.org (Rahul Bhalerao)
Date: Tue,  9 Sep 2008 12:08:41 +0000 (UTC)
Subject: rpms/lohit-fonts/devel .cvsignore, 1.8, 1.9 lohit-fonts.spec, 1.8, 
	1.9 sources, 1.8, 1.9
Message-ID: <20080909120841.9199B7012A@cvs1.fedora.phx.redhat.com>

Author: rbhalera

Update of /cvs/pkgs/rpms/lohit-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31721

Modified Files:
	.cvsignore lohit-fonts.spec sources 
Log Message:
New Upstream Version: lohit-fonts-2.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Aug 2008 10:37:09 -0000	1.8
+++ .cvsignore	9 Sep 2008 12:08:11 -0000	1.9
@@ -1 +1 @@
-lohit-fonts-2.3.0.tar.gz
+lohit-fonts-2.3.1.tar.gz


Index: lohit-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/lohit-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lohit-fonts.spec	20 Aug 2008 10:37:09 -0000	1.8
+++ lohit-fonts.spec	9 Sep 2008 12:08:11 -0000	1.9
@@ -2,7 +2,7 @@
 %define langlist        "bengali hindi gujarati tamil punjabi kannada malayalam oriya telugu marathi maithili kashmiri konkani nepali sindhi"
 
 Name:        lohit-fonts
-Version:     2.3.0
+Version:     2.3.1
 Release:     1%{?dist}
 Summary:     Free Indian truetype/opentype fonts
 
@@ -86,7 +86,10 @@
 
 %changelog
 
-* Wed Aug 20 2008 Rahul Bhalerao <rbhalera at redhat> - 2.3.0-1
+* Tue Sep 09 2008 Rahul Bhalerao <rbhalera at redhat.com> - 2.3.1-1
+- Bug 216400: [te_IN] anaconda GUI - Release Notes button overlaps with other text
+
+* Wed Aug 20 2008 Rahul Bhalerao <rbhalera at redhat.com> - 2.3.0-1
 - Forked Lohit Hindi into Marathi, Maithili, Kashmiri, Konkani, Sindhi and Nepali.
 - Bug 215902: [hi_IN, mr_IN]Incorrect extent of 0x093f when attached to a composite character which has width greater than a single character (hi_IN & maybe others)
 - Bug 445176: [ml_IN] Conjuncts combining with 0D30 do not form the pre based glyph


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Aug 2008 10:37:09 -0000	1.8
+++ sources	9 Sep 2008 12:08:11 -0000	1.9
@@ -1 +1 @@
-55d4e627e643ead3b44487b1347deaac  lohit-fonts-2.3.0.tar.gz
+ca26218fc6323633210c674fe9e2f9d2  lohit-fonts-2.3.1.tar.gz



From limb at fedoraproject.org  Tue Sep  9 12:24:15 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  9 Sep 2008 12:24:15 +0000 (UTC)
Subject: rpms/lilypond-doc/F-9 lilypond-doc.spec,1.8,1.9 sources,1.9,1.10
Message-ID: <20080909122415.99D677012A@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/lilypond-doc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4367

Modified Files:
	lilypond-doc.spec sources 
Log Message:
Update to match lilypond.



Index: lilypond-doc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond-doc/F-9/lilypond-doc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lilypond-doc.spec	3 Jan 2008 17:44:09 -0000	1.8
+++ lilypond-doc.spec	9 Sep 2008 12:23:45 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           lilypond-doc
-Version:        2.10.33
+Version:        2.11.57
 Release:        1%{?dist}
 Summary:        HTML documentation for LilyPond
 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Mon Sep 08 2008 Jon Ciesla <limb at jcomserv.net> 2.11.57-1
+- Update to 2.11.57.
+
 * Thu Jan  3 2008 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.33-1
 - Update to 2.10.33.
 - Compilation fails if the install section doesn't create $RPM_BUILD_ROOT.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond-doc/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Jan 2008 17:44:09 -0000	1.9
+++ sources	9 Sep 2008 12:23:45 -0000	1.10
@@ -1 +1 @@
-9dd76127afe9c4a8f10fa2910a375c53  lilypond-2.10.33-1.documentation.tar.bz2
+b387b6cdcc88887e38e7220e36d06552  lilypond-2.11.57-1.documentation.tar.bz2



From xulchris at fedoraproject.org  Tue Sep  9 12:52:52 2008
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Tue,  9 Sep 2008 12:52:52 +0000 (UTC)
Subject: rpms/poker3d/devel poker3d.spec,1.5,1.6
Message-ID: <20080909125252.DCEC27012A@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13373

Modified Files:
	poker3d.spec 
Log Message:
rebuild against osg-2.6.0 (bz #461372)


Index: poker3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker3d/devel/poker3d.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- poker3d.spec	16 May 2008 06:30:47 -0000	1.5
+++ poker3d.spec	9 Sep 2008 12:52:22 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           poker3d
 Version:        1.1.36
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Three dimensional multi-user online poker game
 
 Group:          Amusements/Games
@@ -161,6 +161,9 @@
 
 
 %changelog
+* Tue Sep 09 2008 Christopher Stone <chris.stone at gmail.com> 1.1.36-11
+- Rebuild against OSG-2.6.0
+
 * Fri May 16 2008 Ralf Cors??pius <rc040203 at freenet.de> - 1.1.36-10
 - Rebuild against OSG-2.4.0.
 



From pkgdb at fedoraproject.org  Tue Sep  9 11:50:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 11:50:39 +0000
Subject: [pkgdb] pinball ownership updated
Message-ID: <20080909115039.4C5C7208D1E@bastion.fedora.phx.redhat.com>

Package pinball in Fedora 8 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pinball



From pbrady at fedoraproject.org  Tue Sep  9 13:07:57 2008
From: pbrady at fedoraproject.org (=?utf-8?q?P=C3=A1draig_Brady?=)
Date: Tue,  9 Sep 2008 13:07:57 +0000 (UTC)
Subject: rpms/fslint/F-8 .cvsignore, 1.9, 1.10 fslint.spec, 1.15,
	1.16 sources, 1.9, 1.10
Message-ID: <20080909130757.71D977012A@cvs1.fedora.phx.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19587

Modified Files:
	.cvsignore fslint.spec sources 
Log Message:
Update to 2.28


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	20 May 2008 22:12:20 -0000	1.9
+++ .cvsignore	9 Sep 2008 13:07:27 -0000	1.10
@@ -1 +1 @@
-fslint-2.26.tar.gz
+fslint-2.28.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/F-8/fslint.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fslint.spec	20 May 2008 22:12:20 -0000	1.15
+++ fslint.spec	9 Sep 2008 13:07:27 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           fslint
-Version:        2.26
+Version:        2.28
 Release:        1%{?dist}
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Tue Sep 09 2008 P??draig Brady <P at draigBrady.com> - 2.28-1
+- Update to 2.28
+
 * Tue May 20 2008 P??draig Brady <P at draigBrady.com> - 2.26-1
 - Update to 2.26
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 May 2008 22:12:20 -0000	1.9
+++ sources	9 Sep 2008 13:07:27 -0000	1.10
@@ -1 +1 @@
-edaee1b2514dbf190ecd8ba1d764f604  fslint-2.26.tar.gz
+e6a9946f7db9cbdb15f70a9fe79470fc  fslint-2.28.tar.gz



From pbrady at fedoraproject.org  Tue Sep  9 13:09:11 2008
From: pbrady at fedoraproject.org (=?utf-8?q?P=C3=A1draig_Brady?=)
Date: Tue,  9 Sep 2008 13:09:11 +0000 (UTC)
Subject: rpms/fslint/F-9 .cvsignore, 1.9, 1.10 fslint.spec, 1.15,
	1.16 sources, 1.9, 1.10
Message-ID: <20080909130911.D2B707012A@cvs1.fedora.phx.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20263

Modified Files:
	.cvsignore fslint.spec sources 
Log Message:
Update to 2.28


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	20 May 2008 22:13:48 -0000	1.9
+++ .cvsignore	9 Sep 2008 13:08:41 -0000	1.10
@@ -1 +1 @@
-fslint-2.26.tar.gz
+fslint-2.28.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/F-9/fslint.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fslint.spec	20 May 2008 22:13:48 -0000	1.15
+++ fslint.spec	9 Sep 2008 13:08:41 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           fslint
-Version:        2.26
+Version:        2.28
 Release:        1%{?dist}
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Tue Sep 09 2008 P??draig Brady <P at draigBrady.com> - 2.28-1
+- Update to 2.28
+
 * Tue May 20 2008 P??draig Brady <P at draigBrady.com> - 2.26-1
 - Update to 2.26
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 May 2008 22:13:48 -0000	1.9
+++ sources	9 Sep 2008 13:08:41 -0000	1.10
@@ -1 +1 @@
-edaee1b2514dbf190ecd8ba1d764f604  fslint-2.26.tar.gz
+e6a9946f7db9cbdb15f70a9fe79470fc  fslint-2.28.tar.gz



From lennart at fedoraproject.org  Tue Sep  9 13:19:09 2008
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue,  9 Sep 2008 13:19:09 +0000 (UTC)
Subject: rpms/pavucontrol/devel .cvsignore, 1.8, 1.9 pavucontrol.spec, 1.10, 
	1.11 sources, 1.8, 1.9
Message-ID: <20080909131909.45C477012A@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pavucontrol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24396

Modified Files:
	.cvsignore pavucontrol.spec sources 
Log Message:
Update to 0.9.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	15 Jul 2008 11:39:53 -0000	1.8
+++ .cvsignore	9 Sep 2008 13:18:38 -0000	1.9
@@ -1 +1 @@
-pavucontrol-0.9.7.git20080715.tar.gz
+pavucontrol-0.9.7.tar.gz


Index: pavucontrol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/pavucontrol.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pavucontrol.spec	15 Jul 2008 11:39:53 -0000	1.10
+++ pavucontrol.spec	9 Sep 2008 13:18:38 -0000	1.11
@@ -1,20 +1,19 @@
-%define alphatag git20080715
-
 Name:           pavucontrol
 Version:        0.9.7
-Release:        0.1.%{alphatag}%{?dist}
+Release:        1%{?dist}
 Summary:        Volume control for PulseAudio
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://0pointer.de/lennart/projects/pavucontrol
-Source0:        http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.%{alphatag}.tar.gz
+Source0:        http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pulseaudio-lib-devel >= 0.9.7-0.10
 BuildRequires:  gtkmm24-devel libglademm24-devel
 BuildRequires:  libsigc++20-devel lynx
 BuildRequires:  desktop-file-utils
+BuildRequires:  libcanberra-devel
 Requires:	pulseaudio-lib >= 0.9.7-0.10
 
 %description
@@ -53,9 +52,12 @@
 %{_bindir}/pavucontrol
 %{_datadir}/pavucontrol
 %{_datadir}/applications/pavucontrol.desktop
-
+%{_datadir}/locale/*
 
 %changelog
+* Tue Sep 9 2008 Lennart Poettering <lpoetter at redhat.com> 0.9.7-1
+- Update to 0.9.7
+
 * Tue Jul 15 2008 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.1.git20080715
 - Update from GIT snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	15 Jul 2008 11:39:53 -0000	1.8
+++ sources	9 Sep 2008 13:18:38 -0000	1.9
@@ -1 +1 @@
-b46d18ac87d40a7b3df848d3b57df495  pavucontrol-0.9.7.git20080715.tar.gz
+ec5ebdc2cf7155719b7be95c3f3b7d4c  pavucontrol-0.9.7.tar.gz



From lkundrak at fedoraproject.org  Tue Sep  9 13:22:11 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  9 Sep 2008 13:22:11 +0000 (UTC)
Subject: rpms/perl-SOAP-Lite/devel SOAP-Lite-0.710.07-nil-value.patch, NONE, 
	1.1 perl-SOAP-Lite.spec, 1.11, 1.12
Message-ID: <20080909132211.299187012A@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-SOAP-Lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25666

Modified Files:
	perl-SOAP-Lite.spec 
Added Files:
	SOAP-Lite-0.710.07-nil-value.patch 
Log Message:
* Tue Sep 09 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.710.07-2
- Re-add the nil patch


SOAP-Lite-0.710.07-nil-value.patch:

--- NEW FILE SOAP-Lite-0.710.07-nil-value.patch ---
This adds support for <nil> value, a XML-RPC extension.
http://ontosys.com/xml-rpc/extensions.php

http://rt.cpan.org/Public/Bug/Display.html?id=20569

diff -up SOAP-Lite-0.710.07/lib/XMLRPC/Lite.pm.nil-value SOAP-Lite-0.710.07/lib/XMLRPC/Lite.pm
--- SOAP-Lite-0.710.07/lib/XMLRPC/Lite.pm.nil-value	2008-06-05 20:43:44.000000000 +0200
+++ SOAP-Lite-0.710.07/lib/XMLRPC/Lite.pm	2008-09-09 15:10:21.000000000 +0200
@@ -314,6 +314,9 @@ sub decode_value {
     elsif ($name =~ /^(?:param|fault)$/) {
         return scalar(($self->decode_object($children->[0]))[1]);
     }
+    elsif ($name =~ /^(?:nil)$/) {
+        return undef;
+    }
     else {
         die "wrong element '$name'\n";
     }


Index: perl-SOAP-Lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SOAP-Lite/devel/perl-SOAP-Lite.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-SOAP-Lite.spec	24 Jun 2008 21:11:30 -0000	1.11
+++ perl-SOAP-Lite.spec	9 Sep 2008 13:21:40 -0000	1.12
@@ -1,11 +1,13 @@
 Name: 		perl-SOAP-Lite
 Version:	0.710.07
-Release:    1%{?dist}
+Release:	2%{?dist}
 Summary:	Client and server side SOAP implementation
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL: 		http://search.cpan.org/dist/SOAP-Lite/
 Source0: 	http://search.cpan.org/CPAN/authors/id/B/BY/BYRNE/SOAP/SOAP-Lite-%{version}.tar.gz
+# Submitted upstream: http://rt.cpan.org/Public/Bug/Display.html?id=20569
+Patch0:		SOAP-Lite-0.710.07-nil-value.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -34,6 +36,7 @@
 
 %prep
 %setup -q -n SOAP-Lite-%{version}
+%patch0 -p1 -b .nil-value
 
 %build
 %{__perl} Makefile.PL --noprompt INSTALLDIRS=vendor
@@ -74,6 +77,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Sep 09 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.710.07-2
+- Re-add the nil patch
+
 * Tue Jun 24 2008 Mike McGrath <mmcgrath at redhat.com> - 0.710.07-1
 - Upstream released new version
 



From lkundrak at fedoraproject.org  Tue Sep  9 13:23:14 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  9 Sep 2008 13:23:14 +0000 (UTC)
Subject: rpms/perl-SOAP-Lite/devel SOAP-Lite-0.60a-paths.patch, 1.1,
	NONE SOAP-Lite-0.68-nil-value.patch, 1.1, NONE
Message-ID: <20080909132314.334FD7012A@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-SOAP-Lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26474

Removed Files:
	SOAP-Lite-0.60a-paths.patch SOAP-Lite-0.68-nil-value.patch 
Log Message:
Clean up the unused patches


--- SOAP-Lite-0.60a-paths.patch DELETED ---


--- SOAP-Lite-0.68-nil-value.patch DELETED ---



From lkundrak at fedoraproject.org  Tue Sep  9 13:26:57 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  9 Sep 2008 13:26:57 +0000 (UTC)
Subject: rpms/perl-SOAP-Lite/EL-5 SOAP-Lite-0.710.07-nil-value.patch, NONE, 
	1.1 perl-SOAP-Lite.spec, 1.11, 1.12 SOAP-Lite-0.60a-paths.patch,
	1.1, NONE SOAP-Lite-0.68-nil-value.patch, 1.1, NONE
Message-ID: <20080909132657.1C8117012A@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-SOAP-Lite/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27815

Modified Files:
	perl-SOAP-Lite.spec 
Added Files:
	SOAP-Lite-0.710.07-nil-value.patch 
Removed Files:
	SOAP-Lite-0.60a-paths.patch SOAP-Lite-0.68-nil-value.patch 
Log Message:
* Tue Sep 09 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.710.07-2
- Re-add the nil patch


SOAP-Lite-0.710.07-nil-value.patch:

--- NEW FILE SOAP-Lite-0.710.07-nil-value.patch ---
This adds support for <nil> value, a XML-RPC extension.
http://ontosys.com/xml-rpc/extensions.php

http://rt.cpan.org/Public/Bug/Display.html?id=20569

diff -up SOAP-Lite-0.710.07/lib/XMLRPC/Lite.pm.nil-value SOAP-Lite-0.710.07/lib/XMLRPC/Lite.pm
--- SOAP-Lite-0.710.07/lib/XMLRPC/Lite.pm.nil-value	2008-06-05 20:43:44.000000000 +0200
+++ SOAP-Lite-0.710.07/lib/XMLRPC/Lite.pm	2008-09-09 15:10:21.000000000 +0200
@@ -314,6 +314,9 @@ sub decode_value {
     elsif ($name =~ /^(?:param|fault)$/) {
         return scalar(($self->decode_object($children->[0]))[1]);
     }
+    elsif ($name =~ /^(?:nil)$/) {
+        return undef;
+    }
     else {
         die "wrong element '$name'\n";
     }


Index: perl-SOAP-Lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SOAP-Lite/EL-5/perl-SOAP-Lite.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-SOAP-Lite.spec	24 Jun 2008 21:19:20 -0000	1.11
+++ perl-SOAP-Lite.spec	9 Sep 2008 13:26:26 -0000	1.12
@@ -1,11 +1,13 @@
 Name: 		perl-SOAP-Lite
 Version:	0.710.07
-Release:    1%{?dist}
+Release:	2%{?dist}
 Summary:	Client and server side SOAP implementation
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL: 		http://search.cpan.org/dist/SOAP-Lite/
 Source0: 	http://search.cpan.org/CPAN/authors/id/B/BY/BYRNE/SOAP/SOAP-Lite-%{version}.tar.gz
+# Submitted upstream: http://rt.cpan.org/Public/Bug/Display.html?id=20569
+Patch0:		SOAP-Lite-0.710.07-nil-value.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -34,6 +36,7 @@
 
 %prep
 %setup -q -n SOAP-Lite-%{version}
+%patch0 -p1 -b .nil-value
 
 %build
 %{__perl} Makefile.PL --noprompt INSTALLDIRS=vendor
@@ -74,6 +77,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Sep 09 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.710.07-2
+- Re-add the nil patch
+
 * Tue Jun 24 2008 Mike McGrath <mmcgrath at redhat.com> - 0.710.07-1
 - Upstream released new version
 


--- SOAP-Lite-0.60a-paths.patch DELETED ---


--- SOAP-Lite-0.68-nil-value.patch DELETED ---



From lennart at fedoraproject.org  Tue Sep  9 13:31:47 2008
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue,  9 Sep 2008 13:31:47 +0000 (UTC)
Subject: rpms/pavucontrol/devel pavucontrol.spec,1.11,1.12
Message-ID: <20080909133147.808E97012A@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pavucontrol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29887

Modified Files:
	pavucontrol.spec 
Log Message:
Add intltool to deps


Index: pavucontrol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/pavucontrol.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pavucontrol.spec	9 Sep 2008 13:18:38 -0000	1.11
+++ pavucontrol.spec	9 Sep 2008 13:31:17 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           pavucontrol
 Version:        0.9.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Volume control for PulseAudio
 
 Group:          Applications/Multimedia
@@ -9,12 +9,13 @@
 Source0:        http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pulseaudio-lib-devel >= 0.9.7-0.10
+BuildRequires:  pulseaudio-lib-devel >= 0.9.12
 BuildRequires:  gtkmm24-devel libglademm24-devel
 BuildRequires:  libsigc++20-devel lynx
 BuildRequires:  desktop-file-utils
 BuildRequires:  libcanberra-devel
-Requires:	pulseaudio-lib >= 0.9.7-0.10
+BuildRequires:  intltool
+Requires:	pulseaudio-lib >= 0.9.12
 
 %description
 PulseAudio Volume Control (pavucontrol) is a simple GTK based volume control
@@ -55,6 +56,9 @@
 %{_datadir}/locale/*
 
 %changelog
+* Tue Sep 9 2008 Lennart Poettering <lpoetter at redhat.com> 0.9.7-2
+- Add intltool to deps
+
 * Tue Sep 9 2008 Lennart Poettering <lpoetter at redhat.com> 0.9.7-1
 - Update to 0.9.7
 



From pkgdb at fedoraproject.org  Tue Sep  9 13:34:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 13:34:22 +0000
Subject: [pkgdb] freetype1 ownership updated
Message-ID: <20080909133422.C50BE208770@bastion.fedora.phx.redhat.com>

Package freetype1 in Fedora devel is now owned by ajax

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetype1



From pkgdb at fedoraproject.org  Tue Sep  9 13:34:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 13:34:51 +0000
Subject: [pkgdb] freetype1 ownership updated
Message-ID: <20080909133451.2650A208770@bastion.fedora.phx.redhat.com>

Package freetype1 in Fedora 8 is now owned by ajax

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetype1



From pkgdb at fedoraproject.org  Tue Sep  9 13:34:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 13:34:52 +0000
Subject: [pkgdb] freetype1 ownership updated
Message-ID: <20080909133452.EC3CE208D7C@bastion.fedora.phx.redhat.com>

Package freetype1 in Fedora 9 is now owned by ajax

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetype1



From pkgdb at fedoraproject.org  Tue Sep  9 13:35:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 13:35:22 +0000
Subject: [pkgdb] i2c-tools ownership updated
Message-ID: <20080909133522.2193E208D7C@bastion.fedora.phx.redhat.com>

Package i2c-tools in Fedora devel is now owned by ajax

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/i2c-tools



From pkgdb at fedoraproject.org  Tue Sep  9 13:35:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 13:35:20 +0000
Subject: [pkgdb] i2c-tools ownership updated
Message-ID: <20080909133520.0D4FF208771@bastion.fedora.phx.redhat.com>

Package i2c-tools in Fedora 9 is now owned by ajax

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/i2c-tools



From pkgdb at fedoraproject.org  Tue Sep  9 13:36:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 13:36:24 +0000
Subject: [pkgdb] libXNVCtrl ownership updated
Message-ID: <20080909133624.A32AC208771@bastion.fedora.phx.redhat.com>

Package libXNVCtrl in Fedora devel is now owned by ajax

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXNVCtrl



From pkgdb at fedoraproject.org  Tue Sep  9 13:36:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 13:36:31 +0000
Subject: [pkgdb] libXNVCtrl ownership updated
Message-ID: <20080909133631.AADEB208D98@bastion.fedora.phx.redhat.com>

Package libXNVCtrl in Fedora 9 is now owned by ajax

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXNVCtrl



From pkgdb at fedoraproject.org  Tue Sep  9 13:36:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 13:36:28 +0000
Subject: [pkgdb] libXNVCtrl ownership updated
Message-ID: <20080909133628.9888D208D7C@bastion.fedora.phx.redhat.com>

Package libXNVCtrl in Fedora 8 is now owned by ajax

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXNVCtrl



From allisson at fedoraproject.org  Tue Sep  9 13:46:25 2008
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Tue,  9 Sep 2008 13:46:25 +0000 (UTC)
Subject: rpms/ruby-cairo/devel import.log, NONE, 1.1 .cvsignore, 1.5,
	1.6 ruby-cairo.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20080909134625.58BAD7012A@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/ruby-cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2395/devel

Modified Files:
	.cvsignore ruby-cairo.spec sources 
Added Files:
	import.log 
Log Message:

Update to 1.7.0



--- NEW FILE import.log ---
ruby-cairo-1_7_0-1_fc9:HEAD:ruby-cairo-1.7.0-1.fc9.src.rpm:1220967755


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-cairo/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 May 2008 03:15:21 -0000	1.5
+++ .cvsignore	9 Sep 2008 13:45:54 -0000	1.6
@@ -1 +1 @@
-rcairo-1.6.1.tar.gz
+rcairo-1.7.0.tar.gz


Index: ruby-cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-cairo/devel/ruby-cairo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ruby-cairo.spec	19 May 2008 03:15:21 -0000	1.5
+++ ruby-cairo.spec	9 Sep 2008 13:45:55 -0000	1.6
@@ -2,7 +2,7 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 Name:           ruby-cairo
-Version:        1.6.1
+Version:        1.7.0
 Release:        1%{?dist}
 Summary:        Ruby bindings for cairo
 
@@ -82,6 +82,9 @@
 
 %changelog
 
+* Tue Sep  9 2008 Allisson Azevedo <allisson at gmail.com> 1.7.0-1
+- Update to 1.7.0
+
 * Sun May 18 2008 Allisson Azevedo <allisson at gmail.com> 1.6.1-1
 - Update to 1.6.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-cairo/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 May 2008 03:15:21 -0000	1.5
+++ sources	9 Sep 2008 13:45:55 -0000	1.6
@@ -1 +1 @@
-bee39f5918095e6688c647bc3d95940b  rcairo-1.6.1.tar.gz
+ed9aed6d62b392200e9e078734a874ce  rcairo-1.7.0.tar.gz



From ajax at fedoraproject.org  Tue Sep  9 13:51:45 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  9 Sep 2008 13:51:45 +0000 (UTC)
Subject: rpms/xorg-x11-proto-devel/F-9 .cvsignore, 1.36, 1.37 sources, 1.34, 
	1.35 xorg-x11-proto-devel.spec, 1.74,
	1.75 inputproto-1.4.3-card32-sucks.patch, 1.1, NONE
Message-ID: <20080909135145.ACEDC7012A@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-proto-devel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4330/F-9

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Removed Files:
	inputproto-1.4.3-card32-sucks.patch 
Log Message:
Misc protocol module updates for xserver 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/F-9/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	7 Apr 2008 14:52:18 -0000	1.36
+++ .cvsignore	9 Sep 2008 13:51:15 -0000	1.37
@@ -2,14 +2,13 @@
 compositeproto-0.4.tar.bz2
 damageproto-1.1.0.tar.bz2
 dmxproto-2.2.2.tar.bz2
+dri2proto-1.1.tar.bz2
 evieext-1.0.2.tar.bz2
 fixesproto-4.0.tar.bz2
 fontcacheproto-0.1.2.tar.bz2
 fontsproto-2.0.2.tar.bz2
 glproto-1.4.9.tar.bz2
-inputproto-1.4.3.tar.bz2
 kbproto-1.0.3.tar.bz2
-randrproto-1.2.1.tar.bz2
 recordproto-1.13.2.tar.bz2
 renderproto-0.9.3.tar.bz2
 resourceproto-1.0.2.tar.bz2
@@ -17,7 +16,6 @@
 trapproto-3.4.3.tar.bz2
 videoproto-2.2.2.tar.bz2
 xcmiscproto-1.1.2.tar.bz2
-xextproto-7.0.2.tar.bz2
 xf86bigfontproto-1.1.2.tar.bz2
 xf86dgaproto-2.0.3.tar.bz2
 xf86driproto-2.0.4.tar.bz2
@@ -25,6 +23,8 @@
 xf86rushproto-1.1.2.tar.bz2
 xf86vidmodeproto-2.2.2.tar.bz2
 xineramaproto-1.1.2.tar.bz2
-xproto-7.0.12.tar.bz2
 xproxymanagementprotocol-1.0.2.tar.bz2
-dri2proto-1.1.tar.bz2
+inputproto-1.4.4.tar.bz2
+randrproto-1.2.2.tar.bz2
+xextproto-7.0.3.tar.bz2
+xproto-7.0.13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/F-9/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	7 Apr 2008 14:52:18 -0000	1.34
+++ sources	9 Sep 2008 13:51:15 -0000	1.35
@@ -2,14 +2,13 @@
 6281344d656d4e0c8e9db4918efe3d1d  compositeproto-0.4.tar.bz2
 33ee591e0b1ca5ad7902934541db7d24  damageproto-1.1.0.tar.bz2
 d80acad88411e7944b9b085463d53302  dmxproto-2.2.2.tar.bz2
+1d70f0653b0b3a837853262dc5d34da4  dri2proto-1.1.tar.bz2
 2507b5d0f4b2848147fbddd155aa6cfe  evieext-1.0.2.tar.bz2
 8b298cc3424597f8138c7faf7763dce9  fixesproto-4.0.tar.bz2
 60df6b625074a9790e28543dcea71651  fontcacheproto-0.1.2.tar.bz2
 c946f166107b016a21cc7a02e1132724  fontsproto-2.0.2.tar.bz2
 e60951628422663e60faeb400f27bac1  glproto-1.4.9.tar.bz2
-a0f0d8cf6fbf0db8ba3937d0cc16138d  inputproto-1.4.3.tar.bz2
 6092cdb0a1225f95356ddbe6c2abaad5  kbproto-1.0.3.tar.bz2
-e2e45564f8ce22e00e1360e79c8ccdeb  randrproto-1.2.1.tar.bz2
 0ed4706564a34fc2aff724aa16d3ff00  recordproto-1.13.2.tar.bz2
 598bc9a493deee2e48e4434e94467189  renderproto-0.9.3.tar.bz2
 b823b314e37eb19dae1f297951d2e933  resourceproto-1.0.2.tar.bz2
@@ -17,7 +16,6 @@
 3b713239e5e6b269b31cb665563358df  trapproto-3.4.3.tar.bz2
 44292d74a9a3c94b1ecb9d77a0da83e8  videoproto-2.2.2.tar.bz2
 fde0b050901f024b19159cdacdcfbd20  xcmiscproto-1.1.2.tar.bz2
-242388ab65dde3a3dd313eeee265e429  xextproto-7.0.2.tar.bz2
 a318c1e86123832d7b0c95fc7d47ef35  xf86bigfontproto-1.1.2.tar.bz2
 42fdcebc66efac02ab4beec2b1b0ad6e  xf86dgaproto-2.0.3.tar.bz2
 01470d088da3a8a3deefa8e1f45d69cb  xf86driproto-2.0.4.tar.bz2
@@ -25,6 +23,8 @@
 b6a96ffdae084e27487a58314008b000  xf86rushproto-1.1.2.tar.bz2
 f00844a63d6e76b69eb0eb5e41eed843  xf86vidmodeproto-2.2.2.tar.bz2
 1cc292c562962ad0ad3a253cae68c632  xineramaproto-1.1.2.tar.bz2
-388234421add6c1760b4fc99fcdc76b0  xproto-7.0.12.tar.bz2
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
-1d70f0653b0b3a837853262dc5d34da4  dri2proto-1.1.tar.bz2
+3a532379f226c34b36a5c585999f75e4  inputproto-1.4.4.tar.bz2
+0458f24d6a77ff4bc5182816f482afa1  randrproto-1.2.2.tar.bz2
+3a2e0252e853ab30b3bff05ac92ec61c  xextproto-7.0.3.tar.bz2
+7d26f45dca52632712a696e0631dc17b  xproto-7.0.13.tar.bz2


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/F-9/xorg-x11-proto-devel.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- xorg-x11-proto-devel.spec	7 Apr 2008 14:52:18 -0000	1.74
+++ xorg-x11-proto-devel.spec	9 Sep 2008 13:51:15 -0000	1.75
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.3
-Release: 12%{?dist}
+Release: 12.1%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -32,12 +32,12 @@
 Source7:  ftp://ftp.x.org/pub/individual/proto/fontsproto-2.0.2.tar.bz2
 Source8:  ftp://ftp.x.org/pub/individual/proto/glproto-1.4.9.tar.bz2
 Provides: glproto = 1.4.9
-Source9:  ftp://ftp.x.org/pub/individual/proto/inputproto-1.4.3.tar.bz2
-Provides: inputproto = 1.4.3
+Source9:  ftp://ftp.x.org/pub/individual/proto/inputproto-1.4.4.tar.bz2
+Provides: inputproto = 1.4.4
 Source10: ftp://ftp.x.org/pub/individual/proto/kbproto-1.0.3.tar.bz2
 Provides: kbproto = 1.0.3
-Source13: ftp://ftp.x.org/pub/individual/proto/randrproto-1.2.1.tar.bz2
-Provides: randrproto = 1.2.1
+Source13: ftp://ftp.x.org/pub/individual/proto/randrproto-1.2.2.tar.bz2
+Provides: randrproto = 1.2.2
 Source14: ftp://ftp.x.org/pub/individual/proto/recordproto-1.13.2.tar.bz2
 Source15: ftp://ftp.x.org/pub/individual/proto/renderproto-0.9.3.tar.bz2
 Provides: renderproto = 0.9.3
@@ -47,7 +47,8 @@
 Source18: ftp://ftp.x.org/pub/individual/proto/trapproto-3.4.3.tar.bz2
 Source19: ftp://ftp.x.org/pub/individual/proto/videoproto-2.2.2.tar.bz2
 Source20: ftp://ftp.x.org/pub/individual/proto/xcmiscproto-1.1.2.tar.bz2
-Source21: ftp://ftp.x.org/pub/individual/proto/xextproto-7.0.2.tar.bz2
+Source21: ftp://ftp.x.org/pub/individual/proto/xextproto-7.0.3.tar.bz2
+Provides: xextproto = 7.0.3
 Source22: ftp://ftp.x.org/pub/individual/proto/xf86bigfontproto-1.1.2.tar.bz2
 Source23: ftp://ftp.x.org/pub/individual/proto/xf86dgaproto-2.0.3.tar.bz2
 Provides: xf86dgaproto = 2.0.3
@@ -56,14 +57,12 @@
 Source26: ftp://ftp.x.org/pub/individual/proto/xf86rushproto-1.1.2.tar.bz2
 Source27: ftp://ftp.x.org/pub/individual/proto/xf86vidmodeproto-2.2.2.tar.bz2
 Source28: ftp://ftp.x.org/pub/individual/proto/xineramaproto-1.1.2.tar.bz2
-Source29: ftp://ftp.x.org/pub/individual/proto/xproto-7.0.12.tar.bz2
-Provides: xproto = 7.0.12
+Source29: ftp://ftp.x.org/pub/individual/proto/xproto-7.0.13.tar.bz2
+Provides: xproto = 7.0.13
 Source30: ftp://ftp.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
 Source31: http://xorg.freedesktop.org/archive/individual/proto/dri2proto-1.1.tar.bz2
 Provides: dri2proto = 1.1
 
-Patch0: inputproto-1.4.3-card32-sucks.patch
-
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.0.2-1
 
@@ -85,7 +84,6 @@
 
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 -a31
-%patch0 -p0 -b .card32
 
 %build
 
@@ -301,6 +299,12 @@
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Tue Sep 09 2008 Adam Jackson <ajax at redhat.com> 7.3-12.1
+- inputproto 1.4.4
+- randrproto 1.2.2
+- xextproto 7.0.3
+- xproto 7.0.13
+
 * Mon Apr 07 2008 Adam Jackson <ajax at redhat.com> 7.3-12
 - dri2proto 1.1.0
 


--- inputproto-1.4.3-card32-sucks.patch DELETED ---



From lennart at fedoraproject.org  Tue Sep  9 13:53:08 2008
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue,  9 Sep 2008 13:53:08 +0000 (UTC)
Subject: rpms/paprefs/devel paprefs.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <20080909135308.C89D67012A@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/paprefs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4813

Modified Files:
	paprefs.spec sources 
Log Message:
Update to 0.9.7


Index: paprefs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paprefs/devel/paprefs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- paprefs.spec	28 Aug 2008 19:42:09 -0000	1.8
+++ paprefs.spec	9 Sep 2008 13:52:38 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           paprefs
-Version:        0.9.6
-Release:        4%{?dist}
+Version:        0.9.7
+Release:        1%{?dist}
 Summary:        Management tool for PulseAudio
 
 Group:          Applications/Multimedia
@@ -12,7 +12,7 @@
 
 BuildRequires:  gconfmm26-devel libglademm24-devel lynx desktop-file-utils
 
-Patch1:         paprefs-gcc43.patch
+#Patch1:         paprefs-gcc43.patch
 
 %description
 PulseAudio Preferences (paprefs) is a simple GTK based configuration dialog
@@ -20,7 +20,7 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .gcc43
+#%patch1 -p1 -b .gcc43
 
 
 %build
@@ -53,6 +53,9 @@
 %{_datadir}/locale/*
 
 %changelog
+* Tue Sep 9 2008 Lennart Poettering <lpoetter at redhat.com> 0.9.7-1
+- Update to 0.9.7
+
 * Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.9.6-4
 - Include unowned directory /usr/share/paprefs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paprefs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Nov 2007 23:07:55 -0000	1.4
+++ sources	9 Sep 2008 13:52:38 -0000	1.5
@@ -1 +1 @@
-de5474d17aad63b40855a8815018cdf8  paprefs-0.9.6.tar.gz
+08407e55679c5ddd5bd4b20fe07bcd93  paprefs-0.9.7.tar.gz



From ajax at fedoraproject.org  Tue Sep  9 13:59:25 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  9 Sep 2008 13:59:25 +0000 (UTC)
Subject: rpms/xorg-x11-proto-devel/F-9 xorg-x11-proto-devel.spec,1.75,1.76
Message-ID: <20080909135925.3698E7012A@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-proto-devel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5957

Modified Files:
	xorg-x11-proto-devel.spec 
Log Message:
add xge proto headers to %%files


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/F-9/xorg-x11-proto-devel.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- xorg-x11-proto-devel.spec	9 Sep 2008 13:51:15 -0000	1.75
+++ xorg-x11-proto-devel.spec	9 Sep 2008 13:58:54 -0000	1.76
@@ -192,6 +192,7 @@
 %{_includedir}/X11/extensions/Xdbeproto.h
 %{_includedir}/X11/extensions/Xext.h
 %{_includedir}/X11/extensions/Xeviestr.h
+%{_includedir}/X11/extensions/Xge.h
 %{_includedir}/X11/extensions/Xinerama.h
 %{_includedir}/X11/extensions/Xv.h
 %{_includedir}/X11/extensions/XvMC.h
@@ -211,6 +212,8 @@
 %{_includedir}/X11/extensions/fontcache.h
 %{_includedir}/X11/extensions/fontcacheP.h
 %{_includedir}/X11/extensions/fontcachstr.h
+%{_includedir}/X11/extensions/ge.h
+%{_includedir}/X11/extensions/geproto.h
 %{_includedir}/X11/extensions/lbxstr.h
 %{_includedir}/X11/extensions/mitmiscstr.h
 %{_includedir}/X11/extensions/multibuf.h



From lennart at fedoraproject.org  Tue Sep  9 14:01:21 2008
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue,  9 Sep 2008 14:01:21 +0000 (UTC)
Subject: rpms/paprefs/devel paprefs.spec,1.9,1.10
Message-ID: <20080909140121.675387012A@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/paprefs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6534

Modified Files:
	paprefs.spec 
Log Message:
Include intltool in deps


Index: paprefs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paprefs/devel/paprefs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- paprefs.spec	9 Sep 2008 13:52:38 -0000	1.9
+++ paprefs.spec	9 Sep 2008 14:00:51 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           paprefs
 Version:        0.9.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Management tool for PulseAudio
 
 Group:          Applications/Multimedia
@@ -11,6 +11,7 @@
 Requires:       pulseaudio-module-gconf
 
 BuildRequires:  gconfmm26-devel libglademm24-devel lynx desktop-file-utils
+BuildRequires: intltool
 
 #Patch1:         paprefs-gcc43.patch
 
@@ -53,6 +54,9 @@
 %{_datadir}/locale/*
 
 %changelog
+* Tue Sep 9 2008 Lennart Poettering <lpoetter at redhat.com> 0.9.7-2
+- Include intltool in deps
+
 * Tue Sep 9 2008 Lennart Poettering <lpoetter at redhat.com> 0.9.7-1
 - Update to 0.9.7
 



From ajax at fedoraproject.org  Tue Sep  9 14:04:33 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  9 Sep 2008 14:04:33 +0000 (UTC)
Subject: rpms/xorg-x11-proto-devel/F-9 xorg-x11-proto-devel.spec,1.76,1.77
Message-ID: <20080909140433.C52C67012A@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-proto-devel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7445

Modified Files:
	xorg-x11-proto-devel.spec 
Log Message:
remove Xagstr.h


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/F-9/xorg-x11-proto-devel.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- xorg-x11-proto-devel.spec	9 Sep 2008 13:58:54 -0000	1.76
+++ xorg-x11-proto-devel.spec	9 Sep 2008 14:04:03 -0000	1.77
@@ -184,7 +184,6 @@
 %{_includedir}/X11/extensions/XShm.h
 %{_includedir}/X11/extensions/XTest.h
 %{_includedir}/X11/extensions/Xag.h
-%{_includedir}/X11/extensions/Xagsrv.h
 %{_includedir}/X11/extensions/Xagstr.h
 %{_includedir}/X11/extensions/Xcup.h
 %{_includedir}/X11/extensions/Xcupstr.h



From pkgdb at fedoraproject.org  Tue Sep  9 14:11:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 14:11:02 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20080909141102.4F390208770@bastion.fedora.phx.redhat.com>

Package ksensors in Fedora 8 is now owned by lyosnorezel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Tue Sep  9 14:11:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 14:11:04 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20080909141105.0D9E7208D0F@bastion.fedora.phx.redhat.com>

Package ksensors in Fedora 9 is now owned by lyosnorezel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksensors



From sgrubb at fedoraproject.org  Tue Sep  9 14:11:34 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue,  9 Sep 2008 14:11:34 +0000 (UTC)
Subject: rpms/libprelude/devel .cvsignore, 1.12, 1.13 libprelude.spec, 1.28, 
	1.29 sources, 1.13, 1.14
Message-ID: <20080909141134.7FDE07012A@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9005

Modified Files:
	.cvsignore libprelude.spec sources 
Log Message:
* Tue Sep 09 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.20.2-1
- New upstream bugfix release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	5 Sep 2008 18:25:12 -0000	1.12
+++ .cvsignore	9 Sep 2008 14:11:04 -0000	1.13
@@ -7,3 +7,4 @@
 libprelude-0.9.19.tar.gz
 libprelude-0.9.20.tar.gz
 libprelude-0.9.20.1.tar.gz
+libprelude-0.9.20.2.tar.gz


Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libprelude.spec	5 Sep 2008 18:25:12 -0000	1.28
+++ libprelude.spec	9 Sep 2008 14:11:04 -0000	1.29
@@ -4,7 +4,7 @@
 
 
 Name:		libprelude
-Version:	0.9.20.1
+Version:	0.9.20.2
 Release:	1%{?dist}
 Summary:	The prelude library        
 Group:		System Environment/Libraries 
@@ -157,6 +157,9 @@
 %{ruby_sitearch}/PreludeEasy.so
 
 %changelog
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 Sep 2008 18:25:12 -0000	1.13
+++ sources	9 Sep 2008 14:11:04 -0000	1.14
@@ -1 +1 @@
-e95aad53a4ea49a529dca31921470a1c  libprelude-0.9.20.1.tar.gz
+4980065cc9fc7f8d6f0ca25e902b745d  libprelude-0.9.20.2.tar.gz



From whot at fedoraproject.org  Tue Sep  9 14:14:07 2008
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue,  9 Sep 2008 14:14:07 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/devel
	xf86-input-synaptics-0.15.1-dont-crash-without-Device.patch,
	NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch, 1.1,
	1.2 xf86-input-synaptics-0.15.0-edges.patch, 1.2,
	1.3 xf86-input-synaptics-0.15.0-preprobe.patch, 1.1,
	1.2 xorg-x11-drv-synaptics.spec, 1.6, 1.7
Message-ID: <20080909141407.740447012A@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9757

Modified Files:
	.cvsignore sources 
	xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch 
	xf86-input-synaptics-0.15.0-edges.patch 
	xf86-input-synaptics-0.15.0-preprobe.patch 
	xorg-x11-drv-synaptics.spec 
Added Files:
	xf86-input-synaptics-0.15.1-dont-crash-without-Device.patch 
Log Message:
* Tue Sep 9 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.1-1
- update to 0.15.1
- remove xf86-input-synaptics-0.15.0-tap.patch: merged in upstream.
- update patches to apply against 0.15.1.
- xf86-input-synaptics-0.15.1-dont-crash-without-Device.patch: don't crash if
  neither Device nor Path is given.



xf86-input-synaptics-0.15.1-dont-crash-without-Device.patch:

--- NEW FILE xf86-input-synaptics-0.15.1-dont-crash-without-Device.patch ---
>From 5d3a47eed9f5330982d10c3acc15c486e3c86beb Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at redhat.com>
Date: Tue, 9 Sep 2008 19:12:35 +0930
Subject: [PATCH] Don't crash when neither Path nor Device are given.

xf86ReplaceOption doesn't seem to like NULL values
---
 src/synaptics.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/synaptics.c b/src/synaptics.c
index 3e55538..8475d1a 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -176,7 +176,8 @@ SetDeviceAndProtocol(LocalDevicePtr local)
     device = xf86FindOptionValue(local->options, "Device");
     if (!device) {
 	device = xf86FindOptionValue(local->options, "Path");
-	xf86ReplaceStrOption(local->options, "Device", device);
+	if (device)
+	    xf86ReplaceStrOption(local->options, "Device", device);
     }
     if (device && strstr(device, "/dev/input/event")) {
 #ifdef BUILD_EVENTCOMM
-- 
1.6.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Aug 2008 06:11:49 -0000	1.2
+++ .cvsignore	9 Sep 2008 14:13:36 -0000	1.3
@@ -1 +1 @@
-xf86-input-synaptics-0.15.0.tar.bz2
+xf86-input-synaptics-0.15.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Aug 2008 06:11:49 -0000	1.2
+++ sources	9 Sep 2008 14:13:36 -0000	1.3
@@ -1 +1 @@
-939f1c831c5cd3a6f027e982592dfc5b  xf86-input-synaptics-0.15.0.tar.bz2
+0a588c729295b9a91a05d9d157270917  xf86-input-synaptics-0.15.1.tar.bz2

xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch:

Index: xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch	2 Sep 2008 10:59:10 -0000	1.1
+++ xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch	9 Sep 2008 14:13:36 -0000	1.2
@@ -1,6 +1,6 @@
-From 8869d14f6169a8e3d94d43c5a0407e8621d9e431 Mon Sep 17 00:00:00 2001
+From 2bb34ea034ebab2a81d17fefe416c4adc80d3817 Mon Sep 17 00:00:00 2001
 From: Peter Hutterer <peter.hutterer at redhat.com>
-Date: Tue, 2 Sep 2008 19:55:19 +0930
+Date: Sat, 6 Sep 2008 03:03:42 +0930
 Subject: [PATCH] Don't lose button up event if timeout is cancelled in the same ReadInput cycle
 
 On a left/right button press, middle button emulation springs into action and
@@ -20,15 +20,15 @@
 
 Red Hat Bug 233717 <http://bugzilla.redhat.com/show_bug.cgi?id=233717>
 ---
- src/synaptics.c |   28 ++++++++++++++++++++++++++--
- src/synaptics.h |    4 +++-
+ src/synaptics.c    |   28 ++++++++++++++++++++++++++--
+ src/synapticsstr.h |    4 +++-
  2 files changed, 29 insertions(+), 3 deletions(-)
 
 diff --git a/src/synaptics.c b/src/synaptics.c
-index 50ebec6..d4b6e4e 100644
+index 3e55538..6027572 100644
 --- a/src/synaptics.c
 +++ b/src/synaptics.c
-@@ -865,6 +865,8 @@ HandleMidButtonEmulation(SynapticsPrivate *priv, struct SynapticsHwState *hw, in
+@@ -877,6 +877,8 @@ HandleMidButtonEmulation(SynapticsPrivate *priv, struct SynapticsHwState *hw, in
  
      while (!done) {
  	switch (priv->mid_emu_state) {
@@ -37,7 +37,7 @@
  	case MBE_OFF:
  	    priv->button_delay_millis = hw->millis;
  	    if (hw->left) {
-@@ -880,7 +882,12 @@ HandleMidButtonEmulation(SynapticsPrivate *priv, struct SynapticsHwState *hw, in
+@@ -892,7 +894,12 @@ HandleMidButtonEmulation(SynapticsPrivate *priv, struct SynapticsHwState *hw, in
  				 hw->millis);
  	    if (timeleft > 0)
  		*delay = MIN(*delay, timeleft);
@@ -51,7 +51,7 @@
  		hw->left = TRUE;
  		priv->mid_emu_state = MBE_TIMEOUT;
  		done = TRUE;
-@@ -896,7 +903,12 @@ HandleMidButtonEmulation(SynapticsPrivate *priv, struct SynapticsHwState *hw, in
+@@ -908,7 +915,12 @@ HandleMidButtonEmulation(SynapticsPrivate *priv, struct SynapticsHwState *hw, in
  				 hw->millis);
  	    if (timeleft > 0)
  		*delay = MIN(*delay, timeleft);
@@ -65,7 +65,7 @@
  		hw->right = TRUE;
  		priv->mid_emu_state = MBE_TIMEOUT;
  		done = TRUE;
-@@ -1889,6 +1901,18 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState *hw)
+@@ -1918,6 +1930,18 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState *hw)
      if (dx || dy)
  	xf86PostMotionEvent(local->dev, 0, 0, 2, dx, dy);
  
@@ -84,11 +84,11 @@
      change = buttons ^ priv->lastButtons;
      while (change) {
  	id = ffs(change); /* number of first set bit 1..32 is returned */
-diff --git a/src/synaptics.h b/src/synaptics.h
-index a24f8b6..afd093a 100644
---- a/src/synaptics.h
-+++ b/src/synaptics.h
-@@ -187,7 +187,9 @@ enum MidButtonEmulation {
+diff --git a/src/synapticsstr.h b/src/synapticsstr.h
+index ca61a9c..5d61d0e 100644
+--- a/src/synapticsstr.h
++++ b/src/synapticsstr.h
+@@ -54,7 +54,9 @@ enum MidButtonEmulation {
      MBE_RIGHT,			/* Right button pressed, waiting for left button or timeout */
      MBE_MID,			/* Left and right buttons pressed, waiting for both buttons
  				   to be released */
@@ -100,5 +100,5 @@
  
  /* See docs/tapndrag.dia for a state machine diagram */
 -- 
-1.5.6.4
+1.6.0.1
 

xf86-input-synaptics-0.15.0-edges.patch:

Index: xf86-input-synaptics-0.15.0-edges.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/xf86-input-synaptics-0.15.0-edges.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xf86-input-synaptics-0.15.0-edges.patch	8 Sep 2008 20:02:37 -0000	1.2
+++ xf86-input-synaptics-0.15.0-edges.patch	9 Sep 2008 14:13:36 -0000	1.3
@@ -1,6 +1,6 @@
-From af9e8eb1795135cad8368fc20625e78b73e3d3ce Mon Sep 17 00:00:00 2001
+From 9ab7e725daa21ceb487df324db62f2e0148b9f4e Mon Sep 17 00:00:00 2001
 From: Peter Hutterer <peter.hutterer at redhat.com>
-Date: Mon, 8 Sep 2008 21:23:46 +0930
+Date: Tue, 9 Sep 2008 00:27:36 +0930
 Subject: [PATCH] Improve edge autodetection and accel.
 
 The synaptics spec specifies "typical axis ranges" for synaptics devices.
@@ -9,16 +9,16 @@
 Based on the hard-coded ranges and acceleration, calculate accel for
 autodetected ranges in the same proportions.
 ---
- src/eventcomm.c |   12 ++++----
- src/synaptics.c |   81 ++++++++++++++++++++++++++++++++++++++++++-------------
- src/synaptics.h |    1 +
- 3 files changed, 69 insertions(+), 25 deletions(-)
+ src/eventcomm.c    |   12 ++++----
+ src/synaptics.c    |   82 ++++++++++++++++++++++++++++++++++++++++------------
+ src/synapticsstr.h |    1 +
+ 3 files changed, 70 insertions(+), 25 deletions(-)
 
 diff --git a/src/eventcomm.c b/src/eventcomm.c
-index 3d3e6cf..14c9cab 100644
+index 6c37dbd..8474c54 100644
 --- a/src/eventcomm.c
 +++ b/src/eventcomm.c
-@@ -106,11 +106,11 @@ event_query_is_touchpad(int fd)
+@@ -108,11 +108,11 @@ event_query_is_touchpad(int fd)
      return TRUE;
  }
  
@@ -32,7 +32,7 @@
      struct input_absinfo abs;
      int rc;
  
-@@ -119,8 +119,8 @@ event_query_axis_ranges(int fd, LocalDevicePtr local)
+@@ -121,8 +121,8 @@ event_query_axis_ranges(int fd, LocalDevicePtr local)
      {
  	xf86Msg(X_INFO, "%s: x-axis range %d - %d\n", local->name,
  		abs.minimum, abs.maximum);
@@ -43,7 +43,7 @@
      } else
  	xf86Msg(X_ERROR, "%s: failed to query axis range (%s)\n", local->name,
  		strerror(errno));
-@@ -130,8 +130,8 @@ event_query_axis_ranges(int fd, LocalDevicePtr local)
+@@ -132,8 +132,8 @@ event_query_axis_ranges(int fd, LocalDevicePtr local)
      {
  	xf86Msg(X_INFO, "%s: y-axis range %d - %d\n", local->name,
  		abs.minimum, abs.maximum);
@@ -55,10 +55,18 @@
  	xf86Msg(X_ERROR, "%s: failed to query axis range (%s)\n", local->name,
  		strerror(errno));
 diff --git a/src/synaptics.c b/src/synaptics.c
-index f1fc42c..f20e259 100644
+index 0a87be8..6cb49e1 100644
 --- a/src/synaptics.c
 +++ b/src/synaptics.c
-@@ -294,6 +294,10 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+@@ -13,6 +13,7 @@
+  * Copyright ? 2006 Christian Thaeter
+  * Copyright ? 2007 Joseph P. Skudlarek
+  * Copyright ? 2008 Fedor P. Goncharov
++ * Copyright ? 2008 Red Hat, Inc.
+  *
+  * Permission to use, copy, modify, distribute, and sell this software
+  * and its documentation for any purpose is hereby granted without
+@@ -307,6 +308,10 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
      char *repeater;
      pointer opts;
      int status;
@@ -69,7 +77,7 @@
  
      /* allocate memory for SynapticsPrivateRec */
      priv = xcalloc(1, sizeof(SynapticsPrivate));
-@@ -336,14 +340,6 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+@@ -349,14 +354,6 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
  
      xf86OptionListReport(opts);
  
@@ -84,7 +92,7 @@
      SetDeviceAndProtocol(local);
  
      /* open the touchpad device */
-@@ -370,11 +366,58 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+@@ -383,11 +380,58 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
      /* read the parameters */
      pars = &priv->synpara_default;
      pars->version = (PACKAGE_VERSION_MAJOR*10000+PACKAGE_VERSION_MINOR*100+PACKAGE_VERSION_PATCHLEVEL);
@@ -148,7 +156,7 @@
  
      pars->finger_low = xf86SetIntOption(opts, "FingerLow", 25);
      pars->finger_high = xf86SetIntOption(opts, "FingerHigh", 30);
-@@ -386,8 +429,8 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+@@ -399,8 +443,8 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
      pars->fast_taps = xf86SetIntOption(opts, "FastTaps", FALSE);
      pars->emulate_mid_button_time = xf86SetIntOption(opts, "EmulateMidButtonTime", 75);
      pars->emulate_twofinger_z = xf86SetIntOption(opts, "EmulateTwoFingerMinZ", 257);
@@ -157,9 +165,9 @@
 +    pars->scroll_dist_vert = xf86SetIntOption(opts, "VertScrollDelta", horizScrollDelta);
 +    pars->scroll_dist_horiz = xf86SetIntOption(opts, "HorizScrollDelta", vertScrollDelta);
      pars->scroll_edge_vert = xf86SetBoolOption(opts, "VertEdgeScroll", TRUE);
+     pars->special_scroll_area_right  = xf86SetBoolOption(opts, "SpecialScrollAreaRight", TRUE);
      pars->scroll_edge_horiz = xf86SetBoolOption(opts, "HorizEdgeScroll", TRUE);
-     pars->scroll_edge_corner = xf86SetBoolOption(opts, "CornerCoasting", FALSE);
-@@ -395,8 +438,8 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+@@ -409,8 +453,8 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
      pars->scroll_twofinger_horiz = xf86SetBoolOption(opts, "HorizTwoFingerScroll", FALSE);
      pars->edge_motion_min_z = xf86SetIntOption(opts, "EdgeMotionMinZ", 30);
      pars->edge_motion_max_z = xf86SetIntOption(opts, "EdgeMotionMaxZ", 160);
@@ -170,7 +178,7 @@
      pars->edge_motion_use_always = xf86SetBoolOption(opts, "EdgeMotionUseAlways", FALSE);
      repeater = xf86SetStrOption(opts, "Repeater", NULL);
      pars->updown_button_scrolling = xf86SetBoolOption(opts, "UpDownScrolling", TRUE);
-@@ -428,8 +471,8 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+@@ -442,8 +486,8 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
      pars->press_motion_min_z = xf86SetIntOption(opts, "PressureMotionMinZ", pars->edge_motion_min_z);
      pars->press_motion_max_z = xf86SetIntOption(opts, "PressureMotionMaxZ", pars->edge_motion_max_z);
  
@@ -181,18 +189,18 @@
      pars->accl = synSetFloatOption(opts, "AccelFactor", 0.0015);
      pars->trackstick_speed = synSetFloatOption(opts, "TrackstickSpeed", 40);
      pars->scroll_dist_circ = synSetFloatOption(opts, "CircScrollDelta", 0.1);
-diff --git a/src/synaptics.h b/src/synaptics.h
-index 9d040dd..afd093a 100644
---- a/src/synaptics.h
-+++ b/src/synaptics.h
-@@ -272,6 +272,7 @@ typedef struct _SynapticsPrivateRec
+diff --git a/src/synapticsstr.h b/src/synapticsstr.h
+index 5d61d0e..e5dd780 100644
+--- a/src/synapticsstr.h
++++ b/src/synapticsstr.h
+@@ -139,6 +139,7 @@ typedef struct _SynapticsPrivateRec
      int prev_z;				/* previous z value, for palm detection */
      int avg_width;			/* weighted average of previous fingerWidth values */
  
 +    int minx, maxx, miny, maxy;         /* min/max dimensions as detected */
  } SynapticsPrivate;
  
- 
+ #endif /* _SYNAPTICSSTR_H_ */
 -- 
 1.6.0.1
 

xf86-input-synaptics-0.15.0-preprobe.patch:

Index: xf86-input-synaptics-0.15.0-preprobe.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/xf86-input-synaptics-0.15.0-preprobe.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xf86-input-synaptics-0.15.0-preprobe.patch	8 Sep 2008 20:02:37 -0000	1.1
+++ xf86-input-synaptics-0.15.0-preprobe.patch	9 Sep 2008 14:13:36 -0000	1.2
@@ -1,13 +1,18 @@
-From 123bc4814c32ecc285d58731ef6e774d2a65994e Mon Sep 17 00:00:00 2001
+From febc8b07e861dced51d5f4f7d4ee8aad3cf79120 Mon Sep 17 00:00:00 2001
 From: Peter Hutterer <peter.hutterer at redhat.com>
-Date: Mon, 8 Sep 2008 23:07:35 +0930
+Date: Tue, 9 Sep 2008 00:24:06 +0930
 Subject: [PATCH] Pre-probe the device (eventcomm only).
 
 For auto-dev, we'd probe the device node and get the axis ranges. If we
-specify the device however we didn't. As a result, the automatic edge and
-accel detection didn't apply.
+specify the device however we didn't retrieve the axis ranges and thus got
+stuck with the defaults - losing out on automatic edge and accel calculation.
 
-Pre-probing the device fixes this issue.
+This is an issue if the device is hotplugged, as HAL will specify the device
+node.
+
+This patch adds another hook to synproto_operations to pre-probe the device.
+This hook is only used by eventcomm and opens the FD, queries the axis range
+and closes the FD again.
 ---
  src/alpscomm.c  |    3 ++-
  src/eventcomm.c |   28 +++++++++++++++++++++++++++-
@@ -30,11 +35,11 @@
 +    NULL /* ProbeDevice */
  };
 diff --git a/src/eventcomm.c b/src/eventcomm.c
-index 14c9cab..789d1d5 100644
+index e3ac20e..6c37dbd 100644
 --- a/src/eventcomm.c
 +++ b/src/eventcomm.c
-@@ -298,6 +298,31 @@ EventReadHwState(LocalDevicePtr local, struct SynapticsHwInfo *synhw,
-     return FALSE;
+@@ -305,6 +305,31 @@ static int EventDevOnly(const struct dirent *dir) {
+ 	return strncmp(EVENT_DEV_NAME, dir->d_name, 5) == 0;
  }
  
 +/**
@@ -65,7 +70,7 @@
  static Bool
  EventAutoDevProbe(LocalDevicePtr local)
  {
-@@ -354,5 +379,6 @@ struct SynapticsProtocolOperations event_proto_operations = {
+@@ -361,5 +386,6 @@ struct SynapticsProtocolOperations event_proto_operations = {
      EventDeviceOffHook,
      EventQueryHardware,
      EventReadHwState,
@@ -98,21 +103,21 @@
 +    NULL /* ProbeDevice */
  };
 diff --git a/src/synaptics.c b/src/synaptics.c
-index 6d55f9a..3f603fc 100644
+index 6027572..0a87be8 100644
 --- a/src/synaptics.c
 +++ b/src/synaptics.c
-@@ -171,8 +171,9 @@ SetDeviceAndProtocol(LocalDevicePtr local)
- 	xf86SetStrOption(local->options, "Device", device);
+@@ -180,8 +180,9 @@ SetDeviceAndProtocol(LocalDevicePtr local)
      }
      if (device && strstr(device, "/dev/input/event")) {
+ #ifdef BUILD_EVENTCOMM
 -	/* trust the device name if we've been given one */
 -	proto = SYN_PROTO_EVENT;
 +        if (event_proto_operations.ProbeDevice &&
 +            event_proto_operations.ProbeDevice(local, device))
 +            proto = SYN_PROTO_EVENT;
+ #endif
      } else {
  	str_par = xf86FindOptionValue(local->options, "Protocol");
- 	if (str_par && !strcmp(str_par, "psaux")) {
 diff --git a/src/synproto.h b/src/synproto.h
 index d5ae8f9..246adbd 100644
 --- a/src/synproto.h


Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-synaptics.spec	8 Sep 2008 20:02:37 -0000	1.6
+++ xorg-x11-drv-synaptics.spec	9 Sep 2008 14:13:36 -0000	1.7
@@ -4,8 +4,8 @@
 
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 synaptics input driver
-Version:        0.15.0
-Release:        6%{?dist}
+Version:        0.15.1
+Release:        1%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -13,10 +13,10 @@
 
 Source0:        ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:        10-synaptics.fdi
-Patch1:		 xf86-input-synaptics-0.15.0-tap.patch
 Patch2:		 xf86-input-synaptics-0.15.0-edges.patch
 Patch3:		 xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch
 Patch4:		 xf86-input-synaptics-0.15.0-preprobe.patch
+Patch5:		 xf86-input-synaptics-0.15.1-dont-crash-without-Device.patch
 ExcludeArch:    s390 s390x
 
 BuildRequires:  libtool pkgconfig
@@ -61,10 +61,10 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch1 -p1 -b .tap
 %patch2 -p1 -b .edges
 %patch3 -p1 -b .dont-lose-buttonup
 %patch4 -p1 -b .preprobe
+%patch5 -p1 -b .dont-crash-without-device
 
 %build
 autoreconf -v --install --force || exit 1
@@ -98,6 +98,13 @@
 %doc COPYING README
 
 %changelog
+* Tue Sep 9 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.1-1
+- update to 0.15.1
+- remove xf86-input-synaptics-0.15.0-tap.patch: merged in upstream.
+- update patches to apply against 0.15.1.
+- xf86-input-synaptics-0.15.1-dont-crash-without-Device.patch: don't crash if
+  neither Device nor Path is given.
+
 * Mon Sep 8 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.0-6
 - xf86-input-synaptics-0.15.0-edges.patch: updated to improve edge calculation
   and acceleration factors.



From nsantos at fedoraproject.org  Tue Sep  9 14:16:32 2008
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Tue,  9 Sep 2008 14:16:32 +0000 (UTC)
Subject: rpms/rhm/devel .cvsignore, 1.5, 1.6 rhm.spec, 1.24, 1.25 sources,
	1.10, 1.11
Message-ID: <20080909141633.020957012A@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/rhm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10952

Modified Files:
	.cvsignore rhm.spec sources 
Log Message:
update for Fedora 10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rhm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Jul 2008 19:37:00 -0000	1.5
+++ .cvsignore	9 Sep 2008 14:16:02 -0000	1.6
@@ -1 +1 @@
-rhm-0.2.2153.tar.gz
+rhm-0.2.2432.tar.gz


Index: rhm.spec
===================================================================
RCS file: /cvs/extras/rpms/rhm/devel/rhm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rhm.spec	3 Sep 2008 20:31:13 -0000	1.24
+++ rhm.spec	9 Sep 2008 14:16:02 -0000	1.25
@@ -2,12 +2,13 @@
 # Spec file for Red Hat Messaging package rhm.
 #
 
-%define svnrev 2153
-# built against qpidc svn rev 667603
+%define svnrev 2432
+# built against qpidc svn rev 693140
+%define svnrev_qpid 693140
 
 Name:           rhm
 Version:        0.2.%{svnrev}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Red Hat persistence extension to the Qpid messaging system
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -24,7 +25,7 @@
 BuildRequires: python
 BuildRequires: libtool
 
-Requires: qpidd >= 0.2.667603
+Requires: qpidd >= 0.3.%{svnrev_qpid}
 Requires: db4
 Requires: libaio
 
@@ -64,6 +65,9 @@
 
 
 %changelog
+* Tue Sep  9 2008 Nuno Santos <nsantos at redhat.com> - 0.2.2432-1
+- Update for Fedora 10
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.2153-3
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rhm/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	1 Jul 2008 19:37:00 -0000	1.10
+++ sources	9 Sep 2008 14:16:02 -0000	1.11
@@ -1 +1 @@
-d7210b111bde8a0ddba10a09d9be5966  rhm-0.2.2153.tar.gz
+4a1d09e59c357a84d7b2d07ad08c2d99  rhm-0.2.2432.tar.gz



From veillard at fedoraproject.org  Tue Sep  9 14:32:45 2008
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue,  9 Sep 2008 14:32:45 +0000 (UTC)
Subject: rpms/libvirt/F-9 libvirt.spec, 1.89, 1.90 sources, 1.31,
	1.32 libvirt-0.4.4-boot-cdrom.patch, 1.1, NONE
Message-ID: <20080909143245.71D8D7012A@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15293

Modified Files:
	libvirt.spec sources 
Removed Files:
	libvirt-0.4.4-boot-cdrom.patch 
Log Message:
Upstream release of 0.4.5, Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-9/libvirt.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- libvirt.spec	8 Jul 2008 13:12:51 -0000	1.89
+++ libvirt.spec	9 Sep 2008 14:32:15 -0000	1.90
@@ -1,32 +1,40 @@
 # -*- rpm-spec -*-
 
-%if 0%{fedora} >= 8
-%define with_polkit 1
-%define with_proxy no
-%else
-%define with_polkit 0
-%define with_proxy yes
+%define with_xen       1
+%define with_xen_proxy 1
+%define with_qemu      1
+%define with_openvz    1
+%define with_lxc       1
+%define with_polkit    0
+
+# Xen is available only on i386 x86_64 ia64
+%ifnarch i386 i686 x86_64 ia64
+%define with_xen 0
+%endif
+
+%if ! %{with_xen}
+%define with_xen_proxy 0
 %endif
 
 %if "%{fedora}"
 %ifarch ppc64
 %define with_qemu 0
-%else
-%define with_qemu 1
 %endif
-%else
-%define with_qemu 0
+%endif
+
+%if 0%{fedora} >= 8
+%define with_polkit    1
+%define with_xen_proxy 0
 %endif
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.4.4
-Release: 2%{?dist}%{?extra_release}
-License: LGPL
+Version: 0.4.5
+Release: 1%{?dist}%{?extra_release}
+License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
-Patch1: %{name}-%{version}-boot-cdrom.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
 Requires: libxml2
@@ -47,12 +55,14 @@
 %endif
 # For mount/umount in FS driver
 BuildRequires: util-linux
-# PPC64 has no Xen nor QEmu, try to build anyway
-%ifnarch ppc64
+# For showmount in FS driver (netfs discovery)
+BuildRequires: nfs-utils
+Requires: nfs-utils
 %if %{with_qemu}
 # From QEMU RPMs
 Requires: /usr/bin/qemu-img
 %else
+%if %{with_xen}
 # From Xen RPMs
 Requires: /usr/sbin/qcow-create
 %endif
@@ -63,10 +73,11 @@
 Requires: iscsi-initiator-utils
 # For disk driver
 Requires: parted
-%ifarch i386 x86_64 ia64
+%if %{with_xen}
 BuildRequires: xen-devel
 %endif
 BuildRequires: libxml2-devel
+BuildRequires: xhtml1-dtds
 BuildRequires: readline-devel
 BuildRequires: ncurses-devel
 BuildRequires: gettext
@@ -84,12 +95,11 @@
 %endif
 # For mount/umount in FS driver
 BuildRequires: util-linux
-# PPC64 has no Xen nor QEmu, try to build anyway
-%ifnarch ppc64
 %if %{with_qemu}
 # From QEMU RPMs
 BuildRequires: /usr/bin/qemu-img
 %else
+%if %{with_xen}
 # From Xen RPMs
 BuildRequires: /usr/sbin/qcow-create
 %endif
@@ -114,7 +124,7 @@
 Group: Development/Libraries
 Requires: libvirt = %{version}
 Requires: pkgconfig
-%ifarch i386 x86_64 ia64
+%if %{with_xen}
 Requires: xen-devel
 %endif
 Obsoletes: libvir-devel
@@ -137,31 +147,32 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
-# Xen is available only on i386 x86_64 ia64
-%ifarch i386 i686 x86_64 ia64
-%configure --with-init-script=redhat \
-           --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
-           --with-remote-file=%{_localstatedir}/run/libvirtd.pid \
-           --with-xen-proxy=%{with_proxy}
-%else
-%ifnarch ppc64
-%configure --without-xen \
-           --with-init-script=redhat \
-           --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
-           --with-remote-file=%{_localstatedir}/run/libvirtd.pid
-%else
-%configure --without-xen \
-           --without-qemu \
-           --with-init-script=redhat \
-           --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
-           --with-remote-file=%{_localstatedir}/run/libvirtd.pid
+%if ! %{with_xen}
+%define _without_xen --without-xen
+%endif
+
+%if ! %{with_qemu}
+%define _without_qemu --without-qemu
 %endif
+
+%if ! %{with_openvz}
+%define _without_openvz --without-openvz
+%endif
+
+%if ! %{with_lxc}
+%define _without_lxc --without-lxc
 %endif
 
-make
+%configure %{?_without_xen} \
+           %{?_without_qemu} \
+           %{?_without_openvz} \
+           %{?_without_lxc} \
+           --with-init-script=redhat \
+           --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
+           --with-remote-file=%{_localstatedir}/run/libvirtd.pid
+make %{?_smp_mflags}
 
 %install
 rm -fr %{buildroot}
@@ -244,14 +255,21 @@
 %dir %{_localstatedir}/lib/libvirt/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
+%{_datadir}/augeas/lenses/libvirtd.aug
+%{_datadir}/augeas/lenses/libvirtd_qemu.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
 %if %{with_polkit}
-%{_datadir}/PolicyKit/policy/libvirtd.policy
+%{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
 %endif
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
-%if %{with_proxy} == "yes"
+%if %{with_xen_proxy}
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
 %endif
 %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
+%if %{with_lxc}
+%attr(0755, root, root) %{_libexecdir}/libvirt_lxc
+%endif
 %attr(0755, root, root) %{_sbindir}/libvirtd
 %doc docs/*.rng
 %doc docs/*.xml
@@ -284,6 +302,12 @@
 %doc docs/examples/python
 
 %changelog
+* Mon Sep  8 2008 Daniel Veillard <veillard at redhat.com> - 0.4.5-1.fc10
+- upstream release 0.4.5
+- a lot of bug fixes
+- major updates to QEmu/KVM and Linux containers drivers
+- support for OpenVZ if installed
+
 * Tue Jul  8 2008 Daniel P. Berrange <berrange at redhat.com> - 0.4.4-2.fc9
 - Fix booting of CDROM images with KVM (rhbz #452355)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-9/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	25 Jun 2008 09:10:04 -0000	1.31
+++ sources	9 Sep 2008 14:32:15 -0000	1.32
@@ -1 +1 @@
-9407900dc16e0ba9ea3eec3cf0a56674  libvirt-0.4.4.tar.gz
+dcb590a6202c332907eae7b44e47ca4b  libvirt-0.4.5.tar.gz


--- libvirt-0.4.4-boot-cdrom.patch DELETED ---



From orion at fedoraproject.org  Tue Sep  9 14:33:45 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue,  9 Sep 2008 14:33:45 +0000 (UTC)
Subject: devel/octave .cvsignore, 1.21, 1.22 octave.spec, 1.74, 1.75 sources,
	1.21, 1.22
Message-ID: <20080909143345.F29E37012A@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/devel/octave
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15660

Modified Files:
	.cvsignore octave.spec sources 
Log Message:
* Mon Sep 8 2008 Orion Poplawski <orion at cora.nwra.com> 3.0.2-1
- Update to 3.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/octave/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	22 Apr 2008 16:09:47 -0000	1.21
+++ .cvsignore	9 Sep 2008 14:33:15 -0000	1.22
@@ -1 +1 @@
-octave-3.0.1.tar.bz2
+octave-3.0.2.tar.bz2


Index: octave.spec
===================================================================
RCS file: /cvs/pkgs/devel/octave/octave.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- octave.spec	22 Apr 2008 16:09:47 -0000	1.74
+++ octave.spec	9 Sep 2008 14:33:15 -0000	1.75
@@ -2,7 +2,7 @@
 %define octave_api api-v32
 
 Name:           octave
-Version:        3.0.1
+Version:        3.0.2
 Release:        1%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
@@ -141,6 +141,9 @@
 
 
 %changelog
+* Mon Sep 8 2008 Orion Poplawski <orion at cora.nwra.com> 3.0.2-1
+- Update to 3.0.2
+
 * Mon Apr 21 2008 Quentin Spencer <qspencer at users.sf.net> 3.0.1-1
 - New release of octave. Remove gcc 4.3 patch.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/octave/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	22 Apr 2008 16:09:47 -0000	1.21
+++ sources	9 Sep 2008 14:33:15 -0000	1.22
@@ -1 +1 @@
-230f3895a42386ec625bf2593a44c441  octave-3.0.1.tar.bz2
+931e28ab1181018c8079fb8138971ab0  octave-3.0.2.tar.bz2



From whot at fedoraproject.org  Tue Sep  9 14:35:28 2008
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue,  9 Sep 2008 14:35:28 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/F-9
	xf86-input-synaptics-0.15.1-dont-crash-without-Device.patch,
	NONE, 1.1 xf86-input-synaptics-0.15.1-dont-lose-buttonup.patch,
	NONE, 1.1 xf86-input-synaptics-0.15.1-edges.patch, NONE,
	1.1 xf86-input-synaptics-0.15.1-preprobe.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 10-synaptics.fdi, 1.2, 1.3 sources, 1.2,
	1.3 xorg-x11-drv-synaptics.spec, 1.3, 1.4
Message-ID: <20080909143528.97F057012A@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16103

Modified Files:
	.cvsignore 10-synaptics.fdi sources 
	xorg-x11-drv-synaptics.spec 
Added Files:
	xf86-input-synaptics-0.15.1-dont-crash-without-Device.patch 
	xf86-input-synaptics-0.15.1-dont-lose-buttonup.patch 
	xf86-input-synaptics-0.15.1-edges.patch 
	xf86-input-synaptics-0.15.1-preprobe.patch 
Log Message:
* Tue Sep 9 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.1-1
- update to upstream 0.15.1
- remove xf86-input-synaptics-0.15.0-tap.patch - merged in upstream.
- xf86-input-synaptics-0.15.1-dont-lose-buttonup.patch: force a click if
  middle button emulation times out during ReadInput cycle. RH #233717.
- xf86-input-synaptics-0.15.1-edges.patch: improve edge calculation and
  acceleration factors.
- xf86-input-synaptics-0.15.1-preprobe patch: pre-probe eventcomm devices for
  axis ranges if specifed with Device option.
- xf86-input-synaptics-0.15.1-dont-crash-without-Device.patch: don't crash if 
  neither Device nor Path is given.
- update fdi file to support "bcm5974" devices.



xf86-input-synaptics-0.15.1-dont-crash-without-Device.patch:

--- NEW FILE xf86-input-synaptics-0.15.1-dont-crash-without-Device.patch ---
>From 5d3a47eed9f5330982d10c3acc15c486e3c86beb Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at redhat.com>
Date: Tue, 9 Sep 2008 19:12:35 +0930
Subject: [PATCH] Don't crash when neither Path nor Device are given.

xf86ReplaceOption doesn't seem to like NULL values
---
 src/synaptics.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/synaptics.c b/src/synaptics.c
index 3e55538..8475d1a 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -176,7 +176,8 @@ SetDeviceAndProtocol(LocalDevicePtr local)
     device = xf86FindOptionValue(local->options, "Device");
     if (!device) {
 	device = xf86FindOptionValue(local->options, "Path");
-	xf86ReplaceStrOption(local->options, "Device", device);
+	if (device)
+	    xf86ReplaceStrOption(local->options, "Device", device);
     }
     if (device && strstr(device, "/dev/input/event")) {
 #ifdef BUILD_EVENTCOMM
-- 
1.6.0.1


xf86-input-synaptics-0.15.1-dont-lose-buttonup.patch:

--- NEW FILE xf86-input-synaptics-0.15.1-dont-lose-buttonup.patch ---
>From 2bb34ea034ebab2a81d17fefe416c4adc80d3817 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at redhat.com>
Date: Sat, 6 Sep 2008 03:03:42 +0930
Subject: [PATCH] Don't lose button up event if timeout is cancelled in the same ReadInput cycle

On a left/right button press, middle button emulation springs into action and
changes the reported hw state. It then returns a delay that is supposed to set
a timer. No button event is posted to the server, the timer ensures that it'll
be posted later.

If however - in the same cycle - the button up is reported, but with a
hardware time > middle emulation timeout, the middle button emulation is
canceled. The hw state is reset to button down, and processing continues,
reporting the button down event.
Since this is in the same cycle, the new delay overrides the previous one and
the timer is never set.

Introduce a new state into MB emulation that forces the click event if the
above situation occurs.

Red Hat Bug 233717 <http://bugzilla.redhat.com/show_bug.cgi?id=233717>
---
 src/synaptics.c    |   28 ++++++++++++++++++++++++++--
 src/synapticsstr.h |    4 +++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/synaptics.c b/src/synaptics.c
index 3e55538..6027572 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -877,6 +877,8 @@ HandleMidButtonEmulation(SynapticsPrivate *priv, struct SynapticsHwState *hw, in
 
     while (!done) {
 	switch (priv->mid_emu_state) {
+	case MBE_LEFT_CLICK:
+	case MBE_RIGHT_CLICK:
 	case MBE_OFF:
 	    priv->button_delay_millis = hw->millis;
 	    if (hw->left) {
@@ -892,7 +894,12 @@ HandleMidButtonEmulation(SynapticsPrivate *priv, struct SynapticsHwState *hw, in
 				 hw->millis);
 	    if (timeleft > 0)
 		*delay = MIN(*delay, timeleft);
-	    if (!hw->left || (timeleft <= 0)) {
+
+            /* timeout, but within the same ReadInput cycle! */
+            if ((timeleft <= 0) && !hw->left) {
+		priv->mid_emu_state = MBE_LEFT_CLICK;
+		done = TRUE;
+            } else if ((!hw->left) || (timeleft <= 0)) {
 		hw->left = TRUE;
 		priv->mid_emu_state = MBE_TIMEOUT;
 		done = TRUE;
@@ -908,7 +915,12 @@ HandleMidButtonEmulation(SynapticsPrivate *priv, struct SynapticsHwState *hw, in
 				 hw->millis);
 	    if (timeleft > 0)
 		*delay = MIN(*delay, timeleft);
-	    if (!hw->right || (timeleft <= 0)) {
+
+	     /* timeout, but within the same ReadInput cycle! */
+            if ((timeleft <= 0) && !hw->right) {
+		priv->mid_emu_state = MBE_RIGHT_CLICK;
+		done = TRUE;
+            } else if (!hw->right || (timeleft <= 0)) {
 		hw->right = TRUE;
 		priv->mid_emu_state = MBE_TIMEOUT;
 		done = TRUE;
@@ -1918,6 +1930,18 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState *hw)
     if (dx || dy)
 	xf86PostMotionEvent(local->dev, 0, 0, 2, dx, dy);
 
+    if (priv->mid_emu_state == MBE_LEFT_CLICK)
+    {
+	xf86PostButtonEvent(local->dev, FALSE, 1, 1, 0, 0);
+	xf86PostButtonEvent(local->dev, FALSE, 1, 0, 0, 0);
+	priv->mid_emu_state = MBE_OFF;
+    } else if (priv->mid_emu_state == MBE_RIGHT_CLICK)
+    {
+	xf86PostButtonEvent(local->dev, FALSE, 3, 1, 0, 0);
+	xf86PostButtonEvent(local->dev, FALSE, 3, 0, 0, 0);
+	priv->mid_emu_state = MBE_OFF;
+    }
+
     change = buttons ^ priv->lastButtons;
     while (change) {
 	id = ffs(change); /* number of first set bit 1..32 is returned */
diff --git a/src/synapticsstr.h b/src/synapticsstr.h
index ca61a9c..5d61d0e 100644
--- a/src/synapticsstr.h
+++ b/src/synapticsstr.h
@@ -54,7 +54,9 @@ enum MidButtonEmulation {
     MBE_RIGHT,			/* Right button pressed, waiting for left button or timeout */
     MBE_MID,			/* Left and right buttons pressed, waiting for both buttons
 				   to be released */
-    MBE_TIMEOUT			/* Waiting for both buttons to be released. */
+    MBE_TIMEOUT,		/* Waiting for both buttons to be released. */
+    MBE_LEFT_CLICK,		/* Emulate left button click. */
+    MBE_RIGHT_CLICK,		/* Emulate right button click. */
 };
 
 /* See docs/tapndrag.dia for a state machine diagram */
-- 
1.6.0.1


xf86-input-synaptics-0.15.1-edges.patch:

--- NEW FILE xf86-input-synaptics-0.15.1-edges.patch ---
>From 9ab7e725daa21ceb487df324db62f2e0148b9f4e Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at redhat.com>
Date: Tue, 9 Sep 2008 00:27:36 +0930
Subject: [PATCH] Improve edge autodetection and accel.

The synaptics spec specifies "typical axis ranges" for synaptics devices.
Based on these typical ranges, calculate edge coordinates and apply the same
proportions to the device at hand.
Based on the hard-coded ranges and acceleration, calculate accel for
autodetected ranges in the same proportions.
---
 src/eventcomm.c    |   12 ++++----
 src/synaptics.c    |   82 ++++++++++++++++++++++++++++++++++++++++------------
 src/synapticsstr.h |    1 +
 3 files changed, 70 insertions(+), 25 deletions(-)

diff --git a/src/eventcomm.c b/src/eventcomm.c
index 6c37dbd..8474c54 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -108,11 +108,11 @@ event_query_is_touchpad(int fd)
     return TRUE;
 }
 
-/* Query device for axis ranges and store outcome in the default parameter. */
+/* Query device for axis ranges */
 static void
 event_query_axis_ranges(int fd, LocalDevicePtr local)
 {
-    SynapticsSHM *pars = &((SynapticsPrivate *)local->private)->synpara_default;
+    SynapticsPrivate *priv = (SynapticsPrivate *)local->private;
     struct input_absinfo abs;
     int rc;
 
@@ -121,8 +121,8 @@ event_query_axis_ranges(int fd, LocalDevicePtr local)
     {
 	xf86Msg(X_INFO, "%s: x-axis range %d - %d\n", local->name,
 		abs.minimum, abs.maximum);
-	pars->left_edge  = abs.minimum;
-	pars->right_edge = abs.maximum;
+	priv->minx = abs.minimum;
+	priv->maxx = abs.maximum;
     } else
 	xf86Msg(X_ERROR, "%s: failed to query axis range (%s)\n", local->name,
 		strerror(errno));
@@ -132,8 +132,8 @@ event_query_axis_ranges(int fd, LocalDevicePtr local)
     {
 	xf86Msg(X_INFO, "%s: y-axis range %d - %d\n", local->name,
 		abs.minimum, abs.maximum);
-	pars->top_edge    = abs.minimum;
-	pars->bottom_edge = abs.maximum;
+	priv->miny = abs.minimum;
+	priv->maxy = abs.maximum;
     } else
 	xf86Msg(X_ERROR, "%s: failed to query axis range (%s)\n", local->name,
 		strerror(errno));
diff --git a/src/synaptics.c b/src/synaptics.c
index 0a87be8..6cb49e1 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -13,6 +13,7 @@
  * Copyright ? 2006 Christian Thaeter
  * Copyright ? 2007 Joseph P. Skudlarek
  * Copyright ? 2008 Fedor P. Goncharov
+ * Copyright ? 2008 Red Hat, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software
  * and its documentation for any purpose is hereby granted without
@@ -307,6 +308,10 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
     char *repeater;
     pointer opts;
     int status;
+    float minSpeed, maxSpeed;
+    int horizScrollDelta, vertScrollDelta,
+        edgeMotionMinSpeed, edgeMotionMaxSpeed;
+    int l, r, t, b; /* left, right, top, bottom */
 
     /* allocate memory for SynapticsPrivateRec */
     priv = xcalloc(1, sizeof(SynapticsPrivate));
@@ -349,14 +354,6 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
 
     xf86OptionListReport(opts);
 
-    /* set hard-coded axis ranges before querying the device.
-     * These defaults are overwritten with the ones provided by the device
-     * during SetDeviceAndProtocol (if applicable). */
-    priv->synpara_default.left_edge   = 1900;
-    priv->synpara_default.right_edge  = 5400;
-    priv->synpara_default.top_edge    = 1900;
-    priv->synpara_default.bottom_edge = 4000;
-
     SetDeviceAndProtocol(local);
 
     /* open the touchpad device */
@@ -383,11 +380,58 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
     /* read the parameters */
     pars = &priv->synpara_default;
     pars->version = (PACKAGE_VERSION_MAJOR*10000+PACKAGE_VERSION_MINOR*100+PACKAGE_VERSION_PATCHLEVEL);
-    /* pars->xyz_edge contains defaults or values reported by hardware*/
-    pars->left_edge = xf86SetIntOption(opts, "LeftEdge", pars->left_edge);
-    pars->right_edge = xf86SetIntOption(opts, "RightEdge", pars->right_edge);
-    pars->top_edge = xf86SetIntOption(opts, "TopEdge", pars->top_edge);
-    pars->bottom_edge = xf86SetIntOption(opts, "BottomEdge", pars->bottom_edge);
+
+    /* The synaptics specs specify typical edge widths of 4% on x, and 5.4% on
+     * y (page 7) [Synaptics TouchPad Interfacing Guide, 510-000080 - A
+     * Second Edition, http://www.synaptics.com/support/dev_support.cfm, 8 Sep
+     * 2008]
+     * If the range was autodetected, apply these edge widths to all four
+     * sides.
+     */
+    if (priv->maxx && priv->maxy)
+    {
+        int width, height;
+        int ewidth, eheight; /* edge width/height */
+
+        width = abs(priv->maxx - priv->minx);
+        height = abs(priv->maxy - priv->miny);
+        ewidth = width * .04;
+        eheight = height * .055;
+
+        l = priv->minx + ewidth;
+        r = priv->maxx - ewidth;
+        t = priv->miny + eheight;
+        b = priv->maxy - eheight;
+
+        /* Default min/max speed are 0.09/0.18. Assuming we have a device that
+         * reports height 3040 (typical y range in synaptics specs) this gives
+         * us the same result. */
+        minSpeed = 273.0/height;
+        maxSpeed = 547.0/height;
+
+        /* Again, based on typical x/y range and defaults */
+        horizScrollDelta = width * .025;
+        vertScrollDelta = height * .04;
+        edgeMotionMinSpeed = 1;
+        edgeMotionMaxSpeed = width * .1;
+    } else {
+        l = 1900;
+        r = 5400;
+        t = 1900;
+        b = 4000;
+        minSpeed = 0.09;
+        maxSpeed = 0.18;
+
+        horizScrollDelta = 100;
+        vertScrollDelta = 100;
+        edgeMotionMinSpeed = 1;
+        edgeMotionMaxSpeed = 400;
+    }
+
+    pars->left_edge = xf86SetIntOption(opts, "LeftEdge", l);
+    pars->right_edge = xf86SetIntOption(opts, "RightEdge", r);
+    pars->top_edge = xf86SetIntOption(opts, "TopEdge", t);
+    pars->bottom_edge = xf86SetIntOption(opts, "BottomEdge", b);
 
     pars->finger_low = xf86SetIntOption(opts, "FingerLow", 25);
     pars->finger_high = xf86SetIntOption(opts, "FingerHigh", 30);
@@ -399,8 +443,8 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
     pars->fast_taps = xf86SetIntOption(opts, "FastTaps", FALSE);
     pars->emulate_mid_button_time = xf86SetIntOption(opts, "EmulateMidButtonTime", 75);
     pars->emulate_twofinger_z = xf86SetIntOption(opts, "EmulateTwoFingerMinZ", 257);
-    pars->scroll_dist_vert = xf86SetIntOption(opts, "VertScrollDelta", 100);
-    pars->scroll_dist_horiz = xf86SetIntOption(opts, "HorizScrollDelta", 100);
+    pars->scroll_dist_vert = xf86SetIntOption(opts, "VertScrollDelta", horizScrollDelta);
+    pars->scroll_dist_horiz = xf86SetIntOption(opts, "HorizScrollDelta", vertScrollDelta);
     pars->scroll_edge_vert = xf86SetBoolOption(opts, "VertEdgeScroll", TRUE);
     pars->special_scroll_area_right  = xf86SetBoolOption(opts, "SpecialScrollAreaRight", TRUE);
     pars->scroll_edge_horiz = xf86SetBoolOption(opts, "HorizEdgeScroll", TRUE);
@@ -409,8 +453,8 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
     pars->scroll_twofinger_horiz = xf86SetBoolOption(opts, "HorizTwoFingerScroll", FALSE);
     pars->edge_motion_min_z = xf86SetIntOption(opts, "EdgeMotionMinZ", 30);
     pars->edge_motion_max_z = xf86SetIntOption(opts, "EdgeMotionMaxZ", 160);
-    pars->edge_motion_min_speed = xf86SetIntOption(opts, "EdgeMotionMinSpeed", 1);
-    pars->edge_motion_max_speed = xf86SetIntOption(opts, "EdgeMotionMaxSpeed", 400);
+    pars->edge_motion_min_speed = xf86SetIntOption(opts, "EdgeMotionMinSpeed", edgeMotionMinSpeed);
+    pars->edge_motion_max_speed = xf86SetIntOption(opts, "EdgeMotionMaxSpeed", edgeMotionMaxSpeed);
     pars->edge_motion_use_always = xf86SetBoolOption(opts, "EdgeMotionUseAlways", FALSE);
     repeater = xf86SetStrOption(opts, "Repeater", NULL);
     pars->updown_button_scrolling = xf86SetBoolOption(opts, "UpDownScrolling", TRUE);
@@ -442,8 +486,8 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
     pars->press_motion_min_z = xf86SetIntOption(opts, "PressureMotionMinZ", pars->edge_motion_min_z);
     pars->press_motion_max_z = xf86SetIntOption(opts, "PressureMotionMaxZ", pars->edge_motion_max_z);
 
-    pars->min_speed = synSetFloatOption(opts, "MinSpeed", 0.09);
-    pars->max_speed = synSetFloatOption(opts, "MaxSpeed", 0.18);
+    pars->min_speed = synSetFloatOption(opts, "MinSpeed", minSpeed);
+    pars->max_speed = synSetFloatOption(opts, "MaxSpeed", maxSpeed);
     pars->accl = synSetFloatOption(opts, "AccelFactor", 0.0015);
     pars->trackstick_speed = synSetFloatOption(opts, "TrackstickSpeed", 40);
     pars->scroll_dist_circ = synSetFloatOption(opts, "CircScrollDelta", 0.1);
diff --git a/src/synapticsstr.h b/src/synapticsstr.h
index 5d61d0e..e5dd780 100644
--- a/src/synapticsstr.h
+++ b/src/synapticsstr.h
@@ -139,6 +139,7 @@ typedef struct _SynapticsPrivateRec
     int prev_z;				/* previous z value, for palm detection */
     int avg_width;			/* weighted average of previous fingerWidth values */
 
+    int minx, maxx, miny, maxy;         /* min/max dimensions as detected */
 } SynapticsPrivate;
 
 #endif /* _SYNAPTICSSTR_H_ */
-- 
1.6.0.1


xf86-input-synaptics-0.15.1-preprobe.patch:

--- NEW FILE xf86-input-synaptics-0.15.1-preprobe.patch ---
>From aeb2fa0764bad4203237eb89bf34963dc92bb7f2 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at redhat.com>
Date: Tue, 9 Sep 2008 00:24:06 +0930
Subject: [PATCH] Pre-probe the device (eventcomm only).

For auto-dev, we'd probe the device node and get the axis ranges. If we
specify the device however we didn't retrieve the axis ranges and thus got
stuck with the defaults - losing out on automatic edge and accel calculation.

This is an issue if the device is hotplugged, as HAL will specify the device
node.

This patch adds another hook to synproto_operations to pre-probe the device.
This hook is only used by eventcomm and opens the FD, queries the axis range
and closes the FD again.
---
 src/alpscomm.c  |    3 ++-
 src/eventcomm.c |   28 +++++++++++++++++++++++++++-
 src/ps2comm.c   |    3 ++-
 src/psmcomm.c   |    3 ++-
 src/synaptics.c |    5 +++--
 src/synproto.h  |    1 +
 6 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/alpscomm.c b/src/alpscomm.c
index 4f19d04..0b93fef 100644
--- a/src/alpscomm.c
+++ b/src/alpscomm.c
@@ -262,5 +262,6 @@ struct SynapticsProtocolOperations alps_proto_operations = {
     ALPSDeviceOffHook,
     ALPSQueryHardware,
     ALPSReadHwState,
-    ALPSAutoDevProbe
+    ALPSAutoDevProbe,
+    NULL /* ProbeDevice */
 };
diff --git a/src/eventcomm.c b/src/eventcomm.c
index e3ac20e..6c37dbd 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -305,6 +305,31 @@ static int EventDevOnly(const struct dirent *dir) {
 	return strncmp(EVENT_DEV_NAME, dir->d_name, 5) == 0;
 }
 
+/**
+ * Probe the given device name for axis ranges, if appropriate.
+ */
+static Bool
+EventProbeDevice(LocalDevicePtr local, char* device)
+{
+    int fd;
+
+    SYSCALL(fd = open(device, O_RDONLY));
+    if (fd < 0)
+        goto out;
+
+    if (!event_query_is_touchpad(fd))
+        goto out;
+
+    event_query_axis_ranges(fd, local);
+
+out:
+    if (fd >= 0)
+        SYSCALL(close(fd));
+
+    /* Always return TRUE, PreInit will complain for us if necessary */
+    return TRUE;
+}
+
 static Bool
 EventAutoDevProbe(LocalDevicePtr local)
 {
@@ -361,5 +386,6 @@ struct SynapticsProtocolOperations event_proto_operations = {
     EventDeviceOffHook,
     EventQueryHardware,
     EventReadHwState,
-    EventAutoDevProbe
+    EventAutoDevProbe,
+    EventProbeDevice
 };
diff --git a/src/ps2comm.c b/src/ps2comm.c
index 32e3dc9..cc2a202 100644
--- a/src/ps2comm.c
+++ b/src/ps2comm.c
@@ -758,5 +758,6 @@ struct SynapticsProtocolOperations psaux_proto_operations = {
     PS2DeviceOffHook,
     PS2QueryHardware,
     PS2ReadHwState,
-    PS2AutoDevProbe
+    PS2AutoDevProbe,
+    NULL /* ProbeDevice */
 };
diff --git a/src/psmcomm.c b/src/psmcomm.c
index 95364ab..c36bed3 100644
--- a/src/psmcomm.c
+++ b/src/psmcomm.c
@@ -177,5 +177,6 @@ struct SynapticsProtocolOperations psm_proto_operations = {
     PSMDeviceOffHook,
     PSMQueryHardware,
     PSMReadHwState,
-    PSMAutoDevProbe
+    PSMAutoDevProbe,
+    NULL /* ProbeDevice */
 };
diff --git a/src/synaptics.c b/src/synaptics.c
index 397cfd8..53d3290 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -180,8 +180,9 @@ SetDeviceAndProtocol(LocalDevicePtr local)
     }
     if (device && strstr(device, "/dev/input/event")) {
 #ifdef BUILD_EVENTCOMM
-	/* trust the device name if we've been given one */
-	proto = SYN_PROTO_EVENT;
+        if (event_proto_operations.ProbeDevice &&
+            event_proto_operations.ProbeDevice(local, device))
+            proto = SYN_PROTO_EVENT;
 #endif
     } else {
 	str_par = xf86FindOptionValue(local->options, "Protocol");
diff --git a/src/synproto.h b/src/synproto.h
index d5ae8f9..246adbd 100644
--- a/src/synproto.h
+++ b/src/synproto.h
@@ -96,6 +96,7 @@ struct SynapticsProtocolOperations {
 			struct SynapticsProtocolOperations *proto_ops,
 			struct CommData *comm, struct SynapticsHwState *hwRet);
     Bool (*AutoDevProbe)(LocalDevicePtr local);
+    Bool (*ProbeDevice)(LocalDevicePtr local, char* name);
 };
 
 extern struct SynapticsProtocolOperations psaux_proto_operations;
-- 
1.6.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Aug 2008 06:51:25 -0000	1.2
+++ .cvsignore	9 Sep 2008 14:35:28 -0000	1.3
@@ -1 +1 @@
-xf86-input-synaptics-0.15.0.tar.bz2
+xf86-input-synaptics-0.15.1.tar.bz2


Index: 10-synaptics.fdi
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-9/10-synaptics.fdi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 10-synaptics.fdi	7 Sep 2008 13:14:17 -0000	1.2
+++ 10-synaptics.fdi	9 Sep 2008 14:35:28 -0000	1.3
@@ -11,6 +11,9 @@
       <match key="info.product" contains="appletouch">
           <merge key="input.x11_driver" type="string">synaptics</merge>
       </match>
+      <match key="info.product" contains="bcm5974">
+          <merge key="input.x11_driver" type="string">synaptics</merge>
+      </match>
     </match>
   </device>
 </deviceinfo>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Aug 2008 06:51:25 -0000	1.2
+++ sources	9 Sep 2008 14:35:28 -0000	1.3
@@ -1 +1 @@
-939f1c831c5cd3a6f027e982592dfc5b  xf86-input-synaptics-0.15.0.tar.bz2
+0a588c729295b9a91a05d9d157270917  xf86-input-synaptics-0.15.1.tar.bz2


Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-9/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-drv-synaptics.spec	7 Sep 2008 13:14:17 -0000	1.3
+++ xorg-x11-drv-synaptics.spec	9 Sep 2008 14:35:28 -0000	1.4
@@ -4,8 +4,8 @@
 
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 synaptics input driver
-Version:        0.15.0
-Release:        3%{?dist}
+Version:        0.15.1
+Release:        1%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -13,7 +13,10 @@
 
 Source0:        ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:        10-synaptics.fdi
-Patch1:		 xf86-input-synaptics-0.15.0-tap.patch
+Patch2:		 xf86-input-synaptics-0.15.1-dont-lose-buttonup.patch
+Patch3:		 xf86-input-synaptics-0.15.1-edges.patch
+Patch4:		 xf86-input-synaptics-0.15.1-preprobe.patch
+Patch5:		 xf86-input-synaptics-0.15.1-dont-crash-without-Device.patch
 ExcludeArch:    s390 s390x
 
 BuildRequires:  libtool pkgconfig
@@ -58,7 +61,10 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch1 -p1 -b .tap
+%patch2 -p1 -b .dont-lose-buttonup
+%patch3 -p1 -b .edges
+%patch4 -p1 -b .preprobe
+%patch5 -p1 -b .dont-crash-without-device
 
 %build
 autoreconf -v --install --force || exit 1
@@ -92,6 +98,19 @@
 %doc COPYING README
 
 %changelog
+* Tue Sep 9 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.1-1
+- update to upstream 0.15.1
+- remove xf86-input-synaptics-0.15.0-tap.patch - merged in upstream.
+- xf86-input-synaptics-0.15.1-dont-lose-buttonup.patch: force a click if
+  middle button emulation times out during ReadInput cycle. RH #233717.
+- xf86-input-synaptics-0.15.1-edges.patch: improve edge calculation and
+  acceleration factors.
+- xf86-input-synaptics-0.15.1-preprobe patch: pre-probe eventcomm devices for
+  axis ranges if specifed with Device option.
+- xf86-input-synaptics-0.15.1-dont-crash-without-Device.patch: don't crash if 
+  neither Device nor Path is given.
+- update fdi file to support "bcm5974" devices.
+
 * Sun Sep 7 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.0-3
 - update fdi file to support "appletouch" devices.
 



From dwalsh at fedoraproject.org  Tue Sep  9 14:37:26 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  9 Sep 2008 14:37:26 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.83, 1.84 setroubleshoot.spec,
	1.100, 1.101 sources, 1.94, 1.95
Message-ID: <20080909143726.5986F7012A@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16788

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Tue Sep 9 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.8-1
- Fix spelling mistakes
- Update translations



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- .cvsignore	21 Feb 2008 20:11:29 -0000	1.83
+++ .cvsignore	9 Sep 2008 14:36:55 -0000	1.84
@@ -1 +1,2 @@
 setroubleshoot-2.0.6.tar.gz
+setroubleshoot-2.0.8.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- setroubleshoot.spec	21 Feb 2008 20:11:29 -0000	1.100
+++ setroubleshoot.spec	9 Sep 2008 14:36:55 -0000	1.101
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.0.6
+Version: 2.0.8
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -182,6 +182,10 @@
 %attr(0755,root,root) /etc/rc.d/init.d/%{name}
 
 %changelog
+* Tue Sep 9 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.8-1
+- Fix spelling mistakes
+- Update translations
+
 * Thu Feb 21 2008  <jdennis at redhat.com> - 2.0.6-1
 	- add dialog to run a command in the background, capture it's stdout & stderr
 	  report it's status, kill it, and pass it a pseudo terminal for password prompts


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- sources	21 Feb 2008 20:11:29 -0000	1.94
+++ sources	9 Sep 2008 14:36:55 -0000	1.95
@@ -1 +1 @@
-2b73ca05ecd413e7a0b280beb7862615  setroubleshoot-2.0.6.tar.gz
+bcf9712ea5328ebaecc07466d01f6aa4  setroubleshoot-2.0.8.tar.gz



From orion at fedoraproject.org  Tue Sep  9 14:37:54 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue,  9 Sep 2008 14:37:54 +0000 (UTC)
Subject: devel/octave-forge .cvsignore, 1.12, 1.13 octave-forge.spec, 1.59, 
	1.60 sources, 1.12, 1.13 octave-forge-20080429-ImageMagick.patch,
	1.1, NONE octave-forge-20080429-gcc43.patch, 1.4, NONE
Message-ID: <20080909143754.A71AE7012A@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/devel/octave-forge
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16926

Modified Files:
	.cvsignore octave-forge.spec sources 
Removed Files:
	octave-forge-20080429-ImageMagick.patch 
	octave-forge-20080429-gcc43.patch 
Log Message:
* Mon Sep 8 2008 Orion Poplawski <orion at cora.nwra.com>  20080831-1
- Update to 20080831
- Drop upstreamed patches
- Enable octave-parallel for 64-bit platforms



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/octave-forge/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	30 Apr 2008 20:57:12 -0000	1.12
+++ .cvsignore	9 Sep 2008 14:37:24 -0000	1.13
@@ -1 +1 @@
-octave-forge-bundle-20080429.patched.tar.gz
+octave-forge-bundle-20080831.tar.gz


Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/devel/octave-forge/octave-forge.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- octave-forge.spec	2 May 2008 14:59:09 -0000	1.59
+++ octave-forge.spec	9 Sep 2008 14:37:24 -0000	1.60
@@ -1,8 +1,8 @@
 %{!?octave_api: %define octave_api %(octave-config -p API_VERSION || echo 0)}
 
 Name:           octave-forge
-Version:        20080429
-Release:        6%{?dist}
+Version:        20080831
+Release:        1%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -17,8 +17,6 @@
 ## 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}-20080429-gcc43.patch
-Patch1:         %{name}-20080429-ImageMagick.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	octave(api) = %{octave_api} ImageMagick
@@ -27,75 +25,74 @@
 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
-Provides: octave-audio = 1.1.1
-Provides: octave-ann = 1.0
-Provides: octave-bioinfo = 0.1.0
-Provides: octave-combinatorics = 1.0.6
-Provides: octave-communications = 1.0.6
-Provides: octave-control = 1.0.6
-#Provides: octave-database = 1.0
-Provides: octave-data-smoothing = 1.0.0
-Provides: octave-econometrics = 1.0.6
-Provides: octave-financial = 0.2.2
-Provides: octave-fixed = 0.7.6
-Provides: octave-ftp = 1.0
-Provides: octave-ga = 0.1.1
-Provides: octave-general = 1.0.6
-Provides: octave-gsl = 1.0.6
-Provides: octave-ident = 1.0.5
-Provides: octave-image = 1.0.6
-Provides: octave-informationtheory = 0.1.5
-Provides: octave-io = 1.0.6
-Provides: octave-irsa = 1.0.5
-Provides: octave-linear-algebra = 1.0.5
-Provides: octave-miscellaneous = 1.0.6
-Provides: octave-missing-functions = 1.0.0
-Provides: octave-nnet = 0.1.7
-Provides: octave-octcdf = 1.0.9
-Provides: octave-octgpr = 1.1.3
-Provides: octave-odebvp = 1.0.4
-Provides: octave-odepkg = 0.6.0
-Provides: octave-optim = 1.0.2
-Provides: octave-optiminterp = 0.2.7
-Provides: octave-outliers = 0.13.7
-%ifnarch x86_64 ppc64
-Provides: octave-parallel = 1.0.6
-%endif
-Provides: octave-physicalconstants = 0.1.5
-Provides: octave-plot = 1.0.5
-Provides: octave-signal = 1.0.7
-Provides: octave-sockets = 1.0.4
-Provides: octave-specfun = 1.0.6
-Provides: octave-special-matrix = 1.0.5
-Provides: octave-splines = 1.0.5
-Provides: octave-statistics = 1.0.6
-Provides: octave-strings = 1.0.5
-Provides: octave-struct = 1.0.5
-Provides: octave-symbolic = 1.0.6
-Provides: octave-time = 1.0.7
-Provides: octave-vrml = 1.0.6
-Provides: octave-zenity = 0.5.5
-Provides: octave-ad = 1.0.2
-Provides: octave-bim = 0.0.6
-Provides: octave-civil-engineering = 1.0.5
-Provides: octave-fpl = 0.1.2
-Provides: octave-graceplot = 1.0.5
-Provides: octave-integration = 1.0.5
-Provides: octave-java = 1.2.4
-Provides: octave-mapping = 1.0.5
-Provides: octave-msh = 0.0.6
-Provides: octave-multicore = 0.2.12
-Provides: octave-nan = 1.0.6
-Provides: octave-ocs = 0.0.1
-Provides: octave-pdb = 1.0.5
-Provides: octave-secs1d = 0.0.6
-Provides: octave-secs2d = 0.0.6
-Provides: octave-symband = 1.0.6
-Provides: octave-tcl-octave = 0.1.6
-Provides: octave-triangular = 1.0.4
-Provides: octave-tsa = 3.10.6
-Provides: octave-xraylib = 1.0.6
-Provides: octave-language-pt_br = 1.0.6
+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
+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
+
 
 %description
 Octave-forge is a community project for collaborative development of
@@ -107,10 +104,6 @@
 
 %prep
 %setup -q -n octave-forge-bundle-%{version}
-#Not 64-bit safe
-%ifarch x86_64 ppc64
-rm main/parallel-*.tar.gz
-%endif
 # The scripts below will build everything automatically, so first
 # remove some packages that we don't want to build:
 # 1. video stuff requires non-free libraries
@@ -138,9 +131,6 @@
    cd ..
 done
 
-%patch0 -p1
-%patch1 -p1
-
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
 
@@ -213,6 +203,11 @@
 
 
 %changelog
+* Mon Sep 8 2008 Orion Poplawski <orion at cora.nwra.com>  20080831-1
+- Update to 20080831
+- Drop upstreamed patches
+- Enable octave-parallel for 64-bit platforms
+
 * Fri May  2 2008 Quentin Spencer <qspencer at users.sf.net> 20080429-6
 - Add patch for new ImageMagick.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/octave-forge/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 Apr 2008 20:57:12 -0000	1.12
+++ sources	9 Sep 2008 14:37:24 -0000	1.13
@@ -1 +1 @@
-c8970c00aa57076909d44ad1c1fb2bfe  octave-forge-bundle-20080429.patched.tar.gz
+680ea705eb7434e219eb4a3eaffd7fba  octave-forge-bundle-20080831.tar.gz


--- octave-forge-20080429-ImageMagick.patch DELETED ---


--- octave-forge-20080429-gcc43.patch DELETED ---



From erikos at fedoraproject.org  Tue Sep  9 14:40:55 2008
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Tue,  9 Sep 2008 14:40:55 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel remove-pseudopo.patch, NONE,
	1.1 sugar-toolkit.spec, 1.19, 1.20
Message-ID: <20080909144055.F2CB27012A@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17785

Modified Files:
	sugar-toolkit.spec 
Added Files:
	remove-pseudopo.patch 
Log Message:
* Tue Sep 9 2008 Simon Schampijer <simon at laptop.org> - 0.82.5-4
- remove pseudo.po from the source tarball



remove-pseudopo.patch:

--- NEW FILE remove-pseudopo.patch ---
diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuilder.py
index a6b8ea5..ecf71e4 100644
--- a/src/sugar/activity/bundlebuilder.py
+++ b/src/sugar/activity/bundlebuilder.py
@@ -190,20 +190,28 @@ class XOPackager(Packager):
         bundle_zip.close()
 
 class SourcePackager(Packager):
+    IGNORE = 'po/pseudo.po'
+
     def __init__(self, config):
         Packager.__init__(self, config)
         self.package_path = os.path.join(self.config.dist_dir,
                                          self.config.tar_name)
 
     def get_files(self):
+        files = []
         git_ls = subprocess.Popen('git-ls-files', stdout=subprocess.PIPE, 
                                   cwd=self.config.source_dir)
         if git_ls.wait():
             # Fall back to filtered list
-            return list_files(self.config.source_dir,
-                              IGNORE_DIRS, IGNORE_FILES)
-        
-        return [path.strip() for path in git_ls.stdout.readlines()]
+            files = list_files(self.config.source_dir,
+                               IGNORE_DIRS, IGNORE_FILES)
+        else:
+            files = [path.strip() for path in git_ls.stdout.readlines()]
+
+        if self.IGNORE in files:
+            files.remove(self.IGNORE)
+
+        return files
 
     def package(self):
         tar = tarfile.open(self.package_path, 'w:bz2')


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sugar-toolkit.spec	4 Sep 2008 01:51:17 -0000	1.19
+++ sugar-toolkit.spec	9 Sep 2008 14:40:25 -0000	1.20
@@ -6,7 +6,7 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.82.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -19,6 +19,8 @@
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: remove-pseudopo.patch
+
 BuildRequires: pkgconfig
 BuildRequires: pygtk2-devel
 BuildRequires: gettext
@@ -44,6 +46,7 @@
 
 %prep
 %setup -q
+%patch1  -p1 -b .pseudopo
 
 %build
 %configure
@@ -67,6 +70,9 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Tue Sep 9 2008 Simon Schampijer <simon at laptop.org> - 0.82.5-4
+- remove pseudo.po from the source tarball
+
 * Wed Sep  3 2008 Jeremy Katz <katzj at redhat.com> - 0.82.5-3
 - requires gettext for bundlebuilder
 



From s4504kr at fedoraproject.org  Tue Sep  9 14:44:29 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue,  9 Sep 2008 14:44:29 +0000 (UTC)
Subject: rpms/aplus-fsf/devel aplus-fsf.wrapper, NONE, 1.1 aplus-fsf.spec,
	1.23, 1.24
Message-ID: <20080909144429.ED5527012A@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18934

Modified Files:
	aplus-fsf.spec 
Added Files:
	aplus-fsf.wrapper 
Log Message:
Try to fix BZ #456952


--- NEW FILE aplus-fsf.wrapper ---
#!/bin/sh

export LC_ALL=POXIS; /usr/bin/a+.bin


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- aplus-fsf.spec	22 Apr 2008 16:13:02 -0000	1.23
+++ aplus-fsf.spec	9 Sep 2008 14:43:59 -0000	1.24
@@ -1,7 +1,7 @@
 %define catalogue %{_sysconfdir}/X11/fontpath.d/
 %define name aplus-fsf
 %define ver 4.22
-%define rel 1
+%define rel 4
 
 %define _x11pref %{_datadir}/X11
 %define _x11bindir %{_bindir}
@@ -14,8 +14,8 @@
 %define _x11appdef %{_x11pref}/app-defaults
 
 Name: %name
-Version: 4.22.1
-Release: 3%{?dist}
+Version: 4.22.4
+Release: 1%{?dist}
 License: GPLv2
 
 Summary: Advanced APL interpreter with s interface
@@ -25,9 +25,10 @@
 
 Source: http://www.aplusdev.org/Download/%name-%ver-%rel.tar.gz
 Source1: aplus-fsf-4.20-elstart
-Patch1: aplus-fsf-4.22-makefile.patch
+Source2: aplus-fsf.wrapper
+Patch1: aplus-fsf-4.22.3-makefile.patch
 Patch3: aplus-fsf-4.20-el.patch
-Patch4: aplus-fsf-4.20-atree.patch
+Patch4: aplus-fsf-4.22.3-atree.patch
 
 BuildRequires: libtool
 BuildRequires: xorg-x11-proto-devel
@@ -99,7 +100,7 @@
 %setup -q -n %{name}-%{ver}
 %patch1 -p1 -b .org
 %patch3 -p1
-%patch4 -p1
+%patch4 -p1 
 
 %build
 # export CXXFLAGS=-O3 CFLAGS=-O3
@@ -119,12 +120,6 @@
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.a
 
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/a+
-cp $RPM_BUILD_ROOT/%{_libdir}/*.+ $RPM_BUILD_ROOT/%{_libdir}/a+/
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.+ 
-
-# Move libs in an other dir to solve conflicts
-
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/aplus-fsf/%{version}
 
 cp $RPM_BUILD_ROOT/%{_libdir}/lib*.so $RPM_BUILD_ROOT/%{_libdir}/aplus-fsf/%{version}
@@ -140,17 +135,16 @@
 mv XTerm XTerm-apl
 popd
 
-cp -R src/scripts samples
-
 mv $RPM_BUILD_ROOT/%{_includedir}/a $RPM_BUILD_ROOT/%{_includedir}/a+
 
-%ifarch x86_64
-mv samples/Makefile samples/Makefile-%{_arch}
-%endif
-
 install -m 0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/fonts/conf.d
 install -d $RPM_BUILD_ROOT/%{catalogue}
 
+# Install a+ wrapper
+
+mv $RPM_BUILD_ROOT/%{_bindir}/a+ $RPM_BUILD_ROOT/%{_bindir}/a+.bin
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/a+
+
 # Installation X11-Fonts
 
 ln -sf %{_x11fonts} $RPM_BUILD_ROOT/%{catalogue}/apl-x11
@@ -160,6 +154,9 @@
 mkfontdir $RPM_BUILD_ROOT/%{_x11fonts}
 mkfontscale $RPM_BUILD_ROOT/%{_x11fonts}
 
+rm -rf $RPM_BUILD_ROOT/%{_prefix}/lisp*
+rm -rf $RPM_BUILD_ROOT/%{_prefix}/contrib
+
 # Installation Truetyp-Fonts
 
 ln -sf %{_ttffonts} $RPM_BUILD_ROOT/%{catalogue}/apl-truetype
@@ -200,16 +197,16 @@
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/a+
+%attr(0755,root,root) %{_bindir}/a+
+%attr(0755,root,root) %{_bindir}/a+.bin
 %{_libdir}/aplus-fsf/
-%{_libdir}/a+
+%{_prefix}/lib/a+/
 %dir %{_x11appdef}
 %{_x11appdef}/XTerm-apl
 %dir %{_fonts}/apl
 %{_sysconfdir}/ld.so.conf.d/aplus-fsf-%{_arch}.conf
 %{_datadir}/aplus-fsf/
 
-%doc samples
 %doc ANNOUNCE AUTHORS ChangeLog LICENSE README
 
 %files devel
@@ -244,6 +241,9 @@
 %{catalogue}/apl-truetype
 
 %Changelog
+* Tue Sep  9 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-1
+- Try to fix BZ #456952
+
 * Tue Apr 22 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.1-3
 - Font packaging cleanup (#443442, #443444)
 



From maxx at fedoraproject.org  Tue Sep  9 14:46:35 2008
From: maxx at fedoraproject.org (Mads Villadsen)
Date: Tue,  9 Sep 2008 14:46:35 +0000 (UTC)
Subject: rpms/hamster-applet/devel .cvsignore, 1.11, 1.12 hamster-applet.spec,
	1.16, 1.17 sources, 1.11, 1.12
Message-ID: <20080909144635.6E4B07012E@cvs1.fedora.phx.redhat.com>

Author: maxx

Update of /cvs/pkgs/rpms/hamster-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19828

Modified Files:
	.cvsignore hamster-applet.spec sources 
Log Message:
* Tue Sep  9 2008 Mads Villadsen <maxx at krakoa.dk> - 2.23.92-1
- Update to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Sep 2008 19:09:27 -0000	1.11
+++ .cvsignore	9 Sep 2008 14:46:05 -0000	1.12
@@ -1 +1 @@
-hamster-applet-2.23.91.tar.bz2
+hamster-applet-2.23.92.tar.bz2


Index: hamster-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/hamster-applet.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- hamster-applet.spec	3 Sep 2008 19:09:27 -0000	1.16
+++ hamster-applet.spec	9 Sep 2008 14:46:05 -0000	1.17
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           hamster-applet
-Version:        2.23.91
+Version:        2.23.92
 Release:        1%{?dist}
 Summary:        Time tracking applet
 
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Tue Sep  9 2008 Mads Villadsen <maxx at krakoa.dk> - 2.23.92-1
+- Update to latest upstream release
+
 * Wed Sep  3 2008 Mads Villadsen <maxx at krakoa.dk> - 2.23.91-1
 - Update to latest upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Sep 2008 19:09:27 -0000	1.11
+++ sources	9 Sep 2008 14:46:05 -0000	1.12
@@ -1 +1 @@
-1ba23e31973403d03f9c9063b2b14a7b  hamster-applet-2.23.91.tar.bz2
+aadde58031ecc751c64acccfe56085a0  hamster-applet-2.23.92.tar.bz2



From mso at fedoraproject.org  Tue Sep  9 14:49:11 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Tue,  9 Sep 2008 14:49:11 +0000 (UTC)
Subject: rpms/gxine/EL-5 gxine.spec,1.12,1.13
Message-ID: <20080909144911.75CB87012A@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/gxine/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20508

Modified Files:
	gxine.spec 
Log Message:


Use correct xulrunner (build)requires.
Rebuild (-16 release blocks another xulrunner update).




Index: gxine.spec
===================================================================
RCS file: /cvs/extras/rpms/gxine/EL-5/gxine.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gxine.spec	16 Jul 2008 22:58:13 -0000	1.12
+++ gxine.spec	9 Sep 2008 14:48:41 -0000	1.13
@@ -1,10 +1,6 @@
-%define use_xulrunner_js 1
-%define gecko_dev_ver 1.9
-%define gecko_libs_ver %{gecko_dev_ver}
-
 Name:           gxine
 Version:        0.5.11
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        GTK frontend for the xine multimedia library
 
 Group:          Applications/Multimedia
@@ -17,11 +13,7 @@
 Patch1:         gxine-0.5.11-keep-wnd-state.patch
 
 
-%if 0%{?use_xulrunner_js}
-BuildRequires:  gecko-devel = %{gecko_dev_ver}
-%else
-BuildRequires:  js-devel
-%endif
+BuildRequires:  gecko-devel >= 1.9
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gtk2-devel
@@ -29,7 +21,7 @@
 
 # for dbus support
 BuildRequires:  dbus-glib-devel
-# for LIRC support (not available only for fedora)
+# for LIRC support (available only for fedora)
 %if 0%{?fedora}
 BuildRequires:  lirc-devel
 %endif
@@ -39,9 +31,7 @@
 BuildRequires:  libXaw-devel
 BuildRequires:  nspr-devel
 
-%if 0%{?use_xulrunner_js}
-Requires:       gecko-libs = %{gecko_libs_ver}
-%endif
+Requires:       gecko-libs >= 1.9
 
 %description
 gxine is a fully-featured free audio/video player for unix-like systems which
@@ -131,6 +121,10 @@
 %{_libdir}/mozilla/plugins/gxineplugin.so
 
 %changelog
+* Tue Sep 09 2008 Martin Sourada <mso at fedoraproject.org> - 0.5.11-17
+- use correct xulrunner (build)require
+- rebuild (-16 release blocks xulrunner update)
+
 * Thu Jul 17 2008 Martin Sourada <martin.sourada at gmail.com> - 0.5.11-16
 - rebuild for xulrunner in EPEL 5
 



From tuxbrewr at fedoraproject.org  Tue Sep  9 14:50:32 2008
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue,  9 Sep 2008 14:50:32 +0000 (UTC)
Subject: rpms/conman/devel .cvsignore, 1.4, 1.5 conman.spec, 1.11,
	1.12 sources, 1.4, 1.5
Message-ID: <20080909145032.7B51C7012A@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/conman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21052

Modified Files:
	.cvsignore conman.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conman/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 May 2008 02:40:48 -0000	1.4
+++ .cvsignore	9 Sep 2008 14:50:02 -0000	1.5
@@ -1,3 +1 @@
-conman-0.1.9.1.tar.bz2
-conman-0.1.9.2.tar.bz2
-conman-0.2.1.tar.bz2
+conman-0.2.2.tar.bz2


Index: conman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conman/devel/conman.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- conman.spec	15 Jul 2008 17:51:51 -0000	1.11
+++ conman.spec	9 Sep 2008 14:50:02 -0000	1.12
@@ -1,6 +1,6 @@
 Name:               conman
-Version:            0.2.1
-Release:            2%{?dist}
+Version:            0.2.2
+Release:            1%{?dist}
 Summary:            ConMan - The Console Manager
 
 Group:              Applications/System
@@ -84,7 +84,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING DISCLAIMER FAQ NEWS
+%doc AUTHORS ChangeLog COPYING FAQ NEWS
 %doc share/examples
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
@@ -98,8 +98,8 @@
 %{_mandir}/*/*
 
 %changelog
-* Tue Jul 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.1-2
-- fix license tag
+* Mon Sep 08 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.2.2-1
+- New upstream release
 
 * Fri May 02 2008 Jarod Wilson <jwilson at redhat.com> 0.2.1-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conman/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 May 2008 02:40:48 -0000	1.4
+++ sources	9 Sep 2008 14:50:02 -0000	1.5
@@ -1 +1 @@
-2972ffabdf9952b6a061087de234e829  conman-0.2.1.tar.bz2
+a4ab31cb665e9ef27933d67c3070b2ed  conman-0.2.2.tar.bz2



From s4504kr at fedoraproject.org  Tue Sep  9 14:52:46 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue,  9 Sep 2008 14:52:46 +0000 (UTC)
Subject: rpms/aplus-fsf/devel .cvsignore, 1.3, 1.4 aplus-fsf.spec, 1.24,
	1.25 sources, 1.3, 1.4
Message-ID: <20080909145246.990C77012A@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21977

Modified Files:
	.cvsignore aplus-fsf.spec sources 
Log Message:
Forgotten to upload sources


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Apr 2008 16:57:26 -0000	1.3
+++ .cvsignore	9 Sep 2008 14:52:16 -0000	1.4
@@ -1 +1 @@
-aplus-fsf-4.22-1.tar.gz
+aplus-fsf-4.22-4.tar.gz


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- aplus-fsf.spec	9 Sep 2008 14:43:59 -0000	1.24
+++ aplus-fsf.spec	9 Sep 2008 14:52:16 -0000	1.25
@@ -15,7 +15,7 @@
 
 Name: %name
 Version: 4.22.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 
 Summary: Advanced APL interpreter with s interface
@@ -241,7 +241,7 @@
 %{catalogue}/apl-truetype
 
 %Changelog
-* Tue Sep  9 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-1
+* Tue Sep  9 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-2
 - Try to fix BZ #456952
 
 * Tue Apr 22 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.1-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Apr 2008 16:57:26 -0000	1.3
+++ sources	9 Sep 2008 14:52:16 -0000	1.4
@@ -1 +1 @@
-af7d3f8a4643c41efa5d50b76507dc3c  aplus-fsf-4.22-1.tar.gz
+196cca239dec0d9744a89778bf8b09c8  aplus-fsf-4.22-4.tar.gz



From tuxbrewr at fedoraproject.org  Tue Sep  9 15:01:48 2008
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue,  9 Sep 2008 15:01:48 +0000 (UTC)
Subject: rpms/conman/F-9 .cvsignore, 1.4, 1.5 conman.spec, 1.10, 1.11 sources,
	1.4, 1.5
Message-ID: <20080909150148.215D17012A@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/conman/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24422

Modified Files:
	.cvsignore conman.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conman/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 May 2008 02:49:30 -0000	1.4
+++ .cvsignore	9 Sep 2008 15:01:17 -0000	1.5
@@ -1,3 +1 @@
-conman-0.1.9.1.tar.bz2
-conman-0.1.9.2.tar.bz2
-conman-0.2.1.tar.bz2
+conman-0.2.2.tar.bz2


Index: conman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conman/F-9/conman.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- conman.spec	3 May 2008 02:49:30 -0000	1.10
+++ conman.spec	9 Sep 2008 15:01:17 -0000	1.11
@@ -1,10 +1,10 @@
 Name:               conman
-Version:            0.2.1
+Version:            0.2.2
 Release:            1%{?dist}
 Summary:            ConMan - The Console Manager
 
 Group:              Applications/System
-License:            GPL
+License:            GPLv2+
 URL:                http://home.gna.org/conman/
 Source0:            http://download.gna.org/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Source1:            %{name}.init
@@ -84,7 +84,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING DISCLAIMER FAQ NEWS
+%doc AUTHORS ChangeLog COPYING FAQ NEWS
 %doc share/examples
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
@@ -98,6 +98,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Sep 08 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.2.2-1
+- New upstream release
+
 * Fri May 02 2008 Jarod Wilson <jwilson at redhat.com> 0.2.1-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conman/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 May 2008 02:49:30 -0000	1.4
+++ sources	9 Sep 2008 15:01:17 -0000	1.5
@@ -1 +1 @@
-2972ffabdf9952b6a061087de234e829  conman-0.2.1.tar.bz2
+a4ab31cb665e9ef27933d67c3070b2ed  conman-0.2.2.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep  9 15:02:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:02:31 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150231.EB53820876E@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on facter (Fedora devel) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:02:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:02:33 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150233.58716208D1E@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on facter (Fedora devel) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:02:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:02:36 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150236.52DCD208D9B@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on facter (Fedora devel) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:02:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:02:35 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150235.D181A208D98@bastion.fedora.phx.redhat.com>

lutter has set the approveacls acl on facter (Fedora devel) to Obsolete for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:02:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:02:39 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150239.9B6BA208DA0@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on facter (Fedora EPEL 4) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:02:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:02:41 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150241.6128E208DA2@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on facter (Fedora EPEL 4) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:02:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:02:42 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150242.E3A5C208DA5@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on facter (Fedora EPEL 4) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:02:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:02:44 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150245.062A220876E@bastion.fedora.phx.redhat.com>

lutter has set the approveacls acl on facter (Fedora EPEL 4) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:02:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:02:49 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150249.86594208DAA@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on facter (Fedora EPEL 5) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From veillard at fedoraproject.org  Tue Sep  9 15:02:50 2008
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue,  9 Sep 2008 15:02:50 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-0.4.5-no-emulator-segfault.patch, NONE, 
	1.1 libvirt.spec, 1.95, 1.96
Message-ID: <20080909150250.24EE67012A@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24653

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-0.4.5-no-emulator-segfault.patch 
Log Message:
Avoid a segfault if missing an emulator, Daniel


libvirt-0.4.5-no-emulator-segfault.patch:

--- NEW FILE libvirt-0.4.5-no-emulator-segfault.patch ---
diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index d742c32..23ef050 100644
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -790,7 +790,7 @@ int qemudBuildCommandLine(virConnectPtr conn,
     if (!emulator)
         return -1;
 
-    ADD_ARG_LIT(vm->def->emulator);
+    ADD_ARG_LIT(emulator);
     ADD_ARG_LIT("-S");
     ADD_ARG_LIT("-M");
     ADD_ARG_LIT(vm->def->os.machine);


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- libvirt.spec	8 Sep 2008 16:55:43 -0000	1.95
+++ libvirt.spec	9 Sep 2008 15:02:19 -0000	1.96
@@ -30,10 +30,11 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.4.5
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
+Patch0: libvirt-0.4.5-no-emulator-segfault.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
@@ -147,6 +148,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %if ! %{with_xen}
@@ -302,9 +304,15 @@
 %doc docs/examples/python
 
 %changelog
+* Tue Sep  9 2008 Daniel Veillard <veillard at redhat.com> - 0.4.5-2.fc10
+- fix a crash if a QEmu/KVM domain is defined without an emulator path
+
 * Mon Sep  8 2008 Daniel Veillard <veillard at redhat.com> - 0.4.5-1.fc10
 - upstream release 0.4.5
-- update
+- a lot of bug fixes
+- major updates to QEmu/KVM and Linux containers drivers
+- support for OpenVZ if installed
+
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.4-3.fc10
 - fix license tag
 



From pkgdb at fedoraproject.org  Tue Sep  9 15:02:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:02:50 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150250.55512208DAE@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on facter (Fedora EPEL 5) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:02:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:02:52 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150252.33CE9208DB1@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on facter (Fedora EPEL 5) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:02:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:02:53 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150253.27148208DB4@bastion.fedora.phx.redhat.com>

lutter has set the approveacls acl on facter (Fedora EPEL 5) to Obsolete for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:03:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:03:08 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150308.E147E208DC3@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on facter (Fedora 9) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:03:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:03:10 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150310.9BA4E208DC7@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on facter (Fedora 9) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:03:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:03:11 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150312.102BB208DC9@bastion.fedora.phx.redhat.com>

lutter has set the approveacls acl on facter (Fedora 9) to Obsolete for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:03:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:03:17 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150317.49DF4208DCC@bastion.fedora.phx.redhat.com>

lutter has set the approveacls acl on facter (Fedora EPEL 4) to Obsolete for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:03:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:03:48 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150348.46148208DA2@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on puppet (Fedora devel) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 15:03:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:03:49 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150349.1E591208DA4@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on puppet (Fedora devel) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 15:03:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:03:50 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150351.05085208DA7@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on puppet (Fedora devel) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 15:03:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:03:52 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150352.99309208DCE@bastion.fedora.phx.redhat.com>

lutter has set the approveacls acl on puppet (Fedora devel) to Obsolete for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 15:03:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:03:54 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150354.568EF208DAB@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on puppet (Fedora EPEL 4) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 15:03:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:03:56 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150356.6038D208DD1@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on puppet (Fedora EPEL 4) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 15:03:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:03:57 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150357.EB823208DD4@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on puppet (Fedora EPEL 4) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 15:04:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:04:00 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150400.700D8208DD6@bastion.fedora.phx.redhat.com>

lutter has set the approveacls acl on puppet (Fedora EPEL 4) to Obsolete for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 15:04:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:04:01 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150401.27097208DD9@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on puppet (Fedora EPEL 5) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 15:04:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:04:02 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150402.CC564208DDD@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on puppet (Fedora EPEL 5) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 15:04:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:04:04 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150404.DA8A5208DB0@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on puppet (Fedora EPEL 5) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 15:04:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:04:06 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150406.707AD208DDF@bastion.fedora.phx.redhat.com>

lutter has set the approveacls acl on puppet (Fedora EPEL 5) to Obsolete for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 15:04:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:04:10 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150410.7279C208DB4@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on puppet (Fedora 8) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 15:04:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:04:11 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150411.7104A208DE4@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on puppet (Fedora 8) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 15:04:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:04:13 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150413.AAF22208DE7@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on puppet (Fedora 8) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 15:04:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:04:14 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150414.3CF59208DEA@bastion.fedora.phx.redhat.com>

lutter has set the approveacls acl on puppet (Fedora 8) to Obsolete for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 15:04:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:04:15 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150416.09F26208DED@bastion.fedora.phx.redhat.com>

lutter has set the approveacls acl on puppet (Fedora 9) to Obsolete for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 15:03:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:03:01 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150301.B6524208DBA@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on facter (Fedora 8) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:03:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:03:04 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150304.C4681208DC0@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on facter (Fedora 9) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:03:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:03:00 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150301.000CD208DB7@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on facter (Fedora 8) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:04:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:04:17 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150417.B70D5208DEF@bastion.fedora.phx.redhat.com>

lutter has set the commit acl on puppet (Fedora 9) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 15:03:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:03:03 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150303.A934F208DBD@bastion.fedora.phx.redhat.com>

lutter has set the approveacls acl on facter (Fedora 8) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:03:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:03:07 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150308.012E7208D99@bastion.fedora.phx.redhat.com>

lutter has set the approveacls acl on facter (Fedora 8) to Obsolete for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From pkgdb at fedoraproject.org  Tue Sep  9 15:04:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:04:18 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150419.4B407208DB5@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on puppet (Fedora 9) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From pkgdb at fedoraproject.org  Tue Sep  9 15:04:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:04:20 +0000
Subject: [pkgdb] puppet had acl change status
Message-ID: <20080909150420.38EFE208DF3@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on puppet (Fedora 9) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/puppet



From tsmetana at fedoraproject.org  Tue Sep  9 15:07:53 2008
From: tsmetana at fedoraproject.org (Tomas Smetana)
Date: Tue,  9 Sep 2008 15:07:53 +0000 (UTC)
Subject: rpms/nut/EL-5 nut.spec,1.50,1.51 ups.sysconfig,1.4,1.5
Message-ID: <20080909150753.180D37012A@cvs1.fedora.phx.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/nut/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26070

Modified Files:
	nut.spec ups.sysconfig 
Log Message:
* Tue Sep 08 2008 Tomas Smetana <tsmetana at redhat.com> 2.2.0-5.2
- fix #461574 - add MODEL variable to sysconfig for initscripts compatibility



Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/EL-5/nut.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- nut.spec	29 Nov 2007 08:13:44 -0000	1.50
+++ nut.spec	9 Sep 2008 15:07:22 -0000	1.51
@@ -9,7 +9,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.2.0
-Release: 5.1%{?dist}
+Release: 5.2%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -297,6 +297,9 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Tue Sep 08 2008 Tomas Smetana <tsmetana at redhat.com> 2.2.0-5.2
+- fix #461574 - add MODEL variable to sysconfig for initscripts compatibility
+
 * Thu Nov 29 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-5.1
 - update init script
 


Index: ups.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/nut/EL-5/ups.sysconfig,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ups.sysconfig	16 Aug 2007 10:31:13 -0000	1.4
+++ ups.sysconfig	9 Sep 2008 15:07:22 -0000	1.5
@@ -5,4 +5,7 @@
 # This *must* be the same as in /etc/ups/upsmon.conf
 POWERDOWNFLAG=/etc/killpower
 #
+# For compatibility with initscripts -- do not change
+MODEL=upsdrvctl
+#
 # [End]



From pkgdb at fedoraproject.org  Tue Sep  9 15:09:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:09:13 +0000
Subject: [pkgdb] openswan: avesh has requested watchcommits
Message-ID: <20080909150913.92FD6208D1E@bastion.fedora.phx.redhat.com>

avesh has requested the watchcommits acl on openswan (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:09:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:09:13 +0000
Subject: [pkgdb] openswan: avesh has requested commit
Message-ID: <20080909150913.B4ACB208DA3@bastion.fedora.phx.redhat.com>

avesh has requested the commit acl on openswan (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:09:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:09:29 +0000
Subject: [pkgdb] openswan: avesh has requested watchcommits
Message-ID: <20080909150929.89366208770@bastion.fedora.phx.redhat.com>

avesh has requested the watchcommits acl on openswan (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:09:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:09:32 +0000
Subject: [pkgdb] openswan: avesh has requested commit
Message-ID: <20080909150932.CDB24208D7C@bastion.fedora.phx.redhat.com>

avesh has requested the commit acl on openswan (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:09:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:09:38 +0000
Subject: [pkgdb] openswan: avesh has requested watchcommits
Message-ID: <20080909150939.01700208D9A@bastion.fedora.phx.redhat.com>

avesh has requested the watchcommits acl on openswan (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:09:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:09:40 +0000
Subject: [pkgdb] openswan: avesh has requested commit
Message-ID: <20080909150940.B3EAB208D9B@bastion.fedora.phx.redhat.com>

avesh has requested the commit acl on openswan (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From lennart at fedoraproject.org  Tue Sep  9 15:10:24 2008
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue,  9 Sep 2008 15:10:24 +0000 (UTC)
Subject: rpms/libcanberra/devel libcanberra.spec,1.13,1.14
Message-ID: <20080909151024.11D007012A@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26756

Modified Files:
	libcanberra.spec 
Log Message:
New version


Index: libcanberra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libcanberra.spec	28 Aug 2008 16:32:03 -0000	1.13
+++ libcanberra.spec	9 Sep 2008 15:09:53 -0000	1.14
@@ -1,6 +1,6 @@
 Name: libcanberra
-Version: 0.8
-Release: 2%{?dist}
+Version: 0.9
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -15,6 +15,7 @@
 BuildRequires: gtk-doc
 BuildRequires: pulseaudio-libs-devel >= 0.9.11-1
 BuildRequires: gstreamer-devel
+BuildRequires: libtdb-devel
 Requires: sound-theme-freedesktop
 Requires: pulseaudio-libs >= 0.9.11-1
 
@@ -96,6 +97,9 @@
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Thu Sep 9 2008 Lennart Poettering <lpoetter at redhat.com> 0.9-1
+- New version
+
 * Thu Aug 28 2008 Lennart Poettering <lpoetter at redhat.com> 0.8-2
 - Fix build-time dep on Gstreamer
 



From tuxbrewr at fedoraproject.org  Tue Sep  9 15:11:15 2008
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue,  9 Sep 2008 15:11:15 +0000 (UTC)
Subject: rpms/conman/F-8 .cvsignore, 1.4, 1.5 conman.spec, 1.9, 1.10 sources,
	1.4, 1.5
Message-ID: <20080909151115.630497012A@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/conman/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27043

Modified Files:
	.cvsignore conman.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conman/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 May 2008 02:54:12 -0000	1.4
+++ .cvsignore	9 Sep 2008 15:10:45 -0000	1.5
@@ -1,3 +1 @@
-conman-0.1.9.1.tar.bz2
-conman-0.1.9.2.tar.bz2
-conman-0.2.1.tar.bz2
+conman-0.2.2.tar.bz2


Index: conman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conman/F-8/conman.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- conman.spec	3 May 2008 02:54:12 -0000	1.9
+++ conman.spec	9 Sep 2008 15:10:45 -0000	1.10
@@ -1,10 +1,10 @@
 Name:               conman
-Version:            0.2.1
+Version:            0.2.2
 Release:            1%{?dist}
 Summary:            ConMan - The Console Manager
 
 Group:              Applications/System
-License:            GPL
+License:            GPLv2+
 URL:                http://home.gna.org/conman/
 Source0:            http://download.gna.org/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Source1:            %{name}.init
@@ -84,7 +84,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING DISCLAIMER FAQ NEWS
+%doc AUTHORS ChangeLog COPYING FAQ NEWS
 %doc share/examples
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
@@ -98,6 +98,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Sep 08 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.2.2-1
+- New upstream release
+
 * Fri May 02 2008 Jarod Wilson <jwilson at redhat.com> 0.2.1-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conman/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 May 2008 02:54:12 -0000	1.4
+++ sources	9 Sep 2008 15:10:45 -0000	1.5
@@ -1 +1 @@
-2972ffabdf9952b6a061087de234e829  conman-0.2.1.tar.bz2
+a4ab31cb665e9ef27933d67c3070b2ed  conman-0.2.2.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep  9 15:12:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:12:23 +0000
Subject: [pkgdb] openswan ownership updated
Message-ID: <20080909151223.AB5E920876E@bastion.fedora.phx.redhat.com>

Package openswan in Fedora devel was orphaned by sgrubb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:12:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:12:29 +0000
Subject: [pkgdb] openswan ownership updated
Message-ID: <20080909151229.CB34B208D0F@bastion.fedora.phx.redhat.com>

Package openswan in Fedora 9 was orphaned by sgrubb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:12:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:12:33 +0000
Subject: [pkgdb] openswan ownership updated
Message-ID: <20080909151233.4B8ED208D7C@bastion.fedora.phx.redhat.com>

Package openswan in Fedora 8 was orphaned by sgrubb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:12:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:12:35 +0000
Subject: [pkgdb] Io-language ownership updated
Message-ID: <20080909151235.6281020876D@bastion.fedora.phx.redhat.com>

Package Io-language in Fedora devel is now owned by salimma

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Tue Sep  9 15:12:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:12:48 +0000
Subject: [pkgdb] Io-language ownership updated
Message-ID: <20080909151248.9A09F208D97@bastion.fedora.phx.redhat.com>

Package Io-language in Fedora 8 is now owned by salimma

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Tue Sep  9 15:12:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:12:52 +0000
Subject: [pkgdb] openswan ownership updated
Message-ID: <20080909151252.C74A8208D7C@bastion.fedora.phx.redhat.com>

Package openswan in Fedora devel is now owned by avesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:12:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:12:49 +0000
Subject: [pkgdb] Io-language ownership updated
Message-ID: <20080909151249.EFB46208D0F@bastion.fedora.phx.redhat.com>

Package Io-language in Fedora 9 is now owned by salimma

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From lennart at fedoraproject.org  Tue Sep  9 15:12:56 2008
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue,  9 Sep 2008 15:12:56 +0000 (UTC)
Subject: rpms/libcanberra/devel .cvsignore,1.7,1.8 sources,1.8,1.9
Message-ID: <20080909151256.6B7547012A@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27605

Modified Files:
	.cvsignore sources 
Log Message:
upload tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Aug 2008 16:11:35 -0000	1.7
+++ .cvsignore	9 Sep 2008 15:12:26 -0000	1.8
@@ -1 +1 @@
-libcanberra-0.8.tar.gz
+libcanberra-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Aug 2008 16:11:36 -0000	1.8
+++ sources	9 Sep 2008 15:12:26 -0000	1.9
@@ -1 +1 @@
-7e94da74f5b1e2029916799b915fdc74  libcanberra-0.8.tar.gz
+1c6c63d5461e6a1ae443a124d49f8fb6  libcanberra-0.9.tar.gz



From pkgdb at fedoraproject.org  Tue Sep  9 15:13:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:13:05 +0000
Subject: [pkgdb] openswan ownership updated
Message-ID: <20080909151305.D3ECF20876E@bastion.fedora.phx.redhat.com>

Package openswan in Fedora 8 is now owned by avesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:13:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:13:08 +0000
Subject: [pkgdb] openswan ownership updated
Message-ID: <20080909151308.2E0E9208D1E@bastion.fedora.phx.redhat.com>

Package openswan in Fedora 9 is now owned by avesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:13:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:13:34 +0000
Subject: [pkgdb] openswan: sgrubb has requested watchcommits
Message-ID: <20080909151334.CEDBC208770@bastion.fedora.phx.redhat.com>

sgrubb has requested the watchcommits acl on openswan (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:13:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:13:36 +0000
Subject: [pkgdb] openswan: sgrubb has requested commit
Message-ID: <20080909151336.BC224208D7C@bastion.fedora.phx.redhat.com>

sgrubb has requested the commit acl on openswan (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:13:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:13:41 +0000
Subject: [pkgdb] openswan: sgrubb has requested watchcommits
Message-ID: <20080909151341.EF987208D98@bastion.fedora.phx.redhat.com>

sgrubb has requested the watchcommits acl on openswan (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:13:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:13:44 +0000
Subject: [pkgdb] openswan: sgrubb has requested commit
Message-ID: <20080909151344.821ED208D9A@bastion.fedora.phx.redhat.com>

sgrubb has requested the commit acl on openswan (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:13:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:13:51 +0000
Subject: [pkgdb] openswan: sgrubb has requested watchcommits
Message-ID: <20080909151352.0318D208770@bastion.fedora.phx.redhat.com>

sgrubb has requested the watchcommits acl on openswan (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:13:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:13:53 +0000
Subject: [pkgdb] openswan: sgrubb has requested commit
Message-ID: <20080909151353.32DD3208D9B@bastion.fedora.phx.redhat.com>

sgrubb has requested the commit acl on openswan (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:13:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:13:57 +0000
Subject: [pkgdb] openswan: sgrubb has requested watchcommits
Message-ID: <20080909151357.4C7F3208D9F@bastion.fedora.phx.redhat.com>

sgrubb has requested the watchcommits acl on openswan (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:13:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:13:58 +0000
Subject: [pkgdb] openswan: sgrubb has requested commit
Message-ID: <20080909151359.0B1E5208DA0@bastion.fedora.phx.redhat.com>

sgrubb has requested the commit acl on openswan (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:14:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:14:04 +0000
Subject: [pkgdb] openswan: sgrubb has given up watchcommits
Message-ID: <20080909151404.BF31E208D9A@bastion.fedora.phx.redhat.com>

sgrubb has given up the watchcommits acl on openswan (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:14:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:14:06 +0000
Subject: [pkgdb] openswan: sgrubb has given up commit
Message-ID: <20080909151406.AC428208DA2@bastion.fedora.phx.redhat.com>

sgrubb has given up the commit acl on openswan (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:14:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:14:39 +0000
Subject: [pkgdb] openswan had acl change status
Message-ID: <20080909151439.E48A6208D98@bastion.fedora.phx.redhat.com>

avesh has set the watchcommits acl on openswan (Fedora devel) to Approved for sgrubb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:14:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:14:43 +0000
Subject: [pkgdb] openswan had acl change status
Message-ID: <20080909151443.3197F208DA0@bastion.fedora.phx.redhat.com>

avesh has set the commit acl on openswan (Fedora devel) to Approved for sgrubb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:14:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:14:47 +0000
Subject: [pkgdb] openswan had acl change status
Message-ID: <20080909151447.DC56D208DA4@bastion.fedora.phx.redhat.com>

avesh has set the watchcommits acl on openswan (Fedora devel) to Obsolete for avesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:14:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:14:50 +0000
Subject: [pkgdb] openswan had acl change status
Message-ID: <20080909151450.CDAEA208DA6@bastion.fedora.phx.redhat.com>

avesh has set the commit acl on openswan (Fedora devel) to Obsolete for avesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:15:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:15:03 +0000
Subject: [pkgdb] openswan had acl change status
Message-ID: <20080909151503.6D36E208D1E@bastion.fedora.phx.redhat.com>

avesh has set the watchcommits acl on openswan (Fedora 8) to Approved for sgrubb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:15:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:15:05 +0000
Subject: [pkgdb] openswan had acl change status
Message-ID: <20080909151505.9CC9F208D9C@bastion.fedora.phx.redhat.com>

avesh has set the commit acl on openswan (Fedora 8) to Approved for sgrubb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:15:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:15:07 +0000
Subject: [pkgdb] openswan had acl change status
Message-ID: <20080909151507.EA962208DA9@bastion.fedora.phx.redhat.com>

avesh has set the watchcommits acl on openswan (Fedora 8) to Obsolete for avesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:15:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:15:20 +0000
Subject: [pkgdb] openswan had acl change status
Message-ID: <20080909151520.B3B8F208D97@bastion.fedora.phx.redhat.com>

avesh has set the watchcommits acl on openswan (Fedora 9) to Approved for sgrubb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:15:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:15:10 +0000
Subject: [pkgdb] openswan had acl change status
Message-ID: <20080909151510.4439C208DAC@bastion.fedora.phx.redhat.com>

avesh has set the commit acl on openswan (Fedora 8) to Obsolete for avesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:15:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:15:22 +0000
Subject: [pkgdb] openswan had acl change status
Message-ID: <20080909151522.C0A8F208D9A@bastion.fedora.phx.redhat.com>

avesh has set the commit acl on openswan (Fedora 9) to Approved for sgrubb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:15:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:15:25 +0000
Subject: [pkgdb] openswan had acl change status
Message-ID: <20080909151525.98A76208DA2@bastion.fedora.phx.redhat.com>

avesh has set the watchcommits acl on openswan (Fedora 9) to Obsolete for avesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From pkgdb at fedoraproject.org  Tue Sep  9 15:15:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:15:29 +0000
Subject: [pkgdb] openswan had acl change status
Message-ID: <20080909151529.7079F208DA4@bastion.fedora.phx.redhat.com>

avesh has set the commit acl on openswan (Fedora 9) to Obsolete for avesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openswan



From mso at fedoraproject.org  Tue Sep  9 15:19:25 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Tue,  9 Sep 2008 15:19:25 +0000 (UTC)
Subject: rpms/gxine/EL-5 gxine.spec,1.13,1.14
Message-ID: <20080909151925.13BFB7012A@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/gxine/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29816

Modified Files:
	gxine.spec 
Log Message:



Index: gxine.spec
===================================================================
RCS file: /cvs/extras/rpms/gxine/EL-5/gxine.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gxine.spec	9 Sep 2008 14:48:41 -0000	1.13
+++ gxine.spec	9 Sep 2008 15:18:54 -0000	1.14
@@ -21,6 +21,7 @@
 
 # for dbus support
 BuildRequires:  dbus-glib-devel
+BuildRequires:  dbus-devel
 # for LIRC support (available only for fedora)
 %if 0%{?fedora}
 BuildRequires:  lirc-devel
@@ -124,6 +125,7 @@
 * Tue Sep 09 2008 Martin Sourada <mso at fedoraproject.org> - 0.5.11-17
 - use correct xulrunner (build)require
 - rebuild (-16 release blocks xulrunner update)
+- add dbus-devel BR (broke dbus-glib-devel deps)
 
 * Thu Jul 17 2008 Martin Sourada <martin.sourada at gmail.com> - 0.5.11-16
 - rebuild for xulrunner in EPEL 5



From nphilipp at fedoraproject.org  Tue Sep  9 15:20:31 2008
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue,  9 Sep 2008 15:20:31 +0000 (UTC)
Subject: rpms/python-slip/devel .cvsignore, 1.11, 1.12 python-slip.spec, 1.10,
	1.11 sources, 1.12, 1.13
Message-ID: <20080909152031.C1A417012A@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/python-slip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30283

Modified Files:
	.cvsignore python-slip.spec sources 
Log Message:
version 0.1.13



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	29 Aug 2008 12:22:56 -0000	1.11
+++ .cvsignore	9 Sep 2008 15:20:01 -0000	1.12
@@ -1 +1 @@
-python-slip-0.1.12.tar.bz2
+python-slip-0.1.13.tar.bz2


Index: python-slip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/python-slip.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-slip.spec	29 Aug 2008 12:22:57 -0000	1.10
+++ python-slip.spec	9 Sep 2008 15:20:01 -0000	1.11
@@ -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.1.12
+Version:    0.1.13
 Release:    1%{?dist}
 Summary:    Miscellaneous convenience, extension and workaround code for Python
 
@@ -75,7 +75,7 @@
 
 %files dbus
 %defattr(-,root,root,-)
-%doc slip/dbus/README slip/dbus/examples
+%doc doc/dbus/*
 %{python_sitelib}/slip/dbus
 %{python_sitelib}/slip.dbus-%{version}-py%{python_version}.egg-info
 
@@ -85,6 +85,9 @@
 %{python_sitelib}/slip.gtk-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Tue Sep 09 2008 Nils Philippsen <nphilipp at redhat.com> - 0.1.13
+- add working examples
+
 * Fri Aug 29 2008 Nils Philippsen <nphilipp at redhat.com> - 0.1.12
 - make slip.dbus.service.Object persistence overridable per object
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	29 Aug 2008 12:22:57 -0000	1.12
+++ sources	9 Sep 2008 15:20:01 -0000	1.13
@@ -1 +1 @@
-8ad9f94c1625ace7ed103850aaec5f4e  python-slip-0.1.12.tar.bz2
+c92fc8c8a11ae922ca9b2438ba87af82  python-slip-0.1.13.tar.bz2



From mso at fedoraproject.org  Tue Sep  9 15:21:55 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Tue,  9 Sep 2008 15:21:55 +0000 (UTC)
Subject: rpms/gxine/EL-5 gxine.spec,1.14,1.15
Message-ID: <20080909152155.35ACE7012A@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/gxine/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30672

Modified Files:
	gxine.spec 
Log Message:


Fix typo.




Index: gxine.spec
===================================================================
RCS file: /cvs/extras/rpms/gxine/EL-5/gxine.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gxine.spec	9 Sep 2008 15:18:54 -0000	1.14
+++ gxine.spec	9 Sep 2008 15:21:25 -0000	1.15
@@ -125,7 +125,7 @@
 * Tue Sep 09 2008 Martin Sourada <mso at fedoraproject.org> - 0.5.11-17
 - use correct xulrunner (build)require
 - rebuild (-16 release blocks xulrunner update)
-- add dbus-devel BR (broke dbus-glib-devel deps)
+- add dbus-devel BR (broken dbus-glib-devel deps)
 
 * Thu Jul 17 2008 Martin Sourada <martin.sourada at gmail.com> - 0.5.11-16
 - rebuild for xulrunner in EPEL 5



From pkgdb at fedoraproject.org  Tue Sep  9 15:02:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:02:58 +0000
Subject: [pkgdb] facter had acl change status
Message-ID: <20080909150258.C8161208D0F@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on facter (Fedora 8) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/facter



From veillard at fedoraproject.org  Tue Sep  9 15:26:21 2008
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue,  9 Sep 2008 15:26:21 +0000 (UTC)
Subject: rpms/libvirt/F-9 libvirt-0.4.5-no-emulator-segfault.patch, NONE,
	1.1 libvirt.spec, 1.90, 1.91
Message-ID: <20080909152621.922147012A@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31823

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-0.4.5-no-emulator-segfault.patch 
Log Message:
fixing a segfault if emulator is missing, Daniel


libvirt-0.4.5-no-emulator-segfault.patch:

--- NEW FILE libvirt-0.4.5-no-emulator-segfault.patch ---
diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index d742c32..23ef050 100644
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -790,7 +790,7 @@ int qemudBuildCommandLine(virConnectPtr conn,
     if (!emulator)
         return -1;
 
-    ADD_ARG_LIT(vm->def->emulator);
+    ADD_ARG_LIT(emulator);
     ADD_ARG_LIT("-S");
     ADD_ARG_LIT("-M");
     ADD_ARG_LIT(vm->def->os.machine);


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-9/libvirt.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- libvirt.spec	9 Sep 2008 14:32:15 -0000	1.90
+++ libvirt.spec	9 Sep 2008 15:25:51 -0000	1.91
@@ -30,10 +30,11 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.4.5
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
+Patch0: libvirt-0.4.5-no-emulator-segfault.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
@@ -147,6 +148,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %if ! %{with_xen}
@@ -302,7 +304,10 @@
 %doc docs/examples/python
 
 %changelog
-* Mon Sep  8 2008 Daniel Veillard <veillard at redhat.com> - 0.4.5-1.fc10
+* Tue Sep  9 2008 Daniel Veillard <veillard at redhat.com> - 0.4.5-2.fc9
+- fix a crash if a QEmu/KVM domain is defined without an emulator path
+
+* Mon Sep  8 2008 Daniel Veillard <veillard at redhat.com> - 0.4.5-1.fc9
 - upstream release 0.4.5
 - a lot of bug fixes
 - major updates to QEmu/KVM and Linux containers drivers



From pkgdb at fedoraproject.org  Tue Sep  9 15:29:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:29:59 +0000
Subject: [pkgdb] kdegraphics-extras: tuxbrewr has requested watchbugzilla
Message-ID: <20080909152959.E88BD208D0F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdegraphics-extras (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics-extras



From pkgdb at fedoraproject.org  Tue Sep  9 15:30:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:30:00 +0000
Subject: [pkgdb] kdegraphics-extras: tuxbrewr has requested watchcommits
Message-ID: <20080909153000.9C436208D97@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdegraphics-extras (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics-extras



From pkgdb at fedoraproject.org  Tue Sep  9 15:30:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:30:13 +0000
Subject: [pkgdb] kdegraphics-extras: tuxbrewr has given up watchcommits
Message-ID: <20080909153014.023BE208D0F@bastion.fedora.phx.redhat.com>

tuxbrewr has given up the watchcommits acl on kdegraphics-extras (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics-extras



From pkgdb at fedoraproject.org  Tue Sep  9 15:30:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:30:14 +0000
Subject: [pkgdb] kdegraphics-extras: tuxbrewr has given up watchbugzilla
Message-ID: <20080909153014.8495B208D9B@bastion.fedora.phx.redhat.com>

tuxbrewr has given up the watchbugzilla acl on kdegraphics-extras (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics-extras



From pkgdb at fedoraproject.org  Tue Sep  9 15:30:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:30:44 +0000
Subject: [pkgdb] kde-i18n: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153044.8B7B4208D7C@bastion.fedora.phx.redhat.com>

tuxbrewr 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  Tue Sep  9 15:30:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:30:47 +0000
Subject: [pkgdb] kde-i18n: tuxbrewr has requested watchcommits
Message-ID: <20080909153047.8550E208D9E@bastion.fedora.phx.redhat.com>

tuxbrewr 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  Tue Sep  9 15:30:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:30:52 +0000
Subject: [pkgdb] kde-i18n: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153052.D66B4208DA4@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kde-i18n (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Tue Sep  9 15:30:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:30:55 +0000
Subject: [pkgdb] kde-i18n: tuxbrewr has requested watchcommits
Message-ID: <20080909153056.0C751208DA6@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kde-i18n (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Tue Sep  9 15:31:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:31:11 +0000
Subject: [pkgdb] kde-l10n: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153111.C8859208D1E@bastion.fedora.phx.redhat.com>

tuxbrewr 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  Tue Sep  9 15:31:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:31:15 +0000
Subject: [pkgdb] kde-l10n: tuxbrewr has requested watchcommits
Message-ID: <20080909153115.195F3208DAA@bastion.fedora.phx.redhat.com>

tuxbrewr 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  Tue Sep  9 15:31:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:31:19 +0000
Subject: [pkgdb] kde-l10n: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153119.B81AE208D9B@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kde-l10n (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Tue Sep  9 15:31:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:31:22 +0000
Subject: [pkgdb] kde-l10n: tuxbrewr has requested watchcommits
Message-ID: <20080909153122.57951208DB2@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kde-l10n (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Tue Sep  9 15:31:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:31:49 +0000
Subject: [pkgdb] kdelibs: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153149.D803F208DB9@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdelibs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Tue Sep  9 15:31:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:31:52 +0000
Subject: [pkgdb] kdelibs: tuxbrewr has requested watchcommits
Message-ID: <20080909153153.22EE8208DA6@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdelibs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Tue Sep  9 15:32:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:32:03 +0000
Subject: [pkgdb] kdelibs: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153203.E744D208DBB@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdelibs (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Tue Sep  9 15:32:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:32:06 +0000
Subject: [pkgdb] kdelibs: tuxbrewr has requested watchcommits
Message-ID: <20080909153206.DF984208DBE@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdelibs (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Tue Sep  9 15:32:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:32:29 +0000
Subject: [pkgdb] kdelibs3: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153229.E54F2208DAA@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdelibs3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs3



From pkgdb at fedoraproject.org  Tue Sep  9 15:32:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:32:31 +0000
Subject: [pkgdb] kdelibs3: tuxbrewr has requested watchcommits
Message-ID: <20080909153231.E943E208DC0@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdelibs3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs3



From pkgdb at fedoraproject.org  Tue Sep  9 15:32:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:32:36 +0000
Subject: [pkgdb] kdelibs3: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153237.0035C208DB2@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdelibs3 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs3



From pkgdb at fedoraproject.org  Tue Sep  9 15:32:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:32:41 +0000
Subject: [pkgdb] kdelibs3: tuxbrewr has requested watchcommits
Message-ID: <20080909153241.7F84C208DC1@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdelibs3 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs3



From pkgdb at fedoraproject.org  Tue Sep  9 15:33:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:33:20 +0000
Subject: [pkgdb] kdelibs4: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153320.E4C22208DA2@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdelibs4 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs4



From pkgdb at fedoraproject.org  Tue Sep  9 15:33:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:33:22 +0000
Subject: [pkgdb] kdelibs4: tuxbrewr has requested watchcommits
Message-ID: <20080909153322.80799208DB4@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdelibs4 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs4



From pkgdb at fedoraproject.org  Tue Sep  9 15:33:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:33:30 +0000
Subject: [pkgdb] kdelibs4: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153330.28997208DA8@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdelibs4 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs4



From pkgdb at fedoraproject.org  Tue Sep  9 15:33:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:33:31 +0000
Subject: [pkgdb] kdelibs4: tuxbrewr has requested watchcommits
Message-ID: <20080909153332.0D99E208DB9@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdelibs4 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs4



From pkgdb at fedoraproject.org  Tue Sep  9 15:33:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:33:51 +0000
Subject: [pkgdb] kdemultimedia: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153351.E4742208D9E@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdemultimedia (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Tue Sep  9 15:33:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:33:53 +0000
Subject: [pkgdb] kdemultimedia: tuxbrewr has requested watchcommits
Message-ID: <20080909153353.9AEE4208DBD@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdemultimedia (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Tue Sep  9 15:34:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:34:02 +0000
Subject: [pkgdb] kdemultimedia: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153403.0C9D3208DAE@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdemultimedia (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Tue Sep  9 15:34:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:34:05 +0000
Subject: [pkgdb] kdemultimedia: tuxbrewr has requested watchcommits
Message-ID: <20080909153405.B687B208DC3@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdemultimedia (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Tue Sep  9 15:35:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:35:05 +0000
Subject: [pkgdb] kdenetwork: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153505.D3C59208D98@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdenetwork (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Tue Sep  9 15:35:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:35:06 +0000
Subject: [pkgdb] kdenetwork: tuxbrewr has requested watchcommits
Message-ID: <20080909153506.BDAE4208DA1@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdenetwork (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Tue Sep  9 15:35:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:35:13 +0000
Subject: [pkgdb] kdenetwork: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153513.BD43A208DA5@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdenetwork (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Tue Sep  9 15:35:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:35:16 +0000
Subject: [pkgdb] kdenetwork: tuxbrewr has requested watchcommits
Message-ID: <20080909153516.89D2C208DB0@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdenetwork (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Tue Sep  9 15:35:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:35:44 +0000
Subject: [pkgdb] kdepim: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153544.F127B208D9E@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdepim (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Tue Sep  9 15:35:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:35:46 +0000
Subject: [pkgdb] kdepim: tuxbrewr has requested watchcommits
Message-ID: <20080909153547.190AC208DAC@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdepim (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Tue Sep  9 15:35:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:35:53 +0000
Subject: [pkgdb] kdepim: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153553.2C432208DB5@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdepim (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Tue Sep  9 15:35:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:35:54 +0000
Subject: [pkgdb] kdepim: tuxbrewr has requested watchcommits
Message-ID: <20080909153554.8CD2D208DB9@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdepim (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From bpepple at fedoraproject.org  Tue Sep  9 15:36:17 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  9 Sep 2008 15:36:17 +0000 (UTC)
Subject: rpms/swfdec-mozilla/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 swfdec-mozilla.spec, 1.8, 1.9
Message-ID: <20080909153617.BC1307012A@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/swfdec-mozilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2407

Modified Files:
	.cvsignore sources swfdec-mozilla.spec 
Log Message:
* Tue Sep  9 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.8.0-1
- Update to 0.8.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/swfdec-mozilla/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	31 Jul 2008 03:12:47 -0000	1.7
+++ .cvsignore	9 Sep 2008 15:35:47 -0000	1.8
@@ -1 +1 @@
-swfdec-mozilla-0.7.4.tar.gz
+swfdec-mozilla-0.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/swfdec-mozilla/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Jul 2008 03:12:48 -0000	1.7
+++ sources	9 Sep 2008 15:35:47 -0000	1.8
@@ -1 +1 @@
-c5958f3b003190b21977495021ac2b28  swfdec-mozilla-0.7.4.tar.gz
+c80f3139ad8900a3d0bd9684e5db46a9  swfdec-mozilla-0.8.0.tar.gz


Index: swfdec-mozilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/swfdec-mozilla/devel/swfdec-mozilla.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- swfdec-mozilla.spec	31 Jul 2008 03:12:48 -0000	1.8
+++ swfdec-mozilla.spec	9 Sep 2008 15:35:47 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		swfdec-mozilla
-Version:	0.7.4
+Version:	0.8.0
 Release:	1%{?dist}
 Summary:	Mozilla/Gecko player Flash plugin using swfdec
  
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Tue Sep  9 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.8.0-1
+- Update to 0.8.0.
+
 * Wed Jul 30 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.4-1
 - Update to 0.7.4.
 



From pkgdb at fedoraproject.org  Tue Sep  9 15:36:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:36:26 +0000
Subject: [pkgdb] kdepimlibs: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153626.79699208D9F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdepimlibs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Tue Sep  9 15:36:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:36:30 +0000
Subject: [pkgdb] kdepimlibs: tuxbrewr has requested watchcommits
Message-ID: <20080909153630.7A194208DBE@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdepimlibs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Tue Sep  9 15:36:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:36:36 +0000
Subject: [pkgdb] kdepimlibs: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153636.44CBB208DA6@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdepimlibs (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Tue Sep  9 15:36:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:36:38 +0000
Subject: [pkgdb] kdegraphics-extras had acl change status
Message-ID: <20080909153638.433F5208DC0@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdegraphics-extras (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics-extras



From pkgdb at fedoraproject.org  Tue Sep  9 15:36:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:36:39 +0000
Subject: [pkgdb] kdepimlibs: tuxbrewr has requested watchcommits
Message-ID: <20080909153639.7274D208DC7@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdepimlibs (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Tue Sep  9 15:36:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:36:39 +0000
Subject: [pkgdb] kdegraphics-extras had acl change status
Message-ID: <20080909153639.848B1208DC2@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdegraphics-extras (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics-extras



From pkgdb at fedoraproject.org  Tue Sep  9 15:36:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:36:40 +0000
Subject: [pkgdb] kdegraphics-extras had acl change status
Message-ID: <20080909153640.83BEF208DCA@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdegraphics-extras (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics-extras



From pkgdb at fedoraproject.org  Tue Sep  9 15:36:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:36:45 +0000
Subject: [pkgdb] kdegraphics-extras had acl change status
Message-ID: <20080909153645.F2F04208DCD@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdegraphics-extras (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics-extras



From pkgdb at fedoraproject.org  Tue Sep  9 15:37:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:37:20 +0000
Subject: [pkgdb] kde-i18n had acl change status
Message-ID: <20080909153720.A1CE8208DAC@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kde-i18n (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Tue Sep  9 15:37:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:37:21 +0000
Subject: [pkgdb] kde-i18n had acl change status
Message-ID: <20080909153721.303C9208DB5@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kde-i18n (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Tue Sep  9 15:37:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:37:22 +0000
Subject: [pkgdb] kde-i18n had group_acl changed
Message-ID: <20080909153722.DFFFA208DB7@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kde-i18n (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Tue Sep  9 15:37:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:37:25 +0000
Subject: [pkgdb] kde-i18n had group_acl changed
Message-ID: <20080909153726.0DA8B208DD5@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kde-i18n (Fedora 7) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Tue Sep  9 15:37:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:37:28 +0000
Subject: [pkgdb] kde-i18n had group_acl changed
Message-ID: <20080909153728.A3CD5208770@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kde-i18n (Fedora 8) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Tue Sep  9 15:37:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:37:30 +0000
Subject: [pkgdb] kde-i18n had acl change status
Message-ID: <20080909153731.0F9DD208DD9@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kde-i18n (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Tue Sep  9 15:37:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:37:31 +0000
Subject: [pkgdb] kde-i18n had acl change status
Message-ID: <20080909153731.19B02208DDE@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kde-i18n (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Tue Sep  9 15:37:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:37:32 +0000
Subject: [pkgdb] kde-i18n had group_acl changed
Message-ID: <20080909153732.9B0CB208DE0@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kde-i18n (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Tue Sep  9 15:37:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:37:43 +0000
Subject: [pkgdb] kdeplasmoids: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153743.B4233208D98@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdeplasmoids (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasmoids



From pkgdb at fedoraproject.org  Tue Sep  9 15:37:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:37:45 +0000
Subject: [pkgdb] kdeplasmoids: tuxbrewr has requested watchcommits
Message-ID: <20080909153745.7E8D62D0027@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdeplasmoids (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasmoids



From pkgdb at fedoraproject.org  Tue Sep  9 15:37:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:37:53 +0000
Subject: [pkgdb] kdeplasmoids: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153753.AFD90208DA1@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdeplasmoids (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasmoids



From pkgdb at fedoraproject.org  Tue Sep  9 15:37:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:37:59 +0000
Subject: [pkgdb] kdeplasmoids: tuxbrewr has requested watchcommits
Message-ID: <20080909153759.32895208DE2@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdeplasmoids (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasmoids



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:17 +0000
Subject: [pkgdb] kde-l10n had acl change status
Message-ID: <20080909153817.AE137208DBE@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kde-l10n (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From lennart at fedoraproject.org  Tue Sep  9 15:38:15 2008
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue,  9 Sep 2008 15:38:15 +0000 (UTC)
Subject: rpms/sound-theme-freedesktop/devel sound-theme-freedesktop.spec, 1.2,
	1.3
Message-ID: <20080909153815.2119E7012A@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-serv3075

Modified Files:
	sound-theme-freedesktop.spec 
Log Message:
Touch root dirs, not just theme dirs


Index: sound-theme-freedesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-theme-freedesktop/devel/sound-theme-freedesktop.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sound-theme-freedesktop.spec	11 Aug 2008 16:35:51 -0000	1.2
+++ sound-theme-freedesktop.spec	9 Sep 2008 15:37:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name: sound-theme-freedesktop
 Version: 0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: freedesktop.org sound theme
 Group: User Interface/Desktops
 Source0: http://0pointer.de/public/sound-theme-freedesktop.tar.gz
@@ -30,10 +30,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/bin/touch --no-create %{_datadir}/sounds/freedesktop
+/bin/touch --no-create %{_datadir}/sounds/freedesktop %{_datadir}/sounds
 
 %postun
-/bin/touch --no-create %{_datadir}/sounds/freedesktop
+/bin/touch --no-create %{_datadir}/sounds/freedesktop %{_datadir}/sounds
 
 %files
 %defattr(-,root,root)
@@ -44,6 +44,9 @@
 %{_datadir}/sounds/freedesktop/stereo/*.ogg
 
 %changelog
+* Tue Sep 9 2008 Lennart Poettering <lpoetter at redhat.com 0.1.3
+- Touch root dirs, not just theme dirs
+
 * Mon Aug 11 2008 Jeremy Katz <katzj at redhat.com> - 0.1-2
 - require touch for scriptlets to not give errors
 



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:19 +0000
Subject: [pkgdb] kde-l10n had acl change status
Message-ID: <20080909153819.6313E208DE4@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kde-l10n (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:19 +0000
Subject: [pkgdb] kde-l10n had group_acl changed
Message-ID: <20080909153819.CB7512D0031@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kde-l10n (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:22 +0000
Subject: [pkgdb] kde-l10n had acl change status
Message-ID: <20080909153823.05ED0208DC5@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kde-l10n (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:24 +0000
Subject: [pkgdb] kde-l10n had acl change status
Message-ID: <20080909153824.3EBBA2D0039@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kde-l10n (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:24 +0000
Subject: [pkgdb] kde-l10n had group_acl changed
Message-ID: <20080909153824.D457D2D0040@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kde-l10n (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:31 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20080909153831.7213E208DC7@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdelibs (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:33 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20080909153833.CA7E82D0043@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdelibs (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:33 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20080909153833.E07F52D0049@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdelibs (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:41 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20080909153841.59F39208DCB@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdelibs (Fedora 8) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:45 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20080909153845.EA88D2D004D@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdelibs (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:44 +0000
Subject: [pkgdb] kdesdk: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153844.E8F4A2D0046@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdesdk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:46 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20080909153846.A34F0208DEA@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdelibs (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:46 +0000
Subject: [pkgdb] kdesdk: tuxbrewr has requested watchcommits
Message-ID: <20080909153847.013CA2D0051@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdesdk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:47 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20080909153847.91BDC2D0055@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdelibs (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:52 +0000
Subject: [pkgdb] kdelibs3 had acl change status
Message-ID: <20080909153852.AC4C02D0059@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdelibs3 (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs3



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:53 +0000
Subject: [pkgdb] kdelibs3 had acl change status
Message-ID: <20080909153853.E15E22D005D@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdelibs3 (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs3



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:54 +0000
Subject: [pkgdb] kdelibs3 had acl change status
Message-ID: <20080909153855.3968F2D0061@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdelibs3 (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs3



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:55 +0000
Subject: [pkgdb] kdesdk: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153855.98C402D0066@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdesdk (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:57 +0000
Subject: [pkgdb] kdelibs3 had acl change status
Message-ID: <20080909153857.7D9E52D0070@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdelibs3 (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs3



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:57 +0000
Subject: [pkgdb] kdesdk: tuxbrewr has requested watchcommits
Message-ID: <20080909153857.BE9952D006C@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdesdk (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:59 +0000
Subject: [pkgdb] kdelibs3 had acl change status
Message-ID: <20080909153859.242F12D006E@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdelibs3 (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs3



From pkgdb at fedoraproject.org  Tue Sep  9 15:38:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:38:59 +0000
Subject: [pkgdb] kdelibs3 had acl change status
Message-ID: <20080909153900.0B7762D0074@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdelibs3 (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs3



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:03 +0000
Subject: [pkgdb] kdelibs4 had acl change status
Message-ID: <20080909153903.A5A72208D9E@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdelibs4 (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs4



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:06 +0000
Subject: [pkgdb] kdelibs4 had acl change status
Message-ID: <20080909153906.E076C208DA8@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdelibs4 (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs4



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:07 +0000
Subject: [pkgdb] kdelibs4 had acl change status
Message-ID: <20080909153907.526E02D0077@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdelibs4 (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs4



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:10 +0000
Subject: [pkgdb] kdelibs4 had acl change status
Message-ID: <20080909153910.551642D007D@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdelibs4 (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs4



From cscott at fedoraproject.org  Tue Sep  9 15:39:13 2008
From: cscott at fedoraproject.org (C. Scott Ananian)
Date: Tue,  9 Sep 2008 15:39:13 +0000 (UTC)
Subject: rpms/olpc-logos/F-9 olpc-logos.spec,1.1,1.2
Message-ID: <20080909153913.315877012A@cvs1.fedora.phx.redhat.com>

Author: cscott

Update of /cvs/pkgs/rpms/olpc-logos/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3215

Modified Files:
	olpc-logos.spec 
Log Message:
We no longer need olpc-logos to Provide redhat-logos, system-logos, etc.



Index: olpc-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-logos/F-9/olpc-logos.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- olpc-logos.spec	11 Sep 2007 22:39:53 -0000	1.1
+++ olpc-logos.spec	9 Sep 2008 15:38:42 -0000	1.2
@@ -14,15 +14,16 @@
 Name: olpc-logos
 Summary: OLPC-related icons and pictures
 Version: 0.1 
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: System Environment/Base
 Source0: olpc-logos-%{version}.tar.bz2
 License: Copyright 2006 Red Hat, Inc.  All rights reserved.
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
-Obsoletes: redhat-logos < 1.2.0
-Provides: redhat-logos = 1.2.0
-Provides: system-logos = %{version}-%{release}
+## As of F9/OLPC 8.2 we no longer need this package to provide system-logos
+#Obsoletes: redhat-logos < 1.2.0
+#Provides: redhat-logos = 1.2.0
+#Provides: system-logos = %{version}-%{release}
 
 %description
 The olpc-logos package (the "Packages") contain image files which
@@ -53,6 +54,8 @@
 
 
 %changelog
+* Tue Sep 09 2008 C. Scott Ananian <cscott at laptop.org> - 0.1-6
+- Drop the Provides lines; they are no longer needed.
 
 * Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 0.1-5
 - Drop a few redundant BR and conflicts



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:11 +0000
Subject: [pkgdb] kdelibs4 had acl change status
Message-ID: <20080909153911.9CFE2208DAD@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdelibs4 (Fedora 8) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs4



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:14 +0000
Subject: [pkgdb] kdelibs4 had acl change status
Message-ID: <20080909153914.53B722D0085@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdelibs4 (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs4



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:16 +0000
Subject: [pkgdb] kdelibs4 had acl change status
Message-ID: <20080909153916.449D52D0089@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdelibs4 (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs4



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:17 +0000
Subject: [pkgdb] kdelibs4 had acl change status
Message-ID: <20080909153917.7806F2D008F@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdelibs4 (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs4



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:24 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20080909153924.B8169208DB5@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdemultimedia (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:25 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20080909153925.9C34F2D0095@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdemultimedia (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:25 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20080909153925.C56EA2D009A@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdemultimedia (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:28 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20080909153928.364082D009E@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdemultimedia (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:29 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20080909153929.DD1802D00A2@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdemultimedia (Fedora 8) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:33 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20080909153933.259782D00A6@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdemultimedia (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:33 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20080909153933.F366A2D00A7@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdemultimedia (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:35 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20080909153935.46BDC2D00AA@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdemultimedia (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:38 +0000
Subject: [pkgdb] kde-settings: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153938.966132D00AF@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kde-settings (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:40 +0000
Subject: [pkgdb] kde-settings: tuxbrewr has requested watchcommits
Message-ID: <20080909153940.9006A208DF9@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kde-settings (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:40 +0000
Subject: [pkgdb] kdemultimedia had group_acl changed
Message-ID: <20080909153941.18B69208DFD@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdemultimedia (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:41 +0000
Subject: [pkgdb] kdemultimedia had group_acl changed
Message-ID: <20080909153941.6D2CC208DFE@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdemultimedia (Fedora 8) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:44 +0000
Subject: [pkgdb] kdemultimedia had group_acl changed
Message-ID: <20080909153944.EE759208E02@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdemultimedia (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:45 +0000
Subject: [pkgdb] kdemultimedia had group_acl changed
Message-ID: <20080909153945.85B51208E06@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdemultimedia (Fedora 7) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:50 +0000
Subject: [pkgdb] kde-settings: tuxbrewr has requested watchbugzilla
Message-ID: <20080909153950.294F52D00B4@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kde-settings (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From pkgdb at fedoraproject.org  Tue Sep  9 15:39:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:39:52 +0000
Subject: [pkgdb] kde-settings: tuxbrewr has requested watchcommits
Message-ID: <20080909153952.D8FB1208E09@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kde-settings (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:02 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20080909154002.8C745208E0C@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdenetwork (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:04 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20080909154004.DF53C208DBA@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdenetwork (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:06 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20080909154006.6EFEC208E10@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdenetwork (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:06 +0000
Subject: [pkgdb] kdenetwork had group_acl changed
Message-ID: <20080909154006.82A14208E14@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdenetwork (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:08 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20080909154008.D6970208E18@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdenetwork (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:09 +0000
Subject: [pkgdb] kdenetwork had group_acl changed
Message-ID: <20080909154009.87506208E1C@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdenetwork (Fedora 7) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:12 +0000
Subject: [pkgdb] kdenetwork had group_acl changed
Message-ID: <20080909154012.CDB62208DDA@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdenetwork (Fedora 8) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:12 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20080909154013.15E1D208E1E@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdenetwork (Fedora 8) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:15 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20080909154015.D47DC208E23@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdenetwork (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:15 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20080909154015.DC77E208E26@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdenetwork (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:17 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20080909154017.477BD208E2B@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdenetwork (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:18 +0000
Subject: [pkgdb] kdenetwork had group_acl changed
Message-ID: <20080909154018.BEDD2208E2F@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdenetwork (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From mtasaka at fedoraproject.org  Tue Sep  9 15:40:30 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  9 Sep 2008 15:40:30 +0000 (UTC)
Subject: rpms/jd/devel jd.spec,1.336,1.337
Message-ID: <20080909154030.EF9497012A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3503

Modified Files:
	jd.spec 
Log Message:
Try 1


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- jd.spec	9 Sep 2008 04:05:01 -0000	1.336
+++ jd.spec	9 Sep 2008 15:40:00 -0000	1.337
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.1
-%define         strtag        svn2322_trunk
-%define         repoid        32731
+%define         strtag        rc080909
+%define         repoid        32826
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -135,6 +135,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Wed Sep 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.rc080909
+- 2.0.1 rc 080909
+
 * Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 2322
 - Set xdg-open as default browser now by configure option



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:32 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20080909154032.D8FC4208DE0@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdesdk (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:34 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20080909154034.637E1208E3B@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdesdk (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:34 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20080909154034.A2856208E40@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdesdk (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:35 +0000
Subject: [pkgdb] kdesdk had group_acl changed
Message-ID: <20080909154035.99D07208E44@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdesdk (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:37 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20080909154037.D3DEA208D1E@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdesdk (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:38 +0000
Subject: [pkgdb] kdesdk had group_acl changed
Message-ID: <20080909154038.1468F208E49@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdesdk (Fedora 7) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:40 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20080909154040.4F623208E4E@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdesdk (Fedora 8) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:41 +0000
Subject: [pkgdb] kdesdk had group_acl changed
Message-ID: <20080909154041.A085D208E53@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdesdk (Fedora 8) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:44 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20080909154044.8F097208E56@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdesdk (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:44 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20080909154045.04AB8208E58@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdesdk (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:45 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20080909154046.093D8208E5F@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdesdk (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Tue Sep  9 15:40:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:40:49 +0000
Subject: [pkgdb] kdesdk had group_acl changed
Message-ID: <20080909154049.992B2208E62@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdesdk (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Tue Sep  9 15:41:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:41:03 +0000
Subject: [pkgdb] kdewebdev had acl change status
Message-ID: <20080909154103.4C1E8208DBB@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdewebdev (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdewebdev



From pkgdb at fedoraproject.org  Tue Sep  9 15:41:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:41:05 +0000
Subject: [pkgdb] kdewebdev had group_acl changed
Message-ID: <20080909154105.7BECB208DBD@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdewebdev (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdewebdev



From pkgdb at fedoraproject.org  Tue Sep  9 15:41:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:41:06 +0000
Subject: [pkgdb] kdewebdev had acl change status
Message-ID: <20080909154106.C8BCC208E67@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdewebdev (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdewebdev



From pkgdb at fedoraproject.org  Tue Sep  9 15:41:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:41:07 +0000
Subject: [pkgdb] kdewebdev had group_acl changed
Message-ID: <20080909154107.B2374208E6A@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdewebdev (Fedora 7) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdewebdev



From pkgdb at fedoraproject.org  Tue Sep  9 15:41:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:41:08 +0000
Subject: [pkgdb] kdetoys: tuxbrewr has requested watchbugzilla
Message-ID: <20080909154108.63FD8208E6F@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdetoys (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:41:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:41:11 +0000
Subject: [pkgdb] kdewebdev had acl change status
Message-ID: <20080909154111.40885208E71@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdewebdev (Fedora 8) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdewebdev



From pkgdb at fedoraproject.org  Tue Sep  9 15:41:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:41:11 +0000
Subject: [pkgdb] kdetoys: tuxbrewr has requested watchcommits
Message-ID: <20080909154111.693C02D0024@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdetoys (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:41:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:41:11 +0000
Subject: [pkgdb] kdewebdev had group_acl changed
Message-ID: <20080909154111.CA0BB2D0027@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdewebdev (Fedora 8) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdewebdev



From pkgdb at fedoraproject.org  Tue Sep  9 15:41:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:41:12 +0000
Subject: [pkgdb] kdewebdev had acl change status
Message-ID: <20080909154112.742742D00B8@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdewebdev (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdewebdev



From pkgdb at fedoraproject.org  Tue Sep  9 15:41:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:41:16 +0000
Subject: [pkgdb] kdetoys: tuxbrewr has requested watchbugzilla
Message-ID: <20080909154116.7D55C208DA5@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdetoys (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:41:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:41:18 +0000
Subject: [pkgdb] kdetoys: tuxbrewr has requested watchcommits
Message-ID: <20080909154118.329B52D00BA@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdetoys (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:41:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:41:28 +0000
Subject: [pkgdb] kdevelop had acl change status
Message-ID: <20080909154128.83FB9208E75@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdevelop (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep  9 15:41:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:41:29 +0000
Subject: [pkgdb] kdevelop had group_acl changed
Message-ID: <20080909154129.5D5482D00BD@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdevelop (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep  9 15:41:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:41:32 +0000
Subject: [pkgdb] kdevelop had acl change status
Message-ID: <20080909154132.9D3232D00C0@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdevelop (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep  9 15:41:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:41:34 +0000
Subject: [pkgdb] kdevelop had acl change status
Message-ID: <20080909154134.32F312D00C4@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdevelop (Fedora 8) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep  9 15:41:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:41:35 +0000
Subject: [pkgdb] kdevelop had group_acl changed
Message-ID: <20080909154135.D22A92D00C8@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdevelop (Fedora 7) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep  9 15:41:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:41:38 +0000
Subject: [pkgdb] kdevelop had group_acl changed
Message-ID: <20080909154138.97A6B2D00CB@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdevelop (Fedora 8) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep  9 15:41:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:41:38 +0000
Subject: [pkgdb] kdevelop had acl change status
Message-ID: <20080909154138.A47E02D00CF@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdevelop (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep  9 15:41:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:41:39 +0000
Subject: [pkgdb] kdevelop had group_acl changed
Message-ID: <20080909154139.5ADF32D00D2@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdevelop (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:00 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154200.ED6B8208DC5@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdetoys (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:03 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154203.CFCCF2D002F@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdetoys (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:04 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154204.3E9802D0033@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdetoys (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:04 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154204.EE30D2D00D5@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdetoys (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:09 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154209.CC6052D00D7@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdetoys (Fedora EPEL 5) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:13 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154213.B71762D003B@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdetoys (Fedora EPEL 5) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From walters at fedoraproject.org  Tue Sep  9 15:42:14 2008
From: walters at fedoraproject.org (Colin Walters)
Date: Tue,  9 Sep 2008 15:42:14 +0000 (UTC)
Subject: rpms/jna/devel .cvsignore, 1.3, 1.4 jna.spec, 1.6, 1.7 sources, 1.3,
	1.4 jna-3.0.4-callbacks-methodname.patch, 1.1,
	NONE jna-3.0.4-callbacks-typemappers.patch, 1.1,
	NONE jna-3.0.4-nomixedjar.patch, 1.1,
	NONE jna-3.0.4-structure-handle-null.patch, 1.1,
	NONE jna-3.0.4-structure-reason.patch, 1.1, NONE
Message-ID: <20080909154214.EFF3E7012A@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/jna/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3911

Modified Files:
	.cvsignore jna.spec sources 
Removed Files:
	jna-3.0.4-callbacks-methodname.patch 
	jna-3.0.4-callbacks-typemappers.patch 
	jna-3.0.4-nomixedjar.patch 
	jna-3.0.4-structure-handle-null.patch 
	jna-3.0.4-structure-reason.patch 
Log Message:
* Tue Sep 09 2008 Colin Walters <walters at redhat.com> - 3.0.4-4.svn700
- Update to upstream SVN r700; drop all now upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jna/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Jul 2008 18:33:15 -0000	1.3
+++ .cvsignore	9 Sep 2008 15:41:44 -0000	1.4
@@ -1 +0,0 @@
-jna-3.0.4.svn630.tar.bz2


Index: jna.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jna/devel/jna.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jna.spec	6 Sep 2008 22:13:22 -0000	1.6
+++ jna.spec	9 Sep 2008 15:41:44 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           jna
 Version:        3.0.4
-Release:        3.svn630%{?dist}
+Release:        4.svn700%{?dist}
 Summary:        Pure Java access to native libraries
 
 Group:          Development/Libraries
@@ -10,20 +10,10 @@
 # following commands to generate the tarball:
 #   svn export https://jna.dev.java.net/svn/jna/tags/%{version}/jnalib/ --username guest jna-%{version}
 #   tar -cjf jna-%{version}.tar.bz2 jna-%{version}
-Source0:        %{name}-%{version}.svn630.tar.bz2
+Source0:        %{name}-%{version}.svn700.tar.bz2
 # This patch is Fedora-specific for now until we get the huge
 # JNI library location mess sorted upstream
 Patch1:         jna-3.0.2-loadlibrary.patch
-# Will send upstream...
-Patch2:         jna-3.0.4-nomixedjar.patch
-# https://jna.dev.java.net/issues/show_bug.cgi?id=84
-Patch3:         jna-3.0.4-callbacks-typemappers.patch
-# https://jna.dev.java.net/issues/show_bug.cgi?id=85
-Patch4:         jna-3.0.4-callbacks-methodname.patch
-# https://jna.dev.java.net/issues/show_bug.cgi?id=86
-Patch5:         jna-3.0.4-structure-reason.patch 
-# https://jna.dev.java.net/issues/show_bug.cgi?id=87
-Patch6:         jna-3.0.4-structure-handle-null.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  java-devel >= 1.6 ant jpackage-utils ant-nodeps
@@ -52,13 +42,8 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-svn630
+%setup -q -n %{name}-%{version}-svn700
 sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH1} | patch -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 # all java binaries must be removed from the sources
 find . -name '*.jar' -exec rm -f '{}' \;
@@ -115,6 +100,9 @@
 
 
 %changelog
+* Tue Sep 09 2008 Colin Walters <walters at redhat.com> - 3.0.4-4.svn700
+- Update to upstream SVN r700; drop all now upstreamed patches
+
 * Sat Sep 06 2008 Colin Walters <walters at redhat.com> - 3.0.4-3.svn630
 - A few more patches for JGIR
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jna/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Jul 2008 18:33:15 -0000	1.3
+++ sources	9 Sep 2008 15:41:44 -0000	1.4
@@ -1 +0,0 @@
-2a90fbade80d2a86d5cc967c5529cd34  jna-3.0.4.svn630.tar.bz2


--- jna-3.0.4-callbacks-methodname.patch DELETED ---


--- jna-3.0.4-callbacks-typemappers.patch DELETED ---


--- jna-3.0.4-nomixedjar.patch DELETED ---


--- jna-3.0.4-structure-handle-null.patch DELETED ---


--- jna-3.0.4-structure-reason.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:16 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154216.216B02D00DB@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdetoys (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:17 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154217.F392E2D00DF@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdetoys (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:19 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154219.AEBFE2D00E3@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdetoys (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From mtasaka at fedoraproject.org  Tue Sep  9 15:42:20 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  9 Sep 2008 15:42:20 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore,1.290,1.291 sources,1.291,1.292
Message-ID: <20080909154220.C4C507012A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3945

Modified Files:
	.cvsignore sources 
Log Message:
try what happens if updating source is forgotton...


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- .cvsignore	9 Sep 2008 04:05:01 -0000	1.290
+++ .cvsignore	9 Sep 2008 15:41:50 -0000	1.291
@@ -1 +1 @@
-jd-2.0.1-svn2322_trunk.tgz
+jd-2.0.1-rc080909.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- sources	9 Sep 2008 04:05:01 -0000	1.291
+++ sources	9 Sep 2008 15:41:50 -0000	1.292
@@ -1 +1 @@
-316d05b99267323262f2dac66e5e4b08  jd-2.0.1-svn2322_trunk.tgz
+648920936589ccf910a44d479052ae9b  jd-2.0.1-rc080909.tgz



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:20 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154220.C5D662D00E8@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdetoys (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:26 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154226.C81962D003C@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdetoys (Fedora 6) to Approved for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:28 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154228.EE9B92D003F@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdetoys (Fedora 6) to Approved for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:30 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154230.630552D00EC@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdetoys (Fedora 6) to Approved for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:32 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154232.C943B2D00F0@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdetoys (Fedora 8) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:34 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154234.B5EE0208DC6@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdetoys (Fedora 8) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:35 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154235.7AD262D00F5@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdetoys (Fedora 8) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:35 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154235.5C5E72D00F2@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdetoys (Fedora 8) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:38 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154238.F36C02D00F8@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdetoys (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:40 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154241.02CFD2D00FA@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdetoys (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:41 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154241.742262D00FF@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdetoys (Fedora 9) to Obsolete for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:43 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154243.5BA7E2D0103@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdetoys (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:45 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154245.F1C4E2D0101@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdetoys (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:45 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154245.DD020208DC7@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdetoys (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:42:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:42:46 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20080909154247.0424F2D0106@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdetoys (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Tue Sep  9 15:43:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:43:05 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20080909154305.234FF2D010D@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdeutils (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Tue Sep  9 15:43:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:43:05 +0000
Subject: [pkgdb] kdeutils had group_acl changed
Message-ID: <20080909154305.E7E5B2D0111@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeutils (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Tue Sep  9 15:43:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:43:08 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20080909154308.578DD208E73@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdeutils (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Tue Sep  9 15:43:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:43:11 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20080909154311.4FA292D011A@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdeutils (Fedora 8) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Tue Sep  9 15:43:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:43:09 +0000
Subject: [pkgdb] kdeutils had group_acl changed
Message-ID: <20080909154309.75FD62D0116@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeutils (Fedora 7) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Tue Sep  9 15:43:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:43:11 +0000
Subject: [pkgdb] kdeutils had group_acl changed
Message-ID: <20080909154311.D24382D011D@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeutils (Fedora 8) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Tue Sep  9 15:43:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:43:13 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20080909154314.2A0FD2D0121@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdeutils (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Tue Sep  9 15:43:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:43:16 +0000
Subject: [pkgdb] kdeutils had group_acl changed
Message-ID: <20080909154316.60C262D0123@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeutils (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From mtasaka at fedoraproject.org  Tue Sep  9 15:45:49 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  9 Sep 2008 15:45:49 +0000 (UTC)
Subject: rpms/jd/devel jd.spec,1.337,1.338
Message-ID: <20080909154549.64DB87012A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4674

Modified Files:
	jd.spec 
Log Message:
another try


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- jd.spec	9 Sep 2008 15:40:00 -0000	1.337
+++ jd.spec	9 Sep 2008 15:45:19 -0000	1.338
@@ -135,7 +135,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Sep 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.2.rc080909
+* Wed Sep 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.3.rc080909
 - 2.0.1 rc 080909
 
 * Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>



From glommer at fedoraproject.org  Tue Sep  9 15:46:56 2008
From: glommer at fedoraproject.org (Glauber Costa)
Date: Tue,  9 Sep 2008 15:46:56 +0000 (UTC)
Subject: rpms/kvm/devel kvm-74-pxe-boot.patch,NONE,1.1 kvm.spec,1.69,1.70
Message-ID: <20080909154656.A9FDB7012A@cvs1.fedora.phx.redhat.com>

Author: glommer

Update of /cvs/pkgs/rpms/kvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4833

Modified Files:
	kvm.spec 
Added Files:
	kvm-74-pxe-boot.patch 
Log Message:
fix pxe booting, apply upstream patch



kvm-74-pxe-boot.patch:

--- NEW FILE kvm-74-pxe-boot.patch ---
commit c0a04f0e130fa98da8b89e74debd379c2f08d120
Author: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
Date:   Tue Sep 9 14:49:02 2008 +0000

    Fix up pxe boot (Glauber Costa)
    
    As discussed in
    http://lists.gnu.org/archive/html/qemu-devel/2008-08/msg00667.html,
    current pxe boot is broken for some use cases. The problem
    goes away if we reduce the number of allowed bits in the address space
    to 32 (which has the side effect of reducing guest max mem size to 4Gb).
    
    After digging for a while, it turns out that it happens because pxelinux
    tries to access address 0x10009e9a6, which does not fit a 32-bit address.
    A closer look, however, reveals this access is totally valid: It's just
    0x9e9a6 with an add carry.
    
    To avoid this, this patch casts the address passed to the POPL macro to
    a 32-bit value. This is also done, although just theorectically, for
    PUSHL too.
    
    Signed-off-by: Glauber Costa <glommer at redhat.com>
    Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
    Reported-by: Chris Lalancette <clalance at redhat.com>
    CC: Eduardo Habkost <ehabkost at redhat.com>
    
    
    
    git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk at 5182 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c
index 32cdf2a..23f3080 100644
--- a/qemu/target-i386/op_helper.c
+++ b/qemu/target-i386/op_helper.c
@@ -590,6 +590,10 @@ do {\
 #define SET_ESP(val, sp_mask) ESP = (ESP & ~(sp_mask)) | ((val) & (sp_mask))
 #endif
 
+/* in 64-bit machines, this can overflow. So this segment addition macro
+ * can be used to trim the value to 32-bit whenever needed */
+#define SEG_ADDL(ssp, sp, sp_mask) ((uint32_t)((ssp) + (sp & (sp_mask))))
+
 /* XXX: add a is_user flag to have proper security support */
 #define PUSHW(ssp, sp, sp_mask, val)\
 {\
@@ -600,7 +604,7 @@ do {\
 #define PUSHL(ssp, sp, sp_mask, val)\
 {\
     sp -= 4;\
-    stl_kernel((ssp) + (sp & (sp_mask)), (val));\
+    stl_kernel(SEG_ADDL(ssp, sp, sp_mask), (uint32_t)(val));\
 }
 
 #define POPW(ssp, sp, sp_mask, val)\
@@ -611,7 +615,7 @@ do {\
 
 #define POPL(ssp, sp, sp_mask, val)\
 {\
-    val = (uint32_t)ldl_kernel((ssp) + (sp & (sp_mask)));\
+    val = (uint32_t)ldl_kernel(SEG_ADDL(ssp, sp, sp_mask));\
     sp += 4;\
 }
 


Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- kvm.spec	28 Aug 2008 12:44:56 -0000	1.69
+++ kvm.spec	9 Sep 2008 15:46:26 -0000	1.70
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 74
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://%{name}.sf.net
@@ -10,6 +10,7 @@
 Source1: %{name}.modules
 Patch0: %{name}-bootmenu.patch
 Patch1: %{name}-62-block-rw-range-check.patch
+Patch2: %{name}-74-pxe-boot.patch
 # patches from upstream qemu
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel
@@ -38,6 +39,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 
@@ -108,6 +110,9 @@
 %{_sysconfdir}/sysconfig/modules/%{name}.modules
 
 %changelog
+* Tue Sep 09 2008 Glauber Costa <glommer at redhat.com> - 74-3
+- fix pxe booting. Needed for oVirt
+
 * Thu Aug 28 2008 Glauber Costa <glommer at redhat.com> - 74-2
 - just a tag increase, because CVS is so awesome...
 



From walters at fedoraproject.org  Tue Sep  9 15:51:37 2008
From: walters at fedoraproject.org (Colin Walters)
Date: Tue,  9 Sep 2008 15:51:37 +0000 (UTC)
Subject: rpms/jna/devel .cvsignore,1.4,1.5 jna.spec,1.7,1.8 sources,1.4,1.5
Message-ID: <20080909155137.199BD7012A@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/jna/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6924

Modified Files:
	.cvsignore jna.spec sources 
Log Message:
increment integer


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jna/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2008 15:41:44 -0000	1.4
+++ .cvsignore	9 Sep 2008 15:51:06 -0000	1.5
@@ -0,0 +1 @@
+jna-3.0.4.svn700.tar.bz2


Index: jna.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jna/devel/jna.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jna.spec	9 Sep 2008 15:41:44 -0000	1.7
+++ jna.spec	9 Sep 2008 15:51:06 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           jna
 Version:        3.0.4
-Release:        4.svn700%{?dist}
+Release:        5.svn700%{?dist}
 Summary:        Pure Java access to native libraries
 
 Group:          Development/Libraries
@@ -100,7 +100,7 @@
 
 
 %changelog
-* Tue Sep 09 2008 Colin Walters <walters at redhat.com> - 3.0.4-4.svn700
+* Tue Sep 09 2008 Colin Walters <walters at redhat.com> - 3.0.4-5.svn700
 - Update to upstream SVN r700; drop all now upstreamed patches
 
 * Sat Sep 06 2008 Colin Walters <walters at redhat.com> - 3.0.4-3.svn630


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jna/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2008 15:41:44 -0000	1.4
+++ sources	9 Sep 2008 15:51:06 -0000	1.5
@@ -0,0 +1 @@
+222d590becf64b4913a0f61967d2c0f4  jna-3.0.4.svn700.tar.bz2



From mtasaka at fedoraproject.org  Tue Sep  9 15:55:23 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  9 Sep 2008 15:55:23 +0000 (UTC)
Subject: rpms/jd/F-8 .cvsignore, 1.283, 1.284 jd.spec, 1.317, 1.318 sources, 
	1.284, 1.285
Message-ID: <20080909155523.5D2027012A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8375/F-8

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Sep 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.3.rc080909
- 2.0.1 rc 080909



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- .cvsignore	9 Sep 2008 04:05:00 -0000	1.283
+++ .cvsignore	9 Sep 2008 15:54:52 -0000	1.284
@@ -1 +1 @@
-jd-2.0.1-svn2322_trunk.tgz
+jd-2.0.1-rc080909.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- jd.spec	9 Sep 2008 04:05:00 -0000	1.317
+++ jd.spec	9 Sep 2008 15:54:52 -0000	1.318
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.1
-%define         strtag        svn2322_trunk
-%define         repoid        32731
+%define         strtag        rc080909
+%define         repoid        32826
 # 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
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -135,6 +135,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Wed Sep 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.3.rc080909
+- 2.0.1 rc 080909
+
 * Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 2322
 - Set xdg-open as default browser now by configure option


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/sources,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- sources	9 Sep 2008 04:05:00 -0000	1.284
+++ sources	9 Sep 2008 15:54:53 -0000	1.285
@@ -1 +1 @@
-316d05b99267323262f2dac66e5e4b08  jd-2.0.1-svn2322_trunk.tgz
+648920936589ccf910a44d479052ae9b  jd-2.0.1-rc080909.tgz



From mtasaka at fedoraproject.org  Tue Sep  9 15:55:23 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  9 Sep 2008 15:55:23 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.290, 1.291 jd.spec, 1.328, 1.329 sources, 
	1.291, 1.292
Message-ID: <20080909155523.A8D447012A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8375/F-9

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Sep 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.3.rc080909
- 2.0.1 rc 080909



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- .cvsignore	9 Sep 2008 04:05:01 -0000	1.290
+++ .cvsignore	9 Sep 2008 15:54:53 -0000	1.291
@@ -1 +1 @@
-jd-2.0.1-svn2322_trunk.tgz
+jd-2.0.1-rc080909.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- jd.spec	9 Sep 2008 04:05:01 -0000	1.328
+++ jd.spec	9 Sep 2008 15:54:53 -0000	1.329
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.1
-%define         strtag        svn2322_trunk
-%define         repoid        32731
+%define         strtag        rc080909
+%define         repoid        32826
 # 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
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -135,6 +135,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Wed Sep 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.3.rc080909
+- 2.0.1 rc 080909
+
 * Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 2322
 - Set xdg-open as default browser now by configure option


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- sources	9 Sep 2008 04:05:01 -0000	1.291
+++ sources	9 Sep 2008 15:54:53 -0000	1.292
@@ -1 +1 @@
-316d05b99267323262f2dac66e5e4b08  jd-2.0.1-svn2322_trunk.tgz
+648920936589ccf910a44d479052ae9b  jd-2.0.1-rc080909.tgz



From mtasaka at fedoraproject.org  Tue Sep  9 15:55:23 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  9 Sep 2008 15:55:23 +0000 (UTC)
Subject: rpms/jd/devel jd.spec,1.338,1.339
Message-ID: <20080909155523.D32AE7012A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8375/devel

Modified Files:
	jd.spec 
Log Message:
* Wed Sep 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.3.rc080909
- 2.0.1 rc 080909



Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- jd.spec	9 Sep 2008 15:45:19 -0000	1.338
+++ jd.spec	9 Sep 2008 15:54:53 -0000	1.339
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    3
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora



From dwalsh at fedoraproject.org  Tue Sep  9 15:54:48 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  9 Sep 2008 15:54:48 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.9,
	1.10 setroubleshoot-plugins.spec, 1.11, 1.12 sources, 1.10, 1.11
Message-ID: <20080909155448.8047C7012A@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8162

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Tue Sep 9 2008  <dwalsh at redhat.com> - 2.0.7-1
- Add catchall_booleans plugin, fix spelling



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	31 Jan 2008 21:58:45 -0000	1.9
+++ .cvsignore	9 Sep 2008 15:54:18 -0000	1.10
@@ -1 +1,2 @@
 setroubleshoot-plugins-2.0.4.tar.gz
+setroubleshoot-plugins-2.0.7.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- setroubleshoot-plugins.spec	4 Apr 2008 14:11:16 -0000	1.11
+++ setroubleshoot-plugins.spec	9 Sep 2008 15:54:18 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
 Version: 2.0.4
-Release: 5%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -52,6 +52,9 @@
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Tue Sep 9 2008  <dwalsh at redhat.com> - 2.0.7-1
+- Add catchall_booleans plugin, fix spelling
+
 * Fri Apr  4 2008 John Dennis <jdennis at redhat.com> - 2.0.4-5
 	- bump rev for build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	31 Jan 2008 21:58:45 -0000	1.10
+++ sources	9 Sep 2008 15:54:18 -0000	1.11
@@ -1 +1 @@
-7bbe52afafea76115c87675f7a35c5f9  setroubleshoot-plugins-2.0.4.tar.gz
+980b9e0663551c56a44ba11bba02e935  setroubleshoot-plugins-2.0.7.tar.gz



From pkgdb at fedoraproject.org  Tue Sep  9 15:58:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:58:58 +0000
Subject: [pkgdb] kde-settings had acl change status
Message-ID: <20080909155858.77EDB208E17@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kde-settings (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From pkgdb at fedoraproject.org  Tue Sep  9 15:58:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:58:59 +0000
Subject: [pkgdb] kde-settings had acl change status
Message-ID: <20080909155859.72E38208E1C@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kde-settings (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From pkgdb at fedoraproject.org  Tue Sep  9 15:59:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:59:04 +0000
Subject: [pkgdb] kde-settings had acl change status
Message-ID: <20080909155904.4E6FA208E21@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kde-settings (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From pkgdb at fedoraproject.org  Tue Sep  9 15:59:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 15:59:05 +0000
Subject: [pkgdb] kde-settings had acl change status
Message-ID: <20080909155905.C3160208E26@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kde-settings (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From davej at fedoraproject.org  Tue Sep  9 16:16:35 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Tue,  9 Sep 2008 16:16:35 +0000 (UTC)
Subject: rpms/kernel/devel .cvsignore,1.919,1.920
Message-ID: <20080909161635.C7F867012A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13890

Modified Files:
	.cvsignore 
Log Message:
re-add ignorance of generated/inconsequential files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.919
retrieving revision 1.920
diff -u -r1.919 -r1.920
--- .cvsignore	9 Sep 2008 06:24:37 -0000	1.919
+++ .cvsignore	9 Sep 2008 16:16:05 -0000	1.920
@@ -1,3 +1,8 @@
+clog
+GNUmakefile
+kernel-2.6.*.config
+temp-*
+kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc5.bz2
 patch-2.6.27-rc5-git10.bz2



From dwalsh at fedoraproject.org  Tue Sep  9 16:19:18 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  9 Sep 2008 16:19:18 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.74,
	1.75 policycoreutils-po.patch, 1.38, 1.39 policycoreutils.spec,
	1.554, 1.555
Message-ID: <20080909161918.CFAAB7012A@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14455

Modified Files:
	policycoreutils-gui.patch policycoreutils-po.patch 
	policycoreutils.spec 
Log Message:
* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-6
- Fix spelling mistake


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- policycoreutils-gui.patch	29 Aug 2008 19:05:21 -0000	1.74
+++ policycoreutils-gui.patch	9 Sep 2008 16:18:36 -0000	1.75
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.54/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.55/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/Makefile	2008-08-11 12:20:26.000000000 -0400
++++ policycoreutils-2.0.55/gui/Makefile	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,37 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -39,9 +39,9 @@
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.54/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.55/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/booleansPage.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/booleansPage.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,237 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -280,9 +280,9 @@
 +        self.load(self.filter)
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.54/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.55/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/fcontextPage.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/fcontextPage.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,217 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -501,9 +501,9 @@
 +        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.54/gui/html_util.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/html_util.py policycoreutils-2.0.55/gui/html_util.py
 --- nsapolicycoreutils/gui/html_util.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/html_util.py	2008-08-11 11:54:46.000000000 -0400
++++ policycoreutils-2.0.55/gui/html_util.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,164 @@
 +# Authors: John Dennis <jdennis at redhat.com>
 +#
@@ -669,9 +669,9 @@
 +    doc += tail
 +    return doc
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.54/gui/lockdown.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.55/gui/lockdown.glade
 --- nsapolicycoreutils/gui/lockdown.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/lockdown.glade	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/lockdown.glade	2008-08-29 14:34:59.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">
@@ -1444,9 +1444,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.54/gui/lockdown.gladep
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.55/gui/lockdown.gladep
 --- nsapolicycoreutils/gui/lockdown.gladep	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/lockdown.gladep	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/lockdown.gladep	2008-08-29 14:34:59.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">
@@ -1455,9 +1455,9 @@
 +  <name></name>
 +  <program_name></program_name>
 +</glade-project>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.54/gui/lockdown.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.55/gui/lockdown.py
 --- nsapolicycoreutils/gui/lockdown.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/lockdown.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/lockdown.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,382 @@
 +#!/usr/bin/python
 +#
@@ -1841,9 +1841,9 @@
 +
 +    app = booleanWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.54/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.55/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/loginsPage.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/loginsPage.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,185 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2030,9 +2030,9 @@
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.54/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.55/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/mappingsPage.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/mappingsPage.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2090,9 +2090,9 @@
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.54/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.55/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/modulesPage.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/modulesPage.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,195 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2289,9 +2289,9 @@
 +        
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.54/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.55/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/polgen.glade	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/polgen.glade	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,3284 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -5577,9 +5577,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.54/gui/polgen.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.55/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/polgen.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/polgen.py	2008-09-09 12:11:25.000000000 -0400
 @@ -0,0 +1,925 @@
 +#!/usr/bin/python
 +#
@@ -5895,7 +5895,7 @@
 +		
 +	def set_use_tmp(self, val):
 +            if self.type not in APPLICATIONS:
-+                raise ValueError(_("USER Types autoomatically get a tmp type"))
++                raise ValueError(_("USER Types automatically get a tmp type"))
 +
 +            if val:
 +		self.DEFAULT_DIRS["tmp"][1].append("/tmp");
@@ -6506,9 +6506,9 @@
 +    sys.exit(0)
 +    
 +	
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.54/gui/polgengui.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.55/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/polgengui.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/polgengui.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,623 @@
 +#!/usr/bin/python -E
 +#
@@ -7133,9 +7133,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.54/gui/portsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.55/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/portsPage.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/portsPage.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,259 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -7396,9 +7396,9 @@
 +
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.54/gui/selinux.tbl
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.55/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/selinux.tbl	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/selinux.tbl	2008-08-29 14:34:59.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 /")
@@ -7634,9 +7634,9 @@
 +webadm_manage_user_files _("HTTPD Service") _("Allow SELinux webadm user to manage unprivileged users home directories")
 +webadm_read_user_files _("HTTPD Service") _("Allow SELinux webadm user to read unprivileged users home directories")
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.54/gui/semanagePage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.55/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/semanagePage.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/semanagePage.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,169 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -7807,9 +7807,9 @@
 +        self.load(self.filter)
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.54/gui/statusPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.55/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/statusPage.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/statusPage.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,191 @@
 +# statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -8002,9 +8002,9 @@
 +        return self.types[self.selinuxTypeOptionMenu.get_active()]
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.54/gui/system-config-selinux.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.55/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/system-config-selinux.glade	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/system-config-selinux.glade	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,3221 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -11227,9 +11227,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.54/gui/system-config-selinux.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.55/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/system-config-selinux.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/system-config-selinux.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,187 @@
 +#!/usr/bin/python
 +#
@@ -11418,9 +11418,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.54/gui/templates/__init__.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.55/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/templates/__init__.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/templates/__init__.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -11440,9 +11440,9 @@
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.54/gui/templates/boolean.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.55/gui/templates/boolean.py
 --- nsapolicycoreutils/gui/templates/boolean.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/templates/boolean.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/templates/boolean.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,40 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -11484,9 +11484,9 @@
 +')
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.54/gui/templates/etc_rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.55/gui/templates/etc_rw.py
 --- nsapolicycoreutils/gui/templates/etc_rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/templates/etc_rw.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/templates/etc_rw.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -11617,9 +11617,9 @@
 +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.54/gui/templates/executable.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.55/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/templates/executable.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/templates/executable.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,327 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -11948,9 +11948,9 @@
 +EXECUTABLE	--	gen_context(system_u:object_r:TEMPLATETYPE_script_exec_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.54/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.55/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/templates/network.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/templates/network.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -12032,9 +12032,9 @@
 +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.54/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.55/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/templates/rw.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/templates/rw.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,128 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12164,9 +12164,9 @@
 +fc_dir="""
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.54/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.55/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/templates/script.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/templates/script.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,105 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12273,9 +12273,9 @@
 +# 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.54/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.55/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/templates/semodule.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/templates/semodule.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12318,9 +12318,9 @@
 +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.54/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.55/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/templates/tmp.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/templates/tmp.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12419,9 +12419,9 @@
 +	TEMPLATETYPE_manage_tmp($1)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.54/gui/templates/user.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.55/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/templates/user.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/templates/user.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,182 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12605,9 +12605,9 @@
 +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.54/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.55/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/templates/var_lib.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/templates/var_lib.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,158 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12767,9 +12767,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.54/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.55/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/templates/var_log.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/templates/var_log.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,110 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12881,9 +12881,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.54/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.55/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/templates/var_run.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/templates/var_run.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,118 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13003,9 +13003,9 @@
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.54/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.55/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/templates/var_spool.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/templates/var_spool.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13136,9 +13136,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.54/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.55/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/translationsPage.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/translationsPage.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -13258,9 +13258,9 @@
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.54/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.55/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/usersPage.py	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/gui/usersPage.py	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,150 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006,2007,2008 Red Hat, Inc.

policycoreutils-po.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.38 -r 1.39 policycoreutils-po.patch
Index: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- policycoreutils-po.patch	29 Aug 2008 19:05:21 -0000	1.38
+++ policycoreutils-po.patch	9 Sep 2008 16:18:37 -0000	1.39
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/.cvsignore policycoreutils-2.0.54/po/.cvsignore
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/.cvsignore policycoreutils-2.0.55/po/.cvsignore
 --- nsapolicycoreutils/po/.cvsignore	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/po/.cvsignore	2008-08-06 18:05:28.000000000 -0400
++++ policycoreutils-2.0.55/po/.cvsignore	2008-08-29 14:34:59.000000000 -0400
 @@ -0,0 +1,16 @@
 +*.gmo
 +*.mo
@@ -18,9 +18,9 @@
 +po2tbl.sed.in
 +stamp-cat-id
 +stamp-it
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-2.0.54/po/Makefile
---- nsapolicycoreutils/po/Makefile	2008-08-05 09:58:34.000000000 -0400
-+++ policycoreutils-2.0.54/po/Makefile	2008-08-06 18:05:28.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-2.0.55/po/Makefile
+--- nsapolicycoreutils/po/Makefile	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.55/po/Makefile	2008-08-29 14:34:59.000000000 -0400
 @@ -23,20 +23,61 @@
  POFILES		= $(wildcard *.po)
  MOFILES		= $(patsubst %.po,%.mo,$(POFILES))
@@ -100,9 +100,9 @@
  install: $(MOFILES)
  	@for n in $(MOFILES); do \
  	    l=`basename $$n .mo`; \
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES policycoreutils-2.0.54/po/POTFILES
---- nsapolicycoreutils/po/POTFILES	2008-08-05 09:58:34.000000000 -0400
-+++ policycoreutils-2.0.54/po/POTFILES	2008-08-06 18:05:28.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES policycoreutils-2.0.55/po/POTFILES
+--- nsapolicycoreutils/po/POTFILES	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.55/po/POTFILES	2008-08-29 14:34:59.000000000 -0400
 @@ -1,10 +1,54 @@
 -	../load_policy/load_policy.c \
 -	../newrole/newrole.c \
@@ -166,9 +166,9 @@
 +	../gui/templates/var_spool.py \
 +	../secon/secon.c \
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycoreutils-2.0.54/po/POTFILES.in
---- nsapolicycoreutils/po/POTFILES.in	2008-08-05 09:58:34.000000000 -0400
-+++ policycoreutils-2.0.54/po/POTFILES.in	2008-08-06 18:05:28.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycoreutils-2.0.55/po/POTFILES.in
+--- nsapolicycoreutils/po/POTFILES.in	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.55/po/POTFILES.in	2008-08-29 14:34:59.000000000 -0400
 @@ -2,9 +2,7 @@
  run_init/run_init.c
  semodule_link/semodule_link.c
@@ -228,19 +228,19 @@
 +gui/templates/var_run.py
 +gui/templates/var_spool.py
  secon/secon.c
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.54/po/af.po
---- nsapolicycoreutils/po/af.po	2008-08-05 09:58:34.000000000 -0400
-+++ policycoreutils-2.0.54/po/af.po	2008-08-11 12:04:05.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.55/po/af.po
+--- nsapolicycoreutils/po/af.po	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.55/po/af.po	2008-09-09 12:15:40.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2006-11-21 14:21-0500\n"
-+"POT-Creation-Date: 2008-08-08 13:53-0400\n"
++"POT-Creation-Date: 2008-09-09 12: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"
-@@ -16,1013 +16,3198 @@
+@@ -16,1013 +16,3298 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
@@ -495,9 +495,9 @@
 +#: ../semanage/seobject.py:392 ../semanage/seobject.py:452
 +#: ../semanage/seobject.py:498 ../semanage/seobject.py:580
 +#: ../semanage/seobject.py:647 ../semanage/seobject.py:705
-+#: ../semanage/seobject.py:915 ../semanage/seobject.py:1267
-+#: ../semanage/seobject.py:1327 ../semanage/seobject.py:1339
-+#: ../semanage/seobject.py:1418 ../semanage/seobject.py:1469
++#: ../semanage/seobject.py:915 ../semanage/seobject.py:1482
++#: ../semanage/seobject.py:1542 ../semanage/seobject.py:1554
++#: ../semanage/seobject.py:1633 ../semanage/seobject.py:1684
 +#, python-format
 +msgid "Could not create a key for %s"
  msgstr ""
@@ -871,7 +871,8 @@
 +msgid "Could not add port %s/%s"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:865 ../semanage/seobject.py:1083
++#: ../semanage/seobject.py:865 ../semanage/seobject.py:1111
++#: ../semanage/seobject.py:1299
 +msgid "Requires setype or serange"
 +msgstr ""
 +
@@ -929,281 +930,380 @@
 +msgid "Port Number"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1022 ../semanage/seobject.py:1211
++#: ../semanage/seobject.py:1016 ../semanage/seobject.py:1098
++#: ../semanage/seobject.py:1148
++msgid "Node Address is required"
++msgstr ""
++
++#: ../semanage/seobject.py:1019 ../semanage/seobject.py:1101
++#: ../semanage/seobject.py:1151
++msgid "Node Netmask is required"
++msgstr ""
++
++#: ../semanage/seobject.py:1026 ../semanage/seobject.py:1107
++#: ../semanage/seobject.py:1158
++msgid "Unknown or missing protocol"
++msgstr ""
++
++#: ../semanage/seobject.py:1036 ../semanage/seobject.py:1238
++#: ../semanage/seobject.py:1427
 +msgid "SELinux Type is required"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1026 ../semanage/seobject.py:1087
-+#: ../semanage/seobject.py:1121 ../semanage/seobject.py:1215
++#: ../semanage/seobject.py:1040 ../semanage/seobject.py:1115
++#: ../semanage/seobject.py:1162 ../semanage/seobject.py:1242
++#: ../semanage/seobject.py:1303 ../semanage/seobject.py:1337
++#: ../semanage/seobject.py:1431
 +#, python-format
 +msgid "Could not create key for %s"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1030 ../semanage/seobject.py:1091
-+#: ../semanage/seobject.py:1125 ../semanage/seobject.py:1131
++#: ../semanage/seobject.py:1042 ../semanage/seobject.py:1119
++#: ../semanage/seobject.py:1166 ../semanage/seobject.py:1172
 +#, python-format
-+msgid "Could not check if interface %s is defined"
++msgid "Could not check if addr %s is defined"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1032
++#: ../semanage/seobject.py:1046
 +#, python-format
-+msgid "Interface %s already defined"
++msgid "Addr %s already defined"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1036
++#: ../semanage/seobject.py:1050
 +#, python-format
-+msgid "Could not create interface for %s"
++msgid "Could not create addr for %s"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1041 ../semanage/seobject.py:1181
++#: ../semanage/seobject.py:1055 ../semanage/seobject.py:1257
++#: ../semanage/seobject.py:1397
 +#, python-format
 +msgid "Could not create context for %s"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1045
++#: ../semanage/seobject.py:1059
++#, python-format
++msgid "Could not set mask for %s"
++msgstr ""
++
++#: ../semanage/seobject.py:1064
++#, python-format
++msgid "Could not set user in addr context for %s"
++msgstr ""
++
++#: ../semanage/seobject.py:1068
++#, python-format
++msgid "Could not set role in addr context for %s"
++msgstr ""
++
++#: ../semanage/seobject.py:1072
++#, python-format
++msgid "Could not set type in addr context for %s"
++msgstr ""
++
++#: ../semanage/seobject.py:1077
++#, python-format
++msgid "Could not set mls fields in addr context for %s"
++msgstr ""
++
++#: ../semanage/seobject.py:1081
++#, python-format
++msgid "Could not set addr context for %s"
++msgstr ""
++
[...69035 lines suppressed...]
-+#: ../semanage/seobject.py:1343 ../semanage/seobject.py:1347
++#: ../semanage/seobject.py:1435 ../semanage/seobject.py:1486
++#: ../semanage/seobject.py:1558 ../semanage/seobject.py:1562
 +#, python-format
 +msgid "Could not check if file context for %s is defined"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1221
++#: ../semanage/seobject.py:1437
 +#, python-format
 +msgid "File context for %s already defined"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1225
++#: ../semanage/seobject.py:1441
 +#, python-format
 +msgid "Could not create file context for %s"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1233
++#: ../semanage/seobject.py:1449
 +#, python-format
 +msgid "Could not set type in file context for %s"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1241 ../semanage/seobject.py:1295
-+#: ../semanage/seobject.py:1299
++#: ../semanage/seobject.py:1457 ../semanage/seobject.py:1510
++#: ../semanage/seobject.py:1514
 +#, python-format
 +msgid "Could not set file context for %s"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1247
++#: ../semanage/seobject.py:1463
 +#, python-format
 +msgid "Could not add file context for %s"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1262
++#: ../semanage/seobject.py:1477
 +msgid "Requires setype, serange or seuser"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1273 ../semanage/seobject.py:1351
++#: ../semanage/seobject.py:1488 ../semanage/seobject.py:1566
 +#, python-format
 +msgid "File context for %s is not defined"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1277
++#: ../semanage/seobject.py:1492
 +#, python-format
 +msgid "Could not query file context for %s"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1303
++#: ../semanage/seobject.py:1518
 +#, python-format
 +msgid "Could not modify file context for %s"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1317
++#: ../semanage/seobject.py:1532
 +msgid "Could not list the file contexts"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1331
++#: ../semanage/seobject.py:1546
 +#, python-format
 +msgid "Could not delete the file context %s"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1349
++#: ../semanage/seobject.py:1564
 +#, python-format
 +msgid "File context for %s is defined in policy, cannot be deleted"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1355
++#: ../semanage/seobject.py:1570
 +#, python-format
 +msgid "Could not delete file context for %s"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1371
++#: ../semanage/seobject.py:1586
 +msgid "Could not list file contexts"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1375
++#: ../semanage/seobject.py:1590
 +msgid "Could not list local file contexts"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1393
++#: ../semanage/seobject.py:1608
 +msgid "SELinux fcontext"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1393
++#: ../semanage/seobject.py:1608
 +msgid "type"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1421 ../semanage/seobject.py:1472
-+#: ../semanage/seobject.py:1478
++#: ../semanage/seobject.py:1636 ../semanage/seobject.py:1687
++#: ../semanage/seobject.py:1693
 +#, python-format
 +msgid "Could not check if boolean %s is defined"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1423 ../semanage/seobject.py:1474
++#: ../semanage/seobject.py:1638 ../semanage/seobject.py:1689
 +#, python-format
 +msgid "Boolean %s is not defined"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1427
++#: ../semanage/seobject.py:1642
 +#, python-format
 +msgid "Could not query file context %s"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1432
++#: ../semanage/seobject.py:1647
 +#, python-format
 +msgid "You must specify one of the following values: %s"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1436
++#: ../semanage/seobject.py:1651
 +#, python-format
 +msgid "Could not set active value of boolean %s"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1439
++#: ../semanage/seobject.py:1654
 +#, python-format
 +msgid "Could not modify boolean %s"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1457
++#: ../semanage/seobject.py:1672
 +#, python-format
 +msgid "Bad format %s: Record %s"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1480
++#: ../semanage/seobject.py:1695
 +#, python-format
 +msgid "Boolean %s is defined in policy, cannot be deleted"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1484
++#: ../semanage/seobject.py:1699
 +#, python-format
 +msgid "Could not delete boolean %s"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1496 ../semanage/seobject.py:1513
++#: ../semanage/seobject.py:1711 ../semanage/seobject.py:1728
 +msgid "Could not list booleans"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1532
++#: ../semanage/seobject.py:1747
 +msgid "unknown"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1535
++#: ../semanage/seobject.py:1750
 +msgid "off"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1535
++#: ../semanage/seobject.py:1750
 +msgid "on"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1544
++#: ../semanage/seobject.py:1759
 +msgid "SELinux boolean"
 +msgstr ""
 +
-+#: ../semanage/seobject.py:1544 ../gui/polgen.glade:3207
++#: ../semanage/seobject.py:1759 ../gui/polgen.glade:3207
 +#: ../gui/polgengui.py:169
 +msgid "Description"
 +msgstr ""
@@ -304486,7 +312299,7 @@
 +msgstr ""
 +
 +#: ../gui/polgen.py:315
-+msgid "USER Types autoomatically get a tmp type"
++msgid "USER Types automatically get a tmp type"
 +msgstr ""
 +
 +#: ../gui/polgen.py:711


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.554
retrieving revision 1.555
diff -u -r1.554 -r1.555
--- policycoreutils.spec	8 Sep 2008 21:03:51 -0000	1.554
+++ policycoreutils.spec	9 Sep 2008 16:18:41 -0000	1.555
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.55
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-6
+- Fix spelling mistake
+
 * Mon Sep 8 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-5
 - Add node support to semanage
 



From lennart at fedoraproject.org  Tue Sep  9 16:43:37 2008
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue,  9 Sep 2008 16:43:37 +0000 (UTC)
Subject: rpms/pulseaudio/devel pulseaudio.spec,1.51,1.52
Message-ID: <20080909164337.E9AC27012A@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19632

Modified Files:
	pulseaudio.spec 
Log Message:
Don't remove pulse users/groups on package removal


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- pulseaudio.spec	9 Sep 2008 01:11:43 -0000	1.51
+++ pulseaudio.spec	9 Sep 2008 16:43:07 -0000	1.52
@@ -3,7 +3,7 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.12
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -208,8 +208,7 @@
 
 %pre
 groupadd -r pulse &>/dev/null || :
-useradd -r -c 'PulseAudio daemon' \
-    -s /sbin/nologin -d / -g pulse pulse &>/dev/null || :
+useradd -r -c 'PulseAudio System Daemon' -s /sbin/nologin -d /var/run/pulse -g pulse pulse &>/dev/null || :
 groupadd -r pulse-rt &>/dev/null || :
 groupadd -r pulse-access &>/dev/null || :
 
@@ -217,12 +216,6 @@
 
 %postun
 /sbin/ldconfig
-if [ $1 -eq 0 ]; then
-    userdel pulse &>/dev/null || :
-    groupdel pulse &>/dev/null || :
-    groupdel pulse-rt &>/dev/null || :
-    groupdel pulse-access &>/dev/null || :
-fi
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
@@ -318,6 +311,7 @@
 %{_mandir}/man5/pulse-client.conf.5.gz
 %{_mandir}/man5/pulse-daemon.conf.5.gz
 %dir %{_libexecdir}/pulse
+%attr(0700, pulse, pulse) %dir %{_localstatedir}/lib/pulse
 
 %files esound-compat
 %defattr(-,root,root)
@@ -411,6 +405,9 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Tue Sep 9 2008 Lennart Poettering <lpoetter at redhat.com> 0.9.12-3
+- Don't remove pulse users/groups on package removal
+
 * Tue Sep 9 2008 Lennart Poettering <lpoetter at redhat.com> 0.9.12-2
 - Add intltool to deps
 



From lennart at fedoraproject.org  Tue Sep  9 16:48:24 2008
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue,  9 Sep 2008 16:48:24 +0000 (UTC)
Subject: rpms/sound-theme-freedesktop/devel sound-theme-freedesktop.spec, 1.3,
	1.4
Message-ID: <20080909164824.23F837012A@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-serv20829

Modified Files:
	sound-theme-freedesktop.spec 
Log Message:
Fix changelog


Index: sound-theme-freedesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-theme-freedesktop/devel/sound-theme-freedesktop.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sound-theme-freedesktop.spec	9 Sep 2008 15:37:44 -0000	1.3
+++ sound-theme-freedesktop.spec	9 Sep 2008 16:47:53 -0000	1.4
@@ -1,6 +1,6 @@
 Name: sound-theme-freedesktop
 Version: 0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: freedesktop.org sound theme
 Group: User Interface/Desktops
 Source0: http://0pointer.de/public/sound-theme-freedesktop.tar.gz
@@ -44,7 +44,10 @@
 %{_datadir}/sounds/freedesktop/stereo/*.ogg
 
 %changelog
-* Tue Sep 9 2008 Lennart Poettering <lpoetter at redhat.com 0.1.3
+* Tue Sep 9 2008 Lennart Poettering <lpoetter at redhat.com 0.1-4
+- Fix changelog
+
+* Tue Sep 9 2008 Lennart Poettering <lpoetter at redhat.com 0.1-3
 - Touch root dirs, not just theme dirs
 
 * Mon Aug 11 2008 Jeremy Katz <katzj at redhat.com> - 0.1-2



From otaylor at fedoraproject.org  Tue Sep  9 16:48:51 2008
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Tue,  9 Sep 2008 16:48:51 +0000 (UTC)
Subject: rpms/bigboard/devel .cvsignore, 1.42, 1.43 bigboard.spec, 1.63,
	1.64 sources, 1.43, 1.44
Message-ID: <20080909164851.AE35F7012A@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/bigboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20936

Modified Files:
	.cvsignore bigboard.spec sources 
Log Message:
Update to 0.6.2 (fixes a crash)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bigboard/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	2 Sep 2008 21:11:13 -0000	1.42
+++ .cvsignore	9 Sep 2008 16:48:21 -0000	1.43
@@ -2,3 +2,4 @@
 bigboard-0.5.34.tar.bz2
 bigboard-0.6.0.tar.gz
 bigboard-0.6.1.tar.gz
+bigboard-0.6.2.tar.gz


Index: bigboard.spec
===================================================================
RCS file: /cvs/extras/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- bigboard.spec	2 Sep 2008 21:11:13 -0000	1.63
+++ bigboard.spec	9 Sep 2008 16:48:21 -0000	1.64
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.6.1
+Version:        0.6.2
 Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
@@ -124,6 +124,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Mon Sep  8 2008 Owen Taylor <otaylor at redhat.com> - 0.6.2-1
+- Update to 0.6.2 (fixes a crash)
+
 * Tue Sep  2 2008 Owen Taylor <otaylor at redhat.com> - 0.6.1-1
 - Update to 0.6.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bigboard/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	2 Sep 2008 21:11:13 -0000	1.43
+++ sources	9 Sep 2008 16:48:21 -0000	1.44
@@ -1 +1 @@
-ada00604ace214809b7eb3635b774e6b  bigboard-0.6.1.tar.gz
+9ff0d70383f7553b42f2d52284145177  bigboard-0.6.2.tar.gz



From jcm at fedoraproject.org  Tue Sep  9 16:50:50 2008
From: jcm at fedoraproject.org (Jon Masters)
Date: Tue,  9 Sep 2008 16:50:50 +0000 (UTC)
Subject: rpms/module-init-tools/devel .cvsignore, 1.15,
	1.16 module-init-tools.spec, 1.72, 1.73 sources, 1.17, 1.18
Message-ID: <20080909165050.8AB367012C@cvs1.fedora.phx.redhat.com>

Author: jcm

Update of /cvs/pkgs/rpms/module-init-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21497

Modified Files:
	.cvsignore module-init-tools.spec sources 
Log Message:
Add ability to override module options on the kernel command line



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	7 Oct 2007 22:33:51 -0000	1.15
+++ .cvsignore	9 Sep 2008 16:50:20 -0000	1.16
@@ -1,2 +1,2 @@
-module-init-tools-3.4.tar.bz2
-module-init-tools-3.4.tar.bz2.sign
+module-init-tools-3.4.1.tar.bz2
+module-init-tools-3.4.1.tar.bz2.sign


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- module-init-tools.spec	11 Aug 2008 15:20:57 -0000	1.72
+++ module-init-tools.spec	9 Sep 2008 16:50:20 -0000	1.73
@@ -1,11 +1,11 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
-Version: 3.4
-Release: 13%{?dist}
+Version: 3.4.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Kernel
-Source: http://www.kerneltools.org/pub/downloads/module-init-tools/module-init-tools-%{version}.tar.bz2
-Source1: http://www.kerneltools.org/pub/downloads/module-init-tools/module-init-tools-%{version}.tar.bz2.sign
+Source: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}.tar.bz2
+Source1: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}.tar.bz2.sign
 Source2: modprobe.conf.dist
 Source3: weak-modules
 Source4: depmod.conf.dist
@@ -104,6 +104,9 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Tue Sep  9 2008 Jon Masters <jcm at redhat.com> - 3.4.1
+- Add ability to supply module options on kernel command line
+
 * Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.4-13
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	7 Oct 2007 22:33:51 -0000	1.17
+++ sources	9 Sep 2008 16:50:20 -0000	1.18
@@ -1,2 +1,2 @@
-db6ac059e80e8dd4389dbe81ee61f3c6  module-init-tools-3.4.tar.bz2
-b649560d1a66b2383d3e47762bbea60e  module-init-tools-3.4.tar.bz2.sign
+e253b066a1bab1d727ca0d54f001b49c  module-init-tools-3.4.1.tar.bz2
+83db3eb3125e2a8cb41dadc9fbe5f716  module-init-tools-3.4.1.tar.bz2.sign



From notting at fedoraproject.org  Tue Sep  9 16:58:12 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue,  9 Sep 2008 16:58:12 +0000 (UTC)
Subject: rpms/libofx/devel libofx-assorted-c++-fu.patch, 1.1, 1.2 libofx.spec,
	1.33, 1.34
Message-ID: <20080909165812.7ECAF7012A@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/libofx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23549

Modified Files:
	libofx-assorted-c++-fu.patch libofx.spec 
Log Message:
Update to 0.9.0.

Note: this breaks ABI, and some API.


libofx-assorted-c++-fu.patch:

Index: libofx-assorted-c++-fu.patch
===================================================================
RCS file: /cvs/extras/rpms/libofx/devel/libofx-assorted-c++-fu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libofx-assorted-c++-fu.patch	14 Feb 2008 17:25:47 -0000	1.1
+++ libofx-assorted-c++-fu.patch	9 Sep 2008 16:58:12 -0000	1.2
@@ -1,52 +1,39 @@
-diff -up libofx-0.8.3/lib/ofx_request_accountinfo.cpp.foo libofx-0.8.3/lib/ofx_request_accountinfo.cpp
---- libofx-0.8.3/lib/ofx_request_accountinfo.cpp.foo	2008-02-14 12:22:43.000000000 -0500
-+++ libofx-0.8.3/lib/ofx_request_accountinfo.cpp	2008-02-14 12:22:53.000000000 -0500
+diff -up libofx-0.9.0/lib/ofx_container_transaction.cpp.c++-fu libofx-0.9.0/lib/ofx_container_transaction.cpp
+--- libofx-0.9.0/lib/ofx_container_transaction.cpp.c++-fu	2007-11-09 18:10:49.000000000 -0500
++++ libofx-0.9.0/lib/ofx_container_transaction.cpp	2008-09-09 11:14:40.000000000 -0400
 @@ -21,6 +21,7 @@
  #include <config.h>
  #endif
  
 +#include <cstdlib>
  #include <string>
+ #include "messages.hh"
  #include "libofx.h"
- #include "ofx_request_accountinfo.hh"
-diff -up libofx-0.8.3/lib/ofx_request.cpp.foo libofx-0.8.3/lib/ofx_request.cpp
---- libofx-0.8.3/lib/ofx_request.cpp.foo	2008-02-14 12:21:59.000000000 -0500
-+++ libofx-0.8.3/lib/ofx_request.cpp	2008-02-14 12:22:12.000000000 -0500
+diff -up libofx-0.9.0/lib/ofx_request_accountinfo.cpp.c++-fu libofx-0.9.0/lib/ofx_request_accountinfo.cpp
+--- libofx-0.9.0/lib/ofx_request_accountinfo.cpp.c++-fu	2007-10-27 22:33:43.000000000 -0400
++++ libofx-0.9.0/lib/ofx_request_accountinfo.cpp	2008-09-09 11:14:40.000000000 -0400
 @@ -21,6 +21,7 @@
  #include <config.h>
  #endif
  
-+#include <cstring>
- #include <string>
- #include "messages.hh"
- #include "libofx.h"
-diff -up libofx-0.8.3/lib/ofx_utilities.cpp.foo libofx-0.8.3/lib/ofx_utilities.cpp
---- libofx-0.8.3/lib/ofx_utilities.cpp.foo	2008-02-14 12:20:47.000000000 -0500
-+++ libofx-0.8.3/lib/ofx_utilities.cpp	2008-02-14 12:21:06.000000000 -0500
-@@ -19,7 +19,8 @@
- #include <iostream>
- #include "ParserEventGeneratorKit.h"
- #include "SGMLApplication.h"
--#include <time.h>
-+#include <ctime>
 +#include <cstdlib>
  #include <string>
- #include <locale.h>
- #include "messages.hh"
-diff -up libofx-0.8.3/lib/ofx_container_transaction.cpp.foo libofx-0.8.3/lib/ofx_container_transaction.cpp
---- libofx-0.8.3/lib/ofx_container_transaction.cpp.foo	2008-02-14 12:21:36.000000000 -0500
-+++ libofx-0.8.3/lib/ofx_container_transaction.cpp	2008-02-14 12:21:47.000000000 -0500
+ #include "libofx.h"
+ #include "ofx_request_accountinfo.hh"
+diff -up libofx-0.9.0/lib/ofx_request.cpp.c++-fu libofx-0.9.0/lib/ofx_request.cpp
+--- libofx-0.9.0/lib/ofx_request.cpp.c++-fu	2007-10-27 22:37:52.000000000 -0400
++++ libofx-0.9.0/lib/ofx_request.cpp	2008-09-09 11:14:40.000000000 -0400
 @@ -21,6 +21,7 @@
  #include <config.h>
  #endif
  
-+#include <cstdlib>
++#include <cstring>
  #include <string>
  #include "messages.hh"
  #include "libofx.h"
-diff -up libofx-0.8.3/lib/ofx_request_statement.cpp.foo libofx-0.8.3/lib/ofx_request_statement.cpp
---- libofx-0.8.3/lib/ofx_request_statement.cpp.foo	2008-02-14 12:23:07.000000000 -0500
-+++ libofx-0.8.3/lib/ofx_request_statement.cpp	2008-02-14 12:23:17.000000000 -0500
+diff -up libofx-0.9.0/lib/ofx_request_statement.cpp.c++-fu libofx-0.9.0/lib/ofx_request_statement.cpp
+--- libofx-0.9.0/lib/ofx_request_statement.cpp.c++-fu	2007-10-28 08:57:18.000000000 -0400
++++ libofx-0.9.0/lib/ofx_request_statement.cpp	2008-09-09 11:14:40.000000000 -0400
 @@ -21,6 +21,7 @@
  #include <config.h>
  #endif
@@ -55,9 +42,22 @@
  #include <string>
  #include "libofx.h"
  #include "ofx_utilities.hh"
-diff -up libofx-0.8.3/ofxdump/ofxdump.cpp.foo libofx-0.8.3/ofxdump/ofxdump.cpp
---- libofx-0.8.3/ofxdump/ofxdump.cpp.foo	2008-02-14 12:23:35.000000000 -0500
-+++ libofx-0.8.3/ofxdump/ofxdump.cpp	2008-02-14 12:24:07.000000000 -0500
+diff -up libofx-0.9.0/lib/ofx_utilities.cpp.c++-fu libofx-0.9.0/lib/ofx_utilities.cpp
+--- libofx-0.9.0/lib/ofx_utilities.cpp.c++-fu	2008-09-09 11:15:19.000000000 -0400
++++ libofx-0.9.0/lib/ofx_utilities.cpp	2008-09-09 11:15:54.000000000 -0400
+@@ -21,7 +21,8 @@
+ 
+ #include "ParserEventGeneratorKit.h"
+ #include "SGMLApplication.h"
+-#include <time.h>
++#include <ctime>
++#include <cstdlib>
+ #include <string>
+ #include <locale.h>
+ #include "messages.hh"
+diff -up libofx-0.9.0/ofxdump/ofxdump.cpp.c++-fu libofx-0.9.0/ofxdump/ofxdump.cpp
+--- libofx-0.9.0/ofxdump/ofxdump.cpp.c++-fu	2006-08-02 00:19:22.000000000 -0400
++++ libofx-0.9.0/ofxdump/ofxdump.cpp	2008-09-09 11:14:40.000000000 -0400
 @@ -29,6 +29,8 @@
   ***************************************************************************/
  #include <iostream>


Index: libofx.spec
===================================================================
RCS file: /cvs/extras/rpms/libofx/devel/libofx.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libofx.spec	14 Feb 2008 18:48:22 -0000	1.33
+++ libofx.spec	9 Sep 2008 16:58:12 -0000	1.34
@@ -2,15 +2,14 @@
 
 Summary: A library for supporting Open Financial Exchange (OFX)
 Name: libofx
-Version: 0.8.3
-Release: 5
+Version: 0.9.0
+Release: 1
 Source: http://downloads.sourceforge.net/libofx/%{name}-%{version}.tar.gz
 URL: http://libofx.sourceforge.net/
 Group:	System Environment/Libraries
 License: GPLv2+
-Patch: libofx-0.8.3-xml++.patch
+Patch1: libofx-0.8.3-xml++.patch
 Patch2: libofx-assorted-c++-fu.patch
-Patch3: libofx-account-type.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: opensp-devel
 BuildRequires: curl-devel
@@ -50,11 +49,10 @@
 %prep
 %setup -q
 %if %{with_xml}
-%patch -p1
+%patch1 -p1
 autoconf
 %endif
-%patch2 -p1
-%patch3 -p1
+%patch2 -p1 -b .c++-fu
 
 rm -rf ./doc/ofx_sample_files/CVS
 chmod 644 ./doc/ofx_sample_files/*
@@ -97,6 +95,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep  9 2008 Bill Nottingham <notting at redhat.com> - 0.9.0-1
+- update to 0.9.0
+
 * Thu Feb 14 2008 Bill Nottingham <notting at redhat.com> - 0.8.3-5
 - fix build with gcc-4.3
 - add patch for other account types (#415961)



From otaylor at fedoraproject.org  Tue Sep  9 16:58:32 2008
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Tue,  9 Sep 2008 16:58:32 +0000 (UTC)
Subject: rpms/bigboard/devel bigboard.spec,1.64,1.65
Message-ID: <20080909165832.34D6B7012A@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/bigboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23580

Modified Files:
	bigboard.spec 
Log Message:
Random release bump, not sure how old version got tagged


Index: bigboard.spec
===================================================================
RCS file: /cvs/extras/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- bigboard.spec	9 Sep 2008 16:48:21 -0000	1.64
+++ bigboard.spec	9 Sep 2008 16:58:02 -0000	1.65
@@ -3,7 +3,7 @@
 
 Name:           bigboard
 Version:        0.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
 Group:          Applications/Internet



From nhorman at fedoraproject.org  Tue Sep  9 16:59:35 2008
From: nhorman at fedoraproject.org (Neil Horman)
Date: Tue,  9 Sep 2008 16:59:35 +0000 (UTC)
Subject: rpms/coda/devel coda.spec,1.4,1.5
Message-ID: <20080909165935.437857012A@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/coda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24094

Modified Files:
	coda.spec 
Log Message:
Resolves: bz 461041


Index: coda.spec
===================================================================
RCS file: /cvs/extras/rpms/coda/devel/coda.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- coda.spec	29 May 2008 14:29:55 -0000	1.4
+++ coda.spec	9 Sep 2008 16:59:05 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           coda
 Version:        6.9.4
-Release:        0.1.%{rcver}%{?dist}
+Release:        0.2.%{rcver}%{?dist}
 Summary:        Coda distributed file system
 Group:          System Environment/Daemons
 License:        GPLv2
@@ -17,7 +17,10 @@
 Patch2:         coda-6.9.3-client-fhs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  lwp-devel rpc2-devel rvm-devel rvm-tools readline-devel
-BuildRequires:  fltk-devel fltk-fluid flex bison python perl
+BuildRequires:  fltk-devel fltk-fluid flex bison python perl krb5-devel
+BuildRequires:	e2fsprogs-devel
+Requires:	krb5-libs
+
 # For /etc/rc.d/init.d so that configure can detect we have RH style init
 BuildRequires:  chkconfig
 
@@ -83,8 +86,9 @@
 
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
-%configure --with-vcodacon
+export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -I/usr/include/et"
+export LIBS="-lkrb5 -lcom_err -lstdc++"
+%configure --with-vcodacon --with-krb5
 make %{?_smp_mflags}
 
 
@@ -288,6 +292,9 @@
 
 
 %changelog
+* Tue Sep 09 2008 Neil Horman <nhorman at redhat.com> 6.9.4-0.2.rc2
+- Enabling krb5 support (bz 461041)
+
 * Thu May 29 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 6.9.4-0.1.rc2
 - Update to 6.9.4~rc2 (bz 448749)
 



From notting at fedoraproject.org  Tue Sep  9 17:00:26 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue,  9 Sep 2008 17:00:26 +0000 (UTC)
Subject: rpms/libofx/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <20080909170026.1D1B67012A@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/libofx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24377

Modified Files:
	.cvsignore sources 
Log Message:
Update to 0.9.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libofx/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Jan 2007 17:34:07 -0000	1.6
+++ .cvsignore	9 Sep 2008 16:59:55 -0000	1.7
@@ -1,2 +1 @@
-libofx-0.8.2.tar.gz
-libofx-0.8.3.tar.gz
+libofx-0.9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libofx/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Jan 2007 17:34:07 -0000	1.6
+++ sources	9 Sep 2008 16:59:55 -0000	1.7
@@ -1,2 +1 @@
-b860894c1e3da7f58ce5d92e064d0e85  libofx-0.8.2.tar.gz
-26ef343ebf93dc6351c889a402e10d89  libofx-0.8.3.tar.gz
+6e2172f0117f90805590bf755190b79e  libofx-0.9.0.tar.gz



From notting at fedoraproject.org  Tue Sep  9 17:02:21 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue,  9 Sep 2008 17:02:21 +0000 (UTC)
Subject: rpms/gwenhywfar/devel gwenhywfar-3.4.1-pkgconfig.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 gwenhywfar.spec, 1.28, 1.29 sources,
	1.8, 1.9 gwenhywfar-2.3.0-pkgconfig.patch, 1.2, NONE
Message-ID: <20080909170221.823A77012A@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/gwenhywfar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25408

Modified Files:
	.cvsignore gwenhywfar.spec sources 
Added Files:
	gwenhywfar-3.4.1-pkgconfig.patch 
Removed Files:
	gwenhywfar-2.3.0-pkgconfig.patch 
Log Message:
Update to 3.4.1


gwenhywfar-3.4.1-pkgconfig.patch:

--- NEW FILE gwenhywfar-3.4.1-pkgconfig.patch ---
diff -up gwenhywfar-3.4.1/gwenhywfar-config.in.in.pkgconfig gwenhywfar-3.4.1/gwenhywfar-config.in.in
--- gwenhywfar-3.4.1/gwenhywfar-config.in.in.pkgconfig	2008-07-31 13:56:05.000000000 -0400
+++ gwenhywfar-3.4.1/gwenhywfar-config.in.in	2008-09-09 11:25:23.000000000 -0400
@@ -1,31 +1,26 @@
 # $Id$
 # Author of this file: Martin Preuss<martin at libchipcard.de>
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
 bindir=@bindir@
 
-libdir=@libdir@
-
 result=""
 
 for d in $*; do
     case $d in
 	--includes)
-	    result="$result -I at gwenhywfar_headerdir@"
+	    result="$result $(pkg-config --cflags gwenhywfar)"
 	    ;;
 	--libraries)
-	    result="$result @gwenhywfar_ldflags@ @gwenhywfar_libs@"
+	    result="$result $(pkg-config --libs gwenhywfar)"
 	    ;;
 	--bindir)
 	    result="$result @gwenhywfar_bindir@"
 	    ;;
 	--headers)
-	    result="$result @gwenhywfar_headerdir@/gwenhywfar"
+	    result="$result $(pkg-config --cflags gwenhywfar)"
 	    ;;
 	--plugins)
-	    result="$result @gwenhywfar_plugindir@"
+	    result="$result $(pkg-config --variable=plugindir gwenhywfar)"
 	    ;;
 	--vmajor)
 	    result="$result @GWENHYWFAR_VERSION_MAJOR@"
diff -up gwenhywfar-3.4.1/gwenhywfar.pc.in.pkgconfig gwenhywfar-3.4.1/gwenhywfar.pc.in
--- gwenhywfar-3.4.1/gwenhywfar.pc.in.pkgconfig	2008-07-31 13:56:05.000000000 -0400
+++ gwenhywfar-3.4.1/gwenhywfar.pc.in	2008-09-09 11:21:51.000000000 -0400
@@ -22,5 +22,4 @@ Description: A multi-platform helper lib
 
 Version: @VERSION@
 Libs: @gwenhywfar_ldflags@ @gwenhywfar_libs@
-Cflags: -I at gwenhywfar_headerdir@
-
+Cflags: -I at gwenhywfar_headerdir@ -I at libdir@/gwenhywfar/include


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwenhywfar/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	16 Jan 2008 03:45:19 -0000	1.8
+++ .cvsignore	9 Sep 2008 17:01:51 -0000	1.9
@@ -1 +1 @@
-gwenhywfar-2.6.2.tar.gz
+gwenhywfar-3.4.1.tar.gz


Index: gwenhywfar.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenhywfar/devel/gwenhywfar.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gwenhywfar.spec	14 Feb 2008 19:25:33 -0000	1.28
+++ gwenhywfar.spec	9 Sep 2008 17:01:51 -0000	1.29
@@ -1,15 +1,15 @@
 Summary: A multi-platform helper library for other libraries
 Name: gwenhywfar
-Version: 2.6.2
-Release: 2%{?dist}
+Version: 3.4.1
+Release: 1%{?dist}
 Source: http://download.sourceforge.net/gwenhywfar/%{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 License: LGPLv2+
-Patch: gwenhywfar-2.3.0-pkgconfig.patch
+Patch: gwenhywfar-3.4.1-pkgconfig.patch
 Patch2: gwen-open.patch
 URL: http://sourceforge.net/projects/gwenhywfar
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel gettext
+BuildRequires: gnutls-devel gettext libgcrypt-devel
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -32,7 +32,6 @@
 %setup -q
 # Port gwenhywfar-config to pkgconfig
 %patch -p1 -b .pkgconfig
-%patch2 -p1 -b .open
 
 %build
 %configure --disable-static --with-openssl-libs=%{_libdir}
@@ -46,13 +45,7 @@
 
 find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \;
 
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/gwenhywfar/include
-mv $RPM_BUILD_ROOT/%{_includedir}/gwenhywfar/types.h $RPM_BUILD_ROOT/%{_libdir}/gwenhywfar/include/gwenhywfar-types-target.h
-
-cat > $RPM_BUILD_ROOT/%{_includedir}/gwenhywfar/types.h << EOF
-/* Wrapper for target-specific types file. */
-#include <gwenhywfar-types-target.h>
-EOF
+%find_lang %{name}
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -61,25 +54,25 @@
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS README COPYING ChangeLog
-%config(noreplace) /etc/gwen-public-ca.crt
 %{_libdir}/*.so.*
 %{_libdir}/%{name}
-%exclude %{_libdir}/%{name}/include
-%{_datadir}/locale/*/LC_MESSAGES/gwenhywfar.mo
+%{_datadir}/%{name}
 
 %files devel
 %defattr(-,root,root)
 %{_bindir}/*
-%{_includedir}/gwenhywfar
-%{_libdir}/%{name}/include
+%{_includedir}/gwenhywfar3
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 %{_datadir}/aclocal/gwenhywfar.m4
 
 %changelog
+* Tue Sep  9 2008 Bill Nottingham <notting at redhat.com> - 3.4.1-1
+- update to 3.4.1
+
 * Thu Feb 14 2008 Bill Nottingham <notting at redhat.com> - 2.6.2-2
 - rebuild with gcc-4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwenhywfar/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 Jan 2008 03:45:19 -0000	1.8
+++ sources	9 Sep 2008 17:01:51 -0000	1.9
@@ -1 +1 @@
-fec3bc3653b7809cc44526b6fed52ab2  gwenhywfar-2.6.2.tar.gz
+c1bee825e06cf81e6811b3e788f67b44  gwenhywfar-3.4.1.tar.gz


--- gwenhywfar-2.3.0-pkgconfig.patch DELETED ---



From notting at fedoraproject.org  Tue Sep  9 17:04:04 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue,  9 Sep 2008 17:04:04 +0000 (UTC)
Subject: rpms/kmymoney2/devel kmymoney2.spec,1.32,1.33
Message-ID: <20080909170404.2BDD87012A@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/kmymoney2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26238

Modified Files:
	kmymoney2.spec 
Log Message:
bump for new libofx abi



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- kmymoney2.spec	14 May 2008 16:25:01 -0000	1.32
+++ kmymoney2.spec	9 Sep 2008 17:03:33 -0000	1.33
@@ -16,7 +16,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 Url:	 http://kmymoney2.sourceforge.net/
@@ -187,6 +187,9 @@
 
 
 %changelog
+* Tue Sep  9 2008 Bill Nottingham <notting at redhat.com> 0.9-2
+- rebuild for new libofx ABI
+
 * Wed May 14 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9-1
 - kmymoney2-0.9
 



From anyremote at fedoraproject.org  Tue Sep  9 17:08:34 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Tue,  9 Sep 2008 17:08:34 +0000 (UTC)
Subject: rpms/anyremote/devel import.log, NONE, 1.1 .cvsignore, 1.6,
	1.7 anyremote.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <20080909170834.094AD7012A@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27592/devel

Modified Files:
	.cvsignore anyremote.spec sources 
Added Files:
	import.log 
Log Message:
build


--- NEW FILE import.log ---
anyremote-4_8_1-1_fc9:HEAD:anyremote-4.8.1-1.fc9.src.rpm:1220980089


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Aug 2008 21:11:03 -0000	1.6
+++ .cvsignore	9 Sep 2008 17:08:03 -0000	1.7
@@ -1 +1 @@
-anyremote-4.7.1.tar.gz
+anyremote-4.8.1.tar.gz


Index: anyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/anyremote.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- anyremote.spec	6 Aug 2008 21:11:03 -0000	1.5
+++ anyremote.spec	9 Sep 2008 17:08:03 -0000	1.6
@@ -1,12 +1,12 @@
 Summary: Remote control through bluetooth or IR connection
 Name: anyremote
-Version: 4.7.1
+Version: 4.8.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
 URL: http://anyremote.sourceforge.net/
-Requires: bc,anyremote-doc >= 4.2,anyremote-data >= 4.2
+Requires: bc,anyremote-data >= 4.2
 BuildRequires:bluez-libs-devel, libX11-devel, libXtst-devel, xorg-x11-proto-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -57,7 +57,16 @@
 %defattr(-,root,root,-)
 %doc %{_defaultdocdir}/%{name}
 
+
 %changelog
+
+* Tue Sep 9 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.8.1-1
+- Small corrections.
+
+* Thu Sep 4 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.8-1
+- Added configuration file for gThumb.
+  Added GuiDescription field to configuration files.
+
 * Thu Aug 7 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.7.1-1
 - Fix crash issue if no bluetooth service runned
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Aug 2008 21:11:03 -0000	1.6
+++ sources	9 Sep 2008 17:08:03 -0000	1.7
@@ -1 +1 @@
-bd177156faa8a59a5d3e02cada243fc3  anyremote-4.7.1.tar.gz
+1cb017bce0775da5bb8e71abf819e01b  anyremote-4.8.1.tar.gz



From anyremote at fedoraproject.org  Tue Sep  9 17:08:55 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Tue,  9 Sep 2008 17:08:55 +0000 (UTC)
Subject: rpms/anyremote/F-9 import.log, NONE, 1.1 .cvsignore, 1.6,
	1.7 anyremote.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <20080909170855.E2FD37012A@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27736/F-9

Modified Files:
	.cvsignore anyremote.spec sources 
Added Files:
	import.log 
Log Message:
build


--- NEW FILE import.log ---
anyremote-4_8_1-1_fc9:F-9:anyremote-4.8.1-1.fc9.src.rpm:1220980093


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Aug 2008 21:09:33 -0000	1.6
+++ .cvsignore	9 Sep 2008 17:08:25 -0000	1.7
@@ -1 +1 @@
-anyremote-4.7.1.tar.gz
+anyremote-4.8.1.tar.gz


Index: anyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-9/anyremote.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- anyremote.spec	6 Aug 2008 21:09:34 -0000	1.5
+++ anyremote.spec	9 Sep 2008 17:08:25 -0000	1.6
@@ -1,12 +1,12 @@
 Summary: Remote control through bluetooth or IR connection
 Name: anyremote
-Version: 4.7.1
+Version: 4.8.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
 URL: http://anyremote.sourceforge.net/
-Requires: bc,anyremote-doc >= 4.2,anyremote-data >= 4.2
+Requires: bc,anyremote-data >= 4.2
 BuildRequires:bluez-libs-devel, libX11-devel, libXtst-devel, xorg-x11-proto-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -57,7 +57,16 @@
 %defattr(-,root,root,-)
 %doc %{_defaultdocdir}/%{name}
 
+
 %changelog
+
+* Tue Sep 9 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.8.1-1
+- Small corrections.
+
+* Thu Sep 4 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.8-1
+- Added configuration file for gThumb.
+  Added GuiDescription field to configuration files.
+
 * Thu Aug 7 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.7.1-1
 - Fix crash issue if no bluetooth service runned
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Aug 2008 21:09:34 -0000	1.6
+++ sources	9 Sep 2008 17:08:25 -0000	1.7
@@ -1 +1 @@
-bd177156faa8a59a5d3e02cada243fc3  anyremote-4.7.1.tar.gz
+1cb017bce0775da5bb8e71abf819e01b  anyremote-4.8.1.tar.gz



From mso at fedoraproject.org  Tue Sep  9 17:15:01 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Tue,  9 Sep 2008 17:15:01 +0000 (UTC)
Subject: rpms/gxine/EL-5 gxine.spec,1.15,1.16
Message-ID: <20080909171501.CC1D77012A@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/gxine/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29125

Modified Files:
	gxine.spec 
Log Message:


Add --rpath for libmozjs.so (for some reason it's not shared).




Index: gxine.spec
===================================================================
RCS file: /cvs/extras/rpms/gxine/EL-5/gxine.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gxine.spec	9 Sep 2008 15:21:25 -0000	1.15
+++ gxine.spec	9 Sep 2008 17:14:31 -0000	1.16
@@ -1,3 +1,6 @@
+%define gecko_stable_ver 1.9
+%define xul_mozjs_path %{_libdir}/xulrunner-%{gecko_stable_ver}
+
 Name:           gxine
 Version:        0.5.11
 Release:        17%{?dist}
@@ -13,7 +16,7 @@
 Patch1:         gxine-0.5.11-keep-wnd-state.patch
 
 
-BuildRequires:  gecko-devel >= 1.9
+BuildRequires:  gecko-devel >= %{gecko_stable_ver}
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gtk2-devel
@@ -32,7 +35,7 @@
 BuildRequires:  libXaw-devel
 BuildRequires:  nspr-devel
 
-Requires:       gecko-libs >= 1.9
+Requires:       gecko-libs >= %{gecko_stable_ver}
 
 %description
 gxine is a fully-featured free audio/video player for unix-like systems which
@@ -62,6 +65,7 @@
 
 %build
 %configure --with-dbus --with-logo-format=image --with-browser-plugin --disable-integration-wizard
+%{__sed} -i 's at LDFLAGS = -Wl,--as-needed at LDFLAGS = -Wl,--as-needed,--rpath=%{xul_mozjs_path}@' src/Makefile
 
 make %{?_smp_mflags}
 
@@ -126,6 +130,7 @@
 - use correct xulrunner (build)require
 - rebuild (-16 release blocks xulrunner update)
 - add dbus-devel BR (broken dbus-glib-devel deps)
+- add --rpath to LDFLAGS, so that it finds libmozjs.so correctly
 
 * Thu Jul 17 2008 Martin Sourada <martin.sourada at gmail.com> - 0.5.11-16
 - rebuild for xulrunner in EPEL 5



From anyremote at fedoraproject.org  Tue Sep  9 17:17:26 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Tue,  9 Sep 2008 17:17:26 +0000 (UTC)
Subject: rpms/anyremote/F-8 import.log, NONE, 1.1 .cvsignore, 1.6,
	1.7 anyremote.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <20080909171726.242877012A@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30200/F-8

Modified Files:
	.cvsignore anyremote.spec sources 
Added Files:
	import.log 
Log Message:
build


--- NEW FILE import.log ---
anyremote-4_8_1-1_fc9:F-8:anyremote-4.8.1-1.fc9.src.rpm:1220980552


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-8/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Aug 2008 21:11:03 -0000	1.6
+++ .cvsignore	9 Sep 2008 17:16:54 -0000	1.7
@@ -1 +1 @@
-anyremote-4.7.1.tar.gz
+anyremote-4.8.1.tar.gz


Index: anyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-8/anyremote.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- anyremote.spec	6 Aug 2008 21:11:03 -0000	1.5
+++ anyremote.spec	9 Sep 2008 17:16:55 -0000	1.6
@@ -1,12 +1,12 @@
 Summary: Remote control through bluetooth or IR connection
 Name: anyremote
-Version: 4.7.1
+Version: 4.8.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
 URL: http://anyremote.sourceforge.net/
-Requires: bc,anyremote-doc >= 4.2,anyremote-data >= 4.2
+Requires: bc,anyremote-data >= 4.2
 BuildRequires:bluez-libs-devel, libX11-devel, libXtst-devel, xorg-x11-proto-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -57,7 +57,16 @@
 %defattr(-,root,root,-)
 %doc %{_defaultdocdir}/%{name}
 
+
 %changelog
+
+* Tue Sep 9 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.8.1-1
+- Small corrections.
+
+* Thu Sep 4 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.8-1
+- Added configuration file for gThumb.
+  Added GuiDescription field to configuration files.
+
 * Thu Aug 7 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.7.1-1
 - Fix crash issue if no bluetooth service runned
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Aug 2008 21:11:03 -0000	1.6
+++ sources	9 Sep 2008 17:16:55 -0000	1.7
@@ -1 +1 @@
-bd177156faa8a59a5d3e02cada243fc3  anyremote-4.7.1.tar.gz
+1cb017bce0775da5bb8e71abf819e01b  anyremote-4.8.1.tar.gz



From nhorman at fedoraproject.org  Tue Sep  9 17:36:49 2008
From: nhorman at fedoraproject.org (Neil Horman)
Date: Tue,  9 Sep 2008 17:36:49 +0000 (UTC)
Subject: rpms/coda/F-9 coda.spec,1.4,1.5
Message-ID: <20080909173649.E04107012A@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/coda/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3061

Modified Files:
	coda.spec 
Log Message:
Resolves: bz 461041


Index: coda.spec
===================================================================
RCS file: /cvs/extras/rpms/coda/F-9/coda.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- coda.spec	29 May 2008 18:34:16 -0000	1.4
+++ coda.spec	9 Sep 2008 17:36:19 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           coda
 Version:        6.9.4
-Release:        0.1.%{rcver}%{?dist}
+Release:        0.2.%{rcver}%{?dist}
 Summary:        Coda distributed file system
 Group:          System Environment/Daemons
 License:        GPLv2
@@ -17,7 +17,10 @@
 Patch2:         coda-6.9.3-client-fhs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  lwp-devel rpc2-devel rvm-devel rvm-tools readline-devel
-BuildRequires:  fltk-devel fltk-fluid flex bison python perl
+BuildRequires:  fltk-devel fltk-fluid flex bison python perl krb5-devel
+BuildRequires:	e2fsprogs-devel
+Requires:	krb5-libs
+
 # For /etc/rc.d/init.d so that configure can detect we have RH style init
 BuildRequires:  chkconfig
 
@@ -83,8 +86,9 @@
 
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
-%configure --with-vcodacon
+export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -I/usr/include/et"
+export LIBS="-lkrb5 -lcom_err -lstdc++"
+%configure --with-vcodacon --with-krb5
 make %{?_smp_mflags}
 
 
@@ -288,6 +292,9 @@
 
 
 %changelog
+* Tue Sep 09 2008 Neil Horman <nhorman at redhat.com> 6.9.4-0.2.rc2
+- Enabling krb5 support (bz 461041)
+
 * Thu May 29 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 6.9.4-0.1.rc2
 - Update to 6.9.4~rc2 (bz 448749)
 



From spot at fedoraproject.org  Tue Sep  9 17:41:08 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 17:41:08 +0000 (UTC)
Subject: rpms/xmms-skins/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xmms-skins.spec, 1.2, 1.3
Message-ID: <20080909174108.E1C4E7012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xmms-skins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4182

Modified Files:
	.cvsignore sources xmms-skins.spec 
Log Message:
readd some of the removed skins, heard from various upstream authors


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmms-skins/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Sep 2008 15:01:48 -0000	1.3
+++ .cvsignore	9 Sep 2008 17:40:38 -0000	1.4
@@ -5,3 +5,8 @@
 Cyrus-XMMS.zip
 GTK+.zip
 Marble.zip
+detone_blue.zip
+detone_green.zip
+Inverse.zip
+sinistar.zip
+titanium.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmms-skins/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Sep 2008 15:01:48 -0000	1.3
+++ sources	9 Sep 2008 17:40:38 -0000	1.4
@@ -5,3 +5,8 @@
 2a2d45538fd2b2d809bed4dee9529a4c  Cyrus-XMMS.zip
 b184bd452ee51ff14e0a60b0eba6c36b  GTK+.zip
 2a4040a1f07b89e708e5e9ea808045ae  Marble.zip
+b28ae05125a30b29372dc91a20b29d0a  detone_blue.zip
+d3d5e43860db73a73b37a4949eebfe4f  detone_green.zip
+d36479a4b55384af8e873c783f48ddc2  Inverse.zip
+1d2b8c189ce9d5b2ee52cc79a3a2c436  sinistar.zip
+a38d448ac059f42bd32e52f3999a6ca5  titanium.zip


Index: xmms-skins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmms-skins/devel/xmms-skins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmms-skins.spec	7 Sep 2008 15:01:48 -0000	1.2
+++ xmms-skins.spec	9 Sep 2008 17:40:38 -0000	1.3
@@ -1,9 +1,9 @@
 Summary: Skins for the X MultiMedia System
 Name: xmms-skins
 Version: 1.2.10
-Release: 16
+Release: 17
 Epoch: 1
-License: MIT and GPL+ and Copyright only
+License: MIT and GPL+ and Copyright only and CC-BY
 Group: Applications/Multimedia
 URL: http://www.xmms.org/
 # Yes, this is painful, but I need to do it for license tracking.
@@ -31,24 +31,24 @@
 # GPL, according to freshmeat page created by author:
 # http://freshmeat.net/projects/cyrus/
 Source10: http://xmms.org/files/Skins/Cyrus-XMMS.zip
-# Emailed author
-# Source11: http://xmms.org/files/Skins/detone_blue.zip
-# Source12: http://xmms.org/files/Skins/detone_green.zip
+# Author (Thomas Seifried) says CC-BY is the License (confirmed via email)
+Source11: http://xmms.org/files/Skins/detone_blue.zip
+Source12: http://xmms.org/files/Skins/detone_green.zip
 # Emailed author
 # Source13: http://xmms.org/files/Skins/fyre.zip
 # GPL+
 Source14: http://xmms.org/files/Skins/GTK+.zip
-# Emailed author
-# Source15: http://xmms.org/files/Skins/Inverse.zip
+# Author (Merlijn van der Mee) says CC-BY is the License (confirmed via email)
+Source15: http://xmms.org/files/Skins/Inverse.zip
 # Derived from E theme, which is under GPL
 # http://ftp.univie.ac.at/pub/FreeBSD/ports/local-distfiles/vanilla/Marble.etheme
 Source16: http://xmms.org/files/Skins/Marble.zip
 # No idea who made this. No License.
 # Source17: http://xmms.org/files/Skins/Panic.zip
-# Emailed author
-# Source18: http://xmms.org/files/Skins/sinistar.zip
-# Emailed author
-# Source19: http://xmms.org/files/Skins/titanium.zip
+# Author (Paul Rahme) gives permission for use under CC-BY (confirmed via email)
+Source18: http://xmms.org/files/Skins/sinistar.zip
+# Author (Anders Berg-Hansen) says CC-BY is the License (confirmed via email)
+Source19: http://xmms.org/files/Skins/titanium.zip
 # Emailed author
 # Source20: http://xmms.org/files/Skins/Ultrafina-pw.zip
 # Source21: http://xmms.org/files/Skins/UltrafinaSE.zip
@@ -75,7 +75,8 @@
 
 %prep
 %setup -q -T -c -n %{name}-%{version}
-cp %{SOURCE1} %{SOURCE5} %{SOURCE6} %{SOURCE8} %{SOURCE10} %{SOURCE14} %{SOURCE16} .
+cp %{SOURCE1} %{SOURCE5} %{SOURCE6} %{SOURCE8} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
+   %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE18} %{SOURCE19} .
 
 
 %build
@@ -97,6 +98,9 @@
 
 
 %changelog
+* Tue Sep  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1:1.2.10-17
+- got some responses from skin creators, readded some of the removed skins
+
 * Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1:1.2.10-16
 - fix license tag, remove skins where licensing is unclear
 



From rathann at fedoraproject.org  Tue Sep  9 17:48:05 2008
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Tue,  9 Sep 2008 17:48:05 +0000 (UTC)
Subject: rpms/libdvdread/devel .cvsignore, 1.4, 1.5 libdvdread.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20080909174805.36CA17012A@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/libdvdread/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6243

Modified Files:
	.cvsignore libdvdread.spec sources 
Log Message:
* Tue Sep 09 2008 Dominik Mierzejewski <rpm at greysector.net> 4.1.3-1
- update to 4.1.3 final



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Aug 2008 11:53:51 -0000	1.4
+++ .cvsignore	9 Sep 2008 17:47:34 -0000	1.5
@@ -1 +1 @@
-libdvdread-4.1.3rc1.tar.bz2
+libdvdread-4.1.3.tar.bz2


Index: libdvdread.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/devel/libdvdread.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libdvdread.spec	31 Aug 2008 12:22:48 -0000	1.7
+++ libdvdread.spec	9 Sep 2008 17:47:34 -0000	1.8
@@ -1,13 +1,13 @@
 Name:           libdvdread
 Version:        4.1.3
-Release:        0.3.rc1%{?dist}
+Release:        1%{?dist}
 Summary:        A library for reading DVD video discs based on Ogle code
 
 Group:          System Environment/Libraries
 License:        GPLv2+
-#Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdread-%{version}.tar.gz
+Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdread-%{version}.tar.bz2
 # svn export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread
-Source:         %{name}-4.1.3rc1.tar.bz2
+#Source:         %{name}-4.1.3rc1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -64,6 +64,9 @@
 %{_libdir}/pkgconfig/dvdread.pc
 
 %changelog
+* Tue Sep 09 2008 Dominik Mierzejewski <rpm at greysector.net> 4.1.3-1
+- update to 4.1.3 final
+
 * Sun Aug 31 2008 Dominik Mierzejewski <rpm at greysector.net> 4.1.3-0.3.rc1
 - update to 4.1.3rc1
 - fix include path


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Aug 2008 11:53:51 -0000	1.5
+++ sources	9 Sep 2008 17:47:34 -0000	1.6
@@ -1 +1 @@
-77405d355ba1d79de6b0cf29c51c7545  libdvdread-4.1.3rc1.tar.bz2
+6dc068d442c85a3cdd5ad3da75f6c6e8  libdvdread-4.1.3.tar.bz2



From rathann at fedoraproject.org  Tue Sep  9 17:51:57 2008
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Tue,  9 Sep 2008 17:51:57 +0000 (UTC)
Subject: rpms/libdvdnav/devel .cvsignore, 1.6, 1.7 libdvdnav.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <20080909175157.CFD3E7012A@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/libdvdnav/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7390

Modified Files:
	.cvsignore libdvdnav.spec sources 
Log Message:
* Tue Sep 09 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.3-1
- update to 4.1.3 final



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdnav/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Aug 2008 11:57:27 -0000	1.6
+++ .cvsignore	9 Sep 2008 17:51:27 -0000	1.7
@@ -1 +1 @@
-libdvdnav-4.1.3rc1.tar.bz2
+libdvdnav-4.1.3.tar.bz2


Index: libdvdnav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdnav/devel/libdvdnav.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libdvdnav.spec	31 Aug 2008 11:57:27 -0000	1.12
+++ libdvdnav.spec	9 Sep 2008 17:51:27 -0000	1.13
@@ -1,13 +1,13 @@
 Name:           libdvdnav
 Version:        4.1.3
-Release:        0.4.rc1%{?dist}
+Release:        1%{?dist}
 Summary:        A library for reading DVD video discs based on Ogle code
 
 Group:          System Environment/Libraries
 License:        GPLv2+
-#Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-%{version}.tar.gz
+Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-%{version}.tar.bz2
 # svn export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav
-Source:         %{name}-4.1.3rc1.tar.bz2
+#Source:         %{name}-4.1.3rc1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  doxygen
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/dvdnavmini.pc
 
 %changelog
+* Tue Sep 09 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.3-1
+- update to 4.1.3 final
+
 * Sun Aug 31 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.3-0.4.rc1
 - update to 4.1.3rc1
 - require libdvdread with fixed API


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdnav/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Aug 2008 11:57:27 -0000	1.6
+++ sources	9 Sep 2008 17:51:27 -0000	1.7
@@ -1 +1 @@
-5fcf0d6a8fa7303b2293b3c253bd60f1  libdvdnav-4.1.3rc1.tar.bz2
+d62383c45b28816771e283515f2c27fa  libdvdnav-4.1.3.tar.bz2



From orion at fedoraproject.org  Tue Sep  9 18:00:12 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue,  9 Sep 2008 18:00:12 +0000 (UTC)
Subject: rpms/octave-forge/devel .cvsignore,1.13,1.14 sources,1.13,1.14
Message-ID: <20080909180013.01E927012A@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9689

Modified Files:
	.cvsignore sources 
Log Message:
Upload the right source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	9 Sep 2008 14:37:24 -0000	1.13
+++ .cvsignore	9 Sep 2008 17:59:42 -0000	1.14
@@ -1 +1 @@
-octave-forge-bundle-20080831.tar.gz
+octave-forge-bundle-20080831.patched.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	9 Sep 2008 14:37:24 -0000	1.13
+++ sources	9 Sep 2008 17:59:42 -0000	1.14
@@ -1 +1 @@
-680ea705eb7434e219eb4a3eaffd7fba  octave-forge-bundle-20080831.tar.gz
+5df8ff572c9b990e404ba94a6724c898  octave-forge-bundle-20080831.patched.tar.gz



From orion at fedoraproject.org  Tue Sep  9 18:09:35 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue,  9 Sep 2008 18:09:35 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge.spec,1.60,1.61
Message-ID: <20080909180935.100227012A@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11805

Modified Files:
	octave-forge.spec 
Log Message:
Document why we don't build jhandles



Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- octave-forge.spec	9 Sep 2008 14:37:24 -0000	1.60
+++ octave-forge.spec	9 Sep 2008 18:09:04 -0000	1.61
@@ -110,7 +110,7 @@
 rm main/video-*.tar.gz
 # 2. engine is not a real octave package
 rm extra/engine-*.tar.gz
-# 3. can't handle jhandles yet
+# 3. jhandles depends on jogl, which is forbidden from Fedora
 rm extra/jhandles-*.tar.gz
 # 4. other OS stuff
 rm extra/windows-*.tar.gz



From spot at fedoraproject.org  Tue Sep  9 18:17:04 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 18:17:04 +0000 (UTC)
Subject: rpms/themes-backgrounds-gnome/devel .cvsignore, 1.4, 1.5 sources,
	1.4, 1.5 themes-backgrounds-gnome.spec, 1.15,
	1.16 themes-backgrounds-gnome.xml, 1.2, 1.3
Message-ID: <20080909181704.5049F7012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/themes-backgrounds-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13377

Modified Files:
	.cvsignore sources themes-backgrounds-gnome.spec 
	themes-backgrounds-gnome.xml 
Log Message:
update to 0.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/themes-backgrounds-gnome/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Sep 2008 20:58:19 -0000	1.4
+++ .cvsignore	9 Sep 2008 18:16:33 -0000	1.5
@@ -1 +1 @@
-themes-backgrounds-gnome-0.5.tar.bz2
+themes-backgrounds-gnome-0.5.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/themes-backgrounds-gnome/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Sep 2008 20:58:19 -0000	1.4
+++ sources	9 Sep 2008 18:16:33 -0000	1.5
@@ -1 +1 @@
-f565ba06bc85f889d4bb6e86b5c2c1e8  themes-backgrounds-gnome-0.5.tar.bz2
+9a9a6a492dfea08973fc4fbabaecb45f  themes-backgrounds-gnome-0.5.1.tar.bz2


Index: themes-backgrounds-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/themes-backgrounds-gnome/devel/themes-backgrounds-gnome.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- themes-backgrounds-gnome.spec	8 Sep 2008 20:58:19 -0000	1.15
+++ themes-backgrounds-gnome.spec	9 Sep 2008 18:16:33 -0000	1.16
@@ -1,6 +1,6 @@
 Summary:        Assorted Backgrounds from art.gnome.org
 Name:           themes-backgrounds-gnome
-Version:        0.5
+Version:        0.5.1
 Release:        1%{?dist}
 # See LICENSING.txt for details and attribution
 License:        GPL+ and LGPL+ and CC-BY and CC-BY-SA and CC-BY-ND and Public Domain
@@ -38,6 +38,9 @@
 %{_datadir}/gnome-background-properties/themes-backgrounds-gnome.xml
 
 %changelog
+* Tue Sep  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.1-1
+- add GNOME-Transparent back, author gives permission to use under CC-BY-SA
+
 * Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5-1
 - massive licensing audit, some files removed, licensing attribution done 
   properly


Index: themes-backgrounds-gnome.xml
===================================================================
RCS file: /cvs/pkgs/rpms/themes-backgrounds-gnome/devel/themes-backgrounds-gnome.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- themes-backgrounds-gnome.xml	8 Sep 2008 20:58:19 -0000	1.2
+++ themes-backgrounds-gnome.xml	9 Sep 2008 18:16:33 -0000	1.3
@@ -122,6 +122,14 @@
     <scolor>#000000</scolor>
   </wallpaper>
   <wallpaper>
+    <name>GNOME-Transparent_1280x1024.png</name>
+    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Transparent_1280x1024.png</filename>
+    <options>stretched</options>
+    <shade_type>solid</shade_type>
+    <pcolor>#FFFFFF</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+  <wallpaper>
     <name>GNOME-YellowCosmos.jpg</name>
     <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-YellowCosmos.jpg</filename>
     <options>stretched</options>



From lennart at fedoraproject.org  Tue Sep  9 18:35:00 2008
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue,  9 Sep 2008 18:35:00 +0000 (UTC)
Subject: rpms/pulseaudio/devel pulseaudio.spec,1.52,1.53
Message-ID: <20080909183500.060097012A@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17537

Modified Files:
	pulseaudio.spec 
Log Message:
Ship /var/lib/pulse in the RPM


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- pulseaudio.spec	9 Sep 2008 16:43:07 -0000	1.52
+++ pulseaudio.spec	9 Sep 2008 18:34:29 -0000	1.53
@@ -3,7 +3,7 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.12
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -202,6 +202,7 @@
 touch -r man/default.pa.5.xml.in $RPM_BUILD_ROOT%{_mandir}/man5/default.pa.5
 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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -405,6 +406,9 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Tue Sep 9 2008 Lennart Poettering <lpoetter at redhat.com> 0.9.12-4
+- Ship /var/lib/pulse in the RPM
+
 * Tue Sep 9 2008 Lennart Poettering <lpoetter at redhat.com> 0.9.12-3
 - Don't remove pulse users/groups on package removal
 



From claudiotomasoni at fedoraproject.org  Tue Sep  9 18:44:08 2008
From: claudiotomasoni at fedoraproject.org (Claudio Tomasoni)
Date: Tue,  9 Sep 2008 18:44:08 +0000 (UTC)
Subject: rpms/tennix/devel import.log, NONE, 1.1 tennix.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080909184408.424E67012A@cvs1.fedora.phx.redhat.com>

Author: claudiotomasoni

Update of /cvs/pkgs/rpms/tennix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19444/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tennix.spec 
Log Message:



--- NEW FILE import.log ---
tennix-0_6_1-4_fc9:HEAD:tennix-0.6.1-4.fc9.src.rpm:1220985773


--- NEW FILE tennix.spec ---
Name:           tennix
Version:        0.6.1
Release:        4%{?dist}
Summary:        A simple tennis game

Group:          Amusements/Games
License:        GPLv2+
URL:            http://icculus.org/tennix/
Source0:        http://icculus.org/tennix/releases/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  SDL-devel, SDL_mixer-devel SDL_image-devel
BuildRequires:  desktop-file-utils


%description
Tennix! is a SDL port of a simple tennis game.
It features a two-player game mode and a single-player mode
against the computer.


%prep
%setup -q
sed -i -e 's/install -s/install/' makefile
sed -i -e 's/install -m/install -p -m/' makefile


%build
CFLAGS="%{optflags}" make
# Usage of smp_mflags causes compilation to fail
# make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
PREFIX=%{_prefix} make install DESTDIR=$RPM_BUILD_ROOT

# Remove executable flag from man page
chmod a-x $RPM_BUILD_ROOT/%{_mandir}/man6/%{name}.*

desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications           \
                     --vendor fedora                                         \
                     --delete-original                                       \
                     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc README COPYING ChangeLog TODO
%{_bindir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/pixmaps/%{name}.png
%{_mandir}/man6/%{name}.*


%changelog
* Wed Aug 27 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.6.1-4
- updated Summary
- fixed filename in SOURCE
- fixed paths in install section
- fixed icon caching after installing and uninstalling
- fixed timestamps preservation in prep section

* Sun Aug 24 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.6.1-3
- fixed .desktop file name in files section

* Mon May 12 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.6.1-2
- make install doesn't strip binaries
- make uses OPTFLAGS

* Wed May  7 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.6.1-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tennix/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:36:58 -0000	1.1
+++ .cvsignore	9 Sep 2008 18:43:37 -0000	1.2
@@ -0,0 +1 @@
+tennix-0.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tennix/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:36:58 -0000	1.1
+++ sources	9 Sep 2008 18:43:37 -0000	1.2
@@ -0,0 +1 @@
+5979d0e3f683808ad492a0691430f259  tennix-0.6.1.tar.gz



From dwalsh at fedoraproject.org  Tue Sep  9 18:45:56 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  9 Sep 2008 18:45:56 +0000 (UTC)
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.162,
	1.163 libselinux.spec, 1.338, 1.339
Message-ID: <20080909184556.847FE7012A@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20052

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.71-2
- Add missing man page links for [lf]getfilecon


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- libselinux-rhat.patch	5 Aug 2008 14:30:33 -0000	1.162
+++ libselinux-rhat.patch	9 Sep 2008 18:45:25 -0000	1.163
@@ -1,6 +1,16 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.70/man/man8/selinuxconlist.8
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/fgetfilecon.3 libselinux-2.0.71/man/man3/fgetfilecon.3
+--- nsalibselinux/man/man3/fgetfilecon.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/fgetfilecon.3	2008-09-09 14:30:58.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/getfilecon.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/lgetfilecon.3 libselinux-2.0.71/man/man3/lgetfilecon.3
+--- nsalibselinux/man/man3/lgetfilecon.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/lgetfilecon.3	2008-09-09 14:30:43.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/getfilecon.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.71/man/man8/selinuxconlist.8
 --- nsalibselinux/man/man8/selinuxconlist.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.70/man/man8/selinuxconlist.8	2008-08-01 06:51:25.000000000 -0400
++++ libselinux-2.0.71/man/man8/selinuxconlist.8	2008-08-13 09:01:48.000000000 -0400
 @@ -0,0 +1,18 @@
 +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -20,9 +30,9 @@
 +
 +.SH "SEE ALSO"
 +secon(8), selinuxdefcon(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.70/man/man8/selinuxdefcon.8
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.71/man/man8/selinuxdefcon.8
 --- nsalibselinux/man/man8/selinuxdefcon.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.70/man/man8/selinuxdefcon.8	2008-08-01 06:51:25.000000000 -0400
++++ libselinux-2.0.71/man/man8/selinuxdefcon.8	2008-08-13 09:01:48.000000000 -0400
 @@ -0,0 +1,19 @@
 +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -43,9 +53,9 @@
 +
 +.SH "SEE ALSO"
 +secon(8), selinuxconlist(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.70/src/callbacks.c
---- nsalibselinux/src/callbacks.c	2008-06-12 23:25:14.000000000 -0400
-+++ libselinux-2.0.70/src/callbacks.c	2008-08-01 06:51:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.71/src/callbacks.c
+--- nsalibselinux/src/callbacks.c	2008-08-28 09:34:24.000000000 -0400
++++ libselinux-2.0.71/src/callbacks.c	2008-08-13 09:01:48.000000000 -0400
 @@ -16,6 +16,7 @@
  {
  	int rc;
@@ -54,9 +64,9 @@
  	va_start(ap, fmt);
  	rc = vfprintf(stderr, fmt, ap);
  	va_end(ap);
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.70/src/matchpathcon.c
---- nsalibselinux/src/matchpathcon.c	2008-06-12 23:25:14.000000000 -0400
-+++ libselinux-2.0.70/src/matchpathcon.c	2008-08-01 06:51:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.71/src/matchpathcon.c
+--- nsalibselinux/src/matchpathcon.c	2008-08-28 09:34:24.000000000 -0400
++++ libselinux-2.0.71/src/matchpathcon.c	2008-08-13 09:01:48.000000000 -0400
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- libselinux.spec	5 Aug 2008 14:05:15 -0000	1.338
+++ libselinux.spec	9 Sep 2008 18:45:26 -0000	1.339
@@ -5,7 +5,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.71
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -152,6 +152,9 @@
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.71-2
+- Add missing man page links for [lf]getfilecon
+
 * Tue Aug 5 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.71-1
 - Update to Upstream
 	* Add group support to seusers using %groupname syntax from Dan Walsh.



From nsantos at fedoraproject.org  Tue Sep  9 19:05:26 2008
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Tue,  9 Sep 2008 19:05:26 +0000 (UTC)
Subject: rpms/qpidc/devel .cvsignore, 1.7, 1.8 qpidc.spec, 1.37, 1.38 sources,
	1.23, 1.24
Message-ID: <20080909190526.DCEF27012A@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27719

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
include latest qmf changes


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Sep 2008 16:56:54 -0000	1.7
+++ .cvsignore	9 Sep 2008 19:04:56 -0000	1.8
@@ -1 +1 @@
-qpidc-0.3.693140.tar.gz
+qpidc-0.3.693548.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- qpidc.spec	8 Sep 2008 17:49:24 -0000	1.37
+++ qpidc.spec	9 Sep 2008 19:04:56 -0000	1.38
@@ -5,7 +5,7 @@
 #
 %define qpidd qpidd
 %define qmf qmf
-%define svnrev 693140
+%define svnrev 693548
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
@@ -269,6 +269,9 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Sep  9 2008 Nuno Santos <nsantos at redhat.com> - 0.3.693548-1
+- Include latest changes to qmf
+
 * Mon Sep  8 2008 Nuno Santos <nsantos at redhat.com> - 0.3.693140-1
 - Update for Fedora 10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	8 Sep 2008 16:56:54 -0000	1.23
+++ sources	9 Sep 2008 19:04:56 -0000	1.24
@@ -1 +1 @@
-ebb62fc8ad2143ae7a2cc9a104f5eff1  qpidc-0.3.693140.tar.gz
+ec77ffb74ed8ac0e26ddb7b5017e17e5  qpidc-0.3.693548.tar.gz



From dwalsh at fedoraproject.org  Tue Sep  9 19:08:03 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  9 Sep 2008 19:08:03 +0000 (UTC)
Subject: rpms/libselinux/devel libselinux.spec,1.339,1.340
Message-ID: <20080909190803.4ECE57012A@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28475

Modified Files:
	libselinux.spec 
Log Message:
* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.71-3
- Split out utilities



Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- libselinux.spec	9 Sep 2008 18:45:26 -0000	1.339
+++ libselinux.spec	9 Sep 2008 19:07:33 -0000	1.340
@@ -5,7 +5,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.71
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -31,6 +31,14 @@
 process and file security contexts and to obtain security policy
 decisions.  Required for any applications that use the SELinux API.
 
+%package utils
+Summary: SELinux libselinux utilies
+Group: Development/Libraries
+Requires: libselinux = %{version}-%{release} 
+
+%description utils
+The libselinux-utils package contains the utilities
+
 %package python
 Summary: SELinux python bindings for libselinux
 Group: Development/Libraries
@@ -118,6 +126,10 @@
 %files
 %defattr(-,root,root,-)
 /%{_lib}/libselinux.so.*
+/var/run/setrans
+
+%files utils
+%defattr(-,root,root,-)
 %{_sbindir}/avcstat
 %{_sbindir}/getenforce
 %{_sbindir}/getsebool
@@ -129,7 +141,6 @@
 %{_sbindir}/togglesebool
 %{_mandir}/man5/*
 %{_mandir}/man8/*
-/var/run/setrans
 
 %files devel
 %defattr(-,root,root,-)
@@ -152,6 +163,9 @@
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.71-3
+- Split out utilities
+
 * Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.71-2
 - Add missing man page links for [lf]getfilecon
 



From dwalsh at fedoraproject.org  Tue Sep  9 19:14:40 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  9 Sep 2008 19:14:40 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.75,
	1.76 policycoreutils.spec, 1.555, 1.556
Message-ID: <20080909191440.3BEAE7012A@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30186

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-7
- Change Requires line to gnome-python2-gnome
- Fix spelling mistakes
- Require libselinux-utils


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- policycoreutils-gui.patch	9 Sep 2008 16:18:36 -0000	1.75
+++ policycoreutils-gui.patch	9 Sep 2008 19:14:39 -0000	1.76
@@ -5579,7 +5579,7 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.55/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/polgen.py	2008-09-09 12:11:25.000000000 -0400
++++ policycoreutils-2.0.55/gui/polgen.py	2008-09-09 13:21:29.000000000 -0400
 @@ -0,0 +1,925 @@
 +#!/usr/bin/python
 +#
@@ -5743,7 +5743,7 @@
 +                temp.append(p)
 +        return temp
 +    except ValueError:
-+        raise  ValueError(_("Ports must be be numbers or ranges of numbers from 1 to %d " % max_port ))
++        raise  ValueError(_("Ports must be numbers or ranges of numbers from 1 to %d " % max_port ))
 +
 +class policy:
 +


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -r1.555 -r1.556
--- policycoreutils.spec	9 Sep 2008 16:18:41 -0000	1.555
+++ policycoreutils.spec	9 Sep 2008 19:14:39 -0000	1.556
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.55
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -26,7 +26,7 @@
 
 BuildRequires: pam-devel libsepol-static >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver}  libcap-devel audit-libs-devel >=  %{libauditver} gettext
 Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff rpm /bin/sed 
-Requires: libselinux >=  %{libselinuxver} libsepol >= %{libsepolver} libsemanage-python >= %{libsemanagever} coreutils audit-libs-python >=  %{libauditver} checkpolicy libselinux-python
+Requires: libsepol >= %{libsepolver} libsemanage-python >= %{libsemanagever} coreutils audit-libs-python >=  %{libauditver} checkpolicy libselinux-python libselinux-utils >=  %{libselinuxver} 
 Requires(post): /sbin/service /sbin/chkconfig 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -109,7 +109,7 @@
 Summary: SELinux configuration GUI
 Group: System Environment/Base
 Requires: policycoreutils = %{version}-%{release} 
-Requires: gnome-python2, pygtk2, pygtk2-libglade, gnome-python2-canvas 
+Requires: gnome-python2-gnome, pygtk2, pygtk2-libglade, gnome-python2-canvas 
 Requires: usermode 
 Requires: setools-console
 Requires: selinux-policy-devel
@@ -192,8 +192,10 @@
 fi
 
 %changelog
-* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-6
-- Fix spelling mistake
+* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-7
+- Change Requires line to gnome-python2-gnome
+- Fix spelling mistakes
+- Require libselinux-utils
 
 * Mon Sep 8 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-5
 - Add node support to semanage



From rcritten at fedoraproject.org  Tue Sep  9 19:19:30 2008
From: rcritten at fedoraproject.org (Robert Crittenden)
Date: Tue,  9 Sep 2008 19:19:30 +0000 (UTC)
Subject: rpms/python-pyasn1/devel .cvsignore, 1.2, 1.3 python-pyasn1.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080909191930.534957012A@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/python-pyasn1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31363

Modified Files:
	.cvsignore python-pyasn1.spec sources 
Log Message:
Update to upstream version 0.0.8a



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-pyasn1/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jan 2008 14:09:39 -0000	1.2
+++ .cvsignore	9 Sep 2008 19:18:59 -0000	1.3
@@ -1 +1 @@
-pyasn1-0.0.7a.tar.gz
+pyasn1-0.0.8a.tar.gz


Index: python-pyasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/python-pyasn1/devel/python-pyasn1.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-pyasn1.spec	18 Jan 2008 14:09:39 -0000	1.1
+++ python-pyasn1.spec	9 Sep 2008 19:19:00 -0000	1.2
@@ -3,8 +3,8 @@
 %define module pyasn1
 
 Name:           python-pyasn1
-Version:        0.0.7a
-Release:        4%{?dist}
+Version:        0.0.8a
+Release:        1%{?dist}
 Summary:        ASN.1 tools for Python
 License:        BSD
 Group:          System Environment/Libraries
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Tue Sep  9 2008 Paul P. Komkoff Jr <i at stingr.net> - 0.0.8a-1
+- Update to upstream version 0.0.8a
+
 * Wed Jan 16 2008 Rob Crittenden <rcritten at redhat.com> - 0.0.7a-4
 - Use setuptools to install the package
 - simplify the files included in the rpm so it includes the .egg-info


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-pyasn1/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jan 2008 14:09:39 -0000	1.2
+++ sources	9 Sep 2008 19:19:00 -0000	1.3
@@ -1 +1 @@
-8dd0a5e1465ab3fd1b095aee812c2091  pyasn1-0.0.7a.tar.gz
+1befe83fd3d8dd8bb0d0fbe58a5788a5  pyasn1-0.0.8a.tar.gz



From krh at fedoraproject.org  Tue Sep  9 19:20:18 2008
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Tue,  9 Sep 2008 19:20:18 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-modeset.patch, 1.12,
	1.13 xorg-x11-drv-ati.spec, 1.110, 1.111
Message-ID: <20080909192018.614307012A@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32113

Modified Files:
	radeon-modeset.patch xorg-x11-drv-ati.spec 
Log Message:
* Tue Sep  9 2008 Kristian H??gsberg <krh at redhat.com> 6.9.0-11
- Restore CFLAGS after testing for DRM_MODE in radeon-modeset.patch.


radeon-modeset.patch:

Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- radeon-modeset.patch	27 Aug 2008 05:56:29 -0000	1.12
+++ radeon-modeset.patch	9 Sep 2008 19:20:18 -0000	1.13
@@ -2,7 +2,7 @@
 index b8c18a6..a7e954d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -115,6 +115,14 @@ if test "$DRI" = yes; then
+@@ -115,6 +115,15 @@ if test "$DRI" = yes; then
  	if test "$have_damage_h" = yes; then
  		AC_DEFINE(DAMAGE,1,[Use Damage extension])
  	fi
@@ -14,6 +14,7 @@
 +        if test "x$DRM_MODE" = xyes; then
 +                AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting])
 +        fi
++        CFLAGS="$save_CFLAGS"
  fi
  
  save_CFLAGS="$CFLAGS"


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.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- xorg-x11-drv-ati.spec	8 Sep 2008 19:20:47 -0000	1.110
+++ xorg-x11-drv-ati.spec	9 Sep 2008 19:20:18 -0000	1.111
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   10%{?dist}
+Release:   11%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -73,6 +73,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Sep  9 2008 Kristian H??gsberg <krh at redhat.com> 6.9.0-11
+- Restore CFLAGS after testing for DRM_MODE in radeon-modeset.patch.
+
 * Mon Sep 08 2008 Adam Jackson <ajax at redhat.com> 6.9.0-10
 - radeon-6.9.0-fb-size.patch: Yet more lame heuristics to preallocate a
   usable framebuffer for laptops. (#458864)



From allisson at fedoraproject.org  Tue Sep  9 19:26:02 2008
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Tue,  9 Sep 2008 19:26:02 +0000 (UTC)
Subject: rpms/ruby-gnome2/devel import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 ruby-gnome2.spec, 1.28, 1.29 sources, 1.3,
	1.4 ruby-gnome2-0.17.0-rc1-newgtk-021303.patch, 1.1, NONE
Message-ID: <20080909192602.519877012A@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/ruby-gnome2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1491/devel

Modified Files:
	.cvsignore ruby-gnome2.spec sources 
Added Files:
	import.log 
Removed Files:
	ruby-gnome2-0.17.0-rc1-newgtk-021303.patch 
Log Message:

- Update to 0.17.0
- Removed ruby-gnome2-0.17.0-rc1-newgtk-021303.patch



--- NEW FILE import.log ---
ruby-gnome2-0_17_0-1_fc9:HEAD:ruby-gnome2-0.17.0-1.fc9.src.rpm:1220988267


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-gnome2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Jun 2008 12:40:25 -0000	1.3
+++ .cvsignore	9 Sep 2008 19:25:31 -0000	1.4
@@ -1 +1 @@
-ruby-gnome2-0.17.0-rc1.tar.gz
+ruby-gnome2-all-0.17.0.tar.gz


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ruby-gnome2.spec	19 Jul 2008 02:55:00 -0000	1.28
+++ ruby-gnome2.spec	9 Sep 2008 19:25:32 -0000	1.29
@@ -11,18 +11,18 @@
 
 Name:           ruby-gnome2
 Version:        0.17.0
-Release:        0.4.%{betaver}%{?dist}
+Release:        1%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
 
 License:        LGPLv2
 URL:            http://ruby-gnome2.sourceforge.jp/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?betaver:-%betaver}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
 Patch14:        ruby-gnome2-all-0.16.0-xulrunner.patch
 # must be sent to upstream
-Patch15:        ruby-gnome2-0.17.0-rc1-newgtk-021303.patch
+#Patch15:        ruby-gnome2-0.17.0-rc1-newgtk-021303.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -484,12 +484,12 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?betaver:-%betaver}
+%setup -q -n %{name}-all-%{version}
 %patch0 -p1
 %if 0%{?fedora} >= 9
 %patch14 -p1 -b .xulrunner
 %endif
-%patch15 -p1 -b .newgtk
+# %patch15 -p1 -b .newgtk
 
 # Fix the attributes of some files
 # suppress lots of messages..
@@ -699,6 +699,11 @@
 
 
 %changelog
+
+* Tue Sep  9 2008 Allisson Azevedo <allisson at gmail.com> 0.17.0-1
+- Update to 0.17.0
+- Removed ruby-gnome2-0.17.0-rc1-newgtk-021303.patch
+
 * Sat Jul 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.17.0-0.4.rc1
 - F-9+: relax gecko libs dependency
 - F-9+: bump version to fix EVR problem between F-8 branch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-gnome2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Jun 2008 12:40:25 -0000	1.3
+++ sources	9 Sep 2008 19:25:32 -0000	1.4
@@ -1 +1 @@
-6d04af04c8674b0a88ce47e09dd26a76  ruby-gnome2-0.17.0-rc1.tar.gz
+cc54338888c487055670ee2898391caf  ruby-gnome2-all-0.17.0.tar.gz


--- ruby-gnome2-0.17.0-rc1-newgtk-021303.patch DELETED ---



From tgl at fedoraproject.org  Tue Sep  9 19:32:41 2008
From: tgl at fedoraproject.org (Tom Lane)
Date: Tue,  9 Sep 2008 19:32:41 +0000 (UTC)
Subject: rpms/libpng/devel libpng-ztxt-bug.patch, NONE, 1.1 libpng.spec, 1.46,
	1.47
Message-ID: <20080909193241.331437012A@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/libpng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3421

Modified Files:
	libpng.spec 
Added Files:
	libpng-ztxt-bug.patch 
Log Message:
Patch for CVE-2008-3964

libpng-ztxt-bug.patch:

--- NEW FILE libpng-ztxt-bug.patch ---
Patch for CVE-2008-3964


diff -ru4NwbB libpng-1.2.31/pngpread.c libpng-1.2.32beta01/pngpread.c
--- libpng-1.2.31/pngpread.c	2008-08-21 05:54:13.254898477 -0500
+++ libpng-1.2.32beta01/pngpread.c	2008-09-06 07:03:43.043602194 -0500
@@ -1278,9 +1278,9 @@
 
                tmp = text;
                text = (png_charp)png_malloc(png_ptr, text_size +
                   (png_uint_32)(png_ptr->zbuf_size 
-                  - png_ptr->zstream.avail_out));
+                  - png_ptr->zstream.avail_out + 1));
                png_memcpy(text, tmp, text_size);
                png_free(png_ptr, tmp);
                png_memcpy(text + text_size, png_ptr->zbuf,
                   png_ptr->zbuf_size - png_ptr->zstream.avail_out);


Index: libpng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpng/devel/libpng.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- libpng.spec	23 Aug 2008 21:07:16 -0000	1.46
+++ libpng.spec	9 Sep 2008 19:32:10 -0000	1.47
@@ -2,7 +2,7 @@
 Name: libpng
 Epoch: 2
 Version: 1.2.31
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: zlib
 Group: System Environment/Libraries
 URL: http://www.libpng.org/pub/png/
@@ -10,6 +10,7 @@
 Source: ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2
 Patch0: libpng-multilib.patch
 Patch1: libpng-pngconf.patch
+Patch2: libpng-ztxt-bug.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel
@@ -53,6 +54,7 @@
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -91,6 +93,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep  9 2008 Tom Lane <tgl at redhat.com> 2:1.2.31-2
+- Apply upstream patch for zTXT buffer overrun (CVE-2008-3964)
+Related: #461599
+
 * Sat Aug 23 2008 Tom Lane <tgl at redhat.com> 2:1.2.31-1
 - Update to libpng 1.2.31
 



From rmccabe at fedoraproject.org  Tue Sep  9 19:35:37 2008
From: rmccabe at fedoraproject.org (Ryan McCabe)
Date: Tue,  9 Sep 2008 19:35:37 +0000 (UTC)
Subject: rpms/ricci/devel .cvsignore, 1.2, 1.3 ricci.spec, 1.3, 1.4 sources, 
	1.3, 1.4
Message-ID: <20080909193537.749607012A@cvs1.fedora.phx.redhat.com>

Author: rmccabe

Update of /cvs/pkgs/rpms/ricci/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4214

Modified Files:
	.cvsignore ricci.spec sources 
Log Message:
Break circular dependency with cman



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 May 2008 18:19:57 -0000	1.2
+++ .cvsignore	9 Sep 2008 19:35:07 -0000	1.3
@@ -1 +1 @@
-ricci-0.13.0.tar.gz
+ricci-0.15.0.tar.gz


Index: ricci.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/devel/ricci.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ricci.spec	2 Jun 2008 15:16:55 -0000	1.3
+++ ricci.spec	9 Sep 2008 19:35:07 -0000	1.4
@@ -9,10 +9,10 @@
 ###############################################################################
 
 Name: ricci
-Version: 0.13.0
-Release: 4%{?dist}
+Version: 0.15.0
+Release: 1%{?dist}
 License: GPLv2
-URL: http://sources.redhat.com/cluster/
+URL: http://sources.redhat.com/cluster/conga/
 Group: System Environment/Base
 Summary: Remote Management System - Managed Station
 Summary: Remote Cluster and Storage Management System
@@ -28,7 +28,7 @@
 Requires: initscripts
 Requires: oddjob dbus openssl pam cyrus-sasl >= 2.1
 Requires: sed util-linux file
-Requires: modcluster >= 0.10.0
+
 # modstorage
 Requires: parted util-linux
 # modservice
@@ -69,6 +69,8 @@
 
 %files -n ricci
 %defattr(-,root,root)
+	%{_bindir}/ccs_sync
+
 # ricci
 %config(noreplace)	%{_sysconfdir}/pam.d/ricci
 %config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci.oddjob.conf
@@ -79,6 +81,7 @@
 %attr(-,root,ricci)	%{_libexecdir}/ricci/
 			%{_docdir}/ricci-%{version}/
 # modrpm
+
 %config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modrpm.oddjob.conf
 %config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modrpm.systembus.conf
 			%{_libexecdir}/ricci-modrpm
@@ -95,6 +98,11 @@
 %config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modlog.systembus.conf
 			%{_libexecdir}/ricci-modlog
 
+# modvirt
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modvirt.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modvirt.systembus.conf
+			%{_libexecdir}/ricci-modvirt
+
 %pre -n ricci
 getent group ricci >/dev/null || groupadd -r ricci
 getent passwd ricci >/dev/null || useradd -r -g ricci -d /var/lib/ricci -s /sbin/nologin -c "ricci daemon user" ricci
@@ -126,8 +134,12 @@
 exit 0
 
 %changelog
+* Tue Sep 09 2008 Ryan McCabe <rmccabe at redhat.com> 0.15.0-1
+ - Break circular dependency with cman
+
 * Mon Jun 02 2008 Ryan McCabe <rmccabe at redhat.com> 0.13.0-4
  - No longer need -lgroup with the new cman packages.
+ - Recognize F9 by name (Sulphur).
 
 * Wed May 20 2008 Ryan McCabe <rmccabe at redhat.com> 0.13.0-3
  - Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jun 2008 15:16:56 -0000	1.3
+++ sources	9 Sep 2008 19:35:07 -0000	1.4
@@ -1 +1 @@
-753ddd2a65b97ea9eaf1c6f374bdb90d  ricci-0.13.0.tar.gz
+a0a03871c469826ba7aecf042f9246ad  ricci-0.15.0.tar.gz



From pjones at fedoraproject.org  Tue Sep  9 19:37:26 2008
From: pjones at fedoraproject.org (Peter Jones)
Date: Tue,  9 Sep 2008 19:37:26 +0000 (UTC)
Subject: rpms/mkinitrd/devel .cvsignore, 1.201, 1.202 mkinitrd.spec, 1.286, 
	1.287 sources, 1.243, 1.244
Message-ID: <20080909193726.BD1617012A@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/mkinitrd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4930

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
* Tue Sep 09 2008 Peter Jones <pjones at redhat.com> - 6.0.63-1
- Only sleep for /proc/scsi/scsi changes once (wwoods)
- Handle built-in usbfs better
- Support dhcp-specified nbd root path (wtogami)
- Hide plymouth splash screen before dropping to a shell (katzj)
- Create /dev/live symlink for SD (katzj)
- Don't force a max length for labels in zipl



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- .cvsignore	11 Aug 2008 16:17:19 -0000	1.201
+++ .cvsignore	9 Sep 2008 19:36:56 -0000	1.202
@@ -1 +1 @@
-mkinitrd-6.0.62.tar.bz2
+mkinitrd-6.0.63.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- mkinitrd.spec	11 Aug 2008 16:17:19 -0000	1.286
+++ mkinitrd.spec	9 Sep 2008 19:36:56 -0000	1.287
@@ -2,7 +2,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.62
+Version: 6.0.63
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -120,6 +120,14 @@
 %dir %{_sysconfdir}/kernel/prerm.d
 
 %changelog
+* Tue Sep 09 2008 Peter Jones <pjones at redhat.com> - 6.0.63-1
+- Only sleep for /proc/scsi/scsi changes once (wwoods)
+- Handle built-in usbfs better
+- Support dhcp-specified nbd root path (wtogami)
+- Hide plymouth splash screen before dropping to a shell (katzj)
+- Create /dev/live symlink for SD (katzj)
+- Don't force a max length for labels in zipl
+
 * Mon Aug 11 2008 Jeremy Katz <katzj at redhat.com> - 6.0.62-1
 - mkliveinitrd: Deal with changes in where udev expects things
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/sources,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- sources	11 Aug 2008 16:17:19 -0000	1.243
+++ sources	9 Sep 2008 19:36:56 -0000	1.244
@@ -1 +1 @@
-823bff7a17c4e67124c90900bc0e7d51  mkinitrd-6.0.62.tar.bz2
+99203fcbd44e34991d55a64f5b745a9e  mkinitrd-6.0.63.tar.bz2



From rmccabe at fedoraproject.org  Tue Sep  9 19:37:45 2008
From: rmccabe at fedoraproject.org (Ryan McCabe)
Date: Tue,  9 Sep 2008 19:37:45 +0000 (UTC)
Subject: rpms/clustermon/devel .cvsignore, 1.2, 1.3 clustermon.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20080909193745.7426C7012A@cvs1.fedora.phx.redhat.com>

Author: rmccabe

Update of /cvs/pkgs/rpms/clustermon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5012

Modified Files:
	.cvsignore clustermon.spec sources 
Log Message:
Restore missing XVM.cpp file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clustermon/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 May 2008 18:21:45 -0000	1.2
+++ .cvsignore	9 Sep 2008 19:37:15 -0000	1.3
@@ -1 +1 @@
-clustermon-0.13.0.tar.gz
+clustermon-0.15.0.tar.gz


Index: clustermon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clustermon/devel/clustermon.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- clustermon.spec	20 May 2008 18:28:07 -0000	1.2
+++ clustermon.spec	9 Sep 2008 19:37:15 -0000	1.3
@@ -16,8 +16,8 @@
 
 
 Name: clustermon
-Version: 0.13.0
-Release: 3%{?dist}
+Version: 0.15.0
+Release: 1%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga
 
@@ -27,7 +27,7 @@
 Source0: %{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: cman-devel libvirt-devel
+BuildRequires: cman-devel
 BuildRequires: glibc-devel gcc-c++ libxml2-devel
 BuildRequires: openssl-devel dbus-devel pam-devel pkgconfig
 BuildRequires: net-snmp-devel tog-pegasus-devel
@@ -45,6 +45,7 @@
 		--docdir=%{_docdir} \
 		--pegasus_providers_dir=%{PEGASUS_PROVIDERS_DIR} \
 		--include_zope_and_plone=no
+
 make %{?_smp_mflags} clustermon
 
 %install
@@ -56,7 +57,6 @@
 
 
 
-
 ### cluster module ###
 
 
@@ -182,8 +182,11 @@
 
 
 %changelog
-* Tue May 20 2008 Ryan McCabe <rmccabe at redhat.com> 0.13.0-3
- - Initial devel build.
+* Tue Sep 09 2008 Ryan McCabe <rmccabe at redhat.com> 0.15.0-1
+ - Restore missing XVM.cpp file for modcluster
 
-* Wed Feb 20 2008 Ryan McCabe <rmccabe at redhat.com> 0.13.0-1
+* Fri Jun 06 2008 Ryan McCabe <rmccabe at redhat.com> 0.13.0-4
+ - Recognize F9 by name (Sulphur).
+
+* Tue May 20 2008 Ryan McCabe <rmccabe at redhat.com> 0.13.0-3
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clustermon/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 May 2008 18:21:45 -0000	1.2
+++ sources	9 Sep 2008 19:37:15 -0000	1.3
@@ -1 +1 @@
-f0f0a58b0bfa12d1760c4e8b99671d90  clustermon-0.13.0.tar.gz
+f4b43c3dde363d3e3a97cc3ce4ad4ff4  clustermon-0.15.0.tar.gz



From spot at fedoraproject.org  Tue Sep  9 19:40:43 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 19:40:43 +0000 (UTC)
Subject: rpms/perl-PPI/F-9 perl-PPI.spec,1.11,1.12 sources,1.7,1.8
Message-ID: <20080909194043.2E1367012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-PPI/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5772/F-9

Modified Files:
	perl-PPI.spec sources 
Log Message:
update to 1.203


Index: perl-PPI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PPI/F-9/perl-PPI.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-PPI.spec	27 Feb 2008 21:45:14 -0000	1.11
+++ perl-PPI.spec	9 Sep 2008 19:40:12 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-PPI
-Version:        1.201
-Release:        3%{?dist}
+Version:        1.203
+Release:        1%{?dist}
 Summary:        Parse, Analyze and Manipulate Perl
 
 Group:          Development/Libraries
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue Sep  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.203-1
+- update to 1.203
+
 * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.201-3
 - Rebuild for perl 5.10 (again)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PPI/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Dec 2007 18:53:25 -0000	1.7
+++ sources	9 Sep 2008 19:40:12 -0000	1.8
@@ -1 +1 @@
-dc7c5df06632764e4641151fd15046db  PPI-1.201.tar.gz
+4d7e598d880ee397e219ae17a9d90277  PPI-1.203.tar.gz



From spot at fedoraproject.org  Tue Sep  9 19:40:43 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 19:40:43 +0000 (UTC)
Subject: rpms/perl-PPI/devel .cvsignore, 1.7, 1.8 perl-PPI.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <20080909194043.7DC287012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-PPI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5772/devel

Modified Files:
	.cvsignore perl-PPI.spec sources 
Log Message:
update to 1.203


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PPI/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Dec 2007 18:53:25 -0000	1.7
+++ .cvsignore	9 Sep 2008 19:40:13 -0000	1.8
@@ -1 +1 @@
-PPI-1.201.tar.gz
+PPI-1.203.tar.gz


Index: perl-PPI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PPI/devel/perl-PPI.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-PPI.spec	27 Feb 2008 21:45:14 -0000	1.11
+++ perl-PPI.spec	9 Sep 2008 19:40:13 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-PPI
-Version:        1.201
-Release:        3%{?dist}
+Version:        1.203
+Release:        1%{?dist}
 Summary:        Parse, Analyze and Manipulate Perl
 
 Group:          Development/Libraries
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue Sep  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.203-1
+- update to 1.203
+
 * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.201-3
 - Rebuild for perl 5.10 (again)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PPI/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Dec 2007 18:53:25 -0000	1.7
+++ sources	9 Sep 2008 19:40:13 -0000	1.8
@@ -1 +1 @@
-dc7c5df06632764e4641151fd15046db  PPI-1.201.tar.gz
+4d7e598d880ee397e219ae17a9d90277  PPI-1.203.tar.gz



From rcritten at fedoraproject.org  Tue Sep  9 19:41:41 2008
From: rcritten at fedoraproject.org (Robert Crittenden)
Date: Tue,  9 Sep 2008 19:41:41 +0000 (UTC)
Subject: rpms/python-pyasn1/F-9 .cvsignore, 1.2, 1.3 python-pyasn1.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080909194141.01B5F7012A@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/python-pyasn1/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6037

Modified Files:
	.cvsignore python-pyasn1.spec sources 
Log Message:
Update to upstream version 0.0.8a



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-pyasn1/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jan 2008 14:09:39 -0000	1.2
+++ .cvsignore	9 Sep 2008 19:41:10 -0000	1.3
@@ -1 +1 @@
-pyasn1-0.0.7a.tar.gz
+pyasn1-0.0.8a.tar.gz


Index: python-pyasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/python-pyasn1/F-9/python-pyasn1.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-pyasn1.spec	18 Jan 2008 14:09:39 -0000	1.1
+++ python-pyasn1.spec	9 Sep 2008 19:41:10 -0000	1.2
@@ -3,8 +3,8 @@
 %define module pyasn1
 
 Name:           python-pyasn1
-Version:        0.0.7a
-Release:        4%{?dist}
+Version:        0.0.8a
+Release:        1%{?dist}
 Summary:        ASN.1 tools for Python
 License:        BSD
 Group:          System Environment/Libraries
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Tue Sep  9 2008 Paul P. Komkoff Jr <i at stingr.net> - 0.0.8a-1
+- Update to upstream version 0.0.8a
+
 * Wed Jan 16 2008 Rob Crittenden <rcritten at redhat.com> - 0.0.7a-4
 - Use setuptools to install the package
 - simplify the files included in the rpm so it includes the .egg-info


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-pyasn1/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jan 2008 14:09:39 -0000	1.2
+++ sources	9 Sep 2008 19:41:10 -0000	1.3
@@ -1 +1 @@
-8dd0a5e1465ab3fd1b095aee812c2091  pyasn1-0.0.7a.tar.gz
+1befe83fd3d8dd8bb0d0fbe58a5788a5  pyasn1-0.0.8a.tar.gz



From rcritten at fedoraproject.org  Tue Sep  9 19:43:09 2008
From: rcritten at fedoraproject.org (Robert Crittenden)
Date: Tue,  9 Sep 2008 19:43:09 +0000 (UTC)
Subject: rpms/python-pyasn1/F-8 .cvsignore, 1.2, 1.3 python-pyasn1.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080909194309.6F62E7012A@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/python-pyasn1/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6377

Modified Files:
	.cvsignore python-pyasn1.spec sources 
Log Message:
Update to upstream version 0.0.8a



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-pyasn1/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jan 2008 14:41:32 -0000	1.2
+++ .cvsignore	9 Sep 2008 19:42:39 -0000	1.3
@@ -1 +1 @@
-pyasn1-0.0.7a.tar.gz
+pyasn1-0.0.8a.tar.gz


Index: python-pyasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/python-pyasn1/F-8/python-pyasn1.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-pyasn1.spec	18 Jan 2008 14:41:32 -0000	1.1
+++ python-pyasn1.spec	9 Sep 2008 19:42:39 -0000	1.2
@@ -3,8 +3,8 @@
 %define module pyasn1
 
 Name:           python-pyasn1
-Version:        0.0.7a
-Release:        4%{?dist}
+Version:        0.0.8a
+Release:        1%{?dist}
 Summary:        ASN.1 tools for Python
 License:        BSD
 Group:          System Environment/Libraries
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Tue Sep  9 2008 Paul P. Komkoff Jr <i at stingr.net> - 0.0.8a-1
+- Update to upstream version 0.0.8a
+
 * Wed Jan 16 2008 Rob Crittenden <rcritten at redhat.com> - 0.0.7a-4
 - Use setuptools to install the package
 - simplify the files included in the rpm so it includes the .egg-info


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-pyasn1/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jan 2008 14:41:32 -0000	1.2
+++ sources	9 Sep 2008 19:42:39 -0000	1.3
@@ -1 +1 @@
-8dd0a5e1465ab3fd1b095aee812c2091  pyasn1-0.0.7a.tar.gz
+1befe83fd3d8dd8bb0d0fbe58a5788a5  pyasn1-0.0.8a.tar.gz



From lennart at fedoraproject.org  Tue Sep  9 19:44:15 2008
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue,  9 Sep 2008 19:44:15 +0000 (UTC)
Subject: rpms/pulseaudio/F-9 pulseaudio-0.9.10-lock-file.patch, NONE,
	1.1 pulseaudio.spec, 1.38, 1.39
Message-ID: <20080909194415.0E7207012A@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6866

Modified Files:
	pulseaudio.spec 
Added Files:
	pulseaudio-0.9.10-lock-file.patch 
Log Message:
Fix lock file handling: properly check if the PID stored in our lock file actually belongs to us. Fixes #438284

pulseaudio-0.9.10-lock-file.patch:

--- NEW FILE pulseaudio-0.9.10-lock-file.patch ---
Index: src/pulsecore/pid.c
===================================================================
--- src/pulsecore/pid.c.orig
+++ src/pulsecore/pid.c
@@ -140,8 +140,51 @@ fail:
     return -1;
 }
 
+static int proc_name_ours(pid_t pid, const char *procname) {
+#ifdef __linux__
+    char bn[PATH_MAX];
+    FILE *f;
+
+    pa_snprintf(bn, sizeof(bn), "/proc/%lu/stat", (unsigned long) pid);
+
+    if (!(f = fopen(bn, "r"))) {
+        pa_log_info("Failed to open %s: %s", bn, pa_cstrerror(errno));
+        return -1;
+    } else {
+        char *expected;
+        pa_bool_t good;
+        char stored[64];
+
+        if (!(fgets(stored, sizeof(stored), f))) {
+            pa_log_info("Failed to read from %s: %s", bn, feof(f) ? "EOF" : pa_cstrerror(errno));
+            fclose(f);
+            return -1;
+        }
+
+        fclose(f);
+
+        expected = pa_sprintf_malloc("%lu (%s)", (unsigned long) pid, procname);
+        good = pa_startswith(stored, expected);
+        pa_xfree(expected);
+
+#if !defined(__OPTIMIZE__)
+        if (!good) {
+            /* libtool likes to rename our binary names ... */
+            expected = pa_sprintf_malloc("%lu (lt-%s)", (unsigned long) pid, procname);
+            good = pa_startswith(stored, expected);
+            pa_xfree(expected);
+        }
+#endif
+
+        return !!good;
+    }
+#endif
+
+    return 1;
+}
+
 /* Create a new PID file for the current process. */
-int pa_pid_file_create(void) {
+int pa_pid_file_create(const char *procname) {
     int fd = -1;
     int ret = -1;
     char fn[PATH_MAX];
@@ -161,14 +204,24 @@ int pa_pid_file_create(void) {
     if ((pid = read_pid(fn, fd)) == (pid_t) -1)
         pa_log_warn("Corrupt PID file, overwriting.");
     else if (pid > 0) {
+
 #ifdef OS_IS_WIN32
         if ((process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid)) != NULL) {
             CloseHandle(process);
 #else
         if (kill(pid, 0) >= 0 || errno != ESRCH) {
 #endif
-            pa_log("Daemon already running.");
-            goto fail;
+	    int ours = 1;
+
+            if (procname)
+                if ((ours = proc_name_ours(pid, procname)) < 0)
+                    goto fail;
+
+            if (ours) {
+                pa_log("Daemon already running.");
+                ret = 1;
+                goto fail;
+            }
         }
 
         pa_log_warn("Stale PID file, overwriting.");
@@ -270,7 +323,7 @@ int pa_pid_file_check_running(pid_t *pid
 /* Kill a current running daemon. Return non-zero on success, -1
  * otherwise. If successful *pid contains the PID of the daemon
  * process. */
-int pa_pid_file_kill(int sig, pid_t *pid, const char *binary_name) {
+int pa_pid_file_kill(int sig, pid_t *pid, const char *procname) {
     int fd = -1;
     char fn[PATH_MAX];
     int ret = -1;
@@ -290,19 +343,14 @@ int pa_pid_file_kill(int sig, pid_t *pid
         goto fail;
 
 #ifdef __linux__
-    if (binary_name) {
-        pa_snprintf(fn, sizeof(fn), "/proc/%lu/exe", (unsigned long) pid);
+    if (procname) {
+        int ours;
 
-        if ((e = pa_readlink(fn))) {
-            char *f = pa_path_get_filename(e);
-            if (strcmp(f, binary_name)
-#if defined(__OPTIMIZE__)
-                /* libtool likes to rename our binary names ... */
-                && !(pa_startswith(f, "lt-") && strcmp(f+3, binary_name) == 0)
-#endif
-            )
-                goto fail;
-        }
+	if ((ours = proc_name_ours(*pid, procname)) < 0)
+	    goto fail;
+
+	if (!ours)
+	    goto fail;
     }
 #endif
 
Index: src/pulsecore/pid.h
===================================================================
--- src/pulsecore/pid.h.orig
+++ src/pulsecore/pid.h
@@ -24,9 +24,9 @@
   USA.
 ***/
 
-int pa_pid_file_create(void);
+int pa_pid_file_create(const char *progname);
 int pa_pid_file_remove(void);
 int pa_pid_file_check_running(pid_t *pid, const char *binary_name);
-int pa_pid_file_kill(int sig, pid_t *pid, const char *binary_name);
+int pa_pid_file_kill(int sig, pid_t *pid, const char *progname);
 
 #endif
Index: src/daemon/main.c
===================================================================
--- src/daemon/main.c.orig
+++ src/daemon/main.c
@@ -687,7 +687,7 @@ int main(int argc, char *argv[]) {
         goto finish;
 
     if (conf->use_pid_file) {
-        if (pa_pid_file_create() < 0) {
+        if (pa_pid_file_create("pulseaudio") < 0) {
             pa_log("pa_pid_file_create() failed.");
 #ifdef HAVE_FORK
             if (conf->daemonize)


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/F-9/pulseaudio.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- pulseaudio.spec	30 Mar 2008 17:05:05 -0000	1.38
+++ pulseaudio.spec	9 Sep 2008 19:43:44 -0000	1.39
@@ -30,6 +30,7 @@
 #Patch7:	pulseaudio-0.9.8-ltdl-assert.patch
 #Patch8:	pulseaudio-0.9.8-disable-realtime.patch
 #Patch9:	pulseaudio-0.9.8-cputime-abort.patch
+Patch10:	pulseaudio-0.9.10-lock-file.patch
 
 %description
 PulseAudio is a sound server for Linux and other Unix like operating 
@@ -174,6 +175,7 @@
 #%patch7 -p0 -b .ltdl-assert
 #%patch8 -p1 -b .realtime
 #%patch9 -p1 -b .cputime-abort
+%patch10 -p0 -b .lock-file
 
 %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
@@ -399,6 +401,10 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Thu Sep 9 2008 Lennart Poettering <lpoetter at redhat.com> 0.9.10-2
+- Fix lock file handling: properly check if the PID stored in our lock file
+  actually belongs to us. Fixes #438284
+
 * Sun Mar 30 2008 Lennart Poettering <lpoetter at redhat.com> 0.9.10-1
 - Update to PulseAudio 0.9.10
 - drop all patches, since they have been integrated upstream



From lennart at fedoraproject.org  Tue Sep  9 19:47:09 2008
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue,  9 Sep 2008 19:47:09 +0000 (UTC)
Subject: rpms/pulseaudio/F-9 pulseaudio.spec,1.39,1.40
Message-ID: <20080909194709.ABBFF7012A@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7426

Modified Files:
	pulseaudio.spec 
Log Message:
forgot to bump the release


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/F-9/pulseaudio.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- pulseaudio.spec	9 Sep 2008 19:43:44 -0000	1.39
+++ pulseaudio.spec	9 Sep 2008 19:46:39 -0000	1.40
@@ -3,7 +3,7 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.10
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz



From notting at fedoraproject.org  Tue Sep  9 19:51:17 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue,  9 Sep 2008 19:51:17 +0000 (UTC)
Subject: rpms/aqbanking/devel aqbanking.spec,1.53,1.54
Message-ID: <20080909195117.71B1E7012A@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/aqbanking/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8756

Modified Files:
	aqbanking.spec 
Log Message:
Update to 3.7.2




Index: aqbanking.spec
===================================================================
RCS file: /cvs/extras/rpms/aqbanking/devel/aqbanking.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- aqbanking.spec	25 Mar 2008 14:05:23 -0000	1.53
+++ aqbanking.spec	9 Sep 2008 19:50:47 -0000	1.54
@@ -1,6 +1,3 @@
-%define backends aqhbci aqdtaus aqofxconnect
-%define frontends cbanking qbanking kbanking g2banking
-
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %define qt3pkg qt
@@ -10,28 +7,24 @@
 
 Name: aqbanking
 Summary: A library for online banking functions and financial data import/export
-Version: 2.3.3
-Release: 3%{?dist}
+Version: 3.7.2
+Release: 1%{?dist}
 Source: http://download.sourceforge.net/aqbanking/%{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 License: GPLv2+
 URL: http://www.aquamaniac.de/aqbanking/
-Patch2: aqbanking-2.2.9-pkgconfig.patch
+Patch2: aqbanking-3.7.2-pkgconfig.patch
 Patch3: aqbanking-2.1.0-conflict.patch
-Patch4: aqbanking-2.3.2-open.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # qbanking
 BuildRequires: %{qt3pkg}-devel
-# g2banking
-BuildRequires: gtk2-devel libglade2-devel
-# kbanking
-BuildRequires: kdelibs3-devel
 # python
 BuildRequires: python, PyXML
-BuildRequires: gwenhywfar-devel >= 2.1.0, libofx-devel >= 0.7.0, gettext, libtool
+BuildRequires: gwenhywfar-devel >= 3.4.1, libofx-devel >= 0.9.0, gettext, libtool
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Obsoletes: aqhbci <= 1.0.3
+Obsoletes: g2banking < %{version}
 
 %description 
 The intention of AqBanking is to provide a middle layer between the
@@ -52,55 +45,12 @@
 # for %{_datadir}/aclocal
 Requires: automake
 Obsoletes: aqhbci-devel <= 1.0.3
+Obsoletes: g2banking-devel < %{version}
 
 %description devel
 This package contains aqbanking-config and header files for writing and
 compiling programs using Aqbanking.
 
-%package -n g2banking
-Summary: GTK bindings for Aqbanking
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description -n g2banking
-This package contains the g2banking GTK bindings for the Aqbanking
-online banking library.
-
-%package -n g2banking-devel
-Summary: Development headers for g2banking
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: g2banking = %{version}-%{release}
-
-%description -n g2banking-devel
-This package contains g2banking-config and header files for writing and
-compiling programs using the g2banking bindings for Aqbanking.
-
-%package -n kbanking
-Summary: KDE bindings for Aqbanking
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description -n kbanking
-This package contains the kbanking KDE bindings for the Aqbanking
-online banking library.
-
-%package -n kbanking-devel
-Summary: Development headers for kbanking
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: qbanking-devel = %{version}-%{release}
-Requires: kbanking = %{version}-%{release}
-Requires: kdelibs3-devel
-
-%description -n kbanking-devel
-This package contains kbanking-config and header files for writing and
-compiling programs using the kbanking bindings for Aqbanking.
-
 %package -n qbanking
 Summary: Qt bindings for Aqbanking
 Group: System Environment/Libraries
@@ -108,6 +58,7 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Obsoletes: aqhbci-qt-tools <= 1.0.3
+Obsoletes: kbanking < %{version}
 
 %description -n qbanking
 This package contains the qbanking KDE bindings for the Aqbanking
@@ -119,6 +70,7 @@
 Requires: %{name}-devel = %{version}-%{release}
 Requires: qbanking = %{version}-%{release}
 Requires: %{qt3pkg}-devel
+Obsoletes: kbanking-devel < %{version}
 
 %description -n qbanking-devel
 This package contains qbanking-config and header files for writing and
@@ -136,12 +88,10 @@
 %setup -q
 %patch2 -p1 -b .pkgconfig
 %patch3 -p1 -b .conflict
-%patch4 -p1 -b .open
 
 %build
 [ -z "$QTDIR" ] && . /etc/profile.d/qt.sh
-%{configure} --disable-static --with-backends="%{backends}" \
-  --with-frontends="%{frontends}" \
+%{configure} --disable-static \
   --with-kde3-libs=%{_libdir} \
   --enable-libofx \
   --enable-python
@@ -174,14 +124,6 @@
 
 %postun -p /sbin/ldconfig
 
-%post -n g2banking -p /sbin/ldconfig
-
-%postun -n g2banking -p /sbin/ldconfig
-
-%post -n kbanking -p /sbin/ldconfig
-
-%postun -n kbanking -p /sbin/ldconfig
-
 %post -n qbanking -p /sbin/ldconfig
 
 %postun -n qbanking -p /sbin/ldconfig
@@ -190,7 +132,6 @@
 %defattr(-,root,root)
 %doc %{_datadir}/doc/%{name}-%{version}
 %{_libdir}/libaq*.so.*
-%{_libdir}/libcbanking.so.*
 %{_libdir}/aqbanking
 %exclude %{_libdir}/aqbanking/plugins/*/debugger
 %exclude %{_libdir}/aqbanking/plugins/*/frontends/qbanking
@@ -199,49 +140,21 @@
 %{_datadir}/aqbanking
 %exclude %{_datadir}/aqbanking/frontends/*
 %exclude %{_datadir}/aqbanking/i18n
-%{_datadir}/aqhbci
-%{_bindir}/*-tool
+%{_bindir}/*-tool3
 
 %files devel
 %defattr(-,root,root)
 %doc doc/0[12]* tutorials
-%{_bindir}/hbcixml2
+%{_bindir}/hbcixml3
 %{_bindir}/aq*-config
-%{_bindir}/cbanking-config
 %{_libdir}/libaq*.so
-%{_libdir}/libcbanking.so
 %{_includedir}/aq*
-%{_includedir}/cbanking
 %{_libdir}/pkgconfig/*
 %{_datadir}/aclocal/aq*
-%{_datadir}/aclocal/cbanking.m4
-
-%files -n g2banking
-%defattr(-,root,root)
-%{_libdir}/libg2banking.so.*
-%{_datadir}/aqbanking/frontends/g2banking
-
-%files -n g2banking-devel
-%defattr(-,root,root)
-%{_bindir}/g2banking-config
-%{_includedir}/g2banking
-%{_libdir}/libg2banking.so
-%{_datadir}/aclocal/g2banking.m4
-
-%files -n kbanking
-%defattr(-,root,root)
-%{_libdir}/libkbanking.so.*
-
-%files -n kbanking-devel
-%defattr(-,root,root)
-%{_bindir}/kbanking-config
-%{_includedir}/kbanking
-%{_libdir}/libkbanking.so
-%{_datadir}/aclocal/kbanking.m4
 
 %files -n qbanking
 %defattr(-,root,root)
-%{_bindir}/qb-help
+%{_bindir}/qb-help5
 %{_libdir}/libqbanking.so.*
 %{_libdir}/aqbanking/plugins/*/debugger
 %{_libdir}/aqbanking/plugins/*/frontends/qbanking
@@ -251,16 +164,18 @@
 
 %files -n qbanking-devel
 %defattr(-,root,root)
-%{_bindir}/qbanking-config
 %{_includedir}/qbanking
 %{_libdir}/libqbanking.so
-%{_datadir}/aclocal/qbanking.m4
 
 %files -n python-%{name}
 %defattr(-,root,root)
 %{python_sitelib}/%{name}
 
 %changelog
+* Tue Sep  9 2008 Bill Nottingham <notting at redhat.com> - 3.7.2-1
+- update to 3.7.2
+- obsolete the no-longer-existing g2banking/kbanking packages
+
 * Tue Mar 25 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.3.3-3
 - s/qt-devel/qt3-devel/ (f9+)
 - qbanking-devel: Req: qt3-devel



From notting at fedoraproject.org  Tue Sep  9 19:53:11 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue,  9 Sep 2008 19:53:11 +0000 (UTC)
Subject: rpms/gnucash/devel gnucash.spec,1.88,1.89
Message-ID: <20080909195311.529AA7012A@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/gnucash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9441

Modified Files:
	gnucash.spec 
Log Message:
rebuild against new aqbanking


Index: gnucash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- gnucash.spec	1 Aug 2008 15:38:58 -0000	1.88
+++ gnucash.spec	9 Sep 2008 19:52:40 -0000	1.89
@@ -128,6 +128,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Tue Sep  9 2008 Bill Nottingham <notting at redhat.com> - 2.2.6-2
+- rebuild against new aqbanking
+
 * Fri Aug  1 2008 Bill Nottingham <notting at redhat.com> - 2.2.6-1
 - update to 2.2.6
 



From notting at fedoraproject.org  Tue Sep  9 19:54:01 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue,  9 Sep 2008 19:54:01 +0000 (UTC)
Subject: rpms/aqbanking/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <20080909195401.C02FE7012A@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/aqbanking/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9258

Modified Files:
	.cvsignore sources 
Log Message:
update to 3.7.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aqbanking/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Jan 2008 04:10:10 -0000	1.7
+++ .cvsignore	9 Sep 2008 19:53:31 -0000	1.8
@@ -1 +1 @@
-aqbanking-2.3.3.tar.gz
+aqbanking-3.7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aqbanking/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Jan 2008 04:10:10 -0000	1.7
+++ sources	9 Sep 2008 19:53:31 -0000	1.8
@@ -1 +1 @@
-69e2870db58f87373e3a4a003a183166  aqbanking-2.3.3.tar.gz
+5b0aef92808dcb48c375b8958e1c4808  aqbanking-3.7.2.tar.gz



From notting at fedoraproject.org  Tue Sep  9 19:54:24 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue,  9 Sep 2008 19:54:24 +0000 (UTC)
Subject: rpms/gnucash/devel gnucash.spec,1.89,1.90
Message-ID: <20080909195424.4E6B77012A@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/gnucash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9880

Modified Files:
	gnucash.spec 
Log Message:
actually bump release


Index: gnucash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- gnucash.spec	9 Sep 2008 19:52:40 -0000	1.89
+++ gnucash.spec	9 Sep 2008 19:53:54 -0000	1.90
@@ -4,7 +4,7 @@
 Summary: GnuCash is an application to keep track of your finances
 Version: 2.2.6
 URL: http://gnucash.org/
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.bz2



From notting at fedoraproject.org  Tue Sep  9 19:55:27 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue,  9 Sep 2008 19:55:27 +0000 (UTC)
Subject: rpms/aqbanking/devel aqbanking-3.7.2-pkgconfig.patch, NONE,
	1.1 aqbanking-2.2.9-pkgconfig.patch, 1.1,
	NONE aqbanking-2.3.2-open.patch, 1.1, NONE
Message-ID: <20080909195527.DACA77012A@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/aqbanking/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10470

Added Files:
	aqbanking-3.7.2-pkgconfig.patch 
Removed Files:
	aqbanking-2.2.9-pkgconfig.patch aqbanking-2.3.2-open.patch 
Log Message:
cleanup


aqbanking-3.7.2-pkgconfig.patch:

--- NEW FILE aqbanking-3.7.2-pkgconfig.patch ---
diff -up aqbanking-3.7.2/aqbanking-config.in.in.pkgconfig aqbanking-3.7.2/aqbanking-config.in.in
--- aqbanking-3.7.2/aqbanking-config.in.in.pkgconfig	2008-07-31 14:13:31.000000000 -0400
+++ aqbanking-3.7.2/aqbanking-config.in.in	2008-09-09 13:18:20.000000000 -0400
@@ -1,50 +1,44 @@
 # $Id$
 # Author of this file: Martin Preuss<martin at libchipcard.de>
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-datadir=@datadir@
-
 result=""
 
 for d in $*; do
     case $d in
 	--includes)
-	    result="$result @aqbanking_includes@ @gwenhywfar_includes@"
+	    result="$result $(pkg-config --cflags aqbanking)"
 	    ;;
 	--libraries)
-	    result="$result @aqbanking_ldflags@ @aqbanking_libs@"
+	    result="$result $(pkg-config --libs aqbanking)"
 	    ;;
 	--libraries++)
 	    result="$result "
 	    ;;
 	--plugins)
-	    result="$result @aqbanking_plugindir@"
+	    result="$result $(pkg-config --variable=plugindir aqbanking)"
 	    ;;
 	--data)
-	    result="$result @aqbanking_pkgdatadir@"
+	    result="$result $(pkg-config --variable=pkgdatadir aqbanking)"
 	    ;;
 
         --has-qbanking)
             result=@with_qbanking@
             ;;
 	--qbanking-libraries)
-	    result="$result @aqbanking_ldflags@ @qbanking_libs@"
+	    result="$result $(pkg-config --variable=qbanking_libs aqbanking)"
 	    ;;
 	--qbanking-plugins)
-	    result="$result @qbanking_plugindir@"
+	    result="$result $(pkg-config --variable=qbanking_plugindir aqbanking)"
 	    ;;
 	--qbanking-helpdir)
-	    result="$result @qbanking_helpdir@"
+	    result="$result $(pkg-config --variable=qbanking_helpdir aqbanking)"
 	    ;;
 
         --has-aqhbci)
             result=@with_aqhbci@
             ;;
 	--aqhbci-libraries)
-	    result="$result @aqbanking_ldflags@ @aqhbci_libs@"
+	    result="$result $(pkg-config --variable=aqhbci_libs aqbanking)"
 	    ;;
 
 	--vmajor)
diff -up aqbanking-3.7.2/aqbanking.pc.in.pkgconfig aqbanking-3.7.2/aqbanking.pc.in
--- aqbanking-3.7.2/aqbanking.pc.in.pkgconfig	2008-09-09 13:16:24.000000000 -0400
+++ aqbanking-3.7.2/aqbanking.pc.in	2008-09-09 13:18:22.000000000 -0400
@@ -32,6 +32,8 @@ kbanking_datadir=@kbanking_data@
 qbanking_includes=@qbanking_includes@
 qbanking_libs=@qbanking_libs@
 qbanking_datadir=@qbanking_data@
+qbanking_plugindir=@qbanking_plugindir@
+qbanking_helpdir=@qbanking_helpdir@
 cbanking_includes=@cbanking_includes@
 cbanking_libs=@cbanking_libs@
 cbanking_datadir=@cbanking_data@


--- aqbanking-2.2.9-pkgconfig.patch DELETED ---


--- aqbanking-2.3.2-open.patch DELETED ---



From rmccabe at fedoraproject.org  Tue Sep  9 19:56:22 2008
From: rmccabe at fedoraproject.org (Ryan McCabe)
Date: Tue,  9 Sep 2008 19:56:22 +0000 (UTC)
Subject: rpms/ricci/devel ricci.spec,1.4,1.5 sources,1.4,1.5
Message-ID: <20080909195622.3BDB97012A@cvs1.fedora.phx.redhat.com>

Author: rmccabe

Update of /cvs/pkgs/rpms/ricci/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10615

Modified Files:
	ricci.spec sources 
Log Message:
Add nss-devel to build depends



Index: ricci.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/devel/ricci.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ricci.spec	9 Sep 2008 19:35:07 -0000	1.4
+++ ricci.spec	9 Sep 2008 19:55:52 -0000	1.5
@@ -10,7 +10,7 @@
 
 Name: ricci
 Version: 0.15.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga/
 Group: System Environment/Base
@@ -24,6 +24,7 @@
 BuildRequires: cman-devel libcap-devel
 BuildRequires: cyrus-sasl-devel >= 2.1
 BuildRequires: openssl-devel dbus-devel pkgconfig file-devel
+BuildRequires: nss-devel
 
 Requires: initscripts
 Requires: oddjob dbus openssl pam cyrus-sasl >= 2.1
@@ -134,6 +135,9 @@
 exit 0
 
 %changelog
+* Tue Sep 09 2008 Ryan McCabe <rmccabe at redhat.com> 0.15.0-2
+ - Add nss-devel to BuildDepends
+
 * Tue Sep 09 2008 Ryan McCabe <rmccabe at redhat.com> 0.15.0-1
  - Break circular dependency with cman
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2008 19:35:07 -0000	1.4
+++ sources	9 Sep 2008 19:55:52 -0000	1.5
@@ -1 +1 @@
-a0a03871c469826ba7aecf042f9246ad  ricci-0.15.0.tar.gz
+96a9da057bcdf67163fecb194fd81e7a  ricci-0.15.0.tar.gz



From dwalsh at fedoraproject.org  Tue Sep  9 20:07:56 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  9 Sep 2008 20:07:56 +0000 (UTC)
Subject: rpms/setroubleshoot/devel setroubleshoot.init, 1.15,
	1.16 setroubleshoot.spec, 1.101, 1.102
Message-ID: <20080909200756.8EFCA7012A@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13363

Modified Files:
	setroubleshoot.init setroubleshoot.spec 
Log Message:
* Tue Sep 9 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.8-2
- Fix setroubleshoot init to rely on messagebus being running



Index: setroubleshoot.init
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.init,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- setroubleshoot.init	15 Jan 2008 20:53:13 -0000	1.15
+++ setroubleshoot.init	9 Sep 2008 20:07:26 -0000	1.16
@@ -12,8 +12,8 @@
 
 ### BEGIN INIT INFO
 # Provides: lsb-setroubleshootd
-# Required-Start: $local_fs $syslog $network $named
-# Required-Stop: $local_fs $syslog $network $named
+# Required-Start: $local_fs $syslog $network $named $messagebus
+# Required-Stop: $local_fs $syslog $network $named $messagebus
 # Default-Start:  3 4 5
 # Default-Stop: 0 1 6
 # Short-Description: start and stop SELinux Troubleshooting Daemon


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- setroubleshoot.spec	9 Sep 2008 14:36:55 -0000	1.101
+++ setroubleshoot.spec	9 Sep 2008 20:07:26 -0000	1.102
@@ -1,7 +1,7 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
 Version: 2.0.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -182,6 +182,9 @@
 %attr(0755,root,root) /etc/rc.d/init.d/%{name}
 
 %changelog
+* Tue Sep 9 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.8-2
+- Fix setroubleshoot init to rely on messagebus being running
+
 * Tue Sep 9 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.8-1
 - Fix spelling mistakes
 - Update translations



From dwalsh at fedoraproject.org  Tue Sep  9 20:12:55 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  9 Sep 2008 20:12:55 +0000 (UTC)
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.102,1.103
Message-ID: <20080909201255.88FB57012A@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14354

Modified Files:
	setroubleshoot.spec 
Log Message:
* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.8-2
- Fix setroubleshoot init to rely on messagebus being running



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- setroubleshoot.spec	9 Sep 2008 20:07:26 -0000	1.102
+++ setroubleshoot.spec	9 Sep 2008 20:12:25 -0000	1.103
@@ -182,10 +182,10 @@
 %attr(0755,root,root) /etc/rc.d/init.d/%{name}
 
 %changelog
-* Tue Sep 9 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.8-2
+* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.8-2
 - Fix setroubleshoot init to rely on messagebus being running
 
-* Tue Sep 9 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.8-1
+* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.8-1
 - Fix spelling mistakes
 - Update translations
 



From notting at fedoraproject.org  Tue Sep  9 20:16:48 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue,  9 Sep 2008 20:16:48 +0000 (UTC)
Subject: rpms/aqbanking/devel aqbanking.spec,1.54,1.55
Message-ID: <20080909201648.9D9317012A@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/aqbanking/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15316

Modified Files:
	aqbanking.spec 
Log Message:
add gmp-devel buildreq


Index: aqbanking.spec
===================================================================
RCS file: /cvs/extras/rpms/aqbanking/devel/aqbanking.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- aqbanking.spec	9 Sep 2008 19:50:47 -0000	1.54
+++ aqbanking.spec	9 Sep 2008 20:16:18 -0000	1.55
@@ -19,7 +19,7 @@
 # qbanking
 BuildRequires: %{qt3pkg}-devel
 # python
-BuildRequires: python, PyXML
+BuildRequires: python, PyXML, gmp-devel
 BuildRequires: gwenhywfar-devel >= 3.4.1, libofx-devel >= 0.9.0, gettext, libtool
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig



From kaitlin at fedoraproject.org  Tue Sep  9 20:18:19 2008
From: kaitlin at fedoraproject.org (Kaitlin Rupert)
Date: Tue,  9 Sep 2008 20:18:19 +0000 (UTC)
Subject: rpms/libcmpiutil/devel rep_disabled_ind.patch, NONE,
	1.1 libcmpiutil.spec, 1.4, 1.5
Message-ID: <20080909201819.AEAE97012A@cvs1.fedora.phx.redhat.com>

Author: kaitlin

Update of /cvs/pkgs/rpms/libcmpiutil/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15394

Modified Files:
	libcmpiutil.spec 
Added Files:
	rep_disabled_ind.patch 
Log Message:
Update libcmpiutil.spec to include patch for revision 0.4-3.   Also add rep_disable_ind.patch.




rep_disabled_ind.patch:

--- NEW FILE rep_disabled_ind.patch ---
# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1214936716 25200
# Node ID fa42fd637a89653873eb0039e8fadf834228f4bd
# Parent  943ae9ae775336ee6cf5a8116eaae069d0bfe5fc
[CU] Report disabled indications

Make sure we always return a valid status object so that we can actually
tell from the caller if the indication was delivered or not.

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 943ae9ae7753 -r fa42fd637a89 std_indication.c
--- a/std_indication.c	Tue May 20 10:30:32 2008 -0700
+++ b/std_indication.c	Tue Jul 01 11:25:16 2008 -0700
@@ -167,6 +167,7 @@
                 cu_statusf(broker, &s,
                            CMPI_RC_ERR_FAILED,
                            "Couldn't get indication name for enable check.");
+                goto out;
         }
 
         enabled = is_ind_enabled(args->_ctx, ind_name, &s);
@@ -175,8 +176,16 @@
                 goto out;
         }
 
+        CU_DEBUG("Indication %s is%s enabled",
+                 ind_name,
+                 enabled ? "" : " not");
+
         if (enabled)
                 s = CBDeliverIndication(broker, ctx, args->ns, ind);
+        else
+                cu_statusf(broker, &s,
+                           CMPI_RC_ERR_METHOD_NOT_AVAILABLE,
+                           "Indication not enabled");
 
  out:
         return s;


Index: libcmpiutil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcmpiutil/devel/libcmpiutil.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libcmpiutil.spec	16 Jun 2008 17:54:27 -0000	1.4
+++ libcmpiutil.spec	9 Sep 2008 20:17:49 -0000	1.5
@@ -3,7 +3,7 @@
 Summary: CMPI Utility Library
 Name: libcmpiutil
 Version: 0.4
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: ftp://libvirt.org/libvirt-cim/libcmpiutil-%{version}.tar.gz
@@ -14,6 +14,7 @@
 BuildRequires: bison
 BuildRequires: libxml2-devel
 BuildConflicts: sblim-cmpi-devel
+Patch0: rep_disabled_ind.patch 
 
 %description
 Libcmpiutil is a library of utility functions for CMPI providers.
@@ -39,6 +40,7 @@
 %prep
 %setup -q
 chmod -x *.c *.y *.h *.l
+%patch0 -p1
 
 %build
 %configure --enable-static=no
@@ -75,6 +77,9 @@
 %doc doc/SubmittingPatches
 
 %changelog
+* Fri Aug 29 2008 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.4-2
+- Added add rep_disabled_ind.patch patch to enable disabled indication reporting
+
 * Tue May 20 2008 Dan Smith <danms at us.ibm.com> - 0.4-1
 - Updated to official 0.4 source release
 



From dwalsh at fedoraproject.org  Tue Sep  9 20:24:23 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  9 Sep 2008 20:24:23 +0000 (UTC)
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.163,
	1.164 libselinux.spec, 1.340, 1.341
Message-ID: <20080909202423.06F5E7012A@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16764

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.71-4
- Add missing get/setkeycreatecon man pages


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- libselinux-rhat.patch	9 Sep 2008 18:45:25 -0000	1.163
+++ libselinux-rhat.patch	9 Sep 2008 20:24:22 -0000	1.164
@@ -1,16 +1,63 @@
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/fgetfilecon.3 libselinux-2.0.71/man/man3/fgetfilecon.3
 --- nsalibselinux/man/man3/fgetfilecon.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/fgetfilecon.3	2008-09-09 14:30:58.000000000 -0400
++++ libselinux-2.0.71/man/man3/fgetfilecon.3	2008-09-09 16:21:46.000000000 -0400
 @@ -0,0 +1 @@
 +.so man3/getfilecon.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/getkeycreatecon.3 libselinux-2.0.71/man/man3/getkeycreatecon.3
+--- nsalibselinux/man/man3/getkeycreatecon.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/getkeycreatecon.3	2008-09-09 16:21:49.000000000 -0400
+@@ -0,0 +1,38 @@
++.TH "getkeycreatecon" "3" "9 September 2008" "dwalsh at redhat.com from russell at coker.com.au" "SELinux API documentation"
++.SH "NAME"
++getkeycreatecon, setkeycreatecon \- get or set the SELinux security context used for creating a new kernel keyrings.
++
++.SH "SYNOPSIS"
++.B #include <selinux/selinux.h>
++.sp
++.BI "int getkeycreatecon(security_context_t *" con );
++
++.BI "int setkeycreatecon(security_context_t "context );
++
++.SH "DESCRIPTION"
++.B getkeycreatecon
++retrieves the context used for creating a new kernel keyring.
++This returned context should be freed with freecon if non-NULL.  
++getkeycreatecon sets *con to NULL if no keycreate context has been explicitly 
++set by the program (i.e. using the default policy behavior).
++
++.B setkeycreatecon
++sets the context used for creating a new kernel keyring.
++NULL can be passed to
++setkeycreatecon to reset to the default policy behavior.  
++The keycreate context is automatically reset after the next execve, so a
++program doesn't need to explicitly sanitize it upon startup.  
++
++setkeycreatecon can be applied prior to library
++functions that internally perform an file creation,
++in order to set an file context on the objects.
++
++
++Note: Signal handlers that perform an setkeycreate must take care to
++save, reset, and restore the keycreate context to avoid unexpected behavior.
++.SH "RETURN VALUE"
++On error -1 is returned.
++On success 0 is returned.
++
++.SH "SEE ALSO"
++.BR selinux "(8), " freecon "(3), " getcon "(3), " getexeccon "(3)"
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/lgetfilecon.3 libselinux-2.0.71/man/man3/lgetfilecon.3
 --- nsalibselinux/man/man3/lgetfilecon.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/lgetfilecon.3	2008-09-09 14:30:43.000000000 -0400
++++ libselinux-2.0.71/man/man3/lgetfilecon.3	2008-09-09 16:21:46.000000000 -0400
 @@ -0,0 +1 @@
 +.so man3/getfilecon.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/setkeycreatecon.3 libselinux-2.0.71/man/man3/setkeycreatecon.3
+--- nsalibselinux/man/man3/setkeycreatecon.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/setkeycreatecon.3	2008-09-09 16:22:09.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/getkeycreatecon.3
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.71/man/man8/selinuxconlist.8
 --- nsalibselinux/man/man8/selinuxconlist.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man8/selinuxconlist.8	2008-08-13 09:01:48.000000000 -0400
++++ libselinux-2.0.71/man/man8/selinuxconlist.8	2008-09-09 16:21:46.000000000 -0400
 @@ -0,0 +1,18 @@
 +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -32,7 +79,7 @@
 +secon(8), selinuxdefcon(8)
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.71/man/man8/selinuxdefcon.8
 --- nsalibselinux/man/man8/selinuxdefcon.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man8/selinuxdefcon.8	2008-08-13 09:01:48.000000000 -0400
++++ libselinux-2.0.71/man/man8/selinuxdefcon.8	2008-09-09 16:21:46.000000000 -0400
 @@ -0,0 +1,19 @@
 +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -55,7 +102,7 @@
 +secon(8), selinuxconlist(8)
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.71/src/callbacks.c
 --- nsalibselinux/src/callbacks.c	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/src/callbacks.c	2008-08-13 09:01:48.000000000 -0400
++++ libselinux-2.0.71/src/callbacks.c	2008-09-09 16:21:46.000000000 -0400
 @@ -16,6 +16,7 @@
  {
  	int rc;
@@ -66,7 +113,7 @@
  	va_end(ap);
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.71/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/src/matchpathcon.c	2008-08-13 09:01:48.000000000 -0400
++++ libselinux-2.0.71/src/matchpathcon.c	2008-09-09 16:21:46.000000000 -0400
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- libselinux.spec	9 Sep 2008 19:07:33 -0000	1.340
+++ libselinux.spec	9 Sep 2008 20:24:22 -0000	1.341
@@ -5,7 +5,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.71
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -163,6 +163,9 @@
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.71-4
+- Add missing get/setkeycreatecon man pages
+
 * Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.71-3
 - Split out utilities
 



From jwilson at fedoraproject.org  Tue Sep  9 20:30:30 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue,  9 Sep 2008 20:30:30 +0000 (UTC)
Subject: rpms/kernel/devel config-powerpc64, 1.21, 1.22 kernel.spec, 1.940,
	1.941
Message-ID: <20080909203030.1E3977012A@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18043

Modified Files:
	config-powerpc64 kernel.spec 
Log Message:
* Tue Sep 09 2008 Jarod Wilson <jarod at redhat.com>
- turn ibmveth back on for ppc64, it builds now (#461637)



Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc64,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- config-powerpc64	13 Aug 2008 04:42:28 -0000	1.21
+++ config-powerpc64	9 Sep 2008 20:29:59 -0000	1.22
@@ -51,7 +51,7 @@
 CONFIG_HVC_CONSOLE=y
 CONFIG_HOTPLUG_PCI=y
 CONFIG_THERM_PM72=y
-# CONFIG_IBMVETH is not set
+CONFIG_IBMVETH=m
 CONFIG_SCSI_IBMVSCSI=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.940
retrieving revision 1.941
diff -u -r1.940 -r1.941
--- kernel.spec	9 Sep 2008 06:16:19 -0000	1.940
+++ kernel.spec	9 Sep 2008 20:29:59 -0000	1.941
@@ -1746,6 +1746,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Sep 09 2008 Jarod Wilson <jarod at redhat.com>
+- turn ibmveth back on for ppc64, it builds now (#461637)
+
 * Tue Sep 09 2008 Dave Airlie <airlied at redhat.com>
 - radeon - update modesetting bits - should fix r400
 - add i915 modesetting bits - don't enable these by default yet



From pkgdb at fedoraproject.org  Tue Sep  9 20:31:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 20:31:19 +0000
Subject: [pkgdb] ConsoleKit had acl change status
Message-ID: <20080909203119.DD4F3208D98@bastion.fedora.phx.redhat.com>

davidz has set the watchbugzilla acl on ConsoleKit (Fedora devel) to Approved for jmccann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Tue Sep  9 20:31:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 20:31:21 +0000
Subject: [pkgdb] ConsoleKit had acl change status
Message-ID: <20080909203122.113F9208D9A@bastion.fedora.phx.redhat.com>

davidz has set the watchcommits acl on ConsoleKit (Fedora devel) to Approved for jmccann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From jdennis at fedoraproject.org  Tue Sep  9 20:46:09 2008
From: jdennis at fedoraproject.org (John Dennis)
Date: Tue,  9 Sep 2008 20:46:09 +0000 (UTC)
Subject: rpms/python-nss/devel .cvsignore, 1.2, 1.3 python-nss.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20080909204609.91E677012A@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/python-nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20863

Modified Files:
	.cvsignore python-nss.spec sources 
Log Message:
- clean up ssl_example.py, fix arg list in get_cert_nicknames,
   make certdir cmd line arg consistent with other NSS tools
- update httplib.py to support client auth, add httplib_example.py which illustrates it's use
- fix some documentation
- fix some type usage which were unsafe on 64-bit



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-nss/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jul 2008 17:13:26 -0000	1.2
+++ .cvsignore	9 Sep 2008 20:45:39 -0000	1.3
@@ -1 +1 @@
-python-nss-0.0.tar.bz2
+python-nss-0.1.tar.bz2


Index: python-nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-nss/devel/python-nss.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-nss.spec	9 Jul 2008 18:26:25 -0000	1.2
+++ python-nss.spec	9 Sep 2008 20:45:39 -0000	1.3
@@ -3,8 +3,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-nss
-Version:        0.0
-Release:        2%{?dist}
+Version:        0.1
+Release:        1%{?dist}
 Summary:        Python bindings for Network Security Services (NSS)
 
 Group:          Development/Languages
@@ -65,6 +65,13 @@
 
 
 %changelog
+* Tue Sep  9 2008 John Dennis <jdennis at redhat.com> - 0.1-1
+- clean up ssl_example.py, fix arg list in get_cert_nicknames,
+   make certdir cmd line arg consistent with other NSS tools
+- update httplib.py to support client auth, add httplib_example.py which illustrates it's use
+- fix some documentation
+- fix some type usage which were unsafe on 64-bit
+
 * Wed Jul  9 2008 John Dennis <jdennis at redhat.com> - 0.0-2
 - add docutils to build requires so restructured text works
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-nss/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jul 2008 17:13:26 -0000	1.2
+++ sources	9 Sep 2008 20:45:39 -0000	1.3
@@ -1 +1 @@
-031a5262d4526413305de87a7437b18f  python-nss-0.0.tar.bz2
+f92dcac6c1837d4cc7991678850b449a  python-nss-0.1.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep  9 20:55:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 20:55:49 +0000
Subject: [pkgdb] ConsoleKit ownership updated
Message-ID: <20080909205549.86855208D0F@bastion.fedora.phx.redhat.com>

Package ConsoleKit in Fedora devel was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Tue Sep  9 21:01:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:01:01 +0000
Subject: [pkgdb] ConsoleKit ownership updated
Message-ID: <20080909210101.31D06208D7C@bastion.fedora.phx.redhat.com>

Package ConsoleKit in Fedora devel is now owned by mccann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Tue Sep  9 21:01:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:01:30 +0000
Subject: [pkgdb] ConsoleKit: mccann has requested watchbugzilla
Message-ID: <20080909210130.9D026208D9B@bastion.fedora.phx.redhat.com>

mccann has requested the watchbugzilla acl on ConsoleKit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Tue Sep  9 21:01:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:01:33 +0000
Subject: [pkgdb] ConsoleKit: mccann has requested watchcommits
Message-ID: <20080909210133.289B9208DB2@bastion.fedora.phx.redhat.com>

mccann has requested the watchcommits acl on ConsoleKit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Tue Sep  9 21:01:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:01:37 +0000
Subject: [pkgdb] ConsoleKit: mccann has requested approveacls
Message-ID: <20080909210137.9D0ED208D9F@bastion.fedora.phx.redhat.com>

mccann has requested the approveacls acl on ConsoleKit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Tue Sep  9 21:01:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:01:34 +0000
Subject: [pkgdb] ConsoleKit: mccann has requested commit
Message-ID: <20080909210134.B97B7208DB4@bastion.fedora.phx.redhat.com>

mccann has requested the commit acl on ConsoleKit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From avesh at fedoraproject.org  Tue Sep  9 21:03:00 2008
From: avesh at fedoraproject.org (avesh agarwal)
Date: Tue,  9 Sep 2008 21:03:00 +0000 (UTC)
Subject: rpms/openswan/devel openswan-2.6.16-examples.patch, NONE,
	1.1 .cvsignore, 1.22, 1.23 openswan.spec, 1.64, 1.65 sources,
	1.21, 1.22 openswan-2.6-examples.patch, 1.2,
	NONE openswan-2.6-intwarning.patch, 1.1, NONE
Message-ID: <20080909210300.B93CA7012A@cvs1.fedora.phx.redhat.com>

Author: avesh

Update of /cvs/pkgs/rpms/openswan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23977

Modified Files:
	.cvsignore openswan.spec sources 
Added Files:
	openswan-2.6.16-examples.patch 
Removed Files:
	openswan-2.6-examples.patch openswan-2.6-intwarning.patch 
Log Message:
* Tue Sep 09 2008 Avesh Agarwal <avagarwa at redhat.com> - 2.6.16-1
- new upstream release


openswan-2.6.16-examples.patch:

--- NEW FILE openswan-2.6.16-examples.patch ---
diff -urN openswan-2.6.16.orig/doc/example-configs/l2tp-cert.conf openswan-2.6.16/doc/example-configs/l2tp-cert.conf
--- openswan-2.6.16.orig/doc/example-configs/l2tp-cert.conf	1969-12-31 19:00:00.000000000 -0500
+++ openswan-2.6.16/doc/example-configs/l2tp-cert.conf	2008-09-09 16:23:29.000000000 -0400
@@ -0,0 +1,38 @@
+conn l2tp-X.509
+	#
+	# Configuration for one user with any type of IPsec/L2TP client
+	# including the updated Windows 2000/XP (MS KB Q818043), but
+	# excluding the non-updated Windows 2000/XP.
+	#
+	#
+	# Use a certificate. Disable Perfect Forward Secrecy.
+	#
+	authby=rsasig
+	pfs=no
+	auto=add
+	# we cannot rekey for %any, let client rekey
+	rekey=no
+	# Set ikelifetime and keylife to same defaults windows has
+	ikelifetime=8h
+	keylife=1h
+	# l2tp-over-ipsec is transport mode
+	# See http://bugs.xelerance.com/view.php?id=466
+	type=transport
+	#
+	left=%defaultroute
+	# or you can use: left=YourIPAddress
+	leftrsasigkey=%cert
+	leftcert=/etc/ipsec.d/certs/YourGatewayCertHere.pem
+	leftprotoport=17/1701
+	#
+	# The remote user.
+	#
+	right=%any
+	rightca=%same
+	rightrsasigkey=%cert
+	# Using the magic port of "0" means "any one single port". This is
+	# a work around required for Apple OSX clients that use a randomly
+	# high port, but propose "0" instead of their port.
+	rightprotoport=17/0
+	rightsubnet=vhost:%priv,%no
+
diff -urN openswan-2.6.16.orig/doc/example-configs/l2tp-psk.conf openswan-2.6.16/doc/example-configs/l2tp-psk.conf
--- openswan-2.6.16.orig/doc/example-configs/l2tp-psk.conf	1969-12-31 19:00:00.000000000 -0500
+++ openswan-2.6.16/doc/example-configs/l2tp-psk.conf	2008-09-09 16:23:29.000000000 -0400
@@ -0,0 +1,43 @@
+conn L2TP-PSK-NAT
+	rightsubnet=vhost:%priv
+	also=L2TP-PSK-noNAT
+
+conn L2TP-PSK-noNAT
+	#
+	# Configuration for one user with any type of IPsec/L2TP client
+	# including the updated Windows 2000/XP (MS KB Q818043), but
+	# excluding the non-updated Windows 2000/XP.
+	#
+	#
+	# Use a Preshared Key. Disable Perfect Forward Secrecy.
+	#
+	# PreSharedSecret needs to be specified in /etc/ipsec.secrets as
+	# YourIPAddress	 %any: "sharedsecret"
+	authby=secret
+	pfs=no
+	auto=add
+	keyingtries=3
+	# we cannot rekey for %any, let client rekey
+	rekey=no
+	# Set ikelifetime and keylife to same defaults windows has
+	ikelifetime=8h
+	keylife=1h
+	# l2tp-over-ipsec is transport mode
+	type=transport
+	#
+	left=%defaultroute
+	# or you can use: left=YourIPAddress
+	#
+	# For updated Windows 2000/XP clients,
+	# to support old clients as well, use leftprotoport=17/%any
+	leftprotoport=17/1701
+	#
+	# The remote user.
+	#
+	right=%any
+	# Using the magic port of "0" means "any one single port". This is
+	# a work around required for Apple OSX clients that use a randomly
+	# high port, but propose "0" instead of their port.
+	rightprotoport=17/0
+
+
diff -urN openswan-2.6.16.orig/doc/example-configs/linux-linux.conf openswan-2.6.16/doc/example-configs/linux-linux.conf
--- openswan-2.6.16.orig/doc/example-configs/linux-linux.conf	1969-12-31 19:00:00.000000000 -0500
+++ openswan-2.6.16/doc/example-configs/linux-linux.conf	2008-09-09 16:23:29.000000000 -0400
@@ -0,0 +1,19 @@
+conn linux-to-linux
+	#
+	# Simple use raw RSA keys
+	# After starting openswan, run: ipsec showhostkey --left (or --right)
+	# and fill in the connection similarly to the example below.
+	#
+	left=1.2.3.4
+	# optional
+	# leftsubnet=10.0.1.0/24
+	leftid=@bofh.xelerance.com
+	leftrsasigkey=0sAQPWTXt8DDlEhTZJ91ngNMxTSyuos6JZxXQmtRcwUl6ppUCcuuWvjXrF/qiz6eiL1LMlpGJyG1oVhtFhTaFJl7ZkF/4J1B9LCFzYxvYI97AnLuC0op5pVAZ1SZx29+aRjeMcKC4zbZ6dMMjUdn9H1gqG9rpE0MBEFNSVLEu9U8rtlz14RfxQAQ9ePj64HnGLfgJlDB0VYhKEIcRihy72bvjZ4eoX16S1EY1FgnHyrveZPxRi8sgn6Q19RytEzSmUAlGjvMDhNfenq6WCSYMeqgj0jFSArTNBQmR2QBkUG6NSOXfb+18c6jDPicGmbmWfoRx/PUJo46WiRF4RRmsxnFpbHpklILFzEJ+/k6qHVAekpVfp
+	# The remote user.
+	#
+	right=5.6.7.8
+	rightid=@tla.xelerance.com
+	# optional
+	# rightsubnet=10.0.2.0/24
+	rightrsasigkey=0sAQNxf6caKULJklYZycuo66Ko0U+iHaJUDr0QZHnG4MJ9IRNYi5H6kPxcwKIXkg+OGo+NeUyyWDEc+ox27BFYViAHQNEyBRLZu0kyE681h+cHm7lfCSy0AOEBSCyZF3aGcL8GWxVhtimpJQ4tNxXZg7tLX5sfYw8mZnUBjkHvyccIred/q3cNWbDlq2WU4TL+NBb5FnxXi9Hk/SRV7sMe56fvZuXkcJu4e2C7uocltzzF1b0BZx7yeXwHjzqAWnW/UA54fbSTvzgnrpSC+FMuhWTI1EdxcqGaOFIjGWWGV2nxg/QaPU9i8vpwFwrEEdCJTiqlbYYNudblg4vYthnVNez0/RkfZHfhAaHdbJRSaQzOu88h
+	auto=start
diff -urN openswan-2.6.16.orig/doc/example-configs/oe-exclude-dns.conf openswan-2.6.16/doc/example-configs/oe-exclude-dns.conf
--- openswan-2.6.16.orig/doc/example-configs/oe-exclude-dns.conf	1969-12-31 19:00:00.000000000 -0500
+++ openswan-2.6.16/doc/example-configs/oe-exclude-dns.conf	2008-09-09 16:23:29.000000000 -0400
@@ -0,0 +1,9 @@
+conn let-my-dns-go
+        left=%defaultroute
+        leftnexthop=%defaultroute
+        leftprotoport=17/%any
+        right=0.0.0.0
+        rightsubnet=0.0.0.0/0
+        rightprotoport=17/53
+        type=passthrough
+        auto=route
diff -urN openswan-2.6.16.orig/doc/example-configs/sysctl.conf openswan-2.6.16/doc/example-configs/sysctl.conf
--- openswan-2.6.16.orig/doc/example-configs/sysctl.conf	1969-12-31 19:00:00.000000000 -0500
+++ openswan-2.6.16/doc/example-configs/sysctl.conf	2008-09-09 16:23:29.000000000 -0400
@@ -0,0 +1,23 @@
+
+# example entries for /etc/sysctl.conf
+# forwarding is needed for subnet or l2tp connections
+net.ipv4.ip_forward = 1
+
+# rp_filter is stupid and cannot deal decrypted packets "appearing out of
+# nowhere"
+net.ipv4.conf.default.rp_filter = 0
+
+# when using 1 interface for two networks, and in some other cases with
+# NETKEY, the kernel thinks it can be clever but breaks things.
+net.ipv4.conf.all.send_redirects = 0
+net.ipv4.conf.default.send_redirects = 0
+net.ipv4.icmp_ignore_bogus_error_responses = 1
+net.ipv4.conf.all.log_martians = 0
+net.ipv4.conf.default.log_martians = 0
+
+# these are non-ipsec specific security policies you should use
+net.ipv4.conf.default.accept_source_route = 0
+net.ipv4.conf.all.accept_redirects = 0
+net.ipv4.conf.default.accept_redirects = 0
+
+
diff -urN openswan-2.6.16.orig/doc/example-configs/xauth.conf openswan-2.6.16/doc/example-configs/xauth.conf
--- openswan-2.6.16.orig/doc/example-configs/xauth.conf	1969-12-31 19:00:00.000000000 -0500
+++ openswan-2.6.16/doc/example-configs/xauth.conf	2008-09-09 16:23:29.000000000 -0400
@@ -0,0 +1,34 @@
+conn xauthserver
+	#
+	left=1.2.3.4
+	leftcert=/etc/ipsec.d/certs/xauthserver.pem
+	leftxauthserver=yes
+	leftmodecfgserver=yes
+	#
+	right=%any
+	rightxauthclient=yes
+	rightmodecfgclient=yes
+	#
+	auto=add
+	rekey=yes
+	modecfgpull=yes
+	modecfgdns1=1.2.3.4
+	modecfgdns2=5.6.7.8
+	modecfgwins1=1.2.3.4
+	modecfgwins2=5.6.7.8
+
+conn xauthclient	
+	#
+	left=1.2.3.4
+	leftxauthserver=yes
+	leftmodecfgserver=yes
+	#
+	right=%defaultroute
+	rightxauthclient=yes
+	rightmodecfgclient=yes
+	#
+	auto=add
+	# you probably can not rekey, it requires xauth password, and openswan does not
+	# cache it for you. Other clients might cache it and rekey to an openswan server
+	rekey=no
+	modecfgpull=yes


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	5 Jul 2008 17:56:51 -0000	1.22
+++ .cvsignore	9 Sep 2008 21:02:30 -0000	1.23
@@ -6,3 +6,4 @@
 openswan-2.6.09.tar.gz
 openswan-2.6.14.tar.gz
 openswan-2.6.15.tar.gz
+openswan-2.6.16.tar.gz


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- openswan.spec	5 Jul 2008 17:56:51 -0000	1.64
+++ openswan.spec	9 Sep 2008 21:02:30 -0000	1.65
@@ -1,6 +1,6 @@
 Summary: Openswan IPSEC implementation
 Name: openswan
-Version: 2.6.15
+Version: 2.6.16
 
 Release: 1%{?dist}
 License: GPLv2+
@@ -9,7 +9,7 @@
 
 Source2: ipsec.conf
 
-Patch1: openswan-2.6-examples.patch
+Patch1: openswan-2.6.16-examples.patch
 Patch2: openswan-2.6-relpath.patch
 Patch3: openswan-2.6-noxmlto.patch
 Patch4: openswan-2.6-selinux.patch
@@ -53,7 +53,7 @@
 find doc -name .gitignore -print0 | xargs -0 rm -v
 rm -rf programs/readwriteconf
 
-%patch1 -p1
+%patch1 -p1 
 %patch2 -p1 -b .relpath
 %patch3 -p1 -b .noxmlto
 %patch4 -p1 -b .selinux
@@ -109,7 +109,7 @@
 
 rm -fr %{buildroot}/etc/rc.d/rc*
 
-rm -f %{buildroot}%{_sysconfdir}/ipsec.d/examples
+rm -fr %{buildroot}%{_sysconfdir}/ipsec.d/examples
 
 %clean
 rm -rf %{buildroot}
@@ -148,6 +148,9 @@
 chkconfig --add ipsec || :
 
 %changelog
+* Tue Sep 09 2008 Avesh Agarwal <avagarwa at redhat.com> - 2.6.16-1
+- new upstream release
+
 * Sat Jul 05 2008 Steve Grubb <sgrubb at redhat.com> - 2.6.15-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	5 Jul 2008 17:56:51 -0000	1.21
+++ sources	9 Sep 2008 21:02:30 -0000	1.22
@@ -1 +1 @@
-767857e546a49f4f2183704343623411  openswan-2.6.15.tar.gz
+ef0ea8f9082df70c993a035904d538c7  openswan-2.6.16.tar.gz


--- openswan-2.6-examples.patch DELETED ---


--- openswan-2.6-intwarning.patch DELETED ---



From guthrie at fedoraproject.org  Tue Sep  9 21:04:22 2008
From: guthrie at fedoraproject.org (John T. Guthrie III)
Date: Tue,  9 Sep 2008 21:04:22 +0000 (UTC)
Subject: rpms/dxpc/devel .cvsignore, 1.4, 1.5 dxpc.spec, 1.18, 1.19 sources, 
	1.7, 1.8
Message-ID: <20080909210422.D56657012A@cvs1.fedora.phx.redhat.com>

Author: guthrie

Update of /cvs/pkgs/rpms/dxpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24310

Modified Files:
	.cvsignore dxpc.spec sources 
Log Message:
Updating sources to dxpc-3.9.1-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dxpc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Feb 2007 22:27:02 -0000	1.4
+++ .cvsignore	9 Sep 2008 21:03:52 -0000	1.5
@@ -1 +1 @@
-dxpc-3.9.1b1.tgz
+dxpc-3.9.1.tgz


Index: dxpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dxpc/devel/dxpc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dxpc.spec	7 Jul 2008 14:54:16 -0000	1.18
+++ dxpc.spec	9 Sep 2008 21:03:52 -0000	1.19
@@ -1,12 +1,12 @@
 Summary: A Differential X Protocol Compressor
 Name:    dxpc
 Version: 3.9.1
-Release: 0.3.b1%{?dist}.1
+Release: 1
 
 License: BSD
 Group:   User Interface/X
-URL:     http://www.vigor.nu/dxpc/
-Source:  http://www.vigor.nu/dxpc-%{version}b1.tgz
+URL:     http://www.vigor.nu/%{name}/
+Source:  http://www.vigor.nu/%{name}/${version}/%{name}-%{version}.tgz
 Patch0: dxpc-3.9.0-mandir.patch
 Patch1: dxpc-3.9.0-dxpcssh.patch
 Patch2: dxpc-3.9.1b1-destdir.patch
@@ -26,7 +26,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}b1
+%setup -q
 
 %patch0 -p1 -b .mandir
 %patch1 -p0 -b .dxpcssh
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Tue Sep 09 2008 John Guthrie <guthrie at counterexample.org> - 3.9.1-1
+- Upgraded source code to 3.9.1-1
+
 * Mon Jul 07 2008 Adam Jackson <ajax at redhat.com> 3.9.1-0.3.b1.1
 - Fix %%fedora string comparison to be integer comparison.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dxpc/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Feb 2007 22:27:02 -0000	1.7
+++ sources	9 Sep 2008 21:03:52 -0000	1.8
@@ -1 +1 @@
-b3ea5af52360a141c2c56182b99c6516  dxpc-3.9.1b1.tgz
+72597625b2dff38af1e6ec435372da79  dxpc-3.9.1.tgz



From rishi at fedoraproject.org  Tue Sep  9 21:08:40 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue,  9 Sep 2008 21:08:40 +0000 (UTC)
Subject: rpms/httrack/F-8 httrack-3.42.93-desktop.patch, NONE,
	1.1 httrack-3.42.93-utf-8.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 httrack.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20080909210841.04B917012A@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/httrack/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25259

Modified Files:
	.cvsignore httrack.spec sources 
Added Files:
	httrack-3.42.93-desktop.patch httrack-3.42.93-utf-8.patch 
Log Message:
* Tue Sep 09 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.42.93-1
- Version bump to 3.42.93. Closes Red Hat Bugzilla bugs #457523
  (CVE-2008-3429)and #460529.
- Use of generic macros in the publicly exposed API fixed by upstream.
- Use of xdg-open now added by upstream.
- OpenSSL version updated by upstream.
- Linkage issues in libhtsjava.so fixed by upstream.


httrack-3.42.93-desktop.patch:

--- NEW FILE httrack-3.42.93-desktop.patch ---
diff -urNp httrack-3.42.93.orig/html/server/div/WebHTTrack.desktop httrack-3.42.93/html/server/div/WebHTTrack.desktop
--- httrack-3.42.93.orig/html/server/div/WebHTTrack.desktop	2008-08-16 15:03:53.000000000 +0530
+++ httrack-3.42.93/html/server/div/WebHTTrack.desktop	2008-09-09 19:29:32.168936695 +0530
@@ -2,10 +2,9 @@
 Encoding=UTF-8
 Version=1.0
 Type=Application
-Categories=Application;Network
+Categories=Network;
 Terminal=false
 Name=WebHTTrack Website Copier
 Comment=Copy websites to your computer
 Exec=webhttrack
-Icon=/usr/share/httrack/icons/webhttrack.xpm
-Type=Application
+Icon=webhttrack
diff -urNp httrack-3.42.93.orig/html/server/div/WebHTTrack-Websites.desktop httrack-3.42.93/html/server/div/WebHTTrack-Websites.desktop
--- httrack-3.42.93.orig/html/server/div/WebHTTrack-Websites.desktop	2008-08-16 15:03:43.000000000 +0530
+++ httrack-3.42.93/html/server/div/WebHTTrack-Websites.desktop	2008-09-09 19:28:38.927687527 +0530
@@ -2,10 +2,9 @@
 Encoding=UTF-8
 Version=1.0
 Type=Application
-Categories=Application;Network
+Categories=Network;
 Terminal=false
 Name=Browse Mirrored Websites
 Comment=Browse Websites Mirrored by WebHTTrack
 Exec=webhttrack browse
-Icon=/usr/share/httrack/icons/webhttrack.xpm
-Type=Application
+Icon=webhttrack

httrack-3.42.93-utf-8.patch:

--- NEW FILE httrack-3.42.93-utf-8.patch ---
diff -urNp httrack-3.42.1.orig/html/contact.html httrack-3.42.1/html/contact.html
--- httrack-3.42.1.orig/html/contact.html	2007-01-14 19:37:06.000000000 +0530
+++ httrack-3.42.1/html/contact.html	2007-11-18 18:49:48.000000000 +0530
@@ -1,7 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
 
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="description" content="HTTrack is an easy-to-use website mirror utility. It allows you to download a World Wide website from the Internet to a local directory,building recursively all structures, getting html, images, and other files from the server to your computer. Links are rebuiltrelatively so that you can freely browse to the local site (works with any browser). You can mirror several sites together so that you can jump from one toanother. You can, also, update an existing mirror site, or resume an interrupted download. The robot is fully configurable, with an integrated help" />
 	<meta name="keywords" content="httrack, HTTRACK, HTTrack, winhttrack, WINHTTRACK, WinHTTrack, offline browser, web mirror utility, aspirateur web, surf offline, web capture, www mirror utility, browse offline, local  site builder, website mirroring, aspirateur www, internet grabber, capture de site web, internet tool, hors connexion, unix, dos, windows 95, windows 98, solaris, ibm580, AIX 4.0, HTS, HTGet, web aspirator, web aspirateur, libre, GPL, GNU, free software" />
 	<title>HTTrack Website Copier - Offline Browser</title>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Nov 2007 19:05:22 -0000	1.2
+++ .cvsignore	9 Sep 2008 21:08:10 -0000	1.3
@@ -1 +1 @@
-httrack-3.42.tar.gz
+httrack-3.43-BETA-4.tar.gz


Index: httrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/F-8/httrack.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- httrack.spec	23 Feb 2008 07:48:27 -0000	1.4
+++ httrack.spec	9 Sep 2008 21:08:10 -0000	1.5
@@ -11,29 +11,24 @@
 
 Summary:	Website copier and offline browser
 Name:		httrack
-Version:	3.42
-Release:	10%{?dist}
+Version:	3.42.93
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.httrack.com/
-Source0:	http://www.httrack.com/%{name}-3.42.tar.gz
-Source1:	htsglobal.h
+Source0:	http://www.httrack.com/%{name}-3.43-BETA-4.tar.gz
 
 Patch0:		%{name}-%{version}-desktop.patch
-Patch1:		%{name}-%{version}-generic-macros.patch
-Patch2:		%{name}-%{version}-libhtsjava.patch
-Patch3:		%{name}-%{version}-openssl.patch
-Patch4:		%{name}-%{version}-utf-8.patch
-Patch5:		%{name}-%{version}-xdg-utils.patch
+Patch1:		%{name}-%{version}-utf-8.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	openssl = %{_openssl_version}
 Requires:	xdg-utils
 
-BuildRequires:	chrpath
 BuildRequires:	desktop-file-utils
 BuildRequires:	dos2unix
+BuildRequires:	libtool
 BuildRequires:	zlib-devel
 
 %description
@@ -56,15 +51,9 @@
 This package contains development files for %{name}.
 
 %prep
-%setup -q -n %{name}-3.42.1
+%setup -q -n %{name}-3.42.93
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
-cp -p %{SOURCE1} ./src
 
 # Suppress rpmlint error.
 chmod 644 `find . -name "*.c" -perm /111 -print`
@@ -94,6 +83,10 @@
 %build
 %configure --disable-static
 
+# Remove rpaths.
+rm -f ./libtool
+cp %{_bindir}/libtool .
+
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
 
@@ -106,6 +99,7 @@
 
 make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -delete
+find $RPM_BUILD_ROOT -type f -name "*.a" -delete
 
 # Remove generic header from /usr/include/httrack.
 rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
@@ -141,11 +135,6 @@
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/WebHTTrack-Websites.desktop
 
-# Remove rpaths.
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/htsserver
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/%{name}
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libhtsjava.so.2.0.42
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -163,6 +152,10 @@
 %doc html
 %doc %{name}-doc.html
 %doc templates
+%doc %{_mandir}/man1/htsserver.1*
+%doc %{_mandir}/man1/%{name}.1*
+%doc %{_mandir}/man1/proxytrack.1*
+%doc %{_mandir}/man1/webhttrack.1*
 %{_bindir}/htsserver
 %{_bindir}/%{name}
 %{_bindir}/proxytrack
@@ -171,11 +164,8 @@
 %{_datadir}/applications/fedora-WebHTTrack-Websites.desktop
 %{_datadir}/pixmaps/%{name}.xpm
 %{_datadir}/pixmaps/webhttrack.xpm
-%{_libdir}/*.so.*
-%{_mandir}/man1/htsserver.1.gz
-%{_mandir}/man1/%{name}.1.gz
-%{_mandir}/man1/proxytrack.1.gz
-%{_mandir}/man1/webhttrack.1.gz
+%{_libdir}/libhtsjava.so.*
+%{_libdir}/libhttrack.so.*
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
@@ -183,12 +173,21 @@
 %files devel
 %defattr(-,root,root,-)
 %doc libtest
-%{_libdir}/*.so
+%{_libdir}/libhtsjava.so
+%{_libdir}/libhttrack.so
 
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*
 
 %changelog
+* Tue Sep 09 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.42.93-1
+- Version bump to 3.42.93. Closes Red Hat Bugzilla bugs #457523
+  (CVE-2008-3429)and #460529.
+- Use of generic macros in the publicly exposed API fixed by upstream.
+- Use of xdg-open now added by upstream.
+- OpenSSL version updated by upstream.
+- Linkage issues in libhtsjava.so fixed by upstream.
+
 * Thu Feb 21 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.42-10
 - Fixed runtime problems with --excludedocs.
 - Omitted unused direct shared library dependencies.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Nov 2007 19:05:22 -0000	1.2
+++ sources	9 Sep 2008 21:08:10 -0000	1.3
@@ -1 +1 @@
-8bb5f09ee007fe6e9875c070b57e0359  httrack-3.42.tar.gz
+fe3fbd3129ac96761bab34a5b1a77aa8  httrack-3.43-BETA-4.tar.gz



From pkgdb at fedoraproject.org  Tue Sep  9 21:11:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:11:42 +0000
Subject: [pkgdb] python-gasp: lfaraone has requested commit
Message-ID: <20080909211143.1428D208D98@bastion.fedora.phx.redhat.com>

lfaraone has requested the commit acl on python-gasp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 21:11:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:11:48 +0000
Subject: [pkgdb] python-gasp: lfaraone has requested commit
Message-ID: <20080909211148.CD5BE20876E@bastion.fedora.phx.redhat.com>

lfaraone has requested the commit acl on python-gasp (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 21:11:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:11:51 +0000
Subject: [pkgdb] python-gasp: lfaraone has requested commit
Message-ID: <20080909211151.4E4E5208D9A@bastion.fedora.phx.redhat.com>

lfaraone has requested the commit acl on python-gasp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 21:11:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:11:54 +0000
Subject: [pkgdb] python-gasp: lfaraone has requested approveacls
Message-ID: <20080909211154.7A7B2208D9C@bastion.fedora.phx.redhat.com>

lfaraone has requested the approveacls acl on python-gasp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 21:11:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:11:56 +0000
Subject: [pkgdb] python-gasp: lfaraone has requested approveacls
Message-ID: <20080909211156.67FB4208D98@bastion.fedora.phx.redhat.com>

lfaraone has requested the approveacls acl on python-gasp (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 21:11:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:11:58 +0000
Subject: [pkgdb] python-gasp: lfaraone has requested approveacls
Message-ID: <20080909211158.7E572208DA0@bastion.fedora.phx.redhat.com>

lfaraone has requested the approveacls acl on python-gasp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From rishi at fedoraproject.org  Tue Sep  9 21:12:43 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue,  9 Sep 2008 21:12:43 +0000 (UTC)
Subject: rpms/httrack/F-9 httrack-3.42.93-desktop.patch, NONE,
	1.1 httrack-3.42.93-utf-8.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 httrack.spec, 1.8, 1.9 sources, 1.2, 1.3 htsglobal.h, 1.1,
	NONE httrack-3.42-desktop.patch, 1.1,
	NONE httrack-3.42-generic-macros.patch, 1.1,
	NONE httrack-3.42-libhtsjava.patch, 1.1,
	NONE httrack-3.42-openssl.patch, 1.3,
	NONE httrack-3.42-utf-8.patch, 1.1,
	NONE httrack-3.42-xdg-utils.patch, 1.1, NONE
Message-ID: <20080909211243.E65C07012A@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/httrack/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26119

Modified Files:
	.cvsignore httrack.spec sources 
Added Files:
	httrack-3.42.93-desktop.patch httrack-3.42.93-utf-8.patch 
Removed Files:
	htsglobal.h httrack-3.42-desktop.patch 
	httrack-3.42-generic-macros.patch 
	httrack-3.42-libhtsjava.patch httrack-3.42-openssl.patch 
	httrack-3.42-utf-8.patch httrack-3.42-xdg-utils.patch 
Log Message:
* Tue Sep 09 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.42.93-1
- Version bump to 3.42.93. Closes Red Hat Bugzilla bugs #457523
  (CVE-2008-3429)and #460529.
- Use of generic macros in the publicly exposed API fixed by upstream.
- Use of xdg-open now added by upstream.
- OpenSSL version updated by upstream.
- Linkage issues in libhtsjava.so fixed by upstream.


httrack-3.42.93-desktop.patch:

--- NEW FILE httrack-3.42.93-desktop.patch ---
diff -urNp httrack-3.42.93.orig/html/server/div/WebHTTrack.desktop httrack-3.42.93/html/server/div/WebHTTrack.desktop
--- httrack-3.42.93.orig/html/server/div/WebHTTrack.desktop	2008-08-16 15:03:53.000000000 +0530
+++ httrack-3.42.93/html/server/div/WebHTTrack.desktop	2008-09-09 19:29:32.168936695 +0530
@@ -2,10 +2,9 @@
 Encoding=UTF-8
 Version=1.0
 Type=Application
-Categories=Application;Network
+Categories=Network;
 Terminal=false
 Name=WebHTTrack Website Copier
 Comment=Copy websites to your computer
 Exec=webhttrack
-Icon=/usr/share/httrack/icons/webhttrack.xpm
-Type=Application
+Icon=webhttrack
diff -urNp httrack-3.42.93.orig/html/server/div/WebHTTrack-Websites.desktop httrack-3.42.93/html/server/div/WebHTTrack-Websites.desktop
--- httrack-3.42.93.orig/html/server/div/WebHTTrack-Websites.desktop	2008-08-16 15:03:43.000000000 +0530
+++ httrack-3.42.93/html/server/div/WebHTTrack-Websites.desktop	2008-09-09 19:28:38.927687527 +0530
@@ -2,10 +2,9 @@
 Encoding=UTF-8
 Version=1.0
 Type=Application
-Categories=Application;Network
+Categories=Network;
 Terminal=false
 Name=Browse Mirrored Websites
 Comment=Browse Websites Mirrored by WebHTTrack
 Exec=webhttrack browse
-Icon=/usr/share/httrack/icons/webhttrack.xpm
-Type=Application
+Icon=webhttrack

httrack-3.42.93-utf-8.patch:

--- NEW FILE httrack-3.42.93-utf-8.patch ---
diff -urNp httrack-3.42.1.orig/html/contact.html httrack-3.42.1/html/contact.html
--- httrack-3.42.1.orig/html/contact.html	2007-01-14 19:37:06.000000000 +0530
+++ httrack-3.42.1/html/contact.html	2007-11-18 18:49:48.000000000 +0530
@@ -1,7 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
 
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="description" content="HTTrack is an easy-to-use website mirror utility. It allows you to download a World Wide website from the Internet to a local directory,building recursively all structures, getting html, images, and other files from the server to your computer. Links are rebuiltrelatively so that you can freely browse to the local site (works with any browser). You can mirror several sites together so that you can jump from one toanother. You can, also, update an existing mirror site, or resume an interrupted download. The robot is fully configurable, with an integrated help" />
 	<meta name="keywords" content="httrack, HTTRACK, HTTrack, winhttrack, WINHTTRACK, WinHTTrack, offline browser, web mirror utility, aspirateur web, surf offline, web capture, www mirror utility, browse offline, local  site builder, website mirroring, aspirateur www, internet grabber, capture de site web, internet tool, hors connexion, unix, dos, windows 95, windows 98, solaris, ibm580, AIX 4.0, HTS, HTGet, web aspirator, web aspirateur, libre, GPL, GNU, free software" />
 	<title>HTTrack Website Copier - Offline Browser</title>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Nov 2007 19:12:00 -0000	1.2
+++ .cvsignore	9 Sep 2008 21:12:13 -0000	1.3
@@ -1 +1 @@
-httrack-3.42.tar.gz
+httrack-3.43-BETA-4.tar.gz


Index: httrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/F-9/httrack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- httrack.spec	23 Feb 2008 07:43:12 -0000	1.8
+++ httrack.spec	9 Sep 2008 21:12:13 -0000	1.9
@@ -11,29 +11,24 @@
 
 Summary:	Website copier and offline browser
 Name:		httrack
-Version:	3.42
-Release:	10%{?dist}
+Version:	3.42.93
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.httrack.com/
-Source0:	http://www.httrack.com/%{name}-3.42.tar.gz
-Source1:	htsglobal.h
+Source0:	http://www.httrack.com/%{name}-3.43-BETA-4.tar.gz
 
 Patch0:		%{name}-%{version}-desktop.patch
-Patch1:		%{name}-%{version}-generic-macros.patch
-Patch2:		%{name}-%{version}-libhtsjava.patch
-Patch3:		%{name}-%{version}-openssl.patch
-Patch4:		%{name}-%{version}-utf-8.patch
-Patch5:		%{name}-%{version}-xdg-utils.patch
+Patch1:		%{name}-%{version}-utf-8.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	openssl = %{_openssl_version}
 Requires:	xdg-utils
 
-BuildRequires:	chrpath
 BuildRequires:	desktop-file-utils
 BuildRequires:	dos2unix
+BuildRequires:	libtool
 BuildRequires:	zlib-devel
 
 %description
@@ -56,15 +51,9 @@
 This package contains development files for %{name}.
 
 %prep
-%setup -q -n %{name}-3.42.1
+%setup -q -n %{name}-3.42.93
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
-cp -p %{SOURCE1} ./src
 
 # Suppress rpmlint error.
 chmod 644 `find . -name "*.c" -perm /111 -print`
@@ -94,6 +83,10 @@
 %build
 %configure --disable-static
 
+# Remove rpaths.
+rm -f ./libtool
+cp %{_bindir}/libtool .
+
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
 
@@ -106,6 +99,7 @@
 
 make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -delete
+find $RPM_BUILD_ROOT -type f -name "*.a" -delete
 
 # Remove generic header from /usr/include/httrack.
 rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
@@ -141,11 +135,6 @@
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/WebHTTrack-Websites.desktop
 
-# Remove rpaths.
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/htsserver
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/%{name}
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libhtsjava.so.2.0.42
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -163,6 +152,10 @@
 %doc html
 %doc %{name}-doc.html
 %doc templates
+%doc %{_mandir}/man1/htsserver.1*
+%doc %{_mandir}/man1/%{name}.1*
+%doc %{_mandir}/man1/proxytrack.1*
+%doc %{_mandir}/man1/webhttrack.1*
 %{_bindir}/htsserver
 %{_bindir}/%{name}
 %{_bindir}/proxytrack
@@ -171,11 +164,8 @@
 %{_datadir}/applications/fedora-WebHTTrack-Websites.desktop
 %{_datadir}/pixmaps/%{name}.xpm
 %{_datadir}/pixmaps/webhttrack.xpm
-%{_libdir}/*.so.*
-%{_mandir}/man1/htsserver.1.gz
-%{_mandir}/man1/%{name}.1.gz
-%{_mandir}/man1/proxytrack.1.gz
-%{_mandir}/man1/webhttrack.1.gz
+%{_libdir}/libhtsjava.so.*
+%{_libdir}/libhttrack.so.*
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
@@ -183,12 +173,21 @@
 %files devel
 %defattr(-,root,root,-)
 %doc libtest
-%{_libdir}/*.so
+%{_libdir}/libhtsjava.so
+%{_libdir}/libhttrack.so
 
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*
 
 %changelog
+* Tue Sep 09 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.42.93-1
+- Version bump to 3.42.93. Closes Red Hat Bugzilla bugs #457523
+  (CVE-2008-3429)and #460529.
+- Use of generic macros in the publicly exposed API fixed by upstream.
+- Use of xdg-open now added by upstream.
+- OpenSSL version updated by upstream.
+- Linkage issues in libhtsjava.so fixed by upstream.
+
 * Thu Feb 21 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.42-10
 - Fixed runtime problems with --excludedocs.
 - Omitted unused direct shared library dependencies.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Nov 2007 19:12:00 -0000	1.2
+++ sources	9 Sep 2008 21:12:13 -0000	1.3
@@ -1 +1 @@
-8bb5f09ee007fe6e9875c070b57e0359  httrack-3.42.tar.gz
+fe3fbd3129ac96761bab34a5b1a77aa8  httrack-3.43-BETA-4.tar.gz


--- htsglobal.h DELETED ---


--- httrack-3.42-desktop.patch DELETED ---


--- httrack-3.42-generic-macros.patch DELETED ---


--- httrack-3.42-libhtsjava.patch DELETED ---


--- httrack-3.42-openssl.patch DELETED ---


--- httrack-3.42-utf-8.patch DELETED ---


--- httrack-3.42-xdg-utils.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Sep  9 21:13:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:13:04 +0000
Subject: [pkgdb] bluecurve-classic-metacity-theme: davidz has given up
	watchbugzilla
Message-ID: <20080909211304.7AF1B208771@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on bluecurve-classic-metacity-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-classic-metacity-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:13:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:13:06 +0000
Subject: [pkgdb] bluecurve-classic-metacity-theme: davidz has given up
	watchcommits
Message-ID: <20080909211306.9C5B2208D7C@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on bluecurve-classic-metacity-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-classic-metacity-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:13:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:13:29 +0000
Subject: [pkgdb] bluecurve-gdm-theme: davidz has given up watchbugzilla
Message-ID: <20080909211329.3454A208771@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on bluecurve-gdm-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-gdm-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:13:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:13:30 +0000
Subject: [pkgdb] bluecurve-gdm-theme: davidz has given up watchcommits
Message-ID: <20080909211330.A5779208D7C@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on bluecurve-gdm-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-gdm-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:13:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:13:34 +0000
Subject: [pkgdb] bluecurve-gnome-theme: davidz has given up watchbugzilla
Message-ID: <20080909211334.14590208D9A@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on bluecurve-gnome-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-gnome-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:13:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:13:35 +0000
Subject: [pkgdb] bluecurve-gnome-theme: davidz has given up watchcommits
Message-ID: <20080909211335.5F4DF208D9E@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on bluecurve-gnome-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-gnome-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:13:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:13:39 +0000
Subject: [pkgdb] bluecurve-gtk-themes: davidz has given up watchbugzilla
Message-ID: <20080909211339.32D2F208D9F@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on bluecurve-gtk-themes (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-gtk-themes



From pkgdb at fedoraproject.org  Tue Sep  9 21:13:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:13:41 +0000
Subject: [pkgdb] bluecurve-gtk-themes: davidz has given up watchcommits
Message-ID: <20080909211341.23675208D0F@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on bluecurve-gtk-themes (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-gtk-themes



From pkgdb at fedoraproject.org  Tue Sep  9 21:13:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:13:43 +0000
Subject: [pkgdb] bluecurve-icon-theme: davidz has given up watchbugzilla
Message-ID: <20080909211343.CB155208DA2@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on bluecurve-icon-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-icon-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:13:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:13:44 +0000
Subject: [pkgdb] bluecurve-icon-theme: davidz has given up watchcommits
Message-ID: <20080909211345.00102208DA5@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on bluecurve-icon-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-icon-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:13:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:13:52 +0000
Subject: [pkgdb] bluecurve-kde-theme: davidz has given up watchbugzilla
Message-ID: <20080909211352.2C614208D97@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on bluecurve-kde-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-kde-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:13:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:13:54 +0000
Subject: [pkgdb] bluecurve-kde-theme: davidz has given up watchcommits
Message-ID: <20080909211354.C6600208DA9@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on bluecurve-kde-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-kde-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:13:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:13:58 +0000
Subject: [pkgdb] bluecurve-kdm-theme: davidz has given up watchbugzilla
Message-ID: <20080909211358.97E9F208DB1@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on bluecurve-kdm-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-kdm-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:00 +0000
Subject: [pkgdb] bluecurve-kdm-theme: davidz has given up watchcommits
Message-ID: <20080909211400.1BF62208DB5@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on bluecurve-kdm-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-kdm-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:02 +0000
Subject: [pkgdb] bluecurve-kwin-theme: davidz has given up watchbugzilla
Message-ID: <20080909211403.307DC208D9F@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on bluecurve-kwin-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-kwin-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:04 +0000
Subject: [pkgdb] bluecurve-kwin-theme: davidz has given up watchcommits
Message-ID: <20080909211404.4EB4D208DBB@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on bluecurve-kwin-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-kwin-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:07 +0000
Subject: [pkgdb] bluecurve-metacity-theme: davidz has given up watchbugzilla
Message-ID: <20080909211407.2A71B208DBF@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on bluecurve-metacity-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-metacity-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:08 +0000
Subject: [pkgdb] bluecurve-metacity-theme: davidz has given up watchcommits
Message-ID: <20080909211408.62375208DC2@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on bluecurve-metacity-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-metacity-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:11 +0000
Subject: [pkgdb] bluecurve-xmms-skin: davidz has given up watchbugzilla
Message-ID: <20080909211411.CD825208D98@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on bluecurve-xmms-skin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-xmms-skin



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:13 +0000
Subject: [pkgdb] bluecurve-xmms-skin: davidz has given up watchcommits
Message-ID: <20080909211413.65E4E208DC3@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on bluecurve-xmms-skin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluecurve-xmms-skin



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:15 +0000
Subject: [pkgdb] fedorabubbles-gdm-theme: davidz has given up watchbugzilla
Message-ID: <20080909211416.0ADF0208DC7@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on fedorabubbles-gdm-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedorabubbles-gdm-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:17 +0000
Subject: [pkgdb] fedorabubbles-gdm-theme: davidz has given up watchcommits
Message-ID: <20080909211417.49199208DCA@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on fedorabubbles-gdm-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedorabubbles-gdm-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:19 +0000
Subject: [pkgdb] fedoradna-gdm-theme: davidz has given up watchbugzilla
Message-ID: <20080909211419.D3BD4208DCF@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on fedoradna-gdm-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedoradna-gdm-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:21 +0000
Subject: [pkgdb] fedoradna-gdm-theme: davidz has given up watchcommits
Message-ID: <20080909211421.775F0208DD2@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on fedoradna-gdm-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedoradna-gdm-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:25 +0000
Subject: [pkgdb] fedoradna-kdm-theme: davidz has given up watchbugzilla
Message-ID: <20080909211425.517C0208DA3@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on fedoradna-kdm-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedoradna-kdm-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:26 +0000
Subject: [pkgdb] fedoradna-kdm-theme: davidz has given up watchcommits
Message-ID: <20080909211426.EF18A2D0023@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on fedoradna-kdm-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedoradna-kdm-theme



From spot at fedoraproject.org  Tue Sep  9 21:14:28 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 21:14:28 +0000 (UTC)
Subject: rpms/perl-Authen-Radius/devel LICENSING.txt, NONE,
	1.1 perl-Authen-Radius.spec, 1.5, 1.6
Message-ID: <20080909211428.7EDEE7012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Authen-Radius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26526

Modified Files:
	perl-Authen-Radius.spec 
Added Files:
	LICENSING.txt 
Log Message:
fix licensing


--- NEW FILE LICENSING.txt ---
Upstream copyright holders for RadiusPerl gave their permission for Fedora to
distribute the code under Artistic 2.0:

*****

Date: Tue, 9 Sep 2008 20:09:21 +0200
From: Carl Declerck <carl at weirdhenge.org>
To: "Tom \"spot\" Callaway" <tcallawa at redhat.com>
Subject: Re: License of RadiusPerl

Tom, Artistic 2.0 is OK for me.

Regards,
Carl.

*****

Date: Tue, 09 Sep 2008 13:38:02 -0700
From: Andriy Zhylenko <Andriy.Zhylenko at portaone.com>
To: "Tom \"spot\" Callaway" <tcallawa at redhat.com>
CC: Carl Declerck <carl at weirdhenge.org>
Subject: Re: License of RadiusPerl

Hello Tom,

Sorry for the delay, I have returned to the US only yesterday. Yes, you 
do have my permission to distribute Authen::Radius under Artistic 2.0

BTW, would RedHat be interested in doing a press-release with PortaOne 
regarding this license change? I believe this will help do educate the 
developer's community on the changes in licenses and perhaps encourage 
more people to change the licensing conditions...

With best regards,
Andriy Zhylenko

*****

Artistic License 2.0

Copyright (c) 2000-2006, The Perl Foundation.

Everyone is permitted to copy and distribute verbatim copies of this license 
document, but changing it is not allowed.

Preamble

This license establishes the terms under which a given free software Package 
may be copied, modified, distributed, and/or redistributed. The intent is that 
the Copyright Holder maintains some artistic control over the development of 
that Package while still keeping the Package available as open source and free 
software.

You are always permitted to make arrangements wholly outside of this license 
directly with the Copyright Holder of a given Package. If the terms of this 
license do not permit the full use that you propose to make of the Package, you 
should contact the Copyright Holder and seek a different licensing arrangement.

Definitions

"Copyright Holder" means the individual(s) or organization(s) named in the 
copyright notice for the entire Package.

"Contributor" means any party that has contributed code or other material to 
the Package, in accordance with the Copyright Holder's procedures.

"You" and "your" means any person who would like to copy, distribute, or modify 
the Package.

"Package" means the collection of files distributed by the Copyright Holder, and 
derivatives of that collection and/or of those files. A given Package may 
consist of either the Standard Version, or a Modified Version.

"Distribute" means providing a copy of the Package or making it accessible to 
anyone else, or in the case of a company or organization, to others outside of 
your company or organization.

"Distributor Fee" means any fee that you charge for Distributing this Package or 
providing support for this Package to another party. It does not mean licensing 
fees.

"Standard Version" refers to the Package if it has not been modified, or has 
been modified only in ways explicitly requested by the Copyright Holder.

"Modified Version" means the Package, if it has been changed, and such changes 
were not explicitly requested by the Copyright Holder.

"Original License" means this Artistic License as Distributed with the Standard 
Version of the Package, in its current version or as it may be modified by The 
Perl Foundation in the future.

"Source" form means the source code, documentation source, and configuration 
files for the Package.

"Compiled" form means the compiled bytecode, object code, binary, or any other 
form resulting from mechanical transformation or translation of the Source form.

Permission for Use and Modification Without Distribution

(1) You are permitted to use the Standard Version and create and use Modified 
Versions for any purpose without restriction, provided that you do not 
Distribute the Modified Version.

Permissions for Redistribution of the Standard Version

(2) You may Distribute verbatim copies of the Source form of the Standard 
Version of this Package in any medium without restriction, either gratis or for 
a Distributor Fee, provided that you duplicate all of the original copyright 
notices and associated disclaimers. At your discretion, such verbatim copies may 
or may not include a Compiled form of the Package.

(3) You may apply any bug fixes, portability changes, and other modifications 
made available from the Copyright Holder. The resulting Package will still be 
considered the Standard Version, and as such will be subject to the Original 
License.

Distribution of Modified Versions of the Package as Source

(4) You may Distribute your Modified Version as Source (either gratis or for a 
Distributor Fee, and with or without a Compiled form of the Modified Version) 
provided that you clearly document how it differs from the Standard Version, 
including, but not limited to, documenting any non-standard features, 
executables, or modules, and provided that you do at least ONE of the following:

(a) make the Modified Version available to the Copyright Holder of the Standard 
Version, under the Original License, so that the Copyright Holder may include 
your modifications in the Standard Version.
(b) ensure that installation of your Modified Version does not prevent the user 
installing or running the Standard Version. In addition, the Modified Version 
must bear a name that is different from the name of the Standard Version.
(c) allow anyone who receives a copy of the Modified Version to make the Source 
form of the Modified Version available to others under
(i) the Original License or
(ii) a license that permits the licensee to freely copy, modify and redistribute 
the Modified Version using the same licensing terms that apply to the copy that 
the licensee received, and requires that the Source form of the Modified 
Version, and of any works derived from it, be made freely available in that 
license fees are prohibited but Distributor Fees are allowed.

Distribution of Compiled Forms of the Standard Version or Modified Versions 
without the Source

(5) You may Distribute Compiled forms of the Standard Version without the 
Source, provided that you include complete instructions on how to get the Source 
of the Standard Version. Such instructions must be valid at the time of your 
distribution. If these instructions, at any time while you are carrying out such 
distribution, become invalid, you must provide new instructions on demand or 
cease further distribution. If you provide valid instructions or cease 
distribution within thirty days after you become aware that the instructions are 
invalid, then you do not forfeit any of your rights under this license.

(6) You may Distribute a Modified Version in Compiled form without the Source, 
provided that you comply with Section 4 with respect to the Source of the 
Modified Version.

Aggregating or Linking the Package

(7) You may aggregate the Package (either the Standard Version or Modified 
Version) with other packages and Distribute the resulting aggregation provided 
that you do not charge a licensing fee for the Package. Distributor Fees are 
permitted, and licensing fees for other components in the aggregation are 
permitted. The terms of this license apply to the use and Distribution of the 
Standard or Modified Versions as included in the aggregation.

(8) You are permitted to link Modified and Standard Versions with other works, 
to embed the Package in a larger work of your own, or to build stand-alone 
binary or bytecode versions of applications that include the Package, and 
Distribute the result without restriction, provided the result does not 
expose a direct interface to the Package.

Items That are Not Considered Part of a Modified Version

(9) Works (including, but not limited to, modules and scripts) that merely 
extend or make use of the Package, do not, by themselves, cause the Package to 
be a Modified Version. In addition, such works are not considered parts of the 
Package itself, and are not subject to the terms of this license.

General Provisions

(10) Any use, modification, and distribution of the Standard or Modified 
Versions is governed by this Artistic License. By using, modifying or 
distributing the Package, you accept this license. Do not use, modify, or 
distribute the Package, if you do not accept this license.

(11) If your Modified Version has been derived from a Modified Version made by 
someone other than you, you are nevertheless required to ensure that your 
Modified Version complies with the requirements of this license.

(12) This license does not grant you the right to use any trademark, service 
mark, tradename, or logo of the Copyright Holder.

(13) This license includes the non-exclusive, worldwide, free-of-charge patent 
license to make, have made, use, offer to sell, sell, import and otherwise 
transfer the Package with respect to any patent claims licensable by the 
Copyright Holder that are necessarily infringed by the Package. If you institute 
patent litigation (including a cross-claim or counterclaim) against any party 
alleging that the Package constitutes direct or contributory patent 
infringement, then this Artistic License to you shall terminate on the date that 
such litigation is filed.

(14) Disclaimer of Warranty: THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND 
CONTRIBUTORS "AS IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED 
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR 
NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL LAW. 
UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL BE LIABLE FOR 
ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY 
OUT OF THE USE OF THE PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
DAMAGE.


Index: perl-Authen-Radius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Authen-Radius/devel/perl-Authen-Radius.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Authen-Radius.spec	8 Feb 2008 01:16:11 -0000	1.5
+++ perl-Authen-Radius.spec	9 Sep 2008 21:13:58 -0000	1.6
@@ -1,11 +1,13 @@
 Name:           perl-Authen-Radius
 Version:        0.13
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl Authen::Radius modules
-License:        Artistic
+# See LICENSING.txt
+License:        Artistic 2.0
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/RadiusPerl/
 Source0:        http://www.cpan.org/modules/by-module/Authen/RadiusPerl-%{version}.tar.gz
+Source1:	LICENSING.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Data::HexDump) >= 0.02
@@ -20,6 +22,7 @@
 
 %prep
 %setup -q -n Authen-Radius-%{version}
+cp %{SOURCE1} .
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -44,11 +47,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes README LICENSING.txt
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.13-3
+- fix license tag (with permission from upstream)
+
 * Thu Feb  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.13-2
 - rebuild for new perl
 



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:29 +0000
Subject: [pkgdb] fedoraflyinghigh-gdm-theme: davidz has given up
	watchbugzilla
Message-ID: <20080909211429.8A6A62D002C@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on fedoraflyinghigh-gdm-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedoraflyinghigh-gdm-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:30 +0000
Subject: [pkgdb] fedoraflyinghigh-gdm-theme: davidz has given up watchcommits
Message-ID: <20080909211431.0AF132D002F@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on fedoraflyinghigh-gdm-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedoraflyinghigh-gdm-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:31 +0000
Subject: [pkgdb] python-gasp had acl change status
Message-ID: <20080909211431.D58A12D0033@bastion.fedora.phx.redhat.com>

bernie has set the commit acl on python-gasp (Fedora devel) to Approved for lfaraone

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:32 +0000
Subject: [pkgdb] python-gasp had acl change status
Message-ID: <20080909211432.C44252D003A@bastion.fedora.phx.redhat.com>

bernie has set the approveacls acl on python-gasp (Fedora devel) to Approved for lfaraone

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:33 +0000
Subject: [pkgdb] python-gasp had acl change status
Message-ID: <20080909211433.D2E052D003C@bastion.fedora.phx.redhat.com>

bernie has set the commit acl on python-gasp (Fedora OLPC 2) to Approved for lfaraone

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:34 +0000
Subject: [pkgdb] fedoraflyinghigh-kdm-theme: davidz has given up
	watchbugzilla
Message-ID: <20080909211434.D379D208D99@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on fedoraflyinghigh-kdm-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedoraflyinghigh-kdm-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:35 +0000
Subject: [pkgdb] python-gasp had acl change status
Message-ID: <20080909211435.ECE4F2D0042@bastion.fedora.phx.redhat.com>

bernie has set the approveacls acl on python-gasp (Fedora OLPC 2) to Approved for lfaraone

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:36 +0000
Subject: [pkgdb] fedoraflyinghigh-kdm-theme: davidz has given up watchcommits
Message-ID: <20080909211436.52B532D0044@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on fedoraflyinghigh-kdm-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedoraflyinghigh-kdm-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:37 +0000
Subject: [pkgdb] python-gasp had acl change status
Message-ID: <20080909211437.4C3D02D004A@bastion.fedora.phx.redhat.com>

bernie has set the commit acl on python-gasp (Fedora 9) to Approved for lfaraone

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:39 +0000
Subject: [pkgdb] fedora-gnome-theme: davidz has given up watchbugzilla
Message-ID: <20080909211439.CC5D32D004D@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on fedora-gnome-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-gnome-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:40 +0000
Subject: [pkgdb] python-gasp had acl change status
Message-ID: <20080909211440.2D18C2D0050@bastion.fedora.phx.redhat.com>

bernie has set the approveacls acl on python-gasp (Fedora 9) to Approved for lfaraone

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:41 +0000
Subject: [pkgdb] fedora-gnome-theme: davidz has given up watchcommits
Message-ID: <20080909211441.1ED242D0053@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on fedora-gnome-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-gnome-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:44 +0000
Subject: [pkgdb] fedora-icon-theme: davidz has given up watchbugzilla
Message-ID: <20080909211444.2FC6C2D0058@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on fedora-icon-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-icon-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:45 +0000
Subject: [pkgdb] fedora-icon-theme: davidz has given up watchcommits
Message-ID: <20080909211445.B7479208DA8@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on fedora-icon-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-icon-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:48 +0000
Subject: [pkgdb] fedorainfinity-gdm-theme: davidz has given up watchbugzilla
Message-ID: <20080909211448.49B472D005A@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on fedorainfinity-gdm-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedorainfinity-gdm-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:49 +0000
Subject: [pkgdb] fedorainfinity-gdm-theme: davidz has given up watchcommits
Message-ID: <20080909211450.0CDD12D005E@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on fedorainfinity-gdm-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedorainfinity-gdm-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:53 +0000
Subject: [pkgdb] fedorainfinity-screensaver-theme: davidz has given up
	watchbugzilla
Message-ID: <20080909211453.64C3A2D0060@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on fedorainfinity-screensaver-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedorainfinity-screensaver-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:54 +0000
Subject: [pkgdb] python-gasp had acl change status
Message-ID: <20080909211454.69A862D0063@bastion.fedora.phx.redhat.com>

bernie has set the watchbugzilla acl on python-gasp (Fedora devel) to Approved for lfaraone

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:55 +0000
Subject: [pkgdb] fedorainfinity-screensaver-theme: davidz has given up
	watchcommits
Message-ID: <20080909211455.6BA112D0065@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on fedorainfinity-screensaver-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedorainfinity-screensaver-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:58 +0000
Subject: [pkgdb] fedora-screensaver-theme: davidz has given up watchbugzilla
Message-ID: <20080909211458.5CFBA208DAD@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on fedora-screensaver-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-screensaver-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:14:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:14:59 +0000
Subject: [pkgdb] fedora-screensaver-theme: davidz has given up watchcommits
Message-ID: <20080909211459.CCC28208DB0@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on fedora-screensaver-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-screensaver-theme



From pkgdb at fedoraproject.org  Tue Sep  9 21:15:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:15:02 +0000
Subject: [pkgdb] python-gasp had acl change status
Message-ID: <20080909211503.0C910208DD5@bastion.fedora.phx.redhat.com>

bernie has set the watchcommits acl on python-gasp (Fedora devel) to Approved for lfaraone

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 21:15:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:15:04 +0000
Subject: [pkgdb] livecd-tools: davidz has given up watchbugzilla
Message-ID: <20080909211505.2DF25208DD9@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on livecd-tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/livecd-tools



From pkgdb at fedoraproject.org  Tue Sep  9 21:15:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:15:06 +0000
Subject: [pkgdb] livecd-tools: davidz has given up watchcommits
Message-ID: <20080909211506.5F2E5208DDD@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on livecd-tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/livecd-tools



From pkgdb at fedoraproject.org  Tue Sep  9 21:15:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:15:08 +0000
Subject: [pkgdb] python-gasp had acl change status
Message-ID: <20080909211508.3D1642D0067@bastion.fedora.phx.redhat.com>

bernie has set the watchbugzilla acl on python-gasp (Fedora OLPC 2) to Approved for lfaraone

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 21:15:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:15:09 +0000
Subject: [pkgdb] python-gasp had acl change status
Message-ID: <20080909211509.AA2662D006A@bastion.fedora.phx.redhat.com>

bernie has set the watchcommits acl on python-gasp (Fedora OLPC 2) to Approved for lfaraone

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 21:15:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:15:11 +0000
Subject: [pkgdb] python-gasp had acl change status
Message-ID: <20080909211511.728412D006D@bastion.fedora.phx.redhat.com>

bernie has set the watchbugzilla acl on python-gasp (Fedora 9) to Approved for lfaraone

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 21:15:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:15:12 +0000
Subject: [pkgdb] NetworkManager-vpnc: davidz has given up watchbugzilla
Message-ID: <20080909211512.5DEA62D006F@bastion.fedora.phx.redhat.com>

davidz has given up the watchbugzilla acl on NetworkManager-vpnc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From pkgdb at fedoraproject.org  Tue Sep  9 21:15:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:15:13 +0000
Subject: [pkgdb] python-gasp had acl change status
Message-ID: <20080909211513.3B33B2D0073@bastion.fedora.phx.redhat.com>

bernie has set the watchcommits acl on python-gasp (Fedora 9) to Approved for lfaraone

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 21:15:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:15:13 +0000
Subject: [pkgdb] NetworkManager-vpnc: davidz has given up watchcommits
Message-ID: <20080909211513.ACC582D0075@bastion.fedora.phx.redhat.com>

davidz has given up the watchcommits acl on NetworkManager-vpnc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From pkgdb at fedoraproject.org  Tue Sep  9 21:15:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:15:20 +0000
Subject: [pkgdb] python-gasp ownership updated
Message-ID: <20080909211521.6413E208D9E@bastion.fedora.phx.redhat.com>

Package python-gasp in Fedora devel was orphaned by bernie

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 21:15:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:15:27 +0000
Subject: [pkgdb] python-gasp ownership updated
Message-ID: <20080909211527.6B81A2D0079@bastion.fedora.phx.redhat.com>

Package python-gasp in Fedora OLPC 2 was orphaned by bernie

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 21:15:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:15:30 +0000
Subject: [pkgdb] python-gasp ownership updated
Message-ID: <20080909211530.2CCD2208DB5@bastion.fedora.phx.redhat.com>

Package python-gasp in Fedora 9 was orphaned by bernie

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From rishi at fedoraproject.org  Tue Sep  9 21:16:07 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue,  9 Sep 2008 21:16:07 +0000 (UTC)
Subject: rpms/httrack/devel httrack-3.42.93-desktop.patch, NONE,
	1.1 httrack-3.42.93-utf-8.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 httrack.spec, 1.8, 1.9 sources, 1.2, 1.3 htsglobal.h, 1.1,
	NONE httrack-3.42-desktop.patch, 1.1,
	NONE httrack-3.42-generic-macros.patch, 1.1,
	NONE httrack-3.42-libhtsjava.patch, 1.1,
	NONE httrack-3.42-openssl.patch, 1.3,
	NONE httrack-3.42-utf-8.patch, 1.1,
	NONE httrack-3.42-xdg-utils.patch, 1.1, NONE
Message-ID: <20080909211607.1DC3F7012A@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/httrack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26985

Modified Files:
	.cvsignore httrack.spec sources 
Added Files:
	httrack-3.42.93-desktop.patch httrack-3.42.93-utf-8.patch 
Removed Files:
	htsglobal.h httrack-3.42-desktop.patch 
	httrack-3.42-generic-macros.patch 
	httrack-3.42-libhtsjava.patch httrack-3.42-openssl.patch 
	httrack-3.42-utf-8.patch httrack-3.42-xdg-utils.patch 
Log Message:
* Tue Sep 09 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.42.93-1
- Version bump to 3.42.93. Closes Red Hat Bugzilla bugs #457523
  (CVE-2008-3429)and #460529.
- Use of generic macros in the publicly exposed API fixed by upstream.
- Use of xdg-open now added by upstream.
- OpenSSL version updated by upstream.
- Linkage issues in libhtsjava.so fixed by upstream.


httrack-3.42.93-desktop.patch:

--- NEW FILE httrack-3.42.93-desktop.patch ---
diff -urNp httrack-3.42.93.orig/html/server/div/WebHTTrack.desktop httrack-3.42.93/html/server/div/WebHTTrack.desktop
--- httrack-3.42.93.orig/html/server/div/WebHTTrack.desktop	2008-08-16 15:03:53.000000000 +0530
+++ httrack-3.42.93/html/server/div/WebHTTrack.desktop	2008-09-09 19:29:32.168936695 +0530
@@ -2,10 +2,9 @@
 Encoding=UTF-8
 Version=1.0
 Type=Application
-Categories=Application;Network
+Categories=Network;
 Terminal=false
 Name=WebHTTrack Website Copier
 Comment=Copy websites to your computer
 Exec=webhttrack
-Icon=/usr/share/httrack/icons/webhttrack.xpm
-Type=Application
+Icon=webhttrack
diff -urNp httrack-3.42.93.orig/html/server/div/WebHTTrack-Websites.desktop httrack-3.42.93/html/server/div/WebHTTrack-Websites.desktop
--- httrack-3.42.93.orig/html/server/div/WebHTTrack-Websites.desktop	2008-08-16 15:03:43.000000000 +0530
+++ httrack-3.42.93/html/server/div/WebHTTrack-Websites.desktop	2008-09-09 19:28:38.927687527 +0530
@@ -2,10 +2,9 @@
 Encoding=UTF-8
 Version=1.0
 Type=Application
-Categories=Application;Network
+Categories=Network;
 Terminal=false
 Name=Browse Mirrored Websites
 Comment=Browse Websites Mirrored by WebHTTrack
 Exec=webhttrack browse
-Icon=/usr/share/httrack/icons/webhttrack.xpm
-Type=Application
+Icon=webhttrack

httrack-3.42.93-utf-8.patch:

--- NEW FILE httrack-3.42.93-utf-8.patch ---
diff -urNp httrack-3.42.1.orig/html/contact.html httrack-3.42.1/html/contact.html
--- httrack-3.42.1.orig/html/contact.html	2007-01-14 19:37:06.000000000 +0530
+++ httrack-3.42.1/html/contact.html	2007-11-18 18:49:48.000000000 +0530
@@ -1,7 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
 
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="description" content="HTTrack is an easy-to-use website mirror utility. It allows you to download a World Wide website from the Internet to a local directory,building recursively all structures, getting html, images, and other files from the server to your computer. Links are rebuiltrelatively so that you can freely browse to the local site (works with any browser). You can mirror several sites together so that you can jump from one toanother. You can, also, update an existing mirror site, or resume an interrupted download. The robot is fully configurable, with an integrated help" />
 	<meta name="keywords" content="httrack, HTTRACK, HTTrack, winhttrack, WINHTTRACK, WinHTTrack, offline browser, web mirror utility, aspirateur web, surf offline, web capture, www mirror utility, browse offline, local  site builder, website mirroring, aspirateur www, internet grabber, capture de site web, internet tool, hors connexion, unix, dos, windows 95, windows 98, solaris, ibm580, AIX 4.0, HTS, HTGet, web aspirator, web aspirateur, libre, GPL, GNU, free software" />
 	<title>HTTrack Website Copier - Offline Browser</title>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Nov 2007 19:12:00 -0000	1.2
+++ .cvsignore	9 Sep 2008 21:15:36 -0000	1.3
@@ -1 +1 @@
-httrack-3.42.tar.gz
+httrack-3.43-BETA-4.tar.gz


Index: httrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/devel/httrack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- httrack.spec	23 Feb 2008 07:43:12 -0000	1.8
+++ httrack.spec	9 Sep 2008 21:15:36 -0000	1.9
@@ -11,29 +11,24 @@
 
 Summary:	Website copier and offline browser
 Name:		httrack
-Version:	3.42
-Release:	10%{?dist}
+Version:	3.42.93
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.httrack.com/
-Source0:	http://www.httrack.com/%{name}-3.42.tar.gz
-Source1:	htsglobal.h
+Source0:	http://www.httrack.com/%{name}-3.43-BETA-4.tar.gz
 
 Patch0:		%{name}-%{version}-desktop.patch
-Patch1:		%{name}-%{version}-generic-macros.patch
-Patch2:		%{name}-%{version}-libhtsjava.patch
-Patch3:		%{name}-%{version}-openssl.patch
-Patch4:		%{name}-%{version}-utf-8.patch
-Patch5:		%{name}-%{version}-xdg-utils.patch
+Patch1:		%{name}-%{version}-utf-8.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	openssl = %{_openssl_version}
 Requires:	xdg-utils
 
-BuildRequires:	chrpath
 BuildRequires:	desktop-file-utils
 BuildRequires:	dos2unix
+BuildRequires:	libtool
 BuildRequires:	zlib-devel
 
 %description
@@ -56,15 +51,9 @@
 This package contains development files for %{name}.
 
 %prep
-%setup -q -n %{name}-3.42.1
+%setup -q -n %{name}-3.42.93
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
-cp -p %{SOURCE1} ./src
 
 # Suppress rpmlint error.
 chmod 644 `find . -name "*.c" -perm /111 -print`
@@ -94,6 +83,10 @@
 %build
 %configure --disable-static
 
+# Remove rpaths.
+rm -f ./libtool
+cp %{_bindir}/libtool .
+
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
 
@@ -106,6 +99,7 @@
 
 make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -delete
+find $RPM_BUILD_ROOT -type f -name "*.a" -delete
 
 # Remove generic header from /usr/include/httrack.
 rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
@@ -141,11 +135,6 @@
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/WebHTTrack-Websites.desktop
 
-# Remove rpaths.
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/htsserver
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/%{name}
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libhtsjava.so.2.0.42
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -163,6 +152,10 @@
 %doc html
 %doc %{name}-doc.html
 %doc templates
+%doc %{_mandir}/man1/htsserver.1*
+%doc %{_mandir}/man1/%{name}.1*
+%doc %{_mandir}/man1/proxytrack.1*
+%doc %{_mandir}/man1/webhttrack.1*
 %{_bindir}/htsserver
 %{_bindir}/%{name}
 %{_bindir}/proxytrack
@@ -171,11 +164,8 @@
 %{_datadir}/applications/fedora-WebHTTrack-Websites.desktop
 %{_datadir}/pixmaps/%{name}.xpm
 %{_datadir}/pixmaps/webhttrack.xpm
-%{_libdir}/*.so.*
-%{_mandir}/man1/htsserver.1.gz
-%{_mandir}/man1/%{name}.1.gz
-%{_mandir}/man1/proxytrack.1.gz
-%{_mandir}/man1/webhttrack.1.gz
+%{_libdir}/libhtsjava.so.*
+%{_libdir}/libhttrack.so.*
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
@@ -183,12 +173,21 @@
 %files devel
 %defattr(-,root,root,-)
 %doc libtest
-%{_libdir}/*.so
+%{_libdir}/libhtsjava.so
+%{_libdir}/libhttrack.so
 
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*
 
 %changelog
+* Tue Sep 09 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.42.93-1
+- Version bump to 3.42.93. Closes Red Hat Bugzilla bugs #457523
+  (CVE-2008-3429)and #460529.
+- Use of generic macros in the publicly exposed API fixed by upstream.
+- Use of xdg-open now added by upstream.
+- OpenSSL version updated by upstream.
+- Linkage issues in libhtsjava.so fixed by upstream.
+
 * Thu Feb 21 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.42-10
 - Fixed runtime problems with --excludedocs.
 - Omitted unused direct shared library dependencies.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Nov 2007 19:12:00 -0000	1.2
+++ sources	9 Sep 2008 21:15:36 -0000	1.3
@@ -1 +1 @@
-8bb5f09ee007fe6e9875c070b57e0359  httrack-3.42.tar.gz
+fe3fbd3129ac96761bab34a5b1a77aa8  httrack-3.43-BETA-4.tar.gz


--- htsglobal.h DELETED ---


--- httrack-3.42-desktop.patch DELETED ---


--- httrack-3.42-generic-macros.patch DELETED ---


--- httrack-3.42-libhtsjava.patch DELETED ---


--- httrack-3.42-openssl.patch DELETED ---


--- httrack-3.42-utf-8.patch DELETED ---


--- httrack-3.42-xdg-utils.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Sep  9 21:17:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:17:22 +0000
Subject: [pkgdb] gpsim ownership updated
Message-ID: <20080909211722.8D52F208DBB@bastion.fedora.phx.redhat.com>

Package gpsim in Fedora devel was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsim



From pkgdb at fedoraproject.org  Tue Sep  9 21:17:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:17:27 +0000
Subject: [pkgdb] gpsim ownership updated
Message-ID: <20080909211727.6A7BC208DBD@bastion.fedora.phx.redhat.com>

Package gpsim in Fedora 7 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsim



From pkgdb at fedoraproject.org  Tue Sep  9 21:17:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:17:30 +0000
Subject: [pkgdb] gpsim ownership updated
Message-ID: <20080909211730.2DA8A208DC0@bastion.fedora.phx.redhat.com>

Package gpsim in Fedora 3 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsim



From pkgdb at fedoraproject.org  Tue Sep  9 21:17:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:17:32 +0000
Subject: [pkgdb] gpsim ownership updated
Message-ID: <20080909211732.DFEA5208DC2@bastion.fedora.phx.redhat.com>

Package gpsim in Fedora 4 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsim



From pkgdb at fedoraproject.org  Tue Sep  9 21:17:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:17:35 +0000
Subject: [pkgdb] gpsim ownership updated
Message-ID: <20080909211735.28D31208DC4@bastion.fedora.phx.redhat.com>

Package gpsim in Fedora 5 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsim



From pkgdb at fedoraproject.org  Tue Sep  9 21:17:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:17:38 +0000
Subject: [pkgdb] gpsim ownership updated
Message-ID: <20080909211738.D9709208DC7@bastion.fedora.phx.redhat.com>

Package gpsim in Fedora 6 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsim



From pkgdb at fedoraproject.org  Tue Sep  9 21:17:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:17:47 +0000
Subject: [pkgdb] gpsim ownership updated
Message-ID: <20080909211747.AAFA5208DCA@bastion.fedora.phx.redhat.com>

Package gpsim in Fedora 8 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsim



From pkgdb at fedoraproject.org  Tue Sep  9 21:17:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:17:50 +0000
Subject: [pkgdb] gpsim ownership updated
Message-ID: <20080909211750.AAE92208DCF@bastion.fedora.phx.redhat.com>

Package gpsim in Fedora 9 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsim



From pkgdb at fedoraproject.org  Tue Sep  9 21:18:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:18:28 +0000
Subject: [pkgdb] gtk+extra ownership updated
Message-ID: <20080909211828.49626208DCE@bastion.fedora.phx.redhat.com>

Package gtk+extra in Fedora devel was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+extra



From pkgdb at fedoraproject.org  Tue Sep  9 21:18:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:18:32 +0000
Subject: [pkgdb] gtk+extra ownership updated
Message-ID: <20080909211832.39B22208DD1@bastion.fedora.phx.redhat.com>

Package gtk+extra in Fedora 7 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+extra



From pkgdb at fedoraproject.org  Tue Sep  9 21:18:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:18:44 +0000
Subject: [pkgdb] gtk+extra ownership updated
Message-ID: <20080909211844.BAF4B208DE2@bastion.fedora.phx.redhat.com>

Package gtk+extra in Fedora 3 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+extra



From pkgdb at fedoraproject.org  Tue Sep  9 21:18:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:18:48 +0000
Subject: [pkgdb] gtk+extra ownership updated
Message-ID: <20080909211848.44822208DE4@bastion.fedora.phx.redhat.com>

Package gtk+extra in Fedora 4 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+extra



From pkgdb at fedoraproject.org  Tue Sep  9 21:18:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:18:51 +0000
Subject: [pkgdb] gtk+extra ownership updated
Message-ID: <20080909211851.9315A208DE5@bastion.fedora.phx.redhat.com>

Package gtk+extra in Fedora 5 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+extra



From pkgdb at fedoraproject.org  Tue Sep  9 21:18:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:18:54 +0000
Subject: [pkgdb] gtk+extra ownership updated
Message-ID: <20080909211854.13C06208DEA@bastion.fedora.phx.redhat.com>

Package gtk+extra in Fedora 6 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+extra



From pkgdb at fedoraproject.org  Tue Sep  9 21:18:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:18:56 +0000
Subject: [pkgdb] gtk+extra ownership updated
Message-ID: <20080909211856.C2B39208DEB@bastion.fedora.phx.redhat.com>

Package gtk+extra in Fedora 8 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+extra



From pkgdb at fedoraproject.org  Tue Sep  9 21:18:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:18:59 +0000
Subject: [pkgdb] gtk+extra ownership updated
Message-ID: <20080909211859.474A3208DEF@bastion.fedora.phx.redhat.com>

Package gtk+extra in Fedora 9 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+extra



From pkgdb at fedoraproject.org  Tue Sep  9 21:19:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:19:46 +0000
Subject: [pkgdb] gtk+extra: dionysos has requested watchbugzilla
Message-ID: <20080909211946.EB98E208DAB@bastion.fedora.phx.redhat.com>

dionysos has requested the watchbugzilla acl on gtk+extra (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+extra



From pkgdb at fedoraproject.org  Tue Sep  9 21:19:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:19:48 +0000
Subject: [pkgdb] gtk+extra: dionysos has requested watchbugzilla
Message-ID: <20080909211948.4E7EB208DF5@bastion.fedora.phx.redhat.com>

dionysos has requested the watchbugzilla acl on gtk+extra (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+extra



From pkgdb at fedoraproject.org  Tue Sep  9 21:19:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:19:49 +0000
Subject: [pkgdb] ConsoleKit ownership updated
Message-ID: <20080909211950.137242D0023@bastion.fedora.phx.redhat.com>

Package ConsoleKit in Fedora 7 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Tue Sep  9 21:19:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:19:53 +0000
Subject: [pkgdb] ConsoleKit ownership updated
Message-ID: <20080909211953.A25682E0011@bastion.fedora.phx.redhat.com>

Package ConsoleKit in Fedora 8 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Tue Sep  9 21:19:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:19:55 +0000
Subject: [pkgdb] gtk+extra: dionysos has given up watchbugzilla
Message-ID: <20080909211955.69D7D208DF9@bastion.fedora.phx.redhat.com>

dionysos has given up the watchbugzilla acl on gtk+extra (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+extra



From pkgdb at fedoraproject.org  Tue Sep  9 21:19:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:19:57 +0000
Subject: [pkgdb] ConsoleKit ownership updated
Message-ID: <20080909211957.AC3B3208DFA@bastion.fedora.phx.redhat.com>

Package ConsoleKit in Fedora 9 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Tue Sep  9 21:20:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:20:10 +0000
Subject: [pkgdb] gtk+extra: dionysos has requested watchbugzilla
Message-ID: <20080909212010.C8358208DD5@bastion.fedora.phx.redhat.com>

dionysos has requested the watchbugzilla acl on gtk+extra (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+extra



From pkgdb at fedoraproject.org  Tue Sep  9 21:20:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:20:14 +0000
Subject: [pkgdb] gtk+extra: dionysos has requested watchbugzilla
Message-ID: <20080909212014.8EC32208DFD@bastion.fedora.phx.redhat.com>

dionysos has requested the watchbugzilla acl on gtk+extra (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+extra



From pkgdb at fedoraproject.org  Tue Sep  9 21:21:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:21:41 +0000
Subject: [pkgdb] gpsim: dionysos has requested watchbugzilla
Message-ID: <20080909212142.2BDC9208D0F@bastion.fedora.phx.redhat.com>

dionysos has requested the watchbugzilla acl on gpsim (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsim



From pkgdb at fedoraproject.org  Tue Sep  9 21:21:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:21:54 +0000
Subject: [pkgdb] gpsim: dionysos has requested watchbugzilla
Message-ID: <20080909212154.B548A208DA1@bastion.fedora.phx.redhat.com>

dionysos has requested the watchbugzilla acl on gpsim (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsim



From pkgdb at fedoraproject.org  Tue Sep  9 21:21:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:21:57 +0000
Subject: [pkgdb] gpsim: dionysos has requested watchbugzilla
Message-ID: <20080909212157.F27122E0032@bastion.fedora.phx.redhat.com>

dionysos has requested the watchbugzilla acl on gpsim (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsim



From spot at fedoraproject.org  Tue Sep  9 21:23:35 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 21:23:35 +0000 (UTC)
Subject: rpms/rman/devel dead.package, NONE, 1.1 rman.spec, 1.7, NONE sources,
	1.2, NONE
Message-ID: <20080909212335.A1B987012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28414

Added Files:
	dead.package 
Removed Files:
	rman.spec sources 
Log Message:
dead due to Artistic 1.0


--- NEW FILE dead.package ---
Package was removed due to licensing issues (it was only available under Artistic 1.0).
Every effort was made to contact upstream for relicensing, but no response was ever received.

See: https://fedoraproject.org/wiki/Features/Artistic1Removal

Tom "spot" Callaway <tcallawa at redhat.com>, Tuesday September 9, 2008


--- rman.spec DELETED ---


--- sources DELETED ---



From pkgdb at fedoraproject.org  Tue Sep  9 21:26:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:26:04 +0000
Subject: [pkgdb] NetworkManager-vpnc ownership updated
Message-ID: <20080909212604.5554A2D0021@bastion.fedora.phx.redhat.com>

Package NetworkManager-vpnc in Fedora devel was orphaned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From pkgdb at fedoraproject.org  Tue Sep  9 21:26:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:26:07 +0000
Subject: [pkgdb] NetworkManager-vpnc ownership updated
Message-ID: <20080909212607.2BA76208DC1@bastion.fedora.phx.redhat.com>

Package NetworkManager-vpnc in Fedora 7 was orphaned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From pkgdb at fedoraproject.org  Tue Sep  9 21:26:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:26:08 +0000
Subject: [pkgdb] ConsoleKit ownership updated
Message-ID: <20080909212608.4F5272D0029@bastion.fedora.phx.redhat.com>

Package ConsoleKit in Fedora 9 is now owned by mccann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Tue Sep  9 21:26:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:26:12 +0000
Subject: [pkgdb] NetworkManager-vpnc ownership updated
Message-ID: <20080909212612.212E62D003C@bastion.fedora.phx.redhat.com>

Package NetworkManager-vpnc in Fedora 8 was orphaned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From pkgdb at fedoraproject.org  Tue Sep  9 21:26:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:26:11 +0000
Subject: [pkgdb] ConsoleKit ownership updated
Message-ID: <20080909212612.006362D003A@bastion.fedora.phx.redhat.com>

Package ConsoleKit in Fedora 8 is now owned by mccann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Tue Sep  9 21:26:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:26:14 +0000
Subject: [pkgdb] NetworkManager-vpnc ownership updated
Message-ID: <20080909212614.97EBF208DC2@bastion.fedora.phx.redhat.com>

Package NetworkManager-vpnc in Fedora EPEL 4 was orphaned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From pkgdb at fedoraproject.org  Tue Sep  9 21:26:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:26:16 +0000
Subject: [pkgdb] NetworkManager-vpnc ownership updated
Message-ID: <20080909212616.168E62D004D@bastion.fedora.phx.redhat.com>

Package NetworkManager-vpnc in Fedora EPEL 5 was orphaned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From pkgdb at fedoraproject.org  Tue Sep  9 21:26:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:26:18 +0000
Subject: [pkgdb] NetworkManager-vpnc ownership updated
Message-ID: <20080909212618.BA777208DC5@bastion.fedora.phx.redhat.com>

Package NetworkManager-vpnc in Fedora 9 was orphaned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From pkgdb at fedoraproject.org  Tue Sep  9 21:26:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:26:27 +0000
Subject: [pkgdb] NetworkManager-vpnc ownership updated
Message-ID: <20080909212627.1CED1208D9B@bastion.fedora.phx.redhat.com>

Package NetworkManager-vpnc in Fedora 6 was orphaned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From pkgdb at fedoraproject.org  Tue Sep  9 21:26:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:26:28 +0000
Subject: [pkgdb] NetworkManager-vpnc ownership updated
Message-ID: <20080909212628.7BCF8208DC9@bastion.fedora.phx.redhat.com>

Package NetworkManager-vpnc in Fedora 5 was orphaned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From spot at fedoraproject.org  Tue Sep  9 21:32:04 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 21:32:04 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.90,1.91
Message-ID: <20080909213204.0F70B7012D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29754

Modified Files:
	comps-f10.xml.in 
Log Message:
remove d4x for f10


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- comps-f10.xml.in	7 Sep 2008 20:00:33 -0000	1.90
+++ comps-f10.xml.in	9 Sep 2008 21:31:33 -0000	1.91
@@ -2033,7 +2033,6 @@
       <packagereq type="optional">checkgmail</packagereq>
       <packagereq type="optional">claws-mail</packagereq>
       <packagereq type="optional">contact-lookup-applet</packagereq>
-      <packagereq type="optional">d4x</packagereq>
       <packagereq type="optional">deluge</packagereq>
       <packagereq type="optional">deskbar-applet</packagereq>
       <packagereq type="optional">dillo</packagereq>



From cjb at fedoraproject.org  Tue Sep  9 21:32:09 2008
From: cjb at fedoraproject.org (Chris Ball)
Date: Tue,  9 Sep 2008 21:32:09 +0000 (UTC)
Subject: rpms/ohm/OLPC-3 .cvsignore, 1.7, 1.8 ohm.spec, 1.8, 1.9 sources, 1.7,
	1.8
Message-ID: <20080909213209.3744A7012D@cvs1.fedora.phx.redhat.com>

Author: cjb

Update of /cvs/pkgs/rpms/ohm/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29699

Modified Files:
	.cvsignore ohm.spec sources 
Log Message:
Fix OLPC #7981, #8062.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/OLPC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Aug 2008 23:55:23 -0000	1.7
+++ .cvsignore	9 Sep 2008 21:31:38 -0000	1.8
@@ -1 +1 @@
-ohm-0.1.1-1.20080828git.tar.gz
+ohm-0.1.1-1.20080910git.tar.gz


Index: ohm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/OLPC-3/ohm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ohm.spec	28 Aug 2008 23:55:23 -0000	1.8
+++ ohm.spec	9 Sep 2008 21:31:39 -0000	1.9
@@ -2,12 +2,12 @@
 %define gtk2_version            2.10.0
 %define dbus_version            0.70
 %define gettext_version         0.14
-%define alphatag                20080828git
+%define alphatag                20080909git
 
 Summary: Open Hardware Manager
 Name: ohm
 Version: 0.1.1
-Release: 6.18.%{alphatag}%{?dist}
+Release: 6.19.%{alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/ohm
 Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz
 
@@ -137,6 +137,10 @@
 %{_includedir}/*
 
 %changelog
+* Tue Sep 09 2008 Chris Ball <cjb at laptop.org> - 0.1.1-6.19.20080910git.olpc
+- #7981:  Use more efficient EC mask setting.
+- #8062:  Inherit automatic/extreme PM settings from the Sugar profile.
+
 * Wed Aug 28 2008 Chris Ball <cjb at laptop.org> - 0.1.1-6.18.20080828git.olpc
 - #8010:  Fix battery status by handling the EC mask over idle suspends.
 - #7879:  Power down wifi chip when lid is closed and mesh is off.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/OLPC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Aug 2008 23:55:23 -0000	1.7
+++ sources	9 Sep 2008 21:31:39 -0000	1.8
@@ -1 +1 @@
-b21c98106d0c1355de89fa58abacef02  ohm-0.1.1-1.20080828git.tar.gz
+7279a896734f6c1786ccb2d401a25769  ohm-0.1.1-1.20080910git.tar.gz



From spot at fedoraproject.org  Tue Sep  9 21:33:22 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 21:33:22 +0000 (UTC)
Subject: rpms/d4x/devel dead.package, NONE, 1.1 d4x-2.5.7.1-desktop.patch,
	1.1, NONE d4x-2.5.7.1-man.patch, 1.1, NONE d4x-2.5.7.1-speed.patch,
	1.1, NONE d4x-2.5.7.1.makebuild.patch, 1.2, NONE d4x.spec, 1.20,
	NONE sources, 1.9, NONE
Message-ID: <20080909213322.D0F5B7012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/d4x/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30594

Added Files:
	dead.package 
Removed Files:
	d4x-2.5.7.1-desktop.patch d4x-2.5.7.1-man.patch 
	d4x-2.5.7.1-speed.patch d4x-2.5.7.1.makebuild.patch d4x.spec 
	sources 
Log Message:
dead package due to Artistic 1.0


--- NEW FILE dead.package ---
This package is dead because of licensing concerns (it is only available under Artistic 1.0).
Every effort was made to contact upstream for relicensing without success.

See: https://fedoraproject.org/wiki/Features/Artistic1Removal

Tom "spot" Callaway <tcallawa at redhat.com>, Tuesday September 9, 2008


--- d4x-2.5.7.1-desktop.patch DELETED ---


--- d4x-2.5.7.1-man.patch DELETED ---


--- d4x-2.5.7.1-speed.patch DELETED ---


--- d4x-2.5.7.1.makebuild.patch DELETED ---


--- d4x.spec DELETED ---


--- sources DELETED ---



From spot at fedoraproject.org  Tue Sep  9 21:35:07 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 21:35:07 +0000 (UTC)
Subject: rpms/perl-Class-Gomor/devel dead.package, NONE,
	1.1 perl-Class-Gomor.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <20080909213507.EE30C7012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Class-Gomor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30902

Added Files:
	dead.package 
Removed Files:
	perl-Class-Gomor.spec sources 
Log Message:
dead package due to Artistic 1.0


--- NEW FILE dead.package ---
This package is dead because of licensing concerns (it is only available under Artistic 1.0).
Upstream was contacted for relicensing, but was not interested.

See: https://fedoraproject.org/wiki/Features/Artistic1Removal

Tom "spot" Callaway <tcallawa at redhat.com>, Tuesday September 9, 2008


--- perl-Class-Gomor.spec DELETED ---


--- sources DELETED ---



From cjb at fedoraproject.org  Tue Sep  9 21:36:36 2008
From: cjb at fedoraproject.org (Chris Ball)
Date: Tue,  9 Sep 2008 21:36:36 +0000 (UTC)
Subject: rpms/ohm/OLPC-3 ohm.spec,1.9,1.10
Message-ID: <20080909213636.796A37012A@cvs1.fedora.phx.redhat.com>

Author: cjb

Update of /cvs/pkgs/rpms/ohm/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31159

Modified Files:
	ohm.spec 
Log Message:
Update alphatag



Index: ohm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/OLPC-3/ohm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ohm.spec	9 Sep 2008 21:31:39 -0000	1.9
+++ ohm.spec	9 Sep 2008 21:36:06 -0000	1.10
@@ -2,7 +2,7 @@
 %define gtk2_version            2.10.0
 %define dbus_version            0.70
 %define gettext_version         0.14
-%define alphatag                20080909git
+%define alphatag                20080910git
 
 Summary: Open Hardware Manager
 Name: ohm



From pkgdb at fedoraproject.org  Tue Sep  9 21:40:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:40:21 +0000
Subject: [pkgdb] NetworkManager-vpnc ownership updated
Message-ID: <20080909214021.8144320876E@bastion.fedora.phx.redhat.com>

Package NetworkManager-vpnc in Fedora devel is now owned by dcbw

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From pkgdb at fedoraproject.org  Tue Sep  9 21:40:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:40:33 +0000
Subject: [pkgdb] NetworkManager-vpnc ownership updated
Message-ID: <20080909214033.99760208D1E@bastion.fedora.phx.redhat.com>

Package NetworkManager-vpnc in Fedora 8 is now owned by dcbw

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From pkgdb at fedoraproject.org  Tue Sep  9 21:40:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:40:50 +0000
Subject: [pkgdb] NetworkManager-vpnc ownership updated
Message-ID: <20080909214050.2BE07208771@bastion.fedora.phx.redhat.com>

Package NetworkManager-vpnc in Fedora 9 is now owned by dcbw

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From pkgdb at fedoraproject.org  Tue Sep  9 21:40:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:40:56 +0000
Subject: [pkgdb] NetworkManager-vpnc ownership updated
Message-ID: <20080909214056.3727F208D9A@bastion.fedora.phx.redhat.com>

Package NetworkManager-vpnc in Fedora EPEL 5 is now owned by dcbw

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From cscott at fedoraproject.org  Tue Sep  9 21:40:57 2008
From: cscott at fedoraproject.org (C. Scott Ananian)
Date: Tue,  9 Sep 2008 21:40:57 +0000 (UTC)
Subject: rpms/olpc-logos/F-9 olpc-logos.spec,1.2,1.3
Message-ID: <20080909214057.0BC4E7012A@cvs1.fedora.phx.redhat.com>

Author: cscott

Update of /cvs/pkgs/rpms/olpc-logos/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31755

Modified Files:
	olpc-logos.spec 
Log Message:
Grub still requires us to Provide system-logos.



Index: olpc-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-logos/F-9/olpc-logos.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- olpc-logos.spec	9 Sep 2008 15:38:42 -0000	1.2
+++ olpc-logos.spec	9 Sep 2008 21:40:26 -0000	1.3
@@ -14,16 +14,15 @@
 Name: olpc-logos
 Summary: OLPC-related icons and pictures
 Version: 0.1 
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: System Environment/Base
 Source0: olpc-logos-%{version}.tar.bz2
 License: Copyright 2006 Red Hat, Inc.  All rights reserved.
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
-## As of F9/OLPC 8.2 we no longer need this package to provide system-logos
-#Obsoletes: redhat-logos < 1.2.0
-#Provides: redhat-logos = 1.2.0
-#Provides: system-logos = %{version}-%{release}
+# As of F9/OLPC 8.2 we no longer need this package to provide redhat-logos
+# but grub wants it to provide system-logos.
+Provides: system-logos = %{version}-%{release}
 
 %description
 The olpc-logos package (the "Packages") contain image files which
@@ -54,6 +53,9 @@
 
 
 %changelog
+* Tue Sep 09 2008 C. Scott Ananian <cscott at laptop.org> - 0.1-7
+- grub still requires us to Provide system-logos
+
 * Tue Sep 09 2008 C. Scott Ananian <cscott at laptop.org> - 0.1-6
 - Drop the Provides lines; they are no longer needed.
 



From pkgdb at fedoraproject.org  Tue Sep  9 21:40:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 21:40:58 +0000
Subject: [pkgdb] NetworkManager-vpnc ownership updated
Message-ID: <20080909214058.A4150208D1E@bastion.fedora.phx.redhat.com>

Package NetworkManager-vpnc in Fedora EPEL 4 is now owned by dcbw

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From spot at fedoraproject.org  Tue Sep  9 21:51:56 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 21:51:56 +0000 (UTC)
Subject: rpms/perl-DBIx-SQLite-Simple/devel dead.package, NONE,
	1.1 perl-DBIx-SQLite-Simple.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <20080909215156.114817012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-DBIx-SQLite-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1449

Added Files:
	dead.package 
Removed Files:
	perl-DBIx-SQLite-Simple.spec sources 
Log Message:
dead package due to Artistic 1.0


--- NEW FILE dead.package ---
This package is dead because of licensing concerns (it is only available under Artistic 1.0).
Upstream was contacted for relicensing, but was not interested.

See: https://fedoraproject.org/wiki/Features/Artistic1Removal

Tom "spot" Callaway <tcallawa at redhat.com>, Tuesday September 9, 2008


--- perl-DBIx-SQLite-Simple.spec DELETED ---


--- sources DELETED ---



From cscott at fedoraproject.org  Tue Sep  9 21:53:27 2008
From: cscott at fedoraproject.org (C. Scott Ananian)
Date: Tue,  9 Sep 2008 21:53:27 +0000 (UTC)
Subject: rpms/pygame/OLPC-3 Makefile,1.1,1.2
Message-ID: <20080909215327.6A3CD7012A@cvs1.fedora.phx.redhat.com>

Author: cscott

Update of /cvs/pkgs/rpms/pygame/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1670

Modified Files:
	Makefile 
Log Message:
Properly set default mock configuration for olpc3 branch.



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/pygame/OLPC-3/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	21 Apr 2006 00:18:30 -0000	1.1
+++ Makefile	9 Sep 2008 21:52:57 -0000	1.2
@@ -2,6 +2,7 @@
 # $Id$
 NAME := pygame
 SPECFILE = $(firstword $(wildcard *.spec))
+MOCKCFG = olpc-3-i386
 
 define find-makefile-common
 for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done



From ndim at fedoraproject.org  Tue Sep  9 21:54:08 2008
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Tue,  9 Sep 2008 21:54:08 +0000 (UTC)
Subject: rpms/nted/devel .cvsignore, 1.2, 1.3 nted.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20080909215408.3FD427012A@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1918

Modified Files:
	.cvsignore nted.spec sources 
Log Message:
* Tue Sep  9 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.0.8-1
- Update to upstream's 1.0.8 release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Sep 2008 07:23:00 -0000	1.2
+++ .cvsignore	9 Sep 2008 21:53:38 -0000	1.3
@@ -1 +1 @@
-nted-1.0.7.tar.gz
+nted-1.0.8.tar.gz


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/nted.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nted.spec	8 Sep 2008 07:23:00 -0000	1.1
+++ nted.spec	9 Sep 2008 21:53:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           nted
-Version:        1.0.7
-Release:        2%{?dist}
+Version:        1.0.8
+Release:        1%{?dist}
 Summary:        Musical score editor
 Summary(de):    Partitureditor
 
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Tue Sep  9 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.0.8-1
+- Update to upstream's 1.0.8 release.
+
 * Sun Sep  7 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.0.7-2
 - Consistently use %%{buildroot} instead of $RPM_BUILD_ROOT
 - Ship upstream's now correct COPYING file.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2008 07:23:00 -0000	1.2
+++ sources	9 Sep 2008 21:53:38 -0000	1.3
@@ -1 +1 @@
-4613ef2b9a63c237375893fc12aae130  nted-1.0.7.tar.gz
+33e9ba55295f451a16033e0fcd63dfb5  nted-1.0.8.tar.gz



From spot at fedoraproject.org  Tue Sep  9 21:54:54 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 21:54:54 +0000 (UTC)
Subject: rpms/perl-Net-Packet/devel dead.package, NONE,
	1.1 perl-Net-Packet-3.25-perlversion.patch, 1.1,
	NONE perl-Net-Packet.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <20080909215454.4442A7012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Net-Packet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2349

Added Files:
	dead.package 
Removed Files:
	perl-Net-Packet-3.25-perlversion.patch perl-Net-Packet.spec 
	sources 
Log Message:
dead package due to Artistic 1.0


--- NEW FILE dead.package ---
This package is dead because of licensing concerns (it is only available under Artistic 1.0).
Upstream was contacted for relicensing, but was not interested.

See: https://fedoraproject.org/wiki/Features/Artistic1Removal

Tom "spot" Callaway <tcallawa at redhat.com>, Tuesday September 9, 2008


--- perl-Net-Packet-3.25-perlversion.patch DELETED ---


--- perl-Net-Packet.spec DELETED ---


--- sources DELETED ---



From spot at fedoraproject.org  Tue Sep  9 21:55:49 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 21:55:49 +0000 (UTC)
Subject: rpms/perl-Net-Packet-Target/devel dead.package, NONE,
	1.1 perl-Net-Packet-Target.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <20080909215549.BFBA77012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Net-Packet-Target/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2610

Added Files:
	dead.package 
Removed Files:
	perl-Net-Packet-Target.spec sources 
Log Message:
dead package due to Artistic 1.0


--- NEW FILE dead.package ---
This package is dead because of licensing concerns (it is only available under Artistic 1.0).
Upstream was contacted for relicensing, but was not interested.

See: https://fedoraproject.org/wiki/Features/Artistic1Removal

Tom "spot" Callaway <tcallawa at redhat.com>, Tuesday September 9, 2008


--- perl-Net-Packet-Target.spec DELETED ---


--- sources DELETED ---



From spot at fedoraproject.org  Tue Sep  9 21:56:45 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  9 Sep 2008 21:56:45 +0000 (UTC)
Subject: rpms/perl-Net-Write/devel dead.package, NONE,
	1.1 perl-Net-Write-1.00-perlversion.patch, 1.1,
	NONE perl-Net-Write.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <20080909215645.4AC497012A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Net-Write/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2847

Added Files:
	dead.package 
Removed Files:
	perl-Net-Write-1.00-perlversion.patch perl-Net-Write.spec 
	sources 
Log Message:
dead package due to Artistic 1.0


--- NEW FILE dead.package ---
This package is dead because of licensing concerns (it is only available under Artistic 1.0).
Upstream was contacted for relicensing, but was not interested.

See: https://fedoraproject.org/wiki/Features/Artistic1Removal

Tom "spot" Callaway <tcallawa at redhat.com>, Tuesday September 9, 2008


--- perl-Net-Write-1.00-perlversion.patch DELETED ---


--- perl-Net-Write.spec DELETED ---


--- sources DELETED ---



From cscott at fedoraproject.org  Tue Sep  9 22:06:08 2008
From: cscott at fedoraproject.org (C. Scott Ananian)
Date: Tue,  9 Sep 2008 22:06:08 +0000 (UTC)
Subject: rpms/pygame/OLPC-3 pygame.spec,1.22,1.23
Message-ID: <20080909220608.D5C3B7012A@cvs1.fedora.phx.redhat.com>

Author: cscott

Update of /cvs/pkgs/rpms/pygame/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4385

Modified Files:
	pygame.spec 
Log Message:
Require SDL_Pango for i18n support, dlo#7997



Index: pygame.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygame/OLPC-3/pygame.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pygame.spec	6 Aug 2008 21:20:43 -0000	1.22
+++ pygame.spec	9 Sep 2008 22:05:38 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.8.0
-Release:        1%{?dist}.2
+Release:        1%{?dist}.3
 Summary:        Python modules for writing games
 
 Group:          Development/Languages
@@ -16,6 +16,7 @@
 BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
 BuildRequires:  libpng-devel libjpeg-devel libX11-devel
 Requires:       numpy
+Requires:       SDL_Pango
 
 %description
 Pygame is a set of Python modules designed for writing games. It is
@@ -30,6 +31,7 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       SDL_ttf-devel SDL_mixer-devel
 Requires:       python-devel
+Requires:       SDL_Pango-devel
 
 %description devel
 This package contains headers required to build applications that use
@@ -88,6 +90,9 @@
 
 
 %changelog
+* Tue Sep  9 2008 C. Scott Ananian <cscott at laptop.org> 1.8.0-1.3
+- Requires SDL_Pango for i18n support, dlo#7997
+
 * Wed Aug  6 2008 Daniel Drake <dsd at laptop.org> 1.8.0-1.2
 - Sync with devel for version 1.8.0
 - Require numpy rather than numeric



From pkgdb at fedoraproject.org  Tue Sep  9 22:07:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 22:07:30 +0000
Subject: [pkgdb] python-gasp ownership updated
Message-ID: <20080909220730.4018D20876F@bastion.fedora.phx.redhat.com>

Package python-gasp in Fedora devel is now owned by lfaraone

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 22:07:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 22:07:31 +0000
Subject: [pkgdb] python-gasp ownership updated
Message-ID: <20080909220731.5FE81208D0F@bastion.fedora.phx.redhat.com>

Package python-gasp in Fedora OLPC 2 is now owned by lfaraone

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From pkgdb at fedoraproject.org  Tue Sep  9 22:07:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 22:07:33 +0000
Subject: [pkgdb] python-gasp ownership updated
Message-ID: <20080909220733.17651208D7C@bastion.fedora.phx.redhat.com>

Package python-gasp in Fedora 9 is now owned by lfaraone

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-gasp



From lkundrak at fedoraproject.org  Tue Sep  9 22:28:27 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  9 Sep 2008 22:28:27 +0000 (UTC)
Subject: rpms/justmoon/F-9 import.log, NONE, 1.1 justmoon-0.3.3-datadir.patch,
	NONE, 1.1 justmoon-0.3.3-parenth.patch, NONE,
	1.1 justmoon-gmoon.desktop, NONE, 1.1 justmoon-qmoon.desktop,
	NONE, 1.1 justmoon.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20080909222827.7542F7012A@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/justmoon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8318/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log justmoon-0.3.3-datadir.patch 
	justmoon-0.3.3-parenth.patch justmoon-gmoon.desktop 
	justmoon-qmoon.desktop justmoon.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
justmoon-0_3_3-3_el5:F-9:justmoon-0.3.3-3.el5.src.rpm:1220999325

justmoon-0.3.3-datadir.patch:

--- NEW FILE justmoon-0.3.3-datadir.patch ---
We pass DATADIR from CFLAGS

Lubomir Rintel <lkundrak at v3.sk>

--- justmoon-0.3.3/include/MoonFeature.h.datadir	2008-09-05 11:58:25.000000000 +0200
+++ justmoon-0.3.3/include/MoonFeature.h	2008-09-05 11:58:37.000000000 +0200
@@ -9,9 +9,6 @@
 #ifndef MOONFEATURE_H
 #define MOONFEATURE_H
 
-// Where the data files live:
-#define DATADIR "/usr/local/qmoon/"
-
 class MoonCanvas;
 
 class MoonFeature

justmoon-0.3.3-parenth.patch:

--- NEW FILE justmoon-0.3.3-parenth.patch ---
Fix build with gcc-4.1

Lubomir Rintel <lkundrak at v3.sk>

--- justmoon-0.3.3/libmoon/MoonFeature.cpp.parenth	2008-09-05 11:44:51.000000000 +0200
+++ justmoon-0.3.3/libmoon/MoonFeature.cpp	2008-09-05 11:45:08.000000000 +0200
@@ -128,7 +128,7 @@
     // Delete the old moonFeature list:
     if (sMoonFeatureList)
         DeleteFeatures();
-    sMoonFeatureList = new (MoonFeature*)[2000];
+    sMoonFeatureList = new MoonFeature*[2000];
 
     sNumFeatures = 0;
 


--- NEW FILE justmoon-gmoon.desktop ---
[Desktop Entry]
Name=Just Moon
Comment=Lunar observing software
GenericName=Just Moon
Exec=gmoon
Icon=/usr/share/justmoon/fullmoon
Type=Application
Categories=Education;Game;Astronomy;Science;
NotShowIn=KDE;


--- NEW FILE justmoon-qmoon.desktop ---
[Desktop Entry]
Name=Just Moon
Comment=Lunar observing software
GenericName=Just Moon
Exec=qmoon
Icon=/usr/share/justmoon/fullmoon
Type=Application
Categories=Education;Game;Astronomy;Science;
NotShowIn=GNOME;


--- NEW FILE justmoon.spec ---
Name:           justmoon
Version:        0.3.3
Release:        3%{?dist}
Summary:        Just Moon is lunar observing software for Linux

Group:          Amusements/Graphics
License:        GPL+
URL:            http://www.shallowsky.com/software/justmoon/
Source0:        http://www.shallowsky.com/software/justmoon/%{name}-%{version}.tar.gz
Source1:        justmoon-gmoon.desktop
Source2:        justmoon-qmoon.desktop
# Not sent to upstream yet
Patch0:         justmoon-0.3.3-parenth.patch
# Not upstreamable
Patch1:         justmoon-0.3.3-datadir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt3-devel
BuildRequires:  gtk+-devel
BuildRequires:  gdk-pixbuf-devel
BuildRequires:  desktop-file-utils

%description
%{summary}


%package gtk
Summary:        GTK+ frontend for Just Moon, a lunar observing software
Group:          Amusements/Graphics
Requires:       %{name}-common = %{version}

%description gtk
This package contains a lunar observing software with
GTK+-based user interface that fits the GNOME Desktop environment.


%package qt
Summary:        QT frontend for Just Moon, a lunar observing software
Group:          Amusements/Graphics
Requires:       %{name}-common = %{version}

%description qt
This package contains a lunar observing software with
QT-based user interface that fits the KDE Desktop environment.


%package common
Summary:        Data files for Just Moon, a lunar observing software
Group:          Amusements/Graphics

%description common
This package contains data file for a lunar observing software Just Moon.
In order to actually use Just Moon you need a graphical frontend from
justmoon-qt or justmoon-gtk package.


%prep
%setup -q
%patch0 -p1 -b .parenth
%patch1 -p1 -b .datadir


%build
make %{?_smp_mflags}                                            \
        'CFLAGS=%{optflags} -DDATADIR=\"%{_datadir}/%{name}/\"' \
        'CXXFLAGS=%{optflags} -DDATADIR=\"%{_datadir}/%{name}/\"'


%install
rm -rf $RPM_BUILD_ROOT
make installdata INSTALLDIR=$RPM_BUILD_ROOT/%{_datadir}/%{name}
make -C gmoon install INSTALLPREFIX=$RPM_BUILD_ROOT/%{_prefix}
install -p -m 0755 qmoon/qmoon $RPM_BUILD_ROOT/%{_bindir}
desktop-file-install --vendor="fedora"                          \
        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
        %{SOURCE1}
desktop-file-install --vendor="fedora"                          \
        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
        %{SOURCE2}


%clean
rm -rf $RPM_BUILD_ROOT


%files common
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}
%attr(0644,root,root) %{_datadir}/%{name}/*
%doc README


%files gtk
%defattr(-,root,root,-)
%{_bindir}/gmoon
%{_datadir}/applications/fedora-justmoon-gmoon.desktop


%files qt
%defattr(-,root,root,-)
%{_bindir}/qmoon
%{_datadir}/applications/fedora-justmoon-qmoon.desktop


%changelog
* Fri Sep 05 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.3-3
- Yet more review fixes, thanks to yet another Marek Mahut

* Fri Sep 05 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.3-2
- Integrate review fixes, thanks to Marek Mahut

* Fri Sep 05 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.3-1
- Initial packaging attempt


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/justmoon/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 13:36:40 -0000	1.1
+++ .cvsignore	9 Sep 2008 22:27:54 -0000	1.2
@@ -0,0 +1 @@
+justmoon-0.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/justmoon/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 13:36:40 -0000	1.1
+++ sources	9 Sep 2008 22:27:55 -0000	1.2
@@ -0,0 +1 @@
+3007c84e3b5232c0dba9f5c0b5c3a669  justmoon-0.3.3.tar.gz



From lkundrak at fedoraproject.org  Tue Sep  9 22:29:38 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  9 Sep 2008 22:29:38 +0000 (UTC)
Subject: rpms/justmoon/EL-5 import.log, NONE,
	1.1 justmoon-0.3.3-datadir.patch, 
	NONE, 1.1 justmoon-0.3.3-parenth.patch, NONE,
	1.1 justmoon-gmoon.desktop, NONE, 1.1 justmoon-qmoon.desktop,
	NONE, 1.1 justmoon.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20080909222938.26B8F7012A@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/justmoon/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8699/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log justmoon-0.3.3-datadir.patch 
	justmoon-0.3.3-parenth.patch justmoon-gmoon.desktop 
	justmoon-qmoon.desktop justmoon.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
justmoon-0_3_3-3_el5:EL-5:justmoon-0.3.3-3.el5.src.rpm:1220999357

justmoon-0.3.3-datadir.patch:

--- NEW FILE justmoon-0.3.3-datadir.patch ---
We pass DATADIR from CFLAGS

Lubomir Rintel <lkundrak at v3.sk>

--- justmoon-0.3.3/include/MoonFeature.h.datadir	2008-09-05 11:58:25.000000000 +0200
+++ justmoon-0.3.3/include/MoonFeature.h	2008-09-05 11:58:37.000000000 +0200
@@ -9,9 +9,6 @@
 #ifndef MOONFEATURE_H
 #define MOONFEATURE_H
 
-// Where the data files live:
-#define DATADIR "/usr/local/qmoon/"
-
 class MoonCanvas;
 
 class MoonFeature

justmoon-0.3.3-parenth.patch:

--- NEW FILE justmoon-0.3.3-parenth.patch ---
Fix build with gcc-4.1

Lubomir Rintel <lkundrak at v3.sk>

--- justmoon-0.3.3/libmoon/MoonFeature.cpp.parenth	2008-09-05 11:44:51.000000000 +0200
+++ justmoon-0.3.3/libmoon/MoonFeature.cpp	2008-09-05 11:45:08.000000000 +0200
@@ -128,7 +128,7 @@
     // Delete the old moonFeature list:
     if (sMoonFeatureList)
         DeleteFeatures();
-    sMoonFeatureList = new (MoonFeature*)[2000];
+    sMoonFeatureList = new MoonFeature*[2000];
 
     sNumFeatures = 0;
 


--- NEW FILE justmoon-gmoon.desktop ---
[Desktop Entry]
Name=Just Moon
Comment=Lunar observing software
GenericName=Just Moon
Exec=gmoon
Icon=/usr/share/justmoon/fullmoon
Type=Application
Categories=Education;Game;Astronomy;Science;
NotShowIn=KDE;


--- NEW FILE justmoon-qmoon.desktop ---
[Desktop Entry]
Name=Just Moon
Comment=Lunar observing software
GenericName=Just Moon
Exec=qmoon
Icon=/usr/share/justmoon/fullmoon
Type=Application
Categories=Education;Game;Astronomy;Science;
NotShowIn=GNOME;


--- NEW FILE justmoon.spec ---
Name:           justmoon
Version:        0.3.3
Release:        3%{?dist}
Summary:        Just Moon is lunar observing software for Linux

Group:          Amusements/Graphics
License:        GPL+
URL:            http://www.shallowsky.com/software/justmoon/
Source0:        http://www.shallowsky.com/software/justmoon/%{name}-%{version}.tar.gz
Source1:        justmoon-gmoon.desktop
Source2:        justmoon-qmoon.desktop
# Not sent to upstream yet
Patch0:         justmoon-0.3.3-parenth.patch
# Not upstreamable
Patch1:         justmoon-0.3.3-datadir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt3-devel
BuildRequires:  gtk+-devel
BuildRequires:  gdk-pixbuf-devel
BuildRequires:  desktop-file-utils

%description
%{summary}


%package gtk
Summary:        GTK+ frontend for Just Moon, a lunar observing software
Group:          Amusements/Graphics
Requires:       %{name}-common = %{version}

%description gtk
This package contains a lunar observing software with
GTK+-based user interface that fits the GNOME Desktop environment.


%package qt
Summary:        QT frontend for Just Moon, a lunar observing software
Group:          Amusements/Graphics
Requires:       %{name}-common = %{version}

%description qt
This package contains a lunar observing software with
QT-based user interface that fits the KDE Desktop environment.


%package common
Summary:        Data files for Just Moon, a lunar observing software
Group:          Amusements/Graphics

%description common
This package contains data file for a lunar observing software Just Moon.
In order to actually use Just Moon you need a graphical frontend from
justmoon-qt or justmoon-gtk package.


%prep
%setup -q
%patch0 -p1 -b .parenth
%patch1 -p1 -b .datadir


%build
make %{?_smp_mflags}                                            \
        'CFLAGS=%{optflags} -DDATADIR=\"%{_datadir}/%{name}/\"' \
        'CXXFLAGS=%{optflags} -DDATADIR=\"%{_datadir}/%{name}/\"'


%install
rm -rf $RPM_BUILD_ROOT
make installdata INSTALLDIR=$RPM_BUILD_ROOT/%{_datadir}/%{name}
make -C gmoon install INSTALLPREFIX=$RPM_BUILD_ROOT/%{_prefix}
install -p -m 0755 qmoon/qmoon $RPM_BUILD_ROOT/%{_bindir}
desktop-file-install --vendor="fedora"                          \
        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
        %{SOURCE1}
desktop-file-install --vendor="fedora"                          \
        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
        %{SOURCE2}


%clean
rm -rf $RPM_BUILD_ROOT


%files common
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}
%attr(0644,root,root) %{_datadir}/%{name}/*
%doc README


%files gtk
%defattr(-,root,root,-)
%{_bindir}/gmoon
%{_datadir}/applications/fedora-justmoon-gmoon.desktop


%files qt
%defattr(-,root,root,-)
%{_bindir}/qmoon
%{_datadir}/applications/fedora-justmoon-qmoon.desktop


%changelog
* Fri Sep 05 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.3-3
- Yet more review fixes, thanks to yet another Marek Mahut

* Fri Sep 05 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.3-2
- Integrate review fixes, thanks to Marek Mahut

* Fri Sep 05 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.3-1
- Initial packaging attempt


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/justmoon/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2008 13:36:40 -0000	1.1
+++ .cvsignore	9 Sep 2008 22:29:07 -0000	1.2
@@ -0,0 +1 @@
+justmoon-0.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/justmoon/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 13:36:40 -0000	1.1
+++ sources	9 Sep 2008 22:29:07 -0000	1.2
@@ -0,0 +1 @@
+3007c84e3b5232c0dba9f5c0b5c3a669  justmoon-0.3.3.tar.gz



From ndim at fedoraproject.org  Tue Sep  9 22:53:10 2008
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Tue,  9 Sep 2008 22:53:10 +0000 (UTC)
Subject: rpms/nted/devel nted.spec,1.2,1.3
Message-ID: <20080909225310.79D2F7012A@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12263

Modified Files:
	nted.spec 
Log Message:
* Wed Sep 10 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.0.8-2
- Work around upstream shipping an executable dynarray.h file.



Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/nted.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nted.spec	9 Sep 2008 21:53:38 -0000	1.2
+++ nted.spec	9 Sep 2008 22:52:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           nted
 Version:        1.0.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Musical score editor
 Summary(de):    Partitureditor
 
@@ -39,6 +39,8 @@
 
 %prep
 %setup -q
+# Upstream mistakenly ships a header file with its x bit set.
+chmod -x dynarray.h
 
 
 %build
@@ -73,6 +75,9 @@
 
 
 %changelog
+* Wed Sep 10 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.0.8-2
+- Work around upstream shipping an executable dynarray.h file.
+
 * Tue Sep  9 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.0.8-1
 - Update to upstream's 1.0.8 release.
 



From ndim at fedoraproject.org  Tue Sep  9 22:53:57 2008
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Tue,  9 Sep 2008 22:53:57 +0000 (UTC)
Subject: rpms/nted/F-9 .cvsignore,1.2,1.3 nted.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20080909225357.DFE947012A@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12494

Modified Files:
	.cvsignore nted.spec sources 
Log Message:
* Wed Sep 10 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.0.8-2
- Work around upstream shipping an executable dynarray.h file.

* Tue Sep  9 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.0.8-1
- Update to upstream's 1.0.8 release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Sep 2008 07:28:54 -0000	1.2
+++ .cvsignore	9 Sep 2008 22:53:27 -0000	1.3
@@ -1 +1 @@
-nted-1.0.7.tar.gz
+nted-1.0.8.tar.gz


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-9/nted.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nted.spec	8 Sep 2008 07:32:19 -0000	1.1
+++ nted.spec	9 Sep 2008 22:53:27 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           nted
-Version:        1.0.7
+Version:        1.0.8
 Release:        2%{?dist}
 Summary:        Musical score editor
 Summary(de):    Partitureditor
@@ -39,6 +39,8 @@
 
 %prep
 %setup -q
+# Upstream mistakenly ships a header file with its x bit set.
+chmod -x dynarray.h
 
 
 %build
@@ -73,6 +75,12 @@
 
 
 %changelog
+* Wed Sep 10 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.0.8-2
+- Work around upstream shipping an executable dynarray.h file.
+
+* Tue Sep  9 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.0.8-1
+- Update to upstream's 1.0.8 release.
+
 * Sun Sep  7 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.0.7-2
 - Consistently use %%{buildroot} instead of $RPM_BUILD_ROOT
 - Ship upstream's now correct COPYING file.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2008 07:28:54 -0000	1.2
+++ sources	9 Sep 2008 22:53:27 -0000	1.3
@@ -1 +1 @@
-4613ef2b9a63c237375893fc12aae130  nted-1.0.7.tar.gz
+33e9ba55295f451a16033e0fcd63dfb5  nted-1.0.8.tar.gz



From cweyl at fedoraproject.org  Tue Sep  9 23:17:16 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  9 Sep 2008 23:17:16 +0000 (UTC)
Subject: rpms/perl-Perl-Critic/devel .cvsignore, 1.11,
	1.12 perl-Perl-Critic.spec, 1.17, 1.18 sources, 1.11, 1.12
Message-ID: <20080909231716.7ED2A7012A@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Perl-Critic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16415

Modified Files:
	.cvsignore perl-Perl-Critic.spec sources 
Log Message:
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.092-1
- update to 1.092



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	1 Jul 2008 03:41:41 -0000	1.11
+++ .cvsignore	9 Sep 2008 23:16:43 -0000	1.12
@@ -1 +1 @@
-Perl-Critic-1.082.tar.gz
+Perl-Critic-1.092.tar.gz


Index: perl-Perl-Critic.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/perl-Perl-Critic.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- perl-Perl-Critic.spec	1 Jul 2008 03:41:41 -0000	1.17
+++ perl-Perl-Critic.spec	9 Sep 2008 23:16:43 -0000	1.18
@@ -1,12 +1,11 @@
 Name:           perl-Perl-Critic
-Version:        1.082
+Version:        1.092
 Release:        1%{?dist}
 Summary:        Critique Perl source code for best-practices
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Perl-Critic/
-Source0:        http://www.cpan.org/authors/id/T/TH/THALJEF/perlcritic/Perl-Critic-%{version}.tar.gz
 Source0:        http://www.cpan.org/modules/by-module/Perl/Perl-Critic-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -19,13 +18,14 @@
 BuildRequires:  perl(IO::String)
 BuildRequires:  perl(List::MoreUtils)
 BuildRequires:  perl(Module::Pluggable) >= 3.1
-BuildRequires:  perl(PPI) >= 1.201
+BuildRequires:  perl(PPI) >= 1.203
 BuildRequires:  perl(String::Format) >= 1.13
 BuildRequires:  perl(Perl::Tidy)
 BuildRequires:  perl(Test::Memory::Cycle)
 BuildRequires:  perl(Readonly) >= 1.03
 BuildRequires:  perl(Exception::Class) >= 1.23
 # BuildRequires:  perl(Regexp::Parser)
+BuildRequires:  perl(Test::Deep)
 # Author tests
 #BuildRequires:  perl(Test::Perl::Critic)
 #BuildRequires:  perl(Test::Kwalitee)
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.092-1
+- update to 1.092
+
 * Sun Mar 09 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.082-1
 - update to 1.082
 - resolve BZ#431577


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Jul 2008 03:41:41 -0000	1.11
+++ sources	9 Sep 2008 23:16:43 -0000	1.12
@@ -1 +1 @@
-f2ad44e084444b42f1b59b0f2f3bb387  Perl-Critic-1.082.tar.gz
+ead8f91253864525e0a022a1ef903c64  Perl-Critic-1.092.tar.gz



From pkgdb at fedoraproject.org  Tue Sep  9 23:36:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 23:36:46 +0000
Subject: [pkgdb] gpsim ownership updated
Message-ID: <20080909233647.86CD8208770@bastion.fedora.phx.redhat.com>

Package gpsim in Fedora devel is now owned by rrankin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsim



From pkgdb at fedoraproject.org  Tue Sep  9 23:38:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 23:38:34 +0000
Subject: [pkgdb] rubygem-activeldap (Fedora EPEL, 5) updated by kevin
Message-ID: <20080909233834.53BF1208D0F@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for rubygem-activeldap
kevin has set commit to Approved for uberpackager on rubygem-activeldap (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on rubygem-activeldap (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on rubygem-activeldap (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-activeldap



From pkgdb at fedoraproject.org  Tue Sep  9 23:39:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 23:39:40 +0000
Subject: [pkgdb] rubygem-hoe (Fedora EPEL, 5) updated by kevin
Message-ID: <20080909233940.F0194208771@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for rubygem-hoe
kevin has set commit to Approved for uberpackager on rubygem-hoe (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on rubygem-hoe (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on rubygem-hoe (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-hoe



From pkgdb at fedoraproject.org  Tue Sep  9 23:40:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 23:40:47 +0000
Subject: [pkgdb] rubygem-rubyforge (Fedora EPEL, 5) updated by kevin
Message-ID: <20080909234048.2BD69208771@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for rubygem-rubyforge
kevin has set commit to Approved for uberpackager on rubygem-rubyforge (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on rubygem-rubyforge (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on rubygem-rubyforge (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-rubyforge



From pkgdb at fedoraproject.org  Tue Sep  9 23:41:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 23:41:41 +0000
Subject: [pkgdb] kde-plasma-lancelot was added for than
Message-ID: <20080909234141.B5E61208D97@bastion.fedora.phx.redhat.com>

kevin has added Package kde-plasma-lancelot with summary An alternative application launcher
kevin has approved Package kde-plasma-lancelot
kevin has added a Fedora devel branch for kde-plasma-lancelot with an owner of than
kevin has approved kde-plasma-lancelot in Fedora devel
kevin has approved Package kde-plasma-lancelot
kevin has set commit to Approved for packager on kde-plasma-lancelot (Fedora devel)
kevin has set build to Approved for packager on kde-plasma-lancelot (Fedora devel)
kevin has set checkout to Approved for packager on kde-plasma-lancelot (Fedora devel)
kevin has set commit to Approved for uberpackager on kde-plasma-lancelot (Fedora devel)
kevin has set build to Approved for uberpackager on kde-plasma-lancelot (Fedora devel)
kevin has set checkout to Approved for uberpackager on kde-plasma-lancelot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-lancelot



From pkgdb at fedoraproject.org  Tue Sep  9 23:41:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 23:41:45 +0000
Subject: [pkgdb] kde-plasma-lancelot (Fedora, 9) updated by kevin
Message-ID: <20080909234145.7C9CE208D9A@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for kde-plasma-lancelot
kevin has set commit to Approved for uberpackager on kde-plasma-lancelot (Fedora 9)
kevin has set build to Approved for uberpackager on kde-plasma-lancelot (Fedora 9)
kevin has set checkout to Approved for uberpackager on kde-plasma-lancelot (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-lancelot



From kevin at fedoraproject.org  Tue Sep  9 23:42:09 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:42:09 +0000 (UTC)
Subject: rpms/kde-plasma-lancelot/devel - New directory
Message-ID: <20080909234209.AD0147012A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kde-plasma-lancelot/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS20505/rpms/kde-plasma-lancelot/devel

Log Message:
Directory /cvs/extras/rpms/kde-plasma-lancelot/devel added to the repository




From kevin at fedoraproject.org  Tue Sep  9 23:42:09 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:42:09 +0000 (UTC)
Subject: rpms/kde-plasma-lancelot - New directory
Message-ID: <20080909234209.4B2417012A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kde-plasma-lancelot
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS20505/rpms/kde-plasma-lancelot

Log Message:
Directory /cvs/extras/rpms/kde-plasma-lancelot added to the repository




From kevin at fedoraproject.org  Tue Sep  9 23:42:11 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:42:11 +0000 (UTC)
Subject: rpms/kde-plasma-lancelot Makefile,NONE,1.1
Message-ID: <20080909234211.278787012A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kde-plasma-lancelot
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS20505/rpms/kde-plasma-lancelot

Added Files:
	Makefile 
Log Message:
Setup of module kde-plasma-lancelot


--- NEW FILE Makefile ---
# Top level Makefile for module kde-plasma-lancelot
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  9 23:42:11 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:42:11 +0000 (UTC)
Subject: rpms/kde-plasma-lancelot/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080909234211.71D9E7012A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kde-plasma-lancelot/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS20505/rpms/kde-plasma-lancelot/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kde-plasma-lancelot


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: kde-plasma-lancelot
# $Id: Makefile,v 1.1 2008/09/09 23:42:11 kevin Exp $
NAME := kde-plasma-lancelot
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  9 23:42:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 23:42:50 +0000
Subject: [pkgdb] gtk+extra ownership updated
Message-ID: <20080909234250.0E41E208770@bastion.fedora.phx.redhat.com>

Package gtk+extra in Fedora devel is now owned by rrankin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+extra



From pkgdb at fedoraproject.org  Tue Sep  9 23:43:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 23:43:18 +0000
Subject: [pkgdb] python-peak-rules was added for lmacken
Message-ID: <20080909234318.8E8AB208D1E@bastion.fedora.phx.redhat.com>

kevin has added Package python-peak-rules with summary Generic functions and business rules support systems
kevin has approved Package python-peak-rules
kevin has added a Fedora devel branch for python-peak-rules with an owner of lmacken
kevin has approved python-peak-rules in Fedora devel
kevin has approved Package python-peak-rules
kevin has set commit to Approved for packager on python-peak-rules (Fedora devel)
kevin has set build to Approved for packager on python-peak-rules (Fedora devel)
kevin has set checkout to Approved for packager on python-peak-rules (Fedora devel)
kevin has set commit to Approved for uberpackager on python-peak-rules (Fedora devel)
kevin has set build to Approved for uberpackager on python-peak-rules (Fedora devel)
kevin has set checkout to Approved for uberpackager on python-peak-rules (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-rules



From pkgdb at fedoraproject.org  Tue Sep  9 23:43:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 23:43:19 +0000
Subject: [pkgdb] python-peak-rules (Fedora, 8) updated by kevin
Message-ID: <20080909234319.9FAE5208D98@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for python-peak-rules
kevin has set commit to Approved for uberpackager on python-peak-rules (Fedora 8)
kevin has set build to Approved for uberpackager on python-peak-rules (Fedora 8)
kevin has set checkout to Approved for uberpackager on python-peak-rules (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-rules



From pkgdb at fedoraproject.org  Tue Sep  9 23:43:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 23:43:19 +0000
Subject: [pkgdb] python-peak-rules (Fedora, 9) updated by kevin
Message-ID: <20080909234319.A3B5C208D9B@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for python-peak-rules
kevin has set commit to Approved for uberpackager on python-peak-rules (Fedora 9)
kevin has set build to Approved for uberpackager on python-peak-rules (Fedora 9)
kevin has set checkout to Approved for uberpackager on python-peak-rules (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-rules



From pkgdb at fedoraproject.org  Tue Sep  9 23:43:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 23:43:19 +0000
Subject: [pkgdb] python-peak-rules (Fedora EPEL, 4) updated by kevin
Message-ID: <20080909234319.AAA58208D9F@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for python-peak-rules
kevin has set commit to Approved for uberpackager on python-peak-rules (Fedora EPEL 4)
kevin has set build to Approved for uberpackager on python-peak-rules (Fedora EPEL 4)
kevin has set checkout to Approved for uberpackager on python-peak-rules (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-rules



From pkgdb at fedoraproject.org  Tue Sep  9 23:43:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 23:43:19 +0000
Subject: [pkgdb] python-peak-rules (Fedora EPEL, 5) updated by kevin
Message-ID: <20080909234319.B6191208DA2@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-peak-rules
kevin has set commit to Approved for uberpackager on python-peak-rules (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on python-peak-rules (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on python-peak-rules (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-rules



From kevin at fedoraproject.org  Tue Sep  9 23:43:34 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:43:34 +0000 (UTC)
Subject: rpms/python-peak-rules - New directory
Message-ID: <20080909234334.32A807012A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-peak-rules
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS20647/rpms/python-peak-rules

Log Message:
Directory /cvs/extras/rpms/python-peak-rules added to the repository




From kevin at fedoraproject.org  Tue Sep  9 23:43:34 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:43:34 +0000 (UTC)
Subject: rpms/python-peak-rules/devel - New directory
Message-ID: <20080909234334.778EE7012A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-peak-rules/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS20647/rpms/python-peak-rules/devel

Log Message:
Directory /cvs/extras/rpms/python-peak-rules/devel added to the repository




From kevin at fedoraproject.org  Tue Sep  9 23:43:35 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:43:35 +0000 (UTC)
Subject: rpms/python-peak-rules Makefile,NONE,1.1
Message-ID: <20080909234335.7EB7F7012A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-peak-rules
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS20647/rpms/python-peak-rules

Added Files:
	Makefile 
Log Message:
Setup of module python-peak-rules


--- NEW FILE Makefile ---
# Top level Makefile for module python-peak-rules
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  9 23:43:35 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:43:35 +0000 (UTC)
Subject: rpms/python-peak-rules/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20080909234335.C92E17012A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-peak-rules/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS20647/rpms/python-peak-rules/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-peak-rules


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-peak-rules
# $Id: Makefile,v 1.1 2008/09/09 23:43:35 kevin Exp $
NAME := python-peak-rules
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  9 23:45:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 23:45:45 +0000
Subject: [pkgdb] netbeans was added for victorv
Message-ID: <20080909234545.63AE8208D1E@bastion.fedora.phx.redhat.com>

kevin has added Package netbeans with summary NetBeans IDE - Integrated Development Environment
kevin has approved Package netbeans
kevin has added a Fedora devel branch for netbeans with an owner of victorv
kevin has approved netbeans in Fedora devel
kevin has approved Package netbeans
kevin has set commit to Approved for packager on netbeans (Fedora devel)
kevin has set build to Approved for packager on netbeans (Fedora devel)
kevin has set checkout to Approved for packager on netbeans (Fedora devel)
kevin has set commit to Approved for uberpackager on netbeans (Fedora devel)
kevin has set build to Approved for uberpackager on netbeans (Fedora devel)
kevin has set checkout to Approved for uberpackager on netbeans (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netbeans



From kevin at fedoraproject.org  Tue Sep  9 23:45:57 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:45:57 +0000 (UTC)
Subject: rpms/netbeans - New directory
Message-ID: <20080909234557.2F3BA7012A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/netbeans
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR20917/rpms/netbeans

Log Message:
Directory /cvs/extras/rpms/netbeans added to the repository




From kevin at fedoraproject.org  Tue Sep  9 23:45:57 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:45:57 +0000 (UTC)
Subject: rpms/netbeans/devel - New directory
Message-ID: <20080909234557.85D247012A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/netbeans/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR20917/rpms/netbeans/devel

Log Message:
Directory /cvs/extras/rpms/netbeans/devel added to the repository




From kevin at fedoraproject.org  Tue Sep  9 23:45:58 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:45:58 +0000 (UTC)
Subject: rpms/netbeans Makefile,NONE,1.1
Message-ID: <20080909234558.BC4B97012A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/netbeans
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR20917/rpms/netbeans

Added Files:
	Makefile 
Log Message:
Setup of module netbeans


--- NEW FILE Makefile ---
# Top level Makefile for module netbeans
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  9 23:45:59 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:45:59 +0000 (UTC)
Subject: rpms/netbeans/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080909234559.73AB97012A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/netbeans/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR20917/rpms/netbeans/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module netbeans


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: netbeans
# $Id: Makefile,v 1.1 2008/09/09 23:45:59 kevin Exp $
NAME := netbeans
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  9 23:47:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 23:47:05 +0000
Subject: [pkgdb] open-cobol was added for s4504kr
Message-ID: <20080909234705.EA1AF208D0F@bastion.fedora.phx.redhat.com>

kevin has added Package open-cobol with summary OpenCOBOL - COBOL Compiler
kevin has approved Package open-cobol
kevin has added a Fedora devel branch for open-cobol with an owner of s4504kr
kevin has approved open-cobol in Fedora devel
kevin has approved Package open-cobol
kevin has set commit to Approved for packager on open-cobol (Fedora devel)
kevin has set build to Approved for packager on open-cobol (Fedora devel)
kevin has set checkout to Approved for packager on open-cobol (Fedora devel)
kevin has set commit to Approved for uberpackager on open-cobol (Fedora devel)
kevin has set build to Approved for uberpackager on open-cobol (Fedora devel)
kevin has set checkout to Approved for uberpackager on open-cobol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/open-cobol



From pkgdb at fedoraproject.org  Tue Sep  9 23:47:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 23:47:09 +0000
Subject: [pkgdb] open-cobol (Fedora, 8) updated by kevin
Message-ID: <20080909234709.EC7D3208D7C@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for open-cobol
kevin has set commit to Approved for uberpackager on open-cobol (Fedora 8)
kevin has set build to Approved for uberpackager on open-cobol (Fedora 8)
kevin has set checkout to Approved for uberpackager on open-cobol (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/open-cobol



From pkgdb at fedoraproject.org  Tue Sep  9 23:47:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 23:47:09 +0000
Subject: [pkgdb] open-cobol (Fedora, 9) updated by kevin
Message-ID: <20080909234710.54539208D99@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for open-cobol
kevin has set commit to Approved for uberpackager on open-cobol (Fedora 9)
kevin has set build to Approved for uberpackager on open-cobol (Fedora 9)
kevin has set checkout to Approved for uberpackager on open-cobol (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/open-cobol



From kevin at fedoraproject.org  Tue Sep  9 23:47:29 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:47:29 +0000 (UTC)
Subject: rpms/open-cobol - New directory
Message-ID: <20080909234729.382817012A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/open-cobol
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb21148/rpms/open-cobol

Log Message:
Directory /cvs/extras/rpms/open-cobol added to the repository




From kevin at fedoraproject.org  Tue Sep  9 23:47:29 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:47:29 +0000 (UTC)
Subject: rpms/open-cobol/devel - New directory
Message-ID: <20080909234729.8F5DB7012A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/open-cobol/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb21148/rpms/open-cobol/devel

Log Message:
Directory /cvs/extras/rpms/open-cobol/devel added to the repository




From kevin at fedoraproject.org  Tue Sep  9 23:47:30 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:47:30 +0000 (UTC)
Subject: rpms/open-cobol Makefile,NONE,1.1
Message-ID: <20080909234730.D44467012A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/open-cobol
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb21148/rpms/open-cobol

Added Files:
	Makefile 
Log Message:
Setup of module open-cobol


--- NEW FILE Makefile ---
# Top level Makefile for module open-cobol
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  9 23:47:31 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:47:31 +0000 (UTC)
Subject: rpms/open-cobol/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080909234731.3D0517012A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/open-cobol/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb21148/rpms/open-cobol/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module open-cobol


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: open-cobol
# $Id: Makefile,v 1.1 2008/09/09 23:47:30 kevin Exp $
NAME := open-cobol
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep  9 23:48:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 23:48:14 +0000
Subject: [pkgdb] libmirage was added for jmoskovc
Message-ID: <20080909234814.1C059208D0F@bastion.fedora.phx.redhat.com>

kevin has added Package libmirage with summary library for reading various CD/DVD image files
kevin has approved Package libmirage
kevin has added a Fedora devel branch for libmirage with an owner of jmoskovc
kevin has approved libmirage in Fedora devel
kevin has approved Package libmirage
kevin has set commit to Approved for packager on libmirage (Fedora devel)
kevin has set build to Approved for packager on libmirage (Fedora devel)
kevin has set checkout to Approved for packager on libmirage (Fedora devel)
kevin has set commit to Approved for uberpackager on libmirage (Fedora devel)
kevin has set build to Approved for uberpackager on libmirage (Fedora devel)
kevin has set checkout to Approved for uberpackager on libmirage (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmirage



From mccann at fedoraproject.org  Tue Sep  9 23:48:20 2008
From: mccann at fedoraproject.org (William Jon McCann)
Date: Tue,  9 Sep 2008 23:48:20 +0000 (UTC)
Subject: rpms/gdm/devel gdm-pam,1.8,1.9 gdm.spec,1.410,1.411
Message-ID: <20080909234820.450047012A@cvs1.fedora.phx.redhat.com>

Author: mccann

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21311

Modified Files:
	gdm-pam gdm.spec 
Log Message:
- Disallow root login




Index: gdm-pam
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-pam,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gdm-pam	14 Jan 2008 15:40:55 -0000	1.8
+++ gdm-pam	9 Sep 2008 23:47:49 -0000	1.9
@@ -1,5 +1,6 @@
 #%PAM-1.0
 auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth       required    pam_succeed_if.so user != root quiet
 auth       required    pam_env.so
 auth       substack    system-auth
 auth       optional    pam_gnome_keyring.so


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- gdm.spec	9 Sep 2008 01:44:42 -0000	1.410
+++ gdm.spec	9 Sep 2008 23:47:49 -0000	1.411
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.23.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -301,6 +301,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Tue Sep  9 2008 Jon McCann <jmccann at redhat.com> - 1:2.23.92-2
+- Disallow root login
+
 * Mon Sep  8 2008 Jon McCann <jmccann at redhat.com> - 1:2.23.92-1
 - Update to 2.23.92-1
 



From kevin at fedoraproject.org  Tue Sep  9 23:48:27 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:48:27 +0000 (UTC)
Subject: rpms/libmirage - New directory
Message-ID: <20080909234827.31AF77012A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libmirage
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA21449/rpms/libmirage

Log Message:
Directory /cvs/extras/rpms/libmirage added to the repository




From pkgdb at fedoraproject.org  Tue Sep  9 23:48:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 09 Sep 2008 23:48:15 +0000
Subject: [pkgdb] libmirage (Fedora, 9) updated by kevin
Message-ID: <20080909234815.2931A208D98@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for libmirage
kevin has set commit to Approved for uberpackager on libmirage (Fedora 9)
kevin has set build to Approved for uberpackager on libmirage (Fedora 9)
kevin has set checkout to Approved for uberpackager on libmirage (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmirage



From kevin at fedoraproject.org  Tue Sep  9 23:48:27 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:48:27 +0000 (UTC)
Subject: rpms/libmirage/devel - New directory
Message-ID: <20080909234827.843A27012A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libmirage/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA21449/rpms/libmirage/devel

Log Message:
Directory /cvs/extras/rpms/libmirage/devel added to the repository




From kevin at fedoraproject.org  Tue Sep  9 23:48:28 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:48:28 +0000 (UTC)
Subject: rpms/libmirage Makefile,NONE,1.1
Message-ID: <20080909234828.D39767012A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libmirage
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA21449/rpms/libmirage

Added Files:
	Makefile 
Log Message:
Setup of module libmirage


--- NEW FILE Makefile ---
# Top level Makefile for module libmirage
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep  9 23:48:29 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  9 Sep 2008 23:48:29 +0000 (UTC)
Subject: rpms/libmirage/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080909234829.429167012F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libmirage/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA21449/rpms/libmirage/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libmirage


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libmirage
# $Id: Makefile,v 1.1 2008/09/09 23:48:28 kevin Exp $
NAME := libmirage
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From andyp at fedoraproject.org  Wed Sep 10 00:17:06 2008
From: andyp at fedoraproject.org (Andrew Price)
Date: Wed, 10 Sep 2008 00:17:06 +0000 (UTC)
Subject: rpms/pybackpack/devel import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 pybackpack.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20080910001706.4BEFE7012C@cvs1.fedora.phx.redhat.com>

Author: andyp

Update of /cvs/pkgs/rpms/pybackpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26603/devel

Modified Files:
	.cvsignore pybackpack.spec sources 
Added Files:
	import.log 
Log Message:
Import pybackpack-0.5.5


--- NEW FILE import.log ---
pybackpack-0_5_5-1_fc9:HEAD:pybackpack-0.5.5-1.fc9.src.rpm:1221005806


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pybackpack/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Jan 2008 20:15:58 -0000	1.3
+++ .cvsignore	10 Sep 2008 00:16:34 -0000	1.4
@@ -1 +1 @@
-pybackpack-0.5.4.tar.gz
+pybackpack-0.5.5.tar.gz


Index: pybackpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pybackpack/devel/pybackpack.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pybackpack.spec	1 Jan 2008 21:09:11 -0000	1.4
+++ pybackpack.spec	10 Sep 2008 00:16:35 -0000	1.5
@@ -3,8 +3,8 @@
 
 Summary: User oriented backup and restore application
 Name: pybackpack
-Version: 0.5.4
-Release: 2%{?dist}
+Version: 0.5.5
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Archiving
 URL: http://andrewprice.me.uk/projects/pybackpack/
@@ -57,6 +57,8 @@
 %endif
 
 %changelog
+* Wed Sep 10 2008 Andy Price <andy at andrewprice.me.uk> - 0.5.5-1
+- Updated RPM to 0.5.5
 * Tue Jan 01 2008 Andy Price <andy at andrewprice.me.uk> - 0.5.4-2
 - Take ownership of .egg-info file in >= Fedora 9
 * Tue Jan 01 2008 Andy Price <andy at andrewprice.me.uk> - 0.5.4-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pybackpack/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Jan 2008 20:15:58 -0000	1.3
+++ sources	10 Sep 2008 00:16:35 -0000	1.4
@@ -1 +1 @@
-1bf64e715159e76b47cf20d61f2debb7  pybackpack-0.5.4.tar.gz
+e7f8409a82c49071fc11d611347de910  pybackpack-0.5.5.tar.gz



From victorv at fedoraproject.org  Wed Sep 10 00:38:07 2008
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Wed, 10 Sep 2008 00:38:07 +0000 (UTC)
Subject: rpms/netbeans/devel import.log, NONE,
	1.1 netbeans-6.1-00-copy-build.patch, NONE,
	1.1 netbeans-6.1-10-ant-external-build.patch, NONE,
	1.1 netbeans-6.1-20-ant-build.patch, NONE,
	1.1 netbeans-6.1-30-parse-project-xml.patch, NONE,
	1.1 netbeans-6.1-40-build-xml.patch, NONE,
	1.1 netbeans-6.1-50-ide-launcher.patch, NONE,
	1.1 netbeans-6.1-60-small-ide-config.patch, NONE,
	1.1 netbeans-ide.desktop-template, NONE, 1.1 netbeans.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080910003807.D8DC77012C@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/netbeans/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30146/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log netbeans-6.1-00-copy-build.patch 
	netbeans-6.1-10-ant-external-build.patch 
	netbeans-6.1-20-ant-build.patch 
	netbeans-6.1-30-parse-project-xml.patch 
	netbeans-6.1-40-build-xml.patch 
	netbeans-6.1-50-ide-launcher.patch 
	netbeans-6.1-60-small-ide-config.patch 
	netbeans-ide.desktop-template netbeans.spec 
Log Message:
Initial version



--- NEW FILE import.log ---
netbeans-6_1-4_fc10:HEAD:netbeans-6.1-4.fc10.src.rpm:1221007047

netbeans-6.1-00-copy-build.patch:

--- NEW FILE netbeans-6.1-00-copy-build.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/junit/nbproject/project.properties netbeans-6.1.new/junit/nbproject/project.properties
--- netbeans-6.1/junit/nbproject/project.properties	2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/junit/nbproject/project.properties	2008-06-16 17:56:43.000000000 +0400
@@ -42,9 +42,9 @@
 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.1.jar=modules/ext/junit-4.1.jar
+#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.1.jar=modules/ext/junit-4.1.jar
 jnlp.indirect.jars=\
     docs/junit-3.8.2-api.zip,\
     modules/ext/junit*.jar
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/libs.commons_logging/nbproject/project.properties netbeans-6.1.new/libs.commons_logging/nbproject/project.properties
--- netbeans-6.1/libs.commons_logging/nbproject/project.properties	2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.commons_logging/nbproject/project.properties	2008-06-16 17:56:43.000000000 +0400
@@ -38,4 +38,4 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/commons-logging-1.0.4.jar=modules/ext/commons-logging-1.0.4.jar
+#release.external/commons-logging-1.0.4.jar=modules/ext/commons-logging-1.0.4.jar
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/libs.freemarker/nbproject/project.properties netbeans-6.1.new/libs.freemarker/nbproject/project.properties
--- netbeans-6.1/libs.freemarker/nbproject/project.properties	2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.freemarker/nbproject/project.properties	2008-06-16 17:56:43.000000000 +0400
@@ -41,5 +41,5 @@
 
 javac.compilerargs=-Xlint:unchecked
 javac.source=1.5
-release.external/freemarker-2.3.8.jar=modules/ext/freemarker-2.3.8.jar
+#release.external/freemarker-2.3.8.jar=modules/ext/freemarker-2.3.8.jar
 module.jar.verifylinkageignores=freemarker.((ext.ant.FreemarkerXmlTask)|(template.DefaultObjectWrapper))
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/libs.ini4j/nbproject/project.properties netbeans-6.1.new/libs.ini4j/nbproject/project.properties
--- netbeans-6.1/libs.ini4j/nbproject/project.properties	2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.ini4j/nbproject/project.properties	2008-06-16 17:56:43.000000000 +0400
@@ -38,7 +38,7 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/ini4j-0.2.6.jar=modules/ext/ini4j-0.2.6.jar
+#release.external/ini4j-0.2.6.jar=modules/ext/ini4j-0.2.6.jar
 module.jar.verifylinkageignores=org.ini4j.IniPreferencesFactoryListener
 
 # Fatal error: class javax.servlet.ServletContextListener not found
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/libs.javacapi/nbproject/project.properties netbeans-6.1.new/libs.javacapi/nbproject/project.properties
--- netbeans-6.1/libs.javacapi/nbproject/project.properties	2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.javacapi/nbproject/project.properties	2008-06-16 17:56:43.000000000 +0400
@@ -44,6 +44,6 @@
 nbm.homepage=http://jackpot.netbeans.org/
 nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc.
 spec.version.base=0.6.0
-release.external/javac-api-nb-7.0-b07.jar=modules/ext/javac-api-nb-7.0-b07.jar
+#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.1/libs.javacimpl/nbproject/project.properties netbeans-6.1.new/libs.javacimpl/nbproject/project.properties
--- netbeans-6.1/libs.javacimpl/nbproject/project.properties	2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.javacimpl/nbproject/project.properties	2008-06-16 17:56:43.000000000 +0400
@@ -41,7 +41,7 @@
 nbm.homepage=http://jackpot.netbeans.org/
 nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc.
 spec.version.base=0.8.0
-release.external/javac-impl-nb-7.0-b07.jar=modules/ext/javac-impl-nb-7.0-b07.jar
+#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.1/libs.jna/nbproject/project.properties netbeans-6.1.new/libs.jna/nbproject/project.properties
--- netbeans-6.1/libs.jna/nbproject/project.properties	2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.jna/nbproject/project.properties	2008-06-16 17:56:43.000000000 +0400
@@ -37,4 +37,4 @@
 # 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.2.jar=modules/ext/jna-3.0.2.jar
+#release.external/jna-3.0.2.jar=modules/ext/jna-3.0.2.jar
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/libs.jsch/nbproject/project.properties netbeans-6.1.new/libs.jsch/nbproject/project.properties
--- netbeans-6.1/libs.jsch/nbproject/project.properties	2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.jsch/nbproject/project.properties	2008-06-16 17:56:43.000000000 +0400
@@ -38,4 +38,4 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/jsch-0.1.24.jar=modules/ext/jsch-0.1.24.jar
+#release.external/jsch-0.1.24.jar=modules/ext/jsch-0.1.24.jar
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/libs.lucene/nbproject/project.properties netbeans-6.1.new/libs.lucene/nbproject/project.properties
--- netbeans-6.1/libs.lucene/nbproject/project.properties	2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.lucene/nbproject/project.properties	2008-06-16 17:56:43.000000000 +0400
@@ -38,4 +38,4 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/lucene-core-2.2.0.jar=modules/ext/lucene-core-2.2.0.jar
+#release.external/lucene-core-2.2.0.jar=modules/ext/lucene-core-2.2.0.jar
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/libs.svnClientAdapter/nbproject/project.properties netbeans-6.1.new/libs.svnClientAdapter/nbproject/project.properties
--- netbeans-6.1/libs.svnClientAdapter/nbproject/project.properties	2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.svnClientAdapter/nbproject/project.properties	2008-06-16 17:56:43.000000000 +0400
@@ -39,7 +39,7 @@
 
 is.autoload=true
 
-release.external/svnClientAdapter-0.9.23.jar=modules/ext/svnClientAdapter-0.9.23.jar
+#release.external/svnClientAdapter-0.9.23.jar=modules/ext/svnClientAdapter-0.9.23.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.1/libs.xerces/nbproject/project.properties netbeans-6.1.new/libs.xerces/nbproject/project.properties
--- netbeans-6.1/libs.xerces/nbproject/project.properties	2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.xerces/nbproject/project.properties	2008-06-16 17:56:43.000000000 +0400
@@ -38,5 +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
+#release.external/xerces-2.8.0.jar=modules/ext/xerces-2.8.0.jar
 module.jar.verifylinkageignores=org.apache.xerces.util.XMLCatalogResolver
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/o.apache.xml.resolver/nbproject/project.properties netbeans-6.1.new/o.apache.xml.resolver/nbproject/project.properties
--- netbeans-6.1/o.apache.xml.resolver/nbproject/project.properties	2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/o.apache.xml.resolver/nbproject/project.properties	2008-06-16 17:56:43.000000000 +0400
@@ -38,4 +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
+#release.external/resolver-1.2.jar=modules/ext/resolver-1.2.jar
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/o.jdesktop.beansbinding/nbproject/project.properties netbeans-6.1.new/o.jdesktop.beansbinding/nbproject/project.properties
--- netbeans-6.1/o.jdesktop.beansbinding/nbproject/project.properties	2008-06-16 17:52:15.000000000 +0400
+++ netbeans-6.1.new/o.jdesktop.beansbinding/nbproject/project.properties	2008-06-16 17:57:13.000000000 +0400
@@ -38,6 +38,6 @@
 # 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
+#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
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/swingapp/nbproject/project.properties netbeans-6.1.new/swingapp/nbproject/project.properties
--- netbeans-6.1/swingapp/nbproject/project.properties	2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/swingapp/nbproject/project.properties	2008-06-16 17:56:43.000000000 +0400
@@ -1,5 +1,5 @@
-extra.module.files=modules/ext/appframework-1.0.3.jar,\
-                   docs/appframework-1.0.3-doc.zip,\
-                   modules/ext/swing-worker-1.1.jar
+#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

netbeans-6.1-10-ant-external-build.patch:

--- NEW FILE netbeans-6.1-10-ant-external-build.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-new-source/o.apache.tools.ant.module/external/build.xml netbeans-new-source.new/o.apache.tools.ant.module/external/build.xml
--- netbeans-new-source/o.apache.tools.ant.module/external/build.xml	2008-04-21 18:43:38.000000000 +0400
+++ netbeans-new-source.new/o.apache.tools.ant.module/external/build.xml	2008-06-10 19:17:52.000000000 +0400
@@ -42,7 +42,7 @@
 -->
 <project name="o.apache.tools.ant.module/external" default="unzip" basedir=".">
     <target name="unzip">
-        <unzip src="ant-libs-1.7.0.zip" dest="lib"/>
+        <!--unzip src="ant-libs-1.7.0.zip" dest="lib"/-->
     </target>
     <target name="clean">
         <delete dir="lib"/>

netbeans-6.1-20-ant-build.patch:

--- NEW FILE netbeans-6.1-20-ant-build.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-new-source/o.apache.tools.ant.module/build.xml netbeans-new-source.new/o.apache.tools.ant.module/build.xml
--- netbeans-new-source/o.apache.tools.ant.module/build.xml	2008-04-21 18:43:38.000000000 +0400
+++ netbeans-new-source.new/o.apache.tools.ant.module/build.xml	2008-06-10 19:24:03.000000000 +0400
@@ -75,21 +75,6 @@
     </target>
 
     <target name="release" depends="init">
-        <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="netbeans-extra" depends="jar-bridge,release"/>

netbeans-6.1-30-parse-project-xml.patch:

--- NEW FILE netbeans-6.1-30-parse-project-xml.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java netbeans-6.1.new/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java
--- netbeans-6.1/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java	2008-04-21 18:43:38.000000000 +0400
+++ netbeans-6.1.new/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java	2008-06-11 20:55:03.000000000 +0400
@@ -1198,6 +1198,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.1-40-build-xml.patch:

--- NEW FILE netbeans-6.1-40-build-xml.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-new-source/nbbuild/build.xml netbeans-new-source.new/nbbuild/build.xml
--- netbeans-new-source/nbbuild/build.xml	2008-04-21 18:43:38.000000000 +0400
+++ netbeans-new-source.new/nbbuild/build.xml	2008-06-10 19:36:52.000000000 +0400
@@ -584,8 +584,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" />
-    <copy file="../ide/launcher/windows/nb.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" />

netbeans-6.1-50-ide-launcher.patch:

--- NEW FILE netbeans-6.1-50-ide-launcher.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-new-source/ide/launcher/unix/netbeans netbeans-new-source.new/ide/launcher/unix/netbeans
--- netbeans-new-source/ide/launcher/unix/netbeans	2008-03-26 18:55:01.000000000 +0300
+++ netbeans-new-source.new/ide/launcher/unix/netbeans	2008-06-10 19:44:30.000000000 +0400
@@ -54,16 +54,18 @@
     fi
 done
 
-progdir=`dirname "$PRG"`
+#progdir=`dirname "$PRG"`
+# Patch for Debian/Ubuntu where launcher is in /usr/bin
+progdir=/usr/share/netbeans/6.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 "$@"

netbeans-6.1-60-small-ide-config.patch:

--- NEW FILE netbeans-6.1-60-small-ide-config.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/form.kit/nbproject/project.xml netbeans-6.1.new/form.kit/nbproject/project.xml
--- netbeans-6.1/form.kit/nbproject/project.xml	2008-06-16 17:33:03.000000000 +0400
+++ netbeans-6.1.new/form.kit/nbproject/project.xml	2008-06-16 17:36:44.000000000 +0400
@@ -12,13 +12,13 @@
                         <specification-version>1.22</specification-version>
                     </run-dependency>
                 </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-->
                 <dependency>
                     <code-name-base>org.netbeans.modules.i18n.form</code-name-base>
                     <run-dependency>
@@ -26,12 +26,12 @@
                         <specification-version>1.21</specification-version>
                     </run-dependency>
                 </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-->
                 <dependency>
                     <code-name-base>org.netbeans.modules.java.kit</code-name-base>
                     <run-dependency>
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/ide.kit/nbproject/project.xml netbeans-6.1.new/ide.kit/nbproject/project.xml
--- netbeans-6.1/ide.kit/nbproject/project.xml	2008-06-16 17:33:03.000000000 +0400
+++ netbeans-6.1.new/ide.kit/nbproject/project.xml	2008-06-16 17:36:44.000000000 +0400
@@ -130,13 +130,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.ide.branding</code-name-base>
                     <run-dependency>
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/java.kit/nbproject/project.xml netbeans-6.1.new/java.kit/nbproject/project.xml
--- netbeans-6.1/java.kit/nbproject/project.xml	2008-06-16 17:33:03.000000000 +0400
+++ netbeans-6.1.new/java.kit/nbproject/project.xml	2008-06-16 17:37:41.000000000 +0400
@@ -66,13 +66,13 @@
                         <specification-version>1.6</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
+                <!--dependency>
                     <code-name-base>org.netbeans.modules.java.examples</code-name-base>
                     <run-dependency>
                         <release-version>1</release-version>
                         <specification-version>1.6</specification-version>
                     </run-dependency>
-                </dependency>
+                </dependency-->
                 <dependency>
                     <code-name-base>org.netbeans.modules.java.freeform</code-name-base>
                     <run-dependency>
@@ -169,7 +169,7 @@
                         <specification-version>1.1</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
+                <!--dependency>
                     <code-name-base>org.netbeans.modules.websvc.jaxws21</code-name-base>
                     <run-dependency>
                         <release-version>1</release-version>
@@ -187,7 +187,7 @@
                     <run-dependency>
                         <specification-version>1.0</specification-version>
                     </run-dependency>
-                </dependency>
+                </dependency-->
             </module-dependencies>
             <public-packages/>
         </data>
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/nbbuild/cluster.properties netbeans-6.1.new/nbbuild/cluster.properties
--- netbeans-6.1/nbbuild/cluster.properties	2008-06-16 17:33:03.000000000 +0400
+++ netbeans-6.1.new/nbbuild/cluster.properties	2008-06-16 17:36:44.000000000 +0400
@@ -231,14 +231,6 @@
         api.xml,\
         classfile,\
         core.ide,\
-        db,\
-        db.core,\
-        db.drivers,\
-        db.kit, \
-        db.mysql, \
-        db.sql.editor,\
-        db.sql.visualeditor,\
-        dbapi,\
         defaults,\
         diff,\
         editor,\
@@ -263,7 +255,6 @@
         editor.util,\
         extbrowser,\
         gototest,\
-        httpserver,\
         ide.kit,\
         image,\
         jumpto,\
@@ -300,7 +291,6 @@
         refactoring.api,\
         schema2beans,\
         server,\
-        servletapi,\
         spi.debugger.ui,\
         spi.editor.hints,\
         spi.navigator,\
@@ -319,7 +309,6 @@
         versioning,\
         versioning.system.cvss,\
         versioning.util,\
-        web.flyingsaucer,\
         xml,\
         xml.axi,\
         xml.catalog,\
@@ -334,8 +323,7 @@
         xml.tools,\
         xml.wsdl.model,\
         xml.xam,\
-        xml.xdm,\
-        xsl
+        xml.xdm
 
 nb.cluster.java.dir=java2
 nb.cluster.java.depends=\
@@ -349,27 +337,19 @@
         ant.kit,\
         api.debugger.jpda,\
         api.java,\
-        beans,\
-        dbschema,\
+	beans,\
         debugger.jpda,\
         debugger.jpda.ant,\
         debugger.jpda.projects,\
         debugger.jpda.ui,\
-        derby,\
         form,\
-        form.j2ee,\
         form.kit,\
         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,\
@@ -395,16 +375,10 @@
         junit,\
         libs.javacapi,\
         libs.javacimpl,\
-        libs.springframework,\
         o.apache.tools.ant.module,\
         o.jdesktop.beansbinding,\
         refactoring.java,\
-        spring.beans,\
         swingapp,\
-        websvc.jaxws21,\
-        websvc.jaxws21api,\
-        websvc.serviceapi,\
-        xml.jaxb, \
         xml.tools.java
 
 nb.cluster.xml.dir=xml2


--- NEW FILE netbeans-ide.desktop-template ---
[Desktop Entry]
Encoding=UTF-8
Type=Application
Version=1.0
Name=NetBeans IDE <nb_ver>
GenericName=Integrated Development Environment (IDE)
Comment=The only IDE you need!
Icon=<nb_icon>
TryExec=<nb_launcher>
Exec=<nb_launcher>
Terminal=false
Categories=Development;Java;IDE;
StartupNotify=true




--- NEW FILE netbeans.spec ---
%define __alternatives %{_sbindir}/alternatives

%define nb_              netbeans
%define nb_org           %{nb_}.org
%define nb_ver           6.1
%define nb_alt_priority  610
%define nb_release_time  200805300101
%define nb_home          %{_datadir}/%{nb_}
%define nb_dir           %{nb_home}/%{nb_ver}

%define nb_platform_ver  8
%define nb_platform      platform%{nb_platform_ver}
%define nb_platform_dir  %{nb_home}/%{nb_platform}
%define nb_platform_pkg  %{nb_}-%{nb_platform}

%define nb_harness       harness
%define nb_harness_dir   %{nb_home}/%{nb_harness}
%define nb_harness_pkg   %{nb_}-%{nb_platform}-%{nb_harness}

%define nb_ide_ver       9
%define nb_ide           ide%{nb_ide_ver}
%define nb_ide_dir       %{nb_home}/%{nb_ide}
%define nb_ide_pkg       %{nb_}-%{nb_ide}

%define nb_java_ver      2
%define nb_java          java%{nb_java_ver}
%define nb_java_dir      %{nb_home}/%{nb_java}
%define nb_java_pkg      %{nb_}-%{nb_java}

%define nb_apisupport_ver  1
%define nb_apisupport      apisupport%{nb_apisupport_ver}
%define nb_apisupport_dir  %{nb_home}/%{nb_apisupport}
%define nb_apisupport_pkg  %{nb_}-%{nb_apisupport}

%define nb_nb         nb%{nb_ver}
%define nb_nb_dir     %{nb_dir}/%{nb_nb}
%define nb_bin_dir    %{nb_dir}/bin
%define nb_etc_dir    %{nb_dir}/etc
%define nb_config_dir %{nb_dir}/config

# See http://wiki.netbeans.org/NBDistroIDs
%define nb_distro_id NBFC

%define nb_javadoc_site  http://bits.netbeans.org/%{nb_ver}/javadoc

# Prevents use of autoupdate on the specified directory.
# %1 the directory being prevented for autoupdate.
%define noautoupdate()    echo > %1/.noautoupdate

# Remove artifacts created by the noautoupdate macro.
# %1 the directory has been prevented for autoupdate.
%define rm_noautoupdate() %{__rm} -rf %1/.noautoupdate


%define cluster basic

%define nb_icon         %{nb_nb_dir}/netbeans.png
%define nb_launcher     %{nb_bin_dir}/netbeans
%define nb_desktop      %{name}-ide-%{version}.desktop

%define compiler_opt    -Dbuild.compiler.deprecation=false -Dbuild.compiler.debug=false
%define jdk_opt         -Dpermit.jdk6.builds=true
%define verify_opt      -Dverify.checkout=false
%define ant_nb_opt %{ant} %{jdk_opt} %{compiler_opt} %{verify_opt}

# Layout defined by ant-1.7.0-1jpp.4.fc9.rpm
%define ant_bin_dir /usr/bin
%define ant_etc_dir %{_datadir}/ant/etc
%define ant_lib_dir %{_datadir}/java
%define ant_lib_dir2 %{_datadir}/java/ant

# Used xml resolver
%define xml_resolver netbeans-resolver
%define xml_resolver_ver %{nb_ver}
%define xml_resolver_jar %{_javadir}/%{xml_resolver}-%{xml_resolver_ver}.jar

# Used netbeans-svnclientadapter-6.1.jar
%define svnclientadapter     netbeans-svnclientadapter
%define svnclientadapter_ver %{nb_ver}
%define svnclientadapter_jar %{_javadir}/%{svnclientadapter}-%{svnclientadapter_ver}.jar

Name:           %{nb_}
Version:        %{nb_ver}
Release:        4%{?dist}
Summary:        Integrated Development Environment (IDE)
Group:          Development/Tools
License:        GPLv2 with exceptions or CDDL
Vendor:         netbeans.org
URL:            http://www.netbeans.org
Distribution:   %{nb_}-%{nb_ver}

Source0: http://nbi.netbeans.org/files/documents/210/2056/%{nb_}-%{nb_ver}-%{nb_release_time}-%{cluster}_cluster-src.zip
Source1: %{name}-ide-launcher.zip
Source2: %{name}-ide.desktop-template
%define nb_desktop_template %{SOURCE2}

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
Patch5: %{name}-%{version}-50-ide-launcher.patch
Patch6: %{name}-%{version}-60-small-ide-config.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

BuildRequires: jpackage-utils
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant >= 0:1.7.0
BuildRequires: ant-junit >= 0:1.7.0
BuildRequires: ant-nodeps >= 0:1.7.0
BuildRequires: ant-trax >= 0:1.7.0
BuildRequires: junit >= 0:3.8.2
BuildRequires: junit4 >= 0:4.3.1
BuildRequires: swing-layout >= 0:1.0
BuildRequires: javahelp2 >= 2.0.05
# BuildRequires: jna >= 0:3.0.2 It is provided by nb_platform
BuildRequires: %{nb_platform_pkg} >= %{version}
BuildRequires: lucene >= 0:2.3.0
BuildRequires: unzip
BuildRequires: desktop-file-utils
BuildRequires: netbeans-javaparser >= %{version}
BuildRequires: xerces-j2 >= 2.7.1
BuildRequires: appframework >= 1.03
BuildRequires: beansbinding >= 1.2.1
BuildRequires: freemarker >= 2.3.8
BuildRequires: jsch >= 0.1.24
BuildRequires: %{xml_resolver} >= %{xml_resolver_ver}
BuildRequires: ini4j >= 0.3.2-4
BuildRequires: netbeans-svnclientadapter >= %{version}

Requires: jpackage-utils
Requires: java >= 1:1.6.0
# Requires: swing-layout >= 0:1.0
# Requires: javahelp2 >= 2.0.05 It is provided by nb_platform
# Requires: jna >= 0:3.0.2 It is provided by nb_platform
Requires: %{nb_apisupport_pkg} >= %{version}
Requires: %{nb_harness_pkg}    >= %{version}
Requires: %{nb_ide_pkg}        >= %{version}
Requires: %{nb_java_pkg}       >= %{version}
Requires: %{nb_platform_pkg}   >= %{version}
Requires: lucene >= 0:2.3.0
Requires: junit >= 0:3.8.2
Requires: junit4 >= 0:4.3.1

%description
NetBeans IDE is an Integrated Development Environment (IDE) for Java/JavaFX, 
C/C++, Ruby, UML, etc. The NetBeans IDE is oriented on wide audience of 
developers from beginners up to experts. A developer can find useful set of 
the development tools that are embedded in the IDE or can be integrated with. 
The NetBeans IDE is the modular system and it can be configured according to 
user needs. Please, visit http://www.netbeans.org/ for more information about 
this open-source project.


%package %{nb_apisupport}

Summary: Common NetBeans Platform Development Related Libraries for NetBeans
Group: Development/Tools
Requires: jpackage-utils
Requires: java >= 1:1.6.0
Requires: %{nb_ide_pkg}      = %{version}-%{release}
Requires: %{nb_java_pkg}     = %{version}-%{release}
Requires: %{nb_platform_pkg} = %{version}
Requires: %{nb_harness_pkg}  = %{version}
Provides: libnb-%{nb_apisupport} = %{version}

%description %{nb_apisupport}
Common libraries for development of NetBeans Platform modular extensions.


%package %{nb_ide}

Summary: Integrated Development Environment (IDE) Libraries for NetBeans
Group: Development/Tools
Requires: jpackage-utils
Requires: java >= 1:1.6.0
Requires: %{nb_platform_pkg} >= %{version}
Requires: jsch >= 0.1.24
Requires: %{xml_resolver} >= %{xml_resolver_ver}
Requires: ini4j >= 0.3.2-4
Requires: freemarker >= 2.3.8
Requires: xerces-j2 >= 2.7.1
Requires: netbeans-svnclientadapter >= %{version}
Provides: libnb-%{nb_ide} = %{version}

%description %{nb_ide}
Common languages independent libraries for use in the IDE.


%package %{nb_java}

Summary: Common Java Related Libraries for NetBeans
Group: Development/Tools
Requires: jpackage-utils
Requires: java >= 1:1.6.0
Requires: %{name}-%{nb_ide} >= %{version}
Requires: java-1.6.0-openjdk >= 1:1.6.0
Requires: netbeans-javaparser = %{version}
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
Provides: libnb-%{nb_java} = %{version}

%description %{nb_java}
Common libraries for the NetBeans Java IDE.

%prep
%setup -q -c
%setup -q -T -D -a 1

find . -type d -print0 | xargs -t -0 chmod 755
find . -type f -print0 | xargs -t -0 chmod 644
find . -type f \( -iname "*.jar" -o -iname "*.zip" \) -print0 | xargs -t -0 %{__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

%{__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
%patch2 -p1 -b .sav
%patch3 -p1 -b .sav
%patch4 -p1 -b .sav
%patch5 -p1 -b .sav
%patch6 -p1 -b .sav

%build

mkdir -p nbbuild/netbeans
%{__ln_s} -f %{nb_platform_dir} nbbuild/netbeans/%{nb_platform}

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.24.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
# 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-0.9.23.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.2.0.jar
%{__ln_s} -f %{_javadir}/commons-logging.jar ${IDE_EXT_DIR}/commons-logging-1.0.4.jar

JAVA_EXT_DIR=nbbuild/netbeans/%{nb_java}/modules/ext
%{__mkdir_p}  ${JAVA_EXT_DIR}
%{__ln_s} -f %{_javadir}/netbeans-javaparser-api-6.1.jar ${JAVA_EXT_DIR}/javac-api-nb-7.0-b07.jar
%{__ln_s} -f %{_javadir}/netbeans-javaparser-impl-6.1.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.1.jar
%{__ln_s} -f %{_javadir}/junit.jar ${JAVA_EXT_DIR}/junit-3.8.2.jar

%{ant_nb_opt} \
    -Do.n.core.dir=%{nb_platform_dir} \
    -Dnb.cluster.platform-is-built=true \
    -Dnb.cluster.harness-is-built=true \
    -Dcore.dir=%{nb_platform_dir} \
    -Do.n.bootstrap.dir=%{nb_platform_dir} \
    -Dopenide.awt.dir=%{nb_platform_dir} \
    -Dlibs.beans-binding.classpath=%{_javadir}/beansbinding.jar \
    -Dlibs.swing-layout.classpath=%{_javadir}/swing-layout.jar \
    -Dcluster.config=basic \
    -f nbbuild/build.xml build-nozip

# Build desktop file
%{__cp} -p %{nb_desktop_template} %{nb_desktop}
sed --in-place "s|<nb_ver>|%{nb_ver}|g" %{nb_desktop}
sed --in-place "s|<nb_icon>|%{nb_icon}|g" %{nb_desktop}
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.24.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}/freemarker-2.3.8.jar
%{__rm} -f ${IDE_EXT_DIR}/svnClientAdapter-0.9.23.jar
%{__rm} -f ${IDE_EXT_DIR}/xerces-2.8.0.jar
%{__rm} -f ${IDE_EXT_DIR}/lucene-core-2.2.0.jar
%{__rm} -f ${IDE_EXT_DIR}/commons-logging-1.0.4.jar

# clean up links to ext jars for the java module
%{__rm} -f ${JAVA_EXT_DIR}/javac-api-nb-7.0-b07.jar
%{__rm} -f ${JAVA_EXT_DIR}/javac-impl-nb-7.0-b07.jar
%{__rm} -f ${JAVA_EXT_DIR}/appframework-1.0.3.jar
%{__rm} -f ${JAVA_EXT_DIR}/beansbinding-1.2.1.jar
%{__rm} -f ${JAVA_EXT_DIR}/junit-4.1.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.
# $1 the destination directory.
# $2 the source(s), e.g. nbbuild/netbeans/platform8/* .
install_package() {
    DISTDIR=$1
    shift
    SOURCES=$*
    %{__mkdir_p} ${DISTDIR}
    %{__cp} -pr ${SOURCES} ${DISTDIR}
}

%{__rm} -rf %{buildroot}

# Install apisupport
install_package %{buildroot}%{nb_apisupport_dir} nbbuild/netbeans/%{nb_apisupport}/*

# Install ide
install_package %{buildroot}%{nb_ide_dir} nbbuild/netbeans/%{nb_ide}/*

# 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.24.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
# 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-0.9.23.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.2.0.jar
%{__ln_s} -f %{_javadir}/commons-logging.jar ${IDE_EXT_DIR}/commons-logging-1.0.4.jar

# Install java
install_package %{buildroot}%{nb_java_dir} nbbuild/netbeans/%{nb_java}/*
# install java ant
install -d -m 755 %{buildroot}%{nb_java_dir}/ant/bin
install -d -m 755 %{buildroot}%{nb_java_dir}/ant/lib

# linking the java to the external JARs
JAVA_EXT_DIR=%{buildroot}%{nb_java_dir}/modules/ext
%{__ln_s} -f %{_javadir}/netbeans-javaparser-api-6.1.jar ${JAVA_EXT_DIR}/javac-api-nb-7.0-b07.jar
%{__ln_s} -f %{_javadir}/netbeans-javaparser-impl-6.1.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.1.jar
%{__ln_s} -f %{_javadir}/junit.jar ${JAVA_EXT_DIR}/junit-3.8.2.jar

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

%{__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
%{__ln_s} -f %{ant_lib_dir2}/ant-nodeps.jar ${JAVA_ANT_DIR}/lib/ant-nodeps.jar
%{__ln_s} -f %{ant_lib_dir2}/ant-trax.jar ${JAVA_ANT_DIR}/lib/ant-trax.jar


# Install nb
install_package %{buildroot}%{nb_nb_dir} nbbuild/netbeans/%{nb_nb}/*
# install nb bin (launcher)
install_package %{buildroot}%{nb_bin_dir} nbbuild/netbeans/bin/*
# install nb etc (netbeans.conf, netbeans.clusters)
install_package %{buildroot}%{nb_etc_dir} nbbuild/netbeans/etc/*
# install nb htmls
%{__cp} -p nbbuild/netbeans/CREDITS.html %{buildroot}%{nb_dir}/
%{__cp} -p nbbuild/netbeans/README.html %{buildroot}%{nb_dir}/
%{__cp} -p nbbuild/netbeans/netbeans.css %{buildroot}%{nb_dir}/
# inistall nb config
%{__mkdir_p} %{buildroot}%{nb_config_dir}
echo -n "%{nb_distro_id}" > %{buildroot}%{nb_config_dir}/productid

# Links to nbX.X components
%{__ln_s} ../%{nb_harness}    %{buildroot}%{nb_dir}/%{nb_harness}
%{__ln_s} ../%{nb_apisupport} %{buildroot}%{nb_dir}/%{nb_apisupport}
%{__ln_s} ../%{nb_ide}        %{buildroot}%{nb_dir}/%{nb_ide}
%{__ln_s} ../%{nb_java}       %{buildroot}%{nb_dir}/%{nb_java}
%{__ln_s} ../%{nb_platform}   %{buildroot}%{nb_dir}/%{nb_platform}

# Install desktop file
desktop-file-validate  %{nb_desktop}
install -d -m 755 %{buildroot}%{_datadir}/applications/%{nb_org}
desktop-file-install --vendor="" \
    --dir=%{buildroot}%{_datadir}/applications/%{nb_org} \
    %{nb_desktop}

%clean
%{__rm} -rf %{buildroot}

%post
%{__alternatives} --install %{_bindir}/%{nb_} %{nb_} %{nb_launcher} %{nb_alt_priority}
%noautoupdate %{nb_nb_dir}

%preun
if [ "$1" = "0" ]; then
    %{__alternatives} --remove %{nb_} %{nb_launcher}
fi
%rm_noautoupdate %{nb_nb_dir}

%post %{nb_apisupport}
%noautoupdate %{nb_apisupport_dir}

%preun %{nb_apisupport}
%rm_noautoupdate %{nb_apisupport_dir}

%post %{nb_ide}
%noautoupdate %{nb_ide_dir}

%preun %{nb_ide}
%rm_noautoupdate %{nb_ide_dir}

%post %{nb_java}
%noautoupdate %{nb_java_dir}

%preun %{nb_java}
%rm_noautoupdate %{nb_java_dir}

%files
%defattr(-,root,root,-)
%dir %{nb_dir}/
%{nb_dir}/
%docdir %{nb_nb_dir}/docs
%dir %{nb_bin_dir}/
%attr(755,root,root) %{nb_launcher}
%{nb_etc_dir}/
%doc %{nb_dir}/CREDITS.html
%doc %{nb_dir}/README.html
%{nb_dir}/netbeans.css
%dir %{_datadir}/applications/%{nb_org}/
%{_datadir}/applications/%{nb_org}/%{nb_desktop}

%files %{nb_apisupport}
%defattr(-,root,root,-)
%{nb_apisupport_dir}/
%doc nbbuild/standard-nbm-license.txt

%files %{nb_ide}
%defattr(-,root,root,-)
%{nb_ide_dir}/
%doc nbbuild/standard-nbm-license.txt

%files %{nb_java}
%defattr(-,root,root,-)
%{nb_java_dir}/
%doc nbbuild/standard-nbm-license.txt

%changelog
* 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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2008 23:45:58 -0000	1.1
+++ .cvsignore	10 Sep 2008 00:38:06 -0000	1.2
@@ -0,0 +1,2 @@
+netbeans-6.1-200805300101-basic_cluster-src.zip
+netbeans-ide-launcher.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2008 23:45:59 -0000	1.1
+++ sources	10 Sep 2008 00:38:06 -0000	1.2
@@ -0,0 +1,2 @@
+a7ea855f475fa3a982f094a45c155ab4  netbeans-6.1-200805300101-basic_cluster-src.zip
+71d0c9c582c4ae420ba1f2358da6df06  netbeans-ide-launcher.zip



From pkgdb at fedoraproject.org  Wed Sep 10 01:05:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 01:05:02 +0000
Subject: [pkgdb] xosview was added for terjeros
Message-ID: <20080910010502.7959B20876E@bastion.fedora.phx.redhat.com>

kevin has added Package xosview with summary OS resource viewer
kevin has approved Package xosview
kevin has added a Fedora devel branch for xosview with an owner of terjeros
kevin has approved xosview in Fedora devel
kevin has approved Package xosview
kevin has set commit to Approved for packager on xosview (Fedora devel)
kevin has set build to Approved for packager on xosview (Fedora devel)
kevin has set checkout to Approved for packager on xosview (Fedora devel)
kevin has set commit to Approved for uberpackager on xosview (Fedora devel)
kevin has set build to Approved for uberpackager on xosview (Fedora devel)
kevin has set checkout to Approved for uberpackager on xosview (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xosview



From pkgdb at fedoraproject.org  Wed Sep 10 01:05:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 01:05:03 +0000
Subject: [pkgdb] xosview (Fedora, 8) updated by kevin
Message-ID: <20080910010504.05E42208D98@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for xosview
kevin has set commit to Approved for uberpackager on xosview (Fedora 8)
kevin has set build to Approved for uberpackager on xosview (Fedora 8)
kevin has set checkout to Approved for uberpackager on xosview (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xosview



From kevin at fedoraproject.org  Wed Sep 10 01:05:27 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 01:05:27 +0000 (UTC)
Subject: rpms/xosview - New directory
Message-ID: <20080910010527.274FF7012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xosview
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYw2923/rpms/xosview

Log Message:
Directory /cvs/extras/rpms/xosview added to the repository




From kevin at fedoraproject.org  Wed Sep 10 01:05:27 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 01:05:27 +0000 (UTC)
Subject: rpms/xosview/devel - New directory
Message-ID: <20080910010527.5CFD470131@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xosview/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYw2923/rpms/xosview/devel

Log Message:
Directory /cvs/extras/rpms/xosview/devel added to the repository




From pkgdb at fedoraproject.org  Wed Sep 10 01:05:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 01:05:03 +0000
Subject: [pkgdb] xosview (Fedora, 9) updated by kevin
Message-ID: <20080910010504.0E955208D9B@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for xosview
kevin has set commit to Approved for uberpackager on xosview (Fedora 9)
kevin has set build to Approved for uberpackager on xosview (Fedora 9)
kevin has set checkout to Approved for uberpackager on xosview (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xosview



From kevin at fedoraproject.org  Wed Sep 10 01:05:28 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 01:05:28 +0000 (UTC)
Subject: rpms/xosview Makefile,NONE,1.1
Message-ID: <20080910010528.338907012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xosview
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYw2923/rpms/xosview

Added Files:
	Makefile 
Log Message:
Setup of module xosview


--- NEW FILE Makefile ---
# Top level Makefile for module xosview
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep 10 01:05:28 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 01:05:28 +0000 (UTC)
Subject: rpms/xosview/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080910010528.696D07012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xosview/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYw2923/rpms/xosview/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xosview


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xosview
# $Id: Makefile,v 1.1 2008/09/10 01:05:28 kevin Exp $
NAME := xosview
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 10 01:07:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 01:07:03 +0000
Subject: [pkgdb] apricots was added for limb
Message-ID: <20080910010703.5FB68208D0F@bastion.fedora.phx.redhat.com>

kevin has added Package apricots with summary 2D air combat game
kevin has approved Package apricots
kevin has added a Fedora devel branch for apricots with an owner of limb
kevin has approved apricots in Fedora devel
kevin has approved Package apricots
kevin has set commit to Approved for packager on apricots (Fedora devel)
kevin has set build to Approved for packager on apricots (Fedora devel)
kevin has set checkout to Approved for packager on apricots (Fedora devel)
kevin has set commit to Approved for uberpackager on apricots (Fedora devel)
kevin has set build to Approved for uberpackager on apricots (Fedora devel)
kevin has set checkout to Approved for uberpackager on apricots (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apricots



From kevin at fedoraproject.org  Wed Sep 10 01:07:13 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 01:07:13 +0000 (UTC)
Subject: rpms/apricots - New directory
Message-ID: <20080910010713.207407012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/apricots
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsur3410/rpms/apricots

Log Message:
Directory /cvs/extras/rpms/apricots added to the repository




From pkgdb at fedoraproject.org  Wed Sep 10 01:07:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 01:07:05 +0000
Subject: [pkgdb] apricots (Fedora, 9) updated by kevin
Message-ID: <20080910010705.2BA7E208D98@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for apricots
kevin has set commit to Approved for uberpackager on apricots (Fedora 9)
kevin has set build to Approved for uberpackager on apricots (Fedora 9)
kevin has set checkout to Approved for uberpackager on apricots (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apricots



From kevin at fedoraproject.org  Wed Sep 10 01:07:14 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 01:07:14 +0000 (UTC)
Subject: rpms/apricots Makefile,NONE,1.1
Message-ID: <20080910010714.47E0B7012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/apricots
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsur3410/rpms/apricots

Added Files:
	Makefile 
Log Message:
Setup of module apricots


--- NEW FILE Makefile ---
# Top level Makefile for module apricots
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep 10 01:07:13 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 01:07:13 +0000 (UTC)
Subject: rpms/apricots/devel - New directory
Message-ID: <20080910010713.587987012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/apricots/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsur3410/rpms/apricots/devel

Log Message:
Directory /cvs/extras/rpms/apricots/devel added to the repository




From kevin at fedoraproject.org  Wed Sep 10 01:07:14 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 01:07:14 +0000 (UTC)
Subject: rpms/apricots/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080910010714.864667012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/apricots/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsur3410/rpms/apricots/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module apricots


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: apricots
# $Id: Makefile,v 1.1 2008/09/10 01:07:14 kevin Exp $
NAME := apricots
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From bpepple at fedoraproject.org  Wed Sep 10 01:07:25 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed, 10 Sep 2008 01:07:25 +0000 (UTC)
Subject: rpms/xchat-gnome/devel xchat-gnome-0.23.92-config.patch, NONE,
	1.1 xchat-gnome-0.23.92-deps.patch, NONE, 1.1 .cvsignore, 1.16,
	1.17 sources, 1.16, 1.17 xchat-gnome.spec, 1.52,
	1.53 xchat-gnome-0.18-config.patch, 1.1,
	NONE xchat-gnome-0.18-it-translation.patch, 1.1,
	NONE xchat-gnome-0.18-reconnect.patch, 1.1,
	NONE xchat-gnome-fix_away_command.patch, 1.2,
	NONE xchat-gnome-spellchecking.patch, 1.1, NONE
Message-ID: <20080910010725.BF2BB7012C@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/xchat-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3311

Modified Files:
	.cvsignore sources xchat-gnome.spec 
Added Files:
	xchat-gnome-0.23.92-config.patch 
	xchat-gnome-0.23.92-deps.patch 
Removed Files:
	xchat-gnome-0.18-config.patch 
	xchat-gnome-0.18-it-translation.patch 
	xchat-gnome-0.18-reconnect.patch 
	xchat-gnome-fix_away_command.patch 
	xchat-gnome-spellchecking.patch 
Log Message:
* Tue Sep  9 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.23.92-1
- Update to 0.23.92.
- Add deps patch to correctly set libnotify & libcanberra options.
- Update BR.
- Drop reconnect patch.  Fixed upstream.
- Drop away-command patch.  Fixed upstream.
- Drop spell-checking patch.  Fixed upstream.
- Drop it-translation patch.  Fixed upstream.


xchat-gnome-0.23.92-config.patch:

--- NEW FILE xchat-gnome-0.23.92-config.patch ---
diff -urp xchat-gnome-0.23.92.OLD/plugins/perl/perl.c xchat-gnome-0.23.92/plugins/perl/perl.c
--- xchat-gnome-0.23.92.OLD/plugins/perl/perl.c	2007-03-09 10:42:50.000000000 -0500
+++ xchat-gnome-0.23.92/plugins/perl/perl.c	2008-09-09 19:07:08.000000000 -0400
@@ -92,7 +92,7 @@ perl_auto_load (void)
 	if (!xdir)						  /* xchatdirfs is new for 2.0.9, will fail on older */
 		xdir = xchat_get_info (ph, "xchatdir");
 
-	/* autoload from ~/.xchat2/ or ${APPDATA}\X-Chat 2\ on win32 */
+	/* autoload from ~/.xchat-gnome/ or ${APPDATA}\X-Chat 2\ on win32 */
 	perl_auto_load_from_path (xdir);
 
 #ifdef WIN32
diff -urp xchat-gnome-0.23.92.OLD/plugins/python/python.c xchat-gnome-0.23.92/plugins/python/python.c
--- xchat-gnome-0.23.92.OLD/plugins/python/python.c	2008-09-07 09:18:27.000000000 -0400
+++ xchat-gnome-0.23.92/plugins/python/python.c	2008-09-09 19:06:47.000000000 -0400
@@ -421,7 +421,7 @@ Util_Expand(char *filename)
 		return expanded;
 	g_free(expanded);
 
-	/* Check if ~/.xchat2/<filename> exists. */
+	/* Check if ~/.xchat-gnome/<filename> exists. */
 	expanded = g_build_filename(xchat_get_info(ph, "xchatdir"),
 				    filename, NULL);
 	if (g_file_test(expanded, G_FILE_TEST_EXISTS))
diff -urp xchat-gnome-0.23.92.OLD/src/common/cfgfiles.c xchat-gnome-0.23.92/src/common/cfgfiles.c
--- xchat-gnome-0.23.92.OLD/src/common/cfgfiles.c	2007-09-12 10:12:26.000000000 -0400
+++ xchat-gnome-0.23.92/src/common/cfgfiles.c	2008-09-09 19:05:01.000000000 -0400
@@ -34,7 +34,7 @@
 #ifdef WIN32
 #define XCHAT_DIR "X-Chat 2"
 #else
-#define XCHAT_DIR ".xchat2"
+#define XCHAT_DIR ".xchat-gnome"
 #endif
 #define DEF_FONT "Monospace 9"
 
@@ -351,7 +351,7 @@ check_prefs_dir (void)
 #else
 		if (mkdir (dir, S_IRUSR | S_IWUSR | S_IXUSR) != 0)
 #endif
-			fe_message (_("Cannot create ~/.xchat2"), FE_MSG_ERROR);
+			fe_message (_("Cannot create ~/.xchat-gnome"), FE_MSG_ERROR);
 	}
 }
 
diff -urp xchat-gnome-0.23.92.OLD/src/common/fe.h xchat-gnome-0.23.92/src/common/fe.h
--- xchat-gnome-0.23.92.OLD/src/common/fe.h	2007-07-09 05:30:58.000000000 -0400
+++ xchat-gnome-0.23.92/src/common/fe.h	2008-09-09 19:05:21.000000000 -0400
@@ -106,7 +106,7 @@ void fe_get_str (char *prompt, char *def
 void fe_get_int (char *prompt, int def, void *callback, void *ud);
 #define FRF_WRITE 1	/* save file */
 #define FRF_MULTIPLE 2	/* multi-select */
-#define FRF_ADDFOLDER 4	/* add ~/.xchat2 to favourites */
+#define FRF_ADDFOLDER 4	/* add ~/.xchat-gnome to favourites */
 #define FRF_CHOOSEFOLDER 8	/* choosing a folder only */
 #define FRF_FILTERISINITIAL 16	/* unused */
 #define FRF_NOASKOVERWRITE 32	/* don't ask to overwrite existing files */
diff -urp xchat-gnome-0.23.92.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.23.92/src/fe-gnome/preferences-page-plugins.c
--- xchat-gnome-0.23.92.OLD/src/fe-gnome/preferences-page-plugins.c	2007-07-24 05:24:39.000000000 -0400
+++ xchat-gnome-0.23.92/src/fe-gnome/preferences-page-plugins.c	2008-09-09 19:06:27.000000000 -0400
@@ -242,7 +242,7 @@ open_plugin_clicked (GtkButton *button, 
 	file_selector = gtk_file_chooser_dialog_new (_("Open Plugin"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
 
 	homedir = g_get_home_dir();
-	plugindir = g_strdup_printf ("%s/.xchat2/plugins", homedir);
+	plugindir = g_strdup_printf ("%s/.xchat-gnome/plugins", homedir);
 	gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_selector), plugindir);
 	g_free (plugindir);
 
@@ -417,7 +417,7 @@ preferences_page_plugins_check_plugins (
 	xchat_plugin *plugin;
 
 	homedir = g_get_home_dir ();
-	xchatdir = g_strdup_printf ("%s/.xchat2/plugins", homedir);
+	xchatdir = g_strdup_printf ("%s/.xchat-gnome/plugins", homedir);
 	for_files (XCHATLIBDIR "/plugins", "*.so", fe_plugin_add);
 	for_files (XCHATLIBDIR "/plugins", "*.sl", fe_plugin_add);
 	for_files (XCHATLIBDIR "/plugins", "*.py", fe_plugin_add);

xchat-gnome-0.23.92-deps.patch:

--- NEW FILE xchat-gnome-0.23.92-deps.patch ---
--- trunk/configure.ac	2008/09/09 20:15:27	2670
+++ trunk/configure.ac	2008/09/09 22:52:52	2671
@@ -122,7 +122,7 @@
   AC_SUBST([LIBNOTIFY_LIBS])
 fi
 
-AM_CONDITIONAL([ENABLE_LIBNOTIFY],[test "$enable_notification" = "yes"])
+AM_CONDITIONAL([ENABLE_LIBNOTIFY],[test "x$enable_notification" = "xyes"])
 
 # libcanberra-gtk
 AC_MSG_CHECKING([whether to enable notification sounds using libcanberra])
@@ -137,7 +137,7 @@
   AC_SUBST([LIBCANBERRAGTK_LIBS])
 fi
 
-AM_CONDITIONAL([ENABLE_LIBCANBERRA],[test "$enable_canberra" = "yes"])
+AM_CONDITIONAL([ENABLE_LIBCANBERRA],[test "x$enable_canberra" = "xyes"])
 
 # GConf
 AM_GCONF_SOURCE_2
@@ -359,7 +359,7 @@
 DIST_PLUGINS="$ALL_PLUGINS $CANBERRA_PLUGINS $DBUS_PLUGINS $LIBNOTIFY_PLUGINS $PYTHON_PLUGINS $PERL_PLUGINS $TCL_PLUGINS"
 
 # canberra specific plugins
-if test "x$libcanberra" = "xyes"; then
+if test "x$enable_canberra" = "xyes"; then
 	ALL_PLUGINS="$ALL_PLUGINS $CANBERRA_PLUGINS"
 else
 	AC_MSG_WARN([xchat-gnome compiled without libcanberra support, plugins $CANBERRA_PLUGINS will not be available])
@@ -373,7 +373,7 @@
 fi
 
 # libnotify-specific plugins
-if test "x$libnotify" = "xyes"; then
+if test "x$enable_notification" = "xyes"; then
 	ALL_PLUGINS="$ALL_PLUGINS $LIBNOTIFY_PLUGINS"
 else
 	AC_MSG_WARN([xchat-gnome compiled without libnotify support, plugins $LIBNOTIFY_PLUGINS will not be available])


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	9 Jul 2007 20:25:20 -0000	1.16
+++ .cvsignore	10 Sep 2008 01:06:55 -0000	1.17
@@ -1 +1 @@
-xchat-gnome-0.18.tar.bz2
+xchat-gnome-0.23.92.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	9 Jul 2007 20:25:20 -0000	1.16
+++ sources	10 Sep 2008 01:06:55 -0000	1.17
@@ -1 +1 @@
-4976cd34a0e9115c800b5d317e121182  xchat-gnome-0.18.tar.bz2
+780963419d487cefa7c1dac14696140c  xchat-gnome-0.23.92.tar.bz2


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- xchat-gnome.spec	27 Mar 2008 04:38:15 -0000	1.52
+++ xchat-gnome.spec	10 Sep 2008 01:06:55 -0000	1.53
@@ -1,31 +1,42 @@
 Name:           xchat-gnome
-Version:        0.18
-Release:        12%{?dist}
+Version:        0.23.92
+Release:        1%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://%{name}.navi.cx/
 Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
+# Patch specific to Fedora to use .xchat-gnome, instead of .xchat2
 Patch0:		%{name}-%{version}-config.patch
-Patch1:		%{name}-%{version}-reconnect.patch
-Patch2:		%{name}-fix_away_command.patch
-Patch3:		%{name}-spellchecking.patch
-Patch4:		%{name}-%{version}-it-translation.patch
+# Backported patch to correctly set the libnotify and libcanberra options 
+# http://bugzilla.gnome.org/show_bug.cgi?id=551515
+Patch1:		%{name}-%{version}-deps.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
 Buildrequires:	libsexy-devel >= 0.1.11
 BuildRequires:	libgnomeui-devel
+BuildRequires:	libnotify-devel
+BuildRequires:	glib2-devel >= 2.18.0
+BuildRequires:	gtk2-devel >= 2.14.0
+BuildRequires:	libcanberra-devel
 BuildRequires:	python-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:  scrollkeeper
+BuildRequires:	intltool
 BuildRequires:  gettext
 BuildRequires:	perl-devel
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	perl(ExtUtils::Embed)
 BuildRequires:	gnome-doc-utils
-BuildRequires:	libnotify-devel
+# The following BR can be dropped when deps patch is removed.
+BuildRequires: 	autoconf
+BuildRequires:	automake
+BuildRequires:	libtool
+BuildRequires:	gettext-devel
+BuildRequires:	gnome-common
+BuildRequires:	gtk-doc
 
 Requires: 	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -47,11 +58,8 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .config
-%patch1 -p1 -b .reconnect
-%patch2 -p1 -b .away
-%patch3 -p0 -b .spellchecking
-%patch4 -p1 -b .translation
-
+%patch1 -p1 -b .deps
+autoreconf
 
 %build
 %configure --disable-tcl		\
@@ -139,6 +147,15 @@
 
 
 %changelog
+* Tue Sep  9 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.23.92-1
+- Update to 0.23.92.
+- Add deps patch to correctly set libnotify & libcanberra options.
+- Update BR.
+- Drop reconnect patch.  Fixed upstream.
+- Drop away-command patch.  Fixed upstream.
+- Drop spell-checking patch.  Fixed upstream.
+- Drop it-translation patch.  Fixed upstream.
+
 * Thu Mar 27 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.18-12
 - Add patch to fix italian translation bug. (#431133)
 


--- xchat-gnome-0.18-config.patch DELETED ---


--- xchat-gnome-0.18-it-translation.patch DELETED ---


--- xchat-gnome-0.18-reconnect.patch DELETED ---


--- xchat-gnome-fix_away_command.patch DELETED ---


--- xchat-gnome-spellchecking.patch DELETED ---



From mclasen at fedoraproject.org  Wed Sep 10 01:08:55 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 10 Sep 2008 01:08:55 +0000 (UTC)
Subject: rpms/metacity/devel .cvsignore, 1.76, 1.77 metacity.spec, 1.160,
	1.161 sources, 1.76, 1.77
Message-ID: <20080910010855.B48DA7012C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3735

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
2.23.610



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- .cvsignore	3 Sep 2008 02:38:04 -0000	1.76
+++ .cvsignore	10 Sep 2008 01:08:25 -0000	1.77
@@ -1 +1 @@
-metacity-2.23.233.tar.bz2
+metacity-2.23.610.tar.bz2


Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- metacity.spec	3 Sep 2008 03:44:12 -0000	1.160
+++ metacity.spec	10 Sep 2008 01:08:25 -0000	1.161
@@ -1,6 +1,6 @@
 Summary: Metacity window manager
 Name: metacity
-Version: 2.23.233
+Version: 2.23.610
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.23/metacity-%{version}.tar.bz2
@@ -154,6 +154,9 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Tue Sep  9 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.610-1
+- Update to 2.23.610
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.233-1
 - Update to 2.23.233
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- sources	3 Sep 2008 02:38:04 -0000	1.76
+++ sources	10 Sep 2008 01:08:25 -0000	1.77
@@ -1 +1 @@
-eb54496ce52ac42de154472faf90b9b4  metacity-2.23.233.tar.bz2
+59bf58fc5c8f4b11014caf66483d6605  metacity-2.23.610.tar.bz2



From davej at fedoraproject.org  Wed Sep 10 01:09:20 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Wed, 10 Sep 2008 01:09:20 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc5-git11.bz2.sign, NONE,
	1.1 .cvsignore, 1.920, 1.921 kernel.spec, 1.941, 1.942 sources,
	1.882, 1.883 upstream, 1.794,
	1.795 patch-2.6.27-rc5-git10.bz2.sign, 1.1, NONE
Message-ID: <20080910010920.9C8327012C@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3919

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.27-rc5-git11.bz2.sign 
Removed Files:
	patch-2.6.27-rc5-git10.bz2.sign 
Log Message:
2.6.27-rc5-git11


--- NEW FILE patch-2.6.27-rc5-git11.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIxw58yGugalF9Dw4RAnjPAKCGJu00caOgxUIERjJsFyEfLkYG8ACfRXJ4
SJZadJeH3T5NmUIU8gatUwo=
=OL/0
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.920
retrieving revision 1.921
diff -u -r1.920 -r1.921
--- .cvsignore	9 Sep 2008 16:16:05 -0000	1.920
+++ .cvsignore	10 Sep 2008 01:08:49 -0000	1.921
@@ -5,4 +5,4 @@
 kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc5.bz2
-patch-2.6.27-rc5-git10.bz2
+patch-2.6.27-rc5-git11.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.941
retrieving revision 1.942
diff -u -r1.941 -r1.942
--- kernel.spec	9 Sep 2008 20:29:59 -0000	1.941
+++ kernel.spec	10 Sep 2008 01:08:49 -0000	1.942
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 5
 # The git snapshot level
-%define gitrev 10
+%define gitrev 11
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1746,6 +1746,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Sep 09 2008 Dave Jones <davej at redhat.com>
+- 2.6.27-rc5-git11
+
 * Tue Sep 09 2008 Jarod Wilson <jarod at redhat.com>
 - turn ibmveth back on for ppc64, it builds now (#461637)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.882
retrieving revision 1.883
diff -u -r1.882 -r1.883
--- sources	9 Sep 2008 06:24:37 -0000	1.882
+++ sources	10 Sep 2008 01:08:50 -0000	1.883
@@ -1,3 +1,3 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 d91adda8bcf04852048b8eab06eeae3d  patch-2.6.27-rc5.bz2
-a0ca52aef12c4c9f179017e39b8e918d  patch-2.6.27-rc5-git10.bz2
+78541c047e91d781107f3fe8e1a463e4  patch-2.6.27-rc5-git11.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.794
retrieving revision 1.795
diff -u -r1.794 -r1.795
--- upstream	9 Sep 2008 01:47:36 -0000	1.794
+++ upstream	10 Sep 2008 01:08:50 -0000	1.795
@@ -1,3 +1,3 @@
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc5.bz2
-patch-2.6.27-rc5-git10.bz2
+patch-2.6.27-rc5-git11.bz2


--- patch-2.6.27-rc5-git10.bz2.sign DELETED ---



From mclasen at fedoraproject.org  Wed Sep 10 01:16:51 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 10 Sep 2008 01:16:51 +0000 (UTC)
Subject: rpms/gnome-applets/devel .cvsignore, 1.67, 1.68 gnome-applets.spec, 
	1.294, 1.295 sources, 1.72, 1.73
Message-ID: <20080910011651.C03837012C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5191

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	5 Sep 2008 03:07:07 -0000	1.67
+++ .cvsignore	10 Sep 2008 01:16:21 -0000	1.68
@@ -1 +1 @@
-gnome-applets-2.23.91.tar.bz2
+gnome-applets-2.23.92.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- gnome-applets.spec	5 Sep 2008 03:07:07 -0000	1.294
+++ gnome-applets.spec	10 Sep 2008 01:16:21 -0000	1.295
@@ -34,7 +34,7 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.23.91
+Version:	2.23.92
 Release: 	1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
@@ -308,6 +308,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Tue Sep  9 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.92-1
+- Update to 2.23.92
+
 * Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	5 Sep 2008 03:07:07 -0000	1.72
+++ sources	10 Sep 2008 01:16:21 -0000	1.73
@@ -1,2 +1 @@
-5979757b1e790199f6191c390159b597  gnome-applets-2.23.91.tar.bz2
-ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2
+b415bc9c44070dfe09ed1d341736d64e  gnome-applets-2.23.92.tar.bz2



From mclasen at fedoraproject.org  Wed Sep 10 01:19:34 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 10 Sep 2008 01:19:34 +0000 (UTC)
Subject: rpms/evince/devel .cvsignore, 1.50, 1.51 evince.spec, 1.129,
	1.130 sources, 1.49, 1.50
Message-ID: <20080910011934.E97347012C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/evince/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5937

Modified Files:
	.cvsignore evince.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	2 Sep 2008 23:40:34 -0000	1.50
+++ .cvsignore	10 Sep 2008 01:19:04 -0000	1.51
@@ -1 +1 @@
-evince-2.23.91.tar.bz2
+evince-2.23.92.tar.bz2


Index: evince.spec
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/evince.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- evince.spec	3 Sep 2008 01:04:34 -0000	1.129
+++ evince.spec	10 Sep 2008 01:19:04 -0000	1.130
@@ -5,7 +5,7 @@
 %define theme_version 2.17.1
 
 Name:		evince
-Version:	2.23.91
+Version:	2.23.92
 Release:	1%{?dist}
 Summary:	Document viewer
 
@@ -230,6 +230,9 @@
 %{_libdir}/evince/backends/djvudocument.evince-backend
 
 %changelog
+* Tue Sep  9 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	2 Sep 2008 23:40:34 -0000	1.49
+++ sources	10 Sep 2008 01:19:04 -0000	1.50
@@ -1 +1 @@
-cd8f03186172147d74c3c0a488389e89  evince-2.23.91.tar.bz2
+2615136c97934b490aa0d61037a73775  evince-2.23.92.tar.bz2



From mclasen at fedoraproject.org  Wed Sep 10 01:21:25 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 10 Sep 2008 01:21:25 +0000 (UTC)
Subject: rpms/metacity/devel metacity.spec,1.161,1.162
Message-ID: <20080910012125.DC7D57012C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6475

Modified Files:
	metacity.spec 
Log Message:
fix file list



Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- metacity.spec	10 Sep 2008 01:08:25 -0000	1.161
+++ metacity.spec	10 Sep 2008 01:20:55 -0000	1.162
@@ -142,6 +142,7 @@
 %{_libdir}/lib*.so.*
 %{_mandir}/man1/metacity.1.gz
 %{_datadir}/applications/metacity.desktop
+%{_datadir}/gnome/wm-properties/metacity-wm.desktop
 
 %files devel
 %defattr(-,root,root)



From jfearn at fedoraproject.org  Wed Sep 10 01:23:22 2008
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Wed, 10 Sep 2008 01:23:22 +0000 (UTC)
Subject: rpms/publican/devel .cvsignore, 1.6, 1.7 publican.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <20080910012322.22DEC7012C@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/publican/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7091

Modified Files:
	.cvsignore publican.spec sources 
Log Message:
new version 0.37


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Jul 2008 05:56:37 -0000	1.6
+++ .cvsignore	10 Sep 2008 01:22:51 -0000	1.7
@@ -2,3 +2,4 @@
 publican-0.32.tgz
 publican-0.33.tgz
 publican-0.34.tgz
+publican-0.37.tgz


Index: publican.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/publican.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- publican.spec	25 Jul 2008 06:18:31 -0000	1.14
+++ publican.spec	10 Sep 2008 01:22:51 -0000	1.15
@@ -4,8 +4,8 @@
 %define PREMOLESTATION 0
 
 Name:		publican	
-Summary:	Common files and scripts for publishing Documentation
-Version:	0.34
+Summary:	Common files and scripts for publishing with DocBook XML
+Version:	0.37
 Release:	0%{?dist}
 License:	GPLv2+ and GFDL
 # The following directories are licensed under the GFDL:
@@ -16,26 +16,27 @@
 Buildarch:	noarch
 Source:		https://fedorahosted.org/releases/p/u/publican/%{name}-%{version}.tgz
 # need kdesdk for po2xml & xml2pot
-Requires:	gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl elinks aspell
+Requires:	gettext libxslt perl(XML::TreeBuilder) docbook-dtds docbook-style-xsl elinks aspell
 Requires:	%{_bindir}/xml2pot %{_bindir}/po2xml
 Requires:	perl-ParseLex perl-HTML-Template make
 Requires:	fop batik saxon ImageMagick
-#Requires:	xslthl
+Requires:	xerces-j2 rpm-build
 
-BuildRequires:	gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl aspell
+BuildRequires:	gettext libxslt perl(XML::TreeBuilder) docbook-dtds docbook-style-xsl aspell
 BuildRequires:	%{_bindir}/xml2pot %{_bindir}/po2xml
 BuildRequires:	desktop-file-utils
-# FOP is required to build the mont metrics.
-BuildRequires:	fop saxon
+# FOP is required to build the font metrics.
+BuildRequires:	fop saxon ImageMagick
 #BuildRequires:	xslthl
 # *&%^*&^ decided to rename font packages and change font paths.
 # No actual real changes.
 %if %{PREMOLESTATION}
+Requires:	xslthl
 Requires:	fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati
 Requires:	fonts-hindi fonts-japanese fonts-kannada fonts-korean
 Requires:	fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala
 Requires:	fonts-tamil fonts-telugu liberation-fonts
-
+BuildRequires:	xslthl
 BuildRequires:	fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati
 BuildRequires:	fonts-hindi fonts-japanese fonts-kannada fonts-korean
 BuildRequires:	fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala
@@ -44,14 +45,12 @@
 Requires:	lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati
 Requires:	lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada
 Requires:	lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
-Requires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts
-# fonts-korean
+Requires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang
 
 BuildRequires:	lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati
 BuildRequires:	lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada
 BuildRequires:	lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
-BuildRequires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts
-#  fonts-korean
+BuildRequires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang
 %endif
 
 URL:		https://fedorahosted.org/publican
@@ -59,7 +58,9 @@
 Obsoletes:	perl-SGML-Translate <= 0.37-3
 
 %description
-Common files and scripts for publishing documentation.
+Publican is a DocBook publication system, not just a DocBook processing tool.
+As well as ensuring your DocBook XML is valid, publican works to ensure
+your XML is up to publishable standard.
 
 %package doc
 Group:		Documentation
@@ -71,7 +72,10 @@
 %endif
 
 %description doc
-Documentation for the Publican publishing tool chain.
+Publican is a tool for publishing material authored in DocBook XML.
+This guide explains how to  to create and build books and articles
+using publican. It is not a DocBook XML tutorial and concentrates
+solely on using the publican tools.
 
 %prep
 %setup -q
@@ -91,7 +95,7 @@
 %{__perl} -p -i -e 's|^#CATALOGS_OVERRIDE$|CATALOGS\t= XML_CATALOG_FILES="%{_datadir}/%{name}/xsl/docbook/dtd-4.5/catalog.xml %{_datadir}/%{name}/xsl/docbook/1.72.0/catalog.xml"|g' make/Makefile.templates
 %endif
 
-for i in fop make xsl Common_Content templates; do
+for i in fop make xsl Common_Content templates maven; do
 	cp -rf $i $RPM_BUILD_ROOT%{_datadir}/%{name}/$i
 done
 cp -rf Book_Template $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates/common-Book_Template
@@ -143,6 +147,44 @@
 %doc fdl.txt
 
 %changelog
+* Wed Sep 3 2008 Jeff Fearn <jfearn at redhat.com> 0.37
+- Fix Bug in web rpm upgrade script.
+- Fix Article not building rpms.
+- Switch ja-JP  font name in pdf from SazanamiMincho to SazanamiGothic
+- Remove empty para tags to break en-US HTML build so writers stop breaking translations.
+- Changed docs reference from --revision to --edition for create_book option
+- Fixed Article layout not matching Book Layout. BZ #460969
+- Fixed Part not ledded properly in TOC BZ #460976
+- Fix duplicate IDs in XHTML output.
+- Made background of remark a pretty yellow. BZ #459213
+- Fix Accessibility typo. BZ #460856
+- Fix spurious hyphenation in verbatim.
+- Fix broken RPM packages when titles have been translated.
+- Fix display bug in html-single. BZ #461375
+- Added FAQ entry for Java weirdness. BZ #460738
+- Add default encoding to XML files. BZ #461379
+- Removed corpauthor from template. BZ #461222
+- Fixed create_book help text. BZ #460736
+- Added menuchoice tag. BZ #459671
+
+* Mon Sep 1 2008 Jeff Fearn <jfearn at redhat.com> 0.35-0
+- Add missing xerces-j2 Requires. BZ #457497
+- Fixed css path for tranlation reports.
+- Fixed font path for Fedora, ensured build fails if font metric creation fails. BZ #458003
+- Set vertical-align:top for TD - BZ #457851
+- Added WARNING for ENTITIES declared in XML files. BZ #456170
+- Added check to ensure PRODUCT has a valid format.
+- Only check xml files for revision history. BZ #458740
+- Made VERSION and RELEASE over-rideable. BZ #458421
+- Fixed display of OL nested in UL. BZ #457915
+- Added "make pom" to output a basic maven pom file.
+- Updated doco. BZ #458764
+- Updated Conventions.xml. BZ #456026 #459216
+- Made PDF and HTML display product version in similar style. BZ #456486
+- Remove ID's from common files. BZ #460770
+- Allowed footnote to keep ID. BZ #460790
+- Fixed bogus verbatim layout. BZ #460771
+
 * Fri Apr 11 2008 Jeff Fearn <jfearn at redhat.com> 0.34-0
 - Fix PO file name missing from translation status report
 - Modify xmlClean to output dummy content for empty files (beta)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	25 Jul 2008 05:56:37 -0000	1.7
+++ sources	10 Sep 2008 01:22:51 -0000	1.8
@@ -1 +1 @@
-6a2f366acfaa8af0119f8c5fde2d9f05  publican-0.34.tgz
+b49ac8772041f3679f151eb1a724caa5  publican-0.37.tgz



From jfearn at fedoraproject.org  Wed Sep 10 01:28:13 2008
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Wed, 10 Sep 2008 01:28:13 +0000 (UTC)
Subject: rpms/publican-fedora/devel .cvsignore, 1.6, 1.7 publican-fedora.spec,
	1.5, 1.6 sources, 1.6, 1.7
Message-ID: <20080910012813.901727012C@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/publican-fedora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8399

Modified Files:
	.cvsignore publican-fedora.spec sources 
Log Message:
new version 0.15


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Jul 2008 05:17:24 -0000	1.6
+++ .cvsignore	10 Sep 2008 01:27:42 -0000	1.7
@@ -2,3 +2,4 @@
 publican-fedora-0.11.tgz
 publican-fedora-0.12.tgz
 publican-fedora-0.13.tgz
+publican-fedora-0.15.tgz


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/devel/publican-fedora.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- publican-fedora.spec	25 Jul 2008 05:17:24 -0000	1.5
+++ publican-fedora.spec	10 Sep 2008 01:27:43 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
-Version:	0.13
+Version:	0.15
 Release:	0%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
@@ -49,6 +49,15 @@
 %{_datadir}/publican/xsl/%{brand}
 
 %changelog
+* Tue Sep 9 2008 Jeff Fearn <jfearn at redhat.com> 0.15
+- Removed corpauthor from template. BZ #461222
+- Updated Fedora legal notice. BZ #448022
+
+* Mon Sep 1 2008 Jeff Fearn <jfearn at redhat.com> 0.14-0
+- Fix styles for publican 0.35 mods
+- Removed common entity files as they break translation
+- Remove ID's from common files. BZ #460770
+
 * Mon Apr 14 2008 Jeff Fearn <jfearn at redhat.com> 0.13-0
 - Fix missing list image in html-single articles
 - QANDA set css fix BZ #442674


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Jul 2008 05:17:24 -0000	1.6
+++ sources	10 Sep 2008 01:27:43 -0000	1.7
@@ -1 +1 @@
-61914fa32218fdbb8a2110e1e8b9bbc8  publican-fedora-0.13.tgz
+b17d2cc7c95f2fd739cd26511cac3db8  publican-fedora-0.15.tgz



From mclasen at fedoraproject.org  Wed Sep 10 01:42:19 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 10 Sep 2008 01:42:19 +0000 (UTC)
Subject: rpms/empathy/devel .cvsignore, 1.20, 1.21 empathy.spec, 1.34,
	1.35 sources, 1.20, 1.21
Message-ID: <20080910014219.2B2F07012C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11169

Modified Files:
	.cvsignore empathy.spec sources 
Log Message:
2.23.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	4 Sep 2008 20:13:38 -0000	1.20
+++ .cvsignore	10 Sep 2008 01:41:48 -0000	1.21
@@ -1 +1 @@
-empathy-2.23.91.tar.bz2
+empathy-2.23.92.tar.bz2


Index: empathy.spec
===================================================================
RCS file: /cvs/extras/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- empathy.spec	4 Sep 2008 20:13:38 -0000	1.34
+++ empathy.spec	10 Sep 2008 01:41:48 -0000	1.35
@@ -9,7 +9,7 @@
 %global	enchant_version		1.2.0		
 
 Name:		empathy
-Version:	2.23.91
+Version:	2.23.92
 Release:	1%{?dist}
 Summary:	GNOME Instant Messaging Client
 
@@ -224,6 +224,9 @@
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Tue Sep  9 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
 * Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/empathy/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	4 Sep 2008 20:13:38 -0000	1.20
+++ sources	10 Sep 2008 01:41:48 -0000	1.21
@@ -1 +1 @@
-c10aef3ab410c3c407c1505efd3df0c2  empathy-2.23.91.tar.bz2
+6bc1f3b9562e7645391a0950d1c2462a  empathy-2.23.92.tar.bz2



From davej at fedoraproject.org  Wed Sep 10 01:45:57 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Wed, 10 Sep 2008 01:45:57 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc6.bz2.sign, NONE, 1.1 .cvsignore, 
	1.921, 1.922 kernel.spec, 1.942, 1.943 sources, 1.883,
	1.884 upstream, 1.795, 1.796 patch-2.6.27-rc5-git11.bz2.sign,
	1.1, NONE patch-2.6.27-rc5.bz2.sign, 1.1, NONE
Message-ID: <20080910014557.A812F7012E@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11931

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.27-rc6.bz2.sign 
Removed Files:
	patch-2.6.27-rc5-git11.bz2.sign patch-2.6.27-rc5.bz2.sign 
Log Message:
2.6.27-rc6


--- NEW FILE patch-2.6.27-rc6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIxx7pyGugalF9Dw4RAhKpAJ9bIKTzRZ/VxXIY2TkJuZBKK7IklwCfZdKN
MvTP71brUiDG7Bay5nbmZU0=
=u+6+
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.921
retrieving revision 1.922
diff -u -r1.921 -r1.922
--- .cvsignore	10 Sep 2008 01:08:49 -0000	1.921
+++ .cvsignore	10 Sep 2008 01:45:26 -0000	1.922
@@ -4,5 +4,4 @@
 temp-*
 kernel-2.6.26
 linux-2.6.26.tar.bz2
-patch-2.6.27-rc5.bz2
-patch-2.6.27-rc5-git11.bz2
+patch-2.6.27-rc6.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.942
retrieving revision 1.943
diff -u -r1.942 -r1.943
--- kernel.spec	10 Sep 2008 01:08:49 -0000	1.942
+++ kernel.spec	10 Sep 2008 01:45:27 -0000	1.943
@@ -43,9 +43,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 5
+%define rcrev 6
 # The git snapshot level
-%define gitrev 11
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1747,6 +1747,9 @@
 
 %changelog
 * Tue Sep 09 2008 Dave Jones <davej at redhat.com>
+- 2.6.27-rc6
+
+* Tue Sep 09 2008 Dave Jones <davej at redhat.com>
 - 2.6.27-rc5-git11
 
 * Tue Sep 09 2008 Jarod Wilson <jarod at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.883
retrieving revision 1.884
diff -u -r1.883 -r1.884
--- sources	10 Sep 2008 01:08:50 -0000	1.883
+++ sources	10 Sep 2008 01:45:27 -0000	1.884
@@ -1,3 +1,2 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
-d91adda8bcf04852048b8eab06eeae3d  patch-2.6.27-rc5.bz2
-78541c047e91d781107f3fe8e1a463e4  patch-2.6.27-rc5-git11.bz2
+d3a173a00e15a6bf3c76068537a5c069  patch-2.6.27-rc6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.795
retrieving revision 1.796
diff -u -r1.795 -r1.796
--- upstream	10 Sep 2008 01:08:50 -0000	1.795
+++ upstream	10 Sep 2008 01:45:27 -0000	1.796
@@ -1,3 +1,2 @@
 linux-2.6.26.tar.bz2
-patch-2.6.27-rc5.bz2
-patch-2.6.27-rc5-git11.bz2
+patch-2.6.27-rc6.bz2


--- patch-2.6.27-rc5-git11.bz2.sign DELETED ---


--- patch-2.6.27-rc5.bz2.sign DELETED ---



From pgordon at fedoraproject.org  Wed Sep 10 01:52:07 2008
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Wed, 10 Sep 2008 01:52:07 +0000 (UTC)
Subject: rpms/midori/devel .cvsignore, 1.4, 1.5 midori.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <20080910015207.E47437012C@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13237

Modified Files:
	.cvsignore midori.spec sources 
Log Message:
Update to 0.0.21


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Aug 2008 23:35:07 -0000	1.4
+++ .cvsignore	10 Sep 2008 01:51:37 -0000	1.5
@@ -1 +1 @@
-midori-0.0.20.tar.bz2
+midori-0.0.21.tar.bz2


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/midori.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- midori.spec	8 Sep 2008 05:28:40 -0000	1.10
+++ midori.spec	10 Sep 2008 01:51:37 -0000	1.11
@@ -1,13 +1,13 @@
 Name:		midori
-Version:	0.0.20
-Release:	2%{?dist}
+Version:	0.0.21
+Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
 Group:		Applications/Internet
 License:	LGPLv2+
 URL:		http://software.twotoasts.de/?page=midori
 
-Source0:	http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.bz2
+Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -91,6 +91,12 @@
 
 
 %changelog
+* Tue Sep 09 2008 Peter Gordon <peter at thecodergeek.com> - 0.0.21-1
+- Update to new upstream release (0.0.21): contains updated translations,
+  fixes for GVFS-->GIO regressions, and various aesthetic enhancements.
+  (See the included ChangeLog for full details.)
+- Update Source0 URL.
+
 * Sun Sep 07 2008 Peter Gordon <peter at thecodergeek.com> - 0.0.20-2
 - Add scriplets for GTK+ icon cache.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Aug 2008 23:35:07 -0000	1.4
+++ sources	10 Sep 2008 01:51:37 -0000	1.5
@@ -1 +1 @@
-d27799c093b13e124eb7c0f479ea26c0  midori-0.0.20.tar.bz2
+0b9298d00c598137431beb51dbe1f302  midori-0.0.21.tar.bz2



From mclasen at fedoraproject.org  Wed Sep 10 01:53:02 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 10 Sep 2008 01:53:02 +0000 (UTC)
Subject: rpms/gnome-applets/devel sources,1.73,1.74
Message-ID: <20080910015302.21CEC7012C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12971

Modified Files:
	sources 
Log Message:
fix sources



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	10 Sep 2008 01:16:21 -0000	1.73
+++ sources	10 Sep 2008 01:52:31 -0000	1.74
@@ -1 +1,2 @@
 b415bc9c44070dfe09ed1d341736d64e  gnome-applets-2.23.92.tar.bz2
+ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2



From kevin at fedoraproject.org  Wed Sep 10 02:05:14 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:05:14 +0000 (UTC)
Subject: rpms/python-schedutils/devel - New directory
Message-ID: <20080910020514.696EE7012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-schedutils/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15629/rpms/python-schedutils/devel

Log Message:
Directory /cvs/extras/rpms/python-schedutils/devel added to the repository




From kevin at fedoraproject.org  Wed Sep 10 02:05:14 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:05:14 +0000 (UTC)
Subject: rpms/python-schedutils - New directory
Message-ID: <20080910020514.285917012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-schedutils
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15629/rpms/python-schedutils

Log Message:
Directory /cvs/extras/rpms/python-schedutils added to the repository




From kevin at fedoraproject.org  Wed Sep 10 02:05:15 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:05:15 +0000 (UTC)
Subject: rpms/python-schedutils Makefile,NONE,1.1
Message-ID: <20080910020515.69CB27012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-schedutils
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15629/rpms/python-schedutils

Added Files:
	Makefile 
Log Message:
Setup of module python-schedutils


--- NEW FILE Makefile ---
# Top level Makefile for module python-schedutils
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep 10 02:05:15 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:05:15 +0000 (UTC)
Subject: rpms/python-schedutils/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20080910020515.AA7FB7012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-schedutils/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15629/rpms/python-schedutils/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-schedutils


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-schedutils
# $Id: Makefile,v 1.1 2008/09/10 02:05:15 kevin Exp $
NAME := python-schedutils
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 10 02:05:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:05:03 +0000
Subject: [pkgdb] python-schedutils was added for acme
Message-ID: <20080910020503.62B0C208D1E@bastion.fedora.phx.redhat.com>

kevin has added Package python-schedutils with summary Linux scheduler python bindings
kevin has approved Package python-schedutils
kevin has added a Fedora devel branch for python-schedutils with an owner of acme
kevin has approved python-schedutils in Fedora devel
kevin has approved Package python-schedutils
kevin has set commit to Approved for packager on python-schedutils (Fedora devel)
kevin has set build to Approved for packager on python-schedutils (Fedora devel)
kevin has set checkout to Approved for packager on python-schedutils (Fedora devel)
kevin has set commit to Approved for uberpackager on python-schedutils (Fedora devel)
kevin has set build to Approved for uberpackager on python-schedutils (Fedora devel)
kevin has set checkout to Approved for uberpackager on python-schedutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-schedutils



From pgordon at fedoraproject.org  Wed Sep 10 02:06:26 2008
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Wed, 10 Sep 2008 02:06:26 +0000 (UTC)
Subject: rpms/midori/F-9 .cvsignore, 1.4, 1.5 midori.spec, 1.5, 1.6 sources, 
	1.4, 1.5
Message-ID: <20080910020626.3E1A57012C@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15803

Modified Files:
	.cvsignore midori.spec sources 
Log Message:
Update to 0.0.21


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Sep 2008 18:32:40 -0000	1.4
+++ .cvsignore	10 Sep 2008 02:05:55 -0000	1.5
@@ -1 +1 @@
-midori-0.0.20.tar.bz2
+midori-0.0.21.tar.bz2


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-9/midori.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- midori.spec	8 Sep 2008 18:32:40 -0000	1.5
+++ midori.spec	10 Sep 2008 02:05:55 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		midori
-Version:	0.0.20
+Version:	0.0.21
 Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
@@ -7,7 +7,7 @@
 License:	LGPLv2+
 URL:		http://software.twotoasts.de/?page=midori
 
-Source0:	http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.bz2
+Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -91,6 +91,12 @@
 
 
 %changelog
+* Tue Sep 09 2008 Peter Gordon <peter at thecodergeek.com> - 0.0.21-1
+- Update to new upstream release (0.0.21): contains updated translations,
+  fixes for GVFS-->GIO regressions, and various aesthetic enhancements.
+  (See the included ChangeLog for full details.)
+- Update Source0 URL.
+
 * Mon Sep 08 2008 Peter Gordon <peter at thecodergeek.com> - 0.0.20-1
 - Update to new upstream release (0.0.20): adds support for single instances,
   some userscripts and Greasemonkey scripting, zooming and printing, as well as


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Sep 2008 18:32:40 -0000	1.4
+++ sources	10 Sep 2008 02:05:55 -0000	1.5
@@ -1 +1 @@
-d27799c093b13e124eb7c0f479ea26c0  midori-0.0.20.tar.bz2
+0b9298d00c598137431beb51dbe1f302  midori-0.0.21.tar.bz2



From pkgdb at fedoraproject.org  Wed Sep 10 02:07:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:07:06 +0000
Subject: [pkgdb] hunspell-eu was added for caolanm
Message-ID: <20080910020706.A1BC1208D7C@bastion.fedora.phx.redhat.com>

kevin has added Package hunspell-eu with summary Basque hunspell dictionary
kevin has approved Package hunspell-eu
kevin has added a Fedora devel branch for hunspell-eu with an owner of caolanm
kevin has approved hunspell-eu in Fedora devel
kevin has approved Package hunspell-eu
kevin has set commit to Approved for packager on hunspell-eu (Fedora devel)
kevin has set build to Approved for packager on hunspell-eu (Fedora devel)
kevin has set checkout to Approved for packager on hunspell-eu (Fedora devel)
kevin has set commit to Approved for uberpackager on hunspell-eu (Fedora devel)
kevin has set build to Approved for uberpackager on hunspell-eu (Fedora devel)
kevin has set checkout to Approved for uberpackager on hunspell-eu (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-eu



From kevin at fedoraproject.org  Wed Sep 10 02:07:17 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:07:17 +0000 (UTC)
Subject: rpms/hunspell-eu - New directory
Message-ID: <20080910020717.2E4FE7012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-eu
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk16073/rpms/hunspell-eu

Log Message:
Directory /cvs/extras/rpms/hunspell-eu added to the repository




From kevin at fedoraproject.org  Wed Sep 10 02:07:17 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:07:17 +0000 (UTC)
Subject: rpms/hunspell-eu/devel - New directory
Message-ID: <20080910020717.7AD297012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-eu/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk16073/rpms/hunspell-eu/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-eu/devel added to the repository




From kevin at fedoraproject.org  Wed Sep 10 02:07:18 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:07:18 +0000 (UTC)
Subject: rpms/hunspell-eu Makefile,NONE,1.1
Message-ID: <20080910020718.A1B897012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-eu
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk16073/rpms/hunspell-eu

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-eu


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-eu
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep 10 02:07:18 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:07:18 +0000 (UTC)
Subject: rpms/hunspell-eu/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080910020718.E3E5A7012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-eu/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk16073/rpms/hunspell-eu/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-eu


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-eu
# $Id: Makefile,v 1.1 2008/09/10 02:07:18 kevin Exp $
NAME := hunspell-eu
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Wed Sep 10 02:08:00 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 10 Sep 2008 02:08:00 +0000 (UTC)
Subject: rpms/cheese/devel cheese.spec,1.31,1.32
Message-ID: <20080910020800.F1D0C7012C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/cheese/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16106

Modified Files:
	cheese.spec 
Log Message:
2.23.92



Index: cheese.spec
===================================================================
RCS file: /cvs/extras/rpms/cheese/devel/cheese.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cheese.spec	3 Sep 2008 20:50:35 -0000	1.31
+++ cheese.spec	10 Sep 2008 02:07:30 -0000	1.32
@@ -1,22 +1,12 @@
 Name:           cheese
-Version:        2.23.91
-Release:        2%{?dist}
+Version:        2.23.92
+Release:        1%{?dist}
 Summary:        A webcam application for snapshots and movies
 
 Group:          Amusements/Graphics
 License:        GPLv2+
 URL:            http://live.gnome.org/Cheese
 Source0:        http://download.gnome.org/sources/cheese/2.23/%{name}-%{version}.tar.bz2
-# Following 3 patches reported upstream here:
-# http://bugzilla.gnome.org/show_bug.cgi?id=546868
-Patch0:         cheese-2.23.91-dont-use-non-capture-devices.patch
-Patch1:         cheese-2.23.91-supported-resolutions-per-device.patch
-Patch2:         cheese-2.23.91-let-gstreamer-choose-yuv-or-rgb.patch
-# Following 3 patches reported upstream here:
-# http://bugzilla.gnome.org/show_bug.cgi?id=547144
-Patch3:         cheese-2.23.91-cheese_webcam_get_supported_video_formats-shuffle.patch
-Patch4:         cheese-2.23.90-only-list-resolutions-once.patch
-Patch5:         cheese-2.23.90-sort-resolutions.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel >= 2.10.0
@@ -52,12 +42,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 
 %build
@@ -126,6 +110,10 @@
 %{_datadir}/dbus-1/services/org.gnome.Cheese.service
 
 %changelog
+* Tue Sep  9 2008 Matthias Clasen  <mclasen at redhat.com> 2.23.92-1
+- Update to 2.23.92
+- Drop upstreamed patches
+
 * Wed Sep  3 2008 Hans de Goede <hdegoede at redhat.com> 2.23.91-2
 - Fix use with multiple v4l devices (rh 460956, gnome 546868, gnome 547144)
 



From mclasen at fedoraproject.org  Wed Sep 10 02:10:00 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 10 Sep 2008 02:10:00 +0000 (UTC)
Subject: rpms/cheese/devel cheese.spec,1.32,1.33
Message-ID: <20080910021000.4E3527012C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/cheese/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16661

Modified Files:
	cheese.spec 
Log Message:
bump rev



Index: cheese.spec
===================================================================
RCS file: /cvs/extras/rpms/cheese/devel/cheese.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cheese.spec	10 Sep 2008 02:07:30 -0000	1.32
+++ cheese.spec	10 Sep 2008 02:09:29 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           cheese
 Version:        2.23.92
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A webcam application for snapshots and movies
 
 Group:          Amusements/Graphics
@@ -110,7 +110,7 @@
 %{_datadir}/dbus-1/services/org.gnome.Cheese.service
 
 %changelog
-* Tue Sep  9 2008 Matthias Clasen  <mclasen at redhat.com> 2.23.92-1
+* Tue Sep  9 2008 Matthias Clasen  <mclasen at redhat.com> 2.23.92-2
 - Update to 2.23.92
 - Drop upstreamed patches
 



From mclasen at fedoraproject.org  Wed Sep 10 02:13:25 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 10 Sep 2008 02:13:25 +0000 (UTC)
Subject: rpms/cheese/devel .cvsignore, 1.16, 1.17 cheese.spec, 1.33,
	1.34 sources, 1.16, 1.17
Message-ID: <20080910021325.5323F7012C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/cheese/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17341

Modified Files:
	.cvsignore cheese.spec sources 
Log Message:
forgotten sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cheese/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	2 Sep 2008 23:44:19 -0000	1.16
+++ .cvsignore	10 Sep 2008 02:12:54 -0000	1.17
@@ -1 +1 @@
-cheese-2.23.91.tar.bz2
+cheese-2.23.92.tar.bz2


Index: cheese.spec
===================================================================
RCS file: /cvs/extras/rpms/cheese/devel/cheese.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- cheese.spec	10 Sep 2008 02:09:29 -0000	1.33
+++ cheese.spec	10 Sep 2008 02:12:54 -0000	1.34
@@ -1,6 +1,6 @@
 Name:           cheese
 Version:        2.23.92
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A webcam application for snapshots and movies
 
 Group:          Amusements/Graphics
@@ -110,7 +110,7 @@
 %{_datadir}/dbus-1/services/org.gnome.Cheese.service
 
 %changelog
-* Tue Sep  9 2008 Matthias Clasen  <mclasen at redhat.com> 2.23.92-2
+* Tue Sep  9 2008 Matthias Clasen  <mclasen at redhat.com> 2.23.92-3
 - Update to 2.23.92
 - Drop upstreamed patches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cheese/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	2 Sep 2008 23:44:19 -0000	1.16
+++ sources	10 Sep 2008 02:12:54 -0000	1.17
@@ -1 +1 @@
-2de86694e145ce455ae1063acb45a18b  cheese-2.23.91.tar.bz2
+323e0db49d9cee1e85d3dd4b8d8c015f  cheese-2.23.92.tar.bz2



From pkgdb at fedoraproject.org  Wed Sep 10 02:14:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:14:28 +0000
Subject: [pkgdb] perl-Catalyst-Model-DBIC-Schema was added for cweyl
Message-ID: <20080910021428.E3A37208771@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Catalyst-Model-DBIC-Schema with summary perl-Catalyst-Model-DBIC-Schema - DBIx::Class::Schema Model
kevin has approved Package perl-Catalyst-Model-DBIC-Schema
kevin has added a Fedora devel branch for perl-Catalyst-Model-DBIC-Schema with an owner of cweyl
kevin has approved perl-Catalyst-Model-DBIC-Schema in Fedora devel
kevin has approved Package perl-Catalyst-Model-DBIC-Schema
kevin has set commit to Approved for packager on perl-Catalyst-Model-DBIC-Schema (Fedora devel)
kevin has set build to Approved for packager on perl-Catalyst-Model-DBIC-Schema (Fedora devel)
kevin has set checkout to Approved for packager on perl-Catalyst-Model-DBIC-Schema (Fedora devel)
kevin has set commit to Approved for uberpackager on perl-Catalyst-Model-DBIC-Schema (Fedora devel)
kevin has set build to Approved for uberpackager on perl-Catalyst-Model-DBIC-Schema (Fedora devel)
kevin has set checkout to Approved for uberpackager on perl-Catalyst-Model-DBIC-Schema (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Model-DBIC-Schema



From pkgdb at fedoraproject.org  Wed Sep 10 02:14:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:14:30 +0000
Subject: [pkgdb] perl-Catalyst-Model-DBIC-Schema (Fedora, 8) updated by kevin
Message-ID: <20080910021430.7D0AE208D97@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for perl-Catalyst-Model-DBIC-Schema
kevin has set commit to Approved for uberpackager on perl-Catalyst-Model-DBIC-Schema (Fedora 8)
kevin has set build to Approved for uberpackager on perl-Catalyst-Model-DBIC-Schema (Fedora 8)
kevin has set checkout to Approved for uberpackager on perl-Catalyst-Model-DBIC-Schema (Fedora 8)
kevin approved watchbugzilla on perl-Catalyst-Model-DBIC-Schema (Fedora 8) for perl-sig
kevin approved watchcommits on perl-Catalyst-Model-DBIC-Schema (Fedora 8) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Model-DBIC-Schema



From pkgdb at fedoraproject.org  Wed Sep 10 02:14:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:14:30 +0000
Subject: [pkgdb] perl-Catalyst-Model-DBIC-Schema (Fedora, 9) updated by kevin
Message-ID: <20080910021430.8877C208D9A@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Catalyst-Model-DBIC-Schema
kevin has set commit to Approved for uberpackager on perl-Catalyst-Model-DBIC-Schema (Fedora 9)
kevin has set build to Approved for uberpackager on perl-Catalyst-Model-DBIC-Schema (Fedora 9)
kevin has set checkout to Approved for uberpackager on perl-Catalyst-Model-DBIC-Schema (Fedora 9)
kevin approved watchbugzilla on perl-Catalyst-Model-DBIC-Schema (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Catalyst-Model-DBIC-Schema (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Model-DBIC-Schema



From pkgdb at fedoraproject.org  Wed Sep 10 02:14:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:14:30 +0000
Subject: [pkgdb] perl-Catalyst-Model-DBIC-Schema (Fedora,
	devel) updated by kevin
Message-ID: <20080910021430.97340208D9F@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Catalyst-Model-DBIC-Schema (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Catalyst-Model-DBIC-Schema (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Model-DBIC-Schema



From pkgdb at fedoraproject.org  Wed Sep 10 02:18:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:18:01 +0000
Subject: [pkgdb] snobol was added for s4504kr
Message-ID: <20080910021801.9DD05208D1E@bastion.fedora.phx.redhat.com>

kevin has added Package snobol with summary Macro Implementation of SNOBOL4 in C
kevin has approved Package snobol
kevin has added a Fedora devel branch for snobol with an owner of s4504kr
kevin has approved snobol in Fedora devel
kevin has approved Package snobol
kevin has set commit to Approved for packager on snobol (Fedora devel)
kevin has set build to Approved for packager on snobol (Fedora devel)
kevin has set checkout to Approved for packager on snobol (Fedora devel)
kevin has set commit to Approved for uberpackager on snobol (Fedora devel)
kevin has set build to Approved for uberpackager on snobol (Fedora devel)
kevin has set checkout to Approved for uberpackager on snobol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/snobol



From pkgdb at fedoraproject.org  Wed Sep 10 02:18:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:18:02 +0000
Subject: [pkgdb] snobol (Fedora, 8) updated by kevin
Message-ID: <20080910021803.02139208D9A@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for snobol
kevin has set commit to Approved for uberpackager on snobol (Fedora 8)
kevin has set build to Approved for uberpackager on snobol (Fedora 8)
kevin has set checkout to Approved for uberpackager on snobol (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/snobol



From pkgdb at fedoraproject.org  Wed Sep 10 02:18:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:18:02 +0000
Subject: [pkgdb] snobol (Fedora, 9) updated by kevin
Message-ID: <20080910021803.52C9D208D9C@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for snobol
kevin has set commit to Approved for uberpackager on snobol (Fedora 9)
kevin has set build to Approved for uberpackager on snobol (Fedora 9)
kevin has set checkout to Approved for uberpackager on snobol (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/snobol



From kevin at fedoraproject.org  Wed Sep 10 02:18:18 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:18:18 +0000 (UTC)
Subject: rpms/perl-Catalyst-Model-DBIC-Schema - New directory
Message-ID: <20080910021818.3AEBE70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Catalyst-Model-DBIC-Schema
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj18390/rpms/perl-Catalyst-Model-DBIC-Schema

Log Message:
Directory /cvs/extras/rpms/perl-Catalyst-Model-DBIC-Schema added to the repository




From kevin at fedoraproject.org  Wed Sep 10 02:18:18 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:18:18 +0000 (UTC)
Subject: rpms/perl-Catalyst-Model-DBIC-Schema/devel - New directory
Message-ID: <20080910021818.98C1570130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Catalyst-Model-DBIC-Schema/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj18390/rpms/perl-Catalyst-Model-DBIC-Schema/devel

Log Message:
Directory /cvs/extras/rpms/perl-Catalyst-Model-DBIC-Schema/devel added to the repository




From kevin at fedoraproject.org  Wed Sep 10 02:18:19 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:18:19 +0000 (UTC)
Subject: rpms/perl-Catalyst-Model-DBIC-Schema Makefile,NONE,1.1
Message-ID: <20080910021820.0027270130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Catalyst-Model-DBIC-Schema
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj18390/rpms/perl-Catalyst-Model-DBIC-Schema

Added Files:
	Makefile 
Log Message:
Setup of module perl-Catalyst-Model-DBIC-Schema


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Catalyst-Model-DBIC-Schema
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep 10 02:18:20 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:18:20 +0000 (UTC)
Subject: rpms/perl-Catalyst-Model-DBIC-Schema/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080910021820.4FA2E70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Catalyst-Model-DBIC-Schema/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj18390/rpms/perl-Catalyst-Model-DBIC-Schema/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Catalyst-Model-DBIC-Schema


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Catalyst-Model-DBIC-Schema
# $Id: Makefile,v 1.1 2008/09/10 02:18:20 kevin Exp $
NAME := perl-Catalyst-Model-DBIC-Schema
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Sep 10 02:18:59 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:18:59 +0000 (UTC)
Subject: rpms/snobol - New directory
Message-ID: <20080910021859.29B907012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/snobol
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW18652/rpms/snobol

Log Message:
Directory /cvs/extras/rpms/snobol added to the repository




From kevin at fedoraproject.org  Wed Sep 10 02:18:59 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:18:59 +0000 (UTC)
Subject: rpms/snobol/devel - New directory
Message-ID: <20080910021859.766D37012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/snobol/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW18652/rpms/snobol/devel

Log Message:
Directory /cvs/extras/rpms/snobol/devel added to the repository




From kevin at fedoraproject.org  Wed Sep 10 02:19:00 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:19:00 +0000 (UTC)
Subject: rpms/snobol Makefile,NONE,1.1
Message-ID: <20080910021900.88E7C7012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/snobol
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW18652/rpms/snobol

Added Files:
	Makefile 
Log Message:
Setup of module snobol


--- NEW FILE Makefile ---
# Top level Makefile for module snobol
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep 10 02:19:00 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:19:00 +0000 (UTC)
Subject: rpms/snobol/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080910021900.D0ECD7012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/snobol/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW18652/rpms/snobol/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module snobol


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: snobol
# $Id: Makefile,v 1.1 2008/09/10 02:19:00 kevin Exp $
NAME := snobol
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 10 02:19:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:19:33 +0000
Subject: [pkgdb] rubygem-cobbler (Fedora EPEL, 5) updated by kevin
Message-ID: <20080910021933.2D98B208D1E@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for rubygem-cobbler
kevin has set commit to Approved for uberpackager on rubygem-cobbler (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on rubygem-cobbler (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on rubygem-cobbler (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Wed Sep 10 02:19:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:19:33 +0000
Subject: [pkgdb] rubygem-cobbler (Fedora, 8) updated by kevin
Message-ID: <20080910021933.52D91208D98@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for rubygem-cobbler
kevin has set commit to Approved for uberpackager on rubygem-cobbler (Fedora 8)
kevin has set build to Approved for uberpackager on rubygem-cobbler (Fedora 8)
kevin has set checkout to Approved for uberpackager on rubygem-cobbler (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Wed Sep 10 02:20:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:20:37 +0000
Subject: [pkgdb] perl-Data-Section was added for berrange
Message-ID: <20080910022037.70A5B208D7C@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Data-Section with summary Read multiple hunks of data out of your DATA section
kevin has approved Package perl-Data-Section
kevin has added a Fedora devel branch for perl-Data-Section with an owner of berrange
kevin has approved perl-Data-Section in Fedora devel
kevin has approved Package perl-Data-Section
kevin has set commit to Approved for packager on perl-Data-Section (Fedora devel)
kevin has set build to Approved for packager on perl-Data-Section (Fedora devel)
kevin has set checkout to Approved for packager on perl-Data-Section (Fedora devel)
kevin has set commit to Approved for uberpackager on perl-Data-Section (Fedora devel)
kevin has set build to Approved for uberpackager on perl-Data-Section (Fedora devel)
kevin has set checkout to Approved for uberpackager on perl-Data-Section (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-Section



From kevin at fedoraproject.org  Wed Sep 10 02:20:48 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:20:48 +0000 (UTC)
Subject: rpms/perl-Data-Section - New directory
Message-ID: <20080910022048.3979D7012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Data-Section
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19033/rpms/perl-Data-Section

Log Message:
Directory /cvs/extras/rpms/perl-Data-Section added to the repository




From kevin at fedoraproject.org  Wed Sep 10 02:20:48 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:20:48 +0000 (UTC)
Subject: rpms/perl-Data-Section/devel - New directory
Message-ID: <20080910022048.81C4E7012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Data-Section/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19033/rpms/perl-Data-Section/devel

Log Message:
Directory /cvs/extras/rpms/perl-Data-Section/devel added to the repository




From kevin at fedoraproject.org  Wed Sep 10 02:20:49 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:20:49 +0000 (UTC)
Subject: rpms/perl-Data-Section Makefile,NONE,1.1
Message-ID: <20080910022049.AB4067012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Data-Section
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19033/rpms/perl-Data-Section

Added Files:
	Makefile 
Log Message:
Setup of module perl-Data-Section


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Data-Section
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep 10 02:20:49 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:20:49 +0000 (UTC)
Subject: rpms/perl-Data-Section/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20080910022049.F3AC77012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Data-Section/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19033/rpms/perl-Data-Section/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Data-Section


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Data-Section
# $Id: Makefile,v 1.1 2008/09/10 02:20:49 kevin Exp $
NAME := perl-Data-Section
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 10 02:20:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:20:38 +0000
Subject: [pkgdb] perl-Data-Section (Fedora, 9) updated by kevin
Message-ID: <20080910022038.93540208D99@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Data-Section
kevin has set commit to Approved for uberpackager on perl-Data-Section (Fedora 9)
kevin has set build to Approved for uberpackager on perl-Data-Section (Fedora 9)
kevin has set checkout to Approved for uberpackager on perl-Data-Section (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-Section



From pkgdb at fedoraproject.org  Wed Sep 10 02:21:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:21:27 +0000
Subject: [pkgdb] binclock was added for maxamillion
Message-ID: <20080910022127.74462208D97@bastion.fedora.phx.redhat.com>

kevin has added Package binclock with summary Fullscreen console binary clock
kevin has approved Package binclock
kevin has added a Fedora devel branch for binclock with an owner of maxamillion
kevin has approved binclock in Fedora devel
kevin has approved Package binclock
kevin has set commit to Approved for packager on binclock (Fedora devel)
kevin has set build to Approved for packager on binclock (Fedora devel)
kevin has set checkout to Approved for packager on binclock (Fedora devel)
kevin has set commit to Approved for uberpackager on binclock (Fedora devel)
kevin has set build to Approved for uberpackager on binclock (Fedora devel)
kevin has set checkout to Approved for uberpackager on binclock (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/binclock



From kevin at fedoraproject.org  Wed Sep 10 02:21:41 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:21:41 +0000 (UTC)
Subject: rpms/binclock - New directory
Message-ID: <20080910022141.2642B7012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/binclock
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi19244/rpms/binclock

Log Message:
Directory /cvs/extras/rpms/binclock added to the repository




From kevin at fedoraproject.org  Wed Sep 10 02:21:42 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:21:42 +0000 (UTC)
Subject: rpms/binclock Makefile,NONE,1.1
Message-ID: <20080910022142.7A3157012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/binclock
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi19244/rpms/binclock

Added Files:
	Makefile 
Log Message:
Setup of module binclock


--- NEW FILE Makefile ---
# Top level Makefile for module binclock
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep 10 02:21:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:21:29 +0000
Subject: [pkgdb] binclock (Fedora, 9) updated by kevin
Message-ID: <20080910022129.0F114208D9A@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for binclock
kevin has set commit to Approved for uberpackager on binclock (Fedora 9)
kevin has set build to Approved for uberpackager on binclock (Fedora 9)
kevin has set checkout to Approved for uberpackager on binclock (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/binclock



From kevin at fedoraproject.org  Wed Sep 10 02:21:41 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:21:41 +0000 (UTC)
Subject: rpms/binclock/devel - New directory
Message-ID: <20080910022141.6DE617012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/binclock/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi19244/rpms/binclock/devel

Log Message:
Directory /cvs/extras/rpms/binclock/devel added to the repository




From kevin at fedoraproject.org  Wed Sep 10 02:21:42 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:21:42 +0000 (UTC)
Subject: rpms/binclock/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080910022142.C6BE97012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/binclock/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi19244/rpms/binclock/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module binclock


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: binclock
# $Id: Makefile,v 1.1 2008/09/10 02:21:42 kevin Exp $
NAME := binclock
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 10 02:22:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:22:27 +0000
Subject: [pkgdb] perl-Config-Grammar was added for terjeros
Message-ID: <20080910022227.7AB82208D97@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Config-Grammar with summary Grammar-based, user-friendly config parser
kevin has approved Package perl-Config-Grammar
kevin has added a Fedora devel branch for perl-Config-Grammar with an owner of terjeros
kevin has approved perl-Config-Grammar in Fedora devel
kevin has approved Package perl-Config-Grammar
kevin has set commit to Approved for packager on perl-Config-Grammar (Fedora devel)
kevin has set build to Approved for packager on perl-Config-Grammar (Fedora devel)
kevin has set checkout to Approved for packager on perl-Config-Grammar (Fedora devel)
kevin has set commit to Approved for uberpackager on perl-Config-Grammar (Fedora devel)
kevin has set build to Approved for uberpackager on perl-Config-Grammar (Fedora devel)
kevin has set checkout to Approved for uberpackager on perl-Config-Grammar (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-Grammar



From pkgdb at fedoraproject.org  Wed Sep 10 02:22:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:22:28 +0000
Subject: [pkgdb] perl-Config-Grammar (Fedora, 8) updated by kevin
Message-ID: <20080910022228.9DB5D208D9E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for perl-Config-Grammar
kevin has set commit to Approved for uberpackager on perl-Config-Grammar (Fedora 8)
kevin has set build to Approved for uberpackager on perl-Config-Grammar (Fedora 8)
kevin has set checkout to Approved for uberpackager on perl-Config-Grammar (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-Grammar



From pkgdb at fedoraproject.org  Wed Sep 10 02:22:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:22:28 +0000
Subject: [pkgdb] perl-Config-Grammar (Fedora, 9) updated by kevin
Message-ID: <20080910022228.A8D7D208DA1@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Config-Grammar
kevin has set commit to Approved for uberpackager on perl-Config-Grammar (Fedora 9)
kevin has set build to Approved for uberpackager on perl-Config-Grammar (Fedora 9)
kevin has set checkout to Approved for uberpackager on perl-Config-Grammar (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-Grammar



From jcollie at fedoraproject.org  Wed Sep 10 02:34:00 2008
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed, 10 Sep 2008 02:34:00 +0000 (UTC)
Subject: rpms/zaptel/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 zaptel.spec, 1.29, 1.30
Message-ID: <20080910023400.24C5F7012C@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/zaptel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21518

Modified Files:
	.cvsignore sources zaptel.spec 
Log Message:
* Tue Sep  9 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.12.1-1
- Update to 1.4.12.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zaptel/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	4 Sep 2008 13:41:54 -0000	1.15
+++ .cvsignore	10 Sep 2008 02:33:29 -0000	1.16
@@ -1 +1 @@
-zaptel-1.4.12.tar.gz
+zaptel-1.4.12.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zaptel/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	4 Sep 2008 13:41:54 -0000	1.15
+++ sources	10 Sep 2008 02:33:29 -0000	1.16
@@ -1 +1 @@
-95789a0960c82da6aaf63cf9736af066  zaptel-1.4.12.tar.gz
+71e83a020b020fa60905edecf70e95a3  zaptel-1.4.12.1.tar.gz


Index: zaptel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zaptel/devel/zaptel.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- zaptel.spec	4 Sep 2008 13:10:42 -0000	1.29
+++ zaptel.spec	10 Sep 2008 02:33:29 -0000	1.30
@@ -1,6 +1,6 @@
 Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces
 Name: zaptel
-Version: 1.4.12
+Version: 1.4.12.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -181,6 +181,9 @@
 %{_libdir}/libtonezone.so
 
 %changelog
+* Tue Sep  9 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.12.1-1
+- Update to 1.4.12.1
+
 * Thu Sep  4 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.12-1
 - Update to 1.4.12
 



From clumens at fedoraproject.org  Wed Sep 10 02:37:43 2008
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed, 10 Sep 2008 02:37:43 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.564, 1.565 anaconda.spec, 1.706, 
	1.707 sources, 1.698, 1.699
Message-ID: <20080910023743.1DF227012C@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22405

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.564
retrieving revision 1.565
diff -u -r1.564 -r1.565
--- .cvsignore	7 Sep 2008 08:50:49 -0000	1.564
+++ .cvsignore	10 Sep 2008 02:37:12 -0000	1.565
@@ -1 +1,2 @@
 anaconda-11.4.1.32.tar.bz2
+anaconda-11.4.1.33.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.706
retrieving revision 1.707
diff -u -r1.706 -r1.707
--- anaconda.spec	7 Sep 2008 08:50:49 -0000	1.706
+++ anaconda.spec	10 Sep 2008 02:37:12 -0000	1.707
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.4.1.32
+Version: 11.4.1.33
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -218,6 +218,21 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Sep 09 2008 Chris Lumens <clumens at redhat.com> - 11.4.1.33-1
+- Include NetworkManager and dbus libraries on 64-bit arches (#461632).
+  (clumens)
+- We need libsqlite3.so in upd-instroot before it can be in the initrd.
+  (clumens)
+- Fix partitions growing (backport of rhbz #442628) (rvykydal)
+- Kickstart timezone validity check fixed (#461526) (rvykydal)
+- Add more kernel crypto modules (#443545). (clumens)
+- Make the progress bar move when downloading the install.img (#461182).
+  (clumens)
+- Add overrideDHCPhostname as an attribute. (clumens)
+- Fix saving to remote hosts (#461500). (clumens)
+- short_desc is now summary. (clumens)
+- Use print() as a function. (pjones)
+
 * Sat Sep 06 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.32-1
 - Use struct audit_reply instead of struct auditd_reply_list (dcantrell)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.698
retrieving revision 1.699
diff -u -r1.698 -r1.699
--- sources	7 Sep 2008 08:50:49 -0000	1.698
+++ sources	10 Sep 2008 02:37:12 -0000	1.699
@@ -1 +1 @@
-5645069302e98bc7e65ded673b6725ea  anaconda-11.4.1.32.tar.bz2
+574b68dee0bd0665240d06e0d4e819aa  anaconda-11.4.1.33.tar.bz2



From kevin at fedoraproject.org  Wed Sep 10 02:48:06 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:48:06 +0000 (UTC)
Subject: rpms/perl-Config-Grammar - New directory
Message-ID: <20080910024806.397FA7012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Config-Grammar
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA24371/rpms/perl-Config-Grammar

Log Message:
Directory /cvs/extras/rpms/perl-Config-Grammar added to the repository




From kevin at fedoraproject.org  Wed Sep 10 02:48:06 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:48:06 +0000 (UTC)
Subject: rpms/perl-Config-Grammar/devel - New directory
Message-ID: <20080910024806.907E97012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Config-Grammar/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA24371/rpms/perl-Config-Grammar/devel

Log Message:
Directory /cvs/extras/rpms/perl-Config-Grammar/devel added to the repository




From kevin at fedoraproject.org  Wed Sep 10 02:48:07 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:48:07 +0000 (UTC)
Subject: rpms/perl-Config-Grammar Makefile,NONE,1.1
Message-ID: <20080910024807.E2AA27012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Config-Grammar
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA24371/rpms/perl-Config-Grammar

Added Files:
	Makefile 
Log Message:
Setup of module perl-Config-Grammar


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Config-Grammar
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep 10 02:48:08 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 10 Sep 2008 02:48:08 +0000 (UTC)
Subject: rpms/perl-Config-Grammar/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080910024808.625EA7012C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Config-Grammar/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA24371/rpms/perl-Config-Grammar/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Config-Grammar


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Config-Grammar
# $Id: Makefile,v 1.1 2008/09/10 02:48:08 kevin Exp $
NAME := perl-Config-Grammar
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 10 02:49:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:49:21 +0000
Subject: [pkgdb] varnish (Fedora EPEL, 4) updated by kevin
Message-ID: <20080910024921.398CC208D0F@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for varnish
kevin has set commit to Approved for uberpackager on varnish (Fedora EPEL 4)
kevin has set build to Approved for uberpackager on varnish (Fedora EPEL 4)
kevin has set checkout to Approved for uberpackager on varnish (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/varnish



From pkgdb at fedoraproject.org  Wed Sep 10 02:49:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 02:49:21 +0000
Subject: [pkgdb] varnish (Fedora EPEL, 5) updated by kevin
Message-ID: <20080910024921.522C5208D98@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for varnish
kevin has set commit to Approved for uberpackager on varnish (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on varnish (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on varnish (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/varnish



From jcollie at fedoraproject.org  Wed Sep 10 02:52:16 2008
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed, 10 Sep 2008 02:52:16 +0000 (UTC)
Subject: rpms/zaptel/F-9 .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 zaptel.spec, 1.27, 1.28
Message-ID: <20080910025216.310137012C@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/zaptel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25160

Modified Files:
	.cvsignore sources zaptel.spec 
Log Message:
* Tue Sep  9 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.12.1-1
- Update to 1.4.12.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zaptel/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	29 May 2008 04:20:50 -0000	1.14
+++ .cvsignore	10 Sep 2008 02:51:45 -0000	1.15
@@ -1 +1 @@
-zaptel-1.4.11.tar.gz
+zaptel-1.4.12.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zaptel/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	29 May 2008 04:20:50 -0000	1.14
+++ sources	10 Sep 2008 02:51:45 -0000	1.15
@@ -1 +1 @@
-894d548d180fddf360de1c0426a68bac  zaptel-1.4.11.tar.gz
+71e83a020b020fa60905edecf70e95a3  zaptel-1.4.12.1.tar.gz


Index: zaptel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zaptel/F-9/zaptel.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- zaptel.spec	29 May 2008 04:20:50 -0000	1.27
+++ zaptel.spec	10 Sep 2008 02:51:45 -0000	1.28
@@ -1,8 +1,8 @@
 Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces
 Name: zaptel
-Version: 1.4.11
+Version: 1.4.12.1
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: Applications/System
 URL: http://www.digium.com/
 Source0: http://downloads.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}.tar.gz
@@ -181,6 +181,15 @@
 %{_libdir}/libtonezone.so
 
 %changelog
+* Tue Sep  9 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.12.1-1
+- Update to 1.4.12.1
+
+* Thu Sep  4 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.12-1
+- Update to 1.4.12
+
+* Mon Aug 11 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.4.11-2
+- Fix license tag.
+
 * Wed May 28 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.11-1
 - Update to 1.4.11
 



From jcollie at fedoraproject.org  Wed Sep 10 02:59:25 2008
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed, 10 Sep 2008 02:59:25 +0000 (UTC)
Subject: rpms/zaptel/F-8 .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 zaptel.spec, 1.19, 1.20
Message-ID: <20080910025925.D97F17012C@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/zaptel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26266

Modified Files:
	.cvsignore sources zaptel.spec 
Log Message:
* Tue Sep  9 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.12.1-1
- Update to 1.4.12.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zaptel/F-8/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	29 May 2008 04:32:11 -0000	1.13
+++ .cvsignore	10 Sep 2008 02:58:55 -0000	1.14
@@ -1 +1 @@
-zaptel-1.4.11.tar.gz
+zaptel-1.4.12.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zaptel/F-8/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	29 May 2008 04:32:12 -0000	1.13
+++ sources	10 Sep 2008 02:58:55 -0000	1.14
@@ -1 +1 @@
-894d548d180fddf360de1c0426a68bac  zaptel-1.4.11.tar.gz
+71e83a020b020fa60905edecf70e95a3  zaptel-1.4.12.1.tar.gz


Index: zaptel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zaptel/F-8/zaptel.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- zaptel.spec	29 May 2008 04:32:12 -0000	1.19
+++ zaptel.spec	10 Sep 2008 02:58:55 -0000	1.20
@@ -1,8 +1,8 @@
 Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces
 Name: zaptel
-Version: 1.4.11
+Version: 1.4.12.1
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: Applications/System
 URL: http://www.digium.com/
 Source0: http://downloads.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}.tar.gz
@@ -181,6 +181,15 @@
 %{_libdir}/libtonezone.so
 
 %changelog
+* Tue Sep  9 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.12.1-1
+- Update to 1.4.12.1
+
+* Thu Sep  4 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.12-1
+- Update to 1.4.12
+
+* Mon Aug 11 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.4.11-2
+- Fix license tag.
+
 * Wed May 28 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.11-1
 - Update to 1.4.11
 



From cweyl at fedoraproject.org  Wed Sep 10 03:11:33 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 10 Sep 2008 03:11:33 +0000 (UTC)
Subject: rpms/perl-Catalyst-Model-DBIC-Schema/devel import.log, NONE,
	1.1 perl-Catalyst-Model-DBIC-Schema.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080910031133.1FC717012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Model-DBIC-Schema/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28390/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Catalyst-Model-DBIC-Schema.spec 
Log Message:
initial commit



--- NEW FILE import.log ---
perl-Catalyst-Model-DBIC-Schema-0_21-1_fc9:HEAD:perl-Catalyst-Model-DBIC-Schema-0.21-1.fc9.src.rpm:1221016256


--- NEW FILE perl-Catalyst-Model-DBIC-Schema.spec ---
Name:           perl-Catalyst-Model-DBIC-Schema
Version:        0.21
Release:        1%{?dist}
Summary:        DBIx::Class::Schema Model Class
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Catalyst-Model-DBIC-Schema/
Source0:        http://search.cpan.org/CPAN/authors/id/B/BO/BOGDAN/Catalyst-Model-DBIC-Schema-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

BuildRequires:  perl(Catalyst::Runtime)     >= 5.70
BuildRequires:  perl(Class::Accessor::Fast) >= 0.22
BuildRequires:  perl(Class::Data::Accessor) >= 0.02
BuildRequires:  perl(DBIx::Class)           >= 0.07006
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(UNIVERSAL::require)    >= 0.10
# Catalyst::Helper::Model::DBIC support
BuildRequires:  perl(DBIx::Class::Schema::Loader) >= 0.03012
# optional tests
BuildRequires:  /usr/bin/catalyst.pl 
# author tests
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)

# not automagically picked up
Requires:       perl(Catalyst::Runtime) >= 5.70
Requires:       perl(Class::Accessor::Fast) >= 0.22
Requires:       perl(Class::Data::Accessor) >= 0.02
# Catalyst::Helper::Model::DBIC support
Requires:       perl(DBIx::Class::Schema::Loader) >= 0.03012

%description
This is a Catalyst Model for DBIx::Class::Schema-based Models. See the
documentation for Catalyst::Helper::Model::DBIC::Schema for information on
generating these Models via Helper scripts.

%prep
%setup -q -n Catalyst-Model-DBIC-Schema-%{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
TEST_POD=1 C_M_DBIC_SCHEMA_TESTAPP=1 make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README t/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 09 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
- update to 0.21

* Tue Jul 22 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.20-2
- add DBIx::Class::Schema::Loader as a BR and R

* Sun Mar 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
- Specfile autogenerated by cpanspec 1.74.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Model-DBIC-Schema/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 02:18:20 -0000	1.1
+++ .cvsignore	10 Sep 2008 03:11:02 -0000	1.2
@@ -0,0 +1 @@
+Catalyst-Model-DBIC-Schema-0.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Model-DBIC-Schema/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 02:18:20 -0000	1.1
+++ sources	10 Sep 2008 03:11:02 -0000	1.2
@@ -0,0 +1 @@
+1616235f66aed96e3aa8befc6c8d3b0f  Catalyst-Model-DBIC-Schema-0.21.tar.gz



From agoode at fedoraproject.org  Wed Sep 10 03:40:26 2008
From: agoode at fedoraproject.org (Adam Goode)
Date: Wed, 10 Sep 2008 03:40:26 +0000 (UTC)
Subject: rpms/coda/devel coda.spec,1.5,1.6
Message-ID: <20080910034026.8626F7012C@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/coda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv376

Modified Files:
	coda.spec 
Log Message:
Add note about /usr/include/et


Index: coda.spec
===================================================================
RCS file: /cvs/extras/rpms/coda/devel/coda.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- coda.spec	9 Sep 2008 16:59:05 -0000	1.5
+++ coda.spec	10 Sep 2008 03:39:56 -0000	1.6
@@ -86,6 +86,7 @@
 
 
 %build
+# note: remove the -I and -l here when upstream releases fix for krb5 building
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -I/usr/include/et"
 export LIBS="-lkrb5 -lcom_err -lstdc++"
 %configure --with-vcodacon --with-krb5



From cweyl at fedoraproject.org  Wed Sep 10 03:45:37 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 10 Sep 2008 03:45:37 +0000 (UTC)
Subject: rpms/perl-Catalyst-Model-DBIC-Schema/devel
	perl-Catalyst-Model-DBIC-Schema.spec, 1.1, 1.2
Message-ID: <20080910034537.419197012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Model-DBIC-Schema/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1542

Modified Files:
	perl-Catalyst-Model-DBIC-Schema.spec 
Log Message:
release bump


Index: perl-Catalyst-Model-DBIC-Schema.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Model-DBIC-Schema/devel/perl-Catalyst-Model-DBIC-Schema.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Catalyst-Model-DBIC-Schema.spec	10 Sep 2008 03:11:02 -0000	1.1
+++ perl-Catalyst-Model-DBIC-Schema.spec	10 Sep 2008 03:45:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Model-DBIC-Schema
 Version:        0.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        DBIx::Class::Schema Model Class
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -66,6 +66,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 09 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.21-2
+- bump
+
 * Tue Sep 09 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
 - update to 0.21
 



From cweyl at fedoraproject.org  Wed Sep 10 03:46:18 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 10 Sep 2008 03:46:18 +0000 (UTC)
Subject: rpms/perl-Catalyst-Model-DBIC-Schema/F-8 import.log, NONE,
	1.1 perl-Catalyst-Model-DBIC-Schema.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080910034618.895D37012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Model-DBIC-Schema/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1830

Modified Files:
	sources 
Added Files:
	import.log perl-Catalyst-Model-DBIC-Schema.spec 
Log Message:
pseudo-branch of perl-Catalyst-Model-DBIC-Schema to F-8


--- NEW FILE import.log ---
perl-Catalyst-Model-DBIC-Schema-0_21-1_fc9:HEAD:perl-Catalyst-Model-DBIC-Schema-0.21-1.fc9.src.rpm:1221016256


--- NEW FILE perl-Catalyst-Model-DBIC-Schema.spec ---
Name:           perl-Catalyst-Model-DBIC-Schema
Version:        0.21
Release:        2%{?dist}
Summary:        DBIx::Class::Schema Model Class
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Catalyst-Model-DBIC-Schema/
Source0:        http://search.cpan.org/CPAN/authors/id/B/BO/BOGDAN/Catalyst-Model-DBIC-Schema-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

BuildRequires:  perl(Catalyst::Runtime)     >= 5.70
BuildRequires:  perl(Class::Accessor::Fast) >= 0.22
BuildRequires:  perl(Class::Data::Accessor) >= 0.02
BuildRequires:  perl(DBIx::Class)           >= 0.07006
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(UNIVERSAL::require)    >= 0.10
# Catalyst::Helper::Model::DBIC support
BuildRequires:  perl(DBIx::Class::Schema::Loader) >= 0.03012
# optional tests
BuildRequires:  /usr/bin/catalyst.pl 
# author tests
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)

# not automagically picked up
Requires:       perl(Catalyst::Runtime) >= 5.70
Requires:       perl(Class::Accessor::Fast) >= 0.22
Requires:       perl(Class::Data::Accessor) >= 0.02
# Catalyst::Helper::Model::DBIC support
Requires:       perl(DBIx::Class::Schema::Loader) >= 0.03012

%description
This is a Catalyst Model for DBIx::Class::Schema-based Models. See the
documentation for Catalyst::Helper::Model::DBIC::Schema for information on
generating these Models via Helper scripts.

%prep
%setup -q -n Catalyst-Model-DBIC-Schema-%{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
TEST_POD=1 C_M_DBIC_SCHEMA_TESTAPP=1 make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README t/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 09 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.21-2
- bump

* Tue Sep 09 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
- update to 0.21

* Tue Jul 22 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.20-2
- add DBIx::Class::Schema::Loader as a BR and R

* Sun Mar 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
- Specfile autogenerated by cpanspec 1.74.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Model-DBIC-Schema/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 02:18:20 -0000	1.1
+++ sources	10 Sep 2008 03:45:48 -0000	1.2
@@ -0,0 +1 @@
+1616235f66aed96e3aa8befc6c8d3b0f  Catalyst-Model-DBIC-Schema-0.21.tar.gz



From cweyl at fedoraproject.org  Wed Sep 10 04:01:58 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 10 Sep 2008 04:01:58 +0000 (UTC)
Subject: rpms/perl-Catalyst-Model-DBIC-Schema/F-9 import.log, NONE,
	1.1 perl-Catalyst-Model-DBIC-Schema.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080910040158.CBF007012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Model-DBIC-Schema/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3950

Modified Files:
	sources 
Added Files:
	import.log perl-Catalyst-Model-DBIC-Schema.spec 
Log Message:
pseudo-branch of perl-Catalyst-Model-DBIC-Schema to F-9


--- NEW FILE import.log ---
perl-Catalyst-Model-DBIC-Schema-0_21-1_fc9:HEAD:perl-Catalyst-Model-DBIC-Schema-0.21-1.fc9.src.rpm:1221016256


--- NEW FILE perl-Catalyst-Model-DBIC-Schema.spec ---
Name:           perl-Catalyst-Model-DBIC-Schema
Version:        0.21
Release:        2%{?dist}
Summary:        DBIx::Class::Schema Model Class
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Catalyst-Model-DBIC-Schema/
Source0:        http://search.cpan.org/CPAN/authors/id/B/BO/BOGDAN/Catalyst-Model-DBIC-Schema-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

BuildRequires:  perl(Catalyst::Runtime)     >= 5.70
BuildRequires:  perl(Class::Accessor::Fast) >= 0.22
BuildRequires:  perl(Class::Data::Accessor) >= 0.02
BuildRequires:  perl(DBIx::Class)           >= 0.07006
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(UNIVERSAL::require)    >= 0.10
# Catalyst::Helper::Model::DBIC support
BuildRequires:  perl(DBIx::Class::Schema::Loader) >= 0.03012
# optional tests
BuildRequires:  /usr/bin/catalyst.pl 
# author tests
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)

# not automagically picked up
Requires:       perl(Catalyst::Runtime) >= 5.70
Requires:       perl(Class::Accessor::Fast) >= 0.22
Requires:       perl(Class::Data::Accessor) >= 0.02
# Catalyst::Helper::Model::DBIC support
Requires:       perl(DBIx::Class::Schema::Loader) >= 0.03012

%description
This is a Catalyst Model for DBIx::Class::Schema-based Models. See the
documentation for Catalyst::Helper::Model::DBIC::Schema for information on
generating these Models via Helper scripts.

%prep
%setup -q -n Catalyst-Model-DBIC-Schema-%{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
TEST_POD=1 C_M_DBIC_SCHEMA_TESTAPP=1 make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README t/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 09 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.21-2
- bump

* Tue Sep 09 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
- update to 0.21

* Tue Jul 22 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.20-2
- add DBIx::Class::Schema::Loader as a BR and R

* Sun Mar 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
- Specfile autogenerated by cpanspec 1.74.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Model-DBIC-Schema/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 02:18:20 -0000	1.1
+++ sources	10 Sep 2008 04:01:28 -0000	1.2
@@ -0,0 +1 @@
+1616235f66aed96e3aa8befc6c8d3b0f  Catalyst-Model-DBIC-Schema-0.21.tar.gz



From airlied at fedoraproject.org  Wed Sep 10 04:54:36 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed, 10 Sep 2008 04:54:36 +0000 (UTC)
Subject: rpms/kernel/devel drm-modesetting-radeon.patch, 1.24,
	1.25 kernel.spec, 1.943, 1.944
Message-ID: <20080910045436.27ADD7012E@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8139

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Tue Sep 09 2008 Dave Airlie <airlied at redhat.com>
- Update radeon modesetting - memory setup + ref count fail


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- drm-modesetting-radeon.patch	9 Sep 2008 06:16:19 -0000	1.24
+++ drm-modesetting-radeon.patch	10 Sep 2008 04:54:35 -0000	1.25
@@ -1,3 +1,21 @@
+commit ed3d32c22ed856ef32594fe2efb88c55c8006627
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Sep 10 14:35:43 2008 +1000
+
+    radeon: do proper memory controller init and setup
+
+commit b20aa3e4a453fe5132794e6fddd0e03d0209466a
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Sep 10 14:35:08 2008 +1000
+
+    radeon: fix return value
+
+commit e64d245c67dce41434a5f9504d7f6f530cf7e5c2
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Sep 10 14:34:39 2008 +1000
+
+    radeon: fixup reference counting properly
+
 commit dc35ec837f7a0ff258e6fde4326ccae7fd77650b
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Sep 9 15:55:38 2008 +1000
@@ -28875,7 +28893,7 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
 new file mode 100644
-index 0000000..bca9e13
+index 0000000..e791055
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_combios.c
 @@ -0,0 +1,1359 @@
@@ -29648,7 +29666,7 @@
 +	return false;
 +}
 +
-+bool radeon_combios_get_ext_tmds_info(struct radeon_encoder *encoder)
++void radeon_combios_get_ext_tmds_info(struct radeon_encoder *encoder)
 +{
 +	struct drm_device *dev = encoder->base.dev;
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
@@ -30612,7 +30630,7 @@
 +	return NULL;
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
-index 248ab4a..cc96220 100644
+index 248ab4a..a1d2290 100644
 --- a/drivers/gpu/drm/radeon/radeon_cp.c
 +++ b/drivers/gpu/drm/radeon/radeon_cp.c
 @@ -31,6 +31,7 @@
@@ -30795,6 +30813,15 @@
  #if RADEON_FIFO_DEBUG
  static void radeon_status(drm_radeon_private_t * dev_priv)
  {
+@@ -234,7 +356,7 @@ static int radeon_do_wait_for_fifo(drm_radeon_private_t * dev_priv, int entries)
+ 	return -EBUSY;
+ }
+ 
+-static int radeon_do_wait_for_idle(drm_radeon_private_t * dev_priv)
++int radeon_do_wait_for_idle(drm_radeon_private_t * dev_priv)
+ {
+ 	int i, ret;
+ 
 @@ -294,7 +416,7 @@ static void radeon_init_pipes(drm_radeon_private_t *dev_priv)
  	}
  
@@ -33593,7 +33620,7 @@
  }
  
 diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
-index 0993816..c7a565c 100644
+index 0993816..e15a47a 100644
 --- a/drivers/gpu/drm/radeon/radeon_drv.h
 +++ b/drivers/gpu/drm/radeon/radeon_drv.h
 @@ -34,6 +34,8 @@
@@ -33846,8 +33873,11 @@
  extern struct drm_ioctl_desc radeon_ioctls[];
  extern int radeon_max_ioctl;
  
-@@ -366,10 +488,6 @@ extern int radeon_wait_ring(drm_radeon_private_t * dev_priv, int n);
+@@ -364,12 +486,9 @@ extern struct drm_buf *radeon_freelist_get(struct drm_device * dev);
  
+ extern int radeon_wait_ring(drm_radeon_private_t * dev_priv, int n);
+ 
++extern int radeon_do_wait_for_idle(drm_radeon_private_t * dev_priv);
  extern int radeon_do_cp_idle(drm_radeon_private_t * dev_priv);
  
 -extern int radeon_driver_preinit(struct drm_device *dev, unsigned long flags);
@@ -33857,7 +33887,7 @@
  extern int radeon_mem_alloc(struct drm_device *dev, void *data, struct drm_file *file_priv);
  extern int radeon_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv);
  extern int radeon_mem_init_heap(struct drm_device *dev, void *data, struct drm_file *file_priv);
-@@ -397,13 +515,19 @@ extern int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value);
+@@ -397,13 +516,19 @@ extern int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value);
  extern int radeon_driver_load(struct drm_device *dev, unsigned long flags);
  extern int radeon_driver_unload(struct drm_device *dev);
  extern int radeon_driver_firstopen(struct drm_device *dev);
@@ -33880,7 +33910,7 @@
  /* r300_cmdbuf.c */
  extern void r300_init_reg_flags(struct drm_device *dev);
  
-@@ -411,6 +535,11 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -411,6 +536,11 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  			     struct drm_file *file_priv,
  			     drm_radeon_kcmd_buffer_t * cmdbuf);
  
@@ -33892,7 +33922,7 @@
  /* Flags for stats.boxes
   */
  #define RADEON_BOX_DMA_IDLE      0x1
-@@ -419,10 +548,14 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -419,10 +549,14 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  #define RADEON_BOX_WAIT_IDLE     0x8
  #define RADEON_BOX_TEXTURE_LOAD  0x10
  
@@ -33907,7 +33937,7 @@
  #define RADEON_AGP_COMMAND		0x0f60
  #define RADEON_AGP_COMMAND_PCI_CONFIG   0x0060	/* offset in PCI config */
  #	define RADEON_AGP_ENABLE	(1<<8)
-@@ -525,16 +658,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -525,16 +659,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  #define R520_MC_IND_WR_EN (1 << 24)
  #define R520_MC_IND_DATA  0x74
  
@@ -33924,7 +33954,7 @@
  #define RADEON_MPP_TB_CONFIG		0x01c0
  #define RADEON_MEM_CNTL			0x0140
  #define RADEON_MEM_SDRAM_MODE_REG	0x0158
-@@ -599,14 +722,23 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -599,14 +723,23 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  #define RADEON_SCRATCH_REG3		0x15ec
  #define RADEON_SCRATCH_REG4		0x15f0
  #define RADEON_SCRATCH_REG5		0x15f4
@@ -33951,7 +33981,7 @@
  
  #define RADEON_GEN_INT_CNTL		0x0040
  #	define RADEON_CRTC_VBLANK_MASK		(1 << 0)
-@@ -623,11 +755,13 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -623,11 +756,13 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  #	define RADEON_SW_INT_TEST		(1 << 25)
  #	define RADEON_SW_INT_TEST_ACK		(1 << 25)
  #	define RADEON_SW_INT_FIRE		(1 << 26)
@@ -33969,7 +33999,7 @@
  
  #define RADEON_ISYNC_CNTL		0x1724
  #	define RADEON_ISYNC_ANY2D_IDLE3D	(1 << 0)
-@@ -666,12 +800,17 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -666,12 +801,17 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  #define RADEON_PP_TXFILTER_1		0x1c6c
  #define RADEON_PP_TXFILTER_2		0x1c84
  
@@ -33993,7 +34023,7 @@
  #define RADEON_RB3D_CNTL		0x1c3c
  #	define RADEON_ALPHA_BLEND_ENABLE	(1 << 0)
  #	define RADEON_PLANE_MASK_ENABLE		(1 << 1)
-@@ -698,11 +837,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -698,11 +838,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  #	define R300_ZC_FLUSH		        (1 << 0)
  #	define R300_ZC_FREE		        (1 << 1)
  #	define R300_ZC_BUSY		        (1 << 31)
@@ -34005,7 +34035,7 @@
  #define R300_RB3D_DSTCACHE_CTLSTAT              0x4e4c
  #	define R300_RB3D_DC_FLUSH		(2 << 0)
  #	define R300_RB3D_DC_FREE		(2 << 2)
-@@ -710,15 +844,15 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -710,15 +845,15 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  #define RADEON_RB3D_ZSTENCILCNTL	0x1c2c
  #	define RADEON_Z_TEST_MASK		(7 << 4)
  #	define RADEON_Z_TEST_ALWAYS		(7 << 4)
@@ -34025,7 +34055,7 @@
  #define RADEON_RBBM_SOFT_RESET		0x00f0
  #	define RADEON_SOFT_RESET_CP		(1 <<  0)
  #	define RADEON_SOFT_RESET_HI		(1 <<  1)
-@@ -978,27 +1112,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -978,27 +1113,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  #define RADEON_NUM_VERTICES_SHIFT		16
  
  #define RADEON_COLOR_FORMAT_CI8		2
@@ -34053,7 +34083,7 @@
  
  #define R200_PP_TXCBLEND_0                0x2f00
  #define R200_PP_TXCBLEND_1                0x2f10
-@@ -1109,13 +1222,41 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -1109,13 +1223,41 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  
  #define R200_SE_TCL_POINT_SPRITE_CNTL     0x22c4
  
@@ -34097,7 +34127,7 @@
  #define R500_D1CRTC_STATUS 0x609c
  #define R500_D2CRTC_STATUS 0x689c
  #define R500_CRTC_V_BLANK (1<<0)
-@@ -1156,19 +1297,35 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -1156,19 +1298,35 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  #define RADEON_RING_HIGH_MARK		128
  
  #define RADEON_PCIGART_TABLE_SIZE      (32*1024)
@@ -34140,7 +34170,7 @@
  #define RADEON_WRITE_PCIE(addr, val)					\
  do {									\
  	RADEON_WRITE8(RADEON_PCIE_INDEX,				\
-@@ -1224,7 +1381,7 @@ do {									\
+@@ -1224,7 +1382,7 @@ do {									\
  #define RADEON_WAIT_UNTIL_2D_IDLE() do {				\
  	OUT_RING( CP_PACKET0( RADEON_WAIT_UNTIL, 0 ) );			\
  	OUT_RING( (RADEON_WAIT_2D_IDLECLEAN |				\
@@ -34149,7 +34179,7 @@
  } while (0)
  
  #define RADEON_WAIT_UNTIL_3D_IDLE() do {				\
-@@ -1301,8 +1458,9 @@ do {									\
+@@ -1301,8 +1459,9 @@ do {									\
  } while (0)
  
  #define VB_AGE_TEST_WITH_RETURN( dev_priv )				\
@@ -34161,7 +34191,7 @@
  	if ( sarea_priv->last_dispatch >= RADEON_MAX_VB_AGE ) {		\
  		int __ret = radeon_do_cp_idle( dev_priv );		\
  		if ( __ret ) return __ret;				\
-@@ -1408,4 +1566,142 @@ do {									\
+@@ -1408,4 +1567,142 @@ do {									\
  	write &= mask;						\
  } while (0)
  
@@ -36427,10 +36457,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
 new file mode 100644
-index 0000000..382d348
+index 0000000..58162e5
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_gem.c
-@@ -0,0 +1,1381 @@
+@@ -0,0 +1,1561 @@
 +/*
 + * Copyright 2008 Red Hat Inc.
 + *
@@ -36697,6 +36727,9 @@
 +#endif
 +out_unlock:
 +	mutex_unlock(&obj_priv->bo->mutex);
++	mutex_lock(&dev->struct_mutex);
++	drm_gem_object_unreference(obj);
++	mutex_unlock(&dev->struct_mutex);
 +	return ret;
 +}
 +
@@ -36755,14 +36788,7 @@
 +	int flags = DRM_BO_FLAG_NO_EVICT;
 +	int mask = DRM_BO_FLAG_NO_EVICT;
 +
-+	obj = drm_gem_object_lookup(dev, file_priv, args->handle);
-+	if (obj == NULL)
-+		return -EINVAL;
-+
-+	obj_priv = obj->driver_private;
-+
-+	DRM_DEBUG("got here %p %p %d\n", obj, obj_priv->bo, atomic_read(&obj_priv->bo->usage));
-+	/* validate into a pin with no fence */
++	/* check for valid args */
 +	if (args->pin_domain) {
 +		mask |= DRM_BO_MASK_MEM;
 +		if (args->pin_domain == RADEON_GEM_DOMAIN_GTT)
@@ -36773,6 +36799,14 @@
 +			return -EINVAL;
 +	}
 +
++	obj = drm_gem_object_lookup(dev, file_priv, args->handle);
++	if (obj == NULL)
++		return -EINVAL;
++
++	obj_priv = obj->driver_private;
++
++	/* validate into a pin with no fence */
++	DRM_DEBUG("got here %p %p %d\n", obj, obj_priv->bo, atomic_read(&obj_priv->bo->usage));
 +	if (!(obj_priv->bo->type != drm_bo_type_kernel && !DRM_SUSER(DRM_CURPROC))) {
 +		ret = drm_bo_do_validate(obj_priv->bo, flags, mask,
 +					 DRM_BO_HINT_DONT_FENCE, 0);
@@ -37136,6 +37170,176 @@
 +
 +}
 +
++static bool avivo_get_mc_idle(struct drm_device *dev)
++{
++	drm_radeon_private_t *dev_priv = dev->dev_private;
++
++	if (dev_priv->chip_family >= CHIP_R600) {
++		/* no idea where this is on r600 yet */
++		return true;
++	} else if (dev_priv->chip_family == CHIP_RV515) {
++		if (radeon_read_mc_reg(dev_priv, RV515_MC_STATUS) & RV515_MC_STATUS_IDLE)
++			return true;
++		else
++			return false;
++	} else if (dev_priv->chip_family == CHIP_RS600) {
++		if (radeon_read_mc_reg(dev_priv, RS600_MC_STATUS) & RS600_MC_STATUS_IDLE)
++			return true;
++		else
++			return false;
++	} else if ((dev_priv->chip_family == CHIP_RS690) ||
++		   (dev_priv->chip_family == CHIP_RS740)) {
++		if (radeon_read_mc_reg(dev_priv, RS690_MC_STATUS) & RS690_MC_STATUS_IDLE)
++			return true;
++		else
++			return false;
++	} else {
++		if (radeon_read_mc_reg(dev_priv, R520_MC_STATUS) & R520_MC_STATUS_IDLE)
++			return true;
++		else
++			return false;
++	}
++}
++
++
++static void avivo_disable_mc_clients(struct drm_device *dev)
++{
++	drm_radeon_private_t *dev_priv = dev->dev_private;
++	uint32_t tmp;
++	int timeout;
++
++	radeon_do_wait_for_idle(dev_priv);
++
++	RADEON_WRITE(AVIVO_D1VGA_CONTROL, RADEON_READ(AVIVO_D1VGA_CONTROL) & ~AVIVO_DVGA_CONTROL_MODE_ENABLE);
++	RADEON_WRITE(AVIVO_D2VGA_CONTROL, RADEON_READ(AVIVO_D2VGA_CONTROL) & ~AVIVO_DVGA_CONTROL_MODE_ENABLE);
++
++	tmp = RADEON_READ(AVIVO_D1CRTC_CONTROL);	
++	RADEON_WRITE(AVIVO_D1CRTC_CONTROL, tmp & ~AVIVO_CRTC_EN);
++
++	tmp = RADEON_READ(AVIVO_D2CRTC_CONTROL);	
++	RADEON_WRITE(AVIVO_D2CRTC_CONTROL, tmp & ~AVIVO_CRTC_EN);
++
++	tmp = RADEON_READ(AVIVO_D2CRTC_CONTROL);
++
++	udelay(1000);
++
++	timeout = 0;
++	while (!(avivo_get_mc_idle(dev))) {
++		if (++timeout > 100000) {
++			DRM_ERROR("Timeout waiting for memory controller to update settings\n");
++			DRM_ERROR("Bad things may or may not happen\n");
++		}
++		udelay(10);
++	}
++}
++
++static inline u32 radeon_busy_wait(struct drm_device *dev, uint32_t reg, uint32_t bits,
++				  unsigned int timeout)
++{
++	drm_radeon_private_t *dev_priv = dev->dev_private;
++	u32 status;
++
++	do {
++		udelay(10);
++		status = RADEON_READ(reg);
++		timeout--;
++	} while(status != 0xffffffff && (status & bits) && (timeout > 0));
++
++	if (timeout == 0)
++		status = 0xffffffff;
++	     
++	return status;
++}
++
++/* Wait for vertical sync on primary CRTC */
++static void radeon_wait_for_vsync(struct drm_device *dev)
++{
++	drm_radeon_private_t *dev_priv = dev->dev_private;
++	uint32_t       crtc_gen_cntl;
++	int ret;
++
++	crtc_gen_cntl = RADEON_READ(RADEON_CRTC_GEN_CNTL);
++	if ((crtc_gen_cntl & RADEON_CRTC_DISP_REQ_EN_B) ||
++	    !(crtc_gen_cntl & RADEON_CRTC_EN))
++		return;
++
++	/* Clear the CRTC_VBLANK_SAVE bit */
++	RADEON_WRITE(RADEON_CRTC_STATUS, RADEON_CRTC_VBLANK_SAVE_CLEAR);
++
++	radeon_busy_wait(dev, RADEON_CRTC_STATUS, RADEON_CRTC_VBLANK_SAVE, 2000);
++
++}
++
++/* Wait for vertical sync on primary CRTC */
++static void radeon_wait_for_vsync2(struct drm_device *dev)
++{
++	drm_radeon_private_t *dev_priv = dev->dev_private;
++	uint32_t       crtc2_gen_cntl;
++	struct timeval timeout;
++
++	crtc2_gen_cntl = RADEON_READ(RADEON_CRTC2_GEN_CNTL);
++	if ((crtc2_gen_cntl & RADEON_CRTC2_DISP_REQ_EN_B) ||
++	    !(crtc2_gen_cntl & RADEON_CRTC2_EN))
++		return;
++
++	/* Clear the CRTC_VBLANK_SAVE bit */
++	RADEON_WRITE(RADEON_CRTC2_STATUS, RADEON_CRTC2_VBLANK_SAVE_CLEAR);
++
++	radeon_busy_wait(dev, RADEON_CRTC2_STATUS, RADEON_CRTC2_VBLANK_SAVE, 2000);
++}
++
++static void legacy_disable_mc_clients(struct drm_device *dev)
++{
++	drm_radeon_private_t *dev_priv = dev->dev_private;
++	uint32_t old_mc_status, status_idle;
++	uint32_t ov0_scale_cntl, crtc_ext_cntl, crtc_gen_cntl, crtc2_gen_cntl;
++	uint32_t status;
++
++	radeon_do_wait_for_idle(dev_priv);
++
++	if (dev_priv->flags & RADEON_IS_IGP)
++		return;
++
++	old_mc_status = RADEON_READ(RADEON_MC_STATUS);
++
++	/* stop display and memory access */
++	ov0_scale_cntl = RADEON_READ(RADEON_OV0_SCALE_CNTL);
++	RADEON_WRITE(RADEON_OV0_SCALE_CNTL, ov0_scale_cntl & ~RADEON_SCALER_ENABLE);
++	crtc_ext_cntl = RADEON_READ(RADEON_CRTC_EXT_CNTL);
++	RADEON_WRITE(RADEON_CRTC_EXT_CNTL, crtc_ext_cntl | RADEON_CRTC_DISPLAY_DIS);
++	crtc_gen_cntl = RADEON_READ(RADEON_CRTC_GEN_CNTL);
++
++	radeon_wait_for_vsync(dev);
++
++	RADEON_WRITE(RADEON_CRTC_GEN_CNTL,
++		     (crtc_gen_cntl & ~(RADEON_CRTC_CUR_EN | RADEON_CRTC_ICON_EN)) |
++		     RADEON_CRTC_DISP_REQ_EN_B | RADEON_CRTC_EXT_DISP_EN);
++
++	if (!(dev_priv->flags & RADEON_SINGLE_CRTC)) {
++		crtc2_gen_cntl = RADEON_READ(RADEON_CRTC2_GEN_CNTL);
++
++		radeon_wait_for_vsync2(dev);
++		RADEON_WRITE(RADEON_CRTC2_GEN_CNTL,
++			     (crtc2_gen_cntl & 
++			      ~(RADEON_CRTC2_CUR_EN | RADEON_CRTC2_ICON_EN)) |
++			     RADEON_CRTC2_DISP_REQ_EN_B);
++	}
++
++	udelay(500);
++
++	if (radeon_is_r300(dev_priv))
++		status_idle = R300_MC_IDLE;
++	else
++		status_idle = RADEON_MC_IDLE;
++
++	status = radeon_busy_wait(dev, RADEON_MC_STATUS, status_idle, 200000);
++	if (status == 0xffffffff) {
++		DRM_ERROR("Timeout waiting for memory controller to update settings\n");
++		DRM_ERROR("Bad things may or may not happen\n");
++	}
++}
++
++
 +void radeon_init_memory_map(struct drm_device *dev)
 +{
 +	drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -37205,6 +37409,14 @@
 +	else
 +		dev_priv->fb_location = (dev_priv->mc_fb_location & 0xffff) << 16;
 +
++	/* updating mc regs here */
++	if (radeon_is_avivo(dev_priv))
++		avivo_disable_mc_clients(dev);
++	else
++		legacy_disable_mc_clients(dev);
++
++	radeon_write_fb_location(dev_priv, dev_priv->mc_fb_location);
++
 +	if (radeon_is_avivo(dev_priv)) {
 +		if (dev_priv->chip_family >= CHIP_R600) 
 +			RADEON_WRITE(R600_HDP_NONSURFACE_BASE, (dev_priv->mc_fb_location << 16) & 0xff0000);
@@ -37212,8 +37424,6 @@
 +			RADEON_WRITE(AVIVO_HDP_FB_LOCATION, dev_priv->mc_fb_location);
 +	}
 +
-+	radeon_write_fb_location(dev_priv, dev_priv->mc_fb_location);
-+
 +	dev_priv->fb_location = (radeon_read_fb_location(dev_priv) & 0xffff) << 16;
 +	dev_priv->fb_size =
 +		((radeon_read_fb_location(dev_priv) & 0xffff0000u) + 0x10000)
@@ -37460,7 +37670,7 @@
 +
 +	obj = drm_gem_object_lookup(dev, file_priv, reloc[1]);
 +	if (!obj)
-+		return false;
++		return -EINVAL;
 +
 +	obj_priv = obj->driver_private;
 +	radeon_gem_set_domain(obj, read_domains, write_domain, &flags, false);
@@ -40457,7 +40667,7 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
 new file mode 100644
-index 0000000..ef268a2
+index 0000000..a4ee78a
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_mode.h
 @@ -0,0 +1,337 @@
@@ -40755,7 +40965,7 @@
 +extern void radeon_atombios_get_tmds_info(struct radeon_encoder *encoder);
 +extern bool radeon_combios_get_lvds_info(struct radeon_encoder *encoder);
 +extern bool radeon_combios_get_tmds_info(struct radeon_encoder *encoder);
-+extern bool radeon_combios_get_ext_tmds_info(struct radeon_encoder *encoder);
++extern void radeon_combios_get_ext_tmds_info(struct radeon_encoder *encoder);
 +extern bool radeon_combios_get_tv_info(struct radeon_encoder *encoder);
 +extern bool radeon_combios_get_tv_dac_info(struct radeon_encoder *encoder);
 +extern bool radeon_combios_get_primary_dac_info(struct radeon_encoder *encoder);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.943
retrieving revision 1.944
diff -u -r1.943 -r1.944
--- kernel.spec	10 Sep 2008 01:45:27 -0000	1.943
+++ kernel.spec	10 Sep 2008 04:54:35 -0000	1.944
@@ -1746,6 +1746,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Sep 09 2008 Dave Airlie <airlied at redhat.com>
+- Update radeon modesetting - memory setup + ref count fail
+
 * Tue Sep 09 2008 Dave Jones <davej at redhat.com>
 - 2.6.27-rc6
 



From guthrie at fedoraproject.org  Wed Sep 10 06:04:57 2008
From: guthrie at fedoraproject.org (John T. Guthrie III)
Date: Wed, 10 Sep 2008 06:04:57 +0000 (UTC)
Subject: rpms/dxpc/devel dxpc.spec,1.19,1.20
Message-ID: <20080910060457.CF7CA7012C@cvs1.fedora.phx.redhat.com>

Author: guthrie

Update of /cvs/pkgs/rpms/dxpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12041

Modified Files:
	dxpc.spec 
Log Message:
Added %%dist tag back to the release tag that had been inadvertently deleted


Index: dxpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dxpc/devel/dxpc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dxpc.spec	9 Sep 2008 21:03:52 -0000	1.19
+++ dxpc.spec	10 Sep 2008 06:04:26 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A Differential X Protocol Compressor
 Name:    dxpc
 Version: 3.9.1
-Release: 1
+Release: 1%{?dist}
 
 License: BSD
 Group:   User Interface/X
@@ -55,6 +55,10 @@
 
 
 %changelog
+* Wed Sep 10 2008 John Guthrie <guthrie at counterexample.org> - 3.9.1-1
+- Added %%dist tag back to the release tag that had been inadvertently deleted
+  by the previous update.
+
 * Tue Sep 09 2008 John Guthrie <guthrie at counterexample.org> - 3.9.1-1
 - Upgraded source code to 3.9.1-1
 



From pkgdb at fedoraproject.org  Wed Sep 10 06:12:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 06:12:58 +0000
Subject: [pkgdb] wireshark had acl change status
Message-ID: <20080910061258.A4AB7208D97@bastion.fedora.phx.redhat.com>

rvokal has set the approveacls acl on wireshark (Fedora 9) to Approved for steved

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From pkgdb at fedoraproject.org  Wed Sep 10 06:13:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 06:13:11 +0000
Subject: [pkgdb] wireshark: rvokal has requested commit
Message-ID: <20080910061311.44978208D99@bastion.fedora.phx.redhat.com>

rvokal has requested the commit acl on wireshark (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From pkgdb at fedoraproject.org  Wed Sep 10 06:13:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 06:13:12 +0000
Subject: [pkgdb] wireshark: rvokal has requested approveacls
Message-ID: <20080910061312.D2638208D9C@bastion.fedora.phx.redhat.com>

rvokal has requested the approveacls acl on wireshark (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From pkgdb at fedoraproject.org  Wed Sep 10 06:13:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 06:13:14 +0000
Subject: [pkgdb] wireshark: rvokal has requested watchcommits
Message-ID: <20080910061315.0D334208D9E@bastion.fedora.phx.redhat.com>

rvokal has requested the watchcommits acl on wireshark (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From pkgdb at fedoraproject.org  Wed Sep 10 06:13:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 06:13:16 +0000
Subject: [pkgdb] wireshark: rvokal has requested watchbugzilla
Message-ID: <20080910061316.2604A208DA0@bastion.fedora.phx.redhat.com>

rvokal has requested the watchbugzilla acl on wireshark (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From pkgdb at fedoraproject.org  Wed Sep 10 06:13:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 06:13:23 +0000
Subject: [pkgdb] wireshark: rvokal has requested watchbugzilla
Message-ID: <20080910061323.F21D7208D0F@bastion.fedora.phx.redhat.com>

rvokal has requested the watchbugzilla acl on wireshark (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From pkgdb at fedoraproject.org  Wed Sep 10 06:13:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 06:13:24 +0000
Subject: [pkgdb] wireshark: rvokal has requested watchcommits
Message-ID: <20080910061325.0F919208DA4@bastion.fedora.phx.redhat.com>

rvokal has requested the watchcommits acl on wireshark (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From pkgdb at fedoraproject.org  Wed Sep 10 06:13:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 06:13:30 +0000
Subject: [pkgdb] wireshark: rvokal has requested approveacls
Message-ID: <20080910061330.A8FB7208DA7@bastion.fedora.phx.redhat.com>

rvokal has requested the approveacls acl on wireshark (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From pkgdb at fedoraproject.org  Wed Sep 10 06:13:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 06:13:29 +0000
Subject: [pkgdb] wireshark: rvokal has requested commit
Message-ID: <20080910061329.24429208DA2@bastion.fedora.phx.redhat.com>

rvokal has requested the commit acl on wireshark (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From dwmw2 at fedoraproject.org  Wed Sep 10 06:13:43 2008
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Wed, 10 Sep 2008 06:13:43 +0000 (UTC)
Subject: rpms/bluez-gnome/devel bluez-gnome-0.28-services.patch, NONE,
	1.1 bluez-gnome.spec, 1.51, 1.52
Message-ID: <20080910061343.CAC957012C@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12600

Modified Files:
	bluez-gnome.spec 
Added Files:
	bluez-gnome-0.28-services.patch 
Log Message:
assume services are running

bluez-gnome-0.28-services.patch:

--- NEW FILE bluez-gnome-0.28-services.patch ---
--- bluez-gnome-0.28/properties/service.c~	2008-06-25 13:22:09.000000000 -0700
+++ bluez-gnome-0.28/properties/service.c	2008-09-09 23:10:34.000000000 -0700
@@ -264,7 +264,7 @@ static void add_service(const char *path
 	GList *list;
 	struct service_data *service;
 	const char *identifier = NULL;
-	gboolean running = FALSE;
+	gboolean running = TRUE;
 
 	list = g_list_find_custom(service_list, path, service_compare);
 	if (list && list->data) {


Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- bluez-gnome.spec	27 Aug 2008 14:31:13 -0000	1.51
+++ bluez-gnome.spec	10 Sep 2008 06:13:13 -0000	1.52
@@ -1,6 +1,6 @@
 Name:		bluez-gnome
 Version:	0.28
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
@@ -8,6 +8,7 @@
 URL:		http://www.bluez.org/
 Source0:	http://bluez.sf.net/download/%{name}-%{version}.tar.gz
 Patch1:		bluez-gnome-remove-class-file-sharing.patch
+Patch2:		bluez-gnome-0.28-services.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,6 +47,7 @@
 %prep
 %setup -q
 %patch1 -p0 -b .remove-class
+%patch2 -p1 -b .services
 
 %build
 %configure --disable-mime-update --disable-desktop-update --disable-icon-update
@@ -134,6 +136,9 @@
 %{_datadir}/man/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Tue Sep 09 2008 - David Woodhouse <David.Woodhouse at intel.com> -0.28-3
+- Fix device addition
+
 * Wed Aug 27 2008 - Bastien Nocera <bnocera at redhat.com> - 0.28-2
 - Update requirements for obexftp browsing
 



From pkgdb at fedoraproject.org  Wed Sep 10 06:13:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 06:13:44 +0000
Subject: [pkgdb] wireshark had acl change status
Message-ID: <20080910061344.C7129208D9F@bastion.fedora.phx.redhat.com>

rvokal has set the watchbugzilla acl on wireshark (Fedora devel) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From pkgdb at fedoraproject.org  Wed Sep 10 06:13:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 06:13:47 +0000
Subject: [pkgdb] wireshark had acl change status
Message-ID: <20080910061347.1CFF9208771@bastion.fedora.phx.redhat.com>

rvokal has set the watchcommits acl on wireshark (Fedora devel) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From pkgdb at fedoraproject.org  Wed Sep 10 06:13:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 06:13:48 +0000
Subject: [pkgdb] wireshark had acl change status
Message-ID: <20080910061348.BF795208DAA@bastion.fedora.phx.redhat.com>

rvokal has set the commit acl on wireshark (Fedora devel) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From pkgdb at fedoraproject.org  Wed Sep 10 06:13:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 06:13:50 +0000
Subject: [pkgdb] wireshark had acl change status
Message-ID: <20080910061350.E0502208DAD@bastion.fedora.phx.redhat.com>

rvokal has set the approveacls acl on wireshark (Fedora devel) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From pkgdb at fedoraproject.org  Wed Sep 10 06:13:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 06:13:55 +0000
Subject: [pkgdb] wireshark had acl change status
Message-ID: <20080910061355.C73712D0024@bastion.fedora.phx.redhat.com>

rvokal has set the watchbugzilla acl on wireshark (Fedora 9) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From pkgdb at fedoraproject.org  Wed Sep 10 06:13:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 06:13:59 +0000
Subject: [pkgdb] wireshark had acl change status
Message-ID: <20080910061359.2CDC6208D9B@bastion.fedora.phx.redhat.com>

rvokal has set the watchcommits acl on wireshark (Fedora 9) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From pkgdb at fedoraproject.org  Wed Sep 10 06:14:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 06:14:01 +0000
Subject: [pkgdb] wireshark had acl change status
Message-ID: <20080910061401.8E81F208DAF@bastion.fedora.phx.redhat.com>

rvokal has set the commit acl on wireshark (Fedora 9) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From pkgdb at fedoraproject.org  Wed Sep 10 06:14:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 06:14:03 +0000
Subject: [pkgdb] wireshark had acl change status
Message-ID: <20080910061404.003B4208DB1@bastion.fedora.phx.redhat.com>

rvokal has set the approveacls acl on wireshark (Fedora 9) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From guthrie at fedoraproject.org  Wed Sep 10 06:32:42 2008
From: guthrie at fedoraproject.org (John T. Guthrie III)
Date: Wed, 10 Sep 2008 06:32:42 +0000 (UTC)
Subject: rpms/dxpc/F-9 .cvsignore, 1.4, 1.5 dxpc.spec, 1.17, 1.18 sources,
	1.7, 1.8
Message-ID: <20080910063242.C17AE7012C@cvs1.fedora.phx.redhat.com>

Author: guthrie

Update of /cvs/pkgs/rpms/dxpc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14006

Modified Files:
	.cvsignore dxpc.spec sources 
Log Message:
Upgraded source code to 3.9.1-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dxpc/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Feb 2007 22:27:02 -0000	1.4
+++ .cvsignore	10 Sep 2008 06:32:12 -0000	1.5
@@ -1 +1 @@
-dxpc-3.9.1b1.tgz
+dxpc-3.9.1.tgz


Index: dxpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dxpc/F-9/dxpc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- dxpc.spec	19 Feb 2008 04:22:00 -0000	1.17
+++ dxpc.spec	10 Sep 2008 06:32:12 -0000	1.18
@@ -1,19 +1,19 @@
 Summary: A Differential X Protocol Compressor
 Name:    dxpc
 Version: 3.9.1
-Release: 0.3.b1%{?dist}
+Release: 1%{?dist}
 
 License: BSD
 Group:   User Interface/X
-URL:     http://www.vigor.nu/dxpc/
-Source:  http://www.vigor.nu/dxpc-%{version}b1.tgz
+URL:     http://www.vigor.nu/%{name}/
+Source:  http://www.vigor.nu/%{name}/${version}/%{name}-%{version}.tgz
 Patch0: dxpc-3.9.0-mandir.patch
 Patch1: dxpc-3.9.0-dxpcssh.patch
 Patch2: dxpc-3.9.1b1-destdir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: lzo-devel >= 1.08
-%if "%{?fedora}" > "4"
+%if 0%{?fedora} > 4
 BuildRequires: libXt-devel
 %else
 BuildRequires: xorg-x11-devel
@@ -26,7 +26,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}b1
+%setup -q
 
 %patch0 -p1 -b .mandir
 %patch1 -p0 -b .dxpcssh
@@ -55,6 +55,10 @@
 
 
 %changelog
+* Wed Sep 10 2008 John Guthrie <guthrie[AT]counterexample.org> - 3.9.1-1
+- Upgraded source code to 3.9.1-1
+- Fix %%fedora string comparison to be integer comparison.
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.9.1-0.3.b1
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dxpc/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Feb 2007 22:27:02 -0000	1.7
+++ sources	10 Sep 2008 06:32:12 -0000	1.8
@@ -1 +1 @@
-b3ea5af52360a141c2c56182b99c6516  dxpc-3.9.1b1.tgz
+72597625b2dff38af1e6ec435372da79  dxpc-3.9.1.tgz



From kkofler at fedoraproject.org  Wed Sep 10 06:35:30 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 10 Sep 2008 06:35:30 +0000 (UTC)
Subject: rpms/kde-l10n/devel .cvsignore, 1.12, 1.13 kde-l10n.spec, 1.43,
	1.44 sources, 1.13, 1.14 subdirs-kde-l10n, 1.9, 1.10
Message-ID: <20080910063530.F1E907012C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14231/devel

Modified Files:
	.cvsignore kde-l10n.spec sources subdirs-kde-l10n 
Log Message:
* Wed Sep 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
- reenable Frisian and Kazakh


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	29 Aug 2008 19:47:56 -0000	1.12
+++ .cvsignore	10 Sep 2008 06:34:59 -0000	1.13
@@ -1,361 +1,3 @@
-kde-l10n-ar-4.0.0.tar.bz2
-kde-l10n-bg-4.0.0.tar.bz2
-kde-l10n-ca-4.0.0.tar.bz2
-kde-l10n-de-4.0.0.tar.bz2
-kde-l10n-el-4.0.0.tar.bz2
-kde-l10n-en_GB-4.0.0.tar.bz2
-kde-l10n-es-4.0.0.tar.bz2
-kde-l10n-et-4.0.0.tar.bz2
-kde-l10n-fi-4.0.0.tar.bz2
-kde-l10n-fr-4.0.0.tar.bz2
-kde-l10n-hu-4.0.0.tar.bz2
-kde-l10n-it-4.0.0.tar.bz2
-kde-l10n-ja-4.0.0.tar.bz2
-kde-l10n-ko-4.0.0.tar.bz2
-kde-l10n-nb-4.0.0.tar.bz2
-kde-l10n-nl-4.0.0.tar.bz2
-kde-l10n-nn-4.0.0.tar.bz2
-kde-l10n-pa-4.0.0.tar.bz2
-kde-l10n-pl-4.0.0.tar.bz2
-kde-l10n-pt-4.0.0.tar.bz2
-kde-l10n-pt_BR-4.0.0.tar.bz2
-kde-l10n-ru-4.0.0.tar.bz2
-kde-l10n-sl-4.0.0.tar.bz2
-kde-l10n-sv-4.0.0.tar.bz2
-kde-l10n-th-4.0.0.tar.bz2
-kde-l10n-tr-4.0.0.tar.bz2
-kde-l10n-uk-4.0.0.tar.bz2
-kde-l10n-zh_CN-4.0.0.tar.bz2
-kde-l10n-zh_TW-4.0.0.tar.bz2
-kde-l10n-be-4.0.0.tar.bz2
-kde-l10n-csb-4.0.0.tar.bz2
-kde-l10n-eo-4.0.0.tar.bz2
-kde-l10n-eu-4.0.0.tar.bz2
-kde-l10n-ga-4.0.0.tar.bz2
-kde-l10n-gl-4.0.0.tar.bz2
-kde-l10n-hi-4.0.0.tar.bz2
-kde-l10n-km-4.0.0.tar.bz2
-kde-l10n-lv-4.0.0.tar.bz2
-kde-l10n-mk-4.0.0.tar.bz2
-kde-l10n-nds-4.0.0.tar.bz2
-kde-l10n-ne-4.0.0.tar.bz2
-kde-l10n-se-4.0.0.tar.bz2
-kde-l10n-wa-4.0.0.tar.bz2
-kde-l10n-ar-4.0.1.tar.bz2
-kde-l10n-be-4.0.1.tar.bz2
-kde-l10n-bg-4.0.1.tar.bz2
-kde-l10n-ca-4.0.1.tar.bz2
-kde-l10n-cs-4.0.1.tar.bz2
-kde-l10n-csb-4.0.1.tar.bz2
-kde-l10n-da-4.0.1.tar.bz2
-kde-l10n-de-4.0.1.tar.bz2
-kde-l10n-el-4.0.1.tar.bz2
-kde-l10n-en_GB-4.0.1.tar.bz2
-kde-l10n-eo-4.0.1.tar.bz2
-kde-l10n-es-4.0.1.tar.bz2
-kde-l10n-et-4.0.1.tar.bz2
-kde-l10n-eu-4.0.1.tar.bz2
-kde-l10n-fi-4.0.1.tar.bz2
-kde-l10n-fr-4.0.1.tar.bz2
-kde-l10n-ga-4.0.1.tar.bz2
-kde-l10n-gl-4.0.1.tar.bz2
-kde-l10n-hi-4.0.1.tar.bz2
-kde-l10n-hu-4.0.1.tar.bz2
-kde-l10n-it-4.0.1.tar.bz2
-kde-l10n-ja-4.0.1.tar.bz2
-kde-l10n-km-4.0.1.tar.bz2
-kde-l10n-ko-4.0.1.tar.bz2
-kde-l10n-mk-4.0.1.tar.bz2
-kde-l10n-lv-4.0.1.tar.bz2
-kde-l10n-nb-4.0.1.tar.bz2
-kde-l10n-nds-4.0.1.tar.bz2
-kde-l10n-ne-4.0.1.tar.bz2
-kde-l10n-nl-4.0.1.tar.bz2
-kde-l10n-nn-4.0.1.tar.bz2
-kde-l10n-pa-4.0.1.tar.bz2
-kde-l10n-pl-4.0.1.tar.bz2
-kde-l10n-pt-4.0.1.tar.bz2
-kde-l10n-pt_BR-4.0.1.tar.bz2
-kde-l10n-ru-4.0.1.tar.bz2
-kde-l10n-se-4.0.1.tar.bz2
-kde-l10n-sl-4.0.1.tar.bz2
-kde-l10n-sv-4.0.1.tar.bz2
-kde-l10n-th-4.0.1.tar.bz2
-kde-l10n-tr-4.0.1.tar.bz2
-kde-l10n-uk-4.0.1.tar.bz2
-kde-l10n-wa-4.0.1.tar.bz2
-kde-l10n-zh_CN-4.0.1.tar.bz2
-kde-l10n-zh_TW-4.0.1.tar.bz2
-kde-l10n-ar-4.0.2.tar.bz2
-kde-l10n-be-4.0.2.tar.bz2
-kde-l10n-bg-4.0.2.tar.bz2
-kde-l10n-ca-4.0.2.tar.bz2
-kde-l10n-cs-4.0.2.tar.bz2
-kde-l10n-csb-4.0.2.tar.bz2
-kde-l10n-da-4.0.2.tar.bz2
-kde-l10n-de-4.0.2.tar.bz2
-kde-l10n-el-4.0.2.tar.bz2
-kde-l10n-en_GB-4.0.2.tar.bz2
-kde-l10n-eo-4.0.2.tar.bz2
-kde-l10n-es-4.0.2.tar.bz2
-kde-l10n-et-4.0.2.tar.bz2
-kde-l10n-eu-4.0.2.tar.bz2
-kde-l10n-fi-4.0.2.tar.bz2
-kde-l10n-fr-4.0.2.tar.bz2
-kde-l10n-ga-4.0.2.tar.bz2
-kde-l10n-gl-4.0.2.tar.bz2
-kde-l10n-hi-4.0.2.tar.bz2
-kde-l10n-hu-4.0.2.tar.bz2
-kde-l10n-it-4.0.2.tar.bz2
-kde-l10n-ja-4.0.2.tar.bz2
-kde-l10n-km-4.0.2.tar.bz2
-kde-l10n-ko-4.0.2.tar.bz2
-kde-l10n-mk-4.0.2.tar.bz2
-kde-l10n-lv-4.0.2.tar.bz2
-kde-l10n-nb-4.0.2.tar.bz2
-kde-l10n-nds-4.0.2.tar.bz2
-kde-l10n-ne-4.0.2.tar.bz2
-kde-l10n-nl-4.0.2.tar.bz2
-kde-l10n-nn-4.0.2.tar.bz2
-kde-l10n-pa-4.0.2.tar.bz2
-kde-l10n-pl-4.0.2.tar.bz2
-kde-l10n-pt-4.0.2.tar.bz2
-kde-l10n-pt_BR-4.0.2.tar.bz2
-kde-l10n-ru-4.0.2.tar.bz2
-kde-l10n-se-4.0.2.tar.bz2
-kde-l10n-sl-4.0.2.tar.bz2
-kde-l10n-sv-4.0.2.tar.bz2
-kde-l10n-th-4.0.2.tar.bz2
-kde-l10n-tr-4.0.2.tar.bz2
-kde-l10n-uk-4.0.2.tar.bz2
-kde-l10n-wa-4.0.2.tar.bz2
-kde-l10n-zh_CN-4.0.2.tar.bz2
-kde-l10n-zh_TW-4.0.2.tar.bz2
-kde-l10n-ar-4.0.3.tar.bz2
-kde-l10n-be-4.0.3.tar.bz2
-kde-l10n-bg-4.0.3.tar.bz2
-kde-l10n-ca-4.0.3.tar.bz2
-kde-l10n-cs-4.0.3.tar.bz2
-kde-l10n-csb-4.0.3.tar.bz2
-kde-l10n-da-4.0.3.tar.bz2
-kde-l10n-de-4.0.3.tar.bz2
-kde-l10n-el-4.0.3.tar.bz2
-kde-l10n-en_GB-4.0.3.tar.bz2
-kde-l10n-eo-4.0.3.tar.bz2
-kde-l10n-es-4.0.3.tar.bz2
-kde-l10n-et-4.0.3.tar.bz2
-kde-l10n-eu-4.0.3.tar.bz2
-kde-l10n-fi-4.0.3.tar.bz2
-kde-l10n-fr-4.0.3.tar.bz2
-kde-l10n-ga-4.0.3.tar.bz2
-kde-l10n-gl-4.0.3.tar.bz2
-kde-l10n-hi-4.0.3.tar.bz2
-kde-l10n-hu-4.0.3.tar.bz2
-kde-l10n-it-4.0.3.tar.bz2
-kde-l10n-ja-4.0.3.tar.bz2
-kde-l10n-km-4.0.3.tar.bz2
-kde-l10n-ko-4.0.3.tar.bz2
-kde-l10n-mk-4.0.3.tar.bz2
-kde-l10n-lv-4.0.3.tar.bz2
-kde-l10n-nb-4.0.3.tar.bz2
-kde-l10n-nds-4.0.3.tar.bz2
-kde-l10n-ne-4.0.3.tar.bz2
-kde-l10n-nl-4.0.3.tar.bz2
-kde-l10n-nn-4.0.3.tar.bz2
-kde-l10n-pa-4.0.3.tar.bz2
-kde-l10n-pl-4.0.3.tar.bz2
-kde-l10n-pt-4.0.3.tar.bz2
-kde-l10n-pt_BR-4.0.3.tar.bz2
-kde-l10n-ru-4.0.3.tar.bz2
-kde-l10n-se-4.0.3.tar.bz2
-kde-l10n-sl-4.0.3.tar.bz2
-kde-l10n-sv-4.0.3.tar.bz2
-kde-l10n-th-4.0.3.tar.bz2
-kde-l10n-tr-4.0.3.tar.bz2
-kde-l10n-uk-4.0.3.tar.bz2
-kde-l10n-wa-4.0.3.tar.bz2
-kde-l10n-zh_CN-4.0.3.tar.bz2
-kde-l10n-zh_TW-4.0.3.tar.bz2
-kde-l10n-ar-4.0.80.tar.bz2
-kde-l10n-be-4.0.80.tar.bz2
-kde-l10n-bg-4.0.80.tar.bz2
-kde-l10n-ca-4.0.80.tar.bz2
-kde-l10n-cs-4.0.80.tar.bz2
-kde-l10n-csb-4.0.80.tar.bz2
-kde-l10n-de-4.0.80.tar.bz2
-kde-l10n-el-4.0.80.tar.bz2
-kde-l10n-en_GB-4.0.80.tar.bz2
-kde-l10n-eo-4.0.80.tar.bz2
-kde-l10n-es-4.0.80.tar.bz2
-kde-l10n-et-4.0.80.tar.bz2
-kde-l10n-eu-4.0.80.tar.bz2
-kde-l10n-fi-4.0.80.tar.bz2
-kde-l10n-fr-4.0.80.tar.bz2
-kde-l10n-ga-4.0.80.tar.bz2
-kde-l10n-gl-4.0.80.tar.bz2
-kde-l10n-hi-4.0.80.tar.bz2
-kde-l10n-hu-4.0.80.tar.bz2
-kde-l10n-it-4.0.80.tar.bz2
-kde-l10n-ja-4.0.80.tar.bz2
-kde-l10n-km-4.0.80.tar.bz2
-kde-l10n-ko-4.0.80.tar.bz2
-kde-l10n-mk-4.0.80.tar.bz2
-kde-l10n-lv-4.0.80.tar.bz2
-kde-l10n-nb-4.0.80.tar.bz2
-kde-l10n-nds-4.0.80.tar.bz2
-kde-l10n-ne-4.0.80.tar.bz2
-kde-l10n-nl-4.0.80.tar.bz2
-kde-l10n-nn-4.0.80.tar.bz2
-kde-l10n-pa-4.0.80.tar.bz2
-kde-l10n-pl-4.0.80.tar.bz2
-kde-l10n-pt-4.0.80.tar.bz2
-kde-l10n-pt_BR-4.0.80.tar.bz2
-kde-l10n-ru-4.0.80.tar.bz2
-kde-l10n-se-4.0.80.tar.bz2
-kde-l10n-sl-4.0.80.tar.bz2
-kde-l10n-sv-4.0.80.tar.bz2
-kde-l10n-th-4.0.80.tar.bz2
-kde-l10n-tr-4.0.80.tar.bz2
-kde-l10n-uk-4.0.80.tar.bz2
-kde-l10n-wa-4.0.80.tar.bz2
-kde-l10n-zh_CN-4.0.80.tar.bz2
-kde-l10n-zh_TW-4.0.80.tar.bz2
-kde-l10n-ar-4.0.83.tar.bz2
-kde-l10n-be-4.0.83.tar.bz2
-kde-l10n-bg-4.0.83.tar.bz2
-kde-l10n-ca-4.0.83.tar.bz2
-kde-l10n-cs-4.0.83.tar.bz2
-kde-l10n-csb-4.0.83.tar.bz2
-kde-l10n-da-4.0.83.tar.bz2
-kde-l10n-de-4.0.83.tar.bz2
-kde-l10n-el-4.0.83.tar.bz2
-kde-l10n-en_GB-4.0.83.tar.bz2
-kde-l10n-eo-4.0.83.tar.bz2
-kde-l10n-es-4.0.83.tar.bz2
-kde-l10n-et-4.0.83.tar.bz2
-kde-l10n-eu-4.0.83.tar.bz2
-kde-l10n-fi-4.0.83.tar.bz2
-kde-l10n-fr-4.0.83.tar.bz2
-kde-l10n-ga-4.0.83.tar.bz2
-kde-l10n-gl-4.0.83.tar.bz2
-kde-l10n-hi-4.0.83.tar.bz2
-kde-l10n-hu-4.0.83.tar.bz2
-kde-l10n-it-4.0.83.tar.bz2
-kde-l10n-ja-4.0.83.tar.bz2
-kde-l10n-km-4.0.83.tar.bz2
-kde-l10n-ko-4.0.83.tar.bz2
-kde-l10n-mk-4.0.83.tar.bz2
-kde-l10n-lv-4.0.83.tar.bz2
-kde-l10n-nb-4.0.83.tar.bz2
-kde-l10n-nds-4.0.83.tar.bz2
-kde-l10n-ne-4.0.83.tar.bz2
-kde-l10n-nl-4.0.83.tar.bz2
-kde-l10n-nn-4.0.83.tar.bz2
-kde-l10n-pa-4.0.83.tar.bz2
-kde-l10n-pl-4.0.83.tar.bz2
-kde-l10n-pt-4.0.83.tar.bz2
-kde-l10n-pt_BR-4.0.83.tar.bz2
-kde-l10n-ru-4.0.83.tar.bz2
-kde-l10n-se-4.0.83.tar.bz2
-kde-l10n-sl-4.0.83.tar.bz2
-kde-l10n-sv-4.0.83.tar.bz2
-kde-l10n-ta-4.0.83.tar.bz2
-kde-l10n-th-4.0.83.tar.bz2
-kde-l10n-tr-4.0.83.tar.bz2
-kde-l10n-uk-4.0.83.tar.bz2
-kde-l10n-wa-4.0.83.tar.bz2
-kde-l10n-zh_CN-4.0.83.tar.bz2
-kde-l10n-zh_TW-4.0.83.tar.bz2
-kde-l10n-sr-4.0.83.tar.bz2
-kde-l10n-ar-4.0.98.tar.bz2
-kde-l10n-be-4.0.98.tar.bz2
-kde-l10n-bg-4.0.98.tar.bz2
-kde-l10n-ca-4.0.98.tar.bz2
-kde-l10n-cs-4.0.98.tar.bz2
-kde-l10n-csb-4.0.98.tar.bz2
-kde-l10n-da-4.0.98.tar.bz2
-kde-l10n-de-4.0.98.tar.bz2
-kde-l10n-el-4.0.98.tar.bz2
-kde-l10n-en_GB-4.0.98.tar.bz2
-kde-l10n-eo-4.0.98.tar.bz2
-kde-l10n-es-4.0.98.tar.bz2
-kde-l10n-et-4.0.98.tar.bz2
-kde-l10n-eu-4.0.98.tar.bz2
-kde-l10n-fi-4.0.98.tar.bz2
-kde-l10n-fr-4.0.98.tar.bz2
-kde-l10n-ga-4.0.98.tar.bz2
-kde-l10n-gl-4.0.98.tar.bz2
-kde-l10n-hi-4.0.98.tar.bz2
-kde-l10n-hu-4.0.98.tar.bz2
-kde-l10n-it-4.0.98.tar.bz2
-kde-l10n-ja-4.0.98.tar.bz2
-kde-l10n-km-4.0.98.tar.bz2
-kde-l10n-ko-4.0.98.tar.bz2
-kde-l10n-mk-4.0.98.tar.bz2
-kde-l10n-lv-4.0.98.tar.bz2
-kde-l10n-nb-4.0.98.tar.bz2
-kde-l10n-nds-4.0.98.tar.bz2
-kde-l10n-ne-4.0.98.tar.bz2
-kde-l10n-nl-4.0.98.tar.bz2
-kde-l10n-nn-4.0.98.tar.bz2
-kde-l10n-pa-4.0.98.tar.bz2
-kde-l10n-pl-4.0.98.tar.bz2
-kde-l10n-pt-4.0.98.tar.bz2
-kde-l10n-pt_BR-4.0.98.tar.bz2
-kde-l10n-ru-4.0.98.tar.bz2
-kde-l10n-se-4.0.98.tar.bz2
-kde-l10n-sl-4.0.98.tar.bz2
-kde-l10n-sr-4.0.98.tar.bz2
-kde-l10n-sv-4.0.98.tar.bz2
-kde-l10n-ta-4.0.98.tar.bz2
-kde-l10n-th-4.0.98.tar.bz2
-kde-l10n-tr-4.0.98.tar.bz2
-kde-l10n-uk-4.0.98.tar.bz2
-kde-l10n-wa-4.0.98.tar.bz2
-kde-l10n-zh_CN-4.0.98.tar.bz2
-kde-l10n-zh_TW-4.0.98.tar.bz2
-kde-l10n-bg-4.1.0.tar.bz2
-kde-l10n-ca-4.1.0.tar.bz2
-kde-l10n-cs-4.1.0.tar.bz2
-kde-l10n-csb-4.1.0.tar.bz2
-kde-l10n-da-4.1.0.tar.bz2
-kde-l10n-de-4.1.0.tar.bz2
-kde-l10n-el-4.1.0.tar.bz2
-kde-l10n-en_GB-4.1.0.tar.bz2
-kde-l10n-eo-4.1.0.tar.bz2
-kde-l10n-es-4.1.0.tar.bz2
-kde-l10n-et-4.1.0.tar.bz2
-kde-l10n-fi-4.1.0.tar.bz2
-kde-l10n-fr-4.1.0.tar.bz2
-kde-l10n-ga-4.1.0.tar.bz2
-kde-l10n-gl-4.1.0.tar.bz2
-kde-l10n-hi-4.1.0.tar.bz2
-kde-l10n-hu-4.1.0.tar.bz2
-kde-l10n-it-4.1.0.tar.bz2
-kde-l10n-ja-4.1.0.tar.bz2
-kde-l10n-km-4.1.0.tar.bz2
-kde-l10n-ko-4.1.0.tar.bz2
-kde-l10n-mk-4.1.0.tar.bz2
-kde-l10n-lv-4.1.0.tar.bz2
-kde-l10n-nb-4.1.0.tar.bz2
-kde-l10n-nds-4.1.0.tar.bz2
-kde-l10n-nl-4.1.0.tar.bz2
-kde-l10n-nn-4.1.0.tar.bz2
-kde-l10n-pa-4.1.0.tar.bz2
-kde-l10n-pl-4.1.0.tar.bz2
-kde-l10n-pt-4.1.0.tar.bz2
-kde-l10n-pt_BR-4.1.0.tar.bz2
-kde-l10n-ru-4.1.0.tar.bz2
-kde-l10n-sl-4.1.0.tar.bz2
-kde-l10n-sr-4.1.0.tar.bz2
-kde-l10n-sv-4.1.0.tar.bz2
-kde-l10n-ta-4.1.0.tar.bz2
-kde-l10n-th-4.1.0.tar.bz2
-kde-l10n-tr-4.1.0.tar.bz2
-kde-l10n-uk-4.1.0.tar.bz2
-kde-l10n-wa-4.1.0.tar.bz2
-kde-l10n-zh_CN-4.1.0.tar.bz2
-kde-l10n-zh_TW-4.1.0.tar.bz2
 kde-l10n-bg-4.1.1.tar.bz2
 kde-l10n-ca-4.1.1.tar.bz2
 kde-l10n-cs-4.1.1.tar.bz2
@@ -398,3 +40,5 @@
 kde-l10n-wa-4.1.1.tar.bz2
 kde-l10n-zh_CN-4.1.1.tar.bz2
 kde-l10n-zh_TW-4.1.1.tar.bz2
+kde-l10n-fy-4.1.1.tar.bz2
+kde-l10n-kk-4.1.1.tar.bz2


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kde-l10n.spec	29 Aug 2008 19:47:56 -0000	1.43
+++ kde-l10n.spec	10 Sep 2008 06:35:00 -0000	1.44
@@ -2,7 +2,7 @@
 
 Name: kde-l10n
 Version: 4.1.1
-Release: 1%{dist}
+Release: 2%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -57,6 +57,8 @@
 Source45: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2
 Source46: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2
 Source47: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sr-%{version}.tar.bz2
+Source48: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2
+Source49: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kk-%{version}.tar.bz2
 
 Source1000: subdirs-kde-l10n
 
@@ -398,6 +400,15 @@
 %description Kashubian
 Kashubian language support for KDE
 
+%package Kazakh
+Summary: Kazakh language support for KDE
+Group: User Interface/Desktops
+Requires: kde-filesystem
+Provides: %{name}-kk = %{version}-%{release}
+
+%description Kazakh
+Kazakh language support for KDE
+
 %package Khmer
 Summary: Khmer language support for KDE
 Group: User Interface/Desktops
@@ -964,11 +975,9 @@
 %lang(fr) %{_kde4_appsdir}/kvtml/fr
 %lang(fr) %{_kde4_docdir}/HTML/fr
 
-%if %{buildall}
 %files Frisian
 %defattr(-,root,root)
 %lang(fy) %{_datadir}/locale/fy/*
-%endif
 
 %files Irish
 %defattr(-,root,root)
@@ -1036,6 +1045,10 @@
 %defattr(-,root,root)
 %lang(csb) %{_datadir}/locale/csb/*
 
+%files Kazakh
+%defattr(-,root,root)
+%lang(kk) %{_datadir}/locale/kk/*
+
 %files Khmer
 %defattr(-,root,root)
 %lang(km) %{_datadir}/locale/km/*
@@ -1280,6 +1293,9 @@
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Wed Sep 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
+- reenable Frisian and Kazakh
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	1 Sep 2008 17:07:00 -0000	1.13
+++ sources	10 Sep 2008 06:35:00 -0000	1.14
@@ -40,3 +40,5 @@
 134cd3d65db7352e88f05df547af04db  kde-l10n-zh_CN-4.1.1.tar.bz2
 4ec74453141d23c503123e788a491c98  kde-l10n-zh_TW-4.1.1.tar.bz2
 b29bc82068ac7d3443fffe924356a7fd  kde-l10n-sr-4.1.1.tar.bz2
+d8482cd920425ca38174ee9dec21c606  kde-l10n-fy-4.1.1.tar.bz2
+a58a0bc175b711da8b36d57e17719f5c  kde-l10n-kk-4.1.1.tar.bz2


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/devel/subdirs-kde-l10n,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- subdirs-kde-l10n	23 Jul 2008 14:38:33 -0000	1.9
+++ subdirs-kde-l10n	10 Sep 2008 06:35:00 -0000	1.10
@@ -11,12 +11,14 @@
 et
 fi
 fr
+fy
 ga
 gl
 hi
 hu
 it
 ja
+kk
 km
 ko
 mk



From rvokal at fedoraproject.org  Wed Sep 10 06:36:44 2008
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Wed, 10 Sep 2008 06:36:44 +0000 (UTC)
Subject: rpms/wireshark/devel .cvsignore, 1.20, 1.21 sources, 1.20,
	1.21 wireshark.spec, 1.41, 1.42
Message-ID: <20080910063644.682017012C@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/pkgs/rpms/wireshark/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14306

Modified Files:
	.cvsignore sources wireshark.spec 
Log Message:
upgrade to 1.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wireshark/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	11 Jul 2008 07:37:01 -0000	1.20
+++ .cvsignore	10 Sep 2008 06:36:13 -0000	1.21
@@ -1 +1 @@
-wireshark-1.0.2.tar.gz
+wireshark-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wireshark/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	11 Jul 2008 07:37:01 -0000	1.20
+++ sources	10 Sep 2008 06:36:13 -0000	1.21
@@ -1 +1 @@
-6045048aa8645d54d1a06bb20e0d23a3  wireshark-1.0.2.tar.gz
+a52b0c6c652ce7239bee879cd6ca02f0  wireshark-1.0.3.tar.gz


Index: wireshark.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wireshark/devel/wireshark.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- wireshark.spec	25 Aug 2008 13:50:39 -0000	1.41
+++ wireshark.spec	10 Sep 2008 06:36:14 -0000	1.42
@@ -5,8 +5,8 @@
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
-Version:	1.0.2
-Release: 	3%{?dist}
+Version:	1.0.3
+Release: 	1%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
 %if %{svn_version}
@@ -210,6 +210,12 @@
 
 
 %changelog
+* Wed Sep 10 2008 Radek Vok??l <rvokal at redhat.com> 1.0.3-1
+- upgrade to 1.0.3
+- Security-related bugs in the NCP dissector, zlib compression code, and Tektronix .rf5 file parser have been fixed. 
+- WPA group key decryption is now supported. 
+- A bug that could cause packets to be wrongly dissected as "Redback Lawful Intercept" has been fixed. 
+
 * Mon Aug 25 2008 Radek Vok??l <rvokal at redhat.com> 1.0.2-3
 - fix requires for wireshark-gnome
 



From tmz at fedoraproject.org  Wed Sep 10 06:41:23 2008
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Wed, 10 Sep 2008 06:41:23 +0000 (UTC)
Subject: rpms/facter/devel .cvsignore, 1.8, 1.9 facter.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <20080910064123.8583D7012C@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/facter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14583

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
* Tue Sep 09 2008 Todd Zullinger <tmz at pobox.com> - 1.5.2-1
- New version
- Simplify spec file checking for Fedora and RHEL versions



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	8 Sep 2008 18:16:45 -0000	1.8
+++ .cvsignore	10 Sep 2008 06:40:51 -0000	1.9
@@ -1 +1 @@
-facter-1.5.1.tgz
+facter-1.5.2.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/facter.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- facter.spec	8 Sep 2008 18:16:45 -0000	1.10
+++ facter.spec	10 Sep 2008 06:40:52 -0000	1.11
@@ -1,11 +1,11 @@
 %{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
 
-%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
+%define has_ruby_abi 0%{?fedora} || 0%{?rhel} >= 5
 %define has_ruby_noarch %has_ruby_abi
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.1
+Version: 1.5.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -13,7 +13,7 @@
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
-BuildArchitectures: noarch
+BuildArch: noarch
 %endif
 
 Requires: ruby >= 1.8.1
@@ -64,6 +64,10 @@
 
 
 %changelog
+* Tue Sep 09 2008 Todd Zullinger <tmz at pobox.com> - 1.5.2-1
+- New version
+- Simplify spec file checking for Fedora and RHEL versions
+
 * Mon Sep  8 2008 David Lutterkort <dlutter at redhat.com> - 1.5.1-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Sep 2008 18:16:45 -0000	1.8
+++ sources	10 Sep 2008 06:40:52 -0000	1.9
@@ -1 +1 @@
-cf836b3b378006fdefdf5716e6d2957a  facter-1.5.1.tgz
+3d257bc2755217690fca868c0fa0cc7b  facter-1.5.2.tgz



From tmz at fedoraproject.org  Wed Sep 10 06:45:39 2008
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Wed, 10 Sep 2008 06:45:39 +0000 (UTC)
Subject: rpms/facter/F-9 .cvsignore, 1.8, 1.9 facter.spec, 1.9, 1.10 sources,
	1.8, 1.9
Message-ID: <20080910064539.AF9807012C@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/facter/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14787

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
* Tue Sep 09 2008 Todd Zullinger <tmz at pobox.com> - 1.5.2-1
- New version
- Simplify spec file checking for Fedora and RHEL versions



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	8 Sep 2008 18:16:44 -0000	1.8
+++ .cvsignore	10 Sep 2008 06:45:08 -0000	1.9
@@ -1 +1 @@
-facter-1.5.1.tgz
+facter-1.5.2.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/F-9/facter.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- facter.spec	8 Sep 2008 18:16:44 -0000	1.9
+++ facter.spec	10 Sep 2008 06:45:08 -0000	1.10
@@ -1,11 +1,11 @@
 %{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
 
-%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
+%define has_ruby_abi 0%{?fedora} || 0%{?rhel} >= 5
 %define has_ruby_noarch %has_ruby_abi
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.1
+Version: 1.5.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -13,7 +13,7 @@
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
-BuildArchitectures: noarch
+BuildArch: noarch
 %endif
 
 Requires: ruby >= 1.8.1
@@ -64,6 +64,10 @@
 
 
 %changelog
+* Tue Sep 09 2008 Todd Zullinger <tmz at pobox.com> - 1.5.2-1
+- New version
+- Simplify spec file checking for Fedora and RHEL versions
+
 * Mon Sep  8 2008 David Lutterkort <dlutter at redhat.com> - 1.5.1-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Sep 2008 18:16:44 -0000	1.8
+++ sources	10 Sep 2008 06:45:08 -0000	1.9
@@ -1 +1 @@
-cf836b3b378006fdefdf5716e6d2957a  facter-1.5.1.tgz
+3d257bc2755217690fca868c0fa0cc7b  facter-1.5.2.tgz



From tmz at fedoraproject.org  Wed Sep 10 06:47:37 2008
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Wed, 10 Sep 2008 06:47:37 +0000 (UTC)
Subject: rpms/facter/F-8 .cvsignore, 1.8, 1.9 facter.spec, 1.9, 1.10 sources,
	1.8, 1.9
Message-ID: <20080910064737.201067012C@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/facter/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14948

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
* Tue Sep 09 2008 Todd Zullinger <tmz at pobox.com> - 1.5.2-1
- New version
- Simplify spec file checking for Fedora and RHEL versions



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/F-8/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	8 Sep 2008 18:16:44 -0000	1.8
+++ .cvsignore	10 Sep 2008 06:47:06 -0000	1.9
@@ -1 +1 @@
-facter-1.5.1.tgz
+facter-1.5.2.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/F-8/facter.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- facter.spec	8 Sep 2008 18:16:44 -0000	1.9
+++ facter.spec	10 Sep 2008 06:47:06 -0000	1.10
@@ -1,11 +1,11 @@
 %{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
 
-%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
+%define has_ruby_abi 0%{?fedora} || 0%{?rhel} >= 5
 %define has_ruby_noarch %has_ruby_abi
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.1
+Version: 1.5.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -13,7 +13,7 @@
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
-BuildArchitectures: noarch
+BuildArch: noarch
 %endif
 
 Requires: ruby >= 1.8.1
@@ -64,6 +64,10 @@
 
 
 %changelog
+* Tue Sep 09 2008 Todd Zullinger <tmz at pobox.com> - 1.5.2-1
+- New version
+- Simplify spec file checking for Fedora and RHEL versions
+
 * Mon Sep  8 2008 David Lutterkort <dlutter at redhat.com> - 1.5.1-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/F-8/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Sep 2008 18:16:44 -0000	1.8
+++ sources	10 Sep 2008 06:47:06 -0000	1.9
@@ -1 +1 @@
-cf836b3b378006fdefdf5716e6d2957a  facter-1.5.1.tgz
+3d257bc2755217690fca868c0fa0cc7b  facter-1.5.2.tgz



From caolanm at fedoraproject.org  Wed Sep 10 06:51:11 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 10 Sep 2008 06:51:11 +0000 (UTC)
Subject: rpms/hunspell-eu/devel hunspell-eu.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080910065111.D46C77012C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-eu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15293/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-eu.spec import.log 
Log Message:



--- NEW FILE hunspell-eu.spec ---
Name: hunspell-eu
Summary: Basque hunspell dictionaries
%define upstreamid 20080507
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source0: http://www.euskara.euskadi.net/r59-20660/eu/contenidos/informacion/euskarazko_softwarea/eu_9567/adjuntos/eu-ES-hunspell.tar.gz
Source1: http://www.euskara.euskadi.net/r59-20660/eu/contenidos/informacion/euskarazko_softwarea/eu_9567/adjuntos/XUXEN_kode_irekia_eskuliburua-LINUX-OO.pdf
Group: Applications/Text
URL: http://www.euskara.euskadi.net/r59-20660/eu/contenidos/informacion/euskarazko_softwarea/eu_9567/xuxen.html
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv2
BuildArch: noarch

Requires: hunspell

%description
Basque hunspell dictionaries.

%prep
%setup -q -c -n hunspell-eu
cp -p %{SOURCE1} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p eu-ES/eu-ES.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/eu_ES.dic
cp -p eu-ES/eu-ES.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/eu_ES.aff

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc XUXEN_kode_irekia_eskuliburua-LINUX-OO.pdf
%{_datadir}/myspell/*

%changelog
* Tue Sep 09 2008 Caolan McNamara <caolanm at redhat.com> - 0.20080507-1
- initial version


--- NEW FILE import.log ---
hunspell-eu-0_20080507-1_fc9:HEAD:hunspell-eu-0.20080507-1.fc9.src.rpm:1221029476


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-eu/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 02:07:18 -0000	1.1
+++ .cvsignore	10 Sep 2008 06:50:41 -0000	1.2
@@ -0,0 +1,2 @@
+XUXEN_kode_irekia_eskuliburua-LINUX-OO.pdf
+eu-ES-hunspell.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-eu/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 02:07:18 -0000	1.1
+++ sources	10 Sep 2008 06:50:41 -0000	1.2
@@ -0,0 +1,2 @@
+1ad71b1fda5b7155a9dbc150131b5578  XUXEN_kode_irekia_eskuliburua-LINUX-OO.pdf
+57ff126e635fb8ac3fe6e54ff79a0ef5  eu-ES-hunspell.tar.gz



From tmz at fedoraproject.org  Wed Sep 10 06:51:35 2008
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Wed, 10 Sep 2008 06:51:35 +0000 (UTC)
Subject: rpms/facter/EL-5 .cvsignore, 1.8, 1.9 facter.spec, 1.9, 1.10 sources,
	1.8, 1.9
Message-ID: <20080910065135.8B2687012C@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/facter/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15339

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
* Tue Sep 09 2008 Todd Zullinger <tmz at pobox.com> - 1.5.2-1
- New version
- Simplify spec file checking for Fedora and RHEL versions



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	8 Sep 2008 18:16:44 -0000	1.8
+++ .cvsignore	10 Sep 2008 06:51:05 -0000	1.9
@@ -1 +1 @@
-facter-1.5.1.tgz
+facter-1.5.2.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-5/facter.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- facter.spec	8 Sep 2008 18:16:44 -0000	1.9
+++ facter.spec	10 Sep 2008 06:51:05 -0000	1.10
@@ -1,11 +1,11 @@
 %{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
 
-%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
+%define has_ruby_abi 0%{?fedora} || 0%{?rhel} >= 5
 %define has_ruby_noarch %has_ruby_abi
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.1
+Version: 1.5.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -13,7 +13,7 @@
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
-BuildArchitectures: noarch
+BuildArch: noarch
 %endif
 
 Requires: ruby >= 1.8.1
@@ -64,6 +64,10 @@
 
 
 %changelog
+* Tue Sep 09 2008 Todd Zullinger <tmz at pobox.com> - 1.5.2-1
+- New version
+- Simplify spec file checking for Fedora and RHEL versions
+
 * Mon Sep  8 2008 David Lutterkort <dlutter at redhat.com> - 1.5.1-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Sep 2008 18:16:44 -0000	1.8
+++ sources	10 Sep 2008 06:51:05 -0000	1.9
@@ -1 +1 @@
-cf836b3b378006fdefdf5716e6d2957a  facter-1.5.1.tgz
+3d257bc2755217690fca868c0fa0cc7b  facter-1.5.2.tgz



From tmz at fedoraproject.org  Wed Sep 10 06:53:38 2008
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Wed, 10 Sep 2008 06:53:38 +0000 (UTC)
Subject: rpms/facter/EL-4 .cvsignore, 1.7, 1.8 facter.spec, 1.8, 1.9 sources,
	1.7, 1.8
Message-ID: <20080910065338.4464F7012C@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/facter/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15590

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
* Tue Sep 09 2008 Todd Zullinger <tmz at pobox.com> - 1.5.2-1
- New version
- Simplify spec file checking for Fedora and RHEL versions



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Sep 2008 18:16:44 -0000	1.7
+++ .cvsignore	10 Sep 2008 06:53:07 -0000	1.8
@@ -1 +1 @@
-facter-1.5.1.tgz
+facter-1.5.2.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-4/facter.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- facter.spec	8 Sep 2008 18:16:44 -0000	1.8
+++ facter.spec	10 Sep 2008 06:53:07 -0000	1.9
@@ -1,11 +1,11 @@
 %{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
 
-%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
+%define has_ruby_abi 0%{?fedora} || 0%{?rhel} >= 5
 %define has_ruby_noarch %has_ruby_abi
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.1
+Version: 1.5.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -13,7 +13,7 @@
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
-BuildArchitectures: noarch
+BuildArch: noarch
 %endif
 
 Requires: ruby >= 1.8.1
@@ -64,6 +64,10 @@
 
 
 %changelog
+* Tue Sep 09 2008 Todd Zullinger <tmz at pobox.com> - 1.5.2-1
+- New version
+- Simplify spec file checking for Fedora and RHEL versions
+
 * Mon Sep  8 2008 David Lutterkort <dlutter at redhat.com> - 1.5.1-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Sep 2008 18:16:44 -0000	1.7
+++ sources	10 Sep 2008 06:53:07 -0000	1.8
@@ -1 +1 @@
-cf836b3b378006fdefdf5716e6d2957a  facter-1.5.1.tgz
+3d257bc2755217690fca868c0fa0cc7b  facter-1.5.2.tgz



From rvokal at fedoraproject.org  Wed Sep 10 07:20:40 2008
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Wed, 10 Sep 2008 07:20:40 +0000 (UTC)
Subject: rpms/wireshark/F-9 .cvsignore, 1.19, 1.20 sources, 1.19,
	1.20 wireshark.spec, 1.36, 1.37
Message-ID: <20080910072040.3E4427012C@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/pkgs/rpms/wireshark/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16942

Modified Files:
	.cvsignore sources wireshark.spec 
Log Message:
upgrade to 1.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wireshark/F-9/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	11 Jul 2008 08:51:47 -0000	1.19
+++ .cvsignore	10 Sep 2008 07:20:09 -0000	1.20
@@ -1 +1 @@
-wireshark-1.0.2.tar.gz
+wireshark-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wireshark/F-9/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	11 Jul 2008 08:51:47 -0000	1.19
+++ sources	10 Sep 2008 07:20:09 -0000	1.20
@@ -1 +1 @@
-6045048aa8645d54d1a06bb20e0d23a3  wireshark-1.0.2.tar.gz
+a52b0c6c652ce7239bee879cd6ca02f0  wireshark-1.0.3.tar.gz


Index: wireshark.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wireshark/F-9/wireshark.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- wireshark.spec	11 Jul 2008 08:51:47 -0000	1.36
+++ wireshark.spec	10 Sep 2008 07:20:09 -0000	1.37
@@ -5,7 +5,7 @@
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
-Version:	1.0.2
+Version:	1.0.3
 Release: 	1%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
@@ -201,6 +201,12 @@
 
 
 %changelog
+* Wed Sep 10 2008 Radek Vok??l <rvokal at redhat.com> 1.0.3-1
+- upgrade to 1.0.3
+- Security-related bugs in the NCP dissector, zlib compression code, and Tektronix .rf5 file parser have been fixed. 
+- WPA group key decryption is now supported. 
+- A bug that could cause packets to be wrongly dissected as "Redback Lawful Intercept" has been fixed. 
+
 * Fri Jul 11 2008 Radek Vok??l <rvokal at redhat.com> 1.0.2-1
 - upgrade to 1.0.2, several security vulnarabilities fixed
 



From pkgdb at fedoraproject.org  Wed Sep 10 07:31:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 07:31:49 +0000
Subject: [pkgdb] supertuxkart ownership updated
Message-ID: <20080910073149.B09D3208E04@bastion.fedora.phx.redhat.com>

Package supertuxkart in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/supertuxkart



From pkgdb at fedoraproject.org  Wed Sep 10 07:31:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 07:31:50 +0000
Subject: [pkgdb] supertuxkart ownership updated
Message-ID: <20080910073150.5F6D5208E06@bastion.fedora.phx.redhat.com>

Package supertuxkart in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/supertuxkart



From pkgdb at fedoraproject.org  Wed Sep 10 07:31:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 07:31:52 +0000
Subject: [pkgdb] supertuxkart ownership updated
Message-ID: <20080910073152.D6374208E09@bastion.fedora.phx.redhat.com>

Package supertuxkart in Fedora 5 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/supertuxkart



From pkgdb at fedoraproject.org  Wed Sep 10 07:31:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 07:31:54 +0000
Subject: [pkgdb] supertuxkart ownership updated
Message-ID: <20080910073154.A794F208E0B@bastion.fedora.phx.redhat.com>

Package supertuxkart in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/supertuxkart



From pkgdb at fedoraproject.org  Wed Sep 10 07:31:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 07:31:56 +0000
Subject: [pkgdb] supertuxkart ownership updated
Message-ID: <20080910073156.3579F208E0D@bastion.fedora.phx.redhat.com>

Package supertuxkart in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/supertuxkart



From pkgdb at fedoraproject.org  Wed Sep 10 07:31:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 07:31:57 +0000
Subject: [pkgdb] supertuxkart ownership updated
Message-ID: <20080910073157.6DA0A208E11@bastion.fedora.phx.redhat.com>

Package supertuxkart in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/supertuxkart



From jwrdegoede at fedoraproject.org  Wed Sep 10 07:50:27 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 10 Sep 2008 07:50:27 +0000 (UTC)
Subject: rpms/cheese/devel cheese-2.23.90-only-list-resolutions-once.patch,
	1.1, NONE cheese-2.23.90-sort-resolutions.patch, 1.1, NONE
	cheese-2.23.91-cheese_webcam_get_supported_video_formats-shuffle.patch,
	1.1, NONE cheese-2.23.91-dont-use-non-capture-devices.patch, 1.1,
	NONE cheese-2.23.91-let-gstreamer-choose-yuv-or-rgb.patch, 1.1,
	NONE cheese-2.23.91-supported-resolutions-per-device.patch, 1.1,
	NONE libexecdir.patch, 1.1, NONE lockup.patch, 1.1,
	NONE stripmenot.patch, 1.1, NONE
Message-ID: <20080910075027.854E57012C@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/cheese/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18284

Removed Files:
	cheese-2.23.90-only-list-resolutions-once.patch 
	cheese-2.23.90-sort-resolutions.patch 
	cheese-2.23.91-cheese_webcam_get_supported_video_formats-shuffle.patch 
	cheese-2.23.91-dont-use-non-capture-devices.patch 
	cheese-2.23.91-let-gstreamer-choose-yuv-or-rgb.patch 
	cheese-2.23.91-supported-resolutions-per-device.patch 
	libexecdir.patch lockup.patch stripmenot.patch 
Log Message:
Remove no longer used patches from CVS


--- cheese-2.23.90-only-list-resolutions-once.patch DELETED ---


--- cheese-2.23.90-sort-resolutions.patch DELETED ---


--- cheese-2.23.91-cheese_webcam_get_supported_video_formats-shuffle.patch DELETED ---


--- cheese-2.23.91-dont-use-non-capture-devices.patch DELETED ---


--- cheese-2.23.91-let-gstreamer-choose-yuv-or-rgb.patch DELETED ---


--- cheese-2.23.91-supported-resolutions-per-device.patch DELETED ---


--- libexecdir.patch DELETED ---


--- lockup.patch DELETED ---


--- stripmenot.patch DELETED ---



From guthrie at fedoraproject.org  Wed Sep 10 07:55:50 2008
From: guthrie at fedoraproject.org (John T. Guthrie III)
Date: Wed, 10 Sep 2008 07:55:50 +0000 (UTC)
Subject: rpms/dxpc/F-8 .cvsignore, 1.4, 1.5 dxpc.spec, 1.16, 1.17 sources,
	1.7, 1.8
Message-ID: <20080910075550.7CE537012C@cvs1.fedora.phx.redhat.com>

Author: guthrie

Update of /cvs/pkgs/rpms/dxpc/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18567

Modified Files:
	.cvsignore dxpc.spec sources 
Log Message:
Updating software to 3.9.1-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dxpc/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Feb 2007 22:27:02 -0000	1.4
+++ .cvsignore	10 Sep 2008 07:55:20 -0000	1.5
@@ -1 +1 @@
-dxpc-3.9.1b1.tgz
+dxpc-3.9.1.tgz


Index: dxpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dxpc/F-8/dxpc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dxpc.spec	5 Feb 2007 17:01:59 -0000	1.16
+++ dxpc.spec	10 Sep 2008 07:55:20 -0000	1.17
@@ -1,19 +1,19 @@
 Summary: A Differential X Protocol Compressor
 Name:    dxpc
 Version: 3.9.1
-Release: 0.2.b1%{?dist}
+Release: 1%{?dist}
 
 License: BSD
 Group:   User Interface/X
-URL:     http://www.vigor.nu/dxpc/
-Source:  http://www.vigor.nu/dxpc-%{version}b1.tgz
+URL:     http://www.vigor.nu/%{name}/
+Source:  http://www.vigor.nu/%{name}/${version}/%{name}-%{version}.tgz
 Patch0: dxpc-3.9.0-mandir.patch
 Patch1: dxpc-3.9.0-dxpcssh.patch
 Patch2: dxpc-3.9.1b1-destdir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: lzo-devel >= 1.08
-%if "%{?fedora}" > "4"
+%if 0%{?fedora} > 4
 BuildRequires: libXt-devel
 %else
 BuildRequires: xorg-x11-devel
@@ -26,7 +26,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}b1
+%setup -q
 
 %patch0 -p1 -b .mandir
 %patch1 -p0 -b .dxpcssh
@@ -55,6 +55,10 @@
 
 
 %changelog
+* Wed Sep 10 2008 John Guthrie <guthrie[AT]counterexample.org> - 3.9.1-1
+- Upgraded source code to 3.9.1-1
+- Fix %%fedora string comparison to be integer comparison.
+
 * Sun Feb 04 2007 John Guthrie <guthrie[AT]counterexample.org> - 3.9.1-0.2.b1
 - Patched Makefile.in so that we can use the DESTDIR variable
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dxpc/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Feb 2007 22:27:02 -0000	1.7
+++ sources	10 Sep 2008 07:55:20 -0000	1.8
@@ -1 +1 @@
-b3ea5af52360a141c2c56182b99c6516  dxpc-3.9.1b1.tgz
+72597625b2dff38af1e6ec435372da79  dxpc-3.9.1.tgz



From caolanm at fedoraproject.org  Wed Sep 10 07:55:58 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 10 Sep 2008 07:55:58 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1645,1.1646
Message-ID: <20080910075558.21B677012C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18594

Modified Files:
	openoffice.org.spec 
Log Message:
jfreereport foo


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1645
retrieving revision 1.1646
diff -u -r1.1645 -r1.1646
--- openoffice.org.spec	9 Sep 2008 10:21:35 -0000	1.1645
+++ openoffice.org.spec	10 Sep 2008 07:55:27 -0000	1.1646
@@ -64,6 +64,7 @@
 BuildRequires:  mesa-libGLU-devel, redland-devel, ant, ant-apache-regexp
 BuildRequires:  jakarta-commons-codec, jakarta-commons-httpclient
 BuildRequires:  jakarta-commons-lang, poppler-devel
+BuildRequires:  pentaho-reporting-flow-engine
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  openoffice.org-multiliblauncher.sh
@@ -220,6 +221,7 @@
 %package report-builder
 Summary: Create database reports from %{name}
 Group: Applications/Productivity
+Requires: pentaho-reporting-flow-engine
 Requires: %{name}-base-core = %{epoch}:%{version}-%{release}
 
 %description report-builder
@@ -1317,10 +1319,7 @@
  --enable-minimizer --enable-presenter-console --enable-pdfimport \
  --enable-wiki-publisher --enable-report-builder --enable-vba \
  --with-vba-package-format="builtin" --with-system-libs \
- --with-system-headers --with-system-apache-commons \
- --with-commons-logging-jar=/usr/share/java/commons-logging.jar \
- --with-lucene-core-jar=/usr/share/java/lucene.jar \
- --with-lucene-analyzers-jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar \
+ --with-system-headers --with-system-jfreereport --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 \
@@ -1483,18 +1482,30 @@
 cd ../../
 
 # unpack report-builder extension
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/sun-report-builder.oxt
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/sun-report-builder.oxt
 unzip solver/%{OFFICEUPD}/unxlng*/bin/sun-report-builder.oxt -d $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/sun-report-builder.oxt
+pushd $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/sun-report-builder.oxt
+ln -sf %{_datadir}/java/flute.jar flute-1.3-jfree-20061107.jar
+ln -sf %{_datadir}/java/jcommon.jar jcommon-1.0.10.jar
+ln -sf %{_datadir}/java/jcommon-serializer.jar jcommon-serializer-0.2.0.jar
+ln -sf %{_datadir}/java/libfonts.jar libfonts-0.3.3.jar
+ln -sf %{_datadir}/java/libformula.jar libformula-0.1.14.jar
+ln -sf %{_datadir}/java/liblayout.jar liblayout-0.2.8.jar
+ln -sf %{_datadir}/java/libloader.jar libloader-0.3.6.jar
+ln -sf %{_datadir}/java/librepository.jar librepository-0.1.4.jar
+ln -sf %{_datadir}/java/libxml.jar libxml-0.9.9.jar
+ln -sf %{_datadir}/java/pentaho-reporting-flow-engine.jar pentaho-reporting-flow-engine-0.9.2.jar
+ln -sf %{_datadir}/java/sac.jar sac.jar
+popd
 
 # unpack wiki-publisher extension
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/wiki-publisher.oxt
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/wiki-publisher.oxt
 unzip solver/%{OFFICEUPD}/unxlng*/bin/swext/wiki-publisher.oxt -d $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/wiki-publisher.oxt
 pushd $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/wiki-publisher.oxt
-rm -rf commons-*.jar
-ln -s /usr/share/java/commons-codec.jar commons-codec-1.3.jar
-ln -s /usr/share/java/commons-httpclient.jar commons-httpclient-3.1.jar
-ln -s /usr/share/java/commons-lang.jar commons-lang-2.3.jar
-ln -s /usr/share/java/commons-logging.jar commons-logging-1.1.1.jar
+ln -sf %{_datadir}/java/commons-codec.jar commons-codec-1.3.jar
+ln -sf %{_datadir}/java/commons-httpclient.jar commons-httpclient-3.1.jar
+ln -sf %{_datadir}/java/commons-lang.jar commons-lang-2.3.jar
+ln -sf %{_datadir}/java/commons-logging.jar commons-logging-1.1.1.jar
 popd
 
 # unpack presentation-minimizer extension



From caolanm at fedoraproject.org  Wed Sep 10 07:58:44 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 10 Sep 2008 07:58:44 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1646,1.1647
Message-ID: <20080910075844.BE1CE7012C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19003

Modified Files:
	openoffice.org.spec 
Log Message:
add Basque spellchecker


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1646
retrieving revision 1.1647
diff -u -r1.1646 -r1.1647
--- openoffice.org.spec	10 Sep 2008 07:55:27 -0000	1.1646
+++ openoffice.org.spec	10 Sep 2008 07:58:14 -0000	1.1647
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 5
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -696,6 +696,7 @@
 Summary: Basque language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-eu
 Obsoletes: openoffice.org-langpack-eu
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-eu_ES
@@ -3661,6 +3662,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Sep 10 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-5.2
+- use system jfreereport
+- Basque spellchecker
+
 * Sun Sep 07 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-5.1
 - next candidate
 



From rvokal at fedoraproject.org  Wed Sep 10 08:23:47 2008
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Wed, 10 Sep 2008 08:23:47 +0000 (UTC)
Subject: rpms/wireshark/F-8 .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 wireshark.spec, 1.27, 1.28
Message-ID: <20080910082347.C9DB17012C@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/pkgs/rpms/wireshark/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20119

Modified Files:
	.cvsignore sources wireshark.spec 
Log Message:
upgrade to 1.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wireshark/F-8/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	18 Jul 2008 12:28:29 -0000	1.17
+++ .cvsignore	10 Sep 2008 08:23:17 -0000	1.18
@@ -1 +1 @@
-wireshark-1.0.2.tar.gz
+wireshark-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wireshark/F-8/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	18 Jul 2008 12:28:29 -0000	1.17
+++ sources	10 Sep 2008 08:23:17 -0000	1.18
@@ -1 +1 @@
-6045048aa8645d54d1a06bb20e0d23a3  wireshark-1.0.2.tar.gz
+a52b0c6c652ce7239bee879cd6ca02f0  wireshark-1.0.3.tar.gz


Index: wireshark.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wireshark/F-8/wireshark.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- wireshark.spec	18 Jul 2008 12:28:29 -0000	1.27
+++ wireshark.spec	10 Sep 2008 08:23:17 -0000	1.28
@@ -5,7 +5,7 @@
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
-Version:	1.0.2
+Version:	1.0.3
 Release: 	1%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
@@ -201,6 +201,9 @@
 
 
 %changelog
+* Wed Sep 10 2008 Radek Vok??l <rvokal at redhat.com> 1.0.3-1
+- upgrade to 1.0.3, fixes several security issues (#461254)
+
 * Fri Jul 18 2008 Radek Vok??l <rvokal at redhat.com> 1.0.2-1
 - upgrade to 1.0.2, fixes a few security issues
 



From ssp at fedoraproject.org  Wed Sep 10 08:26:54 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Wed, 10 Sep 2008 08:26:54 +0000 (UTC)
Subject: rpms/pixman/devel stripes.patch,NONE,1.1 pixman.spec,1.19,1.20
Message-ID: <20080910082654.652257012C@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/pixman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20405

Modified Files:
	pixman.spec 
Added Files:
	stripes.patch 
Log Message:
Fix bug causing stripes in nautilus selection rectangle

stripes.patch:

--- NEW FILE stripes.patch ---
commit 6f00d98f87c019849c611d27e9593c5eecfef4c2
Author: S??ren Sandmann Pedersen <sandmann at daimi.au.dk>
Date:   Tue Sep 9 10:49:56 2008 -0400

    Fix for bug 17477.
    
    over_2x128 was changing the alphaLo and alphaHi arguments, causing
    stripes.

diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
index 8a3e4b5..cc08189 100644
--- a/pixman/pixman-sse2.c
+++ b/pixman/pixman-sse2.c
@@ -244,9 +244,11 @@ invertColors_2x128 (__m128i dataLo, __m128i dataHi, __m128i* invLo, __m128i* inv
 static inline void
 over_2x128 (__m128i* srcLo, __m128i* srcHi, __m128i* alphaLo, __m128i* alphaHi, __m128i* dstLo, __m128i* dstHi)
 {
-    negate_2x128 (*alphaLo, *alphaHi, alphaLo, alphaHi);
+    __m128i t1, t2;
 
-    pixMultiply_2x128 (dstLo, dstHi, alphaLo, alphaHi, dstLo, dstHi);
+    negate_2x128 (*alphaLo, *alphaHi, &t1, &t2);
+
+    pixMultiply_2x128 (dstLo, dstHi, &t1, &t2, dstLo, dstHi);
 
     *dstLo = _mm_adds_epu8 (*srcLo, *dstLo);
     *dstHi = _mm_adds_epu8 (*srcHi, *dstHi);


Index: pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/pixman.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pixman.spec	7 Sep 2008 03:02:19 -0000	1.19
+++ pixman.spec	10 Sep 2008 08:26:23 -0000	1.20
@@ -15,6 +15,7 @@
 Source0:        pixman-%{version}.tar.gz
 Source1:	make-pixman-snapshot.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:		stripes.patch
 
 # BuildRequires:  automake autoconf libtool pkgconfig
 
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .stripes
 
 %build
 %configure --disable-static
@@ -61,6 +63,9 @@
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
+* Wed Sep 10 2008 Soren Sandmann <sandmann at redhat.com> 0.11.10-2
+- Add patch to fix stripes in the Nautilus selection retangle.
+
 * Sat Sep 6 2008 Soren Sandmann <sandmann at redhat.com> 0.11.10-1
 - Upgrade to 0.11.10. Drop altivec patch.
 



From ssp at fedoraproject.org  Wed Sep 10 08:27:49 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Wed, 10 Sep 2008 08:27:49 +0000 (UTC)
Subject: rpms/pixman/devel pixman.spec,1.20,1.21
Message-ID: <20080910082749.9477E7012C@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/pixman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20557

Modified Files:
	pixman.spec 
Log Message:
Bump release


Index: pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/pixman.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pixman.spec	10 Sep 2008 08:26:23 -0000	1.20
+++ pixman.spec	10 Sep 2008 08:27:19 -0000	1.21
@@ -3,7 +3,7 @@
 
 Name:           pixman
 Version:        0.11.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Pixel manipulation library
 
 Group:          System Environment/Libraries



From jwrdegoede at fedoraproject.org  Wed Sep 10 08:58:21 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 10 Sep 2008 08:58:21 +0000 (UTC)
Subject: rpms/gkrellm/devel gkrellm-openssl-license-exception.eml, NONE,
	1.1 gkrellm.spec, 1.16, 1.17
Message-ID: <20080910085821.CB7437012C@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gkrellm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22310

Modified Files:
	gkrellm.spec 
Added Files:
	gkrellm-openssl-license-exception.eml 
Log Message:
* Wed Sep 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.1-5
- Build against openssl instead of gnutls-openssl fixing symbol conflicts when
  using pam_ldap (which uses openssl), this fixes rh 446860



--- NEW FILE gkrellm-openssl-license-exception.eml ---
Return-Path: <billw at dslextreme.com>
Received: from koko.hhs.nl ([145.52.2.16] verified)
  by hhs.nl (CommuniGate Pro SMTP 4.3.6)
  with ESMTP id 90744876 for j.w.r.degoede at hhs.nl; Tue, 09 Sep 2008 02:20:32 +0200
Received: from exim (helo=koko)
	by koko.hhs.nl with local-smtp (Exim 4.62)
	(envelope-from <billw at dslextreme.com>)
	id 1Kcqy5-0006CE-C0
	for j.w.r.degoede at hhs.nl; Tue, 09 Sep 2008 02:20:29 +0200
Received: from [194.171.167.218] (port=40317 helo=filter2-til.mf.surf.net)
	by koko.hhs.nl with esmtp (Exim 4.62)
	(envelope-from <billw at dslextreme.com>)
	id 1Kcqy5-0006C8-36
	for j.w.r.degoede at hhs.nl; Tue, 09 Sep 2008 02:20:29 +0200
Received: from mail5.dslextreme.com (mail5.dslextreme.com [66.51.199.81])
	by filter2-til.mf.surf.net (8.13.8/8.13.8/Debian-3) with SMTP id m890KTBl001805
	for <j.w.r.degoede at hhs.nl>; Tue, 9 Sep 2008 02:20:30 +0200
Received: (qmail 10268 invoked from network); 9 Sep 2008 00:20:27 -0000
Received: from unknown (HELO localhost) (billw at 70.142.30.251)
	by mail5.dslextreme.com with SMTP; Mon, 08 Sep 2008 17:20:27 -0700
Date: Mon, 8 Sep 2008 19:20:26 -0500
From: Bill Wilson <billw at dslextreme.com>
To: Hans de Goede <j.w.r.degoede at hhs.nl>
Subject: Re: gkrellm openssl license exception?
Message-Id: <20080908192026.d5aa51a5.billw at dslextreme.com>
In-Reply-To: <48B2F6B0.30505 at hhs.nl>
References: <48B2F6B0.30505 at hhs.nl>
X-Mailer: Sylpheed 2.5.0 (GTK+ 2.12.11; i486-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-Canit-CHI2: 0.00
X-Bayes-Prob: 0.0001 (Score 0, tokens from: @@RPTN)
X-Spam-Score: 0.00 () [Tag at 8.00] 
X-CanItPRO-Stream: hhs:j.w.r.degoede at hhs.nl (inherits from hhs:default,base:default)
X-Canit-Stats-ID: 110670270 - 6f51dcc34c3c
X-Scanned-By: CanIt (www . roaringpenguin . com) on 194.171.167.218
X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 08092008 #1073355, status: clean

On Mon, 25 Aug 2008 20:15:12 +0200
Hans de Goede <j.w.r.degoede at hhs.nl> wrote:

> Don't know if you remember me, we've had some contact in the past. I'm the 
> Fedora gkrellm packahe maintainer, as well as the author of the lm_sensors-3.x 
> support for gkrellm.

Hi Hans,
Sure, I remember.

> I recently got this bug reported against gkrellm:
> https://bugzilla.redhat.com/show_bug.cgi?id=446860
> 
> The problem is, or I believe it to be, that when an application uses 
> libgnutls-openssl (such as gkrellm does) and then a library uses the real 
> openssl (for example glibc through nss_ldap, see bug) then in the nss_ldap 
> example, the later dlopen's nss_ldap starts using the openssl symbols from 
> gnutls instead of those from openssl, but they are not ABI compatible -> boom.
> 
> 
> So I would like to build and distribute gkrellm against the real openssl. 
> However as you probably know, according according to some the GPL and the 
> openssl library are not compatible. This can be fixed by adding a special 
> exception to the GPL such as the FSF for example has done for wget, quoting 
> from the wget license:
> 
> "In addition, as a special exception, the Free Software Foundation gives 
> permission to link the code of its release of Wget with the OpenSSL project's 
> "OpenSSL" library (or with modified versions of it that use the same license as 
> the "OpenSSL" library), and distribute the linked executables. You must obey 
> the GNU General Public License in all respects for all of the code used other 
> than "OpenSSL". If you modify this file, you may extend this exception to your 
> version of the file, but you are not obligated to do so. If you do not wish to 
> do so, delete this exception statement from your version."
> 
> This I wonder if you would be willing to add such an exception to the gkrellm 
> license, fixing the openssl license issues.

This is OK with me and I'll add a similar exception for linking OpenSSL to gkrellm
for the next release.

If you want to do an OpenSSL linked against the current gkrellm 2.3.1 package
for Fedora in the meantime, you can consider this email permission to do so.

Oh, and sorry for the delay in getting back to you.  I've been doing a lot of
house remodeling lately :(

Bill

-- 
http://gkrellm.net



Index: gkrellm.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gkrellm.spec	25 Jun 2008 07:06:43 -0000	1.16
+++ gkrellm.spec	10 Sep 2008 08:57:51 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -9,12 +9,13 @@
 Source1:        gkrellmd.init
 Source2:        gkrellm.desktop
 Source3:        gkrellm.png
+Source4:        gkrellm-openssl-license-exception.eml
 Patch1:         gkrellm-2.1.28-config.patch
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.2.9-libdir.patch
 Patch5:         gkrellm-2.3.1-netdb.patch
-BuildRequires:  gtk2-devel gnutls-devel libSM-devel desktop-file-utils gettext
+BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
 BuildRequires:  lm_sensors-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -63,6 +64,7 @@
 %patch3 -p1 -z .width
 %patch4 -p1 -z .libdir2
 %patch5 -p1 -z .netdb
+cp -a %{SOURCE4} .
 
 for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
    sed -i -e "s@/usr/lib/gkrellm2/plugins@%{_libdir}/gkrellm2/plugins@" $i
@@ -76,7 +78,8 @@
 
 %build
 make %{?_smp_mflags} INSTALLROOT=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \
-  INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
+  INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \
+  without-gnutls=1
 
 
 %install
@@ -148,6 +151,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYRIGHT Changelog README Themes.html
+%doc gkrellm-openssl-license-exception.eml
 %{_bindir}/%{name}
 %{_libdir}/gkrellm2
 %{_datadir}/gkrellm2
@@ -169,6 +173,10 @@
 
 
 %changelog
+* Wed Sep 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.1-5
+- Build against openssl instead of gnutls-openssl fixing symbol conflicts when
+  using pam_ldap (which uses openssl), this fixes rh 446860
+
 * Wed Jun 25 2008 Tomas Mraz <tmraz at redhat.com> 2.3.1-4
 - rebuild with new gnutls
 



From msuchy at fedoraproject.org  Wed Sep 10 08:58:32 2008
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Wed, 10 Sep 2008 08:58:32 +0000 (UTC)
Subject: rpms/perl-Set-Crontab/F-9 import.log, NONE,
	1.1 perl-Set-Crontab.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080910085832.BE3557012C@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/extras/rpms/perl-Set-Crontab/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22291/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Set-Crontab.spec 
Log Message:
inital commit to F9 branch



--- NEW FILE import.log ---
perl-Set-Crontab-1_02-1:F-9:perl-Set-Crontab-1.02-1.src.rpm:1221037052


--- NEW FILE perl-Set-Crontab.spec ---
Name:           perl-Set-Crontab
Version:        1.02
Release:        1%{?dist}
Summary:        Expand crontab(5)-style integer lists
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Set-Crontab/
Source0:        http://www.cpan.org/modules/by-module/Set/Set-Crontab-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Set::Crontab parses crontab-style lists of integers and defines some
utility functions to make it easier to deal with them.

%prep
%setup -q -n Set-Crontab-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Jul 31 2008 Miroslav Such?? <msuchy at redhat.com> 1.02-1
- Change license to "as Perl itself"

* Sun Jun 22 2008 Michael Stahnke <mastahnke at gmail.com> - 1.00-1
- Repackaging from Spacewalk repo to aid in Fedora packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-Crontab/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Aug 2008 04:36:22 -0000	1.1
+++ .cvsignore	10 Sep 2008 08:58:02 -0000	1.2
@@ -0,0 +1 @@
+Set-Crontab-1.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-Crontab/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Aug 2008 04:36:22 -0000	1.1
+++ sources	10 Sep 2008 08:58:02 -0000	1.2
@@ -0,0 +1 @@
+8217113ca6ad3633a326b1dbb136f99b  Set-Crontab-1.02.tar.gz



From msuchy at fedoraproject.org  Wed Sep 10 09:02:39 2008
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Wed, 10 Sep 2008 09:02:39 +0000 (UTC)
Subject: rpms/perl-Set-Crontab/EL-4 import.log, NONE,
	1.1 perl-Set-Crontab.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080910090239.8AB977012C@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/extras/rpms/perl-Set-Crontab/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22762/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Set-Crontab.spec 
Log Message:
Initial commit to EL-4 branch.



--- NEW FILE import.log ---
perl-Set-Crontab-1_02-1:EL-4:perl-Set-Crontab-1.02-1.src.rpm:1221037287


--- NEW FILE perl-Set-Crontab.spec ---
Name:           perl-Set-Crontab
Version:        1.02
Release:        1%{?dist}
Summary:        Expand crontab(5)-style integer lists
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Set-Crontab/
Source0:        http://www.cpan.org/modules/by-module/Set/Set-Crontab-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Set::Crontab parses crontab-style lists of integers and defines some
utility functions to make it easier to deal with them.

%prep
%setup -q -n Set-Crontab-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Jul 31 2008 Miroslav Such?? <msuchy at redhat.com> 1.02-1
- Change license to "as Perl itself"

* Sun Jun 22 2008 Michael Stahnke <mastahnke at gmail.com> - 1.00-1
- Repackaging from Spacewalk repo to aid in Fedora packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-Crontab/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Aug 2008 04:36:22 -0000	1.1
+++ .cvsignore	10 Sep 2008 09:02:04 -0000	1.2
@@ -0,0 +1 @@
+Set-Crontab-1.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-Crontab/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Aug 2008 04:36:22 -0000	1.1
+++ sources	10 Sep 2008 09:02:09 -0000	1.2
@@ -0,0 +1 @@
+8217113ca6ad3633a326b1dbb136f99b  Set-Crontab-1.02.tar.gz



From msuchy at fedoraproject.org  Wed Sep 10 09:05:03 2008
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Wed, 10 Sep 2008 09:05:03 +0000 (UTC)
Subject: rpms/perl-Set-Crontab/EL-5 import.log, NONE,
	1.1 perl-Set-Crontab.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080910090503.E02397012C@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/extras/rpms/perl-Set-Crontab/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23058/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Set-Crontab.spec 
Log Message:
Inital commit to EL-5 branch.



--- NEW FILE import.log ---
perl-Set-Crontab-1_02-1:EL-5:perl-Set-Crontab-1.02-1.src.rpm:1221037405


--- NEW FILE perl-Set-Crontab.spec ---
Name:           perl-Set-Crontab
Version:        1.02
Release:        1%{?dist}
Summary:        Expand crontab(5)-style integer lists
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Set-Crontab/
Source0:        http://www.cpan.org/modules/by-module/Set/Set-Crontab-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Set::Crontab parses crontab-style lists of integers and defines some
utility functions to make it easier to deal with them.

%prep
%setup -q -n Set-Crontab-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Jul 31 2008 Miroslav Such?? <msuchy at redhat.com> 1.02-1
- Change license to "as Perl itself"

* Sun Jun 22 2008 Michael Stahnke <mastahnke at gmail.com> - 1.00-1
- Repackaging from Spacewalk repo to aid in Fedora packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-Crontab/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Aug 2008 04:36:22 -0000	1.1
+++ .cvsignore	10 Sep 2008 09:04:33 -0000	1.2
@@ -0,0 +1 @@
+Set-Crontab-1.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-Crontab/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Aug 2008 04:36:22 -0000	1.1
+++ sources	10 Sep 2008 09:04:33 -0000	1.2
@@ -0,0 +1 @@
+8217113ca6ad3633a326b1dbb136f99b  Set-Crontab-1.02.tar.gz



From msuchy at fedoraproject.org  Wed Sep 10 09:07:18 2008
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Wed, 10 Sep 2008 09:07:18 +0000 (UTC)
Subject: rpms/perl-Set-Crontab/devel import.log, NONE,
	1.1 perl-Set-Crontab.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080910090718.82FF07012C@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/extras/rpms/perl-Set-Crontab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23535/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Set-Crontab.spec 
Log Message:
Inital commit to devel branch.



--- NEW FILE import.log ---
perl-Set-Crontab-1_02-1:HEAD:perl-Set-Crontab-1.02-1.src.rpm:1221037558


--- NEW FILE perl-Set-Crontab.spec ---
Name:           perl-Set-Crontab
Version:        1.02
Release:        1%{?dist}
Summary:        Expand crontab(5)-style integer lists
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Set-Crontab/
Source0:        http://www.cpan.org/modules/by-module/Set/Set-Crontab-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Set::Crontab parses crontab-style lists of integers and defines some
utility functions to make it easier to deal with them.

%prep
%setup -q -n Set-Crontab-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Jul 31 2008 Miroslav Such?? <msuchy at redhat.com> 1.02-1
- Change license to "as Perl itself"

* Sun Jun 22 2008 Michael Stahnke <mastahnke at gmail.com> - 1.00-1
- Repackaging from Spacewalk repo to aid in Fedora packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-Crontab/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Aug 2008 04:36:22 -0000	1.1
+++ .cvsignore	10 Sep 2008 09:06:48 -0000	1.2
@@ -0,0 +1 @@
+Set-Crontab-1.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-Crontab/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Aug 2008 04:36:22 -0000	1.1
+++ sources	10 Sep 2008 09:06:48 -0000	1.2
@@ -0,0 +1 @@
+8217113ca6ad3633a326b1dbb136f99b  Set-Crontab-1.02.tar.gz



From nigelj at fedoraproject.org  Wed Sep 10 09:08:15 2008
From: nigelj at fedoraproject.org (Nigel Jones)
Date: Wed, 10 Sep 2008 09:08:15 +0000 (UTC)
Subject: rpms/horde/devel horde.spec,1.10,1.11
Message-ID: <20080910090815.AC7E07012C@cvs1.fedora.phx.redhat.com>

Author: nigelj

Update of /cvs/pkgs/rpms/horde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23911/devel

Modified Files:
	horde.spec 
Log Message:
Make the apache config read a bit better


Index: horde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/horde/devel/horde.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- horde.spec	22 Jun 2008 04:35:42 -0000	1.10
+++ horde.spec	10 Sep 2008 09:07:45 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		horde
 Version:	3.2.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The common Horde Framework for all Horde applications
 
 Source0:	ftp://ftp.horde.org/pub/horde/tarballs/horde-%{version}.tar.gz
@@ -109,7 +109,7 @@
 		php-pear-Net-SMTP
 	(or install them individually)
 	- Increase memory_limit in %{_sysconfdir}/httpd/conf.d/%{name}.conf to 32M or higher
-	- Browse http://127.0.0.1/horde/test.php for additional suggestions
+	- Browse http://localhost.localdomain/horde/test.php for additional suggestions
 
 _EOF_
 
@@ -166,7 +166,10 @@
 Alias /%{name} %{_datadir}/%{name}
 
 <Directory %{_datadir}/%{name}>
-	# Comment out the following 3 lines to make Horde accessible from anywhere
+        # 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.
 	Order Deny,Allow
 	Deny from all
 	Allow from 127.0.0.1
@@ -250,6 +253,11 @@
 %doc README.Fedora
 
 %changelog
+* Wed Sep 10 2008 Nigel Jones <dev at nigelj.com> - 3.2.1-2
+- Change apache config file to better document why localhost is only
+  allowed by default
+- ***OTHER CHANGES HERE BEFORE BUILD***
+
 * Sun Jun 22 2008 Nigel Jones <dev at nigelj.com> - 3.2.1-1
 - New Upstream (3.2.1) - Security Updates mainly
 



From jwrdegoede at fedoraproject.org  Wed Sep 10 09:11:26 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 10 Sep 2008 09:11:26 +0000 (UTC)
Subject: rpms/gkrellm/F-9 gkrellm-openssl-license-exception.eml, NONE,
	1.1 gkrellm.spec, 1.15, 1.16
Message-ID: <20080910091126.59B497012C@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gkrellm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24107

Modified Files:
	gkrellm.spec 
Added Files:
	gkrellm-openssl-license-exception.eml 
Log Message:
* Wed Sep 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.1-5
- Build against openssl instead of gnutls-openssl fixing symbol conflicts when
  using pam_ldap (which uses openssl), this fixes rh 446860



--- NEW FILE gkrellm-openssl-license-exception.eml ---
Return-Path: <billw at dslextreme.com>
Received: from koko.hhs.nl ([145.52.2.16] verified)
  by hhs.nl (CommuniGate Pro SMTP 4.3.6)
  with ESMTP id 90744876 for j.w.r.degoede at hhs.nl; Tue, 09 Sep 2008 02:20:32 +0200
Received: from exim (helo=koko)
	by koko.hhs.nl with local-smtp (Exim 4.62)
	(envelope-from <billw at dslextreme.com>)
	id 1Kcqy5-0006CE-C0
	for j.w.r.degoede at hhs.nl; Tue, 09 Sep 2008 02:20:29 +0200
Received: from [194.171.167.218] (port=40317 helo=filter2-til.mf.surf.net)
	by koko.hhs.nl with esmtp (Exim 4.62)
	(envelope-from <billw at dslextreme.com>)
	id 1Kcqy5-0006C8-36
	for j.w.r.degoede at hhs.nl; Tue, 09 Sep 2008 02:20:29 +0200
Received: from mail5.dslextreme.com (mail5.dslextreme.com [66.51.199.81])
	by filter2-til.mf.surf.net (8.13.8/8.13.8/Debian-3) with SMTP id m890KTBl001805
	for <j.w.r.degoede at hhs.nl>; Tue, 9 Sep 2008 02:20:30 +0200
Received: (qmail 10268 invoked from network); 9 Sep 2008 00:20:27 -0000
Received: from unknown (HELO localhost) (billw at 70.142.30.251)
	by mail5.dslextreme.com with SMTP; Mon, 08 Sep 2008 17:20:27 -0700
Date: Mon, 8 Sep 2008 19:20:26 -0500
From: Bill Wilson <billw at dslextreme.com>
To: Hans de Goede <j.w.r.degoede at hhs.nl>
Subject: Re: gkrellm openssl license exception?
Message-Id: <20080908192026.d5aa51a5.billw at dslextreme.com>
In-Reply-To: <48B2F6B0.30505 at hhs.nl>
References: <48B2F6B0.30505 at hhs.nl>
X-Mailer: Sylpheed 2.5.0 (GTK+ 2.12.11; i486-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-Canit-CHI2: 0.00
X-Bayes-Prob: 0.0001 (Score 0, tokens from: @@RPTN)
X-Spam-Score: 0.00 () [Tag at 8.00] 
X-CanItPRO-Stream: hhs:j.w.r.degoede at hhs.nl (inherits from hhs:default,base:default)
X-Canit-Stats-ID: 110670270 - 6f51dcc34c3c
X-Scanned-By: CanIt (www . roaringpenguin . com) on 194.171.167.218
X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 08092008 #1073355, status: clean

On Mon, 25 Aug 2008 20:15:12 +0200
Hans de Goede <j.w.r.degoede at hhs.nl> wrote:

> Don't know if you remember me, we've had some contact in the past. I'm the 
> Fedora gkrellm packahe maintainer, as well as the author of the lm_sensors-3.x 
> support for gkrellm.

Hi Hans,
Sure, I remember.

> I recently got this bug reported against gkrellm:
> https://bugzilla.redhat.com/show_bug.cgi?id=446860
> 
> The problem is, or I believe it to be, that when an application uses 
> libgnutls-openssl (such as gkrellm does) and then a library uses the real 
> openssl (for example glibc through nss_ldap, see bug) then in the nss_ldap 
> example, the later dlopen's nss_ldap starts using the openssl symbols from 
> gnutls instead of those from openssl, but they are not ABI compatible -> boom.
> 
> 
> So I would like to build and distribute gkrellm against the real openssl. 
> However as you probably know, according according to some the GPL and the 
> openssl library are not compatible. This can be fixed by adding a special 
> exception to the GPL such as the FSF for example has done for wget, quoting 
> from the wget license:
> 
> "In addition, as a special exception, the Free Software Foundation gives 
> permission to link the code of its release of Wget with the OpenSSL project's 
> "OpenSSL" library (or with modified versions of it that use the same license as 
> the "OpenSSL" library), and distribute the linked executables. You must obey 
> the GNU General Public License in all respects for all of the code used other 
> than "OpenSSL". If you modify this file, you may extend this exception to your 
> version of the file, but you are not obligated to do so. If you do not wish to 
> do so, delete this exception statement from your version."
> 
> This I wonder if you would be willing to add such an exception to the gkrellm 
> license, fixing the openssl license issues.

This is OK with me and I'll add a similar exception for linking OpenSSL to gkrellm
for the next release.

If you want to do an OpenSSL linked against the current gkrellm 2.3.1 package
for Fedora in the meantime, you can consider this email permission to do so.

Oh, and sorry for the delay in getting back to you.  I've been doing a lot of
house remodeling lately :(

Bill

-- 
http://gkrellm.net



Index: gkrellm.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/F-9/gkrellm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gkrellm.spec	13 Feb 2008 19:26:02 -0000	1.15
+++ gkrellm.spec	10 Sep 2008 09:10:56 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.1
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -9,12 +9,13 @@
 Source1:        gkrellmd.init
 Source2:        gkrellm.desktop
 Source3:        gkrellm.png
+Source4:        gkrellm-openssl-license-exception.eml
 Patch1:         gkrellm-2.1.28-config.patch
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.2.9-libdir.patch
 Patch5:         gkrellm-2.3.1-netdb.patch
-BuildRequires:  gtk2-devel gnutls-devel libSM-devel desktop-file-utils gettext
+BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
 BuildRequires:  lm_sensors-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -63,6 +64,7 @@
 %patch3 -p1 -z .width
 %patch4 -p1 -z .libdir2
 %patch5 -p1 -z .netdb
+cp -a %{SOURCE4} .
 
 for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
    sed -i -e "s@/usr/lib/gkrellm2/plugins@%{_libdir}/gkrellm2/plugins@" $i
@@ -76,7 +78,8 @@
 
 %build
 make %{?_smp_mflags} INSTALLROOT=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \
-  INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
+  INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \
+  without-gnutls=1
 
 
 %install
@@ -148,6 +151,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYRIGHT Changelog README Themes.html
+%doc gkrellm-openssl-license-exception.eml
 %{_bindir}/%{name}
 %{_libdir}/gkrellm2
 %{_datadir}/gkrellm2
@@ -169,6 +173,13 @@
 
 
 %changelog
+* Wed Sep 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.1-5
+- Build against openssl instead of gnutls-openssl fixing symbol conflicts when
+  using pam_ldap (which uses openssl), this fixes rh 446860
+
+* Wed Jun 25 2008 Tomas Mraz <tmraz at redhat.com> 2.3.1-4
+- rebuild with new gnutls
+
 * Wed Feb 13 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.1-3
 - Fix building with latest glibc
 - Rebuild for gcc 4.3



From caolanm at fedoraproject.org  Wed Sep 10 09:20:17 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 10 Sep 2008 09:20:17 +0000 (UTC)
Subject: rpms/mythes-sk/devel .cvsignore, 1.2, 1.3 mythes-sk.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080910092017.980537012C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-sk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24827

Modified Files:
	.cvsignore mythes-sk.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Nov 2007 08:11:44 -0000	1.2
+++ .cvsignore	10 Sep 2008 09:19:47 -0000	1.3
@@ -1 +1 @@
-thes_sk_SK_v2.zip
+OOo-Thesaurus2-sk_SK.zip


Index: mythes-sk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sk/devel/mythes-sk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythes-sk.spec	30 Nov 2007 08:11:44 -0000	1.1
+++ mythes-sk.spec	10 Sep 2008 09:19:47 -0000	1.2
@@ -1,11 +1,11 @@
 Name: mythes-sk
 Summary: Slovak thesarus
-%define upstreamid 20050503
+%define upstreamid 20080905
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
-Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/thes_sk_SK_v2.zip
+Source: http://www.sk-spell.sk.cx/thesaurus/download/OOo-Thesaurus2-sk_SK.zip
 Group: Applications/Text
-URL: http://rak.bb.euroweb.sk/~zdpo/thesaurus
+URL: http://www.sk-spell.sk.cx/thesaurus/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python, perl
 License: BSD
@@ -18,23 +18,27 @@
 %setup -q -c
 
 %build
-tr -d '\r' < README_th_sk_SK_v2.txt > README_th_sk_SK_v2.txt.new
-iconv -f ISO-8859-2 -t UTF-8 README_th_sk_SK_v2.txt.new > README_th_sk_SK_v2.txt
+tr -d '\r' < README_th_sk_SK.txt > README_th_sk_SK.txt.new
+mv -f README_th_sk_SK.txt.new README_th_sk_SK.txt
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mythes
-cp -p th_sk_SK_v2.* $RPM_BUILD_ROOT/%{_datadir}/mythes
+cp -p th_sk_SK.idx $RPM_BUILD_ROOT/%{_datadir}/mythes/th_sk_SK_v2.idx
+cp -p th_sk_SK.dat $RPM_BUILD_ROOT/%{_datadir}/mythes/th_sk_SK_v2.dat
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README_th_sk_SK_v2.txt
+%doc README_th_sk_SK.txt
 %dir %{_datadir}/mythes
 %{_datadir}/mythes/*
 
 %changelog
+* Wed Sep 10 2008 Caolan McNamara <caolanm at redhat.com> - 0.20080905-1
+- latest version
+
 * Wed Nov 28 2007 Caolan McNamara <caolanm at redhat.com> - 0.20050503-1
 - initial version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Nov 2007 08:11:44 -0000	1.2
+++ sources	10 Sep 2008 09:19:47 -0000	1.3
@@ -1 +1 @@
-26c67da6fd2fe486a2ad90e51f3c9446  thes_sk_SK_v2.zip
+b7c18824f248f940fd6e5fdcc5d92dd6  OOo-Thesaurus2-sk_SK.zip



From than at fedoraproject.org  Wed Sep 10 09:44:14 2008
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 10 Sep 2008 09:44:14 +0000 (UTC)
Subject: rpms/kde-plasma-lancelot/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20080910094414.956107012C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-plasma-lancelot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26244

Modified Files:
	.cvsignore sources 
Log Message:
1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-plasma-lancelot/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2008 23:42:11 -0000	1.1
+++ .cvsignore	10 Sep 2008 09:43:44 -0000	1.2
@@ -0,0 +1 @@
+lancelot-1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-plasma-lancelot/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2008 23:42:11 -0000	1.1
+++ sources	10 Sep 2008 09:43:44 -0000	1.2
@@ -0,0 +1 @@
+20ad6b20817ac0f0e6903930c27e7d85  lancelot-1.0.tar.bz2



From than at fedoraproject.org  Wed Sep 10 09:44:33 2008
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 10 Sep 2008 09:44:33 +0000 (UTC)
Subject: rpms/kde-plasma-lancelot/devel kde-plasma-lancelot.spec,NONE,1.1
Message-ID: <20080910094433.A1EF77012C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-plasma-lancelot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26311

Added Files:
	kde-plasma-lancelot.spec 
Log Message:
1.0



--- NEW FILE kde-plasma-lancelot.spec ---
Name:           kde-plasma-lancelot
Version:        1.0
Release:        1%{?dist}
Summary:        An alternative application launcher

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://www.kde-apps.org/content/show.php/Lancelot?content=87914
Source0:        http://downloads.sourceforge.net/lancelot-menu/lancelot-1.0.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kde-filesystem >= 4
BuildRequires:  kdelibs4-devel >= 4.1
BuildRequires:  kdebase-workspace-devel >= 4.1
BuildRequires:  python
BuildRequires:  cmake

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
An alternative application launcher.

%prep
%setup -qn lancelot

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd


make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot} -C %{_target_platform}

# don't include devel stuff
rm -fr %{buildroot}%{_kde4_libdir}/liblancelot.so %{buildroot}%{_includedir}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc TODO COPYING
%{_bindir}/lancelot
%{_kde4_libdir}/kde4/plasma_applet_lancelot_launcher.so
%{_kde4_libdir}/kde4/plasma_applet_lancelot_part.so
%{_kde4_libdir}/liblancelot.so.0
%{_kde4_libdir}/liblancelot.so.0.5.0
%{_kde4_datadir}/dbus-1/services/org.kde.lancelot.service
%{_kde4_datadir}/mime/packages/lancelotpart-mime.xml
%{_kde4_datadir}/kde4/services/plasma-applet-lancelot-launcher.desktop
%{_kde4_datadir}/kde4/services/plasma-applet-lancelot-part.desktop
%{_kde4_iconsdir}/hicolor/*/apps/lancelot.png
%{_kde4_iconsdir}/hicolor/*/apps/lancelot-part.png
%{_kde4_appsdir}/desktoptheme/default/lancelot/


%changelog
* Wed Sep 03 2008 Than Ngo <than at redhat.com> 1.0-1
- 1.0

* Tue Aug 19 2008 Florian Sievert <info at floriansievert.de> - svn20080819
- update version to fix lancelot part

* Mon Aug 18 2008 Florian Sievert <info at floriansievert.de> - svn20080818
- update version to > M2 1/2

* Tue Aug 05 2008 Florian Sievert <info at floriansievert.de> - svn20080805
- initial version



From ndim at fedoraproject.org  Wed Sep 10 09:54:20 2008
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Wed, 10 Sep 2008 09:54:20 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.91,1.92 comps-f9.xml.in,1.386,1.387
Message-ID: <20080910095420.DE8AA7012C@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26764

Modified Files:
	comps-f10.xml.in comps-f9.xml.in 
Log Message:
Add nted (Musical score editor) to sound-and-video



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- comps-f10.xml.in	9 Sep 2008 21:31:33 -0000	1.91
+++ comps-f10.xml.in	10 Sep 2008 09:53:50 -0000	1.92
@@ -3829,6 +3829,7 @@
       <packagereq type="optional">Miro</packagereq>
       <packagereq type="optional">muine</packagereq>
       <packagereq type="optional">mybashburn</packagereq>
+      <packagereq type="optional">nted</packagereq>
       <packagereq type="optional">nyquist</packagereq>
       <packagereq type="optional">padevchooser</packagereq>
       <packagereq type="optional">paman</packagereq>


Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- comps-f9.xml.in	31 Aug 2008 13:24:45 -0000	1.386
+++ comps-f9.xml.in	10 Sep 2008 09:53:50 -0000	1.387
@@ -3614,6 +3614,7 @@
       <packagereq type="optional">Miro</packagereq>
       <packagereq type="optional">muine</packagereq>
       <packagereq type="optional">mybashburn</packagereq>
+      <packagereq type="optional">nted</packagereq>
       <packagereq type="optional">nyquist</packagereq>
       <packagereq type="optional">padevchooser</packagereq>
       <packagereq type="optional">paman</packagereq>



From than at fedoraproject.org  Wed Sep 10 09:59:12 2008
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 10 Sep 2008 09:59:12 +0000 (UTC)
Subject: rpms/kde-plasma-lancelot/F-9 kde-plasma-lancelot.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20080910095912.D01467012C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-plasma-lancelot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26992

Modified Files:
	sources 
Added Files:
	kde-plasma-lancelot.spec 
Log Message:
1.0



--- NEW FILE kde-plasma-lancelot.spec ---
Name:           kde-plasma-lancelot
Version:        1.0
Release:        1%{?dist}
Summary:        An alternative application launcher

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://www.kde-apps.org/content/show.php/Lancelot?content=87914
Source0:        http://downloads.sourceforge.net/lancelot-menu/lancelot-1.0.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kde-filesystem >= 4
BuildRequires:  kdelibs4-devel >= 4.1
BuildRequires:  kdebase-workspace-devel >= 4.1
BuildRequires:  python
BuildRequires:  cmake

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
An alternative application launcher.

%prep
%setup -qn lancelot

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd


make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot} -C %{_target_platform}

# don't include devel stuff
rm -fr %{buildroot}%{_kde4_libdir}/liblancelot.so %{buildroot}%{_includedir}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc TODO COPYING
%{_bindir}/lancelot
%{_kde4_libdir}/kde4/plasma_applet_lancelot_launcher.so
%{_kde4_libdir}/kde4/plasma_applet_lancelot_part.so
%{_kde4_libdir}/liblancelot.so.0
%{_kde4_libdir}/liblancelot.so.0.5.0
%{_kde4_datadir}/dbus-1/services/org.kde.lancelot.service
%{_kde4_datadir}/mime/packages/lancelotpart-mime.xml
%{_kde4_datadir}/kde4/services/plasma-applet-lancelot-launcher.desktop
%{_kde4_datadir}/kde4/services/plasma-applet-lancelot-part.desktop
%{_kde4_iconsdir}/hicolor/*/apps/lancelot.png
%{_kde4_iconsdir}/hicolor/*/apps/lancelot-part.png
%{_kde4_appsdir}/desktoptheme/default/lancelot/


%changelog
* Wed Sep 03 2008 Than Ngo <than at redhat.com> 1.0-1
- 1.0

* Tue Aug 19 2008 Florian Sievert <info at floriansievert.de> - svn20080819
- update version to fix lancelot part

* Mon Aug 18 2008 Florian Sievert <info at floriansievert.de> - svn20080818
- update version to > M2 1/2

* Tue Aug 05 2008 Florian Sievert <info at floriansievert.de> - svn20080805
- initial version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-plasma-lancelot/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2008 23:42:11 -0000	1.1
+++ sources	10 Sep 2008 09:58:42 -0000	1.2
@@ -0,0 +1 @@
+20ad6b20817ac0f0e6903930c27e7d85  lancelot-1.0.tar.bz2



From ovasik at fedoraproject.org  Wed Sep 10 10:19:58 2008
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed, 10 Sep 2008 10:19:58 +0000 (UTC)
Subject: rpms/quota/devel quota.spec,1.45,1.46
Message-ID: <20080910101958.CCC1D7012C@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/quota/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28261

Modified Files:
	quota.spec 
Log Message:
fix rpmlint warnings, rquota headers and manpage now in devel subpackage (#226353)


Index: quota.spec
===================================================================
RCS file: /cvs/extras/rpms/quota/devel/quota.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- quota.spec	27 Aug 2008 13:02:58 -0000	1.45
+++ quota.spec	10 Sep 2008 10:19:28 -0000	1.46
@@ -5,7 +5,7 @@
 Summary: System administration tools for monitoring users' disk usage
 Epoch: 1
 Version: 3.16
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD and GPLv2+
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -27,6 +27,18 @@
 The quota package contains system administration tools for monitoring
 and limiting user and or group disk usage per filesystem.
 
+%package devel
+Summary: Development files for quota
+Group: System Environment/Base
+Requires: quota =  %{epoch}:%{version}-%{release}
+
+%description devel
+The quota package contains system administration tools for monitoring
+and limiting user and or group disk usage per filesystem.
+
+This package contains development header files for implementing quotas
+on remote machines.
+
 
 %prep
 %setup -q -n quota-tools
@@ -73,7 +85,7 @@
 rm -f %{buildroot}%{_sbindir}/xqmstats
 rm -f %{buildroot}%{_mandir}/man8/quot.*
 rm -f %{buildroot}%{_mandir}/man8/xqmstats.*
-ln -s  %{_mandir}/man8/quotaon.8 \
+ln -sf  ./quotaon.8 \
   %{buildroot}%{_mandir}/man8/quotaoff.8
 
 %find_lang %{name}
@@ -83,20 +95,27 @@
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/*
 %attr(0755,root,root) /sbin/*
 %attr(0755,root,root) %{_bindir}/*
 %attr(0755,root,root) %{_sbindir}/*
-%dir %{_includedir}/rpcsvc
-%{_includedir}/rpcsvc/*
 %attr(0644,root,root) %{_mandir}/man1/*
 %attr(0644,root,root) %{_mandir}/man2/*
-%attr(0644,root,root) %{_mandir}/man3/*
 %attr(0644,root,root) %{_mandir}/man8/*
 
+%files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/rpcsvc
+%{_includedir}/rpcsvc/*
+%attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 10 2008 Ondrej Vasik <ovasik at redhat.com> 1:3.16-5
+- fix rpmlint warnings - absolute symlink and not using epoch
+  in version in changelog (#226353)
+- rquota headers and manpage now in devel subpackage
+
 * Wed Aug 27 2008 Ondrej Vasik <ovasik at redhat.com> 3.16-4
 - fix bug in warnquota which could result in bogus hostname
   and domainname (upstream)



From berrange at fedoraproject.org  Wed Sep 10 10:24:40 2008
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Wed, 10 Sep 2008 10:24:40 +0000 (UTC)
Subject: rpms/perl-Data-Section/devel perl-Data-Section.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080910102440.0D5C37012C@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/perl-Data-Section/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28689

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Data-Section.spec 
Log Message:
Initial import of perl-Data-Section after review (rhbz #461303)


--- NEW FILE perl-Data-Section.spec ---
Name:           perl-Data-Section
Version:        0.005
Release:        2%{?dist}
Summary:        Read multiple hunks of data out of your DATA section
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Data-Section/
Source0:        http://www.cpan.org/modules/by-module/Data/Data-Section-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Sub::Exporter) >= 0.979
BuildRequires:  perl(Test::More)
Requires:       perl(Sub::Exporter) >= 0.979
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Data::Section provides an easy way to access multiple named chunks of line-
oriented data in your module's DATA section. It was written to allow
modules to store their own templates, but probably has other uses.

%prep
%setup -q -n Data-Section-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Sep 06 2008 Daniel P. Berrange <berrange at redhat.com> 0.005-2
- Add Test::More BR

* Fri Sep 05 2008 Daniel P. Berrange <berrange at redhat.com> 0.005-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Section/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 02:20:49 -0000	1.1
+++ .cvsignore	10 Sep 2008 10:24:09 -0000	1.2
@@ -0,0 +1,4 @@
+Data-Section-0.005.tar.gz
+noarch
+.build*.log
+*.rpm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Section/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 02:20:49 -0000	1.1
+++ sources	10 Sep 2008 10:24:09 -0000	1.2
@@ -0,0 +1 @@
+9206d32770fbb96fa717f8c4399f74ef  Data-Section-0.005.tar.gz



From ssp at fedoraproject.org  Wed Sep 10 10:30:12 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Wed, 10 Sep 2008 10:30:12 +0000 (UTC)
Subject: rpms/gtk2/devel gtk+-2.14.1-no-randr.patch, NONE, 1.1 gtk2.spec,
	1.320, 1.321
Message-ID: <20080910103012.97B277012C@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29177

Modified Files:
	gtk2.spec 
Added Files:
	gtk+-2.14.1-no-randr.patch 
Log Message:
Remove use of randr in init_multihead

gtk+-2.14.1-no-randr.patch:

--- NEW FILE gtk+-2.14.1-no-randr.patch ---
Index: gdk/x11/gdkscreen-x11.c
===================================================================
--- gdk/x11/gdkscreen-x11.c	(revision 21333)
+++ gdk/x11/gdkscreen-x11.c	(working copy)
@@ -664,81 +664,6 @@
 }
 
 static gboolean
-init_randr12 (GdkScreen *screen)
-{
-#ifdef HAVE_RANDR
-  GdkDisplay *display = gdk_screen_get_display (screen);
-  GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
-  GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
-  Display *dpy = GDK_SCREEN_XDISPLAY (screen);
-  XRRScreenResources *resources;
-  int i;
-  GArray *monitors;
-  gboolean randr12_compat = FALSE;
-
-  if (!display_x11->have_randr12)
-      return FALSE;
-
-  resources = XRRGetScreenResources (screen_x11->xdisplay,
-				     screen_x11->xroot_window);
-  if (!resources)
-    return FALSE;
-  
-  monitors = g_array_sized_new (FALSE, TRUE, sizeof (GdkX11Monitor),
-                                resources->noutput);
-
-  for (i = 0; i < resources->noutput; ++i)
-    {
-      XRROutputInfo *output =
-	XRRGetOutputInfo (dpy, resources, resources->outputs[i]);
-
-      /* Non RandR1.2 X driver have output name "default" */
-      randr12_compat |= !g_strcmp0(output->name, "default");
-
-      if (output->crtc)
-	{
-	  GdkX11Monitor monitor;
-	  XRRCrtcInfo *crtc = XRRGetCrtcInfo (dpy, resources, output->crtc);
-
-	  monitor.geometry.x = crtc->x;
-	  monitor.geometry.y = crtc->y;
-	  monitor.geometry.width = crtc->width;
-	  monitor.geometry.height = crtc->height;
-
-	  /* FIXME: fill this out properly - need EDID parser */
-	  monitor.output = resources->outputs[i];
-	  monitor.width_mm = -1;
-	  monitor.height_mm = -1;
-	  monitor.output_name = NULL;
-	  monitor.manufacturer = NULL;
-
-	  g_array_append_val (monitors, monitor);
-
-          XRRFreeCrtcInfo (crtc);
-	}
-
-      XRRFreeOutputInfo (output);
-    }
-
-  XRRFreeScreenResources (resources);
-
-  /* non RandR 1.2 X driver doesn't return any usable multihead data */
-  if (randr12_compat)
-    {
-      g_array_free (monitors, TRUE);
-      return FALSE;
-    }
-
-  screen_x11->n_monitors = monitors->len;
-  screen_x11->monitors = (GdkX11Monitor *)g_array_free (monitors, FALSE);
-
-  return TRUE;
-#endif
-  
-  return FALSE;
-}
-
-static gboolean
 init_solaris_xinerama (GdkScreen *screen)
 {
 #ifdef HAVE_SOLARIS_XINERAMA
@@ -861,14 +786,14 @@
    *  3. Solaris Xinerama
    *  4. XFree86/Xorg Xinerama
    *
-   * We use them in that order.
+   * However, there are performance issues with calling
+   * XRRGetScreenResources() every time an application starts,
+   * so in the RandR case we simply rely on the information being
+   * exported through Xinerama as well.
    */
   if (init_fake_xinerama (screen))
     return;
 
-  if (init_randr12 (screen))
-    return;
-
   if (XQueryExtension (GDK_SCREEN_XDISPLAY (screen), "XINERAMA",
 		       &opcode, &firstevent, &firsterror))
     {


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- gtk2.spec	5 Sep 2008 14:08:48 -0000	1.320
+++ gtk2.spec	10 Sep 2008 10:29:42 -0000	1.321
@@ -16,7 +16,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.14/gtk+-%{version}.tar.bz2
@@ -32,6 +32,7 @@
 Patch2: workaround.patch
 # fixed upstream
 Patch3: init-deadlock.patch
+Patch4: gtk+-2.14.1-no-randr.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -118,6 +119,7 @@
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
 %patch3 -p0 -b .init-deadlock
+%patch4 -p0 -b .no-randr
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .



From berrange at fedoraproject.org  Wed Sep 10 10:37:09 2008
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Wed, 10 Sep 2008 10:37:09 +0000 (UTC)
Subject: rpms/perl-Data-Section/F-9 perl-Data-Section.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080910103709.EBD837012C@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/perl-Data-Section/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29583

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Data-Section.spec 
Log Message:
Initial import of perl-Data-Section after review (rhbz #461303)


--- NEW FILE perl-Data-Section.spec ---
Name:           perl-Data-Section
Version:        0.005
Release:        2%{?dist}
Summary:        Read multiple hunks of data out of your DATA section
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Data-Section/
Source0:        http://www.cpan.org/modules/by-module/Data/Data-Section-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Sub::Exporter) >= 0.979
BuildRequires:  perl(Test::More)
Requires:       perl(Sub::Exporter) >= 0.979
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Data::Section provides an easy way to access multiple named chunks of line-
oriented data in your module's DATA section. It was written to allow
modules to store their own templates, but probably has other uses.

%prep
%setup -q -n Data-Section-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Sep 06 2008 Daniel P. Berrange <berrange at redhat.com> 0.005-2
- Add Test::More BR

* Fri Sep 05 2008 Daniel P. Berrange <berrange at redhat.com> 0.005-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Section/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 02:20:49 -0000	1.1
+++ .cvsignore	10 Sep 2008 10:36:39 -0000	1.2
@@ -0,0 +1,4 @@
+Data-Section-0.005.tar.gz
+noarch
+.build*.log
+*.rpm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Section/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 02:20:49 -0000	1.1
+++ sources	10 Sep 2008 10:36:39 -0000	1.2
@@ -0,0 +1 @@
+9206d32770fbb96fa717f8c4399f74ef  Data-Section-0.005.tar.gz



From airlied at fedoraproject.org  Wed Sep 10 10:47:51 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed, 10 Sep 2008 10:47:51 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xserver-1.5.0-exa-master-upgrade.patch, 
	NONE, 1.1 xorg-x11-server.spec, 1.346, 1.347
Message-ID: <20080910104752.01B6A7012C@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-serv30175

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.0-exa-master-upgrade.patch 
Log Message:
* Wed Sep 10 2008 Dave Airlie <airlied at redhat.com> 1.5.0-2
- bring master exa back


xserver-1.5.0-exa-master-upgrade.patch:

--- NEW FILE xserver-1.5.0-exa-master-upgrade.patch ---
>From e99347a3e82e6db47dd482169b6799968afc3893 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Wed, 20 Aug 2008 10:11:07 -0400
Subject: [PATCH] Upgrade to master EXA

---


diff --git a/exa/Makefile.am b/exa/Makefile.am
index e2f7ed3..2b3f1e4 100644
--- a/exa/Makefile.am
+++ b/exa/Makefile.am
@@ -18,6 +18,7 @@ libexa_la_SOURCES = \
 	exa.c \
 	exa.h \
 	exa_accel.c \
+	exa_glyphs.c \
 	exa_migration.c \
 	exa_offscreen.c \
 	exa_render.c \
diff --git a/exa/exa.c b/exa/exa.c
index ccf148a..12c1549 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -35,8 +35,6 @@
 #include <stdlib.h>
 
 #include "exa_priv.h"
-#include <X11/fonts/fontstruct.h>
-#include "dixfontstr.h"
 #include "exa.h"
 #include "cw.h"
 
@@ -161,7 +159,7 @@ exaPixmapDirty (PixmapPtr pPix, int x1, int y1, int x2, int y2)
     RegionPtr pDamageReg;
     RegionRec region;
 
-    if (!pExaPixmap)
+    if (!pExaPixmap || !pExaPixmap->pDamage)
 	return;
 	
     box.x1 = max(x1, 0);
@@ -261,6 +259,21 @@ exaSetFbPitch(ExaScreenPrivPtr pExaScr, ExaPixmapPrivPtr pExaPixmap,
                                      pExaScr->info->pixmapPitchAlign);
 }
 
+
+static void
+ExaDamageReport(DamagePtr pDamage, RegionPtr pReg, void *pClosure)
+{
+    PixmapPtr pPixmap = pClosure;
+    ExaPixmapPriv(pPixmap);
+    RegionPtr pDamageReg = DamageRegion(pDamage);
+
+    if (pExaPixmap->pendingDamage) {
+	REGION_UNION(pScreen, pDamageReg, pDamageReg, pReg);
+	pExaPixmap->pendingDamage = FALSE;
+    }
+}
+
+
 /**
  * exaCreatePixmap() creates a new pixmap.
  *
@@ -321,6 +334,7 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
                                        paddedWidth, NULL);
         pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED;
         pExaPixmap->fb_ptr = NULL;
+        pExaPixmap->pDamage = NULL;
     } else {
         pExaPixmap->driverPriv = NULL;
         /* Scratch pixmaps may have w/h equal to zero, and may not be
@@ -345,21 +359,22 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
 	     fbDestroyPixmap(pPixmap);
 	     return NULL;
         }
-    }
- 
-    pExaPixmap->area = NULL;
 
-    /* Set up damage tracking */
-    pExaPixmap->pDamage = DamageCreate (NULL, NULL, DamageReportNone, TRUE,
-					pScreen, pPixmap);
+	/* Set up damage tracking */
+	pExaPixmap->pDamage = DamageCreate (ExaDamageReport, NULL,
+					    DamageReportRawRegion, TRUE,
+					    pScreen, pPixmap);
 
-    if (pExaPixmap->pDamage == NULL) {
-	fbDestroyPixmap (pPixmap);
-	return NULL;
-    }
+	if (pExaPixmap->pDamage == NULL) {
+	    fbDestroyPixmap (pPixmap);
+	    return NULL;
+	}
 
-    DamageRegister (&pPixmap->drawable, pExaPixmap->pDamage);
-    DamageSetReportAfterOp (pExaPixmap->pDamage, TRUE);
+	DamageRegister (&pPixmap->drawable, pExaPixmap->pDamage);
+	DamageSetReportAfterOp (pExaPixmap->pDamage, TRUE);
+    }
+ 
+    pExaPixmap->area = NULL;
 
     /* None of the pixmap bits are valid initially */
     REGION_NULL(pScreen, &pExaPixmap->validSys);
@@ -656,34 +671,25 @@ exaCreateGC (GCPtr pGC)
     return TRUE;
 }
 
-void
-exaPrepareAccessWindow(WindowPtr pWin)
+static Bool
+exaChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
 {
-    if (pWin->backgroundState == BackgroundPixmap) 
+    Bool ret;
+
+    if ((mask & CWBackPixmap) && pWin->backgroundState == BackgroundPixmap) 
         exaPrepareAccess(&pWin->background.pixmap->drawable, EXA_PREPARE_SRC);
 
-    if (pWin->borderIsPixel == FALSE)
-        exaPrepareAccess(&pWin->border.pixmap->drawable, EXA_PREPARE_SRC);
-}
+    if ((mask & CWBorderPixmap) && pWin->borderIsPixel == FALSE)
+        exaPrepareAccess(&pWin->border.pixmap->drawable, EXA_PREPARE_MASK);
 
-void
-exaFinishAccessWindow(WindowPtr pWin)
-{
-    if (pWin->backgroundState == BackgroundPixmap) 
-        exaFinishAccess(&pWin->background.pixmap->drawable, EXA_PREPARE_SRC);
+    ret = fbChangeWindowAttributes(pWin, mask);
 
-    if (pWin->borderIsPixel == FALSE)
-        exaFinishAccess(&pWin->border.pixmap->drawable, EXA_PREPARE_SRC);
-}
+    if ((mask & CWBorderPixmap) && pWin->borderIsPixel == FALSE)
+        exaFinishAccess(&pWin->border.pixmap->drawable, EXA_PREPARE_MASK);
 
-static Bool
-exaChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
-{
-    Bool ret;
+    if ((mask & CWBackPixmap) && pWin->backgroundState == BackgroundPixmap) 
+        exaFinishAccess(&pWin->background.pixmap->drawable, EXA_PREPARE_SRC);
 
-    exaPrepareAccessWindow(pWin);
-    ret = fbChangeWindowAttributes(pWin, mask);
-    exaFinishAccessWindow(pWin);
     return ret;
 }
 
@@ -737,6 +743,9 @@ exaCloseScreen(int i, ScreenPtr pScreen)
     PictureScreenPtr	ps = GetPictureScreenIfSet(pScreen);
 #endif
 
+    if (ps->Glyphs == exaGlyphs)
+	exaGlyphsFini(pScreen);
+
     pScreen->CreateGC = pExaScr->SavedCreateGC;
     pScreen->CloseScreen = pExaScr->SavedCloseScreen;
     pScreen->GetImage = pExaScr->SavedGetImage;
@@ -750,8 +759,9 @@ exaCloseScreen(int i, ScreenPtr pScreen)
 #ifdef RENDER
     if (ps) {
 	ps->Composite = pExaScr->SavedComposite;
+	ps->Glyphs = pExaScr->SavedGlyphs;
 	ps->Trapezoids = pExaScr->SavedTrapezoids;
-	ps->AddTraps = pExaScr->SavedAddTraps;
+	ps->Triangles = pExaScr->SavedTriangles;
     }
 #endif
 
@@ -913,14 +923,16 @@ exaDriverInit (ScreenPtr		pScreen,
         pExaScr->SavedComposite = ps->Composite;
 	ps->Composite = exaComposite;
 
+	if (pScreenInfo->PrepareComposite) {
+	    pExaScr->SavedGlyphs = ps->Glyphs;
+	    ps->Glyphs = exaGlyphs;
+	}
+	
 	pExaScr->SavedTriangles = ps->Triangles;
 	ps->Triangles = exaTriangles;
 
 	pExaScr->SavedTrapezoids = ps->Trapezoids;
 	ps->Trapezoids = exaTrapezoids;
-
-	pExaScr->SavedAddTraps = ps->AddTraps;
-	ps->AddTraps = ExaCheckAddTraps;
     }
 #endif
 
@@ -968,6 +980,9 @@ exaDriverInit (ScreenPtr		pScreen,
 	}
     }
 
[...1695 lines suppressed...]
 	ExaPixmapPriv (pixmap);
 	RegionRec migration;
-	RegionPtr pending_damage = DamagePendingRegion(pExaPixmap->pDamage);
-	int xoff, yoff;
-
-	exaGetDrawableDeltas(pDraw, pixmap, &xoff, &yoff);
 
-	xoff += pDraw->x;
-	yoff += pDraw->y;
+	if (pExaPixmap->pDamage) {
+	    bounds.x1 += pDraw->x;
+	    bounds.y1 += pDraw->y;
+	    bounds.x2 += pDraw->x;
+	    bounds.y2 += pDraw->y;
 
-	bounds.x1 += xoff;
-	bounds.y1 += yoff;
-	bounds.x2 += xoff;
-	bounds.y2 += yoff;
-
-	REGION_INIT(pScreen, &migration, &bounds, 1);
-	REGION_UNION(pScreen, pending_damage, pending_damage, &migration);
-	REGION_UNINIT(pScreen, &migration);
+	    REGION_INIT(pScreen, &migration, &bounds, 1);
+	    exaDamageDestForMigration(pDraw, pixmap, &migration);
+	}
 
 	exaPrepareAccess(pDraw, EXA_PREPARE_DEST);
 
@@ -866,6 +1082,13 @@ exaTrapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst,
 	    (*ps->RasterizeTrapezoid) (pDst, traps, 0, 0);
 
 	exaFinishAccess(pDraw, EXA_PREPARE_DEST);
+
+	/* Damage manually, because Trapezoids expects to hit Composite normally. */
+	/* Composite is wrapped by damage, but Trapezoids isn't. */
+	if (pExaPixmap->pDamage) {
+	    DamageDamageRegion(pDraw, &migration);
+	    REGION_UNINIT(pScreen, &migration);
+	}
     }
     else if (maskFormat)
     {
@@ -946,26 +1169,27 @@ exaTriangles (CARD8 op, PicturePtr pSrc, PicturePtr pDst,
 	PixmapPtr pixmap = exaGetDrawablePixmap (pDraw);
 	ExaPixmapPriv (pixmap);
 	RegionRec migration;
-	RegionPtr pending_damage = DamagePendingRegion(pExaPixmap->pDamage);
-	int xoff, yoff;
-
-	exaGetDrawableDeltas(pDraw, pixmap, &xoff, &yoff);
-
-	xoff += pDraw->x;
-	yoff += pDraw->y;
 
-	bounds.x1 += xoff;
-	bounds.y1 += yoff;
-	bounds.x2 += xoff;
-	bounds.y2 += yoff;
+	if (pExaPixmap->pDamage) {
+	    bounds.x1 += pDraw->x;
+	    bounds.y1 += pDraw->y;
+	    bounds.x2 += pDraw->x;
+	    bounds.y2 += pDraw->y;
 
-	REGION_INIT(pScreen, &migration, &bounds, 1);
-	REGION_UNION(pScreen, pending_damage, pending_damage, &migration);
-	REGION_UNINIT(pScreen, &migration);
+	    REGION_INIT(pScreen, &migration, &bounds, 1);
+	    exaDamageDestForMigration(pDraw, pixmap, &migration);
+	}
 
 	exaPrepareAccess(pDraw, EXA_PREPARE_DEST);
 	(*ps->AddTriangles) (pDst, 0, 0, ntri, tris);
 	exaFinishAccess(pDraw, EXA_PREPARE_DEST);
+
+	/* Damage manually, because Triangles expects to hit Composite normally. */
+	/* Composite is wrapped by damage, but Triangles isn't. */
+	if (pExaPixmap->pDamage) {
+	    DamageDamageRegion(pDraw, &migration);
+	    REGION_UNINIT(pScreen, &migration);
+	}
     }
     else if (maskFormat)
     {
diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index d7bd06c..d5d6a30 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -97,12 +97,15 @@ ExaCheckPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth,
 		 int x, int y, int w, int h, int leftPad, int format,
 		 char *bits)
 {
+    ExaPixmapPriv(exaGetDrawablePixmap(pDrawable));
+
     EXA_FALLBACK(("to %p (%c)\n", pDrawable, exaDrawableLocation(pDrawable)));
     if (exaGCReadsDestination(pDrawable, pGC->planemask, pGC->fillStyle,
 			      pGC->alu))
 	exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);
     else
-	ExaDoPrepareAccess (pDrawable, EXA_PREPARE_DEST);
+	exaPrepareAccessReg (pDrawable, EXA_PREPARE_DEST, pExaPixmap->pDamage ?
+			     DamagePendingRegion(pExaPixmap->pDamage) : NULL);
     fbPutImage (pDrawable, pGC, depth, x, y, w, h, leftPad, format, bits);
     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);
 }
@@ -350,20 +353,6 @@ ExaCheckComposite (CARD8      op,
     REGION_UNINIT(pScreen, &region);
 }
 
-void
-ExaCheckAddTraps (PicturePtr	pPicture,
-		  INT16		x_off,
-		  INT16		y_off,
-		  int		ntrap,
-		  xTrap		*traps)
-{
-    EXA_FALLBACK(("to pict %p (%c)\n",
-		  exaDrawableLocation(pPicture->pDrawable)));
-    exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
-    fbAddTraps (pPicture, x_off, y_off, ntrap, traps);
-    exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
-}
-
 /**
  * Gets the 0,0 pixel of a pixmap.  Used for doing solid fills of tiled pixmaps
  * that happen to be 1x1.  Pixmap must be at least 8bpp.
@@ -373,23 +362,22 @@ ExaCheckAddTraps (PicturePtr	pPicture,
 CARD32
 exaGetPixmapFirstPixel (PixmapPtr pPixmap)
 {
-    ExaScreenPriv(pPixmap->drawable.pScreen);
     CARD32 pixel;
     void *fb;
     Bool need_finish = FALSE;
     BoxRec box;
     RegionRec migration;
     ExaPixmapPriv (pPixmap);
-    Bool sys_valid = !miPointInRegion(&pExaPixmap->validSys, 0, 0,  &box);
-    Bool damaged = miPointInRegion(DamageRegion(pExaPixmap->pDamage), 0, 0,
-				   &box);
+    Bool sys_valid = pExaPixmap->pDamage &&
+	!miPointInRegion(&pExaPixmap->validSys, 0, 0,  &box);
+    Bool damaged = pExaPixmap->pDamage &&
+ 	miPointInRegion(DamageRegion(pExaPixmap->pDamage), 0, 0, &box);
     Bool offscreen = exaPixmapIsOffscreen(pPixmap);
 
     fb = pExaPixmap->sys_ptr;
 
     /* Try to avoid framebuffer readbacks */
-    if (pExaScr->info->CreatePixmap ||
-	(!offscreen && !sys_valid && !damaged) ||
+    if ((!offscreen && !sys_valid && !damaged) ||
 	(offscreen && (!sys_valid || damaged)))
     {
 	box.x1 = 0;
diff --git a/hw/xfree86/exa/exa.man.pre b/hw/xfree86/exa/exa.man.pre
index 14859bc..31e1cfe 100644
--- a/hw/xfree86/exa/exa.man.pre
+++ b/hw/xfree86/exa/exa.man.pre
@@ -31,12 +31,6 @@ Disables acceleration of downloading of pixmap data from the framebuffer.
 Not usable with drivers which rely on DownloadFromScreen succeeding.
 Default: No.
 .TP
-.BI "Option \*qEXAOptimizeMigration\*q \*q" boolean \*q
-Enables an additional optimization for migration of destination pixmaps. This
-may improve performance in some cases (e.g. when switching virtual desktops with
-no compositing manager) but causes corruption in others (e.g. when starting
-compiz). Default: No.
-.TP
 .BI "Option \*qMigrationHeuristic\*q \*q" anystr \*q
 Chooses an alternate pixmap migration heuristic, for debugging purposes.  The
 default is intended to be the best performing one for general use, though others
diff --git a/hw/xfree86/exa/examodule.c b/hw/xfree86/exa/examodule.c
index e18da0a..4a8d8f2 100644
--- a/hw/xfree86/exa/examodule.c
+++ b/hw/xfree86/exa/examodule.c
@@ -145,7 +145,7 @@ exaDDXDriverInit(ScreenPtr pScreen)
 	pExaScr->optimize_migration =
 	    xf86ReturnOptValBool(pScreenPriv->options,
 				 EXAOPT_OPTIMIZE_MIGRATION,
-				 FALSE);
+				 TRUE);
     }
 
     if (xf86ReturnOptValBool(pScreenPriv->options,
@@ -179,13 +179,6 @@ exaDDXDriverInit(ScreenPtr pScreen)
     
 }
 
-/*ARGSUSED*/
-static const OptionInfoRec *
-EXAAvailableOptions(void *unused)
-{
-    return (EXAOptions);
-}
-
 static XF86ModuleVersionInfo exaVersRec =
 {
 	"exa",


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- xorg-x11-server.spec	3 Sep 2008 23:41:17 -0000	1.346
+++ xorg-x11-server.spec	10 Sep 2008 10:47:21 -0000	1.347
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -44,7 +44,7 @@
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
 Patch101:  xserver-1.4.99-dont-backfill-bg-none.patch
 # XXX does this need rebasing still?
-#Patch102:  xserver-1.4.99-exa-master-upgrade.patch
+Patch102:  xserver-1.5.0-exa-master-upgrade.patch
 Patch103:  xserver-1.5.0-bg-none-root.patch
 
 # Red Hat specific tweaking, not intended for upstream
@@ -498,6 +498,9 @@
 
 
 %changelog
+* Wed Sep 10 2008 Dave Airlie <airlied at redhat.com> 1.5.0-2
+- bring master exa back
+
 * Wed Sep 03 2008 Adam Jackson <ajax at redhat.com> 1.5.0-1
 - xserver 1.5.0
 - Revert to the EXA from 1.5.0, should be good enough one hopes.



From kzak at fedoraproject.org  Wed Sep 10 11:48:18 2008
From: kzak at fedoraproject.org (Karel Zak)
Date: Wed, 10 Sep 2008 11:48:18 +0000 (UTC)
Subject: rpms/util-linux-ng/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 util-linux-ng.spec, 1.29, 1.30
Message-ID: <20080910114819.0D1887012C@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-serv363

Modified Files:
	.cvsignore sources util-linux-ng.spec 
Log Message:
* Wed Sep 10 2008 Karel Zak <kzak at redhat.com> 2.14.1-1
- upgrade to stable 2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	14 Aug 2008 00:37:00 -0000	1.12
+++ .cvsignore	10 Sep 2008 11:47:47 -0000	1.13
@@ -1,2 +1,2 @@
-util-linux-ng-2.14.1-rc1.tar.bz2
+util-linux-ng-2.14.1.tar.bz2
 floppy-0.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	14 Aug 2008 00:37:00 -0000	1.12
+++ sources	10 Sep 2008 11:47:47 -0000	1.13
@@ -1,2 +1,2 @@
-1af388cc2d5d2d2c7266267796116cea  util-linux-ng-2.14.1-rc1.tar.bz2
+9aab772ee9b1f4e67dff98169f3cb380  util-linux-ng-2.14.1.tar.bz2
 7eeb9a6f7a258174bf0fa80f1370788d  floppy-0.16.tar.bz2


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- util-linux-ng.spec	14 Aug 2008 00:37:00 -0000	1.29
+++ util-linux-ng.spec	10 Sep 2008 11:47:47 -0000	1.30
@@ -2,8 +2,8 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.14.1
-Release: 0.1%{?dist}
-%define upstream_suffix	-rc1
+Release: 1%{?dist}
+#%define upstream_suffix	-rc1
 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
@@ -516,6 +516,9 @@
 /sbin/losetup
 
 %changelog
+* Wed Sep 10 2008 Karel Zak <kzak at redhat.com> 2.14.1-1
+- upgrade to stable 2.14.1
+
 * Thu Aug 14 2008 Karel Zak <kzak at redhat.com> 2.14.1-0.1
 - upgrade to 2.14.1-rc1
 - refresh old patches



From ovasik at fedoraproject.org  Wed Sep 10 11:58:41 2008
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed, 10 Sep 2008 11:58:41 +0000 (UTC)
Subject: rpms/docbook-utils/F-9 docbook-utils-docbook2man-pl-sdata.patch,
	NONE, 1.1 docbook-utils.spec, 1.28, 1.29
Message-ID: <20080910115841.6D3DE7012C@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv904

Modified Files:
	docbook-utils.spec 
Added Files:
	docbook-utils-docbook2man-pl-sdata.patch 
Log Message:
added many sdata entities to docbook2man-spec.pl, do not consider missing sdata as an error, just spawn warning (#460921)

docbook-utils-docbook2man-pl-sdata.patch:

--- NEW FILE docbook-utils-docbook2man-pl-sdata.patch ---
diff -urNp docbook-utils-0.6.14-orig/helpers/docbook2man-spec.pl docbook-utils-0.6.14/helpers/docbook2man-spec.pl
--- docbook-utils-0.6.14-orig/helpers/docbook2man-spec.pl	2008-09-10 13:12:23.000000000 +0200
+++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl	2008-09-10 13:21:21.000000000 +0200
@@ -1168,17 +1168,268 @@ sgml('<XREF>', sub {
 
 ########################################################################
 #
-# Other handlers 
+# SDATA 
 #
 ########################################################################
 
-man_sgml('|[lt    ]|', '<');
-man_sgml('|[gt    ]|', '>');
-man_sgml('|[amp   ]|', '&');
 man_sgml('|[minus ]|', '-');
 man_sgml('|[copy  ]|', '(C)');
 man_sgml('|[nbsp  ]|', '\~');
 man_sgml('|[thinsp]|', '\~');
+man_sgml('|[lt    ]|', '<');
+man_sgml('|[equals]|', '=');
+man_sgml('|[gt    ]|', '>');
+man_sgml('|[plus  ]|', '\(pl');
+man_sgml('|[dollar]|', '$');
+man_sgml('|[num   ]|', '#');
+man_sgml('|[percnt]|', '%');
+man_sgml('|[amp   ]|', '&');
+man_sgml('|[commat]|', '@');
+man_sgml('|[lsqb  ]|', '[');
+man_sgml('|[bsol  ]|', '\e');
+man_sgml('|[rsqb  ]|', ']');
+man_sgml('|[lcub  ]|', '{');
+man_sgml('|[verbar]|', '\(or');
+man_sgml('|[rcub  ]|', '}');
+man_sgml('|[excl  ]|', '!');
+man_sgml('|[quot  ]|', '"');
+man_sgml('|[apos  ]|', '\\&\'');
+man_sgml('|[lpar  ]|', '(');
+man_sgml('|[rpar  ]|', ')');
+man_sgml('|[comma ]|', ',');
+man_sgml('|[lowbar]|', '_');
+man_sgml('|[period]|', '.');
+man_sgml('|[sol   ]|', '/');
+man_sgml('|[colon ]|', ':');
+man_sgml('|[semi  ]|', ';');
+man_sgml('|[quest ]|', '?');
+man_sgml('|[grave ]|', '`');
+man_sgml('|[tilde ]|', '~');
+man_sgml('|[half  ]|', '\(12');
+man_sgml('|[frac12]|', '\(12');
+man_sgml('|[frac14]|', '\(14');
+man_sgml('|[frac34]|', '\(34');
+man_sgml('|[frac18]|', '1/8');
+man_sgml('|[frac38]|', '3/8');
+man_sgml('|[frac58]|', '5/8');
+man_sgml('|[frac78]|', '7/8');
+man_sgml('|[sup1  ]|', '\u1\l');
+man_sgml('|[sup2  ]|', '\u2\l');
+man_sgml('|[sup3  ]|', '\u3\l');
+man_sgml('|[plusmn]|', '\(+-');
+man_sgml('|[divide]|', '\(di');
+man_sgml('|[times ]|', '\(ti');
+man_sgml('|[pound ]|', '#');
+man_sgml('|[cent  ]|', '\(ct');
+man_sgml('|[yen   ]|', 'yen');
+man_sgml('|[ast   ]|', '*');
+man_sgml('|[horbar]|', '_');
+man_sgml('|[micro ]|', '\(*m');
+man_sgml('|[ohm   ]|', '\(*W');
+man_sgml('|[deg   ]|', '\(de');
+man_sgml('|[sect  ]|', '\(sc');
+man_sgml('|[larr  ]|', '\(<-');
+man_sgml('|[rarr  ]|', '\(->');
+man_sgml('|[uarr  ]|', '\(ua');
+man_sgml('|[darr  ]|', '\(da');
+man_sgml('|[reg   ]|', '\(rg');
+man_sgml('|[trade ]|', '\(tm');
+man_sgml('|[brvbar]|', '|');
+man_sgml('|[not   ]|', '\(no');
+man_sgml('|[hyphen]|', '\-');
+man_sgml('|[laquo ]|', '<<');
+man_sgml('|[raquo ]|', '>>');
+man_sgml('|[lsquo ]|', '`');
+man_sgml('|[rsquo ]|', '\&\'');
+man_sgml('|[ldquo ]|', '"');
+man_sgml('|[rdquo ]|', '"');
+man_sgml('|[shy   ]|', '\%');
+man_sgml('|[emsp  ]|', '\ \ ');
+man_sgml('|[ensp  ]|', '\ ');
+man_sgml('|[emsp3 ]|', '\ ');
+man_sgml('|[emsp4 ]|', '\ ');
+man_sgml('|[numsp ]|', '\0');
+man_sgml('|[puncsp]|', '\|');
+man_sgml('|[hairsp]|', '\\^');
+man_sgml('|[mdash ]|', '\(em');
+man_sgml('|[ndash ]|', '-');
+man_sgml('|[dash  ]|', '-');
+man_sgml('|[blank ]|', '\ ');
+man_sgml('|[hellip]|', '\&...');
+man_sgml('|[nldr  ]|', '\&..');
+man_sgml('|[frac13]|', '1/3');
+man_sgml('|[frac23]|', '2/3');
+man_sgml('|[frac15]|', '1/5');
+man_sgml('|[frac25]|', '2/5');
+man_sgml('|[frac35]|', '3/5');
+man_sgml('|[frac45]|', '4/5');
+man_sgml('|[frac16]|', '1/6');
+man_sgml('|[frac56]|', '5/6');
+man_sgml('|[cir   ]|', '\(ci');
+man_sgml('|[squ   ]|', '\(sq');
+man_sgml('|[star  ]|', '\(**');
+man_sgml('|[bull  ]|', '\(bu');
+man_sgml('|[dagger]|', '\(dg');
+man_sgml('|[Dagger]|', '\(dd');
+man_sgml('|[caret ]|', '\^');
+man_sgml('|[lsquor]|', '`');
+man_sgml('|[ldquor]|', '``');
+man_sgml('|[fflig ]|', '\(ff');
+man_sgml('|[filig ]|', '\(fi');
+man_sgml('|[ffilig]|', '\(Fi');
+man_sgml('|[ffllig]|', '\(Fl');
+man_sgml('|[fllig ]|', '\(fl');
+man_sgml('|[rdquor]|', '\&\'\'');
+man_sgml('|[rsquor]|', '\&\'');
+man_sgml('|[vellip]|', '\&...');
+man_sgml('|[aacute]|', '\(a\'');
+man_sgml('|[Aacute]|', '\(A\'');
+man_sgml('|[acirc ]|', '\(a^');
+man_sgml('|[Acirc ]|', '\(A^');
+man_sgml('|[agrave]|', '\(a`');
+man_sgml('|[Agrave]|', '\(A`');
+man_sgml('|[auml  ]|', '\(a:');
+man_sgml('|[aelig ]|', '\(ae');
+man_sgml('|[AElig ]|', '\(AE');
+man_sgml('|[eacute]|', '\(e\'');
+man_sgml('|[Eacute]|', '\(E\'');
+man_sgml('|[egrave]|', '\(e`');
+man_sgml('|[Egrave]|', '\(E`');
+man_sgml('|[iacute]|', '\(i\'');
+man_sgml('|[Iacute]|', '\(I\'');
+man_sgml('|[igrave]|', '\(i`');
+man_sgml('|[Igrave]|', '\(I`');
+man_sgml('|[ntilde]|', '\(n~');
+man_sgml('|[Ntilde]|', '\(N~');
+man_sgml('|[oacute]|', '\(o\'');
+man_sgml('|[Oacute]|', '\(O\'');
+man_sgml('|[ograve]|', '\(o`');
+man_sgml('|[Ograve]|', '\(O`');
+man_sgml('|[oslash]|', '\(o/');
+man_sgml('|[Oslash]|', '\(O/');
+man_sgml('|[szlig ]|', '\(ss');
+man_sgml('|[thorn ]|', '\(th');
+man_sgml('|[uacute]|', '\(u\'');
+man_sgml('|[Uacute]|', '\(U\'');
+man_sgml('|[ugrave]|', '\(u`');
+man_sgml('|[Ugrave]|', '\(U`');
+man_sgml('|[aogon ]|', '\(ao');
+man_sgml('|[agr   ]|', '\(*a');
+man_sgml('|[Agr   ]|', '\(*A');
+man_sgml('|[bgr   ]|', '\(*b');
+man_sgml('|[Bgr   ]|', '\(*B');
+man_sgml('|[ggr   ]|', '\(*g');
+man_sgml('|[Ggr   ]|', '\(*G');
+man_sgml('|[dgr   ]|', '\(*d');
+man_sgml('|[Dgr   ]|', '\(*D');
+man_sgml('|[egr   ]|', '\(*e');
+man_sgml('|[Egr   ]|', '\(*E');
+man_sgml('|[zgr   ]|', '\(*z');
+man_sgml('|[Zgr   ]|', '\(*Z');
+man_sgml('|[eegr  ]|', '\(*y');
+man_sgml('|[EEgr  ]|', '\(*Y');
+man_sgml('|[thgr  ]|', '\(*h');
+man_sgml('|[THgr  ]|', '\(*H');
+man_sgml('|[igr   ]|', '\(*i');
+man_sgml('|[Igr   ]|', '\(*I');
+man_sgml('|[kgr   ]|', '\(*k');
+man_sgml('|[Kgr   ]|', '\(*K');
+man_sgml('|[lgr   ]|', '\(*l');
+man_sgml('|[Lgr   ]|', '\(*L');
+man_sgml('|[mgr   ]|', '\(*m');
+man_sgml('|[Mgr   ]|', '\(*M');
+man_sgml('|[ngr   ]|', '\(*n');
+man_sgml('|[Ngr   ]|', '\(*N');
+man_sgml('|[xgr   ]|', '\(*c');
+man_sgml('|[Xgr   ]|', '\(*C');
+man_sgml('|[ogr   ]|', '\(*o');
+man_sgml('|[Ogr   ]|', '\(*O');
+man_sgml('|[pgr   ]|', '\(*p');
+man_sgml('|[Pgr   ]|', '\(*P');
+man_sgml('|[rgr   ]|', '\(*r');
+man_sgml('|[Rgr   ]|', '\(*R');
+man_sgml('|[sgr   ]|', '\(*s');
+man_sgml('|[Sgr   ]|', '\(*S');
+man_sgml('|[sfgr  ]|', '\(ts');
+man_sgml('|[tgr   ]|', '\(*t');
+man_sgml('|[Tgr   ]|', '\(*T');
+man_sgml('|[ugr   ]|', '\(*u');
+man_sgml('|[Ugr   ]|', '\(*U');
+man_sgml('|[phgr  ]|', '\(*f');
+man_sgml('|[PHgr  ]|', '\(*F');
+man_sgml('|[khgr  ]|', '\(*x');
+man_sgml('|[KHgr  ]|', '\(*X');
+man_sgml('|[psgr  ]|', '\(*q');
+man_sgml('|[PSgr  ]|', '\(*Q');
+man_sgml('|[ohgr  ]|', '\(*w');
+man_sgml('|[OHgr  ]|', '\(*W');
+man_sgml('|[alpha ]|', '\(*a');
+man_sgml('|[beta  ]|', '\(*b');
+man_sgml('|[gamma ]|', '\(*g');
+man_sgml('|[Gamma ]|', '\(*G');
+man_sgml('|[delta ]|', '\(*d');
+man_sgml('|[Delta ]|', '\(*D');
+man_sgml('|[epsi  ]|', '\(*e');
+man_sgml('|[epsis ]|', '\(*e');
+man_sgml('|[zeta  ]|', '\(*z');
+man_sgml('|[eta   ]|', '\(*y');
+man_sgml('|[thetas]|', '\(*h');
+man_sgml('|[Theta ]|', '\(*H');
+man_sgml('|[iota  ]|', '\(*i');
+man_sgml('|[kappa ]|', '\(*k');
+man_sgml('|[lambda]|', '\(*l');
+man_sgml('|[Lambda]|', '\(*L');
+man_sgml('|[mu    ]|', '\(*m');
+man_sgml('|[nu    ]|', '\(*n');
+man_sgml('|[xi    ]|', '\(*c');
+man_sgml('|[Xi    ]|', '\(*C');
+man_sgml('|[pi    ]|', '\(*p');
+man_sgml('|[Pi    ]|', '\(*P');
+man_sgml('|[rho   ]|', '\(*r');
+man_sgml('|[sigma ]|', '\(*s');
+man_sgml('|[Sigma ]|', '\(*S');
+man_sgml('|[tau   ]|', '\(*t');
+man_sgml('|[upsi  ]|', '\(*u');
+man_sgml('|[Upsi  ]|', '\(*U');
+man_sgml('|[phis  ]|', '\(*f');
+man_sgml('|[Phi   ]|', '\(*F');
+man_sgml('|[chi   ]|', '\(*x');
+man_sgml('|[psi   ]|', '\(*q');
+man_sgml('|[Psi   ]|', '\(*X');
+man_sgml('|[omega ]|', '\(*w');
+man_sgml('|[Omega ]|', '\(*W');
+man_sgml('|[ap    ]|', '\(ap');
+man_sgml('|[equiv ]|', '\(==');
+man_sgml('|[ge    ]|', '\(>=');
+man_sgml('|[infin ]|', '\(if');
+man_sgml('|[isin  ]|', '\(sb');
+man_sgml('|[le    ]|', '\(<=');
+man_sgml('|[ne    ]|', '\(!=');
+man_sgml('|[prop  ]|', '\(pt');
+man_sgml('|[square]|', '\(sq');
+man_sgml('|[sub   ]|', '\(sb');
+man_sgml('|[sube  ]|', '\(ib');
+man_sgml('|[sup   ]|', '\(sp');
+man_sgml('|[supe  ]|', '\(ip');
+man_sgml('|[acute ]|', '\&\'');
+man_sgml('|[breve ]|', '\(be');
+man_sgml('|[caron ]|', '\(hc');
+man_sgml('|[cedil ]|', '\(cd');
+man_sgml('|[dot   ]|', '\(dt');
+man_sgml('|[macr  ]|', '\(ma');
+man_sgml('|[ogon  ]|', '\(og');
+man_sgml('|[ring  ]|', '\(ri');
+man_sgml('|[uml   ]|', '\(..');
+
+sgml('sdata',sub {
+	my ($element, $event) = @_;
+	my ($file, $line) = ($event->file, $event->line);
+	man_output "|[", $_[0], "]|";
+	warn "Warning: unrecognized SDATA '$_[0]'"
+	     . ($file && $line ? " in $file on line $line" : "")
+	     . ": please add definition to docbook2man-spec.pl\n";
+});
+
 
 #
 # Default handlers (uncomment these if needed).  Right now, these are set
@@ -1236,15 +1487,11 @@ sgml('re', sub
 	$newline_last = 1;
 });
 
-sgml('sdata',sub
-{
-	die "Unknown SDATA: " . $_[0];
-});
-sgml('pi',sub { die "Unknown processing instruction: " . $_[0]; });
+sgml('pi',sub {});
 sgml('entity',sub { die "Unknown external entity: " . $_[0]->name; });
 sgml('start_subdoc',sub { die "Unknown subdoc entity: " . $_[0]->name; });
-sgml('end_subdoc','');
-sgml('conforming','');
+sgml('end_subdoc',sub{});
+sgml('conforming',sub{});
 
 1;
 


Index: docbook-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/F-9/docbook-utils.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- docbook-utils.spec	22 Nov 2007 15:09:12 -0000	1.28
+++ docbook-utils.spec	10 Sep 2008 11:58:11 -0000	1.29
@@ -1,6 +1,6 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 13%{?dist}
+Release: 14%{?dist}
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents
@@ -29,6 +29,7 @@
 Patch1: docbook-utils-funcsynopsis.patch
 Patch2: docbook-utils-2ndspaces.patch
 Patch3: docbook-utils-w3mtxtconvert.patch
+Patch4: docbook-utils-docbook2man-pl-sdata.patch
 
 %description
 This package contains scripts are for easy conversion from DocBook
@@ -56,6 +57,7 @@
 %patch1 -p1 -b .0
 %patch2 -p1 -b .2ndspaces
 %patch3 -p1 -b .w3mtxtconvert
+%patch4 -p1 -b .sdata
 
 %build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir}
@@ -122,6 +124,11 @@
 %{_mandir}/*/docbook2ps.*
 
 %changelog 
+* Wed Sep 10 2008 Ondrej Vasik <ovasik at redhat.com> 0.6.14-14
+- added many sdata entities to docbook2man-spec.pl (all from
+  latest upstream docbook2X), do not consider missing sdata 
+  as error (just warning) - #460921
+
 * Thu Nov 22 2007 Ondrej Vasik <ovasik at redhat.com> 0.6.14-13
 - fix of w3m params while converting to txt
 



From kzak at fedoraproject.org  Wed Sep 10 12:29:31 2008
From: kzak at fedoraproject.org (Karel Zak)
Date: Wed, 10 Sep 2008 12:29:31 +0000 (UTC)
Subject: rpms/util-linux-ng/devel util-linux-ng.spec,1.30,1.31
Message-ID: <20080910122931.5DF087012C@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-serv2366

Modified Files:
	util-linux-ng.spec 
Log Message:
fix spec file


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- util-linux-ng.spec	10 Sep 2008 11:47:47 -0000	1.30
+++ util-linux-ng.spec	10 Sep 2008 12:29:01 -0000	1.31
@@ -3,7 +3,6 @@
 Name: util-linux-ng
 Version: 2.14.1
 Release: 1%{?dist}
-#%define upstream_suffix	-rc1
 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
@@ -36,7 +35,7 @@
 BuildRequires: popt-devel
 
 ### Sources
-Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/util-linux-ng-%{version}%{upstream_suffix}.tar.bz2
+Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/util-linux-ng-%{version}.tar.bz2
 Source1: util-linux-ng-login.pamd
 Source2: util-linux-ng-remote.pamd
 Source3: util-linux-ng-chsh-chfn.pamd
@@ -109,7 +108,7 @@
 program.
 
 %prep
-%setup -q -a 11 -n %{name}-%{version}%{upstream_suffix}
+%setup -q -a 11 -n %{name}-%{version}
 cp %{SOURCE8} %{SOURCE9} .
 
 %patch0 -p1



From pkgdb at fedoraproject.org  Wed Sep 10 12:35:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 12:35:08 +0000
Subject: [pkgdb] supertuxkart ownership updated
Message-ID: <20080910123508.7D198208D0F@bastion.fedora.phx.redhat.com>

Package supertuxkart in Fedora devel is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/supertuxkart



From pkgdb at fedoraproject.org  Wed Sep 10 12:35:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 12:35:13 +0000
Subject: [pkgdb] supertuxkart ownership updated
Message-ID: <20080910123513.45880208771@bastion.fedora.phx.redhat.com>

Package supertuxkart in Fedora 8 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/supertuxkart



From pkgdb at fedoraproject.org  Wed Sep 10 12:35:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 12:35:14 +0000
Subject: [pkgdb] supertuxkart ownership updated
Message-ID: <20080910123514.6E190208D98@bastion.fedora.phx.redhat.com>

Package supertuxkart in Fedora 9 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/supertuxkart



From limb at fedoraproject.org  Wed Sep 10 12:43:22 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 10 Sep 2008 12:43:22 +0000 (UTC)
Subject: rpms/apricots/devel apricots-0.2.6-alut-apricots.patch, NONE,
	1.1 apricots-0.2.6-alut-configure.patch, NONE,
	1.1 apricots-0.2.6-alut-sampleio.patch, NONE,
	1.1 apricots-0.2.6-path.patch, NONE, 1.1 apricots.desktop, NONE,
	1.1 apricots.png, NONE, 1.1 apricots.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080910124322.F1B4D7012C@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/extras/rpms/apricots/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3642/devel

Modified Files:
	.cvsignore sources 
Added Files:
	apricots-0.2.6-alut-apricots.patch 
	apricots-0.2.6-alut-configure.patch 
	apricots-0.2.6-alut-sampleio.patch apricots-0.2.6-path.patch 
	apricots.desktop apricots.png apricots.spec 
Log Message:
Initial import.


apricots-0.2.6-alut-apricots.patch:

--- NEW FILE apricots-0.2.6-alut-apricots.patch ---
--- apricots/apricots.cpp	2008-08-26 12:38:27.000000000 -0500
+++ apricots/apricots.cpp	2008-08-26 12:38:27.000000000 -0500
@@ -16,6 +16,7 @@
 int main(int, char**){
 #endif
 
+atexit(SDL_Quit);
   // Initialize data
   gamedata g;
   init_data(g);

apricots-0.2.6-alut-configure.patch:

--- NEW FILE apricots-0.2.6-alut-configure.patch ---
--- configure.in	2008-08-26 12:40:55.000000000 -0500
+++ configure.in	2008-08-26 12:40:55.000000000 -0500
@@ -100,7 +100,9 @@
 
 dnl Check for OpenAL
 AC_CHECK_HEADER(AL/al.h,[CXXFLAGS="$CXXFLAGS -DAP_AUDIO_OPENAL"])
-AC_CHECK_LIB( openal, alutInit)
+dnl AC_CHECK_LIB( openal, alutInit)
+AC_CHECK_LIB( openal, alGetError)
+AC_CHECK_LIB( alut, alutInit)
 
 KDE_CHECK_EXTRA_LIBS
 all_libraries="$all_libraries $USER_LDFLAGS"

apricots-0.2.6-alut-sampleio.patch:

--- NEW FILE apricots-0.2.6-alut-sampleio.patch ---
--- apricots/sampleio.cpp	2008-08-26 12:40:09.000000000 -0500
+++ apricots/sampleio.cpp	2008-08-26 12:40:09.000000000 -0500
@@ -74,12 +74,12 @@
   alListenerfv(AL_ORIENTATION, front );
 
   // Load in samples
-  ALvoid* data = malloc(5 * (512 * 3) * 1024);
+  //ALvoid* data = malloc(5 * (512 * 3) * 1024);
   alGenBuffers(numsamples, samples);
 
   for (int i = 0; i < numsamples; i++){
-    ALsizei freq;
-    ALboolean fileok;
+    //ALsizei freq;
+    //ALboolean fileok;
     // Evil OpenAL portability fix done here
 #ifdef _WIN32
     ALenum format;
@@ -87,15 +87,17 @@
     alutLoadWAVFile(filenames[i],&format,&data,&filelen,&freq,&trash);
     fileok = (alGetError() == AL_NO_ERROR);
 #else
-    ALsizei format;
-    ALsizei trash;
-    fileok = alutLoadWAV(filenames[i],&data,&format,&filelen,&trash,&freq);
+    //ALsizei format;
+    //ALsizei trash;
+    //fileok = alutLoadWAV(filenames[i],&data,&format,&filelen,&trash,&freq);
+    samples[i] = alutCreateBufferFromFile(filenames[i]);
 #endif
-    if (!fileok){
+    //if (!fileok){
+    if (samples[i] == AL_NONE){
       cerr << "sampleio: could not open " << filenames[i] << endl;
       exit(1);
     }         
-    alBufferData(samples[i], format, data, filelen, freq);
+    //alBufferData(samples[i], format, data, filelen, freq);
   }
 
   // Generate Sources
@@ -107,7 +109,7 @@
     alSourcefv(sources[j], AL_ORIENTATION, back );
   }
   
-  free(data);
+  //free(data);
   
 }
 

apricots-0.2.6-path.patch:

--- NEW FILE apricots-0.2.6-path.patch ---
--- configure.in	2008-08-26 12:58:47.000000000 -0500
+++ configure.in	2008-08-26 12:58:47.000000000 -0500
@@ -44,7 +44,7 @@
 dnl
 unset CDPATH
 dnl make /usr/local the default for the installation
-AC_PREFIX_DEFAULT(/usr/local)
+AC_PREFIX_DEFAULT(/usr)
 
 if test "x$prefix" = "xNONE"; then
   prefix=$ac_default_prefix


--- NEW FILE apricots.desktop ---
[Desktop Entry]
Name=Apricots
GenericName=Apricots
Comment=2D air combat game
Exec=apricots
Icon=apricots
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;ArcadeGame;


--- NEW FILE apricots.spec ---
%define apricotsdir %{_datadir}/apricots
Name: apricots
Version:  0.2.6
Release:  2%{?dist}
Summary: 2D air combat game

Group: Amusements/Games
License: GPLv2
URL: http://www.fishies.org.uk/apricots.html
Source0: http://www.fishies.org.uk/apricots-%{version}.tar.gz       
Source1: apricots.png
#Icon created from screenshot on website
Source2: apricots.desktop
Patch0: apricots-0.2.6-alut-apricots.patch
Patch1: apricots-0.2.6-alut-sampleio.patch
Patch2: apricots-0.2.6-alut-configure.patch
# alut patches sent upstream.
Patch3: apricots-0.2.6-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildRequires: SDL-devel
BuildRequires: freealut-devel
BuildRequires: desktop-file-utils


%description
It's a game where you fly a little plane around the screen and
shoot things and drop bombs on enemy targets, and it's meant to be quick 
and fun.

%prep
%setup -q

chmod -x apricots/*.cpp
chmod -x apricots/*.h
chmod -x AUTHORS
chmod -x ChangeLog
chmod -x COPYING
chmod -x README
chmod -x TODO

%patch0 -p0
%patch1 -p0
%patch2 -p0
%patch3 -p0


%build
%configure
make


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -m 755 apricots/apricots %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/apricots
install -m 644 apricots/*.wav %{buildroot}%{_datadir}/apricots
mkdir -p %{buildroot}%{_sysconfdir}
install -m 644 apricots/apricots.cfg %{buildroot}%{_sysconfdir}
ln -s ../../..%{_sysconfdir}/apricots.cfg %{buildroot}%{_datadir}/apricots/apricots.cfg
install -m 644 apricots/*.psf %{buildroot}%{_datadir}/apricots
install -m 644 apricots/*.shapes %{buildroot}%{_datadir}/apricots

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE2}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps
install -p -m 644 %{SOURCE1} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps


%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{_bindir}/apricots
%{_datadir}/apricots
%{_datadir}/applications/fedora-apricots.desktop
%{_datadir}/icons/hicolor/24x24/apps/apricots.png
%config(noreplace) %{_sysconfdir}/apricots.cfg


%changelog
* Tue Sep 09 2008 Jon Ciesla <limb at jcomserv.net> - 0.2.6-2
- Re-base off of pristine tarball, md5 error in review.

* Tue Aug 26 2008 Jon Ciesla <limb at jcomserv.net> - 0.2.6-1
- Initial packaging.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apricots/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 01:07:14 -0000	1.1
+++ .cvsignore	10 Sep 2008 12:42:52 -0000	1.2
@@ -0,0 +1 @@
+apricots-0.2.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apricots/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 01:07:14 -0000	1.1
+++ sources	10 Sep 2008 12:42:52 -0000	1.2
@@ -0,0 +1 @@
+910828d717e46d8cbd9c24f702d09fbc  apricots-0.2.6.tar.gz



From ruben at fedoraproject.org  Wed Sep 10 12:47:37 2008
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Wed, 10 Sep 2008 12:47:37 +0000 (UTC)
Subject: rpms/whatsup/devel import.log, NONE,
	1.1 whatsup-fix-initscript.patch, 
	NONE, 1.1 whatsup-hostsfile, NONE,
	1.1 whatsup-incorrect-open.patch, NONE,
	1.1 whatsup-install-into-vendor-dir.patch, NONE,
	1.1 whatsup-move-initscript.patch, NONE, 1.1 whatsup.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080910124737.3C8377012C@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/whatsup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4479/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log whatsup-fix-initscript.patch whatsup-hostsfile 
	whatsup-incorrect-open.patch 
	whatsup-install-into-vendor-dir.patch 
	whatsup-move-initscript.patch whatsup.spec 
Log Message:
Initial import into devel



--- NEW FILE import.log ---
whatsup-1_8-1_fc9:HEAD:whatsup-1.8-1.fc9.src.rpm:1221050801

whatsup-fix-initscript.patch:

--- NEW FILE whatsup-fix-initscript.patch ---
diff -up whatsup-1.7/etc/whatsup-pingd.orig whatsup-1.7/etc/whatsup-pingd
--- whatsup-1.7/etc/whatsup-pingd.orig	2008-04-26 02:17:14.000000000 +0200
+++ whatsup-1.7/etc/whatsup-pingd	2008-04-26 02:18:16.000000000 +0200
@@ -1,16 +1,15 @@
 #!/bin/sh
-# $Id: whatsup-pingd,v 1.1 2006/07/07 21:00:48 chu11 Exp $
 #
-# chkconfig: 2345 70 40
-# description: pingd startup script
+# chkconfig: - 70 40
+# description: whatsup-pingd startup script
 #
 ### BEGIN INIT INFO
-# Provides: pingd
+# Provides: whatsup-pingd
 # Required-Start: $network $remote_fs $syslog
 # Required-Stop:  $network $remote_fs $syslog
-# Default-Start:  3 5
 # Default-Stop:   0 1 2 6
-# Description:    Start pingd
+# Description:    Start whatsup-pingd
+# Short-Description:    Start whatsup-pingd
 ### END INIT INFO
 
 PINGD=/usr/sbin/pingd


--- NEW FILE whatsup-hostsfile ---
localhost


whatsup-incorrect-open.patch:

--- NEW FILE whatsup-incorrect-open.patch ---
diff -up whatsup-1.7/src/whatsup/whatsup.c.orig whatsup-1.7/src/whatsup/whatsup.c
--- whatsup-1.7/src/whatsup/whatsup.c.orig	2008-04-25 19:54:51.000000000 +0200
+++ whatsup-1.7/src/whatsup/whatsup.c	2008-04-25 19:55:07.000000000 +0200
@@ -1171,7 +1171,7 @@ _log_mode(void)
 
   if (log_file)
     {
-      if ((log_file_fd = open (log_file, O_WRONLY | O_CREAT), 600) < 0)
+      if (log_file_fd = open (log_file, O_WRONLY | O_CREAT, 600) < 0)
         err_exit("error opening log_file = %s: %s", log_file, strerror(errno));
     }
   else

whatsup-install-into-vendor-dir.patch:

--- NEW FILE whatsup-install-into-vendor-dir.patch ---
diff -up whatsup-1.8/src/Libnodeupdown/Makefile.in.orig whatsup-1.8/src/Libnodeupdown/Makefile.in
--- whatsup-1.8/src/Libnodeupdown/Makefile.in.orig	2008-08-14 07:58:14.000000000 -0500
+++ whatsup-1.8/src/Libnodeupdown/Makefile.in	2008-08-14 07:58:25.000000000 -0500
@@ -210,7 +210,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 PERL_INC = "-I../../config -I$(srcdir)/../libcommon -I$(srcdir)/../libexpat -I$(srcdir)/../libnodeupdown"
 PERL_LIBS = "-L../libnodeupdown/.libs -lnodeupdown"
-MAKEMAKERFLAGS = INSTALLDIRS=site \
+MAKEMAKERFLAGS = INSTALLDIRS=vendor \
 		 DESTDIR=$(PERL_DESTDIR) \
 		 SITEPREFIX=$(prefix) \
 		 INC=$(PERL_INC) \

whatsup-move-initscript.patch:

--- NEW FILE whatsup-move-initscript.patch ---
diff -up whatsup-1.7/etc/Makefile.in.orig whatsup-1.7/etc/Makefile.in
--- whatsup-1.7/etc/Makefile.in.orig	2008-04-26 01:32:02.000000000 +0200
+++ whatsup-1.7/etc/Makefile.in	2008-04-26 01:33:28.000000000 +0200
@@ -365,9 +365,10 @@ uninstall-am: uninstall-info-am
 
 
 install-data-hook:
- at WITH_PINGD_TRUE@	$(top_srcdir)/config/install-sh -m 755 -d $(DESTDIR)/$(sysconfdir)/init.d
- at WITH_PINGD_TRUE@	cp $(srcdir)/whatsup-pingd $(DESTDIR)/$(sysconfdir)/init.d/whatsup-pingd; \
- at WITH_PINGD_TRUE@	chmod 755 $(DESTDIR)/$(sysconfdir)/init.d/whatsup-pingd
+ at WITH_PINGD_TRUE@	$(top_srcdir)/config/install-sh -m 755 -d $(DESTDIR)/$(sysconfdir)/rc.d/init.d
+ at WITH_PINGD_TRUE@	$(DESTDIR)/$(sysconfdir)/rc.d/init.d/whatsup-pingd; \
+ at WITH_PINGD_TRUE@	cp $(srcdir)/whatsup-pingd $(DESTDIR)/$(sysconfdir)/rc.d/init.d/whatsup-pingd; \
+ at WITH_PINGD_TRUE@	chmod 755 $(DESTDIR)/$(sysconfdir)/rc.d/init.d/whatsup-pingd
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:


--- NEW FILE whatsup.spec ---
%define libname libnodeupdown

Summary:       Node up/down detection utility
Name:          whatsup
Version:       1.8
Release:       1%{?dist}
Group:         Applications/Communications
License:       GPLv2+
URL:           https://computing.llnl.gov/linux/whatsup.html
Source0:       http://master.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
Source1:       %{name}-hostsfile
Patch0:        %{name}-incorrect-open.patch
Patch1:        %{name}-install-into-vendor-dir.patch
Patch2:        %{name}-move-initscript.patch
Patch3:        %{name}-fix-initscript.patch 
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: perl(ExtUtils::MakeMaker)
Requires:      %{libname} = %{version}-%{release}

%description
Whatsup is a cluster node up/down detection utility.

Whatsup can quickly calculate and output the up and down nodes of a cluster.
Whatsup allows some tools, such as Pdsh, to operate more quickly by
not operating on down nodes. Whatsup calculates the up and down nodes of a
cluster through one of several possible backend tools
and several optional cluster node databases.

%package -n    %{libname}-devel
Summary:       Development headers for %{libname}
Group:         Applications/Communications
Requires:      %{libname} = %{version}-%{release}
%description -n %{libname}-devel
development headers for %{libname}

%package -n    %{libname}
Summary:       A cluster node up/down detection library
Group:         Applications/Communications
%description -n %{libname}
A cluster node up/down detection library, with different backends

%package -n    %{libname}-backend-ganglia
Summary:       Ganglia backend for %{libname}
Group:         Applications/Communications
Requires:      %{libname} = %{version}-%{release}
BuildRequires: ganglia-devel
%description -n %{libname}-backend-ganglia
Ganglia backend module for %{libname}

%package -n    %{libname}-backend-pingd
Summary:       Pingd backend for %{libname}
Group:         Applications/Communications
Requires:      %{libname} = %{version}-%{release}
Requires:      %{name}-pingd = %{version}-%{release}
%description -n %{libname}-backend-pingd
pingd backend module for %{libname}

%package -n    %{name}-pingd
Summary:       Pingd daemon for %{name}
Group:         Applications/Communications
Requires:      %{libname} = %{version}-%{release}
%description -n %{name}-pingd
pingd daemon for %{name}

%package -n    perl-%{libname}
Summary:       Perl bindings for %{libname}
Group:         Applications/Communications
Requires:      %{libname} = %{version}-%{release}
Requires:      perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description -n perl-%{libname}
Perl bindings for %{libname}

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

%build
%configure --disable-static 
make %{?_smpflags}

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
mkdir -vp %{buildroot}%{_initrddir}

# for whatsup-pingd
install -m 644 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/hostsfile

mkdir -vp %{buildroot}%{perl_vendorlib}
mv -v %{buildroot}%{_libdir}/Nodeupdown.pm %{buildroot}%{perl_vendorlib}/Nodeupdown.pm

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -type f -name "*.bs" -exec rm -f {} \;
find %{buildroot} -type f -name "*.la" -exec rm -f {} \;

%{_fixperms} %{buildroot}/*

%clean
rm -rf %{buildroot}

%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig

%post -n %{name}-pingd
/sbin/chkconfig --add %{name}-pingd

%preun -n %{name}-pingd
if [ $1 -eq 0 ]; then
    /sbin/chkconfig --del %{name}-pingd
    /sbin/service %{name}-pingd stop >/dev/null 2>&1 || :
fi

%postun -n %{name}-pingd
if [ $1 -ge 1 ] ; then
    /sbin/service %{name}-pingd condrestart > /dev/null 2>&1 || :
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING DISCLAIMER NEWS README
%{_bindir}/whatsdown
%{_bindir}/whatsup
%{_mandir}/man1/*

%files -n perl-%{libname}
%defattr(-,root,root,-)
%doc COPYING
%{_mandir}/man3/Libnodeupdown.3*
%{_mandir}/man3/Nodeupdown.3*
%{perl_vendorarch}/*
%{perl_vendorlib}/*

%files -n %{libname}-backend-pingd
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/nodeupdown/nodeupdown_backend_pingd.so

%files -n %{name}-pingd
%defattr(-,root,root,-)
%doc COPYING
%{_initrddir}/%{name}-pingd
%{_sbindir}/pingd
%dir %{_libdir}/pingd
%{_libdir}/pingd/pingd_clusterlist_hostsfile.so
%config(noreplace) %{_sysconfdir}/hostsfile
%{_mandir}/man5/pingd.conf.5*
%{_mandir}/man8/pingd.8*

%files -n %{libname}-devel
%defattr(-,root,root,-)
%doc COPYING
%{_includedir}/nodeupdown.h
%dir %{_includedir}/nodeupdown
%{_includedir}/nodeupdown/*.h
%{_libdir}/libnodeupdown*.so
%{_mandir}/man3/nodeupdown*

%files -n %{libname}
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/libnodeupdown*.so.*
%dir %{_libdir}/nodeupdown
%{_libdir}/nodeupdown/nodeupdown_clusterlist_hostsfile.so
%{_mandir}/man3/libnodeupdown.3*
%{_mandir}/man5/nodeupdown.conf.5*

%files -n %{libname}-backend-ganglia
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/nodeupdown/nodeupdown_backend_ganglia.so

%changelog
* Thu Aug 14 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.8-1
- Upstream release new version

* Fri Apr 25 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.7-1
- Initial import





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/whatsup/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Aug 2008 19:03:40 -0000	1.1
+++ .cvsignore	10 Sep 2008 12:47:06 -0000	1.2
@@ -0,0 +1 @@
+whatsup-1.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/whatsup/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Aug 2008 19:03:40 -0000	1.1
+++ sources	10 Sep 2008 12:47:06 -0000	1.2
@@ -0,0 +1 @@
+ee4fae44b83fd70ba29622e57dfadc3e  whatsup-1.8.tar.gz



From timlau at fedoraproject.org  Wed Sep 10 12:52:35 2008
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Wed, 10 Sep 2008 12:52:35 +0000 (UTC)
Subject: rpms/yum-utils/devel repoquery-unbreak.patch, NONE,
	1.1 yum-utils.spec, 1.45, 1.46
Message-ID: <20080910125235.775867012C@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yum-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5002

Modified Files:
	yum-utils.spec 
Added Files:
	repoquery-unbreak.patch 
Log Message:
Added patch to unbreak repoquery

repoquery-unbreak.patch:

--- NEW FILE repoquery-unbreak.patch ---
From: Seth Vidal <skvidal at fedoraproject.org>
Date: Thu, 28 Aug 2008 04:25:47 +0000 (-0400)
Subject: add a parens to unbreak reposync
X-Git-Url: http://devel.linux.duke.edu/gitweb/?p=yum-utils.git;a=commitdiff_plain;h=6b7a864e118df20c151c6d1d63398171e49f1fdb

add a parens to unbreak reposync
---

diff --git a/reposync.py b/reposync.py
index 339a6ca..82cf4f0 100755
--- a/reposync.py
+++ b/reposync.py
@@ -267,7 +267,7 @@ def main():
             try:
                 path = repo.getPackage(pkg)
             except yum.Errors.RepoError, e:
-                my.logger.error("Could not retrieve package %s. Error was %s" % (pkg, str(e))
+                my.logger.error("Could not retrieve package %s. Error was %s" % (pkg, str(e)))
                 continue
                 
             if opts.gpgcheck:


Index: yum-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- yum-utils.spec	27 Aug 2008 18:53:45 -0000	1.45
+++ yum-utils.spec	10 Sep 2008 12:52:05 -0000	1.46
@@ -1,10 +1,11 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
 Version: 1.1.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz
+Patch0: repoquery-unbreak.patch 
 URL: http://linux.duke.edu/yum/download/yum-utils/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -274,6 +275,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -499,6 +501,8 @@
 /etc/NetworkManager/dispatcher.d/*
 
 %changelog
+* Wed Sep 10 2008 Tim Lauridsen <timlau at fedoraproject.org>
+- Added patch to unbreak repoquery
 * Wed Aug 27 2008 Tim Lauridsen <timlau at fedoraproject.org>
 - mark as 1.1.16
 * Wed Aug 20 2008 James Antill <james at fedoraproject.org>



From limb at fedoraproject.org  Wed Sep 10 12:55:59 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 10 Sep 2008 12:55:59 +0000 (UTC)
Subject: rpms/apricots/F-9 apricots-0.2.6-alut-apricots.patch, NONE,
	1.1 apricots-0.2.6-alut-configure.patch, NONE,
	1.1 apricots-0.2.6-alut-sampleio.patch, NONE,
	1.1 apricots-0.2.6-path.patch, NONE, 1.1 apricots.desktop, NONE,
	1.1 apricots.png, NONE, 1.1 apricots.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080910125559.06A5A7012C@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/apricots/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5623

Modified Files:
	sources 
Added Files:
	apricots-0.2.6-alut-apricots.patch 
	apricots-0.2.6-alut-configure.patch 
	apricots-0.2.6-alut-sampleio.patch apricots-0.2.6-path.patch 
	apricots.desktop apricots.png apricots.spec 
Log Message:
Initial import.


apricots-0.2.6-alut-apricots.patch:

--- NEW FILE apricots-0.2.6-alut-apricots.patch ---
--- apricots/apricots.cpp	2008-08-26 12:38:27.000000000 -0500
+++ apricots/apricots.cpp	2008-08-26 12:38:27.000000000 -0500
@@ -16,6 +16,7 @@
 int main(int, char**){
 #endif
 
+atexit(SDL_Quit);
   // Initialize data
   gamedata g;
   init_data(g);

apricots-0.2.6-alut-configure.patch:

--- NEW FILE apricots-0.2.6-alut-configure.patch ---
--- configure.in	2008-08-26 12:40:55.000000000 -0500
+++ configure.in	2008-08-26 12:40:55.000000000 -0500
@@ -100,7 +100,9 @@
 
 dnl Check for OpenAL
 AC_CHECK_HEADER(AL/al.h,[CXXFLAGS="$CXXFLAGS -DAP_AUDIO_OPENAL"])
-AC_CHECK_LIB( openal, alutInit)
+dnl AC_CHECK_LIB( openal, alutInit)
+AC_CHECK_LIB( openal, alGetError)
+AC_CHECK_LIB( alut, alutInit)
 
 KDE_CHECK_EXTRA_LIBS
 all_libraries="$all_libraries $USER_LDFLAGS"

apricots-0.2.6-alut-sampleio.patch:

--- NEW FILE apricots-0.2.6-alut-sampleio.patch ---
--- apricots/sampleio.cpp	2008-08-26 12:40:09.000000000 -0500
+++ apricots/sampleio.cpp	2008-08-26 12:40:09.000000000 -0500
@@ -74,12 +74,12 @@
   alListenerfv(AL_ORIENTATION, front );
 
   // Load in samples
-  ALvoid* data = malloc(5 * (512 * 3) * 1024);
+  //ALvoid* data = malloc(5 * (512 * 3) * 1024);
   alGenBuffers(numsamples, samples);
 
   for (int i = 0; i < numsamples; i++){
-    ALsizei freq;
-    ALboolean fileok;
+    //ALsizei freq;
+    //ALboolean fileok;
     // Evil OpenAL portability fix done here
 #ifdef _WIN32
     ALenum format;
@@ -87,15 +87,17 @@
     alutLoadWAVFile(filenames[i],&format,&data,&filelen,&freq,&trash);
     fileok = (alGetError() == AL_NO_ERROR);
 #else
-    ALsizei format;
-    ALsizei trash;
-    fileok = alutLoadWAV(filenames[i],&data,&format,&filelen,&trash,&freq);
+    //ALsizei format;
+    //ALsizei trash;
+    //fileok = alutLoadWAV(filenames[i],&data,&format,&filelen,&trash,&freq);
+    samples[i] = alutCreateBufferFromFile(filenames[i]);
 #endif
-    if (!fileok){
+    //if (!fileok){
+    if (samples[i] == AL_NONE){
       cerr << "sampleio: could not open " << filenames[i] << endl;
       exit(1);
     }         
-    alBufferData(samples[i], format, data, filelen, freq);
+    //alBufferData(samples[i], format, data, filelen, freq);
   }
 
   // Generate Sources
@@ -107,7 +109,7 @@
     alSourcefv(sources[j], AL_ORIENTATION, back );
   }
   
-  free(data);
+  //free(data);
   
 }
 

apricots-0.2.6-path.patch:

--- NEW FILE apricots-0.2.6-path.patch ---
--- configure.in	2008-08-26 12:58:47.000000000 -0500
+++ configure.in	2008-08-26 12:58:47.000000000 -0500
@@ -44,7 +44,7 @@
 dnl
 unset CDPATH
 dnl make /usr/local the default for the installation
-AC_PREFIX_DEFAULT(/usr/local)
+AC_PREFIX_DEFAULT(/usr)
 
 if test "x$prefix" = "xNONE"; then
   prefix=$ac_default_prefix


--- NEW FILE apricots.desktop ---
[Desktop Entry]
Name=Apricots
GenericName=Apricots
Comment=2D air combat game
Exec=apricots
Icon=apricots
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;ArcadeGame;


--- NEW FILE apricots.spec ---
%define apricotsdir %{_datadir}/apricots
Name: apricots
Version:  0.2.6
Release:  2%{?dist}
Summary: 2D air combat game

Group: Amusements/Games
License: GPLv2
URL: http://www.fishies.org.uk/apricots.html
Source0: http://www.fishies.org.uk/apricots-%{version}.tar.gz       
Source1: apricots.png
#Icon created from screenshot on website
Source2: apricots.desktop
Patch0: apricots-0.2.6-alut-apricots.patch
Patch1: apricots-0.2.6-alut-sampleio.patch
Patch2: apricots-0.2.6-alut-configure.patch
# alut patches sent upstream.
Patch3: apricots-0.2.6-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildRequires: SDL-devel
BuildRequires: freealut-devel
BuildRequires: desktop-file-utils


%description
It's a game where you fly a little plane around the screen and
shoot things and drop bombs on enemy targets, and it's meant to be quick 
and fun.

%prep
%setup -q

chmod -x apricots/*.cpp
chmod -x apricots/*.h
chmod -x AUTHORS
chmod -x ChangeLog
chmod -x COPYING
chmod -x README
chmod -x TODO

%patch0 -p0
%patch1 -p0
%patch2 -p0
%patch3 -p0


%build
%configure
make


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -m 755 apricots/apricots %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/apricots
install -m 644 apricots/*.wav %{buildroot}%{_datadir}/apricots
mkdir -p %{buildroot}%{_sysconfdir}
install -m 644 apricots/apricots.cfg %{buildroot}%{_sysconfdir}
ln -s ../../..%{_sysconfdir}/apricots.cfg %{buildroot}%{_datadir}/apricots/apricots.cfg
install -m 644 apricots/*.psf %{buildroot}%{_datadir}/apricots
install -m 644 apricots/*.shapes %{buildroot}%{_datadir}/apricots

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE2}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps
install -p -m 644 %{SOURCE1} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps


%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{_bindir}/apricots
%{_datadir}/apricots
%{_datadir}/applications/fedora-apricots.desktop
%{_datadir}/icons/hicolor/24x24/apps/apricots.png
%config(noreplace) %{_sysconfdir}/apricots.cfg


%changelog
* Tue Sep 09 2008 Jon Ciesla <limb at jcomserv.net> - 0.2.6-2
- Re-base off of pristine tarball, md5 error in review.

* Tue Aug 26 2008 Jon Ciesla <limb at jcomserv.net> - 0.2.6-1
- Initial packaging.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apricots/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 01:07:14 -0000	1.1
+++ sources	10 Sep 2008 12:55:58 -0000	1.2
@@ -0,0 +1 @@
+910828d717e46d8cbd9c24f702d09fbc  apricots-0.2.6.tar.gz



From svahl at fedoraproject.org  Wed Sep 10 12:58:09 2008
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Wed, 10 Sep 2008 12:58:09 +0000 (UTC)
Subject: rpms/kgrab/F-9 .cvsignore, 1.3, 1.4 kgrab.spec, 1.7, 1.8 sources,
	1.3, 1.4
Message-ID: <20080910125809.E23827012C@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kgrab/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5892/F-9

Modified Files:
	.cvsignore kgrab.spec sources 
Log Message:
devel: fix source0 and changelog; f9: update to kde-4.1.1 version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kgrab/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Aug 2008 22:04:13 -0000	1.3
+++ .cvsignore	10 Sep 2008 12:57:39 -0000	1.4
@@ -1 +1,2 @@
 kgrab-0.1.1-kde4.1.0.tar.bz2
+kgrab-0.1.1-kde4.1.1.tar.bz2


Index: kgrab.spec
===================================================================
RCS file: /cvs/extras/rpms/kgrab/F-9/kgrab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kgrab.spec	28 Aug 2008 22:04:13 -0000	1.7
+++ kgrab.spec	10 Sep 2008 12:57:39 -0000	1.8
@@ -3,13 +3,13 @@
 
 Name:           kgrab
 Version:        0.1.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A screen grabbing utility
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://extragear.kde.org
-Source0:        ftp://ftp.kde.org/pub/kde/stable/4.1.0/src/extragear/%{name}-%{version}-kde4.1.0.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/4.1.1/src/extragear/%{name}-%{version}-kde4.1.1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs4-devel >= 4
@@ -28,7 +28,7 @@
 kgrab is a screen grabbing utility for KDE.
 
 %prep
-%setup -qn %{name}-%{version}-kde4.1.0
+%setup -qn %{name}-%{version}-kde4.1.1
 
 %build
 
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Fri Aug 29 2008 Than Ngo <than at redhat.com> 0.1.1-9
+- 4.1.1
+
 * Thu Aug 28 2008 Sebastian Vahl <fedora at deadbabylon.de> 0.1.1-8
 - 4.1 (final)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kgrab/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Aug 2008 22:04:13 -0000	1.3
+++ sources	10 Sep 2008 12:57:39 -0000	1.4
@@ -1 +1 @@
-11aec9dbc49dfaa971b255676f43509d  kgrab-0.1.1-kde4.1.0.tar.bz2
+1318071a0d9315a4721435abdb226450  kgrab-0.1.1-kde4.1.1.tar.bz2



From svahl at fedoraproject.org  Wed Sep 10 12:58:10 2008
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Wed, 10 Sep 2008 12:58:10 +0000 (UTC)
Subject: rpms/kgrab/devel kgrab.spec,1.9,1.10
Message-ID: <20080910125810.06E6C7012C@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kgrab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5892/devel

Modified Files:
	kgrab.spec 
Log Message:
devel: fix source0 and changelog; f9: update to kde-4.1.1 version


Index: kgrab.spec
===================================================================
RCS file: /cvs/extras/rpms/kgrab/devel/kgrab.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kgrab.spec	29 Aug 2008 16:57:00 -0000	1.9
+++ kgrab.spec	10 Sep 2008 12:57:39 -0000	1.10
@@ -9,7 +9,7 @@
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://extragear.kde.org
-Source0:        ftp://ftp.kde.org/pub/kde/stable/4.1.0/src/extragear/%{name}-%{version}-kde4.1.1.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/4.1.1/src/extragear/%{name}-%{version}-kde4.1.1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs4-devel >= 4
@@ -72,7 +72,7 @@
 
 
 %changelog
-* Fri Aug 29 2008 Than Ngo <than at redhat.com> 0.1.1-8
+* Fri Aug 29 2008 Than Ngo <than at redhat.com> 0.1.1-9
 - 4.1.1
 
 * Thu Aug 28 2008 Sebastian Vahl <fedora at deadbabylon.de> 0.1.1-8



From pertusus at fedoraproject.org  Wed Sep 10 12:59:32 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Wed, 10 Sep 2008 12:59:32 +0000 (UTC)
Subject: rpms/gdal/devel gdal-libdap.patch,NONE,1.1 gdal.spec,1.47,1.48
Message-ID: <20080910125932.476C17012C@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gdal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6149

Modified Files:
	gdal.spec 
Added Files:
	gdal-libdap.patch 
Log Message:
* Tue Sep  9 2008 Patrice Dumas <pertusus at free.fr> - 1.5.2-2
- patch for libdap > 0.8.0, from Rob Cermak


gdal-libdap.patch:

--- NEW FILE gdal-libdap.patch ---
diff -up gdal-1.5.2-fedora/frmts/dods/dodsdataset2.cpp.libdap~ gdal-1.5.2-fedora/frmts/dods/dodsdataset2.cpp
--- gdal-1.5.2-fedora/frmts/dods/dodsdataset2.cpp.libdap~	2008-09-09 16:49:39.000000000 +0200
+++ gdal-1.5.2-fedora/frmts/dods/dodsdataset2.cpp	2008-09-09 16:50:05.000000000 +0200
@@ -67,6 +67,8 @@ CPL_C_START
 void GDALRegister_DODS(void);
 CPL_C_END
 
+using namespace libdap ;
+
 /** Attribute names used to encode geo-referencing information. Note that
     these are not C++ objects to avoid problems with static global
     constructors. 
diff -up gdal-1.5.2-fedora/ogr/ogrsf_frmts/dods/ogr_dods.h.libdap~ gdal-1.5.2-fedora/ogr/ogrsf_frmts/dods/ogr_dods.h
--- gdal-1.5.2-fedora/ogr/ogrsf_frmts/dods/ogr_dods.h.libdap~	2008-09-09 16:50:50.000000000 +0200
+++ gdal-1.5.2-fedora/ogr/ogrsf_frmts/dods/ogr_dods.h	2008-09-09 16:51:19.000000000 +0200
@@ -68,6 +68,8 @@
 #include <Error.h>
 #include <escaping.h>
 
+using namespace libdap ;
+
 /************************************************************************/
 /*                           OGRDODSFieldDefn                           */
 /************************************************************************/


Index: gdal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdal/devel/gdal.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gdal.spec	12 Jun 2008 19:48:03 -0000	1.47
+++ gdal.spec	10 Sep 2008 12:59:02 -0000	1.48
@@ -1,6 +1,6 @@
 Name:      gdal
 Version:   1.5.2
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   GIS file format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -9,6 +9,7 @@
 Source1:   http://download.osgeo.org/gdal/gdalautotest-1.5.0.tar.gz
 Patch0:    %{name}-perl510.patch
 Patch1:    %{name}-sincos.patch
+Patch2:    %{name}-libdap.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool pkgconfig
 BuildRequires: libpng-devel libungif-devel libjpeg-devel libtiff-devel
@@ -95,6 +96,7 @@
 %setup -q -n %{name}-%{version}-fedora
 %patch0 -p0 -b .perl510~
 %patch1 -p0 -b .sincos~
+%patch2 -p1 -b .libdap~
 
 # unpack test cases olso.
 tar -xzf %{SOURCE1} .
@@ -518,6 +520,9 @@
 %endif
 
 %changelog
+* Tue Sep  9 2008 Patrice Dumas <pertusus at free.fr> - 1.5.2-2
+- patch for libdap > 0.8.0, from Rob Cermak
+
 * Thu Jun 12 2008 Balint Cristian <rezso at rdsor.ro> - 1.5.2-1
 - a new bugfix upstream
 - drop gcc43 patch



From timlau at fedoraproject.org  Wed Sep 10 13:00:37 2008
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Wed, 10 Sep 2008 13:00:37 +0000 (UTC)
Subject: rpms/yum-utils/F-9 repoquery-unbreak.patch, NONE, 1.1 yum-utils.spec,
	1.43, 1.44
Message-ID: <20080910130037.3E2397012C@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yum-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6310

Modified Files:
	yum-utils.spec 
Added Files:
	repoquery-unbreak.patch 
Log Message:
Added patch to unbreak repoquery

repoquery-unbreak.patch:

--- NEW FILE repoquery-unbreak.patch ---
From: Seth Vidal <skvidal at fedoraproject.org>
Date: Thu, 28 Aug 2008 04:25:47 +0000 (-0400)
Subject: add a parens to unbreak reposync
X-Git-Url: http://devel.linux.duke.edu/gitweb/?p=yum-utils.git;a=commitdiff_plain;h=6b7a864e118df20c151c6d1d63398171e49f1fdb

add a parens to unbreak reposync
---

diff --git a/reposync.py b/reposync.py
index 339a6ca..82cf4f0 100755
--- a/reposync.py
+++ b/reposync.py
@@ -267,7 +267,7 @@ def main():
             try:
                 path = repo.getPackage(pkg)
             except yum.Errors.RepoError, e:
-                my.logger.error("Could not retrieve package %s. Error was %s" % (pkg, str(e))
+                my.logger.error("Could not retrieve package %s. Error was %s" % (pkg, str(e)))
                 continue
                 
             if opts.gpgcheck:


Index: yum-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/F-9/yum-utils.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- yum-utils.spec	28 Aug 2008 04:44:42 -0000	1.43
+++ yum-utils.spec	10 Sep 2008 13:00:07 -0000	1.44
@@ -1,10 +1,11 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
 Version: 1.1.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz
+Patch0: repoquery-unbreak.patch 
 URL: http://linux.duke.edu/yum/download/yum-utils/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -274,6 +275,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -499,6 +501,8 @@
 /etc/NetworkManager/dispatcher.d/*
 
 %changelog
+* Wed Sep 10 2008 Tim Lauridsen <timlau at fedoraproject.org>
+- Added patch to unbreak repoquery
 * Wed Aug 27 2008 Tim Lauridsen <timlau at fedoraproject.org>
 - mark as 1.1.16
 * Wed Aug 20 2008 James Antill <james at fedoraproject.org>



From tbzatek at fedoraproject.org  Wed Sep 10 13:18:26 2008
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Wed, 10 Sep 2008 13:18:26 +0000 (UTC)
Subject: rpms/sabayon/devel sabayon-lockdown-save.patch, NONE,
	1.1 sabayon.spec, 1.52, 1.53
Message-ID: <20080910131826.7B44B7012C@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7440

Modified Files:
	sabayon.spec 
Added Files:
	sabayon-lockdown-save.patch 
Log Message:
* Wed Sep 10 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.22.0-4
- Fix saving lockdown settings


sabayon-lockdown-save.patch:

--- NEW FILE sabayon-lockdown-save.patch ---
Index: lib/storage.py
===================================================================
--- lib/storage.py	(revision 1010)
+++ lib/storage.py	(working copy)
@@ -601,7 +601,7 @@
                         # We need to stop if we are recursing inside a ignored 
                         # directory.
                         if util.should_ignore_dir (homedir, 
-                                DIRECTORIES_TO_IGNORE, os.path.join(homedir, name, f)):
+                                DIRECTORIES_TO_IGNORE_PROFILE, os.path.join(homedir, name, f)):
                             dprint ("Not going inside %s as it is an ignored directory.", path)
                         else:
                             zip_directory (save_zip,
@@ -613,7 +613,7 @@
                         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, 
-                                DIRECTORIES_TO_IGNORE, FILES_TO_IGNORE, os.path.join(homedir, name, f)):
+                                DIRECTORIES_TO_IGNORE_PROFILE, FILES_TO_IGNORE, os.path.join(homedir, name, f)):
                             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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sabayon.spec	23 Apr 2008 02:51:44 -0000	1.52
+++ sabayon.spec	10 Sep 2008 13:17:56 -0000	1.53
@@ -8,7 +8,7 @@
 
 Name:    sabayon
 Version: 2.22.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -24,6 +24,9 @@
 # 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
 Requires: pygtk2 >= %{pygtk2_version}
@@ -93,6 +96,7 @@
 
 %patch1 -p1 -b .xephyr
 %patch3 -p1 -b .selinux
+%patch4 -p0 -b .gconfsave
 
 %build
 
@@ -281,6 +285,9 @@
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Wed Sep 10 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.22.0-4
+- Fix saving lockdown settings
+
 * Tue Apr 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-3
 - Actually apply the Xephyr patch
 



From pkgdb at fedoraproject.org  Wed Sep 10 13:24:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:24:56 +0000
Subject: [pkgdb] pioneers ownership updated
Message-ID: <20080910132456.67AA7208D0F@bastion.fedora.phx.redhat.com>

Package pioneers in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pioneers



From pkgdb at fedoraproject.org  Wed Sep 10 13:24:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:24:57 +0000
Subject: [pkgdb] pioneers ownership updated
Message-ID: <20080910132457.C839E208D97@bastion.fedora.phx.redhat.com>

Package pioneers in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pioneers



From pkgdb at fedoraproject.org  Wed Sep 10 13:25:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:25:02 +0000
Subject: [pkgdb] pioneers ownership updated
Message-ID: <20080910132503.0AB12208D9B@bastion.fedora.phx.redhat.com>

Package pioneers in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pioneers



From pkgdb at fedoraproject.org  Wed Sep 10 13:24:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:24:59 +0000
Subject: [pkgdb] pioneers ownership updated
Message-ID: <20080910132500.1FC8A208D98@bastion.fedora.phx.redhat.com>

Package pioneers in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pioneers



From pkgdb at fedoraproject.org  Wed Sep 10 13:27:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:27:00 +0000
Subject: [pkgdb] arj: jwrdegoede has given up watchbugzilla
Message-ID: <20080910132700.130EE208D97@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on arj (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Wed Sep 10 13:27:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:27:03 +0000
Subject: [pkgdb] arj: jwrdegoede has given up commit
Message-ID: <20080910132703.2647A208DA0@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on arj (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Wed Sep 10 13:27:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:27:01 +0000
Subject: [pkgdb] arj: jwrdegoede has given up watchcommits
Message-ID: <20080910132701.37E9D208D9C@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on arj (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Wed Sep 10 13:27:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:27:04 +0000
Subject: [pkgdb] arj: jwrdegoede has given up approveacls
Message-ID: <20080910132704.89811208DA2@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on arj (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Wed Sep 10 13:27:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:27:05 +0000
Subject: [pkgdb] arj: jwrdegoede has given up watchbugzilla
Message-ID: <20080910132706.0932B208DA5@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on arj (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Wed Sep 10 13:27:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:27:07 +0000
Subject: [pkgdb] arj: jwrdegoede has given up watchcommits
Message-ID: <20080910132707.1BFBE208DA9@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on arj (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Wed Sep 10 13:27:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:27:08 +0000
Subject: [pkgdb] arj: jwrdegoede has given up commit
Message-ID: <20080910132708.323DE208DAE@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on arj (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Wed Sep 10 13:27:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:27:09 +0000
Subject: [pkgdb] arj: jwrdegoede has given up approveacls
Message-ID: <20080910132709.4C2AD208DB1@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on arj (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Wed Sep 10 13:28:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:28:24 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has given up watchbugzilla
Message-ID: <20080910132824.43B16208D98@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on gnome-games (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:28:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:28:25 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has given up watchcommits
Message-ID: <20080910132825.E2504208DA9@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on gnome-games (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:28:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:28:26 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has given up commit
Message-ID: <20080910132826.ACBAA208DAC@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on gnome-games (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:28:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:28:27 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has given up approveacls
Message-ID: <20080910132828.0178F208DAF@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on gnome-games (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:28:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:28:45 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has requested watchbugzilla
Message-ID: <20080910132845.B2021208DA6@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the watchbugzilla acl on gnome-games (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:28:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:28:46 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has requested watchcommits
Message-ID: <20080910132846.10BD3208DA3@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the watchcommits acl on gnome-games (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:28:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:28:47 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has requested approveacls
Message-ID: <20080910132847.4EAA2208DB4@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the approveacls acl on gnome-games (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:28:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:28:46 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has requested commit
Message-ID: <20080910132847.692DF208D97@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the commit acl on gnome-games (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:06 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has given up watchbugzilla
Message-ID: <20080910132907.1482E208DA8@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on gnome-games (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:08 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has given up watchcommits
Message-ID: <20080910132908.776C52D0025@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on gnome-games (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:10 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has given up commit
Message-ID: <20080910132910.283EB2D0028@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on gnome-games (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:12 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has given up approveacls
Message-ID: <20080910132912.414022D002B@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on gnome-games (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:21 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has given up watchbugzilla
Message-ID: <20080910132921.C2A372D002E@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on gnome-games (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:22 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has given up watchcommits
Message-ID: <20080910132922.C302C208DB0@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on gnome-games (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:25 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has given up approveacls
Message-ID: <20080910132925.5B7652D0034@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on gnome-games (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:23 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has given up commit
Message-ID: <20080910132923.E95252D0031@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on gnome-games (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:30 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has given up watchbugzilla
Message-ID: <20080910132930.E15B6208D9C@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on gnome-games (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:31 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has given up watchcommits
Message-ID: <20080910132932.10591208DAF@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on gnome-games (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:32 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has given up commit
Message-ID: <20080910132933.0742E208DB7@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on gnome-games (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:35 +0000
Subject: [pkgdb] gnome-games: jwrdegoede has given up approveacls
Message-ID: <20080910132935.3BA402D0038@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on gnome-games (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-games



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:43 +0000
Subject: [pkgdb] goffice04: jwrdegoede has given up watchbugzilla
Message-ID: <20080910132943.B2EE12D003C@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on goffice04 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goffice04



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:44 +0000
Subject: [pkgdb] goffice04: jwrdegoede has given up watchcommits
Message-ID: <20080910132944.DC3E7208DBC@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on goffice04 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goffice04



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:46 +0000
Subject: [pkgdb] goffice04: jwrdegoede has given up commit
Message-ID: <20080910132946.627612D0042@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on goffice04 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goffice04



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:47 +0000
Subject: [pkgdb] goffice04: jwrdegoede has given up approveacls
Message-ID: <20080910132947.255A22D0047@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on goffice04 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goffice04



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:49 +0000
Subject: [pkgdb] goffice04: jwrdegoede has given up approveacls
Message-ID: <20080910132949.B0968208DA3@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on goffice04 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goffice04



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:50 +0000
Subject: [pkgdb] goffice04: jwrdegoede has given up commit
Message-ID: <20080910132950.8E6692D004A@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on goffice04 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goffice04



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:52 +0000
Subject: [pkgdb] goffice04: jwrdegoede has given up watchcommits
Message-ID: <20080910132952.759F6208DC1@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on goffice04 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goffice04



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:59 +0000
Subject: [pkgdb] goffice04: jwrdegoede has given up watchbugzilla
Message-ID: <20080910132959.6AD7F208DC6@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on goffice04 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goffice04



From pkgdb at fedoraproject.org  Wed Sep 10 13:29:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:29:54 +0000
Subject: [pkgdb] goffice04: jwrdegoede has given up watchbugzilla
Message-ID: <20080910132955.4F8DC208DB3@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on goffice04 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goffice04



From pkgdb at fedoraproject.org  Wed Sep 10 13:30:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:30:00 +0000
Subject: [pkgdb] goffice04: jwrdegoede has given up watchbugzilla
Message-ID: <20080910133000.9BE98208DCA@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on goffice04 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goffice04



From pkgdb at fedoraproject.org  Wed Sep 10 13:30:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:30:01 +0000
Subject: [pkgdb] goffice04: jwrdegoede has given up watchcommits
Message-ID: <20080910133001.B90C1208DCD@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on goffice04 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goffice04



From pkgdb at fedoraproject.org  Wed Sep 10 13:30:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:30:03 +0000
Subject: [pkgdb] goffice04: jwrdegoede has given up watchcommits
Message-ID: <20080910133003.4622B208DCF@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on goffice04 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goffice04



From pkgdb at fedoraproject.org  Wed Sep 10 13:30:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:30:04 +0000
Subject: [pkgdb] goffice04: jwrdegoede has given up commit
Message-ID: <20080910133004.CE35E208DD1@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on goffice04 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goffice04



From pkgdb at fedoraproject.org  Wed Sep 10 13:30:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:30:05 +0000
Subject: [pkgdb] goffice04: jwrdegoede has given up commit
Message-ID: <20080910133005.AFC6E2D004D@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on goffice04 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goffice04



From pkgdb at fedoraproject.org  Wed Sep 10 13:30:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:30:06 +0000
Subject: [pkgdb] goffice04: jwrdegoede has given up approveacls
Message-ID: <20080910133006.C88CD2D004E@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on goffice04 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goffice04



From pkgdb at fedoraproject.org  Wed Sep 10 13:30:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:30:10 +0000
Subject: [pkgdb] goffice04: jwrdegoede has given up approveacls
Message-ID: <20080910133010.792732D0052@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on goffice04 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goffice04



From pkgdb at fedoraproject.org  Wed Sep 10 13:30:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:30:40 +0000
Subject: [pkgdb] id3lib: jwrdegoede has given up watchbugzilla
Message-ID: <20080910133040.7E08A2D0027@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on id3lib (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3lib



From pkgdb at fedoraproject.org  Wed Sep 10 13:30:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:30:41 +0000
Subject: [pkgdb] id3lib: jwrdegoede has given up watchcommits
Message-ID: <20080910133041.A7E5E2D0056@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on id3lib (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3lib



From pkgdb at fedoraproject.org  Wed Sep 10 13:30:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:30:41 +0000
Subject: [pkgdb] id3lib: jwrdegoede has given up watchcommits
Message-ID: <20080910133041.DDB432D0059@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on id3lib (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3lib



From pkgdb at fedoraproject.org  Wed Sep 10 13:30:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:30:45 +0000
Subject: [pkgdb] id3lib: jwrdegoede has given up watchbugzilla
Message-ID: <20080910133045.6AB18208DAA@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on id3lib (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3lib



From pkgdb at fedoraproject.org  Wed Sep 10 13:32:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:32:00 +0000
Subject: [pkgdb] imlib2: jwrdegoede has given up watchbugzilla
Message-ID: <20080910133200.AB6042D0030@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on imlib2 (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imlib2



From pkgdb at fedoraproject.org  Wed Sep 10 13:32:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:32:02 +0000
Subject: [pkgdb] imlib2: jwrdegoede has given up commit
Message-ID: <20080910133202.8EB5D208DA6@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on imlib2 (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imlib2



From pkgdb at fedoraproject.org  Wed Sep 10 13:32:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:32:02 +0000
Subject: [pkgdb] imlib2: jwrdegoede has given up watchcommits
Message-ID: <20080910133202.DE0D92D0035@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on imlib2 (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imlib2



From pkgdb at fedoraproject.org  Wed Sep 10 13:32:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:32:04 +0000
Subject: [pkgdb] imlib2: jwrdegoede has given up approveacls
Message-ID: <20080910133204.A57892D003B@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on imlib2 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imlib2



From pkgdb at fedoraproject.org  Wed Sep 10 13:32:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:32:04 +0000
Subject: [pkgdb] imlib2: jwrdegoede has given up approveacls
Message-ID: <20080910133204.A03E22D003A@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on imlib2 (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imlib2



From pkgdb at fedoraproject.org  Wed Sep 10 13:32:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:32:05 +0000
Subject: [pkgdb] imlib2: jwrdegoede has given up commit
Message-ID: <20080910133205.425132D003E@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on imlib2 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imlib2



From pkgdb at fedoraproject.org  Wed Sep 10 13:32:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:32:06 +0000
Subject: [pkgdb] imlib2: jwrdegoede has given up watchcommits
Message-ID: <20080910133206.D249A2D005E@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on imlib2 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imlib2



From pkgdb at fedoraproject.org  Wed Sep 10 13:32:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:32:10 +0000
Subject: [pkgdb] imlib2: jwrdegoede has given up watchbugzilla
Message-ID: <20080910133210.C3F802D0062@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on imlib2 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imlib2



From timlau at fedoraproject.org  Wed Sep 10 13:32:29 2008
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Wed, 10 Sep 2008 13:32:29 +0000 (UTC)
Subject: rpms/yum-utils/F-8 repoquery-unbreak.patch, NONE, 1.1 yum-utils.spec,
	1.36, 1.37
Message-ID: <20080910133229.561E77012C@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yum-utils/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8172

Modified Files:
	yum-utils.spec 
Added Files:
	repoquery-unbreak.patch 
Log Message:
Added patch to unbreak repoquery

repoquery-unbreak.patch:

--- NEW FILE repoquery-unbreak.patch ---
From: Seth Vidal <skvidal at fedoraproject.org>
Date: Thu, 28 Aug 2008 04:25:47 +0000 (-0400)
Subject: add a parens to unbreak reposync
X-Git-Url: http://devel.linux.duke.edu/gitweb/?p=yum-utils.git;a=commitdiff_plain;h=6b7a864e118df20c151c6d1d63398171e49f1fdb

add a parens to unbreak reposync
---

diff --git a/reposync.py b/reposync.py
index 339a6ca..82cf4f0 100755
--- a/reposync.py
+++ b/reposync.py
@@ -267,7 +267,7 @@ def main():
             try:
                 path = repo.getPackage(pkg)
             except yum.Errors.RepoError, e:
-                my.logger.error("Could not retrieve package %s. Error was %s" % (pkg, str(e))
+                my.logger.error("Could not retrieve package %s. Error was %s" % (pkg, str(e)))
                 continue
                 
             if opts.gpgcheck:


Index: yum-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/F-8/yum-utils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- yum-utils.spec	28 Aug 2008 04:55:12 -0000	1.36
+++ yum-utils.spec	10 Sep 2008 13:31:59 -0000	1.37
@@ -1,10 +1,11 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
 Version: 1.1.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz
+Patch0: repoquery-unbreak.patch 
 URL: http://linux.duke.edu/yum/download/yum-utils/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -274,6 +275,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -499,6 +501,8 @@
 /etc/NetworkManager/dispatcher.d/*
 
 %changelog
+* Wed Sep 10 2008 Tim Lauridsen <timlau at fedoraproject.org>
+- Added patch to unbreak repoquery
 * Wed Aug 27 2008 Tim Lauridsen <timlau at fedoraproject.org>
 - mark as 1.1.16
 * Wed Aug 20 2008 James Antill <james at fedoraproject.org>



From pkgdb at fedoraproject.org  Wed Sep 10 13:32:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:32:40 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up commit
Message-ID: <20080910133240.41A942D0064@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on qemu (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:32:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:32:41 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up approveacls
Message-ID: <20080910133241.504BE2D0067@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on qemu (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:32:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:32:48 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up approveacls
Message-ID: <20080910133248.68523208DBD@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on qemu (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:32:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:32:49 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up commit
Message-ID: <20080910133249.8F4D72D006A@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on qemu (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:32:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:32:54 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up commit
Message-ID: <20080910133254.8252E208DDA@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on qemu (Fedora 3)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:32:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:32:57 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up approveacls
Message-ID: <20080910133258.62E43208DDD@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on qemu (Fedora 3)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:32:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:32:58 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up commit
Message-ID: <20080910133258.4B009208DDB@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on qemu (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:32:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:32:58 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up approveacls
Message-ID: <20080910133258.A75CB208DE0@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on qemu (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:02 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up commit
Message-ID: <20080910133302.CF1D1208DE4@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on qemu (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:04 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up approveacls
Message-ID: <20080910133304.5F391208DE6@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on qemu (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:04 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up approveacls
Message-ID: <20080910133304.D97142D006C@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on qemu (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:06 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up commit
Message-ID: <20080910133306.CD95C2D006E@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on qemu (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:13 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up commit
Message-ID: <20080910133313.324562D0073@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on qemu (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:14 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up approveacls
Message-ID: <20080910133314.4F6E82D0077@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on qemu (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:15 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up approveacls
Message-ID: <20080910133316.062772D007B@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on qemu (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:17 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up commit
Message-ID: <20080910133317.A1B7F2D007F@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on qemu (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:23 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up commit
Message-ID: <20080910133323.7FFFB2D0083@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on qemu (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:25 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up approveacls
Message-ID: <20080910133325.48B582D0088@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on qemu (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:25 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up approveacls
Message-ID: <20080910133325.E5BEE2D008C@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the approveacls acl on qemu (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:27 +0000
Subject: [pkgdb] qemu: jwrdegoede has given up commit
Message-ID: <20080910133327.2F7FA2D008F@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the commit acl on qemu (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:35 +0000
Subject: [pkgdb] qmmp: jwrdegoede has given up watchcommits
Message-ID: <20080910133335.D0CA1208DB5@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on qmmp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qmmp



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:36 +0000
Subject: [pkgdb] qmmp: jwrdegoede has given up watchbugzilla
Message-ID: <20080910133336.C2B552D0094@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on qmmp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qmmp



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:39 +0000
Subject: [pkgdb] qmmp: jwrdegoede has given up watchcommits
Message-ID: <20080910133339.CC2772D009B@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on qmmp (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qmmp



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:38 +0000
Subject: [pkgdb] qmmp: jwrdegoede has given up watchbugzilla
Message-ID: <20080910133338.C955E2D0097@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on qmmp (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qmmp



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:42 +0000
Subject: [pkgdb] qmmp: jwrdegoede has given up watchcommits
Message-ID: <20080910133342.5F1F42D009A@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on qmmp (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qmmp



From pkgdb at fedoraproject.org  Wed Sep 10 13:34:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:34:10 +0000
Subject: [pkgdb] svgalib: jwrdegoede has given up watchbugzilla
Message-ID: <20080910133410.CE67E2E000D@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on svgalib (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/svgalib



From perex at fedoraproject.org  Wed Sep 10 13:43:04 2008
From: perex at fedoraproject.org (Jaroslav Kysela)
Date: Wed, 10 Sep 2008 13:43:04 +0000 (UTC)
Subject: rpms/alsa-lib/devel alsactl.conf, NONE, 1.1 asound.conf, NONE,
	1.1 .cvsignore, 1.33, 1.34 alsa-lib.spec, 1.72, 1.73 sources,
	1.37, 1.38 alsa-lib-pulse-default.patch, 1.1, NONE
Message-ID: <20080910134304.C15097012C@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9012

Modified Files:
	.cvsignore alsa-lib.spec sources 
Added Files:
	alsactl.conf asound.conf 
Removed Files:
	alsa-lib-pulse-default.patch 
Log Message:
alsa-lib: updated to 1.0.18rc3 and new configuration style


--- NEW FILE alsactl.conf ---
#
# ALSA library configuration file for alsactl tool
# (/usr/share/alsa tree is not necessary for alsactl)
#

ctl.hw {
	@args [ CARD ]
	@args.CARD {
		type string
		default "0"
	}
	type hw
	card $CARD
}


--- NEW FILE asound.conf ---
#
# Place your global alsa-lib configuration here...
#

@hooks [
	{
		func load
		files [
			"/etc/alsa/pulse-default.conf"
		]
		errors false
	}
]


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	15 Aug 2008 16:22:42 -0000	1.33
+++ .cvsignore	10 Sep 2008 13:42:34 -0000	1.34
@@ -20,3 +20,4 @@
 alsa-lib-1.0.16.tar.bz2
 alsa-lib-1.0.17.tar.bz2
 alsa-lib-1.0.17a.tar.bz2
+alsa-lib-1.0.18rc3.tar.bz2


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- alsa-lib.spec	15 Aug 2008 16:22:42 -0000	1.72
+++ alsa-lib.spec	10 Sep 2008 13:42:34 -0000	1.73
@@ -1,17 +1,18 @@
-#define  prever         rc3
-#define  prever_dot     .rc3
-%define postver		a
+%define  prever         rc3
+%define  prever_dot     .rc3
+#define postver		a
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
-Version: 1.0.17
+Version: 1.0.18
 Release: 3%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
+Source10: asound.conf
+Source11: alsactl.conf
 Patch0:  alsa-lib-1.0.17-config.patch
 Patch2:  alsa-lib-1.0.14-glibc-open.patch
-Patch3:	 alsa-lib-pulse-default.patch
 Patch4:	 alsa-lib-1.0.16-no-dox-date.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -43,11 +44,10 @@
 %setup -q -n %{name}-%{version}%{?prever}%{?postver}
 %patch0 -p1 -b .config
 %patch2 -p1 -b .glibc-open
-%patch3 -p1 -b .pulse-default
 %patch4 -p1 -b .no-dox-date
 
 %build
-%configure --with-configdir=%{_sysconfdir}/alsa
+%configure --disable-aload
 # Remove useless /usr/lib64 rpath on 64bit archs
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -63,6 +63,11 @@
 mv %{buildroot}%{_libdir}/libasound.so.* %{buildroot}/%{_lib}
 ln -snf ../../%{_lib}/libasound.so.2 %{buildroot}%{_libdir}/libasound.so
 
+# Install global configuration files
+mkdir -p -m 755 $RPM_BUILD_ROOT/etc/alsa
+install -p -m 644 %{SOURCE10} %{buildroot}/etc
+install -p -m 644 %{SOURCE11} %{buildroot}/etc/alsa
+
 %clean
 rm -rf %{buildroot}
 
@@ -70,16 +75,15 @@
 
 %postun -p /sbin/ldconfig
 
-%triggerpostun -- alsa-lib < 1.0.6-2
-ln -snf ../../etc/alsa %{_datadir}/alsa
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog TODO doc/asoundrc.txt
 %config %{_sysconfdir}/alsa/
+%config %{_sysconfdir}/asound.conf
 /%{_lib}/libasound.so.*
 %{_bindir}/aserver
 %{_libdir}/alsa-lib/
+%(_datadir)/alsa/
 
 %files devel
 %defattr(-,root,root,-)
@@ -92,6 +96,13 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Wed Sep 10 2008 Jaroslav Kysela <jkysela at redhat.com> - 1.0.18-1.rc3
+- updated to 1.0.18rc3
+- moved /etc/alsa configuration files back to /usr/share/alsa
+- removed pulse default patch (moved to /etc/asound.conf)
+- added /etc/asound.conf and /etc/alsa/alsactl.conf
+- disable /dev/aload device checking (obsolete for 2.6 kernels)
+
 * Fri Aug 15 2008 Jaroslav Kysela <jkysela at redhat.com> - 1.0.17-3
 - updated to 1.0.17a
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	15 Aug 2008 16:22:42 -0000	1.37
+++ sources	10 Sep 2008 13:42:34 -0000	1.38
@@ -1 +1 @@
-4284535ff10f5e71152f8f69b325d08d  alsa-lib-1.0.17a.tar.bz2
+748b7ac75102b9b4523827b81e4c1f00  alsa-lib-1.0.18rc3.tar.bz2


--- alsa-lib-pulse-default.patch DELETED ---



From tmraz at fedoraproject.org  Wed Sep 10 13:44:45 2008
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 10 Sep 2008 13:44:45 +0000 (UTC)
Subject: rpms/cyrus-sasl/devel cyrus-sasl-2.1.22-warnings.patch, NONE,
	1.1 .cvsignore, 1.18, 1.19 cyrus-sasl.spec, 1.71,
	1.72 sasl-mechlist.c, 1.1, 1.2 sources, 1.21,
	1.22 cyrus-sasl-2.1.22-db_bundle.patch, 1.2, NONE
Message-ID: <20080910134445.BC3A87012C@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9334

Modified Files:
	.cvsignore cyrus-sasl.spec sasl-mechlist.c sources 
Added Files:
	cyrus-sasl-2.1.22-warnings.patch 
Removed Files:
	cyrus-sasl-2.1.22-db_bundle.patch 
Log Message:
* Wed Sep 29 2008 Tomas Mraz <tmraz at redhat.com> - 2.1.22-18
- fix most critical build warnings (#433583)
- use external db4


cyrus-sasl-2.1.22-warnings.patch:

--- NEW FILE cyrus-sasl-2.1.22-warnings.patch ---
diff -up cyrus-sasl-2.1.22/lib/auxprop.c.warnings cyrus-sasl-2.1.22/lib/auxprop.c
--- cyrus-sasl-2.1.22/lib/auxprop.c.warnings	2006-03-14 15:23:55.000000000 +0100
+++ cyrus-sasl-2.1.22/lib/auxprop.c	2008-09-10 14:31:01.000000000 +0200
@@ -46,6 +46,7 @@
 #include <sasl.h>
 #include <prop.h>
 #include <ctype.h>
+#include <stdio.h>
 #include "saslint.h"
 
 struct proppool 
diff -up cyrus-sasl-2.1.22/lib/server.c.warnings cyrus-sasl-2.1.22/lib/server.c
--- cyrus-sasl-2.1.22/lib/server.c.warnings	2006-05-17 18:46:13.000000000 +0200
+++ cyrus-sasl-2.1.22/lib/server.c	2008-09-10 14:39:02.000000000 +0200
@@ -517,7 +517,7 @@ static int load_config(const sasl_callba
             goto done;
         }
 
-        snprintf(config_filename, len, "%.*s%c%s.conf", path_len, path_to_config, 
+        snprintf(config_filename, len, "%.*s%c%s.conf", (int)path_len, path_to_config, 
 	        HIER_DELIMITER, global_callbacks.appname);
 
         /* Ask the application if it's safe to use this file */
diff -up cyrus-sasl-2.1.22/plugins/gssapi.c.warnings cyrus-sasl-2.1.22/plugins/gssapi.c
--- cyrus-sasl-2.1.22/plugins/gssapi.c.warnings	2004-07-21 16:39:06.000000000 +0200
+++ cyrus-sasl-2.1.22/plugins/gssapi.c	2008-09-10 14:20:59.000000000 +0200
@@ -190,7 +190,8 @@ sasl_gss_seterror_(const sasl_utils_t *u
     OM_uint32 msg_ctx;
     int ret;
     char *out = NULL;
-    size_t len, curlen = 0;
+    size_t len;
+    unsigned curlen = 0;
     const char prefix[] = "GSSAPI Error: ";
     
     len = sizeof(prefix);
diff -up cyrus-sasl-2.1.22/plugins/ldapdb.c.warnings cyrus-sasl-2.1.22/plugins/ldapdb.c
--- cyrus-sasl-2.1.22/plugins/ldapdb.c.warnings	2005-02-19 03:26:31.000000000 +0100
+++ cyrus-sasl-2.1.22/plugins/ldapdb.c	2008-09-10 14:52:33.000000000 +0200
@@ -21,6 +21,7 @@
 
 #include "plugin_common.h"
 
+#define LDAP_DEPRECATED 1
 #include <ldap.h>
 
 static char ldapdb[] = "ldapdb";
diff -up cyrus-sasl-2.1.22/saslauthd/lak.c.warnings cyrus-sasl-2.1.22/saslauthd/lak.c
--- cyrus-sasl-2.1.22/saslauthd/lak.c.warnings	2005-05-15 07:49:51.000000000 +0200
+++ cyrus-sasl-2.1.22/saslauthd/lak.c	2008-09-10 14:52:51.000000000 +0200
@@ -55,6 +55,7 @@
 #include <openssl/des.h>
 #endif
 
+#define LDAP_DEPRECATED 1
 #include <ldap.h>
 #include <lber.h>
 #include <sasl.h>
diff -up cyrus-sasl-2.1.22/saslauthd/auth_httpform.c.warnings cyrus-sasl-2.1.22/saslauthd/auth_httpform.c
--- cyrus-sasl-2.1.22/saslauthd/auth_httpform.c.warnings	2006-04-19 21:51:13.000000000 +0200
+++ cyrus-sasl-2.1.22/saslauthd/auth_httpform.c	2008-09-10 14:45:57.000000000 +0200
@@ -552,7 +552,7 @@ auth_httpform (
               "Content-Type: application/x-www-form-urlencoded" CRLF
               "Content-Length: %d" TWO_CRLF
               "%s",
-              r_uri, r_host, r_port, strlen(escreq), escreq);
+              r_uri, r_host, r_port, (int)strlen(escreq), escreq);
 
     if (flags & VERBOSE) {
         syslog(LOG_DEBUG, "auth_httpform: sending %s %s %s",
diff -up cyrus-sasl-2.1.22/saslauthd/auth_shadow.c.warnings cyrus-sasl-2.1.22/saslauthd/auth_shadow.c
--- cyrus-sasl-2.1.22/saslauthd/auth_shadow.c.warnings	2006-04-19 21:36:36.000000000 +0200
+++ cyrus-sasl-2.1.22/saslauthd/auth_shadow.c	2008-09-10 14:47:47.000000000 +0200
@@ -63,6 +63,10 @@
 #  include <shadow.h>
 # endif /* ! HAVE_GETUSERPW */
 
+# ifdef HAVE_CRYPT_H
+#  include <crypt.h>
+# endif
+
 # include "auth_shadow.h"
 # include "globals.h"
 /* END PUBLIC DEPENDENCIES */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	9 Jul 2008 13:11:39 -0000	1.18
+++ .cvsignore	10 Sep 2008 13:44:15 -0000	1.19
@@ -1,2 +1 @@
 cyrus-sasl-2.1.22-nodlcompatorsrp.tar.gz
-db-4.7.25.tar.gz


Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- cyrus-sasl.spec	29 Aug 2008 10:47:03 -0000	1.71
+++ cyrus-sasl.spec	10 Sep 2008 13:44:15 -0000	1.72
@@ -1,11 +1,10 @@
 %define _plugindir2 %{_libdir}/sasl2
-%define db_version 4.7.25
 %define bootstrap_cyrus_sasl 0
 
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.22
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -13,7 +12,6 @@
 # new tarball.
 Source0: cyrus-sasl-%{version}-nodlcompatorsrp.tar.gz
 Source4: saslauthd.init
-Source6: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
 Source7: sasl-mechlist.c
 Source8: sasl-checkpass.c
 Source9: saslauthd.sysconfig
@@ -30,10 +28,13 @@
 Patch28: cyrus-sasl-2.1.21-keytab.patch
 Patch30: cyrus-sasl-2.1.22-rimap.patch
 Patch31: cyrus-sasl-2.1.22-kerberos4.patch
+Patch32: cyrus-sasl-2.1.22-warnings.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
 BuildRequires: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig
 BuildRequires: mysql-devel, postgresql-devel, zlib-devel
+BuildRequires: db4-devel
 %if ! %{bootstrap_cyrus_sasl}
 BuildRequires: openldap-devel
 %endif
@@ -131,10 +132,10 @@
 support Kerberos 4 authentication.
 
 %prep
-%setup -q -a 6
+%setup -q
 chmod -x doc/*.html
 chmod -x include/*.h
-%patch10 -p1 -b .db_bundle
+#%patch10 -p1 -b .db_bundle
 %patch11 -p1 -b .no_rpath
 %patch15 -p1 -b .path
 %patch24 -p1 -b .sizes
@@ -144,6 +145,7 @@
 %patch28 -p1 -b .keytab
 %patch30 -p1 -b .rimap
 %patch31 -p1 -b .krb4
+%patch32 -p1 -b .warnings
 
 # 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.
@@ -170,19 +172,6 @@
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
 
-# Bundling copy of Berkeley DB, for sasldb support.
-topdir=`pwd`
-pushd db-%{db_version}/build_unix
-../dist/configure \
-        --with-mutex=UNIX/fcntl --disable-shared --enable-static --with-pic \
-        --with-uniquename=_cyrus_sasl_sasldb_rh \
-        --prefix=${topdir}/db-instroot \
-        --includedir=${topdir}/db-instroot/include \
-        --libdir=${topdir}/db-instroot/lib
-make
-make install
-popd
-
 # Find Kerberos.
 krb5_prefix=`krb5-config --prefix`
 if test x$krb5_prefix = x%{_prefix} ; then
@@ -234,8 +223,6 @@
         --with-gss_impl=mit \
         --with-rc4 \
         --with-dblib=berkeley \
-        --with-bdb-incdir=${topdir}/db-instroot/include \
-        --with-bdb-libdir=${topdir}/db-instroot/lib \
         --with-saslauthd=/var/run/saslauthd --without-pwcheck \
 %if ! %{bootstrap_cyrus_sasl}
         --with-ldap \
@@ -393,6 +380,10 @@
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Wed Sep 29 2008 Tomas Mraz <tmraz at redhat.com> - 2.1.22-18
+- fix most critical build warnings (#433583)
+- use external db4
+
 * Fri Aug 29 2008 Tomas Mraz <tmraz at redhat.com> - 2.1.22-17
 - always link against the internal db4 (#459163)
 - rediff patches for no fuzz


Index: sasl-mechlist.c
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/sasl-mechlist.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sasl-mechlist.c	9 Sep 2004 04:05:41 -0000	1.1
+++ sasl-mechlist.c	10 Sep 2008 13:44:15 -0000	1.2
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 static int
 my_getopt(void *context, const char *plugin_name,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	9 Jul 2008 13:11:39 -0000	1.21
+++ sources	10 Sep 2008 13:44:15 -0000	1.22
@@ -1,2 +1 @@
 4dde83929ded5435e4c72e7cc06b0ebb  cyrus-sasl-2.1.22-nodlcompatorsrp.tar.gz
-ec2b87e833779681a0c3a814aa71359e  db-4.7.25.tar.gz


--- cyrus-sasl-2.1.22-db_bundle.patch DELETED ---



From perex at fedoraproject.org  Wed Sep 10 13:44:57 2008
From: perex at fedoraproject.org (Jaroslav Kysela)
Date: Wed, 10 Sep 2008 13:44:57 +0000 (UTC)
Subject: rpms/alsa-lib/devel alsa-lib.spec,1.73,1.74
Message-ID: <20080910134457.403C17012C@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9367

Modified Files:
	alsa-lib.spec 
Log Message:
alsa-lib: moved back to 1.0.18-1-rc3


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- alsa-lib.spec	10 Sep 2008 13:42:34 -0000	1.73
+++ alsa-lib.spec	10 Sep 2008 13:44:27 -0000	1.74
@@ -5,7 +5,7 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
 Version: 1.0.18
-Release: 3%{?prever_dot}%{?dist}
+Release: 1%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2



From tbzatek at fedoraproject.org  Wed Sep 10 13:49:45 2008
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Wed, 10 Sep 2008 13:49:45 +0000 (UTC)
Subject: rpms/sabayon/F-9 sabayon-lockdown-save.patch, NONE, 1.1 sabayon.spec,
	1.52, 1.53
Message-ID: <20080910134945.E0A9A7012C@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10168

Modified Files:
	sabayon.spec 
Added Files:
	sabayon-lockdown-save.patch 
Log Message:
* Wed Sep 10 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.22.0-4 
- Fix saving lockdown settings


sabayon-lockdown-save.patch:

--- NEW FILE sabayon-lockdown-save.patch ---
Index: lib/storage.py
===================================================================
--- lib/storage.py	(revision 1010)
+++ lib/storage.py	(working copy)
@@ -601,7 +601,7 @@
                         # We need to stop if we are recursing inside a ignored 
                         # directory.
                         if util.should_ignore_dir (homedir, 
-                                DIRECTORIES_TO_IGNORE, os.path.join(homedir, name, f)):
+                                DIRECTORIES_TO_IGNORE_PROFILE, os.path.join(homedir, name, f)):
                             dprint ("Not going inside %s as it is an ignored directory.", path)
                         else:
                             zip_directory (save_zip,
@@ -613,7 +613,7 @@
                         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, 
-                                DIRECTORIES_TO_IGNORE, FILES_TO_IGNORE, os.path.join(homedir, name, f)):
+                                DIRECTORIES_TO_IGNORE_PROFILE, FILES_TO_IGNORE, os.path.join(homedir, name, f)):
                             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/F-9/sabayon.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sabayon.spec	23 Apr 2008 02:49:26 -0000	1.52
+++ sabayon.spec	10 Sep 2008 13:49:15 -0000	1.53
@@ -8,7 +8,7 @@
 
 Name:    sabayon
 Version: 2.22.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -24,6 +24,9 @@
 # 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
 Requires: pygtk2 >= %{pygtk2_version}
@@ -93,6 +96,7 @@
 
 %patch1 -p1 -b .xephyr
 %patch3 -p1 -b .selinux
+%patch4 -p0 -b .gconfsave
 
 %build
 
@@ -281,6 +285,9 @@
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Wed Sep 10 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.22.0-4 
+- Fix saving lockdown settings
+
 * Tue Apr 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-3
 - Actually apply the Xephyr patch
 



From perex at fedoraproject.org  Wed Sep 10 13:50:12 2008
From: perex at fedoraproject.org (Jaroslav Kysela)
Date: Wed, 10 Sep 2008 13:50:12 +0000 (UTC)
Subject: rpms/alsa-lib/devel alsa-lib.spec,1.74,1.75
Message-ID: <20080910135012.96FD17012C@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10200

Modified Files:
	alsa-lib.spec 
Log Message:
alsa-lib: fix %(datadir) - should be %{datadir}


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- alsa-lib.spec	10 Sep 2008 13:44:27 -0000	1.74
+++ alsa-lib.spec	10 Sep 2008 13:49:42 -0000	1.75
@@ -83,7 +83,7 @@
 /%{_lib}/libasound.so.*
 %{_bindir}/aserver
 %{_libdir}/alsa-lib/
-%(_datadir)/alsa/
+%{_datadir}/alsa/
 
 %files devel
 %defattr(-,root,root,-)



From tmraz at fedoraproject.org  Wed Sep 10 13:52:30 2008
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 10 Sep 2008 13:52:30 +0000 (UTC)
Subject: rpms/cyrus-sasl/devel cyrus-sasl.spec,1.72,1.73
Message-ID: <20080910135230.B66487012C@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10611

Modified Files:
	cyrus-sasl.spec 
Log Message:
* Wed Sep 29 2008 Tomas Mraz <tmraz at redhat.com> - 2.1.22-18
- fix most critical build warnings (#433583)
- use external db4



Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- cyrus-sasl.spec	10 Sep 2008 13:44:15 -0000	1.72
+++ cyrus-sasl.spec	10 Sep 2008 13:52:00 -0000	1.73
@@ -18,7 +18,6 @@
 Source10: make-no-dlcompatorsrp-tarball.sh
 URL: http://asg.web.cmu.edu/sasl/sasl-library.html
 Requires: %{name}-lib = %{version}-%{release}
-Patch10: cyrus-sasl-2.1.22-db_bundle.patch
 Patch11: cyrus-sasl-2.1.18-no_rpath.patch
 Patch15: cyrus-sasl-2.1.20-saslauthd.conf-path.patch
 Patch24: cyrus-sasl-2.1.21-sizes.patch



From kasal at fedoraproject.org  Wed Sep 10 13:55:48 2008
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 10 Sep 2008 13:55:48 +0000 (UTC)
Subject: rpms/transfig/devel transfig.spec, 1.29,
	1.30 transfig.3.2.4-pstex.patch, 1.2, NONE
Message-ID: <20080910135548.9CE447012C@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/transfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10936

Modified Files:
	transfig.spec 
Removed Files:
	transfig.3.2.4-pstex.patch 
Log Message:
- remove transfig.3.2.4-pstex.patch, which reintroduced #164140
  at the update to 3.2.5


Index: transfig.spec
===================================================================
RCS file: /cvs/extras/rpms/transfig/devel/transfig.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- transfig.spec	8 Sep 2008 21:45:17 -0000	1.29
+++ transfig.spec	10 Sep 2008 13:55:18 -0000	1.30
@@ -1,14 +1,13 @@
 Summary: A utility for converting FIG files (made by xfig) to other formats.
 Name: transfig
 Version: 3.2.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: MIT
 Group: Applications/Multimedia
 Source: ftp://www-epb.lbl.gov/xfig/%{name}.%{version}.tar.gz
 
 Patch5: transfig-3.2.5-modularX.patch
-Patch6: transfig.3.2.4-pstex.patch
 
 Requires:	ghostscript
 
@@ -33,7 +32,6 @@
 %setup -q -n %{name}.%{version}
 
 %patch5 -p1 -b .modularX
-%patch6 -p1 -b .pstex
 
 %build
 xmkmf
@@ -67,6 +65,10 @@
 %{_datadir}/fig2dev
 
 %changelog
+* Wed Sep 10 2008 Stepan Kasal <skasal at redhat.com> - 1:3.2.5-4
+- remove transfig.3.2.4-pstex.patch, which reintroduced #164140
+  at the update to 3.2.5
+
 * Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.2.5-3
 - fix license tag
 


--- transfig.3.2.4-pstex.patch DELETED ---



From kasal at fedoraproject.org  Wed Sep 10 13:57:47 2008
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 10 Sep 2008 13:57:47 +0000 (UTC)
Subject: rpms/transfig/F-8 transfig.spec, 1.27,
	1.28 transfig.3.2.4-pstex.patch, 1.1, NONE
Message-ID: <20080910135747.2E91C7012C@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/transfig/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11163

Modified Files:
	transfig.spec 
Removed Files:
	transfig.3.2.4-pstex.patch 
Log Message:
- remove transfig.3.2.4-pstex.patch, which reintroduced #164140
  at the update to 3.2.5


Index: transfig.spec
===================================================================
RCS file: /cvs/extras/rpms/transfig/F-8/transfig.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- transfig.spec	16 Apr 2007 13:56:47 -0000	1.27
+++ transfig.spec	10 Sep 2008 13:57:16 -0000	1.28
@@ -1,14 +1,13 @@
 Summary: A utility for converting FIG files (made by xfig) to other formats.
 Name: transfig
 Version: 3.2.5
-Release: 1%{?dist}
+Release: 4%{?dist}
 Epoch: 1
-License: distributable
+License: MIT
 Group: Applications/Multimedia
 Source: ftp://www-epb.lbl.gov/xfig/%{name}.%{version}.tar.gz
 
 Patch5: transfig-3.2.5-modularX.patch
-Patch6: transfig.3.2.4-pstex.patch
 
 Requires:	ghostscript
 
@@ -33,7 +32,6 @@
 %setup -q -n %{name}.%{version}
 
 %patch5 -p1 -b .modularX
-%patch6 -p1 -b .pstex
 
 %build
 xmkmf
@@ -67,6 +65,16 @@
 %{_datadir}/fig2dev
 
 %changelog
+* Wed Sep 10 2008 Stepan Kasal <skasal at redhat.com> - 1:3.2.5-4
+- remove transfig.3.2.4-pstex.patch, which reintroduced #164140
+  at the update to 3.2.5
+
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.2.5-3
+- fix license tag
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:3.2.5-2
+- Autorebuild for GCC 4.3
+
 * Mon Apr 16 2007 Than Ngo <than at redhat.com> - 1:3.2.5-1.fc7
 - 3.2.5
 


--- transfig.3.2.4-pstex.patch DELETED ---



From kasal at fedoraproject.org  Wed Sep 10 13:59:26 2008
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 10 Sep 2008 13:59:26 +0000 (UTC)
Subject: rpms/transfig/F-9 transfig.spec, 1.28,
	1.29 transfig.3.2.4-pstex.patch, 1.1, NONE
Message-ID: <20080910135926.F07757012C@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/transfig/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11388

Modified Files:
	transfig.spec 
Removed Files:
	transfig.3.2.4-pstex.patch 
Log Message:
- remove transfig.3.2.4-pstex.patch, which reintroduced #164140
  at the update to 3.2.5


Index: transfig.spec
===================================================================
RCS file: /cvs/extras/rpms/transfig/F-9/transfig.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- transfig.spec	19 Feb 2008 10:10:33 -0000	1.28
+++ transfig.spec	10 Sep 2008 13:58:56 -0000	1.29
@@ -1,14 +1,13 @@
 Summary: A utility for converting FIG files (made by xfig) to other formats.
 Name: transfig
 Version: 3.2.5
-Release: 2%{?dist}
+Release: 4%{?dist}
 Epoch: 1
-License: distributable
+License: MIT
 Group: Applications/Multimedia
 Source: ftp://www-epb.lbl.gov/xfig/%{name}.%{version}.tar.gz
 
 Patch5: transfig-3.2.5-modularX.patch
-Patch6: transfig.3.2.4-pstex.patch
 
 Requires:	ghostscript
 
@@ -33,7 +32,6 @@
 %setup -q -n %{name}.%{version}
 
 %patch5 -p1 -b .modularX
-%patch6 -p1 -b .pstex
 
 %build
 xmkmf
@@ -67,6 +65,13 @@
 %{_datadir}/fig2dev
 
 %changelog
+* Wed Sep 10 2008 Stepan Kasal <skasal at redhat.com> - 1:3.2.5-4
+- remove transfig.3.2.4-pstex.patch, which reintroduced #164140
+  at the update to 3.2.5
+
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.2.5-3
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:3.2.5-2
 - Autorebuild for GCC 4.3
 


--- transfig.3.2.4-pstex.patch DELETED ---



From limb at fedoraproject.org  Wed Sep 10 14:02:26 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 10 Sep 2008 14:02:26 +0000 (UTC)
Subject: rpms/wesnoth/devel .cvsignore, 1.28, 1.29 sources, 1.28,
	1.29 wesnoth.spec, 1.56, 1.57
Message-ID: <20080910140226.D18F57012C@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/wesnoth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11920

Modified Files:
	.cvsignore sources wesnoth.spec 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	12 Aug 2008 18:02:56 -0000	1.28
+++ .cvsignore	10 Sep 2008 14:01:56 -0000	1.29
@@ -1 +1 @@
-wesnoth-1.4.4.tar.bz2
+wesnoth-1.4.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	12 Aug 2008 18:02:56 -0000	1.28
+++ sources	10 Sep 2008 14:01:56 -0000	1.29
@@ -1 +1 @@
-b2260808e94eba12aa7ceaa40fa0ee4d  wesnoth-1.4.4.tar.bz2
+09b7b76d4a4eedf502f38df9d551d827  wesnoth-1.4.5.tar.bz2


Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- wesnoth.spec	22 Aug 2008 22:06:03 -0000	1.56
+++ wesnoth.spec	10 Sep 2008 14:01:56 -0000	1.57
@@ -1,7 +1,7 @@
 %define _default_patch_fuzz 2
 Name:           wesnoth
-Version:        1.4.4
-Release:        2%{?dist}
+Version:        1.4.5
+Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
@@ -201,8 +201,8 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
-* Fri Aug 22 2008 Michel Salim <salimma at fedoraproject.org> - 1.4.4-2
-- Rebuild against new boost
+* Tue Sep 09 2008 Jon Ciesla <limb at jcomserv.net> - 1.4.5-1
+- New upstream release.
 
 * Tue Aug 12 2008 Jon Ciesla <limb at jcomserv.net> - 1.4.4-1
 - New upstream release.



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:50 +0000
Subject: [pkgdb] qmmp: jwrdegoede has given up watchcommits
Message-ID: <20080910133350.9B9AE2D00A6@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on qmmp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qmmp



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:47 +0000
Subject: [pkgdb] qmmp: jwrdegoede has given up watchbugzilla
Message-ID: <20080910133347.C392D2D00A3@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on qmmp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qmmp



From pkgdb at fedoraproject.org  Wed Sep 10 13:33:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:33:42 +0000
Subject: [pkgdb] qmmp: jwrdegoede has given up watchbugzilla
Message-ID: <20080910133342.830852D009F@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on qmmp (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qmmp



From pkgdb at fedoraproject.org  Wed Sep 10 13:34:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:34:08 +0000
Subject: [pkgdb] svgalib: jwrdegoede has given up watchcommits
Message-ID: <20080910133408.ED7AC2E0009@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on svgalib (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/svgalib



From pkgdb at fedoraproject.org  Wed Sep 10 13:34:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:34:05 +0000
Subject: [pkgdb] svgalib: jwrdegoede has given up watchcommits
Message-ID: <20080910133405.447BA2E0005@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchcommits acl on svgalib (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/svgalib



From pkgdb at fedoraproject.org  Wed Sep 10 13:34:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 13:34:03 +0000
Subject: [pkgdb] svgalib: jwrdegoede has given up watchbugzilla
Message-ID: <20080910133403.BF1B4208771@bastion.fedora.phx.redhat.com>

jwrdegoede has given up the watchbugzilla acl on svgalib (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/svgalib



From notting at fedoraproject.org  Wed Sep 10 14:10:14 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 10 Sep 2008 14:10:14 +0000 (UTC)
Subject: rpms/grisbi/devel grisbi.spec,1.20,1.21
Message-ID: <20080910141014.A70EE7012C@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/grisbi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12333

Modified Files:
	grisbi.spec 
Log Message:
rebuild against new libofx


Index: grisbi.spec
===================================================================
RCS file: /cvs/extras/rpms/grisbi/devel/grisbi.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- grisbi.spec	6 Sep 2008 08:09:42 -0000	1.20
+++ grisbi.spec	10 Sep 2008 14:09:44 -0000	1.21
@@ -1,7 +1,7 @@
 %define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help
 Name:		grisbi
 Version:	0.5.9
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Personal finances manager
 
 Group:		Applications/Productivity
@@ -114,6 +114,9 @@
 %ghost %{_datadir}/doc/%{name}/help/fr/grisbi-manuel.html
 
 %changelog
+* Wed Sep 10 2008 Bill Nottngham <notting at redhat.com> 0.5.9-8
+- rebuild against new libofx
+
 * Sat Sep 06 2008 Aurelien Bompard <abompard at fedoraproject.org> 0.5.9-7
 - rediff patch0
 



From notting at fedoraproject.org  Wed Sep 10 14:10:20 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 10 Sep 2008 14:10:20 +0000 (UTC)
Subject: rpms/homebank/devel homebank.spec,1.5,1.6
Message-ID: <20080910141020.3B4797012C@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/homebank/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12362

Modified Files:
	homebank.spec 
Log Message:
rebuild against new libofx


Index: homebank.spec
===================================================================
RCS file: /cvs/extras/rpms/homebank/devel/homebank.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- homebank.spec	30 Aug 2008 20:34:46 -0000	1.5
+++ homebank.spec	10 Sep 2008 14:09:50 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           homebank
 Version:        3.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free easy personal accounting for all  
 
 Group:          Applications/Productivity
@@ -98,6 +98,9 @@
 %{_datadir}/%{name}/help
 
 %changelog
+* Wed Sep 10 2008 Bill Nottingham <notting at redhat.com> 3.8-3
+- rebuild against new libofx
+
 * Sat Aug 30 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 3.8-2
 - patch for gtk deprecated methods (thanks to zebob)
 



From limb at fedoraproject.org  Wed Sep 10 14:32:00 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 10 Sep 2008 14:32:00 +0000 (UTC)
Subject: rpms/bacula/devel bacula.spec,1.11,1.12
Message-ID: <20080910143200.2FA627012C@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13916

Modified Files:
	bacula.spec 
Log Message:
Probable fix for BZ 458432.



Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bacula.spec	31 Jul 2008 18:20:33 -0000	1.11
+++ bacula.spec	10 Sep 2008 14:31:29 -0000	1.12
@@ -9,7 +9,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -620,16 +620,21 @@
 
 
 %preun director-mysql
-/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.mysql
+if [ "$1" = 0 ]; then
+	/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.mysql
+fi
 
 
 %preun director-sqlite
-/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.sqlite
+if [ "$1" = 0 ]; then
+	/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.sqlite
+fi
 
 
 %preun director-postgresql
-/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.postgresql
-
+if [ "$1" = 0 ]; then
+	/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.postgresql
+fi
 
 %pre common
 /usr/sbin/fedora-groupadd 33 -r bacula &>/dev/null || :
@@ -658,23 +663,26 @@
 
 
 %preun storage-mysql
-/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.mysql
-
+if [ "$1" = 0 ]; then
+	/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.mysql
+fi
 
 %preun storage-sqlite
-/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.sqlite
-
+if [ "$1" = 0 ]; then
+	/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.sqlite
+fi
 
 %preun storage-postgresql
-/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.postgresql
-
+if [ "$1" = 0 ]; then
+	/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.postgresql
+fi
 
 %post client
 /sbin/chkconfig --add bacula-fd
 
 
 %preun client
-if [ $1 = 0 ]; then
+if [ "$1" = 0 ]; then
 	/sbin/service bacula-fd stop >/dev/null 2>&1 || :
 	/sbin/chkconfig --del bacula-fd
 fi
@@ -691,7 +699,7 @@
 
 
 %preun director-common
-if [ $1 = 0 ]; then
+if [ "$1" = 0 ]; then
 	/sbin/service bacula-dir stop >/dev/null 2>&1 || :
 	/sbin/chkconfig --del bacula-dir
 fi
@@ -708,7 +716,7 @@
 
 
 %preun storage-common
-if [ $1 = 0 ]; then
+if [ "$1" = 0 ]; then
 	/sbin/service bacula-sd stop >/dev/null 2>&1 || :
 	/sbin/chkconfig --del bacula-sd
 fi
@@ -922,6 +930,10 @@
 
 
 %changelog
+* Tue Sep 09 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.2-2
+- Logrotate fix. BZ 457894.
+- Alternatives fix. BZ 458432.
+
 * Thu Jul 31 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.2-1
 - Update to 2.4.2.
 



From rhughes at fedoraproject.org  Wed Sep 10 14:33:21 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Wed, 10 Sep 2008 14:33:21 +0000 (UTC)
Subject: rpms/PackageKit/devel pk-dont-show-brackets-null.patch, NONE,
	1.1 PackageKit.spec, 1.51, 1.52
Message-ID: <20080910143321.5D2BC7012C@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14179

Modified Files:
	PackageKit.spec 
Added Files:
	pk-dont-show-brackets-null.patch 
Log Message:
* Wed Sep 10 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.2-2
- Fix a library error so we don't print (null) in the UI.


pk-dont-show-brackets-null.patch:

--- NEW FILE pk-dont-show-brackets-null.patch ---
commit 0bc4ba936db39ccf0466987d964a016363bceeee
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Sep 10 15:17:01 2008 +0100

    bugfix: don't convert null sections of a package_id to '(NULL)' instead use an empty string.

diff --git a/libpackagekit/pk-package-id.c b/libpackagekit/pk-package-id.c
index f328225..9d911fb 100644
--- a/libpackagekit/pk-package-id.c
+++ b/libpackagekit/pk-package-id.c
@@ -218,9 +214,12 @@ pk_package_id_copy (const PkPackageId *id)
 gchar *
 pk_package_id_to_string (const PkPackageId *id)
 {
-	return g_strdup_printf ("%s;%s;%s;%s",
-				id->name, id->version,
-				id->arch, id->data);
+	g_return_val_if_fail (id != NULL, NULL);
+	g_return_val_if_fail (id->name != NULL, NULL);
+	return g_strdup_printf ("%s;%s;%s;%s", id->name,
+				id->version != NULL ? id->version : "",
+				id->arch != NULL ? id->arch : "",
+				id->data != NULL ? id->data : "");
 }
 
 /**
@@ -237,11 +236,10 @@ pk_package_id_build (const gchar *name, const gchar *version,
 		     const gchar *arch, const gchar *data)
 {
 	g_return_val_if_fail (name != NULL, NULL);
-	g_return_val_if_fail (version != NULL, NULL);
-	g_return_val_if_fail (arch != NULL, NULL);
-	g_return_val_if_fail (data != NULL, NULL);
-
-	return g_strdup_printf ("%s;%s;%s;%s", name, version, arch, data);
+	return g_strdup_printf ("%s;%s;%s;%s", name,
+				version != NULL ? version : "",
+				arch != NULL ? arch : "",
+				data != NULL ? data : "");
 }
 
 /**



Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- PackageKit.spec	8 Sep 2008 15:34:34 -0000	1.51
+++ PackageKit.spec	10 Sep 2008 14:32:50 -0000	1.52
@@ -8,13 +8,16 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.2
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Upstream: 0bc4ba936db39ccf0466987d964a016363bceeee
+Patch0:    pk-dont-show-brackets-null.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-libs = %{version}-%{release}
@@ -138,6 +141,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -266,6 +270,9 @@
 %{_includedir}/*
 
 %changelog
+* Wed Sep 10 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.2-2
+- Fix a library error so we don't print (null) in the UI.
+
 * Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.2-1
 - New upstream version
 - This is the first release with the dispatcher functionality that allows



From pkgdb at fedoraproject.org  Wed Sep 10 14:33:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:33:48 +0000
Subject: [pkgdb] hal ownership updated
Message-ID: <20080910143348.59474208D1E@bastion.fedora.phx.redhat.com>

Package hal in Fedora devel was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal



From pkgdb at fedoraproject.org  Wed Sep 10 14:33:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:33:54 +0000
Subject: [pkgdb] hal ownership updated
Message-ID: <20080910143354.7D845208DAC@bastion.fedora.phx.redhat.com>

Package hal in Fedora 7 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal



From pkgdb at fedoraproject.org  Wed Sep 10 14:33:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:33:58 +0000
Subject: [pkgdb] hal ownership updated
Message-ID: <20080910143358.49481208DBE@bastion.fedora.phx.redhat.com>

Package hal in Fedora OLPC 2 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal



From pkgdb at fedoraproject.org  Wed Sep 10 14:34:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:34:01 +0000
Subject: [pkgdb] hal ownership updated
Message-ID: <20080910143402.0A1232D0026@bastion.fedora.phx.redhat.com>

Package hal in Fedora 8 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal



From pkgdb at fedoraproject.org  Wed Sep 10 14:34:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:34:06 +0000
Subject: [pkgdb] hal ownership updated
Message-ID: <20080910143406.1CA602E0011@bastion.fedora.phx.redhat.com>

Package hal in Fedora 9 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal



From pkgdb at fedoraproject.org  Wed Sep 10 14:34:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:34:12 +0000
Subject: [pkgdb] hal ownership updated
Message-ID: <20080910143412.C251120876F@bastion.fedora.phx.redhat.com>

Package hal in Fedora OLPC 3 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal



From pkgdb at fedoraproject.org  Wed Sep 10 14:35:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:35:49 +0000
Subject: [pkgdb] hal-info ownership updated
Message-ID: <20080910143549.613B0208DA2@bastion.fedora.phx.redhat.com>

Package hal-info in Fedora devel was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal-info



From pkgdb at fedoraproject.org  Wed Sep 10 14:35:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:35:54 +0000
Subject: [pkgdb] hal-info ownership updated
Message-ID: <20080910143554.E910E208DA6@bastion.fedora.phx.redhat.com>

Package hal-info in Fedora 8 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal-info



From pkgdb at fedoraproject.org  Wed Sep 10 14:35:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:35:58 +0000
Subject: [pkgdb] hal-info ownership updated
Message-ID: <20080910143558.693DB208DAA@bastion.fedora.phx.redhat.com>

Package hal-info in Fedora 9 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal-info



From pkgdb at fedoraproject.org  Wed Sep 10 14:36:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:36:02 +0000
Subject: [pkgdb] hal-info ownership updated
Message-ID: <20080910143602.26F6F208DAD@bastion.fedora.phx.redhat.com>

Package hal-info in Fedora OLPC 3 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal-info



From pkgdb at fedoraproject.org  Wed Sep 10 14:36:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:36:16 +0000
Subject: [pkgdb] gnome-power-manager ownership updated
Message-ID: <20080910143616.6B456208DB1@bastion.fedora.phx.redhat.com>

Package gnome-power-manager in Fedora devel was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-power-manager



From pkgdb at fedoraproject.org  Wed Sep 10 14:36:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:36:19 +0000
Subject: [pkgdb] gnome-power-manager ownership updated
Message-ID: <20080910143619.898772E0026@bastion.fedora.phx.redhat.com>

Package gnome-power-manager in Fedora 7 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-power-manager



From pkgdb at fedoraproject.org  Wed Sep 10 14:36:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:36:22 +0000
Subject: [pkgdb] gnome-power-manager ownership updated
Message-ID: <20080910143622.E3CA42E0037@bastion.fedora.phx.redhat.com>

Package gnome-power-manager in Fedora 8 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-power-manager



From pkgdb at fedoraproject.org  Wed Sep 10 14:36:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:36:26 +0000
Subject: [pkgdb] gnome-power-manager ownership updated
Message-ID: <20080910143626.9F5DB2E004A@bastion.fedora.phx.redhat.com>

Package gnome-power-manager in Fedora 9 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-power-manager



From pkgdb at fedoraproject.org  Wed Sep 10 14:37:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:37:20 +0000
Subject: [pkgdb] rdesktop ownership updated
Message-ID: <20080910143720.DA4E42D0029@bastion.fedora.phx.redhat.com>

Package rdesktop in Fedora devel was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rdesktop



From pkgdb at fedoraproject.org  Wed Sep 10 14:37:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:37:24 +0000
Subject: [pkgdb] rdesktop ownership updated
Message-ID: <20080910143724.46A062D003C@bastion.fedora.phx.redhat.com>

Package rdesktop in Fedora 7 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rdesktop



From pkgdb at fedoraproject.org  Wed Sep 10 14:37:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:37:27 +0000
Subject: [pkgdb] rdesktop ownership updated
Message-ID: <20080910143727.48C6C2D004F@bastion.fedora.phx.redhat.com>

Package rdesktop in Fedora 8 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rdesktop



From pkgdb at fedoraproject.org  Wed Sep 10 14:37:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:37:31 +0000
Subject: [pkgdb] rdesktop ownership updated
Message-ID: <20080910143731.371422D0062@bastion.fedora.phx.redhat.com>

Package rdesktop in Fedora 9 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rdesktop



From pkgdb at fedoraproject.org  Wed Sep 10 14:37:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:37:46 +0000
Subject: [pkgdb] tsclient ownership updated
Message-ID: <20080910143746.B04462D0078@bastion.fedora.phx.redhat.com>

Package tsclient in Fedora devel was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tsclient



From pkgdb at fedoraproject.org  Wed Sep 10 14:37:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:37:50 +0000
Subject: [pkgdb] tsclient ownership updated
Message-ID: <20080910143750.121D02D008C@bastion.fedora.phx.redhat.com>

Package tsclient in Fedora 7 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tsclient



From pkgdb at fedoraproject.org  Wed Sep 10 14:37:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:37:53 +0000
Subject: [pkgdb] tsclient ownership updated
Message-ID: <20080910143753.AB5082D009E@bastion.fedora.phx.redhat.com>

Package tsclient in Fedora 9 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tsclient



From dwalsh at fedoraproject.org  Wed Sep 10 14:38:02 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 10 Sep 2008 14:38:02 +0000 (UTC)
Subject: rpms/libsemanage/devel libsemanage-rhat.patch, 1.39,
	1.40 libsemanage.spec, 1.161, 1.162
Message-ID: <20080910143802.36F797012C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14515

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Wed Sep 10 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.27-3
- Additional fixes for Don't rebuild on fcontext or seuser modifications


libsemanage-rhat.patch:

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libsemanage-rhat.patch	29 Aug 2008 18:57:16 -0000	1.39
+++ libsemanage-rhat.patch	10 Sep 2008 14:37:31 -0000	1.40
@@ -1,7 +1,82 @@
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.27/src/direct_api.c
---- nsalibsemanage/src/direct_api.c	2008-06-12 23:25:16.000000000 -0400
-+++ libsemanage-2.0.27/src/direct_api.c	2008-08-26 10:25:38.000000000 -0400
-@@ -489,12 +489,6 @@
+--- nsalibsemanage/src/direct_api.c	2008-08-28 09:34:24.000000000 -0400
++++ libsemanage-2.0.27/src/direct_api.c	2008-09-10 10:22:42.000000000 -0400
+@@ -430,6 +430,58 @@
+ 	}
+ 	return 0;
+ }
++static int semanage_direct_update_user_extra(semanage_handle_t * sh, sepol_module_package_t *base ) {
++	const char *ofilename = NULL;
++	int retval = -1;
++
++	dbase_config_t *pusers_extra = semanage_user_extra_dbase_policy(sh);
++
++	if (sepol_module_package_get_user_extra_len(base)) {
++		ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_USERS_EXTRA);
++		if (ofilename == NULL) {
++			return retval;
++		}
++		retval = write_file(sh, ofilename,
++				    sepol_module_package_get_user_extra(base),
++				    sepol_module_package_get_user_extra_len(base));
++		if (retval < 0)
++			return retval;
++
++		pusers_extra->dtable->drop_cache(pusers_extra->dbase);
++		
++	} else {
++		retval =  pusers_extra->dtable->clear(sh, pusers_extra->dbase);
++	}
++
++	return retval;
++}
++	
++
++static int semanage_direct_update_seuser(semanage_handle_t * sh, sepol_module_package_t *base ) {
++
++	const char *ofilename = NULL;
++	int retval = -1;
++
++	dbase_config_t *pseusers = semanage_seuser_dbase_policy(sh);
++
++	if (sepol_module_package_get_seusers_len(base)) {
++		ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_SEUSERS);
++		if (ofilename == NULL) {
++			return -1;
++		}
++		retval = write_file(sh, ofilename,
++				    sepol_module_package_get_seusers(base),
++				    sepol_module_package_get_seusers_len(base));
++		if (retval < 0)
++			return retval;
++		
++		pseusers->dtable->drop_cache(pseusers->dbase);
++		
++	} else {
++		retval = pseusers->dtable->clear(sh, pseusers->dbase);
++	}
++	return retval;
++}
+ 
+ /********************* direct API functions ********************/
+ 
+@@ -453,7 +505,6 @@
+ 	dbase_config_t *users_base = semanage_user_base_dbase_local(sh);
+ 	dbase_config_t *pusers_base = semanage_user_base_dbase_policy(sh);
+ 	dbase_config_t *users_extra = semanage_user_extra_dbase_local(sh);
+-	dbase_config_t *pusers_extra = semanage_user_extra_dbase_policy(sh);
+ 	dbase_config_t *ports = semanage_port_dbase_local(sh);
+ 	dbase_config_t *pports = semanage_port_dbase_policy(sh);
+ 	dbase_config_t *bools = semanage_bool_dbase_local(sh);
+@@ -465,7 +516,6 @@
+ 	dbase_config_t *fcontexts = semanage_fcontext_dbase_local(sh);
+ 	dbase_config_t *pfcontexts = semanage_fcontext_dbase_policy(sh);
+ 	dbase_config_t *seusers = semanage_seuser_dbase_local(sh);
+-	dbase_config_t *pseusers = semanage_seuser_dbase_policy(sh);
+ 
+ 	/* Before we do anything else, flush the join to its component parts.
+ 	 * This *does not* flush to disk automatically */
+@@ -489,12 +539,6 @@
  	modified |= ifaces->dtable->is_modified(ifaces->dbase);
  	modified |= nodes->dtable->is_modified(nodes->dbase);
  
@@ -14,7 +89,60 @@
  	/* If there were policy changes, or explicitly requested, rebuild the policy */
  	if (sh->do_rebuild || modified) {
  
-@@ -667,11 +661,33 @@
+@@ -575,46 +619,13 @@
+ 
+ 		pfcontexts->dtable->drop_cache(pfcontexts->dbase);
+ 
+-		/* Seusers */
+-		if (sepol_module_package_get_seusers_len(base)) {
+-			ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_SEUSERS);
+-			if (ofilename == NULL) {
+-				retval = -1;
+-				goto cleanup;
+-			}
+-			retval = write_file(sh, ofilename,
+-					    sepol_module_package_get_seusers(base),
+-					    sepol_module_package_get_seusers_len(base));
+-			if (retval < 0)
+-				goto cleanup;
+-
+-			pseusers->dtable->drop_cache(pseusers->dbase);
+-
+-		} else {
+-			retval = pseusers->dtable->clear(sh, pseusers->dbase);
+-			if (retval < 0)
+-				goto cleanup;
+-		}
+-
+-		/* Users_extra */
+-		if (sepol_module_package_get_user_extra_len(base)) {
+-			ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_USERS_EXTRA);
+-			if (ofilename == NULL) {
+-				retval = -1;
+-				goto cleanup;
+-			}
+-			retval = write_file(sh, ofilename,
+-					    sepol_module_package_get_user_extra(base),
+-					    sepol_module_package_get_user_extra_len(base));
+-			if (retval < 0)
+-				goto cleanup;
+-			pusers_extra->dtable->drop_cache(pusers_extra->dbase);
++		retval = semanage_direct_update_seuser(sh, base );
++		if (retval < 0)
++			goto cleanup;
+ 
+-		} else {
+-			retval = pusers_extra->dtable->clear(sh, pusers_extra->dbase);
+-			if (retval < 0)
+-				goto cleanup;
+-		}
++		retval = semanage_direct_update_user_extra(sh, base );
++		if (retval < 0)
++			goto cleanup;
+ 
+ 		/* Netfilter Contexts */
+ 		/* Sort the netfilter contexts. */
+@@ -667,11 +678,41 @@
  		retval = semanage_verify_kernel(sh);
  		if (retval < 0)
  			goto cleanup;
@@ -23,35 +151,43 @@
 +		retval = sepol_policydb_create(&out);
 +		if (retval < 0)
 +			goto cleanup;
-+		
++
 +		retval = semanage_read_policydb(sh, out);
 +		if (retval < 0)
 +			goto cleanup;
 +		
-+		/*		dbase_policydb_attach((dbase_policydb_t *) pusers_base->dbase,out);
-+		dbase_policydb_attach((dbase_policydb_t *) pports->dbase, out);
-+		dbase_policydb_attach((dbase_policydb_t *) pifaces->dbase, out);
-+		dbase_policydb_attach((dbase_policydb_t *) pbools->dbase, out);
-+		dbase_policydb_attach((dbase_policydb_t *) pnodes->dbase, out);
-+		*/
-+		if (seusers_modified) {
-+			retval = pseusers->dtable->clear(sh, pseusers->dbase);
++		if (seusers_modified || users_extra_modified) {
++			retval = semanage_link_base(sh, &base);
 +			if (retval < 0)
 +				goto cleanup;
-+		}
++
++			if (seusers_modified) {
++				retval = semanage_direct_update_seuser(sh, base );
++				if (retval < 0)
++					goto cleanup;
++			}
++			if (users_extra_modified) {
++				/* Users_extra */
++				retval = semanage_direct_update_user_extra(sh, base );
++				if (retval < 0)
++					goto cleanup;
++			}
  
 -	/* FIXME: else if !modified, but seusers_modified, 
 -	 * load the existing policy instead of rebuilding */
++			sepol_module_package_free(base);
++			base = NULL;
++		}
+ 
 +		retval = semanage_base_merge_components(sh);
 +		if (retval < 0)
 +		  goto cleanup;
- 
-+		/* Seusers */
++
 +	}
  	/* ======= Post-process: Validate non-policydb components ===== */
  
  	/* Validate local modifications to file contexts.
-@@ -724,7 +740,8 @@
+@@ -724,7 +765,8 @@
  	sepol_policydb_free(out);
  	out = NULL;
  
@@ -61,7 +197,7 @@
  		retval = semanage_install_sandbox(sh);
  	}
  
-@@ -733,12 +750,14 @@
+@@ -733,12 +775,14 @@
  		free(mod_filenames[i]);
  	}
  
@@ -83,8 +219,8 @@
  	free(mod_filenames);
  	sepol_policydb_free(out);
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.27/src/genhomedircon.c
---- nsalibsemanage/src/genhomedircon.c	2008-08-05 09:57:28.000000000 -0400
-+++ libsemanage-2.0.27/src/genhomedircon.c	2008-08-26 10:30:30.000000000 -0400
+--- nsalibsemanage/src/genhomedircon.c	2008-08-28 09:34:24.000000000 -0400
++++ libsemanage-2.0.27/src/genhomedircon.c	2008-09-10 10:22:42.000000000 -0400
 @@ -487,7 +487,6 @@
  				  const char *role_prefix)
  {
@@ -102,8 +238,8 @@
  	};
  	Ustr *line = USTR_NULL;
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.27/src/semanage.conf
---- nsalibsemanage/src/semanage.conf	2008-06-12 23:25:16.000000000 -0400
-+++ libsemanage-2.0.27/src/semanage.conf	2008-08-14 14:53:32.000000000 -0400
+--- nsalibsemanage/src/semanage.conf	2008-08-28 09:34:24.000000000 -0400
++++ libsemanage-2.0.27/src/semanage.conf	2008-09-10 10:22:42.000000000 -0400
 @@ -35,4 +35,4 @@
  # given in <sepol/policydb.h>.  Change this setting if a different
  # version is necessary.
@@ -111,9 +247,51 @@
 -
 +expand-check=0
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.27/src/semanage_store.c
---- nsalibsemanage/src/semanage_store.c	2008-06-12 23:25:16.000000000 -0400
-+++ libsemanage-2.0.27/src/semanage_store.c	2008-08-14 14:53:32.000000000 -0400
-@@ -1648,6 +1648,47 @@
+--- nsalibsemanage/src/semanage_store.c	2008-08-28 09:34:24.000000000 -0400
++++ libsemanage-2.0.27/src/semanage_store.c	2008-09-10 10:24:12.000000000 -0400
+@@ -1608,6 +1608,41 @@
+ 	return retval;
+ }
+ 
++/* Links only the base module within the sandbox into the base module.
++ * '*base' will point to the module package that contains everything
++ * linked together (caller must call sepol_module_package_destroy() on
++ * it afterwards).  '*base' will be set to NULL upon entering this
++ * function.  Returns 0 on success, -1 on error.
++ */
++int semanage_link_base(semanage_handle_t * sh,
++			  sepol_module_package_t ** base)
++{
++	const char *base_filename = NULL;
++	int retval = -1;
++
++	*base = NULL;
++
++	/* first make sure that base module is readable */
++	if ((base_filename =
++	     semanage_path(SEMANAGE_TMP, SEMANAGE_BASE)) == NULL) {
++		goto cleanup;
++	}
++	if (access(base_filename, R_OK) == -1) {
++		ERR(sh, "Could not access sandbox base file %s.",
++		    base_filename);
++		goto cleanup;
++	}
++
++	if (semanage_load_module(sh, base_filename, base) == -1) {
++		goto cleanup;
++	}
++
++	retval = 0;
++
++      cleanup:
++	return retval;
++}
++
+ /* 
+  * Expands the policy contained within *base 
+  */
+@@ -1648,6 +1683,47 @@
  }
  
  /**
@@ -162,9 +340,16 @@
   */
  int semanage_write_policydb(semanage_handle_t * sh, sepol_policydb_t * out)
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.h libsemanage-2.0.27/src/semanage_store.h
---- nsalibsemanage/src/semanage_store.h	2008-06-12 23:25:16.000000000 -0400
-+++ libsemanage-2.0.27/src/semanage_store.h	2008-08-14 14:53:32.000000000 -0400
-@@ -97,6 +97,9 @@
+--- nsalibsemanage/src/semanage_store.h	2008-08-28 09:34:24.000000000 -0400
++++ libsemanage-2.0.27/src/semanage_store.h	2008-09-10 10:22:42.000000000 -0400
+@@ -93,10 +93,16 @@
+ int semanage_link_sandbox(semanage_handle_t * sh,
+ 			  sepol_module_package_t ** base);
+ 
++int semanage_link_base(semanage_handle_t * sh,
++		       sepol_module_package_t ** base);
++
+ int semanage_expand_sandbox(semanage_handle_t * sh,
  			    sepol_module_package_t * base,
  			    sepol_policydb_t ** policydb);
  
@@ -176,7 +361,7 @@
  
 diff --exclude-from=exclude -N -u -r nsalibsemanage/tests/test_fcontext.c libsemanage-2.0.27/tests/test_fcontext.c
 --- nsalibsemanage/tests/test_fcontext.c	1969-12-31 19:00:00.000000000 -0500
-+++ libsemanage-2.0.27/tests/test_fcontext.c	2008-08-15 10:59:48.000000000 -0400
++++ libsemanage-2.0.27/tests/test_fcontext.c	2008-09-10 10:22:42.000000000 -0400
 @@ -0,0 +1,72 @@
 +#include <semanage/fcontext_record.h>
 +#include <semanage/semanage.h>


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- libsemanage.spec	15 Aug 2008 16:59:10 -0000	1.161
+++ libsemanage.spec	10 Sep 2008 14:37:31 -0000	1.162
@@ -3,7 +3,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 2.0.27
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -89,7 +89,10 @@
 %{_libdir}/python*/site-packages/*
 
 %changelog
-* Tue Aug 5 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.27-2
+* Wed Sep 10 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.27-3
+- Additional fixes for Don't rebuild on fcontext or seuser modifications
+
+* Tue Sep 2 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.27-2
 - Don't rebuild on fcontext or seuser modifications
 
 * Tue Aug 5 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.27-1



From pkgdb at fedoraproject.org  Wed Sep 10 14:37:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:37:59 +0000
Subject: [pkgdb] tsclient ownership updated
Message-ID: <20080910143759.DD44C2D00B1@bastion.fedora.phx.redhat.com>

Package tsclient in Fedora 8 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tsclient



From pkgdb at fedoraproject.org  Wed Sep 10 14:38:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:38:11 +0000
Subject: [pkgdb] vino ownership updated
Message-ID: <20080910143811.9C070208D97@bastion.fedora.phx.redhat.com>

Package vino in Fedora devel was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vino



From pkgdb at fedoraproject.org  Wed Sep 10 14:38:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:38:16 +0000
Subject: [pkgdb] vino ownership updated
Message-ID: <20080910143816.25164208DCB@bastion.fedora.phx.redhat.com>

Package vino in Fedora 7 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vino



From pkgdb at fedoraproject.org  Wed Sep 10 14:38:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:38:19 +0000
Subject: [pkgdb] vino ownership updated
Message-ID: <20080910143819.8F4972D00CB@bastion.fedora.phx.redhat.com>

Package vino in Fedora 8 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vino



From pkgdb at fedoraproject.org  Wed Sep 10 14:38:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:38:22 +0000
Subject: [pkgdb] vino ownership updated
Message-ID: <20080910143822.E5AEE2D00E4@bastion.fedora.phx.redhat.com>

Package vino in Fedora 9 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vino



From sgrubb at fedoraproject.org  Wed Sep 10 14:43:57 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed, 10 Sep 2008 14:43:57 +0000 (UTC)
Subject: rpms/prelude-lml/F-9 prelude-lml.init, NONE, 1.1 prelude-lml.spec, 
	1.10, 1.11 sources, 1.4, 1.5 prelude-lml-initd.patch, 1.2, NONE
Message-ID: <20080910144357.D88DB7012C@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/prelude-lml/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14860

Modified Files:
	prelude-lml.spec sources 
Added Files:
	prelude-lml.init 
Removed Files:
	prelude-lml-initd.patch 
Log Message:
* Wed Sep 10 2008 Steve Grubb <sgrubb at redhat.com> 0.9.13-1
- new upstream release



--- NEW FILE prelude-lml.init ---
#!/bin/sh
#
# prelude lml	The prelude log analyzer    
#
# chkconfig: - 80 10
# description: The prelude log analyzer
#              when using postgresql : - 87 13
#                         mysql      : - 80 10


# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

prog=prelude-lml
progpath=/usr/bin/$prog
pidfile=/var/run/${prog}.pid

[ -x $progpath ]        || exit 0
[ -d /etc/$prog ]       || exit 0

RETVAL=0

start() {
	# Start daemon.
	echo -n "Starting $prog: "
        daemon $NICELEVEL $progpath -d -P $pidfile 
	RETVAL=$?
	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
        echo
	return $RETVAL	
}

stop() {
        # Stop daemons
        echo -n "Shutting down $prog: "
        killproc $prog
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog $pidfile
	return $RETVAL
}

restart() {
	stop
	start
}

case "$1" in
    start)
	start
	;;
    stop)
	stop
	;;
    restart|reload)
	stop
	start
	;;
    status)
	status $prog 
	RETVAL=$?
	;;
    *)
	echo "Usage: $0 {start|stop|restart|reload|status}"
	exit 1
esac

exit $RETVAL


Index: prelude-lml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prelude-lml/F-9/prelude-lml.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- prelude-lml.spec	24 Apr 2008 19:36:20 -0000	1.10
+++ prelude-lml.spec	10 Sep 2008 14:43:27 -0000	1.11
@@ -1,13 +1,13 @@
 Name:		prelude-lml           
-Version:	0.9.12.2
+Version:	0.9.13
 Release:	1%{?dist}
 Summary:	The prelude log analyzer
 
 Group:		System Environment/Libraries
 License:	GPLv2+
 URL:		http://prelude-ids.org/
-Source0:	http://www.prelude-ids.org/download/releases/%{name}-%{version}.tar.gz	
-Patch0:		%{name}-initd.patch
+Source0:	http://www.prelude-ids.org/download/releases/%{name}/%{name}-%{version}.tar.gz	
+Source1:	prelude-lml.init
 Patch1:		prelude-lml-0.9.12-pie.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,7 +43,6 @@
 
 %prep
 %setup -q
-%patch -p0
 %patch1 -p1
 sed -i.debug -e '/nlist/s|\$rm|: $rm|' ltmain.sh
 
@@ -65,7 +64,7 @@
 mkdir -p %{buildroot}/var/lib/%{name}/
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p"
 cp -p  AUTHORS README ChangeLog NEWS COPYING HACKING.README %{buildroot}%{_defaultdocdir}/%{name}-%{version}  
-install -m 755 %{name}-initd %{buildroot}/%{_initrddir}/%{name}
+install -m 755  %{SOURCE1} %{buildroot}/%{_initrddir}/%{name}
 rm -f %{buildroot}/%{_libdir}/%{name}/debug.la
 rm -f %{buildroot}/%{_libdir}/%{name}/pcre.la
 
@@ -112,6 +111,9 @@
 
 
 %changelog
+* Wed Sep 10 2008 Steve Grubb <sgrubb at redhat.com> 0.9.13-1
+- new upstream release
+
 * Thu Apr 24 2008 Steve Grubb <sgrubb at redhat.com> 0.9.12.2-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/prelude-lml/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Apr 2008 19:36:20 -0000	1.4
+++ sources	10 Sep 2008 14:43:27 -0000	1.5
@@ -1 +1 @@
-f13df3fdee98f6ceb5519d1a71cdf87f  prelude-lml-0.9.12.2.tar.gz
+310649089740e93916af60840e405928  prelude-lml-0.9.13.tar.gz


--- prelude-lml-initd.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Sep 10 14:45:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:45:37 +0000
Subject: [pkgdb] hal ownership updated
Message-ID: <20080910144537.B4AE6208DD5@bastion.fedora.phx.redhat.com>

Package hal in Fedora devel is now owned by rhughes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal



From pkgdb at fedoraproject.org  Wed Sep 10 14:45:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:45:47 +0000
Subject: [pkgdb] hal ownership updated
Message-ID: <20080910144547.1AA12208DEB@bastion.fedora.phx.redhat.com>

Package hal in Fedora OLPC 2 is now owned by rhughes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal



From pkgdb at fedoraproject.org  Wed Sep 10 14:45:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:45:55 +0000
Subject: [pkgdb] hal ownership updated
Message-ID: <20080910144555.3B03F208E00@bastion.fedora.phx.redhat.com>

Package hal in Fedora 8 is now owned by rhughes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal



From pkgdb at fedoraproject.org  Wed Sep 10 14:45:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:45:57 +0000
Subject: [pkgdb] hal ownership updated
Message-ID: <20080910144557.BDB38208E13@bastion.fedora.phx.redhat.com>

Package hal in Fedora 9 is now owned by rhughes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal



From pkgdb at fedoraproject.org  Wed Sep 10 14:46:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:46:02 +0000
Subject: [pkgdb] hal ownership updated
Message-ID: <20080910144603.000CA208E23@bastion.fedora.phx.redhat.com>

Package hal in Fedora OLPC 3 is now owned by rhughes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal



From pkgdb at fedoraproject.org  Wed Sep 10 14:46:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:46:40 +0000
Subject: [pkgdb] hal: rhughes has requested watchbugzilla
Message-ID: <20080910144640.4C94B2D0026@bastion.fedora.phx.redhat.com>

rhughes has requested the watchbugzilla acl on hal (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal



From pkgdb at fedoraproject.org  Wed Sep 10 14:46:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:46:32 +0000
Subject: [pkgdb] hal: rhughes has requested approveacls
Message-ID: <20080910144632.09DFF2D0024@bastion.fedora.phx.redhat.com>

rhughes has requested the approveacls acl on hal (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal



From pkgdb at fedoraproject.org  Wed Sep 10 14:47:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:47:01 +0000
Subject: [pkgdb] gnome-power-manager ownership updated
Message-ID: <20080910144701.B0F222D002F@bastion.fedora.phx.redhat.com>

Package gnome-power-manager in Fedora devel is now owned by rhughes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-power-manager



From pkgdb at fedoraproject.org  Wed Sep 10 14:47:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:47:05 +0000
Subject: [pkgdb] gnome-power-manager ownership updated
Message-ID: <20080910144705.1F9F32D0041@bastion.fedora.phx.redhat.com>

Package gnome-power-manager in Fedora 8 is now owned by rhughes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-power-manager



From pkgdb at fedoraproject.org  Wed Sep 10 14:47:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:47:07 +0000
Subject: [pkgdb] gnome-power-manager ownership updated
Message-ID: <20080910144707.895222D0054@bastion.fedora.phx.redhat.com>

Package gnome-power-manager in Fedora 9 is now owned by rhughes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-power-manager



From pkgdb at fedoraproject.org  Wed Sep 10 14:47:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:47:15 +0000
Subject: [pkgdb] gnome-power-manager had acl change status
Message-ID: <20080910144715.84D952D0064@bastion.fedora.phx.redhat.com>

rhughes has set the watchbugzilla acl on gnome-power-manager (Fedora 9) to Approved for rhughes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-power-manager



From pkgdb at fedoraproject.org  Wed Sep 10 14:47:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:47:24 +0000
Subject: [pkgdb] gnome-power-manager had acl change status
Message-ID: <20080910144724.B70A82D0068@bastion.fedora.phx.redhat.com>

rhughes has set the watchbugzilla acl on gnome-power-manager (Fedora 8) to Approved for rhughes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-power-manager



From pkgdb at fedoraproject.org  Wed Sep 10 14:47:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:47:31 +0000
Subject: [pkgdb] gnome-power-manager had acl change status
Message-ID: <20080910144731.1FF092D006A@bastion.fedora.phx.redhat.com>

rhughes has set the watchbugzilla acl on gnome-power-manager (Fedora devel) to Approved for rhughes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-power-manager



From pkgdb at fedoraproject.org  Wed Sep 10 14:47:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:47:52 +0000
Subject: [pkgdb] hal-info ownership updated
Message-ID: <20080910144752.231622D006F@bastion.fedora.phx.redhat.com>

Package hal-info in Fedora devel is now owned by rhughes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal-info



From pkgdb at fedoraproject.org  Wed Sep 10 14:47:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:47:54 +0000
Subject: [pkgdb] hal-info ownership updated
Message-ID: <20080910144754.29FD82D0072@bastion.fedora.phx.redhat.com>

Package hal-info in Fedora 8 is now owned by rhughes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal-info



From pkgdb at fedoraproject.org  Wed Sep 10 14:47:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:47:55 +0000
Subject: [pkgdb] hal-info ownership updated
Message-ID: <20080910144755.86DA8208D7C@bastion.fedora.phx.redhat.com>

Package hal-info in Fedora 9 is now owned by rhughes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal-info



From pkgdb at fedoraproject.org  Wed Sep 10 14:47:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:47:57 +0000
Subject: [pkgdb] hal-info ownership updated
Message-ID: <20080910144757.10D872D0076@bastion.fedora.phx.redhat.com>

Package hal-info in Fedora OLPC 3 is now owned by rhughes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal-info



From pkgdb at fedoraproject.org  Wed Sep 10 14:48:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:48:02 +0000
Subject: [pkgdb] hal-info had acl change status
Message-ID: <20080910144802.AFFDC2D0077@bastion.fedora.phx.redhat.com>

rhughes has set the watchbugzilla acl on hal-info (Fedora 9) to Approved for rhughes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal-info



From pkgdb at fedoraproject.org  Wed Sep 10 14:48:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:48:03 +0000
Subject: [pkgdb] hal-info had acl change status
Message-ID: <20080910144803.D5F572E0001@bastion.fedora.phx.redhat.com>

rhughes has set the watchbugzilla acl on hal-info (Fedora 8) to Approved for rhughes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal-info



From pkgdb at fedoraproject.org  Wed Sep 10 14:48:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:48:06 +0000
Subject: [pkgdb] hal-info had acl change status
Message-ID: <20080910144806.72A8F208D97@bastion.fedora.phx.redhat.com>

rhughes has set the watchbugzilla acl on hal-info (Fedora devel) to Approved for rhughes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hal-info



From wtogami at fedoraproject.org  Wed Sep 10 14:48:15 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 10 Sep 2008 14:48:15 +0000 (UTC)
Subject: rpms/ltsp/F-9 .cvsignore, 1.19, 1.20 ltsp.spec, 1.28, 1.29 sources, 
	1.23, 1.24
Message-ID: <20080910144815.B6E3C7012C@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15352

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
- Point F8 and F9 client chroot builder at newkey repos
- Ensure that initscripts installs before ltsp-client



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	28 Aug 2008 02:27:21 -0000	1.19
+++ .cvsignore	10 Sep 2008 14:47:45 -0000	1.20
@@ -1 +1 @@
-ltsp-5.1.22.tar.bz2
+ltsp-5.1.23.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ltsp.spec	28 Aug 2008 02:25:32 -0000	1.28
+++ ltsp.spec	10 Sep 2008 14:47:45 -0000	1.29
@@ -1,7 +1,7 @@
 Name:           ltsp
-Version:        5.1.22
-%define _datestamp .20080824.12
-#Release:        8%{_datestamp}%{?dist}
+Version:        5.1.23
+%define _datestamp .20080910.10
+#Release:        3%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
 Group:          User Interface/Desktops
@@ -45,6 +45,7 @@
 Requires:       chkconfig
 Requires:       ltspfsd
 Requires:       nbd
+Requires(post): initscripts
 BuildRequires:  glib2-devel
 
 %description client
@@ -403,6 +404,10 @@
 %endif
 
 %changelog
+* Wed Sep 10 2008 Warren Togami <wtogami at redhat.com> - 5.1.23-1
+- Point F8 and F9 client chroot builder at newkey repos
+- Ensure that initscripts installs before ltsp-client
+
 * Wed Aug 27 2008 Warren Togami <wtogami at redhat.com> - 5.1.22-1
 - Exclude /var/cache/yum/* from mksquashfs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	28 Aug 2008 02:27:21 -0000	1.23
+++ sources	10 Sep 2008 14:47:45 -0000	1.24
@@ -1 +1 @@
-26cd47cf352aae0575ff6a04bc0584ec  ltsp-5.1.22.tar.bz2
+65f3c87d86ef8e42bc6d417876182968  ltsp-5.1.23.tar.bz2



From pkgdb at fedoraproject.org  Wed Sep 10 14:53:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:53:18 +0000
Subject: [pkgdb] pioneers ownership updated
Message-ID: <20080910145318.A8B642E0025@bastion.fedora.phx.redhat.com>

Package pioneers in Fedora 8 is now owned by pfrields

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pioneers



From pkgdb at fedoraproject.org  Wed Sep 10 14:53:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:53:21 +0000
Subject: [pkgdb] pioneers ownership updated
Message-ID: <20080910145321.B3C572E0027@bastion.fedora.phx.redhat.com>

Package pioneers in Fedora 9 is now owned by pfrields

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pioneers



From pkgdb at fedoraproject.org  Wed Sep 10 14:53:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 14:53:24 +0000
Subject: [pkgdb] pioneers ownership updated
Message-ID: <20080910145324.273412E0029@bastion.fedora.phx.redhat.com>

Package pioneers in Fedora devel is now owned by pfrields

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pioneers



From mtasaka at fedoraproject.org  Wed Sep 10 15:02:09 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 10 Sep 2008 15:02:09 +0000 (UTC)
Subject: rpms/fantasdic/F-9 .cvsignore, 1.2, 1.3 fantasdic.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080910150209.D0F9E7012E@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/fantasdic/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16778/F-9

Modified Files:
	.cvsignore fantasdic.spec sources 
Log Message:
* Wed Sep 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-0.2.beta6
- 1.0 beta6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fantasdic/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Jan 2008 05:25:30 -0000	1.2
+++ .cvsignore	10 Sep 2008 15:01:39 -0000	1.3
@@ -1 +1 @@
-fantasdic-1.0-beta5.tar.gz
+fantasdic-1.0-beta6.tar.gz


Index: fantasdic.spec
===================================================================
RCS file: /cvs/extras/rpms/fantasdic/F-9/fantasdic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fantasdic.spec	22 Jan 2008 05:25:30 -0000	1.1
+++ fantasdic.spec	10 Sep 2008 15:01:39 -0000	1.2
@@ -2,10 +2,10 @@
 
 
 %define		mainver		1.0
-%define		betaver		beta5
+%define		betaver		beta6
 %define		rubyabi		1.8
 
-%define		fedorarel	1
+%define		fedorarel	2
 
 
 %define		fullrel		%{?betaver:0.}%{fedorarel}%{?betaver:.%betaver}
@@ -111,6 +111,11 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
+%check
+# Need X, disabling
+exit 0
+ruby setup.rb test
+
 %post
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -156,6 +161,9 @@
 
 
 %changelog
+* Wed Sep 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-0.2.beta6
+- 1.0 beta6
+
 * Sun Jan 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-0.1.beta5
 - Initial packaging
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fantasdic/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Jan 2008 05:25:30 -0000	1.2
+++ sources	10 Sep 2008 15:01:39 -0000	1.3
@@ -1 +1 @@
-207359f43879a4e581a056dd9894201a  fantasdic-1.0-beta5.tar.gz
+894cc88eaa7b50894417c7adca6af552  fantasdic-1.0-beta6.tar.gz



From mtasaka at fedoraproject.org  Wed Sep 10 15:02:09 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 10 Sep 2008 15:02:09 +0000 (UTC)
Subject: rpms/fantasdic/F-8 .cvsignore, 1.2, 1.3 fantasdic.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080910150209.BA1447012C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/fantasdic/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16778/F-8

Modified Files:
	.cvsignore fantasdic.spec sources 
Log Message:
* Wed Sep 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-0.2.beta6
- 1.0 beta6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fantasdic/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Jan 2008 05:25:24 -0000	1.2
+++ .cvsignore	10 Sep 2008 15:01:39 -0000	1.3
@@ -1 +1 @@
-fantasdic-1.0-beta5.tar.gz
+fantasdic-1.0-beta6.tar.gz


Index: fantasdic.spec
===================================================================
RCS file: /cvs/extras/rpms/fantasdic/F-8/fantasdic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fantasdic.spec	22 Jan 2008 05:25:24 -0000	1.1
+++ fantasdic.spec	10 Sep 2008 15:01:39 -0000	1.2
@@ -2,10 +2,10 @@
 
 
 %define		mainver		1.0
-%define		betaver		beta5
+%define		betaver		beta6
 %define		rubyabi		1.8
 
-%define		fedorarel	1
+%define		fedorarel	2
 
 
 %define		fullrel		%{?betaver:0.}%{fedorarel}%{?betaver:.%betaver}
@@ -111,6 +111,11 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
+%check
+# Need X, disabling
+exit 0
+ruby setup.rb test
+
 %post
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -156,6 +161,9 @@
 
 
 %changelog
+* Wed Sep 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-0.2.beta6
+- 1.0 beta6
+
 * Sun Jan 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-0.1.beta5
 - Initial packaging
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fantasdic/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Jan 2008 05:25:24 -0000	1.2
+++ sources	10 Sep 2008 15:01:39 -0000	1.3
@@ -1 +1 @@
-207359f43879a4e581a056dd9894201a  fantasdic-1.0-beta5.tar.gz
+894cc88eaa7b50894417c7adca6af552  fantasdic-1.0-beta6.tar.gz



From mtasaka at fedoraproject.org  Wed Sep 10 15:02:10 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 10 Sep 2008 15:02:10 +0000 (UTC)
Subject: rpms/fantasdic/devel .cvsignore, 1.2, 1.3 fantasdic.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080910150210.136297012C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/fantasdic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16778/devel

Modified Files:
	.cvsignore fantasdic.spec sources 
Log Message:
* Wed Sep 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-0.2.beta6
- 1.0 beta6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fantasdic/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Jan 2008 05:25:30 -0000	1.2
+++ .cvsignore	10 Sep 2008 15:01:39 -0000	1.3
@@ -1 +1 @@
-fantasdic-1.0-beta5.tar.gz
+fantasdic-1.0-beta6.tar.gz


Index: fantasdic.spec
===================================================================
RCS file: /cvs/extras/rpms/fantasdic/devel/fantasdic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fantasdic.spec	22 Jan 2008 05:25:30 -0000	1.1
+++ fantasdic.spec	10 Sep 2008 15:01:39 -0000	1.2
@@ -2,10 +2,10 @@
 
 
 %define		mainver		1.0
-%define		betaver		beta5
+%define		betaver		beta6
 %define		rubyabi		1.8
 
-%define		fedorarel	1
+%define		fedorarel	2
 
 
 %define		fullrel		%{?betaver:0.}%{fedorarel}%{?betaver:.%betaver}
@@ -111,6 +111,11 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
+%check
+# Need X, disabling
+exit 0
+ruby setup.rb test
+
 %post
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -156,6 +161,9 @@
 
 
 %changelog
+* Wed Sep 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-0.2.beta6
+- 1.0 beta6
+
 * Sun Jan 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-0.1.beta5
 - Initial packaging
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fantasdic/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Jan 2008 05:25:30 -0000	1.2
+++ sources	10 Sep 2008 15:01:39 -0000	1.3
@@ -1 +1 @@
-207359f43879a4e581a056dd9894201a  fantasdic-1.0-beta5.tar.gz
+894cc88eaa7b50894417c7adca6af552  fantasdic-1.0-beta6.tar.gz



From cebbert at fedoraproject.org  Wed Sep 10 15:11:05 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed, 10 Sep 2008 15:11:05 +0000 (UTC)
Subject: rpms/kernel/F-9 linux-2.6-compile-fixes.patch,1.163,1.164
Message-ID: <20080910151105.7F69F7012C@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17474

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
fixed in 2.6.26.5

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-compile-fixes.patch,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- linux-2.6-compile-fixes.patch	4 Sep 2008 04:35:02 -0000	1.163
+++ linux-2.6-compile-fixes.patch	10 Sep 2008 15:11:05 -0000	1.164
@@ -4,17 +4,3 @@
 # Please add the errors from gcc before the diffs to save others having
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
-
-net/ipv6/ip6mr.c:48:23: error: linux/pim.h: no such file or directory
-
---- linux-2.6.26.noarch.orig/net/ipv6/ip6mr.c
-+++ linux-2.6.26.noarch/net/ipv6/ip6mr.c
-@@ -45,7 +45,7 @@
- #include <net/ipv6.h>
- #include <net/ip6_route.h>
- #include <linux/mroute6.h>
--#include <linux/pim.h>
-+#include <linux/mroute.h>
- #include <net/addrconf.h>
- #include <linux/netfilter_ipv6.h>
- 



From cebbert at fedoraproject.org  Wed Sep 10 15:12:19 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed, 10 Sep 2008 15:12:19 +0000 (UTC)
Subject: rpms/kernel/F-8 linux-2.6-compile-fixes.patch,1.160,1.161
Message-ID: <20080910151219.39A737012C@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17647

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
fixed in 2.6.26.5

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-compile-fixes.patch,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- linux-2.6-compile-fixes.patch	4 Sep 2008 04:33:51 -0000	1.160
+++ linux-2.6-compile-fixes.patch	10 Sep 2008 15:11:48 -0000	1.161
@@ -4,17 +4,3 @@
 # Please add the errors from gcc before the diffs to save others having
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
-
-net/ipv6/ip6mr.c:48:23: error: linux/pim.h: no such file or directory
-
---- linux-2.6.26.noarch.orig/net/ipv6/ip6mr.c
-+++ linux-2.6.26.noarch/net/ipv6/ip6mr.c
-@@ -45,7 +45,7 @@
- #include <net/ipv6.h>
- #include <net/ip6_route.h>
- #include <linux/mroute6.h>
--#include <linux/pim.h>
-+#include <linux/mroute.h>
- #include <net/addrconf.h>
- #include <linux/netfilter_ipv6.h>
- 



From twaugh at fedoraproject.org  Wed Sep 10 15:19:33 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 10 Sep 2008 15:19:33 +0000 (UTC)
Subject: rpms/cups/F-9 cups-str2536.patch, NONE, 1.1 cups-lspp.patch, 1.35, 
	1.36 cups.spec, 1.423, 1.424
Message-ID: <20080910151933.D7D0A7012C@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18427

Modified Files:
	cups-lspp.patch cups.spec 
Added Files:
	cups-str2536.patch 
Log Message:
* Wed Sep 10 2008 Tim Waugh <twaugh at redhat.com>
- Backported patch for FatalErrors configuration directive
  (bug #314941, STR #2536).


cups-str2536.patch:

--- NEW FILE cups-str2536.patch ---
diff -up cups-1.3.8/config.h.in.str2536 cups-1.3.8/config.h.in
--- cups-1.3.8/config.h.in.str2536	2008-09-10 16:16:44.000000000 +0100
+++ cups-1.3.8/config.h.in	2008-09-10 16:16:44.000000000 +0100
@@ -43,6 +43,13 @@
 
 
 /*
+ * Default fatal error settings...
+ */
+
+#define CUPS_DEFAULT_FATAL_ERRORS	"config"
+
+
+/*
  * Default browsing settings...
  */
 
diff -up cups-1.3.8/config-scripts/cups-defaults.m4.str2536 cups-1.3.8/config-scripts/cups-defaults.m4
--- cups-1.3.8/config-scripts/cups-defaults.m4.str2536	2008-04-14 19:10:27.000000000 +0100
+++ cups-1.3.8/config-scripts/cups-defaults.m4	2008-09-10 16:16:44.000000000 +0100
@@ -43,6 +43,14 @@ AC_ARG_WITH(log_file_perm, [  --with-log
 AC_SUBST(CUPS_LOG_FILE_PERM)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LOG_FILE_PERM, 0$CUPS_LOG_FILE_PERM)
 
+dnl Default FatalErrors
+AC_ARG_WITH(fatal_errors, [  --with-fatal-errors     set default FatalErrors value, default=config],
+	CUPS_FATAL_ERRORS="$withval",
+	CUPS_FATAL_ERRORS="config")
+AC_SUBST(CUPS_FATAL_ERRORS)
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_FATAL_ERRORS, "$CUPS_FATAL_ERRORS")
+
+
 dnl Default Browsing
 AC_ARG_ENABLE(browsing, [  --enable-browsing       enable Browsing by default, default=yes])
 if test "x$enable_browsing" = xno; then
diff -up cups-1.3.8/configure.str2536 cups-1.3.8/configure
--- cups-1.3.8/configure.str2536	2008-09-10 16:16:44.000000000 +0100
+++ cups-1.3.8/configure	2008-09-10 16:18:16.000000000 +0100
@@ -782,6 +782,7 @@ LAUNCHDLIBS
 LANGUAGES
 CUPS_CONFIG_FILE_PERM
 CUPS_LOG_FILE_PERM
+CUPS_FATAL_ERRORS
 CUPS_BROWSING
 CUPS_BROWSE_LOCAL_PROTOCOLS
 CUPS_BROWSE_REMOTE_PROTOCOLS
@@ -1471,6 +1472,7 @@ Optional Packages:
   --with-languages        set installed languages, default=all
   --with-config-file-perm set default ConfigFilePerm value, default=0640
   --with-log-file-perm    set default LogFilePerm value, default=0644
+  --with-fatal-errors     set default FatalErrors value, default=config
   --with-local-protocols  set default BrowseLocalProtocols, default="CUPS"
   --with-remote-protocols set default BrowseRemoteProtocols, default="CUPS"
   --with-cups-user        set default user for CUPS
@@ -9680,10 +9682,10 @@ case "$uname" in
 		;;
 	Linux* | GNU*)
 		# Linux and GNU Hurd
-		MAN1EXT=1.gz
-		MAN5EXT=5.gz
-		MAN7EXT=7.gz
-		MAN8EXT=8.gz
+		MAN1EXT=1
+		MAN5EXT=5
+		MAN7EXT=7
+		MAN8EXT=8
 		MAN8DIR=8
 		;;
 	*)
@@ -17624,6 +17626,21 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+
+# Check whether --with-fatal_errors was given.
+if test "${with_fatal_errors+set}" = set; then
+  withval=$with_fatal_errors; CUPS_FATAL_ERRORS="$withval"
+else
+  CUPS_FATAL_ERRORS="config"
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define CUPS_DEFAULT_FATAL_ERRORS "$CUPS_FATAL_ERRORS"
+_ACEOF
+
+
+
 # Check whether --enable-browsing was given.
 if test "${enable_browsing+set}" = set; then
   enableval=$enable_browsing;
@@ -19407,6 +19424,7 @@ LAUNCHDLIBS!$LAUNCHDLIBS$ac_delim
 LANGUAGES!$LANGUAGES$ac_delim
 CUPS_CONFIG_FILE_PERM!$CUPS_CONFIG_FILE_PERM$ac_delim
 CUPS_LOG_FILE_PERM!$CUPS_LOG_FILE_PERM$ac_delim
+CUPS_FATAL_ERRORS!$CUPS_FATAL_ERRORS$ac_delim
 CUPS_BROWSING!$CUPS_BROWSING$ac_delim
 CUPS_BROWSE_LOCAL_PROTOCOLS!$CUPS_BROWSE_LOCAL_PROTOCOLS$ac_delim
 CUPS_BROWSE_REMOTE_PROTOCOLS!$CUPS_BROWSE_REMOTE_PROTOCOLS$ac_delim
@@ -19432,7 +19450,6 @@ PHPCONFIG!$PHPCONFIG$ac_delim
 PHPDIR!$PHPDIR$ac_delim
 PYTHON!$PYTHON$ac_delim
 INSTALL_LANGUAGES!$INSTALL_LANGUAGES$ac_delim
-UNINSTALL_LANGUAGES!$UNINSTALL_LANGUAGES$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -19474,11 +19491,12 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+UNINSTALL_LANGUAGES!$UNINSTALL_LANGUAGES$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -up cups-1.3.8/doc/help/ref-cupsd-conf.html.in.str2536 cups-1.3.8/doc/help/ref-cupsd-conf.html.in
--- cups-1.3.8/doc/help/ref-cupsd-conf.html.in.str2536	2008-06-17 19:27:16.000000000 +0100
+++ cups-1.3.8/doc/help/ref-cupsd-conf.html.in	2008-09-10 16:16:44.000000000 +0100
@@ -1115,6 +1115,57 @@ printer.</P>
 </UL>
 
 
+
+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.4</SPAN><A NAME="FatalErrors">FatalErrors</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+FatalErrors none
+FatalErrors all
+FatalErrors browse
+FatalErrors config
+FatalErrors listen
+FatalErrors log
+FatalErrors permissions
+FatalErrors all -permissions
+FatalErrors config permissions log
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>FatalErrors</CODE> directive determines whether certain kinds of
+errors are fatal. The following kinds of errors are currently recognized:</P>
+
+<UL>
+
+	<LI><CODE>none</CODE> - No errors are fatal</LI>
+
+	<LI><CODE>all</CODE> - All of the errors below are fatal</LI>
+
+	<LI><CODE>browse</CODE> - Browsing initialization errors are fatal,
+	for example failed binding to the CUPS browse port or failed connections
+	to LDAP servers</LI>
+
+	<LI><CODE>config</CODE> - Configuration file syntax errors are
+	fatal</LI>
+
+	<LI><CODE>listen</CODE> - Listen or Port errors are fatal, except for
+	IPv6 failures on the loopback or "any" addresses</LI>
+
+	<LI><CODE>log</CODE> - Log file creation or write errors are fatal</LI>
+
+	<LI><CODE>permissions</CODE> - Bad startup file permissions are
+	fatal, for example shared SSL certificate and key files with world-
+	read permissions</LI>
+
+</UL>
+
+<P>Multiple errors can be listed, and the form "-kind" can be used with
+<CODE>all</CODE> to remove specific kinds of errors. The default setting is
+<CODE>@CUPS_FATAL_ERRORS@</CODE>.</P>
+
+
 <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.18</SPAN><A NAME="FileDevice">FileDevice</A></H2>
 
 <H3>Examples</H3>
diff -up cups-1.3.8/man/cupsd.conf.man.in.str2536 cups-1.3.8/man/cupsd.conf.man.in
--- cups-1.3.8/man/cupsd.conf.man.in.str2536	2008-06-16 18:41:11.000000000 +0100
+++ cups-1.3.8/man/cupsd.conf.man.in	2008-09-10 16:16:44.000000000 +0100
@@ -275,6 +275,15 @@ ErrorLog syslog
 .br
 Specifies the error log filename.
 .TP 5
+FatalErrors none
+.TP 5
+FatalErrors all -kind [... -kind]
+.TP 5
+FatalErrors kind [... kind]
+.br
+Specifies which errors are fatal, causing the scheduler to exit. "Kind" is
+"browse", "config", "listen", "log", or "permissions".
+.TP 5
 FileDevice Yes
 .TP 5
 FileDevice No
diff -up cups-1.3.8/scheduler/conf.c.str2536 cups-1.3.8/scheduler/conf.c
--- cups-1.3.8/scheduler/conf.c.str2536	2008-09-10 16:16:44.000000000 +0100
+++ cups-1.3.8/scheduler/conf.c	2008-09-10 16:17:52.000000000 +0100
@@ -21,6 +21,7 @@
  *   get_addr_and_mask()      - Get an IP address and netmask.
  *   parse_aaa()              - Parse authentication, authorization, and
  *                              access control lines.
+ *   parse_fatal_errors()     - Parse FatalErrors values in a string.
  *   parse_groups()           - Parse system group names in a string.
  *   parse_protocols()        - Parse browse protocols in a string.
  *   read_configuration()     - Read a configuration file.
@@ -192,6 +193,7 @@ static int		get_addr_and_mask(const char
 			                  unsigned *mask);
 static int		parse_aaa(cupsd_location_t *loc, char *line,
 			          char *value, int linenum);
+static int		parse_fatal_errors(const char *s);
 static int		parse_groups(const char *s);
 static int		parse_protocols(const char *s);
 static int		read_configuration(cups_file_t *fp);
@@ -512,6 +514,7 @@ cupsdReadConfiguration(void)
   */
 
   ConfigFilePerm        = CUPS_DEFAULT_CONFIG_FILE_PERM;
+  FatalErrors           = parse_fatal_errors(CUPS_DEFAULT_FATAL_ERRORS);
   DefaultAuthType       = CUPSD_AUTH_BASIC;
 #ifdef HAVE_SSL
   DefaultEncryption     = HTTP_ENCRYPT_REQUIRED;
@@ -782,30 +785,31 @@ cupsdReadConfiguration(void)
 
   snprintf(temp, sizeof(temp), "%s/rss", CacheDir);
 
-  if (cupsdCheckPermissions(RequestRoot, NULL, 0710, RunUser,
-			    Group, 1, 1) < 0 ||
-      cupsdCheckPermissions(CacheDir, NULL, 0775, RunUser,
-			    Group, 1, 1) < 0 ||
-      cupsdCheckPermissions(temp, NULL, 0775, RunUser,
-			    Group, 1, 1) < 0 ||
-      cupsdCheckPermissions(StateDir, NULL, 0755, RunUser,
-			    Group, 1, 1) < 0 ||
-      cupsdCheckPermissions(StateDir, "certs", RunUser ? 0711 : 0511, User,
-			    SystemGroupIDs[0], 1, 1) < 0 ||
-      cupsdCheckPermissions(ServerRoot, NULL, 0755, RunUser, 
-			    Group, 1, 0) < 0 ||
-      cupsdCheckPermissions(ServerRoot, "ppd", 0755, RunUser,
-			    Group, 1, 1) < 0 ||
-      cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
-			    Group, 1, 0) < 0 ||
-      cupsdCheckPermissions(ServerRoot, "cupsd.conf", ConfigFilePerm, RunUser,
-			    Group, 0, 0) < 0 ||
-      cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
-			    Group, 0, 0) < 0 ||
-      cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-			    Group, 0, 0) < 0 ||
-      cupsdCheckPermissions(ServerRoot, "passwd.md5", 0600, User,
-			    Group, 0, 0) < 0)
+  if ((cupsdCheckPermissions(RequestRoot, NULL, 0710, RunUser,
+			     Group, 1, 1) < 0 ||
+       cupsdCheckPermissions(CacheDir, NULL, 0775, RunUser,
+			     Group, 1, 1) < 0 ||
+       cupsdCheckPermissions(temp, NULL, 0775, RunUser,
+			     Group, 1, 1) < 0 ||
+       cupsdCheckPermissions(StateDir, NULL, 0755, RunUser,
+			     Group, 1, 1) < 0 ||
+       cupsdCheckPermissions(StateDir, "certs", RunUser ? 0711 : 0511, User,
+			     SystemGroupIDs[0], 1, 1) < 0 ||
+       cupsdCheckPermissions(ServerRoot, NULL, 0755, RunUser, 
+			     Group, 1, 0) < 0 ||
+       cupsdCheckPermissions(ServerRoot, "ppd", 0755, RunUser,
+			     Group, 1, 1) < 0 ||
+       cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+			     Group, 1, 0) < 0 ||
+       cupsdCheckPermissions(ServerRoot, "cupsd.conf", ConfigFilePerm, RunUser,
+			     Group, 0, 0) < 0 ||
+       cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+			     Group, 0, 0) < 0 ||
+       cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
+			     Group, 0, 0) < 0 ||
+       cupsdCheckPermissions(ServerRoot, "passwd.md5", 0600, User,
+			     Group, 0, 0) < 0) &&
+      FatalErrors & CUPSD_FATAL_PERMISSIONS)
     return (0);
 
  /*
@@ -855,7 +859,8 @@ cupsdReadConfiguration(void)
     * is under the spool directory or does not exist...
     */
 
-    if (cupsdCheckPermissions(TempDir, NULL, 01770, RunUser, Group, 1, 1) < 0)
+    if (cupsdCheckPermissions(TempDir, NULL, 01770, RunUser, Group, 1, 1) < 0 &&
+	(FatalErrors & CUPSD_FATAL_PERMISSIONS))
       return (0);
   }
 
@@ -872,8 +877,10 @@ cupsdReadConfiguration(void)
   if (MaxClients > (MaxFDs / 3) || MaxClients <= 0)
   {
     if (MaxClients > 0)
-      cupsdLogMessage(CUPSD_LOG_INFO, "MaxClients limited to 1/3 (%d) of the file descriptor limit (%d)...",
-                 MaxFDs / 3, MaxFDs);
+      cupsdLogMessage(CUPSD_LOG_INFO,
+                      "MaxClients limited to 1/3 (%d) of the file descriptor "
+		      "limit (%d)...",
+                      MaxFDs / 3, MaxFDs);
 
     MaxClients = MaxFDs / 3;
   }
@@ -1115,7 +1122,8 @@ cupsdReadConfiguration(void)
     {
       cupsdLogMessage(CUPSD_LOG_EMERG,
                       "Unable to load MIME database from \'%s\'!", ServerRoot);
-      exit(errno);
+      if (FatalErrors & CUPSD_FATAL_CONFIG)
+	return (0);
     }
 
     cupsdLogMessage(CUPSD_LOG_INFO,
@@ -1912,6 +1920,86 @@ parse_aaa(cupsd_location_t *loc,	/* I - 
 
 
 /*
+ * 'parse_fatal_errors()' - Parse FatalErrors values in a string.
+ */
+
+static int				/* O - FatalErrors bits */
+parse_fatal_errors(const char *s)	/* I - FatalErrors string */
+{
+  int	fatal;				/* FatalErrors bits */
+  char	value[1024],			/* Value string */
+	*valstart,			/* Pointer into value */
+	*valend;			/* End of value */
+
+
+ /*
+  * Empty FatalErrors line yields NULL pointer...
+  */
+
+  if (!s)
+    return (CUPSD_FATAL_NONE);
+
+ /*
+  * Loop through the value string,...
+  */
+
+  strlcpy(value, s, sizeof(value));
+
+  fatal = CUPSD_FATAL_NONE;
+
+  for (valstart = value; *valstart;)
+  {
+   /*
+    * Get the current space/comma-delimited kind name...
+    */
+
+    for (valend = valstart; *valend; valend ++)
+      if (isspace(*valend & 255) || *valend == ',')
+	break;
+
+    if (*valend)
+      *valend++ = '\0';
+
+   /*
+    * Add the error to the bitmask...
+    */
+
+    if (!strcasecmp(valstart, "all"))
+      fatal = CUPSD_FATAL_ALL;
+    else if (!strcasecmp(valstart, "browse"))
+      fatal |= CUPSD_FATAL_BROWSE;
+    else if (!strcasecmp(valstart, "-browse"))
+      fatal &= ~CUPSD_FATAL_BROWSE;
+    else if (!strcasecmp(valstart, "config"))
+      fatal |= CUPSD_FATAL_CONFIG;
+    else if (!strcasecmp(valstart, "-config"))
+      fatal &= ~CUPSD_FATAL_CONFIG;
+    else if (!strcasecmp(valstart, "listen"))
+      fatal |= CUPSD_FATAL_LISTEN;
+    else if (!strcasecmp(valstart, "-listen"))
+      fatal &= ~CUPSD_FATAL_LISTEN;
+    else if (!strcasecmp(valstart, "log"))
+      fatal |= CUPSD_FATAL_LOG;
+    else if (!strcasecmp(valstart, "-log"))
+      fatal &= ~CUPSD_FATAL_LOG;
+    else if (!strcasecmp(valstart, "permissions"))
+      fatal |= CUPSD_FATAL_PERMISSIONS;
+    else if (!strcasecmp(valstart, "-permissions"))
+      fatal &= ~CUPSD_FATAL_PERMISSIONS;
+    else if (strcasecmp(valstart, "none"))
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "Unknown FatalErrors kind \"%s\" ignored!", valstart);
+
+    for (valstart = valend; *valstart; valstart ++)
+      if (!isspace(*valstart & 255) || *valstart != ',')
+	break;
+  }
+
+  return (fatal);
+}
+
+
+/*
  * 'parse_groups()' - Parse system group names in a string.
  */
 
@@ -2740,7 +2828,8 @@ read_configuration(cups_file_t *fp)	/* I
 	cupsdLogMessage(CUPSD_LOG_WARN,
 	                "Unknown default authorization type %s on line %d.",
 	                value, linenum);
-	return (0);
+	if (FatalErrors & CUPSD_FATAL_CONFIG)
+	  return (0);
       }
     }
 #ifdef HAVE_SSL
@@ -2761,7 +2850,8 @@ read_configuration(cups_file_t *fp)	/* I
 	cupsdLogMessage(CUPSD_LOG_WARN,
 	                "Unknown default encryption %s on line %d.",
 	                value, linenum);
-	return (0);
+	if (FatalErrors & CUPSD_FATAL_CONFIG)
+	  return (0);
       }
     }
 #endif /* HAVE_SSL */
@@ -3148,7 +3238,8 @@ read_location(cups_file_t *fp,		/* I - C
       if (!value)
       {
         cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d.", linenum);
-        return (0);
+        if (FatalErrors & CUPSD_FATAL_CONFIG)
+	  return (0);
       }
       
       if ((loc = cupsdCopyLocation(&parent)) == NULL)
@@ -3196,7 +3287,8 @@ read_location(cups_file_t *fp,		/* I - C
       cupsdLogMessage(CUPSD_LOG_ERROR,
                       "Unknown Location directive %s on line %d.",
 	              line, linenum);
-      return (0);
+      if (FatalErrors & CUPSD_FATAL_CONFIG)
+	return (0);
     }
   }
 
@@ -3204,7 +3296,7 @@ read_location(cups_file_t *fp,		/* I - C
                   "Unexpected end-of-file at line %d while reading location!",
                   linenum);
 
-  return (0);
+  return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
 }
 
 
@@ -3262,7 +3354,8 @@ read_policy(cups_file_t *fp,		/* I - Con
       if (!value)
       {
         cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d.", linenum);
-        return (0);
+        if (FatalErrors & CUPSD_FATAL_CONFIG)
+	  return (0);
       }
       
      /*
@@ -3336,7 +3429,8 @@ read_policy(cups_file_t *fp,		/* I - Con
       cupsdLogMessage(CUPSD_LOG_ERROR,
                       "Missing <Limit ops> directive before %s on line %d.",
                       line, linenum);
-      return (0);
+      if (FatalErrors & CUPSD_FATAL_CONFIG)
+	return (0);
     }
     else if (!parse_aaa(op, line, value, linenum))
     {
@@ -3349,7 +3443,8 @@ read_policy(cups_file_t *fp,		/* I - Con
 	                "Unknown Policy directive %s on line %d.",
 	                line, linenum);
 
-      return (0);
+      if (FatalErrors & CUPSD_FATAL_CONFIG)
+	return (0);
     }
   }
 
@@ -3357,7 +3452,7 @@ read_policy(cups_file_t *fp,		/* I - Con
                   "Unexpected end-of-file at line %d while reading policy \"%s\"!",
                   linenum, policy);
 
-  return (0);
+  return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
 }
 
 
diff -up cups-1.3.8/scheduler/conf.h.str2536 cups-1.3.8/scheduler/conf.h
--- cups-1.3.8/scheduler/conf.h.str2536	2008-09-10 16:16:44.000000000 +0100
+++ cups-1.3.8/scheduler/conf.h	2008-09-10 16:16:44.000000000 +0100
@@ -38,6 +38,19 @@ typedef enum
 
 
 /*
+ * FatalErrors flags...
+ */
+
+#define CUPSD_FATAL_NONE	0	/* No errors are fatal */
+#define CUPSD_FATAL_BROWSE	1	/* Browse bind errors are fatal */
+#define CUPSD_FATAL_CONFIG	2	/* Config file syntax errors are fatal */
+#define CUPSD_FATAL_LISTEN	4	/* Listen/Port bind errors are fatal */
+#define CUPSD_FATAL_LOG		8	/* Log file errors are fatal */
+#define CUPSD_FATAL_PERMISSIONS	16	/* File permission errors are fatal */
+#define CUPSD_FATAL_ALL		~0	/* All errors are fatal */
+
+
+/*
  * Printcap formats...
  */
 
@@ -124,6 +137,8 @@ VAR int			ClassifyOverride	VALUE(0),
 					/* Allow overrides? */
 			ConfigFilePerm		VALUE(0640),
 					/* Permissions for config files */
+			FatalErrors		VALUE(CUPSD_FATAL_CONFIG),
+					/* Which errors are fatal? */
 			LogFilePerm		VALUE(0644),
 					/* Permissions for log files */
 			LogLevel		VALUE(CUPSD_LOG_ERROR),
diff -up cups-1.3.8/scheduler/dirsvc.c.str2536 cups-1.3.8/scheduler/dirsvc.c
--- cups-1.3.8/scheduler/dirsvc.c.str2536	2008-07-18 21:30:23.000000000 +0100
+++ cups-1.3.8/scheduler/dirsvc.c	2008-09-10 16:16:44.000000000 +0100
@@ -954,9 +954,14 @@ cupsdStartBrowsing(void)
 			strerror(errno));
 	BrowseLocalProtocols &= ~BROWSE_CUPS;
 	BrowseRemoteProtocols &= ~BROWSE_CUPS;
-	return;
+
+	if (FatalErrors & CUPSD_FATAL_BROWSE)
+	  cupsdEndProcess(getpid(), 0);
       }
+    }
 
+    if (BrowseSocket >= 0)
+    {
      /*
       * Bind the socket to browse port...
       */
@@ -981,50 +986,60 @@ cupsdStartBrowsing(void)
 	BrowseSocket = -1;
 	BrowseLocalProtocols &= ~BROWSE_CUPS;
 	BrowseRemoteProtocols &= ~BROWSE_CUPS;
-	return;
+
+	if (FatalErrors & CUPSD_FATAL_BROWSE)
+	  cupsdEndProcess(getpid(), 0);
       }
     }
 
-   /*
-    * Set the "broadcast" flag...
-    */
-
-    val = 1;
-    if (setsockopt(BrowseSocket, SOL_SOCKET, SO_BROADCAST, &val, sizeof(val)))
+    if (BrowseSocket >= 0)
     {
-      cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to set broadcast mode - %s.",
-        	      strerror(errno));
+     /*
+      * Set the "broadcast" flag...
+      */
+
+      val = 1;
+      if (setsockopt(BrowseSocket, SOL_SOCKET, SO_BROADCAST, &val, sizeof(val)))
+      {
+	cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to set broadcast mode - %s.",
+			strerror(errno));
 
 #ifdef WIN32
-      closesocket(BrowseSocket);
+	closesocket(BrowseSocket);
 #else
-      close(BrowseSocket);
+	close(BrowseSocket);
 #endif /* WIN32 */
 
-      BrowseSocket = -1;
-      BrowseLocalProtocols &= ~BROWSE_CUPS;
-      BrowseRemoteProtocols &= ~BROWSE_CUPS;
-      return;
-    }
+	BrowseSocket = -1;
+	BrowseLocalProtocols &= ~BROWSE_CUPS;
+	BrowseRemoteProtocols &= ~BROWSE_CUPS;
 
-   /*
-    * Close the socket on exec...
-    */
+	if (FatalErrors & CUPSD_FATAL_BROWSE)
+	  cupsdEndProcess(getpid(), 0);
+      }
+    }
 
-    fcntl(BrowseSocket, F_SETFD, fcntl(BrowseSocket, F_GETFD) | FD_CLOEXEC);
+    if (BrowseSocket >= 0)
+    {
+     /*
+      * Close the socket on exec...
+      */
 
-   /*
-    * Finally, add the socket to the input selection set as needed...
-    */
+      fcntl(BrowseSocket, F_SETFD, fcntl(BrowseSocket, F_GETFD) | FD_CLOEXEC);
 
-    if (BrowseRemoteProtocols & BROWSE_CUPS)
-    {
      /*
-      * We only listen if we want remote printers...
+      * Finally, add the socket to the input selection set as needed...
       */
 
-      cupsdAddSelect(BrowseSocket, (cupsd_selfunc_t)update_cups_browse,
-                     NULL, NULL);
+      if (BrowseRemoteProtocols & BROWSE_CUPS)
+      {
+       /*
+	* We only listen if we want remote printers...
+	*/
+
+	cupsdAddSelect(BrowseSocket, (cupsd_selfunc_t)update_cups_browse,
+		       NULL, NULL);
+      }
     }
   }
   else
@@ -1043,6 +1058,10 @@ cupsdStartBrowsing(void)
                       "Unable to open an SLP handle; disabling SLP browsing!");
       BrowseLocalProtocols &= ~BROWSE_SLP;
       BrowseRemoteProtocols &= ~BROWSE_SLP;
+      BrowseSLPHandle = NULL;
+
+      if (FatalErrors & CUPSD_FATAL_BROWSE)
+	cupsdEndProcess(getpid(), 0);
     }
 
     BrowseSLPRefresh = 0;
@@ -1060,6 +1079,9 @@ cupsdStartBrowsing(void)
                       "Need to set BrowseLDAPDN to use LDAP browsing!");
       BrowseLocalProtocols &= ~BROWSE_LDAP;
       BrowseRemoteProtocols &= ~BROWSE_LDAP;
+
+      if (FatalErrors & CUPSD_FATAL_BROWSE)
+	cupsdEndProcess(getpid(), 0);
     }
     else
     {
@@ -1105,6 +1127,9 @@ cupsdStartBrowsing(void)
 	                "Unable to initialize LDAP; disabling LDAP browsing!");
 	BrowseLocalProtocols &= ~BROWSE_LDAP;
 	BrowseRemoteProtocols &= ~BROWSE_LDAP;
+
+	if (FatalErrors & CUPSD_FATAL_BROWSE)
+	  cupsdEndProcess(getpid(), 0);
       }
       else if (ldap_set_option(BrowseLDAPHandle, LDAP_OPT_PROTOCOL_VERSION,
                                (const void *)&version) != LDAP_SUCCESS)
@@ -1116,6 +1141,9 @@ cupsdStartBrowsing(void)
 			"disabling LDAP browsing!");
 	BrowseLocalProtocols &= ~BROWSE_LDAP;
 	BrowseRemoteProtocols &= ~BROWSE_LDAP;
+
+	if (FatalErrors & CUPSD_FATAL_BROWSE)
+	  cupsdEndProcess(getpid(), 0);
       }
       else
       {
@@ -1134,6 +1162,9 @@ cupsdStartBrowsing(void)
 	  ldap_unbind_ext(BrowseLDAPHandle, NULL, NULL);
 	  BrowseLocalProtocols &= ~BROWSE_LDAP;
 	  BrowseRemoteProtocols &= ~BROWSE_LDAP;
+
+	  if (FatalErrors & CUPSD_FATAL_BROWSE)
+	    cupsdEndProcess(getpid(), 0);
 	}
       }
     }
diff -up cups-1.3.8/scheduler/listen.c.str2536 cups-1.3.8/scheduler/listen.c
--- cups-1.3.8/scheduler/listen.c.str2536	2007-08-13 18:20:14.000000000 +0100
+++ cups-1.3.8/scheduler/listen.c	2008-09-10 16:16:44.000000000 +0100
@@ -150,10 +150,15 @@ cupsdStartListening(void)
     httpAddrFreeList(ServerAddrs);
 
   if ((ServerAddrs = httpAddrGetList(ServerName, AF_UNSPEC, NULL)) == NULL)
+  {
     cupsdLogMessage(CUPSD_LOG_ERROR,
                     "Unable to find IP address for server name \"%s\"!\n",
 		    ServerName);
 
+    if (FatalErrors & CUPSD_FATAL_LISTEN)
+      cupsdEndProcess(getpid(), 0);
+  }
+
  /*
   * Setup socket listeners...
   */
@@ -194,6 +199,20 @@ cupsdStartListening(void)
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 			"Unable to open listen socket for address %s:%d - %s.",
 			s, p, strerror(errno));
+
+#ifdef AF_INET6
+       /*
+        * IPv6 is often disabled while DNS returns IPv6 addresses...
+	*/
+
+	if (lis->address.addr.sa_family != AF_INET6 &&
+	    (FatalErrors & CUPSD_FATAL_LISTEN))
+	  cupsdEndProcess(getpid(), 0);
+#else
+	if (FatalErrors & CUPSD_FATAL_LISTEN)
+	  cupsdEndProcess(getpid(), 0);
+#endif /* AF_INET6 */
+
 	continue;
       }
 
@@ -278,6 +297,10 @@ cupsdStartListening(void)
 			s, p, strerror(errno));
 	close(lis->fd);
 	lis->fd = -1;
+
+	if (FatalErrors & CUPSD_FATAL_LISTEN)
+	  cupsdEndProcess(getpid(), 0);
+
 	continue;
       }
 
@@ -290,7 +313,14 @@ cupsdStartListening(void)
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 			"Unable to listen for clients on address %s:%d - %s.",
 			s, p, strerror(errno));
-	exit(errno);
+
+	close(lis->fd);
+	lis->fd = -1;
+
+	if (FatalErrors & CUPSD_FATAL_LISTEN)
+	  cupsdEndProcess(getpid(), 0);
+
+        continue;
       }
     }
 
@@ -339,11 +369,8 @@ cupsdStartListening(void)
                     "No Listen or Port lines were found to allow access via "
 		    "localhost!");
 
-   /*
-    * Commit suicide...
-    */
-
-    cupsdEndProcess(getpid(), 0);
+    if (FatalErrors & (CUPSD_FATAL_CONFIG | CUPSD_FATAL_LISTEN))
+      cupsdEndProcess(getpid(), 0);
   }
 
  /*
diff -up cups-1.3.8/scheduler/log.c.str2536 cups-1.3.8/scheduler/log.c
--- cups-1.3.8/scheduler/log.c.str2536	2008-09-10 16:16:44.000000000 +0100
+++ cups-1.3.8/scheduler/log.c	2008-09-10 16:16:44.000000000 +0100
@@ -546,7 +546,20 @@ check_log_file(cups_file_t **lf,	/* IO -
 
       if (!strncmp(filename, CUPS_LOGDIR, strlen(CUPS_LOGDIR)))
       {
-        cupsdCheckPermissions(CUPS_LOGDIR, NULL, 0755, RunUser, Group, 1, -1);
+       /*
+        * Try updating the permissions of the containing log directory, using
+	* the log file permissions as a basis...
+	*/
+
+        int log_dir_perm = 0300 | LogFilePerm;
+					/* LogFilePerm + owner write/search */
+	if (log_dir_perm & 0040)
+	  log_dir_perm |= 0010;		/* Add group search */
+	if (log_dir_perm & 0004)
+	  log_dir_perm |= 0001;		/* Add other search */
+
+        cupsdCheckPermissions(CUPS_LOGDIR, NULL, log_dir_perm, RunUser, Group,
+	                      1, -1);
 
         *lf = cupsFileOpen(filename, "a");
       }
@@ -555,6 +568,10 @@ check_log_file(cups_file_t **lf,	/* IO -
       {
 	syslog(LOG_ERR, "Unable to open log file \"%s\" - %s", filename,
 	       strerror(errno));
+
+        if (FatalErrors & CUPSD_FATAL_LOG)
+	  cupsdEndProcess(getpid(), 0);
+
 	return (0);
       }
     }
@@ -622,6 +639,9 @@ check_log_file(cups_file_t **lf,	/* IO -
       syslog(LOG_ERR, "Unable to open log file \"%s\" - %s", filename,
              strerror(errno));
 
+      if (FatalErrors & CUPSD_FATAL_LOG)
+	cupsdEndProcess(getpid(), 0);
+
       return (0);
     }
 

cups-lspp.patch:

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups-lspp.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- cups-lspp.patch	3 Aug 2008 13:48:28 -0000	1.35
+++ cups-lspp.patch	10 Sep 2008 15:19:33 -0000	1.36
@@ -1,7 +1,7 @@
 diff -up cups-1.3.8/config.h.in.lspp cups-1.3.8/config.h.in
---- cups-1.3.8/config.h.in.lspp	2008-01-07 18:26:57.000000000 +0000
-+++ cups-1.3.8/config.h.in	2008-07-28 16:37:51.000000000 +0100
-@@ -530,6 +530,13 @@
+--- cups-1.3.8/config.h.in.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/config.h.in	2008-09-10 16:18:26.000000000 +0100
+@@ -544,6 +544,13 @@
  #undef HAVE_REMOVEFILE
  
  
@@ -16,8 +16,8 @@
  
  /*
 diff -up /dev/null cups-1.3.8/config-scripts/cups-lspp.m4
---- /dev/null	2008-07-28 15:45:57.127000670 +0100
-+++ cups-1.3.8/config-scripts/cups-lspp.m4	2008-07-28 16:37:51.000000000 +0100
+--- /dev/null	2008-09-10 08:56:32.430063181 +0100
++++ cups-1.3.8/config-scripts/cups-lspp.m4	2008-09-10 16:18:26.000000000 +0100
 @@ -0,0 +1,36 @@
 +dnl
 +dnl   LSPP code for the Common UNIX Printing System (CUPS).
@@ -57,7 +57,7 @@
 +fi
 diff -up cups-1.3.8/configure.in.lspp cups-1.3.8/configure.in
 --- cups-1.3.8/configure.in.lspp	2007-07-25 00:47:12.000000000 +0100
-+++ cups-1.3.8/configure.in	2008-07-28 16:37:51.000000000 +0100
++++ cups-1.3.8/configure.in	2008-09-10 16:18:26.000000000 +0100
 @@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4)
  sinclude(config-scripts/cups-pdf.m4)
  sinclude(config-scripts/cups-scripting.m4)
@@ -68,9 +68,9 @@
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
 diff -up cups-1.3.8/configure.lspp cups-1.3.8/configure
---- cups-1.3.8/configure.lspp	2008-07-28 16:37:51.000000000 +0100
-+++ cups-1.3.8/configure	2008-07-28 16:37:51.000000000 +0100
-@@ -806,6 +806,8 @@ PHP
+--- cups-1.3.8/configure.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/configure	2008-09-10 16:18:43.000000000 +0100
+@@ -807,6 +807,8 @@ PHP
  PHPCONFIG
  PHPDIR
  PYTHON
@@ -79,7 +79,7 @@
  INSTALL_LANGUAGES
  UNINSTALL_LANGUAGES
  LIBOBJS
-@@ -1429,6 +1431,7 @@ Optional Features:
+@@ -1430,6 +1432,7 @@ Optional Features:
                            enable UseNetworkDefault by default, default=auto
    --enable-raw-printing   enable raw printing by default, default=auto
    --enable-pdftops        build pdftops filter, default=auto
@@ -87,22 +87,7 @@
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -9680,10 +9683,10 @@ case "$uname" in
- 		;;
- 	Linux* | GNU*)
- 		# Linux and GNU Hurd
--		MAN1EXT=1.gz
--		MAN5EXT=5.gz
--		MAN7EXT=7.gz
--		MAN8EXT=8.gz
-+		MAN1EXT=1
-+		MAN5EXT=5
-+		MAN7EXT=7
-+		MAN8EXT=8
- 		MAN8DIR=8
- 		;;
- 	*)
-@@ -18452,6 +18455,412 @@ fi
+@@ -18555,6 +18558,412 @@ fi
  
  
  
@@ -515,35 +500,34 @@
  INSTALL_LANGUAGES=""
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
-@@ -19345,8 +19754,8 @@ PHP!$PHP$ac_delim
+@@ -19449,7 +19858,7 @@ PHP!$PHP$ac_delim
  PHPCONFIG!$PHPCONFIG$ac_delim
  PHPDIR!$PHPDIR$ac_delim
  PYTHON!$PYTHON$ac_delim
 -INSTALL_LANGUAGES!$INSTALL_LANGUAGES$ac_delim
--UNINSTALL_LANGUAGES!$UNINSTALL_LANGUAGES$ac_delim
 +LIBAUDIT!$LIBAUDIT$ac_delim
-+LIBSELINUX!$LIBSELINUX$ac_delim
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -19388,11 +19797,13 @@ _ACEOF
+@@ -19491,12 +19900,14 @@ _ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
++LIBSELINUX!$LIBSELINUX$ac_delim
 +INSTALL_LANGUAGES!$INSTALL_LANGUAGES$ac_delim
-+UNINSTALL_LANGUAGES!$UNINSTALL_LANGUAGES$ac_delim
+ UNINSTALL_LANGUAGES!$UNINSTALL_LANGUAGES$ac_delim
  LIBOBJS!$LIBOBJS$ac_delim
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 diff -up cups-1.3.8/cups/cups.h.lspp cups-1.3.8/cups/cups.h
---- cups-1.3.8/cups/cups.h.lspp	2008-07-28 16:37:51.000000000 +0100
-+++ cups-1.3.8/cups/cups.h	2008-07-28 16:37:51.000000000 +0100
+--- cups-1.3.8/cups/cups.h.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/cups/cups.h	2008-09-10 16:18:26.000000000 +0100
 @@ -15,6 +15,9 @@
   *   This file is subject to the Apple OS-Developed Software exception.
   */
@@ -569,7 +553,7 @@
   */
 diff -up cups-1.3.8/data/Makefile.lspp cups-1.3.8/data/Makefile
 --- cups-1.3.8/data/Makefile.lspp	2007-10-10 23:00:43.000000000 +0100
-+++ cups-1.3.8/data/Makefile	2008-07-28 16:37:51.000000000 +0100
++++ cups-1.3.8/data/Makefile	2008-09-10 16:18:26.000000000 +0100
 @@ -25,7 +25,10 @@ BANNERS	=	\
  		secret \
  		standard \
@@ -583,8 +567,8 @@
  CHARMAPS =	\
  		euc-cn.txt \
 diff -up /dev/null cups-1.3.8/data/mls
---- /dev/null	2008-07-28 15:45:57.127000670 +0100
-+++ cups-1.3.8/data/mls	2008-07-28 16:37:51.000000000 +0100
+--- /dev/null	2008-09-10 08:56:32.430063181 +0100
++++ cups-1.3.8/data/mls	2008-09-10 16:18:26.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -848,8 +832,8 @@
 +%
 +%%EOF
 diff -up /dev/null cups-1.3.8/data/selinux
---- /dev/null	2008-07-28 15:45:57.127000670 +0100
-+++ cups-1.3.8/data/selinux	2008-07-28 16:37:51.000000000 +0100
+--- /dev/null	2008-09-10 08:56:32.430063181 +0100
++++ cups-1.3.8/data/selinux	2008-09-10 16:18:26.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -1113,8 +1097,8 @@
 +%
 +%%EOF
 diff -up /dev/null cups-1.3.8/data/te
---- /dev/null	2008-07-28 15:45:57.127000670 +0100
-+++ cups-1.3.8/data/te	2008-07-28 16:37:51.000000000 +0100
+--- /dev/null	2008-09-10 08:56:32.430063181 +0100
++++ cups-1.3.8/data/te	2008-09-10 16:18:26.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -1379,7 +1363,7 @@
 +%%EOF
 diff -up cups-1.3.8/filter/common.c.lspp cups-1.3.8/filter/common.c
 --- cups-1.3.8/filter/common.c.lspp	2008-07-11 23:48:49.000000000 +0100
-+++ cups-1.3.8/filter/common.c	2008-07-28 16:37:51.000000000 +0100
++++ cups-1.3.8/filter/common.c	2008-09-10 16:18:26.000000000 +0100
 @@ -30,6 +30,12 @@
   * Include necessary headers...
   */
@@ -1550,7 +1534,7 @@
  /*
 diff -up cups-1.3.8/Makedefs.in.lspp cups-1.3.8/Makedefs.in
 --- cups-1.3.8/Makedefs.in.lspp	2008-01-22 22:37:21.000000000 +0000
-+++ cups-1.3.8/Makedefs.in	2008-07-28 16:37:51.000000000 +0100
++++ cups-1.3.8/Makedefs.in	2008-09-10 16:18:26.000000000 +0100
 @@ -134,7 +134,7 @@ LIBCUPSORDER	=	@LIBCUPSORDER@
  LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
  LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
@@ -1561,9 +1545,9 @@
  OPTIONS		=
  PAMLIBS		=	@PAMLIBS@
 diff -up cups-1.3.8/scheduler/client.c.lspp cups-1.3.8/scheduler/client.c
---- cups-1.3.8/scheduler/client.c.lspp	2008-07-11 23:48:49.000000000 +0100
-+++ cups-1.3.8/scheduler/client.c	2008-07-28 16:37:51.000000000 +0100
-@@ -39,12 +39,14 @@
+--- cups-1.3.8/scheduler/client.c.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/scheduler/client.c	2008-09-10 16:18:26.000000000 +0100
+@@ -40,12 +40,14 @@
   *   pipe_command()          - Pipe the output of a command to the remote client.
   *   write_file()            - Send a file via HTTP.
   *   write_pipe()            - Flag that data is available on the CGI pipe.
@@ -1578,7 +1562,7 @@
  #include <cups/http-private.h>
  #include "cupsd.h"
  
-@@ -76,6 +78,12 @@ extern const char *cssmErrorString(int e
+@@ -77,6 +79,12 @@ extern const char *cssmErrorString(int e
  #  include <gnutls/x509.h>
  #endif /* HAVE_GNUTLS */
  
@@ -1591,7 +1575,7 @@
  
  /*
   * Local functions...
-@@ -349,6 +357,57 @@ cupsdAcceptClient(cupsd_listener_t *lis)
+@@ -351,6 +359,57 @@ cupsdAcceptClient(cupsd_listener_t *lis)
      }
    }
  
@@ -1649,7 +1633,7 @@
  #ifdef AF_INET6
    if (con->http.hostaddr->addr.sa_family == AF_INET6)
      cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: %d from %s:%d (IPv6)",
-@@ -731,6 +790,13 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -733,6 +792,13 @@ cupsdReadClient(cupsd_client_t *con)	/* 
    mime_type_t		*type;		/* MIME type of file */
    cupsd_printer_t	*p;		/* Printer */
    static unsigned	request_id = 0;	/* Request ID for temp files */
@@ -1663,7 +1647,7 @@
  
  
    status = HTTP_CONTINUE;
-@@ -2016,6 +2082,67 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -2017,6 +2083,67 @@ cupsdReadClient(cupsd_client_t *con)	/* 
  	    fchmod(con->file, 0640);
  	    fchown(con->file, RunUser, Group);
              fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
@@ -1731,7 +1715,7 @@
  	  }
  
  	  if (con->http.state != HTTP_POST_SEND)
-@@ -4255,6 +4382,50 @@ make_certificate(cupsd_client_t *con)	/*
+@@ -4288,6 +4415,50 @@ make_certificate(cupsd_client_t *con)	/*
  #endif /* HAVE_SSL */
  
  
@@ -1784,7 +1768,7 @@
   */
 diff -up cups-1.3.8/scheduler/client.h.lspp cups-1.3.8/scheduler/client.h
 --- cups-1.3.8/scheduler/client.h.lspp	2007-10-22 19:52:13.000000000 +0100
-+++ cups-1.3.8/scheduler/client.h	2008-07-28 16:37:51.000000000 +0100
++++ cups-1.3.8/scheduler/client.h	2008-09-10 16:18:26.000000000 +0100
 @@ -17,6 +17,13 @@
  #  include <Security/Authorization.h>
  #endif /* HAVE_AUTHORIZATION_H */
@@ -1821,9 +1805,9 @@
  
  /*
 diff -up cups-1.3.8/scheduler/conf.c.lspp cups-1.3.8/scheduler/conf.c
---- cups-1.3.8/scheduler/conf.c.lspp	2008-07-28 16:37:51.000000000 +0100
-+++ cups-1.3.8/scheduler/conf.c	2008-07-28 16:37:51.000000000 +0100
-@@ -26,6 +26,7 @@
+--- cups-1.3.8/scheduler/conf.c.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/scheduler/conf.c	2008-09-10 16:18:26.000000000 +0100
+@@ -27,6 +27,7 @@
   *   read_configuration()     - Read a configuration file.
   *   read_location()          - Read a <Location path> definition.
   *   read_policy()            - Read a <Policy name> definition.
@@ -1831,7 +1815,7 @@
   */
  
  /*
-@@ -47,6 +48,9 @@
+@@ -48,6 +49,9 @@
  #  define INADDR_NONE	0xffffffff
  #endif /* !INADDR_NONE */
  
@@ -1841,7 +1825,7 @@
  
  /*
   * Configuration variable structure...
-@@ -160,6 +164,10 @@ static const cupsd_var_t	variables[] =
+@@ -161,6 +165,10 @@ static const cupsd_var_t	variables[] =
  #  if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
    { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_PATHNAME },
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
@@ -1852,7 +1836,7 @@
  #endif /* HAVE_SSL */
    { "ServerName",		&ServerName,		CUPSD_VARTYPE_STRING },
    { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_PATHNAME },
-@@ -350,6 +358,9 @@ cupsdReadConfiguration(void)
+@@ -352,6 +360,9 @@ cupsdReadConfiguration(void)
  		*old_requestroot;	/* Old RequestRoot */
    const char	*tmpdir;		/* TMPDIR environment variable */
    struct stat	tmpinfo;		/* Temporary directory info */
@@ -1862,7 +1846,7 @@
  
  
   /*
-@@ -611,6 +622,25 @@ cupsdReadConfiguration(void)
+@@ -614,6 +625,25 @@ cupsdReadConfiguration(void)
  
    RunUser = getuid();
  
@@ -1888,7 +1872,7 @@
   /*
    * See if the ServerName is an IP address...
    */
-@@ -889,11 +919,23 @@ cupsdReadConfiguration(void)
+@@ -896,11 +926,23 @@ cupsdReadConfiguration(void)
    if (MaxActiveJobs > (MaxFDs / 3))
      MaxActiveJobs = MaxFDs / 3;
  
@@ -1913,8 +1897,8 @@
  
   /*
    * Update the MaxClientsPerHost value, as needed...
-@@ -3360,6 +3402,18 @@ read_policy(cups_file_t *fp,		/* I - Con
-   return (0);
+@@ -3299,6 +3341,18 @@ read_location(cups_file_t *fp,		/* I - C
+   return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
  }
  
 +#ifdef WITH_LSPP
@@ -1931,11 +1915,11 @@
 +
  
  /*
-  * End of "$Id$".
+  * 'read_policy()' - Read a <Policy name> definition.
 diff -up cups-1.3.8/scheduler/conf.h.lspp cups-1.3.8/scheduler/conf.h
---- cups-1.3.8/scheduler/conf.h.lspp	2008-07-28 16:37:51.000000000 +0100
-+++ cups-1.3.8/scheduler/conf.h	2008-07-28 16:37:51.000000000 +0100
-@@ -193,6 +193,12 @@ VAR char		*ServerKey		VALUE(NULL);
+--- cups-1.3.8/scheduler/conf.h.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/scheduler/conf.h	2008-09-10 16:18:26.000000000 +0100
+@@ -208,6 +208,12 @@ VAR char		*ServerKey		VALUE(NULL);
  					/* Server key file */
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
  #endif /* HAVE_SSL */
@@ -1948,7 +1932,7 @@
  
  #ifdef HAVE_LAUNCHD
  VAR int			LaunchdTimeout		VALUE(DEFAULT_TIMEOUT);
-@@ -211,6 +217,9 @@ VAR char		*SystemGroupAuthKey	VALUE(NULL
+@@ -226,6 +232,9 @@ VAR char		*SystemGroupAuthKey	VALUE(NULL
  					/* System group auth key */
  #endif /* HAVE_AUTHORIZATION_H */
  
@@ -1959,8 +1943,8 @@
  /*
   * Prototypes...
 diff -up cups-1.3.8/scheduler/ipp.c.lspp cups-1.3.8/scheduler/ipp.c
---- cups-1.3.8/scheduler/ipp.c.lspp	2008-07-28 16:37:51.000000000 +0100
-+++ cups-1.3.8/scheduler/ipp.c	2008-07-28 16:39:08.000000000 +0100
+--- cups-1.3.8/scheduler/ipp.c.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/scheduler/ipp.c	2008-09-10 16:18:26.000000000 +0100
 @@ -36,6 +36,7 @@
   *   cancel_all_jobs()           - Cancel all print jobs.
   *   cancel_job()                - Cancel a print job.
@@ -2553,8 +2537,8 @@
    * Check the username against the owner...
    */
 diff -up cups-1.3.8/scheduler/job.c.lspp cups-1.3.8/scheduler/job.c
---- cups-1.3.8/scheduler/job.c.lspp	2008-07-28 16:37:51.000000000 +0100
-+++ cups-1.3.8/scheduler/job.c	2008-07-28 16:37:51.000000000 +0100
+--- cups-1.3.8/scheduler/job.c.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/scheduler/job.c	2008-09-10 16:18:26.000000000 +0100
 @@ -60,6 +60,9 @@
   *   update_job_attrs()         - Update the job-printer-* attributes.
   */
@@ -2913,7 +2897,7 @@
      if ((attr = ippFindAttribute(job->attrs, "job-sheets",
 diff -up cups-1.3.8/scheduler/job.h.lspp cups-1.3.8/scheduler/job.h
 --- cups-1.3.8/scheduler/job.h.lspp	2008-01-16 22:20:33.000000000 +0000
-+++ cups-1.3.8/scheduler/job.h	2008-07-28 16:37:51.000000000 +0100
++++ cups-1.3.8/scheduler/job.h	2008-09-10 16:18:26.000000000 +0100
 @@ -13,6 +13,13 @@
   *   file is missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -2940,8 +2924,8 @@
  
  
 diff -up cups-1.3.8/scheduler/main.c.lspp cups-1.3.8/scheduler/main.c
---- cups-1.3.8/scheduler/main.c.lspp	2008-07-28 16:37:51.000000000 +0100
-+++ cups-1.3.8/scheduler/main.c	2008-07-28 16:37:51.000000000 +0100
+--- cups-1.3.8/scheduler/main.c.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/scheduler/main.c	2008-09-10 16:18:26.000000000 +0100
 @@ -35,6 +35,8 @@
   *   usage()                   - Show scheduler usage.
   */
@@ -3010,8 +2994,8 @@
  }
  
 diff -up cups-1.3.8/scheduler/printers.c.lspp cups-1.3.8/scheduler/printers.c
---- cups-1.3.8/scheduler/printers.c.lspp	2008-07-28 16:37:51.000000000 +0100
-+++ cups-1.3.8/scheduler/printers.c	2008-07-28 16:37:51.000000000 +0100
+--- cups-1.3.8/scheduler/printers.c.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/scheduler/printers.c	2008-09-10 16:18:26.000000000 +0100
 @@ -51,6 +51,8 @@
   *                                 printing desktop tools.
   */


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -r1.423 -r1.424
--- cups.spec	3 Sep 2008 16:45:22 -0000	1.423
+++ cups.spec	10 Sep 2008 15:19:33 -0000	1.424
@@ -49,6 +49,7 @@
 Patch22: cups-getnameddest.patch
 Patch23: cups-str2892.patch
 Patch24: cups-res_init.patch
+Patch25: cups-str2536.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -171,6 +172,7 @@
 %patch22 -p1 -b .getnameddest
 %patch23 -p1 -b .str2892
 %patch24 -p1 -b .res_init
+%patch25 -p1 -b .str2536
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -453,6 +455,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Sep 10 2008 Tim Waugh <twaugh at redhat.com>
+- Backported patch for FatalErrors configuration directive
+  (bug #314941, STR #2536).
+
 * Wed Sep  3 2008 Tim Waugh <twaugh at redhat.com>
 - The dnssd backend uses avahi-browse so require it (bug #458565).
 - cups-polld: reinit the resolver if we haven't yet resolved the



From twaugh at fedoraproject.org  Wed Sep 10 15:20:58 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 10 Sep 2008 15:20:58 +0000 (UTC)
Subject: rpms/cups/devel cups-str2536.patch, NONE, 1.1 cups-lspp.patch, 1.35,
	1.36 cups.spec, 1.440, 1.441
Message-ID: <20080910152058.EB15F7012C@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18712

Modified Files:
	cups-lspp.patch cups.spec 
Added Files:
	cups-str2536.patch 
Log Message:
* Wed Sep 10 2008 Tim Waugh <twaugh at redhat.com>
- Backported patch for FatalErrors configuration directive
  (bug #314941, STR #2536).


cups-str2536.patch:

--- NEW FILE cups-str2536.patch ---
diff -up cups-1.3.8/config.h.in.str2536 cups-1.3.8/config.h.in
--- cups-1.3.8/config.h.in.str2536	2008-09-10 16:16:44.000000000 +0100
+++ cups-1.3.8/config.h.in	2008-09-10 16:16:44.000000000 +0100
@@ -43,6 +43,13 @@
 
 
 /*
+ * Default fatal error settings...
+ */
+
+#define CUPS_DEFAULT_FATAL_ERRORS	"config"
+
+
+/*
  * Default browsing settings...
  */
 
diff -up cups-1.3.8/config-scripts/cups-defaults.m4.str2536 cups-1.3.8/config-scripts/cups-defaults.m4
--- cups-1.3.8/config-scripts/cups-defaults.m4.str2536	2008-04-14 19:10:27.000000000 +0100
+++ cups-1.3.8/config-scripts/cups-defaults.m4	2008-09-10 16:16:44.000000000 +0100
@@ -43,6 +43,14 @@ AC_ARG_WITH(log_file_perm, [  --with-log
 AC_SUBST(CUPS_LOG_FILE_PERM)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LOG_FILE_PERM, 0$CUPS_LOG_FILE_PERM)
 
+dnl Default FatalErrors
+AC_ARG_WITH(fatal_errors, [  --with-fatal-errors     set default FatalErrors value, default=config],
+	CUPS_FATAL_ERRORS="$withval",
+	CUPS_FATAL_ERRORS="config")
+AC_SUBST(CUPS_FATAL_ERRORS)
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_FATAL_ERRORS, "$CUPS_FATAL_ERRORS")
+
+
 dnl Default Browsing
 AC_ARG_ENABLE(browsing, [  --enable-browsing       enable Browsing by default, default=yes])
 if test "x$enable_browsing" = xno; then
diff -up cups-1.3.8/configure.str2536 cups-1.3.8/configure
--- cups-1.3.8/configure.str2536	2008-09-10 16:16:44.000000000 +0100
+++ cups-1.3.8/configure	2008-09-10 16:18:16.000000000 +0100
@@ -782,6 +782,7 @@ LAUNCHDLIBS
 LANGUAGES
 CUPS_CONFIG_FILE_PERM
 CUPS_LOG_FILE_PERM
+CUPS_FATAL_ERRORS
 CUPS_BROWSING
 CUPS_BROWSE_LOCAL_PROTOCOLS
 CUPS_BROWSE_REMOTE_PROTOCOLS
@@ -1471,6 +1472,7 @@ Optional Packages:
   --with-languages        set installed languages, default=all
   --with-config-file-perm set default ConfigFilePerm value, default=0640
   --with-log-file-perm    set default LogFilePerm value, default=0644
+  --with-fatal-errors     set default FatalErrors value, default=config
   --with-local-protocols  set default BrowseLocalProtocols, default="CUPS"
   --with-remote-protocols set default BrowseRemoteProtocols, default="CUPS"
   --with-cups-user        set default user for CUPS
@@ -9680,10 +9682,10 @@ case "$uname" in
 		;;
 	Linux* | GNU*)
 		# Linux and GNU Hurd
-		MAN1EXT=1.gz
-		MAN5EXT=5.gz
-		MAN7EXT=7.gz
-		MAN8EXT=8.gz
+		MAN1EXT=1
+		MAN5EXT=5
+		MAN7EXT=7
+		MAN8EXT=8
 		MAN8DIR=8
 		;;
 	*)
@@ -17624,6 +17626,21 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+
+# Check whether --with-fatal_errors was given.
+if test "${with_fatal_errors+set}" = set; then
+  withval=$with_fatal_errors; CUPS_FATAL_ERRORS="$withval"
+else
+  CUPS_FATAL_ERRORS="config"
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define CUPS_DEFAULT_FATAL_ERRORS "$CUPS_FATAL_ERRORS"
+_ACEOF
+
+
+
 # Check whether --enable-browsing was given.
 if test "${enable_browsing+set}" = set; then
   enableval=$enable_browsing;
@@ -19407,6 +19424,7 @@ LAUNCHDLIBS!$LAUNCHDLIBS$ac_delim
 LANGUAGES!$LANGUAGES$ac_delim
 CUPS_CONFIG_FILE_PERM!$CUPS_CONFIG_FILE_PERM$ac_delim
 CUPS_LOG_FILE_PERM!$CUPS_LOG_FILE_PERM$ac_delim
+CUPS_FATAL_ERRORS!$CUPS_FATAL_ERRORS$ac_delim
 CUPS_BROWSING!$CUPS_BROWSING$ac_delim
 CUPS_BROWSE_LOCAL_PROTOCOLS!$CUPS_BROWSE_LOCAL_PROTOCOLS$ac_delim
 CUPS_BROWSE_REMOTE_PROTOCOLS!$CUPS_BROWSE_REMOTE_PROTOCOLS$ac_delim
@@ -19432,7 +19450,6 @@ PHPCONFIG!$PHPCONFIG$ac_delim
 PHPDIR!$PHPDIR$ac_delim
 PYTHON!$PYTHON$ac_delim
 INSTALL_LANGUAGES!$INSTALL_LANGUAGES$ac_delim
-UNINSTALL_LANGUAGES!$UNINSTALL_LANGUAGES$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -19474,11 +19491,12 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+UNINSTALL_LANGUAGES!$UNINSTALL_LANGUAGES$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -up cups-1.3.8/doc/help/ref-cupsd-conf.html.in.str2536 cups-1.3.8/doc/help/ref-cupsd-conf.html.in
--- cups-1.3.8/doc/help/ref-cupsd-conf.html.in.str2536	2008-06-17 19:27:16.000000000 +0100
+++ cups-1.3.8/doc/help/ref-cupsd-conf.html.in	2008-09-10 16:16:44.000000000 +0100
@@ -1115,6 +1115,57 @@ printer.</P>
 </UL>
 
 
+
+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.4</SPAN><A NAME="FatalErrors">FatalErrors</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+FatalErrors none
+FatalErrors all
+FatalErrors browse
+FatalErrors config
+FatalErrors listen
+FatalErrors log
+FatalErrors permissions
+FatalErrors all -permissions
+FatalErrors config permissions log
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>FatalErrors</CODE> directive determines whether certain kinds of
+errors are fatal. The following kinds of errors are currently recognized:</P>
+
+<UL>
+
+	<LI><CODE>none</CODE> - No errors are fatal</LI>
+
+	<LI><CODE>all</CODE> - All of the errors below are fatal</LI>
+
+	<LI><CODE>browse</CODE> - Browsing initialization errors are fatal,
+	for example failed binding to the CUPS browse port or failed connections
+	to LDAP servers</LI>
+
+	<LI><CODE>config</CODE> - Configuration file syntax errors are
+	fatal</LI>
+
+	<LI><CODE>listen</CODE> - Listen or Port errors are fatal, except for
+	IPv6 failures on the loopback or "any" addresses</LI>
+
+	<LI><CODE>log</CODE> - Log file creation or write errors are fatal</LI>
+
+	<LI><CODE>permissions</CODE> - Bad startup file permissions are
+	fatal, for example shared SSL certificate and key files with world-
+	read permissions</LI>
+
+</UL>
+
+<P>Multiple errors can be listed, and the form "-kind" can be used with
+<CODE>all</CODE> to remove specific kinds of errors. The default setting is
+<CODE>@CUPS_FATAL_ERRORS@</CODE>.</P>
+
+
 <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.18</SPAN><A NAME="FileDevice">FileDevice</A></H2>
 
 <H3>Examples</H3>
diff -up cups-1.3.8/man/cupsd.conf.man.in.str2536 cups-1.3.8/man/cupsd.conf.man.in
--- cups-1.3.8/man/cupsd.conf.man.in.str2536	2008-06-16 18:41:11.000000000 +0100
+++ cups-1.3.8/man/cupsd.conf.man.in	2008-09-10 16:16:44.000000000 +0100
@@ -275,6 +275,15 @@ ErrorLog syslog
 .br
 Specifies the error log filename.
 .TP 5
+FatalErrors none
+.TP 5
+FatalErrors all -kind [... -kind]
+.TP 5
+FatalErrors kind [... kind]
+.br
+Specifies which errors are fatal, causing the scheduler to exit. "Kind" is
+"browse", "config", "listen", "log", or "permissions".
+.TP 5
 FileDevice Yes
 .TP 5
 FileDevice No
diff -up cups-1.3.8/scheduler/conf.c.str2536 cups-1.3.8/scheduler/conf.c
--- cups-1.3.8/scheduler/conf.c.str2536	2008-09-10 16:16:44.000000000 +0100
+++ cups-1.3.8/scheduler/conf.c	2008-09-10 16:17:52.000000000 +0100
@@ -21,6 +21,7 @@
  *   get_addr_and_mask()      - Get an IP address and netmask.
  *   parse_aaa()              - Parse authentication, authorization, and
  *                              access control lines.
+ *   parse_fatal_errors()     - Parse FatalErrors values in a string.
  *   parse_groups()           - Parse system group names in a string.
  *   parse_protocols()        - Parse browse protocols in a string.
  *   read_configuration()     - Read a configuration file.
@@ -192,6 +193,7 @@ static int		get_addr_and_mask(const char
 			                  unsigned *mask);
 static int		parse_aaa(cupsd_location_t *loc, char *line,
 			          char *value, int linenum);
+static int		parse_fatal_errors(const char *s);
 static int		parse_groups(const char *s);
 static int		parse_protocols(const char *s);
 static int		read_configuration(cups_file_t *fp);
@@ -512,6 +514,7 @@ cupsdReadConfiguration(void)
   */
 
   ConfigFilePerm        = CUPS_DEFAULT_CONFIG_FILE_PERM;
+  FatalErrors           = parse_fatal_errors(CUPS_DEFAULT_FATAL_ERRORS);
   DefaultAuthType       = CUPSD_AUTH_BASIC;
 #ifdef HAVE_SSL
   DefaultEncryption     = HTTP_ENCRYPT_REQUIRED;
@@ -782,30 +785,31 @@ cupsdReadConfiguration(void)
 
   snprintf(temp, sizeof(temp), "%s/rss", CacheDir);
 
-  if (cupsdCheckPermissions(RequestRoot, NULL, 0710, RunUser,
-			    Group, 1, 1) < 0 ||
-      cupsdCheckPermissions(CacheDir, NULL, 0775, RunUser,
-			    Group, 1, 1) < 0 ||
-      cupsdCheckPermissions(temp, NULL, 0775, RunUser,
-			    Group, 1, 1) < 0 ||
-      cupsdCheckPermissions(StateDir, NULL, 0755, RunUser,
-			    Group, 1, 1) < 0 ||
-      cupsdCheckPermissions(StateDir, "certs", RunUser ? 0711 : 0511, User,
-			    SystemGroupIDs[0], 1, 1) < 0 ||
-      cupsdCheckPermissions(ServerRoot, NULL, 0755, RunUser, 
-			    Group, 1, 0) < 0 ||
-      cupsdCheckPermissions(ServerRoot, "ppd", 0755, RunUser,
-			    Group, 1, 1) < 0 ||
-      cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
-			    Group, 1, 0) < 0 ||
-      cupsdCheckPermissions(ServerRoot, "cupsd.conf", ConfigFilePerm, RunUser,
-			    Group, 0, 0) < 0 ||
-      cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
-			    Group, 0, 0) < 0 ||
-      cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-			    Group, 0, 0) < 0 ||
-      cupsdCheckPermissions(ServerRoot, "passwd.md5", 0600, User,
-			    Group, 0, 0) < 0)
+  if ((cupsdCheckPermissions(RequestRoot, NULL, 0710, RunUser,
+			     Group, 1, 1) < 0 ||
+       cupsdCheckPermissions(CacheDir, NULL, 0775, RunUser,
+			     Group, 1, 1) < 0 ||
+       cupsdCheckPermissions(temp, NULL, 0775, RunUser,
+			     Group, 1, 1) < 0 ||
+       cupsdCheckPermissions(StateDir, NULL, 0755, RunUser,
+			     Group, 1, 1) < 0 ||
+       cupsdCheckPermissions(StateDir, "certs", RunUser ? 0711 : 0511, User,
+			     SystemGroupIDs[0], 1, 1) < 0 ||
+       cupsdCheckPermissions(ServerRoot, NULL, 0755, RunUser, 
+			     Group, 1, 0) < 0 ||
+       cupsdCheckPermissions(ServerRoot, "ppd", 0755, RunUser,
+			     Group, 1, 1) < 0 ||
+       cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+			     Group, 1, 0) < 0 ||
+       cupsdCheckPermissions(ServerRoot, "cupsd.conf", ConfigFilePerm, RunUser,
+			     Group, 0, 0) < 0 ||
+       cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+			     Group, 0, 0) < 0 ||
+       cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
+			     Group, 0, 0) < 0 ||
+       cupsdCheckPermissions(ServerRoot, "passwd.md5", 0600, User,
+			     Group, 0, 0) < 0) &&
+      FatalErrors & CUPSD_FATAL_PERMISSIONS)
     return (0);
 
  /*
@@ -855,7 +859,8 @@ cupsdReadConfiguration(void)
     * is under the spool directory or does not exist...
     */
 
-    if (cupsdCheckPermissions(TempDir, NULL, 01770, RunUser, Group, 1, 1) < 0)
+    if (cupsdCheckPermissions(TempDir, NULL, 01770, RunUser, Group, 1, 1) < 0 &&
+	(FatalErrors & CUPSD_FATAL_PERMISSIONS))
       return (0);
   }
 
@@ -872,8 +877,10 @@ cupsdReadConfiguration(void)
   if (MaxClients > (MaxFDs / 3) || MaxClients <= 0)
   {
     if (MaxClients > 0)
-      cupsdLogMessage(CUPSD_LOG_INFO, "MaxClients limited to 1/3 (%d) of the file descriptor limit (%d)...",
-                 MaxFDs / 3, MaxFDs);
+      cupsdLogMessage(CUPSD_LOG_INFO,
+                      "MaxClients limited to 1/3 (%d) of the file descriptor "
+		      "limit (%d)...",
+                      MaxFDs / 3, MaxFDs);
 
     MaxClients = MaxFDs / 3;
   }
@@ -1115,7 +1122,8 @@ cupsdReadConfiguration(void)
     {
       cupsdLogMessage(CUPSD_LOG_EMERG,
                       "Unable to load MIME database from \'%s\'!", ServerRoot);
-      exit(errno);
+      if (FatalErrors & CUPSD_FATAL_CONFIG)
+	return (0);
     }
 
     cupsdLogMessage(CUPSD_LOG_INFO,
@@ -1912,6 +1920,86 @@ parse_aaa(cupsd_location_t *loc,	/* I - 
 
 
 /*
+ * 'parse_fatal_errors()' - Parse FatalErrors values in a string.
+ */
+
+static int				/* O - FatalErrors bits */
+parse_fatal_errors(const char *s)	/* I - FatalErrors string */
+{
+  int	fatal;				/* FatalErrors bits */
+  char	value[1024],			/* Value string */
+	*valstart,			/* Pointer into value */
+	*valend;			/* End of value */
+
+
+ /*
+  * Empty FatalErrors line yields NULL pointer...
+  */
+
+  if (!s)
+    return (CUPSD_FATAL_NONE);
+
+ /*
+  * Loop through the value string,...
+  */
+
+  strlcpy(value, s, sizeof(value));
+
+  fatal = CUPSD_FATAL_NONE;
+
+  for (valstart = value; *valstart;)
+  {
+   /*
+    * Get the current space/comma-delimited kind name...
+    */
+
+    for (valend = valstart; *valend; valend ++)
+      if (isspace(*valend & 255) || *valend == ',')
+	break;
+
+    if (*valend)
+      *valend++ = '\0';
+
+   /*
+    * Add the error to the bitmask...
+    */
+
+    if (!strcasecmp(valstart, "all"))
+      fatal = CUPSD_FATAL_ALL;
+    else if (!strcasecmp(valstart, "browse"))
+      fatal |= CUPSD_FATAL_BROWSE;
+    else if (!strcasecmp(valstart, "-browse"))
+      fatal &= ~CUPSD_FATAL_BROWSE;
+    else if (!strcasecmp(valstart, "config"))
+      fatal |= CUPSD_FATAL_CONFIG;
+    else if (!strcasecmp(valstart, "-config"))
+      fatal &= ~CUPSD_FATAL_CONFIG;
+    else if (!strcasecmp(valstart, "listen"))
+      fatal |= CUPSD_FATAL_LISTEN;
+    else if (!strcasecmp(valstart, "-listen"))
+      fatal &= ~CUPSD_FATAL_LISTEN;
+    else if (!strcasecmp(valstart, "log"))
+      fatal |= CUPSD_FATAL_LOG;
+    else if (!strcasecmp(valstart, "-log"))
+      fatal &= ~CUPSD_FATAL_LOG;
+    else if (!strcasecmp(valstart, "permissions"))
+      fatal |= CUPSD_FATAL_PERMISSIONS;
+    else if (!strcasecmp(valstart, "-permissions"))
+      fatal &= ~CUPSD_FATAL_PERMISSIONS;
+    else if (strcasecmp(valstart, "none"))
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "Unknown FatalErrors kind \"%s\" ignored!", valstart);
+
+    for (valstart = valend; *valstart; valstart ++)
+      if (!isspace(*valstart & 255) || *valstart != ',')
+	break;
+  }
+
+  return (fatal);
+}
+
+
+/*
  * 'parse_groups()' - Parse system group names in a string.
  */
 
@@ -2740,7 +2828,8 @@ read_configuration(cups_file_t *fp)	/* I
 	cupsdLogMessage(CUPSD_LOG_WARN,
 	                "Unknown default authorization type %s on line %d.",
 	                value, linenum);
-	return (0);
+	if (FatalErrors & CUPSD_FATAL_CONFIG)
+	  return (0);
       }
     }
 #ifdef HAVE_SSL
@@ -2761,7 +2850,8 @@ read_configuration(cups_file_t *fp)	/* I
 	cupsdLogMessage(CUPSD_LOG_WARN,
 	                "Unknown default encryption %s on line %d.",
 	                value, linenum);
-	return (0);
+	if (FatalErrors & CUPSD_FATAL_CONFIG)
+	  return (0);
       }
     }
 #endif /* HAVE_SSL */
@@ -3148,7 +3238,8 @@ read_location(cups_file_t *fp,		/* I - C
       if (!value)
       {
         cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d.", linenum);
-        return (0);
+        if (FatalErrors & CUPSD_FATAL_CONFIG)
+	  return (0);
       }
       
       if ((loc = cupsdCopyLocation(&parent)) == NULL)
@@ -3196,7 +3287,8 @@ read_location(cups_file_t *fp,		/* I - C
       cupsdLogMessage(CUPSD_LOG_ERROR,
                       "Unknown Location directive %s on line %d.",
 	              line, linenum);
-      return (0);
+      if (FatalErrors & CUPSD_FATAL_CONFIG)
+	return (0);
     }
   }
 
@@ -3204,7 +3296,7 @@ read_location(cups_file_t *fp,		/* I - C
                   "Unexpected end-of-file at line %d while reading location!",
                   linenum);
 
-  return (0);
+  return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
 }
 
 
@@ -3262,7 +3354,8 @@ read_policy(cups_file_t *fp,		/* I - Con
       if (!value)
       {
         cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d.", linenum);
-        return (0);
+        if (FatalErrors & CUPSD_FATAL_CONFIG)
+	  return (0);
       }
       
      /*
@@ -3336,7 +3429,8 @@ read_policy(cups_file_t *fp,		/* I - Con
       cupsdLogMessage(CUPSD_LOG_ERROR,
                       "Missing <Limit ops> directive before %s on line %d.",
                       line, linenum);
-      return (0);
+      if (FatalErrors & CUPSD_FATAL_CONFIG)
+	return (0);
     }
     else if (!parse_aaa(op, line, value, linenum))
     {
@@ -3349,7 +3443,8 @@ read_policy(cups_file_t *fp,		/* I - Con
 	                "Unknown Policy directive %s on line %d.",
 	                line, linenum);
 
-      return (0);
+      if (FatalErrors & CUPSD_FATAL_CONFIG)
+	return (0);
     }
   }
 
@@ -3357,7 +3452,7 @@ read_policy(cups_file_t *fp,		/* I - Con
                   "Unexpected end-of-file at line %d while reading policy \"%s\"!",
                   linenum, policy);
 
-  return (0);
+  return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
 }
 
 
diff -up cups-1.3.8/scheduler/conf.h.str2536 cups-1.3.8/scheduler/conf.h
--- cups-1.3.8/scheduler/conf.h.str2536	2008-09-10 16:16:44.000000000 +0100
+++ cups-1.3.8/scheduler/conf.h	2008-09-10 16:16:44.000000000 +0100
@@ -38,6 +38,19 @@ typedef enum
 
 
 /*
+ * FatalErrors flags...
+ */
+
+#define CUPSD_FATAL_NONE	0	/* No errors are fatal */
+#define CUPSD_FATAL_BROWSE	1	/* Browse bind errors are fatal */
+#define CUPSD_FATAL_CONFIG	2	/* Config file syntax errors are fatal */
+#define CUPSD_FATAL_LISTEN	4	/* Listen/Port bind errors are fatal */
+#define CUPSD_FATAL_LOG		8	/* Log file errors are fatal */
+#define CUPSD_FATAL_PERMISSIONS	16	/* File permission errors are fatal */
+#define CUPSD_FATAL_ALL		~0	/* All errors are fatal */
+
+
+/*
  * Printcap formats...
  */
 
@@ -124,6 +137,8 @@ VAR int			ClassifyOverride	VALUE(0),
 					/* Allow overrides? */
 			ConfigFilePerm		VALUE(0640),
 					/* Permissions for config files */
+			FatalErrors		VALUE(CUPSD_FATAL_CONFIG),
+					/* Which errors are fatal? */
 			LogFilePerm		VALUE(0644),
 					/* Permissions for log files */
 			LogLevel		VALUE(CUPSD_LOG_ERROR),
diff -up cups-1.3.8/scheduler/dirsvc.c.str2536 cups-1.3.8/scheduler/dirsvc.c
--- cups-1.3.8/scheduler/dirsvc.c.str2536	2008-07-18 21:30:23.000000000 +0100
+++ cups-1.3.8/scheduler/dirsvc.c	2008-09-10 16:16:44.000000000 +0100
@@ -954,9 +954,14 @@ cupsdStartBrowsing(void)
 			strerror(errno));
 	BrowseLocalProtocols &= ~BROWSE_CUPS;
 	BrowseRemoteProtocols &= ~BROWSE_CUPS;
-	return;
+
+	if (FatalErrors & CUPSD_FATAL_BROWSE)
+	  cupsdEndProcess(getpid(), 0);
       }
+    }
 
+    if (BrowseSocket >= 0)
+    {
      /*
       * Bind the socket to browse port...
       */
@@ -981,50 +986,60 @@ cupsdStartBrowsing(void)
 	BrowseSocket = -1;
 	BrowseLocalProtocols &= ~BROWSE_CUPS;
 	BrowseRemoteProtocols &= ~BROWSE_CUPS;
-	return;
+
+	if (FatalErrors & CUPSD_FATAL_BROWSE)
+	  cupsdEndProcess(getpid(), 0);
       }
     }
 
-   /*
-    * Set the "broadcast" flag...
-    */
-
-    val = 1;
-    if (setsockopt(BrowseSocket, SOL_SOCKET, SO_BROADCAST, &val, sizeof(val)))
+    if (BrowseSocket >= 0)
     {
-      cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to set broadcast mode - %s.",
-        	      strerror(errno));
+     /*
+      * Set the "broadcast" flag...
+      */
+
+      val = 1;
+      if (setsockopt(BrowseSocket, SOL_SOCKET, SO_BROADCAST, &val, sizeof(val)))
+      {
+	cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to set broadcast mode - %s.",
+			strerror(errno));
 
 #ifdef WIN32
-      closesocket(BrowseSocket);
+	closesocket(BrowseSocket);
 #else
-      close(BrowseSocket);
+	close(BrowseSocket);
 #endif /* WIN32 */
 
-      BrowseSocket = -1;
-      BrowseLocalProtocols &= ~BROWSE_CUPS;
-      BrowseRemoteProtocols &= ~BROWSE_CUPS;
-      return;
-    }
+	BrowseSocket = -1;
+	BrowseLocalProtocols &= ~BROWSE_CUPS;
+	BrowseRemoteProtocols &= ~BROWSE_CUPS;
 
-   /*
-    * Close the socket on exec...
-    */
+	if (FatalErrors & CUPSD_FATAL_BROWSE)
+	  cupsdEndProcess(getpid(), 0);
+      }
+    }
 
-    fcntl(BrowseSocket, F_SETFD, fcntl(BrowseSocket, F_GETFD) | FD_CLOEXEC);
+    if (BrowseSocket >= 0)
+    {
+     /*
+      * Close the socket on exec...
+      */
 
-   /*
-    * Finally, add the socket to the input selection set as needed...
-    */
+      fcntl(BrowseSocket, F_SETFD, fcntl(BrowseSocket, F_GETFD) | FD_CLOEXEC);
 
-    if (BrowseRemoteProtocols & BROWSE_CUPS)
-    {
      /*
-      * We only listen if we want remote printers...
+      * Finally, add the socket to the input selection set as needed...
       */
 
-      cupsdAddSelect(BrowseSocket, (cupsd_selfunc_t)update_cups_browse,
-                     NULL, NULL);
+      if (BrowseRemoteProtocols & BROWSE_CUPS)
+      {
+       /*
+	* We only listen if we want remote printers...
+	*/
+
+	cupsdAddSelect(BrowseSocket, (cupsd_selfunc_t)update_cups_browse,
+		       NULL, NULL);
+      }
     }
   }
   else
@@ -1043,6 +1058,10 @@ cupsdStartBrowsing(void)
                       "Unable to open an SLP handle; disabling SLP browsing!");
       BrowseLocalProtocols &= ~BROWSE_SLP;
       BrowseRemoteProtocols &= ~BROWSE_SLP;
+      BrowseSLPHandle = NULL;
+
+      if (FatalErrors & CUPSD_FATAL_BROWSE)
+	cupsdEndProcess(getpid(), 0);
     }
 
     BrowseSLPRefresh = 0;
@@ -1060,6 +1079,9 @@ cupsdStartBrowsing(void)
                       "Need to set BrowseLDAPDN to use LDAP browsing!");
       BrowseLocalProtocols &= ~BROWSE_LDAP;
       BrowseRemoteProtocols &= ~BROWSE_LDAP;
+
+      if (FatalErrors & CUPSD_FATAL_BROWSE)
+	cupsdEndProcess(getpid(), 0);
     }
     else
     {
@@ -1105,6 +1127,9 @@ cupsdStartBrowsing(void)
 	                "Unable to initialize LDAP; disabling LDAP browsing!");
 	BrowseLocalProtocols &= ~BROWSE_LDAP;
 	BrowseRemoteProtocols &= ~BROWSE_LDAP;
+
+	if (FatalErrors & CUPSD_FATAL_BROWSE)
+	  cupsdEndProcess(getpid(), 0);
       }
       else if (ldap_set_option(BrowseLDAPHandle, LDAP_OPT_PROTOCOL_VERSION,
                                (const void *)&version) != LDAP_SUCCESS)
@@ -1116,6 +1141,9 @@ cupsdStartBrowsing(void)
 			"disabling LDAP browsing!");
 	BrowseLocalProtocols &= ~BROWSE_LDAP;
 	BrowseRemoteProtocols &= ~BROWSE_LDAP;
+
+	if (FatalErrors & CUPSD_FATAL_BROWSE)
+	  cupsdEndProcess(getpid(), 0);
       }
       else
       {
@@ -1134,6 +1162,9 @@ cupsdStartBrowsing(void)
 	  ldap_unbind_ext(BrowseLDAPHandle, NULL, NULL);
 	  BrowseLocalProtocols &= ~BROWSE_LDAP;
 	  BrowseRemoteProtocols &= ~BROWSE_LDAP;
+
+	  if (FatalErrors & CUPSD_FATAL_BROWSE)
+	    cupsdEndProcess(getpid(), 0);
 	}
       }
     }
diff -up cups-1.3.8/scheduler/listen.c.str2536 cups-1.3.8/scheduler/listen.c
--- cups-1.3.8/scheduler/listen.c.str2536	2007-08-13 18:20:14.000000000 +0100
+++ cups-1.3.8/scheduler/listen.c	2008-09-10 16:16:44.000000000 +0100
@@ -150,10 +150,15 @@ cupsdStartListening(void)
     httpAddrFreeList(ServerAddrs);
 
   if ((ServerAddrs = httpAddrGetList(ServerName, AF_UNSPEC, NULL)) == NULL)
+  {
     cupsdLogMessage(CUPSD_LOG_ERROR,
                     "Unable to find IP address for server name \"%s\"!\n",
 		    ServerName);
 
+    if (FatalErrors & CUPSD_FATAL_LISTEN)
+      cupsdEndProcess(getpid(), 0);
+  }
+
  /*
   * Setup socket listeners...
   */
@@ -194,6 +199,20 @@ cupsdStartListening(void)
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 			"Unable to open listen socket for address %s:%d - %s.",
 			s, p, strerror(errno));
+
+#ifdef AF_INET6
+       /*
+        * IPv6 is often disabled while DNS returns IPv6 addresses...
+	*/
+
+	if (lis->address.addr.sa_family != AF_INET6 &&
+	    (FatalErrors & CUPSD_FATAL_LISTEN))
+	  cupsdEndProcess(getpid(), 0);
+#else
+	if (FatalErrors & CUPSD_FATAL_LISTEN)
+	  cupsdEndProcess(getpid(), 0);
+#endif /* AF_INET6 */
+
 	continue;
       }
 
@@ -278,6 +297,10 @@ cupsdStartListening(void)
 			s, p, strerror(errno));
 	close(lis->fd);
 	lis->fd = -1;
+
+	if (FatalErrors & CUPSD_FATAL_LISTEN)
+	  cupsdEndProcess(getpid(), 0);
+
 	continue;
       }
 
@@ -290,7 +313,14 @@ cupsdStartListening(void)
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 			"Unable to listen for clients on address %s:%d - %s.",
 			s, p, strerror(errno));
-	exit(errno);
+
+	close(lis->fd);
+	lis->fd = -1;
+
+	if (FatalErrors & CUPSD_FATAL_LISTEN)
+	  cupsdEndProcess(getpid(), 0);
+
+        continue;
       }
     }
 
@@ -339,11 +369,8 @@ cupsdStartListening(void)
                     "No Listen or Port lines were found to allow access via "
 		    "localhost!");
 
-   /*
-    * Commit suicide...
-    */
-
-    cupsdEndProcess(getpid(), 0);
+    if (FatalErrors & (CUPSD_FATAL_CONFIG | CUPSD_FATAL_LISTEN))
+      cupsdEndProcess(getpid(), 0);
   }
 
  /*
diff -up cups-1.3.8/scheduler/log.c.str2536 cups-1.3.8/scheduler/log.c
--- cups-1.3.8/scheduler/log.c.str2536	2008-09-10 16:16:44.000000000 +0100
+++ cups-1.3.8/scheduler/log.c	2008-09-10 16:16:44.000000000 +0100
@@ -546,7 +546,20 @@ check_log_file(cups_file_t **lf,	/* IO -
 
       if (!strncmp(filename, CUPS_LOGDIR, strlen(CUPS_LOGDIR)))
       {
-        cupsdCheckPermissions(CUPS_LOGDIR, NULL, 0755, RunUser, Group, 1, -1);
+       /*
+        * Try updating the permissions of the containing log directory, using
+	* the log file permissions as a basis...
+	*/
+
+        int log_dir_perm = 0300 | LogFilePerm;
+					/* LogFilePerm + owner write/search */
+	if (log_dir_perm & 0040)
+	  log_dir_perm |= 0010;		/* Add group search */
+	if (log_dir_perm & 0004)
+	  log_dir_perm |= 0001;		/* Add other search */
+
+        cupsdCheckPermissions(CUPS_LOGDIR, NULL, log_dir_perm, RunUser, Group,
+	                      1, -1);
 
         *lf = cupsFileOpen(filename, "a");
       }
@@ -555,6 +568,10 @@ check_log_file(cups_file_t **lf,	/* IO -
       {
 	syslog(LOG_ERR, "Unable to open log file \"%s\" - %s", filename,
 	       strerror(errno));
+
+        if (FatalErrors & CUPSD_FATAL_LOG)
+	  cupsdEndProcess(getpid(), 0);
+
 	return (0);
       }
     }
@@ -622,6 +639,9 @@ check_log_file(cups_file_t **lf,	/* IO -
       syslog(LOG_ERR, "Unable to open log file \"%s\" - %s", filename,
              strerror(errno));
 
+      if (FatalErrors & CUPSD_FATAL_LOG)
+	cupsdEndProcess(getpid(), 0);
+
       return (0);
     }
 

cups-lspp.patch:

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-lspp.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- cups-lspp.patch	28 Jul 2008 15:40:15 -0000	1.35
+++ cups-lspp.patch	10 Sep 2008 15:20:58 -0000	1.36
@@ -1,7 +1,7 @@
 diff -up cups-1.3.8/config.h.in.lspp cups-1.3.8/config.h.in
---- cups-1.3.8/config.h.in.lspp	2008-01-07 18:26:57.000000000 +0000
-+++ cups-1.3.8/config.h.in	2008-07-28 16:37:51.000000000 +0100
-@@ -530,6 +530,13 @@
+--- cups-1.3.8/config.h.in.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/config.h.in	2008-09-10 16:18:26.000000000 +0100
+@@ -544,6 +544,13 @@
  #undef HAVE_REMOVEFILE
  
  
@@ -16,8 +16,8 @@
  
  /*
 diff -up /dev/null cups-1.3.8/config-scripts/cups-lspp.m4
---- /dev/null	2008-07-28 15:45:57.127000670 +0100
-+++ cups-1.3.8/config-scripts/cups-lspp.m4	2008-07-28 16:37:51.000000000 +0100
+--- /dev/null	2008-09-10 08:56:32.430063181 +0100
++++ cups-1.3.8/config-scripts/cups-lspp.m4	2008-09-10 16:18:26.000000000 +0100
 @@ -0,0 +1,36 @@
 +dnl
 +dnl   LSPP code for the Common UNIX Printing System (CUPS).
@@ -57,7 +57,7 @@
 +fi
 diff -up cups-1.3.8/configure.in.lspp cups-1.3.8/configure.in
 --- cups-1.3.8/configure.in.lspp	2007-07-25 00:47:12.000000000 +0100
-+++ cups-1.3.8/configure.in	2008-07-28 16:37:51.000000000 +0100
++++ cups-1.3.8/configure.in	2008-09-10 16:18:26.000000000 +0100
 @@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4)
  sinclude(config-scripts/cups-pdf.m4)
  sinclude(config-scripts/cups-scripting.m4)
@@ -68,9 +68,9 @@
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
 diff -up cups-1.3.8/configure.lspp cups-1.3.8/configure
---- cups-1.3.8/configure.lspp	2008-07-28 16:37:51.000000000 +0100
-+++ cups-1.3.8/configure	2008-07-28 16:37:51.000000000 +0100
-@@ -806,6 +806,8 @@ PHP
+--- cups-1.3.8/configure.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/configure	2008-09-10 16:18:43.000000000 +0100
+@@ -807,6 +807,8 @@ PHP
  PHPCONFIG
  PHPDIR
  PYTHON
@@ -79,7 +79,7 @@
  INSTALL_LANGUAGES
  UNINSTALL_LANGUAGES
  LIBOBJS
-@@ -1429,6 +1431,7 @@ Optional Features:
+@@ -1430,6 +1432,7 @@ Optional Features:
                            enable UseNetworkDefault by default, default=auto
    --enable-raw-printing   enable raw printing by default, default=auto
    --enable-pdftops        build pdftops filter, default=auto
@@ -87,22 +87,7 @@
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -9680,10 +9683,10 @@ case "$uname" in
- 		;;
- 	Linux* | GNU*)
- 		# Linux and GNU Hurd
--		MAN1EXT=1.gz
--		MAN5EXT=5.gz
--		MAN7EXT=7.gz
--		MAN8EXT=8.gz
-+		MAN1EXT=1
-+		MAN5EXT=5
-+		MAN7EXT=7
-+		MAN8EXT=8
- 		MAN8DIR=8
- 		;;
- 	*)
-@@ -18452,6 +18455,412 @@ fi
+@@ -18555,6 +18558,412 @@ fi
  
  
  
@@ -515,35 +500,34 @@
  INSTALL_LANGUAGES=""
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
-@@ -19345,8 +19754,8 @@ PHP!$PHP$ac_delim
+@@ -19449,7 +19858,7 @@ PHP!$PHP$ac_delim
  PHPCONFIG!$PHPCONFIG$ac_delim
  PHPDIR!$PHPDIR$ac_delim
  PYTHON!$PYTHON$ac_delim
 -INSTALL_LANGUAGES!$INSTALL_LANGUAGES$ac_delim
--UNINSTALL_LANGUAGES!$UNINSTALL_LANGUAGES$ac_delim
 +LIBAUDIT!$LIBAUDIT$ac_delim
-+LIBSELINUX!$LIBSELINUX$ac_delim
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -19388,11 +19797,13 @@ _ACEOF
+@@ -19491,12 +19900,14 @@ _ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
++LIBSELINUX!$LIBSELINUX$ac_delim
 +INSTALL_LANGUAGES!$INSTALL_LANGUAGES$ac_delim
-+UNINSTALL_LANGUAGES!$UNINSTALL_LANGUAGES$ac_delim
+ UNINSTALL_LANGUAGES!$UNINSTALL_LANGUAGES$ac_delim
  LIBOBJS!$LIBOBJS$ac_delim
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 diff -up cups-1.3.8/cups/cups.h.lspp cups-1.3.8/cups/cups.h
---- cups-1.3.8/cups/cups.h.lspp	2008-07-28 16:37:51.000000000 +0100
-+++ cups-1.3.8/cups/cups.h	2008-07-28 16:37:51.000000000 +0100
+--- cups-1.3.8/cups/cups.h.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/cups/cups.h	2008-09-10 16:18:26.000000000 +0100
 @@ -15,6 +15,9 @@
   *   This file is subject to the Apple OS-Developed Software exception.
   */
@@ -569,7 +553,7 @@
   */
 diff -up cups-1.3.8/data/Makefile.lspp cups-1.3.8/data/Makefile
 --- cups-1.3.8/data/Makefile.lspp	2007-10-10 23:00:43.000000000 +0100
-+++ cups-1.3.8/data/Makefile	2008-07-28 16:37:51.000000000 +0100
++++ cups-1.3.8/data/Makefile	2008-09-10 16:18:26.000000000 +0100
 @@ -25,7 +25,10 @@ BANNERS	=	\
  		secret \
  		standard \
@@ -583,8 +567,8 @@
  CHARMAPS =	\
  		euc-cn.txt \
 diff -up /dev/null cups-1.3.8/data/mls
---- /dev/null	2008-07-28 15:45:57.127000670 +0100
-+++ cups-1.3.8/data/mls	2008-07-28 16:37:51.000000000 +0100
+--- /dev/null	2008-09-10 08:56:32.430063181 +0100
++++ cups-1.3.8/data/mls	2008-09-10 16:18:26.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -848,8 +832,8 @@
 +%
 +%%EOF
 diff -up /dev/null cups-1.3.8/data/selinux
---- /dev/null	2008-07-28 15:45:57.127000670 +0100
-+++ cups-1.3.8/data/selinux	2008-07-28 16:37:51.000000000 +0100
+--- /dev/null	2008-09-10 08:56:32.430063181 +0100
++++ cups-1.3.8/data/selinux	2008-09-10 16:18:26.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -1113,8 +1097,8 @@
 +%
 +%%EOF
 diff -up /dev/null cups-1.3.8/data/te
---- /dev/null	2008-07-28 15:45:57.127000670 +0100
-+++ cups-1.3.8/data/te	2008-07-28 16:37:51.000000000 +0100
+--- /dev/null	2008-09-10 08:56:32.430063181 +0100
++++ cups-1.3.8/data/te	2008-09-10 16:18:26.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -1379,7 +1363,7 @@
 +%%EOF
 diff -up cups-1.3.8/filter/common.c.lspp cups-1.3.8/filter/common.c
 --- cups-1.3.8/filter/common.c.lspp	2008-07-11 23:48:49.000000000 +0100
-+++ cups-1.3.8/filter/common.c	2008-07-28 16:37:51.000000000 +0100
++++ cups-1.3.8/filter/common.c	2008-09-10 16:18:26.000000000 +0100
 @@ -30,6 +30,12 @@
   * Include necessary headers...
   */
@@ -1550,7 +1534,7 @@
  /*
 diff -up cups-1.3.8/Makedefs.in.lspp cups-1.3.8/Makedefs.in
 --- cups-1.3.8/Makedefs.in.lspp	2008-01-22 22:37:21.000000000 +0000
-+++ cups-1.3.8/Makedefs.in	2008-07-28 16:37:51.000000000 +0100
++++ cups-1.3.8/Makedefs.in	2008-09-10 16:18:26.000000000 +0100
 @@ -134,7 +134,7 @@ LIBCUPSORDER	=	@LIBCUPSORDER@
  LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
  LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
@@ -1561,9 +1545,9 @@
  OPTIONS		=
  PAMLIBS		=	@PAMLIBS@
 diff -up cups-1.3.8/scheduler/client.c.lspp cups-1.3.8/scheduler/client.c
---- cups-1.3.8/scheduler/client.c.lspp	2008-07-11 23:48:49.000000000 +0100
-+++ cups-1.3.8/scheduler/client.c	2008-07-28 16:37:51.000000000 +0100
-@@ -39,12 +39,14 @@
+--- cups-1.3.8/scheduler/client.c.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/scheduler/client.c	2008-09-10 16:18:26.000000000 +0100
+@@ -40,12 +40,14 @@
   *   pipe_command()          - Pipe the output of a command to the remote client.
   *   write_file()            - Send a file via HTTP.
   *   write_pipe()            - Flag that data is available on the CGI pipe.
@@ -1578,7 +1562,7 @@
  #include <cups/http-private.h>
  #include "cupsd.h"
  
-@@ -76,6 +78,12 @@ extern const char *cssmErrorString(int e
+@@ -77,6 +79,12 @@ extern const char *cssmErrorString(int e
  #  include <gnutls/x509.h>
  #endif /* HAVE_GNUTLS */
  
@@ -1591,7 +1575,7 @@
  
  /*
   * Local functions...
-@@ -349,6 +357,57 @@ cupsdAcceptClient(cupsd_listener_t *lis)
+@@ -351,6 +359,57 @@ cupsdAcceptClient(cupsd_listener_t *lis)
      }
    }
  
@@ -1649,7 +1633,7 @@
  #ifdef AF_INET6
    if (con->http.hostaddr->addr.sa_family == AF_INET6)
      cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: %d from %s:%d (IPv6)",
-@@ -731,6 +790,13 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -733,6 +792,13 @@ cupsdReadClient(cupsd_client_t *con)	/* 
    mime_type_t		*type;		/* MIME type of file */
    cupsd_printer_t	*p;		/* Printer */
    static unsigned	request_id = 0;	/* Request ID for temp files */
@@ -1663,7 +1647,7 @@
  
  
    status = HTTP_CONTINUE;
-@@ -2016,6 +2082,67 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -2017,6 +2083,67 @@ cupsdReadClient(cupsd_client_t *con)	/* 
  	    fchmod(con->file, 0640);
  	    fchown(con->file, RunUser, Group);
              fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
@@ -1731,7 +1715,7 @@
  	  }
  
  	  if (con->http.state != HTTP_POST_SEND)
-@@ -4255,6 +4382,50 @@ make_certificate(cupsd_client_t *con)	/*
+@@ -4288,6 +4415,50 @@ make_certificate(cupsd_client_t *con)	/*
  #endif /* HAVE_SSL */
  
  
@@ -1784,7 +1768,7 @@
   */
 diff -up cups-1.3.8/scheduler/client.h.lspp cups-1.3.8/scheduler/client.h
 --- cups-1.3.8/scheduler/client.h.lspp	2007-10-22 19:52:13.000000000 +0100
-+++ cups-1.3.8/scheduler/client.h	2008-07-28 16:37:51.000000000 +0100
++++ cups-1.3.8/scheduler/client.h	2008-09-10 16:18:26.000000000 +0100
 @@ -17,6 +17,13 @@
  #  include <Security/Authorization.h>
  #endif /* HAVE_AUTHORIZATION_H */
@@ -1821,9 +1805,9 @@
  
  /*
 diff -up cups-1.3.8/scheduler/conf.c.lspp cups-1.3.8/scheduler/conf.c
---- cups-1.3.8/scheduler/conf.c.lspp	2008-07-28 16:37:51.000000000 +0100
-+++ cups-1.3.8/scheduler/conf.c	2008-07-28 16:37:51.000000000 +0100
-@@ -26,6 +26,7 @@
+--- cups-1.3.8/scheduler/conf.c.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/scheduler/conf.c	2008-09-10 16:18:26.000000000 +0100
+@@ -27,6 +27,7 @@
   *   read_configuration()     - Read a configuration file.
   *   read_location()          - Read a <Location path> definition.
   *   read_policy()            - Read a <Policy name> definition.
@@ -1831,7 +1815,7 @@
   */
  
  /*
-@@ -47,6 +48,9 @@
+@@ -48,6 +49,9 @@
  #  define INADDR_NONE	0xffffffff
  #endif /* !INADDR_NONE */
  
@@ -1841,7 +1825,7 @@
  
  /*
   * Configuration variable structure...
-@@ -160,6 +164,10 @@ static const cupsd_var_t	variables[] =
+@@ -161,6 +165,10 @@ static const cupsd_var_t	variables[] =
  #  if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
    { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_PATHNAME },
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
@@ -1852,7 +1836,7 @@
  #endif /* HAVE_SSL */
    { "ServerName",		&ServerName,		CUPSD_VARTYPE_STRING },
    { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_PATHNAME },
-@@ -350,6 +358,9 @@ cupsdReadConfiguration(void)
+@@ -352,6 +360,9 @@ cupsdReadConfiguration(void)
  		*old_requestroot;	/* Old RequestRoot */
    const char	*tmpdir;		/* TMPDIR environment variable */
    struct stat	tmpinfo;		/* Temporary directory info */
@@ -1862,7 +1846,7 @@
  
  
   /*
-@@ -611,6 +622,25 @@ cupsdReadConfiguration(void)
+@@ -614,6 +625,25 @@ cupsdReadConfiguration(void)
  
    RunUser = getuid();
  
@@ -1888,7 +1872,7 @@
   /*
    * See if the ServerName is an IP address...
    */
-@@ -889,11 +919,23 @@ cupsdReadConfiguration(void)
+@@ -896,11 +926,23 @@ cupsdReadConfiguration(void)
    if (MaxActiveJobs > (MaxFDs / 3))
      MaxActiveJobs = MaxFDs / 3;
  
@@ -1913,8 +1897,8 @@
  
   /*
    * Update the MaxClientsPerHost value, as needed...
-@@ -3360,6 +3402,18 @@ read_policy(cups_file_t *fp,		/* I - Con
-   return (0);
+@@ -3299,6 +3341,18 @@ read_location(cups_file_t *fp,		/* I - C
+   return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
  }
  
 +#ifdef WITH_LSPP
@@ -1931,11 +1915,11 @@
 +
  
  /*
-  * End of "$Id$".
+  * 'read_policy()' - Read a <Policy name> definition.
 diff -up cups-1.3.8/scheduler/conf.h.lspp cups-1.3.8/scheduler/conf.h
---- cups-1.3.8/scheduler/conf.h.lspp	2008-07-28 16:37:51.000000000 +0100
-+++ cups-1.3.8/scheduler/conf.h	2008-07-28 16:37:51.000000000 +0100
-@@ -193,6 +193,12 @@ VAR char		*ServerKey		VALUE(NULL);
+--- cups-1.3.8/scheduler/conf.h.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/scheduler/conf.h	2008-09-10 16:18:26.000000000 +0100
+@@ -208,6 +208,12 @@ VAR char		*ServerKey		VALUE(NULL);
  					/* Server key file */
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
  #endif /* HAVE_SSL */
@@ -1948,7 +1932,7 @@
  
  #ifdef HAVE_LAUNCHD
  VAR int			LaunchdTimeout		VALUE(DEFAULT_TIMEOUT);
-@@ -211,6 +217,9 @@ VAR char		*SystemGroupAuthKey	VALUE(NULL
+@@ -226,6 +232,9 @@ VAR char		*SystemGroupAuthKey	VALUE(NULL
  					/* System group auth key */
  #endif /* HAVE_AUTHORIZATION_H */
  
@@ -1959,8 +1943,8 @@
  /*
   * Prototypes...
 diff -up cups-1.3.8/scheduler/ipp.c.lspp cups-1.3.8/scheduler/ipp.c
---- cups-1.3.8/scheduler/ipp.c.lspp	2008-07-28 16:37:51.000000000 +0100
-+++ cups-1.3.8/scheduler/ipp.c	2008-07-28 16:39:08.000000000 +0100
+--- cups-1.3.8/scheduler/ipp.c.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/scheduler/ipp.c	2008-09-10 16:18:26.000000000 +0100
 @@ -36,6 +36,7 @@
   *   cancel_all_jobs()           - Cancel all print jobs.
   *   cancel_job()                - Cancel a print job.
@@ -2553,8 +2537,8 @@
    * Check the username against the owner...
    */
 diff -up cups-1.3.8/scheduler/job.c.lspp cups-1.3.8/scheduler/job.c
---- cups-1.3.8/scheduler/job.c.lspp	2008-07-28 16:37:51.000000000 +0100
-+++ cups-1.3.8/scheduler/job.c	2008-07-28 16:37:51.000000000 +0100
+--- cups-1.3.8/scheduler/job.c.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/scheduler/job.c	2008-09-10 16:18:26.000000000 +0100
 @@ -60,6 +60,9 @@
   *   update_job_attrs()         - Update the job-printer-* attributes.
   */
@@ -2913,7 +2897,7 @@
      if ((attr = ippFindAttribute(job->attrs, "job-sheets",
 diff -up cups-1.3.8/scheduler/job.h.lspp cups-1.3.8/scheduler/job.h
 --- cups-1.3.8/scheduler/job.h.lspp	2008-01-16 22:20:33.000000000 +0000
-+++ cups-1.3.8/scheduler/job.h	2008-07-28 16:37:51.000000000 +0100
++++ cups-1.3.8/scheduler/job.h	2008-09-10 16:18:26.000000000 +0100
 @@ -13,6 +13,13 @@
   *   file is missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -2940,8 +2924,8 @@
  
  
 diff -up cups-1.3.8/scheduler/main.c.lspp cups-1.3.8/scheduler/main.c
---- cups-1.3.8/scheduler/main.c.lspp	2008-07-28 16:37:51.000000000 +0100
-+++ cups-1.3.8/scheduler/main.c	2008-07-28 16:37:51.000000000 +0100
+--- cups-1.3.8/scheduler/main.c.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/scheduler/main.c	2008-09-10 16:18:26.000000000 +0100
 @@ -35,6 +35,8 @@
   *   usage()                   - Show scheduler usage.
   */
@@ -3010,8 +2994,8 @@
  }
  
 diff -up cups-1.3.8/scheduler/printers.c.lspp cups-1.3.8/scheduler/printers.c
---- cups-1.3.8/scheduler/printers.c.lspp	2008-07-28 16:37:51.000000000 +0100
-+++ cups-1.3.8/scheduler/printers.c	2008-07-28 16:37:51.000000000 +0100
+--- cups-1.3.8/scheduler/printers.c.lspp	2008-09-10 16:18:26.000000000 +0100
++++ cups-1.3.8/scheduler/printers.c	2008-09-10 16:18:26.000000000 +0100
 @@ -51,6 +51,8 @@
   *                                 printing desktop tools.
   */


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -r1.440 -r1.441
--- cups.spec	4 Sep 2008 12:40:34 -0000	1.440
+++ cups.spec	10 Sep 2008 15:20:58 -0000	1.441
@@ -50,6 +50,7 @@
 Patch23: cups-str2892.patch
 Patch24: cups-str2101.patch
 Patch25: cups-res_init.patch
+Patch26: cups-str2536.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -188,6 +189,7 @@
 %patch23 -p1 -b .str2892
 %patch24 -p1 -b .str2101
 %patch25 -p1 -b .res_init
+%patch26 -p1 -b .str2536
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -479,6 +481,10 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Wed Sep 10 2008 Tim Waugh <twaugh at redhat.com>
+- Backported patch for FatalErrors configuration directive
+  (bug #314941, STR #2536).
+
 * Thu Sep  4 2008 Tim Waugh <twaugh at redhat.com>
 - Use php-cgi for executing PHP scripts (bug #460898).
 



From twaugh at fedoraproject.org  Wed Sep 10 15:21:48 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 10 Sep 2008 15:21:48 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.441,1.442
Message-ID: <20080910152148.4636E7012F@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18775

Modified Files:
	cups.spec 
Log Message:
1.3.8-6


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- cups.spec	10 Sep 2008 15:20:58 -0000	1.441
+++ cups.spec	10 Sep 2008 15:21:18 -0000	1.442
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.8
-Release: 5%{?svn:.svn%{svn}}%{?dist}
+Release: 6%{?svn:.svn%{svn}}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@@ -481,7 +481,7 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
-* Wed Sep 10 2008 Tim Waugh <twaugh at redhat.com>
+* Wed Sep 10 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.8-6
 - Backported patch for FatalErrors configuration directive
   (bug #314941, STR #2536).
 



From corsepiu at fedoraproject.org  Wed Sep 10 15:30:04 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Wed, 10 Sep 2008 15:30:04 +0000 (UTC)
Subject: rpms/perl-File-Remove/devel .cvsignore, 1.11,
	1.12 perl-File-Remove.spec, 1.24, 1.25 sources, 1.11, 1.12
Message-ID: <20080910153004.AEE547012C@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Remove/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19753/devel

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Wed Sep 10 2008 Ralf Corsepius <rc040203 at freenet.de> - 1.42-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Remove/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	10 Jun 2008 08:04:04 -0000	1.11
+++ .cvsignore	10 Sep 2008 15:29:34 -0000	1.12
@@ -1 +1 @@
-File-Remove-1.41.tar.gz
+File-Remove-1.42.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Remove/devel/perl-File-Remove.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- perl-File-Remove.spec	10 Jun 2008 08:04:04 -0000	1.24
+++ perl-File-Remove.spec	10 Sep 2008 15:29:34 -0000	1.25
@@ -1,5 +1,5 @@
 Name: 		perl-File-Remove
-Version:	1.41
+Version:	1.42
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL+ or Artistic
@@ -11,19 +11,15 @@
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires:	perl(ExtUtils::MakeMaker)
-BuildRequires:	perl(Test::More)
+BuildRequires:	perl(Test::More) >= 0.42
 BuildRequires:	perl(File::Spec) >= 0.84
 BuildRequires:	perl(File::Path)
 BuildRequires:	perl(File::Glob)
 
 # For improved tests
-BuildRequires:  perl(Test::Pod) >= 1.00
-BuildRequires:  perl(Test::MinimumVersion) >= 0.007
-
-%if 0%{?fedora} >= 10
-# FIXME: Missing in FC < 10
-BuildRequires: perl(Test::CPAN::Meta) >= 0.07
-%endif
+BuildRequires:  perl(Test::Pod) >= 1.26
+BuildRequires:  perl(Test::MinimumVersion) >= 0.008
+BuildRequires:  perl(Test::CPAN::Meta) >= 0.12
 
 BuildArch: 	noarch
 
@@ -57,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 10 2008 Ralf Corsepius <rc040203 at freenet.de> - 1.42-1
+- Upstream update.
+
 * Tue Jun 10 2008 Ralf Corsepius <rc040203 at freenet.de> - 1.41-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Remove/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	10 Jun 2008 08:04:04 -0000	1.11
+++ sources	10 Sep 2008 15:29:34 -0000	1.12
@@ -1 +1 @@
-fcb36b5116156820d8f763150b73a5a6  File-Remove-1.41.tar.gz
+7eef25044fc3cc60b6faf0522f865ed5  File-Remove-1.42.tar.gz



From corsepiu at fedoraproject.org  Wed Sep 10 15:30:05 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Wed, 10 Sep 2008 15:30:05 +0000 (UTC)
Subject: rpms/perl-File-Remove/F-8 .cvsignore, 1.11,
	1.12 perl-File-Remove.spec, 1.19, 1.20 sources, 1.11, 1.12
Message-ID: <20080910153005.20EAF7012C@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Remove/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19753/F-8

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Wed Sep 10 2008 Ralf Corsepius <rc040203 at freenet.de> - 1.42-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Remove/F-8/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	10 Jun 2008 08:04:48 -0000	1.11
+++ .cvsignore	10 Sep 2008 15:29:34 -0000	1.12
@@ -1 +1 @@
-File-Remove-1.41.tar.gz
+File-Remove-1.42.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Remove/F-8/perl-File-Remove.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- perl-File-Remove.spec	10 Jun 2008 08:04:48 -0000	1.19
+++ perl-File-Remove.spec	10 Sep 2008 15:29:34 -0000	1.20
@@ -1,5 +1,5 @@
 Name: 		perl-File-Remove
-Version:	1.41
+Version:	1.42
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL+ or Artistic
@@ -11,19 +11,15 @@
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires:	perl(ExtUtils::MakeMaker)
-BuildRequires:	perl(Test::More)
+BuildRequires:	perl(Test::More) >= 0.42
 BuildRequires:	perl(File::Spec) >= 0.84
 BuildRequires:	perl(File::Path)
 BuildRequires:	perl(File::Glob)
 
 # For improved tests
-BuildRequires:  perl(Test::Pod) >= 1.00
-BuildRequires:  perl(Test::MinimumVersion) >= 0.007
-
-%if 0%{?fedora} >= 10
-# FIXME: Missing in FC < 10
-BuildRequires: perl(Test::CPAN::Meta) >= 0.07
-%endif
+BuildRequires:  perl(Test::Pod) >= 1.26
+BuildRequires:  perl(Test::MinimumVersion) >= 0.008
+BuildRequires:  perl(Test::CPAN::Meta) >= 0.12
 
 BuildArch: 	noarch
 
@@ -57,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 10 2008 Ralf Corsepius <rc040203 at freenet.de> - 1.42-1
+- Upstream update.
+
 * Tue Jun 10 2008 Ralf Corsepius <rc040203 at freenet.de> - 1.41-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Remove/F-8/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	10 Jun 2008 08:04:48 -0000	1.11
+++ sources	10 Sep 2008 15:29:34 -0000	1.12
@@ -1 +1 @@
-fcb36b5116156820d8f763150b73a5a6  File-Remove-1.41.tar.gz
+7eef25044fc3cc60b6faf0522f865ed5  File-Remove-1.42.tar.gz



From corsepiu at fedoraproject.org  Wed Sep 10 15:30:04 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Wed, 10 Sep 2008 15:30:04 +0000 (UTC)
Subject: rpms/perl-File-Remove/F-9 .cvsignore, 1.11,
	1.12 perl-File-Remove.spec, 1.24, 1.25 sources, 1.11, 1.12
Message-ID: <20080910153004.D425D70130@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Remove/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19753/F-9

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Wed Sep 10 2008 Ralf Corsepius <rc040203 at freenet.de> - 1.42-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Remove/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	10 Jun 2008 08:04:24 -0000	1.11
+++ .cvsignore	10 Sep 2008 15:29:34 -0000	1.12
@@ -1 +1 @@
-File-Remove-1.41.tar.gz
+File-Remove-1.42.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Remove/F-9/perl-File-Remove.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- perl-File-Remove.spec	10 Jun 2008 08:04:24 -0000	1.24
+++ perl-File-Remove.spec	10 Sep 2008 15:29:34 -0000	1.25
@@ -1,5 +1,5 @@
 Name: 		perl-File-Remove
-Version:	1.41
+Version:	1.42
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL+ or Artistic
@@ -11,19 +11,15 @@
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires:	perl(ExtUtils::MakeMaker)
-BuildRequires:	perl(Test::More)
+BuildRequires:	perl(Test::More) >= 0.42
 BuildRequires:	perl(File::Spec) >= 0.84
 BuildRequires:	perl(File::Path)
 BuildRequires:	perl(File::Glob)
 
 # For improved tests
-BuildRequires:  perl(Test::Pod) >= 1.00
-BuildRequires:  perl(Test::MinimumVersion) >= 0.007
-
-%if 0%{?fedora} >= 10
-# FIXME: Missing in FC < 10
-BuildRequires: perl(Test::CPAN::Meta) >= 0.07
-%endif
+BuildRequires:  perl(Test::Pod) >= 1.26
+BuildRequires:  perl(Test::MinimumVersion) >= 0.008
+BuildRequires:  perl(Test::CPAN::Meta) >= 0.12
 
 BuildArch: 	noarch
 
@@ -57,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 10 2008 Ralf Corsepius <rc040203 at freenet.de> - 1.42-1
+- Upstream update.
+
 * Tue Jun 10 2008 Ralf Corsepius <rc040203 at freenet.de> - 1.41-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Remove/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	10 Jun 2008 08:04:24 -0000	1.11
+++ sources	10 Sep 2008 15:29:34 -0000	1.12
@@ -1 +1 @@
-fcb36b5116156820d8f763150b73a5a6  File-Remove-1.41.tar.gz
+7eef25044fc3cc60b6faf0522f865ed5  File-Remove-1.42.tar.gz



From sgrubb at fedoraproject.org  Wed Sep 10 15:31:20 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed, 10 Sep 2008 15:31:20 +0000 (UTC)
Subject: rpms/prelude-manager/F-9 prelude-manager.init, NONE,
	1.1 prelude-manager.spec, 1.7, 1.8 sources, 1.6,
	1.7 prelude-manager-0.9.7-initd.patch, 1.2, NONE
Message-ID: <20080910153120.A63C67012C@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/prelude-manager/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19992

Modified Files:
	prelude-manager.spec sources 
Added Files:
	prelude-manager.init 
Removed Files:
	prelude-manager-0.9.7-initd.patch 
Log Message:
* Wed Sep 10 2008 Steve Grubb <sgrubb at redhat.com> 0.9.14.2-1
- new upstream version
- Prelude-Manager-SMTP plugin is now included



--- NEW FILE prelude-manager.init ---
#!/bin/sh
# Startup script for prelude-manager
#
# chkconfig: - 70 35
# description: Run prelude-manager

# Source function library.
. /etc/rc.d/init.d/functions

[ -f /usr/bin/prelude-manager ] || exit 0

prog="prelude-manager"

start() {
    if test "x`pidof prelude-manager`" != x; then
	    echo "prelude-manager already started"
	    action $"Starting $prog: " /bin/false
	    RETVAL=1
	    return $RETVAL
    else
	    echo -n $"Starting $prog: " 
	    daemon prelude-manager -d
	    RETVAL=$?
	    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/prelude-manager
	    echo
	    return $RETVAL
    fi
}

stop() {
    if test "x`pidof prelude-manager`" != x; then
	echo -n $"Stopping $prog: "
	killproc prelude-manager
	echo
    fi
    RETVAL=$?
    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/prelude-manager 
    return $RETVAL
}

case "$1" in
	start)
	    start
	    ;;
	
	stop)
	    stop
	    ;;
	
	status)
	    status prelude-manager
	    ;;
	restart|reload)
	    stop
	    sleep 3
	    start
	    ;;
	condrestart)
	    if test "x`pidof prelude-manager`" != x; then
		stop
		start
	    fi
	    ;;
	
	*)
	    echo $"Usage: $0 {start|stop|restart|condrestart|status}"
	    exit 1

esac

exit 0


Index: prelude-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prelude-manager/F-9/prelude-manager.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- prelude-manager.spec	14 May 2008 12:34:57 -0000	1.7
+++ prelude-manager.spec	10 Sep 2008 15:30:50 -0000	1.8
@@ -1,13 +1,13 @@
 Name:		prelude-manager           
-Version:	0.9.12.1
+Version:	0.9.14.2
 Release:	1%{?dist}
 Summary:	Prelude-Manager
 
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://www.prelude-ids.org
-Source0:	http://www.prelude-ids.org/download/releases/%{name}-%{version}.tar.gz
-Patch0:		%{name}-0.9.7-initd.patch
+Source0:	http://www.prelude-ids.org/download/releases/%{name}/%{name}-%{version}.tar.gz
+Source1:	%{name}.init
 Patch1:		%{name}-0.9.12-pie.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -51,15 +51,7 @@
 %description    db-plugin
 Prelude Manager is the main program of the Prelude Hybrid IDS
 suite. It is a multithreaded server which handles connections from
-the Prelude sensors. It is able to register local or remote
-sensors, let the operator configure them remotely, receive alerts,
-and store alerts in a database or any format supported by
-reporting plugins, thus providing centralized logging and
-analysis. It also provides relaying capabilities for failover and
-replication. The IDMEF standard is used for alert representation.
-Support for filtering plugins allows you to hook in different
-places in the Manager to define custom criteria for alert relaying
-and logging.
+the Prelude sensors.
 
 This plugin authorize prelude-manager to write to database.
 
@@ -71,23 +63,25 @@
 %description    xml-plugin
 Prelude Manager is the main program of the Prelude Hybrid IDS
 suite. It is a multithreaded server which handles connections from
-the Prelude sensors. It is able to register local or remote
-sensors, let the operator configure them remotely, receive alerts,
-and store alerts in a database or any format supported by
-reporting plugins, thus providing centralized logging and
-analysis. It also provides relaying capabilities for failover and
-replication. The IDMEF standard is used for alert representation.
-Support for filtering plugins allows you to hook in different
-places in the Manager to define custom criteria for alert relaying
-and logging.
+the Prelude sensors.
 
 This plugin adds XML logging capabilities to the Prelude IDS
 Manager.
 
+%package	smtp-plugin
+Summary:	SMTP alert plugin for Prelude IDS Manager
+Group:		System Environment/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description    smtp-plugin
+Prelude Manager is the main program of the Prelude Hybrid IDS
+suite. It is a multithreaded server which handles connections from
+the Prelude sensors.
+
+This plugin adds alerting by email capabilities to the Prelude IDS
 
 %prep
 %setup -q
-%patch0 -p0
 %patch1 -p1
 sed -i.debug -e '/nlist/s|\$rm|: $rm|' ltmain.sh
 
@@ -105,12 +99,11 @@
 mkdir -p %{buildroot}/%{_initrddir}
 mkdir -p %{buildroot}/%{_var}/spool/prelude-manager/scheduler
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p"
-cp -p AUTHORS ChangeLog README NEWS COPYING HACKING.README \
-%{buildroot}%{_defaultdocdir}/%{name}-%{version}
-install -m 755 %{name}.initd %{buildroot}/%{_initrddir}/%{name}
+install -m 755 %{SOURCE1} %{buildroot}/%{_initrddir}/%{name}
 rm -f %{buildroot}/%{_libdir}/%{name}/reports/*.la
 rm -f %{buildroot}/%{_libdir}/%{name}/filters/*.la
 rm -f %{buildroot}/%{_libdir}/%{name}/decodes/*.la
+rm -f %{buildroot}%{_defaultdocdir}/%{name}/smtp/template.example
 
 %clean
 rm -rf %{buildroot}
@@ -133,6 +126,7 @@
 
 %files
 %defattr(0755,root,root,-)
+%doc %attr(0644,root,root) AUTHORS README NEWS COPYING HACKING.README
 %config %dir %{_sysconfdir}/%{name}/
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/%{name}/*
 %{_initrddir}/%{name}
@@ -150,8 +144,6 @@
 %dir %{_localstatedir}/spool/%{name}/scheduler
 %dir %{_localstatedir}/run/%{name}/
 %dir %{_datadir}/%{name}/
-%dir %{_defaultdocdir}/%{name}-%{version}/
-%doc %attr(0644,root,root) %{_defaultdocdir}/%{name}-%{version}/*
 %attr(0644,root,root) %{_mandir}/man1/prelude-manager.1.gz
 
 %files db-plugin
@@ -164,6 +156,11 @@
 %dir %{_datadir}/%{name}/xmlmod/
 %{_datadir}/%{name}/xmlmod/*
 
+%files smtp-plugin
+%defattr(-,root,root)
+%doc %attr(0644,root,root) plugins/reports/smtp/template.example
+%{_libdir}/%{name}/reports/smtp.so
+
 %files devel
 %defattr(-,root,root)
 %dir %{_includedir}/%{name}/
@@ -171,6 +168,10 @@
 
 
 %changelog
+* Wed Sep 10 2008 Steve Grubb <sgrubb at redhat.com> 0.9.14.2-1
+- new upstream version
+- Prelude-Manager-SMTP plugin is now included
+
 * Wed May 14 2008 Steve Grubb <sgrubb at redhat.com> 0.9.12.1-1
 - new upstream version 0.9.12.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/prelude-manager/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 May 2008 12:34:57 -0000	1.6
+++ sources	10 Sep 2008 15:30:50 -0000	1.7
@@ -1 +1 @@
-865631e71f63ce605f91d7aed076c4c0  prelude-manager-0.9.12.1.tar.gz
+4112f1be84cace540d649a6127a46d9c  prelude-manager-0.9.14.2.tar.gz


--- prelude-manager-0.9.7-initd.patch DELETED ---



From limb at fedoraproject.org  Wed Sep 10 15:39:35 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 10 Sep 2008 15:39:35 +0000 (UTC)
Subject: rpms/bacula/F-9 bacula.spec,1.8,1.9
Message-ID: <20080910153935.5489B7012C@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bacula/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20604

Modified Files:
	bacula.spec 
Log Message:
 - Logrotate fix. BZ 457894.
 - Alternatives fix. BZ 458432.




Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bacula.spec	31 Jul 2008 12:18:40 -0000	1.8
+++ bacula.spec	10 Sep 2008 15:39:05 -0000	1.9
@@ -9,7 +9,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.2.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -620,16 +620,19 @@
 
 
 %preun director-mysql
-/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.mysql
-
+if [ "$1" = 0 ]; then
+	/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.mysql
+fi
 
 %preun director-sqlite
-/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.sqlite
-
+if [ "$1" = 0 ]; then
+	/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.sqlite
+fi
 
 %preun director-postgresql
-/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.postgresql
-
+if [ "$1" = 0 ]; then
+	/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.postgresql
+fi
 
 %pre common
 /usr/sbin/fedora-groupadd 33 -r bacula &>/dev/null || :
@@ -658,16 +661,19 @@
 
 
 %preun storage-mysql
-/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.mysql
-
+if [ "$1" = 0 ]; then
+	/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.mysql
+fi
 
 %preun storage-sqlite
-/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.sqlite
-
+if [ "$1" = 0 ]; then
+	/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.sqlite
+fi
 
 %preun storage-postgresql
-/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.postgresql
-
+if [ "$1" = 0 ]; then
+	/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.postgresql
+fi
 
 %post client
 /sbin/chkconfig --add bacula-fd
@@ -922,6 +928,10 @@
 
 
 %changelog
+* Wed Sep 10 2008 Jon Ciesla <limb at jcomserv.net> - 2.2.8-3
+- Logrotate fix. BZ 457894.
+- Alternatives fix. BZ 458432.
+
 * Wed Jul 30 2008 Andreas Thienemann <athienem at redhat.com> - 2.2.8-2
 - Fixed %%{fedora} comparision, making bacula-sqlite build on rawhide
 



From s4504kr at fedoraproject.org  Wed Sep 10 15:41:41 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 10 Sep 2008 15:41:41 +0000 (UTC)
Subject: rpms/snobol/devel import.log, NONE, 1.1 snobol-4.1.1-config.patch, 
	NONE, 1.1 snobol-4.1.1-doc.patch, NONE, 1.1 snobol.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080910154141.B4C1C7012C@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/snobol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21093/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log snobol-4.1.1-config.patch snobol-4.1.1-doc.patch 
	snobol.spec 
Log Message:

Initional import



--- NEW FILE import.log ---
snobol-4_1_1-6_fc9:HEAD:snobol-4.1.1-6.fc9.src.rpm:1221061211

snobol-4.1.1-config.patch:

--- NEW FILE snobol-4.1.1-config.patch ---
diff -up snobol4-1.1/configure.bak snobol4-1.1/configure
--- snobol4-1.1/configure.bak	2005-12-07 06:19:20.000000000 +0100
+++ snobol4-1.1/configure	2008-08-21 18:53:48.000000000 +0200
@@ -112,6 +112,9 @@ while [ $# -gt 0 ]; do
 	STUFF=`echo "$1" | sed 's/--bindir=//'`
 	echo "BINDIR=$STUFF"			>> $CONFIG_M4
     	;;
+    --libdir=*)
+        LIBDIR=`echo "$1" | sed 's/--libdir=//'`
+	;;
     --debug)
 	DEBUG=true
 	set -x
@@ -235,9 +238,10 @@ if [ "x$MANDIR" = x ]; then
 fi
 MAN1DIR="$MANDIR/man1"
 MAN3DIR="$MANDIR/man3"
-SNOLIB_DIR="$PREFIX/lib/snobol4"
+SNOLIB_DIR="$PREFIX/share/snobol4"
 
 echo 'BINDIR=$(DESTDIR)'"$BINDIR"		>> $CONFIG_M4
+echo 'LIBDIR=$(DESTDIR)'"$LIBDIR"               >> $CONFIG_M4
 echo 'MANDIR=$(DESTDIR)'"$MANDIR"		>> $CONFIG_M4
 echo 'MAN1DIR=$(DESTDIR)'"$MAN1DIR"		>> $CONFIG_M4
 echo 'MAN3DIR=$(DESTDIR)'"$MAN3DIR"		>> $CONFIG_M4
@@ -432,7 +436,7 @@ if [ "$GCCPATH" -a "$WANTGCC" ]; then
 
     # w/ gcc v3 -O3 turns on things OTHER than -finline-functions,
     # so make -O3 the default, and use -fno-inline-functions
-    OPT=-O3
+    # OPT=-O3
 
     if [ ! "$INLINE_OK" ]; then
 	echo 'ADD_OPT([-fno-inline-functions])'	>> $CONFIG_M4
@@ -1000,7 +1004,7 @@ if [ -f $INCDIR/sys/socket.h ]; then
     echo '#define SOCKLEN_T '$SOCKLEN_T		>> $CONFIG_H
 
     # add network libraries if needed
-    if [ -f /usr/lib/libsocket.a -o -f /usr/lib/libsocket.so ]; then
+    if [ -f $LIBDIR/libsocket.a -o -f $LIBDIR/libsocket.so ]; then
 	# SCO, SunOS5
 	echo 'using libsocket' 1>&2
 	echo 'ADD_LDFLAGS([-lsocket])'		>> $CONFIG_M4
diff -up snobol4-1.1/Makefile2.m4.bak snobol4-1.1/Makefile2.m4
--- snobol4-1.1/Makefile2.m4.bak	2005-12-07 03:10:59.000000000 +0100
+++ snobol4-1.1/Makefile2.m4	2008-08-21 18:56:43.000000000 +0200
@@ -33,6 +33,10 @@ define([_WARN],[undivert(6)])dnl
 
 OPT=-O
 
+VERSION=4.1.1
+
+TOPDIR=$(PWD)
+
 CCM=./cc-M
 
 # for pow(3)
@@ -42,13 +46,13 @@ SH=sh
 SHELL=/bin/sh
 
 # library random accessifier
-RANLIB=ranlib
+RANLIB=gcc --shared
 
 # filename for external function library
-SNOLIB_A=snolib.a
+SNOLIB_A=libsnobol.so
 
 # default file to load
-SNOLIB_FILE=snolib.a
+SNOLIB_FILE=libsnobol.so
 
 # either snobol4 or isnobol4;
 # isnobol4 has had functions reordered for better inlining.
@@ -182,7 +186,7 @@ LDFLAGS=[]_LDFLAGS
 ################
 # compiler flags
 
-CFLAGS=$(COPT) $(MYCPPFLAGS) $(WARN)
+CFLAGS=$(COPT) $(MYCPPFLAGS) $(WARN) -fPIC
 
 ################
 
@@ -230,9 +234,9 @@ changequote([,])dnl
 
 snobol4: xsnobol4 snobol4.c test/tests.in
 	@echo Running regression tests...
-	(cd test; ./run.sh ../xsnobol4)
+	(export LD_LIBRARY_PATH=$(TOPDIR); cd test; ./run.sh ../xsnobol4)
 	@echo Passed regression tests.
-	./timing > timing.out
+	(export LD_LIBRARY_PATH=$(TOPDIR); ./timing > timing.out)
 	-rm -f snobol4$(EXT)
 	ln xsnobol4$(EXT) snobol4$(EXT)
 	@touch snobol4$(EXT)
@@ -419,10 +423,16 @@ SNOLIB_OBJS=chop.o cos.o delete.o enviro
 	ord.o log.o logic.o rename.o retstring.o serv.o sin.o \
 	sprintf.o sqrt.o sset.o sys.o tan.o $(AUX_OBJS)
 
-$(SNOLIB_A): $(SNOLIB_OBJS)
-	rm -f $(SNOLIB_A)
-	ar $(ARXFLAGS) rv $(SNOLIB_A) $(SNOLIB_OBJS)
-	$(RANLIB) $(SNOLIB_A)
+libsnobol.so.$(VERSION): $(SNOLIB_OBJS)
+	rm -f libsnobol.so.$(VERSION)
+	$(CC) $(LDFLAGS) --shared -Wl,--export-dynamic -Wl,-soname -Wl,libsnobol.so.4 \
+	 -o libsnobol.so.$(VERSION) $(SNOLIB_OBJS) 
+
+libsnobol.so: libsnobol.so.$(VERSION)
+	 rm -rf libsnobol.so 
+	 rm -rf libsnobol.so.4 
+	 ln -sf libsnobol.so.$(VERSION) libsnobol.so.4
+	 ln -sf libsnobol.so.4 libsnobol.so
 
 ################
 # snolib files
@@ -537,7 +547,7 @@ INSTALL_H=[include]/h.h [include]/snotyp
 # generated SNOLIB files (host.sno generated at top level)
 GENSNOLIB=host.sno
 
-SNOLIB_FILES=snolib/*.sno $(INSTALL_H) doc/load.txt README $(GENSNOLIB) 
+SNOLIB_FILES=snolib/*.sno $(GENSNOLIB) 
 
 VERS=`./pv`
 install: snobol4 pv
@@ -551,10 +561,19 @@ install: snobol4 pv
 	$(INSTALL) -m 644 doc/snolib.3 $(MAN3DIR)
 	$(INSTALL) -m 644 doc/snobol4dbm.3 $(MAN3DIR)
 	$(INSTALL) -m 644 doc/snobol4tcl.3 $(MAN3DIR)
+	$(INSTALL) -d $(DESTDIR)/usr/include/snobol4/
+	for F in $(INSTALL_H); do \
+	        $(INSTALL) -m 644 $$F $(DESTDIR)/usr/include/snobol4/; \
+        done
 	$(INSTALL) -d $(SNOLIB_DIR)
 	for F in $(SNOLIB_FILES); do \
 		$(INSTALL) -m 644 $$F $(SNOLIB_DIR); \
 	done
+	$(INSTALL) -d $(LIBDIR)
+	$(INSTALL) -m 755 libsnobol.so.$(VERSION) $(LIBDIR)
+	( cd $(LIBDIR); rm -rf libsnobol.so.4; ln -sf libsnobol.so.$(VERSION) libsnobol.so.4 )
+	( cd $(LIBDIR); rm -rf libsnobol.so;   ln -sf libsnobol.so.$(VERSION) libsnobol.so )
+
 	@echo '*********************************************************' 1>&2
 	@echo 'Have you mailed a copy of timing.out to timing at snobol4.org ?' 1>&2
 	@echo '*********************************************************' 1>&2

snobol-4.1.1-doc.patch:

--- NEW FILE snobol-4.1.1-doc.patch ---
diff -up snobol4-1.1/doc/load.txt.docbak snobol4-1.1/doc/load.txt
--- snobol4-1.1/doc/load.txt.docbak	2003-04-15 23:17:01.000000000 +0200
+++ snobol4-1.1/doc/load.txt	2008-08-18 17:40:19.000000000 +0200
@@ -53,12 +53,12 @@ The following snolib functions are avail
 An external C function should be declared as follows (see lib/snolib
 for many examples);
 
-    #include "config.h"
-    #include "h.h"
-    #include "snotypes.h"
-    #include "macros.h"
-    #include "load.h"
-    #include "equ.h"
+    #include <snobol4/config.h>
+    #include <snobol4/h.h>
+    #include <snobol4/snotypes.h>
+    #include <snobol4/macros.h>
+    #include <snobol4/load.h>
+    #include <snobol4/equ.h>
 
     int
     NAME( LA_ALIST ) LA_DCL
@@ -73,7 +73,7 @@ The typedefs int_t and real_t should be 
 and real values.
 
 The SNOBOL4 functions in "wrapper.sno" installed in
-/usr/local/lib/snobol4 will generate C glue code given a
+/usr/share/snobol4 will generate C glue code given a
 LOAD() style prototype.
 
 2.1 Return value
@@ -271,15 +271,15 @@ void function _fini(void) before the lib
 
 Examples;
     using gcc;
-	gcc -c -fPIC -DHAVE_CONFIG_H -I/usr/local/lib/snobol4 source.c
+	gcc -c -fPIC -DHAVE_CONFIG_H source.c
 	gcc -shared -o module.so source.o
 
     on SunOS 4;
-	cc -c -pic -DHAVE_CONFIG_H -I/usr/local/lib/snobol4 source.c
+	cc -c -pic -DHAVE_CONFIG_H source.c
 	ld -o module.so source.o
 
     on SunOS 5 (Solaris2+);
-	cc -c -Kpic -DHAVE_CONFIG_H -I/usr/local/lib/snobol4 source.c
+	cc -c -Kpic -DHAVE_CONFIG_H source.c
 	ld -G -o module.so source.o
 
     On Darwin (MacOS X);
@@ -287,11 +287,11 @@ Examples;
 	(see http://fink.sourceforge.net/doc/porting/shared.php
 	 and http://fink.sourceforge.net/doc/porting/porting.html)
 
-	cc -c -fno-common -DHAVE_CONFIG_H -I/usr/local/lib/snobol4 source.c
+	cc -c -fno-common -DHAVE_CONFIG_H -I/usr/lib/snobol4 source.c
 	cc -bundle -flat_namespace -undefined suppress -o module.so source.o
 
     On Win32, using Cygwin and MINGW;
-	gcc -c -DHAVE_CONFIG_H -I/usr/local/lib/snobol4 source.c
+	gcc -c -DHAVE_CONFIG_H -I/usr/lib/snobol4 source.c
 	dllwrap -v --export-all-symbols --dllname MODULE -o module.dll source.o
 
     On DOS, using DJGPP and DXE2;


--- NEW FILE snobol.spec ---
%define snobrel 1.1

Name:           snobol
Version:        4.%{snobrel}
Release:        6%{?dist}
Summary:        Macro Implementation of SNOBOL4 in C

Group:          Development/Languages
License:        BSD
URL:            http://www.snobol4.org
Source0:        ftp://ftp.ultimate.com/%{name}/%{name}4-%{snobrel}.tar.gz
Patch1:		snobol-4.1.1-config.patch
Patch2:		snobol-4.1.1-doc.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  tcl-devel
BuildRequires:  gdbm-devel
BuildRequires:	m4
Requires(post):	/sbin/ldconfig
Requires(postun):	/sbin/ldconfig

%description
SNOBOL4, while known primarily as a string language excels at any task
involving symbolic manipulations.  It provides run time typing,
garbage collection, user data types, on the fly compilation.  It's
primary weakness is it's simple syntax, and lack of "structured
programming" and "object oriented" constructs.

%package devel
Summary:	Header for external SNOBOL modules
Group:	 	Development/Languages
Requires:	snobol = %{version}

%description devel
This package contains header file which are requires to create
external SNOBOL modules in C

%prep
%setup -q -n %{name}4-%{snobrel}
%patch1 -p1 -b .bak
%patch2 -p1 -b .docbak

%build
export CFLAGS="$RPM_OPT_FLAGS"
./configure  --prefix=%{_prefix} --mandir=%{_mandir} --with-tcl --with-tk \
	     --libdir=%{_libdir} --add-cppflags="${RPM_OPT_FLAGS}"
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 COPYRIGHT README CHANGES doc/load.txt
%{_bindir}/snobol*
%{_datadir}/snobol4/
%{_mandir}/man*/*
%{_libdir}/libsnobol.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/snobol4/
%{_libdir}/libsnobol.so

%changelog
* Thu Aug 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-6
- Try to minimize undef. non-weak symbols

* Wed Aug 20 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-5
- Fix broken Req. in devel package

* Wed Aug 20 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-4
- Fix symlink issue

* Mon Aug 18 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-3
- Fix issue of setting soname

* Sun Aug 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-2
- Remove -O3 flag from configure file
- Splitting of a devel sub package

* Sun Jul 27 2008 Gerard Milmeister <gemi at bluewin.ch> 4.1.1-1
- first Fedora release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/snobol/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 02:19:00 -0000	1.1
+++ .cvsignore	10 Sep 2008 15:41:11 -0000	1.2
@@ -0,0 +1 @@
+snobol4-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snobol/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 02:19:00 -0000	1.1
+++ sources	10 Sep 2008 15:41:11 -0000	1.2
@@ -0,0 +1 @@
+101df7f3c74abb5703a01a85e58b4e9d  snobol4-1.1.tar.gz



From wolfy at fedoraproject.org  Wed Sep 10 15:42:56 2008
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 10 Sep 2008 15:42:56 +0000 (UTC)
Subject: rpms/rpmlint/EL-4 rpmlint.spec,1.21,1.22
Message-ID: <20080910154256.D331A7012C@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/rpmlint/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21301

Modified Files:
	rpmlint.spec 
Log Message:
fix changelog



Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-4/rpmlint.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rpmlint.spec	27 Jul 2008 14:38:05 -0000	1.21
+++ rpmlint.spec	10 Sep 2008 15:42:26 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.84
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Wed Sep 10 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.84-2.1
+- rebuild with proper changelog
+
 * Sat Jul 26 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.84-2
 - 0.84, fixes #355861, #456304.
 - Sync Fedora license list with Wiki revision "16:08, 18 July 2008".



From wolfy at fedoraproject.org  Wed Sep 10 15:44:18 2008
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 10 Sep 2008 15:44:18 +0000 (UTC)
Subject: rpms/rpmlint/EL-5 rpmlint.spec,1.37,1.38
Message-ID: <20080910154418.5C55F7012C@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/rpmlint/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21452

Modified Files:
	rpmlint.spec 
Log Message:
* Wed Sep 10 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.84-2.1
- rebuild with proper changelog



Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/rpmlint.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- rpmlint.spec	8 Aug 2008 22:32:00 -0000	1.37
+++ rpmlint.spec	10 Sep 2008 15:43:48 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.84
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Wed Sep 10 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.84-2.1
+- rebuild with proper changelog
+
 * Sat Jul 26 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.84-2
 - 0.84, fixes #355861, #456304.
 - Sync Fedora license list with Wiki revision "16:08, 18 July 2008".



From acme at fedoraproject.org  Wed Sep 10 15:50:28 2008
From: acme at fedoraproject.org (Arnaldo Carvalho de Melo)
Date: Wed, 10 Sep 2008 15:50:28 +0000 (UTC)
Subject: rpms/python-schedutils/devel import.log, NONE,
	1.1 python-schedutils.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080910155028.CD2897012C@cvs1.fedora.phx.redhat.com>

Author: acme

Update of /cvs/pkgs/rpms/python-schedutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21027/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-schedutils.spec 
Log Message:
Adopting package

Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>



--- NEW FILE import.log ---
python-schedutils-0_2-2_fc10:HEAD:python-schedutils-0.2-2.fc10.src.rpm:1221058322


--- NEW FILE python-schedutils.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?python_ver: %define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")}

Summary: Linux scheduler python bindings
Name: python-schedutils
Version: 0.2
Release: 2%{?dist}
License: GPLv2
URL: http://git.kernel.org/?p=linux/kernel/git/acme/python-schedutils.git
Source: http://userweb.kernel.org/~acme/python-schedutils/%{name}-%{version}.tar.bz2
Group: System Environment/Libraries
BuildRequires: python-devel
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Python interface for the Linux scheduler sched_{get,set}{affinity,scheduler}
functions and friends.

%prep
%setup -q

%build
%{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}
mkdir -p %{buildroot}%{_bindir}
cp -p pchrt.py %{buildroot}%{_bindir}/pchrt
cp -p ptaskset.py %{buildroot}%{_bindir}/ptaskset

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc COPYING
%{_bindir}/pchrt
%{_bindir}/ptaskset
%{python_sitearch}/schedutils.so
%if "%{python_ver}" >= "2.5"
%{python_sitearch}/*.egg-info
%endif

%changelog
* Thu Aug 28 2008 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.2-2
- Fix build and install sections as suggested by the fedora rewiewer
  (BZ #460387)

* Wed Aug 27 2008 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.2-1
- Add get_priority_{min,max} methods
- Add constants for SCHED_{BATCH,FIFO,OTHER,RR}
- Implement get_priority method
- Add pchrt utility for testing the bindings, chrt clone
- Add ptaskset utility for testing the bindings, taskset clone

* Tue Jun 10 2008 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.1-3
- add dist to the release tag

* Tue Dec 19 2007 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.1-2
- First build into rhel5-rt

* Tue Dec 19 2007 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-schedutils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 02:05:15 -0000	1.1
+++ .cvsignore	10 Sep 2008 15:49:58 -0000	1.2
@@ -0,0 +1 @@
+python-schedutils-0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-schedutils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 02:05:15 -0000	1.1
+++ sources	10 Sep 2008 15:49:58 -0000	1.2
@@ -0,0 +1 @@
+32623c3bafa8322d6d697dc1248aed1c  python-schedutils-0.2.tar.bz2



From s4504kr at fedoraproject.org  Wed Sep 10 15:50:39 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 10 Sep 2008 15:50:39 +0000 (UTC)
Subject: rpms/aplus-fsf/devel aplus-fsf-4.22.3-makefile.patch, NONE,
	1.1 aplus-fsf.spec, 1.25, 1.26
Message-ID: <20080910155039.E3F9A7012C@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22028

Modified Files:
	aplus-fsf.spec 
Added Files:
	aplus-fsf-4.22.3-makefile.patch 
Log Message:
Add forgotten patch onto cvs

aplus-fsf-4.22.3-makefile.patch:

--- NEW FILE aplus-fsf-4.22.3-makefile.patch ---
diff -up aplus-fsf-4.22/configure.in.org aplus-fsf-4.22/configure.in
--- aplus-fsf-4.22/configure.in.org	2008-04-08 21:24:30.000000000 +0200
+++ aplus-fsf-4.22/configure.in	2008-08-06 21:44:40.000000000 +0200
@@ -14,9 +14,13 @@ dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
 
-AM_PROG_LIBTOOL 
+AC_PROG_LIBTOOL 
 AC_SUBST(LIBTOOL_DEPS)
 
+APLVERSION=4.20.2
+
+AC_SUBST(APLVERSION)
+
 AC_PROG_INSTALL
 
 dnl Checks for libraries.
@@ -43,6 +47,15 @@ dnl        AC_CHECK_LIB(nsl, socket, LIB
 dnl    ], "$LIBS") 
 dnl ]) 
 
+
+dnl Check X11-Prefix
+if test -d /usr/X11R6; then
+  X_PREFIX=/usr/X11R6
+else
+  X_PREFIX=/usr
+fi
+AC_SUBST(X_PREFIX)
+
 dnl Checks for X headers and libs.
 AC_PATH_X([X11], [X11/Xlib.h], [XOpenDisplay(NULL)])
 if test "x$no_x" = "x"; then
diff -up aplus-fsf-4.22/src/acore/Makefile.am.org aplus-fsf-4.22/src/acore/Makefile.am
--- aplus-fsf-4.22/src/acore/Makefile.am.org	2008-04-08 21:29:45.000000000 +0200
+++ aplus-fsf-4.22/src/acore/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -8,7 +8,7 @@
 ##                                                                           ##
 ###############################################################################
 
-acoredir = $(prefix)/acore
+acoredir = $(prefix)/lib/a+
 
 acore_DATA = \
 	adap.+ \
diff -up aplus-fsf-4.22/src/a/Makefile.am.org aplus-fsf-4.22/src/a/Makefile.am
--- aplus-fsf-4.22/src/a/Makefile.am.org	2008-04-08 21:27:15.000000000 +0200
+++ aplus-fsf-4.22/src/a/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -50,7 +50,7 @@ liba_la_SOURCES = \
 	x.h
 
 
-CFLAGS = @CFLAGS@ -DBSTUB
+AM_CFLAGS = @CFLAGS@ -DBSTUB
 
 INCLUDES = -I..
 
diff -up aplus-fsf-4.22/src/AplusGUI/Makefile.am.org aplus-fsf-4.22/src/AplusGUI/Makefile.am
--- aplus-fsf-4.22/src/AplusGUI/Makefile.am.org	2001-01-30 21:48:35.000000000 +0100
+++ aplus-fsf-4.22/src/AplusGUI/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -125,5 +125,7 @@ libAplusGUI_la_SOURCES= \
 	EnumTables.H\
 	Macros.H
 
+libAplusGUI_la_LIBADD = -L../MSGUI -L../MSTypes -L../MSIPC -L../esf -lMSGUI -lMSTypes -lMSIPC -lesf -lstdc++
+
 INCLUDES = -I.. -I/usr/X11R6/include
 
diff -up aplus-fsf-4.22/src/app-defaults/Makefile.am.org aplus-fsf-4.22/src/app-defaults/Makefile.am
--- aplus-fsf-4.22/src/app-defaults/Makefile.am.org	2001-01-22 21:35:46.000000000 +0100
+++ aplus-fsf-4.22/src/app-defaults/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -8,7 +8,7 @@
 ##                                                                           ##
 ###############################################################################
 
-appdefaultsdir = $(prefix)/app-defaults
+appdefaultsdir = @datadir@/X11/app-defaults
 
 appdefaults_DATA = XTerm
 
diff -up aplus-fsf-4.22/src/autils/Makefile.am.org aplus-fsf-4.22/src/autils/Makefile.am
--- aplus-fsf-4.22/src/autils/Makefile.am.org	2008-04-08 22:07:32.000000000 +0200
+++ aplus-fsf-4.22/src/autils/Makefile.am	2008-08-06 21:52:12.000000000 +0200
@@ -8,7 +8,7 @@
 ##                                                                           ##
 ###############################################################################
 
-autilsdir = $(prefix)/autils
+autilsdir = ${datadir}/aplus-fsf
 
 autils_DATA = \
 	README \
diff -up aplus-fsf-4.22/src/cxb/Makefile.am.org aplus-fsf-4.22/src/cxb/Makefile.am
--- aplus-fsf-4.22/src/cxb/Makefile.am.org	2001-01-19 22:28:09.000000000 +0100
+++ aplus-fsf-4.22/src/cxb/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -13,5 +13,7 @@ lib_LTLIBRARIES = libcxb.la
 libcxb_la_SOURCES = \
 	binary.c
 
+libcxb_la_LIBADD = -L../a -L../dap -la -ldap
+
 INCLUDES = -I..
 
diff -up aplus-fsf-4.22/src/cxc/Makefile.am.org aplus-fsf-4.22/src/cxc/Makefile.am
--- aplus-fsf-4.22/src/cxc/Makefile.am.org	2001-01-19 22:28:18.000000000 +0100
+++ aplus-fsf-4.22/src/cxc/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -15,5 +15,7 @@ libcxc_la_SOURCES = \
 	cform.c \
 	cxc.h
 
+libcxc_la_LIBADD = -L../a -la
+
 INCLUDES = -I..
 
diff -up aplus-fsf-4.22/src/cxs/Makefile.am.org aplus-fsf-4.22/src/cxs/Makefile.am
--- aplus-fsf-4.22/src/cxs/Makefile.am.org	2008-04-08 21:26:32.000000000 +0200
+++ aplus-fsf-4.22/src/cxs/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -12,6 +12,8 @@ lib_LTLIBRARIES = libcxs.la
 
 libcxs_la_SOURCES = S.c
 
+libcxs_la_LIBADD = -L../a -L../dap -la -ldap
+
 INCLUDES = -I..
 
 sdir = $(libdir)
diff -up aplus-fsf-4.22/src/cxsys/Makefile.am.org aplus-fsf-4.22/src/cxsys/Makefile.am
--- aplus-fsf-4.22/src/cxsys/Makefile.am.org	2001-01-19 22:28:29.000000000 +0100
+++ aplus-fsf-4.22/src/cxsys/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -20,5 +20,7 @@ libcxsys_la_SOURCES = \
 	impexp.c \
 	impexp.h
 
+libcxsys_la_LIBADD = -L../a -L../dap -L../cxc -la -ldap -lcxc
+
 INCLUDES = -I..
 
diff -up aplus-fsf-4.22/src/esf/Makefile.am.org aplus-fsf-4.22/src/esf/Makefile.am
--- aplus-fsf-4.22/src/esf/Makefile.am.org	2001-01-19 22:28:59.000000000 +0100
+++ aplus-fsf-4.22/src/esf/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -24,5 +24,7 @@ libesf_la_SOURCES = \
 	kcheck.c \
 	dyld2.c
 
+libesf_la_LIBADD = -L../a -L../dap -la -ldap
+
 INCLUDES = -I..
 
diff -up aplus-fsf-4.22/src/fonts/TrueType/Makefile.am.org aplus-fsf-4.22/src/fonts/TrueType/Makefile.am
--- aplus-fsf-4.22/src/fonts/TrueType/Makefile.am.org	2001-01-19 22:10:06.000000000 +0100
+++ aplus-fsf-4.22/src/fonts/TrueType/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -8,7 +8,7 @@
 ##                                                                           ##
 ###############################################################################
 
-TrueTypedir =  $(prefix)/fonts/TrueType
+TrueTypedir =  @datadir@/fonts/apl/TrueType
 
 TrueType_DATA = KAPL.TTF
 
diff -up aplus-fsf-4.22/src/fonts/X11/Makefile.am.org aplus-fsf-4.22/src/fonts/X11/Makefile.am
--- aplus-fsf-4.22/src/fonts/X11/Makefile.am.org	2001-01-19 22:10:32.000000000 +0100
+++ aplus-fsf-4.22/src/fonts/X11/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -8,4 +8,4 @@
 ##                                                                           ##
 ###############################################################################
 
-SUBDIRS = pcf bdf
+SUBDIRS = pcf
diff -up aplus-fsf-4.22/src/fonts/X11/pcf/Makefile.am.org aplus-fsf-4.22/src/fonts/X11/pcf/Makefile.am
--- aplus-fsf-4.22/src/fonts/X11/pcf/Makefile.am.org	2001-01-19 22:11:24.000000000 +0100
+++ aplus-fsf-4.22/src/fonts/X11/pcf/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -8,7 +8,7 @@
 ##                                                                           ##
 ###############################################################################
 
-fonts_pcfdir = $(prefix)/fonts/X11/pcf
+fonts_pcfdir = @datadir@/fonts/apl/pcf
 
 fonts_pcf_DATA = \
 	Kapl.alias \
diff -up aplus-fsf-4.22/src/html/Makefile.am.org aplus-fsf-4.22/src/html/Makefile.am
--- aplus-fsf-4.22/src/html/Makefile.am.org	2001-10-06 23:49:48.000000000 +0200
+++ aplus-fsf-4.22/src/html/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -10,7 +10,7 @@
 
 SUBDIRS = tutorials
 
-htmldir = $(prefix)/doc/html
+htmldir = @docdir@/html
 
 html_DATA = \
 	A-head3.gif \
@@ -754,5 +754,5 @@ EXTRA_DIST = \
 	 window.gif
 
 install-exec-hook:
-	rm -f $(DESTDIR)$(prefix)/doc/html/index.html
-	ln -s refman.html $(DESTDIR)$(prefix)/doc/html/index.html
+	rm -f $(DESTDIR)$/@docdir@/html/index.html
+	ln -s refman.html $(DESTDIR)/@docdir@/html/index.html
diff -up aplus-fsf-4.22/src/html/tutorials/graphs/Makefile.am.org aplus-fsf-4.22/src/html/tutorials/graphs/Makefile.am
--- aplus-fsf-4.22/src/html/tutorials/graphs/Makefile.am.org	2001-01-19 18:57:30.000000000 +0100
+++ aplus-fsf-4.22/src/html/tutorials/graphs/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -8,7 +8,7 @@
 ##                                                                           ##
 ###############################################################################
 
-graphsdir = $(prefix)/doc/html/tutorials/graphs
+graphsdir = @docdir@/html/tutorials/graphs
 
 graphs_DATA = \
 	graph_tutorial.html
diff -up aplus-fsf-4.22/src/html/tutorials/Makefile.am.org aplus-fsf-4.22/src/html/tutorials/Makefile.am
--- aplus-fsf-4.22/src/html/tutorials/Makefile.am.org	2001-01-19 18:58:36.000000000 +0100
+++ aplus-fsf-4.22/src/html/tutorials/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -10,7 +10,7 @@
 
 SUBDIRS = graphs s.tutorials
 
-tutorialsdir = $(prefix)/doc/html/tutorials
+tutorialsdir = @docdir@/html/tutorials
 
 tutorials_DATA = \
 	Assignment.html \
diff -up aplus-fsf-4.22/src/html/tutorials/s.tutorials/Makefile.am.org aplus-fsf-4.22/src/html/tutorials/s.tutorials/Makefile.am
--- aplus-fsf-4.22/src/html/tutorials/s.tutorials/Makefile.am.org	2001-01-19 18:56:56.000000000 +0100
+++ aplus-fsf-4.22/src/html/tutorials/s.tutorials/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -8,7 +8,7 @@
 ##                                                                           ##
 ###############################################################################
 
-s_tutorialsdir = $(prefix)/doc/html/tutorials/s.tutorials
+s_tutorialsdir = @docdir@/html/tutorials/s.tutorials
 
 s_tutorials_DATA = \
 	buttons.html \
diff -up aplus-fsf-4.22/src/html/tutorials/t.tutorial/Makefile.am.org aplus-fsf-4.22/src/html/tutorials/t.tutorial/Makefile.am
--- aplus-fsf-4.22/src/html/tutorials/t.tutorial/Makefile.am.org	2002-01-24 21:33:42.000000000 +0100
+++ aplus-fsf-4.22/src/html/tutorials/t.tutorial/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -10,7 +10,7 @@
 
 SUBDIRS = files
 
-t_tutorialsdir = $(prefix)/doc/html/tutorials/t.tutorial
+t_tutorialsdir = @docdir@/html/tutorials/t.tutorial
 
 t_tutorials_DATA = \
 	README \
diff -up aplus-fsf-4.22/src/IPC/Makefile.am.org aplus-fsf-4.22/src/IPC/Makefile.am
--- aplus-fsf-4.22/src/IPC/Makefile.am.org	2008-04-08 21:25:50.000000000 +0200
+++ aplus-fsf-4.22/src/IPC/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -52,6 +52,8 @@ libIPC_la_SOURCES = \
 	pString_Connection.H\
 	pString_Listener.H
 
+libIPC_la_LIBADD = -L../MSTypes -L../MSIPC -L../a -lMSTypes -L../cxsys -L../dap -lMSIPC -la -lstdc++ -lcxsys -ldap
+
 INCLUDES = -I..
 
 idapdir = $(libdir)
diff -up aplus-fsf-4.22/src/lisp.0/Makefile.in.org aplus-fsf-4.22/src/lisp.0/Makefile.in
--- aplus-fsf-4.22/src/lisp.0/Makefile.in.org	2008-04-08 22:15:29.000000000 +0200
+++ aplus-fsf-4.22/src/lisp.0/Makefile.in	2008-08-06 21:44:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -16,84 +16,159 @@
 
 ###############################################################################
 ###############################################################################
-SHELL = @SHELL@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/lisp.0
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(lisp0dir)"
+lisp0DATA_INSTALL = $(INSTALL_DATA)
+DATA = $(lisp0_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AS = @AS@
+APLVERSION = @APLVERSION@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
 ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-OBJDUMP = @OBJDUMP@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+XMKMF = @XMKMF@
 X_INCLUDES = @X_INCLUDES@
 X_LIBS = @X_LIBS@
+X_PREFIX = @X_PREFIX@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
-
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 lisp0dir = $(prefix)/lisp.0
-
 lisp0_DATA = \
 	.emacs \
 	a.el \
@@ -101,7 +176,6 @@ lisp0_DATA = \
 	keyb.el \
 	xa.el
 
-
 EXTRA_DIST = \
 	.emacs \
 	a.el \
@@ -109,68 +183,84 @@ EXTRA_DIST = \
 	keyb.el \
 	xa.el
 
-subdir = src/lisp.0
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(lisp0_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lisp.0/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/lisp.0/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+	  $(AUTOMAKE) --gnu  src/lisp.0/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-lisp0DATA_INSTALL = $(INSTALL_DATA)
 install-lisp0DATA: $(lisp0_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(lisp0dir)
+	test -z "$(lisp0dir)" || $(MKDIR_P) "$(DESTDIR)$(lisp0dir)"
 	@list='$(lisp0_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(lisp0DATA_INSTALL) $$d$$p $(DESTDIR)$(lisp0dir)/$$f"; \
-	  $(lisp0DATA_INSTALL) $$d$$p $(DESTDIR)$(lisp0dir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(lisp0DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(lisp0dir)/$$f'"; \
+	  $(lisp0DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(lisp0dir)/$$f"; \
 	done
 
 uninstall-lisp0DATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lisp0_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(lisp0dir)/$$f"; \
-	  rm -f $(DESTDIR)$(lisp0dir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(lisp0dir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(lisp0dir)/$$f"; \
 	done
 tags: TAGS
 TAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
 
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -184,10 +274,10 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(lisp0dir)
-
+	for dir in "$(DESTDIR)$(lisp0dir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -199,7 +289,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -207,7 +297,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -217,46 +307,68 @@ clean: clean-am
 clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-lisp0DATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
-uninstall-am: uninstall-info-am uninstall-lisp0DATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-lisp0DATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-lisp0DATA install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool uninstall uninstall-am uninstall-info-am \
-	uninstall-lisp0DATA
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-lisp0DATA install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-lisp0DATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -up aplus-fsf-4.22/src/lisp.1/Makefile.am.org aplus-fsf-4.22/src/lisp.1/Makefile.am
--- aplus-fsf-4.22/src/lisp.1/Makefile.am.org	2001-03-09 23:38:09.000000000 +0100
+++ aplus-fsf-4.22/src/lisp.1/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -8,10 +8,9 @@
 ##                                                                           ##
 ###############################################################################
 
-lisp1dir = $(prefix)/lisp.1
+lisp1dir = $(datadir)/xemacs/site-packages/lisp/aplus-fsf
 
 lisp1_DATA = \
-	.emacs \
 	a.el \
 	a-font.el \
 	aplus.el \
@@ -19,7 +18,6 @@ lisp1_DATA = \
 	xa.el
 
 EXTRA_DIST = \
-	.emacs \
 	a.el \
 	a-font.el \
 	aplus.el \
diff -up aplus-fsf-4.22/src/main/aplus_main.c.org aplus-fsf-4.22/src/main/aplus_main.c
--- aplus-fsf-4.22/src/main/aplus_main.c.org	2008-04-08 21:16:29.000000000 +0200
+++ aplus-fsf-4.22/src/main/aplus_main.c	2008-08-06 21:44:40.000000000 +0200
@@ -64,7 +64,7 @@ static C *_releaseCode = RELEASE_CODE;
 static C *_whoseTree = "";
 static C *_banner = BANNER;
 static C *_copyright = COPYRIGHT;
-static C *_defaultATREE = (char *)0;
+static C *_defaultATREE = (char *)"/usr/lib/a+";
 static C *_version = (char *)0;
 static C *usage = "usage: a+ [-d display] [-s] [-w workarea] [-q] [-h megsforheap] [-m atmpMode] [script [args]]\n";
 static I _enable_coredump;
diff -up aplus-fsf-4.22/src/main/Makefile.am.org aplus-fsf-4.22/src/main/Makefile.am
--- aplus-fsf-4.22/src/main/Makefile.am.org	2005-08-29 03:32:27.000000000 +0200
+++ aplus-fsf-4.22/src/main/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -21,7 +21,7 @@ aplus_SOURCES = \
 	matherr.c \
 	version.h
 
-CFLAGS = @CFLAGS@ -DBSTUB
+AM_CFLAGS = @CFLAGS@ -DBSTUB
 
 INCLUDES = -I.. $(X_INCLUDES)
 
diff -up aplus-fsf-4.22/src/Makefile.am.org aplus-fsf-4.22/src/Makefile.am
--- aplus-fsf-4.22/src/Makefile.am.org	2008-04-08 20:58:18.000000000 +0200
+++ aplus-fsf-4.22/src/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -9,18 +9,18 @@
 ###############################################################################
 
 SUBDIRS = \
-	IPC \
+	a \
+	cxc \
+	MSTypes \
+	dap \
+	cxsys \
 	cxs \
 	cxb \
-	AplusGUI \
-	cxsys \
-	cxc \
 	esf \
-	a \
-	dap \
-	MSGUI \
 	MSIPC \
-	MSTypes \
+	IPC \
+	MSGUI \
+	AplusGUI \
 	main \
 	html \
 	contrib \
diff -up aplus-fsf-4.22/src/MSGUI/Makefile.am.org aplus-fsf-4.22/src/MSGUI/Makefile.am
--- aplus-fsf-4.22/src/MSGUI/Makefile.am.org	2001-01-30 21:49:25.000000000 +0100
+++ aplus-fsf-4.22/src/MSGUI/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -382,6 +382,8 @@ libMSGUI_la_SOURCES = \
 	MSWidgetView.H\
 	MSWindow.H
 
+libMSGUI_la_LIBADD = -L../MSTypes -L../MSIPC -L../dap -lMSTypes -lMSIPC -ldap -lX11 -lstdc++
+
 EXTRA_DIST = \
 	MSArrayViewInlines.C\
 	MSCompositeTextInlines.C\
diff -up aplus-fsf-4.22/src/MSIPC/Makefile.am.org aplus-fsf-4.22/src/MSIPC/Makefile.am
--- aplus-fsf-4.22/src/MSIPC/Makefile.am.org	2001-01-19 21:44:13.000000000 +0100
+++ aplus-fsf-4.22/src/MSIPC/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -52,6 +52,8 @@ libMSIPC_la_SOURCES = \
 	MSTimer.H\
 	MSTv.H
 
+libMSIPC_la_LIBADD = -L../MSTypes -lMSTypes
+
 EXTRA_DIST = MSProtocolConnection.C
 
 INCLUDES = -I..
diff -up aplus-fsf-4.22/src/MSTypes/Makefile.am.org aplus-fsf-4.22/src/MSTypes/Makefile.am
--- aplus-fsf-4.22/src/MSTypes/Makefile.am.org	2001-01-19 21:46:18.000000000 +0100
+++ aplus-fsf-4.22/src/MSTypes/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -298,8 +298,7 @@ EXTRA_DIST = \
 	MSTypeMatrix.C\
 	MSTypeVector.C
 
-	
-
+libMSTypes_la_LIBADD = -L../a -la -lstdc++
 
 INCLUDES = -I..
 
diff -up aplus-fsf-4.22/src/tutorials/graphs/Makefile.am.org aplus-fsf-4.22/src/tutorials/graphs/Makefile.am
--- aplus-fsf-4.22/src/tutorials/graphs/Makefile.am.org	2001-01-23 15:12:00.000000000 +0100
+++ aplus-fsf-4.22/src/tutorials/graphs/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -8,7 +8,7 @@
 ##                                                                           ##
 ###############################################################################
 
-graphsdir = $(prefix)/doc/tutorials/graphs
+graphsdir = @docdir@/tutorials/graphs
 
 graphs_DATA = \
 	graph_data.m \
diff -up aplus-fsf-4.22/src/tutorials/Makefile.am.org aplus-fsf-4.22/src/tutorials/Makefile.am
--- aplus-fsf-4.22/src/tutorials/Makefile.am.org	2008-04-01 22:02:51.000000000 +0200
+++ aplus-fsf-4.22/src/tutorials/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -10,7 +10,7 @@
 
 SUBDIRS = graphs s.tutorials
 
-tutorialsdir = $(prefix)/doc/tutorials
+tutorialsdir = @docdir@/tutorials
 
 tutorials_DATA = \
 	Assignment \
diff -up aplus-fsf-4.22/src/tutorials/s.tutorials/Makefile.am.org aplus-fsf-4.22/src/tutorials/s.tutorials/Makefile.am
--- aplus-fsf-4.22/src/tutorials/s.tutorials/Makefile.am.org	2001-01-23 15:13:08.000000000 +0100
+++ aplus-fsf-4.22/src/tutorials/s.tutorials/Makefile.am	2008-08-06 21:44:40.000000000 +0200
@@ -8,7 +8,7 @@
 ##                                                                           ##
 ###############################################################################
 
-s_tutorialsdir = $(prefix)/doc/tutorials/s.tutorials
+s_tutorialsdir = @docdir@/tutorials/s.tutorials
 
 s_tutorials_DATA = \
 	aux_vars.+ \


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- aplus-fsf.spec	9 Sep 2008 14:52:16 -0000	1.25
+++ aplus-fsf.spec	10 Sep 2008 15:50:09 -0000	1.26
@@ -15,7 +15,7 @@
 
 Name: %name
 Version: 4.22.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 
 Summary: Advanced APL interpreter with s interface
@@ -241,6 +241,9 @@
 %{catalogue}/apl-truetype
 
 %Changelog
+* Wed Sep 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-3
+- Add forgotten file into cvs
+
 * Tue Sep  9 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-2
 - Try to fix BZ #456952
 



From s4504kr at fedoraproject.org  Wed Sep 10 15:52:37 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 10 Sep 2008 15:52:37 +0000 (UTC)
Subject: rpms/snobol/F-9 snobol-4.1.1-config.patch, NONE,
	1.1 snobol-4.1.1-doc.patch, NONE, 1.1 snobol.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20080910155237.9EDAE70130@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/snobol/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22332

Modified Files:
	sources 
Added Files:
	snobol-4.1.1-config.patch snobol-4.1.1-doc.patch snobol.spec 
Log Message:
Initional import

snobol-4.1.1-config.patch:

--- NEW FILE snobol-4.1.1-config.patch ---
diff -up snobol4-1.1/configure.bak snobol4-1.1/configure
--- snobol4-1.1/configure.bak	2005-12-07 06:19:20.000000000 +0100
+++ snobol4-1.1/configure	2008-08-21 18:53:48.000000000 +0200
@@ -112,6 +112,9 @@ while [ $# -gt 0 ]; do
 	STUFF=`echo "$1" | sed 's/--bindir=//'`
 	echo "BINDIR=$STUFF"			>> $CONFIG_M4
     	;;
+    --libdir=*)
+        LIBDIR=`echo "$1" | sed 's/--libdir=//'`
+	;;
     --debug)
 	DEBUG=true
 	set -x
@@ -235,9 +238,10 @@ if [ "x$MANDIR" = x ]; then
 fi
 MAN1DIR="$MANDIR/man1"
 MAN3DIR="$MANDIR/man3"
-SNOLIB_DIR="$PREFIX/lib/snobol4"
+SNOLIB_DIR="$PREFIX/share/snobol4"
 
 echo 'BINDIR=$(DESTDIR)'"$BINDIR"		>> $CONFIG_M4
+echo 'LIBDIR=$(DESTDIR)'"$LIBDIR"               >> $CONFIG_M4
 echo 'MANDIR=$(DESTDIR)'"$MANDIR"		>> $CONFIG_M4
 echo 'MAN1DIR=$(DESTDIR)'"$MAN1DIR"		>> $CONFIG_M4
 echo 'MAN3DIR=$(DESTDIR)'"$MAN3DIR"		>> $CONFIG_M4
@@ -432,7 +436,7 @@ if [ "$GCCPATH" -a "$WANTGCC" ]; then
 
     # w/ gcc v3 -O3 turns on things OTHER than -finline-functions,
     # so make -O3 the default, and use -fno-inline-functions
-    OPT=-O3
+    # OPT=-O3
 
     if [ ! "$INLINE_OK" ]; then
 	echo 'ADD_OPT([-fno-inline-functions])'	>> $CONFIG_M4
@@ -1000,7 +1004,7 @@ if [ -f $INCDIR/sys/socket.h ]; then
     echo '#define SOCKLEN_T '$SOCKLEN_T		>> $CONFIG_H
 
     # add network libraries if needed
-    if [ -f /usr/lib/libsocket.a -o -f /usr/lib/libsocket.so ]; then
+    if [ -f $LIBDIR/libsocket.a -o -f $LIBDIR/libsocket.so ]; then
 	# SCO, SunOS5
 	echo 'using libsocket' 1>&2
 	echo 'ADD_LDFLAGS([-lsocket])'		>> $CONFIG_M4
diff -up snobol4-1.1/Makefile2.m4.bak snobol4-1.1/Makefile2.m4
--- snobol4-1.1/Makefile2.m4.bak	2005-12-07 03:10:59.000000000 +0100
+++ snobol4-1.1/Makefile2.m4	2008-08-21 18:56:43.000000000 +0200
@@ -33,6 +33,10 @@ define([_WARN],[undivert(6)])dnl
 
 OPT=-O
 
+VERSION=4.1.1
+
+TOPDIR=$(PWD)
+
 CCM=./cc-M
 
 # for pow(3)
@@ -42,13 +46,13 @@ SH=sh
 SHELL=/bin/sh
 
 # library random accessifier
-RANLIB=ranlib
+RANLIB=gcc --shared
 
 # filename for external function library
-SNOLIB_A=snolib.a
+SNOLIB_A=libsnobol.so
 
 # default file to load
-SNOLIB_FILE=snolib.a
+SNOLIB_FILE=libsnobol.so
 
 # either snobol4 or isnobol4;
 # isnobol4 has had functions reordered for better inlining.
@@ -182,7 +186,7 @@ LDFLAGS=[]_LDFLAGS
 ################
 # compiler flags
 
-CFLAGS=$(COPT) $(MYCPPFLAGS) $(WARN)
+CFLAGS=$(COPT) $(MYCPPFLAGS) $(WARN) -fPIC
 
 ################
 
@@ -230,9 +234,9 @@ changequote([,])dnl
 
 snobol4: xsnobol4 snobol4.c test/tests.in
 	@echo Running regression tests...
-	(cd test; ./run.sh ../xsnobol4)
+	(export LD_LIBRARY_PATH=$(TOPDIR); cd test; ./run.sh ../xsnobol4)
 	@echo Passed regression tests.
-	./timing > timing.out
+	(export LD_LIBRARY_PATH=$(TOPDIR); ./timing > timing.out)
 	-rm -f snobol4$(EXT)
 	ln xsnobol4$(EXT) snobol4$(EXT)
 	@touch snobol4$(EXT)
@@ -419,10 +423,16 @@ SNOLIB_OBJS=chop.o cos.o delete.o enviro
 	ord.o log.o logic.o rename.o retstring.o serv.o sin.o \
 	sprintf.o sqrt.o sset.o sys.o tan.o $(AUX_OBJS)
 
-$(SNOLIB_A): $(SNOLIB_OBJS)
-	rm -f $(SNOLIB_A)
-	ar $(ARXFLAGS) rv $(SNOLIB_A) $(SNOLIB_OBJS)
-	$(RANLIB) $(SNOLIB_A)
+libsnobol.so.$(VERSION): $(SNOLIB_OBJS)
+	rm -f libsnobol.so.$(VERSION)
+	$(CC) $(LDFLAGS) --shared -Wl,--export-dynamic -Wl,-soname -Wl,libsnobol.so.4 \
+	 -o libsnobol.so.$(VERSION) $(SNOLIB_OBJS) 
+
+libsnobol.so: libsnobol.so.$(VERSION)
+	 rm -rf libsnobol.so 
+	 rm -rf libsnobol.so.4 
+	 ln -sf libsnobol.so.$(VERSION) libsnobol.so.4
+	 ln -sf libsnobol.so.4 libsnobol.so
 
 ################
 # snolib files
@@ -537,7 +547,7 @@ INSTALL_H=[include]/h.h [include]/snotyp
 # generated SNOLIB files (host.sno generated at top level)
 GENSNOLIB=host.sno
 
-SNOLIB_FILES=snolib/*.sno $(INSTALL_H) doc/load.txt README $(GENSNOLIB) 
+SNOLIB_FILES=snolib/*.sno $(GENSNOLIB) 
 
 VERS=`./pv`
 install: snobol4 pv
@@ -551,10 +561,19 @@ install: snobol4 pv
 	$(INSTALL) -m 644 doc/snolib.3 $(MAN3DIR)
 	$(INSTALL) -m 644 doc/snobol4dbm.3 $(MAN3DIR)
 	$(INSTALL) -m 644 doc/snobol4tcl.3 $(MAN3DIR)
+	$(INSTALL) -d $(DESTDIR)/usr/include/snobol4/
+	for F in $(INSTALL_H); do \
+	        $(INSTALL) -m 644 $$F $(DESTDIR)/usr/include/snobol4/; \
+        done
 	$(INSTALL) -d $(SNOLIB_DIR)
 	for F in $(SNOLIB_FILES); do \
 		$(INSTALL) -m 644 $$F $(SNOLIB_DIR); \
 	done
+	$(INSTALL) -d $(LIBDIR)
+	$(INSTALL) -m 755 libsnobol.so.$(VERSION) $(LIBDIR)
+	( cd $(LIBDIR); rm -rf libsnobol.so.4; ln -sf libsnobol.so.$(VERSION) libsnobol.so.4 )
+	( cd $(LIBDIR); rm -rf libsnobol.so;   ln -sf libsnobol.so.$(VERSION) libsnobol.so )
+
 	@echo '*********************************************************' 1>&2
 	@echo 'Have you mailed a copy of timing.out to timing at snobol4.org ?' 1>&2
 	@echo '*********************************************************' 1>&2

snobol-4.1.1-doc.patch:

--- NEW FILE snobol-4.1.1-doc.patch ---
diff -up snobol4-1.1/doc/load.txt.docbak snobol4-1.1/doc/load.txt
--- snobol4-1.1/doc/load.txt.docbak	2003-04-15 23:17:01.000000000 +0200
+++ snobol4-1.1/doc/load.txt	2008-08-18 17:40:19.000000000 +0200
@@ -53,12 +53,12 @@ The following snolib functions are avail
 An external C function should be declared as follows (see lib/snolib
 for many examples);
 
-    #include "config.h"
-    #include "h.h"
-    #include "snotypes.h"
-    #include "macros.h"
-    #include "load.h"
-    #include "equ.h"
+    #include <snobol4/config.h>
+    #include <snobol4/h.h>
+    #include <snobol4/snotypes.h>
+    #include <snobol4/macros.h>
+    #include <snobol4/load.h>
+    #include <snobol4/equ.h>
 
     int
     NAME( LA_ALIST ) LA_DCL
@@ -73,7 +73,7 @@ The typedefs int_t and real_t should be 
 and real values.
 
 The SNOBOL4 functions in "wrapper.sno" installed in
-/usr/local/lib/snobol4 will generate C glue code given a
+/usr/share/snobol4 will generate C glue code given a
 LOAD() style prototype.
 
 2.1 Return value
@@ -271,15 +271,15 @@ void function _fini(void) before the lib
 
 Examples;
     using gcc;
-	gcc -c -fPIC -DHAVE_CONFIG_H -I/usr/local/lib/snobol4 source.c
+	gcc -c -fPIC -DHAVE_CONFIG_H source.c
 	gcc -shared -o module.so source.o
 
     on SunOS 4;
-	cc -c -pic -DHAVE_CONFIG_H -I/usr/local/lib/snobol4 source.c
+	cc -c -pic -DHAVE_CONFIG_H source.c
 	ld -o module.so source.o
 
     on SunOS 5 (Solaris2+);
-	cc -c -Kpic -DHAVE_CONFIG_H -I/usr/local/lib/snobol4 source.c
+	cc -c -Kpic -DHAVE_CONFIG_H source.c
 	ld -G -o module.so source.o
 
     On Darwin (MacOS X);
@@ -287,11 +287,11 @@ Examples;
 	(see http://fink.sourceforge.net/doc/porting/shared.php
 	 and http://fink.sourceforge.net/doc/porting/porting.html)
 
-	cc -c -fno-common -DHAVE_CONFIG_H -I/usr/local/lib/snobol4 source.c
+	cc -c -fno-common -DHAVE_CONFIG_H -I/usr/lib/snobol4 source.c
 	cc -bundle -flat_namespace -undefined suppress -o module.so source.o
 
     On Win32, using Cygwin and MINGW;
-	gcc -c -DHAVE_CONFIG_H -I/usr/local/lib/snobol4 source.c
+	gcc -c -DHAVE_CONFIG_H -I/usr/lib/snobol4 source.c
 	dllwrap -v --export-all-symbols --dllname MODULE -o module.dll source.o
 
     On DOS, using DJGPP and DXE2;


--- NEW FILE snobol.spec ---
%define snobrel 1.1

Name:           snobol
Version:        4.%{snobrel}
Release:        6%{?dist}
Summary:        Macro Implementation of SNOBOL4 in C

Group:          Development/Languages
License:        BSD
URL:            http://www.snobol4.org
Source0:        ftp://ftp.ultimate.com/%{name}/%{name}4-%{snobrel}.tar.gz
Patch1:		snobol-4.1.1-config.patch
Patch2:		snobol-4.1.1-doc.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  tcl-devel
BuildRequires:  gdbm-devel
BuildRequires:	m4
Requires(post):	/sbin/ldconfig
Requires(postun):	/sbin/ldconfig

%description
SNOBOL4, while known primarily as a string language excels at any task
involving symbolic manipulations.  It provides run time typing,
garbage collection, user data types, on the fly compilation.  It's
primary weakness is it's simple syntax, and lack of "structured
programming" and "object oriented" constructs.

%package devel
Summary:	Header for external SNOBOL modules
Group:	 	Development/Languages
Requires:	snobol = %{version}

%description devel
This package contains header file which are requires to create
external SNOBOL modules in C

%prep
%setup -q -n %{name}4-%{snobrel}
%patch1 -p1 -b .bak
%patch2 -p1 -b .docbak

%build
export CFLAGS="$RPM_OPT_FLAGS"
./configure  --prefix=%{_prefix} --mandir=%{_mandir} --with-tcl --with-tk \
	     --libdir=%{_libdir} --add-cppflags="${RPM_OPT_FLAGS}"
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 COPYRIGHT README CHANGES doc/load.txt
%{_bindir}/snobol*
%{_datadir}/snobol4/
%{_mandir}/man*/*
%{_libdir}/libsnobol.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/snobol4/
%{_libdir}/libsnobol.so

%changelog
* Thu Aug 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-6
- Try to minimize undef. non-weak symbols

* Wed Aug 20 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-5
- Fix broken Req. in devel package

* Wed Aug 20 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-4
- Fix symlink issue

* Mon Aug 18 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-3
- Fix issue of setting soname

* Sun Aug 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-2
- Remove -O3 flag from configure file
- Splitting of a devel sub package

* Sun Jul 27 2008 Gerard Milmeister <gemi at bluewin.ch> 4.1.1-1
- first Fedora release



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snobol/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 02:19:00 -0000	1.1
+++ sources	10 Sep 2008 15:52:07 -0000	1.2
@@ -0,0 +1 @@
+101df7f3c74abb5703a01a85e58b4e9d  snobol4-1.1.tar.gz



From dwalsh at fedoraproject.org  Wed Sep 10 15:59:10 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 10 Sep 2008 15:59:10 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.84, 1.85 setroubleshoot.spec,
	1.103, 1.104 sources, 1.95, 1.96
Message-ID: <20080910155910.5A2B97012C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23204

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.9-1
- Fix startup problems



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- .cvsignore	9 Sep 2008 14:36:55 -0000	1.84
+++ .cvsignore	10 Sep 2008 15:58:40 -0000	1.85
@@ -1,2 +1,3 @@
 setroubleshoot-2.0.6.tar.gz
 setroubleshoot-2.0.8.tar.gz
+setroubleshoot-2.0.9.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- setroubleshoot.spec	9 Sep 2008 20:12:25 -0000	1.103
+++ setroubleshoot.spec	10 Sep 2008 15:58:40 -0000	1.104
@@ -1,7 +1,7 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.0.8
-Release: 2%{?dist}
+Version: 2.0.9
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -182,6 +182,9 @@
 %attr(0755,root,root) /etc/rc.d/init.d/%{name}
 
 %changelog
+* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.9-1
+- Fix startup problems
+
 * Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.8-2
 - Fix setroubleshoot init to rely on messagebus being running
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- sources	9 Sep 2008 14:36:55 -0000	1.95
+++ sources	10 Sep 2008 15:58:40 -0000	1.96
@@ -1 +1 @@
-bcf9712ea5328ebaecc07466d01f6aa4  setroubleshoot-2.0.8.tar.gz
+59510155065fc9b8c3f400ee624587be  setroubleshoot-2.0.9.tar.gz



From s4504kr at fedoraproject.org  Wed Sep 10 15:59:48 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 10 Sep 2008 15:59:48 +0000 (UTC)
Subject: rpms/aplus-fsf/devel aplus-fsf-4.22.3-atree.patch, NONE,
	1.1 aplus-fsf.spec, 1.26, 1.27
Message-ID: <20080910155948.5FFBF7012C@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23296

Modified Files:
	aplus-fsf.spec 
Added Files:
	aplus-fsf-4.22.3-atree.patch 
Log Message:
Add forgotten file

aplus-fsf-4.22.3-atree.patch:

--- NEW FILE aplus-fsf-4.22.3-atree.patch ---
diff -up aplus-fsf-4.22/src/cxs/S.c.org aplus-fsf-4.22/src/cxs/S.c
--- aplus-fsf-4.22/src/cxs/S.c.org	2008-03-27 20:09:22.000000000 +0100
+++ aplus-fsf-4.22/src/cxs/S.c	2008-08-06 18:56:30.000000000 +0200
@@ -17,9 +17,9 @@ void sInstall()
 
   if ((atree = getenv("ATREE")) == (char *)(0))
   {
-    atree = "/usr/local/a+";
+    atree = "/usr/lib/a+";
   }
-  sfile = bnstring(atree, "/lib/s.+", (char *)(0));
+  sfile = bnstring(atree, "/s.+", (char *)(0));
   loadafile(sfile,0);
   bfree(sfile);
   return;
diff -up aplus-fsf-4.22/src/IPC/IPCInterface.C.org aplus-fsf-4.22/src/IPC/IPCInterface.C
--- aplus-fsf-4.22/src/IPC/IPCInterface.C.org	2008-04-08 21:17:25.000000000 +0200
+++ aplus-fsf-4.22/src/IPC/IPCInterface.C	2008-08-06 18:57:39.000000000 +0200
@@ -605,9 +605,9 @@ void ipcInstall(void)
     
     if ((atree = getenv("ATREE")) == (char *)(0))
     {
-      atree = "/usr/local/a+";
+      atree = "/usr/lib/a+";
     }
-    ipcfile = bnstring(atree, "/acore/idap.+", (char *)(0));
+    ipcfile = bnstring(atree, "/idap.+", (char *)(0));
     loadafile(ipcfile,0);
     bfree(ipcfile);
   }


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- aplus-fsf.spec	10 Sep 2008 15:50:09 -0000	1.26
+++ aplus-fsf.spec	10 Sep 2008 15:59:18 -0000	1.27
@@ -15,7 +15,7 @@
 
 Name: %name
 Version: 4.22.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 
 Summary: Advanced APL interpreter with s interface
@@ -241,7 +241,7 @@
 %{catalogue}/apl-truetype
 
 %Changelog
-* Wed Sep 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-3
+* Wed Sep 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-4
 - Add forgotten file into cvs
 
 * Tue Sep  9 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-2



From pkgdb at fedoraproject.org  Wed Sep 10 16:07:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 16:07:58 +0000
Subject: [pkgdb] rdesktop ownership updated
Message-ID: <20080910160758.BC2BF208D0F@bastion.fedora.phx.redhat.com>

Package rdesktop in Fedora devel is now owned by ssp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rdesktop



From pkgdb at fedoraproject.org  Wed Sep 10 16:08:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 16:08:28 +0000
Subject: [pkgdb] rdesktop ownership updated
Message-ID: <20080910160828.AC06E208D7C@bastion.fedora.phx.redhat.com>

Package rdesktop in Fedora 8 is now owned by ssp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rdesktop



From pkgdb at fedoraproject.org  Wed Sep 10 16:08:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 16:08:32 +0000
Subject: [pkgdb] rdesktop ownership updated
Message-ID: <20080910160832.EC326208DB7@bastion.fedora.phx.redhat.com>

Package rdesktop in Fedora 9 is now owned by ssp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rdesktop



From pkgdb at fedoraproject.org  Wed Sep 10 16:08:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 16:08:57 +0000
Subject: [pkgdb] tsclient ownership updated
Message-ID: <20080910160858.35965208DA2@bastion.fedora.phx.redhat.com>

Package tsclient in Fedora devel is now owned by ssp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tsclient



From pkgdb at fedoraproject.org  Wed Sep 10 16:09:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 16:09:02 +0000
Subject: [pkgdb] tsclient ownership updated
Message-ID: <20080910160902.EED76208DCD@bastion.fedora.phx.redhat.com>

Package tsclient in Fedora 8 is now owned by ssp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tsclient



From pkgdb at fedoraproject.org  Wed Sep 10 16:09:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 16:09:04 +0000
Subject: [pkgdb] tsclient ownership updated
Message-ID: <20080910160904.2244E208DD1@bastion.fedora.phx.redhat.com>

Package tsclient in Fedora 9 is now owned by ssp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tsclient



From pkgdb at fedoraproject.org  Wed Sep 10 16:09:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 16:09:20 +0000
Subject: [pkgdb] vino ownership updated
Message-ID: <20080910160920.496AB208D99@bastion.fedora.phx.redhat.com>

Package vino in Fedora devel is now owned by ssp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vino



From pkgdb at fedoraproject.org  Wed Sep 10 16:09:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 16:09:25 +0000
Subject: [pkgdb] vino ownership updated
Message-ID: <20080910160925.7146E208DF0@bastion.fedora.phx.redhat.com>

Package vino in Fedora 8 is now owned by ssp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vino



From pkgdb at fedoraproject.org  Wed Sep 10 16:09:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 16:09:28 +0000
Subject: [pkgdb] vino ownership updated
Message-ID: <20080910160928.79914208E00@bastion.fedora.phx.redhat.com>

Package vino in Fedora 9 is now owned by ssp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vino



From s4504kr at fedoraproject.org  Wed Sep 10 16:10:31 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 10 Sep 2008 16:10:31 +0000 (UTC)
Subject: rpms/snobol/F-8 snobol-4.1.1-config.patch, NONE,
	1.1 snobol-4.1.1-doc.patch, NONE, 1.1 snobol.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20080910161031.9CF7E7012C@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/snobol/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24276

Modified Files:
	sources 
Added Files:
	snobol-4.1.1-config.patch snobol-4.1.1-doc.patch snobol.spec 
Log Message:
Initional import

snobol-4.1.1-config.patch:

--- NEW FILE snobol-4.1.1-config.patch ---
diff -up snobol4-1.1/configure.bak snobol4-1.1/configure
--- snobol4-1.1/configure.bak	2005-12-07 06:19:20.000000000 +0100
+++ snobol4-1.1/configure	2008-08-21 18:53:48.000000000 +0200
@@ -112,6 +112,9 @@ while [ $# -gt 0 ]; do
 	STUFF=`echo "$1" | sed 's/--bindir=//'`
 	echo "BINDIR=$STUFF"			>> $CONFIG_M4
     	;;
+    --libdir=*)
+        LIBDIR=`echo "$1" | sed 's/--libdir=//'`
+	;;
     --debug)
 	DEBUG=true
 	set -x
@@ -235,9 +238,10 @@ if [ "x$MANDIR" = x ]; then
 fi
 MAN1DIR="$MANDIR/man1"
 MAN3DIR="$MANDIR/man3"
-SNOLIB_DIR="$PREFIX/lib/snobol4"
+SNOLIB_DIR="$PREFIX/share/snobol4"
 
 echo 'BINDIR=$(DESTDIR)'"$BINDIR"		>> $CONFIG_M4
+echo 'LIBDIR=$(DESTDIR)'"$LIBDIR"               >> $CONFIG_M4
 echo 'MANDIR=$(DESTDIR)'"$MANDIR"		>> $CONFIG_M4
 echo 'MAN1DIR=$(DESTDIR)'"$MAN1DIR"		>> $CONFIG_M4
 echo 'MAN3DIR=$(DESTDIR)'"$MAN3DIR"		>> $CONFIG_M4
@@ -432,7 +436,7 @@ if [ "$GCCPATH" -a "$WANTGCC" ]; then
 
     # w/ gcc v3 -O3 turns on things OTHER than -finline-functions,
     # so make -O3 the default, and use -fno-inline-functions
-    OPT=-O3
+    # OPT=-O3
 
     if [ ! "$INLINE_OK" ]; then
 	echo 'ADD_OPT([-fno-inline-functions])'	>> $CONFIG_M4
@@ -1000,7 +1004,7 @@ if [ -f $INCDIR/sys/socket.h ]; then
     echo '#define SOCKLEN_T '$SOCKLEN_T		>> $CONFIG_H
 
     # add network libraries if needed
-    if [ -f /usr/lib/libsocket.a -o -f /usr/lib/libsocket.so ]; then
+    if [ -f $LIBDIR/libsocket.a -o -f $LIBDIR/libsocket.so ]; then
 	# SCO, SunOS5
 	echo 'using libsocket' 1>&2
 	echo 'ADD_LDFLAGS([-lsocket])'		>> $CONFIG_M4
diff -up snobol4-1.1/Makefile2.m4.bak snobol4-1.1/Makefile2.m4
--- snobol4-1.1/Makefile2.m4.bak	2005-12-07 03:10:59.000000000 +0100
+++ snobol4-1.1/Makefile2.m4	2008-08-21 18:56:43.000000000 +0200
@@ -33,6 +33,10 @@ define([_WARN],[undivert(6)])dnl
 
 OPT=-O
 
+VERSION=4.1.1
+
+TOPDIR=$(PWD)
+
 CCM=./cc-M
 
 # for pow(3)
@@ -42,13 +46,13 @@ SH=sh
 SHELL=/bin/sh
 
 # library random accessifier
-RANLIB=ranlib
+RANLIB=gcc --shared
 
 # filename for external function library
-SNOLIB_A=snolib.a
+SNOLIB_A=libsnobol.so
 
 # default file to load
-SNOLIB_FILE=snolib.a
+SNOLIB_FILE=libsnobol.so
 
 # either snobol4 or isnobol4;
 # isnobol4 has had functions reordered for better inlining.
@@ -182,7 +186,7 @@ LDFLAGS=[]_LDFLAGS
 ################
 # compiler flags
 
-CFLAGS=$(COPT) $(MYCPPFLAGS) $(WARN)
+CFLAGS=$(COPT) $(MYCPPFLAGS) $(WARN) -fPIC
 
 ################
 
@@ -230,9 +234,9 @@ changequote([,])dnl
 
 snobol4: xsnobol4 snobol4.c test/tests.in
 	@echo Running regression tests...
-	(cd test; ./run.sh ../xsnobol4)
+	(export LD_LIBRARY_PATH=$(TOPDIR); cd test; ./run.sh ../xsnobol4)
 	@echo Passed regression tests.
-	./timing > timing.out
+	(export LD_LIBRARY_PATH=$(TOPDIR); ./timing > timing.out)
 	-rm -f snobol4$(EXT)
 	ln xsnobol4$(EXT) snobol4$(EXT)
 	@touch snobol4$(EXT)
@@ -419,10 +423,16 @@ SNOLIB_OBJS=chop.o cos.o delete.o enviro
 	ord.o log.o logic.o rename.o retstring.o serv.o sin.o \
 	sprintf.o sqrt.o sset.o sys.o tan.o $(AUX_OBJS)
 
-$(SNOLIB_A): $(SNOLIB_OBJS)
-	rm -f $(SNOLIB_A)
-	ar $(ARXFLAGS) rv $(SNOLIB_A) $(SNOLIB_OBJS)
-	$(RANLIB) $(SNOLIB_A)
+libsnobol.so.$(VERSION): $(SNOLIB_OBJS)
+	rm -f libsnobol.so.$(VERSION)
+	$(CC) $(LDFLAGS) --shared -Wl,--export-dynamic -Wl,-soname -Wl,libsnobol.so.4 \
+	 -o libsnobol.so.$(VERSION) $(SNOLIB_OBJS) 
+
+libsnobol.so: libsnobol.so.$(VERSION)
+	 rm -rf libsnobol.so 
+	 rm -rf libsnobol.so.4 
+	 ln -sf libsnobol.so.$(VERSION) libsnobol.so.4
+	 ln -sf libsnobol.so.4 libsnobol.so
 
 ################
 # snolib files
@@ -537,7 +547,7 @@ INSTALL_H=[include]/h.h [include]/snotyp
 # generated SNOLIB files (host.sno generated at top level)
 GENSNOLIB=host.sno
 
-SNOLIB_FILES=snolib/*.sno $(INSTALL_H) doc/load.txt README $(GENSNOLIB) 
+SNOLIB_FILES=snolib/*.sno $(GENSNOLIB) 
 
 VERS=`./pv`
 install: snobol4 pv
@@ -551,10 +561,19 @@ install: snobol4 pv
 	$(INSTALL) -m 644 doc/snolib.3 $(MAN3DIR)
 	$(INSTALL) -m 644 doc/snobol4dbm.3 $(MAN3DIR)
 	$(INSTALL) -m 644 doc/snobol4tcl.3 $(MAN3DIR)
+	$(INSTALL) -d $(DESTDIR)/usr/include/snobol4/
+	for F in $(INSTALL_H); do \
+	        $(INSTALL) -m 644 $$F $(DESTDIR)/usr/include/snobol4/; \
+        done
 	$(INSTALL) -d $(SNOLIB_DIR)
 	for F in $(SNOLIB_FILES); do \
 		$(INSTALL) -m 644 $$F $(SNOLIB_DIR); \
 	done
+	$(INSTALL) -d $(LIBDIR)
+	$(INSTALL) -m 755 libsnobol.so.$(VERSION) $(LIBDIR)
+	( cd $(LIBDIR); rm -rf libsnobol.so.4; ln -sf libsnobol.so.$(VERSION) libsnobol.so.4 )
+	( cd $(LIBDIR); rm -rf libsnobol.so;   ln -sf libsnobol.so.$(VERSION) libsnobol.so )
+
 	@echo '*********************************************************' 1>&2
 	@echo 'Have you mailed a copy of timing.out to timing at snobol4.org ?' 1>&2
 	@echo '*********************************************************' 1>&2

snobol-4.1.1-doc.patch:

--- NEW FILE snobol-4.1.1-doc.patch ---
diff -up snobol4-1.1/doc/load.txt.docbak snobol4-1.1/doc/load.txt
--- snobol4-1.1/doc/load.txt.docbak	2003-04-15 23:17:01.000000000 +0200
+++ snobol4-1.1/doc/load.txt	2008-08-18 17:40:19.000000000 +0200
@@ -53,12 +53,12 @@ The following snolib functions are avail
 An external C function should be declared as follows (see lib/snolib
 for many examples);
 
-    #include "config.h"
-    #include "h.h"
-    #include "snotypes.h"
-    #include "macros.h"
-    #include "load.h"
-    #include "equ.h"
+    #include <snobol4/config.h>
+    #include <snobol4/h.h>
+    #include <snobol4/snotypes.h>
+    #include <snobol4/macros.h>
+    #include <snobol4/load.h>
+    #include <snobol4/equ.h>
 
     int
     NAME( LA_ALIST ) LA_DCL
@@ -73,7 +73,7 @@ The typedefs int_t and real_t should be 
 and real values.
 
 The SNOBOL4 functions in "wrapper.sno" installed in
-/usr/local/lib/snobol4 will generate C glue code given a
+/usr/share/snobol4 will generate C glue code given a
 LOAD() style prototype.
 
 2.1 Return value
@@ -271,15 +271,15 @@ void function _fini(void) before the lib
 
 Examples;
     using gcc;
-	gcc -c -fPIC -DHAVE_CONFIG_H -I/usr/local/lib/snobol4 source.c
+	gcc -c -fPIC -DHAVE_CONFIG_H source.c
 	gcc -shared -o module.so source.o
 
     on SunOS 4;
-	cc -c -pic -DHAVE_CONFIG_H -I/usr/local/lib/snobol4 source.c
+	cc -c -pic -DHAVE_CONFIG_H source.c
 	ld -o module.so source.o
 
     on SunOS 5 (Solaris2+);
-	cc -c -Kpic -DHAVE_CONFIG_H -I/usr/local/lib/snobol4 source.c
+	cc -c -Kpic -DHAVE_CONFIG_H source.c
 	ld -G -o module.so source.o
 
     On Darwin (MacOS X);
@@ -287,11 +287,11 @@ Examples;
 	(see http://fink.sourceforge.net/doc/porting/shared.php
 	 and http://fink.sourceforge.net/doc/porting/porting.html)
 
-	cc -c -fno-common -DHAVE_CONFIG_H -I/usr/local/lib/snobol4 source.c
+	cc -c -fno-common -DHAVE_CONFIG_H -I/usr/lib/snobol4 source.c
 	cc -bundle -flat_namespace -undefined suppress -o module.so source.o
 
     On Win32, using Cygwin and MINGW;
-	gcc -c -DHAVE_CONFIG_H -I/usr/local/lib/snobol4 source.c
+	gcc -c -DHAVE_CONFIG_H -I/usr/lib/snobol4 source.c
 	dllwrap -v --export-all-symbols --dllname MODULE -o module.dll source.o
 
     On DOS, using DJGPP and DXE2;


--- NEW FILE snobol.spec ---
%define snobrel 1.1

Name:           snobol
Version:        4.%{snobrel}
Release:        6%{?dist}
Summary:        Macro Implementation of SNOBOL4 in C

Group:          Development/Languages
License:        BSD
URL:            http://www.snobol4.org
Source0:        ftp://ftp.ultimate.com/%{name}/%{name}4-%{snobrel}.tar.gz
Patch1:		snobol-4.1.1-config.patch
Patch2:		snobol-4.1.1-doc.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  tcl-devel
BuildRequires:  gdbm-devel
BuildRequires:	m4
Requires(post):	/sbin/ldconfig
Requires(postun):	/sbin/ldconfig

%description
SNOBOL4, while known primarily as a string language excels at any task
involving symbolic manipulations.  It provides run time typing,
garbage collection, user data types, on the fly compilation.  It's
primary weakness is it's simple syntax, and lack of "structured
programming" and "object oriented" constructs.

%package devel
Summary:	Header for external SNOBOL modules
Group:	 	Development/Languages
Requires:	snobol = %{version}

%description devel
This package contains header file which are requires to create
external SNOBOL modules in C

%prep
%setup -q -n %{name}4-%{snobrel}
%patch1 -p1 -b .bak
%patch2 -p1 -b .docbak

%build
export CFLAGS="$RPM_OPT_FLAGS"
./configure  --prefix=%{_prefix} --mandir=%{_mandir} --with-tcl --with-tk \
	     --libdir=%{_libdir} --add-cppflags="${RPM_OPT_FLAGS}"
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 COPYRIGHT README CHANGES doc/load.txt
%{_bindir}/snobol*
%{_datadir}/snobol4/
%{_mandir}/man*/*
%{_libdir}/libsnobol.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/snobol4/
%{_libdir}/libsnobol.so

%changelog
* Thu Aug 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-6
- Try to minimize undef. non-weak symbols

* Wed Aug 20 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-5
- Fix broken Req. in devel package

* Wed Aug 20 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-4
- Fix symlink issue

* Mon Aug 18 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-3
- Fix issue of setting soname

* Sun Aug 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-2
- Remove -O3 flag from configure file
- Splitting of a devel sub package

* Sun Jul 27 2008 Gerard Milmeister <gemi at bluewin.ch> 4.1.1-1
- first Fedora release



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snobol/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 02:19:00 -0000	1.1
+++ sources	10 Sep 2008 16:10:01 -0000	1.2
@@ -0,0 +1 @@
+101df7f3c74abb5703a01a85e58b4e9d  snobol4-1.1.tar.gz



From s4504kr at fedoraproject.org  Wed Sep 10 16:29:28 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 10 Sep 2008 16:29:28 +0000 (UTC)
Subject: rpms/open-cobol/devel import.log, NONE, 1.1 open-cobol.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080910162928.552F37012C@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/open-cobol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25556/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log open-cobol.spec 
Log Message:

Initiional import



--- NEW FILE import.log ---
open-cobol-1_0_90-2_fc9:HEAD:open-cobol-1.0.90-2.fc9.src.rpm:1221064053


--- NEW FILE open-cobol.spec ---
%define cobvers 1.1

Name:		open-cobol
Version:	1.0.90
Release:	2%{?dist}
Summary:	OpenCOBOL - COBOL compiler

Group:		Development/Languages
License:	GPLv2+ and LGPLv2+

URL:		http://www.opencobol.org
# Source:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source:		http://www.sim-basis.de/%{name}-%{cobvers}.tar.gz

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gmp-devel >= 4.1.4
BuildRequires:	readline-devel
BuildRequires:	db4-devel >= 4.1.24
BuildRequires:	libtool
BuildRequires:	libtool-ltdl-devel

Requires:	gcc
Requires:	glibc-devel
Requires:	gmp >= 4.1.4
Requires:	gmp-devel >= 4.1.4
Requires:	db4 >= 4.1.24
Requires:	ncurses >= 5.4
Requires:       libcob = %{version}
Requires(post): /sbin/install-info

%description
OpenCOBOL is an open-source COBOL compiler, which translates COBOL
programs to C code and compiles it using GCC.

%package -n libcob
Summary:        OpenCOBOL runtime library
Group:		Development/Libraries
Requires(post):	/sbin/ldconfig
Requires(postun):	/sbin/ldconfig

%description -n libcob
%{summary}.
Runtime libraries for OpenCOBOL

%prep
%setup -q -n %{name}-%{cobvers}

%build
%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
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT/%{_libdir} -type f -name "*.*a" -exec rm -f {} ';'
rm -rf $RPM_BUILD_ROOT/%{_infodir}/dir

%find_lang %{name}

%check
make check

%files -f %{name}.lang
%defattr (-,root,root,-)
%doc AUTHORS COPYING ChangeLog
%doc NEWS README THANKS
%{_bindir}/cobc
%{_bindir}/cob-config
%{_bindir}/cobcrun
%{_datadir}/open-cobol
%{_infodir}/open-cobol.info*
%{_includedir}/*
%{_libdir}/libcob.so

%files -n libcob
%defattr (-,root,root,-)
%doc COPYING.LIB
%{_libdir}/libcob.so.*

%clean
rm -rf $RPM_BUILD_ROOT

%post 
/sbin/install-info %{_infodir}/open-cobol.info %{_infodir}/dir 2>/dev/null || :

%postun 
if [ $1 = 0 ]; then
  /sbin/install-info --delete %{_infodir}/open-cobol.info %{_infodir}/dir 2>/dev/null || :
fi

%post -n libcob -p /sbin/ldconfig

%postun -n libcob -p /sbin/ldconfig

%changelog
* Sun Aug 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 1.0.90-2
- Fix dependency open-cobol -> libcob

* Tue Aug 12 2008 Jochen Schmitt <Jochen herr-schmitt de> 1.0.90-1
- Prerelease of opben-cobol-1.1

* Tue Aug  5 2008 Jochen Schmitt <Jochen herr-schmitt de> 1.0-3
- Blocking Test #98 to failing

* Wed Jul 30 2008 Jochen Schmitt <Jochen herr-schmitt de> 1.0-2
- OpenCOBOL req. libcob-devel
- Fix URIs
- Fix tiwce groups

* Wed Jul 30 2008 Jochen Schmitt <Jochen herr-schmitt de> 1.0-1
- Initional Fedora RPM package



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/open-cobol/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2008 23:47:30 -0000	1.1
+++ .cvsignore	10 Sep 2008 16:28:57 -0000	1.2
@@ -0,0 +1 @@
+open-cobol-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/open-cobol/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2008 23:47:30 -0000	1.1
+++ sources	10 Sep 2008 16:28:58 -0000	1.2
@@ -0,0 +1 @@
+eeb826ab1c181ce0024c7c64b8d32f52  open-cobol-1.1.tar.gz



From rhughes at fedoraproject.org  Wed Sep 10 16:32:28 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Wed, 10 Sep 2008 16:32:28 +0000 (UTC)
Subject: rpms/PackageKit/devel pk-catalog-parameter-fix.patch, NONE,
	1.1 PackageKit.spec, 1.52, 1.53
Message-ID: <20080910163228.550857012C@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25934

Modified Files:
	PackageKit.spec 
Added Files:
	pk-catalog-parameter-fix.patch 
Log Message:
* Wed Sep 10 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.2-3
- Fix an error where we don't check for existing packages in the catalog
  code properly. Also fixes the self tests.


pk-catalog-parameter-fix.patch:

--- NEW FILE pk-catalog-parameter-fix.patch ---
commit 918dd9d10ef18725776c6a55fe9cf03ec18db047
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Sep 10 17:24:24 2008 +0100

    bugfix: use a bitfield when searching for files in the catalog else we might return the wrong results

diff --git a/libpackagekit/pk-catalog.c b/libpackagekit/pk-catalog.c
index 3072ad1..fcd14a2 100644
--- a/libpackagekit/pk-catalog.c
+++ b/libpackagekit/pk-catalog.c
@@ -174,12 +174,18 @@ pk_catalog_process_type (PkCatalog *catalog)
 		/* do the actions */
 		if (mode == PK_CATALOG_PROGRESS_PACKAGES) {
 			packages = pk_package_ids_from_id (package);
-			ret = pk_client_resolve (catalog->priv->client, PK_FILTER_ENUM_NOT_INSTALLED, packages, &error);
+			ret = pk_client_resolve (catalog->priv->client,
+						 pk_bitfield_value (PK_FILTER_ENUM_NOT_INSTALLED),
+						 packages, &error);
 			g_strfreev (packages);
 		} else if (mode == PK_CATALOG_PROGRESS_FILES) {
-			ret = pk_client_search_file (catalog->priv->client, PK_FILTER_ENUM_NOT_INSTALLED, package, &error);
+			ret = pk_client_search_file (catalog->priv->client,
+						     pk_bitfield_value (PK_FILTER_ENUM_NOT_INSTALLED),
+						     package, &error);
 		} else if (mode == PK_CATALOG_PROGRESS_PROVIDES) {
-			ret = pk_client_what_provides (catalog->priv->client, PK_FILTER_ENUM_NOT_INSTALLED, 0, package, &error);
+			ret = pk_client_what_provides (catalog->priv->client,
+						      pk_bitfield_value (PK_FILTER_ENUM_NOT_INSTALLED),
+						      PK_PROVIDES_ENUM_ANY, package, &error);
 		}
 		if (!ret) {
 			egg_warning ("method failed: %s", error->message);


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- PackageKit.spec	10 Sep 2008 14:32:50 -0000	1.52
+++ PackageKit.spec	10 Sep 2008 16:31:58 -0000	1.53
@@ -8,7 +8,7 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -18,6 +18,9 @@
 # Upstream: 0bc4ba936db39ccf0466987d964a016363bceeee
 Patch0:    pk-dont-show-brackets-null.patch
 
+# Upstream: 918dd9d10ef18725776c6a55fe9cf03ec18db047
+Patch1:    pk-catalog-parameter-fix.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-libs = %{version}-%{release}
@@ -142,6 +145,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -270,6 +274,10 @@
 %{_includedir}/*
 
 %changelog
+* Wed Sep 10 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.2-3
+- Fix an error where we don't check for existing packages in the catalog
+  code properly. Also fixes the self tests.
+
 * Wed Sep 10 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.2-2
 - Fix a library error so we don't print (null) in the UI.
 



From belegdol at fedoraproject.org  Wed Sep 10 16:39:07 2008
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Wed, 10 Sep 2008 16:39:07 +0000 (UTC)
Subject: rpms/goffice/F-9 .cvsignore, 1.7, 1.8 goffice.spec, 1.17,
	1.18 sources, 1.7, 1.8
Message-ID: <20080910163907.A1C2C7012C@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/goffice/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26405

Modified Files:
	.cvsignore goffice.spec sources 
Log Message:
* Sun Sep  7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.6.5-1
- Updated to 0.6.5
- Development docs are now in goffice-0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Mar 2008 20:26:51 -0000	1.7
+++ .cvsignore	10 Sep 2008 16:38:37 -0000	1.8
@@ -1 +1 @@
-goffice-0.6.2.tar.bz2
+goffice-0.6.5.tar.bz2


Index: goffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/F-9/goffice.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- goffice.spec	8 Mar 2008 20:26:51 -0000	1.17
+++ goffice.spec	10 Sep 2008 16:38:37 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           goffice         
-Version:        0.6.2
+Version:        0.6.5
 Release:        1%{?dist}
 Summary:        Goffice support libraries
 Group:          System Environment/Libraries
@@ -11,7 +11,11 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgsf-gnome-devel     >= 1.13.3
 BuildRequires:  libgnomeui-devel       >= 2.0.0
-BuildRequires:  pcre-devel intltool gettext
+BuildRequires:  intltool gettext
+# glib on fedora 8 is too old
+%if 0%{?fedora} < 9
+BuildRequires:  pcre-devel
+%endif
 
 %description
 Support libraries for gnome office
@@ -69,10 +73,18 @@
 %{_includedir}/libgoffice-0.6/
 %{_libdir}/pkgconfig/libgoffice-0.6.pc
 %{_libdir}/*.so
-%{_datadir}/gtk-doc/html/goffice/
+%{_datadir}/gtk-doc/html/goffice-0.6/
 
 
 %changelog
+* Sun Sep  7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.6.5-1
+- Updated to 0.6.5
+- Development docs are now in goffice-0.6
+
+* Wed Aug 27 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.6.4-1
+- Updated to 0.6.4
+- BuildRequires: pcre-devel only on Fedora < 9
+
 * Sat Mar  8 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.2-1
 - New upstream version 0.6.2
 
@@ -126,4 +138,4 @@
 -remove some redundant (already included in other) (Build)Requires
 
 * Sat Nov 05 2005 Michael Wise <micwise at gmail.com> - 0.0.4-1
-- Initial spec file
\ No newline at end of file
+- Initial spec file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Mar 2008 20:26:51 -0000	1.7
+++ sources	10 Sep 2008 16:38:37 -0000	1.8
@@ -1 +1 @@
-f52d78cffbcfc3c13336fd308ea3926e  goffice-0.6.2.tar.bz2
+ab0cf11995b7750f26112669cedf6707  goffice-0.6.5.tar.bz2



From cebbert at fedoraproject.org  Wed Sep 10 16:42:09 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed, 10 Sep 2008 16:42:09 +0000 (UTC)
Subject: rpms/kernel/F-9
	linux-2.6-netdev-e1000e-add-support-for-82567lm-4.patch, NONE,
	1.1 kernel.spec, 1.759, 1.760
Message-ID: <20080910164209.1A6E87012C@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26801

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-netdev-e1000e-add-support-for-82567lm-4.patch 
Log Message:
Add support for 82567LM-4 to the e1000e driver (#461438)

linux-2.6-netdev-e1000e-add-support-for-82567lm-4.patch:

--- NEW FILE linux-2.6-netdev-e1000e-add-support-for-82567lm-4.patch ---
From: Bruce Allan <bruce.w.allan at intel.com>
Date: Wed, 27 Aug 2008 01:36:36 +0000 (-0700)
Subject: e1000e: add support for the 82567LM-4 device
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdavem%2Fnet-next-2.6.git;a=commitdiff_plain;h=2f15f9d60190a62bc8ac50fa84fea31fc0b00ecf

e1000e: add support for the 82567LM-4 device

Enable PCI device ID for a new combination of MAC and PHY already supported
in the driver.

Signed-off-by: Bruce Allan <bruce.w.allan at intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---

https://bugzilla.redhat.com/show_bug.cgi?id=461438

diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index 74f263a..d0e7b46 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -346,6 +346,7 @@ enum e1e_registers {
 #define E1000_DEV_ID_ICH8_IFE_G			0x10C5
 #define E1000_DEV_ID_ICH8_IGP_M			0x104D
 #define E1000_DEV_ID_ICH9_IGP_AMT		0x10BD
+#define E1000_DEV_ID_ICH9_BM			0x10E5
 #define E1000_DEV_ID_ICH9_IGP_M_AMT		0x10F5
 #define E1000_DEV_ID_ICH9_IGP_M			0x10BF
 #define E1000_DEV_ID_ICH9_IGP_M_V		0x10CB
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index 9e38452..b5fc2c9 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -44,6 +44,7 @@
  * 82567LF-2 Gigabit Network Connection
  * 82567V-2 Gigabit Network Connection
  * 82562GT-3 10/100 Network Connection
+ * 82567LM-4 Gigabit Network Connection
  */
 
 #include <linux/netdevice.h>
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index d266510..c3d7411 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4767,6 +4767,7 @@ static struct pci_device_id e1000_pci_tbl[] = {
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_GT), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_AMT), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_C), board_ich9lan },
+	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_BM), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_AMT), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_V), board_ich9lan },


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.759
retrieving revision 1.760
diff -u -r1.759 -r1.760
--- kernel.spec	9 Sep 2008 05:38:34 -0000	1.759
+++ kernel.spec	10 Sep 2008 16:41:38 -0000	1.760
@@ -668,6 +668,8 @@
 
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
+Patch2040: linux-2.6-netdev-e1000e-add-support-for-82567lm-4.patch
+
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
 
@@ -1223,6 +1225,8 @@
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
+ApplyPatch linux-2.6-netdev-e1000e-add-support-for-82567lm-4.patch
+
 # Nouveau DRM + drm fixes
 ApplyPatch drm-fedora9-rollup.patch
 
@@ -1832,6 +1836,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Wed Sep 10 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-33
+- Add support for 82567LM-4 to the e1000e driver (#461438)
+
 * Mon Sep 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-32
 - HPET fixes from 2.6.27
 



From perex at fedoraproject.org  Wed Sep 10 16:42:03 2008
From: perex at fedoraproject.org (Jaroslav Kysela)
Date: Wed, 10 Sep 2008 16:42:03 +0000 (UTC)
Subject: rpms/alsa-lib/devel alsa-lib.spec,1.75,1.76
Message-ID: <20080910164203.B29617012C@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26773

Modified Files:
	alsa-lib.spec 
Log Message:
alsa-lib: version number fix


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- alsa-lib.spec	10 Sep 2008 13:49:42 -0000	1.75
+++ alsa-lib.spec	10 Sep 2008 16:41:33 -0000	1.76
@@ -5,7 +5,7 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
 Version: 1.0.18
-Release: 1%{?prever_dot}%{?dist}
+Release: 4%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
@@ -96,6 +96,10 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Wed Sep 10 2008 Jaroslav Kysela <jkysela at redhat.com> - 1.0.18-4.rc3
+- fixed spec file
+- fixed package version number (1.0.18-3.rc3 was tagged by accident)
+
 * Wed Sep 10 2008 Jaroslav Kysela <jkysela at redhat.com> - 1.0.18-1.rc3
 - updated to 1.0.18rc3
 - moved /etc/alsa configuration files back to /usr/share/alsa



From corsepiu at fedoraproject.org  Wed Sep 10 16:44:00 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Wed, 10 Sep 2008 16:44:00 +0000 (UTC)
Subject: rpms/perl-Pod-Tests/devel .cvsignore, 1.2, 1.3 perl-Pod-Tests.spec, 
	1.7, 1.8 sources, 1.2, 1.3
Message-ID: <20080910164400.A08FF7012C@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Pod-Tests/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27191/devel

Modified Files:
	.cvsignore perl-Pod-Tests.spec sources 
Log Message:
* Wed Sep 10 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Tests/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Oct 2005 17:10:11 -0000	1.2
+++ .cvsignore	10 Sep 2008 16:43:30 -0000	1.3
@@ -1 +1 @@
-Pod-Tests-0.18.tar.gz
+Pod-Tests-1.19.tar.gz


Index: perl-Pod-Tests.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Tests/devel/perl-Pod-Tests.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Pod-Tests.spec	4 Mar 2008 15:16:06 -0000	1.7
+++ perl-Pod-Tests.spec	10 Sep 2008 16:43:30 -0000	1.8
@@ -1,6 +1,6 @@
 Name: 		perl-Pod-Tests
-Version: 	0.18
-Release: 	6%{?dist}
+Version: 	1.19
+Release: 	1%{?dist}
 Summary: 	Extract embedded tests and code examples from POD
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -12,8 +12,16 @@
 BuildArch: 	noarch
 
 BuildRequires:	perl(ExtUtils::MakeMaker)
-BuildRequires:	perl(Test::Pod) >= 1.00
-BuildRequires:	/usr/bin/dos2unix
+BuildRequires:  perl(Test::Harness) >= 1.22
+BuildRequires:  perl(Test::More) >= 0.33
+
+# for improved tests
+BuildRequires:  perl(Test::CPAN::Meta) >= 0.12
+BuildRequires:	perl(Test::Pod) >= 1.26
+BuildRequires:  perl(Test::MinimumVersion) >= 0.008
+# N/A in Fedora
+# BuildRequires:  perl(Pod::Simple) >= 3.07
+BuildRequires:  perl(Pod::Simple)
 
 %description
 Pod::Tests extracts embedded tests and code examples from POD.
@@ -21,8 +29,6 @@
 
 %prep
 %setup -q -n Pod-Tests-%{version}
-chmod -x Changes
-/usr/bin/dos2unix Changes
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -39,7 +45,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-make test
+make test AUTOMATED_TESTING=1
 
 %files
 %defattr(-,root,root,-)
@@ -50,6 +56,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 10 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
+- Upstream update.
+
 * Tue Mar 04 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.18-6
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Tests/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Oct 2005 17:10:11 -0000	1.2
+++ sources	10 Sep 2008 16:43:30 -0000	1.3
@@ -1 +1 @@
-dab7e41c23a1c01fa3e96f6237781dda  Pod-Tests-0.18.tar.gz
+9c1a062bc7689e0c4f94784e3de69f35  Pod-Tests-1.19.tar.gz



From corsepiu at fedoraproject.org  Wed Sep 10 16:44:00 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Wed, 10 Sep 2008 16:44:00 +0000 (UTC)
Subject: rpms/perl-Pod-Tests/F-9 .cvsignore, 1.2, 1.3 perl-Pod-Tests.spec,
	1.7, 1.8 sources, 1.2, 1.3
Message-ID: <20080910164400.C58D67012C@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Pod-Tests/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27191/F-9

Modified Files:
	.cvsignore perl-Pod-Tests.spec sources 
Log Message:
* Wed Sep 10 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Tests/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Oct 2005 17:10:11 -0000	1.2
+++ .cvsignore	10 Sep 2008 16:43:30 -0000	1.3
@@ -1 +1 @@
-Pod-Tests-0.18.tar.gz
+Pod-Tests-1.19.tar.gz


Index: perl-Pod-Tests.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Tests/F-9/perl-Pod-Tests.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Pod-Tests.spec	4 Mar 2008 15:16:06 -0000	1.7
+++ perl-Pod-Tests.spec	10 Sep 2008 16:43:30 -0000	1.8
@@ -1,6 +1,6 @@
 Name: 		perl-Pod-Tests
-Version: 	0.18
-Release: 	6%{?dist}
+Version: 	1.19
+Release: 	1%{?dist}
 Summary: 	Extract embedded tests and code examples from POD
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -12,8 +12,16 @@
 BuildArch: 	noarch
 
 BuildRequires:	perl(ExtUtils::MakeMaker)
-BuildRequires:	perl(Test::Pod) >= 1.00
-BuildRequires:	/usr/bin/dos2unix
+BuildRequires:  perl(Test::Harness) >= 1.22
+BuildRequires:  perl(Test::More) >= 0.33
+
+# for improved tests
+BuildRequires:  perl(Test::CPAN::Meta) >= 0.12
+BuildRequires:	perl(Test::Pod) >= 1.26
+BuildRequires:  perl(Test::MinimumVersion) >= 0.008
+# N/A in Fedora
+# BuildRequires:  perl(Pod::Simple) >= 3.07
+BuildRequires:  perl(Pod::Simple)
 
 %description
 Pod::Tests extracts embedded tests and code examples from POD.
@@ -21,8 +29,6 @@
 
 %prep
 %setup -q -n Pod-Tests-%{version}
-chmod -x Changes
-/usr/bin/dos2unix Changes
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -39,7 +45,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-make test
+make test AUTOMATED_TESTING=1
 
 %files
 %defattr(-,root,root,-)
@@ -50,6 +56,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 10 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
+- Upstream update.
+
 * Tue Mar 04 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.18-6
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Tests/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Oct 2005 17:10:11 -0000	1.2
+++ sources	10 Sep 2008 16:43:30 -0000	1.3
@@ -1 +1 @@
-dab7e41c23a1c01fa3e96f6237781dda  Pod-Tests-0.18.tar.gz
+9c1a062bc7689e0c4f94784e3de69f35  Pod-Tests-1.19.tar.gz



From corsepiu at fedoraproject.org  Wed Sep 10 16:44:01 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Wed, 10 Sep 2008 16:44:01 +0000 (UTC)
Subject: rpms/perl-Pod-Tests/F-8 .cvsignore, 1.2, 1.3 perl-Pod-Tests.spec,
	1.6, 1.7 sources, 1.2, 1.3
Message-ID: <20080910164401.128BD7012C@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Pod-Tests/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27191/F-8

Modified Files:
	.cvsignore perl-Pod-Tests.spec sources 
Log Message:
* Wed Sep 10 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Tests/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Oct 2005 17:10:11 -0000	1.2
+++ .cvsignore	10 Sep 2008 16:43:30 -0000	1.3
@@ -1 +1 @@
-Pod-Tests-0.18.tar.gz
+Pod-Tests-1.19.tar.gz


Index: perl-Pod-Tests.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Tests/F-8/perl-Pod-Tests.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Pod-Tests.spec	4 Sep 2007 12:36:50 -0000	1.6
+++ perl-Pod-Tests.spec	10 Sep 2008 16:43:30 -0000	1.7
@@ -1,6 +1,6 @@
 Name: 		perl-Pod-Tests
-Version: 	0.18
-Release: 	5%{?dist}
+Version: 	1.19
+Release: 	1%{?dist}
 Summary: 	Extract embedded tests and code examples from POD
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -12,8 +12,16 @@
 BuildArch: 	noarch
 
 BuildRequires:	perl(ExtUtils::MakeMaker)
-BuildRequires:	perl(Test::Pod) >= 1.00
-BuildRequires:	/usr/bin/dos2unix
+BuildRequires:  perl(Test::Harness) >= 1.22
+BuildRequires:  perl(Test::More) >= 0.33
+
+# for improved tests
+BuildRequires:  perl(Test::CPAN::Meta) >= 0.12
+BuildRequires:	perl(Test::Pod) >= 1.26
+BuildRequires:  perl(Test::MinimumVersion) >= 0.008
+# N/A in Fedora
+# BuildRequires:  perl(Pod::Simple) >= 3.07
+BuildRequires:  perl(Pod::Simple)
 
 %description
 Pod::Tests extracts embedded tests and code examples from POD.
@@ -21,8 +29,6 @@
 
 %prep
 %setup -q -n Pod-Tests-%{version}
-chmod -x Changes
-/usr/bin/dos2unix Changes
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -39,7 +45,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-make test
+make test AUTOMATED_TESTING=1
 
 %files
 %defattr(-,root,root,-)
@@ -50,6 +56,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 10 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
+- Upstream update.
+
+* Tue Mar 04 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.18-6
+- rebuild for new perl
+
 * Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.18-5
 - Update license tag.
 - BR: perl(ExtUtils::MakeMaker).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Tests/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Oct 2005 17:10:11 -0000	1.2
+++ sources	10 Sep 2008 16:43:30 -0000	1.3
@@ -1 +1 @@
-dab7e41c23a1c01fa3e96f6237781dda  Pod-Tests-0.18.tar.gz
+9c1a062bc7689e0c4f94784e3de69f35  Pod-Tests-1.19.tar.gz



From pkgdb at fedoraproject.org  Wed Sep 10 16:47:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 16:47:34 +0000
Subject: [pkgdb] perl-Config-Record ownership updated
Message-ID: <20080910164734.85159208D9B@bastion.fedora.phx.redhat.com>

Package perl-Config-Record in Fedora 8 is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-Record



From pkgdb at fedoraproject.org  Wed Sep 10 16:47:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 16:47:23 +0000
Subject: [pkgdb] perl-Config-Record ownership updated
Message-ID: <20080910164723.2F20A208D98@bastion.fedora.phx.redhat.com>

Package perl-Config-Record in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-Record



From pkgdb at fedoraproject.org  Wed Sep 10 16:47:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 16:47:37 +0000
Subject: [pkgdb] perl-Config-Record ownership updated
Message-ID: <20080910164737.E8400208D9C@bastion.fedora.phx.redhat.com>

Package perl-Config-Record in Fedora 9 is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-Record



From pertusus at fedoraproject.org  Wed Sep 10 16:51:53 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Wed, 10 Sep 2008 16:51:53 +0000 (UTC)
Subject: rpms/libdap/devel .cvsignore, 1.10, 1.11 libdap.spec, 1.22,
	1.23 sources, 1.10, 1.11
Message-ID: <20080910165154.046017012C@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libdap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28080

Modified Files:
	.cvsignore libdap.spec sources 
Log Message:
* Fri Sep  5 2008 Patrice Dumas <pertusus at free.fr> 3.8.2-1
- update to 3.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libdap/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	1 Jan 2008 22:46:38 -0000	1.10
+++ .cvsignore	10 Sep 2008 16:51:23 -0000	1.11
@@ -1 +1 @@
-libdap-3.7.10.tar.gz
+libdap-3.8.2.tar.gz


Index: libdap.spec
===================================================================
RCS file: /cvs/extras/rpms/libdap/devel/libdap.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libdap.spec	19 Feb 2008 18:20:18 -0000	1.22
+++ libdap.spec	10 Sep 2008 16:51:23 -0000	1.23
@@ -1,7 +1,7 @@
 Name: libdap
 Summary: The C++ DAP2 library from OPeNDAP
-Version: 3.7.10
-Release: 3%{?dist}
+Version: 3.8.2
+Release: 1%{?dist}
 
 # the deflate program is covered by the W3C license
 License: LGPLv2+ and W3C
@@ -9,8 +9,6 @@
 URL: http://www.opendap.org/
 Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz
 
-Patch0: libdap-3.7.8-nolibdir.patch
-
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Mandrake
@@ -60,7 +58,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .nolibdir
 iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
 mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
@@ -76,7 +73,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
-rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+mv $RPM_BUILD_ROOT%{_bindir}/dap-config-pkgconfig $RPM_BUILD_ROOT%{_bindir}/dap-config
 
 rm -rf __dist_docs
 cp -pr docs __dist_docs
@@ -122,6 +120,12 @@
 
 
 %changelog
+* Fri Sep  5 2008 Patrice Dumas <pertusus at free.fr> 3.8.2-1
+- update to 3.8.2
+
+* Sun Mar 16 2008 Patrice Dumas <pertusus at free.fr> 3.8.0-1
+- update to 3.8.0
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.7.10-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libdap/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	1 Jan 2008 22:46:38 -0000	1.10
+++ sources	10 Sep 2008 16:51:23 -0000	1.11
@@ -1 +1 @@
-28c6b6ce6b8d1ee8cc40ae8dacea9a3f  libdap-3.7.10.tar.gz
+0b6f6a1bfb6d64d87395c6581e562178  libdap-3.8.2.tar.gz



From cebbert at fedoraproject.org  Wed Sep 10 16:52:50 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed, 10 Sep 2008 16:52:50 +0000 (UTC)
Subject: rpms/kernel/F-8
	linux-2.6-netdev-e1000e-add-support-for-82567lm-4.patch, NONE,
	1.1 kernel.spec, 1.527, 1.528
Message-ID: <20080910165250.A44577012C@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28380

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-netdev-e1000e-add-support-for-82567lm-4.patch 
Log Message:
Add support for 82567LM-4 to the e1000e driver (F9#461438)

linux-2.6-netdev-e1000e-add-support-for-82567lm-4.patch:

--- NEW FILE linux-2.6-netdev-e1000e-add-support-for-82567lm-4.patch ---
From: Bruce Allan <bruce.w.allan at intel.com>
Date: Wed, 27 Aug 2008 01:36:36 +0000 (-0700)
Subject: e1000e: add support for the 82567LM-4 device
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdavem%2Fnet-next-2.6.git;a=commitdiff_plain;h=2f15f9d60190a62bc8ac50fa84fea31fc0b00ecf

e1000e: add support for the 82567LM-4 device

Enable PCI device ID for a new combination of MAC and PHY already supported
in the driver.

Signed-off-by: Bruce Allan <bruce.w.allan at intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---

https://bugzilla.redhat.com/show_bug.cgi?id=461438

diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index 74f263a..d0e7b46 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -346,6 +346,7 @@ enum e1e_registers {
 #define E1000_DEV_ID_ICH8_IFE_G			0x10C5
 #define E1000_DEV_ID_ICH8_IGP_M			0x104D
 #define E1000_DEV_ID_ICH9_IGP_AMT		0x10BD
+#define E1000_DEV_ID_ICH9_BM			0x10E5
 #define E1000_DEV_ID_ICH9_IGP_M_AMT		0x10F5
 #define E1000_DEV_ID_ICH9_IGP_M			0x10BF
 #define E1000_DEV_ID_ICH9_IGP_M_V		0x10CB
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index 9e38452..b5fc2c9 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -44,6 +44,7 @@
  * 82567LF-2 Gigabit Network Connection
  * 82567V-2 Gigabit Network Connection
  * 82562GT-3 10/100 Network Connection
+ * 82567LM-4 Gigabit Network Connection
  */
 
 #include <linux/netdevice.h>
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index d266510..c3d7411 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4767,6 +4767,7 @@ static struct pci_device_id e1000_pci_tbl[] = {
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_GT), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_AMT), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_C), board_ich9lan },
+	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_BM), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_AMT), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_V), board_ich9lan },


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.527
retrieving revision 1.528
diff -u -r1.527 -r1.528
--- kernel.spec	9 Sep 2008 05:42:01 -0000	1.527
+++ kernel.spec	10 Sep 2008 16:52:20 -0000	1.528
@@ -656,6 +656,7 @@
 Patch725: linux-2.6-netdev-atl2.patch
 Patch726: linux-2.6-netdev-atl1e.patch
 Patch727: linux-2.6-e1000-ich9.patch
+Patch728: linux-2.6-netdev-e1000e-add-support-for-82567lm-4.patch
 
 #ACPI
 Patch800: linux-2.6-acpi-processor-use-signed-int.patch
@@ -1186,6 +1187,8 @@
 ApplyPatch linux-2.6-netdev-atl2.patch
 # add atl1e network driver for eeepc 901
 ApplyPatch linux-2.6-netdev-atl1e.patch
+# add new mac/phy already supported in the driver
+ApplyPatch linux-2.6-netdev-e1000e-add-support-for-82567lm-4.patch
 
 # ACPI/PM patches
 # fix obvious thinko
@@ -1823,6 +1826,9 @@
 
 
 %changelog
+* Wed Sep 10 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-18
+- Add support for 82567LM-4 to the e1000e driver (F9#461438)
+
 * Mon Sep 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-17
 - HPET fixes from 2.6.27
 



From pertusus at fedoraproject.org  Wed Sep 10 16:53:32 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Wed, 10 Sep 2008 16:53:32 +0000 (UTC)
Subject: rpms/libnc-dap/devel libnc-dap-3.7.3-template.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 libnc-dap.spec, 1.23, 1.24 sources, 1.5, 1.6
Message-ID: <20080910165332.D5C2B7012C@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libnc-dap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28637

Modified Files:
	.cvsignore libnc-dap.spec sources 
Added Files:
	libnc-dap-3.7.3-template.patch 
Log Message:
* Tue Sep  9 2008 Patrice Dumas <pertusus at free.fr> 3.7.3-1
- update to 3.7.3


libnc-dap-3.7.3-template.patch:

--- NEW FILE libnc-dap-3.7.3-template.patch ---
diff -up libnc-dap-3.7.3/nc_util.cc.template libnc-dap-3.7.3/nc_util.cc
--- libnc-dap-3.7.3/nc_util.cc.template	2008-09-09 22:41:12.000000000 +0200
+++ libnc-dap-3.7.3/nc_util.cc	2008-09-09 22:42:56.000000000 +0200
@@ -58,6 +58,8 @@ static char rcsid[] not_used =
 #include "NCSequence.h"
 #include "NCStructure.h"
 
+#include "Connections.cc"
+
 // When flattening attributes during the translation process, use this to
 // separate the container name from the attribute name.
 const char attr_separator[] = { ":" };


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnc-dap/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 May 2007 11:36:12 -0000	1.5
+++ .cvsignore	10 Sep 2008 16:53:02 -0000	1.6
@@ -1 +1 @@
-libnc-dap-3.7.0.tar.gz
+libnc-dap-3.7.3.tar.gz


Index: libnc-dap.spec
===================================================================
RCS file: /cvs/extras/rpms/libnc-dap/devel/libnc-dap.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libnc-dap.spec	4 Sep 2008 15:50:06 -0000	1.23
+++ libnc-dap.spec	10 Sep 2008 16:53:02 -0000	1.24
@@ -1,19 +1,20 @@
 Name: libnc-dap
 Summary: The NetCDF interface to DAP-2 from OPeNDAP
-Version: 3.7.0
-Release: 11%{?dist}
+Version: 3.7.3
+Release: 1%{?dist}
 
 Group: Development/Libraries
 # ncdump, netcdf headers, lnetcdf are coverd by a BSD/MIT-like license
 # but they are linked statically against libnc-dap
 License: LGPLv2+
 URL: http://www.opendap.org/
-Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz 
-Patch0: libnc-dap-3.7.0-nolibdir.patch
-Patch1: libnc-dap-3.7.0-gcc43.patch
+Source0: http://www.opendap.org/pub/source/libnc-dap-%{version}.tar.gz
+Patch0:  libnc-dap-3.7.3-template.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libdap-devel >= 3.7.3 gcc-gfortran
+BuildRequires: libdap-devel >= 3.8.0 gcc-gfortran
+BuildRequires: pkgconfig
+
 
 %description
 The libnc-dap library is a call-for-call replacement for netcdf. It can 
@@ -29,7 +30,8 @@
 Summary: Development files and header files from libnc-dap
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libdap-devel >= 3.7.0
+Requires: libdap-devel >= 3.8.0
+Requires: pkgconfig
 # for /usr/share/aclocal owning
 Requires: automake
 
@@ -39,8 +41,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .nolibdir
-%patch1 -p1 -b .gcc43
+%patch0 -p1 -b .template
 rm -rf netcdf/.svn
 
 %build
@@ -52,6 +53,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
+mv  $RPM_BUILD_ROOT%{_bindir}/ncdap-config-pkgconfig $RPM_BUILD_ROOT%{_bindir}/ncdap-config
+
 mv $RPM_BUILD_ROOT%{_bindir}/ncdump $RPM_BUILD_ROOT%{_bindir}/dncdump
 
 %clean
@@ -70,12 +73,16 @@
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libnc-dap.so
+%{_libdir}/pkgconfig/libnc-dap.pc
 %{_bindir}/ncdap-config
 %{_includedir}/libnc-dap/
 %{_datadir}/aclocal/*
 
 
 %changelog
+* Tue Sep  9 2008 Patrice Dumas <pertusus at free.fr> 3.7.3-1
+- update to 3.7.3
+
 * Thu Sep  4 2008 Patrice Dumas <pertusus at free.fr> 3.7.0-11
 - gcc 4.3 patch for missing include files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnc-dap/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 May 2007 11:36:12 -0000	1.5
+++ sources	10 Sep 2008 16:53:02 -0000	1.6
@@ -1 +1 @@
-cb1c518725e1b2bb6078a691a2377eea  libnc-dap-3.7.0.tar.gz
+b69f3fb1b26b65903e41c2aa832cab34  libnc-dap-3.7.3.tar.gz



From pertusus at fedoraproject.org  Wed Sep 10 16:55:22 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Wed, 10 Sep 2008 16:55:22 +0000 (UTC)
Subject: rpms/bes/devel bes-3.6.2-gcc43.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 bes.spec, 1.9, 1.10 sources, 1.3, 1.4
Message-ID: <20080910165522.84AA67012C@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/bes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28846

Modified Files:
	.cvsignore bes.spec sources 
Added Files:
	bes-3.6.2-gcc43.patch 
Log Message:
* Fri Sep  5 2008 Patrice Dumas <pertusus at free.fr> 3.6.2-1
- update to 3.6.2


bes-3.6.2-gcc43.patch:

--- NEW FILE bes-3.6.2-gcc43.patch ---
diff -up bes-3.6.2/dispatch/BESStopWatch.cc.gcc43 bes-3.6.2/dispatch/BESStopWatch.cc
--- bes-3.6.2/dispatch/BESStopWatch.cc.gcc43	2008-09-05 16:50:29.000000000 +0200
+++ bes-3.6.2/dispatch/BESStopWatch.cc	2008-09-05 16:50:43.000000000 +0200
@@ -33,6 +33,7 @@
 #include <cerrno>
 #include <string>
 #include <iostream>
+#include <cstring>
 
 using std::string ;
 using std::cerr ;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bes/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jan 2008 00:19:54 -0000	1.3
+++ .cvsignore	10 Sep 2008 16:54:52 -0000	1.4
@@ -1 +1 @@
-bes-3.5.3.tar.gz
+bes-3.6.2.tar.gz


Index: bes.spec
===================================================================
RCS file: /cvs/extras/rpms/bes/devel/bes.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bes.spec	19 Feb 2008 17:58:43 -0000	1.9
+++ bes.spec	10 Sep 2008 16:54:52 -0000	1.10
@@ -5,24 +5,25 @@
 %define besgroup %{name}
 
 Name:           bes
-Version:        3.5.3
-Release:        4%{?dist}
+Version:        3.6.2
+Release:        1%{?dist}
 Summary:        Back-end server software framework for OPeNDAP
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.opendap.org/download/BES.html
 Source0:        http://www.opendap.org/pub/source/bes-%{version}.tar.gz
+Patch0:         bes-3.6.2-gcc43.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libdap-devel >= 3.7.10
+BuildRequires:  libdap-devel >= 3.8.0
 BuildRequires:  readline-devel
+BuildRequires:  bzip2-devel zlib-devel
 # needed by ppt
 BuildRequires:  openssl-devel
-BuildRequires:  doxygen graphviz
 BuildRequires:  pkgconfig
-Requires:       bzip2 gzip
+BuildRequires:  doxygen graphviz
 Requires(pre): shadow-utils
 
 %description
@@ -41,11 +42,10 @@
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       libdap-devel >= 3.7.10
-# in bes-config --libs
-Requires:       openssl-devel zlib-devel
+Requires:       libdap-devel >= 3.8.0
 # for the /usr/share/aclocal directory ownership
 Requires:       automake
+Requires:       openssl-devel, bzip2-devel, zlib-devel
 Requires:       pkgconfig
 
 %description    devel
@@ -63,6 +63,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gcc43
 chmod a-x dispatch/BESStreamResponseHandler*
 
 %build
@@ -98,6 +99,7 @@
 mkdir -p $RPM_BUILD_ROOT%{bescachedir}
 mkdir -p $RPM_BUILD_ROOT%{bespkidir}/{cacerts,public}
 mkdir -p $RPM_BUILD_ROOT%{beslogdir}
+mv $RPM_BUILD_ROOT%{_bindir}/bes-config-pkgconfig $RPM_BUILD_ROOT%{_bindir}/bes-config
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -126,6 +128,7 @@
 %{_datadir}/bes/*.txt
 %{_bindir}/beslistener
 %{_bindir}/besdaemon
+%{_bindir}/besstandalone
 %{_bindir}/besctl
 %{_bindir}/hyraxctl
 %{_bindir}/besregtest
@@ -143,6 +146,7 @@
 %{_bindir}/bes-config
 %{_includedir}/bes/
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/bes_*.pc
 %{_datadir}/bes/templates/
 %{_datadir}/aclocal/bes.m4
 
@@ -151,6 +155,9 @@
 %doc __distribution_docs/api-html/
 
 %changelog
+* Fri Sep  5 2008 Patrice Dumas <pertusus at free.fr> 3.6.2-1
+- update to 3.6.2
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.5.3-4
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bes/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jan 2008 00:19:54 -0000	1.3
+++ sources	10 Sep 2008 16:54:52 -0000	1.4
@@ -1 +1 @@
-919e686e8e5ac5c561b412795bd717de  bes-3.5.3.tar.gz
+7b1c4055179bfc584398c30434042346  bes-3.6.2.tar.gz



From pertusus at fedoraproject.org  Wed Sep 10 16:56:10 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Wed, 10 Sep 2008 16:56:10 +0000 (UTC)
Subject: rpms/dap-server/devel .cvsignore, 1.7, 1.8 dap-server.spec, 1.26,
	1.27 sources, 1.7, 1.8
Message-ID: <20080910165610.4D8A87012C@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/dap-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29049

Modified Files:
	.cvsignore dap-server.spec sources 
Log Message:
* Fri Sep  5 2008 Patrice Dumas <pertusus at free.fr> 3.8.5-1
- update to 3.8.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dap-server/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Jan 2008 00:23:20 -0000	1.7
+++ .cvsignore	10 Sep 2008 16:55:39 -0000	1.8
@@ -1 +1 @@
-dap-server-3.8.4.tar.gz
+dap-server-3.8.5.tar.gz


Index: dap-server.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-server/devel/dap-server.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- dap-server.spec	19 Feb 2008 18:08:43 -0000	1.26
+++ dap-server.spec	10 Sep 2008 16:55:40 -0000	1.27
@@ -7,16 +7,16 @@
 
 Summary:         Basic request handling for OPeNDAP servers 
 Name:            dap-server
-Version:         3.8.4
-Release:         3%{?dist}
+Version:         3.8.5
+Release:         1%{?dist}
 License:         LGPLv2+ and GPLv2+
 Group:           System Environment/Daemons 
 Source0:         http://www.opendap.org/pub/source/%{name}-%{version}.tar.gz
 URL:             http://www.opendap.org/
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:   libdap-devel >= 3.7.10
-BuildRequires:   bes-devel >= 3.5.3
+BuildRequires:   libdap-devel >= 3.8.0
+BuildRequires:   bes-devel >= 3.6.0
 # we use httpd and not webserver because we make use of the apache user. 
 Requires:        curl httpd
 Requires:        perl perl(HTML::Filter) perl(Time::Local) perl(POSIX)
@@ -108,8 +108,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING COPYRIGHT_URI EXAMPLE_OPENDAP_STATISTICS NEWS README.hyrax
-%doc README.cgi-server
+%doc COPYING COPYRIGHT_URI EXAMPLE_OPENDAP_STATISTICS NEWS README
 %doc __dist_doc/*
 %{_bindir}/bes-dap-data.sh
 %{_bindir}/dap_usage
@@ -132,6 +131,9 @@
 
 
 %changelog
+* Fri Sep  5 2008 Patrice Dumas <pertusus at free.fr> 3.8.5-1
+- update to 3.8.5
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.8.4-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dap-server/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Jan 2008 00:23:20 -0000	1.7
+++ sources	10 Sep 2008 16:55:40 -0000	1.8
@@ -1 +1 @@
-785f764229436cbffed52f4e96ffb8fc  dap-server-3.8.4.tar.gz
+df68adbed16ce772302ea1b5e092f210  dap-server-3.8.5.tar.gz



From pertusus at fedoraproject.org  Wed Sep 10 16:58:27 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Wed, 10 Sep 2008 16:58:27 +0000 (UTC)
Subject: rpms/dap-netcdf_handler/devel .cvsignore, 1.8,
	1.9 dap-netcdf_handler.spec, 1.17, 1.18 sources, 1.8, 1.9
Message-ID: <20080910165827.17CD37012C@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/dap-netcdf_handler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29223

Modified Files:
	.cvsignore dap-netcdf_handler.spec sources 
Log Message:
* Fri Sep  5 2008 Patrice Dumas <pertusus at free.fr> 3.7.9-1
- update to 3.7.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dap-netcdf_handler/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	2 Jan 2008 00:22:02 -0000	1.8
+++ .cvsignore	10 Sep 2008 16:57:56 -0000	1.9
@@ -1 +1 @@
-netcdf_handler-3.7.8.tar.gz
+netcdf_handler-3.7.9.tar.gz


Index: dap-netcdf_handler.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-netcdf_handler/devel/dap-netcdf_handler.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- dap-netcdf_handler.spec	19 Feb 2008 18:07:19 -0000	1.17
+++ dap-netcdf_handler.spec	10 Sep 2008 16:57:56 -0000	1.18
@@ -1,14 +1,14 @@
 Summary:         NetCDF 3 data handler for the OPeNDAP Data server
 Name:            dap-netcdf_handler
-Version:         3.7.8
-Release:         3%{?dist}
+Version:         3.7.9
+Release:         1%{?dist}
 License:         LGPLv2+
 Group:           System Environment/Daemons 
 Source0:         http://www.opendap.org/pub/source/netcdf_handler-%{version}.tar.gz
 URL:             http://www.opendap.org/
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:   libdap-devel >= 3.7.10 netcdf-devel
+BuildRequires:   libdap-devel >= 3.8.0 netcdf-devel
 BuildRequires:   bes-devel >= 3.5.3
 
 %description
@@ -48,6 +48,9 @@
 %doc COPYING COPYRIGHT NEWS README
 
 %changelog
+* Fri Sep  5 2008 Patrice Dumas <pertusus at free.fr> 3.7.9-1
+- update to 3.7.9
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.7.8-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dap-netcdf_handler/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Jan 2008 00:22:02 -0000	1.8
+++ sources	10 Sep 2008 16:57:56 -0000	1.9
@@ -1 +1 @@
-f93e720faada33b8f36d670c23a6e001  netcdf_handler-3.7.8.tar.gz
+3ad2f6d19eb793de96e4926dd3c31857  netcdf_handler-3.7.9.tar.gz



From markmc at fedoraproject.org  Wed Sep 10 17:00:29 2008
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 10 Sep 2008 17:00:29 +0000 (UTC)
Subject: rpms/kernel/devel
	linux-2.6-e1000e-add-support-for-82567LM-3-and-82567LF-3-ICH10D-parts.patch,
	NONE, 1.1 linux-2.6-e1000e-add-support-for-new-82574L-part.patch,
	NONE, 1.1 linux-2.6-e1000e-add-support-for-the-82567LM-4-device.patch,
	NONE, 1.1 kernel.spec, 1.944, 1.945
Message-ID: <20080910170029.3D3437012C@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29375

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-e1000e-add-support-for-82567LM-3-and-82567LF-3-ICH10D-parts.patch 
	linux-2.6-e1000e-add-support-for-new-82574L-part.patch 
	linux-2.6-e1000e-add-support-for-the-82567LM-4-device.patch 
Log Message:
* Wed Sep 10 2008 Mark McLoughlin <markmc at redhat.com>
- Pull in new e1000e hardware support (e.g. ich10) from net-next-2.6


linux-2.6-e1000e-add-support-for-82567LM-3-and-82567LF-3-ICH10D-parts.patch:

--- NEW FILE linux-2.6-e1000e-add-support-for-82567LM-3-and-82567LF-3-ICH10D-parts.patch ---
>From f4187b56e1f8a05dd110875d5094b21b51ebd79b Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan at intel.com>
Date: Tue, 26 Aug 2008 18:36:50 -0700
Subject: [PATCH 2/3] e1000e: add support for 82567LM-3 and 82567LF-3 (ICH10D) parts

Add support for new LOM devices on the latest generation ICHx platforms.

Signed-off-by: Bruce Allan <bruce.w.allan at intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---
 drivers/net/e1000e/defines.h |    2 +
 drivers/net/e1000e/e1000.h   |    3 +
 drivers/net/e1000e/ethtool.c |   22 +++++-
 drivers/net/e1000e/hw.h      |    3 +
 drivers/net/e1000e/ich8lan.c |  154 +++++++++++++++++++++++++++++++++++++++---
 drivers/net/e1000e/netdev.c  |   25 +++++++
 drivers/net/e1000e/phy.c     |   85 +++++++++++++++++++++++
 7 files changed, 280 insertions(+), 14 deletions(-)

diff --git a/drivers/net/e1000e/defines.h b/drivers/net/e1000e/defines.h
index 14b0e6c..4b21fa9 100644
--- a/drivers/net/e1000e/defines.h
+++ b/drivers/net/e1000e/defines.h
@@ -505,6 +505,7 @@
 #define NWAY_LPAR_ASM_DIR        0x0800 /* LP Asymmetric Pause Direction bit */
 
 /* Autoneg Expansion Register */
+#define NWAY_ER_LP_NWAY_CAPS     0x0001 /* LP has Auto Neg Capability */
 
 /* 1000BASE-T Control Register */
 #define CR_1000T_HD_CAPS         0x0100 /* Advertise 1000T HD capability */
@@ -540,6 +541,7 @@
 #define E1000_EECD_DO        0x00000008 /* NVM Data Out */
 #define E1000_EECD_REQ       0x00000040 /* NVM Access Request */
 #define E1000_EECD_GNT       0x00000080 /* NVM Access Grant */
+#define E1000_EECD_PRES      0x00000100 /* NVM Present */
 #define E1000_EECD_SIZE      0x00000200 /* NVM Size (0=64 word 1=256 word) */
 /* NVM Addressing bits based on type (0-small, 1-large) */
 #define E1000_EECD_ADDR_BITS 0x00000400
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index ac4e506..ef66dc4 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -98,6 +98,7 @@ enum e1000_boards {
 	board_80003es2lan,
 	board_ich8lan,
 	board_ich9lan,
+	board_ich10lan,
 };
 
 struct e1000_queue_stats {
@@ -374,6 +375,7 @@ extern struct e1000_info e1000_82572_info;
 extern struct e1000_info e1000_82573_info;
 extern struct e1000_info e1000_ich8_info;
 extern struct e1000_info e1000_ich9_info;
+extern struct e1000_info e1000_ich10_info;
 extern struct e1000_info e1000_es2_info;
 
 extern s32 e1000e_read_pba_num(struct e1000_hw *hw, u32 *pba_num);
@@ -446,6 +448,7 @@ extern s32 e1000e_get_cable_length_m88(struct e1000_hw *hw);
 extern s32 e1000e_get_phy_info_m88(struct e1000_hw *hw);
 extern s32 e1000e_read_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 *data);
 extern s32 e1000e_write_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 data);
+extern s32 e1000e_phy_init_script_igp3(struct e1000_hw *hw);
 extern enum e1000_phy_type e1000e_get_phy_type_from_id(u32 phy_id);
 extern s32 e1000e_determine_phy_address(struct e1000_hw *hw);
 extern s32 e1000e_write_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 data);
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index e21c9e0..a89498d 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -781,6 +781,7 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
 	case e1000_82573:
 	case e1000_ich8lan:
 	case e1000_ich9lan:
+	case e1000_ich10lan:
 		toggle = 0x7FFFF033;
 		break;
 	default:
@@ -833,7 +834,9 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
 	REG_PATTERN_TEST(E1000_TIDV, 0x0000FFFF, 0x0000FFFF);
 	for (i = 0; i < mac->rar_entry_count; i++)
 		REG_PATTERN_TEST_ARRAY(E1000_RA, ((i << 1) + 1),
-				       0x8003FFFF, 0xFFFFFFFF);
+				       ((mac->type == e1000_ich10lan) ?
+					   0x8007FFFF : 0x8003FFFF),
+				       0xFFFFFFFF);
 
 	for (i = 0; i < mac->mta_reg_count; i++)
 		REG_PATTERN_TEST_ARRAY(E1000_MTA, i, 0xFFFFFFFF, 0xFFFFFFFF);
@@ -905,12 +908,23 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
 
 	/* Test each interrupt */
 	for (i = 0; i < 10; i++) {
-		if ((adapter->flags & FLAG_IS_ICH) && (i == 8))
-			continue;
-
 		/* Interrupt to test */
 		mask = 1 << i;
 
+		if (adapter->flags & FLAG_IS_ICH) {
+			switch (mask) {
+			case E1000_ICR_RXSEQ:
+				continue;
+			case 0x00000100:
+				if (adapter->hw.mac.type == e1000_ich8lan ||
+				    adapter->hw.mac.type == e1000_ich9lan)
+					continue;
+				break;
+			default:
+				break;
+			}
+		}
+
 		if (!shared_int) {
 			/*
 			 * Disable the interrupt to be reported in
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index d0e7b46..5d2acc5 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -357,6 +357,8 @@ enum e1e_registers {
 #define E1000_DEV_ID_ICH10_R_BM_LM		0x10CC
 #define E1000_DEV_ID_ICH10_R_BM_LF		0x10CD
 #define E1000_DEV_ID_ICH10_R_BM_V		0x10CE
+#define E1000_DEV_ID_ICH10_D_BM_LM		0x10DE
+#define E1000_DEV_ID_ICH10_D_BM_LF		0x10DF
 
 #define E1000_FUNC_1 1
 
@@ -367,6 +369,7 @@ enum e1000_mac_type {
 	e1000_80003es2lan,
 	e1000_ich8lan,
 	e1000_ich9lan,
+	e1000_ich10lan,
 };
 
 enum e1000_media_type {
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index b5fc2c9..0e76bb0 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -43,7 +43,8 @@
  * 82567LM-2 Gigabit Network Connection
  * 82567LF-2 Gigabit Network Connection
  * 82567V-2 Gigabit Network Connection
- * 82562GT-3 10/100 Network Connection
+ * 82567LF-3 Gigabit Network Connection
+ * 82567LM-3 Gigabit Network Connection
  * 82567LM-4 Gigabit Network Connection
  */
 
@@ -158,12 +159,15 @@ static s32 e1000_check_polarity_ife_ich8lan(struct e1000_hw *hw);
 static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank);
 static s32 e1000_retry_write_flash_byte_ich8lan(struct e1000_hw *hw,
 						u32 offset, u8 byte);
+static s32 e1000_read_flash_byte_ich8lan(struct e1000_hw *hw, u32 offset,
+					 u8 *data);
 static s32 e1000_read_flash_word_ich8lan(struct e1000_hw *hw, u32 offset,
 					 u16 *data);
 static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
 					 u8 size, u16 *data);
 static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw);
 static s32 e1000_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw);
+static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw);
 
 static inline u16 __er16flash(struct e1000_hw *hw, unsigned long reg)
 {
@@ -898,6 +902,56 @@ static s32 e1000_set_d3_lplu_state_ich8lan(struct e1000_hw *hw, bool active)
 }
 
 /**
+ *  e1000_valid_nvm_bank_detect_ich8lan - finds out the valid bank 0 or 1
+ *  @hw: pointer to the HW structure
+ *  @bank:  pointer to the variable that returns the active bank
+ *
+ *  Reads signature byte from the NVM using the flash access registers.
+ **/
+static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank)
+{
+	struct e1000_nvm_info *nvm = &hw->nvm;
+	/* flash bank size is in words */
+	u32 bank1_offset = nvm->flash_bank_size * sizeof(u16);
+	u32 act_offset = E1000_ICH_NVM_SIG_WORD * 2 + 1;
+	u8 bank_high_byte = 0;
+
+	if (hw->mac.type != e1000_ich10lan) {
+		if (er32(EECD) & E1000_EECD_SEC1VAL)
+			*bank = 1;
+		else
+			*bank = 0;
+	} else {
+		/*
+		 * Make sure the signature for bank 0 is valid,
+		 * if not check for bank1
+		 */
+		e1000_read_flash_byte_ich8lan(hw, act_offset, &bank_high_byte);
+		if ((bank_high_byte & 0xC0) == 0x80) {
+			*bank = 0;
+		} else {
+			/*
+			 * find if segment 1 is valid by verifying
+			 * bit 15:14 = 10b in word 0x13
+			 */
+			e1000_read_flash_byte_ich8lan(hw,
+						      act_offset + bank1_offset,
+						      &bank_high_byte);
+
+			/* bank1 has a valid signature equivalent to SEC1V */
+			if ((bank_high_byte & 0xC0) == 0x80) {
+				*bank = 1;
+			} else {
+				hw_dbg(hw, "ERROR: EEPROM not present\n");
+				return -E1000_ERR_NVM;
+			}
+		}
+	}
+
+	return 0;
+}
+
+/**
  *  e1000_read_nvm_ich8lan - Read word(s) from the NVM
  *  @hw: pointer to the HW structure
  *  @offset: The offset (in bytes) of the word(s) to read.
@@ -913,6 +967,7 @@ static s32 e1000_read_nvm_ich8lan(struct e1000_hw *hw, u16 offset, u16 words,
 	struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
 	u32 act_offset;
 	s32 ret_val;
+	u32 bank = 0;
 	u16 i, word;
 
 	if ((offset >= nvm->word_size) || (words > nvm->word_size - offset) ||
@@ -925,10 +980,11 @@ static s32 e1000_read_nvm_ich8lan(struct e1000_hw *hw, u16 offset, u16 words,
 	if (ret_val)
 		return ret_val;
 
-	/* Start with the bank offset, then add the relative offset. */
-	act_offset = (er32(EECD) & E1000_EECD_SEC1VAL)
-		     ? nvm->flash_bank_size
-		     : 0;
+	ret_val = e1000_valid_nvm_bank_detect_ich8lan(hw, &bank);
+	if (ret_val)
+		return ret_val;
+
+	act_offset = (bank) ? nvm->flash_bank_size : 0;
 	act_offset += offset;
 
 	for (i = 0; i < words; i++) {
@@ -1076,6 +1132,29 @@ static s32 e1000_read_flash_word_ich8lan(struct e1000_hw *hw, u32 offset,
 }
 
 /**
+ *  e1000_read_flash_byte_ich8lan - Read byte from flash
+ *  @hw: pointer to the HW structure
+ *  @offset: The offset of the byte to read.
+ *  @data: Pointer to a byte to store the value read.
+ *
+ *  Reads a single byte from the NVM using the flash access registers.
+ **/
+static s32 e1000_read_flash_byte_ich8lan(struct e1000_hw *hw, u32 offset,
+					 u8 *data)
+{
+	s32 ret_val;
+	u16 word = 0;
+
+	ret_val = e1000_read_flash_data_ich8lan(hw, offset, 1, &word);
+	if (ret_val)
+		return ret_val;
+
+	*data = (u8)word;
+
+	return 0;
+}
+
+/**
  *  e1000_read_flash_data_ich8lan - Read byte or word from NVM
  *  @hw: pointer to the HW structure
  *  @offset: The offset (in bytes) of the byte or word to read.
@@ -1206,7 +1285,7 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
 {
 	struct e1000_nvm_info *nvm = &hw->nvm;
 	struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
-	u32 i, act_offset, new_bank_offset, old_bank_offset;
+	u32 i, act_offset, new_bank_offset, old_bank_offset, bank;
 	s32 ret_val;
 	u16 data;
 
@@ -1226,7 +1305,11 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
 	 * write to bank 0 etc.  We also need to erase the segment that
 	 * is going to be written
 	 */
-	if (!(er32(EECD) & E1000_EECD_SEC1VAL)) {
+	ret_val =  e1000_valid_nvm_bank_detect_ich8lan(hw, &bank);
+	if (ret_val)
+		return ret_val;
+
+	if (bank == 0) {
 		new_bank_offset = nvm->flash_bank_size;
 		old_bank_offset = 0;
 		e1000_erase_flash_bank_ich8lan(hw, 1);
@@ -2190,13 +2273,14 @@ void e1000e_gig_downshift_workaround_ich8lan(struct e1000_hw *hw)
  *  'LPLU Enabled' and 'Gig Disable' to force link speed negotiation
  *  to a lower speed.
  *
- *  Should only be called for ICH9 devices.
+ *  Should only be called for ICH9 and ICH10 devices.
  **/
 void e1000e_disable_gig_wol_ich8lan(struct e1000_hw *hw)
 {
 	u32 phy_ctrl;
 
-	if (hw->mac.type == e1000_ich9lan) {
+	if ((hw->mac.type == e1000_ich10lan) ||
+	    (hw->mac.type == e1000_ich9lan)) {
 		phy_ctrl = er32(PHY_CTRL);
 		phy_ctrl |= E1000_PHY_CTRL_D0A_LPLU |
 		            E1000_PHY_CTRL_GBE_DISABLE;
@@ -2254,6 +2338,39 @@ static s32 e1000_led_off_ich8lan(struct e1000_hw *hw)
 }
 
 /**
+ *  e1000_get_cfg_done_ich8lan - Read config done bit
+ *  @hw: pointer to the HW structure
+ *
+ *  Read the management control register for the config done bit for
+ *  completion status.  NOTE: silicon which is EEPROM-less will fail trying
+ *  to read the config done bit, so an error is *ONLY* logged and returns
+ *  E1000_SUCCESS.  If we were to return with error, EEPROM-less silicon
+ *  would not be able to be reset or change link.
+ **/
+static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw)
+{
+	u32 bank = 0;
+
+	e1000e_get_cfg_done(hw);
+
+	/* If EEPROM is not marked present, init the IGP 3 PHY manually */
+	if (hw->mac.type != e1000_ich10lan) {
+		if (((er32(EECD) & E1000_EECD_PRES) == 0) &&
+		    (hw->phy.type == e1000_phy_igp_3)) {
+			e1000e_phy_init_script_igp3(hw);
+		}
+	} else {
+		if (e1000_valid_nvm_bank_detect_ich8lan(hw, &bank)) {
+			/* Maybe we should do a basic PHY config */
+			hw_dbg(hw, "EEPROM not present\n");
+			return -E1000_ERR_CONFIG;
+		}
+	}
+
+	return 0;
+}
+
+/**
  *  e1000_clear_hw_cntrs_ich8lan - Clear statistical counters
  *  @hw: pointer to the HW structure
  *
@@ -2303,7 +2420,7 @@ static struct e1000_phy_operations ich8_phy_ops = {
 	.check_reset_block	= e1000_check_reset_block_ich8lan,
 	.commit_phy		= NULL,
 	.force_speed_duplex	= e1000_phy_force_speed_duplex_ich8lan,
-	.get_cfg_done		= e1000e_get_cfg_done,
+	.get_cfg_done		= e1000_get_cfg_done_ich8lan,
 	.get_cable_length	= e1000e_get_cable_length_igp_2,
 	.get_phy_info		= e1000_get_phy_info_ich8lan,
 	.read_phy_reg		= e1000e_read_phy_reg_igp,
@@ -2358,3 +2475,20 @@ struct e1000_info e1000_ich9_info = {
 	.nvm_ops		= &ich8_nvm_ops,
 };
 
+struct e1000_info e1000_ich10_info = {
+	.mac			= e1000_ich10lan,
+	.flags			= FLAG_HAS_JUMBO_FRAMES
+				  | FLAG_IS_ICH
+				  | FLAG_HAS_WOL
+				  | FLAG_RX_CSUM_ENABLED
+				  | FLAG_HAS_CTRLEXT_ON_LOAD
+				  | FLAG_HAS_AMT
+				  | FLAG_HAS_ERT
+				  | FLAG_HAS_FLASH
+				  | FLAG_APME_IN_WUC,
+	.pba			= 10,
+	.get_variants		= e1000_get_variants_ich8lan,
+	.mac_ops		= &ich8_mac_ops,
+	.phy_ops		= &ich8_phy_ops,
+	.nvm_ops		= &ich8_nvm_ops,
+};
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index c3d7411..2d9bcb0 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -58,6 +58,7 @@ static const struct e1000_info *e1000_info_tbl[] = {
 	[board_80003es2lan]	= &e1000_es2_info,
 	[board_ich8lan]		= &e1000_ich8_info,
 	[board_ich9lan]		= &e1000_ich9_info,
+	[board_ich10lan]	= &e1000_ich10_info,
 };
 
 #ifdef DEBUG
@@ -3201,6 +3202,27 @@ static void e1000_watchdog_task(struct work_struct *work)
 						   &adapter->link_duplex);
 			e1000_print_link_info(adapter);
 			/*
+			 * On supported PHYs, check for duplex mismatch only
+			 * if link has autonegotiated at 10/100 half
+			 */
+			if ((hw->phy.type == e1000_phy_igp_3 ||
+			     hw->phy.type == e1000_phy_bm) &&
+			    (hw->mac.autoneg == true) &&
+			    (adapter->link_speed == SPEED_10 ||
+			     adapter->link_speed == SPEED_100) &&
+			    (adapter->link_duplex == HALF_DUPLEX)) {
+				u16 autoneg_exp;
+
+				e1e_rphy(hw, PHY_AUTONEG_EXP, &autoneg_exp);
+
+				if (!(autoneg_exp & NWAY_ER_LP_NWAY_CAPS))
+					e_info("Autonegotiated half duplex but"
+					       " link partner cannot autoneg. "
+					       " Try forcing full duplex if "
+					       "link gets many collisions.\n");
+			}
+
+			/*
 			 * tweak tx_queue_len according to speed/duplex
 			 * and adjust the timeout factor
 			 */
@@ -4776,6 +4798,9 @@ static struct pci_device_id e1000_pci_tbl[] = {
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LF), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_V), board_ich9lan },
 
+	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_LM), board_ich10lan },
+	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_LF), board_ich10lan },
+
 	{ }	/* terminate list */
 };
 MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
index b133dcf..16724f8 100644
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@ -1720,6 +1720,91 @@ s32 e1000e_get_cfg_done(struct e1000_hw *hw)
 	return 0;
 }
 
+/**
+ *  e1000e_phy_init_script_igp3 - Inits the IGP3 PHY
+ *  @hw: pointer to the HW structure
+ *
+ *  Initializes a Intel Gigabit PHY3 when an EEPROM is not present.
+ **/
+s32 e1000e_phy_init_script_igp3(struct e1000_hw *hw)
+{
+	hw_dbg(hw, "Running IGP 3 PHY init script\n");
+
+	/* PHY init IGP 3 */
+	/* Enable rise/fall, 10-mode work in class-A */
+	e1e_wphy(hw, 0x2F5B, 0x9018);
+	/* Remove all caps from Replica path filter */
+	e1e_wphy(hw, 0x2F52, 0x0000);
+	/* Bias trimming for ADC, AFE and Driver (Default) */
+	e1e_wphy(hw, 0x2FB1, 0x8B24);
+	/* Increase Hybrid poly bias */
+	e1e_wphy(hw, 0x2FB2, 0xF8F0);
+	/* Add 4% to Tx amplitude in Gig mode */
+	e1e_wphy(hw, 0x2010, 0x10B0);
+	/* Disable trimming (TTT) */
+	e1e_wphy(hw, 0x2011, 0x0000);
+	/* Poly DC correction to 94.6% + 2% for all channels */
+	e1e_wphy(hw, 0x20DD, 0x249A);
+	/* ABS DC correction to 95.9% */
+	e1e_wphy(hw, 0x20DE, 0x00D3);
+	/* BG temp curve trim */
+	e1e_wphy(hw, 0x28B4, 0x04CE);
+	/* Increasing ADC OPAMP stage 1 currents to max */
+	e1e_wphy(hw, 0x2F70, 0x29E4);
+	/* Force 1000 ( required for enabling PHY regs configuration) */
+	e1e_wphy(hw, 0x0000, 0x0140);
+	/* Set upd_freq to 6 */
+	e1e_wphy(hw, 0x1F30, 0x1606);
+	/* Disable NPDFE */
+	e1e_wphy(hw, 0x1F31, 0xB814);
+	/* Disable adaptive fixed FFE (Default) */
+	e1e_wphy(hw, 0x1F35, 0x002A);
+	/* Enable FFE hysteresis */
+	e1e_wphy(hw, 0x1F3E, 0x0067);
+	/* Fixed FFE for short cable lengths */
+	e1e_wphy(hw, 0x1F54, 0x0065);
+	/* Fixed FFE for medium cable lengths */
+	e1e_wphy(hw, 0x1F55, 0x002A);
+	/* Fixed FFE for long cable lengths */
+	e1e_wphy(hw, 0x1F56, 0x002A);
+	/* Enable Adaptive Clip Threshold */
+	e1e_wphy(hw, 0x1F72, 0x3FB0);
+	/* AHT reset limit to 1 */
+	e1e_wphy(hw, 0x1F76, 0xC0FF);
+	/* Set AHT master delay to 127 msec */
+	e1e_wphy(hw, 0x1F77, 0x1DEC);
+	/* Set scan bits for AHT */
+	e1e_wphy(hw, 0x1F78, 0xF9EF);
+	/* Set AHT Preset bits */
+	e1e_wphy(hw, 0x1F79, 0x0210);
+	/* Change integ_factor of channel A to 3 */
+	e1e_wphy(hw, 0x1895, 0x0003);
+	/* Change prop_factor of channels BCD to 8 */
+	e1e_wphy(hw, 0x1796, 0x0008);
+	/* Change cg_icount + enable integbp for channels BCD */
+	e1e_wphy(hw, 0x1798, 0xD008);
+	/*
+	 * Change cg_icount + enable integbp + change prop_factor_master
+	 * to 8 for channel A
+	 */
+	e1e_wphy(hw, 0x1898, 0xD918);
+	/* Disable AHT in Slave mode on channel A */
+	e1e_wphy(hw, 0x187A, 0x0800);
+	/*
+	 * Enable LPLU and disable AN to 1000 in non-D0a states,
+	 * Enable SPD+B2B
+	 */
+	e1e_wphy(hw, 0x0019, 0x008D);
+	/* Enable restart AN on an1000_dis change */
+	e1e_wphy(hw, 0x001B, 0x2080);
+	/* Enable wh_fifo read clock in 10/100 modes */
+	e1e_wphy(hw, 0x0014, 0x0045);
+	/* Restart AN, Speed selection is 1000 */
+	e1e_wphy(hw, 0x0000, 0x1340);
+
+	return 0;
+}
+
 /* Internal function pointers */
 
 /**
-- 
1.5.4.1


linux-2.6-e1000e-add-support-for-new-82574L-part.patch:

--- NEW FILE linux-2.6-e1000e-add-support-for-new-82574L-part.patch ---
>From 4662e82b2cb41c60826e50474dd86dd5c6372b0c Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan at intel.com>
Date: Tue, 26 Aug 2008 18:37:06 -0700
Subject: [PATCH 3/3] e1000e: add support for new 82574L part

This new part has the same feature set as previous parts with the addition
of MSI-X support.

Signed-off-by: Bruce Allan <bruce.w.allan at intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---
 drivers/net/e1000e/82571.c   |  153 ++++++++++++++--
 drivers/net/e1000e/defines.h |   13 ++
 drivers/net/e1000e/e1000.h   |   28 +++-
 drivers/net/e1000e/es2lan.c  |    2 +-
 drivers/net/e1000e/ethtool.c |   38 +++-
 drivers/net/e1000e/hw.h      |   11 +-
 drivers/net/e1000e/ich8lan.c |   18 ++-
 drivers/net/e1000e/lib.c     |    7 +-
 drivers/net/e1000e/netdev.c  |  409 +++++++++++++++++++++++++++++++++++++-----
 drivers/net/e1000e/param.c   |   27 +++
 drivers/net/e1000e/phy.c     |  109 +++++++++++-
 11 files changed, 738 insertions(+), 77 deletions(-)

diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index 462351c..b2c910c 100644
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/e1000e/82571.c
@@ -38,6 +38,7 @@
  * 82573V Gigabit Ethernet Controller (Copper)
  * 82573E Gigabit Ethernet Controller (Copper)
  * 82573L Gigabit Ethernet Controller
+ * 82574L Gigabit Network Connection
  */
 
 #include <linux/netdevice.h>
@@ -54,6 +55,8 @@
 
 #define E1000_GCR_L1_ACT_WITHOUT_L0S_RX 0x08000000
 
+#define E1000_NVM_INIT_CTRL2_MNGM 0x6000 /* Manageability Operation Mode mask */
+
 static s32 e1000_get_phy_id_82571(struct e1000_hw *hw);
 static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw);
 static s32 e1000_setup_fiber_serdes_link_82571(struct e1000_hw *hw);
@@ -63,6 +66,8 @@ static s32 e1000_fix_nvm_checksum_82571(struct e1000_hw *hw);
 static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw);
 static s32 e1000_setup_link_82571(struct e1000_hw *hw);
 static void e1000_clear_hw_cntrs_82571(struct e1000_hw *hw);
+static bool e1000_check_mng_mode_82574(struct e1000_hw *hw);
+static s32 e1000_led_on_82574(struct e1000_hw *hw);
 
 /**
  *  e1000_init_phy_params_82571 - Init PHY func ptrs.
@@ -92,6 +97,9 @@ static s32 e1000_init_phy_params_82571(struct e1000_hw *hw)
 	case e1000_82573:
 		phy->type		 = e1000_phy_m88;
 		break;
+	case e1000_82574:
+		phy->type		 = e1000_phy_bm;
+		break;
 	default:
 		return -E1000_ERR_PHY;
 		break;
@@ -111,6 +119,10 @@ static s32 e1000_init_phy_params_82571(struct e1000_hw *hw)
 		if (phy->id != M88E1111_I_PHY_ID)
 			return -E1000_ERR_PHY;
 		break;
+	case e1000_82574:
+		if (phy->id != BME1000_E_PHY_ID_R2)
+			return -E1000_ERR_PHY;
+		break;
 	default:
 		return -E1000_ERR_PHY;
 		break;
@@ -150,6 +162,7 @@ static s32 e1000_init_nvm_params_82571(struct e1000_hw *hw)
 
 	switch (hw->mac.type) {
 	case e1000_82573:
+	case e1000_82574:
 		if (((eecd >> 15) & 0x3) == 0x3) {
 			nvm->type = e1000_nvm_flash_hw;
 			nvm->word_size = 2048;
@@ -245,6 +258,17 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
 		break;
 	}
 
+	switch (hw->mac.type) {
+	case e1000_82574:
+		func->check_mng_mode = e1000_check_mng_mode_82574;
+		func->led_on = e1000_led_on_82574;
+		break;
+	default:
+		func->check_mng_mode = e1000e_check_mng_mode_generic;
+		func->led_on = e1000e_led_on_generic;
+		break;
+	}
+
 	return 0;
 }
 
@@ -330,6 +354,8 @@ static s32 e1000_get_variants_82571(struct e1000_adapter *adapter)
 static s32 e1000_get_phy_id_82571(struct e1000_hw *hw)
 {
 	struct e1000_phy_info *phy = &hw->phy;
+	s32 ret_val;
+	u16 phy_id = 0;
 
 	switch (hw->mac.type) {
 	case e1000_82571:
@@ -345,6 +371,20 @@ static s32 e1000_get_phy_id_82571(struct e1000_hw *hw)
 	case e1000_82573:
 		return e1000e_get_phy_id(hw);
 		break;
+	case e1000_82574:
+		ret_val = e1e_rphy(hw, PHY_ID1, &phy_id);
+		if (ret_val)
+			return ret_val;
+
+		phy->id = (u32)(phy_id << 16);
+		udelay(20);
+		ret_val = e1e_rphy(hw, PHY_ID2, &phy_id);
+		if (ret_val)
+			return ret_val;
+
+		phy->id |= (u32)(phy_id);
+		phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
+		break;
 	default:
 		return -E1000_ERR_PHY;
 		break;
@@ -421,7 +461,7 @@ static s32 e1000_acquire_nvm_82571(struct e1000_hw *hw)
 	if (ret_val)
 		return ret_val;
 
-	if (hw->mac.type != e1000_82573)
+	if (hw->mac.type != e1000_82573 && hw->mac.type != e1000_82574)
 		ret_val = e1000e_acquire_nvm(hw);
 
 	if (ret_val)
@@ -461,6 +501,7 @@ static s32 e1000_write_nvm_82571(struct e1000_hw *hw, u16 offset, u16 words,
 
 	switch (hw->mac.type) {
 	case e1000_82573:
+	case e1000_82574:
 		ret_val = e1000_write_nvm_eewr_82571(hw, offset, words, data);
 		break;
 	case e1000_82571:
@@ -735,7 +776,7 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
 	 * Must acquire the MDIO ownership before MAC reset.
 	 * Ownership defaults to firmware after a reset.
 	 */
-	if (hw->mac.type == e1000_82573) {
+	if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
 		extcnf_ctrl = er32(EXTCNF_CTRL);
 		extcnf_ctrl |= E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP;
 
@@ -776,7 +817,7 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
 	 * Need to wait for Phy configuration completion before accessing
 	 * NVM and Phy.
 	 */
-	if (hw->mac.type == e1000_82573)
+	if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574)
 		msleep(25);
 
 	/* Clear any pending interrupt events. */
@@ -843,7 +884,7 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
 	ew32(TXDCTL(0), reg_data);
 
 	/* ...for both queues. */
-	if (mac->type != e1000_82573) {
+	if (mac->type != e1000_82573 && mac->type != e1000_82574) {
 		reg_data = er32(TXDCTL(1));
 		reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
 			   E1000_TXDCTL_FULL_TX_DESC_WB |
@@ -918,19 +959,28 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)
 	}
 
 	/* Device Control */
-	if (hw->mac.type == e1000_82573) {
+	if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
 		reg = er32(CTRL);
 		reg &= ~(1 << 29);
 		ew32(CTRL, reg);
 	}
 
 	/* Extended Device Control */
-	if (hw->mac.type == e1000_82573) {
+	if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
 		reg = er32(CTRL_EXT);
 		reg &= ~(1 << 23);
 		reg |= (1 << 22);
 		ew32(CTRL_EXT, reg);
 	}
+
+	/* PCI-Ex Control Register */
+	if (hw->mac.type == e1000_82574) {
+		reg = er32(GCR);
+		reg |= (1 << 22);
+		ew32(GCR, reg);
+	}
+
+	return;
 }
 
 /**
@@ -947,7 +997,7 @@ void e1000e_clear_vfta(struct e1000_hw *hw)
 	u32 vfta_offset = 0;
 	u32 vfta_bit_in_reg = 0;
 
-	if (hw->mac.type == e1000_82573) {
+	if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
 		if (hw->mng_cookie.vlan_id != 0) {
 			/*
 			 * The VFTA is a 4096b bit-field, each identifying
@@ -976,6 +1026,48 @@ void e1000e_clear_vfta(struct e1000_hw *hw)
 }
 
 /**
+ *  e1000_check_mng_mode_82574 - Check manageability is enabled
+ *  @hw: pointer to the HW structure
+ *
+ *  Reads the NVM Initialization Control Word 2 and returns true
+ *  (>0) if any manageability is enabled, else false (0).
+ **/
+static bool e1000_check_mng_mode_82574(struct e1000_hw *hw)
+{
+	u16 data;
+
+	e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &data);
+	return (data & E1000_NVM_INIT_CTRL2_MNGM) != 0;
+}
+
+/**
+ *  e1000_led_on_82574 - Turn LED on
+ *  @hw: pointer to the HW structure
+ *
+ *  Turn LED on.
+ **/
+static s32 e1000_led_on_82574(struct e1000_hw *hw)
+{
+	u32 ctrl;
+	u32 i;
+
+	ctrl = hw->mac.ledctl_mode2;
+	if (!(E1000_STATUS_LU & er32(STATUS))) {
+		/*
+		 * If no link, then turn LED on by setting the invert bit
+		 * for each LED that's "on" (0x0E) in ledctl_mode2.
+		 */
+		for (i = 0; i < 4; i++)
+			if (((hw->mac.ledctl_mode2 >> (i * 8)) & 0xFF) ==
+			    E1000_LEDCTL_MODE_LED_ON)
+				ctrl |= (E1000_LEDCTL_LED0_IVRT << (i * 8));
+	}
+	ew32(LEDCTL, ctrl);
+
+	return 0;
+}
+
+/**
  *  e1000_update_mc_addr_list_82571 - Update Multicast addresses
  *  @hw: pointer to the HW structure
  *  @mc_addr_list: array of multicast addresses to program
@@ -1018,7 +1110,8 @@ static s32 e1000_setup_link_82571(struct e1000_hw *hw)
 	 * the default flow control setting, so we explicitly
 	 * set it to full.
 	 */
-	if (hw->mac.type == e1000_82573)
+	if ((hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) &&
+	    hw->fc.type == e1000_fc_default)
 		hw->fc.type = e1000_fc_full;
 
 	return e1000e_setup_link(hw);
@@ -1045,6 +1138,7 @@ static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw)
 
 	switch (hw->phy.type) {
 	case e1000_phy_m88:
+	case e1000_phy_bm:
 		ret_val = e1000e_copper_link_setup_m88(hw);
 		break;
 	case e1000_phy_igp_2:
@@ -1114,11 +1208,10 @@ static s32 e1000_valid_led_default_82571(struct e1000_hw *hw, u16 *data)
 		return ret_val;
 	}
 
-	if (hw->mac.type == e1000_82573 &&
+	if ((hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) &&
 	    *data == ID_LED_RESERVED_F746)
 		*data = ID_LED_DEFAULT_82573;
-	else if (*data == ID_LED_RESERVED_0000 ||
-		 *data == ID_LED_RESERVED_FFFF)
+	else if (*data == ID_LED_RESERVED_0000 || *data == ID_LED_RESERVED_FFFF)
 		*data = ID_LED_DEFAULT;
 
 	return 0;
@@ -1265,13 +1358,13 @@ static void e1000_clear_hw_cntrs_82571(struct e1000_hw *hw)
 }
 
 static struct e1000_mac_operations e82571_mac_ops = {
-	.mng_mode_enab		= E1000_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT,
+	/* .check_mng_mode: mac type dependent */
 	/* .check_for_link: media type dependent */
 	.cleanup_led		= e1000e_cleanup_led_generic,
 	.clear_hw_cntrs		= e1000_clear_hw_cntrs_82571,
 	.get_bus_info		= e1000e_get_bus_info_pcie,
 	/* .get_link_up_info: media type dependent */
-	.led_on			= e1000e_led_on_generic,
+	/* .led_on: mac type dependent */
 	.led_off		= e1000e_led_off_generic,
 	.update_mc_addr_list	= e1000_update_mc_addr_list_82571,
 	.reset_hw		= e1000_reset_hw_82571,
@@ -1312,6 +1405,22 @@ static struct e1000_phy_operations e82_phy_ops_m88 = {
 	.write_phy_reg		= e1000e_write_phy_reg_m88,
 };
 
+static struct e1000_phy_operations e82_phy_ops_bm = {
+	.acquire_phy		= e1000_get_hw_semaphore_82571,
+	.check_reset_block	= e1000e_check_reset_block_generic,
+	.commit_phy		= e1000e_phy_sw_reset,
+	.force_speed_duplex	= e1000e_phy_force_speed_duplex_m88,
+	.get_cfg_done		= e1000e_get_cfg_done,
+	.get_cable_length	= e1000e_get_cable_length_m88,
+	.get_phy_info		= e1000e_get_phy_info_m88,
+	.read_phy_reg		= e1000e_read_phy_reg_bm2,
+	.release_phy		= e1000_put_hw_semaphore_82571,
+	.reset_phy		= e1000e_phy_hw_reset_generic,
+	.set_d0_lplu_state	= e1000_set_d0_lplu_state_82571,
+	.set_d3_lplu_state	= e1000e_set_d3_lplu_state,
+	.write_phy_reg		= e1000e_write_phy_reg_bm2,
+};
+
 static struct e1000_nvm_operations e82571_nvm_ops = {
 	.acquire_nvm		= e1000_acquire_nvm_82571,
 	.read_nvm		= e1000e_read_nvm_eerd,
@@ -1375,3 +1484,21 @@ struct e1000_info e1000_82573_info = {
 	.nvm_ops		= &e82571_nvm_ops,
 };
 
+struct e1000_info e1000_82574_info = {
+	.mac			= e1000_82574,
+	.flags			= FLAG_HAS_HW_VLAN_FILTER
+				  | FLAG_HAS_MSIX
+				  | FLAG_HAS_JUMBO_FRAMES
+				  | FLAG_HAS_WOL
+				  | FLAG_APME_IN_CTRL3
+				  | FLAG_RX_CSUM_ENABLED
+				  | FLAG_HAS_SMART_POWER_DOWN
+				  | FLAG_HAS_AMT
+				  | FLAG_HAS_CTRLEXT_ON_LOAD,
+	.pba			= 20,
+	.get_variants		= e1000_get_variants_82571,
+	.mac_ops		= &e82571_mac_ops,
+	.phy_ops		= &e82_phy_ops_bm,
+	.nvm_ops		= &e82571_nvm_ops,
+};
+
diff --git a/drivers/net/e1000e/defines.h b/drivers/net/e1000e/defines.h
index 4b21fa9..48f79ec 100644
--- a/drivers/net/e1000e/defines.h
+++ b/drivers/net/e1000e/defines.h
@@ -71,9 +71,11 @@
 #define E1000_CTRL_EXT_RO_DIS    0x00020000 /* Relaxed Ordering disable */
 #define E1000_CTRL_EXT_LINK_MODE_MASK 0x00C00000
 #define E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES  0x00C00000
+#define E1000_CTRL_EXT_EIAME          0x01000000
 #define E1000_CTRL_EXT_DRV_LOAD       0x10000000 /* Driver loaded bit for FW */
 #define E1000_CTRL_EXT_IAME           0x08000000 /* Interrupt acknowledge Auto-mask */
 #define E1000_CTRL_EXT_INT_TIMER_CLR  0x20000000 /* Clear Interrupt timers after IMS clear */
+#define E1000_CTRL_EXT_PBA_CLR        0x80000000 /* PBA Clear */
 
 /* Receive Descriptor bit definitions */
 #define E1000_RXD_STAT_DD       0x01    /* Descriptor Done */
@@ -299,6 +301,7 @@
 #define E1000_RXCSUM_IPPCSE    0x00001000   /* IP payload checksum enable */
 
 /* Header split receive */
+#define E1000_RFCTL_ACK_DIS             0x00001000
 #define E1000_RFCTL_EXTEN               0x00008000
 #define E1000_RFCTL_IPV6_EX_DIS         0x00010000
 #define E1000_RFCTL_NEW_IPV6_EXT_DIS    0x00020000
@@ -363,6 +366,11 @@
 #define E1000_ICR_RXDMT0        0x00000010 /* Rx desc min. threshold (0) */
 #define E1000_ICR_RXT0          0x00000080 /* Rx timer intr (ring 0) */
 #define E1000_ICR_INT_ASSERTED  0x80000000 /* If this bit asserted, the driver should claim the interrupt */
+#define E1000_ICR_RXQ0          0x00100000 /* Rx Queue 0 Interrupt */
+#define E1000_ICR_RXQ1          0x00200000 /* Rx Queue 1 Interrupt */
+#define E1000_ICR_TXQ0          0x00400000 /* Tx Queue 0 Interrupt */
+#define E1000_ICR_TXQ1          0x00800000 /* Tx Queue 1 Interrupt */
+#define E1000_ICR_OTHER         0x01000000 /* Other Interrupts */
 
 /*
  * This defines the bits that are set in the Interrupt Mask
@@ -386,6 +394,11 @@
 #define E1000_IMS_RXSEQ     E1000_ICR_RXSEQ     /* Rx sequence error */
 #define E1000_IMS_RXDMT0    E1000_ICR_RXDMT0    /* Rx desc min. threshold */
 #define E1000_IMS_RXT0      E1000_ICR_RXT0      /* Rx timer intr */
+#define E1000_IMS_RXQ0      E1000_ICR_RXQ0      /* Rx Queue 0 Interrupt */
+#define E1000_IMS_RXQ1      E1000_ICR_RXQ1      /* Rx Queue 1 Interrupt */
+#define E1000_IMS_TXQ0      E1000_ICR_TXQ0      /* Tx Queue 0 Interrupt */
+#define E1000_IMS_TXQ1      E1000_ICR_TXQ1      /* Tx Queue 1 Interrupt */
+#define E1000_IMS_OTHER     E1000_ICR_OTHER     /* Other Interrupts */
 
 /* Interrupt Cause Set */
 #define E1000_ICS_LSC       E1000_ICR_LSC       /* Link Status Change */
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index ef66dc4..0a1916b 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -62,6 +62,11 @@ struct e1000_info;
 	e_printk(KERN_NOTICE, adapter, format, ## arg)
 
 
+/* Interrupt modes, as used by the IntMode paramter */
+#define E1000E_INT_MODE_LEGACY		0
+#define E1000E_INT_MODE_MSI		1
+#define E1000E_INT_MODE_MSIX		2
+
 /* Tx/Rx descriptor defines */
 #define E1000_DEFAULT_TXD		256
 #define E1000_MAX_TXD			4096
@@ -95,6 +100,7 @@ enum e1000_boards {
 	board_82571,
 	board_82572,
 	board_82573,
+	board_82574,
 	board_80003es2lan,
 	board_ich8lan,
 	board_ich9lan,
@@ -147,6 +153,12 @@ struct e1000_ring {
 	/* array of buffer information structs */
 	struct e1000_buffer *buffer_info;
 
+	char name[IFNAMSIZ + 5];
+	u32 ims_val;
+	u32 itr_val;
+	u16 itr_register;
+	int set_itr;
+
 	struct sk_buff *rx_skb_top;
 
 	struct e1000_queue_stats stats;
@@ -275,6 +287,9 @@ struct e1000_adapter {
 	u32 test_icr;
 
 	u32 msg_enable;
+	struct msix_entry *msix_entries;
+	int int_mode;
+	u32 eiac_mask;
 
 	u32 eeprom_wol;
 	u32 wol;
@@ -307,6 +322,7 @@ struct e1000_info {
 #define FLAG_HAS_SWSM_ON_LOAD             (1 << 6)
 #define FLAG_HAS_JUMBO_FRAMES             (1 << 7)
 #define FLAG_IS_ICH                       (1 << 9)
+#define FLAG_HAS_MSIX                     (1 << 10)
 #define FLAG_HAS_SMART_POWER_DOWN         (1 << 11)
 #define FLAG_IS_QUAD_PORT_A               (1 << 12)
 #define FLAG_IS_QUAD_PORT                 (1 << 13)
@@ -365,6 +381,8 @@ extern int e1000e_setup_tx_resources(struct e1000_adapter *adapter);
 extern void e1000e_free_rx_resources(struct e1000_adapter *adapter);
 extern void e1000e_free_tx_resources(struct e1000_adapter *adapter);
 extern void e1000e_update_stats(struct e1000_adapter *adapter);
+extern void e1000e_set_interrupt_capability(struct e1000_adapter *adapter);
+extern void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter);
 
 extern unsigned int copybreak;
 
@@ -373,6 +391,7 @@ extern char *e1000e_get_hw_dev_name(struct e1000_hw *hw);
 extern struct e1000_info e1000_82571_info;
 extern struct e1000_info e1000_82572_info;
 extern struct e1000_info e1000_82573_info;
+extern struct e1000_info e1000_82574_info;
 extern struct e1000_info e1000_ich8_info;
 extern struct e1000_info e1000_ich9_info;
 extern struct e1000_info e1000_ich10_info;
@@ -453,6 +472,8 @@ extern enum e1000_phy_type e1000e_get_phy_type_from_id(u32 phy_id);
 extern s32 e1000e_determine_phy_address(struct e1000_hw *hw);
 extern s32 e1000e_write_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 data);
 extern s32 e1000e_read_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 *data);
+extern s32 e1000e_read_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 *data);
+extern s32 e1000e_write_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 data);
 extern void e1000e_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl);
 extern s32 e1000e_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data);
 extern s32 e1000e_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data);
@@ -523,7 +544,12 @@ static inline s32 e1000_get_phy_info(struct e1000_hw *hw)
 	return hw->phy.ops.get_phy_info(hw);
 }
 
-extern bool e1000e_check_mng_mode(struct e1000_hw *hw);
+static inline s32 e1000e_check_mng_mode(struct e1000_hw *hw)
+{
+	return hw->mac.ops.check_mng_mode(hw);
+}
+
+extern bool e1000e_check_mng_mode_generic(struct e1000_hw *hw);
 extern bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw);
 extern s32 e1000e_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length);
 
diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
index dc552d7..da9c09c 100644
--- a/drivers/net/e1000e/es2lan.c
+++ b/drivers/net/e1000e/es2lan.c
@@ -1247,7 +1247,7 @@ static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw)
 }
 
 static struct e1000_mac_operations es2_mac_ops = {
-	.mng_mode_enab		= E1000_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT,
+	.check_mng_mode		= e1000e_check_mng_mode_generic,
 	/* check_for_link dependent on media type */
 	.cleanup_led		= e1000e_cleanup_led_generic,
 	.clear_hw_cntrs		= e1000_clear_hw_cntrs_80003es2lan,
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index a89498d..52b762e 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -568,6 +568,7 @@ static int e1000_set_eeprom(struct net_device *netdev,
 	 * and flush shadow RAM for 82573 controllers
 	 */
 	if ((ret_val == 0) && ((first_word <= NVM_CHECKSUM_REG) ||
+			       (hw->mac.type == e1000_82574) ||
 			       (hw->mac.type == e1000_82573)))
 		e1000e_update_nvm_checksum(hw);
 
@@ -779,6 +780,7 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
 		toggle = 0x7FFFF3FF;
 		break;
 	case e1000_82573:
+	case e1000_82574:
 	case e1000_ich8lan:
 	case e1000_ich9lan:
 	case e1000_ich10lan:
@@ -887,10 +889,18 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
 	u32 shared_int = 1;
 	u32 irq = adapter->pdev->irq;
 	int i;
+	int ret_val = 0;
+	int int_mode = E1000E_INT_MODE_LEGACY;
 
 	*data = 0;
 
-	/* NOTE: we don't test MSI interrupts here, yet */
+	/* NOTE: we don't test MSI/MSI-X interrupts here, yet */
+	if (adapter->int_mode == E1000E_INT_MODE_MSIX) {
+		int_mode = adapter->int_mode;
+		e1000e_reset_interrupt_capability(adapter);
+		adapter->int_mode = E1000E_INT_MODE_LEGACY;
+		e1000e_set_interrupt_capability(adapter);
+	}
 	/* Hook up test interrupt handler just for this test */
 	if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED, netdev->name,
 			 netdev)) {
@@ -898,7 +908,8 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
 	} else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED,
 		 netdev->name, netdev)) {
 		*data = 1;
-		return -1;
+		ret_val = -1;
+		goto out;
 	}
 	e_info("testing %s interrupt\n", (shared_int ? "shared" : "unshared"));
 
@@ -988,7 +999,14 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
 	/* Unhook test interrupt handler */
 	free_irq(irq, netdev);
 
-	return *data;
+out:
+	if (int_mode == E1000E_INT_MODE_MSIX) {
+		e1000e_reset_interrupt_capability(adapter);
+		adapter->int_mode = int_mode;
+		e1000e_set_interrupt_capability(adapter);
+	}
+
+	return ret_val;
 }
 
 static void e1000_free_desc_rings(struct e1000_adapter *adapter)
@@ -1769,11 +1787,13 @@ static void e1000_led_blink_callback(unsigned long data)
 static int e1000_phys_id(struct net_device *netdev, u32 data)
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
+	struct e1000_hw *hw = &adapter->hw;
 
 	if (!data)
 		data = INT_MAX;
 
-	if (adapter->hw.phy.type == e1000_phy_ife) {
+	if ((hw->phy.type == e1000_phy_ife) ||
+	    (hw->mac.type == e1000_82574)) {
 		if (!adapter->blink_timer.function) {
 			init_timer(&adapter->blink_timer);
 			adapter->blink_timer.function =
@@ -1783,16 +1803,16 @@ static int e1000_phys_id(struct net_device *netdev, u32 data)
 		mod_timer(&adapter->blink_timer, jiffies);
 		msleep_interruptible(data * 1000);
 		del_timer_sync(&adapter->blink_timer);
-		e1e_wphy(&adapter->hw,
-				    IFE_PHY_SPECIAL_CONTROL_LED, 0);
+		if (hw->phy.type == e1000_phy_ife)
+			e1e_wphy(hw, IFE_PHY_SPECIAL_CONTROL_LED, 0);
 	} else {
-		e1000e_blink_led(&adapter->hw);
+		e1000e_blink_led(hw);
 		msleep_interruptible(data * 1000);
 	}
 
-	adapter->hw.mac.ops.led_off(&adapter->hw);
+	hw->mac.ops.led_off(hw);
 	clear_bit(E1000_LED_ON, &adapter->led_status);
-	adapter->hw.mac.ops.cleanup_led(&adapter->hw);
+	hw->mac.ops.cleanup_led(hw);
 
 	return 0;
 }
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index 5d2acc5..f66ed37 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -65,7 +65,11 @@ enum e1e_registers {
 	E1000_ICS      = 0x000C8, /* Interrupt Cause Set - WO */
 	E1000_IMS      = 0x000D0, /* Interrupt Mask Set - RW */
 	E1000_IMC      = 0x000D8, /* Interrupt Mask Clear - WO */
+	E1000_EIAC_82574 = 0x000DC, /* Ext. Interrupt Auto Clear - RW */
 	E1000_IAM      = 0x000E0, /* Interrupt Acknowledge Auto Mask */
+	E1000_IVAR     = 0x000E4, /* Interrupt Vector Allocation - RW */
+	E1000_EITR_82574_BASE = 0x000E8, /* Interrupt Throttling - RW */
+#define E1000_EITR_82574(_n) (E1000_EITR_82574_BASE + (_n << 2))
 	E1000_RCTL     = 0x00100, /* Rx Control - RW */
 	E1000_FCTTV    = 0x00170, /* Flow Control Transmit Timer Value - RW */
 	E1000_TXCW     = 0x00178, /* Tx Configuration Word - RW */
@@ -332,6 +336,7 @@ enum e1e_registers {
 #define E1000_DEV_ID_82573E			0x108B
 #define E1000_DEV_ID_82573E_IAMT		0x108C
 #define E1000_DEV_ID_82573L			0x109A
+#define E1000_DEV_ID_82574L			0x10D3
 
 #define E1000_DEV_ID_80003ES2LAN_COPPER_DPT	0x1096
 #define E1000_DEV_ID_80003ES2LAN_SERDES_DPT	0x1098
@@ -360,12 +365,15 @@ enum e1e_registers {
 #define E1000_DEV_ID_ICH10_D_BM_LM		0x10DE
 #define E1000_DEV_ID_ICH10_D_BM_LF		0x10DF
 
+#define E1000_REVISION_4 4
+
 #define E1000_FUNC_1 1
 
 enum e1000_mac_type {
 	e1000_82571,
 	e1000_82572,
 	e1000_82573,
+	e1000_82574,
 	e1000_80003es2lan,
 	e1000_ich8lan,
 	e1000_ich9lan,
@@ -700,8 +708,7 @@ struct e1000_host_mng_command_info {
 
 /* Function pointers and static data for the MAC. */
 struct e1000_mac_operations {
-	u32			mng_mode_enab;
-
+	bool (*check_mng_mode)(struct e1000_hw *);
 	s32  (*check_for_link)(struct e1000_hw *);
 	s32  (*cleanup_led)(struct e1000_hw *);
 	void (*clear_hw_cntrs)(struct e1000_hw *);
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index 0e76bb0..019b9c0 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -422,6 +422,22 @@ static void e1000_release_swflag_ich8lan(struct e1000_hw *hw)
 }
 
 /**
+ *  e1000_check_mng_mode_ich8lan - Checks management mode
+ *  @hw: pointer to the HW structure
+ *
+ *  This checks if the adapter has manageability enabled.
+ *  This is a function pointer entry point only called by read/write
+ *  routines for the PHY and NVM parts.
+ **/
+static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw)
+{
+	u32 fwsm = er32(FWSM);
+
+	return (fwsm & E1000_FWSM_MODE_MASK) ==
+		(E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT);
+}
+
+/**
  *  e1000_check_reset_block_ich8lan - Check if PHY reset is blocked
  *  @hw: pointer to the HW structure
  *
@@ -2400,7 +2416,7 @@ static void e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw)
 }
 
 static struct e1000_mac_operations ich8_mac_ops = {
-	.mng_mode_enab		= E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT,
+	.check_mng_mode		= e1000_check_mng_mode_ich8lan,
 	.check_for_link		= e1000e_check_for_copper_link,
 	.cleanup_led		= e1000_cleanup_led_ich8lan,
 	.clear_hw_cntrs		= e1000_clear_hw_cntrs_ich8lan,
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index f1f4e9d..c733730 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -2222,17 +2222,18 @@ static s32 e1000_mng_enable_host_if(struct e1000_hw *hw)
 }
 
 /**
- *  e1000e_check_mng_mode - check management mode
+ *  e1000e_check_mng_mode_generic - check management mode
  *  @hw: pointer to the HW structure
  *
  *  Reads the firmware semaphore register and returns true (>0) if
  *  manageability is enabled, else false (0).
  **/
-bool e1000e_check_mng_mode(struct e1000_hw *hw)
+bool e1000e_check_mng_mode_generic(struct e1000_hw *hw)
 {
 	u32 fwsm = er32(FWSM);
 
-	return (fwsm & E1000_FWSM_MODE_MASK) == hw->mac.ops.mng_mode_enab;
+	return (fwsm & E1000_FWSM_MODE_MASK) ==
+		(E1000_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT);
 }
 
 /**
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 2d9bcb0..0925204 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -55,6 +55,7 @@ static const struct e1000_info *e1000_info_tbl[] = {
 	[board_82571]		= &e1000_82571_info,
 	[board_82572]		= &e1000_82572_info,
 	[board_82573]		= &e1000_82573_info,
+	[board_82574]		= &e1000_82574_info,
 	[board_80003es2lan]	= &e1000_es2_info,
 	[board_ich8lan]		= &e1000_ich8_info,
 	[board_ich9lan]		= &e1000_ich9_info,
@@ -1180,8 +1181,8 @@ static irqreturn_t e1000_intr(int irq, void *data)
 	struct net_device *netdev = data;
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	struct e1000_hw *hw = &adapter->hw;
-
 	u32 rctl, icr = er32(ICR);
+
 	if (!icr)
 		return IRQ_NONE;  /* Not our interrupt */
 
@@ -1237,6 +1238,263 @@ static irqreturn_t e1000_intr(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
+static irqreturn_t e1000_msix_other(int irq, void *data)
+{
+	struct net_device *netdev = data;
+	struct e1000_adapter *adapter = netdev_priv(netdev);
+	struct e1000_hw *hw = &adapter->hw;
+	u32 icr = er32(ICR);
+
+	if (!(icr & E1000_ICR_INT_ASSERTED)) {
+		ew32(IMS, E1000_IMS_OTHER);
+		return IRQ_NONE;
+	}
+
+	if (icr & adapter->eiac_mask)
+		ew32(ICS, (icr & adapter->eiac_mask));
+
+	if (icr & E1000_ICR_OTHER) {
+		if (!(icr & E1000_ICR_LSC))
+			goto no_link_interrupt;
+		hw->mac.get_link_status = 1;
+		/* guard against interrupt when we're going down */
+		if (!test_bit(__E1000_DOWN, &adapter->state))
+			mod_timer(&adapter->watchdog_timer, jiffies + 1);
+	}
+
+no_link_interrupt:
+	ew32(IMS, E1000_IMS_LSC | E1000_IMS_OTHER);
+
+	return IRQ_HANDLED;
+}
+
+
+static irqreturn_t e1000_intr_msix_tx(int irq, void *data)
+{
+	struct net_device *netdev = data;
+	struct e1000_adapter *adapter = netdev_priv(netdev);
+	struct e1000_hw *hw = &adapter->hw;
+	struct e1000_ring *tx_ring = adapter->tx_ring;
+
+
+	adapter->total_tx_bytes = 0;
+	adapter->total_tx_packets = 0;
+
+	if (!e1000_clean_tx_irq(adapter))
+		/* Ring was not completely cleaned, so fire another interrupt */
+		ew32(ICS, tx_ring->ims_val);
+
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t e1000_intr_msix_rx(int irq, void *data)
+{
+	struct net_device *netdev = data;
+	struct e1000_adapter *adapter = netdev_priv(netdev);
+
+	/* Write the ITR value calculated at the end of the
+	 * previous interrupt.
+	 */
+	if (adapter->rx_ring->set_itr) {
+		writel(1000000000 / (adapter->rx_ring->itr_val * 256),
+		       adapter->hw.hw_addr + adapter->rx_ring->itr_register);
+		adapter->rx_ring->set_itr = 0;
+	}
+
+	if (netif_rx_schedule_prep(netdev, &adapter->napi)) {
+		adapter->total_rx_bytes = 0;
+		adapter->total_rx_packets = 0;
+		__netif_rx_schedule(netdev, &adapter->napi);
+	}
+	return IRQ_HANDLED;
+}
+
+/**
+ * e1000_configure_msix - Configure MSI-X hardware
+ *
+ * e1000_configure_msix sets up the hardware to properly
+ * generate MSI-X interrupts.
+ **/
+static void e1000_configure_msix(struct e1000_adapter *adapter)
+{
+	struct e1000_hw *hw = &adapter->hw;
+	struct e1000_ring *rx_ring = adapter->rx_ring;
+	struct e1000_ring *tx_ring = adapter->tx_ring;
+	int vector = 0;
+	u32 ctrl_ext, ivar = 0;
+
+	adapter->eiac_mask = 0;
+
+	/* Workaround issue with spurious interrupts on 82574 in MSI-X mode */
+	if (hw->mac.type == e1000_82574) {
+		u32 rfctl = er32(RFCTL);
+		rfctl |= E1000_RFCTL_ACK_DIS;
+		ew32(RFCTL, rfctl);
+	}
+
+#define E1000_IVAR_INT_ALLOC_VALID	0x8
+	/* Configure Rx vector */
+	rx_ring->ims_val = E1000_IMS_RXQ0;
+	adapter->eiac_mask |= rx_ring->ims_val;
+	if (rx_ring->itr_val)
+		writel(1000000000 / (rx_ring->itr_val * 256),
+		       hw->hw_addr + rx_ring->itr_register);
+	else
+		writel(1, hw->hw_addr + rx_ring->itr_register);
+	ivar = E1000_IVAR_INT_ALLOC_VALID | vector;
+
+	/* Configure Tx vector */
+	tx_ring->ims_val = E1000_IMS_TXQ0;
+	vector++;
+	if (tx_ring->itr_val)
+		writel(1000000000 / (tx_ring->itr_val * 256),
+		       hw->hw_addr + tx_ring->itr_register);
+	else
+		writel(1, hw->hw_addr + tx_ring->itr_register);
+	adapter->eiac_mask |= tx_ring->ims_val;
+	ivar |= ((E1000_IVAR_INT_ALLOC_VALID | vector) << 8);
+
+	/* set vector for Other Causes, e.g. link changes */
+	vector++;
+	ivar |= ((E1000_IVAR_INT_ALLOC_VALID | vector) << 16);
+	if (rx_ring->itr_val)
+		writel(1000000000 / (rx_ring->itr_val * 256),
+		       hw->hw_addr + E1000_EITR_82574(vector));
+	else
+		writel(1, hw->hw_addr + E1000_EITR_82574(vector));
+
+	/* Cause Tx interrupts on every write back */
+	ivar |= (1 << 31);
+
+	ew32(IVAR, ivar);
+
+	/* enable MSI-X PBA support */
+	ctrl_ext = er32(CTRL_EXT);
+	ctrl_ext |= E1000_CTRL_EXT_PBA_CLR;
+
+	/* Auto-Mask Other interrupts upon ICR read */
+#define E1000_EIAC_MASK_82574   0x01F00000
+	ew32(IAM, ~E1000_EIAC_MASK_82574 | E1000_IMS_OTHER);
+	ctrl_ext |= E1000_CTRL_EXT_EIAME;
+	ew32(CTRL_EXT, ctrl_ext);
+	e1e_flush();
+}
+
+void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter)
+{
+	if (adapter->msix_entries) {
+		pci_disable_msix(adapter->pdev);
+		kfree(adapter->msix_entries);
+		adapter->msix_entries = NULL;
+	} else if (adapter->flags & FLAG_MSI_ENABLED) {
+		pci_disable_msi(adapter->pdev);
+		adapter->flags &= ~FLAG_MSI_ENABLED;
+	}
+
+	return;
+}
+
+/**
+ * e1000e_set_interrupt_capability - set MSI or MSI-X if supported
+ *
+ * Attempt to configure interrupts using the best available
+ * capabilities of the hardware and kernel.
+ **/
+void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)
+{
+	int err;
+	int numvecs, i;
+
+
+	switch (adapter->int_mode) {
+	case E1000E_INT_MODE_MSIX:
+		if (adapter->flags & FLAG_HAS_MSIX) {
+			numvecs = 3; /* RxQ0, TxQ0 and other */
+			adapter->msix_entries = kcalloc(numvecs,
+						      sizeof(struct msix_entry),
+						      GFP_KERNEL);
+			if (adapter->msix_entries) {
+				for (i = 0; i < numvecs; i++)
+					adapter->msix_entries[i].entry = i;
+
+				err = pci_enable_msix(adapter->pdev,
+						      adapter->msix_entries,
+						      numvecs);
+				if (err == 0)
+					return;
+			}
+			/* MSI-X failed, so fall through and try MSI */
+			e_err("Failed to initialize MSI-X interrupts.  "
+			      "Falling back to MSI interrupts.\n");
+			e1000e_reset_interrupt_capability(adapter);
+		}
+		adapter->int_mode = E1000E_INT_MODE_MSI;
+		/* Fall through */
+	case E1000E_INT_MODE_MSI:
+		if (!pci_enable_msi(adapter->pdev)) {
+			adapter->flags |= FLAG_MSI_ENABLED;
+		} else {
+			adapter->int_mode = E1000E_INT_MODE_LEGACY;
+			e_err("Failed to initialize MSI interrupts.  Falling "
+			      "back to legacy interrupts.\n");
+		}
+		/* Fall through */
+	case E1000E_INT_MODE_LEGACY:
+		/* Don't do anything; this is the system default */
+		break;
+	}
+
+	return;
+}
+
+/**
+ * e1000_request_msix - Initialize MSI-X interrupts
+ *
+ * e1000_request_msix allocates MSI-X vectors and requests interrupts from the
+ * kernel.
+ **/
+static int e1000_request_msix(struct e1000_adapter *adapter)
+{
+	struct net_device *netdev = adapter->netdev;
+	int err = 0, vector = 0;
+
+	if (strlen(netdev->name) < (IFNAMSIZ - 5))
+		sprintf(adapter->rx_ring->name, "%s-rx0", netdev->name);
+	else
+		memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ);
+	err = request_irq(adapter->msix_entries[vector].vector,
+			  &e1000_intr_msix_rx, 0, adapter->rx_ring->name,
+			  netdev);
+	if (err)
+		goto out;
+	adapter->rx_ring->itr_register = E1000_EITR_82574(vector);
+	adapter->rx_ring->itr_val = adapter->itr;
+	vector++;
+
+	if (strlen(netdev->name) < (IFNAMSIZ - 5))
+		sprintf(adapter->tx_ring->name, "%s-tx0", netdev->name);
+	else
+		memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ);
+	err = request_irq(adapter->msix_entries[vector].vector,
+			  &e1000_intr_msix_tx, 0, adapter->tx_ring->name,
+			  netdev);
+	if (err)
+		goto out;
+	adapter->tx_ring->itr_register = E1000_EITR_82574(vector);
+	adapter->tx_ring->itr_val = adapter->itr;
+	vector++;
+
+	err = request_irq(adapter->msix_entries[vector].vector,
+			  &e1000_msix_other, 0, netdev->name, netdev);
+	if (err)
+		goto out;
+
+	e1000_configure_msix(adapter);
+	return 0;
+out:
+	return err;
+}
+
 /**
  * e1000_request_irq - initialize interrupts
  *
@@ -1246,29 +1504,33 @@ static irqreturn_t e1000_intr(int irq, void *data)
 static int e1000_request_irq(struct e1000_adapter *adapter)
 {
 	struct net_device *netdev = adapter->netdev;
-	int irq_flags = IRQF_SHARED;
 	int err;
 
-	if (!(adapter->flags & FLAG_MSI_TEST_FAILED)) {
-		err = pci_enable_msi(adapter->pdev);
-		if (!err) {
-			adapter->flags |= FLAG_MSI_ENABLED;
-			irq_flags = 0;
-		}
+	if (adapter->msix_entries) {
+		err = e1000_request_msix(adapter);
+		if (!err)
+			return err;
+		/* fall back to MSI */
+		e1000e_reset_interrupt_capability(adapter);
+		adapter->int_mode = E1000E_INT_MODE_MSI;
+		e1000e_set_interrupt_capability(adapter);
 	}
+	if (adapter->flags & FLAG_MSI_ENABLED) {
+		err = request_irq(adapter->pdev->irq, &e1000_intr_msi, 0,
+				  netdev->name, netdev);
+		if (!err)
+			return err;
 
-	err = request_irq(adapter->pdev->irq,
-			  ((adapter->flags & FLAG_MSI_ENABLED) ?
-				&e1000_intr_msi : &e1000_intr),
-			  irq_flags, netdev->name, netdev);
-	if (err) {
-		if (adapter->flags & FLAG_MSI_ENABLED) {
-			pci_disable_msi(adapter->pdev);
-			adapter->flags &= ~FLAG_MSI_ENABLED;
-		}
-		e_err("Unable to allocate interrupt, Error: %d\n", err);
+		/* fall back to legacy interrupt */
+		e1000e_reset_interrupt_capability(adapter);
+		adapter->int_mode = E1000E_INT_MODE_LEGACY;
 	}
 
+	err = request_irq(adapter->pdev->irq, &e1000_intr, IRQF_SHARED,
+			  netdev->name, netdev);
+	if (err)
+		e_err("Unable to allocate interrupt, Error: %d\n", err);
+
 	return err;
 }
 
@@ -1276,11 +1538,21 @@ static void e1000_free_irq(struct e1000_adapter *adapter)
 {
 	struct net_device *netdev = adapter->netdev;
 
-	free_irq(adapter->pdev->irq, netdev);
-	if (adapter->flags & FLAG_MSI_ENABLED) {
-		pci_disable_msi(adapter->pdev);
-		adapter->flags &= ~FLAG_MSI_ENABLED;
+	if (adapter->msix_entries) {
+		int vector = 0;
+
+		free_irq(adapter->msix_entries[vector].vector, netdev);
+		vector++;
+
+		free_irq(adapter->msix_entries[vector].vector, netdev);
+		vector++;
+
+		/* Other Causes interrupt vector */
+		free_irq(adapter->msix_entries[vector].vector, netdev);
+		return;
 	}
+
+	free_irq(adapter->pdev->irq, netdev);
 }
 
 /**
@@ -1291,6 +1563,8 @@ static void e1000_irq_disable(struct e1000_adapter *adapter)
 	struct e1000_hw *hw = &adapter->hw;
 
 	ew32(IMC, ~0);
+	if (adapter->msix_entries)
+		ew32(EIAC_82574, 0);
 	e1e_flush();
 	synchronize_irq(adapter->pdev->irq);
 }
@@ -1302,7 +1576,12 @@ static void e1000_irq_enable(struct e1000_adapter *adapter)
 {
 	struct e1000_hw *hw = &adapter->hw;
 
-	ew32(IMS, IMS_ENABLE_MASK);
+	if (adapter->msix_entries) {
+		ew32(EIAC_82574, adapter->eiac_mask & E1000_EIAC_MASK_82574);
+		ew32(IMS, adapter->eiac_mask | E1000_IMS_OTHER | E1000_IMS_LSC);
+	} else {
+		ew32(IMS, IMS_ENABLE_MASK);
+	}
 	e1e_flush();
 }
 
@@ -1552,9 +1831,8 @@ void e1000e_free_rx_resources(struct e1000_adapter *adapter)
  *      traffic pattern.  Constants in this function were computed
  *      based on theoretical maximum wire speed and thresholds were set based
  *      on testing data as well as attempting to minimize response time
- *      while increasing bulk throughput.
- *      this functionality is controlled by the InterruptThrottleRate module
- *      parameter (see e1000_param.c)
+ *      while increasing bulk throughput.  This functionality is controlled
+ *      by the InterruptThrottleRate module parameter.
  **/
 static unsigned int e1000_update_itr(struct e1000_adapter *adapter,
 				     u16 itr_setting, int packets,
@@ -1662,11 +1940,37 @@ set_itr_now:
 			     min(adapter->itr + (new_itr >> 2), new_itr) :
 			     new_itr;
 		adapter->itr = new_itr;
-		ew32(ITR, 1000000000 / (new_itr * 256));
+		adapter->rx_ring->itr_val = new_itr;
+		if (adapter->msix_entries)
+			adapter->rx_ring->set_itr = 1;
+		else
+			ew32(ITR, 1000000000 / (new_itr * 256));
 	}
 }
 
 /**
+ * e1000_alloc_queues - Allocate memory for all rings
+ * @adapter: board private structure to initialize
+ **/
+static int __devinit e1000_alloc_queues(struct e1000_adapter *adapter)
+{
+	adapter->tx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);
+	if (!adapter->tx_ring)
+		goto err;
+
+	adapter->rx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);
+	if (!adapter->rx_ring)
+		goto err;
+
+	return 0;
+err:
+	e_err("Unable to allocate memory for queues\n");
+	kfree(adapter->rx_ring);
+	kfree(adapter->tx_ring);
+	return -ENOMEM;
+}
+
+/**
  * e1000_clean - NAPI Rx polling callback
  * @napi: struct associated with this polling callback
  * @budget: amount of packets driver is allowed to process this poll
@@ -1674,12 +1978,17 @@ set_itr_now:
 static int e1000_clean(struct napi_struct *napi, int budget)
 {
 	struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi);
+	struct e1000_hw *hw = &adapter->hw;
 	struct net_device *poll_dev = adapter->netdev;
 	int tx_cleaned = 0, work_done = 0;
 
 	/* Must NOT use netdev_priv macro here. */
 	adapter = poll_dev->priv;
 
+	if (adapter->msix_entries &&
+	    !(adapter->rx_ring->ims_val & adapter->tx_ring->ims_val))
+		goto clean_rx;
+
 	/*
 	 * e1000_clean is called per-cpu.  This lock protects
 	 * tx_ring from being cleaned by multiple cpus
@@ -1691,6 +2000,7 @@ static int e1000_clean(struct napi_struct *napi, int budget)
 		spin_unlock(&adapter->tx_queue_lock);
 	}
 
+clean_rx:
 	adapter->clean_rx(adapter, &work_done, budget);
 
 	if (tx_cleaned)
@@ -1701,7 +2011,10 @@ static int e1000_clean(struct napi_struct *napi, int budget)
 		if (adapter->itr_setting & 3)
 			e1000_set_itr(adapter);
 		netif_rx_complete(poll_dev, napi);
-		e1000_irq_enable(adapter);
+		if (adapter->msix_entries)
+			ew32(IMS, adapter->rx_ring->ims_val);
+		else
+			e1000_irq_enable(adapter);
 	}
 
 	return work_done;
@@ -2497,6 +2810,8 @@ int e1000e_up(struct e1000_adapter *adapter)
 	clear_bit(__E1000_DOWN, &adapter->state);
 
 	napi_enable(&adapter->napi);
+	if (adapter->msix_entries)
+		e1000_configure_msix(adapter);
 	e1000_irq_enable(adapter);
 
 	/* fire a link change interrupt to start the watchdog */
@@ -2580,13 +2895,10 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)
 	adapter->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
 	adapter->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
 
-	adapter->tx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);
-	if (!adapter->tx_ring)
-		goto err;
+	e1000e_set_interrupt_capability(adapter);
 
-	adapter->rx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);
-	if (!adapter->rx_ring)
-		goto err;
+	if (e1000_alloc_queues(adapter))
+		return -ENOMEM;
 
 	spin_lock_init(&adapter->tx_queue_lock);
 
@@ -2597,12 +2909,6 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)
 
 	set_bit(__E1000_DOWN, &adapter->state);
 	return 0;
-
-err:
-	e_err("Unable to allocate memory for queues\n");
-	kfree(adapter->rx_ring);
-	kfree(adapter->tx_ring);
-	return -ENOMEM;
 }
 
 /**
@@ -2644,6 +2950,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
 
 	/* free the real vector and request a test handler */
 	e1000_free_irq(adapter);
+	e1000e_reset_interrupt_capability(adapter);
 
 	/* Assume that the test fails, if it succeeds then the test
 	 * MSI irq handler will unset this flag */
@@ -2674,6 +2981,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
 	rmb();
 
 	if (adapter->flags & FLAG_MSI_TEST_FAILED) {
+		adapter->int_mode = E1000E_INT_MODE_LEGACY;
 		err = -EIO;
 		e_info("MSI interrupt test failed!\n");
 	}
@@ -2687,7 +2995,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
 	/* okay so the test worked, restore settings */
 	e_dbg("%s: MSI interrupt test succeeded!\n", netdev->name);
 msi_test_failed:
-	/* restore the original vector, even if it failed */
+	e1000e_set_interrupt_capability(adapter);
 	e1000_request_irq(adapter);
 	return err;
 }
@@ -2797,7 +3105,7 @@ static int e1000_open(struct net_device *netdev)
 	 * ignore e1000e MSI messages, which means we need to test our MSI
 	 * interrupt now
 	 */
-	{
+	if (adapter->int_mode != E1000E_INT_MODE_LEGACY) {
 		err = e1000_test_msi(adapter);
 		if (err) {
 			e_err("Interrupt allocation failed\n");
@@ -2989,7 +3297,8 @@ void e1000e_update_stats(struct e1000_adapter *adapter)
 
 	adapter->stats.algnerrc += er32(ALGNERRC);
 	adapter->stats.rxerrc += er32(RXERRC);
-	adapter->stats.tncrs += er32(TNCRS);
+	if (hw->mac.type != e1000_82574)
+		adapter->stats.tncrs += er32(TNCRS);
 	adapter->stats.cexterr += er32(CEXTERR);
 	adapter->stats.tsctc += er32(TSCTC);
 	adapter->stats.tsctfc += er32(TSCTFC);
@@ -3337,7 +3646,10 @@ link_up:
 	}
 
 	/* Cause software interrupt to ensure Rx ring is cleaned */
-	ew32(ICS, E1000_ICS_RXDMT0);
+	if (adapter->msix_entries)
+		ew32(ICS, adapter->rx_ring->ims_val);
+	else
+		ew32(ICS, E1000_ICS_RXDMT0);
 
 	/* Force detection of hung controller every watchdog period */
 	adapter->detect_tx_hung = 1;
@@ -4054,6 +4366,7 @@ static int e1000_suspend(struct pci_dev *pdev, pm_message_t state)
 		e1000e_down(adapter);
 		e1000_free_irq(adapter);
 	}
+	e1000e_reset_interrupt_capability(adapter);
 
 	retval = pci_save_state(pdev);
 	if (retval)
@@ -4180,6 +4493,7 @@ static int e1000_resume(struct pci_dev *pdev)
 	pci_enable_wake(pdev, PCI_D3hot, 0);
 	pci_enable_wake(pdev, PCI_D3cold, 0);
 
+	e1000e_set_interrupt_capability(adapter);
 	if (netif_running(netdev)) {
 		err = e1000_request_irq(adapter);
 		if (err)
@@ -4489,6 +4803,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 
 	adapter->bd_number = cards_found++;
 
+	e1000e_check_options(adapter);
+
 	/* setup adapter struct */
 	err = e1000_sw_init(adapter);
 	if (err)
@@ -4595,8 +4911,6 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 	INIT_WORK(&adapter->reset_task, e1000_reset_task);
 	INIT_WORK(&adapter->watchdog_task, e1000_watchdog_task);
 
-	e1000e_check_options(adapter);
-
 	/* Initialize link parameters. User can change them with ethtool */
 	adapter->hw.mac.autoneg = 1;
 	adapter->fc_autoneg = 1;
@@ -4726,6 +5040,7 @@ static void __devexit e1000_remove(struct pci_dev *pdev)
 	if (!e1000_check_reset_block(&adapter->hw))
 		e1000_phy_hw_reset(&adapter->hw);
 
+	e1000e_reset_interrupt_capability(adapter);
 	kfree(adapter->tx_ring);
 	kfree(adapter->rx_ring);
 
@@ -4767,6 +5082,8 @@ static struct pci_device_id e1000_pci_tbl[] = {
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82573E_IAMT), board_82573 },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82573L), board_82573 },
 
+	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82574L), board_82574 },
+
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_COPPER_DPT),
 	  board_80003es2lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_COPPER_SPT),
diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c
index ed912e0..f46db6c 100644
--- a/drivers/net/e1000e/param.c
+++ b/drivers/net/e1000e/param.c
@@ -114,6 +114,15 @@ E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate");
 #define DEFAULT_ITR 3
 #define MAX_ITR 100000
 #define MIN_ITR 100
+/* IntMode (Interrupt Mode)
+ *
+ * Valid Range: 0 - 2
+ *
+ * Default Value: 2 (MSI-X)
+ */
+E1000_PARAM(IntMode, "Interrupt Mode");
+#define MAX_INTMODE	2
+#define MIN_INTMODE	0
 
 /*
  * Enable Smart Power Down of the PHY
@@ -352,6 +361,24 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
 			adapter->itr = 20000;
 		}
 	}
+	{ /* Interrupt Mode */
+		struct e1000_option opt = {
+			.type = range_option,
+			.name = "Interrupt Mode",
+			.err  = "defaulting to 2 (MSI-X)",
+			.def  = E1000E_INT_MODE_MSIX,
+			.arg  = { .r = { .min = MIN_INTMODE,
+					 .max = MAX_INTMODE } }
+		};
+
+		if (num_IntMode > bd) {
+			unsigned int int_mode = IntMode[bd];
+			e1000_validate_option(&int_mode, &opt, adapter);
+			adapter->int_mode = int_mode;
+		} else {
+			adapter->int_mode = opt.def;
+		}
+	}
 	{ /* Smart Power Down */
 		const struct e1000_option opt = {
 			.type = enable_option,
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
index 16724f8..6cd333a 100644
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@ -476,7 +476,9 @@ s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw)
 	if (ret_val)
 		return ret_val;
 
-	if ((phy->type == e1000_phy_m88) && (phy->revision < 4)) {
+	if ((phy->type == e1000_phy_m88) &&
+	    (phy->revision < E1000_REVISION_4) &&
+	    (phy->id != BME1000_E_PHY_ID_R2)) {
 		/*
 		 * Force TX_CLK in the Extended PHY Specific Control Register
 		 * to 25MHz clock.
@@ -504,6 +506,18 @@ s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw)
 			return ret_val;
 	}
 
+	if ((phy->type == e1000_phy_bm) && (phy->id == BME1000_E_PHY_ID_R2)) {
+		/* Set PHY page 0, register 29 to 0x0003 */
+		ret_val = e1e_wphy(hw, 29, 0x0003);
+		if (ret_val)
+			return ret_val;
+
+		/* Set PHY page 0, register 30 to 0x0000 */
+		ret_val = e1e_wphy(hw, 30, 0x0000);
+		if (ret_val)
+			return ret_val;
+	}
+
 	/* Commit the changes. */
 	ret_val = e1000e_commit_phy(hw);
 	if (ret_val)
@@ -2054,6 +2068,99 @@ out:
 }
 
 /**
+ *  e1000e_read_phy_reg_bm2 - Read BM PHY register
+ *  @hw: pointer to the HW structure
+ *  @offset: register offset to be read
+ *  @data: pointer to the read data
+ *
+ *  Acquires semaphore, if necessary, then reads the PHY register at offset
+ *  and storing the retrieved information in data.  Release any acquired
+ *  semaphores before exiting.
+ **/
+s32 e1000e_read_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 *data)
+{
+	s32 ret_val;
+	u16 page = (u16)(offset >> IGP_PAGE_SHIFT);
+
+	/* Page 800 works differently than the rest so it has its own func */
+	if (page == BM_WUC_PAGE) {
+		ret_val = e1000_access_phy_wakeup_reg_bm(hw, offset, data,
+							 true);
+		return ret_val;
+	}
+
+	ret_val = hw->phy.ops.acquire_phy(hw);
+	if (ret_val)
+		return ret_val;
+
+	hw->phy.addr = 1;
+
+	if (offset > MAX_PHY_MULTI_PAGE_REG) {
+
+		/* Page is shifted left, PHY expects (page x 32) */
+		ret_val = e1000e_write_phy_reg_mdic(hw, BM_PHY_PAGE_SELECT,
+						    page);
+
+		if (ret_val) {
+			hw->phy.ops.release_phy(hw);
+			return ret_val;
+		}
+	}
+
+	ret_val = e1000e_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
+					   data);
+	hw->phy.ops.release_phy(hw);
+
+	return ret_val;
+}
+
+/**
+ *  e1000e_write_phy_reg_bm2 - Write BM PHY register
+ *  @hw: pointer to the HW structure
+ *  @offset: register offset to write to
+ *  @data: data to write at register offset
+ *
+ *  Acquires semaphore, if necessary, then writes the data to PHY register
+ *  at the offset.  Release any acquired semaphores before exiting.
+ **/
+s32 e1000e_write_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 data)
+{
+	s32 ret_val;
+	u16 page = (u16)(offset >> IGP_PAGE_SHIFT);
+
+	/* Page 800 works differently than the rest so it has its own func */
+	if (page == BM_WUC_PAGE) {
+		ret_val = e1000_access_phy_wakeup_reg_bm(hw, offset, &data,
+							 false);
+		return ret_val;
+	}
+
+	ret_val = hw->phy.ops.acquire_phy(hw);
+	if (ret_val)
+		return ret_val;
+
+	hw->phy.addr = 1;
+
+	if (offset > MAX_PHY_MULTI_PAGE_REG) {
+		/* Page is shifted left, PHY expects (page x 32) */
+		ret_val = e1000e_write_phy_reg_mdic(hw, BM_PHY_PAGE_SELECT,
+						    page);
+
+		if (ret_val) {
+			hw->phy.ops.release_phy(hw);
+			return ret_val;
+		}
+	}
+
+	ret_val = e1000e_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
+					    data);
+
+	hw->phy.ops.release_phy(hw);
+
+	return ret_val;
+}
+
+/**
  *  e1000_access_phy_wakeup_reg_bm - Read BM PHY wakeup register
  *  @hw: pointer to the HW structure
  *  @offset: register offset to be read or written
-- 
1.5.4.1


linux-2.6-e1000e-add-support-for-the-82567LM-4-device.patch:

--- NEW FILE linux-2.6-e1000e-add-support-for-the-82567LM-4-device.patch ---
>From 2f15f9d60190a62bc8ac50fa84fea31fc0b00ecf Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan at intel.com>
Date: Tue, 26 Aug 2008 18:36:36 -0700
Subject: [PATCH 1/3] e1000e: add support for the 82567LM-4 device

Enable PCI device ID for a new combination of MAC and PHY already supported
in the driver.

Signed-off-by: Bruce Allan <bruce.w.allan at intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---
 drivers/net/e1000e/hw.h      |    1 +
 drivers/net/e1000e/ich8lan.c |    1 +
 drivers/net/e1000e/netdev.c  |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index 74f263a..d0e7b46 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -346,6 +346,7 @@ enum e1e_registers {
 #define E1000_DEV_ID_ICH8_IFE_G			0x10C5
 #define E1000_DEV_ID_ICH8_IGP_M			0x104D
 #define E1000_DEV_ID_ICH9_IGP_AMT		0x10BD
+#define E1000_DEV_ID_ICH9_BM			0x10E5
 #define E1000_DEV_ID_ICH9_IGP_M_AMT		0x10F5
 #define E1000_DEV_ID_ICH9_IGP_M			0x10BF
 #define E1000_DEV_ID_ICH9_IGP_M_V		0x10CB
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index 9e38452..b5fc2c9 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -44,6 +44,7 @@
  * 82567LF-2 Gigabit Network Connection
  * 82567V-2 Gigabit Network Connection
  * 82562GT-3 10/100 Network Connection
+ * 82567LM-4 Gigabit Network Connection
  */
 
 #include <linux/netdevice.h>
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index d266510..c3d7411 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4767,6 +4767,7 @@ static struct pci_device_id e1000_pci_tbl[] = {
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_GT), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_AMT), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_C), board_ich9lan },
+	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_BM), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_AMT), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_V), board_ich9lan },
-- 
1.5.4.1



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.944
retrieving revision 1.945
diff -u -r1.944 -r1.945
--- kernel.spec	10 Sep 2008 04:54:35 -0000	1.944
+++ kernel.spec	10 Sep 2008 16:59:58 -0000	1.945
@@ -613,6 +613,11 @@
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
 
+# new e1000e hardware support from net-next-2.6 (e.g. ich10)
+Patch2001: linux-2.6-e1000e-add-support-for-the-82567LM-4-device.patch
+Patch2002: linux-2.6-e1000e-add-support-for-82567LM-3-and-82567LF-3-ICH10D-parts.patch
+Patch2003: linux-2.6-e1000e-add-support-for-new-82574L-part.patch
+
 # Make Eee disk faster.
 Patch2010: linux-2.6-sata-eeepc-faster.patch
 
@@ -1145,6 +1150,10 @@
 
 ApplyPatch linux-2.6-e1000-ich9.patch
 
+ApplyPatch linux-2.6-e1000e-add-support-for-the-82567LM-4-device.patch
+ApplyPatch linux-2.6-e1000e-add-support-for-82567LM-3-and-82567LF-3-ICH10D-parts.patch
+ApplyPatch linux-2.6-e1000e-add-support-for-new-82574L-part.patch
+
 ApplyPatch linux-2.6-sata-eeepc-faster.patch
 ApplyPatch linux-2.6-eeepc-laptop-update.patch
 
@@ -1746,6 +1755,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Sep 10 2008 Mark McLoughlin <markmc at redhat.com>
+- Pull in new e1000e hardware support (e.g. ich10) from net-next-2.6
+
 * Tue Sep 09 2008 Dave Airlie <airlied at redhat.com>
 - Update radeon modesetting - memory setup + ref count fail
 



From pertusus at fedoraproject.org  Wed Sep 10 17:01:07 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Wed, 10 Sep 2008 17:01:07 +0000 (UTC)
Subject: rpms/dap-hdf4_handler/devel hdf4_handler-3.7.9-gcc43.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 dap-hdf4_handler.spec, 1.20,
	1.21 sources, 1.7, 1.8 dap-hdf4_handler-3.7.7-open.patch, 1.1, NONE
Message-ID: <20080910170107.9D2977012C@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/dap-hdf4_handler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29603

Modified Files:
	.cvsignore dap-hdf4_handler.spec sources 
Added Files:
	hdf4_handler-3.7.9-gcc43.patch 
Removed Files:
	dap-hdf4_handler-3.7.7-open.patch 
Log Message:
* Fri Sep  5 2008 Patrice Dumas <pertusus at free.fr> 3.7.9-1
- update to 3.7.9
- remove now unneeded open patch


hdf4_handler-3.7.9-gcc43.patch:

--- NEW FILE hdf4_handler-3.7.9-gcc43.patch ---
diff -up hdf4_handler-3.7.9/HDF4RequestHandler.cc.gcc43 hdf4_handler-3.7.9/HDF4RequestHandler.cc
--- hdf4_handler-3.7.9/HDF4RequestHandler.cc.gcc43	2008-06-20 21:51:24.000000000 +0200
+++ hdf4_handler-3.7.9/HDF4RequestHandler.cc	2008-09-05 18:30:47.000000000 +0200
@@ -28,6 +28,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <cstdlib>
 
 #include "HDF4RequestHandler.h"
 #include "BESResponseNames.h"
diff -up hdf4_handler-3.7.9/eosdas-test.cc.gcc43 hdf4_handler-3.7.9/eosdas-test.cc
--- hdf4_handler-3.7.9/eosdas-test.cc.gcc43	2008-09-05 18:37:24.000000000 +0200
+++ hdf4_handler-3.7.9/eosdas-test.cc	2008-09-05 18:37:56.000000000 +0200
@@ -54,6 +54,7 @@ static char rcsid[] not_used =
 
 #include <iostream>
 #include <string>
+#include <cstdlib>
 
 #include <GetOpt.h>
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Jan 2008 00:16:35 -0000	1.7
+++ .cvsignore	10 Sep 2008 17:00:37 -0000	1.8
@@ -1 +1 @@
-hdf4_handler-3.7.7.tar.gz
+hdf4_handler-3.7.9.tar.gz


Index: dap-hdf4_handler.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/dap-hdf4_handler.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- dap-hdf4_handler.spec	19 Feb 2008 18:06:19 -0000	1.20
+++ dap-hdf4_handler.spec	10 Sep 2008 17:00:37 -0000	1.21
@@ -1,15 +1,15 @@
 Summary:         HDF4 data handler for the OPeNDAP Data server
 Name:            dap-hdf4_handler
-Version:         3.7.7
-Release:         4%{?dist}
+Version:         3.7.9
+Release:         1%{?dist}
 License:         LGPLv2+
 Group:           System Environment/Daemons 
 Source0:         http://www.opendap.org/pub/source/hdf4_handler-%{version}.tar.gz
-Patch0:          %{name}-3.7.7-open.patch
+Patch0:          hdf4_handler-3.7.9-gcc43.patch
 URL:             http://www.opendap.org/
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:   libdap-devel >= 3.7.5 hdf-devel
+BuildRequires:   libdap-devel >= 3.8.2 hdf-devel
 BuildRequires:   bes-devel
 
 %description
@@ -19,7 +19,7 @@
 
 %prep 
 %setup -q -n hdf4_handler-%{version}
-%patch0 -p0
+%patch0 -p1 -b .gcc43
 
 %build
 %configure --disable-dependency-tracking --disable-static
@@ -43,6 +43,10 @@
 %doc COPYING COPYRIGHT_URI NEWS README
 
 %changelog
+* Fri Sep  5 2008 Patrice Dumas <pertusus at free.fr> 3.7.9-1
+- update to 3.7.9
+- remove now unneeded open patch
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.7.7-4
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Jan 2008 00:16:35 -0000	1.7
+++ sources	10 Sep 2008 17:00:37 -0000	1.8
@@ -1 +1 @@
-29a90c3396e85549910354b5e89a7d0e  hdf4_handler-3.7.7.tar.gz
+48b9705084629b3dab9a72c0026b0e3e  hdf4_handler-3.7.9.tar.gz


--- dap-hdf4_handler-3.7.7-open.patch DELETED ---



From pertusus at fedoraproject.org  Wed Sep 10 17:03:07 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Wed, 10 Sep 2008 17:03:07 +0000 (UTC)
Subject: rpms/dap-freeform_handler/devel
	dap-freeform_handler-3.7.9-gcc43.patch, NONE, 1.1 .cvsignore,
	1.7, 1.8 dap-freeform_handler.spec, 1.14, 1.15 sources, 1.7, 1.8
Message-ID: <20080910170307.4C38D7012C@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/dap-freeform_handler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30243

Modified Files:
	.cvsignore dap-freeform_handler.spec sources 
Added Files:
	dap-freeform_handler-3.7.9-gcc43.patch 
Log Message:
* Fri Sep  5 2008 Patrice Dumas <pertusus at free.fr> 3.7.9-1
- update to 3.7.9


dap-freeform_handler-3.7.9-gcc43.patch:

--- NEW FILE dap-freeform_handler-3.7.9-gcc43.patch ---
diff -up freeform_handler-3.7.9/DODS_Date.cc.gcc43 freeform_handler-3.7.9/DODS_Date.cc
--- freeform_handler-3.7.9/DODS_Date.cc.gcc43	2005-09-15 23:03:52.000000000 +0200
+++ freeform_handler-3.7.9/DODS_Date.cc	2008-09-10 15:00:40.000000000 +0200
@@ -37,6 +37,7 @@
 static char rcsid[] not_used ="$Id: DODS_Date.cc 12177 2005-09-15 21:03:52Z jimg $";
 
 
+#include <cstdlib>
 #include <stdio.h>
 #include <assert.h>
 
diff -up freeform_handler-3.7.9/DODS_Date_Time.cc.gcc43 freeform_handler-3.7.9/DODS_Date_Time.cc
--- freeform_handler-3.7.9/DODS_Date_Time.cc.gcc43	2008-09-10 16:50:02.000000000 +0200
+++ freeform_handler-3.7.9/DODS_Date_Time.cc	2008-09-10 16:50:25.000000000 +0200
@@ -40,6 +40,7 @@ static char rcsid[] not_used ="$Id: DODS
 #include <stdio.h>
 #include <time.h>
 #include <assert.h>
+#include <cstdlib>
 
 #include <sstream>
 #include <string>
diff -up freeform_handler-3.7.9/FFStr.cc.gcc43 freeform_handler-3.7.9/FFStr.cc
--- freeform_handler-3.7.9/FFStr.cc.gcc43	2007-09-21 01:17:58.000000000 +0200
+++ freeform_handler-3.7.9/FFStr.cc	2008-09-10 15:00:40.000000000 +0200
@@ -45,6 +45,7 @@ static char rcsid[] not_used = {"$Id: FF
 
 #include <ctype.h>
 #include <string>
+#include <cstring>
 
 #include "FFStr.h"
 #include "util.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dap-freeform_handler/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Jan 2008 00:21:40 -0000	1.7
+++ .cvsignore	10 Sep 2008 17:02:36 -0000	1.8
@@ -1 +1 @@
-freeform_handler-3.7.7.tar.gz
+freeform_handler-3.7.9.tar.gz


Index: dap-freeform_handler.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-freeform_handler/devel/dap-freeform_handler.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dap-freeform_handler.spec	19 Feb 2008 18:05:09 -0000	1.14
+++ dap-freeform_handler.spec	10 Sep 2008 17:02:36 -0000	1.15
@@ -1,14 +1,15 @@
 Summary:         FreeForm data handler for the OPeNDAP Data server
 Name:            dap-freeform_handler
-Version:         3.7.7
-Release:         3%{?dist}
+Version:         3.7.9
+Release:         1%{?dist}
 License:         LGPLv2+
 Group:           System Environment/Daemons 
 Source0:         http://www.opendap.org/pub/source/freeform_handler-%{version}.tar.gz
+Patch0:          dap-freeform_handler-3.7.9-gcc43.patch
 URL:             http://www.opendap.org/
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:   libdap-devel >= 3.7.10
+BuildRequires:   libdap-devel >= 3.8.2
 BuildRequires:   bes-devel >= 3.5.3
 
 %description 
@@ -20,6 +21,7 @@
 
 %prep 
 %setup -q -n freeform_handler-%{version}
+%patch0 -p1 -b .gcc43
 
 %build
 %configure --disable-static --disable-dependency-tracking
@@ -50,6 +52,9 @@
 %doc COPYING COPYRIGHT NEWS README
 
 %changelog
+* Fri Sep  5 2008 Patrice Dumas <pertusus at free.fr> 3.7.9-1
+- update to 3.7.9
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.7.7-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dap-freeform_handler/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Jan 2008 00:21:40 -0000	1.7
+++ sources	10 Sep 2008 17:02:36 -0000	1.8
@@ -1 +1 @@
-71085f8d9fdf0c28e78a77d633e5cbc4  freeform_handler-3.7.7.tar.gz
+2cbbfedb32bbeb06918d34d9c9066b95  freeform_handler-3.7.9.tar.gz



From s4504kr at fedoraproject.org  Wed Sep 10 17:03:46 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 10 Sep 2008 17:03:46 +0000 (UTC)
Subject: rpms/aplus-fsf/devel aplus-fsf-4.20-atree.patch, 1.1,
	NONE aplus-fsf-4.20-gcc41.patch, 1.1,
	NONE aplus-fsf-4.22-makefile.patch, 1.1, NONE
Message-ID: <20080910170346.48F147012C@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30512

Removed Files:
	aplus-fsf-4.20-atree.patch aplus-fsf-4.20-gcc41.patch 
	aplus-fsf-4.22-makefile.patch 
Log Message:
Remove unneeded files


--- aplus-fsf-4.20-atree.patch DELETED ---


--- aplus-fsf-4.20-gcc41.patch DELETED ---


--- aplus-fsf-4.22-makefile.patch DELETED ---



From spot at fedoraproject.org  Wed Sep 10 17:06:06 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 10 Sep 2008 17:06:06 +0000 (UTC)
Subject: rpms/mosml/devel dead.package, NONE, 1.1 mosml-fpic.patch, 1.1,
	NONE mosml-install.patch, 1.1, NONE mosml-ld.patch, 1.1,
	NONE mosml-shared.patch, 1.1, NONE mosml.spec, 1.3, NONE sources,
	1.1, NONE
Message-ID: <20080910170606.CB1777012C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/mosml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31250

Added Files:
	dead.package 
Removed Files:
	mosml-fpic.patch mosml-install.patch mosml-ld.patch 
	mosml-shared.patch mosml.spec sources 
Log Message:
dead.package mosml due to licensing issues


--- NEW FILE dead.package ---
This code (Moscow ML) is under several licenses, but some of it is directly derived from an old version of of Caml Light, so even though Moscow ML is
mostly licensed under the GPL (version 2 or later), it is incompatible with the old INRIA Caml Light license (which was non-free). This
makes the whole work non distributable (and non-free). I made attempts to contact INRIA to see if they would grant permission for the Moscow ML
derived work to inherit newer license permissions (the current INRIA Caml Light version is Free), but they never responded.

If/when INRIA or Moscow ML resolves this licensing issue, this package could be reconsidered for Fedora.

Tom "spot" Callaway <tcallawa at redhat.com> Wednesday September 10, 2008 



--- mosml-fpic.patch DELETED ---


--- mosml-install.patch DELETED ---


--- mosml-ld.patch DELETED ---


--- mosml-shared.patch DELETED ---


--- mosml.spec DELETED ---


--- sources DELETED ---



From amdunn at fedoraproject.org  Wed Sep 10 17:13:34 2008
From: amdunn at fedoraproject.org (Alan Dunn)
Date: Wed, 10 Sep 2008 17:13:34 +0000 (UTC)
Subject: rpms/coq/devel coq.spec,1.3,1.4 import.log,1.3,1.4
Message-ID: <20080910171334.F2C5A7012C@cvs1.fedora.phx.redhat.com>

Author: amdunn

Update of /cvs/pkgs/rpms/coq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32202/devel

Modified Files:
	coq.spec import.log 
Log Message:
Fix prelink issues that cause binaries to stop working and implement execstack fix.



Index: coq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coq/devel/coq.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- coq.spec	5 Aug 2008 18:56:38 -0000	1.3
+++ coq.spec	10 Sep 2008 17:13:04 -0000	1.4
@@ -25,7 +25,7 @@
 
 Name:		coq
 Version:	8.1pl3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Coq proof management system
 
 Group:		Applications/Engineering
@@ -49,11 +49,12 @@
 Patch4:		makefile-parser.patch
 Patch5:		parser-man.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
+BuildRequires:	ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs, prelink
 
 %if 0%{?fedora} < 9
 BuildRequires: tetex, tetex-latex
 # There's no ocaml-camlp5-devel for ppc64 in Fedora <= 8
+# bz# 458467
 ExcludeArch: ppc64
 %else
 BuildRequires: texlive-latex, texlive-texmf
@@ -215,6 +216,11 @@
 # 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
+done
+
 %install
 rm -rf %{buildroot}
 
@@ -242,6 +248,21 @@
 %endif
 mv RecTutorial.v %{buildroot}%{tutorialcodedir}
 
+# Make sure that prelink does not foul up our bytecode executables by
+# stripping them with a cron job. This is done in install to ensure
+# that exactly the files that are eventually installed are in the
+# list, not all of the files in the bin directory of the build
+
+%define prelinkfilename %{name}-prelink.conf
+cd %{buildroot}%{_bindir}
+for f in *; do
+file $f | grep "not stripped" | sed -e 's/:.*//' -e 's!^!-b %{_bindir}/!' >> %{prelinkfilename}
+done
+
+%define prelinkconfdir %{_sysconfdir}/prelink.conf.d
+mkdir -p %{buildroot}%{prelinkconfdir}
+mv %{prelinkfilename} %{buildroot}%{prelinkconfdir}
+
 %clean
 rm -rf %{buildroot}
 
@@ -256,10 +277,10 @@
 %{_datadir}/coq
 %{_bindir}/coq*
 %{_bindir}/gallina
-%{_bindir}/coq-parser
-%if %{opt}
-%{_bindir}/coq-parser.opt
-%endif
+# %%{_bindir}/coq-parser
+# %%if %%{opt}
+# %%{_bindir}/coq-parser.opt
+# %%endif
 # Exclude ide files to put in a separate package
 %exclude %{_bindir}/coqide*
 %exclude %{_datadir}/coq/ide
@@ -267,6 +288,10 @@
 %exclude %{_datadir}/coq/*.cmxa
 %endif
 %{tex_dir}/coq*
+# We DO want to replace any such file with this name - it will only be
+# for Coq, and we want to correctly reflect the set of files that
+# needs to be blacklisted from prelink with this new install
+%config %{prelinkconfdir}/%{prelinkfilename}
 
 %files coqide
 %defattr(-,root,root,-)
@@ -300,6 +325,9 @@
 %doc README.coq-emacs
 
 %changelog
+* Tue Sep 09 2008 Alan Dunn <amdunn at gmail.com> 8.1pl3-4
+- Added creation of prelink blacklist for any bytecode files.
+- Fixed execstack status for binaries.
 * Tue Aug 05 2008 Alan Dunn <amdunn at gmail.com> 8.1pl3-3
 - Changed parser to coq-parser to avoid name conflict with
   coda-client.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/coq/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	5 Aug 2008 18:56:38 -0000	1.3
+++ import.log	10 Sep 2008 17:13:04 -0000	1.4
@@ -1,3 +1,4 @@
 coq-8_1pl3-1_fc9:HEAD:coq-8.1pl3-1.fc9.src.rpm:1216233878
 coq-8_1pl3-2_fc10:HEAD:coq-8.1pl3-2.fc10.src.rpm:1216546261
 coq-8_1pl3-3_fc9:HEAD:coq-8.1pl3-3.fc9.src.rpm:1217962473
+coq-8_1pl3-4_fc9:HEAD:coq-8.1pl3-4.fc9.src.rpm:1221066400



From amdunn at fedoraproject.org  Wed Sep 10 17:14:51 2008
From: amdunn at fedoraproject.org (Alan Dunn)
Date: Wed, 10 Sep 2008 17:14:51 +0000 (UTC)
Subject: rpms/coq/F-9 coq.spec,1.3,1.4 import.log,1.3,1.4
Message-ID: <20080910171451.0E4F27012C@cvs1.fedora.phx.redhat.com>

Author: amdunn

Update of /cvs/pkgs/rpms/coq/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32413/F-9

Modified Files:
	coq.spec import.log 
Log Message:
Fix prelink issues that prevent binaries from working and implement execstack fix.



Index: coq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coq/F-9/coq.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- coq.spec	6 Aug 2008 01:48:31 -0000	1.3
+++ coq.spec	10 Sep 2008 17:14:20 -0000	1.4
@@ -25,7 +25,7 @@
 
 Name:		coq
 Version:	8.1pl3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Coq proof management system
 
 Group:		Applications/Engineering
@@ -49,11 +49,12 @@
 Patch4:		makefile-parser.patch
 Patch5:		parser-man.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
+BuildRequires:	ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs, prelink
 
 %if 0%{?fedora} < 9
 BuildRequires: tetex, tetex-latex
 # There's no ocaml-camlp5-devel for ppc64 in Fedora <= 8
+# bz# 458467
 ExcludeArch: ppc64
 %else
 BuildRequires: texlive-latex, texlive-texmf
@@ -215,6 +216,11 @@
 # 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
+done
+
 %install
 rm -rf %{buildroot}
 
@@ -242,6 +248,21 @@
 %endif
 mv RecTutorial.v %{buildroot}%{tutorialcodedir}
 
+# Make sure that prelink does not foul up our bytecode executables by
+# stripping them with a cron job. This is done in install to ensure
+# that exactly the files that are eventually installed are in the
+# list, not all of the files in the bin directory of the build
+
+%define prelinkfilename %{name}-prelink.conf
+cd %{buildroot}%{_bindir}
+for f in *; do
+file $f | grep "not stripped" | sed -e 's/:.*//' -e 's!^!-b %{_bindir}/!' >> %{prelinkfilename}
+done
+
+%define prelinkconfdir %{_sysconfdir}/prelink.conf.d
+mkdir -p %{buildroot}%{prelinkconfdir}
+mv %{prelinkfilename} %{buildroot}%{prelinkconfdir}
+
 %clean
 rm -rf %{buildroot}
 
@@ -256,10 +277,10 @@
 %{_datadir}/coq
 %{_bindir}/coq*
 %{_bindir}/gallina
-%{_bindir}/coq-parser
-%if %{opt}
-%{_bindir}/coq-parser.opt
-%endif
+# %%{_bindir}/coq-parser
+# %%if %%{opt}
+# %%{_bindir}/coq-parser.opt
+# %%endif
 # Exclude ide files to put in a separate package
 %exclude %{_bindir}/coqide*
 %exclude %{_datadir}/coq/ide
@@ -267,6 +288,10 @@
 %exclude %{_datadir}/coq/*.cmxa
 %endif
 %{tex_dir}/coq*
+# We DO want to replace any such file with this name - it will only be
+# for Coq, and we want to correctly reflect the set of files that
+# needs to be blacklisted from prelink with this new install
+%config %{prelinkconfdir}/%{prelinkfilename}
 
 %files coqide
 %defattr(-,root,root,-)
@@ -300,6 +325,9 @@
 %doc README.coq-emacs
 
 %changelog
+* Tue Sep 09 2008 Alan Dunn <amdunn at gmail.com> 8.1pl3-4
+- Added creation of prelink blacklist for any bytecode files.
+- Fixed execstack status for binaries.
 * Tue Aug 05 2008 Alan Dunn <amdunn at gmail.com> 8.1pl3-3
 - Changed parser to coq-parser to avoid name conflict with
   coda-client.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/coq/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	6 Aug 2008 01:48:31 -0000	1.3
+++ import.log	10 Sep 2008 17:14:20 -0000	1.4
@@ -1,3 +1,4 @@
 coq-8_1pl3-1_fc9:F-9:coq-8.1pl3-1.fc9.src.rpm:1216234547
 coq-8_1pl3-2_fc9:F-9:coq-8.1pl3-2.fc9.src.rpm:1216551707
 coq-8_1pl3-3_fc9:F-9:coq-8.1pl3-3.fc9.src.rpm:1217987203
+coq-8_1pl3-4_fc9:F-9:coq-8.1pl3-4.fc9.src.rpm:1221066514



From amdunn at fedoraproject.org  Wed Sep 10 17:16:41 2008
From: amdunn at fedoraproject.org (Alan Dunn)
Date: Wed, 10 Sep 2008 17:16:41 +0000 (UTC)
Subject: rpms/coq/F-8 coq.spec,1.5,1.6 import.log,1.5,1.6
Message-ID: <20080910171641.8287A7012C@cvs1.fedora.phx.redhat.com>

Author: amdunn

Update of /cvs/pkgs/rpms/coq/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32762/F-8

Modified Files:
	coq.spec import.log 
Log Message:
Fix prelink issue that prevents binaries from working and implement execstack fix.



Index: coq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coq/F-8/coq.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- coq.spec	6 Aug 2008 01:55:49 -0000	1.5
+++ coq.spec	10 Sep 2008 17:16:11 -0000	1.6
@@ -25,7 +25,7 @@
 
 Name:		coq
 Version:	8.1pl3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Coq proof management system
 
 Group:		Applications/Engineering
@@ -49,11 +49,12 @@
 Patch4:		makefile-parser.patch
 Patch5:		parser-man.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
+BuildRequires:	ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs, prelink
 
 %if 0%{?fedora} < 9
 BuildRequires: tetex, tetex-latex
 # There's no ocaml-camlp5-devel for ppc64 in Fedora <= 8
+# bz# 458467
 ExcludeArch: ppc64
 %else
 BuildRequires: texlive-latex, texlive-texmf
@@ -215,6 +216,9 @@
 # Fix permissions in the documentation
 chmod -R a+rX refman stdlib
 
+# Clear any execstack permissions that binaries may have
+execstack -c bin/*
+
 %install
 rm -rf %{buildroot}
 
@@ -242,6 +246,21 @@
 %endif
 mv RecTutorial.v %{buildroot}%{tutorialcodedir}
 
+# Make sure that prelink does not foul up our bytecode executables by
+# stripping them with a cron job. This is done in install to ensure
+# that exactly the files that are eventually installed are in the
+# list, not all of the files in the bin directory of the build
+
+%define prelinkfilename %{name}-prelink.conf
+cd %{buildroot}%{_bindir}
+for f in *; do
+file $f | grep "not stripped" | sed -e 's/:.*//' -e 's!^!-b %{_bindir}/!' >> %{prelinkfilename}
+done
+
+%define prelinkconfdir %{_sysconfdir}/prelink.conf.d
+mkdir -p %{buildroot}%{prelinkconfdir}
+mv %{prelinkfilename} %{buildroot}%{prelinkconfdir}
+
 %clean
 rm -rf %{buildroot}
 
@@ -256,10 +275,10 @@
 %{_datadir}/coq
 %{_bindir}/coq*
 %{_bindir}/gallina
-%{_bindir}/coq-parser
-%if %{opt}
-%{_bindir}/coq-parser.opt
-%endif
+# %%{_bindir}/coq-parser
+# %%if %%{opt}
+# %%{_bindir}/coq-parser.opt
+# %%endif
 # Exclude ide files to put in a separate package
 %exclude %{_bindir}/coqide*
 %exclude %{_datadir}/coq/ide
@@ -267,6 +286,10 @@
 %exclude %{_datadir}/coq/*.cmxa
 %endif
 %{tex_dir}/coq*
+# We DO want to replace any such file with this name - it will only be
+# for Coq, and we want to correctly reflect the set of files that
+# needs to be blacklisted from prelink with this new install
+%config %{prelinkconfdir}/%{prelinkfilename}
 
 %files coqide
 %defattr(-,root,root,-)
@@ -300,6 +323,9 @@
 %doc README.coq-emacs
 
 %changelog
+* Tue Sep 09 2008 Alan Dunn <amdunn at gmail.com> 8.1pl3-4
+- Added creation of prelink blacklist for any bytecode files.
+- Fixed execstack status for binaries.
 * Tue Aug 05 2008 Alan Dunn <amdunn at gmail.com> 8.1pl3-3
 - Changed parser to coq-parser to avoid name conflict with
   coda-client.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/coq/F-8/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	6 Aug 2008 01:55:49 -0000	1.5
+++ import.log	10 Sep 2008 17:16:11 -0000	1.6
@@ -3,3 +3,4 @@
 coq-8_1pl3-2_fc8:F-8:coq-8.1pl3-2.fc8.src.rpm:1216557367
 coq-8_1pl3-2_fc8_1:F-8:coq-8.1pl3-2.fc8.1.src.rpm:1216558147
 coq-8_1pl3-3_fc8:F-8:coq-8.1pl3-3.fc8.src.rpm:1217987468
+coq-8_1pl3-4_fc8:F-8:coq-8.1pl3-4.fc8.src.rpm:1221066654



From dwalsh at fedoraproject.org  Wed Sep 10 17:19:35 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 10 Sep 2008 17:19:35 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.85, 1.86 setroubleshoot.spec,
	1.104, 1.105 sources, 1.96, 1.97
Message-ID: <20080910171935.DF59D7012C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv682

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.10-1
- Fix startup problems



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- .cvsignore	10 Sep 2008 15:58:40 -0000	1.85
+++ .cvsignore	10 Sep 2008 17:19:05 -0000	1.86
@@ -1,3 +1,4 @@
 setroubleshoot-2.0.6.tar.gz
 setroubleshoot-2.0.8.tar.gz
 setroubleshoot-2.0.9.tar.gz
+setroubleshoot-2.0.10.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- setroubleshoot.spec	10 Sep 2008 15:58:40 -0000	1.104
+++ setroubleshoot.spec	10 Sep 2008 17:19:05 -0000	1.105
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.0.9
+Version: 2.0.10
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -182,7 +182,7 @@
 %attr(0755,root,root) /etc/rc.d/init.d/%{name}
 
 %changelog
-* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.9-1
+* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.10-1
 - Fix startup problems
 
 * Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.8-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- sources	10 Sep 2008 15:58:40 -0000	1.96
+++ sources	10 Sep 2008 17:19:05 -0000	1.97
@@ -1 +1 @@
-59510155065fc9b8c3f400ee624587be  setroubleshoot-2.0.9.tar.gz
+91ad882b93b6c38e6ede6c9766c45fe8  setroubleshoot-2.0.10.tar.gz



From cjb at fedoraproject.org  Wed Sep 10 17:47:06 2008
From: cjb at fedoraproject.org (Chris Ball)
Date: Wed, 10 Sep 2008 17:47:06 +0000 (UTC)
Subject: rpms/ohm/OLPC-3 .cvsignore, 1.8, 1.9 ohm.spec, 1.10, 1.11 sources,
	1.8, 1.9
Message-ID: <20080910174706.DABF47012C@cvs1.fedora.phx.redhat.com>

Author: cjb

Update of /cvs/pkgs/rpms/ohm/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2185

Modified Files:
	.cvsignore ohm.spec sources 
Log Message:
Bugfix for OLPC Trac #8062.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/OLPC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	9 Sep 2008 21:31:38 -0000	1.8
+++ .cvsignore	10 Sep 2008 17:46:36 -0000	1.9
@@ -1 +1 @@
-ohm-0.1.1-1.20080910git.tar.gz
+ohm-0.1.1-1.20080911git.tar.gz


Index: ohm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/OLPC-3/ohm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ohm.spec	9 Sep 2008 21:36:06 -0000	1.10
+++ ohm.spec	10 Sep 2008 17:46:36 -0000	1.11
@@ -2,12 +2,12 @@
 %define gtk2_version            2.10.0
 %define dbus_version            0.70
 %define gettext_version         0.14
-%define alphatag                20080910git
+%define alphatag                20080911git
 
 Summary: Open Hardware Manager
 Name: ohm
 Version: 0.1.1
-Release: 6.19.%{alphatag}%{?dist}
+Release: 6.20.%{alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/ohm
 Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz
 
@@ -137,6 +137,9 @@
 %{_includedir}/*
 
 %changelog
+* Wed Sep 10 2008 Chris Ball <cjb at laptop.org> - 0.1.1-6.20.20080911git.olpc
+- #8062:  Bugfix -- look for automaticpm, not automatic_pm. 
+
 * Tue Sep 09 2008 Chris Ball <cjb at laptop.org> - 0.1.1-6.19.20080910git.olpc
 - #7981:  Use more efficient EC mask setting.
 - #8062:  Inherit automatic/extreme PM settings from the Sugar profile.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/OLPC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	9 Sep 2008 21:31:39 -0000	1.8
+++ sources	10 Sep 2008 17:46:36 -0000	1.9
@@ -1 +1 @@
-7279a896734f6c1786ccb2d401a25769  ohm-0.1.1-1.20080910git.tar.gz
+e5226422e8e455a27bb5b6a38d576594  ohm-0.1.1-1.20080911git.tar.gz



From ajax at fedoraproject.org  Wed Sep 10 17:48:34 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 10 Sep 2008 17:48:34 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-6.9.0-fb-size.patch, 1.1,
	1.2 xorg-x11-drv-ati.spec, 1.111, 1.112
Message-ID: <20080910174834.889097012C@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-serv2341

Modified Files:
	radeon-6.9.0-fb-size.patch xorg-x11-drv-ati.spec 
Log Message:
* Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 6.9.0-12
- Do the fb size hack a differently bad way.


radeon-6.9.0-fb-size.patch:

Index: radeon-6.9.0-fb-size.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-6.9.0-fb-size.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- radeon-6.9.0-fb-size.patch	8 Sep 2008 19:20:47 -0000	1.1
+++ radeon-6.9.0-fb-size.patch	10 Sep 2008 17:48:04 -0000	1.2
@@ -1,56 +1,27 @@
 diff -up xf86-video-ati-6.9.0/src/radeon_driver.c.jx xf86-video-ati-6.9.0/src/radeon_driver.c
---- xf86-video-ati-6.9.0/src/radeon_driver.c.jx	2008-09-08 14:17:30.000000000 -0400
-+++ xf86-video-ati-6.9.0/src/radeon_driver.c	2008-09-08 14:44:15.000000000 -0400
-@@ -2713,6 +2713,7 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in
-     xf86Int10InfoPtr  pInt10 = NULL;
-     void *int10_save = NULL;
-     const char *s;
-+    int crtc_min_X = 320, crtc_min_Y = 200;
-     int crtc_max_X, crtc_max_Y;
-     RADEONEntPtr pRADEONEnt;
-     DevUnion* pPriv;
-@@ -2936,19 +2937,25 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in
- 	     * note that these aren't really the CRTC limits, they're just
- 	     * heuristics until we have a better memory manager.
- 	     */
--	    if (pScrn->videoRam <= 16384) {
-+	    if (pScrn->videoRam <= 32768) {
- 		crtc_max_X = 1600;
- 		crtc_max_Y = 1200;
--	    } else if (IS_R300_VARIANT) {
--		crtc_max_X = 2560;
--		crtc_max_Y = 1200;
--	    } else if (IS_AVIVO_VARIANT) {
--		crtc_max_X = 2560;
--		crtc_max_Y = 1600;
-+	    } else if (pScrn->videoRam <= 65536) {
-+		crtc_min_X = 3360;
-+		crtc_min_Y = 1050;
-+		crtc_max_X = 3968;
-+		crtc_max_Y = 1440;
+--- xf86-video-ati-6.9.0/src/radeon_driver.c.jx	2008-09-10 13:03:42.000000000 -0400
++++ xf86-video-ati-6.9.0/src/radeon_driver.c	2008-09-10 13:16:02.000000000 -0400
+@@ -2948,16 +2948,14 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in
  	    } else {
--		crtc_max_X = 2048;
--		crtc_max_Y = 1200;
--	}
-+		crtc_min_X = 3840;
-+		crtc_min_Y = 1200;
-+		if (IS_AVIVO_VARIANT) {
-+		    crtc_max_X = 5120;
-+		    crtc_max_Y = 1600;
-+		} else {
-+		    crtc_max_X = 3968;
-+		    crtc_max_Y = 1440;
-+		}
+ 		crtc_max_X = 2048;
+ 		crtc_max_Y = 1200;
++	    }
++
++	    if (pScrn->videoRam > 65536) {
++		pScrn->display->virtualX = 3840;
++		pScrn->display->virtualY = 1200;
 +	    }
  	}
- 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Max desktop size set to %dx%d\n",
- 		   crtc_max_X, crtc_max_Y);
-@@ -2959,7 +2966,7 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in
- 		   "reduce the desktop size by adjusting the Virtual line to your xorg.conf\n");
- 	
+-	}
+-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Max desktop size set to %dx%d\n",
+-		   crtc_max_X, crtc_max_Y);
+-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+-		   "For a larger or smaller max desktop size, add a Virtual line to your xorg.conf\n");
+-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+-		   "If you are having trouble with 3D, "
+-		   "reduce the desktop size by adjusting the Virtual line to your xorg.conf\n");
+-	
++
      /*xf86CrtcSetSizeRange (pScrn, 320, 200, info->MaxSurfaceWidth, info->MaxLines);*/
--	xf86CrtcSetSizeRange (pScrn, 320, 200, crtc_max_X, crtc_max_Y);
-+	xf86CrtcSetSizeRange (pScrn, crtc_min_X, crtc_min_Y, crtc_max_X, crtc_max_Y);
+ 	xf86CrtcSetSizeRange (pScrn, 320, 200, crtc_max_X, crtc_max_Y);
  	
- 	RADEONPreInitDDC(pScrn);
- 


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.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- xorg-x11-drv-ati.spec	9 Sep 2008 19:20:18 -0000	1.111
+++ xorg-x11-drv-ati.spec	10 Sep 2008 17:48:04 -0000	1.112
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   11%{?dist}
+Release:   12%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -73,6 +73,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 6.9.0-12
+- Do the fb size hack a differently bad way.
+
 * Tue Sep  9 2008 Kristian H??gsberg <krh at redhat.com> 6.9.0-11
 - Restore CFLAGS after testing for DRM_MODE in radeon-modeset.patch.
 



From dwalsh at fedoraproject.org  Wed Sep 10 17:54:54 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 10 Sep 2008 17:54:54 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.10,
	1.11 setroubleshoot-plugins.spec, 1.12, 1.13 sources, 1.11, 1.12
Message-ID: <20080910175454.7AAD17012C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2822

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Wed Sep 10 2008  <dwalsh at redhat.com> - 2.0.8-1
- Add qemu plugins



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	9 Sep 2008 15:54:18 -0000	1.10
+++ .cvsignore	10 Sep 2008 17:54:24 -0000	1.11
@@ -1,2 +1,3 @@
 setroubleshoot-plugins-2.0.4.tar.gz
 setroubleshoot-plugins-2.0.7.tar.gz
+setroubleshoot-plugins-2.0.8.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- setroubleshoot-plugins.spec	9 Sep 2008 15:54:18 -0000	1.12
+++ setroubleshoot-plugins.spec	10 Sep 2008 17:54:24 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.0.4
-Release: 7%{?dist}
+Version: 2.0.8
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -52,6 +52,9 @@
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Wed Sep 10 2008  <dwalsh at redhat.com> - 2.0.8-1
+- Add qemu plugins
+
 * Tue Sep 9 2008  <dwalsh at redhat.com> - 2.0.7-1
 - Add catchall_booleans plugin, fix spelling
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	9 Sep 2008 15:54:18 -0000	1.11
+++ sources	10 Sep 2008 17:54:24 -0000	1.12
@@ -1 +1 @@
-980b9e0663551c56a44ba11bba02e935  setroubleshoot-plugins-2.0.7.tar.gz
+dd5ed456549af92f00531a3d786e161a  setroubleshoot-plugins-2.0.8.tar.gz



From notting at fedoraproject.org  Wed Sep 10 17:55:54 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 10 Sep 2008 17:55:54 +0000 (UTC)
Subject: rpms/libofx/F-9 libofx-account-type.patch, 1.1,
	1.2 libofx-version.patch, 1.1, 1.2 libofx.spec, 1.34, 1.35
Message-ID: <20080910175554.6B4927012C@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/libofx/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2980

Modified Files:
	libofx-account-type.patch libofx-version.patch libofx.spec 
Log Message:
Fix patches (#415961)


libofx-account-type.patch:

Index: libofx-account-type.patch
===================================================================
RCS file: /cvs/extras/rpms/libofx/F-9/libofx-account-type.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libofx-account-type.patch	14 Feb 2008 18:48:22 -0000	1.1
+++ libofx-account-type.patch	10 Sep 2008 17:55:24 -0000	1.2
@@ -1,10 +1,11 @@
-diff -up libofx-0.8.3/lib/ofx_request_statement.cpp.foo libofx-0.8.3/lib/ofx_request_statement.cpp
---- libofx-0.8.3/lib/ofx_request_statement.cpp.foo	2008-02-14 13:40:01.000000000 -0500
-+++ libofx-0.8.3/lib/ofx_request_statement.cpp	2008-02-14 13:41:10.000000000 -0500
-@@ -63,7 +63,16 @@ OfxAggregate OfxStatementRequest::BankSt
+diff -up libofx-0.8.3/lib/ofx_request_statement.cpp.acc libofx-0.8.3/lib/ofx_request_statement.cpp
+--- libofx-0.8.3/lib/ofx_request_statement.cpp.acc	2007-01-08 22:35:30.000000000 -0500
++++ libofx-0.8.3/lib/ofx_request_statement.cpp	2008-09-10 13:52:19.000000000 -0400
+@@ -61,8 +62,16 @@ OfxAggregate OfxStatementRequest::BankSt
+   OfxAggregate bankacctfromTag("BANKACCTFROM");
    bankacctfromTag.Add( "BANKID", m_account.bankid );
    bankacctfromTag.Add( "ACCTID", m_account.accountid );
-   bankacctfromTag.Add( "ACCTTYPE", "CHECKING" );
+-  bankacctfromTag.Add( "ACCTTYPE", "CHECKING" );
 -  // FIXME "CHECKING" should not be hard-coded
 +  if ( m_account.type == OFX_CHECKING_ACCOUNT || m_account.type == OFX_BANK_ACCOUNT )
 +    bankacctfromTag.Add( "ACCTTYPE", "CHECKING" );
@@ -19,20 +20,3 @@
  
    OfxAggregate inctranTag("INCTRAN");
    inctranTag.Add( "DTSTART", time_t_to_ofxdate( m_date_from ) );
-diff -up libofx-0.8.3/inc/libofx.h.foo libofx-0.8.3/inc/libofx.h
---- libofx-0.8.3/inc/libofx.h.foo	2008-02-14 13:36:38.000000000 -0500
-+++ libofx-0.8.3/inc/libofx.h	2008-02-14 13:39:12.000000000 -0500
-@@ -705,7 +705,12 @@ typedef enum{
-   OFX_BANK_ACCOUNT,
-   OFX_INVEST_ACCOUNT,
-   OFX_CREDITCARD_ACCOUNT,
--  OFX_INVALID_ACCOUNT
-+  OFX_INVALID_ACCOUNT,
-+  OFX_CHECKING_ACCOUNT,
-+  OFX_SAVINGS_ACCOUNT,
-+  OFX_MONEYMRKT_ACCOUNT,
-+  OFX_CREDITLINE_ACCOUNT,
-+  OFX_CMA_ACCOUNT
- } AccountType;
- 
-  /**

libofx-version.patch:

Index: libofx-version.patch
===================================================================
RCS file: /cvs/extras/rpms/libofx/F-9/libofx-version.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libofx-version.patch	21 Aug 2008 04:29:05 -0000	1.1
+++ libofx-version.patch	10 Sep 2008 17:55:24 -0000	1.2
@@ -1,5 +1,5 @@
---- ofx_request.cpp	2005/07/12 04:32:04	1.2
-+++ ofx_request.cpp	2007/10/26 18:46:42	1.3
+--- libofx-0.8.3/lib/ofx_request.cpp	2005/07/12 04:32:04	1.2
++++ libofx-0.8.3/lib/ofx_request.cpp	2007/10/26 18:46:42	1.3
 @@ -52,7 +52,7 @@
  {
    return string("OFXHEADER:100\r\n"


Index: libofx.spec
===================================================================
RCS file: /cvs/extras/rpms/libofx/F-9/libofx.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libofx.spec	21 Aug 2008 04:29:05 -0000	1.34
+++ libofx.spec	10 Sep 2008 17:55:24 -0000	1.35
@@ -3,12 +3,12 @@
 Summary: A library for supporting Open Financial Exchange (OFX)
 Name: libofx
 Version: 0.8.3
-Release: 6
+Release: 7
 Source: http://downloads.sourceforge.net/libofx/%{name}-%{version}.tar.gz
 URL: http://libofx.sourceforge.net/
 Group:	System Environment/Libraries
 License: GPLv2+
-Patch: libofx-0.8.3-xml++.patch
+Patch1: libofx-0.8.3-xml++.patch
 Patch2: libofx-assorted-c++-fu.patch
 Patch3: libofx-account-type.patch
 Patch4: libofx-version.patch
@@ -51,7 +51,7 @@
 %prep
 %setup -q
 %if %{with_xml}
-%patch -p1
+%patch1 -p1
 autoconf
 %endif
 %patch2 -p1
@@ -99,6 +99,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Sep 10 2008 Bill Nottingham <notting at redhat.com> - 0.8.3-7
+- fix account types patch (#415961, revisited)
+
 * Thu Aug 21 2008 Bill Nottingham <notting at redhat.com> - 0.8.3-6
 - Bump app versions so banks don't reject it (#459367)
 



From dwalsh at fedoraproject.org  Wed Sep 10 17:58:27 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 10 Sep 2008 17:58:27 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/F-9 .cvsignore, 1.9,
	1.10 setroubleshoot-plugins.spec, 1.11, 1.12 sources, 1.10, 1.11
Message-ID: <20080910175827.6118C7012C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3215

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Wed Sep 10 2008  <dwalsh at redhat.com> - 2.0.8-1
- Add qemu plugins



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	31 Jan 2008 21:58:45 -0000	1.9
+++ .cvsignore	10 Sep 2008 17:57:57 -0000	1.10
@@ -1 +1,3 @@
 setroubleshoot-plugins-2.0.4.tar.gz
+setroubleshoot-plugins-2.0.7.tar.gz
+setroubleshoot-plugins-2.0.8.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/F-9/setroubleshoot-plugins.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- setroubleshoot-plugins.spec	4 Apr 2008 14:11:16 -0000	1.11
+++ setroubleshoot-plugins.spec	10 Sep 2008 17:57:57 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.0.4
-Release: 5%{?dist}
+Version: 2.0.8
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -52,6 +52,12 @@
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Wed Sep 10 2008  <dwalsh at redhat.com> - 2.0.8-1
+- Add qemu plugins
+
+* Tue Sep 9 2008  <dwalsh at redhat.com> - 2.0.7-1
+- Add catchall_booleans plugin, fix spelling
+
 * Fri Apr  4 2008 John Dennis <jdennis at redhat.com> - 2.0.4-5
 	- bump rev for build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	31 Jan 2008 21:58:45 -0000	1.10
+++ sources	10 Sep 2008 17:57:57 -0000	1.11
@@ -1 +1 @@
-7bbe52afafea76115c87675f7a35c5f9  setroubleshoot-plugins-2.0.4.tar.gz
+dd5ed456549af92f00531a3d786e161a  setroubleshoot-plugins-2.0.8.tar.gz



From spot at fedoraproject.org  Wed Sep 10 17:59:05 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 10 Sep 2008 17:59:05 +0000 (UTC)
Subject: rpms/hfsplus-tools/devel hfsplus-tools.spec,1.6,1.7
Message-ID: <20080910175905.10FCE7012C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/hfsplus-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3323

Modified Files:
	hfsplus-tools.spec 
Log Message:
fix license tag


Index: hfsplus-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hfsplus-tools/devel/hfsplus-tools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hfsplus-tools.spec	18 Feb 2008 23:05:22 -0000	1.6
+++ hfsplus-tools.spec	10 Sep 2008 17:58:34 -0000	1.7
@@ -1,10 +1,10 @@
 Name:           hfsplus-tools
 Version:        332.14 
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Tools to create/check Apple HFS+ filesystems
 
 Group:          System Environment/Base
-License:        Apple Public Source License
+License:        APSL 2.0
 URL:            http://gentoo-wiki.com/HOWTO_hfsplus
 
 Source0: http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-%{version}.tar.gz 
@@ -110,6 +110,11 @@
 
 
 %changelog
+* Wed Sep 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 332.14-7
+- RH Legal was kind enough to point out what I had overlooked, the clause in the APSL
+  which permits "any subsequent version of this License published by Apple".
+- Fixed license tag
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 332.14-6
 - Autorebuild for GCC 4.3
 



From notting at fedoraproject.org  Wed Sep 10 17:59:45 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 10 Sep 2008 17:59:45 +0000 (UTC)
Subject: rpms/libofx/F-9 libofx-account-type.patch,1.2,1.3
Message-ID: <20080910175945.A4EBA7012C@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/libofx/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3453

Modified Files:
	libofx-account-type.patch 
Log Message:
fix the fix. doh!


libofx-account-type.patch:

Index: libofx-account-type.patch
===================================================================
RCS file: /cvs/extras/rpms/libofx/F-9/libofx-account-type.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libofx-account-type.patch	10 Sep 2008 17:55:24 -0000	1.2
+++ libofx-account-type.patch	10 Sep 2008 17:59:15 -0000	1.3
@@ -20,3 +20,20 @@
  
    OfxAggregate inctranTag("INCTRAN");
    inctranTag.Add( "DTSTART", time_t_to_ofxdate( m_date_from ) );
+diff -up libofx-0.8.3/inc/libofx.h.foo libofx-0.8.3/inc/libofx.h
+--- libofx-0.8.3/inc/libofx.h.foo	2008-02-14 13:36:38.000000000 -0500
++++ libofx-0.8.3/inc/libofx.h	2008-02-14 13:39:12.000000000 -0500
+@@ -705,7 +705,12 @@ typedef enum{
+   OFX_BANK_ACCOUNT,
+   OFX_INVEST_ACCOUNT,
+   OFX_CREDITCARD_ACCOUNT,
+-  OFX_INVALID_ACCOUNT
++  OFX_INVALID_ACCOUNT,
++  OFX_CHECKING_ACCOUNT,
++  OFX_SAVINGS_ACCOUNT,
++  OFX_MONEYMRKT_ACCOUNT,
++  OFX_CREDITLINE_ACCOUNT,
++  OFX_CMA_ACCOUNT
+ } AccountType;
+ 
+  /**



From spot at fedoraproject.org  Wed Sep 10 18:07:18 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 10 Sep 2008 18:07:18 +0000 (UTC)
Subject: rpms/perl-Image-Info/F-9 perl-Image-Info.spec, 1.21, 1.22 sources, 
	1.11, 1.12
Message-ID: <20080910180718.6FE467012F@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Image-Info/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4030/F-9

Modified Files:
	perl-Image-Info.spec sources 
Log Message:
update to 1.28


Index: perl-Image-Info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-Info/F-9/perl-Image-Info.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- perl-Image-Info.spec	2 Mar 2008 15:50:15 -0000	1.21
+++ perl-Image-Info.spec	10 Sep 2008 18:06:48 -0000	1.22
@@ -1,8 +1,8 @@
 %define rgbtxt  %{_datadir}/X11/rgb.txt
 
 Name:           perl-Image-Info
-Version:        1.27
-Release:        3%{?dist}
+Version:        1.28
+Release:        1%{?dist}
 Summary:        Image meta information extraction module for Perl
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Wed Sep 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.28-1
+- update to 1.28
+
 * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.27-3
 - Rebuild for perl 5.10 (again)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-Info/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Dec 2007 17:49:05 -0000	1.11
+++ sources	10 Sep 2008 18:06:48 -0000	1.12
@@ -1 +1 @@
-410e215975867ca4b79ca8ca3226615a  Image-Info-1.27.tar.gz
+09453662ceb4bd57e1f2fcdd957c7a66  Image-Info-1.28.tar.gz



From spot at fedoraproject.org  Wed Sep 10 18:07:18 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 10 Sep 2008 18:07:18 +0000 (UTC)
Subject: rpms/perl-Image-Info/devel .cvsignore, 1.11,
	1.12 perl-Image-Info.spec, 1.21, 1.22 sources, 1.11, 1.12
Message-ID: <20080910180718.ABAF77012C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Image-Info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4030/devel

Modified Files:
	.cvsignore perl-Image-Info.spec sources 
Log Message:
update to 1.28


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-Info/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Dec 2007 17:49:05 -0000	1.11
+++ .cvsignore	10 Sep 2008 18:06:48 -0000	1.12
@@ -1 +1 @@
-Image-Info-1.27.tar.gz
+Image-Info-1.28.tar.gz


Index: perl-Image-Info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-Info/devel/perl-Image-Info.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- perl-Image-Info.spec	2 Mar 2008 15:50:15 -0000	1.21
+++ perl-Image-Info.spec	10 Sep 2008 18:06:48 -0000	1.22
@@ -1,8 +1,8 @@
 %define rgbtxt  %{_datadir}/X11/rgb.txt
 
 Name:           perl-Image-Info
-Version:        1.27
-Release:        3%{?dist}
+Version:        1.28
+Release:        1%{?dist}
 Summary:        Image meta information extraction module for Perl
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Wed Sep 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.28-1
+- update to 1.28
+
 * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.27-3
 - Rebuild for perl 5.10 (again)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-Info/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Dec 2007 17:49:05 -0000	1.11
+++ sources	10 Sep 2008 18:06:48 -0000	1.12
@@ -1 +1 @@
-410e215975867ca4b79ca8ca3226615a  Image-Info-1.27.tar.gz
+09453662ceb4bd57e1f2fcdd957c7a66  Image-Info-1.28.tar.gz



From spot at fedoraproject.org  Wed Sep 10 18:07:18 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 10 Sep 2008 18:07:18 +0000 (UTC)
Subject: rpms/perl-Image-Info/F-8 perl-Image-Info.spec, 1.17, 1.18 sources, 
	1.10, 1.11
Message-ID: <20080910180718.54DD17012C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Image-Info/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4030/F-8

Modified Files:
	perl-Image-Info.spec sources 
Log Message:
update to 1.28


Index: perl-Image-Info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-Info/F-8/perl-Image-Info.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- perl-Image-Info.spec	30 May 2007 20:44:29 -0000	1.17
+++ perl-Image-Info.spec	10 Sep 2008 18:06:47 -0000	1.18
@@ -1,12 +1,12 @@
 %define rgbtxt  %{_datadir}/X11/rgb.txt
 
 Name:           perl-Image-Info
-Version:        1.25
+Version:        1.28
 Release:        1%{?dist}
 Summary:        Image meta information extraction module for Perl
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Image-Info/
 Source0:        http://www.cpan.org/authors/id/T/TE/TELS/image/Image-Info-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,6 +58,18 @@
 
 
 %changelog
+* Wed Sep 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.28-1
+- update to 1.28
+
+* Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.27-3
+- Rebuild for perl 5.10 (again)
+
+* Mon Jan 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.27-2
+- rebuild for new perl
+
+* Wed Dec 19 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 1.27-1
+- bump to 1.27
+
 * Wed May 30 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.25-1
 - Update to 1.25.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-Info/F-8/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 May 2007 20:44:29 -0000	1.10
+++ sources	10 Sep 2008 18:06:48 -0000	1.11
@@ -1 +1 @@
-f7e7fde305f974a9109ac98e16a9afb8  Image-Info-1.25.tar.gz
+09453662ceb4bd57e1f2fcdd957c7a66  Image-Info-1.28.tar.gz



From dwalsh at fedoraproject.org  Wed Sep 10 18:09:35 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 10 Sep 2008 18:09:35 +0000 (UTC)
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.105,1.106
Message-ID: <20080910180935.D6FF97012C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4274

Modified Files:
	setroubleshoot.spec 
Log Message:
* Wed Sep 10 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.10-2
- Fix requires line to gnome-python2-gnome



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- setroubleshoot.spec	10 Sep 2008 17:19:05 -0000	1.105
+++ setroubleshoot.spec	10 Sep 2008 18:09:05 -0000	1.106
@@ -1,7 +1,7 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
 Version: 2.0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -14,7 +14,7 @@
 Requires: %{name}-server = %{version}-%{release} 
 Requires: %{name}-plugins >= 2.0.4
 Requires: pygtk2 >= 2.9.2
-Requires: gnome-python2, gnome-python2-canvas 
+Requires: gnome-python2-gnome, gnome-python2-canvas 
 BuildRequires: desktop-file-utils
 Requires: gnome-python2-gtkhtml2
 Requires: dbus
@@ -182,6 +182,9 @@
 %attr(0755,root,root) /etc/rc.d/init.d/%{name}
 
 %changelog
+* Wed Sep 10 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.10-2
+- Fix requires line to gnome-python2-gnome
+
 * Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.10-1
 - Fix startup problems
 



From ajax at fedoraproject.org  Wed Sep 10 18:14:16 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 10 Sep 2008 18:14:16 +0000 (UTC)
Subject: rpms/xorg-x11-drv-i810/devel intel-2.4.2-fb-size.patch, 1.1,
	1.2 xorg-x11-drv-i810.spec, 1.107, 1.108
Message-ID: <20080910181416.A1C367012C@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4630

Modified Files:
	intel-2.4.2-fb-size.patch xorg-x11-drv-i810.spec 
Log Message:
* Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 2.4.2-7
- Do the fb size hack a different terrible way.


intel-2.4.2-fb-size.patch:

Index: intel-2.4.2-fb-size.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/intel-2.4.2-fb-size.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- intel-2.4.2-fb-size.patch	8 Sep 2008 19:41:02 -0000	1.1
+++ intel-2.4.2-fb-size.patch	10 Sep 2008 18:13:46 -0000	1.2
@@ -1,33 +1,16 @@
 diff -up xf86-video-intel-2.4.2/src/i830_driver.c.jx xf86-video-intel-2.4.2/src/i830_driver.c
---- xf86-video-intel-2.4.2/src/i830_driver.c.jx	2008-09-08 15:36:41.000000000 -0400
-+++ xf86-video-intel-2.4.2/src/i830_driver.c	2008-09-08 15:40:53.000000000 -0400
-@@ -1461,6 +1461,7 @@ I830PreInitCrtcConfig(ScrnInfoPtr pScrn)
- {
-     xf86CrtcConfigPtr   xf86_config;
-     I830Ptr pI830 = I830PTR(pScrn);
-+    int min_width, min_height;
-     int max_width, max_height;
- 
-     if (pI830->use_drm_mode)
-@@ -1475,14 +1476,20 @@ I830PreInitCrtcConfig(ScrnInfoPtr pScrn)
- 
-     /* See i830_exa.c comments for why we limit the framebuffer size like this.
-      */
-+    min_width = 320;
-+    min_height = 200;
-     if (IS_I965G(pI830)) {
-+	if (pScrn->videoRam >= 65536) {
-+	    min_width = 3840;
-+	    min_height = 1200;
-+	}
- 	max_width = 8192;
- 	max_height = 8192;
-     } else {
+--- xf86-video-intel-2.4.2/src/i830_driver.c.jx	2008-09-10 14:07:08.000000000 -0400
++++ xf86-video-intel-2.4.2/src/i830_driver.c	2008-09-10 14:12:38.000000000 -0400
+@@ -1482,6 +1482,12 @@ I830PreInitCrtcConfig(ScrnInfoPtr pScrn)
  	max_width = 2048;
  	max_height = 2048;
      }
--    xf86CrtcSetSizeRange (pScrn, 320, 200, max_width, max_height);
-+    xf86CrtcSetSizeRange (pScrn, min_width, min_height, max_width, max_height);
++
++    if (!pScrn->display->virtualX && IS_I965G(pI830) && pI830->FbMapSize > 0x4000000) {
++	pScrn->display->virtualX = 3840;
++	pScrn->display->virtualY = 1200;
++    }
++
+     xf86CrtcSetSizeRange (pScrn, 320, 200, max_width, max_height);
  }
  
- static Bool


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- xorg-x11-drv-i810.spec	9 Sep 2008 08:15:49 -0000	1.107
+++ xorg-x11-drv-i810.spec	10 Sep 2008 18:13:46 -0000	1.108
@@ -6,7 +6,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.4.2
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -106,6 +106,9 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 2.4.2-7
+- Do the fb size hack a different terrible way.
+
 * Tue Sep 09 2008 Dave Airlie <airlied at redhat.com> 2.4.2-6
 - fix typo in drmmode display.c
 



From ajax at fedoraproject.org  Wed Sep 10 18:22:03 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 10 Sep 2008 18:22:03 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nv/devel nv-2.1.12-fb-size.patch, 1.1,
	1.2 xorg-x11-drv-nv.spec, 1.74, 1.75
Message-ID: <20080910182203.7CD3E7012C@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-serv5373

Modified Files:
	nv-2.1.12-fb-size.patch xorg-x11-drv-nv.spec 
Log Message:
* Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 2.1.12-3
- Do the fb size hack a differently wretched way.


nv-2.1.12-fb-size.patch:

Index: nv-2.1.12-fb-size.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/nv-2.1.12-fb-size.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nv-2.1.12-fb-size.patch	8 Sep 2008 19:30:07 -0000	1.1
+++ nv-2.1.12-fb-size.patch	10 Sep 2008 18:21:33 -0000	1.2
@@ -1,15 +1,14 @@
 diff -up xf86-video-nv-2.1.12/src/g80_driver.c.jx xf86-video-nv-2.1.12/src/g80_driver.c
---- xf86-video-nv-2.1.12/src/g80_driver.c.jx	2008-09-08 15:26:55.000000000 -0400
-+++ xf86-video-nv-2.1.12/src/g80_driver.c	2008-09-08 15:28:40.000000000 -0400
-@@ -446,7 +446,10 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
-     }
+--- xf86-video-nv-2.1.12/src/g80_driver.c.jx	2008-09-10 14:16:04.000000000 -0400
++++ xf86-video-nv-2.1.12/src/g80_driver.c	2008-09-10 14:18:04.000000000 -0400
+@@ -447,6 +447,10 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
  
      xf86CrtcConfigInit(pScrn, &randr12_screen_funcs);
--    xf86CrtcSetSizeRange(pScrn, 320, 200, 8192, 8192);
-+    if (pScrn->videoRam >= 32768)
-+	xf86CrtcSetSizeRange(pScrn, 3840, 1200, 8192, 8192);
-+    else
-+	xf86CrtcSetSizeRange(pScrn, 320, 200, 8192, 8192);
+     xf86CrtcSetSizeRange(pScrn, 320, 200, 8192, 8192);
++    if (!pScrn->display->virtualX && pScrn->videoRam > 65536) {
++	pScrn->display->virtualX = 3840;
++	pScrn->display->virtualY = 1200;
++    }
  
      if(!xf86LoadSubModule(pScrn, "i2c")) goto fail;
      if(!xf86LoadSubModule(pScrn, "ddc")) goto fail;


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.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- xorg-x11-drv-nv.spec	8 Sep 2008 19:30:07 -0000	1.74
+++ xorg-x11-drv-nv.spec	10 Sep 2008 18:21:33 -0000	1.75
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.12
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -71,6 +71,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 2.1.12-3
+- Do the fb size hack a differently wretched way.
+
 * Mon Sep 08 2008 Adam Jackson <ajax at redhat.com> 2.1.12-2
 - nv-2.1.12-fb-size.patch: Yet more lame heuristics to preallocate a usable
   framebuffer for laptops. (#458864)



From rstrode at fedoraproject.org  Wed Sep 10 18:26:24 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed, 10 Sep 2008 18:26:24 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec,1.49,1.50 sources,1.19,1.20
Message-ID: <20080910182624.15E007012C@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5791

Modified Files:
	plymouth.spec sources 
Log Message:
- Fix text rendering for certain machines



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- plymouth.spec	8 Sep 2008 13:45:02 -0000	1.49
+++ plymouth.spec	10 Sep 2008 18:25:53 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: Plymouth Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.6.0
-Release: 0.2008.09.05.4%{?dist}
+Release: 0.2008.09.10.1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -228,6 +228,9 @@
 %{_libdir}/plymouth/spinfinity.so
 
 %changelog
+* Wed Sep 10 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.10.1
+- Fix text rendering for certain machines
+
 * Mon Sep  8 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.05.4
 - More serial console fixes (bug 460565 again)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	5 Sep 2008 19:12:02 -0000	1.19
+++ sources	10 Sep 2008 18:25:53 -0000	1.20
@@ -1 +1 @@
-22495d5143d21e11e6bb0948429bc47f  plymouth-0.6.0.tar.bz2
+7cb1f9c6984ff6d86084a1c7e869f2ed  plymouth-0.6.0.tar.bz2



From jnovy at fedoraproject.org  Wed Sep 10 18:51:30 2008
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 10 Sep 2008 18:51:30 +0000 (UTC)
Subject: rpms/db4/devel db4.spec,1.62,1.63
Message-ID: <20080910185130.481407012C@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/db4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7091

Modified Files:
	db4.spec 
Log Message:
* Wed Sep 10 2008 Jindrich Novy <jnovy at redhat.com> 4.7.25-4
- actually apply the .jni patch
- fix permissions in db4-utils package (#225675)



Index: db4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/db4/devel/db4.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- db4.spec	20 Aug 2008 12:33:23 -0000	1.62
+++ db4.spec	10 Sep 2008 18:50:59 -0000	1.63
@@ -5,7 +5,7 @@
 Summary: The Berkeley DB database library (version 4) for C
 Name: db4
 Version: 4.7.25
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
 Patch1: http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.1
@@ -130,44 +130,44 @@
 %patch14 -p1 -b .errno
 popd
 
-#%patch22 -p1 -b .4.5.20.jni
+%patch22 -p1 -b .4.5.20.jni
 
 # Remove tags files which we don't need.
 find . -name tags | xargs rm -f
 # Define a shell function for fixing HREF references in the docs, which
 # would otherwise break when we split the docs up into subpackages.
 fixup_href() {
-    for doc in $@ ; do
-        chmod u+w ${doc}
-        sed -e 's,="../api_c/,="../../%{name}-devel-%{version}/api_c/,g' \
-            -e 's,="api_c/,="../%{name}-devel-%{version}/api_c/,g' \
-            -e 's,="../api_cxx/,="../../%{name}-devel-%{version}/api_cxx/,g' \
-            -e 's,="api_cxx/,="../%{name}-devel-%{version}/api_cxx/,g' \
-            -e 's,="../api_tcl/,="../../%{name}-devel-%{version}/api_tcl/,g' \
-            -e 's,="api_tcl/,="../%{name}-devel-%{version}/api_tcl/,g' \
-            -e 's,="../java/,="../../%{name}-devel-%{version}/java/,g' \
-            -e 's,="java/,="../%{name}-devel-%{version}/java/,g' \
-            -e 's,="../examples_c/,="../../%{name}-devel-%{version}/examples_c/,g' \
-            -e 's,="examples_c/,="../%{name}-devel-%{version}/examples_c/,g' \
-            -e 's,="../examples_cxx/,="../../%{name}-devel-%{version}/examples_cxx/,g' \
-            -e 's,="examples_cxx/,="../%{name}-devel-%{version}/examples_cxx/,g' \
-            -e 's,="../ref/,="../../%{name}-devel-%{version}/ref/,g' \
-            -e 's,="ref/,="../%{name}-devel-%{version}/ref/,g' \
-            -e 's,="../images/,="../../%{name}-devel-%{version}/images/,g' \
-            -e 's,="images/,="../%{name}-devel-%{version}/images/,g' \
-            -e 's,="../utility/,="../../%{name}-utils-%{version}/utility/,g' \
-            -e 's,="utility/,="../%{name}-utils-%{version}/utility/,g' ${doc} > ${doc}.new
-        touch -r ${doc} ${doc}.new
-        cat ${doc}.new > ${doc}
-        touch -r ${doc}.new ${doc}
-        rm -f ${doc}.new
-    done
+	for doc in $@ ; do
+		chmod u+w ${doc}
+		sed	-e 's,="../api_c/,="../../%{name}-devel-%{version}/api_c/,g' \
+			-e 's,="api_c/,="../%{name}-devel-%{version}/api_c/,g' \
+			-e 's,="../api_cxx/,="../../%{name}-devel-%{version}/api_cxx/,g' \
+			-e 's,="api_cxx/,="../%{name}-devel-%{version}/api_cxx/,g' \
+			-e 's,="../api_tcl/,="../../%{name}-devel-%{version}/api_tcl/,g' \
+			-e 's,="api_tcl/,="../%{name}-devel-%{version}/api_tcl/,g' \
+			-e 's,="../java/,="../../%{name}-devel-%{version}/java/,g' \
+			-e 's,="java/,="../%{name}-devel-%{version}/java/,g' \
+			-e 's,="../examples_c/,="../../%{name}-devel-%{version}/examples_c/,g' \
+			-e 's,="examples_c/,="../%{name}-devel-%{version}/examples_c/,g' \
+			-e 's,="../examples_cxx/,="../../%{name}-devel-%{version}/examples_cxx/,g' \
+			-e 's,="examples_cxx/,="../%{name}-devel-%{version}/examples_cxx/,g' \
+			-e 's,="../ref/,="../../%{name}-devel-%{version}/ref/,g' \
+			-e 's,="ref/,="../%{name}-devel-%{version}/ref/,g' \
+			-e 's,="../images/,="../../%{name}-devel-%{version}/images/,g' \
+			-e 's,="images/,="../%{name}-devel-%{version}/images/,g' \
+			-e 's,="../utility/,="../../%{name}-utils-%{version}/utility/,g' \
+			-e 's,="utility/,="../%{name}-utils-%{version}/utility/,g' ${doc} > ${doc}.new
+		touch -r ${doc} ${doc}.new
+		cat ${doc}.new > ${doc}
+		touch -r ${doc}.new ${doc}
+		rm -f ${doc}.new
+	done
 }
 
-set +x	# XXX painful to watch
+set +x
 # Fix all of the HTML files.
 fixup_href `find . -name "*.html"`
-set -x	# XXX painful to watch
+set -x
 
 cd dist
 ./s_config
@@ -181,8 +181,8 @@
 build() {
 	test -d dist/$1 || mkdir dist/$1
 	# Static link db_dump185 with old db-185 libraries.
-	/bin/sh libtool --mode=compile %{__cc} $RPM_OPT_FLAGS -Idb.1.85/PORT/%{_os}/include -D_REENTRANT -c db_dump185/db_dump185.c -o dist/$1/db_dump185.lo
-	/bin/sh libtool --mode=link    %{__cc} -o dist/$1/db_dump185 dist/$1/db_dump185.lo db.1.85/PORT/%{_os}/libdb.a
+	/bin/sh libtool --mode=compile	%{__cc} $RPM_OPT_FLAGS -Idb.1.85/PORT/%{_os}/include -D_REENTRANT -c db_dump185/db_dump185.c -o dist/$1/db_dump185.lo
+	/bin/sh libtool --mode=link	%{__cc} -o dist/$1/db_dump185 dist/$1/db_dump185.lo db.1.85/PORT/%{_os}/libdb.a
 
 	pushd dist
 	popd
@@ -214,12 +214,12 @@
 	perl -pi -e 's/^postdep_objects=".*$/postdep_objects=""/' libtool
 	perl -pi -e 's/-shared -nostdlib/-shared/' libtool
 
-	make    %{?_smp_mflags}
+	make %{?_smp_mflags}
 
 	# XXX hack around libtool not creating ./libs/libdb_java-X.Y.lai
 	LDBJ=./.libs/libdb_java-%{__soversion}.la
 	if test -f ${LDBJ} -a ! -f ${LDBJ}i; then
-	    sed -e 's,^installed=no,installed=yes,' < ${LDBJ} > ${LDBJ}i
+		sed -e 's,^installed=no,installed=yes,' < ${LDBJ} > ${LDBJ}i
 	fi
 
 	popd
@@ -252,7 +252,7 @@
   touch $RPM_BUILD_ROOT/rootfile
   root=..
   while [ ! -e $RPM_BUILD_ROOT/%{_libdir}/${root}/rootfile ] ; do
-    root=${root}/..
+	root=${root}/..
   done
   rm $RPM_BUILD_ROOT/rootfile
 
@@ -281,7 +281,7 @@
 rm -rf ${RPM_BUILD_ROOT}%{_prefix}/docs
 
 # XXX Avoid Permission denied. strip when building as non-root.
-chmod u+w ${RPM_BUILD_ROOT}%{_bindir}
+chmod u+w ${RPM_BUILD_ROOT}%{_bindir} ${RPM_BUILD_ROOT}%{_bindir}/*
 
 # remove unneeded .la files (#225675)
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
@@ -366,6 +366,10 @@
 %endif
 
 %changelog
+* Wed Sep 10 2008 Jindrich Novy <jnovy at redhat.com> 4.7.25-4
+- actually apply the .jni patch
+- fix permissions in db4-utils package (#225675)
+
 * Tue Aug 19 2008 Jindrich Novy <jnovy at redhat.com> 4.7.25-3
 - apply upstream patch to allow replication clients to
   opena sequence



From slankes at fedoraproject.org  Wed Sep 10 18:52:36 2008
From: slankes at fedoraproject.org (Sven Lankes)
Date: Wed, 10 Sep 2008 18:52:36 +0000 (UTC)
Subject: rpms/merkaartor/devel merkaartor-0.11-fixes.patch, NONE,
	1.1 merkaartor.spec, 1.4, 1.5
Message-ID: <20080910185236.CFB627012C@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7046

Modified Files:
	merkaartor.spec 
Added Files:
	merkaartor-0.11-fixes.patch 
Log Message:
Add patch from -fixes svn-branch to allow trackpoints as nodes on upload


merkaartor-0.11-fixes.patch:

--- NEW FILE merkaartor-0.11-fixes.patch ---
diff -uprN -x .svn -x Icons merkaartor-orig/CHANGELOG merkaartor-0.11-fixes/CHANGELOG
--- merkaartor-orig/CHANGELOG	2008-07-28 22:34:08.000000000 +0200
+++ merkaartor-0.11-fixes/CHANGELOG	2008-09-10 20:32:16.000000000 +0200
@@ -1,3 +1,6 @@
+v0.11.1
+	* FIX : manage road conflicts from downloads
+	* FIX : 412 when uploading joined/splitted roads (closes #948)
 v0.11
 	* FIX : updated Czech translation file
 	* ADD : Export to KML
diff -uprN -x .svn -x Icons merkaartor-orig/Command/DocumentCommands.cpp merkaartor-0.11-fixes/Command/DocumentCommands.cpp
--- merkaartor-orig/Command/DocumentCommands.cpp	2008-07-18 00:47:04.000000000 +0200
+++ merkaartor-0.11-fixes/Command/DocumentCommands.cpp	2008-09-10 20:32:16.000000000 +0200
@@ -151,8 +151,8 @@ bool RemoveFeatureCommand::buildDirtyLis
 	if (theFeature->lastUpdated() == MapFeature::OSMServerConflict)
 		return false;
 
-	if (!theFeature->hasOSMId())
-		return false;
+	//if (!theFeature->hasOSMId())
+	//	return false;
 
 	if (CascadedCleanUp && CascadedCleanUp->buildDirtyList(theList))
 	{
diff -uprN -x .svn -x Icons merkaartor-orig/Command/RoadCommands.cpp merkaartor-0.11-fixes/Command/RoadCommands.cpp
--- merkaartor-orig/Command/RoadCommands.cpp	2008-07-03 10:22:31.000000000 +0200
+++ merkaartor-0.11-fixes/Command/RoadCommands.cpp	2008-09-10 20:32:16.000000000 +0200
@@ -137,7 +137,7 @@ bool RoadRemoveTrackPointCommand::buildD
 {
 	if (!theRoad->layer())
 		return theList.update(theRoad);
-	if (theRoad->layer()->isUploadable() && theTrackPoint->layer()->isUploadable())
+	if (theRoad->layer()->isUploadable() && (theTrackPoint->layer()->isUploadable() || theTrackPoint->hasOSMId()))
 		return theList.update(theRoad);
 	else
 		return false;
diff -uprN -x .svn -x Icons merkaartor-orig/Map/ImportOSM.cpp merkaartor-0.11-fixes/Map/ImportOSM.cpp
--- merkaartor-orig/Map/ImportOSM.cpp	2008-07-17 15:34:38.000000000 +0200
+++ merkaartor-0.11-fixes/Map/ImportOSM.cpp	2008-09-10 20:32:16.000000000 +0200
@@ -103,8 +103,6 @@ void OSMHandler::parseNd(const QXmlAttri
 	if (!R) return;
 	TrackPoint *Part = MapFeature::getTrackPointOrCreatePlaceHolder(theDocument, theLayer, theList, atts.value("ref"));
 	if (NewFeature)
-		R->add(Part);
-	else
 		theList->add(new RoadAddTrackPointCommand(R,Part));
 }
 
@@ -120,21 +118,25 @@ void OSMHandler::parseWay(const QXmlAttr
 			R->setLastUpdated(MapFeature::UserResolved);
 			NewFeature = false;
 			// conflict
-/*				TrackPoint* Conflict = dynamic_cast<TrackPoint*>(theDocument->get("conflict_node_"+Root.attribute("from")));
-			if (Conflict) From = Conflict;
-			Conflict = dynamic_cast<TrackPoint*>(theDocument->get("conflict_node_"+Root.attribute("to")));
-			if (Conflict) To = Conflict;
-			Way* W = new Way(From,To);
-			W->setId("conflict_"+id);
-			loadSegmentTags(Root,W);
-			theList->add(new AddFeatureCommand(conflictLayer,W, false));
-			W->setLastUpdated(MapFeature::OSMServerConflict); */
+			Road* userRd = R;
+			R = new Road();
+			R->setId("conflict_"+id);
+			R->setLastUpdated(MapFeature::OSMServerConflict);
+			parseStandardAttributes(atts,R);
+			if (R->time() > userRd->time()) {
+				theList->add(new AddFeatureCommand(conflictLayer, R, false));
+				NewFeature = true;
+			} else {
+				delete R;
+				R = userRd;
+				NewFeature = false;
+			}
 		}
 		else if (R->lastUpdated() != MapFeature::UserResolved)
 		{
 			while (R->size())
 				theList->add(new RoadRemoveTrackPointCommand(R,R->get(0)));
-			NewFeature = false;
+			NewFeature = true;
 		}
 	}
 	else
@@ -376,6 +378,15 @@ bool importOSM(QWidget* aParent, QIODevi
 		if (!conflictLayer->size()) {
 			theDocument->remove(conflictLayer);
 			delete conflictLayer;
+		} else {
+			QMessageBox::warning(aParent,QApplication::translate("Downloader","Conflicts have been detected"), 
+				QApplication::translate("Downloader",
+				"This means that some of the feature you modified"
+				" since your last download have since been modified by someone else on the server.\n"
+				"The features have been duplicated as \"conflict_...\" on the \"Conflicts...\" layer.\n"
+				"Before being able to upload your changes, you will have to manually merge the two versions"
+				" and remove the one from the \"Conflicts...\" layer."
+				));
 		}
 	}
 	return true;
diff -uprN -x .svn -x Icons merkaartor-orig/Map/Road.cpp merkaartor-0.11-fixes/Map/Road.cpp
--- merkaartor-orig/Map/Road.cpp	2008-07-24 15:14:40.000000000 +0200
+++ merkaartor-0.11-fixes/Map/Road.cpp	2008-09-10 20:32:16.000000000 +0200
@@ -357,6 +357,9 @@ void Road::cascadedRemoveIfUsing(MapDocu
 
 bool Road::deleteChildren(MapDocument* theDocument, CommandList* theList)
 {
+	if (lastUpdated() == MapFeature::OSMServerConflict)
+		return true;
+
 	QMessageBox::StandardButton resp = QMessageBox::question(NULL, MainWindow::tr("Delete Children"),
 								 MainWindow::tr("Do you want to delete the children nodes also?"),
 								 QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, QMessageBox::Yes);
@@ -409,6 +412,7 @@ bool Road::toXML(QDomElement xParent)
 	e.setAttribute("id", xmlId());
 	e.setAttribute("timestamp", time().toString(Qt::ISODate)+"Z");
 	e.setAttribute("user", user());
+	e.setAttribute("actor", (int)lastUpdated());
 
 	for (unsigned int i=0; i<size(); ++i) {
 		QDomElement n = xParent.ownerDocument().createElement("nd");
@@ -429,14 +433,24 @@ Road * Road::fromXML(MapDocument* d, Map
 		id = "way_" + id;
 	QDateTime time = QDateTime::fromString(e.attribute("timestamp").left(19), "yyyy-MM-ddTHH:mm:ss");
 	QString user = e.attribute("user");
+	MapFeature::ActorType A;
+	if (e.hasAttribute("actor"))
+		A = (MapFeature::ActorType)(e.attribute("actor", "2").toInt());
+	else
+		if (L = d->getDirtyLayer())
+			A = MapFeature::User;
+		else
+			A = MapFeature::OSMServer;
 
 	Road* R = dynamic_cast<Road*>(d->getFeature(id));
 
 	if (!R) {
 		R = new Road();
 		R->setId(id);
-		R->setLastUpdated(MapFeature::OSMServer);
+		R->setLastUpdated(A);
 	} else {
+		if (R->lastUpdated() == MapFeature::NotYetDownloaded)
+			R->setLastUpdated(A);
 		R->layer()->remove(R);
 	}
 	R->setTime(time);


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/merkaartor.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- merkaartor.spec	28 Aug 2008 19:34:49 -0000	1.4
+++ merkaartor.spec	10 Sep 2008 18:52:06 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           merkaartor
 Version:        0.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
@@ -9,6 +9,7 @@
 Source0:        http://www.irule.be/pipe/Merkaartor-0.11.tar.bz2
 Source1:        %{name}.desktop
 Source2:        %{name}.xpm
+Patch0:         %{name}-%{version}-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel >= 4.4
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1
 sed -i 's/CONFIG += debug/CONFIG += release/' Merkaartor.pro
 chmod 644 LICENSE
 find -name "*.[ch]" -exec %{__chmod} -x '{}' \;   
@@ -58,6 +60,9 @@
 
 
 %changelog
+* Wed Sep 10 2008 Sven Lankes <sven at lank.es> - 0.11-3
+- add patch from -fixes branch (fixes upload error)
+
 * Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.11-2
 - include unowned directories
 



From rstrode at fedoraproject.org  Wed Sep 10 19:05:44 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed, 10 Sep 2008 19:05:44 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec, 1.50, 1.51 serial-again.patch,
	1.2, NONE
Message-ID: <20080910190544.D4C5B7012C@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8293

Modified Files:
	plymouth.spec 
Removed Files:
	serial-again.patch 
Log Message:
drop upstreamed patch



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- plymouth.spec	10 Sep 2008 18:25:53 -0000	1.50
+++ plymouth.spec	10 Sep 2008 19:05:14 -0000	1.51
@@ -9,7 +9,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: plymouth-0.5.0-textbar-hotness.patch
-Patch1: serial-again.patch
 
 Obsoletes: rhgb < 1:10.0.0
 Provides: rhgb = 1:10.0.0
@@ -107,7 +106,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .textbar
-%patch1 -p1 -b .serial-again
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \


--- serial-again.patch DELETED ---



From simo at fedoraproject.org  Wed Sep 10 19:07:44 2008
From: simo at fedoraproject.org (Simo Sorce)
Date: Wed, 10 Sep 2008 19:07:44 +0000 (UTC)
Subject: rpms/ipa/F-9 freeipa-change-mkey.patch, NONE,
	1.1 freeipa-cve-2008-3274-fixes.patch, NONE,
	1.1 freeipa-cve-2008-3274-utility.patch, NONE,
	1.1 freeipa-encrypt-files.patch, NONE,
	1.1 freeipa-fix-expire.patch, NONE,
	1.1 freeipa-fix-key-encryption.patch, NONE,
	1.1 freeipa-refresh-mkey.patch, NONE,
	1.1 freeipa-user-input.patch, NONE, 1.1 ipa.spec, 1.18, 1.19
Message-ID: <20080910190744.87C227012C@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/ipa/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8565

Modified Files:
	ipa.spec 
Added Files:
	freeipa-change-mkey.patch freeipa-cve-2008-3274-fixes.patch 
	freeipa-cve-2008-3274-utility.patch 
	freeipa-encrypt-files.patch freeipa-fix-expire.patch 
	freeipa-fix-key-encryption.patch freeipa-refresh-mkey.patch 
	freeipa-user-input.patch 
Log Message:
* Wed Sep 10 2008 Simo Sorce <ssorce at redhat.com> - 1.1.0-7
- Fix for CVE-2008-3274


freeipa-change-mkey.patch:

--- NEW FILE freeipa-change-mkey.patch ---
>From ab6449e101d4282014a06ad3cd20961005fee2ce Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Wed, 6 Aug 2008 16:46:18 -0400
Subject: [PATCH] Add a tool to change the kerberos Master Key in case an admin wants to. This tool will dump and re-encrypt all keys, then reload and change the master key in LDAP and in the stash file. It will also restart the Directory Server and the the KDC

---
 ipa-admintools/Makefile              |    1 +
 ipa-admintools/ipa-change-master-key |  383 ++++++++++++++++++++++++++++++++++
 2 files changed, 384 insertions(+), 0 deletions(-)
 create mode 100644 ipa-admintools/ipa-change-master-key

diff --git a/ipa-admintools/Makefile b/ipa-admintools/Makefile
index 77cc38d..0b7cae8 100644
--- a/ipa-admintools/Makefile
+++ b/ipa-admintools/Makefile
@@ -26,6 +26,7 @@ install:
 	install -m 755 ipa-deldelegation $(SBINDIR)
 	install -m 755 ipa-listdelegation $(SBINDIR)
 	install -m 755 ipa-moddelegation $(SBINDIR)
+	install -m 755 ipa-change-master-key $(SBINDIR)
 
 	@for subdir in $(SUBDIRS); do \
 		(cd $$subdir && $(MAKE) $@) || exit 1; \
diff --git a/ipa-admintools/ipa-change-master-key b/ipa-admintools/ipa-change-master-key
new file mode 100644
index 0000000..233a7af
--- /dev/null
+++ b/ipa-admintools/ipa-change-master-key
@@ -0,0 +1,383 @@
+#! /usr/bin/python -E
+# Authors: Simo Sorce <ssorce at redhat.com>
+#
+# Copyright (C) 2007 Simo Sorce <ssorce at redhat.com>
+# see file 'COPYING' for use and warranty information
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; version 2 or later
+#
+# 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
+#
+
+etckrb5conf = "/etc/krb5.conf"
+krb5dir = "/var/kerberos/krb5kdc"
+cachedir = "/var/cache/ipa"
+libdir = "/var/lib/ipa"
+basedir = libdir+"/mkey"
+ourkrb5conf = basedir+"/krb5.conf"
+ldappwdfile = basedir+"/ldappwd"
+
+password = ""
+
+import sys
+try:
+    from optparse import OptionParser
+    import ipa
+    import ipa.config
+    import ipa.ipautil
+    from ipaclient import ipachangeconf
+    from ipaserver import ipaldap
+
+    import krbV
+
+    import ldap
+    from ldap import LDAPError
+    from ldap import ldapobject
+
+    from pyasn1.type import univ, namedtype
+    import pyasn1.codec.ber.encoder
+    import pyasn1.codec.ber.decoder
+    import struct
+    import base64
+
+    import random
+    import time
+    import os
+    import shutil
+    import getpass
+except ImportError:
+    print >> sys.stderr, """\
+There was a problem importing one of the required Python modules. The
+error was:
+
+    %s
+""" % sys.exc_value
+    sys.exit(1)
+
+def usage():
+    print "ipa-change-master-key [-q|--quiet] [-p DM_PASSWORD]"
+    sys.exit(1)
+
+def parse_options():
+    parser = OptionParser()
+    parser.add_option("-p", "--dm-password", dest="dm_password",
+                      help="The Directory Manager password")
+    parser.add_option("-q", "--quiet", action="store_true", dest="quiet",
+                      help="Keep quiet")
+    parser.add_option("--usage", action="store_true",
+                      help="Program usage")
+
+    args = ipa.config.init_config(sys.argv)
+    options, args = parser.parse_args(args)
+
+    return options, args
+
+# We support only des3 encoded stash files for now
+def generate_new_stash_file(file):
+
+    odd_parity_bytes_pool = ['\x01', '\x02', '\x04', '\x07', '\x08', '\x0b', '\r', '\x0e', '\x10', '\x13', '\x15', '\x16', '\x19', '\x1a', '\x1c', '\x1f', ' ', '#', '%', '&', ')', '*', ',', '/', '1', '2', '4', '7', '8', ';', '=', '>', '@', 'C', 'E', 'F', 'I', 'J', 'L', 'O', 'Q', 'R', 'T', 'W', 'X', '[', ']', '^', 'a', 'b', 'd', 'g', 'h', 'k', 'm', 'n', 'p', 's', 'u', 'v', 'y', 'z', '|', '\x7f', '\x80', '\x83', '\x85', '\x86', '\x89', '\x8a', '\x8c', '\x8f', '\x91', '\x92', '\x94', '\x97', '\x98', '\x9b', '\x9d', '\x9e', '\xa1', '\xa2', '\xa4', '\xa7', '\xa8', '\xab', '\xad', '\xae', '\xb0', '\xb3', '\xb5', '\xb6', '\xb9', '\xba', '\xbc', '\xbf', '\xc1', '\xc2', '\xc4', '\xc7', '\xc8', '\xcb', '\xcd', '\xce', '\xd0', '\xd3', '\xd5', '\xd6', '\xd9', '\xda', '\xdc', '\xdf', '\xe0', '\xe3',
+'\xe5', '\xe6', '\xe9', '\xea', '\xec', '\xef', '\xf1', '\xf2', '\xf4', '\xf7',
+'\xf8', '\xfb', '\xfd', '\xfe']
+    pool_len = len(odd_parity_bytes_pool)
+    keytype = 16 # des3
+    keydata = ""
+
+    r = random.SystemRandom()
+    for k in range(24):
+        keydata += r.choice(odd_parity_bytes_pool)
+
+    format = '=hi%ss' % len(keydata)
+    s = struct.pack(format, keytype, len(keydata), keydata)
+    try:
+        fd = open(file, "w")
+        fd.write(s)
+    except os.error, e:
+        logging.critical("failed to write stash file")
+        raise e
+
+# clean up procedures
+def cleanup(password):
+    try:
+        os.stat(basedir)
+    except:
+        return None
+    try:
+        # always remove ldappwdfile as it contains the Directory Manager password
+        os.remove(ldappwdfile)
+    except:
+        pass
+
+    # tar and encrypt the working dir so that we do not leave sensitive data
+    # around unproteceted
+    curtime = time.strftime("%Y%m%d%H%M%S",time.gmtime())
+    tarfile = libdir+"/ipa-change-mkey-"+curtime+".tar"
+    gpgfile = tarfile+".gpg"
+    args = ['/bin/tar', '-C', libdir, '-cf', tarfile, 'mkey']
+    ipa.ipautil.run(args)
+    ipa.ipautil.encrypt_file(tarfile, gpgfile, password, cachedir)
+    os.remove(tarfile)
+    shutil.rmtree(basedir, ignore_errors=True)
+
+    return "The temporary working directory with backup dump files has been securely archived and gpg-encrypted as "+gpgfile+" using the Directory Manager password."
+
+def main():
+
+    global password
+
+    options, args = parse_options()
+
+    if options.usage:
+        usage()
+
+    krbctx = krbV.default_context()
+
+    realm = krbctx.default_realm
+    suffix = ipa.ipautil.realm_to_suffix(realm)
+
+    backupfile = basedir+"/backup.dump"
+    convertfile = basedir+"/convert.dump"
+    oldstashfile = krb5dir+"/.k5."+realm
+    newstashfile = basedir+"/.new.mkey"
+    bkpstashfile = basedir+"/.k5."+realm
+
+    if os.getuid() != 0:
+        print "ERROR: This command must be run as root"
+
+    print "DANGER: This is a dangerous operation, make sure you backup all your IPA data before running the tool"
+    print "This command will restart your Directory and KDC Servers."
+
+    #TODO: ask for confirmation
+    if not ipa.ipautil.user_input("Do you want to proceed and change the Kerberos Master key?", False):
+        print ""
+        print "Aborting..."
+        return 1
+
+    password = options.dm_password
+    if not password:
+        password = getpass.getpass("Directory Manager password: ")
+
+    # get a connection to the DS
+    try:
+        conn = ipaldap.IPAdmin(ipa.config.config.default_server[0])
+        conn.do_simple_bind(bindpw=password)
+    except Exception, e:
+        print "ERROR: Could not connect to the Directory Server on "+ipa.config.config.default_server[0]+" ("+str(e)+")"
+        return 1
+
+    #  Wipe basedir and recreate it
+    shutil.rmtree(basedir, ignore_errors=True)
+    os.mkdir(basedir, 0700)
+
+    generate_new_stash_file(newstashfile)
+
+    # Generate conf files
+    try:
+        shutil.copyfile(etckrb5conf, ourkrb5conf)
+
+        krbconf = ipachangeconf.IPAChangeConf("IPA Installer")
+        krbconf.setOptionAssignment(" = ")
+        krbconf.setSectionNameDelimiters(("[","]"))
+        krbconf.setSubSectionDelimiters(("{","}"))
+        krbconf.setIndent(("","  ","    "))
+
+        #OPTS
+        opts = [{'name':'ldap_kadmind_dn', 'type':'option', 'action':'set', 'value':'cn=Directory Manager'},
+                {'name':'ldap_service_password_file', 'type':'option', 'action':'set', 'value':ldappwdfile}]
+
+        #REALM
+        realmopts = [{'name':realm, 'type':'subsection', 'action':'set', 'value':opts}]
+
+        #DBMODULES
+        dbopts = [{'name':'dbmodules', 'type':'section', 'action':'set', 'value':realmopts}]
+
+        krbconf.changeConf(ourkrb5conf, dbopts);
+
+        hexpwd = ""
+        for x in password:
+            hexpwd += (hex(ord(x))[2:])
+        pwd_fd = open(ldappwdfile, "w")
+        pwd_fd.write("cn=Directory Manager#{HEX}"+hexpwd+"\n")
+        pwd_fd.close()
+        os.chmod(ldappwdfile, 0600)
+
+    except Exception, e:
+        print "Failed to create custom configuration files ("+str(e)+") aborting..."
+        return 1
+
+    #Set environment vars so that the modified krb5.conf is used
+    os.environ['KRB5_CONFIG'] = ourkrb5conf
+
+    #Backup the kerberos key material for recovery if needed
+    args = ["/usr/kerberos/sbin/kdb5_util", "dump", "-verbose", backupfile]
+    print "Performing safety backup of the key material"
+    try:
+        output = ipa.ipautil.run(args)
+    except ipa.ipautil.CalledProcessError, e:
+        print "Failed to backup key material ("+str(e)+"), aborting ..."
+        return 1
+
+    if not options.quiet:
+        princlist = output[1].split('\n')
+        print "Principals stored into the backup file "+backupfile+":"
+        for p in princlist:
+            print p
+        print ""
+
+    #Convert the kerberos keys to the new master key
+    args = ["/usr/kerberos/sbin/kdb5_util", "dump", "-verbose", "-new_mkey_file", newstashfile, convertfile]
+    print "Converting key material to new master key"
+    try:
+        output = ipa.ipautil.run(args)
+    except ipa.ipautil.CalledProcessError, e:
+        print "Failed to convert key material, aborting ..."
+        return 1
+
+    savedprinclist = output[1].split('\n')
+
+    if not options.quiet:
+        princlist = output[1].split('\n')
+        print "Principals dumped for conversion:"
+        for p in princlist:
+            print p
+        print ""
+
+    #Stop the KDC
+    args = ["/etc/init.d/krb5kdc", "stop"]
+    try:
+        output = ipa.ipautil.run(args)
+        if output[0]:
+            print output[0]
+        if output[1]:
+            print output[1]
+    except ipa.ipautil.CalledProcessError, e:
+        print "WARNING: Failed to restart the KDC ("+str(e)+")"
+        print "You will have to manually restart the KDC when the operation is completed"
+
+    #Change the mkey into ldap
+    try:
+        stash = open(newstashfile, "r")
+        keytype = struct.unpack('h', stash.read(2))[0]
+        keylen = struct.unpack('i', stash.read(4))[0]
+        keydata = stash.read(keylen)
+
+        #encode it in the asn.1 attribute
+        MasterKey = univ.Sequence()
+        MasterKey.setComponentByPosition(0, univ.Integer(keytype))
+        MasterKey.setComponentByPosition(1, univ.OctetString(keydata))
+        krbMKey = univ.Sequence()
+        krbMKey.setComponentByPosition(0, univ.Integer(0)) #we have no kvno
+        krbMKey.setComponentByPosition(1, MasterKey)
+        asn1key = pyasn1.codec.ber.encoder.encode(krbMKey)
+
+        dn = "cn="+realm+",cn=kerberos,"+suffix
+        mod = [(ldap.MOD_REPLACE, 'krbMKey', str(asn1key))]
+        conn.modify_s(dn, mod)
+    except Exception, e:
+        print "ERROR: Failed to upload the Master Key from the Stash file: "+newstashfile+" ("+str(e)+")"
+        return 1
+
+    #Backup old stash file and substitute with new
+    try:
+        shutil.move(oldstashfile, bkpstashfile)
+        shutil.copyfile(newstashfile, oldstashfile)
+    except Exception, e:
+        print "ERROR: An error occurred while installing the new stash file("+str(e)+")"
+        print "The KDC may fail to start if the correct stash file is not in place"
+        print "Verify that "+newstashfile+" has been correctly installed into "+oldstashfile
+        print "A backup copy of the old stash file should be saved in "+bkpstashfile
+
+    #Finally upload the converted principals
+    args = ["/usr/kerberos/sbin/kdb5_util", "load", "-verbose", "-update", convertfile]
+    print "Uploading converted key material"
+    try:
+        output = ipa.ipautil.run(args)
+    except ipa.ipautil.CalledProcessError, e:
+        print "Failed to upload key material ("+e+"), aborting ..."
+        return 1
+
+    if not options.quiet:
+        princlist = output[1].split('\n')
+        print "Principals converted and uploaded:"
+        for p in princlist:
+            print p
+        print ""
+
+    uploadedprinclist = output[1].split('\n')
+
+    #Check for differences and report
+    d = []
+    for p in savedprinclist:
+        if uploadedprinclist.count(p) == 0:
+            d.append(p)
+    if len(d) != 0:
+        print "WARNING: Not all dumped principals have been updated"
+        print "Principals not Updated:"
+        for p in d:
+            print p
+
+    #Remove custom environ
+    del os.environ['KRB5_CONFIG']
+
+    #Restart Directory Server (the pwd plugin need to read the new mkey)
+    args = ["/etc/init.d/dirsrv", "restart"]
+    try:
+        output = ipa.ipautil.run(args)
+        if output[0]:
+            print output[0]
+        if output[1]:
+            print output[1]
+    except ipa.ipautil.CalledProcessError, e:
+        print "WARNING: Failed to restart the Directory Server ("+str(e)+")"
+        print "Please manually restart the DS with 'service dirsrv restart'"
+
+    #Restart the KDC
+    args = ["/etc/init.d/krb5kdc", "start"]
+    try:
+        output = ipa.ipautil.run(args)
+        if output[0]:
+            print output[0]
+        if output[1]:
+            print output[1]
+    except ipa.ipautil.CalledProcessError, e:
+        print "WARNING: Failed to restart the KDC ("+str(e)+")"
+        print "Please manually restart the kdc with 'service krb5kdc start'"
+
+    #TODO: encrypt the backup/temp directory with the Directory Manager password
+
+    print "Master Password successfully changed"
+    print "You MUST now copy the stash file "+oldstashfile+" to all the replicas and restart them!"
+    print ""
+
+    return 0
+
+if __name__ == "__main__":
+    ret = 0
+    try:
+        ret = main()
+    except SystemExit, e:
+        ret = e
+    except KeyboardInterrupt, e:
+        ret = 1
+    except Exception, e:
+        print "%s" % str(e)
+        ret = 1
+
+    try:
+        msg = cleanup(password)
+        if msg:
+            print msg
+    except Exception, e:
+        print "Failed to clean up the temporary location for the dump files and generate and encrypted archive with error:"
+        print e
+        print "Please securely archive/encrypt "+basedir
+
+    sys.exit(ret)
-- 
1.5.5.1


freeipa-cve-2008-3274-fixes.patch:

--- NEW FILE freeipa-cve-2008-3274-fixes.patch ---
>From 7bd21c0d8b0c0889289c7e1eaeb21fb0f1d0c99f Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Fri, 15 Aug 2008 17:17:03 -0400
Subject: [PATCH] CVE 2008 3274 related fixes

---
 ipa-server/ipa-install/share/default-aci.ldif |    4 ++--
 ipa-server/ipaserver/krbinstance.py           |    8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ipa-server/ipa-install/share/default-aci.ldif b/ipa-server/ipa-install/share/default-aci.ldif
index d2946fa..25bd3b2 100644
--- a/ipa-server/ipa-install/share/default-aci.ldif
+++ b/ipa-server/ipa-install/share/default-aci.ldif
@@ -3,8 +3,8 @@
 dn: $SUFFIX
 changetype: modify
 add: aci
-aci: (targetattr != "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword || passwordHistory")(version 3.0; acl "Enable Anonymous access"; allow (read, search, compare) userdn = "ldap:///anyone";)
-aci: (targetattr != "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword || passwordHistory")(version 3.0; acl "Admin can manage any entry"; allow (all) userdn = "ldap:///uid=admin,cn=users,cn=accounts,$SUFFIX";)
+aci: (targetattr != "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword || passwordHistory || krbMKey")(version 3.0; acl "Enable Anonymous access"; allow (read, search, compare) userdn = "ldap:///anyone";)
+aci: (targetattr != "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword || passwordHistory || krbMKey")(version 3.0; acl "Admin can manage any entry"; allow (all) userdn = "ldap:///uid=admin,cn=users,cn=accounts,$SUFFIX";)
 aci: (targetattr = "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword")(version 3.0; acl "Self can write own password"; allow (write) userdn="ldap:///self";)
 aci: (targetattr = "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword || passwordHistory")(version 3.0; acl "Admins can write passwords"; allow (add,delete,write) groupdn="ldap:///cn=admins,cn=groups,cn=accounts,$SUFFIX";)
 aci: (targetattr = "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword || passwordHistory")(version 3.0; acl "Password change service can read/write passwords"; allow (read, write) userdn="ldap:///krbprincipalname=kadmin/changepw@$REALM,cn=$REALM,cn=kerberos,$SUFFIX";)
diff --git a/ipa-server/ipaserver/krbinstance.py b/ipa-server/ipaserver/krbinstance.py
index deea4a6..1668561 100644
--- a/ipa-server/ipaserver/krbinstance.py
+++ b/ipa-server/ipaserver/krbinstance.py
@@ -48,6 +48,10 @@
 import struct
 import base64
 
+KRBMKEY_DENY_ACI = """
+(targetattr = "krbMKey")(version 3.0; acl "No external access"; deny (all) userdn != "ldap:///uid=kdc,cn=sysaccounts,cn=etc,$SUFFIX";)
+"""
+
 def update_key_val_in_file(filename, key, val):
     if os.path.exists(filename):
         pattern = "^[\s#]*%s\s*=\s*%s\s*" % (re.escape(key), re.escape(val))
@@ -358,7 +362,9 @@
 
         entry = ipaldap.Entry("cn="+self.realm+",cn=kerberos,"+self.suffix)
         dn = "cn="+self.realm+",cn=kerberos,"+self.suffix
-        mod = [(ldap.MOD_ADD, 'krbMKey', str(asn1key))]
+        #protect the master key by adding an appropriate deny rule along with the key
+        mod = [(ldap.MOD_ADD, 'aci', ipautil.template_str(KRBMKEY_DENY_ACI, self.sub_dict)),
+               (ldap.MOD_ADD, 'krbMKey', str(asn1key))]
         try:
             self.conn.modify_s(dn, mod)
         except ldap.TYPE_OR_VALUE_EXISTS, e:

freeipa-cve-2008-3274-utility.patch:

--- NEW FILE freeipa-cve-2008-3274-utility.patch ---
>From 40749e3ea6b727fa8c60e2d2af44a0e5ac725936 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Tue, 19 Aug 2008 13:31:26 -0400
Subject: [PATCH] Add script to simplify operations to fix CVE 2008 3274
 Import all of change master key directly into the help fix,
 allows for better control

---
 ipa-server/Makefile.am           |    1 +
 ipa-server/ipa-fix-CVE-2008-3274 |  520 ++++++++++++++++++++++++++++++++++++++
 ipa-server/ipa-server.spec.in    |    1 +
 3 files changed, 522 insertions(+), 0 deletions(-)
 create mode 100644 ipa-server/ipa-fix-CVE-2008-3274

diff --git a/ipa-server/Makefile.am b/ipa-server/Makefile.am
index 6fb854d..f058013 100644
--- a/ipa-server/Makefile.am
+++ b/ipa-server/Makefile.am
@@ -16,6 +16,7 @@ SUBDIRS =			\
 
 sbin_SCRIPTS =			\
 	ipa-upgradeconfig	\
+	ipa-fix-CVE-2008-3274	\
 	$(NULL)
 
 install-exec-local:
diff --git a/ipa-server/ipa-fix-CVE-2008-3274 b/ipa-server/ipa-fix-CVE-2008-3274
new file mode 100644
index 0000000..171a9db
--- /dev/null
+++ b/ipa-server/ipa-fix-CVE-2008-3274
@@ -0,0 +1,518 @@
+#!/usr/bin/python
+#
+# Upgrade configuration files to a newer template.
+
+etckrb5conf = "/etc/krb5.conf"
+krb5dir = "/var/kerberos/krb5kdc"
+cachedir = "/var/cache/ipa"
+libdir = "/var/lib/ipa"
+basedir = libdir+"/mkey"
+ourkrb5conf = basedir+"/krb5.conf"
+ldappwdfile = basedir+"/ldappwd"
+
+import sys
+try:
+    from optparse import OptionParser
+
+    import os
+    import random
+    import time
+    import shutil
+    import getpass
+
+    import ipa
+    import ipa.config
+    import ipa.ipautil
+
+    import krbV
+    import ldap
+
+    from ldap import LDAPError
+    from ldap import ldapobject
+
+    from ipaclient import ipachangeconf    
+    from ipaserver import ipaldap
+
+    from pyasn1.type import univ, namedtype
+    import pyasn1.codec.ber.encoder
+    import pyasn1.codec.ber.decoder
+    import struct
+    import base64
+
+except ImportError:
+    print >> sys.stderr, """\
+There was a problem importing one of the required Python modules. The
+error was:
+
+    %s
+""" % sys.exc_value
+    sys.exit(1)
+
+def usage():
+    print "ipa-fix-CVE-2008-3274 [--check] [--fix] [--fix-replica]"
+    sys.exit(1)
+
+def parse_options():
+    parser = OptionParser()
+    parser.add_option("--check", dest="check", action="store_true",
+                      help="Just check for the vulnerability and report (default action)")
+    parser.add_option("--fix", dest="fix", action="store_true",
+                      help="Run checks and start procedure to fix the problem")
+    parser.add_option("--fix-replica", dest="fix_replica", action="store_true",
+                      help="Fix a replica after the tool has been tun with --fix on another master")
+    parser.add_option("--usage", action="store_true",
+                      help="Program usage")
+
+    args = ipa.config.init_config(sys.argv)
+    options, args = parser.parse_args(args)
+
+    return options, args
+
+def check_vuln(realm, suffix):
+
+    try:
+        conn = ldapobject.SimpleLDAPObject("ldap://127.0.0.1/")
+        conn.simple_bind()
+        msgid = conn.search("cn="+realm+",cn=kerberos,"+suffix,
+                            ldap.SCOPE_BASE,
+                            "(objectclass=krbRealmContainer)",
+                            ("krbmkey", "cn"))
+        res = conn.result(msgid)
+        conn.unbind()
+
+        if len(res) != 2:
+            err = 'Realm Container not found, unable to proceed'
+            print err
+            raise Exception, err
+
+        if 'krbmkey' in res[1][0][1]:
+            print 'System vulnerable'
+            return 1
+        else:
+            print 'System *not* vulnerable'
+            return 0
+    except Exception, e:
+        print "Could not connect to the LDAP server, unable to check server"
+        print "("+type(e)+")("+dir(e)+")"
+        raise e
+
+# We support only des3 encoded stash files for now
+def generate_new_stash_file(file):
+
+    odd_parity_bytes_pool = ['\x01', '\x02', '\x04', '\x07', '\x08', '\x0b', '\r', '\x0e', '\x10', '\x13', '\x15', '\x16', '\x19', '\x1a', '\x1c', '\x1f', ' ', '#', '%', '&', ')', '*', ',', '/', '1', '2', '4', '7', '8', ';', '=', '>', '@', 'C', 'E', 'F', 'I', 'J', 'L', 'O', 'Q', 'R', 'T', 'W', 'X', '[', ']', '^', 'a', 'b', 'd', 'g', 'h', 'k', 'm', 'n', 'p', 's', 'u', 'v', 'y', 'z', '|', '\x7f', '\x80', '\x83', '\x85', '\x86', '\x89', '\x8a', '\x8c', '\x8f', '\x91', '\x92', '\x94', '\x97', '\x98', '\x9b', '\x9d', '\x9e', '\xa1', '\xa2', '\xa4', '\xa7', '\xa8', '\xab', '\xad', '\xae', '\xb0', '\xb3', '\xb5', '\xb6', '\xb9', '\xba', '\xbc', '\xbf', '\xc1', '\xc2', '\xc4', '\xc7', '\xc8', '\xcb', '\xcd', '\xce', '\xd0', '\xd3', '\xd5', '\xd6', '\xd9', '\xda', '\xdc', '\xdf', '\xe0', '\xe3',
+'\xe5', '\xe6', '\xe9', '\xea', '\xec', '\xef', '\xf1', '\xf2', '\xf4', '\xf7',
+'\xf8', '\xfb', '\xfd', '\xfe']
+    pool_len = len(odd_parity_bytes_pool)
+    keytype = 16 # des3
+    keydata = ""
+
+    r = random.SystemRandom()
+    for k in range(24):
+        keydata += r.choice(odd_parity_bytes_pool)
+
+    format = '=hi%ss' % len(keydata)
+    s = struct.pack(format, keytype, len(keydata), keydata)
+    try:
+        fd = open(file, "w")
+        fd.write(s)
+    except os.error, e:
+        logging.critical("failed to write stash file")
+        raise e
+
+# clean up procedures
+def change_mkey_cleanup(password):
+    try:
+        os.stat(basedir)
+    except:
+        return None
+    try:
+        # always remove ldappwdfile as it contains the Directory Manager password
+        os.remove(ldappwdfile)
+    except:
+        pass
+
+    # tar and encrypt the working dir so that we do not leave sensitive data
+    # around unproteceted
+    curtime = time.strftime("%Y%m%d%H%M%S",time.gmtime())
+    tarfile = libdir+"/ipa-change-mkey-"+curtime+".tar"
+    gpgfile = tarfile+".gpg"
+    args = ['/bin/tar', '-C', libdir, '-cf', tarfile, 'mkey']
+    ipa.ipautil.run(args)
+    ipa.ipautil.encrypt_file(tarfile, gpgfile, password, cachedir)
+    os.remove(tarfile)
+    shutil.rmtree(basedir, ignore_errors=True)
+
+    return "The temporary working directory with backup dump files has been securely archived and gpg-encrypted as "+gpgfile+" using the Directory Manager password."
+
+def change_mkey(password = None, quiet = False):
+
+    krbctx = krbV.default_context()
+
+    realm = krbctx.default_realm
+    suffix = ipa.ipautil.realm_to_suffix(realm)
+
+    backupfile = basedir+"/backup.dump"
+    convertfile = basedir+"/convert.dump"
+    oldstashfile = krb5dir+"/.k5."+realm
+    newstashfile = basedir+"/.new.mkey"
+    bkpstashfile = basedir+"/.k5."+realm
+
+    if os.getuid() != 0:
+        print "ERROR: This command must be run as root"
+
+    print "DANGER: This is a dangerous operation, make sure you backup all your IPA data before running the tool"
+    print "This command will restart your Directory and KDC Servers."
+
+    #TODO: ask for confirmation
+    if not ipa.ipautil.user_input("Do you want to proceed and change the Kerberos Master key?", False):
+        print ""
+        print "Aborting..."
+        return 1
+
+    if not password:
+        password = getpass.getpass("Directory Manager password: ")
+
+    # get a connection to the DS
+    try:
+        conn = ipaldap.IPAdmin(ipa.config.config.default_server[0])
+        conn.do_simple_bind(bindpw=password)
+    except Exception, e:
+        print "ERROR: Could not connect to the Directory Server on "+ipa.config.config.default_server[0]+" ("+str(e)+")"
+        return 1
+
+    #  Wipe basedir and recreate it
+    shutil.rmtree(basedir, ignore_errors=True)
+    os.mkdir(basedir, 0700)
+
+    generate_new_stash_file(newstashfile)
+
+    # Generate conf files
+    try:
+        shutil.copyfile(etckrb5conf, ourkrb5conf)
+
+        krbconf = ipachangeconf.IPAChangeConf("IPA Installer")
+        krbconf.setOptionAssignment(" = ")
+        krbconf.setSectionNameDelimiters(("[","]"))
+        krbconf.setSubSectionDelimiters(("{","}"))
+        krbconf.setIndent(("","  ","    "))
+
+        #OPTS
+        opts = [{'name':'ldap_kadmind_dn', 'type':'option', 'action':'set', 'value':'cn=Directory Manager'},
+                {'name':'ldap_service_password_file', 'type':'option', 'action':'set', 'value':ldappwdfile}]
+
+        #REALM
+        realmopts = [{'name':realm, 'type':'subsection', 'action':'set', 'value':opts}]
+
+        #DBMODULES
+        dbopts = [{'name':'dbmodules', 'type':'section', 'action':'set', 'value':realmopts}]
+
+        krbconf.changeConf(ourkrb5conf, dbopts);
+
+        hexpwd = ""
+        for x in password:
+            hexpwd += (hex(ord(x))[2:])
+        pwd_fd = open(ldappwdfile, "w")
+        pwd_fd.write("cn=Directory Manager#{HEX}"+hexpwd+"\n")
+        pwd_fd.close()
+        os.chmod(ldappwdfile, 0600)
+
+    except Exception, e:
+        print "Failed to create custom configuration files ("+str(e)+") aborting..."
+        return 1
+
+    #Set environment vars so that the modified krb5.conf is used
+    os.environ['KRB5_CONFIG'] = ourkrb5conf
+
+    #Backup the kerberos key material for recovery if needed
+    args = ["/usr/kerberos/sbin/kdb5_util", "dump", "-verbose", backupfile]
+    print "Performing safety backup of the key material"
+    try:
+        output = ipa.ipautil.run(args)
+    except ipa.ipautil.CalledProcessError, e:
+        print "Failed to backup key material ("+str(e)+"), aborting ..."
+        return 1
+
+    if not quiet:
+        princlist = output[1].split('\n')
+        print "Principals stored into the backup file "+backupfile+":"
+        for p in princlist:
+            print p
+        print ""
+
+    #Convert the kerberos keys to the new master key
+    args = ["/usr/kerberos/sbin/kdb5_util", "dump", "-verbose", "-new_mkey_file", newstashfile, convertfile]
+    print "Converting key material to new master key"
+    try:
+        output = ipa.ipautil.run(args)
+    except ipa.ipautil.CalledProcessError, e:
+        print "Failed to convert key material, aborting ..."
+        return 1
+
+    savedprinclist = output[1].split('\n')
+
+    if not quiet:
+        princlist = output[1].split('\n')
+        print "Principals dumped for conversion:"
+        for p in princlist:
+            print p
+        print ""
+
+    #Stop the KDC
+    args = ["/etc/init.d/krb5kdc", "stop"]
+    try:
+        output = ipa.ipautil.run(args)
+        if output[0]:
+            print output[0]
+        if output[1]:
+            print output[1]
+    except ipa.ipautil.CalledProcessError, e:
+        print "WARNING: Failed to restart the KDC ("+str(e)+")"
+        print "You will have to manually restart the KDC when the operation is completed"
+
+    #Change the mkey into ldap
+    try:
+        stash = open(newstashfile, "r")
+        keytype = struct.unpack('h', stash.read(2))[0]
+        keylen = struct.unpack('i', stash.read(4))[0]
+        keydata = stash.read(keylen)
+
+        #encode it in the asn.1 attribute
+        MasterKey = univ.Sequence()
+        MasterKey.setComponentByPosition(0, univ.Integer(keytype))
+        MasterKey.setComponentByPosition(1, univ.OctetString(keydata))
+        krbMKey = univ.Sequence()
+        krbMKey.setComponentByPosition(0, univ.Integer(0)) #we have no kvno
+        krbMKey.setComponentByPosition(1, MasterKey)
+        asn1key = pyasn1.codec.ber.encoder.encode(krbMKey)
+
+        dn = "cn="+realm+",cn=kerberos,"+suffix
+        mod = [(ldap.MOD_REPLACE, 'krbMKey', str(asn1key))]
+        conn.modify_s(dn, mod)
+    except Exception, e:
+        print "ERROR: Failed to upload the Master Key from the Stash file: "+newstashfile+" ("+str(e)+")"
+        return 1
+
+    #Backup old stash file and substitute with new
+    try:
+        shutil.move(oldstashfile, bkpstashfile)
+        shutil.copyfile(newstashfile, oldstashfile)
+    except Exception, e:
+        print "ERROR: An error occurred while installing the new stash file("+str(e)+")"
+        print "The KDC may fail to start if the correct stash file is not in place"
+        print "Verify that "+newstashfile+" has been correctly installed into "+oldstashfile
+        print "A backup copy of the old stash file should be saved in "+bkpstashfile
+
+    #Finally upload the converted principals
+    args = ["/usr/kerberos/sbin/kdb5_util", "load", "-verbose", "-update", convertfile]
+    print "Uploading converted key material"
+    try:
+        output = ipa.ipautil.run(args)
+    except ipa.ipautil.CalledProcessError, e:
+        print "Failed to upload key material ("+e+"), aborting ..."
+        return 1
+
+    if not quiet:
+        princlist = output[1].split('\n')
+        print "Principals converted and uploaded:"
+        for p in princlist:
+            print p
+        print ""
+
+    uploadedprinclist = output[1].split('\n')
+
+    #Check for differences and report
+    d = []
+    for p in savedprinclist:
+        if uploadedprinclist.count(p) == 0:
+            d.append(p)
+    if len(d) != 0:
+        print "WARNING: Not all dumped principals have been updated"
+        print "Principals not Updated:"
+        for p in d:
+            print p
+
+    #Remove custom environ
+    del os.environ['KRB5_CONFIG']
+
+    #Restart Directory Server (the pwd plugin need to read the new mkey)
+    args = ["/etc/init.d/dirsrv", "restart"]
+    try:
+        output = ipa.ipautil.run(args)
+        if output[0]:
+            print output[0]
+        if output[1]:
+            print output[1]
+    except ipa.ipautil.CalledProcessError, e:
+        print "WARNING: Failed to restart the Directory Server ("+str(e)+")"
+        print "Please manually restart the DS with 'service dirsrv restart'"
+
+    #Restart the KDC
+    args = ["/etc/init.d/krb5kdc", "start"]
+    try:
+        output = ipa.ipautil.run(args)
+        if output[0]:
+            print output[0]
+        if output[1]:
+            print output[1]
+    except ipa.ipautil.CalledProcessError, e:
+        print "WARNING: Failed to restart the KDC ("+str(e)+")"
+        print "Please manually restart the kdc with 'service krb5kdc start'"
+
+    print "Master Password successfully changed"
+    print ""
+
+    return 0
+
+def fix_replica(password, realm, suffix):
+
+    try:
+        conn = ldapobject.SimpleLDAPObject("ldap://127.0.0.1/")
+        conn.simple_bind("cn=Directory Manager", password)
+        msgid = conn.search("cn="+realm+",cn=kerberos,"+suffix,
+                            ldap.SCOPE_BASE,
+                            "(objectclass=krbRealmContainer)",
+                            ("krbmkey", "cn"))
+        res = conn.result(msgid)
+        conn.unbind()
+        krbmkey = res[1][0][1]['krbmkey'][0]
+    except Exception, e:
+        print "Could not connect to the LDAP server, unable to fix server"
+        print "("+type(e)+")("+dir(e)+")"
+        raise e
+
+    krbMKey = pyasn1.codec.ber.decoder.decode(krbmkey)
+    keytype = int(krbMKey[0][1][0])
+    keydata = str(krbMKey[0][1][1])
+
+    format = '=hi%ss' % len(keydata)
+    s = struct.pack(format, keytype, len(keydata), keydata)
+    try:
+        fd = open("/var/kerberos/krb5kdc/.k5."+realm, "w")
+        fd.write(s)
+        fd.close()
+    except os.error, e:
+        print "failed to write stash file"
+        raise e
+
+    #restart KDC so that it can reload the new Master Key
+    os.system("/etc/init.d/krb5kdc restart")
+
+KRBMKEY_DENY_ACI = """
+(targetattr = "krbMKey")(version 3.0; acl "No external access"; deny (all) userdn != "ldap:///uid=kdc,cn=sysaccounts,cn=etc,$SUFFIX";)
+"""
+
+def fix_main(password, realm, suffix):
+
+    #Run the change master key tool
+    print "Changing Kerberos master key"
+    try:
+        ret = change_mkey(password, True)
+    except SystemExit:
+        ret = 1
+        pass
+    except Exception, e:
+        ret = 1
+        print "%s" % str(e)
+
+    try:
+        msg = change_mkey_cleanup(password)
+        if msg:
+            print msg
+    except Exception, e:
+        print "Failed to clean up the temporary location for the dump files and generate and encrypted archive with error:"
+        print e
+        print "Please securely archive/encrypt "+basedir
+
+    if ret is not 0:
+        sys.exit(ret)
+
+    #Finally upload new master key
+
+    #get the Master Key from the stash file
+    try:
+        stash = open("/var/kerberos/krb5kdc/.k5."+realm, "r")
+        keytype = struct.unpack('h', stash.read(2))[0]
+        keylen = struct.unpack('i', stash.read(4))[0]
+        keydata = stash.read(keylen)
+    except os.error:
+        print "Failed to retrieve Master Key from Stash file: %s"
+        raise e
+    #encode it in the asn.1 attribute
+    MasterKey = univ.Sequence()
+    MasterKey.setComponentByPosition(0, univ.Integer(keytype))
+    MasterKey.setComponentByPosition(1, univ.OctetString(keydata))
+    krbMKey = univ.Sequence()
+    krbMKey.setComponentByPosition(0, univ.Integer(0)) #we have no kvno
+    krbMKey.setComponentByPosition(1, MasterKey)
+    asn1key = pyasn1.codec.ber.encoder.encode(krbMKey)
+
+    dn = "cn=%s,cn=kerberos,%s" % (realm, suffix)
+    sub_dict = dict(REALM=realm, SUFFIX=suffix)
+    #protect the master key by adding an appropriate deny rule along with the key
+    mod = [(ldap.MOD_ADD, 'aci', ipa.ipautil.template_str(KRBMKEY_DENY_ACI, sub_dict)),
+           (ldap.MOD_REPLACE, 'krbMKey', str(asn1key))]
+
+    conn = ldapobject.SimpleLDAPObject("ldap://127.0.0.1/")
+    conn.simple_bind("cn=Directory Manager", password)
+    conn.modify_s(dn, mod)
+    conn.unbind()
+
+    print "\n"
+    print "This server is now correctly configured and the master-key has been changed and secured."
+    print "Please now run this tool with the --fix-replica option on all your other replicas."
+    print "Until you fix the replicas their KDCs will not work."
+
+def main():
+
+    options, args = parse_options()
+
+    if options.usage:
+        usage()
+
+    if not options.fix and not options.fix_replica and not options.check:
+        print "use --help for more info"
+        usage()
+
+    if options.fix or options.fix_replica:
+        password = getpass.getpass("Directory Manager password: ")
+
+    krbctx = krbV.default_context()
+    realm = krbctx.default_realm
+    suffix = ipa.ipautil.realm_to_suffix(realm)
+
+    try:
+        ret = check_vuln(realm, suffix)
+    except:
+        sys.exit(1)
+
+    if options.fix_replica:
+        if ret is 1:
+            print "Your system is still vulnerable"
+            print "If you have already run this tool with --fix on a master then make sure your replication is working correctly, before runnig --fix-replica"
+            sys.exit(1)
+        try:
+            fix_replica(password, realm, suffix)
+        except Exception, e:
+            print "Unexpected error ("+str(e)+")"
+            sys.exit(1)
+        sys.exit(0)
+
+    if options.check:
+        sys.exit(0)
+
+    if options.fix:
+        if ret is 1:
+            try:
+                ret = fix_main(password, realm, suffix)
+            except Exception, e:
+                print "Unexpected error ("+str(e)+")"
+                sys.exit(1)
+        sys.exit(ret)
+
+try:
+    if __name__ == "__main__":
+        sys.exit(main())
+except SystemExit, e:
+    sys.exit(e)
+except KeyboardInterrupt, e:
+    sys.exit(1)
diff --git a/ipa-server/ipa-server.spec.in b/ipa-server/ipa-server.spec.in
index f8de8aa..2a79de0 100644
--- a/ipa-server/ipa-server.spec.in
+++ b/ipa-server/ipa-server.spec.in
@@ -123,6 +123,7 @@ fi
 %{_sbindir}/ipa_kpasswd
 %{_sbindir}/ipa_webgui
 %{_sbindir}/ipa-upgradeconfig
+%{_sbindir}/ipa-fix-CVE-2008-3274
 %attr(755,root,root) %{_initrddir}/ipa_kpasswd
 %attr(755,root,root) %{_initrddir}/ipa_webgui
 
-- 
1.5.5.1


freeipa-encrypt-files.patch:

--- NEW FILE freeipa-encrypt-files.patch ---
>From 5cbc453d89af0ef79b7c99849778f1982abeda05 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Thu, 7 Aug 2008 16:14:37 -0400
Subject: [PATCH] Add encrypt_file and decrypt_file utility functions.
 We will use them to encrypt the replica file so that we can
 transport it over more safely.
 It contains sensitive data, by encrypting it we assure that
 even if a distracted admin leaves it around it cannot be accessed
 without knowing the access passphrase (usually the Directory Manager
 password)

Along the way fix also ipautil.run which was buggy and not passing
in correctly stdin.

Add dependency for gnupg in spec file
---
 ipa-python/ipa-python.spec.in |    2 +-
 ipa-python/ipautil.py         |   65 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/ipa-python/ipa-python.spec.in b/ipa-python/ipa-python.spec.in
index 7d270b4..7744649 100755
--- a/ipa-python/ipa-python.spec.in
+++ b/ipa-python/ipa-python.spec.in
@@ -10,7 +10,7 @@ Source0:        http://www.freeipa.org/downloads/%{name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 BuildRequires:  python-devel
-Requires:       python-kerberos
+Requires:       python-kerberos gnupg
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
diff --git a/ipa-python/ipautil.py b/ipa-python/ipautil.py
index 117171c..649a3f2 100644
--- a/ipa-python/ipautil.py
+++ b/ipa-python/ipautil.py
@@ -73,11 +73,13 @@ def write_tmp_file(txt):
     return fd
 
 def run(args, stdin=None):
-    p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
     if stdin:
+        p = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
         stdout,stderr = p.communicate(stdin)
     else:
+        p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
         stdout,stderr = p.communicate()
+
     logging.info(stdout)
     logging.info(stderr)
 
@@ -115,6 +117,67 @@ def backup_file(fname):
     if file_exists(fname):
         os.rename(fname, fname + ".orig")
 
+# uses gpg to compress and encrypt a file
+def encrypt_file(source, dest, password, workdir = None):
+    if type(source) is not StringType or not len(source):
+        raise ValueError('Missing Source File')
+    #stat it so that we get back an exception if it does no t exist
+    os.stat(source)
+
+    if type(dest) is not StringType or not len(dest):
+        raise ValueError('Missing Destination File')
+
+    if type(password) is not StringType or not len(password):
+        raise ValueError('Missing Password')
+
+    #create a tempdir so that we can clean up with easily
+    tempdir = tempfile.mkdtemp('', 'ipa-', workdir)
+    gpgdir = tempdir+"/.gnupg"
+
+    try:
+        try:
+            #give gpg a fake dir so that we can leater remove all
+            #the cruft when we clean up the tempdir
+            os.mkdir(gpgdir)
+            args = ['/usr/bin/gpg', '--homedir', gpgdir, '--passphrase-fd', '0', '--yes', '--no-tty', '-o', dest, '-c', source]
+            run(args, password)
+        except:
+            raise
+    finally:
+        #job done, clean up
+        shutil.rmtree(tempdir, ignore_errors=True)
+
+
+def decrypt_file(source, dest, password, workdir = None):
+    if type(source) is not StringType or not len(source):
+        raise ValueError('Missing Source File')
+    #stat it so that we get back an exception if it does no t exist
+    os.stat(source)
+
+    if type(dest) is not StringType or not len(dest):
+        raise ValueError('Missing Destination File')
+
+    if type(password) is not StringType or not len(password):
+        raise ValueError('Missing Password')
+
+    #create a tempdir so that we can clean up with easily
+    tempdir = tempfile.mkdtemp('', 'ipa-', workdir)
+    gpgdir = tempdir+"/.gnupg"
+
+    try:
+        try:
+            #give gpg a fake dir so that we can leater remove all
+            #the cruft when we clean up the tempdir
+            os.mkdir(gpgdir)
+            args = ['/usr/bin/gpg', '--homedir', gpgdir, '--passphrase-fd', '0', '--yes', '--no-tty', '-o', dest, '-d', source]
+            run(args, password)
+        except:
+            raise
+    finally:
+        #job done, clean up
+        shutil.rmtree(tempdir, ignore_errors=True)
+
+
 class CIDict(dict):
     """
     Case-insensitive but case-respecting dictionary.
-- 
1.5.5.1


freeipa-fix-expire.patch:

--- NEW FILE freeipa-fix-expire.patch ---
>From cb641d756f0b3e55cc795cacbf122d7b0a6b1c77 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Wed, 6 Aug 2008 17:22:51 -0400
Subject: [PATCH] Treat Jan 1 1970 in krbPrincipalExpiration as a special date that means the account Never Expires

---
 .../ipa-pwd-extop/ipa_pwd_extop.c                  |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
index be440e8..56003f2 100644
--- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
+++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
@@ -1240,10 +1240,11 @@ static int ipapwd_CheckPolicy(struct ipapwd_data *data)
 	int tmp, ret;
 	const char *old_pw;
 
-	/* check account is not expired */
+	/* check account is not expired. Ignore unixtime = 0 (Jan 1 1970) */
 	krbPrincipalExpiration = slapi_entry_attr_get_charptr(data->target, "krbPrincipalExpiration");
-	if (krbPrincipalExpiration) {
-		/* if expiration date set check it */
+	if (krbPrincipalExpiration &&
+	    (strcasecmp("19700101000000Z", krbPrincipalExpiration) != 0)) {
+		/* if expiration date is set check it */
 		memset(&tm, 0, sizeof(struct tm));
 		ret = sscanf(krbPrincipalExpiration,
 			     "%04u%02u%02u%02u%02u%02u",
@@ -1261,6 +1262,7 @@ static int ipapwd_CheckPolicy(struct ipapwd_data *data)
 		}
 		/* FIXME: else error out ? */
 	}
+	slapi_ch_free_string(&krbPrincipalExpiration);
 
 	/* find the entry with the password policy */
 	ret = ipapwd_getPolicy(data->dn, data->target, &policy);
-- 
1.5.5.1


freeipa-fix-key-encryption.patch:

--- NEW FILE freeipa-fix-key-encryption.patch ---
>From c5b44f77a1a2fcc19312dc2d5ad2a46836c936a2 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Tue, 12 Aug 2008 16:11:16 -0400
Subject: [PATCH] Comment out code that generates keys with a random salt, apparently this does not work as expected and generates faulty keys

---
 .../ipa-pwd-extop/ipa_pwd_extop.c                  |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
index 1697fb5..909476b 100644
--- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
+++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
@@ -582,6 +582,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 			 * we have to use a more conservative approach and set the salt
 			 * to be REALMprincipal (the concatenation of REALM and principal
 			 * name without any separator) */
+#if 0
 			if (krbTicketFlags & KTF_REQUIRES_PRE_AUTH) {
 				salt.length = KRB5P_SALT_SIZE;
 				salt.data = malloc(KRB5P_SALT_SIZE);
@@ -598,6 +599,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 					goto enc_error;
 				}
 			} else {
+#endif
 				krberr = krb5_principal2salt(krbctx, princ, &salt);
 				if (krberr) {
 					slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
@@ -605,7 +607,9 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 							krb5_get_error_message(krbctx, krberr));
 					goto enc_error;
 				}
+#if 0
 			}
+#endif
 			break;
 
 		case KRB5_KDB_SALTTYPE_V4:
-- 
1.5.5.1


freeipa-refresh-mkey.patch:

--- NEW FILE freeipa-refresh-mkey.patch ---
>From aad877939879b9c5781d90921d5867e48506b223 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Fri, 22 Aug 2008 15:03:50 -0400
Subject: [PATCH] Retrieve the kerberos configuration every time a new, it will be a bit slower
 but will allow for changing configurations without having to restart DS.
 Password operations are slow and rare enough this is an acceptable compromise.

---
 .../ipa-pwd-extop/ipa_pwd_extop.c                  |  482 ++++++++++----------
 1 files changed, 236 insertions(+), 246 deletions(-)

diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
index eae63da..9b746a9 100644
--- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
+++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
@@ -137,27 +137,42 @@ struct ipapwd_encsalt {
 	krb5_int32	salt_type;
 };
 
-struct ipapwd_config {
-	char *realm;
-	krb5_keyblock *kmkey;
-	int num_supp_encsalts;
-	struct ipapwd_encsalt *supp_encsalts;
-	int num_pref_encsalts;
-	struct ipapwd_encsalt *pref_encsalts;
-};
-
 static const char *ipa_realm_dn = NULL;
 
 Slapi_Mutex *ipa_globals = NULL;
 
-static struct ipapwd_config *ipapwd_config = NULL;
-
 static void *ipapwd_plugin_id;
 
 #define IPA_CHANGETYPE_NORMAL 0
 #define IPA_CHANGETYPE_ADMIN 1
 #define IPA_CHANGETYPE_DSMGR 2
 
+struct ipapwd_krbcfg {
+    krb5_context krbctx;
+    char *realm;
+    krb5_keyblock *kmkey;
+    int num_supp_encsalts;
+    struct ipapwd_encsalt *supp_encsalts;
+    int num_pref_encsalts;
+    struct ipapwd_encsalt *pref_encsalts;
+};
+
+static void free_ipapwd_krbcfg(struct ipapwd_krbcfg **cfg)
+{
+    struct ipapwd_krbcfg *c = *cfg;
+
+    if (!c) return;
+
+    krb5_free_default_realm(c->krbctx, c->realm);
+    krb5_free_context(c->krbctx);
+    free(c->kmkey->contents);
+    free(c->kmkey);
+    free(c->supp_encsalts);
+    free(c->pref_encsalts);
+    free(c);
+    *cfg = NULL;
+};
+
 struct ipapwd_data {
 	Slapi_Entry *target;
 	const char *dn;
@@ -218,23 +233,18 @@ static void ipapwd_keyset_free(struct ipapwd_keyset **pkset)
 	*pkset = NULL;
 }
 
-static int filter_keys(struct ipapwd_keyset *kset)
+static int filter_keys(struct ipapwd_krbcfg *krbcfg, struct ipapwd_keyset *kset)
 {
-	struct ipapwd_config *config;
 	int i, j;
 
-	slapi_lock_mutex(ipa_globals);
-	config = ipapwd_config;
-	slapi_unlock_mutex(ipa_globals);
-
 	for (i = 0; i < kset->num_keys; i++) {
-		for (j = 0; j < config->num_supp_encsalts; j++) {
+		for (j = 0; j < krbcfg->num_supp_encsalts; j++) {
 			if (kset->keys[i].ekey->type ==
-					config->supp_encsalts[j].enc_type) {
+					krbcfg->supp_encsalts[j].enc_type) {
 				break;
 			}
 		}
-		if (j == config->num_supp_encsalts) { /* not valid */
+		if (j == krbcfg->num_supp_encsalts) { /* not valid */
 
 			/* free key */
 			if (kset->keys[i].ekey) {
@@ -458,9 +468,10 @@ static inline void encode_int16(unsigned int val, unsigned char *p)
 	p[0] = (val      ) & 0xff;
 }
 
-static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data *data)
+static Slapi_Value **encrypt_encode_key(struct ipapwd_krbcfg *krbcfg,
+					struct ipapwd_data *data)
 {
-	struct ipapwd_config *config;
+	krb5_context krbctx;
 	const char *krbPrincipalName;
 	uint32_t krbMaxTicketLife;
 	int kvno, i;
@@ -472,9 +483,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 	krb5_data pwd;
 	struct ipapwd_keyset *kset = NULL;
 
-	slapi_lock_mutex(ipa_globals);
-	config = ipapwd_config;
-	slapi_unlock_mutex(ipa_globals);
+	krbctx = krbcfg->krbctx;
 
 	svals = (Slapi_Value **)calloc(2, sizeof(Slapi_Value *));
 	if (!svals) {
@@ -524,7 +533,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 	/* we also assum mkvno is 0 */
 	kset->mkvno = 0;
 
-	kset->num_keys = config->num_pref_encsalts;
+	kset->num_keys = krbcfg->num_pref_encsalts;
 	kset->keys = calloc(kset->num_keys, sizeof(struct ipapwd_krbkey));
 	if (!kset->keys) {
 		slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop", "malloc failed!\n");
@@ -542,7 +551,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 
 		salt.data = NULL;
 
-		switch (config->pref_encsalts[i].salt_type) {
+		switch (krbcfg->pref_encsalts[i].salt_type) {
 
 		case KRB5_KDB_SALTTYPE_ONLYREALM:
 
@@ -629,12 +638,12 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 
 		default:
 			slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
-					"Invalid salt type [%d]\n", config->pref_encsalts[i].salt_type);
+					"Invalid salt type [%d]\n", krbcfg->pref_encsalts[i].salt_type);
 			goto enc_error;
 		}
 
 		/* need to build the key now to manage the AFS salt.length special case */
-		krberr = krb5_c_string_to_key(krbctx, config->pref_encsalts[i].enc_type, &pwd, &salt, &key);
+		krberr = krb5_c_string_to_key(krbctx, krbcfg->pref_encsalts[i].enc_type, &pwd, &salt, &key);
 		if (krberr) {
 			slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
 					"krb5_c_string_to_key failed [%s]\n",
@@ -646,7 +655,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 			salt.length = strlen(salt.data);
 		}
 
-		krberr = krb5_c_encrypt_length(krbctx, config->kmkey->enctype, key.length, &len);
+		krberr = krb5_c_encrypt_length(krbctx, krbcfg->kmkey->enctype, key.length, &len);
 		if (krberr) {
 			slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
 					"krb5_c_string_to_key failed [%s]\n",
@@ -672,7 +681,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 		cipher.ciphertext.length = len;
 		cipher.ciphertext.data = (char *)ptr+2;
 
-		krberr = krb5_c_encrypt(krbctx, config->kmkey, 0, 0, &plain, &cipher);
+		krberr = krb5_c_encrypt(krbctx, krbcfg->kmkey, 0, 0, &plain, &cipher);
 		if (krberr) {
 			slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
 					"krb5_c_encrypt failed [%s]\n",
@@ -692,7 +701,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 			goto enc_error;
 		}
 
-		kset->keys[i].salt->type = config->pref_encsalts[i].salt_type;
+		kset->keys[i].salt->type = krbcfg->pref_encsalts[i].salt_type;
 
 		if (salt.length) {
 			kset->keys[i].salt->value.bv_len = salt.length;
@@ -1633,7 +1642,8 @@ static void hexbuf(char *out, const uint8_t *in)
 }
 
 /* Modify the Password attributes of the entry */
-static int ipapwd_SetPassword(struct ipapwd_data *data)
+static int ipapwd_SetPassword(struct ipapwd_krbcfg *krbcfg,
+				struct ipapwd_data *data)
 {
 	int ret = 0, i = 0;
 	Slapi_Mods *smods;
@@ -1648,26 +1658,17 @@ static int ipapwd_SetPassword(struct ipapwd_data *data)
 	int ntlm_flags = 0;
 	Slapi_Value *sambaSamAccount;
 
-	krberr = krb5_init_context(&krbctx);
-	if (krberr) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop", "krb5_init_context failed\n");
-		return LDAP_OPERATIONS_ERROR;
-	}
-
 	slapi_log_error(SLAPI_LOG_TRACE, "ipa_pwd_extop", "=> ipapwd_SetPassword\n");
 
 	smods = slapi_mods_new();
 
 	/* generate kerberos keys to be put into krbPrincipalKey */
-	svals = encrypt_encode_key(krbctx, data);
+	svals = encrypt_encode_key(krbcfg, data);
 	if (!svals) {
 		slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop", "key encryption/encoding failed\n");
-		krb5_free_context(krbctx);
 		ret = LDAP_OPERATIONS_ERROR;
 		goto free_and_return;
 	}
-	/* done with it */
-	krb5_free_context(krbctx);
 
 	slapi_mods_add_mod_values(smods, LDAP_MOD_REPLACE, "krbPrincipalKey", svals);
 
@@ -1756,7 +1757,7 @@ free_and_return:
 	return ret;
 }
 
-static int ipapwd_chpwop(Slapi_PBlock *pb)
+static int ipapwd_chpwop(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg)
 {
 	char 		*bindDN = NULL;
 	char		*authmethod = NULL;
@@ -1772,11 +1773,6 @@ static int ipapwd_chpwop(Slapi_PBlock *pb)
 	Slapi_Entry *targetEntry=NULL;
 	char *attrlist[] = {"*", "passwordHistory", NULL };
 	struct ipapwd_data pwdata;
-	struct ipapwd_config *config;
-
-	slapi_lock_mutex(ipa_globals);
-	config = ipapwd_config;
-	slapi_unlock_mutex(ipa_globals);
 
 	/* Get the ber value of the extended operation */
 	slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_value);
@@ -1973,7 +1969,7 @@ parse_req_done:
 		if (bindexp) {
 			/* special case kpasswd and Directory Manager */
 			if ((strncasecmp(bindexp[0], "krbprincipalname=kadmin/changepw@", 33) == 0) &&
-			    (strcasecmp(&(bindexp[0][33]), config->realm) == 0)) {
+			    (strcasecmp(&(bindexp[0][33]), krbcfg->realm) == 0)) {
 				pwdata.changetype = IPA_CHANGETYPE_NORMAL;
 			}
 			if ((strcasecmp(bindexp[0], "cn=Directory Manager") == 0) &&
@@ -1999,7 +1995,7 @@ parse_req_done:
 	}
 
 	/* Now we're ready to set the kerberos key material */
-	ret = ipapwd_SetPassword(&pwdata);
+	ret = ipapwd_SetPassword(krbcfg, &pwdata);
 	if (ret != LDAP_SUCCESS) {
 		/* Failed to modify the password,
 		 * e.g. because insufficient access allowed */
@@ -2037,9 +2033,8 @@ free_and_return:
 }
 
 /* Password Modify Extended operation plugin function */
-static int ipapwd_setkeytab(Slapi_PBlock *pb)
+static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg)
 {
-	struct ipapwd_config *config;
 	char *bindDN = NULL;
 	char *serviceName = NULL;
 	char *errMesg = NULL;
@@ -2071,10 +2066,6 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb)
 	char timestr[GENERALIZED_TIME_LENGTH+1];
 	time_t time_now = time(NULL);
 
-	slapi_lock_mutex(ipa_globals);
-	config = ipapwd_config;
-	slapi_unlock_mutex(ipa_globals);
-
 	svals = (Slapi_Value **)calloc(2, sizeof(Slapi_Value *));
 	if (!svals) {
 		slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
@@ -2333,7 +2324,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb)
 		plain.length = tval.bv_len;
 		plain.data = tval.bv_val;
 
-		krberr = krb5_c_encrypt_length(krbctx, config->kmkey->enctype, plain.length, &klen);
+		krberr = krb5_c_encrypt_length(krbctx, krbcfg->kmkey->enctype, plain.length, &klen);
 		if (krberr) {
 			free(tval.bv_val);
 			slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop", "krb encryption failed!\n");
@@ -2354,7 +2345,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb)
 		cipher.ciphertext.length = klen;
 		cipher.ciphertext.data = (char *)kdata + 2;
 
-		krberr = krb5_c_encrypt(krbctx, config->kmkey, 0, 0, &plain, &cipher);
+		krberr = krb5_c_encrypt(krbctx, krbcfg->kmkey, 0, 0, &plain, &cipher);
 		if (krberr) {
 			free(tval.bv_val);
 			slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop", "krb encryption failed!\n");
@@ -2421,7 +2412,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb)
 	ber = NULL;
 
 	/* filter un-supported encodings */
-	ret = filter_keys(kset);
+	ret = filter_keys(krbcfg, kset);
 	if (ret) {
 		slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
 				"keyset filtering failed\n");
@@ -2620,168 +2620,182 @@ static int new_ipapwd_encsalt(krb5_context krbctx, const char * const *encsalts,
 	return LDAP_SUCCESS;
 }
 
-static int ipapwd_getConfig(krb5_context krbctx, const char *realm_dn)
+static struct ipapwd_krbcfg *ipapwd_getConfig(const char *realm_dn)
 {
-	struct ipapwd_config *config = NULL;
-	krb5_keyblock *kmkey = NULL;
-	Slapi_Entry *realm_entry = NULL;
-	Slapi_Attr *a;
-	Slapi_Value *v;
-	BerElement *be = NULL;
-	ber_tag_t tag, tmp;
-	ber_int_t ttype;
-	const struct berval *bval;
-	struct berval *mkey = NULL;
-	char **encsalts;
-	int ret;
-
-	config = malloc(sizeof(struct ipapwd_config));
-	if (!config) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Out of memory!\n");
-		goto free_and_error;
-	}
-	kmkey = malloc(sizeof(krb5_keyblock));
-	if (!kmkey) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Out of memory!\n");
-		goto free_and_error;
-	}
-	config->kmkey = kmkey;
-
-	ret = krb5_get_default_realm(krbctx, &config->realm);
-	if (ret) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Failed to get default realm?!\n");
-		goto free_and_error;
-	}
-
-
-	/* get the Realm Container entry */
-	ret = ipapwd_getEntry(realm_dn, &realm_entry, NULL);
-	if (ret != LDAP_SUCCESS) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"No realm Entry?\n");
-		goto free_and_error;
-	}
-
-	/*** get the Kerberos Master Key ***/
+    krb5_error_code krberr;
+    struct ipapwd_krbcfg *config = NULL;
+    krb5_keyblock *kmkey = NULL;
+    Slapi_Entry *realm_entry = NULL;
+    Slapi_Attr *a;
+    Slapi_Value *v;
+    BerElement *be = NULL;
+    ber_tag_t tag, tmp;
+    ber_int_t ttype;
+    const struct berval *bval;
+    struct berval *mkey = NULL;
+    char **encsalts;
+    int ret;
+
+    config = calloc(1, sizeof(struct ipapwd_krbcfg));
+    if (!config) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Out of memory!\n");
+        goto free_and_error;
+    }
+    kmkey = calloc(1, sizeof(krb5_keyblock));
+    if (!kmkey) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Out of memory!\n");
+        goto free_and_error;
+    }
+    config->kmkey = kmkey;
+
+    krberr = krb5_init_context(&config->krbctx);
+    if (krberr) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "krb5_init_context failed\n");
+        goto free_and_error;
+    }
+
+    ret = krb5_get_default_realm(config->krbctx, &config->realm);
+    if (ret) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Failed to get default realm?!\n");
+        goto free_and_error;
+    }
+
+    /* get the Realm Container entry */
+    ret = ipapwd_getEntry(realm_dn, &realm_entry, NULL);
+    if (ret != LDAP_SUCCESS) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "No realm Entry?\n");
+        goto free_and_error;
+    }
+
+    /*** get the Kerberos Master Key ***/
+
+    ret = slapi_entry_attr_find(realm_entry, "krbMKey", &a);
+    if (ret == -1) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "No master key??\n");
+        goto free_and_error;
+    }
+
+    /* there should be only one value here */
+    ret = slapi_attr_first_value(a, &v);
+    if (ret == -1) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "No master key??\n");
+        goto free_and_error;
+    }
+
+    bval = slapi_value_get_berval(v);
+    if (!bval) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Error retrieving master key berval\n");
+        goto free_and_error;
+    }
+
+    be = ber_init(bval);
+    if (!bval) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "ber_init() failed!\n");
+        goto free_and_error;
+    }
+
+    tag = ber_scanf(be, "{i{iO}}", &tmp, &ttype, &mkey);
+    if (tag == LBER_ERROR) {
+        slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_getConfig",
+                        "Bad Master key encoding ?!\n");
+        goto free_and_error;
+    }
+
+    kmkey->magic = KV5M_KEYBLOCK;
+    kmkey->enctype = ttype;
+    kmkey->length = mkey->bv_len;
+    kmkey->contents = malloc(mkey->bv_len);
+    if (!kmkey->contents) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Out of memory!\n");
+        goto free_and_error;
+    }
+    memcpy(kmkey->contents, mkey->bv_val, mkey->bv_len);
+    ber_bvfree(mkey);
+    ber_free(be, 1);
+    mkey = NULL;
+    be = NULL;
+
+    /*** get the Supported Enc/Salt types ***/
+
+    encsalts = slapi_entry_attr_get_charray(realm_entry, "krbSupportedEncSaltTypes");
+    if (encsalts) {
+        ret = new_ipapwd_encsalt(config->krbctx,
+                                 (const char * const *)encsalts,
+                                 &config->supp_encsalts,
+                                 &config->num_supp_encsalts);
+        slapi_ch_array_free(encsalts);
+    } else {
+        slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_getConfig",
+                        "No configured salt types use defaults\n");
+        ret = new_ipapwd_encsalt(config->krbctx,
+                                 ipapwd_def_encsalts,
+                                 &config->supp_encsalts,
+                                 &config->num_supp_encsalts);
+    }
+    if (ret) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Can't get Supported EncSalt Types\n");
+        goto free_and_error;
+    }
+
+    /*** get the Preferred Enc/Salt types ***/
+
+    encsalts = slapi_entry_attr_get_charray(realm_entry, "krbDefaultEncSaltTypes");
+    if (encsalts) {
+        ret = new_ipapwd_encsalt(config->krbctx,
+                                 (const char * const *)encsalts,
+                                 &config->pref_encsalts,
+                                 &config->num_pref_encsalts);
+        slapi_ch_array_free(encsalts);
+    } else {
+        slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_getConfig",
+                        "No configured salt types use defaults\n");
+        ret = new_ipapwd_encsalt(config->krbctx,
+                                 ipapwd_def_encsalts,
+                                 &config->pref_encsalts,
+                                 &config->num_pref_encsalts);
+    }
+    if (ret) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Can't get Preferred EncSalt Types\n");
+        goto free_and_error;
+    }
 
-	ret = slapi_entry_attr_find(realm_entry, "krbMKey", &a);
-	if (ret == -1) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"No master key??\n");
-		goto free_and_error;
-	}
-
-	/* there should be only one value here */
-	ret = slapi_attr_first_value(a, &v);
-	if (ret == -1) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"No master key values??\n");
-		goto free_and_error;
-	}
-
-	bval = slapi_value_get_berval(v);
-	if (!bval) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Error retrieving master key berval\n");
-		goto free_and_error;
-	}
-
-	be = ber_init(bval);
-	if (!bval) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"ber_init() failed!\n");
-		goto free_and_error;
-	}
-
-	tag = ber_scanf(be, "{i{iO}}", &tmp, &ttype, &mkey);
-	if (tag == LBER_ERROR) {
-		slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_start",
-				"Bad Master key encoding ?!\n");
-		goto free_and_error;
-	}
+    slapi_entry_free(realm_entry);
 
-	kmkey->magic = KV5M_KEYBLOCK;
-	kmkey->enctype = ttype;
-	kmkey->length = mkey->bv_len;
-	kmkey->contents = malloc(mkey->bv_len);
-	if (!kmkey->contents) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Out of memory!\n");
-		goto free_and_error;
-	}
-	memcpy(kmkey->contents, mkey->bv_val, mkey->bv_len);
-	ber_bvfree(mkey);
-	ber_free(be, 1);
-
-	/*** get the Supported Enc/Salt types ***/
-
-	encsalts = slapi_entry_attr_get_charray(realm_entry, "krbSupportedEncSaltTypes");
-	if (encsalts) {
-		ret = new_ipapwd_encsalt(krbctx, (const char * const *)encsalts,
-					 &config->supp_encsalts,
-					 &config->num_supp_encsalts);
-		slapi_ch_array_free(encsalts);
-	} else {
-		slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_start",
-				"No configured salt types use defaults\n");
-		ret = new_ipapwd_encsalt(krbctx, ipapwd_def_encsalts,
-					 &config->supp_encsalts,
-					 &config->num_supp_encsalts);
-	}
-	if (ret) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Can't get Supported EncSalt Types\n");
-		goto free_and_error;
-	}
-
-	/*** get the Preferred Enc/Salt types ***/
-
-	encsalts = slapi_entry_attr_get_charray(realm_entry, "krbDefaultEncSaltTypes");
-	if (encsalts) {
-		ret = new_ipapwd_encsalt(krbctx, (const char * const *)encsalts,
-					 &config->pref_encsalts,
-					 &config->num_pref_encsalts);
-		slapi_ch_array_free(encsalts);
-	} else {
-		slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_start",
-				"No configured salt types use defaults\n");
-		ret = new_ipapwd_encsalt(krbctx, ipapwd_def_encsalts,
-					 &config->pref_encsalts,
-					 &config->num_pref_encsalts);
-	}
-	if (ret) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Can't get Preferred EncSalt Types\n");
-		goto free_and_error;
-	}
-
-	/*** set config/replace old config ***/
-
-	/* FIXME: free old one in a safe way, use read locks ? */
-	slapi_lock_mutex(ipa_globals);
-	ipapwd_config = config;
-	slapi_unlock_mutex(ipa_globals);
-
-	slapi_entry_free(realm_entry);
-	return LDAP_SUCCESS;
+    return config;
 
 free_and_error:
-	if (mkey) ber_bvfree(mkey);
-	if (be) ber_free(be, 1);
-	free(config->pref_encsalts);
-	free(config->supp_encsalts);
-	free(config->kmkey);
-	free(config);
-	if (realm_entry) slapi_entry_free(realm_entry);
-	return LDAP_OPERATIONS_ERROR;
+    if (mkey) ber_bvfree(mkey);
+    if (be) ber_free(be, 1);
+    if (kmkey) {
+        free(kmkey->contents);
+        free(kmkey);
+    }
+    if (config) {
+        if (config->krbctx) krb5_free_context(config->krbctx);
+        free(config->pref_encsalts);
+        free(config->supp_encsalts);
+        free(config);
+    }
+    if (realm_entry) slapi_entry_free(realm_entry);
+    return NULL;
 }
 
 
 static int ipapwd_extop(Slapi_PBlock *pb)
 {
+  	struct ipapwd_krbcfg *krbcfg = NULL;
 	char *oid = NULL;
 	char *errMesg = NULL;
 	int ret=0, rc=0, sasl_ssf=0, is_ssl=0;
@@ -2835,30 +2841,6 @@ static int ipapwd_extop(Slapi_PBlock *pb)
 	}
 #endif
 
-	/* make sure we have the master key */
-	if (ipapwd_config == NULL) {
-		krb5_context krbctx;
-		krb5_error_code krberr;
-
-		krberr = krb5_init_context(&krbctx);
-		if (krberr) {
-			slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-					"krb5_init_context failed\n");
-			errMesg = "Fatal Internal Error";
-			rc = LDAP_OPERATIONS_ERROR;
-			goto free_and_return;
-		}
-		ret = ipapwd_getConfig(krbctx, ipa_realm_dn);
-		if (ret != LDAP_SUCCESS) {
-			slapi_log_error(SLAPI_LOG_PLUGIN, "ipa_pwd_extop",
-					"Error Retrieving Master Key");
-			errMesg = "Fatal Internal Error";
-			rc = LDAP_OPERATIONS_ERROR;
-			goto free_and_return;
-		}
-		krb5_free_context(krbctx);
-	}
-
 	/* Before going any further, we'll make sure that the right extended
 	 * operation plugin has been called: i.e., the OID shipped whithin the
 	 * extended operation request must match this very plugin's OIDs:
@@ -2873,11 +2855,25 @@ static int ipapwd_extop(Slapi_PBlock *pb)
 				"Received extended operation request with OID %s\n", oid);
 	}
 
+	/* get the kerberos context and master key */
+	krbcfg = ipapwd_getConfig(ipa_realm_dn);
+	if (NULL == krbcfg) {
+		slapi_log_error(SLAPI_LOG_PLUGIN, "ipa_pwd_extop",
+				"Error Retrieving Master Key");
+		errMesg = "Fatal Internal Error";
+		rc = LDAP_OPERATIONS_ERROR;
+		goto free_and_return;
+	}
+
 	if (strcasecmp(oid, EXOP_PASSWD_OID) == 0) {
-		return ipapwd_chpwop(pb);
+		ret = ipapwd_chpwop(pb, krbcfg);
+		free_ipapwd_krbcfg(&krbcfg);
+		return ret;
 	}
 	if (strcasecmp(oid, KEYTAB_SET_OID) == 0) {
-		return ipapwd_setkeytab(pb);
+		ret = ipapwd_setkeytab(pb, krbcfg);
+		free_ipapwd_krbcfg(&krbcfg);
+		return ret;
 	}
 
 	errMesg = "Request OID does not match supported OIDs.\n";
@@ -2952,12 +2948,6 @@ static int ipapwd_start( Slapi_PBlock *pb )
 	ipa_realm_dn = realm_dn;
 	slapi_unlock_mutex(ipa_globals);
 
-	ret = ipapwd_getConfig(krbctx, ipa_realm_dn);
-	if (ret) {
-		slapi_log_error( SLAPI_LOG_PLUGIN, "ipapwd_start", "Couldn't init master key at start delaying ...");
-		ret = LDAP_SUCCESS;
-	}
-
 	krb5_free_context(krbctx);
 	slapi_entry_free(config_entry);
 	return ret;
-- 
1.5.5.1


freeipa-user-input.patch:

--- NEW FILE freeipa-user-input.patch ---
>From f7ca405716b1ee8b92a940e07cd611f6b025795d Mon Sep 17 00:00:00 2001
From: Martin Nagy <mnagy at notas.(none)>
Date: Mon, 21 Jul 2008 12:25:37 +0200
Subject: [PATCH] Wrap up the raw_input() to user_input() for convenience and uniformity.

---
 ipa-admintools/ipa-addgroup                   |   17 +------
 ipa-admintools/ipa-adduser                    |   50 ++----------------
 ipa-admintools/ipa-moduser                    |   57 +++-------------------
 ipa-client/ipa-install/ipa-client-install     |   23 ++------
 ipa-python/ipautil.py                         |   66 +++++++++++++++++++++++++
 ipa-radius-server/ipa-radius-install          |    3 +-
 ipa-server/ipa-install/ipa-replica-install    |   10 +---
 ipa-server/ipa-install/ipa-server-certinstall |   19 ++-----
 ipa-server/ipa-install/ipa-server-install     |   64 +++++++++---------------
 9 files changed, 119 insertions(+), 190 deletions(-)

diff --git a/ipa-admintools/ipa-addgroup b/ipa-admintools/ipa-addgroup
index caf4e93..cc81383 100644
--- a/ipa-admintools/ipa-addgroup
+++ b/ipa-admintools/ipa-addgroup
@@ -81,29 +81,16 @@ def main():
     if options.usage:
         usage()
 
-    cont = False
-
     if (len(args) != 2):
-        while (cont != True):
-            cn = raw_input("Group name: ")
-            if (ipavalidate.String(cn, notEmpty=True)):
-                print "Please enter a value"
-            else:
-                cont = True
+        cn = ipautil.user_input("Group name", allow_empty = False)
     else:
         cn = args[1]
         if (ipavalidate.String(cn, notEmpty=True)):
             print "Please enter a value"
             return 1
 
-    cont = False
     if not options.desc:
-        while (cont != True):
-            desc = raw_input("Description: ")
-            if (ipavalidate.String(desc, notEmpty=True)):
-                print "Please enter a value"
-            else:
-                cont = True
+        desc = ipautil.user_input("Description", allow_empty = False)
     else:
         desc = options.desc
         if (ipavalidate.String(desc, notEmpty=True)):
diff --git a/ipa-admintools/ipa-adduser b/ipa-admintools/ipa-adduser
index 2c32d1e..17c75ed 100644
--- a/ipa-admintools/ipa-adduser
+++ b/ipa-admintools/ipa-adduser
@@ -102,7 +102,6 @@ def main():
     groups = ""
 
     match = False
-    cont = False
 
     all_interactive = False
 
@@ -116,40 +115,23 @@ def main():
         all_interactive = True
 
     if not options.gn:
-        while (cont != True):
-            givenname = raw_input("First name: ")
-            if (ipavalidate.String(givenname, notEmpty=True)):
-                print "Please enter a value"
-            else:
-                cont = True
+        givenname = ipautil.user_input("First name", allow_empty = False)
     else:
         givenname = options.gn
         if (ipavalidate.String(givenname, notEmpty=True)):
             print "Please enter a value"
             return 1
 
-    cont = False
     if not options.sn:
-        while (cont != True):
-            lastname = raw_input("Last name: ")
-            if (ipavalidate.String(lastname, notEmpty=True)):
-                print "Please enter a value"
-            else:
-                cont = True
+        lastname = ipautil.user_input("Last name", allow_empty = False)
     else:
         lastname = options.sn
         if (ipavalidate.String(lastname, notEmpty=True)):
             print "Please enter a value"
             return 1
 
-    cont = False
     if (len(args) != 2):
-        while (cont != True):
-            username = raw_input("Login name: ")
-            if (ipavalidate.Plain(username, notEmpty=True, allowSpaces=False)):
-                print "Please enter a value"
-            else:
-                cont = True
+        username = ipautil.user_input_plain("Login name", allow_empty = False, allow_spaces = False)
     else:
         username = args[1]
         if (ipavalidate.Plain(username, notEmpty=True, allowSpaces=False)):
@@ -180,32 +162,12 @@ def main():
     # Ask the questions we don't normally force. We don't require answers
     # for these.
     if all_interactive is True:
-        cont = False
         if not options.gecos:
-            while (cont != True):
-                gecos = raw_input("gecos []: ")
-                if (ipavalidate.String(gecos, notEmpty=False)):
-                    print "Please enter a value"
-                else:
-                    cont = True
-        cont = False
+            gecos = ipautil.user_input("gecos")
         if not options.directory:
-            while (cont != True):
-                directory = raw_input("home directory [/home/"+username+"]: ")
-                if directory == "":
-                     directory = "/home/"+username
-                if (ipavalidate.Path(directory, notEmpty=False)):
-                    print "Please enter a value"
-                else:
-                    cont = True
-        cont = False
+            directory = ipautil.user_input_path("Home directory", "/home/" + username, allow_empty = True)
         if not options.shell:
-            while (cont != True):
-                shell = raw_input("shell [/bin/sh]: ")
-
-                if len(shell) < 1:
-                    shell = None
-                cont = True
+            shell = ipautil.user_input("Shell", "/bin/sh", allow_empty = False)
 
     else:
         gecos = options.gecos
diff --git a/ipa-admintools/ipa-moduser b/ipa-admintools/ipa-moduser
index 22f2318..4b3bd5c 100644
--- a/ipa-admintools/ipa-moduser
+++ b/ipa-admintools/ipa-moduser
@@ -97,7 +97,6 @@ def main():
     shell = ""
 
     match = False
-    cont = False
 
     options, args = parse_options()
 
@@ -141,46 +140,23 @@ def main():
         shell = options.shell
     else:
         if not options.gn:
-            while (cont != True):
-                givenname = raw_input("First name: [%s] " % user.getValue('givenname'))
-                if (ipavalidate.String(givenname, notEmpty=False)):
-                    print "Please enter a value"
-                else:
-                    cont = True
-                if len(givenname) < 1:
-                    givenname = None
-                    cont = True
+            givenname = ipautil.user_input("First name", user.getValue('givenname'), allow_empty = False)
         else:
             givenname = options.gn
             if (ipavalidate.String(givenname, notEmpty=True)):
                 print "Please enter a value"
                 return 1
 
-        cont = False
         if not options.sn:
-            while (cont != True):
-                lastname = raw_input(" Last name: [%s] " % user.getValue('sn'))
-                if (ipavalidate.String(lastname, notEmpty=False)):
-                    print "Please enter a value"
-                else:
-                    cont = True
-                if len(lastname) < 1:
-                    lastname = None
-                    cont = True
+            lastname = ipautil.user_input("Last name", user.getValue('sn'), allow_empty = False)
         else:
             lastname = options.sn
             if (ipavalidate.String(lastname, notEmpty=True)):
                 print "Please enter a value"
                 return 1
 
-        cont = False
         if not options.mail:
-            while (cont != True):
-                mail = raw_input("E-mail addr: [%s]" % user.getValue('mail'))
-                if (ipavalidate.Email(mail, notEmpty=False)):
-                    print "E-mail must include a user and domain name"
-                else:
-                    cont = True
+            mail = ipautil.user_input_email("E-mail address", user.getValue('mail'), allow_empty = True)
         else:
             mail = options.mail
             if (ipavalidate.Email(mail)):
@@ -189,32 +165,13 @@ def main():
 
         # Ask the questions we don't normally force. We don't require answers
         # for these.
-        cont = False
         if not options.gecos:
-            while (cont != True):
-                gecos = raw_input("gecos: [%s] " % user.getValue('gecos'))
-                if (ipavalidate.String(gecos, notEmpty=False)):
-                    print "Please enter a value"
-                else:
-                    cont = True
+            gecos = ipautil.user_input("gecos", user.getValue('gecos'))
 
-        cont = False
         if not options.directory:
-            while (cont != True):
-                directory = raw_input("home directory: [%s] " % user.getValue('homeDirectory'))
-                if (ipavalidate.Path(gecos, notEmpty=False)):
-                    print "Valid path is required"
-                else:
-                    cont = True
-        cont = False
+            directory = ipautil.user_input_path("Home directory", user.getValue('homeDirectory'))
         if not options.shell:
-            while (cont != True):
-                shell = raw_input("shell: [%s] " % user.getValue('loginshell'))
-
-                if len(shell) < 1:
-                    shell = None
-                    cont = True
-        cont = False
+            shell = ipautil.user_input("Shell", user.getValue('loginshell'), allow_empty = False)
 
     if givenname:
         user.setValue('givenname', givenname)
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index ecdf927..eec36e4 100644
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -30,7 +30,7 @@ try:
     import ipaclient.ipadiscovery
     import ipaclient.ipachangeconf
     import ipaclient.ntpconf
-    from ipa.ipautil import run
+    from ipa.ipautil import run, user_input
     from ipa import sysrestore
     from ipa import version
 except ImportError:
@@ -70,13 +70,6 @@ def parse_options():
 
     return options
 
-def ask_for_confirmation(message):
-    yesno = raw_input(message + " [y/N]: ")
-    if not yesno or yesno.lower()[0] != "y":
-        return False
-    print "\n"
-    return True
-
 def logging_setup(options):
     # Always log everything (i.e., DEBUG) to the log
     # file.
@@ -124,7 +117,7 @@ def uninstall(options):
         print "The original nsswitch.conf configuration has been restored."
         print "You may need to restart services or reboot the machine."
         if not options.on_master:
-            if ask_for_confirmation("Do you want to reboot the machine?"):
+            if user_input("Do you want to reboot the machine?", False):
                 try:
                     run(["/usr/bin/reboot"])
                 except Exception, e:
@@ -163,9 +156,7 @@ def main():
             return ret
         else:
             print "DNS discovery failed to determine your DNS domain"
-            cli_domain = ""
-            while cli_domain == "":
-                cli_domain = raw_input("Please provide the domain name of your IPA server (ex: example.com): ")
+            cli_domain = user_input("Please provide the domain name of your IPA server (ex: example.com)", allow_empty = False)
         ret = ds.search(domain=cli_domain, server=options.server)
     if not cli_domain:
         if ds.getDomainName():
@@ -180,9 +171,7 @@ def main():
             return ret
         else:
             print "DNS discovery failed to find the IPA Server"
-            cli_server = ""
-            while cli_server == "":
-                cli_server = raw_input("Please provide your IPA server name (ex: ipa.example.com): ")
+            cli_server = user_input("Please provide your IPA server name (ex: ipa.example.com)", allow_empty = False)
         ret = ds.search(domain=cli_domain, server=cli_server)
     if not cli_server:
         if ds.getServerName():
@@ -203,7 +192,7 @@ def main():
         print "If you proceed with the installation, services will be configured to always"
         print "access the discovered server for all operation and will not fail over to"
         print "other servers in case of failure.\n"
-        if not ask_for_confirmation("Do you want to proceed and configure the system with fixed values with no DNS discovery?"):
+        if not user_input("Do you want to proceed and configure the system with fixed values with no DNS discovery?", False):
             return ret
 
     if options.realm_name and options.realm_name != ds.getRealmName():
@@ -220,7 +209,7 @@ def main():
     print "BaseDN: "+cli_basedn
 
     print "\n"
-    if not options.unattended and not ask_for_confirmation("Continue to configure the system with these values?"):
+    if not options.unattended and not user_input("Continue to configure the system with these values?", False):
         return 1
 
     # Configure ipa.conf
diff --git a/ipa-python/ipautil.py b/ipa-python/ipautil.py
index 4e065fc..3526cc7 100644
--- a/ipa-python/ipautil.py
+++ b/ipa-python/ipautil.py
@@ -29,6 +29,7 @@ import os, sys, traceback, readline
 import stat
 import shutil
 
+from ipa import ipavalidate
 from types import *
 
 import re
@@ -482,6 +483,71 @@ def read_items_file(filename):
     if fd != sys.stdin: fd.close()
     return items
 
+def user_input(prompt, default = None, allow_empty = True):
+    if default == None:
+        while True:
+            ret = raw_input("%s: " % prompt)
+            if allow_empty or ret.strip():
+                return ret
+                
+    if isinstance(default, basestring):
+        while True:
+            ret = raw_input("%s [%s]: " % (prompt, default))
+            if not ret and (allow_empty or default):
+                return default
+            elif ret.strip():
+                return ret
+    if isinstance(default, bool):
+        if default:
+            choice = "yes"
+        else:
+            choice = "no"
+        while True:
+            ret = raw_input("%s [%s]: " % (prompt, choice))
+            if not ret:
+                return default
+            elif ret.lower()[0] == "y":
+                return True
+            elif ret.lower()[0] == "n":
+                return False
+    if isinstance(default, int):
+        while True:
+            try:
+                ret = raw_input("%s [%s]: " % (prompt, default))
+                if not ret:
+                    return default
+                ret = int(ret)
+            except ValueError:
+                pass
+            else:
+                return ret
+
+def user_input_email(prompt, default = None, allow_empty = False):
+    if default != None and allow_empty:
+        prompt += " (enter \"none\" for empty)"
+    while True:
+        ret = user_input(prompt, default, allow_empty)
+        if allow_empty and ret.lower() == "none":
+            return ""
+        if not ipavalidate.Email(ret, not allow_empty):
+            return ret.strip()
+
+def user_input_plain(prompt, default = None, allow_empty = True, allow_spaces = True):
+    while True:
+        ret = user_input(prompt, default, allow_empty)
+        if not ipavalidate.Plain(ret, not allow_empty, allow_spaces):
+            return ret
+
+def user_input_path(prompt, default = None, allow_empty = True):
+    if default != None and allow_empty:
+        prompt += " (enter \"none\" for empty)"
+    while True:
+        ret = user_input(prompt, default, allow_empty)
+        if allow_empty and ret.lower() == "none":
+            return ""
+        if not ipavalidate.Path(ret, not allow_empty):
+            return ret
+
 
 class AttributeValueCompleter:
     '''
diff --git a/ipa-radius-server/ipa-radius-install b/ipa-radius-server/ipa-radius-install
index 8ed3aab..83215b3 100644
--- a/ipa-radius-server/ipa-radius-install
+++ b/ipa-radius-server/ipa-radius-install
@@ -45,8 +45,7 @@ def main():
     if not ipautil.file_exists("/etc/ipa/ipa.conf"):
         print "This system does not appear to have IPA configured."
         print "Has ipa-server-install been run?"
-        yesno = raw_input("Continue with radius install [y/N]? ")
-        if yesno.lower() != "y":
+        if not ipautil.user_input("Continue with radius install?", False):
             sys.exit(1)
 
     installutils.standard_logging_setup("iparadius-install.log", False)
diff --git a/ipa-server/ipa-install/ipa-replica-install b/ipa-server/ipa-install/ipa-replica-install
index 31fd4cc..ab66a83 100644
--- a/ipa-server/ipa-install/ipa-replica-install
+++ b/ipa-server/ipa-install/ipa-replica-install
@@ -145,8 +145,7 @@ def check_dirsrv():
     if serverids:
         print ""
         print "An existing Directory Server has been detected."
-        yesno = raw_input("Do you wish to remove it and create a new one? [no]: ")
-        if not yesno or yesno.lower()[0] != "y":
+        if not ipautil.user_input("Do you wish to remove it and create a new one?", False):
             print ""
             print "Only a single Directory Server instance is allowed on an IPA"
             print "server, the one used by IPA itself."
@@ -189,12 +188,9 @@ def main():
     if host != config.host_name:
         try:
             print "This replica was created for '%s' but this machine is named '%s'" % (host, config.host_name)
-            yesno = raw_input("This may cause problems. Continue? [Y/n]: ")
-            print ""
-            if not yesno or yesno.lower()[0] == "y":
-                pass
-            else:
+            if not ipautil.user_input("This may cause problems. Continue?", True):
                 sys.exit(0)
+            print ""
         except KeyboardInterrupt:
             sys.exit(0)
     config.repl_password = ipautil.ipa_generate_password()
diff --git a/ipa-server/ipa-install/ipa-server-certinstall b/ipa-server/ipa-install/ipa-server-certinstall
index 835af0a..a0d1185 100644
--- a/ipa-server/ipa-install/ipa-server-certinstall
+++ b/ipa-server/ipa-install/ipa-server-certinstall
@@ -27,6 +27,7 @@ import traceback
 
 import krbV, ldap, getpass
 
+from ipa.ipautil import user_input
 from ipaserver import certs, dsinstance, httpinstance, ipaldap, installutils
 
 def get_realm_name():
@@ -76,25 +77,15 @@ def choose_server_cert(server_certs):
         print "%d. %s" % (num, cert[0])
         num += 1
         
-    cert_num = 0
     while 1:
-        cert_input = raw_input("Certificate number [1]: ")
+        num = user_input("Certificate number", 1)
         print ""
-        if cert_input == "":
-            break
+        if num < 1 or num > len(server_certs):
+            print "number out of range"
         else:
-            try:
-                num = int(cert_input)
-            except ValueError:
-                print "invalid number"
-                continue
-            if num > len(server_certs):
-                print "number out of range"
-                continue
-            cert_num = num - 1
             break
-    return server_certs[cert_num]
     
+    return server_certs[num - 1]
 
 def import_cert(dirname, pkcs12_fname):
     cdb = certs.CertDB(dirname)
diff --git a/ipa-server/ipa-install/ipa-server-install b/ipa-server/ipa-install/ipa-server-install
index 8b5b831..ce300cc 100644
--- a/ipa-server/ipa-install/ipa-server-install
+++ b/ipa-server/ipa-install/ipa-server-install
@@ -120,7 +120,6 @@ def signal_handler(signum, frame):
     sys.exit(1)
 
 def read_host_name(host_default):
-    host_ok = False
     host_name = ""
 
     print "Enter the fully qualified domain name of the computer"
@@ -131,19 +130,15 @@ def read_host_name(host_default):
     print ""
     if host_default == "":
         host_default = "master.example.com"
-    while not host_ok:
-        host_input = raw_input("Server host name [" + host_default + "]: ")
+    while True:
+        host_name = user_input("Server host name", host_default, allow_empty = False)
         print ""
-        if host_input == "":
-            host_name = host_default
-        else:
-            host_name = host_input
         try:
             verify_fqdn(host_name)
         except Exception, e:
             raise e
         else:
-            host_ok = True
+            break
     return host_name
 
 def resolve_host(host_name):
@@ -178,10 +173,8 @@ def verify_ip_address(ip):
 
 def read_ip_address(host_name):
     while True:
-        ip = raw_input("Please provide the IP address to be used for this host name: ")
+        ip = user_input("Please provide the IP address to be used for this host name", allow_empty = False)
 
-        if ip == "":
-            continue
         if ip == "127.0.0.1" or ip == "::1":
             print "The IPA Server can't use localhost as a valid IP"
             continue
@@ -213,13 +206,12 @@ def read_ds_user():
         print "A user account named 'dirsrv' already exists. This is the user id"
         print "that the Directory Server will run as."
         print ""
-        yesno = raw_input("Do you want to use the existing 'dirsrv' account? [yes]: ")
-        print ""
-        if not yesno or yesno.lower()[0] != "n":
+        if user_input("Do you want to use the existing 'dirsrv' account?", True):
             ds_user = "dirsrv"
         else:
-            ds_user = raw_input("Which account name do you want to use for the DS instance? ")
             print ""
+            ds_user = user_input_plain("Which account name do you want to use for the DS instance?", allow_empty = False, allow_spaces = False)
+        print ""
     except KeyError:
         ds_user = "dirsrv"
 
@@ -229,37 +221,31 @@ def read_domain_name(domain_name, unattended):
     print "The domain name has been calculated based on the host name."
     print ""
     if not unattended:
-        dn = raw_input("Please confirm the domain name ["+domain_name+"]: ")
+        domain_name = user_input("Please confirm the domain name", domain_name)
         print ""
-        if dn != "":
-            domain_name = dn
     return domain_name
 
 def read_realm_name(domain_name, unattended):
     print "The kerberos protocol requires a Realm name to be defined."
     print "This is typically the domain name converted to uppercase."
     print ""
-    upper_dom = domain_name.upper()
+    
     if unattended:
-        realm_name = upper_dom
-    else:
-        realm_name = raw_input("Please provide a realm name ["+upper_dom+"]: ")
-        print ""
-        if realm_name == "":
-            realm_name = upper_dom
-        else:
-            upper_dom = realm_name.upper()
-        if upper_dom != realm_name:
-            print "An upper-case realm name is required."
-            dom_realm = raw_input("Do you want to use "+upper_dom+" as realm name ? [yes]: ")
+        return domain_name.upper()
+    realm_name = user_input("Please provide a realm name", domain_name.upper())
+    upper_dom = realm_name.upper()
+    if upper_dom != realm_name:
+        print "An upper-case realm name is required."
+        if not user_input("Do you want to use " + upper_dom + " as realm name?", True):
             print ""
-            if dom_realm and dom_realm.lower()[0] != "y":
-                print "An upper-case realm name is required. Unable to continue."
-                sys.exit(1)
-            else:
-                realm_name = upper_dom
+            print "An upper-case realm name is required. Unable to continue."
+            sys.exit(1)
+        else:
+            realm_name = upper_dom
+        print ""
     return realm_name
 
+
 def read_dm_password():
     print "Certain directory server operations require an administrative user."
     print "This user is referred to as the Directory Manager and has full access"
@@ -284,10 +270,7 @@ def check_dirsrv(unattended):
     if serverids:
         print ""
         print "An existing Directory Server has been detected."
-        if unattended:
-            sys.exit(1)
-        yesno = raw_input("Do you wish to remove it and create a new one? [no]: ")
-        if not yesno or yesno.lower()[0] != "y":
+        if unattended or user_input("Do you wish to remove it and create a new one?", False):
             print ""
             print "Only a single Directory Server instance is allowed on an IPA"
             print "server, the one used by IPA itself."
@@ -354,8 +337,7 @@ def main():
     if options.uninstall:
         if not options.unattended:
             print "\nThis is a NON REVERSIBLE operation and will delete all data and configuration!\n"
-            yesno = raw_input("Are you sure you want to continue with the uninstall procedure?:[NO/yes] ")
-            if not yesno or yesno.lower() != "yes":
+            if not user_input("Are you sure you want to continue with the uninstall procedure?", False):
                 print ""
                 print "Aborting uninstall operation."
                 sys.exit(1)
-- 
1.5.5.1



Index: ipa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipa/F-9/ipa.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ipa.spec	23 Jul 2008 12:32:15 -0000	1.18
+++ ipa.spec	10 Sep 2008 19:07:44 -0000	1.19
@@ -23,6 +23,15 @@
 Patch6:         0001-Fix-typo-in-inet-type.patch
 Patch7:         0001-In-openvz-we-found-out-some-interfaces-may-return-a.patch
 
+Patch101:	freeipa-refresh-mkey.patch
+Patch102:	freeipa-fix-expire.patch
+Patch103:	freeipa-fix-key-encryption.patch
+Patch104:	freeipa-user-input.patch
+Patch105:	freeipa-encrypt-files.patch
+Patch106:	freeipa-change-mkey.patch
+Patch107:	freeipa-cve-2008-3274-fixes.patch
+Patch108:	freeipa-cve-2008-3274-utility.patch
+
 BuildRequires:  fedora-ds-base-devel >= 1.1
 BuildRequires:  mozldap-devel
 BuildRequires:  openssl-devel
@@ -194,6 +203,17 @@
 %patch6 -p1 -b af-inet-fix
 %patch7 -p1 -b kpasswd-segfault
 
+#START CVE-2008-3274 block
+%patch101 -p1 -b refresh-mkey
+%patch102 -p1 -b fix-expire
+%patch103 -p1 -b fix-key-encryption
+%patch104 -p1 -b user-input
+%patch105 -p1 -b encrypt-files
+%patch106 -p1 -b change-mkey
+%patch107 -p1 -b cve-2008-3274-fixes
+%patch108 -p1 -b cve-2008-3274-utility
+#END CVE-2008-3274 block
+
 %build
 cd ipa-server; ./autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir} --with-openldap=yes; cd ..
 cd ipa-client; ./autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir} --with-openldap=yes; cd ..
@@ -392,6 +412,8 @@
 %{_sbindir}/ipa-passwd
 %{_sbindir}/ipa-moduser
 %{_sbindir}/ipa-pwpolicy
+%{_sbindir}/ipa-change-master-key
+%{_sbindir}/ipa-fix-CVE-2008-3274
 %{_mandir}/man1/ipa-adddelegation.1.gz
 %{_mandir}/man1/ipa-addgroup.1.gz
 %{_mandir}/man1/ipa-addservice.1.gz
@@ -441,6 +463,9 @@
 %{_sbindir}/ipa-modradiusprofile
 
 %changelog
+* Wed Sep 10 2008 Simo Sorce <ssorce at redhat.com> - 1.1.0-7
+- Fix for CVE-2008-3274
+
 * Wed Jul 23 2008 Simo Sorce <ssorce at redhat.com> - 1.1.0-6
 - Fix build error
 



From simo at fedoraproject.org  Wed Sep 10 19:08:45 2008
From: simo at fedoraproject.org (Simo Sorce)
Date: Wed, 10 Sep 2008 19:08:45 +0000 (UTC)
Subject: rpms/ipa/F-9 ipa.spec,1.19,1.20
Message-ID: <20080910190845.196F77012C@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/ipa/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8635

Modified Files:
	ipa.spec 
Log Message:
release numberx


Index: ipa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipa/F-9/ipa.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ipa.spec	10 Sep 2008 19:07:44 -0000	1.19
+++ ipa.spec	10 Sep 2008 19:08:14 -0000	1.20
@@ -6,7 +6,7 @@
 
 Name:           ipa
 Version:        1.1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base



From mdomsch at fedoraproject.org  Wed Sep 10 19:14:53 2008
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Wed, 10 Sep 2008 19:14:53 +0000 (UTC)
Subject: rpms/aiksaurus/devel aiksaurus-1.2.1-gcc43.patch, NONE,
	1.1 aiksaurus.spec, 1.15, 1.16
Message-ID: <20080910191453.E50A97012C@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/aiksaurus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9011

Modified Files:
	aiksaurus.spec 
Added Files:
	aiksaurus-1.2.1-gcc43.patch 
Log Message:
fix FTBFS

aiksaurus-1.2.1-gcc43.patch:

--- NEW FILE aiksaurus-1.2.1-gcc43.patch ---
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal aiksaurus-1.2.1.orig/base/aiksaurus.t.cpp aiksaurus-1.2.1/base/aiksaurus.t.cpp
--- aiksaurus-1.2.1.orig/base/aiksaurus.t.cpp	2008-09-10 13:40:45.000000000 -0500
+++ aiksaurus-1.2.1/base/aiksaurus.t.cpp	2008-09-10 13:40:54.000000000 -0500
@@ -24,6 +24,7 @@
 #include "config.h"
 #include <iostream>
 #include <string>
+#include <cstdlib>
 using namespace std;
 using AiksaurusImpl::AsciiCompare;
 
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal aiksaurus-1.2.1.orig/gtk/src/Display.cpp aiksaurus-1.2.1/gtk/src/Display.cpp
--- aiksaurus-1.2.1.orig/gtk/src/Display.cpp	2003-05-27 18:56:54.000000000 -0500
+++ aiksaurus-1.2.1/gtk/src/Display.cpp	2008-09-10 14:01:56.000000000 -0500
@@ -18,6 +18,7 @@
  * 02111-1307, USA.
  */
 
+#include <string.h>
 #include "Display.h"
 #include "Meaning.h"
 #include "DialogMediator.h"
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal aiksaurus-1.2.1.orig/gtk/src/gtkAiksaur.t.cpp aiksaurus-1.2.1/gtk/src/gtkAiksaur.t.cpp
--- aiksaurus-1.2.1.orig/gtk/src/gtkAiksaur.t.cpp	2002-01-11 20:02:12.000000000 -0600
+++ aiksaurus-1.2.1/gtk/src/gtkAiksaur.t.cpp	2008-09-10 13:51:47.000000000 -0500
@@ -23,6 +23,7 @@
 #include <gtk/gtk.h>
 #include <iostream>
 #include <string>
+#include <cstdlib>
 using namespace std;
 
 int main(int argc, char** argv)


Index: aiksaurus.spec
===================================================================
RCS file: /cvs/extras/rpms/aiksaurus/devel/aiksaurus.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- aiksaurus.spec	13 Jun 2008 16:13:06 -0000	1.15
+++ aiksaurus.spec	10 Sep 2008 19:14:23 -0000	1.16
@@ -1,6 +1,6 @@
 Name: 		aiksaurus
 Version: 	1.2.1
-Release: 	17%{?dist}
+Release: 	18%{?dist}
 Summary: 	An English-language thesaurus library
 
 Epoch: 		1
@@ -10,6 +10,7 @@
 Source0: 	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:	%{name}.png
 Source2: 	%{name}.desktop
+Patch0:		%{name}-1.2.1-gcc43.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: 	gtk2-devel
@@ -63,7 +64,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %configure
@@ -139,6 +140,9 @@
 
 
 %changelog
+* Wed Sep 10 2008 Matt Domsch <mdomsch at fedoraproject.org> - 1:1.2.1-18
+- fix FTBFS #434484
+
 * Fri Jun 13 2008 Jon Stanley <jonstanley at gmail.com> - 1:1.2.1-17
 - Remove vendor tag, correct license, rebuild
 



From pfj at fedoraproject.org  Wed Sep 10 19:27:25 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 10 Sep 2008 19:27:25 +0000 (UTC)
Subject: rpms/mono/devel import.log, 1.3, 1.4 mono.spec, 1.77, 1.78 sources, 
	1.23, 1.24 mono-2.0-swfxim.patch, 1.1, NONE
Message-ID: <20080910192725.E57FB7012C@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9672/devel

Modified Files:
	import.log mono.spec sources 
Removed Files:
	mono-2.0-swfxim.patch 
Log Message:

Bump to mono-2.0 RC 1
Dropped XIM fix 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	29 Aug 2008 22:08:54 -0000	1.3
+++ import.log	10 Sep 2008 19:26:55 -0000	1.4
@@ -1,3 +1,4 @@
 mono-2_0-1_fc10:HEAD:mono-2.0-1.fc10.src.rpm:1218719116
 mono-2_0-4_fc10:HEAD:mono-2.0-4.fc10.src.rpm:1219746940
 mono-2_0-5_fc10:HEAD:mono-2.0-5.fc10.src.rpm:1220047677
+mono-2_0-6_fc10:HEAD:mono-2.0-6.fc10.src.rpm:1221073246


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- mono.spec	29 Aug 2008 22:08:54 -0000	1.77
+++ mono.spec	10 Sep 2008 19:26:55 -0000	1.78
@@ -1,6 +1,6 @@
 Name:		mono
 Version:        2.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -44,7 +44,6 @@
 Patch6:mono-2.0-uselibdir.patch
 Patch9:mono-2.0-monoservice.patch
 Patch10: mono-2.0-metadata-makefile.patch
-Patch11: mono-2.0-swfxim.patch
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -260,7 +259,6 @@
 %patch7 -p1 -b .pc-patches
 %patch9 -p1 -b .monoservice
 %patch10 -p1 -b .metadata
-%patch11 -p1 -b .swfxim
 autoreconf -f -i -s
 
 # Add undeclared Arg
@@ -279,7 +277,7 @@
 
 gcc -o monodir %{SOURCE1} -DMONODIR=\"%{_libdir}/mono\"
 
-%configure --with-ikvm=yes --with-jit=yes --with-xen_opt=yes --with-moonlight=no --disable-static
+%configure --with-ikvm=yes --with-jit=yes --with-xen_opt=yes --with-moonlight=no --disable-static --with-preview=yes 
 make
 
 
@@ -333,6 +331,7 @@
 %{_bindir}/monodir
 %{_bindir}/mono-api-*
 %{_bindir}/mono-test-install
+%{_bindir}/gacutil2
 %mono_bin certmgr
 %mono_bin chktrust
 %mono_bin gacutil
@@ -614,6 +613,12 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
+* Tue Sep 09 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-6
+- Bump to RC1
+- Removed XIM patch
+- Added additional configure options
+- Fixed spec file
+
 * Fri Aug 29 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-5
 - moved libMonoPosixHelper back to the main package
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	26 Aug 2008 10:37:03 -0000	1.23
+++ sources	10 Sep 2008 19:26:55 -0000	1.24
@@ -1 +1 @@
-edf459582307603df250e2a87efe12a5  mono-2.0.tar.bz2
+bdca04300dd35ca3916614d3bff40e3e  mono-2.0.tar.bz2


--- mono-2.0-swfxim.patch DELETED ---



From pfj at fedoraproject.org  Wed Sep 10 19:29:58 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 10 Sep 2008 19:29:58 +0000 (UTC)
Subject: rpms/libgdiplus/devel import.log, 1.1, 1.2 libgdiplus.spec, 1.30,
	1.31 sources, 1.18, 1.19
Message-ID: <20080910192958.84B5D7012C@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/libgdiplus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9959/devel

Modified Files:
	import.log libgdiplus.spec sources 
Log Message:

Bump to 2.0 RC 1 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Aug 2008 09:56:17 -0000	1.1
+++ import.log	10 Sep 2008 19:29:28 -0000	1.2
@@ -1 +1,2 @@
 libgdiplus-2_0-1_fc10:HEAD:libgdiplus-2.0-1.fc10.src.rpm:1219744526
+libgdiplus-2_0-2_fc10:HEAD:libgdiplus-2.0-2.fc10.src.rpm:1221074944


Index: libgdiplus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/devel/libgdiplus.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libgdiplus.spec	26 Aug 2008 09:56:17 -0000	1.30
+++ libgdiplus.spec	10 Sep 2008 19:29:28 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           libgdiplus
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        libgdiplus: An Open Source implementation of the GDI+ API
 
 Group:          System Environment/Libraries
@@ -59,6 +59,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Tue Sep 09 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-2
+- Bump to RC1
+
 * Sat Aug 02 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-1
 - Bump to preview 1
 - Alter licence


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	26 Aug 2008 09:56:17 -0000	1.18
+++ sources	10 Sep 2008 19:29:28 -0000	1.19
@@ -1 +1 @@
-22cff1e2bc77040a247d34786bf9148a  libgdiplus-2.0.tar.bz2
+37914c1b91dde23f8c30acca9db014f2  libgdiplus-2.0.tar.bz2



From pfj at fedoraproject.org  Wed Sep 10 19:31:26 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 10 Sep 2008 19:31:26 +0000 (UTC)
Subject: rpms/mod_mono/devel import.log,1.1,1.2 mod_mono.spec,1.10,1.11
Message-ID: <20080910193126.1AD517012C@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mod_mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10254/devel

Modified Files:
	import.log mod_mono.spec 
Log Message:

Bump to 2.0 RC 1 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Aug 2008 12:08:49 -0000	1.1
+++ import.log	10 Sep 2008 19:30:55 -0000	1.2
@@ -1 +1,2 @@
 mod_mono-2_0-1_fc10:HEAD:mod_mono-2.0-1.fc10.src.rpm:1219752496
+mod_mono-2_0-2_fc10:HEAD:mod_mono-2.0-2.fc10.src.rpm:1221075027


Index: mod_mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/mod_mono.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_mono.spec	26 Aug 2008 12:08:49 -0000	1.10
+++ mod_mono.spec	10 Sep 2008 19:30:55 -0000	1.11
@@ -1,6 +1,6 @@
 Name: mod_mono
 Version: 2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://go-mono.com/sources-latest/
@@ -48,6 +48,9 @@
 %{_mandir}/man8/mod_mono.8*
 
 %changelog
+* Tue Sep 09 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-2
+- bump to 2.0 RC 1
+
 * Sun Aug 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-1
 - bump to 2.0 preview 1
 - licence changed and other spec file alterations



From pfj at fedoraproject.org  Wed Sep 10 19:33:40 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 10 Sep 2008 19:33:40 +0000 (UTC)
Subject: rpms/mono-basic/devel import.log, 1.1, 1.2 mono-basic.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <20080910193340.18BD87012C@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-basic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10582/devel

Modified Files:
	import.log mono-basic.spec sources 
Log Message:

Bump to 2.0 RC 1 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Aug 2008 12:11:38 -0000	1.1
+++ import.log	10 Sep 2008 19:33:09 -0000	1.2
@@ -1 +1,2 @@
 mono-basic-2_0-1_fc10:HEAD:mono-basic-2.0-1.fc10.src.rpm:1219752663
+mono-basic-2_0-2_fc10:HEAD:mono-basic-2.0-2.fc10.src.rpm:1221075163


Index: mono-basic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/devel/mono-basic.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mono-basic.spec	26 Aug 2008 12:11:38 -0000	1.8
+++ mono-basic.spec	10 Sep 2008 19:33:09 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:		mono-basic
 Version:	2.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:        VisualBasic.NET support for mono
 Group:          Development/Languages
 License:        LGPLv2+
@@ -74,6 +74,9 @@
 %{_libdir}/pkgconfig/mono-basic.pc
 
 %changelog
+* Tue Sep 09 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-2
+- bump to 2.0 RC 1
+
 * Sun Aug 10 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-1
 - bump to 2.0 preview 1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Aug 2008 12:11:38 -0000	1.5
+++ sources	10 Sep 2008 19:33:09 -0000	1.6
@@ -1 +1 @@
-ed5cf7f45354cb6763960e92cca39f92  mono-basic-2.0.tar.bz2
+781dfff7be75b0ddd5d007c805dc6bc7  mono-basic-2.0.tar.bz2



From pfj at fedoraproject.org  Wed Sep 10 19:35:58 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 10 Sep 2008 19:35:58 +0000 (UTC)
Subject: rpms/monodevelop/devel monodevelop-1.9-headbuild.patch, NONE,
	1.1 import.log, 1.3, 1.4 monodevelop.spec, 1.37, 1.38
Message-ID: <20080910193558.188D77012C@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/monodevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10857/devel

Modified Files:
	import.log monodevelop.spec 
Added Files:
	monodevelop-1.9-headbuild.patch 
Log Message:

Added patch to build against Mono 2.0 RC 1 (fixes build options)
Rebuild against Mono 2.0 RC 1 


monodevelop-1.9-headbuild.patch:

--- NEW FILE monodevelop-1.9-headbuild.patch ---
--- monodevelop-1.9/src/addins/VersionControl/Diff/Diff.cs	2008-09-09 12:23:03.000000000 +0100
+++ monodevelop-1.9/src/addins/VersionControl/Diff/Diff-new.cs	2008-09-09 12:24:07.000000000 +0100
@@ -612,7 +612,7 @@
 
 		bool IList.IsReadOnly { get { return true; } }
 		
-		object IList.this[int index] { set { throw new InvalidOperationException(); } }
+		object IList.this[int index] { get { throw new InvalidOperationException(); } set { throw new InvalidOperationException(); } }
 
 		int IList.Add(object obj) { throw new InvalidOperationException(); }
 		
--- monodevelop-1.9/src/addins/CSharpBinding/Parser/mcs/mcs/class.cs	2008-06-30 18:34:33.000000000 +0100
+++ monodevelop-1.9/src/addins/CSharpBinding/Parser/mcs/mcs/class-new.cs	2008-09-09 12:21:27.000000000 +0100
@@ -5143,6 +5143,7 @@
 	// Encapsulates most of the Method's state
 	//
 	public class MethodData {
+		static FieldInfo methodbuilder_attrs_field;
 
 		readonly IMethodData method;
 
@@ -5392,10 +5393,25 @@
 				return;
 			}
 
-#if GMCS_SOURCE && !MS_COMPATIBLE
-			builder.SetGenericMethodSignature (
-				flags, method.CallingConventions,
-				method.ReturnType, ParameterTypes);
+#if GMCS_SOURCE
+			//
+			// Generic method has been already defined to resolve method parameters
+			// correctly when they use type parameters
+			//
+			builder.SetParameters (ParameterTypes);
+			builder.SetReturnType (method.ReturnType);
+
+			if (builder.Attributes != flags) {
+				try {
+					if (methodbuilder_attrs_field == null)
+						methodbuilder_attrs_field = typeof (MethodBuilder).GetField ("attrs", BindingFlags.NonPublic | BindingFlags.Instance);
+					methodbuilder_attrs_field.SetValue (builder, flags);
+				} catch {
+					Report.RuntimeMissingSupport (method.Location, "Generic method MethodAttributes");
+				}
+			}
+#else
+			throw new InternalErrorException ();
 #endif
 		}



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	9 Aug 2008 14:26:37 -0000	1.3
+++ import.log	10 Sep 2008 19:35:27 -0000	1.4
@@ -1,3 +1,4 @@
 monodevelop-1_9-1_fc10:HEAD:monodevelop-1.9-1.fc10.src.rpm:1215513265
 monodevelop-1_9-2_fc10:HEAD:monodevelop-1.9-2.fc10.src.rpm:1215687691
 monodevelop-1_9-3_fc10:HEAD:monodevelop-1.9-3.fc10.src.rpm:1218291689
+monodevelop-1_9-6_fc10:HEAD:monodevelop-1.9-6.fc10.src.rpm:1221075263


Index: monodevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- monodevelop.spec	26 Aug 2008 05:11:16 -0000	1.37
+++ monodevelop.spec	10 Sep 2008 19:35:27 -0000	1.38
@@ -11,7 +11,7 @@
 
 Name:           monodevelop
 Version:        1.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
@@ -21,12 +21,13 @@
 Patch0:         monodevelop-1.9-libdir.patch
 Patch1:		monodevelop-1.9-use-system-cecil.patch
 Patch2:		monodevelop-1.9-use-system-nunit.patch
+Patch3:		monodevelop-1.9-headbuild.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-addins-devel gtk-sharp2-devel monodoc-devel
 BuildRequires:  gnome-sharp-devel gnome-desktop-sharp-devel mono-nunit-devel
 # for the NUnit add-in
-BuildRequires:  mono-nunit22
+BuildRequires:  mono-nunit22 xulrunner-devel-unstable
 BuildRequires:  autoconf desktop-file-utils intltool
 # MonoDevelop is not xulrunner-ready yet
 #Requires:       gecko-sharp2
@@ -63,6 +64,7 @@
 %patch0 -p1 -b .libdir
 %patch1 -p1 -b .use-system-cecil
 %patch2 -p1 -b .use-system-nunit
+%patch3 -p1 -b .head
 autoconf
 
 # Here is where we replace the LONGCECILSTRING and LONGCECILMDBSTRING
@@ -145,6 +147,10 @@
 
 
 %changelog
+* Tue Sep 09 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-6
+- Added patch to build against 2.0 RC 1
+- rebuild against 2.0 RC 1
+
 * Mon Aug 25 2008 Michel Salim <salimma at fedoraproject.org> - 1.9-5
 - Use system-provided nunit
 



From pfj at fedoraproject.org  Wed Sep 10 19:40:45 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 10 Sep 2008 19:40:45 +0000 (UTC)
Subject: rpms/monodoc/devel import.log,1.1,1.2 monodoc.spec,1.27,1.28
Message-ID: <20080910194045.1C6547012C@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/monodoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11537/devel

Modified Files:
	import.log monodoc.spec 
Log Message:

Bump to 2.0 RC 1 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodoc/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Aug 2008 15:03:13 -0000	1.1
+++ import.log	10 Sep 2008 19:40:14 -0000	1.2
@@ -1 +1,2 @@
 monodoc-2_0-1_fc10:HEAD:monodoc-2.0-1.fc10.src.rpm:1219762945
+monodoc-2_0-3_fc10:HEAD:monodoc-2.0-3.fc10.src.rpm:1221075588


Index: monodoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodoc/devel/monodoc.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- monodoc.spec	26 Aug 2008 22:54:45 -0000	1.27
+++ monodoc.spec	10 Sep 2008 19:40:14 -0000	1.28
@@ -5,9 +5,8 @@
 Summary: The mono documentation system
 Name: monodoc
 Version: 2.0
-Release: 2%{?dist}
-# No version specified. Most source files missing license attribution.
-License: GPL+
+Release: 3%{?dist}
+License: GPLv3
 Group: Documentation
 Source0: http://go-mono.com/sources-stable/monodoc-%{version}.zip
 URL: http://go-mono.com/sources/monodoc/
@@ -17,7 +16,7 @@
 BuildRequires:  mono-data, mono-devel >= 2.0, gtk-sharp2-gapi, pkgconfig
 BuildRequires: gtk-sharp2-devel autoconf automake libtool
 Requires: mono-core links
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparcv9 alpha
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
 
 %description
 monodoc is the documentation package for the mono .NET environment
@@ -64,8 +63,11 @@
 %{monodir}/pkgconfig/monodoc.pc
 
 %changelog
-* Tue Aug 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0-2
-- fix license (again)
+* Tue Sep 09 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-3
+- bump to 2.0 RC 1
+
+* Tue Aug 26 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-2
+- fix license
 
 * Sun Aug 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-1
 - bump to 2.0 preview 1



From pfj at fedoraproject.org  Wed Sep 10 19:44:34 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 10 Sep 2008 19:44:34 +0000 (UTC)
Subject: rpms/mono-tools/devel import.log, 1.5, 1.6 mono-tools.spec, 1.9,
	1.10 monotools-2.0-makefiles.patch, 1.1, 1.2 sources, 1.3, 1.4
Message-ID: <20080910194434.EBA907012C@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12087/devel

Modified Files:
	import.log mono-tools.spec monotools-2.0-makefiles.patch 
	sources 
Log Message:

Updated to Mono 2.0 RC 1 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	29 Aug 2008 11:35:29 -0000	1.5
+++ import.log	10 Sep 2008 19:44:04 -0000	1.6
@@ -3,3 +3,4 @@
 mono-tools-1_9-4_1_fc10:HEAD:mono-tools-1.9-4.1.fc10.src.rpm:1216032887
 mono-tools-2_0-2_fc10:HEAD:mono-tools-2.0-2.fc10.src.rpm:1219772232
 mono-tools-2_0-4_fc10:HEAD:mono-tools-2.0-4.fc10.src.rpm:1220009683
+mono-tools-2_0-5_fc10:HEAD:mono-tools-2.0-5.fc10.src.rpm:1221075751


Index: mono-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/mono-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mono-tools.spec	29 Aug 2008 11:35:29 -0000	1.9
+++ mono-tools.spec	10 Sep 2008 19:44:04 -0000	1.10
@@ -3,7 +3,7 @@
 Summary: The mono documentation system
 Name: mono-tools
 Version: 2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: Development/Tools
 Patch0: monotools-2.0-gendarme.patch
@@ -88,6 +88,7 @@
 %{_bindir}/monodoc
 %{_bindir}/gui-compare
 %{_bindir}/gendarme*
+%{_bindir}/mprof*
 %{_libdir}/gendarme/*.dll
 %{_libdir}/gendarme/*.exe
 %{_libdir}/gendarme/*.xml
@@ -103,6 +104,9 @@
 %{_libdir}/monodoc/browser.exe
 %dir %{_libdir}/ilcontrast
 %{_libdir}/ilcontrast/ilcontrast.exe
+%dir %{_libdir}/mono-tools
+%{_libdir}/mono-tools/mprof*
+%{_mandir}/man1/mprof*
 %{_mandir}/man1/create-native-map.1.gz
 %{_datadir}/pixmaps/ilcontrast.png
 %{_datadir}/pixmaps/monodoc.png
@@ -115,6 +119,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Sep 09 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.0-5
+- bump to 2.0 RC 1
+- spec file chanages
+
 * Fri Aug 29 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.0-4
 - additional BRs included
 

monotools-2.0-makefiles.patch:

Index: monotools-2.0-makefiles.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/monotools-2.0-makefiles.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monotools-2.0-makefiles.patch	26 Aug 2008 17:38:06 -0000	1.1
+++ monotools-2.0-makefiles.patch	10 Sep 2008 19:44:04 -0000	1.2
@@ -62,21 +62,7 @@
  pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc)
  
  framework_sources_in = ../AssemblyInfo.cs.in
---- mono-tools-2.0/gendarme/rules/Makefile.am	2008-07-15 19:18:53.000000000 +0100
-+++ mono-tools-2.0/gendarme/rules/Makefile-new.am	2008-08-14 18:33:06.000000000 +0100
-@@ -11,10 +11,10 @@
- DISTCLEANFILES = Makefile.in
- 
- install-data-hook:
--	$(INSTALL) -c -m 0644 rules.xml $(DESTDIR)$(prefix)/lib/gendarme;
-+	$(INSTALL) -c -m 0644 rules.xml $(DESTDIR)$(libdir)/gendarme;
- 
- uninstall-hook:
--	rm -f $(DESTDIR)$(prefix)/lib/gendarme/`basename rules.xml`;
-+	rm -f $(DESTDIR)$(libdir)/gendarme/`basename rules.xml`;
- 
- test:
- 	for ASM in $(SUBDIRS); do \
+
 --- mono-tools-2.0/gendarme/rules/Gendarme.Rules.BadPractice/Makefile.am	2008-07-15 19:18:53.000000000 +0100
 +++ mono-tools-2.0/gendarme/rules/Gendarme.Rules.BadPractice/Makefile-new.am	2008-08-14 18:34:05.000000000 +0100
 @@ -5,7 +5,7 @@
@@ -231,14 +217,6 @@
  ui_rules_SCRIPTS = $(rules_dll)
  ui_rules_DATA = 
  
---- mono-tools-2.0/gendarme/swf-wizard-runner/Makefile.am	2008-07-16 22:21:58.000000000 +0100
-+++ mono-tools-2.0/gendarme/swf-wizard-runner/Makefile-new.am	2008-08-14 18:44:39.000000000 +0100
-@@ -1,4 +1,4 @@
--wizarddir=$(prefix)/lib/gendarme
-+wizarddir=$(libdir)/gendarme
- wizard_SCRIPTS = ../bin/gendarme-wizard.exe
- EXTRA_DIST = $(wizard_sources) $(wizard_sources_in) swf-wizard-runner.csproj Wizard.resx Properties/Resources.resx \
- 	Resources/gendarme.png gendarme.ico
 --- mono-tools-2.0/gnunit/src/Makefile.am	2008-08-10 14:23:19.000000000 +0100
 +++ mono-tools-2.0/gnunit/src/Makefile-new.am	2008-08-14 18:20:59.000000000 +0100
 @@ -11,8 +11,8 @@
@@ -260,3 +238,26 @@
  bin_SCRIPTS = gui-compare
  guicompare_DATA = gui-compare.exe Mono.Cecil.dll
  
+--- mono-tools-2.0/gendarme/rules/Makefile.am	2008-09-09 11:21:04.000000000 +0100
++++ mono-tools-2.0/gendarme/rules/Makefile-new.am	2008-09-09 11:23:35.000000000 +0100
+@@ -11,10 +11,10 @@
+ DISTCLEANFILES = Makefile.in
+ 
+ install-data-hook:
+-	$(INSTALL) -c -m 0644 $(addprefix $(srcdir)/, rules.xml) $(DESTDIR)$(prefix)/lib/gendarme;
++	$(INSTALL) -c -m 0644 $(addprefix $(srcdir)/, rules.xml) $(DESTDIR)$(libdir)/gendarme;
+ 
+ uninstall-hook:
+-	rm -f $(DESTDIR)$(prefix)/lib/gendarme/`basename rules.xml`;
++	rm -f $(DESTDIR)$(libdir)/gendarme/`basename rules.xml`;
+ 
+ test:
+ 	for ASM in $(SUBDIRS); do \
+--- mono-tools-2.0/gendarme/swf-wizard-runner/Makefile.am	2008-09-09 11:21:04.000000000 +0100
++++ mono-tools-2.0/gendarme/swf-wizard-runner/Makefile-new.am	2008-09-09 11:25:19.000000000 +0100
+@@ -1,4 +1,4 @@
+-wizarddir=$(prefix)/lib/gendarme
++wizarddir=$(libdir)/gendarme
+ wizard_SCRIPTS = ../bin/gendarme-wizard.exe
+ EXTRA_DIST = $(wizard_sources) $(wizard_sources_in) swf-wizard-runner.csproj Wizard.resx Properties/Resources.resx \
+ 	Resources/gendarme.png $(wizard_icon) swf-wizard-runner.mdp


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Aug 2008 17:38:06 -0000	1.3
+++ sources	10 Sep 2008 19:44:04 -0000	1.4
@@ -1 +1 @@
-5c0dda666ee3a3dc131e1c0c9b73075b  mono-tools-2.0.tar.bz2
+955025ab9b25bc58058facc39ab88aae  mono-tools-2.0.tar.bz2



From pfj at fedoraproject.org  Wed Sep 10 19:46:59 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 10 Sep 2008 19:46:59 +0000 (UTC)
Subject: rpms/xsp/devel import.log, 1.1, 1.2 sources, 1.13, 1.14 xsp.spec,
	1.23, 1.24
Message-ID: <20080910194659.2C6FD7012C@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/xsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12529/devel

Modified Files:
	import.log sources xsp.spec 
Log Message:

Bump to 2.0 RC 1 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Aug 2008 17:44:00 -0000	1.1
+++ import.log	10 Sep 2008 19:46:28 -0000	1.2
@@ -1 +1,2 @@
 xsp-2_0-1_fc10:HEAD:xsp-2.0-1.fc10.src.rpm:1219772599
+xsp-2_0-2_fc10:HEAD:xsp-2.0-2.fc10.src.rpm:1221075950


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	26 Aug 2008 17:44:00 -0000	1.13
+++ sources	10 Sep 2008 19:46:28 -0000	1.14
@@ -1 +1 @@
-f3b05b8c1a896e8166e862d0ac57dd4b  xsp-2.0.tar.bz2
+bee4b37c2a6b84bdb5405ab085d30739  xsp-2.0.tar.bz2


Index: xsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/xsp.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xsp.spec	26 Aug 2008 17:44:00 -0000	1.23
+++ xsp.spec	10 Sep 2008 19:46:28 -0000	1.24
@@ -1,6 +1,6 @@
 Name:     	xsp
 Version: 	2.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	MIT
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL:		http://www.mono-project.com/ASP.NET
@@ -89,6 +89,9 @@
 %{_libdir}/xsp/test
 
 %changelog
+* Tue Sep 09 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-2
+- bump to 2.0 RC 1
+
 * Sun Aug 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-1
 - bump to 2.0 preview 1
 - spec file fixes



From pfj at fedoraproject.org  Wed Sep 10 19:50:52 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 10 Sep 2008 19:50:52 +0000 (UTC)
Subject: rpms/monodevelop/F-9 import.log, NONE, 1.1 monodevelop-1.0.spec,
	NONE, 1.1 monodevelop-1.9-libdir.patch, NONE,
	1.1 monodevelop-0.19-use-system-Mono.Cecil.patch, 1.1,
	1.2 mdtool.patch, 1.1, NONE monodevelop-config.patch, 1.6,
	NONE monodevelop-libdir.patch, 1.4, NONE monodevelop.spec, 1.28, NONE
Message-ID: <20080910195052.9E78B7012C@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/monodevelop/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13256/F-9

Modified Files:
	monodevelop-0.19-use-system-Mono.Cecil.patch 
Added Files:
	import.log monodevelop-1.0.spec monodevelop-1.9-libdir.patch 
Removed Files:
	mdtool.patch monodevelop-config.patch monodevelop-libdir.patch 
	monodevelop.spec 
Log Message:

Update to MD 1.0 



--- NEW FILE import.log ---
monodevelop-1_0-6_fc10:F-9:monodevelop-1.0-6.fc10.src.rpm:1221076216


--- NEW FILE monodevelop-1.0.spec ---
%define debug_package %{nil}

%define cecilver %(gacutil -l Mono.Cecil |grep Mono.Cecil | cut -d "=" -f 2 | cut -d "," -f 1)
%define ceciltoken %(gacutil -l Mono.Cecil |grep Mono.Cecil | cut -d "=" -f 4)
%define cecilmdbver %(gacutil -l Mono.Cecil.Mdb |grep Mono.Cecil.Mdb | cut -d "=" -f 2 | cut -d "," -f 1)
%define cecilmdbtoken %(gacutil -l Mono.Cecil.Mdb |grep Mono.Cecil.Mdb | cut -d "=" -f 4)

#%(gacutil -l nunit.core | tail -n 2 | grep nunit.core | cut -d "=" -f 2 | cut -d "," -f 1)
%define nunitver 2.2.10.0

Summary:        A full-featured IDE for mono
Name:           monodevelop
Version:        1.0
Release:        6%{?dist}

Group:          Development/Tools
License:        GPLv2+
URL:            http://monodevelop.com/
Source0:        http://go-mono.com/sources/monodevelop/monodevelop-%{version}.tar.bz2
Patch0:         monodevelop-1.9-libdir.patch
Patch1:		monodevelop-0.19-use-system-Mono.Cecil.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mono-devel mono-addins-devel gtk-sharp2-devel monodoc-devel
BuildRequires:  gnome-sharp-devel gnome-desktop-sharp-devel mono-nunit-devel
# for the NUnit add-in
BuildRequires:  mono-nunit22 gtksourceview-sharp-devel
BuildRequires:  autoconf desktop-file-utils intltool
Requires:	mono-addins
Requires:       mono-basic
# Using system nunit, but dependency not automatically picked up by RPM
Requires:	mono(nunit.core) = 2.2.10.0
Requires:	mono(nunit.framework) = 2.2.10.0
Requires:       monodoc
Requires:       subversion
Requires:       hicolor-icon-theme shared-mime-info

# ppc* not supported: needs mono-nunit which needs nant
ExclusiveArch:  %ix86 x86_64 ia64 armv4l sparc alpha

%description
This package provides MonoDevelop, a full-featured IDE for Mono with
syntax colouring, code completion, debugging, project management and
support for C sharp, Visual Basic.NET, Java, Boo, Nemerle and MSIL.


%package        devel
Summary:	Development files for monodevelop
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	pkgconfig
 
%description devel
Development files for %{name}.


%prep
%setup -q
%patch0 -p1 -b .libdir
%patch1 -p1 -b .use-system-cecil
autoreconf

# Here is where we replace the LONGCECILSTRING and LONGCECILMDBSTRING
# placeholders with the actual values for the Mono.Cecil and Mono.Cecil.Mdb
# ver__token
cd src
for i in \
    addins/MonoDevelop.GtkCore/Makefile.{am,in} \
    addins/MonoDevelop.GtkCore/lib/Makefile.{am,in} \
    addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am \
    addins/MonoDevelop.DesignerSupport/Makefile.{am,in} \
    core/MonoDevelop.Projects/Makefile.{am,in} \
; do
  sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' "$i"
done

for i in core/MonoDevelop.Projects/Makefile.{am,in};
do
  sed -i 's|LONGCECILMDBSTRING|%{cecilmdbver}__%{cecilmdbtoken}|g' "$i"
done

sed -i addins/NUnit/MonoDevelopNUnit.addin.xml -e 's|LIBDIR|%{_libdir}|'


%build
%configure --disable-update-mimedb \
           --disable-update-desktopdb \
           --enable-gtksourceview2 --enable-tests

# Not parallel-buildable
#make %{?_smp_mflags}
make


%check
make check


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT \
     GACUTIL_FLAGS="/package monodevelop /root ${RPM_BUILD_ROOT}%{_libdir}"

desktop-file-install \
                     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
                     --delete-original \
  $RPM_BUILD_ROOT%{_datadir}/applications/monodevelop.desktop

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :

%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/m*
%{_libdir}/monodevelop
%{_mandir}/man1/m*
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/
%{_datadir}/mime/packages/monodevelop.xml

%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/monodevelop*.pc



%changelog
* Mon Sep 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-6
- added BR xulrunner-unstable-devel for libgtkmozembed

* Mon Aug 25 2008 Michel Salim <salimma at fedoraproject.org> - 1.9-5
- Use system-provided nunit

* Sat Aug 23 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 1.9-4
- Clean up build dependencies: database support now a separate package
- Clean up spec file and patches

* Fri Aug 08 2008 David Nielsen <gnomeuser at gmail.com> - 1.9-3
- rebase configure patch for fuzz
- file list fix up

* Thu Jul 10 2008 David Nielsen <gnomeuser at gmail.com> 1.9-2
- numerical compare for fedora version test, fixes compile on f10

* Mon Jul 07 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-1
- bump to latest beta for md2
- fixes to patch files for mono.cecil
- fix the archs to be mono package happy
- spec file fixes

* Tue May 06 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-6
- added br mono-tools
- removed prepackaged mime

* Thu May 01 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-5.1
- attempt a fix for a text editor to work
- rebuild

* Wed Apr 30 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-4
- mdtool fix

* Wed Apr 30 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-3
- remove BR ikvm-devel

* Fri Apr 25 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-2
- add in gtksourceview2 support

* Mon Apr 21 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-1
- bump to release

* Mon Apr 21 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.19-7
- remove ppc specific stuff
- enabled gnomeplatform and c and c++ projects
- add BR monobasic
- remove the debug package

* Sat Apr 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.19-6
- disable Requires on ikvm, since ikvm doesn't build from source at the moment

* Fri Apr 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.19-5
- ExcludeArch ppc (no mono-nunit22, due to no nant, means no ppc)

* Fri Apr 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.19-4
- buildrequires mono-core for gacutil

* Fri Apr 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.19-3
- use system Mono.Cecil
- use copies of built from source nunit22 rather than bundling (upstream should really uncouple this)

* Thu Feb 21 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.19-2
- added BR update-desktop-database

* Thu Feb 21 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.19-1
- bump to preview 1

* Fri Jan 04 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.18.1-1
- bump

* Wed Dec 19 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.18-1
- fix for BR boo where boo is not supported
- bump to MD0.18

* Tue Nov 13 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.17-4
- added R mono-data-sqlite

* Sun Nov 11 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.17-3
- excludearch ppc64

* Sun Nov 11 2007 David Nielsen <david at lovesunix.net> - 0.17-2
- Remove support for Fedora < 5
- rediff config patch

* Thu Nov  8 2007 David Nielsen <david at lovesunix.net> - 0.17-1
- Update to MonoDevelop Beta 2

* Wed Oct 17 2007 David Nielsen <david at lovesunix.net> - 0.16
- Update to MonoDevelop Beta 1

* Sat Aug 11 2007 David Nielsen	<david at lovesunix.net> - 0.15
- bump to 0.15

* Thu Mar 08 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.13.1-1
- bugfixes to the source

* Fri Feb 23 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.13-1
- bump to new version

* Wed Dec 20 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-9
- disables version control
- requires gnome-sharp
- enable nemerle added
- enabled aspnet and aspnetedit (rawhide only - requires jscall-sharp)
- added R firefox > 1.99

* Wed Nov 01 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-7
- Added R gtk-sharp2-gapi

* Fri Oct 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-6
- fixed url
- added R apr-devel

* Wed Sep 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-5
- pkgconfig fix 

* Mon Sep 25 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-4
- added R mono-nunit

* Mon Sep 18 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-3
- rebuild to make use of the new boo

* Thu Sep 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-2
- minor spec file fixes

* Wed Sep 06 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-1
- Bump to new version
- Include the patches for all users
- Fixed so it uses ?fedora (silly me!)
- Added BR mono-nunit-devel (FC6)

* Mon Sep 04 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-21
- Revert 64 bit clean for FC-5 and still follow FC guidelines

* Sun Sep 03 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-20
- Added gtk sharp fix
- Added conditional so it builds for FC5

* Sun Aug 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-17
- 64 bit goodness restored

* Fri Aug 04 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-16
- fixed ownership problem in spec file
- added comment about the libdir hack

* Wed Aug 02 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-15
- removed R which, added R mono-nunit
- changed R bytefx-data-mysq to msql
- altered update-mime-info and added update-desktop-database
- added R pkgconfig to devel
- added comment as to why smp_flags are not used on the build

* Sat Jul 29 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-14
- Added additional Rs
- minor specfile tweaks

* Sun Jul 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-12
- fixed which problem
- fixes the libdir issue for 64 bit

* Sun Jul 09 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-11
- minor spec files changes to satisfy rpmlint
- added BR ikvm-devel

* Sun Jul 09 2006 John Mahowald  <jpmahowald at gmail.com> - 0.11-10
- libdir fixes
- BR mono-data-sqlite

* Sun Jul 09 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-9
- removed noarch
- added a couple of patches from the new nant package
- fixes for new mono guidelines

* Wed Jun 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-8
- Removed libdir hack
- Added BR pkgconfig
- Added R monodoc
- Altered configure line to satisfy the parts required

* Mon Jun 05 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-7
- Added additional fix for 64 bit systems

* Sun Jun 04 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-6
- Minor mod to the BR
- Fixed the desktop-file-install problem

* Sat Jun 03 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-5
- Removed duplicate desktop file

* Sat Jun 03 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-4
- Removed R filesystem
- Simplified mime-applications
- Added scriptlets to handle mime info
- Corrected handling of desktop icon
- Removed INSTALL file

* Sat Jun 03 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-3
- Added BR shared-mime-info
- Added R filesystem
- Made all of the bindir and datadir ownerships explicit

* Wed May 31 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-2
- Added devel
- Added fix for 64 bit systems

* Sun May 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-1
- bump to new version
- added exclude archs for x86_64 and ia64 due to build problems

* Wed Apr 26 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.10-8
- removed smp_flags
- added boo and ikvm support

* Sun Apr 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.10-7
- removed static usrlib
- added export macros to fix the x86_64 problem
- disabled boo

* Wed Apr 19 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.10-6
- spec file version correctly bumped
- small spec file fixed
- enable-boo and enable-java added to the %%configure line

* Mon Apr 18 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.10-5
- libdir now usr-lib irrespective of hardware built on

* Mon Apr 17 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.10-4
- Altered install script somewhat
- Changed the path for the monodevelop libdir to be FE compliant
- Fixed source and URL

* Sat Apr 15 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.10-3
- Add in boo and mono-debugger
- fixed a couple of minor spec file bugs
- fixed MonoDevelop.Core not being found in the addins

* Wed Apr 5 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.10-2
- Additional buildreqs and two typo fixed - thanks to Angel Marin again

* Wed Apr 5 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.10-1
- Bump to new version
- mods to spec file for new version

* Wed Apr 5 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.9-3
- minor tweaks
- fixed a couple of typos - thanks to Angel Marin for spotting them

* Wed Jan 25 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.9-2
- added deps for ikvm and bytefx-data-mysql
- removed language support for the moment

* Mon Jan 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.9-1
- Initial import


monodevelop-1.9-libdir.patch:

--- NEW FILE monodevelop-1.9-libdir.patch ---
--- monodevelop-1.9/monodevelop.in.libdir	2008-06-30 13:36:01.000000000 -0400
+++ monodevelop-1.9/monodevelop.in	2008-08-01 20:45:55.000000000 -0400
@@ -53,7 +53,7 @@
 	fi
 fi
 
-MD_BIN_PATH=@prefix@/lib/monodevelop/bin
+MD_BIN_PATH=@libdir@/monodevelop/bin
 
 if [ -n $LD_LIBRARY_PATH ]; then
 	export LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
@@ -62,8 +62,7 @@
 fi
 
 ### SYNCH BLOCK: any changes to this block should be kept in sync with the one in Makefile.include and mdtool.in
-MD_PKG_CONFIG_PATH=@gtksharp_prefix@/lib/pkgconfig/:/usr/lib/pkgconfig/:/usr/local/lib/pkgconfig/:/usr/share/pkgconfig/:/usr/local/share/pkgconfig/
-if test -d /usr/lib64; then MD_PKG_CONFIG_PATH=$MD_PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/local/lib64/pkgconfig/; fi
+MD_PKG_CONFIG_PATH=@libdir@/pkgconfig/
 ### END BLOCK
 
 if [ -n $PKG_CONFIG_PATH ]; then
--- monodevelop-1.9/mdtool.in.libdir	2008-06-30 13:36:01.000000000 -0400
+++ monodevelop-1.9/mdtool.in	2008-08-01 20:48:32.000000000 -0400
@@ -16,11 +16,10 @@
     echo "$ret"
 }
  
-MD_BIN_PATH=@prefix@/lib/monodevelop/bin
+MD_BIN_PATH=@libdir@/monodevelop/bin
 
 ### SYNCH BLOCK: any changes to this block should be kept in sync with the one in Makefile.include and monodevelop.in
-MD_PKG_CONFIG_PATH=@gtksharp_prefix@/lib/pkgconfig/:/usr/lib/pkgconfig/:/usr/local/lib/pkgconfig/:/usr/share/pkgconfig/:/usr/local/share/pkgconfig/
-if test -d /usr/lib64; then MD_PKG_CONFIG_PATH=$MD_PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/local/lib64/pkgconfig/; fi
+MD_PKG_CONFIG_PATH=@libdir@/pkgconfig/
 ### END BLOCK
 
 if [ -n $PKG_CONFIG_PATH ]; then
--- monodevelop-1.9/configure.in.libdir	2008-06-30 13:36:01.000000000 -0400
+++ monodevelop-1.9/configure.in	2008-08-01 20:49:10.000000000 -0400
@@ -308,7 +308,7 @@
 AC_SUBST(CSC_FLAGS)
 
 
-MD_DIR='$(prefix)/lib/monodevelop'
+MD_DIR='$(libdir)/monodevelop'
 MD_ASSEMBLY_DIR="$MD_DIR/bin"
 MD_ADDIN_DIR="$MD_DIR/AddIns"
 
--- monodevelop-1.9/Makefile.in.libdir	2008-06-30 19:34:00.000000000 -0400
+++ monodevelop-1.9/Makefile.in	2008-08-01 21:00:51.000000000 -0400
@@ -214,7 +214,7 @@
 xdgmimedir = $(datadir)/mime/packages
 xdgmime_DATA = monodevelop.xml
 pkgconfig_in_files = monodevelop.pc.in monodevelop-core-addins.pc.in
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc)
 PACKAGES = \
 	build/bin/MonoDevelop.Core.Gui.addin.xml \
--- monodevelop-1.9/monodevelop.pc.in.libdir	2008-06-30 13:36:01.000000000 -0400
+++ monodevelop-1.9/monodevelop.pc.in	2008-08-01 20:46:35.000000000 -0400
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib/monodevelop
+libdir=@libdir@/monodevelop
                                                                                 
 Name: MonoDevelop
 Description: Free .NET Development Environment

monodevelop-0.19-use-system-Mono.Cecil.patch:

Index: monodevelop-0.19-use-system-Mono.Cecil.patch
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/F-9/monodevelop-0.19-use-system-Mono.Cecil.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monodevelop-0.19-use-system-Mono.Cecil.patch	11 Apr 2008 19:34:59 -0000	1.1
+++ monodevelop-0.19-use-system-Mono.Cecil.patch	10 Sep 2008 19:50:52 -0000	1.2
@@ -1,58 +1,7 @@
-diff -up monodevelop-0.19/configure.use-system-Mono.Cecil monodevelop-0.19/configure
---- monodevelop-0.19/configure.use-system-Mono.Cecil	2008-04-11 14:11:37.000000000 -0400
-+++ monodevelop-0.19/configure	2008-04-11 14:11:41.000000000 -0400
-@@ -4742,7 +4742,7 @@ echo "$as_me: error: You must enable one
-    { (exit 1); exit 1; }; }
- fi
- 
--ac_config_files="$ac_config_files build/data/Makefile build/data/resources/css/Makefile build/data/resources/Makefile build/Makefile contrib/Makefile contrib/Mono.Cecil/Makefile src/Makefile src/core/Makefile src/core/NRefactory/Makefile src/core/MonoDevelop.Core/AssemblyInfo.cs src/core/MonoDevelop.Core/Makefile src/core/MonoDevelop.Core.Gui/AssemblyInfo.cs src/core/MonoDevelop.Core.Gui/Makefile src/core/MonoDevelop.Projects/AssemblyInfo.cs src/core/MonoDevelop.Projects/MonoDevelop.Projects.dll.config src/core/MonoDevelop.Projects/Makefile src/core/MonoDevelop.Projects.Gui/AssemblyInfo.cs src/core/MonoDevelop.Projects.Gui/Makefile src/core/MonoDevelop.Documentation/AssemblyInfo.cs src/core/MonoDevelop.Documentation/Makefile src/core/MonoDevelop.Ide/AssemblyInfo.cs src/core/MonoDevelop.Ide/Makefile src/core/MonoDevelop.Dock/Makefile src/core/MonoDevelop.Components/AssemblyInfo.cs src/core/MonoDevelop.Components/Makefile src/core/MonoDevelop.Startup/AssemblyInfo.cs src/core/
 MonoDevelop.Startup/Makefile src/tools/Makefile src/tools/mdhost/Makefile src/tools/mdrun/Makefile src/tools/SharpCoco/Makefile src/addins/Makefile src/addins/MonoDeveloperExtensions/Makefile src/addins/MonoDeveloperExtensions/NUnit/Makefile src/addins/NUnit/Makefile src/addins/VersionControl/Diff/Makefile src/addins/VersionControl/DiffWidget/Makefile src/addins/VersionControl/MonoDevelop.VersionControl/Makefile src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile src/addins/VersionControl/Makefile src/addins/CSharpBinding/Makefile src/addins/CSharpBinding/Autotools/Makefile src/addins/ILAsmBinding/Makefile src/addins/VBNetBinding/Makefile src/addins/MonoDevelop.SourceEditor/AssemblyInfo.cs src/addins/MonoDevelop.SourceEditor/Makefile src/addins/prj2make-sharp-lib/AssemblyInfo.cs src/addins/prj2make-sharp-lib/Makefile src/addins/WelcomePage/Makefile src/addins/ChangeLogAddIn/Makefile src/addins/MonoDevelop.GtkCore/Makefile src/addins/MonoDevelop.GtkCore/l
 ib/Makefile src/addins/AspNetAddIn/Makefile src/addins/MonoDevelop.Autotools/Makefile src/addins/MonoDevelop.DesignerSupport/Makefile src/addins/MonoDevelop.WebReferences/Makefile src/addins/Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile src/addins/MonoDevelop.Gettext/Makefile src/addins/MonoDevelop.RegexToolkit/Makefile src/addins/CBinding/Makefile src/addins/SourceEditor2/AssemblyInfo.cs src/addins/SourceEditor2/Makefile src/addins/GnomePlatform/Makefile src/addins/MacPlatform/Makefile Makefile monodevelop mdtool monodevelop.pc monodevelop-core-addins.pc po/Makefile man/Makefile theme-icons/Makefile"
-+ac_config_files="$ac_config_files build/data/Makefile build/data/resources/css/Makefile build/data/resources/Makefile build/Makefile src/Makefile src/core/Makefile src/core/NRefactory/Makefile src/core/MonoDevelop.Core/AssemblyInfo.cs src/core/MonoDevelop.Core/Makefile src/core/MonoDevelop.Core.Gui/AssemblyInfo.cs src/core/MonoDevelop.Core.Gui/Makefile src/core/MonoDevelop.Projects/AssemblyInfo.cs src/core/MonoDevelop.Projects/MonoDevelop.Projects.dll.config src/core/MonoDevelop.Projects/Makefile src/core/MonoDevelop.Projects.Gui/AssemblyInfo.cs src/core/MonoDevelop.Projects.Gui/Makefile src/core/MonoDevelop.Documentation/AssemblyInfo.cs src/core/MonoDevelop.Documentation/Makefile src/core/MonoDevelop.Ide/AssemblyInfo.cs src/core/MonoDevelop.Ide/Makefile src/core/MonoDevelop.Dock/Makefile src/core/MonoDevelop.Components/AssemblyInfo.cs src/core/MonoDevelop.Components/Makefile src/core/MonoDevelop.Startup/AssemblyInfo.cs src/core/MonoDevelop.Startup/Makefile src/tools/Makefi
 le src/tools/mdhost/Makefile src/tools/mdrun/Makefile src/tools/SharpCoco/Makefile src/addins/Makefile src/addins/MonoDeveloperExtensions/Makefile src/addins/MonoDeveloperExtensions/NUnit/Makefile src/addins/NUnit/Makefile src/addins/VersionControl/Diff/Makefile src/addins/VersionControl/DiffWidget/Makefile src/addins/VersionControl/MonoDevelop.VersionControl/Makefile src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile src/addins/VersionControl/Makefile src/addins/CSharpBinding/Makefile src/addins/CSharpBinding/Autotools/Makefile src/addins/ILAsmBinding/Makefile src/addins/VBNetBinding/Makefile src/addins/MonoDevelop.SourceEditor/AssemblyInfo.cs src/addins/MonoDevelop.SourceEditor/Makefile src/addins/prj2make-sharp-lib/AssemblyInfo.cs src/addins/prj2make-sharp-lib/Makefile src/addins/WelcomePage/Makefile src/addins/ChangeLogAddIn/Makefile src/addins/MonoDevelop.GtkCore/Makefile src/addins/MonoDevelop.GtkCore/lib/Makefile src/addins/AspNetAddIn/Makefile s
 rc/addins/MonoDevelop.Autotools/Makefile src/addins/MonoDevelop.DesignerSupport/Makefile src/addins/MonoDevelop.WebReferences/Makefile src/addins/Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile src/addins/MonoDevelop.Gettext/Makefile src/addins/MonoDevelop.RegexToolkit/Makefile src/addins/CBinding/Makefile src/addins/SourceEditor2/AssemblyInfo.cs src/addins/SourceEditor2/Makefile src/addins/GnomePlatform/Makefile src/addins/MacPlatform/Makefile Makefile monodevelop mdtool monodevelop.pc monodevelop-core-addins.pc po/Makefile man/Makefile theme-icons/Makefile"
- 
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -5415,8 +5415,6 @@ do
-     "build/data/resources/css/Makefile") CONFIG_FILES="$CONFIG_FILES build/data/resources/css/Makefile" ;;
-     "build/data/resources/Makefile") CONFIG_FILES="$CONFIG_FILES build/data/resources/Makefile" ;;
-     "build/Makefile") CONFIG_FILES="$CONFIG_FILES build/Makefile" ;;
--    "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
--    "contrib/Mono.Cecil/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Mono.Cecil/Makefile" ;;
-     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-     "src/core/Makefile") CONFIG_FILES="$CONFIG_FILES src/core/Makefile" ;;
-     "src/core/NRefactory/Makefile") CONFIG_FILES="$CONFIG_FILES src/core/NRefactory/Makefile" ;;
-diff -up monodevelop-0.19/Makefile.am.use-system-Mono.Cecil monodevelop-0.19/Makefile.am
---- monodevelop-0.19/Makefile.am.use-system-Mono.Cecil	2008-04-11 14:11:33.000000000 -0400
-+++ monodevelop-0.19/Makefile.am	2008-04-11 14:11:41.000000000 -0400
-@@ -1,4 +1,4 @@
--SUBDIRS = contrib src build po man theme-icons
-+SUBDIRS = src build po man theme-icons
- 
- bin_SCRIPTS = monodevelop mdtool
- 
-diff -up monodevelop-0.19/Makefile.in.use-system-Mono.Cecil monodevelop-0.19/Makefile.in
---- monodevelop-0.19/Makefile.in.use-system-Mono.Cecil	2008-04-11 14:11:41.000000000 -0400
-+++ monodevelop-0.19/Makefile.in	2008-04-11 14:11:41.000000000 -0400
-@@ -206,7 +206,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = contrib src build po man theme-icons
-+SUBDIRS = src build po man theme-icons
- bin_SCRIPTS = monodevelop mdtool
- desktopdir = $(datadir)/applications
- desktop_DATA = monodevelop.desktop
-diff -up monodevelop-0.19/monodevelop.pc.in.use-system-Mono.Cecil monodevelop-0.19/monodevelop.pc.in
---- monodevelop-0.19/monodevelop.pc.in.use-system-Mono.Cecil	2008-04-11 14:11:33.000000000 -0400
-+++ monodevelop-0.19/monodevelop.pc.in	2008-04-11 14:11:41.000000000 -0400
-@@ -5,4 +5,4 @@ libdir=@libdir@/monodevelop
- Name: MonoDevelop
- Description: Free .NET Development Environment
- Version: @VERSION@
--Libs: -r:${libdir}/bin/MonoDevelop.Core.dll -r:${libdir}/bin/MonoDevelop.Core.Gui.dll -r:${libdir}/bin/MonoDevelop.Projects.dll -r:${libdir}/bin/MonoDevelop.Projects.Gui.dll -r:${libdir}/bin/MonoDevelop.Ide.dll -r:${libdir}/bin/MonoDevelop.Components.dll -r:${libdir}/bin/NRefactory.dll -r:${libdir}/bin/Mono.Cecil.dll
-+Libs: -r:${libdir}/bin/MonoDevelop.Core.dll -r:${libdir}/bin/MonoDevelop.Core.Gui.dll -r:${libdir}/bin/MonoDevelop.Projects.dll -r:${libdir}/bin/MonoDevelop.Projects.Gui.dll -r:${libdir}/bin/MonoDevelop.Ide.dll -r:${libdir}/bin/MonoDevelop.Components.dll -r:${libdir}/bin/NRefactory.dll
-diff -up monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.am.use-system-Mono.Cecil monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.am
---- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.am.use-system-Mono.Cecil	2008-04-11 14:14:35.000000000 -0400
-+++ monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.am	2008-04-11 14:14:49.000000000 -0400
-@@ -58,7 +58,7 @@ libsteticui_REFERENCES  =  \
+diff -uraN monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/lib/Makefile.am monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/Makefile.am
+--- monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/lib/Makefile.am	2008-06-30 19:33:45.000000000 +0200
++++ monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/Makefile.am	2008-08-08 03:51:37.819238210 +0200
+@@ -58,7 +58,7 @@
  	-pkg:gnome-sharp-2.0 \
  	-pkg:gtk-sharp-2.0 \
  	-r:$(libstetic) \
@@ -61,10 +10,10 @@
  	-r:Mono.Posix \
  	-r:System.Runtime.Remoting \
  	-r:System.Xml
-diff -up monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.in.use-system-Mono.Cecil monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.in
---- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.in.use-system-Mono.Cecil	2008-04-11 14:14:04.000000000 -0400
-+++ monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.in	2008-04-11 14:14:20.000000000 -0400
-@@ -209,7 +209,7 @@ libsteticui_REFERENCES = \
+diff -uraN monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/lib/Makefile.in monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/Makefile.in
+--- monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/lib/Makefile.in	2008-07-01 01:33:58.000000000 +0200
++++ monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/Makefile.in	2008-08-08 03:51:37.823239248 +0200
+@@ -210,7 +210,7 @@
  	-pkg:gnome-sharp-2.0 \
  	-pkg:gtk-sharp-2.0 \
  	-r:$(libstetic) \
@@ -73,10 +22,10 @@
  	-r:Mono.Posix \
  	-r:System.Runtime.Remoting \
  	-r:System.Xml
-diff -up monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am.use-system-Mono.Cecil monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am
---- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am.use-system-Mono.Cecil	2008-04-11 14:12:49.000000000 -0400
-+++ monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am	2008-04-11 14:13:42.000000000 -0400
-@@ -5,7 +5,6 @@ ASSEMBLY = $(ASSEMBLY_DIR)/libsteticui.d
+diff -uraN monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am
+--- monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am	2008-06-30 19:33:38.000000000 +0200
++++ monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am	2008-08-08 03:51:37.826239119 +0200
+@@ -5,7 +5,6 @@
  ASSEMBLY_FILES = \
  	$(ASSEMBLY) \
  	$(ASSEMBLY_DIR)/libsteticui.dll.mdb \
@@ -84,7 +33,7 @@
  	$(DATA_FILE_BUILD)
  	
  pkglib_DATA = $(ASSEMBLY_FILES)
-@@ -86,7 +85,7 @@ libsteticui_dll_references =  \
+@@ -86,7 +85,7 @@
  	-pkg:gnome-sharp-2.0 \
  	-pkg:gtk-sharp-2.0 \
  	-r:$(top_builddir)/bin/libstetic.dll \
@@ -93,7 +42,7 @@
  	-r:Mono.Posix \
  	-r:System.Runtime.Remoting \
  	-r:System.Xml
-@@ -94,7 +93,7 @@ libsteticui_dll_references =  \
+@@ -94,7 +93,7 @@
  libsteticui_dll_datafiles = libsteticui.dll.config
  
  
@@ -102,7 +51,7 @@
  	
  RESOURCE_FILES = $(addprefix $(srcdir)/, $(libsteticui_dll_resources))
  DATA_FILES = $(addprefix $(srcdir)/, $(libsteticui_dll_datafiles))
-@@ -111,17 +110,9 @@ $(DATA_FILE_BUILD): $(srcdir)/$(notdir $
+@@ -111,17 +110,9 @@
  	mkdir -p $(ASSEMBLY_DIR)
  	cp $(srcdir)/$(subst $(ASSEMBLY_DIR),$(srcdir),$@) $(ASSEMBLY_DIR)/.
  
@@ -121,10 +70,10 @@
 -	$(DATA_FILES) \
 -	$(srcdir)/lib/$(CECIL)
 +	$(DATA_FILES)
-diff -up monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.am.use-system-Mono.Cecil monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.am
---- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.am.use-system-Mono.Cecil	2008-04-11 14:15:11.000000000 -0400
-+++ monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.am	2008-04-11 14:15:32.000000000 -0400
-@@ -16,7 +16,7 @@ REFS =  \
+diff -uraN monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/Makefile.am monodevelop-1.9/src/addins/MonoDevelop.GtkCore/Makefile.am
+--- monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/Makefile.am	2008-06-30 19:33:45.000000000 +0200
++++ monodevelop-1.9/src/addins/MonoDevelop.GtkCore/Makefile.am	2008-08-08 03:51:37.829240107 +0200
+@@ -16,7 +16,7 @@
  	-r:$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
  	-r:$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libstetic.dll \
  	-r:$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libsteticui.dll \
@@ -133,10 +82,10 @@
  	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
  	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
  	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
-diff -up monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.in.use-system-Mono.Cecil monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.in
---- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.in.use-system-Mono.Cecil	2008-04-11 14:11:39.000000000 -0400
-+++ monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.in	2008-04-11 14:11:41.000000000 -0400
-@@ -198,7 +198,7 @@ REFS = \
+diff -uraN monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/Makefile.in monodevelop-1.9/src/addins/MonoDevelop.GtkCore/Makefile.in
+--- monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/Makefile.in	2008-07-01 01:33:58.000000000 +0200
++++ monodevelop-1.9/src/addins/MonoDevelop.GtkCore/Makefile.in	2008-08-08 03:51:37.836240737 +0200
+@@ -199,7 +199,7 @@
  	-r:$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
  	-r:$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libstetic.dll \
  	-r:$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libsteticui.dll \
@@ -145,10 +94,10 @@
  	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
  	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
  	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
-diff -up monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.am.use-system-Mono.Cecil monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.am
---- monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.am.use-system-Mono.Cecil	2008-04-11 14:16:34.000000000 -0400
-+++ monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.am	2008-04-11 14:16:55.000000000 -0400
-@@ -6,8 +6,8 @@ CONFIG = MonoDevelop.Projects.dll.config
+diff -uraN monodevelop-1.9.orig/src/core/MonoDevelop.Projects/Makefile.am monodevelop-1.9/src/core/MonoDevelop.Projects/Makefile.am
+--- monodevelop-1.9.orig/src/core/MonoDevelop.Projects/Makefile.am	2008-06-30 19:34:45.000000000 +0200
++++ monodevelop-1.9/src/core/MonoDevelop.Projects/Makefile.am	2008-08-08 03:51:37.840238703 +0200
+@@ -6,8 +6,8 @@
  REFS =  \
  	$(MONO_ADDINS_LIBS) \
  	$(MONODOC_LIBS) \
@@ -159,10 +108,10 @@
  	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
  	-r:Mono.Posix \
  	-r:System \
-diff -up monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.in.use-system-Mono.Cecil monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.in
---- monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.in.use-system-Mono.Cecil	2008-04-11 14:16:02.000000000 -0400
-+++ monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.in	2008-04-11 14:16:27.000000000 -0400
-@@ -180,8 +180,8 @@ CONFIG = MonoDevelop.Projects.dll.config
+diff -uraN monodevelop-1.9.orig/src/core/MonoDevelop.Projects/Makefile.in monodevelop-1.9/src/core/MonoDevelop.Projects/Makefile.in
+--- monodevelop-1.9.orig/src/core/MonoDevelop.Projects/Makefile.in	2008-07-01 01:33:59.000000000 +0200
++++ monodevelop-1.9/src/core/MonoDevelop.Projects/Makefile.in	2008-08-08 03:51:37.845238115 +0200
+@@ -181,8 +181,8 @@
  REFS = \
  	$(MONO_ADDINS_LIBS) \
  	$(MONODOC_LIBS) \


--- mdtool.patch DELETED ---


--- monodevelop-config.patch DELETED ---


--- monodevelop-libdir.patch DELETED ---


--- monodevelop.spec DELETED ---



From mbarnes at fedoraproject.org  Wed Sep 10 19:52:24 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed, 10 Sep 2008 19:52:24 +0000 (UTC)
Subject: rpms/evolution-sharp/devel .cvsignore, 1.22,
	1.23 evolution-sharp.spec, 1.55, 1.56 sources, 1.22, 1.23
Message-ID: <20080910195224.381847012C@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13428

Modified Files:
	.cvsignore evolution-sharp.spec sources 
Log Message:

* Wed Sep 10 2008 Matthew Barnes <mbarnes at redhat.com> - 0.17.5-1.fc10
- Update to 0.17.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	16 Jun 2008 17:41:57 -0000	1.22
+++ .cvsignore	10 Sep 2008 19:51:53 -0000	1.23
@@ -1 +1 @@
-evolution-sharp-0.17.4.tar.bz2
+evolution-sharp-0.17.5.tar.bz2


Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- evolution-sharp.spec	18 Jul 2008 13:34:43 -0000	1.55
+++ evolution-sharp.spec	10 Sep 2008 19:51:53 -0000	1.56
@@ -1,8 +1,8 @@
 ### Abstract ###
 
 Name: evolution-sharp
-Version: 0.17.4
-Release: 3%{?dist}
+Version: 0.17.5
+Release: 1%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 Summary: Evolution Data Server Mono Bindings
@@ -86,6 +86,9 @@
 # sonames may need to be updated in evolution-sharp's configure.in.
 
 %changelog
+* Wed Sep 10 2008 Matthew Barnes <mbarnes at redhat.com> - 0.17.5-1.fc10
+- Update to 0.17.5
+
 * Fri Jul 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.17.4-3
 - fix license tag
 - fix patches to apply with fuzz=0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	16 Jun 2008 17:41:57 -0000	1.22
+++ sources	10 Sep 2008 19:51:53 -0000	1.23
@@ -1 +1 @@
-b94f4016457f25b49af8ba1267c1d97d  evolution-sharp-0.17.4.tar.bz2
+e54646198b2affc77e0c62fa96938859  evolution-sharp-0.17.5.tar.bz2



From mdomsch at fedoraproject.org  Wed Sep 10 19:53:19 2008
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Wed, 10 Sep 2008 19:53:19 +0000 (UTC)
Subject: rpms/lineakd/devel lineakd-0.9-gcc43-2.patch, NONE, 1.1 lineakd.spec,
	1.9, 1.10
Message-ID: <20080910195319.8AABB7012C@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/lineakd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13676

Modified Files:
	lineakd.spec 
Added Files:
	lineakd-0.9-gcc43-2.patch 
Log Message:
fix FTBFS bug

lineakd-0.9-gcc43-2.patch:

--- NEW FILE lineakd-0.9-gcc43-2.patch ---
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal lineakd-0.9.orig/lineak/cdromctrl.cpp lineakd-0.9/lineak/cdromctrl.cpp
--- lineakd-0.9.orig/lineak/cdromctrl.cpp	2008-09-10 14:41:12.000000000 -0500
+++ lineakd-0.9/lineak/cdromctrl.cpp	2008-09-10 14:38:44.000000000 -0500
@@ -55,6 +55,7 @@ extern "C" {
 
 }
 #include <iostream>
+#include <cstring>
 
 extern bool verbose;
 //using namespace lineak_core_functions;
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal lineakd-0.9.orig/lineak/pluginmanager.cpp lineakd-0.9/lineak/pluginmanager.cpp
--- lineakd-0.9.orig/lineak/pluginmanager.cpp	2008-09-10 14:41:51.000000000 -0500
+++ lineakd-0.9/lineak/pluginmanager.cpp	2008-09-10 14:38:12.000000000 -0500
@@ -23,6 +23,8 @@
 #include <map>
 #include <iostream>
 #include <algorithm>
+#include <cstring>
+#include <cstdlib>
 
 #include <lineak/displayctrl.h>
 #include <lineak/lkbd.h>
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal lineakd-0.9.orig/lineak/xmgr.cpp lineakd-0.9/lineak/xmgr.cpp
--- lineakd-0.9.orig/lineak/xmgr.cpp	2008-09-10 14:41:38.000000000 -0500
+++ lineakd-0.9/lineak/xmgr.cpp	2008-09-10 14:36:49.000000000 -0500
@@ -15,6 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <cstring>
+#include <cstdlib>
 #include <lineak/xmgr.h>
 #include <lineak/lkbd.h>
 #include <lineak/lkey.h>


Index: lineakd.spec
===================================================================
RCS file: /cvs/extras/rpms/lineakd/devel/lineakd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lineakd.spec	6 Jun 2008 18:01:45 -0000	1.9
+++ lineakd.spec	10 Sep 2008 19:52:49 -0000	1.10
@@ -4,7 +4,7 @@
 
 Name:           lineakd
 Version:        0.9
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Linux support for Easy Access and Multimedia keyboards
 
 Group:          User Interface/Desktops
@@ -16,6 +16,7 @@
 Source:         http://dl.sourceforge.net/lineak/%{name}-%{version}.tar.gz
 Patch0:         install_dirs.patch
 Patch1:         lineakd-0.9-gcc43.patch
+Patch2:         lineakd-0.9-gcc43-2.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -54,6 +55,7 @@
 %setup -q
 %patch0
 %patch1 -p1
+%patch2 -p1
 
 ################################################################################
 
@@ -108,6 +110,9 @@
 ################################################################################
 
 %changelog
+* Wed Sep 10 2008 Matt Domsch <mdomsch at fedoraproject.org> - 0.9-8
+- fix FTBFS #434523
+
 * Fri Jun  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9-7
 - fix license tag
 - fix compile with gcc 4.3



From wwoods at fedoraproject.org  Wed Sep 10 20:24:40 2008
From: wwoods at fedoraproject.org (Will Woods)
Date: Wed, 10 Sep 2008 20:24:40 +0000 (UTC)
Subject: comps Makefile,1.9,1.10
Message-ID: <20080910202441.4E89E7012C@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16527

Modified Files:
	Makefile 
Log Message:
Add validate target. ex:make validate FILES=comps-f10.xml.in


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/comps/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile	13 Jun 2008 02:08:28 -0000	1.9
+++ Makefile	10 Sep 2008 20:24:08 -0000	1.10
@@ -9,6 +9,9 @@
 clean:
 	@rm -fv *~ *.xml
 
+validate: $(FILES) comps.rng
+	for f in $(FILES); do xmllint --noout --relaxng comps.rng $$f; done
+
 %.xml: %.xml.in
 	@python -c 'import libxml2; libxml2.parseFile("$<")'
 	@if test ".$(CLEANUP)" == .yes; then xsltproc --novalid -o $< comps-cleanup.xsl $<; fi



From wwoods at fedoraproject.org  Wed Sep 10 20:31:49 2008
From: wwoods at fedoraproject.org (Will Woods)
Date: Wed, 10 Sep 2008 20:31:49 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.92,1.93
Message-ID: <20080910203149.EC77A7012C@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17270

Modified Files:
	comps-f10.xml.in 
Log Message:
NetworkManager is no longer multilib - add i386/ppc64 to blacklist


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- comps-f10.xml.in	10 Sep 2008 09:53:50 -0000	1.92
+++ comps-f10.xml.in	10 Sep 2008 20:31:19 -0000	1.93
@@ -4951,6 +4951,7 @@
     <package name="geomview" arch="i386" />
     <package name="gnome-panel" arch="i386" />
     <package name="nas" arch="i386" />
+    <package name="NetworkManager" arch="i386" />
     <package name="perl" arch="i386" />
     <package name="e2fsprogs" arch="ppc64" />
     <package name="hal" arch="ppc64" />
@@ -4974,6 +4975,7 @@
     <package name="geomview" arch="ppc64" />
     <package name="gnome-panel" arch="ppc64" />
     <package name="nas" arch="ppc64" />
+    <package name="NetworkManager" arch="ppc64" />
   </blacklist>
   <whiteout>
     <ignoredep package="pango-gtkbeta-devel" requires="pango-gtkbeta" />



From spot at fedoraproject.org  Wed Sep 10 20:56:27 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 10 Sep 2008 20:56:27 +0000 (UTC)
Subject: rpms/fedora-logos/devel .cvsignore, 1.77, 1.78 fedora-logos.spec,
	1.110, 1.111 sources, 1.87, 1.88
Message-ID: <20080910205627.C7A947012C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19886

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
9.99.3, fix bz 445986


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- .cvsignore	25 Aug 2008 18:20:04 -0000	1.77
+++ .cvsignore	10 Sep 2008 20:55:57 -0000	1.78
@@ -1 +1 @@
-fedora-logos-9.99.2.tar.bz2
+fedora-logos-9.99.3.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- fedora-logos.spec	25 Aug 2008 18:20:04 -0000	1.110
+++ fedora-logos.spec	10 Sep 2008 20:55:57 -0000	1.111
@@ -1,9 +1,10 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 9.99.2
+Version: 9.99.3
 Release: 1%{?dist}
 Group: System Environment/Base
-Source0: fedora-logos-%{version}.tar.bz2
+URL: http://git.fedorahosted.org/git/fedora-logos.git/
+Source0: https://fedorahosted.org/releases/f/e/fedora-logos/fedora-logos-%{version}.tar.bz2
 
 # The trademarks contained in this file are the property of Red Hat, Inc.  No
 # license to these trademarks is provided or is necessary if you merely
@@ -113,6 +114,7 @@
 done
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
+install -p -m 644 icons/hicolor/scalable/apps/xfce4_xicon1.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
 
 (cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install)
 
@@ -170,6 +172,10 @@
 # end i386 bits
 
 %changelog
+* Wed Sep 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 9.99.3-1
+- move to its new home
+- package up xfce4_xicon1.svg (bz 445986)
+
 * Mon Aug 25 2008 Ray Strode <rstrode at redhat.com> - 9.99.2-1
 - Move kde background upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/sources,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- sources	25 Aug 2008 18:20:04 -0000	1.87
+++ sources	10 Sep 2008 20:55:57 -0000	1.88
@@ -1 +1 @@
-2162cdda2f106d452dbeee10e8332be2  fedora-logos-9.99.2.tar.bz2
+38bc3510b2658748dc17d698e92c34aa  fedora-logos-9.99.3.tar.bz2



From rcritten at fedoraproject.org  Wed Sep 10 21:05:17 2008
From: rcritten at fedoraproject.org (Robert Crittenden)
Date: Wed, 10 Sep 2008 21:05:17 +0000 (UTC)
Subject: rpms/ipa/F-8 0001-Fix-typo-in-inet-type.patch, NONE,
	1.1 0001-In-openvz-we-found-out-some-interfaces-may-return-a.patch,
	NONE, 1.1 freeipa-change-mkey.patch, NONE,
	1.1 freeipa-cve-2008-3274-fixes.patch, NONE,
	1.1 freeipa-cve-2008-3274-utility.patch, NONE,
	1.1 freeipa-encrypt-files.patch, NONE,
	1.1 freeipa-fix-expire.patch, NONE,
	1.1 freeipa-fix-key-encryption.patch, NONE,
	1.1 freeipa-refresh-mkey.patch, NONE,
	1.1 freeipa-user-input.patch, NONE, 1.1 ipa.spec, 1.12, 1.13
Message-ID: <20080910210517.5073E7012C@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/ipa/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20936

Modified Files:
	ipa.spec 
Added Files:
	0001-Fix-typo-in-inet-type.patch 
	0001-In-openvz-we-found-out-some-interfaces-may-return-a.patch 
	freeipa-change-mkey.patch freeipa-cve-2008-3274-fixes.patch 
	freeipa-cve-2008-3274-utility.patch 
	freeipa-encrypt-files.patch freeipa-fix-expire.patch 
	freeipa-fix-key-encryption.patch freeipa-refresh-mkey.patch 
	freeipa-user-input.patch 
Log Message:
- Fix for CVE-2008-3274
- Fix segfault in ipa-kpasswd in case getifaddrs returns a NULL interface


0001-Fix-typo-in-inet-type.patch:

--- NEW FILE 0001-Fix-typo-in-inet-type.patch ---
>From 77906dce20a8d37b10225c4dc8701b25f172f362 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Mon, 9 Jun 2008 17:55:32 -0400
Subject: [PATCH] Fix typo in inet type

---
 ipa-server/ipa-kpasswd/ipa_kpasswd.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ipa-server/ipa-kpasswd/ipa_kpasswd.c b/ipa-server/ipa-kpasswd/ipa_kpasswd.c
index 677b61b..72d3c13 100644
--- a/ipa-server/ipa-kpasswd/ipa_kpasswd.c
+++ b/ipa-server/ipa-kpasswd/ipa_kpasswd.c
@@ -1296,7 +1296,7 @@ int main(int argc, char *argv[])
 
 	for (tifa = ifa; tifa; tifa = tifa->ifa_next) {
 
-		if (tifa->ifa_addr->sa_family != PF_INET &&
+		if (tifa->ifa_addr->sa_family != AF_INET &&
 		    tifa->ifa_addr->sa_family != AF_INET6) {
 			/* not interesting for us */
 			continue;
-- 
1.5.5.1


0001-In-openvz-we-found-out-some-interfaces-may-return-a.patch:

--- NEW FILE 0001-In-openvz-we-found-out-some-interfaces-may-return-a.patch ---
>From 67f62709f83997945b69919cd744ce936ddf5596 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Tue, 15 Jul 2008 16:13:43 -0400
Subject: [PATCH] In openvz we found out some interfaces may return a null pointer here.
 Skip them if no address is provided or we later get a segfault because
 we dereference a null pointer.

---
 ipa-server/ipa-kpasswd/ipa_kpasswd.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ipa-server/ipa-kpasswd/ipa_kpasswd.c b/ipa-server/ipa-kpasswd/ipa_kpasswd.c
index 7b4f39e..43ca223 100644
--- a/ipa-server/ipa-kpasswd/ipa_kpasswd.c
+++ b/ipa-server/ipa-kpasswd/ipa_kpasswd.c
@@ -1299,6 +1299,10 @@ int main(int argc, char *argv[])
 
 	for (tifa = ifa; tifa; tifa = tifa->ifa_next) {
 
+		if (NULL == tifa->ifa_addr)
+			/* uhmm no address ?? skip it */
+			continue;
+
 		if (tifa->ifa_addr->sa_family != AF_INET &&
 		    tifa->ifa_addr->sa_family != AF_INET6) {
 			/* not interesting for us */
-- 
1.5.5.1


freeipa-change-mkey.patch:

--- NEW FILE freeipa-change-mkey.patch ---
>From ab6449e101d4282014a06ad3cd20961005fee2ce Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Wed, 6 Aug 2008 16:46:18 -0400
Subject: [PATCH] Add a tool to change the kerberos Master Key in case an admin wants to. This tool will dump and re-encrypt all keys, then reload and change the master key in LDAP and in the stash file. It will also restart the Directory Server and the the KDC

---
 ipa-admintools/Makefile              |    1 +
 ipa-admintools/ipa-change-master-key |  383 ++++++++++++++++++++++++++++++++++
 2 files changed, 384 insertions(+), 0 deletions(-)
 create mode 100644 ipa-admintools/ipa-change-master-key

diff --git a/ipa-admintools/Makefile b/ipa-admintools/Makefile
index 77cc38d..0b7cae8 100644
--- a/ipa-admintools/Makefile
+++ b/ipa-admintools/Makefile
@@ -26,6 +26,7 @@ install:
 	install -m 755 ipa-deldelegation $(SBINDIR)
 	install -m 755 ipa-listdelegation $(SBINDIR)
 	install -m 755 ipa-moddelegation $(SBINDIR)
+	install -m 755 ipa-change-master-key $(SBINDIR)
 
 	@for subdir in $(SUBDIRS); do \
 		(cd $$subdir && $(MAKE) $@) || exit 1; \
diff --git a/ipa-admintools/ipa-change-master-key b/ipa-admintools/ipa-change-master-key
new file mode 100644
index 0000000..233a7af
--- /dev/null
+++ b/ipa-admintools/ipa-change-master-key
@@ -0,0 +1,383 @@
+#! /usr/bin/python -E
+# Authors: Simo Sorce <ssorce at redhat.com>
+#
+# Copyright (C) 2007 Simo Sorce <ssorce at redhat.com>
+# see file 'COPYING' for use and warranty information
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; version 2 or later
+#
+# 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
+#
+
+etckrb5conf = "/etc/krb5.conf"
+krb5dir = "/var/kerberos/krb5kdc"
+cachedir = "/var/cache/ipa"
+libdir = "/var/lib/ipa"
+basedir = libdir+"/mkey"
+ourkrb5conf = basedir+"/krb5.conf"
+ldappwdfile = basedir+"/ldappwd"
+
+password = ""
+
+import sys
+try:
+    from optparse import OptionParser
+    import ipa
+    import ipa.config
+    import ipa.ipautil
+    from ipaclient import ipachangeconf
+    from ipaserver import ipaldap
+
+    import krbV
+
+    import ldap
+    from ldap import LDAPError
+    from ldap import ldapobject
+
+    from pyasn1.type import univ, namedtype
+    import pyasn1.codec.ber.encoder
+    import pyasn1.codec.ber.decoder
+    import struct
+    import base64
+
+    import random
+    import time
+    import os
+    import shutil
+    import getpass
+except ImportError:
+    print >> sys.stderr, """\
+There was a problem importing one of the required Python modules. The
+error was:
+
+    %s
+""" % sys.exc_value
+    sys.exit(1)
+
+def usage():
+    print "ipa-change-master-key [-q|--quiet] [-p DM_PASSWORD]"
+    sys.exit(1)
+
+def parse_options():
+    parser = OptionParser()
+    parser.add_option("-p", "--dm-password", dest="dm_password",
+                      help="The Directory Manager password")
+    parser.add_option("-q", "--quiet", action="store_true", dest="quiet",
+                      help="Keep quiet")
+    parser.add_option("--usage", action="store_true",
+                      help="Program usage")
+
+    args = ipa.config.init_config(sys.argv)
+    options, args = parser.parse_args(args)
+
+    return options, args
+
+# We support only des3 encoded stash files for now
+def generate_new_stash_file(file):
+
+    odd_parity_bytes_pool = ['\x01', '\x02', '\x04', '\x07', '\x08', '\x0b', '\r', '\x0e', '\x10', '\x13', '\x15', '\x16', '\x19', '\x1a', '\x1c', '\x1f', ' ', '#', '%', '&', ')', '*', ',', '/', '1', '2', '4', '7', '8', ';', '=', '>', '@', 'C', 'E', 'F', 'I', 'J', 'L', 'O', 'Q', 'R', 'T', 'W', 'X', '[', ']', '^', 'a', 'b', 'd', 'g', 'h', 'k', 'm', 'n', 'p', 's', 'u', 'v', 'y', 'z', '|', '\x7f', '\x80', '\x83', '\x85', '\x86', '\x89', '\x8a', '\x8c', '\x8f', '\x91', '\x92', '\x94', '\x97', '\x98', '\x9b', '\x9d', '\x9e', '\xa1', '\xa2', '\xa4', '\xa7', '\xa8', '\xab', '\xad', '\xae', '\xb0', '\xb3', '\xb5', '\xb6', '\xb9', '\xba', '\xbc', '\xbf', '\xc1', '\xc2', '\xc4', '\xc7', '\xc8', '\xcb', '\xcd', '\xce', '\xd0', '\xd3', '\xd5', '\xd6', '\xd9', '\xda', '\xdc', '\xdf', '\xe0', '\xe3',
+'\xe5', '\xe6', '\xe9', '\xea', '\xec', '\xef', '\xf1', '\xf2', '\xf4', '\xf7',
+'\xf8', '\xfb', '\xfd', '\xfe']
+    pool_len = len(odd_parity_bytes_pool)
+    keytype = 16 # des3
+    keydata = ""
+
+    r = random.SystemRandom()
+    for k in range(24):
+        keydata += r.choice(odd_parity_bytes_pool)
+
+    format = '=hi%ss' % len(keydata)
+    s = struct.pack(format, keytype, len(keydata), keydata)
+    try:
+        fd = open(file, "w")
+        fd.write(s)
+    except os.error, e:
+        logging.critical("failed to write stash file")
+        raise e
+
+# clean up procedures
+def cleanup(password):
+    try:
+        os.stat(basedir)
+    except:
+        return None
+    try:
+        # always remove ldappwdfile as it contains the Directory Manager password
+        os.remove(ldappwdfile)
+    except:
+        pass
+
+    # tar and encrypt the working dir so that we do not leave sensitive data
+    # around unproteceted
+    curtime = time.strftime("%Y%m%d%H%M%S",time.gmtime())
+    tarfile = libdir+"/ipa-change-mkey-"+curtime+".tar"
+    gpgfile = tarfile+".gpg"
+    args = ['/bin/tar', '-C', libdir, '-cf', tarfile, 'mkey']
+    ipa.ipautil.run(args)
+    ipa.ipautil.encrypt_file(tarfile, gpgfile, password, cachedir)
+    os.remove(tarfile)
+    shutil.rmtree(basedir, ignore_errors=True)
+
+    return "The temporary working directory with backup dump files has been securely archived and gpg-encrypted as "+gpgfile+" using the Directory Manager password."
+
+def main():
+
+    global password
+
+    options, args = parse_options()
+
+    if options.usage:
+        usage()
+
+    krbctx = krbV.default_context()
+
+    realm = krbctx.default_realm
+    suffix = ipa.ipautil.realm_to_suffix(realm)
+
+    backupfile = basedir+"/backup.dump"
+    convertfile = basedir+"/convert.dump"
+    oldstashfile = krb5dir+"/.k5."+realm
+    newstashfile = basedir+"/.new.mkey"
+    bkpstashfile = basedir+"/.k5."+realm
+
+    if os.getuid() != 0:
+        print "ERROR: This command must be run as root"
+
+    print "DANGER: This is a dangerous operation, make sure you backup all your IPA data before running the tool"
+    print "This command will restart your Directory and KDC Servers."
+
+    #TODO: ask for confirmation
+    if not ipa.ipautil.user_input("Do you want to proceed and change the Kerberos Master key?", False):
+        print ""
+        print "Aborting..."
+        return 1
+
+    password = options.dm_password
+    if not password:
+        password = getpass.getpass("Directory Manager password: ")
+
+    # get a connection to the DS
+    try:
+        conn = ipaldap.IPAdmin(ipa.config.config.default_server[0])
+        conn.do_simple_bind(bindpw=password)
+    except Exception, e:
+        print "ERROR: Could not connect to the Directory Server on "+ipa.config.config.default_server[0]+" ("+str(e)+")"
+        return 1
+
+    #  Wipe basedir and recreate it
+    shutil.rmtree(basedir, ignore_errors=True)
+    os.mkdir(basedir, 0700)
+
+    generate_new_stash_file(newstashfile)
+
+    # Generate conf files
+    try:
+        shutil.copyfile(etckrb5conf, ourkrb5conf)
+
+        krbconf = ipachangeconf.IPAChangeConf("IPA Installer")
+        krbconf.setOptionAssignment(" = ")
+        krbconf.setSectionNameDelimiters(("[","]"))
+        krbconf.setSubSectionDelimiters(("{","}"))
+        krbconf.setIndent(("","  ","    "))
+
+        #OPTS
+        opts = [{'name':'ldap_kadmind_dn', 'type':'option', 'action':'set', 'value':'cn=Directory Manager'},
+                {'name':'ldap_service_password_file', 'type':'option', 'action':'set', 'value':ldappwdfile}]
+
+        #REALM
+        realmopts = [{'name':realm, 'type':'subsection', 'action':'set', 'value':opts}]
+
+        #DBMODULES
+        dbopts = [{'name':'dbmodules', 'type':'section', 'action':'set', 'value':realmopts}]
+
+        krbconf.changeConf(ourkrb5conf, dbopts);
+
+        hexpwd = ""
+        for x in password:
+            hexpwd += (hex(ord(x))[2:])
+        pwd_fd = open(ldappwdfile, "w")
+        pwd_fd.write("cn=Directory Manager#{HEX}"+hexpwd+"\n")
+        pwd_fd.close()
+        os.chmod(ldappwdfile, 0600)
+
+    except Exception, e:
+        print "Failed to create custom configuration files ("+str(e)+") aborting..."
+        return 1
+
+    #Set environment vars so that the modified krb5.conf is used
+    os.environ['KRB5_CONFIG'] = ourkrb5conf
+
+    #Backup the kerberos key material for recovery if needed
+    args = ["/usr/kerberos/sbin/kdb5_util", "dump", "-verbose", backupfile]
+    print "Performing safety backup of the key material"
+    try:
+        output = ipa.ipautil.run(args)
+    except ipa.ipautil.CalledProcessError, e:
+        print "Failed to backup key material ("+str(e)+"), aborting ..."
+        return 1
+
+    if not options.quiet:
+        princlist = output[1].split('\n')
+        print "Principals stored into the backup file "+backupfile+":"
+        for p in princlist:
+            print p
+        print ""
+
+    #Convert the kerberos keys to the new master key
+    args = ["/usr/kerberos/sbin/kdb5_util", "dump", "-verbose", "-new_mkey_file", newstashfile, convertfile]
+    print "Converting key material to new master key"
+    try:
+        output = ipa.ipautil.run(args)
+    except ipa.ipautil.CalledProcessError, e:
+        print "Failed to convert key material, aborting ..."
+        return 1
+
+    savedprinclist = output[1].split('\n')
+
+    if not options.quiet:
+        princlist = output[1].split('\n')
+        print "Principals dumped for conversion:"
+        for p in princlist:
+            print p
+        print ""
+
+    #Stop the KDC
+    args = ["/etc/init.d/krb5kdc", "stop"]
+    try:
+        output = ipa.ipautil.run(args)
+        if output[0]:
+            print output[0]
+        if output[1]:
+            print output[1]
+    except ipa.ipautil.CalledProcessError, e:
+        print "WARNING: Failed to restart the KDC ("+str(e)+")"
+        print "You will have to manually restart the KDC when the operation is completed"
+
+    #Change the mkey into ldap
+    try:
+        stash = open(newstashfile, "r")
+        keytype = struct.unpack('h', stash.read(2))[0]
+        keylen = struct.unpack('i', stash.read(4))[0]
+        keydata = stash.read(keylen)
+
+        #encode it in the asn.1 attribute
+        MasterKey = univ.Sequence()
+        MasterKey.setComponentByPosition(0, univ.Integer(keytype))
+        MasterKey.setComponentByPosition(1, univ.OctetString(keydata))
+        krbMKey = univ.Sequence()
+        krbMKey.setComponentByPosition(0, univ.Integer(0)) #we have no kvno
+        krbMKey.setComponentByPosition(1, MasterKey)
+        asn1key = pyasn1.codec.ber.encoder.encode(krbMKey)
+
+        dn = "cn="+realm+",cn=kerberos,"+suffix
+        mod = [(ldap.MOD_REPLACE, 'krbMKey', str(asn1key))]
+        conn.modify_s(dn, mod)
+    except Exception, e:
+        print "ERROR: Failed to upload the Master Key from the Stash file: "+newstashfile+" ("+str(e)+")"
+        return 1
+
+    #Backup old stash file and substitute with new
+    try:
+        shutil.move(oldstashfile, bkpstashfile)
+        shutil.copyfile(newstashfile, oldstashfile)
+    except Exception, e:
+        print "ERROR: An error occurred while installing the new stash file("+str(e)+")"
+        print "The KDC may fail to start if the correct stash file is not in place"
+        print "Verify that "+newstashfile+" has been correctly installed into "+oldstashfile
+        print "A backup copy of the old stash file should be saved in "+bkpstashfile
+
+    #Finally upload the converted principals
+    args = ["/usr/kerberos/sbin/kdb5_util", "load", "-verbose", "-update", convertfile]
+    print "Uploading converted key material"
+    try:
+        output = ipa.ipautil.run(args)
+    except ipa.ipautil.CalledProcessError, e:
+        print "Failed to upload key material ("+e+"), aborting ..."
+        return 1
+
+    if not options.quiet:
+        princlist = output[1].split('\n')
+        print "Principals converted and uploaded:"
+        for p in princlist:
+            print p
+        print ""
+
+    uploadedprinclist = output[1].split('\n')
+
+    #Check for differences and report
+    d = []
+    for p in savedprinclist:
+        if uploadedprinclist.count(p) == 0:
+            d.append(p)
+    if len(d) != 0:
+        print "WARNING: Not all dumped principals have been updated"
+        print "Principals not Updated:"
+        for p in d:
+            print p
+
+    #Remove custom environ
+    del os.environ['KRB5_CONFIG']
+
+    #Restart Directory Server (the pwd plugin need to read the new mkey)
+    args = ["/etc/init.d/dirsrv", "restart"]
+    try:
+        output = ipa.ipautil.run(args)
+        if output[0]:
+            print output[0]
+        if output[1]:
+            print output[1]
+    except ipa.ipautil.CalledProcessError, e:
+        print "WARNING: Failed to restart the Directory Server ("+str(e)+")"
+        print "Please manually restart the DS with 'service dirsrv restart'"
+
+    #Restart the KDC
+    args = ["/etc/init.d/krb5kdc", "start"]
+    try:
+        output = ipa.ipautil.run(args)
+        if output[0]:
+            print output[0]
+        if output[1]:
+            print output[1]
+    except ipa.ipautil.CalledProcessError, e:
+        print "WARNING: Failed to restart the KDC ("+str(e)+")"
+        print "Please manually restart the kdc with 'service krb5kdc start'"
+
+    #TODO: encrypt the backup/temp directory with the Directory Manager password
+
+    print "Master Password successfully changed"
+    print "You MUST now copy the stash file "+oldstashfile+" to all the replicas and restart them!"
+    print ""
+
+    return 0
+
+if __name__ == "__main__":
+    ret = 0
+    try:
+        ret = main()
+    except SystemExit, e:
+        ret = e
+    except KeyboardInterrupt, e:
+        ret = 1
+    except Exception, e:
+        print "%s" % str(e)
+        ret = 1
+
+    try:
+        msg = cleanup(password)
+        if msg:
+            print msg
+    except Exception, e:
+        print "Failed to clean up the temporary location for the dump files and generate and encrypted archive with error:"
+        print e
+        print "Please securely archive/encrypt "+basedir
+
+    sys.exit(ret)
-- 
1.5.5.1


freeipa-cve-2008-3274-fixes.patch:

--- NEW FILE freeipa-cve-2008-3274-fixes.patch ---
>From 7bd21c0d8b0c0889289c7e1eaeb21fb0f1d0c99f Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Fri, 15 Aug 2008 17:17:03 -0400
Subject: [PATCH] CVE 2008 3274 related fixes

---
 ipa-server/ipa-install/share/default-aci.ldif |    4 ++--
 ipa-server/ipaserver/krbinstance.py           |    8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ipa-server/ipa-install/share/default-aci.ldif b/ipa-server/ipa-install/share/default-aci.ldif
index d2946fa..25bd3b2 100644
--- a/ipa-server/ipa-install/share/default-aci.ldif
+++ b/ipa-server/ipa-install/share/default-aci.ldif
@@ -3,8 +3,8 @@
 dn: $SUFFIX
 changetype: modify
 add: aci
-aci: (targetattr != "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword || passwordHistory")(version 3.0; acl "Enable Anonymous access"; allow (read, search, compare) userdn = "ldap:///anyone";)
-aci: (targetattr != "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword || passwordHistory")(version 3.0; acl "Admin can manage any entry"; allow (all) userdn = "ldap:///uid=admin,cn=users,cn=accounts,$SUFFIX";)
+aci: (targetattr != "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword || passwordHistory || krbMKey")(version 3.0; acl "Enable Anonymous access"; allow (read, search, compare) userdn = "ldap:///anyone";)
+aci: (targetattr != "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword || passwordHistory || krbMKey")(version 3.0; acl "Admin can manage any entry"; allow (all) userdn = "ldap:///uid=admin,cn=users,cn=accounts,$SUFFIX";)
 aci: (targetattr = "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword")(version 3.0; acl "Self can write own password"; allow (write) userdn="ldap:///self";)
 aci: (targetattr = "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword || passwordHistory")(version 3.0; acl "Admins can write passwords"; allow (add,delete,write) groupdn="ldap:///cn=admins,cn=groups,cn=accounts,$SUFFIX";)
 aci: (targetattr = "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword || passwordHistory")(version 3.0; acl "Password change service can read/write passwords"; allow (read, write) userdn="ldap:///krbprincipalname=kadmin/changepw@$REALM,cn=$REALM,cn=kerberos,$SUFFIX";)
diff --git a/ipa-server/ipaserver/krbinstance.py b/ipa-server/ipaserver/krbinstance.py
index deea4a6..1668561 100644
--- a/ipa-server/ipaserver/krbinstance.py
+++ b/ipa-server/ipaserver/krbinstance.py
@@ -48,6 +48,10 @@
 import struct
 import base64
 
+KRBMKEY_DENY_ACI = """
+(targetattr = "krbMKey")(version 3.0; acl "No external access"; deny (all) userdn != "ldap:///uid=kdc,cn=sysaccounts,cn=etc,$SUFFIX";)
+"""
+
 def update_key_val_in_file(filename, key, val):
     if os.path.exists(filename):
         pattern = "^[\s#]*%s\s*=\s*%s\s*" % (re.escape(key), re.escape(val))
@@ -358,7 +362,9 @@
 
         entry = ipaldap.Entry("cn="+self.realm+",cn=kerberos,"+self.suffix)
         dn = "cn="+self.realm+",cn=kerberos,"+self.suffix
-        mod = [(ldap.MOD_ADD, 'krbMKey', str(asn1key))]
+        #protect the master key by adding an appropriate deny rule along with the key
+        mod = [(ldap.MOD_ADD, 'aci', ipautil.template_str(KRBMKEY_DENY_ACI, self.sub_dict)),
+               (ldap.MOD_ADD, 'krbMKey', str(asn1key))]
         try:
             self.conn.modify_s(dn, mod)
         except ldap.TYPE_OR_VALUE_EXISTS, e:

freeipa-cve-2008-3274-utility.patch:

--- NEW FILE freeipa-cve-2008-3274-utility.patch ---
>From 40749e3ea6b727fa8c60e2d2af44a0e5ac725936 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Tue, 19 Aug 2008 13:31:26 -0400
Subject: [PATCH] Add script to simplify operations to fix CVE 2008 3274
 Import all of change master key directly into the help fix,
 allows for better control

---
 ipa-server/Makefile.am           |    1 +
 ipa-server/ipa-fix-CVE-2008-3274 |  520 ++++++++++++++++++++++++++++++++++++++
 ipa-server/ipa-server.spec.in    |    1 +
 3 files changed, 522 insertions(+), 0 deletions(-)
 create mode 100644 ipa-server/ipa-fix-CVE-2008-3274

diff --git a/ipa-server/Makefile.am b/ipa-server/Makefile.am
index 6fb854d..f058013 100644
--- a/ipa-server/Makefile.am
+++ b/ipa-server/Makefile.am
@@ -16,6 +16,7 @@ SUBDIRS =			\
 
 sbin_SCRIPTS =			\
 	ipa-upgradeconfig	\
+	ipa-fix-CVE-2008-3274	\
 	$(NULL)
 
 install-exec-local:
diff --git a/ipa-server/ipa-fix-CVE-2008-3274 b/ipa-server/ipa-fix-CVE-2008-3274
new file mode 100644
index 0000000..171a9db
--- /dev/null
+++ b/ipa-server/ipa-fix-CVE-2008-3274
@@ -0,0 +1,518 @@
+#!/usr/bin/python
+#
+# Upgrade configuration files to a newer template.
+
+etckrb5conf = "/etc/krb5.conf"
+krb5dir = "/var/kerberos/krb5kdc"
+cachedir = "/var/cache/ipa"
+libdir = "/var/lib/ipa"
+basedir = libdir+"/mkey"
+ourkrb5conf = basedir+"/krb5.conf"
+ldappwdfile = basedir+"/ldappwd"
+
+import sys
+try:
+    from optparse import OptionParser
+
+    import os
+    import random
+    import time
+    import shutil
+    import getpass
+
+    import ipa
+    import ipa.config
+    import ipa.ipautil
+
+    import krbV
+    import ldap
+
+    from ldap import LDAPError
+    from ldap import ldapobject
+
+    from ipaclient import ipachangeconf    
+    from ipaserver import ipaldap
+
+    from pyasn1.type import univ, namedtype
+    import pyasn1.codec.ber.encoder
+    import pyasn1.codec.ber.decoder
+    import struct
+    import base64
+
+except ImportError:
+    print >> sys.stderr, """\
+There was a problem importing one of the required Python modules. The
+error was:
+
+    %s
+""" % sys.exc_value
+    sys.exit(1)
+
+def usage():
+    print "ipa-fix-CVE-2008-3274 [--check] [--fix] [--fix-replica]"
+    sys.exit(1)
+
+def parse_options():
+    parser = OptionParser()
+    parser.add_option("--check", dest="check", action="store_true",
+                      help="Just check for the vulnerability and report (default action)")
+    parser.add_option("--fix", dest="fix", action="store_true",
+                      help="Run checks and start procedure to fix the problem")
+    parser.add_option("--fix-replica", dest="fix_replica", action="store_true",
+                      help="Fix a replica after the tool has been tun with --fix on another master")
+    parser.add_option("--usage", action="store_true",
+                      help="Program usage")
+
+    args = ipa.config.init_config(sys.argv)
+    options, args = parser.parse_args(args)
+
+    return options, args
+
+def check_vuln(realm, suffix):
+
+    try:
+        conn = ldapobject.SimpleLDAPObject("ldap://127.0.0.1/")
+        conn.simple_bind()
+        msgid = conn.search("cn="+realm+",cn=kerberos,"+suffix,
+                            ldap.SCOPE_BASE,
+                            "(objectclass=krbRealmContainer)",
+                            ("krbmkey", "cn"))
+        res = conn.result(msgid)
+        conn.unbind()
+
+        if len(res) != 2:
+            err = 'Realm Container not found, unable to proceed'
+            print err
+            raise Exception, err
+
+        if 'krbmkey' in res[1][0][1]:
+            print 'System vulnerable'
+            return 1
+        else:
+            print 'System *not* vulnerable'
+            return 0
+    except Exception, e:
+        print "Could not connect to the LDAP server, unable to check server"
+        print "("+type(e)+")("+dir(e)+")"
+        raise e
+
+# We support only des3 encoded stash files for now
+def generate_new_stash_file(file):
+
+    odd_parity_bytes_pool = ['\x01', '\x02', '\x04', '\x07', '\x08', '\x0b', '\r', '\x0e', '\x10', '\x13', '\x15', '\x16', '\x19', '\x1a', '\x1c', '\x1f', ' ', '#', '%', '&', ')', '*', ',', '/', '1', '2', '4', '7', '8', ';', '=', '>', '@', 'C', 'E', 'F', 'I', 'J', 'L', 'O', 'Q', 'R', 'T', 'W', 'X', '[', ']', '^', 'a', 'b', 'd', 'g', 'h', 'k', 'm', 'n', 'p', 's', 'u', 'v', 'y', 'z', '|', '\x7f', '\x80', '\x83', '\x85', '\x86', '\x89', '\x8a', '\x8c', '\x8f', '\x91', '\x92', '\x94', '\x97', '\x98', '\x9b', '\x9d', '\x9e', '\xa1', '\xa2', '\xa4', '\xa7', '\xa8', '\xab', '\xad', '\xae', '\xb0', '\xb3', '\xb5', '\xb6', '\xb9', '\xba', '\xbc', '\xbf', '\xc1', '\xc2', '\xc4', '\xc7', '\xc8', '\xcb', '\xcd', '\xce', '\xd0', '\xd3', '\xd5', '\xd6', '\xd9', '\xda', '\xdc', '\xdf', '\xe0', '\xe3',
+'\xe5', '\xe6', '\xe9', '\xea', '\xec', '\xef', '\xf1', '\xf2', '\xf4', '\xf7',
+'\xf8', '\xfb', '\xfd', '\xfe']
+    pool_len = len(odd_parity_bytes_pool)
+    keytype = 16 # des3
+    keydata = ""
+
+    r = random.SystemRandom()
+    for k in range(24):
+        keydata += r.choice(odd_parity_bytes_pool)
+
+    format = '=hi%ss' % len(keydata)
+    s = struct.pack(format, keytype, len(keydata), keydata)
+    try:
+        fd = open(file, "w")
+        fd.write(s)
+    except os.error, e:
+        logging.critical("failed to write stash file")
+        raise e
+
+# clean up procedures
+def change_mkey_cleanup(password):
+    try:
+        os.stat(basedir)
+    except:
+        return None
+    try:
+        # always remove ldappwdfile as it contains the Directory Manager password
+        os.remove(ldappwdfile)
+    except:
+        pass
+
+    # tar and encrypt the working dir so that we do not leave sensitive data
+    # around unproteceted
+    curtime = time.strftime("%Y%m%d%H%M%S",time.gmtime())
+    tarfile = libdir+"/ipa-change-mkey-"+curtime+".tar"
+    gpgfile = tarfile+".gpg"
+    args = ['/bin/tar', '-C', libdir, '-cf', tarfile, 'mkey']
+    ipa.ipautil.run(args)
+    ipa.ipautil.encrypt_file(tarfile, gpgfile, password, cachedir)
+    os.remove(tarfile)
+    shutil.rmtree(basedir, ignore_errors=True)
+
+    return "The temporary working directory with backup dump files has been securely archived and gpg-encrypted as "+gpgfile+" using the Directory Manager password."
+
+def change_mkey(password = None, quiet = False):
+
+    krbctx = krbV.default_context()
+
+    realm = krbctx.default_realm
+    suffix = ipa.ipautil.realm_to_suffix(realm)
+
+    backupfile = basedir+"/backup.dump"
+    convertfile = basedir+"/convert.dump"
+    oldstashfile = krb5dir+"/.k5."+realm
+    newstashfile = basedir+"/.new.mkey"
+    bkpstashfile = basedir+"/.k5."+realm
+
+    if os.getuid() != 0:
+        print "ERROR: This command must be run as root"
+
+    print "DANGER: This is a dangerous operation, make sure you backup all your IPA data before running the tool"
+    print "This command will restart your Directory and KDC Servers."
+
+    #TODO: ask for confirmation
+    if not ipa.ipautil.user_input("Do you want to proceed and change the Kerberos Master key?", False):
+        print ""
+        print "Aborting..."
+        return 1
+
+    if not password:
+        password = getpass.getpass("Directory Manager password: ")
+
+    # get a connection to the DS
+    try:
+        conn = ipaldap.IPAdmin(ipa.config.config.default_server[0])
+        conn.do_simple_bind(bindpw=password)
+    except Exception, e:
+        print "ERROR: Could not connect to the Directory Server on "+ipa.config.config.default_server[0]+" ("+str(e)+")"
+        return 1
+
+    #  Wipe basedir and recreate it
+    shutil.rmtree(basedir, ignore_errors=True)
+    os.mkdir(basedir, 0700)
+
+    generate_new_stash_file(newstashfile)
+
+    # Generate conf files
+    try:
+        shutil.copyfile(etckrb5conf, ourkrb5conf)
+
+        krbconf = ipachangeconf.IPAChangeConf("IPA Installer")
+        krbconf.setOptionAssignment(" = ")
+        krbconf.setSectionNameDelimiters(("[","]"))
+        krbconf.setSubSectionDelimiters(("{","}"))
+        krbconf.setIndent(("","  ","    "))
+
+        #OPTS
+        opts = [{'name':'ldap_kadmind_dn', 'type':'option', 'action':'set', 'value':'cn=Directory Manager'},
+                {'name':'ldap_service_password_file', 'type':'option', 'action':'set', 'value':ldappwdfile}]
+
+        #REALM
+        realmopts = [{'name':realm, 'type':'subsection', 'action':'set', 'value':opts}]
+
+        #DBMODULES
+        dbopts = [{'name':'dbmodules', 'type':'section', 'action':'set', 'value':realmopts}]
+
+        krbconf.changeConf(ourkrb5conf, dbopts);
+
+        hexpwd = ""
+        for x in password:
+            hexpwd += (hex(ord(x))[2:])
+        pwd_fd = open(ldappwdfile, "w")
+        pwd_fd.write("cn=Directory Manager#{HEX}"+hexpwd+"\n")
+        pwd_fd.close()
+        os.chmod(ldappwdfile, 0600)
+
+    except Exception, e:
+        print "Failed to create custom configuration files ("+str(e)+") aborting..."
+        return 1
+
+    #Set environment vars so that the modified krb5.conf is used
+    os.environ['KRB5_CONFIG'] = ourkrb5conf
+
+    #Backup the kerberos key material for recovery if needed
+    args = ["/usr/kerberos/sbin/kdb5_util", "dump", "-verbose", backupfile]
+    print "Performing safety backup of the key material"
+    try:
+        output = ipa.ipautil.run(args)
+    except ipa.ipautil.CalledProcessError, e:
+        print "Failed to backup key material ("+str(e)+"), aborting ..."
+        return 1
+
+    if not quiet:
+        princlist = output[1].split('\n')
+        print "Principals stored into the backup file "+backupfile+":"
+        for p in princlist:
+            print p
+        print ""
+
+    #Convert the kerberos keys to the new master key
+    args = ["/usr/kerberos/sbin/kdb5_util", "dump", "-verbose", "-new_mkey_file", newstashfile, convertfile]
+    print "Converting key material to new master key"
+    try:
+        output = ipa.ipautil.run(args)
+    except ipa.ipautil.CalledProcessError, e:
+        print "Failed to convert key material, aborting ..."
+        return 1
+
+    savedprinclist = output[1].split('\n')
+
+    if not quiet:
+        princlist = output[1].split('\n')
+        print "Principals dumped for conversion:"
+        for p in princlist:
+            print p
+        print ""
+
+    #Stop the KDC
+    args = ["/etc/init.d/krb5kdc", "stop"]
+    try:
+        output = ipa.ipautil.run(args)
+        if output[0]:
+            print output[0]
+        if output[1]:
+            print output[1]
+    except ipa.ipautil.CalledProcessError, e:
+        print "WARNING: Failed to restart the KDC ("+str(e)+")"
+        print "You will have to manually restart the KDC when the operation is completed"
+
+    #Change the mkey into ldap
+    try:
+        stash = open(newstashfile, "r")
+        keytype = struct.unpack('h', stash.read(2))[0]
+        keylen = struct.unpack('i', stash.read(4))[0]
+        keydata = stash.read(keylen)
+
+        #encode it in the asn.1 attribute
+        MasterKey = univ.Sequence()
+        MasterKey.setComponentByPosition(0, univ.Integer(keytype))
+        MasterKey.setComponentByPosition(1, univ.OctetString(keydata))
+        krbMKey = univ.Sequence()
+        krbMKey.setComponentByPosition(0, univ.Integer(0)) #we have no kvno
+        krbMKey.setComponentByPosition(1, MasterKey)
+        asn1key = pyasn1.codec.ber.encoder.encode(krbMKey)
+
+        dn = "cn="+realm+",cn=kerberos,"+suffix
+        mod = [(ldap.MOD_REPLACE, 'krbMKey', str(asn1key))]
+        conn.modify_s(dn, mod)
+    except Exception, e:
+        print "ERROR: Failed to upload the Master Key from the Stash file: "+newstashfile+" ("+str(e)+")"
+        return 1
+
+    #Backup old stash file and substitute with new
+    try:
+        shutil.move(oldstashfile, bkpstashfile)
+        shutil.copyfile(newstashfile, oldstashfile)
+    except Exception, e:
+        print "ERROR: An error occurred while installing the new stash file("+str(e)+")"
+        print "The KDC may fail to start if the correct stash file is not in place"
+        print "Verify that "+newstashfile+" has been correctly installed into "+oldstashfile
+        print "A backup copy of the old stash file should be saved in "+bkpstashfile
+
+    #Finally upload the converted principals
+    args = ["/usr/kerberos/sbin/kdb5_util", "load", "-verbose", "-update", convertfile]
+    print "Uploading converted key material"
+    try:
+        output = ipa.ipautil.run(args)
+    except ipa.ipautil.CalledProcessError, e:
+        print "Failed to upload key material ("+e+"), aborting ..."
+        return 1
+
+    if not quiet:
+        princlist = output[1].split('\n')
+        print "Principals converted and uploaded:"
+        for p in princlist:
+            print p
+        print ""
+
+    uploadedprinclist = output[1].split('\n')
+
+    #Check for differences and report
+    d = []
+    for p in savedprinclist:
+        if uploadedprinclist.count(p) == 0:
+            d.append(p)
+    if len(d) != 0:
+        print "WARNING: Not all dumped principals have been updated"
+        print "Principals not Updated:"
+        for p in d:
+            print p
+
+    #Remove custom environ
+    del os.environ['KRB5_CONFIG']
+
+    #Restart Directory Server (the pwd plugin need to read the new mkey)
+    args = ["/etc/init.d/dirsrv", "restart"]
+    try:
+        output = ipa.ipautil.run(args)
+        if output[0]:
+            print output[0]
+        if output[1]:
+            print output[1]
+    except ipa.ipautil.CalledProcessError, e:
+        print "WARNING: Failed to restart the Directory Server ("+str(e)+")"
+        print "Please manually restart the DS with 'service dirsrv restart'"
+
+    #Restart the KDC
+    args = ["/etc/init.d/krb5kdc", "start"]
+    try:
+        output = ipa.ipautil.run(args)
+        if output[0]:
+            print output[0]
+        if output[1]:
+            print output[1]
+    except ipa.ipautil.CalledProcessError, e:
+        print "WARNING: Failed to restart the KDC ("+str(e)+")"
+        print "Please manually restart the kdc with 'service krb5kdc start'"
+
+    print "Master Password successfully changed"
+    print ""
+
+    return 0
+
+def fix_replica(password, realm, suffix):
+
+    try:
+        conn = ldapobject.SimpleLDAPObject("ldap://127.0.0.1/")
+        conn.simple_bind("cn=Directory Manager", password)
+        msgid = conn.search("cn="+realm+",cn=kerberos,"+suffix,
+                            ldap.SCOPE_BASE,
+                            "(objectclass=krbRealmContainer)",
+                            ("krbmkey", "cn"))
+        res = conn.result(msgid)
+        conn.unbind()
+        krbmkey = res[1][0][1]['krbmkey'][0]
+    except Exception, e:
+        print "Could not connect to the LDAP server, unable to fix server"
+        print "("+type(e)+")("+dir(e)+")"
+        raise e
+
+    krbMKey = pyasn1.codec.ber.decoder.decode(krbmkey)
+    keytype = int(krbMKey[0][1][0])
+    keydata = str(krbMKey[0][1][1])
+
+    format = '=hi%ss' % len(keydata)
+    s = struct.pack(format, keytype, len(keydata), keydata)
+    try:
+        fd = open("/var/kerberos/krb5kdc/.k5."+realm, "w")
+        fd.write(s)
+        fd.close()
+    except os.error, e:
+        print "failed to write stash file"
+        raise e
+
+    #restart KDC so that it can reload the new Master Key
+    os.system("/etc/init.d/krb5kdc restart")
+
+KRBMKEY_DENY_ACI = """
+(targetattr = "krbMKey")(version 3.0; acl "No external access"; deny (all) userdn != "ldap:///uid=kdc,cn=sysaccounts,cn=etc,$SUFFIX";)
+"""
+
+def fix_main(password, realm, suffix):
+
+    #Run the change master key tool
+    print "Changing Kerberos master key"
+    try:
+        ret = change_mkey(password, True)
+    except SystemExit:
+        ret = 1
+        pass
+    except Exception, e:
+        ret = 1
+        print "%s" % str(e)
+
+    try:
+        msg = change_mkey_cleanup(password)
+        if msg:
+            print msg
+    except Exception, e:
+        print "Failed to clean up the temporary location for the dump files and generate and encrypted archive with error:"
+        print e
+        print "Please securely archive/encrypt "+basedir
+
+    if ret is not 0:
+        sys.exit(ret)
+
+    #Finally upload new master key
+
+    #get the Master Key from the stash file
+    try:
+        stash = open("/var/kerberos/krb5kdc/.k5."+realm, "r")
+        keytype = struct.unpack('h', stash.read(2))[0]
+        keylen = struct.unpack('i', stash.read(4))[0]
+        keydata = stash.read(keylen)
+    except os.error:
+        print "Failed to retrieve Master Key from Stash file: %s"
+        raise e
+    #encode it in the asn.1 attribute
+    MasterKey = univ.Sequence()
+    MasterKey.setComponentByPosition(0, univ.Integer(keytype))
+    MasterKey.setComponentByPosition(1, univ.OctetString(keydata))
+    krbMKey = univ.Sequence()
+    krbMKey.setComponentByPosition(0, univ.Integer(0)) #we have no kvno
+    krbMKey.setComponentByPosition(1, MasterKey)
+    asn1key = pyasn1.codec.ber.encoder.encode(krbMKey)
+
+    dn = "cn=%s,cn=kerberos,%s" % (realm, suffix)
+    sub_dict = dict(REALM=realm, SUFFIX=suffix)
+    #protect the master key by adding an appropriate deny rule along with the key
+    mod = [(ldap.MOD_ADD, 'aci', ipa.ipautil.template_str(KRBMKEY_DENY_ACI, sub_dict)),
+           (ldap.MOD_REPLACE, 'krbMKey', str(asn1key))]
+
+    conn = ldapobject.SimpleLDAPObject("ldap://127.0.0.1/")
+    conn.simple_bind("cn=Directory Manager", password)
+    conn.modify_s(dn, mod)
+    conn.unbind()
+
+    print "\n"
+    print "This server is now correctly configured and the master-key has been changed and secured."
+    print "Please now run this tool with the --fix-replica option on all your other replicas."
+    print "Until you fix the replicas their KDCs will not work."
+
+def main():
+
+    options, args = parse_options()
+
+    if options.usage:
+        usage()
+
+    if not options.fix and not options.fix_replica and not options.check:
+        print "use --help for more info"
+        usage()
+
+    if options.fix or options.fix_replica:
+        password = getpass.getpass("Directory Manager password: ")
+
+    krbctx = krbV.default_context()
+    realm = krbctx.default_realm
+    suffix = ipa.ipautil.realm_to_suffix(realm)
+
+    try:
+        ret = check_vuln(realm, suffix)
+    except:
+        sys.exit(1)
+
+    if options.fix_replica:
+        if ret is 1:
+            print "Your system is still vulnerable"
+            print "If you have already run this tool with --fix on a master then make sure your replication is working correctly, before runnig --fix-replica"
+            sys.exit(1)
+        try:
+            fix_replica(password, realm, suffix)
+        except Exception, e:
+            print "Unexpected error ("+str(e)+")"
+            sys.exit(1)
+        sys.exit(0)
+
+    if options.check:
+        sys.exit(0)
+
+    if options.fix:
+        if ret is 1:
+            try:
+                ret = fix_main(password, realm, suffix)
+            except Exception, e:
+                print "Unexpected error ("+str(e)+")"
+                sys.exit(1)
+        sys.exit(ret)
+
+try:
+    if __name__ == "__main__":
+        sys.exit(main())
+except SystemExit, e:
+    sys.exit(e)
+except KeyboardInterrupt, e:
+    sys.exit(1)
diff --git a/ipa-server/ipa-server.spec.in b/ipa-server/ipa-server.spec.in
index f8de8aa..2a79de0 100644
--- a/ipa-server/ipa-server.spec.in
+++ b/ipa-server/ipa-server.spec.in
@@ -123,6 +123,7 @@ fi
 %{_sbindir}/ipa_kpasswd
 %{_sbindir}/ipa_webgui
 %{_sbindir}/ipa-upgradeconfig
+%{_sbindir}/ipa-fix-CVE-2008-3274
 %attr(755,root,root) %{_initrddir}/ipa_kpasswd
 %attr(755,root,root) %{_initrddir}/ipa_webgui
 
-- 
1.5.5.1


freeipa-encrypt-files.patch:

--- NEW FILE freeipa-encrypt-files.patch ---
>From 5cbc453d89af0ef79b7c99849778f1982abeda05 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Thu, 7 Aug 2008 16:14:37 -0400
Subject: [PATCH] Add encrypt_file and decrypt_file utility functions.
 We will use them to encrypt the replica file so that we can
 transport it over more safely.
 It contains sensitive data, by encrypting it we assure that
 even if a distracted admin leaves it around it cannot be accessed
 without knowing the access passphrase (usually the Directory Manager
 password)

Along the way fix also ipautil.run which was buggy and not passing
in correctly stdin.

Add dependency for gnupg in spec file
---
 ipa-python/ipa-python.spec.in |    2 +-
 ipa-python/ipautil.py         |   65 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/ipa-python/ipa-python.spec.in b/ipa-python/ipa-python.spec.in
index 7d270b4..7744649 100755
--- a/ipa-python/ipa-python.spec.in
+++ b/ipa-python/ipa-python.spec.in
@@ -10,7 +10,7 @@ Source0:        http://www.freeipa.org/downloads/%{name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 BuildRequires:  python-devel
-Requires:       python-kerberos
+Requires:       python-kerberos gnupg
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
diff --git a/ipa-python/ipautil.py b/ipa-python/ipautil.py
index 117171c..649a3f2 100644
--- a/ipa-python/ipautil.py
+++ b/ipa-python/ipautil.py
@@ -73,11 +73,13 @@ def write_tmp_file(txt):
     return fd
 
 def run(args, stdin=None):
-    p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
     if stdin:
+        p = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
         stdout,stderr = p.communicate(stdin)
     else:
+        p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
         stdout,stderr = p.communicate()
+
     logging.info(stdout)
     logging.info(stderr)
 
@@ -115,6 +117,67 @@ def backup_file(fname):
     if file_exists(fname):
         os.rename(fname, fname + ".orig")
 
+# uses gpg to compress and encrypt a file
+def encrypt_file(source, dest, password, workdir = None):
+    if type(source) is not StringType or not len(source):
+        raise ValueError('Missing Source File')
+    #stat it so that we get back an exception if it does no t exist
+    os.stat(source)
+
+    if type(dest) is not StringType or not len(dest):
+        raise ValueError('Missing Destination File')
+
+    if type(password) is not StringType or not len(password):
+        raise ValueError('Missing Password')
+
+    #create a tempdir so that we can clean up with easily
+    tempdir = tempfile.mkdtemp('', 'ipa-', workdir)
+    gpgdir = tempdir+"/.gnupg"
+
+    try:
+        try:
+            #give gpg a fake dir so that we can leater remove all
+            #the cruft when we clean up the tempdir
+            os.mkdir(gpgdir)
+            args = ['/usr/bin/gpg', '--homedir', gpgdir, '--passphrase-fd', '0', '--yes', '--no-tty', '-o', dest, '-c', source]
+            run(args, password)
+        except:
+            raise
+    finally:
+        #job done, clean up
+        shutil.rmtree(tempdir, ignore_errors=True)
+
+
+def decrypt_file(source, dest, password, workdir = None):
+    if type(source) is not StringType or not len(source):
+        raise ValueError('Missing Source File')
+    #stat it so that we get back an exception if it does no t exist
+    os.stat(source)
+
+    if type(dest) is not StringType or not len(dest):
+        raise ValueError('Missing Destination File')
+
+    if type(password) is not StringType or not len(password):
+        raise ValueError('Missing Password')
+
+    #create a tempdir so that we can clean up with easily
+    tempdir = tempfile.mkdtemp('', 'ipa-', workdir)
+    gpgdir = tempdir+"/.gnupg"
+
+    try:
+        try:
+            #give gpg a fake dir so that we can leater remove all
+            #the cruft when we clean up the tempdir
+            os.mkdir(gpgdir)
+            args = ['/usr/bin/gpg', '--homedir', gpgdir, '--passphrase-fd', '0', '--yes', '--no-tty', '-o', dest, '-d', source]
+            run(args, password)
+        except:
+            raise
+    finally:
+        #job done, clean up
+        shutil.rmtree(tempdir, ignore_errors=True)
+
+
 class CIDict(dict):
     """
     Case-insensitive but case-respecting dictionary.
-- 
1.5.5.1


freeipa-fix-expire.patch:

--- NEW FILE freeipa-fix-expire.patch ---
>From cb641d756f0b3e55cc795cacbf122d7b0a6b1c77 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Wed, 6 Aug 2008 17:22:51 -0400
Subject: [PATCH] Treat Jan 1 1970 in krbPrincipalExpiration as a special date that means the account Never Expires

---
 .../ipa-pwd-extop/ipa_pwd_extop.c                  |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
index be440e8..56003f2 100644
--- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
+++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
@@ -1240,10 +1240,11 @@ static int ipapwd_CheckPolicy(struct ipapwd_data *data)
 	int tmp, ret;
 	const char *old_pw;
 
-	/* check account is not expired */
+	/* check account is not expired. Ignore unixtime = 0 (Jan 1 1970) */
 	krbPrincipalExpiration = slapi_entry_attr_get_charptr(data->target, "krbPrincipalExpiration");
-	if (krbPrincipalExpiration) {
-		/* if expiration date set check it */
+	if (krbPrincipalExpiration &&
+	    (strcasecmp("19700101000000Z", krbPrincipalExpiration) != 0)) {
+		/* if expiration date is set check it */
 		memset(&tm, 0, sizeof(struct tm));
 		ret = sscanf(krbPrincipalExpiration,
 			     "%04u%02u%02u%02u%02u%02u",
@@ -1261,6 +1262,7 @@ static int ipapwd_CheckPolicy(struct ipapwd_data *data)
 		}
 		/* FIXME: else error out ? */
 	}
+	slapi_ch_free_string(&krbPrincipalExpiration);
 
 	/* find the entry with the password policy */
 	ret = ipapwd_getPolicy(data->dn, data->target, &policy);
-- 
1.5.5.1


freeipa-fix-key-encryption.patch:

--- NEW FILE freeipa-fix-key-encryption.patch ---
>From c5b44f77a1a2fcc19312dc2d5ad2a46836c936a2 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Tue, 12 Aug 2008 16:11:16 -0400
Subject: [PATCH] Comment out code that generates keys with a random salt, apparently this does not work as expected and generates faulty keys

---
 .../ipa-pwd-extop/ipa_pwd_extop.c                  |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
index 1697fb5..909476b 100644
--- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
+++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
@@ -582,6 +582,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 			 * we have to use a more conservative approach and set the salt
 			 * to be REALMprincipal (the concatenation of REALM and principal
 			 * name without any separator) */
+#if 0
 			if (krbTicketFlags & KTF_REQUIRES_PRE_AUTH) {
 				salt.length = KRB5P_SALT_SIZE;
 				salt.data = malloc(KRB5P_SALT_SIZE);
@@ -598,6 +599,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 					goto enc_error;
 				}
 			} else {
+#endif
 				krberr = krb5_principal2salt(krbctx, princ, &salt);
 				if (krberr) {
 					slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
@@ -605,7 +607,9 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 							krb5_get_error_message(krbctx, krberr));
 					goto enc_error;
 				}
+#if 0
 			}
+#endif
 			break;
 
 		case KRB5_KDB_SALTTYPE_V4:
-- 
1.5.5.1


freeipa-refresh-mkey.patch:

--- NEW FILE freeipa-refresh-mkey.patch ---
>From aad877939879b9c5781d90921d5867e48506b223 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Fri, 22 Aug 2008 15:03:50 -0400
Subject: [PATCH] Retrieve the kerberos configuration every time a new, it will be a bit slower
 but will allow for changing configurations without having to restart DS.
 Password operations are slow and rare enough this is an acceptable compromise.

---
 .../ipa-pwd-extop/ipa_pwd_extop.c                  |  482 ++++++++++----------
 1 files changed, 236 insertions(+), 246 deletions(-)

diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
index eae63da..9b746a9 100644
--- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
+++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
@@ -137,27 +137,42 @@ struct ipapwd_encsalt {
 	krb5_int32	salt_type;
 };
 
-struct ipapwd_config {
-	char *realm;
-	krb5_keyblock *kmkey;
-	int num_supp_encsalts;
-	struct ipapwd_encsalt *supp_encsalts;
-	int num_pref_encsalts;
-	struct ipapwd_encsalt *pref_encsalts;
-};
-
 static const char *ipa_realm_dn = NULL;
 
 Slapi_Mutex *ipa_globals = NULL;
 
-static struct ipapwd_config *ipapwd_config = NULL;
-
 static void *ipapwd_plugin_id;
 
 #define IPA_CHANGETYPE_NORMAL 0
 #define IPA_CHANGETYPE_ADMIN 1
 #define IPA_CHANGETYPE_DSMGR 2
 
+struct ipapwd_krbcfg {
+    krb5_context krbctx;
+    char *realm;
+    krb5_keyblock *kmkey;
+    int num_supp_encsalts;
+    struct ipapwd_encsalt *supp_encsalts;
+    int num_pref_encsalts;
+    struct ipapwd_encsalt *pref_encsalts;
+};
+
+static void free_ipapwd_krbcfg(struct ipapwd_krbcfg **cfg)
+{
+    struct ipapwd_krbcfg *c = *cfg;
+
+    if (!c) return;
+
+    krb5_free_default_realm(c->krbctx, c->realm);
+    krb5_free_context(c->krbctx);
+    free(c->kmkey->contents);
+    free(c->kmkey);
+    free(c->supp_encsalts);
+    free(c->pref_encsalts);
+    free(c);
+    *cfg = NULL;
+};
+
 struct ipapwd_data {
 	Slapi_Entry *target;
 	const char *dn;
@@ -218,23 +233,18 @@ static void ipapwd_keyset_free(struct ipapwd_keyset **pkset)
 	*pkset = NULL;
 }
 
-static int filter_keys(struct ipapwd_keyset *kset)
+static int filter_keys(struct ipapwd_krbcfg *krbcfg, struct ipapwd_keyset *kset)
 {
-	struct ipapwd_config *config;
 	int i, j;
 
-	slapi_lock_mutex(ipa_globals);
-	config = ipapwd_config;
-	slapi_unlock_mutex(ipa_globals);
-
 	for (i = 0; i < kset->num_keys; i++) {
-		for (j = 0; j < config->num_supp_encsalts; j++) {
+		for (j = 0; j < krbcfg->num_supp_encsalts; j++) {
 			if (kset->keys[i].ekey->type ==
-					config->supp_encsalts[j].enc_type) {
+					krbcfg->supp_encsalts[j].enc_type) {
 				break;
 			}
 		}
-		if (j == config->num_supp_encsalts) { /* not valid */
+		if (j == krbcfg->num_supp_encsalts) { /* not valid */
 
 			/* free key */
 			if (kset->keys[i].ekey) {
@@ -458,9 +468,10 @@ static inline void encode_int16(unsigned int val, unsigned char *p)
 	p[0] = (val      ) & 0xff;
 }
 
-static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data *data)
+static Slapi_Value **encrypt_encode_key(struct ipapwd_krbcfg *krbcfg,
+					struct ipapwd_data *data)
 {
-	struct ipapwd_config *config;
+	krb5_context krbctx;
 	const char *krbPrincipalName;
 	uint32_t krbMaxTicketLife;
 	int kvno, i;
@@ -472,9 +483,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 	krb5_data pwd;
 	struct ipapwd_keyset *kset = NULL;
 
-	slapi_lock_mutex(ipa_globals);
-	config = ipapwd_config;
-	slapi_unlock_mutex(ipa_globals);
+	krbctx = krbcfg->krbctx;
 
 	svals = (Slapi_Value **)calloc(2, sizeof(Slapi_Value *));
 	if (!svals) {
@@ -524,7 +533,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 	/* we also assum mkvno is 0 */
 	kset->mkvno = 0;
 
-	kset->num_keys = config->num_pref_encsalts;
+	kset->num_keys = krbcfg->num_pref_encsalts;
 	kset->keys = calloc(kset->num_keys, sizeof(struct ipapwd_krbkey));
 	if (!kset->keys) {
 		slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop", "malloc failed!\n");
@@ -542,7 +551,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 
 		salt.data = NULL;
 
-		switch (config->pref_encsalts[i].salt_type) {
+		switch (krbcfg->pref_encsalts[i].salt_type) {
 
 		case KRB5_KDB_SALTTYPE_ONLYREALM:
 
@@ -629,12 +638,12 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 
 		default:
 			slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
-					"Invalid salt type [%d]\n", config->pref_encsalts[i].salt_type);
+					"Invalid salt type [%d]\n", krbcfg->pref_encsalts[i].salt_type);
 			goto enc_error;
 		}
 
 		/* need to build the key now to manage the AFS salt.length special case */
-		krberr = krb5_c_string_to_key(krbctx, config->pref_encsalts[i].enc_type, &pwd, &salt, &key);
+		krberr = krb5_c_string_to_key(krbctx, krbcfg->pref_encsalts[i].enc_type, &pwd, &salt, &key);
 		if (krberr) {
 			slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
 					"krb5_c_string_to_key failed [%s]\n",
@@ -646,7 +655,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 			salt.length = strlen(salt.data);
 		}
 
-		krberr = krb5_c_encrypt_length(krbctx, config->kmkey->enctype, key.length, &len);
+		krberr = krb5_c_encrypt_length(krbctx, krbcfg->kmkey->enctype, key.length, &len);
 		if (krberr) {
 			slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
 					"krb5_c_string_to_key failed [%s]\n",
@@ -672,7 +681,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 		cipher.ciphertext.length = len;
 		cipher.ciphertext.data = (char *)ptr+2;
 
-		krberr = krb5_c_encrypt(krbctx, config->kmkey, 0, 0, &plain, &cipher);
+		krberr = krb5_c_encrypt(krbctx, krbcfg->kmkey, 0, 0, &plain, &cipher);
 		if (krberr) {
 			slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
 					"krb5_c_encrypt failed [%s]\n",
@@ -692,7 +701,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 			goto enc_error;
 		}
 
-		kset->keys[i].salt->type = config->pref_encsalts[i].salt_type;
+		kset->keys[i].salt->type = krbcfg->pref_encsalts[i].salt_type;
 
 		if (salt.length) {
 			kset->keys[i].salt->value.bv_len = salt.length;
@@ -1633,7 +1642,8 @@ static void hexbuf(char *out, const uint8_t *in)
 }
 
 /* Modify the Password attributes of the entry */
-static int ipapwd_SetPassword(struct ipapwd_data *data)
+static int ipapwd_SetPassword(struct ipapwd_krbcfg *krbcfg,
+				struct ipapwd_data *data)
 {
 	int ret = 0, i = 0;
 	Slapi_Mods *smods;
@@ -1648,26 +1658,17 @@ static int ipapwd_SetPassword(struct ipapwd_data *data)
 	int ntlm_flags = 0;
 	Slapi_Value *sambaSamAccount;
 
-	krberr = krb5_init_context(&krbctx);
-	if (krberr) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop", "krb5_init_context failed\n");
-		return LDAP_OPERATIONS_ERROR;
-	}
-
 	slapi_log_error(SLAPI_LOG_TRACE, "ipa_pwd_extop", "=> ipapwd_SetPassword\n");
 
 	smods = slapi_mods_new();
 
 	/* generate kerberos keys to be put into krbPrincipalKey */
-	svals = encrypt_encode_key(krbctx, data);
+	svals = encrypt_encode_key(krbcfg, data);
 	if (!svals) {
 		slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop", "key encryption/encoding failed\n");
-		krb5_free_context(krbctx);
 		ret = LDAP_OPERATIONS_ERROR;
 		goto free_and_return;
 	}
-	/* done with it */
-	krb5_free_context(krbctx);
 
 	slapi_mods_add_mod_values(smods, LDAP_MOD_REPLACE, "krbPrincipalKey", svals);
 
@@ -1756,7 +1757,7 @@ free_and_return:
 	return ret;
 }
 
-static int ipapwd_chpwop(Slapi_PBlock *pb)
+static int ipapwd_chpwop(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg)
 {
 	char 		*bindDN = NULL;
 	char		*authmethod = NULL;
@@ -1772,11 +1773,6 @@ static int ipapwd_chpwop(Slapi_PBlock *pb)
 	Slapi_Entry *targetEntry=NULL;
 	char *attrlist[] = {"*", "passwordHistory", NULL };
 	struct ipapwd_data pwdata;
-	struct ipapwd_config *config;
-
-	slapi_lock_mutex(ipa_globals);
-	config = ipapwd_config;
-	slapi_unlock_mutex(ipa_globals);
 
 	/* Get the ber value of the extended operation */
 	slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_value);
@@ -1973,7 +1969,7 @@ parse_req_done:
 		if (bindexp) {
 			/* special case kpasswd and Directory Manager */
 			if ((strncasecmp(bindexp[0], "krbprincipalname=kadmin/changepw@", 33) == 0) &&
-			    (strcasecmp(&(bindexp[0][33]), config->realm) == 0)) {
+			    (strcasecmp(&(bindexp[0][33]), krbcfg->realm) == 0)) {
 				pwdata.changetype = IPA_CHANGETYPE_NORMAL;
 			}
 			if ((strcasecmp(bindexp[0], "cn=Directory Manager") == 0) &&
@@ -1999,7 +1995,7 @@ parse_req_done:
 	}
 
 	/* Now we're ready to set the kerberos key material */
-	ret = ipapwd_SetPassword(&pwdata);
+	ret = ipapwd_SetPassword(krbcfg, &pwdata);
 	if (ret != LDAP_SUCCESS) {
 		/* Failed to modify the password,
 		 * e.g. because insufficient access allowed */
@@ -2037,9 +2033,8 @@ free_and_return:
 }
 
 /* Password Modify Extended operation plugin function */
-static int ipapwd_setkeytab(Slapi_PBlock *pb)
+static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg)
 {
-	struct ipapwd_config *config;
 	char *bindDN = NULL;
 	char *serviceName = NULL;
 	char *errMesg = NULL;
@@ -2071,10 +2066,6 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb)
 	char timestr[GENERALIZED_TIME_LENGTH+1];
 	time_t time_now = time(NULL);
 
-	slapi_lock_mutex(ipa_globals);
-	config = ipapwd_config;
-	slapi_unlock_mutex(ipa_globals);
-
 	svals = (Slapi_Value **)calloc(2, sizeof(Slapi_Value *));
 	if (!svals) {
 		slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
@@ -2333,7 +2324,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb)
 		plain.length = tval.bv_len;
 		plain.data = tval.bv_val;
 
-		krberr = krb5_c_encrypt_length(krbctx, config->kmkey->enctype, plain.length, &klen);
+		krberr = krb5_c_encrypt_length(krbctx, krbcfg->kmkey->enctype, plain.length, &klen);
 		if (krberr) {
 			free(tval.bv_val);
 			slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop", "krb encryption failed!\n");
@@ -2354,7 +2345,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb)
 		cipher.ciphertext.length = klen;
 		cipher.ciphertext.data = (char *)kdata + 2;
 
-		krberr = krb5_c_encrypt(krbctx, config->kmkey, 0, 0, &plain, &cipher);
+		krberr = krb5_c_encrypt(krbctx, krbcfg->kmkey, 0, 0, &plain, &cipher);
 		if (krberr) {
 			free(tval.bv_val);
 			slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop", "krb encryption failed!\n");
@@ -2421,7 +2412,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb)
 	ber = NULL;
 
 	/* filter un-supported encodings */
-	ret = filter_keys(kset);
+	ret = filter_keys(krbcfg, kset);
 	if (ret) {
 		slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
 				"keyset filtering failed\n");
@@ -2620,168 +2620,182 @@ static int new_ipapwd_encsalt(krb5_context krbctx, const char * const *encsalts,
 	return LDAP_SUCCESS;
 }
 
-static int ipapwd_getConfig(krb5_context krbctx, const char *realm_dn)
+static struct ipapwd_krbcfg *ipapwd_getConfig(const char *realm_dn)
 {
-	struct ipapwd_config *config = NULL;
-	krb5_keyblock *kmkey = NULL;
-	Slapi_Entry *realm_entry = NULL;
-	Slapi_Attr *a;
-	Slapi_Value *v;
-	BerElement *be = NULL;
-	ber_tag_t tag, tmp;
-	ber_int_t ttype;
-	const struct berval *bval;
-	struct berval *mkey = NULL;
-	char **encsalts;
-	int ret;
-
-	config = malloc(sizeof(struct ipapwd_config));
-	if (!config) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Out of memory!\n");
-		goto free_and_error;
-	}
-	kmkey = malloc(sizeof(krb5_keyblock));
-	if (!kmkey) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Out of memory!\n");
-		goto free_and_error;
-	}
-	config->kmkey = kmkey;
-
-	ret = krb5_get_default_realm(krbctx, &config->realm);
-	if (ret) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Failed to get default realm?!\n");
-		goto free_and_error;
-	}
-
-
-	/* get the Realm Container entry */
-	ret = ipapwd_getEntry(realm_dn, &realm_entry, NULL);
-	if (ret != LDAP_SUCCESS) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"No realm Entry?\n");
-		goto free_and_error;
-	}
-
-	/*** get the Kerberos Master Key ***/
+    krb5_error_code krberr;
+    struct ipapwd_krbcfg *config = NULL;
+    krb5_keyblock *kmkey = NULL;
+    Slapi_Entry *realm_entry = NULL;
+    Slapi_Attr *a;
+    Slapi_Value *v;
+    BerElement *be = NULL;
+    ber_tag_t tag, tmp;
+    ber_int_t ttype;
+    const struct berval *bval;
+    struct berval *mkey = NULL;
+    char **encsalts;
+    int ret;
+
+    config = calloc(1, sizeof(struct ipapwd_krbcfg));
+    if (!config) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Out of memory!\n");
+        goto free_and_error;
+    }
+    kmkey = calloc(1, sizeof(krb5_keyblock));
+    if (!kmkey) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Out of memory!\n");
+        goto free_and_error;
+    }
+    config->kmkey = kmkey;
+
+    krberr = krb5_init_context(&config->krbctx);
+    if (krberr) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "krb5_init_context failed\n");
+        goto free_and_error;
+    }
+
+    ret = krb5_get_default_realm(config->krbctx, &config->realm);
+    if (ret) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Failed to get default realm?!\n");
+        goto free_and_error;
+    }
+
+    /* get the Realm Container entry */
+    ret = ipapwd_getEntry(realm_dn, &realm_entry, NULL);
+    if (ret != LDAP_SUCCESS) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "No realm Entry?\n");
+        goto free_and_error;
+    }
+
+    /*** get the Kerberos Master Key ***/
+
+    ret = slapi_entry_attr_find(realm_entry, "krbMKey", &a);
+    if (ret == -1) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "No master key??\n");
+        goto free_and_error;
+    }
+
+    /* there should be only one value here */
+    ret = slapi_attr_first_value(a, &v);
+    if (ret == -1) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "No master key??\n");
+        goto free_and_error;
+    }
+
+    bval = slapi_value_get_berval(v);
+    if (!bval) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Error retrieving master key berval\n");
+        goto free_and_error;
+    }
+
+    be = ber_init(bval);
+    if (!bval) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "ber_init() failed!\n");
+        goto free_and_error;
+    }
+
+    tag = ber_scanf(be, "{i{iO}}", &tmp, &ttype, &mkey);
+    if (tag == LBER_ERROR) {
+        slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_getConfig",
+                        "Bad Master key encoding ?!\n");
+        goto free_and_error;
+    }
+
+    kmkey->magic = KV5M_KEYBLOCK;
+    kmkey->enctype = ttype;
+    kmkey->length = mkey->bv_len;
+    kmkey->contents = malloc(mkey->bv_len);
+    if (!kmkey->contents) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Out of memory!\n");
+        goto free_and_error;
+    }
+    memcpy(kmkey->contents, mkey->bv_val, mkey->bv_len);
+    ber_bvfree(mkey);
+    ber_free(be, 1);
+    mkey = NULL;
+    be = NULL;
+
+    /*** get the Supported Enc/Salt types ***/
+
+    encsalts = slapi_entry_attr_get_charray(realm_entry, "krbSupportedEncSaltTypes");
+    if (encsalts) {
+        ret = new_ipapwd_encsalt(config->krbctx,
+                                 (const char * const *)encsalts,
+                                 &config->supp_encsalts,
+                                 &config->num_supp_encsalts);
+        slapi_ch_array_free(encsalts);
+    } else {
+        slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_getConfig",
+                        "No configured salt types use defaults\n");
+        ret = new_ipapwd_encsalt(config->krbctx,
+                                 ipapwd_def_encsalts,
+                                 &config->supp_encsalts,
+                                 &config->num_supp_encsalts);
+    }
+    if (ret) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Can't get Supported EncSalt Types\n");
+        goto free_and_error;
+    }
+
+    /*** get the Preferred Enc/Salt types ***/
+
+    encsalts = slapi_entry_attr_get_charray(realm_entry, "krbDefaultEncSaltTypes");
+    if (encsalts) {
+        ret = new_ipapwd_encsalt(config->krbctx,
+                                 (const char * const *)encsalts,
+                                 &config->pref_encsalts,
+                                 &config->num_pref_encsalts);
+        slapi_ch_array_free(encsalts);
+    } else {
+        slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_getConfig",
+                        "No configured salt types use defaults\n");
+        ret = new_ipapwd_encsalt(config->krbctx,
+                                 ipapwd_def_encsalts,
+                                 &config->pref_encsalts,
+                                 &config->num_pref_encsalts);
+    }
+    if (ret) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Can't get Preferred EncSalt Types\n");
+        goto free_and_error;
+    }
 
-	ret = slapi_entry_attr_find(realm_entry, "krbMKey", &a);
-	if (ret == -1) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"No master key??\n");
-		goto free_and_error;
-	}
-
-	/* there should be only one value here */
-	ret = slapi_attr_first_value(a, &v);
-	if (ret == -1) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"No master key values??\n");
-		goto free_and_error;
-	}
-
-	bval = slapi_value_get_berval(v);
-	if (!bval) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Error retrieving master key berval\n");
-		goto free_and_error;
-	}
-
-	be = ber_init(bval);
-	if (!bval) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"ber_init() failed!\n");
-		goto free_and_error;
-	}
-
-	tag = ber_scanf(be, "{i{iO}}", &tmp, &ttype, &mkey);
-	if (tag == LBER_ERROR) {
-		slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_start",
-				"Bad Master key encoding ?!\n");
-		goto free_and_error;
-	}
+    slapi_entry_free(realm_entry);
 
-	kmkey->magic = KV5M_KEYBLOCK;
-	kmkey->enctype = ttype;
-	kmkey->length = mkey->bv_len;
-	kmkey->contents = malloc(mkey->bv_len);
-	if (!kmkey->contents) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Out of memory!\n");
-		goto free_and_error;
-	}
-	memcpy(kmkey->contents, mkey->bv_val, mkey->bv_len);
-	ber_bvfree(mkey);
-	ber_free(be, 1);
-
-	/*** get the Supported Enc/Salt types ***/
-
-	encsalts = slapi_entry_attr_get_charray(realm_entry, "krbSupportedEncSaltTypes");
-	if (encsalts) {
-		ret = new_ipapwd_encsalt(krbctx, (const char * const *)encsalts,
-					 &config->supp_encsalts,
-					 &config->num_supp_encsalts);
-		slapi_ch_array_free(encsalts);
-	} else {
-		slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_start",
-				"No configured salt types use defaults\n");
-		ret = new_ipapwd_encsalt(krbctx, ipapwd_def_encsalts,
-					 &config->supp_encsalts,
-					 &config->num_supp_encsalts);
-	}
-	if (ret) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Can't get Supported EncSalt Types\n");
-		goto free_and_error;
-	}
-
-	/*** get the Preferred Enc/Salt types ***/
-
-	encsalts = slapi_entry_attr_get_charray(realm_entry, "krbDefaultEncSaltTypes");
-	if (encsalts) {
-		ret = new_ipapwd_encsalt(krbctx, (const char * const *)encsalts,
-					 &config->pref_encsalts,
-					 &config->num_pref_encsalts);
-		slapi_ch_array_free(encsalts);
-	} else {
-		slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_start",
-				"No configured salt types use defaults\n");
-		ret = new_ipapwd_encsalt(krbctx, ipapwd_def_encsalts,
-					 &config->pref_encsalts,
-					 &config->num_pref_encsalts);
-	}
-	if (ret) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Can't get Preferred EncSalt Types\n");
-		goto free_and_error;
-	}
-
-	/*** set config/replace old config ***/
-
-	/* FIXME: free old one in a safe way, use read locks ? */
-	slapi_lock_mutex(ipa_globals);
-	ipapwd_config = config;
-	slapi_unlock_mutex(ipa_globals);
-
-	slapi_entry_free(realm_entry);
-	return LDAP_SUCCESS;
+    return config;
 
 free_and_error:
-	if (mkey) ber_bvfree(mkey);
-	if (be) ber_free(be, 1);
-	free(config->pref_encsalts);
-	free(config->supp_encsalts);
-	free(config->kmkey);
-	free(config);
-	if (realm_entry) slapi_entry_free(realm_entry);
-	return LDAP_OPERATIONS_ERROR;
+    if (mkey) ber_bvfree(mkey);
+    if (be) ber_free(be, 1);
+    if (kmkey) {
+        free(kmkey->contents);
+        free(kmkey);
+    }
+    if (config) {
+        if (config->krbctx) krb5_free_context(config->krbctx);
+        free(config->pref_encsalts);
+        free(config->supp_encsalts);
+        free(config);
+    }
+    if (realm_entry) slapi_entry_free(realm_entry);
+    return NULL;
 }
 
 
 static int ipapwd_extop(Slapi_PBlock *pb)
 {
+  	struct ipapwd_krbcfg *krbcfg = NULL;
 	char *oid = NULL;
 	char *errMesg = NULL;
 	int ret=0, rc=0, sasl_ssf=0, is_ssl=0;
@@ -2835,30 +2841,6 @@ static int ipapwd_extop(Slapi_PBlock *pb)
 	}
 #endif
 
-	/* make sure we have the master key */
-	if (ipapwd_config == NULL) {
-		krb5_context krbctx;
-		krb5_error_code krberr;
-
-		krberr = krb5_init_context(&krbctx);
-		if (krberr) {
-			slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-					"krb5_init_context failed\n");
-			errMesg = "Fatal Internal Error";
-			rc = LDAP_OPERATIONS_ERROR;
-			goto free_and_return;
-		}
-		ret = ipapwd_getConfig(krbctx, ipa_realm_dn);
-		if (ret != LDAP_SUCCESS) {
-			slapi_log_error(SLAPI_LOG_PLUGIN, "ipa_pwd_extop",
-					"Error Retrieving Master Key");
-			errMesg = "Fatal Internal Error";
-			rc = LDAP_OPERATIONS_ERROR;
-			goto free_and_return;
-		}
-		krb5_free_context(krbctx);
-	}
-
 	/* Before going any further, we'll make sure that the right extended
 	 * operation plugin has been called: i.e., the OID shipped whithin the
 	 * extended operation request must match this very plugin's OIDs:
@@ -2873,11 +2855,25 @@ static int ipapwd_extop(Slapi_PBlock *pb)
 				"Received extended operation request with OID %s\n", oid);
 	}
 
+	/* get the kerberos context and master key */
+	krbcfg = ipapwd_getConfig(ipa_realm_dn);
+	if (NULL == krbcfg) {
+		slapi_log_error(SLAPI_LOG_PLUGIN, "ipa_pwd_extop",
+				"Error Retrieving Master Key");
+		errMesg = "Fatal Internal Error";
+		rc = LDAP_OPERATIONS_ERROR;
+		goto free_and_return;
+	}
+
 	if (strcasecmp(oid, EXOP_PASSWD_OID) == 0) {
-		return ipapwd_chpwop(pb);
+		ret = ipapwd_chpwop(pb, krbcfg);
+		free_ipapwd_krbcfg(&krbcfg);
+		return ret;
 	}
 	if (strcasecmp(oid, KEYTAB_SET_OID) == 0) {
-		return ipapwd_setkeytab(pb);
+		ret = ipapwd_setkeytab(pb, krbcfg);
+		free_ipapwd_krbcfg(&krbcfg);
+		return ret;
 	}
 
 	errMesg = "Request OID does not match supported OIDs.\n";
@@ -2952,12 +2948,6 @@ static int ipapwd_start( Slapi_PBlock *pb )
 	ipa_realm_dn = realm_dn;
 	slapi_unlock_mutex(ipa_globals);
 
-	ret = ipapwd_getConfig(krbctx, ipa_realm_dn);
-	if (ret) {
-		slapi_log_error( SLAPI_LOG_PLUGIN, "ipapwd_start", "Couldn't init master key at start delaying ...");
-		ret = LDAP_SUCCESS;
-	}
-
 	krb5_free_context(krbctx);
 	slapi_entry_free(config_entry);
 	return ret;
-- 
1.5.5.1


freeipa-user-input.patch:

--- NEW FILE freeipa-user-input.patch ---
>From f7ca405716b1ee8b92a940e07cd611f6b025795d Mon Sep 17 00:00:00 2001
From: Martin Nagy <mnagy at notas.(none)>
Date: Mon, 21 Jul 2008 12:25:37 +0200
Subject: [PATCH] Wrap up the raw_input() to user_input() for convenience and uniformity.

---
 ipa-admintools/ipa-addgroup                   |   17 +------
 ipa-admintools/ipa-adduser                    |   50 ++----------------
 ipa-admintools/ipa-moduser                    |   57 +++-------------------
 ipa-client/ipa-install/ipa-client-install     |   23 ++------
 ipa-python/ipautil.py                         |   66 +++++++++++++++++++++++++
 ipa-radius-server/ipa-radius-install          |    3 +-
 ipa-server/ipa-install/ipa-replica-install    |   10 +---
 ipa-server/ipa-install/ipa-server-certinstall |   19 ++-----
 ipa-server/ipa-install/ipa-server-install     |   64 +++++++++---------------
 9 files changed, 119 insertions(+), 190 deletions(-)

diff --git a/ipa-admintools/ipa-addgroup b/ipa-admintools/ipa-addgroup
index caf4e93..cc81383 100644
--- a/ipa-admintools/ipa-addgroup
+++ b/ipa-admintools/ipa-addgroup
@@ -81,29 +81,16 @@ def main():
     if options.usage:
         usage()
 
-    cont = False
-
     if (len(args) != 2):
-        while (cont != True):
-            cn = raw_input("Group name: ")
-            if (ipavalidate.String(cn, notEmpty=True)):
-                print "Please enter a value"
-            else:
-                cont = True
+        cn = ipautil.user_input("Group name", allow_empty = False)
     else:
         cn = args[1]
         if (ipavalidate.String(cn, notEmpty=True)):
             print "Please enter a value"
             return 1
 
-    cont = False
     if not options.desc:
-        while (cont != True):
-            desc = raw_input("Description: ")
-            if (ipavalidate.String(desc, notEmpty=True)):
-                print "Please enter a value"
-            else:
-                cont = True
+        desc = ipautil.user_input("Description", allow_empty = False)
     else:
         desc = options.desc
         if (ipavalidate.String(desc, notEmpty=True)):
diff --git a/ipa-admintools/ipa-adduser b/ipa-admintools/ipa-adduser
index 2c32d1e..17c75ed 100644
--- a/ipa-admintools/ipa-adduser
+++ b/ipa-admintools/ipa-adduser
@@ -102,7 +102,6 @@ def main():
     groups = ""
 
     match = False
-    cont = False
 
     all_interactive = False
 
@@ -116,40 +115,23 @@ def main():
         all_interactive = True
 
     if not options.gn:
-        while (cont != True):
-            givenname = raw_input("First name: ")
-            if (ipavalidate.String(givenname, notEmpty=True)):
-                print "Please enter a value"
-            else:
-                cont = True
+        givenname = ipautil.user_input("First name", allow_empty = False)
     else:
         givenname = options.gn
         if (ipavalidate.String(givenname, notEmpty=True)):
             print "Please enter a value"
             return 1
 
-    cont = False
     if not options.sn:
-        while (cont != True):
-            lastname = raw_input("Last name: ")
-            if (ipavalidate.String(lastname, notEmpty=True)):
-                print "Please enter a value"
-            else:
-                cont = True
+        lastname = ipautil.user_input("Last name", allow_empty = False)
     else:
         lastname = options.sn
         if (ipavalidate.String(lastname, notEmpty=True)):
             print "Please enter a value"
             return 1
 
-    cont = False
     if (len(args) != 2):
-        while (cont != True):
-            username = raw_input("Login name: ")
-            if (ipavalidate.Plain(username, notEmpty=True, allowSpaces=False)):
-                print "Please enter a value"
-            else:
-                cont = True
+        username = ipautil.user_input_plain("Login name", allow_empty = False, allow_spaces = False)
     else:
         username = args[1]
         if (ipavalidate.Plain(username, notEmpty=True, allowSpaces=False)):
@@ -180,32 +162,12 @@ def main():
     # Ask the questions we don't normally force. We don't require answers
     # for these.
     if all_interactive is True:
-        cont = False
         if not options.gecos:
-            while (cont != True):
-                gecos = raw_input("gecos []: ")
-                if (ipavalidate.String(gecos, notEmpty=False)):
-                    print "Please enter a value"
-                else:
-                    cont = True
-        cont = False
+            gecos = ipautil.user_input("gecos")
         if not options.directory:
-            while (cont != True):
-                directory = raw_input("home directory [/home/"+username+"]: ")
-                if directory == "":
-                     directory = "/home/"+username
-                if (ipavalidate.Path(directory, notEmpty=False)):
-                    print "Please enter a value"
-                else:
-                    cont = True
-        cont = False
+            directory = ipautil.user_input_path("Home directory", "/home/" + username, allow_empty = True)
         if not options.shell:
-            while (cont != True):
-                shell = raw_input("shell [/bin/sh]: ")
-
-                if len(shell) < 1:
-                    shell = None
-                cont = True
+            shell = ipautil.user_input("Shell", "/bin/sh", allow_empty = False)
 
     else:
         gecos = options.gecos
diff --git a/ipa-admintools/ipa-moduser b/ipa-admintools/ipa-moduser
index 22f2318..4b3bd5c 100644
--- a/ipa-admintools/ipa-moduser
+++ b/ipa-admintools/ipa-moduser
@@ -97,7 +97,6 @@ def main():
     shell = ""
 
     match = False
-    cont = False
 
     options, args = parse_options()
 
@@ -141,46 +140,23 @@ def main():
         shell = options.shell
     else:
         if not options.gn:
-            while (cont != True):
-                givenname = raw_input("First name: [%s] " % user.getValue('givenname'))
-                if (ipavalidate.String(givenname, notEmpty=False)):
-                    print "Please enter a value"
-                else:
-                    cont = True
-                if len(givenname) < 1:
-                    givenname = None
-                    cont = True
+            givenname = ipautil.user_input("First name", user.getValue('givenname'), allow_empty = False)
         else:
             givenname = options.gn
             if (ipavalidate.String(givenname, notEmpty=True)):
                 print "Please enter a value"
                 return 1
 
-        cont = False
         if not options.sn:
-            while (cont != True):
-                lastname = raw_input(" Last name: [%s] " % user.getValue('sn'))
-                if (ipavalidate.String(lastname, notEmpty=False)):
-                    print "Please enter a value"
-                else:
-                    cont = True
-                if len(lastname) < 1:
-                    lastname = None
-                    cont = True
+            lastname = ipautil.user_input("Last name", user.getValue('sn'), allow_empty = False)
         else:
             lastname = options.sn
             if (ipavalidate.String(lastname, notEmpty=True)):
                 print "Please enter a value"
                 return 1
 
-        cont = False
         if not options.mail:
-            while (cont != True):
-                mail = raw_input("E-mail addr: [%s]" % user.getValue('mail'))
-                if (ipavalidate.Email(mail, notEmpty=False)):
-                    print "E-mail must include a user and domain name"
-                else:
-                    cont = True
+            mail = ipautil.user_input_email("E-mail address", user.getValue('mail'), allow_empty = True)
         else:
             mail = options.mail
             if (ipavalidate.Email(mail)):
@@ -189,32 +165,13 @@ def main():
 
         # Ask the questions we don't normally force. We don't require answers
         # for these.
-        cont = False
         if not options.gecos:
-            while (cont != True):
-                gecos = raw_input("gecos: [%s] " % user.getValue('gecos'))
-                if (ipavalidate.String(gecos, notEmpty=False)):
-                    print "Please enter a value"
-                else:
-                    cont = True
+            gecos = ipautil.user_input("gecos", user.getValue('gecos'))
 
-        cont = False
         if not options.directory:
-            while (cont != True):
-                directory = raw_input("home directory: [%s] " % user.getValue('homeDirectory'))
-                if (ipavalidate.Path(gecos, notEmpty=False)):
-                    print "Valid path is required"
-                else:
-                    cont = True
-        cont = False
+            directory = ipautil.user_input_path("Home directory", user.getValue('homeDirectory'))
         if not options.shell:
-            while (cont != True):
-                shell = raw_input("shell: [%s] " % user.getValue('loginshell'))
-
-                if len(shell) < 1:
-                    shell = None
-                    cont = True
-        cont = False
+            shell = ipautil.user_input("Shell", user.getValue('loginshell'), allow_empty = False)
 
     if givenname:
         user.setValue('givenname', givenname)
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index ecdf927..eec36e4 100644
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -30,7 +30,7 @@ try:
     import ipaclient.ipadiscovery
     import ipaclient.ipachangeconf
     import ipaclient.ntpconf
-    from ipa.ipautil import run
+    from ipa.ipautil import run, user_input
     from ipa import sysrestore
     from ipa import version
 except ImportError:
@@ -70,13 +70,6 @@ def parse_options():
 
     return options
 
-def ask_for_confirmation(message):
-    yesno = raw_input(message + " [y/N]: ")
-    if not yesno or yesno.lower()[0] != "y":
-        return False
-    print "\n"
-    return True
-
 def logging_setup(options):
     # Always log everything (i.e., DEBUG) to the log
     # file.
@@ -124,7 +117,7 @@ def uninstall(options):
         print "The original nsswitch.conf configuration has been restored."
         print "You may need to restart services or reboot the machine."
         if not options.on_master:
-            if ask_for_confirmation("Do you want to reboot the machine?"):
+            if user_input("Do you want to reboot the machine?", False):
                 try:
                     run(["/usr/bin/reboot"])
                 except Exception, e:
@@ -163,9 +156,7 @@ def main():
             return ret
         else:
             print "DNS discovery failed to determine your DNS domain"
-            cli_domain = ""
-            while cli_domain == "":
-                cli_domain = raw_input("Please provide the domain name of your IPA server (ex: example.com): ")
+            cli_domain = user_input("Please provide the domain name of your IPA server (ex: example.com)", allow_empty = False)
         ret = ds.search(domain=cli_domain, server=options.server)
     if not cli_domain:
         if ds.getDomainName():
@@ -180,9 +171,7 @@ def main():
             return ret
         else:
             print "DNS discovery failed to find the IPA Server"
-            cli_server = ""
-            while cli_server == "":
-                cli_server = raw_input("Please provide your IPA server name (ex: ipa.example.com): ")
+            cli_server = user_input("Please provide your IPA server name (ex: ipa.example.com)", allow_empty = False)
         ret = ds.search(domain=cli_domain, server=cli_server)
     if not cli_server:
         if ds.getServerName():
@@ -203,7 +192,7 @@ def main():
         print "If you proceed with the installation, services will be configured to always"
         print "access the discovered server for all operation and will not fail over to"
         print "other servers in case of failure.\n"
-        if not ask_for_confirmation("Do you want to proceed and configure the system with fixed values with no DNS discovery?"):
+        if not user_input("Do you want to proceed and configure the system with fixed values with no DNS discovery?", False):
             return ret
 
     if options.realm_name and options.realm_name != ds.getRealmName():
@@ -220,7 +209,7 @@ def main():
     print "BaseDN: "+cli_basedn
 
     print "\n"
-    if not options.unattended and not ask_for_confirmation("Continue to configure the system with these values?"):
+    if not options.unattended and not user_input("Continue to configure the system with these values?", False):
         return 1
 
     # Configure ipa.conf
diff --git a/ipa-python/ipautil.py b/ipa-python/ipautil.py
index 4e065fc..3526cc7 100644
--- a/ipa-python/ipautil.py
+++ b/ipa-python/ipautil.py
@@ -29,6 +29,7 @@ import os, sys, traceback, readline
 import stat
 import shutil
 
+from ipa import ipavalidate
 from types import *
 
 import re
@@ -482,6 +483,71 @@ def read_items_file(filename):
     if fd != sys.stdin: fd.close()
     return items
 
+def user_input(prompt, default = None, allow_empty = True):
+    if default == None:
+        while True:
+            ret = raw_input("%s: " % prompt)
+            if allow_empty or ret.strip():
+                return ret
+                
+    if isinstance(default, basestring):
+        while True:
+            ret = raw_input("%s [%s]: " % (prompt, default))
+            if not ret and (allow_empty or default):
+                return default
+            elif ret.strip():
+                return ret
+    if isinstance(default, bool):
+        if default:
+            choice = "yes"
+        else:
+            choice = "no"
+        while True:
+            ret = raw_input("%s [%s]: " % (prompt, choice))
+            if not ret:
+                return default
+            elif ret.lower()[0] == "y":
+                return True
+            elif ret.lower()[0] == "n":
+                return False
+    if isinstance(default, int):
+        while True:
+            try:
+                ret = raw_input("%s [%s]: " % (prompt, default))
+                if not ret:
+                    return default
+                ret = int(ret)
+            except ValueError:
+                pass
+            else:
+                return ret
+
+def user_input_email(prompt, default = None, allow_empty = False):
+    if default != None and allow_empty:
+        prompt += " (enter \"none\" for empty)"
+    while True:
+        ret = user_input(prompt, default, allow_empty)
+        if allow_empty and ret.lower() == "none":
+            return ""
+        if not ipavalidate.Email(ret, not allow_empty):
+            return ret.strip()
+
+def user_input_plain(prompt, default = None, allow_empty = True, allow_spaces = True):
+    while True:
+        ret = user_input(prompt, default, allow_empty)
+        if not ipavalidate.Plain(ret, not allow_empty, allow_spaces):
+            return ret
+
+def user_input_path(prompt, default = None, allow_empty = True):
+    if default != None and allow_empty:
+        prompt += " (enter \"none\" for empty)"
+    while True:
+        ret = user_input(prompt, default, allow_empty)
+        if allow_empty and ret.lower() == "none":
+            return ""
+        if not ipavalidate.Path(ret, not allow_empty):
+            return ret
+
 
 class AttributeValueCompleter:
     '''
diff --git a/ipa-radius-server/ipa-radius-install b/ipa-radius-server/ipa-radius-install
index 8ed3aab..83215b3 100644
--- a/ipa-radius-server/ipa-radius-install
+++ b/ipa-radius-server/ipa-radius-install
@@ -45,8 +45,7 @@ def main():
     if not ipautil.file_exists("/etc/ipa/ipa.conf"):
         print "This system does not appear to have IPA configured."
         print "Has ipa-server-install been run?"
-        yesno = raw_input("Continue with radius install [y/N]? ")
-        if yesno.lower() != "y":
+        if not ipautil.user_input("Continue with radius install?", False):
             sys.exit(1)
 
     installutils.standard_logging_setup("iparadius-install.log", False)
diff --git a/ipa-server/ipa-install/ipa-replica-install b/ipa-server/ipa-install/ipa-replica-install
index 31fd4cc..ab66a83 100644
--- a/ipa-server/ipa-install/ipa-replica-install
+++ b/ipa-server/ipa-install/ipa-replica-install
@@ -145,8 +145,7 @@ def check_dirsrv():
     if serverids:
         print ""
         print "An existing Directory Server has been detected."
-        yesno = raw_input("Do you wish to remove it and create a new one? [no]: ")
-        if not yesno or yesno.lower()[0] != "y":
+        if not ipautil.user_input("Do you wish to remove it and create a new one?", False):
             print ""
             print "Only a single Directory Server instance is allowed on an IPA"
             print "server, the one used by IPA itself."
@@ -189,12 +188,9 @@ def main():
     if host != config.host_name:
         try:
             print "This replica was created for '%s' but this machine is named '%s'" % (host, config.host_name)
-            yesno = raw_input("This may cause problems. Continue? [Y/n]: ")
-            print ""
-            if not yesno or yesno.lower()[0] == "y":
-                pass
-            else:
+            if not ipautil.user_input("This may cause problems. Continue?", True):
                 sys.exit(0)
+            print ""
         except KeyboardInterrupt:
             sys.exit(0)
     config.repl_password = ipautil.ipa_generate_password()
diff --git a/ipa-server/ipa-install/ipa-server-certinstall b/ipa-server/ipa-install/ipa-server-certinstall
index 835af0a..a0d1185 100644
--- a/ipa-server/ipa-install/ipa-server-certinstall
+++ b/ipa-server/ipa-install/ipa-server-certinstall
@@ -27,6 +27,7 @@ import traceback
 
 import krbV, ldap, getpass
 
+from ipa.ipautil import user_input
 from ipaserver import certs, dsinstance, httpinstance, ipaldap, installutils
 
 def get_realm_name():
@@ -76,25 +77,15 @@ def choose_server_cert(server_certs):
         print "%d. %s" % (num, cert[0])
         num += 1
         
-    cert_num = 0
     while 1:
-        cert_input = raw_input("Certificate number [1]: ")
+        num = user_input("Certificate number", 1)
         print ""
-        if cert_input == "":
-            break
+        if num < 1 or num > len(server_certs):
+            print "number out of range"
         else:
-            try:
-                num = int(cert_input)
-            except ValueError:
-                print "invalid number"
-                continue
-            if num > len(server_certs):
-                print "number out of range"
-                continue
-            cert_num = num - 1
             break
-    return server_certs[cert_num]
     
+    return server_certs[num - 1]
 
 def import_cert(dirname, pkcs12_fname):
     cdb = certs.CertDB(dirname)
diff --git a/ipa-server/ipa-install/ipa-server-install b/ipa-server/ipa-install/ipa-server-install
index 8b5b831..ce300cc 100644
--- a/ipa-server/ipa-install/ipa-server-install
+++ b/ipa-server/ipa-install/ipa-server-install
@@ -120,7 +120,6 @@ def signal_handler(signum, frame):
     sys.exit(1)
 
 def read_host_name(host_default):
-    host_ok = False
     host_name = ""
 
     print "Enter the fully qualified domain name of the computer"
@@ -131,19 +130,15 @@ def read_host_name(host_default):
     print ""
     if host_default == "":
         host_default = "master.example.com"
-    while not host_ok:
-        host_input = raw_input("Server host name [" + host_default + "]: ")
+    while True:
+        host_name = user_input("Server host name", host_default, allow_empty = False)
         print ""
-        if host_input == "":
-            host_name = host_default
-        else:
-            host_name = host_input
         try:
             verify_fqdn(host_name)
         except Exception, e:
             raise e
         else:
-            host_ok = True
+            break
     return host_name
 
 def resolve_host(host_name):
@@ -178,10 +173,8 @@ def verify_ip_address(ip):
 
 def read_ip_address(host_name):
     while True:
-        ip = raw_input("Please provide the IP address to be used for this host name: ")
+        ip = user_input("Please provide the IP address to be used for this host name", allow_empty = False)
 
-        if ip == "":
-            continue
         if ip == "127.0.0.1" or ip == "::1":
             print "The IPA Server can't use localhost as a valid IP"
             continue
@@ -213,13 +206,12 @@ def read_ds_user():
         print "A user account named 'dirsrv' already exists. This is the user id"
         print "that the Directory Server will run as."
         print ""
-        yesno = raw_input("Do you want to use the existing 'dirsrv' account? [yes]: ")
-        print ""
-        if not yesno or yesno.lower()[0] != "n":
+        if user_input("Do you want to use the existing 'dirsrv' account?", True):
             ds_user = "dirsrv"
         else:
-            ds_user = raw_input("Which account name do you want to use for the DS instance? ")
             print ""
+            ds_user = user_input_plain("Which account name do you want to use for the DS instance?", allow_empty = False, allow_spaces = False)
+        print ""
     except KeyError:
         ds_user = "dirsrv"
 
@@ -229,37 +221,31 @@ def read_domain_name(domain_name, unattended):
     print "The domain name has been calculated based on the host name."
     print ""
     if not unattended:
-        dn = raw_input("Please confirm the domain name ["+domain_name+"]: ")
+        domain_name = user_input("Please confirm the domain name", domain_name)
         print ""
-        if dn != "":
-            domain_name = dn
     return domain_name
 
 def read_realm_name(domain_name, unattended):
     print "The kerberos protocol requires a Realm name to be defined."
     print "This is typically the domain name converted to uppercase."
     print ""
-    upper_dom = domain_name.upper()
+    
     if unattended:
-        realm_name = upper_dom
-    else:
-        realm_name = raw_input("Please provide a realm name ["+upper_dom+"]: ")
-        print ""
-        if realm_name == "":
-            realm_name = upper_dom
-        else:
-            upper_dom = realm_name.upper()
-        if upper_dom != realm_name:
-            print "An upper-case realm name is required."
-            dom_realm = raw_input("Do you want to use "+upper_dom+" as realm name ? [yes]: ")
+        return domain_name.upper()
+    realm_name = user_input("Please provide a realm name", domain_name.upper())
+    upper_dom = realm_name.upper()
+    if upper_dom != realm_name:
+        print "An upper-case realm name is required."
+        if not user_input("Do you want to use " + upper_dom + " as realm name?", True):
             print ""
-            if dom_realm and dom_realm.lower()[0] != "y":
-                print "An upper-case realm name is required. Unable to continue."
-                sys.exit(1)
-            else:
-                realm_name = upper_dom
+            print "An upper-case realm name is required. Unable to continue."
+            sys.exit(1)
+        else:
+            realm_name = upper_dom
+        print ""
     return realm_name
 
+
 def read_dm_password():
     print "Certain directory server operations require an administrative user."
     print "This user is referred to as the Directory Manager and has full access"
@@ -284,10 +270,7 @@ def check_dirsrv(unattended):
     if serverids:
         print ""
         print "An existing Directory Server has been detected."
-        if unattended:
-            sys.exit(1)
-        yesno = raw_input("Do you wish to remove it and create a new one? [no]: ")
-        if not yesno or yesno.lower()[0] != "y":
+        if unattended or user_input("Do you wish to remove it and create a new one?", False):
             print ""
             print "Only a single Directory Server instance is allowed on an IPA"
             print "server, the one used by IPA itself."
@@ -354,8 +337,7 @@ def main():
     if options.uninstall:
         if not options.unattended:
             print "\nThis is a NON REVERSIBLE operation and will delete all data and configuration!\n"
-            yesno = raw_input("Are you sure you want to continue with the uninstall procedure?:[NO/yes] ")
-            if not yesno or yesno.lower() != "yes":
+            if not user_input("Are you sure you want to continue with the uninstall procedure?", False):
                 print ""
                 print "Aborting uninstall operation."
                 sys.exit(1)
-- 
1.5.5.1



Index: ipa.spec
===================================================================
RCS file: /cvs/extras/rpms/ipa/F-8/ipa.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ipa.spec	29 Jun 2008 16:44:07 -0000	1.12
+++ ipa.spec	10 Sep 2008 21:05:16 -0000	1.13
@@ -6,7 +6,7 @@
 
 Name:           ipa
 Version:        1.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -20,6 +20,17 @@
 Patch3:         freeipa-memberofindex.patch
 Patch4:         freeipa-index.patch
 Patch5:         0001-slapi_pw_find_sv-expects-an-array-make-sure-we-ha.patch
+Patch6:         0001-Fix-typo-in-inet-type.patch
+Patch7:         0001-In-openvz-we-found-out-some-interfaces-may-return-a.patch
+
+Patch101:	freeipa-refresh-mkey.patch
+Patch102:	freeipa-fix-expire.patch
+Patch103:	freeipa-fix-key-encryption.patch
+Patch104:	freeipa-user-input.patch
+Patch105:	freeipa-encrypt-files.patch
+Patch106:	freeipa-change-mkey.patch
+Patch107:	freeipa-cve-2008-3274-fixes.patch
+Patch108:	freeipa-cve-2008-3274-utility.patch
 
 BuildRequires:  fedora-ds-base-devel >= 1.1
 BuildRequires:  mozldap-devel
@@ -189,6 +200,19 @@
 %patch3 -p1 -b memberofindex
 %patch4 -p1 -b index
 %patch5 -p1 -b changepw
+%patch6 -p1 -b af-inet-fix
+%patch7 -p1 -b kpasswd-segfault
+
+#START CVE-2008-3274 block
+%patch101 -p1 -b refresh-mkey
+%patch102 -p1 -b fix-expire
+%patch103 -p1 -b fix-key-encryption
+%patch104 -p1 -b user-input
+%patch105 -p1 -b encrypt-files
+%patch106 -p1 -b change-mkey
+%patch107 -p1 -b cve-2008-3274-fixes
+%patch108 -p1 -b cve-2008-3274-utility
+#END CVE-2008-3274 block
 
 %build
 cd ipa-server; ./autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir} --with-openldap=yes; cd ..
@@ -388,6 +412,8 @@
 %{_sbindir}/ipa-passwd
 %{_sbindir}/ipa-moduser
 %{_sbindir}/ipa-pwpolicy
+%{_sbindir}/ipa-change-master-key
+%{_sbindir}/ipa-fix-CVE-2008-3274
 %{_mandir}/man1/ipa-adddelegation.1.gz
 %{_mandir}/man1/ipa-addgroup.1.gz
 %{_mandir}/man1/ipa-addservice.1.gz
@@ -437,6 +463,10 @@
 %{_sbindir}/ipa-modradiusprofile
 
 %changelog
+* Wed Sep 10 2008 Simo Sorce <ssorce at redhat.com> - 1.1.0-4
+- Fix for CVE-2008-3274
+- Fix segfault in ipa-kpasswd in case getifaddrs returns a NULL interface
+
 * Sun Jun 29 2008 Simo Sorce <ssorce at redhat.com> - 1.1.0-3
 - Add fix for bug #453185
 



From pkgdb at fedoraproject.org  Wed Sep 10 21:20:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 21:20:56 +0000
Subject: [pkgdb] perl-Locale-Maketext-Simple: iburrell has requested
	watchcommits
Message-ID: <20080910212056.7C6C7208D97@bastion.fedora.phx.redhat.com>

iburrell has requested the watchcommits acl on perl-Locale-Maketext-Simple (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Simple



From pkgdb at fedoraproject.org  Wed Sep 10 21:20:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 21:20:56 +0000
Subject: [pkgdb] perl-Locale-Maketext-Simple: iburrell has requested
	watchbugzilla
Message-ID: <20080910212056.B9B8A208D9A@bastion.fedora.phx.redhat.com>

iburrell has requested the watchbugzilla acl on perl-Locale-Maketext-Simple (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Simple



From pkgdb at fedoraproject.org  Wed Sep 10 21:20:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 21:20:58 +0000
Subject: [pkgdb] perl-Locale-Maketext-Simple: iburrell has requested commit
Message-ID: <20080910212058.5CACD208D9C@bastion.fedora.phx.redhat.com>

iburrell has requested the commit acl on perl-Locale-Maketext-Simple (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Simple



From spot at fedoraproject.org  Wed Sep 10 21:29:12 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 10 Sep 2008 21:29:12 +0000 (UTC)
Subject: rpms/gambas2/devel .cvsignore, 1.6, 1.7 gambas2.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20080910212912.0DBC17012F@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/gambas2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23643/devel

Modified Files:
	.cvsignore gambas2.spec sources 
Log Message:
update to 2.8.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Aug 2008 17:15:39 -0000	1.6
+++ .cvsignore	10 Sep 2008 21:28:41 -0000	1.7
@@ -1 +1 @@
-gambas2-2.8.1.tar.bz2
+gambas2-2.8.2.tar.bz2


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/devel/gambas2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gambas2.spec	22 Aug 2008 17:15:39 -0000	1.5
+++ gambas2.spec	10 Sep 2008 21:28:41 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		gambas2
 Summary:	IDE based on a basic interpreter with object extensions
-Version:	2.8.1
+Version:	2.8.2
 Release:	1%{?dist}
 License:	GPL+
 Group:		Development/Tools
@@ -22,8 +22,6 @@
 Patch0:		%{name}-2.0.0-use-system-ltdl.patch
 Patch1:		%{name}-2.0.0-nolintl.patch
 Patch2:		%{name}-2.0.0-noliconv.patch
-Patch3:		%{name}-2.2.1-noO0.patch
-Patch4:		%{name}-2.2.1-noOs.patch
 
 %description
 Gambas2 is a free development environment based on a Basic interpreter
@@ -81,6 +79,7 @@
 Requires:	%{name}-gb-compress = %{version}-%{release}
 Requires: 	%{name}-gb-crypt = %{version}-%{release}
 Requires:	%{name}-gb-db = %{version}-%{release}
+Requires:	%{name}-gb-db-form = %{version}-%{release}
 Requires:	%{name}-gb-desktop = %{version}-%{release}
 Requires:	%{name}-gb-form = %{version}-%{release}
 Requires:	%{name}-gb-form-dialog = %{version}-%{release}
@@ -153,6 +152,14 @@
 %description gb-db
 %{summary}
 
+%package gb-db-form
+Summary:	Gambas2 component package for db-form
+Group:		Development/Tools
+Requires:	%{name}-runtime = %{version}-%{release}
+
+%description gb-db-form
+%{summary}
+
 %package gb-desktop
 Summary:	Gambas2 component package for desktop
 Group:		Development/Tools
@@ -407,8 +414,22 @@
 %patch0 -p1
 %patch1 -p1 -b .nolintl
 %patch2 -p1 -b .noliconv
-%patch3 -p1 -b .noO0
-%patch4 -p1 -b .noOs
+# We used to patch these out, but this is simpler.
+for i in acinclude.m4 gb.compress.bzlib2/configure gb.compress.zlib/configure gb.corba/configure \
+	 gb.crypt/configure gb.db.firebird/configure gb.db.mysql/configure gb.db.odbc/configure \
+	 gb.db.postgresql/configure gb.db.sqlite2/configure gb.db.sqlite3/configure gb.desktop/configure \
+	 gb.gtk/configure gb.gtk.svg/configure gb.image/configure gb.net/configure gb.net.curl/configure \
+	 gb.net.smtp/configure gb.opengl/configure gb.pcre/configure gb.pdf/configure gb.qt/configure \
+	 gb.qte/configure gb.qt.kde/configure gb.sdl/configure gb.sdl.sound/configure gb.v4l/configure \
+	 gb.xml/configure help/configure main/configure; do
+	sed -i 's|$AM_CFLAGS -O3|$AM_CFLAGS|g' $i
+	sed -i 's|$AM_CXXFLAGS -Os -fno-omit-frame-pointer|$AM_CXXFLAGS|g' $i
+	sed -i 's|$AM_CFLAGS -Os|$AM_CFLAGS|g' $i
+	sed -i 's|$AM_CFLAGS -O0|$AM_CFLAGS|g' $i
+	sed -i 's|$AM_CXXFLAGS -O0|$AM_CXXFLAGS|g' $i
+done
+
+
 ./reconf-all
 
 # clean up some spurious exec perms
@@ -1256,8 +1277,20 @@
 
 %files gb-db
 %defattr(-, root, root, 0755)
-%{_libdir}/%{name}/gb.db.*
-%{_datadir}/%{name}/info/gb.db.*
+%{_libdir}/%{name}/gb.db.component
+%{_libdir}/%{name}/gb.db.la
+%{_libdir}/%{name}/gb.db.mysql.*
+%{_libdir}/%{name}/gb.db.odbc.*
+%{_libdir}/%{name}/gb.db.postgresql.*
+%{_libdir}/%{name}/gb.db.so*
+%{_libdir}/%{name}/gb.db.sqlite3.*
+%{_datadir}/%{name}/info/gb.db.info
+%{_datadir}/%{name}/info/gb.db.list
+
+%files gb-db-form
+%defattr(-, root, root, 0755)
+%{_libdir}/%{name}/gb.db.form.*
+%{_datadir}/%{name}/info/gb.db.form.*
 
 %files gb-desktop
 %defattr(-, root, root, 0755)
@@ -1457,6 +1490,10 @@
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
+* Wed Sep 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.8.2-1
+- update to 2.8.2
+- make gb-db-form subpackage (bz 461595)
+
 * Thu Aug 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.8.1-1
 - update to 2.8.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Aug 2008 17:15:39 -0000	1.6
+++ sources	10 Sep 2008 21:28:41 -0000	1.7
@@ -1 +1 @@
-94898663d4b8c093dcb432d3cfa2e777  gambas2-2.8.1.tar.bz2
+9f0d1c450b22580eccf3a0e3619a9d7c  gambas2-2.8.2.tar.bz2



From spot at fedoraproject.org  Wed Sep 10 21:29:11 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 10 Sep 2008 21:29:11 +0000 (UTC)
Subject: rpms/gambas2/F-9 gambas2-2.0.0-noliconv.patch, 1.1,
	1.2 gambas2-2.0.0-nolintl.patch, 1.1,
	1.2 gambas2-2.2.1-noO0.patch, 1.1, 1.2 gambas2-2.2.1-noOs.patch,
	1.1, 1.2 gambas2.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20080910212911.ED9DE7012C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/gambas2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23643/F-9

Modified Files:
	gambas2-2.0.0-noliconv.patch gambas2-2.0.0-nolintl.patch 
	gambas2-2.2.1-noO0.patch gambas2-2.2.1-noOs.patch gambas2.spec 
	sources 
Log Message:
update to 2.8.2

gambas2-2.0.0-noliconv.patch:

Index: gambas2-2.0.0-noliconv.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-9/gambas2-2.0.0-noliconv.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gambas2-2.0.0-noliconv.patch	24 Mar 2008 16:02:41 -0000	1.1
+++ gambas2-2.0.0-noliconv.patch	10 Sep 2008 21:28:41 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up gambas-2.0.0/main/configure.ac.BAD gambas-2.0.0/main/configure.ac
---- gambas-2.0.0/main/configure.ac.BAD	2008-01-29 17:02:04.000000000 -0500
-+++ gambas-2.0.0/main/configure.ac	2008-01-29 17:02:15.000000000 -0500
+diff -up gambas2-2.8.1/main/configure.ac.orig gambas2-2.8.1/main/configure.ac
+--- gambas2-2.8.1/main/configure.ac.orig	2008-08-21 13:24:51.000000000 -0400
++++ gambas2-2.8.1/main/configure.ac	2008-08-21 13:31:29.000000000 -0400
 @@ -27,8 +27,8 @@ GB_COMPONENT(
    [optional external charset conversion library],
    [],
@@ -10,5 +10,5 @@
 +  [],
 +  [],
    [],
-   [This library must be located inside the C library])
+   [This library may be located inside the system C library, so let's go on...])
  

gambas2-2.0.0-nolintl.patch:

Index: gambas2-2.0.0-nolintl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-9/gambas2-2.0.0-nolintl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gambas2-2.0.0-nolintl.patch	24 Mar 2008 16:02:41 -0000	1.1
+++ gambas2-2.0.0-nolintl.patch	10 Sep 2008 21:28:41 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up gambas-2.0.0/main/configure.ac.BAD gambas-2.0.0/main/configure.ac
---- gambas-2.0.0/main/configure.ac.BAD	2008-01-29 16:37:47.000000000 -0500
-+++ gambas-2.0.0/main/configure.ac	2008-01-29 16:38:11.000000000 -0500
+diff -up gambas2-2.8.1/main/configure.ac.nolintl gambas2-2.8.1/main/configure.ac
+--- gambas2-2.8.1/main/configure.ac.nolintl	2008-08-21 13:23:35.000000000 -0400
++++ gambas2-2.8.1/main/configure.ac	2008-08-21 13:24:13.000000000 -0400
 @@ -14,8 +14,8 @@ GB_COMPONENT(
    [external internationalization library],
    [],
@@ -10,5 +10,5 @@
 +  [],
 +  [],
    [],
-   [This library should be located inside the system C library])
+   [This library may be located inside the system C library, so let's go on...])
  

gambas2-2.2.1-noO0.patch:

Index: gambas2-2.2.1-noO0.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-9/gambas2-2.2.1-noO0.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gambas2-2.2.1-noO0.patch	24 Mar 2008 16:02:41 -0000	1.1
+++ gambas2-2.2.1-noO0.patch	10 Sep 2008 21:28:41 -0000	1.2
@@ -1,466 +1,480 @@
-diff -up gambas2-2.2.1/gb.qt/acinclude.m4.BAD gambas2-2.2.1/gb.qt/acinclude.m4
-diff -up gambas2-2.2.1/gb.qt/configure.BAD gambas2-2.2.1/gb.qt/configure
---- gambas2-2.2.1/gb.qt/configure.BAD	2008-03-10 14:25:57.000000000 -0400
-+++ gambas2-2.2.1/gb.qt/configure	2008-03-10 14:25:58.000000000 -0400
-@@ -5300,8 +5300,8 @@ _ACEOF
+diff -up gambas2-2.8.1/acinclude.m4.noO0 gambas2-2.8.1/acinclude.m4
+--- gambas2-2.8.1/acinclude.m4.noO0	2008-08-21 13:41:05.000000000 -0400
++++ gambas2-2.8.1/acinclude.m4	2008-08-21 13:43:38.000000000 -0400
+@@ -219,9 +219,9 @@ AC_DEFUN([GB_INIT],
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/app/acinclude.m4.BAD gambas2-2.2.1/app/acinclude.m4
-diff -up gambas2-2.2.1/gb.gtk/acinclude.m4.BAD gambas2-2.2.1/gb.gtk/acinclude.m4
-diff -up gambas2-2.2.1/gb.gtk/configure.BAD gambas2-2.2.1/gb.gtk/configure
---- gambas2-2.2.1/gb.gtk/configure.BAD	2008-03-10 14:25:54.000000000 -0400
-+++ gambas2-2.2.1/gb.gtk/configure	2008-03-10 14:25:54.000000000 -0400
-@@ -5290,8 +5290,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.compress.bzlib2/configure.noO0 gambas2-2.8.1/gb.compress.bzlib2/configure
+--- gambas2-2.8.1/gb.compress.bzlib2/configure.noO0	2008-08-20 20:20:36.000000000 -0400
++++ gambas2-2.8.1/gb.compress.bzlib2/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5279,9 +5279,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.desktop/acinclude.m4.BAD gambas2-2.2.1/gb.desktop/acinclude.m4
-diff -up gambas2-2.2.1/gb.desktop/configure.BAD gambas2-2.2.1/gb.desktop/configure
---- gambas2-2.2.1/gb.desktop/configure.BAD	2008-03-10 14:25:53.000000000 -0400
-+++ gambas2-2.2.1/gb.desktop/configure	2008-03-10 14:25:54.000000000 -0400
-@@ -5290,8 +5290,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.compress.zlib/configure.noO0 gambas2-2.8.1/gb.compress.zlib/configure
+--- gambas2-2.8.1/gb.compress.zlib/configure.noO0	2008-08-20 20:20:43.000000000 -0400
++++ gambas2-2.8.1/gb.compress.zlib/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5279,9 +5279,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/main/acinclude.m4.BAD gambas2-2.2.1/main/acinclude.m4
-diff -up gambas2-2.2.1/main/configure.BAD gambas2-2.2.1/main/configure
---- gambas2-2.2.1/main/configure.BAD	2008-03-10 14:26:00.000000000 -0400
-+++ gambas2-2.2.1/main/configure	2008-03-10 14:26:01.000000000 -0400
-@@ -5299,8 +5299,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.corba/configure.noO0 gambas2-2.8.1/gb.corba/configure
+--- gambas2-2.8.1/gb.corba/configure.noO0	2008-08-20 20:23:24.000000000 -0400
++++ gambas2-2.8.1/gb.corba/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5279,9 +5279,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.corba/acinclude.m4.BAD gambas2-2.2.1/gb.corba/acinclude.m4
-diff -up gambas2-2.2.1/gb.corba/configure.BAD gambas2-2.2.1/gb.corba/configure
---- gambas2-2.2.1/gb.corba/configure.BAD	2008-03-10 14:25:51.000000000 -0400
-+++ gambas2-2.2.1/gb.corba/configure	2008-03-10 14:25:51.000000000 -0400
-@@ -5278,8 +5278,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.crypt/configure.noO0 gambas2-2.8.1/gb.crypt/configure
+--- gambas2-2.8.1/gb.crypt/configure.noO0	2008-08-20 20:23:09.000000000 -0400
++++ gambas2-2.8.1/gb.crypt/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5279,9 +5279,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/acinclude.m4.BAD gambas2-2.2.1/acinclude.m4
---- gambas2-2.2.1/acinclude.m4.BAD	2008-03-10 14:25:50.000000000 -0400
-+++ gambas2-2.2.1/acinclude.m4	2008-03-10 14:26:00.000000000 -0400
-@@ -223,8 +223,8 @@ dnl  # gambas_flags="$gambas_flags -fomi
+diff -up gambas2-2.8.1/gb.db.firebird/configure.noO0 gambas2-2.8.1/gb.db.firebird/configure
+--- gambas2-2.8.1/gb.db.firebird/configure.noO0	2008-08-20 20:21:25.000000000 -0400
++++ gambas2-2.8.1/gb.db.firebird/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5279,9 +5279,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.pdf/acinclude.m4.BAD gambas2-2.2.1/gb.pdf/acinclude.m4
-diff -up gambas2-2.2.1/gb.pdf/configure.BAD gambas2-2.2.1/gb.pdf/configure
---- gambas2-2.2.1/gb.pdf/configure.BAD	2008-03-10 14:25:57.000000000 -0400
-+++ gambas2-2.2.1/gb.pdf/configure	2008-03-10 14:25:57.000000000 -0400
-@@ -5278,8 +5278,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.db.mysql/configure.noO0 gambas2-2.8.1/gb.db.mysql/configure
+--- gambas2-2.8.1/gb.db.mysql/configure.noO0	2008-08-20 20:20:50.000000000 -0400
++++ gambas2-2.8.1/gb.db.mysql/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5279,9 +5279,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.pcre/acinclude.m4.BAD gambas2-2.2.1/gb.pcre/acinclude.m4
-diff -up gambas2-2.2.1/gb.pcre/configure.BAD gambas2-2.2.1/gb.pcre/configure
---- gambas2-2.2.1/gb.pcre/configure.BAD	2008-03-10 14:25:57.000000000 -0400
-+++ gambas2-2.2.1/gb.pcre/configure	2008-03-10 14:25:57.000000000 -0400
-@@ -5278,8 +5278,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.db.odbc/configure.noO0 gambas2-2.8.1/gb.db.odbc/configure
+--- gambas2-2.8.1/gb.db.odbc/configure.noO0	2008-08-20 20:20:56.000000000 -0400
++++ gambas2-2.8.1/gb.db.odbc/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5279,9 +5279,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.sdl.sound/acinclude.m4.BAD gambas2-2.2.1/gb.sdl.sound/acinclude.m4
-diff -up gambas2-2.2.1/gb.sdl.sound/configure.BAD gambas2-2.2.1/gb.sdl.sound/configure
---- gambas2-2.2.1/gb.sdl.sound/configure.BAD	2008-03-10 14:25:59.000000000 -0400
-+++ gambas2-2.2.1/gb.sdl.sound/configure	2008-03-10 14:25:59.000000000 -0400
-@@ -5284,8 +5284,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.db.postgresql/configure.noO0 gambas2-2.8.1/gb.db.postgresql/configure
+--- gambas2-2.8.1/gb.db.postgresql/configure.noO0	2008-08-20 20:21:03.000000000 -0400
++++ gambas2-2.8.1/gb.db.postgresql/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5279,9 +5279,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/help/acinclude.m4.BAD gambas2-2.2.1/help/acinclude.m4
-diff -up gambas2-2.2.1/help/configure.BAD gambas2-2.2.1/help/configure
---- gambas2-2.2.1/help/configure.BAD	2008-03-10 14:26:00.000000000 -0400
-+++ gambas2-2.2.1/help/configure	2008-03-10 14:26:00.000000000 -0400
-@@ -5049,8 +5049,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.db.sqlite2/configure.noO0 gambas2-2.8.1/gb.db.sqlite2/configure
+--- gambas2-2.8.1/gb.db.sqlite2/configure.noO0	2008-08-20 20:21:09.000000000 -0400
++++ gambas2-2.8.1/gb.db.sqlite2/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5279,9 +5279,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.net/acinclude.m4.BAD gambas2-2.2.1/gb.net/acinclude.m4
-diff -up gambas2-2.2.1/gb.net/configure.BAD gambas2-2.2.1/gb.net/configure
---- gambas2-2.2.1/gb.net/configure.BAD	2008-03-10 14:25:55.000000000 -0400
-+++ gambas2-2.2.1/gb.net/configure	2008-03-10 14:25:56.000000000 -0400
-@@ -5278,8 +5278,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.db.sqlite3/configure.noO0 gambas2-2.8.1/gb.db.sqlite3/configure
+--- gambas2-2.8.1/gb.db.sqlite3/configure.noO0	2008-08-20 20:21:19.000000000 -0400
++++ gambas2-2.8.1/gb.db.sqlite3/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5279,9 +5279,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.db.postgresql/acinclude.m4.BAD gambas2-2.2.1/gb.db.postgresql/acinclude.m4
-diff -up gambas2-2.2.1/gb.db.postgresql/configure.BAD gambas2-2.2.1/gb.db.postgresql/configure
---- gambas2-2.2.1/gb.db.postgresql/configure.BAD	2008-03-10 14:25:52.000000000 -0400
-+++ gambas2-2.2.1/gb.db.postgresql/configure	2008-03-10 14:25:53.000000000 -0400
-@@ -5278,8 +5278,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.desktop/configure.noO0 gambas2-2.8.1/gb.desktop/configure
+--- gambas2-2.8.1/gb.desktop/configure.noO0	2008-08-20 20:23:37.000000000 -0400
++++ gambas2-2.8.1/gb.desktop/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5291,9 +5291,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.opengl/acinclude.m4.BAD gambas2-2.2.1/gb.opengl/acinclude.m4
-diff -up gambas2-2.2.1/gb.opengl/configure.BAD gambas2-2.2.1/gb.opengl/configure
---- gambas2-2.2.1/gb.opengl/configure.BAD	2008-03-10 14:25:56.000000000 -0400
-+++ gambas2-2.2.1/gb.opengl/configure	2008-03-10 14:25:57.000000000 -0400
-@@ -5290,8 +5290,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.gtk/configure.noO0 gambas2-2.8.1/gb.gtk/configure
+--- gambas2-2.8.1/gb.gtk/configure.noO0	2008-08-20 20:21:32.000000000 -0400
++++ gambas2-2.8.1/gb.gtk/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5291,9 +5291,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.compress.zlib/acinclude.m4.BAD gambas2-2.2.1/gb.compress.zlib/acinclude.m4
-diff -up gambas2-2.2.1/gb.compress.zlib/configure.BAD gambas2-2.2.1/gb.compress.zlib/configure
---- gambas2-2.2.1/gb.compress.zlib/configure.BAD	2008-03-10 14:25:50.000000000 -0400
-+++ gambas2-2.2.1/gb.compress.zlib/configure	2008-03-10 14:25:51.000000000 -0400
-@@ -5278,8 +5278,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.gtk.svg/configure.noO0 gambas2-2.8.1/gb.gtk.svg/configure
+--- gambas2-2.8.1/gb.gtk.svg/configure.noO0	2008-08-20 20:21:39.000000000 -0400
++++ gambas2-2.8.1/gb.gtk.svg/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5298,9 +5298,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.sdl/acinclude.m4.BAD gambas2-2.2.1/gb.sdl/acinclude.m4
-diff -up gambas2-2.2.1/gb.sdl/configure.BAD gambas2-2.2.1/gb.sdl/configure
---- gambas2-2.2.1/gb.sdl/configure.BAD	2008-03-10 14:25:58.000000000 -0400
-+++ gambas2-2.2.1/gb.sdl/configure	2008-03-10 14:25:59.000000000 -0400
-@@ -5296,8 +5296,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.image/configure.noO0 gambas2-2.8.1/gb.image/configure
+--- gambas2-2.8.1/gb.image/configure.noO0	2008-08-20 20:23:30.000000000 -0400
++++ gambas2-2.8.1/gb.image/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5279,9 +5279,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/examples/acinclude.m4.BAD gambas2-2.2.1/examples/acinclude.m4
-diff -up gambas2-2.2.1/gb.compress.bzlib2/acinclude.m4.BAD gambas2-2.2.1/gb.compress.bzlib2/acinclude.m4
-diff -up gambas2-2.2.1/gb.compress.bzlib2/configure.BAD gambas2-2.2.1/gb.compress.bzlib2/configure
---- gambas2-2.2.1/gb.compress.bzlib2/configure.BAD	2008-03-10 14:25:50.000000000 -0400
-+++ gambas2-2.2.1/gb.compress.bzlib2/configure	2008-03-10 14:25:50.000000000 -0400
-@@ -5278,8 +5278,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.net/configure.noO0 gambas2-2.8.1/gb.net/configure
+--- gambas2-2.8.1/gb.net/configure.noO0	2008-08-20 20:21:53.000000000 -0400
++++ gambas2-2.8.1/gb.net/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5279,9 +5279,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.db.sqlite3/acinclude.m4.BAD gambas2-2.2.1/gb.db.sqlite3/acinclude.m4
-diff -up gambas2-2.2.1/gb.db.sqlite3/configure.BAD gambas2-2.2.1/gb.db.sqlite3/configure
---- gambas2-2.2.1/gb.db.sqlite3/configure.BAD	2008-03-10 14:25:53.000000000 -0400
-+++ gambas2-2.2.1/gb.db.sqlite3/configure	2008-03-10 14:25:53.000000000 -0400
-@@ -5278,8 +5278,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.net.curl/configure.noO0 gambas2-2.8.1/gb.net.curl/configure
+--- gambas2-2.8.1/gb.net.curl/configure.noO0	2008-08-20 20:22:00.000000000 -0400
++++ gambas2-2.8.1/gb.net.curl/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5279,9 +5279,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.v4l/acinclude.m4.BAD gambas2-2.2.1/gb.v4l/acinclude.m4
-diff -up gambas2-2.2.1/gb.v4l/configure.BAD gambas2-2.2.1/gb.v4l/configure
---- gambas2-2.2.1/gb.v4l/configure.BAD	2008-03-10 14:25:59.000000000 -0400
-+++ gambas2-2.2.1/gb.v4l/configure	2008-03-10 14:25:59.000000000 -0400
-@@ -5278,8 +5278,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.net.smtp/configure.noO0 gambas2-2.8.1/gb.net.smtp/configure
+--- gambas2-2.8.1/gb.net.smtp/configure.noO0	2008-08-20 20:22:06.000000000 -0400
++++ gambas2-2.8.1/gb.net.smtp/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5280,9 +5280,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/acinclude.m4.orig.BAD gambas2-2.2.1/acinclude.m4.orig
---- gambas2-2.2.1/acinclude.m4.orig.BAD	2008-03-10 14:25:50.000000000 -0400
-+++ gambas2-2.2.1/acinclude.m4.orig	2008-03-10 14:25:50.000000000 -0400
-@@ -223,8 +223,8 @@ dnl  # gambas_flags="$gambas_flags -fomi
+diff -up gambas2-2.8.1/gb.opengl/configure.noO0 gambas2-2.8.1/gb.opengl/configure
+--- gambas2-2.8.1/gb.opengl/configure.noO0	2008-08-20 20:23:17.000000000 -0400
++++ gambas2-2.8.1/gb.opengl/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5291,9 +5291,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.xml/acinclude.m4.BAD gambas2-2.2.1/gb.xml/acinclude.m4
-diff -up gambas2-2.2.1/gb.xml/configure.BAD gambas2-2.2.1/gb.xml/configure
---- gambas2-2.2.1/gb.xml/configure.BAD	2008-03-10 14:26:00.000000000 -0400
-+++ gambas2-2.2.1/gb.xml/configure	2008-03-10 14:26:00.000000000 -0400
-@@ -5285,8 +5285,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.pcre/configure.noO0 gambas2-2.8.1/gb.pcre/configure
+--- gambas2-2.8.1/gb.pcre/configure.noO0	2008-08-20 20:22:13.000000000 -0400
++++ gambas2-2.8.1/gb.pcre/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5279,9 +5279,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.db.odbc/acinclude.m4.BAD gambas2-2.2.1/gb.db.odbc/acinclude.m4
-diff -up gambas2-2.2.1/gb.db.odbc/configure.BAD gambas2-2.2.1/gb.db.odbc/configure
---- gambas2-2.2.1/gb.db.odbc/configure.BAD	2008-03-10 14:25:52.000000000 -0400
-+++ gambas2-2.2.1/gb.db.odbc/configure	2008-03-10 14:25:52.000000000 -0400
-@@ -5278,8 +5278,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.pdf/configure.noO0 gambas2-2.8.1/gb.pdf/configure
+--- gambas2-2.8.1/gb.pdf/configure.noO0	2008-08-20 20:21:47.000000000 -0400
++++ gambas2-2.8.1/gb.pdf/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5279,9 +5279,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.net.curl/acinclude.m4.BAD gambas2-2.2.1/gb.net.curl/acinclude.m4
-diff -up gambas2-2.2.1/gb.net.curl/configure.BAD gambas2-2.2.1/gb.net.curl/configure
---- gambas2-2.2.1/gb.net.curl/configure.BAD	2008-03-10 14:25:56.000000000 -0400
-+++ gambas2-2.2.1/gb.net.curl/configure	2008-03-10 14:25:56.000000000 -0400
-@@ -5278,8 +5278,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.qt/configure.noO0 gambas2-2.8.1/gb.qt/configure
+--- gambas2-2.8.1/gb.qt/configure.noO0	2008-08-20 20:22:19.000000000 -0400
++++ gambas2-2.8.1/gb.qt/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5301,9 +5301,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.crypt/acinclude.m4.BAD gambas2-2.2.1/gb.crypt/acinclude.m4
-diff -up gambas2-2.2.1/gb.crypt/configure.BAD gambas2-2.2.1/gb.crypt/configure
---- gambas2-2.2.1/gb.crypt/configure.BAD	2008-03-10 14:25:51.000000000 -0400
-+++ gambas2-2.2.1/gb.crypt/configure	2008-03-10 14:25:51.000000000 -0400
-@@ -5278,8 +5278,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.qte/configure.noO0 gambas2-2.8.1/gb.qte/configure
+--- gambas2-2.8.1/gb.qte/configure.noO0	2008-08-20 20:22:27.000000000 -0400
++++ gambas2-2.8.1/gb.qte/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5282,9 +5282,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.gtk.svg/acinclude.m4.BAD gambas2-2.2.1/gb.gtk.svg/acinclude.m4
-diff -up gambas2-2.2.1/gb.gtk.svg/configure.BAD gambas2-2.2.1/gb.gtk.svg/configure
---- gambas2-2.2.1/gb.gtk.svg/configure.BAD	2008-03-10 14:25:54.000000000 -0400
-+++ gambas2-2.2.1/gb.gtk.svg/configure	2008-03-10 14:25:54.000000000 -0400
-@@ -5297,8 +5297,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.qt.kde/configure.noO0 gambas2-2.8.1/gb.qt.kde/configure
+--- gambas2-2.8.1/gb.qt.kde/configure.noO0	2008-08-20 20:22:35.000000000 -0400
++++ gambas2-2.8.1/gb.qt.kde/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5300,9 +5300,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.db.mysql/acinclude.m4.BAD gambas2-2.2.1/gb.db.mysql/acinclude.m4
-diff -up gambas2-2.2.1/gb.db.mysql/configure.BAD gambas2-2.2.1/gb.db.mysql/configure
---- gambas2-2.2.1/gb.db.mysql/configure.BAD	2008-03-10 14:25:52.000000000 -0400
-+++ gambas2-2.2.1/gb.db.mysql/configure	2008-03-10 14:25:52.000000000 -0400
-@@ -5278,8 +5278,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.sdl/configure.noO0 gambas2-2.8.1/gb.sdl/configure
+--- gambas2-2.8.1/gb.sdl/configure.noO0	2008-08-20 20:22:42.000000000 -0400
++++ gambas2-2.8.1/gb.sdl/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5297,9 +5297,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.net.smtp/acinclude.m4.BAD gambas2-2.2.1/gb.net.smtp/acinclude.m4
-diff -up gambas2-2.2.1/gb.net.smtp/configure.BAD gambas2-2.2.1/gb.net.smtp/configure
---- gambas2-2.2.1/gb.net.smtp/configure.BAD	2008-03-10 14:25:56.000000000 -0400
-+++ gambas2-2.2.1/gb.net.smtp/configure	2008-03-10 14:25:56.000000000 -0400
-@@ -5279,8 +5279,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.sdl.sound/configure.noO0 gambas2-2.8.1/gb.sdl.sound/configure
+--- gambas2-2.8.1/gb.sdl.sound/configure.noO0	2008-08-20 20:22:49.000000000 -0400
++++ gambas2-2.8.1/gb.sdl.sound/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5285,9 +5285,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.qte/acinclude.m4.BAD gambas2-2.2.1/gb.qte/acinclude.m4
-diff -up gambas2-2.2.1/gb.qte/configure.BAD gambas2-2.2.1/gb.qte/configure
---- gambas2-2.2.1/gb.qte/configure.BAD	2008-03-10 14:25:58.000000000 -0400
-+++ gambas2-2.2.1/gb.qte/configure	2008-03-10 14:25:58.000000000 -0400
-@@ -5281,8 +5281,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.v4l/configure.noO0 gambas2-2.8.1/gb.v4l/configure
+--- gambas2-2.8.1/gb.v4l/configure.noO0	2008-08-20 20:23:03.000000000 -0400
++++ gambas2-2.8.1/gb.v4l/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5279,9 +5279,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.image/acinclude.m4.BAD gambas2-2.2.1/gb.image/acinclude.m4
-diff -up gambas2-2.2.1/gb.image/configure.BAD gambas2-2.2.1/gb.image/configure
---- gambas2-2.2.1/gb.image/configure.BAD	2008-03-10 14:25:55.000000000 -0400
-+++ gambas2-2.2.1/gb.image/configure	2008-03-10 14:25:55.000000000 -0400
-@@ -5278,8 +5278,8 @@ _ACEOF
+diff -up gambas2-2.8.1/gb.xml/configure.noO0 gambas2-2.8.1/gb.xml/configure
+--- gambas2-2.8.1/gb.xml/configure.noO0	2008-08-20 20:22:56.000000000 -0400
++++ gambas2-2.8.1/gb.xml/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5286,9 +5286,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.qt.kde/acinclude.m4.BAD gambas2-2.2.1/gb.qt.kde/acinclude.m4
-diff -up gambas2-2.2.1/gb.qt.kde/configure.BAD gambas2-2.2.1/gb.qt.kde/configure
---- gambas2-2.2.1/gb.qt.kde/configure.BAD	2008-03-10 14:25:58.000000000 -0400
-+++ gambas2-2.2.1/gb.qt.kde/configure	2008-03-10 14:25:58.000000000 -0400
-@@ -5299,8 +5299,8 @@ _ACEOF
+diff -up gambas2-2.8.1/help/configure.noO0 gambas2-2.8.1/help/configure
+--- gambas2-2.8.1/help/configure.noO0	2008-08-20 20:23:57.000000000 -0400
++++ gambas2-2.8.1/help/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5050,9 +5050,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.db.firebird/acinclude.m4.BAD gambas2-2.2.1/gb.db.firebird/acinclude.m4
-diff -up gambas2-2.2.1/gb.db.firebird/configure.BAD gambas2-2.2.1/gb.db.firebird/configure
---- gambas2-2.2.1/gb.db.firebird/configure.BAD	2008-03-10 14:25:51.000000000 -0400
-+++ gambas2-2.2.1/gb.db.firebird/configure	2008-03-10 14:25:52.000000000 -0400
-@@ -5278,8 +5278,8 @@ _ACEOF
+diff -up gambas2-2.8.1/main/configure.noO0 gambas2-2.8.1/main/configure
+--- gambas2-2.8.1/main/configure.noO0	2008-08-20 20:20:28.000000000 -0400
++++ gambas2-2.8.1/main/configure	2008-08-21 13:40:42.000000000 -0400
+@@ -5301,9 +5301,9 @@ _ACEOF
      AM_CFLAGS="$AM_CFLAGS -Os"
      AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
    else
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O0"
 -    AM_CFLAGS="$AM_CFLAGS -O0"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS"
    fi
  
    CFLAGS=""
-diff -up gambas2-2.2.1/gb.db.sqlite2/acinclude.m4.BAD gambas2-2.2.1/gb.db.sqlite2/acinclude.m4
-diff -up gambas2-2.2.1/gb.db.sqlite2/configure.BAD gambas2-2.2.1/gb.db.sqlite2/configure
---- gambas2-2.2.1/gb.db.sqlite2/configure.BAD	2008-03-10 14:25:53.000000000 -0400
-+++ gambas2-2.2.1/gb.db.sqlite2/configure	2008-03-10 14:25:53.000000000 -0400
-@@ -5278,8 +5278,8 @@ _ACEOF
-     AM_CFLAGS="$AM_CFLAGS -Os"
-     AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
-   else
--    AM_CFLAGS="$AM_CFLAGS -O0"
--    AM_CXXFLAGS="$AM_CXXFLAGS -O0"
-+    AM_CFLAGS="$AM_CFLAGS"
-+    AM_CXXFLAGS="$AM_CXXFLAGS"
-   fi
- 
-   CFLAGS=""
-diff -up gambas2-2.2.1/comp/acinclude.m4.BAD gambas2-2.2.1/comp/acinclude.m4

gambas2-2.2.1-noOs.patch:

Index: gambas2-2.2.1-noOs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-9/gambas2-2.2.1-noOs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gambas2-2.2.1-noOs.patch	24 Mar 2008 16:02:41 -0000	1.1
+++ gambas2-2.2.1-noOs.patch	10 Sep 2008 21:28:41 -0000	1.2
@@ -1,466 +1,484 @@
-diff -up gambas2-2.2.1/gb.qt/acinclude.m4.BAD gambas2-2.2.1/gb.qt/acinclude.m4
-diff -up gambas2-2.2.1/gb.qt/configure.BAD gambas2-2.2.1/gb.qt/configure
---- gambas2-2.2.1/gb.qt/configure.BAD	2008-03-10 14:49:15.000000000 -0400
-+++ gambas2-2.2.1/gb.qt/configure	2008-03-10 14:49:15.000000000 -0400
-@@ -5297,8 +5297,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/acinclude.m4.noOs gambas2-2.8.1/acinclude.m4
+--- gambas2-2.8.1/acinclude.m4.noOs	2008-08-21 13:57:55.000000000 -0400
++++ gambas2-2.8.1/acinclude.m4	2008-08-21 13:59:44.000000000 -0400
+@@ -215,9 +215,9 @@ AC_DEFUN([GB_INIT],
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/app/acinclude.m4.BAD gambas2-2.2.1/app/acinclude.m4
-diff -up gambas2-2.2.1/gb.gtk/acinclude.m4.BAD gambas2-2.2.1/gb.gtk/acinclude.m4
-diff -up gambas2-2.2.1/gb.gtk/configure.BAD gambas2-2.2.1/gb.gtk/configure
---- gambas2-2.2.1/gb.gtk/configure.BAD	2008-03-10 14:49:11.000000000 -0400
-+++ gambas2-2.2.1/gb.gtk/configure	2008-03-10 14:49:11.000000000 -0400
-@@ -5287,8 +5287,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/acinclude.m4.orig.noOs gambas2-2.8.1/acinclude.m4.orig
+diff -up gambas2-2.8.1/app/configure.noOs gambas2-2.8.1/app/configure
+diff -up gambas2-2.8.1/comp/configure.noOs gambas2-2.8.1/comp/configure
+diff -up gambas2-2.8.1/examples/configure.noOs gambas2-2.8.1/examples/configure
+diff -up gambas2-2.8.1/gb.compress.bzlib2/configure.noOs gambas2-2.8.1/gb.compress.bzlib2/configure
+--- gambas2-2.8.1/gb.compress.bzlib2/configure.noOs	2008-08-21 13:57:38.000000000 -0400
++++ gambas2-2.8.1/gb.compress.bzlib2/configure	2008-08-21 13:59:29.000000000 -0400
+@@ -5275,9 +5275,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.desktop/acinclude.m4.BAD gambas2-2.2.1/gb.desktop/acinclude.m4
-diff -up gambas2-2.2.1/gb.desktop/configure.BAD gambas2-2.2.1/gb.desktop/configure
---- gambas2-2.2.1/gb.desktop/configure.BAD	2008-03-10 14:49:11.000000000 -0400
-+++ gambas2-2.2.1/gb.desktop/configure	2008-03-10 14:49:11.000000000 -0400
-@@ -5287,8 +5287,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.compress.zlib/configure.noOs gambas2-2.8.1/gb.compress.zlib/configure
+--- gambas2-2.8.1/gb.compress.zlib/configure.noOs	2008-08-21 13:57:39.000000000 -0400
++++ gambas2-2.8.1/gb.compress.zlib/configure	2008-08-21 13:59:29.000000000 -0400
+@@ -5275,9 +5275,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/main/acinclude.m4.BAD gambas2-2.2.1/main/acinclude.m4
-diff -up gambas2-2.2.1/main/configure.BAD gambas2-2.2.1/main/configure
---- gambas2-2.2.1/main/configure.BAD	2008-03-10 14:49:17.000000000 -0400
-+++ gambas2-2.2.1/main/configure	2008-03-10 14:49:18.000000000 -0400
-@@ -5296,8 +5296,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.corba/configure.noOs gambas2-2.8.1/gb.corba/configure
+--- gambas2-2.8.1/gb.corba/configure.noOs	2008-08-21 13:57:39.000000000 -0400
++++ gambas2-2.8.1/gb.corba/configure	2008-08-21 13:59:30.000000000 -0400
+@@ -5275,9 +5275,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.corba/acinclude.m4.BAD gambas2-2.2.1/gb.corba/acinclude.m4
-diff -up gambas2-2.2.1/gb.corba/configure.BAD gambas2-2.2.1/gb.corba/configure
---- gambas2-2.2.1/gb.corba/configure.BAD	2008-03-10 14:49:08.000000000 -0400
-+++ gambas2-2.2.1/gb.corba/configure	2008-03-10 14:49:08.000000000 -0400
-@@ -5275,8 +5275,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.crypt/configure.noOs gambas2-2.8.1/gb.crypt/configure
+--- gambas2-2.8.1/gb.crypt/configure.noOs	2008-08-21 13:57:40.000000000 -0400
++++ gambas2-2.8.1/gb.crypt/configure	2008-08-21 13:59:30.000000000 -0400
+@@ -5275,9 +5275,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/acinclude.m4.BAD gambas2-2.2.1/acinclude.m4
---- gambas2-2.2.1/acinclude.m4.BAD	2008-03-10 14:49:07.000000000 -0400
-+++ gambas2-2.2.1/acinclude.m4	2008-03-10 14:49:17.000000000 -0400
-@@ -220,8 +220,8 @@ dnl  # gambas_flags="$gambas_flags -fali
- dnl  # gambas_flags="$gambas_flags -fomit-frame-pointer"
+diff -up gambas2-2.8.1/gb.db.firebird/configure.noOs gambas2-2.8.1/gb.db.firebird/configure
+--- gambas2-2.8.1/gb.db.firebird/configure.noOs	2008-08-21 13:57:40.000000000 -0400
++++ gambas2-2.8.1/gb.db.firebird/configure	2008-08-21 13:59:31.000000000 -0400
+@@ -5275,9 +5275,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.pdf/acinclude.m4.BAD gambas2-2.2.1/gb.pdf/acinclude.m4
-diff -up gambas2-2.2.1/gb.pdf/configure.BAD gambas2-2.2.1/gb.pdf/configure
---- gambas2-2.2.1/gb.pdf/configure.BAD	2008-03-10 14:49:15.000000000 -0400
-+++ gambas2-2.2.1/gb.pdf/configure	2008-03-10 14:49:15.000000000 -0400
-@@ -5275,8 +5275,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.db.mysql/configure.noOs gambas2-2.8.1/gb.db.mysql/configure
+--- gambas2-2.8.1/gb.db.mysql/configure.noOs	2008-08-21 13:57:41.000000000 -0400
++++ gambas2-2.8.1/gb.db.mysql/configure	2008-08-21 13:59:31.000000000 -0400
+@@ -5275,9 +5275,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.pcre/acinclude.m4.BAD gambas2-2.2.1/gb.pcre/acinclude.m4
-diff -up gambas2-2.2.1/gb.pcre/configure.BAD gambas2-2.2.1/gb.pcre/configure
---- gambas2-2.2.1/gb.pcre/configure.BAD	2008-03-10 14:49:14.000000000 -0400
-+++ gambas2-2.2.1/gb.pcre/configure	2008-03-10 14:49:15.000000000 -0400
-@@ -5275,8 +5275,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.db.odbc/configure.noOs gambas2-2.8.1/gb.db.odbc/configure
+--- gambas2-2.8.1/gb.db.odbc/configure.noOs	2008-08-21 13:57:41.000000000 -0400
++++ gambas2-2.8.1/gb.db.odbc/configure	2008-08-21 13:59:32.000000000 -0400
+@@ -5275,9 +5275,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.sdl.sound/acinclude.m4.BAD gambas2-2.2.1/gb.sdl.sound/acinclude.m4
-diff -up gambas2-2.2.1/gb.sdl.sound/configure.BAD gambas2-2.2.1/gb.sdl.sound/configure
---- gambas2-2.2.1/gb.sdl.sound/configure.BAD	2008-03-10 14:49:16.000000000 -0400
-+++ gambas2-2.2.1/gb.sdl.sound/configure	2008-03-10 14:49:17.000000000 -0400
-@@ -5281,8 +5281,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.db.postgresql/configure.noOs gambas2-2.8.1/gb.db.postgresql/configure
+--- gambas2-2.8.1/gb.db.postgresql/configure.noOs	2008-08-21 13:57:42.000000000 -0400
++++ gambas2-2.8.1/gb.db.postgresql/configure	2008-08-21 13:59:32.000000000 -0400
+@@ -5275,9 +5275,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/help/acinclude.m4.BAD gambas2-2.2.1/help/acinclude.m4
-diff -up gambas2-2.2.1/help/configure.BAD gambas2-2.2.1/help/configure
---- gambas2-2.2.1/help/configure.BAD	2008-03-10 14:49:17.000000000 -0400
-+++ gambas2-2.2.1/help/configure	2008-03-10 14:49:17.000000000 -0400
-@@ -5046,8 +5046,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.db.sqlite2/configure.noOs gambas2-2.8.1/gb.db.sqlite2/configure
+--- gambas2-2.8.1/gb.db.sqlite2/configure.noOs	2008-08-21 13:57:42.000000000 -0400
++++ gambas2-2.8.1/gb.db.sqlite2/configure	2008-08-21 13:59:33.000000000 -0400
+@@ -5275,9 +5275,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.net/acinclude.m4.BAD gambas2-2.2.1/gb.net/acinclude.m4
-diff -up gambas2-2.2.1/gb.net/configure.BAD gambas2-2.2.1/gb.net/configure
---- gambas2-2.2.1/gb.net/configure.BAD	2008-03-10 14:49:12.000000000 -0400
-+++ gambas2-2.2.1/gb.net/configure	2008-03-10 14:49:12.000000000 -0400
-@@ -5275,8 +5275,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.db.sqlite3/configure.noOs gambas2-2.8.1/gb.db.sqlite3/configure
+--- gambas2-2.8.1/gb.db.sqlite3/configure.noOs	2008-08-21 13:57:44.000000000 -0400
++++ gambas2-2.8.1/gb.db.sqlite3/configure	2008-08-21 13:59:34.000000000 -0400
+@@ -5275,9 +5275,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.db.postgresql/acinclude.m4.BAD gambas2-2.2.1/gb.db.postgresql/acinclude.m4
-diff -up gambas2-2.2.1/gb.db.postgresql/configure.BAD gambas2-2.2.1/gb.db.postgresql/configure
---- gambas2-2.2.1/gb.db.postgresql/configure.BAD	2008-03-10 14:49:10.000000000 -0400
-+++ gambas2-2.2.1/gb.db.postgresql/configure	2008-03-10 14:49:10.000000000 -0400
-@@ -5275,8 +5275,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.desktop/configure.noOs gambas2-2.8.1/gb.desktop/configure
+--- gambas2-2.8.1/gb.desktop/configure.noOs	2008-08-21 13:57:44.000000000 -0400
++++ gambas2-2.8.1/gb.desktop/configure	2008-08-21 13:59:34.000000000 -0400
+@@ -5287,9 +5287,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.opengl/acinclude.m4.BAD gambas2-2.2.1/gb.opengl/acinclude.m4
-diff -up gambas2-2.2.1/gb.opengl/configure.BAD gambas2-2.2.1/gb.opengl/configure
---- gambas2-2.2.1/gb.opengl/configure.BAD	2008-03-10 14:49:14.000000000 -0400
-+++ gambas2-2.2.1/gb.opengl/configure	2008-03-10 14:49:14.000000000 -0400
-@@ -5287,8 +5287,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.gtk/configure.noOs gambas2-2.8.1/gb.gtk/configure
+--- gambas2-2.8.1/gb.gtk/configure.noOs	2008-08-21 13:57:45.000000000 -0400
++++ gambas2-2.8.1/gb.gtk/configure	2008-08-21 13:59:35.000000000 -0400
+@@ -5287,9 +5287,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.compress.zlib/acinclude.m4.BAD gambas2-2.2.1/gb.compress.zlib/acinclude.m4
-diff -up gambas2-2.2.1/gb.compress.zlib/configure.BAD gambas2-2.2.1/gb.compress.zlib/configure
---- gambas2-2.2.1/gb.compress.zlib/configure.BAD	2008-03-10 14:49:08.000000000 -0400
-+++ gambas2-2.2.1/gb.compress.zlib/configure	2008-03-10 14:49:08.000000000 -0400
-@@ -5275,8 +5275,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.gtk.svg/configure.noOs gambas2-2.8.1/gb.gtk.svg/configure
+--- gambas2-2.8.1/gb.gtk.svg/configure.noOs	2008-08-21 13:57:45.000000000 -0400
++++ gambas2-2.8.1/gb.gtk.svg/configure	2008-08-21 13:59:35.000000000 -0400
+@@ -5294,9 +5294,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.sdl/acinclude.m4.BAD gambas2-2.2.1/gb.sdl/acinclude.m4
-diff -up gambas2-2.2.1/gb.sdl/configure.BAD gambas2-2.2.1/gb.sdl/configure
---- gambas2-2.2.1/gb.sdl/configure.BAD	2008-03-10 14:49:16.000000000 -0400
-+++ gambas2-2.2.1/gb.sdl/configure	2008-03-10 14:49:16.000000000 -0400
-@@ -5293,8 +5293,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.image/configure.noOs gambas2-2.8.1/gb.image/configure
+--- gambas2-2.8.1/gb.image/configure.noOs	2008-08-21 13:57:46.000000000 -0400
++++ gambas2-2.8.1/gb.image/configure	2008-08-21 13:59:36.000000000 -0400
+@@ -5275,9 +5275,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/examples/acinclude.m4.BAD gambas2-2.2.1/examples/acinclude.m4
-diff -up gambas2-2.2.1/gb.compress.bzlib2/acinclude.m4.BAD gambas2-2.2.1/gb.compress.bzlib2/acinclude.m4
-diff -up gambas2-2.2.1/gb.compress.bzlib2/configure.BAD gambas2-2.2.1/gb.compress.bzlib2/configure
---- gambas2-2.2.1/gb.compress.bzlib2/configure.BAD	2008-03-10 14:49:07.000000000 -0400
-+++ gambas2-2.2.1/gb.compress.bzlib2/configure	2008-03-10 14:49:07.000000000 -0400
-@@ -5275,8 +5275,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.net/configure.noOs gambas2-2.8.1/gb.net/configure
+--- gambas2-2.8.1/gb.net/configure.noOs	2008-08-21 13:57:47.000000000 -0400
++++ gambas2-2.8.1/gb.net/configure	2008-08-21 13:59:36.000000000 -0400
+@@ -5275,9 +5275,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.db.sqlite3/acinclude.m4.BAD gambas2-2.2.1/gb.db.sqlite3/acinclude.m4
-diff -up gambas2-2.2.1/gb.db.sqlite3/configure.BAD gambas2-2.2.1/gb.db.sqlite3/configure
---- gambas2-2.2.1/gb.db.sqlite3/configure.BAD	2008-03-10 14:49:10.000000000 -0400
-+++ gambas2-2.2.1/gb.db.sqlite3/configure	2008-03-10 14:49:11.000000000 -0400
-@@ -5275,8 +5275,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.net.curl/configure.noOs gambas2-2.8.1/gb.net.curl/configure
+--- gambas2-2.8.1/gb.net.curl/configure.noOs	2008-08-21 13:57:47.000000000 -0400
++++ gambas2-2.8.1/gb.net.curl/configure	2008-08-21 13:59:37.000000000 -0400
+@@ -5275,9 +5275,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.v4l/acinclude.m4.BAD gambas2-2.2.1/gb.v4l/acinclude.m4
-diff -up gambas2-2.2.1/gb.v4l/configure.BAD gambas2-2.2.1/gb.v4l/configure
---- gambas2-2.2.1/gb.v4l/configure.BAD	2008-03-10 14:49:17.000000000 -0400
-+++ gambas2-2.2.1/gb.v4l/configure	2008-03-10 14:49:17.000000000 -0400
-@@ -5275,8 +5275,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.net.smtp/configure.noOs gambas2-2.8.1/gb.net.smtp/configure
+--- gambas2-2.8.1/gb.net.smtp/configure.noOs	2008-08-21 13:57:48.000000000 -0400
++++ gambas2-2.8.1/gb.net.smtp/configure	2008-08-21 13:59:38.000000000 -0400
+@@ -5276,9 +5276,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/acinclude.m4.orig.BAD gambas2-2.2.1/acinclude.m4.orig
---- gambas2-2.2.1/acinclude.m4.orig.BAD	2008-03-10 14:49:07.000000000 -0400
-+++ gambas2-2.2.1/acinclude.m4.orig	2008-03-10 14:49:07.000000000 -0400
-@@ -220,8 +220,8 @@ dnl  # gambas_flags="$gambas_flags -fali
- dnl  # gambas_flags="$gambas_flags -fomit-frame-pointer"
+diff -up gambas2-2.8.1/gb.opengl/configure.noOs gambas2-2.8.1/gb.opengl/configure
+--- gambas2-2.8.1/gb.opengl/configure.noOs	2008-08-21 13:57:48.000000000 -0400
++++ gambas2-2.8.1/gb.opengl/configure	2008-08-21 13:59:38.000000000 -0400
+@@ -5287,9 +5287,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.xml/acinclude.m4.BAD gambas2-2.2.1/gb.xml/acinclude.m4
-diff -up gambas2-2.2.1/gb.xml/configure.BAD gambas2-2.2.1/gb.xml/configure
---- gambas2-2.2.1/gb.xml/configure.BAD	2008-03-10 14:49:17.000000000 -0400
-+++ gambas2-2.2.1/gb.xml/configure	2008-03-10 14:49:17.000000000 -0400
-@@ -5282,8 +5282,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.pcre/configure.noOs gambas2-2.8.1/gb.pcre/configure
+--- gambas2-2.8.1/gb.pcre/configure.noOs	2008-08-21 13:57:49.000000000 -0400
++++ gambas2-2.8.1/gb.pcre/configure	2008-08-21 13:59:39.000000000 -0400
+@@ -5275,9 +5275,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.db.odbc/acinclude.m4.BAD gambas2-2.2.1/gb.db.odbc/acinclude.m4
-diff -up gambas2-2.2.1/gb.db.odbc/configure.BAD gambas2-2.2.1/gb.db.odbc/configure
---- gambas2-2.2.1/gb.db.odbc/configure.BAD	2008-03-10 14:49:09.000000000 -0400
-+++ gambas2-2.2.1/gb.db.odbc/configure	2008-03-10 14:49:10.000000000 -0400
-@@ -5275,8 +5275,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.pdf/configure.noOs gambas2-2.8.1/gb.pdf/configure
+--- gambas2-2.8.1/gb.pdf/configure.noOs	2008-08-21 13:57:49.000000000 -0400
++++ gambas2-2.8.1/gb.pdf/configure	2008-08-21 13:59:39.000000000 -0400
+@@ -5275,9 +5275,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.net.curl/acinclude.m4.BAD gambas2-2.2.1/gb.net.curl/acinclude.m4
-diff -up gambas2-2.2.1/gb.net.curl/configure.BAD gambas2-2.2.1/gb.net.curl/configure
---- gambas2-2.2.1/gb.net.curl/configure.BAD	2008-03-10 14:49:12.000000000 -0400
-+++ gambas2-2.2.1/gb.net.curl/configure	2008-03-10 14:49:13.000000000 -0400
-@@ -5275,8 +5275,8 @@ _ACEOF
- 
- 
-   if test "x$gambas_optimization" = "xyes"; then
--    AM_CFLAGS="$AM_CFLAGS -Os"
--    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
-+    AM_CFLAGS="$AM_CFLAGS"
-+    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
-   else
-     AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.crypt/acinclude.m4.BAD gambas2-2.2.1/gb.crypt/acinclude.m4
-diff -up gambas2-2.2.1/gb.crypt/configure.BAD gambas2-2.2.1/gb.crypt/configure
---- gambas2-2.2.1/gb.crypt/configure.BAD	2008-03-10 14:49:08.000000000 -0400
-+++ gambas2-2.2.1/gb.crypt/configure	2008-03-10 14:49:09.000000000 -0400
-@@ -5275,8 +5275,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.qt/configure.noOs gambas2-2.8.1/gb.qt/configure
+--- gambas2-2.8.1/gb.qt/configure.noOs	2008-08-21 13:57:50.000000000 -0400
++++ gambas2-2.8.1/gb.qt/configure	2008-08-21 13:59:40.000000000 -0400
+@@ -5297,9 +5297,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.gtk.svg/acinclude.m4.BAD gambas2-2.2.1/gb.gtk.svg/acinclude.m4
-diff -up gambas2-2.2.1/gb.gtk.svg/configure.BAD gambas2-2.2.1/gb.gtk.svg/configure
---- gambas2-2.2.1/gb.gtk.svg/configure.BAD	2008-03-10 14:49:11.000000000 -0400
-+++ gambas2-2.2.1/gb.gtk.svg/configure	2008-03-10 14:49:12.000000000 -0400
-@@ -5294,8 +5294,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.qte/configure.noOs gambas2-2.8.1/gb.qte/configure
+--- gambas2-2.8.1/gb.qte/configure.noOs	2008-08-21 13:57:51.000000000 -0400
++++ gambas2-2.8.1/gb.qte/configure	2008-08-21 13:59:40.000000000 -0400
+@@ -5278,9 +5278,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.db.mysql/acinclude.m4.BAD gambas2-2.2.1/gb.db.mysql/acinclude.m4
-diff -up gambas2-2.2.1/gb.db.mysql/configure.BAD gambas2-2.2.1/gb.db.mysql/configure
---- gambas2-2.2.1/gb.db.mysql/configure.BAD	2008-03-10 14:49:09.000000000 -0400
-+++ gambas2-2.2.1/gb.db.mysql/configure	2008-03-10 14:49:09.000000000 -0400
-@@ -5275,8 +5275,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.qt.kde/configure.noOs gambas2-2.8.1/gb.qt.kde/configure
+--- gambas2-2.8.1/gb.qt.kde/configure.noOs	2008-08-21 13:57:51.000000000 -0400
++++ gambas2-2.8.1/gb.qt.kde/configure	2008-08-21 13:59:41.000000000 -0400
+@@ -5296,9 +5296,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.net.smtp/acinclude.m4.BAD gambas2-2.2.1/gb.net.smtp/acinclude.m4
-diff -up gambas2-2.2.1/gb.net.smtp/configure.BAD gambas2-2.2.1/gb.net.smtp/configure
---- gambas2-2.2.1/gb.net.smtp/configure.BAD	2008-03-10 14:49:14.000000000 -0400
-+++ gambas2-2.2.1/gb.net.smtp/configure	2008-03-10 14:49:14.000000000 -0400
-@@ -5276,8 +5276,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.sdl/configure.noOs gambas2-2.8.1/gb.sdl/configure
+--- gambas2-2.8.1/gb.sdl/configure.noOs	2008-08-21 13:57:52.000000000 -0400
++++ gambas2-2.8.1/gb.sdl/configure	2008-08-21 13:59:42.000000000 -0400
+@@ -5293,9 +5293,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.qte/acinclude.m4.BAD gambas2-2.2.1/gb.qte/acinclude.m4
-diff -up gambas2-2.2.1/gb.qte/configure.BAD gambas2-2.2.1/gb.qte/configure
---- gambas2-2.2.1/gb.qte/configure.BAD	2008-03-10 14:49:15.000000000 -0400
-+++ gambas2-2.2.1/gb.qte/configure	2008-03-10 14:49:16.000000000 -0400
-@@ -5278,8 +5278,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.sdl.sound/configure.noOs gambas2-2.8.1/gb.sdl.sound/configure
+--- gambas2-2.8.1/gb.sdl.sound/configure.noOs	2008-08-21 13:57:52.000000000 -0400
++++ gambas2-2.8.1/gb.sdl.sound/configure	2008-08-21 13:59:42.000000000 -0400
+@@ -5281,9 +5281,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.image/acinclude.m4.BAD gambas2-2.2.1/gb.image/acinclude.m4
-diff -up gambas2-2.2.1/gb.image/configure.BAD gambas2-2.2.1/gb.image/configure
---- gambas2-2.2.1/gb.image/configure.BAD	2008-03-10 14:49:12.000000000 -0400
-+++ gambas2-2.2.1/gb.image/configure	2008-03-10 14:49:12.000000000 -0400
-@@ -5275,8 +5275,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.v4l/configure.noOs gambas2-2.8.1/gb.v4l/configure
+--- gambas2-2.8.1/gb.v4l/configure.noOs	2008-08-21 13:57:53.000000000 -0400
++++ gambas2-2.8.1/gb.v4l/configure	2008-08-21 13:59:43.000000000 -0400
+@@ -5275,9 +5275,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.qt.kde/acinclude.m4.BAD gambas2-2.2.1/gb.qt.kde/acinclude.m4
-diff -up gambas2-2.2.1/gb.qt.kde/configure.BAD gambas2-2.2.1/gb.qt.kde/configure
---- gambas2-2.2.1/gb.qt.kde/configure.BAD	2008-03-10 14:49:16.000000000 -0400
-+++ gambas2-2.2.1/gb.qt.kde/configure	2008-03-10 14:49:16.000000000 -0400
-@@ -5296,8 +5296,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/gb.xml/configure.noOs gambas2-2.8.1/gb.xml/configure
+--- gambas2-2.8.1/gb.xml/configure.noOs	2008-08-21 13:57:54.000000000 -0400
++++ gambas2-2.8.1/gb.xml/configure	2008-08-21 13:59:43.000000000 -0400
+@@ -5282,9 +5282,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.db.firebird/acinclude.m4.BAD gambas2-2.2.1/gb.db.firebird/acinclude.m4
-diff -up gambas2-2.2.1/gb.db.firebird/configure.BAD gambas2-2.2.1/gb.db.firebird/configure
---- gambas2-2.2.1/gb.db.firebird/configure.BAD	2008-03-10 14:49:09.000000000 -0400
-+++ gambas2-2.2.1/gb.db.firebird/configure	2008-03-10 14:49:09.000000000 -0400
-@@ -5275,8 +5275,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/help/configure.noOs gambas2-2.8.1/help/configure
+--- gambas2-2.8.1/help/configure.noOs	2008-08-21 13:57:54.000000000 -0400
++++ gambas2-2.8.1/help/configure	2008-08-21 13:59:43.000000000 -0400
+@@ -5046,9 +5046,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/gb.db.sqlite2/acinclude.m4.BAD gambas2-2.2.1/gb.db.sqlite2/acinclude.m4
-diff -up gambas2-2.2.1/gb.db.sqlite2/configure.BAD gambas2-2.2.1/gb.db.sqlite2/configure
---- gambas2-2.2.1/gb.db.sqlite2/configure.BAD	2008-03-10 14:49:10.000000000 -0400
-+++ gambas2-2.2.1/gb.db.sqlite2/configure	2008-03-10 14:49:10.000000000 -0400
-@@ -5275,8 +5275,8 @@ _ACEOF
- 
+diff -up gambas2-2.8.1/main/configure.noOs gambas2-2.8.1/main/configure
+--- gambas2-2.8.1/main/configure.noOs	2008-08-21 13:57:54.000000000 -0400
++++ gambas2-2.8.1/main/configure	2008-08-21 13:59:44.000000000 -0400
+@@ -5297,9 +5297,9 @@ _ACEOF
+   fi
  
    if test "x$gambas_optimization" = "xyes"; then
+-    AM_CFLAGS_OPT="$AM_CFLAGS -O3"
 -    AM_CFLAGS="$AM_CFLAGS -Os"
 -    AM_CXXFLAGS="$AM_CXXFLAGS -Os -fno-omit-frame-pointer"
++    AM_CFLAGS_OPT="$AM_CFLAGS"
 +    AM_CFLAGS="$AM_CFLAGS"
 +    AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer"
    else
+     AM_CFLAGS_OPT="$AM_CFLAGS"
      AM_CFLAGS="$AM_CFLAGS"
-     AM_CXXFLAGS="$AM_CXXFLAGS"
-diff -up gambas2-2.2.1/comp/acinclude.m4.BAD gambas2-2.2.1/comp/acinclude.m4


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-9/gambas2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gambas2.spec	13 Jun 2008 19:54:46 -0000	1.4
+++ gambas2.spec	10 Sep 2008 21:28:41 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		gambas2
 Summary:	IDE based on a basic interpreter with object extensions
-Version:	2.7.0
+Version:	2.8.2
 Release:	1%{?dist}
 License:	GPL+
 Group:		Development/Tools
@@ -22,9 +22,6 @@
 Patch0:		%{name}-2.0.0-use-system-ltdl.patch
 Patch1:		%{name}-2.0.0-nolintl.patch
 Patch2:		%{name}-2.0.0-noliconv.patch
-Patch3:		%{name}-2.2.1-noO0.patch
-Patch4:		%{name}-2.2.1-noOs.patch
-Patch5:		%{name}-2.2.1-poppler-0.7.2-fix.patch
 
 %description
 Gambas2 is a free development environment based on a Basic interpreter
@@ -82,6 +79,7 @@
 Requires:	%{name}-gb-compress = %{version}-%{release}
 Requires: 	%{name}-gb-crypt = %{version}-%{release}
 Requires:	%{name}-gb-db = %{version}-%{release}
+Requires:	%{name}-gb-db-form = %{version}-%{release}
 Requires:	%{name}-gb-desktop = %{version}-%{release}
 Requires:	%{name}-gb-form = %{version}-%{release}
 Requires:	%{name}-gb-form-dialog = %{version}-%{release}
@@ -154,6 +152,14 @@
 %description gb-db
 %{summary}
 
+%package gb-db-form
+Summary:	Gambas2 component package for db-form
+Group:		Development/Tools
+Requires:	%{name}-runtime = %{version}-%{release}
+
+%description gb-db-form
+%{summary}
+
 %package gb-desktop
 Summary:	Gambas2 component package for desktop
 Group:		Development/Tools
@@ -406,12 +412,24 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-# No longer necessary
-# %%patch5 -p1
+%patch1 -p1 -b .nolintl
+%patch2 -p1 -b .noliconv
+# We used to patch these out, but this is simpler.
+for i in acinclude.m4 gb.compress.bzlib2/configure gb.compress.zlib/configure gb.corba/configure \
+	 gb.crypt/configure gb.db.firebird/configure gb.db.mysql/configure gb.db.odbc/configure \
+	 gb.db.postgresql/configure gb.db.sqlite2/configure gb.db.sqlite3/configure gb.desktop/configure \
+	 gb.gtk/configure gb.gtk.svg/configure gb.image/configure gb.net/configure gb.net.curl/configure \
+	 gb.net.smtp/configure gb.opengl/configure gb.pcre/configure gb.pdf/configure gb.qt/configure \
+	 gb.qte/configure gb.qt.kde/configure gb.sdl/configure gb.sdl.sound/configure gb.v4l/configure \
+	 gb.xml/configure help/configure main/configure; do
+	sed -i 's|$AM_CFLAGS -O3|$AM_CFLAGS|g' $i
+	sed -i 's|$AM_CXXFLAGS -Os -fno-omit-frame-pointer|$AM_CXXFLAGS|g' $i
+	sed -i 's|$AM_CFLAGS -Os|$AM_CFLAGS|g' $i
+	sed -i 's|$AM_CFLAGS -O0|$AM_CFLAGS|g' $i
+	sed -i 's|$AM_CXXFLAGS -O0|$AM_CXXFLAGS|g' $i
+done
+
+
 ./reconf-all
 
 # clean up some spurious exec perms
@@ -1259,8 +1277,20 @@
 
 %files gb-db
 %defattr(-, root, root, 0755)
-%{_libdir}/%{name}/gb.db.*
-%{_datadir}/%{name}/info/gb.db.*
+%{_libdir}/%{name}/gb.db.component
+%{_libdir}/%{name}/gb.db.la
+%{_libdir}/%{name}/gb.db.mysql.*
+%{_libdir}/%{name}/gb.db.odbc.*
+%{_libdir}/%{name}/gb.db.postgresql.*
+%{_libdir}/%{name}/gb.db.so*
+%{_libdir}/%{name}/gb.db.sqlite3.*
+%{_datadir}/%{name}/info/gb.db.info
+%{_datadir}/%{name}/info/gb.db.list
+
+%files gb-db-form
+%defattr(-, root, root, 0755)
+%{_libdir}/%{name}/gb.db.form.*
+%{_datadir}/%{name}/info/gb.db.form.*
 
 %files gb-desktop
 %defattr(-, root, root, 0755)
@@ -1460,6 +1490,13 @@
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
+* Wed Sep 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.8.2-1
+- update to 2.8.2
+- make gb-db-form subpackage (bz 461595)
+
+* Thu Aug 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.8.1-1
+- update to 2.8.1
+
 * Fri Jun 13 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-1
 - update to 2.7.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Jun 2008 19:54:46 -0000	1.5
+++ sources	10 Sep 2008 21:28:41 -0000	1.6
@@ -1 +1 @@
-27fdae3bc64c3cfd4a65baf9d1755700  gambas2-2.7.0.tar.bz2
+9f0d1c450b22580eccf3a0e3619a9d7c  gambas2-2.8.2.tar.bz2



From ajax at fedoraproject.org  Wed Sep 10 21:37:56 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 10 Sep 2008 21:37:56 +0000 (UTC)
Subject: rpms/xcb-proto/devel import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4 xcb-proto.spec, 1.2, 1.3
Message-ID: <20080910213756.F13F37012C@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xcb-proto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25110/devel

Modified Files:
	.cvsignore sources xcb-proto.spec 
Added Files:
	import.log 
Log Message:
xcb-proto 1.2



--- NEW FILE import.log ---
xcb-proto-1_2-1_fc10:HEAD:xcb-proto-1.2-1.fc10.src.rpm:1221082638


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-proto/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Nov 2007 15:23:02 -0000	1.3
+++ .cvsignore	10 Sep 2008 21:37:26 -0000	1.4
@@ -1 +1 @@
-xcb-proto-1.1.tar.bz2
+xcb-proto-1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-proto/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Nov 2007 15:23:02 -0000	1.3
+++ sources	10 Sep 2008 21:37:26 -0000	1.4
@@ -1 +1 @@
-dd34acc58c0a438e812f72a9afe7b2a0  xcb-proto-1.1.tar.bz2
+09f912486d8a2353bb4b99ddc28ba3c7  xcb-proto-1.2.tar.bz2


Index: xcb-proto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-proto/devel/xcb-proto.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xcb-proto.spec	12 Nov 2007 15:23:02 -0000	1.2
+++ xcb-proto.spec	10 Sep 2008 21:37:26 -0000	1.3
@@ -1,7 +1,8 @@
 %define debug_package %{nil}
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           xcb-proto
-Version:        1.1
+Version:        1.2
 Release:        1%{?dist}
 Summary:        XCB protocol descriptions
 
@@ -12,6 +13,7 @@
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:	python
 Requires:       pkgconfig
 
 %description
@@ -42,8 +44,12 @@
 %dir %{_datadir}/xcb/
 %{_datadir}/xcb/*.xsd
 %{_datadir}/xcb/*.xml
+%{python_sitearch}/xcbgen
 
 %changelog
+* Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 1.2-1
+- xcb-proto 1.2
+
 * Mon Nov 12 2007 Adam Jackson <ajax at redhat.com> 1.1-1
 - xcb-proto 1.1
 



From notting at fedoraproject.org  Wed Sep 10 21:38:09 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 10 Sep 2008 21:38:09 +0000 (UTC)
Subject: rpms/initscripts/devel .cvsignore, 1.152, 1.153 initscripts.spec,
	1.179, 1.180 sources, 1.168, 1.169
Message-ID: <20080910213809.611237012C@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25234

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
8.82-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- .cvsignore	29 Aug 2008 17:06:14 -0000	1.152
+++ .cvsignore	10 Sep 2008 21:37:39 -0000	1.153
@@ -1 +1 @@
-initscripts-8.81.tar.bz2
+initscripts-8.82.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- initscripts.spec	29 Aug 2008 17:06:14 -0000	1.179
+++ initscripts.spec	10 Sep 2008 21:37:39 -0000	1.180
@@ -1,8 +1,8 @@
-%define with_upstart 1%{nil} 
+%define with_upstart 1%{nil}
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.81
+Version: 8.82
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -27,7 +27,7 @@
 Requires: ethtool >= 1.8-2, /sbin/runuser
 Requires: udev >= 115-1
 Requires: popt >= 1.12-2
-Requires: cpio, findutils
+Requires: cpio
 Conflicts: mkinitrd < 4.0, kernel < 2.6.12, mdadm < 2.6.4-3
 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
 Conflicts: dhclient < 3.0.3-7
@@ -253,6 +253,14 @@
 %config /etc/profile.d/debug*
 
 %changelog
+* Wed Sep 10 2008 Bill Nottingham <notting at redhat.com> - 8.82-1
+- refresh translation strings
+- plymouth updates. (#460702, <rstrode at redhat.com>)
+- translation updates: fi, lv, no
+- remove duplicate dependency (#465182)
+- ifup-eth: Change how we set the zeroconf route. (#239609)
+- ifup*: Use 0.0.0.0/0, not 0/0. (#460580)
+
 * Fri Aug 29 2008 Bill Nottingham <notting at redhat.com> - 8.81-1
 - rc.sysinit: Don't use -L in find (#458652, #458504, CVE-2008-3524)
 - ifup: kill more code from loopback bringup


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/sources,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- sources	29 Aug 2008 17:06:15 -0000	1.168
+++ sources	10 Sep 2008 21:37:39 -0000	1.169
@@ -1 +1 @@
-6f14730fff682d9a5c5df5edd0295e92  initscripts-8.81.tar.bz2
+1763b04d2d10f04eaad0199bb9207522  initscripts-8.82.tar.bz2



From kzak at fedoraproject.org  Wed Sep 10 22:01:00 2008
From: kzak at fedoraproject.org (Karel Zak)
Date: Wed, 10 Sep 2008 22:01:00 +0000 (UTC)
Subject: rpms/util-linux-ng/devel util-linux-ng.spec,1.31,1.32
Message-ID: <20080910220100.612EE7012C@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-serv29227

Modified Files:
	util-linux-ng.spec 
Log Message:
* Wed Sep 10 2008 Karel Zak <kzak at redhat.com> 2.14.1-2
- remove obsolete pam-console support



Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- util-linux-ng.spec	10 Sep 2008 12:29:01 -0000	1.31
+++ util-linux-ng.spec	10 Sep 2008 22:00:29 -0000	1.32
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.14.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -81,7 +81,6 @@
 Patch0: util-linux-ng-2.13-login-pamstart.patch
 # RHEL/Fedora specific mount options
 Patch1: util-linux-ng-2.14-mount-managed.patch
-Patch2: util-linux-ng-2.13-mount-pamconsole.patch
 # add note about ATAPI IDE floppy to fdformat.8
 Patch3: util-linux-ng-2.13-fdformat-man-ide.patch
 # 169628 - /usr/bin/floppy doesn't work with /dev/fd0
@@ -113,7 +112,6 @@
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -515,6 +513,9 @@
 /sbin/losetup
 
 %changelog
+* Wed Sep 10 2008 Karel Zak <kzak at redhat.com> 2.14.1-2
+- remove obsolete pam-console support
+
 * Wed Sep 10 2008 Karel Zak <kzak at redhat.com> 2.14.1-1
 - upgrade to stable 2.14.1
 



From pkgdb at fedoraproject.org  Wed Sep 10 22:02:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 22:02:43 +0000
Subject: [pkgdb] gears-backgrounds was added for mso
Message-ID: <20080910220243.BAEA0208D97@bastion.fedora.phx.redhat.com>

wtogami has added Package gears-backgrounds with summary Gears desktop backgrounds
wtogami has approved Package gears-backgrounds
wtogami has added a Fedora devel branch for gears-backgrounds with an owner of mso
wtogami has approved gears-backgrounds in Fedora devel
wtogami has approved Package gears-backgrounds
wtogami has set commit to Approved for packager on gears-backgrounds (Fedora devel)
wtogami has set build to Approved for packager on gears-backgrounds (Fedora devel)
wtogami has set checkout to Approved for packager on gears-backgrounds (Fedora devel)
wtogami has set commit to Approved for uberpackager on gears-backgrounds (Fedora devel)
wtogami has set build to Approved for uberpackager on gears-backgrounds (Fedora devel)
wtogami has set checkout to Approved for uberpackager on gears-backgrounds (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gears-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 22:02:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 22:02:46 +0000
Subject: [pkgdb] gears-backgrounds (Fedora, 9) updated by wtogami
Message-ID: <20080910220246.4E217208D9A@bastion.fedora.phx.redhat.com>

wtogami added a Fedora 9 branch for gears-backgrounds
wtogami has set commit to Approved for uberpackager on gears-backgrounds (Fedora 9)
wtogami has set build to Approved for uberpackager on gears-backgrounds (Fedora 9)
wtogami has set checkout to Approved for uberpackager on gears-backgrounds (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gears-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 22:02:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 22:02:46 +0000
Subject: [pkgdb] gears-backgrounds (Fedora, 8) updated by wtogami
Message-ID: <20080910220246.5E3D2208D9E@bastion.fedora.phx.redhat.com>

wtogami added a Fedora 8 branch for gears-backgrounds
wtogami has set commit to Approved for uberpackager on gears-backgrounds (Fedora 8)
wtogami has set build to Approved for uberpackager on gears-backgrounds (Fedora 8)
wtogami has set checkout to Approved for uberpackager on gears-backgrounds (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gears-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 22:25:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 22:25:49 +0000
Subject: [pkgdb] invinxble-backgrounds was added for mso
Message-ID: <20080910222550.64D13208D97@bastion.fedora.phx.redhat.com>

wtogami has added Package invinxble-backgrounds with summary InvinXble desktop backgrounds
wtogami has approved Package invinxble-backgrounds
wtogami has added a Fedora devel branch for invinxble-backgrounds with an owner of mso
wtogami has approved invinxble-backgrounds in Fedora devel
wtogami has approved Package invinxble-backgrounds
wtogami has set commit to Approved for packager on invinxble-backgrounds (Fedora devel)
wtogami has set build to Approved for packager on invinxble-backgrounds (Fedora devel)
wtogami has set checkout to Approved for packager on invinxble-backgrounds (Fedora devel)
wtogami has set commit to Approved for uberpackager on invinxble-backgrounds (Fedora devel)
wtogami has set build to Approved for uberpackager on invinxble-backgrounds (Fedora devel)
wtogami has set checkout to Approved for uberpackager on invinxble-backgrounds (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/invinxble-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 22:25:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 22:25:50 +0000
Subject: [pkgdb] invinxble-backgrounds (Fedora, 9) updated by wtogami
Message-ID: <20080910222551.01817208D9C@bastion.fedora.phx.redhat.com>

wtogami added a Fedora 9 branch for invinxble-backgrounds
wtogami has set commit to Approved for uberpackager on invinxble-backgrounds (Fedora 9)
wtogami has set build to Approved for uberpackager on invinxble-backgrounds (Fedora 9)
wtogami has set checkout to Approved for uberpackager on invinxble-backgrounds (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/invinxble-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 22:25:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 22:25:50 +0000
Subject: [pkgdb] invinxble-backgrounds (Fedora, 8) updated by wtogami
Message-ID: <20080910222551.0E1B9208D9F@bastion.fedora.phx.redhat.com>

wtogami added a Fedora 8 branch for invinxble-backgrounds
wtogami has set commit to Approved for uberpackager on invinxble-backgrounds (Fedora 8)
wtogami has set build to Approved for uberpackager on invinxble-backgrounds (Fedora 8)
wtogami has set checkout to Approved for uberpackager on invinxble-backgrounds (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/invinxble-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 22:26:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 22:26:10 +0000
Subject: [pkgdb] neon-backgrounds was added for mso
Message-ID: <20080910222610.5FD6D208D98@bastion.fedora.phx.redhat.com>

wtogami has added Package neon-backgrounds with summary InvinXble desktop backgrounds
wtogami has approved Package neon-backgrounds
wtogami has added a Fedora devel branch for neon-backgrounds with an owner of mso
wtogami has approved neon-backgrounds in Fedora devel
wtogami has approved Package neon-backgrounds
wtogami has set commit to Approved for packager on neon-backgrounds (Fedora devel)
wtogami has set build to Approved for packager on neon-backgrounds (Fedora devel)
wtogami has set checkout to Approved for packager on neon-backgrounds (Fedora devel)
wtogami has set commit to Approved for uberpackager on neon-backgrounds (Fedora devel)
wtogami has set build to Approved for uberpackager on neon-backgrounds (Fedora devel)
wtogami has set checkout to Approved for uberpackager on neon-backgrounds (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/neon-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 22:26:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 22:26:11 +0000
Subject: [pkgdb] neon-backgrounds (Fedora, 9) updated by wtogami
Message-ID: <20080910222611.1A014208DA3@bastion.fedora.phx.redhat.com>

wtogami added a Fedora 9 branch for neon-backgrounds
wtogami has set commit to Approved for uberpackager on neon-backgrounds (Fedora 9)
wtogami has set build to Approved for uberpackager on neon-backgrounds (Fedora 9)
wtogami has set checkout to Approved for uberpackager on neon-backgrounds (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/neon-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 22:26:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 22:26:11 +0000
Subject: [pkgdb] neon-backgrounds (Fedora, 8) updated by wtogami
Message-ID: <20080910222611.23E4D208DA6@bastion.fedora.phx.redhat.com>

wtogami added a Fedora 8 branch for neon-backgrounds
wtogami has set commit to Approved for uberpackager on neon-backgrounds (Fedora 8)
wtogami has set build to Approved for uberpackager on neon-backgrounds (Fedora 8)
wtogami has set checkout to Approved for uberpackager on neon-backgrounds (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/neon-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 22:26:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 22:26:31 +0000
Subject: [pkgdb] solar-backgrounds was added for mso
Message-ID: <20080910222632.2764F208D9A@bastion.fedora.phx.redhat.com>

wtogami has added Package solar-backgrounds with summary InvinXble desktop backgrounds
wtogami has approved Package solar-backgrounds
wtogami has added a Fedora devel branch for solar-backgrounds with an owner of mso
wtogami has approved solar-backgrounds in Fedora devel
wtogami has approved Package solar-backgrounds
wtogami has set commit to Approved for packager on solar-backgrounds (Fedora devel)
wtogami has set build to Approved for packager on solar-backgrounds (Fedora devel)
wtogami has set checkout to Approved for packager on solar-backgrounds (Fedora devel)
wtogami has set commit to Approved for uberpackager on solar-backgrounds (Fedora devel)
wtogami has set build to Approved for uberpackager on solar-backgrounds (Fedora devel)
wtogami has set checkout to Approved for uberpackager on solar-backgrounds (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/solar-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 22:26:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 22:26:32 +0000
Subject: [pkgdb] solar-backgrounds (Fedora, 9) updated by wtogami
Message-ID: <20080910222632.A128A208D9C@bastion.fedora.phx.redhat.com>

wtogami added a Fedora 9 branch for solar-backgrounds
wtogami has set commit to Approved for uberpackager on solar-backgrounds (Fedora 9)
wtogami has set build to Approved for uberpackager on solar-backgrounds (Fedora 9)
wtogami has set checkout to Approved for uberpackager on solar-backgrounds (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/solar-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 22:26:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 22:26:32 +0000
Subject: [pkgdb] solar-backgrounds (Fedora, 8) updated by wtogami
Message-ID: <20080910222632.AE0F9208DA0@bastion.fedora.phx.redhat.com>

wtogami added a Fedora 8 branch for solar-backgrounds
wtogami has set commit to Approved for uberpackager on solar-backgrounds (Fedora 8)
wtogami has set build to Approved for uberpackager on solar-backgrounds (Fedora 8)
wtogami has set checkout to Approved for uberpackager on solar-backgrounds (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/solar-backgrounds



From cscott at fedoraproject.org  Wed Sep 10 22:27:01 2008
From: cscott at fedoraproject.org (C. Scott Ananian)
Date: Wed, 10 Sep 2008 22:27:01 +0000 (UTC)
Subject: rpms/fedora-release/OLPC-3 Makefile, 1.2, 1.3 fedora-release.spec, 
	1.69, 1.70 sources, 1.55, 1.56
Message-ID: <20080910222701.5C9E87012C@cvs1.fedora.phx.redhat.com>

Author: cscott

Update of /cvs/pkgs/rpms/fedora-release/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv447

Modified Files:
	Makefile fedora-release.spec sources 
Log Message:
Update OLPC-3 fork to match f9 9-5.transition package.



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/OLPC-3/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:44:51 -0000	1.2
+++ Makefile	10 Sep 2008 22:26:31 -0000	1.3
@@ -2,6 +2,7 @@
 # $Id$
 NAME := fedora-release
 SPECFILE = $(firstword $(wildcard *.spec))
+MOCKCFG = olpc-3-i386
 
 define find-makefile-common
 for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done


Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/OLPC-3/fedora-release.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- fedora-release.spec	5 Sep 2008 22:26:53 -0000	1.69
+++ fedora-release.spec	10 Sep 2008 22:26:31 -0000	1.70
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	9
-Release:	3.1
+Release:	5.transition.1
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://laptop.org
@@ -54,6 +54,14 @@
 done
 ln -s RPM-GPG-KEY-fedora-primary RPM-GPG-KEY-fedora
 ln -s RPM-GPG-KEY-fedora-test-primary RPM-GPG-KEY-fedora-test
+# Do the same for newkey
+for arch in i386 x86_64 ppc ppc64
+  do
+  ln -s RPM-GPG-KEY-fedora-8-and-9-primary      RPM-GPG-KEY-fedora-8-and-9-$arch
+  ln -s RPM-GPG-KEY-fedora-test-8-and-9-primary RPM-GPG-KEY-fedora-test-8-and-9-$arch
+done
+ln -s RPM-GPG-KEY-fedora-8-and-9-primary      RPM-GPG-KEY-fedora-8-and-9
+ln -s RPM-GPG-KEY-fedora-test-8-and-9-primary RPM-GPG-KEY-fedora-test-8-and-9
 popd
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
@@ -99,6 +107,12 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Wed Sep 10 2008 C. Scott Ananian <cscott at laptop.org> - 9-5.transition.1
+- Update OLPC fork to 5.transition.
+
+* Mon Sep 08 2008 Warren Togami <wtogami at redhat.com> - 9-5.transition
+- transition state between old and new key
+
 * Fri Sep 05 2008 C. Scott Ananian <cscott at laptop.org> - 9-3.1
 - OLPC-local changes.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/OLPC-3/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	20 Aug 2008 21:50:48 -0000	1.55
+++ sources	10 Sep 2008 22:26:31 -0000	1.56
@@ -1 +1 @@
-d3037f3460e9ce7288263cf8f2b90053  fedora-release-9.tar.gz
+06b8fcead95435ca7c8e2c10da0cba7d  fedora-release-9.tar.gz



From notting at fedoraproject.org  Wed Sep 10 22:28:24 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 10 Sep 2008 22:28:24 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.93,1.94
Message-ID: <20080910222824.539797012C@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv522

Modified Files:
	comps-f10.xml.in 
Log Message:
Add maithili-support. (#461739)



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- comps-f10.xml.in	10 Sep 2008 20:31:19 -0000	1.93
+++ comps-f10.xml.in	10 Sep 2008 22:27:54 -0000	1.94
@@ -3154,6 +3154,17 @@
     </packagelist>
   </group>
   <group>
+    <id>maithili-support</id>
+    <_name>maithili-support</id>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>mai</langonly>
+    <packagelist>
+      <packagereq type="default">lohit-fonts-maithili</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>malay-support</id>
     <_name>Malay Support</_name>
     <_description/>



From crobinso at fedoraproject.org  Wed Sep 10 22:32:11 2008
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Wed, 10 Sep 2008 22:32:11 +0000 (UTC)
Subject: rpms/python-virtinst/devel .cvsignore, 1.14,
	1.15 python-virtinst.spec, 
	1.44, 1.45 sources, 1.14, 1.15 virtinst-0.300.3-boot-dir.patch,
	1.1, NONE virtinst-0.300.3-fix-default-arch.patch, 1.1,
	NONE virtinst-0.300.3-fv-extraargs.patch, 1.1,
	NONE virtinst-0.300.3-hvm-kernel.patch, 1.1,
	NONE virtinst-0.300.3-i18n.patch, 1.1,
	NONE virtinst-0.300.3-keep-qemu-cdrom.patch, 1.1,
	NONE virtinst-0.300.3-update-polish-trans.patch, 1.1,
	NONE virtinst-0.300.3-update-serbian-trans.patch, 1.1, NONE
Message-ID: <20080910223211.111F87012C@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1210

Modified Files:
	.cvsignore python-virtinst.spec sources 
Removed Files:
	virtinst-0.300.3-boot-dir.patch 
	virtinst-0.300.3-fix-default-arch.patch 
	virtinst-0.300.3-fv-extraargs.patch 
	virtinst-0.300.3-hvm-kernel.patch virtinst-0.300.3-i18n.patch 
	virtinst-0.300.3-keep-qemu-cdrom.patch 
	virtinst-0.300.3-update-polish-trans.patch 
	virtinst-0.300.3-update-serbian-trans.patch 
Log Message:
Update to newest upstream release 0.400.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	10 Mar 2008 23:57:12 -0000	1.14
+++ .cvsignore	10 Sep 2008 22:31:40 -0000	1.15
@@ -1,4 +1 @@
-.build*.log
-*.rpm
-noarch
-virtinst-0.300.3.tar.gz
+virtinst-0.400.0.tar.gz


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- python-virtinst.spec	4 Jun 2008 20:58:08 -0000	1.44
+++ python-virtinst.spec	10 Sep 2008 22:31:40 -0000	1.45
@@ -8,27 +8,22 @@
 
 %define appname virtinst
 
-Summary: Python modules for starting Xen guest installations
+Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
-Version: 0.300.3
-Release: 7%{_extra_release}
+Version: 0.400.0
+Release: 1%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
-Patch1: %{appname}-%{version}-keep-qemu-cdrom.patch
-Patch2: %{appname}-%{version}-fix-default-arch.patch
-Patch3: %{appname}-%{version}-fv-extraargs.patch
-Patch4: %{appname}-%{version}-update-polish-trans.patch
-Patch5: %{appname}-%{version}-i18n.patch
-Patch6: %{appname}-%{version}-update-serbian-trans.patch
-Patch7: %{appname}-%{version}-boot-dir.patch
-Patch8: %{appname}-%{version}-hvm-kernel.patch
 License: GPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Url: http://virt-manager.org/
-Requires: libvirt-python >= 0.4.2-4.fc10
-# Disabled to allow minimal non-X installs
-#Requires: virt-viewer
+Url: http://virt-manager.org
+Provides: virt-install
+Provides: virt-clone
+Provides: virt-image
+Provides: virt-pack
+Provides: virt-convert
+Requires: libvirt-python >= 0.4.5-2.fc10
 Requires: urlgrabber
 Requires: libxml2-python
 Requires: python-urlgrabber
@@ -39,25 +34,13 @@
 BuildRequires: gettext
 
 %description
-virtinst is a module to help in starting installations of Fedora/Red
-Hat Enterprise Linux related distributions inside of virtual machines.  It
-supports both paravirt guests (for which only FC and RHEL guests are
-currently supported) as well as fully virtualized guests.  It uses
-libvirt (http://www.libvirt.org) for starting things.
-
-Also contained is a simple script virt-install which uses
-virtinst in a command line mode.
+virtinst is a module that helps build and install libvirt based virtual
+machines. Currently supports KVM, QEmu and Xen virtual machines. Package
+includes several command line utilities, including virt-install (build
+and install new VMs) and virt-clone (clone an existing virtual machine).
 
 %prep
 %setup -q -n %{appname}-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
 
 %build
 python setup.py build
@@ -76,9 +59,11 @@
 
 %files -f %{appname}.lang
 %defattr(-,root,root)
-%doc README AUTHORS NEWS ChangeLog doc/image.rng doc/example1.xml
+%doc README COPYING AUTHORS ChangeLog NEWS doc/image.rng doc/example1.xml
 %dir %{python_sitelib}/%{appname}
+%dir %{python_sitelib}/virtconv
 %{python_sitelib}/%{appname}/*
+%{python_sitelib}/virtconv/*
 %{python_sitelib}/%{appname}-*.egg-info
 %{_mandir}/man1/*
 %{_mandir}/man5/*
@@ -86,8 +71,17 @@
 %{_bindir}/virt-install
 %{_bindir}/virt-clone
 %{_bindir}/virt-image
+%{_bindir}/virt-pack
+%{_bindir}/virt-convert
 
 %changelog
+* Wed Sep 10 2008 Cole Robinson <crobinso at redhat.com> - 0.400.0-1.fc10
+- Add virt-convert tool
+- Add virt-pack tool
+- virt-install --disk option for using/provisioning libvirt storage
+- virt-install remote installation support
+- virt-install --sound option to add soundcard emulation
+
 * Wed Jun  4 2008 Daniel P. Berrange <berrange at redhat.com> - 0.300.3-7.fc10
 - Fix fetching of HVM kernels (rhbz #450032)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	10 Mar 2008 23:57:12 -0000	1.14
+++ sources	10 Sep 2008 22:31:40 -0000	1.15
@@ -1 +1 @@
-6354d7c10f5167fbcc03e29280165b27  virtinst-0.300.3.tar.gz
+484792dfe05abc75082d44fc51b811f3  virtinst-0.400.0.tar.gz


--- virtinst-0.300.3-boot-dir.patch DELETED ---


--- virtinst-0.300.3-fix-default-arch.patch DELETED ---


--- virtinst-0.300.3-fv-extraargs.patch DELETED ---


--- virtinst-0.300.3-hvm-kernel.patch DELETED ---


--- virtinst-0.300.3-i18n.patch DELETED ---


--- virtinst-0.300.3-keep-qemu-cdrom.patch DELETED ---


--- virtinst-0.300.3-update-polish-trans.patch DELETED ---


--- virtinst-0.300.3-update-serbian-trans.patch DELETED ---



From notting at fedoraproject.org  Wed Sep 10 22:32:48 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 10 Sep 2008 22:32:48 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.94,1.95
Message-ID: <20080910223248.9E0F27012C@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1317

Modified Files:
	comps-f10.xml.in 
Log Message:
Remove fedora-logos; let it be pulled in by dependencies. (#456882)



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- comps-f10.xml.in	10 Sep 2008 22:27:54 -0000	1.94
+++ comps-f10.xml.in	10 Sep 2008 22:32:17 -0000	1.95
@@ -628,7 +628,6 @@
       <packagereq type="mandatory">dhclient</packagereq>
       <packagereq type="mandatory">e2fsprogs</packagereq>
       <packagereq type="mandatory">ed</packagereq>
-      <packagereq type="mandatory">fedora-logos</packagereq>
       <packagereq type="mandatory">fedora-release</packagereq>
       <packagereq type="mandatory">file</packagereq>
       <packagereq type="mandatory">filesystem</packagereq>



From notting at fedoraproject.org  Wed Sep 10 22:34:49 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 10 Sep 2008 22:34:49 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.95,1.96
Message-ID: <20080910223449.DDA5F7012C@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1665

Modified Files:
	comps-f10.xml.in 
Log Message:
Add intltool to development-tools. (#380711)



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- comps-f10.xml.in	10 Sep 2008 22:32:17 -0000	1.95
+++ comps-f10.xml.in	10 Sep 2008 22:34:19 -0000	1.96
@@ -811,6 +811,7 @@
       <packagereq basearchonly="true" type="default">gcc-gfortran</packagereq>
       <packagereq type="default">git</packagereq>
       <packagereq type="default">indent</packagereq>
+      <packagereq type="default">intltool</packagereq>
       <packagereq basearchonly="true" type="default">ltrace</packagereq>
       <packagereq basearchonly="true" type="default">oprofile</packagereq>
       <packagereq basearchonly="true" type="default">oprofile-gui</packagereq>



From notting at fedoraproject.org  Wed Sep 10 22:46:31 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 10 Sep 2008 22:46:31 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.96,1.97
Message-ID: <20080910224631.653B17012C@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2875

Modified Files:
	comps-f10.xml.in 
Log Message:
Various lang-based additions.



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- comps-f10.xml.in	10 Sep 2008 22:34:19 -0000	1.96
+++ comps-f10.xml.in	10 Sep 2008 22:46:01 -0000	1.97
@@ -1365,6 +1365,7 @@
       <packagereq type="default">lohit-fonts-gujarati</packagereq>
       <packagereq type="default">lohit-fonts-hindi</packagereq>
       <packagereq type="default">lohit-fonts-kannada</packagereq>
+      <packagereq type="default">lohit-fonts-maithili</packagereq>
       <packagereq type="default">lohit-fonts-malayalam</packagereq>
       <packagereq type="default">lohit-fonts-oriya</packagereq>
       <packagereq type="default">lohit-fonts-punjabi</packagereq>
@@ -2218,6 +2219,7 @@
       <packagereq type="mandatory">m17n-contrib-gujarati</packagereq>
       <packagereq type="mandatory">m17n-db-gujarati</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-gu</packagereq>
+      <packagereq type="conditional" requires="hunspell">hunspell-gu</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-gu</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-gu_IN</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-gujarati</packagereq>
@@ -2366,6 +2368,7 @@
     <langonly>is</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-is</packagereq>
+      <packagereq type="conditional" requires="hunspell">hunspell-is</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Icelandic</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-is</packagereq>
     </packagelist>
@@ -2380,6 +2383,7 @@
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-id</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-id</packagereq>
+      <packagereq type="conditional" requires="hunspell">hunspell-id</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-id</packagereq>
     </packagelist>
   </group>
@@ -3189,6 +3193,8 @@
       <packagereq type="mandatory">m17n-contrib-malayalam</packagereq>
       <packagereq type="mandatory">m17n-db-malayalam</packagereq>
       <packagereq type="mandatory">smc-fonts-meera</packagereq>
+      <packagereq type="conditional" requires="aspell">aspell-ml</packagereq>
+      <packagereq type="conditional" requires="hunspell">hunspell-ml</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ml</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ml_IN</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-malayalam</packagereq>
@@ -3654,7 +3660,9 @@
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-sr</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-sr</packagereq>
+      <packagereq type="conditional" requires="hunspell">hunspell-sr</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Serbian</packagereq>
+      <packagereq type="conditional" requires="kdelibs">kde-l10n-Serbian</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-sr</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-sr-Latn</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-sr_cr</packagereq>
@@ -4214,6 +4222,7 @@
       <packagereq type="conditional" requires="aspell">aspell-ta</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ta</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Tamil</packagereq>
+      <packagereq type="conditional" requires="kdelibs">kde-l10n-Tamil</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ta</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ta_lk</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ta_IN</packagereq>
@@ -4401,6 +4410,17 @@
     </packagelist>
   </group>
   <group>
+    <id>uzbek-support</id>
+    <_name>Uzbek Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>uz</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="moodle">moodle-uz</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>venda-support</id>
     <_name>Venda Support</_name>
     <_description/>
@@ -4539,6 +4559,7 @@
       <packagereq type="conditional" requires="aspell">aspell-cy</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-cy</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-cy</packagereq>
+      <packagereq type="conditional" requires="moodle">moodle-cy</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-cy_GB</packagereq>
     </packagelist>
   </group>
@@ -4797,6 +4818,7 @@
       <groupid>lithuanian-support</groupid>
       <groupid>low-saxon-support</groupid>
       <groupid>macedonian-support</groupid>
+      <groupid>maithili-support</groupid>
       <groupid>malay-support</groupid>
       <groupid>malayalam-support</groupid>
       <groupid>maori-support</groupid>
@@ -4836,6 +4858,7 @@
       <groupid>turkish-support</groupid>
       <groupid>ukrainian-support</groupid>
       <groupid>urdu-support</groupid>
+      <groupid>uzbek-support</groupid>
       <groupid>venda-support</groupid>
       <groupid>vietnamese-support</groupid>
       <groupid>walloon-support</groupid>



From notting at fedoraproject.org  Wed Sep 10 22:54:59 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 10 Sep 2008 22:54:59 +0000 (UTC)
Subject: comps Makefile,1.10,1.11
Message-ID: <20080910225459.6446F7012C@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3860

Modified Files:
	Makefile 
Log Message:
Fix validate target.



Index: Makefile
===================================================================
RCS file: /cvs/extras/comps/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile	10 Sep 2008 20:24:08 -0000	1.10
+++ Makefile	10 Sep 2008 22:54:29 -0000	1.11
@@ -9,8 +9,8 @@
 clean:
 	@rm -fv *~ *.xml
 
-validate: $(FILES) comps.rng
-	for f in $(FILES); do xmllint --noout --relaxng comps.rng $$f; done
+validate: $(XMLFILES) comps.rng
+	for f in $(XMLFILES); do xmllint --noout --relaxng comps.rng $$f; done
 
 %.xml: %.xml.in
 	@python -c 'import libxml2; libxml2.parseFile("$<")'



From notting at fedoraproject.org  Wed Sep 10 22:56:52 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 10 Sep 2008 22:56:52 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.97,1.98
Message-ID: <20080910225652.B93BA7012C@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4085

Modified Files:
	comps-f10.xml.in 
Log Message:
Fix group definition.



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- comps-f10.xml.in	10 Sep 2008 22:46:01 -0000	1.97
+++ comps-f10.xml.in	10 Sep 2008 22:56:22 -0000	1.98
@@ -3159,7 +3159,7 @@
   </group>
   <group>
     <id>maithili-support</id>
-    <_name>maithili-support</id>
+    <_name>Maithili Support</_name>
     <_description/>
     <default>false</default>
     <uservisible>false</uservisible>



From crobinso at fedoraproject.org  Wed Sep 10 23:06:51 2008
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Wed, 10 Sep 2008 23:06:51 +0000 (UTC)
Subject: rpms/virt-manager/devel virt-manager-0.6.0-polkit-root.patch, NONE, 
	1.1 .cvsignore, 1.19, 1.20 sources, 1.19, 1.20 virt-manager.spec,
	1.34, 1.35 virt-manager-0.5.4-i18n.patch, 1.1,
	NONE virt-manager-0.5.4-polkit-root.patch, 1.1, NONE
Message-ID: <20080910230651.8149C7012C@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5448

Modified Files:
	.cvsignore sources virt-manager.spec 
Added Files:
	virt-manager-0.6.0-polkit-root.patch 
Removed Files:
	virt-manager-0.5.4-i18n.patch 
	virt-manager-0.5.4-polkit-root.patch 
Log Message:
Update to latest upstream release 0.6.0


virt-manager-0.6.0-polkit-root.patch:

--- NEW FILE virt-manager-0.6.0-polkit-root.patch ---
diff -rup virt-manager-0.5.4.orig/src/virtManager/connection.py virt-manager-0.5.4/src/virtManager/connection.py
--- virt-manager-0.5.4.orig/src/virtManager/connection.py	2008-03-10 20:17:51.000000000 -0400
+++ virt-manager-0.5.4/src/virtManager/connection.py	2008-03-13 13:51:14.000000000 -0400
@@ -336,6 +336,9 @@ class vmmConnection(gobject.GObject):
         self.connectThread.start()
 
     def _do_creds_polkit(self, action):
+        if os.getuid() == 0:
+            logging.debug("Skipping policykit check as root")
+            return 0
         logging.debug("Doing policykit for %s" % action)
         bus = dbus.SessionBus()
         obj = bus.get_object("org.gnome.PolicyKit", "/org/gnome/PolicyKit/Manager")
Only in virt-manager-0.5.4/src/virtManager: connection.py~


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	11 Mar 2008 00:33:40 -0000	1.19
+++ .cvsignore	10 Sep 2008 23:06:21 -0000	1.20
@@ -1,5 +1 @@
-*.src.rpm
-.build*.log
-x86_64
-i686
-virt-manager-0.5.4.tar.gz
+virt-manager-0.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	11 Mar 2008 00:33:40 -0000	1.19
+++ sources	10 Sep 2008 23:06:21 -0000	1.20
@@ -1 +1 @@
-9de921b119e897c28fb10335ca88e6dc  virt-manager-0.5.4.tar.gz
+fd0acd111f180a0766b08d5f42cf5468  virt-manager-0.6.0.tar.gz


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- virt-manager.spec	3 Apr 2008 21:41:10 -0000	1.34
+++ virt-manager.spec	10 Sep 2008 23:06:21 -0000	1.35
@@ -7,8 +7,8 @@
 %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}}
 
 Name: virt-manager
-Version: 0.5.4
-Release: 3%{_extra_release}
+Version: 0.6.0
+Release: 1%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -18,14 +18,13 @@
 Source1: %{name}.pam
 Source2: %{name}.console
 Patch1: %{name}-%{version}-polkit-root.patch
-Patch2: %{name}-%{version}-i18n.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # These two are just the oldest version tested
 Requires: pygtk2 >= 1.99.12-6
 Requires: gnome-python2-gconf >= 1.99.11-7
 # Absolutely require this version or newer
-Requires: libvirt-python >= 0.4.0
+Requires: libvirt-python >= 0.4.5
 # Definitely does not work with earlier due to python API changes
 Requires: dbus-python >= 0.61
 # Might work with earlier, but this is what we've tested
@@ -35,10 +34,11 @@
 # will work just fine - keyring functionality will simply be
 # disabled
 Requires: gnome-python2-gnomekeyring >= 2.15.4
+Requires: gnome-python2-gnomevfs >= 2.15.4
 # Minimum we've tested with
 Requires: libxml2-python >= 2.6.23
-# Required to install Xen guests
-Requires: python-virtinst >= 0.300.2
+# Required to install Xen & QEMU guests
+Requires: python-virtinst >= 0.400.0
 # Required for loading the glade UI
 Requires: pygtk2-libglade
 # Required for our graphics which are currently SVG format
@@ -49,14 +49,23 @@
 Requires: usermode
 # For online help
 Requires: scrollkeeper
-# For the guest console
+# For console widget
 Requires: gtk-vnc-python >= 0.3.4
+# For local authentication against PolicyKit
+Requires: PolicyKit-gnome
 
 BuildRequires: pygtk2-devel
 BuildRequires: gtk2-devel
+BuildRequires: pygobject2-devel
+BuildRequires: glib2-devel
 BuildRequires: python-devel
+BuildRequires: pango-devel
+BuildRequires: atk-devel
+BuildRequires: cairo-devel
 BuildRequires: gettext
 BuildRequires: scrollkeeper
+BuildRequires: intltool
+
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -64,20 +73,20 @@
 Requires(postun): desktop-file-utils
 
 %description
-Virtual Machine Manager provides a graphical tool for administering
-virtual machines such as Xen. It uses libvirt as the backend management
-API.
+Virtual Machine Manager provides a graphical tool for administering virtual
+machines for KVM, Xen, and QEmu. Start, stop, add or remove virtual devices,
+connect to a graphical or serial console, and see resource usage statistics
+for existing VMs on local or remote machines. Uses libvirt as the backend
+management API.
 
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
 
 %build
 %configure
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install  DESTDIR=$RPM_BUILD_ROOT
@@ -162,6 +171,15 @@
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Wed Sep 10 2008 Cole Robinson <crobinso at redhat.com> - 0.6.0-1.fc10
+- Update to 0.6.0 release
+- Add libvirt storage management support
+- Basic support for remote guest installation
+- Merge VM console and details windows
+- Poll avahi for libvirtd advertisement
+- Hypervisor autoconnect option
+- Add sound emulation when creating new guests
+
 * Thu Apr  3 2008 Daniel P. Berrange <berrange at redhat.com> - 0.5.4-3.fc9
 - Updated sr, de, fi, it, pl translations
 


--- virt-manager-0.5.4-i18n.patch DELETED ---


--- virt-manager-0.5.4-polkit-root.patch DELETED ---



From notting at fedoraproject.org  Wed Sep 10 23:16:25 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 10 Sep 2008 23:16:25 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.98,1.99
Message-ID: <20080910231625.4CFF57012C@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6520

Modified Files:
	comps-f10.xml.in 
Log Message:
Make xterm optional. (#454232)



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- comps-f10.xml.in	10 Sep 2008 22:56:22 -0000	1.98
+++ comps-f10.xml.in	10 Sep 2008 23:15:54 -0000	1.99
@@ -325,7 +325,6 @@
       <packagereq type="default">system-config-users</packagereq>
       <packagereq type="default">xorg-x11-apps</packagereq>
       <packagereq type="default">xorg-x11-utils</packagereq>
-      <packagereq type="default">xterm</packagereq>
       <packagereq type="optional">alltray</packagereq>
       <packagereq type="optional">aterm</packagereq>
       <packagereq type="optional">devilspie</packagereq>
@@ -352,6 +351,7 @@
       <packagereq type="optional">xorg-x11-xfs</packagereq>
       <packagereq type="optional">xorg-x11-xfs-utils</packagereq>
       <packagereq type="optional">xorg-x11-xsm</packagereq>
+      <packagereq type="optional">xterm</packagereq>
       <packagereq type="optional">xscreensaver</packagereq>
       <packagereq type="optional">xscreensaver-base</packagereq>
       <packagereq type="optional">xscreensaver-extras</packagereq>



From pkgdb at fedoraproject.org  Wed Sep 10 23:26:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:26:18 +0000
Subject: [pkgdb] solar-backgrounds (Fedora, 9) updated by tibbs
Message-ID: <20080910232619.07B78208D9B@bastion.fedora.phx.redhat.com>

tibbs changed owner of solar-backgrounds in Fedora 9 to mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/solar-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 23:26:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:26:18 +0000
Subject: [pkgdb] solar-backgrounds summary updated by tibbs
Message-ID: <20080910232618.EAF61208D98@bastion.fedora.phx.redhat.com>

tibbs set package solar-backgrounds summary to Solar desktop backgrounds

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/solar-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 23:26:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:26:18 +0000
Subject: [pkgdb] solar-backgrounds (Fedora, 8) updated by tibbs
Message-ID: <20080910232619.C13A5208D9F@bastion.fedora.phx.redhat.com>

tibbs changed owner of solar-backgrounds in Fedora 8 to mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/solar-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 23:26:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:26:18 +0000
Subject: [pkgdb] solar-backgrounds (Fedora, devel) updated by tibbs
Message-ID: <20080910232619.CACD5208DA2@bastion.fedora.phx.redhat.com>

tibbs changed owner of solar-backgrounds in Fedora devel to mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/solar-backgrounds



From tibbs at fedoraproject.org  Wed Sep 10 23:28:03 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 10 Sep 2008 23:28:03 +0000 (UTC)
Subject: rpms/solar-backgrounds - New directory
Message-ID: <20080910232803.293A17012C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/solar-backgrounds
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvssX8115/rpms/solar-backgrounds

Log Message:
Directory /cvs/extras/rpms/solar-backgrounds added to the repository




From tibbs at fedoraproject.org  Wed Sep 10 23:28:04 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 10 Sep 2008 23:28:04 +0000 (UTC)
Subject: rpms/solar-backgrounds/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20080910232804.7E44F7012C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/solar-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvssX8115/rpms/solar-backgrounds/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module solar-backgrounds


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: solar-backgrounds
# $Id: Makefile,v 1.1 2008/09/10 23:28:04 tibbs Exp $
NAME := solar-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 tibbs at fedoraproject.org  Wed Sep 10 23:28:03 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 10 Sep 2008 23:28:03 +0000 (UTC)
Subject: rpms/solar-backgrounds/devel - New directory
Message-ID: <20080910232803.5E74B7012C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/solar-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvssX8115/rpms/solar-backgrounds/devel

Log Message:
Directory /cvs/extras/rpms/solar-backgrounds/devel added to the repository




From tibbs at fedoraproject.org  Wed Sep 10 23:28:04 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 10 Sep 2008 23:28:04 +0000 (UTC)
Subject: rpms/solar-backgrounds Makefile,NONE,1.1
Message-ID: <20080910232804.4C9DD7012C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/solar-backgrounds
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvssX8115/rpms/solar-backgrounds

Added Files:
	Makefile 
Log Message:
Setup of module solar-backgrounds


--- NEW FILE Makefile ---
# Top level Makefile for module solar-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 crobinso at fedoraproject.org  Wed Sep 10 23:28:44 2008
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Wed, 10 Sep 2008 23:28:44 +0000 (UTC)
Subject: rpms/virt-manager/devel virt-manager-0.6.0-polkit-root.patch, 1.1,
	1.2
Message-ID: <20080910232844.278D87012C@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8117

Modified Files:
	virt-manager-0.6.0-polkit-root.patch 
Log Message:
Fix polkit patch to not have any fuzz.


virt-manager-0.6.0-polkit-root.patch:

Index: virt-manager-0.6.0-polkit-root.patch
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager-0.6.0-polkit-root.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- virt-manager-0.6.0-polkit-root.patch	10 Sep 2008 23:06:21 -0000	1.1
+++ virt-manager-0.6.0-polkit-root.patch	10 Sep 2008 23:28:13 -0000	1.2
@@ -1,7 +1,7 @@
-diff -rup virt-manager-0.5.4.orig/src/virtManager/connection.py virt-manager-0.5.4/src/virtManager/connection.py
---- virt-manager-0.5.4.orig/src/virtManager/connection.py	2008-03-10 20:17:51.000000000 -0400
-+++ virt-manager-0.5.4/src/virtManager/connection.py	2008-03-13 13:51:14.000000000 -0400
-@@ -336,6 +336,9 @@ class vmmConnection(gobject.GObject):
+diff -rup virt-manager-0.6.0/src/virtManager/connection.py new/src/virtManager/connection.py
+--- virt-manager-0.6.0/src/virtManager/connection.py	2008-09-10 19:17:43.170355000 -0400
++++ new/src/virtManager/connection.py	2008-09-10 19:19:58.124618000 -0400
+@@ -376,6 +376,9 @@ class vmmConnection(gobject.GObject):
          self.connectThread.start()
  
      def _do_creds_polkit(self, action):
@@ -10,5 +10,4 @@
 +            return 0
          logging.debug("Doing policykit for %s" % action)
          bus = dbus.SessionBus()
-         obj = bus.get_object("org.gnome.PolicyKit", "/org/gnome/PolicyKit/Manager")
-Only in virt-manager-0.5.4/src/virtManager: connection.py~
+ 



From pkgdb at fedoraproject.org  Wed Sep 10 23:31:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:31:38 +0000
Subject: [pkgdb] neon-backgrounds summary updated by tibbs
Message-ID: <20080910233139.1263A208D98@bastion.fedora.phx.redhat.com>

tibbs set package neon-backgrounds summary to Neon desktop backgrounds

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/neon-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 23:31:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:31:38 +0000
Subject: [pkgdb] neon-backgrounds (Fedora, 9) updated by tibbs
Message-ID: <20080910233139.1668D208D9B@bastion.fedora.phx.redhat.com>

tibbs changed owner of neon-backgrounds in Fedora 9 to mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/neon-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 23:31:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:31:38 +0000
Subject: [pkgdb] neon-backgrounds (Fedora, devel) updated by tibbs
Message-ID: <20080910233139.2C749208D9F@bastion.fedora.phx.redhat.com>

tibbs changed owner of neon-backgrounds in Fedora devel to mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/neon-backgrounds



From notting at fedoraproject.org  Wed Sep 10 23:31:53 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 10 Sep 2008 23:31:53 +0000 (UTC)
Subject: rpms/comps-extras/devel sugar-desktop.png, NONE,
	1.1 comps-extras.spec, 1.27, 1.28
Message-ID: <20080910233153.4E1E77012C@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/comps-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8809

Modified Files:
	comps-extras.spec 
Added Files:
	sugar-desktop.png 
Log Message:
Add a sugar logo.



Index: comps-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/comps-extras/devel/comps-extras.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- comps-extras.spec	15 Jul 2008 17:49:05 -0000	1.27
+++ comps-extras.spec	10 Sep 2008 23:31:22 -0000	1.28
@@ -1,14 +1,16 @@
 Summary: Images for components included in Fedora
 Name: comps-extras
 Version: 13
-Release: 2
+Release: 3
 # no upstream source releases; the src.rpm is the source much like 
 # with fedora-release, etc.  anonymous cvs available via
 # cvs -d:pserver:anonymous at rhlinux.redhat.com:/usr/local/CVS co comps-extras
 Source0: %{name}-%{version}.tar.gz
+Source1: sugar-desktop.png
 # while GPL isn't normal for images, it is the case here
 # No version specified.
-License: GPL+
+# Sugar logo is CC-BY-SA, by One Laptop Per Child, Inc.
+License: GPL+ and CC-BY-SA
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -25,6 +27,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/comps/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -35,6 +38,9 @@
 %{_datadir}/pixmaps/comps/*
 
 %changelog
+* Wed Sep 10 2008 Bill Nottingham <notting at redhat.com> - 13-3
+- add a logo for Sugar desktop
+
 * Tue Jul 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 13-2
 - fix license tag
 



From tibbs at fedoraproject.org  Wed Sep 10 23:32:01 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 10 Sep 2008 23:32:01 +0000 (UTC)
Subject: rpms/neon-backgrounds - New directory
Message-ID: <20080910233201.233BF7012C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/neon-backgrounds
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsBH8934/rpms/neon-backgrounds

Log Message:
Directory /cvs/extras/rpms/neon-backgrounds added to the repository




From pkgdb at fedoraproject.org  Wed Sep 10 23:31:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:31:38 +0000
Subject: [pkgdb] neon-backgrounds (Fedora, 8) updated by tibbs
Message-ID: <20080910233139.56AFA208DA2@bastion.fedora.phx.redhat.com>

tibbs changed owner of neon-backgrounds in Fedora 8 to mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/neon-backgrounds



From tibbs at fedoraproject.org  Wed Sep 10 23:32:01 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 10 Sep 2008 23:32:01 +0000 (UTC)
Subject: rpms/neon-backgrounds/devel - New directory
Message-ID: <20080910233201.583197012C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/neon-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsBH8934/rpms/neon-backgrounds/devel

Log Message:
Directory /cvs/extras/rpms/neon-backgrounds/devel added to the repository




From tibbs at fedoraproject.org  Wed Sep 10 23:32:02 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 10 Sep 2008 23:32:02 +0000 (UTC)
Subject: rpms/neon-backgrounds Makefile,NONE,1.1
Message-ID: <20080910233202.3F1397012C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/neon-backgrounds
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsBH8934/rpms/neon-backgrounds

Added Files:
	Makefile 
Log Message:
Setup of module neon-backgrounds


--- NEW FILE Makefile ---
# Top level Makefile for module neon-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  Wed Sep 10 23:32:02 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 10 Sep 2008 23:32:02 +0000 (UTC)
Subject: rpms/neon-backgrounds/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080910233202.79F7F7012C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/neon-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsBH8934/rpms/neon-backgrounds/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module neon-backgrounds


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: neon-backgrounds
# $Id: Makefile,v 1.1 2008/09/10 23:32:02 tibbs Exp $
NAME := neon-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  Wed Sep 10 23:37:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:37:10 +0000
Subject: [pkgdb] invinxble-backgrounds summary updated by tibbs
Message-ID: <20080910233710.4E2F5208D97@bastion.fedora.phx.redhat.com>

tibbs set package invinxble-backgrounds summary to InvinXble desktop backgrounds

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/invinxble-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 23:37:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:37:10 +0000
Subject: [pkgdb] invinxble-backgrounds (Fedora, devel) updated by tibbs
Message-ID: <20080910233710.5D605208D9B@bastion.fedora.phx.redhat.com>

tibbs changed owner of invinxble-backgrounds in Fedora devel to mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/invinxble-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 23:37:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:37:10 +0000
Subject: [pkgdb] invinxble-backgrounds (Fedora, 9) updated by tibbs
Message-ID: <20080910233710.6B198208D9F@bastion.fedora.phx.redhat.com>

tibbs changed owner of invinxble-backgrounds in Fedora 9 to mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/invinxble-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 23:37:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:37:10 +0000
Subject: [pkgdb] invinxble-backgrounds (Fedora, 8) updated by tibbs
Message-ID: <20080910233710.7327D208DA2@bastion.fedora.phx.redhat.com>

tibbs changed owner of invinxble-backgrounds in Fedora 8 to mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/invinxble-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 23:37:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:37:35 +0000
Subject: [pkgdb] gears-backgrounds summary updated by tibbs
Message-ID: <20080910233735.59DCC208D98@bastion.fedora.phx.redhat.com>

tibbs set package gears-backgrounds summary to Gears desktop backgrounds

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gears-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 23:37:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:37:35 +0000
Subject: [pkgdb] gears-backgrounds (Fedora, 9) updated by tibbs
Message-ID: <20080910233735.62426208D9B@bastion.fedora.phx.redhat.com>

tibbs changed owner of gears-backgrounds in Fedora 9 to mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gears-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 23:37:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:37:35 +0000
Subject: [pkgdb] gears-backgrounds (Fedora, 8) updated by tibbs
Message-ID: <20080910233735.7F4B9208DA7@bastion.fedora.phx.redhat.com>

tibbs changed owner of gears-backgrounds in Fedora 8 to mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gears-backgrounds



From pkgdb at fedoraproject.org  Wed Sep 10 23:37:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:37:35 +0000
Subject: [pkgdb] gears-backgrounds (Fedora, devel) updated by tibbs
Message-ID: <20080910233735.86D74208DA9@bastion.fedora.phx.redhat.com>

tibbs changed owner of gears-backgrounds in Fedora devel to mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gears-backgrounds



From tibbs at fedoraproject.org  Wed Sep 10 23:37:50 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 10 Sep 2008 23:37:50 +0000 (UTC)
Subject: rpms/invinxble-backgrounds/devel - New directory
Message-ID: <20080910233750.593727012C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/invinxble-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsKV9927/rpms/invinxble-backgrounds/devel

Log Message:
Directory /cvs/extras/rpms/invinxble-backgrounds/devel added to the repository




From tibbs at fedoraproject.org  Wed Sep 10 23:37:50 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 10 Sep 2008 23:37:50 +0000 (UTC)
Subject: rpms/invinxble-backgrounds - New directory
Message-ID: <20080910233750.262BE7012C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/invinxble-backgrounds
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsKV9927/rpms/invinxble-backgrounds

Log Message:
Directory /cvs/extras/rpms/invinxble-backgrounds added to the repository




From tibbs at fedoraproject.org  Wed Sep 10 23:37:51 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 10 Sep 2008 23:37:51 +0000 (UTC)
Subject: rpms/invinxble-backgrounds Makefile,NONE,1.1
Message-ID: <20080910233751.489727012C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/invinxble-backgrounds
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsKV9927/rpms/invinxble-backgrounds

Added Files:
	Makefile 
Log Message:
Setup of module invinxble-backgrounds


--- NEW FILE Makefile ---
# Top level Makefile for module invinxble-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  Wed Sep 10 23:38:03 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 10 Sep 2008 23:38:03 +0000 (UTC)
Subject: rpms/gears-backgrounds - New directory
Message-ID: <20080910233803.1FF1D7012C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/gears-backgrounds
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsK10099/rpms/gears-backgrounds

Log Message:
Directory /cvs/extras/rpms/gears-backgrounds added to the repository




From tibbs at fedoraproject.org  Wed Sep 10 23:38:03 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 10 Sep 2008 23:38:03 +0000 (UTC)
Subject: rpms/gears-backgrounds/devel - New directory
Message-ID: <20080910233803.52ECB7012C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/gears-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsK10099/rpms/gears-backgrounds/devel

Log Message:
Directory /cvs/extras/rpms/gears-backgrounds/devel added to the repository




From tibbs at fedoraproject.org  Wed Sep 10 23:37:51 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 10 Sep 2008 23:37:51 +0000 (UTC)
Subject: rpms/invinxble-backgrounds/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080910233751.8001D7012C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/invinxble-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsKV9927/rpms/invinxble-backgrounds/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module invinxble-backgrounds


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: invinxble-backgrounds
# $Id: Makefile,v 1.1 2008/09/10 23:37:51 tibbs Exp $
NAME := invinxble-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 tibbs at fedoraproject.org  Wed Sep 10 23:38:04 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 10 Sep 2008 23:38:04 +0000 (UTC)
Subject: rpms/gears-backgrounds Makefile,NONE,1.1
Message-ID: <20080910233804.40A617012C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/gears-backgrounds
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsK10099/rpms/gears-backgrounds

Added Files:
	Makefile 
Log Message:
Setup of module gears-backgrounds


--- NEW FILE Makefile ---
# Top level Makefile for module gears-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  Wed Sep 10 23:38:04 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 10 Sep 2008 23:38:04 +0000 (UTC)
Subject: rpms/gears-backgrounds/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20080910233804.7AE0C7012C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/gears-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsK10099/rpms/gears-backgrounds/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gears-backgrounds


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gears-backgrounds
# $Id: Makefile,v 1.1 2008/09/10 23:38:04 tibbs Exp $
NAME := gears-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 mso at fedoraproject.org  Wed Sep 10 23:39:01 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Wed, 10 Sep 2008 23:39:01 +0000 (UTC)
Subject: rpms/neon-backgrounds/devel import.log, NONE,
	1.1 neon-backgrounds.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080910233901.6B57B7012C@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/neon-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9882/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log neon-backgrounds.spec 
Log Message:


Initial import to CVS.




--- NEW FILE import.log ---
neon-backgrounds-0_0_1-2_fc9:HEAD:neon-backgrounds-0.0.1-2.fc9.src.rpm:1221089808


--- NEW FILE neon-backgrounds.spec ---
Name:           neon-backgrounds
Version:        0.0.1
Release:        2%{?dist}
Summary:        Neon desktop backgrounds

Group:          Applications/Multimedia
License:        CC-BY-SA
URL:            https://fedoraproject.org/wiki/Artwork/F10Themes/Neon
Source0:        neon-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

%description
This package contains desktop backgrounds for the Neon theme.

%prep
%setup -q -n neon-%{version}


%build

%install
rm -rf $RPM_BUILD_ROOT
# copy image files
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/neon
cp -a $RPM_BUILD_DIR/neon-%{version}/*.png \
        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/neon
# copy metadata xml file
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
cp -a $RPM_BUILD_DIR/neon-%{version}/desktop-backgrounds-neon.xml \
        $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
%dir %{_datadir}/backgrounds
%dir %{_datadir}/backgrounds/neon
%{_datadir}/backgrounds/neon/*.png
%dir %{_datadir}/gnome-background-properties
%{_datadir}/gnome-background-properties/desktop-backgrounds-neon.xml


%changelog
* Wed Sep 10 2008 Martin Sourada <mso at fedoraproject.org> - 0.0.1-2
- Use %%{_datadir} instead of %%{_prefix}/share

* Wed Sep 10 2008 Martin Sourada <mso at fedoraproject.org> - 0.0.1-1
- Initial RPM package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/neon-backgrounds/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 23:32:02 -0000	1.1
+++ .cvsignore	10 Sep 2008 23:38:31 -0000	1.2
@@ -0,0 +1 @@
+neon-0.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/neon-backgrounds/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 23:32:02 -0000	1.1
+++ sources	10 Sep 2008 23:38:31 -0000	1.2
@@ -0,0 +1 @@
+df9eb47e9a2065aeb89c27c9a31a5f82  neon-0.0.1.tar.gz



From pkgdb at fedoraproject.org  Wed Sep 10 23:42:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:42:53 +0000
Subject: [pkgdb] pdsh (Fedora EPEL, 5) updated by tibbs
Message-ID: <20080910234253.9C211208D97@bastion.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for pdsh
tibbs has set commit to Approved for uberpackager on pdsh (Fedora EPEL 5)
tibbs has set build to Approved for uberpackager on pdsh (Fedora EPEL 5)
tibbs has set checkout to Approved for uberpackager on pdsh (Fedora EPEL 5)
tibbs changed owner of pdsh in Fedora EPEL 5 to spstarr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pdsh



From mso at fedoraproject.org  Wed Sep 10 23:47:16 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Wed, 10 Sep 2008 23:47:16 +0000 (UTC)
Subject: rpms/solar-backgrounds/devel import.log, NONE,
	1.1 solar-backgrounds.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080910234716.5741A7012C@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/solar-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11752/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log solar-backgrounds.spec 
Log Message:


Initial CVS import.




--- NEW FILE import.log ---
solar-backgrounds-0_0_1-2_fc9:HEAD:solar-backgrounds-0.0.1-2.fc9.src.rpm:1221090252


--- NEW FILE solar-backgrounds.spec ---
Name:           solar-backgrounds
Version:        0.0.1
Release:        2%{?dist}
Summary:        Solar desktop backgrounds

Group:          Applications/Multimedia
License:        CC-BY-SA
URL:            https://fedoraproject.org/wiki/Artwork/F10Themes/Solar
Source0:        solar-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

%description
This package contains desktop backgrounds for the Solar theme.

%prep
%setup -q -n solar-%{version}


%build


%install
rm -rf $RPM_BUILD_ROOT
# copy image files
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/solar
cp -a $RPM_BUILD_DIR/solar-%{version}/*.png \
        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/solar
# copy slideshow xml file
cp -a $RPM_BUILD_DIR/solar-%{version}/solar.xml \
        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/solar
# copy metadata xml file
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
cp -a $RPM_BUILD_DIR/solar-%{version}/desktop-backgrounds-solar.xml \
        $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
%dir %{_datadir}/backgrounds
%dir %{_datadir}/backgrounds/solar
%{_datadir}/backgrounds/solar/*.png
%{_datadir}/backgrounds/solar/solar.xml
%dir %{_datadir}/gnome-background-properties
%{_datadir}/gnome-background-properties/desktop-backgrounds-solar.xml



%changelog
* Wed Sep 10 2008 Martin Sourada <mso at fedoraproject.org> - 0.0.1-2
- Use %%{_datadir} instead of %%{_prefix}/share

* Wed Sep 10 2008 Martin Sourada <mso at fedoraproject.org> - 0.0.1-1
- Initial RPM package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/solar-backgrounds/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 23:28:04 -0000	1.1
+++ .cvsignore	10 Sep 2008 23:46:45 -0000	1.2
@@ -0,0 +1 @@
+solar-0.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/solar-backgrounds/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 23:28:04 -0000	1.1
+++ sources	10 Sep 2008 23:46:45 -0000	1.2
@@ -0,0 +1 @@
+7c6cb62865fa93b30b09b15795dfc2cd  solar-0.0.1.tar.gz



From mso at fedoraproject.org  Wed Sep 10 23:48:50 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Wed, 10 Sep 2008 23:48:50 +0000 (UTC)
Subject: rpms/gears-backgrounds/devel gears-backgrounds.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080910234850.126CB7012C@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/gears-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12159/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gears-backgrounds.spec import.log 
Log Message:


Initial CVS import.




--- NEW FILE gears-backgrounds.spec ---
Name:           gears-backgrounds
Version:        0.0.1
Release:        2%{?dist}
Summary:        Gears desktop backgrounds

Group:          Applications/Multimedia
License:        CC-BY-SA
URL:            https://fedoraproject.org/wiki/Artwork/F10Themes/Gears
Source0:        gears-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

%description
This package contains desktop backgrounds for the Gears theme.

%prep
%setup -q -n gears-%{version}


%build

%install
rm -rf $RPM_BUILD_ROOT
# copy image files
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/gears
cp -a $RPM_BUILD_DIR/gears-%{version}/*.png \
        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/gears
# copy metadata xml file
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
cp -a $RPM_BUILD_DIR/gears-%{version}/desktop-backgrounds-gears.xml \
        $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
%dir %{_datadir}/backgrounds
%dir %{_datadir}/backgrounds/gears
%{_datadir}/backgrounds/gears/*.png
%dir %{_datadir}/gnome-background-properties
%{_datadir}/gnome-background-properties/desktop-backgrounds-gears.xml


%changelog
* Wed Sep 10 2008 Martin Sourada <mso at fedoraproject.org> - 0.0.1-2
- Use %%{_datadir} instead of %%{_prefix}/share

* Wed Sep 10 2008 Martin Sourada <mso at fedoraproject.org> - 0.0.1-1
- Initial RPM package


--- NEW FILE import.log ---
gears-backgrounds-0_0_1-2_fc9:HEAD:gears-backgrounds-0.0.1-2.fc9.src.rpm:1221090412


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gears-backgrounds/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 23:38:04 -0000	1.1
+++ .cvsignore	10 Sep 2008 23:48:19 -0000	1.2
@@ -0,0 +1 @@
+gears-0.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gears-backgrounds/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 23:38:04 -0000	1.1
+++ sources	10 Sep 2008 23:48:19 -0000	1.2
@@ -0,0 +1 @@
+274bac85124ea9225852bb547dedb783  gears-0.0.1.tar.gz



From mso at fedoraproject.org  Wed Sep 10 23:49:34 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Wed, 10 Sep 2008 23:49:34 +0000 (UTC)
Subject: rpms/invinxble-backgrounds/devel import.log, NONE,
	1.1 invinxble-backgrounds.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080910234934.2B6727012C@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/invinxble-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12405/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log invinxble-backgrounds.spec 
Log Message:


Initial CVS import.




--- NEW FILE import.log ---
invinxble-backgrounds-0_0_1-2_fc9:HEAD:invinxble-backgrounds-0.0.1-2.fc9.src.rpm:1221090491


--- NEW FILE invinxble-backgrounds.spec ---
Name:           invinxble-backgrounds
Version:        0.0.1
Release:        2%{?dist}
Summary:        InvinXble desktop backgrounds

Group:          Applications/Multimedia
License:        CC-BY-SA
URL:            https://fedoraproject.org/wiki/Artwork/F10Themes/InvinXble
Source0:        invinxble-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

%description
This package contains desktop backgrounds for the InvinXble theme.

%prep
%setup -q -n invinxble-%{version}


%build

%install
rm -rf $RPM_BUILD_ROOT
# copy image files
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/invinxble
cp -a $RPM_BUILD_DIR/invinxble-%{version}/*.png \
        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/invinxble
# copy metadata xml file
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
cp -a $RPM_BUILD_DIR/invinxble-%{version}/desktop-backgrounds-invinxble.xml \
        $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
%dir %{_datadir}/backgrounds
%dir %{_datadir}/backgrounds/invinxble
%{_datadir}/backgrounds/invinxble/*.png
%dir %{_datadir}/gnome-background-properties
%{_datadir}/gnome-background-properties/desktop-backgrounds-invinxble.xml


%changelog
* Wed Sep 10 2008 Martin Sourada <mso at fedoraproject.org> - 0.0.1-2
- Use %%{_datadir} instead of %%{_prefix}/share

* Wed Sep 10 2008 Martin Sourada <mso at fedoraproject.org> - 0.0.1-1
- Initial RPM package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/invinxble-backgrounds/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 23:37:51 -0000	1.1
+++ .cvsignore	10 Sep 2008 23:49:03 -0000	1.2
@@ -0,0 +1 @@
+invinxble-0.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/invinxble-backgrounds/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 23:37:51 -0000	1.1
+++ sources	10 Sep 2008 23:49:03 -0000	1.2
@@ -0,0 +1 @@
+354d95df8776b15ea774821ee66c73e4  invinxble-0.0.1.tar.gz



From jkeating at fedoraproject.org  Wed Sep 10 23:50:57 2008
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Wed, 10 Sep 2008 23:50:57 +0000 (UTC)
Subject: fedora-release/compose f9-fedora.ks, 1.1.2.2,
	1.1.2.3 livecd-fedora-9-base-desktop.ks, 1.1.2.1, 1.1.2.2
Message-ID: <20080910235057.F31DD7012C@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release/compose
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12898/compose

Modified Files:
      Tag: F-9
	f9-fedora.ks livecd-fedora-9-base-desktop.ks 
Log Message:
Adjust compose configs to point to the .newkey location



Index: f9-fedora.ks
===================================================================
RCS file: /cvs/fedora/fedora-release/compose/Attic/f9-fedora.ks,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- f9-fedora.ks	6 May 2008 16:42:56 -0000	1.1.2.2
+++ f9-fedora.ks	10 Sep 2008 23:50:57 -0000	1.1.2.3
@@ -8,8 +8,8 @@
 # Add the repos you wish to use to compose here.  At least one of them needs group data.
 repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch
 repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-9&arch=$basearch
-repo --name=fedora-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=$basearch
-repo --name=fedora-updates-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f9&arch=$basearch
+repo --name=fedora-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9.newkey&arch=$basearch
+repo --name=fedora-updates-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f9.newkey&arch=$basearch
 
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (@base is added by default unless you add --nobase to %packages)


Index: livecd-fedora-9-base-desktop.ks
===================================================================
RCS file: /cvs/fedora/fedora-release/compose/Attic/livecd-fedora-9-base-desktop.ks,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- livecd-fedora-9-base-desktop.ks	2 May 2008 15:59:00 -0000	1.1.2.1
+++ livecd-fedora-9-base-desktop.ks	10 Sep 2008 23:50:57 -0000	1.1.2.2
@@ -9,7 +9,7 @@
 services --enabled=NetworkManager --disabled=network,sshd
 
 repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch
-repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=$basearch
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9.newkey&arch=$basearch
 
 %packages
 @base-x



From pkgdb at fedoraproject.org  Wed Sep 10 23:58:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:58:06 +0000
Subject: [pkgdb] gnome-valgrind-session was added for rishi
Message-ID: <20080910235806.2CF98208D98@bastion.fedora.phx.redhat.com>

tibbs has added Package gnome-valgrind-session with summary Run an entire GNOME session under valgrind
tibbs has approved Package gnome-valgrind-session
tibbs has added a Fedora devel branch for gnome-valgrind-session with an owner of rishi
tibbs has approved gnome-valgrind-session in Fedora devel
tibbs has approved Package gnome-valgrind-session
tibbs has set commit to Approved for packager on gnome-valgrind-session (Fedora devel)
tibbs has set build to Approved for packager on gnome-valgrind-session (Fedora devel)
tibbs has set checkout to Approved for packager on gnome-valgrind-session (Fedora devel)
tibbs has set commit to Approved for uberpackager on gnome-valgrind-session (Fedora devel)
tibbs has set build to Approved for uberpackager on gnome-valgrind-session (Fedora devel)
tibbs has set checkout to Approved for uberpackager on gnome-valgrind-session (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-valgrind-session



From pkgdb at fedoraproject.org  Wed Sep 10 23:58:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:58:07 +0000
Subject: [pkgdb] gnome-valgrind-session (Fedora, 9) updated by tibbs
Message-ID: <20080910235807.555C1208D9C@bastion.fedora.phx.redhat.com>

tibbs added a Fedora 9 branch for gnome-valgrind-session
tibbs has set commit to Approved for uberpackager on gnome-valgrind-session (Fedora 9)
tibbs has set build to Approved for uberpackager on gnome-valgrind-session (Fedora 9)
tibbs has set checkout to Approved for uberpackager on gnome-valgrind-session (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-valgrind-session



From pkgdb at fedoraproject.org  Wed Sep 10 23:58:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:58:07 +0000
Subject: [pkgdb] gnome-valgrind-session (Fedora, 8) updated by tibbs
Message-ID: <20080910235807.67BD82D0020@bastion.fedora.phx.redhat.com>

tibbs added a Fedora 8 branch for gnome-valgrind-session
tibbs has set commit to Approved for uberpackager on gnome-valgrind-session (Fedora 8)
tibbs has set build to Approved for uberpackager on gnome-valgrind-session (Fedora 8)
tibbs has set checkout to Approved for uberpackager on gnome-valgrind-session (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-valgrind-session



From wtogami at fedoraproject.org  Wed Sep 10 23:59:09 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 10 Sep 2008 23:59:09 +0000 (UTC)
Subject: rpms/ltsp/devel .cvsignore, 1.8, 1.9 ltsp.spec, 1.12, 1.13 sources, 
	1.12, 1.13
Message-ID: <20080910235909.5B2E37012F@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13801

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
sync with F-9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Aug 2008 02:33:44 -0000	1.8
+++ .cvsignore	10 Sep 2008 23:58:39 -0000	1.9
@@ -1 +1 @@
-ltsp-5.1.22.tar.bz2
+ltsp-5.1.23.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/ltsp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ltsp.spec	28 Aug 2008 02:33:45 -0000	1.12
+++ ltsp.spec	10 Sep 2008 23:58:39 -0000	1.13
@@ -1,7 +1,7 @@
 Name:           ltsp
-Version:        5.1.22
-%define _datestamp .20080824.12
-#Release:        8%{_datestamp}%{?dist}
+Version:        5.1.23
+%define _datestamp .20080910.10
+#Release:        3%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
 Group:          User Interface/Desktops
@@ -45,6 +45,7 @@
 Requires:       chkconfig
 Requires:       ltspfsd
 Requires:       nbd
+Requires(post): initscripts
 BuildRequires:  glib2-devel
 
 %description client
@@ -403,6 +404,10 @@
 %endif
 
 %changelog
+* Wed Sep 10 2008 Warren Togami <wtogami at redhat.com> - 5.1.23-1
+- Point F8 and F9 client chroot builder at newkey repos
+- Ensure that initscripts installs before ltsp-client
+
 * Wed Aug 27 2008 Warren Togami <wtogami at redhat.com> - 5.1.22-1
 - Exclude /var/cache/yum/* from mksquashfs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	28 Aug 2008 02:33:45 -0000	1.12
+++ sources	10 Sep 2008 23:58:39 -0000	1.13
@@ -1 +1 @@
-26cd47cf352aae0575ff6a04bc0584ec  ltsp-5.1.22.tar.bz2
+65f3c87d86ef8e42bc6d417876182968  ltsp-5.1.23.tar.bz2



From pkgdb at fedoraproject.org  Wed Sep 10 23:59:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:59:17 +0000
Subject: [pkgdb] python-pysctp was added for nhorman
Message-ID: <20080910235917.3B92C208D99@bastion.fedora.phx.redhat.com>

tibbs has added Package python-pysctp with summary python bindings for the SCTP sockets extension api
tibbs has approved Package python-pysctp
tibbs has added a Fedora devel branch for python-pysctp with an owner of nhorman
tibbs has approved python-pysctp in Fedora devel
tibbs has approved Package python-pysctp
tibbs has set commit to Approved for packager on python-pysctp (Fedora devel)
tibbs has set build to Approved for packager on python-pysctp (Fedora devel)
tibbs has set checkout to Approved for packager on python-pysctp (Fedora devel)
tibbs has set commit to Approved for uberpackager on python-pysctp (Fedora devel)
tibbs has set build to Approved for uberpackager on python-pysctp (Fedora devel)
tibbs has set checkout to Approved for uberpackager on python-pysctp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pysctp



From pkgdb at fedoraproject.org  Wed Sep 10 23:59:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:59:18 +0000
Subject: [pkgdb] python-pysctp (Fedora EPEL, 5) updated by tibbs
Message-ID: <20080910235918.60EB3208D9E@bastion.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for python-pysctp
tibbs has set commit to Approved for uberpackager on python-pysctp (Fedora EPEL 5)
tibbs has set build to Approved for uberpackager on python-pysctp (Fedora EPEL 5)
tibbs has set checkout to Approved for uberpackager on python-pysctp (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pysctp



From pkgdb at fedoraproject.org  Wed Sep 10 23:59:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:59:18 +0000
Subject: [pkgdb] python-pysctp (Fedora EPEL, 4) updated by tibbs
Message-ID: <20080910235918.6A6AC208DA1@bastion.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 4 branch for python-pysctp
tibbs has set commit to Approved for uberpackager on python-pysctp (Fedora EPEL 4)
tibbs has set build to Approved for uberpackager on python-pysctp (Fedora EPEL 4)
tibbs has set checkout to Approved for uberpackager on python-pysctp (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pysctp



From pkgdb at fedoraproject.org  Wed Sep 10 23:59:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 10 Sep 2008 23:59:18 +0000
Subject: [pkgdb] python-pysctp (Fedora, 9) updated by tibbs
Message-ID: <20080910235918.75ADF208DA4@bastion.fedora.phx.redhat.com>

tibbs added a Fedora 9 branch for python-pysctp
tibbs has set commit to Approved for uberpackager on python-pysctp (Fedora 9)
tibbs has set build to Approved for uberpackager on python-pysctp (Fedora 9)
tibbs has set checkout to Approved for uberpackager on python-pysctp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pysctp



From pkgdb at fedoraproject.org  Thu Sep 11 00:00:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 00:00:57 +0000
Subject: [pkgdb] gflags was added for rakesh
Message-ID: <20080911000057.A0F88208D99@bastion.fedora.phx.redhat.com>

tibbs has added Package gflags with summary Library for commandline flag processing
tibbs has approved Package gflags
tibbs has added a Fedora devel branch for gflags with an owner of rakesh
tibbs has approved gflags in Fedora devel
tibbs has approved Package gflags
tibbs has set commit to Approved for packager on gflags (Fedora devel)
tibbs has set build to Approved for packager on gflags (Fedora devel)
tibbs has set checkout to Approved for packager on gflags (Fedora devel)
tibbs has set commit to Approved for uberpackager on gflags (Fedora devel)
tibbs has set build to Approved for uberpackager on gflags (Fedora devel)
tibbs has set checkout to Approved for uberpackager on gflags (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gflags



From pkgdb at fedoraproject.org  Thu Sep 11 00:00:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 00:00:58 +0000
Subject: [pkgdb] gflags (Fedora, 9) updated by tibbs
Message-ID: <20080911000058.7D879208D9C@bastion.fedora.phx.redhat.com>

tibbs added a Fedora 9 branch for gflags
tibbs has set commit to Approved for uberpackager on gflags (Fedora 9)
tibbs has set build to Approved for uberpackager on gflags (Fedora 9)
tibbs has set checkout to Approved for uberpackager on gflags (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gflags



From pkgdb at fedoraproject.org  Thu Sep 11 00:00:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 00:00:58 +0000
Subject: [pkgdb] gflags (Fedora, 8) updated by tibbs
Message-ID: <20080911000058.8BCD4208DA0@bastion.fedora.phx.redhat.com>

tibbs added a Fedora 8 branch for gflags
tibbs has set commit to Approved for uberpackager on gflags (Fedora 8)
tibbs has set build to Approved for uberpackager on gflags (Fedora 8)
tibbs has set checkout to Approved for uberpackager on gflags (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gflags



From pkgdb at fedoraproject.org  Thu Sep 11 00:02:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 00:02:31 +0000
Subject: [pkgdb] pymssql (Fedora EPEL, 5) updated by tibbs
Message-ID: <20080911000232.22FE2208D99@bastion.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for pymssql
tibbs has set commit to Approved for uberpackager on pymssql (Fedora EPEL 5)
tibbs has set build to Approved for uberpackager on pymssql (Fedora EPEL 5)
tibbs has set checkout to Approved for uberpackager on pymssql (Fedora EPEL 5)
tibbs changed owner of pymssql in Fedora EPEL 5 to rayvd
tibbs Approved packager for commit access on pymssql (Fedora EPEL 5)
tibbs Approved uberpackager for commit access on pymssql (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pymssql



From tibbs at fedoraproject.org  Thu Sep 11 00:03:06 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 11 Sep 2008 00:03:06 +0000 (UTC)
Subject: rpms/gnome-valgrind-session - New directory
Message-ID: <20080911000306.2DD3070131@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/gnome-valgrind-session
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsu14381/rpms/gnome-valgrind-session

Log Message:
Directory /cvs/extras/rpms/gnome-valgrind-session added to the repository




From tibbs at fedoraproject.org  Thu Sep 11 00:03:07 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 11 Sep 2008 00:03:07 +0000 (UTC)
Subject: rpms/gnome-valgrind-session Makefile,NONE,1.1
Message-ID: <20080911000307.6ACCF70131@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/gnome-valgrind-session
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsu14381/rpms/gnome-valgrind-session

Added Files:
	Makefile 
Log Message:
Setup of module gnome-valgrind-session


--- NEW FILE Makefile ---
# Top level Makefile for module gnome-valgrind-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 tibbs at fedoraproject.org  Thu Sep 11 00:03:06 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 11 Sep 2008 00:03:06 +0000 (UTC)
Subject: rpms/gnome-valgrind-session/devel - New directory
Message-ID: <20080911000306.72ECA70131@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/gnome-valgrind-session/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsu14381/rpms/gnome-valgrind-session/devel

Log Message:
Directory /cvs/extras/rpms/gnome-valgrind-session/devel added to the repository




From tibbs at fedoraproject.org  Thu Sep 11 00:03:07 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 11 Sep 2008 00:03:07 +0000 (UTC)
Subject: rpms/gnome-valgrind-session/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080911000307.B0D6170131@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/gnome-valgrind-session/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsu14381/rpms/gnome-valgrind-session/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnome-valgrind-session


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gnome-valgrind-session
# $Id: Makefile,v 1.1 2008/09/11 00:03:07 tibbs Exp $
NAME := gnome-valgrind-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 tibbs at fedoraproject.org  Thu Sep 11 00:03:20 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 11 Sep 2008 00:03:20 +0000 (UTC)
Subject: rpms/python-pysctp - New directory
Message-ID: <20080911000320.22A4A70131@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/python-pysctp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsV14544/rpms/python-pysctp

Log Message:
Directory /cvs/extras/rpms/python-pysctp added to the repository




From tibbs at fedoraproject.org  Thu Sep 11 00:03:21 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 11 Sep 2008 00:03:21 +0000 (UTC)
Subject: rpms/python-pysctp Makefile,NONE,1.1
Message-ID: <20080911000321.27A9770131@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/python-pysctp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsV14544/rpms/python-pysctp

Added Files:
	Makefile 
Log Message:
Setup of module python-pysctp


--- NEW FILE Makefile ---
# Top level Makefile for module python-pysctp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep 11 00:03:20 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 11 Sep 2008 00:03:20 +0000 (UTC)
Subject: rpms/python-pysctp/devel - New directory
Message-ID: <20080911000320.5631670131@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/python-pysctp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsV14544/rpms/python-pysctp/devel

Log Message:
Directory /cvs/extras/rpms/python-pysctp/devel added to the repository




From tibbs at fedoraproject.org  Thu Sep 11 00:03:21 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 11 Sep 2008 00:03:21 +0000 (UTC)
Subject: rpms/python-pysctp/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080911000321.5BA2C70131@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/python-pysctp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsV14544/rpms/python-pysctp/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-pysctp


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-pysctp
# $Id: Makefile,v 1.1 2008/09/11 00:03:21 tibbs Exp $
NAME := python-pysctp
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From tibbs at fedoraproject.org  Thu Sep 11 00:03:33 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 11 Sep 2008 00:03:33 +0000 (UTC)
Subject: rpms/gflags - New directory
Message-ID: <20080911000333.20AEC70131@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/gflags
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsu14744/rpms/gflags

Log Message:
Directory /cvs/extras/rpms/gflags added to the repository




From tibbs at fedoraproject.org  Thu Sep 11 00:03:33 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 11 Sep 2008 00:03:33 +0000 (UTC)
Subject: rpms/gflags/devel - New directory
Message-ID: <20080911000333.52EF570131@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/gflags/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsu14744/rpms/gflags/devel

Log Message:
Directory /cvs/extras/rpms/gflags/devel added to the repository




From tibbs at fedoraproject.org  Thu Sep 11 00:03:34 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 11 Sep 2008 00:03:34 +0000 (UTC)
Subject: rpms/gflags Makefile,NONE,1.1
Message-ID: <20080911000334.224B670131@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/gflags
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsu14744/rpms/gflags

Added Files:
	Makefile 
Log Message:
Setup of module gflags


--- NEW FILE Makefile ---
# Top level Makefile for module gflags
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep 11 00:03:34 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 11 Sep 2008 00:03:34 +0000 (UTC)
Subject: rpms/gflags/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080911000334.58B3F70131@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/gflags/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/tmpcvsu14744/rpms/gflags/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gflags


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gflags
# $Id: Makefile,v 1.1 2008/09/11 00:03:34 tibbs Exp $
NAME := gflags
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 11 01:51:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 01:51:50 +0000
Subject: [pkgdb] bluez was added for hadess
Message-ID: <20080911015150.AAAD9208D98@bastion.fedora.phx.redhat.com>

katzj has added Package bluez with summary Bluetooth utilities
katzj has approved Package bluez
katzj has added a Fedora devel branch for bluez with an owner of hadess
katzj has approved bluez in Fedora devel
katzj has approved Package bluez
katzj has set commit to Approved for packager on bluez (Fedora devel)
katzj has set build to Approved for packager on bluez (Fedora devel)
katzj has set checkout to Approved for packager on bluez (Fedora devel)
katzj has set commit to Approved for uberpackager on bluez (Fedora devel)
katzj has set build to Approved for uberpackager on bluez (Fedora devel)
katzj has set checkout to Approved for uberpackager on bluez (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Thu Sep 11 01:51:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 01:51:52 +0000
Subject: [pkgdb] bluez (Fedora, devel) updated by katzj
Message-ID: <20080911015152.82341208D9C@bastion.fedora.phx.redhat.com>

katzj approved watchbugzilla on bluez (Fedora devel) for holtmann
katzj approved watchcommits on bluez (Fedora devel) for holtmann
katzj approved watchbugzilla on bluez (Fedora devel) for dwmw2
katzj approved watchcommits on bluez (Fedora devel) for dwmw2
katzj approved commit on bluez (Fedora devel) for dwmw2
katzj approved build on bluez (Fedora devel) for dwmw2
katzj approved approveacls on bluez (Fedora devel) for dwmw2

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Thu Sep 11 01:51:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 01:51:52 +0000
Subject: [pkgdb] bluez (Fedora, 9) updated by katzj
Message-ID: <20080911015152.95F4A2D0021@bastion.fedora.phx.redhat.com>

katzj added a Fedora 9 branch for bluez
katzj has set commit to Approved for uberpackager on bluez (Fedora 9)
katzj has set build to Approved for uberpackager on bluez (Fedora 9)
katzj has set checkout to Approved for uberpackager on bluez (Fedora 9)
katzj approved watchbugzilla on bluez (Fedora 9) for holtmann
katzj approved watchcommits on bluez (Fedora 9) for holtmann
katzj approved watchbugzilla on bluez (Fedora 9) for dwmw2
katzj approved watchcommits on bluez (Fedora 9) for dwmw2
katzj approved commit on bluez (Fedora 9) for dwmw2
katzj approved build on bluez (Fedora 9) for dwmw2
katzj approved approveacls on bluez (Fedora 9) for dwmw2

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From katzj at fedoraproject.org  Thu Sep 11 01:53:55 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Thu, 11 Sep 2008 01:53:55 +0000 (UTC)
Subject: rpms/bluez - New directory
Message-ID: <20080911015355.8F42770132@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/bluez
In directory cvs1.fedora.phx.redhat.com:/home/fedora/katzj/pkgs-cvsroot/admin/tmpcvsP28526/rpms/bluez

Log Message:
Directory /cvs/extras/rpms/bluez added to the repository




From katzj at fedoraproject.org  Thu Sep 11 01:53:56 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Thu, 11 Sep 2008 01:53:56 +0000 (UTC)
Subject: rpms/bluez Makefile,NONE,1.1
Message-ID: <20080911015356.B306870131@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/bluez
In directory cvs1.fedora.phx.redhat.com:/home/fedora/katzj/pkgs-cvsroot/admin/tmpcvsP28526/rpms/bluez

Added Files:
	Makefile 
Log Message:
Setup of module bluez


--- NEW FILE Makefile ---
# Top level Makefile for module bluez
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From katzj at fedoraproject.org  Thu Sep 11 01:53:55 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Thu, 11 Sep 2008 01:53:55 +0000 (UTC)
Subject: rpms/bluez/devel - New directory
Message-ID: <20080911015355.9611A70133@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/katzj/pkgs-cvsroot/admin/tmpcvsP28526/rpms/bluez/devel

Log Message:
Directory /cvs/extras/rpms/bluez/devel added to the repository




From katzj at fedoraproject.org  Thu Sep 11 01:53:57 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Thu, 11 Sep 2008 01:53:57 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20080911015357.1354770131@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/katzj/pkgs-cvsroot/admin/tmpcvsP28526/rpms/bluez/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bluez


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: bluez
# $Id: Makefile,v 1.1 2008/09/11 01:53:56 katzj Exp $
NAME := bluez
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From dwmw2 at fedoraproject.org  Thu Sep 11 02:10:56 2008
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Thu, 11 Sep 2008 02:10:56 +0000 (UTC)
Subject: rpms/bluez/devel bluetooth.conf, NONE, 1.1 bluetooth.init, NONE,
	1.1 bluez-4.4-input.patch, NONE, 1.1 bluez-utils-oui-usage.patch,
	NONE, 1.1 bluez.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080911021056.83C1A70131@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31037/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bluetooth.conf bluetooth.init bluez-4.4-input.patch 
	bluez-utils-oui-usage.patch bluez.spec import.log 
Log Message:
First import



--- NEW FILE bluetooth.conf ---
# Enable this to use hid2hci to switch a Bluetooth device in USB HID mode
# to HCI mode for Bluetooth operation.
#HID2HCI_ENABLE=true

# Enable this to switch capable devices back to HID mode on Bluetooth shutdown
#HID2HCI_UNDO=true


--- NEW FILE bluetooth.init ---
#!/bin/sh

### BEGIN INIT INFO
# Required-Start: $syslog messagebus
# Short-Description: Bluetooth services
# Description: Bluetooth services for service discovery, authentication, 
#  Human Interface Devices, etc.
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

[ -e /etc/sysconfig/bluetooth ] && . /etc/sysconfig/bluetooth

start()
{
	echo -n $"Starting Bluetooth services:"
	[ "$HID2HCI_ENABLE" = "true" ] && hid2hci --tohci > /dev/null 2>&1 || :
	touch /var/lock/subsys/bluetooth
	echo ""
	return $RETVAL
}

stop()
{
	echo -n "Stopping Bluetooth services:"
	[ "$HID2HCI_UNDO" = "true" ] && hid2hci --tohid > /dev/null 2>&1 || :
	rm -f /var/lock/subsys/bluetooth
	echo ""
	return $RETVAL
}

case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  force-reload|restart|reload)
        stop
        start
        ;;
  try-restart|condrestart)
        [ -e /var/lock/subsys/bluetooth ] && (stop; start)
        ;;
  status)
        status hcid
	RETVAL=$?
        ;;
  *)
        echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
        exit 3
	;;
esac

exit $RETVAL

bluez-4.4-input.patch:

--- NEW FILE bluez-4.4-input.patch ---
commit af3684270a0fe4a753e5199dfa58acd7f9b2038c
Author: Marcel Holtmann <marcel at holtmann.org>
Date:   Wed Sep 10 00:19:00 2008 +0200

    The input connect method takes no parameters

diff --git a/input/device.c b/input/device.c
index 0283918..d079831 100644
--- a/input/device.c
+++ b/input/device.c
@@ -912,14 +912,9 @@ static DBusMessage *device_connect(DBusConnection *conn,
 	struct input_device *idev = data;
 	struct input_conn *iconn;
 	struct fake_input *fake;
-	const char *svc;
 	int err;
 
-	if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &svc,
-						DBUS_TYPE_INVALID) == FALSE)
-		return NULL;
-
-	iconn = find_connection(idev->connections, svc);
+	iconn = find_connection(idev->connections, "HID");
 	if (!iconn)
 		return not_supported(msg);
 
@@ -1012,7 +1007,7 @@ static void device_unregister(void *data)
 }
 
 static GDBusMethodTable device_methods[] = {
-	{ "Connect",		"s",	"",	device_connect,
+	{ "Connect",		"",	"",	device_connect,
 						G_DBUS_METHOD_FLAG_ASYNC },
 	{ "Disconnect",		"",	"",	device_disconnect	},
 	{ "IsConnected",	"",	"b",	device_is_connected	},

bluez-utils-oui-usage.patch:

--- NEW FILE bluez-utils-oui-usage.patch ---
Index: common/oui.c
===================================================================
RCS file: /cvsroot/bluez/utils/common/oui.c,v
retrieving revision 1.2
diff -u -p -r1.2 oui.c
--- common/oui.c	13 Jan 2007 17:48:12 -0000	1.2
+++ common/oui.c	25 Jan 2008 12:16:58 -0000
@@ -38,7 +38,7 @@
 
 /* http://standards.ieee.org/regauth/oui/oui.txt */
 
-#define OUIFILE "/var/lib/misc/oui.txt"
+#define OUIFILE "/usr/share/hwdata/oui.txt"
 
 char *ouitocomp(const char *oui)
 {
@@ -46,14 +46,9 @@ char *ouitocomp(const char *oui)
 	char *str, *map, *off, *end;
 	int fd;
 
-	fd = open("oui.txt", O_RDONLY);
+	fd = open(OUIFILE, O_RDONLY);
 	if (fd < 0) {
-		fd = open(OUIFILE, O_RDONLY);
-		if (fd < 0) {
-			fd = open("/usr/share/misc/oui.txt", O_RDONLY);
-			if (fd < 0)
-				return NULL;
-		}
+		return NULL;
 	}
 
 	if (fstat(fd, &st) < 0) {


--- NEW FILE bluez.spec ---
Summary: Bluetooth libraries and utilities
Name: bluez
Version: 4.4
Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Libraries
Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
Source1: bluetooth.init
Source2: bluetooth.conf
Patch1: bluez-utils-oui-usage.patch
Patch2: bluez-4.4-input.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
URL: http://www.bluez.org/

BuildRequires: flex
BuildRequires: dbus-devel >= 0.90
BuildRequires: libusb-devel, glib2-devel, alsa-lib-devel
BuildRequires: gstreamer-plugins-base-devel, gstreamer-devel
BuildRequires: libsndfile-devel

ExcludeArch: s390 s390x

%description
Libraries and utilities for use in Bluetooth applications.

The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A.

%package libs
Summary: Libraries for use in Bluetooth applications
Group: System Environment/Libraries

%package libs-devel
Summary: Development libraries for Bluetooth applications
Group: Development/Libraries
Requires: bluez-libs = %{version}
Requires: pkgconfig
Obsoletes: bluez-sdp-devel < 4.0

%package utils-cups
Summary: CUPS printer backend for Bluetooth printers
Group: System Environment/Daemons
Requires: bluez-libs = %{version}
Requires: cups

%package utils-gstreamer
Summary: GStreamer support for SBC audio format
Group: System Environment/Daemons
Requires: bluez-libs = %{version}

%package utils-alsa
Summary: ALSA support for Bluetooth audio devices
Group: System Environment/Daemons
Requires: bluez-libs = %{version}

%package utils
Summary: Bluetooth utilities
Group: Applications/System
Obsoletes: bluez-pan < 4.0, bluez-sdp < 4.0
Requires: initscripts, bluez-libs = %{version}
Requires: dbus >= 0.60
Requires: hwdata >= 0.215
Requires: dbus-bluez-pin-helper
Requires(preun): /sbin/chkconfig, /sbin/service
Requires(post): /sbin/chkconfig, /sbin/service

%description utils-cups
This package contains the CUPS backend 

%description utils-gstreamer
This package contains gstreamer plugins for the Bluetooth SBC audio format

%description utils-alsa
This package contains ALSA support for Bluetooth audio devices

%description libs
Libraries for use in Bluetooth applications.

%description libs-devel
bluez-libs-devel contains development libraries and headers for
use in Bluetooth applications.

%description utils
Bluetooth utilities (bluez-utils):
	- hcitool
	- hciattach
	- hciconfig
	- hcid
	- l2ping
	- start scripts (Red Hat)
	- pcmcia configuration files

%prep

%setup -q
%patch1 -p0 -b .oui
%patch2 -p1 -b .input

%build
%configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
make

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT 
/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir}
# Remove autocrap and libtool droppings
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la				\
	$RPM_BUILD_ROOT/%{_libdir}/alsa-lib/*.la		\
	$RPM_BUILD_ROOT/%{_libdir}/bluetooth/plugins/*.la	\
	$RPM_BUILD_ROOT/%{_libdir}/gstreamer-0.10/*.la
rm -f $RPM_BUILD_ROOT/usr/share/aclocal/bluez.m4

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
rm -rf ${RPM_BUILD_ROOT}%{_libdir}/cups
install -D -m0755 cups/bluetooth ${RPM_BUILD_ROOT}/usr/lib/cups/backend/bluetooth

install -D -m0755 scripts/bluetooth.rules ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules
install -D -m0755 scripts/bluetooth_serial ${RPM_BUILD_ROOT}/lib/udev/bluetooth_serial

%clean
rm -rf $RPM_BUILD_ROOT

%post libs -p /sbin/ldconfig

%post utils
/sbin/chkconfig --del hidd >/dev/null 2>&1 || :
/sbin/chkconfig --del dund >/dev/null 2>&1 || :
/sbin/chkconfig --del pand >/dev/null 2>&1 || :

/sbin/chkconfig --add bluetooth
if [ "$1" -ge "1" ]; then
	/sbin/service bluetooth condrestart >/dev/null 2>&1 || :
fi
exit 0

%postun libs -p /sbin/ldconfig

%preun utils
if [ "$1" = "0" ]; then
	/sbin/service bluetooth stop >/dev/null 2>&1 || :
	/sbin/service dund stop >/dev/null 2>&1 || :
	/sbin/service pand stop >/dev/null 2>&1 || :
	/sbin/chkconfig --del bluetooth
	/sbin/chkconfig --del dund 2>&1 || :
	/sbin/chkconfig --del pand 2>&1 || :
fi

%files utils
%defattr(-, root, root)
%{_bindir}/*
%{_sbindir}/*
%{_mandir}/man1/*
%{_mandir}/man8/*
%dir %{_sysconfdir}/bluetooth/
%config(noreplace) %{_sysconfdir}/bluetooth/*
%config(noreplace) %{_sysconfdir}/sysconfig/*
%config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf
%{_libdir}/bluetooth/plugins/*.so
/lib/udev/bluetooth_serial
%{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules
/etc/rc.d/init.d/*

%files libs
%defattr(-, root, root)
%{_libdir}/libbluetooth.so.*
%doc AUTHORS COPYING INSTALL ChangeLog README

%files libs-devel
%defattr(-, root, root)
%{_libdir}/libbluetooth.so
%dir %{_includedir}/bluetooth
%{_includedir}/bluetooth/*
%{_libdir}/pkgconfig/bluez.pc

%files utils-cups
%defattr(-, root, root)
/usr/lib/cups/backend/bluetooth

%files utils-gstreamer
%defattr(-, root, root)
%{_libdir}/gstreamer-*/*.so

%files utils-alsa
%defattr(-, root, root)
%{_libdir}/alsa-lib/*.so

%changelog
* Tue Sep 09 2008 - David Woodhouse <David.Woodhouse at intel.com> - 4.4-2
- Fix rpmlint problems
- Fix input device handling

* Tue Sep 09 2008 - Bastien Nocera <bnocera at redhat.com> - 4.4-1
- Update to 4.4
- Update source address, and remove unneeded deps (thanks Marcel)

* Mon Aug 11 2008 - Bastien Nocera <bnocera at redhat.com> - 4.1-1
- Initial build


--- NEW FILE import.log ---
bluez-4_4-2_fc10:HEAD:bluez-4.4-2.fc10.src.rpm:1221099001


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 01:53:56 -0000	1.1
+++ .cvsignore	11 Sep 2008 02:10:23 -0000	1.2
@@ -0,0 +1 @@
+bluez-4.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 01:53:56 -0000	1.1
+++ sources	11 Sep 2008 02:10:24 -0000	1.2
@@ -0,0 +1 @@
+0fd526ecea7fa7fb53298e8f335526c6  bluez-4.4.tar.gz



From dwmw2 at fedoraproject.org  Thu Sep 11 02:16:43 2008
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Thu, 11 Sep 2008 02:16:43 +0000 (UTC)
Subject: rpms/bluez-gnome/devel bluez-gnome-1.3-input.patch, NONE,
	1.1 .cvsignore, 1.23, 1.24 bluez-gnome.spec, 1.52, 1.53 sources,
	1.23, 1.24 bluez-gnome-0.28-services.patch, 1.1,
	NONE bluez-gnome-remove-class-file-sharing.patch, 1.1, NONE
Message-ID: <20080911021643.7955470131@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32052

Modified Files:
	.cvsignore bluez-gnome.spec sources 
Added Files:
	bluez-gnome-1.3-input.patch 
Removed Files:
	bluez-gnome-0.28-services.patch 
	bluez-gnome-remove-class-file-sharing.patch 
Log Message:
1.3

bluez-gnome-1.3-input.patch:

--- NEW FILE bluez-gnome-1.3-input.patch ---
diff --git a/common/bluetooth-agent.c b/common/bluetooth-agent.c
index f6106ad..bdc20b6 100644
--- a/common/bluetooth-agent.c
+++ b/common/bluetooth-agent.c
@@ -229,6 +229,22 @@ static gboolean bluetooth_agent_authorize(BluetoothAgent *agent,
 	return result;
 }
 
+static gboolean bluetooth_agent_confirm_mode(BluetoothAgent *agent,
+			const char *mode, DBusGMethodInvocation *context)
+{
+	BluetoothAgentPrivate *priv = BLUETOOTH_AGENT_GET_PRIVATE(agent);
+	const char *sender = dbus_g_method_get_sender(context);
+
+	DBG("agent %p sender %s", agent, sender);
+
+	if (g_str_equal(sender, priv->busname) == FALSE)
+		return FALSE;
+
+	dbus_g_method_return(context);
+
+	return TRUE;
+}
+
 static gboolean bluetooth_agent_cancel(BluetoothAgent *agent,
 						DBusGMethodInvocation *context)
 {
diff --git a/common/bluetooth-agent.xml b/common/bluetooth-agent.xml
index 052818c..478177c 100644
--- a/common/bluetooth-agent.xml
+++ b/common/bluetooth-agent.xml
@@ -33,6 +33,11 @@
       <arg type="s" name="uuid"/>
     </method>
 
+    <method name="ConfirmMode">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg type="s" name="mode"/>
+    </method>
+
     <method name="Cancel">
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
     </method>
diff --git a/common/bluetooth-client.c b/common/bluetooth-client.c
index f74744b..a54dfeb 100644
--- a/common/bluetooth-client.c
+++ b/common/bluetooth-client.c
@@ -57,6 +57,7 @@
 #define BLUEZ_MANAGER_INTERFACE	"org.bluez.Manager"
 #define BLUEZ_ADAPTER_INTERFACE	"org.bluez.Adapter"
 #define BLUEZ_DEVICE_INTERFACE	"org.bluez.Device"
+#define BLUEZ_INPUT_INTERFACE	"org.bluez.Input"
 
 static DBusGConnection *connection = NULL;
 static BluetoothClient *bluetooth_client = NULL;
@@ -999,3 +1000,57 @@ gboolean bluetooth_client_create_device(BluetoothClient *client,
 
 	return TRUE;
 }
+
+typedef struct {
+	BluetoothClientConnectFunc func;
+	gpointer data;
+} ConnectData;
+
+static void connect_input_callback(DBusGProxy *proxy,
+					DBusGProxyCall *call, void *user_data)
+{
+	ConnectData *conndata = user_data;
+	GError *error = NULL;
+
+	dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_INVALID);
+
+	if (error != NULL)
+		g_error_free(error);
+
+	if (conndata->func)
+		conndata->func(conndata->data);
+
+	g_object_unref(proxy);
+}
+
+gboolean bluetooth_client_connect_input(BluetoothClient *client,
+				const char *device,
+				BluetoothClientConnectFunc func, gpointer data)
+{
+	BluetoothClientPrivate *priv = BLUETOOTH_CLIENT_GET_PRIVATE(client);
+	ConnectData *conndata;
+	DBusGProxy *proxy;
+	DBusGProxyCall *call;
+
+	DBG("client %p", client);
+
+	proxy = dbus_g_proxy_new_from_proxy(priv->manager,
+						BLUEZ_INPUT_INTERFACE, device);
+	if (proxy == NULL)
+		return FALSE;
+
+	conndata = g_try_new0(ConnectData, 1);
+	if (conndata == NULL) {
+		g_object_unref(proxy);
+		return FALSE;
+	}
+
+	conndata->func = func;
+	conndata->data = data;
+
+	call = dbus_g_proxy_begin_call(proxy, "Connect",
+				connect_input_callback, conndata, g_free,
+							G_TYPE_INVALID);
+
+	return TRUE;
+}
diff --git a/common/bluetooth-client.h b/common/bluetooth-client.h
index 32ed1bd..bf1a313 100644
--- a/common/bluetooth-client.h
+++ b/common/bluetooth-client.h
@@ -79,6 +79,12 @@ gboolean bluetooth_client_create_device(BluetoothClient *client,
 			const char *address, const char *agent,
 			BluetoothClientCreateDeviceFunc func, gpointer data);
 
+typedef void (*BluetoothClientConnectFunc) (gpointer data);
+
+gboolean bluetooth_client_connect_input(BluetoothClient *client,
+				const char *device,
+				BluetoothClientConnectFunc, gpointer data);
+
 enum {
 	BLUETOOTH_COLUMN_PROXY,
 	BLUETOOTH_COLUMN_ADDRESS,
diff --git a/wizard/main.c b/wizard/main.c
index f41083a..5f1b8e2 100644
--- a/wizard/main.c
+++ b/wizard/main.c
@@ -96,6 +96,10 @@ static gboolean cancel_callback(DBusGMethodInvocation *context,
 	return TRUE;
 }
 
+static void connect_callback(gpointer user_data)
+{
+}
+
 static void create_callback(const char *path, gpointer user_data)
 {
 	GtkAssistant *assistant = user_data;
@@ -112,6 +116,11 @@ static void create_callback(const char *path, gpointer user_data)
 		if (page > 0)
 			gtk_assistant_set_current_page(assistant, page + 1);
 
+		if (target_type == BLUETOOTH_TYPE_KEYBOARD ||
+					target_type == BLUETOOTH_TYPE_MOUSE)
+			bluetooth_client_connect_input(client, path,
+						connect_callback, assistant);
+
 		complete = TRUE;
 	} else
 		text = g_strdup_printf(_("Pairing with %s failed"),


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	8 Aug 2008 10:35:02 -0000	1.23
+++ .cvsignore	11 Sep 2008 02:16:12 -0000	1.24
@@ -1 +1 @@
-bluez-gnome-0.28.tar.gz
+bluez-gnome-1.3.tar.gz


Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- bluez-gnome.spec	10 Sep 2008 06:13:13 -0000	1.52
+++ bluez-gnome.spec	11 Sep 2008 02:16:13 -0000	1.53
@@ -1,14 +1,13 @@
 Name:		bluez-gnome
-Version:	0.28
-Release:	3%{?dist}
+Version:	1.3
+Release:	1%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://www.bluez.org/
 Source0:	http://bluez.sf.net/download/%{name}-%{version}.tar.gz
-Patch1:		bluez-gnome-remove-class-file-sharing.patch
-Patch2:		bluez-gnome-0.28-services.patch
+Patch1:		bluez-gnome-1.3-input.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,8 +45,7 @@
 
 %prep
 %setup -q
-%patch1 -p0 -b .remove-class
-%patch2 -p1 -b .services
+%patch1 -p1 -b .input
 
 %build
 %configure --disable-mime-update --disable-desktop-update --disable-icon-update
@@ -120,10 +118,12 @@
 %{_bindir}/bluetooth-applet
 %{_bindir}/bluetooth-properties
 %{_bindir}/bluetooth-sendto
+%{_bindir}/bluetooth-wizard
 %config %{_sysconfdir}/gconf/schemas/*
 %{_datadir}/gnome/autostart/bluetooth-applet.desktop
 %{_datadir}/man/man1/bluetooth-applet.1.gz
 %{_datadir}/man/man1/bluetooth-properties.1.gz
+%{_datadir}/man/man1/bluetooth-wizard.1.gz
 %{_datadir}/applications/bluetooth-properties.desktop
 %{_datadir}/mime/packages/bluetooth-manager.xml
 %{_datadir}/icons/hicolor/*/apps/*
@@ -136,6 +136,9 @@
 %{_datadir}/man/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Wed Sep 10 2008 - David Woodhouse <David.Woodhouse at intel.com> - 1.3-1
+- Update to 1.3
+
 * Tue Sep 09 2008 - David Woodhouse <David.Woodhouse at intel.com> -0.28-3
 - Fix device addition
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	8 Aug 2008 10:35:02 -0000	1.23
+++ sources	11 Sep 2008 02:16:13 -0000	1.24
@@ -1 +1 @@
-f2afcb04e998fdc6aa545633190bc941  bluez-gnome-0.28.tar.gz
+dc824a04adcef5ee6567beb660cf5bcc  bluez-gnome-1.3.tar.gz


--- bluez-gnome-0.28-services.patch DELETED ---


--- bluez-gnome-remove-class-file-sharing.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Sep 11 02:51:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 02:51:23 +0000
Subject: [pkgdb] eclipse-nls was added for seanf
Message-ID: <20080911025123.2520A208D98@bastion.fedora.phx.redhat.com>

petersen has added Package eclipse-nls with summary Babel translations for Eclipse
petersen has approved Package eclipse-nls
petersen has added a Fedora devel branch for eclipse-nls with an owner of seanf
petersen has approved eclipse-nls in Fedora devel
petersen has approved Package eclipse-nls
petersen has set commit to Approved for packager on eclipse-nls (Fedora devel)
petersen has set build to Approved for packager on eclipse-nls (Fedora devel)
petersen has set checkout to Approved for packager on eclipse-nls (Fedora devel)
petersen has set commit to Approved for uberpackager on eclipse-nls (Fedora devel)
petersen has set build to Approved for uberpackager on eclipse-nls (Fedora devel)
petersen has set checkout to Approved for uberpackager on eclipse-nls (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-nls



From petersen at fedoraproject.org  Thu Sep 11 02:51:55 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 11 Sep 2008 02:51:55 +0000 (UTC)
Subject: rpms/eclipse-nls - New directory
Message-ID: <20080911025155.53D8370131@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/eclipse-nls
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsVg3605/rpms/eclipse-nls

Log Message:
Directory /cvs/extras/rpms/eclipse-nls added to the repository




From petersen at fedoraproject.org  Thu Sep 11 02:51:55 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 11 Sep 2008 02:51:55 +0000 (UTC)
Subject: rpms/eclipse-nls/devel - New directory
Message-ID: <20080911025155.9B76370132@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/eclipse-nls/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsVg3605/rpms/eclipse-nls/devel

Log Message:
Directory /cvs/extras/rpms/eclipse-nls/devel added to the repository




From petersen at fedoraproject.org  Thu Sep 11 02:51:56 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 11 Sep 2008 02:51:56 +0000 (UTC)
Subject: rpms/eclipse-nls Makefile,NONE,1.1
Message-ID: <20080911025156.B72DA70131@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/eclipse-nls
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsVg3605/rpms/eclipse-nls

Added Files:
	Makefile 
Log Message:
Setup of module eclipse-nls


--- NEW FILE Makefile ---
# Top level Makefile for module eclipse-nls
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Thu Sep 11 02:51:57 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 11 Sep 2008 02:51:57 +0000 (UTC)
Subject: rpms/eclipse-nls/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080911025157.25B3D70131@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/eclipse-nls/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsVg3605/rpms/eclipse-nls/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eclipse-nls


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eclipse-nls
# $Id: Makefile,v 1.1 2008/09/11 02:51:56 petersen Exp $
NAME := eclipse-nls
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 11 02:54:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 02:54:40 +0000
Subject: [pkgdb] eclipse-nls (Fedora, devel) updated by petersen
Message-ID: <20080911025440.77C4E208D98@bastion.fedora.phx.redhat.com>

petersen approved watchbugzilla on eclipse-nls (Fedora devel) for petersen
petersen approved watchcommits on eclipse-nls (Fedora devel) for petersen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-nls



From pkgdb at fedoraproject.org  Thu Sep 11 02:54:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 02:54:51 +0000
Subject: [pkgdb] eclipse-nls (Fedora, devel) updated by petersen
Message-ID: <20080911025451.64116208D9B@bastion.fedora.phx.redhat.com>

petersen approved watchbugzilla on eclipse-nls (Fedora devel) for overholt
petersen approved watchcommits on eclipse-nls (Fedora devel) for overholt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-nls



From rcritten at fedoraproject.org  Thu Sep 11 02:58:19 2008
From: rcritten at fedoraproject.org (Robert Crittenden)
Date: Thu, 11 Sep 2008 02:58:19 +0000 (UTC)
Subject: rpms/ipa/devel 0001-Fix-typo-in-inet-type.patch, NONE,
	1.1 0001-In-openvz-we-found-out-some-interfaces-may-return-a.patch,
	NONE,
	1.1 0001-slapi_pw_find_sv-expects-an-array-make-sure-we-ha.patch,
	NONE, 1.1 freeipa-change-mkey.patch, NONE,
	1.1 freeipa-cve-2008-3274-fixes.patch, NONE,
	1.1 freeipa-cve-2008-3274-utility.patch, NONE,
	1.1 freeipa-encrypt-files.patch, NONE,
	1.1 freeipa-fix-expire.patch, NONE,
	1.1 freeipa-fix-key-encryption.patch, NONE,
	1.1 freeipa-noi18n.patch, NONE, 1.1 freeipa-refresh-mkey.patch,
	NONE, 1.1 freeipa-user-input.patch, NONE, 1.1 ipa.spec, 1.13, 1.14
Message-ID: <20080911025819.8230970131@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/ipa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4961

Modified Files:
	ipa.spec 
Added Files:
	0001-Fix-typo-in-inet-type.patch 
	0001-In-openvz-we-found-out-some-interfaces-may-return-a.patch 
	0001-slapi_pw_find_sv-expects-an-array-make-sure-we-ha.patch 
	freeipa-change-mkey.patch freeipa-cve-2008-3274-fixes.patch 
	freeipa-cve-2008-3274-utility.patch 
	freeipa-encrypt-files.patch freeipa-fix-expire.patch 
	freeipa-fix-key-encryption.patch freeipa-noi18n.patch 
	freeipa-refresh-mkey.patch freeipa-user-input.patch 
Log Message:
- Fix for CVE-2008-3274
- Fix segfault in ipa-kpasswd in case getifaddrs returns a NULL interface
- Add fix for bug #453185
- Rebuild against openldap libraries, mozldap ones do not work properly
- TurboGears is currently broken in rawhide. Added patch to not build
  the UI locales and removed them from the ipa-server files section.


0001-Fix-typo-in-inet-type.patch:

--- NEW FILE 0001-Fix-typo-in-inet-type.patch ---
>From 77906dce20a8d37b10225c4dc8701b25f172f362 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Mon, 9 Jun 2008 17:55:32 -0400
Subject: [PATCH] Fix typo in inet type

---
 ipa-server/ipa-kpasswd/ipa_kpasswd.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ipa-server/ipa-kpasswd/ipa_kpasswd.c b/ipa-server/ipa-kpasswd/ipa_kpasswd.c
index 677b61b..72d3c13 100644
--- a/ipa-server/ipa-kpasswd/ipa_kpasswd.c
+++ b/ipa-server/ipa-kpasswd/ipa_kpasswd.c
@@ -1296,7 +1296,7 @@ int main(int argc, char *argv[])
 
 	for (tifa = ifa; tifa; tifa = tifa->ifa_next) {
 
-		if (tifa->ifa_addr->sa_family != PF_INET &&
+		if (tifa->ifa_addr->sa_family != AF_INET &&
 		    tifa->ifa_addr->sa_family != AF_INET6) {
 			/* not interesting for us */
 			continue;
-- 
1.5.5.1


0001-In-openvz-we-found-out-some-interfaces-may-return-a.patch:

--- NEW FILE 0001-In-openvz-we-found-out-some-interfaces-may-return-a.patch ---
>From 67f62709f83997945b69919cd744ce936ddf5596 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Tue, 15 Jul 2008 16:13:43 -0400
Subject: [PATCH] In openvz we found out some interfaces may return a null pointer here.
 Skip them if no address is provided or we later get a segfault because
 we dereference a null pointer.

---
 ipa-server/ipa-kpasswd/ipa_kpasswd.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ipa-server/ipa-kpasswd/ipa_kpasswd.c b/ipa-server/ipa-kpasswd/ipa_kpasswd.c
index 7b4f39e..43ca223 100644
--- a/ipa-server/ipa-kpasswd/ipa_kpasswd.c
+++ b/ipa-server/ipa-kpasswd/ipa_kpasswd.c
@@ -1299,6 +1299,10 @@ int main(int argc, char *argv[])
 
 	for (tifa = ifa; tifa; tifa = tifa->ifa_next) {
 
+		if (NULL == tifa->ifa_addr)
+			/* uhmm no address ?? skip it */
+			continue;
+
 		if (tifa->ifa_addr->sa_family != AF_INET &&
 		    tifa->ifa_addr->sa_family != AF_INET6) {
 			/* not interesting for us */
-- 
1.5.5.1


0001-slapi_pw_find_sv-expects-an-array-make-sure-we-ha.patch:

--- NEW FILE 0001-slapi_pw_find_sv-expects-an-array-make-sure-we-ha.patch ---
>From 56a9569563b5dcc26a132d4ac91d940d34540a12 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Tue, 24 Jun 2008 08:40:58 -0400
Subject: [PATCH] slapi_pw_find_sv() expects an array, make sure we have a NULL terminated
 one to avoid potential segfaults
 Avoid leaking memory too.

---
 .../ipa-pwd-extop/ipa_pwd_extop.c                  |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
index 21e50db..c25d0f1 100644
--- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
+++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
@@ -1258,24 +1258,28 @@ static int ipapwd_CheckPolicy(struct ipapwd_data *data)
 		/* skip policy checks */
 		slapi_entry_free(policy);
 		goto no_policy;
-	} 
+	}
 
 	/* first of all check current password, if any */
 	old_pw = slapi_entry_attr_get_charptr(data->target, "userPassword");
 	if (old_pw) {
-		Slapi_Value *cpw;
+		Slapi_Value *cpw[2] = {NULL, NULL};
 		Slapi_Value *pw;
 
-		cpw = slapi_value_new_string(old_pw);
+		cpw[0] = slapi_value_new_string(old_pw);
 		pw = slapi_value_new_string(data->password);
-		if (!cpw || !pw) {
+		if (!cpw[0] || !pw) {
 			slapi_log_error(SLAPI_LOG_PLUGIN, "ipa_pwd_extop",
 					"ipapwd_checkPassword: Out of Memory\n");
 			slapi_entry_free(policy);
+			slapi_value_free(&cpw[0]);
+			slapi_value_free(&pw);
 			return LDAP_OPERATIONS_ERROR;
 		}
 
-		ret = slapi_pw_find_sv(&cpw, pw);
+		ret = slapi_pw_find_sv(cpw, pw);
+		slapi_value_free(&cpw[0]);
+		slapi_value_free(&pw);
 
 		if (ret == 0) {
 			slapi_log_error(SLAPI_LOG_TRACE, "ipa_pwd_extop",
-- 
1.5.5.1


freeipa-change-mkey.patch:

--- NEW FILE freeipa-change-mkey.patch ---
>From ab6449e101d4282014a06ad3cd20961005fee2ce Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Wed, 6 Aug 2008 16:46:18 -0400
Subject: [PATCH] Add a tool to change the kerberos Master Key in case an admin wants to. This tool will dump and re-encrypt all keys, then reload and change the master key in LDAP and in the stash file. It will also restart the Directory Server and the the KDC

---
 ipa-admintools/Makefile              |    1 +
 ipa-admintools/ipa-change-master-key |  383 ++++++++++++++++++++++++++++++++++
 2 files changed, 384 insertions(+), 0 deletions(-)
 create mode 100644 ipa-admintools/ipa-change-master-key

diff --git a/ipa-admintools/Makefile b/ipa-admintools/Makefile
index 77cc38d..0b7cae8 100644
--- a/ipa-admintools/Makefile
+++ b/ipa-admintools/Makefile
@@ -26,6 +26,7 @@ install:
 	install -m 755 ipa-deldelegation $(SBINDIR)
 	install -m 755 ipa-listdelegation $(SBINDIR)
 	install -m 755 ipa-moddelegation $(SBINDIR)
+	install -m 755 ipa-change-master-key $(SBINDIR)
 
 	@for subdir in $(SUBDIRS); do \
 		(cd $$subdir && $(MAKE) $@) || exit 1; \
diff --git a/ipa-admintools/ipa-change-master-key b/ipa-admintools/ipa-change-master-key
new file mode 100644
index 0000000..233a7af
--- /dev/null
+++ b/ipa-admintools/ipa-change-master-key
@@ -0,0 +1,383 @@
+#! /usr/bin/python -E
+# Authors: Simo Sorce <ssorce at redhat.com>
+#
+# Copyright (C) 2007 Simo Sorce <ssorce at redhat.com>
+# see file 'COPYING' for use and warranty information
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; version 2 or later
+#
+# 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
+#
+
+etckrb5conf = "/etc/krb5.conf"
+krb5dir = "/var/kerberos/krb5kdc"
+cachedir = "/var/cache/ipa"
+libdir = "/var/lib/ipa"
+basedir = libdir+"/mkey"
+ourkrb5conf = basedir+"/krb5.conf"
+ldappwdfile = basedir+"/ldappwd"
+
+password = ""
+
+import sys
+try:
+    from optparse import OptionParser
+    import ipa
+    import ipa.config
+    import ipa.ipautil
+    from ipaclient import ipachangeconf
+    from ipaserver import ipaldap
+
+    import krbV
+
+    import ldap
+    from ldap import LDAPError
+    from ldap import ldapobject
+
+    from pyasn1.type import univ, namedtype
+    import pyasn1.codec.ber.encoder
+    import pyasn1.codec.ber.decoder
+    import struct
+    import base64
+
+    import random
+    import time
+    import os
+    import shutil
+    import getpass
+except ImportError:
+    print >> sys.stderr, """\
+There was a problem importing one of the required Python modules. The
+error was:
+
+    %s
+""" % sys.exc_value
+    sys.exit(1)
+
+def usage():
+    print "ipa-change-master-key [-q|--quiet] [-p DM_PASSWORD]"
+    sys.exit(1)
+
+def parse_options():
+    parser = OptionParser()
+    parser.add_option("-p", "--dm-password", dest="dm_password",
+                      help="The Directory Manager password")
+    parser.add_option("-q", "--quiet", action="store_true", dest="quiet",
+                      help="Keep quiet")
+    parser.add_option("--usage", action="store_true",
+                      help="Program usage")
+
+    args = ipa.config.init_config(sys.argv)
+    options, args = parser.parse_args(args)
+
+    return options, args
+
+# We support only des3 encoded stash files for now
+def generate_new_stash_file(file):
+
+    odd_parity_bytes_pool = ['\x01', '\x02', '\x04', '\x07', '\x08', '\x0b', '\r', '\x0e', '\x10', '\x13', '\x15', '\x16', '\x19', '\x1a', '\x1c', '\x1f', ' ', '#', '%', '&', ')', '*', ',', '/', '1', '2', '4', '7', '8', ';', '=', '>', '@', 'C', 'E', 'F', 'I', 'J', 'L', 'O', 'Q', 'R', 'T', 'W', 'X', '[', ']', '^', 'a', 'b', 'd', 'g', 'h', 'k', 'm', 'n', 'p', 's', 'u', 'v', 'y', 'z', '|', '\x7f', '\x80', '\x83', '\x85', '\x86', '\x89', '\x8a', '\x8c', '\x8f', '\x91', '\x92', '\x94', '\x97', '\x98', '\x9b', '\x9d', '\x9e', '\xa1', '\xa2', '\xa4', '\xa7', '\xa8', '\xab', '\xad', '\xae', '\xb0', '\xb3', '\xb5', '\xb6', '\xb9', '\xba', '\xbc', '\xbf', '\xc1', '\xc2', '\xc4', '\xc7', '\xc8', '\xcb', '\xcd', '\xce', '\xd0', '\xd3', '\xd5', '\xd6', '\xd9', '\xda', '\xdc', '\xdf', '\xe0', '\xe3',
+'\xe5', '\xe6', '\xe9', '\xea', '\xec', '\xef', '\xf1', '\xf2', '\xf4', '\xf7',
+'\xf8', '\xfb', '\xfd', '\xfe']
+    pool_len = len(odd_parity_bytes_pool)
+    keytype = 16 # des3
+    keydata = ""
+
+    r = random.SystemRandom()
+    for k in range(24):
+        keydata += r.choice(odd_parity_bytes_pool)
+
+    format = '=hi%ss' % len(keydata)
+    s = struct.pack(format, keytype, len(keydata), keydata)
+    try:
+        fd = open(file, "w")
+        fd.write(s)
+    except os.error, e:
+        logging.critical("failed to write stash file")
+        raise e
+
+# clean up procedures
+def cleanup(password):
+    try:
+        os.stat(basedir)
+    except:
+        return None
+    try:
+        # always remove ldappwdfile as it contains the Directory Manager password
+        os.remove(ldappwdfile)
+    except:
+        pass
+
+    # tar and encrypt the working dir so that we do not leave sensitive data
+    # around unproteceted
+    curtime = time.strftime("%Y%m%d%H%M%S",time.gmtime())
+    tarfile = libdir+"/ipa-change-mkey-"+curtime+".tar"
+    gpgfile = tarfile+".gpg"
+    args = ['/bin/tar', '-C', libdir, '-cf', tarfile, 'mkey']
+    ipa.ipautil.run(args)
+    ipa.ipautil.encrypt_file(tarfile, gpgfile, password, cachedir)
+    os.remove(tarfile)
+    shutil.rmtree(basedir, ignore_errors=True)
+
+    return "The temporary working directory with backup dump files has been securely archived and gpg-encrypted as "+gpgfile+" using the Directory Manager password."
+
+def main():
+
+    global password
+
+    options, args = parse_options()
+
+    if options.usage:
+        usage()
+
+    krbctx = krbV.default_context()
+
+    realm = krbctx.default_realm
+    suffix = ipa.ipautil.realm_to_suffix(realm)
+
+    backupfile = basedir+"/backup.dump"
+    convertfile = basedir+"/convert.dump"
+    oldstashfile = krb5dir+"/.k5."+realm
+    newstashfile = basedir+"/.new.mkey"
+    bkpstashfile = basedir+"/.k5."+realm
+
+    if os.getuid() != 0:
+        print "ERROR: This command must be run as root"
+
+    print "DANGER: This is a dangerous operation, make sure you backup all your IPA data before running the tool"
+    print "This command will restart your Directory and KDC Servers."
+
+    #TODO: ask for confirmation
+    if not ipa.ipautil.user_input("Do you want to proceed and change the Kerberos Master key?", False):
+        print ""
+        print "Aborting..."
+        return 1
+
+    password = options.dm_password
+    if not password:
+        password = getpass.getpass("Directory Manager password: ")
+
+    # get a connection to the DS
+    try:
+        conn = ipaldap.IPAdmin(ipa.config.config.default_server[0])
+        conn.do_simple_bind(bindpw=password)
+    except Exception, e:
+        print "ERROR: Could not connect to the Directory Server on "+ipa.config.config.default_server[0]+" ("+str(e)+")"
+        return 1
+
+    #  Wipe basedir and recreate it
+    shutil.rmtree(basedir, ignore_errors=True)
+    os.mkdir(basedir, 0700)
+
+    generate_new_stash_file(newstashfile)
+
+    # Generate conf files
+    try:
+        shutil.copyfile(etckrb5conf, ourkrb5conf)
+
+        krbconf = ipachangeconf.IPAChangeConf("IPA Installer")
+        krbconf.setOptionAssignment(" = ")
+        krbconf.setSectionNameDelimiters(("[","]"))
+        krbconf.setSubSectionDelimiters(("{","}"))
+        krbconf.setIndent(("","  ","    "))
+
+        #OPTS
+        opts = [{'name':'ldap_kadmind_dn', 'type':'option', 'action':'set', 'value':'cn=Directory Manager'},
+                {'name':'ldap_service_password_file', 'type':'option', 'action':'set', 'value':ldappwdfile}]
+
+        #REALM
+        realmopts = [{'name':realm, 'type':'subsection', 'action':'set', 'value':opts}]
+
+        #DBMODULES
+        dbopts = [{'name':'dbmodules', 'type':'section', 'action':'set', 'value':realmopts}]
+
+        krbconf.changeConf(ourkrb5conf, dbopts);
+
+        hexpwd = ""
+        for x in password:
+            hexpwd += (hex(ord(x))[2:])
+        pwd_fd = open(ldappwdfile, "w")
+        pwd_fd.write("cn=Directory Manager#{HEX}"+hexpwd+"\n")
+        pwd_fd.close()
+        os.chmod(ldappwdfile, 0600)
+
+    except Exception, e:
+        print "Failed to create custom configuration files ("+str(e)+") aborting..."
+        return 1
+
+    #Set environment vars so that the modified krb5.conf is used
+    os.environ['KRB5_CONFIG'] = ourkrb5conf
+
+    #Backup the kerberos key material for recovery if needed
+    args = ["/usr/kerberos/sbin/kdb5_util", "dump", "-verbose", backupfile]
+    print "Performing safety backup of the key material"
+    try:
+        output = ipa.ipautil.run(args)
+    except ipa.ipautil.CalledProcessError, e:
+        print "Failed to backup key material ("+str(e)+"), aborting ..."
+        return 1
+
+    if not options.quiet:
+        princlist = output[1].split('\n')
+        print "Principals stored into the backup file "+backupfile+":"
+        for p in princlist:
+            print p
+        print ""
+
+    #Convert the kerberos keys to the new master key
+    args = ["/usr/kerberos/sbin/kdb5_util", "dump", "-verbose", "-new_mkey_file", newstashfile, convertfile]
+    print "Converting key material to new master key"
+    try:
+        output = ipa.ipautil.run(args)
+    except ipa.ipautil.CalledProcessError, e:
+        print "Failed to convert key material, aborting ..."
+        return 1
+
+    savedprinclist = output[1].split('\n')
+
+    if not options.quiet:
+        princlist = output[1].split('\n')
+        print "Principals dumped for conversion:"
+        for p in princlist:
+            print p
+        print ""
+
+    #Stop the KDC
+    args = ["/etc/init.d/krb5kdc", "stop"]
+    try:
+        output = ipa.ipautil.run(args)
+        if output[0]:
+            print output[0]
+        if output[1]:
+            print output[1]
+    except ipa.ipautil.CalledProcessError, e:
+        print "WARNING: Failed to restart the KDC ("+str(e)+")"
+        print "You will have to manually restart the KDC when the operation is completed"
+
+    #Change the mkey into ldap
+    try:
+        stash = open(newstashfile, "r")
+        keytype = struct.unpack('h', stash.read(2))[0]
+        keylen = struct.unpack('i', stash.read(4))[0]
+        keydata = stash.read(keylen)
+
+        #encode it in the asn.1 attribute
+        MasterKey = univ.Sequence()
+        MasterKey.setComponentByPosition(0, univ.Integer(keytype))
+        MasterKey.setComponentByPosition(1, univ.OctetString(keydata))
+        krbMKey = univ.Sequence()
+        krbMKey.setComponentByPosition(0, univ.Integer(0)) #we have no kvno
+        krbMKey.setComponentByPosition(1, MasterKey)
+        asn1key = pyasn1.codec.ber.encoder.encode(krbMKey)
+
+        dn = "cn="+realm+",cn=kerberos,"+suffix
+        mod = [(ldap.MOD_REPLACE, 'krbMKey', str(asn1key))]
+        conn.modify_s(dn, mod)
+    except Exception, e:
+        print "ERROR: Failed to upload the Master Key from the Stash file: "+newstashfile+" ("+str(e)+")"
+        return 1
+
+    #Backup old stash file and substitute with new
+    try:
+        shutil.move(oldstashfile, bkpstashfile)
+        shutil.copyfile(newstashfile, oldstashfile)
+    except Exception, e:
+        print "ERROR: An error occurred while installing the new stash file("+str(e)+")"
+        print "The KDC may fail to start if the correct stash file is not in place"
+        print "Verify that "+newstashfile+" has been correctly installed into "+oldstashfile
+        print "A backup copy of the old stash file should be saved in "+bkpstashfile
+
+    #Finally upload the converted principals
+    args = ["/usr/kerberos/sbin/kdb5_util", "load", "-verbose", "-update", convertfile]
+    print "Uploading converted key material"
+    try:
+        output = ipa.ipautil.run(args)
+    except ipa.ipautil.CalledProcessError, e:
+        print "Failed to upload key material ("+e+"), aborting ..."
+        return 1
+
+    if not options.quiet:
+        princlist = output[1].split('\n')
+        print "Principals converted and uploaded:"
+        for p in princlist:
+            print p
+        print ""
+
+    uploadedprinclist = output[1].split('\n')
+
+    #Check for differences and report
+    d = []
+    for p in savedprinclist:
+        if uploadedprinclist.count(p) == 0:
+            d.append(p)
+    if len(d) != 0:
+        print "WARNING: Not all dumped principals have been updated"
+        print "Principals not Updated:"
+        for p in d:
+            print p
+
+    #Remove custom environ
+    del os.environ['KRB5_CONFIG']
+
+    #Restart Directory Server (the pwd plugin need to read the new mkey)
+    args = ["/etc/init.d/dirsrv", "restart"]
+    try:
+        output = ipa.ipautil.run(args)
+        if output[0]:
+            print output[0]
+        if output[1]:
+            print output[1]
+    except ipa.ipautil.CalledProcessError, e:
+        print "WARNING: Failed to restart the Directory Server ("+str(e)+")"
+        print "Please manually restart the DS with 'service dirsrv restart'"
+
+    #Restart the KDC
+    args = ["/etc/init.d/krb5kdc", "start"]
+    try:
+        output = ipa.ipautil.run(args)
+        if output[0]:
+            print output[0]
+        if output[1]:
+            print output[1]
+    except ipa.ipautil.CalledProcessError, e:
+        print "WARNING: Failed to restart the KDC ("+str(e)+")"
+        print "Please manually restart the kdc with 'service krb5kdc start'"
+
+    #TODO: encrypt the backup/temp directory with the Directory Manager password
+
+    print "Master Password successfully changed"
+    print "You MUST now copy the stash file "+oldstashfile+" to all the replicas and restart them!"
+    print ""
+
+    return 0
+
+if __name__ == "__main__":
+    ret = 0
+    try:
+        ret = main()
+    except SystemExit, e:
+        ret = e
+    except KeyboardInterrupt, e:
+        ret = 1
+    except Exception, e:
+        print "%s" % str(e)
+        ret = 1
+
+    try:
+        msg = cleanup(password)
+        if msg:
+            print msg
+    except Exception, e:
+        print "Failed to clean up the temporary location for the dump files and generate and encrypted archive with error:"
+        print e
+        print "Please securely archive/encrypt "+basedir
+
+    sys.exit(ret)
-- 
1.5.5.1


freeipa-cve-2008-3274-fixes.patch:

--- NEW FILE freeipa-cve-2008-3274-fixes.patch ---
>From 7bd21c0d8b0c0889289c7e1eaeb21fb0f1d0c99f Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Fri, 15 Aug 2008 17:17:03 -0400
Subject: [PATCH] CVE 2008 3274 related fixes

---
 ipa-server/ipa-install/share/default-aci.ldif |    4 ++--
 ipa-server/ipaserver/krbinstance.py           |    8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ipa-server/ipa-install/share/default-aci.ldif b/ipa-server/ipa-install/share/default-aci.ldif
index d2946fa..25bd3b2 100644
--- a/ipa-server/ipa-install/share/default-aci.ldif
+++ b/ipa-server/ipa-install/share/default-aci.ldif
@@ -3,8 +3,8 @@
 dn: $SUFFIX
 changetype: modify
 add: aci
-aci: (targetattr != "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword || passwordHistory")(version 3.0; acl "Enable Anonymous access"; allow (read, search, compare) userdn = "ldap:///anyone";)
-aci: (targetattr != "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword || passwordHistory")(version 3.0; acl "Admin can manage any entry"; allow (all) userdn = "ldap:///uid=admin,cn=users,cn=accounts,$SUFFIX";)
+aci: (targetattr != "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword || passwordHistory || krbMKey")(version 3.0; acl "Enable Anonymous access"; allow (read, search, compare) userdn = "ldap:///anyone";)
+aci: (targetattr != "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword || passwordHistory || krbMKey")(version 3.0; acl "Admin can manage any entry"; allow (all) userdn = "ldap:///uid=admin,cn=users,cn=accounts,$SUFFIX";)
 aci: (targetattr = "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword")(version 3.0; acl "Self can write own password"; allow (write) userdn="ldap:///self";)
 aci: (targetattr = "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword || passwordHistory")(version 3.0; acl "Admins can write passwords"; allow (add,delete,write) groupdn="ldap:///cn=admins,cn=groups,cn=accounts,$SUFFIX";)
 aci: (targetattr = "userPassword || krbPrincipalKey || sambaLMPassword || sambaNTPassword || passwordHistory")(version 3.0; acl "Password change service can read/write passwords"; allow (read, write) userdn="ldap:///krbprincipalname=kadmin/changepw@$REALM,cn=$REALM,cn=kerberos,$SUFFIX";)
diff --git a/ipa-server/ipaserver/krbinstance.py b/ipa-server/ipaserver/krbinstance.py
index deea4a6..1668561 100644
--- a/ipa-server/ipaserver/krbinstance.py
+++ b/ipa-server/ipaserver/krbinstance.py
@@ -48,6 +48,10 @@
 import struct
 import base64
 
+KRBMKEY_DENY_ACI = """
+(targetattr = "krbMKey")(version 3.0; acl "No external access"; deny (all) userdn != "ldap:///uid=kdc,cn=sysaccounts,cn=etc,$SUFFIX";)
+"""
+
 def update_key_val_in_file(filename, key, val):
     if os.path.exists(filename):
         pattern = "^[\s#]*%s\s*=\s*%s\s*" % (re.escape(key), re.escape(val))
@@ -358,7 +362,9 @@
 
         entry = ipaldap.Entry("cn="+self.realm+",cn=kerberos,"+self.suffix)
         dn = "cn="+self.realm+",cn=kerberos,"+self.suffix
-        mod = [(ldap.MOD_ADD, 'krbMKey', str(asn1key))]
+        #protect the master key by adding an appropriate deny rule along with the key
+        mod = [(ldap.MOD_ADD, 'aci', ipautil.template_str(KRBMKEY_DENY_ACI, self.sub_dict)),
+               (ldap.MOD_ADD, 'krbMKey', str(asn1key))]
         try:
             self.conn.modify_s(dn, mod)
         except ldap.TYPE_OR_VALUE_EXISTS, e:

freeipa-cve-2008-3274-utility.patch:

--- NEW FILE freeipa-cve-2008-3274-utility.patch ---
>From 40749e3ea6b727fa8c60e2d2af44a0e5ac725936 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Tue, 19 Aug 2008 13:31:26 -0400
Subject: [PATCH] Add script to simplify operations to fix CVE 2008 3274
 Import all of change master key directly into the help fix,
 allows for better control

---
 ipa-server/Makefile.am           |    1 +
 ipa-server/ipa-fix-CVE-2008-3274 |  520 ++++++++++++++++++++++++++++++++++++++
 ipa-server/ipa-server.spec.in    |    1 +
 3 files changed, 522 insertions(+), 0 deletions(-)
 create mode 100644 ipa-server/ipa-fix-CVE-2008-3274

diff --git a/ipa-server/Makefile.am b/ipa-server/Makefile.am
index 6fb854d..f058013 100644
--- a/ipa-server/Makefile.am
+++ b/ipa-server/Makefile.am
@@ -16,6 +16,7 @@ SUBDIRS =			\
 
 sbin_SCRIPTS =			\
 	ipa-upgradeconfig	\
+	ipa-fix-CVE-2008-3274	\
 	$(NULL)
 
 install-exec-local:
diff --git a/ipa-server/ipa-fix-CVE-2008-3274 b/ipa-server/ipa-fix-CVE-2008-3274
new file mode 100644
index 0000000..171a9db
--- /dev/null
+++ b/ipa-server/ipa-fix-CVE-2008-3274
@@ -0,0 +1,518 @@
+#!/usr/bin/python
+#
+# Upgrade configuration files to a newer template.
+
+etckrb5conf = "/etc/krb5.conf"
+krb5dir = "/var/kerberos/krb5kdc"
+cachedir = "/var/cache/ipa"
+libdir = "/var/lib/ipa"
+basedir = libdir+"/mkey"
+ourkrb5conf = basedir+"/krb5.conf"
+ldappwdfile = basedir+"/ldappwd"
+
+import sys
+try:
+    from optparse import OptionParser
+
+    import os
+    import random
+    import time
+    import shutil
+    import getpass
+
+    import ipa
+    import ipa.config
+    import ipa.ipautil
+
+    import krbV
+    import ldap
+
+    from ldap import LDAPError
+    from ldap import ldapobject
+
+    from ipaclient import ipachangeconf    
+    from ipaserver import ipaldap
+
+    from pyasn1.type import univ, namedtype
+    import pyasn1.codec.ber.encoder
+    import pyasn1.codec.ber.decoder
+    import struct
+    import base64
+
+except ImportError:
+    print >> sys.stderr, """\
+There was a problem importing one of the required Python modules. The
+error was:
+
+    %s
+""" % sys.exc_value
+    sys.exit(1)
+
+def usage():
+    print "ipa-fix-CVE-2008-3274 [--check] [--fix] [--fix-replica]"
+    sys.exit(1)
+
+def parse_options():
+    parser = OptionParser()
+    parser.add_option("--check", dest="check", action="store_true",
+                      help="Just check for the vulnerability and report (default action)")
+    parser.add_option("--fix", dest="fix", action="store_true",
+                      help="Run checks and start procedure to fix the problem")
+    parser.add_option("--fix-replica", dest="fix_replica", action="store_true",
+                      help="Fix a replica after the tool has been tun with --fix on another master")
+    parser.add_option("--usage", action="store_true",
+                      help="Program usage")
+
+    args = ipa.config.init_config(sys.argv)
+    options, args = parser.parse_args(args)
+
+    return options, args
+
+def check_vuln(realm, suffix):
+
+    try:
+        conn = ldapobject.SimpleLDAPObject("ldap://127.0.0.1/")
+        conn.simple_bind()
+        msgid = conn.search("cn="+realm+",cn=kerberos,"+suffix,
+                            ldap.SCOPE_BASE,
+                            "(objectclass=krbRealmContainer)",
+                            ("krbmkey", "cn"))
+        res = conn.result(msgid)
+        conn.unbind()
+
+        if len(res) != 2:
+            err = 'Realm Container not found, unable to proceed'
+            print err
+            raise Exception, err
+
+        if 'krbmkey' in res[1][0][1]:
+            print 'System vulnerable'
+            return 1
+        else:
+            print 'System *not* vulnerable'
+            return 0
+    except Exception, e:
+        print "Could not connect to the LDAP server, unable to check server"
+        print "("+type(e)+")("+dir(e)+")"
+        raise e
+
+# We support only des3 encoded stash files for now
+def generate_new_stash_file(file):
+
+    odd_parity_bytes_pool = ['\x01', '\x02', '\x04', '\x07', '\x08', '\x0b', '\r', '\x0e', '\x10', '\x13', '\x15', '\x16', '\x19', '\x1a', '\x1c', '\x1f', ' ', '#', '%', '&', ')', '*', ',', '/', '1', '2', '4', '7', '8', ';', '=', '>', '@', 'C', 'E', 'F', 'I', 'J', 'L', 'O', 'Q', 'R', 'T', 'W', 'X', '[', ']', '^', 'a', 'b', 'd', 'g', 'h', 'k', 'm', 'n', 'p', 's', 'u', 'v', 'y', 'z', '|', '\x7f', '\x80', '\x83', '\x85', '\x86', '\x89', '\x8a', '\x8c', '\x8f', '\x91', '\x92', '\x94', '\x97', '\x98', '\x9b', '\x9d', '\x9e', '\xa1', '\xa2', '\xa4', '\xa7', '\xa8', '\xab', '\xad', '\xae', '\xb0', '\xb3', '\xb5', '\xb6', '\xb9', '\xba', '\xbc', '\xbf', '\xc1', '\xc2', '\xc4', '\xc7', '\xc8', '\xcb', '\xcd', '\xce', '\xd0', '\xd3', '\xd5', '\xd6', '\xd9', '\xda', '\xdc', '\xdf', '\xe0', '\xe3',
+'\xe5', '\xe6', '\xe9', '\xea', '\xec', '\xef', '\xf1', '\xf2', '\xf4', '\xf7',
+'\xf8', '\xfb', '\xfd', '\xfe']
+    pool_len = len(odd_parity_bytes_pool)
+    keytype = 16 # des3
+    keydata = ""
+
+    r = random.SystemRandom()
+    for k in range(24):
+        keydata += r.choice(odd_parity_bytes_pool)
+
+    format = '=hi%ss' % len(keydata)
+    s = struct.pack(format, keytype, len(keydata), keydata)
+    try:
+        fd = open(file, "w")
+        fd.write(s)
+    except os.error, e:
+        logging.critical("failed to write stash file")
+        raise e
+
+# clean up procedures
+def change_mkey_cleanup(password):
+    try:
+        os.stat(basedir)
+    except:
+        return None
+    try:
+        # always remove ldappwdfile as it contains the Directory Manager password
+        os.remove(ldappwdfile)
+    except:
+        pass
+
+    # tar and encrypt the working dir so that we do not leave sensitive data
+    # around unproteceted
+    curtime = time.strftime("%Y%m%d%H%M%S",time.gmtime())
+    tarfile = libdir+"/ipa-change-mkey-"+curtime+".tar"
+    gpgfile = tarfile+".gpg"
+    args = ['/bin/tar', '-C', libdir, '-cf', tarfile, 'mkey']
+    ipa.ipautil.run(args)
+    ipa.ipautil.encrypt_file(tarfile, gpgfile, password, cachedir)
+    os.remove(tarfile)
+    shutil.rmtree(basedir, ignore_errors=True)
+
+    return "The temporary working directory with backup dump files has been securely archived and gpg-encrypted as "+gpgfile+" using the Directory Manager password."
+
+def change_mkey(password = None, quiet = False):
+
+    krbctx = krbV.default_context()
+
+    realm = krbctx.default_realm
+    suffix = ipa.ipautil.realm_to_suffix(realm)
+
+    backupfile = basedir+"/backup.dump"
+    convertfile = basedir+"/convert.dump"
+    oldstashfile = krb5dir+"/.k5."+realm
+    newstashfile = basedir+"/.new.mkey"
+    bkpstashfile = basedir+"/.k5."+realm
+
+    if os.getuid() != 0:
+        print "ERROR: This command must be run as root"
+
+    print "DANGER: This is a dangerous operation, make sure you backup all your IPA data before running the tool"
+    print "This command will restart your Directory and KDC Servers."
+
+    #TODO: ask for confirmation
+    if not ipa.ipautil.user_input("Do you want to proceed and change the Kerberos Master key?", False):
+        print ""
+        print "Aborting..."
+        return 1
+
+    if not password:
+        password = getpass.getpass("Directory Manager password: ")
+
+    # get a connection to the DS
+    try:
+        conn = ipaldap.IPAdmin(ipa.config.config.default_server[0])
+        conn.do_simple_bind(bindpw=password)
+    except Exception, e:
+        print "ERROR: Could not connect to the Directory Server on "+ipa.config.config.default_server[0]+" ("+str(e)+")"
+        return 1
+
+    #  Wipe basedir and recreate it
+    shutil.rmtree(basedir, ignore_errors=True)
+    os.mkdir(basedir, 0700)
+
+    generate_new_stash_file(newstashfile)
+
+    # Generate conf files
+    try:
+        shutil.copyfile(etckrb5conf, ourkrb5conf)
+
+        krbconf = ipachangeconf.IPAChangeConf("IPA Installer")
+        krbconf.setOptionAssignment(" = ")
+        krbconf.setSectionNameDelimiters(("[","]"))
+        krbconf.setSubSectionDelimiters(("{","}"))
+        krbconf.setIndent(("","  ","    "))
+
+        #OPTS
+        opts = [{'name':'ldap_kadmind_dn', 'type':'option', 'action':'set', 'value':'cn=Directory Manager'},
+                {'name':'ldap_service_password_file', 'type':'option', 'action':'set', 'value':ldappwdfile}]
+
+        #REALM
+        realmopts = [{'name':realm, 'type':'subsection', 'action':'set', 'value':opts}]
+
+        #DBMODULES
+        dbopts = [{'name':'dbmodules', 'type':'section', 'action':'set', 'value':realmopts}]
+
+        krbconf.changeConf(ourkrb5conf, dbopts);
+
+        hexpwd = ""
+        for x in password:
+            hexpwd += (hex(ord(x))[2:])
+        pwd_fd = open(ldappwdfile, "w")
+        pwd_fd.write("cn=Directory Manager#{HEX}"+hexpwd+"\n")
+        pwd_fd.close()
+        os.chmod(ldappwdfile, 0600)
+
+    except Exception, e:
+        print "Failed to create custom configuration files ("+str(e)+") aborting..."
+        return 1
+
+    #Set environment vars so that the modified krb5.conf is used
+    os.environ['KRB5_CONFIG'] = ourkrb5conf
+
+    #Backup the kerberos key material for recovery if needed
+    args = ["/usr/kerberos/sbin/kdb5_util", "dump", "-verbose", backupfile]
+    print "Performing safety backup of the key material"
+    try:
+        output = ipa.ipautil.run(args)
+    except ipa.ipautil.CalledProcessError, e:
+        print "Failed to backup key material ("+str(e)+"), aborting ..."
+        return 1
+
+    if not quiet:
+        princlist = output[1].split('\n')
+        print "Principals stored into the backup file "+backupfile+":"
+        for p in princlist:
+            print p
+        print ""
+
+    #Convert the kerberos keys to the new master key
+    args = ["/usr/kerberos/sbin/kdb5_util", "dump", "-verbose", "-new_mkey_file", newstashfile, convertfile]
+    print "Converting key material to new master key"
+    try:
+        output = ipa.ipautil.run(args)
+    except ipa.ipautil.CalledProcessError, e:
+        print "Failed to convert key material, aborting ..."
+        return 1
+
+    savedprinclist = output[1].split('\n')
+
+    if not quiet:
+        princlist = output[1].split('\n')
+        print "Principals dumped for conversion:"
+        for p in princlist:
+            print p
+        print ""
+
+    #Stop the KDC
+    args = ["/etc/init.d/krb5kdc", "stop"]
+    try:
+        output = ipa.ipautil.run(args)
+        if output[0]:
+            print output[0]
+        if output[1]:
+            print output[1]
+    except ipa.ipautil.CalledProcessError, e:
+        print "WARNING: Failed to restart the KDC ("+str(e)+")"
+        print "You will have to manually restart the KDC when the operation is completed"
+
+    #Change the mkey into ldap
+    try:
+        stash = open(newstashfile, "r")
+        keytype = struct.unpack('h', stash.read(2))[0]
+        keylen = struct.unpack('i', stash.read(4))[0]
+        keydata = stash.read(keylen)
+
+        #encode it in the asn.1 attribute
+        MasterKey = univ.Sequence()
+        MasterKey.setComponentByPosition(0, univ.Integer(keytype))
+        MasterKey.setComponentByPosition(1, univ.OctetString(keydata))
+        krbMKey = univ.Sequence()
+        krbMKey.setComponentByPosition(0, univ.Integer(0)) #we have no kvno
+        krbMKey.setComponentByPosition(1, MasterKey)
+        asn1key = pyasn1.codec.ber.encoder.encode(krbMKey)
+
+        dn = "cn="+realm+",cn=kerberos,"+suffix
+        mod = [(ldap.MOD_REPLACE, 'krbMKey', str(asn1key))]
+        conn.modify_s(dn, mod)
+    except Exception, e:
+        print "ERROR: Failed to upload the Master Key from the Stash file: "+newstashfile+" ("+str(e)+")"
+        return 1
+
+    #Backup old stash file and substitute with new
+    try:
+        shutil.move(oldstashfile, bkpstashfile)
+        shutil.copyfile(newstashfile, oldstashfile)
+    except Exception, e:
+        print "ERROR: An error occurred while installing the new stash file("+str(e)+")"
+        print "The KDC may fail to start if the correct stash file is not in place"
+        print "Verify that "+newstashfile+" has been correctly installed into "+oldstashfile
+        print "A backup copy of the old stash file should be saved in "+bkpstashfile
+
+    #Finally upload the converted principals
+    args = ["/usr/kerberos/sbin/kdb5_util", "load", "-verbose", "-update", convertfile]
+    print "Uploading converted key material"
+    try:
+        output = ipa.ipautil.run(args)
+    except ipa.ipautil.CalledProcessError, e:
+        print "Failed to upload key material ("+e+"), aborting ..."
+        return 1
+
+    if not quiet:
+        princlist = output[1].split('\n')
+        print "Principals converted and uploaded:"
+        for p in princlist:
+            print p
+        print ""
+
+    uploadedprinclist = output[1].split('\n')
+
+    #Check for differences and report
+    d = []
+    for p in savedprinclist:
+        if uploadedprinclist.count(p) == 0:
+            d.append(p)
+    if len(d) != 0:
+        print "WARNING: Not all dumped principals have been updated"
+        print "Principals not Updated:"
+        for p in d:
+            print p
+
+    #Remove custom environ
+    del os.environ['KRB5_CONFIG']
+
+    #Restart Directory Server (the pwd plugin need to read the new mkey)
+    args = ["/etc/init.d/dirsrv", "restart"]
+    try:
+        output = ipa.ipautil.run(args)
+        if output[0]:
+            print output[0]
+        if output[1]:
+            print output[1]
+    except ipa.ipautil.CalledProcessError, e:
+        print "WARNING: Failed to restart the Directory Server ("+str(e)+")"
+        print "Please manually restart the DS with 'service dirsrv restart'"
+
+    #Restart the KDC
+    args = ["/etc/init.d/krb5kdc", "start"]
+    try:
+        output = ipa.ipautil.run(args)
+        if output[0]:
+            print output[0]
+        if output[1]:
+            print output[1]
+    except ipa.ipautil.CalledProcessError, e:
+        print "WARNING: Failed to restart the KDC ("+str(e)+")"
+        print "Please manually restart the kdc with 'service krb5kdc start'"
+
+    print "Master Password successfully changed"
+    print ""
+
+    return 0
+
+def fix_replica(password, realm, suffix):
+
+    try:
+        conn = ldapobject.SimpleLDAPObject("ldap://127.0.0.1/")
+        conn.simple_bind("cn=Directory Manager", password)
+        msgid = conn.search("cn="+realm+",cn=kerberos,"+suffix,
+                            ldap.SCOPE_BASE,
+                            "(objectclass=krbRealmContainer)",
+                            ("krbmkey", "cn"))
+        res = conn.result(msgid)
+        conn.unbind()
+        krbmkey = res[1][0][1]['krbmkey'][0]
+    except Exception, e:
+        print "Could not connect to the LDAP server, unable to fix server"
+        print "("+type(e)+")("+dir(e)+")"
+        raise e
+
+    krbMKey = pyasn1.codec.ber.decoder.decode(krbmkey)
+    keytype = int(krbMKey[0][1][0])
+    keydata = str(krbMKey[0][1][1])
+
+    format = '=hi%ss' % len(keydata)
+    s = struct.pack(format, keytype, len(keydata), keydata)
+    try:
+        fd = open("/var/kerberos/krb5kdc/.k5."+realm, "w")
+        fd.write(s)
+        fd.close()
+    except os.error, e:
+        print "failed to write stash file"
+        raise e
+
+    #restart KDC so that it can reload the new Master Key
+    os.system("/etc/init.d/krb5kdc restart")
+
+KRBMKEY_DENY_ACI = """
+(targetattr = "krbMKey")(version 3.0; acl "No external access"; deny (all) userdn != "ldap:///uid=kdc,cn=sysaccounts,cn=etc,$SUFFIX";)
+"""
+
+def fix_main(password, realm, suffix):
+
+    #Run the change master key tool
+    print "Changing Kerberos master key"
+    try:
+        ret = change_mkey(password, True)
+    except SystemExit:
+        ret = 1
+        pass
+    except Exception, e:
+        ret = 1
+        print "%s" % str(e)
+
+    try:
+        msg = change_mkey_cleanup(password)
+        if msg:
+            print msg
+    except Exception, e:
+        print "Failed to clean up the temporary location for the dump files and generate and encrypted archive with error:"
+        print e
+        print "Please securely archive/encrypt "+basedir
+
+    if ret is not 0:
+        sys.exit(ret)
+
+    #Finally upload new master key
+
+    #get the Master Key from the stash file
+    try:
+        stash = open("/var/kerberos/krb5kdc/.k5."+realm, "r")
+        keytype = struct.unpack('h', stash.read(2))[0]
+        keylen = struct.unpack('i', stash.read(4))[0]
+        keydata = stash.read(keylen)
+    except os.error:
+        print "Failed to retrieve Master Key from Stash file: %s"
+        raise e
+    #encode it in the asn.1 attribute
+    MasterKey = univ.Sequence()
+    MasterKey.setComponentByPosition(0, univ.Integer(keytype))
+    MasterKey.setComponentByPosition(1, univ.OctetString(keydata))
+    krbMKey = univ.Sequence()
+    krbMKey.setComponentByPosition(0, univ.Integer(0)) #we have no kvno
+    krbMKey.setComponentByPosition(1, MasterKey)
+    asn1key = pyasn1.codec.ber.encoder.encode(krbMKey)
+
+    dn = "cn=%s,cn=kerberos,%s" % (realm, suffix)
+    sub_dict = dict(REALM=realm, SUFFIX=suffix)
+    #protect the master key by adding an appropriate deny rule along with the key
+    mod = [(ldap.MOD_ADD, 'aci', ipa.ipautil.template_str(KRBMKEY_DENY_ACI, sub_dict)),
+           (ldap.MOD_REPLACE, 'krbMKey', str(asn1key))]
+
+    conn = ldapobject.SimpleLDAPObject("ldap://127.0.0.1/")
+    conn.simple_bind("cn=Directory Manager", password)
+    conn.modify_s(dn, mod)
+    conn.unbind()
+
+    print "\n"
+    print "This server is now correctly configured and the master-key has been changed and secured."
+    print "Please now run this tool with the --fix-replica option on all your other replicas."
+    print "Until you fix the replicas their KDCs will not work."
+
+def main():
+
+    options, args = parse_options()
+
+    if options.usage:
+        usage()
+
+    if not options.fix and not options.fix_replica and not options.check:
+        print "use --help for more info"
+        usage()
+
+    if options.fix or options.fix_replica:
+        password = getpass.getpass("Directory Manager password: ")
+
+    krbctx = krbV.default_context()
+    realm = krbctx.default_realm
+    suffix = ipa.ipautil.realm_to_suffix(realm)
+
+    try:
+        ret = check_vuln(realm, suffix)
+    except:
+        sys.exit(1)
+
+    if options.fix_replica:
+        if ret is 1:
+            print "Your system is still vulnerable"
+            print "If you have already run this tool with --fix on a master then make sure your replication is working correctly, before runnig --fix-replica"
+            sys.exit(1)
+        try:
+            fix_replica(password, realm, suffix)
+        except Exception, e:
+            print "Unexpected error ("+str(e)+")"
+            sys.exit(1)
+        sys.exit(0)
+
+    if options.check:
+        sys.exit(0)
+
+    if options.fix:
+        if ret is 1:
+            try:
+                ret = fix_main(password, realm, suffix)
+            except Exception, e:
+                print "Unexpected error ("+str(e)+")"
+                sys.exit(1)
+        sys.exit(ret)
+
+try:
+    if __name__ == "__main__":
+        sys.exit(main())
+except SystemExit, e:
+    sys.exit(e)
+except KeyboardInterrupt, e:
+    sys.exit(1)
diff --git a/ipa-server/ipa-server.spec.in b/ipa-server/ipa-server.spec.in
index f8de8aa..2a79de0 100644
--- a/ipa-server/ipa-server.spec.in
+++ b/ipa-server/ipa-server.spec.in
@@ -123,6 +123,7 @@ fi
 %{_sbindir}/ipa_kpasswd
 %{_sbindir}/ipa_webgui
 %{_sbindir}/ipa-upgradeconfig
+%{_sbindir}/ipa-fix-CVE-2008-3274
 %attr(755,root,root) %{_initrddir}/ipa_kpasswd
 %attr(755,root,root) %{_initrddir}/ipa_webgui
 
-- 
1.5.5.1


freeipa-encrypt-files.patch:

--- NEW FILE freeipa-encrypt-files.patch ---
>From 5cbc453d89af0ef79b7c99849778f1982abeda05 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Thu, 7 Aug 2008 16:14:37 -0400
Subject: [PATCH] Add encrypt_file and decrypt_file utility functions.
 We will use them to encrypt the replica file so that we can
 transport it over more safely.
 It contains sensitive data, by encrypting it we assure that
 even if a distracted admin leaves it around it cannot be accessed
 without knowing the access passphrase (usually the Directory Manager
 password)

Along the way fix also ipautil.run which was buggy and not passing
in correctly stdin.

Add dependency for gnupg in spec file
---
 ipa-python/ipa-python.spec.in |    2 +-
 ipa-python/ipautil.py         |   65 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/ipa-python/ipa-python.spec.in b/ipa-python/ipa-python.spec.in
index 7d270b4..7744649 100755
--- a/ipa-python/ipa-python.spec.in
+++ b/ipa-python/ipa-python.spec.in
@@ -10,7 +10,7 @@ Source0:        http://www.freeipa.org/downloads/%{name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 BuildRequires:  python-devel
-Requires:       python-kerberos
+Requires:       python-kerberos gnupg
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
diff --git a/ipa-python/ipautil.py b/ipa-python/ipautil.py
index 117171c..649a3f2 100644
--- a/ipa-python/ipautil.py
+++ b/ipa-python/ipautil.py
@@ -73,11 +73,13 @@ def write_tmp_file(txt):
     return fd
 
 def run(args, stdin=None):
-    p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
     if stdin:
+        p = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
         stdout,stderr = p.communicate(stdin)
     else:
+        p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
         stdout,stderr = p.communicate()
+
     logging.info(stdout)
     logging.info(stderr)
 
@@ -115,6 +117,67 @@ def backup_file(fname):
     if file_exists(fname):
         os.rename(fname, fname + ".orig")
 
+# uses gpg to compress and encrypt a file
+def encrypt_file(source, dest, password, workdir = None):
+    if type(source) is not StringType or not len(source):
+        raise ValueError('Missing Source File')
+    #stat it so that we get back an exception if it does no t exist
+    os.stat(source)
+
+    if type(dest) is not StringType or not len(dest):
+        raise ValueError('Missing Destination File')
+
+    if type(password) is not StringType or not len(password):
+        raise ValueError('Missing Password')
+
+    #create a tempdir so that we can clean up with easily
+    tempdir = tempfile.mkdtemp('', 'ipa-', workdir)
+    gpgdir = tempdir+"/.gnupg"
+
+    try:
+        try:
+            #give gpg a fake dir so that we can leater remove all
+            #the cruft when we clean up the tempdir
+            os.mkdir(gpgdir)
+            args = ['/usr/bin/gpg', '--homedir', gpgdir, '--passphrase-fd', '0', '--yes', '--no-tty', '-o', dest, '-c', source]
+            run(args, password)
+        except:
+            raise
+    finally:
+        #job done, clean up
+        shutil.rmtree(tempdir, ignore_errors=True)
+
+
+def decrypt_file(source, dest, password, workdir = None):
+    if type(source) is not StringType or not len(source):
+        raise ValueError('Missing Source File')
+    #stat it so that we get back an exception if it does no t exist
+    os.stat(source)
+
+    if type(dest) is not StringType or not len(dest):
+        raise ValueError('Missing Destination File')
+
+    if type(password) is not StringType or not len(password):
+        raise ValueError('Missing Password')
+
+    #create a tempdir so that we can clean up with easily
+    tempdir = tempfile.mkdtemp('', 'ipa-', workdir)
+    gpgdir = tempdir+"/.gnupg"
+
+    try:
+        try:
+            #give gpg a fake dir so that we can leater remove all
+            #the cruft when we clean up the tempdir
+            os.mkdir(gpgdir)
+            args = ['/usr/bin/gpg', '--homedir', gpgdir, '--passphrase-fd', '0', '--yes', '--no-tty', '-o', dest, '-d', source]
+            run(args, password)
+        except:
+            raise
+    finally:
+        #job done, clean up
+        shutil.rmtree(tempdir, ignore_errors=True)
+
+
 class CIDict(dict):
     """
     Case-insensitive but case-respecting dictionary.
-- 
1.5.5.1


freeipa-fix-expire.patch:

--- NEW FILE freeipa-fix-expire.patch ---
>From cb641d756f0b3e55cc795cacbf122d7b0a6b1c77 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Wed, 6 Aug 2008 17:22:51 -0400
Subject: [PATCH] Treat Jan 1 1970 in krbPrincipalExpiration as a special date that means the account Never Expires

---
 .../ipa-pwd-extop/ipa_pwd_extop.c                  |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
index be440e8..56003f2 100644
--- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
+++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
@@ -1240,10 +1240,11 @@ static int ipapwd_CheckPolicy(struct ipapwd_data *data)
 	int tmp, ret;
 	const char *old_pw;
 
-	/* check account is not expired */
+	/* check account is not expired. Ignore unixtime = 0 (Jan 1 1970) */
 	krbPrincipalExpiration = slapi_entry_attr_get_charptr(data->target, "krbPrincipalExpiration");
-	if (krbPrincipalExpiration) {
-		/* if expiration date set check it */
+	if (krbPrincipalExpiration &&
+	    (strcasecmp("19700101000000Z", krbPrincipalExpiration) != 0)) {
+		/* if expiration date is set check it */
 		memset(&tm, 0, sizeof(struct tm));
 		ret = sscanf(krbPrincipalExpiration,
 			     "%04u%02u%02u%02u%02u%02u",
@@ -1261,6 +1262,7 @@ static int ipapwd_CheckPolicy(struct ipapwd_data *data)
 		}
 		/* FIXME: else error out ? */
 	}
+	slapi_ch_free_string(&krbPrincipalExpiration);
 
 	/* find the entry with the password policy */
 	ret = ipapwd_getPolicy(data->dn, data->target, &policy);
-- 
1.5.5.1


freeipa-fix-key-encryption.patch:

--- NEW FILE freeipa-fix-key-encryption.patch ---
>From c5b44f77a1a2fcc19312dc2d5ad2a46836c936a2 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Tue, 12 Aug 2008 16:11:16 -0400
Subject: [PATCH] Comment out code that generates keys with a random salt, apparently this does not work as expected and generates faulty keys

---
 .../ipa-pwd-extop/ipa_pwd_extop.c                  |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
index 1697fb5..909476b 100644
--- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
+++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
@@ -582,6 +582,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 			 * we have to use a more conservative approach and set the salt
 			 * to be REALMprincipal (the concatenation of REALM and principal
 			 * name without any separator) */
+#if 0
 			if (krbTicketFlags & KTF_REQUIRES_PRE_AUTH) {
 				salt.length = KRB5P_SALT_SIZE;
 				salt.data = malloc(KRB5P_SALT_SIZE);
@@ -598,6 +599,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 					goto enc_error;
 				}
 			} else {
+#endif
 				krberr = krb5_principal2salt(krbctx, princ, &salt);
 				if (krberr) {
 					slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
@@ -605,7 +607,9 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 							krb5_get_error_message(krbctx, krberr));
 					goto enc_error;
 				}
+#if 0
 			}
+#endif
 			break;
 
 		case KRB5_KDB_SALTTYPE_V4:
-- 
1.5.5.1


freeipa-noi18n.patch:

--- NEW FILE freeipa-noi18n.patch ---
diff -u --recursive freeipa-1.1.0.orig/ipa-server/ipa-gui/Makefile.am freeipa-1.1.0/ipa-server/ipa-gui/Makefile.am
--- freeipa-1.1.0.orig/ipa-server/ipa-gui/Makefile.am	2008-06-11 10:24:28.000000000 -0400
+++ freeipa-1.1.0/ipa-server/ipa-gui/Makefile.am	2008-09-10 22:13:53.000000000 -0400
@@ -14,7 +14,7 @@
 	ipa_webgui.cfg		\
 	$(NULL)
 
-LINGUAS = ja
+#LINGUAS = ja
 
 mo = $(foreach lang,$(LINGUAS),locales/$(lang)/LC_MESSAGES/messages.mo)
 po = $(foreach lang,$(LINGUAS),locales/$(lang)/LC_MESSAGES/messages.po)

freeipa-refresh-mkey.patch:

--- NEW FILE freeipa-refresh-mkey.patch ---
>From aad877939879b9c5781d90921d5867e48506b223 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Fri, 22 Aug 2008 15:03:50 -0400
Subject: [PATCH] Retrieve the kerberos configuration every time a new, it will be a bit slower
 but will allow for changing configurations without having to restart DS.
 Password operations are slow and rare enough this is an acceptable compromise.

---
 .../ipa-pwd-extop/ipa_pwd_extop.c                  |  482 ++++++++++----------
 1 files changed, 236 insertions(+), 246 deletions(-)

diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
index eae63da..9b746a9 100644
--- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
+++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
@@ -137,27 +137,42 @@ struct ipapwd_encsalt {
 	krb5_int32	salt_type;
 };
 
-struct ipapwd_config {
-	char *realm;
-	krb5_keyblock *kmkey;
-	int num_supp_encsalts;
-	struct ipapwd_encsalt *supp_encsalts;
-	int num_pref_encsalts;
-	struct ipapwd_encsalt *pref_encsalts;
-};
-
 static const char *ipa_realm_dn = NULL;
 
 Slapi_Mutex *ipa_globals = NULL;
 
-static struct ipapwd_config *ipapwd_config = NULL;
-
 static void *ipapwd_plugin_id;
 
 #define IPA_CHANGETYPE_NORMAL 0
 #define IPA_CHANGETYPE_ADMIN 1
 #define IPA_CHANGETYPE_DSMGR 2
 
+struct ipapwd_krbcfg {
+    krb5_context krbctx;
+    char *realm;
+    krb5_keyblock *kmkey;
+    int num_supp_encsalts;
+    struct ipapwd_encsalt *supp_encsalts;
+    int num_pref_encsalts;
+    struct ipapwd_encsalt *pref_encsalts;
+};
+
+static void free_ipapwd_krbcfg(struct ipapwd_krbcfg **cfg)
+{
+    struct ipapwd_krbcfg *c = *cfg;
+
+    if (!c) return;
+
+    krb5_free_default_realm(c->krbctx, c->realm);
+    krb5_free_context(c->krbctx);
+    free(c->kmkey->contents);
+    free(c->kmkey);
+    free(c->supp_encsalts);
+    free(c->pref_encsalts);
+    free(c);
+    *cfg = NULL;
+};
+
 struct ipapwd_data {
 	Slapi_Entry *target;
 	const char *dn;
@@ -218,23 +233,18 @@ static void ipapwd_keyset_free(struct ipapwd_keyset **pkset)
 	*pkset = NULL;
 }
 
-static int filter_keys(struct ipapwd_keyset *kset)
+static int filter_keys(struct ipapwd_krbcfg *krbcfg, struct ipapwd_keyset *kset)
 {
-	struct ipapwd_config *config;
 	int i, j;
 
-	slapi_lock_mutex(ipa_globals);
-	config = ipapwd_config;
-	slapi_unlock_mutex(ipa_globals);
-
 	for (i = 0; i < kset->num_keys; i++) {
-		for (j = 0; j < config->num_supp_encsalts; j++) {
+		for (j = 0; j < krbcfg->num_supp_encsalts; j++) {
 			if (kset->keys[i].ekey->type ==
-					config->supp_encsalts[j].enc_type) {
+					krbcfg->supp_encsalts[j].enc_type) {
 				break;
 			}
 		}
-		if (j == config->num_supp_encsalts) { /* not valid */
+		if (j == krbcfg->num_supp_encsalts) { /* not valid */
 
 			/* free key */
 			if (kset->keys[i].ekey) {
@@ -458,9 +468,10 @@ static inline void encode_int16(unsigned int val, unsigned char *p)
 	p[0] = (val      ) & 0xff;
 }
 
-static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data *data)
+static Slapi_Value **encrypt_encode_key(struct ipapwd_krbcfg *krbcfg,
+					struct ipapwd_data *data)
 {
-	struct ipapwd_config *config;
+	krb5_context krbctx;
 	const char *krbPrincipalName;
 	uint32_t krbMaxTicketLife;
 	int kvno, i;
@@ -472,9 +483,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 	krb5_data pwd;
 	struct ipapwd_keyset *kset = NULL;
 
-	slapi_lock_mutex(ipa_globals);
-	config = ipapwd_config;
-	slapi_unlock_mutex(ipa_globals);
+	krbctx = krbcfg->krbctx;
 
 	svals = (Slapi_Value **)calloc(2, sizeof(Slapi_Value *));
 	if (!svals) {
@@ -524,7 +533,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 	/* we also assum mkvno is 0 */
 	kset->mkvno = 0;
 
-	kset->num_keys = config->num_pref_encsalts;
+	kset->num_keys = krbcfg->num_pref_encsalts;
 	kset->keys = calloc(kset->num_keys, sizeof(struct ipapwd_krbkey));
 	if (!kset->keys) {
 		slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop", "malloc failed!\n");
@@ -542,7 +551,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 
 		salt.data = NULL;
 
-		switch (config->pref_encsalts[i].salt_type) {
+		switch (krbcfg->pref_encsalts[i].salt_type) {
 
 		case KRB5_KDB_SALTTYPE_ONLYREALM:
 
@@ -629,12 +638,12 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 
 		default:
 			slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
-					"Invalid salt type [%d]\n", config->pref_encsalts[i].salt_type);
+					"Invalid salt type [%d]\n", krbcfg->pref_encsalts[i].salt_type);
 			goto enc_error;
 		}
 
 		/* need to build the key now to manage the AFS salt.length special case */
-		krberr = krb5_c_string_to_key(krbctx, config->pref_encsalts[i].enc_type, &pwd, &salt, &key);
+		krberr = krb5_c_string_to_key(krbctx, krbcfg->pref_encsalts[i].enc_type, &pwd, &salt, &key);
 		if (krberr) {
 			slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
 					"krb5_c_string_to_key failed [%s]\n",
@@ -646,7 +655,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 			salt.length = strlen(salt.data);
 		}
 
-		krberr = krb5_c_encrypt_length(krbctx, config->kmkey->enctype, key.length, &len);
+		krberr = krb5_c_encrypt_length(krbctx, krbcfg->kmkey->enctype, key.length, &len);
 		if (krberr) {
 			slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
 					"krb5_c_string_to_key failed [%s]\n",
@@ -672,7 +681,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 		cipher.ciphertext.length = len;
 		cipher.ciphertext.data = (char *)ptr+2;
 
-		krberr = krb5_c_encrypt(krbctx, config->kmkey, 0, 0, &plain, &cipher);
+		krberr = krb5_c_encrypt(krbctx, krbcfg->kmkey, 0, 0, &plain, &cipher);
 		if (krberr) {
 			slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
 					"krb5_c_encrypt failed [%s]\n",
@@ -692,7 +701,7 @@ static Slapi_Value **encrypt_encode_key(krb5_context krbctx, struct ipapwd_data
 			goto enc_error;
 		}
 
-		kset->keys[i].salt->type = config->pref_encsalts[i].salt_type;
+		kset->keys[i].salt->type = krbcfg->pref_encsalts[i].salt_type;
 
 		if (salt.length) {
 			kset->keys[i].salt->value.bv_len = salt.length;
@@ -1633,7 +1642,8 @@ static void hexbuf(char *out, const uint8_t *in)
 }
 
 /* Modify the Password attributes of the entry */
-static int ipapwd_SetPassword(struct ipapwd_data *data)
+static int ipapwd_SetPassword(struct ipapwd_krbcfg *krbcfg,
+				struct ipapwd_data *data)
 {
 	int ret = 0, i = 0;
 	Slapi_Mods *smods;
@@ -1648,26 +1658,17 @@ static int ipapwd_SetPassword(struct ipapwd_data *data)
 	int ntlm_flags = 0;
 	Slapi_Value *sambaSamAccount;
 
-	krberr = krb5_init_context(&krbctx);
-	if (krberr) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop", "krb5_init_context failed\n");
-		return LDAP_OPERATIONS_ERROR;
-	}
-
 	slapi_log_error(SLAPI_LOG_TRACE, "ipa_pwd_extop", "=> ipapwd_SetPassword\n");
 
 	smods = slapi_mods_new();
 
 	/* generate kerberos keys to be put into krbPrincipalKey */
-	svals = encrypt_encode_key(krbctx, data);
+	svals = encrypt_encode_key(krbcfg, data);
 	if (!svals) {
 		slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop", "key encryption/encoding failed\n");
-		krb5_free_context(krbctx);
 		ret = LDAP_OPERATIONS_ERROR;
 		goto free_and_return;
 	}
-	/* done with it */
-	krb5_free_context(krbctx);
 
 	slapi_mods_add_mod_values(smods, LDAP_MOD_REPLACE, "krbPrincipalKey", svals);
 
@@ -1756,7 +1757,7 @@ free_and_return:
 	return ret;
 }
 
-static int ipapwd_chpwop(Slapi_PBlock *pb)
+static int ipapwd_chpwop(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg)
 {
 	char 		*bindDN = NULL;
 	char		*authmethod = NULL;
@@ -1772,11 +1773,6 @@ static int ipapwd_chpwop(Slapi_PBlock *pb)
 	Slapi_Entry *targetEntry=NULL;
 	char *attrlist[] = {"*", "passwordHistory", NULL };
 	struct ipapwd_data pwdata;
-	struct ipapwd_config *config;
-
-	slapi_lock_mutex(ipa_globals);
-	config = ipapwd_config;
-	slapi_unlock_mutex(ipa_globals);
 
 	/* Get the ber value of the extended operation */
 	slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_value);
@@ -1973,7 +1969,7 @@ parse_req_done:
 		if (bindexp) {
 			/* special case kpasswd and Directory Manager */
 			if ((strncasecmp(bindexp[0], "krbprincipalname=kadmin/changepw@", 33) == 0) &&
-			    (strcasecmp(&(bindexp[0][33]), config->realm) == 0)) {
+			    (strcasecmp(&(bindexp[0][33]), krbcfg->realm) == 0)) {
 				pwdata.changetype = IPA_CHANGETYPE_NORMAL;
 			}
 			if ((strcasecmp(bindexp[0], "cn=Directory Manager") == 0) &&
@@ -1999,7 +1995,7 @@ parse_req_done:
 	}
 
 	/* Now we're ready to set the kerberos key material */
-	ret = ipapwd_SetPassword(&pwdata);
+	ret = ipapwd_SetPassword(krbcfg, &pwdata);
 	if (ret != LDAP_SUCCESS) {
 		/* Failed to modify the password,
 		 * e.g. because insufficient access allowed */
@@ -2037,9 +2033,8 @@ free_and_return:
 }
 
 /* Password Modify Extended operation plugin function */
-static int ipapwd_setkeytab(Slapi_PBlock *pb)
+static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg)
 {
-	struct ipapwd_config *config;
 	char *bindDN = NULL;
 	char *serviceName = NULL;
 	char *errMesg = NULL;
@@ -2071,10 +2066,6 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb)
 	char timestr[GENERALIZED_TIME_LENGTH+1];
 	time_t time_now = time(NULL);
 
-	slapi_lock_mutex(ipa_globals);
-	config = ipapwd_config;
-	slapi_unlock_mutex(ipa_globals);
-
 	svals = (Slapi_Value **)calloc(2, sizeof(Slapi_Value *));
 	if (!svals) {
 		slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
@@ -2333,7 +2324,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb)
 		plain.length = tval.bv_len;
 		plain.data = tval.bv_val;
 
-		krberr = krb5_c_encrypt_length(krbctx, config->kmkey->enctype, plain.length, &klen);
+		krberr = krb5_c_encrypt_length(krbctx, krbcfg->kmkey->enctype, plain.length, &klen);
 		if (krberr) {
 			free(tval.bv_val);
 			slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop", "krb encryption failed!\n");
@@ -2354,7 +2345,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb)
 		cipher.ciphertext.length = klen;
 		cipher.ciphertext.data = (char *)kdata + 2;
 
-		krberr = krb5_c_encrypt(krbctx, config->kmkey, 0, 0, &plain, &cipher);
+		krberr = krb5_c_encrypt(krbctx, krbcfg->kmkey, 0, 0, &plain, &cipher);
 		if (krberr) {
 			free(tval.bv_val);
 			slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop", "krb encryption failed!\n");
@@ -2421,7 +2412,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb)
 	ber = NULL;
 
 	/* filter un-supported encodings */
-	ret = filter_keys(kset);
+	ret = filter_keys(krbcfg, kset);
 	if (ret) {
 		slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop",
 				"keyset filtering failed\n");
@@ -2620,168 +2620,182 @@ static int new_ipapwd_encsalt(krb5_context krbctx, const char * const *encsalts,
 	return LDAP_SUCCESS;
 }
 
-static int ipapwd_getConfig(krb5_context krbctx, const char *realm_dn)
+static struct ipapwd_krbcfg *ipapwd_getConfig(const char *realm_dn)
 {
-	struct ipapwd_config *config = NULL;
-	krb5_keyblock *kmkey = NULL;
-	Slapi_Entry *realm_entry = NULL;
-	Slapi_Attr *a;
-	Slapi_Value *v;
-	BerElement *be = NULL;
-	ber_tag_t tag, tmp;
-	ber_int_t ttype;
-	const struct berval *bval;
-	struct berval *mkey = NULL;
-	char **encsalts;
-	int ret;
-
-	config = malloc(sizeof(struct ipapwd_config));
-	if (!config) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Out of memory!\n");
-		goto free_and_error;
-	}
-	kmkey = malloc(sizeof(krb5_keyblock));
-	if (!kmkey) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Out of memory!\n");
-		goto free_and_error;
-	}
-	config->kmkey = kmkey;
-
-	ret = krb5_get_default_realm(krbctx, &config->realm);
-	if (ret) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Failed to get default realm?!\n");
-		goto free_and_error;
-	}
-
-
-	/* get the Realm Container entry */
-	ret = ipapwd_getEntry(realm_dn, &realm_entry, NULL);
-	if (ret != LDAP_SUCCESS) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"No realm Entry?\n");
-		goto free_and_error;
-	}
-
-	/*** get the Kerberos Master Key ***/
+    krb5_error_code krberr;
+    struct ipapwd_krbcfg *config = NULL;
+    krb5_keyblock *kmkey = NULL;
+    Slapi_Entry *realm_entry = NULL;
+    Slapi_Attr *a;
+    Slapi_Value *v;
+    BerElement *be = NULL;
+    ber_tag_t tag, tmp;
+    ber_int_t ttype;
+    const struct berval *bval;
+    struct berval *mkey = NULL;
+    char **encsalts;
+    int ret;
+
+    config = calloc(1, sizeof(struct ipapwd_krbcfg));
+    if (!config) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Out of memory!\n");
+        goto free_and_error;
+    }
+    kmkey = calloc(1, sizeof(krb5_keyblock));
+    if (!kmkey) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Out of memory!\n");
+        goto free_and_error;
+    }
+    config->kmkey = kmkey;
+
+    krberr = krb5_init_context(&config->krbctx);
+    if (krberr) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "krb5_init_context failed\n");
+        goto free_and_error;
+    }
+
+    ret = krb5_get_default_realm(config->krbctx, &config->realm);
+    if (ret) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Failed to get default realm?!\n");
+        goto free_and_error;
+    }
+
+    /* get the Realm Container entry */
+    ret = ipapwd_getEntry(realm_dn, &realm_entry, NULL);
+    if (ret != LDAP_SUCCESS) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "No realm Entry?\n");
+        goto free_and_error;
+    }
+
+    /*** get the Kerberos Master Key ***/
+
+    ret = slapi_entry_attr_find(realm_entry, "krbMKey", &a);
+    if (ret == -1) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "No master key??\n");
+        goto free_and_error;
+    }
+
+    /* there should be only one value here */
+    ret = slapi_attr_first_value(a, &v);
+    if (ret == -1) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "No master key??\n");
+        goto free_and_error;
+    }
+
+    bval = slapi_value_get_berval(v);
+    if (!bval) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Error retrieving master key berval\n");
+        goto free_and_error;
+    }
+
+    be = ber_init(bval);
+    if (!bval) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "ber_init() failed!\n");
+        goto free_and_error;
+    }
+
+    tag = ber_scanf(be, "{i{iO}}", &tmp, &ttype, &mkey);
+    if (tag == LBER_ERROR) {
+        slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_getConfig",
+                        "Bad Master key encoding ?!\n");
+        goto free_and_error;
+    }
+
+    kmkey->magic = KV5M_KEYBLOCK;
+    kmkey->enctype = ttype;
+    kmkey->length = mkey->bv_len;
+    kmkey->contents = malloc(mkey->bv_len);
+    if (!kmkey->contents) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Out of memory!\n");
+        goto free_and_error;
+    }
+    memcpy(kmkey->contents, mkey->bv_val, mkey->bv_len);
+    ber_bvfree(mkey);
+    ber_free(be, 1);
+    mkey = NULL;
+    be = NULL;
+
+    /*** get the Supported Enc/Salt types ***/
+
+    encsalts = slapi_entry_attr_get_charray(realm_entry, "krbSupportedEncSaltTypes");
+    if (encsalts) {
+        ret = new_ipapwd_encsalt(config->krbctx,
+                                 (const char * const *)encsalts,
+                                 &config->supp_encsalts,
+                                 &config->num_supp_encsalts);
+        slapi_ch_array_free(encsalts);
+    } else {
+        slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_getConfig",
+                        "No configured salt types use defaults\n");
+        ret = new_ipapwd_encsalt(config->krbctx,
+                                 ipapwd_def_encsalts,
+                                 &config->supp_encsalts,
+                                 &config->num_supp_encsalts);
+    }
+    if (ret) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Can't get Supported EncSalt Types\n");
+        goto free_and_error;
+    }
+
+    /*** get the Preferred Enc/Salt types ***/
+
+    encsalts = slapi_entry_attr_get_charray(realm_entry, "krbDefaultEncSaltTypes");
+    if (encsalts) {
+        ret = new_ipapwd_encsalt(config->krbctx,
+                                 (const char * const *)encsalts,
+                                 &config->pref_encsalts,
+                                 &config->num_pref_encsalts);
+        slapi_ch_array_free(encsalts);
+    } else {
+        slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_getConfig",
+                        "No configured salt types use defaults\n");
+        ret = new_ipapwd_encsalt(config->krbctx,
+                                 ipapwd_def_encsalts,
+                                 &config->pref_encsalts,
+                                 &config->num_pref_encsalts);
+    }
+    if (ret) {
+        slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig",
+                        "Can't get Preferred EncSalt Types\n");
+        goto free_and_error;
+    }
 
-	ret = slapi_entry_attr_find(realm_entry, "krbMKey", &a);
-	if (ret == -1) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"No master key??\n");
-		goto free_and_error;
-	}
-
-	/* there should be only one value here */
-	ret = slapi_attr_first_value(a, &v);
-	if (ret == -1) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"No master key values??\n");
-		goto free_and_error;
-	}
-
-	bval = slapi_value_get_berval(v);
-	if (!bval) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Error retrieving master key berval\n");
-		goto free_and_error;
-	}
-
-	be = ber_init(bval);
-	if (!bval) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"ber_init() failed!\n");
-		goto free_and_error;
-	}
-
-	tag = ber_scanf(be, "{i{iO}}", &tmp, &ttype, &mkey);
-	if (tag == LBER_ERROR) {
-		slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_start",
-				"Bad Master key encoding ?!\n");
-		goto free_and_error;
-	}
+    slapi_entry_free(realm_entry);
 
-	kmkey->magic = KV5M_KEYBLOCK;
-	kmkey->enctype = ttype;
-	kmkey->length = mkey->bv_len;
-	kmkey->contents = malloc(mkey->bv_len);
-	if (!kmkey->contents) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Out of memory!\n");
-		goto free_and_error;
-	}
-	memcpy(kmkey->contents, mkey->bv_val, mkey->bv_len);
-	ber_bvfree(mkey);
-	ber_free(be, 1);
-
-	/*** get the Supported Enc/Salt types ***/
-
-	encsalts = slapi_entry_attr_get_charray(realm_entry, "krbSupportedEncSaltTypes");
-	if (encsalts) {
-		ret = new_ipapwd_encsalt(krbctx, (const char * const *)encsalts,
-					 &config->supp_encsalts,
-					 &config->num_supp_encsalts);
-		slapi_ch_array_free(encsalts);
-	} else {
-		slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_start",
-				"No configured salt types use defaults\n");
-		ret = new_ipapwd_encsalt(krbctx, ipapwd_def_encsalts,
-					 &config->supp_encsalts,
-					 &config->num_supp_encsalts);
-	}
-	if (ret) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Can't get Supported EncSalt Types\n");
-		goto free_and_error;
-	}
-
-	/*** get the Preferred Enc/Salt types ***/
-
-	encsalts = slapi_entry_attr_get_charray(realm_entry, "krbDefaultEncSaltTypes");
-	if (encsalts) {
-		ret = new_ipapwd_encsalt(krbctx, (const char * const *)encsalts,
-					 &config->pref_encsalts,
-					 &config->num_pref_encsalts);
-		slapi_ch_array_free(encsalts);
-	} else {
-		slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_start",
-				"No configured salt types use defaults\n");
-		ret = new_ipapwd_encsalt(krbctx, ipapwd_def_encsalts,
-					 &config->pref_encsalts,
-					 &config->num_pref_encsalts);
-	}
-	if (ret) {
-		slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-				"Can't get Preferred EncSalt Types\n");
-		goto free_and_error;
-	}
-
-	/*** set config/replace old config ***/
-
-	/* FIXME: free old one in a safe way, use read locks ? */
-	slapi_lock_mutex(ipa_globals);
-	ipapwd_config = config;
-	slapi_unlock_mutex(ipa_globals);
-
-	slapi_entry_free(realm_entry);
-	return LDAP_SUCCESS;
+    return config;
 
 free_and_error:
-	if (mkey) ber_bvfree(mkey);
-	if (be) ber_free(be, 1);
-	free(config->pref_encsalts);
-	free(config->supp_encsalts);
-	free(config->kmkey);
-	free(config);
-	if (realm_entry) slapi_entry_free(realm_entry);
-	return LDAP_OPERATIONS_ERROR;
+    if (mkey) ber_bvfree(mkey);
+    if (be) ber_free(be, 1);
+    if (kmkey) {
+        free(kmkey->contents);
+        free(kmkey);
+    }
+    if (config) {
+        if (config->krbctx) krb5_free_context(config->krbctx);
+        free(config->pref_encsalts);
+        free(config->supp_encsalts);
+        free(config);
+    }
+    if (realm_entry) slapi_entry_free(realm_entry);
+    return NULL;
 }
 
 
 static int ipapwd_extop(Slapi_PBlock *pb)
 {
+  	struct ipapwd_krbcfg *krbcfg = NULL;
 	char *oid = NULL;
 	char *errMesg = NULL;
 	int ret=0, rc=0, sasl_ssf=0, is_ssl=0;
@@ -2835,30 +2841,6 @@ static int ipapwd_extop(Slapi_PBlock *pb)
 	}
 #endif
 
-	/* make sure we have the master key */
-	if (ipapwd_config == NULL) {
-		krb5_context krbctx;
-		krb5_error_code krberr;
-
-		krberr = krb5_init_context(&krbctx);
-		if (krberr) {
-			slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_start",
-					"krb5_init_context failed\n");
-			errMesg = "Fatal Internal Error";
-			rc = LDAP_OPERATIONS_ERROR;
-			goto free_and_return;
-		}
-		ret = ipapwd_getConfig(krbctx, ipa_realm_dn);
-		if (ret != LDAP_SUCCESS) {
-			slapi_log_error(SLAPI_LOG_PLUGIN, "ipa_pwd_extop",
-					"Error Retrieving Master Key");
-			errMesg = "Fatal Internal Error";
-			rc = LDAP_OPERATIONS_ERROR;
-			goto free_and_return;
-		}
-		krb5_free_context(krbctx);
-	}
-
 	/* Before going any further, we'll make sure that the right extended
 	 * operation plugin has been called: i.e., the OID shipped whithin the
 	 * extended operation request must match this very plugin's OIDs:
@@ -2873,11 +2855,25 @@ static int ipapwd_extop(Slapi_PBlock *pb)
 				"Received extended operation request with OID %s\n", oid);
 	}
 
+	/* get the kerberos context and master key */
+	krbcfg = ipapwd_getConfig(ipa_realm_dn);
+	if (NULL == krbcfg) {
+		slapi_log_error(SLAPI_LOG_PLUGIN, "ipa_pwd_extop",
+				"Error Retrieving Master Key");
+		errMesg = "Fatal Internal Error";
+		rc = LDAP_OPERATIONS_ERROR;
+		goto free_and_return;
+	}
+
 	if (strcasecmp(oid, EXOP_PASSWD_OID) == 0) {
-		return ipapwd_chpwop(pb);
+		ret = ipapwd_chpwop(pb, krbcfg);
+		free_ipapwd_krbcfg(&krbcfg);
+		return ret;
 	}
 	if (strcasecmp(oid, KEYTAB_SET_OID) == 0) {
-		return ipapwd_setkeytab(pb);
+		ret = ipapwd_setkeytab(pb, krbcfg);
+		free_ipapwd_krbcfg(&krbcfg);
+		return ret;
 	}
 
 	errMesg = "Request OID does not match supported OIDs.\n";
@@ -2952,12 +2948,6 @@ static int ipapwd_start( Slapi_PBlock *pb )
 	ipa_realm_dn = realm_dn;
 	slapi_unlock_mutex(ipa_globals);
 
-	ret = ipapwd_getConfig(krbctx, ipa_realm_dn);
-	if (ret) {
-		slapi_log_error( SLAPI_LOG_PLUGIN, "ipapwd_start", "Couldn't init master key at start delaying ...");
-		ret = LDAP_SUCCESS;
-	}
-
 	krb5_free_context(krbctx);
 	slapi_entry_free(config_entry);
 	return ret;
-- 
1.5.5.1


freeipa-user-input.patch:

--- NEW FILE freeipa-user-input.patch ---
>From f7ca405716b1ee8b92a940e07cd611f6b025795d Mon Sep 17 00:00:00 2001
From: Martin Nagy <mnagy at notas.(none)>
Date: Mon, 21 Jul 2008 12:25:37 +0200
Subject: [PATCH] Wrap up the raw_input() to user_input() for convenience and uniformity.

---
 ipa-admintools/ipa-addgroup                   |   17 +------
 ipa-admintools/ipa-adduser                    |   50 ++----------------
 ipa-admintools/ipa-moduser                    |   57 +++-------------------
 ipa-client/ipa-install/ipa-client-install     |   23 ++------
 ipa-python/ipautil.py                         |   66 +++++++++++++++++++++++++
 ipa-radius-server/ipa-radius-install          |    3 +-
 ipa-server/ipa-install/ipa-replica-install    |   10 +---
 ipa-server/ipa-install/ipa-server-certinstall |   19 ++-----
 ipa-server/ipa-install/ipa-server-install     |   64 +++++++++---------------
 9 files changed, 119 insertions(+), 190 deletions(-)

diff --git a/ipa-admintools/ipa-addgroup b/ipa-admintools/ipa-addgroup
index caf4e93..cc81383 100644
--- a/ipa-admintools/ipa-addgroup
+++ b/ipa-admintools/ipa-addgroup
@@ -81,29 +81,16 @@ def main():
     if options.usage:
         usage()
 
-    cont = False
-
     if (len(args) != 2):
-        while (cont != True):
-            cn = raw_input("Group name: ")
-            if (ipavalidate.String(cn, notEmpty=True)):
-                print "Please enter a value"
-            else:
-                cont = True
+        cn = ipautil.user_input("Group name", allow_empty = False)
     else:
         cn = args[1]
         if (ipavalidate.String(cn, notEmpty=True)):
             print "Please enter a value"
             return 1
 
-    cont = False
     if not options.desc:
-        while (cont != True):
-            desc = raw_input("Description: ")
-            if (ipavalidate.String(desc, notEmpty=True)):
-                print "Please enter a value"
-            else:
-                cont = True
+        desc = ipautil.user_input("Description", allow_empty = False)
     else:
         desc = options.desc
         if (ipavalidate.String(desc, notEmpty=True)):
diff --git a/ipa-admintools/ipa-adduser b/ipa-admintools/ipa-adduser
index 2c32d1e..17c75ed 100644
--- a/ipa-admintools/ipa-adduser
+++ b/ipa-admintools/ipa-adduser
@@ -102,7 +102,6 @@ def main():
     groups = ""
 
     match = False
-    cont = False
 
     all_interactive = False
 
@@ -116,40 +115,23 @@ def main():
         all_interactive = True
 
     if not options.gn:
-        while (cont != True):
-            givenname = raw_input("First name: ")
-            if (ipavalidate.String(givenname, notEmpty=True)):
-                print "Please enter a value"
-            else:
-                cont = True
+        givenname = ipautil.user_input("First name", allow_empty = False)
     else:
         givenname = options.gn
         if (ipavalidate.String(givenname, notEmpty=True)):
             print "Please enter a value"
             return 1
 
-    cont = False
     if not options.sn:
-        while (cont != True):
-            lastname = raw_input("Last name: ")
-            if (ipavalidate.String(lastname, notEmpty=True)):
-                print "Please enter a value"
-            else:
-                cont = True
+        lastname = ipautil.user_input("Last name", allow_empty = False)
     else:
         lastname = options.sn
         if (ipavalidate.String(lastname, notEmpty=True)):
             print "Please enter a value"
             return 1
 
-    cont = False
     if (len(args) != 2):
-        while (cont != True):
-            username = raw_input("Login name: ")
-            if (ipavalidate.Plain(username, notEmpty=True, allowSpaces=False)):
-                print "Please enter a value"
-            else:
-                cont = True
+        username = ipautil.user_input_plain("Login name", allow_empty = False, allow_spaces = False)
     else:
         username = args[1]
         if (ipavalidate.Plain(username, notEmpty=True, allowSpaces=False)):
@@ -180,32 +162,12 @@ def main():
     # Ask the questions we don't normally force. We don't require answers
     # for these.
     if all_interactive is True:
-        cont = False
         if not options.gecos:
-            while (cont != True):
-                gecos = raw_input("gecos []: ")
-                if (ipavalidate.String(gecos, notEmpty=False)):
-                    print "Please enter a value"
-                else:
-                    cont = True
-        cont = False
+            gecos = ipautil.user_input("gecos")
         if not options.directory:
-            while (cont != True):
-                directory = raw_input("home directory [/home/"+username+"]: ")
-                if directory == "":
-                     directory = "/home/"+username
-                if (ipavalidate.Path(directory, notEmpty=False)):
-                    print "Please enter a value"
-                else:
-                    cont = True
-        cont = False
+            directory = ipautil.user_input_path("Home directory", "/home/" + username, allow_empty = True)
         if not options.shell:
-            while (cont != True):
-                shell = raw_input("shell [/bin/sh]: ")
-
-                if len(shell) < 1:
-                    shell = None
-                cont = True
+            shell = ipautil.user_input("Shell", "/bin/sh", allow_empty = False)
 
     else:
         gecos = options.gecos
diff --git a/ipa-admintools/ipa-moduser b/ipa-admintools/ipa-moduser
index 22f2318..4b3bd5c 100644
--- a/ipa-admintools/ipa-moduser
+++ b/ipa-admintools/ipa-moduser
@@ -97,7 +97,6 @@ def main():
     shell = ""
 
     match = False
-    cont = False
 
     options, args = parse_options()
 
@@ -141,46 +140,23 @@ def main():
         shell = options.shell
     else:
         if not options.gn:
-            while (cont != True):
-                givenname = raw_input("First name: [%s] " % user.getValue('givenname'))
-                if (ipavalidate.String(givenname, notEmpty=False)):
-                    print "Please enter a value"
-                else:
-                    cont = True
-                if len(givenname) < 1:
-                    givenname = None
-                    cont = True
+            givenname = ipautil.user_input("First name", user.getValue('givenname'), allow_empty = False)
         else:
             givenname = options.gn
             if (ipavalidate.String(givenname, notEmpty=True)):
                 print "Please enter a value"
                 return 1
 
-        cont = False
         if not options.sn:
-            while (cont != True):
-                lastname = raw_input(" Last name: [%s] " % user.getValue('sn'))
-                if (ipavalidate.String(lastname, notEmpty=False)):
-                    print "Please enter a value"
-                else:
-                    cont = True
-                if len(lastname) < 1:
-                    lastname = None
-                    cont = True
+            lastname = ipautil.user_input("Last name", user.getValue('sn'), allow_empty = False)
         else:
             lastname = options.sn
             if (ipavalidate.String(lastname, notEmpty=True)):
                 print "Please enter a value"
                 return 1
 
-        cont = False
         if not options.mail:
-            while (cont != True):
-                mail = raw_input("E-mail addr: [%s]" % user.getValue('mail'))
-                if (ipavalidate.Email(mail, notEmpty=False)):
-                    print "E-mail must include a user and domain name"
-                else:
-                    cont = True
+            mail = ipautil.user_input_email("E-mail address", user.getValue('mail'), allow_empty = True)
         else:
             mail = options.mail
             if (ipavalidate.Email(mail)):
@@ -189,32 +165,13 @@ def main():
 
         # Ask the questions we don't normally force. We don't require answers
         # for these.
-        cont = False
         if not options.gecos:
-            while (cont != True):
-                gecos = raw_input("gecos: [%s] " % user.getValue('gecos'))
-                if (ipavalidate.String(gecos, notEmpty=False)):
-                    print "Please enter a value"
-                else:
-                    cont = True
+            gecos = ipautil.user_input("gecos", user.getValue('gecos'))
 
-        cont = False
         if not options.directory:
-            while (cont != True):
-                directory = raw_input("home directory: [%s] " % user.getValue('homeDirectory'))
-                if (ipavalidate.Path(gecos, notEmpty=False)):
-                    print "Valid path is required"
-                else:
-                    cont = True
-        cont = False
+            directory = ipautil.user_input_path("Home directory", user.getValue('homeDirectory'))
         if not options.shell:
-            while (cont != True):
-                shell = raw_input("shell: [%s] " % user.getValue('loginshell'))
-
-                if len(shell) < 1:
-                    shell = None
-                    cont = True
-        cont = False
+            shell = ipautil.user_input("Shell", user.getValue('loginshell'), allow_empty = False)
 
     if givenname:
         user.setValue('givenname', givenname)
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index ecdf927..eec36e4 100644
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -30,7 +30,7 @@ try:
     import ipaclient.ipadiscovery
     import ipaclient.ipachangeconf
     import ipaclient.ntpconf
-    from ipa.ipautil import run
+    from ipa.ipautil import run, user_input
     from ipa import sysrestore
     from ipa import version
 except ImportError:
@@ -70,13 +70,6 @@ def parse_options():
 
     return options
 
-def ask_for_confirmation(message):
-    yesno = raw_input(message + " [y/N]: ")
-    if not yesno or yesno.lower()[0] != "y":
-        return False
-    print "\n"
-    return True
-
 def logging_setup(options):
     # Always log everything (i.e., DEBUG) to the log
     # file.
@@ -124,7 +117,7 @@ def uninstall(options):
         print "The original nsswitch.conf configuration has been restored."
         print "You may need to restart services or reboot the machine."
         if not options.on_master:
-            if ask_for_confirmation("Do you want to reboot the machine?"):
+            if user_input("Do you want to reboot the machine?", False):
                 try:
                     run(["/usr/bin/reboot"])
                 except Exception, e:
@@ -163,9 +156,7 @@ def main():
             return ret
         else:
             print "DNS discovery failed to determine your DNS domain"
-            cli_domain = ""
-            while cli_domain == "":
-                cli_domain = raw_input("Please provide the domain name of your IPA server (ex: example.com): ")
+            cli_domain = user_input("Please provide the domain name of your IPA server (ex: example.com)", allow_empty = False)
         ret = ds.search(domain=cli_domain, server=options.server)
     if not cli_domain:
         if ds.getDomainName():
@@ -180,9 +171,7 @@ def main():
             return ret
         else:
             print "DNS discovery failed to find the IPA Server"
-            cli_server = ""
-            while cli_server == "":
-                cli_server = raw_input("Please provide your IPA server name (ex: ipa.example.com): ")
+            cli_server = user_input("Please provide your IPA server name (ex: ipa.example.com)", allow_empty = False)
         ret = ds.search(domain=cli_domain, server=cli_server)
     if not cli_server:
         if ds.getServerName():
@@ -203,7 +192,7 @@ def main():
         print "If you proceed with the installation, services will be configured to always"
         print "access the discovered server for all operation and will not fail over to"
         print "other servers in case of failure.\n"
-        if not ask_for_confirmation("Do you want to proceed and configure the system with fixed values with no DNS discovery?"):
+        if not user_input("Do you want to proceed and configure the system with fixed values with no DNS discovery?", False):
             return ret
 
     if options.realm_name and options.realm_name != ds.getRealmName():
@@ -220,7 +209,7 @@ def main():
     print "BaseDN: "+cli_basedn
 
     print "\n"
-    if not options.unattended and not ask_for_confirmation("Continue to configure the system with these values?"):
+    if not options.unattended and not user_input("Continue to configure the system with these values?", False):
         return 1
 
     # Configure ipa.conf
diff --git a/ipa-python/ipautil.py b/ipa-python/ipautil.py
index 4e065fc..3526cc7 100644
--- a/ipa-python/ipautil.py
+++ b/ipa-python/ipautil.py
@@ -29,6 +29,7 @@ import os, sys, traceback, readline
 import stat
 import shutil
 
+from ipa import ipavalidate
 from types import *
 
 import re
@@ -482,6 +483,71 @@ def read_items_file(filename):
     if fd != sys.stdin: fd.close()
     return items
 
+def user_input(prompt, default = None, allow_empty = True):
+    if default == None:
+        while True:
+            ret = raw_input("%s: " % prompt)
+            if allow_empty or ret.strip():
+                return ret
+                
+    if isinstance(default, basestring):
+        while True:
+            ret = raw_input("%s [%s]: " % (prompt, default))
+            if not ret and (allow_empty or default):
+                return default
+            elif ret.strip():
+                return ret
+    if isinstance(default, bool):
+        if default:
+            choice = "yes"
+        else:
+            choice = "no"
+        while True:
+            ret = raw_input("%s [%s]: " % (prompt, choice))
+            if not ret:
+                return default
+            elif ret.lower()[0] == "y":
+                return True
+            elif ret.lower()[0] == "n":
+                return False
+    if isinstance(default, int):
+        while True:
+            try:
+                ret = raw_input("%s [%s]: " % (prompt, default))
+                if not ret:
+                    return default
+                ret = int(ret)
+            except ValueError:
+                pass
+            else:
+                return ret
+
+def user_input_email(prompt, default = None, allow_empty = False):
+    if default != None and allow_empty:
+        prompt += " (enter \"none\" for empty)"
+    while True:
+        ret = user_input(prompt, default, allow_empty)
+        if allow_empty and ret.lower() == "none":
+            return ""
+        if not ipavalidate.Email(ret, not allow_empty):
+            return ret.strip()
+
+def user_input_plain(prompt, default = None, allow_empty = True, allow_spaces = True):
+    while True:
+        ret = user_input(prompt, default, allow_empty)
+        if not ipavalidate.Plain(ret, not allow_empty, allow_spaces):
+            return ret
+
+def user_input_path(prompt, default = None, allow_empty = True):
+    if default != None and allow_empty:
+        prompt += " (enter \"none\" for empty)"
+    while True:
+        ret = user_input(prompt, default, allow_empty)
+        if allow_empty and ret.lower() == "none":
+            return ""
+        if not ipavalidate.Path(ret, not allow_empty):
+            return ret
+
 
 class AttributeValueCompleter:
     '''
diff --git a/ipa-radius-server/ipa-radius-install b/ipa-radius-server/ipa-radius-install
index 8ed3aab..83215b3 100644
--- a/ipa-radius-server/ipa-radius-install
+++ b/ipa-radius-server/ipa-radius-install
@@ -45,8 +45,7 @@ def main():
     if not ipautil.file_exists("/etc/ipa/ipa.conf"):
         print "This system does not appear to have IPA configured."
         print "Has ipa-server-install been run?"
-        yesno = raw_input("Continue with radius install [y/N]? ")
-        if yesno.lower() != "y":
+        if not ipautil.user_input("Continue with radius install?", False):
             sys.exit(1)
 
     installutils.standard_logging_setup("iparadius-install.log", False)
diff --git a/ipa-server/ipa-install/ipa-replica-install b/ipa-server/ipa-install/ipa-replica-install
index 31fd4cc..ab66a83 100644
--- a/ipa-server/ipa-install/ipa-replica-install
+++ b/ipa-server/ipa-install/ipa-replica-install
@@ -145,8 +145,7 @@ def check_dirsrv():
     if serverids:
         print ""
         print "An existing Directory Server has been detected."
-        yesno = raw_input("Do you wish to remove it and create a new one? [no]: ")
-        if not yesno or yesno.lower()[0] != "y":
+        if not ipautil.user_input("Do you wish to remove it and create a new one?", False):
             print ""
             print "Only a single Directory Server instance is allowed on an IPA"
             print "server, the one used by IPA itself."
@@ -189,12 +188,9 @@ def main():
     if host != config.host_name:
         try:
             print "This replica was created for '%s' but this machine is named '%s'" % (host, config.host_name)
-            yesno = raw_input("This may cause problems. Continue? [Y/n]: ")
-            print ""
-            if not yesno or yesno.lower()[0] == "y":
-                pass
-            else:
+            if not ipautil.user_input("This may cause problems. Continue?", True):
                 sys.exit(0)
+            print ""
         except KeyboardInterrupt:
             sys.exit(0)
     config.repl_password = ipautil.ipa_generate_password()
diff --git a/ipa-server/ipa-install/ipa-server-certinstall b/ipa-server/ipa-install/ipa-server-certinstall
index 835af0a..a0d1185 100644
--- a/ipa-server/ipa-install/ipa-server-certinstall
+++ b/ipa-server/ipa-install/ipa-server-certinstall
@@ -27,6 +27,7 @@ import traceback
 
 import krbV, ldap, getpass
 
+from ipa.ipautil import user_input
 from ipaserver import certs, dsinstance, httpinstance, ipaldap, installutils
 
 def get_realm_name():
@@ -76,25 +77,15 @@ def choose_server_cert(server_certs):
         print "%d. %s" % (num, cert[0])
         num += 1
         
-    cert_num = 0
     while 1:
-        cert_input = raw_input("Certificate number [1]: ")
+        num = user_input("Certificate number", 1)
         print ""
-        if cert_input == "":
-            break
+        if num < 1 or num > len(server_certs):
+            print "number out of range"
         else:
-            try:
-                num = int(cert_input)
-            except ValueError:
-                print "invalid number"
-                continue
-            if num > len(server_certs):
-                print "number out of range"
-                continue
-            cert_num = num - 1
             break
-    return server_certs[cert_num]
     
+    return server_certs[num - 1]
 
 def import_cert(dirname, pkcs12_fname):
     cdb = certs.CertDB(dirname)
diff --git a/ipa-server/ipa-install/ipa-server-install b/ipa-server/ipa-install/ipa-server-install
index 8b5b831..ce300cc 100644
--- a/ipa-server/ipa-install/ipa-server-install
+++ b/ipa-server/ipa-install/ipa-server-install
@@ -120,7 +120,6 @@ def signal_handler(signum, frame):
     sys.exit(1)
 
 def read_host_name(host_default):
-    host_ok = False
     host_name = ""
 
     print "Enter the fully qualified domain name of the computer"
@@ -131,19 +130,15 @@ def read_host_name(host_default):
     print ""
     if host_default == "":
         host_default = "master.example.com"
-    while not host_ok:
-        host_input = raw_input("Server host name [" + host_default + "]: ")
+    while True:
+        host_name = user_input("Server host name", host_default, allow_empty = False)
         print ""
-        if host_input == "":
-            host_name = host_default
-        else:
-            host_name = host_input
         try:
             verify_fqdn(host_name)
         except Exception, e:
             raise e
         else:
-            host_ok = True
+            break
     return host_name
 
 def resolve_host(host_name):
@@ -178,10 +173,8 @@ def verify_ip_address(ip):
 
 def read_ip_address(host_name):
     while True:
-        ip = raw_input("Please provide the IP address to be used for this host name: ")
+        ip = user_input("Please provide the IP address to be used for this host name", allow_empty = False)
 
-        if ip == "":
-            continue
         if ip == "127.0.0.1" or ip == "::1":
             print "The IPA Server can't use localhost as a valid IP"
             continue
@@ -213,13 +206,12 @@ def read_ds_user():
         print "A user account named 'dirsrv' already exists. This is the user id"
         print "that the Directory Server will run as."
         print ""
-        yesno = raw_input("Do you want to use the existing 'dirsrv' account? [yes]: ")
-        print ""
-        if not yesno or yesno.lower()[0] != "n":
+        if user_input("Do you want to use the existing 'dirsrv' account?", True):
             ds_user = "dirsrv"
         else:
-            ds_user = raw_input("Which account name do you want to use for the DS instance? ")
             print ""
+            ds_user = user_input_plain("Which account name do you want to use for the DS instance?", allow_empty = False, allow_spaces = False)
+        print ""
     except KeyError:
         ds_user = "dirsrv"
 
@@ -229,37 +221,31 @@ def read_domain_name(domain_name, unattended):
     print "The domain name has been calculated based on the host name."
     print ""
     if not unattended:
-        dn = raw_input("Please confirm the domain name ["+domain_name+"]: ")
+        domain_name = user_input("Please confirm the domain name", domain_name)
         print ""
-        if dn != "":
-            domain_name = dn
     return domain_name
 
 def read_realm_name(domain_name, unattended):
     print "The kerberos protocol requires a Realm name to be defined."
     print "This is typically the domain name converted to uppercase."
     print ""
-    upper_dom = domain_name.upper()
+    
     if unattended:
-        realm_name = upper_dom
-    else:
-        realm_name = raw_input("Please provide a realm name ["+upper_dom+"]: ")
-        print ""
-        if realm_name == "":
-            realm_name = upper_dom
-        else:
-            upper_dom = realm_name.upper()
-        if upper_dom != realm_name:
-            print "An upper-case realm name is required."
-            dom_realm = raw_input("Do you want to use "+upper_dom+" as realm name ? [yes]: ")
+        return domain_name.upper()
+    realm_name = user_input("Please provide a realm name", domain_name.upper())
+    upper_dom = realm_name.upper()
+    if upper_dom != realm_name:
+        print "An upper-case realm name is required."
+        if not user_input("Do you want to use " + upper_dom + " as realm name?", True):
             print ""
-            if dom_realm and dom_realm.lower()[0] != "y":
-                print "An upper-case realm name is required. Unable to continue."
-                sys.exit(1)
-            else:
-                realm_name = upper_dom
+            print "An upper-case realm name is required. Unable to continue."
+            sys.exit(1)
+        else:
+            realm_name = upper_dom
+        print ""
     return realm_name
 
+
 def read_dm_password():
     print "Certain directory server operations require an administrative user."
     print "This user is referred to as the Directory Manager and has full access"
@@ -284,10 +270,7 @@ def check_dirsrv(unattended):
     if serverids:
         print ""
         print "An existing Directory Server has been detected."
-        if unattended:
-            sys.exit(1)
-        yesno = raw_input("Do you wish to remove it and create a new one? [no]: ")
-        if not yesno or yesno.lower()[0] != "y":
+        if unattended or user_input("Do you wish to remove it and create a new one?", False):
             print ""
             print "Only a single Directory Server instance is allowed on an IPA"
             print "server, the one used by IPA itself."
@@ -354,8 +337,7 @@ def main():
     if options.uninstall:
         if not options.unattended:
             print "\nThis is a NON REVERSIBLE operation and will delete all data and configuration!\n"
-            yesno = raw_input("Are you sure you want to continue with the uninstall procedure?:[NO/yes] ")
-            if not yesno or yesno.lower() != "yes":
+            if not user_input("Are you sure you want to continue with the uninstall procedure?", False):
                 print ""
                 print "Aborting uninstall operation."
                 sys.exit(1)
-- 
1.5.5.1



Index: ipa.spec
===================================================================
RCS file: /cvs/extras/rpms/ipa/devel/ipa.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ipa.spec	18 Jun 2008 16:55:40 -0000	1.13
+++ ipa.spec	11 Sep 2008 02:58:19 -0000	1.14
@@ -1,3 +1,5 @@
+%define _default_patch_fuzz 30
+
 %define httpd_conf /etc/httpd/conf.d
 %define plugin_dir %{_libdir}/dirsrv/plugins
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
@@ -6,7 +8,7 @@
 
 Name:           ipa
 Version:        1.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -19,6 +21,19 @@
 Patch2:         freeipa-noinit.patch
 Patch3:         freeipa-memberofindex.patch
 Patch4:         freeipa-index.patch
+Patch5:         0001-slapi_pw_find_sv-expects-an-array-make-sure-we-ha.patch
+Patch6:         0001-Fix-typo-in-inet-type.patch
+Patch7:         0001-In-openvz-we-found-out-some-interfaces-may-return-a.patch
+Patch8:         freeipa-noi18n.patch
+
+Patch101:	freeipa-refresh-mkey.patch
+Patch102:	freeipa-fix-expire.patch
+Patch103:	freeipa-fix-key-encryption.patch
+Patch104:	freeipa-user-input.patch
+Patch105:	freeipa-encrypt-files.patch
+Patch106:	freeipa-change-mkey.patch
+Patch107:	freeipa-cve-2008-3274-fixes.patch
+Patch108:	freeipa-cve-2008-3274-utility.patch
 
 BuildRequires:  fedora-ds-base-devel >= 1.1
 BuildRequires:  mozldap-devel
@@ -187,10 +202,25 @@
 %patch2 -p1 -b noinit
 %patch3 -p1 -b memberofindex
 %patch4 -p1 -b index
+%patch5 -p1 -b changepw
+%patch6 -p1 -b af-inet-fix
+%patch7 -p1 -b kpasswd-segfault
+%patch8 -p1 -b noi18n
+
+#START CVE-2008-3274 block
+%patch101 -p1 -b refresh-mkey
+%patch102 -p1 -b fix-expire
+%patch103 -p1 -b fix-key-encryption
+%patch104 -p1 -b user-input
+%patch105 -p1 -b encrypt-files
+%patch106 -p1 -b change-mkey
+%patch107 -p1 -b cve-2008-3274-fixes
+%patch108 -p1 -b cve-2008-3274-utility
+#END CVE-2008-3274 block
 
 %build
-cd ipa-server; ./autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
-cd ipa-client; ./autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
+cd ipa-server; ./autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir} --with-openldap=yes; cd ..
+cd ipa-client; ./autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir} --with-openldap=yes; cd ..
 
 make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} version-update all
 cd ipa-server/selinux
@@ -325,8 +355,9 @@
 %{_usr}/share/ipa/ipa_gui.egg-info/*
 %dir %{_usr}/share/ipa/ipaserver
 %{_usr}/share/ipa/ipaserver/*
-%dir %{_usr}/share/ipa/locales/
-%{_usr}/share/ipa/locales/*
+# locales are not built because TurboGears is currently broken
+#%dir %{_usr}/share/ipa/locales/
+#%{_usr}/share/ipa/locales/*
 %attr(755,root,root) %{plugin_dir}/libipa_pwd_extop.so
 %attr(755,root,root) %{plugin_dir}/libipa-memberof-plugin.so
 %attr(755,root,root) %{plugin_dir}/libipa-dna-plugin.so
@@ -386,6 +417,8 @@
 %{_sbindir}/ipa-passwd
 %{_sbindir}/ipa-moduser
 %{_sbindir}/ipa-pwpolicy
+%{_sbindir}/ipa-change-master-key
+%{_sbindir}/ipa-fix-CVE-2008-3274
 %{_mandir}/man1/ipa-adddelegation.1.gz
 %{_mandir}/man1/ipa-addgroup.1.gz
 %{_mandir}/man1/ipa-addservice.1.gz
@@ -435,6 +468,14 @@
 %{_sbindir}/ipa-modradiusprofile
 
 %changelog
+* Wed Jul 23 2008 Simo Sorce <ssorce at redhat.com> - 1.1.0-3
+- Fix for CVE-2008-3274
+- Fix segfault in ipa-kpasswd in case getifaddrs returns a NULL interface
+- Add fix for bug #453185
+- Rebuild against openldap libraries, mozldap ones do not work properly
+- TurboGears is currently broken in rawhide. Added patch to not build
+  the UI locales and removed them from the ipa-server files section.
+
 * Wed Jun 18 2008 Rob Crittenden <rcritten at redhat.com> - 1.1.0-2
 - Add call to /usr/sbin/upgradeconfig to post install
 



From seanf at fedoraproject.org  Thu Sep 11 03:23:08 2008
From: seanf at fedoraproject.org (Sean Flanigan)
Date: Thu, 11 Sep 2008 03:23:08 +0000 (UTC)
Subject: rpms/eclipse-nls/devel eclipse-nls.spec, NONE, 1.1 fetch-babel.sh, 
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <20080911032308.580C870131@cvs1.fedora.phx.redhat.com>

Author: seanf

Update of /cvs/pkgs/rpms/eclipse-nls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8285/devel

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-nls.spec fetch-babel.sh import.log 
Log Message:

Initial package.


--- NEW FILE eclipse-nls.spec ---
%define snapshot 20080807snap
%define eclipse_data %{_datadir}/eclipse
# Disable repacking of jars, since it takes forever for all the little jars, 
# and we don't need multilib anyway:
%define __jar_repack %{nil}

Name: eclipse-nls 
Summary: Babel language packs for the Eclipse platform and various plugins
Group: Development/Languages
License: EPL
URL: http://babel.eclipse.org/

Version: 0.2.0
Release: 0.5.%{snapshot}%{?dist}
## The source for this package is taken from the Babel project's update site.
## Use the following commands to generate the tarball:
# sudo yum install eclipse-platform curl
# mkdir temp && cd temp
# sh ../fetch-babel.sh
# tar cjf ../org.eclipse.nls-%{snapshot}-fetched-src.tar.bz2 eclipse-nls
# cd ..
Source0: org.eclipse.nls-%{snapshot}-fetched-src.tar.bz2
Source1: fetch-babel.sh
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:  noarch

%description
Babel language packs include translations for the Eclipse platform and other 
Eclipse-related packages.

%define lang_meta_pkg() \
%package %1 \
Summary:    Eclipse/Babel language pack for %2 \
Group:      Development/Languages \
# provides %{eclipse_data}/dropins \
Requires:   eclipse-platform >= 3.4.0-18 \
Obsoletes:  eclipse-sdk-nls-%1 < 3.2.1-4 \
\
%description %1 \
This language pack for %2 contains user-contributed translations of the \
strings in all Eclipse projects. Please see the http://babel.eclipse.org/ \
Babel project web pages for a full how-to-use explanation of these \
translations as well as how you can contribute to \
the translations of this and future versions of Eclipse. \
Note that English text will be displayed if Babel doesn't \
have a translation for a given string. \
\
%files %1 \
%defattr(-,root,root,-) \
%{eclipse_data}/dropins/babel-%1

# Note that no licence %%doc files are listed under %%files.  Upstream does 
# not provide a single distribution archive for eclipse-nls, but rather an 
# update site which serves up 400 plugin jars for each language.  These 
# jars are collected into a tarball by fetch-babel.sh.  Each jar does 
# include HTML files with licence information, and these jars are placed 
# in the dropins/babel-* directory above.

%lang_meta_pkg cs Czech
%lang_meta_pkg hu Hungarian
%lang_meta_pkg pl Polish
%lang_meta_pkg ru Russian
%lang_meta_pkg ar Arabic
# NB 'he' is 'iw' as far as Java is concerned.  fetch-babel.sh knows about it
%lang_meta_pkg he Hebrew
%lang_meta_pkg da Danish
%lang_meta_pkg de German
%lang_meta_pkg el Greek
%lang_meta_pkg es Spanish
%lang_meta_pkg fi Finnish
%lang_meta_pkg fr French
%lang_meta_pkg it Italian
%lang_meta_pkg ja Japanese
%lang_meta_pkg ko Korean
%lang_meta_pkg nl Dutch
%lang_meta_pkg no Norwegian
%lang_meta_pkg pt Portuguese
%lang_meta_pkg pt_BR Portuguese (Brazilian)
%lang_meta_pkg sv Swedish
%lang_meta_pkg tr Turkish
%lang_meta_pkg zh Chinese (Simplified)
%lang_meta_pkg zh_TW Chinese (Traditional)
##########################################
# Currently less than 10% coverage
%lang_meta_pkg uk Ukrainian
%lang_meta_pkg ro Romanian
%lang_meta_pkg bg Bulgarian
##########################################
##########################################
# Currently 0% coverage
#Hindi
#Klingon
#Spanish-Catalonian
#English
##########################################

%prep
%setup -q -n %{name}

%build
# nothing to do

%install
rm -rf $RPM_BUILD_ROOT

for loc in ?? ??_??; do
   mkdir -p $RPM_BUILD_ROOT%{eclipse_data}/dropins/babel-${loc}/eclipse
   cp -R ${loc}/features ${loc}/plugins $RPM_BUILD_ROOT%{eclipse_data}/dropins/babel-${loc}/eclipse
done

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Thu Sep 11 2008 Sean Flanigan <sflaniga at redhat.com> - 0.2.0-0.5.20080807snap
- Applied another tidy-up patch from Jens Petersen and added a comment
 about the licence doc files

* Wed Sep 10 2008 Sean Flanigan <sflaniga at redhat.com> - 0.2.0-0.4.20080807snap
- Applied Jens Petersen's suggested patch to remove eclipse_version macro and 
  unnecessary buildroot checks

* Tue Sep 9 2008 Sean Flanigan <sflaniga at redhat.com> - 0.2.0-0.3.20080807snap
- Added eclipse_version macro
- Changed the Obsoletes version to be slightly higher than the last release of 
  eclipse-sdk-nls

* Mon Aug 11 2008 Sean Flanigan <sflaniga at redhat.com> - 0.2.0-0.2.20080807snap
- Fixed version in changelog
- Updated snapshot of Babel translation plugins
- Changed code for Hebrew to he (not iw); changed fetch-babel.sh to compensate
- Renamed eclipse_base macro to eclipse_data

* Fri Jul 25 2008 Sean Flanigan <sflaniga at redhat.com> - 0.2.0-0.1.20080720snap
- Initial rpm package


--- NEW FILE fetch-babel.sh ---
#!/bin/sh
UPDATE_SITE=http://download.eclipse.org/technology/babel/update-site/ganymede/
ECLIPSE_BIN=eclipse
CURL='curl -H Pragma: --remote-time --fail --show-error'

DEST=eclipse
mkdir -p $DEST home

#$CURL $UPDATE_SITE -o site.xml
#cat site.xml | grep 'id="org.eclipse.nls.' | sed 's/.*id="org.eclipse.nls.\([a-zA-Z_]*\)".*/\1/g' | sort -u >locales.txt
#locales = (backquote)cat locales.txt(backquote); do

locales='ar bg cs da de el es fi fr hu it he ja ko nl no pl pt pt_BR ro ru sv tr uk zh zh_TW' #es_CA hi tl en

echo Locales to be fetched:
echo $locales
for locale in $locales; do
    # deal with locale id changes - see http://java.sun.com/javase/6/docs/api/java/util/Locale.html#Locale(java.lang.String)
    if [ $locale == he ] ; then
        javalocale=iw
    elif [ $locale == yi ] ; then
        javalocale=ji
    elif [ $locale == id ] ; then
        javalocale=in
    else
        javalocale=$locale
    fi
	workdir=eclipse-nls/$locale
	mkdir -p $workdir
	echo "Downloading all translations for locale \"$locale\".  This might take a few minutes..."
	profile=${locale}-Profile
	# work around the fact that p2 doesn't seem to 
	# support updates from command-line:
	rm -fr $DEST/p2/org.eclipse.equinox.p2.engine/profileRegistry/$profile.profile
	time $ECLIPSE_BIN                                                \
	--launcher.suppressErrors                                        \
	-nosplash                                                        \
	-consoleLog                                                      \
	-application org.eclipse.equinox.p2.director.app.application     \
	-metadataRepository $UPDATE_SITE                                 \
	-artifactRepository $UPDATE_SITE                                 \
	-installIU org.eclipse.nls.$javalocale.feature.group                 \
	-destination $DEST                                               \
	-profile $profile                                                \
	-profileProperties org.eclipse.update.install.features=true      \
	-bundlepool $workdir                                             \
	-p2.os linux                                                     \
	-p2.ws gtk                                                       \
	-p2.arch x86                                                     \
	-roaming                                                         \
	-vmargs                                                          \
	-Duser.home=home                                                 \
	-Declipse.p2.data.area=$DEST/p2

	echo "Downloaded \"$locale\".  Disk space used:"
	du -sh eclipse-nls/$locale
	done
exit



--- NEW FILE import.log ---
eclipse-nls-0_2_0-0_5_20080807snap_fc9:HEAD:eclipse-nls-0.2.0-0.5.20080807snap.fc9.src.rpm:1221103325


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 02:51:56 -0000	1.1
+++ .cvsignore	11 Sep 2008 03:22:38 -0000	1.2
@@ -0,0 +1 @@
+org.eclipse.nls-20080807snap-fetched-src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 02:51:56 -0000	1.1
+++ sources	11 Sep 2008 03:22:38 -0000	1.2
@@ -0,0 +1 @@
+14c51fc450752ce281c3e8d067b268b2  org.eclipse.nls-20080807snap-fetched-src.tar.bz2



From lmacken at fedoraproject.org  Thu Sep 11 03:31:01 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 03:31:01 +0000 (UTC)
Subject: rpms/bodhi/devel .cvsignore, 1.16, 1.17 bodhi.spec, 1.21,
	1.22 sources, 1.18, 1.19
Message-ID: <20080911033101.29BA870131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/bodhi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9685

Modified Files:
	.cvsignore bodhi.spec sources 
Log Message:
0.5.3 upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	3 Sep 2008 04:56:27 -0000	1.16
+++ .cvsignore	11 Sep 2008 03:30:30 -0000	1.17
@@ -1 +1 @@
-bodhi-0.5.2.tar.bz2
+bodhi-0.5.3.tar.bz2


Index: bodhi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/devel/bodhi.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bodhi.spec	3 Sep 2008 04:56:27 -0000	1.21
+++ bodhi.spec	11 Sep 2008 03:30:30 -0000	1.22
@@ -2,7 +2,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
-Version:        0.5.2
+Version:        0.5.3
 Release:        1%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
@@ -13,9 +13,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
+BuildRequires: python-setuptools 
 BuildRequires: python-setuptools-devel
 BuildRequires: python-devel
-BuildRequires: TurboGears
+
+BuildRequires: TurboGears python-bugzilla
+BuildRequires: python-fedora python-TurboMail TurboGears yum koji
 
 %description
 Bodhi is a web application that facilitates the process of publishing
@@ -108,6 +111,14 @@
 
 
 %changelog
+* Wed Sep 10 2008 Luke Macken <lmacken at redhat.com> - 0.5.3-1
+- Latest upstream release
+
+* Wed Sep 03 2008 Luke Macken <lmacken at redhat.com> - 0.5.2-2
+- Add the masher deps to BuildRequires, since it now resides
+  on the turbogears.extensions entry point and will be
+  imported by pkg_resources at build time.
+
 * Wed Sep 03 2008 Luke Macken <lmacken at redhat.com> - 0.5.2-1
 - Latest upstream bugfix release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	3 Sep 2008 04:56:27 -0000	1.18
+++ sources	11 Sep 2008 03:30:30 -0000	1.19
@@ -1 +1 @@
-3406f588f7f414bfa82a332456f0afbc  bodhi-0.5.2.tar.bz2
+610f428a6bf3c792c2213648d1456a28  bodhi-0.5.3.tar.bz2



From lmacken at fedoraproject.org  Thu Sep 11 03:36:30 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 03:36:30 +0000 (UTC)
Subject: rpms/bodhi/F-9 bodhi.spec,1.21,1.22 sources,1.18,1.19
Message-ID: <20080911033630.AE5E170131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/bodhi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10960

Modified Files:
	bodhi.spec sources 
Log Message:
0.5.3 upstream release


Index: bodhi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-9/bodhi.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bodhi.spec	3 Sep 2008 04:57:13 -0000	1.21
+++ bodhi.spec	11 Sep 2008 03:36:00 -0000	1.22
@@ -2,7 +2,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
-Version:        0.5.2
+Version:        0.5.3
 Release:        1%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
@@ -13,9 +13,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
+BuildRequires: python-setuptools 
 BuildRequires: python-setuptools-devel
 BuildRequires: python-devel
-BuildRequires: TurboGears
+
+BuildRequires: TurboGears python-bugzilla
+BuildRequires: python-fedora python-TurboMail TurboGears yum koji
 
 %description
 Bodhi is a web application that facilitates the process of publishing
@@ -108,6 +111,14 @@
 
 
 %changelog
+* Wed Sep 10 2008 Luke Macken <lmacken at redhat.com> - 0.5.3-1
+- Latest upstream release
+
+* Wed Sep 03 2008 Luke Macken <lmacken at redhat.com> - 0.5.2-2
+- Add the masher deps to BuildRequires, since it now resides
+  on the turbogears.extensions entry point and will be
+  imported by pkg_resources at build time.
+
 * Wed Sep 03 2008 Luke Macken <lmacken at redhat.com> - 0.5.2-1
 - Latest upstream bugfix release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	3 Sep 2008 04:57:13 -0000	1.18
+++ sources	11 Sep 2008 03:36:00 -0000	1.19
@@ -1 +1 @@
-3406f588f7f414bfa82a332456f0afbc  bodhi-0.5.2.tar.bz2
+610f428a6bf3c792c2213648d1456a28  bodhi-0.5.3.tar.bz2



From lmacken at fedoraproject.org  Thu Sep 11 03:44:01 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 03:44:01 +0000 (UTC)
Subject: rpms/bodhi/F-8 bodhi.spec,1.15,1.16 sources,1.14,1.15
Message-ID: <20080911034401.5834070131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/bodhi/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12145

Modified Files:
	bodhi.spec sources 
Log Message:
0.5.3 upstream release


Index: bodhi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-8/bodhi.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- bodhi.spec	3 Sep 2008 04:57:17 -0000	1.15
+++ bodhi.spec	11 Sep 2008 03:43:31 -0000	1.16
@@ -2,7 +2,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
-Version:        0.5.2
+Version:        0.5.3
 Release:        1%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
@@ -13,9 +13,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
+BuildRequires: python-setuptools 
 BuildRequires: python-setuptools-devel
 BuildRequires: python-devel
-BuildRequires: TurboGears
+
+BuildRequires: TurboGears python-bugzilla
+BuildRequires: python-fedora python-TurboMail TurboGears yum koji
 
 %description
 Bodhi is a web application that facilitates the process of publishing
@@ -108,6 +111,14 @@
 
 
 %changelog
+* Wed Sep 10 2008 Luke Macken <lmacken at redhat.com> - 0.5.3-1
+- Latest upstream release
+
+* Wed Sep 03 2008 Luke Macken <lmacken at redhat.com> - 0.5.2-2
+- Add the masher deps to BuildRequires, since it now resides
+  on the turbogears.extensions entry point and will be
+  imported by pkg_resources at build time.
+
 * Wed Sep 03 2008 Luke Macken <lmacken at redhat.com> - 0.5.2-1
 - Latest upstream bugfix release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-8/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	3 Sep 2008 04:57:17 -0000	1.14
+++ sources	11 Sep 2008 03:43:31 -0000	1.15
@@ -1 +1 @@
-3406f588f7f414bfa82a332456f0afbc  bodhi-0.5.2.tar.bz2
+610f428a6bf3c792c2213648d1456a28  bodhi-0.5.3.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep 11 04:16:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:16:14 +0000
Subject: [pkgdb] python-peak-util-symbols was added for lmacken
Message-ID: <20080911041614.552F9208D99@bastion.fedora.phx.redhat.com>

huzaifas has added Package python-peak-util-symbols with summary Simple "symbol" type, useful for enumerations or sentinels
huzaifas has approved Package python-peak-util-symbols
huzaifas has added a Fedora devel branch for python-peak-util-symbols with an owner of lmacken
huzaifas has approved python-peak-util-symbols in Fedora devel
huzaifas has approved Package python-peak-util-symbols
huzaifas has set commit to Approved for packager on python-peak-util-symbols (Fedora devel)
huzaifas has set build to Approved for packager on python-peak-util-symbols (Fedora devel)
huzaifas has set checkout to Approved for packager on python-peak-util-symbols (Fedora devel)
huzaifas has set commit to Approved for uberpackager on python-peak-util-symbols (Fedora devel)
huzaifas has set build to Approved for uberpackager on python-peak-util-symbols (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-symbols (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-symbols



From pkgdb at fedoraproject.org  Thu Sep 11 04:16:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:16:15 +0000
Subject: [pkgdb] python-peak-util-symbols (Fedora, 9) updated by huzaifas
Message-ID: <20080911041615.1F786208D9B@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for python-peak-util-symbols
huzaifas has set commit to Approved for uberpackager on python-peak-util-symbols (Fedora 9)
huzaifas has set build to Approved for uberpackager on python-peak-util-symbols (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-symbols (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-symbols



From pkgdb at fedoraproject.org  Thu Sep 11 04:16:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:16:15 +0000
Subject: [pkgdb] python-peak-util-symbols (Fedora EPEL,
	5) updated by huzaifas
Message-ID: <20080911041615.28CFC208DA0@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 5 branch for python-peak-util-symbols
huzaifas has set commit to Approved for uberpackager on python-peak-util-symbols (Fedora EPEL 5)
huzaifas has set build to Approved for uberpackager on python-peak-util-symbols (Fedora EPEL 5)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-symbols (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-symbols



From pkgdb at fedoraproject.org  Thu Sep 11 04:16:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:16:15 +0000
Subject: [pkgdb] python-peak-util-symbols (Fedora, 8) updated by huzaifas
Message-ID: <20080911041615.3CFB0208DA4@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for python-peak-util-symbols
huzaifas has set commit to Approved for uberpackager on python-peak-util-symbols (Fedora 8)
huzaifas has set build to Approved for uberpackager on python-peak-util-symbols (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-symbols (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-symbols



From pkgdb at fedoraproject.org  Thu Sep 11 04:16:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:16:15 +0000
Subject: [pkgdb] python-peak-util-symbols (Fedora EPEL,
	4) updated by huzaifas
Message-ID: <20080911041615.44BBA208DA6@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 4 branch for python-peak-util-symbols
huzaifas has set commit to Approved for uberpackager on python-peak-util-symbols (Fedora EPEL 4)
huzaifas has set build to Approved for uberpackager on python-peak-util-symbols (Fedora EPEL 4)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-symbols (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-symbols



From huzaifas at fedoraproject.org  Thu Sep 11 04:29:22 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 04:29:22 +0000 (UTC)
Subject: rpms/python-peak-util-symbols - New directory
Message-ID: <20080911042922.4583070131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/python-peak-util-symbols
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsq25990/rpms/python-peak-util-symbols

Log Message:
Directory /cvs/extras/rpms/python-peak-util-symbols added to the repository




From huzaifas at fedoraproject.org  Thu Sep 11 04:29:22 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 04:29:22 +0000 (UTC)
Subject: rpms/python-peak-util-symbols/devel - New directory
Message-ID: <20080911042922.98F1270131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/python-peak-util-symbols/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsq25990/rpms/python-peak-util-symbols/devel

Log Message:
Directory /cvs/extras/rpms/python-peak-util-symbols/devel added to the repository




From huzaifas at fedoraproject.org  Thu Sep 11 04:29:23 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 04:29:23 +0000 (UTC)
Subject: rpms/python-peak-util-symbols Makefile,NONE,1.1
Message-ID: <20080911042923.B9CB270131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/python-peak-util-symbols
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsq25990/rpms/python-peak-util-symbols

Added Files:
	Makefile 
Log Message:
Setup of module python-peak-util-symbols


--- NEW FILE Makefile ---
# Top level Makefile for module python-peak-util-symbols
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Thu Sep 11 04:29:24 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 04:29:24 +0000 (UTC)
Subject: rpms/python-peak-util-symbols/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080911042924.18D2970131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/python-peak-util-symbols/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsq25990/rpms/python-peak-util-symbols/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-peak-util-symbols


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-peak-util-symbols
# $Id: Makefile,v 1.1 2008/09/11 04:29:23 huzaifas Exp $
NAME := python-peak-util-symbols
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From cweyl at fedoraproject.org  Thu Sep 11 04:36:15 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu, 11 Sep 2008 04:36:15 +0000 (UTC)
Subject: rpms/perl-Catalyst-Devel/devel perl-Catalyst-Devel.spec,1.7,1.8
Message-ID: <20080911043615.646B070131@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-serv28767

Modified Files:
	perl-Catalyst-Devel.spec 
Log Message:
* Wed Sep 10 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.08-2
- add perl(parent) as a requires (BZ#461581)



Index: perl-Catalyst-Devel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Devel/devel/perl-Catalyst-Devel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Catalyst-Devel.spec	1 Aug 2008 01:15:44 -0000	1.7
+++ perl-Catalyst-Devel.spec	11 Sep 2008 04:35:45 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Devel
 Version:        1.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Catalyst Development Tools
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -34,6 +34,7 @@
 Requires:       perl(Module::Install) >= 0.64
 Requires:       perl(Path::Class) >= 0.09
 Requires:       perl(YAML) >= 0.55
+Requires:       perl(parent)
 
 # for catalyst.pl
 Requires:       perl-Catalyst-Runtime-scripts
@@ -74,6 +75,9 @@
 %{_mandir}/man[13]/*
 
 %changelog
+* Wed Sep 10 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.08-2
+- add perl(parent) as a requires (BZ#461581)
+
 * Thu Jul 31 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.08-1
 - update to 1.08
 



From pkgdb at fedoraproject.org  Thu Sep 11 04:39:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:39:41 +0000
Subject: [pkgdb] F-9 was added for ianweller
Message-ID: <20080911043941.E7CEE2D0020@bastion.fedora.phx.redhat.com>

huzaifas has added Package F-9 with summary CSS parser and optimizer
huzaifas has approved Package F-9
huzaifas has added a Fedora devel branch for F-9 with an owner of ianweller
huzaifas has approved F-9 in Fedora devel
huzaifas has approved Package F-9
huzaifas has set commit to Approved for packager on F-9 (Fedora devel)
huzaifas has set build to Approved for packager on F-9 (Fedora devel)
huzaifas has set checkout to Approved for packager on F-9 (Fedora devel)
huzaifas has set commit to Approved for uberpackager on F-9 (Fedora devel)
huzaifas has set build to Approved for uberpackager on F-9 (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on F-9 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/F-9



From pkgdb at fedoraproject.org  Thu Sep 11 04:39:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:39:42 +0000
Subject: [pkgdb] F-9 (Fedora, 8) updated by huzaifas
Message-ID: <20080911043942.A25B22D0024@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for F-9
huzaifas has set commit to Approved for uberpackager on F-9 (Fedora 8)
huzaifas has set build to Approved for uberpackager on F-9 (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on F-9 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/F-9



From pkgdb at fedoraproject.org  Thu Sep 11 04:39:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:39:44 +0000
Subject: [pkgdb] EL-4 was added for ianweller
Message-ID: <20080911043944.60DDB2D0027@bastion.fedora.phx.redhat.com>

huzaifas has added Package EL-4 with summary CSS parser and optimizer
huzaifas has approved Package EL-4
huzaifas has added a Fedora devel branch for EL-4 with an owner of ianweller
huzaifas has approved EL-4 in Fedora devel
huzaifas has approved Package EL-4
huzaifas has set commit to Approved for packager on EL-4 (Fedora devel)
huzaifas has set build to Approved for packager on EL-4 (Fedora devel)
huzaifas has set checkout to Approved for packager on EL-4 (Fedora devel)
huzaifas has set commit to Approved for uberpackager on EL-4 (Fedora devel)
huzaifas has set build to Approved for uberpackager on EL-4 (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on EL-4 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/EL-4



From pkgdb at fedoraproject.org  Thu Sep 11 04:39:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:39:45 +0000
Subject: [pkgdb] EL-4 (Fedora, 8) updated by huzaifas
Message-ID: <20080911043945.1A26E2D002A@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for EL-4
huzaifas has set commit to Approved for uberpackager on EL-4 (Fedora 8)
huzaifas has set build to Approved for uberpackager on EL-4 (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on EL-4 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/EL-4



From pkgdb at fedoraproject.org  Thu Sep 11 04:39:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:39:52 +0000
Subject: [pkgdb] EL-5 summary updated by huzaifas
Message-ID: <20080911043952.1E6082D002E@bastion.fedora.phx.redhat.com>

huzaifas set package EL-5 summary to CSS parser and optimizer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/EL-5



From pkgdb at fedoraproject.org  Thu Sep 11 04:39:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:39:52 +0000
Subject: [pkgdb] EL-5 (Fedora, devel) updated by huzaifas
Message-ID: <20080911043952.564CA2E0003@bastion.fedora.phx.redhat.com>

huzaifas changed owner of EL-5 in Fedora devel to ianweller

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/EL-5



From pkgdb at fedoraproject.org  Thu Sep 11 04:39:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:39:52 +0000
Subject: [pkgdb] EL-5 (Fedora, 8) updated by huzaifas
Message-ID: <20080911043952.6E42B2E0006@bastion.fedora.phx.redhat.com>

huzaifas changed owner of EL-5 in Fedora 8 to ianweller

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/EL-5



From pkgdb at fedoraproject.org  Thu Sep 11 04:41:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:41:29 +0000
Subject: [pkgdb] F-9 summary updated by huzaifas
Message-ID: <20080911044129.CD861208D99@bastion.fedora.phx.redhat.com>

huzaifas set package F-9 summary to CSS parser and optimizer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/F-9



From pkgdb at fedoraproject.org  Thu Sep 11 04:41:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:41:29 +0000
Subject: [pkgdb] F-9 (Fedora, 8) updated by huzaifas
Message-ID: <20080911044129.E61732D0023@bastion.fedora.phx.redhat.com>

huzaifas changed owner of F-9 in Fedora 8 to ianweller

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/F-9



From pkgdb at fedoraproject.org  Thu Sep 11 04:41:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:41:36 +0000
Subject: [pkgdb] EL-4 summary updated by huzaifas
Message-ID: <20080911044136.1BAE92D0027@bastion.fedora.phx.redhat.com>

huzaifas set package EL-4 summary to CSS parser and optimizer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/EL-4



From pkgdb at fedoraproject.org  Thu Sep 11 04:41:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:41:36 +0000
Subject: [pkgdb] EL-4 (Fedora, 8) updated by huzaifas
Message-ID: <20080911044136.2F6F42D002A@bastion.fedora.phx.redhat.com>

huzaifas changed owner of EL-4 in Fedora 8 to ianweller

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/EL-4



From pkgdb at fedoraproject.org  Thu Sep 11 04:41:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:41:43 +0000
Subject: [pkgdb] EL-5 summary updated by huzaifas
Message-ID: <20080911044143.742FC2D002D@bastion.fedora.phx.redhat.com>

huzaifas set package EL-5 summary to CSS parser and optimizer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/EL-5



From pkgdb at fedoraproject.org  Thu Sep 11 04:41:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:41:43 +0000
Subject: [pkgdb] EL-5 (Fedora, 8) updated by huzaifas
Message-ID: <20080911044143.85B812E0003@bastion.fedora.phx.redhat.com>

huzaifas changed owner of EL-5 in Fedora 8 to ianweller

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/EL-5



From pkgdb at fedoraproject.org  Thu Sep 11 04:41:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:41:45 +0000
Subject: [pkgdb] csstidy (Fedora, 8) updated by huzaifas
Message-ID: <20080911044145.AE95B2E0009@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for csstidy
huzaifas has set commit to Approved for uberpackager on csstidy (Fedora 8)
huzaifas has set build to Approved for uberpackager on csstidy (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on csstidy (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/csstidy



From pkgdb at fedoraproject.org  Thu Sep 11 04:41:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:41:44 +0000
Subject: [pkgdb] csstidy was added for ianweller
Message-ID: <20080911044144.AE1AC2E0006@bastion.fedora.phx.redhat.com>

huzaifas has added Package csstidy with summary CSS parser and optimizer
huzaifas has approved Package csstidy
huzaifas has added a Fedora devel branch for csstidy with an owner of ianweller
huzaifas has approved csstidy in Fedora devel
huzaifas has approved Package csstidy
huzaifas has set commit to Approved for packager on csstidy (Fedora devel)
huzaifas has set build to Approved for packager on csstidy (Fedora devel)
huzaifas has set checkout to Approved for packager on csstidy (Fedora devel)
huzaifas has set commit to Approved for uberpackager on csstidy (Fedora devel)
huzaifas has set build to Approved for uberpackager on csstidy (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on csstidy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/csstidy



From huzaifas at fedoraproject.org  Thu Sep 11 04:42:09 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 04:42:09 +0000 (UTC)
Subject: rpms/csstidy - New directory
Message-ID: <20080911044209.3AA2770131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/csstidy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsw30953/rpms/csstidy

Log Message:
Directory /cvs/extras/rpms/csstidy added to the repository




From huzaifas at fedoraproject.org  Thu Sep 11 04:42:09 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 04:42:09 +0000 (UTC)
Subject: rpms/csstidy/devel - New directory
Message-ID: <20080911044209.984AC70131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/csstidy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsw30953/rpms/csstidy/devel

Log Message:
Directory /cvs/extras/rpms/csstidy/devel added to the repository




From huzaifas at fedoraproject.org  Thu Sep 11 04:42:11 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 04:42:11 +0000 (UTC)
Subject: rpms/csstidy Makefile,NONE,1.1
Message-ID: <20080911044211.04A0E70131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/csstidy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsw30953/rpms/csstidy

Added Files:
	Makefile 
Log Message:
Setup of module csstidy


--- NEW FILE Makefile ---
# Top level Makefile for module csstidy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Thu Sep 11 04:42:11 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 04:42:11 +0000 (UTC)
Subject: rpms/csstidy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080911044211.5899E70131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/csstidy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsw30953/rpms/csstidy/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module csstidy


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: csstidy
# $Id: Makefile,v 1.1 2008/09/11 04:42:11 huzaifas Exp $
NAME := csstidy
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 11 04:43:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:43:32 +0000
Subject: [pkgdb] csstidy summary updated by huzaifas
Message-ID: <20080911044332.D2EC22D0023@bastion.fedora.phx.redhat.com>

huzaifas set package csstidy summary to CSS parser and optimizer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/csstidy



From pkgdb at fedoraproject.org  Thu Sep 11 04:43:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:43:32 +0000
Subject: [pkgdb] csstidy (Fedora, 8) updated by huzaifas
Message-ID: <20080911044333.257A12D0026@bastion.fedora.phx.redhat.com>

huzaifas changed owner of csstidy in Fedora 8 to ianweller

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/csstidy



From pkgdb at fedoraproject.org  Thu Sep 11 04:43:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:43:32 +0000
Subject: [pkgdb] csstidy (Fedora EPEL, 5) updated by huzaifas
Message-ID: <20080911044333.C98D02D002C@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 5 branch for csstidy
huzaifas has set commit to Approved for uberpackager on csstidy (Fedora EPEL 5)
huzaifas has set build to Approved for uberpackager on csstidy (Fedora EPEL 5)
huzaifas has set checkout to Approved for uberpackager on csstidy (Fedora EPEL 5)
huzaifas changed owner of csstidy in Fedora EPEL 5 to ianweller

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/csstidy



From pkgdb at fedoraproject.org  Thu Sep 11 04:43:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:43:32 +0000
Subject: [pkgdb] csstidy (Fedora EPEL, 4) updated by huzaifas
Message-ID: <20080911044333.621CD2D0029@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 4 branch for csstidy
huzaifas has set commit to Approved for uberpackager on csstidy (Fedora EPEL 4)
huzaifas has set build to Approved for uberpackager on csstidy (Fedora EPEL 4)
huzaifas has set checkout to Approved for uberpackager on csstidy (Fedora EPEL 4)
huzaifas changed owner of csstidy in Fedora EPEL 4 to ianweller

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/csstidy



From pkgdb at fedoraproject.org  Thu Sep 11 04:43:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:43:32 +0000
Subject: [pkgdb] csstidy (Fedora, 9) updated by huzaifas
Message-ID: <20080911044333.E9CA82D002F@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for csstidy
huzaifas has set commit to Approved for uberpackager on csstidy (Fedora 9)
huzaifas has set build to Approved for uberpackager on csstidy (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on csstidy (Fedora 9)
huzaifas changed owner of csstidy in Fedora 9 to ianweller

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/csstidy



From cweyl at fedoraproject.org  Thu Sep 11 04:45:22 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu, 11 Sep 2008 04:45:22 +0000 (UTC)
Subject: rpms/perl-Catalyst-Devel/F-9 perl-Catalyst-Devel.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20080911044522.B312D70131@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Devel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32162

Modified Files:
	perl-Catalyst-Devel.spec sources 
Log Message:
* Wed Sep 10 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.08-2
- add perl(parent) as a requires (BZ#461581)



Index: perl-Catalyst-Devel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Devel/F-9/perl-Catalyst-Devel.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Catalyst-Devel.spec	1 Aug 2008 01:06:16 -0000	1.6
+++ perl-Catalyst-Devel.spec	11 Sep 2008 04:44:52 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Catalyst-Devel
-Version:        1.07
+Version:        1.08
 Release:        2%{?dist}
 Summary:        Catalyst Development Tools
 License:        GPL+ or Artistic
@@ -19,11 +19,11 @@
 BuildRequires:  perl(Catalyst::Plugin::ConfigLoader) 
 BuildRequires:  perl(Catalyst::Plugin::Static::Simple) >= 0.16
 BuildRequires:  perl(Class::Accessor::Fast) 
+BuildRequires:  perl(Config::General)
 BuildRequires:  perl(File::Copy::Recursive) 
 BuildRequires:  perl(Module::Install) >= 0.64
 BuildRequires:  perl(Path::Class) >= 0.09
 BuildRequires:  perl(Template) >= 2.14
-BuildRequires:  perl(YAML) >= 0.55
 BuildRequires:  perl(parent)
 
 Requires:       perl(Catalyst) >= 5.7000
@@ -34,6 +34,7 @@
 Requires:       perl(Module::Install) >= 0.64
 Requires:       perl(Path::Class) >= 0.09
 Requires:       perl(YAML) >= 0.55
+Requires:       perl(parent)
 
 # for catalyst.pl
 Requires:       perl-Catalyst-Runtime-scripts
@@ -74,6 +75,12 @@
 %{_mandir}/man[13]/*
 
 %changelog
+* Wed Sep 10 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.08-2
+- add perl(parent) as a requires (BZ#461581)
+
+* Thu Jul 31 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.08-1
+- update to 1.08
+
 * Thu Jul 31 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.07-2
 - drop requires on Catalyst::Manual that should have been dropped in 1.06-1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Devel/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Jun 2008 16:13:19 -0000	1.4
+++ sources	11 Sep 2008 04:44:52 -0000	1.5
@@ -1 +1 @@
-9d890503da6bd552d85bafdc92d1729a  Catalyst-Devel-1.07.tar.gz
+8ea62cae2d555bad770d92359a7df641  Catalyst-Devel-1.08.tar.gz



From spot at fedoraproject.org  Thu Sep 11 04:49:43 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 04:49:43 +0000 (UTC)
Subject: rpms/uqm/devel uqm-functions.sh, NONE, 1.1 uqm.autodlrc, NONE,
	1.1 uqm-optflags.patch, 1.3, 1.4 uqm.desktop, 1.2, 1.3 uqm.sh,
	1.1, 1.2 uqm.spec, 1.15, 1.16
Message-ID: <20080911044943.907B170131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/uqm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1157

Modified Files:
	uqm-optflags.patch uqm.desktop uqm.sh uqm.spec 
Added Files:
	uqm-functions.sh uqm.autodlrc 
Log Message:
migrate to autodownloader


--- NEW FILE uqm-functions.sh ---
# creates a local working directory in user-home
function createLocalDir ()
{
  if [ ! -f $myHomeDir/uqm-0.6.2 ]; then
    echo "creating local working directory $myHomeDir ..."
    set +e
    /usr/share/autodl/AutoDL.py $myShareDir/uqm.autodlrc
    STATUS=$?
    set -e
    # status 2 means download was ok, but the user choose not to start the game
    if [ "$STATUS" = "0" -o  "$STATUS" = "2" ]; then
      cd $myHomeDir/content/
      if [ ! -f ./version ]; then
        ln -s $myShareDir/content/version version
      fi
      cd packages/
      if [ ! -f ./addons ]; then
        ln -s $myShareDir/content/packages/addons addons
      fi
      # Signal succesful datafiles installation
      cd ../..
      touch uqm-0.6.2
    fi

    if [ "$STATUS" != "0" ]; then
      exit $STATUS
    fi
  fi
}


--- NEW FILE uqm.autodlrc ---
[MESSAGELIST]
[MESSAGE]
	[TITLE]Please click 'Accept' to allow internet access.[/TITLE]
	[TEXT]In order to play Ur-Quan Masters, the uqm data files are needed.

These files are not included in Fedora because they are licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 2.5 License, which contains a no commercial use clause. These files can be freely downloaded from the internet.

If you click Accept the necessary files will be automatically downloaded and installed for you.

Please click Accept to allow access to the internet to download the necessary datafiles.[/TEXT]
[/MESSAGE]
[MESSAGE]
	[TITLE]License Information[/TITLE]
	[TEXT]Attribution-NonCommercial-ShareAlike 2.5 License

You are free:

 * to Share ??? to copy, distribute and transmit
   the work
 * to Remix ??? to adapt the work

Under the following conditions:

 * Attribution. You must attribute the work in the
   manner specified by the author or licensor (but
   not in any way that suggests that they endorse
   you or your use of the work).
 * Noncommercial. You may not use this work for
   commercial purposes.
 * Share Alike. If you alter, transform, or build
   upon this work, you may distribute the resulting
   work only under the same or similar license to
   this one.

 * For any reuse or distribution, you must make clear
   to others the license terms of this work. The best
   way to do this is with a link to this web page.
 * Any of the above conditions can be waived if you
   get permission from the copyright holder.
 * Nothing in this license impairs or restricts the
   author's moral rights.

Disclaimer

Your fair dealing and other rights are in no way affected by the above.

This is a human-readable summary of the Legal Code (the full license), which is available here:
http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode
[/TEXT]
[/MESSAGE]
[/MESSAGELIST]

[FILELIST]
[FILE]
	[FILENAME]uqm-0.6.0-content.uqm[/FILENAME]
	[MD5]7e8f0ed8490e24231431420ea2ba6a03[/MD5]
	[PATH]$HOME/.uqm/content/packages[/PATH]
	[MIRRORS]
		[URL]http://download.sourceforge.net/sc2/uqm-0.6.0-content.uqm[/URL]
		[URL]http://download.sourceforge.net/sc2/uqm-0.6.0-content.uqm[/URL]
		[URL]http://download.sourceforge.net/sc2/uqm-0.6.0-content.uqm[/URL]
	[/MIRRORS]
[/FILE]
[FILE]
	[FILENAME]uqm-0.6.0-voice.uqm[/FILENAME]
	[MD5]d31577b896be935cc2238afd07299b8b[/MD5]
	[PATH]$HOME/.uqm/content/packages[/PATH]
	[MIRRORS]
		[URL]http://download.sourceforge.net/sc2/uqm-0.6.0-voice.uqm[/URL]
		[URL]http://download.sourceforge.net/sc2/uqm-0.6.0-voice.uqm[/URL]
		[URL]http://download.sourceforge.net/sc2/uqm-0.6.0-voice.uqm[/URL]
	[/MIRRORS]
[/FILE]
[FILE]
	[FILENAME]uqm-0.6.0-3domusic.uqm[/FILENAME]
	[MD5]a20cacc8e66f5ff1fdf5e1d3a3b93fd2[/MD5]
	[PATH]$HOME/.uqm/content/packages[/PATH]
	[MIRRORS]
		[URL]http://download.sourceforge.net/sc2/uqm-0.6.0-3domusic.uqm[/URL]
		[URL]http://download.sourceforge.net/sc2/uqm-0.6.0-3domusic.uqm[/URL]
		[URL]http://download.sourceforge.net/sc2/uqm-0.6.0-3domusic.uqm[/URL]
	[/MIRRORS]
[/FILE]
[/FILELIST]

uqm-optflags.patch:

Index: uqm-optflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/uqm/devel/uqm-optflags.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- uqm-optflags.patch	22 Dec 2006 20:26:17 -0000	1.3
+++ uqm-optflags.patch	11 Sep 2008 04:49:13 -0000	1.4
@@ -1,15 +1,16 @@
---- sc2/build/unix/build.config~	2005-05-19 04:11:25.000000000 +0300
-+++ sc2/build/unix/build.config	2005-05-21 23:30:40.000000000 +0300
-@@ -81,7 +81,7 @@
- 	CHOICE_debug_OPTION_nodebug_TITLE="No debugging information"
+diff -up sc2/build/unix/build.config.orig sc2/build/unix/build.config
+--- sc2/build/unix/build.config.orig	2006-12-23 05:26:16.000000000 -0500
++++ sc2/build/unix/build.config	2008-09-10 11:03:12.000000000 -0400
+@@ -90,7 +90,7 @@ uqm_prepare_config()
+ 	CHOICE_debug_OPTION_nodebug_TITLE="Optimised release build"
  	CHOICE_debug_OPTION_nodebug_ACTION='nodebug_action'
  	nodebug_action() {
 -		CFLAGS="$CFLAGS -O3"
 +		CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
  		DEBUG=0
  	}
- 	CHOICE_debug_OPTION_debug_TITLE="Debugging information"
-@@ -122,7 +122,7 @@
+ 	CHOICE_debug_OPTION_debug_TITLE="Debugging build"
+@@ -131,7 +131,7 @@ uqm_prepare_config()
  				# for more readable messages.
  		DEBUG=1
  	}


Index: uqm.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/uqm/devel/uqm.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- uqm.desktop	11 Dec 2004 15:54:10 -0000	1.2
+++ uqm.desktop	11 Sep 2008 04:49:13 -0000	1.3
@@ -3,7 +3,7 @@
 Comment=An epic space adventure
 Comment[fi]=Eeppinen avaruusseikkailu
 Exec=uqm
-Icon=uqm.png
+Icon=uqm
 Terminal=false
 Type=Application
 Encoding=UTF-8


Index: uqm.sh
===================================================================
RCS file: /cvs/pkgs/rpms/uqm/devel/uqm.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- uqm.sh	24 May 2005 06:42:29 -0000	1.1
+++ uqm.sh	11 Sep 2008 04:49:13 -0000	1.2
@@ -2,6 +2,18 @@
 
 # Wrapper script for starting The Ur-Quan Masters
 
+# base settings
+myShareDir=/usr/share/uqm
+myHomeDir=~/.uqm
+
+. $myShareDir/uqm-functions.sh
+
+echo ""
+echo "starting uqm ..."
+
+# creates a local working directory in user-home
+createLocalDir
+
 # Source system wide settings
 if [ -e /etc/uqm.conf ] ; then
   . /etc/uqm.conf


Index: uqm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uqm/devel/uqm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- uqm.spec	17 Feb 2008 18:52:59 -0000	1.15
+++ uqm.spec	11 Sep 2008 04:49:13 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           uqm
 Version:        0.6.2
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        The Ur-Quan Masters, a port of the classic game Star Control II
 
 Group:          Amusements/Games
@@ -10,6 +10,8 @@
 Source1:        %{name}.conf
 Source2:        %{name}.sh
 Source3:        %{name}.desktop
+Source4:        %{name}-functions.sh
+Source5:        %{name}.autodlrc
 Patch0:         %{name}-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,8 +22,8 @@
 BuildRequires:  zlib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libGLU-devel
-BuildRequires:  mikmod-devel
-Requires:       %{name}-content >= 0.6
+BuildRequires:  libmikmod-devel
+Requires:       autodownloader
 
 
 %description
@@ -39,7 +41,8 @@
 
 %build
 pushd sc2
-echo INPUT_install_sharedir_VALUE=%{_datadir}/games > config.state
+echo INPUT_install_sharedir_VALUE=%{_datadir} > config.state
+sed -i 's|@CONTENTDIR@|~/.uqm|g' src/config_unix.h.in
 sh ./build.sh uqm < /dev/null
 convert src/res/ur-quan-icon-std.ico uqm.png
 
@@ -59,8 +62,8 @@
 install -Dpm 755 uqm $RPM_BUILD_ROOT%{_prefix}/games/uqm
 
 install -dm 755 \
-  $RPM_BUILD_ROOT%{_datadir}/games/uqm/content/packages/addons/uqmremix
-echo %{version} > $RPM_BUILD_ROOT%{_datadir}/games/uqm/content/version
+  $RPM_BUILD_ROOT%{_datadir}/uqm/content/packages/addons/uqmremix
+echo %{version} > $RPM_BUILD_ROOT%{_datadir}/uqm/content/version
 
 desktop-file-install \
   --vendor fedora \
@@ -70,6 +73,9 @@
  %{SOURCE3}
 install -Dpm 644 uqm-5.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/uqm.png
 
+# needed "data" files
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 644 %{SOURCE4} %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,12 +88,19 @@
 %config(noreplace) %{_sysconfdir}/uqm.conf
 %{_bindir}/uqm
 %{_prefix}/games/uqm
-%{_datadir}/games/uqm/
+%{_datadir}/uqm/
 %{_datadir}/applications/*-%{name}.desktop
 %{_datadir}/pixmaps/uqm.png
 
 
 %changelog
+* Wed Sep 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.2-5
+- drop /usr/share/games/uqm to /usr/share/uqm
+
+* Wed Sep 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.2-4
+- convert package to use autodownloader
+- look for content in user homedir
+
 * Sun Feb 17 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.2-3
 - Rebuild for newer mikmod.
 



From pkgdb at fedoraproject.org  Thu Sep 11 04:53:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:53:08 +0000
Subject: [pkgdb] python-peak-util-extremes (Fedora, 9) updated by huzaifas
Message-ID: <20080911045308.3F897208D9C@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for python-peak-util-extremes
huzaifas has set commit to Approved for uberpackager on python-peak-util-extremes (Fedora 9)
huzaifas has set build to Approved for uberpackager on python-peak-util-extremes (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-extremes (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-extremes



From pkgdb at fedoraproject.org  Thu Sep 11 04:53:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:53:07 +0000
Subject: [pkgdb] python-peak-util-extremes was added for lmacken
Message-ID: <20080911045307.6B9FE208D9A@bastion.fedora.phx.redhat.com>

huzaifas has added Package python-peak-util-extremes with summary Production quality Min and Max objects
huzaifas has approved Package python-peak-util-extremes
huzaifas has added a Fedora devel branch for python-peak-util-extremes with an owner of lmacken
huzaifas has approved python-peak-util-extremes in Fedora devel
huzaifas has approved Package python-peak-util-extremes
huzaifas has set commit to Approved for packager on python-peak-util-extremes (Fedora devel)
huzaifas has set build to Approved for packager on python-peak-util-extremes (Fedora devel)
huzaifas has set checkout to Approved for packager on python-peak-util-extremes (Fedora devel)
huzaifas has set commit to Approved for uberpackager on python-peak-util-extremes (Fedora devel)
huzaifas has set build to Approved for uberpackager on python-peak-util-extremes (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-extremes (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-extremes



From pkgdb at fedoraproject.org  Thu Sep 11 04:53:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:53:08 +0000
Subject: [pkgdb] python-peak-util-extremes (Fedora EPEL,
	5) updated by huzaifas
Message-ID: <20080911045308.4701C208DA1@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 5 branch for python-peak-util-extremes
huzaifas has set commit to Approved for uberpackager on python-peak-util-extremes (Fedora EPEL 5)
huzaifas has set build to Approved for uberpackager on python-peak-util-extremes (Fedora EPEL 5)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-extremes (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-extremes



From pkgdb at fedoraproject.org  Thu Sep 11 04:53:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:53:08 +0000
Subject: [pkgdb] python-peak-util-extremes (Fedora, 8) updated by huzaifas
Message-ID: <20080911045308.4F892208DA4@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for python-peak-util-extremes
huzaifas has set commit to Approved for uberpackager on python-peak-util-extremes (Fedora 8)
huzaifas has set build to Approved for uberpackager on python-peak-util-extremes (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-extremes (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-extremes



From pkgdb at fedoraproject.org  Thu Sep 11 04:53:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:53:08 +0000
Subject: [pkgdb] python-peak-util-extremes (Fedora EPEL,
	4) updated by huzaifas
Message-ID: <20080911045308.5BDD1208DA7@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 4 branch for python-peak-util-extremes
huzaifas has set commit to Approved for uberpackager on python-peak-util-extremes (Fedora EPEL 4)
huzaifas has set build to Approved for uberpackager on python-peak-util-extremes (Fedora EPEL 4)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-extremes (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-extremes



From huzaifas at fedoraproject.org  Thu Sep 11 04:53:45 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 04:53:45 +0000 (UTC)
Subject: rpms/python-peak-util-extremes - New directory
Message-ID: <20080911045345.2680570131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/python-peak-util-extremes
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsoc2656/rpms/python-peak-util-extremes

Log Message:
Directory /cvs/extras/rpms/python-peak-util-extremes added to the repository




From huzaifas at fedoraproject.org  Thu Sep 11 04:53:45 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 04:53:45 +0000 (UTC)
Subject: rpms/python-peak-util-extremes/devel - New directory
Message-ID: <20080911045345.5FE4070131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/python-peak-util-extremes/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsoc2656/rpms/python-peak-util-extremes/devel

Log Message:
Directory /cvs/extras/rpms/python-peak-util-extremes/devel added to the repository




From huzaifas at fedoraproject.org  Thu Sep 11 04:53:46 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 04:53:46 +0000 (UTC)
Subject: rpms/python-peak-util-extremes/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080911045346.85B3070131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/python-peak-util-extremes/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsoc2656/rpms/python-peak-util-extremes/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-peak-util-extremes


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-peak-util-extremes
# $Id: Makefile,v 1.1 2008/09/11 04:53:46 huzaifas Exp $
NAME := python-peak-util-extremes
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From huzaifas at fedoraproject.org  Thu Sep 11 04:53:46 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 04:53:46 +0000 (UTC)
Subject: rpms/python-peak-util-extremes Makefile,NONE,1.1
Message-ID: <20080911045346.4596370131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/python-peak-util-extremes
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsoc2656/rpms/python-peak-util-extremes

Added Files:
	Makefile 
Log Message:
Setup of module python-peak-util-extremes


--- NEW FILE Makefile ---
# Top level Makefile for module python-peak-util-extremes
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep 11 04:56:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:56:39 +0000
Subject: [pkgdb] python-peak-util-assembler was added for lmacken
Message-ID: <20080911045639.EC7CF208D9A@bastion.fedora.phx.redhat.com>

huzaifas has added Package python-peak-util-assembler with summary Generate python code objects by assembling bytecode
huzaifas has approved Package python-peak-util-assembler
huzaifas has added a Fedora devel branch for python-peak-util-assembler with an owner of lmacken
huzaifas has approved python-peak-util-assembler in Fedora devel
huzaifas has approved Package python-peak-util-assembler
huzaifas has set commit to Approved for packager on python-peak-util-assembler (Fedora devel)
huzaifas has set build to Approved for packager on python-peak-util-assembler (Fedora devel)
huzaifas has set checkout to Approved for packager on python-peak-util-assembler (Fedora devel)
huzaifas has set commit to Approved for uberpackager on python-peak-util-assembler (Fedora devel)
huzaifas has set build to Approved for uberpackager on python-peak-util-assembler (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-assembler (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-assembler



From pkgdb at fedoraproject.org  Thu Sep 11 04:56:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:56:40 +0000
Subject: [pkgdb] python-peak-util-assembler (Fedora, 9) updated by huzaifas
Message-ID: <20080911045640.AF601208D9E@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for python-peak-util-assembler
huzaifas has set commit to Approved for uberpackager on python-peak-util-assembler (Fedora 9)
huzaifas has set build to Approved for uberpackager on python-peak-util-assembler (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-assembler (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-assembler



From pkgdb at fedoraproject.org  Thu Sep 11 04:56:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:56:40 +0000
Subject: [pkgdb] python-peak-util-assembler (Fedora EPEL,
	5) updated by huzaifas
Message-ID: <20080911045640.B88EF208DA1@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 5 branch for python-peak-util-assembler
huzaifas has set commit to Approved for uberpackager on python-peak-util-assembler (Fedora EPEL 5)
huzaifas has set build to Approved for uberpackager on python-peak-util-assembler (Fedora EPEL 5)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-assembler (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-assembler



From pkgdb at fedoraproject.org  Thu Sep 11 04:56:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:56:40 +0000
Subject: [pkgdb] python-peak-util-assembler (Fedora, 8) updated by huzaifas
Message-ID: <20080911045640.C34172D0023@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for python-peak-util-assembler
huzaifas has set commit to Approved for uberpackager on python-peak-util-assembler (Fedora 8)
huzaifas has set build to Approved for uberpackager on python-peak-util-assembler (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-assembler (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-assembler



From pkgdb at fedoraproject.org  Thu Sep 11 04:56:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:56:40 +0000
Subject: [pkgdb] python-peak-util-assembler (Fedora EPEL,
	4) updated by huzaifas
Message-ID: <20080911045640.E23AD2D0026@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 4 branch for python-peak-util-assembler
huzaifas has set commit to Approved for uberpackager on python-peak-util-assembler (Fedora EPEL 4)
huzaifas has set build to Approved for uberpackager on python-peak-util-assembler (Fedora EPEL 4)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-assembler (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-assembler



From huzaifas at fedoraproject.org  Thu Sep 11 04:57:30 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 04:57:30 +0000 (UTC)
Subject: rpms/python-peak-util-assembler/devel - New directory
Message-ID: <20080911045730.5AAF870131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/python-peak-util-assembler/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsTn3889/rpms/python-peak-util-assembler/devel

Log Message:
Directory /cvs/extras/rpms/python-peak-util-assembler/devel added to the repository




From huzaifas at fedoraproject.org  Thu Sep 11 04:57:30 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 04:57:30 +0000 (UTC)
Subject: rpms/python-peak-util-assembler - New directory
Message-ID: <20080911045730.280E670131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/python-peak-util-assembler
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsTn3889/rpms/python-peak-util-assembler

Log Message:
Directory /cvs/extras/rpms/python-peak-util-assembler added to the repository




From huzaifas at fedoraproject.org  Thu Sep 11 04:57:31 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 04:57:31 +0000 (UTC)
Subject: rpms/python-peak-util-assembler Makefile,NONE,1.1
Message-ID: <20080911045731.27AB470131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/python-peak-util-assembler
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsTn3889/rpms/python-peak-util-assembler

Added Files:
	Makefile 
Log Message:
Setup of module python-peak-util-assembler


--- NEW FILE Makefile ---
# Top level Makefile for module python-peak-util-assembler
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Thu Sep 11 04:57:31 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 04:57:31 +0000 (UTC)
Subject: rpms/python-peak-util-assembler/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080911045731.600F370131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/python-peak-util-assembler/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsTn3889/rpms/python-peak-util-assembler/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-peak-util-assembler


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-peak-util-assembler
# $Id: Makefile,v 1.1 2008/09/11 04:57:31 huzaifas Exp $
NAME := python-peak-util-assembler
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 11 04:58:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:58:23 +0000
Subject: [pkgdb] rtorrent: iburrell has requested watchbugzilla
Message-ID: <20080911045823.AC6BD208D98@bastion.fedora.phx.redhat.com>

iburrell has requested the watchbugzilla acl on rtorrent (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rtorrent



From pkgdb at fedoraproject.org  Thu Sep 11 04:58:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:58:28 +0000
Subject: [pkgdb] rtorrent: iburrell has requested watchcommits
Message-ID: <20080911045828.0CEFC208D9E@bastion.fedora.phx.redhat.com>

iburrell has requested the watchcommits acl on rtorrent (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rtorrent



From pkgdb at fedoraproject.org  Thu Sep 11 04:58:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:58:28 +0000
Subject: [pkgdb] rtorrent: iburrell has requested commit
Message-ID: <20080911045828.754432D0021@bastion.fedora.phx.redhat.com>

iburrell has requested the commit acl on rtorrent (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rtorrent



From pkgdb at fedoraproject.org  Thu Sep 11 04:58:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:58:57 +0000
Subject: [pkgdb] python-peak-util-assembler summary updated by huzaifas
Message-ID: <20080911045857.C78A8208D9C@bastion.fedora.phx.redhat.com>

huzaifas set package python-peak-util-assembler summary to Dynamically extend other objects with AddOns

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-assembler



From pkgdb at fedoraproject.org  Thu Sep 11 04:58:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:58:57 +0000
Subject: [pkgdb] python-peak-util-assembler (Fedora, 9) updated by huzaifas
Message-ID: <20080911045857.CE065208DA1@bastion.fedora.phx.redhat.com>

huzaifas changed owner of python-peak-util-assembler in Fedora 9 to lmacken

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-assembler



From pkgdb at fedoraproject.org  Thu Sep 11 04:58:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:58:57 +0000
Subject: [pkgdb] python-peak-util-assembler (Fedora EPEL,
	5) updated by huzaifas
Message-ID: <20080911045857.D38A4208DA3@bastion.fedora.phx.redhat.com>

huzaifas changed owner of python-peak-util-assembler in Fedora EPEL 5 to lmacken

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-assembler



From pkgdb at fedoraproject.org  Thu Sep 11 04:58:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:58:57 +0000
Subject: [pkgdb] python-peak-util-assembler (Fedora, 8) updated by huzaifas
Message-ID: <20080911045857.E3587208DA6@bastion.fedora.phx.redhat.com>

huzaifas changed owner of python-peak-util-assembler in Fedora 8 to lmacken

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-assembler



From pkgdb at fedoraproject.org  Thu Sep 11 04:58:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 04:58:57 +0000
Subject: [pkgdb] python-peak-util-assembler (Fedora EPEL,
	4) updated by huzaifas
Message-ID: <20080911045858.0058A2D0026@bastion.fedora.phx.redhat.com>

huzaifas changed owner of python-peak-util-assembler in Fedora EPEL 4 to lmacken

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-assembler



From pkgdb at fedoraproject.org  Thu Sep 11 05:00:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:00:20 +0000
Subject: [pkgdb] python-peak-util-addons was added for lmacken
Message-ID: <20080911050020.C2476208D99@bastion.fedora.phx.redhat.com>

huzaifas has added Package python-peak-util-addons with summary Dynamically extend other objects with AddOns
huzaifas has approved Package python-peak-util-addons
huzaifas has added a Fedora devel branch for python-peak-util-addons with an owner of lmacken
huzaifas has approved python-peak-util-addons in Fedora devel
huzaifas has approved Package python-peak-util-addons
huzaifas has set commit to Approved for packager on python-peak-util-addons (Fedora devel)
huzaifas has set build to Approved for packager on python-peak-util-addons (Fedora devel)
huzaifas has set checkout to Approved for packager on python-peak-util-addons (Fedora devel)
huzaifas has set commit to Approved for uberpackager on python-peak-util-addons (Fedora devel)
huzaifas has set build to Approved for uberpackager on python-peak-util-addons (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-addons (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-addons



From pkgdb at fedoraproject.org  Thu Sep 11 05:00:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:00:21 +0000
Subject: [pkgdb] python-peak-util-addons (Fedora, 9) updated by huzaifas
Message-ID: <20080911050021.AA862208D9C@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for python-peak-util-addons
huzaifas has set commit to Approved for uberpackager on python-peak-util-addons (Fedora 9)
huzaifas has set build to Approved for uberpackager on python-peak-util-addons (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-addons (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-addons



From pkgdb at fedoraproject.org  Thu Sep 11 05:00:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:00:21 +0000
Subject: [pkgdb] python-peak-util-addons (Fedora, 8) updated by huzaifas
Message-ID: <20080911050021.B99222D0023@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for python-peak-util-addons
huzaifas has set commit to Approved for uberpackager on python-peak-util-addons (Fedora 8)
huzaifas has set build to Approved for uberpackager on python-peak-util-addons (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-addons (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-addons



From pkgdb at fedoraproject.org  Thu Sep 11 05:00:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:00:21 +0000
Subject: [pkgdb] python-peak-util-addons (Fedora EPEL, 5) updated by huzaifas
Message-ID: <20080911050021.B0164208DA0@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 5 branch for python-peak-util-addons
huzaifas has set commit to Approved for uberpackager on python-peak-util-addons (Fedora EPEL 5)
huzaifas has set build to Approved for uberpackager on python-peak-util-addons (Fedora EPEL 5)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-addons (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-addons



From huzaifas at fedoraproject.org  Thu Sep 11 05:00:47 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 05:00:47 +0000 (UTC)
Subject: rpms/python-peak-util-addons - New directory
Message-ID: <20080911050047.2978170131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/python-peak-util-addons
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvskh5049/rpms/python-peak-util-addons

Log Message:
Directory /cvs/extras/rpms/python-peak-util-addons added to the repository




From pkgdb at fedoraproject.org  Thu Sep 11 05:00:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:00:21 +0000
Subject: [pkgdb] python-peak-util-addons (Fedora EPEL, 4) updated by huzaifas
Message-ID: <20080911050021.C9FB82D0026@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 4 branch for python-peak-util-addons
huzaifas has set commit to Approved for uberpackager on python-peak-util-addons (Fedora EPEL 4)
huzaifas has set build to Approved for uberpackager on python-peak-util-addons (Fedora EPEL 4)
huzaifas has set checkout to Approved for uberpackager on python-peak-util-addons (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-addons



From huzaifas at fedoraproject.org  Thu Sep 11 05:00:48 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 05:00:48 +0000 (UTC)
Subject: rpms/python-peak-util-addons Makefile,NONE,1.1
Message-ID: <20080911050048.7557E70131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/python-peak-util-addons
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvskh5049/rpms/python-peak-util-addons

Added Files:
	Makefile 
Log Message:
Setup of module python-peak-util-addons


--- NEW FILE Makefile ---
# Top level Makefile for module python-peak-util-addons
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Thu Sep 11 05:00:47 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 05:00:47 +0000 (UTC)
Subject: rpms/python-peak-util-addons/devel - New directory
Message-ID: <20080911050047.7625D70131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/python-peak-util-addons/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvskh5049/rpms/python-peak-util-addons/devel

Log Message:
Directory /cvs/extras/rpms/python-peak-util-addons/devel added to the repository




From huzaifas at fedoraproject.org  Thu Sep 11 05:00:48 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 05:00:48 +0000 (UTC)
Subject: rpms/python-peak-util-addons/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080911050048.B362370131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/python-peak-util-addons/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvskh5049/rpms/python-peak-util-addons/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-peak-util-addons


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-peak-util-addons
# $Id: Makefile,v 1.1 2008/09/11 05:00:48 huzaifas Exp $
NAME := python-peak-util-addons
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 11 05:01:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:01:37 +0000
Subject: [pkgdb] python-peak-util-assembler summary updated by huzaifas
Message-ID: <20080911050137.CCBE32D0021@bastion.fedora.phx.redhat.com>

huzaifas set package python-peak-util-assembler summary to Generate python code objects by assembling bytecode

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-assembler



From pkgdb at fedoraproject.org  Thu Sep 11 05:01:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:01:37 +0000
Subject: [pkgdb] python-peak-util-assembler (Fedora EPEL,
	5) updated by huzaifas
Message-ID: <20080911050137.DFF502D0024@bastion.fedora.phx.redhat.com>

huzaifas changed owner of python-peak-util-assembler in Fedora EPEL 5 to lmacken

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-assembler



From pkgdb at fedoraproject.org  Thu Sep 11 05:01:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:01:37 +0000
Subject: [pkgdb] python-peak-util-assembler (Fedora, 9) updated by huzaifas
Message-ID: <20080911050138.253662D0027@bastion.fedora.phx.redhat.com>

huzaifas changed owner of python-peak-util-assembler in Fedora 9 to lmacken

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-assembler



From pkgdb at fedoraproject.org  Thu Sep 11 05:01:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:01:37 +0000
Subject: [pkgdb] python-peak-util-assembler (Fedora, 8) updated by huzaifas
Message-ID: <20080911050138.3217D2E0002@bastion.fedora.phx.redhat.com>

huzaifas changed owner of python-peak-util-assembler in Fedora 8 to lmacken

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-assembler



From pkgdb at fedoraproject.org  Thu Sep 11 05:01:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:01:37 +0000
Subject: [pkgdb] python-peak-util-assembler (Fedora EPEL,
	4) updated by huzaifas
Message-ID: <20080911050138.3AE6E2E0005@bastion.fedora.phx.redhat.com>

huzaifas changed owner of python-peak-util-assembler in Fedora EPEL 4 to lmacken

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-peak-util-assembler



From pkgdb at fedoraproject.org  Thu Sep 11 05:02:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:02:49 +0000
Subject: [pkgdb] perl-Catalyst-Runtime had group_acl changed
Message-ID: <20080911050249.F3471208D98@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Runtime (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Runtime



From pkgdb at fedoraproject.org  Thu Sep 11 05:02:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:02:53 +0000
Subject: [pkgdb] perl-Catalyst-Runtime had group_acl changed
Message-ID: <20080911050253.A85F0208D9A@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Runtime (Fedora 7) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Runtime



From pkgdb at fedoraproject.org  Thu Sep 11 05:02:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:02:55 +0000
Subject: [pkgdb] perl-Catalyst-Runtime had group_acl changed
Message-ID: <20080911050255.56552208D9B@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Runtime (Fedora 5) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Runtime



From pkgdb at fedoraproject.org  Thu Sep 11 05:02:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:02:56 +0000
Subject: [pkgdb] perl-Catalyst-Runtime had group_acl changed
Message-ID: <20080911050256.3DFB6208D9C@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Runtime (Fedora 6) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Runtime



From pkgdb at fedoraproject.org  Thu Sep 11 05:03:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:03:02 +0000
Subject: [pkgdb] perl-Catalyst-Runtime had group_acl changed
Message-ID: <20080911050302.1B21A208DA1@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Runtime (Fedora 8) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Runtime



From pkgdb at fedoraproject.org  Thu Sep 11 05:03:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:03:05 +0000
Subject: [pkgdb] perl-Catalyst-Runtime had group_acl changed
Message-ID: <20080911050305.B96A1208DA3@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Runtime (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Runtime



From ingvar at fedoraproject.org  Thu Sep 11 05:03:22 2008
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Thu, 11 Sep 2008 05:03:22 +0000 (UTC)
Subject: rpms/varnish/EL-5 varnish.coresize.patch, NONE,
	1.1 varnish.cs3157.patch, NONE,
	1.1 varnish.endianfix.cs3170-3071.patch, NONE,
	1.1 varnish.lockfile.patch, NONE, 1.1 varnish.vcl_changes.patch,
	NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 varnish.spec,
	1.1, 1.2
Message-ID: <20080911050322.DCE3F70131@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6094

Modified Files:
	.cvsignore sources varnish.spec 
Added Files:
	varnish.coresize.patch varnish.cs3157.patch 
	varnish.endianfix.cs3170-3071.patch varnish.lockfile.patch 
	varnish.vcl_changes.patch 
Log Message:
New upstream release varnish-2.0-beta1

varnish.coresize.patch:

--- NEW FILE varnish.coresize.patch ---
diff -Naur ../varnish-2.0-beta1.orig/redhat/varnish.sysconfig ./redhat/varnish.sysconfig
--- ../varnish-2.0-beta1.orig/redhat/varnish.sysconfig	2008-06-18 12:59:41.000000000 +0200
+++ ./redhat/varnish.sysconfig	2008-09-02 14:50:51.000000000 +0200
@@ -11,6 +11,9 @@
 # Default log size is 82MB + header
 MEMLOCK=82000
 
+# Maximum size of corefile (for ulimit -c). Default in Fedora is 0
+# DAEMON_COREFILE_LIMIT="unlimited"
+
 # This file contains 4 alternatives, please use only one.
 
 ## Alternative 1, Minimal configuration, no VCL

varnish.cs3157.patch:

--- NEW FILE varnish.cs3157.patch ---
Index: bin/varnishtest/vtc_server.c
===================================================================
--- bin/varnishtest/vtc_server.c	(revision 3155)
+++ bin/varnishtest/vtc_server.c	(revision 3157)
@@ -97,7 +97,7 @@
 		vtc_log(vl, 3, "Accepted socket fd is %d", fd);
 		http_process(vl, s->spec, fd, 0);
 		vtc_log(vl, 3, "shutting fd %d", fd);
-		AZ(shutdown(fd, SHUT_WR));
+		assert((shutdown(fd, SHUT_WR) == 0) || errno == ENOTCONN);
 		TCP_close(&fd);
 	}
 	vtc_log(vl, 2, "Ending");

varnish.endianfix.cs3170-3071.patch:

--- NEW FILE varnish.endianfix.cs3170-3071.patch ---
Index: include/vrt.h
===================================================================
--- include/vrt.h	(revisjon 3169)
+++ include/vrt.h	(revisjon 3171)
@@ -154,6 +154,7 @@
 
 /* Simple stuff */
 int VRT_strcmp(const char *s1, const char *s2);
+void VRT_memmove(void *dst, const void *src, unsigned len);
 
 void VRT_ESI(struct sess *sp);
 void VRT_Rollback(struct sess *sp);
Index: lib/libvcl/vcc_fixed_token.c
===================================================================
--- lib/libvcl/vcc_fixed_token.c	(revisjon 3169)
+++ lib/libvcl/vcc_fixed_token.c	(revisjon 3171)
@@ -434,6 +434,7 @@
 	vsb_cat(sb, "\n");
 	vsb_cat(sb, "/* Simple stuff */\n");
 	vsb_cat(sb, "int VRT_strcmp(const char *s1, const char *s2);\n");
+	vsb_cat(sb, "void VRT_memmove(void *dst, const void *src, unsigned len);\n");
 	vsb_cat(sb, "\n");
 	vsb_cat(sb, "void VRT_ESI(struct sess *sp);\n");
 	vsb_cat(sb, "void VRT_Rollback(struct sess *sp);\n");
Index: lib/libvcl/vcc_acl.c
===================================================================
--- lib/libvcl/vcc_acl.c	(revisjon 3169)
+++ lib/libvcl/vcc_acl.c	(revisjon 3171)
@@ -328,23 +328,37 @@
 	int depth, l, m, i;
 	unsigned at[VRT_ACL_MAXADDR + 1];
 	const char *oc;
+	struct sockaddr sa;
 
 	Fh(tl, 0, "\nstatic int\n");
 	Fh(tl, 0, "match_acl_%s_%s(const struct sess *sp, const void *p)\n",
 	    pfx, acln);
 	Fh(tl, 0, "{\n");
-	Fh(tl, 0, "\tunsigned fam;\n");
 	Fh(tl, 0, "\tconst unsigned char *a;\n");
+	assert(sizeof (unsigned char) == 1);
+	assert(sizeof (unsigned short) == 2);
+	assert(sizeof (unsigned int) == 4);
+	if (sizeof sa.sa_family == 1)
+		Fh(tl, 0, "\tunsigned char fam;\n");
+	else if (sizeof sa.sa_family == 2)
+		Fh(tl, 0, "\tunsigned short fam;\n");
+	else if (sizeof sa.sa_family == 4)
+		Fh(tl, 0, "\tunsigned int fam;\n");
+	else
+		assert(0 == __LINE__);
+		
 	Fh(tl, 0, "\n");
 	Fh(tl, 0, "\ta = p;\n");
-	Fh(tl, 0, "\tfam = a[%d];\n", offsetof(struct sockaddr, sa_family));
+	Fh(tl, 0, "\tVRT_memmove(&fam, a + %d, sizeof fam);\n",
+	    offsetof(struct sockaddr, sa_family));
 	Fh(tl, 0, "\tif (fam == %d)\n", PF_INET);
 	Fh(tl, 0, "\t\ta += %d;\n", offsetof(struct sockaddr_in, sin_addr));
 	Fh(tl, 0, "\telse if (fam == %d)\n", PF_INET6);
 	Fh(tl, 0, "\t\ta += %d;\n", offsetof(struct sockaddr_in6, sin6_addr));
-	Fh(tl, 0, "\telse\n");
+	Fh(tl, 0, "\telse {\n");
+	Fh(tl, 0, "\t\tVRT_acl_log(sp, \"NO_FAM %s\");\n", acln);
 	Fh(tl, 0, "\t\treturn(0);\n");
-	Fh(tl, 0, "\n");
+	Fh(tl, 0, "\t}\n\n");
 	depth = -1;
 	oc = 0;
 	at[0] = 256;
Index: bin/varnishd/cache_vrt.c
===================================================================
--- bin/varnishd/cache_vrt.c	(revisjon 3169)
+++ bin/varnishd/cache_vrt.c	(revisjon 3171)
@@ -726,3 +726,10 @@
 	return (strcmp(s1, s2));
 }
 
+void
+VRT_memmove(void *dst, const void *src, unsigned len)
+{
+
+	(void)memmove(dst, src, len);
+}
+

varnish.lockfile.patch:

--- NEW FILE varnish.lockfile.patch ---
diff -Naur ../varnish-2.0-beta1.orig/redhat/varnish.initrc ./redhat/varnish.initrc
--- ../varnish-2.0-beta1.orig/redhat/varnish.initrc	2008-08-27 09:45:40.000000000 +0200
+++ ./redhat/varnish.initrc	2008-08-29 22:52:23.000000000 +0200
@@ -31,8 +31,6 @@
 # Include varnish defaults
 [ -e /etc/sysconfig/varnish ] && . /etc/sysconfig/varnish
 
-lockfile=/var/lock/subsys/$prog
-
 start() {
 
 	if [ ! -x $exec ]
diff -Naur ../varnish-2.0-beta1.orig/redhat/varnishlog.initrc ./redhat/varnishlog.initrc
--- ../varnish-2.0-beta1.orig/redhat/varnishlog.initrc	2008-08-27 09:45:40.000000000 +0200
+++ ./redhat/varnishlog.initrc	2008-08-29 22:53:30.000000000 +0200
@@ -32,8 +32,6 @@
 # Include varnish defaults
 [ -e /etc/sysconfig/varnishlog ] && . /etc/sysconfig/varnishlog
 
-lockfile=/var/lock/subsys/$prog
-
 start() {
 
 	if [ ! -x $exec ]

varnish.vcl_changes.patch:

--- NEW FILE varnish.vcl_changes.patch ---
diff -Naur ../varnish-2.0-beta1.orig/redhat/README.redhat ./redhat/README.redhat
--- ../varnish-2.0-beta1.orig/redhat/README.redhat	2008-08-27 09:45:40.000000000 +0200
+++ ./redhat/README.redhat	2008-09-02 16:14:43.000000000 +0200
@@ -5,6 +5,24 @@
 
 Varnish should work fine with GCC 3.3 and above.
 
+Upgrading from 1.x to 2.0
+=========================
+There are a few changes in the vcl language from varnish-1.x to 2.0.
+Because of varnish' dynamic vcl loading feature, there is no way to
+guarantee that the vcl file in use actually exists on disk. Thus,
+there is no way to securely automate this process, and one must do the
+changes by hand.
+
+In vcl, the word "insert" has been replaced by "deliver". 
+
+In the vcl declaration of backends, where one earlier used "set
+backend", backend parts are now just prefixed with a dot, so the
+default localhost configuration will look like this:
+
+backend default {
+  .host = "127.0.0.1";
+  .port = "80";
+}
 
 Configuration of addresses and ports
 ====================================


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 May 2007 18:05:21 -0000	1.2
+++ .cvsignore	11 Sep 2008 05:03:22 -0000	1.3
@@ -1 +1 @@
-varnish-1.0.4.tar.gz
+varnish-2.0-beta1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 May 2007 18:05:21 -0000	1.2
+++ sources	11 Sep 2008 05:03:22 -0000	1.3
@@ -1 +1 @@
-2a917e485700d44b28c0d0b626ea90d8  varnish-1.0.4.tar.gz
+66582fd4baa3f7fb91727fa27f41aa94  varnish-2.0-beta1.tar.gz


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-5/varnish.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- varnish.spec	21 May 2007 18:05:21 -0000	1.1
+++ varnish.spec	11 Sep 2008 05:03:22 -0000	1.2
@@ -1,18 +1,31 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
-Version: 1.0.4
-Release: 2%{?dist}
-License: BSD-like
+Version: 2.0
+Release: 0.8.beta1%{?dist}
+License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
-Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
+#Source0: http://varnish.projects.linpro.no/static/varnish-cache.tar.gz
+#Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/varnish/varnish-2.0-beta1.tar.gz
+Patch0: varnish.lockfile.patch
+Patch1: varnish.coresize.patch
+Patch2: varnish.vcl_changes.patch
+Patch3: varnish.cs3157.patch
+Patch4: varnish.endianfix.cs3170-3071.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ncurses-devel 
+# The svn sources needs autoconf, automake and libtool to generate a suitable
+# configure script. Release tarballs would not need this
+#BuildRequires: automake autoconf libtool
+BuildRequires: ncurses-devel libxslt groff
 Requires: kernel >= 2.6.0 varnish-libs = %{version}-%{release}
 Requires: logrotate
+Requires: ncurses
+Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+Requires(preun): initscripts
 
 # Varnish actually needs gcc installed to work. It uses the C compiler 
 # at runtime to compile the VCL configuration files. This is by design.
@@ -27,40 +40,96 @@
 Summary: Libraries for %{name}
 Group: System Environment/Libraries
 BuildRequires: ncurses-devel
-#Requires: ncurses
+#Obsoletes: libvarnish1
 
 %description libs
 Libraries for %{name}.
 Varnish is a high-performance HTTP accelerator.
 
-## Removed the -devel package for now
-#%package devel
-#Summary: Development libraries for %{name}
+%package libs-devel
+Summary: Development files for %{name}-libs
+Group: System Environment/Libraries
+BuildRequires: ncurses-devel
+Requires: kernel >= 2.6.0 varnish-libs = %{version}-%{release}
+
+%description libs-devel
+Development files for %{name}-libs
+Varnish is a high-performance HTTP accelerator
+
+#%package libs-static
+#Summary: Files for static linking of %{name} library functions
 #Group: System Environment/Libraries
 #BuildRequires: ncurses-devel
-#Requires: kernel >= 2.6.0  varnish-libs = %{version}-%{release}
+#Requires: kernel >= 2.6.0 varnish-libs-devel = %{version}-%{release}
 #
-#%description devel
-#Development libraries for %{name}.
+#%description libs-static
+#Files for static linking of varnish library functions
 #Varnish is a high-performance HTTP accelerator
 
 %prep
-%setup -q
+#%setup -q
+%setup -q -n varnish-2.0-beta1
+
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+%patch4 -p0
+
+# The svn sources needs to generate a suitable configure script
+# Release tarballs would not need this
+# ./autogen.sh
+
+# Hack to get 32- and 64-bits tests run concurrently on the same build machine
+case `uname -m` in
+    ppc64 | s390x | x86_64 | sparc64 )
+        sed -i ' 
+            s,9001,9011,g;
+            s,9080,9090,g; 
+            s,9081,9091,g; 
+            s,9082,9092,g; 
+            s,9180,9190,g;
+        ' bin/varnishtest/*.c bin/varnishtest/tests/*vtc
+        ;;
+    *)
+        ;;
+esac
+
+mkdir examples
+cp bin/varnishd/default.vcl etc/zope-plone.vcl examples
 
 %build
 
 # Remove "--disable static" if you want to build static libraries 
-# (ie for the devel package)
-%configure --disable-static
+%configure --disable-static --localstatedir=/var/lib
 
 # We have to remove rpath - not allowed in Fedora
 # (This problem only visible on 64 bit arches)
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g;
+        s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 %{__make} %{?_smp_mflags}
 
-sed -e ' s/8080/80/g ' etc/default.vcl > redhat/default.vcl
+head -6 etc/default.vcl > redhat/default.vcl
+
+cat << EOF >> redhat/default.vcl
+backend default {
+  .host = "127.0.0.1";
+  .port = "80";
+}
+EOF
+
+tail -n +11 etc/default.vcl >> redhat/default.vcl
+
+%if "%dist" == "el4"
+    sed -i 's,--pidfile \$pidfile,,g;
+            s,status -p \$pidfile,status,g;
+            s,killproc -p \$pidfile,killproc,g' \
+    redhat/varnish.initrc redhat/varnishlog.initrc
+%endif
+
+%check
+%{__make} check LD_LIBRARY_PATH="../../lib/libvarnish/.libs:../../lib/libvarnishcompat/.libs:../../lib/libvarnishapi/.libs:../../lib/libvcl/.libs"
 
 %install
 rm -rf %{buildroot}
@@ -69,17 +138,17 @@
 # None of these for fedora
 find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';'
 
-# Remove this line to build the devel package
-find %{buildroot}/%{_libdir}/ -name '*.so' -type l -exec rm -f {} ';'
+# Remove this line to build a devel package with symlinks
+#find %{buildroot}/%{_libdir}/ -name '*.so' -type l -exec rm -f {} ';'
 
 mkdir -p %{buildroot}/var/lib/varnish
 mkdir -p %{buildroot}/var/log/varnish
-
+mkdir -p %{buildroot}/var/run/varnish
 %{__install} -D -m 0644 redhat/default.vcl %{buildroot}%{_sysconfdir}/varnish/default.vcl
 %{__install} -D -m 0644 redhat/varnish.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/varnish
 %{__install} -D -m 0644 redhat/varnish.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/varnish
-%{__install} -D -m 0755 redhat/varnish.initrc %{buildroot}%{_sysconfdir}/init.d/varnish
-%{__install} -D -m 0755 redhat/varnishlog.initrc %{buildroot}%{_sysconfdir}/init.d/varnishlog
+%{__install} -D -m 0755 redhat/varnish.initrc %{buildroot}%{_initrddir}/varnish
+%{__install} -D -m 0755 redhat/varnishlog.initrc %{buildroot}%{_initrddir}/varnishlog
 
 %clean
 rm -rf %{buildroot}
@@ -92,25 +161,48 @@
 %{_var}/log/varnish
 %{_mandir}/man1/*.1*
 %{_mandir}/man7/*.7*
-%doc INSTALL LICENSE README redhat/README.redhat redhat/default.vcl ChangeLog 
+%doc INSTALL LICENSE README redhat/README.redhat ChangeLog 
+%doc examples
 %dir %{_sysconfdir}/varnish/
 %config(noreplace) %{_sysconfdir}/varnish/default.vcl
 %config(noreplace) %{_sysconfdir}/sysconfig/varnish
 %config(noreplace) %{_sysconfdir}/logrotate.d/varnish
-%{_sysconfdir}/init.d/varnish
-%{_sysconfdir}/init.d/varnishlog
+%{_initrddir}/varnish
+%{_initrddir}/varnishlog
 
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
 %doc LICENSE
 
-## Removed the -devel package for now
-#%files devel
-#%defattr(-,root,root,-)
-#%{_libdir}/libvarnish.so
-#%{_libdir}/libvarnishapi.so
-#%{_libdir}/libvcl.so
+%files libs-devel
+%defattr(-,root,root,-)
+%{_libdir}/libvarnish.so
+%{_libdir}/libvarnishapi.so
+%{_libdir}/libvarnishcompat.so
+%{_libdir}/libvcl.so
+%dir %{_includedir}/varnish
+%{_includedir}/varnish/shmlog.h
+%{_includedir}/varnish/shmlog_tags.h
+%{_includedir}/varnish/stat_field.h
+%{_includedir}/varnish/stats.h
+%{_includedir}/varnish/varnishapi.h
+%{_libdir}/pkgconfig/varnishapi.pc
+%doc LICENSE
+
+#%files libs-static
+#%{_libdir}/libvarnish.a
+#%{_libdir}/libvarnishapi.a
+#%{_libdir}/libvarnishcompat.a
+#%{_libdir}/libvcl.a
+#%doc LICENSE
+
+%pre
+getent group varnish >/dev/null || groupadd -r varnish
+getent passwd varnish >/dev/null || \
+    useradd -r -g varnish -d /var/lib/varnish -s /sbin/nologin \
+        -c "Varnish http accelerator user" varnish
+exit 0
 
 %post
 /sbin/chkconfig --add varnish
@@ -118,16 +210,16 @@
 
 %preun
 if [ $1 -lt 1 ]; then
-  /sbin/service varnish stop > /dev/null 2>/dev/null
-  /sbin/service varnishlog stop > /dev/null 2>/dev/null
+  /sbin/service varnish stop > /dev/null 2>&1
+  /sbin/service varnishlog stop > /dev/null 2>&1
   /sbin/chkconfig --del varnish
   /sbin/chkconfig --del varnishlog
 fi
 
 %postun
 if [ $1 -ge 1 ]; then
-  /sbin/service varnish condrestart > /dev/null 2>/dev/null
-  /sbin/service varnishlog condrestart > /dev/null 2>/dev/null
+  /sbin/service varnish condrestart > /dev/null 2>&1
+  /sbin/service varnishlog condrestart > /dev/null 2>&1
 fi
 
 %post libs -p /sbin/ldconfig
@@ -135,9 +227,83 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Sep 09 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.8.beta1
+- Added a patch from r3171 that fixes an endian bug on ppc and ppc64
+- Added a hack that changes the varnishtest ports for 64bits builds,
+  so they can run in parallell with 32bits build on same build host
+
+* Tue Sep 02 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.7.beta1
+- Added a patch from r3156 and r3157, hiding a legit errno in make check
+
+* Tue Sep 02 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.6.beta1
+- Added a commented option for max coresize in the sysconfig script
+- Added a comment in README.redhat about upgrading from 1.x to 2.0
+
+* Fri Aug 29 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.5.beta1
+- Bumped version numbers and source url for first beta release \o/
+- Added a missing directory to the libs-devel package (Michael Schwendt)
+- Added the LICENSE file to the libs-devel package
+- Moved make check to its proper place
+- Removed superfluous definition of lockfile in initscripts
+
+* Wed Aug 27 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.4.20080827svn3136
+- Fixed up init script for varnishlog too
+
+* Mon Aug 25 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.3.20080825svn3125
+- Fixing up init script according to newer Fedora standards
+- The build now runs the test suite after compiling
+- Requires initscripts
+- Change default.vcl from nothing but comments to point to localhost:80,
+
+* Mon Aug 18 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.2.tp2
+- Changed source, version and release to match 2.0-tp2
+
+* Thu Aug 14 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.1.20080814svn
+- default.vcl has moved
+- Added groff to build requirements
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1.2-6
+- Autorebuild for GCC 4.3
+
+* Sat Dec 29 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.2-5
+- Added missing configuration examples
+- Corrected the license to "BSD"
+
+* Fri Dec 28 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.2-4
+- Build for fedora update
+
+* Fri Dec 28 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.2-2
+- Added missing changelog items
+
+* Thu Dec 20 2007 Stig Sandbeck Mathisen <ssm at linpro.no> - 1.1.2-1
+- Bumped the version number to 1.1.2.
+- Addeed build dependency on libxslt
+
+* Wed Sep 08 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-3
+- Added a patch, changeset 1913 from svn trunk. This makes varnish
+  more stable under specific loads. 
+
+* Tue Sep 06 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-2
+- Removed autogen call (only diff from relase tarball)
+
+* Mon Aug 20 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-1
+- Bumped the version number to 1.1.1.
+
+* Tue Aug 14 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.svn
+- Update for 1.1 branch
+- Added the devel package for the header files and static library files
+- Added a varnish user, and fixed the init script accordingly
+
+* Thu Jul 05 2007 Dag-Erling Sm??rgrav <des at des.no> - 1.1-1
+- Bump Version and Release for 1.1
+
+* Mon May 28 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.4-3
+- Fixed initrc-script bug only visible on el4 (fixes #107)
+
 * Sun May 20 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.4-2
 - Repack from unchanged 1.0.4 tarball
 - Final review request and CVS request for Fedora Extras
+- Repack with extra obsoletes for upgrading from older sf.net package
 
 * Fri May 18 2007 Dag-Erling Sm??rgrav <des at des.no> - 1.0.4-1
 - Bump Version and Release for 1.0.4



From pkgdb at fedoraproject.org  Thu Sep 11 05:03:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:03:32 +0000
Subject: [pkgdb] perl-Catalyst-Devel had group_acl changed
Message-ID: <20080911050332.DB7F3208D9A@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Devel (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Devel



From pkgdb at fedoraproject.org  Thu Sep 11 05:03:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:03:36 +0000
Subject: [pkgdb] perl-Catalyst-Devel had group_acl changed
Message-ID: <20080911050336.5FF1C208D9E@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Devel (Fedora 6) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Devel



From pkgdb at fedoraproject.org  Thu Sep 11 05:03:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:03:37 +0000
Subject: [pkgdb] perl-Catalyst-Devel had group_acl changed
Message-ID: <20080911050337.E9988208DA0@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Devel (Fedora 7) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Devel



From pkgdb at fedoraproject.org  Thu Sep 11 05:03:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:03:39 +0000
Subject: [pkgdb] perl-Catalyst-Devel had group_acl changed
Message-ID: <20080911050339.21F35208DA1@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Devel (Fedora 8) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Devel



From pkgdb at fedoraproject.org  Thu Sep 11 05:03:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:03:42 +0000
Subject: [pkgdb] perl-Catalyst-Devel had group_acl changed
Message-ID: <20080911050342.DC7B4208DA4@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Devel (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Devel



From pkgdb at fedoraproject.org  Thu Sep 11 05:04:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:04:23 +0000
Subject: [pkgdb] libtorrent: iburrell has requested watchbugzilla
Message-ID: <20080911050423.8E7E5208D98@bastion.fedora.phx.redhat.com>

iburrell has requested the watchbugzilla acl on libtorrent (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtorrent



From pkgdb at fedoraproject.org  Thu Sep 11 05:04:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:04:24 +0000
Subject: [pkgdb] libtorrent: iburrell has requested watchcommits
Message-ID: <20080911050424.1ACD1208D9B@bastion.fedora.phx.redhat.com>

iburrell has requested the watchcommits acl on libtorrent (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtorrent



From pkgdb at fedoraproject.org  Thu Sep 11 05:04:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:04:26 +0000
Subject: [pkgdb] libtorrent: iburrell has requested commit
Message-ID: <20080911050426.57104208D9F@bastion.fedora.phx.redhat.com>

iburrell has requested the commit acl on libtorrent (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtorrent



From mclasen at fedoraproject.org  Thu Sep 11 05:17:24 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 11 Sep 2008 05:17:24 +0000 (UTC)
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.182,1.183
Message-ID: <20080911051724.8205D70131@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-vfs2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9885

Modified Files:
	gnome-vfs2.spec 
Log Message:
Rebuild



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- gnome-vfs2.spec	5 Aug 2008 01:54:48 -0000	1.182
+++ gnome-vfs2.spec	11 Sep 2008 05:16:54 -0000	1.183
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.23.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+ 
@@ -231,6 +231,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Thu Sep 11 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.0-1
+- Rebuild against new bluez-libs
+
 * Thu Jul 24 2008 Matthias Clasen  <mclasen at redhat.com> - 2.22.0-4
 - Use newer xdgmime 
 



From pkgdb at fedoraproject.org  Thu Sep 11 05:18:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:18:39 +0000
Subject: [pkgdb] perl-Acme-Damn had group_acl changed
Message-ID: <20080911051840.06E18208D98@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Acme-Damn (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Acme-Damn



From pkgdb at fedoraproject.org  Thu Sep 11 05:18:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:18:44 +0000
Subject: [pkgdb] perl-Acme-Damn had group_acl changed
Message-ID: <20080911051844.EFDFE2D0021@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Acme-Damn (Fedora devel) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Acme-Damn



From pkgdb at fedoraproject.org  Thu Sep 11 05:19:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:19:52 +0000
Subject: [pkgdb] perl-Catalyst-Devel had group_acl changed
Message-ID: <20080911051952.507B8208D98@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Devel (Fedora devel) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Devel



From pkgdb at fedoraproject.org  Thu Sep 11 05:19:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:19:55 +0000
Subject: [pkgdb] perl-Catalyst-Devel had group_acl changed
Message-ID: <20080911051955.86C0E208D9A@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Devel (Fedora 6) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Devel



From pkgdb at fedoraproject.org  Thu Sep 11 05:19:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:19:57 +0000
Subject: [pkgdb] perl-Catalyst-Devel had group_acl changed
Message-ID: <20080911051957.7B465208D9C@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Devel (Fedora 7) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Devel



From pkgdb at fedoraproject.org  Thu Sep 11 05:19:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:19:59 +0000
Subject: [pkgdb] perl-Catalyst-Devel had group_acl changed
Message-ID: <20080911051959.D66B2208D9F@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Devel (Fedora 8) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Devel



From pkgdb at fedoraproject.org  Thu Sep 11 05:20:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:20:21 +0000
Subject: [pkgdb] perl-Catalyst-Runtime had group_acl changed
Message-ID: <20080911052021.47D61208D98@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Runtime (Fedora devel) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Runtime



From pkgdb at fedoraproject.org  Thu Sep 11 05:20:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:20:02 +0000
Subject: [pkgdb] perl-Catalyst-Devel had group_acl changed
Message-ID: <20080911052002.CC5A7208DA1@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Devel (Fedora 9) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Devel



From pkgdb at fedoraproject.org  Thu Sep 11 05:20:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:20:25 +0000
Subject: [pkgdb] perl-Catalyst-Runtime had group_acl changed
Message-ID: <20080911052025.96879208D9B@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Runtime (Fedora 6) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Runtime



From pkgdb at fedoraproject.org  Thu Sep 11 05:20:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:20:28 +0000
Subject: [pkgdb] perl-Catalyst-Runtime had group_acl changed
Message-ID: <20080911052028.8B30D208D98@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Runtime (Fedora 5) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Runtime



From pkgdb at fedoraproject.org  Thu Sep 11 05:20:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:20:30 +0000
Subject: [pkgdb] perl-Catalyst-Runtime had group_acl changed
Message-ID: <20080911052030.8BDC7208D9E@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Runtime (Fedora 7) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Runtime



From pkgdb at fedoraproject.org  Thu Sep 11 05:20:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:20:34 +0000
Subject: [pkgdb] perl-Catalyst-Runtime had group_acl changed
Message-ID: <20080911052034.B8FE42D0020@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Runtime (Fedora 8) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Runtime



From pkgdb at fedoraproject.org  Thu Sep 11 05:20:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 05:20:35 +0000
Subject: [pkgdb] perl-Catalyst-Runtime had group_acl changed
Message-ID: <20080911052035.E95AF208DA2@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Catalyst-Runtime (Fedora 9) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Runtime



From mclasen at fedoraproject.org  Thu Sep 11 05:20:39 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 11 Sep 2008 05:20:39 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs.spec,1.71,1.72
Message-ID: <20080911052039.5958870131@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11001

Modified Files:
	gvfs.spec 
Log Message:
Rebuild



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- gvfs.spec	9 Sep 2008 09:57:15 -0000	1.71
+++ gvfs.spec	11 Sep 2008 05:20:08 -0000	1.72
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 0.99.7.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -247,6 +247,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Matthias Clasen <mclasen at redhat.com>  - 0.99.7.1-3
+- Rebuild 
+
 * Tue Sep 09 2008 - Bastien Nocera <bnocera at redhat.com> - 0.99.7.1-2
 - Somebody made the build system be obnoxious and point out my
   errors in obvious ways



From mclasen at fedoraproject.org  Thu Sep 11 05:23:18 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 11 Sep 2008 05:23:18 +0000 (UTC)
Subject: rpms/gnome-phone-manager/devel gnome-phone-manager.spec,1.25,1.26
Message-ID: <20080911052318.EEA4870131@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-phone-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11842

Modified Files:
	gnome-phone-manager.spec 
Log Message:
Rebuild



Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnome-phone-manager.spec	11 Jun 2008 14:27:15 -0000	1.25
+++ gnome-phone-manager.spec	11 Sep 2008 05:22:48 -0000	1.26
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.60
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPLv2+
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -109,6 +109,9 @@
 %{_datadir}/mission-control/profiles/*
 
 %changelog
+* Thu Sep 11 2008  Matthias Clasen  <mclasen at redhat.com>
+- Rebuild
+
 * Wed Jun 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.60-1
 - Update to 0.60
 - Remove vendor from desktop file



From mtasaka at fedoraproject.org  Thu Sep 11 05:23:49 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 11 Sep 2008 05:23:49 +0000 (UTC)
Subject: rpms/anyremote/devel anyremote.spec,1.6,1.7
Message-ID: <20080911052349.CCF2170131@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/anyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12035/anyremote/devel

Modified Files:
	anyremote.spec 
Log Message:
rebuild against new bluez


Index: anyremote.spec
===================================================================
RCS file: /cvs/extras/rpms/anyremote/devel/anyremote.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- anyremote.spec	9 Sep 2008 17:08:03 -0000	1.6
+++ anyremote.spec	11 Sep 2008 05:23:19 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Remote control through bluetooth or IR connection
 Name: anyremote
 Version: 4.8.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
@@ -59,6 +59,8 @@
 
 
 %changelog
+* Thu Sep 11 2008 Mamoru Tasaka <mtasaka at ioa.s.u-toky.ac.jp> - 4.8.1-2
+- F-10: rebuild against new bluez
 
 * Tue Sep 9 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.8.1-1
 - Small corrections.



From mtasaka at fedoraproject.org  Thu Sep 11 05:23:50 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 11 Sep 2008 05:23:50 +0000 (UTC)
Subject: rpms/cwiid/devel cwiid.spec,1.3,1.4
Message-ID: <20080911052350.3545770131@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cwiid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12035/cwiid/devel

Modified Files:
	cwiid.spec 
Log Message:
rebuild against new bluez


Index: cwiid.spec
===================================================================
RCS file: /cvs/extras/rpms/cwiid/devel/cwiid.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cwiid.spec	22 May 2008 14:21:15 -0000	1.3
+++ cwiid.spec	11 Sep 2008 05:23:19 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           cwiid
 Version:        0.6.00
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Wiimote interface library
 
 Group:          System Environment/Libraries
@@ -110,6 +110,9 @@
 %{_datadir}/applications/fedora-wmgui.desktop
 
 %changelog
+* Thu Sep 11 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.6.00-8
+- F-10: rebuild against new bluez
+
 * Thu May  1 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.6.00-7
 - Rename -wmgui to -tools and repackage.
 



From mclasen at fedoraproject.org  Thu Sep 11 05:25:55 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 11 Sep 2008 05:25:55 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.55,1.56
Message-ID: <20080911052555.6BEE070131@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12949

Modified Files:
	gnome-bluetooth.spec 
Log Message:
Rebuild



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnome-bluetooth.spec	20 May 2008 07:07:31 -0000	1.55
+++ gnome-bluetooth.spec	11 Sep 2008 05:25:25 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: GNOME Bluetooth Subsystem
 Name: gnome-bluetooth
 Version: 0.11.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2 and LGPLv2+
 Group: System Environment/Libraries
 URL: http://live.gnome.org/GnomeBluetooth
@@ -124,6 +124,9 @@
 %{_libdir}/libgnomebt.so
 
 %changelog
+* Thu Sep 11 2008 Matthias Clasen  <mclasen at redhat.com> - 0.11.0-5
+- Rebuild against new bluez-libs
+
 * Wed May 14 2008 - Ondrej Vasik <ovasik at redhat.com> - 0.11.0-4
 - Changed name of icon file(#444811)
 



From mtasaka at fedoraproject.org  Thu Sep 11 05:26:27 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 11 Sep 2008 05:26:27 +0000 (UTC)
Subject: rpms/cwiid/devel cwiid.spec,1.4,1.5
Message-ID: <20080911052627.529B570131@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cwiid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13169/cwiid/devel

Modified Files:
	cwiid.spec 
Log Message:
orz


Index: cwiid.spec
===================================================================
RCS file: /cvs/extras/rpms/cwiid/devel/cwiid.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cwiid.spec	11 Sep 2008 05:23:19 -0000	1.4
+++ cwiid.spec	11 Sep 2008 05:25:57 -0000	1.5
@@ -110,7 +110,7 @@
 %{_datadir}/applications/fedora-wmgui.desktop
 
 %changelog
-* Thu Sep 11 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.6.00-8
+* Thu Sep 11 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.6.00-9
 - F-10: rebuild against new bluez
 
 * Thu May  1 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.6.00-7



From mclasen at fedoraproject.org  Thu Sep 11 05:34:03 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 11 Sep 2008 05:34:03 +0000 (UTC)
Subject: rpms/obex-data-server/devel obex-data-server.spec,1.7,1.8
Message-ID: <20080911053403.B2C4070131@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/obex-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15765

Modified Files:
	obex-data-server.spec 
Log Message:
Rebuild



Index: obex-data-server.spec
===================================================================
RCS file: /cvs/extras/rpms/obex-data-server/devel/obex-data-server.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- obex-data-server.spec	22 Aug 2008 23:41:56 -0000	1.7
+++ obex-data-server.spec	11 Sep 2008 05:33:33 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		obex-data-server
 Version:	0.3.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 Summary:	D-Bus service for Obex access
 
@@ -60,6 +60,9 @@
 %{_mandir}/man1/obex-data-server.1.gz
 
 %changelog
+* Thu Sep 11 2008 Matthias Clasen <mclasen at redhat.com> - 0.3.4-2
+- Rebuild
+
 * Sat Aug 23 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-1
 - Update to 0.3.4
 - Fixes a problem accessing Nokia phones (#456541)



From mtasaka at fedoraproject.org  Thu Sep 11 05:47:50 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 11 Sep 2008 05:47:50 +0000 (UTC)
Subject: rpms/cwiid/devel cwiid-0.6.00-bluez-api.patch, NONE, 1.1 cwiid.spec,
	1.5, 1.6
Message-ID: <20080911054750.D046670131@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cwiid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20384

Modified Files:
	cwiid.spec 
Added Files:
	cwiid-0.6.00-bluez-api.patch 
Log Message:
Fix for bluez api change

cwiid-0.6.00-bluez-api.patch:

--- NEW FILE cwiid-0.6.00-bluez-api.patch ---
--- cwiid-0.6.00/libcwiid/bluetooth.c.debug	2007-04-25 11:41:13.000000000 +0900
+++ cwiid-0.6.00/libcwiid/bluetooth.c	2008-09-11 14:40:22.000000000 +0900
@@ -122,7 +122,7 @@
 		}
 
 		/* timeout (10000) in milliseconds */
-		if (hci_remote_name(sock, &dev_list[i].bdaddr, BT_NAME_LEN,
+		if (hci_read_remote_name(sock, &dev_list[i].bdaddr, BT_NAME_LEN,
 		                    (*bdinfo)[bdinfo_count].name, 10000)) {
 			cwiid_err(NULL, "Bluetooth name read error");
 			err = 1;


Index: cwiid.spec
===================================================================
RCS file: /cvs/extras/rpms/cwiid/devel/cwiid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cwiid.spec	11 Sep 2008 05:25:57 -0000	1.5
+++ cwiid.spec	11 Sep 2008 05:47:20 -0000	1.6
@@ -10,6 +10,7 @@
 URL:            http://abstrakraft.org/cwiid/
 Source0:        http://abstrakraft.org/cwiid/downloads/cwiid-%{version}.tgz
 Source1:        wmgui.desktop
+Patch0:         cwiid-0.6.00-bluez-api.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bluez-libs-devel, gawk, bison, flex, gtk2-devel, python-devel >= 2.4, desktop-file-utils
@@ -60,6 +61,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .api
 
 %build
 %configure CC="gcc %{optflags}" --disable-static
@@ -112,6 +114,7 @@
 %changelog
 * Thu Sep 11 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.6.00-9
 - F-10: rebuild against new bluez
+- Fix for bluez api change
 
 * Thu May  1 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.6.00-7
 - Rename -wmgui to -tools and repackage.



From jnovy at fedoraproject.org  Thu Sep 11 06:16:50 2008
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Thu, 11 Sep 2008 06:16:50 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.5.90-cpio-hardlink.patch, NONE,
	1.1 rpm-4.5.90-rpmbuild-dirs.patch, NONE,
	1.1 rpm-4.5.90-topdir.patch, NONE, 1.1 rpm.spec, 1.294, 1.295
Message-ID: <20080911061650.8BE2B70131@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29334

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.5.90-cpio-hardlink.patch rpm-4.5.90-rpmbuild-dirs.patch 
	rpm-4.5.90-topdir.patch 
Log Message:
* Thu Sep 11 2008 Jindrich Novy <jnovy at redhat.com>
- create directory structure for rpmbuild prior to build if it doesn't exist (#455387)
- create _topdir if it doesn't exist when installing SRPM
- don't generate broken cpio in case of hardlink pointing on softlink,
  thanks to pixel at mandriva.com


rpm-4.5.90-cpio-hardlink.patch:

--- NEW FILE rpm-4.5.90-cpio-hardlink.patch ---
commit 5c71ced2da7d99b870a07a83dd8f7e8d1f1b7e4b
Author: Jindrich Novy <jnovy at redhat.com>
Date:   Wed Sep 10 15:04:57 2008 +0200

    Don't generate broken cpio in case of hardlink pointing on softlink
    - thanks to Pixel

diff --git a/lib/fsm.c b/lib/fsm.c
index 0905e3c..8175f82 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -1573,7 +1573,7 @@ static int fsmStage(FSM_t fsm, fileStage stage)
 	fsm->postpone = XFA_SKIPPING(fsm->action);
 	if (fsm->goal == FSM_PKGINSTALL || fsm->goal == FSM_PKGBUILD) {
 	    /* FIX: saveHardLink can modify fsm */
-	    if (!S_ISDIR(st->st_mode) && st->st_nlink > 1)
+	    if (S_ISREG(st->st_mode) && st->st_nlink > 1)
 		fsm->postpone = saveHardLink(fsm);
 	}
 	break;
@@ -1599,7 +1599,7 @@ static int fsmStage(FSM_t fsm, fileStage stage)
 	if (fsm->goal == FSM_PKGBUILD) {
 	    if (fsm->fflags & RPMFILE_GHOST) /* XXX Don't if %ghost file. */
 		break;
-	    if (!S_ISDIR(st->st_mode) && st->st_nlink > 1) {
+	    if (S_ISREG(st->st_mode) && st->st_nlink > 1) {
 		hardLink_t li, prev;
 
 if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
@@ -1699,7 +1699,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
 	    if (!IS_DEV_LOG(fsm->path))
 		rc = CPIOERR_UNKNOWN_FILETYPE;
 	}
-	if (!S_ISDIR(st->st_mode) && st->st_nlink > 1) {
+	if (S_ISREG(st->st_mode) && st->st_nlink > 1) {
 	    fsm->li->createdPath = fsm->li->linkIndex;
 	    rc = fsmMakeLinks(fsm);
 	}
@@ -1743,7 +1743,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
     case FSM_FINI:
 	if (!fsm->postpone && fsm->commit) {
 	    if (fsm->goal == FSM_PKGINSTALL)
-		rc = ((!S_ISDIR(st->st_mode) && st->st_nlink > 1)
+		rc = ((S_ISREG(st->st_mode) && st->st_nlink > 1)
 			? fsmCommitLinks(fsm) : fsmNext(fsm, FSM_COMMIT));
 	    if (fsm->goal == FSM_PKGCOMMIT)
 		rc = fsmNext(fsm, FSM_COMMIT);

rpm-4.5.90-rpmbuild-dirs.patch:

--- NEW FILE rpm-4.5.90-rpmbuild-dirs.patch ---
commit ff7bfd9a32d672f8582ea334ee351af8c32229ad
Author: Jindrich Novy <jnovy at redhat.com>
Date:   Mon Sep 1 14:35:34 2008 +0200

    Create directory structure for rpmbuild prior to build if it doesn't exist
    - creates all needed directories that rpmbuild uses for input and output

diff --git a/build.c b/build.c
index faa09c5..83aaf20 100644
--- a/build.c
+++ b/build.c
@@ -16,6 +16,7 @@
 #include <rpm/rpmts.h>
 #include <rpm/rpmfileutil.h>
 #include <rpm/rpmlog.h>
+#include <lib/misc.h>
 
 #include "build.h"
 #include "debug.h"
@@ -253,6 +254,28 @@ static int buildForTarget(rpmts ts, const char * arg, BTA_t ba)
 	goto exit;
     }
 
+    /* Be sure all required directories exist, attempt to create them if not */
+    {
+	char *_topdir = rpmGenPath(rpmtsRootDir(ts), "%{_topdir}", ""),
+	     *_builddir = rpmGenPath(rpmtsRootDir(ts), "%{_builddir}", ""),
+	     *_buildrootdir = rpmGenPath(rpmtsRootDir(ts), "%{_buildrootdir}", ""),
+	     *_sourcedir = rpmGenPath(rpmtsRootDir(ts), "%{_sourcedir}", ""),
+	     *_rpmdir = rpmGenPath(rpmtsRootDir(ts), "%{_rpmdir}", ""),
+	     *_specdir = rpmGenPath(rpmtsRootDir(ts), "%{_specdir}", ""),
+	     *_srcrpmdir = rpmGenPath(rpmtsRootDir(ts), "%{_srcrpmdir}", "");
+
+	if ( rpmMkdirPath(_topdir, "_topdir") ||
+	     rpmMkdirPath(_builddir, "_builddir") ||
+	     rpmMkdirPath(_buildrootdir, "_buildrootdir") ||
+	     rpmMkdirPath(_sourcedir, "_sourcedir") ||
+	     rpmMkdirPath(_rpmdir, "_rpmdir") ||
+	     rpmMkdirPath(_specdir, "_specdir") ||
+	     rpmMkdirPath(_srcrpmdir, "_srcrpmdir")
+	) {
+	    goto exit;
+	}
+    }
+
     if (buildSpec(ts, spec, buildAmount, ba->noBuild)) {
 	goto exit;
     }

rpm-4.5.90-topdir.patch:

--- NEW FILE rpm-4.5.90-topdir.patch ---
commit b16df5b3089e36cf0bd697177983dcae11b849ec
Author: Jindrich Novy <jnovy at redhat.com>
Date:   Mon Sep 1 14:31:33 2008 +0200

    Create _topdir if it doesn't exist when installing SRPM
    - otherwise creating _sourcedir and _specdir fails

diff --git a/lib/psm.c b/lib/psm.c
index d4bea69..046964b 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -231,6 +231,7 @@ rpmRC rpmInstallSourcePackage(rpmts ts, FD_t fd,
 {
     int scareMem = 1;
     rpmfi fi = NULL;
+    char * _topdir = NULL;
     char * _sourcedir = NULL;
     char * _specdir = NULL;
     char * specFile = NULL;
@@ -335,6 +336,13 @@ rpmRC rpmInstallSourcePackage(rpmts ts, FD_t fd,
 	}
     }
 
+    _topdir = rpmGenPath(rpmtsRootDir(ts), "%{_topdir}", "");
+    rpmrc = rpmMkdirPath(_topdir, "_topdir");
+    if (rpmrc) {
+	rpmrc = RPMRC_FAIL;
+	goto exit;
+    }
+
     _sourcedir = rpmGenPath(rpmtsRootDir(ts), "%{_sourcedir}", "");
     rpmrc = rpmMkdirPath(_sourcedir, "_sourcedir");
     if (rpmrc) {


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- rpm.spec	6 Sep 2008 13:36:14 -0000	1.294
+++ rpm.spec	11 Sep 2008 06:16:20 -0000	1.295
@@ -18,7 +18,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.5
+Release: 0.%{snapver}.6
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -37,6 +37,9 @@
 Patch202: rpm-4.5.90-segfault.patch
 Patch203: rpm-4.5.90-macrofix.patch
 Patch204: rpm-4.5.90-patches.patch
+Patch205: rpm-4.5.90-topdir.patch
+Patch206: rpm-4.5.90-rpmbuild-dirs.patch
+Patch207: rpm-4.5.90-cpio-hardlink.patch
 
 # These are not yet upstream
 Patch300: rpm-4.5.90-posttrans.patch
@@ -172,6 +175,9 @@
 %patch202 -p1 -b .segfault
 %patch203 -p1 -b .macrofix
 %patch204 -p1 -b .patches
+%patch205 -p1 -b .topdir
+%patch206 -p1 -b .rpmbuild-dirs
+%patch207 -p1 -b .cpio-hardlink
 
 # needs a bit of upstream love first...
 #%patch300 -p1 -b .posttrans
@@ -350,6 +356,12 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Sep 11 2008 Jindrich Novy <jnovy at redhat.com>
+- create directory structure for rpmbuild prior to build if it doesn't exist (#455387)
+- create _topdir if it doesn't exist when installing SRPM
+- don't generate broken cpio in case of hardlink pointing on softlink,
+  thanks to pixel at mandriva.com
+
 * Sat Sep 06 2008 Jindrich Novy <jnovy at redhat.com>
 - fail hard if patch isn't found (#461347)
 



From cebbert at fedoraproject.org  Thu Sep 11 06:49:44 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 11 Sep 2008 06:49:44 +0000 (UTC)
Subject: rpms/kernel/F-9
	linux-2.6-libata-pata_marvell-play-nice-with-ahci.patch, NONE,
	1.1 kernel.spec, 1.760, 1.761
Message-ID: <20080911064944.15A2D70131@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6836

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-libata-pata_marvell-play-nice-with-ahci.patch 
Log Message:
Don't use ahci driver for marvell controllers. (#455833)

linux-2.6-libata-pata_marvell-play-nice-with-ahci.patch:

--- NEW FILE linux-2.6-libata-pata_marvell-play-nice-with-ahci.patch ---
pata_marvell: Undo the regressions Jeff caused

From: Alan Cox <alan at redhat.com>

I've been chasing Jeff about this for months so am now giving up and sending
it directly. Jeff added the Marvell device identifiers to the ahci driver
without making the AHCI driver handle the PATA port. This means a lot of users
can't use current kernels and in most distro cases can't even install. This has
been going on since March 2008 for the 6121 Marvell, and late 2007 for the 6145.

This was all pointed out at the time and repeatedly ignored. Bugs assigned
to Jeff about this are ignored also.

To quote Jeff in email

"Just switch the order of 'ahci' and 'pata_marvell' in
/etc/modprobe.conf, then use Fedora's tools regenerate the initrd.

See?  It's not rocket science, and the current configuration can be
easily made to work for Fedora users."

(Which isn't trivial, isn't end user, shouldn't be needed, and as it usually
breaks at install time is in fact impossible)

To quote Jeff in August 2007

"   mv-ahci-pata
Marvell 6121/6141 PATA support.  Needs fixing in the 'PATA controller
command' area before it is usable, and can go upstream."

Only he applied it all anyway later and broke everything.

The actual fix for the moment is very simple. If the user has included
the pata_marvell driver let it drive the ports. If they've only selected
for SATA support give them the AHCI driver which will run the port a fraction
faster.


Signed-off-by: Alan Cox <alan at redhat.com>

Index: linux-2.6.26.noarch/drivers/ata/Kconfig
===================================================================
--- linux-2.6.26.noarch.orig/drivers/ata/Kconfig
+++ linux-2.6.26.noarch/drivers/ata/Kconfig
@@ -448,8 +448,10 @@ config PATA_MARVELL
 	tristate "Marvell PATA support via legacy mode"
 	depends on PCI
 	help
-	  This option enables limited support for the Marvell 88SE6145 ATA
-	  controller.
+	  This option enables limited support for the Marvell 88SE61xx ATA
+	  controllers. If you wish to use only the SATA ports then select
+	  the AHCI driver alone. If you wish to the use the PATA port or
+	  both SATA and PATA include this driver.
 
 	  If unsure, say N.
 
Index: linux-2.6.26.noarch/drivers/ata/ahci.c
===================================================================
--- linux-2.6.26.noarch.orig/drivers/ata/ahci.c
+++ linux-2.6.26.noarch/drivers/ata/ahci.c
@@ -538,9 +538,14 @@ static const struct pci_device_id ahci_p
 	{ PCI_VDEVICE(SI, 0x1185), board_ahci_nopmp },		/* SiS 968 */
 	{ PCI_VDEVICE(SI, 0x0186), board_ahci_nopmp },		/* SiS 968 */
 
+#if  !defined(CONFIG_PATA_MARVELL) && !defined(CONFIG_PATA_MARVELL_MODULE)
 	/* Marvell */
+	/* The AHCI driver can only drive the SATA ports, the PATA driver
+	   can drive them all so if both drivers are selected make sure
+	   AHCI stays out of the way */
 	{ PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv },	/* 6145 */
 	{ PCI_VDEVICE(MARVELL, 0x6121), board_ahci_mv },	/* 6121 */
+#endif
 
 	/* Generic, PCI class code for AHCI */
 	{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.760
retrieving revision 1.761
diff -u -r1.760 -r1.761
--- kernel.spec	10 Sep 2008 16:41:38 -0000	1.760
+++ kernel.spec	11 Sep 2008 06:49:13 -0000	1.761
@@ -635,6 +635,7 @@
 Patch670: linux-2.6-ata-quirk.patch
 Patch671: linux-2.6-libata-pata_it821x-driver-updates-and-reworking.patch
 Patch674: linux-2.6-sata-eeepc-faster.patch
+Patch675: linux-2.6-libata-pata_marvell-play-nice-with-ahci.patch
 
 Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
@@ -1184,6 +1185,8 @@
 ApplyPatch linux-2.6-libata-pata_it821x-driver-updates-and-reworking.patch
 # Make Eee disk faster.
 ApplyPatch linux-2.6-sata-eeepc-faster.patch
+# don't use ahci for pata_marvell adapters
+ApplyPatch linux-2.6-libata-pata_marvell-play-nice-with-ahci.patch
 
 # wireless patches headed for 2.6.26
 #ApplyPatch linux-2.6-wireless.patch
@@ -1836,6 +1839,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Thu Sep 11 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-34
+- Don't use ahci driver for marvell controllers. (#455833)
+
 * Wed Sep 10 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-33
 - Add support for 82567LM-4 to the e1000e driver (#461438)
 



From cebbert at fedoraproject.org  Thu Sep 11 06:53:35 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 11 Sep 2008 06:53:35 +0000 (UTC)
Subject: rpms/kernel/F-8
	linux-2.6-libata-pata_marvell-play-nice-with-ahci.patch, NONE,
	1.1 kernel.spec, 1.528, 1.529
Message-ID: <20080911065335.1ACE370131@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8069

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-libata-pata_marvell-play-nice-with-ahci.patch 
Log Message:
Don't use ahci driver for marvell controllers. (F9#455833)

linux-2.6-libata-pata_marvell-play-nice-with-ahci.patch:

--- NEW FILE linux-2.6-libata-pata_marvell-play-nice-with-ahci.patch ---
pata_marvell: Undo the regressions Jeff caused

From: Alan Cox <alan at redhat.com>

I've been chasing Jeff about this for months so am now giving up and sending
it directly. Jeff added the Marvell device identifiers to the ahci driver
without making the AHCI driver handle the PATA port. This means a lot of users
can't use current kernels and in most distro cases can't even install. This has
been going on since March 2008 for the 6121 Marvell, and late 2007 for the 6145.

This was all pointed out at the time and repeatedly ignored. Bugs assigned
to Jeff about this are ignored also.

To quote Jeff in email

"Just switch the order of 'ahci' and 'pata_marvell' in
/etc/modprobe.conf, then use Fedora's tools regenerate the initrd.

See?  It's not rocket science, and the current configuration can be
easily made to work for Fedora users."

(Which isn't trivial, isn't end user, shouldn't be needed, and as it usually
breaks at install time is in fact impossible)

To quote Jeff in August 2007

"   mv-ahci-pata
Marvell 6121/6141 PATA support.  Needs fixing in the 'PATA controller
command' area before it is usable, and can go upstream."

Only he applied it all anyway later and broke everything.

The actual fix for the moment is very simple. If the user has included
the pata_marvell driver let it drive the ports. If they've only selected
for SATA support give them the AHCI driver which will run the port a fraction
faster.


Signed-off-by: Alan Cox <alan at redhat.com>

Index: linux-2.6.26.noarch/drivers/ata/Kconfig
===================================================================
--- linux-2.6.26.noarch.orig/drivers/ata/Kconfig
+++ linux-2.6.26.noarch/drivers/ata/Kconfig
@@ -448,8 +448,10 @@ config PATA_MARVELL
 	tristate "Marvell PATA support via legacy mode"
 	depends on PCI
 	help
-	  This option enables limited support for the Marvell 88SE6145 ATA
-	  controller.
+	  This option enables limited support for the Marvell 88SE61xx ATA
+	  controllers. If you wish to use only the SATA ports then select
+	  the AHCI driver alone. If you wish to the use the PATA port or
+	  both SATA and PATA include this driver.
 
 	  If unsure, say N.
 
Index: linux-2.6.26.noarch/drivers/ata/ahci.c
===================================================================
--- linux-2.6.26.noarch.orig/drivers/ata/ahci.c
+++ linux-2.6.26.noarch/drivers/ata/ahci.c
@@ -538,9 +538,14 @@ static const struct pci_device_id ahci_p
 	{ PCI_VDEVICE(SI, 0x1185), board_ahci_nopmp },		/* SiS 968 */
 	{ PCI_VDEVICE(SI, 0x0186), board_ahci_nopmp },		/* SiS 968 */
 
+#if  !defined(CONFIG_PATA_MARVELL) && !defined(CONFIG_PATA_MARVELL_MODULE)
 	/* Marvell */
+	/* The AHCI driver can only drive the SATA ports, the PATA driver
+	   can drive them all so if both drivers are selected make sure
+	   AHCI stays out of the way */
 	{ PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv },	/* 6145 */
 	{ PCI_VDEVICE(MARVELL, 0x6121), board_ahci_mv },	/* 6121 */
+#endif
 
 	/* Generic, PCI class code for AHCI */
 	{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.528
retrieving revision 1.529
diff -u -r1.528 -r1.529
--- kernel.spec	10 Sep 2008 16:52:20 -0000	1.528
+++ kernel.spec	11 Sep 2008 06:53:04 -0000	1.529
@@ -641,6 +641,7 @@
 
 Patch670: linux-2.6-ata-quirk.patch
 Patch674: linux-2.6-sata-eeepc-faster.patch
+Patch675: linux-2.6-libata-pata_marvell-play-nice-with-ahci.patch
 
 Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
@@ -1151,6 +1152,8 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 # eepc short cable quirk
 ApplyPatch linux-2.6-sata-eeepc-faster.patch
+# don't use ahci for pata_marvell adapters
+ApplyPatch linux-2.6-libata-pata_marvell-play-nice-with-ahci.patch
 
 # wireless
 #
@@ -1826,6 +1829,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-19
+- Don't use ahci driver for marvell controllers. (F9#455833)
+
 * Wed Sep 10 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-18
 - Add support for 82567LM-4 to the e1000e driver (F9#461438)
 



From lmacken at fedoraproject.org  Thu Sep 11 07:14:09 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 07:14:09 +0000 (UTC)
Subject: rpms/python-peak-rules/devel import.log, NONE,
	1.1 python-peak-rules-setup.patch, NONE,
	1.1 python-peak-rules.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911071409.9967170131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-rules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15195/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-rules-setup.patch 
	python-peak-rules.spec 
Log Message:
Initial import of python-peak-rules


--- NEW FILE import.log ---
python-peak-rules-0_5a1_dev-0_2569_fc9:HEAD:python-peak-rules-0.5a1.dev-0.2569.fc9.src.rpm:1221117193

python-peak-rules-setup.patch:

--- NEW FILE python-peak-rules-setup.patch ---
--- setup.py.orig	2008-08-12 15:48:38.000000000 -0400
+++ setup.py	2008-08-12 15:49:18.000000000 -0400
@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 """Distutils setup file"""
-import ez_setup
-ez_setup.use_setuptools()
 from setuptools import setup
 PACKAGE_NAME = "PEAK-Rules"
 PACKAGE_VERSION = "0.5a1"


--- NEW FILE python-peak-rules.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename PEAK-Rules
%define devrev  2569

%define docs README.txt AST-Builder.txt Code-Generation.txt Criteria.txt DESIGN.txt Indexing.txt Predicates.txt Syntax-Matching.txt

Name:           python-peak-rules
Version:        0.5a1.dev
Release:        0.%{devrev}%{?dist}
Summary:        Generic functions and business rules support systems

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/PEAK-Rules
Source0:        http://peak.telecommunity.com/snapshots/%{packagename}-%{version}-r%{devrev}.tar.gz
Patch0:         %{name}-setup.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

Requires:       python-peak-util-assembler >= 0.3
Requires:       python-peak-util-addons >= 0.6
Requires:       python-peak-util-extremes >= 1.1
Requires:       python-decoratortools >= 1.7

%description
SymbolType gives you access to the peak.util.symbols module, previously
available only by installing the full PEAK toolkit. peak.util.symbols provides
a Symbol type and two built-in symbols that are used by PEAK: NOT_FOUND and
NOT_GIVEN.

%prep
%setup -q -n %{packagename}-%{version}-r%{devrev}
%patch0 -b .setup
%{__chmod} -x %{docs}

%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 %{docs}
%{python_sitelib}/*

%changelog
* Sun Aug  3 2008 Luke Macken <lmacken at redhat.com> - 0.5a1.dev-0.2569
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-rules/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2008 23:43:35 -0000	1.1
+++ .cvsignore	11 Sep 2008 07:13:39 -0000	1.2
@@ -0,0 +1 @@
+PEAK-Rules-0.5a1.dev-r2569.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-rules/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2008 23:43:35 -0000	1.1
+++ sources	11 Sep 2008 07:13:39 -0000	1.2
@@ -0,0 +1 @@
+77ce21fd7c452630bb035d93e2ebb8ed  PEAK-Rules-0.5a1.dev-r2569.tar.gz



From lmacken at fedoraproject.org  Thu Sep 11 07:15:21 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 07:15:21 +0000 (UTC)
Subject: rpms/python-peak-util-symbols/devel import.log, NONE,
	1.1 python-peak-util-symbols.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911071521.3183070131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-symbols/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15845/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-symbols.spec 
Log Message:
Initial import of python-peak-util-symbols


--- NEW FILE import.log ---
python-peak-util-symbols-1_0-1_fc9:HEAD:python-peak-util-symbols-1.0-1.fc9.src.rpm:1221117275


--- NEW FILE python-peak-util-symbols.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename SymbolType

Name:           python-peak-util-symbols
Version:        1.0
Release:        1%{?dist}
Summary:        Simple "symbol" type, useful for enumerations or sentinels

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://peak.telecommunity.com/DevCenter/%{packagename}
Source0:        http://pypi.python.org/packages/source/S/%{packagename}/%{packagename}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  python-nose

%description
SymbolType gives you access to the peak.util.symbols module, previously
available only by installing the full PEAK toolkit. peak.util.symbols provides
a Symbol type and two built-in symbols that are used by PEAK: NOT_FOUND and
NOT_GIVEN.

%prep
%setup -q -n %{packagename}-%{version}

%build
%{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}

%check
nosetests

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README.txt
%{python_sitelib}/*

%changelog
* Sun Aug  3 2008 Luke Macken <lmacken at redhat.com> - 1.0-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-symbols/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:29:23 -0000	1.1
+++ .cvsignore	11 Sep 2008 07:14:50 -0000	1.2
@@ -0,0 +1 @@
+SymbolType-1.0.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-symbols/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:29:23 -0000	1.1
+++ sources	11 Sep 2008 07:14:50 -0000	1.2
@@ -0,0 +1 @@
+4b9155cc908b249f029a518b8de09368  SymbolType-1.0.zip



From lmacken at fedoraproject.org  Thu Sep 11 07:16:58 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 07:16:58 +0000 (UTC)
Subject: rpms/python-peak-util-extremes/devel import.log, NONE,
	1.1 python-peak-util-extremes-setup.patch, NONE,
	1.1 python-peak-util-extremes.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911071658.E244270131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-extremes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16644/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-extremes-setup.patch 
	python-peak-util-extremes.spec 
Log Message:
Initial import of python-peak-util-extremes


--- NEW FILE import.log ---
python-peak-util-extremes-1_1-1_fc9:HEAD:python-peak-util-extremes-1.1-1.fc9.src.rpm:1221117349

python-peak-util-extremes-setup.patch:

--- NEW FILE python-peak-util-extremes-setup.patch ---
--- setup.py.orig	2008-08-12 15:37:45.000000000 -0400
+++ setup.py	2008-08-12 15:37:54.000000000 -0400
@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 """Distutils setup file"""
 
-import ez_setup
-ez_setup.use_setuptools()
 from setuptools import setup
 
 # Metadata


--- NEW FILE python-peak-util-extremes.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename Extremes

Name:           python-peak-util-extremes
Version:        1.1
Release:        1%{?dist}
Summary:        Production-quality 'Min' and 'Max' objects

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/Extremes
Source0:        http://pypi.python.org/packages/source/E/%{packagename}/%{packagename}-%{version}.zip
Patch0:         %{name}-setup.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

%description 
The peak.util.extremes module provides a production-quality implementation of
the Min and Max objects from PEP 326.  While PEP 326 was rejected for inclusion
in the language or standard library, the objects described in it are useful in
a variety of applications.  In PEAK, they have been used to implement generic
functions (in RuleDispatch and PEAK-Rules), as well as to handle scheduling and
time operations in the Trellis.  Because this has led to each project copying
the same code, we've now split the module out so it can be used independently.

%prep
%setup -q -n %{packagename}-%{version}
%patch0 -b .setup

%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 README.txt
%{python_sitelib}/*

%changelog
* Sun Aug 12 2008 Luke Macken <lmacken at redhat.com> - 1.1-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-extremes/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:53:46 -0000	1.1
+++ .cvsignore	11 Sep 2008 07:16:28 -0000	1.2
@@ -0,0 +1 @@
+Extremes-1.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-extremes/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:53:46 -0000	1.1
+++ sources	11 Sep 2008 07:16:28 -0000	1.2
@@ -0,0 +1 @@
+34fc2c114b09e2cc331482d6cc4e4399  Extremes-1.1.zip



From lmacken at fedoraproject.org  Thu Sep 11 07:18:47 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 07:18:47 +0000 (UTC)
Subject: rpms/python-peak-util-assembler/devel import.log, NONE,
	1.1 python-peak-util-assembler.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911071847.E989D70131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-assembler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17442/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-assembler.spec 
Log Message:
Initial import of python-peak-util-assembler


--- NEW FILE import.log ---
python-peak-util-assembler-0_5-1_fc9:HEAD:python-peak-util-assembler-0.5-1.fc9.src.rpm:1221117444


--- NEW FILE python-peak-util-assembler.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename BytecodeAssembler

Name:           python-peak-util-assembler
Version:        0.5
Release:        1%{?dist}
Summary:        Generate Python code objects by "assembling" bytecode

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/BytecodeAssembler
Source0:        http://pypi.python.org/packages/source/B/%{packagename}/%{packagename}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  python-nose

Requires:       python-decoratortools >= 1.2
Requires:       python-peak-util-symbols >= 1.0

%description
peak.util.assembler is a simple bytecode assembler module that handles most
low-level bytecode generation details like jump offsets, stack size tracking,
line number table generation, constant and variable name index tracking, etc.
That way, you can focus your attention on the desired semantics of your
bytecode instead of on these mechanical issues.

In addition to a low-level opcode-oriented API for directly generating specific
Python bytecodes, this module also offers an extensible mini-AST framework for
generating code from high-level specifications.  This framework does most of
the work needed to transform tree-like structures into linear bytecode
instructions, and includes the ability to do compile-time constant folding.

%prep
%setup -q -n %{packagename}-%{version}

%build
%{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}

%check
nosetests

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README.txt
%{python_sitelib}/*

%changelog
* Sun Aug  3 2008 Luke Macken <lmacken at redhat.com> - 0.5-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-assembler/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:57:31 -0000	1.1
+++ .cvsignore	11 Sep 2008 07:18:17 -0000	1.2
@@ -0,0 +1 @@
+BytecodeAssembler-0.5.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-assembler/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:57:31 -0000	1.1
+++ sources	11 Sep 2008 07:18:17 -0000	1.2
@@ -0,0 +1 @@
+94645cdd4b97ed94b946ff66c0f7bbf0  BytecodeAssembler-0.5.zip



From pkgdb at fedoraproject.org  Thu Sep 11 07:19:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 07:19:52 +0000
Subject: [pkgdb] alsa-lib ownership updated
Message-ID: <20080911071952.390F7208D97@bastion.fedora.phx.redhat.com>

Package alsa-lib in Fedora 1 was orphaned by stransky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Thu Sep 11 07:21:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 07:21:10 +0000
Subject: [pkgdb] alsa-lib ownership updated
Message-ID: <20080911072110.2C055208D97@bastion.fedora.phx.redhat.com>

Package alsa-lib in Fedora 7 was orphaned by stransky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From lmacken at fedoraproject.org  Thu Sep 11 07:21:10 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 07:21:10 +0000 (UTC)
Subject: rpms/python-peak-util-addons/devel import.log, NONE,
	1.1 python-peak-util-addons.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911072110.D2BDC70131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18445/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-addons.spec 
Log Message:
Initial import of python-peak-util-addons


--- NEW FILE import.log ---
python-peak-util-addons-0_6-1_fc9:HEAD:python-peak-util-addons-0.6-1.fc9.src.rpm:1221117553


--- NEW FILE python-peak-util-addons.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename AddOns

Name:           python-peak-util-addons
Version:        0.6
Release:        1%{?dist}
Summary:        Dynamically extend other objects with AddOns

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/AddOns
Source0:        http://pypi.python.org/packages/source/A/%{packagename}/%{packagename}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

Requires:       python-decoratortools >= 1.5

%description
In any sufficiently-sized application or framework, it's common to end up
lumping a lot of different concerns into the same class.  For example, you may
have business logic, persistence code, and UI all jammed into a single class.
Attribute and method names for all sorts of different operations get shoved
into a single namespace -- even when using mixin classes.

Separating concerns into different objects, however, makes it easier to write
reusable and separately-testable components.  The AddOns package
(``peak.util.addons``) lets you manage concerns using ``AddOn`` classes.

%prep
%setup -q -n %{packagename}-%{version}

%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 README.txt
%{python_sitelib}/*

%changelog
* Sun Aug 12 2008 Luke Macken <lmacken at redhat.com> - 0.6-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-addons/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 05:00:48 -0000	1.1
+++ .cvsignore	11 Sep 2008 07:20:40 -0000	1.2
@@ -0,0 +1 @@
+AddOns-0.6.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-addons/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 05:00:48 -0000	1.1
+++ sources	11 Sep 2008 07:20:40 -0000	1.2
@@ -0,0 +1 @@
+cce3b98e30aeee7e918649a18ba8f8b7  AddOns-0.6.zip



From pkgdb at fedoraproject.org  Thu Sep 11 07:21:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 07:21:28 +0000
Subject: [pkgdb] alsa-lib ownership updated
Message-ID: <20080911072128.4EBD6208D97@bastion.fedora.phx.redhat.com>

Package alsa-lib in Fedora 7 is now owned by stransky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From ssp at fedoraproject.org  Thu Sep 11 07:58:10 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu, 11 Sep 2008 07:58:10 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel
	gnome-settings-daemon-2.23.91-fnf7-cycle.patch, 1.2,
	1.3 gnome-settings-daemon.spec, 1.54, 1.55
Message-ID: <20080911075810.4375B70131@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30816

Modified Files:
	gnome-settings-daemon-2.23.91-fnf7-cycle.patch 
	gnome-settings-daemon.spec 
Log Message:
Fix various bugs in the fn-f7 support

gnome-settings-daemon-2.23.91-fnf7-cycle.patch:

Index: gnome-settings-daemon-2.23.91-fnf7-cycle.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon-2.23.91-fnf7-cycle.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-settings-daemon-2.23.91-fnf7-cycle.patch	4 Sep 2008 19:36:21 -0000	1.2
+++ gnome-settings-daemon-2.23.91-fnf7-cycle.patch	11 Sep 2008 07:57:39 -0000	1.3
@@ -1,5 +1,5 @@
 diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
-index 4d8ce2f..b80e55d 100644
+index 4d8ce2f..4057962 100644
 --- a/plugins/xrandr/gsd-xrandr-manager.c
 +++ b/plugins/xrandr/gsd-xrandr-manager.c
 @@ -82,6 +82,10 @@ struct GsdXrandrManagerPrivate
@@ -13,7 +13,7 @@
  };
  
  static void     gsd_xrandr_manager_class_init  (GsdXrandrManagerClass *klass);
-@@ -127,6 +131,418 @@ on_client_message (GdkXEvent  *xevent,
+@@ -127,6 +131,421 @@ on_client_message (GdkXEvent  *xevent,
          return GDK_FILTER_CONTINUE;
  }
  
@@ -136,6 +136,7 @@
 +                                info->width = width;
 +                                info->height = height;
 +                                info->rate = best_rate;
++                                info->rotation = GNOME_RR_ROTATION_0;
 +                                info->x = 0;
 +                                info->y = 0;
 +                        }
@@ -219,10 +220,8 @@
 +                GnomeOutputInfo *info = result->outputs[i];
 +
 +                if (is_laptop (info)) {
-+                        if (!info->on) {
-+                                if (turn_on (screen, info, x, 0)) {
-+                                        x += info->width;
-+                                }
++                        if (info->on || turn_on (screen, info, x, 0)) {
++                                x += info->width;
 +                        }
 +                }
 +        }
@@ -231,10 +230,8 @@
 +                GnomeOutputInfo *info = result->outputs[i];
 +
 +                if (info->connected && !is_laptop (info)) {
-+                        if (!info->on) {
-+                                if (turn_on (screen, info, x, 0)) {
-+                                        x += info->width;
-+                                }
++                        if (info->on || turn_on (screen, info, x, 0)) {
++                                x += info->width;
 +                        }
 +                }
 +        }
@@ -403,8 +400,14 @@
 +
 +        current = gnome_rr_config_new_current (screen);
 +        
-+        if (priv->fn_f7_configs && !gnome_rr_config_match (current, priv->fn_f7_configs[0]))
-+                generate_fn_f7_configs (mgr);
++        if (priv->fn_f7_configs && 
++            (!gnome_rr_config_match (current, priv->fn_f7_configs[0]) ||
++             !gnome_rr_config_equal (current, priv->fn_f7_configs[mgr->priv->current_fn_f7_config]))) {
++                    /* Our view of the world is incorrect, so regenerate the
++                     * configurations
++                     */
++                    generate_fn_f7_configs (mgr);
++            }
 +
 +        gnome_rr_config_free (current);
 +        
@@ -432,7 +435,7 @@
  static GdkFilterReturn
  event_filter (GdkXEvent           *xevent,
                GdkEvent            *event,
-@@ -142,12 +558,9 @@ event_filter (GdkXEvent           *xevent,
+@@ -142,12 +561,9 @@ event_filter (GdkXEvent           *xevent,
          if (xev->xany.type != KeyPress && xev->xany.type != KeyRelease)
                  return GDK_FILTER_CONTINUE;
  
@@ -448,7 +451,7 @@
                  return GDK_FILTER_CONTINUE;
          }
  
-@@ -869,6 +1282,9 @@ gsd_xrandr_manager_init (GsdXrandrManager *manager)
+@@ -869,6 +1285,9 @@ gsd_xrandr_manager_init (GsdXrandrManager *manager)
          manager->priv = GSD_XRANDR_MANAGER_GET_PRIVATE (manager);
  
          manager->priv->keycode = keycode;


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gnome-settings-daemon.spec	8 Sep 2008 16:34:05 -0000	1.54
+++ gnome-settings-daemon.spec	11 Sep 2008 07:57:39 -0000	1.55
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.23.92
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -155,6 +155,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> - 2.23.91-5
+- Fix various bugs in the fn-F7 support
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 



From lmacken at fedoraproject.org  Thu Sep 11 08:07:51 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:07:51 +0000 (UTC)
Subject: rpms/python-peak-util-symbols/F-9 import.log, NONE,
	1.1 python-peak-util-symbols.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911080751.A673170131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-symbols/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1521/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-symbols.spec 
Log Message:
Initial import of python-peak-util-symbols


--- NEW FILE import.log ---
python-peak-util-symbols-1_0-1_fc9:F-9:python-peak-util-symbols-1.0-1.fc9.src.rpm:1221120431


--- NEW FILE python-peak-util-symbols.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename SymbolType

Name:           python-peak-util-symbols
Version:        1.0
Release:        1%{?dist}
Summary:        Simple "symbol" type, useful for enumerations or sentinels

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://peak.telecommunity.com/DevCenter/%{packagename}
Source0:        http://pypi.python.org/packages/source/S/%{packagename}/%{packagename}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  python-nose

%description
SymbolType gives you access to the peak.util.symbols module, previously
available only by installing the full PEAK toolkit. peak.util.symbols provides
a Symbol type and two built-in symbols that are used by PEAK: NOT_FOUND and
NOT_GIVEN.

%prep
%setup -q -n %{packagename}-%{version}

%build
%{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}

%check
nosetests

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README.txt
%{python_sitelib}/*

%changelog
* Sun Aug  3 2008 Luke Macken <lmacken at redhat.com> - 1.0-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-symbols/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:29:23 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:07:21 -0000	1.2
@@ -0,0 +1 @@
+SymbolType-1.0.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-symbols/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:29:23 -0000	1.1
+++ sources	11 Sep 2008 08:07:21 -0000	1.2
@@ -0,0 +1 @@
+4b9155cc908b249f029a518b8de09368  SymbolType-1.0.zip



From lmacken at fedoraproject.org  Thu Sep 11 08:11:26 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:11:26 +0000 (UTC)
Subject: rpms/python-peak-util-symbols/F-8 import.log, NONE,
	1.1 python-peak-util-symbols.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911081126.09DA070131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-symbols/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2967/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-symbols.spec 
Log Message:
Initial import of python-peak-util-symbols


--- NEW FILE import.log ---
python-peak-util-symbols-1_0-1_fc9:F-8:python-peak-util-symbols-1.0-1.fc9.src.rpm:1221120647


--- NEW FILE python-peak-util-symbols.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename SymbolType

Name:           python-peak-util-symbols
Version:        1.0
Release:        1%{?dist}
Summary:        Simple "symbol" type, useful for enumerations or sentinels

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://peak.telecommunity.com/DevCenter/%{packagename}
Source0:        http://pypi.python.org/packages/source/S/%{packagename}/%{packagename}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  python-nose

%description
SymbolType gives you access to the peak.util.symbols module, previously
available only by installing the full PEAK toolkit. peak.util.symbols provides
a Symbol type and two built-in symbols that are used by PEAK: NOT_FOUND and
NOT_GIVEN.

%prep
%setup -q -n %{packagename}-%{version}

%build
%{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}

%check
nosetests

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README.txt
%{python_sitelib}/*

%changelog
* Sun Aug  3 2008 Luke Macken <lmacken at redhat.com> - 1.0-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-symbols/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:29:23 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:10:55 -0000	1.2
@@ -0,0 +1 @@
+SymbolType-1.0.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-symbols/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:29:23 -0000	1.1
+++ sources	11 Sep 2008 08:10:55 -0000	1.2
@@ -0,0 +1 @@
+4b9155cc908b249f029a518b8de09368  SymbolType-1.0.zip



From pkgdb at fedoraproject.org  Thu Sep 11 08:13:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 08:13:53 +0000
Subject: [pkgdb] perl-Schedule-Cron-Events was added for msuchy
Message-ID: <20080911081353.F1408208D98@bastion.fedora.phx.redhat.com>

huzaifas has added Package perl-Schedule-Cron-Events with summary Take a line from crontab and find out when events will occur
huzaifas has approved Package perl-Schedule-Cron-Events
huzaifas has added a Fedora devel branch for perl-Schedule-Cron-Events with an owner of msuchy
huzaifas has approved perl-Schedule-Cron-Events in Fedora devel
huzaifas has approved Package perl-Schedule-Cron-Events
huzaifas has set commit to Approved for packager on perl-Schedule-Cron-Events (Fedora devel)
huzaifas has set build to Approved for packager on perl-Schedule-Cron-Events (Fedora devel)
huzaifas has set checkout to Approved for packager on perl-Schedule-Cron-Events (Fedora devel)
huzaifas has set commit to Approved for uberpackager on perl-Schedule-Cron-Events (Fedora devel)
huzaifas has set build to Approved for uberpackager on perl-Schedule-Cron-Events (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on perl-Schedule-Cron-Events (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Schedule-Cron-Events



From pkgdb at fedoraproject.org  Thu Sep 11 08:13:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 08:13:54 +0000
Subject: [pkgdb] perl-Schedule-Cron-Events (Fedora EPEL,
	4) updated by huzaifas
Message-ID: <20080911081354.CB17E208D9B@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 4 branch for perl-Schedule-Cron-Events
huzaifas has set commit to Approved for uberpackager on perl-Schedule-Cron-Events (Fedora EPEL 4)
huzaifas has set build to Approved for uberpackager on perl-Schedule-Cron-Events (Fedora EPEL 4)
huzaifas has set checkout to Approved for uberpackager on perl-Schedule-Cron-Events (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Schedule-Cron-Events



From pkgdb at fedoraproject.org  Thu Sep 11 08:13:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 08:13:54 +0000
Subject: [pkgdb] perl-Schedule-Cron-Events (Fedora, 9) updated by huzaifas
Message-ID: <20080911081354.D8429208D9F@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for perl-Schedule-Cron-Events
huzaifas has set commit to Approved for uberpackager on perl-Schedule-Cron-Events (Fedora 9)
huzaifas has set build to Approved for uberpackager on perl-Schedule-Cron-Events (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on perl-Schedule-Cron-Events (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Schedule-Cron-Events



From pkgdb at fedoraproject.org  Thu Sep 11 08:13:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 08:13:54 +0000
Subject: [pkgdb] perl-Schedule-Cron-Events (Fedora EPEL,
	5) updated by huzaifas
Message-ID: <20080911081354.E1C00208DA2@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 5 branch for perl-Schedule-Cron-Events
huzaifas has set commit to Approved for uberpackager on perl-Schedule-Cron-Events (Fedora EPEL 5)
huzaifas has set build to Approved for uberpackager on perl-Schedule-Cron-Events (Fedora EPEL 5)
huzaifas has set checkout to Approved for uberpackager on perl-Schedule-Cron-Events (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Schedule-Cron-Events



From huzaifas at fedoraproject.org  Thu Sep 11 08:14:29 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 08:14:29 +0000 (UTC)
Subject: rpms/perl-Schedule-Cron-Events - New directory
Message-ID: <20080911081429.2C2FD70131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-Schedule-Cron-Events
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvswi4304/rpms/perl-Schedule-Cron-Events

Log Message:
Directory /cvs/extras/rpms/perl-Schedule-Cron-Events added to the repository




From huzaifas at fedoraproject.org  Thu Sep 11 08:14:29 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 08:14:29 +0000 (UTC)
Subject: rpms/perl-Schedule-Cron-Events/devel - New directory
Message-ID: <20080911081429.73CB370131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-Schedule-Cron-Events/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvswi4304/rpms/perl-Schedule-Cron-Events/devel

Log Message:
Directory /cvs/extras/rpms/perl-Schedule-Cron-Events/devel added to the repository




From huzaifas at fedoraproject.org  Thu Sep 11 08:14:30 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 08:14:30 +0000 (UTC)
Subject: rpms/perl-Schedule-Cron-Events/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080911081430.F1C4B70131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-Schedule-Cron-Events/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvswi4304/rpms/perl-Schedule-Cron-Events/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Schedule-Cron-Events


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Schedule-Cron-Events
# $Id: Makefile,v 1.1 2008/09/11 08:14:30 huzaifas Exp $
NAME := perl-Schedule-Cron-Events
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From huzaifas at fedoraproject.org  Thu Sep 11 08:14:30 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 08:14:30 +0000 (UTC)
Subject: rpms/perl-Schedule-Cron-Events Makefile,NONE,1.1
Message-ID: <20080911081430.A6A4970131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-Schedule-Cron-Events
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvswi4304/rpms/perl-Schedule-Cron-Events

Added Files:
	Makefile 
Log Message:
Setup of module perl-Schedule-Cron-Events


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Schedule-Cron-Events
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From lmacken at fedoraproject.org  Thu Sep 11 08:15:15 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:15:15 +0000 (UTC)
Subject: rpms/python-peak-util-symbols/EL-5 import.log, NONE,
	1.1 python-peak-util-symbols.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911081515.C9DD470131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-symbols/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4694/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-symbols.spec 
Log Message:
Initial import of python-peak-util-symbols


--- NEW FILE import.log ---
python-peak-util-symbols-1_0-1_fc9:EL-5:python-peak-util-symbols-1.0-1.fc9.src.rpm:1221120877


--- NEW FILE python-peak-util-symbols.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename SymbolType

Name:           python-peak-util-symbols
Version:        1.0
Release:        1%{?dist}
Summary:        Simple "symbol" type, useful for enumerations or sentinels

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://peak.telecommunity.com/DevCenter/%{packagename}
Source0:        http://pypi.python.org/packages/source/S/%{packagename}/%{packagename}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  python-nose

%description
SymbolType gives you access to the peak.util.symbols module, previously
available only by installing the full PEAK toolkit. peak.util.symbols provides
a Symbol type and two built-in symbols that are used by PEAK: NOT_FOUND and
NOT_GIVEN.

%prep
%setup -q -n %{packagename}-%{version}

%build
%{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}

%check
nosetests

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README.txt
%{python_sitelib}/*

%changelog
* Sun Aug  3 2008 Luke Macken <lmacken at redhat.com> - 1.0-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-symbols/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:29:23 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:14:45 -0000	1.2
@@ -0,0 +1 @@
+SymbolType-1.0.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-symbols/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:29:23 -0000	1.1
+++ sources	11 Sep 2008 08:14:45 -0000	1.2
@@ -0,0 +1 @@
+4b9155cc908b249f029a518b8de09368  SymbolType-1.0.zip



From lmacken at fedoraproject.org  Thu Sep 11 08:16:24 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:16:24 +0000 (UTC)
Subject: rpms/python-peak-util-symbols/EL-4 import.log, NONE,
	1.1 python-peak-util-symbols.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911081624.F2C5070131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-symbols/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5334/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-symbols.spec 
Log Message:
Initial import of python-peak-util-symbols


--- NEW FILE import.log ---
python-peak-util-symbols-1_0-1_fc9:EL-4:python-peak-util-symbols-1.0-1.fc9.src.rpm:1221120946


--- NEW FILE python-peak-util-symbols.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename SymbolType

Name:           python-peak-util-symbols
Version:        1.0
Release:        1%{?dist}
Summary:        Simple "symbol" type, useful for enumerations or sentinels

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://peak.telecommunity.com/DevCenter/%{packagename}
Source0:        http://pypi.python.org/packages/source/S/%{packagename}/%{packagename}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  python-nose

%description
SymbolType gives you access to the peak.util.symbols module, previously
available only by installing the full PEAK toolkit. peak.util.symbols provides
a Symbol type and two built-in symbols that are used by PEAK: NOT_FOUND and
NOT_GIVEN.

%prep
%setup -q -n %{packagename}-%{version}

%build
%{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}

%check
nosetests

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README.txt
%{python_sitelib}/*

%changelog
* Sun Aug  3 2008 Luke Macken <lmacken at redhat.com> - 1.0-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-symbols/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:29:23 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:15:54 -0000	1.2
@@ -0,0 +1 @@
+SymbolType-1.0.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-symbols/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:29:23 -0000	1.1
+++ sources	11 Sep 2008 08:15:54 -0000	1.2
@@ -0,0 +1 @@
+4b9155cc908b249f029a518b8de09368  SymbolType-1.0.zip



From lmacken at fedoraproject.org  Thu Sep 11 08:17:34 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:17:34 +0000 (UTC)
Subject: rpms/python-peak-util-extremes/F-9 import.log, NONE,
	1.1 python-peak-util-extremes-setup.patch, NONE,
	1.1 python-peak-util-extremes.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911081734.D8DE770131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-extremes/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5971/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-extremes-setup.patch 
	python-peak-util-extremes.spec 
Log Message:
Initial import of python-peak-util-extremes


--- NEW FILE import.log ---
python-peak-util-extremes-1_1-1_fc9:F-9:python-peak-util-extremes-1.1-1.fc9.src.rpm:1221121016

python-peak-util-extremes-setup.patch:

--- NEW FILE python-peak-util-extremes-setup.patch ---
--- setup.py.orig	2008-08-12 15:37:45.000000000 -0400
+++ setup.py	2008-08-12 15:37:54.000000000 -0400
@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 """Distutils setup file"""
 
-import ez_setup
-ez_setup.use_setuptools()
 from setuptools import setup
 
 # Metadata


--- NEW FILE python-peak-util-extremes.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename Extremes

Name:           python-peak-util-extremes
Version:        1.1
Release:        1%{?dist}
Summary:        Production-quality 'Min' and 'Max' objects

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/Extremes
Source0:        http://pypi.python.org/packages/source/E/%{packagename}/%{packagename}-%{version}.zip
Patch0:         %{name}-setup.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

%description 
The peak.util.extremes module provides a production-quality implementation of
the Min and Max objects from PEP 326.  While PEP 326 was rejected for inclusion
in the language or standard library, the objects described in it are useful in
a variety of applications.  In PEAK, they have been used to implement generic
functions (in RuleDispatch and PEAK-Rules), as well as to handle scheduling and
time operations in the Trellis.  Because this has led to each project copying
the same code, we've now split the module out so it can be used independently.

%prep
%setup -q -n %{packagename}-%{version}
%patch0 -b .setup

%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 README.txt
%{python_sitelib}/*

%changelog
* Sun Aug 12 2008 Luke Macken <lmacken at redhat.com> - 1.1-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-extremes/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:53:46 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:17:04 -0000	1.2
@@ -0,0 +1 @@
+Extremes-1.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-extremes/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:53:46 -0000	1.1
+++ sources	11 Sep 2008 08:17:04 -0000	1.2
@@ -0,0 +1 @@
+34fc2c114b09e2cc331482d6cc4e4399  Extremes-1.1.zip



From lmacken at fedoraproject.org  Thu Sep 11 08:22:20 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:22:20 +0000 (UTC)
Subject: rpms/python-peak-util-extremes/F-8 import.log, NONE,
	1.1 python-peak-util-extremes-setup.patch, NONE,
	1.1 python-peak-util-extremes.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911082221.05F5670131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-extremes/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7786/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-extremes-setup.patch 
	python-peak-util-extremes.spec 
Log Message:
Initial import of python-peak-util-extremes


--- NEW FILE import.log ---
python-peak-util-extremes-1_1-1_fc9:F-8:python-peak-util-extremes-1.1-1.fc9.src.rpm:1221121302

python-peak-util-extremes-setup.patch:

--- NEW FILE python-peak-util-extremes-setup.patch ---
--- setup.py.orig	2008-08-12 15:37:45.000000000 -0400
+++ setup.py	2008-08-12 15:37:54.000000000 -0400
@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 """Distutils setup file"""
 
-import ez_setup
-ez_setup.use_setuptools()
 from setuptools import setup
 
 # Metadata


--- NEW FILE python-peak-util-extremes.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename Extremes

Name:           python-peak-util-extremes
Version:        1.1
Release:        1%{?dist}
Summary:        Production-quality 'Min' and 'Max' objects

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/Extremes
Source0:        http://pypi.python.org/packages/source/E/%{packagename}/%{packagename}-%{version}.zip
Patch0:         %{name}-setup.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

%description 
The peak.util.extremes module provides a production-quality implementation of
the Min and Max objects from PEP 326.  While PEP 326 was rejected for inclusion
in the language or standard library, the objects described in it are useful in
a variety of applications.  In PEAK, they have been used to implement generic
functions (in RuleDispatch and PEAK-Rules), as well as to handle scheduling and
time operations in the Trellis.  Because this has led to each project copying
the same code, we've now split the module out so it can be used independently.

%prep
%setup -q -n %{packagename}-%{version}
%patch0 -b .setup

%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 README.txt
%{python_sitelib}/*

%changelog
* Sun Aug 12 2008 Luke Macken <lmacken at redhat.com> - 1.1-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-extremes/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:53:46 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:21:50 -0000	1.2
@@ -0,0 +1 @@
+Extremes-1.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-extremes/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:53:46 -0000	1.1
+++ sources	11 Sep 2008 08:21:50 -0000	1.2
@@ -0,0 +1 @@
+34fc2c114b09e2cc331482d6cc4e4399  Extremes-1.1.zip



From lmacken at fedoraproject.org  Thu Sep 11 08:26:56 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:26:56 +0000 (UTC)
Subject: rpms/python-peak-util-extremes/EL-5 import.log, NONE,
	1.1 python-peak-util-extremes-setup.patch, NONE,
	1.1 python-peak-util-extremes.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911082657.0289470131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-extremes/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9651/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-extremes-setup.patch 
	python-peak-util-extremes.spec 
Log Message:
Initial import of python-peak-util-extremes


--- NEW FILE import.log ---
python-peak-util-extremes-1_1-1_fc9:EL-5:python-peak-util-extremes-1.1-1.fc9.src.rpm:1221121578

python-peak-util-extremes-setup.patch:

--- NEW FILE python-peak-util-extremes-setup.patch ---
--- setup.py.orig	2008-08-12 15:37:45.000000000 -0400
+++ setup.py	2008-08-12 15:37:54.000000000 -0400
@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 """Distutils setup file"""
 
-import ez_setup
-ez_setup.use_setuptools()
 from setuptools import setup
 
 # Metadata


--- NEW FILE python-peak-util-extremes.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename Extremes

Name:           python-peak-util-extremes
Version:        1.1
Release:        1%{?dist}
Summary:        Production-quality 'Min' and 'Max' objects

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/Extremes
Source0:        http://pypi.python.org/packages/source/E/%{packagename}/%{packagename}-%{version}.zip
Patch0:         %{name}-setup.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

%description 
The peak.util.extremes module provides a production-quality implementation of
the Min and Max objects from PEP 326.  While PEP 326 was rejected for inclusion
in the language or standard library, the objects described in it are useful in
a variety of applications.  In PEAK, they have been used to implement generic
functions (in RuleDispatch and PEAK-Rules), as well as to handle scheduling and
time operations in the Trellis.  Because this has led to each project copying
the same code, we've now split the module out so it can be used independently.

%prep
%setup -q -n %{packagename}-%{version}
%patch0 -b .setup

%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 README.txt
%{python_sitelib}/*

%changelog
* Sun Aug 12 2008 Luke Macken <lmacken at redhat.com> - 1.1-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-extremes/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:53:46 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:26:26 -0000	1.2
@@ -0,0 +1 @@
+Extremes-1.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-extremes/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:53:46 -0000	1.1
+++ sources	11 Sep 2008 08:26:26 -0000	1.2
@@ -0,0 +1 @@
+34fc2c114b09e2cc331482d6cc4e4399  Extremes-1.1.zip



From perex at fedoraproject.org  Thu Sep 11 08:27:15 2008
From: perex at fedoraproject.org (Jaroslav Kysela)
Date: Thu, 11 Sep 2008 08:27:15 +0000 (UTC)
Subject: rpms/alsa-lib/devel alsa-lib.spec,1.76,1.77 alsactl.conf,1.1,NONE
Message-ID: <20080911082715.72C4C70131@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9783

Modified Files:
	alsa-lib.spec 
Removed Files:
	alsactl.conf 
Log Message:
alsa-lib: move alsactl.conf to alsa-utils package


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- alsa-lib.spec	10 Sep 2008 16:41:33 -0000	1.76
+++ alsa-lib.spec	11 Sep 2008 08:26:45 -0000	1.77
@@ -5,12 +5,11 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
 Version: 1.0.18
-Release: 4%{?prever_dot}%{?dist}
+Release: 5%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
 Source10: asound.conf
-Source11: alsactl.conf
 Patch0:  alsa-lib-1.0.17-config.patch
 Patch2:  alsa-lib-1.0.14-glibc-open.patch
 Patch4:	 alsa-lib-1.0.16-no-dox-date.patch
@@ -64,9 +63,7 @@
 ln -snf ../../%{_lib}/libasound.so.2 %{buildroot}%{_libdir}/libasound.so
 
 # Install global configuration files
-mkdir -p -m 755 $RPM_BUILD_ROOT/etc/alsa
 install -p -m 644 %{SOURCE10} %{buildroot}/etc
-install -p -m 644 %{SOURCE11} %{buildroot}/etc/alsa
 
 %clean
 rm -rf %{buildroot}
@@ -78,7 +75,6 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog TODO doc/asoundrc.txt
-%config %{_sysconfdir}/alsa/
 %config %{_sysconfdir}/asound.conf
 /%{_lib}/libasound.so.*
 %{_bindir}/aserver
@@ -96,6 +92,9 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Wed Sep 10 2008 Jaroslav Kysela <jkysela at redhat.com> - 1.0.18-5.rc3
+- move alsactl.conf to alsa-utils package
+
 * Wed Sep 10 2008 Jaroslav Kysela <jkysela at redhat.com> - 1.0.18-4.rc3
 - fixed spec file
 - fixed package version number (1.0.18-3.rc3 was tagged by accident)


--- alsactl.conf DELETED ---



From lmacken at fedoraproject.org  Thu Sep 11 08:28:06 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:28:06 +0000 (UTC)
Subject: rpms/python-peak-util-extremes/EL-4 import.log, NONE,
	1.1 python-peak-util-extremes-setup.patch, NONE,
	1.1 python-peak-util-extremes.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911082806.D562170131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-extremes/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10478/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-extremes-setup.patch 
	python-peak-util-extremes.spec 
Log Message:
Initial import of python-peak-util-extremes


--- NEW FILE import.log ---
python-peak-util-extremes-1_1-1_fc9:EL-4:python-peak-util-extremes-1.1-1.fc9.src.rpm:1221121648

python-peak-util-extremes-setup.patch:

--- NEW FILE python-peak-util-extremes-setup.patch ---
--- setup.py.orig	2008-08-12 15:37:45.000000000 -0400
+++ setup.py	2008-08-12 15:37:54.000000000 -0400
@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 """Distutils setup file"""
 
-import ez_setup
-ez_setup.use_setuptools()
 from setuptools import setup
 
 # Metadata


--- NEW FILE python-peak-util-extremes.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename Extremes

Name:           python-peak-util-extremes
Version:        1.1
Release:        1%{?dist}
Summary:        Production-quality 'Min' and 'Max' objects

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/Extremes
Source0:        http://pypi.python.org/packages/source/E/%{packagename}/%{packagename}-%{version}.zip
Patch0:         %{name}-setup.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

%description 
The peak.util.extremes module provides a production-quality implementation of
the Min and Max objects from PEP 326.  While PEP 326 was rejected for inclusion
in the language or standard library, the objects described in it are useful in
a variety of applications.  In PEAK, they have been used to implement generic
functions (in RuleDispatch and PEAK-Rules), as well as to handle scheduling and
time operations in the Trellis.  Because this has led to each project copying
the same code, we've now split the module out so it can be used independently.

%prep
%setup -q -n %{packagename}-%{version}
%patch0 -b .setup

%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 README.txt
%{python_sitelib}/*

%changelog
* Sun Aug 12 2008 Luke Macken <lmacken at redhat.com> - 1.1-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-extremes/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:53:46 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:27:36 -0000	1.2
@@ -0,0 +1 @@
+Extremes-1.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-extremes/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:53:46 -0000	1.1
+++ sources	11 Sep 2008 08:27:36 -0000	1.2
@@ -0,0 +1 @@
+34fc2c114b09e2cc331482d6cc4e4399  Extremes-1.1.zip



From pkgdb at fedoraproject.org  Thu Sep 11 08:28:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 08:28:38 +0000
Subject: [pkgdb] hunspell-nr was added for caolanm
Message-ID: <20080911082838.EB4E02D0020@bastion.fedora.phx.redhat.com>

huzaifas has added Package hunspell-nr with summary Ndebele hunspell dictionaries
huzaifas has approved Package hunspell-nr
huzaifas has added a Fedora devel branch for hunspell-nr with an owner of caolanm
huzaifas has approved hunspell-nr in Fedora devel
huzaifas has approved Package hunspell-nr
huzaifas has set commit to Approved for packager on hunspell-nr (Fedora devel)
huzaifas has set build to Approved for packager on hunspell-nr (Fedora devel)
huzaifas has set checkout to Approved for packager on hunspell-nr (Fedora devel)
huzaifas has set commit to Approved for uberpackager on hunspell-nr (Fedora devel)
huzaifas has set build to Approved for uberpackager on hunspell-nr (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on hunspell-nr (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-nr



From lmacken at fedoraproject.org  Thu Sep 11 08:29:11 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:29:11 +0000 (UTC)
Subject: rpms/python-peak-util-assembler/F-9 import.log, NONE,
	1.1 python-peak-util-assembler.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911082911.BB1BE70131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-assembler/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11185/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-assembler.spec 
Log Message:
Initial import of python-peak-util-assembler


--- NEW FILE import.log ---
python-peak-util-assembler-0_5-1_fc9:F-9:python-peak-util-assembler-0.5-1.fc9.src.rpm:1221121713


--- NEW FILE python-peak-util-assembler.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename BytecodeAssembler

Name:           python-peak-util-assembler
Version:        0.5
Release:        1%{?dist}
Summary:        Generate Python code objects by "assembling" bytecode

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/BytecodeAssembler
Source0:        http://pypi.python.org/packages/source/B/%{packagename}/%{packagename}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  python-nose

Requires:       python-decoratortools >= 1.2
Requires:       python-peak-util-symbols >= 1.0

%description
peak.util.assembler is a simple bytecode assembler module that handles most
low-level bytecode generation details like jump offsets, stack size tracking,
line number table generation, constant and variable name index tracking, etc.
That way, you can focus your attention on the desired semantics of your
bytecode instead of on these mechanical issues.

In addition to a low-level opcode-oriented API for directly generating specific
Python bytecodes, this module also offers an extensible mini-AST framework for
generating code from high-level specifications.  This framework does most of
the work needed to transform tree-like structures into linear bytecode
instructions, and includes the ability to do compile-time constant folding.

%prep
%setup -q -n %{packagename}-%{version}

%build
%{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}

%check
nosetests

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README.txt
%{python_sitelib}/*

%changelog
* Sun Aug  3 2008 Luke Macken <lmacken at redhat.com> - 0.5-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-assembler/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:57:31 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:28:41 -0000	1.2
@@ -0,0 +1 @@
+BytecodeAssembler-0.5.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-assembler/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:57:31 -0000	1.1
+++ sources	11 Sep 2008 08:28:41 -0000	1.2
@@ -0,0 +1 @@
+94645cdd4b97ed94b946ff66c0f7bbf0  BytecodeAssembler-0.5.zip



From huzaifas at fedoraproject.org  Thu Sep 11 08:29:35 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 08:29:35 +0000 (UTC)
Subject: rpms/hunspell-nr - New directory
Message-ID: <20080911082935.26A1970131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-nr
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvso11667/rpms/hunspell-nr

Log Message:
Directory /cvs/extras/rpms/hunspell-nr added to the repository




From huzaifas at fedoraproject.org  Thu Sep 11 08:29:35 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 08:29:35 +0000 (UTC)
Subject: rpms/hunspell-nr/devel - New directory
Message-ID: <20080911082935.6A81770131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-nr/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvso11667/rpms/hunspell-nr/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-nr/devel added to the repository




From huzaifas at fedoraproject.org  Thu Sep 11 08:29:36 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 08:29:36 +0000 (UTC)
Subject: rpms/hunspell-nr Makefile,NONE,1.1
Message-ID: <20080911082936.7964470131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-nr
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvso11667/rpms/hunspell-nr

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-nr


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-nr
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Thu Sep 11 08:29:36 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 08:29:36 +0000 (UTC)
Subject: rpms/hunspell-nr/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080911082936.BCDDF70131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-nr/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvso11667/rpms/hunspell-nr/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-nr


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-nr
# $Id: Makefile,v 1.1 2008/09/11 08:29:36 huzaifas Exp $
NAME := hunspell-nr
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From lmacken at fedoraproject.org  Thu Sep 11 08:32:42 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:32:42 +0000 (UTC)
Subject: rpms/python-peak-util-assembler/F-8 import.log, NONE,
	1.1 python-peak-util-assembler.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911083242.2C42070131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-assembler/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12727/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-assembler.spec 
Log Message:
Initial import of python-peak-util-assembler


--- NEW FILE import.log ---
python-peak-util-assembler-0_5-1_fc9:F-8:python-peak-util-assembler-0.5-1.fc9.src.rpm:1221121923


--- NEW FILE python-peak-util-assembler.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename BytecodeAssembler

Name:           python-peak-util-assembler
Version:        0.5
Release:        1%{?dist}
Summary:        Generate Python code objects by "assembling" bytecode

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/BytecodeAssembler
Source0:        http://pypi.python.org/packages/source/B/%{packagename}/%{packagename}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  python-nose

Requires:       python-decoratortools >= 1.2
Requires:       python-peak-util-symbols >= 1.0

%description
peak.util.assembler is a simple bytecode assembler module that handles most
low-level bytecode generation details like jump offsets, stack size tracking,
line number table generation, constant and variable name index tracking, etc.
That way, you can focus your attention on the desired semantics of your
bytecode instead of on these mechanical issues.

In addition to a low-level opcode-oriented API for directly generating specific
Python bytecodes, this module also offers an extensible mini-AST framework for
generating code from high-level specifications.  This framework does most of
the work needed to transform tree-like structures into linear bytecode
instructions, and includes the ability to do compile-time constant folding.

%prep
%setup -q -n %{packagename}-%{version}

%build
%{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}

%check
nosetests

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README.txt
%{python_sitelib}/*

%changelog
* Sun Aug  3 2008 Luke Macken <lmacken at redhat.com> - 0.5-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-assembler/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:57:31 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:32:11 -0000	1.2
@@ -0,0 +1 @@
+BytecodeAssembler-0.5.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-assembler/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:57:31 -0000	1.1
+++ sources	11 Sep 2008 08:32:11 -0000	1.2
@@ -0,0 +1 @@
+94645cdd4b97ed94b946ff66c0f7bbf0  BytecodeAssembler-0.5.zip



From pkgdb at fedoraproject.org  Thu Sep 11 08:32:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 08:32:56 +0000
Subject: [pkgdb] ptlib was added for veillard
Message-ID: <20080911083257.140542D0020@bastion.fedora.phx.redhat.com>

huzaifas has added Package ptlib with summary Portable Tools Library
huzaifas has approved Package ptlib
huzaifas has added a Fedora devel branch for ptlib with an owner of veillard
huzaifas has approved ptlib in Fedora devel
huzaifas has approved Package ptlib
huzaifas has set commit to Approved for packager on ptlib (Fedora devel)
huzaifas has set build to Approved for packager on ptlib (Fedora devel)
huzaifas has set checkout to Approved for packager on ptlib (Fedora devel)
huzaifas has set commit to Approved for uberpackager on ptlib (Fedora devel)
huzaifas has set build to Approved for uberpackager on ptlib (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on ptlib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ptlib



From pkgdb at fedoraproject.org  Thu Sep 11 08:32:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 08:32:59 +0000
Subject: [pkgdb] ptlib (Fedora, 9) updated by huzaifas
Message-ID: <20080911083259.5788D2D0026@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for ptlib
huzaifas has set commit to Approved for uberpackager on ptlib (Fedora 9)
huzaifas has set build to Approved for uberpackager on ptlib (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on ptlib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ptlib



From pkgdb at fedoraproject.org  Thu Sep 11 08:32:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 08:32:59 +0000
Subject: [pkgdb] ptlib (Fedora, 8) updated by huzaifas
Message-ID: <20080911083259.66E8A2D0029@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for ptlib
huzaifas has set commit to Approved for uberpackager on ptlib (Fedora 8)
huzaifas has set build to Approved for uberpackager on ptlib (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on ptlib (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ptlib



From huzaifas at fedoraproject.org  Thu Sep 11 08:34:01 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 08:34:01 +0000 (UTC)
Subject: rpms/ptlib - New directory
Message-ID: <20080911083401.2AF5C70131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/ptlib
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsp13460/rpms/ptlib

Log Message:
Directory /cvs/extras/rpms/ptlib added to the repository




From huzaifas at fedoraproject.org  Thu Sep 11 08:34:02 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 08:34:02 +0000 (UTC)
Subject: rpms/ptlib Makefile,NONE,1.1
Message-ID: <20080911083402.7CBBF70131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/ptlib
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsp13460/rpms/ptlib

Added Files:
	Makefile 
Log Message:
Setup of module ptlib


--- NEW FILE Makefile ---
# Top level Makefile for module ptlib
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Thu Sep 11 08:34:01 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 08:34:01 +0000 (UTC)
Subject: rpms/ptlib/devel - New directory
Message-ID: <20080911083401.6B6BD70131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/ptlib/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsp13460/rpms/ptlib/devel

Log Message:
Directory /cvs/extras/rpms/ptlib/devel added to the repository




From huzaifas at fedoraproject.org  Thu Sep 11 08:34:02 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 08:34:02 +0000 (UTC)
Subject: rpms/ptlib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20080911083402.C851270131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/ptlib/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsp13460/rpms/ptlib/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ptlib


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ptlib
# $Id: Makefile,v 1.1 2008/09/11 08:34:02 huzaifas Exp $
NAME := ptlib
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From lmacken at fedoraproject.org  Thu Sep 11 08:36:35 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:36:35 +0000 (UTC)
Subject: rpms/python-peak-util-assembler/EL-5 import.log, NONE,
	1.1 python-peak-util-assembler.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911083635.0B75D70131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-assembler/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14402/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-assembler.spec 
Log Message:
Initial import of python-peak-util-assembler


--- NEW FILE import.log ---
python-peak-util-assembler-0_5-1_fc9:EL-5:python-peak-util-assembler-0.5-1.fc9.src.rpm:1221122156


--- NEW FILE python-peak-util-assembler.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename BytecodeAssembler

Name:           python-peak-util-assembler
Version:        0.5
Release:        1%{?dist}
Summary:        Generate Python code objects by "assembling" bytecode

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/BytecodeAssembler
Source0:        http://pypi.python.org/packages/source/B/%{packagename}/%{packagename}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  python-nose

Requires:       python-decoratortools >= 1.2
Requires:       python-peak-util-symbols >= 1.0

%description
peak.util.assembler is a simple bytecode assembler module that handles most
low-level bytecode generation details like jump offsets, stack size tracking,
line number table generation, constant and variable name index tracking, etc.
That way, you can focus your attention on the desired semantics of your
bytecode instead of on these mechanical issues.

In addition to a low-level opcode-oriented API for directly generating specific
Python bytecodes, this module also offers an extensible mini-AST framework for
generating code from high-level specifications.  This framework does most of
the work needed to transform tree-like structures into linear bytecode
instructions, and includes the ability to do compile-time constant folding.

%prep
%setup -q -n %{packagename}-%{version}

%build
%{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}

%check
nosetests

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README.txt
%{python_sitelib}/*

%changelog
* Sun Aug  3 2008 Luke Macken <lmacken at redhat.com> - 0.5-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-assembler/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:57:31 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:36:04 -0000	1.2
@@ -0,0 +1 @@
+BytecodeAssembler-0.5.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-assembler/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:57:31 -0000	1.1
+++ sources	11 Sep 2008 08:36:04 -0000	1.2
@@ -0,0 +1 @@
+94645cdd4b97ed94b946ff66c0f7bbf0  BytecodeAssembler-0.5.zip



From lmacken at fedoraproject.org  Thu Sep 11 08:37:39 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:37:39 +0000 (UTC)
Subject: rpms/python-peak-util-assembler/EL-4 import.log, NONE,
	1.1 python-peak-util-assembler.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911083739.D554870131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-assembler/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15015/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-assembler.spec 
Log Message:
Initial import of python-peak-util-assembler


--- NEW FILE import.log ---
python-peak-util-assembler-0_5-1_fc9:EL-4:python-peak-util-assembler-0.5-1.fc9.src.rpm:1221122221


--- NEW FILE python-peak-util-assembler.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename BytecodeAssembler

Name:           python-peak-util-assembler
Version:        0.5
Release:        1%{?dist}
Summary:        Generate Python code objects by "assembling" bytecode

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/BytecodeAssembler
Source0:        http://pypi.python.org/packages/source/B/%{packagename}/%{packagename}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  python-nose

Requires:       python-decoratortools >= 1.2
Requires:       python-peak-util-symbols >= 1.0

%description
peak.util.assembler is a simple bytecode assembler module that handles most
low-level bytecode generation details like jump offsets, stack size tracking,
line number table generation, constant and variable name index tracking, etc.
That way, you can focus your attention on the desired semantics of your
bytecode instead of on these mechanical issues.

In addition to a low-level opcode-oriented API for directly generating specific
Python bytecodes, this module also offers an extensible mini-AST framework for
generating code from high-level specifications.  This framework does most of
the work needed to transform tree-like structures into linear bytecode
instructions, and includes the ability to do compile-time constant folding.

%prep
%setup -q -n %{packagename}-%{version}

%build
%{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}

%check
nosetests

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README.txt
%{python_sitelib}/*

%changelog
* Sun Aug  3 2008 Luke Macken <lmacken at redhat.com> - 0.5-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-assembler/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:57:31 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:37:09 -0000	1.2
@@ -0,0 +1 @@
+BytecodeAssembler-0.5.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-assembler/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:57:31 -0000	1.1
+++ sources	11 Sep 2008 08:37:09 -0000	1.2
@@ -0,0 +1 @@
+94645cdd4b97ed94b946ff66c0f7bbf0  BytecodeAssembler-0.5.zip



From lmacken at fedoraproject.org  Thu Sep 11 08:38:44 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:38:44 +0000 (UTC)
Subject: rpms/python-peak-util-addons/F-9 import.log, NONE,
	1.1 python-peak-util-addons.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911083844.E09D670131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-addons/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15638/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-addons.spec 
Log Message:
Initial import of python-peak-util-addons


--- NEW FILE import.log ---
python-peak-util-addons-0_6-1_fc9:F-9:python-peak-util-addons-0.6-1.fc9.src.rpm:1221122286


--- NEW FILE python-peak-util-addons.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename AddOns

Name:           python-peak-util-addons
Version:        0.6
Release:        1%{?dist}
Summary:        Dynamically extend other objects with AddOns

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/AddOns
Source0:        http://pypi.python.org/packages/source/A/%{packagename}/%{packagename}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

Requires:       python-decoratortools >= 1.5

%description
In any sufficiently-sized application or framework, it's common to end up
lumping a lot of different concerns into the same class.  For example, you may
have business logic, persistence code, and UI all jammed into a single class.
Attribute and method names for all sorts of different operations get shoved
into a single namespace -- even when using mixin classes.

Separating concerns into different objects, however, makes it easier to write
reusable and separately-testable components.  The AddOns package
(``peak.util.addons``) lets you manage concerns using ``AddOn`` classes.

%prep
%setup -q -n %{packagename}-%{version}

%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 README.txt
%{python_sitelib}/*

%changelog
* Sun Aug 12 2008 Luke Macken <lmacken at redhat.com> - 0.6-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-addons/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 05:00:48 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:38:14 -0000	1.2
@@ -0,0 +1 @@
+AddOns-0.6.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-addons/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 05:00:48 -0000	1.1
+++ sources	11 Sep 2008 08:38:14 -0000	1.2
@@ -0,0 +1 @@
+cce3b98e30aeee7e918649a18ba8f8b7  AddOns-0.6.zip



From lmacken at fedoraproject.org  Thu Sep 11 08:42:59 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:42:59 +0000 (UTC)
Subject: rpms/python-peak-util-addons/F-8 import.log, NONE,
	1.1 python-peak-util-addons.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911084259.E45E570131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-addons/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17572/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-addons.spec 
Log Message:
Initial import of python-peak-util-addons


--- NEW FILE import.log ---
python-peak-util-addons-0_6-1_fc9:F-8:python-peak-util-addons-0.6-1.fc9.src.rpm:1221122541


--- NEW FILE python-peak-util-addons.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename AddOns

Name:           python-peak-util-addons
Version:        0.6
Release:        1%{?dist}
Summary:        Dynamically extend other objects with AddOns

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/AddOns
Source0:        http://pypi.python.org/packages/source/A/%{packagename}/%{packagename}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

Requires:       python-decoratortools >= 1.5

%description
In any sufficiently-sized application or framework, it's common to end up
lumping a lot of different concerns into the same class.  For example, you may
have business logic, persistence code, and UI all jammed into a single class.
Attribute and method names for all sorts of different operations get shoved
into a single namespace -- even when using mixin classes.

Separating concerns into different objects, however, makes it easier to write
reusable and separately-testable components.  The AddOns package
(``peak.util.addons``) lets you manage concerns using ``AddOn`` classes.

%prep
%setup -q -n %{packagename}-%{version}

%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 README.txt
%{python_sitelib}/*

%changelog
* Sun Aug 12 2008 Luke Macken <lmacken at redhat.com> - 0.6-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-addons/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 05:00:48 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:42:29 -0000	1.2
@@ -0,0 +1 @@
+AddOns-0.6.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-addons/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 05:00:48 -0000	1.1
+++ sources	11 Sep 2008 08:42:29 -0000	1.2
@@ -0,0 +1 @@
+cce3b98e30aeee7e918649a18ba8f8b7  AddOns-0.6.zip



From thm at fedoraproject.org  Thu Sep 11 08:43:02 2008
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 11 Sep 2008 08:43:02 +0000 (UTC)
Subject: rpms/ikiwiki/devel .cvsignore, 1.8, 1.9 ikiwiki.spec, 1.7,
	1.8 import.log, 1.7, 1.8 sources, 1.8, 1.9
Message-ID: <20080911084302.A10FB70131@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17601/devel

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Log Message:
Update to 2.63.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 Aug 2008 16:43:06 -0000	1.8
+++ .cvsignore	11 Sep 2008 08:42:32 -0000	1.9
@@ -1 +1 @@
-ikiwiki_2.62.1.tar.gz
+ikiwiki_2.63.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/ikiwiki.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ikiwiki.spec	30 Aug 2008 16:43:06 -0000	1.7
+++ ikiwiki.spec	11 Sep 2008 08:42:32 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        2.62.1
+Version:        2.63
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
@@ -58,7 +58,7 @@
 
 # Filter Requires, all used by plugins
 # - Monotone: see bz 450267
-# - RPC::XML: see bz 435835
+# - RPC::XML: see bz 459933
 %{__cat} << \EOF > %{name}-req
 #!/bin/sh
 %{__perl_requires} $* |\
@@ -147,6 +147,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.63-1
+- Update to 2.63.
+
 * Sat Aug 30 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.62.1-1
 - Update to 2.62.1. Add /etc/ikiwiki.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	30 Aug 2008 16:43:06 -0000	1.7
+++ import.log	11 Sep 2008 08:42:32 -0000	1.8
@@ -5,3 +5,4 @@
 ikiwiki-2_55-1_fc9:HEAD:ikiwiki-2.55-1.fc9.src.rpm:1217582458
 ikiwiki-2_56-1_fc9:HEAD:ikiwiki-2.56-1.fc9.src.rpm:1218097891
 ikiwiki-2_62_1-1_fc9:HEAD:ikiwiki-2.62.1-1.fc9.src.rpm:1220114514
+ikiwiki-2_63-1_fc9:HEAD:ikiwiki-2.63-1.fc9.src.rpm:1221122510


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Aug 2008 16:43:06 -0000	1.8
+++ sources	11 Sep 2008 08:42:32 -0000	1.9
@@ -1 +1 @@
-87d371e9705beef27143f8151bbff64d  ikiwiki_2.62.1.tar.gz
+33eeeab36333deb7a088141f74df21f4  ikiwiki_2.63.tar.gz



From lmacken at fedoraproject.org  Thu Sep 11 08:47:12 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:47:12 +0000 (UTC)
Subject: rpms/python-peak-util-addons/EL-5 import.log, NONE,
	1.1 python-peak-util-addons.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911084712.1420D70131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-addons/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19609/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-addons.spec 
Log Message:
Initial import of python-peak-util-addons


--- NEW FILE import.log ---
python-peak-util-addons-0_6-1_fc9:EL-5:python-peak-util-addons-0.6-1.fc9.src.rpm:1221122793


--- NEW FILE python-peak-util-addons.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename AddOns

Name:           python-peak-util-addons
Version:        0.6
Release:        1%{?dist}
Summary:        Dynamically extend other objects with AddOns

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/AddOns
Source0:        http://pypi.python.org/packages/source/A/%{packagename}/%{packagename}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

Requires:       python-decoratortools >= 1.5

%description
In any sufficiently-sized application or framework, it's common to end up
lumping a lot of different concerns into the same class.  For example, you may
have business logic, persistence code, and UI all jammed into a single class.
Attribute and method names for all sorts of different operations get shoved
into a single namespace -- even when using mixin classes.

Separating concerns into different objects, however, makes it easier to write
reusable and separately-testable components.  The AddOns package
(``peak.util.addons``) lets you manage concerns using ``AddOn`` classes.

%prep
%setup -q -n %{packagename}-%{version}

%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 README.txt
%{python_sitelib}/*

%changelog
* Sun Aug 12 2008 Luke Macken <lmacken at redhat.com> - 0.6-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-addons/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 05:00:48 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:46:41 -0000	1.2
@@ -0,0 +1 @@
+AddOns-0.6.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-addons/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 05:00:48 -0000	1.1
+++ sources	11 Sep 2008 08:46:41 -0000	1.2
@@ -0,0 +1 @@
+cce3b98e30aeee7e918649a18ba8f8b7  AddOns-0.6.zip



From lmacken at fedoraproject.org  Thu Sep 11 08:48:18 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:48:18 +0000 (UTC)
Subject: rpms/python-peak-util-addons/EL-4 import.log, NONE,
	1.1 python-peak-util-addons.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911084818.33BDD70131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-addons/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20263/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-util-addons.spec 
Log Message:
Initial import of python-peak-util-addons


--- NEW FILE import.log ---
python-peak-util-addons-0_6-1_fc9:EL-4:python-peak-util-addons-0.6-1.fc9.src.rpm:1221122859


--- NEW FILE python-peak-util-addons.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename AddOns

Name:           python-peak-util-addons
Version:        0.6
Release:        1%{?dist}
Summary:        Dynamically extend other objects with AddOns

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/AddOns
Source0:        http://pypi.python.org/packages/source/A/%{packagename}/%{packagename}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

Requires:       python-decoratortools >= 1.5

%description
In any sufficiently-sized application or framework, it's common to end up
lumping a lot of different concerns into the same class.  For example, you may
have business logic, persistence code, and UI all jammed into a single class.
Attribute and method names for all sorts of different operations get shoved
into a single namespace -- even when using mixin classes.

Separating concerns into different objects, however, makes it easier to write
reusable and separately-testable components.  The AddOns package
(``peak.util.addons``) lets you manage concerns using ``AddOn`` classes.

%prep
%setup -q -n %{packagename}-%{version}

%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 README.txt
%{python_sitelib}/*

%changelog
* Sun Aug 12 2008 Luke Macken <lmacken at redhat.com> - 0.6-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-addons/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 05:00:48 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:47:47 -0000	1.2
@@ -0,0 +1 @@
+AddOns-0.6.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-addons/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 05:00:48 -0000	1.1
+++ sources	11 Sep 2008 08:47:47 -0000	1.2
@@ -0,0 +1 @@
+cce3b98e30aeee7e918649a18ba8f8b7  AddOns-0.6.zip



From pkgdb at fedoraproject.org  Thu Sep 11 08:48:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 08:48:36 +0000
Subject: [pkgdb] ptlib summary updated by huzaifas
Message-ID: <20080911084836.B2A0B208D9A@bastion.fedora.phx.redhat.com>

huzaifas set package ptlib summary to Portable Tools Library

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ptlib



From pkgdb at fedoraproject.org  Thu Sep 11 08:48:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 08:48:36 +0000
Subject: [pkgdb] ptlib (Fedora, 8) updated by huzaifas
Message-ID: <20080911084836.C5729208D9F@bastion.fedora.phx.redhat.com>

huzaifas changed owner of ptlib in Fedora 8 to pbrobinson
huzaifas approved watchbugzilla on ptlib (Fedora 8) for pbrobinson
huzaifas approved watchcommits on ptlib (Fedora 8) for pbrobinson
huzaifas approved watchbugzilla on ptlib (Fedora 8) for veillard
huzaifas approved watchcommits on ptlib (Fedora 8) for veillard
huzaifas approved commit on ptlib (Fedora 8) for veillard
huzaifas approved build on ptlib (Fedora 8) for veillard
huzaifas approved approveacls on ptlib (Fedora 8) for veillard

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ptlib



From pkgdb at fedoraproject.org  Thu Sep 11 08:48:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 08:48:36 +0000
Subject: [pkgdb] ptlib (Fedora, devel) updated by huzaifas
Message-ID: <20080911084836.D87462D0021@bastion.fedora.phx.redhat.com>

huzaifas changed owner of ptlib in Fedora devel to pbrobinson
huzaifas approved watchbugzilla on ptlib (Fedora devel) for pbrobinson
huzaifas approved watchcommits on ptlib (Fedora devel) for pbrobinson
huzaifas approved watchbugzilla on ptlib (Fedora devel) for veillard
huzaifas approved watchcommits on ptlib (Fedora devel) for veillard
huzaifas approved commit on ptlib (Fedora devel) for veillard
huzaifas approved build on ptlib (Fedora devel) for veillard
huzaifas approved approveacls on ptlib (Fedora devel) for veillard

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ptlib



From pkgdb at fedoraproject.org  Thu Sep 11 08:48:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 08:48:36 +0000
Subject: [pkgdb] ptlib (Fedora, 9) updated by huzaifas
Message-ID: <20080911084836.E8A6F2D0025@bastion.fedora.phx.redhat.com>

huzaifas changed owner of ptlib in Fedora 9 to pbrobinson
huzaifas approved watchbugzilla on ptlib (Fedora 9) for pbrobinson
huzaifas approved watchcommits on ptlib (Fedora 9) for pbrobinson
huzaifas approved watchbugzilla on ptlib (Fedora 9) for veillard
huzaifas approved watchcommits on ptlib (Fedora 9) for veillard
huzaifas approved commit on ptlib (Fedora 9) for veillard
huzaifas approved build on ptlib (Fedora 9) for veillard
huzaifas approved approveacls on ptlib (Fedora 9) for veillard

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ptlib



From lmacken at fedoraproject.org  Thu Sep 11 08:49:29 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:49:29 +0000 (UTC)
Subject: rpms/python-peak-rules/F-9 import.log, NONE,
	1.1 python-peak-rules-setup.patch, NONE,
	1.1 python-peak-rules.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911084929.3ED4970131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-rules/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20899/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-rules-setup.patch 
	python-peak-rules.spec 
Log Message:
Initial import of python-peak-rules


--- NEW FILE import.log ---
python-peak-rules-0_5a1_dev-0_2569_fc9:F-9:python-peak-rules-0.5a1.dev-0.2569.fc9.src.rpm:1221122930

python-peak-rules-setup.patch:

--- NEW FILE python-peak-rules-setup.patch ---
--- setup.py.orig	2008-08-12 15:48:38.000000000 -0400
+++ setup.py	2008-08-12 15:49:18.000000000 -0400
@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 """Distutils setup file"""
-import ez_setup
-ez_setup.use_setuptools()
 from setuptools import setup
 PACKAGE_NAME = "PEAK-Rules"
 PACKAGE_VERSION = "0.5a1"


--- NEW FILE python-peak-rules.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename PEAK-Rules
%define devrev  2569

%define docs README.txt AST-Builder.txt Code-Generation.txt Criteria.txt DESIGN.txt Indexing.txt Predicates.txt Syntax-Matching.txt

Name:           python-peak-rules
Version:        0.5a1.dev
Release:        0.%{devrev}%{?dist}
Summary:        Generic functions and business rules support systems

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/PEAK-Rules
Source0:        http://peak.telecommunity.com/snapshots/%{packagename}-%{version}-r%{devrev}.tar.gz
Patch0:         %{name}-setup.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

Requires:       python-peak-util-assembler >= 0.3
Requires:       python-peak-util-addons >= 0.6
Requires:       python-peak-util-extremes >= 1.1
Requires:       python-decoratortools >= 1.7

%description
SymbolType gives you access to the peak.util.symbols module, previously
available only by installing the full PEAK toolkit. peak.util.symbols provides
a Symbol type and two built-in symbols that are used by PEAK: NOT_FOUND and
NOT_GIVEN.

%prep
%setup -q -n %{packagename}-%{version}-r%{devrev}
%patch0 -b .setup
%{__chmod} -x %{docs}

%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 %{docs}
%{python_sitelib}/*

%changelog
* Sun Aug  3 2008 Luke Macken <lmacken at redhat.com> - 0.5a1.dev-0.2569
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-rules/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2008 23:43:35 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:48:58 -0000	1.2
@@ -0,0 +1 @@
+PEAK-Rules-0.5a1.dev-r2569.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-rules/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2008 23:43:35 -0000	1.1
+++ sources	11 Sep 2008 08:48:58 -0000	1.2
@@ -0,0 +1 @@
+77ce21fd7c452630bb035d93e2ebb8ed  PEAK-Rules-0.5a1.dev-r2569.tar.gz



From lmacken at fedoraproject.org  Thu Sep 11 08:53:22 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:53:22 +0000 (UTC)
Subject: rpms/python-peak-rules/F-8 import.log, NONE,
	1.1 python-peak-rules-setup.patch, NONE,
	1.1 python-peak-rules.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911085322.EE18770131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-rules/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22274/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-rules-setup.patch 
	python-peak-rules.spec 
Log Message:
Initial import of python-peak-rules


--- NEW FILE import.log ---
python-peak-rules-0_5a1_dev-0_2569_fc9:F-8:python-peak-rules-0.5a1.dev-0.2569.fc9.src.rpm:1221123164

python-peak-rules-setup.patch:

--- NEW FILE python-peak-rules-setup.patch ---
--- setup.py.orig	2008-08-12 15:48:38.000000000 -0400
+++ setup.py	2008-08-12 15:49:18.000000000 -0400
@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 """Distutils setup file"""
-import ez_setup
-ez_setup.use_setuptools()
 from setuptools import setup
 PACKAGE_NAME = "PEAK-Rules"
 PACKAGE_VERSION = "0.5a1"


--- NEW FILE python-peak-rules.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename PEAK-Rules
%define devrev  2569

%define docs README.txt AST-Builder.txt Code-Generation.txt Criteria.txt DESIGN.txt Indexing.txt Predicates.txt Syntax-Matching.txt

Name:           python-peak-rules
Version:        0.5a1.dev
Release:        0.%{devrev}%{?dist}
Summary:        Generic functions and business rules support systems

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/PEAK-Rules
Source0:        http://peak.telecommunity.com/snapshots/%{packagename}-%{version}-r%{devrev}.tar.gz
Patch0:         %{name}-setup.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

Requires:       python-peak-util-assembler >= 0.3
Requires:       python-peak-util-addons >= 0.6
Requires:       python-peak-util-extremes >= 1.1
Requires:       python-decoratortools >= 1.7

%description
SymbolType gives you access to the peak.util.symbols module, previously
available only by installing the full PEAK toolkit. peak.util.symbols provides
a Symbol type and two built-in symbols that are used by PEAK: NOT_FOUND and
NOT_GIVEN.

%prep
%setup -q -n %{packagename}-%{version}-r%{devrev}
%patch0 -b .setup
%{__chmod} -x %{docs}

%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 %{docs}
%{python_sitelib}/*

%changelog
* Sun Aug  3 2008 Luke Macken <lmacken at redhat.com> - 0.5a1.dev-0.2569
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-rules/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2008 23:43:35 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:52:52 -0000	1.2
@@ -0,0 +1 @@
+PEAK-Rules-0.5a1.dev-r2569.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-rules/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2008 23:43:35 -0000	1.1
+++ sources	11 Sep 2008 08:52:52 -0000	1.2
@@ -0,0 +1 @@
+77ce21fd7c452630bb035d93e2ebb8ed  PEAK-Rules-0.5a1.dev-r2569.tar.gz



From perex at fedoraproject.org  Thu Sep 11 08:54:33 2008
From: perex at fedoraproject.org (Jaroslav Kysela)
Date: Thu, 11 Sep 2008 08:54:33 +0000 (UTC)
Subject: rpms/alsa-lib/devel alsa-lib.spec,1.77,1.78
Message-ID: <20080911085433.2B50F70131@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22828

Modified Files:
	alsa-lib.spec 
Log Message:
alsa-lib: fix /etc directory issue


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- alsa-lib.spec	11 Sep 2008 08:26:45 -0000	1.77
+++ alsa-lib.spec	11 Sep 2008 08:54:02 -0000	1.78
@@ -5,7 +5,7 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
 Version: 1.0.18
-Release: 5%{?prever_dot}%{?dist}
+Release: 6%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
@@ -63,6 +63,7 @@
 ln -snf ../../%{_lib}/libasound.so.2 %{buildroot}%{_libdir}/libasound.so
 
 # Install global configuration files
+mkdir -p -m 755 %{buildroot}/etc
 install -p -m 644 %{SOURCE10} %{buildroot}/etc
 
 %clean
@@ -92,6 +93,9 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Wed Sep 10 2008 Jaroslav Kysela <jkysela at redhat.com> - 1.0.18-6.rc3
+- fix /etc directory issue
+
 * Wed Sep 10 2008 Jaroslav Kysela <jkysela at redhat.com> - 1.0.18-5.rc3
 - move alsactl.conf to alsa-utils package
 



From pkgdb at fedoraproject.org  Thu Sep 11 08:57:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 08:57:33 +0000
Subject: [pkgdb] nes_ntsc was added for dtimms
Message-ID: <20080911085733.1822A208D99@bastion.fedora.phx.redhat.com>

huzaifas has added Package nes_ntsc with summary Provides NES NTSC video filtering library
huzaifas has approved Package nes_ntsc
huzaifas has added a Fedora devel branch for nes_ntsc with an owner of dtimms
huzaifas has approved nes_ntsc in Fedora devel
huzaifas has approved Package nes_ntsc
huzaifas has set commit to Approved for packager on nes_ntsc (Fedora devel)
huzaifas has set build to Approved for packager on nes_ntsc (Fedora devel)
huzaifas has set checkout to Approved for packager on nes_ntsc (Fedora devel)
huzaifas has set commit to Approved for uberpackager on nes_ntsc (Fedora devel)
huzaifas has set build to Approved for uberpackager on nes_ntsc (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on nes_ntsc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nes_ntsc



From pkgdb at fedoraproject.org  Thu Sep 11 08:57:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 08:57:35 +0000
Subject: [pkgdb] nes_ntsc (Fedora, 9) updated by huzaifas
Message-ID: <20080911085735.D94FF208D9C@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for nes_ntsc
huzaifas has set commit to Approved for uberpackager on nes_ntsc (Fedora 9)
huzaifas has set build to Approved for uberpackager on nes_ntsc (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on nes_ntsc (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nes_ntsc



From pkgdb at fedoraproject.org  Thu Sep 11 08:57:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 08:57:35 +0000
Subject: [pkgdb] nes_ntsc (Fedora, 8) updated by huzaifas
Message-ID: <20080911085736.1E8F5208DA0@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for nes_ntsc
huzaifas has set commit to Approved for uberpackager on nes_ntsc (Fedora 8)
huzaifas has set build to Approved for uberpackager on nes_ntsc (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on nes_ntsc (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nes_ntsc



From lmacken at fedoraproject.org  Thu Sep 11 08:57:38 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:57:38 +0000 (UTC)
Subject: rpms/python-peak-rules/EL-5 import.log, NONE,
	1.1 python-peak-rules-setup.patch, NONE,
	1.1 python-peak-rules.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911085738.5149A70131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-rules/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24177/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-rules-setup.patch 
	python-peak-rules.spec 
Log Message:
Initial import of python-peak-rules


--- NEW FILE import.log ---
python-peak-rules-0_5a1_dev-0_2569_fc9:EL-5:python-peak-rules-0.5a1.dev-0.2569.fc9.src.rpm:1221123419

python-peak-rules-setup.patch:

--- NEW FILE python-peak-rules-setup.patch ---
--- setup.py.orig	2008-08-12 15:48:38.000000000 -0400
+++ setup.py	2008-08-12 15:49:18.000000000 -0400
@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 """Distutils setup file"""
-import ez_setup
-ez_setup.use_setuptools()
 from setuptools import setup
 PACKAGE_NAME = "PEAK-Rules"
 PACKAGE_VERSION = "0.5a1"


--- NEW FILE python-peak-rules.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename PEAK-Rules
%define devrev  2569

%define docs README.txt AST-Builder.txt Code-Generation.txt Criteria.txt DESIGN.txt Indexing.txt Predicates.txt Syntax-Matching.txt

Name:           python-peak-rules
Version:        0.5a1.dev
Release:        0.%{devrev}%{?dist}
Summary:        Generic functions and business rules support systems

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/PEAK-Rules
Source0:        http://peak.telecommunity.com/snapshots/%{packagename}-%{version}-r%{devrev}.tar.gz
Patch0:         %{name}-setup.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

Requires:       python-peak-util-assembler >= 0.3
Requires:       python-peak-util-addons >= 0.6
Requires:       python-peak-util-extremes >= 1.1
Requires:       python-decoratortools >= 1.7

%description
SymbolType gives you access to the peak.util.symbols module, previously
available only by installing the full PEAK toolkit. peak.util.symbols provides
a Symbol type and two built-in symbols that are used by PEAK: NOT_FOUND and
NOT_GIVEN.

%prep
%setup -q -n %{packagename}-%{version}-r%{devrev}
%patch0 -b .setup
%{__chmod} -x %{docs}

%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 %{docs}
%{python_sitelib}/*

%changelog
* Sun Aug  3 2008 Luke Macken <lmacken at redhat.com> - 0.5a1.dev-0.2569
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-rules/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2008 23:43:35 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:57:07 -0000	1.2
@@ -0,0 +1 @@
+PEAK-Rules-0.5a1.dev-r2569.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-rules/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2008 23:43:35 -0000	1.1
+++ sources	11 Sep 2008 08:57:07 -0000	1.2
@@ -0,0 +1 @@
+77ce21fd7c452630bb035d93e2ebb8ed  PEAK-Rules-0.5a1.dev-r2569.tar.gz



From huzaifas at fedoraproject.org  Thu Sep 11 08:58:07 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 08:58:07 +0000 (UTC)
Subject: rpms/nes_ntsc - New directory
Message-ID: <20080911085807.28EC270131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/nes_ntsc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsb24663/rpms/nes_ntsc

Log Message:
Directory /cvs/extras/rpms/nes_ntsc added to the repository




From huzaifas at fedoraproject.org  Thu Sep 11 08:58:08 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 08:58:08 +0000 (UTC)
Subject: rpms/nes_ntsc Makefile,NONE,1.1
Message-ID: <20080911085808.7C93370131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/nes_ntsc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsb24663/rpms/nes_ntsc

Added Files:
	Makefile 
Log Message:
Setup of module nes_ntsc


--- NEW FILE Makefile ---
# Top level Makefile for module nes_ntsc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Thu Sep 11 08:58:07 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 08:58:07 +0000 (UTC)
Subject: rpms/nes_ntsc/devel - New directory
Message-ID: <20080911085807.6EA2970131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/nes_ntsc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsb24663/rpms/nes_ntsc/devel

Log Message:
Directory /cvs/extras/rpms/nes_ntsc/devel added to the repository




From huzaifas at fedoraproject.org  Thu Sep 11 08:58:08 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 11 Sep 2008 08:58:08 +0000 (UTC)
Subject: rpms/nes_ntsc/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080911085808.C22B070131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/nes_ntsc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsb24663/rpms/nes_ntsc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nes_ntsc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: nes_ntsc
# $Id: Makefile,v 1.1 2008/09/11 08:58:08 huzaifas Exp $
NAME := nes_ntsc
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From lmacken at fedoraproject.org  Thu Sep 11 08:58:47 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 08:58:47 +0000 (UTC)
Subject: rpms/python-peak-rules/EL-4 import.log, NONE,
	1.1 python-peak-rules-setup.patch, NONE,
	1.1 python-peak-rules.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911085847.02A8D70131@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-rules/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24923/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-peak-rules-setup.patch 
	python-peak-rules.spec 
Log Message:
Initial import of python-peak-rules


--- NEW FILE import.log ---
python-peak-rules-0_5a1_dev-0_2569_fc9:EL-4:python-peak-rules-0.5a1.dev-0.2569.fc9.src.rpm:1221123488

python-peak-rules-setup.patch:

--- NEW FILE python-peak-rules-setup.patch ---
--- setup.py.orig	2008-08-12 15:48:38.000000000 -0400
+++ setup.py	2008-08-12 15:49:18.000000000 -0400
@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 """Distutils setup file"""
-import ez_setup
-ez_setup.use_setuptools()
 from setuptools import setup
 PACKAGE_NAME = "PEAK-Rules"
 PACKAGE_VERSION = "0.5a1"


--- NEW FILE python-peak-rules.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename PEAK-Rules
%define devrev  2569

%define docs README.txt AST-Builder.txt Code-Generation.txt Criteria.txt DESIGN.txt Indexing.txt Predicates.txt Syntax-Matching.txt

Name:           python-peak-rules
Version:        0.5a1.dev
Release:        0.%{devrev}%{?dist}
Summary:        Generic functions and business rules support systems

Group:          Development/Languages
License:        Python or ZPLv2.1
URL:            http://pypi.python.org/pypi/PEAK-Rules
Source0:        http://peak.telecommunity.com/snapshots/%{packagename}-%{version}-r%{devrev}.tar.gz
Patch0:         %{name}-setup.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

Requires:       python-peak-util-assembler >= 0.3
Requires:       python-peak-util-addons >= 0.6
Requires:       python-peak-util-extremes >= 1.1
Requires:       python-decoratortools >= 1.7

%description
SymbolType gives you access to the peak.util.symbols module, previously
available only by installing the full PEAK toolkit. peak.util.symbols provides
a Symbol type and two built-in symbols that are used by PEAK: NOT_FOUND and
NOT_GIVEN.

%prep
%setup -q -n %{packagename}-%{version}-r%{devrev}
%patch0 -b .setup
%{__chmod} -x %{docs}

%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 %{docs}
%{python_sitelib}/*

%changelog
* Sun Aug  3 2008 Luke Macken <lmacken at redhat.com> - 0.5a1.dev-0.2569
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-rules/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2008 23:43:35 -0000	1.1
+++ .cvsignore	11 Sep 2008 08:58:16 -0000	1.2
@@ -0,0 +1 @@
+PEAK-Rules-0.5a1.dev-r2569.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-rules/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2008 23:43:35 -0000	1.1
+++ sources	11 Sep 2008 08:58:16 -0000	1.2
@@ -0,0 +1 @@
+77ce21fd7c452630bb035d93e2ebb8ed  PEAK-Rules-0.5a1.dev-r2569.tar.gz



From perex at fedoraproject.org  Thu Sep 11 09:04:12 2008
From: perex at fedoraproject.org (Jaroslav Kysela)
Date: Thu, 11 Sep 2008 09:04:12 +0000 (UTC)
Subject: rpms/alsa-utils/devel alsactl.conf, NONE, 1.1 alsaunmute, NONE,
	1.1 .cvsignore, 1.24, 1.25 alsa-info.sh, 1.2,
	1.3 alsa-utils.spec, 1.70, 1.71 alsa.rules, 1.3, 1.4 sources,
	1.28, 1.29 alsa-utils-1.0.14-statedir.patch, 1.2,
	NONE alsacard.c, 1.1, NONE alsaunmute.c, 1.16, NONE salsa.1, 1.1,
	NONE salsa.c, 1.8, NONE
Message-ID: <20080911090412.A7BEA70131@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26960

Modified Files:
	.cvsignore alsa-info.sh alsa-utils.spec alsa.rules sources 
Added Files:
	alsactl.conf alsaunmute 
Removed Files:
	alsa-utils-1.0.14-statedir.patch alsacard.c alsaunmute.c 
	salsa.1 salsa.c 
Log Message:
alsa-utils: updated 1.0.18rc3 and removed RH specific udev helpers


--- NEW FILE alsactl.conf ---
#
# ALSA library configuration file for alsactl tool
# (/usr/share/alsa tree is not necessary for alsactl)
#

ctl.hw {
	@args [ CARD ]
	@args.CARD {
		type string
		default "0"
	}
	type hw
	card $CARD
}


--- NEW FILE alsaunmute ---
#!/bin/sh

export ALSA_CONFIG_PATH="/etc/alsa/alsactl.conf"
exec /sbin/alsactl init



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	21 Jul 2008 10:11:54 -0000	1.24
+++ .cvsignore	11 Sep 2008 09:03:42 -0000	1.25
@@ -17,3 +17,4 @@
 alsa-utils-1.0.15rc1.tar.bz2
 alsa-utils-1.0.16.tar.bz2
 alsa-utils-1.0.17.tar.bz2
+alsa-utils-1.0.18rc3.tar.bz2


Index: alsa-info.sh
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-info.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa-info.sh	21 Jul 2008 10:11:54 -0000	1.2
+++ alsa-info.sh	11 Sep 2008 09:03:42 -0000	1.3
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_VERSION=0.4.48
+SCRIPT_VERSION=0.4.51
 CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"
 
 #################################################################################
@@ -33,7 +33,11 @@
 #Define some simple functions
 
 pbcheck(){
-	[[ $(ping -c1 www.pastebin.ca) ]] || KEEP_FILES="yes" NOUPLOAD="yes" PBERROR="yes"
+	if [[ -z $PASTEBIN ]]; then
+		[[ $(ping -c1 www.alsa-project.org) ]] || KEEP_FILES="yes" NOUPLOAD="yes" PBERROR="yes"
+	else
+		[[ $(ping -c1 www.pastebin.ca) ]] || KEEP_FILES="yes" NOUPLOAD="yes" PBERROR="yes"
+	fi
 }
 
 update() {
@@ -69,12 +73,6 @@
 }
 
 
-#### FIX ME
-withsecure() {
-	POST_URL="http://alsa-info.pastebin.ca"
-}
-###########
-
 withaplay() {
         echo "!!Aplay/Arecord output" >> $FILE
         echo "!!------------" >> $FILE
@@ -106,6 +104,7 @@
 	CARD_NAME=`grep "^ *$i " /tmp/alsainfo/alsacards.tmp|awk {'print $2'}`
 	echo "!!-------Mixer controls for card $i $CARD_NAME]" >> $FILE
 	echo "" >>$FILE
+	amixer -c$i info>> $FILE 2>&1
 	amixer -c$i>> $FILE 2>&1
         echo "" >> $FILE
 	done
@@ -192,6 +191,8 @@
 #Check modprobe config files for sound related options
 SNDOPTIONS=$(modprobe -c|sed -n 's/^options \(snd[-_][^ ]*\)/\1:/p')
 
+PASTEBIN=""
+WWWSERVICE="www.alsa-project.org"
 QUESTION="yes"
 PROCEED="yes"
 REPEAT=""
@@ -205,6 +206,10 @@
 	--no-upload)
 		NOUPLOAD="yes"
 		;;
+	--pastebin)
+		PASTEBIN="yes"
+		WWWSERVICE="pastebin"
+		;;
 	--no-dialog)
 		DIALOG=""
 		REPEAT=""
@@ -219,7 +224,7 @@
 if [[ -n "$DIALOG" ]]
 then
 if [ -z "$NOUPLOAD" ]; then
-	dialog --backtitle "$BGTITLE" --title "ALSA-Info script v $SCRIPT_VERSION" --yesno "\nThis script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem\n\nBy default, this script will AUTOMATICALLY UPLOAD your information to a pastebin site.\n\nSee $0 --help for options\n\nDo you want to run this script?" 0 0
+	dialog --backtitle "$BGTITLE" --title "ALSA-Info script v $SCRIPT_VERSION" --yesno "\nThis script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem\n\nBy default, this script will AUTOMATICALLY UPLOAD your information to a $WWWSERVICE site.\n\nSee $0 --help for options\n\nDo you want to run this script?" 0 0
 else
 	dialog --backtitle "$BGTITLE" --title "ALSA-Info script v $SCRIPT_VERSION" --yesno "\nThis script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem\n\nSee $0 --help for options\n\nDo you want to run this script?" 0 0
 fi
@@ -238,11 +243,11 @@
 if [ -z "$NOUPLOAD" ]; then
 if [[ -n "$TPUT" ]]; then
 tput bold
-echo "By default, the collected information will be AUTOMATICALLY uploaded to a pastebin site."
+echo "By default, the collected information will be AUTOMATICALLY uploaded to a $WWWSERVICE site."
 echo "If you do not wish for this to occur, run the script with the --no-upload argument"
 tput sgr0
 else
-echo "By default, the collected information will be AUTOMATICALLY uploaded to a pastebin site."
+echo "By default, the collected information will be AUTOMATICALLY uploaded to a $WWWSERVICE site."
 echo "If you do not wish for this to occur, run the script with the --no-upload argument"
 fi
 echo ""
@@ -297,7 +302,11 @@
 cat /proc/asound/card*/codec97\#0/ac97\#0-0+regs > /tmp/alsainfo/alsa-ac97-regs.tmp 2> /dev/null
 
 #Fetch the info, and put it in $FILE in a nice readable format.
+if [[ -z $PASTEBIN ]]; then
+echo "upload=true&script=true&cardinfo=" > $FILE
+else
 echo "name=$USER&type=33&description=/tmp/alsa-info.txt&expiry=&s=Submit+Post&content=" > $FILE
+fi
 echo "!!################################" >> $FILE
 echo "!!ALSA Information Script v $SCRIPT_VERSION" >> $FILE
 echo "!!################################" >> $FILE
@@ -425,6 +434,16 @@
 	until [ -z "$1" ]
 	do
 	case "$1" in
+		--pastebin)
+		        update
+        		withdevices
+        		withconfigs
+        		withaplay
+        		withamixer
+        		withalsactl
+        		withlsmod
+        		pbcheck
+			;;
 		--update)
 			update
 			exit
@@ -510,18 +529,23 @@
 			exit 0
 			;;
 		*)
+			echo "alsa-info.sh version $SCRIPT_VERSION"
 			echo ""
 			echo "Available options:"
 			echo "	--with-aplay (includes the output of aplay -l)"
 			echo "	--with-amixer (includes the output of amixer)"
 			echo "	--with-alsactl (includes the output of alsactl)"
-			echo "	--with-configs (includes the output of ~/.asoundrc and /etc/asound.conf if they exist)" 
+			echo "	--with-configs (includes the output of ~/.asoundrc and"
+			echo "	    /etc/asound.conf if they exist)" 
 			echo "	--with-devices (shows the device nodes in /dev/snd/)"
 			echo ""
 			echo "	--update (check server for script updates)"
 			echo "	--no-upload (do not upload contents to remote server)"
+			echo "	--pastebin (use http://pastebin.ca) as remote server"
+			echo "	    instead www.alsa-project.org"
 			echo "	--about (show some information about the script)"
-			echo "	--debug (will run the script as normal, but will not delete $FILE)"
+			echo "	--debug (will run the script as normal, but will not"
+			echo "	     delete $FILE)"
 			cleanup
 			exit 0
 			;;
@@ -539,6 +563,14 @@
 if [[ -n "$DIALOG" ]]
 then
 	if [[ -z $NOUPLOAD ]]; then
+	if [[ -z $PASTEBIN ]]; then
+	wget -O - --tries=5 --timeout=60 --post-file=/tmp/alsa-info.txt "http://www.alsa-project.org/cardinfo-db/" &>/tmp/alsainfo/wget.tmp || echo "Upload failed; exit"
+	{ for i in 10 20 30 40 50 60 70 80 90; do
+		echo $i
+		sleep 0.2
+	done
+	echo; } |dialog --backtitle "$BGTITLE" --guage "Uploading information to www.alsa-project.org ..." 6 70 0
+	else
 	wget -O - --tries=5 --timeout=60 --post-file=/tmp/alsa-info.txt "http://pastebin.ca/quiet-paste.php?api=$PASTEBINKEY&encrypt=t&encryptpw=blahblah" &>/tmp/alsainfo/wget.tmp || echo "Upload failed; exit"
 	{ for i in 10 20 30 40 50 60 70 80 90; do
 		echo $i
@@ -546,12 +578,18 @@
 	done
 	echo; } |dialog --backtitle "$BGTITLE" --guage "Uploading information to www.pastebin.ca ..." 6 70 0
 	fi
+	fi
 else
 
 	if [[ -z $NOUPLOAD ]]; then
+	if [[ -z $PASTEBIN ]]; then
+	echo -n "Uploading information to www.alsa-project.org ... " 
+	wget -O - --tries=5 --timeout=60 --post-file=/tmp/alsa-info.txt http://www.alsa-project.org/cardinfo-db/ &>/tmp/alsainfo/wget.tmp &
+	else
 	echo -n "Uploading information to www.pastebin.ca ... " 
 	wget -O - --tries=5 --timeout=60 --post-file=/tmp/alsa-info.txt http://pastebin.ca/quiet-paste.php?api=$PASTEBINKEY &>/tmp/alsainfo/wget.tmp &
 	fi
+	fi
 fi
 #Progess spinner for wget transfer.
 if [[ -z "$DIALOG" ]]	
@@ -569,9 +607,17 @@
 if [[ -z $NOUPLOAD ]]; then
 	if [[ -n "$TPUT" ]]
 	then
-		FINAL_URL=`tput setaf 1; grep "SUCCESS:" /tmp/alsainfo/wget.tmp |sed -n 's/.*\:\([0-9]\+\).*/http:\/\/pastebin.ca\/\1/p';tput sgr0`
+		if [[ -z $PASTEBIN ]]; then
+			FINAL_URL=`tput setaf 1; grep "SUCCESS:" /tmp/alsainfo/wget.tmp | cut -d ' ' -f 2 ; tput sgr0`
+		else
+			FINAL_URL=`tput setaf 1; grep "SUCCESS:" /tmp/alsainfo/wget.tmp |sed -n 's/.*\:\([0-9]\+\).*/http:\/\/pastebin.ca\/\1/p';tput sgr0`
+		fi
 	else
-		FINAL_URL=`grep "SUCCESS:" /tmp/alsainfo/wget.tmp |sed -n 's/.*\:\([0-9]\+\).*/http:\/\/pastebin.ca\/\1/p'`
+		if [[ -z $PASTEBIN ]]; then
+			FINAL_URL=`grep "SUCCESS:" /tmp/alsainfo/wget.tmp | cut -d ' ' -f 2`
+		else
+			FINAL_URL=`grep "SUCCESS:" /tmp/alsainfo/wget.tmp |sed -n 's/.*\:\([0-9]\+\).*/http:\/\/pastebin.ca\/\1/p'`
+		fi
 	fi
 fi
 #Output the URL of the uploaded file.	
@@ -589,9 +635,9 @@
 then
 	if [[ -n $NOUPLOAD ]]; then
 		if [[ -n $PBERROR ]]; then
-			dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "An error occured while contacting the pastebin. Your information was NOT automatically uploaded.\n\nYour ALSA information can be seen by looking in $FILE" 10 100
+			dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "An error occured while contacting the $WWWSERVICE. Your information was NOT automatically uploaded.\n\nYour ALSA information can be seen by looking in $FILE" 10 100
 		else
-			dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "You requested that your information was NOT automatically uploaded to the pastebin\n\nYour ALSA information can be seen by looking in $FILE" 10 100
+			dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "You requested that your information was NOT automatically uploaded to the $WWWSERVICE\n\nYour ALSA information can be seen by looking in $FILE" 10 100
 		fi
 	else
 		dialog --backtitle "$BGTITLE" --title "Information uploaded" --yesno "Would you like to see the uploaded information?" 5 100 
@@ -605,12 +651,12 @@
 clear
 if [[ -n $NOUPLOAD ]]; then
 	if [[ -n $PBERROR ]]; then
-		echo "An error occured while contacting the pastebin. Your information was NOT automatically uploaded."
+		echo "An error occured while contacting the $WWWSERVICE. Your information was NOT automatically uploaded."
 		echo ""
 		echo "Your ALSA information can be seen by looking in $FILE"
 		echo ""
 	else
-		echo "You requested that your information was NOT automatically uploaded to the pastebin"
+		echo "You requested that your information was NOT automatically uploaded to the $WWWSERVICE"
 		echo ""
 		echo "Your ALSA information can be seen by looking in $FILE"
 		echo ""
@@ -621,7 +667,7 @@
 echo "Please inform the person helping you."
 echo ""
 fi
-	#We posted the file to pastebin.ca , so we dont need it anymore. delete it.
+	#We posted the file , so we dont need it anymore. delete it.
 	if [ -z $KEEP_FILES ]
 	then
 		rm $FILE 
@@ -631,6 +677,16 @@
 else
 	if [[ -z $DIALOG ]]
 	then
+		if [[ -z $PASTEBIN ]]; then
+		echo ""
+		echo "Could not automatically upload output to http://www.alsa-project.org"
+		echo "Possible reasons are:"
+		echo "    1. Couldnt find 'wget' in your PATH"
+		echo "    2. Your version of wget is less than 1.8.2"
+		echo ""
+		echo "Please manually upload $FILE to http://www.alsa-project.org/cardinfo-db/ and submit your post."
+		echo ""
+		else
 		echo ""
 		echo "Could not automatically upload output to http://www.pastebin.ca"
 		echo "Possible reasons are:"
@@ -639,10 +695,15 @@
 		echo ""
 		echo "Please manually upload $FILE to http://www.pastebin.ca/upload.php and submit your post."
 		echo ""
+		fi
 	fi
 	if [[ -n $DIALOG ]]
 	then
-		dialog --backtitle "$BGTITLE" --msgbox "Could not automatically upload output to http://www.pastebin.ca.\nPossible reasons are:\n\n    1. Couldn't find 'wget' in your PATH\n    2. Your version of wget is less than 1.8.2\n\nPlease manually upload $FILE to http://www.pastebin.ca/upload.php and submit your post." 25 100
+		if [[ -z $PASTEBIN ]]; then
+			dialog --backtitle "$BGTITLE" --msgbox "Could not automatically upload output to http://www.alsa-project.org.\nPossible reasons are:\n\n    1. Couldn't find 'wget' in your PATH\n    2. Your version of wget is less than 1.8.2\n\nPlease manually upload $FILE to http://www.alsa-project,org/cardinfo-db/ and submit your post." 25 100
+		else
+			dialog --backtitle "$BGTITLE" --msgbox "Could not automatically upload output to http://www.pastebin.ca.\nPossible reasons are:\n\n    1. Couldn't find 'wget' in your PATH\n    2. Your version of wget is less than 1.8.2\n\nPlease manually upload $FILE to http://www.pastebin.ca/upload.php and submit your post." 25 100
+		fi
 	fi
 fi
 #Clean up the temp files


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- alsa-utils.spec	21 Jul 2008 12:14:14 -0000	1.70
+++ alsa-utils.spec	11 Sep 2008 09:03:42 -0000	1.71
@@ -1,22 +1,19 @@
-#define  prever         rc1
-#define  prever_dot     .rc1
+%define  prever         rc3
+%define  prever_dot     .rc3
 
 Summary: Advanced Linux Sound Architecture (ALSA) utilities
 Name:    alsa-utils
-Version: 1.0.17
+Version: 1.0.18
 Release: 1%{?prever_dot}%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.alsa-project.org/
 Source:  ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}%{?prever}.tar.bz2
-Source2: salsa.c
-Source3: alsacard.c
-Source4: alsaunmute.c
-Source5: salsa.1
+Source4: alsaunmute
 Source6: alsa-info.sh
 Source10: alsa.rules
+Source11: alsactl.conf
 Patch0:  alsa-utils-1.0.17-alsaconf.patch
-Patch1:  alsa-utils-1.0.14-statedir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel >= %{version}
 BuildRequires: ncurses-devel
@@ -30,14 +27,10 @@
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
 %patch0 -p1
-%patch1 -p1 -b .statedir
 
 %build
 %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --sbindir=/sbin
 %{__make} %{?_smp_mflags}
-%{__cc} $RPM_OPT_FLAGS -o salsa %{SOURCE2} -lasound
-%{__cc} $RPM_OPT_FLAGS -o alsacard %{SOURCE3} -lasound
-%{__cc} $RPM_OPT_FLAGS -o alsaunmute %{SOURCE4} -lasound
 %{__cp} %{SOURCE5} .
 
 %install
@@ -51,20 +44,16 @@
 
 # Install support utilities
 mkdir -p -m755 $RPM_BUILD_ROOT/bin
-install -p -m 755 alsacard alsaunmute %{buildroot}/bin/
-install -p -m 755 salsa %{buildroot}/sbin/
+install -p -m 755 alsaunmute %{buildroot}/bin/
 
 # Link alsactl to /usr/sbin
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
 ln -s ../../sbin/alsactl $RPM_BUILD_ROOT/%{_sbindir}/alsactl
 
-# Create a place for volume configuration
-mkdir -p $RPM_BUILD_ROOT/etc/alsa
-touch $RPM_BUILD_ROOT/etc/alsa/asound.state
-
-# Install salsa man page
-mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1
-install -p -m 644 salsa.1 %{buildroot}/usr/share/man/man1
+# Create a place for global configuration
+mkdir -p -m 755 $RPM_BUILD_ROOT/etc/alsa
+install -p -m 644 alsactl.conf %{buildroot}/etc/alsa
+touch $RPM_BUILD_ROOT/etc/asound.state
 
 # Install alsa-info.sh script
 install -p -m 755 %{SOURCE6} $RPM_BUILD_ROOT/usr/bin/alsa-info
@@ -76,6 +65,7 @@
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README TODO
 %config /etc/udev/rules.d/*
+%config /etc/alsa/*
 /bin/*
 /sbin/*
 %{_bindir}/*
@@ -84,10 +74,19 @@
 %{_datadir}/sounds/
 %{_mandir}/man?/*
 %dir /etc/alsa/
-%ghost /etc/alsa/asound.state
+%ghost /etc/asound.state
 
 
 %changelog
+* Thu Sep 11 2008 Jaroslav Kysela <jkysela at redhat.com> 1.0.18-1.rc3
+- updated to 1.0.18rc3
+- updated alsa-info.sh script to 0.4.51
+- removed alsacard utility
+- removed salsa utility
+- changed alsaunmute to use 'alsactl init' now
+- updated ALSA udevd rules to use alsactl
+- moved /etc/alsa/asound.state back to /etc/asound.state
+
 * Mon Jul 21 2008 Jaroslav Kysela <jkysela at redhat.com> 1.0.17-1
 - updated to 1.0.17 final
 - updated alsa-info.sh script to 0.4.48


Index: alsa.rules
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa.rules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- alsa.rules	24 Sep 2007 15:06:48 -0000	1.3
+++ alsa.rules	11 Sep 2008 09:03:42 -0000	1.4
@@ -1,2 +1,4 @@
-SUBSYSTEM=="sound", KERNEL=="controlC*"	RUN+="/sbin/salsa"
-SUBSYSTEM=="sound", KERNEL=="pcm*"	RUN+="/sbin/salsa"
\ No newline at end of file
+ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", \
+  ENV{ALSA_CONFIG_PATH}="/etc/alsa/alsactl.conf", RUN+="/sbin/alsactl restore $name"
+ACTION=="remove", SUBSYSTEM=="sound", KERNEL=="controlC*", \
+  ENV{ALSA_CONFIG_PATH}="/etc/alsa/alsactl.conf", RUN+="/sbin/alsactl store $name"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	21 Jul 2008 10:11:54 -0000	1.28
+++ sources	11 Sep 2008 09:03:42 -0000	1.29
@@ -1 +1 @@
-14ccd0c900bf663afb36eac6f92d41d6  alsa-utils-1.0.17.tar.bz2
+31ff44de50e6725974b3d2e032ab214d  alsa-utils-1.0.18rc3.tar.bz2


--- alsa-utils-1.0.14-statedir.patch DELETED ---


--- alsacard.c DELETED ---


--- alsaunmute.c DELETED ---


--- salsa.1 DELETED ---


--- salsa.c DELETED ---



From kzak at fedoraproject.org  Thu Sep 11 09:13:25 2008
From: kzak at fedoraproject.org (Karel Zak)
Date: Thu, 11 Sep 2008 09:13:25 +0000 (UTC)
Subject: rpms/util-linux-ng/devel util-linux-ng-2.13-mount-pamconsole.patch, 
	1.2, NONE
Message-ID: <20080911091325.5F03070131@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-serv30395

Removed Files:
	util-linux-ng-2.13-mount-pamconsole.patch 
Log Message:
remove unused patch


--- util-linux-ng-2.13-mount-pamconsole.patch DELETED ---



From caolanm at fedoraproject.org  Thu Sep 11 09:23:19 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 11 Sep 2008 09:23:19 +0000 (UTC)
Subject: rpms/hunspell-nr/devel hunspell-nr.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080911092319.0D68A70131@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-nr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1267/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-nr.spec import.log 
Log Message:



--- NEW FILE hunspell-nr.spec ---
Name: hunspell-nr
Summary: Southern Ndebele hunspell dictionaries
%define upstreamid 20060120
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://downloads.sourceforge.net/translate/myspell-nr_ZA-%{upstreamid}.zip
Group: Applications/Text
URL: http://translate.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+
BuildArch: noarch

Requires: hunspell

%description
Southern Ndebele hunspell dictionaries.

%prep
%setup -q -c -n hunspell-nr

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_nr_ZA.txt
%{_datadir}/myspell/*

%changelog
* Tue Sep 09 2008 Caolan McNamara <caolanm at redhat.com> - 0.20060120-1
- initial version


--- NEW FILE import.log ---
hunspell-nr-0_20060120-1_fc9:HEAD:hunspell-nr-0.20060120-1.fc9.src.rpm:1221125038


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-nr/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 08:29:36 -0000	1.1
+++ .cvsignore	11 Sep 2008 09:22:48 -0000	1.2
@@ -0,0 +1 @@
+myspell-nr_ZA-20060120.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-nr/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 08:29:36 -0000	1.1
+++ sources	11 Sep 2008 09:22:48 -0000	1.2
@@ -0,0 +1 @@
+bcc97822f0dfa96d08e20396b920cac0  myspell-nr_ZA-20060120.zip



From pbrobinson at fedoraproject.org  Thu Sep 11 09:26:16 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 11 Sep 2008 09:26:16 +0000 (UTC)
Subject: rpms/ptlib/devel import.log, NONE, 1.1 ptlib.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080911092616.0B93570131@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ptlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2755/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ptlib.spec 
Log Message:
- Initial cvs import



--- NEW FILE import.log ---
ptlib-2_3_1-2_fc9:HEAD:ptlib-2.3.1-2.fc9.src.rpm:1221123525


--- NEW FILE ptlib.spec ---
Name:		ptlib
Summary:	Portable Tools Library
Version:	2.3.1
Release:	2%{?dist}
URL:		http://www.opalvoip.org/
Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ptlib/2.3/%{name}-%{version}.tar.bz2
License:	MPLv1.0
Group:		System Environment/Libraries
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	expat openssl-devel pkgconfig
BuildRequires:  alsa-lib-devel, libstdc++-devel, libv4l-devel
BuildRequires:  openldap-devel, expat-devel, SDL-devel, flex, bison

%description
PTLib (Portable Tools Library) is a moderately large class library that 
has it's genesis many years ago as PWLib (portable Windows Library), a 
method to product applications to run on both Microsoft Windows and Unix 
systems. It has also been ported to other systems such as Mac OSX, VxWorks 
and other embedded systems.

It is supplied mainly to support the OPAL project, but that shouldn't stop
you from using it in whatever project you have in mind if you so desire. 

%package devel
Summary:	Development package for ptlib
Group:		Development/Libraries
Requires:	ptlib = %{version}-%{release}
Requires:	pkgconfig

%description devel
The ptlib-devel package includes the libraries and header files for ptlib.

%prep
%setup -q 

%build
export CFLAGS="$CFLAGS -DLDAP_DEPRECATED"
%configure --prefix=%{_prefix} --disable-static --enable-opal --enable-plugins --disable-oss --enable-v4l2 --disable-avc
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make PREFIX=$RPM_BUILD_ROOT%{_prefix} LIBDIR=$RPM_BUILD_ROOT%{_libdir} install

perl -pi -e 's at PTLIBDIR.*=.*@PTLIBDIR = /usr/share/ptlib@' $RPM_BUILD_ROOT%{_datadir}/ptlib/make/ptbuildopts.mak

# hack to fixup things for bug 197318
find $RPM_BUILD_ROOT%{_libdir} -name '*.so*' -type f -exec chmod +x {} \;

# Remove empty include file
rm -rf $RPM_BUILD_ROOT%{_includedir}/ptlib/devplugin.h

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc History.txt ReadMe.txt mpl-1.0.htm
%attr(755,root,root) %{_libdir}/libpt*.so.*
%dir %{_libdir}/ptlib
%dir %{_libdir}/ptlib/devices
%dir %{_libdir}/ptlib/devices/sound
%dir %{_libdir}/ptlib/devices/videoinput
# List these explicitly so we don't get any surprises
%attr(755,root,root) %{_libdir}/ptlib/devices/sound/alsa_pwplugin.so
%attr(755,root,root) %{_libdir}/ptlib/devices/videoinput/v4l_pwplugin.so
%attr(755,root,root) %{_libdir}/ptlib/devices/videoinput/v4l2_pwplugin.so

%files devel
%defattr(-,root,root)
%{_libdir}/libpt*.so
%{_includedir}/*
%{_datadir}/ptlib
%{_libdir}/pkgconfig/ptlib.pc
%attr(755,root,root) %{_bindir}/*

%changelog
* Wed Sep 10 2008 Peter Robinson <pbrobinson at gmail.com> - 2.3.1-2
- Build fixes from package review

* Sun Jun 8 2008 Peter Robinson <pbrobinson at gmail.com> - 2.3.1-1
- Initial version of ptlib


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 08:34:02 -0000	1.1
+++ .cvsignore	11 Sep 2008 09:25:45 -0000	1.2
@@ -0,0 +1 @@
+ptlib-2.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 08:34:02 -0000	1.1
+++ sources	11 Sep 2008 09:25:45 -0000	1.2
@@ -0,0 +1 @@
+bd495deba21a292348bb57ae2cb05d6a  ptlib-2.3.1.tar.bz2



From msuchy at fedoraproject.org  Thu Sep 11 09:26:25 2008
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Thu, 11 Sep 2008 09:26:25 +0000 (UTC)
Subject: rpms/perl-Schedule-Cron-Events/F-9 import.log, NONE,
	1.1 perl-Schedule-Cron-Events.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911092625.916A370131@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/extras/rpms/perl-Schedule-Cron-Events/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2777/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Schedule-Cron-Events.spec 
Log Message:
Inital upload of perl-Schedule-Cron-Events to F-9.



--- NEW FILE import.log ---
perl-Schedule-Cron-Events-1_8-14_f10:F-9:perl-Schedule-Cron-Events-1.8-14.f10.src.rpm:1221125120


--- NEW FILE perl-Schedule-Cron-Events.spec ---
Name:           perl-Schedule-Cron-Events
Version:        1.8
Release:        14%{?dist}
Summary:        Take a line from a crontab and find out when events will occur
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Schedule-Cron-Events/
Source0:        http://www.cpan.org/modules/by-module/Schedule/Schedule-Cron-Events-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(Set::Crontab)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Given a line from a crontab, tells you the time at which cron will next run
the line, or when the last event occurred, relative to any date you choose.
The object keeps that reference date internally, and updates it when you
call nextEvent() or previousEvent() - such that successive calls will give
you a sequence of events going forward, or backwards, in time.

%prep
%setup -q -n Schedule-Cron-Events-%{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
%{_bindir}/cron_event_predict.plx 
%{perl_vendorlib}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Wed Sep 10 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-14
- fix mixed tab and space

* Thu Sep  4 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-12
- add build requires

* Fri Aug 29 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-2
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Schedule-Cron-Events/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 08:14:30 -0000	1.1
+++ .cvsignore	11 Sep 2008 09:25:55 -0000	1.2
@@ -0,0 +1 @@
+Schedule-Cron-Events-1.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Schedule-Cron-Events/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 08:14:30 -0000	1.1
+++ sources	11 Sep 2008 09:25:55 -0000	1.2
@@ -0,0 +1 @@
+c9cc7e3ce3e00935cdba315404be91bf  Schedule-Cron-Events-1.8.tar.gz



From msuchy at fedoraproject.org  Thu Sep 11 09:28:17 2008
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Thu, 11 Sep 2008 09:28:17 +0000 (UTC)
Subject: rpms/perl-Schedule-Cron-Events/EL-4 import.log, NONE,
	1.1 perl-Schedule-Cron-Events.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911092817.D116A70131@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/extras/rpms/perl-Schedule-Cron-Events/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3857/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Schedule-Cron-Events.spec 
Log Message:
Inital upload of perl-Schedule-Cron-Events to EL-4.



--- NEW FILE import.log ---
perl-Schedule-Cron-Events-1_8-14_f10:EL-4:perl-Schedule-Cron-Events-1.8-14.f10.src.rpm:1221125243


--- NEW FILE perl-Schedule-Cron-Events.spec ---
Name:           perl-Schedule-Cron-Events
Version:        1.8
Release:        14%{?dist}
Summary:        Take a line from a crontab and find out when events will occur
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Schedule-Cron-Events/
Source0:        http://www.cpan.org/modules/by-module/Schedule/Schedule-Cron-Events-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(Set::Crontab)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Given a line from a crontab, tells you the time at which cron will next run
the line, or when the last event occurred, relative to any date you choose.
The object keeps that reference date internally, and updates it when you
call nextEvent() or previousEvent() - such that successive calls will give
you a sequence of events going forward, or backwards, in time.

%prep
%setup -q -n Schedule-Cron-Events-%{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
%{_bindir}/cron_event_predict.plx 
%{perl_vendorlib}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Wed Sep 10 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-14
- fix mixed tab and space

* Thu Sep  4 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-12
- add build requires

* Fri Aug 29 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-2
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Schedule-Cron-Events/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 08:14:30 -0000	1.1
+++ .cvsignore	11 Sep 2008 09:27:47 -0000	1.2
@@ -0,0 +1 @@
+Schedule-Cron-Events-1.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Schedule-Cron-Events/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 08:14:30 -0000	1.1
+++ sources	11 Sep 2008 09:27:47 -0000	1.2
@@ -0,0 +1 @@
+c9cc7e3ce3e00935cdba315404be91bf  Schedule-Cron-Events-1.8.tar.gz



From msuchy at fedoraproject.org  Thu Sep 11 09:30:25 2008
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Thu, 11 Sep 2008 09:30:25 +0000 (UTC)
Subject: rpms/perl-Schedule-Cron-Events/EL-5 import.log, NONE,
	1.1 perl-Schedule-Cron-Events.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911093025.DB9D970131@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/extras/rpms/perl-Schedule-Cron-Events/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4852/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Schedule-Cron-Events.spec 
Log Message:
Inital upload of perl-Schedule-Cron-Events to EL-5.



--- NEW FILE import.log ---
perl-Schedule-Cron-Events-1_8-14_f10:EL-5:perl-Schedule-Cron-Events-1.8-14.f10.src.rpm:1221125362


--- NEW FILE perl-Schedule-Cron-Events.spec ---
Name:           perl-Schedule-Cron-Events
Version:        1.8
Release:        14%{?dist}
Summary:        Take a line from a crontab and find out when events will occur
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Schedule-Cron-Events/
Source0:        http://www.cpan.org/modules/by-module/Schedule/Schedule-Cron-Events-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(Set::Crontab)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Given a line from a crontab, tells you the time at which cron will next run
the line, or when the last event occurred, relative to any date you choose.
The object keeps that reference date internally, and updates it when you
call nextEvent() or previousEvent() - such that successive calls will give
you a sequence of events going forward, or backwards, in time.

%prep
%setup -q -n Schedule-Cron-Events-%{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
%{_bindir}/cron_event_predict.plx 
%{perl_vendorlib}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Wed Sep 10 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-14
- fix mixed tab and space

* Thu Sep  4 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-12
- add build requires

* Fri Aug 29 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-2
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Schedule-Cron-Events/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 08:14:30 -0000	1.1
+++ .cvsignore	11 Sep 2008 09:29:55 -0000	1.2
@@ -0,0 +1 @@
+Schedule-Cron-Events-1.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Schedule-Cron-Events/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 08:14:30 -0000	1.1
+++ sources	11 Sep 2008 09:29:55 -0000	1.2
@@ -0,0 +1 @@
+c9cc7e3ce3e00935cdba315404be91bf  Schedule-Cron-Events-1.8.tar.gz



From msuchy at fedoraproject.org  Thu Sep 11 09:36:09 2008
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Thu, 11 Sep 2008 09:36:09 +0000 (UTC)
Subject: rpms/perl-Schedule-Cron-Events/devel import.log, NONE,
	1.1 perl-Schedule-Cron-Events.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911093609.E40B270131@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/extras/rpms/perl-Schedule-Cron-Events/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5755/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Schedule-Cron-Events.spec 
Log Message:
Inital upload of perl-Schedule-Cron-Events to devel.



--- NEW FILE import.log ---
perl-Schedule-Cron-Events-1_8-14_f10:HEAD:perl-Schedule-Cron-Events-1.8-14.f10.src.rpm:1221125471


--- NEW FILE perl-Schedule-Cron-Events.spec ---
Name:           perl-Schedule-Cron-Events
Version:        1.8
Release:        14%{?dist}
Summary:        Take a line from a crontab and find out when events will occur
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Schedule-Cron-Events/
Source0:        http://www.cpan.org/modules/by-module/Schedule/Schedule-Cron-Events-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(Set::Crontab)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Given a line from a crontab, tells you the time at which cron will next run
the line, or when the last event occurred, relative to any date you choose.
The object keeps that reference date internally, and updates it when you
call nextEvent() or previousEvent() - such that successive calls will give
you a sequence of events going forward, or backwards, in time.

%prep
%setup -q -n Schedule-Cron-Events-%{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
%{_bindir}/cron_event_predict.plx 
%{perl_vendorlib}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Wed Sep 10 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-14
- fix mixed tab and space

* Thu Sep  4 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-12
- add build requires

* Fri Aug 29 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-2
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Schedule-Cron-Events/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 08:14:30 -0000	1.1
+++ .cvsignore	11 Sep 2008 09:35:39 -0000	1.2
@@ -0,0 +1 @@
+Schedule-Cron-Events-1.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Schedule-Cron-Events/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 08:14:30 -0000	1.1
+++ sources	11 Sep 2008 09:35:39 -0000	1.2
@@ -0,0 +1 @@
+c9cc7e3ce3e00935cdba315404be91bf  Schedule-Cron-Events-1.8.tar.gz



From msuchy at fedoraproject.org  Thu Sep 11 09:53:18 2008
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Thu, 11 Sep 2008 09:53:18 +0000 (UTC)
Subject: rpms/perl-Schedule-Cron-Events/F-9 import.log, 1.1,
	1.2 perl-Schedule-Cron-Events.spec, 1.1, 1.2
Message-ID: <20080911095318.99D2B70131@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/extras/rpms/perl-Schedule-Cron-Events/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14013/F-9

Modified Files:
	import.log perl-Schedule-Cron-Events.spec 
Log Message:
Fix missing build requires.



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Schedule-Cron-Events/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Sep 2008 09:25:55 -0000	1.1
+++ import.log	11 Sep 2008 09:52:48 -0000	1.2
@@ -1 +1,2 @@
 perl-Schedule-Cron-Events-1_8-14_f10:F-9:perl-Schedule-Cron-Events-1.8-14.f10.src.rpm:1221125120
+perl-Schedule-Cron-Events-1_8-15:F-9:perl-Schedule-Cron-Events-1.8-15.src.rpm:1221126729


Index: perl-Schedule-Cron-Events.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Schedule-Cron-Events/F-9/perl-Schedule-Cron-Events.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Schedule-Cron-Events.spec	11 Sep 2008 09:25:55 -0000	1.1
+++ perl-Schedule-Cron-Events.spec	11 Sep 2008 09:52:48 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           perl-Schedule-Cron-Events
 Version:        1.8
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Take a line from a crontab and find out when events will occur
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Schedule-Cron-Events/
 Source0:        http://www.cpan.org/modules/by-module/Schedule/Schedule-Cron-Events-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Set::Crontab)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -50,6 +51,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 11 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-15
+- add build requires ExtUtils::MakeMaker
+
 * Wed Sep 10 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-14
 - fix mixed tab and space
 



From mpg at fedoraproject.org  Thu Sep 11 09:56:48 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Thu, 11 Sep 2008 09:56:48 +0000 (UTC)
Subject: rpms/hulahop/OLPC-3 .cvsignore, 1.6, 1.7 hulahop.spec, 1.13,
	1.14 sources, 1.7, 1.8
Message-ID: <20080911095648.7C69D70131@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/hulahop/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15382

Modified Files:
	.cvsignore hulahop.spec sources 
Log Message:
* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.4.6-1
- Fixes for components registration




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/OLPC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Sep 2008 15:47:01 -0000	1.6
+++ .cvsignore	11 Sep 2008 09:56:18 -0000	1.7
@@ -1 +1 @@
-hulahop-0.4.5.tar.bz2
+hulahop-0.4.6.tar.bz2


Index: hulahop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/OLPC-3/hulahop.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- hulahop.spec	6 Sep 2008 16:20:47 -0000	1.13
+++ hulahop.spec	11 Sep 2008 09:56:18 -0000	1.14
@@ -1,8 +1,8 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 
 Name: hulahop
-Version: 0.4.5
-Release: 2%{?dist}
+Version: 0.4.6
+Release: 1%{?dist}
 Summary: A pygtk widget for embedding mozilla
 
 Group: System Environment/Libraries
@@ -56,7 +56,10 @@
 %{python_sitelib}/*
 
 %changelog
-* Sat Sep  6 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.4.5-1
+* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.4.6-1
+- Fixes for components registration
+
+* Sat Sep  6 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.4.5-2
 - Switch vendor to OLPC
 
 * Sat Sep  6 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.4.5-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/OLPC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Sep 2008 15:47:01 -0000	1.7
+++ sources	11 Sep 2008 09:56:18 -0000	1.8
@@ -1 +1 @@
-f1d023e6482392052104321aaa873bfc  hulahop-0.4.5.tar.bz2
+d6a1c444d2f9e052504c7edf3f849248  hulahop-0.4.6.tar.bz2



From airlied at fedoraproject.org  Thu Sep 11 09:58:24 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 11 Sep 2008 09:58:24 +0000 (UTC)
Subject: rpms/kernel/devel drm-modesetting-radeon.patch, 1.25,
	1.26 kernel.spec, 1.945, 1.946
Message-ID: <20080911095824.79AB570131@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16265

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Thu Sep 11 2008 Dave Airlie <airlied at redhat.com>
- drm - fix some minor annoyance with radeon for beta


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- drm-modesetting-radeon.patch	10 Sep 2008 04:54:35 -0000	1.25
+++ drm-modesetting-radeon.patch	11 Sep 2008 09:58:23 -0000	1.26
@@ -1,3 +1,33 @@
+commit 7d7949742ae5d6d0aca8857bfcab77b2fffaf0d7
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Sep 11 18:26:27 2008 +1000
+
+    radeon: fixup buffer and cs
+    
+    just fallback around busted stuff for now
+
+commit 3bd833adf4e37a47d9e794498c4cdb4bff09d167
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Sep 11 18:25:18 2008 +1000
+
+    radeon: fixup GEM domain setting - allows more userspace paths
+    
+    also dirty buffer on validate
+
+commit c323b90fe655fcee25aa7e39671c1594e897c4f6
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Sep 11 17:13:32 2008 +1000
+
+    radeon: disable blit moves
+
+commit 7783a2254b7707861662b3f94ca2ca38c83ce64b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Sep 11 16:18:27 2008 +1000
+
+    radeon: fail properly if we can't create the ring.
+    
+    Normally this will be due to an AGP driver needing updating
+
 commit ed3d32c22ed856ef32594fe2efb88c55c8006627
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Sep 10 14:35:43 2008 +1000
@@ -28447,10 +28477,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_buffer.c b/drivers/gpu/drm/radeon/radeon_buffer.c
 new file mode 100644
-index 0000000..07989bf
+index 0000000..fe2aa6f
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_buffer.c
-@@ -0,0 +1,440 @@
+@@ -0,0 +1,441 @@
 +/**************************************************************************
 + * 
 + * Copyright 2007 Dave Airlie
@@ -28629,6 +28659,7 @@
 +	RADEON_WAIT_UNTIL_2D_IDLE();
 +	ADVANCE_RING();
 +
++	COMMIT_RING();
 +	return;
 +}
 +
@@ -28853,12 +28884,12 @@
 +		return 0; 
 +	}
 +
++	/* disable these blit moves for now that appear to be failing */
++	goto fallback;
++
 +	if (new_mem->mem_type == DRM_BO_MEM_VRAM) {
 +		if (radeon_move_vram(bo, evict, no_wait, new_mem))
 +			goto fallback;
-+	} else if (new_mem->mem_type == DRM_BO_MEM_LOCAL){ 
-+		if (radeon_move_flip(bo, evict, no_wait, new_mem))
-+			goto fallback;
 +	} else {
 +		if (radeon_move_flip(bo, evict, no_wait, new_mem))
 +			goto fallback;
@@ -30630,7 +30661,7 @@
 +	return NULL;
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
-index 248ab4a..a1d2290 100644
+index 248ab4a..7870d0f 100644
 --- a/drivers/gpu/drm/radeon/radeon_cp.c
 +++ b/drivers/gpu/drm/radeon/radeon_cp.c
 @@ -31,6 +31,7 @@
@@ -31999,7 +32030,7 @@
  	switch (flags & RADEON_FAMILY_MASK) {
  	case CHIP_R100:
  	case CHIP_RV200:
-@@ -1720,18 +2494,119 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -1720,18 +2494,126 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
  		break;
  	}
  
@@ -32058,7 +32089,10 @@
 +
 +	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 +
-+		radeon_gem_mm_init(dev);
++		ret = radeon_gem_mm_init(dev);
++		if (ret)
++			goto modeset_fail;
++
 +		radeon_modeset_init(dev);
 +
 +		radeon_modeset_cp_init(dev);
@@ -32068,6 +32102,10 @@
 +	}
 +
 +
++	return ret;
++modeset_fail:
++	dev->driver->driver_features &= ~DRIVER_MODESET;
++	drm_put_minor(&dev->control);
  	return ret;
  }
  
@@ -32120,7 +32158,7 @@
  /* Create mappings for registers and framebuffer so userland doesn't necessarily
   * have to find them.
   */
-@@ -1743,19 +2618,6 @@ int radeon_driver_firstopen(struct drm_device *dev)
+@@ -1743,19 +2625,6 @@ int radeon_driver_firstopen(struct drm_device *dev)
  
  	dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE;
  
@@ -32140,7 +32178,7 @@
  	return 0;
  }
  
-@@ -1763,9 +2625,40 @@ int radeon_driver_unload(struct drm_device *dev)
+@@ -1763,9 +2632,40 @@ int radeon_driver_unload(struct drm_device *dev)
  {
  	drm_radeon_private_t *dev_priv = dev->dev_private;
  
@@ -32183,10 +32221,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
 new file mode 100644
-index 0000000..d961189
+index 0000000..c8b0c97
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_cs.c
-@@ -0,0 +1,411 @@
+@@ -0,0 +1,412 @@
 +/*
 + * Copyright 2008 Jerome Glisse.
 + * All Rights Reserved.
@@ -32557,13 +32595,14 @@
 +	/* ISYNC_CNTL should not have CPSCRACTH bit set */
 +	*id = radeon_cs_id_get(dev_priv);
 +	/* emit id in SCRATCH6 */
-+	BEGIN_RING(6);
++	BEGIN_RING(8);
 +	OUT_RING(CP_PACKET0(R300_CP_RESYNC_ADDR, 0));
 +	OUT_RING(6);
 +	OUT_RING(CP_PACKET0(R300_CP_RESYNC_DATA, 0));
 +	OUT_RING(*id);
 +	OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
 +	OUT_RING(R300_RB3D_DC_FINISH);
++	RADEON_WAIT_UNTIL_3D_IDLE();
 +	ADVANCE_RING();	
 +}
 +
@@ -36457,10 +36496,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
 new file mode 100644
-index 0000000..58162e5
+index 0000000..8338f8f
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_gem.c
-@@ -0,0 +1,1561 @@
+@@ -0,0 +1,1584 @@
 +/*
 + * Copyright 2008 Red Hat Inc.
 + *
@@ -36629,8 +36668,16 @@
 +			return -EINVAL; // we can't write to system RAM
 +	} else {
 +		/* okay for a read domain - prefer wherever the object is now or close enough */
-+		if ((read_domains == 0) || (read_domains == RADEON_GEM_DOMAIN_CPU))
++		if (read_domains == 0)
 +			return -EINVAL;
++
++		/* if its already a local memory and CPU is valid do nothing */
++		if (read_domains & RADEON_GEM_DOMAIN_CPU) {
++			if (obj_priv->bo->mem.mem_type == DRM_BO_MEM_LOCAL)
++				return 0;
++			if (read_domains == RADEON_GEM_DOMAIN_CPU)
++				return -EINVAL;
++		}
 +		
 +		/* simple case no choice in domains */
 +		if (read_domains == RADEON_GEM_DOMAIN_VRAM)
@@ -36641,12 +36688,19 @@
 +			flags = DRM_BO_FLAG_MEM_VRAM;
 +		else if ((obj_priv->bo->mem.mem_type == DRM_BO_MEM_TT) && (read_domains & RADEON_GEM_DOMAIN_GTT))
 +			flags = DRM_BO_FLAG_MEM_TT;
++		else if ((obj_priv->bo->mem.mem_type == DRM_BO_MEM_LOCAL) && (read_domains & RADEON_GEM_DOMAIN_GTT))
++			flags = DRM_BO_FLAG_MEM_TT;
 +		else if (read_domains & RADEON_GEM_DOMAIN_VRAM)
 +			flags = DRM_BO_FLAG_MEM_VRAM;
 +		else if (read_domains & RADEON_GEM_DOMAIN_GTT)
 +			flags = DRM_BO_FLAG_MEM_TT;
 +	}
 +
++	/* if this BO is pinned then we ain't moving it anywhere */
++	if (obj_priv->bo->pinned_mem_type && unfenced) 
++		return 0;
++
++	DRM_DEBUG("validating %p from %d into %x %d %d\n", obj_priv->bo, obj_priv->bo->mem.mem_type, flags, read_domains, write_domain);
 +	ret = drm_bo_do_validate(obj_priv->bo, flags, DRM_BO_MASK_MEM | DRM_BO_FLAG_CACHED,
 +				 unfenced ? DRM_BO_HINT_DONT_FENCE : 0, 0);
 +	if (ret)
@@ -37130,7 +37184,10 @@
 +				       DRM_BO_FLAG_MAPPABLE | DRM_BO_FLAG_NO_EVICT,
 +				       0, 1, 0, &dev_priv->mm.ring.bo);
 +	if (ret) {
-+		DRM_ERROR("failed to allocate ring\n");
++		if (dev_priv->flags & RADEON_IS_AGP)
++			DRM_ERROR("failed to allocate ring - most likely an AGP driver bug\n");
++		else
++			DRM_ERROR("failed to allocate ring\n");
 +		return -EINVAL;
 +	}
 +
@@ -37467,8 +37524,10 @@
 +	/* need to allocate some objects in the GART */
 +	/* ring + ring read ptr */
 +	ret = radeon_alloc_gart_objects(dev);
-+	if (ret)
++	if (ret) {
++		radeon_gem_mm_fini(dev);
 +		return -EINVAL;
++	}
 +
 +	dev_priv->mm_enabled = true;
 +	return 0;
@@ -37675,6 +37734,7 @@
 +	obj_priv = obj->driver_private;
 +	radeon_gem_set_domain(obj, read_domains, write_domain, &flags, false);
 +
++	obj_priv->bo->mem.flags &= ~DRM_BO_FLAG_CLEAN;
 +	if (flags == DRM_BO_FLAG_MEM_VRAM)
 +		*offset = obj_priv->bo->offset + dev_priv->fb_location;
 +	else if (flags == DRM_BO_FLAG_MEM_TT)
@@ -37971,8 +38031,10 @@
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
 +	drm_dma_takedown(dev);
 +
-+	drm_bo_kunmap(&dev_priv->mm.dma_bufs.kmap);
-+	drm_bo_usage_deref_unlocked(&dev_priv->mm.dma_bufs.bo);
++	if (dev_priv->mm.dma_bufs.bo) {
++		drm_bo_kunmap(&dev_priv->mm.dma_bufs.kmap);
++		drm_bo_usage_deref_unlocked(&dev_priv->mm.dma_bufs.bo);
++	}
 +}
 +
 +


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.945
retrieving revision 1.946
diff -u -r1.945 -r1.946
--- kernel.spec	10 Sep 2008 16:59:58 -0000	1.945
+++ kernel.spec	11 Sep 2008 09:58:23 -0000	1.946
@@ -1755,6 +1755,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Sep 11 2008 Dave Airlie <airlied at redhat.com>
+- drm - fix some minor annoyance with radeon for beta
+
 * Wed Sep 10 2008 Mark McLoughlin <markmc at redhat.com>
 - Pull in new e1000e hardware support (e.g. ich10) from net-next-2.6
 



From msuchy at fedoraproject.org  Thu Sep 11 09:58:23 2008
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Thu, 11 Sep 2008 09:58:23 +0000 (UTC)
Subject: rpms/perl-Schedule-Cron-Events/devel import.log, 1.1,
	1.2 perl-Schedule-Cron-Events.spec, 1.1, 1.2
Message-ID: <20080911095823.58A2D70131@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/extras/rpms/perl-Schedule-Cron-Events/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15953/devel

Modified Files:
	import.log perl-Schedule-Cron-Events.spec 
Log Message:
Add missing build requires.



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Schedule-Cron-Events/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Sep 2008 09:35:39 -0000	1.1
+++ import.log	11 Sep 2008 09:57:53 -0000	1.2
@@ -1 +1,2 @@
 perl-Schedule-Cron-Events-1_8-14_f10:HEAD:perl-Schedule-Cron-Events-1.8-14.f10.src.rpm:1221125471
+perl-Schedule-Cron-Events-1_8-15:HEAD:perl-Schedule-Cron-Events-1.8-15.src.rpm:1221127027


Index: perl-Schedule-Cron-Events.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Schedule-Cron-Events/devel/perl-Schedule-Cron-Events.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Schedule-Cron-Events.spec	11 Sep 2008 09:35:39 -0000	1.1
+++ perl-Schedule-Cron-Events.spec	11 Sep 2008 09:57:53 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           perl-Schedule-Cron-Events
 Version:        1.8
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Take a line from a crontab and find out when events will occur
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Schedule-Cron-Events/
 Source0:        http://www.cpan.org/modules/by-module/Schedule/Schedule-Cron-Events-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Set::Crontab)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -50,6 +51,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 11 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-15
+- add build requires ExtUtils::MakeMaker
+
 * Wed Sep 10 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-14
 - fix mixed tab and space
 



From mpg at fedoraproject.org  Thu Sep 11 09:58:35 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Thu, 11 Sep 2008 09:58:35 +0000 (UTC)
Subject: rpms/sugar-toolkit/OLPC-3 .cvsignore, 1.12, 1.13 sources, 1.13,
	1.14 sugar-toolkit.spec, 1.17, 1.18
Message-ID: <20080911095835.2A31C70131@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-toolkit/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16168

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.6-1
- #8394 sugar shell leaks presence service info
- #8392 Remove "dynamic" font height computation




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	1 Sep 2008 14:56:48 -0000	1.12
+++ .cvsignore	11 Sep 2008 09:58:04 -0000	1.13
@@ -1 +1 @@
-sugar-toolkit-0.82.5.tar.bz2
+sugar-toolkit-0.82.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	1 Sep 2008 14:56:48 -0000	1.13
+++ sources	11 Sep 2008 09:58:04 -0000	1.14
@@ -1 +1 @@
-aa52414fbe020ab2269867e58359803a  sugar-toolkit-0.82.5.tar.bz2
+ce1a33591f0242bf815e3cfa06ee62c9  sugar-toolkit-0.82.6.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sugar-toolkit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sugar-toolkit.spec	1 Sep 2008 14:56:48 -0000	1.17
+++ sugar-toolkit.spec	11 Sep 2008 09:58:04 -0000	1.18
@@ -5,7 +5,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.82.5
+Version: 0.82.6
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
@@ -65,6 +65,10 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.6-1
+- #8394 sugar shell leaks presence service info
+- #8392 Remove "dynamic" font height computation
+
 * Mon Sep 01 2008 Simon Schampijer <simon at laptop.org> - 0.82.5-1
 - Translation updates
 - Add plural information for all languages



From mpg at fedoraproject.org  Thu Sep 11 10:01:58 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Thu, 11 Sep 2008 10:01:58 +0000 (UTC)
Subject: rpms/sugar/OLPC-3 .cvsignore, 1.16, 1.17 sources, 1.16,
	1.17 sugar.spec, 1.19, 1.20
Message-ID: <20080911100158.8BA4570131@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17823

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.4-1
- #7480 Need to 'reset' the network configurations - short term fix
- #8368 Disable the server plugin if no server was specified




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	6 Sep 2008 16:06:04 -0000	1.16
+++ .cvsignore	11 Sep 2008 10:01:28 -0000	1.17
@@ -1 +1 @@
-sugar-0.82.3.tar.bz2
+sugar-0.82.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	6 Sep 2008 16:06:04 -0000	1.16
+++ sources	11 Sep 2008 10:01:28 -0000	1.17
@@ -1 +1 @@
-ac790847c2701ebe8858111ac171fe64  sugar-0.82.3.tar.bz2
+2c95d636cfdc8006aeea002582185c28  sugar-0.82.4.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sugar.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sugar.spec	6 Sep 2008 16:06:04 -0000	1.19
+++ sugar.spec	11 Sep 2008 10:01:28 -0000	1.20
@@ -3,7 +3,7 @@
 
 Summary: OLPC desktop environment
 Name: sugar
-Version: 0.82.3
+Version: 0.82.4
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
@@ -94,6 +94,10 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.4-1
+- #7480 Need to 'reset' the network configurations - short term fix
+- #8368 Disable the server plugin if no server was specified
+
 * Sat Sep  6 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.3-1
 - #8300 Shell _launchers are leaked
 - #7856 notify::active behaviour change



From transif at fedoraproject.org  Thu Sep 11 10:04:17 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 11 Sep 2008 10:04:17 +0000 (UTC)
Subject: comps/po de.po,1.23,1.24
Message-ID: <20080911100417.A1A1B70131@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18767/po

Modified Files:
	de.po 
Log Message:
    2008-09-11  Fabian Affolter <fabian at bernewireless.net> (via
fab at fedoraproject.org)
    
      * po/de.po: Updated German translation
    



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.23 -r 1.24 de.po
Index: de.po
===================================================================
RCS file: /cvs/pkgs/comps/po/de.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- de.po	10 Sep 2008 22:57:54 -0000	1.23
+++ de.po	11 Sep 2008 10:03:46 -0000	1.24
@@ -1,6 +1,4 @@
-# translation of comps.HEAD.de.po to German
-# translation of comps.HEAD.de.po to
-#
+# German translation of comps
 #
 # Ronny Buchmann <ronny-vlug at vlugnet.org> 2004, 2005.
 # Bernd Groh <bgroh at redhat.com>, 2003,2004.
@@ -10,13 +8,14 @@
 # Severin Heiniger <severinheiniger at gmail.com>, 2007.
 # Fabian Affolter <fab at fedoraproject.org>, 2007,2008.
 # Daniela Kugelmann <dkugelma at redhat.com >, 2008.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-10 18:57-0400\n"
-"PO-Revision-Date: 2008-09-09 10:26+1000\n"
-"Last-Translator: Daniela Kugelmann <dkugelma at redhat.com >\n"
+"POT-Creation-Date: 2008-09-11 03:29+0000\n"
+"PO-Revision-Date: 2008-09-11 12:02+0100\n"
+"Last-Translator: Fabian Affolter <fab at fedoraproject.org>\n"
 "Language-Team: German <i18 at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,188 +25,282 @@
 "X-Poedit-Language: German\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
+#: ../comps-f7.xml.in.h:1
+#: ../comps-f8.xml.in.h:1
+#: ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
-"Eine schlanke Desktop-Umgebung, die gut auf ??lteren Systemen funktioniert."
+msgstr "Eine schlanke Desktop-Umgebung, die gut auf ??lteren Systemen funktioniert."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../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:2
+#: ../comps-el4.xml.in.h:1
+#: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Verwaltungswerkzeuge"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
+#: ../comps-f7.xml.in.h:3
+#: ../comps-f8.xml.in.h:3
+#: ../comps-f9.xml.in.h:3
 #: ../comps-f10.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "Unterst??tzung f??r Afrikaans"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
+#: ../comps-f7.xml.in.h:4
+#: ../comps-f8.xml.in.h:4
+#: ../comps-f9.xml.in.h:4
 #: ../comps-f10.xml.in.h:4
 msgid "Albanian Support"
 msgstr "Unterst??tzung f??r Albanisch"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../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:5
+#: ../comps-el4.xml.in.h:2
+#: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
+#: ../comps-f7.xml.in.h:6
+#: ../comps-f8.xml.in.h:6
+#: ../comps-f9.xml.in.h:6
 #: ../comps-f10.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
 msgstr "Anwendungen zur Durchf??hrung einer Vielzahl von Aufgaben"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../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:7
+#: ../comps-el4.xml.in.h:4
+#: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Unterst??tzung f??r Arabisch"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../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:8
+#: ../comps-el4.xml.in.h:5
+#: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Unterst??tzung f??r Armenisch"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
+#: ../comps-f7.xml.in.h:9
+#: ../comps-f8.xml.in.h:9
+#: ../comps-f9.xml.in.h:9
 #: ../comps-f10.xml.in.h:9
 msgid "Assamese Support"
 msgstr "Unterst??tzung f??r Assamesisch"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../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:10
+#: ../comps-el4.xml.in.h:6
+#: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Schreiben und Publizieren"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
+#: ../comps-f7.xml.in.h:11
+#: ../comps-f8.xml.in.h:11
+#: ../comps-f9.xml.in.h:11
 #: ../comps-f10.xml.in.h:11
 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:12 ../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:12
+#: ../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-f7.xml.in.h:13
+#: ../comps-f8.xml.in.h:13
+#: ../comps-f9.xml.in.h:13
 #: ../comps-f10.xml.in.h:13
 msgid "Basic support for the Ruby programming language."
 msgstr "Basis-Unterst??tzung f??r die Programmiersprache Ruby."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
+#: ../comps-f7.xml.in.h:14
+#: ../comps-f8.xml.in.h:14
+#: ../comps-f9.xml.in.h:14
 #: ../comps-f10.xml.in.h:14
 msgid "Basque Support"
 msgstr "Unterst??tzung f??r Baskisch (Spanien)"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
+#: ../comps-f7.xml.in.h:15
+#: ../comps-f8.xml.in.h:15
+#: ../comps-f9.xml.in.h:15
 #: ../comps-f10.xml.in.h:15
 msgid "Belarusian Support"
 msgstr "Unterst??tzung f??r Belarussisch"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
+#: ../comps-f7.xml.in.h:16
+#: ../comps-f8.xml.in.h:16
+#: ../comps-f9.xml.in.h:16
 #: ../comps-f10.xml.in.h:16
 msgid "Bengali Support"
 msgstr "Unterst??tzung f??r Bengali"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
+#: ../comps-f7.xml.in.h:17
+#: ../comps-f8.xml.in.h:17
+#: ../comps-f9.xml.in.h:17
 #: ../comps-f10.xml.in.h:17
 msgid "Bhutanese Support"
 msgstr "Unterst??tzung f??r Bhutanisch"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
+#: ../comps-f7.xml.in.h:18
+#: ../comps-f8.xml.in.h:18
+#: ../comps-f9.xml.in.h:18
 #: ../comps-f10.xml.in.h:18
 msgid "Bosnian Support"
[...1848 lines suppressed...]
 msgstr "Unterst??tzung f??r Nepalisch"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:123
+#: ../comps-f8.xml.in.h:114
+#: ../comps-f9.xml.in.h:118
+#: ../comps-f10.xml.in.h:123
 msgid "Older bitmap and vector fonts packages"
 msgstr "??ltere Pakete mit Bitmap- und Vektor-Schriftarten"
 
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44
+#: ../comps-f9.xml.in.h:44
+#: ../comps-f10.xml.in.h:44
 msgid "Esperanto Support"
 msgstr "Unterst??tzung f??r Esperanto"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:94
+#: ../comps-f9.xml.in.h:91
+#: ../comps-f10.xml.in.h:94
 msgid "Kashubian Support"
 msgstr "Unterst??tzung f??r Kashubisch"
 
-#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:106
+#: ../comps-f9.xml.in.h:103
+#: ../comps-f10.xml.in.h:106
 msgid "Macedonian Support"
 msgstr "Unterst??tzung f??r Mazedonisch"
 
-#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:119
+#: ../comps-f9.xml.in.h:114
+#: ../comps-f10.xml.in.h:119
 msgid "Northern Sami Support"
 msgstr "Unterst??tzung f??r Nord-Sami"
 
-#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:135
+#: ../comps-f9.xml.in.h:130
+#: ../comps-f10.xml.in.h:135
 msgid "SUGAR Desktop Environment"
 msgstr "SUGAR Desktopumgebung"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:136
+#: ../comps-f9.xml.in.h:131
+#: ../comps-f10.xml.in.h:136
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
-msgstr ""
-"SUGAR ist die Desktopumgebung, welche f??r den OLPC XO entwickelt wurde."
+msgstr "SUGAR ist die Desktopumgebung, welche f??r den OLPC XO entwickelt wurde."
 
-#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:207
+#: ../comps-f9.xml.in.h:200
+#: ../comps-f10.xml.in.h:207
 msgid "Walloon Support"
 msgstr "Unterst??tzung f??r Wallonisch"
 
@@ -1202,9 +1631,8 @@
 msgstr "Eingabemethoden-Paket f??r die Eingabe von internationalem Text."
 
 #: ../comps-f10.xml.in.h:108
-#, fuzzy
 msgid "Maithili Support"
-msgstr "Unterst??tzung f??r Marathi"
+msgstr "Unterst??tzung f??r Maithili"
 
 #: ../comps-f10.xml.in.h:115
 msgid "Myanmar (Burmese) Support"
@@ -1215,88 +1643,70 @@
 msgstr "Unterst??tzung f??r Tajik"
 
 #: ../comps-f10.xml.in.h:201
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "Unterst??tzung f??r Tschechisch"
+msgstr "Unterst??tzung f??r Usbekisch"
 
-#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
+#: ../comps-el4.xml.in.h:3
+#: ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Anwendungen f??r eine Vielzahl von Aufgaben"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12
+#: ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "Unterst??tzung f??r DF??-Netzwerk"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
-msgid ""
-"GNOME is a powerful, graphical user interface which includes a panel, "
-"desktop, system icons, and a graphical file manager."
-msgstr ""
-"GNOME ist eine leistungsstarke grafische Benutzeroberfl??che mit Men??leiste, "
-"Desktop, Systemsymbolen und grafischem Dateimanager."
+#: ../comps-el4.xml.in.h:22
+#: ../comps-el5.xml.in.h:23
+msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "GNOME ist eine leistungsstarke grafische Benutzeroberfl??che mit Men??leiste, Desktop, Systemsymbolen und grafischem Dateimanager."
+
+#: ../comps-el4.xml.in.h:35
+#: ../comps-el5.xml.in.h:35
+msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "KDE ist eine leistungsstarke, grafische Benutzeroberfl??che mit Men??leiste, Desktop, Systemsymbolen und grafischem Dateimanager."
+
+#: ../comps-el4.xml.in.h:44
+#: ../comps-el5.xml.in.h:44
+msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi."
+msgstr "Diese auch als Text-Editoren bezeichneten Programme erm??glichen das Anlegen und Bearbeiten von Dateien. Dazu geh??ren Emacs und Vi."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
-msgid ""
-"KDE is a powerful, graphical user interface which includes a panel, desktop, "
-"system icons, and a graphical file manager."
-msgstr ""
-"KDE ist eine leistungsstarke, grafische Benutzeroberfl??che mit Men??leiste, "
-"Desktop, Systemsymbolen und grafischem Dateimanager."
-
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
-msgid ""
-"Sometimes called text editors, these are programs that allow you to create "
-"and edit files. These include Emacs and Vi."
-msgstr ""
-"Diese auch als Text-Editoren bezeichneten Programme erm??glichen das Anlegen "
-"und Bearbeiten von Dateien. Dazu geh??ren Emacs und Vi."
-
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50
+#: ../comps-el5.xml.in.h:48
 msgid "The XEmacs text editor."
 msgstr "Der Text-Editor XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
-msgid ""
-"These tools allow you to create documentation in the DocBook format and "
-"convert them to HTML, PDF, Postscript, and text."
-msgstr ""
-"Mit diesen Programmen k??nnen Sie Dokumentationen im DocBook-Format anlegen "
-"und diese in die Formate HTML, PDF, Postscript und Text konvertieren."
+#: ../comps-el4.xml.in.h:54
+#: ../comps-el5.xml.in.h:52
+msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text."
+msgstr "Mit diesen Programmen k??nnen Sie Dokumentationen im DocBook-Format anlegen und diese in die Formate HTML, PDF, Postscript und Text konvertieren."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64
+#: ../comps-el5.xml.in.h:62
 msgid "This group is a collection of network servers for specific purposes"
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Netzwerkservern f??r verschiedene "
-"Zwecke."
+msgstr "Diese Gruppe umfasst eine Sammlung von Netzwerkservern f??r verschiedene Zwecke."
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
-"arabische Umgebungen."
-
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
-"hebr??ische Umgebungen."
+#: ../comps-el4.xml.in.h:65
+#: ../comps-el5.xml.in.h:63
+msgid "This group is a collection of tools and resources of Arabic environments."
+msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von arabische Umgebungen."
+
+#: ../comps-el4.xml.in.h:67
+#: ../comps-el5.xml.in.h:66
+msgid "This group is a collection of tools and resources of Hebrew environments."
+msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von hebr??ische Umgebungen."
+
+#: ../comps-el4.xml.in.h:68
+#: ../comps-el5.xml.in.h:67
+msgid "This group is a collection of tools and resources of Japanese environments."
+msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von japanische Umgebungen."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
-"japanische Umgebungen."
-
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77
+#: ../comps-el5.xml.in.h:77
 msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
-"tschechischen Umgebungen."
+msgid "This group is a collection of tools and resources of Czech environments."
+msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von tschechischen Umgebungen."
+



From ssp at fedoraproject.org  Thu Sep 11 10:05:05 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu, 11 Sep 2008 10:05:05 +0000 (UTC)
Subject: rpms/hal-info/devel hal-info.spec,1.26,1.27
Message-ID: <20080911100505.907B170131@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/hal-info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19022

Modified Files:
	hal-info.spec 
Log Message:
Patch for Lenovo 3000 video key


Index: hal-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/hal-info.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- hal-info.spec	13 Aug 2008 18:43:40 -0000	1.26
+++ hal-info.spec	11 Sep 2008 10:04:35 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Device information files for HAL
 Name: hal-info
 Version: 20080813
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: AFL or GPLv2
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/Software/hal
@@ -10,6 +10,7 @@
 BuildArch: noarch
 Requires: hal >= 0.5.10
 BuildRequires: hal-devel >= 0.5.10
+Patch0: lenovo-video-key.patch
 
 %description 
 The hal-info package contains various device information files (also
@@ -17,6 +18,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .lenovo-video-key
 
 %build
 %configure
@@ -35,6 +37,9 @@
 %{_datadir}/hal/fdi/preprobe/10osvendor/*.fdi
 
 %changelog
+* Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> - 20080813-2
+- Add patch for Lenovo 3000 video key
+
 * Wed Aug 13 2008 Matthew Garrett <mjg at redhat.com> - 20080813-1
 - update to git snapshot
 



From ssp at fedoraproject.org  Thu Sep 11 10:06:36 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu, 11 Sep 2008 10:06:36 +0000 (UTC)
Subject: rpms/hal-info/devel lenovo-video-key.patch,NONE,1.1
Message-ID: <20080911100636.B939270131@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/hal-info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19826

Added Files:
	lenovo-video-key.patch 
Log Message:
Add the patch

lenovo-video-key.patch:

--- NEW FILE lenovo-video-key.patch ---
diff --git a/fdi/information/10freedesktop/30-keymap-lenovo.fdi b/fdi/information/10freedesktop/30-keymap-lenovo.fdi
index 973f0e1..4785caa 100644
--- a/fdi/information/10freedesktop/30-keymap-lenovo.fdi
+++ b/fdi/information/10freedesktop/30-keymap-lenovo.fdi
@@ -8,6 +8,7 @@
 
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="LENOVO">
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="3000">
+	  <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn-F7 video -->
           <append key="input.keymap.data" type="strlist">e016:wlan</append> <!-- Fn+F5 wireless -->
           <append key="input.keymap.data" type="strlist">e017:sleep</append> <!-- Fn+F4 suspend -->
           <append key="input.keymap.data" type="strlist">e018:suspend</append> <!-- Fn+F12 hibernate -->



From msuchy at fedoraproject.org  Thu Sep 11 10:07:16 2008
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Thu, 11 Sep 2008 10:07:16 +0000 (UTC)
Subject: rpms/perl-Schedule-Cron-Events/EL-4 import.log, 1.1,
	1.2 perl-Schedule-Cron-Events.spec, 1.1, 1.2
Message-ID: <20080911100716.AA25B70131@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/extras/rpms/perl-Schedule-Cron-Events/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19785/EL-4

Modified Files:
	import.log perl-Schedule-Cron-Events.spec 
Log Message:
Fix missing buildrequires.



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Schedule-Cron-Events/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Sep 2008 09:27:47 -0000	1.1
+++ import.log	11 Sep 2008 10:06:46 -0000	1.2
@@ -1 +1,2 @@
 perl-Schedule-Cron-Events-1_8-14_f10:EL-4:perl-Schedule-Cron-Events-1.8-14.f10.src.rpm:1221125243
+perl-Schedule-Cron-Events-1_8-15:EL-4:perl-Schedule-Cron-Events-1.8-15.src.rpm:1221127575


Index: perl-Schedule-Cron-Events.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Schedule-Cron-Events/EL-4/perl-Schedule-Cron-Events.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Schedule-Cron-Events.spec	11 Sep 2008 09:27:47 -0000	1.1
+++ perl-Schedule-Cron-Events.spec	11 Sep 2008 10:06:46 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           perl-Schedule-Cron-Events
 Version:        1.8
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Take a line from a crontab and find out when events will occur
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Schedule-Cron-Events/
 Source0:        http://www.cpan.org/modules/by-module/Schedule/Schedule-Cron-Events-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Set::Crontab)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -50,6 +51,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 11 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-15
+- add build requires ExtUtils::MakeMaker
+
 * Wed Sep 10 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-14
 - fix mixed tab and space
 



From ssp at fedoraproject.org  Thu Sep 11 10:07:43 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu, 11 Sep 2008 10:07:43 +0000 (UTC)
Subject: rpms/hal-info/devel hal-info.spec,1.27,1.28
Message-ID: <20080911100743.7B87B70131@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/hal-info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20266

Modified Files:
	hal-info.spec 
Log Message:
Bump release


Index: hal-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/hal-info.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- hal-info.spec	11 Sep 2008 10:04:35 -0000	1.27
+++ hal-info.spec	11 Sep 2008 10:07:13 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Device information files for HAL
 Name: hal-info
 Version: 20080813
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: AFL or GPLv2
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/Software/hal



From msuchy at fedoraproject.org  Thu Sep 11 10:08:51 2008
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Thu, 11 Sep 2008 10:08:51 +0000 (UTC)
Subject: rpms/perl-Schedule-Cron-Events/EL-5 import.log, 1.1,
	1.2 perl-Schedule-Cron-Events.spec, 1.1, 1.2
Message-ID: <20080911100851.ACBC670131@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/extras/rpms/perl-Schedule-Cron-Events/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20795/EL-5

Modified Files:
	import.log perl-Schedule-Cron-Events.spec 
Log Message:
fix missing build requires



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Schedule-Cron-Events/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Sep 2008 09:29:55 -0000	1.1
+++ import.log	11 Sep 2008 10:08:21 -0000	1.2
@@ -1 +1,2 @@
 perl-Schedule-Cron-Events-1_8-14_f10:EL-5:perl-Schedule-Cron-Events-1.8-14.f10.src.rpm:1221125362
+perl-Schedule-Cron-Events-1_8-15:EL-5:perl-Schedule-Cron-Events-1.8-15.src.rpm:1221127666


Index: perl-Schedule-Cron-Events.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Schedule-Cron-Events/EL-5/perl-Schedule-Cron-Events.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Schedule-Cron-Events.spec	11 Sep 2008 09:29:55 -0000	1.1
+++ perl-Schedule-Cron-Events.spec	11 Sep 2008 10:08:21 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           perl-Schedule-Cron-Events
 Version:        1.8
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Take a line from a crontab and find out when events will occur
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Schedule-Cron-Events/
 Source0:        http://www.cpan.org/modules/by-module/Schedule/Schedule-Cron-Events-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Set::Crontab)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -50,6 +51,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 11 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-15
+- add build requires ExtUtils::MakeMaker
+
 * Wed Sep 10 2008 Miroslav Such?? <msuchy at redhat.com> 1.8-14
 - fix mixed tab and space
 



From kdudka at fedoraproject.org  Thu Sep 11 10:18:59 2008
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Thu, 11 Sep 2008 10:18:59 +0000 (UTC)
Subject: rpms/docbook-style-xsl/F-9 docbook-style-xsl.spec, 1.46,
	1.47 docbook-xsl-list-item-body.patch, 1.1,
	1.2 docbook-xsl-marginleft.patch, 1.6,
	1.7 docbook-xsl-newmethods.patch, 1.3,
	1.4 docbook-xsl-non-constant-expressions.patch, 1.2,
	1.3 docbook-xsl-pagesetup.patch, 1.2, 1.3
Message-ID: <20080911101859.E990C70131@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/docbook-style-xsl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24740

Modified Files:
	docbook-style-xsl.spec docbook-xsl-list-item-body.patch 
	docbook-xsl-marginleft.patch docbook-xsl-newmethods.patch 
	docbook-xsl-non-constant-expressions.patch 
	docbook-xsl-pagesetup.patch 
Log Message:
tiny changes in docbook-xsl-newmethods.patch to work with xalan (#461463)


Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-9/docbook-style-xsl.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- docbook-style-xsl.spec	14 Dec 2007 12:26:22 -0000	1.46
+++ docbook-style-xsl.spec	11 Sep 2008 10:18:29 -0000	1.47
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
 Version: 1.73.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML
@@ -117,6 +117,11 @@
 fi
 
 %changelog
+* Thu Sep 11 2008 Kamil Dudka <kdudka at redhat.com> 1.73.2-10
+- tiny changes in docbook-xsl-newmethods.patch to work with xalan
+  (#461463)
+- rediffed all patches
+
 * Fri Dec 14 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-9
 - added fixes for passivetex extension and list-item-body
   (#161371)

docbook-xsl-list-item-body.patch:

Index: docbook-xsl-list-item-body.patch
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-9/docbook-xsl-list-item-body.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- docbook-xsl-list-item-body.patch	14 Dec 2007 12:26:22 -0000	1.1
+++ docbook-xsl-list-item-body.patch	11 Sep 2008 10:18:29 -0000	1.2
@@ -1,6 +1,6 @@
-diff -urNp docbook-xsl-1.73.2-orig/fo/lists.xsl docbook-xsl-1.73.2/fo/lists.xsl
---- docbook-xsl-1.73.2-orig/fo/lists.xsl	2007-12-14 12:27:58.000000000 +0100
-+++ docbook-xsl-1.73.2/fo/lists.xsl	2007-12-14 12:43:25.000000000 +0100
+diff -ruNp docbook-xsl-1.73.2.orig/fo/lists.xsl docbook-xsl-1.73.2/fo/lists.xsl
+--- docbook-xsl-1.73.2.orig/fo/lists.xsl	2008-09-11 11:06:31.000000000 +0200
++++ docbook-xsl-1.73.2/fo/lists.xsl	2008-09-11 11:07:40.000000000 +0200
 @@ -286,9 +286,17 @@
        </fo:block>
      </fo:list-item-label>

docbook-xsl-marginleft.patch:

Index: docbook-xsl-marginleft.patch
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-9/docbook-xsl-marginleft.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- docbook-xsl-marginleft.patch	4 Dec 2007 15:07:09 -0000	1.6
+++ docbook-xsl-marginleft.patch	11 Sep 2008 10:18:29 -0000	1.7
@@ -1,40 +1,7 @@
---- docbook-xsl-1.68.0/fo/pagesetup.xsl.marginleft	2005-02-09 12:09:37.000000000 +0000
-+++ docbook-xsl-1.68.0/fo/pagesetup.xsl	2005-02-09 14:53:59.088068221 +0000
-@@ -34,29 +34,11 @@
-      margin-left="{$page.margin.outer} - {$title.margin.left}"
- -->
- <xsl:param name="margin.left.outer">
--  <xsl:choose>
--    <xsl:when test="$passivetex.extensions != 0">
--      <xsl:value-of select="$page.margin.outer"/>
--    </xsl:when>
--    <xsl:otherwise>
--      <xsl:value-of select="$page.margin.outer"/>
--      <xsl:text> - </xsl:text>
--      <xsl:value-of select="$title.margin.left"/>
--    </xsl:otherwise>
--  </xsl:choose>
-+  <xsl:value-of select="$page.margin.outer"/>
- </xsl:param>
- 
- <xsl:param name="margin.left.inner">
--  <xsl:choose>
--    <xsl:when test="$passivetex.extensions != 0">
--      <xsl:value-of select="$page.margin.inner"/>
--    </xsl:when>
--    <xsl:otherwise>
--      <xsl:value-of select="$page.margin.inner"/>
--      <xsl:text> - </xsl:text>
--      <xsl:value-of select="$title.margin.left"/>
--    </xsl:otherwise>
--  </xsl:choose>
-+  <xsl:value-of select="$page.margin.inner"/>
- </xsl:param>
- 
- <xsl:template name="setup.pagemasters">
---- docbook-xsl-1.68.0/fo/lists.xsl.marginleft	2005-02-09 12:09:37.000000000 +0000
-+++ docbook-xsl-1.68.0/fo/lists.xsl	2005-02-09 14:55:06.682138599 +0000
-@@ -371,7 +371,7 @@
+diff -ruNp docbook-xsl-1.73.2.orig/fo/lists.xsl docbook-xsl-1.73.2/fo/lists.xsl
+--- docbook-xsl-1.73.2.orig/fo/lists.xsl	2007-07-07 10:15:39.000000000 +0200
++++ docbook-xsl-1.73.2/fo/lists.xsl	2008-09-11 10:52:43.000000000 +0200
+@@ -362,7 +362,7 @@
        </xsl:when>
        <xsl:when test="@termlength">
          <xsl:variable name="termlength.is.number">
@@ -42,8 +9,8 @@
 +          <xsl:value-of select="@termlength"/>
          </xsl:variable>
          <xsl:choose>
-           <xsl:when test="$termlength.is.number = 'NaN'">
-@@ -380,15 +380,7 @@
+           <xsl:when test="string($termlength.is.number) = 'NaN'">
+@@ -371,15 +371,7 @@
            </xsl:when>
            <xsl:otherwise>
              <xsl:value-of select="@termlength"/>
@@ -60,7 +27,7 @@
            </xsl:otherwise>
          </xsl:choose>
        </xsl:when>
-@@ -397,15 +389,7 @@
+@@ -388,15 +380,7 @@
            <xsl:with-param name="terms" select="varlistentry/term"/>
            <xsl:with-param name="maxlength" select="$variablelist.max.termlength"/>
          </xsl:call-template>
@@ -77,7 +44,7 @@
        </xsl:otherwise>
      </xsl:choose>
    </xsl:variable>
-@@ -419,17 +403,7 @@
+@@ -410,17 +394,7 @@
  
    <xsl:variable name="label-separation">1em</xsl:variable>
    <xsl:variable name="distance-between-starts">
@@ -96,9 +63,45 @@
    </xsl:variable>
  
    <xsl:if test="title">
---- docbook-xsl-1.68.0/fo/param.xsl.marginleft	2005-02-09 12:20:55.000000000 +0000
-+++ docbook-xsl-1.68.0/fo/param.xsl	2005-02-09 14:53:59.115063057 +0000
-@@ -95,8 +95,8 @@
+diff -ruNp docbook-xsl-1.73.2.orig/fo/pagesetup.xsl docbook-xsl-1.73.2/fo/pagesetup.xsl
+--- docbook-xsl-1.73.2.orig/fo/pagesetup.xsl	2008-09-11 10:50:36.000000000 +0200
++++ docbook-xsl-1.73.2/fo/pagesetup.xsl	2008-09-11 10:52:43.000000000 +0200
+@@ -34,29 +34,11 @@
+      margin-left="{$page.margin.outer} - {$title.margin.left}"
+ -->
+ <xsl:param name="margin.left.outer">
+-  <xsl:choose>
+-    <xsl:when test="$passivetex.extensions != 0">
+-      <xsl:value-of select="$page.margin.outer"/>
+-    </xsl:when>
+-    <xsl:otherwise>
+-      <xsl:value-of select="$page.margin.outer"/>
+-      <xsl:text> - </xsl:text>
+-      <xsl:value-of select="$title.margin.left"/>
+-    </xsl:otherwise>
+-  </xsl:choose>
++  <xsl:value-of select="$page.margin.outer"/>
+ </xsl:param>
+ 
+ <xsl:param name="margin.left.inner">
+-  <xsl:choose>
+-    <xsl:when test="$passivetex.extensions != 0">
+-      <xsl:value-of select="$page.margin.inner"/>
+-    </xsl:when>
+-    <xsl:otherwise>
+-      <xsl:value-of select="$page.margin.inner"/>
+-      <xsl:text> - </xsl:text>
+-      <xsl:value-of select="$title.margin.left"/>
+-    </xsl:otherwise>
+-  </xsl:choose>
++  <xsl:value-of select="$page.margin.inner"/>
+ </xsl:param>
+ 
+ <xsl:template name="setup.pagemasters">
+diff -ruNp docbook-xsl-1.73.2.orig/fo/param.xsl docbook-xsl-1.73.2/fo/param.xsl
+--- docbook-xsl-1.73.2.orig/fo/param.xsl	2007-08-30 15:43:12.000000000 +0200
++++ docbook-xsl-1.73.2/fo/param.xsl	2008-09-11 10:52:43.000000000 +0200
+@@ -133,8 +133,8 @@
  <xsl:attribute-set name="component.title.properties">
    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
    <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
@@ -107,5 +110,5 @@
 +  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master*0.8, 'pt')"/></xsl:attribute>
 +  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master*1.2, 'pt')"/></xsl:attribute>
    <xsl:attribute name="hyphenate">false</xsl:attribute>
-   <xsl:attribute name="start-indent">0pt</xsl:attribute>
- </xsl:attribute-set>
+   <xsl:attribute name="text-align">
+     <xsl:choose>

docbook-xsl-newmethods.patch:

Index: docbook-xsl-newmethods.patch
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-9/docbook-xsl-newmethods.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- docbook-xsl-newmethods.patch	29 Aug 2007 15:13:32 -0000	1.3
+++ docbook-xsl-newmethods.patch	11 Sep 2008 10:18:29 -0000	1.4
@@ -1,6 +1,6 @@
-diff -urNp docbook-xsl-1.72.0/html/docbook.xsl devel/html/docbook.xsl
---- docbook-xsl-1.72.0/html/docbook.xsl	2007-01-21 18:39:03.000000000 +0100
-+++ devel/html/docbook.xsl	2007-06-18 13:19:45.000000000 +0200
+diff -ruNp docbook-xsl-1.73.2.orig/html/docbook.xsl docbook-xsl-1.73.2/html/docbook.xsl
+--- docbook-xsl-1.73.2.orig/html/docbook.xsl	2007-08-09 09:48:42.000000000 +0200
++++ docbook-xsl-1.73.2/html/docbook.xsl	2008-09-11 10:54:26.000000000 +0200
 @@ -25,6 +25,7 @@
  <xsl:include href="../VERSION"/>
  <xsl:include href="param.xsl"/>
@@ -8,8 +8,8 @@
 +<xsl:include href="../lib/dumpfragment.xsl"/>
  <xsl:include href="../common/l10n.xsl"/>
  <xsl:include href="../common/common.xsl"/>
- <xsl:include href="../common/labels.xsl"/>
-@@ -42,6 +43,7 @@
+ <xsl:include href="../common/utility.xsl"/>
+@@ -43,6 +44,7 @@
  <xsl:include href="graphics.xsl"/>
  <xsl:include href="xref.xsl"/>
  <xsl:include href="formal.xsl"/>
@@ -17,10 +17,10 @@
  <xsl:include href="table.xsl"/>
  <xsl:include href="htmltbl.xsl"/>
  <xsl:include href="sections.xsl"/>
-diff -urNp docbook-xsl-1.72.0/html/dtbl.xsl devel/html/dtbl.xsl
---- docbook-xsl-1.72.0/html/dtbl.xsl	1970-01-01 01:00:00.000000000 +0100
-+++ devel/html/dtbl.xsl	2007-06-18 14:00:05.000000000 +0200
-@@ -0,0 +1,292 @@
+diff -ruNp docbook-xsl-1.73.2.orig/html/dtbl.xsl docbook-xsl-1.73.2/html/dtbl.xsl
+--- docbook-xsl-1.73.2.orig/html/dtbl.xsl	1970-01-01 01:00:00.000000000 +0100
++++ docbook-xsl-1.73.2/html/dtbl.xsl	2008-09-11 10:55:42.000000000 +0200
+@@ -0,0 +1,293 @@
 +<?xml version="1.0" encoding="US-ASCII"?>
 +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 +                xmlns:exsl="http://exslt.org/common"
@@ -201,11 +201,12 @@
 +</xsl:template>
 +
 +<xsl:template match="col" mode="dtbl-correct-rounding-error">
++  <xsl:param name="relative.widths.total"/>
 +  <xsl:param name="error"/>
 +
 +  <xsl:element name="col">
 +    <xsl:attribute name="width">
-+      <xsl:value-of select="concat(round((@relwidth div $relative.widths.total) * 100))"/>
++      <xsl:value-of select="concat('', round((@relwidth div $relative.widths.total) * 100))"/>
 +    </xsl:attribute>
 +    <xsl:apply-templates mode="dtbl-use-absolute-widths"/>
 +  </xsl:element>
@@ -313,23 +314,20 @@
 +</xsl:template>
 +
 +</xsl:stylesheet>
-diff -urNp docbook-xsl-1.72.0/html/param.xsl devel/html/param.xsl
---- docbook-xsl-1.72.0/html/param.xsl	2007-01-23 13:33:37.000000000 +0100
-+++ devel/html/param.xsl	2007-06-18 13:26:41.000000000 +0200
+diff -ruNp docbook-xsl-1.73.2.orig/html/param.xsl docbook-xsl-1.73.2/html/param.xsl
+--- docbook-xsl-1.73.2.orig/html/param.xsl	2007-08-30 15:43:10.000000000 +0200
++++ docbook-xsl-1.73.2/html/param.xsl	2008-09-11 10:54:26.000000000 +0200
 @@ -64,6 +64,7 @@ div.annotation-close { position: absolut
-                       right: 2px;
-                     }
+                      }
  </xsl:param>
-
+ 
 +<xsl:param name="adjustColumnWidths.debug" select="false()"/>
  <xsl:param name="annotation.js">
  <xsl:text>http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js</xsl:text></xsl:param>
  
- <xsl:param name="annotation.graphic.open">http://docbook.sourceforge.net/release/images/annot-open.png</xsl:param>
- <xsl:param name="annotation.graphic.close">
-diff -urNp docbook-xsl-1.72.0/html/table.xsl devel/html/table.xsl
---- docbook-xsl-1.72.0/html/table.xsl	2006-12-06 10:28:33.000000000 +0100
-+++ devel/html/table.xsl	2007-06-18 13:30:00.000000000 +0200
+diff -ruNp docbook-xsl-1.73.2.orig/html/table.xsl docbook-xsl-1.73.2/html/table.xsl
+--- docbook-xsl-1.73.2.orig/html/table.xsl	2007-07-12 02:28:40.000000000 +0200
++++ docbook-xsl-1.73.2/html/table.xsl	2008-09-11 10:54:26.000000000 +0200
 @@ -5,7 +5,8 @@
                  xmlns:xtbl="xalan://com.nwalsh.xalan.Table"
                  xmlns:lxslt="http://xml.apache.org/xslt"
@@ -340,7 +338,7 @@
                  version='1.0'>
  
  <xsl:include href="../common/table.xsl"/>
-@@ -373,6 +374,9 @@
+@@ -364,6 +365,9 @@
            <xsl:when test="$use.extensions != 0
                            and $tablecolumns.extension != 0">
              <xsl:choose>
@@ -350,7 +348,7 @@
                <xsl:when test="function-available('stbl:convertLength')">
                  <xsl:value-of select="stbl:convertLength($table.width)"/>
                </xsl:when>
-@@ -397,6 +401,9 @@
+@@ -388,6 +392,9 @@
        <xsl:when test="$use.extensions != 0
                        and $tablecolumns.extension != 0">
          <xsl:choose>
@@ -360,9 +358,9 @@
            <xsl:when test="function-available('stbl:adjustColumnWidths')">
              <xsl:copy-of select="stbl:adjustColumnWidths($colgroup)"/>
            </xsl:when>
-diff -urNp docbook-xsl-1.72.0/lib/dumpfragment.xsl devel/lib/dumpfragment.xsl
---- docbook-xsl-1.72.0/lib/dumpfragment.xsl	1970-01-01 01:00:00.000000000 +0100
-+++ devel/lib/dumpfragment.xsl	2007-06-18 14:00:52.000000000 +0200
+diff -ruNp docbook-xsl-1.73.2.orig/lib/dumpfragment.xsl docbook-xsl-1.73.2/lib/dumpfragment.xsl
+--- docbook-xsl-1.73.2.orig/lib/dumpfragment.xsl	1970-01-01 01:00:00.000000000 +0100
++++ docbook-xsl-1.73.2/lib/dumpfragment.xsl	2008-09-11 10:54:26.000000000 +0200
 @@ -0,0 +1,30 @@
 +<?xml version="1.0" encoding="US-ASCII"?>
 +<xsl:stylesheet version="1.0"

docbook-xsl-non-constant-expressions.patch:

Index: docbook-xsl-non-constant-expressions.patch
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-9/docbook-xsl-non-constant-expressions.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docbook-xsl-non-constant-expressions.patch	11 Dec 2007 13:08:23 -0000	1.2
+++ docbook-xsl-non-constant-expressions.patch	11 Sep 2008 10:18:29 -0000	1.3
@@ -1,6 +1,6 @@
-diff -ur docbook-xsl-1.73.2-orig/fo/param.xsl docbook-xsl-1.73.2/fo/param.xsl
---- docbook-xsl-1.73.2-orig/fo/param.xsl	2007-12-03 15:49:14.000000000 +0100
-+++ docbook-xsl-1.73.2/fo/param.xsl	2007-12-04 15:49:46.000000000 +0100
+diff -ruNp docbook-xsl-1.73.2.orig/fo/param.xsl docbook-xsl-1.73.2/fo/param.xsl
+--- docbook-xsl-1.73.2.orig/fo/param.xsl	2008-09-11 11:06:31.000000000 +0200
++++ docbook-xsl-1.73.2/fo/param.xsl	2008-09-11 11:07:06.000000000 +0200
 @@ -23,8 +23,8 @@
    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
@@ -12,7 +12,7 @@
    <xsl:attribute name="hyphenate">false</xsl:attribute>
    <xsl:attribute name="text-align">center</xsl:attribute>
  </xsl:attribute-set>
-@@ -331,8 +331,8 @@
+@@ -331,8 +331,8 @@ set       toc,title
    <xsl:attribute name="font-weight">bold</xsl:attribute>
    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
    <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master,'pt')"/></xsl:attribute>

docbook-xsl-pagesetup.patch:

Index: docbook-xsl-pagesetup.patch
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-9/docbook-xsl-pagesetup.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docbook-xsl-pagesetup.patch	3 Dec 2007 15:36:43 -0000	1.2
+++ docbook-xsl-pagesetup.patch	11 Sep 2008 10:18:29 -0000	1.3
@@ -1,10 +1,10 @@
-diff -urp docbook-xsl-1.73.2-orig/fo/pagesetup.xsl docbook-xsl-1.73.2/fo/pagesetup.xsl
---- docbook-xsl-1.73.2-orig/fo/pagesetup.xsl	2007-12-03 14:54:28.000000000 +0100
-+++ docbook-xsl-1.73.2/fo/pagesetup.xsl	2007-12-03 15:24:32.000000000 +0100
-@@ -1679,37 +1679,82 @@
+diff -ruNp docbook-xsl-1.73.2.orig/fo/pagesetup.xsl docbook-xsl-1.73.2/fo/pagesetup.xsl
+--- docbook-xsl-1.73.2.orig/fo/pagesetup.xsl	2007-06-29 01:23:31.000000000 +0200
++++ docbook-xsl-1.73.2/fo/pagesetup.xsl	2008-09-11 10:50:36.000000000 +0200
+@@ -1697,36 +1697,81 @@
          <xsl:with-param name="gentext-key" select="$gentext-key"/>
        </xsl:call-template>
-
+ 
 -      <fo:table-column column-number="1">
 -        <xsl:attribute name="column-width">
 -          <xsl:text>proportional-column-width(</xsl:text>
@@ -110,11 +110,10 @@
 +          </fo:table-column>
 +        </xsl:otherwise>
 +      </xsl:choose>
-
+ 
        <fo:table-body>
          <fo:table-row>
-           <xsl:attribute name="block-progression-dimension.minimum">
-@@ -2003,36 +2046,81 @@
+@@ -2021,36 +2066,81 @@
          <xsl:with-param name="sequence" select="$sequence"/>
          <xsl:with-param name="gentext-key" select="$gentext-key"/>
        </xsl:call-template>



From mpg at fedoraproject.org  Thu Sep 11 10:28:53 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Thu, 11 Sep 2008 10:28:53 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel sources, 1.15, 1.16 sugar-toolkit.spec,
	1.20, 1.21
Message-ID: <20080911102853.689C370131@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28196

Modified Files:
	sources sugar-toolkit.spec 
Log Message:
* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.6-1
- #8394 sugar shell leaks presence service info
- #8392 Remove "dynamic" font height computation




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	1 Sep 2008 15:01:00 -0000	1.15
+++ sources	11 Sep 2008 10:28:22 -0000	1.16
@@ -1 +1 @@
-aa52414fbe020ab2269867e58359803a  sugar-toolkit-0.82.5.tar.bz2
+ce1a33591f0242bf815e3cfa06ee62c9  sugar-toolkit-0.82.6.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sugar-toolkit.spec	9 Sep 2008 14:40:25 -0000	1.20
+++ sugar-toolkit.spec	11 Sep 2008 10:28:23 -0000	1.21
@@ -5,8 +5,8 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.82.5
-Release: 4%{?dist}
+Version: 0.82.6
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -19,8 +19,6 @@
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: remove-pseudopo.patch
-
 BuildRequires: pkgconfig
 BuildRequires: pygtk2-devel
 BuildRequires: gettext
@@ -46,7 +44,6 @@
 
 %prep
 %setup -q
-%patch1  -p1 -b .pseudopo
 
 %build
 %configure
@@ -70,6 +67,10 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.6-1
+- #8394 sugar shell leaks presence service info
+- #8392 Remove "dynamic" font height computation
+
 * Tue Sep 9 2008 Simon Schampijer <simon at laptop.org> - 0.82.5-4
 - remove pseudo.po from the source tarball
 



From mpg at fedoraproject.org  Thu Sep 11 10:36:34 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Thu, 11 Sep 2008 10:36:34 +0000 (UTC)
Subject: rpms/sugar/devel sources,1.16,1.17 sugar.spec,1.23,1.24
Message-ID: <20080911103634.2091C70131@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31093

Modified Files:
	sources sugar.spec 
Log Message:
* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.4-1
- #7480 Need to 'reset' the network configurations - short term fix
- #8368 Disable the server plugin if no server was specified




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	6 Sep 2008 16:10:25 -0000	1.16
+++ sources	11 Sep 2008 10:36:03 -0000	1.17
@@ -1 +1 @@
-ac790847c2701ebe8858111ac171fe64  sugar-0.82.3.tar.bz2
+2c95d636cfdc8006aeea002582185c28  sugar-0.82.4.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sugar.spec	6 Sep 2008 18:22:31 -0000	1.23
+++ sugar.spec	11 Sep 2008 10:36:03 -0000	1.24
@@ -3,8 +3,8 @@
 
 Summary: OLPC desktop environment
 Name: sugar
-Version: 0.82.3
-Release: 2%{?dist}
+Version: 0.82.4
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/sugar
@@ -94,6 +94,10 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.4-1
+- #7480 Need to 'reset' the network configurations - short term fix
+- #8368 Disable the server plugin if no server was specified
+
 * Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.82.3-2
 - fix license tag
 



From mpg at fedoraproject.org  Thu Sep 11 10:46:41 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Thu, 11 Sep 2008 10:46:41 +0000 (UTC)
Subject: rpms/sugar-journal/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 sugar-journal.spec, 1.5, 1.6
Message-ID: <20080911104641.EAC8670131@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-journal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2356

Modified Files:
	.cvsignore sources sugar-journal.spec 
Log Message:
* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 99-1
- #8287 8.2-757: Copy-to-clipboard broken 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-journal/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Aug 2008 00:41:02 -0000	1.4
+++ .cvsignore	11 Sep 2008 10:46:11 -0000	1.5
@@ -1 +1 @@
-Journal-98.tar.bz2
+Journal-99.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-journal/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Aug 2008 00:41:02 -0000	1.4
+++ sources	11 Sep 2008 10:46:11 -0000	1.5
@@ -1 +1 @@
-04132404d45f0d67fb9e7e8c79df0348  Journal-98.tar.bz2
+f68a4cdb44e71889f712b2aa9b096bc3  Journal-99.tar.bz2


Index: sugar-journal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-journal/devel/sugar-journal.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sugar-journal.spec	30 Aug 2008 01:23:32 -0000	1.5
+++ sugar-journal.spec	11 Sep 2008 10:46:11 -0000	1.6
@@ -2,7 +2,7 @@
 %define alphatag 20080822git%{commitid}
 
 Name:           sugar-journal
-Version:        98
+Version:        99
 Release:        1%{?dist}
 #Release:        4.%{alphatag}%{?dist}
 Summary:        Journal for Sugar
@@ -113,6 +113,9 @@
 %lang(zh_TW) %{sugaractivitydir}/Journal.activity/locale/zh_TW/
 
 %changelog
+* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 99-1
+- #8287 8.2-757: Copy-to-clipboard broken in Journal
+
 * Thu Aug 28 2008 Simon Schampijer <simon at laptop.org> - 98-1
 - 7588 Sugar should provide messages indicating when NAND is 'getting full' and 'critically full'
 - 6800 Journal window should be mirrored in RTL locales 



From ssp at fedoraproject.org  Thu Sep 11 10:54:16 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu, 11 Sep 2008 10:54:16 +0000 (UTC)
Subject: rpms/hal-info/devel hal-info.spec,1.28,1.29
Message-ID: <20080911105416.963F770131@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/hal-info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4842

Modified Files:
	hal-info.spec 
Log Message:
Correct Patch vs Patch0


Index: hal-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/hal-info.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- hal-info.spec	11 Sep 2008 10:07:13 -0000	1.28
+++ hal-info.spec	11 Sep 2008 10:53:46 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Device information files for HAL
 Name: hal-info
 Version: 20080813
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: AFL or GPLv2
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/Software/hal
@@ -18,7 +18,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b .lenovo-video-key
+%patch0 -p1 -b .lenovo-video-key
 
 %build
 %configure



From jroth at fedoraproject.org  Thu Sep 11 10:54:27 2008
From: jroth at fedoraproject.org (Jochen Roth)
Date: Thu, 11 Sep 2008 10:54:27 +0000 (UTC)
Subject: rpms/libspe2/devel .cvsignore, 1.3, 1.4 libspe2.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20080911105427.A59D470131@cvs1.fedora.phx.redhat.com>

Author: jroth

Update of /cvs/pkgs/rpms/libspe2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4791

Modified Files:
	.cvsignore libspe2.spec sources 
Log Message:
Upgrade to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libspe2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Jul 2008 12:18:10 -0000	1.3
+++ .cvsignore	11 Sep 2008 10:53:57 -0000	1.4
@@ -1 +1 @@
-libspe2-2.2.80-129.tar.gz
+libspe2-2.2.80-132.tar.gz


Index: libspe2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libspe2/devel/libspe2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libspe2.spec	29 Jul 2008 13:55:04 -0000	1.5
+++ libspe2.spec	11 Sep 2008 10:53:57 -0000	1.6
@@ -1,10 +1,10 @@
 %define up_version 2.2.80
-%define up_release 129
+%define up_release 132
 %define spuinclude /usr/spu/include
 
 Name:              libspe2
 Version:           %{up_version}.%{up_release}
-Release:           2%{?dist}
+Release:           1%{?dist}
 Summary:           SPE Runtime Management Library
 
 Group:             System Environment/Libraries
@@ -154,6 +154,9 @@
 %endif
 
 %changelog
+* Thu Sep 11 2008 Jochen Roth <jroth at linux.vnet.ibm.com> 2.2.80.132-1
+- Upgraded to latest upstream version
+
 * Thu Jul 29 2008 Jochen Roth <jroth at linux.vnet.ibm.com> 2.2.80.129-2
 - Prepared for spu cross toolchain includes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libspe2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Jul 2008 12:18:10 -0000	1.3
+++ sources	11 Sep 2008 10:53:57 -0000	1.4
@@ -1 +1 @@
-bf9c4a8ec7aff188f5489220f3f170cb  libspe2-2.2.80-129.tar.gz
+50e173b46b48d8d2ed37c38446b03e32  libspe2-2.2.80-132.tar.gz



From zprikryl at fedoraproject.org  Thu Sep 11 11:44:27 2008
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Thu, 11 Sep 2008 11:44:27 +0000 (UTC)
Subject: rpms/mtr/devel .cvsignore, 1.12, 1.13 mtr.spec, 1.44, 1.45 sources, 
	1.12, 1.13
Message-ID: <20080911114428.3718870131@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/mtr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22452

Modified Files:
	.cvsignore mtr.spec sources 
Log Message:
Updated to 0.74



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mtr/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	21 May 2008 12:40:55 -0000	1.12
+++ .cvsignore	11 Sep 2008 11:43:55 -0000	1.13
@@ -1 +1,2 @@
 mtr-0.73.tar.gz
+mtr-0.74.tar.gz


Index: mtr.spec
===================================================================
RCS file: /cvs/extras/rpms/mtr/devel/mtr.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- mtr.spec	2 Sep 2008 12:42:35 -0000	1.44
+++ mtr.spec	11 Sep 2008 11:43:56 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: A network diagnostic tool
 Name: mtr
-Version: 0.73
-Release: 2%{?dist}
+Version: 0.74
+Release: 1%{?dist}
 Epoch:	2
 Group: Applications/Internet
 License: GPLv2+
@@ -40,8 +40,6 @@
 %patch3 -p1 -b .underflow
 
 %build
-# mtr-0.73 has an error in ./configure, we need to create new one
-autoreconf
 %configure --enable-gtk2
 make %{?_smp_mflags} && mv mtr xmtr && make distclean
 %configure --without-gtk
@@ -90,6 +88,9 @@
 %{_datadir}/pixmaps/mtr_icon.xpm
 
 %changelog
+* Thu Sep 09 2008 Zdenek Prikryl <zprikryl at redhat.com> - 2:0.74-1
+- Updated to 0.74
+
 * Tue Sep 02 2008 Zdenek Prikryl <zprikryl at redhat.com> - 2:0.73-2
 - Minor fix in the patch underflow
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mtr/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	21 May 2008 12:40:55 -0000	1.12
+++ sources	11 Sep 2008 11:43:56 -0000	1.13
@@ -1 +1,2 @@
 52223cc34c72092a0392865356a3dc76  mtr-0.73.tar.gz
+0bc1601c9bc6f2a4af58c6b5baca4668  mtr-0.74.tar.gz



From jroth at fedoraproject.org  Thu Sep 11 11:47:22 2008
From: jroth at fedoraproject.org (Jochen Roth)
Date: Thu, 11 Sep 2008 11:47:22 +0000 (UTC)
Subject: rpms/libspe2/F-9 libspe2.spec,1.2,1.3
Message-ID: <20080911114723.01ECF70131@cvs1.fedora.phx.redhat.com>

Author: jroth

Update of /cvs/pkgs/rpms/libspe2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23540

Modified Files:
	libspe2.spec 
Log Message:
Upgraded to latest upstream version which includes some important bugfixes.



Index: libspe2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libspe2/F-9/libspe2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libspe2.spec	29 Jul 2008 14:24:06 -0000	1.2
+++ libspe2.spec	11 Sep 2008 11:46:52 -0000	1.3
@@ -1,10 +1,10 @@
 %define up_version 2.2.80
-%define up_release 129
+%define up_release 132
 %define spuinclude /usr/spu/include
 
 Name:              libspe2
 Version:           %{up_version}.%{up_release}
-Release:           2%{?dist}
+Release:           1%{?dist}
 Summary:           SPE Runtime Management Library
 
 Group:             System Environment/Libraries
@@ -154,6 +154,9 @@
 %endif
 
 %changelog
+* Thu Sep 11 2008 Jochen Roth <jroth at linux.vnet.ibm.com> 2.2.80.132-1
+- Upgraded to latest upstream version
+
 * Thu Jul 29 2008 Jochen Roth <jroth at linux.vnet.ibm.com> 2.2.80.129-2
 - Prepared for spu cross toolchain includes
 



From than at fedoraproject.org  Thu Sep 11 11:47:44 2008
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 11 Sep 2008 11:47:44 +0000 (UTC)
Subject: rpms/kde-plasma-lancelot/F-9 .cvsignore, 1.1,
	1.2 kde-plasma-lancelot.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080911114744.8A1F470131@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-plasma-lancelot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23883

Modified Files:
	.cvsignore kde-plasma-lancelot.spec sources 
Log Message:
1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-plasma-lancelot/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2008 23:42:11 -0000	1.1
+++ .cvsignore	11 Sep 2008 11:47:14 -0000	1.2
@@ -0,0 +1 @@
+lancelot-1.0.2.tar.bz2


Index: kde-plasma-lancelot.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-plasma-lancelot/F-9/kde-plasma-lancelot.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-plasma-lancelot.spec	10 Sep 2008 09:58:42 -0000	1.1
+++ kde-plasma-lancelot.spec	11 Sep 2008 11:47:14 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           kde-plasma-lancelot
-Version:        1.0
+Version:        1.0.2
 Release:        1%{?dist}
 Summary:        An alternative application launcher
 
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Than Ngo <than at redhat.com> 1.0.2-1
+- 1.0.2
+
 * Wed Sep 03 2008 Than Ngo <than at redhat.com> 1.0-1
 - 1.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-plasma-lancelot/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2008 09:58:42 -0000	1.2
+++ sources	11 Sep 2008 11:47:14 -0000	1.3
@@ -1 +1 @@
-20ad6b20817ac0f0e6903930c27e7d85  lancelot-1.0.tar.bz2
+85a596521cdcf3c4214626f151506bd1  lancelot-1.0.2.tar.bz2



From pvrabec at fedoraproject.org  Thu Sep 11 11:48:10 2008
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Thu, 11 Sep 2008 11:48:10 +0000 (UTC)
Subject: rpms/shadow-utils/devel shadow-4.1.1-selinuxUserMappings.patch, NONE,
	1.1 shadow-utils.spec, 1.121, 1.122
Message-ID: <20080911114810.130FD70131@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/shadow-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24115

Modified Files:
	shadow-utils.spec 
Added Files:
	shadow-4.1.1-selinuxUserMappings.patch 
Log Message:
fix usermod SELinux user mappings change (#458766)


shadow-4.1.1-selinuxUserMappings.patch:

--- NEW FILE shadow-4.1.1-selinuxUserMappings.patch ---
diff -up shadow-4.1.1/src/usermod.c.selinux-user shadow-4.1.1/src/usermod.c
--- shadow-4.1.1/src/usermod.c.selinux-user	2008-09-09 17:28:45.673915250 +0200
+++ shadow-4.1.1/src/usermod.c	2008-09-09 17:35:39.000000000 +0200
@@ -116,6 +116,7 @@ static int
     oflg = 0,			/* permit non-unique user ID to be specified with -u */
     pflg = 0,			/* new encrypted password */
     sflg = 0,			/* new shell program */
+    Sflg = 0,			/* new selinux user */
     uflg = 0,			/* specify new user ID */
     Uflg = 0;			/* unlock the password */
 
@@ -967,8 +968,10 @@ static void process_flags (int argc, cha
 				break;
 #ifdef WITH_SELINUX
                          case 'Z':
-                                if (is_selinux_enabled() > 0)
-                                        user_selinux = optarg;
+                                if (is_selinux_enabled() > 0) {
+					user_selinux = optarg;
+					Sflg++;
+				}
                                 else {
                                         fprintf (stderr, _("%s: -Z requires SELinux enabled kernel\n"), Prog);
                                         exit (E_BAD_ARG);
@@ -1015,7 +1018,7 @@ static void process_flags (int argc, cha
 	}
 
 	if (Uflg + uflg + sflg + pflg + oflg + mflg + Lflg + lflg + Gflg +
-	    gflg + fflg + eflg + dflg + cflg == 0) {
+	    gflg + fflg + eflg + dflg + cflg + Sflg == 0) {
 		fprintf (stderr, _("%s: no changes\n"), Prog);
 		exit (E_SUCCESS);
 	}


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- shadow-utils.spec	2 Sep 2008 14:12:30 -0000	1.121
+++ shadow-utils.spec	11 Sep 2008 11:47:39 -0000	1.122
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.1.2
-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
@@ -18,6 +18,7 @@
 Patch3: shadow-4.1.2-sysAccountDownhill.patch
 Patch4: shadow-4.1.2-gmSEGV.patch
 Patch5: shadow-4.1.2-audit.patch
+Patch6: shadow-4.1.1-selinuxUserMappings.patch
 
 License: BSD
 Group: System Environment/Base
@@ -48,6 +49,7 @@
 %patch3 -p1 -b .sysAccountDownhill
 %patch4 -p1 -b .gmSEGV
 %patch5 -p1 -b .audit
+%patch6 -p1 -b .selinuxUserMappings
 
 
 rm po/*.gmo
@@ -188,10 +190,13 @@
 %{_mandir}/man8/vigr.8*
 
 %changelog
-* Thu Sep 02 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-6
+* Thu Sep 11 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-7
+- fix usermod SELinux user mappings change (#458766)
+
+* Tue Sep 02 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-6
 - audit improvements, thnx. to sgrubb at redhat.com
 
-* Thu Sep 02 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-5
+* Tue Sep 02 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-5
 - fix groupmems issues (#459825)
 
 * Mon Jul 28 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-4



From jroth at fedoraproject.org  Thu Sep 11 11:51:40 2008
From: jroth at fedoraproject.org (Jochen Roth)
Date: Thu, 11 Sep 2008 11:51:40 +0000 (UTC)
Subject: rpms/libspe2/F-9 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20080911115140.BF57F70131@cvs1.fedora.phx.redhat.com>

Author: jroth

Update of /cvs/pkgs/rpms/libspe2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25481

Modified Files:
	.cvsignore sources 
Log Message:
changed sources and .cvsignore to thethe  new tar.gz 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libspe2/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Jul 2008 14:24:06 -0000	1.3
+++ .cvsignore	11 Sep 2008 11:51:10 -0000	1.4
@@ -1 +1 @@
-libspe2-2.2.80-129.tar.gz
+libspe2-2.2.80-132.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libspe2/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Jul 2008 14:24:06 -0000	1.3
+++ sources	11 Sep 2008 11:51:10 -0000	1.4
@@ -1 +1 @@
-bf9c4a8ec7aff188f5489220f3f170cb  libspe2-2.2.80-129.tar.gz
+50e173b46b48d8d2ed37c38446b03e32  libspe2-2.2.80-132.tar.gz



From than at fedoraproject.org  Thu Sep 11 11:53:16 2008
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 11 Sep 2008 11:53:16 +0000 (UTC)
Subject: rpms/kde-plasma-lancelot/F-9 kde-plasma-lancelot.spec,1.2,1.3
Message-ID: <20080911115316.9C7C570131@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-plasma-lancelot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26200

Modified Files:
	kde-plasma-lancelot.spec 
Log Message:
1.0.2



Index: kde-plasma-lancelot.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-plasma-lancelot/F-9/kde-plasma-lancelot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde-plasma-lancelot.spec	11 Sep 2008 11:47:14 -0000	1.2
+++ kde-plasma-lancelot.spec	11 Sep 2008 11:52:46 -0000	1.3
@@ -6,7 +6,7 @@
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://www.kde-apps.org/content/show.php/Lancelot?content=87914
-Source0:        http://downloads.sourceforge.net/lancelot-menu/lancelot-1.0.tar.bz2
+Source0:        http://downloads.sourceforge.net/lancelot-menu/lancelot-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kde-filesystem >= 4



From perex at fedoraproject.org  Thu Sep 11 11:54:39 2008
From: perex at fedoraproject.org (Jaroslav Kysela)
Date: Thu, 11 Sep 2008 11:54:39 +0000 (UTC)
Subject: rpms/alsa-utils/devel alsa-utils-1.0.18-alsaconf.patch, NONE,
	1.1 alsactl-fix-card-parsing.patch, NONE, 1.1 alsa-utils.spec,
	1.71, 1.72 alsa.rules, 1.4, 1.5 alsaunmute, 1.1,
	1.2 alsa-utils-1.0.17-alsaconf.patch, 1.1, NONE
Message-ID: <20080911115439.C0D8E70131@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26722

Modified Files:
	alsa-utils.spec alsa.rules alsaunmute 
Added Files:
	alsa-utils-1.0.18-alsaconf.patch 
	alsactl-fix-card-parsing.patch 
Removed Files:
	alsa-utils-1.0.17-alsaconf.patch 
Log Message:
alsa-utils: more cleanups for 1.0.18rc3

alsa-utils-1.0.18-alsaconf.patch:

--- NEW FILE alsa-utils-1.0.18-alsaconf.patch ---
--- alsa-utils-1.0.18rc3/Makefile.am.orig	2008-09-09 19:50:28.000000000 +0200
+++ alsa-utils-1.0.18rc3/Makefile.am	2008-09-11 11:18:01.000000000 +0200
@@ -4,7 +4,7 @@ ALSAMIXER_DIR=alsamixer
 else
 ALSAMIXER_DIR=
 endif
-SUBDIRS= include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
+SUBDIRS= include alsactl $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
 EXTRA_DIST= config.rpath  TODO gitcompile
 AUTOMAKE_OPTIONS=foreign
 ACLOCAL_AMFLAGS = -I m4
--- alsa-utils-1.0.18rc3/Makefile.in.orig	2008-09-11 11:17:52.000000000 +0200
+++ alsa-utils-1.0.18rc3/Makefile.in	2008-09-11 11:17:52.000000000 +0200
@@ -65,7 +65,7 @@ RECURSIVE_TARGETS = all-recursive check-
 	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = include alsactl alsaconf alsamixer amidi amixer aplay \
+DIST_SUBDIRS = include alsactl alsamixer amidi amixer aplay \
 	iecset seq speaker-test utils m4 po
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -197,7 +197,7 @@ target_alias = @target_alias@
 INCLUDES = -I$(top_srcdir)/include
 @ALSAMIXER_FALSE at ALSAMIXER_DIR = 
 @ALSAMIXER_TRUE at ALSAMIXER_DIR = alsamixer
-SUBDIRS = include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
+SUBDIRS = include alsactl $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
 EXTRA_DIST = config.rpath  TODO gitcompile
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4

alsactl-fix-card-parsing.patch:

--- NEW FILE alsactl-fix-card-parsing.patch ---
>From 0a8e8d581e5df6f1b13ea009fcdd77c6afcbdc43 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Thu, 11 Sep 2008 13:39:42 +0200
Subject: [PATCH] alsactl: Fix oops (when parsing card argument)

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 alsactl/alsactl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/alsactl/alsactl.c b/alsactl/alsactl.c
index 6728fbc..57957bf 100644
--- a/alsactl/alsactl.c
+++ b/alsactl/alsactl.c
@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
 	}
 
 	cardname = argc - optind > 1 ? argv[optind + 1] : NULL;
-	for (tmp = devfiles; cardname != NULL && tmp != NULL; tmp++) {
+	for (tmp = devfiles; cardname != NULL && *tmp != NULL; tmp++) {
 		int len = strlen(*tmp);
 		if (!strncmp(cardname, *tmp, len)) {
 			long l = strtol(cardname + len, NULL, 0);
-- 
1.6.0.GIT



Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- alsa-utils.spec	11 Sep 2008 09:03:42 -0000	1.71
+++ alsa-utils.spec	11 Sep 2008 11:54:09 -0000	1.72
@@ -13,11 +13,13 @@
 Source6: alsa-info.sh
 Source10: alsa.rules
 Source11: alsactl.conf
-Patch0:  alsa-utils-1.0.17-alsaconf.patch
+Patch0:  alsa-utils-1.0.18-alsaconf.patch
+Patch1:  alsactl-fix-card-parsing.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel >= %{version}
 BuildRequires: ncurses-devel
 BuildRequires: gettext-devel
+BuildRequires: xmlto
 Conflicts: udev < 062
 
 %description
@@ -27,11 +29,12 @@
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --sbindir=/sbin
 %{__make} %{?_smp_mflags}
-%{__cp} %{SOURCE5} .
+%{__cp} %{SOURCE4} .
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -50,13 +53,20 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
 ln -s ../../sbin/alsactl $RPM_BUILD_ROOT/%{_sbindir}/alsactl
 
+# Move /usr/share/alsa/init to /lib/alsa/init
+mkdir -p -m 755 %{buildroot}/%{_lib}/alsa
+mv %{buildroot}%{_datadir}/alsa/init %{buildroot}/%{_lib}/alsa
+
+# Link /lib/alsa/init to /usr/share/alsa/init back
+ln -s ../../../lib/alsa/init %{buildroot}%{_datadir}/alsa/init
+
 # Create a place for global configuration
-mkdir -p -m 755 $RPM_BUILD_ROOT/etc/alsa
-install -p -m 644 alsactl.conf %{buildroot}/etc/alsa
-touch $RPM_BUILD_ROOT/etc/asound.state
+mkdir -p -m 755 %{buildroot}/etc/alsa
+install -p -m 644 %{SOURCE11} %{buildroot}/etc/alsa
+touch %{buildroot}/etc/asound.state
 
 # Install alsa-info.sh script
-install -p -m 755 %{SOURCE6} $RPM_BUILD_ROOT/usr/bin/alsa-info
+install -p -m 755 %{SOURCE6} %{buildroot}/usr/bin/alsa-info
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -68,6 +78,7 @@
 %config /etc/alsa/*
 /bin/*
 /sbin/*
+/%{_lib}/alsa/init/*
 %{_bindir}/*
 %{_sbindir}/*
 %{_datadir}/alsa/


Index: alsa.rules
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa.rules,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- alsa.rules	11 Sep 2008 09:03:42 -0000	1.4
+++ alsa.rules	11 Sep 2008 11:54:09 -0000	1.5
@@ -1,4 +1,4 @@
 ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", \
-  ENV{ALSA_CONFIG_PATH}="/etc/alsa/alsactl.conf", RUN+="/sbin/alsactl restore $name"
+  RUN+="/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf --initfile=/lib/alsa/init/00main restore $name"
 ACTION=="remove", SUBSYSTEM=="sound", KERNEL=="controlC*", \
-  ENV{ALSA_CONFIG_PATH}="/etc/alsa/alsactl.conf", RUN+="/sbin/alsactl store $name"
+  RUN+="/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf store $name"


Index: alsaunmute
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsaunmute,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alsaunmute	11 Sep 2008 09:03:42 -0000	1.1
+++ alsaunmute	11 Sep 2008 11:54:09 -0000	1.2
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-export ALSA_CONFIG_PATH="/etc/alsa/alsactl.conf"
-exec /sbin/alsactl init
-
+exec /sbin/alsactl \
+  -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf \
+  --initfile=/lib/alsa/init/00main \
+  init


--- alsa-utils-1.0.17-alsaconf.patch DELETED ---



From mpg at fedoraproject.org  Thu Sep 11 11:58:20 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Thu, 11 Sep 2008 11:58:20 +0000 (UTC)
Subject: rpms/sugar-journal/devel sugar-journal.spec,1.6,1.7
Message-ID: <20080911115820.3871670131@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-journal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28045

Modified Files:
	sugar-journal.spec 
Log Message:
* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 99-2
- Fixup packaging for the new bundlebuilder




Index: sugar-journal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-journal/devel/sugar-journal.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sugar-journal.spec	11 Sep 2008 10:46:11 -0000	1.6
+++ sugar-journal.spec	11 Sep 2008 11:57:49 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           sugar-journal
 Version:        99
-Release:        1%{?dist}
+Release:        2%{?dist}
 #Release:        4.%{alphatag}%{?dist}
 Summary:        Journal for Sugar
 
@@ -30,89 +30,27 @@
 %setup -q -n Journal-%{version}
 
 %build
-
+python ./setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{sugaractivitydir}
-python setup.py build
-python setup.py install $RPM_BUILD_ROOT%{sugaractivitydir}
-rm $RPM_BUILD_ROOT%{sugaractivitydir}/Journal.activity/MANIFEST
-rm -rf $RPM_BUILD_ROOT%{sugaractivitydir}Journal.activity/po
-chmod +x $RPM_BUILD_ROOT%{sugaractivitydir}/Journal.activity/setup.py
+python ./setup.py install --prefix=$RPM_BUILD_ROOT/%{_prefix}
+
+%find_lang org.laptop.JournalActivity
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%files
+%files -f org.laptop.JournalActivity
 %defattr(-,root,root,-)
-%dir %{sugaractivitydir}/Journal.activity/
-%doc %{sugaractivitydir}/Journal.activity/NEWS
-%{sugaractivitydir}/Journal.activity/activity/
-%{sugaractivitydir}/Journal.activity/*.py*
-%{sugaractivitydir}/Journal.activity/icons/
-#%{sugaractivitydir}/Journal.activity/po/
-%dir %{sugaractivitydir}/Journal.activity/locale/
-%lang(af) %{sugaractivitydir}/Journal.activity/locale/af/
-%lang(am) %{sugaractivitydir}/Journal.activity/locale/am/
-%lang(ar) %{sugaractivitydir}/Journal.activity/locale/ar/
-%lang(ay) %{sugaractivitydir}/Journal.activity/locale/ay/
-%lang(bg) %{sugaractivitydir}/Journal.activity/locale/bg/
-%lang(bn) %{sugaractivitydir}/Journal.activity/locale/bn/
-%lang(bn_IN) %{sugaractivitydir}/Journal.activity/locale/bn_IN/
-%lang(ca) %{sugaractivitydir}/Journal.activity/locale/ca/
-%lang(de) %{sugaractivitydir}/Journal.activity/locale/de/
-%lang(dz) %{sugaractivitydir}/Journal.activity/locale/dz/
-%lang(el) %{sugaractivitydir}/Journal.activity/locale/el/
-%lang(en) %{sugaractivitydir}/Journal.activity/locale/en/
-%lang(es) %{sugaractivitydir}/Journal.activity/locale/es/
-%lang(fa) %{sugaractivitydir}/Journal.activity/locale/fa/
-%lang(fa_AF) %{sugaractivitydir}/Journal.activity/locale/fa_AF/
-%lang(ff) %{sugaractivitydir}/Journal.activity/locale/ff/
-%lang(fr) %{sugaractivitydir}/Journal.activity/locale/fr/
-%lang(gu) %{sugaractivitydir}/Journal.activity/locale/gu/
-%lang(hi) %{sugaractivitydir}/Journal.activity/locale/hi/
-%lang(ht) %{sugaractivitydir}/Journal.activity/locale/ht/
-%lang(ig) %{sugaractivitydir}/Journal.activity/locale/ig/
-%lang(is) %{sugaractivitydir}/Journal.activity/locale/is/
-%lang(it) %{sugaractivitydir}/Journal.activity/locale/it/
-%lang(ja) %{sugaractivitydir}/Journal.activity/locale/ja/
-%lang(km) %{sugaractivitydir}/Journal.activity/locale/km/
-%lang(ko) %{sugaractivitydir}/Journal.activity/locale/ko/
-%lang(mk) %{sugaractivitydir}/Journal.activity/locale/mk/
-%lang(ml) %{sugaractivitydir}/Journal.activity/locale/ml/
-%lang(mn) %{sugaractivitydir}/Journal.activity/locale/mn/
-%lang(mr) %{sugaractivitydir}/Journal.activity/locale/mr/
-%lang(mvo) %{sugaractivitydir}/Journal.activity/locale/mvo/
-%lang(nb) %{sugaractivitydir}/Journal.activity/locale/nb/
-%lang(ne) %{sugaractivitydir}/Journal.activity/locale/ne/
-%lang(nl) %{sugaractivitydir}/Journal.activity/locale/nl/
-%lang(pa) %{sugaractivitydir}/Journal.activity/locale/pa/
-%lang(pap) %{sugaractivitydir}/Journal.activity/locale/pap/
-%lang(pis) %{sugaractivitydir}/Journal.activity/locale/pis/
-%lang(pl) %{sugaractivitydir}/Journal.activity/locale/pl/
-%lang(ps) %{sugaractivitydir}/Journal.activity/locale/ps/
-%lang(pt) %{sugaractivitydir}/Journal.activity/locale/pt/
-%lang(pt_BR) %{sugaractivitydir}/Journal.activity/locale/pt_BR/
-%lang(qu) %{sugaractivitydir}/Journal.activity/locale/qu/
-%lang(ro) %{sugaractivitydir}/Journal.activity/locale/ro/
-%lang(ru) %{sugaractivitydir}/Journal.activity/locale/ru/
-%lang(rw) %{sugaractivitydir}/Journal.activity/locale/rw/
-%lang(sd) %{sugaractivitydir}/Journal.activity/locale/sd/
-%lang(si) %{sugaractivitydir}/Journal.activity/locale/si/
-%lang(sl) %{sugaractivitydir}/Journal.activity/locale/sl/
-%lang(te) %{sugaractivitydir}/Journal.activity/locale/te/
-%lang(th) %{sugaractivitydir}/Journal.activity/locale/th/
-%lang(tpi) %{sugaractivitydir}/Journal.activity/locale/tpi/
-%lang(tr) %{sugaractivitydir}/Journal.activity/locale/tr/
-%lang(ur) %{sugaractivitydir}/Journal.activity/locale/ur/
-%lang(vi) %{sugaractivitydir}/Journal.activity/locale/vi/
-%lang(yo) %{sugaractivitydir}/Journal.activity/locale/yo/
-%lang(zh_CN) %{sugaractivitydir}/Journal.activity/locale/zh_CN/
-%lang(zh_TW) %{sugaractivitydir}/Journal.activity/locale/zh_TW/
+%doc NEWS
+%{sugaractivitydir}/Journal.activity/
 
 %changelog
+* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 99-2
+- Fixup packaging for the new bundlebuilder
+
 * Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 99-1
 - #8287 8.2-757: Copy-to-clipboard broken in Journal
 



From pmatilai at fedoraproject.org  Thu Sep 11 12:02:41 2008
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Thu, 11 Sep 2008 12:02:41 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.5.90-gstreamer-provides.patch, NONE,
	1.1 rpm-4.5.90-macro-args.patch, NONE, 1.1 rpm.spec, 1.295, 1.296
Message-ID: <20080911120241.B418770131@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29704

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.5.90-gstreamer-provides.patch 
	rpm-4.5.90-macro-args.patch 
Log Message:
- add hack to support extracting gstreamer plugin provides (#438225)
- fix another macro argument handling regression (#461180)


rpm-4.5.90-gstreamer-provides.patch:

--- NEW FILE rpm-4.5.90-gstreamer-provides.patch ---
diff --git a/build/rpmfc.c b/build/rpmfc.c
index 94fb68e..525915b 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -1093,6 +1093,11 @@ assert(s != NULL);
 	free(buf);
     }
 
+    /* Add possible GStreamer provides */
+    if (!fc->skipProv && isDSO) {
+	xx = rpmfcHelper(fc, 'P', "gstreamer");
+    }
+
 exit:
     soname = _free(soname);
     if (elf) (void) elf_end(elf);

rpm-4.5.90-macro-args.patch:

--- NEW FILE rpm-4.5.90-macro-args.patch ---
diff --git a/rpmio/macro.c b/rpmio/macro.c
index ad1f94a..1e292c6 100644
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -780,7 +780,7 @@ static const char *
 grabArgs(MacroBuf mb, const rpmMacroEntry me, const char * se,
 		const char * lastc)
 {
-    const char *opts, *o, *ret;
+    const char *opts, *o;
     char *args = NULL;
     ARGV_t argv = NULL;
     int argc = 0;
@@ -792,13 +792,10 @@ grabArgs(MacroBuf mb, const rpmMacroEntry me, const char * se,
     
     /* 
      * Make a copy of se up to lastc string that we can pass to argvSplit().
-     * Append the results to main argv, save return value. 
+     * Append the results to main argv. 
      */
     {	ARGV_t av = NULL;
 	char *s = xcalloc((lastc-se)+1, sizeof(*s));
-
-	/* XXX expandMacro() expects next \0 which can be beyond lastc */
-	ret = strchr(se, '\0');
 	memcpy(s, se, (lastc-se));
 
 	argvSplit(&av, s, " ");
@@ -884,7 +881,7 @@ grabArgs(MacroBuf mb, const rpmMacroEntry me, const char * se,
 
 exit:
     argvFree(argv);
-    return ret;
+    return *lastc ? lastc + 1 : lastc; 
 }
 
 /**


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- rpm.spec	11 Sep 2008 06:16:20 -0000	1.295
+++ rpm.spec	11 Sep 2008 12:02:10 -0000	1.296
@@ -18,7 +18,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.6
+Release: 0.%{snapver}.7
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -28,6 +28,7 @@
 
 Patch0: rpm-4.5.90-devel-autodep.patch
 Patch1: rpm-4.5.90-pkgconfig-path.patch
+Patch2: rpm-4.5.90-gstreamer-provides.patch
 # XXX only create provides for pkgconfig and libtool initially
 Patch100: rpm-4.6.x-no-pkgconfig-reqs.patch
 
@@ -40,6 +41,7 @@
 Patch205: rpm-4.5.90-topdir.patch
 Patch206: rpm-4.5.90-rpmbuild-dirs.patch
 Patch207: rpm-4.5.90-cpio-hardlink.patch
+Patch208: rpm-4.5.90-macro-args.patch
 
 # These are not yet upstream
 Patch300: rpm-4.5.90-posttrans.patch
@@ -168,6 +170,7 @@
 %setup -q -n %{name}-%{srcver} %{?with_int_bdb:-a 1}
 %patch0 -p1 -b .devel-autodep
 %patch1 -p1 -b .pkgconfig-path
+%patch2 -p1 -b .gstreamer-prov
 %patch100 -p1 -b .pkgconfig-deps
 
 %patch200 -p1 -b .archivesize
@@ -178,6 +181,7 @@
 %patch205 -p1 -b .topdir
 %patch206 -p1 -b .rpmbuild-dirs
 %patch207 -p1 -b .cpio-hardlink
+%patch208 -p1 -b .macro-args
 
 # needs a bit of upstream love first...
 #%patch300 -p1 -b .posttrans
@@ -356,6 +360,10 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Sep 11 2008 Panu Matilainen <pmatilai at redhat.com>
+- add hack to support extracting gstreamer plugin provides (#438225)
+- fix another macro argument handling regression (#461180)
+
 * Thu Sep 11 2008 Jindrich Novy <jnovy at redhat.com>
 - create directory structure for rpmbuild prior to build if it doesn't exist (#455387)
 - create _topdir if it doesn't exist when installing SRPM



From pbrobinson at fedoraproject.org  Thu Sep 11 12:05:09 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 11 Sep 2008 12:05:09 +0000 (UTC)
Subject: rpms/ptlib/F-9 import.log, NONE, 1.1 ptlib.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080911120509.7C3AC70131@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ptlib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13175/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ptlib.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
ptlib-2_3_1-2_fc9:F-9:ptlib-2.3.1-2.fc9.src.rpm:1221125733


--- NEW FILE ptlib.spec ---
Name:		ptlib
Summary:	Portable Tools Library
Version:	2.3.1
Release:	2%{?dist}
URL:		http://www.opalvoip.org/
Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ptlib/2.3/%{name}-%{version}.tar.bz2
License:	MPLv1.0
Group:		System Environment/Libraries
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	expat openssl-devel pkgconfig
BuildRequires:  alsa-lib-devel, libstdc++-devel, libv4l-devel
BuildRequires:  openldap-devel, expat-devel, SDL-devel, flex, bison

%description
PTLib (Portable Tools Library) is a moderately large class library that 
has it's genesis many years ago as PWLib (portable Windows Library), a 
method to product applications to run on both Microsoft Windows and Unix 
systems. It has also been ported to other systems such as Mac OSX, VxWorks 
and other embedded systems.

It is supplied mainly to support the OPAL project, but that shouldn't stop
you from using it in whatever project you have in mind if you so desire. 

%package devel
Summary:	Development package for ptlib
Group:		Development/Libraries
Requires:	ptlib = %{version}-%{release}
Requires:	pkgconfig

%description devel
The ptlib-devel package includes the libraries and header files for ptlib.

%prep
%setup -q 

%build
export CFLAGS="$CFLAGS -DLDAP_DEPRECATED"
%configure --prefix=%{_prefix} --disable-static --enable-opal --enable-plugins --disable-oss --enable-v4l2 --disable-avc
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make PREFIX=$RPM_BUILD_ROOT%{_prefix} LIBDIR=$RPM_BUILD_ROOT%{_libdir} install

perl -pi -e 's at PTLIBDIR.*=.*@PTLIBDIR = /usr/share/ptlib@' $RPM_BUILD_ROOT%{_datadir}/ptlib/make/ptbuildopts.mak

# hack to fixup things for bug 197318
find $RPM_BUILD_ROOT%{_libdir} -name '*.so*' -type f -exec chmod +x {} \;

# Remove empty include file
rm -rf $RPM_BUILD_ROOT%{_includedir}/ptlib/devplugin.h

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc History.txt ReadMe.txt mpl-1.0.htm
%attr(755,root,root) %{_libdir}/libpt*.so.*
%dir %{_libdir}/ptlib
%dir %{_libdir}/ptlib/devices
%dir %{_libdir}/ptlib/devices/sound
%dir %{_libdir}/ptlib/devices/videoinput
# List these explicitly so we don't get any surprises
%attr(755,root,root) %{_libdir}/ptlib/devices/sound/alsa_pwplugin.so
%attr(755,root,root) %{_libdir}/ptlib/devices/videoinput/v4l_pwplugin.so
%attr(755,root,root) %{_libdir}/ptlib/devices/videoinput/v4l2_pwplugin.so

%files devel
%defattr(-,root,root)
%{_libdir}/libpt*.so
%{_includedir}/*
%{_datadir}/ptlib
%{_libdir}/pkgconfig/ptlib.pc
%attr(755,root,root) %{_bindir}/*

%changelog
* Wed Sep 10 2008 Peter Robinson <pbrobinson at gmail.com> - 2.3.1-2
- Build fixes from package review

* Sun Jun 8 2008 Peter Robinson <pbrobinson at gmail.com> - 2.3.1-1
- Initial version of ptlib


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 08:34:02 -0000	1.1
+++ .cvsignore	11 Sep 2008 12:04:37 -0000	1.2
@@ -0,0 +1 @@
+ptlib-2.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 08:34:02 -0000	1.1
+++ sources	11 Sep 2008 12:04:37 -0000	1.2
@@ -0,0 +1 @@
+bd495deba21a292348bb57ae2cb05d6a  ptlib-2.3.1.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep 11 12:20:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:20:26 +0000
Subject: [pkgdb] alsa-lib ownership updated
Message-ID: <20080911122026.D078F2D0021@bastion.fedora.phx.redhat.com>

Package alsa-lib in Fedora devel was orphaned by stransky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Thu Sep 11 12:20:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:20:43 +0000
Subject: [pkgdb] alsa-lib ownership updated
Message-ID: <20080911122043.433862D0020@bastion.fedora.phx.redhat.com>

Package alsa-lib in Fedora 7 was orphaned by stransky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Thu Sep 11 12:20:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:20:47 +0000
Subject: [pkgdb] alsa-lib ownership updated
Message-ID: <20080911122047.9B4372D0025@bastion.fedora.phx.redhat.com>

Package alsa-lib in Fedora 8 was orphaned by stransky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Thu Sep 11 12:20:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:20:49 +0000
Subject: [pkgdb] alsa-lib ownership updated
Message-ID: <20080911122049.6B3782D0028@bastion.fedora.phx.redhat.com>

Package alsa-lib in Fedora 9 was orphaned by stransky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From hadess at fedoraproject.org  Thu Sep 11 12:21:27 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 12:21:27 +0000 (UTC)
Subject: rpms/libbtctl/devel libbtctl.spec,1.52,1.53
Message-ID: <20080911122127.AFCFB70131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libbtctl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4144

Modified Files:
	libbtctl.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-4
- Rebuild



Index: libbtctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- libbtctl.spec	2 Sep 2008 12:38:36 -0000	1.52
+++ libbtctl.spec	11 Sep 2008 12:20:57 -0000	1.53
@@ -8,7 +8,7 @@
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.10.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL+
 Group: System Environment/Libraries
 URL: http://live.gnome.org/GnomeBluetooth 
@@ -109,6 +109,9 @@
 %{_datadir}/gtk-doc/html/libbtctl
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-4
+- Rebuild
+
 * Mon Sep  1 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 0.10.0-3
 - made doc subpackage to avoid conflict on multiarch env.
 - Resolves: #341931



From pkgdb at fedoraproject.org  Thu Sep 11 12:21:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:21:53 +0000
Subject: [pkgdb] alsa-lib ownership updated
Message-ID: <20080911122153.28F38208D99@bastion.fedora.phx.redhat.com>

Package alsa-lib in Fedora devel is now owned by perex

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Thu Sep 11 12:22:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:22:20 +0000
Subject: [pkgdb] alsa-lib: perex has requested watchbugzilla
Message-ID: <20080911122220.C103B208D97@bastion.fedora.phx.redhat.com>

perex has requested the watchbugzilla acl on alsa-lib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Thu Sep 11 12:22:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:22:25 +0000
Subject: [pkgdb] alsa-lib: perex has requested approveacls
Message-ID: <20080911122225.1D9D2208D9E@bastion.fedora.phx.redhat.com>

perex has requested the approveacls acl on alsa-lib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Thu Sep 11 12:22:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:22:24 +0000
Subject: [pkgdb] alsa-lib: perex has requested commit
Message-ID: <20080911122224.8E661208D9B@bastion.fedora.phx.redhat.com>

perex has requested the commit acl on alsa-lib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Thu Sep 11 12:22:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:22:22 +0000
Subject: [pkgdb] alsa-lib: perex has requested watchcommits
Message-ID: <20080911122222.151CB208D99@bastion.fedora.phx.redhat.com>

perex has requested the watchcommits acl on alsa-lib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Thu Sep 11 12:23:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:23:08 +0000
Subject: [pkgdb] alsa-lib ownership updated
Message-ID: <20080911122308.8AD10208D99@bastion.fedora.phx.redhat.com>

Package alsa-lib in Fedora 9 is now owned by perex

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Thu Sep 11 12:23:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:23:17 +0000
Subject: [pkgdb] alsa-lib: perex has requested watchbugzilla
Message-ID: <20080911122317.4C143208D98@bastion.fedora.phx.redhat.com>

perex has requested the watchbugzilla acl on alsa-lib (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Thu Sep 11 12:23:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:23:09 +0000
Subject: [pkgdb] alsa-lib ownership updated
Message-ID: <20080911122309.B8AAB208D9C@bastion.fedora.phx.redhat.com>

Package alsa-lib in Fedora 8 is now owned by perex

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Thu Sep 11 12:23:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:23:18 +0000
Subject: [pkgdb] alsa-lib: perex has requested watchcommits
Message-ID: <20080911122318.18BA5208D9B@bastion.fedora.phx.redhat.com>

perex has requested the watchcommits acl on alsa-lib (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Thu Sep 11 12:23:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:23:20 +0000
Subject: [pkgdb] alsa-lib: perex has requested commit
Message-ID: <20080911122320.50315208DA0@bastion.fedora.phx.redhat.com>

perex has requested the commit acl on alsa-lib (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Thu Sep 11 12:23:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:23:21 +0000
Subject: [pkgdb] alsa-lib: perex has requested approveacls
Message-ID: <20080911122321.B5D41208D9F@bastion.fedora.phx.redhat.com>

perex has requested the approveacls acl on alsa-lib (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Thu Sep 11 12:23:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:23:26 +0000
Subject: [pkgdb] alsa-lib: perex has requested watchbugzilla
Message-ID: <20080911122326.BDBE32D0023@bastion.fedora.phx.redhat.com>

perex has requested the watchbugzilla acl on alsa-lib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Thu Sep 11 12:23:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:23:30 +0000
Subject: [pkgdb] alsa-lib: perex has requested watchcommits
Message-ID: <20080911122330.921BD208D97@bastion.fedora.phx.redhat.com>

perex has requested the watchcommits acl on alsa-lib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Thu Sep 11 12:23:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:23:32 +0000
Subject: [pkgdb] alsa-lib: perex has requested commit
Message-ID: <20080911122332.1ADD9208D9A@bastion.fedora.phx.redhat.com>

perex has requested the commit acl on alsa-lib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Thu Sep 11 12:23:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:23:33 +0000
Subject: [pkgdb] alsa-lib: perex has requested approveacls
Message-ID: <20080911122333.7E1F5208DA5@bastion.fedora.phx.redhat.com>

perex has requested the approveacls acl on alsa-lib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Thu Sep 11 12:24:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:24:56 +0000
Subject: [pkgdb] alsa-utils ownership updated
Message-ID: <20080911122456.13060208D99@bastion.fedora.phx.redhat.com>

Package alsa-utils in Fedora devel was orphaned by stransky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Thu Sep 11 12:24:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:24:57 +0000
Subject: [pkgdb] alsa-utils ownership updated
Message-ID: <20080911122457.BB79F208D9B@bastion.fedora.phx.redhat.com>

Package alsa-utils in Fedora 7 was orphaned by stransky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From than at fedoraproject.org  Thu Sep 11 12:25:01 2008
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 11 Sep 2008 12:25:01 +0000 (UTC)
Subject: rpms/kde-plasma-lancelot/F-9 kde-plasma-lancelot.spec,1.3,1.4
Message-ID: <20080911122501.074B470131@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-plasma-lancelot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5489

Modified Files:
	kde-plasma-lancelot.spec 
Log Message:
use %%version




Index: kde-plasma-lancelot.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-plasma-lancelot/F-9/kde-plasma-lancelot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kde-plasma-lancelot.spec	11 Sep 2008 11:52:46 -0000	1.3
+++ kde-plasma-lancelot.spec	11 Sep 2008 12:24:30 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           kde-plasma-lancelot
 Version:        1.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An alternative application launcher
 
 Group:          User Interface/Desktops
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Than Ngo <than at redhat.com> 1.0.2-2
+- use %%version
+
 * Thu Sep 11 2008 Than Ngo <than at redhat.com> 1.0.2-1
 - 1.0.2
 



From pkgdb at fedoraproject.org  Thu Sep 11 12:24:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:24:59 +0000
Subject: [pkgdb] alsa-utils ownership updated
Message-ID: <20080911122459.3F027208D9E@bastion.fedora.phx.redhat.com>

Package alsa-utils in Fedora 1 was orphaned by stransky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Thu Sep 11 12:25:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:25:00 +0000
Subject: [pkgdb] alsa-utils ownership updated
Message-ID: <20080911122500.B7E78208D98@bastion.fedora.phx.redhat.com>

Package alsa-utils in Fedora 8 was orphaned by stransky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Thu Sep 11 12:25:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:25:02 +0000
Subject: [pkgdb] alsa-utils ownership updated
Message-ID: <20080911122502.6E0AE208DA2@bastion.fedora.phx.redhat.com>

Package alsa-utils in Fedora 9 was orphaned by stransky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Thu Sep 11 12:25:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:25:24 +0000
Subject: [pkgdb] alsa-utils ownership updated
Message-ID: <20080911122524.CC11A208D97@bastion.fedora.phx.redhat.com>

Package alsa-utils in Fedora devel is now owned by perex

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Thu Sep 11 12:25:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:25:28 +0000
Subject: [pkgdb] alsa-utils: perex has requested watchbugzilla
Message-ID: <20080911122528.7420A208D9A@bastion.fedora.phx.redhat.com>

perex has requested the watchbugzilla acl on alsa-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Thu Sep 11 12:25:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:25:30 +0000
Subject: [pkgdb] alsa-utils: perex has requested watchcommits
Message-ID: <20080911122530.395EA208D97@bastion.fedora.phx.redhat.com>

perex has requested the watchcommits acl on alsa-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Thu Sep 11 12:25:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:25:30 +0000
Subject: [pkgdb] alsa-utils: perex has requested commit
Message-ID: <20080911122530.D6EE2208D9C@bastion.fedora.phx.redhat.com>

perex has requested the commit acl on alsa-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Thu Sep 11 12:25:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:25:33 +0000
Subject: [pkgdb] alsa-utils: perex has requested approveacls
Message-ID: <20080911122533.5BA33208D9F@bastion.fedora.phx.redhat.com>

perex has requested the approveacls acl on alsa-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Thu Sep 11 12:25:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:25:42 +0000
Subject: [pkgdb] alsa-utils ownership updated
Message-ID: <20080911122542.10AEE208D9B@bastion.fedora.phx.redhat.com>

Package alsa-utils in Fedora 9 is now owned by perex

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Thu Sep 11 12:25:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:25:40 +0000
Subject: [pkgdb] alsa-utils ownership updated
Message-ID: <20080911122540.B7696208D9A@bastion.fedora.phx.redhat.com>

Package alsa-utils in Fedora 8 is now owned by perex

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Thu Sep 11 12:25:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:25:49 +0000
Subject: [pkgdb] alsa-utils: perex has requested watchcommits
Message-ID: <20080911122549.9972C208D99@bastion.fedora.phx.redhat.com>

perex has requested the watchcommits acl on alsa-utils (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Thu Sep 11 12:25:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:25:47 +0000
Subject: [pkgdb] alsa-utils: perex has requested watchbugzilla
Message-ID: <20080911122547.7EE4B208D97@bastion.fedora.phx.redhat.com>

perex has requested the watchbugzilla acl on alsa-utils (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Thu Sep 11 12:25:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:25:52 +0000
Subject: [pkgdb] alsa-utils: perex has requested commit
Message-ID: <20080911122552.E2B14208D9E@bastion.fedora.phx.redhat.com>

perex has requested the commit acl on alsa-utils (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Thu Sep 11 12:25:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:25:55 +0000
Subject: [pkgdb] alsa-utils: perex has requested approveacls
Message-ID: <20080911122554.EEC82208D9F@bastion.fedora.phx.redhat.com>

perex has requested the approveacls acl on alsa-utils (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Thu Sep 11 12:25:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:25:59 +0000
Subject: [pkgdb] alsa-utils: perex has requested watchbugzilla
Message-ID: <20080911122559.B4F60208DAA@bastion.fedora.phx.redhat.com>

perex has requested the watchbugzilla acl on alsa-utils (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Thu Sep 11 12:26:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:26:02 +0000
Subject: [pkgdb] alsa-utils: perex has requested watchcommits
Message-ID: <20080911122602.0D456208DAC@bastion.fedora.phx.redhat.com>

perex has requested the watchcommits acl on alsa-utils (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Thu Sep 11 12:26:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:26:04 +0000
Subject: [pkgdb] alsa-utils: perex has requested commit
Message-ID: <20080911122604.120F2208D9B@bastion.fedora.phx.redhat.com>

perex has requested the commit acl on alsa-utils (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Thu Sep 11 12:26:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:26:06 +0000
Subject: [pkgdb] alsa-utils: perex has requested approveacls
Message-ID: <20080911122606.0113A208D9A@bastion.fedora.phx.redhat.com>

perex has requested the approveacls acl on alsa-utils (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Thu Sep 11 12:26:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:26:46 +0000
Subject: [pkgdb] awesfx ownership updated
Message-ID: <20080911122646.965A6208DA0@bastion.fedora.phx.redhat.com>

Package awesfx in Fedora devel was orphaned by stransky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Thu Sep 11 12:26:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:26:47 +0000
Subject: [pkgdb] awesfx ownership updated
Message-ID: <20080911122647.C2DB9208DA7@bastion.fedora.phx.redhat.com>

Package awesfx in Fedora 7 was orphaned by stransky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Thu Sep 11 12:26:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:26:50 +0000
Subject: [pkgdb] awesfx ownership updated
Message-ID: <20080911122650.4E8F8208D9B@bastion.fedora.phx.redhat.com>

Package awesfx in Fedora 8 was orphaned by stransky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Thu Sep 11 12:26:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:26:53 +0000
Subject: [pkgdb] awesfx ownership updated
Message-ID: <20080911122653.63AFF208D9A@bastion.fedora.phx.redhat.com>

Package awesfx in Fedora 9 was orphaned by stransky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Thu Sep 11 12:27:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:27:21 +0000
Subject: [pkgdb] awesfx ownership updated
Message-ID: <20080911122721.3BC3E208D9E@bastion.fedora.phx.redhat.com>

Package awesfx in Fedora devel is now owned by perex

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Thu Sep 11 12:27:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:27:25 +0000
Subject: [pkgdb] awesfx ownership updated
Message-ID: <20080911122725.EDC552D0023@bastion.fedora.phx.redhat.com>

Package awesfx in Fedora devel was orphaned by perex

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Thu Sep 11 12:27:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:27:48 +0000
Subject: [pkgdb] awesfx: perex has requested watchbugzilla
Message-ID: <20080911122748.59C06208D99@bastion.fedora.phx.redhat.com>

perex has requested the watchbugzilla acl on awesfx (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Thu Sep 11 12:27:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:27:44 +0000
Subject: [pkgdb] awesfx ownership updated
Message-ID: <20080911122744.A29B8208D97@bastion.fedora.phx.redhat.com>

Package awesfx in Fedora devel is now owned by perex

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From rrakus at fedoraproject.org  Thu Sep 11 12:27:51 2008
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Thu, 11 Sep 2008 12:27:51 +0000 (UTC)
Subject: rpms/system-config-kdump/devel
	s-c-kdump-1.0.14-reflect-current-settings.patch, NONE,
	1.1 system-config-kdump.spec, 1.3, 1.4
Message-ID: <20080911122751.9754870131@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/system-config-kdump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6790

Modified Files:
	system-config-kdump.spec 
Added Files:
	s-c-kdump-1.0.14-reflect-current-settings.patch 
Log Message:
Resolves: #461602. Don't specify any offset in cmdline argument

s-c-kdump-1.0.14-reflect-current-settings.patch:

--- NEW FILE s-c-kdump-1.0.14-reflect-current-settings.patch ---
diff -up system-config-kdump-1.0.14/src/system-config-kdump.py.reflect system-config-kdump-1.0.14/src/system-config-kdump.py
--- system-config-kdump-1.0.14/src/system-config-kdump.py.reflect	2008-03-20 16:40:48.000000000 +0100
+++ system-config-kdump-1.0.14/src/system-config-kdump.py	2008-08-27 14:19:17.000000000 +0200
@@ -115,6 +115,7 @@ class mainWindow:
         self.kdumpMem = 0
         self.usableMem = 0
         self.origCrashKernel = ""
+	self.defKern = ""
 
         self.bootloader = None
 
@@ -125,6 +126,7 @@ class mainWindow:
         self.memoryTable = self.xml.get_widget("memoryTable")
         self.kdumpEnableCheckButton = self.xml.get_widget("kdumpEnableCheckButton")
         self.totalMemLabel = self.xml.get_widget("totalMem")
+	self.kdumpMemCurrentLabel = self.xml.get_widget("kdumpMemCurrent")
         self.kdumpMemSpinButton = self.xml.get_widget("kdumpMemSpinButton")
         self.usableMemLabel = self.xml.get_widget("usableMem")
 
@@ -163,7 +165,9 @@ class mainWindow:
         # Check to see if kdump memory is already reserved
         # Read from /proc/iomem so we're portable across xen and non-xen
         kdumpMem = 0
+	kdumpMemGrubby = 0
         kdumpOffset = 0
+	kdumpOffsetGrubby = 0
         # PowerPC64 doesn't list crashkernel reservation in /proc/iomem
         if self.arch != 'ppc64':
             ioMem = open("/proc/iomem").readlines()
@@ -193,24 +197,29 @@ class mainWindow:
                         self.xenKdumpKernel = "kernel-PAE"
                         break
 
-        # Fix up memory calculations, if need be
-        if kdumpMem != 0:
-            self.kdumpEnabled = True
-            self.kdumpEnableCheckButton.set_active(True)
-            totalMem += kdumpMem
-            self.origCrashKernel = "%dM@%dM" % (kdumpMem, kdumpOffset)
-        else:
-            self.kdumpEnableCheckButton.set_active(False)
+        # read current kdump settings from grubby
+        self.defKern = os.popen("/sbin/grubby --default-kernel").read().rstrip('\n')
+	if debug:
+		print "grubby --default-kernel: %s" % (self.defKern,)
+	grubbyInfo = os.popen("/sbin/grubby --info=%s" \
+				% (self.defKern,)).readlines()
+	for line in grubbyInfo:
+		if line.find("crashkernel") != -1:
+			line = line.replace('"', '')
+			crashString = filter(lambda t: t.startswith("crashkernel="),
+					     line.split())[0].split("=")[1]
+			(kdumpMemGrubby, kdumpOffsetGrubby) = \
+				[int(m[:-1]) for m in crashString.split("@")]
+			if debug:
+				print "grubby --info: crashkernel=%iM@%iM" \
+					% (kdumpMemGrubby, kdumpOffsetGrubby)
 
-        self.totalMemLabel.set_text("%s" % (totalMem,))
-
-        # Do some sanity-checking and try to present only sane options.
-        #
         # Defaults
         lowerBound = 128
         minUsable = 512
         step = 64
 
+
         if self.arch == 'ia64':
             # ia64 needs at least 256M, page-aligned
             lowerBound = 256
@@ -219,6 +228,22 @@ class mainWindow:
             lowerBound = 256
             minUsable = 2048
 
+
+
+        # Fix up memory calculations, if need be
+	if kdumpMemGrubby != 0:
+            self.kdumpEnabled = True
+            self.kdumpEnableCheckButton.set_active(True)
+            totalMem += kdumpMem
+            self.origCrashKernel = "%dM@%dM" % (kdumpMem, kdumpOffset)
+        else:
+	    self.kdumpMem = kdumpMemGrubby = lowerBound
+            self.kdumpEnableCheckButton.set_active(False)
+
+        self.totalMemLabel.set_text("%s" % (totalMem,))
+
+        # Do some sanity-checking and try to present only sane options.
+        #
         upperBound = (totalMem - minUsable) - (totalMem % step) 
 
         if upperBound < lowerBound:
@@ -227,27 +252,27 @@ class mainWindow:
             sys.exit(1)
 
         # Set spinner to lowerBound unless already set on kernel command line
-        if kdumpMem == 0:
-            kdumpMem = lowerBound
-        else:
+        if kdumpMem != 0:
             # round it down to a multiple of %step
             kdumpMem = kdumpMem - (kdumpMem % step)
+            self.kdumpMem = kdumpMem
 
         self.totalMem = totalMem
-        self.kdumpMem = kdumpMem
         self.usableMem = self.totalMem - self.kdumpMem
 
+	self.kdumpMemCurrentLabel.set_text(_("%s" % (kdumpMem)))
+
         kdumpMemAdj = gtk.Adjustment(kdumpMem, lowerBound, upperBound, step, step, 64)
         self.kdumpMemSpinButton.set_adjustment(kdumpMemAdj)
         self.kdumpMemSpinButton.set_update_policy(gtk.UPDATE_IF_VALID)
         self.kdumpMemSpinButton.set_numeric(True)
         self.kdumpMemSpinButton.connect("value_changed", self.updateUsableMem)
-        self.kdumpMemSpinButton.set_value(kdumpMem)
+        self.kdumpMemSpinButton.set_value(kdumpMemGrubby)
 
         self.usableMemLabel.set_text("%s" % (self.usableMem,))
 
         if debug:
-            print "totalMem = %dM\nkdumpMem = %dM\nusableMem = %dM" % (totalMem, kdumpMem, self.usableMem)
+            print "totalMem = %dM\nkdumpMem = %dM\nkdumpMemGrubby = %dM\nusableMem = %dM" % (totalMem, kdumpMem, kdumpMemGrubby, self.usableMem)
 
         self.defaultActionCombo = self.xml.get_widget("defaultActionCombo")
 
@@ -685,8 +710,8 @@ class mainWindow:
         # Are we adding or removing the crashkernel param?
         if self.kdumpEnabled:
             crashKernel = "%iM@%iM" % (self.kdumpMem, offset)
-            grubbyCmd = '/sbin/grubby --%s --update-kernel=%s/vmlinuz-%s --%s="crashkernel=%s"' \
-                        % (self.bootloader, kpath, self.runningKernel, 
+            grubbyCmd = '/sbin/grubby --%s --update-kernel=%s --%s="crashkernel=%s"' \
+                        % (self.bootloader, self.defKern, 
                            args, crashKernel)
             chkconfigStatus = "on"
             if self.origCrashKernel:
@@ -694,8 +719,8 @@ class mainWindow:
             else:
                 serviceOp = "start"
         else:
-            grubbyCmd = '/sbin/grubby --%s --update-kernel=%s/vmlinuz-%s --remove-%s="crashkernel=%s"' \
-                        % (self.bootloader, kpath, self.runningKernel, 
+            grubbyCmd = '/sbin/grubby --%s --update-kernel=%s --remove-%s="crashkernel=%s"' \
+                        % (self.bootloader, self.defKern, 
                            args, self.origCrashKernel)
             chkconfigStatus = "off"
             serviceOp = "stop"
diff -up system-config-kdump-1.0.14/src/system-config-kdump.glade.reflect system-config-kdump-1.0.14/src/system-config-kdump.glade
--- system-config-kdump-1.0.14/src/system-config-kdump.glade.reflect	2006-12-20 20:49:40.000000000 +0100
+++ system-config-kdump-1.0.14/src/system-config-kdump.glade	2008-08-27 14:08:21.000000000 +0200
@@ -62,7 +62,7 @@
       <child>
 	<widget class="GtkTable" id="memoryTable">
 	  <property name="visible">True</property>
-	  <property name="n_rows">3</property>
+	  <property name="n_rows">4</property>
 	  <property name="n_columns">2</property>
 	  <property name="homogeneous">False</property>
 	  <property name="row_spacing">5</property>
@@ -125,9 +125,9 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkLabel" id="kdumpMemLabel">
+	    <widget class="GtkLabel" id="kdumpMemCurrentLabel">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">kdump Memory (MB):</property>
+	      <property name="label" translatable="yes">Current kdump Memory (MB):</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_RIGHT</property>
@@ -153,12 +153,12 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkLabel" id="usableMemLabel">
+	    <widget class="GtkLabel" id="kdumpMemCurrent">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Usable Memory (MB):</property>
+	      <property name="label" translatable="yes"></property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_RIGHT</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
 	      <property name="xalign">0</property>
@@ -167,26 +167,26 @@
 	      <property name="ypad">0</property>
 	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">True</property>
+	      <property name="single_line_mode">False</property>
 	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
+	      <property name="left_attach">1</property>
+	      <property name="right_attach">2</property>
+	      <property name="top_attach">1</property>
+	      <property name="bottom_attach">2</property>
 	      <property name="x_options">fill</property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
 
 	  <child>
-	    <widget class="GtkLabel" id="usableMem">
+	    <widget class="GtkLabel" id="kdumpMemLabel">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
+	      <property name="label" translatable="yes">New kdump Memory (MB):</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="justify">GTK_JUSTIFY_RIGHT</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
 	      <property name="xalign">0</property>
@@ -195,14 +195,14 @@
 	      <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="single_line_mode">True</property>
 	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">1</property>
 	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
+	      <property name="bottom_attach">4</property>
 	      <property name="x_options">fill</property>
 	      <property name="y_options"></property>
 	    </packing>
@@ -223,8 +223,64 @@
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
+	      <property name="top_attach">2</property>
+	      <property name="bottom_attach">4</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="usableMemLabel">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Usable Memory (MB):</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_RIGHT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">True</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">1</property>
+	      <property name="top_attach">4</property>
+	      <property name="bottom_attach">6</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="usableMem">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">1</property>
+	      <property name="right_attach">2</property>
+	      <property name="top_attach">4</property>
+	      <property name="bottom_attach">6</property>
 	      <property name="x_options">fill</property>
 	      <property name="y_options"></property>
 	    </packing>


Index: system-config-kdump.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-kdump/devel/system-config-kdump.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- system-config-kdump.spec	9 Sep 2008 11:20:11 -0000	1.3
+++ system-config-kdump.spec	11 Sep 2008 12:27:21 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A graphical interface for configuring kernel crash dumping
 Name: system-config-kdump
 Version: 1.0.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPLv2+
 Group: System Environment/Base
@@ -18,7 +18,9 @@
 Requires: kexec-tools
 Requires(pre): gtk2 >= 2.8.20
 Requires(pre): hicolor-icon-theme
-Patch1: system-config-kdump-1.0.14-fedora.patch
+Patch1: s-c-kdump-1.0.14-reflect-current-settings.patch
+Patch2: system-config-kdump-1.0.14-fedora.patch
+Patch3: system-config-kdump-1.0.14-ommit-offset.patch
 
 %description
 system-config-kdump is a graphical tool for configuring kernel crash
@@ -26,7 +28,9 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .fedora
+%patch1 -p1 -b .reflect
+%patch2 -p1 -b .fedora
+%patch3 -p1 -b .ommit-offset
 %build
 make
 
@@ -70,7 +74,11 @@
 %doc ChangeLog COPYING
 
 %changelog
-* Tue Sep 09 2008 Roman Rakus <rrakus at redhatm.com> 1.0.14-1
+* Thu Sep 11 2008 Roman Rakus <rrakus at redhat.com> 1.0.14-2
+- Don't specify any offset in cmdline argument
+  Resolves: #461602
+
+* Tue Sep 09 2008 Roman Rakus <rrakus at redhat.com> 1.0.14-1
 - Bump to version 1.0.14
 
 * Fri Feb 01 2008 Dave Lehman <dlehman at redhat.com> 1.0.13-2%{?dist}



From pkgdb at fedoraproject.org  Thu Sep 11 12:27:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:27:50 +0000
Subject: [pkgdb] awesfx: perex has requested watchcommits
Message-ID: <20080911122750.22D85208D9C@bastion.fedora.phx.redhat.com>

perex has requested the watchcommits acl on awesfx (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Thu Sep 11 12:27:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:27:53 +0000
Subject: [pkgdb] awesfx: perex has requested approveacls
Message-ID: <20080911122753.B455D208DA2@bastion.fedora.phx.redhat.com>

perex has requested the approveacls acl on awesfx (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Thu Sep 11 12:27:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:27:52 +0000
Subject: [pkgdb] awesfx: perex has requested commit
Message-ID: <20080911122752.17CF6208DA1@bastion.fedora.phx.redhat.com>

perex has requested the commit acl on awesfx (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Thu Sep 11 12:27:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:27:58 +0000
Subject: [pkgdb] awesfx ownership updated
Message-ID: <20080911122758.85C7D208DA4@bastion.fedora.phx.redhat.com>

Package awesfx in Fedora 8 is now owned by perex

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Thu Sep 11 12:28:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:28:02 +0000
Subject: [pkgdb] awesfx: perex has requested watchbugzilla
Message-ID: <20080911122802.B0A9A208DA6@bastion.fedora.phx.redhat.com>

perex has requested the watchbugzilla acl on awesfx (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Thu Sep 11 12:28:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:28:04 +0000
Subject: [pkgdb] awesfx: perex has requested watchcommits
Message-ID: <20080911122804.1916D208D98@bastion.fedora.phx.redhat.com>

perex has requested the watchcommits acl on awesfx (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Thu Sep 11 12:28:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:28:07 +0000
Subject: [pkgdb] awesfx: perex has requested commit
Message-ID: <20080911122808.07150208DA9@bastion.fedora.phx.redhat.com>

perex has requested the commit acl on awesfx (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Thu Sep 11 12:28:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:28:12 +0000
Subject: [pkgdb] awesfx: perex has requested approveacls
Message-ID: <20080911122812.44F3B208D9F@bastion.fedora.phx.redhat.com>

perex has requested the approveacls acl on awesfx (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Thu Sep 11 12:28:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:28:15 +0000
Subject: [pkgdb] awesfx ownership updated
Message-ID: <20080911122815.E1BAF208D9C@bastion.fedora.phx.redhat.com>

Package awesfx in Fedora 9 is now owned by perex

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Thu Sep 11 12:28:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:28:19 +0000
Subject: [pkgdb] awesfx: perex has requested watchbugzilla
Message-ID: <20080911122819.D3DA9208DA0@bastion.fedora.phx.redhat.com>

perex has requested the watchbugzilla acl on awesfx (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Thu Sep 11 12:28:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:28:23 +0000
Subject: [pkgdb] awesfx: perex has requested commit
Message-ID: <20080911122823.500332D0020@bastion.fedora.phx.redhat.com>

perex has requested the commit acl on awesfx (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Thu Sep 11 12:28:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:28:21 +0000
Subject: [pkgdb] awesfx: perex has requested watchcommits
Message-ID: <20080911122821.615AF208DA2@bastion.fedora.phx.redhat.com>

perex has requested the watchcommits acl on awesfx (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Thu Sep 11 12:28:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 12:28:26 +0000
Subject: [pkgdb] awesfx: perex has requested approveacls
Message-ID: <20080911122826.90A50208DAF@bastion.fedora.phx.redhat.com>

perex has requested the approveacls acl on awesfx (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awesfx



From hadess at fedoraproject.org  Thu Sep 11 12:31:23 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 12:31:23 +0000 (UTC)
Subject: rpms/libwiimote/devel libwiimote.spec,1.4,1.5
Message-ID: <20080911123123.09F0870131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libwiimote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7971

Modified Files:
	libwiimote.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.4-6
- Rebuild



Index: libwiimote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwiimote/devel/libwiimote.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libwiimote.spec	18 Feb 2008 18:59:24 -0000	1.4
+++ libwiimote.spec	11 Sep 2008 12:30:52 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libwiimote
 Version:        0.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Simple Wiimote Library for Linux
 
 Group:          System Environment/Libraries
@@ -70,6 +70,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.4-6
+- Rebuild
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4-5
 - Autorebuild for GCC 4.3
 



From hadess at fedoraproject.org  Thu Sep 11 12:34:15 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 12:34:15 +0000 (UTC)
Subject: rpms/gnokii/devel gnokii.spec,1.31,1.32
Message-ID: <20080911123415.8AEAD70131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnokii/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9510

Modified Files:
	gnokii.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.6.26-3
- Rebuild



Index: gnokii.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnokii/devel/gnokii.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnokii.spec	19 Jun 2008 16:00:32 -0000	1.31
+++ gnokii.spec	11 Sep 2008 12:33:45 -0000	1.32
@@ -2,7 +2,7 @@
 
 Name:           gnokii
 Version:        0.6.26
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Linux/Unix tool suite for various mobile phones
 
 Group:          Applications/Communications
@@ -227,6 +227,9 @@
 %{_libdir}/pkgconfig/xgnokii.pc
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.6.26-3
+- Rebuild
+
 * Thu Jun 19 2008 - Bastien Nocera <bnocera at redhat.com> - 0.6.26-2
 - Rebuild with libical support
 



From rrakus at fedoraproject.org  Thu Sep 11 12:34:32 2008
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Thu, 11 Sep 2008 12:34:32 +0000 (UTC)
Subject: rpms/system-config-kdump/devel
	system-config-kdump-1.0.14-ommit-offset.patch, NONE, 1.1
Message-ID: <20080911123432.3C87670131@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/system-config-kdump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9946

Added Files:
	system-config-kdump-1.0.14-ommit-offset.patch 
Log Message:
added missing patch

system-config-kdump-1.0.14-ommit-offset.patch:

--- NEW FILE system-config-kdump-1.0.14-ommit-offset.patch ---
diff -up system-config-kdump-1.0.14/src/system-config-kdump.py.ommit-offset system-config-kdump-1.0.14/src/system-config-kdump.py
--- system-config-kdump-1.0.14/src/system-config-kdump.py.ommit-offset	2008-09-11 14:10:29.000000000 +0200
+++ system-config-kdump-1.0.14/src/system-config-kdump.py	2008-09-11 14:14:30.000000000 +0200
@@ -183,8 +183,10 @@ class mainWindow:
             if cmdLine.find("crashkernel=") > -1:
                 crashString = filter(lambda t: t.startswith("crashkernel="), 
                                      cmdLine.split())[0].split("=")[1]
-                (kdumpMem, kdumpOffset) = \
-                           [int(m[:-1]) for m in crashString.split("@")]
+                tokens = crashString.split("@")
+                kdumpMem = int(tokens[0][:-1])
+                if len(tokens) == 2:
+                    kdumpOffset = int(tokens[1][:-1])
 
         # i686 xen requires kernel-PAE for kdump if any memory
         # is mapped above 4GB
@@ -208,8 +210,10 @@ class mainWindow:
 			line = line.replace('"', '')
 			crashString = filter(lambda t: t.startswith("crashkernel="),
 					     line.split())[0].split("=")[1]
-			(kdumpMemGrubby, kdumpOffsetGrubby) = \
-				[int(m[:-1]) for m in crashString.split("@")]
+                        tokens = crashString.split("@")
+                        kdumpMemGrubby = int(tokens[0][:-1])
+                        if len(tokens) == 2:
+                            kdumpOffsetGrubby = int(tokens[2][:-1])
 			if debug:
 				print "grubby --info: crashkernel=%iM@%iM" \
 					% (kdumpMemGrubby, kdumpOffsetGrubby)
@@ -235,7 +239,10 @@ class mainWindow:
             self.kdumpEnabled = True
             self.kdumpEnableCheckButton.set_active(True)
             totalMem += kdumpMem
-            self.origCrashKernel = "%dM@%dM" % (kdumpMem, kdumpOffset)
+            if kdumpOffset == 0:
+                self.origCrashKernel = "%dM" % (kdumpMem)
+            else:
+                self.origCrashKernel = "%dM@%dM" % (kdumpMem, kdumpOffset)
         else:
 	    self.kdumpMem = kdumpMemGrubby = lowerBound
             self.kdumpEnableCheckButton.set_active(False)
@@ -709,7 +716,7 @@ class mainWindow:
 
         # Are we adding or removing the crashkernel param?
         if self.kdumpEnabled:
-            crashKernel = "%iM@%iM" % (self.kdumpMem, offset)
+            crashKernel = "%iM" % (self.kdumpMem)
             grubbyCmd = '/sbin/grubby --%s --update-kernel=%s --%s="crashkernel=%s"' \
                         % (self.bootloader, self.defKern, 
                            args, crashKernel)
@@ -726,7 +733,7 @@ class mainWindow:
             serviceOp = "stop"
 
         if debug:
-            print "Using %s bootloader with %iM offset" % (self.bootloader, offset)
+            print "Using %s bootloader without offset" % (self.bootloader)
             print "Grubby command:\n    %s" % grubbyCmd
 
         # FIXME: use rhpl.executil (and handle errors)!



From hadess at fedoraproject.org  Thu Sep 11 12:40:12 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 12:40:12 +0000 (UTC)
Subject: rpms/pilot-link/devel pilot-link.spec,1.79,1.80
Message-ID: <20080911124013.07E2670131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/pilot-link/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10329

Modified Files:
	pilot-link.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 2:0.12.3-15
- Rebuild



Index: pilot-link.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pilot-link/devel/pilot-link.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- pilot-link.spec	6 Jul 2008 01:59:21 -0000	1.79
+++ pilot-link.spec	11 Sep 2008 12:39:42 -0000	1.80
@@ -3,7 +3,7 @@
 
 Name: pilot-link
 Version: 0.12.3
-Release: 14%{?dist}
+Release: 15%{?dist}
 Epoch: 2
 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL
 Group: Applications/Communications
@@ -179,6 +179,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 2:0.12.3-15
+- Rebuild
+
 * Sun Jun 15 2008 Kevin Page <krp[AT]fedoraproject org> - 2:0.12.3-14
 - corrected documentation for visor module use
 



From perex at fedoraproject.org  Thu Sep 11 12:42:46 2008
From: perex at fedoraproject.org (Jaroslav Kysela)
Date: Thu, 11 Sep 2008 12:42:46 +0000 (UTC)
Subject: rpms/alsa-plugins/devel .cvsignore, 1.5, 1.6 alsa-plugins.spec, 1.16,
	1.17 sources, 1.5, 1.6 alsa-plugins-1.0.15-pulsehint.patch, 1.1,
	NONE alsa-plugins-1.0.17-pulsenoassert.patch, 1.1,
	NONE alsa-plugins-1.0.17-pulsetrigger.patch, 1.1, NONE
Message-ID: <20080911124246.73AF270131@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12838

Modified Files:
	.cvsignore alsa-plugins.spec sources 
Removed Files:
	alsa-plugins-1.0.15-pulsehint.patch 
	alsa-plugins-1.0.17-pulsenoassert.patch 
	alsa-plugins-1.0.17-pulsetrigger.patch 
Log Message:
alsa-plugins: updated to 1.0.18rc3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Jul 2008 15:00:49 -0000	1.5
+++ .cvsignore	11 Sep 2008 12:42:15 -0000	1.6
@@ -1,2 +1,3 @@
 alsa-plugins-1.0.16.tar.bz2
 alsa-plugins-1.0.17.tar.bz2
+alsa-plugins-1.0.18rc3.tar.bz2


Index: alsa-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/alsa-plugins.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- alsa-plugins.spec	21 Jul 2008 15:22:39 -0000	1.16
+++ alsa-plugins.spec	11 Sep 2008 12:42:16 -0000	1.17
@@ -1,21 +1,21 @@
+%define		prever		rc3
+%define		prever_dot	.%{prever}
+
 Name:           alsa-plugins
-Version:        1.0.17
-Release:        1%{?dist}
+Version:        1.0.18
+Release:        1%{?prever_dot}%{?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+
 Group:          System Environment/Libraries
 URL:            http://www.alsa-project.org/
-Source0:        ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2
+Source0:        ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}%{?prever}.tar.bz2
 Source1:        jack.conf
 Source2:        pcm-oss.conf
 Source4:        samplerate.conf
 Source5:        upmix.conf
 Source6:        vdownmix.conf
 Source7:        pulse-default.conf
-Patch3:         alsa-plugins-1.0.15-pulsehint.patch
-Patch4:		alsa-plugins-1.0.17-pulsenoassert.patch
-Patch5:		alsa-plugins-1.0.17-pulsetrigger.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -95,11 +95,16 @@
 a simple spacialization, so the output sounds like a kind of "virtual
 surround".
 
+%package usbstream
+Summary:        USB stream plugin for ALSA
+Group:          System Environment/Libraries
+License:        LGPLv2+
+%description usbstream
+The usbstream plugin is for snd-usb-us122l driver. It converts PCM
+stream to USB specific stream.
+
 %prep
-%setup -q -n %{name}-%{version}
-%patch3 -p1 -b .pulsehint
-%patch4 -p1 -b .pulsenoassert
-%patch5 -p1 -b .pulsetrigger
+%setup -q -n %{name}-%{version}%{?prever}
 
 %build
 %configure --disable-static \
@@ -173,7 +178,16 @@
 %config(noreplace) %{_sysconfdir}/alsa/pcm/vdownmix.conf
 %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
 
+%files usbstream
+%defattr(-,root,root,-)
+%doc COPYING COPYING.GPL
+%{_libdir}/alsa-lib/libasound_module_pcm_usb_stream.so
+
 %changelog
+* Thu Sep 11 2008 Jaroslav Kysela <jkysela at redhat.com> - 1.0.18-1.rc3
+- Updated to 1.0.18rc3
+- Added usbstream subpackage
+
 * Mon Jul 21 2008 Jaroslav Kysela <jkysela at redhat.com> - 1.0.17-1
 - Updated to 1.0.17
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Jul 2008 15:00:49 -0000	1.5
+++ sources	11 Sep 2008 12:42:16 -0000	1.6
@@ -1 +1 @@
-f37d0b2b19dfbe215144941ab8bb6e49  alsa-plugins-1.0.17.tar.bz2
+e3b7bcd92d1bb380d7de13e61af996e9  alsa-plugins-1.0.18rc3.tar.bz2


--- alsa-plugins-1.0.15-pulsehint.patch DELETED ---


--- alsa-plugins-1.0.17-pulsenoassert.patch DELETED ---


--- alsa-plugins-1.0.17-pulsetrigger.patch DELETED ---



From hadess at fedoraproject.org  Thu Sep 11 12:44:10 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 12:44:10 +0000 (UTC)
Subject: rpms/libbtctl/devel libbtctl-bluez4.patch, NONE, 1.1 libbtctl.spec, 
	1.53, 1.54
Message-ID: <20080911124410.4AEFD70131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libbtctl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13428

Modified Files:
	libbtctl.spec 
Added Files:
	libbtctl-bluez4.patch 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-5
- Rebuild with patch for BlueZ 4.x


libbtctl-bluez4.patch:

--- NEW FILE libbtctl-bluez4.patch ---
Index: src/btctlimpl.c
===================================================================
--- src/btctlimpl.c	(revision 134)
+++ src/btctlimpl.c	(working copy)
@@ -330,8 +330,8 @@
 	if (dd>=0) {
 		for (i = 0; i < num_rsp; i++) {
 			memset(name, 0, sizeof(name));
-			if (hci_remote_name(dd, &(info+i)->bdaddr,
-						sizeof(name), name, 100000) < 0)
+			if (hci_read_remote_name(dd, &(info+i)->bdaddr,
+						 sizeof(name), name, 100000) < 0)
 				strcpy(name, "n/a");
 
 			baswap(&bdaddr, &(info+i)->bdaddr);


Index: libbtctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- libbtctl.spec	11 Sep 2008 12:20:57 -0000	1.53
+++ libbtctl.spec	11 Sep 2008 12:43:40 -0000	1.54
@@ -8,7 +8,7 @@
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.10.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL+
 Group: System Environment/Libraries
 URL: http://live.gnome.org/GnomeBluetooth 
@@ -23,6 +23,7 @@
 %{expand BuildRequires: mono-devel gtk-sharp-gapi gtk-sharp}
 %endif
 
+Patch1: libbtctl-bluez4.patch
 Patch2: libbtctl-0.4.1-pydir.patch
 
 %description
@@ -47,6 +48,7 @@
 
 %prep
 %setup -q
+%patch1 -p0 -b .bluez4
 %patch2 -p1 -b .pydir
 aclocal
 automake -a
@@ -109,6 +111,9 @@
 %{_datadir}/gtk-doc/html/libbtctl
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-5
+- Rebuild with patch for BlueZ 4.x
+
 * Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-4
 - Rebuild
 



From hadess at fedoraproject.org  Thu Sep 11 12:50:07 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 12:50:07 +0000 (UTC)
Subject: rpms/libwiimote/devel libwiimote-0.4-bluez4.patch, NONE,
	1.1 libwiimote.spec, 1.5, 1.6
Message-ID: <20080911125007.F40D270131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libwiimote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16049

Modified Files:
	libwiimote.spec 
Added Files:
	libwiimote-0.4-bluez4.patch 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.4-7
- Rebuild with Bluez 4.x patch


libwiimote-0.4-bluez4.patch:

--- NEW FILE libwiimote-0.4-bluez4.patch ---
diff -upr libwiimote-0.4/configure.in libwiimote-0.4.new/configure.in
--- libwiimote-0.4/configure.in	2008-09-11 13:46:48.000000000 +0100
+++ libwiimote-0.4.new/configure.in	2008-09-11 13:46:07.000000000 +0100
@@ -33,7 +33,7 @@ AC_SUBST(CPICFLAGS)
 CFLAGS="${CFLAGS} ${CPICFLAGS}"
 
 # Checks for BlueZ.
-AC_CHECK_LIB([bluetooth], [hci_remote_name],
+AC_CHECK_LIB([bluetooth], [hci_read_remote_name],
 	     [], [AC_MSG_ERROR([We require BlueZ])])
 
 AC_CONFIG_FILES([config.mk
diff -upr libwiimote-0.4/src/wiimote_link.c libwiimote-0.4.new/src/wiimote_link.c
--- libwiimote-0.4/src/wiimote_link.c	2007-02-07 23:51:07.000000000 +0000
+++ libwiimote-0.4.new/src/wiimote_link.c	2008-09-11 13:48:22.000000000 +0100
@@ -95,7 +95,7 @@ static int is_wiimote(int hci_sock, inqu
 	return 0;
     }
 
-    if (hci_remote_name(hci_sock, &dev->bdaddr, WIIMOTE_CMP_LEN, dev_name, 5000)) {
+    if (hci_read_remote_name(hci_sock, &dev->bdaddr, WIIMOTE_CMP_LEN, dev_name, 5000)) {
 	wiimote_error("is_wiimote(): Error reading device name: %m");
 	return 0;
     }


Index: libwiimote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwiimote/devel/libwiimote.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libwiimote.spec	11 Sep 2008 12:30:52 -0000	1.5
+++ libwiimote.spec	11 Sep 2008 12:49:37 -0000	1.6
@@ -13,6 +13,7 @@
 Patch1:		libwiimote-0.4-includedir.patch
 Patch2:		libwiimote-0.4-dso-symlinks.patch
 Patch3:		libwiimote-0.4-soname.patch
+Patch4:		libwiimote-0.4-bluez4.patch
 
 BuildRequires:  autoconf
 BuildRequires:  bluez-libs-devel
@@ -38,6 +39,7 @@
 %patch1 -p1 -b .includedir
 %patch2 -p1 -b .dso-symlinks
 %patch3 -p1 -b .soname
+%patch4 -p1 -b .bluez4
 
 %build
 autoconf
@@ -70,6 +72,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.4-7
+- Rebuild with Bluez 4.x patch
+
 * Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.4-6
 - Rebuild
 



From hadess at fedoraproject.org  Thu Sep 11 12:52:40 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 12:52:40 +0000 (UTC)
Subject: rpms/libwiimote/devel libwiimote.spec,1.6,1.7
Message-ID: <20080911125240.73B2C70131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libwiimote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17117

Modified Files:
	libwiimote.spec 
Log Message:
Fix release



Index: libwiimote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwiimote/devel/libwiimote.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libwiimote.spec	11 Sep 2008 12:49:37 -0000	1.6
+++ libwiimote.spec	11 Sep 2008 12:52:10 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           libwiimote
 Version:        0.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Simple Wiimote Library for Linux
 
 Group:          System Environment/Libraries



From hadess at fedoraproject.org  Thu Sep 11 12:52:54 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 12:52:54 +0000 (UTC)
Subject: rpms/gnome-vfs2-obexftp/devel gnome-vfs2-obexftp.spec,1.10,1.11
Message-ID: <20080911125254.17D0F70131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-vfs2-obexftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16990

Modified Files:
	gnome-vfs2-obexftp.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.4-8
- Rebuild



Index: gnome-vfs2-obexftp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2-obexftp/devel/gnome-vfs2-obexftp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-vfs2-obexftp.spec	24 Jul 2008 15:03:51 -0000	1.10
+++ gnome-vfs2-obexftp.spec	11 Sep 2008 12:52:23 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:	ObexFTP over Bluetooth support for GNOME
 Name:		gnome-vfs2-obexftp
 Version:	0.4
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	LGPLv2+
 Group:		Applications/Communications
 URL:		http://www.gnome.org/
@@ -48,6 +48,9 @@
 %{_libdir}/gnome-vfs-2.0/modules/*.so
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.4-8
+- Rebuild
+
 * Thu Jul 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4-7
 - fix license tag
 



From mpg at fedoraproject.org  Thu Sep 11 12:53:42 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Thu, 11 Sep 2008 12:53:42 +0000 (UTC)
Subject: rpms/sugar-journal/devel sugar-journal.spec,1.7,1.8
Message-ID: <20080911125342.94B7E70131@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-journal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17677

Modified Files:
	sugar-journal.spec 
Log Message:
* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 99-3
- Obvious typo in the files




Index: sugar-journal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-journal/devel/sugar-journal.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sugar-journal.spec	11 Sep 2008 11:57:49 -0000	1.7
+++ sugar-journal.spec	11 Sep 2008 12:53:11 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           sugar-journal
 Version:        99
-Release:        2%{?dist}
+Release:        3%{?dist}
 #Release:        4.%{alphatag}%{?dist}
 Summary:        Journal for Sugar
 
@@ -42,12 +42,15 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f org.laptop.JournalActivity
+%files -f org.laptop.JournalActivity.lang
 %defattr(-,root,root,-)
 %doc NEWS
 %{sugaractivitydir}/Journal.activity/
 
 %changelog
+* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 99-3
+- Obvious typo in the files
+
 * Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 99-2
 - Fixup packaging for the new bundlebuilder
 



From dtimms at fedoraproject.org  Thu Sep 11 13:01:05 2008
From: dtimms at fedoraproject.org (David Timms)
Date: Thu, 11 Sep 2008 13:01:05 +0000 (UTC)
Subject: rpms/nes_ntsc/devel import.log, NONE, 1.1 nes_ntsc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080911130105.37FD370131@cvs1.fedora.phx.redhat.com>

Author: dtimms

Update of /cvs/pkgs/rpms/nes_ntsc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20619/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log nes_ntsc.spec 
Log Message:
Initial .src.rpm import into fedora of nes_ntsc



--- NEW FILE import.log ---
nes_ntsc-0_2_2-1_fc9:HEAD:nes_ntsc-0.2.2-1.fc9.src.rpm:1221137981


--- NEW FILE nes_ntsc.spec ---
%define         libname lib%{name}.so

Name:          nes_ntsc
Version:       0.2.2
Release:       1%{?dist}
Summary:       Provides a NES NTSC video filtering library

Group:         System Environment/Libraries
License:       LGPLv2+
URL:           http://www.slack.net/~ant/libs/ntsc.html
Source0:       http://blargg.fileave.com/libs/%{name}-%{version}.zip
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: SDL-devel

%description
NES NTSC video filter library. Pixel artifacts and color mixing play an 
important role in NES games console graphics. Accepts pixels in native 6-bit
NES palette format, or a 9-bit format that includes the three color emphasis
bits in PPU register $2001. Can also output an RGB palette for use in a 
regular blitter


%package devel
Summary:        Development files for nes_ntsc
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
Development files for nes_ntsc


%package demos
Summary:        Examples using nes_ntsc
Group:          Development/Libraries

%description demos
Examples using nes_ntsc


%prep
%setup -q
# Some location cleanups
sed -i 's/\"SDL.h\"/\<SDL\/SDL.h\>/' demo_impl.h
sed -i 's/\"test.bmp\"/\"\/usr\/share\/nes_ntsc\/test.bmp\"/' demo.c
# mod EOL{dos}->EOL{unix}
%{__sed} -i 's/\r//' *.txt

#%{__sed} -i 's/\r//' changes.txt
#%{__sed} -i 's/\r//' license.txt
#%{__sed} -i 's/\r//' nes_ntsc.txt
#%{__sed} -i 's/\r//' readme.txt


%build
# Compile library, link and give it an soname
gcc -c $RPM_OPT_FLAGS -fPIC %{name}.c
gcc $RPM_OPT_FLAGS -shared -Wl,-soname,%{libname}.0 -o %{libname}.0.2.2 %{name}.o

# Make symlinks now as they are needed
ln -s %{libname}.0.2.2 %{libname}.0
ln -s %{libname}.0.2.2 %{libname}.0.2.0
ln -s %{libname}.0.2.2 %{libname}

# Compile demos
gcc $RPM_OPT_FLAGS benchmark.c -o nes_ntsc_benchmark -L. -lnes_ntsc -lm
gcc $RPM_OPT_FLAGS demo.c -o nes_ntsc_demo -L. -lnes_ntsc -lm -lSDL


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_libdir} \
         %{buildroot}%{_includedir} %{buildroot}%{_datadir}/%{name}

# Install include
install -pm 0644 %{name}.h %{buildroot}%{_includedir}

# Install test roms and examples
cp -a tests %{buildroot}%{_datadir}/%{name}
install -pm 0644 test.bmp %{buildroot}%{_datadir}/%{name}

# Install lib and symlinks
install -pm 0755 %{libname}.0.2.2 %{buildroot}%{_libdir}
mv %{libname}.0 %{buildroot}%{_libdir}
mv %{libname}.0.2.0 %{buildroot}%{_libdir}
mv %{libname} %{buildroot}%{_libdir}

# Install demos
install -p -m0755 nes_ntsc_benchmark %{buildroot}%{_bindir}
install -p -m0755 nes_ntsc_demo %{buildroot}%{_bindir}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_libdir}/%{libname}.0
%{_libdir}/%{libname}.0.2.0
%{_libdir}/%{libname}.0.2.2
%doc changes.txt license.txt


%files devel
%defattr(-,root,root,-)
%{_libdir}/%{libname}
%{_includedir}/%{name}.h
%doc nes_ntsc.txt readme.txt


%files demos
%defattr(-,root,root,-)
%{_datadir}/%{name}
%{_bindir}/nes_ntsc_benchmark
%{_bindir}/nes_ntsc_demo


%changelog
* Wed Aug  6 2008 David Timms <iinet.net.au at dtimms> 0.2.2-1
- update ex dribble spec to new release @ new url
- meet fedora license guidelines
- mod sed patches to suit new source filenames

* Sun Oct 29 2006 Ian Chapman <packages at amiga-hardware.com> 0.2.0-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nes_ntsc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 08:58:08 -0000	1.1
+++ .cvsignore	11 Sep 2008 13:00:34 -0000	1.2
@@ -0,0 +1 @@
+nes_ntsc-0.2.2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nes_ntsc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 08:58:08 -0000	1.1
+++ sources	11 Sep 2008 13:00:34 -0000	1.2
@@ -0,0 +1 @@
+fc5bfed1399ed101c22a65efadb5834a  nes_ntsc-0.2.2.zip



From hadess at fedoraproject.org  Thu Sep 11 13:01:40 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 13:01:40 +0000 (UTC)
Subject: rpms/obex-data-server/devel obex-data-server-0.3.4-bluez4.patch,
	NONE, 1.1 obex-data-server.spec, 1.8, 1.9
Message-ID: <20080911130140.D782D70131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/obex-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20958

Modified Files:
	obex-data-server.spec 
Added Files:
	obex-data-server-0.3.4-bluez4.patch 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-3
- Rebuild with BlueZ 4.x patch


obex-data-server-0.3.4-bluez4.patch:

--- NEW FILE obex-data-server-0.3.4-bluez4.patch ---
--- obex-data-server-0.3.4/src/ods-bluez.c	2008-06-27 16:21:14.000000000 +0100
+++ obex-data-server-0.3.4.new/src/ods-bluez.c	2008-09-11 13:56:37.000000000 +0100
@@ -314,7 +314,7 @@ get_remote_service_record_cb (DBusGProxy
 		goto err;
 	}
 	
-	sdp_record = sdp_extract_pdu ((uint8_t *)record_array->data, &scanned);
+	sdp_record = sdp_extract_pdu ((uint8_t *)record_array->data, record_array->len, &scanned);
 	
 	/* get channel for this service */
 	if (sdp_get_access_protos (sdp_record, &protos) != 0) {


Index: obex-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obex-data-server/devel/obex-data-server.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- obex-data-server.spec	11 Sep 2008 05:33:33 -0000	1.8
+++ obex-data-server.spec	11 Sep 2008 13:01:10 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		obex-data-server
 Version:	0.3.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Epoch:		1
 Summary:	D-Bus service for Obex access
 
@@ -16,6 +16,8 @@
 BuildRequires:	glib2-devel
 BuildRequires:	libtool
 
+Patch0:		obex-data-server-0.3.4-bluez4.patch
+
 %description
 obex-data-server is a D-Bus service to allow sending and receiving files
 using the ObexFTP and Obex Push protocols, common on mobile phones and
@@ -23,6 +25,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .bluez4
 
 %build
 %configure
@@ -60,6 +63,9 @@
 %{_mandir}/man1/obex-data-server.1.gz
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-3
+- Rebuild with BlueZ 4.x patch
+
 * Thu Sep 11 2008 Matthias Clasen <mclasen at redhat.com> - 0.3.4-2
 - Rebuild
 



From dtimms at fedoraproject.org  Thu Sep 11 13:05:19 2008
From: dtimms at fedoraproject.org (David Timms)
Date: Thu, 11 Sep 2008 13:05:19 +0000 (UTC)
Subject: rpms/nes_ntsc/F-8 import.log, NONE, 1.1 nes_ntsc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080911130519.17DF970131@cvs1.fedora.phx.redhat.com>

Author: dtimms

Update of /cvs/pkgs/rpms/nes_ntsc/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22428/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log nes_ntsc.spec 
Log Message:
Initial import of .src.rpm into Fedora


--- NEW FILE import.log ---
nes_ntsc-0_2_2-1_fc9:F-8:nes_ntsc-0.2.2-1.fc9.src.rpm:1221138219


--- NEW FILE nes_ntsc.spec ---
%define         libname lib%{name}.so

Name:          nes_ntsc
Version:       0.2.2
Release:       1%{?dist}
Summary:       Provides a NES NTSC video filtering library

Group:         System Environment/Libraries
License:       LGPLv2+
URL:           http://www.slack.net/~ant/libs/ntsc.html
Source0:       http://blargg.fileave.com/libs/%{name}-%{version}.zip
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: SDL-devel

%description
NES NTSC video filter library. Pixel artifacts and color mixing play an 
important role in NES games console graphics. Accepts pixels in native 6-bit
NES palette format, or a 9-bit format that includes the three color emphasis
bits in PPU register $2001. Can also output an RGB palette for use in a 
regular blitter


%package devel
Summary:        Development files for nes_ntsc
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
Development files for nes_ntsc


%package demos
Summary:        Examples using nes_ntsc
Group:          Development/Libraries

%description demos
Examples using nes_ntsc


%prep
%setup -q
# Some location cleanups
sed -i 's/\"SDL.h\"/\<SDL\/SDL.h\>/' demo_impl.h
sed -i 's/\"test.bmp\"/\"\/usr\/share\/nes_ntsc\/test.bmp\"/' demo.c
# mod EOL{dos}->EOL{unix}
%{__sed} -i 's/\r//' *.txt

#%{__sed} -i 's/\r//' changes.txt
#%{__sed} -i 's/\r//' license.txt
#%{__sed} -i 's/\r//' nes_ntsc.txt
#%{__sed} -i 's/\r//' readme.txt


%build
# Compile library, link and give it an soname
gcc -c $RPM_OPT_FLAGS -fPIC %{name}.c
gcc $RPM_OPT_FLAGS -shared -Wl,-soname,%{libname}.0 -o %{libname}.0.2.2 %{name}.o

# Make symlinks now as they are needed
ln -s %{libname}.0.2.2 %{libname}.0
ln -s %{libname}.0.2.2 %{libname}.0.2.0
ln -s %{libname}.0.2.2 %{libname}

# Compile demos
gcc $RPM_OPT_FLAGS benchmark.c -o nes_ntsc_benchmark -L. -lnes_ntsc -lm
gcc $RPM_OPT_FLAGS demo.c -o nes_ntsc_demo -L. -lnes_ntsc -lm -lSDL


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_libdir} \
         %{buildroot}%{_includedir} %{buildroot}%{_datadir}/%{name}

# Install include
install -pm 0644 %{name}.h %{buildroot}%{_includedir}

# Install test roms and examples
cp -a tests %{buildroot}%{_datadir}/%{name}
install -pm 0644 test.bmp %{buildroot}%{_datadir}/%{name}

# Install lib and symlinks
install -pm 0755 %{libname}.0.2.2 %{buildroot}%{_libdir}
mv %{libname}.0 %{buildroot}%{_libdir}
mv %{libname}.0.2.0 %{buildroot}%{_libdir}
mv %{libname} %{buildroot}%{_libdir}

# Install demos
install -p -m0755 nes_ntsc_benchmark %{buildroot}%{_bindir}
install -p -m0755 nes_ntsc_demo %{buildroot}%{_bindir}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_libdir}/%{libname}.0
%{_libdir}/%{libname}.0.2.0
%{_libdir}/%{libname}.0.2.2
%doc changes.txt license.txt


%files devel
%defattr(-,root,root,-)
%{_libdir}/%{libname}
%{_includedir}/%{name}.h
%doc nes_ntsc.txt readme.txt


%files demos
%defattr(-,root,root,-)
%{_datadir}/%{name}
%{_bindir}/nes_ntsc_benchmark
%{_bindir}/nes_ntsc_demo


%changelog
* Wed Aug  6 2008 David Timms <iinet.net.au at dtimms> 0.2.2-1
- update ex dribble spec to new release @ new url
- meet fedora license guidelines
- mod sed patches to suit new source filenames

* Sun Oct 29 2006 Ian Chapman <packages at amiga-hardware.com> 0.2.0-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nes_ntsc/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 08:58:08 -0000	1.1
+++ .cvsignore	11 Sep 2008 13:04:48 -0000	1.2
@@ -0,0 +1 @@
+nes_ntsc-0.2.2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nes_ntsc/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 08:58:08 -0000	1.1
+++ sources	11 Sep 2008 13:04:48 -0000	1.2
@@ -0,0 +1 @@
+fc5bfed1399ed101c22a65efadb5834a  nes_ntsc-0.2.2.zip



From dtimms at fedoraproject.org  Thu Sep 11 13:08:53 2008
From: dtimms at fedoraproject.org (David Timms)
Date: Thu, 11 Sep 2008 13:08:53 +0000 (UTC)
Subject: rpms/nes_ntsc/F-9 import.log, NONE, 1.1 nes_ntsc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080911130853.AE9A170131@cvs1.fedora.phx.redhat.com>

Author: dtimms

Update of /cvs/pkgs/rpms/nes_ntsc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23619/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log nes_ntsc.spec 
Log Message:
Initial import of .src.rpm into Fedora


--- NEW FILE import.log ---
nes_ntsc-0_2_2-1_fc9:F-9:nes_ntsc-0.2.2-1.fc9.src.rpm:1221138460


--- NEW FILE nes_ntsc.spec ---
%define         libname lib%{name}.so

Name:          nes_ntsc
Version:       0.2.2
Release:       1%{?dist}
Summary:       Provides a NES NTSC video filtering library

Group:         System Environment/Libraries
License:       LGPLv2+
URL:           http://www.slack.net/~ant/libs/ntsc.html
Source0:       http://blargg.fileave.com/libs/%{name}-%{version}.zip
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: SDL-devel

%description
NES NTSC video filter library. Pixel artifacts and color mixing play an 
important role in NES games console graphics. Accepts pixels in native 6-bit
NES palette format, or a 9-bit format that includes the three color emphasis
bits in PPU register $2001. Can also output an RGB palette for use in a 
regular blitter


%package devel
Summary:        Development files for nes_ntsc
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
Development files for nes_ntsc


%package demos
Summary:        Examples using nes_ntsc
Group:          Development/Libraries

%description demos
Examples using nes_ntsc


%prep
%setup -q
# Some location cleanups
sed -i 's/\"SDL.h\"/\<SDL\/SDL.h\>/' demo_impl.h
sed -i 's/\"test.bmp\"/\"\/usr\/share\/nes_ntsc\/test.bmp\"/' demo.c
# mod EOL{dos}->EOL{unix}
%{__sed} -i 's/\r//' *.txt

#%{__sed} -i 's/\r//' changes.txt
#%{__sed} -i 's/\r//' license.txt
#%{__sed} -i 's/\r//' nes_ntsc.txt
#%{__sed} -i 's/\r//' readme.txt


%build
# Compile library, link and give it an soname
gcc -c $RPM_OPT_FLAGS -fPIC %{name}.c
gcc $RPM_OPT_FLAGS -shared -Wl,-soname,%{libname}.0 -o %{libname}.0.2.2 %{name}.o

# Make symlinks now as they are needed
ln -s %{libname}.0.2.2 %{libname}.0
ln -s %{libname}.0.2.2 %{libname}.0.2.0
ln -s %{libname}.0.2.2 %{libname}

# Compile demos
gcc $RPM_OPT_FLAGS benchmark.c -o nes_ntsc_benchmark -L. -lnes_ntsc -lm
gcc $RPM_OPT_FLAGS demo.c -o nes_ntsc_demo -L. -lnes_ntsc -lm -lSDL


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_libdir} \
         %{buildroot}%{_includedir} %{buildroot}%{_datadir}/%{name}

# Install include
install -pm 0644 %{name}.h %{buildroot}%{_includedir}

# Install test roms and examples
cp -a tests %{buildroot}%{_datadir}/%{name}
install -pm 0644 test.bmp %{buildroot}%{_datadir}/%{name}

# Install lib and symlinks
install -pm 0755 %{libname}.0.2.2 %{buildroot}%{_libdir}
mv %{libname}.0 %{buildroot}%{_libdir}
mv %{libname}.0.2.0 %{buildroot}%{_libdir}
mv %{libname} %{buildroot}%{_libdir}

# Install demos
install -p -m0755 nes_ntsc_benchmark %{buildroot}%{_bindir}
install -p -m0755 nes_ntsc_demo %{buildroot}%{_bindir}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_libdir}/%{libname}.0
%{_libdir}/%{libname}.0.2.0
%{_libdir}/%{libname}.0.2.2
%doc changes.txt license.txt


%files devel
%defattr(-,root,root,-)
%{_libdir}/%{libname}
%{_includedir}/%{name}.h
%doc nes_ntsc.txt readme.txt


%files demos
%defattr(-,root,root,-)
%{_datadir}/%{name}
%{_bindir}/nes_ntsc_benchmark
%{_bindir}/nes_ntsc_demo


%changelog
* Wed Aug  6 2008 David Timms <iinet.net.au at dtimms> 0.2.2-1
- update ex dribble spec to new release @ new url
- meet fedora license guidelines
- mod sed patches to suit new source filenames

* Sun Oct 29 2006 Ian Chapman <packages at amiga-hardware.com> 0.2.0-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nes_ntsc/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 08:58:08 -0000	1.1
+++ .cvsignore	11 Sep 2008 13:08:23 -0000	1.2
@@ -0,0 +1 @@
+nes_ntsc-0.2.2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nes_ntsc/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 08:58:08 -0000	1.1
+++ sources	11 Sep 2008 13:08:23 -0000	1.2
@@ -0,0 +1 @@
+fc5bfed1399ed101c22a65efadb5834a  nes_ntsc-0.2.2.zip



From rhughes at fedoraproject.org  Thu Sep 11 13:16:11 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Thu, 11 Sep 2008 13:16:11 +0000 (UTC)
Subject: rpms/pm-utils/devel .cvsignore, 1.33, 1.34 pm-utils.spec, 1.109,
	1.110 sources, 1.39, 1.40
Message-ID: <20080911131611.3FA1D70131@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25987

Modified Files:
	.cvsignore pm-utils.spec sources 
Log Message:
* Thu Sep 11 2008 Richard Hughes <rhughes at redhat.com> - 1.2.0-1
- Update to 1.2.0
- The core hook-running machinery will now abort running hooks of one fails,
  and the front-end scripts will return a failure error code if hook-running
  was aborted.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	22 Jun 2008 15:00:44 -0000	1.33
+++ .cvsignore	11 Sep 2008 13:15:40 -0000	1.34
@@ -1 +1 @@
-pm-utils-1.1.2.3.tar.gz
+pm-utils-1.2.0.tar.gz


Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- pm-utils.spec	22 Jun 2008 15:00:44 -0000	1.109
+++ pm-utils.spec	11 Sep 2008 13:15:40 -0000	1.110
@@ -1,7 +1,7 @@
 Name: pm-utils
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
-Version: 1.1.2.3
+Version: 1.2.0
 Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
@@ -107,6 +107,12 @@
 
 
 %changelog
+* Thu Sep 11 2008 Richard Hughes <rhughes at redhat.com> - 1.2.0-1
+- Update to 1.2.0
+- The core hook-running machinery will now abort running hooks of one fails,
+  and the front-end scripts will return a failure error code if hook-running
+  was aborted.
+
 * Mon Jun 22 2008 Richard Hughes <rhughes at redhat.com> - 1.1.2.3-1
 - Update to 1.1.2.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	22 Jun 2008 15:00:44 -0000	1.39
+++ sources	11 Sep 2008 13:15:40 -0000	1.40
@@ -1 +1 @@
-aede0cf8d44fa3eb4daa88aabc5cbe99  pm-utils-1.1.2.3.tar.gz
+4f111de7b54275f09fbcd49775d6b1ae  pm-utils-1.2.0.tar.gz



From ssp at fedoraproject.org  Thu Sep 11 13:32:23 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu, 11 Sep 2008 13:32:23 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xserver-1.5.0-projector-fb-size.patch,
	NONE, 1.1 xorg-x11-server.spec, 1.347, 1.348
Message-ID: <20080911133223.BC4EC70131@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31298

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.0-projector-fb-size.patch 
Log Message:
Make room for a 1280 wide projector in the default screen limits

xserver-1.5.0-projector-fb-size.patch:

--- NEW FILE xserver-1.5.0-projector-fb-size.patch ---
>From ef49675e8d7dc829032bf6e586d55f9985d06844 Mon Sep 17 00:00:00 2001
From: Fedora X Ninjas <x at fedoraproject.org>
Date: Thu, 11 Sep 2008 09:25:18 -0400
Subject: [PATCH] Make room for a 1280 wide projector in the default screen limits

---
 hw/xfree86/modes/xf86Crtc.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 4de7e05..ee7e412 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -987,6 +987,8 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp,
 	if (crtc_height > height)
 	    height = crtc_height;
     }
+    /* Make room for a projector */
+    width += 1280;
     if (config->maxWidth && width > config->maxWidth) width = config->maxWidth;
     if (config->maxHeight && height > config->maxHeight) height = config->maxHeight;
     if (config->minWidth && width < config->minWidth) width = config->minWidth;
-- 
1.6.0.1



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- xorg-x11-server.spec	10 Sep 2008 10:47:21 -0000	1.347
+++ xorg-x11-server.spec	11 Sep 2008 13:31:53 -0000	1.348
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -54,6 +54,7 @@
 Patch1010:  xserver-1.3.0-no-prerelease-warning.patch
 
 Patch2013:  xserver-1.4.99-document-fontpath-correctly.patch
+Patch2014:  xserver-1.5.0-projector-fb-size.patch
 
 # Trivial things to never merge upstream ever
 # Don't merge this without protecting the gccisms.
@@ -498,6 +499,10 @@
 
 
 %changelog
+* Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 1.5.0-3
+- Change the default screen limits to include room for a 1280 wide
+  projector.
+
 * Wed Sep 10 2008 Dave Airlie <airlied at redhat.com> 1.5.0-2
 - bring master exa back
 



From ssp at fedoraproject.org  Thu Sep 11 13:35:49 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu, 11 Sep 2008 13:35:49 +0000 (UTC)
Subject: rpms/xorg-x11-drv-i810/devel xorg-x11-drv-i810.spec, 1.108,
	1.109 intel-2.4.2-fb-size.patch, 1.2, NONE
Message-ID: <20080911133549.1729970131@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32714

Modified Files:
	xorg-x11-drv-i810.spec 
Removed Files:
	intel-2.4.2-fb-size.patch 
Log Message:
Remove fb size hack


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- xorg-x11-drv-i810.spec	10 Sep 2008 18:13:46 -0000	1.108
+++ xorg-x11-drv-i810.spec	11 Sep 2008 13:35:18 -0000	1.109
@@ -6,7 +6,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.4.2
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -26,7 +26,6 @@
 Patch5: intel-fix-irq.patch
 # fd.o bug 17341
 Patch6: i830-render-init-no-map.patch
-Patch7: intel-2.4.2-fb-size.patch
 Patch8: intel-2.4.2-fix-mode-typo.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
@@ -62,7 +61,6 @@
 #patch4 -p1 -b .fixflip
 %patch5 -p1 -b .irqfix
 %patch6 -p1 -b .exafix
-%patch7 -p1 -b .fb-size
 %patch8 -p1 -b .modename
 
 %build
@@ -106,6 +104,9 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 2.4.2-8
+- Remove the fb size hack, since there is a fix in the server now.
+
 * Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 2.4.2-7
 - Do the fb size hack a different terrible way.
 


--- intel-2.4.2-fb-size.patch DELETED ---



From dionysos at fedoraproject.org  Thu Sep 11 13:45:43 2008
From: dionysos at fedoraproject.org (Alain Portal)
Date: Thu, 11 Sep 2008 13:45:43 +0000 (UTC)
Subject: rpms/man-pages-fr/devel man-pages-fr.spec,1.42,1.43
Message-ID: <20080911134543.1700F70131@cvs1.fedora.phx.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/man-pages-fr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3450

Modified Files:
	man-pages-fr.spec 
Log Message:
- Remove pages provided by their upstream tarball
  Fix #455277 and #457663



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/extras/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- man-pages-fr.spec	7 Jun 2008 10:19:39 -0000	1.42
+++ man-pages-fr.spec	11 Sep 2008 13:45:12 -0000	1.43
@@ -4,7 +4,7 @@
 Summary:	French version of the Linux man-pages
 Name:		man-pages-fr
 Version:	2.80.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL+
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
@@ -52,6 +52,12 @@
 # This page is provided by LDP so we have to remove it from shadow-utils package
 %{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man3/getspnam.3
 
+# This page is provided by rmp package
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man8/rpm.8
+
+# This page is provided by sitecopy package
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man1/sitecopy.1
+
 LANG=fr ./cree_index_man.sh $RPM_BUILD_ROOT%{_mandir}/fr/
 
 %clean
@@ -64,6 +70,10 @@
 %{_mandir}/fr/
 
 %changelog
+* Sat Sep  6 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.80.0-3
+- Remove pages provided by their upstream tarball
+  Fix #455277 and #457663
+
 * Fri Jun  6 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.80.0-2
 - Bump release because wrong sources file
 



From dwalsh at fedoraproject.org  Thu Sep 11 13:55:41 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 11 Sep 2008 13:55:41 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-sepolgen.patch, 1.15,
	1.16 policycoreutils.spec, 1.556, 1.557
Message-ID: <20080911135541.DEAE970131@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7091

Modified Files:
	policycoreutils-sepolgen.patch policycoreutils.spec 
Log Message:
* Thu Sep 11 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-8
- Only call gen_requires once in sepolgen


policycoreutils-sepolgen.patch:

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- policycoreutils-sepolgen.patch	29 Jul 2008 14:40:15 -0000	1.15
+++ policycoreutils-sepolgen.patch	11 Sep 2008 13:55:11 -0000	1.16
@@ -1,6 +1,39 @@
-diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.52/sepolgen-1.0.13/src/sepolgen/refparser.py
---- nsasepolgen/src/sepolgen/refparser.py	2008-06-13 23:25:26.000000000 -0400
-+++ policycoreutils-2.0.52/sepolgen-1.0.13/src/sepolgen/refparser.py	2008-07-29 09:06:29.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/policygen.py policycoreutils-2.0.55/sepolgen-1.0.13/src/sepolgen/policygen.py
+--- nsasepolgen/src/sepolgen/policygen.py	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.55/sepolgen-1.0.13/src/sepolgen/policygen.py	2008-09-11 09:26:52.000000000 -0400
+@@ -134,6 +134,10 @@
+             m.refpolicy = False
+ 
+     def get_module(self):
++        # Generate the requires
++        if self.gen_requires:
++            gen_requires(self.module)
++
+         """Return the generated module"""
+         return self.module
+ 
+@@ -163,18 +167,10 @@
+         # Generate the raw allow rules from the filtered list
+         self.__add_allow_rules(raw_allow)
+ 
+-        # Generate the requires
+-        if self.gen_requires:
+-            gen_requires(self.module)
+-
+     def add_role_types(self, role_type_set):
+         for role_type in role_type_set:
+             self.module.children.append(role_type)
+ 
+-        # Generate the requires
+-        if self.gen_requires:
+-            gen_requires(self.module)
+-
+ def explain_access(av, ml=None, verbosity=SHORT_EXPLANATION):
+     """Explain why a policy statement was generated.
+ 
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.55/sepolgen-1.0.13/src/sepolgen/refparser.py
+--- nsasepolgen/src/sepolgen/refparser.py	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.55/sepolgen-1.0.13/src/sepolgen/refparser.py	2008-08-29 14:34:59.000000000 -0400
 @@ -919,7 +919,7 @@
  def list_headers(root):
      modules = []


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.556
retrieving revision 1.557
diff -u -r1.556 -r1.557
--- policycoreutils.spec	9 Sep 2008 19:14:39 -0000	1.556
+++ policycoreutils.spec	11 Sep 2008 13:55:11 -0000	1.557
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.55
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Thu Sep 11 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-8
+- Only call gen_requires once in sepolgen
+
 * Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-7
 - Change Requires line to gnome-python2-gnome
 - Fix spelling mistakes



From ajax at fedoraproject.org  Thu Sep 11 13:56:58 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 11 Sep 2008 13:56:58 +0000 (UTC)
Subject: rpms/rhpxl/devel rhpxl.spec,1.80,1.81
Message-ID: <20080911135658.3B2EC70131@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/rhpxl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7646

Modified Files:
	rhpxl.spec 
Log Message:
* Thu Sep 11 2008 Adam Jackson <ajax at redhat.com> 1.9-3
- Un-Requires: newt.



Index: rhpxl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- rhpxl.spec	4 Aug 2008 13:46:46 -0000	1.80
+++ rhpxl.spec	11 Sep 2008 13:56:27 -0000	1.81
@@ -4,14 +4,14 @@
 Name: rhpxl
 URL: http://fedoraproject.org/wiki/rhpxl
 Version: 1.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: https://fedorahosted.org/releases/r/h/%{name}/%{name}-%{version}.tar.gz
 License: GPLv2
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel, gettext, libXrandr-devel, libX11-devel
 ExcludeArch: s390 s390x
-Requires: python, rhpl >= 0.214, newt, hwdata >= 0.169, hal
+Requires: python, rhpl >= 0.214, hwdata >= 0.169, hal
 Requires: pyxf86config >= 0.3.31, xorg-x11-server-Xorg >= 1.4.99.901
 
 %description
@@ -40,6 +40,9 @@
 %{python_sitearch}/*egg-info
 
 %changelog
+* Thu Sep 11 2008 Adam Jackson <ajax at redhat.com> 1.9-3
+- Un-Requires: newt.
+
 * Mon Aug 04 2008 Adam Jackson <ajax at redhat.com> 1.9-2
 - Fix Source URL.
 



From spot at fedoraproject.org  Thu Sep 11 14:07:57 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 14:07:57 +0000 (UTC)
Subject: rpms/GraphicsMagick/devel .cvsignore, 1.4,
	1.5 GraphicsMagick-perl.patch, 1.1, 1.2 GraphicsMagick.spec,
	1.19, 1.20 sources, 1.4, 1.5
Message-ID: <20080911140757.96AC070131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/GraphicsMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11767

Modified Files:
	.cvsignore GraphicsMagick-perl.patch GraphicsMagick.spec 
	sources 
Log Message:
update to 1.2.5, fix perl bits


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jan 2008 17:21:57 -0000	1.4
+++ .cvsignore	11 Sep 2008 14:07:27 -0000	1.5
@@ -1 +1 @@
-GraphicsMagick-1.1.10.tar.bz2
+GraphicsMagick-1.2.5.tar.bz2

GraphicsMagick-perl.patch:

Index: GraphicsMagick-perl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/GraphicsMagick-perl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GraphicsMagick-perl.patch	28 Jan 2008 17:21:57 -0000	1.1
+++ GraphicsMagick-perl.patch	11 Sep 2008 14:07:27 -0000	1.2
@@ -1,24 +1,24 @@
-diff -up GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.orig GraphicsMagick-1.1.10/PerlMagick/Makefile.PL
---- GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.orig	2008-01-28 17:48:28.000000000 +0100
-+++ GraphicsMagick-1.1.10/PerlMagick/Makefile.PL	2008-01-28 17:48:58.000000000 +0100
-@@ -62,7 +62,7 @@ WriteMakefile
-    'INSTALLBIN'	=> '/usr/local/bin',
+diff -up GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.in.perl GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.in
+--- GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.in.perl	2008-05-18 17:21:59.000000000 -0400
++++ GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.in	2008-09-11 08:54:06.000000000 -0400
+@@ -61,7 +61,7 @@ WriteMakefile
+    'INSTALLBIN'	=> '@BIN_DIR@',
  
     # Library specification
--   'LIBS'	=> ['-L/usr/local/lib -R/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/home/glennrp/CVS/ImageMagick/magick -lGraphicsMagick -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lgs -lpng -lfpx -lwmflite -lXext -lSM -lICE -lX11 -lsocket -lnsl -lbz2 -lxml2 -lz -lpthread -lm'],
-+   'LIBS'	=> ['-L/usr/local/lib -R/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/home/glennrp/CVS/ImageMagick/magick -L../magick/.libs -lGraphicsMagick -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lgs -lpng -lfpx -lwmflite -lXext -lSM -lICE -lX11 -lsocket -lnsl -lbz2 -lxml2 -lz -lpthread -lm'],
+-   'LIBS'	=> ['-L at MAGICKLIBDIR@ -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
++   'LIBS'	=> ['-L at MAGICKLIBDIR@ -L../magick/.libs -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
  
     # Perl binary name (if a Perl binary is built)
     'MAP_TARGET'	=> 'PerlMagick',
-diff -up GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in.orig GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in
---- GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in.orig	2008-01-28 17:48:34.000000000 +0100
-+++ GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in	2008-01-28 17:48:58.000000000 +0100
+diff -up GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.perl GraphicsMagick-1.2.5/PerlMagick/Makefile.PL
+--- GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.perl	2004-04-18 18:20:51.000000000 -0400
++++ GraphicsMagick-1.2.5/PerlMagick/Makefile.PL	2008-09-11 08:57:44.000000000 -0400
 @@ -57,7 +57,7 @@ WriteMakefile
-    'INSTALLBIN'	=> '@BIN_DIR@',
+    'INSTALLBIN'	=> '/usr/local/bin',
  
     # Library specification
--   'LIBS'	=> ['-L at MAGICKLIBDIR@ -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
-+   'LIBS'	=> ['-L at MAGICKLIBDIR@ -L../magick/.libs -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
+-   'LIBS'	=> ['-L/home/bfriesen/src/graphics/GraphicsMagick-Web/magick/.libs -lGraphicsMagick -L/usr/local/lib -R/usr/local/lib -R/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib -L/usr/local/lib -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lwmflite -ldpstk -ldps -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lc_r'],
++   'LIBS'	=> ['-L/home/bfriesen/src/graphics/GraphicsMagick-Web/magick/.libs -L../magick/.libs -lGraphicsMagick -L/usr/local/lib -R/usr/local/lib -R/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib -L/usr/local/lib -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lwmflite -ldpstk -ldps -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lc_r'],
  
     # Perl binary name (if a Perl binary is built)
     'MAP_TARGET'	=> 'PerlMagick',


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/GraphicsMagick.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- GraphicsMagick.spec	2 Jun 2008 03:48:06 -0000	1.19
+++ GraphicsMagick.spec	11 Sep 2008 14:07:27 -0000	1.20
@@ -1,13 +1,12 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
-Version: 1.1.10
-Release: 4%{?dist}
+Version: 1.2.5
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
 Patch0: GraphicsMagick-gslib.patch
 Patch1: GraphicsMagick-perl.patch
-Patch2: GraphicsMagick-1.1.10-gcc43.patch
 Url: http://www.graphicsmagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
@@ -46,9 +45,7 @@
 Summary: GraphicsMagick perl bindings
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: perl >= 5.6.0
-%define perl_vendorarch %(perl -MConfig -le 'print $Config{installvendorarch}')
-BuildRequires: %{perl_vendorarch}
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description perl
 Perl bindings to GraphicsMagick.
@@ -91,10 +88,12 @@
 # Disabled, causing segfaults in the gslib code path
 #%patch0 -p 1 -b .gslib 
 %patch1 -p 1 -b .perl
-%patch2 -p 1 -b .gcc43
 # Regenerating configure script
 #autoconf
 
+iconv -f iso-8859-2 -t utf8 < ChangeLog > ChangeLog.utf8
+mv -f ChangeLog.utf8 ChangeLog
+
 %build
 %configure --enable-shared \
            --with-modules \
@@ -112,6 +111,9 @@
            --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
            --without-dps
 
+# Avoid bogus RPATHs on x86_64
+sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+
 make
 
 %install
@@ -188,10 +190,9 @@
 %postun c++ -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog Copyright.txt
-%doc index.html www/ images/
-%doc README.txt AUTHORS NEWS 
+%defattr(-,root,root,-)
+%doc README.txt AUTHORS.txt 
+%doc %{_datadir}/doc/%{name}/
 %attr(755,root,root) %{_libdir}/libGraphicsMagick.so.*
 %attr(755,root,root) %{_libdir}/libGraphicsMagickWand.so.*
 %{_bindir}/[a-z]*
@@ -231,6 +232,10 @@
 
 
 %changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.5-1
+- update to 1.2.5
+- fix perl issues
+
 * Sun Jun 01 2008 Dennis Gilmore <dennis at ausil.us> - 1.1.10-4
 - sparc64 is a 64 bit arch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jan 2008 17:21:57 -0000	1.4
+++ sources	11 Sep 2008 14:07:27 -0000	1.5
@@ -1 +1 @@
-fb8a223ad7d7369970166b2266cb41e4  GraphicsMagick-1.1.10.tar.bz2
+a023a1561ec0780f25f5a4f0cf208053  GraphicsMagick-1.2.5.tar.bz2



From spot at fedoraproject.org  Thu Sep 11 14:10:17 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 14:10:17 +0000 (UTC)
Subject: rpms/dvdauthor/devel dvdauthor.spec,1.10,1.11
Message-ID: <20080911141017.F199C70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/dvdauthor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12779

Modified Files:
	dvdauthor.spec 
Log Message:
rebuild against new GraphicsMagick


Index: dvdauthor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvdauthor/devel/dvdauthor.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dvdauthor.spec	8 Jul 2008 17:00:44 -0000	1.10
+++ dvdauthor.spec	11 Sep 2008 14:09:47 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           dvdauthor
 Version:        0.6.14
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Command line DVD authoring tool
 
 Group:          Applications/Multimedia
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.14-7
+- rebuild against new GraphicsMagick
+
 * Tue Jul  8 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.14-6
 - Fix build with changed libdvdread 4.1.3 header location.
 



From hadess at fedoraproject.org  Thu Sep 11 14:11:27 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 14:11:27 +0000 (UTC)
Subject: rpms/obexftp/devel obexftp.spec,1.16,1.17
Message-ID: <20080911141127.AA4CA70131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/obexftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13239

Modified Files:
	obexftp.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.23-0.2.alpha
- Rebuild



Index: obexftp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obexftp/devel/obexftp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- obexftp.spec	29 Aug 2008 22:07:29 -0000	1.16
+++ obexftp.spec	11 Sep 2008 14:10:57 -0000	1.17
@@ -8,7 +8,7 @@
 Summary: Tool to access devices via the OBEX protocol
 Group: Applications/File
 Version: 0.23
-Release: 0.1.%{pre}%{?dist}
+Release: 0.2.%{pre}%{?dist}
 License: GPLv2+
 URL: http://openobex.triq.net/
 Source: http://triq.net/obexftp/%{name}-%{version}-%{pre}.tar.bz2
@@ -161,6 +161,9 @@
 %{ruby_sitearch}/obexftp.so
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.23-0.2.alpha
+- Rebuild
+
 * Mon Aug 18 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.23-0.1.alpha
 - updated to 0.23-alpha
 - split libs into separate subpackage for multilib



From hadess at fedoraproject.org  Thu Sep 11 14:14:06 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 14:14:06 +0000 (UTC)
Subject: rpms/obexfs/devel obexfs.spec,1.3,1.4
Message-ID: <20080911141406.17E7F70131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/obexfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14356

Modified Files:
	obexfs.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.11-0.4.rc3
- Rebuild



Index: obexfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obexfs/devel/obexfs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- obexfs.spec	19 Feb 2008 20:48:46 -0000	1.3
+++ obexfs.spec	11 Sep 2008 14:13:35 -0000	1.4
@@ -4,7 +4,7 @@
 Summary: FUSE based filesystem using ObexFTP
 Group: System Environment/Base
 Version: 0.11
-Release: 0.3.%{pre}%{?dist}
+Release: 0.4.%{pre}%{?dist}
 License: GPLv2+
 URL: http://openobex.triq.net/
 Source: http://triq.net/obexftp/%{name}-%{version}-%{pre}.tar.gz
@@ -37,6 +37,9 @@
 %{_bindir}/obexfs
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.11-0.4.rc3
+- Rebuild
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.11-0.3.rc3
 - Autorebuild for GCC 4.3
 



From pertusus at fedoraproject.org  Thu Sep 11 14:15:27 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Thu, 11 Sep 2008 14:15:27 +0000 (UTC)
Subject: rpms/gdal/devel gdal.spec,1.48,1.49
Message-ID: <20080911141527.A151070131@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gdal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15620

Modified Files:
	gdal.spec 
Log Message:
disable grass support to avoid depending on oneself during the build


Index: gdal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdal/devel/gdal.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gdal.spec	10 Sep 2008 12:59:02 -0000	1.48
+++ gdal.spec	11 Sep 2008 14:14:57 -0000	1.49
@@ -1,6 +1,6 @@
 Name:      gdal
 Version:   1.5.2
-Release:   2%{?dist}
+Release:   2%{?dist}.1
 Summary:   GIS file format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -25,7 +25,7 @@
 %endif
 
 # enable/disable grass support, for bootstrapping
-%define grass_support 1
+%define grass_support 0
 # enable/disable refman generation
 %define build_refman  1
 
@@ -520,7 +520,7 @@
 %endif
 
 %changelog
-* Tue Sep  9 2008 Patrice Dumas <pertusus at free.fr> - 1.5.2-2
+* Tue Sep  9 2008 Patrice Dumas <pertusus at free.fr> - 1.5.2-2.1
 - patch for libdap > 0.8.0, from Rob Cermak
 
 * Thu Jun 12 2008 Balint Cristian <rezso at rdsor.ro> - 1.5.2-1



From orion at fedoraproject.org  Thu Sep 11 14:16:04 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 11 Sep 2008 14:16:04 +0000 (UTC)
Subject: rpms/ncl/devel ncl.spec,1.3,1.4
Message-ID: <20080911141604.CF73D70131@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/ncl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15913

Modified Files:
	ncl.spec 
Log Message:
* Thu Sep 11 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-12
- Rebuild for new libdap



Index: ncl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/devel/ncl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ncl.spec	11 Apr 2008 16:40:51 -0000	1.3
+++ ncl.spec	11 Sep 2008 14:15:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ncl
 Version:        5.0.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        NCAR Command Language and NCAR Graphics
 
 Group:          Applications/Engineering
@@ -288,6 +288,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-12
+- Rebuild for new libdap
+
 * Fri Apr 11 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-11
 - Add patch to fix raster image problems on non 32-bit platforms
 - Add more includes to includes patch



From hadess at fedoraproject.org  Thu Sep 11 14:17:07 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 14:17:07 +0000 (UTC)
Subject: rpms/gypsy/devel gypsy.spec,1.1,1.2
Message-ID: <20080911141707.BC62870131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gypsy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16412

Modified Files:
	gypsy.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> 0.6-4
- Rebuild



Index: gypsy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gypsy/devel/gypsy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gypsy.spec	16 May 2008 11:30:51 -0000	1.1
+++ gypsy.spec	11 Sep 2008 14:16:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gypsy
 Version:        0.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Gypsy is a GPS multiplexing daemon
 
 Group:          System Environment/Libraries
@@ -70,6 +70,8 @@
 %{_libdir}/libgypsy.so
 
 %changelog
+* 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 spot at fedoraproject.org  Thu Sep 11 14:19:27 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 14:19:27 +0000 (UTC)
Subject: rpms/uqm/devel uqm.spec,1.16,1.17
Message-ID: <20080911141927.6F43870131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/uqm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17419

Modified Files:
	uqm.spec 
Log Message:
provide/obsolete dead uqm-content package


Index: uqm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uqm/devel/uqm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- uqm.spec	11 Sep 2008 04:49:13 -0000	1.16
+++ uqm.spec	11 Sep 2008 14:18:57 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           uqm
 Version:        0.6.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The Ur-Quan Masters, a port of the classic game Star Control II
 
 Group:          Amusements/Games
@@ -24,6 +24,8 @@
 BuildRequires:  libGLU-devel
 BuildRequires:  libmikmod-devel
 Requires:       autodownloader
+Provides:       uqm-content = %{version}-%{release}
+Obsoletes:      uqm-content <= 0.6.0-2
 
 
 %description
@@ -94,6 +96,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.2-6
+- properly Provide/Obsolete dead uqm-content package
+
 * Wed Sep 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.2-5
 - drop /usr/share/games/uqm to /usr/share/uqm
 



From spot at fedoraproject.org  Thu Sep 11 14:20:24 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 14:20:24 +0000 (UTC)
Subject: rpms/uqm-content/devel dead.package, NONE, 1.1 sources, 1.5,
	NONE uqm-content.spec, 1.7, NONE
Message-ID: <20080911142024.E12CD70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/uqm-content/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18085

Added Files:
	dead.package 
Removed Files:
	sources uqm-content.spec 
Log Message:
dead package due to licensing issue


--- NEW FILE dead.package ---
The content bits for uqm (Ur-Quan Masters) were under Creative Commons Attribution-NonCommercial-ShareAlike. 
The NonCommercial part makes them not okay for Fedora, so this package is now dead. The main uqm package has
been converted to use autodownloader, and now Provides/Obsoletes this package.

Tom "spot" Callaway <tcallawa at redhat.com> Thursday, September 11, 2008


--- sources DELETED ---


--- uqm-content.spec DELETED ---



From hadess at fedoraproject.org  Thu Sep 11 14:21:03 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 14:21:03 +0000 (UTC)
Subject: rpms/libsyncml/devel libsyncml.spec,1.5,1.6
Message-ID: <20080911142103.E6E7870131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libsyncml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17087

Modified Files:
	libsyncml.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.4.5-3
- Rebuild



Index: libsyncml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsyncml/devel/libsyncml.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libsyncml.spec	19 Feb 2008 21:35:44 -0000	1.5
+++ libsyncml.spec	11 Sep 2008 14:20:33 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		libsyncml
 Version:	0.4.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	SyncML protocol library
 
 Group:		System Environment/Libraries
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.4.5-3
+- Rebuild
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.5-2
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Thu Sep 11 14:22:05 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 14:22:05 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.99,1.100
Message-ID: <20080911142205.5781670131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18638

Modified Files:
	comps-f10.xml.in 
Log Message:
drop uqm-content*


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- comps-f10.xml.in	10 Sep 2008 23:15:54 -0000	1.99
+++ comps-f10.xml.in	11 Sep 2008 14:21:34 -0000	1.100
@@ -1740,8 +1740,6 @@
       <packagereq type="optional">ularn</packagereq>
       <packagereq type="optional">ultimatestunts</packagereq>
       <packagereq type="optional">uqm</packagereq>
-      <packagereq type="optional">uqm-content-3domusic</packagereq>
-      <packagereq type="optional">uqm-content-voice</packagereq>
       <packagereq type="optional">urbanterror</packagereq>
       <packagereq type="optional">vavoom</packagereq>
       <packagereq type="optional">vdr-sudoku</packagereq>



From hadess at fedoraproject.org  Thu Sep 11 14:24:27 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 14:24:27 +0000 (UTC)
Subject: rpms/amora/devel amora.spec,1.3,1.4
Message-ID: <20080911142427.18E0F70131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/amora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19415

Modified Files:
	amora.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> 1.1-2
- Rebuild



Index: amora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amora/devel/amora.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- amora.spec	6 Sep 2008 17:27:27 -0000	1.3
+++ amora.spec	11 Sep 2008 14:23:56 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           amora
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A mobile remote assistant
 
 Group:          Applications/Communications
@@ -50,6 +50,8 @@
 %{_mandir}/man8/amorad.8.gz
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> 1.1-2
+- Rebuild
 
 * Sat Sep  6 2008 Allisson Azevedo <allisson at gmail.com> 1.1-1
 - Update to 1.1



From hadess at fedoraproject.org  Thu Sep 11 14:26:44 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 14:26:44 +0000 (UTC)
Subject: rpms/pybluez/devel pybluez.spec,1.3,1.4
Message-ID: <20080911142644.A26E670131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/pybluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20399

Modified Files:
	pybluez.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.15-2
- Rebuild



Index: pybluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pybluez/devel/pybluez.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pybluez.spec	4 Jun 2008 18:02:29 -0000	1.3
+++ pybluez.spec	11 Sep 2008 14:26:14 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           pybluez
 Version:        0.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python API for the BlueZ bluetooth stack 
 
 Group:          Development/Languages
@@ -43,6 +43,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.15-2
+- Rebuild
+
 * Wed Jun 4 2008 Will Woods <wwoods at redhat.com> - 0.15-1
 - New upstream version
 



From hadess at fedoraproject.org  Thu Sep 11 14:28:45 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 14:28:45 +0000 (UTC)
Subject: rpms/callweaver/devel callweaver.spec,1.14,1.15
Message-ID: <20080911142845.479DF70131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/callweaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21171

Modified Files:
	callweaver.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 1.2.0.1-1.2
- Rebuild



Index: callweaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/callweaver/devel/callweaver.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- callweaver.spec	30 Jul 2008 16:54:20 -0000	1.14
+++ callweaver.spec	11 Sep 2008 14:28:14 -0000	1.15
@@ -7,7 +7,7 @@
 
 Name:		callweaver
 Version:	1.2.0.1
-Release:	1.1%{?snap:.%{snap}}%{?dist}
+Release:	1.2%{?snap:.%{snap}}%{?dist}
 Summary:	The Truly Open Source PBX
 
 Group:		Applications/Internet
@@ -377,6 +377,9 @@
 %{_sbindir}/eogi*
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 1.2.0.1-1.2
+- Rebuild
+
 * Wed Jul 30 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.0.1-1.1
 - Package manpage again.
 



From hadess at fedoraproject.org  Thu Sep 11 14:30:39 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 14:30:39 +0000 (UTC)
Subject: rpms/asterisk/devel asterisk.spec,1.32,1.33
Message-ID: <20080911143040.0047970131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21937

Modified Files:
	asterisk.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 1.6.0-0.22.beta9
- Rebuild



Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- asterisk.spec	30 Jul 2008 15:04:08 -0000	1.32
+++ asterisk.spec	11 Sep 2008 14:30:09 -0000	1.33
@@ -4,7 +4,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.0
-Release: 0.21.beta%{beta}%{?dist}
+Release: 0.22.beta%{beta}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -1026,6 +1026,9 @@
 %{_libdir}/asterisk/modules/codec_zap.so
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 1.6.0-0.22.beta9
+- Rebuild
+
 * Wed Jul 30 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0-0.21.beta9
 - Replace app_rxfax/app_txfax with app_fax taken from upstream SVN.
 



From hadess at fedoraproject.org  Thu Sep 11 14:33:02 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 14:33:02 +0000 (UTC)
Subject: rpms/kdebluetooth/devel kdebluetooth.spec,1.15,1.16
Message-ID: <20080911143302.1D34370131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/kdebluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22837

Modified Files:
	kdebluetooth.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 1.0-0.42.beta8
- Rebuild



Index: kdebluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/devel/kdebluetooth.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kdebluetooth.spec	1 Apr 2008 20:06:30 -0000	1.15
+++ kdebluetooth.spec	11 Sep 2008 14:32:31 -0000	1.16
@@ -3,7 +3,7 @@
 Summary:		The KDE Bluetooth Framework
 Name:			kdebluetooth
 Version:		1.0 
-Release:		0.41.%{reltype}%{?dist}
+Release:		0.42.%{reltype}%{?dist}
 License:		GPLv2+
 Group:			Applications/Communications
 URL:			http://bluetooth.kmobiletools.org/
@@ -166,6 +166,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 1.0-0.42.beta8
+- Rebuild
+
 * Tue Apr  1 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.41.beta8
 - -devel: Requires: kdelibs3-devel
 



From hadess at fedoraproject.org  Thu Sep 11 14:36:16 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 14:36:16 +0000 (UTC)
Subject: rpms/libopensync-plugin-irmc/devel libopensync-plugin-irmc.spec,
	1.16, 1.17
Message-ID: <20080911143616.A7BDD70131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libopensync-plugin-irmc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24127

Modified Files:
	libopensync-plugin-irmc.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.36-2
- Rebuild



Index: libopensync-plugin-irmc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-irmc/devel/libopensync-plugin-irmc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libopensync-plugin-irmc.spec	20 Jun 2008 07:27:37 -0000	1.16
+++ libopensync-plugin-irmc.spec	11 Sep 2008 14:35:46 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-irmc
 Version:        0.36
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Irmc plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/opensync-1.0/defaults/irmc-sync
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.36-2
+- Rebuild
+
 * Fri Jun 20 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 0.36-1
 - version upgrade



From spot at fedoraproject.org  Thu Sep 11 14:39:12 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 14:39:12 +0000 (UTC)
Subject: rpms/GraphicsMagick/F-9 .cvsignore, 1.4, 1.5 GraphicsMagick.spec,
	1.20, 1.21 sources, 1.4, 1.5
Message-ID: <20080911143912.AE24A70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/GraphicsMagick/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25206

Modified Files:
	.cvsignore GraphicsMagick.spec sources 
Log Message:
update to 1.1.14, fix perl issues


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jan 2008 17:21:57 -0000	1.4
+++ .cvsignore	11 Sep 2008 14:38:42 -0000	1.5
@@ -1 +1 @@
-GraphicsMagick-1.1.10.tar.bz2
+GraphicsMagick-1.1.14.tar.bz2


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-9/GraphicsMagick.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- GraphicsMagick.spec	2 Jun 2008 03:31:35 -0000	1.20
+++ GraphicsMagick.spec	11 Sep 2008 14:38:42 -0000	1.21
@@ -1,13 +1,12 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
-Version: 1.1.10
-Release: 4%{?dist}
+Version: 1.1.14
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
 Patch0: GraphicsMagick-gslib.patch
 Patch1: GraphicsMagick-perl.patch
-Patch2: GraphicsMagick-1.1.10-gcc43.patch
 Url: http://www.graphicsmagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
@@ -46,9 +45,7 @@
 Summary: GraphicsMagick perl bindings
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: perl >= 5.6.0
-%define perl_vendorarch %(perl -MConfig -le 'print $Config{installvendorarch}')
-BuildRequires: %{perl_vendorarch}
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description perl
 Perl bindings to GraphicsMagick.
@@ -91,10 +88,12 @@
 # Disabled, causing segfaults in the gslib code path
 #%patch0 -p 1 -b .gslib 
 %patch1 -p 1 -b .perl
-%patch2 -p 1 -b .gcc43
 # Regenerating configure script
 #autoconf
 
+iconv -f iso-8859-2 -t utf8 < ChangeLog > ChangeLog.utf8
+mv -f ChangeLog.utf8 ChangeLog
+
 %build
 %configure --enable-shared \
            --with-modules \
@@ -112,6 +111,9 @@
            --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
            --without-dps
 
+# Avoid bogus RPATHs on x86_64
+sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+
 make
 
 %install
@@ -231,6 +233,10 @@
 
 
 %changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.14-1
+- update to 1.1.14
+- fix perl issue (bz 454087)
+
 * Sun Jun 01 2008 Dennis Gilmore <dennis at ausil.us> - 1.1.10-4
 - sparc64 is a 64 bit arch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jan 2008 17:21:57 -0000	1.4
+++ sources	11 Sep 2008 14:38:42 -0000	1.5
@@ -1 +1 @@
-fb8a223ad7d7369970166b2266cb41e4  GraphicsMagick-1.1.10.tar.bz2
+a4085265d4493a090557534b938ce942  GraphicsMagick-1.1.14.tar.bz2



From ssp at fedoraproject.org  Thu Sep 11 14:52:05 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu, 11 Sep 2008 14:52:05 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.348,
	1.349 xserver-1.5.0-projector-fb-size.patch, 1.1, 1.2
Message-ID: <20080911145205.B76EE70131@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29424

Modified Files:
	xorg-x11-server.spec xserver-1.5.0-projector-fb-size.patch 
Log Message:
Fix up the projector patch to key off of amount of video ram


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- xorg-x11-server.spec	11 Sep 2008 13:31:53 -0000	1.348
+++ xorg-x11-server.spec	11 Sep 2008 14:51:35 -0000	1.349
@@ -500,6 +500,9 @@
 
 %changelog
 * Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 1.5.0-3
+- Change the external monitor patch to base off of amount of video ram.
+
+* Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 1.5.0-3
 - Change the default screen limits to include room for a 1280 wide
   projector.
 

xserver-1.5.0-projector-fb-size.patch:

Index: xserver-1.5.0-projector-fb-size.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.5.0-projector-fb-size.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.5.0-projector-fb-size.patch	11 Sep 2008 13:31:53 -0000	1.1
+++ xserver-1.5.0-projector-fb-size.patch	11 Sep 2008 14:51:35 -0000	1.2
@@ -1,22 +1,29 @@
-From ef49675e8d7dc829032bf6e586d55f9985d06844 Mon Sep 17 00:00:00 2001
-From: Fedora X Ninjas <x at fedoraproject.org>
-Date: Thu, 11 Sep 2008 09:25:18 -0400
-Subject: [PATCH] Make room for a 1280 wide projector in the default screen limits
+From ff21ec16fc05cc5fd0d60e466b7175fb2a33f8d2 Mon Sep 17 00:00:00 2001
+From: Soren Sandmann <sandmann at redhat.com>
+Date: Thu, 11 Sep 2008 10:47:03 -0400
+Subject: [PATCH] Make room for an external monitor if we have enough video ram
 
 ---
- hw/xfree86/modes/xf86Crtc.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ hw/xfree86/modes/xf86Crtc.c |    9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
 
 diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 4de7e05..ee7e412 100644
+index 4de7e05..afb70a7 100644
 --- a/hw/xfree86/modes/xf86Crtc.c
 +++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -987,6 +987,8 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp,
+@@ -987,6 +987,15 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp,
  	if (crtc_height > height)
  	    height = crtc_height;
      }
-+    /* Make room for a projector */
-+    width += 1280;
++
++    /* Make room for an external monitor if we have enough video ram */
++    if (scrn->VideoRam >= 65536)
++        width += 1920;
++    else if (scrn->VideoRam >= 32768)
++        width += 1280;
++    else if (scrn->VideoRam >= 16384)
++        width += 1024;
++    
      if (config->maxWidth && width > config->maxWidth) width = config->maxWidth;
      if (config->maxHeight && height > config->maxHeight) height = config->maxHeight;
      if (config->minWidth && width < config->minWidth) width = config->minWidth;



From hadess at fedoraproject.org  Thu Sep 11 15:07:21 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 15:07:21 +0000 (UTC)
Subject: rpms/pulseaudio/devel pulseaudio.spec,1.53,1.54
Message-ID: <20080911150721.7A10E70131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2194

Modified Files:
	pulseaudio.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> 0.9.12-5
- Rebuild



Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- pulseaudio.spec	9 Sep 2008 18:34:29 -0000	1.53
+++ pulseaudio.spec	11 Sep 2008 15:06:51 -0000	1.54
@@ -3,7 +3,7 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.12
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -406,6 +406,9 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> 0.9.12-5
+- Rebuild
+
 * Tue Sep 9 2008 Lennart Poettering <lpoetter at redhat.com> 0.9.12-4
 - Ship /var/lib/pulse in the RPM
 



From pertusus at fedoraproject.org  Thu Sep 11 15:07:52 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Thu, 11 Sep 2008 15:07:52 +0000 (UTC)
Subject: rpms/gdal/devel gdal.spec,1.49,1.50
Message-ID: <20080911150752.BB6C170131@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gdal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2499

Modified Files:
	gdal.spec 
Log Message:
reenable grass support


Index: gdal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdal/devel/gdal.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gdal.spec	11 Sep 2008 14:14:57 -0000	1.49
+++ gdal.spec	11 Sep 2008 15:07:22 -0000	1.50
@@ -1,6 +1,6 @@
 Name:      gdal
 Version:   1.5.2
-Release:   2%{?dist}.1
+Release:   3%{?dist}
 Summary:   GIS file format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -25,7 +25,7 @@
 %endif
 
 # enable/disable grass support, for bootstrapping
-%define grass_support 0
+%define grass_support 1
 # enable/disable refman generation
 %define build_refman  1
 
@@ -520,7 +520,7 @@
 %endif
 
 %changelog
-* Tue Sep  9 2008 Patrice Dumas <pertusus at free.fr> - 1.5.2-2.1
+* Tue Sep  9 2008 Patrice Dumas <pertusus at free.fr> - 1.5.2-3
 - patch for libdap > 0.8.0, from Rob Cermak
 
 * Thu Jun 12 2008 Balint Cristian <rezso at rdsor.ro> - 1.5.2-1



From pertusus at fedoraproject.org  Thu Sep 11 15:08:54 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Thu, 11 Sep 2008 15:08:54 +0000 (UTC)
Subject: rpms/nco/devel nco.spec,1.12,1.13
Message-ID: <20080911150854.08A8F70131@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/nco/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3036

Modified Files:
	nco.spec 
Log Message:
* Thu Sep 11 2008 - Patrice Dumas <pertusus at free.fr> - 3.9.5-2
- rebuild for newer libnc-dap



Index: nco.spec
===================================================================
RCS file: /cvs/extras/rpms/nco/devel/nco.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nco.spec	10 Jul 2008 11:47:37 -0000	1.12
+++ nco.spec	11 Sep 2008 15:08:23 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           nco
 Version:        3.9.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Suite of programs for manipulating NetCDF/HDF4 files
 Group:          Applications/Engineering
 License:        GPLv3
@@ -112,6 +112,9 @@
 %{_libdir}/libnco*.a
 
 %changelog
+* Thu Sep 11 2008 - Patrice Dumas <pertusus at free.fr> - 3.9.5-2
+- rebuild for newer libnc-dap
+
 * Thu Jul 10 2008 - Patrice Dumas <pertusus at free.fr> - 3.9.5-1
 - update to 3.9.5
 



From pertusus at fedoraproject.org  Thu Sep 11 15:09:15 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Thu, 11 Sep 2008 15:09:15 +0000 (UTC)
Subject: rpms/grads/devel grads.spec,1.23,1.24
Message-ID: <20080911150915.9DEFA70131@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3190

Modified Files:
	grads.spec 
Log Message:
* Thu Sep 11 2008 - Patrice Dumas <pertusus at free.fr> 1.9b4-24
- rebuild for new libnc-dap



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- grads.spec	19 Feb 2008 18:15:44 -0000	1.23
+++ grads.spec	11 Sep 2008 15:08:45 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        23%{?dist}
+Release:        24%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -121,6 +121,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 - Patrice Dumas <pertusus at free.fr> 1.9b4-24
+- rebuild for new libnc-dap
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.9b4-23
 - Autorebuild for GCC 4.3
 



From dhavalgiani at fedoraproject.org  Thu Sep 11 15:22:07 2008
From: dhavalgiani at fedoraproject.org (Dhaval Giani)
Date: Thu, 11 Sep 2008 15:22:07 +0000 (UTC)
Subject: rpms/libcgroup/devel fix_makefile_to_link_with_builddir.patch, NONE,
	1.1 fix_overflow.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 libcgroup.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20080911152207.B65D670131@cvs1.fedora.phx.redhat.com>

Author: dhavalgiani

Update of /cvs/pkgs/rpms/libcgroup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7714

Modified Files:
	.cvsignore libcgroup.spec sources 
Added Files:
	fix_makefile_to_link_with_builddir.patch fix_overflow.patch 
Log Message:
libcgroup v0.31: Updating to latest upstream.


fix_makefile_to_link_with_builddir.patch:

--- NEW FILE fix_makefile_to_link_with_builddir.patch ---
Index: v0.31/Makefile.in
===================================================================
--- v0.31.orig/Makefile.in	2008-09-05 19:52:44.000000000 +0530
+++ v0.31/Makefile.in	2008-09-05 20:33:01.000000000 +0530
@@ -14,7 +14,7 @@ YACC_DEBUG=-t
 DEBUG=-DDEBUG
 INC=-I.
 LIBS= -lcgroup -lpthread
-LDFLAGS=@LDFLAGS@ -L .
+LDFLAGS=@LDFLAGS@ -L . -L $(RPM_BUILD_ROOT)
 YACC=@YACC@
 LEX=@LEX@
 bindir=@bindir@
@@ -38,7 +38,7 @@ cgconfigparser: libcgroup.so config.c y.
 cgexec: libcgroup.so cgexec.c libcgroup.h
 	$(CC) $(CFLAGS) -Wall -o $@ cgexec.c $(LDFLAGS) $(LIBS)
 
-cgclassify: cgclassify.c
+cgclassify: libcgroup.so cgclassify.c
 	$(CC) $(CFLAGS) -Wall -o $@ cgclassify.c $(LDFLAGS) $(LIBS)
 
 y.tab.c: parse.y lex.yy.c
@@ -59,14 +59,14 @@ pam_cgroup.so: pam_cgroup.c
 	$(CC) $(CFLAGS) -shared -fPIC -Wall -o $@ pam_cgroup.c $(LDFLAGS) \
 	$(LIBS) -lpam
 
-install: libcgroup.so cgexec cgclassify
+install: libcgroup.so cgexec cgclassify cgconfigparser
 	$(INSTALL_DATA) -D libcgroup.h $(DESTDIR)$(includedir)/libcgroup.h
 	$(INSTALL) -D libcgroup.so $(DESTDIR)$(libdir)/libcgroup-$(PACKAGE_VERSION).so
 	ln -sf libcgroup-$(PACKAGE_VERSION).so $(DESTDIR)$(libdir)/libcgroup.so.$(VERSION)
 	ln -sf libcgroup.so.$(VERSION) $(DESTDIR)$(libdir)/libcgroup.so
-	$(INSTALL) -D cgconfigparser $(DESTDIR)$(sbindir)
-	$(INSTALL) cgexec $(DESTDIR)$(bindir)/cgexec
-	$(INSTALL) cgclassify $(DESTDIR)$(bindir)/cgclassify
+	$(INSTALL) -D cgconfigparser $(DESTDIR)$(sbindir)/cgconfigparser
+	$(INSTALL) -D cgexec $(DESTDIR)$(bindir)/cgexec
+	$(INSTALL) -D cgclassify $(DESTDIR)$(bindir)/cgclassify
 
 uninstall: libcgroup.so
 	rm -f $(DESTDIR)$(includedir)/libcgroup.h

fix_overflow.patch:

--- NEW FILE fix_overflow.patch ---
Index: v0.31/api.c
===================================================================
--- v0.31.orig/api.c	2008-09-05 19:52:44.000000000 +0530
+++ v0.31/api.c	2008-09-05 20:06:53.000000000 +0530
@@ -1041,7 +1041,7 @@ struct cgroup *cgroup_get_cgroup(struct 
 					cg_mount_table[i].name))
 			continue;
 
-		strncat(path, cgroup->name, sizeof(path));
+		strncat(path, cgroup->name, sizeof(path) - strlen(path));
 
 		if (access(path, F_OK))
 			continue;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libcgroup/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Jun 2008 09:22:00 -0000	1.3
+++ .cvsignore	11 Sep 2008 15:21:37 -0000	1.4
@@ -1 +1 @@
-libcgroup-0.1c.tar.bz2
+libcgroup-0.31.tar.bz2


Index: libcgroup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcgroup/devel/libcgroup.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libcgroup.spec	2 Aug 2008 08:18:16 -0000	1.3
+++ libcgroup.spec	11 Sep 2008 15:21:37 -0000	1.4
@@ -1,11 +1,13 @@
 Name: libcgroup
 Summary: Tools and libraries to control and monitor control groups
 Group: Development/Libraries
-Version: 0.1c
-Release:        3%{?dist}
+Version: 0.31
+Release:        1%{?dist}
 License: LGPLv2+
 URL: http://libcg.sourceforge.net/
 Source0: http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2
+patch0: http://downloads.sourceforge.net/libcg/fix_overflow.patch
+patch1: http://downloads.sourceforge.net/libcg/fix_makefile_to_link_with_builddir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: byacc
 BuildRequires: flex
@@ -27,6 +29,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -48,6 +52,9 @@
 %defattr(-,root,root,-)
 %{_libdir}/libcgroup-%{version}.so
 %{_libdir}/libcgroup.so.*
+%{_bindir}/cgexec
+%{_bindir}/cgclassify
+%{_sbindir}/cgconfigparser
 %doc COPYING INSTALL
 
 %files devel
@@ -58,6 +65,8 @@
 
 
 %changelog
+* Thu Sep 11 2008 Dhaval Giani <dhaval at linux-vnet.ibm.com> 0.31-1
+- Update to latest upstream
 * Sat Aug 2 2008 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.1c-3
 - Change release to fix broken upgrade path
 * Wed Jun 11 2008 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.1c-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libcgroup/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Jun 2008 09:22:00 -0000	1.3
+++ sources	11 Sep 2008 15:21:37 -0000	1.4
@@ -1 +1 @@
-6c9fd0525e1b7e05911588b1eceb7246  libcgroup-0.1c.tar.bz2
+494cb429edd57b5233840cbe3fdcf6a7  libcgroup-0.31.tar.bz2



From jkeating at fedoraproject.org  Thu Sep 11 15:34:52 2008
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Thu, 11 Sep 2008 15:34:52 +0000 (UTC)
Subject: rpms/evolution-brutus/devel evolution-brutus.spec,1.14,1.15
Message-ID: <20080911153452.A5DDD70131@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/evolution-brutus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12512

Modified Files:
	evolution-brutus.spec 
Log Message:
* Thu Sep 11 2008 Jesse Keating <jkeating at redhat.com> - 1.2.17-2
- Rebuild for broken deps.



Index: evolution-brutus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-brutus/devel/evolution-brutus.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- evolution-brutus.spec	11 Jun 2008 01:57:54 -0000	1.14
+++ evolution-brutus.spec	11 Sep 2008 15:34:22 -0000	1.15
@@ -5,7 +5,7 @@
 
 Name:		evolution-brutus
 Version:	1.2.17
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Brutus based Exchange connector for Novell Evolution 2.4 and later
 
 License:	GPLv2+
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Jesse Keating <jkeating at redhat.com> - 1.2.17-2
+- Rebuild for broken deps.
+
 * Tue Jun 10 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.17-1
 - Update to 1.2.17 which works against evolution-data-server 2.24
 - Fix FTBFS (#449548)



From spot at fedoraproject.org  Thu Sep 11 15:46:57 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 15:46:57 +0000 (UTC)
Subject: rpms/GraphicsMagick/devel GraphicsMagick-1.1.10-gcc43.patch, 1.1,
	1.2 GraphicsMagick-perl.patch, 1.2, 1.3 GraphicsMagick.spec,
	1.20, 1.21 sources, 1.5, 1.6
Message-ID: <20080911154657.0E9A770131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/GraphicsMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16785/devel

Modified Files:
	GraphicsMagick-1.1.10-gcc43.patch GraphicsMagick-perl.patch 
	GraphicsMagick.spec sources 
Log Message:
revert devel to 1.1.14, apply gcc43 patch

GraphicsMagick-1.1.10-gcc43.patch:

Index: GraphicsMagick-1.1.10-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/GraphicsMagick-1.1.10-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GraphicsMagick-1.1.10-gcc43.patch	11 Feb 2008 12:53:00 -0000	1.1
+++ GraphicsMagick-1.1.10-gcc43.patch	11 Sep 2008 15:46:56 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up GraphicsMagick-1.1.10/Magick++/lib/Geometry.cpp.orig GraphicsMagick-1.1.10/Magick++/lib/Geometry.cpp
---- GraphicsMagick-1.1.10/Magick++/lib/Geometry.cpp.orig	2008-02-11 13:26:47.000000000 +0100
-+++ GraphicsMagick-1.1.10/Magick++/lib/Geometry.cpp	2008-02-11 13:29:08.000000000 +0100
+diff -up GraphicsMagick-1.1.14/Magick++/lib/Geometry.cpp.BAD GraphicsMagick-1.1.14/Magick++/lib/Geometry.cpp
+--- GraphicsMagick-1.1.14/Magick++/lib/Geometry.cpp.BAD	2008-09-11 11:43:45.000000000 -0400
++++ GraphicsMagick-1.1.14/Magick++/lib/Geometry.cpp	2008-09-11 11:43:52.000000000 -0400
 @@ -8,7 +8,7 @@
  #define MAGICK_IMPLEMENTATION
  
@@ -8,5 +8,5 @@
 -#include <string>
 +#include <cstring>
  #include <ctype.h> // for isdigit
+ #include <strings.h> // for strcpy
  
- using namespace std;

GraphicsMagick-perl.patch:

Index: GraphicsMagick-perl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/GraphicsMagick-perl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphicsMagick-perl.patch	11 Sep 2008 14:07:27 -0000	1.2
+++ GraphicsMagick-perl.patch	11 Sep 2008 15:46:56 -0000	1.3
@@ -1,24 +1,24 @@
-diff -up GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.in.perl GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.in
---- GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.in.perl	2008-05-18 17:21:59.000000000 -0400
-+++ GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.in	2008-09-11 08:54:06.000000000 -0400
-@@ -61,7 +61,7 @@ WriteMakefile
-    'INSTALLBIN'	=> '@BIN_DIR@',
+diff -up GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.orig GraphicsMagick-1.1.10/PerlMagick/Makefile.PL
+--- GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.orig	2008-01-28 17:48:28.000000000 +0100
++++ GraphicsMagick-1.1.10/PerlMagick/Makefile.PL	2008-01-28 17:48:58.000000000 +0100
+@@ -62,7 +62,7 @@ WriteMakefile
+    'INSTALLBIN'	=> '/usr/local/bin',
  
     # Library specification
--   'LIBS'	=> ['-L at MAGICKLIBDIR@ -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
-+   'LIBS'	=> ['-L at MAGICKLIBDIR@ -L../magick/.libs -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
+-   'LIBS'	=> ['-L/usr/local/lib -R/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/home/glennrp/CVS/ImageMagick/magick -lGraphicsMagick -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lgs -lpng -lfpx -lwmflite -lXext -lSM -lICE -lX11 -lsocket -lnsl -lbz2 -lxml2 -lz -lpthread -lm'],
++   'LIBS'	=> ['-L/usr/local/lib -R/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/home/glennrp/CVS/ImageMagick/magick -L../magick/.libs -lGraphicsMagick -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lgs -lpng -lfpx -lwmflite -lXext -lSM -lICE -lX11 -lsocket -lnsl -lbz2 -lxml2 -lz -lpthread -lm'],
  
     # Perl binary name (if a Perl binary is built)
     'MAP_TARGET'	=> 'PerlMagick',
-diff -up GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.perl GraphicsMagick-1.2.5/PerlMagick/Makefile.PL
---- GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.perl	2004-04-18 18:20:51.000000000 -0400
-+++ GraphicsMagick-1.2.5/PerlMagick/Makefile.PL	2008-09-11 08:57:44.000000000 -0400
+diff -up GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in.orig GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in
+--- GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in.orig	2008-01-28 17:48:34.000000000 +0100
++++ GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in	2008-01-28 17:48:58.000000000 +0100
 @@ -57,7 +57,7 @@ WriteMakefile
-    'INSTALLBIN'	=> '/usr/local/bin',
+    'INSTALLBIN'	=> '@BIN_DIR@',
  
     # Library specification
--   'LIBS'	=> ['-L/home/bfriesen/src/graphics/GraphicsMagick-Web/magick/.libs -lGraphicsMagick -L/usr/local/lib -R/usr/local/lib -R/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib -L/usr/local/lib -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lwmflite -ldpstk -ldps -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lc_r'],
-+   'LIBS'	=> ['-L/home/bfriesen/src/graphics/GraphicsMagick-Web/magick/.libs -L../magick/.libs -lGraphicsMagick -L/usr/local/lib -R/usr/local/lib -R/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib -L/usr/local/lib -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lwmflite -ldpstk -ldps -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lc_r'],
+-   'LIBS'	=> ['-L at MAGICKLIBDIR@ -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
++   'LIBS'	=> ['-L at MAGICKLIBDIR@ -L../magick/.libs -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
  
     # Perl binary name (if a Perl binary is built)
     'MAP_TARGET'	=> 'PerlMagick',


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/GraphicsMagick.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- GraphicsMagick.spec	11 Sep 2008 14:07:27 -0000	1.20
+++ GraphicsMagick.spec	11 Sep 2008 15:46:56 -0000	1.21
@@ -1,12 +1,13 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
-Version: 1.2.5
-Release: 1%{?dist}
+Version: 1.1.14
+Release: 2%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
 Patch0: GraphicsMagick-gslib.patch
 Patch1: GraphicsMagick-perl.patch
+Patch2: GraphicsMagick-1.1.10-gcc43.patch
 Url: http://www.graphicsmagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
@@ -88,6 +89,7 @@
 # Disabled, causing segfaults in the gslib code path
 #%patch0 -p 1 -b .gslib 
 %patch1 -p 1 -b .perl
+%patch2 -p1 -b .gcc43
 # Regenerating configure script
 #autoconf
 
@@ -190,9 +192,10 @@
 %postun c++ -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
-%doc README.txt AUTHORS.txt 
-%doc %{_datadir}/doc/%{name}/
+%defattr(-,root,root)
+%doc ChangeLog Copyright.txt
+%doc index.html www/ images/
+%doc README.txt AUTHORS NEWS 
 %attr(755,root,root) %{_libdir}/libGraphicsMagick.so.*
 %attr(755,root,root) %{_libdir}/libGraphicsMagickWand.so.*
 %{_bindir}/[a-z]*
@@ -232,9 +235,12 @@
 
 
 %changelog
-* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.5-1
-- update to 1.2.5
-- fix perl issues
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.14-2
+- turns out we do need gcc43 patch
+
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.14-1
+- update to 1.1.14
+- fix perl issue (bz 454087)
 
 * Sun Jun 01 2008 Dennis Gilmore <dennis at ausil.us> - 1.1.10-4
 - sparc64 is a 64 bit arch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Sep 2008 14:07:27 -0000	1.5
+++ sources	11 Sep 2008 15:46:56 -0000	1.6
@@ -1 +1 @@
-a023a1561ec0780f25f5a4f0cf208053  GraphicsMagick-1.2.5.tar.bz2
+a4085265d4493a090557534b938ce942  GraphicsMagick-1.1.14.tar.bz2



From spot at fedoraproject.org  Thu Sep 11 15:47:26 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 15:47:26 +0000 (UTC)
Subject: rpms/GraphicsMagick/F-9 GraphicsMagick-1.1.10-gcc43.patch, 1.1,
	1.2 GraphicsMagick.spec, 1.21, 1.22
Message-ID: <20080911154726.89DE070131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/GraphicsMagick/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16785/F-9

Modified Files:
	GraphicsMagick-1.1.10-gcc43.patch GraphicsMagick.spec 
Log Message:
revert devel to 1.1.14, apply gcc43 patch

GraphicsMagick-1.1.10-gcc43.patch:

Index: GraphicsMagick-1.1.10-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-9/GraphicsMagick-1.1.10-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GraphicsMagick-1.1.10-gcc43.patch	11 Feb 2008 12:53:00 -0000	1.1
+++ GraphicsMagick-1.1.10-gcc43.patch	11 Sep 2008 15:46:56 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up GraphicsMagick-1.1.10/Magick++/lib/Geometry.cpp.orig GraphicsMagick-1.1.10/Magick++/lib/Geometry.cpp
---- GraphicsMagick-1.1.10/Magick++/lib/Geometry.cpp.orig	2008-02-11 13:26:47.000000000 +0100
-+++ GraphicsMagick-1.1.10/Magick++/lib/Geometry.cpp	2008-02-11 13:29:08.000000000 +0100
+diff -up GraphicsMagick-1.1.14/Magick++/lib/Geometry.cpp.BAD GraphicsMagick-1.1.14/Magick++/lib/Geometry.cpp
+--- GraphicsMagick-1.1.14/Magick++/lib/Geometry.cpp.BAD	2008-09-11 11:43:45.000000000 -0400
++++ GraphicsMagick-1.1.14/Magick++/lib/Geometry.cpp	2008-09-11 11:43:52.000000000 -0400
 @@ -8,7 +8,7 @@
  #define MAGICK_IMPLEMENTATION
  
@@ -8,5 +8,5 @@
 -#include <string>
 +#include <cstring>
  #include <ctype.h> // for isdigit
+ #include <strings.h> // for strcpy
  
- using namespace std;


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-9/GraphicsMagick.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- GraphicsMagick.spec	11 Sep 2008 14:38:42 -0000	1.21
+++ GraphicsMagick.spec	11 Sep 2008 15:46:56 -0000	1.22
@@ -1,12 +1,13 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.1.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
 Patch0: GraphicsMagick-gslib.patch
 Patch1: GraphicsMagick-perl.patch
+Patch2: GraphicsMagick-1.1.10-gcc43.patch
 Url: http://www.graphicsmagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
@@ -88,6 +89,7 @@
 # Disabled, causing segfaults in the gslib code path
 #%patch0 -p 1 -b .gslib 
 %patch1 -p 1 -b .perl
+%patch2 -p1 -b .gcc43
 # Regenerating configure script
 #autoconf
 
@@ -233,6 +235,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.14-2
+- turns out we do need gcc43 patch
+
 * Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.14-1
 - update to 1.1.14
 - fix perl issue (bz 454087)



From orion at fedoraproject.org  Thu Sep 11 15:48:08 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 11 Sep 2008 15:48:08 +0000 (UTC)
Subject: rpms/ncl/devel Site.local.ncl,1.1,1.2
Message-ID: <20080911154808.CE13C70131@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/ncl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17047

Modified Files:
	Site.local.ncl 
Log Message:
New netcdf location



Index: Site.local.ncl
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/devel/Site.local.ncl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Site.local.ncl	28 Feb 2008 22:11:41 -0000	1.1
+++ Site.local.ncl	11 Sep 2008 15:47:38 -0000	1.2
@@ -4,7 +4,7 @@
 #define SharePath $(DESTDIR)@datadir@
 
 #define BuildWithF90 TRUE
-#define IncSearch -I/usr/include/netcdf-3
+#define IncSearch -I/usr/include/netcdf
 #define LibSearch -L at libdir@/hdf
 
 #define BuildUdunits TRUE



From pkgdb at fedoraproject.org  Thu Sep 11 15:49:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 15:49:39 +0000
Subject: [pkgdb] libgcrypt: tmraz has requested watchbugzilla
Message-ID: <20080911154939.D59BA2D0024@bastion.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on libgcrypt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 11 15:49:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 15:49:41 +0000
Subject: [pkgdb] libgcrypt: tmraz has requested watchcommits
Message-ID: <20080911154942.13B5B2D0029@bastion.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on libgcrypt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 11 15:49:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 15:49:43 +0000
Subject: [pkgdb] libgcrypt: tmraz has requested commit
Message-ID: <20080911154943.592622D002E@bastion.fedora.phx.redhat.com>

tmraz has requested the commit acl on libgcrypt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 11 15:49:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 15:49:52 +0000
Subject: [pkgdb] libgcrypt: tmraz has requested watchbugzilla
Message-ID: <20080911154953.02BE8208D9A@bastion.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on libgcrypt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 11 15:49:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 15:49:53 +0000
Subject: [pkgdb] libgcrypt: tmraz has requested watchcommits
Message-ID: <20080911154953.B5A3F208DA0@bastion.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on libgcrypt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 11 15:49:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 15:49:55 +0000
Subject: [pkgdb] libgcrypt: tmraz has requested commit
Message-ID: <20080911154955.93E13208DA5@bastion.fedora.phx.redhat.com>

tmraz has requested the commit acl on libgcrypt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 11 15:55:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 15:55:33 +0000
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <20080911155533.4B149208D9B@bastion.fedora.phx.redhat.com>

jorton has set the watchbugzilla acl on libgcrypt (Fedora devel) to Approved for tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 11 15:55:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 15:55:34 +0000
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <20080911155535.043052D0025@bastion.fedora.phx.redhat.com>

jorton has set the watchcommits acl on libgcrypt (Fedora devel) to Approved for tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 11 15:55:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 15:55:35 +0000
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <20080911155535.8EEC12D002A@bastion.fedora.phx.redhat.com>

jorton has set the commit acl on libgcrypt (Fedora devel) to Approved for tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 11 15:55:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 15:55:42 +0000
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <20080911155542.14C4F208DA0@bastion.fedora.phx.redhat.com>

jorton has set the watchbugzilla acl on libgcrypt (Fedora 9) to Approved for tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 11 15:55:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 15:55:43 +0000
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <20080911155543.416A72D002F@bastion.fedora.phx.redhat.com>

jorton has set the watchcommits acl on libgcrypt (Fedora 9) to Approved for tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 11 15:55:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 15:55:44 +0000
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <20080911155544.5565F2D0034@bastion.fedora.phx.redhat.com>

jorton has set the commit acl on libgcrypt (Fedora 9) to Approved for tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 11 15:55:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 15:55:48 +0000
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <20080911155548.DC0B3208DA5@bastion.fedora.phx.redhat.com>

jorton has set the approveacls acl on libgcrypt (Fedora 9) to Approved for tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 11 15:55:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 15:55:54 +0000
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <20080911155554.47A7F208DA7@bastion.fedora.phx.redhat.com>

jorton has set the approveacls acl on libgcrypt (Fedora devel) to Approved for tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 11 15:56:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 15:56:54 +0000
Subject: [pkgdb] cryptsetup-luks had acl change status
Message-ID: <20080911155654.7C6E12D0025@bastion.fedora.phx.redhat.com>

till has set the commit acl on cryptsetup-luks (Fedora 8) to Approved for till

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks



From pkgdb at fedoraproject.org  Thu Sep 11 15:57:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 15:57:05 +0000
Subject: [pkgdb] cryptsetup-luks: till has given up commit
Message-ID: <20080911155705.986642D002A@bastion.fedora.phx.redhat.com>

till has given up the commit acl on cryptsetup-luks (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks



From laxathom at fedoraproject.org  Thu Sep 11 15:57:37 2008
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Thu, 11 Sep 2008 15:57:37 +0000 (UTC)
Subject: rpms/gammu/devel gammu.spec,1.14,1.15
Message-ID: <20080911155737.E7C6670131@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gammu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20346

Modified Files:
	gammu.spec 
Log Message:
rebuild against new libbluetooth


Index: gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/gammu.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gammu.spec	25 Aug 2008 09:35:59 -0000	1.14
+++ gammu.spec	11 Sep 2008 15:57:07 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		gammu
 Version:        1.20.90
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Command Line utility to work with mobile phones
 
 Group:          Applications/System
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Xavier Lamien <lxtnow[at]gmail.com> - 1.20.90-2
+- Rebuild against new libbluetooth.
+
 * Mon Aug 25 2008 Xavier Lamien <lxtnow[at]gmail.com> - 1.20.90-1
 - Update release.
 



From pkgdb at fedoraproject.org  Thu Sep 11 16:07:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 16:07:28 +0000
Subject: [pkgdb] cryptsetup-luks had acl change status
Message-ID: <20080911160728.D2F99208D9B@bastion.fedora.phx.redhat.com>

till has set the commit acl on cryptsetup-luks (Fedora 8) to Approved for till

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks



From pkgdb at fedoraproject.org  Thu Sep 11 16:07:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 16:07:32 +0000
Subject: [pkgdb] cryptsetup-luks: till has given up commit
Message-ID: <20080911160732.548CF208DA0@bastion.fedora.phx.redhat.com>

till has given up the commit acl on cryptsetup-luks (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks



From pkgdb at fedoraproject.org  Thu Sep 11 16:08:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 16:08:29 +0000
Subject: [pkgdb] cryptsetup-luks had acl change status
Message-ID: <20080911160829.8D141208D9A@bastion.fedora.phx.redhat.com>

till has set the commit acl on cryptsetup-luks (Fedora 8) to Approved for till

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks



From notting at fedoraproject.org  Thu Sep 11 16:13:11 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu, 11 Sep 2008 16:13:11 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.100,1.101
Message-ID: <20080911161311.8CB9C70131@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25570

Modified Files:
	comps-f10.xml.in 
Log Message:
Clean up Haskell name/description


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- comps-f10.xml.in	11 Sep 2008 14:21:34 -0000	1.100
+++ comps-f10.xml.in	11 Sep 2008 16:12:41 -0000	1.101
@@ -2268,8 +2268,8 @@
   </group>
   <group>
     <id>haskell</id>
-    <_name>Haskell</_name>
-    <_description/>
+    <_name>Haskell Development</_name>
+    <_description>Support for developing programs in the Haskell programming language.</_description>
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>



From pertusus at fedoraproject.org  Thu Sep 11 16:16:50 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Thu, 11 Sep 2008 16:16:50 +0000 (UTC)
Subject: rpms/grads/devel grads-build_system.patch, 1.1,
	1.2 grads-dap_build_fixes.patch, 1.1, 1.2 grads.spec, 1.24, 1.25
Message-ID: <20080911161650.AE78F70131@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26674

Modified Files:
	grads-build_system.patch grads-dap_build_fixes.patch 
	grads.spec 
Log Message:
* Thu Sep 11 2008 - Patrice Dumas <pertusus at free.fr> 1.9b4-25
- rebuild for new libnc-dap
- rediff patches
- use new netcdf devel file locations


grads-build_system.patch:

Index: grads-build_system.patch
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads-build_system.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grads-build_system.patch	22 Aug 2007 10:48:32 -0000	1.1
+++ grads-build_system.patch	11 Sep 2008 16:16:20 -0000	1.2
@@ -1,181 +1,6 @@
-diff -up grads-1.9b4/src/config.h.in.build_system grads-1.9b4/src/config.h.in
---- grads-1.9b4/src/config.h.in.build_system	2004-12-15 22:00:03.000000000 +0100
-+++ grads-1.9b4/src/config.h.in	2007-08-22 10:36:54.000000000 +0200
-@@ -61,6 +61,9 @@
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
- 
-+/* prepend sd_ to netcdf symbols */
-+#undef HDF_SD_NETCDF
-+
- /* Enhanced readline with history */
- #undef MM_READLINE
- 
-@@ -88,6 +91,9 @@
- /* Define to 1 if you have the ANSI C header files. */
- #undef STDC_HEADERS
- 
-+/* Use GetFile from freq */
-+#undef USEFREQ
-+
- /* Enable GUI widgets */
- #undef USEGUI
- 
-@@ -116,5 +122,11 @@
- /* Define to empty if `const' does not conform to ANSI C. */
- #undef const
- 
--/* Define to `long' if <sys/types.h> does not define. */
-+/* Define to `long int' if <sys/types.h> does not define. */
- #undef off_t
-+
-+
-+#ifdef HDF_SD_NETCDF
-+#include "gawrapsd.h"
-+#endif
-+
-diff -up grads-1.9b4/src/Makefile.am.build_system grads-1.9b4/src/Makefile.am
---- grads-1.9b4/src/Makefile.am.build_system	2004-12-15 22:00:03.000000000 +0100
-+++ grads-1.9b4/src/Makefile.am	2007-08-22 10:36:43.000000000 +0200
-@@ -63,7 +63,7 @@ hdr_png             = gd13gif.h mtables.
- hdr_lats            = lats.h latsint.h latsparm.h latstime.h \
-                       fgrib.h fgrib_init.h 
- noinst_HEADERS	    = $(hdr_core) $(hdr_x11) $(hdr_sdf) $(hdr_png) $(hdr_gui) \
--                      $(hdr_lats) $(hdr_img) $(hdr_pc) $(hdr_bufr)
-+                      $(hdr_pc) $(hdr_bufr)
- 
- # Get rid of buildinfo.h on "make distclean"
- DISTCLEANFILES	       = buildinfo.h
-@@ -198,10 +198,13 @@ EXTRA_gradsnc_SOURCES    = galats.c lats
- 
- # Object files that should not be reused by the other GrADS binaries,
- # plus libraries needed by this GrADS binary
--gradsnc_LDADD	       = latsnc-nc.o gaddes-nc.o gacfg-nc.o gaio-nc.o \
-+gradsnc_LDADD	       = gaddes-nc.o gacfg-nc.o gaio-nc.o \
- 			gauser-nc.o gasdf-nc.o \
- 			$(common_ldadd) \
- 			$(nc_libs)
-+if USELATS
-+gradsnc_LDADD        += latsnc-nc.o
-+endif
- 
- # Custom compilation for object files specific to this GrADS binary
- COMPILE_NC 		= $(COMPILE) -I$(supp_include_dir)/nc \
-@@ -296,11 +299,14 @@ gradsdods_LINK         = $(CXX) $(AM_CFL
- 
- # Object files that should not be reused by the other GrADS binaries,
- # plus libraries needed by this GrADS binary
--gradsdods_LDADD	       = latsnc-nc.o gaddes-dods.o gacfg-dods.o gaio-dods.o \
-+gradsdods_LDADD	       = gaddes-dods.o gacfg-dods.o gaio-dods.o \
- 			gauser-dods.o gasdf-dods.o \
- 			$(common_ldadd) \
- 			$(dods_libs) \
- 			$(dods_darwin_libs)
-+if USELATS
-+gradsdods_LDADD        += latsnc-nc.o
-+endif
- 
- # Custom compilation for object files specific to this GrADS binary
- COMPILE_DODS 		= $(COMPILE) -I$(supp_include_dir)/dods \
-diff -up grads-1.9b4/configure.in.build_system grads-1.9b4/configure.in
---- grads-1.9b4/configure.in.build_system	2005-05-23 17:04:40.000000000 +0200
-+++ grads-1.9b4/configure.in	2007-08-22 10:36:43.000000000 +0200
-@@ -274,14 +274,24 @@ echo
- 
- 
- use_gui=no
-+use_new_gui=no
- if test "$with_gui" != "no" ; then
-    echo "Check GrADS GUI support..."
-    GA_CHECK_GUI([use_gui=yes])
-+   if test $use_gui = no; then
-+      GA_CHECK_NEW_GUI([use_new_gui=yes; use_gui=yes])
-+   fi
- fi
- if test $use_gui = "yes" ; then
-   AC_DEFINE(USEGUI, 1, [Enable GUI widgets]) 
-   echo "+ GUI enabled"
--  GA_SET_LIB_VAR(gui_libs, [sx freq])
-+  if test $use_new_gui = no; then
-+    GA_SET_LIB_VAR(gui_libs, [sx freq])
-+    AC_DEFINE(USEFREQ, 1, [Use GetFile from freq])
-+  else
-+    GA_SET_LIB_VAR([gui_libs], [sx])
-+    AC_DEFINE(USEFREQ, 0, [Use GetFile from freq])
-+  fi
-   gui_libs="$gui_libs -lXaw -lXmu -lXt $guilibadd"
-   AC_SUBST(gui_libs)
- else
-@@ -366,6 +376,11 @@ else
- fi
- echo
- 
-+AH_BOTTOM([
-+#ifdef HDF_SD_NETCDF
-+#include "gawrapsd.h"
-+#endif
-+])
- 
- use_hdf=no
- if test "$with_hdf" != "no" ; then
-@@ -373,6 +388,13 @@ if test "$with_hdf" != "no" ; then
- fi
- if test $use_hdf = "yes" ; then
-     GA_SET_LIB_VAR(hdf_libs, [mfhdf df jpeg udunits z])
-+    if test "${ga_dyn_supplibs}" = "yes"; then
-+      ac_save_LIBS="$LIBS"
-+      LIBS="$LIBS $hdf_libs"
-+      AC_CHECK_FUNC([sd_ncopen],
-+        [AC_DEFINE([HDF_SD_NETCDF],[],[prepend sd_ to netcdf symbols])])
-+      LIBS="$ac_save_LIBS"
-+    fi
-     AC_SUBST(hdf_libs)
-     extra_bins="$extra_bins gradshdf"
-     echo "+ gradshdf (HDF-SDS/netCDF) build enabled"
-@@ -383,15 +405,25 @@ echo
- 
- 
- use_dods=no
-+dods_ncdap=no
- if test "$with_dods" != "no" ; then
-   GA_CHECK_DODS([use_dods=yes])
-+  if test "z$use_dods" = "zno" -a "${ga_dyn_supplibs}" = "yes" ; then
-+  AC_CHECK_HEADER([udunits.h],
-+  [ AC_CHECK_HEADER([netcdf.h],
-+    [ GA_CHECK_LIB([udunits], [utInit],
-+       [AC_CHECK_NC_DODS([dods_ncdap=yes; use_dods=yes])])
-+    ])
-+  ])
-+  fi
- fi
- 
- if test $use_dods = "yes" ; then
- 
-     extra_bins="$extra_bins gradsdods"
--    GA_SET_LIB_VAR(dods_libs, [udunits www rx z])
--
-+    if test "z$dods_ncdap" = "zno" ; then
-+       GA_SET_LIB_VAR(dods_libs, [udunits www rx z])
-+    fi
- 
-     GA_CHECK_LIB(gadods, main, [use_gadods=yes], [use_gadods=no])
-     if test $use_gadods = "yes" ; then	
-@@ -404,7 +436,11 @@ if test $use_dods = "yes" ; then
-        echo "+ gradsdods (OPeNDAP/netCDF) build enabled - gridded interface only"
-     fi
- 
--    dods_libs="$dods_rep_libs $dods_rep_libs $dods_libs"
-+    if test "z$dods_ncdap" = "zyes" ; then
-+       dods_libs="$NC_DAP_LIBS -ludunits"
-+    else
-+       dods_libs="$dods_rep_libs $dods_rep_libs $dods_libs"
-+    fi
-     AC_SUBST(dods_libs)
-     AC_SUBST(gadods_def)
- else
 diff -up grads-1.9b4/acinclude.m4.build_system grads-1.9b4/acinclude.m4
 --- grads-1.9b4/acinclude.m4.build_system	2003-10-02 16:01:15.000000000 +0200
-+++ grads-1.9b4/acinclude.m4	2007-08-22 10:41:24.000000000 +0200
++++ grads-1.9b4/acinclude.m4	2008-09-11 18:03:44.000000000 +0200
 @@ -12,7 +12,7 @@ dnl GA_SET_FLAGS : Adds supplibs to the 
  dnl 		   compiler or linker flags given, and saves original settings
  dnl 		   for restoration by GA_UNSET_FLAGS
@@ -356,3 +181,178 @@
  
    ga_check_dods="no"
    AC_CHECK_HEADER(udunits.h,
+diff -up grads-1.9b4/configure.in.build_system grads-1.9b4/configure.in
+--- grads-1.9b4/configure.in.build_system	2005-05-23 17:04:40.000000000 +0200
++++ grads-1.9b4/configure.in	2008-09-11 18:03:44.000000000 +0200
+@@ -274,14 +274,24 @@ echo
+ 
+ 
+ use_gui=no
++use_new_gui=no
+ if test "$with_gui" != "no" ; then
+    echo "Check GrADS GUI support..."
+    GA_CHECK_GUI([use_gui=yes])
++   if test $use_gui = no; then
++      GA_CHECK_NEW_GUI([use_new_gui=yes; use_gui=yes])
++   fi
+ fi
+ if test $use_gui = "yes" ; then
+   AC_DEFINE(USEGUI, 1, [Enable GUI widgets]) 
+   echo "+ GUI enabled"
+-  GA_SET_LIB_VAR(gui_libs, [sx freq])
++  if test $use_new_gui = no; then
++    GA_SET_LIB_VAR(gui_libs, [sx freq])
++    AC_DEFINE(USEFREQ, 1, [Use GetFile from freq])
++  else
++    GA_SET_LIB_VAR([gui_libs], [sx])
++    AC_DEFINE(USEFREQ, 0, [Use GetFile from freq])
++  fi
+   gui_libs="$gui_libs -lXaw -lXmu -lXt $guilibadd"
+   AC_SUBST(gui_libs)
+ else
+@@ -366,6 +376,11 @@ else
+ fi
+ echo
+ 
++AH_BOTTOM([
++#ifdef HDF_SD_NETCDF
++#include "gawrapsd.h"
++#endif
++])
+ 
+ use_hdf=no
+ if test "$with_hdf" != "no" ; then
+@@ -373,6 +388,13 @@ if test "$with_hdf" != "no" ; then
+ fi
+ if test $use_hdf = "yes" ; then
+     GA_SET_LIB_VAR(hdf_libs, [mfhdf df jpeg udunits z])
++    if test "${ga_dyn_supplibs}" = "yes"; then
++      ac_save_LIBS="$LIBS"
++      LIBS="$LIBS $hdf_libs"
++      AC_CHECK_FUNC([sd_ncopen],
++        [AC_DEFINE([HDF_SD_NETCDF],[],[prepend sd_ to netcdf symbols])])
++      LIBS="$ac_save_LIBS"
++    fi
+     AC_SUBST(hdf_libs)
+     extra_bins="$extra_bins gradshdf"
+     echo "+ gradshdf (HDF-SDS/netCDF) build enabled"
+@@ -383,15 +405,25 @@ echo
+ 
+ 
+ use_dods=no
++dods_ncdap=no
+ if test "$with_dods" != "no" ; then
+   GA_CHECK_DODS([use_dods=yes])
++  if test "z$use_dods" = "zno" -a "${ga_dyn_supplibs}" = "yes" ; then
++  AC_CHECK_HEADER([udunits.h],
++  [ AC_CHECK_HEADER([netcdf.h],
++    [ GA_CHECK_LIB([udunits], [utInit],
++       [AC_CHECK_NC_DODS([dods_ncdap=yes; use_dods=yes])])
++    ])
++  ])
++  fi
+ fi
+ 
+ if test $use_dods = "yes" ; then
+ 
+     extra_bins="$extra_bins gradsdods"
+-    GA_SET_LIB_VAR(dods_libs, [udunits www rx z])
+-
++    if test "z$dods_ncdap" = "zno" ; then
++       GA_SET_LIB_VAR(dods_libs, [udunits www rx z])
++    fi
+ 
+     GA_CHECK_LIB(gadods, main, [use_gadods=yes], [use_gadods=no])
+     if test $use_gadods = "yes" ; then	
+@@ -404,7 +436,11 @@ if test $use_dods = "yes" ; then
+        echo "+ gradsdods (OPeNDAP/netCDF) build enabled - gridded interface only"
+     fi
+ 
+-    dods_libs="$dods_rep_libs $dods_rep_libs $dods_libs"
++    if test "z$dods_ncdap" = "zyes" ; then
++       dods_libs="$NC_DAP_LIBS -ludunits"
++    else
++       dods_libs="$dods_rep_libs $dods_rep_libs $dods_libs"
++    fi
+     AC_SUBST(dods_libs)
+     AC_SUBST(gadods_def)
+ else
+diff -up grads-1.9b4/src/config.h.in.build_system grads-1.9b4/src/config.h.in
+--- grads-1.9b4/src/config.h.in.build_system	2004-12-15 22:00:03.000000000 +0100
++++ grads-1.9b4/src/config.h.in	2008-09-11 18:03:44.000000000 +0200
+@@ -61,6 +61,9 @@
+ /* Define to 1 if you have the <unistd.h> header file. */
+ #undef HAVE_UNISTD_H
+ 
++/* prepend sd_ to netcdf symbols */
++#undef HDF_SD_NETCDF
++
+ /* Enhanced readline with history */
+ #undef MM_READLINE
+ 
+@@ -88,6 +91,9 @@
+ /* Define to 1 if you have the ANSI C header files. */
+ #undef STDC_HEADERS
+ 
++/* Use GetFile from freq */
++#undef USEFREQ
++
+ /* Enable GUI widgets */
+ #undef USEGUI
+ 
+@@ -116,5 +122,11 @@
+ /* Define to empty if `const' does not conform to ANSI C. */
+ #undef const
+ 
+-/* Define to `long' if <sys/types.h> does not define. */
++/* Define to `long int' if <sys/types.h> does not define. */
+ #undef off_t
++
++
++#ifdef HDF_SD_NETCDF
++#include "gawrapsd.h"
++#endif
++
+diff -up grads-1.9b4/src/Makefile.am.build_system grads-1.9b4/src/Makefile.am
+--- grads-1.9b4/src/Makefile.am.build_system	2004-12-15 22:00:03.000000000 +0100
++++ grads-1.9b4/src/Makefile.am	2008-09-11 18:03:44.000000000 +0200
+@@ -63,7 +63,7 @@ hdr_png             = gd13gif.h mtables.
+ hdr_lats            = lats.h latsint.h latsparm.h latstime.h \
+                       fgrib.h fgrib_init.h 
+ noinst_HEADERS	    = $(hdr_core) $(hdr_x11) $(hdr_sdf) $(hdr_png) $(hdr_gui) \
+-                      $(hdr_lats) $(hdr_img) $(hdr_pc) $(hdr_bufr)
++                      $(hdr_pc) $(hdr_bufr)
+ 
+ # Get rid of buildinfo.h on "make distclean"
+ DISTCLEANFILES	       = buildinfo.h
+@@ -198,10 +198,13 @@ EXTRA_gradsnc_SOURCES    = galats.c lats
+ 
+ # Object files that should not be reused by the other GrADS binaries,
+ # plus libraries needed by this GrADS binary
+-gradsnc_LDADD	       = latsnc-nc.o gaddes-nc.o gacfg-nc.o gaio-nc.o \
++gradsnc_LDADD	       = gaddes-nc.o gacfg-nc.o gaio-nc.o \
+ 			gauser-nc.o gasdf-nc.o \
+ 			$(common_ldadd) \
+ 			$(nc_libs)
++if USELATS
++gradsnc_LDADD        += latsnc-nc.o
++endif
+ 
+ # Custom compilation for object files specific to this GrADS binary
+ COMPILE_NC 		= $(COMPILE) -I$(supp_include_dir)/nc \
+@@ -296,11 +299,14 @@ gradsdods_LINK         = $(CXX) $(AM_CFL
+ 
+ # Object files that should not be reused by the other GrADS binaries,
+ # plus libraries needed by this GrADS binary
+-gradsdods_LDADD	       = latsnc-nc.o gaddes-dods.o gacfg-dods.o gaio-dods.o \
++gradsdods_LDADD	       = gaddes-dods.o gacfg-dods.o gaio-dods.o \
+ 			gauser-dods.o gasdf-dods.o \
+ 			$(common_ldadd) \
+ 			$(dods_libs) \
+ 			$(dods_darwin_libs)
++if USELATS
++gradsdods_LDADD        += latsnc-nc.o
++endif
+ 
+ # Custom compilation for object files specific to this GrADS binary
+ COMPILE_DODS 		= $(COMPILE) -I$(supp_include_dir)/dods \

grads-dap_build_fixes.patch:

Index: grads-dap_build_fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads-dap_build_fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grads-dap_build_fixes.patch	22 Aug 2007 10:48:32 -0000	1.1
+++ grads-dap_build_fixes.patch	11 Sep 2008 16:16:20 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Naur grads-1.9b4/src/gacfg.c grads-1.9b4_new/src/gacfg.c
---- grads-1.9b4/src/gacfg.c   2005-05-18 14:29:17.000000000 +0000
-+++ grads-1.9b4_new/src/gacfg.c 2005-11-03 13:18:45.000000000 +0000
+diff -up grads-1.9b4/src/gacfg.c.dap_build_fixes grads-1.9b4/src/gacfg.c
+--- grads-1.9b4/src/gacfg.c.dap_build_fixes	2005-05-18 16:29:17.000000000 +0200
++++ grads-1.9b4/src/gacfg.c	2008-09-11 18:03:44.000000000 +0200
 @@ -32,6 +32,7 @@
   */
  
@@ -9,9 +9,9 @@
  #include "grads.h"
  #include "buildinfo.h"
  
-diff -Naur grads-1.9b4/src/gaexpr.c grads-1.9b4_new/src/gaexpr.c
---- grads-1.9b4/src/gaexpr.c  2005-05-18 14:48:36.000000000 +0000
-+++ grads-1.9b4_new/src/gaexpr.c        2005-11-03 11:22:27.000000000 +0000
+diff -up grads-1.9b4/src/gaexpr.c.dap_build_fixes grads-1.9b4/src/gaexpr.c
+--- grads-1.9b4/src/gaexpr.c.dap_build_fixes	2005-05-18 16:48:36.000000000 +0200
++++ grads-1.9b4/src/gaexpr.c	2008-09-11 18:03:44.000000000 +0200
 @@ -13,6 +13,7 @@
  #endif
  
@@ -20,9 +20,9 @@
  #include <math.h>
  #include "grads.h"
  
-diff -Naur grads-1.9b4/src/gaio.c grads-1.9b4_new/src/gaio.c
---- grads-1.9b4/src/gaio.c    2005-05-23 17:59:01.000000000 +0000
-+++ grads-1.9b4_new/src/gaio.c  2005-11-03 11:37:35.000000000 +0000
+diff -up grads-1.9b4/src/gaio.c.dap_build_fixes grads-1.9b4/src/gaio.c
+--- grads-1.9b4/src/gaio.c.dap_build_fixes	2005-05-23 19:59:01.000000000 +0200
++++ grads-1.9b4/src/gaio.c	2008-09-11 18:03:44.000000000 +0200
 @@ -22,6 +22,7 @@
  #include "grads.h"
  #include <math.h>
@@ -31,10 +31,10 @@
  #if USESDF == 1
  #include <netcdf.h>
  #if USEHDF == 1
-diff -Naur grads-1.9b4/src/gasdf.c grads-1.9b4_new/src/gasdf.c
---- grads-1.9b4/src/gasdf.c   2005-05-18 14:29:17.000000000 +0000
-+++ grads-1.9b4_new/src/gasdf.c 2005-11-04 10:02:05.000000000 +0000
-@@ -5785,7 +5785,11 @@
+diff -up grads-1.9b4/src/gasdf.c.dap_build_fixes grads-1.9b4/src/gasdf.c
+--- grads-1.9b4/src/gasdf.c.dap_build_fixes	2005-05-18 16:29:17.000000000 +0200
++++ grads-1.9b4/src/gasdf.c	2008-09-11 18:03:44.000000000 +0200
+@@ -5785,7 +5785,11 @@ get_netcdf_attname (cdfid, varid, attnum
    /* Turn off automatic error handling. */
    ncopts = 0;
  
@@ -46,7 +46,7 @@
      ncopts = oldncopts ;
      return Failure;
    }
-@@ -5813,10 +5817,23 @@
+@@ -5813,10 +5817,23 @@ get_netcdf_att_info (cdfid, varid, aname
    /* Turn off automatic error handling. */
    ncopts = 0;
  
@@ -70,7 +70,7 @@
  
    /* Allocate space for values. */
    if ((*atype == NC_BYTE) || (*atype == NC_CHAR))  {
-@@ -5831,6 +5848,7 @@
+@@ -5831,6 +5848,7 @@ get_netcdf_att_info (cdfid, varid, aname
      *adata = (double *) malloc (sizeof (double) * *alen);
    }  else {
      ncopts = oldncopts ;
@@ -78,7 +78,7 @@
      return Failure;
    }
  
-@@ -5840,10 +5858,65 @@
+@@ -5840,10 +5858,65 @@ get_netcdf_att_info (cdfid, varid, aname
    }
  
    /* Retrieve values. */
@@ -144,9 +144,20 @@
  
    /* If character, set last byte to null. */
    if (*atype == NC_CHAR)  {
-diff -Naur grads-1.9b4/src/gxdxwd.c grads-1.9b4_new/src/gxdxwd.c
---- grads-1.9b4/src/gxdxwd.c  2002-10-28 19:08:33.000000000 +0000
-+++ grads-1.9b4_new/src/gxdxwd.c        2005-11-03 13:37:45.000000000 +0000
+diff -up grads-1.9b4/src/gauser.c.dap_build_fixes grads-1.9b4/src/gauser.c
+--- grads-1.9b4/src/gauser.c.dap_build_fixes	2005-05-18 20:51:01.000000000 +0200
++++ grads-1.9b4/src/gauser.c	2008-09-11 18:03:44.000000000 +0200
+@@ -42,6 +42,7 @@
+ #endif
+ 
+ /* int gxhpng (char *, int, int, int, int); */
++int gxhpng (char *, int, int, int, int, char *, char *, int) ;
+ 
+ /*mf 971022 --- expose Mike Fiorino's global struct to these routines for warning level setting mf*/
+ extern struct gamfcmn mfcmn;
+diff -up grads-1.9b4/src/gxdxwd.c.dap_build_fixes grads-1.9b4/src/gxdxwd.c
+--- grads-1.9b4/src/gxdxwd.c.dap_build_fixes	2002-10-28 20:08:33.000000000 +0100
++++ grads-1.9b4/src/gxdxwd.c	2008-09-11 18:03:44.000000000 +0200
 @@ -7,6 +7,7 @@
  #endif
  
@@ -155,7 +166,7 @@
  #include <errno.h>
  
  #include <X11/Xos.h>
-@@ -22,7 +23,7 @@
+@@ -22,7 +23,7 @@ typedef unsigned long Pixel;
   *              writting.
   */
  
@@ -164,7 +175,7 @@
  
  #include "X11/XWDFile.h"
  
-@@ -92,6 +91,7 @@
+@@ -92,6 +93,7 @@ Window_Dump(window, out)
      int bw;
      Window dummywin;
      XWDFileHeader header;
@@ -172,7 +183,7 @@
  
      
      /*
-@@ -232,7 +232,8 @@
+@@ -232,7 +234,8 @@ Window_Dump(window, out)
       * Write out the color maps, if any
       */
  
@@ -182,9 +193,9 @@
  /*
      {
      int icineca=0;
-diff -Naur grads-1.9b4/src/gxeps.c grads-1.9b4_new/src/gxeps.c
---- grads-1.9b4/src/gxeps.c   2004-02-27 14:42:11.000000000 +0000
-+++ grads-1.9b4_new/src/gxeps.c 2005-11-03 14:45:16.000000000 +0000
+diff -up grads-1.9b4/src/gxeps.c.dap_build_fixes grads-1.9b4/src/gxeps.c
+--- grads-1.9b4/src/gxeps.c.dap_build_fixes	2004-02-27 15:42:11.000000000 +0100
++++ grads-1.9b4/src/gxeps.c	2008-09-11 18:03:44.000000000 +0200
 @@ -6,6 +6,8 @@
  #include <config.h>
  #endif
@@ -194,9 +205,9 @@
  /***********************************************************
   * GXEPS a grads metafile to PostScript converter
   * Copyright (c) 1999 - 2001 Matthias Munnich
-diff -Naur grads-1.9b4/src/gxhpng.c grads-1.9b4_new/src/gxhpng.c
---- grads-1.9b4/src/gxhpng.c  2004-03-12 16:14:04.000000000 +0000
-+++ grads-1.9b4_new/src/gxhpng.c        2005-11-03 11:56:53.000000000 +0000
+diff -up grads-1.9b4/src/gxhpng.c.dap_build_fixes grads-1.9b4/src/gxhpng.c
+--- grads-1.9b4/src/gxhpng.c.dap_build_fixes	2004-03-12 17:14:04.000000000 +0100
++++ grads-1.9b4/src/gxhpng.c	2008-09-11 18:03:44.000000000 +0200
 @@ -6,7 +6,6 @@
  #include <config.h>
  #endif
@@ -205,19 +216,31 @@
  /* Rasterize current metafile buffer via gd library.  Loosly based
     on the gxpng utility:
  
-@@ -455,7 +452,7 @@
-                                im->polyInts[ints++] = (y-y1) * (x2-x1) / (y2-y1) + x1;
-			}
-		}
+@@ -379,6 +378,11 @@ short *poi,*pend;
+ 	
+ int gdCompareInt(const void *a, const void *b);
+ 
++int gdCompareInt(const void *a, const void *b)
++{
++	return (*(const int *)a) - (*(const int *)b);
++}
++
+ /* Version of gdImageFilledPolygon to invoke my local 
+    version of gdImageLne.  Nothing else changed... B.Doty 5/31/01 */
+ 
+@@ -455,7 +459,7 @@ void gdImageFilldPolygon(gdImagePtr im, 
+ 				im->polyInts[ints++] = (y-y1) * (x2-x1) / (y2-y1) + x1;
+ 			}
+ 		}
 -		qsort(im->polyInts, ints, sizeof(int), gdCompareInt);
 +		qsort(im->polyInts, ints, sizeof(int), (void *) gdCompareInt);
-
-		for (i=0; (i < (ints)); i+=2) {
-                        gdImageLne(im, im->polyInts[i], y,
-diff -Naur grads-1.9b4/src/gxX.c grads-1.9b4_new/src/gxX.c
---- grads-1.9b4/src/gxX.c     2005-05-18 14:29:17.000000000 +0000
-+++ grads-1.9b4_new/src/gxX.c   2005-11-03 11:28:15.000000000 +0000
-@@ -270,7 +270,7 @@
+ 
+ 		for (i=0; (i < (ints)); i+=2) {
+ 			gdImageLne(im, im->polyInts[i], y,
+diff -up grads-1.9b4/src/gxX.c.dap_build_fixes grads-1.9b4/src/gxX.c
+--- grads-1.9b4/src/gxX.c.dap_build_fixes	2005-05-18 16:29:17.000000000 +0200
++++ grads-1.9b4/src/gxX.c	2008-09-11 18:03:44.000000000 +0200
+@@ -270,7 +270,7 @@ char **flist,*xfnam;
  
    /* Set up icon pixmap */
  
@@ -226,7 +249,7 @@
                  icon_bitmap_width, icon_bitmap_height);
  
    /* Set standard properties */
-@@ -402,7 +402,7 @@
+@@ -402,7 +402,7 @@ char **flist,*xfnam;
    if (xfnam) flist = XListFonts (display, xfnam, 1, &i);
    else flist = NULL;
    if (flist==NULL) {
@@ -235,7 +258,7 @@
    }
    if (flist==NULL) {
      flist = XListFonts (display, "-adobe-helvetica-bold-r-normal-*-120*", 1, &i);
-@@ -418,7 +418,7 @@
+@@ -418,7 +418,7 @@ char **flist,*xfnam;
    if (xfnam) flist = XListFonts (display, xfnam, 1, &i);
    else flist = NULL;
    if (flist==NULL) {
@@ -244,37 +267,12 @@
    }
    if (flist==NULL) {
      flist = XListFonts (display, "-adobe-helvetica-bold-o-normal-*-120*", 1, &i);
-@@ -3267,7 +3267,7 @@
+@@ -3267,7 +3267,7 @@ Pixmap stipple_pixmap;
    }
  
    if (typ>1) {
 -    stipple_pixmap = XCreateBitmapFromData(display, win, bitmap_bits,
 +    stipple_pixmap = XCreateBitmapFromData(display, win, (char *) bitmap_bits,
-		     bitmap_width, bitmap_height);
+ 		     bitmap_width, bitmap_height);
      XSetStipple(display, gc, stipple_pixmap);
      XSetFillStyle(display, gc, FillStippled);
-diff -u --recursive grads-1.9b4-orig/src/gauser.c grads-1.9b4-rpm/src/gauser.c
---- grads-1.9b4-orig/src/gauser.c	2005-05-18 20:51:01.000000000 +0200
-+++ grads-1.9b4-rpm/src/gauser.c	2006-02-17 15:19:32.000000000 +0100
-@@ -42,6 +42,7 @@
- #endif
- 
- /* int gxhpng (char *, int, int, int, int); */
-+int gxhpng (char *, int, int, int, int, char *, char *, int) ;
- 
- /*mf 971022 --- expose Mike Fiorino's global struct to these routines for warning level setting mf*/
- extern struct gamfcmn mfcmn;
---- grads-1.9b4-orig/src/gxhpng.c	2004-03-12 17:14:04.000000000 +0100
-+++ grads-1.9b4-rpm/src/gxhpng.c	2006-02-17 15:19:32.000000000 +0100
-@@ -379,6 +379,11 @@
- 	
- int gdCompareInt(const void *a, const void *b);
- 
-+int gdCompareInt(const void *a, const void *b)
-+{
-+	return (*(const int *)a) - (*(const int *)b);
-+}
-+
- /* Version of gdImageFilledPolygon to invoke my local 
-    version of gdImageLne.  Nothing else changed... B.Doty 5/31/01 */
- 


Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- grads.spec	11 Sep 2008 15:08:45 -0000	1.24
+++ grads.spec	11 Sep 2008 16:16:20 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        24%{?dist}
+Release:        25%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -81,7 +81,7 @@
 
 %build
 ./bootstrap
-%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
+%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
 
 make %{?_smp_mflags}
 
@@ -121,8 +121,10 @@
 
 
 %changelog
-* Thu Sep 11 2008 - Patrice Dumas <pertusus at free.fr> 1.9b4-24
+* Thu Sep 11 2008 - Patrice Dumas <pertusus at free.fr> 1.9b4-25
 - rebuild for new libnc-dap
+- rediff patches
+- use new netcdf devel file locations
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.9b4-23
 - Autorebuild for GCC 4.3



From mtasaka at fedoraproject.org  Thu Sep 11 16:22:49 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 11 Sep 2008 16:22:49 +0000 (UTC)
Subject: rpms/xscreensaver/F-8 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 update-xscreensaver-hacks, 1.5, 1.6 xscreensaver.spec, 1.69, 1.70
Message-ID: <20080911162249.5C51A70131@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29635/F-8

Modified Files:
	.cvsignore sources update-xscreensaver-hacks xscreensaver.spec 
Log Message:
* Fri Sep 12 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-2
- Update ja.po
- Fix the explanation in XScreenSaver.ad (bug 461415)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	20 Aug 2008 18:13:22 -0000	1.9
+++ .cvsignore	11 Sep 2008 16:22:19 -0000	1.10
@@ -1 +1,2 @@
 xscreensaver-5.07.tar.gz
+ja.po.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 Aug 2008 18:13:22 -0000	1.9
+++ sources	11 Sep 2008 16:22:19 -0000	1.10
@@ -1 +1,2 @@
 55a12fcb5d3a7231c9850ef9d9f82918  xscreensaver-5.07.tar.gz
+43d35c0a54c80d16c6476d0b841bb92c  ja.po.gz


Index: update-xscreensaver-hacks
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-8/update-xscreensaver-hacks,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- update-xscreensaver-hacks	15 Sep 2007 14:47:28 -0000	1.5
+++ update-xscreensaver-hacks	11 Sep 2008 16:22:19 -0000	1.6
@@ -61,13 +61,18 @@
 
 tmpfile=`mktemp /tmp/XScreenSaver.ad.XXXXXXXX`
 
-echo "! Don't edit this file directly by yourself!!" > $tmpfile
-echo "! This file will be updated automatically." >> $tmpfile
-echo "!" >> $tmpfile
-echo "! Instread, please edit /etc/xscreensaver/XScreenSaver.ad.header," >> $tmpfile
-echo "! /etc/xscreensaver/XScreenSaver.ad.tail and add files under" >> $tmpfile
-echo "! /usr/share/xscreensaver/hacks.conf.d if you want." >> $tmpfile
-echo >> $tmpfile
+cat > $tmpfile <<EOF
+! Don't edit this file directly by yourself!!
+! This file is not meant to be edited directly.
+!
+! Instread, please edit /etc/xscreensaver/XScreenSaver.ad.header,
+! /etc/xscreensaver/XScreenSaver.ad.tail and add files under
+! /usr/share/xscreensaver/hacks.conf.d if you want.
+!
+! Then call /usr/sbin/update-xscreensaver-hacks to 
+! update this file.
+!
+EOF
 
 cat $ADDIR/XScreenSaver.ad.header >> $tmpfile
 


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-8/xscreensaver.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- xscreensaver.spec	20 Aug 2008 18:13:22 -0000	1.69
+++ xscreensaver.spec	11 Sep 2008 16:22:19 -0000	1.70
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    1
+%define fedora_rel    2
 
 %define extrarel      %{nil}
 
@@ -14,7 +14,7 @@
 %define pam_ver       0.80-7
 %define autoconf_ver  2.53
 
-%define update_po     0
+%define update_po     1
 %define build_tests   0
 
 Buildroot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,6 +31,7 @@
 %if %{modular_conf}
 Source10:        update-xscreensaver-hacks
 %endif
+Source20:        ja.po.gz
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
@@ -186,6 +187,8 @@
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
 
+gzip -dc %SOURCE20 > po/ja.po
+
 change_option(){
    set +x
    ADFILE=$1
@@ -308,7 +311,7 @@
 sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
 
 %build
-autoconf
+#autoconf
 
 archdir=`./config.guess`
 mkdir $archdir
@@ -334,7 +337,8 @@
 ( cd po ; make generate_potfiles_in update-po )
 %endif
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} \
+	GMSGFMT="msgfmt --statistics"
 
 %if %{modular_conf}
 # Make XScreenSavar.ad modular
@@ -607,6 +611,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Sep 12 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-2
+- Update ja.po
+- Fix the explanation in XScreenSaver.ad (bug 461415)
+
 * Thu Aug 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-1
 - Update to 5.07
 - Fix the license tag: BSD -> MIT



From mtasaka at fedoraproject.org  Thu Sep 11 16:22:49 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 11 Sep 2008 16:22:49 +0000 (UTC)
Subject: rpms/xscreensaver/F-9 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 update-xscreensaver-hacks, 1.5, 1.6 xscreensaver.spec, 1.73, 1.74
Message-ID: <20080911162249.8CA6870131@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29635/F-9

Modified Files:
	.cvsignore sources update-xscreensaver-hacks xscreensaver.spec 
Log Message:
* Fri Sep 12 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-2
- Update ja.po
- Fix the explanation in XScreenSaver.ad (bug 461415)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	20 Aug 2008 18:13:22 -0000	1.9
+++ .cvsignore	11 Sep 2008 16:22:19 -0000	1.10
@@ -1 +1,2 @@
 xscreensaver-5.07.tar.gz
+ja.po.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 Aug 2008 18:13:22 -0000	1.9
+++ sources	11 Sep 2008 16:22:19 -0000	1.10
@@ -1 +1,2 @@
 55a12fcb5d3a7231c9850ef9d9f82918  xscreensaver-5.07.tar.gz
+43d35c0a54c80d16c6476d0b841bb92c  ja.po.gz


Index: update-xscreensaver-hacks
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-9/update-xscreensaver-hacks,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- update-xscreensaver-hacks	15 Sep 2007 14:47:28 -0000	1.5
+++ update-xscreensaver-hacks	11 Sep 2008 16:22:19 -0000	1.6
@@ -61,13 +61,18 @@
 
 tmpfile=`mktemp /tmp/XScreenSaver.ad.XXXXXXXX`
 
-echo "! Don't edit this file directly by yourself!!" > $tmpfile
-echo "! This file will be updated automatically." >> $tmpfile
-echo "!" >> $tmpfile
-echo "! Instread, please edit /etc/xscreensaver/XScreenSaver.ad.header," >> $tmpfile
-echo "! /etc/xscreensaver/XScreenSaver.ad.tail and add files under" >> $tmpfile
-echo "! /usr/share/xscreensaver/hacks.conf.d if you want." >> $tmpfile
-echo >> $tmpfile
+cat > $tmpfile <<EOF
+! Don't edit this file directly by yourself!!
+! This file is not meant to be edited directly.
+!
+! Instread, please edit /etc/xscreensaver/XScreenSaver.ad.header,
+! /etc/xscreensaver/XScreenSaver.ad.tail and add files under
+! /usr/share/xscreensaver/hacks.conf.d if you want.
+!
+! Then call /usr/sbin/update-xscreensaver-hacks to 
+! update this file.
+!
+EOF
 
 cat $ADDIR/XScreenSaver.ad.header >> $tmpfile
 


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-9/xscreensaver.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- xscreensaver.spec	20 Aug 2008 18:13:22 -0000	1.73
+++ xscreensaver.spec	11 Sep 2008 16:22:19 -0000	1.74
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    1
+%define fedora_rel    2
 
 %define extrarel      %{nil}
 
@@ -14,7 +14,7 @@
 %define pam_ver       0.80-7
 %define autoconf_ver  2.53
 
-%define update_po     0
+%define update_po     1
 %define build_tests   0
 
 Buildroot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,6 +31,7 @@
 %if %{modular_conf}
 Source10:        update-xscreensaver-hacks
 %endif
+Source20:        ja.po.gz
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
@@ -186,6 +187,8 @@
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
 
+gzip -dc %SOURCE20 > po/ja.po
+
 change_option(){
    set +x
    ADFILE=$1
@@ -308,7 +311,7 @@
 sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
 
 %build
-autoconf
+#autoconf
 
 archdir=`./config.guess`
 mkdir $archdir
@@ -334,7 +337,8 @@
 ( cd po ; make generate_potfiles_in update-po )
 %endif
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} \
+	GMSGFMT="msgfmt --statistics"
 
 %if %{modular_conf}
 # Make XScreenSavar.ad modular
@@ -607,6 +611,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Sep 12 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-2
+- Update ja.po
+- Fix the explanation in XScreenSaver.ad (bug 461415)
+
 * Thu Aug 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-1
 - Update to 5.07
 - Fix the license tag: BSD -> MIT



From mtasaka at fedoraproject.org  Thu Sep 11 16:22:49 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 11 Sep 2008 16:22:49 +0000 (UTC)
Subject: rpms/xscreensaver/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 update-xscreensaver-hacks, 1.5, 1.6 xscreensaver.spec, 1.74, 1.75
Message-ID: <20080911162249.C925670131@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29635/devel

Modified Files:
	.cvsignore sources update-xscreensaver-hacks xscreensaver.spec 
Log Message:
* Fri Sep 12 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-2
- Update ja.po
- Fix the explanation in XScreenSaver.ad (bug 461415)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	20 Aug 2008 18:08:54 -0000	1.9
+++ .cvsignore	11 Sep 2008 16:22:19 -0000	1.10
@@ -1 +1,2 @@
 xscreensaver-5.07.tar.gz
+ja.po.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 Aug 2008 18:08:54 -0000	1.9
+++ sources	11 Sep 2008 16:22:19 -0000	1.10
@@ -1 +1,2 @@
 55a12fcb5d3a7231c9850ef9d9f82918  xscreensaver-5.07.tar.gz
+43d35c0a54c80d16c6476d0b841bb92c  ja.po.gz


Index: update-xscreensaver-hacks
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/update-xscreensaver-hacks,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- update-xscreensaver-hacks	15 Sep 2007 14:47:28 -0000	1.5
+++ update-xscreensaver-hacks	11 Sep 2008 16:22:19 -0000	1.6
@@ -61,13 +61,18 @@
 
 tmpfile=`mktemp /tmp/XScreenSaver.ad.XXXXXXXX`
 
-echo "! Don't edit this file directly by yourself!!" > $tmpfile
-echo "! This file will be updated automatically." >> $tmpfile
-echo "!" >> $tmpfile
-echo "! Instread, please edit /etc/xscreensaver/XScreenSaver.ad.header," >> $tmpfile
-echo "! /etc/xscreensaver/XScreenSaver.ad.tail and add files under" >> $tmpfile
-echo "! /usr/share/xscreensaver/hacks.conf.d if you want." >> $tmpfile
-echo >> $tmpfile
+cat > $tmpfile <<EOF
+! Don't edit this file directly by yourself!!
+! This file is not meant to be edited directly.
+!
+! Instread, please edit /etc/xscreensaver/XScreenSaver.ad.header,
+! /etc/xscreensaver/XScreenSaver.ad.tail and add files under
+! /usr/share/xscreensaver/hacks.conf.d if you want.
+!
+! Then call /usr/sbin/update-xscreensaver-hacks to 
+! update this file.
+!
+EOF
 
 cat $ADDIR/XScreenSaver.ad.header >> $tmpfile
 


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- xscreensaver.spec	20 Aug 2008 18:08:54 -0000	1.74
+++ xscreensaver.spec	11 Sep 2008 16:22:19 -0000	1.75
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    1
+%define fedora_rel    2
 
 %define extrarel      %{nil}
 
@@ -14,7 +14,7 @@
 %define pam_ver       0.80-7
 %define autoconf_ver  2.53
 
-%define update_po     0
+%define update_po     1
 %define build_tests   0
 
 Buildroot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,6 +31,7 @@
 %if %{modular_conf}
 Source10:        update-xscreensaver-hacks
 %endif
+Source20:        ja.po.gz
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
@@ -186,6 +187,8 @@
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
 
+gzip -dc %SOURCE20 > po/ja.po
+
 change_option(){
    set +x
    ADFILE=$1
@@ -308,7 +311,7 @@
 sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
 
 %build
-autoconf
+#autoconf
 
 archdir=`./config.guess`
 mkdir $archdir
@@ -334,7 +337,8 @@
 ( cd po ; make generate_potfiles_in update-po )
 %endif
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} \
+	GMSGFMT="msgfmt --statistics"
 
 %if %{modular_conf}
 # Make XScreenSavar.ad modular
@@ -607,6 +611,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Sep 12 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-2
+- Update ja.po
+- Fix the explanation in XScreenSaver.ad (bug 461415)
+
 * Thu Aug 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-1
 - Update to 5.07
 - Fix the license tag: BSD -> MIT



From wolfy at fedoraproject.org  Thu Sep 11 16:23:08 2008
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Thu, 11 Sep 2008 16:23:08 +0000 (UTC)
Subject: rpms/ssmtp/devel ssmtp-unitialized-strdup.patch, NONE,
	1.1 ssmtp-md5auth-non-rsa, 1.1, 1.2 ssmtp-password-leak.patch,
	1.1, 1.2 ssmtp.spec, 1.16, 1.17
Message-ID: <20080911162308.A2CF270131@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/ssmtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29469

Modified Files:
	ssmtp-md5auth-non-rsa ssmtp-password-leak.patch ssmtp.spec 
Added Files:
	ssmtp-unitialized-strdup.patch 
Log Message:
fix CVE-2008-3962 
cleanup existing patches


ssmtp-unitialized-strdup.patch:

--- NEW FILE ssmtp-unitialized-strdup.patch ---
--- ssmtp-2.61/ssmtp.c.orig	2008-09-11 18:04:07.000000000 +0300
+++ ssmtp-2.61/ssmtp.c	2008-09-11 18:07:14.000000000 +0300
@@ -489,6 +489,11 @@ char *from_format(char *str, bool_t over
 				die("from_format() -- snprintf() failed");
 			}
 		}
+		else {
+			if(snprintf(buf, BUF_SZ, "%s", str) == -1) {
+				die("from_format() -- snprintf() failed");
+			}
+		}
 	}
 
 #if 0


Index: ssmtp-md5auth-non-rsa
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/devel/ssmtp-md5auth-non-rsa,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp-md5auth-non-rsa	17 Oct 2007 00:09:53 -0000	1.1
+++ ssmtp-md5auth-non-rsa	11 Sep 2008 16:22:38 -0000	1.2
@@ -7391,38 +7391,3 @@
  
  	for (i = 0; i < MD5_DIGEST_LEN; i++) {
  		digascii[2 * i] = hextab[digest[i] >> 4];
-diff -Nupr ssmtp-2.61.orig/ssmtp.c.orig ssmtp-2.61/ssmtp.c.orig
---- ssmtp-2.61.orig/ssmtp.c.orig	2007-10-17 02:20:25.000000000 +0300
-+++ ssmtp-2.61/ssmtp.c.orig	2007-10-17 02:29:11.000000000 +0300
-@@ -708,6 +708,10 @@ void header_save(char *str)
- 		else if(strncasecmp(ht->string, "Bcc:", 4) == 0) {
- 			p = (ht->string + 4);
- 			rcpt_parse(p);
-+                        /* Undo adding the header to the list: */
-+                        free(ht->string);
-+                        ht->string = NULL;
-+                        return;
- 		}
- 		else if(strncasecmp(ht->string, "CC:", 3) == 0) {
- 			p = (ht->string + 3);
-@@ -1406,6 +1410,7 @@ int ssmtp(char *argv[])
- 	struct passwd *pw;
- 	int i, sock;
- 	uid_t uid;
-+	bool_t minus_v_save;
- 	int timeout = 0;
- 
- 	outbytes = 0;
-@@ -1522,7 +1527,12 @@ int ssmtp(char *argv[])
- #ifdef MD5AUTH
- 		}
- #endif
-+		/* We do NOT want the password output to STDERR
-+		 * even base64 encoded.*/
-+		minus_v_save = minus_v;
-+		minus_v = False;
- 		outbytes += smtp_write(sock, "%s", buf);
-+		minus_v = minus_v_save;
- 		(void)alarm((unsigned) MEDWAIT);
- 
- 		if(smtp_okay(sock, buf) == False) {

ssmtp-password-leak.patch:

Index: ssmtp-password-leak.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/devel/ssmtp-password-leak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp-password-leak.patch	8 Dec 2006 00:09:53 -0000	1.1
+++ ssmtp-password-leak.patch	11 Sep 2008 16:22:38 -0000	1.2
@@ -1,6 +1,6 @@
 --- ssmtp-2.61.redhat/ssmtp.c	2006-12-08 01:25:35.000000000 +0200
 +++ ssmtp-2.61.debian/ssmtp.c	2006-12-08 01:24:25.000000000 +0200
-@@ -1404,6 +1406,7 @@
+@@ -1406,6 +1404,7 @@
  	struct passwd *pw;
  	int i, sock;
  	uid_t uid;
@@ -8,7 +8,7 @@
  	int timeout = 0;
  
  	outbytes = 0;
-@@ -1520,7 +1523,12 @@
+@@ -1522,7 +1521,12 @@
  #ifdef MD5AUTH
  		}
  #endif


Index: ssmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/devel/ssmtp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ssmtp.spec	2 Aug 2008 05:29:03 -0000	1.16
+++ ssmtp.spec	11 Sep 2008 16:22:38 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	11.5%{?dist}.4
+Release:	11.6%{?dist}
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPLv2+
@@ -16,8 +16,9 @@
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=340803
 # replaces RSA's md5 with a GPL compatible implementation
 Patch6:		%{name}-md5auth-non-rsa
+Patch7:		%{name}-unitialized-strdup.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:       %{_sbindir}/sendmail
+Provides:	%{_sbindir}/sendmail
 Requires(post):	%{_sbindir}/alternatives
 Requires(preun):	%{_sbindir}/alternatives
 BuildRequires:	openssl-devel
@@ -42,6 +43,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 
 %build
@@ -115,6 +117,10 @@
 
 
 %changelog
+* Thu Sep 11 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6
+- patch to fix CVE-2008-3962 (courtesy https://bugs.gentoo.org/127592)
+- cleanup of other patches, make build with fuzz=0
+
 * Sat Aug 02 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.5.4
 - work around rpmbuild more strict syntax checker
 



From till at fedoraproject.org  Thu Sep 11 16:24:26 2008
From: till at fedoraproject.org (Till Maas)
Date: Thu, 11 Sep 2008 16:24:26 +0000 (UTC)
Subject: rpms/libHX/devel .cvsignore, 1.7, 1.8 libHX.spec, 1.9, 1.10 sources,
	1.7, 1.8
Message-ID: <20080911162426.8B97F70131@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/libHX/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30282

Modified Files:
	.cvsignore libHX.spec sources 
Log Message:
* Thu Sep 11 2008 Till Maas <opensource at till.name> - 1.25-1
- Update to latest version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Sep 2008 11:45:02 -0000	1.7
+++ .cvsignore	11 Sep 2008 16:23:56 -0000	1.8
@@ -1 +1 @@
-libHX-1.23.tar.bz2
+libHX-1.25.tar.bz2


Index: libHX.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/libHX.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libHX.spec	5 Sep 2008 11:50:35 -0000	1.9
+++ libHX.spec	11 Sep 2008 16:23:56 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           libHX
-Version:        1.23
+Version:        1.25
 Release:        1%{?dist}
 Summary:        General-purpose library for typical low-level operations
 
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Till Maas <opensource at till.name> - 1.25-1
+- Update to latest version
+
 * Fri Sep 05 2008 Till Maas <opensource at till.name> - 1.23-1
 - Update to latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Sep 2008 11:45:02 -0000	1.7
+++ sources	11 Sep 2008 16:23:56 -0000	1.8
@@ -1 +1 @@
-a14dcb5f8c89ec6ba754b4d1e61612b4  libHX-1.23.tar.bz2
+6f19ce48a03f729c3cab32a42924ed2f  libHX-1.25.tar.bz2



From till at fedoraproject.org  Thu Sep 11 16:27:45 2008
From: till at fedoraproject.org (Till Maas)
Date: Thu, 11 Sep 2008 16:27:45 +0000 (UTC)
Subject: rpms/pam_mount/devel .cvsignore, 1.15, 1.16 pam_mount.spec, 1.42,
	1.43 sources, 1.16, 1.17
Message-ID: <20080911162745.2D65D70131@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31690

Modified Files:
	.cvsignore pam_mount.spec sources 
Log Message:
* Thu Sep 11 2008 Till Maas <opensource at till.name> - 0.48-1
- Update to new version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	5 Sep 2008 08:25:52 -0000	1.15
+++ .cvsignore	11 Sep 2008 16:27:14 -0000	1.16
@@ -1 +1 @@
-pam_mount-0.47.tar.lzma
+pam_mount-0.48.tar.lzma


Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- pam_mount.spec	5 Sep 2008 20:16:19 -0000	1.42
+++ pam_mount.spec	11 Sep 2008 16:27:14 -0000	1.43
@@ -1,5 +1,5 @@
 Name:           pam_mount
-Version:        0.47
+Version:        0.48
 Release:        1%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Till Maas <opensource at till.name> - 0.48-1
+- Update to new version
+
 * Fri Sep 05 2008 Till Maas <opensource at till.name> - 0.47-1
 - Update to new version that includes a security fix:
   https://sourceforge.net/project/shownotes.php?release_id=624240


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	5 Sep 2008 08:25:52 -0000	1.16
+++ sources	11 Sep 2008 16:27:14 -0000	1.17
@@ -1 +1 @@
-5ef5d12af86a3fe61d1bb0d557f034ac  pam_mount-0.47.tar.lzma
+dcbf1dd27132915d7f9c64362af9a6b0  pam_mount-0.48.tar.lzma



From spot at fedoraproject.org  Thu Sep 11 16:31:02 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 16:31:02 +0000 (UTC)
Subject: rpms/GraphicsMagick/F-9 GraphicsMagick.spec,1.22,1.23
Message-ID: <20080911163102.3943F70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/GraphicsMagick/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32508/F-9

Modified Files:
	GraphicsMagick.spec 
Log Message:
own all files properly


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-9/GraphicsMagick.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- GraphicsMagick.spec	11 Sep 2008 15:46:56 -0000	1.22
+++ GraphicsMagick.spec	11 Sep 2008 16:30:31 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.1.14
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
@@ -192,10 +192,10 @@
 %postun c++ -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog Copyright.txt
-%doc index.html www/ images/
-%doc README.txt AUTHORS NEWS 
+%defattr(-,root,root,-)
+%doc Copyright.txt
+%doc README.txt AUTHORS
+%doc %{_datadir}/doc/%{name}/
 %attr(755,root,root) %{_libdir}/libGraphicsMagick.so.*
 %attr(755,root,root) %{_libdir}/libGraphicsMagickWand.so.*
 %{_bindir}/[a-z]*
@@ -235,6 +235,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.14-3
+- own all files properly
+
 * Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.14-2
 - turns out we do need gcc43 patch
 



From spot at fedoraproject.org  Thu Sep 11 16:31:02 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 16:31:02 +0000 (UTC)
Subject: rpms/GraphicsMagick/devel .cvsignore, 1.5, 1.6 GraphicsMagick.spec, 
	1.21, 1.22
Message-ID: <20080911163102.6700070131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/GraphicsMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32508/devel

Modified Files:
	.cvsignore GraphicsMagick.spec 
Log Message:
own all files properly


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Sep 2008 14:07:27 -0000	1.5
+++ .cvsignore	11 Sep 2008 16:30:32 -0000	1.6
@@ -1 +1 @@
-GraphicsMagick-1.2.5.tar.bz2
+GraphicsMagick-1.1.14.tar.bz2


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/GraphicsMagick.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- GraphicsMagick.spec	11 Sep 2008 15:46:56 -0000	1.21
+++ GraphicsMagick.spec	11 Sep 2008 16:30:32 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.1.14
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
@@ -192,10 +192,10 @@
 %postun c++ -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog Copyright.txt
-%doc index.html www/ images/
-%doc README.txt AUTHORS NEWS 
+%defattr(-,root,root,-)
+%doc Copyright.txt
+%doc README.txt AUTHORS
+%doc %{_datadir}/doc/%{name}/
 %attr(755,root,root) %{_libdir}/libGraphicsMagick.so.*
 %attr(755,root,root) %{_libdir}/libGraphicsMagickWand.so.*
 %{_bindir}/[a-z]*
@@ -235,6 +235,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.14-3
+- own all files properly
+
 * Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.14-2
 - turns out we do need gcc43 patch
 



From orion at fedoraproject.org  Thu Sep 11 16:31:41 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 11 Sep 2008 16:31:41 +0000 (UTC)
Subject: rpms/ncl/devel ncl.spec,1.4,1.5
Message-ID: <20080911163141.48B8B70131@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/ncl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv359

Modified Files:
	ncl.spec 
Log Message:
Update comment



Index: ncl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/devel/ncl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ncl.spec	11 Sep 2008 14:15:34 -0000	1.4
+++ ncl.spec	11 Sep 2008 16:31:11 -0000	1.5
@@ -290,6 +290,7 @@
 %changelog
 * Thu Sep 11 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-12
 - Rebuild for new libdap
+- Fix netcdf include location
 
 * Fri Apr 11 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-11
 - Add patch to fix raster image problems on non 32-bit platforms



From terjeros at fedoraproject.org  Thu Sep 11 17:49:20 2008
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Thu, 11 Sep 2008 17:49:20 +0000 (UTC)
Subject: rpms/perl-Config-Grammar/devel import.log, NONE,
	1.1 perl-Config-Grammar.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911174920.A0A7570131@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/perl-Config-Grammar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24337/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Config-Grammar.spec 
Log Message:
Importing perl-Config-Grammar




--- NEW FILE import.log ---
perl-Config-Grammar-1_10-1_fc9:HEAD:perl-Config-Grammar-1.10-1.fc9.src.rpm:1221155278


--- NEW FILE perl-Config-Grammar.spec ---
Name:           perl-Config-Grammar
Version:        1.10
Release:        1%{?dist}
Summary:        Grammar-based, user-friendly config parser
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Config-Grammar/
Source0:        http://www.cpan.org/authors/id/D/DS/DSCHWEI/Config-Grammar-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::Simple)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Config::Grammar is a module to parse configuration files. The
configuration may consist of multiple-level sections with assignments
and tabular data.  The parsed data will be returned as a hash
containing the whole configuration. Config::Grammar uses a grammar
that is supplied upon creation of a Config::Grammar object to parse
the configuration file and return helpful error messages in case of
syntax errors. Using the makepod method you can generate documentation
of the configuration file format.

%prep
%setup -q -n Config-Grammar-%{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 -delete
%{_fixperms} %{buildroot}/*

%check
%{__make} test

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc Changes README
%{perl_vendorlib}/Config/Grammar*
%{_mandir}/man3//Config::Grammar*

%changelog
* Tue Sep 09 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.10-1
- initial build based on cpanspec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Grammar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 02:48:08 -0000	1.1
+++ .cvsignore	11 Sep 2008 17:48:50 -0000	1.2
@@ -0,0 +1 @@
+Config-Grammar-1.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Grammar/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 02:48:08 -0000	1.1
+++ sources	11 Sep 2008 17:48:50 -0000	1.2
@@ -0,0 +1 @@
+ce904f687f1ee9c70521142a2e0f15c9  Config-Grammar-1.10.tar.gz



From nhorman at fedoraproject.org  Thu Sep 11 17:49:48 2008
From: nhorman at fedoraproject.org (Neil Horman)
Date: Thu, 11 Sep 2008 17:49:48 +0000 (UTC)
Subject: rpms/python-pysctp/F-9 __init__.py, NONE, 1.1 pysctp-buildfix.patch,
	NONE, 1.1 python-pysctp.spec, NONE, 1.1 setup.py, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080911174948.A633770131@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/python-pysctp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24661

Modified Files:
	.cvsignore sources 
Added Files:
	__init__.py pysctp-buildfix.patch python-pysctp.spec setup.py 
Log Message:
Initial import


--- NEW FILE __init__.py ---
__version__ = "0.3.1"

pysctp-buildfix.patch:

--- NEW FILE pysctp-buildfix.patch ---
diff -up pysctp-0.3.1/sctp.py.orig pysctp-0.3.1/sctp.py
--- pysctp-0.3.1/sctp.py.orig	2008-04-10 21:30:33.000000000 -0400
+++ pysctp-0.3.1/sctp.py	2008-04-10 21:30:20.000000000 -0400
@@ -32,7 +32,7 @@ send_failed(): 
 remote_error(): 
 shutdown_event(): 
 pdapi_event(): 
-adaption_event(): 
+adaptation_event(): 
 
 Every SCTP socket has a number of properties. Two "complex" properties,
 that contain a number of sub-properties, are: 
@@ -246,7 +246,7 @@ class notification(object):
 	type_REMOTE_ERROR = _sctp.getconstant("SCTP_REMOTE_ERROR")
 	type_SHUTDOWN_EVENT = _sctp.getconstant("SCTP_SHUTDOWN_EVENT")
 	type_PARTIAL_DELIVERY_EVENT = _sctp.getconstant("SCTP_PARTIAL_DELIVERY_EVENT")
-	type_ADAPTION_INDICATION = _sctp.getconstant("SCTP_ADAPTION_INDICATION")
+	type_ADAPTATION_INDICATION = _sctp.getconstant("SCTP_ADAPTATION_INDICATION")
 
 class assoc_change(notification):
 	"""
@@ -396,14 +396,14 @@ class shutdown_event(notification):
 		self.assoc_id = 0
 		notification.__init__(self, values)
 	
-class adaption_event(notification):
+class adaptation_event(notification):
 	"""
 	Adaption indication event. It signals that the remote peer requests
-	an specific adaption layer.
+	an specific adaptation layer.
 
 	In SCTP, you can pass an optional 32-bit metadata identifier 
 	along each message, called "ppid". For protocols that actively use
-	this feature, it is like a subprotocol identifier, or "adaption
+	this feature, it is like a subprotocol identifier, or "adaptation
 	layer". The message interpreter is chosen by this value. This is
 	mostly for telephony signaling-related protocols.
 
@@ -419,7 +419,7 @@ class adaption_event(notification):
 	that (see event_subscribe class for details).
 	"""
 	def __init__(self, values=None):
-		self.adaption_ind = 0
+		self.adaptation_ind = 0
 		self.assoc_id = 0
 		notification.__init__(self, values)
 
@@ -451,7 +451,7 @@ notification_table = {
 	notification.type_REMOTE_ERROR: remote_error,
 	notification.type_SHUTDOWN_EVENT: shutdown_event,
 	notification.type_PARTIAL_DELIVERY_EVENT: pdapi_event,
-	notification.type_ADAPTION_INDICATION: adaption_event,
+	notification.type_ADAPTATION_INDICATION: adaptation_event,
 }
 
 
@@ -519,7 +519,7 @@ class event_subscribe(object):
 	peer_error: refers to remote_error() event
 	shutdown: refers to shutdon_event() 
 	partial_delivery: refers to pdapi_event()
-	adaption_layer: refers to adaption_event()
+	adaptation_layer: refers to adaptation_event()
 
 	(*) sndrcvinfo is ALWAYS returned by sctp_recv() along with message data. The
 	    data_io property just controls whether sndrcvinfo() contains useful data.
@@ -531,7 +531,7 @@ class event_subscribe(object):
 	sendfailure = send_failure
 	peererror = peer_error
 	partialdelivery = partial_delivery
-	adaptionlayer = adaption_layer
+	adaptationlayer = adaptation_layer
 	"""
 
 	def flush(self):
@@ -548,8 +548,8 @@ class event_subscribe(object):
 	def __get_property(self, key):
 		return self.__dict__[key]
 
-	def get_adaption_layer(self):
-		return self.__get_property("_adaption_layer")
+	def get_adaptation_layer(self):
+		return self.__get_property("_adaptation_layer")
 
 	def get_partial_delivery(self):
 		return self.__get_property("_partial_delivery")
@@ -572,8 +572,8 @@ class event_subscribe(object):
 	def get_data_io(self, value):
 		return self.__get_property("_data_io")
 
-	def set_adaption_layer(self, value):
-		self.__set_property("_adaption_layer", value)
+	def set_adaptation_layer(self, value):
+		self.__set_property("_adaptation_layer", value)
 
 	def set_partial_delivery(self, value):
 		self.__set_property("_partial_delivery", value)
@@ -608,7 +608,7 @@ class event_subscribe(object):
 		self._peer_error = 0
 		self._shutdown = 0
 		self._partial_delivery = 0
-		self._adaption_layer = 0
+		self._adaptation_layer = 0
 
 		if self.autoflush:
 			self.flush()
@@ -642,8 +642,8 @@ class event_subscribe(object):
 	partial_delivery = property(get_partial_delivery, set_partial_delivery)
 	partialdelivery = partial_delivery
 
-	adaption_layer = property(get_adaption_layer, set_adaption_layer)
-	adaptionlayer = adaption_layer
+	adaptation_layer = property(get_adaptation_layer, set_adaptation_layer)
+	adaptationlayer = adaptation_layer
 
 
 ########## STRUCTURES EXCHANGED VIA set/getsockopt() 
@@ -964,7 +964,7 @@ class sctpsocket(object):
 		 nature of SCTP, some implementations have it turned on by default, while TCP 
 		 is mandated to have it off by default.
 
-	adaption: 32-bit value related to the "ppid" metadata field sent along each data
+	adaptation: 32-bit value related to the "ppid" metadata field sent along each data
 		  message. If this property is different than zero, the configured value
 		  is sent via ADAPTION INDICATION event to the remote peer when a new 
 		  association is opened. This is intended to be used by telephony-related
@@ -1097,7 +1097,7 @@ class sctpsocket(object):
 
 		    WARNING: identifying destination by Association ID not implemented yet!
 
-		ppid: adaption layer value, a 32-bit metadata that is sent along the message.
+		ppid: adaptation layer value, a 32-bit metadata that is sent along the message.
 		      Defaults to 0.
 
 		flags: a bitmap of MSG_* flags. For example, MSG_UNORDERED indicates that 
@@ -1313,21 +1313,21 @@ class sctpsocket(object):
 		"""
 		_sctp.set_nodelay(self._sk.fileno(), rvalue)
 
-	def get_adaption(self):
+	def get_adaptation(self):
 		"""
-		Gets the adaption layer indication from kernel.
+		Gets the adaptation layer indication from kernel.
 		
-		See class documentation for more details. (adaption property)
+		See class documentation for more details. (adaptation property)
 		"""
-		return _sctp.get_adaption(self._sk.fileno())
+		return _sctp.get_adaptation(self._sk.fileno())
 
-	def set_adaption(self, rvalue):
+	def set_adaptation(self, rvalue):
 		"""
-		Sets the adaption layer indication for this socket.
+		Sets the adaptation layer indication for this socket.
 
-		See class documentation for more details. (adaption property)
+		See class documentation for more details. (adaptation property)
 		"""
-		_sctp.set_adaption(self._sk.fileno(), rvalue)
+		_sctp.set_adaptation(self._sk.fileno(), rvalue)
 
 	def get_disable_fragments(self):
 		"""
@@ -1599,7 +1599,7 @@ class sctpsocket(object):
 	# properties
 
 	nodelay = property(get_nodelay, set_nodelay)
-	adaption = property(get_adaption, set_adaption)
+	adaptation = property(get_adaptation, set_adaptation)
 	disable_fragments = property(get_disable_fragments, set_disable_fragments)
 	mappedv4 = property(get_mappedv4, set_mappedv4)
 	maxseg = property(get_maxseg, set_maxseg)
diff -up pysctp-0.3.1/Makefile.orig pysctp-0.3.1/Makefile
--- pysctp-0.3.1/Makefile.orig	2008-04-10 21:30:33.000000000 -0400
+++ pysctp-0.3.1/Makefile	2008-04-10 21:29:46.000000000 -0400
@@ -1,4 +1,4 @@
-PYTHON_VERSION = 2.4
+PYTHON_VERSION = 2.5
 CFLAGS = -Wall -I/usr/include/python$(PYTHON_VERSION) -fPIC
 LDFLAGS = -fPIC -shared -lsctp
 
diff -up pysctp-0.3.1/_sctp.c.orig pysctp-0.3.1/_sctp.c
--- pysctp-0.3.1/_sctp.c.orig	2008-04-10 21:30:33.000000000 -0400
+++ pysctp-0.3.1/_sctp.c	2008-04-10 21:30:20.000000000 -0400
@@ -5,8 +5,7 @@
  * Elvis Pf??tzenreuter (elvis.pfutzenreuter@{gmail.com,indt.org.br})
  * Copyright (c) 2005 Instituto Nokia de Tecnologia
  */
-
-#include "Python.h"
+#include <Python.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/sctp.h>
@@ -36,8 +35,8 @@ static PyObject* get_disable_fragments(P
 static PyObject* set_disable_fragments(PyObject* dummy, PyObject* args);
 static PyObject* get_autoclose(PyObject* dummy, PyObject* args);
 static PyObject* set_autoclose(PyObject* dummy, PyObject* args);
-static PyObject* get_adaption(PyObject* dummy, PyObject* args);
-static PyObject* set_adaption(PyObject* dummy, PyObject* args);
+static PyObject* get_adaptation(PyObject* dummy, PyObject* args);
+static PyObject* set_adaptation(PyObject* dummy, PyObject* args);
 static PyObject* set_peer_primary(PyObject* dummy, PyObject* args);
 static PyObject* set_primary(PyObject* dummy, PyObject* args);
 static PyObject* bindx(PyObject* dummy, PyObject* args);
@@ -84,8 +83,8 @@ static PyMethodDef _sctpMethods[] = 
 	{"set_initparams", set_initparams, METH_VARARGS, ""},
 	{"get_nodelay", get_nodelay, METH_VARARGS, ""},
 	{"set_nodelay", set_nodelay, METH_VARARGS, ""},
-	{"get_adaption", get_adaption, METH_VARARGS, ""},
-	{"set_adaption", set_adaption, METH_VARARGS, ""},
+	{"get_adaptation", get_adaptation, METH_VARARGS, ""},
+	{"set_adaptation", set_adaptation, METH_VARARGS, ""},
 	{"get_disable_fragments", get_disable_fragments, METH_VARARGS, ""},
 	{"set_disable_fragments", set_disable_fragments, METH_VARARGS, ""},
 	{"get_events", get_events, METH_VARARGS, ""},
@@ -206,7 +205,7 @@ static ktuple _constants[] = 
 	{"SCTP_REMOTE_ERROR", SCTP_REMOTE_ERROR},
 	{"SCTP_SHUTDOWN_EVENT", SCTP_SHUTDOWN_EVENT},
 	{"SCTP_PARTIAL_DELIVERY_EVENT", SCTP_PARTIAL_DELIVERY_EVENT}, 
-	{"SCTP_ADAPTION_INDICATION", SCTP_ADAPTION_INDICATION},
+	{"SCTP_ADAPTATION_INDICATION", SCTP_ADAPTATION_INDICATION},
 	{0, -1}
 };
 
@@ -299,7 +298,7 @@ static PyObject* get_mappedv4(PyObject* 
 {
 	PyObject* ret = 0;
 	int fd, v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	if (PyArg_ParseTuple(args, "i", &fd)) {
 		if (getsockopt(fd, SOL_SCTP, SCTP_I_WANT_MAPPED_V4_ADDR, &v, &lv)) {
 			PyErr_SetFromErrno(PyExc_IOError);
@@ -328,7 +327,7 @@ static PyObject* get_nodelay(PyObject* d
 {
 	PyObject* ret = 0;
 	int fd, v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	if (PyArg_ParseTuple(args, "i", &fd)) {
 		if (getsockopt(fd, SOL_SCTP, SCTP_NODELAY, &v, &lv)) {
 			PyErr_SetFromErrno(PyExc_IOError);
@@ -360,7 +359,7 @@ static PyObject* get_assocparams(PyObjec
 	PyObject* oassoc_id;
 	int fd;
 	struct sctp_assocparams v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	int ok;
 	
 	ok = PyArg_ParseTuple(args, "iO", &fd, &dict) && PyDict_Check(dict);
@@ -456,7 +455,7 @@ static PyObject* get_paddrparams(PyObjec
 	int slen_dummy;
 
 	struct sctp_paddrparams v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	int ok;
 	
 	ok = PyArg_ParseTuple(args, "iO", &fd, &dict) && PyDict_Check(dict);
@@ -580,7 +579,7 @@ static PyObject* get_status(PyObject* du
 
 	int fd;
 	struct sctp_status v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	int ok;
 	
 	ok = PyArg_ParseTuple(args, "iOO", &fd, &dict, &dict2) && \
@@ -641,7 +640,7 @@ static PyObject* get_paddrinfo(PyObject*
 	int fd;
 	int slen_dummy;
 	struct sctp_paddrinfo v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	int ok;
 	
 	ok = PyArg_ParseTuple(args, "iO", &fd, &dict) && PyDict_Check(dict);
@@ -682,7 +681,7 @@ static PyObject* get_rtoinfo(PyObject* d
 	PyObject* oassoc_id;
 	int fd;
 	struct sctp_rtoinfo v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	int ok;
 	
 	ok = PyArg_ParseTuple(args, "iO", &fd, &dict) && PyDict_Check(dict);
@@ -758,7 +757,7 @@ static PyObject* get_initparams(PyObject
 	PyObject* ret = 0;
 	int fd;
 	struct sctp_initmsg v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 
 	if (! PyArg_ParseTuple(args, "i", &fd)) {
 		return ret;
@@ -834,7 +833,7 @@ static PyObject* get_events(PyObject* du
 	PyObject* ret = 0;
 	int fd;
 	struct sctp_event_subscribe v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 
 	if (PyArg_ParseTuple(args, "i", &fd)) {
 		if (getsockopt(fd, SOL_SCTP, SCTP_EVENTS, &v, &lv)) {
@@ -848,7 +847,7 @@ static PyObject* get_events(PyObject* du
 			PyDict_SetItemString(ret, "_peer_error", PyBool_FromLong(v.sctp_peer_error_event));
 			PyDict_SetItemString(ret, "_shutdown", PyBool_FromLong(v.sctp_shutdown_event));
 			PyDict_SetItemString(ret, "_partial_delivery", PyBool_FromLong(v.sctp_partial_delivery_event));
-			PyDict_SetItemString(ret, "_adaption_layer", PyBool_FromLong(v.sctp_adaption_layer_event));
+			PyDict_SetItemString(ret, "_adaptation_layer", PyBool_FromLong(v.sctp_adaptation_layer_event));
 		}
 	}
 	return ret;
@@ -859,7 +858,7 @@ static PyObject* set_events(PyObject* du
 	PyObject* ret = 0;
 	int fd;
 	PyObject *ov, *o_data_io, *o_association, *o_address, *o_send_failure;
-	PyObject *o_peer_error, *o_shutdown, *o_partial_delivery, *o_adaption_layer;
+	PyObject *o_peer_error, *o_shutdown, *o_partial_delivery, *o_adaptation_layer;
 	struct sctp_event_subscribe v;
 	int ok = PyArg_ParseTuple(args, "iO", &fd, &ov) && PyDict_Check(ov);
 
@@ -870,7 +869,7 @@ static PyObject* set_events(PyObject* du
 	ok = ok && (o_peer_error = PyDict_GetItemString(ov, "_peer_error"));
 	ok = ok && (o_shutdown = PyDict_GetItemString(ov, "_shutdown"));
 	ok = ok && (o_partial_delivery = PyDict_GetItemString(ov, "_partial_delivery"));
-	ok = ok && (o_adaption_layer = PyDict_GetItemString(ov, "_adaption_layer"));
+	ok = ok && (o_adaptation_layer = PyDict_GetItemString(ov, "_adaptation_layer"));
 
 	ok = ok && (PyInt_Check(o_data_io) != 0);
 	ok = ok && (PyInt_Check(o_association) != 0);
@@ -879,7 +878,7 @@ static PyObject* set_events(PyObject* du
 	ok = ok && (PyInt_Check(o_peer_error) != 0);
 	ok = ok && (PyInt_Check(o_shutdown) != 0);
 	ok = ok && (PyInt_Check(o_send_failure) != 0);
-	ok = ok && (PyInt_Check(o_adaption_layer) != 0);
+	ok = ok && (PyInt_Check(o_adaptation_layer) != 0);
 
 	if (ok) {
 		memset(&v, 0, sizeof(v));
@@ -890,7 +889,7 @@ static PyObject* set_events(PyObject* du
 		v.sctp_peer_error_event = PyInt_AsLong(o_peer_error);
 		v.sctp_shutdown_event = PyInt_AsLong(o_shutdown);
 		v.sctp_partial_delivery_event = PyInt_AsLong(o_partial_delivery);
-		v.sctp_adaption_layer_event = PyInt_AsLong(o_adaption_layer);
+		v.sctp_adaptation_layer_event = PyInt_AsLong(o_adaptation_layer);
 		
 		if (setsockopt(fd, SOL_SCTP, SCTP_EVENTS, &v, sizeof(v))) {
 			PyErr_SetFromErrno(PyExc_IOError);
@@ -905,7 +904,7 @@ static PyObject* get_maxseg(PyObject* du
 {
 	PyObject* ret = 0;
 	int fd, v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 
 	if (PyArg_ParseTuple(args, "i", &fd)) {
 		if (getsockopt(fd, SOL_SCTP, SCTP_MAXSEG, &v, &lv)) {
@@ -936,7 +935,7 @@ static PyObject* get_disable_fragments(P
 {
 	PyObject* ret = 0;
 	int fd, v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 
 	if (PyArg_ParseTuple(args, "i", &fd)) {
 		if (getsockopt(fd, SOL_SCTP, SCTP_DISABLE_FRAGMENTS, &v, &lv)) {
@@ -967,7 +966,7 @@ static PyObject* get_autoclose(PyObject*
 {
 	PyObject* ret = 0;
 	int fd, v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 
 	if (PyArg_ParseTuple(args, "i", &fd)) {
 		if (getsockopt(fd, SOL_SCTP, SCTP_AUTOCLOSE, &v, &lv)) {
@@ -994,14 +993,14 @@ static PyObject* set_autoclose(PyObject*
 	return ret;
 }
 
-static PyObject* get_adaption(PyObject* dummy, PyObject* args)
+static PyObject* get_adaptation(PyObject* dummy, PyObject* args)
 {
 	PyObject* ret = 0;
 	int fd, v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	
 	if (PyArg_ParseTuple(args, "i", &fd)) {
-		if (getsockopt(fd, SOL_SCTP, SCTP_ADAPTION_LAYER, &v, &lv)) {
+		if (getsockopt(fd, SOL_SCTP, SCTP_ADAPTATION_LAYER, &v, &lv)) {
 			PyErr_SetFromErrno(PyExc_IOError);
 		} else {
 			ret = PyInt_FromLong(v);
@@ -1010,13 +1009,13 @@ static PyObject* get_adaption(PyObject* 
 	return ret;
 }
 
-static PyObject* set_adaption(PyObject* dummy, PyObject* args)
+static PyObject* set_adaptation(PyObject* dummy, PyObject* args)
 {
 	PyObject* ret = 0;
 	int fd, v;
 
 	if (PyArg_ParseTuple(args, "ii", &fd, &v)) {
-		if (setsockopt(fd, SOL_SCTP, SCTP_ADAPTION_LAYER, &v, sizeof(v))) {
+		if (setsockopt(fd, SOL_SCTP, SCTP_ADAPTATION_LAYER, &v, sizeof(v))) {
 			PyErr_SetFromErrno(PyExc_IOError);
 		} else {
 			ret = Py_None; Py_INCREF(ret);
@@ -1522,10 +1521,10 @@ void interpret_notification(PyObject* di
 		PyDict_SetItemString(dict, "assoc_id", PyInt_FromLong(n->pdapi_assoc_id));
 		}
 		break;
-	case SCTP_ADAPTION_INDICATION:
+	case SCTP_ADAPTATION_INDICATION:
 		{
-		const struct sctp_adaption_event* n = &(notif->sn_adaption_event);
-		PyDict_SetItemString(dict, "adaption_ind", PyInt_FromLong(n->sai_adaption_ind));
+		const struct sctp_adaptation_event* n = &(notif->sn_adaptation_event);
+		PyDict_SetItemString(dict, "adaptation_ind", PyInt_FromLong(n->sai_adaptation_ind));
 		PyDict_SetItemString(dict, "assoc_id", PyInt_FromLong(n->sai_assoc_id));
 		}
 		break;
@@ -1537,7 +1536,7 @@ static PyObject* sctp_recv_msg(PyObject*
 	int fd, max_len;
 
 	struct sockaddr_storage sfrom;
-	int sfrom_len = sizeof(sfrom);
+	socklen_t sfrom_len = sizeof(sfrom);
 	int family;
 	int len;
 	int port;
diff -up pysctp-0.3.1/test.py.orig pysctp-0.3.1/test.py
--- pysctp-0.3.1/test.py.orig	2008-04-10 21:30:33.000000000 -0400
+++ pysctp-0.3.1/test.py	2008-04-10 21:30:20.000000000 -0400
@@ -15,8 +15,8 @@ import time
 
 
 
-client = "10.0.1.2"
-server = "10.0.1.1" 
+client = "127.0.0.1"
+server = "127.0.0.1" 
 test_impossible_sending = False
 
 
@@ -68,12 +68,12 @@ tcp.disable_fragments = \
 tcp.mappedv4 = 0
 
 tcp.maxseg = 10001;
-tcp.adaption = 318;
+tcp.adaptation = 318;
 
 if _sctp.get_nodelay(tcp.fileno()) or  \
    _sctp.get_disable_fragments(tcp.fileno()) or \
    _sctp.get_maxseg(tcp.fileno()) != 10001 or \
-   _sctp.get_adaption(tcp.fileno()) != 318 or \
+   _sctp.get_adaptation(tcp.fileno()) != 318 or \
    _sctp.get_mappedv4(tcp.fileno()):
 	raise "Property attribution was not effective"
 
@@ -105,7 +105,7 @@ for s in (tcp, udp, tcp2, udp2):
 	rawparams["_peer_error"] or \
 	rawparams["_shutdown"] or \
 	rawparams["_partial_delivery"] or \
-	rawparams["_adaption_layer"]:
+	rawparams["_adaptation_layer"]:
 		raise "events properties were not effective (in 0)"
 	
 	s.events.data_io = True
@@ -115,7 +115,7 @@ for s in (tcp, udp, tcp2, udp2):
 	s.events.peer_error = True
 	s.events.shutdown = True
 	s.events.partial_delivery = True
-	s.events.adaption_layer = True
+	s.events.adaptation_layer = True
 
 	rawparams = _sctp.get_events(s.fileno())
 
@@ -126,7 +126,7 @@ for s in (tcp, udp, tcp2, udp2):
 	not rawparams["_peer_error"] or \
 	not rawparams["_shutdown"] or \
 	not rawparams["_partial_delivery"] or \
-	not rawparams["_adaption_layer"]:
+	not rawparams["_adaptation_layer"]:
 		raise "events properties were not effective (in 1)"
 
 	s.events.data_io = False
@@ -136,7 +136,7 @@ for s in (tcp, udp, tcp2, udp2):
 	s.events.peer_error = False
 	s.events.shutdown = False
 	s.events.partial_delivery = False
-	s.events.adaption_layer = False
+	s.events.adaptation_layer = False
 
 	rawparams = _sctp.get_events(s.fileno())
 
@@ -147,10 +147,10 @@ for s in (tcp, udp, tcp2, udp2):
 	rawparams["_peer_error"] or \
 	rawparams["_shutdown"] or \
 	rawparams["_partial_delivery"] or \
-	rawparams["_adaption_layer"]:
+	rawparams["_adaptation_layer"]:
 		raise "events properties were not effective (in 0)"
 		
-ipv4 = _sctp._sockaddr_test(("10.00.1.01", 1234))
+ipv4 = _sctp._sockaddr_test(("10.0.1.1", 1234))
 ipv6 = _sctp._sockaddr_test(("FE80::0:0:34", 65534))
 
 if ipv4[3] != ("10.0.1.1", 1234):


--- NEW FILE python-pysctp.spec ---
%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")

Name:		python-pysctp 
Version:	0.3.1
Release:	3%{?dist}
Summary:	Python sctp socket api extensions bindings
Group:		System Environment/Libraries
License:	LGPLv2
URL:		http://epx.com.br/pysctp/
Source0:	http://epx.com.br/pysctp/pysctp-%{version}.tar.gz
Source1:	setup.py
Source2:	__init__.py
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	python lksctp-tools-devel 
BuildRequires:  python-setuptools-devel lksctp-tools-devel

Patch0: pysctp-buildfix.patch

%description
Python bindings for the SCTP socket api (see draft-ietf-tsvwg-sctpsocket-10.txt)

%prep
%setup -q -n pysctp-%{version}
%patch0 -p1
mkdir ./pysctp
cp %{SOURCE1} . 
cp %{SOURCE2} ./pysctp
mv ./sctp.py ./pysctp

%build
FLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{python_sitearch}/*
%doc README Changelog doc/draft-ietf-tsvwg-sctpsocket-10.txt

%changelog
* Wed Sep 10 2008 Neil Horman <nhorman at tuxdriver.com> 0.3-1-3 
- Fixed files section, last minute pre-import fixes

* Wed Sep 10 2008 Neil Horman <nhorman at tuxdriver.com> 0.3.1-2
- Updated spec file with documentation

* Thu Apr 10 2008 Neil Horman <nhorman at tuxdriver.com> 0.3.1-1
- Initial build


--- NEW FILE setup.py ---
# distutils build script
# To install fuse-python, run 'python setup.py install'

# This setup.py based on that of shout-python (py bindings for libshout,
# part of the icecast project, http://svn.xiph.org/icecast/trunk/shout-python)

try:
    from setuptools import setup
    from setuptools.dist import Distribution
except ImportError:
    from distutils.core import setup
    from distutils.dist import Distribution
from distutils.core import Extension
import os
import sys
from pysctp import __version__

classifiers = """\
Development Status :: 4 - Beta
Intended Audience :: Developers
License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)
Operating System :: POSIX
Programming Language :: C
Programming Language :: Python
Topic :: System :: Libraries 
"""

class MyDistribution(Distribution):
    """
    Obnoxious hack to enforce the packager to generate
    the to-be-generated files
    """

    def run_command(self, command):
        if command == 'sdist':
            for f in ('Changelog'):
                 if not os.path.exists(f):
                     raise RuntimeError, 'file ' + `f` + \
                           " doesn't exist, please generate it before creating a source distribution"

        return Distribution.run_command(self, command)

cflags = "-Wall -I/usr/include/python$(PYTHON_VERSION) -fPIC"
# there must be an easier way to set up these flags!
iflags = [x[2:] for x in cflags.split() if x[0:2] == '-I']
extra_cflags = [x for x in cflags.split() if x[0:2] != '-I']
libdirs = []
libsonly = ['sctp'] 

try:
    import thread
except ImportError:
    # if our Python doesn't have thread support, we enforce
    # linking against libpthread so that libfuse's pthread
    # related symbols won't be undefined
    libsonly.append("pthread")

# include_dirs=[]
# libraries=[]
# runtime_library_dirs=[]
# extra_objects, extra_compile_args, extra_link_args
pysctpmodule = Extension('pysctp/_sctp', sources = ['_sctp.c'],
                  include_dirs = iflags,
                  extra_compile_args = extra_cflags,
                  library_dirs = libdirs,
                  libraries = libsonly)

setup (name = 'pysctp',
       description = 'Pyton bindings for SCTP protocol',
       classifiers = filter(None, classifiers.split("\n")),
       version = __version__,
       license = 'LGPL',
       platforms = ['posix'],
       url = 'http//epx.com.br/pysctp/index.php',
       author = 'Elvis Pfutzenreuter',
       author_email = 'epx at altoriopreto.com.br',
       maintainer = 'Neil Horman',
       maintainer_email = 'nhorman at tuxdriver.com',
       packages = ["pysctp"],
       ext_modules = [ pysctpmodule ],
       py_modules=[],
       distclass = MyDistribution)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-pysctp/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 00:03:21 -0000	1.1
+++ .cvsignore	11 Sep 2008 17:49:18 -0000	1.2
@@ -0,0 +1 @@
+pysctp-0.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-pysctp/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 00:03:21 -0000	1.1
+++ sources	11 Sep 2008 17:49:18 -0000	1.2
@@ -0,0 +1 @@
+7fd43fa7a7f31cff557d0a69fa751e5f  pysctp-0.3.1.tar.gz



From scop at fedoraproject.org  Thu Sep 11 18:20:09 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 11 Sep 2008 18:20:09 +0000 (UTC)
Subject: rpms/bash-completion/devel bash-completion-20060301-getent.patch,
	NONE, 1.1 bash-completion-20060301-gzip.patch, NONE,
	1.1 bash-completion-20060301-lzma.patch, NONE,
	1.1 bash-completion-20060301-rpm-backups.patch, NONE,
	1.1 bash-completion-20060301-rpm-eval.patch, NONE,
	1.1 bash-completion-20060301-sqlite.patch, NONE,
	1.1 bash-completion-lzop, NONE,
	1.1 bash-completion-20060301-debian.patch, 1.1,
	1.2 bash-completion.spec, 1.28, 1.29
Message-ID: <20080911182009.AC6BD70131@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1919/devel

Modified Files:
	bash-completion-20060301-debian.patch bash-completion.spec 
Added Files:
	bash-completion-20060301-getent.patch 
	bash-completion-20060301-gzip.patch 
	bash-completion-20060301-lzma.patch 
	bash-completion-20060301-rpm-backups.patch 
	bash-completion-20060301-rpm-eval.patch 
	bash-completion-20060301-sqlite.patch bash-completion-lzop 
Log Message:
* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-13
- Borrow/improve/adapt to Fedora some patches from Mandriva: improved support
  for getent and rpm --eval, better rpm backup file avoidance, lzma support.
- Patch/unpatch to fix gzip and bzip2 options completion.
- Patch to add --rsyncable to gzip options completion.
- Add and trigger-install support for lzop.
- Associate *.sqlite with sqlite3.


bash-completion-20060301-getent.patch:

--- NEW FILE bash-completion-20060301-getent.patch ---
diff -up bash_completion/bash_completion~ bash_completion/bash_completion
--- bash_completion/bash_completion~	2006-03-01 18:20:18.000000000 +0200
+++ bash_completion/bash_completion	2008-09-07 12:25:42.000000000 +0300
@@ -8379,19 +8379,19 @@ _getent()
 			COMPREPLY=( $( compgen -A hostname $cur  ) )
 			return 0
 			;;
-		protocols)
-			COMPREPLY=( $( getent protocols | awk '{print $1}' | grep "^$cur" ) )
+		protocols|networks|ahosts|ahostsv4|ahostsv6|rpc)
+			COMPREPLY=( $( getent $prev | awk '{print $1}' | grep "^$cur" ) )
 			return 0
 			;;
-		networks)
-			COMPREPLY=( $( getent networks | awk '{print $1}' | grep "^$cur" ) )
+		aliases|shadow)
+			COMPREPLY=( $( getent $prev | cut -d : -f 1 | grep "^$cur" ) )
 			return 0
 			;;
 	esac
 
 
 	if [ $COMP_CWORD -eq 1 ]; then
-		COMPREPLY=( $( compgen -W 'passwd group hosts services protocols networks' -- $cur ) )
+		COMPREPLY=( $( compgen -W 'passwd group hosts services protocols networks ahosts ahostsv4 ahostsv6 aliases ethers netgroup rpc shadow' -- $cur ) )
 	fi
 } &&
 complete -F _getent getent

bash-completion-20060301-gzip.patch:

--- NEW FILE bash-completion-20060301-gzip.patch ---
diff -up bash_completion/bash_completion~ bash_completion/bash_completion
--- bash_completion/bash_completion~	2006-03-01 18:20:18.000000000 +0200
+++ bash_completion/bash_completion	2008-09-11 01:29:49.000000000 +0300
@@ -3281,7 +3281,7 @@ complete -F _mysqladmin mysqladmin
 have gzip &&
 _gzip()
 {
-	local cur prev xspec IFS=$'\t\n'
+	local cur prev xspec
 
 	COMPREPLY=()
 	cur=${COMP_WORDS[COMP_CWORD]}
@@ -3290,7 +3290,7 @@ _gzip()
 			--stdout --decompress --force --help --list \
 			--license --no-name --name --quiet --recursive \
 			--suffix --test --verbose --version --fast \
-			--best' -- $cur ) )
+			--best --rsyncable' -- $cur ) )
 		return 0
 	fi
 

bash-completion-20060301-lzma.patch:

--- NEW FILE bash-completion-20060301-lzma.patch ---
diff -up bash_completion/bash_completion~ bash_completion/bash_completion
--- bash_completion/bash_completion~	2006-03-01 18:20:18.000000000 +0200
+++ bash_completion/bash_completion	2008-09-10 19:02:25.000000000 +0300
@@ -796,7 +796,7 @@ _man()
 	# weed out directory path names and paths to man pages
 	COMPREPLY=( ${COMPREPLY[@]##*/?(:)} )
 	# strip suffix from man pages
-	COMPREPLY=( ${COMPREPLY[@]%.@(gz|bz2)} )
+	COMPREPLY=( ${COMPREPLY[@]%.@(gz|bz2|lzma)} )
 	COMPREPLY=( $( compgen -W '${COMPREPLY[@]%.*}' -- "${cur//\\\\/}" ) )
 
 	[[ "$prev" != [0-9ln] ]] && _filedir '[0-9ln]'
@@ -1971,7 +1971,7 @@ _rpm()
 		elif [[ ${COMP_WORDS[1]} == -b* ]]; then
 			_filedir 'spec'
 		else
-			_filedir '@(tgz|tar.@(gz|bz2))'
+			_filedir '@(tgz|tar.@(gz|bz2|lzma))'
 		fi
 		;;
 	--re@(build|compile))
@@ -1983,7 +1983,7 @@ _rpm()
 		fi
 		;;
 	--tarbuild)
-		_filedir '@(tgz|tar.@(gz|bz2))'
+		_filedir '@(tgz|tar.@(gz|bz2|lzma))'
 		;;
 	--@(re|add)sign)
 		_filedir 'rpm'
@@ -3356,6 +3356,44 @@ _bzip2()
 } &&
 complete -F _bzip2 $filenames bzip2
 
+# lzma(1) completion
+#
+have lzma &&
+_lzma()
+{
+	local cur prev xspec
+
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+
+	if [[ "$cur" == -* ]]; then
+		COMPREPLY=( $( compgen -W '-c -d -f -h -k -L -q -s \
+			-v -V -z -1 -2 -3 -4 -5 -6 -7 -8 -9 \
+			--help --decompress --compress --keep --force \
+			--test --stdout --quiet --verbose --license \
+			--version --small --fast --best --text' -- $cur ) )
+		return 0
+	fi
+
+	xspec="*.lzma"
+	if [[ "$prev" == --* ]]; then
+		[[ "$prev" == --decompress || \
+			"$prev" == --list || \
+			"$prev" == --test ]] && xspec="!"$xspec
+		[[ "$prev" == --compress ]] && xspec=
+	elif [[ "$prev" == -* ]]; then
+		[[ "$prev" == -*[dt]* ]] && xspec="!"$xspec
+		[[ "$prev" == -*z* ]] && xspec=
+	fi
+
+	_expand || return 0
+
+	COMPREPLY=( $( compgen -f -X "$xspec" -- $cur ) \
+		$( compgen -d -- $cur ) )
+} &&
+complete -F _lzma $filenames lzma
+
 # openssl(1) completion
 #
 have openssl && {
@@ -6968,7 +7006,7 @@ _info()
 		fi;
 	done  
 	# strip suffix from info pages
-	COMPREPLY=( ${COMPREPLY[@]%.@(gz|bz2)} )
+	COMPREPLY=( ${COMPREPLY[@]%.@(gz|bz2|lzma)} )
 	COMPREPLY=( $( compgen -W '${COMPREPLY[@]%.*}' -- "${cur//\\\\/}" ) )
 
 	return 0

bash-completion-20060301-rpm-backups.patch:

--- NEW FILE bash-completion-20060301-rpm-backups.patch ---
diff -up bash_completion/bash_completion~ bash_completion/bash_completion
--- bash_completion/bash_completion~	2006-03-01 18:20:18.000000000 +0200
+++ bash_completion/bash_completion	2008-09-07 12:12:11.000000000 +0300
@@ -348,10 +348,10 @@ _services()
 	local sysvdir famdir
 	[ -d /etc/rc.d/init.d ] && sysvdir=/etc/rc.d/init.d || sysvdir=/etc/init.d
 	famdir=/etc/xinetd.d
-	COMPREPLY=( $( builtin echo $sysvdir/!(*.rpmsave|*.rpmorig|*~|functions)) )
+	COMPREPLY=( $( builtin echo $sysvdir/!(*.rpmsave|*.rpmorig|*.rpmnew|*~|functions)) )
 
 	if [ -d $famdir ]; then
-		COMPREPLY=( ${COMPREPLY[@]} $( builtin echo $famdir/!(*.rpmsave|*.rpmorig|*~)) )
+		COMPREPLY=( ${COMPREPLY[@]} $( builtin echo $famdir/!(*.rpmsave|*.rpmorig|*.rpmnew|*~)) )
 	fi
 
 	COMPREPLY=( $( compgen -W '${COMPREPLY[@]#@($sysvdir|$famdir)/}' -- $cur ) )
@@ -8679,7 +8679,7 @@ _update_rc_d()
     [ -d /etc/rc.d/init.d ] && sysvdir=/etc/rc.d/init.d \
 	|| sysvdir=/etc/init.d
 
-    services=( $(echo $sysvdir/!(README*|*.sh|*.dpkg*|*.rpm*)) )
+    services=( $(echo $sysvdir/!(README*|*.sh|*.dpkg*|*.rpmsave|*.rpmorig|*.rpmnew)) )
     services=( ${services[@]#$sysvdir/} )
     options=( -f -n )
 
@@ -8745,7 +8745,7 @@ _invoke_rc_d()
     [ -d /etc/rc.d/init.d ] && sysvdir=/etc/rc.d/init.d \
 	|| sysvdir=/etc/init.d
 
-    services=( $(echo $sysvdir/!(README*|*.sh|*.dpkg*|*.rpm*)) )
+    services=( $(echo $sysvdir/!(README*|*.sh|*.dpkg*|*.rpmsave|*.rpmorig|*.rpmnew)) )
     services=( ${services[@]#$sysvdir/} )
     options=( --help --quiet --force --try-anyway --disclose-deny --query --no-fallback )
 
@@ -9281,7 +9281,7 @@ unset list
 if [ -d $BASH_COMPLETION_DIR -a -r $BASH_COMPLETION_DIR -a \
      -x $BASH_COMPLETION_DIR ]; then
 	for i in $BASH_COMPLETION_DIR/*; do
-		[[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|.rpm*) ]] &&
+		[[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpmsave|*.rpmorig|*.rpmnew) ]] &&
 			[ \( -f $i -o -h $i \) -a -r $i ] && . $i
 	done
 fi

bash-completion-20060301-rpm-eval.patch:

--- NEW FILE bash-completion-20060301-rpm-eval.patch ---
diff -up bash_completion/bash_completion~ bash_completion/bash_completion
--- bash_completion/bash_completion~	2006-03-01 18:20:18.000000000 +0200
+++ bash_completion/bash_completion	2008-09-07 12:34:55.000000000 +0300
@@ -1809,7 +1809,7 @@ _rpm()
 			--import' -- $cur ) )
 			;;
 		*)
-			COMPREPLY=( $( compgen -W '-b -e -F -i -q -t -U -V' \
+			COMPREPLY=( $( compgen -W '-b -e -E -F -i -q -t -U -V' \
 				       -- $cur ) )
 			;;
 		esac
@@ -1822,10 +1822,10 @@ _rpm()
 		_filedir -d
 		return 0
 		;;
-	--eval)
+	--eval|-E)
 		# get a list of macros
 		COMPREPLY=( $( sed -ne 's|^\(%'${cur#\%}'[^ '$'\t'']*\).*$|\1|p' \
-			       /usr/lib/rpm/macros ) )
+			       /usr/lib/rpm/macros /usr/lib/rpm/redhat/macros /etc/rpm/*macros ~/.rpmmacros ) )
 		return 0
 		;;
 	--pipe)

bash-completion-20060301-sqlite.patch:

--- NEW FILE bash-completion-20060301-sqlite.patch ---
diff -up bash_completion/bash_completion~ bash_completion/bash_completion
--- bash_completion/bash_completion~	2006-03-01 18:20:18.000000000 +0200
+++ bash_completion/bash_completion	2008-09-07 13:33:40.000000000 +0300
@@ -115,6 +115,7 @@ complete -f -X '!*.@(sxd|std|sda|sdd|odg
 complete -f -X '!*.@(sxm|smf|mml|odf)' oomath
 complete -f -X '!*.odb' oobase
 complete -f -X '!*.rpm' rpm2cpio
+complete -f -X '!*.sqlite' sqlite3
 # FINISH exclude -- do not remove this line
 
 # start of section containing compspecs that can be handled within bash


--- NEW FILE bash-completion-lzop ---
# bash completion for lzop(1)                                        -*- sh -*-
#
have lzop &&
_lzop()
{
	local cur prev xspec IFS=$' \t\n'

	COMPREPLY=()
	cur=${COMP_WORDS[COMP_CWORD]}
	prev=${COMP_WORDS[COMP_CWORD-1]}

	if [[ "$cur" == -* ]]; then
		COMPREPLY=( $( compgen -W '-d -x -l -I -t -V -h -L -q -v -c \
			-o -p -f -n -N -P -S -U	-1 -2 -3 -4 -5 -6 -7 -8 -9 \
			--fast --best --decompress --uncompress --extract \
			--test --list --ls --info --sysinfo --license --help \
			--version --stdout --output --path --force --no-name \
			--no-checksum --name --no-mode --no-time --suffix \
			--keep --unlink --delete --crc32 --no-warn --quiet \
			--silent --ignore-warn --verbose --no-stdin --filter \
			--checksum --no-color --mono --color' -- $cur ) )
		return 0
	fi

	xspec="*.?(t)lzo"
	if [[ "$prev" == --* ]]; then
		[[ "$prev" == --@(de|un)compress || \
			"$prev" == --list || \
			"$prev" == --test ]] && xspec="!"$xspec
		[[ "$prev" == --force ]] && xspec=
	elif [[ "$prev" == -* ]]; then
		[[ "$prev" == -*[dlt]* ]] && xspec="!"$xspec
		[[ "$prev" == -*f* ]] && xspec=
	elif [ "$prev" = '>' ]; then
		xspec=
	fi

	_expand || return 0

	COMPREPLY=( $( compgen -f -X "$xspec" -- $cur ) \
		    $( compgen -d -- $cur ) )
} &&
complete -F _lzop $filenames lzop

bash-completion-20060301-debian.patch:

Index: bash-completion-20060301-debian.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion-20060301-debian.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-completion-20060301-debian.patch	27 Feb 2007 23:38:43 -0000	1.1
+++ bash-completion-20060301-debian.patch	11 Sep 2008 18:20:09 -0000	1.2
@@ -9,12 +9,3 @@
  
  # renice(8) completion
  #
-@@ -3325,7 +3323,7 @@
- have bzip2 &&
- _bzip2()
- {
--	local cur prev xspec
-+	local cur prev xspec IFS=$'\t\n'
- 
- 	COMPREPLY=()
- 	cur=${COMP_WORDS[COMP_CWORD]}


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- bash-completion.spec	23 Jul 2008 17:10:07 -0000	1.28
+++ bash-completion.spec	11 Sep 2008 18:20:09 -0000	1.29
@@ -1,12 +1,13 @@
 Name:           bash-completion
 Version:        20060301
-Release:        12
+Release:        13
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
 License:        GPLv2+
 URL:            http://www.caliban.org/bash/
 Source0:        http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2
+Source1:        %{name}-lzop
 Source2:        %{name}-mock
 Source3:        %{name}-repomanage
 Source4:        %{name}-plague-client
@@ -16,6 +17,12 @@
 Patch3:         %{name}-20060301-jpeg2000-304771.patch
 Patch4:         %{name}-20060301-mediafiles-444467.patch
 Patch5:         %{name}-20060301-svn-filenames-430059.patch
+Patch6:         %{name}-20060301-gzip.patch
+Patch7:         %{name}-20060301-lzma.patch
+Patch8:         %{name}-20060301-rpm-backups.patch
+Patch9:         %{name}-20060301-rpm-eval.patch
+Patch10:        %{name}-20060301-getent.patch
+Patch11:        %{name}-20060301-sqlite.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,7 +41,14 @@
 %patch3
 %patch4
 %patch5
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
+install -pm 644 %{SOURCE1} contrib/lzop
 install -pm 644 %{SOURCE2} contrib/mock
 install -pm 644 %{SOURCE3} contrib/repomanage
 install -pm 644 %{SOURCE4} contrib/plague-client
@@ -114,6 +128,11 @@
 %triggerun -- lilypond
 %do_triggerun lilypond
 
+%triggerin -- lzop
+%do_triggerin lzop
+%triggerun -- lzop
+%do_triggerun lzop
+
 %triggerin -- mailman
 %do_triggerin mailman
 %triggerun -- mailman
@@ -200,6 +219,14 @@
 
 
 %changelog
+* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-13
+- Borrow/improve/adapt to Fedora some patches from Mandriva: improved support
+  for getent and rpm --eval, better rpm backup file avoidance, lzma support.
+- Patch/unpatch to fix gzip and bzip2 options completion.
+- Patch to add --rsyncable to gzip options completion.
+- Add and trigger-install support for lzop.
+- Associate *.sqlite with sqlite3.
+
 * Wed Jul 23 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-12
 - Fix plague-client completion install (#456355, Ricky Zhou).
 - Trigger-install support for sitecopy.



From terjeros at fedoraproject.org  Thu Sep 11 17:41:16 2008
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Thu, 11 Sep 2008 17:41:16 +0000 (UTC)
Subject: rpms/xosview/F-9 XOsview.png, NONE,
	1.1 xosview-1.8.3-app-defaults.patch, NONE,
	1.1 xosview-1.8.3-disable-flags.patch, NONE, 1.1 xosview.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080911174116.BECD970131@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/xosview/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21743/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	XOsview.png xosview-1.8.3-app-defaults.patch 
	xosview-1.8.3-disable-flags.patch xosview.spec 
Log Message:
Sync with rawhide.



xosview-1.8.3-app-defaults.patch:

--- NEW FILE xosview-1.8.3-app-defaults.patch ---
diff -uNr -x '*~' xosview-1.8.3.cvs/config/Makefile.top.in xosview-1.8.3/config/Makefile.top.in
--- xosview-1.8.3.cvs/config/Makefile.top.in	2008-04-03 19:20:54.000000000 +0200
+++ xosview-1.8.3/config/Makefile.top.in	2008-04-03 19:22:05.000000000 +0200
@@ -49,7 +49,7 @@
 PREFIX_TO_USE=@prefix@
 BINDIR=$(PREFIX_TO_USE)/bin
 MANDIR=$(PREFIX_TO_USE)/share/man/man1
-XAPPLOADDIR=$(PREFIX_TO_USE)/lib/X11/app-defaults
+XAPPLOADDIR=$(PREFIX_TO_USE)/share/X11/app-defaults
 PACKAGENAME=xosview-$(VERS)
 DISTRIBDIR=@top_srcdir@/../$(PACKAGENAME)
 
diff -uNr -x '*~' xosview-1.8.3.cvs/Xrm.cc xosview-1.8.3/Xrm.cc
--- xosview-1.8.3.cvs/Xrm.cc	2008-04-03 19:20:55.000000000 +0200
+++ xosview-1.8.3/Xrm.cc	2008-04-03 19:21:43.000000000 +0200
@@ -159,7 +159,7 @@
     XrmQuarkToString(_class));
   if (rfilename != NULL)
     XrmCombineFileDatabase (rfilename, &_db, 1);
-  result = snprintf(rfilename, sizeof rfilename, "/usr/lib/X11/app-defaults/%s",
+  result = snprintf(rfilename, sizeof rfilename, "/usr/share/X11/app-defaults/%s",
     XrmQuarkToString(_class));
   if (result >= 0 && result < (int)sizeof(rfilename))
     XrmCombineFileDatabase (rfilename, &_db, 1);

xosview-1.8.3-disable-flags.patch:

--- NEW FILE xosview-1.8.3-disable-flags.patch ---
--- xosview-1.8.3/config/aclocal.m4~	2008-04-07 21:54:43.000000000 +0200
+++ xosview-1.8.3/config/aclocal.m4	2008-04-07 21:55:52.000000000 +0200
@@ -55,7 +55,7 @@
 
 dnl	For gcc-based (or primarily-gcc) OS's, set EXTRA_CXXFLAGS to -Wall -O4
 AC_DEFUN(AC_GCC_EXTRA_CXXFLAGS, [
-	EXTRA_CXXFLAGS="-W -Wall -O3"
+	EXTRA_CXXFLAGS=""
 ])
 
 AC_DEFUN(SMP_LINUX,


--- NEW FILE xosview.spec ---
%define date   20080301

Name:          xosview
Summary:       An X Window System utility for monitoring system resources
Version:       1.8.3
Release:       13.%{date}cvs%{?dist}

Group:         Applications/System
# The netbsd/swapinternal.{cc,h} source files are BSD only (with 
# advertising), but neither file is used in the linux version of 
# xosview.  Instead, the source files used are linux/swapmeter.{cc,h}, 
# both of which fall under the GPL. All other files are either GPL 
# based, or can fall under either the BSD or GPL copyright.
License:       GPL+
URL:           http://xosview.sourceforge.net/

# A snapshot from %{date} of the source was used due to significant changes 
# that have occurred compared to the current release version. 
# $ cvs -z3 -d:pserver:anonymous at xosview.cvs.sourceforge.net:/cvsroot/xosview \
#     co -P -D%{date} xosview 
# $ mv xosview xosview-1.8.3-%{date}
# $ tar czvf xosview-1.8.3-%{date}.tar.gz xosview-1.8.3-%{date}
Source0:       %{name}-%{version}-%{date}.tar.gz

# An old png file is being used for the icon.  It is located at:
Source1:       http://roxos.sunsite.dk/dev-contrib/guido/XOsview.png

Patch0:        xosview-1.8.3-app-defaults.patch
Patch1:        xosview-1.8.3-disable-flags.patch
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: autoconf libXpm-devel libX11-devel desktop-file-utils

%description
The xosview utility displays a set of bar graphs which show the
current system state, including memory usage, CPU usage, system load,
etc. Xosview runs under the X Window System.

%prep
%setup -q -n %{name}-%{version}-%{date}
%patch0 -p1
%patch1 -p1

%build
./autogen.sh

# From redhat-rpm-config 9.0.3-1 (F-10) config.{guess,sub} are
# not overwritten automatically. The original config.{guess,sub}
# do not work on ppc64
#
# The following /usr/lib cannot be %%_libdir !!
%{__cp} -p /usr/lib/rpm/config.{guess,sub} config/

%configure
%{__make} %{?_smp_mflags} all

cat > %{name}.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=OS Resource Viewer
Comment=
Exec=xosview
Terminal=false
Type=Application
Icon=xosview
Categories=Utility;System;
EOF

%install
%{__rm} -rf %{buildroot}
%{__install} -d %{buildroot}%{_bindir}   \
    %{buildroot}%{_mandir}/man1          \
    %{buildroot}%{_datadir}/icons        \
    %{buildroot}%{_datadir}/applications \
    %{buildroot}%{_datadir}/X11/app-defaults

%{__make} install PREFIX_TO_USE=%{buildroot}%{_prefix} INSTALL="%{__install} -p"
%{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/%{name}.png
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc CHANGES COPYING COPYING.GPL README README.linux TODO
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*
%{_datadir}/icons/%{name}.png
%{_datadir}/X11/app-defaults/XOsview
%{_datadir}/applications/%{name}.desktop

%changelog
* Mon Sep  8 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-13.20080301cvs
- Fix license and desktop file

* Mon Sep  8 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-12.20080301cvs
- Drop fedora as vendor
- Use date in cvs checkout

* Tue May 20 2008 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> - 1.8.3-11.20080520cvs
- Pulling icon directly from website

* Tue May 20 2008 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> - 1.8.3-10.20080520cvs
- Added Source1 URL
- Fixed ppc64 config error
- Added -q to %%setup again (deleted by accident in release 9)
- Fixed macros conventions
- Only including README and README.linux files

* Mon May 19 2008 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> - 1.8.3-9.20080519cvs
- Fixed naming guidelines (again)
- Removed CXXFLAGS (redundant)

* Fri Apr 25 2008 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> - 1.8.3.20080425cvs-8
- Clarified BSD vs. GPL License Issue
- Pulling source dirctly from CVS
- Removed CVS patch generation file since current CVS snapshot is used
- Removed COPYING.BSD file (see License Section above for explanation)
- Fixed Post-Release Naming Guidelines
- Fixed Categories section in Desktop file

* Thu Apr 17 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-7
- Add cvs patch generation info

* Mon Apr  7 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-6
- Remove extra build flags

* Thu Apr  3 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-5
- Patches from cvs, remove private patches
- Add app-defaults patch
- Fix license, summary, src url, buildroot and desktop file
- Random clean up

* Wed Feb 20 2008 Chelban Vasile <vchelban at fedoramd.org> 1.8.3-4.prof_k
- BuildRequires: libXpm-devel, libX11-devel
- Removed i386 build restriction

* Sun Dec 16 2007 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> xosview-1.8.3-3.fc8.prof_k
- Fixed man location

* Wed Dec 12 2007 Gregory Kriehn <gkriehn at csufresno.edu> xosview-1.8.3-2.fc8.prof_k
- Cleaned up spec file
- Now includes doc files

* Mon Dec 3 2007 Gregory Kriehn <gkriehn at csufresno.edu> xosview-1.8.3-1.fc8.prof_k
- Recompiled for Fedora 8

* Sun Mar 26 2006 Ron Yorston <rmy at tigress.co.uk> 1.8.3-1.tig1.fc5
- fixes to compile with modular X on FC5

* Wed Jan  2 2005 Ron Yorston <rmy at tigress.co.uk> 1.8.2-1.tig1
- backport from FC3 to RHEL3
- change default reosurce for CPU to 'cpuGraph: False'

* Mon Jul 19 2004 Than Ngo <than at redhat.com> 1.8.2-1
- update to 1.8.2
- remove all patches, which are included in new upstream
- bug #126432, #124156, #124569, #124896

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed May 19 2004 Than Ngo <than at redhat.com> 1.8.0-21
- fix PAGE/DISK lines with kernel > 2.5, they work again.

* Wed May 19 2004 Than Ngo <than at redhat.com> 1.8.0-20
- fixed build problem with gcc34

* Wed Mar 10 2004 Than Ngo <than at redhat.com> 1.8.0-19
- added nfs traffic

* Tue Feb 24 2004 Than Ngo <than at redhat.com> 1.8.0-18 
- get rid of rpath

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jan 20 2004 Than Ngo <than at redhat.com> 1.8.0-16
- add patch to get xosview working on 2.6 kernel

* Tue Jul 08 2003 Than Ngo <than at redhat.com> 1.8.0-15
- cleanup

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu May 22 2003 Than Ngo <than at redhat.com> 1.8.0-13
- fix build with gcc 3.3

* Wed Apr 30 2003 Elliot Lee <sopwith at redhat.com> 1.8.0-12
- Fix powerpc64 & ia64 according to the pattern of other non-i386 archs

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Wed Dec 11 2002 Tim Powers <timp at redhat.com> 1.8.0-10
- rebuild on all arches

* Sat Aug 10 2002 Elliot Lee <sopwith at redhat.com>
- rebuilt with gcc-3.2 (we hope)

* Wed Jul 24 2002 Than Ngo <than at redhat.com> 1.8.0-7
- desktop file issue (bug #69551)

* Tue Jul 23 2002 Tim Powers <timp at redhat.com> 1.8.0-6
- build using gcc-3.2-0.1

* Fri Jun 21 2002 Tim Powers <timp at redhat.com> 1.8.0-5
- automated rebuild

* Thu Jun 20 2002 Than Ngo <than at redhat.com> 1.8.0-4
- Don't forcibly strip binaries

* Sun Jun 2 2002 Than Ngo <than at redhat.com> 1.8.0-3
- fix a bug in cpumeter (bug #64798)

* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Wed Apr 24 2002 Karsten Hopp <karsten at redhat.de> 1.8.0-1
- update to current version
- redo .proc patch
- change URLs

* Fri Feb 22 2002 Than Ngo <than at redhat.com> 1.7.3-10
- rebuild in new environment.

* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Tue Dec 18 2001 Than Ngo <than at redhat.com> 1.7.3-8
- xosview +net goes into hard loop (bug #57150)
- add patch for building against g++ 3
- use RPM_OPT_FLAG

* Wed Nov 14 2001 Than Ngo <than at redhat.com> 1.7.3-7
- added missing Icon in desktop file
- fixed Url

* Wed Sep 12 2001 Tim Powers <timp at redhat.com>
- rebuild with new gcc and binutils

* Tue Apr 10 2001 Phil Knirsch <pknirsch at redhat.de>
- Fix for s390 patch to actually work

* Tue Mar 20 2001 Preston Brown <pbrown at redhat.com>
- fix up .desktop entry

* Sun Feb 11 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- fix typo

* Sun Feb 11 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- adjusted s390 patches

* Wed Jan 31 2001 Preston Brown <pbrown at redhat.com>
- upgrade to 1.7.3, fixes (#11380)

* Mon Jan 15 2001 Than Ngo <than at redhat.com>
- ported to ibm s/390

* Tue Jul 25 2000 Jeff Johnson <jbj at redhat.com>
- migrate wmconfig to applnk.

* Fri Jul 14 2000 Jeff Johnson <jbj at redhat.com>
- rebuild the auto-rebuild.
- exclude alpha and i164 for now.

* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Tue Jul  2 2000 Jakub Jelinek <jakub at redhat.com>
- Rebuild with new C++

* Fri Jun  2 2000 Jeff Johnson <jbj at redhat.com>
- rebuild for 7.0

* Mon Feb 14 2000 Matt Wilson <msw at redhat.com>
- rebuild on i386

* Mon Feb  7 2000 Jeff Johnson <jbj at redhat.com>
- compress man pages.

* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
- auto rebuild in the new build environment (release 2)

* Mon Mar  8 1999 Jeff Johnson <jbj at redhat.com>
- updated to 1.7.1.

* Wed Mar  3 1999 Matt Wilson <msw at redhat.com>
- updated to 1.7.0

* Fri Feb  5 1999 Bill Nottingham <notting at redhat.com>
- build against new libstdc++, build on arm

* Tue Dec 22 1998 Jeff Johnson <jbj at redhat.com>
- update to 1.6.2.a.

* Tue Jun 16 1998 Jeff Johnson <jbj at redhat.com>
- add sparc/alpha functionality.
- add %%clean

* Mon Jun 01 1998 Prospector System <bugs at redhat.com>
- translations modified for de

* Mon Jun 01 1998 Erik Troan <ewt at redhat.com>
- how the hell did this get setuid root?

* Thu May 07 1998 Prospector System <bugs at redhat.com>
- translations modified for de, fr, tr

* Wed Apr 29 1998 Cristian Gafton <gafton at redhat.com>
- upgraded to 1.5.1 (so that it compiles with egcs)
- buildroot

* Tue Nov  4 1997 Erik Troan <ewt at redhat.com>
- commented out line causing core dumps when exiting

* Fri Oct 24 1997 Marc Ewing <marc at redhat.com>
- wmconfig

* Fri Aug 22 1997 Erik Troan <ewt at redhat.com>
- built against glibc


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xosview/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 01:05:28 -0000	1.1
+++ .cvsignore	11 Sep 2008 17:40:46 -0000	1.2
@@ -0,0 +1 @@
+xosview-1.8.3-20080301.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xosview/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 01:05:28 -0000	1.1
+++ sources	11 Sep 2008 17:40:46 -0000	1.2
@@ -0,0 +1 @@
+25cf811c5ca77c37baeac6e516a58a66  xosview-1.8.3-20080301.tar.gz



From hadess at fedoraproject.org  Thu Sep 11 18:09:12 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 18:09:12 +0000 (UTC)
Subject: rpms/gstreamer-plugins-flumpegdemux/devel
	gstreamer-plugins-flumpegdemux.spec, 1.1, 1.2
Message-ID: <20080911180912.3604070131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-flumpegdemux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30645

Modified Files:
	gstreamer-plugins-flumpegdemux.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.15-3
- Rebuild for GStreamer RPM provides work



Index: gstreamer-plugins-flumpegdemux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-flumpegdemux/devel/gstreamer-plugins-flumpegdemux.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gstreamer-plugins-flumpegdemux.spec	6 May 2008 22:30:47 -0000	1.1
+++ gstreamer-plugins-flumpegdemux.spec	11 Sep 2008 18:08:42 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: MPEG demuxer for GStreamer
 Name: gstreamer-plugins-flumpegdemux
 Version: 0.10.15
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 License: MPLv1.1
 Group: Applications/Multimedia
 Source0: http://core.fluendo.com/gstreamer/src/gst-fluendo-mpegdemux/gst-fluendo-mpegdemux-%{version}.tar.bz2
@@ -41,6 +41,9 @@
 %{_libdir}/gstreamer-0.10/libgstflumpegdemux.so
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.15-3
+- Rebuild for GStreamer RPM provides work
+
 * Tue May 06 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.15-2
 - Fix some review bugs
 



From hadess at fedoraproject.org  Thu Sep 11 18:05:55 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 18:05:55 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.72,
	1.73
Message-ID: <20080911180555.E570270131@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-serv29533

Modified Files:
	gstreamer-plugins-good.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> 0.10.10-3
- Rebuild for GStreamer RPM provides



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- gstreamer-plugins-good.spec	31 Aug 2008 21:21:05 -0000	1.72
+++ gstreamer-plugins-good.spec	11 Sep 2008 18:05:25 -0000	1.73
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.10
-Release:  	2%{?dist}
+Release:  	3%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -239,6 +239,9 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> 0.10.10-3
+- Rebuild for GStreamer RPM provides
+
 * Sun Aug 31 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.10-2
 - Fix gst-plugins-good-0.10.9-libv4l.patch to not only patch configure.ac
   but also configure so that the libv4l code actually gets enabled



From terjeros at fedoraproject.org  Thu Sep 11 17:31:57 2008
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Thu, 11 Sep 2008 17:31:57 +0000 (UTC)
Subject: rpms/xosview/devel XOsview.png, NONE, 1.1 import.log, NONE,
	1.1 xosview-1.8.3-app-defaults.patch, NONE,
	1.1 xosview-1.8.3-disable-flags.patch, NONE, 1.1 xosview.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080911173157.A291A70131@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/xosview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18698/devel

Modified Files:
	.cvsignore sources 
Added Files:
	XOsview.png import.log xosview-1.8.3-app-defaults.patch 
	xosview-1.8.3-disable-flags.patch xosview.spec 
Log Message:
Importing xosview.




--- NEW FILE import.log ---
xosview-1_8_3-13_20080301cvs_fc9:HEAD:xosview-1.8.3-13.20080301cvs.fc9.src.rpm:1221154151

xosview-1.8.3-app-defaults.patch:

--- NEW FILE xosview-1.8.3-app-defaults.patch ---
diff -uNr -x '*~' xosview-1.8.3.cvs/config/Makefile.top.in xosview-1.8.3/config/Makefile.top.in
--- xosview-1.8.3.cvs/config/Makefile.top.in	2008-04-03 19:20:54.000000000 +0200
+++ xosview-1.8.3/config/Makefile.top.in	2008-04-03 19:22:05.000000000 +0200
@@ -49,7 +49,7 @@
 PREFIX_TO_USE=@prefix@
 BINDIR=$(PREFIX_TO_USE)/bin
 MANDIR=$(PREFIX_TO_USE)/share/man/man1
-XAPPLOADDIR=$(PREFIX_TO_USE)/lib/X11/app-defaults
+XAPPLOADDIR=$(PREFIX_TO_USE)/share/X11/app-defaults
 PACKAGENAME=xosview-$(VERS)
 DISTRIBDIR=@top_srcdir@/../$(PACKAGENAME)
 
diff -uNr -x '*~' xosview-1.8.3.cvs/Xrm.cc xosview-1.8.3/Xrm.cc
--- xosview-1.8.3.cvs/Xrm.cc	2008-04-03 19:20:55.000000000 +0200
+++ xosview-1.8.3/Xrm.cc	2008-04-03 19:21:43.000000000 +0200
@@ -159,7 +159,7 @@
     XrmQuarkToString(_class));
   if (rfilename != NULL)
     XrmCombineFileDatabase (rfilename, &_db, 1);
-  result = snprintf(rfilename, sizeof rfilename, "/usr/lib/X11/app-defaults/%s",
+  result = snprintf(rfilename, sizeof rfilename, "/usr/share/X11/app-defaults/%s",
     XrmQuarkToString(_class));
   if (result >= 0 && result < (int)sizeof(rfilename))
     XrmCombineFileDatabase (rfilename, &_db, 1);

xosview-1.8.3-disable-flags.patch:

--- NEW FILE xosview-1.8.3-disable-flags.patch ---
--- xosview-1.8.3/config/aclocal.m4~	2008-04-07 21:54:43.000000000 +0200
+++ xosview-1.8.3/config/aclocal.m4	2008-04-07 21:55:52.000000000 +0200
@@ -55,7 +55,7 @@
 
 dnl	For gcc-based (or primarily-gcc) OS's, set EXTRA_CXXFLAGS to -Wall -O4
 AC_DEFUN(AC_GCC_EXTRA_CXXFLAGS, [
-	EXTRA_CXXFLAGS="-W -Wall -O3"
+	EXTRA_CXXFLAGS=""
 ])
 
 AC_DEFUN(SMP_LINUX,


--- NEW FILE xosview.spec ---
%define date   20080301

Name:          xosview
Summary:       An X Window System utility for monitoring system resources
Version:       1.8.3
Release:       13.%{date}cvs%{?dist}

Group:         Applications/System
# The netbsd/swapinternal.{cc,h} source files are BSD only (with 
# advertising), but neither file is used in the linux version of 
# xosview.  Instead, the source files used are linux/swapmeter.{cc,h}, 
# both of which fall under the GPL. All other files are either GPL 
# based, or can fall under either the BSD or GPL copyright.
License:       GPL+
URL:           http://xosview.sourceforge.net/

# A snapshot from %{date} of the source was used due to significant changes 
# that have occurred compared to the current release version. 
# $ cvs -z3 -d:pserver:anonymous at xosview.cvs.sourceforge.net:/cvsroot/xosview \
#     co -P -D%{date} xosview 
# $ mv xosview xosview-1.8.3-%{date}
# $ tar czvf xosview-1.8.3-%{date}.tar.gz xosview-1.8.3-%{date}
Source0:       %{name}-%{version}-%{date}.tar.gz

# An old png file is being used for the icon.  It is located at:
Source1:       http://roxos.sunsite.dk/dev-contrib/guido/XOsview.png

Patch0:        xosview-1.8.3-app-defaults.patch
Patch1:        xosview-1.8.3-disable-flags.patch
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: autoconf libXpm-devel libX11-devel desktop-file-utils

%description
The xosview utility displays a set of bar graphs which show the
current system state, including memory usage, CPU usage, system load,
etc. Xosview runs under the X Window System.

%prep
%setup -q -n %{name}-%{version}-%{date}
%patch0 -p1
%patch1 -p1

%build
./autogen.sh

# From redhat-rpm-config 9.0.3-1 (F-10) config.{guess,sub} are
# not overwritten automatically. The original config.{guess,sub}
# do not work on ppc64
#
# The following /usr/lib cannot be %%_libdir !!
%{__cp} -p /usr/lib/rpm/config.{guess,sub} config/

%configure
%{__make} %{?_smp_mflags} all

cat > %{name}.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=OS Resource Viewer
Comment=
Exec=xosview
Terminal=false
Type=Application
Icon=xosview
Categories=Utility;System;
EOF

%install
%{__rm} -rf %{buildroot}
%{__install} -d %{buildroot}%{_bindir}   \
    %{buildroot}%{_mandir}/man1          \
    %{buildroot}%{_datadir}/icons        \
    %{buildroot}%{_datadir}/applications \
    %{buildroot}%{_datadir}/X11/app-defaults

%{__make} install PREFIX_TO_USE=%{buildroot}%{_prefix} INSTALL="%{__install} -p"
%{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/%{name}.png
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc CHANGES COPYING COPYING.GPL README README.linux TODO
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*
%{_datadir}/icons/%{name}.png
%{_datadir}/X11/app-defaults/XOsview
%{_datadir}/applications/%{name}.desktop

%changelog
* Mon Sep  8 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-13.20080301cvs
- Fix license and desktop file

* Mon Sep  8 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-12.20080301cvs
- Drop fedora as vendor
- Use date in cvs checkout

* Tue May 20 2008 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> - 1.8.3-11.20080520cvs
- Pulling icon directly from website

* Tue May 20 2008 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> - 1.8.3-10.20080520cvs
- Added Source1 URL
- Fixed ppc64 config error
- Added -q to %%setup again (deleted by accident in release 9)
- Fixed macros conventions
- Only including README and README.linux files

* Mon May 19 2008 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> - 1.8.3-9.20080519cvs
- Fixed naming guidelines (again)
- Removed CXXFLAGS (redundant)

* Fri Apr 25 2008 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> - 1.8.3.20080425cvs-8
- Clarified BSD vs. GPL License Issue
- Pulling source dirctly from CVS
- Removed CVS patch generation file since current CVS snapshot is used
- Removed COPYING.BSD file (see License Section above for explanation)
- Fixed Post-Release Naming Guidelines
- Fixed Categories section in Desktop file

* Thu Apr 17 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-7
- Add cvs patch generation info

* Mon Apr  7 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-6
- Remove extra build flags

* Thu Apr  3 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-5
- Patches from cvs, remove private patches
- Add app-defaults patch
- Fix license, summary, src url, buildroot and desktop file
- Random clean up

* Wed Feb 20 2008 Chelban Vasile <vchelban at fedoramd.org> 1.8.3-4.prof_k
- BuildRequires: libXpm-devel, libX11-devel
- Removed i386 build restriction

* Sun Dec 16 2007 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> xosview-1.8.3-3.fc8.prof_k
- Fixed man location

* Wed Dec 12 2007 Gregory Kriehn <gkriehn at csufresno.edu> xosview-1.8.3-2.fc8.prof_k
- Cleaned up spec file
- Now includes doc files

* Mon Dec 3 2007 Gregory Kriehn <gkriehn at csufresno.edu> xosview-1.8.3-1.fc8.prof_k
- Recompiled for Fedora 8

* Sun Mar 26 2006 Ron Yorston <rmy at tigress.co.uk> 1.8.3-1.tig1.fc5
- fixes to compile with modular X on FC5

* Wed Jan  2 2005 Ron Yorston <rmy at tigress.co.uk> 1.8.2-1.tig1
- backport from FC3 to RHEL3
- change default reosurce for CPU to 'cpuGraph: False'

* Mon Jul 19 2004 Than Ngo <than at redhat.com> 1.8.2-1
- update to 1.8.2
- remove all patches, which are included in new upstream
- bug #126432, #124156, #124569, #124896

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed May 19 2004 Than Ngo <than at redhat.com> 1.8.0-21
- fix PAGE/DISK lines with kernel > 2.5, they work again.

* Wed May 19 2004 Than Ngo <than at redhat.com> 1.8.0-20
- fixed build problem with gcc34

* Wed Mar 10 2004 Than Ngo <than at redhat.com> 1.8.0-19
- added nfs traffic

* Tue Feb 24 2004 Than Ngo <than at redhat.com> 1.8.0-18 
- get rid of rpath

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jan 20 2004 Than Ngo <than at redhat.com> 1.8.0-16
- add patch to get xosview working on 2.6 kernel

* Tue Jul 08 2003 Than Ngo <than at redhat.com> 1.8.0-15
- cleanup

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu May 22 2003 Than Ngo <than at redhat.com> 1.8.0-13
- fix build with gcc 3.3

* Wed Apr 30 2003 Elliot Lee <sopwith at redhat.com> 1.8.0-12
- Fix powerpc64 & ia64 according to the pattern of other non-i386 archs

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Wed Dec 11 2002 Tim Powers <timp at redhat.com> 1.8.0-10
- rebuild on all arches

* Sat Aug 10 2002 Elliot Lee <sopwith at redhat.com>
- rebuilt with gcc-3.2 (we hope)

* Wed Jul 24 2002 Than Ngo <than at redhat.com> 1.8.0-7
- desktop file issue (bug #69551)

* Tue Jul 23 2002 Tim Powers <timp at redhat.com> 1.8.0-6
- build using gcc-3.2-0.1

* Fri Jun 21 2002 Tim Powers <timp at redhat.com> 1.8.0-5
- automated rebuild

* Thu Jun 20 2002 Than Ngo <than at redhat.com> 1.8.0-4
- Don't forcibly strip binaries

* Sun Jun 2 2002 Than Ngo <than at redhat.com> 1.8.0-3
- fix a bug in cpumeter (bug #64798)

* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Wed Apr 24 2002 Karsten Hopp <karsten at redhat.de> 1.8.0-1
- update to current version
- redo .proc patch
- change URLs

* Fri Feb 22 2002 Than Ngo <than at redhat.com> 1.7.3-10
- rebuild in new environment.

* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Tue Dec 18 2001 Than Ngo <than at redhat.com> 1.7.3-8
- xosview +net goes into hard loop (bug #57150)
- add patch for building against g++ 3
- use RPM_OPT_FLAG

* Wed Nov 14 2001 Than Ngo <than at redhat.com> 1.7.3-7
- added missing Icon in desktop file
- fixed Url

* Wed Sep 12 2001 Tim Powers <timp at redhat.com>
- rebuild with new gcc and binutils

* Tue Apr 10 2001 Phil Knirsch <pknirsch at redhat.de>
- Fix for s390 patch to actually work

* Tue Mar 20 2001 Preston Brown <pbrown at redhat.com>
- fix up .desktop entry

* Sun Feb 11 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- fix typo

* Sun Feb 11 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- adjusted s390 patches

* Wed Jan 31 2001 Preston Brown <pbrown at redhat.com>
- upgrade to 1.7.3, fixes (#11380)

* Mon Jan 15 2001 Than Ngo <than at redhat.com>
- ported to ibm s/390

* Tue Jul 25 2000 Jeff Johnson <jbj at redhat.com>
- migrate wmconfig to applnk.

* Fri Jul 14 2000 Jeff Johnson <jbj at redhat.com>
- rebuild the auto-rebuild.
- exclude alpha and i164 for now.

* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Tue Jul  2 2000 Jakub Jelinek <jakub at redhat.com>
- Rebuild with new C++

* Fri Jun  2 2000 Jeff Johnson <jbj at redhat.com>
- rebuild for 7.0

* Mon Feb 14 2000 Matt Wilson <msw at redhat.com>
- rebuild on i386

* Mon Feb  7 2000 Jeff Johnson <jbj at redhat.com>
- compress man pages.

* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
- auto rebuild in the new build environment (release 2)

* Mon Mar  8 1999 Jeff Johnson <jbj at redhat.com>
- updated to 1.7.1.

* Wed Mar  3 1999 Matt Wilson <msw at redhat.com>
- updated to 1.7.0

* Fri Feb  5 1999 Bill Nottingham <notting at redhat.com>
- build against new libstdc++, build on arm

* Tue Dec 22 1998 Jeff Johnson <jbj at redhat.com>
- update to 1.6.2.a.

* Tue Jun 16 1998 Jeff Johnson <jbj at redhat.com>
- add sparc/alpha functionality.
- add %%clean

* Mon Jun 01 1998 Prospector System <bugs at redhat.com>
- translations modified for de

* Mon Jun 01 1998 Erik Troan <ewt at redhat.com>
- how the hell did this get setuid root?

* Thu May 07 1998 Prospector System <bugs at redhat.com>
- translations modified for de, fr, tr

* Wed Apr 29 1998 Cristian Gafton <gafton at redhat.com>
- upgraded to 1.5.1 (so that it compiles with egcs)
- buildroot

* Tue Nov  4 1997 Erik Troan <ewt at redhat.com>
- commented out line causing core dumps when exiting

* Fri Oct 24 1997 Marc Ewing <marc at redhat.com>
- wmconfig

* Fri Aug 22 1997 Erik Troan <ewt at redhat.com>
- built against glibc


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xosview/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 01:05:28 -0000	1.1
+++ .cvsignore	11 Sep 2008 17:31:27 -0000	1.2
@@ -0,0 +1 @@
+xosview-1.8.3-20080301.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xosview/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 01:05:28 -0000	1.1
+++ sources	11 Sep 2008 17:31:27 -0000	1.2
@@ -0,0 +1 @@
+25cf811c5ca77c37baeac6e516a58a66  xosview-1.8.3-20080301.tar.gz



From scop at fedoraproject.org  Thu Sep 11 18:07:46 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 11 Sep 2008 18:07:46 +0000 (UTC)
Subject: rpms/tomcat-native/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 tomcat-native.spec, 1.9, 1.10
Message-ID: <20080911180746.9AC2070131@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/tomcat-native/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30253/devel

Modified Files:
	.cvsignore sources tomcat-native.spec 
Log Message:
* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.15-1
- 1.1.15.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Jul 2008 20:03:08 -0000	1.5
+++ .cvsignore	11 Sep 2008 18:07:16 -0000	1.6
@@ -1 +1 @@
-tomcat-native-1.1.14-src.tar.gz
+tomcat-native-1.1.15-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Jul 2008 20:03:08 -0000	1.5
+++ sources	11 Sep 2008 18:07:16 -0000	1.6
@@ -1 +1 @@
-b190d214e4c7cfcc012d272fd375589a  tomcat-native-1.1.14-src.tar.gz
+31beca620246cc076cbd70d8c1629fec  tomcat-native-1.1.15-src.tar.gz


Index: tomcat-native.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/devel/tomcat-native.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tomcat-native.spec	5 Jul 2008 20:03:08 -0000	1.9
+++ tomcat-native.spec	11 Sep 2008 18:07:16 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           tomcat-native
-Version:        1.1.14
-Release:        1%{?dist}
+Version:        1.1.15
+Release:        0%{?dist}
 Summary:        Tomcat native library
 
 Group:          System Environment/Libraries
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.15-1
+- 1.1.15.
+
 * Sat Jul  5 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.14-1
 - 1.1.14.
 



From ssp at fedoraproject.org  Thu Sep 11 17:47:54 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu, 11 Sep 2008 17:47:54 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.350,1.351
Message-ID: <20080911174754.DD94A70131@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23850/devel

Modified Files:
	xorg-x11-server.spec 
Log Message:
Bump buildrequires on mesa


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -r1.350 -r1.351
--- xorg-x11-server.spec	11 Sep 2008 17:36:09 -0000	1.350
+++ xorg-x11-server.spec	11 Sep 2008 17:47:24 -0000	1.351
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.0
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -121,7 +121,7 @@
 
 # openssl? really?
 BuildRequires: pixman-devel libpciaccess-devel openssl-devel byacc flex
-BuildRequires: mesa-libGL-devel >= 7.1-0.36
+BuildRequires: mesa-libGL-devel >= 7.1-0.37
 # should be useless now...
 # BuildRequires: mesa-source >= 7.1-0.36
 # XXX silly...
@@ -499,6 +499,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 1.5.0-5
+- Bump BuildRequires on mesa-GL-devel. Maybe that will work.
+
 * Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 1.5.0-4
 - Bump BuildRequires on xorg-x11-proto-devel
 



From spot at fedoraproject.org  Thu Sep 11 17:35:39 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 17:35:39 +0000 (UTC)
Subject: rpms/perl-Glib/devel .cvsignore, 1.17, 1.18 perl-Glib.spec, 1.28,
	1.29 sources, 1.17, 1.18
Message-ID: <20080911173539.E326A70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19979

Modified Files:
	.cvsignore perl-Glib.spec sources 
Log Message:
update to 1.183


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Glib/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	17 Dec 2007 21:01:21 -0000	1.17
+++ .cvsignore	11 Sep 2008 17:35:09 -0000	1.18
@@ -1 +1 @@
-Glib-1.162.tar.gz
+Glib-1.183.tar.gz


Index: perl-Glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Glib/devel/perl-Glib.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- perl-Glib.spec	3 Mar 2008 20:42:50 -0000	1.28
+++ perl-Glib.spec	11 Sep 2008 17:35:09 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           perl-Glib
-Version:        1.162
-Release:        5%{?dist}
+Version:        1.183
+Release:        1%{?dist}
 Summary:        Perl interface to GLib
 
 Group:          Development/Libraries
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.183-1
+- update to 1.183
+
 * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.162-5
 - Rebuild for perl 5.10 (again)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Glib/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	17 Dec 2007 21:01:21 -0000	1.17
+++ sources	11 Sep 2008 17:35:09 -0000	1.18
@@ -1 +1 @@
-b2c3e4bb5e56c15709df2dd9a6704886  Glib-1.162.tar.gz
+582fc784f05802f3a8e592a53a3099c4  Glib-1.183.tar.gz



From nhorman at fedoraproject.org  Thu Sep 11 18:10:10 2008
From: nhorman at fedoraproject.org (Neil Horman)
Date: Thu, 11 Sep 2008 18:10:10 +0000 (UTC)
Subject: rpms/python-pysctp/EL-5 __init__.py, NONE, 1.1 pysctp-buildfix.patch,
	NONE, 1.1 python-pysctp.spec, NONE, 1.1 setup.py, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080911181010.8D2ED70131@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/python-pysctp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31112

Modified Files:
	.cvsignore sources 
Added Files:
	__init__.py pysctp-buildfix.patch python-pysctp.spec setup.py 
Log Message:
Initial import


--- NEW FILE __init__.py ---
__version__ = "0.3.1"

pysctp-buildfix.patch:

--- NEW FILE pysctp-buildfix.patch ---
diff -up pysctp-0.3.1/sctp.py.orig pysctp-0.3.1/sctp.py
--- pysctp-0.3.1/sctp.py.orig	2008-04-10 21:30:33.000000000 -0400
+++ pysctp-0.3.1/sctp.py	2008-04-10 21:30:20.000000000 -0400
@@ -32,7 +32,7 @@ send_failed(): 
 remote_error(): 
 shutdown_event(): 
 pdapi_event(): 
-adaption_event(): 
+adaptation_event(): 
 
 Every SCTP socket has a number of properties. Two "complex" properties,
 that contain a number of sub-properties, are: 
@@ -246,7 +246,7 @@ class notification(object):
 	type_REMOTE_ERROR = _sctp.getconstant("SCTP_REMOTE_ERROR")
 	type_SHUTDOWN_EVENT = _sctp.getconstant("SCTP_SHUTDOWN_EVENT")
 	type_PARTIAL_DELIVERY_EVENT = _sctp.getconstant("SCTP_PARTIAL_DELIVERY_EVENT")
-	type_ADAPTION_INDICATION = _sctp.getconstant("SCTP_ADAPTION_INDICATION")
+	type_ADAPTATION_INDICATION = _sctp.getconstant("SCTP_ADAPTATION_INDICATION")
 
 class assoc_change(notification):
 	"""
@@ -396,14 +396,14 @@ class shutdown_event(notification):
 		self.assoc_id = 0
 		notification.__init__(self, values)
 	
-class adaption_event(notification):
+class adaptation_event(notification):
 	"""
 	Adaption indication event. It signals that the remote peer requests
-	an specific adaption layer.
+	an specific adaptation layer.
 
 	In SCTP, you can pass an optional 32-bit metadata identifier 
 	along each message, called "ppid". For protocols that actively use
-	this feature, it is like a subprotocol identifier, or "adaption
+	this feature, it is like a subprotocol identifier, or "adaptation
 	layer". The message interpreter is chosen by this value. This is
 	mostly for telephony signaling-related protocols.
 
@@ -419,7 +419,7 @@ class adaption_event(notification):
 	that (see event_subscribe class for details).
 	"""
 	def __init__(self, values=None):
-		self.adaption_ind = 0
+		self.adaptation_ind = 0
 		self.assoc_id = 0
 		notification.__init__(self, values)
 
@@ -451,7 +451,7 @@ notification_table = {
 	notification.type_REMOTE_ERROR: remote_error,
 	notification.type_SHUTDOWN_EVENT: shutdown_event,
 	notification.type_PARTIAL_DELIVERY_EVENT: pdapi_event,
-	notification.type_ADAPTION_INDICATION: adaption_event,
+	notification.type_ADAPTATION_INDICATION: adaptation_event,
 }
 
 
@@ -519,7 +519,7 @@ class event_subscribe(object):
 	peer_error: refers to remote_error() event
 	shutdown: refers to shutdon_event() 
 	partial_delivery: refers to pdapi_event()
-	adaption_layer: refers to adaption_event()
+	adaptation_layer: refers to adaptation_event()
 
 	(*) sndrcvinfo is ALWAYS returned by sctp_recv() along with message data. The
 	    data_io property just controls whether sndrcvinfo() contains useful data.
@@ -531,7 +531,7 @@ class event_subscribe(object):
 	sendfailure = send_failure
 	peererror = peer_error
 	partialdelivery = partial_delivery
-	adaptionlayer = adaption_layer
+	adaptationlayer = adaptation_layer
 	"""
 
 	def flush(self):
@@ -548,8 +548,8 @@ class event_subscribe(object):
 	def __get_property(self, key):
 		return self.__dict__[key]
 
-	def get_adaption_layer(self):
-		return self.__get_property("_adaption_layer")
+	def get_adaptation_layer(self):
+		return self.__get_property("_adaptation_layer")
 
 	def get_partial_delivery(self):
 		return self.__get_property("_partial_delivery")
@@ -572,8 +572,8 @@ class event_subscribe(object):
 	def get_data_io(self, value):
 		return self.__get_property("_data_io")
 
-	def set_adaption_layer(self, value):
-		self.__set_property("_adaption_layer", value)
+	def set_adaptation_layer(self, value):
+		self.__set_property("_adaptation_layer", value)
 
 	def set_partial_delivery(self, value):
 		self.__set_property("_partial_delivery", value)
@@ -608,7 +608,7 @@ class event_subscribe(object):
 		self._peer_error = 0
 		self._shutdown = 0
 		self._partial_delivery = 0
-		self._adaption_layer = 0
+		self._adaptation_layer = 0
 
 		if self.autoflush:
 			self.flush()
@@ -642,8 +642,8 @@ class event_subscribe(object):
 	partial_delivery = property(get_partial_delivery, set_partial_delivery)
 	partialdelivery = partial_delivery
 
-	adaption_layer = property(get_adaption_layer, set_adaption_layer)
-	adaptionlayer = adaption_layer
+	adaptation_layer = property(get_adaptation_layer, set_adaptation_layer)
+	adaptationlayer = adaptation_layer
 
 
 ########## STRUCTURES EXCHANGED VIA set/getsockopt() 
@@ -964,7 +964,7 @@ class sctpsocket(object):
 		 nature of SCTP, some implementations have it turned on by default, while TCP 
 		 is mandated to have it off by default.
 
-	adaption: 32-bit value related to the "ppid" metadata field sent along each data
+	adaptation: 32-bit value related to the "ppid" metadata field sent along each data
 		  message. If this property is different than zero, the configured value
 		  is sent via ADAPTION INDICATION event to the remote peer when a new 
 		  association is opened. This is intended to be used by telephony-related
@@ -1097,7 +1097,7 @@ class sctpsocket(object):
 
 		    WARNING: identifying destination by Association ID not implemented yet!
 
-		ppid: adaption layer value, a 32-bit metadata that is sent along the message.
+		ppid: adaptation layer value, a 32-bit metadata that is sent along the message.
 		      Defaults to 0.
 
 		flags: a bitmap of MSG_* flags. For example, MSG_UNORDERED indicates that 
@@ -1313,21 +1313,21 @@ class sctpsocket(object):
 		"""
 		_sctp.set_nodelay(self._sk.fileno(), rvalue)
 
-	def get_adaption(self):
+	def get_adaptation(self):
 		"""
-		Gets the adaption layer indication from kernel.
+		Gets the adaptation layer indication from kernel.
 		
-		See class documentation for more details. (adaption property)
+		See class documentation for more details. (adaptation property)
 		"""
-		return _sctp.get_adaption(self._sk.fileno())
+		return _sctp.get_adaptation(self._sk.fileno())
 
-	def set_adaption(self, rvalue):
+	def set_adaptation(self, rvalue):
 		"""
-		Sets the adaption layer indication for this socket.
+		Sets the adaptation layer indication for this socket.
 
-		See class documentation for more details. (adaption property)
+		See class documentation for more details. (adaptation property)
 		"""
-		_sctp.set_adaption(self._sk.fileno(), rvalue)
+		_sctp.set_adaptation(self._sk.fileno(), rvalue)
 
 	def get_disable_fragments(self):
 		"""
@@ -1599,7 +1599,7 @@ class sctpsocket(object):
 	# properties
 
 	nodelay = property(get_nodelay, set_nodelay)
-	adaption = property(get_adaption, set_adaption)
+	adaptation = property(get_adaptation, set_adaptation)
 	disable_fragments = property(get_disable_fragments, set_disable_fragments)
 	mappedv4 = property(get_mappedv4, set_mappedv4)
 	maxseg = property(get_maxseg, set_maxseg)
diff -up pysctp-0.3.1/Makefile.orig pysctp-0.3.1/Makefile
--- pysctp-0.3.1/Makefile.orig	2008-04-10 21:30:33.000000000 -0400
+++ pysctp-0.3.1/Makefile	2008-04-10 21:29:46.000000000 -0400
@@ -1,4 +1,4 @@
-PYTHON_VERSION = 2.4
+PYTHON_VERSION = 2.5
 CFLAGS = -Wall -I/usr/include/python$(PYTHON_VERSION) -fPIC
 LDFLAGS = -fPIC -shared -lsctp
 
diff -up pysctp-0.3.1/_sctp.c.orig pysctp-0.3.1/_sctp.c
--- pysctp-0.3.1/_sctp.c.orig	2008-04-10 21:30:33.000000000 -0400
+++ pysctp-0.3.1/_sctp.c	2008-04-10 21:30:20.000000000 -0400
@@ -5,8 +5,7 @@
  * Elvis Pf??tzenreuter (elvis.pfutzenreuter@{gmail.com,indt.org.br})
  * Copyright (c) 2005 Instituto Nokia de Tecnologia
  */
-
-#include "Python.h"
+#include <Python.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/sctp.h>
@@ -36,8 +35,8 @@ static PyObject* get_disable_fragments(P
 static PyObject* set_disable_fragments(PyObject* dummy, PyObject* args);
 static PyObject* get_autoclose(PyObject* dummy, PyObject* args);
 static PyObject* set_autoclose(PyObject* dummy, PyObject* args);
-static PyObject* get_adaption(PyObject* dummy, PyObject* args);
-static PyObject* set_adaption(PyObject* dummy, PyObject* args);
+static PyObject* get_adaptation(PyObject* dummy, PyObject* args);
+static PyObject* set_adaptation(PyObject* dummy, PyObject* args);
 static PyObject* set_peer_primary(PyObject* dummy, PyObject* args);
 static PyObject* set_primary(PyObject* dummy, PyObject* args);
 static PyObject* bindx(PyObject* dummy, PyObject* args);
@@ -84,8 +83,8 @@ static PyMethodDef _sctpMethods[] = 
 	{"set_initparams", set_initparams, METH_VARARGS, ""},
 	{"get_nodelay", get_nodelay, METH_VARARGS, ""},
 	{"set_nodelay", set_nodelay, METH_VARARGS, ""},
-	{"get_adaption", get_adaption, METH_VARARGS, ""},
-	{"set_adaption", set_adaption, METH_VARARGS, ""},
+	{"get_adaptation", get_adaptation, METH_VARARGS, ""},
+	{"set_adaptation", set_adaptation, METH_VARARGS, ""},
 	{"get_disable_fragments", get_disable_fragments, METH_VARARGS, ""},
 	{"set_disable_fragments", set_disable_fragments, METH_VARARGS, ""},
 	{"get_events", get_events, METH_VARARGS, ""},
@@ -206,7 +205,7 @@ static ktuple _constants[] = 
 	{"SCTP_REMOTE_ERROR", SCTP_REMOTE_ERROR},
 	{"SCTP_SHUTDOWN_EVENT", SCTP_SHUTDOWN_EVENT},
 	{"SCTP_PARTIAL_DELIVERY_EVENT", SCTP_PARTIAL_DELIVERY_EVENT}, 
-	{"SCTP_ADAPTION_INDICATION", SCTP_ADAPTION_INDICATION},
+	{"SCTP_ADAPTATION_INDICATION", SCTP_ADAPTATION_INDICATION},
 	{0, -1}
 };
 
@@ -299,7 +298,7 @@ static PyObject* get_mappedv4(PyObject* 
 {
 	PyObject* ret = 0;
 	int fd, v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	if (PyArg_ParseTuple(args, "i", &fd)) {
 		if (getsockopt(fd, SOL_SCTP, SCTP_I_WANT_MAPPED_V4_ADDR, &v, &lv)) {
 			PyErr_SetFromErrno(PyExc_IOError);
@@ -328,7 +327,7 @@ static PyObject* get_nodelay(PyObject* d
 {
 	PyObject* ret = 0;
 	int fd, v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	if (PyArg_ParseTuple(args, "i", &fd)) {
 		if (getsockopt(fd, SOL_SCTP, SCTP_NODELAY, &v, &lv)) {
 			PyErr_SetFromErrno(PyExc_IOError);
@@ -360,7 +359,7 @@ static PyObject* get_assocparams(PyObjec
 	PyObject* oassoc_id;
 	int fd;
 	struct sctp_assocparams v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	int ok;
 	
 	ok = PyArg_ParseTuple(args, "iO", &fd, &dict) && PyDict_Check(dict);
@@ -456,7 +455,7 @@ static PyObject* get_paddrparams(PyObjec
 	int slen_dummy;
 
 	struct sctp_paddrparams v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	int ok;
 	
 	ok = PyArg_ParseTuple(args, "iO", &fd, &dict) && PyDict_Check(dict);
@@ -580,7 +579,7 @@ static PyObject* get_status(PyObject* du
 
 	int fd;
 	struct sctp_status v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	int ok;
 	
 	ok = PyArg_ParseTuple(args, "iOO", &fd, &dict, &dict2) && \
@@ -641,7 +640,7 @@ static PyObject* get_paddrinfo(PyObject*
 	int fd;
 	int slen_dummy;
 	struct sctp_paddrinfo v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	int ok;
 	
 	ok = PyArg_ParseTuple(args, "iO", &fd, &dict) && PyDict_Check(dict);
@@ -682,7 +681,7 @@ static PyObject* get_rtoinfo(PyObject* d
 	PyObject* oassoc_id;
 	int fd;
 	struct sctp_rtoinfo v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	int ok;
 	
 	ok = PyArg_ParseTuple(args, "iO", &fd, &dict) && PyDict_Check(dict);
@@ -758,7 +757,7 @@ static PyObject* get_initparams(PyObject
 	PyObject* ret = 0;
 	int fd;
 	struct sctp_initmsg v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 
 	if (! PyArg_ParseTuple(args, "i", &fd)) {
 		return ret;
@@ -834,7 +833,7 @@ static PyObject* get_events(PyObject* du
 	PyObject* ret = 0;
 	int fd;
 	struct sctp_event_subscribe v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 
 	if (PyArg_ParseTuple(args, "i", &fd)) {
 		if (getsockopt(fd, SOL_SCTP, SCTP_EVENTS, &v, &lv)) {
@@ -848,7 +847,7 @@ static PyObject* get_events(PyObject* du
 			PyDict_SetItemString(ret, "_peer_error", PyBool_FromLong(v.sctp_peer_error_event));
 			PyDict_SetItemString(ret, "_shutdown", PyBool_FromLong(v.sctp_shutdown_event));
 			PyDict_SetItemString(ret, "_partial_delivery", PyBool_FromLong(v.sctp_partial_delivery_event));
-			PyDict_SetItemString(ret, "_adaption_layer", PyBool_FromLong(v.sctp_adaption_layer_event));
+			PyDict_SetItemString(ret, "_adaptation_layer", PyBool_FromLong(v.sctp_adaptation_layer_event));
 		}
 	}
 	return ret;
@@ -859,7 +858,7 @@ static PyObject* set_events(PyObject* du
 	PyObject* ret = 0;
 	int fd;
 	PyObject *ov, *o_data_io, *o_association, *o_address, *o_send_failure;
-	PyObject *o_peer_error, *o_shutdown, *o_partial_delivery, *o_adaption_layer;
+	PyObject *o_peer_error, *o_shutdown, *o_partial_delivery, *o_adaptation_layer;
 	struct sctp_event_subscribe v;
 	int ok = PyArg_ParseTuple(args, "iO", &fd, &ov) && PyDict_Check(ov);
 
@@ -870,7 +869,7 @@ static PyObject* set_events(PyObject* du
 	ok = ok && (o_peer_error = PyDict_GetItemString(ov, "_peer_error"));
 	ok = ok && (o_shutdown = PyDict_GetItemString(ov, "_shutdown"));
 	ok = ok && (o_partial_delivery = PyDict_GetItemString(ov, "_partial_delivery"));
-	ok = ok && (o_adaption_layer = PyDict_GetItemString(ov, "_adaption_layer"));
+	ok = ok && (o_adaptation_layer = PyDict_GetItemString(ov, "_adaptation_layer"));
 
 	ok = ok && (PyInt_Check(o_data_io) != 0);
 	ok = ok && (PyInt_Check(o_association) != 0);
@@ -879,7 +878,7 @@ static PyObject* set_events(PyObject* du
 	ok = ok && (PyInt_Check(o_peer_error) != 0);
 	ok = ok && (PyInt_Check(o_shutdown) != 0);
 	ok = ok && (PyInt_Check(o_send_failure) != 0);
-	ok = ok && (PyInt_Check(o_adaption_layer) != 0);
+	ok = ok && (PyInt_Check(o_adaptation_layer) != 0);
 
 	if (ok) {
 		memset(&v, 0, sizeof(v));
@@ -890,7 +889,7 @@ static PyObject* set_events(PyObject* du
 		v.sctp_peer_error_event = PyInt_AsLong(o_peer_error);
 		v.sctp_shutdown_event = PyInt_AsLong(o_shutdown);
 		v.sctp_partial_delivery_event = PyInt_AsLong(o_partial_delivery);
-		v.sctp_adaption_layer_event = PyInt_AsLong(o_adaption_layer);
+		v.sctp_adaptation_layer_event = PyInt_AsLong(o_adaptation_layer);
 		
 		if (setsockopt(fd, SOL_SCTP, SCTP_EVENTS, &v, sizeof(v))) {
 			PyErr_SetFromErrno(PyExc_IOError);
@@ -905,7 +904,7 @@ static PyObject* get_maxseg(PyObject* du
 {
 	PyObject* ret = 0;
 	int fd, v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 
 	if (PyArg_ParseTuple(args, "i", &fd)) {
 		if (getsockopt(fd, SOL_SCTP, SCTP_MAXSEG, &v, &lv)) {
@@ -936,7 +935,7 @@ static PyObject* get_disable_fragments(P
 {
 	PyObject* ret = 0;
 	int fd, v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 
 	if (PyArg_ParseTuple(args, "i", &fd)) {
 		if (getsockopt(fd, SOL_SCTP, SCTP_DISABLE_FRAGMENTS, &v, &lv)) {
@@ -967,7 +966,7 @@ static PyObject* get_autoclose(PyObject*
 {
 	PyObject* ret = 0;
 	int fd, v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 
 	if (PyArg_ParseTuple(args, "i", &fd)) {
 		if (getsockopt(fd, SOL_SCTP, SCTP_AUTOCLOSE, &v, &lv)) {
@@ -994,14 +993,14 @@ static PyObject* set_autoclose(PyObject*
 	return ret;
 }
 
-static PyObject* get_adaption(PyObject* dummy, PyObject* args)
+static PyObject* get_adaptation(PyObject* dummy, PyObject* args)
 {
 	PyObject* ret = 0;
 	int fd, v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	
 	if (PyArg_ParseTuple(args, "i", &fd)) {
-		if (getsockopt(fd, SOL_SCTP, SCTP_ADAPTION_LAYER, &v, &lv)) {
+		if (getsockopt(fd, SOL_SCTP, SCTP_ADAPTATION_LAYER, &v, &lv)) {
 			PyErr_SetFromErrno(PyExc_IOError);
 		} else {
 			ret = PyInt_FromLong(v);
@@ -1010,13 +1009,13 @@ static PyObject* get_adaption(PyObject* 
 	return ret;
 }
 
-static PyObject* set_adaption(PyObject* dummy, PyObject* args)
+static PyObject* set_adaptation(PyObject* dummy, PyObject* args)
 {
 	PyObject* ret = 0;
 	int fd, v;
 
 	if (PyArg_ParseTuple(args, "ii", &fd, &v)) {
-		if (setsockopt(fd, SOL_SCTP, SCTP_ADAPTION_LAYER, &v, sizeof(v))) {
+		if (setsockopt(fd, SOL_SCTP, SCTP_ADAPTATION_LAYER, &v, sizeof(v))) {
 			PyErr_SetFromErrno(PyExc_IOError);
 		} else {
 			ret = Py_None; Py_INCREF(ret);
@@ -1522,10 +1521,10 @@ void interpret_notification(PyObject* di
 		PyDict_SetItemString(dict, "assoc_id", PyInt_FromLong(n->pdapi_assoc_id));
 		}
 		break;
-	case SCTP_ADAPTION_INDICATION:
+	case SCTP_ADAPTATION_INDICATION:
 		{
-		const struct sctp_adaption_event* n = &(notif->sn_adaption_event);
-		PyDict_SetItemString(dict, "adaption_ind", PyInt_FromLong(n->sai_adaption_ind));
+		const struct sctp_adaptation_event* n = &(notif->sn_adaptation_event);
+		PyDict_SetItemString(dict, "adaptation_ind", PyInt_FromLong(n->sai_adaptation_ind));
 		PyDict_SetItemString(dict, "assoc_id", PyInt_FromLong(n->sai_assoc_id));
 		}
 		break;
@@ -1537,7 +1536,7 @@ static PyObject* sctp_recv_msg(PyObject*
 	int fd, max_len;
 
 	struct sockaddr_storage sfrom;
-	int sfrom_len = sizeof(sfrom);
+	socklen_t sfrom_len = sizeof(sfrom);
 	int family;
 	int len;
 	int port;
diff -up pysctp-0.3.1/test.py.orig pysctp-0.3.1/test.py
--- pysctp-0.3.1/test.py.orig	2008-04-10 21:30:33.000000000 -0400
+++ pysctp-0.3.1/test.py	2008-04-10 21:30:20.000000000 -0400
@@ -15,8 +15,8 @@ import time
 
 
 
-client = "10.0.1.2"
-server = "10.0.1.1" 
+client = "127.0.0.1"
+server = "127.0.0.1" 
 test_impossible_sending = False
 
 
@@ -68,12 +68,12 @@ tcp.disable_fragments = \
 tcp.mappedv4 = 0
 
 tcp.maxseg = 10001;
-tcp.adaption = 318;
+tcp.adaptation = 318;
 
 if _sctp.get_nodelay(tcp.fileno()) or  \
    _sctp.get_disable_fragments(tcp.fileno()) or \
    _sctp.get_maxseg(tcp.fileno()) != 10001 or \
-   _sctp.get_adaption(tcp.fileno()) != 318 or \
+   _sctp.get_adaptation(tcp.fileno()) != 318 or \
    _sctp.get_mappedv4(tcp.fileno()):
 	raise "Property attribution was not effective"
 
@@ -105,7 +105,7 @@ for s in (tcp, udp, tcp2, udp2):
 	rawparams["_peer_error"] or \
 	rawparams["_shutdown"] or \
 	rawparams["_partial_delivery"] or \
-	rawparams["_adaption_layer"]:
+	rawparams["_adaptation_layer"]:
 		raise "events properties were not effective (in 0)"
 	
 	s.events.data_io = True
@@ -115,7 +115,7 @@ for s in (tcp, udp, tcp2, udp2):
 	s.events.peer_error = True
 	s.events.shutdown = True
 	s.events.partial_delivery = True
-	s.events.adaption_layer = True
+	s.events.adaptation_layer = True
 
 	rawparams = _sctp.get_events(s.fileno())
 
@@ -126,7 +126,7 @@ for s in (tcp, udp, tcp2, udp2):
 	not rawparams["_peer_error"] or \
 	not rawparams["_shutdown"] or \
 	not rawparams["_partial_delivery"] or \
-	not rawparams["_adaption_layer"]:
+	not rawparams["_adaptation_layer"]:
 		raise "events properties were not effective (in 1)"
 
 	s.events.data_io = False
@@ -136,7 +136,7 @@ for s in (tcp, udp, tcp2, udp2):
 	s.events.peer_error = False
 	s.events.shutdown = False
 	s.events.partial_delivery = False
-	s.events.adaption_layer = False
+	s.events.adaptation_layer = False
 
 	rawparams = _sctp.get_events(s.fileno())
 
@@ -147,10 +147,10 @@ for s in (tcp, udp, tcp2, udp2):
 	rawparams["_peer_error"] or \
 	rawparams["_shutdown"] or \
 	rawparams["_partial_delivery"] or \
-	rawparams["_adaption_layer"]:
+	rawparams["_adaptation_layer"]:
 		raise "events properties were not effective (in 0)"
 		
-ipv4 = _sctp._sockaddr_test(("10.00.1.01", 1234))
+ipv4 = _sctp._sockaddr_test(("10.0.1.1", 1234))
 ipv6 = _sctp._sockaddr_test(("FE80::0:0:34", 65534))
 
 if ipv4[3] != ("10.0.1.1", 1234):


--- NEW FILE python-pysctp.spec ---
%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")

Name:		python-pysctp 
Version:	0.3.1
Release:	3%{?dist}
Summary:	Python sctp socket api extensions bindings
Group:		System Environment/Libraries
License:	LGPLv2
URL:		http://epx.com.br/pysctp/
Source0:	http://epx.com.br/pysctp/pysctp-%{version}.tar.gz
Source1:	setup.py
Source2:	__init__.py
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	python lksctp-tools-devel 
BuildRequires:  python-setuptools-devel lksctp-tools-devel

Patch0: pysctp-buildfix.patch

%description
Python bindings for the SCTP socket api (see draft-ietf-tsvwg-sctpsocket-10.txt)

%prep
%setup -q -n pysctp-%{version}
%patch0 -p1
mkdir ./pysctp
cp %{SOURCE1} . 
cp %{SOURCE2} ./pysctp
mv ./sctp.py ./pysctp

%build
FLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{python_sitearch}/*
%doc README Changelog doc/draft-ietf-tsvwg-sctpsocket-10.txt

%changelog
* Wed Sep 10 2008 Neil Horman <nhorman at tuxdriver.com> 0.3-1-3 
- Fixed files section, last minute pre-import fixes

* Wed Sep 10 2008 Neil Horman <nhorman at tuxdriver.com> 0.3.1-2
- Updated spec file with documentation

* Thu Apr 10 2008 Neil Horman <nhorman at tuxdriver.com> 0.3.1-1
- Initial build


--- NEW FILE setup.py ---
# distutils build script
# To install fuse-python, run 'python setup.py install'

# This setup.py based on that of shout-python (py bindings for libshout,
# part of the icecast project, http://svn.xiph.org/icecast/trunk/shout-python)

try:
    from setuptools import setup
    from setuptools.dist import Distribution
except ImportError:
    from distutils.core import setup
    from distutils.dist import Distribution
from distutils.core import Extension
import os
import sys
from pysctp import __version__

classifiers = """\
Development Status :: 4 - Beta
Intended Audience :: Developers
License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)
Operating System :: POSIX
Programming Language :: C
Programming Language :: Python
Topic :: System :: Libraries 
"""

class MyDistribution(Distribution):
    """
    Obnoxious hack to enforce the packager to generate
    the to-be-generated files
    """

    def run_command(self, command):
        if command == 'sdist':
            for f in ('Changelog'):
                 if not os.path.exists(f):
                     raise RuntimeError, 'file ' + `f` + \
                           " doesn't exist, please generate it before creating a source distribution"

        return Distribution.run_command(self, command)

cflags = "-Wall -I/usr/include/python$(PYTHON_VERSION) -fPIC"
# there must be an easier way to set up these flags!
iflags = [x[2:] for x in cflags.split() if x[0:2] == '-I']
extra_cflags = [x for x in cflags.split() if x[0:2] != '-I']
libdirs = []
libsonly = ['sctp'] 

try:
    import thread
except ImportError:
    # if our Python doesn't have thread support, we enforce
    # linking against libpthread so that libfuse's pthread
    # related symbols won't be undefined
    libsonly.append("pthread")

# include_dirs=[]
# libraries=[]
# runtime_library_dirs=[]
# extra_objects, extra_compile_args, extra_link_args
pysctpmodule = Extension('pysctp/_sctp', sources = ['_sctp.c'],
                  include_dirs = iflags,
                  extra_compile_args = extra_cflags,
                  library_dirs = libdirs,
                  libraries = libsonly)

setup (name = 'pysctp',
       description = 'Pyton bindings for SCTP protocol',
       classifiers = filter(None, classifiers.split("\n")),
       version = __version__,
       license = 'LGPL',
       platforms = ['posix'],
       url = 'http//epx.com.br/pysctp/index.php',
       author = 'Elvis Pfutzenreuter',
       author_email = 'epx at altoriopreto.com.br',
       maintainer = 'Neil Horman',
       maintainer_email = 'nhorman at tuxdriver.com',
       packages = ["pysctp"],
       ext_modules = [ pysctpmodule ],
       py_modules=[],
       distclass = MyDistribution)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-pysctp/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 00:03:21 -0000	1.1
+++ .cvsignore	11 Sep 2008 18:09:40 -0000	1.2
@@ -0,0 +1 @@
+pysctp-0.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-pysctp/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 00:03:21 -0000	1.1
+++ sources	11 Sep 2008 18:09:40 -0000	1.2
@@ -0,0 +1 @@
+7fd43fa7a7f31cff557d0a69fa751e5f  pysctp-0.3.1.tar.gz



From scop at fedoraproject.org  Thu Sep 11 18:09:34 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 11 Sep 2008 18:09:34 +0000 (UTC)
Subject: rpms/tomcat-native/F-9 tomcat-native.spec,1.10,1.11
Message-ID: <20080911180934.22C0870131@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/tomcat-native/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30845/F-9

Modified Files:
	tomcat-native.spec 
Log Message:
Fix release


Index: tomcat-native.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/F-9/tomcat-native.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tomcat-native.spec	11 Sep 2008 18:07:16 -0000	1.10
+++ tomcat-native.spec	11 Sep 2008 18:09:03 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           tomcat-native
 Version:        1.1.15
-Release:        0%{?dist}
+Release:        1%{?dist}
 Summary:        Tomcat native library
 
 Group:          System Environment/Libraries



From ssp at fedoraproject.org  Thu Sep 11 17:36:40 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu, 11 Sep 2008 17:36:40 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.349,1.350
Message-ID: <20080911173640.0688870131@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20430/devel

Modified Files:
	xorg-x11-server.spec 
Log Message:
Bump requirement on xorg-x11-proto-devel


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -r1.349 -r1.350
--- xorg-x11-server.spec	11 Sep 2008 14:51:35 -0000	1.349
+++ xorg-x11-server.spec	11 Sep 2008 17:36:09 -0000	1.350
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.0
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -97,7 +97,7 @@
 BuildRequires: automake autoconf libtool pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.1.5
 
-BuildRequires: xorg-x11-proto-devel >= 7.3-10
+BuildRequires: xorg-x11-proto-devel >= 7.4-3
 BuildRequires: damageproto >= 1.1
 BuildRequires: dri2proto >= 1.1
 BuildRequires: fixesproto >= 4.0
@@ -499,6 +499,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 1.5.0-4
+- Bump BuildRequires on xorg-x11-proto-devel
+
 * Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 1.5.0-3
 - Change the external monitor patch to base off of amount of video ram.
 



From scop at fedoraproject.org  Thu Sep 11 18:09:34 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 11 Sep 2008 18:09:34 +0000 (UTC)
Subject: rpms/tomcat-native/devel tomcat-native.spec,1.10,1.11
Message-ID: <20080911180934.561F670131@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/tomcat-native/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30845/devel

Modified Files:
	tomcat-native.spec 
Log Message:
Fix release


Index: tomcat-native.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/devel/tomcat-native.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tomcat-native.spec	11 Sep 2008 18:07:16 -0000	1.10
+++ tomcat-native.spec	11 Sep 2008 18:09:04 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           tomcat-native
 Version:        1.1.15
-Release:        0%{?dist}
+Release:        1%{?dist}
 Summary:        Tomcat native library
 
 Group:          System Environment/Libraries



From scop at fedoraproject.org  Thu Sep 11 18:07:46 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 11 Sep 2008 18:07:46 +0000 (UTC)
Subject: rpms/tomcat-native/F-9 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 tomcat-native.spec, 1.9, 1.10
Message-ID: <20080911180746.7C10470131@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/tomcat-native/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30253/F-9

Modified Files:
	.cvsignore sources tomcat-native.spec 
Log Message:
* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.15-1
- 1.1.15.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Jul 2008 20:02:51 -0000	1.5
+++ .cvsignore	11 Sep 2008 18:07:16 -0000	1.6
@@ -1 +1 @@
-tomcat-native-1.1.14-src.tar.gz
+tomcat-native-1.1.15-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Jul 2008 20:02:51 -0000	1.5
+++ sources	11 Sep 2008 18:07:16 -0000	1.6
@@ -1 +1 @@
-b190d214e4c7cfcc012d272fd375589a  tomcat-native-1.1.14-src.tar.gz
+31beca620246cc076cbd70d8c1629fec  tomcat-native-1.1.15-src.tar.gz


Index: tomcat-native.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/F-9/tomcat-native.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tomcat-native.spec	5 Jul 2008 20:02:51 -0000	1.9
+++ tomcat-native.spec	11 Sep 2008 18:07:16 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           tomcat-native
-Version:        1.1.14
-Release:        1%{?dist}
+Version:        1.1.15
+Release:        0%{?dist}
 Summary:        Tomcat native library
 
 Group:          System Environment/Libraries
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.15-1
+- 1.1.15.
+
 * Sat Jul  5 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.14-1
 - 1.1.14.
 



From scop at fedoraproject.org  Thu Sep 11 18:20:39 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 11 Sep 2008 18:20:39 +0000 (UTC)
Subject: rpms/bash-completion/F-9 bash-completion-20060301-getent.patch, NONE,
	1.1 bash-completion-20060301-gzip.patch, NONE,
	1.1 bash-completion-20060301-lzma.patch, NONE,
	1.1 bash-completion-20060301-rpm-backups.patch, NONE,
	1.1 bash-completion-20060301-rpm-eval.patch, NONE,
	1.1 bash-completion-20060301-sqlite.patch, NONE,
	1.1 bash-completion-lzop, NONE,
	1.1 bash-completion-20060301-debian.patch, 1.1,
	1.2 bash-completion.spec, 1.28, 1.29
Message-ID: <20080911182039.4A89B70131@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1919/F-9

Modified Files:
	bash-completion-20060301-debian.patch bash-completion.spec 
Added Files:
	bash-completion-20060301-getent.patch 
	bash-completion-20060301-gzip.patch 
	bash-completion-20060301-lzma.patch 
	bash-completion-20060301-rpm-backups.patch 
	bash-completion-20060301-rpm-eval.patch 
	bash-completion-20060301-sqlite.patch bash-completion-lzop 
Log Message:
* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-13
- Borrow/improve/adapt to Fedora some patches from Mandriva: improved support
  for getent and rpm --eval, better rpm backup file avoidance, lzma support.
- Patch/unpatch to fix gzip and bzip2 options completion.
- Patch to add --rsyncable to gzip options completion.
- Add and trigger-install support for lzop.
- Associate *.sqlite with sqlite3.


bash-completion-20060301-getent.patch:

--- NEW FILE bash-completion-20060301-getent.patch ---
diff -up bash_completion/bash_completion~ bash_completion/bash_completion
--- bash_completion/bash_completion~	2006-03-01 18:20:18.000000000 +0200
+++ bash_completion/bash_completion	2008-09-07 12:25:42.000000000 +0300
@@ -8379,19 +8379,19 @@ _getent()
 			COMPREPLY=( $( compgen -A hostname $cur  ) )
 			return 0
 			;;
-		protocols)
-			COMPREPLY=( $( getent protocols | awk '{print $1}' | grep "^$cur" ) )
+		protocols|networks|ahosts|ahostsv4|ahostsv6|rpc)
+			COMPREPLY=( $( getent $prev | awk '{print $1}' | grep "^$cur" ) )
 			return 0
 			;;
-		networks)
-			COMPREPLY=( $( getent networks | awk '{print $1}' | grep "^$cur" ) )
+		aliases|shadow)
+			COMPREPLY=( $( getent $prev | cut -d : -f 1 | grep "^$cur" ) )
 			return 0
 			;;
 	esac
 
 
 	if [ $COMP_CWORD -eq 1 ]; then
-		COMPREPLY=( $( compgen -W 'passwd group hosts services protocols networks' -- $cur ) )
+		COMPREPLY=( $( compgen -W 'passwd group hosts services protocols networks ahosts ahostsv4 ahostsv6 aliases ethers netgroup rpc shadow' -- $cur ) )
 	fi
 } &&
 complete -F _getent getent

bash-completion-20060301-gzip.patch:

--- NEW FILE bash-completion-20060301-gzip.patch ---
diff -up bash_completion/bash_completion~ bash_completion/bash_completion
--- bash_completion/bash_completion~	2006-03-01 18:20:18.000000000 +0200
+++ bash_completion/bash_completion	2008-09-11 01:29:49.000000000 +0300
@@ -3281,7 +3281,7 @@ complete -F _mysqladmin mysqladmin
 have gzip &&
 _gzip()
 {
-	local cur prev xspec IFS=$'\t\n'
+	local cur prev xspec
 
 	COMPREPLY=()
 	cur=${COMP_WORDS[COMP_CWORD]}
@@ -3290,7 +3290,7 @@ _gzip()
 			--stdout --decompress --force --help --list \
 			--license --no-name --name --quiet --recursive \
 			--suffix --test --verbose --version --fast \
-			--best' -- $cur ) )
+			--best --rsyncable' -- $cur ) )
 		return 0
 	fi
 

bash-completion-20060301-lzma.patch:

--- NEW FILE bash-completion-20060301-lzma.patch ---
diff -up bash_completion/bash_completion~ bash_completion/bash_completion
--- bash_completion/bash_completion~	2006-03-01 18:20:18.000000000 +0200
+++ bash_completion/bash_completion	2008-09-10 19:02:25.000000000 +0300
@@ -796,7 +796,7 @@ _man()
 	# weed out directory path names and paths to man pages
 	COMPREPLY=( ${COMPREPLY[@]##*/?(:)} )
 	# strip suffix from man pages
-	COMPREPLY=( ${COMPREPLY[@]%.@(gz|bz2)} )
+	COMPREPLY=( ${COMPREPLY[@]%.@(gz|bz2|lzma)} )
 	COMPREPLY=( $( compgen -W '${COMPREPLY[@]%.*}' -- "${cur//\\\\/}" ) )
 
 	[[ "$prev" != [0-9ln] ]] && _filedir '[0-9ln]'
@@ -1971,7 +1971,7 @@ _rpm()
 		elif [[ ${COMP_WORDS[1]} == -b* ]]; then
 			_filedir 'spec'
 		else
-			_filedir '@(tgz|tar.@(gz|bz2))'
+			_filedir '@(tgz|tar.@(gz|bz2|lzma))'
 		fi
 		;;
 	--re@(build|compile))
@@ -1983,7 +1983,7 @@ _rpm()
 		fi
 		;;
 	--tarbuild)
-		_filedir '@(tgz|tar.@(gz|bz2))'
+		_filedir '@(tgz|tar.@(gz|bz2|lzma))'
 		;;
 	--@(re|add)sign)
 		_filedir 'rpm'
@@ -3356,6 +3356,44 @@ _bzip2()
 } &&
 complete -F _bzip2 $filenames bzip2
 
+# lzma(1) completion
+#
+have lzma &&
+_lzma()
+{
+	local cur prev xspec
+
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+
+	if [[ "$cur" == -* ]]; then
+		COMPREPLY=( $( compgen -W '-c -d -f -h -k -L -q -s \
+			-v -V -z -1 -2 -3 -4 -5 -6 -7 -8 -9 \
+			--help --decompress --compress --keep --force \
+			--test --stdout --quiet --verbose --license \
+			--version --small --fast --best --text' -- $cur ) )
+		return 0
+	fi
+
+	xspec="*.lzma"
+	if [[ "$prev" == --* ]]; then
+		[[ "$prev" == --decompress || \
+			"$prev" == --list || \
+			"$prev" == --test ]] && xspec="!"$xspec
+		[[ "$prev" == --compress ]] && xspec=
+	elif [[ "$prev" == -* ]]; then
+		[[ "$prev" == -*[dt]* ]] && xspec="!"$xspec
+		[[ "$prev" == -*z* ]] && xspec=
+	fi
+
+	_expand || return 0
+
+	COMPREPLY=( $( compgen -f -X "$xspec" -- $cur ) \
+		$( compgen -d -- $cur ) )
+} &&
+complete -F _lzma $filenames lzma
+
 # openssl(1) completion
 #
 have openssl && {
@@ -6968,7 +7006,7 @@ _info()
 		fi;
 	done  
 	# strip suffix from info pages
-	COMPREPLY=( ${COMPREPLY[@]%.@(gz|bz2)} )
+	COMPREPLY=( ${COMPREPLY[@]%.@(gz|bz2|lzma)} )
 	COMPREPLY=( $( compgen -W '${COMPREPLY[@]%.*}' -- "${cur//\\\\/}" ) )
 
 	return 0

bash-completion-20060301-rpm-backups.patch:

--- NEW FILE bash-completion-20060301-rpm-backups.patch ---
diff -up bash_completion/bash_completion~ bash_completion/bash_completion
--- bash_completion/bash_completion~	2006-03-01 18:20:18.000000000 +0200
+++ bash_completion/bash_completion	2008-09-07 12:12:11.000000000 +0300
@@ -348,10 +348,10 @@ _services()
 	local sysvdir famdir
 	[ -d /etc/rc.d/init.d ] && sysvdir=/etc/rc.d/init.d || sysvdir=/etc/init.d
 	famdir=/etc/xinetd.d
-	COMPREPLY=( $( builtin echo $sysvdir/!(*.rpmsave|*.rpmorig|*~|functions)) )
+	COMPREPLY=( $( builtin echo $sysvdir/!(*.rpmsave|*.rpmorig|*.rpmnew|*~|functions)) )
 
 	if [ -d $famdir ]; then
-		COMPREPLY=( ${COMPREPLY[@]} $( builtin echo $famdir/!(*.rpmsave|*.rpmorig|*~)) )
+		COMPREPLY=( ${COMPREPLY[@]} $( builtin echo $famdir/!(*.rpmsave|*.rpmorig|*.rpmnew|*~)) )
 	fi
 
 	COMPREPLY=( $( compgen -W '${COMPREPLY[@]#@($sysvdir|$famdir)/}' -- $cur ) )
@@ -8679,7 +8679,7 @@ _update_rc_d()
     [ -d /etc/rc.d/init.d ] && sysvdir=/etc/rc.d/init.d \
 	|| sysvdir=/etc/init.d
 
-    services=( $(echo $sysvdir/!(README*|*.sh|*.dpkg*|*.rpm*)) )
+    services=( $(echo $sysvdir/!(README*|*.sh|*.dpkg*|*.rpmsave|*.rpmorig|*.rpmnew)) )
     services=( ${services[@]#$sysvdir/} )
     options=( -f -n )
 
@@ -8745,7 +8745,7 @@ _invoke_rc_d()
     [ -d /etc/rc.d/init.d ] && sysvdir=/etc/rc.d/init.d \
 	|| sysvdir=/etc/init.d
 
-    services=( $(echo $sysvdir/!(README*|*.sh|*.dpkg*|*.rpm*)) )
+    services=( $(echo $sysvdir/!(README*|*.sh|*.dpkg*|*.rpmsave|*.rpmorig|*.rpmnew)) )
     services=( ${services[@]#$sysvdir/} )
     options=( --help --quiet --force --try-anyway --disclose-deny --query --no-fallback )
 
@@ -9281,7 +9281,7 @@ unset list
 if [ -d $BASH_COMPLETION_DIR -a -r $BASH_COMPLETION_DIR -a \
      -x $BASH_COMPLETION_DIR ]; then
 	for i in $BASH_COMPLETION_DIR/*; do
-		[[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|.rpm*) ]] &&
+		[[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpmsave|*.rpmorig|*.rpmnew) ]] &&
 			[ \( -f $i -o -h $i \) -a -r $i ] && . $i
 	done
 fi

bash-completion-20060301-rpm-eval.patch:

--- NEW FILE bash-completion-20060301-rpm-eval.patch ---
diff -up bash_completion/bash_completion~ bash_completion/bash_completion
--- bash_completion/bash_completion~	2006-03-01 18:20:18.000000000 +0200
+++ bash_completion/bash_completion	2008-09-07 12:34:55.000000000 +0300
@@ -1809,7 +1809,7 @@ _rpm()
 			--import' -- $cur ) )
 			;;
 		*)
-			COMPREPLY=( $( compgen -W '-b -e -F -i -q -t -U -V' \
+			COMPREPLY=( $( compgen -W '-b -e -E -F -i -q -t -U -V' \
 				       -- $cur ) )
 			;;
 		esac
@@ -1822,10 +1822,10 @@ _rpm()
 		_filedir -d
 		return 0
 		;;
-	--eval)
+	--eval|-E)
 		# get a list of macros
 		COMPREPLY=( $( sed -ne 's|^\(%'${cur#\%}'[^ '$'\t'']*\).*$|\1|p' \
-			       /usr/lib/rpm/macros ) )
+			       /usr/lib/rpm/macros /usr/lib/rpm/redhat/macros /etc/rpm/*macros ~/.rpmmacros ) )
 		return 0
 		;;
 	--pipe)

bash-completion-20060301-sqlite.patch:

--- NEW FILE bash-completion-20060301-sqlite.patch ---
diff -up bash_completion/bash_completion~ bash_completion/bash_completion
--- bash_completion/bash_completion~	2006-03-01 18:20:18.000000000 +0200
+++ bash_completion/bash_completion	2008-09-07 13:33:40.000000000 +0300
@@ -115,6 +115,7 @@ complete -f -X '!*.@(sxd|std|sda|sdd|odg
 complete -f -X '!*.@(sxm|smf|mml|odf)' oomath
 complete -f -X '!*.odb' oobase
 complete -f -X '!*.rpm' rpm2cpio
+complete -f -X '!*.sqlite' sqlite3
 # FINISH exclude -- do not remove this line
 
 # start of section containing compspecs that can be handled within bash


--- NEW FILE bash-completion-lzop ---
# bash completion for lzop(1)                                        -*- sh -*-
#
have lzop &&
_lzop()
{
	local cur prev xspec IFS=$' \t\n'

	COMPREPLY=()
	cur=${COMP_WORDS[COMP_CWORD]}
	prev=${COMP_WORDS[COMP_CWORD-1]}

	if [[ "$cur" == -* ]]; then
		COMPREPLY=( $( compgen -W '-d -x -l -I -t -V -h -L -q -v -c \
			-o -p -f -n -N -P -S -U	-1 -2 -3 -4 -5 -6 -7 -8 -9 \
			--fast --best --decompress --uncompress --extract \
			--test --list --ls --info --sysinfo --license --help \
			--version --stdout --output --path --force --no-name \
			--no-checksum --name --no-mode --no-time --suffix \
			--keep --unlink --delete --crc32 --no-warn --quiet \
			--silent --ignore-warn --verbose --no-stdin --filter \
			--checksum --no-color --mono --color' -- $cur ) )
		return 0
	fi

	xspec="*.?(t)lzo"
	if [[ "$prev" == --* ]]; then
		[[ "$prev" == --@(de|un)compress || \
			"$prev" == --list || \
			"$prev" == --test ]] && xspec="!"$xspec
		[[ "$prev" == --force ]] && xspec=
	elif [[ "$prev" == -* ]]; then
		[[ "$prev" == -*[dlt]* ]] && xspec="!"$xspec
		[[ "$prev" == -*f* ]] && xspec=
	elif [ "$prev" = '>' ]; then
		xspec=
	fi

	_expand || return 0

	COMPREPLY=( $( compgen -f -X "$xspec" -- $cur ) \
		    $( compgen -d -- $cur ) )
} &&
complete -F _lzop $filenames lzop

bash-completion-20060301-debian.patch:

Index: bash-completion-20060301-debian.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/F-9/bash-completion-20060301-debian.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-completion-20060301-debian.patch	27 Feb 2007 23:38:43 -0000	1.1
+++ bash-completion-20060301-debian.patch	11 Sep 2008 18:20:08 -0000	1.2
@@ -9,12 +9,3 @@
  
  # renice(8) completion
  #
-@@ -3325,7 +3323,7 @@
- have bzip2 &&
- _bzip2()
- {
--	local cur prev xspec
-+	local cur prev xspec IFS=$'\t\n'
- 
- 	COMPREPLY=()
- 	cur=${COMP_WORDS[COMP_CWORD]}


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/F-9/bash-completion.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- bash-completion.spec	23 Jul 2008 17:09:30 -0000	1.28
+++ bash-completion.spec	11 Sep 2008 18:20:08 -0000	1.29
@@ -1,12 +1,13 @@
 Name:           bash-completion
 Version:        20060301
-Release:        12
+Release:        13
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
 License:        GPLv2+
 URL:            http://www.caliban.org/bash/
 Source0:        http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2
+Source1:        %{name}-lzop
 Source2:        %{name}-mock
 Source3:        %{name}-repomanage
 Source4:        %{name}-plague-client
@@ -16,6 +17,12 @@
 Patch3:         %{name}-20060301-jpeg2000-304771.patch
 Patch4:         %{name}-20060301-mediafiles-444467.patch
 Patch5:         %{name}-20060301-svn-filenames-430059.patch
+Patch6:         %{name}-20060301-gzip.patch
+Patch7:         %{name}-20060301-lzma.patch
+Patch8:         %{name}-20060301-rpm-backups.patch
+Patch9:         %{name}-20060301-rpm-eval.patch
+Patch10:        %{name}-20060301-getent.patch
+Patch11:        %{name}-20060301-sqlite.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,7 +41,14 @@
 %patch3
 %patch4
 %patch5
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
+install -pm 644 %{SOURCE1} contrib/lzop
 install -pm 644 %{SOURCE2} contrib/mock
 install -pm 644 %{SOURCE3} contrib/repomanage
 install -pm 644 %{SOURCE4} contrib/plague-client
@@ -114,6 +128,11 @@
 %triggerun -- lilypond
 %do_triggerun lilypond
 
+%triggerin -- lzop
+%do_triggerin lzop
+%triggerun -- lzop
+%do_triggerun lzop
+
 %triggerin -- mailman
 %do_triggerin mailman
 %triggerun -- mailman
@@ -200,6 +219,14 @@
 
 
 %changelog
+* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-13
+- Borrow/improve/adapt to Fedora some patches from Mandriva: improved support
+  for getent and rpm --eval, better rpm backup file avoidance, lzma support.
+- Patch/unpatch to fix gzip and bzip2 options completion.
+- Patch to add --rsyncable to gzip options completion.
+- Add and trigger-install support for lzop.
+- Associate *.sqlite with sqlite3.
+
 * Wed Jul 23 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-12
 - Fix plague-client completion install (#456355, Ricky Zhou).
 - Trigger-install support for sitecopy.



From terjeros at fedoraproject.org  Thu Sep 11 17:41:16 2008
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Thu, 11 Sep 2008 17:41:16 +0000 (UTC)
Subject: rpms/xosview/F-8 XOsview.png, NONE,
	1.1 xosview-1.8.3-app-defaults.patch, NONE,
	1.1 xosview-1.8.3-disable-flags.patch, NONE, 1.1 xosview.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080911174116.9443370131@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/xosview/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21743/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	XOsview.png xosview-1.8.3-app-defaults.patch 
	xosview-1.8.3-disable-flags.patch xosview.spec 
Log Message:
Sync with rawhide.



xosview-1.8.3-app-defaults.patch:

--- NEW FILE xosview-1.8.3-app-defaults.patch ---
diff -uNr -x '*~' xosview-1.8.3.cvs/config/Makefile.top.in xosview-1.8.3/config/Makefile.top.in
--- xosview-1.8.3.cvs/config/Makefile.top.in	2008-04-03 19:20:54.000000000 +0200
+++ xosview-1.8.3/config/Makefile.top.in	2008-04-03 19:22:05.000000000 +0200
@@ -49,7 +49,7 @@
 PREFIX_TO_USE=@prefix@
 BINDIR=$(PREFIX_TO_USE)/bin
 MANDIR=$(PREFIX_TO_USE)/share/man/man1
-XAPPLOADDIR=$(PREFIX_TO_USE)/lib/X11/app-defaults
+XAPPLOADDIR=$(PREFIX_TO_USE)/share/X11/app-defaults
 PACKAGENAME=xosview-$(VERS)
 DISTRIBDIR=@top_srcdir@/../$(PACKAGENAME)
 
diff -uNr -x '*~' xosview-1.8.3.cvs/Xrm.cc xosview-1.8.3/Xrm.cc
--- xosview-1.8.3.cvs/Xrm.cc	2008-04-03 19:20:55.000000000 +0200
+++ xosview-1.8.3/Xrm.cc	2008-04-03 19:21:43.000000000 +0200
@@ -159,7 +159,7 @@
     XrmQuarkToString(_class));
   if (rfilename != NULL)
     XrmCombineFileDatabase (rfilename, &_db, 1);
-  result = snprintf(rfilename, sizeof rfilename, "/usr/lib/X11/app-defaults/%s",
+  result = snprintf(rfilename, sizeof rfilename, "/usr/share/X11/app-defaults/%s",
     XrmQuarkToString(_class));
   if (result >= 0 && result < (int)sizeof(rfilename))
     XrmCombineFileDatabase (rfilename, &_db, 1);

xosview-1.8.3-disable-flags.patch:

--- NEW FILE xosview-1.8.3-disable-flags.patch ---
--- xosview-1.8.3/config/aclocal.m4~	2008-04-07 21:54:43.000000000 +0200
+++ xosview-1.8.3/config/aclocal.m4	2008-04-07 21:55:52.000000000 +0200
@@ -55,7 +55,7 @@
 
 dnl	For gcc-based (or primarily-gcc) OS's, set EXTRA_CXXFLAGS to -Wall -O4
 AC_DEFUN(AC_GCC_EXTRA_CXXFLAGS, [
-	EXTRA_CXXFLAGS="-W -Wall -O3"
+	EXTRA_CXXFLAGS=""
 ])
 
 AC_DEFUN(SMP_LINUX,


--- NEW FILE xosview.spec ---
%define date   20080301

Name:          xosview
Summary:       An X Window System utility for monitoring system resources
Version:       1.8.3
Release:       13.%{date}cvs%{?dist}

Group:         Applications/System
# The netbsd/swapinternal.{cc,h} source files are BSD only (with 
# advertising), but neither file is used in the linux version of 
# xosview.  Instead, the source files used are linux/swapmeter.{cc,h}, 
# both of which fall under the GPL. All other files are either GPL 
# based, or can fall under either the BSD or GPL copyright.
License:       GPL+
URL:           http://xosview.sourceforge.net/

# A snapshot from %{date} of the source was used due to significant changes 
# that have occurred compared to the current release version. 
# $ cvs -z3 -d:pserver:anonymous at xosview.cvs.sourceforge.net:/cvsroot/xosview \
#     co -P -D%{date} xosview 
# $ mv xosview xosview-1.8.3-%{date}
# $ tar czvf xosview-1.8.3-%{date}.tar.gz xosview-1.8.3-%{date}
Source0:       %{name}-%{version}-%{date}.tar.gz

# An old png file is being used for the icon.  It is located at:
Source1:       http://roxos.sunsite.dk/dev-contrib/guido/XOsview.png

Patch0:        xosview-1.8.3-app-defaults.patch
Patch1:        xosview-1.8.3-disable-flags.patch
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: autoconf libXpm-devel libX11-devel desktop-file-utils

%description
The xosview utility displays a set of bar graphs which show the
current system state, including memory usage, CPU usage, system load,
etc. Xosview runs under the X Window System.

%prep
%setup -q -n %{name}-%{version}-%{date}
%patch0 -p1
%patch1 -p1

%build
./autogen.sh

# From redhat-rpm-config 9.0.3-1 (F-10) config.{guess,sub} are
# not overwritten automatically. The original config.{guess,sub}
# do not work on ppc64
#
# The following /usr/lib cannot be %%_libdir !!
%{__cp} -p /usr/lib/rpm/config.{guess,sub} config/

%configure
%{__make} %{?_smp_mflags} all

cat > %{name}.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=OS Resource Viewer
Comment=
Exec=xosview
Terminal=false
Type=Application
Icon=xosview
Categories=Utility;System;
EOF

%install
%{__rm} -rf %{buildroot}
%{__install} -d %{buildroot}%{_bindir}   \
    %{buildroot}%{_mandir}/man1          \
    %{buildroot}%{_datadir}/icons        \
    %{buildroot}%{_datadir}/applications \
    %{buildroot}%{_datadir}/X11/app-defaults

%{__make} install PREFIX_TO_USE=%{buildroot}%{_prefix} INSTALL="%{__install} -p"
%{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/%{name}.png
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc CHANGES COPYING COPYING.GPL README README.linux TODO
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*
%{_datadir}/icons/%{name}.png
%{_datadir}/X11/app-defaults/XOsview
%{_datadir}/applications/%{name}.desktop

%changelog
* Mon Sep  8 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-13.20080301cvs
- Fix license and desktop file

* Mon Sep  8 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-12.20080301cvs
- Drop fedora as vendor
- Use date in cvs checkout

* Tue May 20 2008 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> - 1.8.3-11.20080520cvs
- Pulling icon directly from website

* Tue May 20 2008 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> - 1.8.3-10.20080520cvs
- Added Source1 URL
- Fixed ppc64 config error
- Added -q to %%setup again (deleted by accident in release 9)
- Fixed macros conventions
- Only including README and README.linux files

* Mon May 19 2008 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> - 1.8.3-9.20080519cvs
- Fixed naming guidelines (again)
- Removed CXXFLAGS (redundant)

* Fri Apr 25 2008 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> - 1.8.3.20080425cvs-8
- Clarified BSD vs. GPL License Issue
- Pulling source dirctly from CVS
- Removed CVS patch generation file since current CVS snapshot is used
- Removed COPYING.BSD file (see License Section above for explanation)
- Fixed Post-Release Naming Guidelines
- Fixed Categories section in Desktop file

* Thu Apr 17 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-7
- Add cvs patch generation info

* Mon Apr  7 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-6
- Remove extra build flags

* Thu Apr  3 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-5
- Patches from cvs, remove private patches
- Add app-defaults patch
- Fix license, summary, src url, buildroot and desktop file
- Random clean up

* Wed Feb 20 2008 Chelban Vasile <vchelban at fedoramd.org> 1.8.3-4.prof_k
- BuildRequires: libXpm-devel, libX11-devel
- Removed i386 build restriction

* Sun Dec 16 2007 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> xosview-1.8.3-3.fc8.prof_k
- Fixed man location

* Wed Dec 12 2007 Gregory Kriehn <gkriehn at csufresno.edu> xosview-1.8.3-2.fc8.prof_k
- Cleaned up spec file
- Now includes doc files

* Mon Dec 3 2007 Gregory Kriehn <gkriehn at csufresno.edu> xosview-1.8.3-1.fc8.prof_k
- Recompiled for Fedora 8

* Sun Mar 26 2006 Ron Yorston <rmy at tigress.co.uk> 1.8.3-1.tig1.fc5
- fixes to compile with modular X on FC5

* Wed Jan  2 2005 Ron Yorston <rmy at tigress.co.uk> 1.8.2-1.tig1
- backport from FC3 to RHEL3
- change default reosurce for CPU to 'cpuGraph: False'

* Mon Jul 19 2004 Than Ngo <than at redhat.com> 1.8.2-1
- update to 1.8.2
- remove all patches, which are included in new upstream
- bug #126432, #124156, #124569, #124896

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed May 19 2004 Than Ngo <than at redhat.com> 1.8.0-21
- fix PAGE/DISK lines with kernel > 2.5, they work again.

* Wed May 19 2004 Than Ngo <than at redhat.com> 1.8.0-20
- fixed build problem with gcc34

* Wed Mar 10 2004 Than Ngo <than at redhat.com> 1.8.0-19
- added nfs traffic

* Tue Feb 24 2004 Than Ngo <than at redhat.com> 1.8.0-18 
- get rid of rpath

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jan 20 2004 Than Ngo <than at redhat.com> 1.8.0-16
- add patch to get xosview working on 2.6 kernel

* Tue Jul 08 2003 Than Ngo <than at redhat.com> 1.8.0-15
- cleanup

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu May 22 2003 Than Ngo <than at redhat.com> 1.8.0-13
- fix build with gcc 3.3

* Wed Apr 30 2003 Elliot Lee <sopwith at redhat.com> 1.8.0-12
- Fix powerpc64 & ia64 according to the pattern of other non-i386 archs

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Wed Dec 11 2002 Tim Powers <timp at redhat.com> 1.8.0-10
- rebuild on all arches

* Sat Aug 10 2002 Elliot Lee <sopwith at redhat.com>
- rebuilt with gcc-3.2 (we hope)

* Wed Jul 24 2002 Than Ngo <than at redhat.com> 1.8.0-7
- desktop file issue (bug #69551)

* Tue Jul 23 2002 Tim Powers <timp at redhat.com> 1.8.0-6
- build using gcc-3.2-0.1

* Fri Jun 21 2002 Tim Powers <timp at redhat.com> 1.8.0-5
- automated rebuild

* Thu Jun 20 2002 Than Ngo <than at redhat.com> 1.8.0-4
- Don't forcibly strip binaries

* Sun Jun 2 2002 Than Ngo <than at redhat.com> 1.8.0-3
- fix a bug in cpumeter (bug #64798)

* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Wed Apr 24 2002 Karsten Hopp <karsten at redhat.de> 1.8.0-1
- update to current version
- redo .proc patch
- change URLs

* Fri Feb 22 2002 Than Ngo <than at redhat.com> 1.7.3-10
- rebuild in new environment.

* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Tue Dec 18 2001 Than Ngo <than at redhat.com> 1.7.3-8
- xosview +net goes into hard loop (bug #57150)
- add patch for building against g++ 3
- use RPM_OPT_FLAG

* Wed Nov 14 2001 Than Ngo <than at redhat.com> 1.7.3-7
- added missing Icon in desktop file
- fixed Url

* Wed Sep 12 2001 Tim Powers <timp at redhat.com>
- rebuild with new gcc and binutils

* Tue Apr 10 2001 Phil Knirsch <pknirsch at redhat.de>
- Fix for s390 patch to actually work

* Tue Mar 20 2001 Preston Brown <pbrown at redhat.com>
- fix up .desktop entry

* Sun Feb 11 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- fix typo

* Sun Feb 11 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- adjusted s390 patches

* Wed Jan 31 2001 Preston Brown <pbrown at redhat.com>
- upgrade to 1.7.3, fixes (#11380)

* Mon Jan 15 2001 Than Ngo <than at redhat.com>
- ported to ibm s/390

* Tue Jul 25 2000 Jeff Johnson <jbj at redhat.com>
- migrate wmconfig to applnk.

* Fri Jul 14 2000 Jeff Johnson <jbj at redhat.com>
- rebuild the auto-rebuild.
- exclude alpha and i164 for now.

* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Tue Jul  2 2000 Jakub Jelinek <jakub at redhat.com>
- Rebuild with new C++

* Fri Jun  2 2000 Jeff Johnson <jbj at redhat.com>
- rebuild for 7.0

* Mon Feb 14 2000 Matt Wilson <msw at redhat.com>
- rebuild on i386

* Mon Feb  7 2000 Jeff Johnson <jbj at redhat.com>
- compress man pages.

* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
- auto rebuild in the new build environment (release 2)

* Mon Mar  8 1999 Jeff Johnson <jbj at redhat.com>
- updated to 1.7.1.

* Wed Mar  3 1999 Matt Wilson <msw at redhat.com>
- updated to 1.7.0

* Fri Feb  5 1999 Bill Nottingham <notting at redhat.com>
- build against new libstdc++, build on arm

* Tue Dec 22 1998 Jeff Johnson <jbj at redhat.com>
- update to 1.6.2.a.

* Tue Jun 16 1998 Jeff Johnson <jbj at redhat.com>
- add sparc/alpha functionality.
- add %%clean

* Mon Jun 01 1998 Prospector System <bugs at redhat.com>
- translations modified for de

* Mon Jun 01 1998 Erik Troan <ewt at redhat.com>
- how the hell did this get setuid root?

* Thu May 07 1998 Prospector System <bugs at redhat.com>
- translations modified for de, fr, tr

* Wed Apr 29 1998 Cristian Gafton <gafton at redhat.com>
- upgraded to 1.5.1 (so that it compiles with egcs)
- buildroot

* Tue Nov  4 1997 Erik Troan <ewt at redhat.com>
- commented out line causing core dumps when exiting

* Fri Oct 24 1997 Marc Ewing <marc at redhat.com>
- wmconfig

* Fri Aug 22 1997 Erik Troan <ewt at redhat.com>
- built against glibc


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xosview/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 01:05:28 -0000	1.1
+++ .cvsignore	11 Sep 2008 17:40:46 -0000	1.2
@@ -0,0 +1 @@
+xosview-1.8.3-20080301.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xosview/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 01:05:28 -0000	1.1
+++ sources	11 Sep 2008 17:40:46 -0000	1.2
@@ -0,0 +1 @@
+25cf811c5ca77c37baeac6e516a58a66  xosview-1.8.3-20080301.tar.gz



From jkeating at fedoraproject.org  Thu Sep 11 17:06:21 2008
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Thu, 11 Sep 2008 17:06:21 +0000 (UTC)
Subject: rpms/perl-RPM2/devel perl-RPM2.spec,1.5,1.6
Message-ID: <20080911170621.4DC0770131@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/perl-RPM2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10791

Modified Files:
	perl-RPM2.spec 
Log Message:
* Thu Sep 11 2008 Jesse Keating <jkeating at redhat.com> - 0.67-6
- Rebuild for rpm deps



Index: perl-RPM2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-RPM2/devel/perl-RPM2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-RPM2.spec	7 Mar 2008 02:15:42 -0000	1.5
+++ perl-RPM2.spec	11 Sep 2008 17:05:50 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		perl-RPM2
 Version:	0.67
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Perl bindings for the RPM Package Manager API
 License:	GPL+ or Artistic
 Group:		Development/Libraries
@@ -52,6 +52,9 @@
 %{_mandir}/man3/RPM2.3pm*
 
 %changelog
+* Thu Sep 11 2008 Jesse Keating <jkeating at redhat.com> - 0.67-6
+- Rebuild for rpm deps
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.67-5
 Rebuild for new perl
 



From jkeating at fedoraproject.org  Thu Sep 11 17:07:41 2008
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Thu, 11 Sep 2008 17:07:41 +0000 (UTC)
Subject: rpms/pyclutter/devel pyclutter.spec,1.9,1.10
Message-ID: <20080911170741.048E070131@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/pyclutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11330

Modified Files:
	pyclutter.spec 
Log Message:
* Thu Sep 11 2008 Jesse Keating <jkeating at redhat.com> - 0.6.2-4
- Rebuild for new clutter



Index: pyclutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyclutter/devel/pyclutter.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pyclutter.spec	28 Aug 2008 19:49:23 -0000	1.9
+++ pyclutter.spec	11 Sep 2008 17:07:10 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           pyclutter
 Version:        0.6.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Python modules that allow you to use the Clutter toolkit
 
 Group:          Development/Languages
@@ -125,6 +125,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Jesse Keating <jkeating at redhat.com> - 0.6.2-4
+- Rebuild for new clutter
+
 * Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.6.2-3
 - Fix unowned directory
 



From scop at fedoraproject.org  Thu Sep 11 18:51:43 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 11 Sep 2008 18:51:43 +0000 (UTC)
Subject: rpms/w3c-markup-validator/F-9
	w3c-markup-validator-0.8.3-errlog-trash.patch, NONE,
	1.1 w3c-markup-validator.spec, 1.20, 1.21
Message-ID: <20080911185143.DDC2970131@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/w3c-markup-validator/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10970/F-9

Modified Files:
	w3c-markup-validator.spec 
Added Files:
	w3c-markup-validator-0.8.3-errlog-trash.patch 
Log Message:
* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.3-2
- Upstream fix for server error log trashing.


w3c-markup-validator-0.8.3-errlog-trash.patch:

--- NEW FILE w3c-markup-validator-0.8.3-errlog-trash.patch ---
diff -u -r1.591 -r1.592
--- httpd/cgi-bin/check	14 Jul 2008 03:15:25 -0000	1.591
+++ httpd/cgi-bin/check	14 Aug 2008 18:04:34 -0000	1.592
@@ -624,14 +624,14 @@
 
 # Always transcode, even if the content claims to be UTF-8
 $File = transcode($File);
-if (($File->{ContentType} == "text/html") and ($File->{Charset}->{Default}) and $File->{'Error Flagged'}) {
+if (($File->{ContentType} eq "text/html") and ($File->{Charset}->{Default}) and $File->{'Error Flagged'}) {
     $File->{'Error Flagged'} = FALSE; # reset
     # we try again, this time with win-1252
     $File->{Charset}->{Use} = 'windows-1252';
     &add_warning('W04', {W04_charset => "windows-1252", W04_also_tried=> "UTF-8"});
     $File = transcode($File);
 }
-if (($File->{ContentType} == "text/html") and ($File->{Charset}->{Default}) and $File->{'Error Flagged'}) {
+if (($File->{ContentType} eq "text/html") and ($File->{Charset}->{Default}) and $File->{'Error Flagged'}) {
     $File->{'Error Flagged'} = FALSE; # reset
     # we try again, this time with latin1...
     $File->{Charset}->{Use} = 'iso-8859-1';


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-markup-validator/F-9/w3c-markup-validator.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- w3c-markup-validator.spec	12 Aug 2008 06:30:25 -0000	1.20
+++ w3c-markup-validator.spec	11 Sep 2008 18:51:13 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:           w3c-markup-validator
 Version:        0.8.3
-Release:        1
+Release:        2
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
@@ -16,6 +16,7 @@
 Patch3:         %{name}-0.8.2-xhtml1.patch
 Patch4:         %{name}-0.8.1-extra-encoders.patch
 Patch5:         %{name}-0.8.3-htmli18n.patch
+Patch6:         %{name}-0.8.3-errlog-trash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -51,6 +52,7 @@
 %patch3 -p2
 %patch4 -p1
 %patch5 -p0
+%patch6 -p0
 find . -name "*.orig" -print0 | xargs -0 rm
 
 # Localize configs.
@@ -134,6 +136,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.3-2
+- Upstream fix for server error log trashing.
+
 * Tue Aug 12 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.3-1
 - 0.8.3 + upstream types.conf fix; missing form enctype patch applied upstream.
 - Drop disttag.



From scop at fedoraproject.org  Thu Sep 11 18:51:44 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 11 Sep 2008 18:51:44 +0000 (UTC)
Subject: rpms/w3c-markup-validator/devel
	w3c-markup-validator-0.8.3-errlog-trash.patch, NONE,
	1.1 w3c-markup-validator.spec, 1.20, 1.21
Message-ID: <20080911185144.087EF70131@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/w3c-markup-validator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10970/devel

Modified Files:
	w3c-markup-validator.spec 
Added Files:
	w3c-markup-validator-0.8.3-errlog-trash.patch 
Log Message:
* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.3-2
- Upstream fix for server error log trashing.


w3c-markup-validator-0.8.3-errlog-trash.patch:

--- NEW FILE w3c-markup-validator-0.8.3-errlog-trash.patch ---
diff -u -r1.591 -r1.592
--- httpd/cgi-bin/check	14 Jul 2008 03:15:25 -0000	1.591
+++ httpd/cgi-bin/check	14 Aug 2008 18:04:34 -0000	1.592
@@ -624,14 +624,14 @@
 
 # Always transcode, even if the content claims to be UTF-8
 $File = transcode($File);
-if (($File->{ContentType} == "text/html") and ($File->{Charset}->{Default}) and $File->{'Error Flagged'}) {
+if (($File->{ContentType} eq "text/html") and ($File->{Charset}->{Default}) and $File->{'Error Flagged'}) {
     $File->{'Error Flagged'} = FALSE; # reset
     # we try again, this time with win-1252
     $File->{Charset}->{Use} = 'windows-1252';
     &add_warning('W04', {W04_charset => "windows-1252", W04_also_tried=> "UTF-8"});
     $File = transcode($File);
 }
-if (($File->{ContentType} == "text/html") and ($File->{Charset}->{Default}) and $File->{'Error Flagged'}) {
+if (($File->{ContentType} eq "text/html") and ($File->{Charset}->{Default}) and $File->{'Error Flagged'}) {
     $File->{'Error Flagged'} = FALSE; # reset
     # we try again, this time with latin1...
     $File->{Charset}->{Use} = 'iso-8859-1';


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-markup-validator/devel/w3c-markup-validator.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- w3c-markup-validator.spec	12 Aug 2008 06:32:45 -0000	1.20
+++ w3c-markup-validator.spec	11 Sep 2008 18:51:13 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:           w3c-markup-validator
 Version:        0.8.3
-Release:        1
+Release:        2
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
@@ -16,6 +16,7 @@
 Patch3:         %{name}-0.8.2-xhtml1.patch
 Patch4:         %{name}-0.8.1-extra-encoders.patch
 Patch5:         %{name}-0.8.3-htmli18n.patch
+Patch6:         %{name}-0.8.3-errlog-trash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -51,6 +52,7 @@
 %patch3 -p2
 %patch4 -p1
 %patch5 -p0
+%patch6 -p0
 find . -name "*.orig" -print0 | xargs -0 rm
 
 # Localize configs.
@@ -134,6 +136,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.3-2
+- Upstream fix for server error log trashing.
+
 * Tue Aug 12 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.3-1
 - 0.8.3 + upstream types.conf fix; missing form enctype patch applied upstream.
 - Drop disttag.



From terjeros at fedoraproject.org  Thu Sep 11 17:58:23 2008
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Thu, 11 Sep 2008 17:58:23 +0000 (UTC)
Subject: rpms/perl-Config-Grammar/F-8 perl-Config-Grammar.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080911175823.670F470131@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/perl-Config-Grammar/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27113/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Config-Grammar.spec 
Log Message:
Sync with rawhide.




--- NEW FILE perl-Config-Grammar.spec ---
Name:           perl-Config-Grammar
Version:        1.10
Release:        1%{?dist}
Summary:        Grammar-based, user-friendly config parser
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Config-Grammar/
Source0:        http://www.cpan.org/authors/id/D/DS/DSCHWEI/Config-Grammar-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::Simple)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Config::Grammar is a module to parse configuration files. The
configuration may consist of multiple-level sections with assignments
and tabular data.  The parsed data will be returned as a hash
containing the whole configuration. Config::Grammar uses a grammar
that is supplied upon creation of a Config::Grammar object to parse
the configuration file and return helpful error messages in case of
syntax errors. Using the makepod method you can generate documentation
of the configuration file format.

%prep
%setup -q -n Config-Grammar-%{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 -delete
%{_fixperms} %{buildroot}/*

%check
%{__make} test

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc Changes README
%{perl_vendorlib}/Config/Grammar*
%{_mandir}/man3//Config::Grammar*

%changelog
* Tue Sep 09 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.10-1
- initial build based on cpanspec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Grammar/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 02:48:08 -0000	1.1
+++ .cvsignore	11 Sep 2008 17:57:53 -0000	1.2
@@ -0,0 +1 @@
+Config-Grammar-1.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Grammar/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 02:48:08 -0000	1.1
+++ sources	11 Sep 2008 17:57:53 -0000	1.2
@@ -0,0 +1 @@
+ce904f687f1ee9c70521142a2e0f15c9  Config-Grammar-1.10.tar.gz



From rdieter at fedoraproject.org  Thu Sep 11 18:32:29 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 11 Sep 2008 18:32:29 +0000 (UTC)
Subject: rpms/kdebluetooth/devel kdebluetooth.spec,1.16,1.17
Message-ID: <20080911183229.4C97270131@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5657

Modified Files:
	kdebluetooth.spec 
Log Message:
* Thu Sep 11 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.43.beta8
- fix build (no kdepim3 on f10+)
- spec cosmetics
- drop multilib upgrade Obsoletes hack



Index: kdebluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/devel/kdebluetooth.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kdebluetooth.spec	11 Sep 2008 14:32:31 -0000	1.16
+++ kdebluetooth.spec	11 Sep 2008 18:31:59 -0000	1.17
@@ -1,9 +1,14 @@
 %define reltype	beta8
 
+# no kdepim3 on f10+
+%if ! 0%{?fedora} > 9
+%define kdepim3 kdepim
+%endif
+
 Summary:		The KDE Bluetooth Framework
 Name:			kdebluetooth
 Version:		1.0 
-Release:		0.42.%{reltype}%{?dist}
+Release:		0.43.%{reltype}%{?dist}
 License:		GPLv2+
 Group:			Applications/Communications
 URL:			http://bluetooth.kmobiletools.org/
@@ -16,7 +21,7 @@
 BuildRequires:	xmms-devel
 BuildRequires:	bluez-libs-devel
 BuildRequires:	kdelibs3-devel
-BuildRequires:	kdepim3-devel
+%{?kdepim3:BuildRequires: %{kdepim3}-devel}
 BuildRequires:	openobex-devel >= 1.1
 BuildRequires:	libusb-devel
 BuildRequires:	pkgconfig
@@ -39,7 +44,7 @@
 %package libs
 Summary: Base libraries for %{name}
 Group:	 System Environment/Libraries
-Obsoletes:		%{name} < %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %if 0%{?fedora} >= 8
 Provides:		dbus-bluez-pin-helper
@@ -70,12 +75,13 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 %configure \
-	--with-bluetooth-libraries=%{_libdir}	\
-	--disable-rpath							\
-	--enable-new-ldflags					\
-	--disable-debug							\
-	--disable-dependency-tracking			\
+	--with-bluetooth-libraries=%{_libdir} \
+	--disable-rpath	\
+	--enable-new-ldflags \
+	--disable-debug \
+	--disable-dependency-tracking \
 	--enable-final
+
 make %{?_smp_mflags} 
 
 
@@ -84,13 +90,13 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 for DESK_PATH in applications/kde applnk/Utilities ; do
-	desktop-file-install												\
-		--mode=644														\
-		--vendor=""														\
-		--dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde				\
-		--remove-category="Network"										\
-		--add-category="System"											\
-		--delete-original												\
+	desktop-file-install \
+		--mode=644 \
+		--vendor="" \
+		--dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+		--remove-category="Network" \
+		--add-category="System"	\
+		--delete-original \
 		$RPM_BUILD_ROOT%{_datadir}/$DESK_PATH/*.desktop ||:
 done
 
@@ -102,7 +108,7 @@
 	%find_lang $PROG && cat $PROG.lang >> %{name}.lang	||:
 done
 
-rm -f $RPM_BUILD_ROOT/%{_datadir}/applnk/Settings/Network/Bluetooth/.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Settings/Network/Bluetooth/.directory
 
 
 %clean
@@ -129,7 +135,9 @@
 %{_bindir}/kioobex_start
 %{_bindir}/kinputwizard
 %{_datadir}/applications/kde/*.desktop
+# FIXME
 %{_datadir}/applnk/.hidden/*.desktop
+# FIXME: kde3-only
 %{_datadir}/apps/konqsidebartng/virtual_folders/services/*.desktop
 %{_datadir}/apps/*/*
 %{_datadir}/autostart/*
@@ -166,6 +174,11 @@
 
 
 %changelog
+* Thu Sep 11 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.43.beta8
+- fix build (no kdepim3 on f10+)
+- spec cosmetics
+- drop multilib upgrade Obsoletes hack
+
 * Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 1.0-0.42.beta8
 - Rebuild
 



From hadess at fedoraproject.org  Thu Sep 11 18:03:33 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 18:03:33 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.60,
	1.61
Message-ID: <20080911180333.7CEF370131@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-serv28884

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-3
- Rebuild for new RPM provides



Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- gstreamer-plugins-base.spec	22 Aug 2008 23:48:30 -0000	1.60
+++ gstreamer-plugins-base.spec	11 Sep 2008 18:03:03 -0000	1.61
@@ -5,7 +5,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.20
-Release:  	2%{?dist}	
+Release:  	3%{?dist}	
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -242,6 +242,9 @@
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-3
+- Rebuild for new RPM provides
+
 * Sat Aug 23 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-2
 - Fix useless codeina popup when playing recent ogg files (#458404)
 



From ssp at fedoraproject.org  Thu Sep 11 18:34:18 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu, 11 Sep 2008 18:34:18 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xserver-1.5.0-comment-out-glxdri2.c, NONE,
	1.1 xorg-x11-server.spec, 1.351, 1.352
Message-ID: <20080911183418.8F0CB70131@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6370

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.0-comment-out-glxdri2.c 
Log Message:
Comment out glxdri2.c since it doesn't compile


--- NEW FILE xserver-1.5.0-comment-out-glxdri2.c ---
>From 70cd71bc194060b58c0973ba931f69b4de0f698d Mon Sep 17 00:00:00 2001
From: =?utf-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <sandmann at redhat.com>
Date: Thu, 11 Sep 2008 14:28:25 -0400
Subject: [PATCH] Comment out glxdri2.c

---
 glx/glxdri2.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 9a3bc1f..4862124 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -1,3 +1,4 @@
+#if 0
 /*
  * Copyright ?? 2007 Red Hat, Inc
  *
@@ -582,3 +583,4 @@ __GLXprovider __glXDRI2Provider = {
     "DRI2",
     NULL
 };
+#endif
-- 
1.6.0.1



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- xorg-x11-server.spec	11 Sep 2008 17:47:24 -0000	1.351
+++ xorg-x11-server.spec	11 Sep 2008 18:33:48 -0000	1.352
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.0
-Release:   5%{?dist}
+Release:   6%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -55,6 +55,7 @@
 
 Patch2013:  xserver-1.4.99-document-fontpath-correctly.patch
 Patch2014:  xserver-1.5.0-projector-fb-size.patch
+Patch2015:  xserver-1.5.0-comment-out-glxdri2.c
 
 # Trivial things to never merge upstream ever
 # Don't merge this without protecting the gccisms.
@@ -99,7 +100,7 @@
 
 BuildRequires: xorg-x11-proto-devel >= 7.4-3
 BuildRequires: damageproto >= 1.1
-BuildRequires: dri2proto >= 1.1
+BuildRequires: dri2proto >= 1.99.1
 BuildRequires: fixesproto >= 4.0
 BuildRequires: glproto >= 1.4.9
 BuildRequires: kbproto >= 1.0.3
@@ -499,6 +500,10 @@
 
 
 %changelog
+* Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 1.5.0-6
+- Comment out glxdri2.c since it doesn't compile. (krh says it
+  won't break at runtime). 
+
 * Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 1.5.0-5
 - Bump BuildRequires on mesa-GL-devel. Maybe that will work.
 



From hadess at fedoraproject.org  Thu Sep 11 18:27:33 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 18:27:33 +0000 (UTC)
Subject: rpms/gstreamer/devel gstreamer.spec,1.82,1.83
Message-ID: <20080911182733.103D570131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3663

Modified Files:
	gstreamer.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-3
- Update filelist as well



Index: gstreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- gstreamer.spec	11 Sep 2008 17:56:56 -0000	1.82
+++ gstreamer.spec	11 Sep 2008 18:27:02 -0000	1.83
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}
 Version: 	0.10.20
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -209,8 +209,12 @@
 %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}
 
 %{_libdir}/rpm/gstreamer.prov
+%{_sysconfdir}/rpm/macros.gstreamer
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-3
+- Update filelist as well
+
 * Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-2
 - Update gstreamer provides work for the new RPM, see #438225
 



From maxamillion at fedoraproject.org  Thu Sep 11 16:42:14 2008
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Thu, 11 Sep 2008 16:42:14 +0000 (UTC)
Subject: rpms/binclock/devel binclock.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080911164214.7F23970131@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/binclock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3895/devel

Modified Files:
	.cvsignore sources 
Added Files:
	binclock.spec import.log 
Log Message:
First upload of binclock package




--- NEW FILE binclock.spec ---
Name:           binclock
Summary:        Fullscreen console binary clock
Version:        0.3.2
Release:        2%{?dist}
License:        GPLv2
Group:          Applications/Text
URL:            http://binclock.sourceforge.net

Source0:        http://prdownloads.sourceforge.net/%{name}/%{name}_%{version}-1.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

BuildArch:      noarch

BuildRequires:  python

Requires:       python

%description
Fullscreen console binary clock.
Features:

    * Written in Python (needs version 2 or later)
    * Uses ncurses
    * In color
    * Proper SIGWINCH handling


%prep
#NONE

%setup -q
#NONE

%build
#NONE

%install
#For sanity protection, nuke buildroot
%{__rm} -rf %{buildroot}

#get rid of the developers debian folder
%{__rm} -rf debian

#get rid of the Makefile as it is not needed
%{__rm} -rf Makefile

#move the file to get rid of extension, environment is known
mv binclock.py binclock
%{__rm} -rf *.py

#Install the executable
install -Dp -m0755 binclock %{buildroot}%{_bindir}/binclock

%clean
%{__rm} -rf %{buildroot}

%files
%defattr (-, root, root)
%{_bindir}/binclock

%changelog
* Thu Sep 04 2008 Adam Miller <maxamillion [AT] gmail.com> - 0.3.2-2
- Fixed issues pointed out by package review:
- License has been altered, incorrect assumption previously taken from the sourceforge page.
- Stylistic changes made to satisfy rpmlint warning
* Wed Aug 20 2008 Adam Miller <maxamillion [AT] gmail.com> - 0.3.2-1
- First packaging attempt


--- NEW FILE import.log ---
binclock-0_3_2-2:HEAD:binclock-0.3.2-2.src.rpm:1221151263


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/binclock/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 02:21:42 -0000	1.1
+++ .cvsignore	11 Sep 2008 16:41:44 -0000	1.2
@@ -0,0 +1 @@
+binclock_0.3.2-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/binclock/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 02:21:42 -0000	1.1
+++ sources	11 Sep 2008 16:41:44 -0000	1.2
@@ -0,0 +1 @@
+aa8f1124d9aff7864a0d6d792a2aaea7  binclock_0.3.2-1.tar.gz



From terjeros at fedoraproject.org  Thu Sep 11 17:58:23 2008
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Thu, 11 Sep 2008 17:58:23 +0000 (UTC)
Subject: rpms/perl-Config-Grammar/F-9 perl-Config-Grammar.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080911175823.9FADF70131@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/perl-Config-Grammar/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27113/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Config-Grammar.spec 
Log Message:
Sync with rawhide.




--- NEW FILE perl-Config-Grammar.spec ---
Name:           perl-Config-Grammar
Version:        1.10
Release:        1%{?dist}
Summary:        Grammar-based, user-friendly config parser
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Config-Grammar/
Source0:        http://www.cpan.org/authors/id/D/DS/DSCHWEI/Config-Grammar-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::Simple)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Config::Grammar is a module to parse configuration files. The
configuration may consist of multiple-level sections with assignments
and tabular data.  The parsed data will be returned as a hash
containing the whole configuration. Config::Grammar uses a grammar
that is supplied upon creation of a Config::Grammar object to parse
the configuration file and return helpful error messages in case of
syntax errors. Using the makepod method you can generate documentation
of the configuration file format.

%prep
%setup -q -n Config-Grammar-%{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 -delete
%{_fixperms} %{buildroot}/*

%check
%{__make} test

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc Changes README
%{perl_vendorlib}/Config/Grammar*
%{_mandir}/man3//Config::Grammar*

%changelog
* Tue Sep 09 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.10-1
- initial build based on cpanspec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Grammar/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 02:48:08 -0000	1.1
+++ .cvsignore	11 Sep 2008 17:57:53 -0000	1.2
@@ -0,0 +1 @@
+Config-Grammar-1.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Grammar/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 02:48:08 -0000	1.1
+++ sources	11 Sep 2008 17:57:53 -0000	1.2
@@ -0,0 +1 @@
+ce904f687f1ee9c70521142a2e0f15c9  Config-Grammar-1.10.tar.gz



From ajax at fedoraproject.org  Thu Sep 11 18:00:45 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 11 Sep 2008 18:00:45 +0000 (UTC)
Subject: rpms/libxcb/devel import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 libxcb-1.1-abstract-socket.patch, 1.1, 1.2 libxcb.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <20080911180045.A92F870131@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libxcb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26794/devel

Modified Files:
	.cvsignore libxcb-1.1-abstract-socket.patch libxcb.spec 
	sources 
Added Files:
	import.log 
Log Message:
libxcb 1.1.91



--- NEW FILE import.log ---
libxcb-1_1_91-1_fc10:HEAD:libxcb-1.1.91-1.fc10.src.rpm:1221155742


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Nov 2007 15:36:24 -0000	1.3
+++ .cvsignore	11 Sep 2008 18:00:15 -0000	1.4
@@ -1 +1 @@
-libxcb-1.1.tar.bz2
+libxcb-1.1.91.tar.bz2

libxcb-1.1-abstract-socket.patch:

Index: libxcb-1.1-abstract-socket.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/libxcb-1.1-abstract-socket.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libxcb-1.1-abstract-socket.patch	12 Nov 2007 15:36:24 -0000	1.1
+++ libxcb-1.1-abstract-socket.patch	11 Sep 2008 18:00:15 -0000	1.2
@@ -1,27 +1,26 @@
-diff -up libxcb-1.1/src/xcb_util.c.abstract libxcb-1.1/src/xcb_util.c
---- libxcb-1.1/src/xcb_util.c.abstract	2007-10-23 12:44:59.000000000 -0400
-+++ libxcb-1.1/src/xcb_util.c	2007-11-12 10:32:37.000000000 -0500
-@@ -249,13 +249,22 @@ static int _xcb_open_unix(char *protocol
+diff -up libxcb-1.1.91/src/xcb_util.c.abstract libxcb-1.1.91/src/xcb_util.c
+--- libxcb-1.1.91/src/xcb_util.c.abstract	2008-07-13 07:42:41.000000000 -0400
++++ libxcb-1.1.91/src/xcb_util.c	2008-09-10 17:23:10.000000000 -0400
+@@ -36,6 +36,7 @@
+ #endif
+ #include <netdb.h>
+ #include <errno.h>
++#include <stddef.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -251,6 +252,14 @@ static int _xcb_open_unix(char *protocol
      if (protocol && strcmp("unix",protocol))
          return -1;
  
--    strcpy(addr.sun_path, file);
 +    memset(&addr, 0, sizeof(addr));
 +    addr.sun_family = AF_UNIX;
- 
-     fd = socket(AF_UNIX, SOCK_STREAM, 0);
-     if(fd == -1)
-         return -1;
 +
 +    /* try the abstract socket first */
 +    strcpy(addr.sun_path + 1, file);
-+    if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) != -1)
++    if(connect(fd, (struct sockaddr *) &addr, strlen(file) + 1 + offsetof(struct sockaddr_un, sun_path)) != -1)
 +        return fd;
 +
-+    strcpy(addr.sun_path, file);
-     if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1)
-         return -1;
-+
-     return fd;
- }
- 
+     strcpy(addr.sun_path, file);
+     addr.sun_family = AF_UNIX;
+ #if HAVE_SOCKADDR_SUN_LEN


Index: libxcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/libxcb.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libxcb.spec	22 Apr 2008 16:53:59 -0000	1.7
+++ libxcb.spec	11 Sep 2008 18:00:15 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libxcb
-Version:        1.1
-Release:        4%{?dist}
+Version:        1.1.91
+Release:        1%{?dist}
 Summary:        A C binding to the X11 protocol
 
 Group:          System Environment/Libraries
@@ -18,6 +18,7 @@
 BuildRequires:  graphviz
 BuildRequires:  libXau-devel
 BuildRequires:  libxslt
+BuildRequires:	python
 BuildRequires:  xcb-proto >= 1.1
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  xorg-x11-util-macros
@@ -82,6 +83,9 @@
 %{_datadir}/doc/%{name}-%{version}
 
 %changelog
+* Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 1.1.91-1
+- libxcb 1.1.91
+
 * Tue Apr 22 2008 Adam Jackson <ajax at redhat.com> 1.1-4
 - libxcb-1.1-sloppy-lock.patch: Turn sloppy locking on all the time.  I'm
   tired of fighting it. (#390261)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Nov 2007 15:36:24 -0000	1.3
+++ sources	11 Sep 2008 18:00:15 -0000	1.4
@@ -1 +1 @@
-9310b02433273d75d42f10da3c7455aa  libxcb-1.1.tar.bz2
+aeee03318a5716aa14f91af33c4abe37  libxcb-1.1.91.tar.bz2



From spot at fedoraproject.org  Thu Sep 11 18:31:33 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 18:31:33 +0000 (UTC)
Subject: rpms/highlight/devel highlight.spec,1.33,1.34
Message-ID: <20080911183133.2C4DE70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/highlight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5242

Modified Files:
	highlight.spec 
Log Message:
fix broken provides/requires


Index: highlight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- highlight.spec	7 Sep 2008 20:06:06 -0000	1.33
+++ highlight.spec	11 Sep 2008 18:31:02 -0000	1.34
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
 Version:	2.6.12
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		Development/Tools
 License:	GPLv2
@@ -26,6 +26,23 @@
 %setup -q
 %patch1 -p1 -b .mak
 
+# Provides: exclude perl(highlight_pipe) from example
+cat <<__EOF__ > %{name}-perl.prov
+#!/bin/sh
+/usr/lib/rpm/perl.prov \$* | grep -v '^perl(highlight_pipe)$'
+__EOF__
+%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-perl.prov
+chmod +x %{__perl_provides}
+
+# Requires: exclude perl(IPC::Open3) from example
+cat <<__EOF__ > %{name}-perl.req
+#!/bin/sh
+/usr/lib/rpm/perl.req \$* | grep -v '^perl(IPC::Open3)$'
+__EOF__
+%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-perl.req
+chmod +x %{__perl_requires}
+
+
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
 
@@ -34,6 +51,10 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# Packaging this example causes lots of incorrect perl provides and 
+# requires. Since it isn't going to work out of the box, I'm nuking it.
+rm -rf examples/plugins/movabletype
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -49,6 +70,11 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.12-2
+- don't package broken examples, causes bogus perl provides/requires
+- don't claim to Provide: perl(highlight_pipe)
+- don't claim to Requires: perl(IPC::Open3)
+
 * Mon Aug 18 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.12-1
 - New upstream release
 



From maxamillion at fedoraproject.org  Thu Sep 11 16:44:51 2008
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Thu, 11 Sep 2008 16:44:51 +0000 (UTC)
Subject: rpms/binclock/F-9 binclock.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080911164451.EF2F770131@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/binclock/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4911/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	binclock.spec import.log 
Log Message:
First upload of package




--- NEW FILE binclock.spec ---
Name:           binclock
Summary:        Fullscreen console binary clock
Version:        0.3.2
Release:        2%{?dist}
License:        GPLv2
Group:          Applications/Text
URL:            http://binclock.sourceforge.net

Source0:        http://prdownloads.sourceforge.net/%{name}/%{name}_%{version}-1.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

BuildArch:      noarch

BuildRequires:  python

Requires:       python

%description
Fullscreen console binary clock.
Features:

    * Written in Python (needs version 2 or later)
    * Uses ncurses
    * In color
    * Proper SIGWINCH handling


%prep
#NONE

%setup -q
#NONE

%build
#NONE

%install
#For sanity protection, nuke buildroot
%{__rm} -rf %{buildroot}

#get rid of the developers debian folder
%{__rm} -rf debian

#get rid of the Makefile as it is not needed
%{__rm} -rf Makefile

#move the file to get rid of extension, environment is known
mv binclock.py binclock
%{__rm} -rf *.py

#Install the executable
install -Dp -m0755 binclock %{buildroot}%{_bindir}/binclock

%clean
%{__rm} -rf %{buildroot}

%files
%defattr (-, root, root)
%{_bindir}/binclock

%changelog
* Thu Sep 04 2008 Adam Miller <maxamillion [AT] gmail.com> - 0.3.2-2
- Fixed issues pointed out by package review:
- License has been altered, incorrect assumption previously taken from the sourceforge page.
- Stylistic changes made to satisfy rpmlint warning
* Wed Aug 20 2008 Adam Miller <maxamillion [AT] gmail.com> - 0.3.2-1
- First packaging attempt


--- NEW FILE import.log ---
binclock-0_3_2-2:F-9:binclock-0.3.2-2.src.rpm:1221151438


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/binclock/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 02:21:42 -0000	1.1
+++ .cvsignore	11 Sep 2008 16:44:21 -0000	1.2
@@ -0,0 +1 @@
+binclock_0.3.2-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/binclock/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 02:21:42 -0000	1.1
+++ sources	11 Sep 2008 16:44:21 -0000	1.2
@@ -0,0 +1 @@
+aa8f1124d9aff7864a0d6d792a2aaea7  binclock_0.3.2-1.tar.gz



From hadess at fedoraproject.org  Thu Sep 11 17:57:27 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 17:57:27 +0000 (UTC)
Subject: rpms/gstreamer/devel macros.gstreamer, NONE, 1.1 gstreamer.spec,
	1.81, 1.82
Message-ID: <20080911175727.3D73170131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24547

Modified Files:
	gstreamer.spec 
Added Files:
	macros.gstreamer 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-2
- Update gstreamer provides work for the new RPM, see #438225



--- NEW FILE macros.gstreamer ---
%__gstreamer_provides  /usr/lib/rpm/gstreamer.prov


Index: gstreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- gstreamer.spec	18 Jun 2008 16:55:43 -0000	1.81
+++ gstreamer.spec	11 Sep 2008 17:56:56 -0000	1.82
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}
 Version: 	0.10.20
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -34,6 +34,7 @@
 # For the GStreamer RPM provides
 Patch1:		gstreamer-inspect-rpm-format.patch
 Source1:	gstreamer.prov
+Source2:	macros.gstreamer
 
 ### documentation requirements
 BuildRequires:  python2
@@ -130,6 +131,8 @@
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gstreamer-%{majorminor}
 # Add the provides script
 install -m0755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/rpm/gstreamer.prov
+# Add the macros file
+install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.gstreamer
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -208,6 +211,9 @@
 %{_libdir}/rpm/gstreamer.prov
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-2
+- Update gstreamer provides work for the new RPM, see #438225
+
 * Wed Jun 18 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-1
 - Update to 0.10.20
 



From pjones at fedoraproject.org  Thu Sep 11 19:00:59 2008
From: pjones at fedoraproject.org (Peter Jones)
Date: Thu, 11 Sep 2008 19:00:59 +0000 (UTC)
Subject: rpms/mkinitrd/devel mkinitrd.spec,1.287,1.288
Message-ID: <20080911190059.CE01270131@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/mkinitrd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13345

Modified Files:
	mkinitrd.spec 
Log Message:
Require newer plymouth.



Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- mkinitrd.spec	9 Sep 2008 19:36:56 -0000	1.287
+++ mkinitrd.spec	11 Sep 2008 19:00:29 -0000	1.288
@@ -3,7 +3,7 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 6.0.63
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
@@ -14,7 +14,7 @@
 Requires: lvm2 >= 2.02.33-9, diffutils
 Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.63-1
 Requires: e2fsprogs >= 1.38-12, glib2, libselinux, libsepol, coreutils
-Requires: mdadm, elfutils-libelf, isomd5sum, plymouth >= 0.5.0
+Requires: mdadm, elfutils-libelf, isomd5sum, plymouth >= 0.6.0-0.2008.09.10.1
 BuildRequires: popt-devel, elfutils-libelf-devel, elfutils-devel
 BuildRequires: e2fsprogs-devel parted-devel >= 1.8.5, pkgconfig, glib2-devel
 BuildRequires: libdhcp4client-devel, libdhcp6client-devel, libdhcp-devel >= 1.9
@@ -120,6 +120,9 @@
 %dir %{_sysconfdir}/kernel/prerm.d
 
 %changelog
+* Thu Sep 11 2008 Peter Jones <pjones at redhat.com> - 6.0.63-2
+- Require a newer plymouth
+
 * Tue Sep 09 2008 Peter Jones <pjones at redhat.com> - 6.0.63-1
 - Only sleep for /proc/scsi/scsi changes once (wwoods)
 - Handle built-in usbfs better



From jkeating at fedoraproject.org  Thu Sep 11 17:09:07 2008
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Thu, 11 Sep 2008 17:09:07 +0000 (UTC)
Subject: rpms/pyexiv2/devel pyexiv2.spec,1.1,1.2
Message-ID: <20080911170907.98BF270131@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/pyexiv2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11880

Modified Files:
	pyexiv2.spec 
Log Message:
* Thu Sep 11 2008 Jesse Keating <jkeating at redhat.com> - 0.1.2-4
- Rebuild for deps



Index: pyexiv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyexiv2/devel/pyexiv2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyexiv2.spec	18 Jul 2008 21:47:42 -0000	1.1
+++ pyexiv2.spec	11 Sep 2008 17:08:37 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           pyexiv2
 Version:        0.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Python binding to exiv2
 
 Group:          Development/Languages
@@ -60,6 +60,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Thu Sep 11 2008 Jesse Keating <jkeating at redhat.com> - 0.1.2-4
+- Rebuild for deps
+
 * Fri Jul 18 2008 Mat??j Cepl <mcepl at redhat.com> 0.1.2-3
 - Fix building system.
 - Approved for Fedora 
@@ -68,4 +71,4 @@
 - Dan's patch to fix compilation flags.
 
 * Thu Jul 17 2008 Mat??j Cepl <mcepl at redhat.com> 0.1.2-1
-- initial build
\ No newline at end of file
+- initial build



From spot at fedoraproject.org  Thu Sep 11 19:23:52 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 19:23:52 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.101,1.102
Message-ID: <20080911192352.93E0870131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19616

Modified Files:
	comps-f10.xml.in 
Log Message:
drop tetex-eurofont


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- comps-f10.xml.in	11 Sep 2008 16:12:41 -0000	1.101
+++ comps-f10.xml.in	11 Sep 2008 19:23:22 -0000	1.102
@@ -120,7 +120,6 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="conditional" requires="texlive">tetex-eurofont</packagereq>
       <packagereq type="conditional" requires="texlive">tetex-font-cm-lgc</packagereq>
       <packagereq type="default">docbook-slides</packagereq>
       <packagereq type="default">docbook-style-dsssl</packagereq>



From ajax at fedoraproject.org  Thu Sep 11 19:09:28 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 11 Sep 2008 19:09:28 +0000 (UTC)
Subject: rpms/xcb-proto/devel xcb-proto-1.2-selinux.patch, NONE,
	1.1 xcb-proto.spec, 1.3, 1.4
Message-ID: <20080911190928.4673E70131@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xcb-proto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15496

Modified Files:
	xcb-proto.spec 
Added Files:
	xcb-proto-1.2-selinux.patch 
Log Message:
* Thu Sep 11 2008 Adam Jackson <ajax at redhat.com> 1.2-2
- Add additional selinux requests. (#461844)


xcb-proto-1.2-selinux.patch:

--- NEW FILE xcb-proto-1.2-selinux.patch ---
commit 91b5a1b56c744c2aa2740eb814d39ec48cbd27af
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Tue Sep 2 17:38:30 2008 -0400

    xcb-xselinux: Add GetClientContext request.

diff --git a/src/xselinux.xml b/src/xselinux.xml
index 30a8a27..7751470 100644
--- a/src/xselinux.xml
+++ b/src/xselinux.xml
@@ -261,4 +261,16 @@ authorization from the authors.
     </reply>
   </request>
 
+  <request name="GetClientContext" opcode="22">
+    <field type="CARD32" name="resource" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="context_len" />
+      <pad bytes="20" />
+      <list type="char" name="context">
+	<fieldref>context_len</fieldref>
+      </list>
+    </reply>
+  </request>
+
 </xcb>


Index: xcb-proto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-proto/devel/xcb-proto.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xcb-proto.spec	10 Sep 2008 21:37:26 -0000	1.3
+++ xcb-proto.spec	11 Sep 2008 19:08:57 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           xcb-proto
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        XCB protocol descriptions
 
 Group:          Development/Libraries
@@ -16,6 +16,8 @@
 BuildRequires:	python
 Requires:       pkgconfig
 
+Patch0:		xcb-proto-1.2-selinux.patch
+
 %description
 XCB is a project to enable efficient language bindings to the X11 protocol.
 This package contains the protocol descriptions themselves.  Language
@@ -24,6 +26,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .selinux
 
 %build
 # Bit of a hack to get the pc file in /usr/share, no we can be noarch.
@@ -47,6 +50,9 @@
 %{python_sitearch}/xcbgen
 
 %changelog
+* Thu Sep 11 2008 Adam Jackson <ajax at redhat.com> 1.2-2
+- Add additional selinux requests. (#461844)
+
 * Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 1.2-1
 - xcb-proto 1.2
 



From scop at fedoraproject.org  Thu Sep 11 19:10:03 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 11 Sep 2008 19:10:03 +0000 (UTC)
Subject: rpms/javasqlite/EL-5 javasqlite-20080420-loadfail.patch, NONE,
	1.1 javasqlite-20080420-tests.patch, NONE, 1.1 javasqlite.spec,
	1.1, 1.2
Message-ID: <20080911191003.6A7E770131@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/javasqlite/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15739

Modified Files:
	javasqlite.spec 
Added Files:
	javasqlite-20080420-loadfail.patch 
	javasqlite-20080420-tests.patch 
Log Message:
* Sat Sep  6 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20080420-1.1
- Include JDBC 3 (Java 1.4.x, 1.5.x) drivers.
- Work around build setup issues #460761 and #460783.
- Patch to output error message if loading the lib from a specified
  SQLite.library.path fails.
- Patch test suite to exit with non-zero status on failures.


javasqlite-20080420-loadfail.patch:

--- NEW FILE javasqlite-20080420-loadfail.patch ---
diff -up javasqlite-20080420/SQLite/Database.java~ javasqlite-20080420/SQLite/Database.java
--- javasqlite-20080420/SQLite/Database.java~	2008-01-29 10:48:21.000000000 +0200
+++ javasqlite-20080420/SQLite/Database.java	2008-08-30 23:44:00.000000000 +0300
@@ -721,6 +721,7 @@ public class Database {
 		    String mapped = (String) mapLibraryName.invoke(null, args);
 		    System.load(path + java.io.File.separator + mapped);
 		} catch (Throwable t) {
+		    System.err.println("Unable to load sqlite from SQLite.library.path=" + path + ", trying system default: " + t);
 		    System.loadLibrary("sqlite_jni");
 		}
 	    }

javasqlite-20080420-tests.patch:

--- NEW FILE javasqlite-20080420-tests.patch ---
diff -up javasqlite-20080420/Makefile.in~ javasqlite-20080420/Makefile.in
--- javasqlite-20080420/Makefile.in~	2008-04-07 08:23:47.000000000 +0300
+++ javasqlite-20080420/Makefile.in	2008-08-30 23:49:36.000000000 +0300
@@ -150,6 +150,8 @@ test:
 	$(JAVAC) -classpath sqlite.jar:$(PWD) test.java
 	$(JAVA_RUN) -classpath sqlite.jar:$(PWD) \
 	    -DSQLite.library.path=$(PWD)/.libs test
+
+test2:	test
 	$(JAVA_RUN) -classpath sqlite.jar:$(PWD) \
 	    -DSQLite.library.path=$(PWD)/.libs test db2
 
diff -up javasqlite-20080420/test3.java~ javasqlite-20080420/test3.java
--- javasqlite-20080420/test3.java~	2008-04-05 10:30:10.000000000 +0300
+++ javasqlite-20080420/test3.java	2008-08-30 23:48:47.000000000 +0300
@@ -77,6 +77,7 @@ public class test3 implements SQLite.Tra
     }
 
     public static void main(String args[]) {
+        boolean error = true;
         test3 T = new test3();
 	System.out.println("LIB version: " + SQLite.Database.version());
 	SQLite.Database db = new SQLite.Database();
@@ -145,6 +146,7 @@ public class test3 implements SQLite.Tra
 	    T.do_exec(db, "drop table TEST3");
 	    T.do_exec(db, "drop table B");
 	    T.do_select(db, "select * from sqlite_master");
+	    error = false;
 	} catch (java.lang.Exception e) {
 	    System.err.println("error: " + e);
 	    e.printStackTrace();
@@ -159,9 +161,13 @@ public class test3 implements SQLite.Tra
 		db.close();
 	    } catch(java.lang.Exception e) {
 		System.err.println("error: " + e);
+		error = true;
 	    } finally {
 		System.err.println("done.");
 	    }
 	}
+	if (error) {
+	    System.exit(1);
+	}
     }
 }
diff -up javasqlite-20080420/test.java~ javasqlite-20080420/test.java
--- javasqlite-20080420/test.java~	2007-06-29 12:52:46.000000000 +0300
+++ javasqlite-20080420/test.java	2008-08-30 23:48:47.000000000 +0300
@@ -69,6 +69,7 @@ public class test implements SQLite.Call
     }
 
     public static void main(String args[]) {
+	boolean error = true;
 	System.out.println("LIB version: " + SQLite.Database.version());
 	SQLite.Database db = new SQLite.Database();
 	try {
@@ -114,6 +115,7 @@ public class test implements SQLite.Call
 		}
 	    } while (vm.compile());
 	    db.close();
+	    error = false;
 	    System.out.println("An exception is expected from now on.");
 	    System.out.println("==== local callback ====");
 	    db.exec("select * from sqlite_master", new test());
@@ -128,6 +130,9 @@ public class test implements SQLite.Call
 	    } finally {
 		System.err.println("done.");
 	    }
+	    if (error) {
+		System.exit(1);
+	    }
 	}
 	
     }


Index: javasqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/EL-5/javasqlite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- javasqlite.spec	17 May 2008 13:16:26 -0000	1.1
+++ javasqlite.spec	11 Sep 2008 19:09:33 -0000	1.2
@@ -1,22 +1,22 @@
-# TODO: build JDBC 3 driver too (not doable with gcj 1.5.0 - it apparently
-#       has java 1.6 (JDBC 4) class libs???)
-
-
 Name:           javasqlite
 Version:        20080420
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        SQLite Java Wrapper/JDBC Driver
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.ch-werner.de/javasqlite/
 Source0:        http://www.ch-werner.de/javasqlite/%{name}-%{version}.tar.gz
-# jnipath: Fedora specific, no need to send upstream
+# jnipath: Fedora specific, no need to send upstream.
 Patch0:         %{name}-20080315-jnipath.patch
+# loadfail, tests: Sent upstream 20080830.
+Patch1:         %{name}-20080420-loadfail.patch
+Patch2:         %{name}-20080420-tests.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sqlite-devel
-BuildRequires:  java-devel
+BuildRequires:  java-devel = 1:1.6.0
+BuildRequires:  java-devel = 1.4.2
 BuildRequires:  java-javadoc
 Requires:       jre
 
@@ -37,16 +37,32 @@
 %prep
 %setup -q
 sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH0} | patch -p1
+%patch1 -p1
+%patch2 -p1
 sed -i -e 's/\r//g' doc/ajhowto.txt
 f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 
 %build
+
+origpath="$PATH"
+
+# Pass #1: JDBC 3 driver and common files with 1.4.2
+export PATH="%{_jvmdir}/java-1.4.2/bin:$origpath" # bug 460761
+%configure --with-jdk=%{_jvmdir}/java-1.4.2
+make %{?_smp_mflags} sqlite.jar JAVAC_FLAGS="-source 1.4"
+
+# Pass #2: JDBC 4 driver and the rest with 1.6.0
+export PATH="%{_jvmdir}/java-1.6.0/bin:$origpath" # bug 460761 (to be sure)
 %configure \
-    --with-jdk=%{_jvmdir}/java \
+    --with-jdk=%{_jvmdir}/java-1.6.0 \
     --with-jardir=%{_libdir}/%{name} \
     --libdir=%{_libdir}/%{name}
-make %{?_smp_mflags} JAVAC_FLAGS="-source 5"
+make %{?_smp_mflags}
+
+# Add JDBC 3 classes
+jar uf sqlite.jar SQLite/JDBC2x/*.class
+
 make javadoc JAVADOCLINK=%{_javadocdir}/java
 
 
@@ -63,7 +79,19 @@
 
 
 %check
-make test
+
+# LD_LIBRARY_PATH: prevent falling back to system installed library in case
+# loading the just built one fails, see static initializer in SQLite.Database.
+export LD_LIBRARY_PATH="$PWD/.libs:$LD_LIBRARY_PATH"
+
+origpath="$PATH"
+for javaver in 1.4.2 1.6.0 ; do
+    jdir=%{_jvmdir}/java-$javaver/bin
+    export PATH="$jdir:$origpath" # bug 460761
+    # test2 is for SQLite 2.x, which we don't support
+    # test3 uses zeroblob which is available in sqlite 3.4+ (EL-5 has 3.3.6)
+    make JAVA_RUN="$jdir/java" JAVAC="$jdir/javac" test
+done
 
 
 %files
@@ -78,6 +106,13 @@
 
 
 %changelog
+* Sat Sep  6 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20080420-1.1
+- Include JDBC 3 (Java 1.4.x, 1.5.x) drivers.
+- Work around build setup issues #460761 and #460783.
+- Patch to output error message if loading the lib from a specified
+  SQLite.library.path fails.
+- Patch test suite to exit with non-zero status on failures.
+
 * Tue Apr 22 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20080420-1
 - 20080420; all upstreamable patches applied upstream.
 



From pkgdb at fedoraproject.org  Thu Sep 11 19:29:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 19:29:33 +0000
Subject: [pkgdb] sugar-journal (Fedora OLPC, 3) updated by kevin
Message-ID: <20080911192933.87E23208D9E@bastion.fedora.phx.redhat.com>

kevin added a Fedora OLPC 3 branch for sugar-journal
kevin has set commit to Approved for uberpackager on sugar-journal (Fedora OLPC 3)
kevin has set build to Approved for uberpackager on sugar-journal (Fedora OLPC 3)
kevin has set checkout to Approved for uberpackager on sugar-journal (Fedora OLPC 3)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-journal



From wtogami at fedoraproject.org  Thu Sep 11 19:30:03 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 11 Sep 2008 19:30:03 +0000 (UTC)
Subject: rpms/ltsp/F-9 .cvsignore, 1.20, 1.21 ltsp.spec, 1.29, 1.30 sources, 
	1.24, 1.25
Message-ID: <20080911193003.903E170131@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21244

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
- lts.conf options: VOLUME, HEADPHONE_VOLUME, PCM_VOLUME, CD_VOLUME, FRONT_VOLUME
  Set values higher than default if not specified in lts.conf.
  MIC_VOLUME not set by default, but can be controlled by lts.conf.
- xrexec     renamed to ltsp-localapps
- xrexecd.sh renamed to ltsp-localappsd
- fix build on RHEL-5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	10 Sep 2008 14:47:45 -0000	1.20
+++ .cvsignore	11 Sep 2008 19:29:33 -0000	1.21
@@ -1 +1 @@
-ltsp-5.1.23.tar.bz2
+ltsp-5.1.24.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ltsp.spec	10 Sep 2008 14:47:45 -0000	1.29
+++ ltsp.spec	11 Sep 2008 19:29:33 -0000	1.30
@@ -1,7 +1,7 @@
 Name:           ltsp
-Version:        5.1.23
-%define _datestamp .20080910.10
-#Release:        3%{_datestamp}%{?dist}
+Version:        5.1.24
+%define _datestamp .20080911.14
+#Release:        4%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
 Group:          User Interface/Desktops
@@ -97,7 +97,7 @@
   make %{?_smp_mflags}
 popd
 
-pushd client/xrexecd
+pushd localapps
   %configure
   make %{?_smp_mflags}
 popd
@@ -128,6 +128,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/mkinitrd/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/scripts/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/scripts.d/
@@ -139,6 +140,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts/
 mkdir -p $RPM_BUILD_ROOT/opt/ltsp
 mkdir -p $RPM_BUILD_ROOT/opt/ltsp/images
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/cache/localapps/
 
 mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/i386/pxelinux.cfg/
 mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/x86_64/pxelinux.cfg/
@@ -149,10 +151,10 @@
 
 %if 0%{?fedora}
 ###### client install
-pushd client/xrexecd
+pushd localapps
     make install DESTDIR=$RPM_BUILD_ROOT
 popd
-install -m 0755 client/xrexecd/xrexecd.sh  $RPM_BUILD_ROOT/%{_bindir}/
+install -m 0755 localapps/ltsp-localappsd $RPM_BUILD_ROOT/%{_bindir}/
 
 install -m 0755 client/getltscfg/getltscfg $RPM_BUILD_ROOT/%{_bindir}/getltscfg
 install -m 0644 client/getltscfg/getltscfg.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
@@ -168,21 +170,21 @@
 install -m 0644 client/jetpipe/jetpipe.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
 install -m 0755 client/scripts/k12linux/ltsp-rewrap-latest-kernel $RPM_BUILD_ROOT/%{_sbindir}
 install -m 0700 client/chroot-setup/ltsp-chroot-setup $RPM_BUILD_ROOT/%{_datadir}/ltsp/
-install -m 0755 client/xrexecd/ldm-rc.d/S01-localapps $RPM_BUILD_ROOT%{_datadir}/ldm/rc.d/
+install -m 0755 localapps/ldm-rc.d/S01-localapps $RPM_BUILD_ROOT%{_datadir}/ldm/rc.d/
 cp -av client/chroot-setup/k12linux/* $RPM_BUILD_ROOT%{_datadir}/ltsp/chroot-setup.d/
 cp -av client/screen.d $RPM_BUILD_ROOT/%{_datadir}/ltsp/
 touch $RPM_BUILD_ROOT%{_sysconfdir}/lts.conf
 touch $RPM_BUILD_ROOT%{_localstatedir}/lib/random-seed
-%endif
 # We need these files in both in client and server, but it ends up in the same place.
 # client copy is to ensure that it gets upgraded with ltsp-client package upgrades.
 # server copy is so chroot-creator can copy it into the chroot before mkinitrd runs the first time.
 install -m 0644 server/configs/k12linux/mkinitrd/sysconfig-mkinitrd $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mkinitrd
 install -m 0755 server/configs/k12linux/mkinitrd/ltsp-postinst.d $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/ltsp
 install -m 0755 server/configs/k12linux/mkinitrd/ltsp-prerm.d    $RPM_BUILD_ROOT%{_sysconfdir}/kernel/prerm.d/ltsp
+%endif
 
 ### server install
-install -m 0755 client/xrexecd/xrexec  $RPM_BUILD_ROOT/%{_bindir}/
+install -m 0755 localapps/ltsp-localapps  $RPM_BUILD_ROOT/%{_bindir}/
 install -m 0755 server/nbdrootd $RPM_BUILD_ROOT%{_sbindir}
 install -m 0755 server/nbdswapd $RPM_BUILD_ROOT%{_sbindir}
 install -m 0755 server/ldminfod $RPM_BUILD_ROOT%{_sbindir}
@@ -312,7 +314,7 @@
 %{_mandir}/man8/jetpipe.8.gz
 %{_datadir}/ltsp/ltsp-chroot-setup
 %{_datadir}/ltsp/chroot-setup.d/
-%{_bindir}/xrexecd.sh
+%{_bindir}/ltsp-localappsd
 %{_sysconfdir}/sysconfig/mkinitrd
 %{_sysconfdir}/kernel/postinst.d/ltsp
 %{_sysconfdir}/kernel/prerm.d/ltsp
@@ -342,7 +344,7 @@
 %config(noreplace) %{_tftpdir}/ltsp/i386/pxelinux.cfg/default
 %config(noreplace) %{_tftpdir}/ltsp/x86_64/pxelinux.cfg/default
 %endif
-%{_bindir}/xrexec
+%{_bindir}/ltsp-localapps
 %{_sysconfdir}/ltsp/live-config/
 
 %dir /opt/ltsp
@@ -372,6 +374,7 @@
 %config(noreplace) %{_sysconfdir}/xinetd.d/nbdswapd
 %config(noreplace) %{_sysconfdir}/xinetd.d/ldminfod
 %dir %{_sysconfdir}/ltsp/
+%dir %{_localstatedir}/cache/localapps/
 # Configuration Files
 %config(noreplace) %{_sysconfdir}/sysconfig/ltsp-dhcpd
 %config(noreplace) %{_sysconfdir}/sysconfig/network-scripts/ifcfg-ltspbr0
@@ -404,6 +407,14 @@
 %endif
 
 %changelog
+* Thu Sep 11 2008 Warren Togami <wtogami at redhat.com> - 5.1.24-1
+- lts.conf options: VOLUME, HEADPHONE_VOLUME, PCM_VOLUME, CD_VOLUME, FRONT_VOLUME
+  Set values higher than default if not specified in lts.conf.
+  MIC_VOLUME not set by default, but can be controlled by lts.conf.
+- xrexec     renamed to ltsp-localapps
+- xrexecd.sh renamed to ltsp-localappsd
+- fix build on RHEL-5
+
 * Wed Sep 10 2008 Warren Togami <wtogami at redhat.com> - 5.1.23-1
 - Point F8 and F9 client chroot builder at newkey repos
 - Ensure that initscripts installs before ltsp-client


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	10 Sep 2008 14:47:45 -0000	1.24
+++ sources	11 Sep 2008 19:29:33 -0000	1.25
@@ -1 +1 @@
-65f3c87d86ef8e42bc6d417876182968  ltsp-5.1.23.tar.bz2
+0edb9dacd14a9db3e41ed5dc80fdea62  ltsp-5.1.24.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep 11 19:31:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 19:31:59 +0000
Subject: [pkgdb] fwknop (Fedora, 9) updated by kevin
Message-ID: <20080911193159.73F11208D9A@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for fwknop
kevin has set commit to Approved for uberpackager on fwknop (Fedora 9)
kevin has set build to Approved for uberpackager on fwknop (Fedora 9)
kevin has set checkout to Approved for uberpackager on fwknop (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fwknop



From till at fedoraproject.org  Thu Sep 11 19:32:37 2008
From: till at fedoraproject.org (Till Maas)
Date: Thu, 11 Sep 2008 19:32:37 +0000 (UTC)
Subject: rpms/libHX/F-9 .cvsignore, 1.4, 1.5 libHX.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <20080911193237.3406870131@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/libHX/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22030

Modified Files:
	.cvsignore libHX.spec sources 
Log Message:
* Thu Sep 11 2008 Till Maas <opensource at till.name> - 1.25-1
- Update to latest version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Sep 2008 11:59:00 -0000	1.4
+++ .cvsignore	11 Sep 2008 19:32:06 -0000	1.5
@@ -1 +1 @@
-libHX-1.23.tar.bz2
+libHX-1.25.tar.bz2


Index: libHX.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/F-9/libHX.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libHX.spec	5 Sep 2008 11:59:00 -0000	1.5
+++ libHX.spec	11 Sep 2008 19:32:06 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           libHX
-Version:        1.23
+Version:        1.25
 Release:        1%{?dist}
 Summary:        General-purpose library for typical low-level operations
 
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Till Maas <opensource at till.name> - 1.25-1
+- Update to latest version
+
 * Fri Sep 05 2008 Till Maas <opensource at till.name> - 1.23-1
 - Update to latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Sep 2008 11:59:00 -0000	1.5
+++ sources	11 Sep 2008 19:32:06 -0000	1.6
@@ -1 +1 @@
-a14dcb5f8c89ec6ba754b4d1e61612b4  libHX-1.23.tar.bz2
+6f19ce48a03f729c3cab32a42924ed2f  libHX-1.25.tar.bz2



From wtogami at fedoraproject.org  Thu Sep 11 19:32:52 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 11 Sep 2008 19:32:52 +0000 (UTC)
Subject: rpms/ltsp/devel .cvsignore, 1.9, 1.10 ltsp.spec, 1.13, 1.14 sources,
	1.13, 1.14
Message-ID: <20080911193252.1416070131@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22110

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
- lts.conf options: VOLUME, HEADPHONE_VOLUME, PCM_VOLUME, CD_VOLUME, FRONT_VOLUME
  Set values higher than default if not specified in lts.conf.
  MIC_VOLUME not set by default, but can be controlled by lts.conf.
- xrexec     renamed to ltsp-localapps
- xrexecd.sh renamed to ltsp-localappsd
- fix build on RHEL-5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Sep 2008 23:58:39 -0000	1.9
+++ .cvsignore	11 Sep 2008 19:32:21 -0000	1.10
@@ -1 +1 @@
-ltsp-5.1.23.tar.bz2
+ltsp-5.1.24.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/ltsp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ltsp.spec	10 Sep 2008 23:58:39 -0000	1.13
+++ ltsp.spec	11 Sep 2008 19:32:21 -0000	1.14
@@ -1,7 +1,7 @@
 Name:           ltsp
-Version:        5.1.23
-%define _datestamp .20080910.10
-#Release:        3%{_datestamp}%{?dist}
+Version:        5.1.24
+%define _datestamp .20080911.14
+#Release:        4%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
 Group:          User Interface/Desktops
@@ -97,7 +97,7 @@
   make %{?_smp_mflags}
 popd
 
-pushd client/xrexecd
+pushd localapps
   %configure
   make %{?_smp_mflags}
 popd
@@ -128,6 +128,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/mkinitrd/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/scripts/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/scripts.d/
@@ -139,6 +140,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts/
 mkdir -p $RPM_BUILD_ROOT/opt/ltsp
 mkdir -p $RPM_BUILD_ROOT/opt/ltsp/images
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/cache/localapps/
 
 mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/i386/pxelinux.cfg/
 mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/x86_64/pxelinux.cfg/
@@ -149,10 +151,10 @@
 
 %if 0%{?fedora}
 ###### client install
-pushd client/xrexecd
+pushd localapps
     make install DESTDIR=$RPM_BUILD_ROOT
 popd
-install -m 0755 client/xrexecd/xrexecd.sh  $RPM_BUILD_ROOT/%{_bindir}/
+install -m 0755 localapps/ltsp-localappsd $RPM_BUILD_ROOT/%{_bindir}/
 
 install -m 0755 client/getltscfg/getltscfg $RPM_BUILD_ROOT/%{_bindir}/getltscfg
 install -m 0644 client/getltscfg/getltscfg.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
@@ -168,21 +170,21 @@
 install -m 0644 client/jetpipe/jetpipe.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
 install -m 0755 client/scripts/k12linux/ltsp-rewrap-latest-kernel $RPM_BUILD_ROOT/%{_sbindir}
 install -m 0700 client/chroot-setup/ltsp-chroot-setup $RPM_BUILD_ROOT/%{_datadir}/ltsp/
-install -m 0755 client/xrexecd/ldm-rc.d/S01-localapps $RPM_BUILD_ROOT%{_datadir}/ldm/rc.d/
+install -m 0755 localapps/ldm-rc.d/S01-localapps $RPM_BUILD_ROOT%{_datadir}/ldm/rc.d/
 cp -av client/chroot-setup/k12linux/* $RPM_BUILD_ROOT%{_datadir}/ltsp/chroot-setup.d/
 cp -av client/screen.d $RPM_BUILD_ROOT/%{_datadir}/ltsp/
 touch $RPM_BUILD_ROOT%{_sysconfdir}/lts.conf
 touch $RPM_BUILD_ROOT%{_localstatedir}/lib/random-seed
-%endif
 # We need these files in both in client and server, but it ends up in the same place.
 # client copy is to ensure that it gets upgraded with ltsp-client package upgrades.
 # server copy is so chroot-creator can copy it into the chroot before mkinitrd runs the first time.
 install -m 0644 server/configs/k12linux/mkinitrd/sysconfig-mkinitrd $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mkinitrd
 install -m 0755 server/configs/k12linux/mkinitrd/ltsp-postinst.d $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/ltsp
 install -m 0755 server/configs/k12linux/mkinitrd/ltsp-prerm.d    $RPM_BUILD_ROOT%{_sysconfdir}/kernel/prerm.d/ltsp
+%endif
 
 ### server install
-install -m 0755 client/xrexecd/xrexec  $RPM_BUILD_ROOT/%{_bindir}/
+install -m 0755 localapps/ltsp-localapps  $RPM_BUILD_ROOT/%{_bindir}/
 install -m 0755 server/nbdrootd $RPM_BUILD_ROOT%{_sbindir}
 install -m 0755 server/nbdswapd $RPM_BUILD_ROOT%{_sbindir}
 install -m 0755 server/ldminfod $RPM_BUILD_ROOT%{_sbindir}
@@ -312,7 +314,7 @@
 %{_mandir}/man8/jetpipe.8.gz
 %{_datadir}/ltsp/ltsp-chroot-setup
 %{_datadir}/ltsp/chroot-setup.d/
-%{_bindir}/xrexecd.sh
+%{_bindir}/ltsp-localappsd
 %{_sysconfdir}/sysconfig/mkinitrd
 %{_sysconfdir}/kernel/postinst.d/ltsp
 %{_sysconfdir}/kernel/prerm.d/ltsp
@@ -342,7 +344,7 @@
 %config(noreplace) %{_tftpdir}/ltsp/i386/pxelinux.cfg/default
 %config(noreplace) %{_tftpdir}/ltsp/x86_64/pxelinux.cfg/default
 %endif
-%{_bindir}/xrexec
+%{_bindir}/ltsp-localapps
 %{_sysconfdir}/ltsp/live-config/
 
 %dir /opt/ltsp
@@ -372,6 +374,7 @@
 %config(noreplace) %{_sysconfdir}/xinetd.d/nbdswapd
 %config(noreplace) %{_sysconfdir}/xinetd.d/ldminfod
 %dir %{_sysconfdir}/ltsp/
+%dir %{_localstatedir}/cache/localapps/
 # Configuration Files
 %config(noreplace) %{_sysconfdir}/sysconfig/ltsp-dhcpd
 %config(noreplace) %{_sysconfdir}/sysconfig/network-scripts/ifcfg-ltspbr0
@@ -404,6 +407,14 @@
 %endif
 
 %changelog
+* Thu Sep 11 2008 Warren Togami <wtogami at redhat.com> - 5.1.24-1
+- lts.conf options: VOLUME, HEADPHONE_VOLUME, PCM_VOLUME, CD_VOLUME, FRONT_VOLUME
+  Set values higher than default if not specified in lts.conf.
+  MIC_VOLUME not set by default, but can be controlled by lts.conf.
+- xrexec     renamed to ltsp-localapps
+- xrexecd.sh renamed to ltsp-localappsd
+- fix build on RHEL-5
+
 * Wed Sep 10 2008 Warren Togami <wtogami at redhat.com> - 5.1.23-1
 - Point F8 and F9 client chroot builder at newkey repos
 - Ensure that initscripts installs before ltsp-client


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	10 Sep 2008 23:58:39 -0000	1.13
+++ sources	11 Sep 2008 19:32:21 -0000	1.14
@@ -1 +1 @@
-65f3c87d86ef8e42bc6d417876182968  ltsp-5.1.23.tar.bz2
+0edb9dacd14a9db3e41ed5dc80fdea62  ltsp-5.1.24.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep 11 19:33:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 19:33:26 +0000
Subject: [pkgdb] system-switch-displaymanager was added for than
Message-ID: <20080911193326.9EA55208D98@bastion.fedora.phx.redhat.com>

kevin has added Package system-switch-displaymanager with summary A display manager switcher for GDM, KDM, XDM and WDM
kevin has approved Package system-switch-displaymanager
kevin has added a Fedora devel branch for system-switch-displaymanager with an owner of than
kevin has approved system-switch-displaymanager in Fedora devel
kevin has approved Package system-switch-displaymanager
kevin has set commit to Approved for packager on system-switch-displaymanager (Fedora devel)
kevin has set build to Approved for packager on system-switch-displaymanager (Fedora devel)
kevin has set checkout to Approved for packager on system-switch-displaymanager (Fedora devel)
kevin has set commit to Approved for uberpackager on system-switch-displaymanager (Fedora devel)
kevin has set build to Approved for uberpackager on system-switch-displaymanager (Fedora devel)
kevin has set checkout to Approved for uberpackager on system-switch-displaymanager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-switch-displaymanager



From pkgdb at fedoraproject.org  Thu Sep 11 19:33:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 19:33:27 +0000
Subject: [pkgdb] system-switch-displaymanager (Fedora, 9) updated by kevin
Message-ID: <20080911193327.BD70A208D9C@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for system-switch-displaymanager
kevin has set commit to Approved for uberpackager on system-switch-displaymanager (Fedora 9)
kevin has set build to Approved for uberpackager on system-switch-displaymanager (Fedora 9)
kevin has set checkout to Approved for uberpackager on system-switch-displaymanager (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-switch-displaymanager



From kevin at fedoraproject.org  Thu Sep 11 19:33:39 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 11 Sep 2008 19:33:39 +0000 (UTC)
Subject: rpms/system-switch-displaymanager - New directory
Message-ID: <20080911193339.2C2C670131@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/system-switch-displaymanager
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse22672/rpms/system-switch-displaymanager

Log Message:
Directory /cvs/extras/rpms/system-switch-displaymanager added to the repository




From kevin at fedoraproject.org  Thu Sep 11 19:33:39 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 11 Sep 2008 19:33:39 +0000 (UTC)
Subject: rpms/system-switch-displaymanager/devel - New directory
Message-ID: <20080911193339.701F370131@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/system-switch-displaymanager/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse22672/rpms/system-switch-displaymanager/devel

Log Message:
Directory /cvs/extras/rpms/system-switch-displaymanager/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 11 19:33:40 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 11 Sep 2008 19:33:40 +0000 (UTC)
Subject: rpms/system-switch-displaymanager Makefile,NONE,1.1
Message-ID: <20080911193340.6F6BF70131@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/system-switch-displaymanager
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse22672/rpms/system-switch-displaymanager

Added Files:
	Makefile 
Log Message:
Setup of module system-switch-displaymanager


--- NEW FILE Makefile ---
# Top level Makefile for module system-switch-displaymanager
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep 11 19:33:40 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 11 Sep 2008 19:33:40 +0000 (UTC)
Subject: rpms/system-switch-displaymanager/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080911193340.B129D70131@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/system-switch-displaymanager/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse22672/rpms/system-switch-displaymanager/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module system-switch-displaymanager


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: system-switch-displaymanager
# $Id: Makefile,v 1.1 2008/09/11 19:33:40 kevin Exp $
NAME := system-switch-displaymanager
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Thu Sep 11 19:34:36 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 11 Sep 2008 19:34:36 +0000 (UTC)
Subject: rpms/ltspfs/F-9 .cvsignore, 1.5, 1.6 ltspfs.spec, 1.4, 1.5 sources, 
	1.5, 1.6
Message-ID: <20080911193436.C0FC070131@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltspfs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22904

Modified Files:
	.cvsignore ltspfs.spec sources 
Log Message:
- bug fixes and more man pages



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltspfs/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Apr 2008 23:08:14 -0000	1.5
+++ .cvsignore	11 Sep 2008 19:34:06 -0000	1.6
@@ -1 +1 @@
-ltspfs-0.5.2.tar.bz2
+ltspfs-0.5.4.tar.bz2


Index: ltspfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltspfs/F-9/ltspfs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ltspfs.spec	28 Apr 2008 23:08:14 -0000	1.4
+++ ltspfs.spec	11 Sep 2008 19:34:06 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           ltspfs
-Version:        0.5.2
+Version:        0.5.4
 Release:        1%{?dist}
 Summary:        LTSP file system, daemon that runs on thin clients
 
@@ -12,6 +12,7 @@
 BuildRequires: fuse-devel
 BuildRequires: libX11-devel
 BuildRequires: glib2-devel
+Requires:      dkms-fuse
 
 %package -n ltspfsd 
 Group:          System Environment/Base
@@ -57,9 +58,9 @@
 %{_bindir}/ltspfs
 %attr(4755,root,root) %{_bindir}/lbmount
 %{_sbindir}/ltspfsmounter
-%{_datadir}/man/man1/ltspfs.1.gz
-%{_datadir}/man/man1/lbmount.1.gz
-%{_datadir}/man/man1/ltspfsmounter.1.gz
+%{_mandir}/man1/ltspfs.1.gz
+%{_mandir}/man1/lbmount.1.gz
+%{_mandir}/man1/ltspfsmounter.1.gz
 
 %files -n ltspfsd
 %defattr(-,root,root,-)
@@ -70,11 +71,16 @@
 %{_sysconfdir}/udev/rules.d/88-ltsp.rules
 /lib/udev/ltspfs_entry
 %{_datadir}/ldm/
-%{_datadir}/ldm/
-%{_datadir}/man/man1/ltspfsd.1.gz
+%{_mandir}/man1/ltspfsd.1.gz
+%{_mandir}/man1/cdpinger.1.gz
+%{_mandir}/man1/ltspfs_mount.1.gz
+%{_mandir}/man1/ltspfs_umount.1.gz
 %dir %{_localstatedir}/run/devices/
 
 %changelog
+* Thu Sep 11 2008 Warren Togami <wtogami at redhat.com> - 0.5.4-1
+- bug fixes and more man pages
+
 * Mon Apr 28 2008 Warren Togami <wtogami at redhat.com> - 0.5.2-1
 - Create /media/$username as 0750 instead of 0755
   (needed by glib2-2.16.3-5.fc9)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltspfs/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Apr 2008 23:08:14 -0000	1.5
+++ sources	11 Sep 2008 19:34:06 -0000	1.6
@@ -1 +1 @@
-1937c65a0e821d7e5a9e3c8d0c9017a8  ltspfs-0.5.2.tar.bz2
+628ca063cbc6c5ae236f0b5887e527ba  ltspfs-0.5.4.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep 11 19:36:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 19:36:18 +0000
Subject: [pkgdb] python-markdown2 was added for thm
Message-ID: <20080911193618.C81B6208D9A@bastion.fedora.phx.redhat.com>

kevin has added Package python-markdown2 with summary A fast and complete Python implementation of Markdown
kevin has approved Package python-markdown2
kevin has added a Fedora devel branch for python-markdown2 with an owner of thm
kevin has approved python-markdown2 in Fedora devel
kevin has approved Package python-markdown2
kevin has set commit to Approved for packager on python-markdown2 (Fedora devel)
kevin has set build to Approved for packager on python-markdown2 (Fedora devel)
kevin has set checkout to Approved for packager on python-markdown2 (Fedora devel)
kevin has set commit to Approved for uberpackager on python-markdown2 (Fedora devel)
kevin has set build to Approved for uberpackager on python-markdown2 (Fedora devel)
kevin has set checkout to Approved for uberpackager on python-markdown2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-markdown2



From pkgdb at fedoraproject.org  Thu Sep 11 19:36:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 19:36:19 +0000
Subject: [pkgdb] python-markdown2 (Fedora, 8) updated by kevin
Message-ID: <20080911193619.F29B6208D9F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for python-markdown2
kevin has set commit to Approved for uberpackager on python-markdown2 (Fedora 8)
kevin has set build to Approved for uberpackager on python-markdown2 (Fedora 8)
kevin has set checkout to Approved for uberpackager on python-markdown2 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-markdown2



From kevin at fedoraproject.org  Thu Sep 11 19:36:39 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 11 Sep 2008 19:36:39 +0000 (UTC)
Subject: rpms/python-markdown2 - New directory
Message-ID: <20080911193639.2D7F670131@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-markdown2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse23705/rpms/python-markdown2

Log Message:
Directory /cvs/extras/rpms/python-markdown2 added to the repository




From pkgdb at fedoraproject.org  Thu Sep 11 19:36:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 19:36:19 +0000
Subject: [pkgdb] python-markdown2 (Fedora, 9) updated by kevin
Message-ID: <20080911193620.2B3C3208DA2@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for python-markdown2
kevin has set commit to Approved for uberpackager on python-markdown2 (Fedora 9)
kevin has set build to Approved for uberpackager on python-markdown2 (Fedora 9)
kevin has set checkout to Approved for uberpackager on python-markdown2 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-markdown2



From kevin at fedoraproject.org  Thu Sep 11 19:36:40 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 11 Sep 2008 19:36:40 +0000 (UTC)
Subject: rpms/python-markdown2 Makefile,NONE,1.1
Message-ID: <20080911193640.6500870131@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-markdown2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse23705/rpms/python-markdown2

Added Files:
	Makefile 
Log Message:
Setup of module python-markdown2


--- NEW FILE Makefile ---
# Top level Makefile for module python-markdown2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep 11 19:36:39 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 11 Sep 2008 19:36:39 +0000 (UTC)
Subject: rpms/python-markdown2/devel - New directory
Message-ID: <20080911193639.708F770131@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-markdown2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse23705/rpms/python-markdown2/devel

Log Message:
Directory /cvs/extras/rpms/python-markdown2/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 11 19:36:40 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 11 Sep 2008 19:36:40 +0000 (UTC)
Subject: rpms/python-markdown2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080911193640.A42BD70131@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-markdown2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse23705/rpms/python-markdown2/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-markdown2


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-markdown2
# $Id: Makefile,v 1.1 2008/09/11 19:36:40 kevin Exp $
NAME := python-markdown2
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From hadess at fedoraproject.org  Thu Sep 11 19:37:17 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 19:37:17 +0000 (UTC)
Subject: rpms/gstreamer/devel gstreamer.spec,1.83,1.84
Message-ID: <20080911193717.3EEE670131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23685

Modified Files:
	gstreamer.spec 
Log Message:
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-4
- Add the rpm scripts install in /usr/lib/rpm, not under libdir on 64-bit



Index: gstreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- gstreamer.spec	11 Sep 2008 18:27:02 -0000	1.83
+++ gstreamer.spec	11 Sep 2008 19:36:47 -0000	1.84
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}
 Version: 	0.10.20
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -130,7 +130,7 @@
 # Create empty cache directory
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gstreamer-%{majorminor}
 # Add the provides script
-install -m0755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/rpm/gstreamer.prov
+install -m0755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_prefix}/lib/rpm/gstreamer.prov
 # Add the macros file
 install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.gstreamer
 
@@ -208,10 +208,13 @@
 %doc %{_datadir}/gtk-doc/html/gstreamer-libs-%{majorminor}
 %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}
 
-%{_libdir}/rpm/gstreamer.prov
+%{_prefix}/lib/rpm/gstreamer.prov
 %{_sysconfdir}/rpm/macros.gstreamer
 
 %changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-4
+- Add the rpm scripts install in /usr/lib/rpm, not under libdir on 64-bit
+
 * Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-3
 - Update filelist as well
 



From till at fedoraproject.org  Thu Sep 11 19:37:54 2008
From: till at fedoraproject.org (Till Maas)
Date: Thu, 11 Sep 2008 19:37:54 +0000 (UTC)
Subject: rpms/libHX/F-8 .cvsignore, 1.3, 1.4 libHX.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20080911193754.1828170131@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/libHX/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24035

Modified Files:
	.cvsignore libHX.spec sources 
Log Message:
* Thu Sep 11 2008 Till Maas <opensource at till.name> - 1.25-1
- Update to latest version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Sep 2008 12:15:48 -0000	1.3
+++ .cvsignore	11 Sep 2008 19:37:23 -0000	1.4
@@ -1 +1 @@
-libHX-1.23.tar.bz2
+libHX-1.25.tar.bz2


Index: libHX.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/F-8/libHX.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libHX.spec	5 Sep 2008 12:15:48 -0000	1.2
+++ libHX.spec	11 Sep 2008 19:37:23 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           libHX
-Version:        1.23
+Version:        1.25
 Release:        1%{?dist}
 Summary:        General-purpose library for typical low-level operations
 
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Till Maas <opensource at till.name> - 1.25-1
+- Update to latest version
+
 * Fri Sep 05 2008 Till Maas <opensource at till.name> - 1.23-1
 - Update to latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Sep 2008 12:15:48 -0000	1.3
+++ sources	11 Sep 2008 19:37:23 -0000	1.4
@@ -1 +1 @@
-a14dcb5f8c89ec6ba754b4d1e61612b4  libHX-1.23.tar.bz2
+6f19ce48a03f729c3cab32a42924ed2f  libHX-1.25.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep 11 19:40:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 19:40:20 +0000
Subject: [pkgdb] eigen2 was added for rdieter
Message-ID: <20080911194020.B4EBA208D9C@bastion.fedora.phx.redhat.com>

kevin has added Package eigen2 with summary A lightweight C++ template library for vector and matrix math
kevin has approved Package eigen2
kevin has added a Fedora devel branch for eigen2 with an owner of rdieter
kevin has approved eigen2 in Fedora devel
kevin has approved Package eigen2
kevin has set commit to Approved for packager on eigen2 (Fedora devel)
kevin has set build to Approved for packager on eigen2 (Fedora devel)
kevin has set checkout to Approved for packager on eigen2 (Fedora devel)
kevin has set commit to Approved for uberpackager on eigen2 (Fedora devel)
kevin has set build to Approved for uberpackager on eigen2 (Fedora devel)
kevin has set checkout to Approved for uberpackager on eigen2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eigen2



From kevin at fedoraproject.org  Thu Sep 11 19:40:37 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 11 Sep 2008 19:40:37 +0000 (UTC)
Subject: rpms/eigen2/devel - New directory
Message-ID: <20080911194037.7591A70131@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eigen2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB25122/rpms/eigen2/devel

Log Message:
Directory /cvs/extras/rpms/eigen2/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 11 19:40:37 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 11 Sep 2008 19:40:37 +0000 (UTC)
Subject: rpms/eigen2 - New directory
Message-ID: <20080911194037.2DF5B70131@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eigen2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB25122/rpms/eigen2

Log Message:
Directory /cvs/extras/rpms/eigen2 added to the repository




From kevin at fedoraproject.org  Thu Sep 11 19:40:38 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 11 Sep 2008 19:40:38 +0000 (UTC)
Subject: rpms/eigen2 Makefile,NONE,1.1
Message-ID: <20080911194038.9E82570131@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eigen2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB25122/rpms/eigen2

Added Files:
	Makefile 
Log Message:
Setup of module eigen2


--- NEW FILE Makefile ---
# Top level Makefile for module eigen2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep 11 19:40:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 19:40:22 +0000
Subject: [pkgdb] eigen2 (Fedora, 9) updated by kevin
Message-ID: <20080911194022.7EE62208D9F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for eigen2
kevin has set commit to Approved for uberpackager on eigen2 (Fedora 9)
kevin has set build to Approved for uberpackager on eigen2 (Fedora 9)
kevin has set checkout to Approved for uberpackager on eigen2 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eigen2



From kevin at fedoraproject.org  Thu Sep 11 19:40:39 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 11 Sep 2008 19:40:39 +0000 (UTC)
Subject: rpms/eigen2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080911194039.26EE570131@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eigen2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB25122/rpms/eigen2/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eigen2


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eigen2
# $Id: Makefile,v 1.1 2008/09/11 19:40:38 kevin Exp $
NAME := eigen2
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Thu Sep 11 19:43:24 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 11 Sep 2008 19:43:24 +0000 (UTC)
Subject: rpms/ltspfs/F-9 ltspfs.spec,1.5,1.6
Message-ID: <20080911194324.DC09570131@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltspfs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25728

Modified Files:
	ltspfs.spec 
Log Message:
dkms-fuse is only RHEL5



Index: ltspfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltspfs/F-9/ltspfs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ltspfs.spec	11 Sep 2008 19:34:06 -0000	1.5
+++ ltspfs.spec	11 Sep 2008 19:42:54 -0000	1.6
@@ -12,7 +12,9 @@
 BuildRequires: fuse-devel
 BuildRequires: libX11-devel
 BuildRequires: glib2-devel
+%if 0%{?rhel} > 5
 Requires:      dkms-fuse
+%endif
 
 %package -n ltspfsd 
 Group:          System Environment/Base



From ajax at fedoraproject.org  Thu Sep 11 19:11:48 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 11 Sep 2008 19:11:48 +0000 (UTC)
Subject: rpms/libxcb/devel libxcb.spec,1.8,1.9
Message-ID: <20080911191148.AFACF70131@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libxcb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16265

Modified Files:
	libxcb.spec 
Log Message:
* Thu Sep 11 2008 Adam Jackson <ajax at redhat.com> 1.1.91-2
- Enable x-selinux bindings.



Index: libxcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/libxcb.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libxcb.spec	11 Sep 2008 18:00:15 -0000	1.8
+++ libxcb.spec	11 Sep 2008 19:11:18 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           libxcb
 Version:        1.1.91
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A C binding to the X11 protocol
 
 Group:          System Environment/Libraries
@@ -53,7 +53,8 @@
 
 %build
 autoreconf -v --install
-%configure --disable-static --docdir=%{_datadir}/doc/%{name}-%{version}
+%configure --disable-static --docdir=%{_datadir}/doc/%{name}-%{version} \
+	   --enable-xselinux
 make %{?_smp_mflags}
 
 %install
@@ -83,6 +84,9 @@
 %{_datadir}/doc/%{name}-%{version}
 
 %changelog
+* Thu Sep 11 2008 Adam Jackson <ajax at redhat.com> 1.1.91-2
+- Enable x-selinux bindings.
+
 * Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 1.1.91-1
 - libxcb 1.1.91
 



From spot at fedoraproject.org  Thu Sep 11 19:20:42 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 19:20:42 +0000 (UTC)
Subject: rpms/tetex-eurofont/devel dead.package, NONE, 1.1 eurofont.ins.diff,
	1.1, NONE sources, 1.2, NONE tetex-eurofont.spec, 1.7, NONE
Message-ID: <20080911192042.3D52870131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tetex-eurofont/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18879

Added Files:
	dead.package 
Removed Files:
	eurofont.ins.diff sources tetex-eurofont.spec 
Log Message:
kill package due to bad license


--- NEW FILE dead.package ---
This font set is under a non-free license. Attempts to reach upstream for relicensing were unsuccessful.

Tom "spot" Callaway <tcallawa at redhat.com> Thursday September 11, 2008


--- eurofont.ins.diff DELETED ---


--- sources DELETED ---


--- tetex-eurofont.spec DELETED ---



From ajax at fedoraproject.org  Thu Sep 11 19:45:25 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 11 Sep 2008 19:45:25 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-6.9.0-panel-size-sanity.patch,
	NONE, 1.1 xorg-x11-drv-ati.spec, 1.113, 1.114
Message-ID: <20080911194525.B956770131@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-serv26276

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.9.0-panel-size-sanity.patch 
Log Message:
* Thu Sep 11 2008 Adam Jackson <ajax at redhat.com> 6.9.0-14
- radeon-6.9.0-panel-size-sanity.patch: Panels smaller than 800x480 are
  highly implausible, disable them if we find them.  If you have one,
  you can force it with Option "PanelSize".


radeon-6.9.0-panel-size-sanity.patch:

--- NEW FILE radeon-6.9.0-panel-size-sanity.patch ---
diff -up xf86-video-ati-6.9.0/src/radeon_output.c.jx xf86-video-ati-6.9.0/src/radeon_output.c
--- xf86-video-ati-6.9.0/src/radeon_output.c.jx	2008-09-11 15:31:28.000000000 -0400
+++ xf86-video-ati-6.9.0/src/radeon_output.c	2008-09-11 15:41:33.000000000 -0400
@@ -1972,14 +1972,18 @@ RADEONGetLVDSInfo (xf86OutputPtr output)
     RADEONOutputPrivatePtr radeon_output = output->driver_private;
     char* s;
 
-    if (!RADEONGetLVDSInfoFromBIOS(output))
-	RADEONGetPanelInfoFromReg(output);
-
     if ((s = xf86GetOptValString(info->Options, OPTION_PANEL_SIZE))) {
 	radeon_output->PanelPwrDly = 200;
 	if (sscanf (s, "%dx%d", &radeon_output->PanelXRes, &radeon_output->PanelYRes) != 2) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Invalid PanelSize option: %s\n", s);
-	    RADEONGetPanelInfoFromReg(output);
+	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Invalid PanelSize option: %s, disabling the panel\n", s);
+	    return FALSE;
+	}
+    } else if (!RADEONGetLVDSInfoFromBIOS(output)) {
+	RADEONGetPanelInfoFromReg(output);
+	if (radeon_output->PanelXRes < 800 || radeon_output->PanelYRes < 480) {
+	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+		       "Implausible panel size, disabling\n");
+	    return 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.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- xorg-x11-drv-ati.spec	11 Sep 2008 17:25:35 -0000	1.113
+++ xorg-x11-drv-ati.spec	11 Sep 2008 19:44:55 -0000	1.114
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   13%{?dist}
+Release:   14%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -19,6 +19,7 @@
 Patch2:     radeon-suspend-fix.patch
 Patch3:	    radeon-fix-pipe-config.patch
 Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
+Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 
 ExcludeArch: s390 s390x
 
@@ -42,6 +43,7 @@
 %patch2 -p1 -b .suspend
 %patch3 -p1 -b .pipe-config
 %patch4 -p1 -b .remove-limit-heuristics
+%patch5 -p1 -b .panel-size
 
 %build
 autoreconf
@@ -73,6 +75,11 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Sep 11 2008 Adam Jackson <ajax at redhat.com> 6.9.0-14
+- radeon-6.9.0-panel-size-sanity.patch: Panels smaller than 800x480 are
+  highly implausible, disable them if we find them.  If you have one,
+  you can force it with Option "PanelSize".
+
 * Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 6.9.0-13
 - Remove the fb size hack since there is a fix in the server now.
 - Unfortunately, the driver prevents this fix from working by applying 



From wtogami at fedoraproject.org  Thu Sep 11 19:47:24 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 11 Sep 2008 19:47:24 +0000 (UTC)
Subject: rpms/ltspfs/F-9 ltspfs.spec,1.6,1.7
Message-ID: <20080911194724.38D0170131@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltspfs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26767

Modified Files:
	ltspfs.spec 
Log Message:
correct operator



Index: ltspfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltspfs/F-9/ltspfs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ltspfs.spec	11 Sep 2008 19:42:54 -0000	1.6
+++ ltspfs.spec	11 Sep 2008 19:46:53 -0000	1.7
@@ -12,7 +12,7 @@
 BuildRequires: fuse-devel
 BuildRequires: libX11-devel
 BuildRequires: glib2-devel
-%if 0%{?rhel} > 5
+%if 0%{?rhel} == 5
 Requires:      dkms-fuse
 %endif
 



From wtogami at fedoraproject.org  Thu Sep 11 19:49:22 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 11 Sep 2008 19:49:22 +0000 (UTC)
Subject: rpms/ltspfs/devel .cvsignore, 1.3, 1.4 ltspfs.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20080911194922.45C6D70131@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltspfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27267

Modified Files:
	.cvsignore ltspfs.spec sources 
Log Message:
- bug fixes and more man pages



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltspfs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Apr 2008 23:10:55 -0000	1.3
+++ .cvsignore	11 Sep 2008 19:48:52 -0000	1.4
@@ -1 +1 @@
-ltspfs-0.5.0.tar.bz2
+ltspfs-0.5.4.tar.bz2


Index: ltspfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltspfs/devel/ltspfs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ltspfs.spec	16 Apr 2008 23:10:55 -0000	1.2
+++ ltspfs.spec	11 Sep 2008 19:48:52 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           ltspfs
-Version:        0.5.0
+Version:        0.5.4
 Release:        1%{?dist}
 Summary:        LTSP file system, daemon that runs on thin clients
 
@@ -12,10 +12,14 @@
 BuildRequires: fuse-devel
 BuildRequires: libX11-devel
 BuildRequires: glib2-devel
+%if 0%{?rhel} == 5
+Requires:      dkms-fuse
+%endif
 
 %package -n ltspfsd 
 Group:          System Environment/Base
 Summary:        LTSP file system, userspace FUSE module that runs on a server
+Requires:      xorg-x11-utils
 
 %description
 Fuse based remote filesystem for LTSP thin clients
@@ -52,13 +56,13 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING
+%doc COPYING ChangeLog
 %{_bindir}/ltspfs
-%{_bindir}/lbmount
+%attr(4755,root,root) %{_bindir}/lbmount
 %{_sbindir}/ltspfsmounter
-%{_datadir}/man/man1/ltspfs.1.gz
-%{_datadir}/man/man1/lbmount.1.gz
-%{_datadir}/man/man1/ltspfsmounter.1.gz
+%{_mandir}/man1/ltspfs.1.gz
+%{_mandir}/man1/lbmount.1.gz
+%{_mandir}/man1/ltspfsmounter.1.gz
 
 %files -n ltspfsd
 %defattr(-,root,root,-)
@@ -67,14 +71,29 @@
 %{_sbindir}/ltspfs_mount
 %{_sbindir}/ltspfs_umount
 %{_sysconfdir}/udev/rules.d/88-ltsp.rules
-/lib/udev/add_fstab_entry
-/lib/udev/remove_fstab_entry
+/lib/udev/ltspfs_entry
 %{_datadir}/ldm/
-%{_datadir}/ldm/
-%{_datadir}/man/man1/ltspfsd.1.gz
+%{_mandir}/man1/ltspfsd.1.gz
+%{_mandir}/man1/cdpinger.1.gz
+%{_mandir}/man1/ltspfs_mount.1.gz
+%{_mandir}/man1/ltspfs_umount.1.gz
 %dir %{_localstatedir}/run/devices/
 
 %changelog
+* Thu Sep 11 2008 Warren Togami <wtogami at redhat.com> - 0.5.4-1
+- bug fixes and more man pages
+
+* Mon Apr 28 2008 Warren Togami <wtogami at redhat.com> - 0.5.2-1
+- Create /media/$username as 0750 instead of 0755
+  (needed by glib2-2.16.3-5.fc9)
+  Ignore inaccessible mounts during mountpoint enumeration (GNOME #526320)
+  This prevents bogus inaccessible devices owned by one user from appearing
+  on the desktops of other users.
+
+* Mon Apr 21 2008 Warren Togami <wtogami at redhat.com> - 0.5.1-1
+- lbmount must be setuid
+- ltspfsd requires xorg-x11-utils in the client chroot
+
 * Wed Apr 16 2008 Warren Togami <wtogami at redhat.com> - 0.5.0-1
 - 0.5.0 to have an actual version number
   almost no change changes since previous snapshot


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltspfs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Apr 2008 23:10:55 -0000	1.3
+++ sources	11 Sep 2008 19:48:52 -0000	1.4
@@ -1 +1 @@
-8f57f9b731ac0fd284e7805f31cdabbf  ltspfs-0.5.0.tar.bz2
+628ca063cbc6c5ae236f0b5887e527ba  ltspfs-0.5.4.tar.bz2



From cweyl at fedoraproject.org  Thu Sep 11 19:49:13 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu, 11 Sep 2008 19:49:13 +0000 (UTC)
Subject: rpms/perl-Perl-Critic/F-9 perl-Perl-Critic.spec, 1.17, 1.18 sources,
	1.11, 1.12
Message-ID: <20080911194913.0AE4B70131@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Perl-Critic/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27304

Modified Files:
	perl-Perl-Critic.spec sources 
Log Message:
* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.092-1
- update to 1.092



Index: perl-Perl-Critic.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/F-9/perl-Perl-Critic.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- perl-Perl-Critic.spec	1 Jul 2008 03:58:44 -0000	1.17
+++ perl-Perl-Critic.spec	11 Sep 2008 19:48:42 -0000	1.18
@@ -1,12 +1,11 @@
 Name:           perl-Perl-Critic
-Version:        1.082
+Version:        1.092
 Release:        1%{?dist}
 Summary:        Critique Perl source code for best-practices
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Perl-Critic/
-Source0:        http://www.cpan.org/authors/id/T/TH/THALJEF/perlcritic/Perl-Critic-%{version}.tar.gz
 Source0:        http://www.cpan.org/modules/by-module/Perl/Perl-Critic-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -19,13 +18,14 @@
 BuildRequires:  perl(IO::String)
 BuildRequires:  perl(List::MoreUtils)
 BuildRequires:  perl(Module::Pluggable) >= 3.1
-BuildRequires:  perl(PPI) >= 1.201
+BuildRequires:  perl(PPI) >= 1.203
 BuildRequires:  perl(String::Format) >= 1.13
 BuildRequires:  perl(Perl::Tidy)
 BuildRequires:  perl(Test::Memory::Cycle)
 BuildRequires:  perl(Readonly) >= 1.03
 BuildRequires:  perl(Exception::Class) >= 1.23
 # BuildRequires:  perl(Regexp::Parser)
+BuildRequires:  perl(Test::Deep)
 # Author tests
 #BuildRequires:  perl(Test::Perl::Critic)
 #BuildRequires:  perl(Test::Kwalitee)
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Mon Sep 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.092-1
+- update to 1.092
+
 * Sun Mar 09 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.082-1
 - update to 1.082
 - resolve BZ#431577


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Jul 2008 03:58:44 -0000	1.11
+++ sources	11 Sep 2008 19:48:42 -0000	1.12
@@ -1 +1 @@
-f2ad44e084444b42f1b59b0f2f3bb387  Perl-Critic-1.082.tar.gz
+ead8f91253864525e0a022a1ef903c64  Perl-Critic-1.092.tar.gz



From wtogami at fedoraproject.org  Thu Sep 11 19:52:52 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 11 Sep 2008 19:52:52 +0000 (UTC)
Subject: rpms/ldm/F-9 ldm.spec,1.15,1.16
Message-ID: <20080911195252.AAB4270131@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ldm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28361

Modified Files:
	ldm.spec 
Log Message:
- remove /var/cache/ldm from package, renamed and shipped in ltsp-server instead



Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-9/ldm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ldm.spec	24 Aug 2008 16:19:40 -0000	1.15
+++ ldm.spec	11 Sep 2008 19:52:22 -0000	1.16
@@ -1,8 +1,8 @@
 Name:           ldm
 Version:        2.0.12
-%define _datestamp .20080811.14
+%define _datestamp .20080911.15
 #Release:        7%{_datestamp}%{?dist}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        LTSP Display Manager
 
 Group:          User Interface/X
@@ -53,9 +53,11 @@
 %{_mandir}/man1/ldm.1.gz
 %{_datadir}/ltsp/screen.d/ldm
 %dir %{_localstatedir}/run/ldm/
-%dir %{_localstatedir}/cache/ldm/
 
 %changelog
+* Wed Sep 10 2008 Warren Togami <wtogami at redhat.com> - 2.0.12-2
+- remove /var/cache/ldm from package, renamed and shipped in ltsp-server instead
+
 * Sun Aug 24 2008 Warren Togami <wtogami at redhat.com> - 2.0.12-1
 - Fix crash on x86_64
 - Fix crash after X failure



From ssp at fedoraproject.org  Thu Sep 11 17:30:29 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu, 11 Sep 2008 17:30:29 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nv/devel xorg-x11-drv-nv.spec, 1.75,
	1.76 nv-2.1.12-fb-size.patch, 1.2, NONE
Message-ID: <20080911173029.ABF0070131@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18261

Modified Files:
	xorg-x11-drv-nv.spec 
Removed Files:
	nv-2.1.12-fb-size.patch 
Log Message:
Remove fb size hack


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.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- xorg-x11-drv-nv.spec	10 Sep 2008 18:21:33 -0000	1.75
+++ xorg-x11-drv-nv.spec	11 Sep 2008 17:29:59 -0000	1.76
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.12
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -30,7 +30,6 @@
 Patch5:	    nv-2.1.6-starvation.patch
 Patch6:	    nv-2.1.6-panel-fix.patch
 Patch7:	    nv-save-rom.patch
-Patch8:	    nv-2.1.12-fb-size.patch
 
 %description 
 X.Org X11 nv video driver.
@@ -44,7 +43,6 @@
 %patch5 -p1 -b .starve
 %patch6 -p1 -b .panel
 %patch7 -p1 -b .save-rom
-%patch8 -p1 -b .fb-size
 
 %build
 %configure --disable-static
@@ -71,6 +69,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 2.1.12-4
+- Remove fb size hack since there is a fix in the server now.
+
 * Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 2.1.12-3
 - Do the fb size hack a differently wretched way.
 


--- nv-2.1.12-fb-size.patch DELETED ---



From ssp at fedoraproject.org  Thu Sep 11 17:19:56 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu, 11 Sep 2008 17:19:56 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xserver-1.5.0-projector-fb-size.patch,
	1.2, 1.3
Message-ID: <20080911171956.B41CD70131@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14796

Modified Files:
	xserver-1.5.0-projector-fb-size.patch 
Log Message:
Make the patch compile

xserver-1.5.0-projector-fb-size.patch:

Index: xserver-1.5.0-projector-fb-size.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.5.0-projector-fb-size.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xserver-1.5.0-projector-fb-size.patch	11 Sep 2008 14:51:35 -0000	1.2
+++ xserver-1.5.0-projector-fb-size.patch	11 Sep 2008 17:19:26 -0000	1.3
@@ -1,14 +1,14 @@
-From ff21ec16fc05cc5fd0d60e466b7175fb2a33f8d2 Mon Sep 17 00:00:00 2001
-From: Soren Sandmann <sandmann at redhat.com>
-Date: Thu, 11 Sep 2008 10:47:03 -0400
-Subject: [PATCH] Make room for an external monitor if we have enough video ram
+From dc5cedd61e00afec33cbfaa7fdfbb6c357074dbd Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <sandmann at redhat.com>
+Date: Thu, 11 Sep 2008 12:51:31 -0400
+Subject: [PATCH] Make room for an external monitor if we have enough video RAM
 
 ---
  hw/xfree86/modes/xf86Crtc.c |    9 +++++++++
  1 files changed, 9 insertions(+), 0 deletions(-)
 
 diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 4de7e05..afb70a7 100644
+index 4de7e05..9bcf81b 100644
 --- a/hw/xfree86/modes/xf86Crtc.c
 +++ b/hw/xfree86/modes/xf86Crtc.c
 @@ -987,6 +987,15 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp,
@@ -17,13 +17,13 @@
      }
 +
 +    /* Make room for an external monitor if we have enough video ram */
-+    if (scrn->VideoRam >= 65536)
++    if (scrn->videoRam >= 65536)
 +        width += 1920;
-+    else if (scrn->VideoRam >= 32768)
++    else if (scrn->videoRam >= 32768)
 +        width += 1280;
-+    else if (scrn->VideoRam >= 16384)
++    else if (scrn->videoRam >= 16384)
 +        width += 1024;
-+    
++
      if (config->maxWidth && width > config->maxWidth) width = config->maxWidth;
      if (config->maxHeight && height > config->maxHeight) height = config->maxHeight;
      if (config->minWidth && width < config->minWidth) width = config->minWidth;



From ssp at fedoraproject.org  Thu Sep 11 17:26:05 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu, 11 Sep 2008 17:26:05 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel
	radeon-6.9.0-remove-limit-heuristics.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.112,
	1.113 radeon-6.9.0-fb-size.patch, 1.2, NONE
Message-ID: <20080911172605.A919570131@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16652

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.9.0-remove-limit-heuristics.patch 
Removed Files:
	radeon-6.9.0-fb-size.patch 
Log Message:
Remove fb size patch; add patch to remove size range heuristics

radeon-6.9.0-remove-limit-heuristics.patch:

--- NEW FILE radeon-6.9.0-remove-limit-heuristics.patch ---
diff -up xf86-video-ati-6.9.0/src/radeon_driver.c.orig xf86-video-ati-6.9.0/src/radeon_driver.c
--- xf86-video-ati-6.9.0/src/radeon_driver.c.orig	2008-09-11 09:58:15.000000000 -0400
+++ xf86-video-ati-6.9.0/src/radeon_driver.c	2008-09-11 09:58:40.000000000 -0400
@@ -2932,32 +2932,41 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in
 	    if (crtc_max_Y > 8192)
 		crtc_max_Y = 8192;
 	} else {
+
 	    /*
-	     * note that these aren't really the CRTC limits, they're just
-	     * heuristics until we have a better memory manager.
+	     * <ssp> In radeon_driver.c it says:
+	     *        *
+	     *        * note that these aren't really the CRTC limits, they're just
+	     *        * heuristics until we have a better memory manager.
+	     *	      *
+	     *	  then it goes on to heuristically assign numbers to crtc_max_X/Y
+	     *        I think that's wrong because xf86InitialConfiguration will already pick a
+	     *	  reasonable value for xf86CrtcSetSizeRange() - there is no need for driver
+	     *	  heuristics. So I think it should just set the size range to whatever the crtc
+	     *	  limits are. Does anyone know the actual values?
+	     * <ajax> depends on whether your front buffer is tiled
+	     * <ssp>  Ah, so info->MaxSurfaceWidth would be a resonable setting
+	     * <ajax> 3968 if it is.  otherwise i think it's 8k for r500+ and 4k for previous
+	     * <ssp>  Cool, I'll patch it to do something like that in Fedora then
+	     * <ajax> ta
+	     *
 	     */
-	    if (pScrn->videoRam <= 16384) {
-		crtc_max_X = 1600;
-		crtc_max_Y = 1200;
-	    } else if (IS_R300_VARIANT) {
-		crtc_max_X = 2560;
-		crtc_max_Y = 1200;
-	    } else if (IS_AVIVO_VARIANT) {
-		crtc_max_X = 2560;
-		crtc_max_Y = 1600;
-	    } else {
-		crtc_max_X = 2048;
-		crtc_max_Y = 1200;
-	}
+	    if (info->allowColorTiling) {
+		crtc_max_X = info->MaxSurfaceWidth;
+		crtc_max_Y = info->MaxLines;
+	    }
+	    else {
+               if (IS_AVIVO_VARIANT) {
+		    crtc_max_X = 8192;
+		    crtc_max_Y = 8192;
+		}
+		else {
+		    crtc_max_X = 4096;
+		    crtc_max_Y = 4096;
+		}
+	    }
 	}
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Max desktop size set to %dx%d\n",
-		   crtc_max_X, crtc_max_Y);
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		   "For a larger or smaller max desktop size, add a Virtual line to your xorg.conf\n");
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		   "If you are having trouble with 3D, "
-		   "reduce the desktop size by adjusting the Virtual line to your xorg.conf\n");
-	
+
     /*xf86CrtcSetSizeRange (pScrn, 320, 200, info->MaxSurfaceWidth, info->MaxLines);*/
 	xf86CrtcSetSizeRange (pScrn, 320, 200, crtc_max_X, crtc_max_Y);
 	


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- xorg-x11-drv-ati.spec	10 Sep 2008 17:48:04 -0000	1.112
+++ xorg-x11-drv-ati.spec	11 Sep 2008 17:25:35 -0000	1.113
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   12%{?dist}
+Release:   13%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -18,7 +18,7 @@
 Patch1:     radeon-modeset.patch
 Patch2:     radeon-suspend-fix.patch
 Patch3:	    radeon-fix-pipe-config.patch
-Patch4:	    radeon-6.9.0-fb-size.patch
+Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 
 ExcludeArch: s390 s390x
 
@@ -41,7 +41,7 @@
 %patch1 -p1 -b .modeset
 %patch2 -p1 -b .suspend
 %patch3 -p1 -b .pipe-config
-%patch4 -p1 -b .fb-size
+%patch4 -p1 -b .remove-limit-heuristics
 
 %build
 autoreconf
@@ -73,6 +73,11 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 6.9.0-13
+- Remove the fb size hack since there is a fix in the server now.
+- Unfortunately, the driver prevents this fix from working by applying 
+  its own heuristics. Remove those.
+
 * Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 6.9.0-12
 - Do the fb size hack a differently bad way.
 


--- radeon-6.9.0-fb-size.patch DELETED ---



From wtogami at fedoraproject.org  Thu Sep 11 20:04:21 2008
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 11 Sep 2008 20:04:21 +0000 (UTC)
Subject: rpms/ldm/devel ldm.spec,1.9,1.10
Message-ID: <20080911200421.BE26470131@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ldm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31375

Modified Files:
	ldm.spec 
Log Message:
- remove /var/cache/ldm from package, renamed and shipped in ltsp-server instead



Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/devel/ldm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ldm.spec	25 Aug 2008 15:28:35 -0000	1.9
+++ ldm.spec	11 Sep 2008 20:03:51 -0000	1.10
@@ -1,8 +1,8 @@
 Name:           ldm
 Version:        2.0.12
-%define _datestamp .20080811.14
+%define _datestamp .20080911.15
 #Release:        7%{_datestamp}%{?dist}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        LTSP Display Manager
 
 Group:          User Interface/X
@@ -53,9 +53,11 @@
 %{_mandir}/man1/ldm.1.gz
 %{_datadir}/ltsp/screen.d/ldm
 %dir %{_localstatedir}/run/ldm/
-%dir %{_localstatedir}/cache/ldm/
 
 %changelog
+* Wed Sep 10 2008 Warren Togami <wtogami at redhat.com> - 2.0.12-2
+- remove /var/cache/ldm from package, renamed and shipped in ltsp-server instead
+
 * Sun Aug 24 2008 Warren Togami <wtogami at redhat.com> - 2.0.12-1
 - Fix crash on x86_64
 - Fix crash after X failure



From nhorman at fedoraproject.org  Thu Sep 11 17:14:10 2008
From: nhorman at fedoraproject.org (Neil Horman)
Date: Thu, 11 Sep 2008 17:14:10 +0000 (UTC)
Subject: rpms/python-pysctp/devel __init__.py, NONE,
	1.1 pysctp-buildfix.patch, 
	NONE, 1.1 python-pysctp.spec, NONE, 1.1 setup.py, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080911171410.1A93870131@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/python-pysctp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13352

Modified Files:
	.cvsignore sources 
Added Files:
	__init__.py pysctp-buildfix.patch python-pysctp.spec setup.py 
Log Message:
Initial import


--- NEW FILE __init__.py ---
__version__ = "0.3.1"

pysctp-buildfix.patch:

--- NEW FILE pysctp-buildfix.patch ---
diff -up pysctp-0.3.1/sctp.py.orig pysctp-0.3.1/sctp.py
--- pysctp-0.3.1/sctp.py.orig	2008-04-10 21:30:33.000000000 -0400
+++ pysctp-0.3.1/sctp.py	2008-04-10 21:30:20.000000000 -0400
@@ -32,7 +32,7 @@ send_failed(): 
 remote_error(): 
 shutdown_event(): 
 pdapi_event(): 
-adaption_event(): 
+adaptation_event(): 
 
 Every SCTP socket has a number of properties. Two "complex" properties,
 that contain a number of sub-properties, are: 
@@ -246,7 +246,7 @@ class notification(object):
 	type_REMOTE_ERROR = _sctp.getconstant("SCTP_REMOTE_ERROR")
 	type_SHUTDOWN_EVENT = _sctp.getconstant("SCTP_SHUTDOWN_EVENT")
 	type_PARTIAL_DELIVERY_EVENT = _sctp.getconstant("SCTP_PARTIAL_DELIVERY_EVENT")
-	type_ADAPTION_INDICATION = _sctp.getconstant("SCTP_ADAPTION_INDICATION")
+	type_ADAPTATION_INDICATION = _sctp.getconstant("SCTP_ADAPTATION_INDICATION")
 
 class assoc_change(notification):
 	"""
@@ -396,14 +396,14 @@ class shutdown_event(notification):
 		self.assoc_id = 0
 		notification.__init__(self, values)
 	
-class adaption_event(notification):
+class adaptation_event(notification):
 	"""
 	Adaption indication event. It signals that the remote peer requests
-	an specific adaption layer.
+	an specific adaptation layer.
 
 	In SCTP, you can pass an optional 32-bit metadata identifier 
 	along each message, called "ppid". For protocols that actively use
-	this feature, it is like a subprotocol identifier, or "adaption
+	this feature, it is like a subprotocol identifier, or "adaptation
 	layer". The message interpreter is chosen by this value. This is
 	mostly for telephony signaling-related protocols.
 
@@ -419,7 +419,7 @@ class adaption_event(notification):
 	that (see event_subscribe class for details).
 	"""
 	def __init__(self, values=None):
-		self.adaption_ind = 0
+		self.adaptation_ind = 0
 		self.assoc_id = 0
 		notification.__init__(self, values)
 
@@ -451,7 +451,7 @@ notification_table = {
 	notification.type_REMOTE_ERROR: remote_error,
 	notification.type_SHUTDOWN_EVENT: shutdown_event,
 	notification.type_PARTIAL_DELIVERY_EVENT: pdapi_event,
-	notification.type_ADAPTION_INDICATION: adaption_event,
+	notification.type_ADAPTATION_INDICATION: adaptation_event,
 }
 
 
@@ -519,7 +519,7 @@ class event_subscribe(object):
 	peer_error: refers to remote_error() event
 	shutdown: refers to shutdon_event() 
 	partial_delivery: refers to pdapi_event()
-	adaption_layer: refers to adaption_event()
+	adaptation_layer: refers to adaptation_event()
 
 	(*) sndrcvinfo is ALWAYS returned by sctp_recv() along with message data. The
 	    data_io property just controls whether sndrcvinfo() contains useful data.
@@ -531,7 +531,7 @@ class event_subscribe(object):
 	sendfailure = send_failure
 	peererror = peer_error
 	partialdelivery = partial_delivery
-	adaptionlayer = adaption_layer
+	adaptationlayer = adaptation_layer
 	"""
 
 	def flush(self):
@@ -548,8 +548,8 @@ class event_subscribe(object):
 	def __get_property(self, key):
 		return self.__dict__[key]
 
-	def get_adaption_layer(self):
-		return self.__get_property("_adaption_layer")
+	def get_adaptation_layer(self):
+		return self.__get_property("_adaptation_layer")
 
 	def get_partial_delivery(self):
 		return self.__get_property("_partial_delivery")
@@ -572,8 +572,8 @@ class event_subscribe(object):
 	def get_data_io(self, value):
 		return self.__get_property("_data_io")
 
-	def set_adaption_layer(self, value):
-		self.__set_property("_adaption_layer", value)
+	def set_adaptation_layer(self, value):
+		self.__set_property("_adaptation_layer", value)
 
 	def set_partial_delivery(self, value):
 		self.__set_property("_partial_delivery", value)
@@ -608,7 +608,7 @@ class event_subscribe(object):
 		self._peer_error = 0
 		self._shutdown = 0
 		self._partial_delivery = 0
-		self._adaption_layer = 0
+		self._adaptation_layer = 0
 
 		if self.autoflush:
 			self.flush()
@@ -642,8 +642,8 @@ class event_subscribe(object):
 	partial_delivery = property(get_partial_delivery, set_partial_delivery)
 	partialdelivery = partial_delivery
 
-	adaption_layer = property(get_adaption_layer, set_adaption_layer)
-	adaptionlayer = adaption_layer
+	adaptation_layer = property(get_adaptation_layer, set_adaptation_layer)
+	adaptationlayer = adaptation_layer
 
 
 ########## STRUCTURES EXCHANGED VIA set/getsockopt() 
@@ -964,7 +964,7 @@ class sctpsocket(object):
 		 nature of SCTP, some implementations have it turned on by default, while TCP 
 		 is mandated to have it off by default.
 
-	adaption: 32-bit value related to the "ppid" metadata field sent along each data
+	adaptation: 32-bit value related to the "ppid" metadata field sent along each data
 		  message. If this property is different than zero, the configured value
 		  is sent via ADAPTION INDICATION event to the remote peer when a new 
 		  association is opened. This is intended to be used by telephony-related
@@ -1097,7 +1097,7 @@ class sctpsocket(object):
 
 		    WARNING: identifying destination by Association ID not implemented yet!
 
-		ppid: adaption layer value, a 32-bit metadata that is sent along the message.
+		ppid: adaptation layer value, a 32-bit metadata that is sent along the message.
 		      Defaults to 0.
 
 		flags: a bitmap of MSG_* flags. For example, MSG_UNORDERED indicates that 
@@ -1313,21 +1313,21 @@ class sctpsocket(object):
 		"""
 		_sctp.set_nodelay(self._sk.fileno(), rvalue)
 
-	def get_adaption(self):
+	def get_adaptation(self):
 		"""
-		Gets the adaption layer indication from kernel.
+		Gets the adaptation layer indication from kernel.
 		
-		See class documentation for more details. (adaption property)
+		See class documentation for more details. (adaptation property)
 		"""
-		return _sctp.get_adaption(self._sk.fileno())
+		return _sctp.get_adaptation(self._sk.fileno())
 
-	def set_adaption(self, rvalue):
+	def set_adaptation(self, rvalue):
 		"""
-		Sets the adaption layer indication for this socket.
+		Sets the adaptation layer indication for this socket.
 
-		See class documentation for more details. (adaption property)
+		See class documentation for more details. (adaptation property)
 		"""
-		_sctp.set_adaption(self._sk.fileno(), rvalue)
+		_sctp.set_adaptation(self._sk.fileno(), rvalue)
 
 	def get_disable_fragments(self):
 		"""
@@ -1599,7 +1599,7 @@ class sctpsocket(object):
 	# properties
 
 	nodelay = property(get_nodelay, set_nodelay)
-	adaption = property(get_adaption, set_adaption)
+	adaptation = property(get_adaptation, set_adaptation)
 	disable_fragments = property(get_disable_fragments, set_disable_fragments)
 	mappedv4 = property(get_mappedv4, set_mappedv4)
 	maxseg = property(get_maxseg, set_maxseg)
diff -up pysctp-0.3.1/Makefile.orig pysctp-0.3.1/Makefile
--- pysctp-0.3.1/Makefile.orig	2008-04-10 21:30:33.000000000 -0400
+++ pysctp-0.3.1/Makefile	2008-04-10 21:29:46.000000000 -0400
@@ -1,4 +1,4 @@
-PYTHON_VERSION = 2.4
+PYTHON_VERSION = 2.5
 CFLAGS = -Wall -I/usr/include/python$(PYTHON_VERSION) -fPIC
 LDFLAGS = -fPIC -shared -lsctp
 
diff -up pysctp-0.3.1/_sctp.c.orig pysctp-0.3.1/_sctp.c
--- pysctp-0.3.1/_sctp.c.orig	2008-04-10 21:30:33.000000000 -0400
+++ pysctp-0.3.1/_sctp.c	2008-04-10 21:30:20.000000000 -0400
@@ -5,8 +5,7 @@
  * Elvis Pf??tzenreuter (elvis.pfutzenreuter@{gmail.com,indt.org.br})
  * Copyright (c) 2005 Instituto Nokia de Tecnologia
  */
-
-#include "Python.h"
+#include <Python.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/sctp.h>
@@ -36,8 +35,8 @@ static PyObject* get_disable_fragments(P
 static PyObject* set_disable_fragments(PyObject* dummy, PyObject* args);
 static PyObject* get_autoclose(PyObject* dummy, PyObject* args);
 static PyObject* set_autoclose(PyObject* dummy, PyObject* args);
-static PyObject* get_adaption(PyObject* dummy, PyObject* args);
-static PyObject* set_adaption(PyObject* dummy, PyObject* args);
+static PyObject* get_adaptation(PyObject* dummy, PyObject* args);
+static PyObject* set_adaptation(PyObject* dummy, PyObject* args);
 static PyObject* set_peer_primary(PyObject* dummy, PyObject* args);
 static PyObject* set_primary(PyObject* dummy, PyObject* args);
 static PyObject* bindx(PyObject* dummy, PyObject* args);
@@ -84,8 +83,8 @@ static PyMethodDef _sctpMethods[] = 
 	{"set_initparams", set_initparams, METH_VARARGS, ""},
 	{"get_nodelay", get_nodelay, METH_VARARGS, ""},
 	{"set_nodelay", set_nodelay, METH_VARARGS, ""},
-	{"get_adaption", get_adaption, METH_VARARGS, ""},
-	{"set_adaption", set_adaption, METH_VARARGS, ""},
+	{"get_adaptation", get_adaptation, METH_VARARGS, ""},
+	{"set_adaptation", set_adaptation, METH_VARARGS, ""},
 	{"get_disable_fragments", get_disable_fragments, METH_VARARGS, ""},
 	{"set_disable_fragments", set_disable_fragments, METH_VARARGS, ""},
 	{"get_events", get_events, METH_VARARGS, ""},
@@ -206,7 +205,7 @@ static ktuple _constants[] = 
 	{"SCTP_REMOTE_ERROR", SCTP_REMOTE_ERROR},
 	{"SCTP_SHUTDOWN_EVENT", SCTP_SHUTDOWN_EVENT},
 	{"SCTP_PARTIAL_DELIVERY_EVENT", SCTP_PARTIAL_DELIVERY_EVENT}, 
-	{"SCTP_ADAPTION_INDICATION", SCTP_ADAPTION_INDICATION},
+	{"SCTP_ADAPTATION_INDICATION", SCTP_ADAPTATION_INDICATION},
 	{0, -1}
 };
 
@@ -299,7 +298,7 @@ static PyObject* get_mappedv4(PyObject* 
 {
 	PyObject* ret = 0;
 	int fd, v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	if (PyArg_ParseTuple(args, "i", &fd)) {
 		if (getsockopt(fd, SOL_SCTP, SCTP_I_WANT_MAPPED_V4_ADDR, &v, &lv)) {
 			PyErr_SetFromErrno(PyExc_IOError);
@@ -328,7 +327,7 @@ static PyObject* get_nodelay(PyObject* d
 {
 	PyObject* ret = 0;
 	int fd, v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	if (PyArg_ParseTuple(args, "i", &fd)) {
 		if (getsockopt(fd, SOL_SCTP, SCTP_NODELAY, &v, &lv)) {
 			PyErr_SetFromErrno(PyExc_IOError);
@@ -360,7 +359,7 @@ static PyObject* get_assocparams(PyObjec
 	PyObject* oassoc_id;
 	int fd;
 	struct sctp_assocparams v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	int ok;
 	
 	ok = PyArg_ParseTuple(args, "iO", &fd, &dict) && PyDict_Check(dict);
@@ -456,7 +455,7 @@ static PyObject* get_paddrparams(PyObjec
 	int slen_dummy;
 
 	struct sctp_paddrparams v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	int ok;
 	
 	ok = PyArg_ParseTuple(args, "iO", &fd, &dict) && PyDict_Check(dict);
@@ -580,7 +579,7 @@ static PyObject* get_status(PyObject* du
 
 	int fd;
 	struct sctp_status v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	int ok;
 	
 	ok = PyArg_ParseTuple(args, "iOO", &fd, &dict, &dict2) && \
@@ -641,7 +640,7 @@ static PyObject* get_paddrinfo(PyObject*
 	int fd;
 	int slen_dummy;
 	struct sctp_paddrinfo v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	int ok;
 	
 	ok = PyArg_ParseTuple(args, "iO", &fd, &dict) && PyDict_Check(dict);
@@ -682,7 +681,7 @@ static PyObject* get_rtoinfo(PyObject* d
 	PyObject* oassoc_id;
 	int fd;
 	struct sctp_rtoinfo v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	int ok;
 	
 	ok = PyArg_ParseTuple(args, "iO", &fd, &dict) && PyDict_Check(dict);
@@ -758,7 +757,7 @@ static PyObject* get_initparams(PyObject
 	PyObject* ret = 0;
 	int fd;
 	struct sctp_initmsg v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 
 	if (! PyArg_ParseTuple(args, "i", &fd)) {
 		return ret;
@@ -834,7 +833,7 @@ static PyObject* get_events(PyObject* du
 	PyObject* ret = 0;
 	int fd;
 	struct sctp_event_subscribe v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 
 	if (PyArg_ParseTuple(args, "i", &fd)) {
 		if (getsockopt(fd, SOL_SCTP, SCTP_EVENTS, &v, &lv)) {
@@ -848,7 +847,7 @@ static PyObject* get_events(PyObject* du
 			PyDict_SetItemString(ret, "_peer_error", PyBool_FromLong(v.sctp_peer_error_event));
 			PyDict_SetItemString(ret, "_shutdown", PyBool_FromLong(v.sctp_shutdown_event));
 			PyDict_SetItemString(ret, "_partial_delivery", PyBool_FromLong(v.sctp_partial_delivery_event));
-			PyDict_SetItemString(ret, "_adaption_layer", PyBool_FromLong(v.sctp_adaption_layer_event));
+			PyDict_SetItemString(ret, "_adaptation_layer", PyBool_FromLong(v.sctp_adaptation_layer_event));
 		}
 	}
 	return ret;
@@ -859,7 +858,7 @@ static PyObject* set_events(PyObject* du
 	PyObject* ret = 0;
 	int fd;
 	PyObject *ov, *o_data_io, *o_association, *o_address, *o_send_failure;
-	PyObject *o_peer_error, *o_shutdown, *o_partial_delivery, *o_adaption_layer;
+	PyObject *o_peer_error, *o_shutdown, *o_partial_delivery, *o_adaptation_layer;
 	struct sctp_event_subscribe v;
 	int ok = PyArg_ParseTuple(args, "iO", &fd, &ov) && PyDict_Check(ov);
 
@@ -870,7 +869,7 @@ static PyObject* set_events(PyObject* du
 	ok = ok && (o_peer_error = PyDict_GetItemString(ov, "_peer_error"));
 	ok = ok && (o_shutdown = PyDict_GetItemString(ov, "_shutdown"));
 	ok = ok && (o_partial_delivery = PyDict_GetItemString(ov, "_partial_delivery"));
-	ok = ok && (o_adaption_layer = PyDict_GetItemString(ov, "_adaption_layer"));
+	ok = ok && (o_adaptation_layer = PyDict_GetItemString(ov, "_adaptation_layer"));
 
 	ok = ok && (PyInt_Check(o_data_io) != 0);
 	ok = ok && (PyInt_Check(o_association) != 0);
@@ -879,7 +878,7 @@ static PyObject* set_events(PyObject* du
 	ok = ok && (PyInt_Check(o_peer_error) != 0);
 	ok = ok && (PyInt_Check(o_shutdown) != 0);
 	ok = ok && (PyInt_Check(o_send_failure) != 0);
-	ok = ok && (PyInt_Check(o_adaption_layer) != 0);
+	ok = ok && (PyInt_Check(o_adaptation_layer) != 0);
 
 	if (ok) {
 		memset(&v, 0, sizeof(v));
@@ -890,7 +889,7 @@ static PyObject* set_events(PyObject* du
 		v.sctp_peer_error_event = PyInt_AsLong(o_peer_error);
 		v.sctp_shutdown_event = PyInt_AsLong(o_shutdown);
 		v.sctp_partial_delivery_event = PyInt_AsLong(o_partial_delivery);
-		v.sctp_adaption_layer_event = PyInt_AsLong(o_adaption_layer);
+		v.sctp_adaptation_layer_event = PyInt_AsLong(o_adaptation_layer);
 		
 		if (setsockopt(fd, SOL_SCTP, SCTP_EVENTS, &v, sizeof(v))) {
 			PyErr_SetFromErrno(PyExc_IOError);
@@ -905,7 +904,7 @@ static PyObject* get_maxseg(PyObject* du
 {
 	PyObject* ret = 0;
 	int fd, v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 
 	if (PyArg_ParseTuple(args, "i", &fd)) {
 		if (getsockopt(fd, SOL_SCTP, SCTP_MAXSEG, &v, &lv)) {
@@ -936,7 +935,7 @@ static PyObject* get_disable_fragments(P
 {
 	PyObject* ret = 0;
 	int fd, v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 
 	if (PyArg_ParseTuple(args, "i", &fd)) {
 		if (getsockopt(fd, SOL_SCTP, SCTP_DISABLE_FRAGMENTS, &v, &lv)) {
@@ -967,7 +966,7 @@ static PyObject* get_autoclose(PyObject*
 {
 	PyObject* ret = 0;
 	int fd, v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 
 	if (PyArg_ParseTuple(args, "i", &fd)) {
 		if (getsockopt(fd, SOL_SCTP, SCTP_AUTOCLOSE, &v, &lv)) {
@@ -994,14 +993,14 @@ static PyObject* set_autoclose(PyObject*
 	return ret;
 }
 
-static PyObject* get_adaption(PyObject* dummy, PyObject* args)
+static PyObject* get_adaptation(PyObject* dummy, PyObject* args)
 {
 	PyObject* ret = 0;
 	int fd, v;
-	int lv = sizeof(v);
+	socklen_t lv = sizeof(v);
 	
 	if (PyArg_ParseTuple(args, "i", &fd)) {
-		if (getsockopt(fd, SOL_SCTP, SCTP_ADAPTION_LAYER, &v, &lv)) {
+		if (getsockopt(fd, SOL_SCTP, SCTP_ADAPTATION_LAYER, &v, &lv)) {
 			PyErr_SetFromErrno(PyExc_IOError);
 		} else {
 			ret = PyInt_FromLong(v);
@@ -1010,13 +1009,13 @@ static PyObject* get_adaption(PyObject* 
 	return ret;
 }
 
-static PyObject* set_adaption(PyObject* dummy, PyObject* args)
+static PyObject* set_adaptation(PyObject* dummy, PyObject* args)
 {
 	PyObject* ret = 0;
 	int fd, v;
 
 	if (PyArg_ParseTuple(args, "ii", &fd, &v)) {
-		if (setsockopt(fd, SOL_SCTP, SCTP_ADAPTION_LAYER, &v, sizeof(v))) {
+		if (setsockopt(fd, SOL_SCTP, SCTP_ADAPTATION_LAYER, &v, sizeof(v))) {
 			PyErr_SetFromErrno(PyExc_IOError);
 		} else {
 			ret = Py_None; Py_INCREF(ret);
@@ -1522,10 +1521,10 @@ void interpret_notification(PyObject* di
 		PyDict_SetItemString(dict, "assoc_id", PyInt_FromLong(n->pdapi_assoc_id));
 		}
 		break;
-	case SCTP_ADAPTION_INDICATION:
+	case SCTP_ADAPTATION_INDICATION:
 		{
-		const struct sctp_adaption_event* n = &(notif->sn_adaption_event);
-		PyDict_SetItemString(dict, "adaption_ind", PyInt_FromLong(n->sai_adaption_ind));
+		const struct sctp_adaptation_event* n = &(notif->sn_adaptation_event);
+		PyDict_SetItemString(dict, "adaptation_ind", PyInt_FromLong(n->sai_adaptation_ind));
 		PyDict_SetItemString(dict, "assoc_id", PyInt_FromLong(n->sai_assoc_id));
 		}
 		break;
@@ -1537,7 +1536,7 @@ static PyObject* sctp_recv_msg(PyObject*
 	int fd, max_len;
 
 	struct sockaddr_storage sfrom;
-	int sfrom_len = sizeof(sfrom);
+	socklen_t sfrom_len = sizeof(sfrom);
 	int family;
 	int len;
 	int port;
diff -up pysctp-0.3.1/test.py.orig pysctp-0.3.1/test.py
--- pysctp-0.3.1/test.py.orig	2008-04-10 21:30:33.000000000 -0400
+++ pysctp-0.3.1/test.py	2008-04-10 21:30:20.000000000 -0400
@@ -15,8 +15,8 @@ import time
 
 
 
-client = "10.0.1.2"
-server = "10.0.1.1" 
+client = "127.0.0.1"
+server = "127.0.0.1" 
 test_impossible_sending = False
 
 
@@ -68,12 +68,12 @@ tcp.disable_fragments = \
 tcp.mappedv4 = 0
 
 tcp.maxseg = 10001;
-tcp.adaption = 318;
+tcp.adaptation = 318;
 
 if _sctp.get_nodelay(tcp.fileno()) or  \
    _sctp.get_disable_fragments(tcp.fileno()) or \
    _sctp.get_maxseg(tcp.fileno()) != 10001 or \
-   _sctp.get_adaption(tcp.fileno()) != 318 or \
+   _sctp.get_adaptation(tcp.fileno()) != 318 or \
    _sctp.get_mappedv4(tcp.fileno()):
 	raise "Property attribution was not effective"
 
@@ -105,7 +105,7 @@ for s in (tcp, udp, tcp2, udp2):
 	rawparams["_peer_error"] or \
 	rawparams["_shutdown"] or \
 	rawparams["_partial_delivery"] or \
-	rawparams["_adaption_layer"]:
+	rawparams["_adaptation_layer"]:
 		raise "events properties were not effective (in 0)"
 	
 	s.events.data_io = True
@@ -115,7 +115,7 @@ for s in (tcp, udp, tcp2, udp2):
 	s.events.peer_error = True
 	s.events.shutdown = True
 	s.events.partial_delivery = True
-	s.events.adaption_layer = True
+	s.events.adaptation_layer = True
 
 	rawparams = _sctp.get_events(s.fileno())
 
@@ -126,7 +126,7 @@ for s in (tcp, udp, tcp2, udp2):
 	not rawparams["_peer_error"] or \
 	not rawparams["_shutdown"] or \
 	not rawparams["_partial_delivery"] or \
-	not rawparams["_adaption_layer"]:
+	not rawparams["_adaptation_layer"]:
 		raise "events properties were not effective (in 1)"
 
 	s.events.data_io = False
@@ -136,7 +136,7 @@ for s in (tcp, udp, tcp2, udp2):
 	s.events.peer_error = False
 	s.events.shutdown = False
 	s.events.partial_delivery = False
-	s.events.adaption_layer = False
+	s.events.adaptation_layer = False
 
 	rawparams = _sctp.get_events(s.fileno())
 
@@ -147,10 +147,10 @@ for s in (tcp, udp, tcp2, udp2):
 	rawparams["_peer_error"] or \
 	rawparams["_shutdown"] or \
 	rawparams["_partial_delivery"] or \
-	rawparams["_adaption_layer"]:
+	rawparams["_adaptation_layer"]:
 		raise "events properties were not effective (in 0)"
 		
-ipv4 = _sctp._sockaddr_test(("10.00.1.01", 1234))
+ipv4 = _sctp._sockaddr_test(("10.0.1.1", 1234))
 ipv6 = _sctp._sockaddr_test(("FE80::0:0:34", 65534))
 
 if ipv4[3] != ("10.0.1.1", 1234):


--- NEW FILE python-pysctp.spec ---
%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")

Name:		python-pysctp 
Version:	0.3.1
Release:	3%{?dist}
Summary:	Python sctp socket api extensions bindings
Group:		System Environment/Libraries
License:	LGPLv2
URL:		http://epx.com.br/pysctp/
Source0:	http://epx.com.br/pysctp/pysctp-%{version}.tar.gz
Source1:	setup.py
Source2:	__init__.py
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	python lksctp-tools-devel 
BuildRequires:  python-setuptools-devel lksctp-tools-devel

Patch0: pysctp-buildfix.patch

%description
Python bindings for the SCTP socket api (see draft-ietf-tsvwg-sctpsocket-10.txt)

%prep
%setup -q -n pysctp-%{version}
%patch0 -p1
mkdir ./pysctp
cp %{SOURCE1} . 
cp %{SOURCE2} ./pysctp
mv ./sctp.py ./pysctp

%build
FLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{python_sitearch}/*
%doc README Changelog doc/draft-ietf-tsvwg-sctpsocket-10.txt

%changelog
* Wed Sep 10 2008 Neil Horman <nhorman at tuxdriver.com> 0.3-1-3 
- Fixed files section, last minute pre-import fixes

* Wed Sep 10 2008 Neil Horman <nhorman at tuxdriver.com> 0.3.1-2
- Updated spec file with documentation

* Thu Apr 10 2008 Neil Horman <nhorman at tuxdriver.com> 0.3.1-1
- Initial build


--- NEW FILE setup.py ---
# distutils build script
# To install fuse-python, run 'python setup.py install'

# This setup.py based on that of shout-python (py bindings for libshout,
# part of the icecast project, http://svn.xiph.org/icecast/trunk/shout-python)

try:
    from setuptools import setup
    from setuptools.dist import Distribution
except ImportError:
    from distutils.core import setup
    from distutils.dist import Distribution
from distutils.core import Extension
import os
import sys
from pysctp import __version__

classifiers = """\
Development Status :: 4 - Beta
Intended Audience :: Developers
License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)
Operating System :: POSIX
Programming Language :: C
Programming Language :: Python
Topic :: System :: Libraries 
"""

class MyDistribution(Distribution):
    """
    Obnoxious hack to enforce the packager to generate
    the to-be-generated files
    """

    def run_command(self, command):
        if command == 'sdist':
            for f in ('Changelog'):
                 if not os.path.exists(f):
                     raise RuntimeError, 'file ' + `f` + \
                           " doesn't exist, please generate it before creating a source distribution"

        return Distribution.run_command(self, command)

cflags = "-Wall -I/usr/include/python$(PYTHON_VERSION) -fPIC"
# there must be an easier way to set up these flags!
iflags = [x[2:] for x in cflags.split() if x[0:2] == '-I']
extra_cflags = [x for x in cflags.split() if x[0:2] != '-I']
libdirs = []
libsonly = ['sctp'] 

try:
    import thread
except ImportError:
    # if our Python doesn't have thread support, we enforce
    # linking against libpthread so that libfuse's pthread
    # related symbols won't be undefined
    libsonly.append("pthread")

# include_dirs=[]
# libraries=[]
# runtime_library_dirs=[]
# extra_objects, extra_compile_args, extra_link_args
pysctpmodule = Extension('pysctp/_sctp', sources = ['_sctp.c'],
                  include_dirs = iflags,
                  extra_compile_args = extra_cflags,
                  library_dirs = libdirs,
                  libraries = libsonly)

setup (name = 'pysctp',
       description = 'Pyton bindings for SCTP protocol',
       classifiers = filter(None, classifiers.split("\n")),
       version = __version__,
       license = 'LGPL',
       platforms = ['posix'],
       url = 'http//epx.com.br/pysctp/index.php',
       author = 'Elvis Pfutzenreuter',
       author_email = 'epx at altoriopreto.com.br',
       maintainer = 'Neil Horman',
       maintainer_email = 'nhorman at tuxdriver.com',
       packages = ["pysctp"],
       ext_modules = [ pysctpmodule ],
       py_modules=[],
       distclass = MyDistribution)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-pysctp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 00:03:21 -0000	1.1
+++ .cvsignore	11 Sep 2008 17:13:39 -0000	1.2
@@ -0,0 +1 @@
+pysctp-0.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-pysctp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 00:03:21 -0000	1.1
+++ sources	11 Sep 2008 17:13:39 -0000	1.2
@@ -0,0 +1 @@
+7fd43fa7a7f31cff557d0a69fa751e5f  pysctp-0.3.1.tar.gz



From jjohnstn at fedoraproject.org  Thu Sep 11 20:12:32 2008
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Thu, 11 Sep 2008 20:12:32 +0000 (UTC)
Subject: rpms/eclipse-cdt/devel eclipse-cdt-autotools-bug461647.patch, NONE, 
	1.1 eclipse-cdt.spec, 1.107, 1.108
Message-ID: <20080911201232.3185770131@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1149

Modified Files:
	eclipse-cdt.spec 
Added Files:
	eclipse-cdt-autotools-bug461647.patch 
Log Message:

* Tue Sep 09 2008 Jeff Johnston <jjohnstn at redhat.com> 5.0.0-6
- Fix for NPE during alteration of Autotools configuration settings.
- Resolves #461647



eclipse-cdt-autotools-bug461647.patch:

--- NEW FILE eclipse-cdt-autotools-bug461647.patch ---
Index: src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
===================================================================
RCS file: /cvs/eclipse/autotools/com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java,v
retrieving revision 1.19
diff -u -r1.19 AutotoolsMakefileBuilder.java
--- src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java	28 Jan 2008 20:45:12 -0000	1.19
+++ src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java	9 Sep 2008 19:16:28 -0000
@@ -50,6 +50,7 @@
 	public static final String BUILDER_ID = AutotoolsPlugin.getUniqueIdentifier() + "." + BUILDER_NAME; //$NON-NLS-1$
 	public static final String MANAGED_BUILDER_ID = ManagedBuilderCorePlugin.getUniqueIdentifier() + "." + BUILDER_NAME; //$NON-NLS-1$
 	public static final String AUTOTOOLS_CONFIG_ID = AutotoolsPlugin.getUniqueIdentifier() + ".configuration.build"; //$NON-NLS-1$
+	public static final String AUTOTOOLS_PROJECT_TYPE_ID = AutotoolsPlugin.getUniqueIdentifier() + ".projectType"; //$NON-NLS-1$
 	
 	private static final String BUILD_FINISHED = "AutotoolsMakefileBuilder.message.finished";	//$NON-NLS-1$
 	private static final String TYPE_CLEAN = "AutotoolsMakefileBuilder.type.clean";	//$NON-NLS-1$
@@ -76,8 +77,7 @@
 			// then return true.
 			if (project.getNature(ManagedCProjectNature.MNG_NATURE_ID) != null) {
 				IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
-				IConfiguration config = info.getDefaultConfiguration();
-				if (config.getParent().getId().equals(AUTOTOOLS_CONFIG_ID)) {
+				if (info.getManagedProject().getProjectType().getId().equals(AUTOTOOLS_PROJECT_TYPE_ID)) {
 					AutotoolsProjectNature.addAutotoolsBuilder(project, new NullProgressMonitor());
 					AutotoolsPlugin.verifyScannerInfoProvider(project);
 					return true;


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- eclipse-cdt.spec	8 Sep 2008 17:57:59 -0000	1.107
+++ eclipse-cdt.spec	11 Sep 2008 20:12:01 -0000	1.108
@@ -20,7 +20,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -54,11 +54,14 @@
 # Script to run the tests in Xvnc
 Source5: %{name}-runtests.sh
 
+# Don't run the tests as part of the build.  We'll do this ourselves.
+Patch4: %{name}-no-tests-%{version}.patch
+
 # Fix autotools plugin to reference correct project nature.
 Patch5: %{name}-autotools-plugin.patch
 
-# Don't run the tests as part of the build.  We'll do this ourselves.
-Patch4: %{name}-no-tests-%{version}.patch
+# Fix for autotools property settings problem.
+Patch6: %{name}-autotools-bug461647.patch
 
 ## Patch to cppunit code to support double-clicking on file names, classes, and
 ## member names in the Hierarchy and Failure views such that the appropriate
@@ -208,6 +211,7 @@
 tar -xzf %{SOURCE1}
 pushd com.redhat.eclipse.cdt.autotools
 %patch5
+%patch6
 popd
 popd
 
@@ -524,6 +528,10 @@
 %endif
 
 %changelog
+* Tue Sep 09 2008 Jeff Johnston <jjohnstn at redhat.com> 5.0.0-6
+- Fix for NPE during alteration of Autotools configuration settings.
+- Resolves #461647
+
 * Thu Sep 04 2008 Jeff Johnston <jjohnstn at redhat.com> 5.0.0-5
 - Fix for autotools plugin referencing invalid build nature.
 - Resolves #461201



From s4504kr at fedoraproject.org  Thu Sep 11 20:22:05 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 11 Sep 2008 20:22:05 +0000 (UTC)
Subject: rpms/open-cobol/devel open-cobol.spec,1.1,1.2
Message-ID: <20080911202205.52C9870131@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/open-cobol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3826

Modified Files:
	open-cobol.spec 
Log Message:
Set -D__NO_STRING_INLINES for i86 systems


Index: open-cobol.spec
===================================================================
RCS file: /cvs/extras/rpms/open-cobol/devel/open-cobol.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- open-cobol.spec	10 Sep 2008 16:28:58 -0000	1.1
+++ open-cobol.spec	11 Sep 2008 20:21:34 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		open-cobol
 Version:	1.0.90
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	OpenCOBOL - COBOL compiler
 
 Group:		Development/Languages
@@ -45,12 +45,20 @@
 
 %prep
 %setup -q -n %{name}-%{cobvers}
+(cd libcob; sed -i -e 's/\-\-mode=compile $(CC)/--mode=compile $(CC) -no-suppress/g' Makefile.in)
 
 %build
 %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}
+
+# set -D__NO_STRING_LINES for i86 systems
+
+%ifarch %{ix86}
+BUILDFLAGS="-D__NO_STRING_INLINES=1"
+%endif
+
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS $BUILDFLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -96,6 +104,9 @@
 %postun -n libcob -p /sbin/ldconfig
 
 %changelog
+* Thu Sep 11 2008 Jochen Schmitt <Jochen herr-schmitt de> 1.0.90-3
+- Add -D__NO_STRING_INLINES for the i86 arch
+
 * Sun Aug 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 1.0.90-2
 - Fix dependency open-cobol -> libcob
 



From dcbw at fedoraproject.org  Thu Sep 11 20:24:48 2008
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 11 Sep 2008 20:24:48 +0000 (UTC)
Subject: rpms/NetworkManager/devel crypto-init.patch, NONE,
	1.1 NetworkManager.spec, 1.237, 1.238
Message-ID: <20080911202448.0E69370131@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4847

Modified Files:
	NetworkManager.spec 
Added Files:
	crypto-init.patch 
Log Message:
* Thu Sep 11 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.2
- Fix hang when reading system connections from ifcfg files



crypto-init.patch:

--- NEW FILE crypto-init.patch ---
diff -up NetworkManager-0.7.0/libnm-util/crypto_nss.c.crypto-init NetworkManager-0.7.0/libnm-util/crypto_nss.c
--- NetworkManager-0.7.0/libnm-util/crypto_nss.c.crypto-init	2008-08-22 12:14:12.000000000 -0400
+++ NetworkManager-0.7.0/libnm-util/crypto_nss.c	2008-09-11 16:22:29.000000000 -0400
@@ -29,27 +29,39 @@
 #include <pk11pub.h>
 #include <pkcs11t.h>
 #include <cert.h>
+#include <prerror.h>
 
 #include "crypto.h"
 
-static guint32 refcount = 0;
+static gboolean initialized = FALSE;
 
 gboolean
 crypto_init (GError **error)
 {
-	if (refcount == 0) {
-		PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 1);
-		NSS_NoDB_Init (NULL);
+	SECStatus ret;
+
+	if (initialized)
+		return TRUE;
+
+	PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 1);
+	ret = NSS_NoDB_Init (NULL);
+	if (ret != SECSuccess) {
+		PR_Cleanup ();
+		g_set_error (error, NM_CRYPTO_ERROR,
+		             0,
+		             _("Failed to initialize the crypto engine: %d."),
+		             PR_GetError ());
+		return FALSE;
 	}
-	refcount++;
+
+	initialized = TRUE;
 	return TRUE;
 }
 
 void
 crypto_deinit (void)
 {
-	refcount--;
-	if (refcount == 0) {
+	if (initialized) {
 		NSS_Shutdown ();
 		PR_Cleanup ();
 	}
diff -up NetworkManager-0.7.0/libnm-util/nm-utils.c.crypto-init NetworkManager-0.7.0/libnm-util/nm-utils.c
--- NetworkManager-0.7.0/libnm-util/nm-utils.c.crypto-init	2008-08-22 12:14:12.000000000 -0400
+++ NetworkManager-0.7.0/libnm-util/nm-utils.c	2008-09-11 16:19:25.000000000 -0400
@@ -1152,7 +1152,6 @@ nm_utils_uuid_generate_from_string (cons
 
 out:
 	g_free (uuid);
-	crypto_deinit ();
 	return buf;
 }
 


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- NetworkManager.spec	4 Sep 2008 17:35:25 -0000	1.237
+++ NetworkManager.spec	11 Sep 2008 20:24:17 -0000	1.238
@@ -16,7 +16,7 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.11.%{snapshot}.1%{?dist}
+Release: 0.11.%{snapshot}.2%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -27,6 +27,7 @@
 Patch4: serial-debug.patch
 Patch5: explain-dns1-dns2.patch
 Patch6: wpa-adhoc-fix.patch
+Patch7: crypto-init.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -148,6 +149,7 @@
 %patch4 -p1 -b .serial-debug
 %patch5 -p1 -b .explain-dns1-dns2
 %patch6 -p1 -b .wpa-adhoc-fix
+%patch7 -p1 -b .crypto-init
 
 %build
 autoreconf -i
@@ -302,6 +304,9 @@
 %{_datadir}/gtk-doc/html/libnm-glib/
 
 %changelog
+* Thu Sep 11 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.2
+- Fix hang when reading system connections from ifcfg files
+
 * Thu Sep  4 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.1
 - Fix WPA Ad-Hoc connections
 



From spot at fedoraproject.org  Thu Sep 11 20:24:55 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 20:24:55 +0000 (UTC)
Subject: rpms/xmms-skins/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xmms-skins.spec, 1.3, 1.4
Message-ID: <20080911202455.B41C570131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xmms-skins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4930

Modified Files:
	.cvsignore sources xmms-skins.spec 
Log Message:
Ultrafina author says CC-BY is fine.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmms-skins/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2008 17:40:38 -0000	1.4
+++ .cvsignore	11 Sep 2008 20:24:25 -0000	1.5
@@ -10,3 +10,6 @@
 Inverse.zip
 sinistar.zip
 titanium.zip
+Ultrafina.zip
+UltrafinaSE.zip
+Ultrafina-pw.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmms-skins/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2008 17:40:38 -0000	1.4
+++ sources	11 Sep 2008 20:24:25 -0000	1.5
@@ -10,3 +10,6 @@
 d36479a4b55384af8e873c783f48ddc2  Inverse.zip
 1d2b8c189ce9d5b2ee52cc79a3a2c436  sinistar.zip
 a38d448ac059f42bd32e52f3999a6ca5  titanium.zip
+d77a144cdb775a0937617389b6e0e4f0  Ultrafina.zip
+448abb9626d8cecb044ab589900a1afb  UltrafinaSE.zip
+cab830ccf13bdfefebf05b84e298c9bd  Ultrafina-pw.zip


Index: xmms-skins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmms-skins/devel/xmms-skins.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmms-skins.spec	9 Sep 2008 17:40:38 -0000	1.3
+++ xmms-skins.spec	11 Sep 2008 20:24:25 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Skins for the X MultiMedia System
 Name: xmms-skins
 Version: 1.2.10
-Release: 17
+Release: 18
 Epoch: 1
 License: MIT and GPL+ and Copyright only and CC-BY
 Group: Applications/Multimedia
@@ -49,10 +49,10 @@
 Source18: http://xmms.org/files/Skins/sinistar.zip
 # Author (Anders Berg-Hansen) says CC-BY is the License (confirmed via email)
 Source19: http://xmms.org/files/Skins/titanium.zip
-# Emailed author
-# Source20: http://xmms.org/files/Skins/Ultrafina-pw.zip
-# Source21: http://xmms.org/files/Skins/UltrafinaSE.zip
-# Source22: http://xmms.org/files/Skins/Ultrafina.zip
+# Author (James T. Mayled) says CC-BY is the License (confirmed via email)
+Source20: http://xmms.org/files/Skins/Ultrafina-pw.zip
+Source21: http://xmms.org/files/Skins/UltrafinaSE.zip
+Source22: http://xmms.org/files/Skins/Ultrafina.zip
 # Same author as Covenant skin (if he replies, I will ask about this one)
 # Source23: http://xmms.org/files/Skins/Vulcan.zip
 # Cannot find active email for Christopher Allen (copyright holder)
@@ -76,7 +76,7 @@
 %prep
 %setup -q -T -c -n %{name}-%{version}
 cp %{SOURCE1} %{SOURCE5} %{SOURCE6} %{SOURCE8} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
-   %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE18} %{SOURCE19} .
+   %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE18} %{SOURCE19} %{SOURCE20} %{SOURCE21} %{SOURCE22} .
 
 
 %build
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1:1.2.10-18
+- Ultrafina author says we can use them under CC-BY
+
 * Tue Sep  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1:1.2.10-17
 - got some responses from skin creators, readded some of the removed skins
 



From spot at fedoraproject.org  Thu Sep 11 20:30:35 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 20:30:35 +0000 (UTC)
Subject: rpms/rekall/F-9 rekall.spec,1.34,1.35
Message-ID: <20080911203035.90C8F70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rekall/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7037/F-9

Modified Files:
	rekall.spec 
Log Message:
make library symlinks, fixes bz 455979


Index: rekall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rekall/F-9/rekall.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- rekall.spec	25 Mar 2008 13:04:54 -0000	1.34
+++ rekall.spec	11 Sep 2008 20:30:05 -0000	1.35
@@ -1,7 +1,7 @@
 Name:		rekall
 Summary:	A KDE database front-end application
 Version:	2.4.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 Group:		Development/Tools
 License:	GPLv2
 URL:		http://www.rekallrevealed.org/
@@ -156,6 +156,12 @@
 ln -s %{_bindir}/rekallqt rekall
 ln -s %{_bindir}/rekallqtManual rekallManual
 
+cd $RPM_BUILD_ROOT%{_libdir}
+for i in *.so.246; do
+  SHORTNAME=`echo $i | sed 's|.246||g'`
+  ln -s $i $SHORTNAME
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -301,6 +307,9 @@
 %{_libdir}/librekallqt_driver_sqlite3.so*
 
 %changelog
+* Wed Feb 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.6-5
+- make symlinks so rekall can find its own libraries
+
 * Wed Feb 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.6-4
 - more missing BR
 



From spot at fedoraproject.org  Thu Sep 11 20:30:35 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 20:30:35 +0000 (UTC)
Subject: rpms/rekall/devel rekall.spec,1.34,1.35
Message-ID: <20080911203035.C368770131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rekall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7037/devel

Modified Files:
	rekall.spec 
Log Message:
make library symlinks, fixes bz 455979


Index: rekall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rekall/devel/rekall.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- rekall.spec	25 Mar 2008 13:04:54 -0000	1.34
+++ rekall.spec	11 Sep 2008 20:30:05 -0000	1.35
@@ -1,7 +1,7 @@
 Name:		rekall
 Summary:	A KDE database front-end application
 Version:	2.4.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 Group:		Development/Tools
 License:	GPLv2
 URL:		http://www.rekallrevealed.org/
@@ -156,6 +156,12 @@
 ln -s %{_bindir}/rekallqt rekall
 ln -s %{_bindir}/rekallqtManual rekallManual
 
+cd $RPM_BUILD_ROOT%{_libdir}
+for i in *.so.246; do
+  SHORTNAME=`echo $i | sed 's|.246||g'`
+  ln -s $i $SHORTNAME
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -301,6 +307,9 @@
 %{_libdir}/librekallqt_driver_sqlite3.so*
 
 %changelog
+* Wed Feb 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.6-5
+- make symlinks so rekall can find its own libraries
+
 * Wed Feb 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.6-4
 - more missing BR
 



From ausil at fedoraproject.org  Thu Sep 11 20:45:06 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 11 Sep 2008 20:45:06 +0000 (UTC)
Subject: common Makefile.common,1.111,1.112
Message-ID: <20080911204506.2235A70131@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11225

Modified Files:
	Makefile.common 
Log Message:
remove TAG_OPTS  per FESCo meeting Wed Sept 10 2008



Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- Makefile.common	8 Sep 2008 15:48:23 -0000	1.111
+++ Makefile.common	11 Sep 2008 20:44:35 -0000	1.112
@@ -403,7 +403,7 @@
 # If you build a new version into the tree, first do "make tag",
 # then "make srpm", then build the package.  
 tag::    $(SPECFILE) $(COMMON_DIR)/branches
-	cvs tag $(TAG_OPTS) -c $(TAG)
+	cvs tag -c $(TAG)
 	@echo "Tagged with: $(TAG)"
 	@echo
 



From pkgdb at fedoraproject.org  Thu Sep 11 20:55:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 20:55:56 +0000
Subject: [pkgdb] pidgin-facebook was added for spot
Message-ID: <20080911205556.16DF1208D97@bastion.fedora.phx.redhat.com>

spot has added Package pidgin-facebook with summary Facebook Chat IM Pidgin plugin
spot has approved Package pidgin-facebook
spot has added a Fedora devel branch for pidgin-facebook with an owner of spot
spot has approved pidgin-facebook in Fedora devel
spot has approved Package pidgin-facebook
spot has set commit to Approved for packager on pidgin-facebook (Fedora devel)
spot has set build to Approved for packager on pidgin-facebook (Fedora devel)
spot has set checkout to Approved for packager on pidgin-facebook (Fedora devel)
spot has set commit to Approved for uberpackager on pidgin-facebook (Fedora devel)
spot has set build to Approved for uberpackager on pidgin-facebook (Fedora devel)
spot has set checkout to Approved for uberpackager on pidgin-facebook (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-facebook



From pkgdb at fedoraproject.org  Thu Sep 11 20:55:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 20:55:56 +0000
Subject: [pkgdb] pidgin-facebook (Fedora, 9) updated by spot
Message-ID: <20080911205556.BEEC6208D99@bastion.fedora.phx.redhat.com>

spot added a Fedora 9 branch for pidgin-facebook
spot has set commit to Approved for uberpackager on pidgin-facebook (Fedora 9)
spot has set build to Approved for uberpackager on pidgin-facebook (Fedora 9)
spot has set checkout to Approved for uberpackager on pidgin-facebook (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-facebook



From pkgdb at fedoraproject.org  Thu Sep 11 20:55:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 20:55:56 +0000
Subject: [pkgdb] pidgin-facebook (Fedora, 8) updated by spot
Message-ID: <20080911205556.C968E208D9C@bastion.fedora.phx.redhat.com>

spot added a Fedora 8 branch for pidgin-facebook
spot has set commit to Approved for uberpackager on pidgin-facebook (Fedora 8)
spot has set build to Approved for uberpackager on pidgin-facebook (Fedora 8)
spot has set checkout to Approved for uberpackager on pidgin-facebook (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-facebook



From pkgdb at fedoraproject.org  Thu Sep 11 21:01:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 21:01:27 +0000
Subject: [pkgdb] pidgin-facebookchat was added for spot
Message-ID: <20080911210127.70B52208D97@bastion.fedora.phx.redhat.com>

spot has added Package pidgin-facebookchat with summary Facebook Chat IM Pidgin plugin
spot has approved Package pidgin-facebookchat
spot has added a Fedora devel branch for pidgin-facebookchat with an owner of spot
spot has approved pidgin-facebookchat in Fedora devel
spot has approved Package pidgin-facebookchat
spot has set commit to Approved for packager on pidgin-facebookchat (Fedora devel)
spot has set build to Approved for packager on pidgin-facebookchat (Fedora devel)
spot has set checkout to Approved for packager on pidgin-facebookchat (Fedora devel)
spot has set commit to Approved for uberpackager on pidgin-facebookchat (Fedora devel)
spot has set build to Approved for uberpackager on pidgin-facebookchat (Fedora devel)
spot has set checkout to Approved for uberpackager on pidgin-facebookchat (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-facebookchat



From pkgdb at fedoraproject.org  Thu Sep 11 21:01:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 21:01:28 +0000
Subject: [pkgdb] pidgin-facebookchat (Fedora, 9) updated by spot
Message-ID: <20080911210128.2A880208D99@bastion.fedora.phx.redhat.com>

spot added a Fedora 9 branch for pidgin-facebookchat
spot has set commit to Approved for uberpackager on pidgin-facebookchat (Fedora 9)
spot has set build to Approved for uberpackager on pidgin-facebookchat (Fedora 9)
spot has set checkout to Approved for uberpackager on pidgin-facebookchat (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-facebookchat



From pkgdb at fedoraproject.org  Thu Sep 11 21:01:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 11 Sep 2008 21:01:28 +0000
Subject: [pkgdb] pidgin-facebookchat (Fedora, 8) updated by spot
Message-ID: <20080911210128.2FA8D208D9C@bastion.fedora.phx.redhat.com>

spot added a Fedora 8 branch for pidgin-facebookchat
spot has set commit to Approved for uberpackager on pidgin-facebookchat (Fedora 8)
spot has set build to Approved for uberpackager on pidgin-facebookchat (Fedora 8)
spot has set checkout to Approved for uberpackager on pidgin-facebookchat (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-facebookchat



From nalin at fedoraproject.org  Thu Sep 11 21:06:59 2008
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Thu, 11 Sep 2008 21:06:59 +0000 (UTC)
Subject: rpms/nss_ldap/devel nss_ldap.spec,1.96,1.97
Message-ID: <20080911210659.EB7C17012E@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17184

Modified Files:
	nss_ldap.spec 
Log Message:
- add libssl and libcrypto to the list of libraries against which we link
  statically to avoid running into symbol collisions at run-time (#446860)

Not really a fix, more of a workaround.



Index: nss_ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/devel/nss_ldap.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- nss_ldap.spec	16 Jul 2008 18:22:25 -0000	1.96
+++ nss_ldap.spec	11 Sep 2008 21:06:29 -0000	1.97
@@ -2,7 +2,7 @@
 Summary: NSS library and PAM module for LDAP
 Name: nss_ldap
 Version: 261
-Release: 1%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.padl.com/pub/nss_ldap-%{version}.tar.gz
 Source1: ftp://ftp.padl.com/pub/pam_ldap-%{pam_ldap_version}.tar.gz
 Source3: nss_ldap.versions
@@ -112,7 +112,7 @@
         --enable-schema-mapping \
         --enable-rfc2307bis \
         --enable-configurable-krb5-ccname-gssapi
-make %{?_smp_mflags} LIBS="-Wl,-Bstatic -lldap -llber -Wl,-Bdynamic -lsasl2 -lgssapi_krb5 -lssl -ldl -lpthread_nonshared -lnsl -lresolv"
+make %{?_smp_mflags} LIBS="-Wl,-Bstatic -lldap -llber -lssl -lcrypto -Wl,-Bdynamic -lz -lsasl2 -lgssapi_krb5 -ldl -lpthread_nonshared -lnsl -lresolv"
 popd
 
 # Check that the modules are actually loadable.
@@ -188,6 +188,13 @@
 %doc pam_ldap-%{pam_ldap_version}/ns-pwd-policy.schema
 
 %changelog
+* Thu Sep 11 2008 Nalin Dahyabhai <nalin at redhat.com> - 261-3
+- promote the previous change from a scratch build to the real thing
+
+* Tue Aug 26 2008 Nalin Dahyabhai <nalin at redhat.com> - 261-2
+- add libssl and libcrypto to the list of libraries against which we link
+  statically to avoid running into symbol collisions at run-time (#446860)
+
 * Wed Jul 16 2008 Nalin Dahyabhai <nalin at redhat.com> - 261-1
 - update to version 261
 - remove fuzz from patches



From toshio at fedoraproject.org  Thu Sep 11 21:07:33 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 11 Sep 2008 21:07:33 +0000 (UTC)
Subject: rpms/pidgin-facebookchat - New directory
Message-ID: <20080911210733.2025A7012E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pidgin-facebookchat
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsi17620/rpms/pidgin-facebookchat

Log Message:
Directory /cvs/extras/rpms/pidgin-facebookchat added to the repository




From toshio at fedoraproject.org  Thu Sep 11 21:07:34 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 11 Sep 2008 21:07:34 +0000 (UTC)
Subject: rpms/pidgin-facebookchat Makefile,NONE,1.1
Message-ID: <20080911210734.22B7E7012E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pidgin-facebookchat
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsi17620/rpms/pidgin-facebookchat

Added Files:
	Makefile 
Log Message:
Setup of module pidgin-facebookchat


--- NEW FILE Makefile ---
# Top level Makefile for module pidgin-facebookchat
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From toshio at fedoraproject.org  Thu Sep 11 21:07:33 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 11 Sep 2008 21:07:33 +0000 (UTC)
Subject: rpms/pidgin-facebookchat/devel - New directory
Message-ID: <20080911210733.53F3D7012E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pidgin-facebookchat/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsi17620/rpms/pidgin-facebookchat/devel

Log Message:
Directory /cvs/extras/rpms/pidgin-facebookchat/devel added to the repository




From toshio at fedoraproject.org  Thu Sep 11 21:07:34 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 11 Sep 2008 21:07:34 +0000 (UTC)
Subject: rpms/pidgin-facebookchat/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080911210734.5E6E27012E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pidgin-facebookchat/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsi17620/rpms/pidgin-facebookchat/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pidgin-facebookchat


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pidgin-facebookchat
# $Id: Makefile,v 1.1 2008/09/11 21:07:34 toshio Exp $
NAME := pidgin-facebookchat
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From rstrode at fedoraproject.org  Thu Sep 11 21:11:24 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Thu, 11 Sep 2008 21:11:24 +0000 (UTC)
Subject: rpms/gdm/devel gdm-2.23.92-force-active-vt.patch, NONE, 1.1 gdm.spec,
	1.411, 1.412
Message-ID: <20080911211124.4478E7012E@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18687

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.23.92-force-active-vt.patch 
Log Message:
- Add hook to allow for plymouth transition


gdm-2.23.92-force-active-vt.patch:

--- NEW FILE gdm-2.23.92-force-active-vt.patch ---
commit 01247e06779bef0b4619d6807f31e118d5b55cf0
Author: Ray Strode <rstrode at halfline-kentsfield.usersys.redhat.com>
Date:   Thu Sep 11 12:54:19 2008 -0400

    Force vt if force-display-on-active-vt is set
    
    This will allow plymouth and gdm to transition smoothly

diff --git a/configure.ac b/configure.ac
index 4a08418..8891882 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1311,6 +1311,23 @@ fi
 AC_SUBST(GDM_XAUTH_DIR)
 
 dnl ---------------------------------------------------------------------------
+dnl - Directory to spool events from other processes
+dnl ---------------------------------------------------------------------------
+
+AC_ARG_WITH(spool-dir,
+            AS_HELP_STRING([--with-spool-dir=<dir>],
+                           [spool directory]))
+
+if ! test -z "$with_spool_dir"; then
+   GDM_SPOOL_DIR=$with_spool_dir
+else
+   GDM_SPOOL_DIR=${localstatedir}/spool/gdm
+fi
+
+AC_SUBST(GDM_SPOOL_DIR)
+
+
+dnl ---------------------------------------------------------------------------
 dnl - Finish
 dnl ---------------------------------------------------------------------------
 
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 1846ed2..ced03a3 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -16,6 +16,7 @@ INCLUDES = \
 	-DPIXMAPDIR=\"$(pixmapdir)\"			\
 	-DSBINDIR=\"$(sbindir)\"			\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+	-DGDM_SPOOL_DIR=\"$(GDM_SPOOL_DIR)\"  \
 	-DGDM_XAUTH_DIR=\"$(GDM_XAUTH_DIR)\"		\
 	-DGDM_DEFAULTS_CONF=\"$(GDM_DEFAULTS_CONF)\"	\
 	-DGDM_CUSTOM_CONF=\"$(GDM_CUSTOM_CONF)\"	\
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index ca37a2a..e6f821f 100644
--- a/daemon/gdm-server.c
+++ b/daemon/gdm-server.c
@@ -34,6 +34,8 @@
 #include <signal.h>
 #include <sys/resource.h>
 
+#include <linux/vt.h>
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
@@ -663,6 +665,56 @@ gdm_server_spawn (GdmServer  *server,
         return ret;
 }
 
+static gboolean
+should_force_display_on_active_vt (void)
+{
+	gboolean should_force_display_on_active_vt;
+
+	should_force_display_on_active_vt = g_file_test (GDM_SPOOL_DIR "/force-display-on-active-vt",
+			               G_FILE_TEST_EXISTS);
+  	g_unlink (GDM_SPOOL_DIR "/force-display-on-active-vt");
+
+  	return should_force_display_on_active_vt;
+}
+
+static int
+get_active_vt (void)
+{
+	int console_fd;
+	struct vt_stat console_state = { 0 };
+
+	console_fd = open ("/dev/tty0", O_RDONLY | O_NOCTTY);
+
+	if (console_fd < 0) {
+		goto out;
+	}
+
+	if (ioctl (console_fd, VT_GETSTATE, &console_state) < 0) {
+		goto out;
+	}
+
+out:
+  	if (console_fd >= 0) {
+    		close (console_fd);
+	}
+
+  return console_state.v_active;
+}
+
+static char *
+get_active_vt_as_string (void)
+{
+	int vt;
+
+	vt = get_active_vt ();
+	
+	if (vt <= 0) {
+		return NULL;
+	}
+
+	return g_strdup_printf ("vt%d", vt);
+}
+
 /**
  * gdm_server_start:
  * @disp: Pointer to a GdmDisplay structure
@@ -675,8 +727,18 @@ gdm_server_start (GdmServer *server)
 {
         gboolean res;
 
-        /* fork X server process */
-        res = gdm_server_spawn (server, NULL);
+	if (should_force_display_on_active_vt () || TRUE) {
+                char *vt;
+
+		g_free (server->priv->command);
+		server->priv->command = g_strdup (X_SERVER " -nr -verbose");
+                vt = get_active_vt_as_string ();
+		res = gdm_server_spawn (server, vt);
+                g_free (vt);
+	} else {
+		/* fork X server process */
+		res = gdm_server_spawn (server, NULL);
+	}
 
         return res;
 }
diff --git a/data/Makefile.am b/data/Makefile.am
index 30e1f55..400c43d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -13,6 +13,7 @@ predir = $(gdmconfdir)/PreSession
 postlogindir = $(gdmconfdir)/PostLogin
 workingdir = $(GDM_WORKING_DIR)
 xauthdir = $(GDM_XAUTH_DIR)
+spooldir = $(GDM_SPOOL_DIR)
 
 if OS_SOLARIS
    DISTRO_XSESSION=$(srcdir)/Xsession.solaris
@@ -132,6 +133,7 @@ uninstall-hook:
 	-rf \
 	$(DESTDIR)$(workingdir)/.gconf.mandatory \
 	$(DESTDIR)$(xauthdir)
+	$(DESTDIR)$(spooldir)
 
 install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.path
 	if test '!' -d $(DESTDIR)$(gdmconfdir); then \
@@ -219,6 +221,12 @@ install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.pa
 		chown root:gdm $(DESTDIR)$(workingdir) || : ; \
 	fi
 
+	if test '!' -d $(DESTDIR)$(spooldir); then \
+		$(mkinstalldirs) $(DESTDIR)$(spooldir); \
+		chmod 1770 $(DESTDIR)$(spooldir); \
+		chown root:gdm $(DESTDIR)$(spooldir) || : ; \
+	fi
+
 	$(INSTALL_DATA) $(srcdir)/gconf.path $(DESTDIR)$(workingdir)/.gconf.path
 	gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --recursive-unset /
 	gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --load $(srcdir)/session-setup.entries


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -r1.411 -r1.412
--- gdm.spec	9 Sep 2008 23:47:49 -0000	1.411
+++ gdm.spec	11 Sep 2008 21:10:53 -0000	1.412
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.23.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -79,6 +79,7 @@
 
 Requires: audit-libs >= %{libauditver}
 Patch1: xkb-groups.patch
+Patch2: gdm-2.23.92-force-active-vt.patch
 
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
@@ -101,6 +102,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .xkb-groups
+%patch2 -p1 -b .force-active-vt
 %patch99 -p1 -b .fedora-logo
 
 autoreconf
@@ -293,6 +295,7 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 %attr(1770, root, gdm) %dir %{_localstatedir}/lib/gdm
 %attr(1777, root, gdm) %dir %{_localstatedir}/run/gdm
+%attr(1770, root, gdm) %dir %{_localstatedir}/spool/gdm
 
 %files user-switch-applet
 %defattr(-, root, root)
@@ -301,6 +304,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Thu Sep 11 2008 Ray Strode <rstrode at redhat.com> - 1:2.23.92-3
+- Add hook to allow for plymouth transition
+
 * Tue Sep  9 2008 Jon McCann <jmccann at redhat.com> - 1:2.23.92-2
 - Disallow root login
 



From spot at fedoraproject.org  Thu Sep 11 21:12:35 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 21:12:35 +0000 (UTC)
Subject: rpms/pidgin-facebookchat/devel import.log, NONE,
	1.1 pidgin-facebookchat.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911211235.399837012E@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pidgin-facebookchat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19201/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pidgin-facebookchat.spec 
Log Message:

initial import



--- NEW FILE import.log ---
pidgin-facebookchat-1_35-1_fc10:HEAD:pidgin-facebookchat-1.35-1.fc10.src.rpm:1221167347


--- NEW FILE pidgin-facebookchat.spec ---
%global	pidgin_version 2.0.0

Name:		pidgin-facebookchat
Version:	1.35
Release:	1%{?dist}
Summary:	Facebook Chat IM Pidgin plugin 
Group:		Applications/Internet
License:	GPLv3+
URL:		http://code.google.com/p/pidgin-facebookchat/
Source0:	http://pidgin-facebookchat.googlecode.com/files/%{name}-source-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	pidgin-devel >= %{pidgin_version}
Requires:	pidgin >= %{pidgin_version}

%description
This is a Facebook chat plugin for Pidgin and libpurple messengers. It 
connects to the new Facebook Chat IM service without the need for an API 
key.

Currently the plugin can log into the Facebook servers, grab the buddy 
list, send/receive messages, add/remove friends, receive notifications, 
search for Facebook friends and set your Facebook status. 

%prep
%setup -q -c -n %{name}-%{version}


%build
# The makefile is horrifying. Just don't pay attention to the variable
# names we're abusing here, it gives us the right end-result.
make LINUX32_COMPILER="gcc %{optflags}" libfacebook.so

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_libdir}/purple-2/
install -p libfacebook.so %{buildroot}%{_libdir}/purple-2/
mkdir -p %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/16/
mkdir -p %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/22/
mkdir -p %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/48/
install -p facebook16.png %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/16/facebook.png
install -p facebook22.png %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/22/facebook.png
install	-p facebook48.png %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/48/facebook.png

mkdir -p %{buildroot}/opt/mycompany/files
touch %{buildroot}/opt/mycompany/files/foo

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/purple-2/libfacebook.so
%{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
/opt/mycompany/files/

%changelog
* Wed Aug 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.35-1
- update to 1.35

* Wed Aug 13 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.33-1
- Initial packaging for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pidgin-facebookchat/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 21:07:34 -0000	1.1
+++ .cvsignore	11 Sep 2008 21:12:05 -0000	1.2
@@ -0,0 +1 @@
+pidgin-facebookchat-source-1.35.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pidgin-facebookchat/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 21:07:34 -0000	1.1
+++ sources	11 Sep 2008 21:12:05 -0000	1.2
@@ -0,0 +1 @@
+80d8e91a094e67377cd816c5af8fcdec  pidgin-facebookchat-source-1.35.tar.bz2



From spot at fedoraproject.org  Thu Sep 11 21:14:14 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 21:14:14 +0000 (UTC)
Subject: rpms/pidgin-facebookchat/F-8 pidgin-facebookchat.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20080911211414.194DE7012E@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pidgin-facebookchat/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19780/F-8

Modified Files:
	sources 
Added Files:
	pidgin-facebookchat.spec 
Log Message:
initial branching


--- NEW FILE pidgin-facebookchat.spec ---
%global	pidgin_version 2.0.0

Name:		pidgin-facebookchat
Version:	1.35
Release:	1%{?dist}
Summary:	Facebook Chat IM Pidgin plugin 
Group:		Applications/Internet
License:	GPLv3+
URL:		http://code.google.com/p/pidgin-facebookchat/
Source0:	http://pidgin-facebookchat.googlecode.com/files/%{name}-source-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	pidgin-devel >= %{pidgin_version}
Requires:	pidgin >= %{pidgin_version}

%description
This is a Facebook chat plugin for Pidgin and libpurple messengers. It 
connects to the new Facebook Chat IM service without the need for an API 
key.

Currently the plugin can log into the Facebook servers, grab the buddy 
list, send/receive messages, add/remove friends, receive notifications, 
search for Facebook friends and set your Facebook status. 

%prep
%setup -q -c -n %{name}-%{version}


%build
# The makefile is horrifying. Just don't pay attention to the variable
# names we're abusing here, it gives us the right end-result.
make LINUX32_COMPILER="gcc %{optflags}" libfacebook.so

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_libdir}/purple-2/
install -p libfacebook.so %{buildroot}%{_libdir}/purple-2/
mkdir -p %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/16/
mkdir -p %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/22/
mkdir -p %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/48/
install -p facebook16.png %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/16/facebook.png
install -p facebook22.png %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/22/facebook.png
install	-p facebook48.png %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/48/facebook.png

mkdir -p %{buildroot}/opt/mycompany/files
touch %{buildroot}/opt/mycompany/files/foo

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/purple-2/libfacebook.so
%{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
/opt/mycompany/files/

%changelog
* Wed Aug 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.35-1
- update to 1.35

* Wed Aug 13 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.33-1
- Initial packaging for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-facebookchat/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 21:07:34 -0000	1.1
+++ sources	11 Sep 2008 21:13:43 -0000	1.2
@@ -0,0 +1 @@
+80d8e91a094e67377cd816c5af8fcdec  pidgin-facebookchat-source-1.35.tar.bz2



From spot at fedoraproject.org  Thu Sep 11 21:14:14 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 21:14:14 +0000 (UTC)
Subject: rpms/pidgin-facebookchat/F-9 pidgin-facebookchat.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20080911211414.50CCC7012E@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pidgin-facebookchat/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19780/F-9

Modified Files:
	sources 
Added Files:
	pidgin-facebookchat.spec 
Log Message:
initial branching


--- NEW FILE pidgin-facebookchat.spec ---
%global	pidgin_version 2.0.0

Name:		pidgin-facebookchat
Version:	1.35
Release:	1%{?dist}
Summary:	Facebook Chat IM Pidgin plugin 
Group:		Applications/Internet
License:	GPLv3+
URL:		http://code.google.com/p/pidgin-facebookchat/
Source0:	http://pidgin-facebookchat.googlecode.com/files/%{name}-source-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	pidgin-devel >= %{pidgin_version}
Requires:	pidgin >= %{pidgin_version}

%description
This is a Facebook chat plugin for Pidgin and libpurple messengers. It 
connects to the new Facebook Chat IM service without the need for an API 
key.

Currently the plugin can log into the Facebook servers, grab the buddy 
list, send/receive messages, add/remove friends, receive notifications, 
search for Facebook friends and set your Facebook status. 

%prep
%setup -q -c -n %{name}-%{version}


%build
# The makefile is horrifying. Just don't pay attention to the variable
# names we're abusing here, it gives us the right end-result.
make LINUX32_COMPILER="gcc %{optflags}" libfacebook.so

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_libdir}/purple-2/
install -p libfacebook.so %{buildroot}%{_libdir}/purple-2/
mkdir -p %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/16/
mkdir -p %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/22/
mkdir -p %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/48/
install -p facebook16.png %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/16/facebook.png
install -p facebook22.png %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/22/facebook.png
install	-p facebook48.png %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/48/facebook.png

mkdir -p %{buildroot}/opt/mycompany/files
touch %{buildroot}/opt/mycompany/files/foo

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/purple-2/libfacebook.so
%{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
/opt/mycompany/files/

%changelog
* Wed Aug 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.35-1
- update to 1.35

* Wed Aug 13 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.33-1
- Initial packaging for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-facebookchat/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 21:07:34 -0000	1.1
+++ sources	11 Sep 2008 21:13:44 -0000	1.2
@@ -0,0 +1 @@
+80d8e91a094e67377cd816c5af8fcdec  pidgin-facebookchat-source-1.35.tar.bz2



From thm at fedoraproject.org  Thu Sep 11 21:22:24 2008
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 11 Sep 2008 21:22:24 +0000 (UTC)
Subject: rpms/python-markdown2/devel import.log, NONE, 1.1 markdown2, NONE, 
	1.1 python-markdown2.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911212224.C0D607012E@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-markdown2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22622/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log markdown2 python-markdown2.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
python-markdown2-1_0_1_7-1_fc9:HEAD:python-markdown2-1.0.1.7-1.fc9.src.rpm:1221168087


--- NEW FILE markdown2 ---
#!/usr/bin/env python

from markdown2 import logging, main
import sys

logging.basicConfig()
sys.exit( main(sys.argv) )


--- NEW FILE python-markdown2.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define srcname markdown2

Name:           python-%{srcname}
Version:        1.0.1.7
Release:        1%{?dist}
Summary:        A fast and complete Python implementation of Markdown
Group:          Development/Languages
License:        MIT
URL:            http://code.google.com/p/python-%{srcname}/
Source0:        http://pypi.python.org/packages/source/m/%{srcname}/%{srcname}-%{version}.tar.gz
Source1:        markdown2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-pygments

%description
Markdown is a text-to-HTML filter; it translates an easy-to-read /
easy-to-write structured text format into HTML. Markdown's text format
is most similar to that of plain text email, and supports features
such as headers, emphasis, code blocks, blockquotes, and links.

This is a fast and complete Python implementation of the Markdown
spec.

For information about markdown itself, see
http://daringfireball.net/projects/markdown/


%prep
%setup0 -q -n %{srcname}-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

# remove shebangs and fix permissions
find %{buildroot}%{python_sitelib} \( -name '*.py' -o -name 'py.*' \) \
  -exec sed -i '1{/^#!/d}' {} \; \
  -exec chmod u=rw,go=r {} \;

# overwrite the script (which is self-contained) with a version that
# instead imports from markdown2
install -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}


%clean
rm -rf %{buildroot}


%check
cd test
%{__python} test.py


%files
%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt README.txt TODO.txt
%{python_sitelib}/*
%{_bindir}/markdown2


%changelog
* Tue Sep  9 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.7-1
- New package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 19:36:40 -0000	1.1
+++ .cvsignore	11 Sep 2008 21:21:54 -0000	1.2
@@ -0,0 +1 @@
+markdown2-1.0.1.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 19:36:40 -0000	1.1
+++ sources	11 Sep 2008 21:21:54 -0000	1.2
@@ -0,0 +1 @@
+21d346c8415efe94312323a30b8d2e09  markdown2-1.0.1.7.tar.gz



From thm at fedoraproject.org  Thu Sep 11 21:27:04 2008
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 11 Sep 2008 21:27:04 +0000 (UTC)
Subject: rpms/python-markdown2/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 markdown2, 1.1, 1.2 python-markdown2.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20080911212705.010B47012E@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-markdown2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24089/devel

Modified Files:
	.cvsignore import.log markdown2 python-markdown2.spec sources 
Log Message:
Update to 1.0.1.8.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Sep 2008 21:21:54 -0000	1.2
+++ .cvsignore	11 Sep 2008 21:26:34 -0000	1.3
@@ -1 +1 @@
-markdown2-1.0.1.7.tar.gz
+markdown2-1.0.1.8.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Sep 2008 21:21:54 -0000	1.1
+++ import.log	11 Sep 2008 21:26:34 -0000	1.2
@@ -1 +1,2 @@
 python-markdown2-1_0_1_7-1_fc9:HEAD:python-markdown2-1.0.1.7-1.fc9.src.rpm:1221168087
+python-markdown2-1_0_1_8-1_fc9:HEAD:python-markdown2-1.0.1.8-1.fc9.src.rpm:1221168324


Index: markdown2
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/markdown2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- markdown2	11 Sep 2008 21:21:54 -0000	1.1
+++ markdown2	11 Sep 2008 21:26:34 -0000	1.2
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
-from markdown2 import logging, main
+from markdown2 import main
 import sys
 
-logging.basicConfig()
 sys.exit( main(sys.argv) )


Index: python-markdown2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/python-markdown2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-markdown2.spec	11 Sep 2008 21:21:54 -0000	1.1
+++ python-markdown2.spec	11 Sep 2008 21:26:34 -0000	1.2
@@ -3,7 +3,7 @@
 %define srcname markdown2
 
 Name:           python-%{srcname}
-Version:        1.0.1.7
+Version:        1.0.1.8
 Release:        1%{?dist}
 Summary:        A fast and complete Python implementation of Markdown
 Group:          Development/Languages
@@ -68,5 +68,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.8-1
+- Update to 1.0.1.8.
+- Simplify the cmdline wrapper.
+
 * Tue Sep  9 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.7-1
 - New package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Sep 2008 21:21:54 -0000	1.2
+++ sources	11 Sep 2008 21:26:34 -0000	1.3
@@ -1 +1 @@
-21d346c8415efe94312323a30b8d2e09  markdown2-1.0.1.7.tar.gz
+869daf8cc2510a6492aa9b3a810e73e0  markdown2-1.0.1.8.tar.gz



From mso at fedoraproject.org  Thu Sep 11 21:35:45 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Thu, 11 Sep 2008 21:35:45 +0000 (UTC)
Subject: rpms/echo-icon-theme/devel echo-icon-theme.spec, 1.28, 1.29 sources,
	1.21, 1.22
Message-ID: <20080911213545.12A627012E@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/echo-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26193

Modified Files:
	echo-icon-theme.spec sources 
Log Message:


Update to latest git.




Index: echo-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/echo-icon-theme/devel/echo-icon-theme.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- echo-icon-theme.spec	28 Aug 2008 17:55:49 -0000	1.28
+++ echo-icon-theme.spec	11 Sep 2008 21:35:14 -0000	1.29
@@ -1,10 +1,10 @@
-%define git_head 3e5f61d
-%define checkout 20080828
+%define git_head a7c752e
+%define checkout 20080911
 %define alphatag %{checkout}git%{git_head}
 
 Name:           echo-icon-theme
 Version:        0.3.89.0
-Release:        0.9.%{alphatag}%{?dist}
+Release:        0.10.%{alphatag}%{?dist}
 Summary:        Echo icon theme
 
 Group:          User Interface/Desktops
@@ -49,6 +49,10 @@
 %ghost %{_datadir}/icons/Echo/icon-theme.cache
 
 %changelog
+* Thu Sep 11 2008 Martin Sourada <martin.sourada at gmail.com>
+- 0.3.89.0-0.10.20080911gita7c752e
+- New git snapshot
+
 * Thu Aug 28 2008 Martin Sourada <martin.sourada at gmail.com>
 - 0.3.89.0-0.9.20080828git3e5f61d
 - New git snapshot


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/echo-icon-theme/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	28 Aug 2008 17:55:49 -0000	1.21
+++ sources	11 Sep 2008 21:35:14 -0000	1.22
@@ -1 +1 @@
-03a94c917d2ce4c32bec6d3b61baacc3  echo-icon-theme-0.3.89.0.tar.bz2
+81eaab7b9a8ab04e187cf29aa1ef8804  echo-icon-theme-0.3.89.0.tar.bz2



From scop at fedoraproject.org  Thu Sep 11 21:37:08 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 11 Sep 2008 21:37:08 +0000 (UTC)
Subject: rpms/mysqltuner/devel .cvsignore, 1.2, 1.3 mysqltuner.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20080911213708.5D2947012E@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mysqltuner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26650/devel

Modified Files:
	.cvsignore mysqltuner.spec sources 
Log Message:
* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.9-1
- 0.9.9.
- Update description.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysqltuner/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jun 2008 18:14:16 -0000	1.2
+++ .cvsignore	11 Sep 2008 21:36:38 -0000	1.3
@@ -1 +1 @@
-mysqltuner.pl.gz
+mysqltuner-0.9.9.pl


Index: mysqltuner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysqltuner/devel/mysqltuner.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mysqltuner.spec	25 Jul 2008 16:35:28 -0000	1.5
+++ mysqltuner.spec	11 Sep 2008 21:36:38 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           mysqltuner
-Version:        0.9.8
+Version:        0.9.9
 Release:        1
 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:       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,10 @@
 
 
 %changelog
+* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.9-1
+- 0.9.9.
+- Update description.
+
 * Mon Jul 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.8-1
 - 0.9.8, --checkversion patch applied upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysqltuner/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jul 2008 21:06:07 -0000	1.3
+++ sources	11 Sep 2008 21:36:38 -0000	1.4
@@ -1 +1 @@
-960fff8a910ba86b1eef62e627670b1f  mysqltuner.pl.gz
+097ceed8577ff4dbed134970fd8781e4  mysqltuner-0.9.9.pl



From scop at fedoraproject.org  Thu Sep 11 21:37:08 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 11 Sep 2008 21:37:08 +0000 (UTC)
Subject: rpms/mysqltuner/F-9 .cvsignore, 1.2, 1.3 mysqltuner.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20080911213708.20A557012E@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mysqltuner/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26650/F-9

Modified Files:
	.cvsignore mysqltuner.spec sources 
Log Message:
* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.9-1
- 0.9.9.
- Update description.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysqltuner/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jun 2008 18:22:54 -0000	1.2
+++ .cvsignore	11 Sep 2008 21:36:37 -0000	1.3
@@ -1 +1 @@
-mysqltuner.pl.gz
+mysqltuner-0.9.9.pl


Index: mysqltuner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysqltuner/F-9/mysqltuner.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mysqltuner.spec	21 Jul 2008 21:05:52 -0000	1.2
+++ mysqltuner.spec	11 Sep 2008 21:36:37 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           mysqltuner
-Version:        0.9.8
+Version:        0.9.9
 Release:        1
 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:       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,10 @@
 
 
 %changelog
+* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.9-1
+- 0.9.9.
+- Update description.
+
 * Mon Jul 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.8-1
 - 0.9.8, --checkversion patch applied upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysqltuner/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jul 2008 21:05:52 -0000	1.3
+++ sources	11 Sep 2008 21:36:37 -0000	1.4
@@ -1 +1 @@
-960fff8a910ba86b1eef62e627670b1f  mysqltuner.pl.gz
+097ceed8577ff4dbed134970fd8781e4  mysqltuner-0.9.9.pl



From thm at fedoraproject.org  Thu Sep 11 21:38:46 2008
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 11 Sep 2008 21:38:46 +0000 (UTC)
Subject: rpms/python-markdown2/F-9 import.log, NONE, 1.1 markdown2, NONE,
	1.1 python-markdown2.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911213846.14B4D7012E@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-markdown2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27390/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log markdown2 python-markdown2.spec 
Log Message:
Initial import to F-9 branch.


--- NEW FILE import.log ---
python-markdown2-1_0_1_8-1_fc9:F-9:python-markdown2-1.0.1.8-1.fc9.src.rpm:1221169076


--- NEW FILE markdown2 ---
#!/usr/bin/env python

from markdown2 import main
import sys

sys.exit( main(sys.argv) )


--- NEW FILE python-markdown2.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define srcname markdown2

Name:           python-%{srcname}
Version:        1.0.1.8
Release:        1%{?dist}
Summary:        A fast and complete Python implementation of Markdown
Group:          Development/Languages
License:        MIT
URL:            http://code.google.com/p/python-%{srcname}/
Source0:        http://pypi.python.org/packages/source/m/%{srcname}/%{srcname}-%{version}.tar.gz
Source1:        markdown2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-pygments

%description
Markdown is a text-to-HTML filter; it translates an easy-to-read /
easy-to-write structured text format into HTML. Markdown's text format
is most similar to that of plain text email, and supports features
such as headers, emphasis, code blocks, blockquotes, and links.

This is a fast and complete Python implementation of the Markdown
spec.

For information about markdown itself, see
http://daringfireball.net/projects/markdown/


%prep
%setup0 -q -n %{srcname}-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

# remove shebangs and fix permissions
find %{buildroot}%{python_sitelib} \( -name '*.py' -o -name 'py.*' \) \
  -exec sed -i '1{/^#!/d}' {} \; \
  -exec chmod u=rw,go=r {} \;

# overwrite the script (which is self-contained) with a version that
# instead imports from markdown2
install -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}


%clean
rm -rf %{buildroot}


%check
cd test
%{__python} test.py


%files
%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt README.txt TODO.txt
%{python_sitelib}/*
%{_bindir}/markdown2


%changelog
* Thu Sep 11 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.8-1
- Update to 1.0.1.8.
- Simplify the cmdline wrapper.

* Tue Sep  9 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.7-1
- New package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 19:36:40 -0000	1.1
+++ .cvsignore	11 Sep 2008 21:38:15 -0000	1.2
@@ -0,0 +1 @@
+markdown2-1.0.1.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 19:36:40 -0000	1.1
+++ sources	11 Sep 2008 21:38:15 -0000	1.2
@@ -0,0 +1 @@
+869daf8cc2510a6492aa9b3a810e73e0  markdown2-1.0.1.8.tar.gz



From mso at fedoraproject.org  Thu Sep 11 22:02:44 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Thu, 11 Sep 2008 22:02:44 +0000 (UTC)
Subject: rpms/echo-icon-theme/F-8 .cvsignore, 1.11, 1.12 echo-icon-theme.spec,
	1.18, 1.19 sources, 1.13, 1.14
Message-ID: <20080911220244.7AF0F70132@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/echo-icon-theme/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2155/F-8

Modified Files:
	.cvsignore echo-icon-theme.spec sources 
Log Message:


New release.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/echo-icon-theme/F-8/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	6 Jul 2008 11:46:19 -0000	1.11
+++ .cvsignore	11 Sep 2008 22:02:14 -0000	1.12
@@ -1 +1 @@
-echo-icon-theme-0.3.2.1.tar.bz2
+echo-icon-theme-0.3.3.tar.bz2


Index: echo-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/echo-icon-theme/F-8/echo-icon-theme.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- echo-icon-theme.spec	6 Jul 2008 11:46:19 -0000	1.18
+++ echo-icon-theme.spec	11 Sep 2008 22:02:14 -0000	1.19
@@ -1,10 +1,10 @@
 Name:           echo-icon-theme
-Version:        0.3.2.1
+Version:        0.3.3
 Release:        1%{?dist}
 Summary:        Echo icon theme
 
 Group:          User Interface/Desktops
-License:        Creative Commons Attribution-ShareAlike 3.0
+License:        CC-BY-SA
 URL:            http://fedoraproject.org/wiki/Artwork/EchoDevelopment
 Source0:        https://fedorahosted.org/releases/e/c/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,6 +46,11 @@
 
 
 %changelog
+* Thu Sep 11 2008 Martin Sourada <mso at fedoraproject.org> - 0.3.3-1
+- New release
+- Add bunch of new icons
+- Fix license tag
+
 * Sun Jul 06 2008 Martin Sourada <martin.sourada at gmail.com> - 0.3.2.1-1
 - New bugfix release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/echo-icon-theme/F-8/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	6 Jul 2008 11:46:19 -0000	1.13
+++ sources	11 Sep 2008 22:02:14 -0000	1.14
@@ -1 +1 @@
-279f61b3eda4f42bdc51641c85fb8936  echo-icon-theme-0.3.2.1.tar.bz2
+1d298fb4e8ff5766adb95f488e53c927  echo-icon-theme-0.3.3.tar.bz2



From mso at fedoraproject.org  Thu Sep 11 22:02:44 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Thu, 11 Sep 2008 22:02:44 +0000 (UTC)
Subject: rpms/echo-icon-theme/F-9 .cvsignore, 1.13, 1.14 echo-icon-theme.spec,
	1.19, 1.20 sources, 1.13, 1.14
Message-ID: <20080911220244.9C92070132@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/echo-icon-theme/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2155/F-9

Modified Files:
	.cvsignore echo-icon-theme.spec sources 
Log Message:


New release.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/echo-icon-theme/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	6 Jul 2008 11:46:41 -0000	1.13
+++ .cvsignore	11 Sep 2008 22:02:14 -0000	1.14
@@ -1 +1 @@
-echo-icon-theme-0.3.2.1.tar.bz2
+echo-icon-theme-0.3.3.tar.bz2


Index: echo-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/echo-icon-theme/F-9/echo-icon-theme.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- echo-icon-theme.spec	6 Jul 2008 11:46:41 -0000	1.19
+++ echo-icon-theme.spec	11 Sep 2008 22:02:14 -0000	1.20
@@ -1,10 +1,10 @@
 Name:           echo-icon-theme
-Version:        0.3.2.1
+Version:        0.3.3
 Release:        1%{?dist}
 Summary:        Echo icon theme
 
 Group:          User Interface/Desktops
-License:        Creative Commons Attribution-ShareAlike 3.0
+License:        CC-BY-SA
 URL:            http://fedoraproject.org/wiki/Artwork/EchoDevelopment
 Source0:        https://fedorahosted.org/releases/e/c/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,6 +46,11 @@
 
 
 %changelog
+* Thu Sep 11 2008 Martin Sourada <mso at fedoraproject.org> - 0.3.3-1
+- New release
+- Add bunch of new icons
+- Fix license tag
+
 * Sun Jul 06 2008 Martin Sourada <martin.sourada at gmail.com> - 0.3.2.1-1
 - New bugfix release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/echo-icon-theme/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	6 Jul 2008 11:46:41 -0000	1.13
+++ sources	11 Sep 2008 22:02:14 -0000	1.14
@@ -1 +1 @@
-279f61b3eda4f42bdc51641c85fb8936  echo-icon-theme-0.3.2.1.tar.bz2
+1d298fb4e8ff5766adb95f488e53c927  echo-icon-theme-0.3.3.tar.bz2



From mso at fedoraproject.org  Thu Sep 11 22:11:31 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Thu, 11 Sep 2008 22:11:31 +0000 (UTC)
Subject: rpms/echo-artist/F-8 .cvsignore, 1.2, 1.3 echo-artist.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080911221131.0CC8170132@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/echo-artist/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4265/F-8

Modified Files:
	.cvsignore echo-artist.spec sources 
Log Message:


New release.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/echo-artist/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2008 22:26:14 -0000	1.2
+++ .cvsignore	11 Sep 2008 22:11:00 -0000	1.3
@@ -1 +1 @@
-echo-artist-0.1.tar.gz
+echo-artist-0.1.1.tar.gz


Index: echo-artist.spec
===================================================================
RCS file: /cvs/extras/rpms/echo-artist/F-8/echo-artist.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- echo-artist.spec	1 Sep 2008 22:29:33 -0000	1.1
+++ echo-artist.spec	11 Sep 2008 22:11:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           echo-artist
-Version:        0.1
-Release:        2%{?dist}
+Version:        0.1.1
+Release:        1%{?dist}
 Summary:        Automation tools for echo-icon-theme artists
 
 Group:          Applications/Productivity
@@ -48,6 +48,10 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Sep 19 2008 Martin Sourada <mso at fedoraproject.org> - 0.1.1-1
+- New release
+- Fixes problem with adding new icons to dir where no other icons are yet.
+
 * Mon Sep 01 2008 Martin Sourada <mso at fedoraproject.org> - 0.1-2
 - Use %%{buildroot} instead of $$RPM_BUILD_ROOT
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/echo-artist/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2008 22:26:14 -0000	1.2
+++ sources	11 Sep 2008 22:11:00 -0000	1.3
@@ -1 +1 @@
-d690d9ee0efc3a343f8120bd15f8908f  echo-artist-0.1.tar.gz
+8e7fbb553b88e2de6fe405aaca7fa42f  echo-artist-0.1.1.tar.gz



From mso at fedoraproject.org  Thu Sep 11 22:11:31 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Thu, 11 Sep 2008 22:11:31 +0000 (UTC)
Subject: rpms/echo-artist/F-9 .cvsignore, 1.2, 1.3 echo-artist.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080911221131.3BDBF70132@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/echo-artist/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4265/F-9

Modified Files:
	.cvsignore echo-artist.spec sources 
Log Message:


New release.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/echo-artist/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2008 22:26:14 -0000	1.2
+++ .cvsignore	11 Sep 2008 22:11:00 -0000	1.3
@@ -1 +1 @@
-echo-artist-0.1.tar.gz
+echo-artist-0.1.1.tar.gz


Index: echo-artist.spec
===================================================================
RCS file: /cvs/extras/rpms/echo-artist/F-9/echo-artist.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- echo-artist.spec	1 Sep 2008 22:29:33 -0000	1.1
+++ echo-artist.spec	11 Sep 2008 22:11:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           echo-artist
-Version:        0.1
-Release:        2%{?dist}
+Version:        0.1.1
+Release:        1%{?dist}
 Summary:        Automation tools for echo-icon-theme artists
 
 Group:          Applications/Productivity
@@ -48,6 +48,10 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Sep 19 2008 Martin Sourada <mso at fedoraproject.org> - 0.1.1-1
+- New release
+- Fixes problem with adding new icons to dir where no other icons are yet.
+
 * Mon Sep 01 2008 Martin Sourada <mso at fedoraproject.org> - 0.1-2
 - Use %%{buildroot} instead of $$RPM_BUILD_ROOT
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/echo-artist/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2008 22:26:14 -0000	1.2
+++ sources	11 Sep 2008 22:11:00 -0000	1.3
@@ -1 +1 @@
-d690d9ee0efc3a343f8120bd15f8908f  echo-artist-0.1.tar.gz
+8e7fbb553b88e2de6fe405aaca7fa42f  echo-artist-0.1.1.tar.gz



From mso at fedoraproject.org  Thu Sep 11 22:11:31 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Thu, 11 Sep 2008 22:11:31 +0000 (UTC)
Subject: rpms/echo-artist/devel .cvsignore, 1.2, 1.3 echo-artist.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20080911221131.8489870132@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/echo-artist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4265/devel

Modified Files:
	.cvsignore echo-artist.spec sources 
Log Message:


New release.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/echo-artist/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2008 22:21:46 -0000	1.2
+++ .cvsignore	11 Sep 2008 22:11:01 -0000	1.3
@@ -1 +1 @@
-echo-artist-0.1.tar.gz
+echo-artist-0.1.1.tar.gz


Index: echo-artist.spec
===================================================================
RCS file: /cvs/extras/rpms/echo-artist/devel/echo-artist.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- echo-artist.spec	1 Sep 2008 22:21:46 -0000	1.1
+++ echo-artist.spec	11 Sep 2008 22:11:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           echo-artist
-Version:        0.1
-Release:        2%{?dist}
+Version:        0.1.1
+Release:        1%{?dist}
 Summary:        Automation tools for echo-icon-theme artists
 
 Group:          Applications/Productivity
@@ -48,6 +48,10 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Sep 19 2008 Martin Sourada <mso at fedoraproject.org> - 0.1.1-1
+- New release
+- Fixes problem with adding new icons to dir where no other icons are yet.
+
 * Mon Sep 01 2008 Martin Sourada <mso at fedoraproject.org> - 0.1-2
 - Use %%{buildroot} instead of $$RPM_BUILD_ROOT
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/echo-artist/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2008 22:21:46 -0000	1.2
+++ sources	11 Sep 2008 22:11:01 -0000	1.3
@@ -1 +1 @@
-d690d9ee0efc3a343f8120bd15f8908f  echo-artist-0.1.tar.gz
+8e7fbb553b88e2de6fe405aaca7fa42f  echo-artist-0.1.1.tar.gz



From spot at fedoraproject.org  Thu Sep 11 22:12:09 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 22:12:09 +0000 (UTC)
Subject: rpms/pidgin-facebookchat/devel pidgin-facebookchat.spec,1.1,1.2
Message-ID: <20080911221209.EA85170132@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pidgin-facebookchat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4933/devel

Modified Files:
	pidgin-facebookchat.spec 
Log Message:
fix broken Makefile


Index: pidgin-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-facebookchat/devel/pidgin-facebookchat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pidgin-facebookchat.spec	11 Sep 2008 21:12:05 -0000	1.1
+++ pidgin-facebookchat.spec	11 Sep 2008 22:11:39 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		pidgin-facebookchat
 Version:	1.35
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Facebook Chat IM Pidgin plugin 
 Group:		Applications/Internet
 License:	GPLv3+
@@ -23,7 +23,7 @@
 
 %prep
 %setup -q -c -n %{name}-%{version}
-
+sed -i 's|/usr/lib|%{_libdir}|g' Makefile
 
 %build
 # The makefile is horrifying. Just don't pay attention to the variable
@@ -55,6 +55,9 @@
 /opt/mycompany/files/
 
 %changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.35-2
+- apply more duct-tape to the horrifying Makefile
+
 * Wed Aug 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.35-1
 - update to 1.35
 



From spot at fedoraproject.org  Thu Sep 11 22:16:28 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 22:16:28 +0000 (UTC)
Subject: rpms/pidgin-facebookchat/F-8 pidgin-facebookchat.spec,1.1,1.2
Message-ID: <20080911221628.649B670132@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pidgin-facebookchat/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6254/F-8

Modified Files:
	pidgin-facebookchat.spec 
Log Message:
fix broken Makefile


Index: pidgin-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-facebookchat/F-8/pidgin-facebookchat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pidgin-facebookchat.spec	11 Sep 2008 21:13:43 -0000	1.1
+++ pidgin-facebookchat.spec	11 Sep 2008 22:15:58 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		pidgin-facebookchat
 Version:	1.35
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Facebook Chat IM Pidgin plugin 
 Group:		Applications/Internet
 License:	GPLv3+
@@ -23,7 +23,7 @@
 
 %prep
 %setup -q -c -n %{name}-%{version}
-
+sed -i 's|/usr/lib|%{_libdir}|g' Makefile
 
 %build
 # The makefile is horrifying. Just don't pay attention to the variable
@@ -55,6 +55,9 @@
 /opt/mycompany/files/
 
 %changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.35-2
+- apply more duct-tape to the horrifying Makefile
+
 * Wed Aug 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.35-1
 - update to 1.35
 



From spot at fedoraproject.org  Thu Sep 11 22:16:28 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 22:16:28 +0000 (UTC)
Subject: rpms/pidgin-facebookchat/F-9 pidgin-facebookchat.spec,1.1,1.2
Message-ID: <20080911221628.8FC9370132@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pidgin-facebookchat/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6254/F-9

Modified Files:
	pidgin-facebookchat.spec 
Log Message:
fix broken Makefile


Index: pidgin-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-facebookchat/F-9/pidgin-facebookchat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pidgin-facebookchat.spec	11 Sep 2008 21:13:44 -0000	1.1
+++ pidgin-facebookchat.spec	11 Sep 2008 22:15:58 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		pidgin-facebookchat
 Version:	1.35
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Facebook Chat IM Pidgin plugin 
 Group:		Applications/Internet
 License:	GPLv3+
@@ -23,7 +23,7 @@
 
 %prep
 %setup -q -c -n %{name}-%{version}
-
+sed -i 's|/usr/lib|%{_libdir}|g' Makefile
 
 %build
 # The makefile is horrifying. Just don't pay attention to the variable
@@ -55,6 +55,9 @@
 /opt/mycompany/files/
 
 %changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.35-2
+- apply more duct-tape to the horrifying Makefile
+
 * Wed Aug 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.35-1
 - update to 1.35
 



From thm at fedoraproject.org  Thu Sep 11 22:21:09 2008
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 11 Sep 2008 22:21:09 +0000 (UTC)
Subject: rpms/python-markdown2/F-8 import.log, NONE, 1.1 markdown2, NONE,
	1.1 python-markdown2.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080911222109.4D8B970131@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-markdown2/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8115/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log markdown2 python-markdown2.spec 
Log Message:
Initial import to F-8 branch.


--- NEW FILE import.log ---
python-markdown2-1_0_1_8-1_fc9:F-8:python-markdown2-1.0.1.8-1.fc9.src.rpm:1221171619


--- NEW FILE markdown2 ---
#!/usr/bin/env python

from markdown2 import main
import sys

sys.exit( main(sys.argv) )


--- NEW FILE python-markdown2.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define srcname markdown2

Name:           python-%{srcname}
Version:        1.0.1.8
Release:        1%{?dist}
Summary:        A fast and complete Python implementation of Markdown
Group:          Development/Languages
License:        MIT
URL:            http://code.google.com/p/python-%{srcname}/
Source0:        http://pypi.python.org/packages/source/m/%{srcname}/%{srcname}-%{version}.tar.gz
Source1:        markdown2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-pygments

%description
Markdown is a text-to-HTML filter; it translates an easy-to-read /
easy-to-write structured text format into HTML. Markdown's text format
is most similar to that of plain text email, and supports features
such as headers, emphasis, code blocks, blockquotes, and links.

This is a fast and complete Python implementation of the Markdown
spec.

For information about markdown itself, see
http://daringfireball.net/projects/markdown/


%prep
%setup0 -q -n %{srcname}-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

# remove shebangs and fix permissions
find %{buildroot}%{python_sitelib} \( -name '*.py' -o -name 'py.*' \) \
  -exec sed -i '1{/^#!/d}' {} \; \
  -exec chmod u=rw,go=r {} \;

# overwrite the script (which is self-contained) with a version that
# instead imports from markdown2
install -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}


%clean
rm -rf %{buildroot}


%check
cd test
%{__python} test.py


%files
%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt README.txt TODO.txt
%{python_sitelib}/*
%{_bindir}/markdown2


%changelog
* Thu Sep 11 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.8-1
- Update to 1.0.1.8.
- Simplify the cmdline wrapper.

* Tue Sep  9 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.7-1
- New package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 19:36:40 -0000	1.1
+++ .cvsignore	11 Sep 2008 22:20:38 -0000	1.2
@@ -0,0 +1 @@
+markdown2-1.0.1.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 19:36:40 -0000	1.1
+++ sources	11 Sep 2008 22:20:38 -0000	1.2
@@ -0,0 +1 @@
+869daf8cc2510a6492aa9b3a810e73e0  markdown2-1.0.1.8.tar.gz



From spot at fedoraproject.org  Thu Sep 11 22:32:09 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 11 Sep 2008 22:32:09 +0000 (UTC)
Subject: rpms/freecol/devel freecol.spec,1.5,1.6
Message-ID: <20080911223209.5E67F70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/freecol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10944

Modified Files:
	freecol.spec 
Log Message:
use tetex-tex4ht instead of latex2html


Index: freecol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freecol/devel/freecol.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- freecol.spec	16 Jun 2008 20:16:42 -0000	1.5
+++ freecol.spec	11 Sep 2008 22:31:39 -0000	1.6
@@ -7,7 +7,7 @@
 
 Name:           freecol
 Version:        0.7.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The FreeCol multi-player strategy game
 Group:          Amusements/Games
 License:        GPL+
@@ -16,7 +16,7 @@
 Source1:        %{name}.sh
 Source2:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  ant ant-nodeps xml-commons-apis xml-commons-resolver latex2html
+BuildRequires:  ant ant-nodeps xml-commons-apis xml-commons-resolver tetex-tex4ht
 BuildRequires:  higlayout ImageMagick desktop-file-utils
 # needed by netpbm-tools, which is required by latex2html
 BuildRequires:  xorg-x11-server-utils
@@ -41,7 +41,6 @@
 
 %prep
 %setup -q -n %{name}
-sed -i 's|htlatex|latex2html|g' build.xml
 sed -i '/Class-Path:/d' src/MANIFEST.MF
 # build against the system version of higlayout and StAX
 rm jars/*
@@ -115,10 +114,13 @@
 
 %files manual
 %defattr(-,root,root,-)
-%doc doc/FreeCol.pdf doc/FreeCol/*.html doc/FreeCol/*.css doc/FreeCol/*.png
+%doc doc/FreeCol.pdf doc/FreeCol.html doc/FreeCol.css doc/images
 
 
 %changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.7.4-2
+- use tetex-tex4ht instead of latex2html
+
 * Mon Jun 16 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.4-1
 - New upstream release 0.7.4
 



From transif at fedoraproject.org  Thu Sep 11 22:37:38 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 11 Sep 2008 22:37:38 +0000 (UTC)
Subject: comps/po de.po,1.24,1.25
Message-ID: <20080911223738.6839470131@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12707/po

Modified Files:
	de.po 
Log Message:
    2008-09-11  Daniela Kugelmann <dkugelma at redhat.com> (via
dkugelma at fedoraproject.org)
    
      * po/de.po: Updated German translation.
    



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.24 -r 1.25 de.po
Index: de.po
===================================================================
RCS file: /cvs/pkgs/comps/po/de.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- de.po	11 Sep 2008 10:03:46 -0000	1.24
+++ de.po	11 Sep 2008 22:37:07 -0000	1.25
@@ -1,5 +1,7 @@
+# translation of comps.HEAD.de.po to German
 # German translation of comps
 #
+#
 # Ronny Buchmann <ronny-vlug at vlugnet.org> 2004, 2005.
 # Bernd Groh <bgroh at redhat.com>, 2003,2004.
 # Verena <vfuehrer at redhat.com>, 2004.
@@ -8,14 +10,13 @@
 # Severin Heiniger <severinheiniger at gmail.com>, 2007.
 # Fabian Affolter <fab at fedoraproject.org>, 2007,2008.
 # Daniela Kugelmann <dkugelma at redhat.com >, 2008.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-11 03:29+0000\n"
-"PO-Revision-Date: 2008-09-11 12:02+0100\n"
-"Last-Translator: Fabian Affolter <fab at fedoraproject.org>\n"
+"POT-Creation-Date: 2008-09-11 19:28+0000\n"
+"PO-Revision-Date: 2008-09-12 08:23+1000\n"
+"Last-Translator: Daniela Kugelmann <dkugelma at redhat.com >\n"
 "Language-Team: German <i18 at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,282 +26,187 @@
 "X-Poedit-Language: German\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: ../comps-f7.xml.in.h:1
-#: ../comps-f8.xml.in.h:1
-#: ../comps-f9.xml.in.h:1
+#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "Eine schlanke Desktop-Umgebung, die gut auf ??lteren Systemen funktioniert."
 
-#: ../comps-f7.xml.in.h:2
-#: ../comps-f8.xml.in.h:2
-#: ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2
-#: ../comps-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:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Verwaltungswerkzeuge"
 
-#: ../comps-f7.xml.in.h:3
-#: ../comps-f8.xml.in.h:3
-#: ../comps-f9.xml.in.h:3
+#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
 #: ../comps-f10.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "Unterst??tzung f??r Afrikaans"
 
-#: ../comps-f7.xml.in.h:4
-#: ../comps-f8.xml.in.h:4
-#: ../comps-f9.xml.in.h:4
+#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
 #: ../comps-f10.xml.in.h:4
 msgid "Albanian Support"
 msgstr "Unterst??tzung f??r Albanisch"
 
-#: ../comps-f7.xml.in.h:5
-#: ../comps-f8.xml.in.h:5
-#: ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5
-#: ../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:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: ../comps-f7.xml.in.h:6
-#: ../comps-f8.xml.in.h:6
-#: ../comps-f9.xml.in.h:6
+#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
 #: ../comps-f10.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
 msgstr "Anwendungen zur Durchf??hrung einer Vielzahl von Aufgaben"
 
-#: ../comps-f7.xml.in.h:7
-#: ../comps-f8.xml.in.h:7
-#: ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7
-#: ../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:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Unterst??tzung f??r Arabisch"
 
-#: ../comps-f7.xml.in.h:8
-#: ../comps-f8.xml.in.h:8
-#: ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8
-#: ../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:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Unterst??tzung f??r Armenisch"
 
-#: ../comps-f7.xml.in.h:9
-#: ../comps-f8.xml.in.h:9
-#: ../comps-f9.xml.in.h:9
+#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
 #: ../comps-f10.xml.in.h:9
 msgid "Assamese Support"
 msgstr "Unterst??tzung f??r Assamesisch"
 
-#: ../comps-f7.xml.in.h:10
-#: ../comps-f8.xml.in.h:10
-#: ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10
-#: ../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:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Schreiben und Publizieren"
 
-#: ../comps-f7.xml.in.h:11
-#: ../comps-f8.xml.in.h:11
-#: ../comps-f9.xml.in.h:11
+#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
 #: ../comps-f10.xml.in.h:11
 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:12
-#: ../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:12 ../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-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
 #: ../comps-f10.xml.in.h:13
 msgid "Basic support for the Ruby programming language."
 msgstr "Basis-Unterst??tzung f??r die Programmiersprache Ruby."
 
-#: ../comps-f7.xml.in.h:14
-#: ../comps-f8.xml.in.h:14
-#: ../comps-f9.xml.in.h:14
+#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
 #: ../comps-f10.xml.in.h:14
 msgid "Basque Support"
 msgstr "Unterst??tzung f??r Baskisch (Spanien)"
 
-#: ../comps-f7.xml.in.h:15
-#: ../comps-f8.xml.in.h:15
-#: ../comps-f9.xml.in.h:15
+#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
 #: ../comps-f10.xml.in.h:15
 msgid "Belarusian Support"
 msgstr "Unterst??tzung f??r Belarussisch"
 
-#: ../comps-f7.xml.in.h:16
-#: ../comps-f8.xml.in.h:16
-#: ../comps-f9.xml.in.h:16
+#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
 #: ../comps-f10.xml.in.h:16
 msgid "Bengali Support"
 msgstr "Unterst??tzung f??r Bengali"
 
-#: ../comps-f7.xml.in.h:17
-#: ../comps-f8.xml.in.h:17
-#: ../comps-f9.xml.in.h:17
+#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
 #: ../comps-f10.xml.in.h:17
 msgid "Bhutanese Support"
 msgstr "Unterst??tzung f??r Bhutanisch"
 
-#: ../comps-f7.xml.in.h:18
-#: ../comps-f8.xml.in.h:18
-#: ../comps-f9.xml.in.h:18
+#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
 #: ../comps-f10.xml.in.h:18
 msgid "Bosnian Support"
 msgstr "Unterst??tzung f??r Bosnisch"
 
[...1835 lines suppressed...]
-#: ../comps-f9.xml.in.h:111
-#: ../comps-f10.xml.in.h:116
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:116
 msgid "Nepali Support"
 msgstr "Unterst??tzung f??r Nepalisch"
 
-#: ../comps-f8.xml.in.h:114
-#: ../comps-f9.xml.in.h:118
-#: ../comps-f10.xml.in.h:123
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:123
 msgid "Older bitmap and vector fonts packages"
 msgstr "??ltere Pakete mit Bitmap- und Vektor-Schriftarten"
 
-#: ../comps-f9.xml.in.h:44
-#: ../comps-f10.xml.in.h:44
+#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44
 msgid "Esperanto Support"
 msgstr "Unterst??tzung f??r Esperanto"
 
-#: ../comps-f9.xml.in.h:91
-#: ../comps-f10.xml.in.h:94
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:94
 msgid "Kashubian Support"
 msgstr "Unterst??tzung f??r Kashubisch"
 
-#: ../comps-f9.xml.in.h:103
-#: ../comps-f10.xml.in.h:106
+#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:106
 msgid "Macedonian Support"
 msgstr "Unterst??tzung f??r Mazedonisch"
 
-#: ../comps-f9.xml.in.h:114
-#: ../comps-f10.xml.in.h:119
+#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:119
 msgid "Northern Sami Support"
 msgstr "Unterst??tzung f??r Nord-Sami"
 
-#: ../comps-f9.xml.in.h:130
-#: ../comps-f10.xml.in.h:135
+#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:135
 msgid "SUGAR Desktop Environment"
 msgstr "SUGAR Desktopumgebung"
 
-#: ../comps-f9.xml.in.h:131
-#: ../comps-f10.xml.in.h:136
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:136
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR ist die Desktopumgebung, welche f??r den OLPC XO entwickelt wurde."
 
-#: ../comps-f9.xml.in.h:200
-#: ../comps-f10.xml.in.h:207
+#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:208
 msgid "Walloon Support"
 msgstr "Unterst??tzung f??r Wallonisch"
 
 #: ../comps-f10.xml.in.h:70
-msgid "Haskell"
-msgstr "Haskell"
+msgid "Haskell Development"
+msgstr "Haskell-Entwicklung"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
@@ -1638,75 +1188,95 @@
 msgid "Myanmar (Burmese) Support"
 msgstr "Unterst??tzung f??r Burmesisch (Myanmar)"
 
-#: ../comps-f10.xml.in.h:159
+#: ../comps-f10.xml.in.h:153
+msgid "Support for developing programs in the Haskell programming language."
+msgstr ""
+"Unterst??tzung f??r die Entwicklung von Programmen in der Programmiersprache "
+"Haskell."
+
+#: ../comps-f10.xml.in.h:160
 msgid "Tajik Support"
 msgstr "Unterst??tzung f??r Tajik"
 
-#: ../comps-f10.xml.in.h:201
+#: ../comps-f10.xml.in.h:202
 msgid "Uzbek Support"
 msgstr "Unterst??tzung f??r Usbekisch"
 
-#: ../comps-el4.xml.in.h:3
-#: ../comps-el5.xml.in.h:3
+#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Anwendungen f??r eine Vielzahl von Aufgaben"
 
-#: ../comps-el4.xml.in.h:12
-#: ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "Unterst??tzung f??r DF??-Netzwerk"
 
-#: ../comps-el4.xml.in.h:22
-#: ../comps-el5.xml.in.h:23
-msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
-msgstr "GNOME ist eine leistungsstarke grafische Benutzeroberfl??che mit Men??leiste, Desktop, Systemsymbolen und grafischem Dateimanager."
-
-#: ../comps-el4.xml.in.h:35
-#: ../comps-el5.xml.in.h:35
-msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
-msgstr "KDE ist eine leistungsstarke, grafische Benutzeroberfl??che mit Men??leiste, Desktop, Systemsymbolen und grafischem Dateimanager."
-
-#: ../comps-el4.xml.in.h:44
-#: ../comps-el5.xml.in.h:44
-msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi."
-msgstr "Diese auch als Text-Editoren bezeichneten Programme erm??glichen das Anlegen und Bearbeiten von Dateien. Dazu geh??ren Emacs und Vi."
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+msgid ""
+"GNOME is a powerful, graphical user interface which includes a panel, "
+"desktop, system icons, and a graphical file manager."
+msgstr ""
+"GNOME ist eine leistungsstarke grafische Benutzeroberfl??che mit Men??leiste, "
+"Desktop, Systemsymbolen und grafischem Dateimanager."
+
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+msgid ""
+"KDE is a powerful, graphical user interface which includes a panel, desktop, "
+"system icons, and a graphical file manager."
+msgstr ""
+"KDE ist eine leistungsstarke, grafische Benutzeroberfl??che mit Men??leiste, "
+"Desktop, Systemsymbolen und grafischem Dateimanager."
+
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+msgid ""
+"Sometimes called text editors, these are programs that allow you to create "
+"and edit files. These include Emacs and Vi."
+msgstr ""
+"Diese auch als Text-Editoren bezeichneten Programme erm??glichen das Anlegen "
+"und Bearbeiten von Dateien. Dazu geh??ren Emacs und Vi."
 
-#: ../comps-el4.xml.in.h:50
-#: ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
 msgid "The XEmacs text editor."
 msgstr "Der Text-Editor XEmacs."
 
-#: ../comps-el4.xml.in.h:54
-#: ../comps-el5.xml.in.h:52
-msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text."
-msgstr "Mit diesen Programmen k??nnen Sie Dokumentationen im DocBook-Format anlegen und diese in die Formate HTML, PDF, Postscript und Text konvertieren."
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+msgid ""
+"These tools allow you to create documentation in the DocBook format and "
+"convert them to HTML, PDF, Postscript, and text."
+msgstr ""
+"Mit diesen Programmen k??nnen Sie Dokumentationen im DocBook-Format anlegen "
+"und diese in die Formate HTML, PDF, Postscript und Text konvertieren."
 
-#: ../comps-el4.xml.in.h:64
-#: ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
 msgid "This group is a collection of network servers for specific purposes"
-msgstr "Diese Gruppe umfasst eine Sammlung von Netzwerkservern f??r verschiedene Zwecke."
+msgstr ""
+"Diese Gruppe umfasst eine Sammlung von Netzwerkservern f??r verschiedene "
+"Zwecke."
 
-#: ../comps-el4.xml.in.h:65
-#: ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of tools and resources of Arabic environments."
-msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von arabische Umgebungen."
+msgstr ""
+"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
+"arabische Umgebungen."
 
-#: ../comps-el4.xml.in.h:67
-#: ../comps-el5.xml.in.h:66
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Hebrew environments."
-msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von hebr??ische Umgebungen."
+msgstr ""
+"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
+"hebr??ische Umgebungen."
 
-#: ../comps-el4.xml.in.h:68
-#: ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
 msgid "This group is a collection of tools and resources of Japanese environments."
-msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von japanische Umgebungen."
+msgstr ""
+"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
+"japanische Umgebungen."
 
-#: ../comps-el4.xml.in.h:77
-#: ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
 msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
 msgid "This group is a collection of tools and resources of Czech environments."
-msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von tschechischen Umgebungen."
+msgstr ""
+"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
+"tschechischen Umgebungen."
 



From pfj at fedoraproject.org  Thu Sep 11 22:39:31 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Thu, 11 Sep 2008 22:39:31 +0000 (UTC)
Subject: rpms/mono-addins/F-9 import.log,NONE,1.1 mono-addins.spec,1.4,1.5
Message-ID: <20080911223931.653C970131@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-addins/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13359/F-9

Modified Files:
	mono-addins.spec 
Added Files:
	import.log 
Log Message:

Rebuild 



--- NEW FILE import.log ---
mono-addins-0_3_1-2_2_fc10:F-9:mono-addins-0.3.1-2.2.fc10.src.rpm:1221172710


Index: mono-addins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-addins/F-9/mono-addins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mono-addins.spec	16 May 2008 10:15:46 -0000	1.4
+++ mono-addins.spec	11 Sep 2008 22:39:01 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		mono-addins
 Version:	0.3.1
-Release:	2.1%{?dist}
+Release:	2.2%{?dist}
 Summary:	Addins for mono
 Group:		Development/Languages
 License:	GPLv2
@@ -63,6 +63,9 @@
 %{_libdir}/pkgconfig/mono-addins*
 
 %changelog
+* Mon Jul 14 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.3.1-2.2
+- rebuild
+
 * Thu May 01 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.3.1-2.1
 - rebuild
 



From pfj at fedoraproject.org  Thu Sep 11 22:44:47 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Thu, 11 Sep 2008 22:44:47 +0000 (UTC)
Subject: rpms/mono-tools/F-9 import.log,NONE,1.1 mono-tools.spec,1.2,1.3
Message-ID: <20080911224447.96F8370131@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-tools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14851/F-9

Modified Files:
	mono-tools.spec 
Added Files:
	import.log 
Log Message:

Bump to newer version
Fixed archs and BRs 



--- NEW FILE import.log ---
mono-tools-1_9-4_fc10:F-9:mono-tools-1.9-4.fc10.src.rpm:1221173015


Index: mono-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/F-9/mono-tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mono-tools.spec	3 Jun 2008 10:48:40 -0000	1.2
+++ mono-tools.spec	11 Sep 2008 22:44:17 -0000	1.3
@@ -1,11 +1,10 @@
 %define debug_package %{nil}
 %define monodir %{_libdir}
-ExcludeArch: ppc64
 
 Summary: The mono documentation system
 Name: mono-tools
 Version: 1.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: Development/Tools
 Patch0: mono-tools.patch
@@ -15,9 +14,11 @@
 BuildRequires:  mono-data, mono-devel, gtk-sharp2-gapi, pkgconfig mono-nunit
 BuildRequires: monodoc-devel gecko-sharp2-devel gnome-sharp-devel, gettext-devel
 BuildRequires: gtk-sharp2-devel autoconf automake libtool mono-nunit-devel
-BuildRequires: hunspell-devel desktop-file-utils
+BuildRequires: hunspell-devel desktop-file-utils gnome-desktop-sharp-devel
 Requires: mono-core links monodoc
 
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
+
 %description
 Monotools are a number of tools for mono such as allowing monodoc to be run
 independantly of monodevelop
@@ -94,6 +95,13 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Jul 08 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-4
+- added br gnome-desktop-sharp
+- fix for archs
+
+* Mon Jul 07 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-3.1
+- rebuild
+
 * Tue Jun 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-3
 - added BR desktop-file-utils
 



From pfj at fedoraproject.org  Thu Sep 11 22:46:51 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Thu, 11 Sep 2008 22:46:51 +0000 (UTC)
Subject: rpms/mono-zeroconf/F-9 import.log, NONE,
	1.1 zeroconf-076-config.patch, 
	NONE, 1.1 .cvsignore, 1.3, 1.4 mono-zeroconf.spec, 1.5,
	1.6 sources, 1.3, 1.4 mono-zeroconf-libdir.patch, 1.1, NONE
Message-ID: <20080911224651.38DC270131@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-zeroconf/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15605/F-9

Modified Files:
	.cvsignore mono-zeroconf.spec sources 
Added Files:
	import.log zeroconf-076-config.patch 
Removed Files:
	mono-zeroconf-libdir.patch 
Log Message:

Bump to newer version
Fixed libdir problems 



--- NEW FILE import.log ---
mono-zeroconf-0_7_6-3_fc10:F-9:mono-zeroconf-0.7.6-3.fc10.src.rpm:1221173150

zeroconf-076-config.patch:

--- NEW FILE zeroconf-076-config.patch ---
--- mono-zeroconf-0.7.6/configure.ac	2008-03-21 00:44:37.000000000 +0000
+++ mono-zeroconf-0.7.6/configure-new.ac	2008-08-14 17:46:29.000000000 +0100
@@ -33,8 +33,8 @@
 	AC_MSG_ERROR([You need to install al])
 fi
 
-GACUTIL_FLAGS='-package $(PACKAGE) -root $(DESTDIR)$(prefix)/lib'
-GACUTIL_POLICY_FLAGS='-root $(DESTDIR)$(prefix)/lib'
+GACUTIL_FLAGS='-package $(PACKAGE) -root $(DESTDIR)$@libdir@'
+GACUTIL_POLICY_FLAGS='-root $(DESTDIR)$@libdir@'
 AC_SUBST(GACUTIL_FLAGS)
 AC_SUBST(GACUTIL_POLICY_FLAGS)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-zeroconf/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Feb 2008 07:13:32 -0000	1.3
+++ .cvsignore	11 Sep 2008 22:46:20 -0000	1.4
@@ -1 +1 @@
-mono-zeroconf-0.7.5.tar.bz2
+mono-zeroconf-0.7.6.tar.bz2


Index: mono-zeroconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-zeroconf/F-9/mono-zeroconf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mono-zeroconf.spec	7 Apr 2008 14:26:54 -0000	1.5
+++ mono-zeroconf.spec	11 Sep 2008 22:46:20 -0000	1.6
@@ -1,20 +1,19 @@
 %define                 debug_package %{nil}
 
 Name:           mono-zeroconf
-Version:        0.7.5
-Release:        4%{?dist}
+Version:        0.7.6
+Release:        3%{?dist}
 Summary:        Mono-zeroconf namespace
 Group:          Development/Languages
-License:        GPLv2
+License:        MIT
 URL:            http://banshee-project.org/files/mono-zeroconf
 Source0:        %{name}-%{version}.tar.bz2
-Patch0:		%{name}-libdir.patch
+Patch0:		zeroconf-076-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  mono-devel, avahi-sharp, monodoc-devel
 Requires: monodoc
 
-# Bug 241850 - no Mono on pp64
-ExcludeArch: ppc64
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
 
 %description
 Mono.Zeroconf is a cross platform Zero Configuration Networking library
@@ -30,9 +29,10 @@
 
 %prep
 %setup -q
-
-# libdir madness
-%patch0 -p1 -b .libdir
+# sed magic...
+sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH0}
+%patch0 -p1 -b .original
+sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH0} 
 
 %build
 %configure
@@ -54,11 +54,19 @@
 %{_libdir}/mono/mono-zeroconf
 %{_libdir}/monodoc/sources/mono-zeroconf*
 %{_libdir}/mono/gac/policy.1.0.Mono.Zeroconf/
+%{_libdir}/mono/gac/policy.2.0.Mono.Zeroconf/
 
 %files devel
 %{_libdir}/pkgconfig/mono-zeroconf.pc
 
 %changelog
+* Sun Aug 17 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.7.6-3
+- added autoreconf
+
+* Thu Aug 14 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.7.6-2
+- bump to new version
+- libdir clean now
+
 * Tue Apr 07 2008 David Nielsen <gnomeuser at gmail.com> - 0.7.5-4
 - Our CVS has odd bugs - pointless bump to make upgrade path work
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-zeroconf/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Feb 2008 07:13:32 -0000	1.3
+++ sources	11 Sep 2008 22:46:20 -0000	1.4
@@ -1 +1 @@
-bedac5b9288dce742854f15c4dbc0e2f  mono-zeroconf-0.7.5.tar.bz2
+7c7c841d6e10ad803bb879511ab9747b  mono-zeroconf-0.7.6.tar.bz2


--- mono-zeroconf-libdir.patch DELETED ---



From pfj at fedoraproject.org  Thu Sep 11 22:48:43 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Thu, 11 Sep 2008 22:48:43 +0000 (UTC)
Subject: rpms/monotorrent/F-9 import.log, NONE, 1.1 monotorrent.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080911224843.250BF70131@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/monotorrent/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16385/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log monotorrent.spec 
Log Message:

Initial F9 import 



--- NEW FILE import.log ---
monotorrent-0_4-2_fc10:F-9:monotorrent-0.4-2.fc10.src.rpm:1221173266


--- NEW FILE monotorrent.spec ---
%define                 debug_package %{nil}

Name:           monotorrent
Version:        0.4
Release:        2%{?dist}
Summary:        Mono bittorrent client
Group:          Development/Languages
License:        X11/MIT
URL:            http://www.monotorrent.com
Source0:        %{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  mono-devel, gtk-sharp2-devel, desktop-file-utils

# Bug 241850 - no Mono on pp64
ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha

%description
Monotorrent is a bittorrent for mono

%package devel
Summary: .pc file for monotorrent
Group: Documentation
Requires: %{name} = %{version}-%{release} pkgconfig

%description devel
Package config file for monotorrent

%prep
%setup -q

%build
%configure
make

%install
%{__rm} -rf %{buildroot}
make DESTDIR=%{buildroot} install

%clean
%{__rm} -rf %{buildroot}

%files 
%defattr(-,root,root,-)
%doc COPYING README
%{_bindir}/trackerapp
%{_bindir}/sampleclient
%{_libdir}/monotorrent/*

%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/monotorrent.pc

%changelog
* Sat Jun 28 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.4-2
- defattr fix

* Wed Jun 25 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.4-1
- Initial import for FE


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotorrent/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jul 2008 16:54:23 -0000	1.1
+++ .cvsignore	11 Sep 2008 22:48:12 -0000	1.2
@@ -0,0 +1 @@
+monotorrent-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monotorrent/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jul 2008 16:54:23 -0000	1.1
+++ sources	11 Sep 2008 22:48:12 -0000	1.2
@@ -0,0 +1 @@
+636e6b06198a2f7ba80790245018ca1c  monotorrent-0.4.tar.gz



From pfj at fedoraproject.org  Thu Sep 11 22:50:45 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Thu, 11 Sep 2008 22:50:45 +0000 (UTC)
Subject: rpms/xmms/devel import.log,1.1,1.2 xmms.spec,1.36,1.37
Message-ID: <20080911225045.29D8270133@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/xmms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17185/devel

Modified Files:
	import.log xmms.spec 
Log Message:

Fixed license tag 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xmms/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Sep 2008 21:44:44 -0000	1.1
+++ import.log	11 Sep 2008 22:50:14 -0000	1.2
@@ -1 +1,2 @@
 xmms-1_2_11-1_20071117cvs_fc10:HEAD:xmms-1.2.11-1.20071117cvs.fc10.src.rpm:1220391799
+xmms-1_2_11-1_20071117cvs_1_fc10:HEAD:xmms-1.2.11-1.20071117cvs.1.fc10.src.rpm:1221173377


Index: xmms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xmms.spec	2 Sep 2008 21:44:44 -0000	1.36
+++ xmms.spec	11 Sep 2008 22:50:14 -0000	1.37
@@ -1,11 +1,11 @@
 Name:           xmms
 Version:        1.2.11
-Release:        1.20071117cvs%{?dist}
+Release:        1.20071117cvs.1%{?dist}
 Epoch:          1
 Summary:        The X MultiMedia System, a media player
 
 Group:          Applications/Multimedia
-License:        GPLv2
+License:        GPLv2+
 URL:            http://www.xmms.org/
 # http://www.xmms.org/download.php, to recreate the tarball:
 # $ wget http://www.xmms.org/files/1.2.x/xmms-1.2.10.tar.bz2
@@ -215,6 +215,9 @@
 
 
 %changelog
+* Wed Sep 10 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.11-20071117cvs-1.1
+- Reverted license to gplv2+ (oopsy!)
+
 * Tue Sep 02 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.11-20071117cvs-1
 - Bump to 1.2.11 devel branch
 - Alter license



From sgrubb at fedoraproject.org  Thu Sep 11 22:51:46 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Thu, 11 Sep 2008 22:51:46 +0000 (UTC)
Subject: rpms/audit/devel .cvsignore, 1.94, 1.95 audit.spec, 1.182,
	1.183 sources, 1.118, 1.119
Message-ID: <20080911225146.86E5770130@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17675

Modified Files:
	.cvsignore audit.spec sources 
Log Message:
* Wed Sep 11 2008 Steve Grubb <sgrubb at redhat.com> 1.7.6-1
- Add subject to audit daemon events (Chu Li)
- Add tcp_wrappers support for auditd
- Updated syscall tables for 2.6.27 kernel
- Audit connect/disconnect of remote clients
- Add GSS/Kerberos encryption to the remote protocol (DJ Delorie)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/.cvsignore,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- .cvsignore	25 Aug 2008 20:05:08 -0000	1.94
+++ .cvsignore	11 Sep 2008 22:51:16 -0000	1.95
@@ -91,3 +91,4 @@
 audit-1.7.3.tar.gz
 audit-1.7.4.tar.gz
 audit-1.7.5.tar.gz
+audit-1.7.6.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- audit.spec	31 Aug 2008 16:54:48 -0000	1.182
+++ audit.spec	11 Sep 2008 22:51:16 -0000	1.183
@@ -1,12 +1,12 @@
 %define sca_version 0.4.8
-%define sca_release 1
+%define sca_release 2
 %define selinux_variants mls strict targeted
 %define selinux_policyver 3.2.5 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 1.7.5
+Version: 1.7.6
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -15,6 +15,7 @@
 Patch1: audit-1.7.5-policy.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel intltool libtool swig python-devel
+BuildRequires: tcp_wrappers-devel krb5-devel
 BuildRequires: kernel-headers >= 2.6.18
 BuildRequires: automake >= 1.9
 BuildRequires: autoconf >= 2.59
@@ -102,7 +103,7 @@
 
 %build
 (cd system-config-audit; ./autogen.sh)
-%configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude
+%configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5
 make %{?_smp_mflags}
 cd zos-remote-policy
 for selinuxvariant in %{selinux_variants}
@@ -167,10 +168,8 @@
 	--delete-original				\
 	system-config-audit/system-config-audit.desktop
 
-# This is a reminder to enable it when tests
-# aren't based on postfix uids
-#% check
-#make check
+%check
+make check
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -325,6 +324,13 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Wed Sep 11 2008 Steve Grubb <sgrubb at redhat.com> 1.7.6-1
+- Add subject to audit daemon events (Chu Li)
+- Add tcp_wrappers support for auditd
+- Updated syscall tables for 2.6.27 kernel
+- Audit connect/disconnect of remote clients
+- Add GSS/Kerberos encryption to the remote protocol (DJ Delorie)
+
 * Mon Aug 25 2008 Steve Grubb <sgrubb at redhat.com> 1.7.5-1
 - Update system-config-audit to 0.4.8
 - Whole lot of bug fixes - see ChangeLog for details


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/sources,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- sources	25 Aug 2008 20:05:09 -0000	1.118
+++ sources	11 Sep 2008 22:51:16 -0000	1.119
@@ -1 +1 @@
-584b681fb473c74e2325b92a4c3d3423  audit-1.7.5.tar.gz
+4dcd4f2f9535feb38a2ad0c594dfdeb1  audit-1.7.6.tar.gz



From pfj at fedoraproject.org  Thu Sep 11 22:54:05 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Thu, 11 Sep 2008 22:54:05 +0000 (UTC)
Subject: rpms/xmms/F-9 import.log, NONE, 1.1 xmms-1.2.11-alsalib.patch, NONE,
	1.1 xmms-1.2.11-arts.patch, NONE, 1.1 xmms-1.2.11-multilib.patch,
	NONE, 1.1 xmms-1.2.11-nomp3.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4 xmms.spec, 1.34,
	1.35 xmms-1.2.10-joycrash.patch, 1.1,
	NONE xmms-1.2.10-multidevel.patch, 1.1,
	NONE xmms-1.2.10-pls-188603.patch, 1.1,
	NONE xmms-1.2.10-ubuntu-CVE-2007-0653.patch, 1.1,
	NONE xmms-1.2.8-alsalib.patch, 1.1, NONE xmms-1.2.8-arts.patch,
	1.1, NONE xmms-1.2.9-nomp3.patch, 1.1,
	NONE xmms-alsa-backport.patch, 1.1, NONE xmms-underquoted.patch,
	1.1, NONE
Message-ID: <20080911225405.B885F70130@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/xmms/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18767/F-9

Modified Files:
	.cvsignore sources xmms.spec 
Added Files:
	import.log xmms-1.2.11-alsalib.patch xmms-1.2.11-arts.patch 
	xmms-1.2.11-multilib.patch xmms-1.2.11-nomp3.patch 
Removed Files:
	xmms-1.2.10-joycrash.patch xmms-1.2.10-multidevel.patch 
	xmms-1.2.10-pls-188603.patch 
	xmms-1.2.10-ubuntu-CVE-2007-0653.patch 
	xmms-1.2.8-alsalib.patch xmms-1.2.8-arts.patch 
	xmms-1.2.9-nomp3.patch xmms-alsa-backport.patch 
	xmms-underquoted.patch 
Log Message:

Bump to new version
Removed old patches and fixed quite a few as well 



--- NEW FILE import.log ---
xmms-1_2_11-1_20071117cvs_1_fc10:F-9:xmms-1.2.11-1.20071117cvs.1.fc10.src.rpm:1221173566

xmms-1.2.11-alsalib.patch:

--- NEW FILE xmms-1.2.11-alsalib.patch ---
--- xmms-1.2.11-20071117cvs/configure	2008-09-02 19:22:09.000000000 +0100
+++ xmms-1.2.11-20071117cvs/configure-new	2008-09-02 21:02:33.000000000 +0100
@@ -30090,8 +30090,6 @@
 #define HAVE_LIBASOUND 1
 _ACEOF
 
-  LIBS="-lasound $LIBS"
-
 else
 
 	 alsa_found=no
@@ -30104,7 +30102,6 @@
    have_alsa=yes
    LIBS=`echo $LIBS | sed 's/-lasound//g'`
    LIBS=`echo $LIBS | sed 's/  //'`
-   LIBS="-lasound $LIBS"
 fi
 if test "x$alsa_found" = "xno" ; then
    have_alsa=no

xmms-1.2.11-arts.patch:

--- NEW FILE xmms-1.2.11-arts.patch ---
--- xmms-1.2.11-20071117cvs/xmms/main.c	2008-09-02 19:08:34.000000000 +0100
+++ xmms-1.2.11-20071117cvs/xmms/main-new.c	2008-09-02 19:16:29.000000000 +0100
@@ -307,6 +307,40 @@
 	sizeof(mainwin_general_menu_entries) / 
 	sizeof(mainwin_general_menu_entries[0]);
 
+#include <kde/artsc/artsc.h>
+#include <dlfcn.h>
+
+/* dlopen libarts, for seeing if we should use this as the default plugin. */
+static int arts_running(void) {
+	void *arts_handle;
+	int (*a_init)(void);
+	void (*a_close)(void);
+	int ret = 0;
+	
+	arts_handle = dlopen("libartsc.so.0", RTLD_NOW);
+	if (!arts_handle)
+		return 0;
+
+	a_init = dlsym(arts_handle, "arts_init");
+	a_close = dlsym(arts_handle, "arts_free");
+	if (!a_init || !a_close) {
+		dlclose(arts_handle);
+		return 0;
+	}
+	signal(SIGPIPE, SIG_DFL);
+	if ((*a_init)() == 0) {
+		ret = 1;
+		/* there are problems with library unloading in conjunction with X11, */
+		/* (Arts::X11GlobalComm), so we don't unload stuff here */
+ 		/* (*a_close)(); */
+	}
+	signal(SIGPIPE, SIG_IGN);
+	dlclose(arts_handle);
+	return ret;
+}
+
+
+
 static void make_xmms_dir(void)
 {
 	gchar *filename;
@@ -503,6 +537,19 @@
 		cfg.skin = g_strdup("/usr/share/xmms/Skins/Bluecurve-xmms.zip");
 	if (cfg.outputplugin == NULL)
 	{
+		/* If aRts is running and the plugin is there, use that... */
+		if (arts_running())
+		{
+			cfg.outputplugin = g_strdup_printf("%s/%s/libarts.so", PLUGIN_DIR, plugin_dir_list[0]);
+			if (access(cfg.outputplugin, X_OK))
+			{
+				g_free(cfg.outputplugin);
+				cfg.outputplugin = NULL;
+			}
+		}
+	}
+	if (cfg.outputplugin == NULL)
+	{
 #ifdef HAVE_OSS
 		cfg.outputplugin = g_strdup_printf("%s/%s/libALSA.so", PLUGIN_DIR, plugin_dir_list[0]);
 #elif defined(sun)
@@ -515,6 +562,13 @@
 		cfg.outputplugin = g_strdup("");
 #endif
 	}
+	/* Migrate users of the previous arts plugin */
+	if (!strcmp(g_basename(cfg.outputplugin),"libartsout.so")) {
+		if (access(cfg.outputplugin,X_OK)) {
+			g_free(cfg.outputplugin);
+			cfg.outputplugin = g_strdup_printf("%s/%s/libarts.so", PLUGIN_DIR, plugin_dir_list[0]);
+		}
+	}
 	if (cfg.eqpreset_default_file == NULL)
 		cfg.eqpreset_default_file = g_strdup("dir_default.preset");
 	if (cfg.eqpreset_extension == NULL)

xmms-1.2.11-multilib.patch:

--- NEW FILE xmms-1.2.11-multilib.patch ---
--- xmms-1.2.11-20071117cvs/configure	2008-09-02 21:03:56.000000000 +0100
+++ xmms-1.2.11-20071117cvs/configure-new	2008-09-02 21:36:04.000000000 +0100
@@ -33510,7 +33510,7 @@
 
 
 
-                                                                                                                                                                                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visualization/blur_scope/Mak
 efile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile"
+                                                                                                                                                                                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms.pc xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visualization/blur_s
 cope/Makefile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile"
           ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -34178,6 +34178,7 @@
   "wmxmms.1" ) CONFIG_FILES="$CONFIG_FILES wmxmms.1" ;;
   "xmms.spec" ) CONFIG_FILES="$CONFIG_FILES xmms.spec" ;;
   "xmms-config" ) CONFIG_FILES="$CONFIG_FILES xmms-config" ;;
+  "xmms.pc" ) CONFIG_FILES="$CONFIG_FILES xmms.pc" ;;
   "xmms/Makefile" ) CONFIG_FILES="$CONFIG_FILES xmms/Makefile" ;;
   "xmms/defskin/Makefile" ) CONFIG_FILES="$CONFIG_FILES xmms/defskin/Makefile" ;;
   "Output/Makefile" ) CONFIG_FILES="$CONFIG_FILES Output/Makefile" ;;
--- xmms-1.2.11-20071117cvs/xmms-config.in	2001-04-06 01:35:49.000000000 +0100
+++ xmms-1.2.11-20071117cvs/xmms-config-new.in	2008-09-02 22:23:29.000000000 +0100
@@ -18,24 +18,6 @@
 data_dir="@datadir@/@PACKAGE@"
 
 version="@VERSION@"
-include_dir="@includedir@"
-xmms_include_dir="@includedir@/@PACKAGE@"
-lib_dir="@libdir@"
-
-if ( (gtk-config --version) > /dev/null 2>&1)  then
-   gtk_libs=`gtk-config --libs`
-   gtk_cflags=`gtk-config --cflags`
-else
-   gtk_libs="@GTK_LIBS@"
-   gtk_cflags="@GTK_CFLAGS@"
-fi
-
-plugin_dir="@plugindir@"
-visualization_plugin_dir="@plugindir@/@VISUALIZATION_PLUGIN_DIR@"
-input_plugin_dir="@plugindir@/@INPUT_PLUGIN_DIR@"
-output_plugin_dir="@plugindir@/@OUTPUT_PLUGIN_DIR@"
-effect_plugin_dir="@plugindir@/@EFFECT_PLUGIN_DIR@"
-general_plugin_dir="@plugindir@/@GENERAL_PLUGIN_DIR@"
 
 usage()
 {
@@ -146,24 +128,12 @@
     echo $exec_prefix
 fi
 
-if test "$include_dir" != "/usr/include"; then
-    cflags="-I$include_dir -I$xmms_include_dir $gtk_cflags"
-else
-    cflags="-I$xmms_include_dir $gtk_cflags"
-fi
-
-if test "$lib_dir" != "/usr/lib"; then
-    libs="-L$lib_dir $gtk_libs -lxmms"
-else
-    libs="$gtk_libs -lxmms"
-fi
-
 if test "$echo_cflags" = "yes"; then
-    echo $cflags
+    pkg-config xmms --cflags
 fi
 
 if test "$echo_libs" = "yes"; then
-    echo $libs
+    pkg-config xmms --libs
 fi
 
 if test "$echo_data_dir" = "yes"; then
@@ -171,25 +141,25 @@
 fi
 
 if test "$echo_plugin_dir" = "yes"; then
-    echo $plugin_dir
+    pkg-config xmms --variable=plugin_dir
 fi
 
 if test "$echo_visualization_plugin_dir" = "yes"; then
-    echo $visualization_plugin_dir
+    pkg-config xmms --variable=visualization_plugin_dirr
 fi
 
 if test "$echo_input_plugin_dir" = "yes"; then
-    echo $input_plugin_dir
+    pkg-config xmms --variable=input_plugin_dir
 fi
 
 if test "$echo_output_plugin_dir" = "yes"; then
-    echo $output_plugin_dir
+    pkg-config xmms --variable=output_plugin_dir
 fi
 
 if test "$echo_general_plugin_dir" = "yes"; then
-    echo $general_plugin_dir
+    pkg-config xmms --variable=general_plugin_dir
 fi
 
 if test "$echo_effect_plugin_dir" = "yes"; then
-    echo $effect_plugin_dir
+    pkg-config xmms --variable=effect_plugin_dir
 fi

--- xmms-1.2.10/xmms.pc.in~	2006-05-24 23:54:59.000000000 +0300
+++ xmms-1.2.10/xmms.pc.in	2006-05-24 23:54:48.000000000 +0300
@@ -0,0 +1,18 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+data_dir=@datadir@
+plugin_dir=@plugindir@
+visualization_plugin_dir=${plugin_dir}/@VISUALIZATION_PLUGIN_DIR@
+input_plugin_dir=${plugin_dir}/@INPUT_PLUGIN_DIR@
+output_plugin_dir=${plugin_dir}/@OUTPUT_PLUGIN_DIR@
+effect_plugin_dir=${plugin_dir}/@EFFECT_PLUGIN_DIR@
+general_plugin_dir=${plugin_dir}/@GENERAL_PLUGIN_DIR@
+
+Name: XMMS
+Description: The X MultiMedia System, a media player
+Version: @VERSION@
+Requires: gtk+
+Libs: -L${libdir} -lxmms
+Cflags: -I${includedir} -I${includedir}/@PACKAGE@


xmms-1.2.11-nomp3.patch:

--- NEW FILE xmms-1.2.11-nomp3.patch ---
--- xmms-1.2.11-20071117cvs/xmms/input.c	2005-05-15 22:46:35.000000000 +0100
+++ xmms-1.2.11-20071117cvs/xmms/input-new.c	2008-09-02 19:07:19.000000000 +0100
@@ -17,6 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+#define _GNU_SOURCE 1
 #include "xmms.h"
 #include "fft.h"
 #include "libxmms/titlestring.h"
@@ -228,16 +229,21 @@
 {
 	GList *node;
 	InputPlugin *ip;
-
+	InputPlugin *rhmp3 = NULL;
 	node = get_input_list();
 	while (node)
 	{
 		ip = (InputPlugin *) node->data;
-		if (ip && !g_list_find(disabled_iplugins, ip) &&
+		if (ip && !strcmp(basename(ip->filename),"librh_mp3.so"))
+			rhmp3 = ip;
+		else if (ip && !g_list_find(disabled_iplugins, ip) &&
 		    ip->is_our_file(filename))
 			return TRUE;
 		node = node->next;
 	}
+	if (rhmp3 && !g_list_find(disabled_iplugins, rhmp3) &&
+	    rhmp3->is_our_file(filename))
+		return TRUE;
 	return FALSE;
 }
 
@@ -245,7 +251,7 @@
 {
 	GList *node;
 	InputPlugin *ip;
-
+	InputPlugin *rhmp3 = NULL;
 	node = get_input_list();
 	if (get_current_output_plugin() == NULL)
 	{
@@ -263,8 +269,9 @@
 	while (node)
 	{
 		ip = node->data;
-		if (ip && !g_list_find(disabled_iplugins, ip) &&
-		    ip->is_our_file(filename))
+		if (ip && !strcmp(basename(ip->filename),"librh_mp3.so"))
+			rhmp3 = ip;
+		else if (ip && !g_list_find(disabled_iplugins, ip) && 			    ip->is_our_file(filename))
 		{
 			set_current_input_plugin(ip);
 			ip->output = get_current_output_plugin();
@@ -274,6 +281,15 @@
 		}
 		node = node->next;
 	}
+	if (rhmp3 && !g_list_find(disabled_iplugins, rhmp3) &&
+	    rhmp3->is_our_file(filename))
+	{
+		set_current_input_plugin(rhmp3);
+		rhmp3->output = get_current_output_plugin();
+		rhmp3->play_file(filename);
+		ip_data->playing = TRUE;
+		return;
+	}
 	set_current_input_plugin(NULL);
 }
 
 
--- xmms-1.2.11-20071117cvs/Input/Makefile.am	2002-03-15 23:10:06.000000000 +0000
+++ xmms-1.2.11-20071117cvs/Input/Makefile-new.am	2008-09-02 13:50:06.000000000 +0100
@@ -1,3 +1,3 @@
-ALL_PLUGINS = wav mpg123 mikmod cdaudio tonegen vorbis
+ALL_PLUGINS = wav mikmod cdaudio tonegen vorbis
 SUBDIRS = @INPUT_PLUGINS@
 
--- xmms-1.2.11-20071117cvs/Input/Makefile.in	2007-11-17 22:45:30.000000000 +0000
+++ xmms-1.2.11-20071117cvs/Input/Makefile-new.in	2008-09-02 13:51:16.000000000 +0100
@@ -260,7 +260,7 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 xmmsdir = @xmmsdir@
-ALL_PLUGINS = wav mpg123 mikmod cdaudio tonegen vorbis
+ALL_PLUGINS = wav mikmod cdaudio tonegen vorbis
 SUBDIRS = @INPUT_PLUGINS@
 all: all-recursive
 
--- xmms-1.2.11-20071117cvs/po/POTFILES.in	2004-01-17 22:45:07.000000000 +0000
+++ xmms-1.2.11-20071117cvs/po/POTFILES-new.in	2008-09-02 13:52:14.000000000 +0100
@@ -19,11 +19,6 @@
 Input/cdaudio/http.c
 Input/mikmod/drv_xmms.c
 Input/mikmod/plugin.c
-Input/mpg123/common.c
-Input/mpg123/configure.c
-Input/mpg123/fileinfo.c
-Input/mpg123/http.c
-Input/mpg123/mpg123.c
 Input/tonegen/tonegen.c
 Input/vorbis/configure.c
 Input/vorbis/fileinfo.c

--- xmms-1.2.9/configure.cow	2004-01-28 21:14:46.418517318 -0500
+++ xmms-1.2.9/configure	2004-01-28 21:14:57.290123348 -0500
@@ -19192,7 +19192,7 @@
 
 
 
-                                                                                                                                                                                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mpg123/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visual
 ization/blur_scope/Makefile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile"
+                                                                                                                                                                                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visualization/blur_scope/Mak
 efile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile"
           ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -19863,7 +19863,6 @@
   "Output/alsa/Makefile" ) CONFIG_FILES="$CONFIG_FILES Output/alsa/Makefile" ;;
   "Input/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/Makefile" ;;
   "Input/wav/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/wav/Makefile" ;;
-  "Input/mpg123/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/mpg123/Makefile" ;;
   "Input/mikmod/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/mikmod/Makefile" ;;
   "Input/cdaudio/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/cdaudio/Makefile" ;;
   "Input/tonegen/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/tonegen/Makefile" ;;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmms/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Apr 2005 20:07:18 -0000	1.3
+++ .cvsignore	11 Sep 2008 22:53:35 -0000	1.4
@@ -1 +1 @@
-xmms-1.2.10.patched.tar.bz2
+xmms-1.2.11-20071117cvs.patched.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmms/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Apr 2005 20:07:18 -0000	1.3
+++ sources	11 Sep 2008 22:53:35 -0000	1.4
@@ -1 +1 @@
-16414f1c15f0b87c3ee6362a7dcf4e7e  xmms-1.2.10.patched.tar.bz2
+4b96f79ab252fa790341a1fa80cc081c  xmms-1.2.11-20071117cvs.patched.tar.bz2


Index: xmms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmms/F-9/xmms.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xmms.spec	19 Feb 2008 18:59:36 -0000	1.34
+++ xmms.spec	11 Sep 2008 22:53:35 -0000	1.35
@@ -1,39 +1,34 @@
 Name:           xmms
-Version:        1.2.10
-Release:        38%{?dist}
+Version:        1.2.11
+Release:        1.20071117cvs.1%{?dist}
 Epoch:          1
 Summary:        The X MultiMedia System, a media player
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2+
 URL:            http://www.xmms.org/
 # http://www.xmms.org/download.php, to recreate the tarball:
 # $ wget http://www.xmms.org/files/1.2.x/xmms-1.2.10.tar.bz2
 # $ tar jx --exclude "mpg123*" -f xmms-1.2.10.tar.bz2
 # $ tar jcf xmms-1.2.10.patched.tar.bz2 xmms-1.2.10
-Source0:        %{name}-%{version}.patched.tar.bz2
+Source0:        %{name}-%{version}-20071117cvs.patched.tar.bz2
 Source1:        xmms.sh
 Source2:        xmms.xpm
 Source3:        rh_mp3.c
 # http://cvs.xmms.org/cvsweb.cgi/xmms/General/joystick/joy.c.diff?r1=1.8&r2=1.9
-Patch0:         %{name}-1.2.10-joycrash.patch
 Patch1:         %{name}-1.2.6-audio.patch
 Patch2:         %{name}-1.2.6-lazy.patch
 Patch3:         %{name}-1.2.8-default-skin.patch
-Patch4:         %{name}-1.2.9-nomp3.patch
-Patch5:         %{name}-1.2.8-arts.patch
-Patch6:         %{name}-1.2.8-alsalib.patch
+Patch4:         %{name}-1.2.11-nomp3.patch
+Patch5:         %{name}-1.2.11-arts.patch
+Patch6:         %{name}-1.2.11-alsalib.patch
 Patch7:         %{name}-cd-mountpoint.patch
 # Patch8 on top of patch4
-Patch8:         %{name}-1.2.10-multidevel.patch
-Patch9:         %{name}-underquoted.patch
-Patch10:        %{name}-alsa-backport.patch
+Patch8:         %{name}-1.2.11-multilib.patch
 Patch11:        %{name}-1.2.10-gcc4.patch
 Patch12:        %{name}-1.2.10-crossfade-0.3.9.patch
-Patch13:        %{name}-1.2.10-pls-188603.patch
 Patch14:	%{name}-1.2.10-configfile-safe-write.patch
 Patch15:	%{name}-1.2.10-reposition.patch
-Patch16:	%{name}-1.2.10-ubuntu-CVE-2007-0653.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk+-devel
@@ -87,9 +82,7 @@
 
 
 %prep
-%setup -q 
-# Fix joystick plugin crashes
-%patch0 -p1 -b .joycrash
+%setup -q -n %{name}-%{version}-20071117cvs
 # Set default output plugin to ALSA
 %patch1 -p1 -b .audio
 # Use RTLD_LAZY, not RTLD_NOW
@@ -106,19 +99,11 @@
 %patch7 -p0 -b .cd-mountpoint
 # Avoid multilib devel conflicts
 %patch8 -p1 -b .multidevel
-# Fix m4 underquoted warning
-%patch9 -p1 -b .underquoted
-# Backport for recent ALSA
-%patch10 -p0 -b .alsa-backport
-# Fix compilation with gcc4
-%patch11 -p1 -b .gcc4
 # Fix for crossfade >= 0.3.9 to work properly
 %patch12 -p1 -b .crossfade
 # Randomize playlists better
-%patch13 -p1 -b .pls
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
 # Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it
 sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure
 
@@ -230,6 +215,15 @@
 
 
 %changelog
+* Wed Sep 10 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.11-20071117cvs-1.1
+- Reverted license to gplv2+ (oopsy!)
+
+* Tue Sep 02 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.11-20071117cvs-1
+- Bump to 1.2.11 devel branch
+- Alter license
+- Removed unused patches
+- Fixed old patches to work with new version
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:1.2.10-38
 - Autorebuild for GCC 4.3
 


--- xmms-1.2.10-joycrash.patch DELETED ---


--- xmms-1.2.10-multidevel.patch DELETED ---


--- xmms-1.2.10-pls-188603.patch DELETED ---


--- xmms-1.2.10-ubuntu-CVE-2007-0653.patch DELETED ---


--- xmms-1.2.8-alsalib.patch DELETED ---


--- xmms-1.2.8-arts.patch DELETED ---


--- xmms-1.2.9-nomp3.patch DELETED ---


--- xmms-alsa-backport.patch DELETED ---


--- xmms-underquoted.patch DELETED ---



From pfj at fedoraproject.org  Thu Sep 11 22:56:25 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Thu, 11 Sep 2008 22:56:25 +0000 (UTC)
Subject: rpms/fig2sxd/F-9 import.log, NONE, 1.1 fig2sxd.spec, 1.1,
	1.2 fig2sxd.patch, 1.1, NONE
Message-ID: <20080911225625.DE8A870130@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/fig2sxd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19614/F-9

Modified Files:
	fig2sxd.spec 
Added Files:
	import.log 
Removed Files:
	fig2sxd.patch 
Log Message:

Dropped old patch - not required 



--- NEW FILE import.log ---
fig2sxd-0_18-3_fc10:F-9:fig2sxd-0.18-3.fc10.src.rpm:1221173726


Index: fig2sxd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fig2sxd/F-9/fig2sxd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fig2sxd.spec	2 Jun 2008 15:18:55 -0000	1.1
+++ fig2sxd.spec	11 Sep 2008 22:55:55 -0000	1.2
@@ -1,10 +1,9 @@
 Name:           fig2sxd
 Version:        0.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A fig to sxd file converter
 Group:          System Environment/Libraries
 License:        GPLv2
-Patch0:		fig2sxd.patch
 Patch1:		fig2sxd-makefile.patch
 URL:            http://fig2sxd.sf.net
 BuildRequires:	zlib-devel
@@ -18,7 +17,6 @@
 
 %prep
 %setup -q 
-%patch0 -p1 -b .orig
 %patch1 -p1 -b .orig
 
 %build
@@ -38,6 +36,9 @@
 
 
 %changelog
+* Thu Aug 28 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.18-3
+- dropped redundant patch file
+
 * Tue May 20 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.18-2
 - fix URL
 


--- fig2sxd.patch DELETED ---



From clumens at fedoraproject.org  Thu Sep 11 22:58:42 2008
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu, 11 Sep 2008 22:58:42 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.565, 1.566 anaconda.spec, 1.707, 
	1.708 sources, 1.699, 1.700
Message-ID: <20080911225842.CB15D70130@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20541

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.565
retrieving revision 1.566
diff -u -r1.565 -r1.566
--- .cvsignore	10 Sep 2008 02:37:12 -0000	1.565
+++ .cvsignore	11 Sep 2008 22:58:12 -0000	1.566
@@ -1,2 +1,3 @@
 anaconda-11.4.1.32.tar.bz2
 anaconda-11.4.1.33.tar.bz2
+anaconda-11.4.1.34.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.707
retrieving revision 1.708
diff -u -r1.707 -r1.708
--- anaconda.spec	10 Sep 2008 02:37:12 -0000	1.707
+++ anaconda.spec	11 Sep 2008 22:58:12 -0000	1.708
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.4.1.33
+Version: 11.4.1.34
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -218,6 +218,28 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Sep 11 2008 Chris Lumens <clumens at redhat.com> - 11.4.1.34-1
+- Always start NM so we can talk to it in the boot.iso case (#461071).
+  (clumens)
+- Use the device path to identify LUKS devs in /etc/fstab. (#460700)
+  (dlehman)
+- Use the LUKS UUID instead of device nodes in all references. (#460700)
+  (dlehman)
+- LUKSDevice.getScheme() no longer cares if the dev has a passphrase.
+  (#461203) (dlehman)
+- Correct translation to fix the build. (clumens)
+- Add the method string back into anaconda-ks.cfg. (clumens)
+- Let's try pulling libsqlite into the initrd one more time. (clumens)
+- Don't traceback at the end of live installs (katzj)
+- Correct the message telling you to use a VNC password. (clumens)
+- Remove unused TIMEZONES= crud. (clumens)
+- print doesn't yet support the file= syntax in our version of python.
+  (clumens)
+- Catch errors from using the wrong bugzilla field and display them.
+  (clumens)
+- Fix line wrapping on part type screen (jlaska, #461759).
+- rep_platform has been renamed to platform. (clumens)
+
 * Tue Sep 09 2008 Chris Lumens <clumens at redhat.com> - 11.4.1.33-1
 - Include NetworkManager and dbus libraries on 64-bit arches (#461632).
   (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.699
retrieving revision 1.700
diff -u -r1.699 -r1.700
--- sources	10 Sep 2008 02:37:12 -0000	1.699
+++ sources	11 Sep 2008 22:58:12 -0000	1.700
@@ -1 +1 @@
-574b68dee0bd0665240d06e0d4e819aa  anaconda-11.4.1.33.tar.bz2
+e3948ec1d6f1dca31abe98ad4210d5be  anaconda-11.4.1.34.tar.bz2



From orion at fedoraproject.org  Thu Sep 11 22:59:18 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 11 Sep 2008 22:59:18 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge.spec,1.61,1.62
Message-ID: <20080911225918.EB80770130@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20843

Modified Files:
	octave-forge.spec 
Log Message:
* Thu Sep 11 2008 Orion Poplawski <orion at cora.nwra.com>  20080831-2
- Rebuild for new libdap



Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- octave-forge.spec	9 Sep 2008 18:09:04 -0000	1.61
+++ octave-forge.spec	11 Sep 2008 22:58:48 -0000	1.62
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20080831
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -203,6 +203,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Orion Poplawski <orion at cora.nwra.com>  20080831-2
+- Rebuild for new libdap
+
 * Mon Sep 8 2008 Orion Poplawski <orion at cora.nwra.com>  20080831-1
 - Update to 20080831
 - Drop upstreamed patches



From lmacken at fedoraproject.org  Thu Sep 11 23:02:08 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 23:02:08 +0000 (UTC)
Subject: rpms/python-peak-util-symbols/EL-4 python-peak-util-symbols.spec,
	1.1, 1.2
Message-ID: <20080911230208.A012570130@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-symbols/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21881

Modified Files:
	python-peak-util-symbols.spec 
Log Message:
* Thu Sep 11 2008 Luke Macken <lmacken at redhat.com> - 1.0-1
- Disable the unittests, as EL-4's doctest does not have the DocFileSuite



Index: python-peak-util-symbols.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-symbols/EL-4/python-peak-util-symbols.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-peak-util-symbols.spec	11 Sep 2008 08:15:54 -0000	1.1
+++ python-peak-util-symbols.spec	11 Sep 2008 23:01:38 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           python-peak-util-symbols
 Version:        1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple "symbol" type, useful for enumerations or sentinels
 
 Group:          Development/Languages
@@ -16,7 +16,7 @@
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
-BuildRequires:  python-nose
+#BuildRequires:  python-nose
 
 %description
 SymbolType gives you access to the peak.util.symbols module, previously
@@ -34,8 +34,8 @@
 rm -rf %{buildroot}
 %{__python} setup.py install --skip-build --root %{buildroot}
 
-%check
-nosetests
+#%check
+#nosetests
 
 %clean
 rm -rf %{buildroot}
@@ -46,5 +46,8 @@
 %{python_sitelib}/*
 
 %changelog
+* Thu Sep 11 2008 Luke Macken <lmacken at redhat.com> - 1.0-1
+- Disable the unittests, as EL-4's doctest does not have the DocFileSuite
+
 * Sun Aug  3 2008 Luke Macken <lmacken at redhat.com> - 1.0-1
 - Initial package for Fedora



From lmacken at fedoraproject.org  Thu Sep 11 23:06:18 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 11 Sep 2008 23:06:18 +0000 (UTC)
Subject: rpms/python-peak-util-assembler/EL-4
	python-peak-util-assembler.spec, 1.1, 1.2
Message-ID: <20080911230618.8403270130@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-peak-util-assembler/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23278

Modified Files:
	python-peak-util-assembler.spec 
Log Message:
* Thu Sep 11 2008 Luke Macken <lmacken at redhat.com> - 0.5-1
- Disable the unittests, as EL-4's doctest does not have the DocFileSuite




Index: python-peak-util-assembler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-util-assembler/EL-4/python-peak-util-assembler.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-peak-util-assembler.spec	11 Sep 2008 08:37:09 -0000	1.1
+++ python-peak-util-assembler.spec	11 Sep 2008 23:05:48 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           python-peak-util-assembler
 Version:        0.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Generate Python code objects by "assembling" bytecode
 
 Group:          Development/Languages
@@ -16,7 +16,7 @@
 
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
-BuildRequires:  python-nose
+#BuildRequires:  python-nose
 
 Requires:       python-decoratortools >= 1.2
 Requires:       python-peak-util-symbols >= 1.0
@@ -44,8 +44,8 @@
 rm -rf %{buildroot}
 %{__python} setup.py install --skip-build --root %{buildroot}
 
-%check
-nosetests
+#%check
+#nosetests
 
 %clean
 rm -rf %{buildroot}
@@ -56,5 +56,8 @@
 %{python_sitelib}/*
 
 %changelog
+* Thu Sep 11 2008 Luke Macken <lmacken at redhat.com> - 0.5-1
+- Disable the unittests, as EL-4's doctest does not have the DocFileSuite
+
 * Sun Aug  3 2008 Luke Macken <lmacken at redhat.com> - 0.5-1
 - Initial package for Fedora



From ajax at fedoraproject.org  Thu Sep 11 23:08:12 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 11 Sep 2008 23:08:12 +0000 (UTC)
Subject: rpms/cdparanoia/devel import.log, NONE, 1.1 .cvsignore, 1.5,
	1.6 cdparanoia.spec, 1.34, 1.35 sources, 1.6,
	1.7 cdparanoia-III-10.0-headers.patch, 1.1,
	NONE cdparanoia-III-alpha9.8.O_EXCL.patch, 1.1,
	NONE cdparanoia-III-alpha9.8.cflags.patch, 1.1,
	NONE cdparanoia-III-alpha9.8.env.patch, 1.1,
	NONE cdparanoia-III-alpha9.8.labels.patch, 1.1,
	NONE cdparanoia-III-alpha9.8.lm.patch, 1.1,
	NONE cdparanoia-III-alpha9.8.louder.patch, 1.1,
	NONE cdparanoia-III-alpha9.8.nostrip.patch, 1.1,
	NONE cdparanoia-III-alpha9.8.scsi-setspeed.patch, 1.2,
	NONE cdparanoia-III-alpha9.8.sgio.patch, 1.1,
	NONE cdparanoia-III-alpha9.8.smalldma.patch, 1.1,
	NONE cdparanoia-III-alpha9.8.verbose.patch, 1.1,
	NONE cdparanoia-III-alpha9.8.verbosity3.patch, 1.1, NONE
Message-ID: <20080911230812.3CB8070130@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/cdparanoia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24212/devel

Modified Files:
	.cvsignore cdparanoia.spec sources 
Added Files:
	import.log 
Removed Files:
	cdparanoia-III-10.0-headers.patch 
	cdparanoia-III-alpha9.8.O_EXCL.patch 
	cdparanoia-III-alpha9.8.cflags.patch 
	cdparanoia-III-alpha9.8.env.patch 
	cdparanoia-III-alpha9.8.labels.patch 
	cdparanoia-III-alpha9.8.lm.patch 
	cdparanoia-III-alpha9.8.louder.patch 
	cdparanoia-III-alpha9.8.nostrip.patch 
	cdparanoia-III-alpha9.8.scsi-setspeed.patch 
	cdparanoia-III-alpha9.8.sgio.patch 
	cdparanoia-III-alpha9.8.smalldma.patch 
	cdparanoia-III-alpha9.8.verbose.patch 
	cdparanoia-III-alpha9.8.verbosity3.patch 
Log Message:
cdparanoia 10.2



--- NEW FILE import.log ---
cdparanoia-10_2-1_fc10:HEAD:cdparanoia-10.2-1.fc10.src.rpm:1221174408


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cdparanoia/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Aug 2008 14:24:59 -0000	1.5
+++ .cvsignore	11 Sep 2008 23:07:41 -0000	1.6
@@ -1 +1 @@
-cdparanoia-III-10.1.src.tgz
+cdparanoia-III-10.2.src.tgz


Index: cdparanoia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdparanoia/devel/cdparanoia.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cdparanoia.spec	13 Aug 2008 14:24:59 -0000	1.34
+++ cdparanoia.spec	11 Sep 2008 23:07:41 -0000	1.35
@@ -1,25 +1,12 @@
 %define ver	10
 
 Name: cdparanoia
-Version: 10.1
+Version: 10.2
 Release: 1%{?dist}
 # the app is GPLv2, everything else is LGPLv2
 License: GPLv2 and LGPLv2
 Group: Applications/Multimedia
 Source: http://downloads.xiph.org/releases/%{name}/%{name}-III-%{version}.src.tgz
-Patch0: cdparanoia-III-alpha9.8.nostrip.patch
-Patch1: cdparanoia-III-alpha9.8.labels.patch
-Patch2: cdparanoia-III-alpha9.8.O_EXCL.patch
-Patch3: cdparanoia-III-alpha9.8.cflags.patch
-Patch4: cdparanoia-III-alpha9.8.sgio.patch
-Patch5: cdparanoia-III-alpha9.8.verbose.patch
-Patch6: cdparanoia-III-alpha9.8.louder.patch
-Patch7: cdparanoia-III-alpha9.8.verbosity3.patch
-Patch8: cdparanoia-III-alpha9.8.env.patch
-Patch9: cdparanoia-III-alpha9.8.smalldma.patch
-Patch10: cdparanoia-III-alpha9.8.lm.patch
-Patch11: cdparanoia-III-alpha9.8.scsi-setspeed.patch
-Patch12: cdparanoia-III-10.0-headers.patch
 Url: http://www.xiph.org/paranoia/index.html
 BuildRoot: %{_tmppath}/cdparanoia-%{version}-root
 Requires: cdparanoia-libs = %{version}-%{release}
@@ -57,19 +44,6 @@
 
 %prep
 %setup -q -n %{name}-III-%{version}
-#patch4 -p1 -b .sgio
-#patch0 -p1 -b .nostrip
-#patch1 -p1 -b .labels
-#patch2 -p1 -b .O_EXCL
-#patch3 -p1 -b .cflags
-#patch5 -p1 -b .verbose
-#patch6 -p1 -b .louder
-#patch7 -p1 -b .verbosity3
-#patch8 -p1 -b .env
-#patch9 -p1 -b .smalldma
-#patch10 -p1 -b .lm
-%patch11 -p1 -b .setspeed
-%patch12 -p1 -b .headers
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -88,8 +62,8 @@
 install -m 0644 cdparanoia.1 $RPM_BUILD_ROOT%{_mandir}/man1/ 
 install -m 0644 utils.h paranoia/cdda_paranoia.h interface/cdda_interface.h \
 	$RPM_BUILD_ROOT%{_includedir}/cdda
-install -m 0755 paranoia/libcdda_paranoia.so.0.10.0 \
-	interface/libcdda_interface.so.0.10.0 \
+install -m 0755 paranoia/libcdda_paranoia.so.0.10.? \
+	interface/libcdda_interface.so.0.10.? \
 	$RPM_BUILD_ROOT%{_libdir}
 install -m 0755 paranoia/libcdda_paranoia.a interface/libcdda_interface.a \
 	$RPM_BUILD_ROOT%{_libdir}
@@ -97,8 +71,8 @@
 /sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir}
 
 pushd $RPM_BUILD_ROOT%{_libdir}
-ln -s libcdda_paranoia.so.0.10.0 libcdda_paranoia.so
-ln -s libcdda_interface.so.0.10.0 libcdda_interface.so
+ln -s libcdda_paranoia.so.0.10.? libcdda_paranoia.so
+ln -s libcdda_interface.so.0.10.? libcdda_interface.so
 popd
 
 %post -n cdparanoia-libs
@@ -128,6 +102,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Thu Sep 11 2008 Adam Jackson <ajax at redhat.com> 10.2-1
+- cdparanoia 10.2
+
 * Wed Aug 13 2008 Adam Jackson <ajax at redhat.com> 10.1-1
 - Update to 10.1, just changes the license back.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cdparanoia/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Aug 2008 14:24:59 -0000	1.6
+++ sources	11 Sep 2008 23:07:41 -0000	1.7
@@ -1 +1 @@
-abf410217c4ba42f927bfd9d7b86e163  cdparanoia-III-10.1.src.tgz
+b304bbe8ab63373924a744eac9ebc652  cdparanoia-III-10.2.src.tgz


--- cdparanoia-III-10.0-headers.patch DELETED ---


--- cdparanoia-III-alpha9.8.O_EXCL.patch DELETED ---


--- cdparanoia-III-alpha9.8.cflags.patch DELETED ---


--- cdparanoia-III-alpha9.8.env.patch DELETED ---


--- cdparanoia-III-alpha9.8.labels.patch DELETED ---


--- cdparanoia-III-alpha9.8.lm.patch DELETED ---


--- cdparanoia-III-alpha9.8.louder.patch DELETED ---


--- cdparanoia-III-alpha9.8.nostrip.patch DELETED ---


--- cdparanoia-III-alpha9.8.scsi-setspeed.patch DELETED ---


--- cdparanoia-III-alpha9.8.sgio.patch DELETED ---


--- cdparanoia-III-alpha9.8.smalldma.patch DELETED ---


--- cdparanoia-III-alpha9.8.verbose.patch DELETED ---


--- cdparanoia-III-alpha9.8.verbosity3.patch DELETED ---



From sgrubb at fedoraproject.org  Thu Sep 11 23:11:39 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Thu, 11 Sep 2008 23:11:39 +0000 (UTC)
Subject: rpms/audit/devel audit.spec,1.183,1.184
Message-ID: <20080911231139.1D6FA70130@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25398

Modified Files:
	audit.spec 
Log Message:
Don't do make check just yet



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- audit.spec	11 Sep 2008 22:51:16 -0000	1.183
+++ audit.spec	11 Sep 2008 23:11:08 -0000	1.184
@@ -168,8 +168,8 @@
 	--delete-original				\
 	system-config-audit/system-config-audit.desktop
 
-%check
-make check
+#% check
+#make check
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From pfj at fedoraproject.org  Thu Sep 11 23:32:34 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Thu, 11 Sep 2008 23:32:34 +0000 (UTC)
Subject: rpms/monodevelop/F-9 import.log, 1.1,
	1.2 monodevelop-0.19-use-system-Mono.Cecil.patch, 1.2,
	1.3 monodevelop-1.0.spec, 1.1, 1.2
Message-ID: <20080911233234.9E9A670130@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/monodevelop/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30720/F-9

Modified Files:
	import.log monodevelop-0.19-use-system-Mono.Cecil.patch 
	monodevelop-1.0.spec 
Log Message:

Rebuild 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Sep 2008 19:50:52 -0000	1.1
+++ import.log	11 Sep 2008 23:32:04 -0000	1.2
@@ -1 +1,2 @@
 monodevelop-1_0-6_fc10:F-9:monodevelop-1.0-6.fc10.src.rpm:1221076216
+monodevelop-1_0-6_1_fc10:F-9:monodevelop-1.0-6.1.fc10.src.rpm:1221175889

monodevelop-0.19-use-system-Mono.Cecil.patch:

Index: monodevelop-0.19-use-system-Mono.Cecil.patch
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/F-9/monodevelop-0.19-use-system-Mono.Cecil.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- monodevelop-0.19-use-system-Mono.Cecil.patch	10 Sep 2008 19:50:52 -0000	1.2
+++ monodevelop-0.19-use-system-Mono.Cecil.patch	11 Sep 2008 23:32:04 -0000	1.3
@@ -1,7 +1,58 @@
-diff -uraN monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/lib/Makefile.am monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/Makefile.am
---- monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/lib/Makefile.am	2008-06-30 19:33:45.000000000 +0200
-+++ monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/Makefile.am	2008-08-08 03:51:37.819238210 +0200
-@@ -58,7 +58,7 @@
+diff -up monodevelop-0.19/configure.use-system-Mono.Cecil monodevelop-0.19/configure
+--- monodevelop-0.19/configure.use-system-Mono.Cecil	2008-04-11 14:11:37.000000000 -0400
++++ monodevelop-0.19/configure	2008-04-11 14:11:41.000000000 -0400
+@@ -4742,7 +4742,7 @@ echo "$as_me: error: You must enable one
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-ac_config_files="$ac_config_files build/data/Makefile build/data/resources/css/Makefile build/data/resources/Makefile build/Makefile contrib/Makefile contrib/Mono.Cecil/Makefile src/Makefile src/core/Makefile src/core/NRefactory/Makefile src/core/MonoDevelop.Core/AssemblyInfo.cs src/core/MonoDevelop.Core/Makefile src/core/MonoDevelop.Core.Gui/AssemblyInfo.cs src/core/MonoDevelop.Core.Gui/Makefile src/core/MonoDevelop.Projects/AssemblyInfo.cs src/core/MonoDevelop.Projects/MonoDevelop.Projects.dll.config src/core/MonoDevelop.Projects/Makefile src/core/MonoDevelop.Projects.Gui/AssemblyInfo.cs src/core/MonoDevelop.Projects.Gui/Makefile src/core/MonoDevelop.Documentation/AssemblyInfo.cs src/core/MonoDevelop.Documentation/Makefile src/core/MonoDevelop.Ide/AssemblyInfo.cs src/core/MonoDevelop.Ide/Makefile src/core/MonoDevelop.Dock/Makefile src/core/MonoDevelop.Components/AssemblyInfo.cs src/core/MonoDevelop.Components/Makefile src/core/MonoDevelop.Startup/AssemblyInfo.cs src/core/
 MonoDevelop.Startup/Makefile src/tools/Makefile src/tools/mdhost/Makefile src/tools/mdrun/Makefile src/tools/SharpCoco/Makefile src/addins/Makefile src/addins/MonoDeveloperExtensions/Makefile src/addins/MonoDeveloperExtensions/NUnit/Makefile src/addins/NUnit/Makefile src/addins/VersionControl/Diff/Makefile src/addins/VersionControl/DiffWidget/Makefile src/addins/VersionControl/MonoDevelop.VersionControl/Makefile src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile src/addins/VersionControl/Makefile src/addins/CSharpBinding/Makefile src/addins/CSharpBinding/Autotools/Makefile src/addins/ILAsmBinding/Makefile src/addins/VBNetBinding/Makefile src/addins/MonoDevelop.SourceEditor/AssemblyInfo.cs src/addins/MonoDevelop.SourceEditor/Makefile src/addins/prj2make-sharp-lib/AssemblyInfo.cs src/addins/prj2make-sharp-lib/Makefile src/addins/WelcomePage/Makefile src/addins/ChangeLogAddIn/Makefile src/addins/MonoDevelop.GtkCore/Makefile src/addins/MonoDevelop.GtkCore/l
 ib/Makefile src/addins/AspNetAddIn/Makefile src/addins/MonoDevelop.Autotools/Makefile src/addins/MonoDevelop.DesignerSupport/Makefile src/addins/MonoDevelop.WebReferences/Makefile src/addins/Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile src/addins/MonoDevelop.Gettext/Makefile src/addins/MonoDevelop.RegexToolkit/Makefile src/addins/CBinding/Makefile src/addins/SourceEditor2/AssemblyInfo.cs src/addins/SourceEditor2/Makefile src/addins/GnomePlatform/Makefile src/addins/MacPlatform/Makefile Makefile monodevelop mdtool monodevelop.pc monodevelop-core-addins.pc po/Makefile man/Makefile theme-icons/Makefile"
++ac_config_files="$ac_config_files build/data/Makefile build/data/resources/css/Makefile build/data/resources/Makefile build/Makefile src/Makefile src/core/Makefile src/core/NRefactory/Makefile src/core/MonoDevelop.Core/AssemblyInfo.cs src/core/MonoDevelop.Core/Makefile src/core/MonoDevelop.Core.Gui/AssemblyInfo.cs src/core/MonoDevelop.Core.Gui/Makefile src/core/MonoDevelop.Projects/AssemblyInfo.cs src/core/MonoDevelop.Projects/MonoDevelop.Projects.dll.config src/core/MonoDevelop.Projects/Makefile src/core/MonoDevelop.Projects.Gui/AssemblyInfo.cs src/core/MonoDevelop.Projects.Gui/Makefile src/core/MonoDevelop.Documentation/AssemblyInfo.cs src/core/MonoDevelop.Documentation/Makefile src/core/MonoDevelop.Ide/AssemblyInfo.cs src/core/MonoDevelop.Ide/Makefile src/core/MonoDevelop.Dock/Makefile src/core/MonoDevelop.Components/AssemblyInfo.cs src/core/MonoDevelop.Components/Makefile src/core/MonoDevelop.Startup/AssemblyInfo.cs src/core/MonoDevelop.Startup/Makefile src/tools/Makefi
 le src/tools/mdhost/Makefile src/tools/mdrun/Makefile src/tools/SharpCoco/Makefile src/addins/Makefile src/addins/MonoDeveloperExtensions/Makefile src/addins/MonoDeveloperExtensions/NUnit/Makefile src/addins/NUnit/Makefile src/addins/VersionControl/Diff/Makefile src/addins/VersionControl/DiffWidget/Makefile src/addins/VersionControl/MonoDevelop.VersionControl/Makefile src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile src/addins/VersionControl/Makefile src/addins/CSharpBinding/Makefile src/addins/CSharpBinding/Autotools/Makefile src/addins/ILAsmBinding/Makefile src/addins/VBNetBinding/Makefile src/addins/MonoDevelop.SourceEditor/AssemblyInfo.cs src/addins/MonoDevelop.SourceEditor/Makefile src/addins/prj2make-sharp-lib/AssemblyInfo.cs src/addins/prj2make-sharp-lib/Makefile src/addins/WelcomePage/Makefile src/addins/ChangeLogAddIn/Makefile src/addins/MonoDevelop.GtkCore/Makefile src/addins/MonoDevelop.GtkCore/lib/Makefile src/addins/AspNetAddIn/Makefile s
 rc/addins/MonoDevelop.Autotools/Makefile src/addins/MonoDevelop.DesignerSupport/Makefile src/addins/MonoDevelop.WebReferences/Makefile src/addins/Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile src/addins/MonoDevelop.Gettext/Makefile src/addins/MonoDevelop.RegexToolkit/Makefile src/addins/CBinding/Makefile src/addins/SourceEditor2/AssemblyInfo.cs src/addins/SourceEditor2/Makefile src/addins/GnomePlatform/Makefile src/addins/MacPlatform/Makefile Makefile monodevelop mdtool monodevelop.pc monodevelop-core-addins.pc po/Makefile man/Makefile theme-icons/Makefile"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -5415,8 +5415,6 @@ do
+     "build/data/resources/css/Makefile") CONFIG_FILES="$CONFIG_FILES build/data/resources/css/Makefile" ;;
+     "build/data/resources/Makefile") CONFIG_FILES="$CONFIG_FILES build/data/resources/Makefile" ;;
+     "build/Makefile") CONFIG_FILES="$CONFIG_FILES build/Makefile" ;;
+-    "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
+-    "contrib/Mono.Cecil/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Mono.Cecil/Makefile" ;;
+     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+     "src/core/Makefile") CONFIG_FILES="$CONFIG_FILES src/core/Makefile" ;;
+     "src/core/NRefactory/Makefile") CONFIG_FILES="$CONFIG_FILES src/core/NRefactory/Makefile" ;;
+diff -up monodevelop-0.19/Makefile.am.use-system-Mono.Cecil monodevelop-0.19/Makefile.am
+--- monodevelop-0.19/Makefile.am.use-system-Mono.Cecil	2008-04-11 14:11:33.000000000 -0400
++++ monodevelop-0.19/Makefile.am	2008-04-11 14:11:41.000000000 -0400
+@@ -1,4 +1,4 @@
+-SUBDIRS = contrib src build po man theme-icons
++SUBDIRS = src build po man theme-icons
+ 
+ bin_SCRIPTS = monodevelop mdtool
+ 
+diff -up monodevelop-0.19/Makefile.in.use-system-Mono.Cecil monodevelop-0.19/Makefile.in
+--- monodevelop-0.19/Makefile.in.use-system-Mono.Cecil	2008-04-11 14:11:41.000000000 -0400
++++ monodevelop-0.19/Makefile.in	2008-04-11 14:11:41.000000000 -0400
+@@ -206,7 +206,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = contrib src build po man theme-icons
++SUBDIRS = src build po man theme-icons
+ bin_SCRIPTS = monodevelop mdtool
+ desktopdir = $(datadir)/applications
+ desktop_DATA = monodevelop.desktop
+diff -up monodevelop-0.19/monodevelop.pc.in.use-system-Mono.Cecil monodevelop-0.19/monodevelop.pc.in
+--- monodevelop-0.19/monodevelop.pc.in.use-system-Mono.Cecil	2008-04-11 14:11:33.000000000 -0400
++++ monodevelop-0.19/monodevelop.pc.in	2008-04-11 14:11:41.000000000 -0400
+@@ -5,4 +5,4 @@ libdir=@libdir@/monodevelop
+ Name: MonoDevelop
+ Description: Free .NET Development Environment
+ Version: @VERSION@
+-Libs: -r:${libdir}/bin/MonoDevelop.Core.dll -r:${libdir}/bin/MonoDevelop.Core.Gui.dll -r:${libdir}/bin/MonoDevelop.Projects.dll -r:${libdir}/bin/MonoDevelop.Projects.Gui.dll -r:${libdir}/bin/MonoDevelop.Ide.dll -r:${libdir}/bin/MonoDevelop.Components.dll -r:${libdir}/bin/NRefactory.dll -r:${libdir}/bin/Mono.Cecil.dll
++Libs: -r:${libdir}/bin/MonoDevelop.Core.dll -r:${libdir}/bin/MonoDevelop.Core.Gui.dll -r:${libdir}/bin/MonoDevelop.Projects.dll -r:${libdir}/bin/MonoDevelop.Projects.Gui.dll -r:${libdir}/bin/MonoDevelop.Ide.dll -r:${libdir}/bin/MonoDevelop.Components.dll -r:${libdir}/bin/NRefactory.dll
+diff -up monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.am.use-system-Mono.Cecil monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.am
+--- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.am.use-system-Mono.Cecil	2008-04-11 14:14:35.000000000 -0400
++++ monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.am	2008-04-11 14:14:49.000000000 -0400
+@@ -58,7 +58,7 @@ libsteticui_REFERENCES  =  \
  	-pkg:gnome-sharp-2.0 \
  	-pkg:gtk-sharp-2.0 \
  	-r:$(libstetic) \
@@ -10,10 +61,10 @@
  	-r:Mono.Posix \
  	-r:System.Runtime.Remoting \
  	-r:System.Xml
-diff -uraN monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/lib/Makefile.in monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/Makefile.in
---- monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/lib/Makefile.in	2008-07-01 01:33:58.000000000 +0200
-+++ monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/Makefile.in	2008-08-08 03:51:37.823239248 +0200
-@@ -210,7 +210,7 @@
+diff -up monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.in.use-system-Mono.Cecil monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.in
+--- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.in.use-system-Mono.Cecil	2008-04-11 14:14:04.000000000 -0400
++++ monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.in	2008-04-11 14:14:20.000000000 -0400
+@@ -209,7 +209,7 @@ libsteticui_REFERENCES = \
  	-pkg:gnome-sharp-2.0 \
  	-pkg:gtk-sharp-2.0 \
  	-r:$(libstetic) \
@@ -22,10 +73,10 @@
  	-r:Mono.Posix \
  	-r:System.Runtime.Remoting \
  	-r:System.Xml
-diff -uraN monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am
---- monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am	2008-06-30 19:33:38.000000000 +0200
-+++ monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am	2008-08-08 03:51:37.826239119 +0200
-@@ -5,7 +5,6 @@
+diff -up monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am.use-system-Mono.Cecil monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am
+--- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am.use-system-Mono.Cecil	2008-04-11 14:12:49.000000000 -0400
++++ monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am	2008-04-11 14:13:42.000000000 -0400
+@@ -5,7 +5,6 @@ ASSEMBLY = $(ASSEMBLY_DIR)/libsteticui.d
  ASSEMBLY_FILES = \
  	$(ASSEMBLY) \
  	$(ASSEMBLY_DIR)/libsteticui.dll.mdb \
@@ -33,7 +84,7 @@
  	$(DATA_FILE_BUILD)
  	
  pkglib_DATA = $(ASSEMBLY_FILES)
-@@ -86,7 +85,7 @@
+@@ -86,7 +85,7 @@ libsteticui_dll_references =  \
  	-pkg:gnome-sharp-2.0 \
  	-pkg:gtk-sharp-2.0 \
  	-r:$(top_builddir)/bin/libstetic.dll \
@@ -42,7 +93,7 @@
  	-r:Mono.Posix \
  	-r:System.Runtime.Remoting \
  	-r:System.Xml
-@@ -94,7 +93,7 @@
+@@ -94,7 +93,7 @@ libsteticui_dll_references =  \
  libsteticui_dll_datafiles = libsteticui.dll.config
  
  
@@ -51,7 +102,7 @@
  	
  RESOURCE_FILES = $(addprefix $(srcdir)/, $(libsteticui_dll_resources))
  DATA_FILES = $(addprefix $(srcdir)/, $(libsteticui_dll_datafiles))
-@@ -111,17 +110,9 @@
+@@ -111,17 +110,9 @@ $(DATA_FILE_BUILD): $(srcdir)/$(notdir $
  	mkdir -p $(ASSEMBLY_DIR)
  	cp $(srcdir)/$(subst $(ASSEMBLY_DIR),$(srcdir),$@) $(ASSEMBLY_DIR)/.
  
@@ -70,10 +121,10 @@
 -	$(DATA_FILES) \
 -	$(srcdir)/lib/$(CECIL)
 +	$(DATA_FILES)
-diff -uraN monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/Makefile.am monodevelop-1.9/src/addins/MonoDevelop.GtkCore/Makefile.am
---- monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/Makefile.am	2008-06-30 19:33:45.000000000 +0200
-+++ monodevelop-1.9/src/addins/MonoDevelop.GtkCore/Makefile.am	2008-08-08 03:51:37.829240107 +0200
-@@ -16,7 +16,7 @@
+diff -up monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.am.use-system-Mono.Cecil monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.am
+--- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.am.use-system-Mono.Cecil	2008-04-11 14:15:11.000000000 -0400
++++ monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.am	2008-04-11 14:15:32.000000000 -0400
+@@ -16,7 +16,7 @@ REFS =  \
  	-r:$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
  	-r:$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libstetic.dll \
  	-r:$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libsteticui.dll \
@@ -82,10 +133,10 @@
  	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
  	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
  	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
-diff -uraN monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/Makefile.in monodevelop-1.9/src/addins/MonoDevelop.GtkCore/Makefile.in
---- monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/Makefile.in	2008-07-01 01:33:58.000000000 +0200
-+++ monodevelop-1.9/src/addins/MonoDevelop.GtkCore/Makefile.in	2008-08-08 03:51:37.836240737 +0200
-@@ -199,7 +199,7 @@
+diff -up monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.in.use-system-Mono.Cecil monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.in
+--- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.in.use-system-Mono.Cecil	2008-04-11 14:11:39.000000000 -0400
++++ monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.in	2008-04-11 14:11:41.000000000 -0400
+@@ -198,7 +198,7 @@ REFS = \
  	-r:$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
  	-r:$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libstetic.dll \
  	-r:$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libsteticui.dll \
@@ -94,10 +145,10 @@
  	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
  	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
  	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
-diff -uraN monodevelop-1.9.orig/src/core/MonoDevelop.Projects/Makefile.am monodevelop-1.9/src/core/MonoDevelop.Projects/Makefile.am
---- monodevelop-1.9.orig/src/core/MonoDevelop.Projects/Makefile.am	2008-06-30 19:34:45.000000000 +0200
-+++ monodevelop-1.9/src/core/MonoDevelop.Projects/Makefile.am	2008-08-08 03:51:37.840238703 +0200
-@@ -6,8 +6,8 @@
+diff -up monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.am.use-system-Mono.Cecil monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.am
+--- monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.am.use-system-Mono.Cecil	2008-04-11 14:16:34.000000000 -0400
++++ monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.am	2008-04-11 14:16:55.000000000 -0400
+@@ -6,8 +6,8 @@ CONFIG = MonoDevelop.Projects.dll.config
  REFS =  \
  	$(MONO_ADDINS_LIBS) \
  	$(MONODOC_LIBS) \
@@ -108,10 +159,10 @@
  	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
  	-r:Mono.Posix \
  	-r:System \
-diff -uraN monodevelop-1.9.orig/src/core/MonoDevelop.Projects/Makefile.in monodevelop-1.9/src/core/MonoDevelop.Projects/Makefile.in
---- monodevelop-1.9.orig/src/core/MonoDevelop.Projects/Makefile.in	2008-07-01 01:33:59.000000000 +0200
-+++ monodevelop-1.9/src/core/MonoDevelop.Projects/Makefile.in	2008-08-08 03:51:37.845238115 +0200
-@@ -181,8 +181,8 @@
+diff -up monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.in.use-system-Mono.Cecil monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.in
+--- monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.in.use-system-Mono.Cecil	2008-04-11 14:16:02.000000000 -0400
++++ monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.in	2008-04-11 14:16:27.000000000 -0400
+@@ -180,8 +180,8 @@ CONFIG = MonoDevelop.Projects.dll.config
  REFS = \
  	$(MONO_ADDINS_LIBS) \
  	$(MONODOC_LIBS) \


Index: monodevelop-1.0.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/F-9/monodevelop-1.0.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monodevelop-1.0.spec	10 Sep 2008 19:50:52 -0000	1.1
+++ monodevelop-1.0.spec	11 Sep 2008 23:32:04 -0000	1.2
@@ -5,113 +5,98 @@
 %define cecilmdbver %(gacutil -l Mono.Cecil.Mdb |grep Mono.Cecil.Mdb | cut -d "=" -f 2 | cut -d "," -f 1)
 %define cecilmdbtoken %(gacutil -l Mono.Cecil.Mdb |grep Mono.Cecil.Mdb | cut -d "=" -f 4)
 
-#%(gacutil -l nunit.core | tail -n 2 | grep nunit.core | cut -d "=" -f 2 | cut -d "," -f 1)
-%define nunitver 2.2.10.0
+Summary: A full-featured IDE for Mono and Gtk sharp
+Name: monodevelop
+Version: 1.0
+Release: 6.1%{?dist}
+License: GPLv2+
+Group: Development/Tools
+Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.bz2
+URL: http://www.monodevelop.com/
+Patch0: monodevelop-1.9-libdir.patch
+Patch2: monodevelop-0.19-use-system-Mono.Cecil.patch
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: mono-devel, gtk-sharp2-devel, intltool, gettext-devel, bytefx-data-mysql, mono-data-postgresql, mono-data-oracle, mono-data-sqlite, mono-data-sybase, gtk-sharp2-gapi, shared-mime-info, pkgconfig, gtksourceview-sharp-devel, monodoc-devel, subversion-devel desktop-file-utils,boo-devel
+BuildRequires: gecko-sharp2-devel gtk-sharp2-devel gnome-sharp-devel mono-core
+BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit22-devel mono-nunit mono-basic-devel gtksourceview-sharp-devel mono-tools-devel
+%ifarch !ppc
+BuildRequires: boo-devel
+Requires: boo
+%endif
+%if 0%{?fedora} > 8
+BuildRequires: mono-addins-devel
+Requires: mono-addins
+%endif
+Requires: mono-core, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr, gtk-sharp2-gapi, gnome-sharp, firefox > 1.99, xsp, subversion, mono-data-sqlite
+Requires: mono-tools
+# ikvm doesn't build from source at the moment. If it does at some point in the future, uncomment this line.
+# Requires: ikvm
 
-Summary:        A full-featured IDE for mono
-Name:           monodevelop
-Version:        1.0
-Release:        6%{?dist}
-
-Group:          Development/Tools
-License:        GPLv2+
-URL:            http://monodevelop.com/
-Source0:        http://go-mono.com/sources/monodevelop/monodevelop-%{version}.tar.bz2
-Patch0:         monodevelop-1.9-libdir.patch
-Patch1:		monodevelop-0.19-use-system-Mono.Cecil.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  mono-devel mono-addins-devel gtk-sharp2-devel monodoc-devel
-BuildRequires:  gnome-sharp-devel gnome-desktop-sharp-devel mono-nunit-devel
-# for the NUnit add-in
-BuildRequires:  mono-nunit22 gtksourceview-sharp-devel
-BuildRequires:  autoconf desktop-file-utils intltool
-Requires:	mono-addins
-Requires:       mono-basic
-# Using system nunit, but dependency not automatically picked up by RPM
-Requires:	mono(nunit.core) = 2.2.10.0
-Requires:	mono(nunit.framework) = 2.2.10.0
-Requires:       monodoc
-Requires:       subversion
-Requires:       hicolor-icon-theme shared-mime-info
-
-# ppc* not supported: needs mono-nunit which needs nant
-ExclusiveArch:  %ix86 x86_64 ia64 armv4l sparc alpha
+# Sorry ppc/ppc64. No mono-nunit22 (because of no nant) means no monodevelop.
+excludearch: ppc64 ppc
 
 %description
-This package provides MonoDevelop, a full-featured IDE for Mono with
-syntax colouring, code completion, debugging, project management and
-support for C sharp, Visual Basic.NET, Java, Boo, Nemerle and MSIL.
-
-
-%package        devel
-Summary:	Development files for monodevelop
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	pkgconfig
+This package provides MonoDevelop, a full-featured IDE for Mono
+with syntax colouring, code completion, debugging, project 
+management and support for C sharp, Visual Basic.NET, Java, Boo,
+Nemerle and MSIL.
+
+%package devel
+Summary: Development files for monodevelop
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release} pkgconfig
  
 %description devel
-Development files for %{name}.
-
+Development files for monodevelop
 
 %prep
-%setup -q
-%patch0 -p1 -b .libdir
-%patch1 -p1 -b .use-system-cecil
-autoreconf
-
-# Here is where we replace the LONGCECILSTRING and LONGCECILMDBSTRING
-# placeholders with the actual values for the Mono.Cecil and Mono.Cecil.Mdb
-# ver__token
-cd src
-for i in \
-    addins/MonoDevelop.GtkCore/Makefile.{am,in} \
-    addins/MonoDevelop.GtkCore/lib/Makefile.{am,in} \
-    addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am \
-    addins/MonoDevelop.DesignerSupport/Makefile.{am,in} \
-    core/MonoDevelop.Projects/Makefile.{am,in} \
-; do
-  sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' "$i"
-done
-
-for i in core/MonoDevelop.Projects/Makefile.{am,in};
-do
-  sed -i 's|LONGCECILMDBSTRING|%{cecilmdbver}__%{cecilmdbtoken}|g' "$i"
-done
-
-sed -i addins/NUnit/MonoDevelopNUnit.addin.xml -e 's|LIBDIR|%{_libdir}|'
-
+%setup -q 
+%patch0 -p1 -b .orig
+autoreconf -f -i -s
+%patch2 -p1 -b .use-system-Mono.Cecil
+# Here is where we replace the LONGCECILSTRING LONGCECILMDBSTRING placeholders with the actual
+# values for the Mono.Cecil and Mono.Cecil.Mdb ver__token
+sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.GtkCore/lib/Makefile.am
+sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.GtkCore/lib/Makefile.in
+sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am
+sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.GtkCore/Makefile.am
+sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.GtkCore/Makefile.in
+sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/core/MonoDevelop.Projects/Makefile.am
+sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/core/MonoDevelop.Projects/Makefile.in
+sed -i 's|LONGCECILMDBSTRING|%{cecilmdbver}__%{cecilmdbtoken}|g' src/core/MonoDevelop.Projects/Makefile.am
+sed -i 's|LONGCECILMDBSTRING|%{cecilmdbver}__%{cecilmdbtoken}|g' src/core/MonoDevelop.Projects/Makefile.in
+#delete prebuilt nunit
+rm -rf src/addins/NUnit/lib/*
+# Now, copy our built from source nunit. We'd really prefer it just used the system nunit bits
+# but monodevelop is really stubborn.
+cp %{_libdir}/mono/nunit22/nunit.core.dll src/addins/NUnit/lib/
+cp %{_libdir}/mono/nunit22/nunit.framework.dll src/addins/NUnit/lib/
 
 %build
-%configure --disable-update-mimedb \
-           --disable-update-desktopdb \
-           --enable-gtksourceview2 --enable-tests
-
-# Not parallel-buildable
-#make %{?_smp_mflags}
+%configure --enable-boo --enable-java --enable-nemerle --enable-versioncontrol --prefix=%{_prefix} --libdir=%{_libdir} --enable-gnomeplatform --enable-c --enable-gtksourceview2 
 make
-
-
-%check
-make check
-
+# no smp flags as it falls over during the build (race condition)
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT \
-     GACUTIL_FLAGS="/package monodevelop /root ${RPM_BUILD_ROOT}%{_libdir}"
-
-desktop-file-install \
-                     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-                     --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/monodevelop.desktop
-
+%{__rm} -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 %find_lang %{name}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+desktop-file-install --vendor fedora \
+        --dir %{buildroot}%{_datadir}/applications \
+        --add-category X-Fedora \
+        --delete-original \
+        %{buildroot}%{_datadir}/applications/monodevelop.desktop
+
+#remove package mime caches
+%{__rm} -f %{buildroot}%{_datadir}/mime/XMLnamespaces
+%{__rm} -f %{buildroot}%{_datadir}/mime/aliases
+%{__rm} -f %{buildroot}%{_datadir}/mime/application/*
+%{__rm} -f %{buildroot}%{_datadir}/mime/text/*
+%{__rm} -f %{buildroot}%{_datadir}/mime/globs
+%{__rm} -f %{buildroot}%{_datadir}/mime/magic
+%{__rm} -f %{buildroot}%{_datadir}/mime/subclasses
+%{__rm} -f %{buildroot}%{_datadir}/mime/mime.cache
+%{__rm} -f %{buildroot}%{_datadir}/applications/mimeinfo.cache
 
 %post
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -121,46 +106,33 @@
 update-mime-database %{_datadir}/mime &> /dev/null || :
 update-desktop-database &> /dev/null || :
 
-
 %files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-%{_bindir}/m*
-%{_libdir}/monodevelop
-%{_mandir}/man1/m*
-%{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/
+%defattr (-,root,root,-)
+%{_bindir}/mdtool
+%{_bindir}/monodevelop
+%doc AUTHORS COPYING ChangeLog README
+%{_libdir}/monodevelop/
 %{_datadir}/mime/packages/monodevelop.xml
+%{_datadir}/applications/fedora-monodevelop.desktop
+%{_datadir}/man/man1/mdtool.1.gz
+%{_datadir}/man/man1/monodevelop.1.gz
+%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_datadir}/icons/hicolor/22x22/apps/%{name}.png
+%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/monodevelop*.pc
-
+%{_libdir}/pkgconfig/monodevelop*
 
+%clean
+%{__rm} -rf %{buildroot}
 
 %changelog
-* Mon Sep 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-6
-- added BR xulrunner-unstable-devel for libgtkmozembed
-
-* Mon Aug 25 2008 Michel Salim <salimma at fedoraproject.org> - 1.9-5
-- Use system-provided nunit
-
-* Sat Aug 23 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 1.9-4
-- Clean up build dependencies: database support now a separate package
-- Clean up spec file and patches
-
-* Fri Aug 08 2008 David Nielsen <gnomeuser at gmail.com> - 1.9-3
-- rebase configure patch for fuzz
-- file list fix up
-
-* Thu Jul 10 2008 David Nielsen <gnomeuser at gmail.com> 1.9-2
-- numerical compare for fedora version test, fixes compile on f10
-
-* Mon Jul 07 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-1
-- bump to latest beta for md2
-- fixes to patch files for mono.cecil
-- fix the archs to be mono package happy
-- spec file fixes
+* Fri Sep 12 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-6.1
+- rebuild
 
 * Tue May 06 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-6
 - added br mono-tools



From hadess at fedoraproject.org  Thu Sep 11 23:48:43 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 23:48:43 +0000 (UTC)
Subject: rpms/gstreamer/devel gstreamer-inspect-rpm-format.patch, 1.1,
	1.2 gstreamer.prov, 1.1, 1.2 gstreamer.spec, 1.84, 1.85
Message-ID: <20080911234843.1032170130@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32196

Modified Files:
	gstreamer-inspect-rpm-format.patch gstreamer.prov 
	gstreamer.spec 
Log Message:
* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-5
- Update rpm provides script and patch to:
  - filter out errors
  - only run gst-inspect on gstreamer plugins
  - print out protocol handlers provides correctly


gstreamer-inspect-rpm-format.patch:

Index: gstreamer-inspect-rpm-format.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer-inspect-rpm-format.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gstreamer-inspect-rpm-format.patch	25 Mar 2008 10:48:18 -0000	1.1
+++ gstreamer-inspect-rpm-format.patch	11 Sep 2008 23:48:12 -0000	1.2
@@ -1,11 +1,11 @@
 Index: gst-inspect.c
 ===================================================================
 RCS file: /cvs/gstreamer/gstreamer/tools/gst-inspect.c,v
-retrieving revision 1.137
-diff -u -p -u -p -r1.137 gst-inspect.c
---- gst-inspect.c	29 Feb 2008 12:41:32 -0000	1.137
-+++ gst-inspect.c	17 Mar 2008 18:56:00 -0000
-@@ -1168,9 +1168,219 @@ print_element_info (GstElementFactory * 
+retrieving revision 1.142
+diff -u -p -r1.142 gst-inspect.c
+--- gst-inspect.c	31 Jul 2008 15:20:31 -0000	1.142
++++ gst-inspect.c	11 Sep 2008 23:47:16 -0000
+@@ -1188,9 +1188,219 @@ print_element_info (GstElementFactory * 
    return 0;
  }
  
@@ -226,7 +226,7 @@
  {
    GstPadDirection direction;
    const gchar *type_name;
-@@ -1231,15 +1441,19 @@ print_plugin_automatic_install_info_code
+@@ -1251,15 +1461,19 @@ print_plugin_automatic_install_info_code
      gst_structure_remove_field (s, "rate");
      gst_structure_remove_field (s, "depth");
      gst_structure_remove_field (s, "clock-rate");
@@ -250,7 +250,27 @@
  {
    gchar **protocols, **p;
  
-@@ -1262,7 +1476,7 @@ print_plugin_automatic_install_info_prot
+@@ -1268,11 +1482,17 @@ print_plugin_automatic_install_info_prot
+     switch (gst_element_factory_get_uri_type (factory)) {
+       case GST_URI_SINK:
+         for (p = protocols; *p != NULL; ++p)
+-          g_print ("urisink-%s\n", *p);
++          if (!rpm_format)
++            g_print ("urisink-%s\n", *p);
++          else
++            g_print ("gstreamer0.10(urisink-%s)\n", *p);
+         break;
+       case GST_URI_SRC:
+         for (p = protocols; *p != NULL; ++p)
+-          g_print ("urisource-%s\n", *p);
++          if (!rpm_format)
++            g_print ("urisource-%s\n", *p);
++          else
++            g_print ("gstreamer0.10(urisource-%s)\n", *p);
+         break;
+       default:
+         break;
+@@ -1282,7 +1502,7 @@ print_plugin_automatic_install_info_prot
  }
  
  static void
@@ -259,7 +279,7 @@
  {
    const gchar *plugin_name;
    GList *features, *l;
-@@ -1282,11 +1496,12 @@ print_plugin_automatic_install_info (Gst
+@@ -1302,11 +1522,12 @@ print_plugin_automatic_install_info (Gst
      if (g_str_equal (plugin_name, feature->plugin_name)) {
        GstElementFactory *factory;
  
@@ -275,7 +295,7 @@
      }
    }
  
-@@ -1299,6 +1514,7 @@ main (int argc, char *argv[])
+@@ -1319,6 +1540,7 @@ main (int argc, char *argv[])
  {
    gboolean print_all = FALSE;
    gboolean print_aii = FALSE;
@@ -283,7 +303,7 @@
    GOptionEntry options[] = {
      {"print-all", 'a', 0, G_OPTION_ARG_NONE, &print_all,
          N_("Print all elements"), NULL},
-@@ -1307,6 +1523,9 @@ main (int argc, char *argv[])
+@@ -1327,6 +1549,9 @@ main (int argc, char *argv[])
                "provides.\n                                       "
                "Useful in connection with external automatic plugin "
                "installation mechanisms"), NULL},
@@ -293,7 +313,7 @@
      GST_TOOLS_GOPTION_VERSION,
      {NULL}
    };
-@@ -1364,7 +1583,7 @@ main (int argc, char *argv[])
+@@ -1384,7 +1609,7 @@ main (int argc, char *argv[])
        /* if there is such a plugin, print out info */
        if (plugin) {
          if (print_aii) {
@@ -302,7 +322,7 @@
          } else {
            print_plugin_info (plugin);
            print_plugin_features (plugin);
-@@ -1377,7 +1596,7 @@ main (int argc, char *argv[])
+@@ -1397,13 +1622,16 @@ main (int argc, char *argv[])
  
            if (plugin) {
              if (print_aii) {
@@ -311,3 +331,13 @@
              } else {
                print_plugin_info (plugin);
                print_plugin_features (plugin);
+             }
+           } else {
+-            g_print (_("Could not load plugin file: %s\n"), error->message);
++            if (!print_aii_rpm)
++              g_print (_("Could not load plugin file: %s\n"), error->message);
++	    else
++              g_printerr (_("Could not load plugin file: %s\n"), error->message);
+             g_error_free (error);
+             return -1;
+           }


Index: gstreamer.prov
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer.prov,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gstreamer.prov	25 Mar 2008 10:48:18 -0000	1.1
+++ gstreamer.prov	11 Sep 2008 23:48:12 -0000	1.2
@@ -9,7 +9,7 @@
 # Based on other provides scripts from RPM
 #
 
-filelist=`sed "s/['\"]/\\\&/g"`
+filelist=`grep -e '.so$' | sed "s/['\"]/\\\&/g"`
 
 # --- Alpha does not mark 64bit dependencies???
 case `uname -m` in
@@ -17,7 +17,7 @@
   *)		mark64="()(64bit)" ;;
 esac
 
-solist=$(echo $filelist | grep "\\.so" | grep -v "^/lib/ld.so" | \
+solist=$(echo $filelist | grep -v "^/lib/ld.so" | \
 	xargs file -L 2>/dev/null | grep "ELF.*shared object" | cut -d: -f1 | grep libgst)
 
 function getmark()
@@ -28,7 +28,7 @@
 
 for so in $solist ; do
 	getmark $so
-	gst-inspect --print-plugin-auto-install-info --rpm $so | while read line ; do
+	gst-inspect --print-plugin-auto-install-info --rpm $so 2> /dev/null | while read line ; do
 		echo -n "$line";
 		echo -n "$lib64"
 		echo


Index: gstreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- gstreamer.spec	11 Sep 2008 19:36:47 -0000	1.84
+++ gstreamer.spec	11 Sep 2008 23:48:12 -0000	1.85
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}
 Version: 	0.10.20
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -212,6 +212,12 @@
 %{_sysconfdir}/rpm/macros.gstreamer
 
 %changelog
+* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-5
+- Update rpm provides script and patch to:
+  - filter out errors
+  - only run gst-inspect on gstreamer plugins
+  - print out protocol handlers provides correctly
+
 * Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-4
 - Add the rpm scripts install in /usr/lib/rpm, not under libdir on 64-bit
 



From hadess at fedoraproject.org  Thu Sep 11 23:50:39 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 23:50:39 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.61,
	1.62
Message-ID: <20080911235039.9F7D870130@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-serv32477

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-4
- Another rebuild



Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- gstreamer-plugins-base.spec	11 Sep 2008 18:03:03 -0000	1.61
+++ gstreamer-plugins-base.spec	11 Sep 2008 23:50:09 -0000	1.62
@@ -5,7 +5,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.20
-Release:  	3%{?dist}	
+Release:  	4%{?dist}	
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -242,6 +242,9 @@
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-4
+- Another rebuild
+
 * Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-3
 - Rebuild for new RPM provides
 



From hadess at fedoraproject.org  Thu Sep 11 23:54:21 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 23:54:21 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.73,
	1.74
Message-ID: <20080911235421.1153070130@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-serv32758

Modified Files:
	gstreamer-plugins-good.spec 
Log Message:
* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> 0.10.10-4
- Another rebuild



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- gstreamer-plugins-good.spec	11 Sep 2008 18:05:25 -0000	1.73
+++ gstreamer-plugins-good.spec	11 Sep 2008 23:53:50 -0000	1.74
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.10
-Release:  	3%{?dist}
+Release:  	4%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -239,6 +239,9 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> 0.10.10-4
+- Another rebuild
+
 * Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> 0.10.10-3
 - Rebuild for GStreamer RPM provides
 



From hadess at fedoraproject.org  Thu Sep 11 23:57:00 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 11 Sep 2008 23:57:00 +0000 (UTC)
Subject: rpms/gstreamer-plugins-flumpegdemux/devel
	gstreamer-plugins-flumpegdemux.spec, 1.2, 1.3
Message-ID: <20080911235700.0D06970130@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-flumpegdemux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv852

Modified Files:
	gstreamer-plugins-flumpegdemux.spec 
Log Message:
* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.15-4
- Another rebuild



Index: gstreamer-plugins-flumpegdemux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-flumpegdemux/devel/gstreamer-plugins-flumpegdemux.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gstreamer-plugins-flumpegdemux.spec	11 Sep 2008 18:08:42 -0000	1.2
+++ gstreamer-plugins-flumpegdemux.spec	11 Sep 2008 23:56:29 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: MPEG demuxer for GStreamer
 Name: gstreamer-plugins-flumpegdemux
 Version: 0.10.15
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 License: MPLv1.1
 Group: Applications/Multimedia
 Source0: http://core.fluendo.com/gstreamer/src/gst-fluendo-mpegdemux/gst-fluendo-mpegdemux-%{version}.tar.bz2
@@ -41,6 +41,9 @@
 %{_libdir}/gstreamer-0.10/libgstflumpegdemux.so
 
 %changelog
+* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.15-4
+- Another rebuild
+
 * Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.15-3
 - Rebuild for GStreamer RPM provides work
 



From transif at fedoraproject.org  Fri Sep 12 00:20:07 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Fri, 12 Sep 2008 00:20:07 +0000 (UTC)
Subject: comps/po zh_CN.po,1.16,1.17
Message-ID: <20080912002007.A5D9F70132@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3565/po

Modified Files:
	zh_CN.po 
Log Message:
    2008-09-12  Wei Liu <lliu at redhat.com> (via leahliu at fedoraproject.org)
    
      * po/zh_CN.po: updated zh_CN translation
    



Index: zh_CN.po
===================================================================
RCS file: /cvs/pkgs/comps/po/zh_CN.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- zh_CN.po	10 Sep 2008 22:57:57 -0000	1.16
+++ zh_CN.po	12 Sep 2008 00:19:37 -0000	1.17
@@ -13,8 +13,8 @@
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-10 18:57-0400\n"
-"PO-Revision-Date: 2008-09-01 09:50+1000\n"
+"POT-Creation-Date: 2008-09-11 17:23+0000\n"
+"PO-Revision-Date: 2008-09-12 10:18+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"
@@ -400,14 +400,12 @@
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:81
-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:82 ../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
@@ -643,8 +641,7 @@
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
 #: ../comps-f10.xml.in.h:141 ../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:137
@@ -682,8 +679,7 @@
 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:144
 #: ../comps-f10.xml.in.h:149 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
@@ -706,52 +702,52 @@
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:153 ../comps-el4.xml.in.h:46
+#: ../comps-f10.xml.in.h:154 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "????????? Java ????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:154 ../comps-el4.xml.in.h:47
+#: ../comps-f10.xml.in.h:155 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "??????????????? Java ???????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:155
+#: ../comps-f10.xml.in.h:156
 msgid "Swati Support"
 msgstr "Swati ?????????"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:156
+#: ../comps-f10.xml.in.h:157
 msgid "Swedish Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:157 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
+#: ../comps-f10.xml.in.h:158 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:158
+#: ../comps-f10.xml.in.h:159
 msgid "Tagalog Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:160
+#: ../comps-f10.xml.in.h:161
 msgid "Tamil Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:161
+#: ../comps-f10.xml.in.h:162
 msgid "Telugu Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:162 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
+#: ../comps-f10.xml.in.h:163 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:163
+#: ../comps-f10.xml.in.h:164
 msgid "Thai Support"
 msgstr "????????????"
 
@@ -760,65 +756,61 @@
 msgstr "Eclipse ??????????????????"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:164 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
+#: ../comps-f10.xml.in.h:165 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "???????????????????????????????????????PDF ??????????????????"
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:165
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+#: ../comps-f10.xml.in.h:166
+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:160
-#: ../comps-f10.xml.in.h:166 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
+#: ../comps-f10.xml.in.h:167 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "?????????????????????????????? IMAP ??? Postfix ??????????????????"
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:167
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+#: ../comps-f10.xml.in.h:168
+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:162
-#: ../comps-f10.xml.in.h:168 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+#: ../comps-f10.xml.in.h:169 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:169
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+#: ../comps-f10.xml.in.h:170
+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:164
-#: ../comps-f10.xml.in.h:170
+#: ../comps-f10.xml.in.h:171
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
 msgstr "?????????????????????????????????????????????????????????????????? rsh ??? telnet???"
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:171
+#: ../comps-f10.xml.in.h:172
 msgid "These packages provide a virtualization environment."
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:172
+#: ../comps-f10.xml.in.h:173
 msgid "These packages provide compatibility with previous releases."
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:173
+#: ../comps-f10.xml.in.h:174
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
 msgstr "??????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:174
+#: ../comps-f10.xml.in.h:175
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -827,58 +819,58 @@
 "Postscript ??????????????????"
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
+#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
+#: ../comps-f10.xml.in.h:177 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "??????????????????????????????????????? FTP ????????????"
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:177 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
+#: ../comps-f10.xml.in.h:178 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
 msgstr "?????????????????? automake???gcc???perl???python ??????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:178 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
+#: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:179
+#: ../comps-f10.xml.in.h:180
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:180
+#: ../comps-f10.xml.in.h:181
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
+#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
+#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
 msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
+#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
+#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -887,7 +879,7 @@
 "?????? X ???????????????"
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
+#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -896,165 +888,161 @@
 "??????"
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:186 ../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."
+#: ../comps-f10.xml.in.h:187 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:187 ../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."
+#: ../comps-f10.xml.in.h:188 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
+msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:188 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
+#: ../comps-f10.xml.in.h:189 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
 "client for connecting to SMB shares and tools to monitor network traffic."
-msgstr ""
-"???????????????????????????????????????????????????????????? SMB ????????????????????????????????????????????????"
+msgstr "???????????????????????????????????????????????????????????? SMB ????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:189
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+#: ../comps-f10.xml.in.h:190
+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:184
-#: ../comps-f10.xml.in.h:190
+#: ../comps-f10.xml.in.h:191
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
 msgstr "??????????????????????????? Linux ??? MS Windows(tm) ????????????????????????"
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:191
+#: ../comps-f10.xml.in.h:192
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "???????????????????????? MySQL ?????????????????????"
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:192
+#: ../comps-f10.xml.in.h:193
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "???????????????????????? Postgresql ?????????????????????"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:193
+#: ../comps-f10.xml.in.h:194
 msgid "Tibetan Support"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:194
+#: ../comps-f10.xml.in.h:195
 msgid "Tonga Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:195 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
+#: ../comps-f10.xml.in.h:196 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Fedora Packager ????????????????????????"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:196
+#: ../comps-f10.xml.in.h:197
 msgid "Tsonga Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:197
+#: ../comps-f10.xml.in.h:198
 msgid "Tswana Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:198
+#: ../comps-f10.xml.in.h:199
 msgid "Turkish Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:199
+#: ../comps-f10.xml.in.h:200
 msgid "Ukrainian Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:200
+#: ../comps-f10.xml.in.h:201
 msgid "Urdu Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:202 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
+#: ../comps-f10.xml.in.h:203 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:203 ../comps-el5.xml.in.h:72
+#: ../comps-f10.xml.in.h:204 ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:204
+#: ../comps-f10.xml.in.h:205
 msgid "Venda Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:205
+#: ../comps-f10.xml.in.h:206
 msgid "Vietnamese Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:206
+#: ../comps-f10.xml.in.h:207
 msgid "Virtualization"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:201
-#: ../comps-f10.xml.in.h:208 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
+#: ../comps-f10.xml.in.h:209 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:209 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
+#: ../comps-f10.xml.in.h:210 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:210
+#: ../comps-f10.xml.in.h:211
 msgid "Welsh Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:211 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
+#: ../comps-f10.xml.in.h:212 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:212
+#: ../comps-f10.xml.in.h:213
 msgid "Windows File Server"
 msgstr "Windows ???????????????"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:213
+#: ../comps-f10.xml.in.h:214
 msgid "X Software Development"
 msgstr "X ????????????"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:214 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
+#: ../comps-f10.xml.in.h:215 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X ????????????"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:215
+#: ../comps-f10.xml.in.h:216
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:216
+#: ../comps-f10.xml.in.h:217
 msgid "XFCE Software Development"
 msgstr "XFCE ????????????"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:217
+#: ../comps-f10.xml.in.h:218
 msgid "Xhosa Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:218
+#: ../comps-f10.xml.in.h:219
 msgid "Zulu Support"
 msgstr "???????????????"
 
@@ -1122,13 +1110,13 @@
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR ?????? OLPC XO ????????????????????????"
 
-#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:207
+#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:208
 msgid "Walloon Support"
 msgstr "???????????????"
 
 #: ../comps-f10.xml.in.h:70
-msgid "Haskell"
-msgstr "Haskell"
+msgid "Haskell Development"
+msgstr "Haskell ??????"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
@@ -1139,23 +1127,24 @@
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-f10.xml.in.h:108
-#, fuzzy
 msgid "Maithili Support"
-msgstr "?????????????????????"
+msgstr "??????????????????"
 
 #: ../comps-f10.xml.in.h:115
-#, fuzzy
 msgid "Myanmar (Burmese) Support"
-msgstr "???????????????"
+msgstr "???????????????"
 
-#: ../comps-f10.xml.in.h:159
+#: ../comps-f10.xml.in.h:153
+msgid "Support for developing programs in the Haskell programming language."
+msgstr "???????????????????????????????????????"
+
+#: ../comps-f10.xml.in.h:160
 msgid "Tajik Support"
 msgstr "??????????????????"
 
-#: ../comps-f10.xml.in.h:201
-#, fuzzy
+#: ../comps-f10.xml.in.h:202
 msgid "Uzbek Support"
-msgstr "???????????????"
+msgstr "?????????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1185,8 +1174,7 @@
 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."
@@ -1205,18 +1193,15 @@
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "???????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1224,6 +1209,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??????????????????????????????????????????????????????"
+



From dcnomura at fedoraproject.org  Fri Sep 12 00:28:25 2008
From: dcnomura at fedoraproject.org (Dave Nomura)
Date: Fri, 12 Sep 2008 00:28:25 +0000 (UTC)
Subject: rpms/stapitrace/devel stapitrace.spec,1.13,1.14
Message-ID: <20080912002825.B2F5E70131@cvs1.fedora.phx.redhat.com>

Author: dcnomura

Update of /cvs/pkgs/rpms/stapitrace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4537

Modified Files:
	stapitrace.spec 
Log Message:
look for libbfd



Index: stapitrace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stapitrace/devel/stapitrace.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- stapitrace.spec	4 Sep 2008 15:36:08 -0000	1.13
+++ stapitrace.spec	12 Sep 2008 00:27:55 -0000	1.14
@@ -38,6 +38,43 @@
 %patch0 -p1
 
 %build
+cat >>conftest.c <<_ACEOF
+/* confdefs.h.  */
+
+#define PACKAGE_NAME "Performance Inspector"
+#define PACKAGE_TARNAME "performance-inspector"
+#define PACKAGE_VERSION "3.4"
+#define PACKAGE_STRING "Performance Inspector 3.4"
+#define PACKAGE_BUGREPORT "mmilenko at us.ibm.com"
+#define PACKAGE "performance-inspector"
+#define VERSION "3.4"
+#define HAVE_LIBC 1
+#define HAVE_LIBDL 1
+#define HAVE_LIBIBERTY 1
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char bfd_get_elf_phdrs ();
+int
+main ()
+{
+bfd_get_elf_phdrs ();
+  ;
+  return 0;
+}
+_ACEOF
+ls -l /usr/lib/libbfd*
+file /usr/lib/libbfd*
+gcc -o conftest -g -O2 conftest.c -lbfd -liberty -ldl -lc
+gcc -o conftest -g -O2 conftest.c /usr/lib/libbfd.a -liberty -ldl -lc
+gcc -o conftest -g -O2 conftest.c /usr/lib/libbfd*.so -liberty -ldl -lc
+nm /usr/lib/libbfd.a | grep bfd_get_elf_phdrs 
+nm /usr/lib/libbfd*.so | grep bfd_get_elf_phdrs 
 autoreconf -i --force
 # override -m64
 export CFLAGS="%{__global_cflags} -mminimal-toc"	



From toshio at fedoraproject.org  Fri Sep 12 00:33:03 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri, 12 Sep 2008 00:33:03 +0000 (UTC)
Subject: rpms/python-simplejson/F-9 .cvsignore, 1.9,
	1.10 python-simplejson.spec, 1.17, 1.18 sources, 1.9, 1.10
Message-ID: <20080912003303.A5FFE70131@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-simplejson/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4954

Modified Files:
	.cvsignore python-simplejson.spec sources 
Log Message:
Update to 1.9.1.  Needed for gwibber.

* Tue May 06 2008 Luke Macken <lmacken at redhat.com> - 1.9.1-1
- Update to 1.9.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	2 Apr 2008 18:35:30 -0000	1.9
+++ .cvsignore	12 Sep 2008 00:32:33 -0000	1.10
@@ -1 +1 @@
-simplejson-1.8.1.tar.gz
+simplejson-1.9.1.tar.gz


Index: python-simplejson.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/F-9/python-simplejson.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- python-simplejson.spec	2 Apr 2008 18:35:30 -0000	1.17
+++ python-simplejson.spec	12 Sep 2008 00:32:33 -0000	1.18
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-simplejson
-Version:        1.8.1
+Version:        1.9.1
 Release:        1%{?dist}
 Summary:        Simple, fast, extensible JSON encoder/decoder for Python
 
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue May 06 2008 Luke Macken <lmacken at redhat.com> - 1.9.1-1
+- Update to 1.9.1
+
 * Wed Apr 02 2008 Luke Macken <lmacken at redhat.com> - 1.8.1-1
 - Update to 1.8.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	2 Apr 2008 18:35:30 -0000	1.9
+++ sources	12 Sep 2008 00:32:33 -0000	1.10
@@ -1 +1 @@
-7d024d6ae74abb269637be204e132bdc  simplejson-1.8.1.tar.gz
+d2ee608bdf6397b82a7cd53c8602b29e  simplejson-1.9.1.tar.gz



From allisson at fedoraproject.org  Fri Sep 12 02:11:31 2008
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Fri, 12 Sep 2008 02:11:31 +0000 (UTC)
Subject: rpms/pyclutter/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 pyclutter.spec, 1.10, NONE
Message-ID: <20080912021131.9795670131@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/pyclutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13304

Modified Files:
	.cvsignore sources 
Removed Files:
	pyclutter.spec 
Log Message:

Marking pyclutter as dead.package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyclutter/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 May 2008 00:38:58 -0000	1.6
+++ .cvsignore	12 Sep 2008 02:11:00 -0000	1.7
@@ -1 +1,2 @@
 pyclutter-0.6.2.tar.gz
+dead.package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyclutter/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 May 2008 00:38:58 -0000	1.6
+++ sources	12 Sep 2008 02:11:00 -0000	1.7
@@ -1 +1,2 @@
 4560b8b3782994b884712bd653bdebb6  pyclutter-0.6.2.tar.gz
+17142e29ce2a0ea9c3478d84681053b2  dead.package


--- pyclutter.spec DELETED ---



From jfearn at fedoraproject.org  Fri Sep 12 02:27:45 2008
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Fri, 12 Sep 2008 02:27:45 +0000 (UTC)
Subject: rpms/publican/F-9 publican.spec,1.8,1.9 sources,1.7,1.8
Message-ID: <20080912022745.7E38B70131@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/publican/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16098

Modified Files:
	publican.spec sources 
Log Message:
new version


Index: publican.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-9/publican.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- publican.spec	1 Aug 2008 05:37:26 -0000	1.8
+++ publican.spec	12 Sep 2008 02:27:15 -0000	1.9
@@ -4,8 +4,8 @@
 %define PREMOLESTATION 0
 
 Name:		publican	
-Summary:	Common files and scripts for publishing Documentation
-Version:	0.34
+Summary:	Common files and scripts for publishing with DocBook XML
+Version:	0.37
 Release:	0%{?dist}
 License:	GPLv2+ and GFDL
 # The following directories are licensed under the GFDL:
@@ -16,26 +16,27 @@
 Buildarch:	noarch
 Source:		https://fedorahosted.org/releases/p/u/publican/%{name}-%{version}.tgz
 # need kdesdk for po2xml & xml2pot
-Requires:	gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl elinks aspell
+Requires:	gettext libxslt perl(XML::TreeBuilder) docbook-dtds docbook-style-xsl elinks aspell
 Requires:	%{_bindir}/xml2pot %{_bindir}/po2xml
 Requires:	perl-ParseLex perl-HTML-Template make
 Requires:	fop batik saxon ImageMagick
-#Requires:	xslthl
+Requires:	xerces-j2 rpm-build
 
-BuildRequires:	gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl aspell
+BuildRequires:	gettext libxslt perl(XML::TreeBuilder) docbook-dtds docbook-style-xsl aspell
 BuildRequires:	%{_bindir}/xml2pot %{_bindir}/po2xml
 BuildRequires:	desktop-file-utils
-# FOP is required to build the mont metrics.
-BuildRequires:	fop saxon
+# FOP is required to build the font metrics.
+BuildRequires:	fop saxon ImageMagick
 #BuildRequires:	xslthl
 # *&%^*&^ decided to rename font packages and change font paths.
 # No actual real changes.
 %if %{PREMOLESTATION}
+Requires:	xslthl
 Requires:	fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati
 Requires:	fonts-hindi fonts-japanese fonts-kannada fonts-korean
 Requires:	fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala
 Requires:	fonts-tamil fonts-telugu liberation-fonts
-
+BuildRequires:	xslthl
 BuildRequires:	fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati
 BuildRequires:	fonts-hindi fonts-japanese fonts-kannada fonts-korean
 BuildRequires:	fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala
@@ -44,14 +45,12 @@
 Requires:	lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati
 Requires:	lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada
 Requires:	lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
-Requires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts
-# fonts-korean
+Requires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang
 
 BuildRequires:	lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati
 BuildRequires:	lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada
 BuildRequires:	lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
-BuildRequires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts
-#  fonts-korean
+BuildRequires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang
 %endif
 
 URL:		https://fedorahosted.org/publican
@@ -59,7 +58,9 @@
 Obsoletes:	perl-SGML-Translate <= 0.37-3
 
 %description
-Common files and scripts for publishing documentation.
+Publican is a DocBook publication system, not just a DocBook processing tool.
+As well as ensuring your DocBook XML is valid, publican works to ensure
+your XML is up to publishable standard.
 
 %package doc
 Group:		Documentation
@@ -71,7 +72,10 @@
 %endif
 
 %description doc
-Documentation for the Publican publishing tool chain.
+Publican is a tool for publishing material authored in DocBook XML.
+This guide explains how to  to create and build books and articles
+using publican. It is not a DocBook XML tutorial and concentrates
+solely on using the publican tools.
 
 %prep
 %setup -q
@@ -91,7 +95,7 @@
 %{__perl} -p -i -e 's|^#CATALOGS_OVERRIDE$|CATALOGS\t= XML_CATALOG_FILES="%{_datadir}/%{name}/xsl/docbook/dtd-4.5/catalog.xml %{_datadir}/%{name}/xsl/docbook/1.72.0/catalog.xml"|g' make/Makefile.templates
 %endif
 
-for i in fop make xsl Common_Content templates; do
+for i in fop make xsl Common_Content templates maven; do
 	cp -rf $i $RPM_BUILD_ROOT%{_datadir}/%{name}/$i
 done
 cp -rf Book_Template $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates/common-Book_Template
@@ -143,6 +147,44 @@
 %doc fdl.txt
 
 %changelog
+* Wed Sep 3 2008 Jeff Fearn <jfearn at redhat.com> 0.37
+- Fix Bug in web rpm upgrade script.
+- Fix Article not building rpms.
+- Switch ja-JP  font name in pdf from SazanamiMincho to SazanamiGothic
+- Remove empty para tags to break en-US HTML build so writers stop breaking translations.
+- Changed docs reference from --revision to --edition for create_book option
+- Fixed Article layout not matching Book Layout. BZ #460969
+- Fixed Part not ledded properly in TOC BZ #460976
+- Fix duplicate IDs in XHTML output.
+- Made background of remark a pretty yellow. BZ #459213
+- Fix Accessibility typo. BZ #460856
+- Fix spurious hyphenation in verbatim.
+- Fix broken RPM packages when titles have been translated.
+- Fix display bug in html-single. BZ #461375
+- Added FAQ entry for Java weirdness. BZ #460738
+- Add default encoding to XML files. BZ #461379
+- Removed corpauthor from template. BZ #461222
+- Fixed create_book help text. BZ #460736
+- Added menuchoice tag. BZ #459671
+
+* Mon Sep 1 2008 Jeff Fearn <jfearn at redhat.com> 0.35-0
+- Add missing xerces-j2 Requires. BZ #457497
+- Fixed css path for tranlation reports.
+- Fixed font path for Fedora, ensured build fails if font metric creation fails. BZ #458003
+- Set vertical-align:top for TD - BZ #457851
+- Added WARNING for ENTITIES declared in XML files. BZ #456170
+- Added check to ensure PRODUCT has a valid format.
+- Only check xml files for revision history. BZ #458740
+- Made VERSION and RELEASE over-rideable. BZ #458421
+- Fixed display of OL nested in UL. BZ #457915
+- Added "make pom" to output a basic maven pom file.
+- Updated doco. BZ #458764
+- Updated Conventions.xml. BZ #456026 #459216
+- Made PDF and HTML display product version in similar style. BZ #456486
+- Remove ID's from common files. BZ #460770
+- Allowed footnote to keep ID. BZ #460790
+- Fixed bogus verbatim layout. BZ #460771
+
 * Fri Apr 11 2008 Jeff Fearn <jfearn at redhat.com> 0.34-0
 - Fix PO file name missing from translation status report
 - Modify xmlClean to output dummy content for empty files (beta)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Aug 2008 05:37:26 -0000	1.7
+++ sources	12 Sep 2008 02:27:15 -0000	1.8
@@ -1 +1 @@
-6a2f366acfaa8af0119f8c5fde2d9f05  publican-0.34.tgz
+b49ac8772041f3679f151eb1a724caa5  publican-0.37.tgz



From jfearn at fedoraproject.org  Fri Sep 12 02:30:56 2008
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Fri, 12 Sep 2008 02:30:56 +0000 (UTC)
Subject: rpms/publican-fedora/F-9 publican-fedora.spec, 1.5, 1.6 sources, 1.6,
	1.7
Message-ID: <20080912023056.28AC870135@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/publican-fedora/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16874

Modified Files:
	publican-fedora.spec sources 
Log Message:
new version


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-9/publican-fedora.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- publican-fedora.spec	1 Aug 2008 06:19:40 -0000	1.5
+++ publican-fedora.spec	12 Sep 2008 02:30:25 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
-Version:	0.13
+Version:	0.15
 Release:	0%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
@@ -49,6 +49,15 @@
 %{_datadir}/publican/xsl/%{brand}
 
 %changelog
+* Tue Sep 9 2008 Jeff Fearn <jfearn at redhat.com> 0.15
+- Removed corpauthor from template. BZ #461222
+- Updated Fedora legal notice. BZ #448022
+
+* Mon Sep 1 2008 Jeff Fearn <jfearn at redhat.com> 0.14-0
+- Fix styles for publican 0.35 mods
+- Removed common entity files as they break translation
+- Remove ID's from common files. BZ #460770
+
 * Mon Apr 14 2008 Jeff Fearn <jfearn at redhat.com> 0.13-0
 - Fix missing list image in html-single articles
 - QANDA set css fix BZ #442674


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Aug 2008 06:19:40 -0000	1.6
+++ sources	12 Sep 2008 02:30:25 -0000	1.7
@@ -1 +1 @@
-61914fa32218fdbb8a2110e1e8b9bbc8  publican-fedora-0.13.tgz
+b17d2cc7c95f2fd739cd26511cac3db8  publican-fedora-0.15.tgz



From ianweller at fedoraproject.org  Fri Sep 12 02:34:31 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Fri, 12 Sep 2008 02:34:31 +0000 (UTC)
Subject: rpms/csstidy/devel csstidy-1.4-fix-misc.cpp.patch, NONE,
	1.1 csstidy.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080912023431.AB23770131@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/csstidy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17930/devel

Modified Files:
	.cvsignore sources 
Added Files:
	csstidy-1.4-fix-misc.cpp.patch csstidy.spec import.log 
Log Message:
importing csstidy-1.4-1 in devel

csstidy-1.4-fix-misc.cpp.patch:

--- NEW FILE csstidy-1.4-fix-misc.cpp.patch ---
diff -up src/csstidy/misc.cpp.orig src/csstidy/misc.cpp
--- src/csstidy/misc.cpp.orig	2008-09-05 19:07:07.000000000 -0500
+++ src/csstidy/misc.cpp	2008-09-05 19:07:23.000000000 -0500
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
  
+#include <string.h>
 #include "csspp_globals.hpp"
 
 bool escaped(const string &istring, const int pos) 


--- NEW FILE csstidy.spec ---
Name:           csstidy
Version:        1.4
Release:        1%{?dist}
Summary:        CSS parser and optimizer

Group:          Applications/Internet
License:        GPLv2+
URL:            http://csstidy.sourceforge.net
# The developer is ridiculous and puts together this archive on Windows, and fails miserably.
# We repackaged it ourself by doing the following:
#   mkdir csstidy-%{version}; cd csstidy-%{version}
#   wget http://downloads.sourceforge.net/csstidy/csstidy-source-1.4.zip
#   unzip csstidy-source-1.4.zip; rm csstidy-source-1.4.zip
#   cd ..; tar czf csstidy-%{version}.tar.gz csstidy-%{version}
Source0:        csstidy-%{version}.tar.gz
Patch0:         csstidy-1.4-fix-misc.cpp.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gcc-c++ scons

%description
CSSTidy is an open source CSS parser and optimizer. In opposite to most other
CSS parsers, no regular expressions are used and thus CSSTidy has full CSS2
support and a higher reliability.


%prep
%setup -q
%patch0 -p1


%build
scons


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -cpm 755 release/csstidy/csstidy %{buildroot}%{_bindir}/%{name}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS ChangeLog COPYING NEWS README TODO
%{_bindir}/%{name}


%changelog
* Thu Jul 24 2008 Ian Weller <ianweller at gmail.com> 1.4-1
- Initial package build.


--- NEW FILE import.log ---
csstidy-1_4-1_fc9:HEAD:csstidy-1.4-1.fc9.src.rpm:1221186831


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/csstidy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:42:11 -0000	1.1
+++ .cvsignore	12 Sep 2008 02:34:01 -0000	1.2
@@ -0,0 +1 @@
+csstidy-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/csstidy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:42:11 -0000	1.1
+++ sources	12 Sep 2008 02:34:01 -0000	1.2
@@ -0,0 +1 @@
+308b82a6ecc7b51650dff87afe1f0a01  csstidy-1.4.tar.gz



From ianweller at fedoraproject.org  Fri Sep 12 02:36:15 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Fri, 12 Sep 2008 02:36:15 +0000 (UTC)
Subject: rpms/csstidy/F-9 csstidy-1.4-fix-misc.cpp.patch, NONE,
	1.1 csstidy.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080912023615.25A4D70131@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/csstidy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18460/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	csstidy-1.4-fix-misc.cpp.patch csstidy.spec import.log 
Log Message:
importing csstidy-1.4-1 in F-9

csstidy-1.4-fix-misc.cpp.patch:

--- NEW FILE csstidy-1.4-fix-misc.cpp.patch ---
diff -up src/csstidy/misc.cpp.orig src/csstidy/misc.cpp
--- src/csstidy/misc.cpp.orig	2008-09-05 19:07:07.000000000 -0500
+++ src/csstidy/misc.cpp	2008-09-05 19:07:23.000000000 -0500
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
  
+#include <string.h>
 #include "csspp_globals.hpp"
 
 bool escaped(const string &istring, const int pos) 


--- NEW FILE csstidy.spec ---
Name:           csstidy
Version:        1.4
Release:        1%{?dist}
Summary:        CSS parser and optimizer

Group:          Applications/Internet
License:        GPLv2+
URL:            http://csstidy.sourceforge.net
# The developer is ridiculous and puts together this archive on Windows, and fails miserably.
# We repackaged it ourself by doing the following:
#   mkdir csstidy-%{version}; cd csstidy-%{version}
#   wget http://downloads.sourceforge.net/csstidy/csstidy-source-1.4.zip
#   unzip csstidy-source-1.4.zip; rm csstidy-source-1.4.zip
#   cd ..; tar czf csstidy-%{version}.tar.gz csstidy-%{version}
Source0:        csstidy-%{version}.tar.gz
Patch0:         csstidy-1.4-fix-misc.cpp.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gcc-c++ scons

%description
CSSTidy is an open source CSS parser and optimizer. In opposite to most other
CSS parsers, no regular expressions are used and thus CSSTidy has full CSS2
support and a higher reliability.


%prep
%setup -q
%patch0 -p1


%build
scons


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -cpm 755 release/csstidy/csstidy %{buildroot}%{_bindir}/%{name}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS ChangeLog COPYING NEWS README TODO
%{_bindir}/%{name}


%changelog
* Thu Jul 24 2008 Ian Weller <ianweller at gmail.com> 1.4-1
- Initial package build.


--- NEW FILE import.log ---
csstidy-1_4-1_fc9:F-9:csstidy-1.4-1.fc9.src.rpm:1221186907


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/csstidy/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:42:11 -0000	1.1
+++ .cvsignore	12 Sep 2008 02:35:44 -0000	1.2
@@ -0,0 +1 @@
+csstidy-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/csstidy/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:42:11 -0000	1.1
+++ sources	12 Sep 2008 02:35:44 -0000	1.2
@@ -0,0 +1 @@
+308b82a6ecc7b51650dff87afe1f0a01  csstidy-1.4.tar.gz



From ianweller at fedoraproject.org  Fri Sep 12 02:37:47 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Fri, 12 Sep 2008 02:37:47 +0000 (UTC)
Subject: rpms/csstidy/F-8 csstidy-1.4-fix-misc.cpp.patch, NONE,
	1.1 csstidy.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080912023747.BFEE870131@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/csstidy/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18965/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	csstidy-1.4-fix-misc.cpp.patch csstidy.spec import.log 
Log Message:
importing csstidy-1.4-1 in F-8

csstidy-1.4-fix-misc.cpp.patch:

--- NEW FILE csstidy-1.4-fix-misc.cpp.patch ---
diff -up src/csstidy/misc.cpp.orig src/csstidy/misc.cpp
--- src/csstidy/misc.cpp.orig	2008-09-05 19:07:07.000000000 -0500
+++ src/csstidy/misc.cpp	2008-09-05 19:07:23.000000000 -0500
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
  
+#include <string.h>
 #include "csspp_globals.hpp"
 
 bool escaped(const string &istring, const int pos) 


--- NEW FILE csstidy.spec ---
Name:           csstidy
Version:        1.4
Release:        1%{?dist}
Summary:        CSS parser and optimizer

Group:          Applications/Internet
License:        GPLv2+
URL:            http://csstidy.sourceforge.net
# The developer is ridiculous and puts together this archive on Windows, and fails miserably.
# We repackaged it ourself by doing the following:
#   mkdir csstidy-%{version}; cd csstidy-%{version}
#   wget http://downloads.sourceforge.net/csstidy/csstidy-source-1.4.zip
#   unzip csstidy-source-1.4.zip; rm csstidy-source-1.4.zip
#   cd ..; tar czf csstidy-%{version}.tar.gz csstidy-%{version}
Source0:        csstidy-%{version}.tar.gz
Patch0:         csstidy-1.4-fix-misc.cpp.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gcc-c++ scons

%description
CSSTidy is an open source CSS parser and optimizer. In opposite to most other
CSS parsers, no regular expressions are used and thus CSSTidy has full CSS2
support and a higher reliability.


%prep
%setup -q
%patch0 -p1


%build
scons


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -cpm 755 release/csstidy/csstidy %{buildroot}%{_bindir}/%{name}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS ChangeLog COPYING NEWS README TODO
%{_bindir}/%{name}


%changelog
* Thu Jul 24 2008 Ian Weller <ianweller at gmail.com> 1.4-1
- Initial package build.


--- NEW FILE import.log ---
csstidy-1_4-1_fc9:F-8:csstidy-1.4-1.fc9.src.rpm:1221187012


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/csstidy/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:42:11 -0000	1.1
+++ .cvsignore	12 Sep 2008 02:37:17 -0000	1.2
@@ -0,0 +1 @@
+csstidy-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/csstidy/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:42:11 -0000	1.1
+++ sources	12 Sep 2008 02:37:17 -0000	1.2
@@ -0,0 +1 @@
+308b82a6ecc7b51650dff87afe1f0a01  csstidy-1.4.tar.gz



From ianweller at fedoraproject.org  Fri Sep 12 02:39:29 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Fri, 12 Sep 2008 02:39:29 +0000 (UTC)
Subject: rpms/csstidy/EL-5 csstidy-1.4-fix-misc.cpp.patch, NONE,
	1.1 csstidy.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080912023929.260A670131@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/csstidy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19498/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	csstidy-1.4-fix-misc.cpp.patch csstidy.spec import.log 
Log Message:
importing csstidy-1.4-1 in EL-5

csstidy-1.4-fix-misc.cpp.patch:

--- NEW FILE csstidy-1.4-fix-misc.cpp.patch ---
diff -up src/csstidy/misc.cpp.orig src/csstidy/misc.cpp
--- src/csstidy/misc.cpp.orig	2008-09-05 19:07:07.000000000 -0500
+++ src/csstidy/misc.cpp	2008-09-05 19:07:23.000000000 -0500
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
  
+#include <string.h>
 #include "csspp_globals.hpp"
 
 bool escaped(const string &istring, const int pos) 


--- NEW FILE csstidy.spec ---
Name:           csstidy
Version:        1.4
Release:        1%{?dist}
Summary:        CSS parser and optimizer

Group:          Applications/Internet
License:        GPLv2+
URL:            http://csstidy.sourceforge.net
# The developer is ridiculous and puts together this archive on Windows, and fails miserably.
# We repackaged it ourself by doing the following:
#   mkdir csstidy-%{version}; cd csstidy-%{version}
#   wget http://downloads.sourceforge.net/csstidy/csstidy-source-1.4.zip
#   unzip csstidy-source-1.4.zip; rm csstidy-source-1.4.zip
#   cd ..; tar czf csstidy-%{version}.tar.gz csstidy-%{version}
Source0:        csstidy-%{version}.tar.gz
Patch0:         csstidy-1.4-fix-misc.cpp.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gcc-c++ scons

%description
CSSTidy is an open source CSS parser and optimizer. In opposite to most other
CSS parsers, no regular expressions are used and thus CSSTidy has full CSS2
support and a higher reliability.


%prep
%setup -q
%patch0 -p1


%build
scons


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -cpm 755 release/csstidy/csstidy %{buildroot}%{_bindir}/%{name}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS ChangeLog COPYING NEWS README TODO
%{_bindir}/%{name}


%changelog
* Thu Jul 24 2008 Ian Weller <ianweller at gmail.com> 1.4-1
- Initial package build.


--- NEW FILE import.log ---
csstidy-1_4-1_fc9:EL-5:csstidy-1.4-1.fc9.src.rpm:1221187092


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/csstidy/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:42:11 -0000	1.1
+++ .cvsignore	12 Sep 2008 02:38:58 -0000	1.2
@@ -0,0 +1 @@
+csstidy-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/csstidy/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:42:11 -0000	1.1
+++ sources	12 Sep 2008 02:38:58 -0000	1.2
@@ -0,0 +1 @@
+308b82a6ecc7b51650dff87afe1f0a01  csstidy-1.4.tar.gz



From ianweller at fedoraproject.org  Fri Sep 12 02:41:31 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Fri, 12 Sep 2008 02:41:31 +0000 (UTC)
Subject: rpms/csstidy/EL-4 csstidy-1.4-fix-misc.cpp.patch, NONE,
	1.1 csstidy.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080912024131.1BA0E70131@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/csstidy/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20034/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	csstidy-1.4-fix-misc.cpp.patch csstidy.spec import.log 
Log Message:
importing csstidy-1.4-1 in EL-4

csstidy-1.4-fix-misc.cpp.patch:

--- NEW FILE csstidy-1.4-fix-misc.cpp.patch ---
diff -up src/csstidy/misc.cpp.orig src/csstidy/misc.cpp
--- src/csstidy/misc.cpp.orig	2008-09-05 19:07:07.000000000 -0500
+++ src/csstidy/misc.cpp	2008-09-05 19:07:23.000000000 -0500
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
  
+#include <string.h>
 #include "csspp_globals.hpp"
 
 bool escaped(const string &istring, const int pos) 


--- NEW FILE csstidy.spec ---
Name:           csstidy
Version:        1.4
Release:        1%{?dist}
Summary:        CSS parser and optimizer

Group:          Applications/Internet
License:        GPLv2+
URL:            http://csstidy.sourceforge.net
# The developer is ridiculous and puts together this archive on Windows, and fails miserably.
# We repackaged it ourself by doing the following:
#   mkdir csstidy-%{version}; cd csstidy-%{version}
#   wget http://downloads.sourceforge.net/csstidy/csstidy-source-1.4.zip
#   unzip csstidy-source-1.4.zip; rm csstidy-source-1.4.zip
#   cd ..; tar czf csstidy-%{version}.tar.gz csstidy-%{version}
Source0:        csstidy-%{version}.tar.gz
Patch0:         csstidy-1.4-fix-misc.cpp.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gcc-c++ scons

%description
CSSTidy is an open source CSS parser and optimizer. In opposite to most other
CSS parsers, no regular expressions are used and thus CSSTidy has full CSS2
support and a higher reliability.


%prep
%setup -q
%patch0 -p1


%build
scons


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -cpm 755 release/csstidy/csstidy %{buildroot}%{_bindir}/%{name}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS ChangeLog COPYING NEWS README TODO
%{_bindir}/%{name}


%changelog
* Thu Jul 24 2008 Ian Weller <ianweller at gmail.com> 1.4-1
- Initial package build.


--- NEW FILE import.log ---
csstidy-1_4-1_fc9:EL-4:csstidy-1.4-1.fc9.src.rpm:1221187195


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/csstidy/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 04:42:11 -0000	1.1
+++ .cvsignore	12 Sep 2008 02:41:00 -0000	1.2
@@ -0,0 +1 @@
+csstidy-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/csstidy/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 04:42:11 -0000	1.1
+++ sources	12 Sep 2008 02:41:00 -0000	1.2
@@ -0,0 +1 @@
+308b82a6ecc7b51650dff87afe1f0a01  csstidy-1.4.tar.gz



From ianweller at fedoraproject.org  Fri Sep 12 02:56:00 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Fri, 12 Sep 2008 02:56:00 +0000 (UTC)
Subject: rpms/flam3/devel .cvsignore, 1.9, 1.10 flam3.spec, 1.10,
	1.11 import.log, 1.2, 1.3 sources, 1.9, 1.10
Message-ID: <20080912025600.C402970131@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/flam3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22208/devel

Modified Files:
	.cvsignore flam3.spec import.log sources 
Log Message:
import flam3-2.7.16-1 into devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Sep 2008 03:54:37 -0000	1.9
+++ .cvsignore	12 Sep 2008 02:55:30 -0000	1.10
@@ -1 +1 @@
-flam3-2.7.15.tar.gz
+flam3-2.7.16.tar.gz


Index: flam3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/devel/flam3.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- flam3.spec	4 Sep 2008 03:54:37 -0000	1.10
+++ flam3.spec	12 Sep 2008 02:55:30 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           flam3
-Version:        2.7.15
+Version:        2.7.16
 Release:        1%{?dist}
 Summary:        Programs to generate and render cosmic recursive fractal flames
 
@@ -86,6 +86,25 @@
 
 
 %changelog
+* Thu Sep 11 2008 Ian Weller <ianweller at gmail.com> 2.7.16-1
+- Upstream updated:
+    Added 'clone_all' to flam3_genome to allow application of 
+    template to all flames in a file at once, and 'animate' to write
+    a full sequence of interpolations out.  'animate' is similar to 
+    'sequence' except that no control point rotation is performed.  
+    Fixed non-functional 'write_genome' env var for flam3_animate.  
+    Two bugs associated with interpolating from a log interpolation_type
+    to a non-log interpolation_type fixed (rotate angle reduction and 
+    special inverted identity).  when using flam3_rotate in 'spin_inter'
+    the interp type of the first genome is now used rather than the
+    current genome's interp type.  Enforced upper and lower bounds for
+    xform color and upper bound for interpolated colormap values
+    as "smooth" interpolation led to values out of range.  If "smooth"
+    interpolation is specified for all flames in a file, the first and
+    second-to-last genome is switched to "linear" with a warning.
+    spatial filters with non-box-filter window functions fixed.
+    Release as 2.7.16.
+
 * Wed Sep 03 2008 Ian Weller <ianweller at gmail.com> 2.7.15-1
 - Upstream updated:
     Added new interpolation types 'old' and 'older', for use in 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	4 Sep 2008 03:54:37 -0000	1.2
+++ import.log	12 Sep 2008 02:55:30 -0000	1.3
@@ -1,2 +1,3 @@
 flam3-2_7_14-1_fc9:HEAD:flam3-2.7.14-1.fc9.src.rpm:1217870319
 flam3-2_7_15-1_fc9:HEAD:flam3-2.7.15-1.fc9.src.rpm:1220500457
+flam3-2_7_16-1_fc9:HEAD:flam3-2.7.16-1.fc9.src.rpm:1221188112


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Sep 2008 03:54:37 -0000	1.9
+++ sources	12 Sep 2008 02:55:30 -0000	1.10
@@ -1 +1 @@
-d65e28f27866820117ee2039dbcf1c0b  flam3-2.7.15.tar.gz
+890b95d0fdb9cc97fdd1c42d77122116  flam3-2.7.16.tar.gz



From ianweller at fedoraproject.org  Fri Sep 12 02:57:27 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Fri, 12 Sep 2008 02:57:27 +0000 (UTC)
Subject: rpms/flam3/F-9 .cvsignore, 1.9, 1.10 flam3.spec, 1.9,
	1.10 import.log, 1.2, 1.3 sources, 1.9, 1.10
Message-ID: <20080912025727.6A9C370131@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/flam3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22580/F-9

Modified Files:
	.cvsignore flam3.spec import.log sources 
Log Message:
import flam3-2.7.16-1 into F-9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Sep 2008 03:53:21 -0000	1.9
+++ .cvsignore	12 Sep 2008 02:56:57 -0000	1.10
@@ -1 +1 @@
-flam3-2.7.15.tar.gz
+flam3-2.7.16.tar.gz


Index: flam3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-9/flam3.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- flam3.spec	4 Sep 2008 03:53:21 -0000	1.9
+++ flam3.spec	12 Sep 2008 02:56:57 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           flam3
-Version:        2.7.15
+Version:        2.7.16
 Release:        1%{?dist}
 Summary:        Programs to generate and render cosmic recursive fractal flames
 
@@ -86,6 +86,25 @@
 
 
 %changelog
+* Thu Sep 11 2008 Ian Weller <ianweller at gmail.com> 2.7.16-1
+- Upstream updated:
+    Added 'clone_all' to flam3_genome to allow application of 
+    template to all flames in a file at once, and 'animate' to write
+    a full sequence of interpolations out.  'animate' is similar to 
+    'sequence' except that no control point rotation is performed.  
+    Fixed non-functional 'write_genome' env var for flam3_animate.  
+    Two bugs associated with interpolating from a log interpolation_type
+    to a non-log interpolation_type fixed (rotate angle reduction and 
+    special inverted identity).  when using flam3_rotate in 'spin_inter'
+    the interp type of the first genome is now used rather than the
+    current genome's interp type.  Enforced upper and lower bounds for
+    xform color and upper bound for interpolated colormap values
+    as "smooth" interpolation led to values out of range.  If "smooth"
+    interpolation is specified for all flames in a file, the first and
+    second-to-last genome is switched to "linear" with a warning.
+    spatial filters with non-box-filter window functions fixed.
+    Release as 2.7.16.
+
 * Wed Sep 03 2008 Ian Weller <ianweller at gmail.com> 2.7.15-1
 - Upstream updated:
     Added new interpolation types 'old' and 'older', for use in 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	4 Sep 2008 03:53:21 -0000	1.2
+++ import.log	12 Sep 2008 02:56:57 -0000	1.3
@@ -1,2 +1,3 @@
 flam3-2_7_14-1_fc9:F-9:flam3-2.7.14-1.fc9.src.rpm:1217870714
 flam3-2_7_15-1_fc9:F-9:flam3-2.7.15-1.fc9.src.rpm:1220500094
+flam3-2_7_16-1_fc9:F-9:flam3-2.7.16-1.fc9.src.rpm:1221188181


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Sep 2008 03:53:21 -0000	1.9
+++ sources	12 Sep 2008 02:56:57 -0000	1.10
@@ -1 +1 @@
-d65e28f27866820117ee2039dbcf1c0b  flam3-2.7.15.tar.gz
+890b95d0fdb9cc97fdd1c42d77122116  flam3-2.7.16.tar.gz



From ianweller at fedoraproject.org  Fri Sep 12 03:00:46 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Fri, 12 Sep 2008 03:00:46 +0000 (UTC)
Subject: rpms/flam3/F-8 .cvsignore, 1.9, 1.10 flam3.spec, 1.9,
	1.10 import.log, 1.2, 1.3 sources, 1.9, 1.10
Message-ID: <20080912030046.C938C70131@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/flam3/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23142/F-8

Modified Files:
	.cvsignore flam3.spec import.log sources 
Log Message:
import flam3-2.7.16-1 into F-8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Sep 2008 03:47:28 -0000	1.9
+++ .cvsignore	12 Sep 2008 03:00:16 -0000	1.10
@@ -1 +1 @@
-flam3-2.7.15.tar.gz
+flam3-2.7.16.tar.gz


Index: flam3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-8/flam3.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- flam3.spec	4 Sep 2008 03:47:28 -0000	1.9
+++ flam3.spec	12 Sep 2008 03:00:16 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           flam3
-Version:        2.7.15
+Version:        2.7.16
 Release:        1%{?dist}
 Summary:        Programs to generate and render cosmic recursive fractal flames
 
@@ -86,6 +86,25 @@
 
 
 %changelog
+* Thu Sep 11 2008 Ian Weller <ianweller at gmail.com> 2.7.16-1
+- Upstream updated:
+    Added 'clone_all' to flam3_genome to allow application of 
+    template to all flames in a file at once, and 'animate' to write
+    a full sequence of interpolations out.  'animate' is similar to 
+    'sequence' except that no control point rotation is performed.  
+    Fixed non-functional 'write_genome' env var for flam3_animate.  
+    Two bugs associated with interpolating from a log interpolation_type
+    to a non-log interpolation_type fixed (rotate angle reduction and 
+    special inverted identity).  when using flam3_rotate in 'spin_inter'
+    the interp type of the first genome is now used rather than the
+    current genome's interp type.  Enforced upper and lower bounds for
+    xform color and upper bound for interpolated colormap values
+    as "smooth" interpolation led to values out of range.  If "smooth"
+    interpolation is specified for all flames in a file, the first and
+    second-to-last genome is switched to "linear" with a warning.
+    spatial filters with non-box-filter window functions fixed.
+    Release as 2.7.16.
+
 * Wed Sep 03 2008 Ian Weller <ianweller at gmail.com> 2.7.15-1
 - Upstream updated:
     Added new interpolation types 'old' and 'older', for use in 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-8/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	4 Sep 2008 03:47:28 -0000	1.2
+++ import.log	12 Sep 2008 03:00:16 -0000	1.3
@@ -1,2 +1,3 @@
 flam3-2_7_14-1_fc9:F-8:flam3-2.7.14-1.fc9.src.rpm:1217870618
 flam3-2_7_15-1_fc9:F-8:flam3-2.7.15-1.fc9.src.rpm:1220499885
+flam3-2_7_16-1_fc9:F-8:flam3-2.7.16-1.fc9.src.rpm:1221188265


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Sep 2008 03:47:28 -0000	1.9
+++ sources	12 Sep 2008 03:00:16 -0000	1.10
@@ -1 +1 @@
-d65e28f27866820117ee2039dbcf1c0b  flam3-2.7.15.tar.gz
+890b95d0fdb9cc97fdd1c42d77122116  flam3-2.7.16.tar.gz



From ianweller at fedoraproject.org  Fri Sep 12 03:02:40 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Fri, 12 Sep 2008 03:02:40 +0000 (UTC)
Subject: rpms/flam3/EL-5 .cvsignore, 1.7, 1.8 flam3.spec, 1.7, 1.8 import.log,
	1.1, 1.2 sources, 1.7, 1.8
Message-ID: <20080912030240.35A5C70132@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/flam3/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23595/EL-5

Modified Files:
	.cvsignore flam3.spec import.log sources 
Log Message:
import flam3-2.7.16-1 into EL-5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	4 Aug 2008 17:22:34 -0000	1.7
+++ .cvsignore	12 Sep 2008 03:02:09 -0000	1.8
@@ -1 +1 @@
-flam3-2.7.14.tar.gz
+flam3-2.7.16.tar.gz


Index: flam3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/EL-5/flam3.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- flam3.spec	4 Aug 2008 17:22:34 -0000	1.7
+++ flam3.spec	12 Sep 2008 03:02:09 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           flam3
-Version:        2.7.14
+Version:        2.7.16
 Release:        1%{?dist}
 Summary:        Programs to generate and render cosmic recursive fractal flames
 
@@ -86,6 +86,44 @@
 
 
 %changelog
+* Thu Sep 11 2008 Ian Weller <ianweller at gmail.com> 2.7.16-1
+- Upstream updated:
+    Added 'clone_all' to flam3_genome to allow application of 
+    template to all flames in a file at once, and 'animate' to write
+    a full sequence of interpolations out.  'animate' is similar to 
+    'sequence' except that no control point rotation is performed.  
+    Fixed non-functional 'write_genome' env var for flam3_animate.  
+    Two bugs associated with interpolating from a log interpolation_type
+    to a non-log interpolation_type fixed (rotate angle reduction and 
+    special inverted identity).  when using flam3_rotate in 'spin_inter'
+    the interp type of the first genome is now used rather than the
+    current genome's interp type.  Enforced upper and lower bounds for
+    xform color and upper bound for interpolated colormap values
+    as "smooth" interpolation led to values out of range.  If "smooth"
+    interpolation is specified for all flames in a file, the first and
+    second-to-last genome is switched to "linear" with a warning.
+    spatial filters with non-box-filter window functions fixed.
+    Release as 2.7.16.
+
+* Wed Sep 03 2008 Ian Weller <ianweller at gmail.com> 2.7.15-1
+- Upstream updated:
+    Added new interpolation types 'old' and 'older', for use in 
+    recreating old animations.  'linear' mode now does not rotate padded
+    xforms (results in prettier symmetric singularities). switched to
+    using a 'padding' flag instead of a 'just initialized' flag; padding 
+    flag used for implementation of 'old' and 'older' types.  
+    interpolation_space now deprecated, instead use interpolation_type. 
+    flam3_align is now idempotent (multiple applications do not change
+    the control points.)  Default number of temporal samples bumped to 
+    1000.  Removed CVS headers from source code (now using SVN).
+    Default interpolation mode now log. Removed 'move' and 'split' vars.
+    changes to flam3-genome: sequence mode now returns linear 
+    interpolation mode for all control points except first/last of edges 
+    - these cps will use the original interpolation mode;  inter and 
+    rotate modes will now return padded genomes for all control points,
+    all with linear interpolation specified.  instead of centering 
+    sometimes reframe by golden mean plus noise. Release as 2.7.15.
+
 * Mon Aug 04 2008 Ian Weller <ianweller at gmail.com> 2.7.14-1
 - Upstream updated:
     Add configuration option for atomic-ops.  bug fix: do not


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Aug 2008 17:22:34 -0000	1.1
+++ import.log	12 Sep 2008 03:02:09 -0000	1.2
@@ -1 +1,2 @@
 flam3-2_7_14-1_fc9:EL-5:flam3-2.7.14-1.fc9.src.rpm:1217870539
+flam3-2_7_16-1_fc9:EL-5:flam3-2.7.16-1.fc9.src.rpm:1221188470


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Aug 2008 17:22:34 -0000	1.7
+++ sources	12 Sep 2008 03:02:09 -0000	1.8
@@ -1 +1 @@
-94bdff2e2e1f3051e46780d0fd153577  flam3-2.7.14.tar.gz
+890b95d0fdb9cc97fdd1c42d77122116  flam3-2.7.16.tar.gz



From ianweller at fedoraproject.org  Fri Sep 12 03:08:30 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Fri, 12 Sep 2008 03:08:30 +0000 (UTC)
Subject: rpms/flam3/EL-4 .cvsignore, 1.7, 1.8 flam3.spec, 1.8, 1.9 import.log,
	1.1, 1.2 sources, 1.7, 1.8
Message-ID: <20080912030830.13E3070131@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/flam3/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24811/EL-4

Modified Files:
	.cvsignore flam3.spec import.log sources 
Log Message:
import flam3-2.7.16-1 into EL-4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/EL-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	4 Aug 2008 17:21:26 -0000	1.7
+++ .cvsignore	12 Sep 2008 03:07:59 -0000	1.8
@@ -1 +1 @@
-flam3-2.7.14.tar.gz
+flam3-2.7.16.tar.gz


Index: flam3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/EL-4/flam3.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- flam3.spec	4 Aug 2008 17:21:26 -0000	1.8
+++ flam3.spec	12 Sep 2008 03:07:59 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           flam3
-Version:        2.7.14
+Version:        2.7.16
 Release:        1%{?dist}
 Summary:        Programs to generate and render cosmic recursive fractal flames
 
@@ -86,6 +86,44 @@
 
 
 %changelog
+* Thu Sep 11 2008 Ian Weller <ianweller at gmail.com> 2.7.16-1
+- Upstream updated:
+    Added 'clone_all' to flam3_genome to allow application of 
+    template to all flames in a file at once, and 'animate' to write
+    a full sequence of interpolations out.  'animate' is similar to 
+    'sequence' except that no control point rotation is performed.  
+    Fixed non-functional 'write_genome' env var for flam3_animate.  
+    Two bugs associated with interpolating from a log interpolation_type
+    to a non-log interpolation_type fixed (rotate angle reduction and 
+    special inverted identity).  when using flam3_rotate in 'spin_inter'
+    the interp type of the first genome is now used rather than the
+    current genome's interp type.  Enforced upper and lower bounds for
+    xform color and upper bound for interpolated colormap values
+    as "smooth" interpolation led to values out of range.  If "smooth"
+    interpolation is specified for all flames in a file, the first and
+    second-to-last genome is switched to "linear" with a warning.
+    spatial filters with non-box-filter window functions fixed.
+    Release as 2.7.16.
+
+* Wed Sep 03 2008 Ian Weller <ianweller at gmail.com> 2.7.15-1
+- Upstream updated:
+    Added new interpolation types 'old' and 'older', for use in 
+    recreating old animations.  'linear' mode now does not rotate padded
+    xforms (results in prettier symmetric singularities). switched to
+    using a 'padding' flag instead of a 'just initialized' flag; padding 
+    flag used for implementation of 'old' and 'older' types.  
+    interpolation_space now deprecated, instead use interpolation_type. 
+    flam3_align is now idempotent (multiple applications do not change
+    the control points.)  Default number of temporal samples bumped to 
+    1000.  Removed CVS headers from source code (now using SVN).
+    Default interpolation mode now log. Removed 'move' and 'split' vars.
+    changes to flam3-genome: sequence mode now returns linear 
+    interpolation mode for all control points except first/last of edges 
+    - these cps will use the original interpolation mode;  inter and 
+    rotate modes will now return padded genomes for all control points,
+    all with linear interpolation specified.  instead of centering 
+    sometimes reframe by golden mean plus noise. Release as 2.7.15.
+
 * Mon Aug 04 2008 Ian Weller <ianweller at gmail.com> 2.7.14-1
 - Upstream updated:
     Add configuration option for atomic-ops.  bug fix: do not


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Aug 2008 17:21:26 -0000	1.1
+++ import.log	12 Sep 2008 03:07:59 -0000	1.2
@@ -1 +1,2 @@
 flam3-2_7_14-1_fc9:EL-4:flam3-2.7.14-1.fc9.src.rpm:1217870465
+flam3-2_7_16-1_fc9:EL-4:flam3-2.7.16-1.fc9.src.rpm:1221188573


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Aug 2008 17:21:26 -0000	1.7
+++ sources	12 Sep 2008 03:07:59 -0000	1.8
@@ -1 +1 @@
-94bdff2e2e1f3051e46780d0fd153577  flam3-2.7.14.tar.gz
+890b95d0fdb9cc97fdd1c42d77122116  flam3-2.7.16.tar.gz



From pkgdb at fedoraproject.org  Fri Sep 12 03:15:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 03:15:17 +0000
Subject: [pkgdb] weplab was added for fab
Message-ID: <20080912031517.BAC06208D9F@bastion.fedora.phx.redhat.com>

huzaifas has added Package weplab with summary Analyzing WEP encryption security on wireless networks
huzaifas has approved Package weplab
huzaifas has added a Fedora devel branch for weplab with an owner of fab
huzaifas has approved weplab in Fedora devel
huzaifas has approved Package weplab
huzaifas has set commit to Approved for packager on weplab (Fedora devel)
huzaifas has set build to Approved for packager on weplab (Fedora devel)
huzaifas has set checkout to Approved for packager on weplab (Fedora devel)
huzaifas has set commit to Approved for uberpackager on weplab (Fedora devel)
huzaifas has set build to Approved for uberpackager on weplab (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on weplab (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/weplab



From pkgdb at fedoraproject.org  Fri Sep 12 03:15:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 03:15:18 +0000
Subject: [pkgdb] weplab (Fedora, 9) updated by huzaifas
Message-ID: <20080912031518.8F4FC208DA2@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for weplab
huzaifas has set commit to Approved for uberpackager on weplab (Fedora 9)
huzaifas has set build to Approved for uberpackager on weplab (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on weplab (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/weplab



From pkgdb at fedoraproject.org  Fri Sep 12 03:15:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 03:15:18 +0000
Subject: [pkgdb] weplab (Fedora, 8) updated by huzaifas
Message-ID: <20080912031518.BA58D208DA5@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for weplab
huzaifas has set commit to Approved for uberpackager on weplab (Fedora 8)
huzaifas has set build to Approved for uberpackager on weplab (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on weplab (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/weplab



From huzaifas at fedoraproject.org  Fri Sep 12 03:15:59 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 03:15:59 +0000 (UTC)
Subject: rpms/weplab - New directory
Message-ID: <20080912031559.48EE170131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/weplab
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsR26347/rpms/weplab

Log Message:
Directory /cvs/extras/rpms/weplab added to the repository




From huzaifas at fedoraproject.org  Fri Sep 12 03:16:01 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 03:16:01 +0000 (UTC)
Subject: rpms/weplab Makefile,NONE,1.1
Message-ID: <20080912031601.196B370131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/weplab
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsR26347/rpms/weplab

Added Files:
	Makefile 
Log Message:
Setup of module weplab


--- NEW FILE Makefile ---
# Top level Makefile for module weplab
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep 12 03:16:01 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 03:16:01 +0000 (UTC)
Subject: rpms/weplab/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080912031601.7A6D170131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/weplab/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsR26347/rpms/weplab/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module weplab


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: weplab
# $Id: Makefile,v 1.1 2008/09/12 03:16:01 huzaifas Exp $
NAME := weplab
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From huzaifas at fedoraproject.org  Fri Sep 12 03:15:59 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 03:15:59 +0000 (UTC)
Subject: rpms/weplab/devel - New directory
Message-ID: <20080912031559.9F83170131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/weplab/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsR26347/rpms/weplab/devel

Log Message:
Directory /cvs/extras/rpms/weplab/devel added to the repository




From ianweller at fedoraproject.org  Fri Sep 12 03:18:15 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Fri, 12 Sep 2008 03:18:15 +0000 (UTC)
Subject: rpms/qosmic/devel .cvsignore, 1.6, 1.7 import.log, 1.1,
	1.2 qosmic.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20080912031815.9701870131@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/qosmic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26814/devel

Modified Files:
	.cvsignore import.log qosmic.spec sources 
Log Message:
import qosmic-1.4.1-1 in devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Aug 2008 19:26:52 -0000	1.6
+++ .cvsignore	12 Sep 2008 03:17:44 -0000	1.7
@@ -1 +1 @@
-qosmic-1.4.tar.bz2
+qosmic-1.4.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Aug 2008 19:26:52 -0000	1.1
+++ import.log	12 Sep 2008 03:17:45 -0000	1.2
@@ -1 +1,2 @@
 qosmic-1_4-1_fc9:HEAD:qosmic-1.4-1.fc9.src.rpm:1217877764
+qosmic-1_4_1-1_fc9:HEAD:qosmic-1.4.1-1.fc9.src.rpm:1221189299


Index: qosmic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/devel/qosmic.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qosmic.spec	4 Aug 2008 19:26:52 -0000	1.9
+++ qosmic.spec	12 Sep 2008 03:17:45 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           qosmic
-Version:        1.4
+Version:        1.4.1
 Release:        1%{?dist}
 Summary:        A cosmic recursive fractal flame editor written in Qt4
 
@@ -11,12 +11,12 @@
 Source2:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  flam3-devel >= 2.7.11
+BuildRequires:  flam3-devel >= 2.7.16
 BuildRequires:  qt4-devel >= 4.3.1
 BuildRequires:  ImageMagick
 BuildRequires:  desktop-file-utils
 BuildRequires:  lua-devel
-Requires:       flam3 >= 2.7.11
+Requires:       flam3 >= 2.7.16
 
 %description
 Qosmic is a nifty toy with which you can edit and render flam3 fractal images.
@@ -59,6 +59,20 @@
 
 
 %changelog
+* Thu Sep 11 2008 Ian Weller <ianweller at gmail.com> 1.4.1-1
+  - Updated upstream:
+  - Viewer presets can be renamed and changed, and they no longer modify the
+    final image size.
+  - Added support for UGR gradient files to the palette editor.
+  - Updated all debug messages to work with 64bit systems.
+  - Several rendering scheduling bugfixes.
+  - Fixed a crash bug in the genome selection widget, and also adjusted the
+    layout.
+  - Automatically rescale the genome when the image size is changed.
+  - Fixed a some scaling and redrawing problems in the figure editor.
+  - Updated to flam3-2.7.16.
+- Updated flam3 requires to 2.7.16
+
 * Mon Aug 04 2008 Ian Weller <ianweller at gmail.com> 1.4-1
 - Updated upstream:
   - Fixed a bug in calculating the scaling factor when resizing triangles.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Aug 2008 19:26:52 -0000	1.7
+++ sources	12 Sep 2008 03:17:45 -0000	1.8
@@ -1 +1 @@
-5d1d1486bead6721526fbbba035c5408  qosmic-1.4.tar.bz2
+d2c25d0f617575d94d2a903c44fc4e0c  qosmic-1.4.1.tar.bz2



From pkgdb at fedoraproject.org  Fri Sep 12 03:19:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 03:19:15 +0000
Subject: [pkgdb] rsstool was added for ianweller
Message-ID: <20080912031915.9D957208D98@bastion.fedora.phx.redhat.com>

huzaifas has added Package rsstool with summary Command-line RSS/Atom parser and generator
huzaifas has approved Package rsstool
huzaifas has added a Fedora devel branch for rsstool with an owner of ianweller
huzaifas has approved rsstool in Fedora devel
huzaifas has approved Package rsstool
huzaifas has set commit to Approved for packager on rsstool (Fedora devel)
huzaifas has set build to Approved for packager on rsstool (Fedora devel)
huzaifas has set checkout to Approved for packager on rsstool (Fedora devel)
huzaifas has set commit to Approved for uberpackager on rsstool (Fedora devel)
huzaifas has set build to Approved for uberpackager on rsstool (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on rsstool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rsstool



From pkgdb at fedoraproject.org  Fri Sep 12 03:19:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 03:19:16 +0000
Subject: [pkgdb] rsstool (Fedora, 8) updated by huzaifas
Message-ID: <20080912031916.9A730208DA3@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for rsstool
huzaifas has set commit to Approved for uberpackager on rsstool (Fedora 8)
huzaifas has set build to Approved for uberpackager on rsstool (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on rsstool (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rsstool



From pkgdb at fedoraproject.org  Fri Sep 12 03:19:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 03:19:16 +0000
Subject: [pkgdb] rsstool (Fedora EPEL, 4) updated by huzaifas
Message-ID: <20080912031916.85D9A208D9E@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 4 branch for rsstool
huzaifas has set commit to Approved for uberpackager on rsstool (Fedora EPEL 4)
huzaifas has set build to Approved for uberpackager on rsstool (Fedora EPEL 4)
huzaifas has set checkout to Approved for uberpackager on rsstool (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rsstool



From pkgdb at fedoraproject.org  Fri Sep 12 03:19:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 03:19:16 +0000
Subject: [pkgdb] rsstool (Fedora, 9) updated by huzaifas
Message-ID: <20080912031916.8BF14208DA1@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for rsstool
huzaifas has set commit to Approved for uberpackager on rsstool (Fedora 9)
huzaifas has set build to Approved for uberpackager on rsstool (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on rsstool (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rsstool



From pkgdb at fedoraproject.org  Fri Sep 12 03:19:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 03:19:16 +0000
Subject: [pkgdb] rsstool (Fedora EPEL, 5) updated by huzaifas
Message-ID: <20080912031916.A89B8208DA6@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 5 branch for rsstool
huzaifas has set commit to Approved for uberpackager on rsstool (Fedora EPEL 5)
huzaifas has set build to Approved for uberpackager on rsstool (Fedora EPEL 5)
huzaifas has set checkout to Approved for uberpackager on rsstool (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rsstool



From ianweller at fedoraproject.org  Fri Sep 12 03:19:39 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Fri, 12 Sep 2008 03:19:39 +0000 (UTC)
Subject: rpms/qosmic/F-9 .cvsignore, 1.6, 1.7 import.log, 1.1,
	1.2 qosmic.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20080912031939.B0F3870131@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/qosmic/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27233/F-9

Modified Files:
	.cvsignore import.log qosmic.spec sources 
Log Message:
import qosmic-1.4.1-1 in F-9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Aug 2008 19:21:45 -0000	1.6
+++ .cvsignore	12 Sep 2008 03:19:09 -0000	1.7
@@ -1 +1 @@
-qosmic-1.4.tar.bz2
+qosmic-1.4.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Aug 2008 19:21:45 -0000	1.1
+++ import.log	12 Sep 2008 03:19:09 -0000	1.2
@@ -1 +1,2 @@
 qosmic-1_4-1_fc9:F-9:qosmic-1.4-1.fc9.src.rpm:1217877692
+qosmic-1_4_1-1_fc9:F-9:qosmic-1.4.1-1.fc9.src.rpm:1221189509


Index: qosmic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/F-9/qosmic.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qosmic.spec	4 Aug 2008 19:21:45 -0000	1.9
+++ qosmic.spec	12 Sep 2008 03:19:09 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           qosmic
-Version:        1.4
+Version:        1.4.1
 Release:        1%{?dist}
 Summary:        A cosmic recursive fractal flame editor written in Qt4
 
@@ -11,12 +11,12 @@
 Source2:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  flam3-devel >= 2.7.11
+BuildRequires:  flam3-devel >= 2.7.16
 BuildRequires:  qt4-devel >= 4.3.1
 BuildRequires:  ImageMagick
 BuildRequires:  desktop-file-utils
 BuildRequires:  lua-devel
-Requires:       flam3 >= 2.7.11
+Requires:       flam3 >= 2.7.16
 
 %description
 Qosmic is a nifty toy with which you can edit and render flam3 fractal images.
@@ -59,6 +59,20 @@
 
 
 %changelog
+* Thu Sep 11 2008 Ian Weller <ianweller at gmail.com> 1.4.1-1
+  - Updated upstream:
+  - Viewer presets can be renamed and changed, and they no longer modify the
+    final image size.
+  - Added support for UGR gradient files to the palette editor.
+  - Updated all debug messages to work with 64bit systems.
+  - Several rendering scheduling bugfixes.
+  - Fixed a crash bug in the genome selection widget, and also adjusted the
+    layout.
+  - Automatically rescale the genome when the image size is changed.
+  - Fixed a some scaling and redrawing problems in the figure editor.
+  - Updated to flam3-2.7.16.
+- Updated flam3 requires to 2.7.16
+
 * Mon Aug 04 2008 Ian Weller <ianweller at gmail.com> 1.4-1
 - Updated upstream:
   - Fixed a bug in calculating the scaling factor when resizing triangles.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Aug 2008 19:21:45 -0000	1.7
+++ sources	12 Sep 2008 03:19:09 -0000	1.8
@@ -1 +1 @@
-5d1d1486bead6721526fbbba035c5408  qosmic-1.4.tar.bz2
+d2c25d0f617575d94d2a903c44fc4e0c  qosmic-1.4.1.tar.bz2



From huzaifas at fedoraproject.org  Fri Sep 12 03:19:41 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 03:19:41 +0000 (UTC)
Subject: rpms/rsstool - New directory
Message-ID: <20080912031941.27F9C70131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/rsstool
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsE27316/rpms/rsstool

Log Message:
Directory /cvs/extras/rpms/rsstool added to the repository




From huzaifas at fedoraproject.org  Fri Sep 12 03:19:41 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 03:19:41 +0000 (UTC)
Subject: rpms/rsstool/devel - New directory
Message-ID: <20080912031941.72D5170131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/rsstool/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsE27316/rpms/rsstool/devel

Log Message:
Directory /cvs/extras/rpms/rsstool/devel added to the repository




From huzaifas at fedoraproject.org  Fri Sep 12 03:19:42 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 03:19:42 +0000 (UTC)
Subject: rpms/rsstool Makefile,NONE,1.1
Message-ID: <20080912031942.B243D70131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/rsstool
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsE27316/rpms/rsstool

Added Files:
	Makefile 
Log Message:
Setup of module rsstool


--- NEW FILE Makefile ---
# Top level Makefile for module rsstool
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep 12 03:19:43 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 03:19:43 +0000 (UTC)
Subject: rpms/rsstool/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080912031943.1895F70131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/rsstool/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsE27316/rpms/rsstool/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rsstool


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rsstool
# $Id: Makefile,v 1.1 2008/09/12 03:19:42 huzaifas Exp $
NAME := rsstool
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From ianweller at fedoraproject.org  Fri Sep 12 03:20:36 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Fri, 12 Sep 2008 03:20:36 +0000 (UTC)
Subject: rpms/qosmic/F-8 .cvsignore, 1.6, 1.7 import.log, 1.1,
	1.2 qosmic.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20080912032036.55E6270131@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/qosmic/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27744/F-8

Modified Files:
	.cvsignore import.log qosmic.spec sources 
Log Message:
import qosmic-1.4.1-1 in F-8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/F-8/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Aug 2008 19:20:41 -0000	1.6
+++ .cvsignore	12 Sep 2008 03:20:05 -0000	1.7
@@ -1 +1 @@
-qosmic-1.4.tar.bz2
+qosmic-1.4.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/F-8/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Aug 2008 19:20:41 -0000	1.1
+++ import.log	12 Sep 2008 03:20:06 -0000	1.2
@@ -1 +1,2 @@
 qosmic-1_4-1_fc9:F-8:qosmic-1.4-1.fc9.src.rpm:1217877623
+qosmic-1_4_1-1_fc9:F-8:qosmic-1.4.1-1.fc9.src.rpm:1221189595


Index: qosmic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/F-8/qosmic.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qosmic.spec	4 Aug 2008 19:20:42 -0000	1.9
+++ qosmic.spec	12 Sep 2008 03:20:06 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           qosmic
-Version:        1.4
+Version:        1.4.1
 Release:        1%{?dist}
 Summary:        A cosmic recursive fractal flame editor written in Qt4
 
@@ -11,12 +11,12 @@
 Source2:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  flam3-devel >= 2.7.11
+BuildRequires:  flam3-devel >= 2.7.16
 BuildRequires:  qt4-devel >= 4.3.1
 BuildRequires:  ImageMagick
 BuildRequires:  desktop-file-utils
 BuildRequires:  lua-devel
-Requires:       flam3 >= 2.7.11
+Requires:       flam3 >= 2.7.16
 
 %description
 Qosmic is a nifty toy with which you can edit and render flam3 fractal images.
@@ -59,6 +59,20 @@
 
 
 %changelog
+* Thu Sep 11 2008 Ian Weller <ianweller at gmail.com> 1.4.1-1
+  - Updated upstream:
+  - Viewer presets can be renamed and changed, and they no longer modify the
+    final image size.
+  - Added support for UGR gradient files to the palette editor.
+  - Updated all debug messages to work with 64bit systems.
+  - Several rendering scheduling bugfixes.
+  - Fixed a crash bug in the genome selection widget, and also adjusted the
+    layout.
+  - Automatically rescale the genome when the image size is changed.
+  - Fixed a some scaling and redrawing problems in the figure editor.
+  - Updated to flam3-2.7.16.
+- Updated flam3 requires to 2.7.16
+
 * Mon Aug 04 2008 Ian Weller <ianweller at gmail.com> 1.4-1
 - Updated upstream:
   - Fixed a bug in calculating the scaling factor when resizing triangles.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Aug 2008 19:20:42 -0000	1.7
+++ sources	12 Sep 2008 03:20:06 -0000	1.8
@@ -1 +1 @@
-5d1d1486bead6721526fbbba035c5408  qosmic-1.4.tar.bz2
+d2c25d0f617575d94d2a903c44fc4e0c  qosmic-1.4.1.tar.bz2



From pkgdb at fedoraproject.org  Fri Sep 12 03:22:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 03:22:12 +0000
Subject: [pkgdb] ember was added for atorkhov
Message-ID: <20080912032212.4F1D0208D29@bastion.fedora.phx.redhat.com>

huzaifas has added Package ember with summary 3D Client for WorldForge
huzaifas has approved Package ember
huzaifas has added a Fedora devel branch for ember with an owner of atorkhov
huzaifas has approved ember in Fedora devel
huzaifas has approved Package ember
huzaifas has set commit to Approved for packager on ember (Fedora devel)
huzaifas has set build to Approved for packager on ember (Fedora devel)
huzaifas has set checkout to Approved for packager on ember (Fedora devel)
huzaifas has set commit to Approved for uberpackager on ember (Fedora devel)
huzaifas has set build to Approved for uberpackager on ember (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on ember (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ember



From pkgdb at fedoraproject.org  Fri Sep 12 03:22:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 03:22:12 +0000
Subject: [pkgdb] ember (Fedora, devel) updated by huzaifas
Message-ID: <20080912032213.109F1208D9C@bastion.fedora.phx.redhat.com>

huzaifas approved watchbugzilla on ember (Fedora devel) for wart
huzaifas approved watchcommits on ember (Fedora devel) for wart
huzaifas approved commit on ember (Fedora devel) for wart
huzaifas approved build on ember (Fedora devel) for wart
huzaifas approved approveacls on ember (Fedora devel) for wart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ember



From pkgdb at fedoraproject.org  Fri Sep 12 03:22:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 03:22:12 +0000
Subject: [pkgdb] ember (Fedora, 9) updated by huzaifas
Message-ID: <20080912032213.20E05208DA1@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for ember
huzaifas has set commit to Approved for uberpackager on ember (Fedora 9)
huzaifas has set build to Approved for uberpackager on ember (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on ember (Fedora 9)
huzaifas approved watchbugzilla on ember (Fedora 9) for wart
huzaifas approved watchcommits on ember (Fedora 9) for wart
huzaifas approved commit on ember (Fedora 9) for wart
huzaifas approved build on ember (Fedora 9) for wart
huzaifas approved approveacls on ember (Fedora 9) for wart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ember



From huzaifas at fedoraproject.org  Fri Sep 12 03:22:34 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 03:22:34 +0000 (UTC)
Subject: rpms/ember Makefile,NONE,1.1
Message-ID: <20080912032234.9C65870131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/ember
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvss28306/rpms/ember

Added Files:
	Makefile 
Log Message:
Setup of module ember


--- NEW FILE Makefile ---
# Top level Makefile for module ember
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep 12 03:22:33 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 03:22:33 +0000 (UTC)
Subject: rpms/ember - New directory
Message-ID: <20080912032233.30BBB70131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/ember
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvss28306/rpms/ember

Log Message:
Directory /cvs/extras/rpms/ember added to the repository




From huzaifas at fedoraproject.org  Fri Sep 12 03:22:33 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 03:22:33 +0000 (UTC)
Subject: rpms/ember/devel - New directory
Message-ID: <20080912032233.7CA2870131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/ember/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvss28306/rpms/ember/devel

Log Message:
Directory /cvs/extras/rpms/ember/devel added to the repository




From huzaifas at fedoraproject.org  Fri Sep 12 03:22:34 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 03:22:34 +0000 (UTC)
Subject: rpms/ember/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20080912032234.E1DCC70131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/ember/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvss28306/rpms/ember/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ember


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ember
# $Id: Makefile,v 1.1 2008/09/12 03:22:34 huzaifas Exp $
NAME := ember
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 12 03:24:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 03:24:20 +0000
Subject: [pkgdb] ember-media was added for atorkhov
Message-ID: <20080912032420.B2A02208D98@bastion.fedora.phx.redhat.com>

huzaifas has added Package ember-media with summary Ember media files
huzaifas has approved Package ember-media
huzaifas has added a Fedora devel branch for ember-media with an owner of atorkhov
huzaifas has approved ember-media in Fedora devel
huzaifas has approved Package ember-media
huzaifas has set commit to Approved for packager on ember-media (Fedora devel)
huzaifas has set build to Approved for packager on ember-media (Fedora devel)
huzaifas has set checkout to Approved for packager on ember-media (Fedora devel)
huzaifas has set commit to Approved for uberpackager on ember-media (Fedora devel)
huzaifas has set build to Approved for uberpackager on ember-media (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on ember-media (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ember-media



From pkgdb at fedoraproject.org  Fri Sep 12 03:24:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 03:24:22 +0000
Subject: [pkgdb] ember-media (Fedora, devel) updated by huzaifas
Message-ID: <20080912032422.3A0B8208D9E@bastion.fedora.phx.redhat.com>

huzaifas approved watchbugzilla on ember-media (Fedora devel) for wart
huzaifas approved watchcommits on ember-media (Fedora devel) for wart
huzaifas approved commit on ember-media (Fedora devel) for wart
huzaifas approved build on ember-media (Fedora devel) for wart
huzaifas approved approveacls on ember-media (Fedora devel) for wart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ember-media



From pkgdb at fedoraproject.org  Fri Sep 12 03:24:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 03:24:22 +0000
Subject: [pkgdb] ember-media (Fedora, 9) updated by huzaifas
Message-ID: <20080912032422.4F078208DA2@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for ember-media
huzaifas has set commit to Approved for uberpackager on ember-media (Fedora 9)
huzaifas has set build to Approved for uberpackager on ember-media (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on ember-media (Fedora 9)
huzaifas approved watchbugzilla on ember-media (Fedora 9) for wart
huzaifas approved watchcommits on ember-media (Fedora 9) for wart
huzaifas approved commit on ember-media (Fedora 9) for wart
huzaifas approved build on ember-media (Fedora 9) for wart
huzaifas approved approveacls on ember-media (Fedora 9) for wart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ember-media



From corsepiu at fedoraproject.org  Fri Sep 12 03:38:47 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Fri, 12 Sep 2008 03:38:47 +0000 (UTC)
Subject: rpms/perl-Data-ICal/F-9 perl-Data-ICal.spec,1.1,1.2
Message-ID: <20080912033847.EC3CC70131@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Data-ICal/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30855/F-9

Modified Files:
	perl-Data-ICal.spec 
Log Message:
* Fri Sep 12 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.13-3
- Fix minor typo in spec.



Index: perl-Data-ICal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-ICal/F-9/perl-Data-ICal.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Data-ICal.spec	30 Aug 2008 03:08:05 -0000	1.1
+++ perl-Data-ICal.spec	12 Sep 2008 03:38:17 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Data-ICal
 Version:        0.13
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Generates iCalendar (RFC 2445) calendar files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,8 +56,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Sep 12 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.13-3
+- Fix minor typo in spec.
+
 * Tue Aug 26 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.13-2
-- Clean up up spec.
+- Clean up spec.
 - Fedora submission.
 
 * Mon Aug 11 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.13-1



From corsepiu at fedoraproject.org  Fri Sep 12 03:38:47 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Fri, 12 Sep 2008 03:38:47 +0000 (UTC)
Subject: rpms/perl-Data-ICal/devel perl-Data-ICal.spec,1.1,1.2
Message-ID: <20080912033847.CD53F70131@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Data-ICal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30855/devel

Modified Files:
	perl-Data-ICal.spec 
Log Message:
* Fri Sep 12 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.13-3
- Fix minor typo in spec.



Index: perl-Data-ICal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-ICal/devel/perl-Data-ICal.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Data-ICal.spec	30 Aug 2008 03:04:30 -0000	1.1
+++ perl-Data-ICal.spec	12 Sep 2008 03:38:17 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Data-ICal
 Version:        0.13
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Generates iCalendar (RFC 2445) calendar files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,8 +56,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Sep 12 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.13-3
+- Fix minor typo in spec.
+
 * Tue Aug 26 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.13-2
-- Clean up up spec.
+- Clean up spec.
 - Fedora submission.
 
 * Mon Aug 11 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.13-1



From corsepiu at fedoraproject.org  Fri Sep 12 03:38:48 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Fri, 12 Sep 2008 03:38:48 +0000 (UTC)
Subject: rpms/perl-Data-ICal/F-8 perl-Data-ICal.spec,1.1,1.2
Message-ID: <20080912033848.353C970131@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Data-ICal/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30855/F-8

Modified Files:
	perl-Data-ICal.spec 
Log Message:
* Fri Sep 12 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.13-3
- Fix minor typo in spec.



Index: perl-Data-ICal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-ICal/F-8/perl-Data-ICal.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Data-ICal.spec	30 Aug 2008 03:08:06 -0000	1.1
+++ perl-Data-ICal.spec	12 Sep 2008 03:38:17 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Data-ICal
 Version:        0.13
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Generates iCalendar (RFC 2445) calendar files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,8 +56,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Sep 12 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.13-3
+- Fix minor typo in spec.
+
 * Tue Aug 26 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.13-2
-- Clean up up spec.
+- Clean up spec.
 - Fedora submission.
 
 * Mon Aug 11 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.13-1



From konradm at fedoraproject.org  Fri Sep 12 04:02:02 2008
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Fri, 12 Sep 2008 04:02:02 +0000 (UTC)
Subject: rpms/sdcc/devel sdcc-2.8.0-configure.diff, NONE,
	1.1 sdcc-2.8.0-debugger-makefile.diff, NONE, 1.1 .cvsignore, 1.2,
	1.3 sdcc.spec, 1.6, 1.7 sources, 1.2,
	1.3 sdcc-2.6.0-configure.diff, 1.1,
	NONE sdcc-2.6.0-sdccman.lyx.patch, 1.1, NONE
Message-ID: <20080912040202.7F0C370131@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/sdcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3263

Modified Files:
	.cvsignore sdcc.spec sources 
Added Files:
	sdcc-2.8.0-configure.diff sdcc-2.8.0-debugger-makefile.diff 
Removed Files:
	sdcc-2.6.0-configure.diff sdcc-2.6.0-sdccman.lyx.patch 
Log Message:
* Tue Sep 9 2008 Conrad Meyer <konrad at tylerc.org> - 2.8.0-1
- Bump to 2.8.0.
- Patch configure to not mess up CFLAGS.
- Patch debugger Makefile to not break canonicalized paths.

sdcc-2.8.0-configure.diff:

--- NEW FILE sdcc-2.8.0-configure.diff ---
diff -r -U 5 sdcc.orig/configure sdcc/configure
--- sdcc.orig/configure	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/configure	2008-09-09 02:29:24.000000000 -0700
@@ -2516,11 +2516,11 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
-   CFLAGS="-g"
+:  CFLAGS="-g"
    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -2554,11 +2554,11 @@
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	CFLAGS=""
+:	CFLAGS=""
       cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -2593,11 +2593,11 @@
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
+:	 CFLAGS="-g"
 	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -2646,22 +2646,22 @@
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
+: CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+:   CFLAGS="-g -O2"
   else
-    CFLAGS="-g"
+:   CFLAGS="-g"
   fi
 else
   if test "$GCC" = yes; then
-    CFLAGS="-O2"
+:   CFLAGS="-O2"
   else
-    CFLAGS=
+:   CFLAGS=
   fi
 fi
 { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
 echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
@@ -3794,11 +3794,11 @@
 fi
 { echo "$as_me:$LINENO: result: $sdcc_cv_CCggdb" >&5
 echo "${ECHO_T}$sdcc_cv_CCggdb" >&6; }
 
 if test "$sdcc_cv_CCggdb" = "yes"; then
-  CFLAGS="-ggdb ${CFLAGS}"
+: CFLAGS="-ggdb ${CFLAGS}"
 fi
 
 
 { echo "$as_me:$LINENO: checking whether $CC accepts -pipe" >&5
 echo $ECHO_N "checking whether $CC accepts -pipe... $ECHO_C" >&6; }
@@ -3819,11 +3819,11 @@
 fi
 { echo "$as_me:$LINENO: result: $sdcc_cv_CCpipe" >&5
 echo "${ECHO_T}$sdcc_cv_CCpipe" >&6; }
 
 if test "$sdcc_cv_CCpipe" = "yes"; then
-  CFLAGS="-pipe $CFLAGS"
+: CFLAGS="-pipe $CFLAGS"
 fi
 
 
 # Checks for typedefs, structures, and compiler characteristics.
 # ===========================================================================
diff -r -U 5 sdcc.orig/configure.in sdcc/configure.in
--- sdcc.orig/configure.in	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/configure.in	2008-09-09 02:29:33.000000000 -0700
@@ -321,16 +321,16 @@
 AC_SUBST(M_OR_MM)
 
 # This is the first time when CFLAGS are set/modified!!
 adl_DD_COPT(CC, ggdb)
 if test "$sdcc_cv_CCggdb" = "yes"; then
-  CFLAGS="-ggdb ${CFLAGS}"
+: CFLAGS="-ggdb ${CFLAGS}"
 fi
 
 adl_DD_COPT(CC, pipe)
 if test "$sdcc_cv_CCpipe" = "yes"; then
-  CFLAGS="-pipe $CFLAGS"
+: CFLAGS="-pipe $CFLAGS"
 fi
 
 
 # Checks for typedefs, structures, and compiler characteristics.
 # ===========================================================================
diff -r -U 5 sdcc.orig/sim/ucsim/configure sdcc/sim/ucsim/configure
--- sdcc.orig/sim/ucsim/configure	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/sim/ucsim/configure	2008-09-09 02:30:25.000000000 -0700
@@ -12458,15 +12458,15 @@
 fi
 { echo "$as_me:$LINENO: result: $ucsim_cv_CXXgstabs" >&5
 echo "${ECHO_T}$ucsim_cv_CXXgstabs" >&6; }
 
 if test "$ucsim_cv_CXXgstabs" = "yes"; then
-   gopt="-gstabs+ -g3"
+:  gopt="-gstabs+ -g3"
 elif test "$ucsim_cv_CXXggdb" = "yes"; then
-     gopt="-ggdb -g3"
+:    gopt="-ggdb -g3"
 else
-     gopt="-g"
+:    gopt="-g"
 fi
 if test "$CXXFLAGS"x = x ;then
         CXXFLAGS="$gopt"
 else
         CXXFLAGS="$CXXFLAGS $gopt"
diff -r -U 5 sdcc.orig/sim/ucsim/configure.in sdcc/sim/ucsim/configure.in
--- sdcc.orig/sim/ucsim/configure.in	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/sim/ucsim/configure.in	2008-09-09 02:30:13.000000000 -0700
@@ -517,15 +517,15 @@
 # This is the first time when CFLAGS are set/modified!!
 
 DD_COPT(CXX, ggdb)
 DD_COPT(CXX, gstabs)
 if test "$ucsim_cv_CXXgstabs" = "yes"; then
-   gopt="-gstabs+ -g3"
+:  gopt="-gstabs+ -g3"
 elif test "$ucsim_cv_CXXggdb" = "yes"; then
-     gopt="-ggdb -g3"
+:    gopt="-ggdb -g3"
 else
-     gopt="-g"
+:    gopt="-g"
 fi
 if test "$CXXFLAGS"x = x ;then
         CXXFLAGS="$gopt"
 else
         CXXFLAGS="$CXXFLAGS $gopt"

sdcc-2.8.0-debugger-makefile.diff:

--- NEW FILE sdcc-2.8.0-debugger-makefile.diff ---
--- debugger/mcs51/Makefile.in.orig	2008-09-11 18:06:29.000000000 -0700
+++ debugger/mcs51/Makefile.in	2008-09-11 18:06:34.000000000 -0700
@@ -7,11 +7,11 @@
 CPP		= @CPP@
 INSTALL		= @INSTALL@
 STRIP           = @STRIP@
 
 
-top_builddir	= ../../
+top_builddir	= ../..
 top_srcdir	= @srcdir@/../..
 SLIB		= $(top_builddir)/support/Util
 SDCCLIB		= $(top_builddir)/src
 
 VPATH           = @srcdir@


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Mar 2007 16:08:20 -0000	1.2
+++ .cvsignore	12 Sep 2008 04:01:32 -0000	1.3
@@ -1 +1 @@
-sdcc-src-2.6.0.tar.gz
+sdcc-src-2.8.0.tar.bz2


Index: sdcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/devel/sdcc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sdcc.spec	4 Sep 2008 16:54:04 -0000	1.6
+++ sdcc.spec	12 Sep 2008 04:01:32 -0000	1.7
@@ -1,15 +1,14 @@
 Name:           sdcc
-Version:        2.6.0
-Release:        13%{?dist}
+Version:        2.8.0
+Release:        1%{?dist}
 Summary:        Small Device C Compiler
-
 Group:          Applications/Engineering
 License:        GPLv2+
-URL:            http://sdcc.sourceforge.net
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
+URL:            http://sdcc.sourceforge.net/
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.bz2
 Source1:        README.fedora
-Patch0:         sdcc-2.6.0-configure.diff
-Patch1:         sdcc-2.6.0-sdccman.lyx.patch 
+Patch0:         sdcc-2.8.0-configure.diff
+Patch1:		sdcc-2.8.0-debugger-makefile.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  flex
@@ -40,29 +39,9 @@
 %prep
 %setup -q -n sdcc
 %patch0 -p1
-%patch1 -p1
+%patch1 -p0
 find -name '*.[ch]' -exec chmod -x '{}' \;
 
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-
 
 %build
 %configure --enable-doc --enable-libgc STRIP=:
@@ -72,16 +51,16 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT Q=
-mv $RPM_BUILD_ROOT/%{_datadir}/%{name}/doc installed-docs
+mv $RPM_BUILD_ROOT%{_datadir}/doc installed-docs
 install -m 644 %SOURCE1 installed-docs
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp
-mv $RPM_BUILD_ROOT/%{_bindir}/*.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
+mv $RPM_BUILD_ROOT%{_bindir}/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
 find $RPM_BUILD_ROOT -type f -name \*.c -exec chmod a-x '{}' \;
-mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/sdcc
-mv $RPM_BUILD_ROOT/%{_bindir}/* $RPM_BUILD_ROOT/%{_libexecdir}/sdcc
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/sdcc
+mv $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_libexecdir}/sdcc
 
-# Creat lauch scripts in %{_bindir}
-pushd $RPM_BUILD_ROOT/%{_bindir}
+# Create launch scripts in %{_bindir}
+pushd $RPM_BUILD_ROOT%{_bindir}
 for x in ../libexec/sdcc/*; do 
 echo "#!/bin/sh
 PATH=/usr/libexec/sdcc:\$PATH
@@ -90,7 +69,6 @@
 done
 popd
 
-%define __os_install_post . ./os_install_post
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -113,6 +91,11 @@
 %{_datadir}/%{name}/lib/*/*.asm
 
 %changelog
+* Tue Sep 9 2008 Conrad Meyer <konrad at tylerc.org> - 2.8.0-1
+- Bump to 2.8.0.
+- Patch configure to not mess up CFLAGS.
+- Patch debugger Makefile to not break canonicalized paths.
+
 * Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.6.0-13
 - fix license tag
 
@@ -163,4 +146,3 @@
 
 * Thu Feb 1 2007 Trond Danielsen <trond.danielsen at gmail.com> - 2.6.0-1
 - Initial version.
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Mar 2007 16:08:20 -0000	1.2
+++ sources	12 Sep 2008 04:01:32 -0000	1.3
@@ -1 +1 @@
-70d6036226d852995237f30c5cb50960  sdcc-src-2.6.0.tar.gz
+1b9c2e581b92d5e3f13bca37c5784080  sdcc-src-2.8.0.tar.bz2


--- sdcc-2.6.0-configure.diff DELETED ---


--- sdcc-2.6.0-sdccman.lyx.patch DELETED ---



From konradm at fedoraproject.org  Fri Sep 12 04:02:19 2008
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Fri, 12 Sep 2008 04:02:19 +0000 (UTC)
Subject: rpms/sdcc/F-9 sdcc-2.8.0-configure.diff, NONE,
	1.1 sdcc-2.8.0-debugger-makefile.diff, NONE, 1.1 .cvsignore, 1.2,
	1.3 sdcc.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <20080912040219.3DAB470131@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/sdcc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3428

Modified Files:
	.cvsignore sdcc.spec sources 
Added Files:
	sdcc-2.8.0-configure.diff sdcc-2.8.0-debugger-makefile.diff 
Log Message:
* Tue Sep 9 2008 Conrad Meyer <konrad at tylerc.org> - 2.8.0-1
- Bump to 2.8.0.
- Patch configure to not mess up CFLAGS.
- Patch debugger Makefile to not break canonicalized paths.

sdcc-2.8.0-configure.diff:

--- NEW FILE sdcc-2.8.0-configure.diff ---
diff -r -U 5 sdcc.orig/configure sdcc/configure
--- sdcc.orig/configure	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/configure	2008-09-09 02:29:24.000000000 -0700
@@ -2516,11 +2516,11 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
-   CFLAGS="-g"
+:  CFLAGS="-g"
    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -2554,11 +2554,11 @@
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	CFLAGS=""
+:	CFLAGS=""
       cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -2593,11 +2593,11 @@
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
+:	 CFLAGS="-g"
 	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -2646,22 +2646,22 @@
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
+: CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+:   CFLAGS="-g -O2"
   else
-    CFLAGS="-g"
+:   CFLAGS="-g"
   fi
 else
   if test "$GCC" = yes; then
-    CFLAGS="-O2"
+:   CFLAGS="-O2"
   else
-    CFLAGS=
+:   CFLAGS=
   fi
 fi
 { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
 echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
@@ -3794,11 +3794,11 @@
 fi
 { echo "$as_me:$LINENO: result: $sdcc_cv_CCggdb" >&5
 echo "${ECHO_T}$sdcc_cv_CCggdb" >&6; }
 
 if test "$sdcc_cv_CCggdb" = "yes"; then
-  CFLAGS="-ggdb ${CFLAGS}"
+: CFLAGS="-ggdb ${CFLAGS}"
 fi
 
 
 { echo "$as_me:$LINENO: checking whether $CC accepts -pipe" >&5
 echo $ECHO_N "checking whether $CC accepts -pipe... $ECHO_C" >&6; }
@@ -3819,11 +3819,11 @@
 fi
 { echo "$as_me:$LINENO: result: $sdcc_cv_CCpipe" >&5
 echo "${ECHO_T}$sdcc_cv_CCpipe" >&6; }
 
 if test "$sdcc_cv_CCpipe" = "yes"; then
-  CFLAGS="-pipe $CFLAGS"
+: CFLAGS="-pipe $CFLAGS"
 fi
 
 
 # Checks for typedefs, structures, and compiler characteristics.
 # ===========================================================================
diff -r -U 5 sdcc.orig/configure.in sdcc/configure.in
--- sdcc.orig/configure.in	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/configure.in	2008-09-09 02:29:33.000000000 -0700
@@ -321,16 +321,16 @@
 AC_SUBST(M_OR_MM)
 
 # This is the first time when CFLAGS are set/modified!!
 adl_DD_COPT(CC, ggdb)
 if test "$sdcc_cv_CCggdb" = "yes"; then
-  CFLAGS="-ggdb ${CFLAGS}"
+: CFLAGS="-ggdb ${CFLAGS}"
 fi
 
 adl_DD_COPT(CC, pipe)
 if test "$sdcc_cv_CCpipe" = "yes"; then
-  CFLAGS="-pipe $CFLAGS"
+: CFLAGS="-pipe $CFLAGS"
 fi
 
 
 # Checks for typedefs, structures, and compiler characteristics.
 # ===========================================================================
diff -r -U 5 sdcc.orig/sim/ucsim/configure sdcc/sim/ucsim/configure
--- sdcc.orig/sim/ucsim/configure	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/sim/ucsim/configure	2008-09-09 02:30:25.000000000 -0700
@@ -12458,15 +12458,15 @@
 fi
 { echo "$as_me:$LINENO: result: $ucsim_cv_CXXgstabs" >&5
 echo "${ECHO_T}$ucsim_cv_CXXgstabs" >&6; }
 
 if test "$ucsim_cv_CXXgstabs" = "yes"; then
-   gopt="-gstabs+ -g3"
+:  gopt="-gstabs+ -g3"
 elif test "$ucsim_cv_CXXggdb" = "yes"; then
-     gopt="-ggdb -g3"
+:    gopt="-ggdb -g3"
 else
-     gopt="-g"
+:    gopt="-g"
 fi
 if test "$CXXFLAGS"x = x ;then
         CXXFLAGS="$gopt"
 else
         CXXFLAGS="$CXXFLAGS $gopt"
diff -r -U 5 sdcc.orig/sim/ucsim/configure.in sdcc/sim/ucsim/configure.in
--- sdcc.orig/sim/ucsim/configure.in	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/sim/ucsim/configure.in	2008-09-09 02:30:13.000000000 -0700
@@ -517,15 +517,15 @@
 # This is the first time when CFLAGS are set/modified!!
 
 DD_COPT(CXX, ggdb)
 DD_COPT(CXX, gstabs)
 if test "$ucsim_cv_CXXgstabs" = "yes"; then
-   gopt="-gstabs+ -g3"
+:  gopt="-gstabs+ -g3"
 elif test "$ucsim_cv_CXXggdb" = "yes"; then
-     gopt="-ggdb -g3"
+:    gopt="-ggdb -g3"
 else
-     gopt="-g"
+:    gopt="-g"
 fi
 if test "$CXXFLAGS"x = x ;then
         CXXFLAGS="$gopt"
 else
         CXXFLAGS="$CXXFLAGS $gopt"

sdcc-2.8.0-debugger-makefile.diff:

--- NEW FILE sdcc-2.8.0-debugger-makefile.diff ---
--- debugger/mcs51/Makefile.in.orig	2008-09-11 18:06:29.000000000 -0700
+++ debugger/mcs51/Makefile.in	2008-09-11 18:06:34.000000000 -0700
@@ -7,11 +7,11 @@
 CPP		= @CPP@
 INSTALL		= @INSTALL@
 STRIP           = @STRIP@
 
 
-top_builddir	= ../../
+top_builddir	= ../..
 top_srcdir	= @srcdir@/../..
 SLIB		= $(top_builddir)/support/Util
 SDCCLIB		= $(top_builddir)/src
 
 VPATH           = @srcdir@


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Mar 2007 16:08:20 -0000	1.2
+++ .cvsignore	12 Sep 2008 04:01:48 -0000	1.3
@@ -1 +1 @@
-sdcc-src-2.6.0.tar.gz
+sdcc-src-2.8.0.tar.bz2


Index: sdcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/F-9/sdcc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sdcc.spec	3 Mar 2008 10:33:09 -0000	1.5
+++ sdcc.spec	12 Sep 2008 04:01:48 -0000	1.6
@@ -1,15 +1,14 @@
 Name:           sdcc
-Version:        2.6.0
-Release:        12%{?dist}
+Version:        2.8.0
+Release:        1%{?dist}
 Summary:        Small Device C Compiler
-
 Group:          Applications/Engineering
-License:        GPL
-URL:            http://sdcc.sourceforge.net
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
+License:        GPLv2+
+URL:            http://sdcc.sourceforge.net/
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.bz2
 Source1:        README.fedora
-Patch0:         sdcc-2.6.0-configure.diff
-Patch1:         sdcc-2.6.0-sdccman.lyx.patch 
+Patch0:         sdcc-2.8.0-configure.diff
+Patch1:		sdcc-2.8.0-debugger-makefile.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  flex
@@ -40,29 +39,9 @@
 %prep
 %setup -q -n sdcc
 %patch0 -p1
-%patch1 -p1
+%patch1 -p0
 find -name '*.[ch]' -exec chmod -x '{}' \;
 
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-
 
 %build
 %configure --enable-doc --enable-libgc STRIP=:
@@ -72,16 +51,16 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT Q=
-mv $RPM_BUILD_ROOT/%{_datadir}/%{name}/doc installed-docs
+mv $RPM_BUILD_ROOT%{_datadir}/doc installed-docs
 install -m 644 %SOURCE1 installed-docs
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp
-mv $RPM_BUILD_ROOT/%{_bindir}/*.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
+mv $RPM_BUILD_ROOT%{_bindir}/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
 find $RPM_BUILD_ROOT -type f -name \*.c -exec chmod a-x '{}' \;
-mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/sdcc
-mv $RPM_BUILD_ROOT/%{_bindir}/* $RPM_BUILD_ROOT/%{_libexecdir}/sdcc
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/sdcc
+mv $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_libexecdir}/sdcc
 
-# Creat lauch scripts in %{_bindir}
-pushd $RPM_BUILD_ROOT/%{_bindir}
+# Create launch scripts in %{_bindir}
+pushd $RPM_BUILD_ROOT%{_bindir}
 for x in ../libexec/sdcc/*; do 
 echo "#!/bin/sh
 PATH=/usr/libexec/sdcc:\$PATH
@@ -90,7 +69,6 @@
 done
 popd
 
-%define __os_install_post . ./os_install_post
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -113,6 +91,14 @@
 %{_datadir}/%{name}/lib/*/*.asm
 
 %changelog
+* Tue Sep 9 2008 Conrad Meyer <konrad at tylerc.org> - 2.8.0-1
+- Bump to 2.8.0.
+- Patch configure to not mess up CFLAGS.
+- Patch debugger Makefile to not break canonicalized paths.
+
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.6.0-13
+- fix license tag
+
 * Sun Mar 2  2008 Marek Mahut <mmahut at fedoraproject.org> - 2.6.0-12
 - Fixing build problems under GCC 4.3
 
@@ -160,4 +146,3 @@
 
 * Thu Feb 1 2007 Trond Danielsen <trond.danielsen at gmail.com> - 2.6.0-1
 - Initial version.
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Mar 2007 16:08:20 -0000	1.2
+++ sources	12 Sep 2008 04:01:48 -0000	1.3
@@ -1 +1 @@
-70d6036226d852995237f30c5cb50960  sdcc-src-2.6.0.tar.gz
+1b9c2e581b92d5e3f13bca37c5784080  sdcc-src-2.8.0.tar.bz2



From konradm at fedoraproject.org  Fri Sep 12 04:02:33 2008
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Fri, 12 Sep 2008 04:02:33 +0000 (UTC)
Subject: rpms/sdcc/F-8 sdcc-2.8.0-configure.diff, NONE,
	1.1 sdcc-2.8.0-debugger-makefile.diff, NONE, 1.1 .cvsignore, 1.2,
	1.3 sdcc.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20080912040233.CF5FC70131@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/sdcc/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3562

Modified Files:
	.cvsignore sdcc.spec sources 
Added Files:
	sdcc-2.8.0-configure.diff sdcc-2.8.0-debugger-makefile.diff 
Log Message:
* Tue Sep 9 2008 Conrad Meyer <konrad at tylerc.org> - 2.8.0-1
- Bump to 2.8.0.
- Patch configure to not mess up CFLAGS.
- Patch debugger Makefile to not break canonicalized paths.

sdcc-2.8.0-configure.diff:

--- NEW FILE sdcc-2.8.0-configure.diff ---
diff -r -U 5 sdcc.orig/configure sdcc/configure
--- sdcc.orig/configure	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/configure	2008-09-09 02:29:24.000000000 -0700
@@ -2516,11 +2516,11 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
-   CFLAGS="-g"
+:  CFLAGS="-g"
    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -2554,11 +2554,11 @@
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	CFLAGS=""
+:	CFLAGS=""
       cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -2593,11 +2593,11 @@
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
+:	 CFLAGS="-g"
 	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -2646,22 +2646,22 @@
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
+: CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+:   CFLAGS="-g -O2"
   else
-    CFLAGS="-g"
+:   CFLAGS="-g"
   fi
 else
   if test "$GCC" = yes; then
-    CFLAGS="-O2"
+:   CFLAGS="-O2"
   else
-    CFLAGS=
+:   CFLAGS=
   fi
 fi
 { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
 echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
@@ -3794,11 +3794,11 @@
 fi
 { echo "$as_me:$LINENO: result: $sdcc_cv_CCggdb" >&5
 echo "${ECHO_T}$sdcc_cv_CCggdb" >&6; }
 
 if test "$sdcc_cv_CCggdb" = "yes"; then
-  CFLAGS="-ggdb ${CFLAGS}"
+: CFLAGS="-ggdb ${CFLAGS}"
 fi
 
 
 { echo "$as_me:$LINENO: checking whether $CC accepts -pipe" >&5
 echo $ECHO_N "checking whether $CC accepts -pipe... $ECHO_C" >&6; }
@@ -3819,11 +3819,11 @@
 fi
 { echo "$as_me:$LINENO: result: $sdcc_cv_CCpipe" >&5
 echo "${ECHO_T}$sdcc_cv_CCpipe" >&6; }
 
 if test "$sdcc_cv_CCpipe" = "yes"; then
-  CFLAGS="-pipe $CFLAGS"
+: CFLAGS="-pipe $CFLAGS"
 fi
 
 
 # Checks for typedefs, structures, and compiler characteristics.
 # ===========================================================================
diff -r -U 5 sdcc.orig/configure.in sdcc/configure.in
--- sdcc.orig/configure.in	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/configure.in	2008-09-09 02:29:33.000000000 -0700
@@ -321,16 +321,16 @@
 AC_SUBST(M_OR_MM)
 
 # This is the first time when CFLAGS are set/modified!!
 adl_DD_COPT(CC, ggdb)
 if test "$sdcc_cv_CCggdb" = "yes"; then
-  CFLAGS="-ggdb ${CFLAGS}"
+: CFLAGS="-ggdb ${CFLAGS}"
 fi
 
 adl_DD_COPT(CC, pipe)
 if test "$sdcc_cv_CCpipe" = "yes"; then
-  CFLAGS="-pipe $CFLAGS"
+: CFLAGS="-pipe $CFLAGS"
 fi
 
 
 # Checks for typedefs, structures, and compiler characteristics.
 # ===========================================================================
diff -r -U 5 sdcc.orig/sim/ucsim/configure sdcc/sim/ucsim/configure
--- sdcc.orig/sim/ucsim/configure	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/sim/ucsim/configure	2008-09-09 02:30:25.000000000 -0700
@@ -12458,15 +12458,15 @@
 fi
 { echo "$as_me:$LINENO: result: $ucsim_cv_CXXgstabs" >&5
 echo "${ECHO_T}$ucsim_cv_CXXgstabs" >&6; }
 
 if test "$ucsim_cv_CXXgstabs" = "yes"; then
-   gopt="-gstabs+ -g3"
+:  gopt="-gstabs+ -g3"
 elif test "$ucsim_cv_CXXggdb" = "yes"; then
-     gopt="-ggdb -g3"
+:    gopt="-ggdb -g3"
 else
-     gopt="-g"
+:    gopt="-g"
 fi
 if test "$CXXFLAGS"x = x ;then
         CXXFLAGS="$gopt"
 else
         CXXFLAGS="$CXXFLAGS $gopt"
diff -r -U 5 sdcc.orig/sim/ucsim/configure.in sdcc/sim/ucsim/configure.in
--- sdcc.orig/sim/ucsim/configure.in	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/sim/ucsim/configure.in	2008-09-09 02:30:13.000000000 -0700
@@ -517,15 +517,15 @@
 # This is the first time when CFLAGS are set/modified!!
 
 DD_COPT(CXX, ggdb)
 DD_COPT(CXX, gstabs)
 if test "$ucsim_cv_CXXgstabs" = "yes"; then
-   gopt="-gstabs+ -g3"
+:  gopt="-gstabs+ -g3"
 elif test "$ucsim_cv_CXXggdb" = "yes"; then
-     gopt="-ggdb -g3"
+:    gopt="-ggdb -g3"
 else
-     gopt="-g"
+:    gopt="-g"
 fi
 if test "$CXXFLAGS"x = x ;then
         CXXFLAGS="$gopt"
 else
         CXXFLAGS="$CXXFLAGS $gopt"

sdcc-2.8.0-debugger-makefile.diff:

--- NEW FILE sdcc-2.8.0-debugger-makefile.diff ---
--- debugger/mcs51/Makefile.in.orig	2008-09-11 18:06:29.000000000 -0700
+++ debugger/mcs51/Makefile.in	2008-09-11 18:06:34.000000000 -0700
@@ -7,11 +7,11 @@
 CPP		= @CPP@
 INSTALL		= @INSTALL@
 STRIP           = @STRIP@
 
 
-top_builddir	= ../../
+top_builddir	= ../..
 top_srcdir	= @srcdir@/../..
 SLIB		= $(top_builddir)/support/Util
 SDCCLIB		= $(top_builddir)/src
 
 VPATH           = @srcdir@


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Mar 2007 16:08:20 -0000	1.2
+++ .cvsignore	12 Sep 2008 04:02:03 -0000	1.3
@@ -1 +1 @@
-sdcc-src-2.6.0.tar.gz
+sdcc-src-2.8.0.tar.bz2


Index: sdcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/F-8/sdcc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sdcc.spec	4 Mar 2008 17:07:30 -0000	1.4
+++ sdcc.spec	12 Sep 2008 04:02:03 -0000	1.5
@@ -1,15 +1,14 @@
 Name:           sdcc
-Version:        2.6.0
-Release:        11%{?dist}
+Version:        2.8.0
+Release:        1%{?dist}
 Summary:        Small Device C Compiler
-
 Group:          Applications/Engineering
-License:        GPL
-URL:            http://sdcc.sourceforge.net
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
+License:        GPLv2+
+URL:            http://sdcc.sourceforge.net/
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.bz2
 Source1:        README.fedora
-Patch0:         sdcc-2.6.0-configure.diff
-Patch1:         sdcc-2.6.0-sdccman.lyx.patch 
+Patch0:         sdcc-2.8.0-configure.diff
+Patch1:		sdcc-2.8.0-debugger-makefile.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  flex
@@ -40,29 +39,9 @@
 %prep
 %setup -q -n sdcc
 %patch0 -p1
-%patch1 -p1
+%patch1 -p0
 find -name '*.[ch]' -exec chmod -x '{}' \;
 
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-
 
 %build
 %configure --enable-doc --enable-libgc STRIP=:
@@ -72,16 +51,16 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT Q=
-mv $RPM_BUILD_ROOT/%{_datadir}/%{name}/doc installed-docs
+mv $RPM_BUILD_ROOT%{_datadir}/doc installed-docs
 install -m 644 %SOURCE1 installed-docs
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp
-mv $RPM_BUILD_ROOT/%{_bindir}/*.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
+mv $RPM_BUILD_ROOT%{_bindir}/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
 find $RPM_BUILD_ROOT -type f -name \*.c -exec chmod a-x '{}' \;
-mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/sdcc
-mv $RPM_BUILD_ROOT/%{_bindir}/* $RPM_BUILD_ROOT/%{_libexecdir}/sdcc
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/sdcc
+mv $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_libexecdir}/sdcc
 
-# Creat lauch scripts in %{_bindir}
-pushd $RPM_BUILD_ROOT/%{_bindir}
+# Create launch scripts in %{_bindir}
+pushd $RPM_BUILD_ROOT%{_bindir}
 for x in ../libexec/sdcc/*; do 
 echo "#!/bin/sh
 PATH=/usr/libexec/sdcc:\$PATH
@@ -90,7 +69,6 @@
 done
 popd
 
-%define __os_install_post . ./os_install_post
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -113,8 +91,19 @@
 %{_datadir}/%{name}/lib/*/*.asm
 
 %changelog
-* Tue Mar 04 2008 Marek Mahut <mmahut at fedoraproject.org> 2.6.0-11
-- PowerPC build is missing, rebuilding.
+* Tue Sep 9 2008 Conrad Meyer <konrad at tylerc.org> - 2.8.0-1
+- Bump to 2.8.0.
+- Patch configure to not mess up CFLAGS.
+- Patch debugger Makefile to not break canonicalized paths.
+
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.6.0-13
+- fix license tag
+
+* Sun Mar 2  2008 Marek Mahut <mmahut at fedoraproject.org> - 2.6.0-12
+- Fixing build problems under GCC 4.3
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.6.0-11
+- Autorebuild for GCC 4.3
 
 * Sat Apr 07 2007 Trond Danielsen <trond.danielsen at gmail.com> - 2.6.0-10
 - Added patch to fix a problem with sdccman.lyx that caused lyx to fail.
@@ -157,4 +146,3 @@
 
 * Thu Feb 1 2007 Trond Danielsen <trond.danielsen at gmail.com> - 2.6.0-1
 - Initial version.
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Mar 2007 16:08:20 -0000	1.2
+++ sources	12 Sep 2008 04:02:03 -0000	1.3
@@ -1 +1 @@
-70d6036226d852995237f30c5cb50960  sdcc-src-2.6.0.tar.gz
+1b9c2e581b92d5e3f13bca37c5784080  sdcc-src-2.8.0.tar.bz2



From konradm at fedoraproject.org  Fri Sep 12 04:02:53 2008
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Fri, 12 Sep 2008 04:02:53 +0000 (UTC)
Subject: rpms/sdcc/EL-5 sdcc-2.8.0-configure.diff, NONE,
	1.1 sdcc-2.8.0-debugger-makefile.diff, NONE, 1.1 .cvsignore, 1.2,
	1.3 sdcc.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20080912040253.65CFD70131@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/sdcc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3753

Modified Files:
	.cvsignore sdcc.spec sources 
Added Files:
	sdcc-2.8.0-configure.diff sdcc-2.8.0-debugger-makefile.diff 
Log Message:
* Tue Sep 9 2008 Conrad Meyer <konrad at tylerc.org> - 2.8.0-1
- Bump to 2.8.0.
- Patch configure to not mess up CFLAGS.
- Patch debugger Makefile to not break canonicalized paths.

sdcc-2.8.0-configure.diff:

--- NEW FILE sdcc-2.8.0-configure.diff ---
diff -r -U 5 sdcc.orig/configure sdcc/configure
--- sdcc.orig/configure	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/configure	2008-09-09 02:29:24.000000000 -0700
@@ -2516,11 +2516,11 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
-   CFLAGS="-g"
+:  CFLAGS="-g"
    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -2554,11 +2554,11 @@
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	CFLAGS=""
+:	CFLAGS=""
       cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -2593,11 +2593,11 @@
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
+:	 CFLAGS="-g"
 	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -2646,22 +2646,22 @@
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
+: CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+:   CFLAGS="-g -O2"
   else
-    CFLAGS="-g"
+:   CFLAGS="-g"
   fi
 else
   if test "$GCC" = yes; then
-    CFLAGS="-O2"
+:   CFLAGS="-O2"
   else
-    CFLAGS=
+:   CFLAGS=
   fi
 fi
 { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
 echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
@@ -3794,11 +3794,11 @@
 fi
 { echo "$as_me:$LINENO: result: $sdcc_cv_CCggdb" >&5
 echo "${ECHO_T}$sdcc_cv_CCggdb" >&6; }
 
 if test "$sdcc_cv_CCggdb" = "yes"; then
-  CFLAGS="-ggdb ${CFLAGS}"
+: CFLAGS="-ggdb ${CFLAGS}"
 fi
 
 
 { echo "$as_me:$LINENO: checking whether $CC accepts -pipe" >&5
 echo $ECHO_N "checking whether $CC accepts -pipe... $ECHO_C" >&6; }
@@ -3819,11 +3819,11 @@
 fi
 { echo "$as_me:$LINENO: result: $sdcc_cv_CCpipe" >&5
 echo "${ECHO_T}$sdcc_cv_CCpipe" >&6; }
 
 if test "$sdcc_cv_CCpipe" = "yes"; then
-  CFLAGS="-pipe $CFLAGS"
+: CFLAGS="-pipe $CFLAGS"
 fi
 
 
 # Checks for typedefs, structures, and compiler characteristics.
 # ===========================================================================
diff -r -U 5 sdcc.orig/configure.in sdcc/configure.in
--- sdcc.orig/configure.in	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/configure.in	2008-09-09 02:29:33.000000000 -0700
@@ -321,16 +321,16 @@
 AC_SUBST(M_OR_MM)
 
 # This is the first time when CFLAGS are set/modified!!
 adl_DD_COPT(CC, ggdb)
 if test "$sdcc_cv_CCggdb" = "yes"; then
-  CFLAGS="-ggdb ${CFLAGS}"
+: CFLAGS="-ggdb ${CFLAGS}"
 fi
 
 adl_DD_COPT(CC, pipe)
 if test "$sdcc_cv_CCpipe" = "yes"; then
-  CFLAGS="-pipe $CFLAGS"
+: CFLAGS="-pipe $CFLAGS"
 fi
 
 
 # Checks for typedefs, structures, and compiler characteristics.
 # ===========================================================================
diff -r -U 5 sdcc.orig/sim/ucsim/configure sdcc/sim/ucsim/configure
--- sdcc.orig/sim/ucsim/configure	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/sim/ucsim/configure	2008-09-09 02:30:25.000000000 -0700
@@ -12458,15 +12458,15 @@
 fi
 { echo "$as_me:$LINENO: result: $ucsim_cv_CXXgstabs" >&5
 echo "${ECHO_T}$ucsim_cv_CXXgstabs" >&6; }
 
 if test "$ucsim_cv_CXXgstabs" = "yes"; then
-   gopt="-gstabs+ -g3"
+:  gopt="-gstabs+ -g3"
 elif test "$ucsim_cv_CXXggdb" = "yes"; then
-     gopt="-ggdb -g3"
+:    gopt="-ggdb -g3"
 else
-     gopt="-g"
+:    gopt="-g"
 fi
 if test "$CXXFLAGS"x = x ;then
         CXXFLAGS="$gopt"
 else
         CXXFLAGS="$CXXFLAGS $gopt"
diff -r -U 5 sdcc.orig/sim/ucsim/configure.in sdcc/sim/ucsim/configure.in
--- sdcc.orig/sim/ucsim/configure.in	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/sim/ucsim/configure.in	2008-09-09 02:30:13.000000000 -0700
@@ -517,15 +517,15 @@
 # This is the first time when CFLAGS are set/modified!!
 
 DD_COPT(CXX, ggdb)
 DD_COPT(CXX, gstabs)
 if test "$ucsim_cv_CXXgstabs" = "yes"; then
-   gopt="-gstabs+ -g3"
+:  gopt="-gstabs+ -g3"
 elif test "$ucsim_cv_CXXggdb" = "yes"; then
-     gopt="-ggdb -g3"
+:    gopt="-ggdb -g3"
 else
-     gopt="-g"
+:    gopt="-g"
 fi
 if test "$CXXFLAGS"x = x ;then
         CXXFLAGS="$gopt"
 else
         CXXFLAGS="$CXXFLAGS $gopt"

sdcc-2.8.0-debugger-makefile.diff:

--- NEW FILE sdcc-2.8.0-debugger-makefile.diff ---
--- debugger/mcs51/Makefile.in.orig	2008-09-11 18:06:29.000000000 -0700
+++ debugger/mcs51/Makefile.in	2008-09-11 18:06:34.000000000 -0700
@@ -7,11 +7,11 @@
 CPP		= @CPP@
 INSTALL		= @INSTALL@
 STRIP           = @STRIP@
 
 
-top_builddir	= ../../
+top_builddir	= ../..
 top_srcdir	= @srcdir@/../..
 SLIB		= $(top_builddir)/support/Util
 SDCCLIB		= $(top_builddir)/src
 
 VPATH           = @srcdir@


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Mar 2007 16:10:42 -0000	1.2
+++ .cvsignore	12 Sep 2008 04:02:23 -0000	1.3
@@ -1 +1 @@
-sdcc-src-2.6.0.tar.gz
+sdcc-src-2.8.0.tar.bz2


Index: sdcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/EL-5/sdcc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sdcc.spec	25 Mar 2007 15:17:32 -0000	1.2
+++ sdcc.spec	12 Sep 2008 04:02:23 -0000	1.3
@@ -1,14 +1,14 @@
 Name:           sdcc
-Version:        2.6.0
-Release:        9%{?dist}
+Version:        2.8.0
+Release:        1%{?dist}
 Summary:        Small Device C Compiler
-
 Group:          Applications/Engineering
-License:        GPL
-URL:            http://sdcc.sourceforge.net
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
+License:        GPLv2+
+URL:            http://sdcc.sourceforge.net/
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.bz2
 Source1:        README.fedora
-Patch0:         sdcc-2.6.0-configure.diff
+Patch0:         sdcc-2.8.0-configure.diff
+Patch1:		sdcc-2.8.0-debugger-makefile.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  flex
@@ -38,48 +38,29 @@
 
 %prep
 %setup -q -n sdcc
-%patch -p1
+%patch0 -p1
+%patch1 -p0
 find -name '*.[ch]' -exec chmod -x '{}' \;
 
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-
 
 %build
 %configure --enable-doc --enable-libgc STRIP=:
-make %{?_smp_mflags} Q=
+make Q=
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT Q=
-mv $RPM_BUILD_ROOT/%{_datadir}/%{name}/doc installed-docs
+mv $RPM_BUILD_ROOT%{_datadir}/doc installed-docs
 install -m 644 %SOURCE1 installed-docs
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp
-mv $RPM_BUILD_ROOT/%{_bindir}/*.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
+mv $RPM_BUILD_ROOT%{_bindir}/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
 find $RPM_BUILD_ROOT -type f -name \*.c -exec chmod a-x '{}' \;
-mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/sdcc
-mv $RPM_BUILD_ROOT/%{_bindir}/* $RPM_BUILD_ROOT/%{_libexecdir}/sdcc
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/sdcc
+mv $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_libexecdir}/sdcc
 
-# Creat lauch scripts in %{_bindir}
-pushd $RPM_BUILD_ROOT/%{_bindir}
+# Create launch scripts in %{_bindir}
+pushd $RPM_BUILD_ROOT%{_bindir}
 for x in ../libexec/sdcc/*; do 
 echo "#!/bin/sh
 PATH=/usr/libexec/sdcc:\$PATH
@@ -88,7 +69,6 @@
 done
 popd
 
-%define __os_install_post . ./os_install_post
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -111,6 +91,23 @@
 %{_datadir}/%{name}/lib/*/*.asm
 
 %changelog
+* Tue Sep 9 2008 Conrad Meyer <konrad at tylerc.org> - 2.8.0-1
+- Bump to 2.8.0.
+- Patch configure to not mess up CFLAGS.
+- Patch debugger Makefile to not break canonicalized paths.
+
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.6.0-13
+- fix license tag
+
+* Sun Mar 2  2008 Marek Mahut <mmahut at fedoraproject.org> - 2.6.0-12
+- Fixing build problems under GCC 4.3
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.6.0-11
+- Autorebuild for GCC 4.3
+
+* Sat Apr 07 2007 Trond Danielsen <trond.danielsen at gmail.com> - 2.6.0-10
+- Added patch to fix a problem with sdccman.lyx that caused lyx to fail.
+
 * Fri Mar 23 2007 Trond Danielsen <trond.danielsen at gmail.com> - 2.6.0-9
 - Removed symlinks, added scripts (solves bug #233385).
 
@@ -149,4 +146,3 @@
 
 * Thu Feb 1 2007 Trond Danielsen <trond.danielsen at gmail.com> - 2.6.0-1
 - Initial version.
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Mar 2007 16:10:42 -0000	1.2
+++ sources	12 Sep 2008 04:02:23 -0000	1.3
@@ -1 +1 @@
-70d6036226d852995237f30c5cb50960  sdcc-src-2.6.0.tar.gz
+1b9c2e581b92d5e3f13bca37c5784080  sdcc-src-2.8.0.tar.bz2



From xulchris at fedoraproject.org  Fri Sep 12 04:07:32 2008
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri, 12 Sep 2008 04:07:32 +0000 (UTC)
Subject: rpms/cksfv/EL-5 .cvsignore, 1.7, 1.8 cksfv.spec, 1.18, 1.19 sources,
	1.7, 1.8
Message-ID: <20080912040732.3EA8B70131@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/cksfv/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5409/EL-5

Modified Files:
	.cvsignore cksfv.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Sep 2007 18:07:17 -0000	1.7
+++ .cvsignore	12 Sep 2008 04:07:01 -0000	1.8
@@ -1 +1 @@
-cksfv-1.3.12.tar.gz
+cksfv-1.3.13.tar.bz2


Index: cksfv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/EL-5/cksfv.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cksfv.spec	27 Oct 2007 22:28:05 -0000	1.18
+++ cksfv.spec	12 Sep 2008 04:07:01 -0000	1.19
@@ -1,12 +1,12 @@
 Name:           cksfv
-Version:        1.3.12
-Release:        2%{?dist}
+Version:        1.3.13
+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.gz
+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)
 
@@ -55,6 +55,12 @@
 
 
 %changelog
+* Thu Sep 11 2008 Christopher Stone <chris.stone at gmail.com> 1.3.13-1
+- Upstream sync
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> 1.3.12-3
+- Autorebuild for GCC 4.3
+
 * Sat Oct 27 2007 Christohper Stone <chris.stone at gmail.com> 1.3.12-2
 - Fix rpmlint issues
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Sep 2007 18:07:17 -0000	1.7
+++ sources	12 Sep 2008 04:07:01 -0000	1.8
@@ -1 +1 @@
-dc22d32db2bf8fdaa37e83e3484a5407  cksfv-1.3.12.tar.gz
+a6d7e4f2dc267e670ebb48eb8b806993  cksfv-1.3.13.tar.bz2



From xulchris at fedoraproject.org  Fri Sep 12 04:07:32 2008
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri, 12 Sep 2008 04:07:32 +0000 (UTC)
Subject: rpms/cksfv/F-8 .cvsignore, 1.7, 1.8 cksfv.spec, 1.19, 1.20 sources, 
	1.7, 1.8
Message-ID: <20080912040732.74DC470131@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/cksfv/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5409/F-8

Modified Files:
	.cvsignore cksfv.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Sep 2007 18:07:20 -0000	1.7
+++ .cvsignore	12 Sep 2008 04:07:02 -0000	1.8
@@ -1 +1 @@
-cksfv-1.3.12.tar.gz
+cksfv-1.3.13.tar.bz2


Index: cksfv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/F-8/cksfv.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- cksfv.spec	27 Oct 2007 22:28:01 -0000	1.19
+++ cksfv.spec	12 Sep 2008 04:07:02 -0000	1.20
@@ -1,12 +1,12 @@
 Name:           cksfv
-Version:        1.3.12
-Release:        2%{?dist}
+Version:        1.3.13
+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.gz
+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)
 
@@ -55,6 +55,12 @@
 
 
 %changelog
+* Thu Sep 11 2008 Christopher Stone <chris.stone at gmail.com> 1.3.13-1
+- Upstream sync
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> 1.3.12-3
+- Autorebuild for GCC 4.3
+
 * Sat Oct 27 2007 Christohper Stone <chris.stone at gmail.com> 1.3.12-2
 - Fix rpmlint issues
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Sep 2007 18:07:20 -0000	1.7
+++ sources	12 Sep 2008 04:07:02 -0000	1.8
@@ -1 +1 @@
-dc22d32db2bf8fdaa37e83e3484a5407  cksfv-1.3.12.tar.gz
+a6d7e4f2dc267e670ebb48eb8b806993  cksfv-1.3.13.tar.bz2



From xulchris at fedoraproject.org  Fri Sep 12 04:07:32 2008
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri, 12 Sep 2008 04:07:32 +0000 (UTC)
Subject: rpms/cksfv/devel .cvsignore, 1.7, 1.8 cksfv.spec, 1.20, 1.21 sources,
	1.7, 1.8
Message-ID: <20080912040732.F01F470131@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/cksfv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5409/devel

Modified Files:
	.cvsignore cksfv.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Sep 2007 18:07:20 -0000	1.7
+++ .cvsignore	12 Sep 2008 04:07:02 -0000	1.8
@@ -1 +1 @@
-cksfv-1.3.12.tar.gz
+cksfv-1.3.13.tar.bz2


Index: cksfv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/devel/cksfv.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cksfv.spec	20 Feb 2008 08:27:34 -0000	1.20
+++ cksfv.spec	12 Sep 2008 04:07:02 -0000	1.21
@@ -1,12 +1,12 @@
 Name:           cksfv
-Version:        1.3.12
-Release:        3%{?dist}
+Version:        1.3.13
+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.gz
+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)
 
@@ -55,7 +55,10 @@
 
 
 %changelog
-* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3.12-3
+* Thu Sep 11 2008 Christopher Stone <chris.stone at gmail.com> 1.3.13-1
+- Upstream sync
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> 1.3.12-3
 - Autorebuild for GCC 4.3
 
 * Sat Oct 27 2007 Christohper Stone <chris.stone at gmail.com> 1.3.12-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Sep 2007 18:07:20 -0000	1.7
+++ sources	12 Sep 2008 04:07:02 -0000	1.8
@@ -1 +1 @@
-dc22d32db2bf8fdaa37e83e3484a5407  cksfv-1.3.12.tar.gz
+a6d7e4f2dc267e670ebb48eb8b806993  cksfv-1.3.13.tar.bz2



From xulchris at fedoraproject.org  Fri Sep 12 04:07:32 2008
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri, 12 Sep 2008 04:07:32 +0000 (UTC)
Subject: rpms/cksfv/F-9 .cvsignore, 1.7, 1.8 cksfv.spec, 1.20, 1.21 sources, 
	1.7, 1.8
Message-ID: <20080912040732.A6E1C70131@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/cksfv/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5409/F-9

Modified Files:
	.cvsignore cksfv.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Sep 2007 18:07:20 -0000	1.7
+++ .cvsignore	12 Sep 2008 04:07:02 -0000	1.8
@@ -1 +1 @@
-cksfv-1.3.12.tar.gz
+cksfv-1.3.13.tar.bz2


Index: cksfv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/F-9/cksfv.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cksfv.spec	20 Feb 2008 08:27:34 -0000	1.20
+++ cksfv.spec	12 Sep 2008 04:07:02 -0000	1.21
@@ -1,12 +1,12 @@
 Name:           cksfv
-Version:        1.3.12
-Release:        3%{?dist}
+Version:        1.3.13
+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.gz
+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)
 
@@ -55,7 +55,10 @@
 
 
 %changelog
-* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3.12-3
+* Thu Sep 11 2008 Christopher Stone <chris.stone at gmail.com> 1.3.13-1
+- Upstream sync
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> 1.3.12-3
 - Autorebuild for GCC 4.3
 
 * Sat Oct 27 2007 Christohper Stone <chris.stone at gmail.com> 1.3.12-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Sep 2007 18:07:20 -0000	1.7
+++ sources	12 Sep 2008 04:07:02 -0000	1.8
@@ -1 +1 @@
-dc22d32db2bf8fdaa37e83e3484a5407  cksfv-1.3.12.tar.gz
+a6d7e4f2dc267e670ebb48eb8b806993  cksfv-1.3.13.tar.bz2



From dcantrel at fedoraproject.org  Fri Sep 12 04:19:14 2008
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Fri, 12 Sep 2008 04:19:14 +0000 (UTC)
Subject: rpms/dhcpv6/devel .cvsignore, 1.22, 1.23 dhcpv6.spec, 1.94,
	1.95 sources, 1.22, 1.23
Message-ID: <20080912041914.85A1070131@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9323

Modified Files:
	.cvsignore dhcpv6.spec sources 
Log Message:
* Thu Sep 11 2008 David Cantrell <dcantrell at redhat.com> - 1.0.22-1
- Upgrade to dhcpv6-1.0.22, changes include:
      Windows 2008 interoperability fixes for ADVERTISE msgs
      Information Refresh Time option support
      IA address option bug fixes
      Check DAD by interface type in REPLY msgs
      Clear request addr list when msg is sent successfully
      Call init_lease_hashes() in dhcp6c



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	30 Jul 2008 02:24:21 -0000	1.22
+++ .cvsignore	12 Sep 2008 04:18:43 -0000	1.23
@@ -1 +1 @@
-dhcpv6-1.0.21.tar.gz
+dhcpv6-1.0.22.tar.gz


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- dhcpv6.spec	30 Jul 2008 02:25:22 -0000	1.94
+++ dhcpv6.spec	12 Sep 2008 04:18:44 -0000	1.95
@@ -6,7 +6,7 @@
 
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
-Version: 1.0.21
+Version: 1.0.22
 Release: 1%{?dist}
 License: LGPLv2+
 Group:   System Environment/Daemons
@@ -162,6 +162,15 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Thu Sep 11 2008 David Cantrell <dcantrell at redhat.com> - 1.0.22-1
+- Upgrade to dhcpv6-1.0.22, changes include:
+      Windows 2008 interoperability fixes for ADVERTISE msgs
+      Information Refresh Time option support
+      IA address option bug fixes
+      Check DAD by interface type in REPLY msgs
+      Clear request addr list when msg is sent successfully
+      Call init_lease_hashes() in dhcp6c
+
 * Tue Jul 29 2008 David Cantrell <dcantrell at redhat.com> - 1.0.21-1
 - Upgrade to dhcpv6-1.0.21, changes include:
       Remove old dadlist variable reference in dhcp6c


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	30 Jul 2008 02:24:21 -0000	1.22
+++ sources	12 Sep 2008 04:18:44 -0000	1.23
@@ -1 +1 @@
-bc1df1d0fb75f3bca2c2e97ff7eb4128  dhcpv6-1.0.21.tar.gz
+592d3c8308c2d88861e5b317378fd95c  dhcpv6-1.0.22.tar.gz



From rishi at fedoraproject.org  Fri Sep 12 04:25:24 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Fri, 12 Sep 2008 04:25:24 +0000 (UTC)
Subject: rpms/gnome-valgrind-session/F-8
	gnome-valgrind-session-1.1-desktop.patch, NONE,
	1.1 gnome-valgrind-session-1.1-use-gnome-session.patch, NONE,
	1.1 gnome-valgrind-session.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080912042524.6051170131@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/gnome-valgrind-session/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11621/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-valgrind-session-1.1-desktop.patch 
	gnome-valgrind-session-1.1-use-gnome-session.patch 
	gnome-valgrind-session.spec import.log 
Log Message:
Initial import into F-8.

 Modified Files:
 	F-8/.cvsignore F-8/sources 
 Added Files:
 	F-8/gnome-valgrind-session-1.1-desktop.patch 
 	F-8/gnome-valgrind-session-1.1-use-gnome-session.patch 
 	F-8/gnome-valgrind-session.spec F-8/import.log 


gnome-valgrind-session-1.1-desktop.patch:

--- NEW FILE gnome-valgrind-session-1.1-desktop.patch ---
diff -urNp gnome-valgrind-session-1.1.orig/gnome-valgrind-errors.desktop gnome-valgrind-session-1.1/gnome-valgrind-errors.desktop
--- gnome-valgrind-session-1.1.orig/gnome-valgrind-errors.desktop	2008-09-12 04:11:13.516914580 +0530
+++ gnome-valgrind-session-1.1/gnome-valgrind-errors.desktop	2008-09-12 04:11:46.508156064 +0530
@@ -1,6 +1,5 @@
 [Desktop Entry]
-Encoding=UTF-8
-Type=XSession
+Type=Application
 Exec=gnome-valgrind-errors
 TryExec=gnome-valgrind-errors
 Name=GNOME Valgrind (Errors)
diff -urNp gnome-valgrind-session-1.1.orig/gnome-valgrind-leaks.desktop gnome-valgrind-session-1.1/gnome-valgrind-leaks.desktop
--- gnome-valgrind-session-1.1.orig/gnome-valgrind-leaks.desktop	2008-09-12 04:11:13.516914580 +0530
+++ gnome-valgrind-session-1.1/gnome-valgrind-leaks.desktop	2008-09-12 04:11:37.596154819 +0530
@@ -1,6 +1,5 @@
 [Desktop Entry]
-Encoding=UTF-8
-Type=XSession
+Type=Application
 Exec=gnome-valgrind-leaks
 TryExec=gnome-valgrind-leaks
 Name=GNOME Valgrind (Leaks)

gnome-valgrind-session-1.1-use-gnome-session.patch:

--- NEW FILE gnome-valgrind-session-1.1-use-gnome-session.patch ---
diff -urNp gnome-valgrind-session-1.1.orig/gnome-valgrind-errors gnome-valgrind-session-1.1/gnome-valgrind-errors
--- gnome-valgrind-session-1.1.orig/gnome-valgrind-errors	2008-04-25 08:18:05.000000000 +0530
+++ gnome-valgrind-session-1.1/gnome-valgrind-errors	2008-04-25 08:19:09.000000000 +0530
@@ -18,4 +18,4 @@ rm -f $SESSIONDIR/*
 export G_SLICE=always-malloc
 export G_DEBUG=gc-friendly
 
-valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=no /usr/bin/gnome
+valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=no /usr/bin/gnome-session
diff -urNp gnome-valgrind-session-1.1.orig/gnome-valgrind-leaks gnome-valgrind-session-1.1/gnome-valgrind-leaks
--- gnome-valgrind-session-1.1.orig/gnome-valgrind-leaks	2008-04-25 08:18:05.000000000 +0530
+++ gnome-valgrind-session-1.1/gnome-valgrind-leaks	2008-04-25 08:19:32.000000000 +0530
@@ -18,4 +18,4 @@ rm -f $SESSIONDIR/*
 export G_SLICE=always-malloc
 export G_DEBUG=gc-friendly
 
-valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=yes --show-reachable=no --leak-resolution=high /usr/bin/gnome
+valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=yes --show-reachable=no --leak-resolution=high /usr/bin/gnome-session


--- NEW FILE gnome-valgrind-session.spec ---
Summary:	Run an entire GNOME session under valgrind
Name:		gnome-valgrind-session
Version:	1.1
Release:	2%{?dist}
License:	Public Domain
Group:		Development/Tools
URL:		http://hp.cl.no/proj/gnome-valgrind-session/
Source0:	http://hp.cl.no/proj/gnome-valgrind-session/src/%{name}-%{version}.tar.bz2
Patch0:		%{name}-%{version}-desktop.patch
Patch1:		%{name}-%{version}-use-gnome-session.patch

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires:	gnome-session 
Requires:	valgrind

BuildArch:	noarch

%description
GNOME Valgrind Session adds new types of GNOME session to the login manager's
session menu. These let you instrument your entire session with Valgrind for
debugging purposes. The generated logs are collected and subjected to simple
postprocessing when you log out. The result is saved to a file in your home
directory.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xsessions

# Startup and post-processing scripts for the sessions.
install -p -m0755 gnome-valgrind-errors $RPM_BUILD_ROOT/%{_bindir}
install -p -m0755 gnome-valgrind-errors-postprocess $RPM_BUILD_ROOT/%{_bindir}
install -p -m0755 gnome-valgrind-leaks $RPM_BUILD_ROOT/%{_bindir}
install -p -m0755 gnome-valgrind-leaks-postprocess $RPM_BUILD_ROOT/%{_bindir}

# These desktop files represent sessions, not GUI apps, so we don't use
# desktop-file-install upon them (following precedent in the gnome-session
# package).
install -p -m0644 gnome-valgrind-errors.desktop \
  $RPM_BUILD_ROOT/%{_datadir}/xsessions
install -p -m0644 gnome-valgrind-leaks.desktop \
  $RPM_BUILD_ROOT/%{_datadir}/xsessions

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_bindir}/gnome-valgrind-errors
%{_bindir}/gnome-valgrind-errors-postprocess
%{_bindir}/gnome-valgrind-leaks
%{_bindir}/gnome-valgrind-leaks-postprocess
%{_datadir}/xsessions/gnome-valgrind-errors.desktop
%{_datadir}/xsessions/gnome-valgrind-leaks.desktop

%changelog
* Fri Sep 12 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.1-2
- Removed Encoding and fixed Type value in Desktop Entry.

* Fri Apr 25 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.1-1
- Initial build. Imported SPEC written by David Malcolm and Matthias Clasen.


--- NEW FILE import.log ---
gnome-valgrind-session-1_1-2_fc9:F-8:gnome-valgrind-session-1.1-2.fc9.src.rpm:1221173630


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-valgrind-session/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 00:03:07 -0000	1.1
+++ .cvsignore	12 Sep 2008 04:24:54 -0000	1.2
@@ -0,0 +1 @@
+gnome-valgrind-session-1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-valgrind-session/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 00:03:07 -0000	1.1
+++ sources	12 Sep 2008 04:24:54 -0000	1.2
@@ -0,0 +1 @@
+4988af57dc895509ce01e2742883f47b  gnome-valgrind-session-1.1.tar.bz2



From rishi at fedoraproject.org  Fri Sep 12 04:28:51 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Fri, 12 Sep 2008 04:28:51 +0000 (UTC)
Subject: rpms/gnome-valgrind-session/F-9
	gnome-valgrind-session-1.1-desktop.patch, NONE,
	1.1 gnome-valgrind-session-1.1-use-gnome-session.patch, NONE,
	1.1 gnome-valgrind-session.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080912042851.896F070131@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/gnome-valgrind-session/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13044/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-valgrind-session-1.1-desktop.patch 
	gnome-valgrind-session-1.1-use-gnome-session.patch 
	gnome-valgrind-session.spec import.log 
Log Message:
Initial import into F-9.

 Modified Files:
 	F-9/.cvsignore F-9/sources 
 Added Files:
 	F-9/gnome-valgrind-session-1.1-desktop.patch 
 	F-9/gnome-valgrind-session-1.1-use-gnome-session.patch 
 	F-9/gnome-valgrind-session.spec F-9/import.log 


gnome-valgrind-session-1.1-desktop.patch:

--- NEW FILE gnome-valgrind-session-1.1-desktop.patch ---
diff -urNp gnome-valgrind-session-1.1.orig/gnome-valgrind-errors.desktop gnome-valgrind-session-1.1/gnome-valgrind-errors.desktop
--- gnome-valgrind-session-1.1.orig/gnome-valgrind-errors.desktop	2008-09-12 04:11:13.516914580 +0530
+++ gnome-valgrind-session-1.1/gnome-valgrind-errors.desktop	2008-09-12 04:11:46.508156064 +0530
@@ -1,6 +1,5 @@
 [Desktop Entry]
-Encoding=UTF-8
-Type=XSession
+Type=Application
 Exec=gnome-valgrind-errors
 TryExec=gnome-valgrind-errors
 Name=GNOME Valgrind (Errors)
diff -urNp gnome-valgrind-session-1.1.orig/gnome-valgrind-leaks.desktop gnome-valgrind-session-1.1/gnome-valgrind-leaks.desktop
--- gnome-valgrind-session-1.1.orig/gnome-valgrind-leaks.desktop	2008-09-12 04:11:13.516914580 +0530
+++ gnome-valgrind-session-1.1/gnome-valgrind-leaks.desktop	2008-09-12 04:11:37.596154819 +0530
@@ -1,6 +1,5 @@
 [Desktop Entry]
-Encoding=UTF-8
-Type=XSession
+Type=Application
 Exec=gnome-valgrind-leaks
 TryExec=gnome-valgrind-leaks
 Name=GNOME Valgrind (Leaks)

gnome-valgrind-session-1.1-use-gnome-session.patch:

--- NEW FILE gnome-valgrind-session-1.1-use-gnome-session.patch ---
diff -urNp gnome-valgrind-session-1.1.orig/gnome-valgrind-errors gnome-valgrind-session-1.1/gnome-valgrind-errors
--- gnome-valgrind-session-1.1.orig/gnome-valgrind-errors	2008-04-25 08:18:05.000000000 +0530
+++ gnome-valgrind-session-1.1/gnome-valgrind-errors	2008-04-25 08:19:09.000000000 +0530
@@ -18,4 +18,4 @@ rm -f $SESSIONDIR/*
 export G_SLICE=always-malloc
 export G_DEBUG=gc-friendly
 
-valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=no /usr/bin/gnome
+valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=no /usr/bin/gnome-session
diff -urNp gnome-valgrind-session-1.1.orig/gnome-valgrind-leaks gnome-valgrind-session-1.1/gnome-valgrind-leaks
--- gnome-valgrind-session-1.1.orig/gnome-valgrind-leaks	2008-04-25 08:18:05.000000000 +0530
+++ gnome-valgrind-session-1.1/gnome-valgrind-leaks	2008-04-25 08:19:32.000000000 +0530
@@ -18,4 +18,4 @@ rm -f $SESSIONDIR/*
 export G_SLICE=always-malloc
 export G_DEBUG=gc-friendly
 
-valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=yes --show-reachable=no --leak-resolution=high /usr/bin/gnome
+valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=yes --show-reachable=no --leak-resolution=high /usr/bin/gnome-session


--- NEW FILE gnome-valgrind-session.spec ---
Summary:	Run an entire GNOME session under valgrind
Name:		gnome-valgrind-session
Version:	1.1
Release:	2%{?dist}
License:	Public Domain
Group:		Development/Tools
URL:		http://hp.cl.no/proj/gnome-valgrind-session/
Source0:	http://hp.cl.no/proj/gnome-valgrind-session/src/%{name}-%{version}.tar.bz2
Patch0:		%{name}-%{version}-desktop.patch
Patch1:		%{name}-%{version}-use-gnome-session.patch

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires:	gnome-session 
Requires:	valgrind

BuildArch:	noarch

%description
GNOME Valgrind Session adds new types of GNOME session to the login manager's
session menu. These let you instrument your entire session with Valgrind for
debugging purposes. The generated logs are collected and subjected to simple
postprocessing when you log out. The result is saved to a file in your home
directory.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xsessions

# Startup and post-processing scripts for the sessions.
install -p -m0755 gnome-valgrind-errors $RPM_BUILD_ROOT/%{_bindir}
install -p -m0755 gnome-valgrind-errors-postprocess $RPM_BUILD_ROOT/%{_bindir}
install -p -m0755 gnome-valgrind-leaks $RPM_BUILD_ROOT/%{_bindir}
install -p -m0755 gnome-valgrind-leaks-postprocess $RPM_BUILD_ROOT/%{_bindir}

# These desktop files represent sessions, not GUI apps, so we don't use
# desktop-file-install upon them (following precedent in the gnome-session
# package).
install -p -m0644 gnome-valgrind-errors.desktop \
  $RPM_BUILD_ROOT/%{_datadir}/xsessions
install -p -m0644 gnome-valgrind-leaks.desktop \
  $RPM_BUILD_ROOT/%{_datadir}/xsessions

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_bindir}/gnome-valgrind-errors
%{_bindir}/gnome-valgrind-errors-postprocess
%{_bindir}/gnome-valgrind-leaks
%{_bindir}/gnome-valgrind-leaks-postprocess
%{_datadir}/xsessions/gnome-valgrind-errors.desktop
%{_datadir}/xsessions/gnome-valgrind-leaks.desktop

%changelog
* Fri Sep 12 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.1-2
- Removed Encoding and fixed Type value in Desktop Entry.

* Fri Apr 25 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.1-1
- Initial build. Imported SPEC written by David Malcolm and Matthias Clasen.


--- NEW FILE import.log ---
gnome-valgrind-session-1_1-2_fc9:F-9:gnome-valgrind-session-1.1-2.fc9.src.rpm:1221173831


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-valgrind-session/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 00:03:07 -0000	1.1
+++ .cvsignore	12 Sep 2008 04:28:21 -0000	1.2
@@ -0,0 +1 @@
+gnome-valgrind-session-1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-valgrind-session/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 00:03:07 -0000	1.1
+++ sources	12 Sep 2008 04:28:21 -0000	1.2
@@ -0,0 +1 @@
+4988af57dc895509ce01e2742883f47b  gnome-valgrind-session-1.1.tar.bz2



From rishi at fedoraproject.org  Fri Sep 12 04:32:56 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Fri, 12 Sep 2008 04:32:56 +0000 (UTC)
Subject: rpms/gnome-valgrind-session/devel
	gnome-valgrind-session-1.1-desktop.patch, NONE,
	1.1 gnome-valgrind-session-1.1-use-gnome-session.patch, NONE,
	1.1 gnome-valgrind-session.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080912043256.404F270131@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/gnome-valgrind-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14434/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-valgrind-session-1.1-desktop.patch 
	gnome-valgrind-session-1.1-use-gnome-session.patch 
	gnome-valgrind-session.spec import.log 
Log Message:
Initial import into devel.

 Modified Files:
 	devel/.cvsignore devel/sources 
 Added Files:
 	devel/gnome-valgrind-session-1.1-desktop.patch 
 	devel/gnome-valgrind-session-1.1-use-gnome-session.patch 
 	devel/gnome-valgrind-session.spec devel/import.log 


gnome-valgrind-session-1.1-desktop.patch:

--- NEW FILE gnome-valgrind-session-1.1-desktop.patch ---
diff -urNp gnome-valgrind-session-1.1.orig/gnome-valgrind-errors.desktop gnome-valgrind-session-1.1/gnome-valgrind-errors.desktop
--- gnome-valgrind-session-1.1.orig/gnome-valgrind-errors.desktop	2008-09-12 04:11:13.516914580 +0530
+++ gnome-valgrind-session-1.1/gnome-valgrind-errors.desktop	2008-09-12 04:11:46.508156064 +0530
@@ -1,6 +1,5 @@
 [Desktop Entry]
-Encoding=UTF-8
-Type=XSession
+Type=Application
 Exec=gnome-valgrind-errors
 TryExec=gnome-valgrind-errors
 Name=GNOME Valgrind (Errors)
diff -urNp gnome-valgrind-session-1.1.orig/gnome-valgrind-leaks.desktop gnome-valgrind-session-1.1/gnome-valgrind-leaks.desktop
--- gnome-valgrind-session-1.1.orig/gnome-valgrind-leaks.desktop	2008-09-12 04:11:13.516914580 +0530
+++ gnome-valgrind-session-1.1/gnome-valgrind-leaks.desktop	2008-09-12 04:11:37.596154819 +0530
@@ -1,6 +1,5 @@
 [Desktop Entry]
-Encoding=UTF-8
-Type=XSession
+Type=Application
 Exec=gnome-valgrind-leaks
 TryExec=gnome-valgrind-leaks
 Name=GNOME Valgrind (Leaks)

gnome-valgrind-session-1.1-use-gnome-session.patch:

--- NEW FILE gnome-valgrind-session-1.1-use-gnome-session.patch ---
diff -urNp gnome-valgrind-session-1.1.orig/gnome-valgrind-errors gnome-valgrind-session-1.1/gnome-valgrind-errors
--- gnome-valgrind-session-1.1.orig/gnome-valgrind-errors	2008-04-25 08:18:05.000000000 +0530
+++ gnome-valgrind-session-1.1/gnome-valgrind-errors	2008-04-25 08:19:09.000000000 +0530
@@ -18,4 +18,4 @@ rm -f $SESSIONDIR/*
 export G_SLICE=always-malloc
 export G_DEBUG=gc-friendly
 
-valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=no /usr/bin/gnome
+valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=no /usr/bin/gnome-session
diff -urNp gnome-valgrind-session-1.1.orig/gnome-valgrind-leaks gnome-valgrind-session-1.1/gnome-valgrind-leaks
--- gnome-valgrind-session-1.1.orig/gnome-valgrind-leaks	2008-04-25 08:18:05.000000000 +0530
+++ gnome-valgrind-session-1.1/gnome-valgrind-leaks	2008-04-25 08:19:32.000000000 +0530
@@ -18,4 +18,4 @@ rm -f $SESSIONDIR/*
 export G_SLICE=always-malloc
 export G_DEBUG=gc-friendly
 
-valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=yes --show-reachable=no --leak-resolution=high /usr/bin/gnome
+valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=yes --show-reachable=no --leak-resolution=high /usr/bin/gnome-session


--- NEW FILE gnome-valgrind-session.spec ---
Summary:	Run an entire GNOME session under valgrind
Name:		gnome-valgrind-session
Version:	1.1
Release:	2%{?dist}
License:	Public Domain
Group:		Development/Tools
URL:		http://hp.cl.no/proj/gnome-valgrind-session/
Source0:	http://hp.cl.no/proj/gnome-valgrind-session/src/%{name}-%{version}.tar.bz2
Patch0:		%{name}-%{version}-desktop.patch
Patch1:		%{name}-%{version}-use-gnome-session.patch

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires:	gnome-session 
Requires:	valgrind

BuildArch:	noarch

%description
GNOME Valgrind Session adds new types of GNOME session to the login manager's
session menu. These let you instrument your entire session with Valgrind for
debugging purposes. The generated logs are collected and subjected to simple
postprocessing when you log out. The result is saved to a file in your home
directory.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xsessions

# Startup and post-processing scripts for the sessions.
install -p -m0755 gnome-valgrind-errors $RPM_BUILD_ROOT/%{_bindir}
install -p -m0755 gnome-valgrind-errors-postprocess $RPM_BUILD_ROOT/%{_bindir}
install -p -m0755 gnome-valgrind-leaks $RPM_BUILD_ROOT/%{_bindir}
install -p -m0755 gnome-valgrind-leaks-postprocess $RPM_BUILD_ROOT/%{_bindir}

# These desktop files represent sessions, not GUI apps, so we don't use
# desktop-file-install upon them (following precedent in the gnome-session
# package).
install -p -m0644 gnome-valgrind-errors.desktop \
  $RPM_BUILD_ROOT/%{_datadir}/xsessions
install -p -m0644 gnome-valgrind-leaks.desktop \
  $RPM_BUILD_ROOT/%{_datadir}/xsessions

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_bindir}/gnome-valgrind-errors
%{_bindir}/gnome-valgrind-errors-postprocess
%{_bindir}/gnome-valgrind-leaks
%{_bindir}/gnome-valgrind-leaks-postprocess
%{_datadir}/xsessions/gnome-valgrind-errors.desktop
%{_datadir}/xsessions/gnome-valgrind-leaks.desktop

%changelog
* Fri Sep 12 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.1-2
- Removed Encoding and fixed Type value in Desktop Entry.

* Fri Apr 25 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.1-1
- Initial build. Imported SPEC written by David Malcolm and Matthias Clasen.


--- NEW FILE import.log ---
gnome-valgrind-session-1_1-2_fc9:HEAD:gnome-valgrind-session-1.1-2.fc9.src.rpm:1221174046


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-valgrind-session/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 00:03:07 -0000	1.1
+++ .cvsignore	12 Sep 2008 04:32:25 -0000	1.2
@@ -0,0 +1 @@
+gnome-valgrind-session-1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-valgrind-session/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 00:03:07 -0000	1.1
+++ sources	12 Sep 2008 04:32:25 -0000	1.2
@@ -0,0 +1 @@
+4988af57dc895509ce01e2742883f47b  gnome-valgrind-session-1.1.tar.bz2



From atorkhov at fedoraproject.org  Fri Sep 12 05:35:31 2008
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Fri, 12 Sep 2008 05:35:31 +0000 (UTC)
Subject: rpms/libwfut/F-8 libwfut.spec,1.3,1.4
Message-ID: <20080912053531.C782370131@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/libwfut/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv301

Modified Files:
	libwfut.spec 
Log Message:
Fixing build reqs for F-8.


Index: libwfut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwfut/F-8/libwfut.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libwfut.spec	20 Jun 2008 11:07:10 -0000	1.3
+++ libwfut.spec	12 Sep 2008 05:35:00 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           libwfut
 Version:        0.2.0
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        Software updater tool for WorldForge applications
 
 Group:          Development/Libraries
@@ -14,7 +14,7 @@
 Patch1:         libwfut-0.2.0-system-tinyxml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libsigc++20-devel libcurl-devel zlib-devel tinyxml-devel python-devel swig
+BuildRequires:  libsigc++20-devel curl-devel zlib-devel tinyxml-devel python-devel swig
 
 %description
 libwfut is the WorldForge Update Tool (WFUT) client side implementation in C++



From transif at fedoraproject.org  Fri Sep 12 05:46:41 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Fri, 12 Sep 2008 05:46:41 +0000 (UTC)
Subject: comps/po zh_TW.po,1.12,1.13
Message-ID: <20080912054641.3CCC670131@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3701/po

Modified Files:
	zh_TW.po 
Log Message:
    2008-09-12  Terry Chuang <tchuang at redhat.com> (via
tchuang at fedoraproject.org)
    
      * po/zh_TW.po: 
    



Index: zh_TW.po
===================================================================
RCS file: /cvs/pkgs/comps/po/zh_TW.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- zh_TW.po	10 Sep 2008 22:57:57 -0000	1.12
+++ zh_TW.po	12 Sep 2008 05:46:10 -0000	1.13
@@ -1,4 +1,4 @@
-# translation of comps.HEAD.po to Chinese, Tradition
+# translation of comps.HEAD.po to Traditional Chinese
 # Translation of comps-po to Traditional Chinese
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) 2002 comps-po's COPYRIGHT HOLDER
@@ -7,14 +7,15 @@
 # Jouston Huang <jouston at jouston.no-ip.com>, 2004.
 # Chester Cheng <ccheng at redhat.com>, 2004, 2005, 2006, 2008.
 # Walter Cheuk <wwycheuk at gmail.com>, 2006.
+# Terry Chuang <tchuang at redhat.com>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-10 18:57-0400\n"
-"PO-Revision-Date: 2008-04-15 16:14+1000\n"
-"Last-Translator: Chester Cheng <ccheng at redhat.com>\n"
-"Language-Team: Chinese, Tradition <zh_TW at li.org>\n"
+"POT-Creation-Date: 2008-08-27 19:54+0000\n"
+"PO-Revision-Date: 2008-09-01 16:48+1000\n"
+"Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
+"Language-Team: Traditional Chinese <zh at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -398,14 +399,12 @@
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:81
-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:82 ../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
@@ -513,170 +512,169 @@
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:109
+#: ../comps-f10.xml.in.h:108
 msgid "Malay Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:110
+#: ../comps-f10.xml.in.h:109
 msgid "Malayalam Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:111
+#: ../comps-f10.xml.in.h:110
 msgid "Maori Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:112
+#: ../comps-f10.xml.in.h:111
 msgid "Marathi Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:110
-#: ../comps-f10.xml.in.h:114
+#: ../comps-f10.xml.in.h:113
 msgid "MySQL Database"
 msgstr "MySQL ?????????"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:112
-#: ../comps-f10.xml.in.h:117 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
+#: ../comps-f10.xml.in.h:115 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:118 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
+#: ../comps-f10.xml.in.h:116 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:115
-#: ../comps-f10.xml.in.h:120
+#: ../comps-f10.xml.in.h:118
 msgid "Northern Sotho Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:121
+#: ../comps-f10.xml.in.h:119
 msgid "Norwegian Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:122 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
+#: ../comps-f10.xml.in.h:120 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "????????????/???????????????"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:119
-#: ../comps-f10.xml.in.h:124
+#: ../comps-f10.xml.in.h:122
 msgid "Oriya Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:125 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
+#: ../comps-f10.xml.in.h:123 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
 msgstr "????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:126
+#: ../comps-f10.xml.in.h:124
 msgid "Persian Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:127
+#: ../comps-f10.xml.in.h:125
 msgid "Polish Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:128
+#: ../comps-f10.xml.in.h:126
 msgid "Portuguese Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:129
+#: ../comps-f10.xml.in.h:127
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ?????????"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:130
+#: ../comps-f10.xml.in.h:128
 msgid "Printing Support"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:131
+#: ../comps-f10.xml.in.h:129
 msgid "Punjabi Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:132
+#: ../comps-f10.xml.in.h:130
 msgid "Romanian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:133
+#: ../comps-f10.xml.in.h:131
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:134
+#: ../comps-f10.xml.in.h:132
 msgid "Russian Support"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:132
-#: ../comps-f10.xml.in.h:137
+#: ../comps-f10.xml.in.h:135
 msgid "Samoan Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:138
+#: ../comps-f10.xml.in.h:136
 msgid "Serbian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:139
+#: ../comps-f10.xml.in.h:137
 msgid "Server Configuration Tools"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:140 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
+#: ../comps-f10.xml.in.h:138 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:141 ../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."
+#: ../comps-f10.xml.in.h:139 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
+msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:142
+#: ../comps-f10.xml.in.h:140
 msgid "Sinhala Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:143
+#: ../comps-f10.xml.in.h:141
 msgid "Slovak Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:144
+#: ../comps-f10.xml.in.h:142
 msgid "Slovenian Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:145
+#: ../comps-f10.xml.in.h:143
 msgid "Smallest possible installation"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:146 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
+#: ../comps-f10.xml.in.h:144 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:147
+#: ../comps-f10.xml.in.h:145
 msgid "Somali Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:148
+#: ../comps-f10.xml.in.h:146
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -685,72 +683,72 @@
 "??? Vi???"
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:149 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
+#: ../comps-f10.xml.in.h:147 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:150
+#: ../comps-f10.xml.in.h:148
 msgid "Southern Ndebele Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:151
+#: ../comps-f10.xml.in.h:149
 msgid "Southern Sotho Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:152
+#: ../comps-f10.xml.in.h:150
 msgid "Spanish Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:153 ../comps-el4.xml.in.h:46
+#: ../comps-f10.xml.in.h:151 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "Java ????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:154 ../comps-el4.xml.in.h:47
+#: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "Java ????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:155
+#: ../comps-f10.xml.in.h:153
 msgid "Swati Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:156
+#: ../comps-f10.xml.in.h:154
 msgid "Swedish Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:157 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
+#: ../comps-f10.xml.in.h:155 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:158
+#: ../comps-f10.xml.in.h:156
 msgid "Tagalog Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:160
+#: ../comps-f10.xml.in.h:158
 msgid "Tamil Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:161
+#: ../comps-f10.xml.in.h:159
 msgid "Telugu Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:162 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
+#: ../comps-f10.xml.in.h:160 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:163
+#: ../comps-f10.xml.in.h:161
 msgid "Thai Support"
 msgstr "????????????"
 
@@ -759,65 +757,61 @@
 msgstr "Eclipse ?????????????????????"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:164 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
+#: ../comps-f10.xml.in.h:162 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "?????????????????????????????????????????????PDF ??????????????????"
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:165
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+#: ../comps-f10.xml.in.h:163
+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:160
-#: ../comps-f10.xml.in.h:166 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
+#: ../comps-f10.xml.in.h:164 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "?????????????????????????????? IMAP ??? SMTP ??????????????????"
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:167
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+#: ../comps-f10.xml.in.h:165
+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:162
-#: ../comps-f10.xml.in.h:168 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+#: ../comps-f10.xml.in.h:166 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:169
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+#: ../comps-f10.xml.in.h:167
+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:164
-#: ../comps-f10.xml.in.h:170
+#: ../comps-f10.xml.in.h:168
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
 msgstr "????????????????????????????????????????????????????????? rsh ??? telnet???"
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:171
+#: ../comps-f10.xml.in.h:169
 msgid "These packages provide a virtualization environment."
 msgstr "???????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:172
+#: ../comps-f10.xml.in.h:170
 msgid "These packages provide compatibility with previous releases."
 msgstr "??????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:173
+#: ../comps-f10.xml.in.h:171
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
 msgstr "??????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:174
+#: ../comps-f10.xml.in.h:172
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -826,59 +820,58 @@
 "Postscript ?????????????????????"
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
+#: ../comps-f10.xml.in.h:173 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
+#: ../comps-f10.xml.in.h:174 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "?????????????????????????????????????????? FTP ????????????"
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:177 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
+#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
-msgstr ""
-"???????????????????????????????????????????????? automake, gcc, perl, python ?????? debuggers???"
+msgstr "???????????????????????????????????????????????? automake, gcc, perl, python ?????? debuggers???"
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:178 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
+#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:179
+#: ../comps-f10.xml.in.h:177
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "???????????????????????? Red Hat ?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:180
+#: ../comps-f10.xml.in.h:178
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
 msgstr "??????????????????????????????????????????????????????????????? / ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
+#: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
+#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
+#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
+#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -887,27 +880,24 @@
 "????????????"
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
+#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
-msgstr ""
-"???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:186 ../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."
+#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:187 ../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."
+#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
+msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:188 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
+#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
 "client for connecting to SMB shares and tools to monitor network traffic."
@@ -916,145 +906,144 @@
 "????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:189
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+#: ../comps-f10.xml.in.h:187
+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:184
-#: ../comps-f10.xml.in.h:190
+#: ../comps-f10.xml.in.h:188
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
 msgstr "????????????????????????????????? Linux ??? MS Windows (tm) ????????????????????????"
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:191
+#: ../comps-f10.xml.in.h:189
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "?????????????????????????????????????????? MySQL ????????????"
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:192
+#: ../comps-f10.xml.in.h:190
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "?????????????????????????????????????????? Postgresql ????????????"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:193
+#: ../comps-f10.xml.in.h:191
 msgid "Tibetan Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:194
+#: ../comps-f10.xml.in.h:192
 msgid "Tonga Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:195 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
+#: ../comps-f10.xml.in.h:193 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Fedora ????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:196
+#: ../comps-f10.xml.in.h:194
 msgid "Tsonga Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:197
+#: ../comps-f10.xml.in.h:195
 msgid "Tswana Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:198
+#: ../comps-f10.xml.in.h:196
 msgid "Turkish Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:199
+#: ../comps-f10.xml.in.h:197
 msgid "Ukrainian Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:200
+#: ../comps-f10.xml.in.h:198
 msgid "Urdu Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:202 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
+#: ../comps-f10.xml.in.h:199 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:203 ../comps-el5.xml.in.h:72
+#: ../comps-f10.xml.in.h:200 ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:204
+#: ../comps-f10.xml.in.h:201
 msgid "Venda Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:205
+#: ../comps-f10.xml.in.h:202
 msgid "Vietnamese Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:206
+#: ../comps-f10.xml.in.h:203
 msgid "Virtualization"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:201
-#: ../comps-f10.xml.in.h:208 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
+#: ../comps-f10.xml.in.h:205 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:209 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
+#: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:210
+#: ../comps-f10.xml.in.h:207
 msgid "Welsh Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:211 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
+#: ../comps-f10.xml.in.h:208 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:212
+#: ../comps-f10.xml.in.h:209
 msgid "Windows File Server"
 msgstr "Windows ???????????????"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:213
+#: ../comps-f10.xml.in.h:210
 msgid "X Software Development"
 msgstr "X ????????????"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:214 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
+#: ../comps-f10.xml.in.h:211 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X ????????????"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:215
+#: ../comps-f10.xml.in.h:212
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:216
+#: ../comps-f10.xml.in.h:213
 msgid "XFCE Software Development"
 msgstr "XFCE ????????????"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:217
+#: ../comps-f10.xml.in.h:214
 msgid "Xhosa Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:218
+#: ../comps-f10.xml.in.h:215
 msgid "Zulu Support"
 msgstr "???????????????"
 
@@ -1086,83 +1075,61 @@
 msgid "Low Saxon Support"
 msgstr "??????????????????"
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:113
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:112
 msgid "Mongolian Support"
 msgstr "???????????????"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:116
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:114
 msgid "Nepali Support"
 msgstr "??????????????????"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:123
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:121
 msgid "Older bitmap and vector fonts packages"
 msgstr "????????? bitmap ?????????????????????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44
-#, fuzzy
 msgid "Esperanto Support"
-msgstr "????????????"
+msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashubian Support"
-msgstr "?????????????????????"
+msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:106
-#, fuzzy
 msgid "Macedonian Support"
-msgstr "???????????????"
+msgstr "??????????????????"
 
-#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:119
-#, fuzzy
+#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:117
 msgid "Northern Sami Support"
-msgstr "??????????????????"
+msgstr "??????????????????"
 
-#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:135
-#, fuzzy
+#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:133
 msgid "SUGAR Desktop Environment"
-msgstr "????????????"
+msgstr "SUGAR ????????????"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:136
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:134
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
-msgstr ""
+msgstr "SUGAR ????????? OLPC XO ???????????????????????????"
 
-#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:207
-#, fuzzy
+#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:204
 msgid "Walloon Support"
-msgstr "???????????????"
+msgstr "???????????????"
 
 #: ../comps-f10.xml.in.h:70
 msgid "Haskell"
-msgstr ""
+msgstr "Haskell"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
-msgstr ""
+msgstr "?????????"
 
 #: ../comps-f10.xml.in.h:77
 msgid "Input method packages for the input of international text."
-msgstr ""
+msgstr "??????????????????????????????????????????"
 
-#: ../comps-f10.xml.in.h:108
-#, fuzzy
-msgid "Maithili Support"
-msgstr "??????????????????"
-
-#: ../comps-f10.xml.in.h:115
-#, fuzzy
-msgid "Myanmar (Burmese) Support"
-msgstr "???????????????"
-
-#: ../comps-f10.xml.in.h:159
-#, fuzzy
+#: ../comps-f10.xml.in.h:157
 msgid "Tajik Support"
-msgstr "????????????"
-
-#: ../comps-f10.xml.in.h:201
-#, fuzzy
-msgid "Uzbek Support"
-msgstr "???????????????"
+msgstr "??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1213,18 +1180,15 @@
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "???????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1232,67 +1196,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??????????????????????????????????????????????????????"
 
-#~ msgid "British Support"
-#~ msgstr "??????????????????"
-
-#~ msgid "Cluster Storage"
-#~ msgstr "????????????"
-
-#~ msgid "Clustering Support."
-#~ msgstr "?????????Clustering????????????"
-
-#~ msgid "Libraries for applications built on older releases."
-#~ msgstr "?????????????????????????????????????????????????????????"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "????????????????????????"
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "??????????????? GFS ????????????"
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "????????? GFS ??????"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "??????????????????????????????????????????????????????"
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "Java ??????????????????????????????"
-
-#~ msgid "Misc"
-#~ msgstr "??????"
-
-#~ msgid "Misc packages"
-#~ msgstr "????????????"
-
-#~ msgid "Multimedia"
-#~ msgstr "?????????"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "?????????????????????"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr "??? Red Hat Enterprise Linux ???????????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux Supplementary"
-#~ msgstr "Red Hat Enterprise Linux ??????"
-
-#~ msgid ""
-#~ "Components used for high performance networking and clustering, such as "
-#~ "Infiniband and RDMA."
-#~ msgstr "????????????????????????????????????????????? Infiniband ??? RDMA???"
-
-#~ msgid "OpenFabrics Enterprise Distribution"
-#~ msgstr "OpenFabrics ???????????????"
-
-#~ msgid "Virtualization Support."
-#~ msgstr "???????????????"



From pkgdb at fedoraproject.org  Fri Sep 12 05:49:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 05:49:11 +0000
Subject: [pkgdb] vdr-streamdev was added for heffer
Message-ID: <20080912054911.8F768208D9A@bastion.fedora.phx.redhat.com>

huzaifas has added Package vdr-streamdev with summary Streaming plugin for VDR
huzaifas has approved Package vdr-streamdev
huzaifas has added a Fedora devel branch for vdr-streamdev with an owner of heffer
huzaifas has approved vdr-streamdev in Fedora devel
huzaifas has approved Package vdr-streamdev
huzaifas has set commit to Approved for packager on vdr-streamdev (Fedora devel)
huzaifas has set build to Approved for packager on vdr-streamdev (Fedora devel)
huzaifas has set checkout to Approved for packager on vdr-streamdev (Fedora devel)
huzaifas has set commit to Approved for uberpackager on vdr-streamdev (Fedora devel)
huzaifas has set build to Approved for uberpackager on vdr-streamdev (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on vdr-streamdev (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vdr-streamdev



From pkgdb at fedoraproject.org  Fri Sep 12 05:49:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 05:49:12 +0000
Subject: [pkgdb] vdr-streamdev (Fedora, 9) updated by huzaifas
Message-ID: <20080912054912.5BBA3208D9E@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for vdr-streamdev
huzaifas has set commit to Approved for uberpackager on vdr-streamdev (Fedora 9)
huzaifas has set build to Approved for uberpackager on vdr-streamdev (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on vdr-streamdev (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vdr-streamdev



From pkgdb at fedoraproject.org  Fri Sep 12 05:49:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 05:49:12 +0000
Subject: [pkgdb] vdr-streamdev (Fedora, 8) updated by huzaifas
Message-ID: <20080912054912.64538208DA1@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for vdr-streamdev
huzaifas has set commit to Approved for uberpackager on vdr-streamdev (Fedora 8)
huzaifas has set build to Approved for uberpackager on vdr-streamdev (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on vdr-streamdev (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vdr-streamdev



From huzaifas at fedoraproject.org  Fri Sep 12 05:49:32 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 05:49:32 +0000 (UTC)
Subject: rpms/vdr-streamdev/devel - New directory
Message-ID: <20080912054932.6C8EB70134@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/vdr-streamdev/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsfA4576/rpms/vdr-streamdev/devel

Log Message:
Directory /cvs/extras/rpms/vdr-streamdev/devel added to the repository




From huzaifas at fedoraproject.org  Fri Sep 12 05:49:32 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 05:49:32 +0000 (UTC)
Subject: rpms/vdr-streamdev - New directory
Message-ID: <20080912054932.35E3E70131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/vdr-streamdev
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsfA4576/rpms/vdr-streamdev

Log Message:
Directory /cvs/extras/rpms/vdr-streamdev added to the repository




From huzaifas at fedoraproject.org  Fri Sep 12 05:49:33 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 05:49:33 +0000 (UTC)
Subject: rpms/vdr-streamdev Makefile,NONE,1.1
Message-ID: <20080912054933.60D6570131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/vdr-streamdev
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsfA4576/rpms/vdr-streamdev

Added Files:
	Makefile 
Log Message:
Setup of module vdr-streamdev


--- NEW FILE Makefile ---
# Top level Makefile for module vdr-streamdev
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep 12 05:49:33 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 05:49:33 +0000 (UTC)
Subject: rpms/vdr-streamdev/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080912054933.A337570131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/vdr-streamdev/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsfA4576/rpms/vdr-streamdev/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vdr-streamdev


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: vdr-streamdev
# $Id: Makefile,v 1.1 2008/09/12 05:49:33 huzaifas Exp $
NAME := vdr-streamdev
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From huzaifas at fedoraproject.org  Fri Sep 12 06:00:23 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 06:00:23 +0000 (UTC)
Subject: rpms/ember-media - New directory
Message-ID: <20080912060023.24C8B70131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/ember-media
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvswH9676/rpms/ember-media

Log Message:
Directory /cvs/extras/rpms/ember-media added to the repository




From huzaifas at fedoraproject.org  Fri Sep 12 06:00:24 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 06:00:24 +0000 (UTC)
Subject: rpms/ember-media/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080912060024.6C06870131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/ember-media/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvswH9676/rpms/ember-media/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ember-media


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ember-media
# $Id: Makefile,v 1.1 2008/09/12 06:00:24 huzaifas Exp $
NAME := ember-media
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From huzaifas at fedoraproject.org  Fri Sep 12 06:00:23 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 06:00:23 +0000 (UTC)
Subject: rpms/ember-media/devel - New directory
Message-ID: <20080912060023.5872870131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/ember-media/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvswH9676/rpms/ember-media/devel

Log Message:
Directory /cvs/extras/rpms/ember-media/devel added to the repository




From huzaifas at fedoraproject.org  Fri Sep 12 06:00:24 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 06:00:24 +0000 (UTC)
Subject: rpms/ember-media Makefile,NONE,1.1
Message-ID: <20080912060024.350B970131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/ember-media
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvswH9676/rpms/ember-media

Added Files:
	Makefile 
Log Message:
Setup of module ember-media


--- NEW FILE Makefile ---
# Top level Makefile for module ember-media
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From atorkhov at fedoraproject.org  Fri Sep 12 06:01:19 2008
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Fri, 12 Sep 2008 06:01:19 +0000 (UTC)
Subject: rpms/ember/F-9 ember-0.5.4-gcc43.patch, NONE, 1.1 ember.spec, NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080912060119.E1BF170131@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/ember/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9611/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	ember-0.5.4-gcc43.patch ember.spec import.log 
Log Message:
Import of 0.5.4 package.


ember-0.5.4-gcc43.patch:

--- NEW FILE ember-0.5.4-gcc43.patch ---
diff --git a/src/services/sound/SoundService.cpp b/src/services/sound/SoundService.cpp
index f0024af..1403c83 100644
--- a/src/services/sound/SoundService.cpp
+++ b/src/services/sound/SoundService.cpp
@@ -31,6 +31,7 @@
 
 #include <map>
 #include <cstring>
+#include <algorithm>
 
 #ifndef __WIN32__
 #include <AL/alut.h>


--- NEW FILE ember.spec ---
Name:           ember
Version:        0.5.4
Release:        1%{?dist}
Summary:        Ember - a client for Worldforge

Group:          Amusements/Games
License:        GPLv3+
URL:            http://www.worldforge.org/dev/eng/clients/ember
Source0:        http://downloads.sourceforge.net/worldforge/%{name}-%{version}.tar.bz2
Patch0:         ember-0.5.4-gcc43.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  SDL-devel tinyxml-devel DevIL-devel cegui-devel ogre-devel
BuildRequires:  lua-devel tolua++-devel openal-devel freealut-devel
BuildRequires:  atlascpp-devel eris-devel mercator-devel varconf-devel wfmath-devel libwfut-devel
BuildRequires:  desktop-file-utils

Requires:       %{name}-media = %{version}

%description
Ember is a client for MMORPGs using the WorldForge system.
It uses the Ogre 3D engine with CEGUI.


%prep
%setup -q
%patch0 -p1

# Encoding fix
iconv -f iso-8859-1 -t utf-8 AUTHORS > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS


%build
%configure --disable-static --disable-freeimage-check
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor="fedora" \
    --remove-category="Application" --add-category="RolePlaying" \
    --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mv $RPM_BUILD_ROOT%{_datadir}/icons/worldforge/ember.png \
    $RPM_BUILD_ROOT%{_datadir}/pixmaps/

# Remove media that are duplicated with ember-media package
rm -rf $RPM_BUILD_ROOT%{_datadir}/ember/media/user # modeldefinitions


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README INSTALL AUTHORS
%{_bindir}/%{name}
%{_bindir}/%{name}.bin
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/ember.png
# datadir/%{name} is owned by ember-media
%{_datadir}/%{name}/carpenter
%{_datadir}/%{name}/jesus
# datadir/%{name}/media is owned by ember-media
# datadir/%{name}/media/shared is owned by ember-media
# datadir/%{name}/media/shared/gui is owned by ember-media
%{_datadir}/%{name}/media/shared/gui/*.xsd
# datadir/%{name}/media/shared/gui/cegui is owned by ember-media
%{_datadir}/%{name}/media/shared/gui/cegui/datafiles
%{_datadir}/%{name}/media/shared/scripting

# Not using noreplace: having old config file can make things not working as was intended. User can override settings with config in homedir.
%dir %{_sysconfdir}/%{name}
%config %{_sysconfdir}/%{name}/*



%changelog
* Tue Sep 09 2008 Alexey Torkhov <atorkhov at gmail.com> 0.5.4-1
- Update to 0.5.4.

* Tue Jul 08 2008 Alexey Torkhov <atorkhov at gmail.com> 0.5.3-1
- Update to 0.5.3.

* Fri Jun 20 2008 Alexey Torkhov <atorkhov at gmail.com> 0.5.2-1
- Inital spec for Fedora.


--- NEW FILE import.log ---
ember-0_5_4-1_fc9:F-9:ember-0.5.4-1.fc9.src.rpm:1221199184


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ember/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2008 03:22:34 -0000	1.1
+++ .cvsignore	12 Sep 2008 06:00:49 -0000	1.2
@@ -0,0 +1 @@
+ember-0.5.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ember/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 03:22:34 -0000	1.1
+++ sources	12 Sep 2008 06:00:49 -0000	1.2
@@ -0,0 +1 @@
+217a7d014b929bbdfcb12385b4fe1658  ember-0.5.4.tar.bz2



From atorkhov at fedoraproject.org  Fri Sep 12 06:05:31 2008
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Fri, 12 Sep 2008 06:05:31 +0000 (UTC)
Subject: rpms/ember/devel ember-0.5.4-gcc43.patch, NONE, 1.1 ember.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080912060531.5F92470131@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/ember/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11736/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ember-0.5.4-gcc43.patch ember.spec import.log 
Log Message:
Import of 0.5.4 package.


ember-0.5.4-gcc43.patch:

--- NEW FILE ember-0.5.4-gcc43.patch ---
diff --git a/src/services/sound/SoundService.cpp b/src/services/sound/SoundService.cpp
index f0024af..1403c83 100644
--- a/src/services/sound/SoundService.cpp
+++ b/src/services/sound/SoundService.cpp
@@ -31,6 +31,7 @@
 
 #include <map>
 #include <cstring>
+#include <algorithm>
 
 #ifndef __WIN32__
 #include <AL/alut.h>


--- NEW FILE ember.spec ---
Name:           ember
Version:        0.5.4
Release:        1%{?dist}
Summary:        Ember - a client for Worldforge

Group:          Amusements/Games
License:        GPLv3+
URL:            http://www.worldforge.org/dev/eng/clients/ember
Source0:        http://downloads.sourceforge.net/worldforge/%{name}-%{version}.tar.bz2
Patch0:         ember-0.5.4-gcc43.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  SDL-devel tinyxml-devel DevIL-devel cegui-devel ogre-devel
BuildRequires:  lua-devel tolua++-devel openal-devel freealut-devel
BuildRequires:  atlascpp-devel eris-devel mercator-devel varconf-devel wfmath-devel libwfut-devel
BuildRequires:  desktop-file-utils

Requires:       %{name}-media = %{version}

%description
Ember is a client for MMORPGs using the WorldForge system.
It uses the Ogre 3D engine with CEGUI.


%prep
%setup -q
%patch0 -p1

# Encoding fix
iconv -f iso-8859-1 -t utf-8 AUTHORS > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS


%build
%configure --disable-static --disable-freeimage-check
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor="fedora" \
    --remove-category="Application" --add-category="RolePlaying" \
    --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mv $RPM_BUILD_ROOT%{_datadir}/icons/worldforge/ember.png \
    $RPM_BUILD_ROOT%{_datadir}/pixmaps/

# Remove media that are duplicated with ember-media package
rm -rf $RPM_BUILD_ROOT%{_datadir}/ember/media/user # modeldefinitions


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README INSTALL AUTHORS
%{_bindir}/%{name}
%{_bindir}/%{name}.bin
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/ember.png
# datadir/%{name} is owned by ember-media
%{_datadir}/%{name}/carpenter
%{_datadir}/%{name}/jesus
# datadir/%{name}/media is owned by ember-media
# datadir/%{name}/media/shared is owned by ember-media
# datadir/%{name}/media/shared/gui is owned by ember-media
%{_datadir}/%{name}/media/shared/gui/*.xsd
# datadir/%{name}/media/shared/gui/cegui is owned by ember-media
%{_datadir}/%{name}/media/shared/gui/cegui/datafiles
%{_datadir}/%{name}/media/shared/scripting

# Not using noreplace: having old config file can make things not working as was intended. User can override settings with config in homedir.
%dir %{_sysconfdir}/%{name}
%config %{_sysconfdir}/%{name}/*



%changelog
* Tue Sep 09 2008 Alexey Torkhov <atorkhov at gmail.com> 0.5.4-1
- Update to 0.5.4.

* Tue Jul 08 2008 Alexey Torkhov <atorkhov at gmail.com> 0.5.3-1
- Update to 0.5.3.

* Fri Jun 20 2008 Alexey Torkhov <atorkhov at gmail.com> 0.5.2-1
- Inital spec for Fedora.


--- NEW FILE import.log ---
ember-0_5_4-1_fc9:HEAD:ember-0.5.4-1.fc9.src.rpm:1221199458


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ember/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2008 03:22:34 -0000	1.1
+++ .cvsignore	12 Sep 2008 06:05:00 -0000	1.2
@@ -0,0 +1 @@
+ember-0.5.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ember/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 03:22:34 -0000	1.1
+++ sources	12 Sep 2008 06:05:01 -0000	1.2
@@ -0,0 +1 @@
+217a7d014b929bbdfcb12385b4fe1658  ember-0.5.4.tar.bz2



From atorkhov at fedoraproject.org  Fri Sep 12 06:31:16 2008
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Fri, 12 Sep 2008 06:31:16 +0000 (UTC)
Subject: rpms/ember-media/devel ember-media.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080912063116.05F7870131@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/ember-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20578/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ember-media.spec import.log 
Log Message:
Import 0.5.4 package.



--- NEW FILE ember-media.spec ---
Name:           ember-media
Version:        0.5.4
# No dist tag because this is large noarch game data
Release:        2
Summary:        Media files for the ember WorldForge client

Group:          Amusements/Games
License:        GPLv2+ or GFDL
URL:            http://www.worldforge.org/dev/eng/clients/ember
Source0:        http://downloads.sourceforge.net/worldforge/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       ember >= %{version} bitstream-vera-fonts

%description
Media files for the ember WorldForge client.


%prep
%setup -q


%build
# Nothing to build!


%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/ember/media
cp -a * $RPM_BUILD_ROOT%{_datadir}/ember/media

# Remove doc files from installed media files
rm -f $RPM_BUILD_ROOT%{_datadir}/ember/media/shared/{LICENSING.txt,README}
rm -f $RPM_BUILD_ROOT%{_datadir}/ember/media/user/{LICENSING.txt,README}

# Use system Bitstream Vera fonts
rm -f $RPM_BUILD_ROOT%{_datadir}/ember/media/shared/common/themes/ember/gui/fonts/{Vera,VeraBd}.ttf
cd $RPM_BUILD_ROOT%{_datadir}/ember/media/shared/common/themes/ember/gui/fonts/
ln -s ../../../../../../../../fonts/bitstream-vera/{Vera,VeraBd}.ttf .
rm -f $RPM_BUILD_ROOT%{_datadir}/ember/media/shared/core/Vera.ttf
cd $RPM_BUILD_ROOT%{_datadir}/ember/media/shared/core/
ln -s ../../../../fonts/bitstream-vera/Vera.ttf .

# Should not be executable
chmod -x $RPM_BUILD_ROOT%{_datadir}/ember/media/user/common/resources/ogre/scripts/materials/*.material

# Don't need zero length files
rm -f $RPM_BUILD_ROOT%{_datadir}/ember/media/user/modeldefinitions/{drystan_archer,vehicles,outdoor_structures,buildings,fencegate,palissade,house_A,choppingblockA,choppingblockB,mushroom}.modeldef
rm -f $RPM_BUILD_ROOT%{_datadir}/ember/media/user/common/resources/ogre/scripts/materials/smoke.material

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc user/LICENSING.txt user/README
%dir %{_datadir}/ember
%{_datadir}/ember/media



%changelog
* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.5.4-2
- use relative symlinks
- delete zero length files
- don't set files +x unnecessarily

* Tue Sep 09 2008 Alexey Torkhov <atorkhov at gmail.com> 0.5.4-1
- Update to 0.5.4.

* Tue Jul 08 2008 Alexey Torkhov <atorkhov at gmail.com> 0.5.3-1
- Update to 0.5.3.

* Fri Jun 20 2008 Alexey Torkhov <atorkhov at gmail.com> 0.5.2-1
- Inital spec for Fedora.


--- NEW FILE import.log ---
ember-media-0_5_4-2:HEAD:ember-media-0.5.4-2.src.rpm:1221200997


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ember-media/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2008 06:00:24 -0000	1.1
+++ .cvsignore	12 Sep 2008 06:30:45 -0000	1.2
@@ -0,0 +1 @@
+ember-media-0.5.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ember-media/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 06:00:24 -0000	1.1
+++ sources	12 Sep 2008 06:30:45 -0000	1.2
@@ -0,0 +1 @@
+3456da701e60171d17d371c2d4abdd49  ember-media-0.5.4.tar.bz2



From than at fedoraproject.org  Fri Sep 12 06:33:22 2008
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 12 Sep 2008 06:33:22 +0000 (UTC)
Subject: rpms/system-switch-displaymanager/devel .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20080912063322.A510270131@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/system-switch-displaymanager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21392

Modified Files:
	.cvsignore sources 
Log Message:
import into cvs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/system-switch-displaymanager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 19:33:40 -0000	1.1
+++ .cvsignore	12 Sep 2008 06:32:52 -0000	1.2
@@ -0,0 +1 @@
+system-switch-displaymanager-1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-switch-displaymanager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 19:33:40 -0000	1.1
+++ sources	12 Sep 2008 06:32:52 -0000	1.2
@@ -0,0 +1 @@
+81a1112ea0de8fa57984d242e6810094  system-switch-displaymanager-1.1.tar.bz2



From than at fedoraproject.org  Fri Sep 12 06:33:25 2008
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 12 Sep 2008 06:33:25 +0000 (UTC)
Subject: rpms/system-switch-displaymanager/devel
	system-switch-displaymanager.spec, NONE, 1.1
Message-ID: <20080912063325.E878470131@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/system-switch-displaymanager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22034

Added Files:
	system-switch-displaymanager.spec 
Log Message:
import into cvs



--- NEW FILE system-switch-displaymanager.spec ---
Name: system-switch-displaymanager
Summary: A display manager switcher for GDM, KDM, XDM and WDM
Version: 1.1
Release: 1
URL: http://fedoraproject.org/wiki/switch-displaymanager
Source: %{name}-%{version}.tar.bz2
License: GPLv2+
Group: User Interface/Desktops
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
Requires: usermode
BuildRequires: intltool
BuildRequires: gettext
BuildRequires: desktop-file-utils

%description
The Display Manager Switcher is a tool which enables users to easily switch
between various deskplay managers that they have installed. The tool includes
support for GDM, KDM, XDM and WDM.

Install system-switch-displaymanager if you need a tool for switching between
display managers.

%package gnome
Group: User Interface/Desktops
Summary: A graphical interface for the Display Manager Switcher
Requires: %{name} = %{version}-%{release} python pygtk2

%description gnome
The system-switch-displaymanager-gnome package provides the GNOME graphical user
interface for the Display Manager Switcher.

%prep

%setup -q -n %{name}-%{version}

%build
make

%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot}

%find_lang %{name} || true

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc COPYING
%dir %{_datadir}/%{name}
%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
%{_bindir}/%{name}
%{_sbindir}/%{name}
%{_datadir}/%{name}/%{name}-helper
%{_mandir}/man1/*

%files gnome -f %{name}.lang
%defattr(-,root,root)
%{_datadir}/%{name}/pixmaps
%{_datadir}/%{name}/*.glade
%{_datadir}/%{name}/*.py*
%{_datadir}/applications/*

%changelog
* Thu Sep 11 2008 Than Ngo <than at redhat.com> 1.1-1
- rename to system-switch-displaymanager

* Fri Aug 15 2008 Than Ngo <than at redhat.com> 1.0-1
- 1.0



From than at fedoraproject.org  Fri Sep 12 06:38:36 2008
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 12 Sep 2008 06:38:36 +0000 (UTC)
Subject: rpms/system-switch-displaymanager/F-9 sources,1.1,1.2
Message-ID: <20080912063836.B957070131@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/system-switch-displaymanager/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23701

Modified Files:
	sources 
Log Message:
import into cvs



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-switch-displaymanager/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 19:33:40 -0000	1.1
+++ sources	12 Sep 2008 06:38:06 -0000	1.2
@@ -0,0 +1 @@
+81a1112ea0de8fa57984d242e6810094  system-switch-displaymanager-1.1.tar.bz2



From rezso at fedoraproject.org  Fri Sep 12 06:45:41 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Fri, 12 Sep 2008 06:45:41 +0000 (UTC)
Subject: rpms/mapnik/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 mapnik.spec, 1.1, 1.2 sources, 1.2, 1.3 gcc43-warnings.patch,
	1.1, NONE
Message-ID: <20080912064541.BA68A70131@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/mapnik/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26038/devel

Modified Files:
	.cvsignore import.log mapnik.spec sources 
Removed Files:
	gcc43-warnings.patch 
Log Message:
- new cvs snapshot, x86_64 should work for now
- new cairo dep added
 ----------------------------------------------------------------------
 Modified Files:
 	devel/.cvsignore devel/import.log devel/mapnik.spec 
 	devel/sources 
 Removed Files:
 	devel/gcc43-warnings.patch 
 ----------------------------------------------------------------------



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Aug 2008 16:00:19 -0000	1.2
+++ .cvsignore	12 Sep 2008 06:45:11 -0000	1.3
@@ -1 +1 @@
-mapnik_src-0.5.1.tar.gz
+mapnik_src-0.5.2.svn738.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Aug 2008 16:00:19 -0000	1.1
+++ import.log	12 Sep 2008 06:45:11 -0000	1.2
@@ -1 +1,2 @@
 mapnik-0_5_1-4_fc9:HEAD:mapnik-0.5.1-4.fc9.src.rpm:1219679501
+mapnik-0_5_2-0_1_svn738_fc10:HEAD:mapnik-0.5.2-0.1.svn738.fc10.src.rpm:1221201860


Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/mapnik.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mapnik.spec	25 Aug 2008 16:00:19 -0000	1.1
+++ mapnik.spec	12 Sep 2008 06:45:11 -0000	1.2
@@ -1,25 +1,24 @@
 Name:      mapnik
-Version:   0.5.1
-Release:   4%{?dist}
+Version:   0.5.2
+Release:   0.1.svn738%{?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}.tar.gz
+Source0:   http://download.berlios.de/mapnik/mapnik_src-%{version}.svn738.tar.gz
 Source1:   mapnik-data.license
 Source2:   no_date_footer.html
 Patch0:    use-system-fonts.patch
-Patch1:    gcc43-warnings.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  dejavu-fonts
 
 BuildRequires: scons doxygen
-BuildRequires: postgresql-devel python-devel
-BuildRequires: libtool-ltdl-devel pkgconfig
-BuildRequires: gdal-devel proj-devel agg-devel
+BuildRequires: libtool-ltdl-devel
 BuildRequires: libxml2-devel boost-devel
-BuildRequires: libtiff-devel libjpeg-devel
-BuildRequires: libpng-devel freetype-devel fribidi-devel
+BuildRequires: postgresql-devel pkgconfig
+BuildRequires: gdal-devel proj-devel agg-devel
+BuildRequires: libtiff-devel libjpeg-devel libpng-devel
+BuildRequires: cairomm-devel pycairo-devel freetype-devel
 
 %{!?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)")}
@@ -93,9 +92,11 @@
 spatial visualization library
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}
 %patch0 -p0
-%patch1 -p0
+
+# clean SVN
+find . -type d -name .svn -exec rm -rf '{}' +
 
 # get rid of local agg, tinyxml and fonts
 rm -rf agg tinyxml fonts
@@ -127,9 +128,7 @@
 sed -i -e "s|.\#tinyxml..||g" SConstruct
 sed -i -e "s|\#agg\/include|\/usr\/include\/agg2\/|g" SConstruct
 sed -i -e "s|SConscript(.agg|\#SConscript(.agg|g" SConstruct
-sed -i -e "s|\[.iconv.|\[\'dl\'|g" SConstruct
-# system_error.hpp missing on linux
-sed -i -e "s|\[.system.|\#\[\'system\'|g" SConstruct
+
 # linkage errors
 sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\',|g" plugins/input/gdal/SConscript
 sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\',|g" plugins/input/postgis/SConscript
@@ -139,10 +138,13 @@
 # fix build flags
 sed -i -e "s|common_cxx_flags = .-D\%s|common_cxx_flags = \'-D\%s $RPM_OPT_FLAGS |g" SConstruct
 
-%{__python} scons/scons.py \
-                PREFIX=%{_prefix} \
-                XMLPARSER=libxml2 \
-                GDAL_INCLUDES=%{_includedir}/gdal
+
+scons %{?_smp_mflags} \
+              PREFIX=%{_prefix} \
+              THREADING=multi \
+              XMLPARSER=libxml2 \
+              GDAL_INCLUDES=%{_includedir}/gdal \
+              INTERNAL_LIBAGG=False
 
 # build doxygen docs
 # use multilib aware footer
@@ -156,10 +158,12 @@
 
 rm -rf %{buildroot}
 
-%{__python} scons/scons.py install DESTDIR=%{buildroot} \
-                PREFIX=%{_prefix} \
-                XMLPARSER=libxml2 \
-                GDAL_INCLUDES=%{_includedir}/gdal
+scons install DESTDIR=%{buildroot} \
+              PREFIX=%{_prefix} \
+              THREADING=multi \
+              XMLPARSER=libxml2 \
+              GDAL_INCLUDES=%{_includedir}/gdal \
+              INTERNAL_LIBAGG=False
 
 # get rid of fonts use external instead
 rm -rf %{buildroot}%{_libdir}/%{name}/fonts
@@ -220,6 +224,10 @@
 %doc demo/python demo/test
 
 %changelog
+* Thu Sep 11 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.1.svn738
+- new cvs snapshot, x86_64 should work for now
+- new cairo dep added
+
 * Mon Aug 25 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.1-4
 - License of demo is GPLv2+ GeoGratis
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2008 16:00:19 -0000	1.2
+++ sources	12 Sep 2008 06:45:11 -0000	1.3
@@ -1 +1 @@
-fa484bdb5cf1faf0720f17129a43038b  mapnik_src-0.5.1.tar.gz
+01b65569ff99e3b3e70880bc47302a11  mapnik_src-0.5.2.svn738.tar.gz


--- gcc43-warnings.patch DELETED ---



From thm at fedoraproject.org  Fri Sep 12 07:08:21 2008
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri, 12 Sep 2008 07:08:21 +0000 (UTC)
Subject: rpms/python-markdown2/devel .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 python-markdown2.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20080912070822.01E7570131@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-markdown2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1601/devel

Modified Files:
	.cvsignore import.log python-markdown2.spec sources 
Log Message:
Update to 1.0.1.9.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Sep 2008 21:26:34 -0000	1.3
+++ .cvsignore	12 Sep 2008 07:07:51 -0000	1.4
@@ -1 +1 @@
-markdown2-1.0.1.8.tar.gz
+markdown2-1.0.1.9.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	11 Sep 2008 21:26:34 -0000	1.2
+++ import.log	12 Sep 2008 07:07:51 -0000	1.3
@@ -1,2 +1,3 @@
 python-markdown2-1_0_1_7-1_fc9:HEAD:python-markdown2-1.0.1.7-1.fc9.src.rpm:1221168087
 python-markdown2-1_0_1_8-1_fc9:HEAD:python-markdown2-1.0.1.8-1.fc9.src.rpm:1221168324
+python-markdown2-1_0_1_9-1_fc9:HEAD:python-markdown2-1.0.1.9-1.fc9.src.rpm:1221203243


Index: python-markdown2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/python-markdown2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-markdown2.spec	11 Sep 2008 21:26:34 -0000	1.2
+++ python-markdown2.spec	12 Sep 2008 07:07:51 -0000	1.3
@@ -3,7 +3,7 @@
 %define srcname markdown2
 
 Name:           python-%{srcname}
-Version:        1.0.1.8
+Version:        1.0.1.9
 Release:        1%{?dist}
 Summary:        A fast and complete Python implementation of Markdown
 Group:          Development/Languages
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.9-1
+- Update to 1.0.1.9.
+
 * Thu Sep 11 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.8-1
 - Update to 1.0.1.8.
 - Simplify the cmdline wrapper.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Sep 2008 21:26:34 -0000	1.3
+++ sources	12 Sep 2008 07:07:51 -0000	1.4
@@ -1 +1 @@
-869daf8cc2510a6492aa9b3a810e73e0  markdown2-1.0.1.8.tar.gz
+88501d48c2745fa6369ccf2c8805c89b  markdown2-1.0.1.9.tar.gz



From cebbert at fedoraproject.org  Fri Sep 12 07:08:39 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 12 Sep 2008 07:08:39 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc6-git1.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.922, 1.923 kernel.spec, 1.946, 1.947 sources, 1.884,
	1.885 upstream, 1.796, 1.797
Message-ID: <20080912070839.00FAA70131@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1717

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.27-rc6-git1.bz2.sign 
Log Message:
2.6.27-rc6-git1


--- NEW FILE patch-2.6.27-rc6-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIybG5yGugalF9Dw4RAvTVAKCQf7cJAlDKbAaFCNPnffn/4e9GewCdHQqq
JhEffeVK2l4LfOYCO7OhuV0=
=95gs
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.922
retrieving revision 1.923
diff -u -r1.922 -r1.923
--- .cvsignore	10 Sep 2008 01:45:26 -0000	1.922
+++ .cvsignore	12 Sep 2008 07:08:08 -0000	1.923
@@ -5,3 +5,4 @@
 kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc6.bz2
+patch-2.6.27-rc6-git1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.946
retrieving revision 1.947
diff -u -r1.946 -r1.947
--- kernel.spec	11 Sep 2008 09:58:23 -0000	1.946
+++ kernel.spec	12 Sep 2008 07:08:08 -0000	1.947
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1755,6 +1755,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Sep 12 2008 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.27-rc6-git1
+
 * Thu Sep 11 2008 Dave Airlie <airlied at redhat.com>
 - drm - fix some minor annoyance with radeon for beta
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.884
retrieving revision 1.885
diff -u -r1.884 -r1.885
--- sources	10 Sep 2008 01:45:27 -0000	1.884
+++ sources	12 Sep 2008 07:08:08 -0000	1.885
@@ -1,2 +1,3 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 d3a173a00e15a6bf3c76068537a5c069  patch-2.6.27-rc6.bz2
+6fb0002c695965e00a8310e3972dbb3d  patch-2.6.27-rc6-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.796
retrieving revision 1.797
diff -u -r1.796 -r1.797
--- upstream	10 Sep 2008 01:45:27 -0000	1.796
+++ upstream	12 Sep 2008 07:08:08 -0000	1.797
@@ -1,2 +1,3 @@
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc6.bz2
+patch-2.6.27-rc6-git1.bz2



From sharkcz at fedoraproject.org  Fri Sep 12 07:10:00 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 12 Sep 2008 07:10:00 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel cyrus-imapd.spec, 1.42,
	1.43 cyrus-imapd-2.2.12-dam_invalid_id-christos.patch, 1.1,
	NONE cyrus-imapd-2.2.12-munge8bit.patch, 1.1,
	NONE cyrus-imapd-2.3.1-backend_sigsegv.patch, 1.1,
	NONE cyrus-imapd-2.3.1-make_md5.patch, 1.1,
	NONE cyrus-imapd-2.3.1-replication_policycheck.patch, 1.1,
	NONE cyrus-imapd-2.3.7-db4.5.patch, 1.1,
	NONE cyrus-imapd-2.3.7-makeinstallfix.patch, 1.1, NONE
Message-ID: <20080912071000.6436D70131@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2463

Modified Files:
	cyrus-imapd.spec 
Removed Files:
	cyrus-imapd-2.2.12-dam_invalid_id-christos.patch 
	cyrus-imapd-2.2.12-munge8bit.patch 
	cyrus-imapd-2.3.1-backend_sigsegv.patch 
	cyrus-imapd-2.3.1-make_md5.patch 
	cyrus-imapd-2.3.1-replication_policycheck.patch 
	cyrus-imapd-2.3.7-db4.5.patch 
	cyrus-imapd-2.3.7-makeinstallfix.patch 
Log Message:
* Fri Sep 14 2008 Dan Hor??k <dan[at]danny.cz - 2.3.12p2-2
- fix linking with db4.7 (Resolves: #461875)
- patch cleanup



Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- cyrus-imapd.spec	1 Sep 2008 11:50:44 -0000	1.42
+++ cyrus-imapd.spec	12 Sep 2008 07:09:30 -0000	1.43
@@ -1,7 +1,7 @@
 %define upstream_ver 2.3.12p2
 Name: cyrus-imapd
 Version: 2.3.12p2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -134,26 +134,18 @@
 Patch2: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.12/cyrus-imapd-2.3.12p2-autosieve-0.6.0.diff
 #Patch3: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.9/cyrus-imapd-2.3.9-rmquota+deletemailbox-0.2-1.diff
 Patch4: http://servercc.oakton.edu/~jwade/cyrus/cyrus-imapd-2.1.3/cyrus-imapd-2.1.3-flock.patch
-Patch5: cyrus-imapd-2.2.12-munge8bit.patch
 Patch6: cyrus-imapd-2.1.16-getrlimit.patch
 Patch7: cyrus-imapd-2.3.7-nobarenewlinescheck.patch
 Patch9: cyrus-imapd-2.3.1-config_defaults.patch
 Patch10: cyrus-imapd-acceptinvalidfrom.patch
-Patch11: cyrus-imapd-2.2.12-dam_invalid_id-christos.patch
 Patch12: cyrus-imapd-2.3.7-notify_sms.patch
-Patch13: allow_auth_plain_proxying.patch
 Patch14: cyrus-imapd-2.3.1-authid_normalize.patch
 Patch15: cyrus-imapd-2.3.1-make_md5_defaults.patch
-Patch16: cyrus-imapd-2.3.7-db4.5.patch
-Patch17: cyrus-imapd-2.3.7-makeinstallfix.patch
 Patch18: cyrus-imapd-2.3.7-krb4.patch
-# Patches >= 100 are / will be fixed in CVS
-Patch100: cyrus-imapd-2.3.1-make_md5.patch
-Patch101: cyrus-imapd-2.3.1-backend_sigsegv.patch
-Patch102: cyrus-imapd-2.3.1-replication_policycheck.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Patch19: cyrus-imapd-2.3.12p2-db4.7.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf >= 2.59
-BuildRequires: cyrus-sasl-devel >= 2.1.15-1, perl, perl-devel, tcp_wrappers
+BuildRequires: cyrus-sasl-devel >= 2.1.15-1, perl-devel, tcp_wrappers
 BuildRequires: %{_dbver}-devel, openssl-devel, pkgconfig
 BuildRequires: flex, bison, groff >= 1.15-8, automake
 BuildRequires: openldap-devel
@@ -239,32 +231,17 @@
 #%patch3 -p1 -b .rmquota
 %endif
 %patch4 -p1 -b .flock
-# superseded by upstream munge8bit support
-#%patch5 -p1 -b .munge8bit
 %patch6 -p1 -b .getrlimit
 %if %{NO_BARE_NL}
 %patch7 -p1 -b .nobarenewlinescheck
 %endif
 #%patch9 -p1 -b .config_defaults
 %patch10 -p1 -b .acceptinvalidfrom
-# fixed upstream already
-#%patch11 -p1 -b .dam_invalid_id
 %patch12 -p1 -b .notify_sms
-#%patch13 -p0 -b .allow_auth_plain
 %patch14 -p1 -b .authid_normalize
 %patch15 -p1 -b .make_md5_defaults
-#%patch16 -p1 -b .db4.5
-#%patch17 -p1 -b .makeinstallfix
 %patch18 -p1 -b .krb4
-# fixed upstream
-#%patch100 -p1 -b .make_md5
-# fixed upstream
-#%patch101 -p1 -b .backend_sigsegv
-# not applicable -- the policy check is not done upstream anymore at all
-# commented out with a comment: XXX is this really necessary since only sync_client talks to us?
-# probably fixes same problem as our patch, but in a different way
-# may be a risk of regressions though
-#%patch102 -p1 -b .replication_policycheck
+%patch19 -p1 -b .db4.7
 
 # only to update config.* files
 automake -a -f -c || :
@@ -807,6 +784,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Sep 14 2008 Dan Hor??k <dan[at]danny.cz - 2.3.12p2-2
+- fix linking with db4.7 (Resolves: #461875)
+- patch cleanup
+
 * Mon Sep  1 2008 Dan Hor??k <dan[at]danny.cz - 2.3.12p2-1
 - update to new upstream version 2.3.12p2
 - update patches


--- cyrus-imapd-2.2.12-dam_invalid_id-christos.patch DELETED ---


--- cyrus-imapd-2.2.12-munge8bit.patch DELETED ---


--- cyrus-imapd-2.3.1-backend_sigsegv.patch DELETED ---


--- cyrus-imapd-2.3.1-make_md5.patch DELETED ---


--- cyrus-imapd-2.3.1-replication_policycheck.patch DELETED ---


--- cyrus-imapd-2.3.7-db4.5.patch DELETED ---


--- cyrus-imapd-2.3.7-makeinstallfix.patch DELETED ---



From sharkcz at fedoraproject.org  Fri Sep 12 07:12:04 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 12 Sep 2008 07:12:04 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel cyrus-imapd-2.3.12p2-db4.7.patch,NONE,1.1
Message-ID: <20080912071204.52B9270131@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3672

Added Files:
	cyrus-imapd-2.3.12p2-db4.7.patch 
Log Message:
- add missing file

cyrus-imapd-2.3.12p2-db4.7.patch:

--- NEW FILE cyrus-imapd-2.3.12p2-db4.7.patch ---
--- cyrus-imapd-2.3.12p2/cmulocal/berkdb.m4.orig	2008-09-12 07:46:46.000000000 +0200
+++ cyrus-imapd-2.3.12p2/cmulocal/berkdb.m4	2008-09-12 07:47:10.000000000 +0200
@@ -213,7 +213,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
 	fi
 
 	saved_LIBS=$LIBS
-        for dbname in ${with_bdb} db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+        for dbname in ${with_bdb} db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
           do
 	    LIBS="$saved_LIBS -l$dbname"
 	    AC_TRY_LINK([#include <stdio.h>



From xulchris at fedoraproject.org  Fri Sep 12 07:12:48 2008
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri, 12 Sep 2008 07:12:48 +0000 (UTC)
Subject: rpms/php-pear-Date-Holidays/EL-5 .cvsignore, 1.5,
	1.6 php-pear-Date-Holidays.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20080912071248.6071D70131@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-serv3807/EL-5

Modified Files:
	.cvsignore php-pear-Date-Holidays.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Feb 2008 22:18:50 -0000	1.5
+++ .cvsignore	12 Sep 2008 07:12:18 -0000	1.6
@@ -1 +1 @@
-Date_Holidays-0.17.4.tgz
+Date_Holidays-0.20.1.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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- php-pear-Date-Holidays.spec	7 Feb 2008 22:18:50 -0000	1.7
+++ php-pear-Date-Holidays.spec	12 Sep 2008 07:12:18 -0000	1.8
@@ -2,12 +2,12 @@
 %define pear_name Date_Holidays
 
 Name:           php-pear-Date-Holidays
-Version:        0.17.4
+Version:        0.20.1
 Release:        1%{?dist}
 Summary:        Driver based class to calculate holidays
 
 Group:          Development/Libraries
-License:        PHP License
+License:        PHP
 URL:            http://pear.php.net/package/Date_Holidays
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source1:        PHP-LICENSE-3.01
@@ -84,6 +84,12 @@
 
 
 %changelog
+* Fri Sep 12 2008 Christopher Stone <chris.stone at gmail.com> 0.20.1-1
+- Upstream sync
+
+* Thu May 22 2008 Christopher Stone <chris.stone at gmail.com> 0.19.1-1
+- Upstream sync
+
 * Thu Feb 07 2008 Christopher Stone <chris.stone at gmail.com> 0.17.4-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Feb 2008 22:18:50 -0000	1.5
+++ sources	12 Sep 2008 07:12:18 -0000	1.6
@@ -1 +1 @@
-25dc30aba33fb49a4e26b9b5a08ca797  Date_Holidays-0.17.4.tgz
+b481badb7dab8706a49576e726a3add5  Date_Holidays-0.20.1.tgz



From xulchris at fedoraproject.org  Fri Sep 12 07:12:48 2008
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri, 12 Sep 2008 07:12:48 +0000 (UTC)
Subject: rpms/php-pear-Date-Holidays/F-8 .cvsignore, 1.6,
	1.7 php-pear-Date-Holidays.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20080912071248.A3E0B70131@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Date-Holidays/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3807/F-8

Modified Files:
	.cvsignore php-pear-Date-Holidays.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/F-8/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 May 2008 02:58:51 -0000	1.6
+++ .cvsignore	12 Sep 2008 07:12:18 -0000	1.7
@@ -1 +1 @@
-Date_Holidays-0.19.1.tgz
+Date_Holidays-0.20.1.tgz


Index: php-pear-Date-Holidays.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/F-8/php-pear-Date-Holidays.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- php-pear-Date-Holidays.spec	23 May 2008 02:58:51 -0000	1.8
+++ php-pear-Date-Holidays.spec	12 Sep 2008 07:12:18 -0000	1.9
@@ -2,7 +2,7 @@
 %define pear_name Date_Holidays
 
 Name:           php-pear-Date-Holidays
-Version:        0.19.1
+Version:        0.20.1
 Release:        1%{?dist}
 Summary:        Driver based class to calculate holidays
 
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Christopher Stone <chris.stone at gmail.com> 0.20.1-1
+- Upstream sync
+
 * Thu May 22 2008 Christopher Stone <chris.stone at gmail.com> 0.19.1-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 May 2008 02:58:51 -0000	1.6
+++ sources	12 Sep 2008 07:12:18 -0000	1.7
@@ -1 +1 @@
-9ffe33dce4a579853f6046c0bed62e6f  Date_Holidays-0.19.1.tgz
+b481badb7dab8706a49576e726a3add5  Date_Holidays-0.20.1.tgz



From xulchris at fedoraproject.org  Fri Sep 12 07:12:49 2008
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri, 12 Sep 2008 07:12:49 +0000 (UTC)
Subject: rpms/php-pear-Date-Holidays/devel .cvsignore, 1.6,
	1.7 php-pear-Date-Holidays.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20080912071249.66B0370131@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-serv3807/devel

Modified Files:
	.cvsignore php-pear-Date-Holidays.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 May 2008 02:59:33 -0000	1.6
+++ .cvsignore	12 Sep 2008 07:12:19 -0000	1.7
@@ -1 +1 @@
-Date_Holidays-0.19.1.tgz
+Date_Holidays-0.20.1.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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- php-pear-Date-Holidays.spec	23 May 2008 02:59:33 -0000	1.8
+++ php-pear-Date-Holidays.spec	12 Sep 2008 07:12:19 -0000	1.9
@@ -2,7 +2,7 @@
 %define pear_name Date_Holidays
 
 Name:           php-pear-Date-Holidays
-Version:        0.19.1
+Version:        0.20.1
 Release:        1%{?dist}
 Summary:        Driver based class to calculate holidays
 
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Christopher Stone <chris.stone at gmail.com> 0.20.1-1
+- Upstream sync
+
 * Thu May 22 2008 Christopher Stone <chris.stone at gmail.com> 0.19.1-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 May 2008 02:59:33 -0000	1.6
+++ sources	12 Sep 2008 07:12:19 -0000	1.7
@@ -1 +1 @@
-9ffe33dce4a579853f6046c0bed62e6f  Date_Holidays-0.19.1.tgz
+b481badb7dab8706a49576e726a3add5  Date_Holidays-0.20.1.tgz



From xulchris at fedoraproject.org  Fri Sep 12 07:12:49 2008
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri, 12 Sep 2008 07:12:49 +0000 (UTC)
Subject: rpms/php-pear-Date-Holidays/F-9 .cvsignore, 1.6,
	1.7 php-pear-Date-Holidays.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20080912071249.0548770131@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Date-Holidays/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3807/F-9

Modified Files:
	.cvsignore php-pear-Date-Holidays.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 May 2008 02:59:07 -0000	1.6
+++ .cvsignore	12 Sep 2008 07:12:18 -0000	1.7
@@ -1 +1 @@
-Date_Holidays-0.19.1.tgz
+Date_Holidays-0.20.1.tgz


Index: php-pear-Date-Holidays.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/F-9/php-pear-Date-Holidays.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- php-pear-Date-Holidays.spec	23 May 2008 02:59:07 -0000	1.8
+++ php-pear-Date-Holidays.spec	12 Sep 2008 07:12:18 -0000	1.9
@@ -2,7 +2,7 @@
 %define pear_name Date_Holidays
 
 Name:           php-pear-Date-Holidays
-Version:        0.19.1
+Version:        0.20.1
 Release:        1%{?dist}
 Summary:        Driver based class to calculate holidays
 
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Christopher Stone <chris.stone at gmail.com> 0.20.1-1
+- Upstream sync
+
 * Thu May 22 2008 Christopher Stone <chris.stone at gmail.com> 0.19.1-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 May 2008 02:59:07 -0000	1.6
+++ sources	12 Sep 2008 07:12:18 -0000	1.7
@@ -1 +1 @@
-9ffe33dce4a579853f6046c0bed62e6f  Date_Holidays-0.19.1.tgz
+b481badb7dab8706a49576e726a3add5  Date_Holidays-0.20.1.tgz



From heffer at fedoraproject.org  Fri Sep 12 07:15:00 2008
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 12 Sep 2008 07:15:00 +0000 (UTC)
Subject: rpms/vdr-streamdev/devel import.log, NONE,
	1.1 vdr-streamdev-client.conf, NONE,
	1.1 vdr-streamdev-server.conf, NONE, 1.1 vdr-streamdev.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080912071500.DBC4D70131@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/vdr-streamdev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4124/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vdr-streamdev-client.conf vdr-streamdev-server.conf 
	vdr-streamdev.spec 
Log Message:
* Fri Sep 12 2008 Felix Kaechele <felix at fetzig dot org> - 0.3.4-2
- initial import



--- NEW FILE import.log ---
vdr-streamdev-0_3_4-2_fc9:HEAD:vdr-streamdev-0.3.4-2.fc9.src.rpm:1221203534


--- NEW FILE vdr-streamdev-client.conf ---
# Configuration snippet for vdr-streamdev-client                         -*- sh -*-
#
# Add command line options to pass to the streamdev-client plugin to PLUGIN_OPTIONS.

PLUGIN_OPTIONS=""


--- NEW FILE vdr-streamdev-server.conf ---
# Configuration snippet for vdr-streamdev-server                          -*- sh -*-
#
# Add command line options to pass to the streamdev-server plugin to PLUGIN_OPTIONS.

PLUGIN_OPTIONS=""


--- NEW FILE vdr-streamdev.spec ---
%define pname     streamdev
%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
%define configdir %(vdr-config --configdir  2>/dev/null || echo ERROR)

Name:           vdr-%{pname}
Version:        0.3.4
Release:        2%{?dist}
Summary:        Streaming plugin for VDR

Group:          Applications/Multimedia
License:        GPL+ and GPLv2+
URL:            http://streamdev.vdr-developer.org
Source0:        http://streamdev.vdr-developer.org/releases/vdr-streamdev-%{version}.tgz
# Configuration files for plugin parameters. These are Fedora specific and not in upstream.
Source1:        %{name}-server.conf
Source2:        %{name}-client.conf
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  vdr-devel >= 1.3.47

%description
The streamdev plugin adds streaming capabilities to your VDR.

%package server
Summary:        Streaming server plugin for VDR
Group:          Applications/Multimedia
Requires:       vdr(abi) = %{apiver}

%description server
Lets your VDR act as a streaming server for other clients.
This will let you watch TV or Recordings across the network.

%package client
Summary:        Streaming client plugin for VDR
Group:          Applications/Multimedia
Requires:       vdr(abi) = %{apiver}

%description client
Lets your VDR in conjunction with a streamdev-server act as a streaming client.
VDR will then be able to work even without a DVB device.

%prep
%setup -q -n %{pname}-%{version}

%build
make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr all

%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{plugindir}
install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins
install -pm 755 libvdr-%{pname}-server.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
install -pm 755 libvdr-%{pname}-client.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
install -Dpm 644 streamdevhosts.conf.example $RPM_BUILD_ROOT%{configdir}/plugins/streamdevhosts.conf
install -Dpm 644 %{SOURCE1} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf
install -Dpm 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf

%clean
rm -rf $RPM_BUILD_ROOT

%files server
%defattr(-,root,root,-)
%{plugindir}/libvdr-%{pname}-server.so.%{apiver}
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf
%config(noreplace) %{configdir}/plugins/streamdevhosts.conf
%doc CONTRIBUTORS COPYING HISTORY PROTOCOL README

%files client
%defattr(-,root,root,-)
%{plugindir}/libvdr-%{pname}-client.so.%{apiver}
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf
%doc CONTRIBUTORS COPYING HISTORY PROTOCOL README

%changelog
* Sat Aug 30 2008 Felix Kaechele <felix at fetzig dot org> - 0.3.4-2
- Incorporated fixes suggested in bug #454120
* Fri Jul  4 2008 Felix Kaechele <felix at fetzig dot org> - 0.3.4-1
- Initial Build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-streamdev/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2008 05:49:33 -0000	1.1
+++ .cvsignore	12 Sep 2008 07:14:30 -0000	1.2
@@ -0,0 +1 @@
+vdr-streamdev-0.3.4.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-streamdev/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 05:49:33 -0000	1.1
+++ sources	12 Sep 2008 07:14:30 -0000	1.2
@@ -0,0 +1 @@
+dcbe6cb0974a5ff43a1b9bb22086ec64  vdr-streamdev-0.3.4.tgz



From airlied at fedoraproject.org  Fri Sep 12 07:24:44 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 12 Sep 2008 07:24:44 +0000 (UTC)
Subject: rpms/mesa/devel intel-revert-vbl.patch, NONE, 1.1 mesa.spec, 1.192, 
	1.193
Message-ID: <20080912072445.04E1D70131@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8594

Modified Files:
	mesa.spec 
Added Files:
	intel-revert-vbl.patch 
Log Message:
* Fri Sep 12 2008 Dave Airlie <airlied at redhat.com> 7.2-0.2
- intel stop vbl default for now


intel-revert-vbl.patch:

--- NEW FILE intel-revert-vbl.patch ---
commit 532d2051245a1d8afe7ca236f1d966d555bb121a
Author: Dave Airlie <airlied at linux.ie>
Date:   Fri Sep 12 17:21:25 2008 +1000

    Revert "intel: sync to vblank by default"
    
    This reverts commit e9bf3e4cc9a7e4bcd4c45bd707541d26ecdf0409.

diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index c193830..f02192d 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -55,7 +55,7 @@ PUBLIC const char __driConfigOptions[] =
    DRI_CONF_BEGIN
    DRI_CONF_SECTION_PERFORMANCE
       DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS)
-      DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_ALWAYS_SYNC)
+      DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0)
       /* Options correspond to DRI_CONF_BO_REUSE_DISABLED,
        * DRI_CONF_BO_REUSE_ALL
        */


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- mesa.spec	5 Sep 2008 05:49:33 -0000	1.192
+++ mesa.spec	12 Sep 2008 07:24:14 -0000	1.193
@@ -17,7 +17,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.2
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -37,6 +37,7 @@
 
 Patch7: mesa-7.1-link-shared.patch
 Patch8: intel-mmio-fix.patch
+Patch9: intel-revert-vbl.patch
 
 Patch12: mesa-7.1-disable-intel-classic-warn.patch
 
@@ -171,6 +172,7 @@
 %patch5 -p1 -b .r300-bufmgr
 %patch7 -p1 -b .dricore
 %patch8 -p1 -b .intel-mmio
+%patch9 -p1 -b .intel-vbl
 %patch12 -p1 -b .intel-nowarn
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
@@ -406,6 +408,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Fri Sep 12 2008 Dave Airlie <airlied at redhat.com> 7.2-0.2
+- intel stop vbl default for now
+
 * Fri Sep 05 2008 Dave Airlie <airlied at redhat.com> 7.2-0.1
 - latest snapshot - r300 bufmgr code
 - stop building mach64, patch around some intel issues



From heffer at fedoraproject.org  Fri Sep 12 07:26:48 2008
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 12 Sep 2008 07:26:48 +0000 (UTC)
Subject: rpms/vdr-streamdev/F-9 import.log, NONE,
	1.1 vdr-streamdev-client.conf, 
	NONE, 1.1 vdr-streamdev-server.conf, NONE,
	1.1 vdr-streamdev.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20080912072648.A86FC70131@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/vdr-streamdev/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9187/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vdr-streamdev-client.conf vdr-streamdev-server.conf 
	vdr-streamdev.spec 
Log Message:
* Fri Sep 12 2008 Felix Kaechele <felix at fetzig dot org> - 0.3.4-2
- initial import



--- NEW FILE import.log ---
vdr-streamdev-0_3_4-2_fc9:F-9:vdr-streamdev-0.3.4-2.fc9.src.rpm:1221204273


--- NEW FILE vdr-streamdev-client.conf ---
# Configuration snippet for vdr-streamdev-client                         -*- sh -*-
#
# Add command line options to pass to the streamdev-client plugin to PLUGIN_OPTIONS.

PLUGIN_OPTIONS=""


--- NEW FILE vdr-streamdev-server.conf ---
# Configuration snippet for vdr-streamdev-server                          -*- sh -*-
#
# Add command line options to pass to the streamdev-server plugin to PLUGIN_OPTIONS.

PLUGIN_OPTIONS=""


--- NEW FILE vdr-streamdev.spec ---
%define pname     streamdev
%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
%define configdir %(vdr-config --configdir  2>/dev/null || echo ERROR)

Name:           vdr-%{pname}
Version:        0.3.4
Release:        2%{?dist}
Summary:        Streaming plugin for VDR

Group:          Applications/Multimedia
License:        GPL+ and GPLv2+
URL:            http://streamdev.vdr-developer.org
Source0:        http://streamdev.vdr-developer.org/releases/vdr-streamdev-%{version}.tgz
# Configuration files for plugin parameters. These are Fedora specific and not in upstream.
Source1:        %{name}-server.conf
Source2:        %{name}-client.conf
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  vdr-devel >= 1.3.47

%description
The streamdev plugin adds streaming capabilities to your VDR.

%package server
Summary:        Streaming server plugin for VDR
Group:          Applications/Multimedia
Requires:       vdr(abi) = %{apiver}

%description server
Lets your VDR act as a streaming server for other clients.
This will let you watch TV or Recordings across the network.

%package client
Summary:        Streaming client plugin for VDR
Group:          Applications/Multimedia
Requires:       vdr(abi) = %{apiver}

%description client
Lets your VDR in conjunction with a streamdev-server act as a streaming client.
VDR will then be able to work even without a DVB device.

%prep
%setup -q -n %{pname}-%{version}

%build
make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr all

%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{plugindir}
install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins
install -pm 755 libvdr-%{pname}-server.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
install -pm 755 libvdr-%{pname}-client.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
install -Dpm 644 streamdevhosts.conf.example $RPM_BUILD_ROOT%{configdir}/plugins/streamdevhosts.conf
install -Dpm 644 %{SOURCE1} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf
install -Dpm 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf

%clean
rm -rf $RPM_BUILD_ROOT

%files server
%defattr(-,root,root,-)
%{plugindir}/libvdr-%{pname}-server.so.%{apiver}
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf
%config(noreplace) %{configdir}/plugins/streamdevhosts.conf
%doc CONTRIBUTORS COPYING HISTORY PROTOCOL README

%files client
%defattr(-,root,root,-)
%{plugindir}/libvdr-%{pname}-client.so.%{apiver}
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf
%doc CONTRIBUTORS COPYING HISTORY PROTOCOL README

%changelog
* Sat Aug 30 2008 Felix Kaechele <felix at fetzig dot org> - 0.3.4-2
- Incorporated fixes suggested in bug #454120
* Fri Jul  4 2008 Felix Kaechele <felix at fetzig dot org> - 0.3.4-1
- Initial Build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-streamdev/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2008 05:49:33 -0000	1.1
+++ .cvsignore	12 Sep 2008 07:26:18 -0000	1.2
@@ -0,0 +1 @@
+vdr-streamdev-0.3.4.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-streamdev/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 05:49:33 -0000	1.1
+++ sources	12 Sep 2008 07:26:18 -0000	1.2
@@ -0,0 +1 @@
+dcbe6cb0974a5ff43a1b9bb22086ec64  vdr-streamdev-0.3.4.tgz



From rezso at fedoraproject.org  Fri Sep 12 07:29:58 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Fri, 12 Sep 2008 07:29:58 +0000 (UTC)
Subject: rpms/mapnik/devel import.log,1.2,1.3 mapnik.spec,1.2,1.3
Message-ID: <20080912072958.4A9BC70131@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/mapnik/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11082/devel

Modified Files:
	import.log mapnik.spec 
Log Message:
- fix koji build
- disable smp build with upstream scons

 ----------------------------------------------------------------------
 Modified Files:
 	devel/import.log devel/mapnik.spec 
 ----------------------------------------------------------------------



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	12 Sep 2008 06:45:11 -0000	1.2
+++ import.log	12 Sep 2008 07:29:27 -0000	1.3
@@ -1,2 +1,3 @@
 mapnik-0_5_1-4_fc9:HEAD:mapnik-0.5.1-4.fc9.src.rpm:1219679501
 mapnik-0_5_2-0_1_svn738_fc10:HEAD:mapnik-0.5.2-0.1.svn738.fc10.src.rpm:1221201860
+mapnik-0_5_2-0_2_svn738_fc10:HEAD:mapnik-0.5.2-0.2.svn738.fc10.src.rpm:1221204521


Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/mapnik.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mapnik.spec	12 Sep 2008 06:45:11 -0000	1.2
+++ mapnik.spec	12 Sep 2008 07:29:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name:      mapnik
 Version:   0.5.2
-Release:   0.1.svn738%{?dist}
+Release:   0.2.svn738%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
@@ -124,11 +124,6 @@
 
 %build
 
-# do not use internal agg and tinyxml
-sed -i -e "s|.\#tinyxml..||g" SConstruct
-sed -i -e "s|\#agg\/include|\/usr\/include\/agg2\/|g" SConstruct
-sed -i -e "s|SConscript(.agg|\#SConscript(.agg|g" SConstruct
-
 # linkage errors
 sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\',|g" plugins/input/gdal/SConscript
 sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\',|g" plugins/input/postgis/SConscript
@@ -138,9 +133,9 @@
 # fix build flags
 sed -i -e "s|common_cxx_flags = .-D\%s|common_cxx_flags = \'-D\%s $RPM_OPT_FLAGS |g" SConstruct
 
-
-scons %{?_smp_mflags} \
-              PREFIX=%{_prefix} \
+# WARNING smp may brak build
+# %{?_smp_mflags}
+scons         PREFIX=%{_prefix} \
               THREADING=multi \
               XMLPARSER=libxml2 \
               GDAL_INCLUDES=%{_includedir}/gdal \
@@ -224,6 +219,10 @@
 %doc demo/python demo/test
 
 %changelog
+* Fri Sep 12 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.2.svn738
+- fix koji build
+- disable smp build with upstream scons
+
 * Thu Sep 11 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.1.svn738
 - new cvs snapshot, x86_64 should work for now
 - new cairo dep added



From pkgdb at fedoraproject.org  Fri Sep 12 07:33:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 07:33:24 +0000
Subject: [pkgdb] gputils ownership updated
Message-ID: <20080912073324.7A83B208D29@bastion.fedora.phx.redhat.com>

Package gputils in Fedora devel was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Fri Sep 12 07:33:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 07:33:30 +0000
Subject: [pkgdb] gputils ownership updated
Message-ID: <20080912073330.D7536208D9A@bastion.fedora.phx.redhat.com>

Package gputils in Fedora 7 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Fri Sep 12 07:33:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 07:33:31 +0000
Subject: [pkgdb] gputils ownership updated
Message-ID: <20080912073331.1980B208D9C@bastion.fedora.phx.redhat.com>

Package gputils in Fedora 1 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Fri Sep 12 07:33:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 07:33:40 +0000
Subject: [pkgdb] gputils ownership updated
Message-ID: <20080912073340.34D3E208D29@bastion.fedora.phx.redhat.com>

Package gputils in Fedora 3 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Fri Sep 12 07:33:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 07:33:48 +0000
Subject: [pkgdb] gputils ownership updated
Message-ID: <20080912073348.F3053208D9A@bastion.fedora.phx.redhat.com>

Package gputils in Fedora 4 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Fri Sep 12 07:33:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 07:33:52 +0000
Subject: [pkgdb] gputils ownership updated
Message-ID: <20080912073352.71B96208D9B@bastion.fedora.phx.redhat.com>

Package gputils in Fedora 5 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Fri Sep 12 07:33:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 07:33:55 +0000
Subject: [pkgdb] gputils ownership updated
Message-ID: <20080912073355.C340F208D9E@bastion.fedora.phx.redhat.com>

Package gputils in Fedora 6 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Fri Sep 12 07:34:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 07:34:06 +0000
Subject: [pkgdb] gputils ownership updated
Message-ID: <20080912073406.EEC50208D29@bastion.fedora.phx.redhat.com>

Package gputils in Fedora 8 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Fri Sep 12 07:34:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 07:34:10 +0000
Subject: [pkgdb] gputils ownership updated
Message-ID: <20080912073410.50A5A208D9A@bastion.fedora.phx.redhat.com>

Package gputils in Fedora 9 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Fri Sep 12 07:34:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 07:34:39 +0000
Subject: [pkgdb] gputils ownership updated
Message-ID: <20080912073439.0CB63208DA0@bastion.fedora.phx.redhat.com>

Package gputils in Fedora 2 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From heffer at fedoraproject.org  Fri Sep 12 07:35:50 2008
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 12 Sep 2008 07:35:50 +0000 (UTC)
Subject: rpms/vdr-streamdev/F-8 import.log, NONE,
	1.1 vdr-streamdev-client.conf, 
	NONE, 1.1 vdr-streamdev-server.conf, NONE,
	1.1 vdr-streamdev.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20080912073550.C637270131@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/vdr-streamdev/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13576/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vdr-streamdev-client.conf vdr-streamdev-server.conf 
	vdr-streamdev.spec 
Log Message:
* Fri Sep 12 2008 Felix Kaechele <felix at fetzig dot org> - 0.3.4-2
- initial import



--- NEW FILE import.log ---
vdr-streamdev-0_3_4-2_fc9:F-8:vdr-streamdev-0.3.4-2.fc9.src.rpm:1221204898


--- NEW FILE vdr-streamdev-client.conf ---
# Configuration snippet for vdr-streamdev-client                         -*- sh -*-
#
# Add command line options to pass to the streamdev-client plugin to PLUGIN_OPTIONS.

PLUGIN_OPTIONS=""


--- NEW FILE vdr-streamdev-server.conf ---
# Configuration snippet for vdr-streamdev-server                          -*- sh -*-
#
# Add command line options to pass to the streamdev-server plugin to PLUGIN_OPTIONS.

PLUGIN_OPTIONS=""


--- NEW FILE vdr-streamdev.spec ---
%define pname     streamdev
%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
%define configdir %(vdr-config --configdir  2>/dev/null || echo ERROR)

Name:           vdr-%{pname}
Version:        0.3.4
Release:        2%{?dist}
Summary:        Streaming plugin for VDR

Group:          Applications/Multimedia
License:        GPL+ and GPLv2+
URL:            http://streamdev.vdr-developer.org
Source0:        http://streamdev.vdr-developer.org/releases/vdr-streamdev-%{version}.tgz
# Configuration files for plugin parameters. These are Fedora specific and not in upstream.
Source1:        %{name}-server.conf
Source2:        %{name}-client.conf
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  vdr-devel >= 1.3.47

%description
The streamdev plugin adds streaming capabilities to your VDR.

%package server
Summary:        Streaming server plugin for VDR
Group:          Applications/Multimedia
Requires:       vdr(abi) = %{apiver}

%description server
Lets your VDR act as a streaming server for other clients.
This will let you watch TV or Recordings across the network.

%package client
Summary:        Streaming client plugin for VDR
Group:          Applications/Multimedia
Requires:       vdr(abi) = %{apiver}

%description client
Lets your VDR in conjunction with a streamdev-server act as a streaming client.
VDR will then be able to work even without a DVB device.

%prep
%setup -q -n %{pname}-%{version}

%build
make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr all

%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{plugindir}
install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins
install -pm 755 libvdr-%{pname}-server.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
install -pm 755 libvdr-%{pname}-client.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
install -Dpm 644 streamdevhosts.conf.example $RPM_BUILD_ROOT%{configdir}/plugins/streamdevhosts.conf
install -Dpm 644 %{SOURCE1} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf
install -Dpm 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf

%clean
rm -rf $RPM_BUILD_ROOT

%files server
%defattr(-,root,root,-)
%{plugindir}/libvdr-%{pname}-server.so.%{apiver}
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf
%config(noreplace) %{configdir}/plugins/streamdevhosts.conf
%doc CONTRIBUTORS COPYING HISTORY PROTOCOL README

%files client
%defattr(-,root,root,-)
%{plugindir}/libvdr-%{pname}-client.so.%{apiver}
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf
%doc CONTRIBUTORS COPYING HISTORY PROTOCOL README

%changelog
* Sat Aug 30 2008 Felix Kaechele <felix at fetzig dot org> - 0.3.4-2
- Incorporated fixes suggested in bug #454120
* Fri Jul  4 2008 Felix Kaechele <felix at fetzig dot org> - 0.3.4-1
- Initial Build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-streamdev/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2008 05:49:33 -0000	1.1
+++ .cvsignore	12 Sep 2008 07:35:20 -0000	1.2
@@ -0,0 +1 @@
+vdr-streamdev-0.3.4.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-streamdev/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 05:49:33 -0000	1.1
+++ sources	12 Sep 2008 07:35:20 -0000	1.2
@@ -0,0 +1 @@
+dcbe6cb0974a5ff43a1b9bb22086ec64  vdr-streamdev-0.3.4.tgz



From xulchris at fedoraproject.org  Fri Sep 12 07:42:06 2008
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri, 12 Sep 2008 07:42:06 +0000 (UTC)
Subject: rpms/php-pear-HTTP-Request/EL-5 .cvsignore, 1.4,
	1.5 php-pear-HTTP-Request.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20080912074206.C64D270131@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-HTTP-Request/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16038/EL-5

Modified Files:
	.cvsignore php-pear-HTTP-Request.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Nov 2007 22:07:50 -0000	1.4
+++ .cvsignore	12 Sep 2008 07:41:36 -0000	1.5
@@ -1 +1 @@
-HTTP_Request-1.4.2.tgz
+HTTP_Request-1.4.3.tgz


Index: php-pear-HTTP-Request.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/EL-5/php-pear-HTTP-Request.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-pear-HTTP-Request.spec	22 Nov 2007 22:07:50 -0000	1.4
+++ php-pear-HTTP-Request.spec	12 Sep 2008 07:41:36 -0000	1.5
@@ -2,7 +2,7 @@
 %define pear_name HTTP_Request
 
 Name:           php-pear-HTTP-Request
-Version:        1.4.2
+Version:        1.4.3
 Release:        1%{?dist}
 Summary:        Provides an easy way to perform HTTP requests
 
@@ -14,9 +14,9 @@
 
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
-Requires:       php-pear(PEAR) >= 1.4.0b1
+Requires:       php-pear(PEAR) >= 1.4.3
 Requires:       php-pear(Net_URL) >= 1.0.12
-Requires:       php-pear(Net_Socket) >= 1.0.2
+Requires:       php-pear(Net_Socket) >= 1.0.7
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -82,6 +82,10 @@
 
 
 %changelog
+* Fri Sep 12 2008 Christopher Stone <chris.stone at gmail.com> 1.4.3-1
+- Upstream sync
+- Update Requires
+
 * Thu Nov 22 2007 Christopher Stone <chris.stone at gmail.com> 1.4.2-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Nov 2007 22:07:50 -0000	1.4
+++ sources	12 Sep 2008 07:41:36 -0000	1.5
@@ -1 +1 @@
-e5963ed69fb67fa9d2afdf74261a25f5  HTTP_Request-1.4.2.tgz
+0d46e5e6feb54022c9f7eefdada0e6b5  HTTP_Request-1.4.3.tgz



From xulchris at fedoraproject.org  Fri Sep 12 07:42:07 2008
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri, 12 Sep 2008 07:42:07 +0000 (UTC)
Subject: rpms/php-pear-HTTP-Request/F-8 .cvsignore, 1.4,
	1.5 php-pear-HTTP-Request.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20080912074207.146F570131@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-HTTP-Request/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16038/F-8

Modified Files:
	.cvsignore php-pear-HTTP-Request.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Nov 2007 22:07:57 -0000	1.4
+++ .cvsignore	12 Sep 2008 07:41:36 -0000	1.5
@@ -1 +1 @@
-HTTP_Request-1.4.2.tgz
+HTTP_Request-1.4.3.tgz


Index: php-pear-HTTP-Request.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/F-8/php-pear-HTTP-Request.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-pear-HTTP-Request.spec	22 Nov 2007 22:07:57 -0000	1.4
+++ php-pear-HTTP-Request.spec	12 Sep 2008 07:41:36 -0000	1.5
@@ -2,7 +2,7 @@
 %define pear_name HTTP_Request
 
 Name:           php-pear-HTTP-Request
-Version:        1.4.2
+Version:        1.4.3
 Release:        1%{?dist}
 Summary:        Provides an easy way to perform HTTP requests
 
@@ -14,9 +14,9 @@
 
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
-Requires:       php-pear(PEAR) >= 1.4.0b1
+Requires:       php-pear(PEAR) >= 1.4.3
 Requires:       php-pear(Net_URL) >= 1.0.12
-Requires:       php-pear(Net_Socket) >= 1.0.2
+Requires:       php-pear(Net_Socket) >= 1.0.7
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -82,6 +82,10 @@
 
 
 %changelog
+* Fri Sep 12 2008 Christopher Stone <chris.stone at gmail.com> 1.4.3-1
+- Upstream sync
+- Update Requires
+
 * Thu Nov 22 2007 Christopher Stone <chris.stone at gmail.com> 1.4.2-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Nov 2007 22:07:57 -0000	1.4
+++ sources	12 Sep 2008 07:41:36 -0000	1.5
@@ -1 +1 @@
-e5963ed69fb67fa9d2afdf74261a25f5  HTTP_Request-1.4.2.tgz
+0d46e5e6feb54022c9f7eefdada0e6b5  HTTP_Request-1.4.3.tgz



From xulchris at fedoraproject.org  Fri Sep 12 07:42:07 2008
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri, 12 Sep 2008 07:42:07 +0000 (UTC)
Subject: rpms/php-pear-HTTP-Request/F-9 .cvsignore, 1.4,
	1.5 php-pear-HTTP-Request.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20080912074207.6BB6970131@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-HTTP-Request/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16038/F-9

Modified Files:
	.cvsignore php-pear-HTTP-Request.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Nov 2007 22:08:04 -0000	1.4
+++ .cvsignore	12 Sep 2008 07:41:37 -0000	1.5
@@ -1 +1 @@
-HTTP_Request-1.4.2.tgz
+HTTP_Request-1.4.3.tgz


Index: php-pear-HTTP-Request.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/F-9/php-pear-HTTP-Request.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-pear-HTTP-Request.spec	22 Nov 2007 22:08:04 -0000	1.4
+++ php-pear-HTTP-Request.spec	12 Sep 2008 07:41:37 -0000	1.5
@@ -2,7 +2,7 @@
 %define pear_name HTTP_Request
 
 Name:           php-pear-HTTP-Request
-Version:        1.4.2
+Version:        1.4.3
 Release:        1%{?dist}
 Summary:        Provides an easy way to perform HTTP requests
 
@@ -14,9 +14,9 @@
 
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
-Requires:       php-pear(PEAR) >= 1.4.0b1
+Requires:       php-pear(PEAR) >= 1.4.3
 Requires:       php-pear(Net_URL) >= 1.0.12
-Requires:       php-pear(Net_Socket) >= 1.0.2
+Requires:       php-pear(Net_Socket) >= 1.0.7
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -82,6 +82,10 @@
 
 
 %changelog
+* Fri Sep 12 2008 Christopher Stone <chris.stone at gmail.com> 1.4.3-1
+- Upstream sync
+- Update Requires
+
 * Thu Nov 22 2007 Christopher Stone <chris.stone at gmail.com> 1.4.2-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Nov 2007 22:08:04 -0000	1.4
+++ sources	12 Sep 2008 07:41:37 -0000	1.5
@@ -1 +1 @@
-e5963ed69fb67fa9d2afdf74261a25f5  HTTP_Request-1.4.2.tgz
+0d46e5e6feb54022c9f7eefdada0e6b5  HTTP_Request-1.4.3.tgz



From xulchris at fedoraproject.org  Fri Sep 12 07:42:07 2008
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri, 12 Sep 2008 07:42:07 +0000 (UTC)
Subject: rpms/php-pear-HTTP-Request/devel .cvsignore, 1.4,
	1.5 php-pear-HTTP-Request.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20080912074207.BC44E70131@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-HTTP-Request/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16038/devel

Modified Files:
	.cvsignore php-pear-HTTP-Request.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Nov 2007 22:08:04 -0000	1.4
+++ .cvsignore	12 Sep 2008 07:41:37 -0000	1.5
@@ -1 +1 @@
-HTTP_Request-1.4.2.tgz
+HTTP_Request-1.4.3.tgz


Index: php-pear-HTTP-Request.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/devel/php-pear-HTTP-Request.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-pear-HTTP-Request.spec	22 Nov 2007 22:08:04 -0000	1.4
+++ php-pear-HTTP-Request.spec	12 Sep 2008 07:41:37 -0000	1.5
@@ -2,7 +2,7 @@
 %define pear_name HTTP_Request
 
 Name:           php-pear-HTTP-Request
-Version:        1.4.2
+Version:        1.4.3
 Release:        1%{?dist}
 Summary:        Provides an easy way to perform HTTP requests
 
@@ -14,9 +14,9 @@
 
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
-Requires:       php-pear(PEAR) >= 1.4.0b1
+Requires:       php-pear(PEAR) >= 1.4.3
 Requires:       php-pear(Net_URL) >= 1.0.12
-Requires:       php-pear(Net_Socket) >= 1.0.2
+Requires:       php-pear(Net_Socket) >= 1.0.7
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -82,6 +82,10 @@
 
 
 %changelog
+* Fri Sep 12 2008 Christopher Stone <chris.stone at gmail.com> 1.4.3-1
+- Upstream sync
+- Update Requires
+
 * Thu Nov 22 2007 Christopher Stone <chris.stone at gmail.com> 1.4.2-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTTP-Request/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Nov 2007 22:08:04 -0000	1.4
+++ sources	12 Sep 2008 07:41:37 -0000	1.5
@@ -1 +1 @@
-e5963ed69fb67fa9d2afdf74261a25f5  HTTP_Request-1.4.2.tgz
+0d46e5e6feb54022c9f7eefdada0e6b5  HTTP_Request-1.4.3.tgz



From rezso at fedoraproject.org  Fri Sep 12 07:42:28 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Fri, 12 Sep 2008 07:42:28 +0000 (UTC)
Subject: rpms/mapnik/devel import.log,1.3,1.4 mapnik.spec,1.3,1.4
Message-ID: <20080912074228.ACB2E70131@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/mapnik/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16087/devel

Modified Files:
	import.log mapnik.spec 
Log Message:
- enable libicu wrap
 ----------------------------------------------------------------------
 Modified Files:
 	devel/import.log devel/mapnik.spec 
 ----------------------------------------------------------------------



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	12 Sep 2008 07:29:27 -0000	1.3
+++ import.log	12 Sep 2008 07:41:58 -0000	1.4
@@ -1,3 +1,4 @@
 mapnik-0_5_1-4_fc9:HEAD:mapnik-0.5.1-4.fc9.src.rpm:1219679501
 mapnik-0_5_2-0_1_svn738_fc10:HEAD:mapnik-0.5.2-0.1.svn738.fc10.src.rpm:1221201860
 mapnik-0_5_2-0_2_svn738_fc10:HEAD:mapnik-0.5.2-0.2.svn738.fc10.src.rpm:1221204521
+mapnik-0_5_2-0_3_svn738_fc10:HEAD:mapnik-0.5.2-0.3.svn738.fc10.src.rpm:1221205271


Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/mapnik.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mapnik.spec	12 Sep 2008 07:29:27 -0000	1.3
+++ mapnik.spec	12 Sep 2008 07:41:58 -0000	1.4
@@ -1,6 +1,6 @@
 Name:      mapnik
 Version:   0.5.2
-Release:   0.2.svn738%{?dist}
+Release:   0.3.svn738%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
@@ -14,9 +14,9 @@
 
 BuildRequires: scons doxygen
 BuildRequires: libtool-ltdl-devel
-BuildRequires: libxml2-devel boost-devel
 BuildRequires: postgresql-devel pkgconfig
 BuildRequires: gdal-devel proj-devel agg-devel
+BuildRequires: libxml2-devel boost-devel libicu-devel
 BuildRequires: libtiff-devel libjpeg-devel libpng-devel
 BuildRequires: cairomm-devel pycairo-devel freetype-devel
 
@@ -219,6 +219,9 @@
 %doc demo/python demo/test
 
 %changelog
+* Fri Sep 12 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.3.svn738
+- enable libicu wrap
+
 * Fri Sep 12 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.2.svn738
 - fix koji build
 - disable smp build with upstream scons



From varekova at fedoraproject.org  Fri Sep 12 07:42:43 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Fri, 12 Sep 2008 07:42:43 +0000 (UTC)
Subject: rpms/man-pages/devel .cvsignore, 1.53, 1.54 man-pages.spec, 1.103, 
	1.104 sources, 1.52, 1.53
Message-ID: <20080912074243.B7BC770131@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16297

Modified Files:
	.cvsignore man-pages.spec sources 
Log Message:
update to 3.09



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	14 Aug 2008 10:48:01 -0000	1.53
+++ .cvsignore	12 Sep 2008 07:42:13 -0000	1.54
@@ -3,4 +3,4 @@
 man-pages-posix-2003-a.tar.bz2
 man-pages_syscalls.tar.bz2
 man-pages_add-01.tar.bz2
-man-pages-3.07.tar.bz2
+man-pages-3.09.tar.bz2


Index: man-pages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- man-pages.spec	14 Aug 2008 10:48:01 -0000	1.103
+++ man-pages.spec	12 Sep 2008 07:42:13 -0000	1.104
@@ -3,7 +3,7 @@
 
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
-Version: 3.07
+Version: 3.09
 Release: 1%{?dist}
 License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
@@ -117,6 +117,9 @@
 %lang(en) %{_mandir}/en/man*
 
 %changelog
+* Fri Sep 12 2008 Ivana Varekova <varekova at redhat.com> - 3.09-1
+- update to 3.09
+
 * Thu Aug 14 2008 Ivana Varekova <varekova at redhat.com> - 3.07-1
 - update to 3.07
 - remove ncsa_auth.8 (#458498)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	14 Aug 2008 10:48:01 -0000	1.52
+++ sources	12 Sep 2008 07:42:13 -0000	1.53
@@ -3,4 +3,4 @@
 7c78aff03c0a6767ba483d34f19e4b09  man-pages-posix-2003-a.tar.bz2
 bf0d94a7faf6dc0db31325dbf576fd84  man-pages_syscalls.tar.bz2
 4ae755c6caaa035cb7737bf4a3ec7927  man-pages_add-01.tar.bz2
-56a36e2b19b76488e03b2557bb45efce  man-pages-3.07.tar.bz2
+a04a1676e2c0676f047a525184e3320b  man-pages-3.09.tar.bz2



From mnagy at fedoraproject.org  Fri Sep 12 07:52:02 2008
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Fri, 12 Sep 2008 07:52:02 +0000 (UTC)
Subject: rpms/itzam-core/devel itzam-core-2.1.1-itzam32.patch, NONE,
	1.1 itzam-core.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080912075202.2834F70131@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/itzam-core/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20200

Modified Files:
	.cvsignore sources 
Added Files:
	itzam-core-2.1.1-itzam32.patch itzam-core.spec 
Log Message:
* Sat Sep 06 2008 Martin Nagy <mnagy at redhat.com> 2.1.1-1
- initial packaging


itzam-core-2.1.1-itzam32.patch:

--- NEW FILE itzam-core-2.1.1-itzam32.patch ---
diff -up itzam-core-2.1.1/libitzam/itzam.h.itzam32 itzam-core-2.1.1/libitzam/itzam.h
--- itzam-core-2.1.1/libitzam/itzam.h.itzam32	2008-09-06 22:23:02.000000000 +0200
+++ itzam-core-2.1.1/libitzam/itzam.h	2008-09-06 22:24:58.000000000 +0200
@@ -67,6 +67,10 @@ typedef signed char      int8_t;
 #include <stdint.h>
 #endif
 
+#if __WORDSIZE == 32
+#define ITZAM32
+#endif
+
 //------------------------------------------------------------
 // enumerated types
 typedef enum
diff -up itzam-core-2.1.1/libitzam/itzam_btree.c.patch itzam-core-2.1.1/libitzam/itzam_btree.c
--- itzam-core-2.1.1/libitzam/itzam_btree.c.patch	2008-09-06 03:20:32.000000000 +0200
+++ itzam-core-2.1.1/libitzam/itzam_btree.c	2008-09-06 03:21:06.000000000 +0200
@@ -285,11 +285,7 @@ static itzam_btree_page * read_page_dire
 }
 
 // cen't be static because it's used by debug routines
-#if defined(_MSC_VER)
 itzam_btree_page * read_page(itzam_btree * btree, itzam_ref where)
-#else
-inline itzam_btree_page * read_page(itzam_btree * btree, itzam_ref where)
-#endif
 {
     // what we return
     itzam_btree_page * page = NULL;


--- NEW FILE itzam-core.spec ---
Name:		itzam-core
Version:	2.1.1
Release:	1%{?dist}
Summary:	Library for creating and manipulating keyed-access database files

Group:		System Environment/Libraries
License:	GPLv3+
URL:		http://www.coyotegulch.com/products/itzam/index.html
Source0:	http://www.coyotegulch.com/distfiles/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:		itzam-core-2.1.1-itzam32.patch

%description
Itzam/Core is a deliberately portable and concise C library for creating and
manipulating keyed-access database files containing variable-length, random
access records. Information is referenced by a user-defined key value;
indexes may be combined with or remain separate from data. 

%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 .itzam32


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

cat LICENSE.NON-FREE | tr -d '\r' > LICENSE.NON-FREE.tmp
touch -r LICENSE.NON-FREE LICENSE.NON-FREE.tmp
mv LICENSE.NON-FREE.tmp LICENSE.NON-FREE


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING LICENSE.GPL LICENSE.NON-FREE LICENSE.POLICY NEWS README
%{_libdir}/*.so.*
%{_bindir}/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so


%changelog
* Sat Sep 06 2008 Martin Nagy <mnagy at redhat.com> 2.1.1-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/itzam-core/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 04:15:44 -0000	1.1
+++ .cvsignore	12 Sep 2008 07:51:31 -0000	1.2
@@ -0,0 +1 @@
+itzam-core-2.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/itzam-core/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 04:15:44 -0000	1.1
+++ sources	12 Sep 2008 07:51:31 -0000	1.2
@@ -0,0 +1 @@
+5477e3b3f10cc73b84870e5c5750baa1  itzam-core-2.1.1.tar.gz



From mnagy at fedoraproject.org  Fri Sep 12 07:55:39 2008
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Fri, 12 Sep 2008 07:55:39 +0000 (UTC)
Subject: rpms/itzam-core/EL-5 itzam-core-2.1.1-itzam32.patch, NONE,
	1.1 itzam-core.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080912075539.3869770131@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/itzam-core/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21447

Modified Files:
	sources 
Added Files:
	itzam-core-2.1.1-itzam32.patch itzam-core.spec 
Log Message:
* Sat Sep 06 2008 Martin Nagy <mnagy at redhat.com> 2.1.1-1
- initial packaging


itzam-core-2.1.1-itzam32.patch:

--- NEW FILE itzam-core-2.1.1-itzam32.patch ---
diff -up itzam-core-2.1.1/libitzam/itzam.h.itzam32 itzam-core-2.1.1/libitzam/itzam.h
--- itzam-core-2.1.1/libitzam/itzam.h.itzam32	2008-09-06 22:23:02.000000000 +0200
+++ itzam-core-2.1.1/libitzam/itzam.h	2008-09-06 22:24:58.000000000 +0200
@@ -67,6 +67,10 @@ typedef signed char      int8_t;
 #include <stdint.h>
 #endif
 
+#if __WORDSIZE == 32
+#define ITZAM32
+#endif
+
 //------------------------------------------------------------
 // enumerated types
 typedef enum
diff -up itzam-core-2.1.1/libitzam/itzam_btree.c.patch itzam-core-2.1.1/libitzam/itzam_btree.c
--- itzam-core-2.1.1/libitzam/itzam_btree.c.patch	2008-09-06 03:20:32.000000000 +0200
+++ itzam-core-2.1.1/libitzam/itzam_btree.c	2008-09-06 03:21:06.000000000 +0200
@@ -285,11 +285,7 @@ static itzam_btree_page * read_page_dire
 }
 
 // cen't be static because it's used by debug routines
-#if defined(_MSC_VER)
 itzam_btree_page * read_page(itzam_btree * btree, itzam_ref where)
-#else
-inline itzam_btree_page * read_page(itzam_btree * btree, itzam_ref where)
-#endif
 {
     // what we return
     itzam_btree_page * page = NULL;


--- NEW FILE itzam-core.spec ---
Name:		itzam-core
Version:	2.1.1
Release:	1%{?dist}
Summary:	Library for creating and manipulating keyed-access database files

Group:		System Environment/Libraries
License:	GPLv3+
URL:		http://www.coyotegulch.com/products/itzam/index.html
Source0:	http://www.coyotegulch.com/distfiles/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:		itzam-core-2.1.1-itzam32.patch

%description
Itzam/Core is a deliberately portable and concise C library for creating and
manipulating keyed-access database files containing variable-length, random
access records. Information is referenced by a user-defined key value;
indexes may be combined with or remain separate from data. 

%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 .itzam32


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

cat LICENSE.NON-FREE | tr -d '\r' > LICENSE.NON-FREE.tmp
touch -r LICENSE.NON-FREE LICENSE.NON-FREE.tmp
mv LICENSE.NON-FREE.tmp LICENSE.NON-FREE


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING LICENSE.GPL LICENSE.NON-FREE LICENSE.POLICY NEWS README
%{_libdir}/*.so.*
%{_bindir}/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so


%changelog
* Sat Sep 06 2008 Martin Nagy <mnagy at redhat.com> 2.1.1-1
- initial packaging


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/itzam-core/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 04:15:44 -0000	1.1
+++ sources	12 Sep 2008 07:55:08 -0000	1.2
@@ -0,0 +1 @@
+5477e3b3f10cc73b84870e5c5750baa1  itzam-core-2.1.1.tar.gz



From mnagy at fedoraproject.org  Fri Sep 12 07:58:20 2008
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Fri, 12 Sep 2008 07:58:20 +0000 (UTC)
Subject: rpms/itzam-core/F-8 itzam-core-2.1.1-itzam32.patch, NONE,
	1.1 itzam-core.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080912075820.1072B70131@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/itzam-core/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22414

Modified Files:
	sources 
Added Files:
	itzam-core-2.1.1-itzam32.patch itzam-core.spec 
Log Message:
* Sat Sep 06 2008 Martin Nagy <mnagy at redhat.com> 2.1.1-1
- initial packaging


itzam-core-2.1.1-itzam32.patch:

--- NEW FILE itzam-core-2.1.1-itzam32.patch ---
diff -up itzam-core-2.1.1/libitzam/itzam.h.itzam32 itzam-core-2.1.1/libitzam/itzam.h
--- itzam-core-2.1.1/libitzam/itzam.h.itzam32	2008-09-06 22:23:02.000000000 +0200
+++ itzam-core-2.1.1/libitzam/itzam.h	2008-09-06 22:24:58.000000000 +0200
@@ -67,6 +67,10 @@ typedef signed char      int8_t;
 #include <stdint.h>
 #endif
 
+#if __WORDSIZE == 32
+#define ITZAM32
+#endif
+
 //------------------------------------------------------------
 // enumerated types
 typedef enum
diff -up itzam-core-2.1.1/libitzam/itzam_btree.c.patch itzam-core-2.1.1/libitzam/itzam_btree.c
--- itzam-core-2.1.1/libitzam/itzam_btree.c.patch	2008-09-06 03:20:32.000000000 +0200
+++ itzam-core-2.1.1/libitzam/itzam_btree.c	2008-09-06 03:21:06.000000000 +0200
@@ -285,11 +285,7 @@ static itzam_btree_page * read_page_dire
 }
 
 // cen't be static because it's used by debug routines
-#if defined(_MSC_VER)
 itzam_btree_page * read_page(itzam_btree * btree, itzam_ref where)
-#else
-inline itzam_btree_page * read_page(itzam_btree * btree, itzam_ref where)
-#endif
 {
     // what we return
     itzam_btree_page * page = NULL;


--- NEW FILE itzam-core.spec ---
Name:		itzam-core
Version:	2.1.1
Release:	1%{?dist}
Summary:	Library for creating and manipulating keyed-access database files

Group:		System Environment/Libraries
License:	GPLv3+
URL:		http://www.coyotegulch.com/products/itzam/index.html
Source0:	http://www.coyotegulch.com/distfiles/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:		itzam-core-2.1.1-itzam32.patch

%description
Itzam/Core is a deliberately portable and concise C library for creating and
manipulating keyed-access database files containing variable-length, random
access records. Information is referenced by a user-defined key value;
indexes may be combined with or remain separate from data. 

%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 .itzam32


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

cat LICENSE.NON-FREE | tr -d '\r' > LICENSE.NON-FREE.tmp
touch -r LICENSE.NON-FREE LICENSE.NON-FREE.tmp
mv LICENSE.NON-FREE.tmp LICENSE.NON-FREE


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING LICENSE.GPL LICENSE.NON-FREE LICENSE.POLICY NEWS README
%{_libdir}/*.so.*
%{_bindir}/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so


%changelog
* Sat Sep 06 2008 Martin Nagy <mnagy at redhat.com> 2.1.1-1
- initial packaging


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/itzam-core/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 04:15:44 -0000	1.1
+++ sources	12 Sep 2008 07:57:49 -0000	1.2
@@ -0,0 +1 @@
+5477e3b3f10cc73b84870e5c5750baa1  itzam-core-2.1.1.tar.gz



From rezso at fedoraproject.org  Fri Sep 12 08:06:50 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Fri, 12 Sep 2008 08:06:50 +0000 (UTC)
Subject: rpms/mapnik/F-9 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 mapnik.spec, 
	1.1, 1.2 sources, 1.2, 1.3 gcc43-warnings.patch, 1.1, NONE
Message-ID: <20080912080650.8FA3670131@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/mapnik/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25536/F-9

Modified Files:
	.cvsignore import.log mapnik.spec sources 
Removed Files:
	gcc43-warnings.patch 
Log Message:
- enable libicu wrap
- fix koji build
- disable smp build with upstream scons
- new cvs snapshot, x86_64 should work for now
- new cairo dep added

 ----------------------------------------------------------------------
 Modified Files:
 	F-9/.cvsignore F-9/import.log F-9/mapnik.spec F-9/sources 
 Removed Files:
 	F-9/gcc43-warnings.patch 
 ----------------------------------------------------------------------



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Aug 2008 16:03:08 -0000	1.2
+++ .cvsignore	12 Sep 2008 08:06:20 -0000	1.3
@@ -1 +1 @@
-mapnik_src-0.5.1.tar.gz
+mapnik_src-0.5.2.svn738.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Aug 2008 16:03:08 -0000	1.1
+++ import.log	12 Sep 2008 08:06:20 -0000	1.2
@@ -1 +1,2 @@
 mapnik-0_5_1-4_fc9:F-9:mapnik-0.5.1-4.fc9.src.rpm:1219679751
+mapnik-0_5_2-0_3_svn738_fc10:F-9:mapnik-0.5.2-0.3.svn738.fc10.src.rpm:1221206719


Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/F-9/mapnik.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mapnik.spec	25 Aug 2008 16:03:08 -0000	1.1
+++ mapnik.spec	12 Sep 2008 08:06:20 -0000	1.2
@@ -1,25 +1,24 @@
 Name:      mapnik
-Version:   0.5.1
-Release:   4%{?dist}
+Version:   0.5.2
+Release:   0.3.svn738%{?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}.tar.gz
+Source0:   http://download.berlios.de/mapnik/mapnik_src-%{version}.svn738.tar.gz
 Source1:   mapnik-data.license
 Source2:   no_date_footer.html
 Patch0:    use-system-fonts.patch
-Patch1:    gcc43-warnings.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  dejavu-fonts
 
 BuildRequires: scons doxygen
-BuildRequires: postgresql-devel python-devel
-BuildRequires: libtool-ltdl-devel pkgconfig
+BuildRequires: libtool-ltdl-devel
+BuildRequires: postgresql-devel pkgconfig
 BuildRequires: gdal-devel proj-devel agg-devel
-BuildRequires: libxml2-devel boost-devel
-BuildRequires: libtiff-devel libjpeg-devel
-BuildRequires: libpng-devel freetype-devel fribidi-devel
+BuildRequires: libxml2-devel boost-devel libicu-devel
+BuildRequires: libtiff-devel libjpeg-devel libpng-devel
+BuildRequires: cairomm-devel pycairo-devel freetype-devel
 
 %{!?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)")}
@@ -93,9 +92,11 @@
 spatial visualization library
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}
 %patch0 -p0
-%patch1 -p0
+
+# clean SVN
+find . -type d -name .svn -exec rm -rf '{}' +
 
 # get rid of local agg, tinyxml and fonts
 rm -rf agg tinyxml fonts
@@ -123,13 +124,6 @@
 
 %build
 
-# do not use internal agg and tinyxml
-sed -i -e "s|.\#tinyxml..||g" SConstruct
-sed -i -e "s|\#agg\/include|\/usr\/include\/agg2\/|g" SConstruct
-sed -i -e "s|SConscript(.agg|\#SConscript(.agg|g" SConstruct
-sed -i -e "s|\[.iconv.|\[\'dl\'|g" SConstruct
-# system_error.hpp missing on linux
-sed -i -e "s|\[.system.|\#\[\'system\'|g" SConstruct
 # linkage errors
 sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\',|g" plugins/input/gdal/SConscript
 sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\',|g" plugins/input/postgis/SConscript
@@ -139,10 +133,13 @@
 # fix build flags
 sed -i -e "s|common_cxx_flags = .-D\%s|common_cxx_flags = \'-D\%s $RPM_OPT_FLAGS |g" SConstruct
 
-%{__python} scons/scons.py \
-                PREFIX=%{_prefix} \
-                XMLPARSER=libxml2 \
-                GDAL_INCLUDES=%{_includedir}/gdal
+# WARNING smp may brak build
+# %{?_smp_mflags}
+scons         PREFIX=%{_prefix} \
+              THREADING=multi \
+              XMLPARSER=libxml2 \
+              GDAL_INCLUDES=%{_includedir}/gdal \
+              INTERNAL_LIBAGG=False
 
 # build doxygen docs
 # use multilib aware footer
@@ -156,10 +153,12 @@
 
 rm -rf %{buildroot}
 
-%{__python} scons/scons.py install DESTDIR=%{buildroot} \
-                PREFIX=%{_prefix} \
-                XMLPARSER=libxml2 \
-                GDAL_INCLUDES=%{_includedir}/gdal
+scons install DESTDIR=%{buildroot} \
+              PREFIX=%{_prefix} \
+              THREADING=multi \
+              XMLPARSER=libxml2 \
+              GDAL_INCLUDES=%{_includedir}/gdal \
+              INTERNAL_LIBAGG=False
 
 # get rid of fonts use external instead
 rm -rf %{buildroot}%{_libdir}/%{name}/fonts
@@ -220,6 +219,17 @@
 %doc demo/python demo/test
 
 %changelog
+* Fri Sep 12 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.3.svn738
+- enable libicu wrap
+
+* Fri Sep 12 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.2.svn738
+- fix koji build
+- disable smp build with upstream scons
+
+* Thu Sep 11 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.1.svn738
+- new cvs snapshot, x86_64 should work for now
+- new cairo dep added
+
 * Mon Aug 25 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.1-4
 - License of demo is GPLv2+ GeoGratis
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2008 16:03:08 -0000	1.2
+++ sources	12 Sep 2008 08:06:20 -0000	1.3
@@ -1 +1 @@
-fa484bdb5cf1faf0720f17129a43038b  mapnik_src-0.5.1.tar.gz
+01b65569ff99e3b3e70880bc47302a11  mapnik_src-0.5.2.svn738.tar.gz


--- gcc43-warnings.patch DELETED ---



From mnagy at fedoraproject.org  Fri Sep 12 08:06:59 2008
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Fri, 12 Sep 2008 08:06:59 +0000 (UTC)
Subject: rpms/itzam-core/F-9 itzam-core-2.1.1-itzam32.patch, NONE,
	1.1 itzam-core.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080912080659.ADD4470131@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/itzam-core/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25815

Modified Files:
	sources 
Added Files:
	itzam-core-2.1.1-itzam32.patch itzam-core.spec 
Log Message:
* Sat Sep 06 2008 Martin Nagy <mnagy at redhat.com> 2.1.1-1
- initial packaging


itzam-core-2.1.1-itzam32.patch:

--- NEW FILE itzam-core-2.1.1-itzam32.patch ---
diff -up itzam-core-2.1.1/libitzam/itzam.h.itzam32 itzam-core-2.1.1/libitzam/itzam.h
--- itzam-core-2.1.1/libitzam/itzam.h.itzam32	2008-09-06 22:23:02.000000000 +0200
+++ itzam-core-2.1.1/libitzam/itzam.h	2008-09-06 22:24:58.000000000 +0200
@@ -67,6 +67,10 @@ typedef signed char      int8_t;
 #include <stdint.h>
 #endif
 
+#if __WORDSIZE == 32
+#define ITZAM32
+#endif
+
 //------------------------------------------------------------
 // enumerated types
 typedef enum
diff -up itzam-core-2.1.1/libitzam/itzam_btree.c.patch itzam-core-2.1.1/libitzam/itzam_btree.c
--- itzam-core-2.1.1/libitzam/itzam_btree.c.patch	2008-09-06 03:20:32.000000000 +0200
+++ itzam-core-2.1.1/libitzam/itzam_btree.c	2008-09-06 03:21:06.000000000 +0200
@@ -285,11 +285,7 @@ static itzam_btree_page * read_page_dire
 }
 
 // cen't be static because it's used by debug routines
-#if defined(_MSC_VER)
 itzam_btree_page * read_page(itzam_btree * btree, itzam_ref where)
-#else
-inline itzam_btree_page * read_page(itzam_btree * btree, itzam_ref where)
-#endif
 {
     // what we return
     itzam_btree_page * page = NULL;


--- NEW FILE itzam-core.spec ---
Name:		itzam-core
Version:	2.1.1
Release:	1%{?dist}
Summary:	Library for creating and manipulating keyed-access database files

Group:		System Environment/Libraries
License:	GPLv3+
URL:		http://www.coyotegulch.com/products/itzam/index.html
Source0:	http://www.coyotegulch.com/distfiles/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:		itzam-core-2.1.1-itzam32.patch

%description
Itzam/Core is a deliberately portable and concise C library for creating and
manipulating keyed-access database files containing variable-length, random
access records. Information is referenced by a user-defined key value;
indexes may be combined with or remain separate from data. 

%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 .itzam32


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

cat LICENSE.NON-FREE | tr -d '\r' > LICENSE.NON-FREE.tmp
touch -r LICENSE.NON-FREE LICENSE.NON-FREE.tmp
mv LICENSE.NON-FREE.tmp LICENSE.NON-FREE


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING LICENSE.GPL LICENSE.NON-FREE LICENSE.POLICY NEWS README
%{_libdir}/*.so.*
%{_bindir}/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so


%changelog
* Sat Sep 06 2008 Martin Nagy <mnagy at redhat.com> 2.1.1-1
- initial packaging


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/itzam-core/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 04:15:44 -0000	1.1
+++ sources	12 Sep 2008 08:06:29 -0000	1.2
@@ -0,0 +1 @@
+5477e3b3f10cc73b84870e5c5750baa1  itzam-core-2.1.1.tar.gz



From perex at fedoraproject.org  Fri Sep 12 08:27:31 2008
From: perex at fedoraproject.org (Jaroslav Kysela)
Date: Fri, 12 Sep 2008 08:27:31 +0000 (UTC)
Subject: rpms/alsa-lib/F-9 alsa-lib-1.0.17-pcm-no-flags.patch, NONE,
	1.1 alsa-lib-1.0.17-pcm-softvol.patch, NONE, 1.1 .cvsignore,
	1.32, 1.33 alsa-lib.spec, 1.68, 1.69 sources, 1.36, 1.37
Message-ID: <20080912082731.9E1AF70131@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-lib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1115

Modified Files:
	.cvsignore alsa-lib.spec sources 
Added Files:
	alsa-lib-1.0.17-pcm-no-flags.patch 
	alsa-lib-1.0.17-pcm-softvol.patch 
Log Message:
alsa-lib: updated to 1.0.17a

alsa-lib-1.0.17-pcm-no-flags.patch:

--- NEW FILE alsa-lib-1.0.17-pcm-no-flags.patch ---
>From 73d20069e072e2b62bbc3ea12e46ae19d8b6cac9 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <mznyfn at 0pointer.de>
Date: Sun, 31 Aug 2008 03:41:48 +0200
Subject: [PATCH] alsa-lib: Make sure SND_PCM_NO_xxx flags don't get lost when nonblocking mode is enabled

The plug PCM copies the 'mode' field from the slave PCM. If blocking mode is
enabled for the plug PCM the mode is subsequently overwritten with the original
requested 'mode'. If non-blocking mode is requested this does not happen.

Because the hw PCM synthesizes the 'mode' from the actual file descriptor flags
no SND_PCM_NO_xxx will ever be set for it. This has the effect that the 'mode'
of the plug PCM will also not include those flags anymore -- unless they are
overwritten as mentioned above. This basically means SND_PCM_NO_xxx is ignored
for plug:hw:4711 style device strings opened in non-blocking mode.

You can easily test this with "aplay --channels 7 --disable-channels -f S16_LE
-r 44100 -D plug:hw:0" on a device that cannot do 7 channels. Normally this
call should fail, however if you add "-N" to the command line this call will
succeed.

This patch simply copies the SND_PCM_NO_xxx flags back into the 'mode' field in
case we don't overwrite it with the original anyway.

Probably closes bug 3571 for good.

From: Lennart Poettering <mznyfn at 0pointer.de>
Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 src/pcm/pcm_hw.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
index 1e1889c..c8d9a62 100644
--- a/src/pcm/pcm_hw.c
+++ b/src/pcm/pcm_hw.c
@@ -1507,7 +1507,13 @@ int _snd_pcm_hw_open(snd_pcm_t **pcmp, const char *name,
 		/* revert to blocking mode for read/write access */
 		snd_pcm_hw_nonblock(*pcmp, 0);
 		(*pcmp)->mode = mode;
-	}
+	} else
+		/* make sure the SND_PCM_NO_xxx flags don't get lost on the
+		 * way */
+		(*pcmp)->mode |= mode & (SND_PCM_NO_AUTO_RESAMPLE|
+					 SND_PCM_NO_AUTO_CHANNELS|
+					 SND_PCM_NO_AUTO_FORMAT|
+					 SND_PCM_NO_SOFTVOL);
 
 	hw = (*pcmp)->private_data;
 	if (format != SND_PCM_FORMAT_UNKNOWN)
-- 
1.5.5.1


alsa-lib-1.0.17-pcm-softvol.patch:

--- NEW FILE alsa-lib-1.0.17-pcm-softvol.patch ---
>From a13707da6bb0161db855a146c3e4d1d849e4108b Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Tue, 9 Sep 2008 13:07:39 +0200
Subject: [PATCH] pcm_softvol plugin: remove access type change for refine

The softvol plugin does in-place sample recalculation. The access type
cannot be changed like in linear plugins. Remove access type change
in refine functions.

This bug was detected with PulseAudio on Sony PS3 platform.

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 src/pcm/pcm_softvol.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/pcm/pcm_softvol.c b/src/pcm/pcm_softvol.c
index eee6424..8268f1d 100644
--- a/src/pcm/pcm_softvol.c
+++ b/src/pcm/pcm_softvol.c
@@ -399,7 +399,6 @@ static int snd_pcm_softvol_hw_refine_cprepare(snd_pcm_t *pcm,
 {
 	int err;
 	snd_pcm_softvol_t *svol = pcm->private_data;
-	snd_pcm_access_mask_t access_mask = { SND_PCM_ACCBIT_SHM };
 	snd_pcm_format_mask_t format_mask = {
 		{
 			(1ULL << SND_PCM_FORMAT_S16_LE) |
@@ -413,10 +412,6 @@ static int snd_pcm_softvol_hw_refine_cprepare(snd_pcm_t *pcm,
 		snd_pcm_format_mask_none(&format_mask);
 		snd_pcm_format_mask_set(&format_mask, svol->sformat);
 	}
-	err = _snd_pcm_hw_param_set_mask(params, SND_PCM_HW_PARAM_ACCESS,
-					 &access_mask);
-	if (err < 0)
-		return err;
 	err = _snd_pcm_hw_param_set_mask(params, SND_PCM_HW_PARAM_FORMAT,
 					 &format_mask);
 	if (err < 0)
@@ -434,10 +429,7 @@ static int snd_pcm_softvol_hw_refine_cprepare(snd_pcm_t *pcm,
 static int snd_pcm_softvol_hw_refine_sprepare(snd_pcm_t *pcm, snd_pcm_hw_params_t *sparams)
 {
 	snd_pcm_softvol_t *svol = pcm->private_data;
-	snd_pcm_access_mask_t saccess_mask = { SND_PCM_ACCBIT_MMAP };
 	_snd_pcm_hw_params_any(sparams);
-	_snd_pcm_hw_param_set_mask(sparams, SND_PCM_HW_PARAM_ACCESS,
-				   &saccess_mask);
 	if (svol->sformat != SND_PCM_FORMAT_UNKNOWN) {
 		_snd_pcm_hw_params_set_format(sparams, svol->sformat);
 		_snd_pcm_hw_params_set_subformat(sparams, SND_PCM_SUBFORMAT_STD);
@@ -451,7 +443,8 @@ static int snd_pcm_softvol_hw_refine_schange(snd_pcm_t *pcm,
 {
 	snd_pcm_softvol_t *svol = pcm->private_data;
 	int err;
-	unsigned int links = (SND_PCM_HW_PARBIT_CHANNELS |
+	unsigned int links = (SND_PCM_HW_PARBIT_ACCESS |
+			      SND_PCM_HW_PARBIT_CHANNELS |
 			      SND_PCM_HW_PARBIT_RATE |
 			      SND_PCM_HW_PARBIT_PERIODS |
 			      SND_PCM_HW_PARBIT_PERIOD_SIZE |
@@ -475,7 +468,8 @@ static int snd_pcm_softvol_hw_refine_cchange(snd_pcm_t *pcm,
 {
 	snd_pcm_softvol_t *svol = pcm->private_data;
 	int err;
-	unsigned int links = (SND_PCM_HW_PARBIT_CHANNELS |
+	unsigned int links = (SND_PCM_HW_PARBIT_ACCESS |
+			      SND_PCM_HW_PARBIT_CHANNELS |
 			      SND_PCM_HW_PARBIT_RATE |
 			      SND_PCM_HW_PARBIT_PERIODS |
 			      SND_PCM_HW_PARBIT_PERIOD_SIZE |
-- 
1.5.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-9/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	19 Jun 2008 14:25:17 -0000	1.32
+++ .cvsignore	12 Sep 2008 08:27:01 -0000	1.33
@@ -19,3 +19,4 @@
 alsa-lib-1.0.15rc3.tar.bz2
 alsa-lib-1.0.16.tar.bz2
 alsa-lib-1.0.17rc2.tar.bz2
+alsa-lib-1.0.17a.tar.bz2


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-9/alsa-lib.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- alsa-lib.spec	19 Jun 2008 14:25:18 -0000	1.68
+++ alsa-lib.spec	12 Sep 2008 08:27:01 -0000	1.69
@@ -1,10 +1,11 @@
-%define  prever         rc2
-%define  prever_dot     .rc2
+#define  prever         rc2
+#define  prever_dot     .%{prever}
+%define	 postver	a
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
 Version: 1.0.17
-Release: 1%{?prever_dot}%{?dist}
+Release: 2%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
@@ -12,6 +13,8 @@
 Patch2:  alsa-lib-1.0.14-glibc-open.patch
 Patch3:	 alsa-lib-pulse-default.patch
 Patch4:	 alsa-lib-1.0.16-no-dox-date.patch
+Patch5:  alsa-lib-1.0.17-pcm-no-flags.patch
+Patch6:  alsa-lib-1.0.17-pcm-softvol.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: doxygen
@@ -39,11 +42,13 @@
 against the ALSA libraries and interfaces.
 
 %prep
-%setup -q -n %{name}-%{version}%{?prever}
+%setup -q -n %{name}-%{version}%{?prever}%{?postver}
 %patch0 -p1 -b .config
 %patch2 -p1 -b .glibc-open
 %patch3 -p1 -b .pulse-default
 %patch4 -p1 -b .no-dox-date
+%patch5 -p1 -b .pcm-no-flags
+%patch6 -p1 -b .pcm-softvol
 
 %build
 %configure --with-configdir=%{_sysconfdir}/alsa
@@ -91,6 +96,9 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Fri Sep 12 2008 Jaroslav Kysela <jkysela at redhat.com> 1.0.17-2
+- updated to 1.0.17a
+
 * Thu Jun 19 2008 Jaroslav Kysela <jkysela at redhat.com> 1.0.17-1.rc2
 - updated to 1.0.17rc2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-9/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	19 Jun 2008 14:25:18 -0000	1.36
+++ sources	12 Sep 2008 08:27:01 -0000	1.37
@@ -1 +1 @@
-5177ad39854d2fb7fcc567bf24ba99f4  alsa-lib-1.0.17rc2.tar.bz2
+4284535ff10f5e71152f8f69b325d08d  alsa-lib-1.0.17a.tar.bz2



From mpg at fedoraproject.org  Fri Sep 12 08:35:45 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Fri, 12 Sep 2008 08:35:45 +0000 (UTC)
Subject: rpms/sugar-journal/OLPC-3 sugar-journal.spec, 1.14, 1.15 setup.patch,
	1.1, NONE
Message-ID: <20080912083545.0FFB670131@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-journal/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4203

Modified Files:
	sugar-journal.spec 
Removed Files:
	setup.patch 
Log Message:
Resync with rawhide


Index: sugar-journal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-journal/OLPC-3/sugar-journal.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sugar-journal.spec	28 Aug 2008 12:42:04 -0000	1.14
+++ sugar-journal.spec	12 Sep 2008 08:35:14 -0000	1.15
@@ -2,8 +2,8 @@
 %define alphatag 20080822git%{commitid}
 
 Name:           sugar-journal
-Version:        98
-Release:        1%{?dist}
+Version:        99
+Release:        3%{?dist}
 #Release:        4.%{alphatag}%{?dist}
 Summary:        Journal for Sugar
 
@@ -15,7 +15,6 @@
 # cd journal-activity
 # git-checkout %{commitid}
 #Source0:        Journal-%{version}-git%{commitid}.tar.bz2
-Patch0:         setup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python sugar-toolkit git-core gettext
@@ -29,90 +28,35 @@
 
 %prep
 %setup -q -n Journal-%{version}
-%patch0 -p1 -b .setup
 
 %build
-
+python ./setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{sugaractivitydir}
-python setup.py build
-python setup.py install $RPM_BUILD_ROOT%{sugaractivitydir}
-chmod +x $RPM_BUILD_ROOT%{sugaractivitydir}/Journal.activity/setup.py
+python ./setup.py install --prefix=$RPM_BUILD_ROOT/%{_prefix}
+
+%find_lang org.laptop.JournalActivity
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%files
+%files -f org.laptop.JournalActivity.lang
 %defattr(-,root,root,-)
-%dir %{sugaractivitydir}/Journal.activity/
-%doc %{sugaractivitydir}/Journal.activity/NEWS
-%{sugaractivitydir}/Journal.activity/activity/
-%{sugaractivitydir}/Journal.activity/*.py*
-%{sugaractivitydir}/Journal.activity/icons/
-#%{sugaractivitydir}/Journal.activity/po/
-%dir %{sugaractivitydir}/Journal.activity/locale/
-%lang(af) %{sugaractivitydir}/Journal.activity/locale/af/
-%lang(am) %{sugaractivitydir}/Journal.activity/locale/am/
-%lang(ar) %{sugaractivitydir}/Journal.activity/locale/ar/
-%lang(ay) %{sugaractivitydir}/Journal.activity/locale/ay/
-%lang(bg) %{sugaractivitydir}/Journal.activity/locale/bg/
-%lang(bn) %{sugaractivitydir}/Journal.activity/locale/bn/
-%lang(bn_IN) %{sugaractivitydir}/Journal.activity/locale/bn_IN/
-%lang(ca) %{sugaractivitydir}/Journal.activity/locale/ca/
-%lang(de) %{sugaractivitydir}/Journal.activity/locale/de/
-%lang(dz) %{sugaractivitydir}/Journal.activity/locale/dz/
-%lang(el) %{sugaractivitydir}/Journal.activity/locale/el/
-%lang(en) %{sugaractivitydir}/Journal.activity/locale/en/
-%lang(es) %{sugaractivitydir}/Journal.activity/locale/es/
-%lang(fa) %{sugaractivitydir}/Journal.activity/locale/fa/
-%lang(fa_AF) %{sugaractivitydir}/Journal.activity/locale/fa_AF/
-%lang(ff) %{sugaractivitydir}/Journal.activity/locale/ff/
-%lang(fr) %{sugaractivitydir}/Journal.activity/locale/fr/
-%lang(gu) %{sugaractivitydir}/Journal.activity/locale/gu/
-%lang(hi) %{sugaractivitydir}/Journal.activity/locale/hi/
-%lang(ht) %{sugaractivitydir}/Journal.activity/locale/ht/
-%lang(ig) %{sugaractivitydir}/Journal.activity/locale/ig/
-%lang(is) %{sugaractivitydir}/Journal.activity/locale/is/
-%lang(it) %{sugaractivitydir}/Journal.activity/locale/it/
-%lang(ja) %{sugaractivitydir}/Journal.activity/locale/ja/
-%lang(km) %{sugaractivitydir}/Journal.activity/locale/km/
-%lang(ko) %{sugaractivitydir}/Journal.activity/locale/ko/
-%lang(mk) %{sugaractivitydir}/Journal.activity/locale/mk/
-%lang(ml) %{sugaractivitydir}/Journal.activity/locale/ml/
-%lang(mn) %{sugaractivitydir}/Journal.activity/locale/mn/
-%lang(mr) %{sugaractivitydir}/Journal.activity/locale/mr/
-%lang(mvo) %{sugaractivitydir}/Journal.activity/locale/mvo/
-%lang(nb) %{sugaractivitydir}/Journal.activity/locale/nb/
-%lang(ne) %{sugaractivitydir}/Journal.activity/locale/ne/
-%lang(nl) %{sugaractivitydir}/Journal.activity/locale/nl/
-%lang(pa) %{sugaractivitydir}/Journal.activity/locale/pa/
-%lang(pap) %{sugaractivitydir}/Journal.activity/locale/pap/
-%lang(pis) %{sugaractivitydir}/Journal.activity/locale/pis/
-%lang(pl) %{sugaractivitydir}/Journal.activity/locale/pl/
-%lang(ps) %{sugaractivitydir}/Journal.activity/locale/ps/
-%lang(pt) %{sugaractivitydir}/Journal.activity/locale/pt/
-%lang(pt_BR) %{sugaractivitydir}/Journal.activity/locale/pt_BR/
-%lang(qu) %{sugaractivitydir}/Journal.activity/locale/qu/
-%lang(ro) %{sugaractivitydir}/Journal.activity/locale/ro/
-%lang(ru) %{sugaractivitydir}/Journal.activity/locale/ru/
-%lang(rw) %{sugaractivitydir}/Journal.activity/locale/rw/
-%lang(sd) %{sugaractivitydir}/Journal.activity/locale/sd/
-%lang(si) %{sugaractivitydir}/Journal.activity/locale/si/
-%lang(sl) %{sugaractivitydir}/Journal.activity/locale/sl/
-%lang(te) %{sugaractivitydir}/Journal.activity/locale/te/
-%lang(th) %{sugaractivitydir}/Journal.activity/locale/th/
-%lang(tpi) %{sugaractivitydir}/Journal.activity/locale/tpi/
-%lang(tr) %{sugaractivitydir}/Journal.activity/locale/tr/
-%lang(ur) %{sugaractivitydir}/Journal.activity/locale/ur/
-%lang(vi) %{sugaractivitydir}/Journal.activity/locale/vi/
-%lang(yo) %{sugaractivitydir}/Journal.activity/locale/yo/
-%lang(zh_CN) %{sugaractivitydir}/Journal.activity/locale/zh_CN/
-%lang(zh_TW) %{sugaractivitydir}/Journal.activity/locale/zh_TW/
+%doc NEWS
+%{sugaractivitydir}/Journal.activity/
 
 %changelog
+* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 99-3
+- Obvious typo in the files
+
+* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 99-2
+- Fixup packaging for the new bundlebuilder
+
+* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 99-1
+- #8287 8.2-757: Copy-to-clipboard broken in Journal
+
 * Thu Aug 28 2008 Simon Schampijer <simon at laptop.org> - 98-1
 - 7588 Sugar should provide messages indicating when NAND is 'getting full' and 'critically full'
 - 6800 Journal window should be mirrored in RTL locales 


--- setup.patch DELETED ---



From mpg at fedoraproject.org  Fri Sep 12 08:36:52 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Fri, 12 Sep 2008 08:36:52 +0000 (UTC)
Subject: rpms/sugar-journal/OLPC-3 sources,1.10,1.11
Message-ID: <20080912083652.423E570131@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-journal/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4604

Modified Files:
	sources 
Log Message:
Update sources


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-journal/OLPC-3/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	28 Aug 2008 12:42:04 -0000	1.10
+++ sources	12 Sep 2008 08:36:22 -0000	1.11
@@ -1 +1 @@
-04132404d45f0d67fb9e7e8c79df0348  Journal-98.tar.bz2
+f68a4cdb44e71889f712b2aa9b096bc3  Journal-99.tar.bz2



From rezso at fedoraproject.org  Fri Sep 12 08:43:36 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Fri, 12 Sep 2008 08:43:36 +0000 (UTC)
Subject: rpms/mapnik/F-8 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 mapnik.spec, 
	1.1, 1.2 sources, 1.2, 1.3 gcc43-warnings.patch, 1.1, NONE
Message-ID: <20080912084337.048F470131@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/mapnik/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6895/F-8

Modified Files:
	.cvsignore import.log mapnik.spec sources 
Removed Files:
	gcc43-warnings.patch 
Log Message:
- enable libicu wrap
- fix koji build
- disable smp build with upstream scons
- new cvs snapshot, x86_64 should work for now
- new cairo dep added
 ----------------------------------------------------------------------
 Modified Files:
 	F-8/.cvsignore F-8/import.log F-8/mapnik.spec F-8/sources 
 Removed Files:
 	F-8/gcc43-warnings.patch 
 ----------------------------------------------------------------------



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Aug 2008 16:12:23 -0000	1.2
+++ .cvsignore	12 Sep 2008 08:43:06 -0000	1.3
@@ -1 +1 @@
-mapnik_src-0.5.1.tar.gz
+mapnik_src-0.5.2.svn738.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/F-8/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Aug 2008 16:12:23 -0000	1.1
+++ import.log	12 Sep 2008 08:43:06 -0000	1.2
@@ -1 +1,2 @@
 mapnik-0_5_1-4_fc9:F-8:mapnik-0.5.1-4.fc9.src.rpm:1219680658
+mapnik-0_5_2-0_3_svn738_fc10:F-8:mapnik-0.5.2-0.3.svn738.fc10.src.rpm:1221208908


Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/F-8/mapnik.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mapnik.spec	25 Aug 2008 16:12:23 -0000	1.1
+++ mapnik.spec	12 Sep 2008 08:43:06 -0000	1.2
@@ -1,25 +1,24 @@
 Name:      mapnik
-Version:   0.5.1
-Release:   4%{?dist}
+Version:   0.5.2
+Release:   0.3.svn738%{?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}.tar.gz
+Source0:   http://download.berlios.de/mapnik/mapnik_src-%{version}.svn738.tar.gz
 Source1:   mapnik-data.license
 Source2:   no_date_footer.html
 Patch0:    use-system-fonts.patch
-Patch1:    gcc43-warnings.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  dejavu-fonts
 
 BuildRequires: scons doxygen
-BuildRequires: postgresql-devel python-devel
-BuildRequires: libtool-ltdl-devel pkgconfig
+BuildRequires: libtool-ltdl-devel
+BuildRequires: postgresql-devel pkgconfig
 BuildRequires: gdal-devel proj-devel agg-devel
-BuildRequires: libxml2-devel boost-devel
-BuildRequires: libtiff-devel libjpeg-devel
-BuildRequires: libpng-devel freetype-devel fribidi-devel
+BuildRequires: libxml2-devel boost-devel libicu-devel
+BuildRequires: libtiff-devel libjpeg-devel libpng-devel
+BuildRequires: cairomm-devel pycairo-devel freetype-devel
 
 %{!?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)")}
@@ -93,9 +92,11 @@
 spatial visualization library
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}
 %patch0 -p0
-%patch1 -p0
+
+# clean SVN
+find . -type d -name .svn -exec rm -rf '{}' +
 
 # get rid of local agg, tinyxml and fonts
 rm -rf agg tinyxml fonts
@@ -123,13 +124,6 @@
 
 %build
 
-# do not use internal agg and tinyxml
-sed -i -e "s|.\#tinyxml..||g" SConstruct
-sed -i -e "s|\#agg\/include|\/usr\/include\/agg2\/|g" SConstruct
-sed -i -e "s|SConscript(.agg|\#SConscript(.agg|g" SConstruct
-sed -i -e "s|\[.iconv.|\[\'dl\'|g" SConstruct
-# system_error.hpp missing on linux
-sed -i -e "s|\[.system.|\#\[\'system\'|g" SConstruct
 # linkage errors
 sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\',|g" plugins/input/gdal/SConscript
 sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\',|g" plugins/input/postgis/SConscript
@@ -139,10 +133,13 @@
 # fix build flags
 sed -i -e "s|common_cxx_flags = .-D\%s|common_cxx_flags = \'-D\%s $RPM_OPT_FLAGS |g" SConstruct
 
-%{__python} scons/scons.py \
-                PREFIX=%{_prefix} \
-                XMLPARSER=libxml2 \
-                GDAL_INCLUDES=%{_includedir}/gdal
+# WARNING smp may brak build
+# %{?_smp_mflags}
+scons         PREFIX=%{_prefix} \
+              THREADING=multi \
+              XMLPARSER=libxml2 \
+              GDAL_INCLUDES=%{_includedir}/gdal \
+              INTERNAL_LIBAGG=False
 
 # build doxygen docs
 # use multilib aware footer
@@ -156,10 +153,12 @@
 
 rm -rf %{buildroot}
 
-%{__python} scons/scons.py install DESTDIR=%{buildroot} \
-                PREFIX=%{_prefix} \
-                XMLPARSER=libxml2 \
-                GDAL_INCLUDES=%{_includedir}/gdal
+scons install DESTDIR=%{buildroot} \
+              PREFIX=%{_prefix} \
+              THREADING=multi \
+              XMLPARSER=libxml2 \
+              GDAL_INCLUDES=%{_includedir}/gdal \
+              INTERNAL_LIBAGG=False
 
 # get rid of fonts use external instead
 rm -rf %{buildroot}%{_libdir}/%{name}/fonts
@@ -220,6 +219,17 @@
 %doc demo/python demo/test
 
 %changelog
+* Fri Sep 12 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.3.svn738
+- enable libicu wrap
+
+* Fri Sep 12 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.2.svn738
+- fix koji build
+- disable smp build with upstream scons
+
+* Thu Sep 11 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.1.svn738
+- new cvs snapshot, x86_64 should work for now
+- new cairo dep added
+
 * Mon Aug 25 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.1-4
 - License of demo is GPLv2+ GeoGratis
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2008 16:12:23 -0000	1.2
+++ sources	12 Sep 2008 08:43:06 -0000	1.3
@@ -1 +1 @@
-fa484bdb5cf1faf0720f17129a43038b  mapnik_src-0.5.1.tar.gz
+01b65569ff99e3b3e70880bc47302a11  mapnik_src-0.5.2.svn738.tar.gz


--- gcc43-warnings.patch DELETED ---



From perex at fedoraproject.org  Fri Sep 12 08:44:17 2008
From: perex at fedoraproject.org (Jaroslav Kysela)
Date: Fri, 12 Sep 2008 08:44:17 +0000 (UTC)
Subject: rpms/alsa-utils/F-9 alsa-utils-1.0.17-alsaconf.patch, NONE,
	1.1 alsa-utils-1.0.17-amixer-dbscale.patch, NONE, 1.1 .cvsignore,
	1.23, 1.24 alsa-utils.spec, 1.68, 1.69 alsa.rules, 1.3,
	1.4 sources, 1.27, 1.28 alsa-utils-1.0.14-alsaconf.patch, 1.2, NONE
Message-ID: <20080912084417.4CC9C70131@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7440

Modified Files:
	.cvsignore alsa-utils.spec alsa.rules sources 
Added Files:
	alsa-utils-1.0.17-alsaconf.patch 
	alsa-utils-1.0.17-amixer-dbscale.patch 
Removed Files:
	alsa-utils-1.0.14-alsaconf.patch 
Log Message:
alsa-utils: updated to 1.0.17 final

alsa-utils-1.0.17-alsaconf.patch:

--- NEW FILE alsa-utils-1.0.17-alsaconf.patch ---
--- alsa-utils-1.0.17/Makefile.am.orig	2008-07-14 11:16:02.000000000 +0200
+++ alsa-utils-1.0.17/Makefile.am	2008-09-12 10:39:43.000000000 +0200
@@ -4,7 +4,7 @@
 else
 ALSAMIXER_DIR=
 endif
-SUBDIRS= include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
+SUBDIRS= include alsactl $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
 EXTRA_DIST= config.rpath  config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure gitcompile depcomp
 AUTOMAKE_OPTIONS=foreign
 ACLOCAL_AMFLAGS = -I m4
--- alsa-utils-1.0.17/Makefile.in.orig	2008-07-14 11:16:06.000000000 +0200
+++ alsa-utils-1.0.17/Makefile.in	2008-09-12 10:39:57.000000000 +0200
@@ -65,7 +65,7 @@
 	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = include alsactl alsaconf alsamixer amidi amixer aplay \
+DIST_SUBDIRS = include alsactl alsamixer amidi amixer aplay \
 	iecset seq speaker-test utils m4 po
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -197,7 +197,7 @@
 INCLUDES = -I$(top_srcdir)/include
 @ALSAMIXER_FALSE at ALSAMIXER_DIR = 
 @ALSAMIXER_TRUE at ALSAMIXER_DIR = alsamixer
-SUBDIRS = include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
+SUBDIRS = include alsactl $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
 EXTRA_DIST = config.rpath  config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure gitcompile depcomp
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4

alsa-utils-1.0.17-amixer-dbscale.patch:

--- NEW FILE alsa-utils-1.0.17-amixer-dbscale.patch ---
>From ec73719ec6a7d4ccdd71c32de585217f31a99fb3 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at t61.perex-int.cz>
Date: Thu, 14 Aug 2008 14:57:19 +0200
Subject: [PATCH] amixer - fixed TLV dBscale and added dBrange parsing

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 amixer/amixer.c |   30 +++++++++++++++++++++++++-----
 1 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/amixer/amixer.c b/amixer/amixer.c
index 61259f6..f93fa9e 100644
--- a/amixer/amixer.c
+++ b/amixer/amixer.c
@@ -456,7 +456,7 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_
 	unsigned int type = tlv[0];
 	unsigned int size;
 	unsigned int idx = 0;
-	
+
 	if (tlv_size < 2 * sizeof(unsigned int)) {
 		printf("TLV size error!\n");
 		return;
@@ -487,12 +487,12 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_
 		printf("dBscale-");
 		if (size != 2 * sizeof(unsigned int)) {
 			while (size > 0) {
-				printf("0x%x", tlv[idx++]);
+				printf("0x%08x,", tlv[idx++]);
 				size -= sizeof(unsigned int);
 			}
 		} else {
 			printf("min=");
-			print_dB(tlv[2]);
+			print_dB((int)tlv[2]);
 			printf(",step=");
 			print_dB(tlv[3] & 0xffff);
 			printf(",mute=%i", (tlv[3] >> 16) & 1);
@@ -503,7 +503,7 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_
 		printf("dBlinear-");
 		if (size != 2 * sizeof(unsigned int)) {
 			while (size > 0) {
-				printf("0x%x", tlv[idx++]);
+				printf("0x%08x,", tlv[idx++]);
 				size -= sizeof(unsigned int);
 			}
 		} else {
@@ -514,10 +514,30 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_
 		}
 		break;
 #endif
+#ifdef SND_CTL_TLVT_DB_RANGE
+	case SND_CTL_TLVT_DB_RANGE:
+		printf("dBrange-\n");
+		if ((size / (6 * sizeof(unsigned int))) != 0) {
+			while (size > 0) {
+				printf("0x%08x,", tlv[idx++]);
+				size -= sizeof(unsigned int);
+			}
+			break;
+		}
+		idx = 0;
+		while (idx < size) {
+			print_spaces(spaces + 2);
+			printf("rangemin=%i,", tlv[0]);
+			printf(",rangemax=%i\n", tlv[1]);
+			decode_tlv(spaces + 4, tlv + 2, 6 * sizeof(unsigned int));
+			idx += 6 * sizeof(unsigned int);
+		}
+		break;
+#endif
 	default:
 		printf("unk-%i-", type);
 		while (size > 0) {
-			printf("0x%x", tlv[idx++]);
+			printf("0x%08x,", tlv[idx++]);
 			size -= sizeof(unsigned int);
 		}
 		break;
-- 
1.5.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-9/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	18 Feb 2008 10:40:32 -0000	1.23
+++ .cvsignore	12 Sep 2008 08:43:46 -0000	1.24
@@ -16,3 +16,5 @@
 alsa-utils-1.0.14.tar.bz2
 alsa-utils-1.0.15rc1.tar.bz2
 alsa-utils-1.0.16.tar.bz2
+alsa-utils-1.0.17rc2.tar.bz2
+alsa-utils-1.0.17.tar.bz2


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-9/alsa-utils.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- alsa-utils.spec	28 Apr 2008 10:39:01 -0000	1.68
+++ alsa-utils.spec	12 Sep 2008 08:43:46 -0000	1.69
@@ -1,10 +1,10 @@
-#define  prever         rc1
-#define  prever_dot     .rc1
+#define  prever         rc2
+#define  prever_dot     .rc2
 
 Summary: Advanced Linux Sound Architecture (ALSA) utilities
 Name:    alsa-utils
-Version: 1.0.16
-Release: 3%{?prever_dot}%{?dist}
+Version: 1.0.17
+Release: 2%{?prever_dot}%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.alsa-project.org/
@@ -15,8 +15,9 @@
 Source5: salsa.1
 Source6: alsa-info.sh
 Source10: alsa.rules
-Patch0:  alsa-utils-1.0.14-alsaconf.patch
+Patch0:  alsa-utils-1.0.17-alsaconf.patch
 Patch1:  alsa-utils-1.0.14-statedir.patch
+Patch2:  alsa-utils-1.0.17-amixer-dbscale.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel >= %{version}
 BuildRequires: ncurses-devel
@@ -31,6 +32,7 @@
 %setup -q -n %{name}-%{version}%{?prever}
 %patch0 -p1
 %patch1 -p1 -b .statedir
+%patch2 -p1 -b .amixerdbscale
 
 %build
 %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --sbindir=/sbin
@@ -88,6 +90,12 @@
 
 
 %changelog
+* Fri Sep 12 2008 Jaroslav Kysela <jkysela at redhat.com> 1.0.17-2
+- updated to 1.0.17 final
+
+* Thu Jun 19 2008 Jaroslav Kysela <jkysela at redhat.com> 1.0.17-1.rc2
+- updated to 1.0.17rc2
+
 * Mon Apr 28 2008 Martin Stransky <stransky at redhat.com> 1.0.16-3
 - Added alsa-info.sh script to /usr/bin/alsa-info
 


Index: alsa.rules
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-9/alsa.rules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- alsa.rules	24 Sep 2007 15:06:48 -0000	1.3
+++ alsa.rules	12 Sep 2008 08:43:46 -0000	1.4
@@ -1,2 +1,2 @@
-SUBSYSTEM=="sound", KERNEL=="controlC*"	RUN+="/sbin/salsa"
-SUBSYSTEM=="sound", KERNEL=="pcm*"	RUN+="/sbin/salsa"
\ No newline at end of file
+SUBSYSTEM=="sound", KERNEL=="controlC*", RUN+="/sbin/salsa"
+SUBSYSTEM=="sound", KERNEL=="pcm*", RUN+="/sbin/salsa"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-9/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	18 Feb 2008 10:40:32 -0000	1.27
+++ sources	12 Sep 2008 08:43:46 -0000	1.28
@@ -1 +1 @@
-b9f803f45e6988bb27a6bed521a949fc  alsa-utils-1.0.16.tar.bz2
+14ccd0c900bf663afb36eac6f92d41d6  alsa-utils-1.0.17.tar.bz2


--- alsa-utils-1.0.14-alsaconf.patch DELETED ---



From laxathom at fedoraproject.org  Fri Sep 12 08:46:17 2008
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Fri, 12 Sep 2008 08:46:17 +0000 (UTC)
Subject: rpms/gnome-desktop-sharp/F-9
	gnome-desktop-sharp-2.20.1-libdir.patch, 
	NONE, 1.1 gnome-desktop-sharp.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080912084617.F205370131@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gnome-desktop-sharp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8311/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-desktop-sharp-2.20.1-libdir.patch 
	gnome-desktop-sharp.spec import.log 
Log Message:


Add gnome-desktop-sharp to F-9 branch.


gnome-desktop-sharp-2.20.1-libdir.patch:

--- NEW FILE gnome-desktop-sharp-2.20.1-libdir.patch ---
diff -up gnome-desktop-sharp-2.20.1/gnomedesktop/gnome-desktop-sharp-2.0.pc.in.libdir gnome-desktop-sharp-2.20.1/gnomedesktop/gnome-desktop-sharp-2.0.pc.in
--- gnome-desktop-sharp-2.20.1/gnomedesktop/gnome-desktop-sharp-2.0.pc.in.libdir	2008-07-05 10:06:11.000000000 +0200
+++ gnome-desktop-sharp-2.20.1/gnomedesktop/gnome-desktop-sharp-2.0.pc.in	2008-07-05 10:06:59.000000000 +0200
@@ -1,8 +1,8 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 gapidir=${prefix}/share/gnomedesktop-sharp/2.20
-assemblies_dir=${libdir}/mono/gnomedesktop-sharp-2.20
+assemblies_dir=@libdir@/mono/gnomedesktop-sharp-2.20
 
 Name: GnomeDesktop#
 Description: GnomeDesktop# - GNOMEDesktop .NET Binding
diff -up gnome-desktop-sharp-2.20.1/gtkhtml/gtkhtml-sharp-3.14.pc.in.libdir gnome-desktop-sharp-2.20.1/gtkhtml/gtkhtml-sharp-3.14.pc.in
--- gnome-desktop-sharp-2.20.1/gtkhtml/gtkhtml-sharp-3.14.pc.in.libdir	2008-07-05 10:07:48.000000000 +0200
+++ gnome-desktop-sharp-2.20.1/gtkhtml/gtkhtml-sharp-3.14.pc.in	2008-07-05 10:08:13.000000000 +0200
@@ -1,8 +1,8 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 gapidir=${prefix}/share/gtkhtml-sharp/3.14
-assemblies_dir=${libdir}/mono/gtkhtml-sharp-3.14
+assemblies_dir=@libdir@/mono/gtkhtml-sharp-3.14
 
 Name: Gtkhtml#
 Description: Gtkhtml# - Gtkhtml .NET Binding
diff -up gnome-desktop-sharp-2.20.1/gtksourceview/gtksourceview2-sharp.pc.in.libdir gnome-desktop-sharp-2.20.1/gtksourceview/gtksourceview2-sharp.pc.in
--- gnome-desktop-sharp-2.20.1/gtksourceview/gtksourceview2-sharp.pc.in.libdir	2008-07-05 10:09:11.000000000 +0200
+++ gnome-desktop-sharp-2.20.1/gtksourceview/gtksourceview2-sharp.pc.in	2008-07-05 10:10:01.000000000 +0200
@@ -7,4 +7,4 @@ Name: GtkSourceView#
 Description: GtkSourceView# - gtksourceview .NET Binding
 Version: @VERSION@
 Requires: gtk-sharp-2.0
-Libs: -r:${prefix}/lib/mono/gtksourceview2-sharp-2.0/gtksourceview2-sharp.dll
+Libs: -r:@libdir@/mono/gtksourceview2-sharp-2.0/gtksourceview2-sharp.dll
diff -up gnome-desktop-sharp-2.20.1/nautilusburn/nautilusburn-sharp.pc.in.libdir gnome-desktop-sharp-2.20.1/nautilusburn/nautilusburn-sharp.pc.in
--- gnome-desktop-sharp-2.20.1/nautilusburn/nautilusburn-sharp.pc.in.libdir	2008-07-05 10:10:23.000000000 +0200
+++ gnome-desktop-sharp-2.20.1/nautilusburn/nautilusburn-sharp.pc.in	2008-07-05 10:12:34.000000000 +0200
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 gapidir=${prefix}/share/nautilusburn-sharp/2.20
 
 
@@ -8,4 +8,4 @@ Name: NautilusBurn#
 Description: NautilusBurn# - libnautilus-burn .NET Binding
 Version: @VERSION@
 Cflags: -I:${gapidir}/nautilusburn-api.xml
-Libs: -r:${libdir}/mono/nautilusburn-sharp-2.20/nautilusburn-sharp.dll
+Libs: -r:@libdir@/mono/nautilusburn-sharp-2.20/nautilusburn-sharp.dll
diff -up gnome-desktop-sharp-2.20.1/rsvg/rsvg2-sharp-2.0.pc.in.libdir gnome-desktop-sharp-2.20.1/rsvg/rsvg2-sharp-2.0.pc.in
--- gnome-desktop-sharp-2.20.1/rsvg/rsvg2-sharp-2.0.pc.in.libdir	2008-07-05 10:12:55.000000000 +0200
+++ gnome-desktop-sharp-2.20.1/rsvg/rsvg2-sharp-2.0.pc.in	2008-07-05 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 gapidir=${prefix}/share/rsvg2-sharp/2.0
 
 
@@ -8,4 +8,4 @@ Name: Rsvg#
 Description: Rsvg# - librsvg .NET Binding
 Version: @VERSION@
 Cflags: -I:${gapidir}/rsvg2-api.xml
-Libs: -r:${libdir}/mono/rsvg2-sharp-2.0/rsvg2-sharp.dll
+Libs: -r:@libdir@/mono/rsvg2-sharp-2.0/rsvg2-sharp.dll
diff -up gnome-desktop-sharp-2.20.1/vte/vte-sharp-0.16.pc.in.libdir gnome-desktop-sharp-2.20.1/vte/vte-sharp-0.16.pc.in
--- gnome-desktop-sharp-2.20.1/vte/vte-sharp-0.16.pc.in.libdir	2008-07-05 10:13:58.000000000 +0200
+++ gnome-desktop-sharp-2.20.1/vte/vte-sharp-0.16.pc.in	2008-07-05 10:14:16.000000000 +0200
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 gapidir=${prefix}/share/vte-sharp/0.16
 
 
@@ -9,4 +9,4 @@ Description: Vte# - libvte .NET Binding
 Version: @VERSION@
 Requires: gtk-sharp-2.0
 Cflags: -I:${gapidir}/vte-api.xml
-Libs: -r:${libdir}/mono/vte-sharp-0.16/vte-sharp.dll
+Libs: -r:@libdir@/mono/vte-sharp-0.16/vte-sharp.dll
diff -up gnome-desktop-sharp-2.20.1/wnck/wnck-sharp-1.0.pc.in.libdir gnome-desktop-sharp-2.20.1/wnck/wnck-sharp-1.0.pc.in
--- gnome-desktop-sharp-2.20.1/wnck/wnck-sharp-1.0.pc.in.libdir	2008-07-05 10:14:28.000000000 +0200
+++ gnome-desktop-sharp-2.20.1/wnck/wnck-sharp-1.0.pc.in	2008-07-05 10:15:20.000000000 +0200
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 gapidir=${prefix}/share/wnck-sharp/2.20
 assemblies_dir=${libdir}/mono/wnck-sharp-2.20
 


--- NEW FILE gnome-desktop-sharp.spec ---
Name:           gnome-desktop-sharp
Version:        2.20.1
Release:        2%{?dist}
Summary:        .NET language binding for mono

Group:          System Environment/Libraries
License:        LGPLv2
URL:            http://www.mono-project.com/GtkSharp
Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/2.20/%{name}-%{version}.tar.bz2
Patch0:         %{name}-%{version}-libdir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mono-devel, gtk2-devel, gtkhtml3-devel
BuildRequires:  librsvg2-devel, vte-devel, gnome-panel-devel
BuildRequires:  libwnck-devel, gtksourceview2-devel
BuildRequires:  nautilus-cd-burner-devel
BuildRequires:  gtk-sharp2-gapi >= 2.12.0
BuildRequires:  gtk-sharp2-devel >= 2.12.0

Provides:       gtksourceview2-sharp = 2:%{version}-%{release}
Obsoletes:      gtksourceview2-sharp < 2:2.20.1-2

#Mono only available on this following arch
ExclusiveArch:  %ix86 x86_64 ppc ia64 armv4l sparc alpha

%description
GnomeDesktop is a .NET language binding for assorted
GNOME libraries from the desktop release.

%package         devel
Summary:         Developing files for gnome-Desktop-sharp
Group:           Development/Libraries
Requires:        %{name} = %{version}-%{release}
Requires:        pkgconfig

Provides:        gtksourceview2-sharp-devel = 2:%{version}-%{release}
Obsoletes:       gtksourceview2-sharp-devel < 2:2.20.1-2

%description     devel
Package %{name}-devel provides development files for writing
%{name} applications.


%prep
%setup -q
%patch0 -p1 -b .libdir

# Fix GACUTIL FLAGS lib
sed -i 's|$(prefix)/lib|%{_libdir}|g' configure

# Fix permission
chmod 0644 HACKING

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libttol archive
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog AUTHORS README
%{_libdir}/*.so
%{_libdir}/mono/gac/gnomedesktop-sharp
%{_libdir}/mono/gac/nautilusburn-sharp
%{_libdir}/mono/gac/gtkhtml-sharp
%{_libdir}/mono/gac/gtksourceview2-sharp
%{_libdir}/mono/gac/rsvg2-sharp
%{_libdir}/mono/gac/vte-sharp
%{_libdir}/mono/gac/wnck-sharp
%{_libdir}/mono/gnomedesktop-sharp-2.20
%{_libdir}/mono/nautilusburn-sharp-2.20
%{_libdir}/mono/gtkhtml-sharp-3.14
%{_libdir}/mono/gtksourceview2-sharp-2.0
%{_libdir}/mono/rsvg2-sharp-2.0
%{_libdir}/mono/vte-sharp-0.16
%{_libdir}/mono/wnck-sharp-2.20
%{_datadir}/gnomedesktop-sharp
%{_datadir}/nautilusburn-sharp
%{_datadir}/gtkhtml-sharp
%{_datadir}/gtksourceview2-sharp
%{_datadir}/rsvg2-sharp
%{_datadir}/vte-sharp
%{_datadir}/wnck-sharp

%files           devel
%defattr(-,root,root,-)
%doc HACKING
%{_libdir}/pkgconfig/*.pc

%changelog
* Sat Jul 05 2008 Xavier Lamien <lxtnow[at]gmail.com> - 2.20.1-2
- Obsolete standalone package gtksourceview2-sharp.

* Sat Jul 05 2008 Xavier Lamien <lxtno[at]gmail.com> - 2.20.1-1
- Initial RPM Release.


--- NEW FILE import.log ---
gnome-desktop-sharp-2_20_1-2_fc10:F-9:gnome-desktop-sharp-2.20.1-2.fc10.src.rpm:1221209098


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop-sharp/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Jul 2008 18:12:03 -0000	1.1
+++ .cvsignore	12 Sep 2008 08:45:47 -0000	1.2
@@ -0,0 +1 @@
+gnome-desktop-sharp-2.20.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop-sharp/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Jul 2008 18:12:03 -0000	1.1
+++ sources	12 Sep 2008 08:45:47 -0000	1.2
@@ -0,0 +1 @@
+874cfcf8a6547476906b638355a0ed2f  gnome-desktop-sharp-2.20.1.tar.bz2



From mpg at fedoraproject.org  Fri Sep 12 08:51:19 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Fri, 12 Sep 2008 08:51:19 +0000 (UTC)
Subject: rpms/sugar-journal/OLPC-3 sugar-journal.spec,1.15,1.16
Message-ID: <20080912085119.868FE70131@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-journal/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10410

Modified Files:
	sugar-journal.spec 
Log Message:
* Fri Sep 12 2008 Marco Pesenti Gritti <mpg at redhat.com> - 99-4
- Remove dependecy on git-core. We are using a tarball.




Index: sugar-journal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-journal/OLPC-3/sugar-journal.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sugar-journal.spec	12 Sep 2008 08:35:14 -0000	1.15
+++ sugar-journal.spec	12 Sep 2008 08:50:49 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:           sugar-journal
 Version:        99
-Release:        3%{?dist}
+Release:        4%{?dist}
 #Release:        4.%{alphatag}%{?dist}
 Summary:        Journal for Sugar
 
@@ -17,7 +17,7 @@
 #Source0:        Journal-%{version}-git%{commitid}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python sugar-toolkit git-core gettext
+BuildRequires:  python sugar-toolkit gettext
 Requires:       sugar
 BuildArch:      noarch
 
@@ -48,6 +48,9 @@
 %{sugaractivitydir}/Journal.activity/
 
 %changelog
+* Fri Sep 12 2008 Marco Pesenti Gritti <mpg at redhat.com> - 99-4
+- Remove dependecy on git-core. We are using a tarball.
+
 * Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 99-3
 - Obvious typo in the files
 



From phuang at fedoraproject.org  Fri Sep 12 08:54:50 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 12 Sep 2008 08:54:50 +0000 (UTC)
Subject: rpms/ibus-anthy/devel .cvsignore, 1.9, 1.10 ibus-anthy.spec, 1.8,
	1.9 sources, 1.9, 1.10
Message-ID: <20080912085450.800EF70131@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-anthy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11696

Modified Files:
	.cvsignore ibus-anthy.spec sources 
Log Message:
Update to 0.1.1.20080912


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	1 Sep 2008 00:14:22 -0000	1.9
+++ .cvsignore	12 Sep 2008 08:54:20 -0000	1.10
@@ -1 +1 @@
-ibus-anthy-0.1.1.20080901.tar.gz
+ibus-anthy-0.1.1.20080912.tar.gz


Index: ibus-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/ibus-anthy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ibus-anthy.spec	1 Sep 2008 00:14:22 -0000	1.8
+++ ibus-anthy.spec	12 Sep 2008 08:54:20 -0000	1.9
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define mod_path ibus-0.1
 Name:       ibus-anthy
-Version:    0.1.1.20080901
+Version:    0.1.1.20080912
 Release:    1%{?dist}
 Summary:    The Anthy engine for IBus input platform
 License:    GPLv2+
@@ -55,6 +55,9 @@
 %{_datadir}/ibus/engine/anthy.engine
 
 %changelog
+* Fri Sep 12 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080912-1
+- Update to 0.1.1.20080912.
+
 * Mon Sep 01 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
 - Update to 0.1.1.20080901.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	1 Sep 2008 00:14:22 -0000	1.9
+++ sources	12 Sep 2008 08:54:20 -0000	1.10
@@ -1 +1 @@
-6e4273996b500ead4ed539d180a6c7af  ibus-anthy-0.1.1.20080901.tar.gz
+a476baf046e2db0290c30bcaee586c7d  ibus-anthy-0.1.1.20080912.tar.gz



From thias at fedoraproject.org  Fri Sep 12 08:57:20 2008
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri, 12 Sep 2008 08:57:20 +0000 (UTC)
Subject: rpms/pigment/devel .cvsignore, 1.8, 1.9 pigment.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <20080912085720.9100070131@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/pigment/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12979/devel

Modified Files:
	.cvsignore pigment.spec sources 
Log Message:
Update to 0.3.8.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pigment/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Jul 2008 12:46:21 -0000	1.8
+++ .cvsignore	12 Sep 2008 08:56:50 -0000	1.9
@@ -1 +1 @@
-pigment-0.3.7.tar.bz2
+pigment-0.3.8.tar.bz2


Index: pigment.spec
===================================================================
RCS file: /cvs/extras/rpms/pigment/devel/pigment.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pigment.spec	29 Jul 2008 12:46:21 -0000	1.9
+++ pigment.spec	12 Sep 2008 08:56:50 -0000	1.10
@@ -1,6 +1,6 @@
 Summary: Media Center Toolkit
 Name: pigment
-Version: 0.3.7
+Version: 0.3.8
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Applications/Multimedia
@@ -91,10 +91,14 @@
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/pigment-0.3.pc
 %{_libdir}/pkgconfig/pigment-gtk-0.3.pc
+%{_libdir}/pkgconfig/pigment-imaging-0.3.pc
 %doc %{_datadir}/gtk-doc/html/pigment/
 
 
 %changelog
+* Fri Sep 12 2008 Matthias Saou <http://freshrpms.net/> 0.3.8-1
+- Update to 0.3.8.
+
 * Tue Jul 29 2008 Matthias Saou <http://freshrpms.net/> 0.3.7-1
 - Update to 0.3.7.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pigment/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Jul 2008 12:46:21 -0000	1.8
+++ sources	12 Sep 2008 08:56:50 -0000	1.9
@@ -1 +1 @@
-ba850b6e6c3c9ed0d9bee910ad0bb1fb  pigment-0.3.7.tar.bz2
+d1a476ff3c8717e504cf89fbffbdbb4f  pigment-0.3.8.tar.bz2



From thias at fedoraproject.org  Fri Sep 12 09:03:12 2008
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri, 12 Sep 2008 09:03:12 +0000 (UTC)
Subject: rpms/pigment-python/devel .cvsignore, 1.5, 1.6 pigment-python.spec, 
	1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20080912090312.79FBC70131@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/pigment-python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15330

Modified Files:
	.cvsignore pigment-python.spec sources 
Log Message:
Update to 0.3.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pigment-python/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Jul 2008 13:00:44 -0000	1.5
+++ .cvsignore	12 Sep 2008 09:02:42 -0000	1.6
@@ -1 +1 @@
-pigment-python-0.3.5.tar.bz2
+pigment-python-0.3.6.tar.bz2


Index: pigment-python.spec
===================================================================
RCS file: /cvs/extras/rpms/pigment-python/devel/pigment-python.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pigment-python.spec	29 Jul 2008 13:00:44 -0000	1.6
+++ pigment-python.spec	12 Sep 2008 09:02:42 -0000	1.7
@@ -3,7 +3,7 @@
 
 Summary: Python bindings to the Pigment Media Center Toolkit
 Name: pigment-python
-Version: 0.3.5
+Version: 0.3.6
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Applications/Multimedia
@@ -12,9 +12,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: gstreamer-python
 Requires: pygtk2
-Requires: pigment >= 0.3.7
+Requires: pigment >= 0.3.8
 BuildRequires: glib2-devel
-BuildRequires: pigment-devel >= 0.3.7
+BuildRequires: pigment-devel >= 0.3.8
 BuildRequires: python-devel
 BuildRequires: pygtk2-devel
 BuildRequires: gstreamer-devel
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Matthias Saou <http://freshrpms.net/> 0.3.6-1
+- Update to 0.3.6.
+
 * Tue Jul 29 2008 Matthias Saou <http://freshrpms.net/> 0.3.5-1
 - Update to 0.3.5.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pigment-python/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Jul 2008 13:00:44 -0000	1.5
+++ sources	12 Sep 2008 09:02:42 -0000	1.6
@@ -1 +1 @@
-c668fd370c022e1dc1d2ce300732913d  pigment-python-0.3.5.tar.bz2
+73556451cabde413d16ec923c0c503b5  pigment-python-0.3.6.tar.bz2



From phuang at fedoraproject.org  Fri Sep 12 09:07:30 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 12 Sep 2008 09:07:30 +0000 (UTC)
Subject: rpms/ibus-anthy/F-9 .cvsignore, 1.7, 1.8 ibus-anthy.spec, 1.7,
	1.8 sources, 1.8, 1.9
Message-ID: <20080912090730.A1D0B70131@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-anthy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16990

Modified Files:
	.cvsignore ibus-anthy.spec sources 
Log Message:
Update to 0.1.1.20080912


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Sep 2008 00:25:46 -0000	1.7
+++ .cvsignore	12 Sep 2008 09:07:00 -0000	1.8
@@ -1 +1 @@
-ibus-anthy-0.1.1.20080901.tar.gz
+ibus-anthy-0.1.1.20080912.tar.gz


Index: ibus-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/F-9/ibus-anthy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ibus-anthy.spec	1 Sep 2008 00:25:46 -0000	1.7
+++ ibus-anthy.spec	12 Sep 2008 09:07:00 -0000	1.8
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define mod_path ibus-0.1
 Name:       ibus-anthy
-Version:    0.1.1.20080901
+Version:    0.1.1.20080912
 Release:    1%{?dist}
 Summary:    The Anthy engine for IBus input platform
 License:    GPLv2+
@@ -55,6 +55,9 @@
 %{_datadir}/ibus/engine/anthy.engine
 
 %changelog
+* Fri Sep 12 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080912-1
+- Update to 0.1.1.20080912.
+
 * Mon Sep 01 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
 - Update to 0.1.1.20080901.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Sep 2008 00:25:46 -0000	1.8
+++ sources	12 Sep 2008 09:07:00 -0000	1.9
@@ -1 +1 @@
-6e4273996b500ead4ed539d180a6c7af  ibus-anthy-0.1.1.20080901.tar.gz
+a476baf046e2db0290c30bcaee586c7d  ibus-anthy-0.1.1.20080912.tar.gz



From rezso at fedoraproject.org  Fri Sep 12 09:12:49 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Fri, 12 Sep 2008 09:12:49 +0000 (UTC)
Subject: rpms/iverilog/devel import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 iverilog.spec, 1.7, 1.8 sources, 1.7, 1.8
Message-ID: <20080912091249.A2FF970131@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/iverilog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18495/devel

Modified Files:
	.cvsignore iverilog.spec sources 
Added Files:
	import.log 
Log Message:
- new snapshot release upstream.
 ----------------------------------------------------------------------
 Modified Files:
 	devel/.cvsignore devel/iverilog.spec devel/sources 
 Added Files:
 	devel/import.log 
 ----------------------------------------------------------------------



--- NEW FILE import.log ---
iverilog-0_9_20080905-1_fc10:HEAD:iverilog-0.9.20080905-1.fc10.src.rpm:1221210397


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 May 2008 11:26:24 -0000	1.7
+++ .cvsignore	12 Sep 2008 09:12:19 -0000	1.8
@@ -1 +1 @@
-verilog-20080429.tar.gz
+verilog-20080905.tar.gz


Index: iverilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/devel/iverilog.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- iverilog.spec	26 May 2008 11:26:24 -0000	1.7
+++ iverilog.spec	12 Sep 2008 09:12:19 -0000	1.8
@@ -1,4 +1,4 @@
-%define      snapshot 20080429
+%define      snapshot 20080905
 
 Name:        iverilog
 Version:     0.9.%{snapshot}
@@ -62,7 +62,7 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING README.txt BUGS.txt QUICK_START.txt ieee1364-notes.txt
-%doc swift.txt netlist.txt t-dll.txt vpi.txt xnf.txt tgt-fpga/fpga.txt
+%doc swift.txt netlist.txt t-dll.txt vpi.txt tgt-fpga/fpga.txt
 %doc cadpli/cadpli.txt xilinx-hint.txt examples/*
 %{_bindir}/*
 %dir %{_libdir}/ivl
@@ -75,6 +75,9 @@
 %exclude %{_libdir}/*.a
 
 %changelog
+* Fri Sep 12 2008 Balint Cristian <rezso at rdsor.ro> 0.9.20080905-1
+- new snapshot release upstream.
+
 * Mon May 26 2008 Balint Cristian <rezso at rdsor.ro> 0.9.20080429-1
 - new snapshot release upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 May 2008 11:26:24 -0000	1.7
+++ sources	12 Sep 2008 09:12:19 -0000	1.8
@@ -1 +1 @@
-c64c75fde56f3eb2eac5712736f2150d  verilog-20080429.tar.gz
+6ed46d551034982fbca2fc33af58cc63  verilog-20080905.tar.gz



From atorkhov at fedoraproject.org  Fri Sep 12 09:26:46 2008
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Fri, 12 Sep 2008 09:26:46 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.102,1.103
Message-ID: <20080912092646.B24F670131@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23687

Modified Files:
	comps-f10.xml.in 
Log Message:
Add ember.


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- comps-f10.xml.in	11 Sep 2008 19:23:22 -0000	1.102
+++ comps-f10.xml.in	12 Sep 2008 09:26:15 -0000	1.103
@@ -1599,6 +1599,7 @@
       <packagereq type="optional">dgae</packagereq>
       <packagereq type="optional">duel3</packagereq>
       <packagereq type="optional">egoboo</packagereq>
+      <packagereq type="optional">ember</packagereq>
       <packagereq type="optional">enigma</packagereq>
       <packagereq type="optional">escape</packagereq>
       <packagereq type="optional">extremetuxracer</packagereq>



From hadess at fedoraproject.org  Fri Sep 12 09:34:35 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 12 Sep 2008 09:34:35 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.2, 1.3 bluetooth.init, 1.1,
	1.2 bluez.spec, 1.1, 1.2 sources, 1.2, 1.3 bluez-4.4-input.patch,
	1.1, NONE import.log, 1.1, NONE
Message-ID: <20080912093435.9473F70131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26265

Modified Files:
	.cvsignore bluetooth.init bluez.spec sources 
Removed Files:
	bluez-4.4-input.patch import.log 
Log Message:
* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 4.5-1
- Update to 4.5
- Fix initscript to actually start bluetoothd by hand
- Add chkconfig information to the initscript



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Sep 2008 02:10:23 -0000	1.2
+++ .cvsignore	12 Sep 2008 09:34:04 -0000	1.3
@@ -1 +1 @@
-bluez-4.4.tar.gz
+bluez-4.5.tar.gz


Index: bluetooth.init
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluetooth.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bluetooth.init	11 Sep 2008 02:10:23 -0000	1.1
+++ bluetooth.init	12 Sep 2008 09:34:05 -0000	1.2
@@ -1,5 +1,9 @@
 #!/bin/sh
-
+#
+# chkconfig: 345 50 83
+# description: Bluetooth services for service discovery, authentication, \
+#	       Human Interface Devices, etc.
+#
 ### BEGIN INIT INFO
 # Required-Start: $syslog messagebus
 # Short-Description: Bluetooth services
@@ -15,6 +19,9 @@
 start()
 {
 	echo -n $"Starting Bluetooth services:"
+	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 ""
@@ -25,7 +32,10 @@
 {
 	echo -n "Stopping Bluetooth services:"
 	[ "$HID2HCI_UNDO" = "true" ] && hid2hci --tohid > /dev/null 2>&1 || :
+	killproc bluetoothd
+	RETVAL=$?
 	rm -f /var/lock/subsys/bluetooth
+	rm -f /var/lock/subsys/bluetoothd
 	echo ""
 	return $RETVAL
 }
@@ -45,7 +55,7 @@
         [ -e /var/lock/subsys/bluetooth ] && (stop; start)
         ;;
   status)
-        status hcid
+        status bluetoothd
 	RETVAL=$?
         ;;
   *)


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bluez.spec	11 Sep 2008 02:10:24 -0000	1.1
+++ bluez.spec	12 Sep 2008 09:34:05 -0000	1.2
@@ -1,14 +1,13 @@
 Summary: Bluetooth libraries and utilities
 Name: bluez
-Version: 4.4
-Release: 2%{?dist}
+Version: 4.5
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
 Source1: bluetooth.init
 Source2: bluetooth.conf
 Patch1: bluez-utils-oui-usage.patch
-Patch2: bluez-4.4-input.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -94,7 +93,6 @@
 
 %setup -q
 %patch1 -p0 -b .oui
-%patch2 -p1 -b .input
 
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
@@ -189,6 +187,11 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 4.5-1
+- Update to 4.5
+- Fix initscript to actually start bluetoothd by hand
+- Add chkconfig information to the initscript
+
 * Tue Sep 09 2008 - David Woodhouse <David.Woodhouse at intel.com> - 4.4-2
 - Fix rpmlint problems
 - Fix input device handling


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Sep 2008 02:10:24 -0000	1.2
+++ sources	12 Sep 2008 09:34:05 -0000	1.3
@@ -1 +1 @@
-0fd526ecea7fa7fb53298e8f335526c6  bluez-4.4.tar.gz
+97d4dfad90ed924952d013bd0b03bedd  bluez-4.5.tar.gz


--- bluez-4.4-input.patch DELETED ---


--- import.log DELETED ---



From hadess at fedoraproject.org  Fri Sep 12 09:42:35 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 12 Sep 2008 09:42:35 +0000 (UTC)
Subject: rpms/bluez-utils/F-9 bluetooth.init, 1.9, 1.10 bluez-utils.spec,
	1.105, 1.106
Message-ID: <20080912094235.CC72270131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28736

Modified Files:
	bluetooth.init bluez-utils.spec 
Log Message:
* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 3.35-5
- Re-add chkconfig code to the initscript (#448888)



Index: bluetooth.init
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/F-9/bluetooth.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bluetooth.init	5 Oct 2007 12:20:18 -0000	1.9
+++ bluetooth.init	12 Sep 2008 09:42:05 -0000	1.10
@@ -1,5 +1,9 @@
 #!/bin/sh
-
+#
+# chkconfig: 345 50 83
+# description: Bluetooth services for service discovery, authentication, \
+#	       Human Interface Devices, etc.
+#
 ### BEGIN INIT INFO
 # Required-Start: $syslog messagebus
 # Default-Start: 2 3 4 5


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/F-9/bluez-utils.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- bluez-utils.spec	11 Aug 2008 15:47:13 -0000	1.105
+++ bluez-utils.spec	12 Sep 2008 09:42:05 -0000	1.106
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
 Version: 3.35
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -158,6 +158,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 3.35-5
+- Re-add chkconfig code to the initscript (#448888)
+
 * Mon Aug 11 2008 - Bastien Nocera <bnocera at redhat.com> - 3.35-4
 - Re-add dund (#458680)
 



From than at fedoraproject.org  Fri Sep 12 09:54:23 2008
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 12 Sep 2008 09:54:23 +0000 (UTC)
Subject: rpms/kde-plasma-lancelot/F-9 kde-plasma-lancelot.spec,1.4,1.5
Message-ID: <20080912095423.5B37B70131@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-plasma-lancelot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32664

Modified Files:
	kde-plasma-lancelot.spec 
Log Message:
fix rpm file list



Index: kde-plasma-lancelot.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-plasma-lancelot/F-9/kde-plasma-lancelot.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kde-plasma-lancelot.spec	11 Sep 2008 12:24:30 -0000	1.4
+++ kde-plasma-lancelot.spec	12 Sep 2008 09:53:52 -0000	1.5
@@ -50,7 +50,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc TODO COPYING
+%doc COPYING
 %{_bindir}/lancelot
 %{_kde4_libdir}/kde4/plasma_applet_lancelot_launcher.so
 %{_kde4_libdir}/kde4/plasma_applet_lancelot_part.so



From rezso at fedoraproject.org  Fri Sep 12 10:19:44 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Fri, 12 Sep 2008 10:19:44 +0000 (UTC)
Subject: rpms/iverilog/F-9 import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 iverilog.spec, 1.7, 1.8 sources, 1.7, 1.8
Message-ID: <20080912101944.D8F9470131@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/iverilog/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8571/F-9

Modified Files:
	.cvsignore iverilog.spec sources 
Added Files:
	import.log 
Log Message:
- new snapshot release upstream.
 ----------------------------------------------------------------------
 Modified Files:
 	F-9/.cvsignore F-9/iverilog.spec F-9/sources 
 Added Files:
 	F-9/import.log 
 ----------------------------------------------------------------------



--- NEW FILE import.log ---
iverilog-0_9_20080905-1_fc10:F-9:iverilog-0.9.20080905-1.fc10.src.rpm:1221214723


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 May 2008 11:20:29 -0000	1.7
+++ .cvsignore	12 Sep 2008 10:19:14 -0000	1.8
@@ -1 +1 @@
-verilog-20080429.tar.gz
+verilog-20080905.tar.gz


Index: iverilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-9/iverilog.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- iverilog.spec	26 May 2008 11:20:29 -0000	1.7
+++ iverilog.spec	12 Sep 2008 10:19:14 -0000	1.8
@@ -1,4 +1,4 @@
-%define      snapshot 20080429
+%define      snapshot 20080905
 
 Name:        iverilog
 Version:     0.9.%{snapshot}
@@ -62,7 +62,7 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING README.txt BUGS.txt QUICK_START.txt ieee1364-notes.txt
-%doc swift.txt netlist.txt t-dll.txt vpi.txt xnf.txt tgt-fpga/fpga.txt
+%doc swift.txt netlist.txt t-dll.txt vpi.txt tgt-fpga/fpga.txt
 %doc cadpli/cadpli.txt xilinx-hint.txt examples/*
 %{_bindir}/*
 %dir %{_libdir}/ivl
@@ -75,6 +75,9 @@
 %exclude %{_libdir}/*.a
 
 %changelog
+* Fri Sep 12 2008 Balint Cristian <rezso at rdsor.ro> 0.9.20080905-1
+- new snapshot release upstream.
+
 * Mon May 26 2008 Balint Cristian <rezso at rdsor.ro> 0.9.20080429-1
 - new snapshot release upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 May 2008 11:20:29 -0000	1.7
+++ sources	12 Sep 2008 10:19:14 -0000	1.8
@@ -1 +1 @@
-c64c75fde56f3eb2eac5712736f2150d  verilog-20080429.tar.gz
+6ed46d551034982fbca2fc33af58cc63  verilog-20080905.tar.gz



From pkgdb at fedoraproject.org  Fri Sep 12 10:25:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 10:25:13 +0000
Subject: [pkgdb] anyremote2html was added for anyremote
Message-ID: <20080912102513.17ED1208D9A@bastion.fedora.phx.redhat.com>

huzaifas has added Package anyremote2html with summary WEB interface for anyRemote
huzaifas has approved Package anyremote2html
huzaifas has added a Fedora devel branch for anyremote2html with an owner of anyremote
huzaifas has approved anyremote2html in Fedora devel
huzaifas has approved Package anyremote2html
huzaifas has set commit to Approved for packager on anyremote2html (Fedora devel)
huzaifas has set build to Approved for packager on anyremote2html (Fedora devel)
huzaifas has set checkout to Approved for packager on anyremote2html (Fedora devel)
huzaifas has set commit to Approved for uberpackager on anyremote2html (Fedora devel)
huzaifas has set build to Approved for uberpackager on anyremote2html (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on anyremote2html (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anyremote2html



From pkgdb at fedoraproject.org  Fri Sep 12 10:25:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 10:25:13 +0000
Subject: [pkgdb] anyremote2html (Fedora, 9) updated by huzaifas
Message-ID: <20080912102514.205BA208D9E@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for anyremote2html
huzaifas has set commit to Approved for uberpackager on anyremote2html (Fedora 9)
huzaifas has set build to Approved for uberpackager on anyremote2html (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on anyremote2html (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anyremote2html



From pkgdb at fedoraproject.org  Fri Sep 12 10:25:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 10:25:13 +0000
Subject: [pkgdb] anyremote2html (Fedora, 8) updated by huzaifas
Message-ID: <20080912102514.31C37208DA1@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for anyremote2html
huzaifas has set commit to Approved for uberpackager on anyremote2html (Fedora 8)
huzaifas has set build to Approved for uberpackager on anyremote2html (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on anyremote2html (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anyremote2html



From huzaifas at fedoraproject.org  Fri Sep 12 10:25:53 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 10:25:53 +0000 (UTC)
Subject: rpms/anyremote2html/devel - New directory
Message-ID: <20080912102553.6EAE170134@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/anyremote2html/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsm10889/rpms/anyremote2html/devel

Log Message:
Directory /cvs/extras/rpms/anyremote2html/devel added to the repository




From huzaifas at fedoraproject.org  Fri Sep 12 10:25:53 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 10:25:53 +0000 (UTC)
Subject: rpms/anyremote2html - New directory
Message-ID: <20080912102553.31F5870131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/anyremote2html
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsm10889/rpms/anyremote2html

Log Message:
Directory /cvs/extras/rpms/anyremote2html added to the repository




From huzaifas at fedoraproject.org  Fri Sep 12 10:25:54 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 10:25:54 +0000 (UTC)
Subject: rpms/anyremote2html Makefile,NONE,1.1
Message-ID: <20080912102554.9318E70131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/anyremote2html
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsm10889/rpms/anyremote2html

Added Files:
	Makefile 
Log Message:
Setup of module anyremote2html


--- NEW FILE Makefile ---
# Top level Makefile for module anyremote2html
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep 12 10:25:55 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 12 Sep 2008 10:25:55 +0000 (UTC)
Subject: rpms/anyremote2html/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080912102555.224B470131@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/anyremote2html/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsm10889/rpms/anyremote2html/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module anyremote2html


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: anyremote2html
# $Id: Makefile,v 1.1 2008/09/12 10:25:54 huzaifas Exp $
NAME := anyremote2html
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From rezso at fedoraproject.org  Fri Sep 12 10:34:34 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Fri, 12 Sep 2008 10:34:34 +0000 (UTC)
Subject: rpms/iverilog/F-8 import.log, NONE, 1.1 .cvsignore, 1.5,
	1.6 iverilog.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20080912103434.74EAF70131@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/iverilog/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13504/F-8

Modified Files:
	.cvsignore iverilog.spec sources 
Added Files:
	import.log 
Log Message:
- new snapshot release upstream.
 ----------------------------------------------------------------------
 Modified Files:
 	F-8/.cvsignore F-8/iverilog.spec F-8/sources 
 Added Files:
 	F-8/import.log 
 ----------------------------------------------------------------------



--- NEW FILE import.log ---
iverilog-0_9_20080905-1_fc10:F-8:iverilog-0.9.20080905-1.fc10.src.rpm:1221215244


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Jun 2007 10:39:28 -0000	1.5
+++ .cvsignore	12 Sep 2008 10:34:04 -0000	1.6
@@ -1 +1 @@
-verilog-20070608.tar.gz
+verilog-20080905.tar.gz


Index: iverilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-8/iverilog.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- iverilog.spec	10 Jun 2007 10:39:28 -0000	1.4
+++ iverilog.spec	12 Sep 2008 10:34:04 -0000	1.5
@@ -1,11 +1,11 @@
-%define      snapshot 20070608
+%define      snapshot 20080905
 
 Name:        iverilog
 Version:     0.9.%{snapshot}
 Release:     1%{?dist}
 Summary:     Icarus Verilog is a verilog compiler and simulator
 Group:       Applications/Engineering
-License:     GPL
+License:     GPLv2
 URL:         http://www.icarus.com/eda/verilog/index.html
 Source0:     ftp://icarus.com/pub/eda/verilog/snapshots/verilog-%{snapshot}.tar.gz
 Patch0:      %{name}-pagesize.patch
@@ -53,6 +53,8 @@
              vpidir=%{buildroot}%{_libdir}/ivl/ \
              INSTALL="install -p" \
 install
+%check
+make check
 
 %clean
 rm -rf %{buildroot}
@@ -60,7 +62,7 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING README.txt BUGS.txt QUICK_START.txt ieee1364-notes.txt
-%doc swift.txt netlist.txt t-dll.txt vpi.txt xnf.txt tgt-fpga/fpga.txt
+%doc swift.txt netlist.txt t-dll.txt vpi.txt tgt-fpga/fpga.txt
 %doc cadpli/cadpli.txt xilinx-hint.txt examples/*
 %{_bindir}/*
 %dir %{_libdir}/ivl
@@ -73,6 +75,19 @@
 %exclude %{_libdir}/*.a
 
 %changelog
+* Fri Sep 12 2008 Balint Cristian <rezso at rdsor.ro> 0.9.20080905-1
+- new snapshot release upstream.
+
+* Mon May 26 2008 Balint Cristian <rezso at rdsor.ro> 0.9.20080429-1
+- new snapshot release upstream.
+
+* Fri Mar 28 2008 Balint Cristian <rezso at rdsor.ro> 0.9.20080314-1
+- new snapshot release upstream.
+- add check section for some tests
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.20070608-2
+- Autorebuild for GCC 4.3
+
 * Sun Jun 10 2007 Balint Cristian <cbalint at redhat.com> 0.9.20070608-1
 - new snapshot release upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Jun 2007 10:39:28 -0000	1.5
+++ sources	12 Sep 2008 10:34:04 -0000	1.6
@@ -1 +1 @@
-c7ee9575fb19daa6d276fc361af1ef7b  verilog-20070608.tar.gz
+6ed46d551034982fbca2fc33af58cc63  verilog-20080905.tar.gz



From varekova at fedoraproject.org  Fri Sep 12 12:42:52 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Fri, 12 Sep 2008 12:42:52 +0000 (UTC)
Subject: rpms/man/devel man.spec,1.69,1.70
Message-ID: <20080912124252.6BCEA70131@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19082

Modified Files:
	man.spec 
Log Message:
- Resolves: #461775
  man needs lzma



Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- man.spec	2 Sep 2008 06:42:27 -0000	1.69
+++ man.spec	12 Sep 2008 12:42:21 -0000	1.70
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -38,7 +38,7 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: coreutils
 Requires: less, groff >= 1.18, nroff-i18n, findutils, mktemp >= 1.5-2.1.5x
-Requires: bzip2, gzip, rpm
+Requires: bzip2, gzip, rpm, lzma
 BuildRequires: less, groff
 
 %description
@@ -263,6 +263,10 @@
 
 
 %changelog
+* Fri Sep 12 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-10
+- Resolves: #461775
+  man needs lzma
+
 * Mon Sep  1 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-9
 - update patches
 



From avesh at fedoraproject.org  Fri Sep 12 13:00:51 2008
From: avesh at fedoraproject.org (avesh agarwal)
Date: Fri, 12 Sep 2008 13:00:51 +0000 (UTC)
Subject: rpms/openswan/devel openswan-2.6.16-initscript-correction.patch,
	NONE, 1.1 openswan.spec, 1.65, 1.66
Message-ID: <20080912130051.09F4A70134@cvs1.fedora.phx.redhat.com>

Author: avesh

Update of /cvs/pkgs/rpms/openswan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22748

Modified Files:
	openswan.spec 
Added Files:
	openswan-2.6.16-initscript-correction.patch 
Log Message:
* Tue Sep 09 2008 Avesh Agarwal <avagarwa at redhat.com> - 2.6.16-1
- new upstream release


openswan-2.6.16-initscript-correction.patch:

--- NEW FILE openswan-2.6.16-initscript-correction.patch ---
diff -ur openswan-2.6.16.orig/programs/setup/setup.in openswan-2.6.16/programs/setup/setup.in
--- openswan-2.6.16.orig/programs/setup/setup.in	2008-09-09 16:22:47.000000000 -0400
+++ openswan-2.6.16/programs/setup/setup.in	2008-09-10 15:02:33.000000000 -0400
@@ -26,7 +26,7 @@
 # times of NFS filesystem startup/shutdown).  Startup is after startup of
 # syslog and pcmcia support; shutdown is just before shutdown of syslog.
 #
-# chkconfig: 2345 47 76
+# chkconfig: - 47 76
 # description: IPsec provides encrypted and authenticated communications; \
 # KLIPS is the kernel half of it, Pluto is the user-level management daemon.
 


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- openswan.spec	9 Sep 2008 21:02:30 -0000	1.65
+++ openswan.spec	12 Sep 2008 13:00:20 -0000	1.66
@@ -13,6 +13,7 @@
 Patch2: openswan-2.6-relpath.patch
 Patch3: openswan-2.6-noxmlto.patch
 Patch4: openswan-2.6-selinux.patch
+Patch5: openswan-2.6.16-initscript-correction.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,6 +58,7 @@
 %patch2 -p1 -b .relpath
 %patch3 -p1 -b .noxmlto
 %patch4 -p1 -b .selinux
+%patch5 -p1
 
 %build
 



From pkgdb at fedoraproject.org  Fri Sep 12 13:02:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 13:02:10 +0000
Subject: [pkgdb] mpage ownership updated
Message-ID: <20080912130210.522B3208D29@bastion.fedora.phx.redhat.com>

Package mpage in Fedora devel was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mpage



From stransky at fedoraproject.org  Fri Sep 12 13:02:44 2008
From: stransky at fedoraproject.org (Martin Stransky)
Date: Fri, 12 Sep 2008 13:02:44 +0000 (UTC)
Subject: rpms/xulrunner/devel xulrunner.spec,1.131,1.132
Message-ID: <20080912130244.B35CA70131@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23240

Modified Files:
	xulrunner.spec 
Log Message:
fixed 430814 -  broken URL in xulrunner package description


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- xulrunner.spec	23 Jul 2008 04:59:37 -0000	1.131
+++ xulrunner.spec	12 Sep 2008 13:02:14 -0000	1.132
@@ -9,7 +9,7 @@
 Name:           xulrunner
 Version:        1.9.0.1
 Release:        2%{?dist}
-URL:            http://www.mozilla.org/projects/xulrunner/
+URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 Source0:        xulrunner-%{version}-source.tar.bz2



From pkgdb at fedoraproject.org  Fri Sep 12 13:03:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 13:03:40 +0000
Subject: [pkgdb] mpage ownership updated
Message-ID: <20080912130340.F308C208D98@bastion.fedora.phx.redhat.com>

Package mpage in Fedora devel is now owned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mpage



From stransky at fedoraproject.org  Fri Sep 12 13:03:55 2008
From: stransky at fedoraproject.org (Martin Stransky)
Date: Fri, 12 Sep 2008 13:03:55 +0000 (UTC)
Subject: rpms/xulrunner/F-9 xulrunner.spec,1.129,1.130
Message-ID: <20080912130355.692A970131@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23547

Modified Files:
	xulrunner.spec 
Log Message:
fixed 430814 -  broken URL in xulrunner package description


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-9/xulrunner.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- xulrunner.spec	16 Jul 2008 19:18:54 -0000	1.129
+++ xulrunner.spec	12 Sep 2008 13:03:25 -0000	1.130
@@ -9,7 +9,7 @@
 Name:           xulrunner
 Version:        1.9.0.1
 Release:        1%{?dist}
-URL:            http://www.mozilla.org/projects/xulrunner/
+URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 Source0:        xulrunner-%{version}-source.tar.bz2



From ruben at fedoraproject.org  Fri Sep 12 13:06:50 2008
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Fri, 12 Sep 2008 13:06:50 +0000 (UTC)
Subject: rpms/pdns/devel pdns-bz461768.patch,NONE,1.1 pdns.spec,1.11,1.12
Message-ID: <20080912130650.10D1C70131@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/pdns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24100

Modified Files:
	pdns.spec 
Added Files:
	pdns-bz461768.patch 
Log Message:
* Fri Sep 12 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21.1-2
- Fix handling of AAAA records (bz #461768)


pdns-bz461768.patch:

--- NEW FILE pdns-bz461768.patch ---
Index: /trunk/pdns/pdns/packethandler.cc
===================================================================
--- /trunk/pdns/pdns/packethandler.cc (revision 1079)
+++ /trunk/pdns/pdns/packethandler.cc (revision 1081)
@@ -399,6 +399,8 @@
       }
     }
-    if(hits && !found && !rfound && shortcut ) // we found matching qnames but not a qtype
+    if(hits && !found && !rfound && shortcut ) { // we found matching qnames but not a qtype
+      DLOG(L<<"Found matching qname, but not the qtype"<<endl);
       return 2;
+    }
 
     if(rfound)
@@ -654,4 +656,5 @@
 
     if(mret==2) { // there is some data, but not of the correct type
+      r->clearRecords();
       DLOG(L<<"There is some data, but not of the correct type, adding SOA for NXRECORDSET"<<endl);
       SOAData sd;
@@ -696,5 +699,4 @@
       }
     }
-
     noSameLevelNS=true;
 
@@ -739,5 +741,5 @@
     // not found yet, try wildcards (we only try here in case of recursion - we should check before we hand off)
 
-    if(p->d.rd && d_doRecursion && d_doWildcards) { 
+    if(mret != 2 && p->d.rd && d_doRecursion && d_doWildcards) { 
       int res=doWildcardRecords(p,r,target);
       if(res) { // had a result


Index: pdns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/devel/pdns.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pdns.spec	6 Aug 2008 13:14:27 -0000	1.11
+++ pdns.spec	12 Sep 2008 13:06:19 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
 Version:	2.9.21.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		System Environment/Daemons
 License:	GPLv2
@@ -11,6 +11,7 @@
 Patch0:		%{name}-fixinit.patch
 Patch1:		%{name}-avoid-version.patch
 Patch2:		%{name}-gcc43.patch
+Patch3:         %{name}-bz461768.patch
 
 Requires(post):	%{_sbindir}/useradd, /sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig
@@ -84,6 +85,7 @@
 %patch0 -p1 -b .fixinit
 %patch1 -p1 -b .avoid-version
 %patch2 -p1
+%patch3 -p3
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}"
@@ -183,6 +185,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21.1-2
+- Fix handling of AAAA records (bz #461768)
+
 * Wed Aug 06 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21.1-1
 - CVE-2008-3337
 



From avesh at fedoraproject.org  Fri Sep 12 13:22:20 2008
From: avesh at fedoraproject.org (avesh agarwal)
Date: Fri, 12 Sep 2008 13:22:20 +0000 (UTC)
Subject: rpms/openswan/devel openswan.spec,1.66,1.67
Message-ID: <20080912132221.061D070131@cvs1.fedora.phx.redhat.com>

Author: avesh

Update of /cvs/pkgs/rpms/openswan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26527

Modified Files:
	openswan.spec 
Log Message:
* Tue Sep 12 2008 Avesh Agarwal <avagarwa at redhat.com> - 2.6.16-2
- added initscript patch to prevent openswan service start by default



Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- openswan.spec	12 Sep 2008 13:00:20 -0000	1.66
+++ openswan.spec	12 Sep 2008 13:21:50 -0000	1.67
@@ -2,7 +2,7 @@
 Name: openswan
 Version: 2.6.16
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Url: http://www.openswan.org/
 Source: openswan-%{version}.tar.gz
@@ -150,6 +150,9 @@
 chkconfig --add ipsec || :
 
 %changelog
+* Tue Sep 12 2008 Avesh Agarwal <avagarwa at redhat.com> - 2.6.16-2
+- added initscript patch to prevent openswan service start by default
+
 * Tue Sep 09 2008 Avesh Agarwal <avagarwa at redhat.com> - 2.6.16-1
 - new upstream release
 



From rdieter at fedoraproject.org  Fri Sep 12 13:32:36 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 12 Sep 2008 13:32:36 +0000 (UTC)
Subject: rpms/lyx/devel .cvsignore, 1.30, 1.31 lyx.spec, 1.76, 1.77 sources, 
	1.28, 1.29
Message-ID: <20080912133236.3621D70131@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28474

Modified Files:
	.cvsignore lyx.spec sources 
Log Message:
* Fri Sep 12 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-0.7.rc2
- lyx-1.6.0rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	7 Aug 2008 03:35:38 -0000	1.30
+++ .cvsignore	12 Sep 2008 13:32:05 -0000	1.31
@@ -1 +1 @@
-lyx-1.6.0rc1.tar.bz2
+lyx-1.6.0rc2.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- lyx.spec	7 Aug 2008 03:35:38 -0000	1.76
+++ lyx.spec	12 Sep 2008 13:32:05 -0000	1.77
@@ -2,8 +2,8 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.6.0
-%define  pre rc1 
-Release: 0.6.%{pre}%{?dist}
+%define  pre rc2
+Release: 0.7.%{pre}%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -184,6 +184,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-0.7.rc2
+- lyx-1.6.0rc2
+
 * Wed Aug 06 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-0.6.rc1
 - lyx-1.6.0rc1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	7 Aug 2008 03:35:38 -0000	1.28
+++ sources	12 Sep 2008 13:32:05 -0000	1.29
@@ -1 +1 @@
-0b4f1e9dbf9f5acae9ea7582963ef034  lyx-1.6.0rc1.tar.bz2
+359825f1c873b23d1693b1afe8342165  lyx-1.6.0rc2.tar.bz2



From ruben at fedoraproject.org  Fri Sep 12 13:33:02 2008
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Fri, 12 Sep 2008 13:33:02 +0000 (UTC)
Subject: rpms/pdns/F-9 pdns-bz461768.patch,NONE,1.1 pdns.spec,1.11,1.12
Message-ID: <20080912133302.6FD9F70131@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/pdns/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28673

Modified Files:
	pdns.spec 
Added Files:
	pdns-bz461768.patch 
Log Message:
* Fri Sep 12 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21.1-2
- Fix handling of AAAA records (bz #461768)


pdns-bz461768.patch:

--- NEW FILE pdns-bz461768.patch ---
Index: /trunk/pdns/pdns/packethandler.cc
===================================================================
--- /trunk/pdns/pdns/packethandler.cc (revision 1079)
+++ /trunk/pdns/pdns/packethandler.cc (revision 1081)
@@ -399,6 +399,8 @@
       }
     }
-    if(hits && !found && !rfound && shortcut ) // we found matching qnames but not a qtype
+    if(hits && !found && !rfound && shortcut ) { // we found matching qnames but not a qtype
+      DLOG(L<<"Found matching qname, but not the qtype"<<endl);
       return 2;
+    }
 
     if(rfound)
@@ -654,4 +656,5 @@
 
     if(mret==2) { // there is some data, but not of the correct type
+      r->clearRecords();
       DLOG(L<<"There is some data, but not of the correct type, adding SOA for NXRECORDSET"<<endl);
       SOAData sd;
@@ -696,5 +699,4 @@
       }
     }
-
     noSameLevelNS=true;
 
@@ -739,5 +741,5 @@
     // not found yet, try wildcards (we only try here in case of recursion - we should check before we hand off)
 
-    if(p->d.rd && d_doRecursion && d_doWildcards) { 
+    if(mret != 2 && p->d.rd && d_doRecursion && d_doWildcards) { 
       int res=doWildcardRecords(p,r,target);
       if(res) { // had a result


Index: pdns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/F-9/pdns.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pdns.spec	6 Aug 2008 13:25:50 -0000	1.11
+++ pdns.spec	12 Sep 2008 13:32:32 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
 Version:	2.9.21.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		System Environment/Daemons
 License:	GPLv2
@@ -11,6 +11,7 @@
 Patch0:		%{name}-fixinit.patch
 Patch1:		%{name}-avoid-version.patch
 Patch2:		%{name}-gcc43.patch
+Patch3:         %{name}-bz461768.patch
 
 Requires(post):	%{_sbindir}/useradd, /sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig
@@ -84,6 +85,7 @@
 %patch0 -p1 -b .fixinit
 %patch1 -p1 -b .avoid-version
 %patch2 -p1
+%patch3 -p3
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}"
@@ -183,6 +185,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21.1-2
+- Fix handling of AAAA records (bz #461768)
+
 * Wed Aug 06 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21.1-1
 - CVE-2008-3337
 



From bpepple at fedoraproject.org  Fri Sep 12 13:39:11 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Fri, 12 Sep 2008 13:39:11 +0000 (UTC)
Subject: rpms/gstreamer-plugins-farsight/devel
	gstreamer-plugins-farsight.spec, 1.16, 1.17
Message-ID: <20080912133911.5CACB70131@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/gstreamer-plugins-farsight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30195

Modified Files:
	gstreamer-plugins-farsight.spec 
Log Message:
* Fri Sep 12 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.12.9-2
- Rebuild for new gst.



Index: gstreamer-plugins-farsight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-farsight/devel/gstreamer-plugins-farsight.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gstreamer-plugins-farsight.spec	1 Aug 2008 00:35:17 -0000	1.16
+++ gstreamer-plugins-farsight.spec	12 Sep 2008 13:38:41 -0000	1.17
@@ -3,7 +3,7 @@
 
 Name:           gstreamer-plugins-farsight
 Version:        0.12.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GStreamer plug-ins for farsight protocol
 
 Group:          Applications/Multimedia
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.12.9-2
+- Rebuild for new gst.
+
 * Thu Jul 31 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.12.9-1
 - Update to 0.12.9.
 



From pkgdb at fedoraproject.org  Fri Sep 12 13:44:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 13:44:09 +0000
Subject: [pkgdb] perl-Gtk2-ImageView was added for spot
Message-ID: <20080912134409.AE37B208D9A@bastion.fedora.phx.redhat.com>

spot has added Package perl-Gtk2-ImageView with summary Perl bindings to the GtkImageView image viewer widget
spot has approved Package perl-Gtk2-ImageView
spot has added a Fedora devel branch for perl-Gtk2-ImageView with an owner of spot
spot has approved perl-Gtk2-ImageView in Fedora devel
spot has approved Package perl-Gtk2-ImageView
spot has set commit to Approved for packager on perl-Gtk2-ImageView (Fedora devel)
spot has set build to Approved for packager on perl-Gtk2-ImageView (Fedora devel)
spot has set checkout to Approved for packager on perl-Gtk2-ImageView (Fedora devel)
spot has set commit to Approved for uberpackager on perl-Gtk2-ImageView (Fedora devel)
spot has set build to Approved for uberpackager on perl-Gtk2-ImageView (Fedora devel)
spot has set checkout to Approved for uberpackager on perl-Gtk2-ImageView (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Gtk2-ImageView



From pkgdb at fedoraproject.org  Fri Sep 12 13:47:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 13:47:37 +0000
Subject: [pkgdb] perl-Gtk2-ImageView (Fedora, devel) updated by spot
Message-ID: <20080912134737.8D77F208D9C@bastion.fedora.phx.redhat.com>

spot changed owner of perl-Gtk2-ImageView in Fedora devel to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Gtk2-ImageView



From pkgdb at fedoraproject.org  Fri Sep 12 13:47:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 13:47:37 +0000
Subject: [pkgdb] perl-Gtk2-ImageView summary updated by spot
Message-ID: <20080912134737.7ADA1208D29@bastion.fedora.phx.redhat.com>

spot set package perl-Gtk2-ImageView summary to Perl bindings to the GtkImageView image viewer widget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Gtk2-ImageView



From pkgdb at fedoraproject.org  Fri Sep 12 13:47:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 13:47:37 +0000
Subject: [pkgdb] perl-Gtk2-ImageView (Fedora, 9) updated by spot
Message-ID: <20080912134737.82F1E208D9A@bastion.fedora.phx.redhat.com>

spot added a Fedora 9 branch for perl-Gtk2-ImageView
spot has set commit to Approved for uberpackager on perl-Gtk2-ImageView (Fedora 9)
spot has set build to Approved for uberpackager on perl-Gtk2-ImageView (Fedora 9)
spot has set checkout to Approved for uberpackager on perl-Gtk2-ImageView (Fedora 9)
spot changed owner of perl-Gtk2-ImageView in Fedora 9 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Gtk2-ImageView



From pkgdb at fedoraproject.org  Fri Sep 12 13:47:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 13:47:37 +0000
Subject: [pkgdb] perl-Gtk2-ImageView (Fedora, 8) updated by spot
Message-ID: <20080912134737.9C66F208D9F@bastion.fedora.phx.redhat.com>

spot added a Fedora 8 branch for perl-Gtk2-ImageView
spot has set commit to Approved for uberpackager on perl-Gtk2-ImageView (Fedora 8)
spot has set build to Approved for uberpackager on perl-Gtk2-ImageView (Fedora 8)
spot has set checkout to Approved for uberpackager on perl-Gtk2-ImageView (Fedora 8)
spot changed owner of perl-Gtk2-ImageView in Fedora 8 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Gtk2-ImageView



From pkgdb at fedoraproject.org  Fri Sep 12 13:49:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 13:49:15 +0000
Subject: [pkgdb] perl-Gtk2-ImageView summary updated by spot
Message-ID: <20080912134915.3028A208D98@bastion.fedora.phx.redhat.com>

spot set package perl-Gtk2-ImageView summary to Perl bindings to the GtkImageView image viewer widget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Gtk2-ImageView



From pkgdb at fedoraproject.org  Fri Sep 12 13:49:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 13:49:15 +0000
Subject: [pkgdb] perl-Gtk2-ImageView (Fedora, 8) updated by spot
Message-ID: <20080912134915.391CF208D9B@bastion.fedora.phx.redhat.com>

spot changed owner of perl-Gtk2-ImageView in Fedora 8 to spot
spot approved watchbugzilla on perl-Gtk2-ImageView (Fedora 8) for perl-sig
spot approved watchcommits on perl-Gtk2-ImageView (Fedora 8) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Gtk2-ImageView



From pkgdb at fedoraproject.org  Fri Sep 12 13:49:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 13:49:15 +0000
Subject: [pkgdb] perl-Gtk2-ImageView (Fedora, devel) updated by spot
Message-ID: <20080912134915.52017208D9E@bastion.fedora.phx.redhat.com>

spot changed owner of perl-Gtk2-ImageView in Fedora devel to spot
spot approved watchbugzilla on perl-Gtk2-ImageView (Fedora devel) for perl-sig
spot approved watchcommits on perl-Gtk2-ImageView (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Gtk2-ImageView



From pkgdb at fedoraproject.org  Fri Sep 12 13:49:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 13:49:15 +0000
Subject: [pkgdb] perl-Gtk2-ImageView (Fedora, 9) updated by spot
Message-ID: <20080912134915.57EDA208DA0@bastion.fedora.phx.redhat.com>

spot changed owner of perl-Gtk2-ImageView in Fedora 9 to spot
spot approved watchbugzilla on perl-Gtk2-ImageView (Fedora 9) for perl-sig
spot approved watchcommits on perl-Gtk2-ImageView (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Gtk2-ImageView



From pkgdb at fedoraproject.org  Fri Sep 12 13:55:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 13:55:54 +0000
Subject: [pkgdb] pam_ccreds ownership updated
Message-ID: <20080912135554.732BF208D9B@bastion.fedora.phx.redhat.com>

Package pam_ccreds in Fedora 9 was orphaned by tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_ccreds



From pkgdb at fedoraproject.org  Fri Sep 12 13:55:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 13:55:48 +0000
Subject: [pkgdb] pam_ccreds ownership updated
Message-ID: <20080912135548.DEA3D208D98@bastion.fedora.phx.redhat.com>

Package pam_ccreds in Fedora devel was orphaned by tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_ccreds



From pkgdb at fedoraproject.org  Fri Sep 12 13:55:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 13:55:57 +0000
Subject: [pkgdb] pam_ccreds ownership updated
Message-ID: <20080912135558.12AEE208D9C@bastion.fedora.phx.redhat.com>

Package pam_ccreds in Fedora 8 was orphaned by tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_ccreds



From pkgdb at fedoraproject.org  Fri Sep 12 13:56:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 13:56:04 +0000
Subject: [pkgdb] pam_passwdqc ownership updated
Message-ID: <20080912135604.62A07208D9E@bastion.fedora.phx.redhat.com>

Package pam_passwdqc in Fedora devel was orphaned by tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_passwdqc



From pkgdb at fedoraproject.org  Fri Sep 12 13:56:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 13:56:14 +0000
Subject: [pkgdb] pam_passwdqc ownership updated
Message-ID: <20080912135614.63A66208D9B@bastion.fedora.phx.redhat.com>

Package pam_passwdqc in Fedora 9 was orphaned by tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_passwdqc



From pkgdb at fedoraproject.org  Fri Sep 12 13:56:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 13:56:12 +0000
Subject: [pkgdb] pam_passwdqc ownership updated
Message-ID: <20080912135612.5DA5E208D9A@bastion.fedora.phx.redhat.com>

Package pam_passwdqc in Fedora 8 was orphaned by tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_passwdqc



From ruben at fedoraproject.org  Fri Sep 12 13:56:56 2008
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Fri, 12 Sep 2008 13:56:56 +0000 (UTC)
Subject: rpms/pdns/F-8 pdns-bz461768.patch,NONE,1.1 pdns.spec,1.8,1.9
Message-ID: <20080912135656.5BDC470131@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/pdns/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1344

Modified Files:
	pdns.spec 
Added Files:
	pdns-bz461768.patch 
Log Message:
* Fri Sep 12 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21.1-2
- Fix handling of AAAA records (bz #461768)


pdns-bz461768.patch:

--- NEW FILE pdns-bz461768.patch ---
Index: /trunk/pdns/pdns/packethandler.cc
===================================================================
--- /trunk/pdns/pdns/packethandler.cc (revision 1079)
+++ /trunk/pdns/pdns/packethandler.cc (revision 1081)
@@ -399,6 +399,8 @@
       }
     }
-    if(hits && !found && !rfound && shortcut ) // we found matching qnames but not a qtype
+    if(hits && !found && !rfound && shortcut ) { // we found matching qnames but not a qtype
+      DLOG(L<<"Found matching qname, but not the qtype"<<endl);
       return 2;
+    }
 
     if(rfound)
@@ -654,4 +656,5 @@
 
     if(mret==2) { // there is some data, but not of the correct type
+      r->clearRecords();
       DLOG(L<<"There is some data, but not of the correct type, adding SOA for NXRECORDSET"<<endl);
       SOAData sd;
@@ -696,5 +699,4 @@
       }
     }
-
     noSameLevelNS=true;
 
@@ -739,5 +741,5 @@
     // not found yet, try wildcards (we only try here in case of recursion - we should check before we hand off)
 
-    if(p->d.rd && d_doRecursion && d_doWildcards) { 
+    if(mret != 2 && p->d.rd && d_doRecursion && d_doWildcards) { 
       int res=doWildcardRecords(p,r,target);
       if(res) { // had a result


Index: pdns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/F-8/pdns.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pdns.spec	6 Aug 2008 13:36:59 -0000	1.8
+++ pdns.spec	12 Sep 2008 13:56:26 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
 Version:	2.9.21.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		System Environment/Daemons
 License:	GPLv2
@@ -11,6 +11,7 @@
 Patch0:		%{name}-fixinit.patch
 Patch1:		%{name}-avoid-version.patch
 Patch2:		%{name}-gcc43.patch
+Patch3:         %{name}-bz461768.patch
 
 Requires(post):	%{_sbindir}/useradd, /sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig
@@ -84,6 +85,7 @@
 %patch0 -p1 -b .fixinit
 %patch1 -p1 -b .avoid-version
 %patch2 -p1
+%patch3 -p3
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}"
@@ -183,6 +185,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21.1-2
+- Fix handling of AAAA records (bz #461768)
+
 * Wed Aug 06 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21.1-1
 - CVE-2008-3337
 



From mkasik at fedoraproject.org  Fri Sep 12 13:57:31 2008
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Fri, 12 Sep 2008 13:57:31 +0000 (UTC)
Subject: rpms/evince/devel duplex-copies.patch, NONE, 1.1 evince.spec, 1.130,
	1.131
Message-ID: <20080912135731.753A470131@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/evince/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1467

Modified Files:
	evince.spec 
Added Files:
	duplex-copies.patch 
Log Message:
* Fri Sep  12 2008 Marek Kasik <mkasik at redhat.com> - 2.23.92-2
- fix duplex printing of copies
- upstream bug #455759


duplex-copies.patch:

--- NEW FILE duplex-copies.patch ---
--- shell/ev-window.c	2008-09-12 14:11:56.000000000 +0200
+++ shell/ev-window.c	2008-09-12 17:07:00.000000000 +0200
@@ -2283,8 +2283,6 @@ ev_window_print_send (EvWindow    *windo
 
 	gtk_print_settings_set_page_ranges (settings, NULL, 0);
 	gtk_print_settings_set_print_pages (settings, GTK_PRINT_PAGES_ALL);
-	if (capabilities & EV_FILE_EXPORTER_CAN_COPIES)
-		gtk_print_settings_set_n_copies (settings, 1);
 	if (capabilities & EV_FILE_EXPORTER_CAN_PAGE_SET)
 		gtk_print_settings_set_page_set (settings, GTK_PAGE_SET_ALL);
 	if (capabilities & EV_FILE_EXPORTER_CAN_SCALE)
@@ -2371,7 +2369,6 @@ ev_window_print_dialog_response_cb (GtkD
 	EvPrintRange  *ranges = NULL;
 	EvPrintPageSet page_set;
 	gint           n_ranges = 0;
-	gint           copies;
 	gint           pages_per_sheet;
 	gboolean       collate;
 	gboolean       reverse;
@@ -2477,7 +2474,6 @@ ev_window_print_dialog_response_cb (GtkD
 
 	pages_per_sheet = gtk_print_settings_get_number_up (window->priv->print_settings);
 	
-	copies = gtk_print_settings_get_n_copies (window->priv->print_settings);
 	collate = gtk_print_settings_get_collate (window->priv->print_settings);
 	reverse = gtk_print_settings_get_reverse (window->priv->print_settings);
 	
@@ -2487,7 +2483,7 @@ ev_window_print_dialog_response_cb (GtkD
 						    ranges, n_ranges,
 						    page_set,
 						    pages_per_sheet,
-						    copies, collate,
+						    1, collate,
 						    reverse);
 	
 	g_signal_connect (window->priv->print_job, "finished",


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- evince.spec	10 Sep 2008 01:19:04 -0000	1.130
+++ evince.spec	12 Sep 2008 13:57:01 -0000	1.131
@@ -6,7 +6,7 @@
 
 Name:		evince
 Version:	2.23.92
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Document viewer
 
 License: 	GPLv2+ and GFDL
@@ -14,6 +14,7 @@
 URL:		http://www.gnome.org/projects/evince/
 Source0: 	http://download.gnome.org/sources/%{name}/2.23/%{name}-%{version}.tar.bz2
 Patch0:		evince-0.6.0-print-error.patch
+Patch1:		duplex-copies.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel >= %{gtk2_version}
@@ -88,6 +89,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .print-error
+%patch1 -p0 -b .duplex-copies
 
 %build
 %configure --disable-static --disable-scrollkeeper \
@@ -230,6 +232,10 @@
 %{_libdir}/evince/backends/djvudocument.evince-backend
 
 %changelog
+* Fri Sep  12 2008 Marek Kasik <mkasik at redhat.com> - 2.23.92-2
+- fix duplex printing of copies
+- upstream bug #455759
+
 * Tue Sep  9 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 



From spot at fedoraproject.org  Fri Sep 12 14:14:28 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 14:14:28 +0000 (UTC)
Subject: rpms/perl-Gtk2-ImageView - New directory
Message-ID: <20080912141428.30CFE70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Gtk2-ImageView
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsWV4907/rpms/perl-Gtk2-ImageView

Log Message:
Directory /cvs/extras/rpms/perl-Gtk2-ImageView added to the repository




From spot at fedoraproject.org  Fri Sep 12 14:14:28 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 14:14:28 +0000 (UTC)
Subject: rpms/perl-Gtk2-ImageView/devel - New directory
Message-ID: <20080912141428.7748C70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Gtk2-ImageView/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsWV4907/rpms/perl-Gtk2-ImageView/devel

Log Message:
Directory /cvs/extras/rpms/perl-Gtk2-ImageView/devel added to the repository




From spot at fedoraproject.org  Fri Sep 12 14:14:29 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 14:14:29 +0000 (UTC)
Subject: rpms/perl-Gtk2-ImageView Makefile,NONE,1.1
Message-ID: <20080912141429.9148470131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Gtk2-ImageView
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsWV4907/rpms/perl-Gtk2-ImageView

Added Files:
	Makefile 
Log Message:
Setup of module perl-Gtk2-ImageView


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Gtk2-ImageView
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From spot at fedoraproject.org  Fri Sep 12 14:14:29 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 14:14:29 +0000 (UTC)
Subject: rpms/perl-Gtk2-ImageView/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080912141429.D7C5070131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Gtk2-ImageView/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsWV4907/rpms/perl-Gtk2-ImageView/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Gtk2-ImageView


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Gtk2-ImageView
# $Id: Makefile,v 1.1 2008/09/12 14:14:29 spot Exp $
NAME := perl-Gtk2-ImageView
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From ajax at fedoraproject.org  Fri Sep 12 14:15:14 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri, 12 Sep 2008 14:15:14 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-9 .cvsignore, 1.50, 1.51 import.log, 1.4,
	1.5 sources, 1.44, 1.45 xorg-x11-server.spec, 1.340,
	1.341 xserver-1.5.0-no-evdev-keyboards-kthnx.patch, 1.3, 1.4
Message-ID: <20080912141514.31FFB70131@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5093/F-9

Modified Files:
	.cvsignore import.log sources xorg-x11-server.spec 
	xserver-1.5.0-no-evdev-keyboards-kthnx.patch 
Log Message:
xserver 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	24 Jul 2008 14:41:11 -0000	1.50
+++ .cvsignore	12 Sep 2008 14:14:43 -0000	1.51
@@ -1 +1 @@
-xorg-server-1.4.99.906.tar.bz2
+xorg-server-1.5.0.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	24 Jul 2008 14:41:11 -0000	1.4
+++ import.log	12 Sep 2008 14:14:43 -0000	1.5
@@ -1,2 +1,3 @@
 xorg-x11-server-1_4_99_905-2_20080702_fc9:F-9:xorg-x11-server-1.4.99.905-2.20080702.fc9.src.rpm:1215018868
 xorg-x11-server-1_4_99_906-1_fc9:F-9:xorg-x11-server-1.4.99.906-1.fc9.src.rpm:1216909882
+xorg-x11-server-1_5_0-1_fc9:F-9:xorg-x11-server-1.5.0-1.fc9.src.rpm:1221228853


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	24 Jul 2008 14:41:11 -0000	1.44
+++ sources	12 Sep 2008 14:14:43 -0000	1.45
@@ -1 +1 @@
-d225476fea6721d9f64c3268e47d6c51  xorg-server-1.4.99.906.tar.bz2
+9a817e5f7374d45b4dbe64b21bc0fb61  xorg-server-1.5.0.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xorg-x11-server.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- xorg-x11-server.spec	24 Jul 2008 14:41:11 -0000	1.340
+++ xorg-x11-server.spec	12 Sep 2008 14:14:43 -0000	1.341
@@ -18,7 +18,7 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.4.99.906
+Version:   1.5.0
 Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
@@ -459,6 +459,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Adam Jackson <ajax at redhat.com> 1.5.0-1
+- xserver 1.5.0
+
 * Wed Jul 23 2008 Adam Jackson <ajax at redhat.com> 1.4.99.906-1
 - 1.5RC6.
 

xserver-1.5.0-no-evdev-keyboards-kthnx.patch:

Index: xserver-1.5.0-no-evdev-keyboards-kthnx.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xserver-1.5.0-no-evdev-keyboards-kthnx.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xserver-1.5.0-no-evdev-keyboards-kthnx.patch	12 Jun 2008 02:07:31 -0000	1.3
+++ xserver-1.5.0-no-evdev-keyboards-kthnx.patch	12 Sep 2008 14:14:43 -0000	1.4
@@ -1,6 +1,6 @@
-From e654ed62d44b8d61484f97eab1b1adbfb08d375f Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied at redhat.com>
-Date: Thu, 12 Jun 2008 11:52:29 +1000
+From d70615e602361be7204552327f1fd5fa6d170cd0 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Fri, 12 Sep 2008 10:12:55 -0400
 Subject: [PATCH] config: disable evdev for keyboards
 
 ---
@@ -8,12 +8,12 @@
  1 files changed, 28 insertions(+), 0 deletions(-)
 
 diff --git a/config/hal.c b/config/hal.c
-index f4eb438..ee0f18f 100644
+index 0e0505b..76e8c45 100644
 --- a/config/hal.c
 +++ b/config/hal.c
-@@ -168,6 +168,31 @@ get_prop_string_array(LibHalContext *hal_ctx, const char *udi, const char *prop)
+@@ -166,6 +166,31 @@ get_prop_string_array(LibHalContext *hal_ctx, const char *udi, const char *prop)
+     return ret;
  }
- #endif
  
 +static Bool
 +get_device_is_keyboard(LibHalContext *hal_ctx, const char *udi, DBusError *error_p)
@@ -43,7 +43,7 @@
  static void
  device_added(LibHalContext *hal_ctx, const char *udi)
  {
-@@ -184,6 +209,9 @@ device_added(LibHalContext *hal_ctx, const char *udi)
+@@ -182,6 +207,9 @@ device_added(LibHalContext *hal_ctx, const char *udi)
  
      dbus_error_init(&error);
  
@@ -54,5 +54,5 @@
      if (!driver){
          /* verbose, don't tell the user unless they _want_ to see it */
 -- 
-1.5.3.7
+1.6.0.1
 



From spot at fedoraproject.org  Fri Sep 12 14:16:09 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 14:16:09 +0000 (UTC)
Subject: rpms/perl-Gtk2-ImageView/devel import.log, NONE,
	1.1 perl-Gtk2-ImageView.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080912141609.056F770131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Gtk2-ImageView/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5523/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Gtk2-ImageView.spec 
Log Message:

initial commit



--- NEW FILE import.log ---
perl-Gtk2-ImageView-0_04-2_fc10:HEAD:perl-Gtk2-ImageView-0.04-2.fc10.src.rpm:1221228826


--- NEW FILE perl-Gtk2-ImageView.spec ---
Name:           perl-Gtk2-ImageView
Version:        0.04
Release:        2%{?dist}
Summary:        Perl bindings to the GtkImageView image viewer widget

Group:          Development/Libraries
License:        LGPLv3+
URL:            http://search.cpan.org/dist/Gtk2-ImageView/
Source0:        http://search.cpan.org/CPAN/authors/id/R/RA/RATCLIFFE/Gtk2-ImageView-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  gtkimageview-devel >= 1.6.0
BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
BuildRequires:  perl(Glib) >= 1.163
BuildRequires:  perl(Cairo) >= 1.00
BuildRequires:  perl(ExtUtils::Depends) >= 0.2
BuildRequires:  perl(ExtUtils::PkgConfig) >= 1.03
BuildRequires:  perl(Gtk2)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:       perl(Glib) >= 1.163
Requires:       perl(Cairo) >= 1.00

%description
Perl bindings to the GtkImageView image viewer widget. Find out more about 
GtkImageView at http://trac.bjourne.webfactional.com/. The Perl bindings follow 
the C API very closely, and the C reference should be considered the canonical 
documentation.

%package devel
Summary:        Development headers for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
Development headers for %{name}.

%prep
%setup -q -n Gtk2-ImageView-%{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' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
# There are tests, but they need an X DISPLAY to run. Not worth it.
# make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING.LESSER README
%{perl_vendorarch}/auto/Gtk2/ImageView/
%{perl_vendorarch}/Gtk2*
%exclude %{perl_vendorarch}/Gtk2/ImageView/Install/*.h
%{_mandir}/man3/*.3pm*

%files devel
%defattr(-,root,root,-)
%{perl_vendorarch}/Gtk2/ImageView/Install/*.h

%changelog
* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.04-2
- missing BuildRequires: perl(GTK2)

* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.04-1
- initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-ImageView/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2008 14:14:29 -0000	1.1
+++ .cvsignore	12 Sep 2008 14:15:38 -0000	1.2
@@ -0,0 +1 @@
+Gtk2-ImageView-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-ImageView/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 14:14:29 -0000	1.1
+++ sources	12 Sep 2008 14:15:38 -0000	1.2
@@ -0,0 +1 @@
+1351295fb6391345fba53c25065180ed  Gtk2-ImageView-0.04.tar.gz



From dwalsh at fedoraproject.org  Fri Sep 12 14:21:35 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 12 Sep 2008 14:21:35 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-mls.conf, 1.34,
	1.35 policy-20080710.patch, 1.28, 1.29 selinux-policy.spec,
	1.704, 1.705
Message-ID: <20080912142135.E80E170131@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6979

Modified Files:
	modules-mls.conf policy-20080710.patch selinux-policy.spec 
Log Message:
* Thu Sep 11 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-1
- Merge upstream changes
- Add Xavier Toth patches



Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- modules-mls.conf	30 Jun 2008 20:52:56 -0000	1.34
+++ modules-mls.conf	12 Sep 2008 14:21:04 -0000	1.35
@@ -1122,3 +1122,25 @@
 # IMAP and POP3 email servers
 # 
 courier = module
+
+# Layer: services
+# Module: rpcbind
+#
+#  universal addresses to RPC program number mapper
+# 
+rpcbind = module
+
+
+# Layer: services
+# Module: xserver
+#
+# X windows login display manager
+# 
+xserver = module
+
+# Layer: apps
+# Module: wm
+#
+# X windows window manager
+# 
+wm = module

policy-20080710.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.28 -r 1.29 policy-20080710.patch
Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- policy-20080710.patch	8 Sep 2008 20:54:44 -0000	1.28
+++ policy-20080710.patch	12 Sep 2008 14:21:04 -0000	1.29
@@ -1,6 +1,6 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.7/Makefile
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.8/Makefile
 --- nsaserefpolicy/Makefile	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.5.7/Makefile	2008-09-08 10:19:44.000000000 -0400
++++ serefpolicy-3.5.8/Makefile	2008-09-11 16:37:43.000000000 -0400
 @@ -311,20 +311,22 @@
  
  # parse-rolemap modulename,outputfile
@@ -45,9 +45,9 @@
  $(appdir)/%: $(appconf)/%
  	@mkdir -p $(appdir)
  	$(verbose) $(INSTALL) -m 644 $< $@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.7/Rules.modular
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.8/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.5.7/Rules.modular	2008-09-08 10:19:44.000000000 -0400
++++ serefpolicy-3.5.8/Rules.modular	2008-09-11 16:37:43.000000000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -77,9 +77,9 @@
  
  $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy
  $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.7/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.5.8/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.7/config/appconfig-mcs/default_contexts	2008-09-08 10:19:44.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/default_contexts	2008-09-11 16:37:43.000000000 -0400
 @@ -1,15 +0,0 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -96,15 +96,15 @@
 -
 -user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.7/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.5.8/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.7/config/appconfig-mcs/failsafe_context	2008-09-08 10:19:44.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/failsafe_context	2008-09-11 16:37:43.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.7/config/appconfig-mcs/guest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.7/config/appconfig-mcs/guest_u_default_contexts	2008-09-08 10:19:44.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/guest_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
 @@ -0,0 +1,6 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -112,9 +112,9 @@
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
 +system_r:initrc_su_t:s0		guest_r:guest_t:s0
 +guest_r:guest_t:s0		guest_r:guest_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.5.7/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.5.8/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.7/config/appconfig-mcs/root_default_contexts	2008-09-08 10:19:44.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/root_default_contexts	2008-09-11 16:37:43.000000000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
  system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -128,9 +128,9 @@
  #
 -#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 +system_r:sshd_t:s0		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/staff_u_default_contexts serefpolicy-3.5.7/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.5.8/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.7/config/appconfig-mcs/staff_u_default_contexts	2008-09-08 10:19:44.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/staff_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
 @@ -5,6 +5,8 @@
  system_r:xdm_t:s0		staff_r:staff_t:s0
  staff_r:staff_su_t:s0		staff_r:staff_t:s0
@@ -140,9 +140,9 @@
  sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
  sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.7/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.5.8/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.7/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-08 10:19:44.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
 @@ -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
@@ -150,9 +150,9 @@
 +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/user_u_default_contexts serefpolicy-3.5.7/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.5.8/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.7/config/appconfig-mcs/user_u_default_contexts	2008-09-08 10:19:44.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/user_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
 @@ -5,4 +5,5 @@
  system_r:xdm_t:s0		user_r:user_t:s0
  user_r:user_su_t:s0		user_r:user_t:s0
@@ -160,15 +160,15 @@
 -
 +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/userhelper_context serefpolicy-3.5.7/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.5.8/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.7/config/appconfig-mcs/userhelper_context	2008-09-08 10:19:44.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/userhelper_context	2008-09-11 16:37:43.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/xguest_u_default_contexts serefpolicy-3.5.7/config/appconfig-mcs/xguest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.7/config/appconfig-mcs/xguest_u_default_contexts	2008-09-08 10:19:44.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/xguest_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -177,25 +177,25 @@
 +system_r:xdm_t		xguest_r:xguest_t:s0
 +system_r:initrc_su_t:s0	xguest_r:xguest_t:s0
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.7/config/appconfig-mls/guest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.7/config/appconfig-mls/guest_u_default_contexts	2008-09-08 10:19:44.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mls/guest_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
 +system_r:sshd_t:s0		guest_r:guest_t:s0
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.7/config/appconfig-standard/guest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.8/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.7/config/appconfig-standard/guest_u_default_contexts	2008-09-08 10:19:44.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-standard/guest_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
 +system_r:sshd_t		guest_r:guest_t
 +system_r:crond_t	guest_r:guest_crond_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.5.7/config/appconfig-standard/root_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.5.8/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.7/config/appconfig-standard/root_default_contexts	2008-09-08 10:19:44.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-standard/root_default_contexts	2008-09-11 16:37:43.000000000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t	unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t
  system_r:local_login_t  unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
@@ -209,18 +209,18 @@
  #
 -#system_r:sshd_t	unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
 +system_r:sshd_t	unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.7/config/appconfig-standard/xguest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.8/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.7/config/appconfig-standard/xguest_u_default_contexts	2008-09-08 10:19:44.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-standard/xguest_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
 +system_r:sshd_t		xguest_r:xguest_t
 +system_r:crond_t	xguest_r:xguest_crond_t
 +system_r:xdm_t		xguest_r:xguest_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.5.7/policy/global_tunables
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.5.8/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.7/policy/global_tunables	2008-09-08 10:19:44.000000000 -0400
++++ serefpolicy-3.5.8/policy/global_tunables	2008-09-11 16:37:43.000000000 -0400
 @@ -34,7 +34,7 @@
  
  ## <desc>
@@ -259,9 +259,32 @@
 +gen_tunable(allow_console_login,false)
 +
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.5.7/policy/modules/admin/alsa.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-3.5.8/policy/mls
+--- nsaserefpolicy/policy/mls	2008-09-05 10:28:20.000000000 -0400
++++ serefpolicy-3.5.8/policy/mls	2008-09-11 16:37:43.000000000 -0400
+@@ -381,11 +381,18 @@
+ 	 ( t1 == mlsxwinread ));
+ 
+ # the x_drawable "write" ops (implicit single level)
+-mlsconstrain x_drawable { create destroy write setattr add_child remove_child send manage }
++mlsconstrain x_drawable { create destroy write setattr send manage }
+ 	(( l1 eq l2 ) or
+ 	 (( t1 == mlsxwinwritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
[...6492 lines suppressed...]
++## <summary>
 +##	Transition to the unconfined_execmem domain.
- ## </summary>
- ## <param name="domain">
- ##	<summary>
-@@ -626,20 +683,58 @@
- ##	</summary>
- ## </param>
- #
--interface(`unconfined_read_tmp_files',`
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
 +interface(`unconfined_execmem_domtrans',`
 +
- 	gen_require(`
--		type unconfined_tmp_t;
++	gen_require(`
 +		type unconfined_execmem_t, unconfined_execmem_exec_t;
- 	')
- 
--	files_search_tmp($1)
--	allow $1 unconfined_tmp_t:dir list_dir_perms;
--	read_files_pattern($1, unconfined_tmp_t, unconfined_tmp_t)
--	read_lnk_files_pattern($1, unconfined_tmp_t, unconfined_tmp_t)
++	')
++
 +	domtrans_pattern($1, unconfined_execmem_exec_t, unconfined_execmem_t)
- ')
- 
- ########################################
- ## <summary>
--##	Write unconfined users temporary files.
++')
++
++########################################
++## <summary>
 +##	allow attempts to use unconfined ttys and ptys.
 +## </summary>
 +## <param name="domain">
@@ -32661,23 +32902,20 @@
 +########################################
 +## <summary>
 +##	Allow apps to set rlimits on userdomain
- ## </summary>
- ## <param name="domain">
- ##	<summary>
-@@ -647,10 +742,124 @@
- ##	</summary>
- ## </param>
- #
--interface(`unconfined_write_tmp_files',`
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
 +interface(`unconfined_set_rlimitnh',`
- 	gen_require(`
--		type unconfined_tmp_t;
++	gen_require(`
 +		type unconfined_t;
- 	')
- 
--	allow $1 unconfined_tmp_t:file { getattr write append };
++	')
++
 +	allow $1 unconfined_t:process rlimitinh;
- ')
++')
 +
 +########################################
 +## <summary>
@@ -32792,9 +33030,9 @@
 +	userdom_role_change_template(unconfined, $1)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.7/policy/modules/system/unconfined.te
---- nsaserefpolicy/policy/modules/system/unconfined.te	2008-09-03 07:59:15.000000000 -0400
-+++ serefpolicy-3.5.7/policy/modules/system/unconfined.te	2008-09-08 10:19:45.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.8/policy/modules/system/unconfined.te
+--- nsaserefpolicy/policy/modules/system/unconfined.te	2008-09-11 16:42:49.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/unconfined.te	2008-09-11 16:37:43.000000000 -0400
 @@ -1,40 +1,80 @@
  
 -policy_module(unconfined, 2.3.1)
@@ -33129,9 +33367,9 @@
 +# Allow SELinux aware applications to request rpm_script execution
 +rpm_transition_script(unconfined_notrans_t)
 +domain_ptrace_all_domains(unconfined_notrans_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.7/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.5.8/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.7/policy/modules/system/userdomain.fc	2008-09-08 10:19:45.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/userdomain.fc	2008-09-11 16:37:43.000000000 -0400
 @@ -1,4 +1,5 @@
 -HOME_DIR	-d	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
 -HOME_DIR/.+		gen_context(system_u:object_r:ROLE_home_t,s0)
@@ -33142,9 +33380,9 @@
 +HOME_DIR/.+		gen_context(system_u:object_r:user_home_t,s0)
 +/tmp/gconfd-USER -d	gen_context(system_u:object_r:user_tmp_t,s0)
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.5.7/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.5.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.7/policy/modules/system/userdomain.if	2008-09-08 10:19:45.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/userdomain.if	2008-09-11 16:37:43.000000000 -0400
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -35704,9 +35942,9 @@
 +
 +	dontaudit $1 user_home_t:file unlink;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.7/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.5.8/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.7/policy/modules/system/userdomain.te	2008-09-08 10:19:45.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/userdomain.te	2008-09-11 16:37:43.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -35821,9 +36059,9 @@
 +	manage_fifo_files_pattern(privhome, cifs_t, cifs_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.7/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.5.8/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.7/policy/modules/system/xen.fc	2008-09-08 10:19:45.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/xen.fc	2008-09-11 16:37:43.000000000 -0400
 @@ -20,6 +20,7 @@
  /var/run/xenconsoled\.pid --	gen_context(system_u:object_r:xenconsoled_var_run_t,s0)
  /var/run/xend(/.*)?		gen_context(system_u:object_r:xend_var_run_t,s0)
@@ -35832,9 +36070,9 @@
  /var/run/xenstore\.pid	--	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  /var/run/xenstored(/.*)?	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.7/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.5.8/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.7/policy/modules/system/xen.if	2008-09-08 10:19:45.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/xen.if	2008-09-11 16:37:43.000000000 -0400
 @@ -167,11 +167,14 @@
  #
  interface(`xen_stream_connect',`
@@ -35876,9 +36114,9 @@
 +	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.5.7/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.5.8/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.7/policy/modules/system/xen.te	2008-09-08 10:19:45.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/xen.te	2008-09-11 16:37:43.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -36115,9 +36353,9 @@
 +optional_policy(`
 +	unconfined_domain(xend_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.7/policy/support/file_patterns.spt
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.8/policy/support/file_patterns.spt
 --- nsaserefpolicy/policy/support/file_patterns.spt	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.7/policy/support/file_patterns.spt	2008-09-08 10:19:45.000000000 -0400
++++ serefpolicy-3.5.8/policy/support/file_patterns.spt	2008-09-11 16:37:43.000000000 -0400
 @@ -537,3 +537,18 @@
  	allow $1 $2:dir rw_dir_perms;
  	type_transition $1 $2:$4 $3;
@@ -36137,9 +36375,9 @@
 +        relabel_sock_files_pattern($1,$2,$2)
 +
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.7/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.5.8/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.7/policy/support/obj_perm_sets.spt	2008-09-08 10:19:45.000000000 -0400
++++ serefpolicy-3.5.8/policy/support/obj_perm_sets.spt	2008-09-11 16:37:43.000000000 -0400
 @@ -316,3 +316,13 @@
  #
  define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }')
@@ -36154,9 +36392,9 @@
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
 +
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.7/policy/users
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.8/policy/users
 --- nsaserefpolicy/policy/users	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.7/policy/users	2008-09-08 10:19:45.000000000 -0400
++++ serefpolicy-3.5.8/policy/users	2008-09-11 16:37:43.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.704
retrieving revision 1.705
diff -u -r1.704 -r1.705
--- selinux-policy.spec	8 Sep 2008 20:54:45 -0000	1.704
+++ selinux-policy.spec	12 Sep 2008 14:21:05 -0000	1.705
@@ -16,7 +16,7 @@
 %define CHECKPOLICYVER 2.0.16-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.5.7
+Version: 3.5.8
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -381,6 +381,13 @@
 %endif
 
 %changelog
+* Thu Sep 11 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-1
+- Merge upstream changes
+- Add Xavier Toth patches
+
+* Wed Sep 10 2008 Dan Walsh <dwalsh at redhat.com> 3.5.7-2
+- Add qemu_cache_t for /var/cache/libvirt
+
 * Fri Sep 5 2008 Dan Walsh <dwalsh at redhat.com> 3.5.7-1
 - Remove gamin policy
 



From ajax at fedoraproject.org  Fri Sep 12 14:25:16 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri, 12 Sep 2008 14:25:16 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-9 xorg-x11-server.spec,1.341,1.342
Message-ID: <20080912142516.7558970131@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7770

Modified Files:
	xorg-x11-server.spec 
Log Message:
no DRI2 for you


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xorg-x11-server.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- xorg-x11-server.spec	12 Sep 2008 14:14:43 -0000	1.341
+++ xorg-x11-server.spec	12 Sep 2008 14:24:46 -0000	1.342
@@ -370,7 +370,6 @@
 %dir %{_libdir}/xorg/modules/extensions
 %{_libdir}/xorg/modules/extensions/libglx.so
 %{_libdir}/xorg/modules/extensions/libdri.so
-%{_libdir}/xorg/modules/extensions/libdri2.so
 %{_libdir}/xorg/modules/extensions/libdbe.so
 %{_libdir}/xorg/modules/extensions/libextmod.so
 %dir %{_libdir}/xorg/modules/input



From pkgdb at fedoraproject.org  Fri Sep 12 14:26:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 14:26:06 +0000
Subject: [pkgdb] pam_ccreds ownership updated
Message-ID: <20080912142606.2238120876F@bastion.fedora.phx.redhat.com>

Package pam_ccreds in Fedora devel is now owned by avesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_ccreds



From pkgdb at fedoraproject.org  Fri Sep 12 14:26:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 14:26:09 +0000
Subject: [pkgdb] pam_ccreds ownership updated
Message-ID: <20080912142609.A72AE208D9A@bastion.fedora.phx.redhat.com>

Package pam_ccreds in Fedora devel was orphaned by avesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_ccreds



From pkgdb at fedoraproject.org  Fri Sep 12 14:26:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 14:26:21 +0000
Subject: [pkgdb] pam_ccreds ownership updated
Message-ID: <20080912142621.2AD0420876F@bastion.fedora.phx.redhat.com>

Package pam_ccreds in Fedora devel is now owned by avesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_ccreds



From pkgdb at fedoraproject.org  Fri Sep 12 14:26:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 14:26:30 +0000
Subject: [pkgdb] pam_ccreds ownership updated
Message-ID: <20080912142630.BA9AA208D9C@bastion.fedora.phx.redhat.com>

Package pam_ccreds in Fedora 8 is now owned by avesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_ccreds



From pkgdb at fedoraproject.org  Fri Sep 12 14:26:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 14:26:34 +0000
Subject: [pkgdb] pam_ccreds ownership updated
Message-ID: <20080912142634.2198D208D29@bastion.fedora.phx.redhat.com>

Package pam_ccreds in Fedora 9 is now owned by avesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_ccreds



From pkgdb at fedoraproject.org  Fri Sep 12 14:28:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 14:28:03 +0000
Subject: [pkgdb] pam_passwdqc ownership updated
Message-ID: <20080912142803.CB500208D98@bastion.fedora.phx.redhat.com>

Package pam_passwdqc in Fedora devel is now owned by avesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_passwdqc



From pkgdb at fedoraproject.org  Fri Sep 12 14:28:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 14:28:22 +0000
Subject: [pkgdb] pam_passwdqc ownership updated
Message-ID: <20080912142822.4CC5220876F@bastion.fedora.phx.redhat.com>

Package pam_passwdqc in Fedora 8 is now owned by avesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_passwdqc



From pkgdb at fedoraproject.org  Fri Sep 12 14:28:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 14:28:30 +0000
Subject: [pkgdb] pam_passwdqc ownership updated
Message-ID: <20080912142830.E8E31208D98@bastion.fedora.phx.redhat.com>

Package pam_passwdqc in Fedora 9 is now owned by avesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_passwdqc



From overholt at fedoraproject.org  Fri Sep 12 14:29:00 2008
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 12 Sep 2008 14:29:00 +0000 (UTC)
Subject: rpms/ws-commons-util/devel ws-commons-util.spec,1.8,1.9
Message-ID: <20080912142900.BCD2570131@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8368

Modified Files:
	ws-commons-util.spec 
Log Message:
* Fri Sep 12 2008 Andrew Overholt <overholt at redhat.com> 1.0.1-9
- Add ppc64.


Index: ws-commons-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ws-commons-util/devel/ws-commons-util.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ws-commons-util.spec	6 Sep 2008 21:23:59 -0000	1.8
+++ ws-commons-util.spec	12 Sep 2008 14:28:30 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           ws-commons-util
 Version:        1.0.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Common utilities from the Apache Web Services Project 
 
 Group:          System Environment/Libraries
@@ -10,9 +10,6 @@
 Patch0:         %{name}-addosgimanifest.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
-ExcludeArch:    ppc64
-
 BuildRequires:  jpackage-utils >= 1.5
 BuildRequires:  maven2
 BuildRequires:  maven2-plugin-jar
@@ -85,6 +82,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Fri Sep 12 2008 Andrew Overholt <overholt at redhat.com> 1.0.1-9
+- Add ppc64.
+
 * Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-8
 - fix license tag
 



From overholt at fedoraproject.org  Fri Sep 12 14:29:38 2008
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 12 Sep 2008 14:29:38 +0000 (UTC)
Subject: rpms/xmlrpc3/devel xmlrpc3.spec,1.7,1.8
Message-ID: <20080912142938.88B0F70131@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/xmlrpc3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8599

Modified Files:
	xmlrpc3.spec 
Log Message:
* Fri Sep 12 2008 Andrew Overholt <overholt at redhat.com> 3.0-2.7
- Add ppc64.


Index: xmlrpc3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlrpc3/devel/xmlrpc3.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xmlrpc3.spec	10 Jul 2008 20:47:32 -0000	1.7
+++ xmlrpc3.spec	12 Sep 2008 14:29:08 -0000	1.8
@@ -35,7 +35,7 @@
 
 Name:       xmlrpc3
 Version:    3.0
-Release:    2.6%{?dist}
+Release:    2.7%{?dist}
 Summary:    Java XML-RPC implementation
 License:    ASL 2.0
 Group:      Development/Libraries
@@ -50,9 +50,6 @@
 Patch1:     %{name}-client-addosgimanifest.patch
 Patch2:     %{name}-common-addosgimanifest.patch
 
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
-ExcludeArch: ppc64
-
 BuildRequires:  dos2unix
 BuildRequires:  maven2 >= 2.0.4
 BuildRequires:  maven2-plugin-resources
@@ -270,6 +267,9 @@
 %{_javadir}/%{name}-server-%{version}-sources.jar
 
 %changelog
+* Fri Sep 12 2008 Andrew Overholt <overholt at redhat.com> 3.0-2.7
+- Add ppc64.
+
 * Thu Jul 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> 3.0-2.6
 - drop repotag
 - fix license tag



From pkgdb at fedoraproject.org  Fri Sep 12 14:32:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 14:32:42 +0000
Subject: [pkgdb] kphone ownership updated
Message-ID: <20080912143242.63FD1208D98@bastion.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  Fri Sep 12 14:33:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 14:33:07 +0000
Subject: [pkgdb] kphone ownership updated
Message-ID: <20080912143307.AB308208D29@bastion.fedora.phx.redhat.com>

Package kphone in Fedora devel is now owned by ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kphone



From jwboyer at fedoraproject.org  Fri Sep 12 14:39:28 2008
From: jwboyer at fedoraproject.org (Joshua W. Boyer)
Date: Fri, 12 Sep 2008 14:39:28 +0000 (UTC)
Subject: rpms/stapitrace/devel stapitrace-fix-bfd-configure.patch, NONE,
	1.1 stapitrace.spec, 1.14, 1.15
Message-ID: <20080912143928.E151870131@cvs1.fedora.phx.redhat.com>

Author: jwboyer

Update of /cvs/pkgs/rpms/stapitrace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11028

Modified Files:
	stapitrace.spec 
Added Files:
	stapitrace-fix-bfd-configure.patch 
Log Message:
* Fri Sep 12 2008 Josh Boyer <jwboyer at gmail.com>
- Fix bfd configure test as binutils now requires zlib for compressed
  sections


stapitrace-fix-bfd-configure.patch:

--- NEW FILE stapitrace-fix-bfd-configure.patch ---
---
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- Dpiperf.orig/configure.in
+++ Dpiperf/configure.in
@@ -19,7 +19,7 @@ AC_PROG_RANLIB
 AC_CHECK_LIB([c], [atoi], [], [AC_MSG_ERROR([[Please install libc.]])])
 AC_CHECK_LIB([dl], [dlsym], [], [AC_MSG_ERROR([[Please install libdl.]])])
 AC_CHECK_LIB([iberty], [cplus_demangle], [], [AC_MSG_ERROR([[Please install libiberty (binutils package).]])])
-AC_CHECK_LIB([bfd], [bfd_get_elf_phdrs], [], [AC_MSG_ERROR([[Please install libbfd (binutils package).]])])
+AC_CHECK_LIB([bfd], [bfd_get_elf_phdrs], [], [AC_MSG_ERROR([[Please install libbfd (binutils package).]])],[-lz])
 
 # Checks for header files.
 AC_CHECK_HEADERS([bfd.h], [], [AC_MSG_ERROR([[Please make sure you have bfd.h header - please install binutils-devel package]])])


Index: stapitrace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stapitrace/devel/stapitrace.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- stapitrace.spec	12 Sep 2008 00:27:55 -0000	1.14
+++ stapitrace.spec	12 Sep 2008 14:38:58 -0000	1.15
@@ -6,15 +6,16 @@
 Name:		stapitrace
 Summary:	Instruction Tracing Tool
 Version:	1.0.0
-Release:	11.%{alphatag}%{?dist}
+Release:	12.%{alphatag}%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://sourceforge.net/projects/perfinsp
 Source0:	%{name}-%{version}.%{alphatag}.tar.gz
 Patch0:		itrace_fix1.patch
+Patch1:		stapitrace-fix-bfd-configure.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:	systemtap systemtap-runtime binutils binutils-devel
-BuildRequires:	binutils binutils-devel autoconf automake
+BuildRequires:	binutils binutils-devel autoconf automake zlib-devel
 ExclusiveArch:	ppc
 
 %description
@@ -36,45 +37,9 @@
 %prep
 %setup -q -n Dpiperf
 %patch0 -p1
+%patch1 -p1
 
 %build
-cat >>conftest.c <<_ACEOF
-/* confdefs.h.  */
-
-#define PACKAGE_NAME "Performance Inspector"
-#define PACKAGE_TARNAME "performance-inspector"
-#define PACKAGE_VERSION "3.4"
-#define PACKAGE_STRING "Performance Inspector 3.4"
-#define PACKAGE_BUGREPORT "mmilenko at us.ibm.com"
-#define PACKAGE "performance-inspector"
-#define VERSION "3.4"
-#define HAVE_LIBC 1
-#define HAVE_LIBDL 1
-#define HAVE_LIBIBERTY 1
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char bfd_get_elf_phdrs ();
-int
-main ()
-{
-bfd_get_elf_phdrs ();
-  ;
-  return 0;
-}
-_ACEOF
-ls -l /usr/lib/libbfd*
-file /usr/lib/libbfd*
-gcc -o conftest -g -O2 conftest.c -lbfd -liberty -ldl -lc
-gcc -o conftest -g -O2 conftest.c /usr/lib/libbfd.a -liberty -ldl -lc
-gcc -o conftest -g -O2 conftest.c /usr/lib/libbfd*.so -liberty -ldl -lc
-nm /usr/lib/libbfd.a | grep bfd_get_elf_phdrs 
-nm /usr/lib/libbfd*.so | grep bfd_get_elf_phdrs 
 autoreconf -i --force
 # override -m64
 export CFLAGS="%{__global_cflags} -mminimal-toc"	
@@ -120,6 +85,10 @@
 %{_bindir}/itrace
 
 %changelog -n itrace
+* Fri Sep 12 2008 Josh Boyer <jwboyer at gmail.com>
+- Fix bfd configure test as binutils now requires zlib for compressed
+  sections
+
 * Tue May 27 2008 Dave Nomura <dcnltc at us.ibm.com>
 - removed liba2n.so dependency and changed to all apps to 32-bit
 



From dwalsh at fedoraproject.org  Fri Sep 12 14:47:17 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 12 Sep 2008 14:47:17 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 modules-mls.conf, 1.33,
	1.34 policy-20071130.patch, 1.206, 1.207 selinux-policy.spec,
	1.706, 1.707
Message-ID: <20080912144717.B214370131@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12478

Modified Files:
	modules-mls.conf policy-20071130.patch selinux-policy.spec 
Log Message:
* Tue Sep 2 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-90
- Add rpcbind to mls policy
- Fix up policy so permissive domains will work



Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/modules-mls.conf,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- modules-mls.conf	30 Jun 2008 20:52:16 -0000	1.33
+++ modules-mls.conf	12 Sep 2008 14:46:46 -0000	1.34
@@ -1101,3 +1101,11 @@
 # IMAP and POP3 email servers
 # 
 courier = module
+
+# Layer: services
+# Module: rpcbind
+#
+#  universal addresses to RPC program number mapper
+# 
+rpcbind = module
+

policy-20071130.patch:

Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- policy-20071130.patch	8 Sep 2008 19:25:46 -0000	1.206
+++ policy-20071130.patch	12 Sep 2008 14:46:46 -0000	1.207
@@ -943,8 +943,48 @@
  .EE 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.3.1/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/flask/access_vectors	2008-09-08 11:45:12.000000000 -0400
-@@ -407,141 +407,159 @@
++++ serefpolicy-3.3.1/policy/flask/access_vectors	2008-09-12 10:30:37.000000000 -0400
+@@ -125,6 +125,7 @@
+ 	reparent
+ 	search
+ 	rmdir
++	open
+ }
+ 
+ class file
+@@ -133,6 +134,7 @@
+ 	execute_no_trans
+ 	entrypoint
+ 	execmod
++	open
+ }
+ 
+ class lnk_file
+@@ -144,16 +146,23 @@
+ 	execute_no_trans
+ 	entrypoint
+ 	execmod
++	open
+ }
+ 
+ class blk_file
+ inherits file
++{
++	open
++}
+ 
+ class sock_file
+ inherits file
+ 
+ class fifo_file
+ inherits file
++{
++	open
++}
+ 
+ class fd
+ {
+@@ -407,141 +416,160 @@
  #
  # SE-X Windows stuff
  #
@@ -1058,6 +1098,7 @@
  	read
 -	store
 +	write
++	append
  	getattr
  	setattr
  }
@@ -1158,12 +1199,6 @@
 +}
 +
 +class x_event
-+{
-+	send
-+	receive
-+}
-+
-+class x_synthetic_event
  {
 -	pageexec	# Paging based non-executable pages
 -	emutramp	# Emulate trampolines
@@ -1173,12 +1208,29 @@
 -	segmexec	# Segmentation based non-executable pages
 +	send
 +	receive
++}
++
++class x_synthetic_event
++{
++	send
++	receive
  }
  
  #
+@@ -747,3 +775,10 @@
+ {
+ 	recv
+ }
++
++class x_application_data
++{
++	paste
++	paste_after_confirm
++	copy
++}
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/security_classes serefpolicy-3.3.1/policy/flask/security_classes
 --- nsaserefpolicy/policy/flask/security_classes	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/flask/security_classes	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/flask/security_classes	2008-09-12 10:30:52.000000000 -0400
 @@ -50,21 +50,19 @@
  # passwd/chfn/chsh
  class passwd			# userspace
@@ -1214,7 +1266,7 @@
  
  # extended netlink sockets
  class netlink_route_socket
-@@ -112,4 +110,9 @@
+@@ -112,4 +110,10 @@
  # Capabilities >= 32
  class capability2
  
@@ -1222,6 +1274,7 @@
 +class x_resource		# userspace
 +class x_event			# userspace
 +class x_synthetic_event		# userspace
++class x_application_data	# userspace
 +
  # FLASK
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.3.1/policy/global_tunables
@@ -9108,19 +9161,246 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.3.1/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/kernel/kernel.if	2008-09-08 11:45:12.000000000 -0400
-@@ -851,9 +851,8 @@
++++ serefpolicy-3.3.1/policy/modules/kernel/kernel.if	2008-09-12 10:26:53.000000000 -0400
+@@ -330,6 +330,11 @@
+ 
+ 	allow $1 self:capability sys_module;
+ 	typeattribute $1 can_load_kernmodule;
++
++	# load_module() calls stop_machine() which
++	# calls sched_setscheduler()
++	allow $1 self:capability sys_nice;
++	kernel_setsched($1)
+ ')
+ 
+ ########################################
+@@ -584,7 +589,7 @@
+ 		type debugfs_t;
+ 	')
+ 
+-	search_dirs_pattern($1,debugfs_t,debugfs_t)
++	search_dirs_pattern($1, debugfs_t, debugfs_t)
+ ')
+ 
+ ########################################
+@@ -602,9 +607,9 @@
+ 		type debugfs_t;
+ 	')
+ 
+-	read_files_pattern($1,debugfs_t,debugfs_t)
+-	read_lnk_files_pattern($1,debugfs_t,debugfs_t)
+-	list_dirs_pattern($1,debugfs_t,debugfs_t)
++	read_files_pattern($1, debugfs_t, debugfs_t)
++	read_lnk_files_pattern($1, debugfs_t, debugfs_t)
++	list_dirs_pattern($1, debugfs_t, debugfs_t)
+ ')
+ 
+ ########################################
+@@ -676,7 +681,7 @@
+ 		type proc_t;
+ 	')
+ 
+-	search_dirs_pattern($1,proc_t,proc_t)
++	search_dirs_pattern($1, proc_t, proc_t)
+ ')
+ 
+ ########################################
+@@ -694,7 +699,7 @@
+ 		type proc_t;
+ 	')
+ 
+-	list_dirs_pattern($1,proc_t,proc_t)
++	list_dirs_pattern($1, proc_t, proc_t)
+ ')
+ 
+ ########################################
+@@ -731,7 +736,7 @@
+ 		type proc_t;
+ 	')
+ 
+-	getattr_files_pattern($1,proc_t,proc_t)
++	getattr_files_pattern($1, proc_t, proc_t)
+ ')
+ 
+ ########################################
+@@ -749,7 +754,7 @@
+ 		type proc_t;
+ 	')
+ 
+-	read_lnk_files_pattern($1,proc_t,proc_t)
++	read_lnk_files_pattern($1, proc_t, proc_t)
+ ')
+ 
+ ########################################
+@@ -768,10 +773,10 @@
+ 		type proc_t;
+ 	')
+ 
+-	read_files_pattern($1,proc_t,proc_t)
+-	read_lnk_files_pattern($1,proc_t,proc_t)
++	read_files_pattern($1, proc_t, proc_t)
++	read_lnk_files_pattern($1, proc_t, proc_t)
+ 
+-	list_dirs_pattern($1,proc_t,proc_t)
++	list_dirs_pattern($1, proc_t, proc_t)
+ ')
+ 
+ ########################################
+@@ -794,7 +799,7 @@
+ 		type proc_t;
+ 	')
+ 
+-	write_files_pattern($1,proc_t,proc_t)
++	write_files_pattern($1, proc_t, proc_t)
+ ')
+ 
+ ########################################
+@@ -851,9 +856,8 @@
  		type proc_t, proc_afs_t;
  	')
  
 -	read_files_pattern($1,proc_t,proc_afs_t)
 -
- 	list_dirs_pattern($1,proc_t,proc_t)
-+	rw_files_pattern($1,proc_afs_t,proc_afs_t)
+-	list_dirs_pattern($1,proc_t,proc_t)
++	list_dirs_pattern($1, proc_t, proc_t)
++	rw_files_pattern($1, proc_afs_t, proc_afs_t)
+ ')
+ 
+ #######################################
+@@ -872,9 +876,9 @@
+ 		type proc_t, proc_mdstat_t;
+ 	')
+ 
+-	read_files_pattern($1,proc_t,proc_mdstat_t)
++	read_files_pattern($1, proc_t, proc_mdstat_t)
+ 
+-	list_dirs_pattern($1,proc_t,proc_t)
++	list_dirs_pattern($1, proc_t, proc_t)
  ')
  
  #######################################
-@@ -1194,6 +1193,7 @@
+@@ -892,9 +896,9 @@
+ 		type proc_t, proc_mdstat_t;
+ 	')
+ 
+-	rw_files_pattern($1,proc_t,proc_mdstat_t)
++	rw_files_pattern($1, proc_t, proc_mdstat_t)
+ 
+-	list_dirs_pattern($1,proc_t,proc_t)
++	list_dirs_pattern($1, proc_t, proc_t)
+ ')
+ 
+ ########################################
+@@ -912,9 +916,9 @@
+ 		type proc_t, proc_kcore_t;
+ 	')
+ 
+-	getattr_files_pattern($1,proc_t,proc_kcore_t)
++	getattr_files_pattern($1, proc_t, proc_kcore_t)
+ 
+-	list_dirs_pattern($1,proc_t,proc_t)
++	list_dirs_pattern($1, proc_t, proc_t)
+ ')
+ 
+ ########################################
+@@ -953,7 +957,7 @@
+ 		type proc_kmsg_t, proc_t;
+ 	')
+ 
+-	read_files_pattern($1,proc_t,proc_kmsg_t)
++	read_files_pattern($1, proc_t, proc_kmsg_t)
+ 
+ 	typeattribute $1 can_receive_kernel_messages;
+ ')
+@@ -974,7 +978,7 @@
+ 		type proc_kmsg_t, proc_t;
+ 	')
+ 
+-	getattr_files_pattern($1,proc_t,proc_kmsg_t)
++	getattr_files_pattern($1, proc_t, proc_kmsg_t)
+ ')
+ 
+ ########################################
+@@ -1032,7 +1036,7 @@
+ 		type proc_net_t;
+ 	')
+ 
+-	search_dirs_pattern($1,proc_t,proc_net_t)
++	search_dirs_pattern($1, proc_t, proc_net_t)
+ ')
+ 
+ ########################################
+@@ -1051,10 +1055,10 @@
+ 		type proc_t, proc_net_t;
+ 	')
+ 
+-	read_files_pattern($1,{ proc_t proc_net_t },proc_net_t)
+-	read_lnk_files_pattern($1,{ proc_t proc_net_t },proc_net_t)
++	read_files_pattern($1, { proc_t proc_net_t }, proc_net_t)
++	read_lnk_files_pattern($1, { proc_t proc_net_t }, proc_net_t)
+ 
+-	list_dirs_pattern($1,proc_t,proc_net_t)
++	list_dirs_pattern($1, proc_t, proc_net_t)
+ ')
+ 
+ ########################################
+@@ -1072,9 +1076,9 @@
+ 		type proc_t, proc_net_t;
+ 	')
+ 
+-	read_lnk_files_pattern($1,{ proc_t proc_net_t },proc_net_t)
++	read_lnk_files_pattern($1, { proc_t proc_net_t }, proc_net_t)
+ 
+-	list_dirs_pattern($1,proc_t,proc_net_t)
++	list_dirs_pattern($1, proc_t, proc_net_t)
+ ')
+ 
+ ########################################
+@@ -1093,7 +1097,7 @@
+ 		type proc_t, proc_xen_t;
+ 	')
+ 
+-	search_dirs_pattern($1,proc_t,proc_xen_t)
++	search_dirs_pattern($1, proc_t, proc_xen_t)
+ ')
+ 
+ ########################################
+@@ -1132,10 +1136,10 @@
+ 		type proc_t, proc_xen_t;
+ 	')
+ 
+-	read_files_pattern($1,{ proc_t proc_xen_t },proc_xen_t)
+-	read_lnk_files_pattern($1,{ proc_t proc_xen_t },proc_xen_t)
++	read_files_pattern($1, { proc_t proc_xen_t }, proc_xen_t)
++	read_lnk_files_pattern($1, { proc_t proc_xen_t }, proc_xen_t)
+ 
+-	list_dirs_pattern($1,proc_t,proc_xen_t)
++	list_dirs_pattern($1, proc_t, proc_xen_t)
+ ')
+ 
+ ########################################
+@@ -1154,9 +1158,9 @@
+ 		type proc_t, proc_xen_t;
+ 	')
+ 
+-	read_lnk_files_pattern($1,{ proc_t proc_xen_t },proc_xen_t)
++	read_lnk_files_pattern($1, { proc_t proc_xen_t }, proc_xen_t)
+ 
+-	list_dirs_pattern($1,proc_t,proc_xen_t)
++	list_dirs_pattern($1, proc_t, proc_xen_t)
+ ')
+ 
+ ########################################
+@@ -1175,7 +1179,7 @@
+ 		type proc_t, proc_xen_t;
+ 	')
+ 
+-	write_files_pattern($1,{ proc_t proc_xen_t },proc_xen_t)
++	write_files_pattern($1, { proc_t proc_xen_t }, proc_xen_t)
+ ')
+ 
+ ########################################
+@@ -1194,6 +1198,7 @@
  	')
  
  	dontaudit $1 proc_type:dir list_dir_perms;
@@ -9128,7 +9408,273 @@
  ')
  
  ########################################
-@@ -1764,6 +1764,7 @@
+@@ -1232,7 +1237,7 @@
+ 		type sysctl_t;
+ 	')
+ 
+-	list_dirs_pattern($1,proc_t,sysctl_t)
++	list_dirs_pattern($1, proc_t, sysctl_t)
+ ')
+ 
+ ########################################
+@@ -1251,9 +1256,9 @@
+ 		type proc_t, sysctl_t, sysctl_dev_t;
+ 	')
+ 
+-	read_files_pattern($1,{ proc_t sysctl_t sysctl_dev_t },sysctl_dev_t)
++	read_files_pattern($1, { proc_t sysctl_t sysctl_dev_t }, sysctl_dev_t)
+ 
+-	list_dirs_pattern($1,{ proc_t sysctl_t },sysctl_dev_t)
++	list_dirs_pattern($1, { proc_t sysctl_t }, sysctl_dev_t)
+ ')
+ 
+ ########################################
+@@ -1272,9 +1277,9 @@
+ 		type proc_t, sysctl_t, sysctl_dev_t;
+ 	')
+ 
+-	rw_files_pattern($1,{ proc_t sysctl_t sysctl_dev_t },sysctl_dev_t)
++	rw_files_pattern($1, { proc_t sysctl_t sysctl_dev_t }, sysctl_dev_t)
+ 
+-	list_dirs_pattern($1,{ proc_t sysctl_t },sysctl_dev_t)
++	list_dirs_pattern($1, { proc_t sysctl_t }, sysctl_dev_t)
+ ')
+ 
+ ########################################
+@@ -1292,7 +1297,7 @@
+ 		type proc_t, sysctl_t, sysctl_vm_t;
+ 	')
+ 
+-	search_dirs_pattern($1,{ proc_t sysctl_t },sysctl_vm_t)
++	search_dirs_pattern($1, { proc_t sysctl_t }, sysctl_vm_t)
+ ')
+ 
+ ########################################
+@@ -1311,9 +1316,9 @@
+ 		type proc_t, sysctl_t, sysctl_vm_t;
+ 	')
+ 
+-	read_files_pattern($1,{ proc_t sysctl_t sysctl_vm_t },sysctl_vm_t)
++	read_files_pattern($1, { proc_t sysctl_t sysctl_vm_t }, sysctl_vm_t)
+ 
+-	list_dirs_pattern($1,{ proc_t sysctl_t },sysctl_vm_t)
++	list_dirs_pattern($1, { proc_t sysctl_t }, sysctl_vm_t)
+ ')
+ 
+ ########################################
+@@ -1332,8 +1337,8 @@
+ 		type proc_t, sysctl_t, sysctl_vm_t;
+ 	')
+ 
+-	rw_files_pattern($1,{ proc_t sysctl_t sysctl_vm_t },sysctl_vm_t)
+-	list_dirs_pattern($1,{ proc_t sysctl_t },sysctl_vm_t)
++	rw_files_pattern($1 ,{ proc_t sysctl_t sysctl_vm_t }, sysctl_vm_t)
++	list_dirs_pattern($1, { proc_t sysctl_t }, sysctl_vm_t)
+ 
+ 	# hal needs this
+ 	allow $1 sysctl_vm_t:dir write;
+@@ -1354,7 +1359,7 @@
+ 		type proc_t, sysctl_t, sysctl_net_t;
+ 	')
+ 
+-	search_dirs_pattern($1,{ proc_t sysctl_t },sysctl_net_t)
++	search_dirs_pattern($1, { proc_t sysctl_t }, sysctl_net_t)
+ ')
+ 
+ ########################################
+@@ -1391,9 +1396,9 @@
+ 		type proc_t, sysctl_t, sysctl_net_t;
+ 	')
+ 
+-	read_files_pattern($1,{ proc_t sysctl_t sysctl_net_t },sysctl_net_t)
++	read_files_pattern($1, { proc_t sysctl_t sysctl_net_t }, sysctl_net_t)
+ 
+-	list_dirs_pattern($1,{ proc_t sysctl_t },sysctl_net_t)
++	list_dirs_pattern($1, { proc_t sysctl_t }, sysctl_net_t)
+ ')
+ 
+ ########################################
+@@ -1412,9 +1417,9 @@
+ 		type proc_t, sysctl_t, sysctl_net_t;
+ 	')
+ 
+-	rw_files_pattern($1,{ proc_t sysctl_t sysctl_net_t },sysctl_net_t)
++	rw_files_pattern($1, { proc_t sysctl_t sysctl_net_t }, sysctl_net_t)
+ 
+-	list_dirs_pattern($1,{ proc_t sysctl_t },sysctl_net_t)
++	list_dirs_pattern($1, { proc_t sysctl_t }, sysctl_net_t)
+ ')
+ 
+ ########################################
+@@ -1434,9 +1439,9 @@
+ 		type proc_t, sysctl_t, sysctl_net_t, sysctl_net_unix_t;
+ 	')
+ 
+-	read_files_pattern($1,{ proc_t sysctl_t sysctl_net_t },sysctl_net_unix_t)
++	read_files_pattern($1, { proc_t sysctl_t sysctl_net_t }, sysctl_net_unix_t)
+ 
+-	list_dirs_pattern($1,{ proc_t sysctl_t },sysctl_net_t)
++	list_dirs_pattern($1, { proc_t sysctl_t }, sysctl_net_t)
+ ')
+ 
+ ########################################
+@@ -1456,9 +1461,9 @@
+ 		type proc_t, sysctl_t, sysctl_net_t, sysctl_net_unix_t;
+ 	')
+ 
+-	rw_files_pattern($1,{ proc_t sysctl_t sysctl_net_t },sysctl_net_unix_t)
++	rw_files_pattern($1, { proc_t sysctl_t sysctl_net_t }, sysctl_net_unix_t)
+ 
+-	list_dirs_pattern($1,{ proc_t sysctl_t },sysctl_net_t)
++	list_dirs_pattern($1, { proc_t sysctl_t }, sysctl_net_t)
+ ')
+ 
+ ########################################
+@@ -1477,9 +1482,9 @@
+ 		type proc_t, sysctl_t, sysctl_kernel_t, sysctl_hotplug_t;
+ 	')
+ 
+-	read_files_pattern($1,{ proc_t sysctl_t sysctl_kernel_t },sysctl_hotplug_t)
++	read_files_pattern($1, { proc_t sysctl_t sysctl_kernel_t }, sysctl_hotplug_t)
+ 
+-	list_dirs_pattern($1,{ proc_t sysctl_t },sysctl_kernel_t)
++	list_dirs_pattern($1, { proc_t sysctl_t }, sysctl_kernel_t)
+ ')
+ 
+ ########################################
+@@ -1498,9 +1503,9 @@
+ 		type proc_t, sysctl_t, sysctl_kernel_t, sysctl_hotplug_t;
+ 	')
+ 
+-	rw_files_pattern($1,{ proc_t sysctl_t sysctl_kernel_t },sysctl_hotplug_t)
++	rw_files_pattern($1, { proc_t sysctl_t sysctl_kernel_t }, sysctl_hotplug_t)
+ 
+-	list_dirs_pattern($1,{ proc_t sysctl_t },sysctl_kernel_t)
++	list_dirs_pattern($1, { proc_t sysctl_t }, sysctl_kernel_t)
+ ')
+ 
+ ########################################
+@@ -1519,9 +1524,9 @@
+ 		type proc_t, sysctl_t, sysctl_kernel_t, sysctl_modprobe_t;
+ 	')
+ 
+-	read_files_pattern($1,{ proc_t sysctl_t sysctl_kernel_t },sysctl_modprobe_t)
++	read_files_pattern($1, { proc_t sysctl_t sysctl_kernel_t }, sysctl_modprobe_t)
+ 
+-	list_dirs_pattern($1,{ proc_t sysctl_t },sysctl_kernel_t)
++	list_dirs_pattern($1, { proc_t sysctl_t }, sysctl_kernel_t)
+ ')
+ 
+ ########################################
+@@ -1540,9 +1545,9 @@
+ 		type proc_t, sysctl_t, sysctl_kernel_t, sysctl_modprobe_t;
+ 	')
+ 
+-	rw_files_pattern($1,{ proc_t sysctl_t sysctl_kernel_t },sysctl_modprobe_t)
++	rw_files_pattern($1, { proc_t sysctl_t sysctl_kernel_t }, sysctl_modprobe_t)
+ 
+-	list_dirs_pattern($1,{ proc_t sysctl_t },sysctl_kernel_t)
++	list_dirs_pattern($1, { proc_t sysctl_t }, sysctl_kernel_t)
+ ')
+ 
+ ########################################
+@@ -1578,9 +1583,9 @@
+ 		type proc_t, sysctl_t, sysctl_kernel_t;
+ 	')
+ 
+-	read_files_pattern($1,{ proc_t sysctl_t sysctl_kernel_t },sysctl_kernel_t)
++	read_files_pattern($1, { proc_t sysctl_t sysctl_kernel_t }, sysctl_kernel_t)
+ 
+-	list_dirs_pattern($1,{ proc_t sysctl_t },sysctl_kernel_t)
++	list_dirs_pattern($1, { proc_t sysctl_t }, sysctl_kernel_t)
+ ')
+ 
+ ########################################
+@@ -1617,9 +1622,9 @@
+ 		type proc_t, sysctl_t, sysctl_kernel_t;
+ 	')
+ 
+-	rw_files_pattern($1,{ proc_t sysctl_t sysctl_kernel_t },sysctl_kernel_t)
++	rw_files_pattern($1, { proc_t sysctl_t sysctl_kernel_t }, sysctl_kernel_t)
+ 
+-	list_dirs_pattern($1,{ proc_t sysctl_t },sysctl_kernel_t)
++	list_dirs_pattern($1, { proc_t sysctl_t }, sysctl_kernel_t)
+ ')
+ 
+ ########################################
+@@ -1638,9 +1643,9 @@
+ 		type proc_t, sysctl_t, sysctl_fs_t;
+ 	')
+ 
+-	read_files_pattern($1,{ proc_t sysctl_t sysctl_fs_t },sysctl_fs_t)
++	read_files_pattern($1, { proc_t sysctl_t sysctl_fs_t }, sysctl_fs_t)
+ 
+-	list_dirs_pattern($1,{ proc_t sysctl_t },sysctl_fs_t)
++	list_dirs_pattern($1, { proc_t sysctl_t }, sysctl_fs_t)
+ ')
+ 
+ ########################################
+@@ -1659,9 +1664,9 @@
+ 		type proc_t, sysctl_t, sysctl_fs_t;
+ 	')
+ 
+-	rw_files_pattern($1,{ proc_t sysctl_t sysctl_fs_t },sysctl_fs_t)
++	rw_files_pattern($1, { proc_t sysctl_t sysctl_fs_t }, sysctl_fs_t)
+ 
+-	list_dirs_pattern($1,{ proc_t sysctl_t },sysctl_fs_t)
++	list_dirs_pattern($1, { proc_t sysctl_t }, sysctl_fs_t)
+ ')
+ 
+ ########################################
+@@ -1680,9 +1685,9 @@
+ 		type proc_t, sysctl_irq_t;
+ 	')
+ 
+-	read_files_pattern($1,{ proc_t sysctl_irq_t },sysctl_irq_t)
++	read_files_pattern($1, { proc_t sysctl_irq_t }, sysctl_irq_t)
+ 
+-	list_dirs_pattern($1,proc_t,sysctl_irq_t)
++	list_dirs_pattern($1, proc_t, sysctl_irq_t)
+ ')
+ 
+ ########################################
+@@ -1701,9 +1706,9 @@
+ 		type proc_t, sysctl_irq_t;
+ 	')
+ 
+-	rw_files_pattern($1,{ proc_t sysctl_irq_t },sysctl_irq_t)
++	rw_files_pattern($1, { proc_t sysctl_irq_t }, sysctl_irq_t)
+ 
+-	list_dirs_pattern($1,proc_t,sysctl_irq_t)
++	list_dirs_pattern($1, proc_t, sysctl_irq_t)
+ ')
+ 
+ ########################################
+@@ -1722,9 +1727,9 @@
+ 		type proc_t, proc_net_t, sysctl_rpc_t;
+ 	')
+ 
+-	read_files_pattern($1,{ proc_t proc_net_t sysctl_rpc_t },sysctl_rpc_t)
++	read_files_pattern($1, { proc_t proc_net_t sysctl_rpc_t }, sysctl_rpc_t)
+ 
+-	list_dirs_pattern($1,{ proc_t proc_net_t },sysctl_rpc_t)
++	list_dirs_pattern($1, { proc_t proc_net_t }, sysctl_rpc_t)
+ ')
+ 
+ ########################################
+@@ -1743,9 +1748,9 @@
+ 		type proc_t, proc_net_t, sysctl_rpc_t;
+ 	')
+ 
+-	rw_files_pattern($1,{ proc_t proc_net_t sysctl_rpc_t },sysctl_rpc_t)
++	rw_files_pattern($1, { proc_t proc_net_t sysctl_rpc_t }, sysctl_rpc_t)
+ 
+-	list_dirs_pattern($1,{ proc_t proc_net_t },sysctl_rpc_t)
++	list_dirs_pattern($1, { proc_t proc_net_t }, sysctl_rpc_t)
+ ')
+ 
+ ########################################
+@@ -1764,6 +1769,7 @@
  	')
  
  	dontaudit $1 sysctl_type:dir list_dir_perms;
@@ -9136,10 +9682,95 @@
  ')
  
  ########################################
-@@ -2508,3 +2509,33 @@
+@@ -1784,9 +1790,9 @@
+ 	')
+ 
+ 	# proc_net_t for /proc/net/rpc sysctls
+-	read_files_pattern($1,{ proc_t proc_net_t sysctl_type },sysctl_type)
++	read_files_pattern($1, { proc_t proc_net_t sysctl_type }, sysctl_type)
+ 
+-	list_dirs_pattern($1,{ proc_t proc_net_t },sysctl_type)
++	list_dirs_pattern($1, { proc_t proc_net_t }, sysctl_type)
+ ')
+ 
+ ########################################
+@@ -1807,7 +1813,7 @@
+ 	')
  
- 	typeattribute $1 kern_unconfined;
+ 	# proc_net_t for /proc/net/rpc sysctls
+-	rw_files_pattern($1,{ proc_t proc_net_t sysctl_type },sysctl_type)
++	rw_files_pattern($1, { proc_t proc_net_t sysctl_type }, sysctl_type)
+ 
+ 	allow $1 sysctl_type:dir list_dir_perms;
+ 	# why is setattr needed?
+@@ -1938,8 +1944,8 @@
+ 	')
+ 
+ 	allow $1 unlabeled_t:dir list_dir_perms;
+-	read_files_pattern($1,unlabeled_t,unlabeled_t)
+-	read_lnk_files_pattern($1,unlabeled_t,unlabeled_t)
++	read_files_pattern($1, unlabeled_t, unlabeled_t)
++	read_lnk_files_pattern($1, unlabeled_t, unlabeled_t)
  ')
+ 
+ 
+@@ -2493,6 +2499,109 @@
+ 
+ ########################################
+ ## <summary>
++##	Receive packets from an unlabeled peer.
++## </summary>
++## <desc>
++##	<p>
++##	Receive packets from an unlabeled peer, these packets do not have any
++##      peer labeling information present.
++##	</p>
++##	<p>
++##	The corenetwork interface corenet_recvfrom_unlabeled_peer() should
++##	be used instead of this one.
++##	</p>
++## </desc>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`kernel_recvfrom_unlabeled_peer',`
++	gen_require(`
++		type unlabeled_t;
++	')
++
++	allow $1 unlabeled_t:peer recv;
++')
++
++########################################
++## <summary>
++##	Do not audit attempts to receive packets from an unlabeled peer.
++## </summary>
++## <desc>
++##	<p>
++##	Do not audit attempts to receive packets from an unlabeled peer,
++##      these packets do not have any peer labeling information present.
++##	</p>
++##	<p>
++##	The corenetwork interface corenet_dontaudit_*_recvfrom_unlabeled()
++##	should be used instead of this one.
++##	</p>
++## </desc>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`kernel_dontaudit_recvfrom_unlabeled_peer',`
++	gen_require(`
++		type unlabeled_t;
++	')
++
++	dontaudit $1 unlabeled_t:peer recv;
++')
 +
 +########################################
 +## <summary>
@@ -9170,9 +9801,32 @@
 +	allow $1 unlabeled_t:db_blob { setattr relabelfrom };
 +')
 +
++########################################
++## <summary>
++##      Relabel to unlabeled context .
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`kernel_relabelto_unlabeled',`
++	gen_require(`
++		type unlabeled_t;
++	')
++
++	allow $1 unlabeled_t:dir_file_class_set relabelto;
++')
++
++########################################
++## <summary>
+ ##	Unconfined access to kernel module resources.
+ ## </summary>
+ ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.3.1/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/kernel/kernel.te	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/kernel/kernel.te	2008-09-12 10:29:36.000000000 -0400
 @@ -45,6 +45,15 @@
  sid kernel gen_context(system_u:system_r:kernel_t,mls_systemhigh)
  
@@ -9189,7 +9843,41 @@
  # DebugFS
  #
  
-@@ -231,6 +240,8 @@
+@@ -54,6 +63,15 @@
+ genfscon debugfs / gen_context(system_u:object_r:debugfs_t,s0)
+ 
+ #
++# infinibandeventfs fs
++#
++
++type infinibandeventfs_t;
++fs_type(infinibandeventfs_t)
++allow infinibandeventfs_t self:filesystem associate;
++genfscon infinibandeventfs / gen_context(system_u:object_r:infinibandeventfs_t,s0)
++
++#
+ # kvmFS
+ #
+ 
+@@ -151,6 +169,7 @@
+ #
+ type unlabeled_t;
+ sid unlabeled gen_context(system_u:object_r:unlabeled_t,mls_systemhigh)
++fs_associate(unlabeled_t)
+ 
+ # These initial sids are no longer used, and can be removed:
+ sid any_socket		gen_context(system_u:object_r:unlabeled_t,mls_systemhigh)
+@@ -212,6 +231,9 @@
+ # connections with invalidated labels:
+ allow kernel_t unlabeled_t:packet send;
+ 
++# Forwarded network traffic
++allow unlabeled_t unlabeled_t:packet { forward_in forward_out };
++
+ corenet_all_recvfrom_unlabeled(kernel_t)
+ corenet_all_recvfrom_netlabel(kernel_t)
+ # Kernel-generated traffic e.g., ICMP replies:
+@@ -231,6 +253,8 @@
  # Mount root file system.  Used when loading a policy
  # from initrd, then mounting the root filesystem
  fs_mount_all_fs(kernel_t)
@@ -9198,7 +9886,7 @@
  
  selinux_load_policy(kernel_t)
  
-@@ -253,12 +264,16 @@
+@@ -253,12 +277,16 @@
  
  mls_process_read_up(kernel_t)
  mls_process_write_down(kernel_t)
@@ -9215,7 +9903,7 @@
  tunable_policy(`read_default_t',`
  	files_list_default(kernel_t)
  	files_read_default_files(kernel_t)
-@@ -363,7 +378,7 @@
+@@ -363,7 +391,7 @@
  
  allow kern_unconfined proc_type:{ dir file lnk_file } *;
  
@@ -9224,7 +9912,7 @@
  
  allow kern_unconfined kernel_t:system *;
  
-@@ -374,3 +389,4 @@
+@@ -374,3 +402,4 @@
  allow kern_unconfined unlabeled_t:process ~{ transition dyntransition execmem execstack execheap };
  
  kernel_rw_all_sysctls(kern_unconfined)
@@ -16886,6 +17574,20 @@
 +	polkit_read_lib(gnomeclock_t)
 +')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpm.te serefpolicy-3.3.1/policy/modules/services/gpm.te
+--- nsaserefpolicy/policy/modules/services/gpm.te	2008-06-12 23:38:01.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/gpm.te	2008-09-12 10:36:09.000000000 -0400
+@@ -41,8 +41,8 @@
+ allow gpm_t gpm_var_run_t:file manage_file_perms;
+ files_pid_filetrans(gpm_t,gpm_var_run_t,file)
+ 
+-allow gpm_t gpmctl_t:sock_file manage_file_perms;
+-allow gpm_t gpmctl_t:fifo_file manage_file_perms;
++allow gpm_t gpmctl_t:sock_file manage_sock_file_perms;
++allow gpm_t gpmctl_t:fifo_file manage_fifo_file_perms;
+ dev_filetrans(gpm_t,gpmctl_t,{ sock_file fifo_file })
+ 
+ kernel_read_kernel_sysctls(gpm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.3.1/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2008-06-12 23:38:02.000000000 -0400
 +++ serefpolicy-3.3.1/policy/modules/services/hal.fc	2008-09-08 11:45:12.000000000 -0400
@@ -18360,7 +19062,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.3.1/policy/modules/services/mailman.te
 --- nsaserefpolicy/policy/modules/services/mailman.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/mailman.te	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/mailman.te	2008-09-11 13:48:31.000000000 -0400
 @@ -53,10 +53,9 @@
  	apache_use_fds(mailman_cgi_t)
  	apache_dontaudit_append_log(mailman_cgi_t)
@@ -18374,7 +19076,7 @@
  ')
  
  ########################################
-@@ -65,8 +64,15 @@
+@@ -65,8 +64,19 @@
  #
  
  allow mailman_mail_t self:unix_dgram_socket create_socket_perms;
@@ -18384,6 +19086,10 @@
 +
 +files_search_spool(mailman_mail_t)
 +fs_rw_anon_inodefs_files(mailman_mail_t)
++
++manage_dirs_pattern(mailman_mail_t, mailman_archive_t, mailman_archive_t)
++manage_files_pattern(mailman_mail_t, mailman_archive_t, mailman_archive_t)
++manage_lnk_files_pattern(mailman_mail_t, mailman_archive_t, mailman_archive_t)
  
  mta_dontaudit_rw_delivery_tcp_sockets(mailman_mail_t)
 +mta_dontaudit_rw_queue(mailman_mail_t)
@@ -26300,7 +27006,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-3.3.1/policy/modules/services/snmp.te
 --- nsaserefpolicy/policy/modules/services/snmp.te	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/snmp.te	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/snmp.te	2008-09-09 08:43:38.000000000 -0400
 @@ -18,12 +18,16 @@
  type snmpd_var_lib_t;
  files_type(snmpd_var_lib_t)
@@ -26312,7 +27018,8 @@
  #
  # Local policy
  #
- allow snmpd_t self:capability { dac_override kill net_admin sys_nice sys_tty_config };
+-allow snmpd_t self:capability { dac_override kill net_admin sys_nice sys_tty_config };
++allow snmpd_t self:capability { dac_override kill net_admin sys_nice sys_tty_config sys_ptrace };
  dontaudit snmpd_t self:capability { sys_module sys_tty_config };
 +allow snmpd_t self:process { getsched setsched };
  allow snmpd_t self:fifo_file rw_fifo_file_perms;
@@ -26326,7 +27033,14 @@
  kernel_read_net_sysctls(snmpd_t)
  kernel_read_proc_symlinks(snmpd_t)
  kernel_read_system_state(snmpd_t)
-@@ -81,8 +86,7 @@
+@@ -76,13 +81,14 @@
+ domain_use_interactive_fds(snmpd_t)
+ domain_signull_all_domains(snmpd_t)
+ domain_read_all_domains_state(snmpd_t)
++domain_dontaudit_ptrace_all_domains(snmpd_t)
++domain_exec_all_entry_files(snmpd_t)
+ 
+ files_read_etc_files(snmpd_t)
  files_read_usr_files(snmpd_t)
  files_read_etc_runtime_files(snmpd_t)
  files_search_home(snmpd_t)
@@ -26336,6 +27050,24 @@
  
  fs_getattr_all_dirs(snmpd_t)
  fs_getattr_all_fs(snmpd_t)
+@@ -94,6 +100,8 @@
+ init_read_utmp(snmpd_t)
+ init_dontaudit_write_utmp(snmpd_t)
+ 
++auth_use_nsswitch(snmpd_t)
++
+ libs_use_ld_so(snmpd_t)
+ libs_use_shared_libs(snmpd_t)
+ 
+@@ -120,7 +128,7 @@
+ ')
+ 
+ optional_policy(`
+-	auth_use_nsswitch(snmpd_t)
++	consoletype_exec(snmpd_t)
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.fc serefpolicy-3.3.1/policy/modules/services/snort.fc
 --- nsaserefpolicy/policy/modules/services/snort.fc	2008-06-12 23:38:01.000000000 -0400
 +++ serefpolicy-3.3.1/policy/modules/services/snort.fc	2008-09-08 11:45:13.000000000 -0400
@@ -34151,7 +34883,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-3.3.1/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/selinuxutil.fc	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/system/selinuxutil.fc	2008-09-12 09:58:16.000000000 -0400
 @@ -38,7 +38,7 @@
  /usr/sbin/restorecond		--	gen_context(system_u:object_r:restorecond_exec_t,s0)
  /usr/sbin/run_init		--	gen_context(system_u:object_r:run_init_exec_t,s0)
@@ -34161,19 +34893,35 @@
  /usr/sbin/semanage		--	gen_context(system_u:object_r:semanage_exec_t,s0)
  /usr/sbin/semodule		--	gen_context(system_u:object_r:semanage_exec_t,s0)
  
+@@ -46,3 +46,8 @@
+ # /var/run
+ #
+ /var/run/restorecond\.pid	--	gen_context(system_u:object_r:restorecond_var_run_t,s0)
++
++#
++# /var/lib
++#
++/var/lib/selinux(/.*)?			gen_context(system_u:object_r:selinux_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.3.1/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/selinuxutil.if	2008-09-08 11:45:13.000000000 -0400
-@@ -215,8 +215,6 @@
- 	seutil_domtrans_newrole($1)
- 	role $2 types newrole_t;
- 	allow newrole_t $3:chr_file rw_term_perms;
--
--	auth_run_upd_passwd(newrole_t, $2, $3)
- ')
- 
- ########################################
-@@ -553,6 +551,59 @@
++++ serefpolicy-3.3.1/policy/modules/system/selinuxutil.if	2008-09-12 09:57:55.000000000 -0400
+@@ -430,6 +430,7 @@
+ 		role system_r;
+ 	')
+ 
++	auth_run_chk_passwd(run_init_t, $2, $3)
+ 	seutil_domtrans_runinit($1)
+ 	role $2 types run_init_t;
+ 	allow run_init_t $3:chr_file rw_term_perms;
+@@ -474,6 +475,7 @@
+ 		role system_r;
+ 	')
+ 
++	auth_run_chk_passwd(run_init_t, $2, $3)
+ 	seutil_init_script_domtrans_runinit($1)
+ 	role $2 types run_init_t;
+ 	allow run_init_t $3:chr_file rw_term_perms;
+@@ -553,6 +555,59 @@
  
  ########################################
  ## <summary>
@@ -34192,7 +34940,7 @@
 +
 +	files_search_usr($1)
 +	corecmd_search_bin($1)
-+	domtrans_pattern($1,setfiles_exec_t,setfiles_mac_t)
++	domtrans_pattern($1, setfiles_exec_t, setfiles_mac_t)
 +')
 +
 +########################################
@@ -34233,7 +34981,7 @@
  ##	Execute setfiles in the caller domain.
  ## </summary>
  ## <param name="domain">
-@@ -587,7 +638,7 @@
+@@ -587,7 +642,7 @@
  		type selinux_config_t;
  	')
  
@@ -34242,7 +34990,7 @@
  ')
  
  ########################################
-@@ -606,7 +657,7 @@
+@@ -606,7 +661,7 @@
  		type selinux_config_t;
  	')
  
@@ -34251,15 +34999,15 @@
  	dontaudit $1 selinux_config_t:file { getattr read };
  ')
  
-@@ -698,6 +749,7 @@
+@@ -698,6 +753,7 @@
  	')
  
  	files_search_etc($1)
-+	manage_dirs_pattern($1,selinux_config_t,selinux_config_t)
++	manage_dirs_pattern($1, selinux_config_t, selinux_config_t)
  	manage_files_pattern($1,selinux_config_t,selinux_config_t)
  	read_lnk_files_pattern($1,selinux_config_t,selinux_config_t)
  ')
-@@ -807,6 +859,28 @@
+@@ -807,6 +863,28 @@
  
  ########################################
  ## <summary>
@@ -34288,7 +35036,25 @@
  ##	Read and write the file_contexts files.
  ## </summary>
  ## <param name="domain">
-@@ -997,6 +1071,26 @@
+@@ -817,7 +895,7 @@
+ #
+ interface(`seutil_rw_file_contexts',`
+ 	gen_require(`
+-		type selinux_config_t, file_context_t;
++		type selinux_config_t, file_context_t, default_context_t;
+ 	')
+ 
+ 	files_search_etc($1)
+@@ -838,7 +916,7 @@
+ #
+ interface(`seutil_manage_file_contexts',`
+ 	gen_require(`
+-		type selinux_config_t, file_context_t;
++		type selinux_config_t, file_context_t, default_context_t;
+ 	')
+ 
+ 	files_search_etc($1)
+@@ -997,6 +1075,26 @@
  
  ########################################
  ## <summary>
@@ -34307,7 +35073,7 @@
 +
 +	files_search_usr($1)
 +	corecmd_search_bin($1)
-+	domtrans_pattern($1,setsebool_exec_t,setsebool_t)
++	domtrans_pattern($1, setsebool_exec_t, setsebool_t)
 +')
 +
 +########################################
@@ -34315,7 +35081,7 @@
  ##	Execute semanage in the semanage domain, and
  ##	allow the specified role the semanage domain,
  ##	and use the caller's terminal.
-@@ -1008,7 +1102,7 @@
+@@ -1008,7 +1106,7 @@
  ## </param>
  ## <param name="role">
  ##	<summary>
@@ -34324,7 +35090,7 @@
  ##	</summary>
  ## </param>
  ## <param name="terminal">
-@@ -1030,6 +1124,39 @@
+@@ -1030,6 +1128,39 @@
  
  ########################################
  ## <summary>
@@ -34364,7 +35130,7 @@
  ##	Full management of the semanage
  ##	module store.
  ## </summary>
-@@ -1141,3 +1268,260 @@
+@@ -1141,3 +1272,260 @@
  	selinux_dontaudit_get_fs_mount($1)
  	seutil_dontaudit_read_config($1)
  ')
@@ -34408,12 +35174,12 @@
 +
 +	type $1_setsebool_t;
 +	domain_type($1_setsebool_t)
-+	domain_entry_file($1_setsebool_t,setsebool_exec_t)
++	domain_entry_file($1_setsebool_t, setsebool_exec_t)
 +	role $3 types $1_setsebool_t;
 +
 +	files_search_usr($2)
 +	corecmd_search_bin($2)
-+	domtrans_pattern($2,setsebool_exec_t,$1_setsebool_t)
++	domtrans_pattern($2, setsebool_exec_t, $1_setsebool_t)
 +	seutil_semanage_policy($1_setsebool_t)
 +
 +	# Need to define per type booleans
@@ -34608,7 +35374,7 @@
 +	fs_rw_tmpfs_chr_files($1)
 +')
 +
-+ifdef(`distro_redhat', `
++ifdef(`distro_redhat',`
 +	fs_rw_tmpfs_chr_files($1)
 +	fs_rw_tmpfs_blk_files($1)
 +	fs_relabel_tmpfs_blk_file($1)
@@ -34627,8 +35393,18 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.3.1/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/selinuxutil.te	2008-09-08 11:45:13.000000000 -0400
-@@ -75,7 +75,6 @@
++++ serefpolicy-3.3.1/policy/modules/system/selinuxutil.te	2008-09-12 09:54:59.000000000 -0400
+@@ -23,6 +23,9 @@
+ type selinux_config_t;
+ files_type(selinux_config_t)
+ 
++type selinux_var_lib_t;
++files_type(selinux_var_lib_t)
++
+ type checkpolicy_t, can_write_binary_policy;
+ type checkpolicy_exec_t;
+ application_domain(checkpolicy_t, checkpolicy_exec_t)
+@@ -75,7 +78,6 @@
  type restorecond_exec_t;
  init_daemon_domain(restorecond_t,restorecond_exec_t)
  domain_obj_id_change_exemption(restorecond_t)
@@ -34636,7 +35412,7 @@
  
  type restorecond_var_run_t;
  files_pid_file(restorecond_var_run_t)
-@@ -92,6 +91,10 @@
+@@ -92,6 +94,10 @@
  domain_interactive_fd(semanage_t)
  role system_r types semanage_t;
  
@@ -34647,7 +35423,7 @@
  type semanage_store_t;
  files_type(semanage_store_t)
  
-@@ -109,6 +112,11 @@
+@@ -109,6 +115,11 @@
  init_system_domain(setfiles_t,setfiles_exec_t)
  domain_obj_id_change_exemption(setfiles_t)
  
@@ -34659,7 +35435,7 @@
  ########################################
  #
  # Checkpolicy local policy
-@@ -168,6 +176,7 @@
+@@ -168,6 +179,7 @@
  files_read_etc_runtime_files(load_policy_t)
  
  fs_getattr_xattr_fs(load_policy_t)
@@ -34667,7 +35443,7 @@
  
  mls_file_read_all_levels(load_policy_t)
  
-@@ -195,15 +204,6 @@
+@@ -195,15 +207,6 @@
  	')
  ')
  
@@ -34683,7 +35459,7 @@
  ########################################
  #
  # Newrole local policy
-@@ -221,7 +221,7 @@
+@@ -221,7 +224,7 @@
  allow newrole_t self:msg { send receive };
  allow newrole_t self:unix_dgram_socket sendto;
  allow newrole_t self:unix_stream_socket { create_stream_socket_perms connectto };
@@ -34692,7 +35468,7 @@
  
  read_files_pattern(newrole_t,default_context_t,default_context_t)
  read_lnk_files_pattern(newrole_t,default_context_t,default_context_t)
-@@ -277,6 +277,7 @@
+@@ -277,6 +280,7 @@
  libs_use_ld_so(newrole_t)
  libs_use_shared_libs(newrole_t)
  
@@ -34700,16 +35476,17 @@
  logging_send_syslog_msg(newrole_t)
  
  miscfiles_read_localization(newrole_t)
-@@ -347,6 +348,8 @@
+@@ -347,6 +351,9 @@
  
  seutil_libselinux_linked(restorecond_t)
  
 +userdom_read_all_users_home_dirs_symlinks(restorecond_t)
++userdom_read_all_users_home_content_symlinks(restorecond_t)
 +
  ifdef(`distro_ubuntu',`
  	optional_policy(`
  		unconfined_domain(restorecond_t)
-@@ -365,7 +368,7 @@
+@@ -365,7 +372,7 @@
  allow run_init_t self:process setexec;
  allow run_init_t self:capability setuid;
  allow run_init_t self:fifo_file rw_file_perms;
@@ -34718,7 +35495,7 @@
  
  # often the administrator runs such programs from a directory that is owned
  # by a different user or has restrictive SE permissions, do not want to audit
-@@ -396,7 +399,6 @@
+@@ -396,7 +403,6 @@
  
  auth_use_nsswitch(run_init_t)
  auth_domtrans_chk_passwd(run_init_t)
@@ -34726,7 +35503,7 @@
  auth_dontaudit_read_shadow(run_init_t)
  
  init_spec_domtrans_script(run_init_t)
-@@ -435,67 +437,28 @@
+@@ -435,64 +441,22 @@
  # semodule local policy
  #
  
@@ -34747,9 +35524,13 @@
 -corecmd_exec_bin(semanage_t)
 -
 -dev_read_urand(semanage_t)
--
++seutil_semanage_policy(semanage_t)
++allow semanage_t self:fifo_file rw_fifo_file_perms;
+ 
 -domain_use_interactive_fds(semanage_t)
--
++manage_dirs_pattern(semanage_t, selinux_var_lib_t,  selinux_var_lib_t)
++manage_files_pattern(semanage_t, selinux_var_lib_t,  selinux_var_lib_t)
+ 
 -files_read_etc_files(semanage_t)
 -files_read_etc_runtime_files(semanage_t)
 -files_read_usr_files(semanage_t)
@@ -34762,7 +35543,6 @@
 -selinux_get_enforce_mode(semanage_t)
 -selinux_getattr_fs(semanage_t)
 -# for setsebool:
-+seutil_semanage_policy(semanage_t)
  selinux_set_boolean(semanage_t)
 +can_exec(semanage_t, semanage_exec_t)
  
@@ -34777,11 +35557,11 @@
 -locallogin_use_fds(semanage_t)
 -
 -logging_send_syslog_msg(semanage_t)
+-
+-miscfiles_read_localization(semanage_t)
 +# Admins are creating pp files in random locations
 +auth_read_all_files_except_shadow(semanage_t)
  
--miscfiles_read_localization(semanage_t)
--
 -seutil_libselinux_linked(semanage_t)
  seutil_manage_file_contexts(semanage_t)
  seutil_manage_config(semanage_t)
@@ -34796,6 +35576,10 @@
  # netfilter_contexts:
  seutil_manage_default_contexts(semanage_t)
  
+@@ -501,12 +465,30 @@
+ 	files_read_var_lib_symlinks(semanage_t)
+ ')
+ 
 +userdom_search_sysadm_home_dirs(semanage_t)
 +
 +optional_policy(`
@@ -34804,10 +35588,14 @@
 +	consoletype_exec(semanage_t)
 +')
 +
- ifdef(`distro_debian',`
- 	files_read_var_lib_files(semanage_t)
- 	files_read_var_lib_symlinks(semanage_t)
-@@ -507,6 +470,11 @@
++ifdef(`distro_debian',`
++	files_read_var_lib_files(semanage_t)
++	files_read_var_lib_symlinks(semanage_t)
++')
++
+ ifdef(`distro_ubuntu',`
+ 	optional_policy(`
+ 		unconfined_domain(semanage_t)
  	')
  ')
  
@@ -34819,7 +35607,7 @@
  # cjp: need a more general way to handle this:
  ifdef(`enable_mls',`
  	# read secadm tmp files
-@@ -514,121 +482,35 @@
+@@ -514,121 +496,42 @@
  	# Handle pp files created in homedir and /tmp
  	userdom_read_sysadm_home_content_files(semanage_t)
  	userdom_read_sysadm_tmp_files(semanage_t)
@@ -34936,31 +35724,36 @@
 -		unconfined_domain(setfiles_t)
 -	')
 -')
--
--ifdef(`hide_broken_symptoms',`
--	optional_policy(`
--		udev_dontaudit_rw_dgram_sockets(setfiles_t)
--	')
 +########################################
 +#
 +# Setfiles local policy
 +#
  
+-ifdef(`hide_broken_symptoms',`
+-	optional_policy(`
+-		udev_dontaudit_rw_dgram_sockets(setfiles_t)
+-	')
++seutil_setfiles(setfiles_t)
++# During boot in Rawhide
++term_use_generic_ptys(setfiles_t)
+ 
 -	# cjp: cover up stray file descriptors.
 -	optional_policy(`
 -		unconfined_dontaudit_read_pipes(setfiles_t)
 -		unconfined_dontaudit_rw_tcp_sockets(setfiles_t)
 -	')
--')
-+seutil_setfiles(setfiles_t)
- 
- optional_policy(`
--	hotplug_use_fds(setfiles_t)
++optional_policy(`
 +	cron_system_entry(setfiles_t, setfiles_exec_t)
  ')
-+
+ 
 +seutil_setfiles(setfiles_mac_t)
++allow setfiles_mac_t self:capability2 mac_admin;
++kernel_relabelto_unlabeled(setfiles_mac_t)
 +
+ optional_policy(`
+-	hotplug_use_fds(setfiles_t)
++	unconfined_domain(setfiles_mac_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.fc serefpolicy-3.3.1/policy/modules/system/setrans.fc
 --- nsaserefpolicy/policy/modules/system/setrans.fc	2008-06-12 23:38:01.000000000 -0400
 +++ serefpolicy-3.3.1/policy/modules/system/setrans.fc	2008-09-08 11:45:13.000000000 -0400
@@ -40922,8 +41715,71 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.3.1/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt	2008-09-08 11:45:13.000000000 -0400
-@@ -315,3 +315,13 @@
++++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt	2008-09-12 10:31:36.000000000 -0400
+@@ -193,7 +193,7 @@
+ define(`create_dir_perms',`{ getattr create }')
+ define(`rename_dir_perms',`{ getattr rename }')
+ define(`delete_dir_perms',`{ getattr rmdir }')
+-define(`manage_dir_perms',`{ create getattr setattr read write link unlink rename search add_name remove_name reparent rmdir lock ioctl }')
++define(`manage_dir_perms',`{ create open getattr setattr read write link unlink rename search add_name remove_name reparent rmdir lock ioctl }')
+ define(`relabelfrom_dir_perms',`{ getattr relabelfrom }')
+ define(`relabelto_dir_perms',`{ getattr relabelto }')
+ define(`relabel_dir_perms',`{ getattr relabelfrom relabelto }')
+@@ -209,10 +209,10 @@
+ define(`append_file_perms',`{ getattr append lock ioctl }')
+ define(`write_file_perms',`{ getattr write append lock ioctl }')
+ define(`rw_file_perms',`{ getattr read write append ioctl lock }')
+-define(`create_file_perms',`{ getattr create }')
++define(`create_file_perms',`{ getattr create open }')
+ define(`rename_file_perms',`{ getattr rename }')
+ define(`delete_file_perms',`{ getattr unlink }')
+-define(`manage_file_perms',`{ create getattr setattr read write append rename link unlink ioctl lock }')
++define(`manage_file_perms',`{ create open getattr setattr read write append rename link unlink ioctl lock }')
+ define(`relabelfrom_file_perms',`{ getattr relabelfrom }')
+ define(`relabelto_file_perms',`{ getattr relabelto }')
+ define(`relabel_file_perms',`{ getattr relabelfrom relabelto }')
+@@ -223,7 +223,8 @@
+ define(`getattr_lnk_file_perms',`{ getattr }')
+ define(`setattr_lnk_file_perms',`{ setattr }')
+ define(`read_lnk_file_perms',`{ getattr read }')
+-define(`write_lnk_file_perms',`{ getattr write lock ioctl }')
++define(`append_lnk_file_perms',`{ getattr append lock ioctl }')
++define(`write_lnk_file_perms',`{ getattr append write lock ioctl }')
+ define(`rw_lnk_file_perms',`{ getattr read write lock ioctl }')
+ define(`create_lnk_file_perms',`{ create getattr }')
+ define(`rename_lnk_file_perms',`{ getattr rename }')
+@@ -242,10 +243,10 @@
+ define(`append_fifo_file_perms',`{ getattr append lock ioctl }')
+ define(`write_fifo_file_perms',`{ getattr write append lock ioctl }')
+ define(`rw_fifo_file_perms',`{ getattr read write append ioctl lock }')
+-define(`create_fifo_file_perms',`{ getattr create }')
++define(`create_fifo_file_perms',`{ getattr create open }')
+ define(`rename_fifo_file_perms',`{ getattr rename }')
+ define(`delete_fifo_file_perms',`{ getattr unlink }')
+-define(`manage_fifo_file_perms',`{ create getattr setattr read write append rename link unlink ioctl lock }')
++define(`manage_fifo_file_perms',`{ create open getattr setattr read write append rename link unlink ioctl lock }')
+ define(`relabelfrom_fifo_file_perms',`{ getattr relabelfrom }')
+ define(`relabelto_fifo_file_perms',`{ getattr relabelto }')
+ define(`relabel_fifo_file_perms',`{ getattr relabelfrom relabelto }')
+@@ -278,7 +279,7 @@
+ define(`create_blk_file_perms',`{ getattr create }')
+ define(`rename_blk_file_perms',`{ getattr rename }')
+ define(`delete_blk_file_perms',`{ getattr unlink }')
+-define(`manage_blk_file_perms',`{ create getattr setattr read write append rename link unlink ioctl lock }')
++define(`manage_blk_file_perms',`{ create open getattr setattr read write append rename link unlink ioctl lock }')
+ define(`relabelfrom_blk_file_perms',`{ getattr relabelfrom }')
+ define(`relabelto_blk_file_perms',`{ getattr relabelto }')
+ define(`relabel_blk_file_perms',`{ getattr relabelfrom relabelto }')
+@@ -295,7 +296,7 @@
+ define(`create_chr_file_perms',`{ getattr create }')
+ define(`rename_chr_file_perms',`{ getattr rename }')
+ define(`delete_chr_file_perms',`{ getattr unlink }')
+-define(`manage_chr_file_perms',`{ create getattr setattr read write append rename link unlink ioctl lock }')
++define(`manage_chr_file_perms',`{ create open getattr setattr read write append rename link unlink ioctl lock }')
+ define(`relabelfrom_chr_file_perms',`{ getattr relabelfrom }')
+ define(`relabelto_chr_file_perms',`{ getattr relabelto }')
+ define(`relabel_chr_file_perms',`{ getattr relabelfrom relabelto }')
+@@ -315,3 +316,13 @@
  #
  define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }')
  define(`server_stream_socket_perms', `{ client_stream_socket_perms listen accept }')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v
retrieving revision 1.706
retrieving revision 1.707
diff -u -r1.706 -r1.707
--- selinux-policy.spec	4 Sep 2008 20:59:27 -0000	1.706
+++ selinux-policy.spec	12 Sep 2008 14:46:47 -0000	1.707
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.3.1
-Release: 89.1%{?dist}
+Release: 90%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -386,6 +386,10 @@
 %endif
 
 %changelog
+* Tue Sep 2 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-90
+- Add rpcbind to mls policy
+- Fix up policy so permissive domains will work
+
 * Tue Sep 2 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-89
 - Fix init script paths
 



From spot at fedoraproject.org  Fri Sep 12 15:07:12 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 15:07:12 +0000 (UTC)
Subject: rpms/uqm/devel uqm.spec,1.17,1.18
Message-ID: <20080912150712.1C35370131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/uqm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16592

Modified Files:
	uqm.spec 
Log Message:
add missing provides/obsoletes


Index: uqm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uqm/devel/uqm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- uqm.spec	11 Sep 2008 14:18:57 -0000	1.17
+++ uqm.spec	12 Sep 2008 15:06:41 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           uqm
 Version:        0.6.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        The Ur-Quan Masters, a port of the classic game Star Control II
 
 Group:          Amusements/Games
@@ -25,7 +25,11 @@
 BuildRequires:  libmikmod-devel
 Requires:       autodownloader
 Provides:       uqm-content = %{version}-%{release}
+Provides:       uqm-content-3domusic = %{version}-%{release}
+Provides:       uqm-content-voice = %{version}-%{release}
 Obsoletes:      uqm-content <= 0.6.0-2
+Obsoletes:      uqm-content-3domusic <= 0.6.0-2
+Obsoletes:      uqm-content-voice <= 0.6.0-2
 
 
 %description
@@ -96,6 +100,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.2-7
+- forgot a few obsoletes/provides
+
 * Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.2-6
 - properly Provide/Obsolete dead uqm-content package
 



From rdieter at fedoraproject.org  Fri Sep 12 15:19:25 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 12 Sep 2008 15:19:25 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.103,1.104
Message-ID: <20080912151925.DBD0670131@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18825

Modified Files:
	comps-f10.xml.in 
Log Message:
sound-and-video: +xine-lib-pulseaudio conditional



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- comps-f10.xml.in	12 Sep 2008 09:26:15 -0000	1.103
+++ comps-f10.xml.in	12 Sep 2008 15:18:55 -0000	1.104
@@ -3778,6 +3778,7 @@
     <packagelist>
       <packagereq type="mandatory">alsa-utils</packagereq>
       <packagereq type="mandatory">vorbis-tools</packagereq>
+      <packagereq type="conditional" requires="xine-lib">xine-lib-pulseaudio</packagereq>
       <packagereq type="default">alsa-plugins-pulseaudio</packagereq>
       <packagereq type="default">bluez-utils-alsa</packagereq>
       <packagereq type="default">cdparanoia</packagereq>



From ruben at fedoraproject.org  Fri Sep 12 15:26:12 2008
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Fri, 12 Sep 2008 15:26:12 +0000 (UTC)
Subject: rpms/pdns/EL-5 pdns-bz461768.patch,NONE,1.1 pdns.spec,1.7,1.8
Message-ID: <20080912152612.9931070131@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/pdns/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19912

Modified Files:
	pdns.spec 
Added Files:
	pdns-bz461768.patch 
Log Message:
* Fri Sep 12 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21.1-2
- Fix AAAA record handling (bz #461768)


pdns-bz461768.patch:

--- NEW FILE pdns-bz461768.patch ---
Index: /trunk/pdns/pdns/packethandler.cc
===================================================================
--- /trunk/pdns/pdns/packethandler.cc (revision 1079)
+++ /trunk/pdns/pdns/packethandler.cc (revision 1081)
@@ -399,6 +399,8 @@
       }
     }
-    if(hits && !found && !rfound && shortcut ) // we found matching qnames but not a qtype
+    if(hits && !found && !rfound && shortcut ) { // we found matching qnames but not a qtype
+      DLOG(L<<"Found matching qname, but not the qtype"<<endl);
       return 2;
+    }
 
     if(rfound)
@@ -654,4 +656,5 @@
 
     if(mret==2) { // there is some data, but not of the correct type
+      r->clearRecords();
       DLOG(L<<"There is some data, but not of the correct type, adding SOA for NXRECORDSET"<<endl);
       SOAData sd;
@@ -696,5 +699,4 @@
       }
     }
-
     noSameLevelNS=true;
 
@@ -739,5 +741,5 @@
     // not found yet, try wildcards (we only try here in case of recursion - we should check before we hand off)
 
-    if(p->d.rd && d_doRecursion && d_doWildcards) { 
+    if(mret != 2 && p->d.rd && d_doRecursion && d_doWildcards) { 
       int res=doWildcardRecords(p,r,target);
       if(res) { // had a result


Index: pdns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/EL-5/pdns.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pdns.spec	6 Aug 2008 13:45:52 -0000	1.7
+++ pdns.spec	12 Sep 2008 15:25:42 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
 Version:	2.9.21.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		System Environment/Daemons
 License:	GPLv2
@@ -10,6 +10,7 @@
 Source0:	http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
 Patch0:		%{name}-fixinit.patch
 Patch1:		%{name}-avoid-version.patch
+Patch2:		%{name}-bz461768.patch
 
 Requires(post):	%{_sbindir}/useradd, /sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig
@@ -82,6 +83,7 @@
 %setup -q
 %patch0 -p1 -b .fixinit
 %patch1 -p1 -b .avoid-version
+%patch2 -p3
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}"
@@ -181,6 +183,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21.1-2
+- Fix AAAA record handling (bz #461768)
+
 * Wed Aug 06 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21.1-1
 - CVE-2008-3337
 



From spot at fedoraproject.org  Fri Sep 12 15:29:04 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 15:29:04 +0000 (UTC)
Subject: rpms/daa2iso/devel daa2iso.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20080912152904.5AB1970131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/daa2iso/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20493

Modified Files:
	daa2iso.spec sources 
Log Message:
update to 0.1.6


Index: daa2iso.spec
===================================================================
RCS file: /cvs/pkgs/rpms/daa2iso/devel/daa2iso.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- daa2iso.spec	27 May 2008 20:46:57 -0000	1.1
+++ daa2iso.spec	12 Sep 2008 15:28:34 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		daa2iso
 Summary: 	Program for converting DAA files to ISO
-Version:	0.1.4a
+Version:	0.1.6
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
@@ -39,5 +39,8 @@
 %{_bindir}/daa2iso
 
 %changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.1.6-1
+- update to 0.1.6
+
 * Tue May 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.1.4a-1
 - initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/daa2iso/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 May 2008 20:46:57 -0000	1.2
+++ sources	12 Sep 2008 15:28:34 -0000	1.3
@@ -1 +1 @@
-123cc1b3958265802a9063c035044581  daa2iso.zip
+0c77e1912019fb092176de3b77233941  daa2iso.zip



From clumens at fedoraproject.org  Fri Sep 12 15:33:12 2008
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Fri, 12 Sep 2008 15:33:12 +0000 (UTC)
Subject: rpms/firstboot/devel .cvsignore, 1.92, 1.93 firstboot.spec, 1.125, 
	1.126 sources, 1.122, 1.123
Message-ID: <20080912153312.086EC70131@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/firstboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21375

Modified Files:
	.cvsignore firstboot.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- .cvsignore	31 Jul 2008 19:44:34 -0000	1.92
+++ .cvsignore	12 Sep 2008 15:32:41 -0000	1.93
@@ -64,3 +64,4 @@
 firstboot-1.97.tar.bz2
 firstboot-1.98.tar.bz2
 firstboot-1.99.tar.bz2
+firstboot-1.100.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- firstboot.spec	31 Jul 2008 19:44:34 -0000	1.125
+++ firstboot.spec	12 Sep 2008 15:32:41 -0000	1.126
@@ -3,7 +3,7 @@
 Summary: Initial system configuration utility
 Name: firstboot
 URL: http://fedoraproject.org/wiki/FirstBoot
-Version: 1.99
+Version: 1.100
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -70,6 +70,10 @@
 %{_datadir}/firstboot/themes/default/*
 
 %changelog
+* Fri Sep 12 2008 Chris Lumens <clumens at redhat.com> 1.100-1
+- Force creating a user unless the network button was checked (jmccann, #461656).
+- Don't sit at the bootup splash screen indefinitely (#458553).
+
 * Thu Jul 31 2008 Chris Lumens <clumens at redhat.com> 1.99-1
 - Enable the correct keyboard layout (#453228).
 - Remove the timezone tab from the default date & time module (#442394).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/sources,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- sources	31 Jul 2008 19:44:34 -0000	1.122
+++ sources	12 Sep 2008 15:32:41 -0000	1.123
@@ -1 +1 @@
-8883a4e5b1eb6ddc121741b467fd3760  firstboot-1.99.tar.bz2
+119b8e1b09411c14ff95079ff9a011ea  firstboot-1.100.tar.bz2



From spot at fedoraproject.org  Fri Sep 12 15:34:49 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 15:34:49 +0000 (UTC)
Subject: rpms/fuseiso/devel fuseiso.spec,1.3,1.4
Message-ID: <20080912153449.853F970131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fuseiso/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21688

Modified Files:
	fuseiso.spec 
Log Message:
note on upstream patch


Index: fuseiso.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuseiso/devel/fuseiso.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fuseiso.spec	3 Apr 2008 17:03:25 -0000	1.3
+++ fuseiso.spec	12 Sep 2008 15:34:19 -0000	1.4
@@ -5,6 +5,7 @@
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://ubiz.ru/dm/%{name}-%{version}.tar.bz2
+# Upstream: https://sourceforge.net/tracker/index.php?func=detail&aid=1933445&group_id=215002&atid=1031924
 Patch0:		fuseiso-largeiso.patch
 URL:		http://fuse.sourceforge.net/wiki/index.php/FuseIso
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From spot at fedoraproject.org  Fri Sep 12 15:35:38 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 15:35:38 +0000 (UTC)
Subject: rpms/c-ares/devel .cvsignore, 1.7, 1.8 c-ares.spec, 1.12,
	1.13 sources, 1.7, 1.8
Message-ID: <20080912153538.5670C70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/c-ares/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21857

Modified Files:
	.cvsignore c-ares.spec sources 
Log Message:
update to 1.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/c-ares/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Feb 2008 16:20:30 -0000	1.7
+++ .cvsignore	12 Sep 2008 15:35:08 -0000	1.8
@@ -1 +1 @@
-c-ares-1.5.1.tar.gz
+c-ares-1.5.3.tar.gz


Index: c-ares.spec
===================================================================
RCS file: /cvs/pkgs/rpms/c-ares/devel/c-ares.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- c-ares.spec	20 Feb 2008 01:04:44 -0000	1.12
+++ c-ares.spec	12 Sep 2008 15:35:08 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: A library that performs asynchronous DNS operations
 Name: c-ares
-Version: 1.5.1
-Release: 2%{?dist}
+Version: 1.5.3
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://daniel.haxx.se/projects/c-ares/
@@ -18,6 +18,7 @@
 Summary: Development files for c-ares
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 This package contains the header files and static libraries needed to
@@ -54,9 +55,13 @@
 %{_includedir}/ares_dns.h
 %{_includedir}/ares_version.h
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/libcares.pc
 %{_mandir}/man3/ares_*
 
 %changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5.3-1
+- update to 1.5.3
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.5.1-2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/c-ares/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Feb 2008 16:20:30 -0000	1.7
+++ sources	12 Sep 2008 15:35:08 -0000	1.8
@@ -1 +1 @@
-f39acb8033391b0afebf367d314bed36  c-ares-1.5.1.tar.gz
+ec202543a8cb86647f52e1ed4b5c0b37  c-ares-1.5.3.tar.gz



From nphilipp at fedoraproject.org  Fri Sep 12 15:17:37 2008
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 12 Sep 2008 15:17:37 +0000 (UTC)
Subject: rpms/system-config-services/devel .cvsignore, 1.68, 1.69 sources,
	1.81, 1.82 system-config-services.spec, 1.80, 1.81
Message-ID: <20080912151737.B3C8870131@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-serv18278

Modified Files:
	.cvsignore sources system-config-services.spec 
Log Message:
version 0.99.23



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	26 Aug 2008 12:01:46 -0000	1.68
+++ .cvsignore	12 Sep 2008 15:17:07 -0000	1.69
@@ -1 +1 @@
-system-config-services-0.99.22.tar.bz2
+system-config-services-0.99.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sources	26 Aug 2008 12:01:46 -0000	1.81
+++ sources	12 Sep 2008 15:17:07 -0000	1.82
@@ -1 +1 @@
-8d403dff15eac4da45e83289f0f52d59  system-config-services-0.99.22.tar.bz2
+68f73b4db9958c724e9511075a1ccc1a  system-config-services-0.99.23.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- system-config-services.spec	26 Aug 2008 12:01:46 -0000	1.80
+++ system-config-services.spec	12 Sep 2008 15:17:07 -0000	1.81
@@ -11,7 +11,7 @@
 
 Summary: system-config-services is an initscript and xinetd configuration utility
 Name: system-config-services
-Version: 0.99.22
+Version: 0.99.23
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/services
 # We are upstream, thus the source is only available from within this source
@@ -44,7 +44,7 @@
 Requires: python >= 2.3.0
 Requires: dbus-python
 Requires: python-slip >= 0.1.11
-Requires: python-slip-dbus >= 0.1.7
+Requires: python-slip-dbus >= 0.1.12
 Requires: python-slip-gtk
 Requires: PolicyKit-gnome
 Obsoletes: serviceconf <= 0.8.1
@@ -107,6 +107,14 @@
 %{_mandir}/*/system-config-services.8*
 
 %changelog
+* Fri Sep 12 2008 Nils Philippsen <nphilipp at redhat.com> - 0.99.23-1
+- make double-thaws of notications fail
+- ensure correct order replay of frozen notifications when thawing (#460598)
+- ensure list is sensitive when dealing with herders that are ready already
+  (e.g. in the case of already running backend)
+- avoid premature herder ready signals
+- XinetdServiceHerder: delay added/deleted services signals only after startup
+
 * Tue Aug 26 2008 Nils Philippsen <nphilipp at redhat.com> - 0.99.22-1
 - version 0.99.22
 



From spot at fedoraproject.org  Fri Sep 12 15:41:55 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 15:41:55 +0000 (UTC)
Subject: rpms/gxemul/devel .cvsignore, 1.9, 1.10 gxemul.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <20080912154155.09C8270131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/gxemul/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23123

Modified Files:
	.cvsignore gxemul.spec sources 
Log Message:
0.4.6.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gxemul/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	19 Feb 2008 19:08:20 -0000	1.9
+++ .cvsignore	12 Sep 2008 15:41:24 -0000	1.10
@@ -1 +1 @@
-gxemul-0.4.6.2.tar.gz
+gxemul-0.4.6.5.tar.gz


Index: gxemul.spec
===================================================================
RCS file: /cvs/extras/rpms/gxemul/devel/gxemul.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gxemul.spec	20 Feb 2008 01:11:06 -0000	1.13
+++ gxemul.spec	12 Sep 2008 15:41:24 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		gxemul
-Version:	0.4.6.2
-Release:	2%{?dist}
+Version:	0.4.6.5
+Release:	1%{?dist}
 License:	BSD
 Group:		Development/Tools
 Summary:	Instruction-level machine emulator
@@ -41,6 +41,9 @@
 %{_mandir}/man1/gxemul.*
 
 %changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.6.5-1
+- update to 0.4.6.5
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.6.2-2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gxemul/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	19 Feb 2008 19:08:20 -0000	1.9
+++ sources	12 Sep 2008 15:41:24 -0000	1.10
@@ -1 +1 @@
-f26e1f796f50889c6f94e0764cdc36b5  gxemul-0.4.6.2.tar.gz
+8ffe3fde1c2f17ff54500665dce82a22  gxemul-0.4.6.5.tar.gz



From overholt at fedoraproject.org  Fri Sep 12 15:45:31 2008
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 12 Sep 2008 15:45:31 +0000 (UTC)
Subject: rpms/ws-commons-util/devel ws-commons-util.spec,1.9,1.10
Message-ID: <20080912154531.7F0E170131@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23838

Modified Files:
	ws-commons-util.spec 
Log Message:
* Fri Sep 12 2008 Andrew Overholt <overholt at redhat.com> 1.0.1-10
- Bump so I can chain-build with xmlrpc3.


Index: ws-commons-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ws-commons-util/devel/ws-commons-util.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ws-commons-util.spec	12 Sep 2008 14:28:30 -0000	1.9
+++ ws-commons-util.spec	12 Sep 2008 15:45:01 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           ws-commons-util
 Version:        1.0.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Common utilities from the Apache Web Services Project 
 
 Group:          System Environment/Libraries
@@ -82,6 +82,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Fri Sep 12 2008 Andrew Overholt <overholt at redhat.com> 1.0.1-10
+- Bump so I can chain-build with xmlrpc3.
+
 * Fri Sep 12 2008 Andrew Overholt <overholt at redhat.com> 1.0.1-9
 - Add ppc64.
 



From spot at fedoraproject.org  Fri Sep 12 15:45:31 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 15:45:31 +0000 (UTC)
Subject: rpms/jam/devel jam.spec,1.6,1.7
Message-ID: <20080912154531.1D6F770131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/jam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23817/jam/devel

Modified Files:
	jam.spec 
Log Message:
update source path


Index: jam.spec
===================================================================
RCS file: /cvs/extras/rpms/jam/devel/jam.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jam.spec	20 Feb 2008 01:11:59 -0000	1.6
+++ jam.spec	12 Sep 2008 15:45:00 -0000	1.7
@@ -5,7 +5,7 @@
 Group:		Development/Tools
 Summary:	Program construction tool, similar to make
 URL:		http://public.perforce.com/public/jam/index.html
-Source0:	ftp://ftp.perforce.com/pub/jam/%{name}-%{version}.tar
+Source0:	ftp://ftp.perforce.com/jam/%{name}-%{version}.tar
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	byacc
 



From dwalsh at fedoraproject.org  Fri Sep 12 15:45:51 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 12 Sep 2008 15:45:51 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.390,
	1.391 policycoreutils.spec, 1.557, 1.558
Message-ID: <20080912154551.734CC70131@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23974

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Fri Sep 12 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-9
- Fix semanage help display


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- policycoreutils-rhat.patch	8 Sep 2008 21:03:49 -0000	1.390
+++ policycoreutils-rhat.patch	12 Sep 2008 15:45:19 -0000	1.391
@@ -92,7 +92,7 @@
  }
 diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.55/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/semanage/semanage	2008-09-08 14:46:57.000000000 -0400
++++ policycoreutils-2.0.55/semanage/semanage	2008-09-12 11:43:28.000000000 -0400
 @@ -20,7 +20,7 @@
  #                                        02111-1307  USA
  #
@@ -107,7 +107,7 @@
  
  	def usage(message = ""):
 -		print _("""
-+               raise ValueError(_("""
++               text = _("""
 +semanage [ -S store ] -i [ input_file | - ]
 +
  semanage {boolean|login|user|port|interface|node|fcontext|translation} -{l|D} [-n]
@@ -121,15 +121,16 @@
  	-l, --list       List the OBJECTS
  	-C, --locallist  List OBJECTS local customizations
  	-D, --deleteall  Remove all OBJECTS local customizations
-@@ -91,9 +94,8 @@
+@@ -90,10 +93,9 @@
+ 
  	-s, --seuser     SELinux User Name
  	-t, --type       SELinux Type for the object
- 	-r, --range      MLS/MCS Security Range (MLS/MCS Systems only)
--""")
+-	-r, --range      MLS/MCS Security Range (MLS/MCS Systems only)
++	-r, --range      MLS/MCS Security Range (MLS/MCS Systems only
+ """)
 -		print message
 -		sys.exit(1)
-+%s
-+""") % message)
++               raise ValueError("%s\n%s" % (text, message))
  		
  	def errorExit(error):
  		sys.stderr.write("%s: " % sys.argv[0])
@@ -204,7 +205,8 @@
 +		object = argv[0]
  		option_dict=get_options()
  		if object not in option_dict.keys():
- 			usage(_("%s not defined") % object)
+-			usage(_("%s not defined") % object)
++			usage(_("Invalid parameter %s not defined") % object)
  			
 -		args = sys.argv[2:]
 +		args = argv[1:]


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.557
retrieving revision 1.558
diff -u -r1.557 -r1.558
--- policycoreutils.spec	11 Sep 2008 13:55:11 -0000	1.557
+++ policycoreutils.spec	12 Sep 2008 15:45:21 -0000	1.558
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.55
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Fri Sep 12 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-9
+- Fix semanage help display
+
 * Thu Sep 11 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-8
 - Only call gen_requires once in sepolgen
 



From dwalsh at fedoraproject.org  Fri Sep 12 15:59:20 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 12 Sep 2008 15:59:20 +0000 (UTC)
Subject: rpms/policycoreutils/devel .cvsignore, 1.187,
	1.188 policycoreutils-po.patch, 1.39,
	1.40 policycoreutils-rhat.patch, 1.391,
	1.392 policycoreutils.spec, 1.558, 1.559 sources, 1.192, 1.193
Message-ID: <20080912155920.6728D70131@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26596

Modified Files:
	.cvsignore policycoreutils-po.patch policycoreutils-rhat.patch 
	policycoreutils.spec sources 
Log Message:
* Fri Sep 12 2008 Dan Walsh <dwalsh at redhat.com> 2.0.56-1
- Fix semanage help display
- Update to upstream
	* fixfiles will now remove all files in /tmp and will check for
	  unlabeled_t in /tmp and /var/tmp from Dan Walsh.
	* add glob support to restorecond from Dan Walsh.
	* allow semanage to handle multi-line commands in a single transaction
	  from Dan Walsh.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- .cvsignore	29 Aug 2008 19:05:21 -0000	1.187
+++ .cvsignore	12 Sep 2008 15:58:45 -0000	1.188
@@ -187,3 +187,4 @@
 policycoreutils-2.0.53.tgz
 policycoreutils-2.0.54.tgz
 policycoreutils-2.0.55.tgz
+policycoreutils-2.0.56.tgz

policycoreutils-po.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.39 -r 1.40 policycoreutils-po.patch
Index: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- policycoreutils-po.patch	9 Sep 2008 16:18:37 -0000	1.39
+++ policycoreutils-po.patch	12 Sep 2008 15:58:45 -0000	1.40
@@ -1,23 +1,3 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/.cvsignore policycoreutils-2.0.55/po/.cvsignore
---- nsapolicycoreutils/po/.cvsignore	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/po/.cvsignore	2008-08-29 14:34:59.000000000 -0400
-@@ -0,0 +1,16 @@
-+*.gmo
-+*.mo
-+*.pot
-+.intltool-merge-cache
-+Makefile
-+Makefile.in
-+Makefile.in.in
-+POTFILES
-+cat-id-tbl.c
-+messages
-+missing
-+notexist
-+po2tbl.sed
-+po2tbl.sed.in
-+stamp-cat-id
-+stamp-it
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-2.0.55/po/Makefile
 --- nsapolicycoreutils/po/Makefile	2008-08-28 09:34:24.000000000 -0400
 +++ policycoreutils-2.0.55/po/Makefile	2008-08-29 14:34:59.000000000 -0400
@@ -230,13 +210,13 @@
  secon/secon.c
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.55/po/af.po
 --- nsapolicycoreutils/po/af.po	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/po/af.po	2008-09-09 12:15:40.000000000 -0400
++++ policycoreutils-2.0.55/po/af.po	2008-09-12 11:53:31.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2006-11-21 14:21-0500\n"
-+"POT-Creation-Date: 2008-09-09 12:11-0400\n"
++"POT-Creation-Date: 2008-09-09 13:24-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"
@@ -2211,7 +2191,7 @@
 +
 +#: ../gui/polgen.py:163
 +#, python-format
-+msgid "Ports must be be numbers or ranges of numbers from 1 to %d "
++msgid "Ports must be numbers or ranges of numbers from 1 to %d "
 +msgstr ""
 +
 +#: ../gui/polgen.py:192
@@ -4126,13 +4106,13 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.55/po/am.po
 --- nsapolicycoreutils/po/am.po	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/po/am.po	2008-09-09 12:15:40.000000000 -0400
++++ policycoreutils-2.0.55/po/am.po	2008-09-12 11:53:31.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2006-11-21 14:21-0500\n"
-+"POT-Creation-Date: 2008-09-09 12:11-0400\n"
++"POT-Creation-Date: 2008-09-09 13:24-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"
@@ -6107,7 +6087,7 @@
 +
 +#: ../gui/polgen.py:163
 +#, python-format
-+msgid "Ports must be be numbers or ranges of numbers from 1 to %d "
++msgid "Ports must be numbers or ranges of numbers from 1 to %d "
 +msgstr ""
 +
 +#: ../gui/polgen.py:192
@@ -8022,13 +8002,13 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.55/po/ar.po
 --- nsapolicycoreutils/po/ar.po	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/po/ar.po	2008-09-09 12:15:40.000000000 -0400
++++ policycoreutils-2.0.55/po/ar.po	2008-09-12 11:53:31.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2006-11-21 14:21-0500\n"
-+"POT-Creation-Date: 2008-09-09 12:11-0400\n"
++"POT-Creation-Date: 2008-09-09 13:24-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"
@@ -10003,7 +9983,7 @@
 +
 +#: ../gui/polgen.py:163
 +#, python-format
-+msgid "Ports must be be numbers or ranges of numbers from 1 to %d "
++msgid "Ports must be numbers or ranges of numbers from 1 to %d "
 +msgstr ""
 +
 +#: ../gui/polgen.py:192
@@ -11918,7 +11898,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.55/po/as.po
 --- nsapolicycoreutils/po/as.po	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/po/as.po	2008-09-09 12:15:40.000000000 -0400
++++ policycoreutils-2.0.55/po/as.po	2008-09-12 11:53:31.000000000 -0400
 @@ -1,1028 +1,3696 @@
  # translation of as.po to Assamese
  # This file is distributed under the same license as the PACKAGE package.
@@ -11932,7 +11912,7 @@
 +msgstr ""
 +"Project-Id-Version: as\n"
 +"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2008-09-09 12:11-0400\n"
++"POT-Creation-Date: 2008-09-09 13:24-0400\n"
 +"PO-Revision-Date: 2008-01-31 12:04+0530\n"
 +"Last-Translator: Amitakhya Phukan <aphukan at fedoraproject.org>\n"
 +"Language-Team: Assamese\n"
@@ -13888,7 +13868,7 @@
 +
 +#: ../gui/polgen.py:163
 +#, fuzzy, python-format
-+msgid "Ports must be be numbers or ranges of numbers from 1 to %d "
++msgid "Ports must be numbers or ranges of numbers from 1 to %d "
 +msgstr "??????????????? ?????????????????? 1 ???????????? %d-??? ???????????? ?????????????????? "
 +
 +#: ../gui/polgen.py:192
@@ -16395,13 +16375,13 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.55/po/be.po
 --- nsapolicycoreutils/po/be.po	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/po/be.po	2008-09-09 12:15:40.000000000 -0400
++++ policycoreutils-2.0.55/po/be.po	2008-09-12 11:53:31.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2006-11-21 14:21-0500\n"
-+"POT-Creation-Date: 2008-09-09 12:11-0400\n"
++"POT-Creation-Date: 2008-09-09 13:24-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"
@@ -18376,7 +18356,7 @@
 +
 +#: ../gui/polgen.py:163
 +#, python-format
-+msgid "Ports must be be numbers or ranges of numbers from 1 to %d "
++msgid "Ports must be numbers or ranges of numbers from 1 to %d "
 +msgstr ""
 +
 +#: ../gui/polgen.py:192
@@ -20291,7 +20271,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.55/po/bg.po
 --- nsapolicycoreutils/po/bg.po	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/po/bg.po	2008-09-09 12:15:40.000000000 -0400
++++ policycoreutils-2.0.55/po/bg.po	2008-09-12 11:53:31.000000000 -0400
 @@ -1,1028 +1,4007 @@
 -# SOME DESCRIPTIVE TITLE.
 -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -20306,7 +20286,7 @@
 +msgstr ""
 +"Project-Id-Version: policycoreutils\n"
 +"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2008-09-09 12:11-0400\n"
++"POT-Creation-Date: 2008-09-09 13:24-0400\n"
 +"PO-Revision-Date: 2008-03-10 21:37+0100\n"
 +"Last-Translator: Alexander Todorov <atodorov at redhat.com>\n"
 +"Language-Team: Bulgarian <dict at fsa-bg.org>\n"
@@ -22321,7 +22301,7 @@
 +
 +#: ../gui/polgen.py:163
 +#, fuzzy, python-format
-+msgid "Ports must be be numbers or ranges of numbers from 1 to %d "
++msgid "Ports must be numbers or ranges of numbers from 1 to %d "
 +msgstr "?????????????????? ???????????? ???? ???? ?????????? ???? 1 ???? %d "
 +
 +#: ../gui/polgen.py:192
@@ -25067,13 +25047,13 @@
 +#~ msgstr "???????????? ???? ?????? root ???? ???? ???????????????????? %s."
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.55/po/bn.po
 --- nsapolicycoreutils/po/bn.po	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/po/bn.po	2008-09-09 12:15:40.000000000 -0400
++++ policycoreutils-2.0.55/po/bn.po	2008-09-12 11:53:31.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2006-11-21 14:21-0500\n"
-+"POT-Creation-Date: 2008-09-09 12:11-0400\n"
++"POT-Creation-Date: 2008-09-09 13:24-0400\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
[...26126 lines suppressed...]
++msgid ""
++"SELinux MLS/MCS\n"
++"Level"
 +msgstr ""
++"SELinux MLS/MCS\n"
++"??????"
  
 -#: ../audit2allow/audit2allow:183
 -#, c-format
 -msgid "Generating type enforcment file: %s.te"
 -msgstr "????????????????????????%s.te"
-+#: ../gui/system-config-selinux.glade:2775
-+msgid "Delete Network Port"
-+msgstr ""
++#: ../gui/system-config-selinux.glade.h:51
++msgid "SELinux Type"
++msgstr "SELinux ??????"
  
 -#: ../audit2allow/audit2allow:189 ../audit2allow/audit2allow:194
 -msgid "Compiling policy"
 -msgstr "????????????"
-+#: ../gui/system-config-selinux.glade:2811
-+#: ../gui/system-config-selinux.glade:2829
++#: ../gui/system-config-selinux.glade.h:54
++msgid ""
++"Select if you wish to relabel then entire file system on next reboot.  "
++"Relabeling can take a very long time, depending on the size of the system.  "
++"If you are changing policy types or going from disabled to enforcing, a "
++"relabel is required."
++msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
++
++#: ../gui/system-config-selinux.glade.h:55
++msgid "System Default Enforcing Mode"
++msgstr "????????????????????????"
++
++#: ../gui/system-config-selinux.glade.h:56
++msgid "System Default Policy Type: "
++msgstr "???????????????????????????"
++
++#: ../gui/system-config-selinux.glade.h:57
++msgid "Toggle between Customized and All Booleans"
++msgstr "???????????????????????????????????????????????????"
++
++#: ../gui/system-config-selinux.glade.h:58
 +msgid "Toggle between Customized and All Ports"
-+msgstr ""
++msgstr "???????????????????????????????????????????????????"
++
++#: ../gui/system-config-selinux.glade.h:59
++msgid "Toggle between all and customized file context"
++msgstr "?????????????????????????????? context ??????????????????"
++
++#: ../gui/system-config-selinux.glade.h:61
++msgid "_Delete"
++msgstr "?????????_D???"
++
++#: ../gui/system-config-selinux.glade.h:62
++msgid "_Properties"
++msgstr "?????????_P???"
  
 -#: ../audit2allow/audit2allow:205
--msgid ""
++#: ../gui/system-config-selinux.glade.h:63
+ msgid ""
 -"\n"
 -"******************** IMPORTANT ***********************\n"
-+#: ../gui/system-config-selinux.glade:2948
-+msgid "label42"
++"all files\n"
++"regular file\n"
++"directory\n"
++"character device\n"
++"block device\n"
++"socket\n"
++"symbolic link\n"
++"named pipe\n"
  msgstr ""
 -"\n"
 -"******************** ?????? ***********************\n"
++"????????????\n"
++"????????????\n"
++"??????\n"
++"????????????\n"
++"????????????\n"
++"socket\n"
++"????????????\n"
++"named ??????\n"
  
 -#: ../audit2allow/audit2allow:206
 -#, c-format
-+#: ../gui/system-config-selinux.glade:2985
-+msgid "Generate new policy module"
-+msgstr ""
-+
-+#: ../gui/system-config-selinux.glade:3001
-+#, fuzzy
-+msgid "Load policy module"
-+msgstr "?????????????????? store???"
-+
-+#: ../gui/system-config-selinux.glade:3017
-+msgid "Remove loadable policy module"
-+msgstr ""
-+
-+#: ../gui/system-config-selinux.glade:3053
++#: ../gui/system-config-selinux.glade.h:73
  msgid ""
 -"In order to load this newly created policy package into the kernel,\n"
 -"you are required to execute \n"
 -"\n"
 -"semodule -i %s.pp\n"
 -"\n"
-+"Enable/Disable additional audit rules, that are normally not reported in the "
-+"log files."
++"tcp\n"
++"udp"
  msgstr ""
 -"????????????????????????????????????????????????????????????\n"
 -"???????????????\n"
 -"\n"
 -"semodule -i %s.pp\n"
 -"\n"
++"tcp\n"
++"udp"
  
 -#: ../audit2allow/audit2allow:211
 -#, c-format
 -msgid "Options Error: %s "
 -msgstr "???????????????%s"
-+#: ../gui/system-config-selinux.glade:3172
-+msgid "label44"
-+msgstr ""
-+
-+#: ../gui/translationsPage.py:53
-+msgid "Sensitvity Level"
-+msgstr ""
-+
-+#: ../gui/usersPage.py:138
-+#, fuzzy, python-format
-+msgid "SELinux user '%s' is required"
-+msgstr "?????? SELinux ??????"
-+
-+#~ msgid "Requires value"
-+#~ msgstr "????????????"
-+
-+#~ msgid "Invalid prefix %s"
-+#~ msgstr "??????????????? %s"
-+
-+#~ msgid "Requires 2 or more arguments"
-+#~ msgstr "???????????????????????????"
-+
-+#~ msgid "%s not defined"
-+#~ msgstr "%s ?????????"
-+
-+#~ msgid "%s not valid for %s objects\n"
-+#~ msgstr "%s ??? %s ????????????????????????\n"
-+
-+#~ msgid "range not supported on Non MLS machines"
-+#~ msgstr "??? MLS ???????????????????????????"
-+
-+#~ msgid "Invalid value %s"
-+#~ msgstr "??????????????? %s"
-+
-+#~ msgid ""
-+#~ "In order to load this newly created policy package into the kernel,\n"
-+#~ "you are required to execute \n"
-+#~ "\n"
-+#~ "semodule -i %s.pp\n"
-+#~ "\n"
-+#~ msgstr ""
-+#~ "????????????????????????????????????????????????????????????\n"
-+#~ "???????????????\n"
-+#~ "\n"
-+#~ "semodule -i %s.pp\n"
-+#~ "\n"
-+
-+#~ msgid "Options Error: %s "
-+#~ msgstr "???????????????%s"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.55/po/zu.po
 --- nsapolicycoreutils/po/zu.po	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/po/zu.po	2008-09-09 12:15:50.000000000 -0400
++++ policycoreutils-2.0.55/po/zu.po	2008-09-12 11:53:32.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2006-11-21 14:21-0500\n"
-+"POT-Creation-Date: 2008-09-09 12:11-0400\n"
++"POT-Creation-Date: 2008-09-09 13:24-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"
@@ -312279,7 +311277,7 @@
 +
 +#: ../gui/polgen.py:163
 +#, python-format
-+msgid "Ports must be be numbers or ranges of numbers from 1 to %d "
++msgid "Ports must be numbers or ranges of numbers from 1 to %d "
 +msgstr ""
 +
 +#: ../gui/polgen.py:192

policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- policycoreutils-rhat.patch	12 Sep 2008 15:45:19 -0000	1.391
+++ policycoreutils-rhat.patch	12 Sep 2008 15:58:46 -0000	1.392
@@ -7,1666 +7,35 @@
  
  INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.55/restorecond/restorecond.conf
---- nsapolicycoreutils/restorecond/restorecond.conf	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/restorecond/restorecond.conf	2008-09-03 17:38:35.000000000 -0400
-@@ -1,7 +1,8 @@
-+/etc/services
- /etc/resolv.conf
- /etc/samba/secrets.tdb
- /etc/mtab
- /var/run/utmp
- /var/log/wtmp
--~/public_html
-+~/*
- ~/.mozilla/plugins/libflashplayer.so
-diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/stringslist.c policycoreutils-2.0.55/restorecond/stringslist.c
---- nsapolicycoreutils/restorecond/stringslist.c	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/restorecond/stringslist.c	2008-09-03 17:43:40.000000000 -0400
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2006 Red Hat 
-+ * Copyright (C) 2006, 2008 Red Hat 
-  * see file 'COPYING' for use and warranty information
-  *
-  * This program is free software; you can redistribute it and/or
-@@ -27,6 +27,7 @@
- #include <stdlib.h>
- #include "stringslist.h"
- #include "restorecond.h"
-+#include <fnmatch.h>
- 
- /* Sorted lists */
- void strings_list_add(struct stringsList **list, const char *string)
-@@ -57,11 +58,9 @@
- int strings_list_find(struct stringsList *ptr, const char *string)
- {
- 	while (ptr) {
--		int cmp = strcmp(string, ptr->string);
--		if (cmp < 0)
--			return -1;	/* Not on list break out to add */
--		if (cmp == 0)
--			return 0;	/* Already on list */
-+		int cmp = fnmatch(ptr->string, string, 0);
-+		if (cmp == 0) 
-+			return 0;	/* Match found */
- 		ptr = ptr->next;
- 	}
- 	return -1;
-@@ -120,6 +119,7 @@
- 	if (strings_list_diff(list, list1) == 0)
- 		printf("strings_list_diff test2 bug\n");
- 	strings_list_add(&list1, "/etc/walsh");
-+	strings_list_add(&list1, "/etc/walsh/*");
- 	strings_list_add(&list1, "/etc/resolv.conf");
- 	strings_list_add(&list1, "/etc/mtab1");
- 	if (strings_list_diff(list, list1) == 0)
-@@ -127,6 +127,7 @@
- 	printf("strings list\n");
- 	strings_list_print(list);
- 	printf("strings list1\n");
-+	strings_list_find(list1, "/etc/walsh/dan");
- 	strings_list_print(list1);
- 	strings_list_free(list);
- 	strings_list_free(list1);
-diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.55/scripts/fixfiles
---- nsapolicycoreutils/scripts/fixfiles	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/scripts/fixfiles	2008-09-08 14:08:57.000000000 -0400
-@@ -139,14 +139,14 @@
- LogReadOnly
- ${SETFILES} -q ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
- rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-*
--find /tmp -context "*:file_t*" -exec chcon -t tmp_t {} \;
--find /var/tmp -context "*:file_t*" -exec chcon -t tmp_t {} \;
-+find /tmp \( -context "*:file_t*" -o -context "*:unlabeled_t*" \) -exec chcon -t tmp_t {} \;
-+find /var/tmp \( -context "*:file_t*" -o -context "*:unlabeled_t*" \) -exec chcon -t tmp_t {} \;
- exit $?
- }
- 
- fullrelabel() {
-     logit "Cleaning out /tmp"
--    rm -rf /tmp/.??* /tmp/*
-+    find /tmp/ -mindepth 1 -print0 | xargs -0 /bin/rm -f
-     LogReadOnly
-     restore
- }
 diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.55/semanage/semanage
---- nsapolicycoreutils/semanage/semanage	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/semanage/semanage	2008-09-12 11:43:28.000000000 -0400
-@@ -20,7 +20,7 @@
- #                                        02111-1307  USA
- #
- #  
--import os, sys, getopt
-+import sys, getopt, re
- import seobject
- import selinux
- PROGNAME="policycoreutils"
-@@ -43,7 +43,9 @@
+--- nsapolicycoreutils/semanage/semanage	2008-09-12 11:48:15.000000000 -0400
++++ policycoreutils-2.0.55/semanage/semanage	2008-09-12 11:49:59.000000000 -0400
+@@ -43,7 +43,7 @@
  if __name__ == '__main__':
  
  	def usage(message = ""):
--		print _("""
+-               raise ValueError(_("""
 +               text = _("""
-+semanage [ -S store ] -i [ input_file | - ]
-+
- semanage {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
-@@ -60,6 +62,7 @@
- 	-a, --add        Add a OBJECT record NAME
- 	-d, --delete     Delete a OBJECT record NAME
- 	-m, --modify     Modify a OBJECT record NAME
-+        -i, --input      Input multiple semange commands in a transaction 
- 	-l, --list       List the OBJECTS
- 	-C, --locallist  List OBJECTS local customizations
- 	-D, --deleteall  Remove all OBJECTS local customizations
-@@ -90,10 +93,9 @@
+ semanage [ -S store ] -i [ input_file | - ]
  
+ semanage {boolean|login|user|port|interface|node|fcontext|translation} -{l|D} [-n]
+@@ -94,8 +94,8 @@
  	-s, --seuser     SELinux User Name
  	-t, --type       SELinux Type for the object
--	-r, --range      MLS/MCS Security Range (MLS/MCS Systems only)
-+	-r, --range      MLS/MCS Security Range (MLS/MCS Systems only
- """)
--		print message
--		sys.exit(1)
+ 	-r, --range      MLS/MCS Security Range (MLS/MCS Systems only)
+-%s
+-""") % message)
++""")
 +               raise ValueError("%s\n%s" % (text, message))
  		
  	def errorExit(error):
  		sys.stderr.write("%s: " % sys.argv[0])
-@@ -124,12 +126,53 @@
- 		valid_option["permissive"] += [ '-a', '--add', '-d', '--delete', '-l', '--list', '-h', '--help', '-n', '--noheading', '-D', '--deleteall' ]
- 		return valid_option
- 
--	#
--	# 
--	#
--	try:
--		input = sys.stdin
--		output = sys.stdout
-+        def mkargv(line):
-+               dquote = "\""
-+               squote = "\'"
-+               l = line.split()
-+               ret = []
-+               i = 0
-+               while i < len(l):
-+                      cnt = len(re.findall(dquote, l[i]))
-+                      if cnt > 1:
-+                             ret.append(l[i].strip(dquote))
-+                             i = i + 1
-+                             continue
-+                      if cnt == 1:
-+                             quote = [ l[i].strip(dquote) ]
-+                             i = i + 1
-+                             
-+                             while i < len(l) and  dquote not in l[i]:
-+                                    quote.append(l[i])
-+                                    i = i + 1
-+                             quote.append(l[i].strip(dquote))
-+                             ret.append(" ".join(quote))
-+                             i = i + 1
-+                             continue
-+
-+                      cnt = len(re.findall(squote, l[i]))
-+                      if cnt > 1:
-+                             ret.append(l[i].strip(squote))
-+                             i = i + 1
-+                             continue
-+                      if cnt == 1:
-+                             quote = [ l[i].strip(squote) ]
-+                             i = i + 1
-+                             while i < len(l) and  squote not in l[i]:
-+                                    quote.append(l[i])
-+                                    i = i + 1
-+
-+                             quote.append(l[i].strip(squote))
-+                             ret.append(" ".join(quote))
-+                             i = i + 1
-+                             continue
-+
-+                      ret.append(l[i])
-+                      i = i + 1
-+
-+               return ret
-+
-+        def process_args(argv):
- 		serange = ""
- 		port = ""
- 		proto = ""
-@@ -151,24 +194,23 @@
- 		locallist = False
- 		use_file = False
-                 store = ""
--		if len(sys.argv) < 3:
--			usage(_("Requires 2 or more arguments"))
- 			
--		object = sys.argv[1]
-+		object = argv[0]
+@@ -198,7 +198,7 @@
+ 		object = argv[0]
  		option_dict=get_options()
  		if object not in option_dict.keys():
 -			usage(_("%s not defined") % object)
 +			usage(_("Invalid parameter %s not defined") % object)
  			
--		args = sys.argv[2:]
-+		args = argv[1:]
- 
- 		gopts, cmds = getopt.getopt(args,
--					    '01adf:lhmnp:s:FCDR:L:r:t:T:P:S:M:',
-+					    '01adf:i:lhmnp:s:FCDR:L:r:t:T:P:S:M:',
- 					    ['add',
- 					     'delete',
- 					     'deleteall',
- 					     'ftype=',
- 					     'file',
- 					     'help',
-+                                             'input=',
- 					     'list', 
- 					     'modify',
- 					     'noheading',
-@@ -184,7 +226,7 @@
- 					     'type=',
- 					     'trans=',
- 					     'prefix=',
--                         'mask='
-+                                             'mask='
- 					     ])
- 		for o, a in gopts:
- 			if o not in option_dict[object]:
-@@ -193,16 +235,16 @@
- 		for o,a in gopts:
- 			if o == "-a" or o == "--add":
- 				if modify or delete:
--					usage()
-+                                       raise ValueError(_("%s bad option") % o)
- 				add = True
- 				
- 			if o == "-d"  or o == "--delete":
- 				if modify or add:
--					usage()
-+                                       raise ValueError(_("%s bad option") % o)
- 				delete = True
- 			if o == "-D"  or o == "--deleteall":
- 				if modify:
--                                       usage()
-+                                       raise ValueError(_("%s bad option") % o)
- 				deleteall = True
- 			if o == "-f"  or o == "--ftype":
- 				ftype=a
-@@ -211,7 +253,7 @@
- 				use_file = True
- 
- 			if o == "-h" or o == "--help":
--				usage()
-+                               raise ValueError(_("%s bad option") % o)
- 
- 			if o == "-n" or o == "--noheading":
- 				heading = False
-@@ -221,7 +263,7 @@
- 
- 			if o == "-m"or o == "--modify":
- 				if delete or add:
--					usage()
-+                                       raise ValueError(_("%s bad option") % o)
- 				modify = True
- 				
- 			if o == "-S" or o == '--store':
-@@ -229,7 +271,7 @@
- 
- 			if o == "-r" or o == '--range':
- 				if is_mls_enabled == 0:
--					errorExit(_("range not supported on Non MLS machines"))
-+                                       raise ValueError(_("range not supported on Non MLS machines"))
- 				serange = a
- 
- 			if o == "-l" or o == "--list":
-@@ -237,7 +279,7 @@
- 
- 			if o == "-L" or o == '--level':
- 				if is_mls_enabled == 0:
--					errorExit(_("range not supported on Non MLS machines"))
-+                                       raise ValueError(_("range not supported on Non MLS machines"))
- 				selevel = a
- 
- 			if o == "-p" or o == '--proto':
-@@ -280,7 +322,7 @@
- 
- 		if object == "node":
- 			OBJECT = seobject.nodeRecords(store)
--		
-+
- 		if object == "fcontext":
- 			OBJECT = seobject.fcontextRecords(store)
- 		
-@@ -298,14 +340,14 @@
-                                OBJECT.list(heading, locallist, use_file)
- 			else:
-                                OBJECT.list(heading, locallist)
--			sys.exit(0);
-+                        return
- 			
- 		if deleteall:
- 			OBJECT.deleteall()
--			sys.exit(0);
-+                        return
- 			
- 		if len(cmds) != 1:
--			usage()
-+                       raise ValueError(_("%s bad option") % o)
-                         
-                 target = cmds[0]
- 
-@@ -317,10 +359,7 @@
- 				OBJECT.add(target, setrans)
- 
- 			if object == "user":
--                               rlist = []
--                               if not use_file:
--                                      rlist = roles.split()
--                               OBJECT.add(target, rlist, selevel, serange, prefix)
-+				OBJECT.add(target, roles.split(), selevel, serange, prefix)
- 
- 			if object == "port":
- 				OBJECT.add(target, proto, serange, setype)
-@@ -336,7 +375,7 @@
- 			if object == "permissive":
- 				OBJECT.add(target)
- 
--			sys.exit(0);
-+                        return
- 			
- 		if modify:
- 			if object == "boolean":
-@@ -364,7 +403,7 @@
- 			if object == "fcontext":
- 				OBJECT.modify(target, setype, ftype, serange, seuser)
- 
--			sys.exit(0);
-+                        return
- 
- 		if delete:
- 			if object == "port":
-@@ -379,16 +418,69 @@
- 			else:
- 				OBJECT.delete(target)
- 
--			sys.exit(0);
--		usage()
-+                        return
-+
-+                raise ValueError(_("Invalid command") % " ".join(argv))
-+
-+	#
-+	# 
-+	#
-+	try:
-+               input = None
-+               store = ""
-+
-+               if len(sys.argv) < 3:
-+                      usage(_("Requires 2 or more arguments"))
-+                
-+               gopts, cmds = getopt.getopt(sys.argv[1:],
-+                                           '01adf:i:lhmnp:s:FCDR:L:r:t:T:P:S:',
-+                                           ['add',
-+                                            'delete',
-+                                            'deleteall',
-+                                            'ftype=',
-+                                            'file',
-+                                            'help',
-+                                            'input=',
-+                                            'list', 
-+                                            'modify',
-+                                            'noheading',
-+                                            'localist',
-+                                            'off', 
-+                                            'on', 
-+                                            'proto=',
-+                                            'seuser=',
-+                                            'store=',
-+                                            'range=',
-+                                            'level=',
-+                                            'roles=',
-+                                            'type=',
-+                                            'trans=',
-+                                            'prefix='
-+                                            ])
-+               for o, a in gopts:
-+                      if o == "-S" or o == '--store':
-+                             store = a
-+                      if o == "-i" or o == '--input':
-+                             input = a
-+
-+               if input != None:
-+                      if input == "-":
-+                             fd = sys.stdin
-+                      else:
-+                             fd = open(input, 'r')
-+                      trans = seobject.semanageRecords(store)
-+                      trans.begin()
-+                      for l in fd.readlines():
-+                             process_args(mkargv(l))
-+                      trans.commit()
-+               else:
-+                      process_args(sys.argv[1:])
- 			
- 	except getopt.error, error:
--		errorExit(_("Options Error %s ") % error.msg)
-+		usage(_("Options Error %s ") % error.msg)
- 	except ValueError, error:
- 		errorExit(error.args[0])
- 	except KeyError, error:
- 		errorExit(_("Invalid value %s") % error.args[0])
- 	except IOError, error:
- 		errorExit(error.args[1])
--	except KeyboardInterrupt, error:
--		sys.exit(0)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.55/semanage/seobject.py
---- nsapolicycoreutils/semanage/seobject.py	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/semanage/seobject.py	2008-09-08 15:02:04.000000000 -0400
-@@ -26,7 +26,6 @@
- PROGNAME="policycoreutils"
- import sepolgen.module as module
- 
--import commands
- import gettext
- gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
- gettext.textdomain(PROGNAME)
-@@ -40,6 +39,33 @@
- 
- import syslog
- 
-+handle = None
-+
-+def get_handle(store):
-+       global handle
-+
-+       handle = semanage_handle_create()
-+       if not handle:
-+              raise ValueError(_("Could not create semanage handle"))
-+       
-+       if store != "":
-+              semanage_select_store(handle, store, SEMANAGE_CON_DIRECT);
-+
-+       if not semanage_is_managed(handle):
-+              semanage_handle_destroy(handle)
-+              raise ValueError(_("SELinux policy is not managed or store cannot be accessed."))
-+
-+       rc = semanage_access_check(handle)
-+       if rc < SEMANAGE_CAN_READ:
-+              semanage_handle_destroy(handle)
-+              raise ValueError(_("Cannot read policy store."))
-+
-+       rc = semanage_connect(handle)
-+       if rc < 0:
-+              semanage_handle_destroy(handle)
-+              raise ValueError(_("Could not establish semanage connection"))       
-+       return handle
-+
- file_types = {}
- file_types[""] = SEMANAGE_FCONTEXT_ALL;
- file_types["all files"] = SEMANAGE_FCONTEXT_ALL;
-@@ -90,8 +116,6 @@
- 			
- mylog = logger()		
- 
--import sys, os
--import re
- import xml.etree.ElementTree
- 
- booleans_dict={}
-@@ -249,31 +273,36 @@
- 		os.rename(newfilename, self.filename)
-                 os.system("/sbin/service mcstrans reload > /dev/null")
- 
--class permissiveRecords:
-+class semanageRecords:
- 	def __init__(self, store):
--               self.store = store
--               self.sh = semanage_handle_create()
--               if not self.sh:
--                      raise ValueError(_("Could not create semanage handle"))
--               
--               if store != "":
--                      semanage_select_store(self.sh, store, SEMANAGE_CON_DIRECT);
-+               global handle
-                       
--               self.semanaged = semanage_is_managed(self.sh)
--               
--               if not self.semanaged:
--                      semanage_handle_destroy(self.sh)
--                      raise ValueError(_("SELinux policy is not managed or store cannot be accessed."))
--
--               rc = semanage_access_check(self.sh)
--               if rc < SEMANAGE_CAN_READ:
--                      semanage_handle_destroy(self.sh)
--                      raise ValueError(_("Cannot read policy store."))
-+               if handle != None:
-+                      self.transaction = True
-+                      self.sh = handle
-+               else:
-+                      self.sh=get_handle(store)
-+                      self.transaction = False
-+
-+        def deleteall(self):
-+               raise ValueError(_("Not yet implemented"))
- 
--               rc = semanage_connect(self.sh)
-+        def begin(self):
-+               if self.transaction:
-+                      return
-+               rc = semanage_begin_transaction(self.sh)
-+               if rc < 0:
-+                      raise ValueError(_("Could not start semanage transaction"))
-+        def commit(self):
-+               if self.transaction:
-+                      return
-+               rc = semanage_commit(self.sh) 
-                if rc < 0:
--                      semanage_handle_destroy(self.sh)
--                      raise ValueError(_("Could not establish semanage connection"))
-+                      raise ValueError(_("Could not commit semanage transaction"))
-+
-+class permissiveRecords(semanageRecords):
-+	def __init__(self, store):
-+               semanageRecords.__init__(self, store)
- 
- 	def get_all(self):
-                l = []
-@@ -321,9 +350,9 @@
-                rc = semanage_module_install(self.sh, data, len(data));
-                if rc < 0:
- 			raise ValueError(_("Could not set permissive domain %s (module installation failed)") % name)
--               rc = semanage_commit(self.sh)
--               if rc < 0:
--			raise ValueError(_("Could not set permissive domain %s (commit failed)") % name)
-+
-+               self.commit()
-+
-                for root, dirs, files in os.walk("tmp", topdown=False):
-                       for name in files:
-                              os.remove(os.path.join(root, name))
-@@ -331,13 +360,12 @@
-                              os.rmdir(os.path.join(root, name))
- 
- 	def delete(self, name):
--		for n in name.split():
--			rc = semanage_module_remove(self.sh, "permissive_%s" % n)
--			if rc < 0:
--	                        raise ValueError(_("Could not remove permissive domain %s (remove failed)") % name)
--			rc = semanage_commit(self.sh)
--			if rc < 0:
--                               raise ValueError(_("Could not remove permissive domain %s (commit failed)") % name)
-+               for n in name.split():
-+                      rc = semanage_module_remove(self.sh, "permissive_%s" % n)
-+                      if rc < 0:
-+                             raise ValueError(_("Could not remove permissive domain %s (remove failed)") % name)
-+                      
-+               self.commit()
- 			
- 	def deleteall(self):
-                l = self.get_all()
-@@ -345,39 +373,11 @@
-                       all = " ".join(l)
-                       self.delete(all)
- 
--class semanageRecords:
--	def __init__(self, store):
--		self.sh = semanage_handle_create()
--		if not self.sh:
--		       raise ValueError(_("Could not create semanage handle"))
--		
--                if store != "":
--                       semanage_select_store(self.sh, store, SEMANAGE_CON_DIRECT);
--
--		self.semanaged = semanage_is_managed(self.sh)
--
--		if not self.semanaged:
--			semanage_handle_destroy(self.sh)
--			raise ValueError(_("SELinux policy is not managed or store cannot be accessed."))
--
--		rc = semanage_access_check(self.sh)
--		if rc < SEMANAGE_CAN_READ:
--			semanage_handle_destroy(self.sh)
--			raise ValueError(_("Cannot read policy store."))
--
--		rc = semanage_connect(self.sh)
--		if rc < 0:
--			semanage_handle_destroy(self.sh)
--			raise ValueError(_("Could not establish semanage connection"))
--        def deleteall(self):
--               raise ValueError(_("Not yet implemented"))
--               
--
- class loginRecords(semanageRecords):
- 	def __init__(self, store = ""):
- 		semanageRecords.__init__(self, store)
- 
--	def add(self, name, sename, serange):
-+	def __add(self, name, sename, serange):
- 		if is_mls_enabled == 1:
- 			if serange == "":
- 				serange = "s0"
-@@ -387,153 +387,145 @@
- 		if sename == "":
- 			sename = "user_u"
- 			
--		try:
--			(rc,k) = semanage_seuser_key_create(self.sh, name)
--			if rc < 0:
--				raise ValueError(_("Could not create a key for %s") % 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)
--			if rc < 0:
--				raise ValueError(_("Could not check if login mapping for %s is defined") % name)
--			if exists:
--				raise ValueError(_("Login mapping for %s is already defined") % name)
--                        if name[0] == '%':
--                                try:
--                                       grp.getgrnam(name[1:])
--                                except:
--                                       raise ValueError(_("Linux Group %s does not exist") % name[1:])
--                        else:
--                                try:
--                                       pwd.getpwnam(name)
--                                except:
--                                       raise ValueError(_("Linux User %s does not exist") % name)
-+		(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:
-+			raise ValueError(_("Login mapping for %s is already defined") % name)
-+                if name[0] == '%':
-+                       try:
-+                              grp.getgrnam(name[1:])
-+                       except:
-+                              raise ValueError(_("Linux Group %s does not exist") % name[1:])
-+                else:
-+                       try:
-+                              pwd.getpwnam(name)
-+                       except:
-+                              raise ValueError(_("Linux User %s does not exist") % name)
- 
--			(rc,u) = semanage_seuser_create(self.sh)
--			if rc < 0:
--				raise ValueError(_("Could not create login mapping for %s") % name)
-+                (rc,u) = semanage_seuser_create(self.sh)
-+                if rc < 0:
-+                       raise ValueError(_("Could not create login mapping for %s") % name)
- 
--			rc = semanage_seuser_set_name(self.sh, u, name)
--			if rc < 0:
--				raise ValueError(_("Could not set name for %s") % name)
-+                rc = semanage_seuser_set_name(self.sh, u, name)
-+                if rc < 0:
-+                       raise ValueError(_("Could not set name for %s") % name)
- 
--			if serange != "":
--				rc = semanage_seuser_set_mlsrange(self.sh, u, serange)
--				if rc < 0:
--					raise ValueError(_("Could not set MLS range for %s") % name)
-+                if serange != "":
-+                       rc = semanage_seuser_set_mlsrange(self.sh, u, serange)
-+                       if rc < 0:
-+                              raise ValueError(_("Could not set MLS range for %s") % name)
- 
--			rc = semanage_seuser_set_sename(self.sh, u, sename)
--			if rc < 0:
--				raise ValueError(_("Could not set SELinux user for %s") % name)
-+                rc = semanage_seuser_set_sename(self.sh, u, sename)
-+                if rc < 0:
-+                       raise ValueError(_("Could not set SELinux user for %s") % name)
- 
--			rc = semanage_begin_transaction(self.sh)
--			if rc < 0:
--				raise ValueError(_("Could not start semanage transaction"))
-+                rc = semanage_seuser_modify_local(self.sh, k, u)
-+                if rc < 0:
-+                       raise ValueError(_("Could not add login mapping for %s") % name)
- 
--			rc = semanage_seuser_modify_local(self.sh, k, u)
--			if rc < 0:
--				raise ValueError(_("Could not add login mapping for %s") % name)
-+		semanage_seuser_key_free(k)
-+		semanage_seuser_free(u)
- 
--			rc = semanage_commit(self.sh) 
--			if rc < 0:
--				raise ValueError(_("Could not add login mapping for %s") % name)
-+	def add(self, name, sename, serange):
-+		try:
-+                        self.begin()
-+                        self.__add(name, sename, serange)
-+                        self.commit()
- 
- 		except ValueError, error:
- 			mylog.log(0, _("add SELinux user mapping"), name, sename, "", serange);
- 			raise error
- 		
- 		mylog.log(1, _("add SELinux user mapping"), name, sename, "", serange);
--		semanage_seuser_key_free(k)
--		semanage_seuser_free(u)
- 
--	def modify(self, name, sename = "", serange = ""):
--		oldsename = ""
--		oldserange = ""
--		try:
--			if sename == "" and serange == "":
--				raise ValueError(_("Requires seuser or serange"))
-+	def __modify(self, name, sename = "", serange = ""):
-+               if sename == "" and serange == "":
-+                      raise ValueError(_("Requires seuser or serange"))
- 
--			(rc,k) = semanage_seuser_key_create(self.sh, name)
--			if rc < 0:
--				raise ValueError(_("Could not create a key for %s") % 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)
--			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(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)
--			if rc < 0:
--				raise ValueError(_("Could not query seuser for %s") % name)
-+               (rc,u) = semanage_seuser_query(self.sh, k)
-+               if rc < 0:
-+                      raise ValueError(_("Could not query seuser for %s") % name)
- 
--			oldserange = semanage_seuser_get_mlsrange(u)
--			oldsename = semanage_seuser_get_sename(u)
--			if serange != "":
--				semanage_seuser_set_mlsrange(self.sh, u, untranslate(serange))
--			else:
--				serange = oldserange
--			if sename != "":
--				semanage_seuser_set_sename(self.sh, u, sename)
--			else:
--				sename = oldsename
-+               oldserange = semanage_seuser_get_mlsrange(u)
-+               oldsename = semanage_seuser_get_sename(u)
-+               if serange != "":
-+                      semanage_seuser_set_mlsrange(self.sh, u, untranslate(serange))
-+               else:
-+                      serange = oldserange
- 
--			rc = semanage_begin_transaction(self.sh)
--			if rc < 0:
--				raise ValueError(_("Could not start semanage transaction"))
-+               if sename != "":
-+                      semanage_seuser_set_sename(self.sh, u, sename)
-+               else:
-+                      sename = oldsename
- 
--			rc = semanage_seuser_modify_local(self.sh, k, u)
--			if rc < 0:
--				raise ValueError(_("Could not modify login mapping for %s") % name)
-+               rc = semanage_seuser_modify_local(self.sh, k, u)
-+               if rc < 0:
-+                      raise ValueError(_("Could not modify login mapping for %s") % name)
- 
--			rc = semanage_commit(self.sh)
--			if rc < 0:
--				raise ValueError(_("Could not modify login mapping for %s") % name)
-+               semanage_seuser_key_free(k)
-+               semanage_seuser_free(u)
- 
--		except ValueError, error:
--			mylog.log(0,"modify selinux user mapping", name, sename,"", serange, oldsename, "", oldserange);
--			raise error
--		
--		mylog.log(1,"modify selinux user mapping", name, sename, "", serange, oldsename, "", oldserange);
--		semanage_seuser_key_free(k)
--		semanage_seuser_free(u)
-+               mylog.log(1,"modify selinux user mapping", name, sename, "", serange, oldsename, "", oldserange);
- 
--	def delete(self, name):
-+	def modify(self, name, sename = "", serange = ""):
- 		try:
--			(rc,k) = semanage_seuser_key_create(self.sh, name)
--			if rc < 0:
--				raise ValueError(_("Could not create a key for %s") % name)
-+                        self.begin()
-+                        self.__modify(name, sename, serange)
-+                        self.commit()
- 
--			(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)
-+		except ValueError, error:
-+			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)
-+               if rc < 0:
-+                      raise ValueError(_("Could not create a key for %s") % name)
- 
--			(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:
--				raise ValueError(_("Login mapping for %s is defined in policy, cannot be deleted") % name)
-+               (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 = semanage_begin_transaction(self.sh)
--			if rc < 0:
--				raise ValueError(_("Could not start semanage transaction"))
-+               (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:
-+                      raise ValueError(_("Login mapping for %s is defined in policy, cannot be deleted") % name)
- 
--			rc = semanage_seuser_del_local(self.sh, k)
-+               rc = semanage_seuser_del_local(self.sh, k)
-+               if rc < 0:
-+                      raise ValueError(_("Could not delete login mapping for %s") % name)
- 
--			if rc < 0:
--				raise ValueError(_("Could not delete login mapping for %s") % name)
-+               semanage_seuser_key_free(k)
- 
--			rc = semanage_commit(self.sh)
--			if rc < 0:
--				raise ValueError(_("Could not delete login mapping for %s") % name)
-+	def delete(self, name):
-+		try:
-+                       self.begin()
-+                       self.__delete(name)
-+                       self.commit()
- 
- 		except ValueError, error:
- 			mylog.log(0,"delete SELinux user mapping", name);
- 			raise error
- 		
- 		mylog.log(1,"delete SELinux user mapping", name);
--		semanage_seuser_key_free(k)
- 
- 	def get_all(self, locallist = 0):
- 		ddict = {}
-@@ -568,7 +560,7 @@
- 	def __init__(self, store = ""):
- 		semanageRecords.__init__(self, store)
- 
--	def add(self, name, roles, selevel, serange, prefix):
-+	def __add(self, name, roles, selevel, serange, prefix):
- 		if is_mls_enabled == 1:
- 			if serange == "":
- 				serange = "s0"
-@@ -580,170 +572,167 @@
- 			else:
- 				selevel = untranslate(selevel)
- 			
--		seroles = " ".join(roles)
--		try:
--			(rc,k) = semanage_user_key_create(self.sh, name)
--			if rc < 0:
--				raise ValueError(_("Could not create a key for %s") % name)
-+                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)
-+                if rc < 0:
-+                       raise ValueError(_("Could not create a key for %s") % name)
- 
--			(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,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)
--			if rc < 0:
--				raise ValueError(_("Could not create SELinux user for %s") % name)
-+                (rc,u) = semanage_user_create(self.sh)
-+                if rc < 0:
-+                       raise ValueError(_("Could not create SELinux user for %s") % name)
- 
--			rc = semanage_user_set_name(self.sh, u, name)
--			if rc < 0:
--				raise ValueError(_("Could not set name for %s") % name)
-+                rc = semanage_user_set_name(self.sh, u, name)
-+                if rc < 0:
-+                       raise ValueError(_("Could not set name for %s") % name)
- 
--			for r in roles:
--				rc = semanage_user_add_role(self.sh, u, r)
--				if rc < 0:
--					raise ValueError(_("Could not add role %s for %s") % (r, name))
-+                for r in roles:
-+                       rc = semanage_user_add_role(self.sh, u, r)
-+                       if rc < 0:
-+                              raise ValueError(_("Could not add role %s for %s") % (r, name))
- 
--			if is_mls_enabled == 1:
--				rc = semanage_user_set_mlsrange(self.sh, u, serange)
--				if rc < 0:
--					raise ValueError(_("Could not set MLS range for %s") % name)
--
--				rc = semanage_user_set_mlslevel(self.sh, u, selevel)
--				if rc < 0:
--					raise ValueError(_("Could not set MLS level for %s") % name)
--			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)
--			if rc < 0:
--				raise ValueError(_("Could not extract key for %s") % name)
-+                if is_mls_enabled == 1:
-+                       rc = semanage_user_set_mlsrange(self.sh, u, serange)
-+                       if rc < 0:
-+                              raise ValueError(_("Could not set MLS range for %s") % name)
- 
--			rc = semanage_begin_transaction(self.sh)
--			if rc < 0:
--				raise ValueError(_("Could not start semanage transaction"))
-+                       rc = semanage_user_set_mlslevel(self.sh, u, selevel)
-+                       if rc < 0:
-+                              raise ValueError(_("Could not set MLS level for %s") % name)
-+                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)
-+                if rc < 0:
-+                       raise ValueError(_("Could not extract key for %s") % name)
- 
--			rc = semanage_user_modify_local(self.sh, k, u)
--			if rc < 0:
--				raise ValueError(_("Could not add SELinux user %s") % name)
-+                rc = semanage_user_modify_local(self.sh, k, u)
-+                if rc < 0:
-+                       raise ValueError(_("Could not add SELinux user %s") % name)
- 
--			rc = semanage_commit(self.sh)
--			if rc < 0:
--				raise ValueError(_("Could not add SELinux user %s") % name)
-+                semanage_user_key_free(k)
-+                semanage_user_free(u)
- 
-+	def add(self, name, roles, selevel, serange, prefix):
-+		seroles = " ".join(roles)
-+                try:
-+                       self.begin()
-+                       self.__add( name, roles, selevel, serange, prefix)
-+                       self.commit()
- 		except ValueError, error:
- 			mylog.log(0,"add SELinux user record", name, name, seroles, serange)
- 			raise error
- 		
- 		mylog.log(1,"add SELinux user record", name, name, seroles, serange)
--		semanage_user_key_free(k)
--		semanage_user_free(u)
- 
--	def modify(self, name, roles = [], selevel = "", serange = "", prefix = ""):
-+        def __modify(self, name, roles = [], selevel = "", serange = "", prefix = ""):
- 		oldroles = ""
- 		oldserange = ""
- 		newroles = string.join(roles, ' ');
--		try:
--			if prefix == "" and len(roles) == 0  and serange == "" and selevel == "":
--				if is_mls_enabled == 1:
--					raise ValueError(_("Requires prefix, roles, level or range"))
--				else:
--					raise ValueError(_("Requires prefix or roles"))
--
--			(rc,k) = semanage_user_key_create(self.sh, name)
--			if rc < 0:
--				raise ValueError(_("Could not create a key for %s") % name)
-+                if prefix == "" and len(roles) == 0  and serange == "" and selevel == "":
-+                       if is_mls_enabled == 1:
-+                              raise ValueError(_("Requires prefix, roles, level or range"))
-+                       else:
-+                              raise ValueError(_("Requires prefix or roles"))
- 
--			(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,k) = semanage_user_key_create(self.sh, name)
-+                if rc < 0:
-+                       raise ValueError(_("Could not create a key for %s") % name)
- 
--			(rc,u) = semanage_user_query(self.sh, k)
--			if rc < 0:
--				raise ValueError(_("Could not query user for %s") % name)
-+                (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)
- 
--			oldserange = semanage_user_get_mlsrange(u)
--			(rc, rlist) = semanage_user_get_roles(self.sh, u)
--			if rc >= 0:
--				oldroles = string.join(rlist, ' ');
--			newroles = newroles + ' ' + oldroles;
--
--
--			if serange != "":
--				semanage_user_set_mlsrange(self.sh, u, untranslate(serange))
--			if selevel != "":
--				semanage_user_set_mlslevel(self.sh, u, untranslate(selevel))
--
--			if prefix != "":
--                               semanage_user_set_prefix(self.sh, u, prefix)
--
--			if len(roles) != 0:
--                               for r in rlist:
--                                      if r not in roles:
--                                             semanage_user_del_role(u, r)
--                               for r in roles:
--                                      if r not in rlist:
--                                             semanage_user_add_role(self.sh, u, r)
-+                (rc,u) = semanage_user_query(self.sh, k)
-+                if rc < 0:
-+                       raise ValueError(_("Could not query user for %s") % name)
- 
--			rc = semanage_begin_transaction(self.sh)
--			if rc < 0:
--				raise ValueError(_("Could not start semanage transaction"))
-+                oldserange = semanage_user_get_mlsrange(u)
-+                (rc, rlist) = semanage_user_get_roles(self.sh, u)
-+                if rc >= 0:
-+                       oldroles = string.join(rlist, ' ');
-+                       newroles = newroles + ' ' + oldroles;
-+
-+
-+                if serange != "":
-+                       semanage_user_set_mlsrange(self.sh, u, untranslate(serange))
-+                if selevel != "":
-+                       semanage_user_set_mlslevel(self.sh, u, untranslate(selevel))
-+
-+                if prefix != "":
-+                       semanage_user_set_prefix(self.sh, u, prefix)
-+
-+                if len(roles) != 0:
-+                       for r in rlist:
-+                              if r not in roles:
-+                                     semanage_user_del_role(u, r)
-+                       for r in roles:
-+                              if r not in rlist:
-+                                     semanage_user_add_role(self.sh, u, r)
- 
--			rc = semanage_user_modify_local(self.sh, k, u)
--			if rc < 0:
--				raise ValueError(_("Could not modify SELinux user %s") % name)
--
--			rc = semanage_commit(self.sh)
--			if rc < 0:
--				raise ValueError(_("Could not modify SELinux user %s") % name)
-+                rc = semanage_user_modify_local(self.sh, k, u)
-+                if rc < 0:
-+                       raise ValueError(_("Could not modify SELinux user %s") % name)
- 
--		except ValueError, error:
--			mylog.log(0,"modify SELinux user record", name, "", newroles, serange, "", oldroles, oldserange)
--			raise error
-+		semanage_user_key_free(k)
-+		semanage_user_free(u)
- 		
- 		mylog.log(1,"modify SELinux user record", name, "", newroles, serange, "", oldroles, oldserange)
- 
--		semanage_user_key_free(k)
--		semanage_user_free(u)
- 
--	def delete(self, name):
-+	def modify(self, name, roles = [], selevel = "", serange = "", prefix = ""):
- 		try:
--			(rc,k) = semanage_user_key_create(self.sh, name)
--			if rc < 0:
--				raise ValueError(_("Could not create a key for %s") % name)
-+                        self.begin()
-+                        self.__modify(name, roles, selevel, serange, prefix)
-+                        self.commit()
-+
-+		except ValueError, error:
-+			mylog.log(0,"modify SELinux user record", name, "", " ".join(roles), serange, "", "", "")
-+			raise error
-+
-+	def __delete(self, 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)
--			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(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)
--			if rc < 0:
--				raise ValueError(_("Could not check if SELinux user %s is defined") % name)
--			if not exists:
--				raise ValueError(_("SELinux user %s is defined in policy, cannot be deleted") % name)
-+               (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:
-+                      raise ValueError(_("SELinux user %s is defined in policy, cannot be deleted") % name)
- 			
--			rc = semanage_begin_transaction(self.sh)
--			if rc < 0:
--				raise ValueError(_("Could not start semanage transaction"))
-+               rc = semanage_user_del_local(self.sh, k)
-+               if rc < 0:
-+                      raise ValueError(_("Could not delete SELinux user %s") % name)
- 
--			rc = semanage_user_del_local(self.sh, k)
--			if rc < 0:
--				raise ValueError(_("Could not delete SELinux user %s") % name)
-+               semanage_user_key_free(k)		
-+
-+	def delete(self, name):
-+		try:
-+                        self.begin()
-+                        self.__delete(name)
-+                        self.commit()
- 
--			rc = semanage_commit(self.sh)
--			if rc < 0:
--				raise ValueError(_("Could not delete SELinux user %s") % name)
- 		except ValueError, error:
- 			mylog.log(0,"delete SELinux user record", name)
- 			raise error
- 		
- 		mylog.log(1,"delete SELinux user record", name)
--		semanage_user_key_free(k)		
- 
- 	def get_all(self, locallist = 0):
- 		ddict = {}
-@@ -808,7 +797,7 @@
- 			raise ValueError(_("Could not create a key for %s/%s") % (proto, port))
- 		return ( k, proto_d, low, high )
- 
--	def add(self, port, proto, serange, type):
-+	def __add(self, port, proto, serange, type):
- 		if is_mls_enabled == 1:
- 			if serange == "":
- 				serange = "s0"
-@@ -857,23 +846,20 @@
- 		if rc < 0:
- 			raise ValueError(_("Could not set port context for %s/%s") % (proto, port))
- 
--		rc = semanage_begin_transaction(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not start semanage transaction"))
--
- 		rc = semanage_port_modify_local(self.sh, k, p)
- 		if rc < 0:
- 			raise ValueError(_("Could not add port %s/%s") % (proto, port))
- 	
--		rc = semanage_commit(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not add port %s/%s") % (proto, port))
--
- 		semanage_context_free(con)
- 		semanage_port_key_free(k)
- 		semanage_port_free(p)
- 
--	def modify(self, port, proto, serange, setype):
-+	def add(self, port, proto, serange, type):
-+                self.begin()
-+                self.__add(port, proto, serange, type)
-+                self.commit()
-+
-+	def __modify(self, port, proto, serange, setype):
- 		if serange == "" and setype == "":
- 			if is_mls_enabled == 1:
- 				raise ValueError(_("Requires setype or serange"))
-@@ -899,29 +885,24 @@
- 		if setype != "":
- 			semanage_context_set_type(self.sh, con, setype)
- 
--		rc = semanage_begin_transaction(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not start semanage transaction"))
--
- 		rc = semanage_port_modify_local(self.sh, k, p)
- 		if rc < 0:
- 			raise ValueError(_("Could not modify port %s/%s") % (proto, port))
- 
--		rc = semanage_commit(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not modify port %s/%s") % (proto, port))
--		
- 		semanage_port_key_free(k)
- 		semanage_port_free(p)
- 
-+	def modify(self, port, proto, serange, setype):
-+                self.begin()
-+                self.__modify(port, proto, serange, setype)
-+                self.commit()
-+
- 	def deleteall(self):
- 		(rc, plist) = semanage_port_list_local(self.sh)
- 		if rc < 0:
- 			raise ValueError(_("Could not list the ports"))
- 
--		rc = semanage_begin_transaction(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not start semanage transaction"))
-+                self.begin()
- 
- 		for port in plist:
-                        proto = semanage_port_get_proto(port)
-@@ -938,11 +919,9 @@
-                               raise ValueError(_("Could not delete the port %s") % port_str)
-                        semanage_port_key_free(k)
- 	
--		rc = semanage_commit(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not delete the %s") % port_str)
-+                self.commit()
- 
--	def delete(self, port, proto):
-+	def __delete(self, port, proto):
- 		( k, proto_d, low, high ) = self.__genkey(port, proto)
- 		(rc,exists) = semanage_port_exists(self.sh, k)
- 		if rc < 0:
-@@ -956,20 +935,17 @@
- 		if not exists:
- 			raise ValueError(_("Port %s/%s is defined in policy, cannot be deleted") % (proto, port))
- 
--		rc = semanage_begin_transaction(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not start semanage transaction"))
--
- 		rc = semanage_port_del_local(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not delete port %s/%s") % (proto, port))
- 
--		rc = semanage_commit(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not delete port %s/%s") % (proto, port))
--		
- 		semanage_port_key_free(k)
- 
-+	def delete(self, port, proto):
-+                self.begin()
-+                self.__delete(port, proto)
-+                self.commit()
-+
- 	def get_all(self, locallist = 0):
- 		ddict = {}
-                 if locallist:
-@@ -1035,7 +1011,7 @@
-        def __init__(self, store = ""):
-                semanageRecords.__init__(self,store)
- 
--       def add(self, addr, mask, proto, serange, ctype):
-+       def __add(self, addr, mask, proto, serange, ctype):
-                if addr == "":
-                        raise ValueError(_("Node Address is required"))
- 
-@@ -1104,23 +1080,20 @@
-                if rc < 0:
-                        raise ValueError(_("Could not set addr context for %s") % addr)
- 
--               rc = semanage_begin_transaction(self.sh)
--               if rc < 0:
--                       raise ValueError(_("Could not start semanage transaction"))
--
-                rc = semanage_node_modify_local(self.sh, k, node)
-                if rc < 0:
-                        raise ValueError(_("Could not add addr %s") % addr)
- 
--               rc = semanage_commit(self.sh)
--               if rc < 0:
--                       raise ValueError(_("Could not add addr %s") % addr)
--
-                semanage_context_free(con)
-                semanage_node_key_free(k)
-                semanage_node_free(node)
- 
--       def modify(self, addr, mask, proto, serange, setype):
-+       def add(self, addr, mask, proto, serange, ctype):
-+                self.begin()
-+                self.__add(self, addr, mask, proto, serange, ctype)
-+                self.commit()
-+
-+       def __modify(self, addr, mask, proto, serange, setype):
-                if addr == "":
-                        raise ValueError(_("Node Address is required"))
- 
-@@ -1158,22 +1131,19 @@
-                if setype != "":
-                        semanage_context_set_type(self.sh, con, setype)
- 
--               rc = semanage_begin_transaction(self.sh)
--               if rc < 0:
--                       raise ValueError(_("Could not start semanage transaction"))
--
-                rc = semanage_node_modify_local(self.sh, k, node)
-                if rc < 0:
-                        raise ValueError(_("Could not modify addr %s") % addr)
- 
--               rc = semanage_commit(self.sh)
--               if rc < 0:
--                       raise ValueError(_("Could not modify addr %s") % addr)
--
-                semanage_node_key_free(k)
-                semanage_node_free(node)
- 
--       def delete(self, addr, mask, proto):
-+       def modify(self, addr, mask, proto, serange, setype):
-+                self.begin()
-+                self.__modify(addr, mask, proto, serange, setype)
-+                self.commit()
-+
-+       def __delete(self, addr, mask, proto):
-                if addr == "":
-                        raise ValueError(_("Node Address is required"))
- 
-@@ -1203,20 +1173,17 @@
-                if not exists:
-                        raise ValueError(_("Addr %s is defined in policy, cannot be deleted") % addr)
- 
--               rc = semanage_begin_transaction(self.sh)
--               if rc < 0:
--                       raise ValueError(_("Could not start semanage transaction"))
--
-                rc = semanage_node_del_local(self.sh, k)
-                if rc < 0:
-                        raise ValueError(_("Could not delete addr %s") % addr)
- 
--               rc = semanage_commit(self.sh)
--               if rc < 0:
--                       raise ValueError(_("Could not delete addr %s") % addr)
--
-                semanage_node_key_free(k)
- 
-+       def delete(self, addr, mask, proto):
-+              self.begin()
-+              self.__delete(addr, mask, proto)
-+              self.commit()
-+		
-        def get_all(self, locallist = 0):
-                ddict = {}
- 	       if locallist :
-@@ -1260,7 +1227,7 @@
- 	def __init__(self, store = ""):
- 		semanageRecords.__init__(self, store)
- 
--	def add(self, interface, serange, ctype):
-+	def __add(self, interface, serange, ctype):
- 		if is_mls_enabled == 1:
- 			if serange == "":
- 				serange = "s0"
-@@ -1314,23 +1281,20 @@
- 		if rc < 0:
- 			raise ValueError(_("Could not set message context for %s") % interface)
- 
--		rc = semanage_begin_transaction(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not start semanage transaction"))
--
- 		rc = semanage_iface_modify_local(self.sh, k, iface)
- 		if rc < 0:
- 			raise ValueError(_("Could not add interface %s") % interface)
- 
--		rc = semanage_commit(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not add interface %s") % interface)
--
- 		semanage_context_free(con)
- 		semanage_iface_key_free(k)
- 		semanage_iface_free(iface)
- 
--	def modify(self, interface, serange, setype):
-+	def add(self, interface, serange, ctype):
-+                self.begin()
-+                self.__add(interface, serange, ctype)
-+                self.commit()
-+
-+	def __modify(self, interface, serange, setype):
- 		if serange == "" and setype == "":
- 			raise ValueError(_("Requires setype or serange"))
- 
-@@ -1355,22 +1319,19 @@
- 		if setype != "":
- 			semanage_context_set_type(self.sh, con, setype)
- 
--		rc = semanage_begin_transaction(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not start semanage transaction"))
--
- 		rc = semanage_iface_modify_local(self.sh, k, iface)
- 		if rc < 0:
- 			raise ValueError(_("Could not modify interface %s") % interface)
- 		
--		rc = semanage_commit(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not modify interface %s") % interface)
--
- 		semanage_iface_key_free(k)
- 		semanage_iface_free(iface)
- 
--	def delete(self, interface):
-+	def modify(self, interface, serange, setype):
-+                self.begin()
-+                self.__modify(interface, serange, setype)
-+                self.commit()
-+
-+	def __delete(self, interface):
- 		(rc,k) = semanage_iface_key_create(self.sh, interface)
- 		if rc < 0:
- 			raise ValueError(_("Could not create key for %s") % interface)
-@@ -1387,20 +1348,17 @@
- 		if not exists:
- 			raise ValueError(_("Interface %s is defined in policy, cannot be deleted") % interface)
- 
--		rc = semanage_begin_transaction(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not start semanage transaction"))
--
- 		rc = semanage_iface_del_local(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not delete interface %s") % interface)
- 
--		rc = semanage_commit(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not delete interface %s") % interface)
--		
- 		semanage_iface_key_free(k)
- 
-+	def delete(self, interface):
-+                self.begin()
-+                self.__delete(interface)
-+                self.commit()
-+		
- 	def get_all(self, locallist = 0):
- 		ddict = {}
-                 if locallist:
-@@ -1459,7 +1417,7 @@
-                if target == "" or target.find("\n") >= 0:
-                       raise ValueError(_("Invalid file specification"))
-                       
--	def add(self, target, type, ftype = "", serange = "", seuser = "system_u"):
-+	def __add(self, target, type, ftype = "", serange = "", seuser = "system_u"):
-                 self.validate(target)
- 
- 		if is_mls_enabled == 1:
-@@ -1500,24 +1458,21 @@
- 
- 		semanage_fcontext_set_type(fcontext, file_types[ftype])
- 
--		rc = semanage_begin_transaction(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not start semanage transaction"))
--
- 		rc = semanage_fcontext_modify_local(self.sh, k, fcontext)
- 		if rc < 0:
- 			raise ValueError(_("Could not add file context for %s") % target)
- 
--		rc = semanage_commit(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not add file context for %s") % target)
--
-                 if type != "<<none>>":
-                        semanage_context_free(con)
- 		semanage_fcontext_key_free(k)
- 		semanage_fcontext_free(fcontext)
- 
--	def modify(self, target, setype, ftype, serange, seuser):
-+	def add(self, target, type, ftype = "", serange = "", seuser = "system_u"):
-+                self.begin()
-+                self.__add(target, type, ftype, serange, seuser)
-+                self.commit()
-+
-+	def __modify(self, target, setype, ftype, serange, seuser):
- 		if serange == "" and setype == "" and seuser == "":
- 			raise ValueError(_("Requires setype, serange or seuser"))
-                 self.validate(target)
-@@ -1558,29 +1513,25 @@
-                        if rc < 0:
-                               raise ValueError(_("Could not set file context for %s") % target)
-                        
--                rc = semanage_begin_transaction(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not start semanage transaction"))
--
- 		rc = semanage_fcontext_modify_local(self.sh, k, fcontext)
- 		if rc < 0:
- 			raise ValueError(_("Could not modify file context for %s") % target)
- 
--		rc = semanage_commit(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not modify file context for %s") % target)
--		
- 		semanage_fcontext_key_free(k)
- 		semanage_fcontext_free(fcontext)
- 
-+	def modify(self, target, setype, ftype, serange, seuser):
-+                self.begin()
-+                self.__modify(target, setype, ftype, serange, seuser)
-+                self.commit()
-+		
-+
- 	def deleteall(self):
- 		(rc, flist) = semanage_fcontext_list_local(self.sh)
- 		if rc < 0:
- 			raise ValueError(_("Could not list the file contexts"))
- 
--		rc = semanage_begin_transaction(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not start semanage transaction"))
-+                self.begin()
- 
- 		for fcontext in flist:
-                        target = semanage_fcontext_get_expr(fcontext)
-@@ -1595,11 +1546,9 @@
-                               raise ValueError(_("Could not delete the file context %s") % target)
-                        semanage_fcontext_key_free(k)
- 	
--		rc = semanage_commit(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not delete the file context %s") % target)
-+                self.commit()
- 
--	def delete(self, target, ftype):
-+	def __delete(self, target, 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)
-@@ -1616,20 +1565,17 @@
- 			else:
- 				raise ValueError(_("File context for %s is not defined") % target)
- 
--		rc = semanage_begin_transaction(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not start semanage transaction"))
--
- 		rc = semanage_fcontext_del_local(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not delete file context for %s") % target)
- 
--		rc = semanage_commit(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not delete file context for %s") % target)
--
- 		semanage_fcontext_key_free(k)		
- 
-+	def delete(self, target, ftype):
-+                self.begin()
-+                self.__delete( target, ftype)
-+                self.commit()
-+
- 	def get_all(self, locallist = 0):
- 		l = []
-                 if locallist:
-@@ -1711,9 +1657,8 @@
- 
- 	def modify(self, name, value=None, use_file=False):
-                 
--		rc = semanage_begin_transaction(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not start semanage transaction"))
-+                self.begin()
-+
-                 if use_file:
-                        fd = open(name)
-                        for b in fd.read().split("\n"):
-@@ -1723,18 +1668,16 @@
- 
-                               try:
-                                      boolname, val = b.split("=")
--                              except ValueError, e:
-+                              except ValueError:
-                                      raise ValueError(_("Bad format %s: Record %s" % ( name, b) ))
-                               self.__mod(boolname.strip(), val.strip())
-                        fd.close()
-                 else:
-                        self.__mod(name, value)
- 
--		rc = semanage_commit(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not modify boolean %s") % name)
-+                self.commit()
- 		
--	def delete(self, name):
-+	def __delete(self, name):
- 
-                 (rc,k) = semanage_bool_key_create(self.sh, name)
-                 if rc < 0:
-@@ -1751,42 +1694,30 @@
- 		if not exists:
- 			raise ValueError(_("Boolean %s is defined in policy, cannot be deleted") % name)
- 
--		rc = semanage_begin_transaction(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not start semanage transaction"))
--
- 		rc = semanage_bool_del_local(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not delete boolean %s") % name)
- 	
--		rc = semanage_commit(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not delete boolean %s") % name)
- 		semanage_bool_key_free(k)
- 
-+	def delete(self, name):
-+                self.begin()
-+                self.__delete(name)
-+                self.commit()
-+
- 	def deleteall(self):
- 		(rc, self.blist) = semanage_bool_list_local(self.sh)
- 		if rc < 0:
- 			raise ValueError(_("Could not list booleans"))
- 
--		rc = semanage_begin_transaction(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not start semanage transaction"))
-+                self.begin()
- 
- 		for boolean in self.blist:
-                        name = semanage_bool_get_name(boolean)
--                       (rc,k) = semanage_bool_key_create(self.sh, name)
--                       if rc < 0:
--                              raise ValueError(_("Could not create a key for %s") % name)
-+                       self.__delete(name)
+ 		args = argv[1:]
  
--                       rc = semanage_bool_del_local(self.sh, k)
--                       if rc < 0:
--                              raise ValueError(_("Could not delete boolean %s") % name)
--                       semanage_bool_key_free(k)
-+                self.commit()
- 	
--		rc = semanage_commit(self.sh)
--		if rc < 0:
--			raise ValueError(_("Could not delete boolean %s") % name)
- 	def get_all(self, locallist = 0):
- 		ddict = {}
-                 if locallist:


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.558
retrieving revision 1.559
diff -u -r1.558 -r1.559
--- policycoreutils.spec	12 Sep 2008 15:45:21 -0000	1.558
+++ policycoreutils.spec	12 Sep 2008 15:58:47 -0000	1.559
@@ -5,8 +5,8 @@
 %define	sepolgenver	1.0.13
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
-Version: 2.0.55
-Release: 9%{?dist}
+Version: 2.0.56
+Release: 1%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,8 +192,14 @@
 fi
 
 %changelog
-* Fri Sep 12 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-9
+* Fri Sep 12 2008 Dan Walsh <dwalsh at redhat.com> 2.0.56-1
 - Fix semanage help display
+- Update to upstream
+	* fixfiles will now remove all files in /tmp and will check for
+	  unlabeled_t in /tmp and /var/tmp from Dan Walsh.
+	* add glob support to restorecond from Dan Walsh.
+	* allow semanage to handle multi-line commands in a single transaction
+	  from Dan Walsh.
 
 * Thu Sep 11 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-8
 - Only call gen_requires once in sepolgen


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- sources	29 Aug 2008 19:05:25 -0000	1.192
+++ sources	12 Sep 2008 15:58:47 -0000	1.193
@@ -1,2 +1,2 @@
 b6756a012c26f414e4a5f8f438ce2188  sepolgen-1.0.13.tgz
-0c606d0237e6588d0bc01137fe948644  policycoreutils-2.0.55.tgz
+59462f5b1150734a23303e39d98feebc  policycoreutils-2.0.56.tgz



From spot at fedoraproject.org  Fri Sep 12 16:04:59 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 16:04:59 +0000 (UTC)
Subject: rpms/kscope/devel .cvsignore, 1.2, 1.3 kscope.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <20080912160459.586FA70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/kscope/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28245

Modified Files:
	.cvsignore kscope.spec sources 
Log Message:
update to 1.6.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kscope/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jan 2008 22:11:15 -0000	1.2
+++ .cvsignore	12 Sep 2008 16:04:29 -0000	1.3
@@ -1 +1 @@
-kscope-1.6.1.tar.gz
+kscope-1.6.2.tar.gz


Index: kscope.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kscope/devel/kscope.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kscope.spec	25 Mar 2008 13:01:31 -0000	1.3
+++ kscope.spec	12 Sep 2008 16:04:29 -0000	1.4
@@ -1,7 +1,7 @@
 Name:		kscope
 Summary: 	KDE front-end to Cscope
-Version:	1.6.1
-Release:	4%{?dist}
+Version:	1.6.2
+Release:	1%{?dist}
 License:	BSD
 Group:		Development/Tools
 Source0:	http://download.sourceforge.net/kscope/%{name}-%{version}.tar.gz
@@ -69,6 +69,9 @@
 %{_datadir}/icons/locolor/*/apps/%{name}.png
 
 %changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.2-1
+- update to 1.6.2
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.6.1-4
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kscope/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jan 2008 22:11:15 -0000	1.2
+++ sources	12 Sep 2008 16:04:29 -0000	1.3
@@ -1 +1 @@
-528e5751b3d747e03f38c0147d35b01f  kscope-1.6.1.tar.gz
+b0c6115fa6ea0c95fe3a8d45baa98392  kscope-1.6.2.tar.gz



From spot at fedoraproject.org  Fri Sep 12 16:10:09 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 16:10:09 +0000 (UTC)
Subject: rpms/winpdb/devel .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 winpdb.spec,
	1.9, 1.10
Message-ID: <20080912161009.F15F170131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/winpdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29637

Modified Files:
	.cvsignore sources winpdb.spec 
Log Message:
1.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/winpdb/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Mar 2008 18:32:52 -0000	1.7
+++ .cvsignore	12 Sep 2008 16:09:39 -0000	1.8
@@ -1 +1 @@
-winpdb-1.3.6.tar.gz
+winpdb-1.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/winpdb/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Apr 2008 17:14:08 -0000	1.8
+++ sources	12 Sep 2008 16:09:39 -0000	1.9
@@ -1 +1 @@
-81de14efa0b52bb39611f34162cc29cb  winpdb-1.3.8.tar.gz
+f650271232a4fa164f5a22bbd0d4a178  winpdb-1.4.0.tar.gz


Index: winpdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/winpdb/devel/winpdb.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- winpdb.spec	23 Apr 2008 17:14:08 -0000	1.9
+++ winpdb.spec	12 Sep 2008 16:09:39 -0000	1.10
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		winpdb
-Version:	1.3.8
+Version:	1.4.0
 Release:	1%{?dist}
 Summary:	An advanced python debugger
 Group:		Development/Debuggers
@@ -49,6 +49,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4.0-1
+- update to 1.4.0
+
 * Wed Apr 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3.8-1
 - update to 1.3.8
 



From jorton at fedoraproject.org  Fri Sep 12 16:11:13 2008
From: jorton at fedoraproject.org (Joe Orton)
Date: Fri, 12 Sep 2008 16:11:13 +0000 (UTC)
Subject: rpms/subversion/devel subversion-1.5.2.tar.gz.asc, NONE,
	1.1 .cvsignore, 1.24, 1.25 sources, 1.31,
	1.32 subversion-1.5.1-rpath.patch, 1.1, 1.2 subversion.spec,
	1.120, 1.121 upstream, 1.17, 1.18 upstream-key.gpg, 1.8, 1.9
Message-ID: <20080912161113.15D0170131@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30016

Modified Files:
	.cvsignore sources subversion-1.5.1-rpath.patch 
	subversion.spec upstream upstream-key.gpg 
Added Files:
	subversion-1.5.2.tar.gz.asc 
Log Message:
* Fri Sep 12 2008 Joe Orton <jorton at redhat.com> 1.5.2-2
- update to 1.5.2



--- NEW FILE subversion-1.5.2.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQBItb5GCwOubk4kUXwRAp3zAKDdQS+jcKOLUpiHO/ugqJZVo+7PyACgiHfw
W8WBgUNuf6QZWk92zs7N9nI=
=Rh5M
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAki2UNcACgkQvJ27E9sAokiCrwCgyUskjkLdWtJdRn3MJPtT1PZM
aMkAniL4nCSus9m9Y9R6YfwtJiW3F1w5
=MBZt
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)

iD8DBQBItp7INR8z5DU+JbwRAoMtAJ96rTfPvPkHbNlmWEybvSc3l+5Y2gCgmGFw
ayX6rq/TEuFri6AdbJ9z0wE=
=mUPF
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQBItp089o1G+2zNQDgRAuswAJ9BiujuEQLl4GWxvubm5rwk9yLGMgCgjjuN
iYzN4xafz6dLEkOSa+rO27Q=
=KTcG
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Darwin)

iEYEABECAAYFAki2wUgACgkQxXIjJtpWHZF+vwCghn86wGDiqYl1EveHagyoGzk8
WEgAnifvCKkh9qprQi5eZH0AYwAlX7HV
=gbUP
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAki398kACgkQ+ZiecT68nAMZPQCgg7XPxIwHk+9r1UcYKS3ylxCc
M4QAoJjZ1xlm1oEgMcnBAClaOwRFP5mT
=12mz
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	26 Jun 2008 14:39:01 -0000	1.24
+++ .cvsignore	12 Sep 2008 16:10:42 -0000	1.25
@@ -1,3 +1 @@
-subversion-1.4.3.tar.gz
-subversion-1.4.6.tar.gz
-subversion-1.5.0.tar.gz
+subversion-1.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	28 Jul 2008 08:18:44 -0000	1.31
+++ sources	12 Sep 2008 16:10:42 -0000	1.32
@@ -1 +1 @@
-37533b0435caaa3e4e1be359389fcbb9  subversion-1.5.1.tar.gz
+ec3ae55d43ee87c1c1f57e2411009459  subversion-1.5.2.tar.gz

subversion-1.5.1-rpath.patch:

Index: subversion-1.5.1-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion-1.5.1-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- subversion-1.5.1-rpath.patch	28 Jul 2008 09:29:54 -0000	1.1
+++ subversion-1.5.1-rpath.patch	12 Sep 2008 16:10:42 -0000	1.2
@@ -1,3 +1,12 @@
+
+Libraries should be linked with -rpath $libdir but programs should not.
+Doing so for the latter means that a redundant RPATH entry of $libdir
+will end up in the binaries.
+
+The redundant RPATH can also cause obscure build failures by causing
+in-build binaries to pick up libraries from the system environment,
+which libtool will otherwise avoid.
+
 --- subversion-1.5.1/build/generator/gen_base.py.rpath
 +++ subversion-1.5.1/build/generator/gen_base.py
 @@ -453,6 +453,9 @@ class TargetLib(TargetLinked):


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- subversion.spec	28 Jul 2008 09:29:54 -0000	1.120
+++ subversion.spec	12 Sep 2008 16:10:42 -0000	1.121
@@ -14,7 +14,7 @@
 
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
-Version: 1.5.1
+Version: 1.5.2
 Release: 2
 License: ASL 1.1
 Group: Development/Tools
@@ -277,6 +277,9 @@
 %endif
 
 %changelog
+* Fri Sep 12 2008 Joe Orton <jorton at redhat.com> 1.5.2-2
+- update to 1.5.2
+
 * Mon Jul 28 2008 Joe Orton <jorton at redhat.com> 1.5.1-2
 - update to 1.5.1
 - require suitable APR


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/upstream,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- upstream	26 Jun 2008 13:44:29 -0000	1.17
+++ upstream	12 Sep 2008 16:10:42 -0000	1.18
@@ -1 +1 @@
-subversion-1.5.0.tar.gz
+subversion-1.5.2.tar.gz


Index: upstream-key.gpg
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/upstream-key.gpg,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- upstream-key.gpg	28 Jul 2008 08:18:44 -0000	1.8
+++ upstream-key.gpg	12 Sep 2008 16:10:42 -0000	1.9
@@ -375,3 +375,36 @@
 DsaBdgGvAKCGgo20vieV2HBWLOLVNH7t7CJQ+A==
 =nnAp
 -----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+mQGiBEhra/QRBACJCtNyVyi8+iH45zmHlw7vnU8ipoYQRCIpjKu8dDDnn2J2AgiQ
+bdRY3s6jGmlwdkxD51L5qejiOWnRMJbc6n90D0z1U7e0v9Bb0F0AaPjxS9aZXxp+
+13+2gC3bWLhDAU56MxWkkXxqulJsaNAPuMOnwGS885hz9VNnqE3l+oUSNwCgxZYM
+0dvHQzwp8SyJrshIZKurXn0D/0XewxYZPE6Pls4Ss6HsJCj4v37EIVDOl78PCSMM
+/8khpcBqzdDs5dbMN+XBl/tmns0AIXJtpWjSKa3w8NAoWqbsTxmJlGCS6NiP/lU2
+u1te47XrI0pVIaA+1UV15PHqbWIhhuWU/ge1wWHRFCBdgDcNgbbMtQIfVzJc/7Gn
+H1+nA/oC6+pSNPjRKNNmGMzRVKrtgS4YG0MPUYAraI+Det8CvkvP5V3IJsC74881
+0ToZUX7kO1JxgUfdoPOI5cDJwexElyeL1cW2zuNXNnBC8CXwng87mYDEAQZrOGWv
+3w7RVDhI/vzScNrLBRF+vyiIU0u0r9DG/B89x3rXmb59WowbsbQmU2VudGhpbCBL
+dW1hcmFuIFMgPHN0eWxlc2VuQGdtYWlsLmNvbT6IYAQTEQIAIAUCSGtr9AIbAwYL
+CQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEPaNRvtszUA4rDcAn1+nHEQYTv5kXbQf
+ktaCs9wyMrSHAJ44cGGj9V1PSZbTwSidYrXxeXmLOLQyU2VudGhpbCBLdW1hcmFu
+IFMgKENvbGxhYk5ldCkgPHNlbnRoaWxAY29sbGFiLm5ldD6IYAQTEQIAIAUCSGuE
+XQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEPaNRvtszUA43fUAnAqi49Fn
+EHFpFNV53w67mFKIYV91AKCLvl+yOaleHcZsCLi037CTNU7tNrkCDQRIa2wGEAgA
+/9lC3XQKBB+pzZO/yWtJp54c4QsqPO4FlbZPlKLU5UXG/3wDVPIt6ChglKcYIByk
+JGq/oD93UUHWSN9ve29m+Ka0uhGr2rGwmSPEAJJBaZG2hwbCUYcsqcY5XTtVapAb
+flAQLz0IbgYVT3i5szicIWUdaApQU6TwyiytLSizneyYzq6xXxmssrY5VLXqmqj3
+fa2E1zgwL7uEzyHWFSTWhThPXi6ncb8zrCZZIuFQV2p+nfWk5thYqiomIKs3kxCN
+KuYfYo25jbZi/H0ZQ0Tc7j2Wph6VeRRnEpcvGvLeaejhYCMHzzrs9iuI7AqAutdJ
+Vd8N3Rtks7vf/wNSNpjc+wADBQf9Er3xKIB+4XwfKBlpqcv/fIuqZXubL/Kjd7i+
+zTgcuOTZA5ZyKfnd9kpBO8zW1nknZQo1hKQX7pg0OD4CQk59cnYdpday3kvEofsd
+idkzPapSKDHxV448J7RsSc6Qca1KKIuW+9buCQRirHxrh3AyUcbDPQcb1XAS9fZF
+y9/GmGxCqI0j5Liokfok7ps+G0AUUN3S4i5BFpZMF9gSf7FMLZk/5gd6j+SrLmNQ
+lkaWUeLIkuy9lmhzdLQzyvLX55ujkKlUjgtPwgw04dFtyz8+gTmiMEB9y3NM4tSk
+l4E0A0GBatTuhF7tiKXYb8oB3flSq+xdYH02iV4k59ycvLsHI4hJBBgRAgAJBQJI
+a2wGAhsMAAoJEPaNRvtszUA4E5gAn19YSN4BMk9y+kro+0owbyeceQuNAJ9KpoYy
+Gxwlp5wUvMFncAQf/hsZag==
+=DqKd
+-----END PGP PUBLIC KEY BLOCK-----



From spot at fedoraproject.org  Fri Sep 12 16:16:18 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 16:16:18 +0000 (UTC)
Subject: rpms/libconfig/devel .cvsignore, 1.3, 1.4 libconfig.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20080912161618.EA62F70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/libconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30880

Modified Files:
	.cvsignore libconfig.spec sources 
Log Message:
update to 1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libconfig/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Feb 2008 19:37:04 -0000	1.3
+++ .cvsignore	12 Sep 2008 16:15:48 -0000	1.4
@@ -1 +1 @@
-libconfig-1.2.1.tar.gz
+libconfig-1.3.1.tar.gz


Index: libconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libconfig/devel/libconfig.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libconfig.spec	20 Feb 2008 01:16:04 -0000	1.4
+++ libconfig.spec	12 Sep 2008 16:15:48 -0000	1.5
@@ -1,7 +1,7 @@
 Name:			libconfig
 Summary: 		C/C++ configuration file library
-Version:		1.2.1
-Release:		2%{?dist}
+Version:		1.3.1
+Release:		1%{?dist}
 License:		LGPLv2+
 Group:			System Environment/Libraries
 Source0:		http://www.hyperrealm.com/libconfig/libconfig-%{version}.tar.gz
@@ -72,6 +72,9 @@
 %{_infodir}/libconfig.info*
 
 %changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3.1-1
+- update to 1.3.1
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.1-2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libconfig/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Feb 2008 19:37:04 -0000	1.3
+++ sources	12 Sep 2008 16:15:48 -0000	1.4
@@ -1 +1 @@
-53e2fc5394c456add5581606c5165dd7  libconfig-1.2.1.tar.gz
+f02bfa27a21b3040089026975b9dc0b8  libconfig-1.3.1.tar.gz



From pkgdb at fedoraproject.org  Fri Sep 12 16:18:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 16:18:02 +0000
Subject: [pkgdb] sugar-journal ownership updated
Message-ID: <20080912161802.7AE50208D98@bastion.fedora.phx.redhat.com>

Package sugar-journal in Fedora devel was orphaned by ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-journal



From pkgdb at fedoraproject.org  Fri Sep 12 16:18:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 16:18:04 +0000
Subject: [pkgdb] sugar-journal ownership updated
Message-ID: <20080912161804.B681F208D9B@bastion.fedora.phx.redhat.com>

Package sugar-journal in Fedora 9 was orphaned by ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-journal



From pkgdb at fedoraproject.org  Fri Sep 12 16:18:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 16:18:07 +0000
Subject: [pkgdb] sugar-journal ownership updated
Message-ID: <20080912161807.6358D2D0021@bastion.fedora.phx.redhat.com>

Package sugar-journal in Fedora 8 was orphaned by ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-journal



From pkgdb at fedoraproject.org  Fri Sep 12 16:18:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 16:18:10 +0000
Subject: [pkgdb] sugar-journal ownership updated
Message-ID: <20080912161810.5C2542D0023@bastion.fedora.phx.redhat.com>

Package sugar-journal in Fedora OLPC 3 was orphaned by ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-journal



From pkgdb at fedoraproject.org  Fri Sep 12 16:19:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 16:19:33 +0000
Subject: [pkgdb] fedora-ds-base: ausil has given up watchcommits
Message-ID: <20080912161933.A9618208D9B@bastion.fedora.phx.redhat.com>

ausil has given up the watchcommits acl on fedora-ds-base (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-base



From pkgdb at fedoraproject.org  Fri Sep 12 16:19:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 16:19:37 +0000
Subject: [pkgdb] fedora-ds-base: ausil has given up watchbugzilla
Message-ID: <20080912161937.816D6208DA1@bastion.fedora.phx.redhat.com>

ausil has given up the watchbugzilla acl on fedora-ds-base (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-base



From pkgdb at fedoraproject.org  Fri Sep 12 16:19:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 16:19:38 +0000
Subject: [pkgdb] fedora-ds-base: ausil has given up watchcommits
Message-ID: <20080912161938.C1059208DA6@bastion.fedora.phx.redhat.com>

ausil has given up the watchcommits acl on fedora-ds-base (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-base



From pkgdb at fedoraproject.org  Fri Sep 12 16:19:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 16:19:41 +0000
Subject: [pkgdb] fedora-ds-base: ausil has given up watchbugzilla
Message-ID: <20080912161941.9F57A2D0024@bastion.fedora.phx.redhat.com>

ausil has given up the watchbugzilla acl on fedora-ds-base (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-base



From pkgdb at fedoraproject.org  Fri Sep 12 16:19:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 16:19:46 +0000
Subject: [pkgdb] fedora-ds-base: ausil has given up watchcommits
Message-ID: <20080912161946.5B707208DAA@bastion.fedora.phx.redhat.com>

ausil has given up the watchcommits acl on fedora-ds-base (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-base



From pkgdb at fedoraproject.org  Fri Sep 12 16:19:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 16:19:48 +0000
Subject: [pkgdb] fedora-ds-base: ausil has given up watchbugzilla
Message-ID: <20080912161949.04EC22D0026@bastion.fedora.phx.redhat.com>

ausil has given up the watchbugzilla acl on fedora-ds-base (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-base



From pkgdb at fedoraproject.org  Fri Sep 12 16:19:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 16:19:50 +0000
Subject: [pkgdb] fedora-ds-base: ausil has given up watchcommits
Message-ID: <20080912161950.CE4062D002B@bastion.fedora.phx.redhat.com>

ausil has given up the watchcommits acl on fedora-ds-base (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-base



From pkgdb at fedoraproject.org  Fri Sep 12 16:19:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 16:19:53 +0000
Subject: [pkgdb] fedora-ds-base: ausil has given up watchcommits
Message-ID: <20080912161953.DEB2F2D0030@bastion.fedora.phx.redhat.com>

ausil has given up the watchcommits acl on fedora-ds-base (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-base



From pkgdb at fedoraproject.org  Fri Sep 12 16:19:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 16:19:58 +0000
Subject: [pkgdb] fedora-ds-base: ausil has given up watchbugzilla
Message-ID: <20080912161958.3619F208D9E@bastion.fedora.phx.redhat.com>

ausil has given up the watchbugzilla acl on fedora-ds-base (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-base



From pkgdb at fedoraproject.org  Fri Sep 12 16:20:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 16:20:02 +0000
Subject: [pkgdb] fedora-ds-base: ausil has given up watchcommits
Message-ID: <20080912162002.CDB802D0031@bastion.fedora.phx.redhat.com>

ausil has given up the watchcommits acl on fedora-ds-base (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-base



From pkgdb at fedoraproject.org  Fri Sep 12 16:20:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 16:20:05 +0000
Subject: [pkgdb] fedora-ds-base: ausil has given up watchbugzilla
Message-ID: <20080912162006.073972D0036@bastion.fedora.phx.redhat.com>

ausil has given up the watchbugzilla acl on fedora-ds-base (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-base



From pkgdb at fedoraproject.org  Fri Sep 12 16:21:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 16:21:18 +0000
Subject: [pkgdb] fedora-ds-base had acl change status
Message-ID: <20080912162118.A6E2D2D0023@bastion.fedora.phx.redhat.com>

ausil has set the watchcommits acl on fedora-ds-base (Fedora devel) to Obsolete for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-base



From pkgdb at fedoraproject.org  Fri Sep 12 16:21:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 16:21:21 +0000
Subject: [pkgdb] fedora-ds-base had acl change status
Message-ID: <20080912162121.17C4B2D0028@bastion.fedora.phx.redhat.com>

ausil has set the watchbugzilla acl on fedora-ds-base (Fedora devel) to Obsolete for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-base



From rstrode at fedoraproject.org  Fri Sep 12 16:22:06 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 12 Sep 2008 16:22:06 +0000 (UTC)
Subject: rpms/gdm/devel gdm-2.23.92-force-active-vt.patch, 1.1, 1.2 gdm.spec,
	1.412, 1.413
Message-ID: <20080912162206.9A9DC70131@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31897

Modified Files:
	gdm-2.23.92-force-active-vt.patch gdm.spec 
Log Message:
- Fix bug in last patch


gdm-2.23.92-force-active-vt.patch:

Index: gdm-2.23.92-force-active-vt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.23.92-force-active-vt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.23.92-force-active-vt.patch	11 Sep 2008 21:10:53 -0000	1.1
+++ gdm-2.23.92-force-active-vt.patch	12 Sep 2008 16:21:36 -0000	1.2
@@ -42,7 +42,7 @@
  	-DPIXMAPDIR=\"$(pixmapdir)\"			\
  	-DSBINDIR=\"$(sbindir)\"			\
  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-+	-DGDM_SPOOL_DIR=\"$(GDM_SPOOL_DIR)\"  \
++        -DGDM_SPOOL_DIR=\"$(GDM_SPOOL_DIR)\"  \
  	-DGDM_XAUTH_DIR=\"$(GDM_XAUTH_DIR)\"		\
  	-DGDM_DEFAULTS_CONF=\"$(GDM_DEFAULTS_CONF)\"	\
  	-DGDM_CUSTOM_CONF=\"$(GDM_CUSTOM_CONF)\"	\
@@ -66,51 +66,51 @@
 +static gboolean
 +should_force_display_on_active_vt (void)
 +{
-+	gboolean should_force_display_on_active_vt;
++        gboolean should_force_display_on_active_vt;
 +
-+	should_force_display_on_active_vt = g_file_test (GDM_SPOOL_DIR "/force-display-on-active-vt",
-+			               G_FILE_TEST_EXISTS);
-+  	g_unlink (GDM_SPOOL_DIR "/force-display-on-active-vt");
++        should_force_display_on_active_vt = g_file_test (GDM_SPOOL_DIR "/force-display-on-active-vt",
++                                                         G_FILE_TEST_EXISTS);
++        g_unlink (GDM_SPOOL_DIR "/force-display-on-active-vt");
 +
-+  	return should_force_display_on_active_vt;
++        return should_force_display_on_active_vt;
 +}
 +
 +static int
 +get_active_vt (void)
 +{
-+	int console_fd;
-+	struct vt_stat console_state = { 0 };
++        int console_fd;
++        struct vt_stat console_state = { 0 };
 +
-+	console_fd = open ("/dev/tty0", O_RDONLY | O_NOCTTY);
++        console_fd = open ("/dev/tty0", O_RDONLY | O_NOCTTY);
 +
-+	if (console_fd < 0) {
-+		goto out;
-+	}
-+
-+	if (ioctl (console_fd, VT_GETSTATE, &console_state) < 0) {
-+		goto out;
-+	}
++        if (console_fd < 0) {
++                goto out;
++        }
++
++        if (ioctl (console_fd, VT_GETSTATE, &console_state) < 0) {
++                goto out;
++        }
 +
 +out:
-+  	if (console_fd >= 0) {
-+    		close (console_fd);
-+	}
++        if (console_fd >= 0) {
++                close (console_fd);
++        }
 +
-+  return console_state.v_active;
++        return console_state.v_active;
 +}
 +
 +static char *
 +get_active_vt_as_string (void)
 +{
-+	int vt;
++        int vt;
 +
-+	vt = get_active_vt ();
-+	
-+	if (vt <= 0) {
-+		return NULL;
-+	}
++        vt = get_active_vt ();
 +
-+	return g_strdup_printf ("vt%d", vt);
++        if (vt <= 0) {
++                return NULL;
++        }
++
++        return g_strdup_printf ("vt%d", vt);
 +}
 +
  /**
@@ -122,18 +122,18 @@
  
 -        /* fork X server process */
 -        res = gdm_server_spawn (server, NULL);
-+	if (should_force_display_on_active_vt () || TRUE) {
++        if (should_force_display_on_active_vt ()) {
 +                char *vt;
 +
-+		g_free (server->priv->command);
-+		server->priv->command = g_strdup (X_SERVER " -nr -verbose");
++                g_free (server->priv->command);
++                server->priv->command = g_strdup (X_SERVER " -nr -verbose");
 +                vt = get_active_vt_as_string ();
-+		res = gdm_server_spawn (server, vt);
++                res = gdm_server_spawn (server, vt);
 +                g_free (vt);
-+	} else {
-+		/* fork X server process */
-+		res = gdm_server_spawn (server, NULL);
-+	}
++        } else {
++                /* fork X server process */
++                res = gdm_server_spawn (server, NULL);
++        }
  
          return res;
  }
@@ -153,7 +153,7 @@
  	-rf \
  	$(DESTDIR)$(workingdir)/.gconf.mandatory \
  	$(DESTDIR)$(xauthdir)
-+	$(DESTDIR)$(spooldir)
++        $(DESTDIR)$(spooldir)
  
  install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.path
  	if test '!' -d $(DESTDIR)$(gdmconfdir); then \
@@ -161,11 +161,11 @@
  		chown root:gdm $(DESTDIR)$(workingdir) || : ; \
  	fi
  
-+	if test '!' -d $(DESTDIR)$(spooldir); then \
-+		$(mkinstalldirs) $(DESTDIR)$(spooldir); \
-+		chmod 1770 $(DESTDIR)$(spooldir); \
-+		chown root:gdm $(DESTDIR)$(spooldir) || : ; \
-+	fi
++        if test '!' -d $(DESTDIR)$(spooldir); then \
++        	$(mkinstalldirs) $(DESTDIR)$(spooldir); \
++        	chmod 1770 $(DESTDIR)$(spooldir); \
++        	chown root:gdm $(DESTDIR)$(spooldir) || : ; \
++        fi
 +
  	$(INSTALL_DATA) $(srcdir)/gconf.path $(DESTDIR)$(workingdir)/.gconf.path
  	gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --recursive-unset /


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- gdm.spec	11 Sep 2008 21:10:53 -0000	1.412
+++ gdm.spec	12 Sep 2008 16:21:36 -0000	1.413
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.23.92
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -304,6 +304,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Fri Sep 12 2008 Ray Strode <rstrode at redhat.com> - 1:2.23.92-4
+- Fix bug in last patch
+
 * Thu Sep 11 2008 Ray Strode <rstrode at redhat.com> - 1:2.23.92-3
 - Add hook to allow for plymouth transition
 



From mpg at fedoraproject.org  Fri Sep 12 16:29:13 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Fri, 12 Sep 2008 16:29:13 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.16, 1.17 sources, 1.17,
	1.18 sugar.spec, 1.24, 1.25
Message-ID: <20080912162913.6F7F370131@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv792

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Thu Sep 12 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.5-1
- #8427 Sugar does not send SetActive(True)
- #8409 Sugar does not save network's BSSIDs in networks.cfg




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	6 Sep 2008 16:10:25 -0000	1.16
+++ .cvsignore	12 Sep 2008 16:28:43 -0000	1.17
@@ -1 +1 @@
-sugar-0.82.3.tar.bz2
+sugar-0.82.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	11 Sep 2008 10:36:03 -0000	1.17
+++ sources	12 Sep 2008 16:28:43 -0000	1.18
@@ -1 +1 @@
-2c95d636cfdc8006aeea002582185c28  sugar-0.82.4.tar.bz2
+b013856f373c16c3946805217fad93fe  sugar-0.82.5.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sugar.spec	11 Sep 2008 10:36:03 -0000	1.24
+++ sugar.spec	12 Sep 2008 16:28:43 -0000	1.25
@@ -3,7 +3,7 @@
 
 Summary: OLPC desktop environment
 Name: sugar
-Version: 0.82.4
+Version: 0.82.5
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
@@ -94,6 +94,10 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Thu Sep 12 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.5-1
+- #8427 Sugar does not send SetActive(True)
+- #8409 Sugar does not save network's BSSIDs in networks.cfg
+
 * Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.4-1
 - #7480 Need to 'reset' the network configurations - short term fix
 - #8368 Disable the server plugin if no server was specified



From mpg at fedoraproject.org  Fri Sep 12 16:30:42 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Fri, 12 Sep 2008 16:30:42 +0000 (UTC)
Subject: rpms/sugar/OLPC-3 sources,1.17,1.18 sugar.spec,1.20,1.21
Message-ID: <20080912163042.8B52870131@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1110

Modified Files:
	sources sugar.spec 
Log Message:
* Thu Sep 12 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.5-1
- #8427 Sugar does not send SetActive(True)
- #8409 Sugar does not save network's BSSIDs in networks.cfg




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	11 Sep 2008 10:01:28 -0000	1.17
+++ sources	12 Sep 2008 16:30:12 -0000	1.18
@@ -1 +1 @@
-2c95d636cfdc8006aeea002582185c28  sugar-0.82.4.tar.bz2
+b013856f373c16c3946805217fad93fe  sugar-0.82.5.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sugar.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sugar.spec	11 Sep 2008 10:01:28 -0000	1.20
+++ sugar.spec	12 Sep 2008 16:30:12 -0000	1.21
@@ -3,7 +3,7 @@
 
 Summary: OLPC desktop environment
 Name: sugar
-Version: 0.82.4
+Version: 0.82.5
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
@@ -94,6 +94,10 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Thu Sep 12 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.5-1
+- #8427 Sugar does not send SetActive(True)
+- #8409 Sugar does not save network's BSSIDs in networks.cfg
+
 * Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.4-1
 - #7480 Need to 'reset' the network configurations - short term fix
 - #8368 Disable the server plugin if no server was specified



From spot at fedoraproject.org  Fri Sep 12 16:32:31 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 16:32:31 +0000 (UTC)
Subject: rpms/ntfsprogs/devel
	ntfsprogs-2.0.0-avoid_crash_on_failed_readall_attr.patch, NONE,
	1.1 ntfsprogs-2.0.0-undelete-segfault-fix.patch, NONE,
	1.1 ntfsprogs-2.0.0-build-extras-by-default.patch, 1.1,
	1.2 ntfsprogs.spec, 1.15, 1.16
Message-ID: <20080912163231.DA14670131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ntfsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1835

Modified Files:
	ntfsprogs-2.0.0-build-extras-by-default.patch ntfsprogs.spec 
Added Files:
	ntfsprogs-2.0.0-avoid_crash_on_failed_readall_attr.patch 
	ntfsprogs-2.0.0-undelete-segfault-fix.patch 
Log Message:
fix FTBFS, avoid crash on failed readall attr, undelete segfault fix

ntfsprogs-2.0.0-avoid_crash_on_failed_readall_attr.patch:

--- NEW FILE ntfsprogs-2.0.0-avoid_crash_on_failed_readall_attr.patch ---
diff -up ntfsprogs-2.0.0/libntfs/volume.c.BAD ntfsprogs-2.0.0/libntfs/volume.c
--- ntfsprogs-2.0.0/libntfs/volume.c.BAD	2008-09-12 12:21:01.000000000 -0400
+++ ntfsprogs-2.0.0/libntfs/volume.c	2008-09-12 12:21:40.000000000 -0400
@@ -258,8 +258,10 @@ mft_has_no_attr_list:
 	/* Receive attributes from STANDARD_INFORMATION. */
 	std_info = ntfs_attr_readall(vol->mft_ni, AT_STANDARD_INFORMATION,
 				     AT_UNNAMED, 0, NULL);
-	vol->mft_ni->flags = std_info->file_attributes;
-	free(std_info);
+	if(std_info!=NULL) {
+		vol->mft_ni->flags = std_info->file_attributes;
+		free(std_info);
+	}
 
 	/* We now have a fully setup ntfs inode for $MFT in vol->mft_ni. */
 

ntfsprogs-2.0.0-undelete-segfault-fix.patch:

--- NEW FILE ntfsprogs-2.0.0-undelete-segfault-fix.patch ---
diff -up ntfsprogs-2.0.0/ntfsprogs/ntfsundelete.c.BAD ntfsprogs-2.0.0/ntfsprogs/ntfsundelete.c
--- ntfsprogs-2.0.0/ntfsprogs/ntfsundelete.c.BAD	2008-09-12 12:19:02.000000000 -0400
+++ ntfsprogs-2.0.0/ntfsprogs/ntfsundelete.c	2008-09-12 12:19:28.000000000 -0400
@@ -1779,7 +1779,7 @@ static int undelete_file(ntfs_volume *vo
 							"%lld clusters.\n",
 							(long long)rl[i].length);
 					memset(buffer, opts.fillbyte, bufsize);
-					for (k = 0; k < rl[k].length * vol->cluster_size; k += bufsize) {
+					for (k = 0; k < rl[i].length * vol->cluster_size; k += bufsize) {
 						if (write_data(fd, buffer, bufsize) < bufsize) {
 							ntfs_log_perror("Write failed");
 							close(fd);

ntfsprogs-2.0.0-build-extras-by-default.patch:

Index: ntfsprogs-2.0.0-build-extras-by-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ntfsprogs/devel/ntfsprogs-2.0.0-build-extras-by-default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntfsprogs-2.0.0-build-extras-by-default.patch	30 Nov 2007 19:36:51 -0000	1.1
+++ ntfsprogs-2.0.0-build-extras-by-default.patch	12 Sep 2008 16:32:31 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up ntfsprogs-1.13.1/ntfsprogs/Makefile.am.BAD ntfsprogs-1.13.1/ntfsprogs/Makefile.am
---- ntfsprogs-1.13.1/ntfsprogs/Makefile.am.BAD	2007-07-11 16:16:54.000000000 -0500
-+++ ntfsprogs-1.13.1/ntfsprogs/Makefile.am	2007-07-11 16:19:06.000000000 -0500
+diff -up ntfsprogs-2.0.0/ntfsprogs/Makefile.am.orig ntfsprogs-2.0.0/ntfsprogs/Makefile.am
+--- ntfsprogs-2.0.0/ntfsprogs/Makefile.am.orig	2007-09-24 12:05:58.000000000 -0400
++++ ntfsprogs-2.0.0/ntfsprogs/Makefile.am	2008-09-12 12:17:13.000000000 -0400
 @@ -11,7 +11,9 @@ endif
  # Workaround to make REALLYSTATIC work with automake 1.5.
  LINK=$(STATIC_LINK) $(LIBTOOL_LINK)
@@ -19,10 +19,10 @@
 +bin_PROGRAMS		+= ntfsdecrypt
  endif
  
- if ENABLE_RICH
-diff -up ntfsprogs-2.0.0/ntfsprogs/Makefile.in.BAD ntfsprogs-2.0.0/ntfsprogs/Makefile.in
---- ntfsprogs-2.0.0/ntfsprogs/Makefile.in.BAD	2007-11-30 08:50:49.000000000 -0500
-+++ ntfsprogs-2.0.0/ntfsprogs/Makefile.in	2007-11-30 08:51:33.000000000 -0500
+ # Set the include path.
+diff -up ntfsprogs-2.0.0/ntfsprogs/Makefile.in.orig ntfsprogs-2.0.0/ntfsprogs/Makefile.in
+--- ntfsprogs-2.0.0/ntfsprogs/Makefile.in.orig	2008-09-12 12:18:10.000000000 -0400
++++ ntfsprogs-2.0.0/ntfsprogs/Makefile.in	2008-09-12 12:15:16.000000000 -0400
 @@ -35,7 +35,9 @@ host_triplet = @host@
  target_triplet = @target@
  bin_PROGRAMS = ntfsfix$(EXEEXT) ntfsinfo$(EXEEXT) ntfscluster$(EXEEXT) \


Index: ntfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntfsprogs/devel/ntfsprogs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ntfsprogs.spec	25 Jun 2008 13:01:08 -0000	1.15
+++ ntfsprogs.spec	12 Sep 2008 16:32:31 -0000	1.16
@@ -1,11 +1,13 @@
 Name:		ntfsprogs
 Version:	2.0.0
-Release:	8%{?dist}
+Release:	9%{?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
 Patch1:		ntfsprogs-2.0.0-mbonly-info.patch
 Patch2:		ntfsprogs-2.0.0-check_volume.patch
+Patch3:		ntfsprogs-2.0.0-undelete-segfault-fix.patch
+Patch4:		ntfsprogs-2.0.0-avoid_crash_on_failed_readall_attr.patch
 License:	GPLv2+
 URL:		http://www.linux-ntfs.org/
 Group:		System Environment/Base
@@ -46,6 +48,8 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1 -b .check_volume
+%patch3 -p1 -b .undelete-segfault-fix
+%patch4 -p1 -b .avoid_crash_on_failed_readall_attr
 
 %build
 # If we need to enable the fuse module, we'd change this.
@@ -116,6 +120,11 @@
 %{_libdir}/gnome-vfs-2.0/modules/libntfs-gnomevfs.so
 
 %changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.0-9
+- avoid crash when ntfs_attr_readall fails (Christophe Grenier)
+- fix segfault in ntfsundelete (Gary Funck)
+- fix FTBFS
+
 * Wed Jun 25 2008 Tomas Mraz <tmraz at redhat.com> - 2.0.0-8
 - rebuild with new gnutls
 



From rdieter at fedoraproject.org  Fri Sep 12 16:37:25 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 12 Sep 2008 16:37:25 +0000 (UTC)
Subject: rpms/eigen2/devel eigen2.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080912163725.6CC0770131@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/eigen2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2971/devel

Modified Files:
	.cvsignore sources 
Added Files:
	eigen2.spec import.log 
Log Message:
import



--- NEW FILE eigen2.spec ---

# Fedora package review
# http://bugzilla.redhat.com/459705

#define _with_check -DBUILD_TESTS=ON 
%define pre alpha7

Name:    eigen2
Summary: A lightweight C++ template library for vector and matrix math
Version: 2.0 
Release: 0.3.%{pre}%{?dist} 
Group:   System Environment/Libraries
License: GPLv2+ or LGPLv3+
URL:     http://eigen.tuxfamily.org/
Source0: http://download.tuxfamily.org/eigen/eigen-%{version}-%{pre}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

BuildRequires: cmake
#docs
BuildRequires: doxygen graphviz
%if 0%{?fedora} > 8
BuildRequires: tex(latex)
%else
BuildRequires: tetex-latex
#BuildRequires: %{_bindir}/latex
%endif
%{?_with_check:BuildRequires: qt4-devel}

%description
%{summary}

%package devel
Summary: A lightweight C++ template library for vector and matrix math
Group:   Development/Libraries
# -devel subpkg only atm, compat with other distros
Provides: %{name} = %{version}-%{release}
%description devel
%{summary}


%prep
%setup -q -n eigen2


%build

mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake} %{?_with_check}  ..
popd

make %{?_smp_mflags} -C %{_target_platform}

# docs
doxygen



%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot} -C %{_target_platform}


%check
%if 0%{?_with_check:1}
( cd %{_target_platform}/test; ctest )
%endif


%clean 
rm -rf %{buildroot}


%files devel
%defattr(-,root,root,-)
%doc COPYING COPYING.LESSER
%doc html/
%{_includedir}/eigen2/


%changelog
* Mon Aug 25 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.3.alpha7
- disable buildtime tests, which tickle gcc bugs

* Fri Aug 22 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.2.alpha7
- add working %%check

* Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.1.alpha7
- eigen-2.0-alpha7


--- NEW FILE import.log ---
eigen2-2_0-0_3_alpha7_fc10:HEAD:eigen2-2.0-0.3.alpha7.fc10.src.rpm:1221237423


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 19:40:38 -0000	1.1
+++ .cvsignore	12 Sep 2008 16:36:55 -0000	1.2
@@ -0,0 +1 @@
+eigen-2.0-alpha7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 19:40:38 -0000	1.1
+++ sources	12 Sep 2008 16:36:55 -0000	1.2
@@ -0,0 +1 @@
+97f0d655dd020df6fa9d40dcdf967ef2  eigen-2.0-alpha7.tar.bz2



From rstrode at fedoraproject.org  Fri Sep 12 16:40:28 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 12 Sep 2008 16:40:28 +0000 (UTC)
Subject: rpms/gdm/devel gdm-2.23.92-force-active-vt.patch,1.2,1.3
Message-ID: <20080912164028.AD6DB70131@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4090

Modified Files:
	gdm-2.23.92-force-active-vt.patch 
Log Message:
fix whitespace issue introduced from editing patch in place


gdm-2.23.92-force-active-vt.patch:

Index: gdm-2.23.92-force-active-vt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.23.92-force-active-vt.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdm-2.23.92-force-active-vt.patch	12 Sep 2008 16:21:36 -0000	1.2
+++ gdm-2.23.92-force-active-vt.patch	12 Sep 2008 16:40:28 -0000	1.3
@@ -153,7 +153,7 @@
  	-rf \
  	$(DESTDIR)$(workingdir)/.gconf.mandatory \
  	$(DESTDIR)$(xauthdir)
-+        $(DESTDIR)$(spooldir)
++	$(DESTDIR)$(spooldir)
  
  install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.path
  	if test '!' -d $(DESTDIR)$(gdmconfdir); then \
@@ -161,11 +161,11 @@
  		chown root:gdm $(DESTDIR)$(workingdir) || : ; \
  	fi
  
-+        if test '!' -d $(DESTDIR)$(spooldir); then \
-+        	$(mkinstalldirs) $(DESTDIR)$(spooldir); \
-+        	chmod 1770 $(DESTDIR)$(spooldir); \
-+        	chown root:gdm $(DESTDIR)$(spooldir) || : ; \
-+        fi
++	if test '!' -d $(DESTDIR)$(spooldir); then \
++		$(mkinstalldirs) $(DESTDIR)$(spooldir); \
++		chmod 1770 $(DESTDIR)$(spooldir); \
++		chown root:gdm $(DESTDIR)$(spooldir) || : ; \
++	fi
 +
  	$(INSTALL_DATA) $(srcdir)/gconf.path $(DESTDIR)$(workingdir)/.gconf.path
  	gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --recursive-unset /



From davej at fedoraproject.org  Fri Sep 12 16:42:47 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 12 Sep 2008 16:42:47 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc6-git2.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.923, 1.924 kernel.spec, 1.947, 1.948 sources, 1.885,
	1.886 upstream, 1.797, 1.798 patch-2.6.27-rc6-git1.bz2.sign, 1.1, NONE
Message-ID: <20080912164247.38B9170131@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4669

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.27-rc6-git2.bz2.sign 
Removed Files:
	patch-2.6.27-rc6-git1.bz2.sign 
Log Message:
2.6.27-rc6-git2


--- NEW FILE patch-2.6.27-rc6-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIylo8yGugalF9Dw4RAtgzAJ9xbVqFoD0Zm/fn+bNccS7GouVFhwCglVf7
HwCiE+Io+ES54n+GaGX7nsg=
=Apec
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.923
retrieving revision 1.924
diff -u -r1.923 -r1.924
--- .cvsignore	12 Sep 2008 07:08:08 -0000	1.923
+++ .cvsignore	12 Sep 2008 16:42:16 -0000	1.924
@@ -5,4 +5,4 @@
 kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc6.bz2
-patch-2.6.27-rc6-git1.bz2
+patch-2.6.27-rc6-git2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.947
retrieving revision 1.948
diff -u -r1.947 -r1.948
--- kernel.spec	12 Sep 2008 07:08:08 -0000	1.947
+++ kernel.spec	12 Sep 2008 16:42:16 -0000	1.948
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1755,6 +1755,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Sep 12 2008 Dave Jones <davej at redhat.com>
+- 2.6.27-rc6-git2
+
 * Fri Sep 12 2008 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.27-rc6-git1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.885
retrieving revision 1.886
diff -u -r1.885 -r1.886
--- sources	12 Sep 2008 07:08:08 -0000	1.885
+++ sources	12 Sep 2008 16:42:16 -0000	1.886
@@ -1,3 +1,3 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 d3a173a00e15a6bf3c76068537a5c069  patch-2.6.27-rc6.bz2
-6fb0002c695965e00a8310e3972dbb3d  patch-2.6.27-rc6-git1.bz2
+d487da311055fd8f952a5db4e736c322  patch-2.6.27-rc6-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.797
retrieving revision 1.798
diff -u -r1.797 -r1.798
--- upstream	12 Sep 2008 07:08:08 -0000	1.797
+++ upstream	12 Sep 2008 16:42:16 -0000	1.798
@@ -1,3 +1,3 @@
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc6.bz2
-patch-2.6.27-rc6-git1.bz2
+patch-2.6.27-rc6-git2.bz2


--- patch-2.6.27-rc6-git1.bz2.sign DELETED ---



From rdieter at fedoraproject.org  Fri Sep 12 16:42:42 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 12 Sep 2008 16:42:42 +0000 (UTC)
Subject: rpms/eigen2/F-9 eigen2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20080912164242.A23E470131@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/eigen2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4597

Modified Files:
	.cvsignore sources 
Added Files:
	eigen2.spec 
Log Message:
sync w/devel



--- NEW FILE eigen2.spec ---

# Fedora package review
# http://bugzilla.redhat.com/459705

#define _with_check -DBUILD_TESTS=ON 
%define pre alpha7

Name:    eigen2
Summary: A lightweight C++ template library for vector and matrix math
Version: 2.0 
Release: 0.3.%{pre}%{?dist} 
Group:   System Environment/Libraries
License: GPLv2+ or LGPLv3+
URL:     http://eigen.tuxfamily.org/
Source0: http://download.tuxfamily.org/eigen/eigen-%{version}-%{pre}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

BuildRequires: cmake
#docs
BuildRequires: doxygen graphviz
%if 0%{?fedora} > 8
BuildRequires: tex(latex)
%else
BuildRequires: tetex-latex
#BuildRequires: %{_bindir}/latex
%endif
%{?_with_check:BuildRequires: qt4-devel}

%description
%{summary}

%package devel
Summary: A lightweight C++ template library for vector and matrix math
Group:   Development/Libraries
# -devel subpkg only atm, compat with other distros
Provides: %{name} = %{version}-%{release}
%description devel
%{summary}


%prep
%setup -q -n eigen2


%build

mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake} %{?_with_check}  ..
popd

make %{?_smp_mflags} -C %{_target_platform}

# docs
doxygen



%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot} -C %{_target_platform}


%check
%if 0%{?_with_check:1}
( cd %{_target_platform}/test; ctest )
%endif


%clean 
rm -rf %{buildroot}


%files devel
%defattr(-,root,root,-)
%doc COPYING COPYING.LESSER
%doc html/
%{_includedir}/eigen2/


%changelog
* Mon Aug 25 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.3.alpha7
- disable buildtime tests, which tickle gcc bugs

* Fri Aug 22 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.2.alpha7
- add working %%check

* Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.1.alpha7
- eigen-2.0-alpha7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 19:40:38 -0000	1.1
+++ .cvsignore	12 Sep 2008 16:42:12 -0000	1.2
@@ -0,0 +1 @@
+eigen-2.0-alpha7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 19:40:38 -0000	1.1
+++ sources	12 Sep 2008 16:42:12 -0000	1.2
@@ -0,0 +1 @@
+97f0d655dd020df6fa9d40dcdf967ef2  eigen-2.0-alpha7.tar.bz2



From allisson at fedoraproject.org  Fri Sep 12 16:49:26 2008
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Fri, 12 Sep 2008 16:49:26 +0000 (UTC)
Subject: rpms/clutter-gst/devel clutter-gst.spec,1.5,1.6
Message-ID: <20080912164926.54AC670131@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/clutter-gst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5630

Modified Files:
	clutter-gst.spec 
Log Message:

Rebuild against new gstreamer-devel



Index: clutter-gst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gst/devel/clutter-gst.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- clutter-gst.spec	7 Sep 2008 18:12:49 -0000	1.5
+++ clutter-gst.spec	12 Sep 2008 16:48:56 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           clutter-gst
 Version:        0.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ClutterMedia interface to GStreamer
 
 Group:          Development/Languages
@@ -59,6 +59,9 @@
 
 %changelog
 
+* Fri Sep 12 2008 Allisson Azevedo <allisson at gmail.com> 0.8.0-2
+- Rebuild against new gstreamer-devel
+
 * Sat Sep  6 2008 Allisson Azevedo <allisson at gmail.com> 0.8.0-1
 - Update to 0.8.0
 



From mpg at fedoraproject.org  Fri Sep 12 16:49:27 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Fri, 12 Sep 2008 16:49:27 +0000 (UTC)
Subject: rpms/sugar-datastore/OLPC-3 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 sugar-datastore.spec, 1.10, 1.11
Message-ID: <20080912164927.82A8970131@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-datastore/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5692

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Fri Sep 12 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.1-1
- #8396 copy-to-journal does not work from console




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/OLPC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	8 Jul 2008 14:19:41 -0000	1.9
+++ .cvsignore	12 Sep 2008 16:48:57 -0000	1.10
@@ -1 +1 @@
-sugar-datastore-0.8.3.tar.bz2
+sugar-datastore-0.82.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/OLPC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	8 Jul 2008 14:19:41 -0000	1.9
+++ sources	12 Sep 2008 16:48:57 -0000	1.10
@@ -1 +1 @@
-4771d999b14b2100a19b253b23f832d2  sugar-datastore-0.8.3.tar.bz2
+cf07fc14938df7f343b9efb552bbeaaa  sugar-datastore-0.82.1.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/OLPC-3/sugar-datastore.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sugar-datastore.spec	8 Jul 2008 14:19:41 -0000	1.10
+++ sugar-datastore.spec	12 Sep 2008 16:48:57 -0000	1.11
@@ -1,14 +1,14 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 
 Name: sugar-datastore
-Version: 0.8.3
+Version: 0.82.1
 Release: 1%{?dist}
 Summary: Sugar Datastore
 
 Group: Development/Libraries
 License: GPL
 URL: http://dev.laptop.org/
-Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -17,7 +17,6 @@
 
 Requires: gnome-python2-gnomevfs
 Requires: xapian-bindings-python
-Requires: python-sqlite2
 Requires: python-cjson
 
 %description
@@ -49,14 +48,14 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
-* Tue Jul 08 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.8.3-1
-- Update to 0.8.3
+* Fri Sep 12 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.1-1
+- #8396 copy-to-journal does not work from console
 
-* Mon Jul 07 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.8.2-3.20080707git4c75dcdebd
-- New git snapshot
+* Thu Aug 07 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.0-1
+- Update to 0.82.0
 
-* Thu Jul 03 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.8.2-2.20080703git588f82ed0d
-- New git snapshot
+* Fri Aug 01 2008 Morgan Collett <morgan at laptop.org> - 0.8.4-1
+- #7234 Request all the results so we get an accurate entry count
 
 * Sat Jun 21 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.8.2-1
 - Maintain a metadata copy outside the index



From allisson at fedoraproject.org  Fri Sep 12 16:54:01 2008
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Fri, 12 Sep 2008 16:54:01 +0000 (UTC)
Subject: rpms/ruby-gnome2/devel ruby-gnome2.spec,1.29,1.30
Message-ID: <20080912165401.836DC70131@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/ruby-gnome2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6865

Modified Files:
	ruby-gnome2.spec 
Log Message:

Rebuild against new gstreamer-devel



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ruby-gnome2.spec	9 Sep 2008 19:25:32 -0000	1.29
+++ ruby-gnome2.spec	12 Sep 2008 16:53:31 -0000	1.30
@@ -11,7 +11,7 @@
 
 Name:           ruby-gnome2
 Version:        0.17.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -700,6 +700,9 @@
 
 %changelog
 
+* Fri Sep 12 2008 Allisson Azevedo <allisson at gmail.com> 0.17.0-2
+- Rebuild against new gstreamer-devel
+
 * Tue Sep  9 2008 Allisson Azevedo <allisson at gmail.com> 0.17.0-1
 - Update to 0.17.0
 - Removed ruby-gnome2-0.17.0-rc1-newgtk-021303.patch



From hadess at fedoraproject.org  Fri Sep 12 16:53:55 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 12 Sep 2008 16:53:55 +0000 (UTC)
Subject: rpms/obex-data-server/devel obex-data-server-0.3.4-bluez4.patch, 1.1,
	1.2 obex-data-server.spec, 1.9, 1.10
Message-ID: <20080912165355.5C38D70131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/obex-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6761

Modified Files:
	obex-data-server-0.3.4-bluez4.patch obex-data-server.spec 
Log Message:
* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-4
- Update bluez 4.x patch for the latest D-Bus API


obex-data-server-0.3.4-bluez4.patch:

Index: obex-data-server-0.3.4-bluez4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/obex-data-server/devel/obex-data-server-0.3.4-bluez4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- obex-data-server-0.3.4-bluez4.patch	11 Sep 2008 13:01:10 -0000	1.1
+++ obex-data-server-0.3.4-bluez4.patch	12 Sep 2008 16:53:24 -0000	1.2
@@ -1,11 +1,35 @@
---- obex-data-server-0.3.4/src/ods-bluez.c	2008-06-27 16:21:14.000000000 +0100
-+++ obex-data-server-0.3.4.new/src/ods-bluez.c	2008-09-11 13:56:37.000000000 +0100
-@@ -314,7 +314,7 @@ get_remote_service_record_cb (DBusGProxy
+Index: src/ods-bluez.c
+===================================================================
+--- src/ods-bluez.c	(revision 1878)
++++ src/ods-bluez.c	(working copy)
+@@ -109,18 +109,18 @@
+ ods_bluez_init (OdsBluez *bluez)
+ {
+ 	GError		*error = NULL;
+-	gchar		*adapter_object = NULL;
++	char		*adapter_object = NULL;
+ 
+ 	OdsBluezClass *klass = ODS_BLUEZ_GET_CLASS (bluez);
+ 	bluez->priv = ODS_BLUEZ_GET_PRIVATE (bluez);
+ 
+ 	bluez->priv->manager_proxy = dbus_g_proxy_new_for_name (klass->connection,
+ 															"org.bluez",
+-															"/org/bluez",
++															"/",
+ 															"org.bluez.Manager");
+ 	if (!dbus_g_proxy_call (bluez->priv->manager_proxy, "DefaultAdapter", &error,
+ 								G_TYPE_INVALID,
+-								G_TYPE_STRING, &adapter_object,
++								DBUS_TYPE_G_OBJECT_PATH, &adapter_object,
+ 								G_TYPE_INVALID)) {
+ 		g_warning("Unable to connect to dbus: %s", error->message);
+ 		g_clear_error (&error);
+@@ -349,7 +349,7 @@
  		goto err;
  	}
- 	
+ 
 -	sdp_record = sdp_extract_pdu ((uint8_t *)record_array->data, &scanned);
 +	sdp_record = sdp_extract_pdu ((uint8_t *)record_array->data, record_array->len, &scanned);
- 	
+ 
  	/* get channel for this service */
  	if (sdp_get_access_protos (sdp_record, &protos) != 0) {


Index: obex-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obex-data-server/devel/obex-data-server.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- obex-data-server.spec	11 Sep 2008 13:01:10 -0000	1.9
+++ obex-data-server.spec	12 Sep 2008 16:53:25 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		obex-data-server
 Version:	0.3.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Epoch:		1
 Summary:	D-Bus service for Obex access
 
@@ -25,7 +25,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .bluez4
+%patch0 -p0 -b .bluez4
 
 %build
 %configure
@@ -63,6 +63,9 @@
 %{_mandir}/man1/obex-data-server.1.gz
 
 %changelog
+* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-4
+- Update bluez 4.x patch for the latest D-Bus API
+
 * Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-3
 - Rebuild with BlueZ 4.x patch
 



From rdieter at fedoraproject.org  Fri Sep 12 16:55:33 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 12 Sep 2008 16:55:33 +0000 (UTC)
Subject: rpms/koffice/devel .cvsignore, 1.18, 1.19 koffice.spec, 1.75,
	1.76 sources, 1.18, 1.19
Message-ID: <20080912165533.9391B70131@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7487

Modified Files:
	.cvsignore koffice.spec sources 
Log Message:
* Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.10-1
- koffice-1.9.95.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	17 Jul 2008 05:23:10 -0000	1.18
+++ .cvsignore	12 Sep 2008 16:55:03 -0000	1.19
@@ -1 +1 @@
-koffice-1.9.95.9.tar.bz2
+koffice-1.9.95.10.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- koffice.spec	17 Jul 2008 05:23:10 -0000	1.75
+++ koffice.spec	12 Sep 2008 16:55:03 -0000	1.76
@@ -1,6 +1,6 @@
 
 Name:           koffice
-Version:        1.9.95.9
+Version:        1.9.95.10
 Release:        1%{?dist}
 Summary:        An integrated office suite
 
@@ -24,7 +24,7 @@
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
 BuildRequires: doxygen
-BuildRequires: eigen-devel
+BuildRequires: eigen2-devel
 BuildRequires: exiv2-devel
 BuildRequires: fontconfig-devel
 BuildRequires: freeglut-devel
@@ -34,6 +34,8 @@
 BuildRequires: glew-devel
 BuildRequires: GraphicsMagick-devel
 BuildRequires: gsl-devel
+# BR: libkdcraw-devel >= 0.2.0 
+BuildRequires: kdegraphics4-devel
 BuildRequires: kdelibs4-devel
 BuildRequires: kdepimlibs-devel
 BuildRequires: lcms-devel
@@ -236,7 +238,10 @@
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+# SET EIGEN2_INCLUDE_DIR since our kde4_incdir != eigen2_incdir
+%{cmake_kde4} \
+  -DEIGEN2_INCLUDE_DIR=%{_includedir}/eigen2 \
+  ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -378,6 +383,7 @@
 %{_kde4_libdir}/libkomain.so.*
 %{_kde4_libdir}/libkoodf.so.*
 %{_kde4_libdir}/libkopageapp.so.*
+%{_kde4_libdir}/libkoproperty2.so.*
 %{_kde4_libdir}/libkoresources.so.*
 %{_kde4_libdir}/libkoffice_graya_u16.so.*
 %{_kde4_libdir}/libkofficegrayau8colorspace.so.*
@@ -408,7 +414,6 @@
 %{_kde4_libdir}/kde4/libgnumericexport.*
 %{_kde4_libdir}/kde4/libgnumericimport.*
 %{_kde4_libdir}/kde4/libkspreadhtmlexport.*
-%{_kde4_libdir}/kde4/libkspreadinsertcalendar.*
 %{_kde4_libdir}/kde4/libkspreadsolver.so
 %{_kde4_libdir}/kde4/libopencalcexport.*
 %{_kde4_libdir}/kde4/libopencalcimport.*
@@ -568,8 +573,6 @@
 %{_kde4_libdir}/kde4/libamiproimport.*
 %{_kde4_libdir}/kde4/libapplixspreadimport.*
 %{_kde4_libdir}/kde4/libapplixwordimport.*
-%{_kde4_libdir}/kde4/libasciiexport.*
-%{_kde4_libdir}/kde4/libasciiimport.*
 %{_kde4_libdir}/kde4/libdbaseimport.*
 %{_kde4_libdir}/kde4/libdocbookexport.*
 %{_kde4_libdir}/kde4/libexcelimport.*
@@ -635,6 +638,9 @@
 %{_kde4_datadir}/kde4/services/ServiceMenus/kword_konqi.desktop
 
 %changelog
+* Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.10-1
+- koffice-1.9.95.10
+
 * Thu Jul 17 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.9-1
 - koffice-1.9.95.9
 - fix pkg interdependencies, multilib issues


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	17 Jul 2008 05:23:10 -0000	1.18
+++ sources	12 Sep 2008 16:55:03 -0000	1.19
@@ -1 +1 @@
-8686ff53789c093284543ed5348b012d  koffice-1.9.95.9.tar.bz2
+06d7b0feedb0801dce098f26fe7f3e7e  koffice-1.9.95.10.tar.bz2



From dwmw2 at fedoraproject.org  Fri Sep 12 16:58:27 2008
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Fri, 12 Sep 2008 16:58:27 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.104,1.105
Message-ID: <20080912165827.EEC5B70131@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8347

Modified Files:
	comps-f10.xml.in 
Log Message:
s/bluez-utils/bluez/


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- comps-f10.xml.in	12 Sep 2008 15:18:55 -0000	1.104
+++ comps-f10.xml.in	12 Sep 2008 16:57:57 -0000	1.105
@@ -180,7 +180,7 @@
       <packagereq type="conditional" requires="hunspell">hunspell-en</packagereq>
       <packagereq type="default">acpid</packagereq>
       <packagereq type="default">anacron</packagereq>
-      <packagereq type="default">bluez-utils</packagereq>
+      <packagereq type="default">bluez</packagereq>
       <packagereq type="default">ccid</packagereq>
       <packagereq type="default">coolkey</packagereq>
       <packagereq type="default">cpuspeed</packagereq>
@@ -3549,7 +3549,7 @@
       <packagereq type="mandatory">cups</packagereq>
       <packagereq type="mandatory">ghostscript</packagereq>
       <packagereq type="default">a2ps</packagereq>
-      <packagereq type="default">bluez-utils-cups</packagereq>
+      <packagereq type="default">bluez-cups</packagereq>
       <packagereq type="default">enscript</packagereq>
       <packagereq type="default">gutenprint</packagereq>
       <packagereq type="default">gutenprint-foomatic</packagereq>
@@ -3780,7 +3780,7 @@
       <packagereq type="mandatory">vorbis-tools</packagereq>
       <packagereq type="conditional" requires="xine-lib">xine-lib-pulseaudio</packagereq>
       <packagereq type="default">alsa-plugins-pulseaudio</packagereq>
-      <packagereq type="default">bluez-utils-alsa</packagereq>
+      <packagereq type="default">bluez-alsa</packagereq>
       <packagereq type="default">cdparanoia</packagereq>
       <packagereq type="default">codeina</packagereq>
       <packagereq type="default">genisoimage</packagereq>



From dwmw2 at fedoraproject.org  Fri Sep 12 17:01:00 2008
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Fri, 12 Sep 2008 17:01:00 +0000 (UTC)
Subject: rpms/bluez/devel bluez.spec,1.2,1.3
Message-ID: <20080912170100.2D26E70131@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8904

Modified Files:
	bluez.spec 
Log Message:
s/bluez-utils/bluez/


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bluez.spec	12 Sep 2008 09:34:05 -0000	1.2
+++ bluez.spec	12 Sep 2008 17:00:29 -0000	1.3
@@ -1,9 +1,9 @@
-Summary: Bluetooth libraries and utilities
+Summary: Bluetooth utilities
 Name: bluez
 Version: 4.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
-Group: System Environment/Libraries
+Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
 Source1: bluetooth.init
 Source2: bluetooth.conf
@@ -20,8 +20,26 @@
 
 ExcludeArch: s390 s390x
 
+Obsoletes: bluez-pan < 4.0, bluez-sdp < 4.0
+Requires: initscripts, bluez-libs = %{version}
+Requires: dbus >= 0.60
+Requires: hwdata >= 0.215
+Requires: dbus-bluez-pin-helper
+Requires(preun): /sbin/chkconfig, /sbin/service
+Requires(post): /sbin/chkconfig, /sbin/service
+
+Obsoletes: bluez-utils < 4.5-2
+Provides: bluez-utils = %{version}-%{release}
+
 %description
-Libraries and utilities for use in Bluetooth applications.
+Utilities for use in Bluetooth applications:
+	- hcitool
+	- hciattach
+	- hciconfig
+	- bluetoothd
+	- l2ping
+	- start scripts (Red Hat)
+	- pcmcia configuration files
 
 The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A.
 
@@ -36,40 +54,33 @@
 Requires: pkgconfig
 Obsoletes: bluez-sdp-devel < 4.0
 
-%package utils-cups
+%package cups
 Summary: CUPS printer backend for Bluetooth printers
 Group: System Environment/Daemons
+Obsoletes: bluez-utils-cups
+Provides: bluez-utils-cups = %{version}-%{release}
 Requires: bluez-libs = %{version}
 Requires: cups
 
-%package utils-gstreamer
+%package gstreamer
 Summary: GStreamer support for SBC audio format
 Group: System Environment/Daemons
+Obsoletes: bluez-utils-gstreamer
+Provides: bluez-utils-gstreamer = %{version}-%{release}
 Requires: bluez-libs = %{version}
 
-%package utils-alsa
+%package alsa
 Summary: ALSA support for Bluetooth audio devices
 Group: System Environment/Daemons
 Requires: bluez-libs = %{version}
 
-%package utils
-Summary: Bluetooth utilities
-Group: Applications/System
-Obsoletes: bluez-pan < 4.0, bluez-sdp < 4.0
-Requires: initscripts, bluez-libs = %{version}
-Requires: dbus >= 0.60
-Requires: hwdata >= 0.215
-Requires: dbus-bluez-pin-helper
-Requires(preun): /sbin/chkconfig, /sbin/service
-Requires(post): /sbin/chkconfig, /sbin/service
-
-%description utils-cups
+%description cups
 This package contains the CUPS backend 
 
-%description utils-gstreamer
+%description gstreamer
 This package contains gstreamer plugins for the Bluetooth SBC audio format
 
-%description utils-alsa
+%description alsa
 This package contains ALSA support for Bluetooth audio devices
 
 %description libs
@@ -79,16 +90,6 @@
 bluez-libs-devel contains development libraries and headers for
 use in Bluetooth applications.
 
-%description utils
-Bluetooth utilities (bluez-utils):
-	- hcitool
-	- hciattach
-	- hciconfig
-	- hcid
-	- l2ping
-	- start scripts (Red Hat)
-	- pcmcia configuration files
-
 %prep
 
 %setup -q
@@ -107,7 +108,6 @@
 	$RPM_BUILD_ROOT/%{_libdir}/alsa-lib/*.la		\
 	$RPM_BUILD_ROOT/%{_libdir}/bluetooth/plugins/*.la	\
 	$RPM_BUILD_ROOT/%{_libdir}/gstreamer-0.10/*.la
-rm -f $RPM_BUILD_ROOT/usr/share/aclocal/bluez.m4
 
 install -D -m0755 %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/bluetooth
 install -D -m0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/bluetooth
@@ -124,11 +124,7 @@
 
 %post libs -p /sbin/ldconfig
 
-%post utils
-/sbin/chkconfig --del hidd >/dev/null 2>&1 || :
-/sbin/chkconfig --del dund >/dev/null 2>&1 || :
-/sbin/chkconfig --del pand >/dev/null 2>&1 || :
-
+%post
 /sbin/chkconfig --add bluetooth
 if [ "$1" -ge "1" ]; then
 	/sbin/service bluetooth condrestart >/dev/null 2>&1 || :
@@ -137,17 +133,13 @@
 
 %postun libs -p /sbin/ldconfig
 
-%preun utils
+%preun
 if [ "$1" = "0" ]; then
 	/sbin/service bluetooth stop >/dev/null 2>&1 || :
-	/sbin/service dund stop >/dev/null 2>&1 || :
-	/sbin/service pand stop >/dev/null 2>&1 || :
 	/sbin/chkconfig --del bluetooth
-	/sbin/chkconfig --del dund 2>&1 || :
-	/sbin/chkconfig --del pand 2>&1 || :
 fi
 
-%files utils
+%files
 %defattr(-, root, root)
 %{_bindir}/*
 %{_sbindir}/*
@@ -174,19 +166,23 @@
 %{_includedir}/bluetooth/*
 %{_libdir}/pkgconfig/bluez.pc
 
-%files utils-cups
+%files cups
 %defattr(-, root, root)
 /usr/lib/cups/backend/bluetooth
 
-%files utils-gstreamer
+%files gstreamer
 %defattr(-, root, root)
 %{_libdir}/gstreamer-*/*.so
 
-%files utils-alsa
+%files alsa
 %defattr(-, root, root)
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Fri Sep 12 2008 - David Woodhouse <David.Woodhouse at intel.com> - 4.5-2
+- Change main utils package name to 'bluez'; likewise its subpackages
+- Remove references to obsolete initscripts (hidd,pand,dund)
+
 * Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 4.5-1
 - Update to 4.5
 - Fix initscript to actually start bluetoothd by hand



From spot at fedoraproject.org  Fri Sep 12 17:00:51 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 17:00:51 +0000 (UTC)
Subject: rpms/rpmlint/devel rpmlint.config,1.22,1.23 rpmlint.spec,1.48,1.49
Message-ID: <20080912170052.041F370131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rpmlint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8869

Modified Files:
	rpmlint.config rpmlint.spec 
Log Message:
update licenses


Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- rpmlint.config	26 Jul 2008 17:09:14 -0000	1.22
+++ rpmlint.config	12 Sep 2008 17:00:21 -0000	1.23
@@ -28,7 +28,7 @@
 setOption("ValidLicenses", (
     # These are the short names for all of the Fedora approved licenses.
     # The master list is kept here: http://fedoraproject.org/wiki/Licensing
-    # Last synced with revision "16:08, 18 July 2008" of that page.
+    # Last synced with revision "1.09, 12 Sep 2008" of that page.
     'Adobe',
     'ADSL',
     'AFL',
@@ -51,7 +51,10 @@
     'BSD',
     'BSD with advertising',
     'CeCILL',
+    'CeCILL-B',
+    'CeCILL-C',
     'CDDL',
+    'CNRI',
     'CPAL',
     'CPL',
     'Condor',
@@ -75,6 +78,7 @@
     'GPL+',
     'GPL+ or Artistic',
     'GPLv1',
+    'GPLv2 or Artistic',
     'GPLv2+ or Artistic',
     'GPLv2',
     'GPLv2 with exceptions',
@@ -98,6 +102,7 @@
     'LGPLv2',
     'LGPLv2 with exceptions',
     'LGPLv2+',
+    'LGPLv2+ or Artistic',
     'LGPLv2+ with exceptions',
     'LGPLv3',
     'LGPLv3 with exceptions',
@@ -136,8 +141,10 @@
     'OSL 3.0',
     'OSL 3.0+',
     'OpenSSL',
+    'OReilly',
     'Phorum',
     'PHP',
+    'psutils',
     'Public Domain',
     'Python',
     'Qhull',
@@ -152,6 +159,8 @@
     'SLIB',
     'SPL',
     'TCL',
+    'Teeworlds',
+    'TMate',
     'UCD',
     'VOSTROM',
     'Vim',
@@ -187,10 +196,12 @@
     'DSL',
     'EFML',
     'Free Art',
+    'GeoGratis',
     # Font licenses
     'Arphic',
     'Baekmuk',
     'Bitstream Vera',
+    'Hershey',
     'Liberation',
     'Lucida',
     'mplus',


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- rpmlint.spec	26 Jul 2008 19:04:08 -0000	1.48
+++ rpmlint.spec	12 Sep 2008 17:00:21 -0000	1.49
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.84
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.84-3
+- Sync Fedora license list with Wiki revision 1.09
+
 * Sat Jul 26 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.84-2
 - 0.84, fixes #355861, #456304.
 - Sync Fedora license list with Wiki revision "16:08, 18 July 2008".



From spot at fedoraproject.org  Fri Sep 12 17:12:32 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 17:12:32 +0000 (UTC)
Subject: rpms/pyke/devel .cvsignore, 1.2, 1.3 pyke.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20080912171232.66E7970131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pyke/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11533

Modified Files:
	.cvsignore pyke.spec sources 
Log Message:
update to 0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Apr 2008 19:01:38 -0000	1.2
+++ .cvsignore	12 Sep 2008 17:12:01 -0000	1.3
@@ -1 +1 @@
-pyke-0.2.tar.gz
+pyke-0.4.tar.gz


Index: pyke.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/devel/pyke.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyke.spec	25 Apr 2008 19:01:38 -0000	1.1
+++ pyke.spec	12 Sep 2008 17:12:02 -0000	1.2
@@ -2,8 +2,8 @@
 
 Name:			pyke
 Summary: 		Knowledge-based inference engine
-Version:		0.2
-Release:		2%{?dist}
+Version:		0.4
+Release:		1%{?dist}
 License:		MIT
 Group:			System Environment/Libraries
 URL:			http://pyke.sourceforge.net/
@@ -42,6 +42,9 @@
 %{python_sitelib}/%{name}-%{version}*.egg-info/
 
 %changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.4-1
+- update to 0.4
+
 * Wed Apr 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.2-2
 - add BR: python-setuptools
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Apr 2008 19:01:38 -0000	1.2
+++ sources	12 Sep 2008 17:12:02 -0000	1.3
@@ -1 +1 @@
-03237cda523f42882fe9fd517da6a2b1  pyke-0.2.tar.gz
+b3c8ec082f3ec89d50cf16f7384f3380  pyke-0.4.tar.gz



From than at fedoraproject.org  Fri Sep 12 17:14:09 2008
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 12 Sep 2008 17:14:09 +0000 (UTC)
Subject: rpms/kde-plasma-lancelot/devel lancelot-1.0.2-cmake.patch, NONE,
	1.1 kde-plasma-lancelot.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080912171409.F229170131@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-plasma-lancelot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11892

Modified Files:
	kde-plasma-lancelot.spec sources 
Added Files:
	lancelot-1.0.2-cmake.patch 
Log Message:
1.0.2


lancelot-1.0.2-cmake.patch:

--- NEW FILE lancelot-1.0.2-cmake.patch ---
diff -up lancelot/CMakeLists.txt.orig lancelot/CMakeLists.txt
--- lancelot/CMakeLists.txt.orig	2008-09-12 15:36:53.000000000 +0200
+++ lancelot/CMakeLists.txt	2008-09-12 15:44:46.000000000 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+find_package(KDE4 REQUIRED)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 


Index: kde-plasma-lancelot.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-plasma-lancelot/devel/kde-plasma-lancelot.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-plasma-lancelot.spec	10 Sep 2008 09:44:33 -0000	1.1
+++ kde-plasma-lancelot.spec	12 Sep 2008 17:13:39 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           kde-plasma-lancelot
-Version:        1.0
-Release:        1%{?dist}
+Version:        1.0.2
+Release:        3%{?dist}
 Summary:        An alternative application launcher
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://www.kde-apps.org/content/show.php/Lancelot?content=87914
-Source0:        http://downloads.sourceforge.net/lancelot-menu/lancelot-1.0.tar.bz2
+Source0:        http://downloads.sourceforge.net/lancelot-menu/lancelot-%{version}.tar.bz2
+Patch0:         lancelot-1.0.2-cmake.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kde-filesystem >= 4
@@ -23,6 +24,8 @@
 %prep
 %setup -qn lancelot
 
+%patch0 -p1 -b .cmake
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -50,7 +53,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc TODO COPYING
+%doc COPYING
 %{_bindir}/lancelot
 %{_kde4_libdir}/kde4/plasma_applet_lancelot_launcher.so
 %{_kde4_libdir}/kde4/plasma_applet_lancelot_part.so
@@ -66,6 +69,15 @@
 
 
 %changelog
+* Fri Sep 12 2008 Than Ngo <than at redhat.com> 1.0.2-3
+- bump release
+
+* Thu Sep 11 2008 Than Ngo <than at redhat.com> 1.0.2-2
+- use %%version
+
+* Thu Sep 11 2008 Than Ngo <than at redhat.com> 1.0.2-1
+- 1.0.2
+
 * Wed Sep 03 2008 Than Ngo <than at redhat.com> 1.0-1
 - 1.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-plasma-lancelot/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2008 09:43:44 -0000	1.2
+++ sources	12 Sep 2008 17:13:39 -0000	1.3
@@ -1 +1 @@
-20ad6b20817ac0f0e6903930c27e7d85  lancelot-1.0.tar.bz2
+85a596521cdcf3c4214626f151506bd1  lancelot-1.0.2.tar.bz2



From hadess at fedoraproject.org  Fri Sep 12 17:19:55 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 12 Sep 2008 17:19:55 +0000 (UTC)
Subject: rpms/obex-data-server/devel obex-data-server-0.3.4-bluez4.patch, 1.2,
	1.3 obex-data-server.spec, 1.10, 1.11
Message-ID: <20080912171955.4E4DC70131@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/obex-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12973

Modified Files:
	obex-data-server-0.3.4-bluez4.patch obex-data-server.spec 
Log Message:
* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-5
- Another BlueZ 4.x patch update


obex-data-server-0.3.4-bluez4.patch:

Index: obex-data-server-0.3.4-bluez4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/obex-data-server/devel/obex-data-server-0.3.4-bluez4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- obex-data-server-0.3.4-bluez4.patch	12 Sep 2008 16:53:24 -0000	1.2
+++ obex-data-server-0.3.4-bluez4.patch	12 Sep 2008 17:19:54 -0000	1.3
@@ -1,35 +1,25 @@
-Index: src/ods-bluez.c
-===================================================================
---- src/ods-bluez.c	(revision 1878)
-+++ src/ods-bluez.c	(working copy)
-@@ -109,18 +109,18 @@
- ods_bluez_init (OdsBluez *bluez)
- {
- 	GError		*error = NULL;
--	gchar		*adapter_object = NULL;
-+	char		*adapter_object = NULL;
- 
- 	OdsBluezClass *klass = ODS_BLUEZ_GET_CLASS (bluez);
- 	bluez->priv = ODS_BLUEZ_GET_PRIVATE (bluez);
- 
+--- obex-data-server-0.3.4.old/src/ods-bluez.c	2008-06-27 16:21:14.000000000 +0100
++++ obex-data-server-0.3.4/src/ods-bluez.c	2008-09-12 18:17:27.000000000 +0100
+@@ -121,11 +121,11 @@ ods_bluez_init (OdsBluez *bluez)
+ 	
  	bluez->priv->manager_proxy = dbus_g_proxy_new_for_name (klass->connection,
- 															"org.bluez",
--															"/org/bluez",
-+															"/",
+ 															"org.bluez", 
+-															"/org/bluez", 
++															"/", 
  															"org.bluez.Manager");
- 	if (!dbus_g_proxy_call (bluez->priv->manager_proxy, "DefaultAdapter", &error,
+ 	if (!dbus_g_proxy_call (bluez->priv->manager_proxy, "DefaultAdapter", &error, 
  								G_TYPE_INVALID,
--								G_TYPE_STRING, &adapter_object,
+-								G_TYPE_STRING, &adapter_object, 
 +								DBUS_TYPE_G_OBJECT_PATH, &adapter_object,
  								G_TYPE_INVALID)) {
  		g_warning("Unable to connect to dbus: %s", error->message);
  		g_clear_error (&error);
-@@ -349,7 +349,7 @@
+@@ -314,7 +314,7 @@ get_remote_service_record_cb (DBusGProxy
  		goto err;
  	}
- 
+ 	
 -	sdp_record = sdp_extract_pdu ((uint8_t *)record_array->data, &scanned);
 +	sdp_record = sdp_extract_pdu ((uint8_t *)record_array->data, record_array->len, &scanned);
- 
+ 	
  	/* get channel for this service */
  	if (sdp_get_access_protos (sdp_record, &protos) != 0) {


Index: obex-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obex-data-server/devel/obex-data-server.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- obex-data-server.spec	12 Sep 2008 16:53:25 -0000	1.10
+++ obex-data-server.spec	12 Sep 2008 17:19:55 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		obex-data-server
 Version:	0.3.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Epoch:		1
 Summary:	D-Bus service for Obex access
 
@@ -25,7 +25,7 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .bluez4
+%patch0 -p1 -b .bluez4
 
 %build
 %configure
@@ -63,6 +63,9 @@
 %{_mandir}/man1/obex-data-server.1.gz
 
 %changelog
+* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-5
+- Another BlueZ 4.x patch update
+
 * Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-4
 - Update bluez 4.x patch for the latest D-Bus API
 



From limb at fedoraproject.org  Fri Sep 12 17:24:26 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 12 Sep 2008 17:24:26 +0000 (UTC)
Subject: rpms/archivemail/devel archivemail.spec,1.5,1.6
Message-ID: <20080912172426.2415270131@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/archivemail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13698

Modified Files:
	archivemail.spec 
Log Message:
FUzz workaround.



Index: archivemail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/archivemail/devel/archivemail.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- archivemail.spec	9 Nov 2007 21:00:30 -0000	1.5
+++ archivemail.spec	12 Sep 2008 17:23:55 -0000	1.6
@@ -1,6 +1,7 @@
+%define _default_patch_fuzz 2
 Name:		archivemail
 Version:	0.7.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A tool for archiving and compressing old email in mailboxes
 
 Group:		Applications/Internet
@@ -61,6 +62,9 @@
 %{_mandir}/man1/archivemail.1.gz
 
 %changelog
+* Fri Sep 12 2008 Jon Ciesla <limb at jcomserv.net> 0.7.2-2
+- Introduced patch fuzz workaround, will fix.
+
 * Fri Nov 9 2007 Jon Ciesla <limb at jcomserv.net> 0.7.2-1
 - Update to 0.7.2.
 



From spot at fedoraproject.org  Fri Sep 12 17:25:09 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 17:25:09 +0000 (UTC)
Subject: rpms/udunits/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 udunits-1.12.4-linuxfixes.patch, 1.1, 1.2 udunits.spec, 1.16, 1.17
Message-ID: <20080912172509.28AB670131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/udunits/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13895

Modified Files:
	.cvsignore sources udunits-1.12.4-linuxfixes.patch 
	udunits.spec 
Log Message:
update to 1.12.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/udunits/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Apr 2005 21:59:57 -0000	1.2
+++ .cvsignore	12 Sep 2008 17:24:38 -0000	1.3
@@ -1 +1 @@
-udunits-1.12.4.tar.bz2
+udunits-1.12.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/udunits/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Apr 2005 21:59:57 -0000	1.2
+++ sources	12 Sep 2008 17:24:38 -0000	1.3
@@ -1 +1 @@
-ecafe00024ef19327b1c55af5c021b96  udunits-1.12.4.tar.bz2
+2bf4ba7a92e4c45b9e6003a295ca4e65  udunits-1.12.9.tar.gz

udunits-1.12.4-linuxfixes.patch:

Index: udunits-1.12.4-linuxfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udunits/devel/udunits-1.12.4-linuxfixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udunits-1.12.4-linuxfixes.patch	14 Apr 2005 21:59:57 -0000	1.1
+++ udunits-1.12.4-linuxfixes.patch	12 Sep 2008 17:24:38 -0000	1.2
@@ -1,35 +1,21 @@
---- udunits-1.12.4/src/port/cfortran/cfortran.h.BAD	2005-03-25 22:15:13.000000000 -0600
-+++ udunits-1.12.4/src/port/cfortran/cfortran.h	2005-03-25 22:17:24.000000000 -0600
-@@ -83,7 +83,7 @@
- #if !(defined(NAGf90Fortran)||defined(f2cFortran)||defined(hpuxFortran)||defined(apolloFortran)||defined(sunFortran)||defined(IBMR2Fortran)||defined(CRAYFortran)||defined(pgiFortran))
- #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran))
- /* If no Fortran compiler is given, we choose one for the machines we know.   */
--#if defined(lynx) || defined(VAXUltrix)
-+#if defined(lynx) || defined(VAXUltrix) || defined(__linux__)
- #define f2cFortran    /* Lynx:      Only support f2c at the moment.
-                          VAXUltrix: f77 behaves like f2c.
-                            Support f2c or f77 with gcc, vcc with f2c. 
---- udunits-1.12.4/src/udunits/udunits.c.BAD	2005-03-25 22:24:50.000000000 -0600
-+++ udunits-1.12.4/src/udunits/udunits.c	2005-03-25 22:33:08.000000000 -0600
-@@ -4,12 +4,15 @@
-  * Test program for the Unidata udunits(3) library.
-  */
- 
-+#define _POSIX_SOURCE 1
-+
- #include <limits.h>	/* for _POSIX_MAX_INPUT */
- #include <stddef.h>	/* for size_t */
- #include <stdio.h>	/* for I/O functions, and NULL */
- #include <string.h>	/* for strlen() & memmove() */
- #include <errno.h>	/* for errno */
- #include <ctype.h>	/* for isspace() */
-+#include <stdlib.h>	/* for exit */
- #include "udunits.h"
+diff -up udunits-1.12.9/src/lib/Makefile.in.linuxfixes udunits-1.12.9/src/lib/Makefile.in
+--- udunits-1.12.9/src/lib/Makefile.in.linuxfixes	2008-07-22 13:05:50.000000000 -0400
++++ udunits-1.12.9/src/lib/Makefile.in	2008-09-12 13:15:25.000000000 -0400
+@@ -6,8 +6,8 @@
  
- #ifdef YYDEBUG
---- udunits-1.12.4/src/Makefile.in.BAD	2005-03-25 23:03:01.000000000 -0600
-+++ udunits-1.12.4/src/Makefile.in	2005-03-25 23:03:14.000000000 -0600
-@@ -68,7 +68,7 @@
+ LIBRARY		= udunits
+ 
+-FLEX		= /usr/local/gnu/bin/flex
+-cpp_path	= -DUT_DEFAULT_PATH='"$(prefix)/etc/udunits.dat"'
++FLEX		= /usr/bin/flex
++cpp_path	= -DUT_DEFAULT_PATH='"/etc/udunits.dat"'
+ CPPFLAGS	= -I../port/misc -I../port/cfortran $(cpp_path) @CPPFLAGS@
+ CFLAGS		= @CFLAGS@
+ 
+diff -up udunits-1.12.9/src/Makefile.in.linuxfixes udunits-1.12.9/src/Makefile.in
+--- udunits-1.12.9/src/Makefile.in.linuxfixes	2003-08-29 14:27:07.000000000 -0400
++++ udunits-1.12.9/src/Makefile.in	2008-09-12 13:15:25.000000000 -0400
+@@ -68,7 +68,7 @@ $(MANUALS) dummy:
  @PERL_DISTCLEAN@ dummy:	perl/Makefile
  
  perl/Makefile:		perl/Makefile.PL
@@ -38,20 +24,22 @@
  
  install:	whatis
  
---- udunits-1.12.4/src/lib/Makefile.in.BAD	2005-03-25 23:28:38.000000000 -0600
-+++ udunits-1.12.4/src/lib/Makefile.in	2005-03-25 23:28:56.000000000 -0600
-@@ -7,7 +7,7 @@
- LIBRARY		= udunits
- 
- FLEX		= /usr/local/gnu/bin/flex
--cpp_path	= -DUT_DEFAULT_PATH='"$(prefix)/etc/udunits.dat"'
-+cpp_path	= -DUT_DEFAULT_PATH='"/etc/udunits.dat"'
- CPPFLAGS	= -I../port/misc -I../port/cfortran $(cpp_path) @CPPFLAGS@
- CFLAGS		= @CFLAGS@
- 
---- udunits-1.12.4/src/port/master.mk.in.BAD	2005-03-25 23:37:16.000000000 -0600
-+++ udunits-1.12.4/src/port/master.mk.in	2005-03-25 23:37:25.000000000 -0600
-@@ -351,7 +351,7 @@
+diff -up udunits-1.12.9/src/port/cfortran/cfortran.h.linuxfixes udunits-1.12.9/src/port/cfortran/cfortran.h
+--- udunits-1.12.9/src/port/cfortran/cfortran.h.linuxfixes	2008-07-22 12:47:24.000000000 -0400
++++ udunits-1.12.9/src/port/cfortran/cfortran.h	2008-09-12 13:16:41.000000000 -0400
+@@ -84,7 +84,7 @@ only C calling FORTRAN subroutines will 
+ #if !(defined(NAGf90Fortran)||defined(f2cFortran)||defined(hpuxFortran)||defined(apolloFortran)||defined(sunFortran)||defined(IBMR2Fortran)||defined(CRAYFortran))
+ #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran))
+ /* If no Fortran compiler is given, we choose one for the machines we know.   */
+-#if defined(lynx) || defined(VAXUltrix)
++#if defined(lynx) || defined(VAXUltrix) || defined(__linux__)
+ #define f2cFortran    /* Lynx:      Only support f2c at the moment.
+                          VAXUltrix: f77 behaves like f2c.
+                            Support f2c or f77 with gcc, vcc with f2c. 
+diff -up udunits-1.12.9/src/port/master.mk.in.linuxfixes udunits-1.12.9/src/port/master.mk.in
+--- udunits-1.12.9/src/port/master.mk.in.linuxfixes	2008-07-22 13:06:02.000000000 -0400
++++ udunits-1.12.9/src/port/master.mk.in	2008-09-12 13:15:25.000000000 -0400
+@@ -351,7 +351,7 @@ dummy_incdir $(INCDIR):
  ############################################################################
  # `etc/' files:
  ############################################################################
@@ -60,20 +48,7 @@
  ETCFILE	= dummy-etcfile		# to silence GNU make(1)
  
  installed_etcfiles:
---- udunits-1.12.4/src/lib/Makefile.in.BAD	2005-04-11 11:45:36.000000000 -0500
-+++ udunits-1.12.4/src/lib/Makefile.in	2005-04-11 11:46:17.000000000 -0500
-@@ -6,7 +6,7 @@
- 
- LIBRARY		= udunits
- 
--FLEX		= /usr/local/gnu/bin/flex
-+FLEX		= /usr/bin/flex
- cpp_path	= -DUT_DEFAULT_PATH='"/etc/udunits.dat"'
- CPPFLAGS	= -I../port/misc -I../port/cfortran $(cpp_path) @CPPFLAGS@
- CFLAGS		= @CFLAGS@
---- udunits-1.12.4/src/port/master.mk.in.BAD	2005-04-11 11:44:37.000000000 -0500
-+++ udunits-1.12.4/src/port/master.mk.in	2005-04-11 11:44:55.000000000 -0500
-@@ -382,7 +382,7 @@
+@@ -382,7 +382,7 @@ dummy_etcdir $(ETCDIR):
  ############################################################################
  # Manual Pages:
  ############################################################################
@@ -82,3 +57,14 @@
  MANUAL		= dummy-manual	# to slience GNU make
  WHATIS		= @WHATIS@
  # The following macro should be empty on systems that don't
+diff -up udunits-1.12.9/src/udunits/udunits.c.linuxfixes udunits-1.12.9/src/udunits/udunits.c
+--- udunits-1.12.9/src/udunits/udunits.c.linuxfixes	2008-07-22 12:47:25.000000000 -0400
++++ udunits-1.12.9/src/udunits/udunits.c	2008-09-12 13:17:18.000000000 -0400
+@@ -13,6 +13,7 @@
+ #include <string.h>	/* for strlen() & memmove() */
+ #include <errno.h>	/* for errno */
+ #include <ctype.h>	/* for isspace() */
++#include <stdlib.h>	/* for exit */
+ #include "udunits.h"
+ 
+ #ifdef YYDEBUG


Index: udunits.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udunits/devel/udunits.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- udunits.spec	11 Mar 2008 02:27:40 -0000	1.16
+++ udunits.spec	12 Sep 2008 17:24:38 -0000	1.17
@@ -1,13 +1,11 @@
 Name: udunits
-Version: 1.12.4
-Release: 15%{?dist}
+Version: 1.12.9
+Release: 1%{?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
-# Upstream actually packages it as a .tar.Z, I repackaged to prevent ncompress 
-# as a dependency.
-Source0: udunits-1.12.4.tar.bz2
+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
 Patch1: udunits-1.12.4-64bit.patch
@@ -54,7 +52,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .linuxfixes
 # Yes, this is a dirty hack.
 %ifarch x86_64 ppc64 sparc64
 %patch1 -p1
@@ -127,6 +125,9 @@
 %{_mandir}/man1/udunitsperl.1.gz
 
 %changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.12.9-1
+- update to 1.12.9
+
 * Mon Mar 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.12.4-15
 - ia64 doesn't need lib64 hack
 



From than at fedoraproject.org  Fri Sep 12 17:26:13 2008
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 12 Sep 2008 17:26:13 +0000 (UTC)
Subject: rpms/kde-plasma-lancelot/F-9 lancelot-1.0.2-cmake.patch, NONE,
	1.1 kde-plasma-lancelot.spec, 1.5, 1.6
Message-ID: <20080912172613.AB87D70131@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-plasma-lancelot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14164

Modified Files:
	kde-plasma-lancelot.spec 
Added Files:
	lancelot-1.0.2-cmake.patch 
Log Message:
1.0.2


lancelot-1.0.2-cmake.patch:

--- NEW FILE lancelot-1.0.2-cmake.patch ---
diff -up lancelot/CMakeLists.txt.orig lancelot/CMakeLists.txt
--- lancelot/CMakeLists.txt.orig	2008-09-12 15:36:53.000000000 +0200
+++ lancelot/CMakeLists.txt	2008-09-12 15:44:46.000000000 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+find_package(KDE4 REQUIRED)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 


Index: kde-plasma-lancelot.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-plasma-lancelot/F-9/kde-plasma-lancelot.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kde-plasma-lancelot.spec	12 Sep 2008 09:53:52 -0000	1.5
+++ kde-plasma-lancelot.spec	12 Sep 2008 17:25:43 -0000	1.6
@@ -1,12 +1,13 @@
 Name:           kde-plasma-lancelot
 Version:        1.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An alternative application launcher
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://www.kde-apps.org/content/show.php/Lancelot?content=87914
 Source0:        http://downloads.sourceforge.net/lancelot-menu/lancelot-%{version}.tar.bz2
+Patch0:         lancelot-1.0.2-cmake.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kde-filesystem >= 4
@@ -23,6 +24,8 @@
 %prep
 %setup -qn lancelot
 
+%patch0 -p1 -b .cmake
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -66,6 +69,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Than Ngo <than at redhat.com> 1.0.2-3
+- bump release
+
 * Thu Sep 11 2008 Than Ngo <than at redhat.com> 1.0.2-2
 - use %%version
 



From limb at fedoraproject.org  Fri Sep 12 17:28:52 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 12 Sep 2008 17:28:52 +0000 (UTC)
Subject: rpms/nagi/devel nagi.spec,1.4,1.5
Message-ID: <20080912172852.CA53670131@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/nagi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14940

Modified Files:
	nagi.spec 
Log Message:
Fuzz workaround.



Index: nagi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagi/devel/nagi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nagi.spec	14 Feb 2008 17:45:09 -0000	1.4
+++ nagi.spec	12 Sep 2008 17:28:22 -0000	1.5
@@ -1,7 +1,8 @@
+%define _default_patch_fuzz 2
 Summary: An interpreter for AGI games
 Name: nagi
 Version: 2.06
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: Amusements/Games
 License: MIT
 URL: http://www.agidev.com/projects/nagi/
@@ -57,6 +58,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Fri Sep 12 2008 Jon Ciesla <limb at jcomserv.net> 2.06-6
+- Patch fuzz workaround, will fix.
+
 * Fri Feb 08 2008 Jon Ciesla <limb at jcomserv.net> 2.06-5
 - GCC 4.3 rebuild.
 - BR SDL-static.



From spot at fedoraproject.org  Fri Sep 12 17:29:28 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 17:29:28 +0000 (UTC)
Subject: rpms/udunits/devel udunits.spec,1.17,1.18
Message-ID: <20080912172928.2AFC970131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/udunits/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15087

Modified Files:
	udunits.spec 
Log Message:
missing BR: byacc


Index: udunits.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udunits/devel/udunits.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- udunits.spec	12 Sep 2008 17:24:38 -0000	1.17
+++ udunits.spec	12 Sep 2008 17:28:57 -0000	1.18
@@ -1,6 +1,6 @@
 Name: udunits
 Version: 1.12.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A library for manipulating units of physical quantities
 License: MIT
 Group: System Environment/Libraries
@@ -10,7 +10,7 @@
 Patch0: udunits-1.12.4-linuxfixes.patch
 Patch1: udunits-1.12.4-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gcc-gfortran, gcc-c++, groff
+BuildRequires: gcc-gfortran, gcc-c++, groff, byacc
 BuildRequires: perl(ExtUtils::MakeMaker)
 
 %description
@@ -125,6 +125,9 @@
 %{_mandir}/man1/udunitsperl.1.gz
 
 %changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.12.9-2
+- missing BR: byacc
+
 * Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.12.9-1
 - update to 1.12.9
 



From limb at fedoraproject.org  Fri Sep 12 17:42:04 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 12 Sep 2008 17:42:04 +0000 (UTC)
Subject: rpms/rafkill/devel rafkill.spec,1.10,1.11
Message-ID: <20080912174204.54A0870134@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/rafkill/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17765

Modified Files:
	rafkill.spec 
Log Message:
License, fuzz.



Index: rafkill.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rafkill/devel/rafkill.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rafkill.spec	9 Jul 2008 13:41:10 -0000	1.10
+++ rafkill.spec	12 Sep 2008 17:41:33 -0000	1.11
@@ -1,9 +1,10 @@
+%define _default_patch_fuzz 2
 Name:           rafkill
 Version:        1.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Top-down shooter with powerups
 Group:          Amusements/Games
-License:        GPL+
+License:        GPLv2
 URL:            http://raptorv2.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/raptorv2/%{name}-%{version}.tar.gz
 Source1:        rafkill.desktop
@@ -89,6 +90,10 @@
 
 
 %changelog
+* Fri Sep 12 2008 Jon Ciesla <limb at jcomserv.net> - 1.2.3-2
+- Added patch fuxx workaround, will fix.
+- Fixed license tag.
+
 * Wed Jul 09 2008 Jon Ciesla <limb at jcomserv.net> - 1.2.3-1
 - Update to 1.2.3.
 - Dropped -spell patch, applied upstream.



From jjames at fedoraproject.org  Fri Sep 12 17:44:08 2008
From: jjames at fedoraproject.org (Jerry James)
Date: Fri, 12 Sep 2008 17:44:08 +0000 (UTC)
Subject: rpms/automaton/devel .cvsignore, 1.2, 1.3 automaton.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080912174408.BF65F70131@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/automaton/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18331/devel

Modified Files:
	.cvsignore automaton.spec sources 
Log Message:
* Fri Sep 12 2008 Jerry James <loganjerry at gmail.com> - 1.10r5-1
- Upgrade to 1.10-5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jul 2008 15:45:49 -0000	1.2
+++ .cvsignore	12 Sep 2008 17:43:38 -0000	1.3
@@ -1 +1 @@
-automaton-1.10-4.tar.gz
+automaton-1.10-5.tar.gz


Index: automaton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/devel/automaton.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- automaton.spec	7 Jul 2008 15:45:49 -0000	1.1
+++ automaton.spec	12 Sep 2008 17:43:38 -0000	1.2
@@ -1,13 +1,13 @@
 # Upstream uses version-release.  Control the madness here.
 %define upver 1.10
-%define uprel 4
+%define uprel 5
 %define 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
@@ -97,6 +97,9 @@
 %{_javadocdir}/automaton*
 
 %changelog
+* Fri Sep 12 2008 Jerry James <loganjerry at gmail.com> - 1.10r5-1
+- Upgrade to 1.10-5
+
 * Mon Jun 30 2008 Jerry James <loganjerry at gmail.com> - 1.10r4-2
 - Conditionalize gcj invocations
 - Remove the prebuilt jar before building


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jul 2008 15:45:49 -0000	1.2
+++ sources	12 Sep 2008 17:43:38 -0000	1.3
@@ -1 +1 @@
-2caabfdb853dcf79396a6d03d4d835cd  automaton-1.10-4.tar.gz
+63f6778eb5cb77f1c7d64e8710ca8a40  automaton-1.10-5.tar.gz



From jjames at fedoraproject.org  Fri Sep 12 17:44:08 2008
From: jjames at fedoraproject.org (Jerry James)
Date: Fri, 12 Sep 2008 17:44:08 +0000 (UTC)
Subject: rpms/automaton/F-9 .cvsignore, 1.1, 1.2 automaton.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080912174408.9CF0170131@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/automaton/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18331/F-9

Modified Files:
	.cvsignore automaton.spec sources 
Log Message:
* Fri Sep 12 2008 Jerry James <loganjerry at gmail.com> - 1.10r5-1
- Upgrade to 1.10-5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jul 2008 19:38:28 -0000	1.1
+++ .cvsignore	12 Sep 2008 17:43:38 -0000	1.2
@@ -0,0 +1 @@
+automaton-1.10-5.tar.gz


Index: automaton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/F-9/automaton.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- automaton.spec	7 Jul 2008 15:49:17 -0000	1.1
+++ automaton.spec	12 Sep 2008 17:43:38 -0000	1.2
@@ -1,13 +1,13 @@
 # Upstream uses version-release.  Control the madness here.
 %define upver 1.10
-%define uprel 4
+%define uprel 5
 %define 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
@@ -97,6 +97,9 @@
 %{_javadocdir}/automaton*
 
 %changelog
+* Fri Sep 12 2008 Jerry James <loganjerry at gmail.com> - 1.10r5-1
+- Upgrade to 1.10-5
+
 * Mon Jun 30 2008 Jerry James <loganjerry at gmail.com> - 1.10r4-2
 - Conditionalize gcj invocations
 - Remove the prebuilt jar before building


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jul 2008 15:49:17 -0000	1.2
+++ sources	12 Sep 2008 17:43:38 -0000	1.3
@@ -1 +1 @@
-2caabfdb853dcf79396a6d03d4d835cd  automaton-1.10-4.tar.gz
+63f6778eb5cb77f1c7d64e8710ca8a40  automaton-1.10-5.tar.gz



From limb at fedoraproject.org  Fri Sep 12 17:45:34 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 12 Sep 2008 17:45:34 +0000 (UTC)
Subject: rpms/xmoto/devel xmoto.spec,1.40,1.41
Message-ID: <20080912174534.8F85470131@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18629

Modified Files:
	xmoto.spec 
Log Message:
Fuzz.



Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xmoto.spec	19 Mar 2008 00:00:01 -0000	1.40
+++ xmoto.spec	12 Sep 2008 17:45:04 -0000	1.41
@@ -1,6 +1,7 @@
+%define _default_patch_fuzz 2
 Name:		xmoto
 Version:	0.4.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Challenging 2D Motocross Platform Game
 
 Group:		Amusements/Games
@@ -96,8 +97,10 @@
 %{_datadir}/icons/hicolor/48x48/apps/xmoto.png
 %{_mandir}/man6/xmoto.6.gz
 
-
 %changelog
+* Fri Sep 12 2008 Jon Ciesla <limb at jcomserv.net> 0.4.2-2
+- Introducted patch fuzz workaround, will fix.
+
 * Tue Mar 18 2008 Jon Ciesla <limb at jcomserv.net> 0.4.2-1
 - Update to 0.4.2.
 - Dropping xmoto-man patch.



From pkgdb at fedoraproject.org  Fri Sep 12 17:55:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 17:55:47 +0000
Subject: [pkgdb] sugar-journal ownership updated
Message-ID: <20080912175547.EF4BB208D97@bastion.fedora.phx.redhat.com>

Package sugar-journal in Fedora devel is now owned by mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-journal



From pkgdb at fedoraproject.org  Fri Sep 12 17:55:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 17:55:54 +0000
Subject: [pkgdb] sugar-journal ownership updated
Message-ID: <20080912175554.2481A208D9A@bastion.fedora.phx.redhat.com>

Package sugar-journal in Fedora 9 is now owned by mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-journal



From pkgdb at fedoraproject.org  Fri Sep 12 17:56:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 17:56:08 +0000
Subject: [pkgdb] sugar-journal ownership updated
Message-ID: <20080912175608.438EA208D9F@bastion.fedora.phx.redhat.com>

Package sugar-journal in Fedora 8 is now owned by mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-journal



From pkgdb at fedoraproject.org  Fri Sep 12 17:56:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 17:56:14 +0000
Subject: [pkgdb] sugar-journal ownership updated
Message-ID: <20080912175614.DA327208D98@bastion.fedora.phx.redhat.com>

Package sugar-journal in Fedora OLPC 3 is now owned by mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-journal



From pgordon at fedoraproject.org  Fri Sep 12 18:39:47 2008
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Fri, 12 Sep 2008 18:39:47 +0000 (UTC)
Subject: rpms/telepathy-haze/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 telepathy-haze.spec, 1.12, 1.13
Message-ID: <20080912183947.070AF70131@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/telepathy-haze/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27267

Modified Files:
	.cvsignore sources telepathy-haze.spec 
Log Message:
Upgrade to 0.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Mar 2008 17:54:21 -0000	1.5
+++ .cvsignore	12 Sep 2008 18:39:16 -0000	1.6
@@ -1 +1 @@
-telepathy-haze-0.2.0.tar.gz
+telepathy-haze-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Mar 2008 17:54:21 -0000	1.5
+++ sources	12 Sep 2008 18:39:16 -0000	1.6
@@ -1 +1 @@
-63bb7d0f9c45be27d5cec478f9f61846  telepathy-haze-0.2.0.tar.gz
+6da0d8194848be0fe95cae6d49cce112  telepathy-haze-0.2.1.tar.gz


Index: telepathy-haze.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/devel/telepathy-haze.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- telepathy-haze.spec	14 Aug 2008 03:44:02 -0000	1.12
+++ telepathy-haze.spec	12 Sep 2008 18:39:16 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		telepathy-haze
-Version:	0.2.0
-Release:	3%{?dist}
+Version:	0.2.1
+Release:	1%{?dist}
 Summary:	A multi-protocol Libpurple connection manager for Telepathy
 
 Group:		Applications/Communications
@@ -24,8 +24,6 @@
 others will probably work too.
 
 
-
-
 %prep
 %setup -q
 
@@ -53,6 +51,9 @@
 %{_mandir}/man8/telepathy-haze.8*
 
 %changelog
+* Fri Sep 12 2008 Peter Gordon <peter at thecodergeek.com> - 0.2.1-1
+- Update to new upstream release (0.2.1)
+
 * Wed Aug 13 2008 Peter Gordon <peter at thecodergeek.com> - 0.2.0-3
 - Remove the mission-control subpackage in favor of using the profiles from
   Empathy upstream.



From mstone at fedoraproject.org  Fri Sep 12 18:52:19 2008
From: mstone at fedoraproject.org (Michael Stone)
Date: Fri, 12 Sep 2008 18:52:19 +0000 (UTC)
Subject: rpms/rainbow/F-9 .cvsignore, 1.10, 1.11 rainbow.spec, 1.10,
	1.11 sources, 1.10, 1.11
Message-ID: <20080912185219.2C6FD70131@cvs1.fedora.phx.redhat.com>

Author: mstone

Update of /cvs/pkgs/rpms/rainbow/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29295

Modified Files:
	.cvsignore rainbow.spec sources 
Log Message:
- Michael Stone (1):
    dlo#8434: Add a use-serial permission.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Sep 2008 21:26:41 -0000	1.10
+++ .cvsignore	12 Sep 2008 18:51:48 -0000	1.11
@@ -1 +1 @@
-rainbow-0.7.21.tar.bz2
+rainbow-0.7.22.tar.bz2


Index: rainbow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/F-9/rainbow.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rainbow.spec	5 Sep 2008 21:26:42 -0000	1.10
+++ rainbow.spec	12 Sep 2008 18:51:48 -0000	1.11
@@ -3,7 +3,7 @@
 %{!?python_version: %define python_version %(%{__python} -c "import sys; print sys.version[0:3]")}
 
 Name:           rainbow
-Version:        0.7.21
+Version:        0.7.22
 Release:        1%{?dist}
 Summary:        The OLPC security service
 
@@ -81,6 +81,10 @@
 %{python_sitelib}/%{name}-%{version}-py%{python_version}.egg-info/*
 
 %changelog
+* Fri Sep 12 2008 Michael Stone <michael at laptop.org> - 0.7.22-1.olpc3
+- Michael Stone (1):
+    dlo#8434: Add a use-serial permission.
+
 * Fri Sep 05 2008 Michael Stone <michael at laptop.org> - 0.7.21-1.olpc3
 - Michael Stone (1):
     Move the permissions.info file into the activity directory.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	5 Sep 2008 21:26:42 -0000	1.10
+++ sources	12 Sep 2008 18:51:48 -0000	1.11
@@ -1 +1 @@
-139df3c1f397ed9ac735af9695863956  rainbow-0.7.21.tar.bz2
+85ad9797af2bd3ec7b419369a1a0f253  rainbow-0.7.22.tar.bz2



From wolfy at fedoraproject.org  Fri Sep 12 18:52:23 2008
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri, 12 Sep 2008 18:52:23 +0000 (UTC)
Subject: rpms/ssmtp/devel ssmtp.spec,1.17,1.18
Message-ID: <20080912185223.E508F70131@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/ssmtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29242

Modified Files:
	ssmtp.spec 
Log Message:
consolidate specs for Fedora and EPEL



Index: ssmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/devel/ssmtp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ssmtp.spec	11 Sep 2008 16:22:38 -0000	1.17
+++ ssmtp.spec	12 Sep 2008 18:51:53 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	11.6%{?dist}
+Release:	11.6%{?dist}.1
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPLv2+
@@ -18,7 +18,11 @@
 Patch6:		%{name}-md5auth-non-rsa
 Patch7:		%{name}-unitialized-strdup.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:	%{_sbindir}/sendmail
+#hack around wrong requires for mutt and mdadm
+%if 0%{?rhel}
+Provides:	MTA smtpdaemon
+%endif
+Provides:	%{_sbindir}/sendmail 
 Requires(post):	%{_sbindir}/alternatives
 Requires(preun):	%{_sbindir}/alternatives
 BuildRequires:	openssl-devel
@@ -117,6 +121,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6.1
+- use conditionals to consolidate specs for Fedora and EPEL
+
 * Thu Sep 11 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6
 - patch to fix CVE-2008-3962 (courtesy https://bugs.gentoo.org/127592)
 - cleanup of other patches, make build with fuzz=0



From spot at fedoraproject.org  Fri Sep 12 19:09:39 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 19:09:39 +0000 (UTC)
Subject: rpms/qstat/devel qstat-2.11-20080912svn311.patch, NONE,
	1.1 qstat.spec, 1.8, 1.9
Message-ID: <20080912190939.BF37F70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/qstat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32321

Modified Files:
	qstat.spec 
Added Files:
	qstat-2.11-20080912svn311.patch 
Log Message:
update to svn, relicensed to Artistic 2.0

qstat-2.11-20080912svn311.patch:

--- NEW FILE qstat-2.11-20080912svn311.patch ---
diff -urP qstat-2.11/a2s.c qstat-2.11-20080912svn311/a2s.c
--- qstat-2.11/a2s.c	2006-05-28 07:48:38.000000000 -0400
+++ qstat-2.11-20080912svn311/a2s.c	2008-09-12 14:52:23.000000000 -0400
@@ -44,12 +44,14 @@
 	unsigned char type;
 };
 
-void send_a2s_request_packet(struct qserver *server)
+int send_a2s_request_packet(struct qserver *server)
 {
 	struct a2s_status* status = (struct a2s_status*)server->master_query_tag;
 
 	if(qserver_send_initial(server, A2S_INFO, sizeof(A2S_INFO)) == -1)
-		goto error;
+	{
+		return DONE_FORCE;
+	}
 
 	status->sent_info = 1;
 	status->type = 0;
@@ -57,28 +59,27 @@
 	if(get_server_rules || get_player_info)
 		server->next_rule = ""; // trigger calling send_a2s_rule_request_packet
 
-	return;
-
-error:
-	cleanup_qserver(server, 1);
+	return 0;
 }
 
-void send_a2s_rule_request_packet(struct qserver *server)
+int send_a2s_rule_request_packet(struct qserver *server)
 {
 	struct a2s_status* status = (struct a2s_status*)server->master_query_tag;
 
 	if(!get_server_rules && !get_player_info)
 	{
-		goto error;
+		return DONE_FORCE;
 	}
 
-	do
+	while( 1 )
 	{
 		if(!status->have_challenge)
 		{
 			debug(3, "sending challenge");
-			if(qserver_send_initial(server, A2S_GETCHALLENGE, sizeof(A2S_GETCHALLENGE)-1) == -1)
-				goto error;
+			if( SOCKET_ERROR == qserver_send_initial(server, A2S_GETCHALLENGE, sizeof(A2S_GETCHALLENGE)-1) )
+			{
+				return SOCKET_ERROR;
+			}
 			status->sent_challenge = 1;
 			break;
 		}
@@ -87,8 +88,10 @@
 			char buf[sizeof(A2S_RULES)-1+4] = A2S_RULES;
 			memcpy(buf+sizeof(A2S_RULES)-1, &status->challenge, 4);
 			debug(3, "sending rule query");
-			if(qserver_send_initial(server, buf, sizeof(buf)) == -1)
-				goto error;
+			if( SOCKET_ERROR == qserver_send_initial(server, buf, sizeof(buf)) )
+			{
+				return SOCKET_ERROR;
+			}
 			status->sent_rules = 1;
 			break;
 		}
@@ -97,8 +100,10 @@
 			char buf[sizeof(A2S_PLAYER)-1+4] = A2S_PLAYER;
 			memcpy(buf+sizeof(A2S_PLAYER)-1, &status->challenge, 4);
 			debug(3, "sending player query");
-			if(qserver_send_initial(server, buf, sizeof(buf)) == -1)
-				goto error;
+			if( SOCKET_ERROR == qserver_send_initial(server, buf, sizeof(buf)) )
+			{
+				return SOCKET_ERROR;
+			}
 			status->sent_player = 1;
 			break;
 		}
@@ -109,15 +114,12 @@
 			status->have_challenge = 0;
 			status->have_rules = 0;
 		}
-	} while(1);
-
-	return;
+	}
 
-error:
-	cleanup_qserver(server, 1);
+	return INPROGRESS;
 }
 
-void deal_with_a2s_packet(struct qserver *server, char *rawpkt, int pktlen)
+int deal_with_a2s_packet(struct qserver *server, char *rawpkt, int pktlen)
 {
 	struct a2s_status* status = (struct a2s_status*)server->master_query_tag;
 	char* pkt = rawpkt;
@@ -159,12 +161,12 @@
 		// packetId
 		if ( 1 == status->type )
 		{
-			// HL2 format
+			// HL1 format
 			// The lower four bits represent the number of packets (2 to 15) and
 			// the upper four bits represent the current packet starting with 0
 			pkt_max = ((unsigned char)*pkt) & 15;
 			pkt_index = ((unsigned char)*pkt) >> 4;
-			debug( 3, "packetid: 0x%hhx => idx: %hhu, max: %hhu", *pkt, pkt_index, pkt_max );
+			debug( 3, "packetid[1]: 0x%hhx => idx: %hhu, max: %hhu", *pkt, pkt_index, pkt_max );
 			pkt++;
 			pktlen -= 9;
 		}
@@ -172,20 +174,20 @@
 		{
 			// HL2 format
 			// The next two bytes are:
-			// 1. the max packets sent
-			// 2. the index of this packet starting from 0
+			// 1. the max packets sent ( byte )
+			// 2. the index of this packet starting from 0 ( byte )
+			// 3. Size of the split ( short )
 			if(pktlen < 10) goto out_too_short;
 			pkt_max = ((unsigned char)*pkt);
 			pkt_index = ((unsigned char)*(pkt+1));
-			debug( 3, "packetid: 0x%hhx => idx: %hhu, max: %hhu", *pkt, pkt_index, pkt_max );
-			pkt+=2;
-			pktlen -= 10;
+			debug( 3, "packetid[2]: 0x%hhx => idx: %hhu, max: %hhu", *pkt, pkt_index, pkt_max );
+			pkt+=4;
+			pktlen -= 12;
 		}
 		else
 		{
 			malformed_packet( server, "Unable to determine packet format" );
-			cleanup_qserver( server, 1 );
-			return;
+			return PKT_ERROR;
 		}
 
 		// pkt_max is the total number of packets expected
@@ -210,25 +212,24 @@
 		if ( NULL == sdata->data )
 		{
 			malformed_packet(server, "Out of memory");
-			cleanup_qserver( server, 1 );
-			return;
+			return MEM_ERROR;
 		}
 		memcpy( sdata->data, pkt, sdata->datalen);
 
 		// combine_packets will call us recursively
-		combine_packets( server );
-		return;
+		return combine_packets( server );
 	}
 	else if( 0 != memcmp(pkt, "\xFF\xFF\xFF\xFF", 4) )
 	{
 		malformed_packet(server, "invalid packet header");
-		goto out_error;
+		return PKT_ERROR;
 	}
 
 	pkt += 4;
 	pktlen -= 4;
 
 	pktlen -= 1;
+	debug( 2, "A2S type = %hhd", *pkt );
 	switch(*pkt++)
 	{
 	case A2S_CHALLENGERESPONSE:
@@ -438,6 +439,9 @@
 		server->num_players = (unsigned char)pkt[2];
 		server->max_players = (unsigned char)pkt[3];
 		// pkt[4] number of bots
+		sprintf( buf, "%hhu", pkt[4] );
+		add_rule( server, "bots", buf, 0 );
+
 		add_rule(server, "dedicated", pkt[5]?"1":"0", 0);
 		if(pkt[6] == 'l')
 		{
@@ -582,7 +586,7 @@
 
 	default:
 		malformed_packet(server, "invalid packet id %hhx", *--pkt);
-		goto out_error;
+		return PKT_ERROR;
 	}
 
 	if(
@@ -593,14 +597,11 @@
 		server->next_rule = NULL;
 	}
 
-	cleanup_qserver(server, 0);
[...47066 lines suppressed...]
+ *
+ */
+
+#include <sys/types.h>
+#ifndef _WIN32
+#include <sys/socket.h>
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+
+#include "debug.h"
+#include "qstat.h"
+#include "packet_manip.h"
+
+
+int send_wic_request_packet( struct qserver *server )
+{
+	char buf[256];
+
+	int serverport = get_param_i_value( server, "port", 0 );
+	char *password = get_param_value( server, "password", "N/A" );
+	change_server_port( server, serverport, 1 );
+
+	if ( get_player_info )
+	{
+		server->flags |= TF_PLAYER_QUERY|TF_RULES_QUERY;
+		sprintf( buf, "%s\x0d\x0a/listsettings\x0d\x0a/listplayers\x0d\x0a/exit\x0d\x0a", password );
+		server->saved_data.pkt_index = 2;
+	}
+	else
+	{
+		server->flags |= TF_STATUS_QUERY;
+		sprintf( buf, "%s\x0d\x0a/listsettings\x0d\x0a/exit\x0d\x0a", password );
+		server->saved_data.pkt_index = 1;
+	}
+
+	return send_packet( server, buf, strlen( buf ) );
+}
+
+
+int deal_with_wic_packet( struct qserver *server, char *rawpkt, int pktlen )
+{
+	char *s, *end, *team = NULL;
+	int mode = server->n_servers, slot, score;
+	char name[256], role[256];
+
+	debug( 2, "processing n_requests %d, retry1 %d, n_retries %d, delta %d", server->n_requests, server->retry1, n_retries, time_delta( &packet_recv_time, &server->packet_time1 ) );
+
+	server->ping_total += time_delta( &packet_recv_time, &server->packet_time1 );
+	server->n_requests++;
+	gettimeofday( &server->packet_time1, NULL);
+
+	rawpkt[pktlen]= '\0';
+	end = &rawpkt[pktlen];
+
+	s = rawpkt;
+
+	while ( NULL != s )
+	{
+		int len = strlen( s );
+		*(s + len - 2) = '\0'; // strip off \x0D\x0A
+		debug( 2, "Line[%d]: %s", mode, s );
+
+		if ( 0 == mode )
+		{
+			// Settings
+			// TODO: make parse safe
+			if ( 0 == strncmp( s, "Settings: ", 9 ) )
+			{
+				// Server Rule
+				char *key = s + 10;
+				char *value = strchr( key, ' ' );
+				*value = '\0';
+				value++;
+				debug( 2, "key: '%s' = '%s'", key, value );
+				if ( 0 == strcmp( "myGameName", key ) )
+				{
+					server->server_name = strdup( value );
+				}
+				else if ( 0 == strcmp( "myMapFilename", key ) )
+				{
+					server->map_name = strdup( value );
+				}
+				else if ( 0 == strcmp( "myMaxPlayers", key ) )
+				{
+					server->max_players = atoi( value );
+				}
+				else if ( 0 == strcmp( "myCurrentNumberOfPlayers", key ) )
+				{
+					server->num_players = atoi( value);
+				}
+				else
+				{
+					add_rule( server, key, value, NO_FLAGS );
+				}
+			}
+			else if ( 0 == strcmp( "Listing players", s ) )
+			{
+				// end of rules request
+				server->saved_data.pkt_index--;
+				mode++;
+			}
+			else if ( 0 == strcmp( "Exit confirmed.", s ) )
+			{
+				server->n_servers = mode;
+				return DONE_FORCE;
+			}
+		}
+		else if ( 1 == mode )
+		{
+			// Player info
+			if ( 0 == strncmp( s, "Team: ", 6 ) )
+			{
+				team = s + 6;
+				debug( 2, "Team: %s", team );
+			}
+			else if ( 4 == sscanf( s, "Slot: %d Role: %s Score: %d Name: %255[^\x0d\x0a]", &slot, role, &score, name ) )
+			{
+				// Player info
+				struct player *player = add_player( server, server->n_player_info );
+				if ( NULL != player )
+				{
+					player->flags |= PLAYER_FLAG_DO_NOT_FREE_TEAM;
+					player->name = strdup( name );
+					player->score = score;
+					player->team_name = team;
+					player->tribe_tag = strdup( role );
+					// Indicate if its a bot
+					player->type_flag = ( 0 == strcmp( name, "Computer: Balanced" ) ) ? 1 : 0;
+				}
+				debug( 2, "player %d, role %s, score %d, name %s", slot, role, score, name );
+			}
+			else if ( 3 == sscanf( s, "Slot: %d Role:  Score: %d Name: %255[^\x0d\x0a]", &slot, &score, name ) )
+			{
+				// Player info
+				struct player *player = add_player( server, server->n_player_info );
+				if ( NULL != player )
+				{
+					player->flags |= PLAYER_FLAG_DO_NOT_FREE_TEAM;
+					player->name = strdup( name );
+					player->score = score;
+					player->team_name = team;
+					// Indicate if its a bot
+					player->type_flag = ( 0 == strcmp( name, "Computer: Balanced" ) ) ? 1 : 0;
+				}
+				debug( 2, "player %d, score %d, name %s", slot, score, name );
+			}
+			else if ( 0 == strcmp( "Exit confirmed.", s ) )
+			{
+				server->n_servers = mode;
+				return DONE_FORCE;
+			}
+		}
+
+		s += len;
+		if ( s + 1 < end )
+		{
+			s++; // next line
+		}
+		else
+		{
+			s = NULL;
+		}
+	}
+
+	server->n_servers = mode;
+
+	if ( 0 == server->saved_data.pkt_index )
+	{
+		server->map_name = strdup( "N/A" );
+		return DONE_FORCE;
+	}
+
+	return INPROGRESS;
+}
diff -urP qstat-2.11/wic.h qstat-2.11-20080912svn311/wic.h
--- qstat-2.11/wic.h	1969-12-31 19:00:00.000000000 -0500
+++ qstat-2.11-20080912svn311/wic.h	2008-09-12 14:52:23.000000000 -0400
@@ -0,0 +1,20 @@
+/*
+ * qstat 2.8
+ * by Steve Jankowski
+ *
+ * World in Conflict Protocol
+ * Copyright 2007 Steven Hartland
+ *
+ * Licensed under the Artistic License, see LICENSE.txt for license terms
+ */
+#ifndef QSTAT_GPS_H
+#define QSTAT_GPS_H
+
+#include "qserver.h"
+
+// Packet processing methods
+int deal_with_wic_packet( struct qserver *server, char *pkt, int pktlen );
+int send_wic_request_packet( struct qserver *server );
+
+#endif
+


Index: qstat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qstat/devel/qstat.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qstat.spec	18 Feb 2008 19:24:45 -0000	1.8
+++ qstat.spec	12 Sep 2008 19:09:09 -0000	1.9
@@ -1,12 +1,13 @@
 Summary: Real-time Game Server Status for FPS game servers
 Name: qstat
 Version: 2.11
-Release: 5%{?dist}
-License: Artistic
+Release: 6.20080912svn311%{?dist}
+License: Artistic 2.0
 Group: Amusements/Games
 URL: http://sourceforge.net/projects/qstat/
 Source: http://downloads.sourceforge.net/qstat/qstat-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: qstat-2.11-20080912svn311.patch
 # The name "qstat" is actually a requirement in POSIX 1003.2d.
 # it has been implemented by many batch queueing systems over the decades.
 # In this case try to handle with the conflicting package(s).
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -43,6 +45,10 @@
 %{_bindir}/qstat
 
 %changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.11-6.20080912svn311
+- update to latest svn
+- upstream relicensed to Artistic 2.0
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.11-5
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Fri Sep 12 19:15:23 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 19:15:23 +0000 (UTC)
Subject: rpms/pydot/devel .cvsignore, 1.2, 1.3 pydot.spec, 1.4, 1.5 sources, 
	1.2, 1.3
Message-ID: <20080912191523.C5CF570134@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pydot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv713

Modified Files:
	.cvsignore pydot.spec sources 
Log Message:
update to 1.0.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pydot/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Oct 2005 04:16:56 -0000	1.2
+++ .cvsignore	12 Sep 2008 19:14:53 -0000	1.3
@@ -1 +1 @@
-pydot-0.9.10.tar.gz
+pydot-1.0.2.tar.gz


Index: pydot.spec
===================================================================
RCS file: /cvs/extras/rpms/pydot/devel/pydot.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pydot.spec	15 Dec 2006 04:33:37 -0000	1.4
+++ pydot.spec	12 Sep 2008 19:14:53 -0000	1.5
@@ -1,13 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		pydot
-Version:	0.9.10
-Release:	5%{?dist}
+Version:	1.0.2
+Release:	1%{?dist}
 License:	MIT
 Group:		System Environment/Libraries
 Summary:	Python interface to Graphviz's Dot language
-URL:		http://dkbza.org/pydot.html
-Source0:	http://dkbza.org/data/pydot-%{version}.tar.gz
+URL:		http://code.google.com/p/pydot/
+Source0:	http://pydot.googlecode.com/files/pydot-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	pyparsing python-devel
 Requires:	graphviz, pyparsing
@@ -16,7 +16,7 @@
 %description
 An interface for creating both directed and non directed graphs from Python. 
 Currently all attributes implemented in the Dot language are supported (up 
-to Graphviz 1.16).
+to Graphviz 2.16).
 
 Output can be inlined in Postscript into interactive scientific environments 
 like TeXmacs, or output in any of the format's supported by the Graphviz 
@@ -32,6 +32,9 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root=$RPM_BUILD_ROOT
 
+# Why would you do this? :/
+rm -rf $RPM_BUILD_ROOT%{_prefix}/ChangeLog $RPM_BUILD_ROOT%{_prefix}/LICENSE $RPM_BUILD_ROOT%{_prefix}/README
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -41,6 +44,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.2-1
+- update to 1.0.2
+
 * Thu Dec 14 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.9.10-5
 - Rebuild for new Python
 - Add BR: python-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pydot/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Oct 2005 04:16:56 -0000	1.2
+++ sources	12 Sep 2008 19:14:53 -0000	1.3
@@ -1 +1 @@
-d59609a3b69b19ad018c55d765945baf  pydot-0.9.10.tar.gz
+e5cbbe7ef3d221c05c96e4bd4bcf95f9  pydot-1.0.2.tar.gz



From wolfy at fedoraproject.org  Fri Sep 12 19:22:46 2008
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri, 12 Sep 2008 19:22:46 +0000 (UTC)
Subject: rpms/ssmtp/F-9 ssmtp-md5auth-non-rsa, 1.1,
	1.2 ssmtp-password-leak.patch, 1.1, 1.2 ssmtp.spec, 1.15, 1.16
Message-ID: <20080912192246.DD8D270131@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/ssmtp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2425

Modified Files:
	ssmtp-md5auth-non-rsa ssmtp-password-leak.patch ssmtp.spec 
Log Message:
* Fri Sep 12 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6.1
- use conditionals to consolidate specs for Fedora and EPEL



Index: ssmtp-md5auth-non-rsa
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/F-9/ssmtp-md5auth-non-rsa,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp-md5auth-non-rsa	17 Oct 2007 00:09:53 -0000	1.1
+++ ssmtp-md5auth-non-rsa	12 Sep 2008 19:22:16 -0000	1.2
@@ -7391,38 +7391,3 @@
  
  	for (i = 0; i < MD5_DIGEST_LEN; i++) {
  		digascii[2 * i] = hextab[digest[i] >> 4];
-diff -Nupr ssmtp-2.61.orig/ssmtp.c.orig ssmtp-2.61/ssmtp.c.orig
---- ssmtp-2.61.orig/ssmtp.c.orig	2007-10-17 02:20:25.000000000 +0300
-+++ ssmtp-2.61/ssmtp.c.orig	2007-10-17 02:29:11.000000000 +0300
-@@ -708,6 +708,10 @@ void header_save(char *str)
- 		else if(strncasecmp(ht->string, "Bcc:", 4) == 0) {
- 			p = (ht->string + 4);
- 			rcpt_parse(p);
-+                        /* Undo adding the header to the list: */
-+                        free(ht->string);
-+                        ht->string = NULL;
-+                        return;
- 		}
- 		else if(strncasecmp(ht->string, "CC:", 3) == 0) {
- 			p = (ht->string + 3);
-@@ -1406,6 +1410,7 @@ int ssmtp(char *argv[])
- 	struct passwd *pw;
- 	int i, sock;
- 	uid_t uid;
-+	bool_t minus_v_save;
- 	int timeout = 0;
- 
- 	outbytes = 0;
-@@ -1522,7 +1527,12 @@ int ssmtp(char *argv[])
- #ifdef MD5AUTH
- 		}
- #endif
-+		/* We do NOT want the password output to STDERR
-+		 * even base64 encoded.*/
-+		minus_v_save = minus_v;
-+		minus_v = False;
- 		outbytes += smtp_write(sock, "%s", buf);
-+		minus_v = minus_v_save;
- 		(void)alarm((unsigned) MEDWAIT);
- 
- 		if(smtp_okay(sock, buf) == False) {

ssmtp-password-leak.patch:

Index: ssmtp-password-leak.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/F-9/ssmtp-password-leak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp-password-leak.patch	8 Dec 2006 00:09:53 -0000	1.1
+++ ssmtp-password-leak.patch	12 Sep 2008 19:22:16 -0000	1.2
@@ -1,6 +1,6 @@
 --- ssmtp-2.61.redhat/ssmtp.c	2006-12-08 01:25:35.000000000 +0200
 +++ ssmtp-2.61.debian/ssmtp.c	2006-12-08 01:24:25.000000000 +0200
-@@ -1404,6 +1406,7 @@
+@@ -1406,6 +1404,7 @@
  	struct passwd *pw;
  	int i, sock;
  	uid_t uid;
@@ -8,7 +8,7 @@
  	int timeout = 0;
  
  	outbytes = 0;
-@@ -1520,7 +1523,12 @@
+@@ -1522,7 +1521,12 @@
  #ifdef MD5AUTH
  		}
  #endif


Index: ssmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/F-9/ssmtp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ssmtp.spec	11 Feb 2008 22:58:03 -0000	1.15
+++ ssmtp.spec	12 Sep 2008 19:22:16 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	11.5%{?dist}.3
+Release:	11.6%{?dist}.1
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPLv2+
@@ -16,8 +16,13 @@
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=340803
 # replaces RSA's md5 with a GPL compatible implementation
 Patch6:		%{name}-md5auth-non-rsa
+Patch7:		%{name}-unitialized-strdup.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:       %{_sbindir}/sendmail
+#hack around wrong requires for mutt and mdadm
+%if 0%{?rhel}
+Provides:	MTA smtpdaemon
+%endif
+Provides:	%{_sbindir}/sendmail 
 Requires(post):	%{_sbindir}/alternatives
 Requires(preun):	%{_sbindir}/alternatives
 BuildRequires:	openssl-devel
@@ -35,13 +40,14 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 
 %build
@@ -115,6 +121,16 @@
 
 
 %changelog
+* Fri Sep 12 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6.1
+- use conditionals to consolidate specs for Fedora and EPEL
+
+* Thu Sep 11 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6
+- patch to fix CVE-2008-3962 (courtesy https://bugs.gentoo.org/127592)
+- cleanup of other patches, make build with fuzz=0
+
+* Sat Aug 02 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.5.4
+- work around rpmbuild more strict syntax checker
+
 * Tue Feb 12 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.5.3
 - rebuilt for gcc 4.3.0
 



From wolfy at fedoraproject.org  Fri Sep 12 19:23:39 2008
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri, 12 Sep 2008 19:23:39 +0000 (UTC)
Subject: rpms/ssmtp/F-8 ssmtp-md5auth-non-rsa, 1.1,
	1.2 ssmtp-password-leak.patch, 1.1, 1.2 ssmtp.spec, 1.11, 1.12
Message-ID: <20080912192339.99FF270131@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/ssmtp/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2589

Modified Files:
	ssmtp-md5auth-non-rsa ssmtp-password-leak.patch ssmtp.spec 
Log Message:
* Fri Sep 12 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6.1
- use conditionals to consolidate specs for Fedora and EPEL



Index: ssmtp-md5auth-non-rsa
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/F-8/ssmtp-md5auth-non-rsa,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp-md5auth-non-rsa	17 Oct 2007 00:09:53 -0000	1.1
+++ ssmtp-md5auth-non-rsa	12 Sep 2008 19:23:09 -0000	1.2
@@ -7391,38 +7391,3 @@
  
  	for (i = 0; i < MD5_DIGEST_LEN; i++) {
  		digascii[2 * i] = hextab[digest[i] >> 4];
-diff -Nupr ssmtp-2.61.orig/ssmtp.c.orig ssmtp-2.61/ssmtp.c.orig
---- ssmtp-2.61.orig/ssmtp.c.orig	2007-10-17 02:20:25.000000000 +0300
-+++ ssmtp-2.61/ssmtp.c.orig	2007-10-17 02:29:11.000000000 +0300
-@@ -708,6 +708,10 @@ void header_save(char *str)
- 		else if(strncasecmp(ht->string, "Bcc:", 4) == 0) {
- 			p = (ht->string + 4);
- 			rcpt_parse(p);
-+                        /* Undo adding the header to the list: */
-+                        free(ht->string);
-+                        ht->string = NULL;
-+                        return;
- 		}
- 		else if(strncasecmp(ht->string, "CC:", 3) == 0) {
- 			p = (ht->string + 3);
-@@ -1406,6 +1410,7 @@ int ssmtp(char *argv[])
- 	struct passwd *pw;
- 	int i, sock;
- 	uid_t uid;
-+	bool_t minus_v_save;
- 	int timeout = 0;
- 
- 	outbytes = 0;
-@@ -1522,7 +1527,12 @@ int ssmtp(char *argv[])
- #ifdef MD5AUTH
- 		}
- #endif
-+		/* We do NOT want the password output to STDERR
-+		 * even base64 encoded.*/
-+		minus_v_save = minus_v;
-+		minus_v = False;
- 		outbytes += smtp_write(sock, "%s", buf);
-+		minus_v = minus_v_save;
- 		(void)alarm((unsigned) MEDWAIT);
- 
- 		if(smtp_okay(sock, buf) == False) {

ssmtp-password-leak.patch:

Index: ssmtp-password-leak.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/F-8/ssmtp-password-leak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp-password-leak.patch	8 Dec 2006 00:09:53 -0000	1.1
+++ ssmtp-password-leak.patch	12 Sep 2008 19:23:09 -0000	1.2
@@ -1,6 +1,6 @@
 --- ssmtp-2.61.redhat/ssmtp.c	2006-12-08 01:25:35.000000000 +0200
 +++ ssmtp-2.61.debian/ssmtp.c	2006-12-08 01:24:25.000000000 +0200
-@@ -1404,6 +1406,7 @@
+@@ -1406,6 +1404,7 @@
  	struct passwd *pw;
  	int i, sock;
  	uid_t uid;
@@ -8,7 +8,7 @@
  	int timeout = 0;
  
  	outbytes = 0;
-@@ -1520,7 +1523,12 @@
+@@ -1522,7 +1521,12 @@
  #ifdef MD5AUTH
  		}
  #endif


Index: ssmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/F-8/ssmtp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ssmtp.spec	2 Nov 2007 00:16:11 -0000	1.11
+++ ssmtp.spec	12 Sep 2008 19:23:09 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	11.5%{?dist}.1
+Release:	11.6%{?dist}.1
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPLv2+
@@ -16,8 +16,13 @@
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=340803
 # replaces RSA's md5 with a GPL compatible implementation
 Patch6:		%{name}-md5auth-non-rsa
+Patch7:		%{name}-unitialized-strdup.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:       %{_sbindir}/sendmail
+#hack around wrong requires for mutt and mdadm
+%if 0%{?rhel}
+Provides:	MTA smtpdaemon
+%endif
+Provides:	%{_sbindir}/sendmail 
 Requires(post):	%{_sbindir}/alternatives
 Requires(preun):	%{_sbindir}/alternatives
 BuildRequires:	openssl-devel
@@ -35,24 +40,25 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 
 %build
 #on RHEL3 krb5 is somewhere else
 #test -e /usr/include/krb5.h || CPPFLAGS="-I/usr/kerberos/include"
 #CPPFLAGS=$(pkg-config --cflags-only-I openssl)
-%if "0%{?dist}" == "0el3" 
+%if "0%{?dist}" == "0.el3" 
 	%define cppflags -I/usr/kerberos/include
 %endif
 %configure --enable-ssl --enable-md5auth --enable-inet6
-%if "0%{?dist}" == "0el3" 
+%if "0%{?dist}" == "0.el3" 
 	make %{?_smp_mflags} CPPFLAGS=%{cppflags}
 %else
 	make %{?_smp_mflags}
@@ -115,6 +121,23 @@
 
 
 %changelog
+* Fri Sep 12 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6.1
+- use conditionals to consolidate specs for Fedora and EPEL
+
+* Thu Sep 11 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6
+- patch to fix CVE-2008-3962 (courtesy https://bugs.gentoo.org/127592)
+- cleanup of other patches, make build with fuzz=0
+
+* Sat Aug 02 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.5.4
+- work around rpmbuild more strict syntax checker
+
+* Tue Feb 12 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.5.3
+- rebuilt for gcc 4.3.0
+
+* Wed Dec 5 2007 lonely wolf <wolfy at nobugconsulting.ro> 2.61-11.5.2
+- rebuilt for newer openssl
+- fix usage of disttag for compatibility with mock + el3
+
 * Wed Oct 24 2007 lonely wolf <wolfy at nobugconsulting.ro> 2.61-11.5.1
 - adds back /usr/sbin/sendmail provides, rpmbuild by default does not add it
 



From wolfy at fedoraproject.org  Fri Sep 12 19:24:27 2008
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri, 12 Sep 2008 19:24:27 +0000 (UTC)
Subject: rpms/ssmtp/F-7 ssmtp-md5auth-non-rsa, 1.1,
	1.2 ssmtp-password-leak.patch, 1.1, 1.2 ssmtp.spec, 1.10, 1.11
Message-ID: <20080912192427.EDA2770131@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/ssmtp/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2692

Modified Files:
	ssmtp-md5auth-non-rsa ssmtp-password-leak.patch ssmtp.spec 
Log Message:
* Fri Sep 12 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6.1
- use conditionals to consolidate specs for Fedora and EPEL



Index: ssmtp-md5auth-non-rsa
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/F-7/ssmtp-md5auth-non-rsa,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp-md5auth-non-rsa	17 Oct 2007 00:29:30 -0000	1.1
+++ ssmtp-md5auth-non-rsa	12 Sep 2008 19:23:57 -0000	1.2
@@ -7391,38 +7391,3 @@
  
  	for (i = 0; i < MD5_DIGEST_LEN; i++) {
  		digascii[2 * i] = hextab[digest[i] >> 4];
-diff -Nupr ssmtp-2.61.orig/ssmtp.c.orig ssmtp-2.61/ssmtp.c.orig
---- ssmtp-2.61.orig/ssmtp.c.orig	2007-10-17 02:20:25.000000000 +0300
-+++ ssmtp-2.61/ssmtp.c.orig	2007-10-17 02:29:11.000000000 +0300
-@@ -708,6 +708,10 @@ void header_save(char *str)
- 		else if(strncasecmp(ht->string, "Bcc:", 4) == 0) {
- 			p = (ht->string + 4);
- 			rcpt_parse(p);
-+                        /* Undo adding the header to the list: */
-+                        free(ht->string);
-+                        ht->string = NULL;
-+                        return;
- 		}
- 		else if(strncasecmp(ht->string, "CC:", 3) == 0) {
- 			p = (ht->string + 3);
-@@ -1406,6 +1410,7 @@ int ssmtp(char *argv[])
- 	struct passwd *pw;
- 	int i, sock;
- 	uid_t uid;
-+	bool_t minus_v_save;
- 	int timeout = 0;
- 
- 	outbytes = 0;
-@@ -1522,7 +1527,12 @@ int ssmtp(char *argv[])
- #ifdef MD5AUTH
- 		}
- #endif
-+		/* We do NOT want the password output to STDERR
-+		 * even base64 encoded.*/
-+		minus_v_save = minus_v;
-+		minus_v = False;
- 		outbytes += smtp_write(sock, "%s", buf);
-+		minus_v = minus_v_save;
- 		(void)alarm((unsigned) MEDWAIT);
- 
- 		if(smtp_okay(sock, buf) == False) {

ssmtp-password-leak.patch:

Index: ssmtp-password-leak.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/F-7/ssmtp-password-leak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp-password-leak.patch	8 Dec 2006 00:09:53 -0000	1.1
+++ ssmtp-password-leak.patch	12 Sep 2008 19:23:57 -0000	1.2
@@ -1,6 +1,6 @@
 --- ssmtp-2.61.redhat/ssmtp.c	2006-12-08 01:25:35.000000000 +0200
 +++ ssmtp-2.61.debian/ssmtp.c	2006-12-08 01:24:25.000000000 +0200
-@@ -1404,6 +1406,7 @@
+@@ -1406,6 +1404,7 @@
  	struct passwd *pw;
  	int i, sock;
  	uid_t uid;
@@ -8,7 +8,7 @@
  	int timeout = 0;
  
  	outbytes = 0;
-@@ -1520,7 +1523,12 @@
+@@ -1522,7 +1521,12 @@
  #ifdef MD5AUTH
  		}
  #endif


Index: ssmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/F-7/ssmtp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ssmtp.spec	2 Nov 2007 00:29:35 -0000	1.10
+++ ssmtp.spec	12 Sep 2008 19:23:57 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	11.5%{?dist}.1
+Release:	11.6%{?dist}.1
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPLv2+
@@ -16,8 +16,13 @@
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=340803
 # replaces RSA's md5 with a GPL compatible implementation
 Patch6:		%{name}-md5auth-non-rsa
+Patch7:		%{name}-unitialized-strdup.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:       %{_sbindir}/sendmail
+#hack around wrong requires for mutt and mdadm
+%if 0%{?rhel}
+Provides:	MTA smtpdaemon
+%endif
+Provides:	%{_sbindir}/sendmail 
 Requires(post):	%{_sbindir}/alternatives
 Requires(preun):	%{_sbindir}/alternatives
 BuildRequires:	openssl-devel
@@ -35,24 +40,25 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 
 %build
 #on RHEL3 krb5 is somewhere else
 #test -e /usr/include/krb5.h || CPPFLAGS="-I/usr/kerberos/include"
 #CPPFLAGS=$(pkg-config --cflags-only-I openssl)
-%if "0%{?dist}" == "0el3" 
+%if "0%{?dist}" == "0.el3" 
 	%define cppflags -I/usr/kerberos/include
 %endif
 %configure --enable-ssl --enable-md5auth --enable-inet6
-%if "0%{?dist}" == "0el3" 
+%if "0%{?dist}" == "0.el3" 
 	make %{?_smp_mflags} CPPFLAGS=%{cppflags}
 %else
 	make %{?_smp_mflags}
@@ -115,6 +121,23 @@
 
 
 %changelog
+* Fri Sep 12 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6.1
+- use conditionals to consolidate specs for Fedora and EPEL
+
+* Thu Sep 11 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6
+- patch to fix CVE-2008-3962 (courtesy https://bugs.gentoo.org/127592)
+- cleanup of other patches, make build with fuzz=0
+
+* Sat Aug 02 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.5.4
+- work around rpmbuild more strict syntax checker
+
+* Tue Feb 12 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.5.3
+- rebuilt for gcc 4.3.0
+
+* Wed Dec 5 2007 lonely wolf <wolfy at nobugconsulting.ro> 2.61-11.5.2
+- rebuilt for newer openssl
+- fix usage of disttag for compatibility with mock + el3
+
 * Wed Oct 24 2007 lonely wolf <wolfy at nobugconsulting.ro> 2.61-11.5.1
 - adds back /usr/sbin/sendmail provides, rpmbuild by default does not add it
 



From wolfy at fedoraproject.org  Fri Sep 12 19:25:37 2008
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri, 12 Sep 2008 19:25:37 +0000 (UTC)
Subject: rpms/ssmtp/FC-6 ssmtp-md5auth-non-rsa, 1.1,
	1.2 ssmtp-password-leak.patch, 1.1, 1.2 ssmtp.spec, 1.8, 1.9
Message-ID: <20080912192537.65C0970131@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/ssmtp/FC-6
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2876

Modified Files:
	ssmtp-md5auth-non-rsa ssmtp-password-leak.patch ssmtp.spec 
Log Message:
* Fri Sep 12 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6.1
- use conditionals to consolidate specs for Fedora and EPEL



Index: ssmtp-md5auth-non-rsa
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/FC-6/ssmtp-md5auth-non-rsa,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp-md5auth-non-rsa	17 Oct 2007 00:35:09 -0000	1.1
+++ ssmtp-md5auth-non-rsa	12 Sep 2008 19:25:07 -0000	1.2
@@ -7391,38 +7391,3 @@
  
  	for (i = 0; i < MD5_DIGEST_LEN; i++) {
  		digascii[2 * i] = hextab[digest[i] >> 4];
-diff -Nupr ssmtp-2.61.orig/ssmtp.c.orig ssmtp-2.61/ssmtp.c.orig
---- ssmtp-2.61.orig/ssmtp.c.orig	2007-10-17 02:20:25.000000000 +0300
-+++ ssmtp-2.61/ssmtp.c.orig	2007-10-17 02:29:11.000000000 +0300
-@@ -708,6 +708,10 @@ void header_save(char *str)
- 		else if(strncasecmp(ht->string, "Bcc:", 4) == 0) {
- 			p = (ht->string + 4);
- 			rcpt_parse(p);
-+                        /* Undo adding the header to the list: */
-+                        free(ht->string);
-+                        ht->string = NULL;
-+                        return;
- 		}
- 		else if(strncasecmp(ht->string, "CC:", 3) == 0) {
- 			p = (ht->string + 3);
-@@ -1406,6 +1410,7 @@ int ssmtp(char *argv[])
- 	struct passwd *pw;
- 	int i, sock;
- 	uid_t uid;
-+	bool_t minus_v_save;
- 	int timeout = 0;
- 
- 	outbytes = 0;
-@@ -1522,7 +1527,12 @@ int ssmtp(char *argv[])
- #ifdef MD5AUTH
- 		}
- #endif
-+		/* We do NOT want the password output to STDERR
-+		 * even base64 encoded.*/
-+		minus_v_save = minus_v;
-+		minus_v = False;
- 		outbytes += smtp_write(sock, "%s", buf);
-+		minus_v = minus_v_save;
- 		(void)alarm((unsigned) MEDWAIT);
- 
- 		if(smtp_okay(sock, buf) == False) {

ssmtp-password-leak.patch:

Index: ssmtp-password-leak.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/FC-6/ssmtp-password-leak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp-password-leak.patch	9 Dec 2006 17:54:50 -0000	1.1
+++ ssmtp-password-leak.patch	12 Sep 2008 19:25:07 -0000	1.2
@@ -1,6 +1,6 @@
 --- ssmtp-2.61.redhat/ssmtp.c	2006-12-08 01:25:35.000000000 +0200
 +++ ssmtp-2.61.debian/ssmtp.c	2006-12-08 01:24:25.000000000 +0200
-@@ -1404,6 +1406,7 @@
+@@ -1406,6 +1404,7 @@
  	struct passwd *pw;
  	int i, sock;
  	uid_t uid;
@@ -8,7 +8,7 @@
  	int timeout = 0;
  
  	outbytes = 0;
-@@ -1520,7 +1523,12 @@
+@@ -1522,7 +1521,12 @@
  #ifdef MD5AUTH
  		}
  #endif


Index: ssmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/FC-6/ssmtp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ssmtp.spec	17 Oct 2007 00:35:09 -0000	1.8
+++ ssmtp.spec	12 Sep 2008 19:25:07 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	11.4%{?dist}
+Release:	11.6%{?dist}.1
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPLv2+
@@ -16,8 +16,13 @@
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=340803
 # replaces RSA's md5 with a GPL compatible implementation
 Patch6:		%{name}-md5auth-non-rsa
+Patch7:		%{name}-unitialized-strdup.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:	MTA smtpdaemon %{_sbindir}/sendmail 
+#hack around wrong requires for mutt and mdadm
+%if 0%{?rhel}
+Provides:	MTA smtpdaemon
+%endif
+Provides:	%{_sbindir}/sendmail 
 Requires(post):	%{_sbindir}/alternatives
 Requires(preun):	%{_sbindir}/alternatives
 BuildRequires:	openssl-devel
@@ -35,24 +40,25 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 
 %build
 #on RHEL3 krb5 is somewhere else
 #test -e /usr/include/krb5.h || CPPFLAGS="-I/usr/kerberos/include"
 #CPPFLAGS=$(pkg-config --cflags-only-I openssl)
-%if "0%{?dist}" == "0el3" 
+%if "0%{?dist}" == "0.el3" 
 	%define cppflags -I/usr/kerberos/include
 %endif
 %configure --enable-ssl --enable-md5auth --enable-inet6
-%if "0%{?dist}" == "0el3" 
+%if "0%{?dist}" == "0.el3" 
 	make %{?_smp_mflags} CPPFLAGS=%{cppflags}
 %else
 	make %{?_smp_mflags}
@@ -115,6 +121,30 @@
 
 
 %changelog
+* Fri Sep 12 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6.1
+- use conditionals to consolidate specs for Fedora and EPEL
+
+* Thu Sep 11 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6
+- patch to fix CVE-2008-3962 (courtesy https://bugs.gentoo.org/127592)
+- cleanup of other patches, make build with fuzz=0
+
+* Sat Aug 02 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.5.4
+- work around rpmbuild more strict syntax checker
+
+* Tue Feb 12 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.5.3
+- rebuilt for gcc 4.3.0
+
+* Wed Dec 5 2007 lonely wolf <wolfy at nobugconsulting.ro> 2.61-11.5.2
+- rebuilt for newer openssl
+- fix usage of disttag for compatibility with mock + el3
+
+* Wed Oct 24 2007 lonely wolf <wolfy at nobugconsulting.ro> 2.61-11.5.1
+- adds back /usr/sbin/sendmail provides, rpmbuild by default does not add it
+
+* Wed Oct 24 2007 lonely wolf <wolfy at nobugconsulting.ro> 2.61-11.5
+- fixes https://bugzilla.redhat.com/show_bug.cgi?id=235594 by removing MTA
+  and smtpdaemon provides, as the packages which required those were fixed
+
 * Tue Oct 16 2007 lonely wolf <wolfy at nobugconsulting.ro> 2.61-11.4
 - includes patch from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=340803
   replacing md5 from RSA with a version released under GPLv2+



From wolfy at fedoraproject.org  Fri Sep 12 19:29:21 2008
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri, 12 Sep 2008 19:29:21 +0000 (UTC)
Subject: rpms/ssmtp/EL-5 ssmtp-md5auth-non-rsa, 1.1,
	1.2 ssmtp-password-leak.patch, 1.1, 1.2 ssmtp.spec, 1.10, 1.11
Message-ID: <20080912192921.117C170131@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/ssmtp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3500

Modified Files:
	ssmtp-md5auth-non-rsa ssmtp-password-leak.patch ssmtp.spec 
Log Message:
* Fri Sep 12 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6.1
- use conditionals to consolidate specs for Fedora and EPEL



Index: ssmtp-md5auth-non-rsa
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/EL-5/ssmtp-md5auth-non-rsa,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp-md5auth-non-rsa	17 Oct 2007 00:22:53 -0000	1.1
+++ ssmtp-md5auth-non-rsa	12 Sep 2008 19:28:50 -0000	1.2
@@ -7391,38 +7391,3 @@
  
  	for (i = 0; i < MD5_DIGEST_LEN; i++) {
  		digascii[2 * i] = hextab[digest[i] >> 4];
-diff -Nupr ssmtp-2.61.orig/ssmtp.c.orig ssmtp-2.61/ssmtp.c.orig
---- ssmtp-2.61.orig/ssmtp.c.orig	2007-10-17 02:20:25.000000000 +0300
-+++ ssmtp-2.61/ssmtp.c.orig	2007-10-17 02:29:11.000000000 +0300
-@@ -708,6 +708,10 @@ void header_save(char *str)
- 		else if(strncasecmp(ht->string, "Bcc:", 4) == 0) {
- 			p = (ht->string + 4);
- 			rcpt_parse(p);
-+                        /* Undo adding the header to the list: */
-+                        free(ht->string);
-+                        ht->string = NULL;
-+                        return;
- 		}
- 		else if(strncasecmp(ht->string, "CC:", 3) == 0) {
- 			p = (ht->string + 3);
-@@ -1406,6 +1410,7 @@ int ssmtp(char *argv[])
- 	struct passwd *pw;
- 	int i, sock;
- 	uid_t uid;
-+	bool_t minus_v_save;
- 	int timeout = 0;
- 
- 	outbytes = 0;
-@@ -1522,7 +1527,12 @@ int ssmtp(char *argv[])
- #ifdef MD5AUTH
- 		}
- #endif
-+		/* We do NOT want the password output to STDERR
-+		 * even base64 encoded.*/
-+		minus_v_save = minus_v;
-+		minus_v = False;
- 		outbytes += smtp_write(sock, "%s", buf);
-+		minus_v = minus_v_save;
- 		(void)alarm((unsigned) MEDWAIT);
- 
- 		if(smtp_okay(sock, buf) == False) {

ssmtp-password-leak.patch:

Index: ssmtp-password-leak.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/EL-5/ssmtp-password-leak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp-password-leak.patch	9 Dec 2006 17:54:50 -0000	1.1
+++ ssmtp-password-leak.patch	12 Sep 2008 19:28:50 -0000	1.2
@@ -1,6 +1,6 @@
 --- ssmtp-2.61.redhat/ssmtp.c	2006-12-08 01:25:35.000000000 +0200
 +++ ssmtp-2.61.debian/ssmtp.c	2006-12-08 01:24:25.000000000 +0200
-@@ -1404,6 +1406,7 @@
+@@ -1406,6 +1404,7 @@
  	struct passwd *pw;
  	int i, sock;
  	uid_t uid;
@@ -8,7 +8,7 @@
  	int timeout = 0;
  
  	outbytes = 0;
-@@ -1520,7 +1523,12 @@
+@@ -1522,7 +1521,12 @@
  #ifdef MD5AUTH
  		}
  #endif


Index: ssmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/EL-5/ssmtp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ssmtp.spec	17 Oct 2007 00:26:05 -0000	1.10
+++ ssmtp.spec	12 Sep 2008 19:28:50 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	11.4%{?dist}
+Release:	11.6%{?dist}.1
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPLv2+
@@ -16,8 +16,13 @@
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=340803
 # replaces RSA's md5 with a GPL compatible implementation
 Patch6:		%{name}-md5auth-non-rsa
+Patch7:		%{name}-unitialized-strdup.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:	MTA smtpdaemon %{_sbindir}/sendmail 
+#hack around wrong requires for mutt and mdadm
+%if 0%{?rhel}
+Provides:	MTA smtpdaemon
+%endif
+Provides:	%{_sbindir}/sendmail 
 Requires(post):	%{_sbindir}/alternatives
 Requires(preun):	%{_sbindir}/alternatives
 BuildRequires:	openssl-devel
@@ -35,24 +40,25 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 
 %build
 #on RHEL3 krb5 is somewhere else
 #test -e /usr/include/krb5.h || CPPFLAGS="-I/usr/kerberos/include"
 #CPPFLAGS=$(pkg-config --cflags-only-I openssl)
-%if "0%{?dist}" == "0el3" 
+%if "0%{?dist}" == "0.el3" 
 	%define cppflags -I/usr/kerberos/include
 %endif
 %configure --enable-ssl --enable-md5auth --enable-inet6
-%if "0%{?dist}" == "0el3" 
+%if "0%{?dist}" == "0.el3" 
 	make %{?_smp_mflags} CPPFLAGS=%{cppflags}
 %else
 	make %{?_smp_mflags}
@@ -115,6 +121,30 @@
 
 
 %changelog
+* Fri Sep 12 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6.1
+- use conditionals to consolidate specs for Fedora and EPEL
+
+* Thu Sep 11 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6
+- patch to fix CVE-2008-3962 (courtesy https://bugs.gentoo.org/127592)
+- cleanup of other patches, make build with fuzz=0
+
+* Sat Aug 02 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.5.4
+- work around rpmbuild more strict syntax checker
+
+* Tue Feb 12 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.5.3
+- rebuilt for gcc 4.3.0
+
+* Wed Dec 5 2007 lonely wolf <wolfy at nobugconsulting.ro> 2.61-11.5.2
+- rebuilt for newer openssl
+- fix usage of disttag for compatibility with mock + el3
+
+* Wed Oct 24 2007 lonely wolf <wolfy at nobugconsulting.ro> 2.61-11.5.1
+- adds back /usr/sbin/sendmail provides, rpmbuild by default does not add it
+
+* Wed Oct 24 2007 lonely wolf <wolfy at nobugconsulting.ro> 2.61-11.5
+- fixes https://bugzilla.redhat.com/show_bug.cgi?id=235594 by removing MTA
+  and smtpdaemon provides, as the packages which required those were fixed
+
 * Tue Oct 16 2007 lonely wolf <wolfy at nobugconsulting.ro> 2.61-11.4
 - includes patch from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=340803
   replacing md5 from RSA with a version released under GPLv2+
@@ -129,9 +159,6 @@
 * Fri Aug 3 2007 lonely wolf <wolfy at nobugconsulting.ro> 2.61-11.2
 - license clarification
 
-* Fri Apr 20 2007 lonely wolf <wolfy at nobugconsulting.ro> 2.61-11.1.el5.1
-- rebuilt
-
 * Sun Dec 10 2006 lonely wolf <wolfy at nobugconsulting.ro> 2.61-11.1
 - fix double %%changelog entry
 



From pkgdb at fedoraproject.org  Fri Sep 12 19:29:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 19:29:51 +0000
Subject: [pkgdb] ql2500-firmware was added for spot
Message-ID: <20080912192951.87708208D9A@bastion.fedora.phx.redhat.com>

spot has added Package ql2500-firmware with summary Firmware for qlogic 2500 devices
spot has approved Package ql2500-firmware
spot has added a Fedora devel branch for ql2500-firmware with an owner of spot
spot has approved ql2500-firmware in Fedora devel
spot has approved Package ql2500-firmware
spot has set commit to Approved for packager on ql2500-firmware (Fedora devel)
spot has set build to Approved for packager on ql2500-firmware (Fedora devel)
spot has set checkout to Approved for packager on ql2500-firmware (Fedora devel)
spot has set commit to Approved for uberpackager on ql2500-firmware (Fedora devel)
spot has set build to Approved for uberpackager on ql2500-firmware (Fedora devel)
spot has set checkout to Approved for uberpackager on ql2500-firmware (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ql2500-firmware



From spot at fedoraproject.org  Fri Sep 12 19:30:04 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 19:30:04 +0000 (UTC)
Subject: rpms/ql2500-firmware - New directory
Message-ID: <20080912193004.2BA7670131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ql2500-firmware
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsZw3854/rpms/ql2500-firmware

Log Message:
Directory /cvs/extras/rpms/ql2500-firmware added to the repository




From spot at fedoraproject.org  Fri Sep 12 19:30:04 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 19:30:04 +0000 (UTC)
Subject: rpms/ql2500-firmware/devel - New directory
Message-ID: <20080912193004.6622F70136@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ql2500-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsZw3854/rpms/ql2500-firmware/devel

Log Message:
Directory /cvs/extras/rpms/ql2500-firmware/devel added to the repository




From pkgdb at fedoraproject.org  Fri Sep 12 19:29:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 19:29:53 +0000
Subject: [pkgdb] ql2500-firmware (Fedora, 9) updated by spot
Message-ID: <20080912192953.E7651208D9C@bastion.fedora.phx.redhat.com>

spot added a Fedora 9 branch for ql2500-firmware
spot has set commit to Approved for uberpackager on ql2500-firmware (Fedora 9)
spot has set build to Approved for uberpackager on ql2500-firmware (Fedora 9)
spot has set checkout to Approved for uberpackager on ql2500-firmware (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ql2500-firmware



From pkgdb at fedoraproject.org  Fri Sep 12 19:29:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 19:29:53 +0000
Subject: [pkgdb] ql2500-firmware (Fedora, 8) updated by spot
Message-ID: <20080912192953.F4223208D9F@bastion.fedora.phx.redhat.com>

spot added a Fedora 8 branch for ql2500-firmware
spot has set commit to Approved for uberpackager on ql2500-firmware (Fedora 8)
spot has set build to Approved for uberpackager on ql2500-firmware (Fedora 8)
spot has set checkout to Approved for uberpackager on ql2500-firmware (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ql2500-firmware



From spot at fedoraproject.org  Fri Sep 12 19:30:05 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 19:30:05 +0000 (UTC)
Subject: rpms/ql2500-firmware Makefile,NONE,1.1
Message-ID: <20080912193005.6E25E70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ql2500-firmware
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsZw3854/rpms/ql2500-firmware

Added Files:
	Makefile 
Log Message:
Setup of module ql2500-firmware


--- NEW FILE Makefile ---
# Top level Makefile for module ql2500-firmware
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From spot at fedoraproject.org  Fri Sep 12 19:30:05 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 19:30:05 +0000 (UTC)
Subject: rpms/ql2500-firmware/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080912193005.A7BA770131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ql2500-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsZw3854/rpms/ql2500-firmware/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ql2500-firmware


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ql2500-firmware
# $Id: Makefile,v 1.1 2008/09/12 19:30:05 spot Exp $
NAME := ql2500-firmware
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From wolfy at fedoraproject.org  Fri Sep 12 19:31:55 2008
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri, 12 Sep 2008 19:31:55 +0000 (UTC)
Subject: rpms/ssmtp/EL-4 ssmtp-md5auth-non-rsa, 1.1,
	1.2 ssmtp-password-leak.patch, 1.1, 1.2 ssmtp.spec, 1.9, 1.10
Message-ID: <20080912193155.C517E70131@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/ssmtp/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4256

Modified Files:
	ssmtp-md5auth-non-rsa ssmtp-password-leak.patch ssmtp.spec 
Log Message:
* Fri Sep 12 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6.1
- use conditionals to consolidate specs for Fedora and EPEL
- fix CVE-2008-3962
- cleanup patches



Index: ssmtp-md5auth-non-rsa
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/EL-4/ssmtp-md5auth-non-rsa,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp-md5auth-non-rsa	17 Oct 2007 00:18:13 -0000	1.1
+++ ssmtp-md5auth-non-rsa	12 Sep 2008 19:31:25 -0000	1.2
@@ -7391,38 +7391,3 @@
  
  	for (i = 0; i < MD5_DIGEST_LEN; i++) {
  		digascii[2 * i] = hextab[digest[i] >> 4];
-diff -Nupr ssmtp-2.61.orig/ssmtp.c.orig ssmtp-2.61/ssmtp.c.orig
---- ssmtp-2.61.orig/ssmtp.c.orig	2007-10-17 02:20:25.000000000 +0300
-+++ ssmtp-2.61/ssmtp.c.orig	2007-10-17 02:29:11.000000000 +0300
-@@ -708,6 +708,10 @@ void header_save(char *str)
- 		else if(strncasecmp(ht->string, "Bcc:", 4) == 0) {
- 			p = (ht->string + 4);
- 			rcpt_parse(p);
-+                        /* Undo adding the header to the list: */
-+                        free(ht->string);
-+                        ht->string = NULL;
-+                        return;
- 		}
- 		else if(strncasecmp(ht->string, "CC:", 3) == 0) {
- 			p = (ht->string + 3);
-@@ -1406,6 +1410,7 @@ int ssmtp(char *argv[])
- 	struct passwd *pw;
- 	int i, sock;
- 	uid_t uid;
-+	bool_t minus_v_save;
- 	int timeout = 0;
- 
- 	outbytes = 0;
-@@ -1522,7 +1527,12 @@ int ssmtp(char *argv[])
- #ifdef MD5AUTH
- 		}
- #endif
-+		/* We do NOT want the password output to STDERR
-+		 * even base64 encoded.*/
-+		minus_v_save = minus_v;
-+		minus_v = False;
- 		outbytes += smtp_write(sock, "%s", buf);
-+		minus_v = minus_v_save;
- 		(void)alarm((unsigned) MEDWAIT);
- 
- 		if(smtp_okay(sock, buf) == False) {

ssmtp-password-leak.patch:

Index: ssmtp-password-leak.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/EL-4/ssmtp-password-leak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp-password-leak.patch	8 Dec 2006 00:09:53 -0000	1.1
+++ ssmtp-password-leak.patch	12 Sep 2008 19:31:25 -0000	1.2
@@ -1,6 +1,6 @@
 --- ssmtp-2.61.redhat/ssmtp.c	2006-12-08 01:25:35.000000000 +0200
 +++ ssmtp-2.61.debian/ssmtp.c	2006-12-08 01:24:25.000000000 +0200
-@@ -1404,6 +1406,7 @@
+@@ -1406,6 +1404,7 @@
  	struct passwd *pw;
  	int i, sock;
  	uid_t uid;
@@ -8,7 +8,7 @@
  	int timeout = 0;
  
  	outbytes = 0;
-@@ -1520,7 +1523,12 @@
+@@ -1522,7 +1521,12 @@
  #ifdef MD5AUTH
  		}
  #endif


Index: ssmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/EL-4/ssmtp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ssmtp.spec	17 Oct 2007 00:18:13 -0000	1.9
+++ ssmtp.spec	12 Sep 2008 19:31:25 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	11.4%{?dist}
+Release:	11.6%{?dist}.1
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPLv2+
@@ -16,8 +16,13 @@
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=340803
 # replaces RSA's md5 with a GPL compatible implementation
 Patch6:		%{name}-md5auth-non-rsa
+Patch7:		%{name}-unitialized-strdup.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:	MTA smtpdaemon %{_sbindir}/sendmail 
+#hack around wrong requires for mutt and mdadm
+%if 0%{?rhel}
+Provides:	MTA smtpdaemon
+%endif
+Provides:	%{_sbindir}/sendmail 
 Requires(post):	%{_sbindir}/alternatives
 Requires(preun):	%{_sbindir}/alternatives
 BuildRequires:	openssl-devel
@@ -35,24 +40,25 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 
 %build
 #on RHEL3 krb5 is somewhere else
 #test -e /usr/include/krb5.h || CPPFLAGS="-I/usr/kerberos/include"
 #CPPFLAGS=$(pkg-config --cflags-only-I openssl)
-%if "0%{?dist}" == "0el3" 
+%if "0%{?dist}" == "0.el3" 
 	%define cppflags -I/usr/kerberos/include
 %endif
 %configure --enable-ssl --enable-md5auth --enable-inet6
-%if "0%{?dist}" == "0el3" 
+%if "0%{?dist}" == "0.el3" 
 	make %{?_smp_mflags} CPPFLAGS=%{cppflags}
 %else
 	make %{?_smp_mflags}
@@ -115,6 +121,30 @@
 
 
 %changelog
+* Fri Sep 12 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6.1
+- use conditionals to consolidate specs for Fedora and EPEL
+
+* Thu Sep 11 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6
+- patch to fix CVE-2008-3962 (courtesy https://bugs.gentoo.org/127592)
+- cleanup of other patches, make build with fuzz=0
+
+* Sat Aug 02 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.5.4
+- work around rpmbuild more strict syntax checker
+
+* Tue Feb 12 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.5.3
+- rebuilt for gcc 4.3.0
+
+* Wed Dec 5 2007 lonely wolf <wolfy at nobugconsulting.ro> 2.61-11.5.2
+- rebuilt for newer openssl
+- fix usage of disttag for compatibility with mock + el3
+
+* Wed Oct 24 2007 lonely wolf <wolfy at nobugconsulting.ro> 2.61-11.5.1
+- adds back /usr/sbin/sendmail provides, rpmbuild by default does not add it
+
+* Wed Oct 24 2007 lonely wolf <wolfy at nobugconsulting.ro> 2.61-11.5
+- fixes https://bugzilla.redhat.com/show_bug.cgi?id=235594 by removing MTA
+  and smtpdaemon provides, as the packages which required those were fixed
+
 * Tue Oct 16 2007 lonely wolf <wolfy at nobugconsulting.ro> 2.61-11.4
 - includes patch from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=340803
   replacing md5 from RSA with a version released under GPLv2+



From spot at fedoraproject.org  Fri Sep 12 19:35:52 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 19:35:52 +0000 (UTC)
Subject: rpms/ql2500-firmware/devel LICENSE, NONE, 1.1 import.log, NONE,
	1.1 ql2500-firmware.spec, NONE, 1.1 ql2500_fw.bin_mid, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080912193552.4F52A70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ql2500-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5106/devel

Modified Files:
	.cvsignore sources 
Added Files:
	LICENSE import.log ql2500-firmware.spec ql2500_fw.bin_mid 
Log Message:

initial commit



--- NEW FILE LICENSE ---
Copyright (c)  2003-2006 QLogic Corporation
QLogic Linux Fibre Channel HBA Firmware

You may redistribute the hardware specific firmware binary file
under the following terms:

	1. Redistribution of source code (only if applicable),
	   must retain the above copyright notice, this list of
	   conditions and the following disclaimer.

	2. Redistribution 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 QLogic Corporation may not be used to
	   endorse or promote products derived from this software
	   without specific prior written permission

REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE,
THIS PROGRAM IS PROVIDED BY QLOGIC CORPORATION "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.

USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT
CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR
OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT,
TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN
ANY OTHER QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN
COMBINATION WITH THIS PROGRAM.


--- NEW FILE import.log ---
ql2500-firmware-4_04_04-1_fc10:HEAD:ql2500-firmware-4.04.04-1.fc10.src.rpm:1221247936


--- NEW FILE ql2500-firmware.spec ---
Name:		ql2500-firmware
Summary: 	Firmware for qlogic 2500 devices
Version:	4.04.04
Release:	1%{?dist}
License:	Redistributable, no modification permitted
Group:		System Environment/Kernel
Source0:	ftp://ftp.qlogic.com/outgoing/linux/firmware/ql2500_fw.bin
Source1:	ftp://ftp.qlogic.com/outgoing/linux/firmware/LICENSE
Source2:	ftp://ftp.qlogic.com/outgoing/linux/firmware/ql2500_fw.bin_mid
URL:		ftp://ftp.qlogic.com/outgoing/linux/firmware/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

%description
Firmware for qlogic 2500 devices.

%prep
%setup -n %{name} -c -T
cp %{SOURCE0} .
cp %{SOURCE1} .
cp %{SOURCE2} .

%build
# Firmware, do nothing.

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/lib/firmware/
install -m0644 ql2500_fw.bin ql2500_fw.bin_mid $RPM_BUILD_ROOT/lib/firmware/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc LICENSE
/lib/firmware/ql2500_fw.bin
/lib/firmware/ql2500_fw.bin_mid

%changelog
* Fri Aug 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 4.04.04-1
- Initial package for Fedora


--- NEW FILE ql2500_fw.bin_mid ---

?B
??Y?
X H?WXL
k
??J?
HR?`?
`
Y??
Y??
Y??
IgP{Y?
HP
??1??
??
?
??Y?
?!?>?])??)?V?&?WB?
X

 
@?<Ax@
?
@B
?
@
?
?

H
?
)??L
)??L
)??????
0
??
pHP}`

??
B8
Y?
Ik?W?^?@AjX
IzX????UB
Jp?
d?Jp??
Y?
?Y?
?dp?`??
?2e


???
??
?
Y0?
&H`
d#p?
?
B
k??`B
d
?/@
Y4
S
??
???$??%
?

@H?WB
Y?? d?
Y? ?P.

Y?(!?-
??:
?Y?
?

P 
d#p?
?
B
?
?P
Y,0Y08Iz`Iz`H`H`H
`H`?@H`
X8
?P
H`H"`
?
`Y,
?
X?	?
?
???\
??
`x
??
?
???dp?
?
???Y,?
?P
H
`H`H`\X
?P
H
`H`Iz`????

H"`H*`H?WH3?WH#?WH+?W?
Y,
?
bY,	?

X?X?X?
H
H(H(Y?
@
?P
?
?
?
?
?
?
?
?
?
?
?
?
?P @
H"`H*`?
??
?
?P
	\
XX<	X<
??
XHXY?
??`?H`x
??`
?`?H`x
G\
v?`??Hc?WLX
p?d
lLX
\X\
X\
XX\
XH??`
?

@

Y0x
X<
?
ZI/?WL0
?
J?
?
?
?
?
?
?
?
?
?
?
?
?
?
?
???
H?W
?
A???l?
<H?




????H?V`? 

????H?V
?

j?
W??`L\
eY?

?O?\<T?\
?J??
@H??
?
?
?
X?
?
Y?
a 
%?{
Y?
??
?
?B?NY?O?	?
?
?"???A??
M 

Y?5?

ah
??
??
??
??
??x??
??

??
Y?
d+PUI{PKY?
??F
?
??
??
??


??
??
??
\
?
?\?@?2
??X?@
?
?
??S?P?@
?
?
?X?0
?
?
?
??0?P?pH?
`
?
?
@
?
?
?

@?
@H?
?
?
?
?

0
?Y???
2?@H??H??
?

Y??

??? ?


???
?
?F
?

?
`? 
`?
HPZHP[H#P\
?


`8????? `8?????
`8?????`8?????
`8?????`8	
@? 
@?
@?
?????
?I\
?a\
???
?
?
?
?
?
???
?
?
?
?
?
?
?
fw
?2a<
?SCFQ


??

1??ddAzx
p
?
%??
?.Y?
H+?W?l?
X(?

?\?
?!?d?
?
?
?
?\?
I&`ddAzx
??
?
??I#PI#?WY$
p
\?
?
??
?h
??
?,
Iz`	I&`Azx

??
Y?

??F?
A\h
 



`@?

X?

?
?????T?`4?
?	??@?
?
Y??	??
@Y?
?
UB
Y??	??
@Y?
?
9B
Y????@Ax
Y????@Ax


??
?i
?
\X
?
?
?0???Az`
?3d
??a?
??
??
? =
??
L
????\


?
?

"?
?
?
?
?e
Y??
@H?WY?
Y??
@H?W
?T?l??IY?Y??
Y??

HxHxIxxY?	?
H
HB?!?HDY?
HHx
@?`
?	?HD
X<
??

?	?

X?XX?
Y??
@`
?
??
??
H?W@`

??

???
\
?
	??a@Y?
?	??
@Y?Y????@Y?Y?	???@Y?	Y?"
?!??%@9?}?7????l?
Y?
???	?Y?Y??
?6
bJd
??
Y??
??
bJd
Y????HB	I_D	Y?
Y?
?P?
AxH


@

@H?-a??Y?
????
?
????
?
????
?
????
?
????
?@ 

Y?
????
??

X?
Y???,?`?
?	?????????
X?
??
X?
??????Y?Y????@Y?Y????@?
X?
?
X?XX?
?	
X?
H
??5
X?XX?
X?XX?
X?XX?
X?XX?

?
?


?!
?`?
X?
?BH
FY??

H?
JHL

@HJ
zH???
H??Y??
L
L
HH
L?
(???
?????
:H??\
??	??Y?
HP??LY?
?
X?XX?
0??
J
??
HY??
H?.\?&L?@
X?
?
9w
?
?
?
	?P?kLX
?

X?X
X?

?	??
?
?=?
???
X?
`?

H??Y?
 H??H??I{PQ`?
?	??
@H?Y?	Y?
	?	??
@H?d
?

??
	??

?	?

?	?
Y?
HDH]?Y?
??HBd+D\
X?
	?
?\?(?F?

?	?

?	?
Y?
HDH]?Y?
??HBd+D\
X?
@?
??@??4<D0
?	??
@H?Y?	Y?
	?	??
@H?d
?

?#
??

?	?

?	?
??HBd+D\
X?

X?XX?
Y?8??
???IG@
HhY,
X?X
X?
X?X
X?

?X?
HX
?,I/?WH?W
?
\X
?????H?@?
Y?

??IzZIzXJ\
?>?Y???L
B
? 
?
??`l
??
`\p?P8h
@H?
?
?X?@??I{PB
H?`
?

Y?
Y?
A
?cd?PI{PB
#?
?

?
Y$
B
@HH@
Y?

B
@HH@
Y?

@HH@
Y?
Y?
Y?
@HH@
?vY?
?Y?
@?
@?
?6H?V???I{PI{P
?
?Y?
B
B
?I{PY?
Y?
?

?
?
@
@
?
?
2Y?
B
x
x
x
?H?VB
x
?
H?VB
x

IFl?]@
\X

?
?$
??

Y4?


?H?W??@
?
?
?
I.`	d*dap



!?	I.`	dd? 

?
?
@?
THh
Azx
p
? 
?
@?
T
??
Hh
I&`I6`
!??I.`	ddAzx

Y4
j
\
??`
??`
?
IzhIzhIzhL
L
?
?

j
?]@?VY6`?2a?
Ld

HP8?X??
	?
Y??
@Y?#?ZHR#Y4
?
????4?`?
?4?`?

?

?Y4
??
??
Hj
??\
??Y?H?WHjY?
H?WHlY4
H?WH?WH?WY? ?%
?
j
?]@
A,?
IzXdXIJXINX?,`8?
?]@

?X
?O
?

???IzX
?L?
?
?]@
dXIzX?,`@?
?.Y?
??i?
X
l
?
P
P
P

?

#?
Y0X
#?
j
??
?
l?
P
?

?
?

?Y?
HHj
?
?a??L
Y.??
?
?
?
?Y$
?M,
8
?
?
(

?
?
p
`
`

!??I.`	I2X	?6i?
``
?6i?
?
Y,?
Y,
????I.`	aRp
?
??
?
?
`@
?!?
??

???
??
??

?
??{
?

???
A
?` 
` 
??
?
H?
	?@
Y???????
?
?!???
?Y1?#X?@
X?
?
?



@HX
@HX
C
?




?F\?
?8\?
??I{??B
???l
?

??,Y???
?
??
?X
?
????\

`"x
`0

Y?
Y?
H??X
H??X
????J?
?/H?VJ?
???B


H?d???

a??	?r??Y?

 

?
?

?
??
?
?
@

@
?
?@

@

XY,IzX
I/?WB

?
?
?
??3
?F?
	H?WY.D?"A??
I3?W?0?????
Y?
<d?dY,?
HdY,
HbdbB
?

?p
?? 
??
??
??}
b
?


I&`I2X
dddb

L
X
Z
?0?????????
Y0??
Y0
Z
@
?d??B`
?4?
Y4
?	?
?	?

?
dZJZ
D(
?,
?Z
Y,
C
dd
@
?
?
?
???M,
M,
	Az`
I/?WA-?
\X
\
? ?
P<
@



DHJ
x
?l?
\I"Z???d\I"Z???I#?WMD
?
x
?!??ddI6`
I&``??

????ddI6`
I&``,
E
J?

?
?
?
?
\
?\
\
? 
XIC?WH?WH?W
??
X
`?
?
Ixp
Ixp
?
Ixp??
?]@
ZJZ
?
`
X8
@
?
@
Ixp
IxpY,?
IzXIzXIzX
IzXJX
HHPI{?0?
@


??

??
HbY?
?
?
?
?
?

?

pH?2Y??
LH?Y?
?
?
? 
?!
?R
?
?P
?
?
?
?

?$

?S
?
?a
?`%?
?`
?T
j
?U
p
?x
?
?c

?V

?W
?}
"
??


?8?
ddY?Hb?8?
ddY?Hbd&dd&dJb
?
? 
?
?!
?

HbY?
?
?

?
I&`I6`
??ddY?Hb
??
?6i?
Y?
HbY0?
?6i?

Y?
HbY0?
`"p

??????

Izd??d
dd"b`"p

???g??
??ddY?Hb`p
Hb`&p

?o
Hb`*p

?X

?Y?Y?
Y?y?
0?
?
0?
?
L
@h
Y??
Y?*
??\
@\ 
@\ 
?d??
Y4
X
X`*?-

`H`X\8
X
?

dd>bd`	?5L
P???H?VAx 
`
I:dd>bY?


X

????@?
X
?6i?

?????

?
?`
?T
?
#?
?

?


?R
?
?P
???

?
?R



?e
?^
?H
?A
? 
DH`
?
@
J\
@
@
?P?
@?
????
Y????Y?
?	?
@
??IgP
IgP{Y??
Ad

?Y?
?m@??Y4?
Y?
dd`p
Y,
@
J
??
Jx?
?J
?
?J
?
?J
?
?Jx
?Jx
RH`X?

@?
RH`Iz`
?	?
M4
?
 H`a&p

??\?
?
?^
?
?)
?[
?Y?
?
?K
?
?-?
?
?G\?

?/Y0
?

?
H?V`
Jp?
@Y?

??
M,
Y0


?
BH
Y?
??
?4?
Y?
\?
g?
W?
9?
.?
x
???0

\x
t?PH?@Y?L
\
?
`
?*
?
?
??
???2a?
Y,	?
?
Y?
?
??B

I{Y?

?
CI/?VY2h
?6i?
I,	??H

X0
X2`?0
?
X2`J
???
???H?W
?
Z
P?
K?
H
?Y,
H
?	Y,
Iy?Y,
?

H
?Y,
Y$
?
?

?

Y$
?
Y??H?Y?#?

?7Y?
Y$
H?Iy?Iy?Iy?Iy?Y?

?
?+

?}
?
#?
0
Y$
H?Iy?Iy?Iy?Iy?Y4

Y?
`

??J
?

?Y0?

?

?
?




`
`
?


?
?
P
Y6?H?W
?

Iy?Iy?Iy?
Iy?Iy?Iy?`,
Y?
Iy?Iy?Iy?
` 


Iy?Iy?Iy?	Iy?	Iy?`
?B
X
??

?
?B
YY?>
?
?
H?Y2HY$Y0
X?
?	
?H
?H	?	
?

??

@?
Y?
?
X

?
X
Y?
?`
B
???
J
??
HY?#?

FH?Y?
?`
Y$
Y0H?W?
?
?
?
x`??
?~
?
x`??
?k
?
?

?
H??0.

?
Y?
(
??I?h?Hh?Y?
????
?

?Iz`	Y,?
H
`	dddbJd
R
H
dJb
?
?
?
?
?
Y0 H?W?	?
?
?
M0
`
\	Y,H\
Y,
HZY,
HX
?
?\?
??HX
dVZY,?
?j
?!@0
?e?4????
Y
@
XY,? @H\
?I"\?
??@HXY,
?
??
?
` ?
??,???
?\
X?XJZ
?
Y0	?	?

X?XX?

X?XJZ
?

E???*?

6???
?Y0	???
0H
HZ
HX\
XHXA,

?
\??
Y.D?"AY0
	??ddI.`	YYH`H
`M8

Hj
?

?
`?
	??I?g
?
??Iz`	\?
dB
??

M0
Y
Y,H?WH?W????Y?
H?WH8H8B
I6`
	??ddB

?
`?
	??c??
?
??Iz`	\X
dB
`?
???Y4"
h
?%BHj
Iz`	dddd`0

?
Y4
#?
@HR#????k
?
?

?	??
b	??
X?
?
?
???
???
?L?
??M?
??-?
????
??i?
??>?
????
????
????
???
????
?
??
?*?
?
?
??
k
??L

?I&`I6`
Iz`	ddddY$


??Ax
???`@
HHPI{?0?pH?2Y??
LH??/Y?#?
????Y?
I6`
??
d??9???`
??`
Y?
\
	?B
<\`
d`0

??\?
d????,
?
?

???D`??
?

#?
PY?
HR#HT#??
HP8??\

`?
?
?

A
?
 ?[
Y,	?
PH\	


?IzbY0
XH\	?5
Y0H\?S
x

Ax
HX?
\
\HX?
?HX
??\
???H?WH?W?
??
IzbY2X	Y,	Ax(
XH\	Ax0
I3?WY0H\??
bed@\
Y0
bY?
Y,	?
PH\	
HbY0	Ix
IxX	?XH	
?
?
DHdIzb????8???Y?
HbY?Y,?
IzX?
Ax 
Ax
HX?
?=RH|	JZ
X<X<X<"	H\H
XHZ	????
bY,$	Y0I3?WH?WY,?
Y,
Y0
@?Y0H\HXJZ
??
X<X<
???H?WY,x
Y0Y,?
X<
X
Ixx
`p
Y????????H??WX?
dY0?H
`L
?
\X
I/?W
dZJZ
`
?
?Y0
H\	dZ??D?
dZ?	?
?
HX?
`p
?I3?WY???
?4?
:Jd
?O??D\X
Y0H?W?
?
?
?
??8?
{I;?W??h??pI3?W
???
?o
??
IBZ
??
d:bY?
d:bY?
?8?
?
?'Y0
??

HbI6`
???I&`
??ddB
H?WH`
X\H?WHdX\
H?WHbX\
H?WHbX\H?WHdX\
H?WHbI` 
??B
?\X
M,
?\
?\
?

?
	?
T??\?
??G\X

?
Y?
x
Y2X	Ax
??
@X
	?
?
?r
Y0
?
?
???\h
?a
?
?
Jd
dB
?Y0
?X?
?
??
?dZ
?
?
???????
?f
?
?a
????;B
?\
?
?XM4
Y0?

??

?
???\X
?yB
?L\
I&`
?%M0

??Y0?
dB

?
??	??
Y?y?
I.`	ddY4H`?
???M@
\?
??AI&`
?AddI.`	M8
H?`#I6`
??/I&`
?/ddI.`	M8
??I&`
?ddI.`	M8


?I/?WI3?WY,?
???I&`
??ddI.`	M8
???I&`
??ddI.`	M8
?
?
?
?
?
?
?

??H?`#ddI.`	M<
Y?
??????
b??
Y04??
b
?
?
?
bY0
Y4
@
?Y?
Hb?
BHd
?
Y4
??\I&`
?\Y?

?Y,	?
Y,	?
??O\X
?
:?
H?W?
?
I6`
ddd?ddbB
?
?
?s???

?
??
?\X

X
??
?
ddbY?
HP;`
???ddI.`	`$
???
??L`
XAzx
???ddI.`	M8
?????Y,??,?
?GY.X
?.Y???Y1?#X?@
X?XJZ
?
Y0??
??
??
Y0
??
?
???
?
I.`	??I&`
?
IBZ???Y.?Y,B? 
?\
Y4
?@?@
Ax?
Y,?
I&`I6`
???ddI.`	`,
??
??;?????
??=ddM<
??$`

?

VHJ
x
?X

d`(
?
bY?
?????5Y0?
?
?
I7?W???dFX
?I7?W???dBXd?ZdX
?
?u
???
??
IzXIzX??
X
??H
Y,
H
`
X
??~

???M<
`?
h
?%B?%Hj
?
b
?
X
bA,
X	?
A,
XB
?
X8
\
@
IzXIzXJX
@
H
Z
?

?d?
?
?Y0?
?
?
?
?
?
?
?
?
?
?
?
?
?
?
?Y0?
?
?Y0?
?
dB
?
Y?
??*Y?
'?
"?<
dB
??z?
?
??
Y?? A??9????	?dbAx(
?
?5?
Y??
Ax
I:d
?T

d:d? 
Y???9I3?W`0
?
?
??

Y4?

?4?
?4?
??z
Y0?
?4?
b??


?

Y44

?
`?
Y?8
?
L
`$0
\
Y?Y???
Y?
?
?
?85?



















































??????
b
?
LX

d???L?
HbX4
H`
X4H`??6ddB
?
???Y4

d???Y?
?8?
bY2h
Y4
`?

?
Y4
Y,?
b
?`?
b
?
X
?

?
@?
@?
@?

@?
M0
Jd
X
?
?!?
I;?W?8?
Y0	X
X
??fH^`
\
L
`,0
\
??
X?
#?
?	?
??

??`?
`?
`?
H?WY4
?
lY
H<\8
cIz` 
?
??
\
??
????
?H
X
XH\
?JX
????J\
HXH"XHXHZH\	IBZ	HZ??
e&Z	H
ZH\HZH\??

?

?
Z?
?
?

"?
?
?
?
\
?
???

?	?
Y4
?
?

Ax(
??
?
Y4
?
?

H?Wd?dd&dJb
IzX
Y0H\Y0H\Y?
XHZX
Y0H?W?
?
?
???M,
??????
?????
?
HbX4
H`
X4H`???

H`
X4H`??????@6`
X
bY0?
?
?
?
`?
?
?,?LX
X?8?
P
?
X
?????
#Y2HY$


dddb??q? 

??$
??P

H?WH'?W?

??
X

??
??!
??
???-??Y2X	dZ
0Y0???????L
X` 
?!???X` 

Y0?

Y$
?
Y?
?
?
Y,
?
?
?
?
?
?
?
?
?
?
?
?(

?

?
??



TP?
DP?
 ?7


X<(?
?=?@0
?=?@4
?=?@,
Y?
B
??
D
??
@HP?
?
k?
@

?



?

??Y4
l?
JZ

??
??Y4
l?

@H?WY?
??
?P@
X80Y08X8
Y,0Y08Iz`Iz`H`H`H
`H`?@H`

H?W?

H
`H`H`A,0
?P
H`H`?<}J@<
??
???$?

?????
k?
B?
>?

?
?
Y?
I??
H?@Y?
?

?,\?
Y?Y???
Y??
M,
Y??
?}@
'Y4
X?
?
@
I.`	?-
l???dj\X
dddb
????Y.D?"E

HbdZ?
@??IzX
Y?
?Y,
@??


?
?
?
?
??

??&?\?
?
?Y?H0
?(
S`
]`
\`
H????Y?
?
Ih
?
Y?	
????Y?
Y???????
SH?d?B?
]H?d?B?
@??
?
@
Y?	
?????$Y?
Y???????
??? 
SH?`
]H?d?B?
H0Y?
@
P
P
???????(?
P
 J0
IzX	?0?????
 X?0?
Y0??
"?Y,$I6`
I&`?
"LY$?

HbI.`	
?M?
?\?
?\?
?'?H(\
H
@
?@H(!
H( ?'?Y?
@
?@H(
H(?'?Y?
@
?@H($
@
?@H('
H(&?'?Y?)Y?
Y,
@
RH`Iz`
RY0
@H`X?
?
5?H?W??
???

e>Y0? ???

5H?W
?
?
?
Ez`
Y0?

?JZ
?	?
:	?HXH
\???Y4
l?
X??eY,?
Y0
@
?
X

T????8?
F\?8?
D]
?

B
B

?Y??Y??	Y??	?l

J??

?
?
J?

?Y??Y??Y???l
Y??
?l
Y??
?h
?


Ad
JD

?

?
Y??	?h??Y??	@l
?h??Y??
@l
Y?? ?h?0Y?? ?i

H??Y1pH??J
?
Xh??it?
@?h

?
Y0?Xm
?h??Y??
@l
?,?
Y???it?
?h?
B
Y0?Xl?
?,?
B
?h??
H??HW?J?0
I-
B
J?


?Y??Hi
?h??Y??
@l
X?pH?`H?\J`


Ax?
Hm
X?pH?`J`


Ax?
Hm
Iy@Iy@

?

?

?
@?qp@

?h??
HkD
?

@?qp@





?
X??
I7?W? 
?6i?
Y4??it?
X??/@p?
A4

?
X?@
A0

??@i?
A0

??@i?
B

??@i?
Y2X	I3?WIC?WI??WY0?Hk?WY0??l

??
?

?

?
?A0?
?<?
?6i?
A4

??B
Y4?AD

?
?
Y4?AD
Y4?AD

?
X?@

?	A1
Y1

?
?

?
Y0?@l

??B

?

?
?6i?
Y0??h??

?

?
Ad
@?`
?h??
Iz`	
??B


?

?C?.Y?
?@?`
J
?
??u

?

Jd
??u
Y4?


?
B

?tY2X
?

?

?

?

?

?

?,X?
?h?@B

?h??
@??

????

??
?
@?x
???p@
IG?WI7?W@?X

???

?IG?WJ

Ax?
JP5
 ?
JPK


Y???h?4Hk?
?
Y??(B

?

Y$?
 

?
IzZJ\

??u
Ax?


X??

??B
Ax?
@??


???:?
????0?
K????
0

?

y????

J
?PF
P
Jh?


?
lx

?\.?{?


0?

@????




H?z?y?
?Q?
?Q?

y????


?Q?

.P ?y?



??y?P???y\P???EPz
?????
y?P??\/????Q.@ ??

?
?

?w ?
?wI0

?
??K
`
????"








?
??
=?
???
/??????
??`u????	

 ?
???`P
?
}??/?	h
`u????"

>@
}??/?	h

?
??J$z
 ??#?
x

??
@
P

`
p
?
?
?0y?

???
@
P

`
p
?
?
?0y 


u????	
@
P

`
p
?
?
?0} 



?
??
=?
??
???m?y???
?#p/?




-



??
/?	
D?`

??/?9
PK
????	

?
`
H`?
#D 
Hp?
&D?
J



`

??/?	x

?
??/?x

??
/?	
??/?"
?
j?
`

??/?	y?

??/?
00


??/?	i?
????	

??
/?	x

??

????	
H??i???'x@


?!0
?
??/?
00

????	


????
x
????	

??G@h

??
` 
????	

????	



?




??x
 ?/?.\


 ?

??S?u0?u????C?
@
??*@d?Tp??S
?0D?*? *
??? C0 ?B000??O
?T?*?
??F@
??CD?*???*? ?uIT??@

~@
 ?A?/?t>t?B???/?t?t??"??>?)B???3????<t??d?"??????T"?????????"????"?????"????$??D"????88?:?99/?t:t??"??>?&??D??????t?"t??/??>%?t"?????
4%
u??S???0?u??C?? ???x????????S?x	S????u?????????????? ? ????C? ?
@ tt??/??>??>???/?>t?<????<??<@>p`Ea	?>?;@u???>?@8??8>??`>?9??99?!:>??????C?"p`Eal@'??	B?!A??<?"?@8??8<?`<??9=?99?:?<?!=??8?"?99?8::?8?!??"?9???
D????t??????0(?
??u@?? u?u????u????????????
??	P
??@?? ???(???u??T?@
?
???u?Tt"???????????????u??t??D?????T???????T????M??????u?????????D???uu?T???70??D
???u0??D
8??uD??D??0(?
9 u?T???: ??
???ut??T??????T??u???T?D?u?????pN?"?&????&??(????8$????pNd?)????&??(????D?T?$?d??pN
?
}d?
??C???S?"???%?2$?%4??????U?"??T??"?? T??"
{



DT?uU???-1 %?uu??
?8P
1  ??
??
!P1  ?
?P
??* %1?*??
?
$??B6`???ut66
c???_?

}X?5?Y?	??7"t??u6t??u6t??u6t??u6t??u6t??u6???uu6????u6????u66????uu6??????X?}Y?6
l?0??T??dp at dT?	???0?%?%?N?TN?T??+???x*?3?3????????*?+?3?x??3?????????????????????????????+???*???P
~??u?? ????&pW?W?V?
$??3???W??@?V ?
?
P??C?1???ueU1?p"1?"?&?????????9?A?@A???9?&???A at x?
|?
???u??T??D????u"???t???t?????pu4 ?uu??Pt4 t??%????4 ?0d?t`?%????"???*??????u7T???6??D=
&??B??AB$?@??u7??
t6??6&??"?S'?u*???
+
00??)???????
`?poRU??UF??U?"?@????????

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ql2500-firmware/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2008 19:30:05 -0000	1.1
+++ .cvsignore	12 Sep 2008 19:35:21 -0000	1.2
@@ -0,0 +1 @@
+ql2500_fw.bin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ql2500-firmware/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 19:30:05 -0000	1.1
+++ sources	12 Sep 2008 19:35:21 -0000	1.2
@@ -0,0 +1 @@
+e0eee74a60109539f1ea39c89ef05a92  ql2500_fw.bin



From wolfy at fedoraproject.org  Fri Sep 12 19:37:31 2008
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri, 12 Sep 2008 19:37:31 +0000 (UTC)
Subject: rpms/ssmtp/EL-4 ssmtp-unitialized-strdup.patch,NONE,1.1
Message-ID: <20080912193731.33F8370131@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/ssmtp/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5908

Added Files:
	ssmtp-unitialized-strdup.patch 
Log Message:
patch for CVE-2008-3962


ssmtp-unitialized-strdup.patch:

--- NEW FILE ssmtp-unitialized-strdup.patch ---
--- ssmtp-2.61/ssmtp.c.orig	2008-09-11 18:04:07.000000000 +0300
+++ ssmtp-2.61/ssmtp.c	2008-09-11 18:07:14.000000000 +0300
@@ -489,6 +489,11 @@ char *from_format(char *str, bool_t over
 				die("from_format() -- snprintf() failed");
 			}
 		}
+		else {
+			if(snprintf(buf, BUF_SZ, "%s", str) == -1) {
+				die("from_format() -- snprintf() failed");
+			}
+		}
 	}
 
 #if 0



From spot at fedoraproject.org  Fri Sep 12 19:38:17 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 19:38:17 +0000 (UTC)
Subject: rpms/ql2500-firmware/F-8 LICENSE, NONE, 1.1 ql2500-firmware.spec,
	NONE, 1.1 ql2500_fw.bin_mid, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080912193817.F2FEA70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ql2500-firmware/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6102/F-8

Modified Files:
	sources 
Added Files:
	LICENSE ql2500-firmware.spec ql2500_fw.bin_mid 
Log Message:
initial branching


--- NEW FILE LICENSE ---
Copyright (c)  2003-2006 QLogic Corporation
QLogic Linux Fibre Channel HBA Firmware

You may redistribute the hardware specific firmware binary file
under the following terms:

	1. Redistribution of source code (only if applicable),
	   must retain the above copyright notice, this list of
	   conditions and the following disclaimer.

	2. Redistribution 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 QLogic Corporation may not be used to
	   endorse or promote products derived from this software
	   without specific prior written permission

REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE,
THIS PROGRAM IS PROVIDED BY QLOGIC CORPORATION "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.

USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT
CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR
OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT,
TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN
ANY OTHER QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN
COMBINATION WITH THIS PROGRAM.


--- NEW FILE ql2500-firmware.spec ---
Name:		ql2500-firmware
Summary: 	Firmware for qlogic 2500 devices
Version:	4.04.04
Release:	1%{?dist}
License:	Redistributable, no modification permitted
Group:		System Environment/Kernel
Source0:	ftp://ftp.qlogic.com/outgoing/linux/firmware/ql2500_fw.bin
Source1:	ftp://ftp.qlogic.com/outgoing/linux/firmware/LICENSE
Source2:	ftp://ftp.qlogic.com/outgoing/linux/firmware/ql2500_fw.bin_mid
URL:		ftp://ftp.qlogic.com/outgoing/linux/firmware/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

%description
Firmware for qlogic 2500 devices.

%prep
%setup -n %{name} -c -T
cp %{SOURCE0} .
cp %{SOURCE1} .
cp %{SOURCE2} .

%build
# Firmware, do nothing.

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/lib/firmware/
install -m0644 ql2500_fw.bin ql2500_fw.bin_mid $RPM_BUILD_ROOT/lib/firmware/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc LICENSE
/lib/firmware/ql2500_fw.bin
/lib/firmware/ql2500_fw.bin_mid

%changelog
* Fri Aug 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 4.04.04-1
- Initial package for Fedora


--- NEW FILE ql2500_fw.bin_mid ---

?B
??Y?
X H?WXL
k
??J?
HR?`?
`
Y??
Y??
Y??
IgP{Y?
HP
??1??
??
?
??Y?
?!?>?])??)?V?&?WB?
X

 
@?<Ax@
?
@B
?
@
?
?

H
?
)??L
)??L
)??????
0
??
pHP}`

??
B8
Y?
Ik?W?^?@AjX
IzX????UB
Jp?
d?Jp??
Y?
?Y?
?dp?`??
?2e


???
??
?
Y0?
&H`
d#p?
?
B
k??`B
d
?/@
Y4
S
??
???$??%
?

@H?WB
Y?? d?
Y? ?P.

Y?(!?-
??:
?Y?
?

P 
d#p?
?
B
?
?P
Y,0Y08Iz`Iz`H`H`H
`H`?@H`
X8
?P
H`H"`
?
`Y,
?
X?	?
?
???\
??
`x
??
?
???dp?
?
???Y,?
?P
H
`H`H`\X
?P
H
`H`Iz`????

H"`H*`H?WH3?WH#?WH+?W?
Y,
?
bY,	?

X?X?X?
H
H(H(Y?
@
?P
?
?
?
?
?
?
?
?
?
?
?
?
?P @
H"`H*`?
??
?
?P
	\
XX<	X<
??
XHXY?
??`?H`x
??`
?`?H`x
G\
v?`??Hc?WLX
p?d
lLX
\X\
X\
XX\
XH??`
?

@

Y0x
X<
?
ZI/?WL0
?
J?
?
?
?
?
?
?
?
?
?
?
?
?
?
?
???
H?W
?
A???l?
<H?




????H?V`? 

????H?V
?

j?
W??`L\
eY?

?O?\<T?\
?J??
@H??
?
?
?
X?
?
Y?
a 
%?{
Y?
??
?
?B?NY?O?	?
?
?"???A??
M 

Y?5?

ah
??
??
??
??
??x??
??

??
Y?
d+PUI{PKY?
??F
?
??
??
??


??
??
??
\
?
?\?@?2
??X?@
?
?
??S?P?@
?
?
?X?0
?
?
?
??0?P?pH?
`
?
?
@
?
?
?

@?
@H?
?
?
?
?

0
?Y???
2?@H??H??
?

Y??

??? ?


???
?
?F
?

?
`? 
`?
HPZHP[H#P\
?


`8????? `8?????
`8?????`8?????
`8?????`8	
@? 
@?
@?
?????
?I\
?a\
???
?
?
?
?
?
???
?
?
?
?
?
?
?
fw
?2a<
?SCFQ


??

1??ddAzx
p
?
%??
?.Y?
H+?W?l?
X(?

?\?
?!?d?
?
?
?
?\?
I&`ddAzx
??
?
??I#PI#?WY$
p
\?
?
??
?h
??
?,
Iz`	I&`Azx

??
Y?

??F?
A\h
 



`@?

X?

?
?????T?`4?
?	??@?
?
Y??	??
@Y?
?
UB
Y??	??
@Y?
?
9B
Y????@Ax
Y????@Ax


??
?i
?
\X
?
?
?0???Az`
?3d
??a?
??
??
? =
??
L
????\


?
?

"?
?
?
?
?e
Y??
@H?WY?
Y??
@H?W
?T?l??IY?Y??
Y??

HxHxIxxY?	?
H
HB?!?HDY?
HHx
@?`
?	?HD
X<
??

?	?

X?XX?
Y??
@`
?
??
??
H?W@`

??

???
\
?
	??a@Y?
?	??
@Y?Y????@Y?Y?	???@Y?	Y?"
?!??%@9?}?7????l?
Y?
???	?Y?Y??
?6
bJd
??
Y??
??
bJd
Y????HB	I_D	Y?
Y?
?P?
AxH


@

@H?-a??Y?
????
?
????
?
????
?
????
?
????
?@ 

Y?
????
??

X?
Y???,?`?
?	?????????
X?
??
X?
??????Y?Y????@Y?Y????@?
X?
?
X?XX?
?	
X?
H
??5
X?XX?
X?XX?
X?XX?
X?XX?

?
?


?!
?`?
X?
?BH
FY??

H?
JHL

@HJ
zH???
H??Y??
L
L
HH
L?
(???
?????
:H??\
??	??Y?
HP??LY?
?
X?XX?
0??
J
??
HY??
H?.\?&L?@
X?
?
9w
?
?
?
	?P?kLX
?

X?X
X?

?	??
?
?=?
???
X?
`?

H??Y?
 H??H??I{PQ`?
?	??
@H?Y?	Y?
	?	??
@H?d
?

??
	??

?	?

?	?
Y?
HDH]?Y?
??HBd+D\
X?
	?
?\?(?F?

?	?

?	?
Y?
HDH]?Y?
??HBd+D\
X?
@?
??@??4<D0
?	??
@H?Y?	Y?
	?	??
@H?d
?

?#
??

?	?

?	?
??HBd+D\
X?

X?XX?
Y?8??
???IG@
HhY,
X?X
X?
X?X
X?

?X?
HX
?,I/?WH?W
?
\X
?????H?@?
Y?

??IzZIzXJ\
?>?Y???L
B
? 
?
??`l
??
`\p?P8h
@H?
?
?X?@??I{PB
H?`
?

Y?
Y?
A
?cd?PI{PB
#?
?

?
Y$
B
@HH@
Y?

B
@HH@
Y?

@HH@
Y?
Y?
Y?
@HH@
?vY?
?Y?
@?
@?
?6H?V???I{PI{P
?
?Y?
B
B
?I{PY?
Y?
?

?
?
@
@
?
?
2Y?
B
x
x
x
?H?VB
x
?
H?VB
x

IFl?]@
\X

?
?$
??

Y4?


?H?W??@
?
?
?
I.`	d*dap



!?	I.`	dd? 

?
?
@?
THh
Azx
p
? 
?
@?
T
??
Hh
I&`I6`
!??I.`	ddAzx

Y4
j
\
??`
??`
?
IzhIzhIzhL
L
?
?

j
?]@?VY6`?2a?
Ld

HP8?X??
	?
Y??
@Y?#?ZHR#Y4
?
????4?`?
?4?`?

?

?Y4
??
??
Hj
??\
??Y?H?WHjY?
H?WHlY4
H?WH?WH?WY? ?%
?
j
?]@
A,?
IzXdXIJXINX?,`8?
?]@

?X
?O
?

???IzX
?L?
?
?]@
dXIzX?,`@?
?.Y?
??i?
X
l
?
P
P
P

?

#?
Y0X
#?
j
??
?
l?
P
?

?
?

?Y?
HHj
?
?a??L
Y.??
?
?
?
?Y$
?M,
8
?
?
(

?
?
p
`
`

!??I.`	I2X	?6i?
``
?6i?
?
Y,?
Y,
????I.`	aRp
?
??
?
?
`@
?!?
??

???
??
??

?
??{
?

???
A
?` 
` 
??
?
H?
	?@
Y???????
?
?!???
?Y1?#X?@
X?
?
?



@HX
@HX
C
?




?F\?
?8\?
??I{??B
???l
?

??,Y???
?
??
?X
?
????\

`"x
`0

Y?
Y?
H??X
H??X
????J?
?/H?VJ?
???B


H?d???

a??	?r??Y?

 

?
?

?
??
?
?
@

@
?
?@

@

XY,IzX
I/?WB

?
?
?
??3
?F?
	H?WY.D?"A??
I3?W?0?????
Y?
<d?dY,?
HdY,
HbdbB
?

?p
?? 
??
??
??}
b
?


I&`I2X
dddb

L
X
Z
?0?????????
Y0??
Y0
Z
@
?d??B`
?4?
Y4
?	?
?	?

?
dZJZ
D(
?,
?Z
Y,
C
dd
@
?
?
?
???M,
M,
	Az`
I/?WA-?
\X
\
? ?
P<
@



DHJ
x
?l?
\I"Z???d\I"Z???I#?WMD
?
x
?!??ddI6`
I&``??

????ddI6`
I&``,
E
J?

?
?
?
?
\
?\
\
? 
XIC?WH?WH?W
??
X
`?
?
Ixp
Ixp
?
Ixp??
?]@
ZJZ
?
`
X8
@
?
@
Ixp
IxpY,?
IzXIzXIzX
IzXJX
HHPI{?0?
@


??

??
HbY?
?
?
?
?
?

?

pH?2Y??
LH?Y?
?
?
? 
?!
?R
?
?P
?
?
?
?

?$

?S
?
?a
?`%?
?`
?T
j
?U
p
?x
?
?c

?V

?W
?}
"
??


?8?
ddY?Hb?8?
ddY?Hbd&dd&dJb
?
? 
?
?!
?

HbY?
?
?

?
I&`I6`
??ddY?Hb
??
?6i?
Y?
HbY0?
?6i?

Y?
HbY0?
`"p

??????

Izd??d
dd"b`"p

???g??
??ddY?Hb`p
Hb`&p

?o
Hb`*p

?X

?Y?Y?
Y?y?
0?
?
0?
?
L
@h
Y??
Y?*
??\
@\ 
@\ 
?d??
Y4
X
X`*?-

`H`X\8
X
?

dd>bd`	?5L
P???H?VAx 
`
I:dd>bY?


X

????@?
X
?6i?

?????

?
?`
?T
?
#?
?

?


?R
?
?P
???

?
?R



?e
?^
?H
?A
? 
DH`
?
@
J\
@
@
?P?
@?
????
Y????Y?
?	?
@
??IgP
IgP{Y??
Ad

?Y?
?m@??Y4?
Y?
dd`p
Y,
@
J
??
Jx?
?J
?
?J
?
?J
?
?Jx
?Jx
RH`X?

@?
RH`Iz`
?	?
M4
?
 H`a&p

??\?
?
?^
?
?)
?[
?Y?
?
?K
?
?-?
?
?G\?

?/Y0
?

?
H?V`
Jp?
@Y?

??
M,
Y0


?
BH
Y?
??
?4?
Y?
\?
g?
W?
9?
.?
x
???0

\x
t?PH?@Y?L
\
?
`
?*
?
?
??
???2a?
Y,	?
?
Y?
?
??B

I{Y?

?
CI/?VY2h
?6i?
I,	??H

X0
X2`?0
?
X2`J
???
???H?W
?
Z
P?
K?
H
?Y,
H
?	Y,
Iy?Y,
?

H
?Y,
Y$
?
?

?

Y$
?
Y??H?Y?#?

?7Y?
Y$
H?Iy?Iy?Iy?Iy?Y?

?
?+

?}
?
#?
0
Y$
H?Iy?Iy?Iy?Iy?Y4

Y?
`

??J
?

?Y0?

?

?
?




`
`
?


?
?
P
Y6?H?W
?

Iy?Iy?Iy?
Iy?Iy?Iy?`,
Y?
Iy?Iy?Iy?
` 


Iy?Iy?Iy?	Iy?	Iy?`
?B
X
??

?
?B
YY?>
?
?
H?Y2HY$Y0
X?
?	
?H
?H	?	
?

??

@?
Y?
?
X

?
X
Y?
?`
B
???
J
??
HY?#?

FH?Y?
?`
Y$
Y0H?W?
?
?
?
x`??
?~
?
x`??
?k
?
?

?
H??0.

?
Y?
(
??I?h?Hh?Y?
????
?

?Iz`	Y,?
H
`	dddbJd
R
H
dJb
?
?
?
?
?
Y0 H?W?	?
?
?
M0
`
\	Y,H\
Y,
HZY,
HX
?
?\?
??HX
dVZY,?
?j
?!@0
?e?4????
Y
@
XY,? @H\
?I"\?
??@HXY,
?
??
?
` ?
??,???
?\
X?XJZ
?
Y0	?	?

X?XX?

X?XJZ
?

E???*?

6???
?Y0	???
0H
HZ
HX\
XHXA,

?
\??
Y.D?"AY0
	??ddI.`	YYH`H
`M8

Hj
?

?
`?
	??I?g
?
??Iz`	\?
dB
??

M0
Y
Y,H?WH?W????Y?
H?WH8H8B
I6`
	??ddB

?
`?
	??c??
?
??Iz`	\X
dB
`?
???Y4"
h
?%BHj
Iz`	dddd`0

?
Y4
#?
@HR#????k
?
?

?	??
b	??
X?
?
?
???
???
?L?
??M?
??-?
????
??i?
??>?
????
????
????
???
????
?
??
?*?
?
?
??
k
??L

?I&`I6`
Iz`	ddddY$


??Ax
???`@
HHPI{?0?pH?2Y??
LH??/Y?#?
????Y?
I6`
??
d??9???`
??`
Y?
\
	?B
<\`
d`0

??\?
d????,
?
?

???D`??
?

#?
PY?
HR#HT#??
HP8??\

`?
?
?

A
?
 ?[
Y,	?
PH\	


?IzbY0
XH\	?5
Y0H\?S
x

Ax
HX?
\
\HX?
?HX
??\
???H?WH?W?
??
IzbY2X	Y,	Ax(
XH\	Ax0
I3?WY0H\??
bed@\
Y0
bY?
Y,	?
PH\	
HbY0	Ix
IxX	?XH	
?
?
DHdIzb????8???Y?
HbY?Y,?
IzX?
Ax 
Ax
HX?
?=RH|	JZ
X<X<X<"	H\H
XHZ	????
bY,$	Y0I3?WH?WY,?
Y,
Y0
@?Y0H\HXJZ
??
X<X<
???H?WY,x
Y0Y,?
X<
X
Ixx
`p
Y????????H??WX?
dY0?H
`L
?
\X
I/?W
dZJZ
`
?
?Y0
H\	dZ??D?
dZ?	?
?
HX?
`p
?I3?WY???
?4?
:Jd
?O??D\X
Y0H?W?
?
?
?
??8?
{I;?W??h??pI3?W
???
?o
??
IBZ
??
d:bY?
d:bY?
?8?
?
?'Y0
??

HbI6`
???I&`
??ddB
H?WH`
X\H?WHdX\
H?WHbX\
H?WHbX\H?WHdX\
H?WHbI` 
??B
?\X
M,
?\
?\
?

?
	?
T??\?
??G\X

?
Y?
x
Y2X	Ax
??
@X
	?
?
?r
Y0
?
?
???\h
?a
?
?
Jd
dB
?Y0
?X?
?
??
?dZ
?
?
???????
?f
?
?a
????;B
?\
?
?XM4
Y0?

??

?
???\X
?yB
?L\
I&`
?%M0

??Y0?
dB

?
??	??
Y?y?
I.`	ddY4H`?
???M@
\?
??AI&`
?AddI.`	M8
H?`#I6`
??/I&`
?/ddI.`	M8
??I&`
?ddI.`	M8


?I/?WI3?WY,?
???I&`
??ddI.`	M8
???I&`
??ddI.`	M8
?
?
?
?
?
?
?

??H?`#ddI.`	M<
Y?
??????
b??
Y04??
b
?
?
?
bY0
Y4
@
?Y?
Hb?
BHd
?
Y4
??\I&`
?\Y?

?Y,	?
Y,	?
??O\X
?
:?
H?W?
?
I6`
ddd?ddbB
?
?
?s???

?
??
?\X

X
??
?
ddbY?
HP;`
???ddI.`	`$
???
??L`
XAzx
???ddI.`	M8
?????Y,??,?
?GY.X
?.Y???Y1?#X?@
X?XJZ
?
Y0??
??
??
Y0
??
?
???
?
I.`	??I&`
?
IBZ???Y.?Y,B? 
?\
Y4
?@?@
Ax?
Y,?
I&`I6`
???ddI.`	`,
??
??;?????
??=ddM<
??$`

?

VHJ
x
?X

d`(
?
bY?
?????5Y0?
?
?
I7?W???dFX
?I7?W???dBXd?ZdX
?
?u
???
??
IzXIzX??
X
??H
Y,
H
`
X
??~

???M<
`?
h
?%B?%Hj
?
b
?
X
bA,
X	?
A,
XB
?
X8
\
@
IzXIzXJX
@
H
Z
?

?d?
?
?Y0?
?
?
?
?
?
?
?
?
?
?
?
?
?
?
?Y0?
?
?Y0?
?
dB
?
Y?
??*Y?
'?
"?<
dB
??z?
?
??
Y?? A??9????	?dbAx(
?
?5?
Y??
Ax
I:d
?T

d:d? 
Y???9I3?W`0
?
?
??

Y4?

?4?
?4?
??z
Y0?
?4?
b??


?

Y44

?
`?
Y?8
?
L
`$0
\
Y?Y???
Y?
?
?
?85?



















































??????
b
?
LX

d???L?
HbX4
H`
X4H`??6ddB
?
???Y4

d???Y?
?8?
bY2h
Y4
`?

?
Y4
Y,?
b
?`?
b
?
X
?

?
@?
@?
@?

@?
M0
Jd
X
?
?!?
I;?W?8?
Y0	X
X
??fH^`
\
L
`,0
\
??
X?
#?
?	?
??

??`?
`?
`?
H?WY4
?
lY
H<\8
cIz` 
?
??
\
??
????
?H
X
XH\
?JX
????J\
HXH"XHXHZH\	IBZ	HZ??
e&Z	H
ZH\HZH\??

?

?
Z?
?
?

"?
?
?
?
\
?
???

?	?
Y4
?
?

Ax(
??
?
Y4
?
?

H?Wd?dd&dJb
IzX
Y0H\Y0H\Y?
XHZX
Y0H?W?
?
?
???M,
??????
?????
?
HbX4
H`
X4H`???

H`
X4H`??????@6`
X
bY0?
?
?
?
`?
?
?,?LX
X?8?
P
?
X
?????
#Y2HY$


dddb??q? 

??$
??P

H?WH'?W?

??
X

??
??!
??
???-??Y2X	dZ
0Y0???????L
X` 
?!???X` 

Y0?

Y$
?
Y?
?
?
Y,
?
?
?
?
?
?
?
?
?
?
?
?(

?

?
??



TP?
DP?
 ?7


X<(?
?=?@0
?=?@4
?=?@,
Y?
B
??
D
??
@HP?
?
k?
@

?



?

??Y4
l?
JZ

??
??Y4
l?

@H?WY?
??
?P@
X80Y08X8
Y,0Y08Iz`Iz`H`H`H
`H`?@H`

H?W?

H
`H`H`A,0
?P
H`H`?<}J@<
??
???$?

?????
k?
B?
>?

?
?
Y?
I??
H?@Y?
?

?,\?
Y?Y???
Y??
M,
Y??
?}@
'Y4
X?
?
@
I.`	?-
l???dj\X
dddb
????Y.D?"E

HbdZ?
@??IzX
Y?
?Y,
@??


?
?
?
?
??

??&?\?
?
?Y?H0
?(
S`
]`
\`
H????Y?
?
Ih
?
Y?	
????Y?
Y???????
SH?d?B?
]H?d?B?
@??
?
@
Y?	
?????$Y?
Y???????
??? 
SH?`
]H?d?B?
H0Y?
@
P
P
???????(?
P
 J0
IzX	?0?????
 X?0?
Y0??
"?Y,$I6`
I&`?
"LY$?

HbI.`	
?M?
?\?
?\?
?'?H(\
H
@
?@H(!
H( ?'?Y?
@
?@H(
H(?'?Y?
@
?@H($
@
?@H('
H(&?'?Y?)Y?
Y,
@
RH`Iz`
RY0
@H`X?
?
5?H?W??
???

e>Y0? ???

5H?W
?
?
?
Ez`
Y0?

?JZ
?	?
:	?HXH
\???Y4
l?
X??eY,?
Y0
@
?
X

T????8?
F\?8?
D]
?

B
B

?Y??Y??	Y??	?l

J??

?
?
J?

?Y??Y??Y???l
Y??
?l
Y??
?h
?


Ad
JD

?

?
Y??	?h??Y??	@l
?h??Y??
@l
Y?? ?h?0Y?? ?i

H??Y1pH??J
?
Xh??it?
@?h

?
Y0?Xm
?h??Y??
@l
?,?
Y???it?
?h?
B
Y0?Xl?
?,?
B
?h??
H??HW?J?0
I-
B
J?


?Y??Hi
?h??Y??
@l
X?pH?`H?\J`


Ax?
Hm
X?pH?`J`


Ax?
Hm
Iy@Iy@

?

?

?
@?qp@

?h??
HkD
?

@?qp@





?
X??
I7?W? 
?6i?
Y4??it?
X??/@p?
A4

?
X?@
A0

??@i?
A0

??@i?
B

??@i?
Y2X	I3?WIC?WI??WY0?Hk?WY0??l

??
?

?

?
?A0?
?<?
?6i?
A4

??B
Y4?AD

?
?
Y4?AD
Y4?AD

?
X?@

?	A1
Y1

?
?

?
Y0?@l

??B

?

?
?6i?
Y0??h??

?

?
Ad
@?`
?h??
Iz`	
??B


?

?C?.Y?
?@?`
J
?
??u

?

Jd
??u
Y4?


?
B

?tY2X
?

?

?

?

?

?

?,X?
?h?@B

?h??
@??

????

??
?
@?x
???p@
IG?WI7?W@?X

???

?IG?WJ

Ax?
JP5
 ?
JPK


Y???h?4Hk?
?
Y??(B

?

Y$?
 

?
IzZJ\

??u
Ax?


X??

??B
Ax?
@??


???:?
????0?
K????
0

?

y????

J
?PF
P
Jh?


?
lx

?\.?{?


0?

@????




H?z?y?
?Q?
?Q?

y????


?Q?

.P ?y?



??y?P???y\P???EPz
?????
y?P??\/????Q.@ ??

?
?

?w ?
?wI0

?
??K
`
????"








?
??
=?
???
/??????
??`u????	

 ?
???`P
?
}??/?	h
`u????"

>@
}??/?	h

?
??J$z
 ??#?
x

??
@
P

`
p
?
?
?0y?

???
@
P

`
p
?
?
?0y 


u????	
@
P

`
p
?
?
?0} 



?
??
=?
??
???m?y???
?#p/?




-



??
/?	
D?`

??/?9
PK
????	

?
`
H`?
#D 
Hp?
&D?
J



`

??/?	x

?
??/?x

??
/?	
??/?"
?
j?
`

??/?	y?

??/?
00


??/?	i?
????	

??
/?	x

??

????	
H??i???'x@


?!0
?
??/?
00

????	


????
x
????	

??G@h

??
` 
????	

????	



?




??x
 ?/?.\


 ?

??S?u0?u????C?
@
??*@d?Tp??S
?0D?*? *
??? C0 ?B000??O
?T?*?
??F@
??CD?*???*? ?uIT??@

~@
 ?A?/?t>t?B???/?t?t??"??>?)B???3????<t??d?"??????T"?????????"????"?????"????$??D"????88?:?99/?t:t??"??>?&??D??????t?"t??/??>%?t"?????
4%
u??S???0?u??C?? ???x????????S?x	S????u?????????????? ? ????C? ?
@ tt??/??>??>???/?>t?<????<??<@>p`Ea	?>?;@u???>?@8??8>??`>?9??99?!:>??????C?"p`Eal@'??	B?!A??<?"?@8??8<?`<??9=?99?:?<?!=??8?"?99?8::?8?!??"?9???
D????t??????0(?
??u@?? u?u????u????????????
??	P
??@?? ???(???u??T?@
?
???u?Tt"???????????????u??t??D?????T???????T????M??????u?????????D???uu?T???70??D
???u0??D
8??uD??D??0(?
9 u?T???: ??
???ut??T??????T??u???T?D?u?????pN?"?&????&??(????8$????pNd?)????&??(????D?T?$?d??pN
?
}d?
??C???S?"???%?2$?%4??????U?"??T??"?? T??"
{



DT?uU???-1 %?uu??
?8P
1  ??
??
!P1  ?
?P
??* %1?*??
?
$??B6`???ut66
c???_?

}X?5?Y?	??7"t??u6t??u6t??u6t??u6t??u6t??u6???uu6????u6????u66????uu6??????X?}Y?6
l?0??T??dp at dT?	???0?%?%?N?TN?T??+???x*?3?3????????*?+?3?x??3?????????????????????????????+???*???P
~??u?? ????&pW?W?V?
$??3???W??@?V ?
?
P??C?1???ueU1?p"1?"?&?????????9?A?@A???9?&???A at x?
|?
???u??T??D????u"???t???t?????pu4 ?uu??Pt4 t??%????4 ?0d?t`?%????"???*??????u7T???6??D=
&??B??AB$?@??u7??
t6??6&??"?S'?u*???
+
00??)???????
`?poRU??UF??U?"?@????????

Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ql2500-firmware/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 19:30:05 -0000	1.1
+++ sources	12 Sep 2008 19:37:47 -0000	1.2
@@ -0,0 +1 @@
+e0eee74a60109539f1ea39c89ef05a92  ql2500_fw.bin



From spot at fedoraproject.org  Fri Sep 12 19:38:18 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 19:38:18 +0000 (UTC)
Subject: rpms/ql2500-firmware/F-9 LICENSE, NONE, 1.1 ql2500-firmware.spec,
	NONE, 1.1 ql2500_fw.bin_mid, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080912193818.4181D70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ql2500-firmware/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6102/F-9

Modified Files:
	sources 
Added Files:
	LICENSE ql2500-firmware.spec ql2500_fw.bin_mid 
Log Message:
initial branching


--- NEW FILE LICENSE ---
Copyright (c)  2003-2006 QLogic Corporation
QLogic Linux Fibre Channel HBA Firmware

You may redistribute the hardware specific firmware binary file
under the following terms:

	1. Redistribution of source code (only if applicable),
	   must retain the above copyright notice, this list of
	   conditions and the following disclaimer.

	2. Redistribution 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 QLogic Corporation may not be used to
	   endorse or promote products derived from this software
	   without specific prior written permission

REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE,
THIS PROGRAM IS PROVIDED BY QLOGIC CORPORATION "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.

USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT
CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR
OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT,
TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN
ANY OTHER QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN
COMBINATION WITH THIS PROGRAM.


--- NEW FILE ql2500-firmware.spec ---
Name:		ql2500-firmware
Summary: 	Firmware for qlogic 2500 devices
Version:	4.04.04
Release:	1%{?dist}
License:	Redistributable, no modification permitted
Group:		System Environment/Kernel
Source0:	ftp://ftp.qlogic.com/outgoing/linux/firmware/ql2500_fw.bin
Source1:	ftp://ftp.qlogic.com/outgoing/linux/firmware/LICENSE
Source2:	ftp://ftp.qlogic.com/outgoing/linux/firmware/ql2500_fw.bin_mid
URL:		ftp://ftp.qlogic.com/outgoing/linux/firmware/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

%description
Firmware for qlogic 2500 devices.

%prep
%setup -n %{name} -c -T
cp %{SOURCE0} .
cp %{SOURCE1} .
cp %{SOURCE2} .

%build
# Firmware, do nothing.

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/lib/firmware/
install -m0644 ql2500_fw.bin ql2500_fw.bin_mid $RPM_BUILD_ROOT/lib/firmware/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc LICENSE
/lib/firmware/ql2500_fw.bin
/lib/firmware/ql2500_fw.bin_mid

%changelog
* Fri Aug 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 4.04.04-1
- Initial package for Fedora


--- NEW FILE ql2500_fw.bin_mid ---

?B
??Y?
X H?WXL
k
??J?
HR?`?
`
Y??
Y??
Y??
IgP{Y?
HP
??1??
??
?
??Y?
?!?>?])??)?V?&?WB?
X

 
@?<Ax@
?
@B
?
@
?
?

H
?
)??L
)??L
)??????
0
??
pHP}`

??
B8
Y?
Ik?W?^?@AjX
IzX????UB
Jp?
d?Jp??
Y?
?Y?
?dp?`??
?2e


???
??
?
Y0?
&H`
d#p?
?
B
k??`B
d
?/@
Y4
S
??
???$??%
?

@H?WB
Y?? d?
Y? ?P.

Y?(!?-
??:
?Y?
?

P 
d#p?
?
B
?
?P
Y,0Y08Iz`Iz`H`H`H
`H`?@H`
X8
?P
H`H"`
?
`Y,
?
X?	?
?
???\
??
`x
??
?
???dp?
?
???Y,?
?P
H
`H`H`\X
?P
H
`H`Iz`????

H"`H*`H?WH3?WH#?WH+?W?
Y,
?
bY,	?

X?X?X?
H
H(H(Y?
@
?P
?
?
?
?
?
?
?
?
?
?
?
?
?P @
H"`H*`?
??
?
?P
	\
XX<	X<
??
XHXY?
??`?H`x
??`
?`?H`x
G\
v?`??Hc?WLX
p?d
lLX
\X\
X\
XX\
XH??`
?

@

Y0x
X<
?
ZI/?WL0
?
J?
?
?
?
?
?
?
?
?
?
?
?
?
?
?
???
H?W
?
A???l?
<H?




????H?V`? 

????H?V
?

j?
W??`L\
eY?

?O?\<T?\
?J??
@H??
?
?
?
X?
?
Y?
a 
%?{
Y?
??
?
?B?NY?O?	?
?
?"???A??
M 

Y?5?

ah
??
??
??
??
??x??
??

??
Y?
d+PUI{PKY?
??F
?
??
??
??


??
??
??
\
?
?\?@?2
??X?@
?
?
??S?P?@
?
?
?X?0
?
?
?
??0?P?pH?
`
?
?
@
?
?
?

@?
@H?
?
?
?
?

0
?Y???
2?@H??H??
?

Y??

??? ?


???
?
?F
?

?
`? 
`?
HPZHP[H#P\
?


`8????? `8?????
`8?????`8?????
`8?????`8	
@? 
@?
@?
?????
?I\
?a\
???
?
?
?
?
?
???
?
?
?
?
?
?
?
fw
?2a<
?SCFQ


??

1??ddAzx
p
?
%??
?.Y?
H+?W?l?
X(?

?\?
?!?d?
?
?
?
?\?
I&`ddAzx
??
?
??I#PI#?WY$
p
\?
?
??
?h
??
?,
Iz`	I&`Azx

??
Y?

??F?
A\h
 



`@?

X?

?
?????T?`4?
?	??@?
?
Y??	??
@Y?
?
UB
Y??	??
@Y?
?
9B
Y????@Ax
Y????@Ax


??
?i
?
\X
?
?
?0???Az`
?3d
??a?
??
??
? =
??
L
????\


?
?

"?
?
?
?
?e
Y??
@H?WY?
Y??
@H?W
?T?l??IY?Y??
Y??

HxHxIxxY?	?
H
HB?!?HDY?
HHx
@?`
?	?HD
X<
??

?	?

X?XX?
Y??
@`
?
??
??
H?W@`

??

???
\
?
	??a@Y?
?	??
@Y?Y????@Y?Y?	???@Y?	Y?"
?!??%@9?}?7????l?
Y?
???	?Y?Y??
?6
bJd
??
Y??
??
bJd
Y????HB	I_D	Y?
Y?
?P?
AxH


@

@H?-a??Y?
????
?
????
?
????
?
????
?
????
?@ 

Y?
????
??

X?
Y???,?`?
?	?????????
X?
??
X?
??????Y?Y????@Y?Y????@?
X?
?
X?XX?
?	
X?
H
??5
X?XX?
X?XX?
X?XX?
X?XX?

?
?


?!
?`?
X?
?BH
FY??

H?
JHL

@HJ
zH???
H??Y??
L
L
HH
L?
(???
?????
:H??\
??	??Y?
HP??LY?
?
X?XX?
0??
J
??
HY??
H?.\?&L?@
X?
?
9w
?
?
?
	?P?kLX
?

X?X
X?

?	??
?
?=?
???
X?
`?

H??Y?
 H??H??I{PQ`?
?	??
@H?Y?	Y?
	?	??
@H?d
?

??
	??

?	?

?	?
Y?
HDH]?Y?
??HBd+D\
X?
	?
?\?(?F?

?	?

?	?
Y?
HDH]?Y?
??HBd+D\
X?
@?
??@??4<D0
?	??
@H?Y?	Y?
	?	??
@H?d
?

?#
??

?	?

?	?
??HBd+D\
X?

X?XX?
Y?8??
???IG@
HhY,
X?X
X?
X?X
X?

?X?
HX
?,I/?WH?W
?
\X
?????H?@?
Y?

??IzZIzXJ\
?>?Y???L
B
? 
?
??`l
??
`\p?P8h
@H?
?
?X?@??I{PB
H?`
?

Y?
Y?
A
?cd?PI{PB
#?
?

?
Y$
B
@HH@
Y?

B
@HH@
Y?

@HH@
Y?
Y?
Y?
@HH@
?vY?
?Y?
@?
@?
?6H?V???I{PI{P
?
?Y?
B
B
?I{PY?
Y?
?

?
?
@
@
?
?
2Y?
B
x
x
x
?H?VB
x
?
H?VB
x

IFl?]@
\X

?
?$
??

Y4?


?H?W??@
?
?
?
I.`	d*dap



!?	I.`	dd? 

?
?
@?
THh
Azx
p
? 
?
@?
T
??
Hh
I&`I6`
!??I.`	ddAzx

Y4
j
\
??`
??`
?
IzhIzhIzhL
L
?
?

j
?]@?VY6`?2a?
Ld

HP8?X??
	?
Y??
@Y?#?ZHR#Y4
?
????4?`?
?4?`?

?

?Y4
??
??
Hj
??\
??Y?H?WHjY?
H?WHlY4
H?WH?WH?WY? ?%
?
j
?]@
A,?
IzXdXIJXINX?,`8?
?]@

?X
?O
?

???IzX
?L?
?
?]@
dXIzX?,`@?
?.Y?
??i?
X
l
?
P
P
P

?

#?
Y0X
#?
j
??
?
l?
P
?

?
?

?Y?
HHj
?
?a??L
Y.??
?
?
?
?Y$
?M,
8
?
?
(

?
?
p
`
`

!??I.`	I2X	?6i?
``
?6i?
?
Y,?
Y,
????I.`	aRp
?
??
?
?
`@
?!?
??

???
??
??

?
??{
?

???
A
?` 
` 
??
?
H?
	?@
Y???????
?
?!???
?Y1?#X?@
X?
?
?



@HX
@HX
C
?




?F\?
?8\?
??I{??B
???l
?

??,Y???
?
??
?X
?
????\

`"x
`0

Y?
Y?
H??X
H??X
????J?
?/H?VJ?
???B


H?d???

a??	?r??Y?

 

?
?

?
??
?
?
@

@
?
?@

@

XY,IzX
I/?WB

?
?
?
??3
?F?
	H?WY.D?"A??
I3?W?0?????
Y?
<d?dY,?
HdY,
HbdbB
?

?p
?? 
??
??
??}
b
?


I&`I2X
dddb

L
X
Z
?0?????????
Y0??
Y0
Z
@
?d??B`
?4?
Y4
?	?
?	?

?
dZJZ
D(
?,
?Z
Y,
C
dd
@
?
?
?
???M,
M,
	Az`
I/?WA-?
\X
\
? ?
P<
@



DHJ
x
?l?
\I"Z???d\I"Z???I#?WMD
?
x
?!??ddI6`
I&``??

????ddI6`
I&``,
E
J?

?
?
?
?
\
?\
\
? 
XIC?WH?WH?W
??
X
`?
?
Ixp
Ixp
?
Ixp??
?]@
ZJZ
?
`
X8
@
?
@
Ixp
IxpY,?
IzXIzXIzX
IzXJX
HHPI{?0?
@


??

??
HbY?
?
?
?
?
?

?

pH?2Y??
LH?Y?
?
?
? 
?!
?R
?
?P
?
?
?
?

?$

?S
?
?a
?`%?
?`
?T
j
?U
p
?x
?
?c

?V

?W
?}
"
??


?8?
ddY?Hb?8?
ddY?Hbd&dd&dJb
?
? 
?
?!
?

HbY?
?
?

?
I&`I6`
??ddY?Hb
??
?6i?
Y?
HbY0?
?6i?

Y?
HbY0?
`"p

??????

Izd??d
dd"b`"p

???g??
??ddY?Hb`p
Hb`&p

?o
Hb`*p

?X

?Y?Y?
Y?y?
0?
?
0?
?
L
@h
Y??
Y?*
??\
@\ 
@\ 
?d??
Y4
X
X`*?-

`H`X\8
X
?

dd>bd`	?5L
P???H?VAx 
`
I:dd>bY?


X

????@?
X
?6i?

?????

?
?`
?T
?
#?
?

?


?R
?
?P
???

?
?R



?e
?^
?H
?A
? 
DH`
?
@
J\
@
@
?P?
@?
????
Y????Y?
?	?
@
??IgP
IgP{Y??
Ad

?Y?
?m@??Y4?
Y?
dd`p
Y,
@
J
??
Jx?
?J
?
?J
?
?J
?
?Jx
?Jx
RH`X?

@?
RH`Iz`
?	?
M4
?
 H`a&p

??\?
?
?^
?
?)
?[
?Y?
?
?K
?
?-?
?
?G\?

?/Y0
?

?
H?V`
Jp?
@Y?

??
M,
Y0


?
BH
Y?
??
?4?
Y?
\?
g?
W?
9?
.?
x
???0

\x
t?PH?@Y?L
\
?
`
?*
?
?
??
???2a?
Y,	?
?
Y?
?
??B

I{Y?

?
CI/?VY2h
?6i?
I,	??H

X0
X2`?0
?
X2`J
???
???H?W
?
Z
P?
K?
H
?Y,
H
?	Y,
Iy?Y,
?

H
?Y,
Y$
?
?

?

Y$
?
Y??H?Y?#?

?7Y?
Y$
H?Iy?Iy?Iy?Iy?Y?

?
?+

?}
?
#?
0
Y$
H?Iy?Iy?Iy?Iy?Y4

Y?
`

??J
?

?Y0?

?

?
?




`
`
?


?
?
P
Y6?H?W
?

Iy?Iy?Iy?
Iy?Iy?Iy?`,
Y?
Iy?Iy?Iy?
` 


Iy?Iy?Iy?	Iy?	Iy?`
?B
X
??

?
?B
YY?>
?
?
H?Y2HY$Y0
X?
?	
?H
?H	?	
?

??

@?
Y?
?
X

?
X
Y?
?`
B
???
J
??
HY?#?

FH?Y?
?`
Y$
Y0H?W?
?
?
?
x`??
?~
?
x`??
?k
?
?

?
H??0.

?
Y?
(
??I?h?Hh?Y?
????
?

?Iz`	Y,?
H
`	dddbJd
R
H
dJb
?
?
?
?
?
Y0 H?W?	?
?
?
M0
`
\	Y,H\
Y,
HZY,
HX
?
?\?
??HX
dVZY,?
?j
?!@0
?e?4????
Y
@
XY,? @H\
?I"\?
??@HXY,
?
??
?
` ?
??,???
?\
X?XJZ
?
Y0	?	?

X?XX?

X?XJZ
?

E???*?

6???
?Y0	???
0H
HZ
HX\
XHXA,

?
\??
Y.D?"AY0
	??ddI.`	YYH`H
`M8

Hj
?

?
`?
	??I?g
?
??Iz`	\?
dB
??

M0
Y
Y,H?WH?W????Y?
H?WH8H8B
I6`
	??ddB

?
`?
	??c??
?
??Iz`	\X
dB
`?
???Y4"
h
?%BHj
Iz`	dddd`0

?
Y4
#?
@HR#????k
?
?

?	??
b	??
X?
?
?
???
???
?L?
??M?
??-?
????
??i?
??>?
????
????
????
???
????
?
??
?*?
?
?
??
k
??L

?I&`I6`
Iz`	ddddY$


??Ax
???`@
HHPI{?0?pH?2Y??
LH??/Y?#?
????Y?
I6`
??
d??9???`
??`
Y?
\
	?B
<\`
d`0

??\?
d????,
?
?

???D`??
?

#?
PY?
HR#HT#??
HP8??\

`?
?
?

A
?
 ?[
Y,	?
PH\	


?IzbY0
XH\	?5
Y0H\?S
x

Ax
HX?
\
\HX?
?HX
??\
???H?WH?W?
??
IzbY2X	Y,	Ax(
XH\	Ax0
I3?WY0H\??
bed@\
Y0
bY?
Y,	?
PH\	
HbY0	Ix
IxX	?XH	
?
?
DHdIzb????8???Y?
HbY?Y,?
IzX?
Ax 
Ax
HX?
?=RH|	JZ
X<X<X<"	H\H
XHZ	????
bY,$	Y0I3?WH?WY,?
Y,
Y0
@?Y0H\HXJZ
??
X<X<
???H?WY,x
Y0Y,?
X<
X
Ixx
`p
Y????????H??WX?
dY0?H
`L
?
\X
I/?W
dZJZ
`
?
?Y0
H\	dZ??D?
dZ?	?
?
HX?
`p
?I3?WY???
?4?
:Jd
?O??D\X
Y0H?W?
?
?
?
??8?
{I;?W??h??pI3?W
???
?o
??
IBZ
??
d:bY?
d:bY?
?8?
?
?'Y0
??

HbI6`
???I&`
??ddB
H?WH`
X\H?WHdX\
H?WHbX\
H?WHbX\H?WHdX\
H?WHbI` 
??B
?\X
M,
?\
?\
?

?
	?
T??\?
??G\X

?
Y?
x
Y2X	Ax
??
@X
	?
?
?r
Y0
?
?
???\h
?a
?
?
Jd
dB
?Y0
?X?
?
??
?dZ
?
?
???????
?f
?
?a
????;B
?\
?
?XM4
Y0?

??

?
???\X
?yB
?L\
I&`
?%M0

??Y0?
dB

?
??	??
Y?y?
I.`	ddY4H`?
???M@
\?
??AI&`
?AddI.`	M8
H?`#I6`
??/I&`
?/ddI.`	M8
??I&`
?ddI.`	M8


?I/?WI3?WY,?
???I&`
??ddI.`	M8
???I&`
??ddI.`	M8
?
?
?
?
?
?
?

??H?`#ddI.`	M<
Y?
??????
b??
Y04??
b
?
?
?
bY0
Y4
@
?Y?
Hb?
BHd
?
Y4
??\I&`
?\Y?

?Y,	?
Y,	?
??O\X
?
:?
H?W?
?
I6`
ddd?ddbB
?
?
?s???

?
??
?\X

X
??
?
ddbY?
HP;`
???ddI.`	`$
???
??L`
XAzx
???ddI.`	M8
?????Y,??,?
?GY.X
?.Y???Y1?#X?@
X?XJZ
?
Y0??
??
??
Y0
??
?
???
?
I.`	??I&`
?
IBZ???Y.?Y,B? 
?\
Y4
?@?@
Ax?
Y,?
I&`I6`
???ddI.`	`,
??
??;?????
??=ddM<
??$`

?

VHJ
x
?X

d`(
?
bY?
?????5Y0?
?
?
I7?W???dFX
?I7?W???dBXd?ZdX
?
?u
???
??
IzXIzX??
X
??H
Y,
H
`
X
??~

???M<
`?
h
?%B?%Hj
?
b
?
X
bA,
X	?
A,
XB
?
X8
\
@
IzXIzXJX
@
H
Z
?

?d?
?
?Y0?
?
?
?
?
?
?
?
?
?
?
?
?
?
?
?Y0?
?
?Y0?
?
dB
?
Y?
??*Y?
'?
"?<
dB
??z?
?
??
Y?? A??9????	?dbAx(
?
?5?
Y??
Ax
I:d
?T

d:d? 
Y???9I3?W`0
?
?
??

Y4?

?4?
?4?
??z
Y0?
?4?
b??


?

Y44

?
`?
Y?8
?
L
`$0
\
Y?Y???
Y?
?
?
?85?



















































??????
b
?
LX

d???L?
HbX4
H`
X4H`??6ddB
?
???Y4

d???Y?
?8?
bY2h
Y4
`?

?
Y4
Y,?
b
?`?
b
?
X
?

?
@?
@?
@?

@?
M0
Jd
X
?
?!?
I;?W?8?
Y0	X
X
??fH^`
\
L
`,0
\
??
X?
#?
?	?
??

??`?
`?
`?
H?WY4
?
lY
H<\8
cIz` 
?
??
\
??
????
?H
X
XH\
?JX
????J\
HXH"XHXHZH\	IBZ	HZ??
e&Z	H
ZH\HZH\??

?

?
Z?
?
?

"?
?
?
?
\
?
???

?	?
Y4
?
?

Ax(
??
?
Y4
?
?

H?Wd?dd&dJb
IzX
Y0H\Y0H\Y?
XHZX
Y0H?W?
?
?
???M,
??????
?????
?
HbX4
H`
X4H`???

H`
X4H`??????@6`
X
bY0?
?
?
?
`?
?
?,?LX
X?8?
P
?
X
?????
#Y2HY$


dddb??q? 

??$
??P

H?WH'?W?

??
X

??
??!
??
???-??Y2X	dZ
0Y0???????L
X` 
?!???X` 

Y0?

Y$
?
Y?
?
?
Y,
?
?
?
?
?
?
?
?
?
?
?
?(

?

?
??



TP?
DP?
 ?7


X<(?
?=?@0
?=?@4
?=?@,
Y?
B
??
D
??
@HP?
?
k?
@

?



?

??Y4
l?
JZ

??
??Y4
l?

@H?WY?
??
?P@
X80Y08X8
Y,0Y08Iz`Iz`H`H`H
`H`?@H`

H?W?

H
`H`H`A,0
?P
H`H`?<}J@<
??
???$?

?????
k?
B?
>?

?
?
Y?
I??
H?@Y?
?

?,\?
Y?Y???
Y??
M,
Y??
?}@
'Y4
X?
?
@
I.`	?-
l???dj\X
dddb
????Y.D?"E

HbdZ?
@??IzX
Y?
?Y,
@??


?
?
?
?
??

??&?\?
?
?Y?H0
?(
S`
]`
\`
H????Y?
?
Ih
?
Y?	
????Y?
Y???????
SH?d?B?
]H?d?B?
@??
?
@
Y?	
?????$Y?
Y???????
??? 
SH?`
]H?d?B?
H0Y?
@
P
P
???????(?
P
 J0
IzX	?0?????
 X?0?
Y0??
"?Y,$I6`
I&`?
"LY$?

HbI.`	
?M?
?\?
?\?
?'?H(\
H
@
?@H(!
H( ?'?Y?
@
?@H(
H(?'?Y?
@
?@H($
@
?@H('
H(&?'?Y?)Y?
Y,
@
RH`Iz`
RY0
@H`X?
?
5?H?W??
???

e>Y0? ???

5H?W
?
?
?
Ez`
Y0?

?JZ
?	?
:	?HXH
\???Y4
l?
X??eY,?
Y0
@
?
X

T????8?
F\?8?
D]
?

B
B

?Y??Y??	Y??	?l

J??

?
?
J?

?Y??Y??Y???l
Y??
?l
Y??
?h
?


Ad
JD

?

?
Y??	?h??Y??	@l
?h??Y??
@l
Y?? ?h?0Y?? ?i

H??Y1pH??J
?
Xh??it?
@?h

?
Y0?Xm
?h??Y??
@l
?,?
Y???it?
?h?
B
Y0?Xl?
?,?
B
?h??
H??HW?J?0
I-
B
J?


?Y??Hi
?h??Y??
@l
X?pH?`H?\J`


Ax?
Hm
X?pH?`J`


Ax?
Hm
Iy@Iy@

?

?

?
@?qp@

?h??
HkD
?

@?qp@





?
X??
I7?W? 
?6i?
Y4??it?
X??/@p?
A4

?
X?@
A0

??@i?
A0

??@i?
B

??@i?
Y2X	I3?WIC?WI??WY0?Hk?WY0??l

??
?

?

?
?A0?
?<?
?6i?
A4

??B
Y4?AD

?
?
Y4?AD
Y4?AD

?
X?@

?	A1
Y1

?
?

?
Y0?@l

??B

?

?
?6i?
Y0??h??

?

?
Ad
@?`
?h??
Iz`	
??B


?

?C?.Y?
?@?`
J
?
??u

?

Jd
??u
Y4?


?
B

?tY2X
?

?

?

?

?

?

?,X?
?h?@B

?h??
@??

????

??
?
@?x
???p@
IG?WI7?W@?X

???

?IG?WJ

Ax?
JP5
 ?
JPK


Y???h?4Hk?
?
Y??(B

?

Y$?
 

?
IzZJ\

??u
Ax?


X??

??B
Ax?
@??


???:?
????0?
K????
0

?

y????

J
?PF
P
Jh?


?
lx

?\.?{?


0?

@????




H?z?y?
?Q?
?Q?

y????


?Q?

.P ?y?



??y?P???y\P???EPz
?????
y?P??\/????Q.@ ??

?
?

?w ?
?wI0

?
??K
`
????"








?
??
=?
???
/??????
??`u????	

 ?
???`P
?
}??/?	h
`u????"

>@
}??/?	h

?
??J$z
 ??#?
x

??
@
P

`
p
?
?
?0y?

???
@
P

`
p
?
?
?0y 


u????	
@
P

`
p
?
?
?0} 



?
??
=?
??
???m?y???
?#p/?




-



??
/?	
D?`

??/?9
PK
????	

?
`
H`?
#D 
Hp?
&D?
J



`

??/?	x

?
??/?x

??
/?	
??/?"
?
j?
`

??/?	y?

??/?
00


??/?	i?
????	

??
/?	x

??

????	
H??i???'x@


?!0
?
??/?
00

????	


????
x
????	

??G@h

??
` 
????	

????	



?




??x
 ?/?.\


 ?

??S?u0?u????C?
@
??*@d?Tp??S
?0D?*? *
??? C0 ?B000??O
?T?*?
??F@
??CD?*???*? ?uIT??@

~@
 ?A?/?t>t?B???/?t?t??"??>?)B???3????<t??d?"??????T"?????????"????"?????"????$??D"????88?:?99/?t:t??"??>?&??D??????t?"t??/??>%?t"?????
4%
u??S???0?u??C?? ???x????????S?x	S????u?????????????? ? ????C? ?
@ tt??/??>??>???/?>t?<????<??<@>p`Ea	?>?;@u???>?@8??8>??`>?9??99?!:>??????C?"p`Eal@'??	B?!A??<?"?@8??8<?`<??9=?99?:?<?!=??8?"?99?8::?8?!??"?9???
D????t??????0(?
??u@?? u?u????u????????????
??	P
??@?? ???(???u??T?@
?
???u?Tt"???????????????u??t??D?????T???????T????M??????u?????????D???uu?T???70??D
???u0??D
8??uD??D??0(?
9 u?T???: ??
???ut??T??????T??u???T?D?u?????pN?"?&????&??(????8$????pNd?)????&??(????D?T?$?d??pN
?
}d?
??C???S?"???%?2$?%4??????U?"??T??"?? T??"
{



DT?uU???-1 %?uu??
?8P
1  ??
??
!P1  ?
?P
??* %1?*??
?
$??B6`???ut66
c???_?

}X?5?Y?	??7"t??u6t??u6t??u6t??u6t??u6t??u6???uu6????u6????u66????uu6??????X?}Y?6
l?0??T??dp at dT?	???0?%?%?N?TN?T??+???x*?3?3????????*?+?3?x??3?????????????????????????????+???*???P
~??u?? ????&pW?W?V?
$??3???W??@?V ?
?
P??C?1???ueU1?p"1?"?&?????????9?A?@A???9?&???A at x?
|?
???u??T??D????u"???t???t?????pu4 ?uu??Pt4 t??%????4 ?0d?t`?%????"???*??????u7T???6??D=
&??B??AB$?@??u7??
t6??6&??"?S'?u*???
+
00??)???????
`?poRU??UF??U?"?@????????

Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ql2500-firmware/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 19:30:05 -0000	1.1
+++ sources	12 Sep 2008 19:37:48 -0000	1.2
@@ -0,0 +1 @@
+e0eee74a60109539f1ea39c89ef05a92  ql2500_fw.bin



From wolfy at fedoraproject.org  Fri Sep 12 19:38:47 2008
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri, 12 Sep 2008 19:38:47 +0000 (UTC)
Subject: rpms/ssmtp/F-9 ssmtp-unitialized-strdup.patch,NONE,1.1
Message-ID: <20080912193847.1D64670131@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/ssmtp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6419

Added Files:
	ssmtp-unitialized-strdup.patch 
Log Message:
patch for CVE-2008-3962


ssmtp-unitialized-strdup.patch:

--- NEW FILE ssmtp-unitialized-strdup.patch ---
--- ssmtp-2.61/ssmtp.c.orig	2008-09-11 18:04:07.000000000 +0300
+++ ssmtp-2.61/ssmtp.c	2008-09-11 18:07:14.000000000 +0300
@@ -489,6 +489,11 @@ char *from_format(char *str, bool_t over
 				die("from_format() -- snprintf() failed");
 			}
 		}
+		else {
+			if(snprintf(buf, BUF_SZ, "%s", str) == -1) {
+				die("from_format() -- snprintf() failed");
+			}
+		}
 	}
 
 #if 0



From wolfy at fedoraproject.org  Fri Sep 12 19:39:49 2008
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri, 12 Sep 2008 19:39:49 +0000 (UTC)
Subject: rpms/ssmtp/F-8 ssmtp-unitialized-strdup.patch,NONE,1.1
Message-ID: <20080912193949.3802E70131@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/ssmtp/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6886

Added Files:
	ssmtp-unitialized-strdup.patch 
Log Message:
patch for CVE-2008-3962


ssmtp-unitialized-strdup.patch:

--- NEW FILE ssmtp-unitialized-strdup.patch ---
--- ssmtp-2.61/ssmtp.c.orig	2008-09-11 18:04:07.000000000 +0300
+++ ssmtp-2.61/ssmtp.c	2008-09-11 18:07:14.000000000 +0300
@@ -489,6 +489,11 @@ char *from_format(char *str, bool_t over
 				die("from_format() -- snprintf() failed");
 			}
 		}
+		else {
+			if(snprintf(buf, BUF_SZ, "%s", str) == -1) {
+				die("from_format() -- snprintf() failed");
+			}
+		}
 	}
 
 #if 0



From wolfy at fedoraproject.org  Fri Sep 12 19:41:14 2008
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri, 12 Sep 2008 19:41:14 +0000 (UTC)
Subject: rpms/ssmtp/F-7 ssmtp-unitialized-strdup.patch,NONE,1.1
Message-ID: <20080912194114.7ACF170131@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/ssmtp/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7187

Added Files:
	ssmtp-unitialized-strdup.patch 
Log Message:
patch for CVE-2008-3962


ssmtp-unitialized-strdup.patch:

--- NEW FILE ssmtp-unitialized-strdup.patch ---
--- ssmtp-2.61/ssmtp.c.orig	2008-09-11 18:04:07.000000000 +0300
+++ ssmtp-2.61/ssmtp.c	2008-09-11 18:07:14.000000000 +0300
@@ -489,6 +489,11 @@ char *from_format(char *str, bool_t over
 				die("from_format() -- snprintf() failed");
 			}
 		}
+		else {
+			if(snprintf(buf, BUF_SZ, "%s", str) == -1) {
+				die("from_format() -- snprintf() failed");
+			}
+		}
 	}
 
 #if 0



From wolfy at fedoraproject.org  Fri Sep 12 19:41:38 2008
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri, 12 Sep 2008 19:41:38 +0000 (UTC)
Subject: rpms/ssmtp/FC-6 ssmtp-unitialized-strdup.patch,NONE,1.1
Message-ID: <20080912194138.BE85E70131@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/ssmtp/FC-6
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7303

Added Files:
	ssmtp-unitialized-strdup.patch 
Log Message:
patch for CVE-2008-3962


ssmtp-unitialized-strdup.patch:

--- NEW FILE ssmtp-unitialized-strdup.patch ---
--- ssmtp-2.61/ssmtp.c.orig	2008-09-11 18:04:07.000000000 +0300
+++ ssmtp-2.61/ssmtp.c	2008-09-11 18:07:14.000000000 +0300
@@ -489,6 +489,11 @@ char *from_format(char *str, bool_t over
 				die("from_format() -- snprintf() failed");
 			}
 		}
+		else {
+			if(snprintf(buf, BUF_SZ, "%s", str) == -1) {
+				die("from_format() -- snprintf() failed");
+			}
+		}
 	}
 
 #if 0



From wolfy at fedoraproject.org  Fri Sep 12 19:43:02 2008
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri, 12 Sep 2008 19:43:02 +0000 (UTC)
Subject: rpms/ssmtp/EL-5 ssmtp-unitialized-strdup.patch,NONE,1.1
Message-ID: <20080912194302.6390B70131@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/ssmtp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7403

Added Files:
	ssmtp-unitialized-strdup.patch 
Log Message:
patch for CVE-2008-3962


ssmtp-unitialized-strdup.patch:

--- NEW FILE ssmtp-unitialized-strdup.patch ---
--- ssmtp-2.61/ssmtp.c.orig	2008-09-11 18:04:07.000000000 +0300
+++ ssmtp-2.61/ssmtp.c	2008-09-11 18:07:14.000000000 +0300
@@ -489,6 +489,11 @@ char *from_format(char *str, bool_t over
 				die("from_format() -- snprintf() failed");
 			}
 		}
+		else {
+			if(snprintf(buf, BUF_SZ, "%s", str) == -1) {
+				die("from_format() -- snprintf() failed");
+			}
+		}
 	}
 
 #if 0



From kkofler at fedoraproject.org  Fri Sep 12 19:53:21 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 12 Sep 2008 19:53:21 +0000 (UTC)
Subject: rpms/kde-l10n/F-9 .cvsignore, 1.10, 1.11 kde-l10n.spec, 1.35,
	1.36 sources, 1.12, 1.13 subdirs-kde-l10n, 1.6, 1.7
Message-ID: <20080912195321.4493070131@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-l10n/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9909/F-9

Modified Files:
	.cvsignore kde-l10n.spec sources subdirs-kde-l10n 
Log Message:
* Wed Sep 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
- reenable Frisian and Kazakh


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	25 Jul 2008 11:45:35 -0000	1.10
+++ .cvsignore	12 Sep 2008 19:52:50 -0000	1.11
@@ -1,358 +1,44 @@
-kde-l10n-ar-4.0.0.tar.bz2
-kde-l10n-bg-4.0.0.tar.bz2
-kde-l10n-ca-4.0.0.tar.bz2
-kde-l10n-de-4.0.0.tar.bz2
-kde-l10n-el-4.0.0.tar.bz2
-kde-l10n-en_GB-4.0.0.tar.bz2
-kde-l10n-es-4.0.0.tar.bz2
-kde-l10n-et-4.0.0.tar.bz2
-kde-l10n-fi-4.0.0.tar.bz2
-kde-l10n-fr-4.0.0.tar.bz2
-kde-l10n-hu-4.0.0.tar.bz2
-kde-l10n-it-4.0.0.tar.bz2
-kde-l10n-ja-4.0.0.tar.bz2
-kde-l10n-ko-4.0.0.tar.bz2
-kde-l10n-nb-4.0.0.tar.bz2
-kde-l10n-nl-4.0.0.tar.bz2
-kde-l10n-nn-4.0.0.tar.bz2
-kde-l10n-pa-4.0.0.tar.bz2
-kde-l10n-pl-4.0.0.tar.bz2
-kde-l10n-pt-4.0.0.tar.bz2
-kde-l10n-pt_BR-4.0.0.tar.bz2
-kde-l10n-ru-4.0.0.tar.bz2
-kde-l10n-sl-4.0.0.tar.bz2
-kde-l10n-sv-4.0.0.tar.bz2
-kde-l10n-th-4.0.0.tar.bz2
-kde-l10n-tr-4.0.0.tar.bz2
-kde-l10n-uk-4.0.0.tar.bz2
-kde-l10n-zh_CN-4.0.0.tar.bz2
-kde-l10n-zh_TW-4.0.0.tar.bz2
-kde-l10n-be-4.0.0.tar.bz2
-kde-l10n-csb-4.0.0.tar.bz2
-kde-l10n-eo-4.0.0.tar.bz2
-kde-l10n-eu-4.0.0.tar.bz2
-kde-l10n-ga-4.0.0.tar.bz2
-kde-l10n-gl-4.0.0.tar.bz2
-kde-l10n-hi-4.0.0.tar.bz2
-kde-l10n-km-4.0.0.tar.bz2
-kde-l10n-lv-4.0.0.tar.bz2
-kde-l10n-mk-4.0.0.tar.bz2
-kde-l10n-nds-4.0.0.tar.bz2
-kde-l10n-ne-4.0.0.tar.bz2
-kde-l10n-se-4.0.0.tar.bz2
-kde-l10n-wa-4.0.0.tar.bz2
-kde-l10n-ar-4.0.1.tar.bz2
-kde-l10n-be-4.0.1.tar.bz2
-kde-l10n-bg-4.0.1.tar.bz2
-kde-l10n-ca-4.0.1.tar.bz2
-kde-l10n-cs-4.0.1.tar.bz2
-kde-l10n-csb-4.0.1.tar.bz2
-kde-l10n-da-4.0.1.tar.bz2
-kde-l10n-de-4.0.1.tar.bz2
-kde-l10n-el-4.0.1.tar.bz2
-kde-l10n-en_GB-4.0.1.tar.bz2
-kde-l10n-eo-4.0.1.tar.bz2
-kde-l10n-es-4.0.1.tar.bz2
-kde-l10n-et-4.0.1.tar.bz2
-kde-l10n-eu-4.0.1.tar.bz2
-kde-l10n-fi-4.0.1.tar.bz2
-kde-l10n-fr-4.0.1.tar.bz2
-kde-l10n-ga-4.0.1.tar.bz2
-kde-l10n-gl-4.0.1.tar.bz2
-kde-l10n-hi-4.0.1.tar.bz2
-kde-l10n-hu-4.0.1.tar.bz2
-kde-l10n-it-4.0.1.tar.bz2
-kde-l10n-ja-4.0.1.tar.bz2
-kde-l10n-km-4.0.1.tar.bz2
-kde-l10n-ko-4.0.1.tar.bz2
-kde-l10n-mk-4.0.1.tar.bz2
-kde-l10n-lv-4.0.1.tar.bz2
-kde-l10n-nb-4.0.1.tar.bz2
-kde-l10n-nds-4.0.1.tar.bz2
-kde-l10n-ne-4.0.1.tar.bz2
-kde-l10n-nl-4.0.1.tar.bz2
-kde-l10n-nn-4.0.1.tar.bz2
-kde-l10n-pa-4.0.1.tar.bz2
-kde-l10n-pl-4.0.1.tar.bz2
-kde-l10n-pt-4.0.1.tar.bz2
-kde-l10n-pt_BR-4.0.1.tar.bz2
-kde-l10n-ru-4.0.1.tar.bz2
-kde-l10n-se-4.0.1.tar.bz2
-kde-l10n-sl-4.0.1.tar.bz2
-kde-l10n-sv-4.0.1.tar.bz2
-kde-l10n-th-4.0.1.tar.bz2
-kde-l10n-tr-4.0.1.tar.bz2
-kde-l10n-uk-4.0.1.tar.bz2
-kde-l10n-wa-4.0.1.tar.bz2
-kde-l10n-zh_CN-4.0.1.tar.bz2
-kde-l10n-zh_TW-4.0.1.tar.bz2
-kde-l10n-ar-4.0.2.tar.bz2
-kde-l10n-be-4.0.2.tar.bz2
-kde-l10n-bg-4.0.2.tar.bz2
-kde-l10n-ca-4.0.2.tar.bz2
-kde-l10n-cs-4.0.2.tar.bz2
-kde-l10n-csb-4.0.2.tar.bz2
-kde-l10n-da-4.0.2.tar.bz2
-kde-l10n-de-4.0.2.tar.bz2
-kde-l10n-el-4.0.2.tar.bz2
-kde-l10n-en_GB-4.0.2.tar.bz2
-kde-l10n-eo-4.0.2.tar.bz2
-kde-l10n-es-4.0.2.tar.bz2
-kde-l10n-et-4.0.2.tar.bz2
-kde-l10n-eu-4.0.2.tar.bz2
-kde-l10n-fi-4.0.2.tar.bz2
-kde-l10n-fr-4.0.2.tar.bz2
-kde-l10n-ga-4.0.2.tar.bz2
-kde-l10n-gl-4.0.2.tar.bz2
-kde-l10n-hi-4.0.2.tar.bz2
-kde-l10n-hu-4.0.2.tar.bz2
-kde-l10n-it-4.0.2.tar.bz2
-kde-l10n-ja-4.0.2.tar.bz2
-kde-l10n-km-4.0.2.tar.bz2
-kde-l10n-ko-4.0.2.tar.bz2
-kde-l10n-mk-4.0.2.tar.bz2
-kde-l10n-lv-4.0.2.tar.bz2
-kde-l10n-nb-4.0.2.tar.bz2
-kde-l10n-nds-4.0.2.tar.bz2
-kde-l10n-ne-4.0.2.tar.bz2
-kde-l10n-nl-4.0.2.tar.bz2
-kde-l10n-nn-4.0.2.tar.bz2
-kde-l10n-pa-4.0.2.tar.bz2
-kde-l10n-pl-4.0.2.tar.bz2
-kde-l10n-pt-4.0.2.tar.bz2
-kde-l10n-pt_BR-4.0.2.tar.bz2
-kde-l10n-ru-4.0.2.tar.bz2
-kde-l10n-se-4.0.2.tar.bz2
-kde-l10n-sl-4.0.2.tar.bz2
-kde-l10n-sv-4.0.2.tar.bz2
-kde-l10n-th-4.0.2.tar.bz2
-kde-l10n-tr-4.0.2.tar.bz2
-kde-l10n-uk-4.0.2.tar.bz2
-kde-l10n-wa-4.0.2.tar.bz2
-kde-l10n-zh_CN-4.0.2.tar.bz2
-kde-l10n-zh_TW-4.0.2.tar.bz2
-kde-l10n-ar-4.0.3.tar.bz2
-kde-l10n-be-4.0.3.tar.bz2
-kde-l10n-bg-4.0.3.tar.bz2
-kde-l10n-ca-4.0.3.tar.bz2
-kde-l10n-cs-4.0.3.tar.bz2
-kde-l10n-csb-4.0.3.tar.bz2
-kde-l10n-da-4.0.3.tar.bz2
-kde-l10n-de-4.0.3.tar.bz2
-kde-l10n-el-4.0.3.tar.bz2
-kde-l10n-en_GB-4.0.3.tar.bz2
-kde-l10n-eo-4.0.3.tar.bz2
-kde-l10n-es-4.0.3.tar.bz2
-kde-l10n-et-4.0.3.tar.bz2
-kde-l10n-eu-4.0.3.tar.bz2
-kde-l10n-fi-4.0.3.tar.bz2
-kde-l10n-fr-4.0.3.tar.bz2
-kde-l10n-ga-4.0.3.tar.bz2
-kde-l10n-gl-4.0.3.tar.bz2
-kde-l10n-hi-4.0.3.tar.bz2
-kde-l10n-hu-4.0.3.tar.bz2
-kde-l10n-it-4.0.3.tar.bz2
-kde-l10n-ja-4.0.3.tar.bz2
-kde-l10n-km-4.0.3.tar.bz2
-kde-l10n-ko-4.0.3.tar.bz2
-kde-l10n-mk-4.0.3.tar.bz2
-kde-l10n-lv-4.0.3.tar.bz2
-kde-l10n-nb-4.0.3.tar.bz2
-kde-l10n-nds-4.0.3.tar.bz2
-kde-l10n-ne-4.0.3.tar.bz2
-kde-l10n-nl-4.0.3.tar.bz2
-kde-l10n-nn-4.0.3.tar.bz2
-kde-l10n-pa-4.0.3.tar.bz2
-kde-l10n-pl-4.0.3.tar.bz2
-kde-l10n-pt-4.0.3.tar.bz2
-kde-l10n-pt_BR-4.0.3.tar.bz2
-kde-l10n-ru-4.0.3.tar.bz2
-kde-l10n-se-4.0.3.tar.bz2
-kde-l10n-sl-4.0.3.tar.bz2
-kde-l10n-sv-4.0.3.tar.bz2
-kde-l10n-th-4.0.3.tar.bz2
-kde-l10n-tr-4.0.3.tar.bz2
-kde-l10n-uk-4.0.3.tar.bz2
-kde-l10n-wa-4.0.3.tar.bz2
-kde-l10n-zh_CN-4.0.3.tar.bz2
-kde-l10n-zh_TW-4.0.3.tar.bz2
-kde-l10n-ar-4.0.80.tar.bz2
-kde-l10n-be-4.0.80.tar.bz2
-kde-l10n-bg-4.0.80.tar.bz2
-kde-l10n-ca-4.0.80.tar.bz2
-kde-l10n-cs-4.0.80.tar.bz2
-kde-l10n-csb-4.0.80.tar.bz2
-kde-l10n-de-4.0.80.tar.bz2
-kde-l10n-el-4.0.80.tar.bz2
-kde-l10n-en_GB-4.0.80.tar.bz2
-kde-l10n-eo-4.0.80.tar.bz2
-kde-l10n-es-4.0.80.tar.bz2
-kde-l10n-et-4.0.80.tar.bz2
-kde-l10n-eu-4.0.80.tar.bz2
-kde-l10n-fi-4.0.80.tar.bz2
-kde-l10n-fr-4.0.80.tar.bz2
-kde-l10n-ga-4.0.80.tar.bz2
-kde-l10n-gl-4.0.80.tar.bz2
-kde-l10n-hi-4.0.80.tar.bz2
-kde-l10n-hu-4.0.80.tar.bz2
-kde-l10n-it-4.0.80.tar.bz2
-kde-l10n-ja-4.0.80.tar.bz2
-kde-l10n-km-4.0.80.tar.bz2
-kde-l10n-ko-4.0.80.tar.bz2
-kde-l10n-mk-4.0.80.tar.bz2
-kde-l10n-lv-4.0.80.tar.bz2
-kde-l10n-nb-4.0.80.tar.bz2
-kde-l10n-nds-4.0.80.tar.bz2
-kde-l10n-ne-4.0.80.tar.bz2
-kde-l10n-nl-4.0.80.tar.bz2
-kde-l10n-nn-4.0.80.tar.bz2
-kde-l10n-pa-4.0.80.tar.bz2
-kde-l10n-pl-4.0.80.tar.bz2
-kde-l10n-pt-4.0.80.tar.bz2
-kde-l10n-pt_BR-4.0.80.tar.bz2
-kde-l10n-ru-4.0.80.tar.bz2
-kde-l10n-se-4.0.80.tar.bz2
-kde-l10n-sl-4.0.80.tar.bz2
-kde-l10n-sv-4.0.80.tar.bz2
-kde-l10n-th-4.0.80.tar.bz2
-kde-l10n-tr-4.0.80.tar.bz2
-kde-l10n-uk-4.0.80.tar.bz2
-kde-l10n-wa-4.0.80.tar.bz2
-kde-l10n-zh_CN-4.0.80.tar.bz2
-kde-l10n-zh_TW-4.0.80.tar.bz2
-kde-l10n-ar-4.0.83.tar.bz2
-kde-l10n-be-4.0.83.tar.bz2
-kde-l10n-bg-4.0.83.tar.bz2
-kde-l10n-ca-4.0.83.tar.bz2
-kde-l10n-cs-4.0.83.tar.bz2
-kde-l10n-csb-4.0.83.tar.bz2
-kde-l10n-da-4.0.83.tar.bz2
-kde-l10n-de-4.0.83.tar.bz2
-kde-l10n-el-4.0.83.tar.bz2
-kde-l10n-en_GB-4.0.83.tar.bz2
-kde-l10n-eo-4.0.83.tar.bz2
-kde-l10n-es-4.0.83.tar.bz2
-kde-l10n-et-4.0.83.tar.bz2
-kde-l10n-eu-4.0.83.tar.bz2
-kde-l10n-fi-4.0.83.tar.bz2
-kde-l10n-fr-4.0.83.tar.bz2
-kde-l10n-ga-4.0.83.tar.bz2
-kde-l10n-gl-4.0.83.tar.bz2
-kde-l10n-hi-4.0.83.tar.bz2
-kde-l10n-hu-4.0.83.tar.bz2
-kde-l10n-it-4.0.83.tar.bz2
-kde-l10n-ja-4.0.83.tar.bz2
-kde-l10n-km-4.0.83.tar.bz2
-kde-l10n-ko-4.0.83.tar.bz2
-kde-l10n-mk-4.0.83.tar.bz2
-kde-l10n-lv-4.0.83.tar.bz2
-kde-l10n-nb-4.0.83.tar.bz2
-kde-l10n-nds-4.0.83.tar.bz2
-kde-l10n-ne-4.0.83.tar.bz2
-kde-l10n-nl-4.0.83.tar.bz2
-kde-l10n-nn-4.0.83.tar.bz2
-kde-l10n-pa-4.0.83.tar.bz2
-kde-l10n-pl-4.0.83.tar.bz2
-kde-l10n-pt-4.0.83.tar.bz2
-kde-l10n-pt_BR-4.0.83.tar.bz2
-kde-l10n-ru-4.0.83.tar.bz2
-kde-l10n-se-4.0.83.tar.bz2
-kde-l10n-sl-4.0.83.tar.bz2
-kde-l10n-sv-4.0.83.tar.bz2
-kde-l10n-ta-4.0.83.tar.bz2
-kde-l10n-th-4.0.83.tar.bz2
-kde-l10n-tr-4.0.83.tar.bz2
-kde-l10n-uk-4.0.83.tar.bz2
-kde-l10n-wa-4.0.83.tar.bz2
-kde-l10n-zh_CN-4.0.83.tar.bz2
-kde-l10n-zh_TW-4.0.83.tar.bz2
-kde-l10n-sr-4.0.83.tar.bz2
-kde-l10n-ar-4.0.98.tar.bz2
-kde-l10n-be-4.0.98.tar.bz2
-kde-l10n-bg-4.0.98.tar.bz2
-kde-l10n-ca-4.0.98.tar.bz2
-kde-l10n-cs-4.0.98.tar.bz2
-kde-l10n-csb-4.0.98.tar.bz2
-kde-l10n-da-4.0.98.tar.bz2
-kde-l10n-de-4.0.98.tar.bz2
-kde-l10n-el-4.0.98.tar.bz2
-kde-l10n-en_GB-4.0.98.tar.bz2
-kde-l10n-eo-4.0.98.tar.bz2
-kde-l10n-es-4.0.98.tar.bz2
-kde-l10n-et-4.0.98.tar.bz2
-kde-l10n-eu-4.0.98.tar.bz2
-kde-l10n-fi-4.0.98.tar.bz2
-kde-l10n-fr-4.0.98.tar.bz2
-kde-l10n-ga-4.0.98.tar.bz2
-kde-l10n-gl-4.0.98.tar.bz2
-kde-l10n-hi-4.0.98.tar.bz2
-kde-l10n-hu-4.0.98.tar.bz2
-kde-l10n-it-4.0.98.tar.bz2
-kde-l10n-ja-4.0.98.tar.bz2
-kde-l10n-km-4.0.98.tar.bz2
-kde-l10n-ko-4.0.98.tar.bz2
-kde-l10n-mk-4.0.98.tar.bz2
-kde-l10n-lv-4.0.98.tar.bz2
-kde-l10n-nb-4.0.98.tar.bz2
-kde-l10n-nds-4.0.98.tar.bz2
-kde-l10n-ne-4.0.98.tar.bz2
-kde-l10n-nl-4.0.98.tar.bz2
-kde-l10n-nn-4.0.98.tar.bz2
-kde-l10n-pa-4.0.98.tar.bz2
-kde-l10n-pl-4.0.98.tar.bz2
-kde-l10n-pt-4.0.98.tar.bz2
-kde-l10n-pt_BR-4.0.98.tar.bz2
-kde-l10n-ru-4.0.98.tar.bz2
-kde-l10n-se-4.0.98.tar.bz2
-kde-l10n-sl-4.0.98.tar.bz2
-kde-l10n-sr-4.0.98.tar.bz2
-kde-l10n-sv-4.0.98.tar.bz2
-kde-l10n-ta-4.0.98.tar.bz2
-kde-l10n-th-4.0.98.tar.bz2
-kde-l10n-tr-4.0.98.tar.bz2
-kde-l10n-uk-4.0.98.tar.bz2
-kde-l10n-wa-4.0.98.tar.bz2
-kde-l10n-zh_CN-4.0.98.tar.bz2
-kde-l10n-zh_TW-4.0.98.tar.bz2
-kde-l10n-bg-4.1.0.tar.bz2
-kde-l10n-ca-4.1.0.tar.bz2
-kde-l10n-cs-4.1.0.tar.bz2
-kde-l10n-csb-4.1.0.tar.bz2
-kde-l10n-da-4.1.0.tar.bz2
-kde-l10n-de-4.1.0.tar.bz2
-kde-l10n-el-4.1.0.tar.bz2
-kde-l10n-en_GB-4.1.0.tar.bz2
-kde-l10n-eo-4.1.0.tar.bz2
-kde-l10n-es-4.1.0.tar.bz2
-kde-l10n-et-4.1.0.tar.bz2
-kde-l10n-fi-4.1.0.tar.bz2
-kde-l10n-fr-4.1.0.tar.bz2
-kde-l10n-ga-4.1.0.tar.bz2
-kde-l10n-gl-4.1.0.tar.bz2
-kde-l10n-hi-4.1.0.tar.bz2
-kde-l10n-hu-4.1.0.tar.bz2
-kde-l10n-it-4.1.0.tar.bz2
-kde-l10n-ja-4.1.0.tar.bz2
-kde-l10n-km-4.1.0.tar.bz2
-kde-l10n-ko-4.1.0.tar.bz2
-kde-l10n-mk-4.1.0.tar.bz2
-kde-l10n-lv-4.1.0.tar.bz2
-kde-l10n-nb-4.1.0.tar.bz2
-kde-l10n-nds-4.1.0.tar.bz2
-kde-l10n-nl-4.1.0.tar.bz2
-kde-l10n-nn-4.1.0.tar.bz2
-kde-l10n-pa-4.1.0.tar.bz2
-kde-l10n-pl-4.1.0.tar.bz2
-kde-l10n-pt-4.1.0.tar.bz2
-kde-l10n-pt_BR-4.1.0.tar.bz2
-kde-l10n-ru-4.1.0.tar.bz2
-kde-l10n-sl-4.1.0.tar.bz2
-kde-l10n-sr-4.1.0.tar.bz2
-kde-l10n-sv-4.1.0.tar.bz2
-kde-l10n-ta-4.1.0.tar.bz2
-kde-l10n-th-4.1.0.tar.bz2
-kde-l10n-tr-4.1.0.tar.bz2
-kde-l10n-uk-4.1.0.tar.bz2
-kde-l10n-wa-4.1.0.tar.bz2
-kde-l10n-zh_CN-4.1.0.tar.bz2
-kde-l10n-zh_TW-4.1.0.tar.bz2
+kde-l10n-bg-4.1.1.tar.bz2
+kde-l10n-ca-4.1.1.tar.bz2
+kde-l10n-cs-4.1.1.tar.bz2
+kde-l10n-csb-4.1.1.tar.bz2
+kde-l10n-da-4.1.1.tar.bz2
+kde-l10n-de-4.1.1.tar.bz2
+kde-l10n-el-4.1.1.tar.bz2
+kde-l10n-en_GB-4.1.1.tar.bz2
+kde-l10n-eo-4.1.1.tar.bz2
+kde-l10n-es-4.1.1.tar.bz2
+kde-l10n-et-4.1.1.tar.bz2
+kde-l10n-fi-4.1.1.tar.bz2
+kde-l10n-fr-4.1.1.tar.bz2
+kde-l10n-ga-4.1.1.tar.bz2
+kde-l10n-gl-4.1.1.tar.bz2
+kde-l10n-hi-4.1.1.tar.bz2
+kde-l10n-hu-4.1.1.tar.bz2
+kde-l10n-it-4.1.1.tar.bz2
+kde-l10n-ja-4.1.1.tar.bz2
+kde-l10n-km-4.1.1.tar.bz2
+kde-l10n-ko-4.1.1.tar.bz2
+kde-l10n-mk-4.1.1.tar.bz2
+kde-l10n-lv-4.1.1.tar.bz2
+kde-l10n-nb-4.1.1.tar.bz2
+kde-l10n-nds-4.1.1.tar.bz2
+kde-l10n-nl-4.1.1.tar.bz2
+kde-l10n-nn-4.1.1.tar.bz2
+kde-l10n-pa-4.1.1.tar.bz2
+kde-l10n-pl-4.1.1.tar.bz2
+kde-l10n-pt-4.1.1.tar.bz2
+kde-l10n-pt_BR-4.1.1.tar.bz2
+kde-l10n-ru-4.1.1.tar.bz2
+kde-l10n-sl-4.1.1.tar.bz2
+kde-l10n-sr-4.1.1.tar.bz2
+kde-l10n-sv-4.1.1.tar.bz2
+kde-l10n-ta-4.1.1.tar.bz2
+kde-l10n-th-4.1.1.tar.bz2
+kde-l10n-tr-4.1.1.tar.bz2
+kde-l10n-uk-4.1.1.tar.bz2
+kde-l10n-wa-4.1.1.tar.bz2
+kde-l10n-zh_CN-4.1.1.tar.bz2
+kde-l10n-zh_TW-4.1.1.tar.bz2
+kde-l10n-fy-4.1.1.tar.bz2
+kde-l10n-kk-4.1.1.tar.bz2


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/kde-l10n.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kde-l10n.spec	29 Aug 2008 19:49:30 -0000	1.35
+++ kde-l10n.spec	12 Sep 2008 19:52:50 -0000	1.36
@@ -2,7 +2,7 @@
 
 Name: kde-l10n
 Version: 4.1.1
-Release: 1%{dist}
+Release: 2%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -57,6 +57,8 @@
 Source45: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2
 Source46: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2
 Source47: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sr-%{version}.tar.bz2
+Source48: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2
+Source49: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kk-%{version}.tar.bz2
 
 Source1000: subdirs-kde-l10n
 
@@ -398,6 +400,15 @@
 %description Kashubian
 Kashubian language support for KDE
 
+%package Kazakh
+Summary: Kazakh language support for KDE
+Group: User Interface/Desktops
+Requires: kde-filesystem
+Provides: %{name}-kk = %{version}-%{release}
+
+%description Kazakh
+Kazakh language support for KDE
+
 %package Khmer
 Summary: Khmer language support for KDE
 Group: User Interface/Desktops
@@ -964,11 +975,9 @@
 %lang(fr) %{_kde4_appsdir}/kvtml/fr
 %lang(fr) %{_kde4_docdir}/HTML/fr
 
-%if %{buildall}
 %files Frisian
 %defattr(-,root,root)
 %lang(fy) %{_datadir}/locale/fy/*
-%endif
 
 %files Irish
 %defattr(-,root,root)
@@ -1036,6 +1045,10 @@
 %defattr(-,root,root)
 %lang(csb) %{_datadir}/locale/csb/*
 
+%files Kazakh
+%defattr(-,root,root)
+%lang(kk) %{_datadir}/locale/kk/*
+
 %files Khmer
 %defattr(-,root,root)
 %lang(km) %{_datadir}/locale/km/*
@@ -1280,6 +1293,9 @@
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Wed Sep 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
+- reenable Frisian and Kazakh
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	1 Sep 2008 17:08:49 -0000	1.12
+++ sources	12 Sep 2008 19:52:50 -0000	1.13
@@ -40,3 +40,5 @@
 134cd3d65db7352e88f05df547af04db  kde-l10n-zh_CN-4.1.1.tar.bz2
 4ec74453141d23c503123e788a491c98  kde-l10n-zh_TW-4.1.1.tar.bz2
 b29bc82068ac7d3443fffe924356a7fd  kde-l10n-sr-4.1.1.tar.bz2
+d8482cd920425ca38174ee9dec21c606  kde-l10n-fy-4.1.1.tar.bz2
+a58a0bc175b711da8b36d57e17719f5c  kde-l10n-kk-4.1.1.tar.bz2


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/subdirs-kde-l10n,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- subdirs-kde-l10n	25 Jul 2008 11:45:35 -0000	1.6
+++ subdirs-kde-l10n	12 Sep 2008 19:52:50 -0000	1.7
@@ -11,12 +11,14 @@
 et
 fi
 fr
+fy
 ga
 gl
 hi
 hu
 it
 ja
+kk
 km
 ko
 mk



From transif at fedoraproject.org  Fri Sep 12 19:57:43 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Fri, 12 Sep 2008 19:57:43 +0000 (UTC)
Subject: comps/po fi.po,1.17,1.18
Message-ID: <20080912195743.2098170131@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10690/po

Modified Files:
	fi.po 
Log Message:
    2008-09-12  Ville-Pekka Vainio <vpivaini at cs.helsinki.fi> (via
vpv at fedoraproject.org)
    
      * po/fi.po: Updated Finnish translation
    



Index: fi.po
===================================================================
RCS file: /cvs/pkgs/comps/po/fi.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fi.po	10 Sep 2008 22:57:55 -0000	1.17
+++ fi.po	12 Sep 2008 19:57:12 -0000	1.18
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: fi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-10 18:57-0400\n"
-"PO-Revision-Date: 2008-08-31 01:08+0300\n"
+"POT-Creation-Date: 2008-09-12 17:25+0000\n"
+"PO-Revision-Date: 2008-09-12 22:55+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"
@@ -712,52 +712,52 @@
 msgstr "Espanjan kielituki"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:153 ../comps-el4.xml.in.h:46
+#: ../comps-f10.xml.in.h:154 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "Ohjelmistokehitystuki Java-ohjelmointikielelle."
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:154 ../comps-el4.xml.in.h:47
+#: ../comps-f10.xml.in.h:155 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "Tuki Java-ohjelmointikielell?? tehtyjen ohjelmien suorittamiseen."
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:155
+#: ../comps-f10.xml.in.h:156
 msgid "Swati Support"
 msgstr "Siswatin kielituki"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:156
+#: ../comps-f10.xml.in.h:157
 msgid "Swedish Support"
 msgstr "Ruotsin kielituki"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:157 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
+#: ../comps-f10.xml.in.h:158 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "J??rjestelm??ty??kalut"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:158
+#: ../comps-f10.xml.in.h:159
 msgid "Tagalog Support"
 msgstr "Tagalogin kielituki"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:160
+#: ../comps-f10.xml.in.h:161
 msgid "Tamil Support"
 msgstr "Tamilin kielituki"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:161
+#: ../comps-f10.xml.in.h:162
 msgid "Telugu Support"
 msgstr "Telugun kielituki"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:162 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
+#: ../comps-f10.xml.in.h:163 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "Tekstipohjainen Internet"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:163
+#: ../comps-f10.xml.in.h:164
 msgid "Thai Support"
 msgstr "Thain kielituki"
 
@@ -766,12 +766,12 @@
 msgstr "Eclipse-ohjelmistokehitysymp??rist??."
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:164 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
+#: ../comps-f10.xml.in.h:165 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "Sovellukset sis??lt??v??t mm. toimistosovelluksia ja PDF-n??yttimi??."
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:165
+#: ../comps-f10.xml.in.h:166
 msgid ""
 "The packages in this group are core libraries needed to develop applications."
 msgstr ""
@@ -779,27 +779,27 @@
 "kirjastoja."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:166 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
+#: ../comps-f10.xml.in.h:167 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr ""
 "N??m?? paketit mahdollistavat IMAP- tai SMTP-postipalvelimen perustamisen."
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:167
+#: ../comps-f10.xml.in.h:168
 msgid ""
 "These packages allow you to develop applications for the X Window System."
 msgstr ""
 "N??m?? paketit mahdollistavat ohjelmistokehityksen X-ikkunointij??rjestelm??lle."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:168 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
+#: ../comps-f10.xml.in.h:169 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
 msgid ""
 "These packages are helpful when developing web applications or web pages."
 msgstr ""
 "N??m?? paketit ovat hy??dyllisi?? kehitett??ess?? web-sovelluksia tai web-sivuja."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:169
+#: ../comps-f10.xml.in.h:170
 msgid ""
 "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
@@ -807,7 +807,7 @@
 "ja NIS:n."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:170
+#: ../comps-f10.xml.in.h:171
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -816,17 +816,17 @@
 "lle ja telnetille."
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:171
+#: ../comps-f10.xml.in.h:172
 msgid "These packages provide a virtualization environment."
 msgstr "N??m?? paketit tarjoavat virtualisointiymp??rist??n."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:172
+#: ../comps-f10.xml.in.h:173
 msgid "These packages provide compatibility with previous releases."
 msgstr "N??m?? paketit tarjoavat yhteensopivuuden aiempien julkaisujen kanssa."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:173
+#: ../comps-f10.xml.in.h:174
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -834,7 +834,7 @@
 "T??m?? paketti tarjoaa tuen useita kirjasimia ja sy??tt??tapoja useille kielille."
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:174
+#: ../comps-f10.xml.in.h:175
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -843,17 +843,17 @@
 "niiden muuntamisen HTML:ksi, PDF:ksi, Postscriptiksi tai tekstiksi."
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
+#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "N??ill?? ty??kaluilla j??rjestelm??ss?? voidaan ajaa WWW-palvelinta."
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
+#: ../comps-f10.xml.in.h:177 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "N??ill?? ty??kaluilla j??rjestelm??ss?? voidaan ajaa FTP-palvelinta."
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:177 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
+#: ../comps-f10.xml.in.h:178 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -862,17 +862,17 @@
 "perlin, pythonin ja vianj??ljitysohjelmia."
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:178 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
+#: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "T??m?? ryhm?? mahdollistaa postipalvelimen konfiguroinnin j??rjestelm????n."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:179
+#: ../comps-f10.xml.in.h:180
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "T??m?? ryhm?? sis??lt???? kaikki Red Hatin omat palvelinasetusty??kalut."
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:180
+#: ../comps-f10.xml.in.h:181
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -881,12 +881,12 @@
 "palomuurin luomiseksi."
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
+#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "T??m?? ryhm?? sis??lt???? graafisia s??hk??posti-, WWW- ja keskusteluohjelmia."
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
+#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -895,12 +895,12 @@
 "sek?? piirt??miseen, ja my??s yksik??nmuunnoksiin."
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
+#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "T??m?? ryhm?? sis??lt???? paketteja kuvien muokkaamiseen ja skannaamiseen."
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
+#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -910,7 +910,7 @@
 "ikkunointij??rjestelm????."
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
+#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -919,7 +919,7 @@
 "k??ytt??j??tunnuksien ja j??rjestelm??n laitteiston hallinnan."
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
+#: ../comps-f10.xml.in.h:187 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of tools and resources of Armenian environments."
 msgstr ""
@@ -927,13 +927,13 @@
 "ymp??rist??ihin."
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:187 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
+#: ../comps-f10.xml.in.h:188 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
 msgid ""
 "This group is a collection of tools for various hardware specific utilities."
 msgstr "T??m?? ryhm?? on kokoelma laitteistospesifisi?? hy??tyohjelmia."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:188 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
+#: ../comps-f10.xml.in.h:189 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
 "client for connecting to SMB shares and tools to monitor network traffic."
@@ -943,14 +943,14 @@
 "tarkkailuun."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:189
+#: ../comps-f10.xml.in.h:190
 msgid ""
 "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
 "T??m?? paketti mahdollistaa DNS-nimipalvelimen (BIND) ajamisen j??rjestelm??ss??."
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:190
+#: ../comps-f10.xml.in.h:191
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -959,136 +959,136 @@
 "j??rjestelmien v??lill??."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:191
+#: ../comps-f10.xml.in.h:192
 msgid "This package group contains packages useful for use with MySQL."
 msgstr ""
 "T??m?? pakettiryhm?? sis??lt???? hy??dyllisi?? paketteja k??ytett??v??ksi MySQL:n "
 "kanssa."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:192
+#: ../comps-f10.xml.in.h:193
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr ""
 "T??m?? pakettiryhm?? sis??lt???? hy??dyllisi?? paketteja k??ytett??v??ksi Postgresql:n "
 "kanssa."
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:193
+#: ../comps-f10.xml.in.h:194
 msgid "Tibetan Support"
 msgstr "Tiibetin kielituki"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:194
+#: ../comps-f10.xml.in.h:195
 msgid "Tonga Support"
 msgstr "Tongan kielituki"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:195 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
+#: ../comps-f10.xml.in.h:196 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Fedora-paketoijan tarvitsemia ty??kaluja ja ohjelmia"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:196
+#: ../comps-f10.xml.in.h:197
 msgid "Tsonga Support"
 msgstr "Tsongan kielituki"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:197
+#: ../comps-f10.xml.in.h:198
 msgid "Tswana Support"
 msgstr "T??wanan kielituki"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:198
+#: ../comps-f10.xml.in.h:199
 msgid "Turkish Support"
 msgstr "Turkin kielituki"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:199
+#: ../comps-f10.xml.in.h:200
 msgid "Ukrainian Support"
 msgstr "Ukrainan kielituki"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:200
+#: ../comps-f10.xml.in.h:201
 msgid "Urdu Support"
 msgstr "Urdun kielituki"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:202 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
+#: ../comps-f10.xml.in.h:203 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "Erilaisia j??rjestelm??n ydinosia."
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:203 ../comps-el5.xml.in.h:72
+#: ../comps-f10.xml.in.h:204 ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "Useita tapoja rentoutumiseen ja vapaa-ajan viett??miseen."
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:204
+#: ../comps-f10.xml.in.h:205
 msgid "Venda Support"
 msgstr "Vendan kielituki"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:205
+#: ../comps-f10.xml.in.h:206
 msgid "Vietnamese Support"
 msgstr "Vietnamin kielituki"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:206
+#: ../comps-f10.xml.in.h:207
 msgid "Virtualization"
 msgstr "Virtualisointi"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:201
-#: ../comps-f10.xml.in.h:208 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
+#: ../comps-f10.xml.in.h:209 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "Web-kehitys"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:209 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
+#: ../comps-f10.xml.in.h:210 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "WWW-palvelin"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:210
+#: ../comps-f10.xml.in.h:211
 msgid "Welsh Support"
 msgstr "Kymrin kielituki"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:211 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
+#: ../comps-f10.xml.in.h:212 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "Ikkunank??sittelij??t"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:212
+#: ../comps-f10.xml.in.h:213
 msgid "Windows File Server"
 msgstr "Windows-tiedostopalvelin"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:213
+#: ../comps-f10.xml.in.h:214
 msgid "X Software Development"
 msgstr "X-ohjelmistokehitys"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:214 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
+#: ../comps-f10.xml.in.h:215 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X-ikkunointij??rjestelm??"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:215
+#: ../comps-f10.xml.in.h:216
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:216
+#: ../comps-f10.xml.in.h:217
 msgid "XFCE Software Development"
 msgstr "XFCE-ohjelmistokehitys"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:217
+#: ../comps-f10.xml.in.h:218
 msgid "Xhosa Support"
 msgstr "Xhosan kielituki"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:218
+#: ../comps-f10.xml.in.h:219
 msgid "Zulu Support"
 msgstr "Zulun kielituki"
 
@@ -1156,13 +1156,13 @@
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR on OLCP XO:lle kehitetty ty??p??yt??ymp??rist??."
 
-#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:207
+#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:208
 msgid "Walloon Support"
 msgstr "Vallonin kielituki"
 
 #: ../comps-f10.xml.in.h:70
-msgid "Haskell"
-msgstr "Haskell"
+msgid "Haskell Development"
+msgstr "Haskell-kehitys"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
@@ -1173,23 +1173,24 @@
 msgstr "Sy??tt??menetelm??paketteja kansainv??lisen tekstin sy??tt??miseen."
 
 #: ../comps-f10.xml.in.h:108
-#, fuzzy
 msgid "Maithili Support"
-msgstr "Marathin kielituki"
+msgstr "Maithilin kielituki"
 
 #: ../comps-f10.xml.in.h:115
-#, fuzzy
 msgid "Myanmar (Burmese) Support"
-msgstr "Vietnamin kielituki"
+msgstr "Myanmarin (burman) kielituki"
 
-#: ../comps-f10.xml.in.h:159
+#: ../comps-f10.xml.in.h:153
+msgid "Support for developing programs in the Haskell programming language."
+msgstr "Ohjelmistokehitystuki Haskell-ohjelmointikielelle."
+
+#: ../comps-f10.xml.in.h:160
 msgid "Tajik Support"
 msgstr "Tad??ikin kielituki"
 
-#: ../comps-f10.xml.in.h:201
-#, fuzzy
+#: ../comps-f10.xml.in.h:202
 msgid "Uzbek Support"
-msgstr "T??ekin kielituki"
+msgstr "Uzbekin kielituki"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1271,6 +1272,9 @@
 "T??m?? ryhm?? sis??lt???? kokoelman ty??kaluja ja v??lineit?? tsekkil??isiin "
 "ymp??rist??ihin."
 
+#~ msgid "Haskell"
+#~ msgstr "Haskell"
+
 #~ msgid "British Support"
 #~ msgstr "Brittienglannin kielituki"
 



From ajax at fedoraproject.org  Fri Sep 12 20:08:53 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri, 12 Sep 2008 20:08:53 +0000 (UTC)
Subject: rpms/xorg-x11-drv-evdev/devel evdev-2.0.4-cache-info.patch, 1.1,
	1.2 evdev-2.0.4-reopen-device.patch, 1.1,
	1.2 xorg-x11-drv-evdev.spec, 1.30, 1.31
Message-ID: <20080912200853.09F6970131@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12800

Modified Files:
	evdev-2.0.4-cache-info.patch evdev-2.0.4-reopen-device.patch 
	xorg-x11-drv-evdev.spec 
Log Message:
* Fri Sep 12 2008 Adam Jackson <ajax at redhat.com> 2.0.4-3
- evdev-2.0.4-reopen-device.patch: When arming the reopen timer, stash it in
  the driver private, and explicitly cancel it if the server decides to
  close the device for real.
- evdev-2.0.4-cache-info.patch: Rebase to account for same.


evdev-2.0.4-cache-info.patch:

Index: evdev-2.0.4-cache-info.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/evdev-2.0.4-cache-info.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evdev-2.0.4-cache-info.patch	28 Aug 2008 02:26:38 -0000	1.1
+++ evdev-2.0.4-cache-info.patch	12 Sep 2008 20:08:52 -0000	1.2
@@ -1,25 +1,6 @@
-From 441a97c22933db462dd53e000d1cb269dab6e825 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at redhat.com>
-Date: Thu, 28 Aug 2008 10:29:26 +0930
-Subject: [PATCH] Cache device information and compare against info after re-open.
-
-This way we ensure that if the topology changes under us, we don't open a
-completely different device. If a device has changed, we disable it.
-(cherry picked from commit 3bb7d100570134058eb4c906d4902c655148a8be)
-
-Conflicts:
-
-	src/evdev.c
-	src/evdev.h
----
- src/evdev.c |  131 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
- src/evdev.h |   12 +++++
- 2 files changed, 137 insertions(+), 6 deletions(-)
-
-diff --git a/src/evdev.c b/src/evdev.c
-index 16cf67f..ca6da6e 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
+diff -up xf86-input-evdev-2.0.4/src/evdev.c.jx xf86-input-evdev-2.0.4/src/evdev.c
+--- xf86-input-evdev-2.0.4/src/evdev.c.jx	2008-09-12 16:04:34.000000000 -0400
++++ xf86-input-evdev-2.0.4/src/evdev.c	2008-09-12 16:04:56.000000000 -0400
 @@ -98,6 +98,7 @@ static const char *evdevDefaults[] = {
  };
  
@@ -28,7 +9,7 @@
  
  static void
  SetXkbOption(InputInfoPtr pInfo, char *name, char **option)
-@@ -176,11 +177,19 @@ EvdevReopenTimer(OsTimerPtr timer, CARD32 time, pointer arg)
+@@ -176,12 +177,19 @@ EvdevReopenTimer(OsTimerPtr timer, CARD3
  
      if (pInfo->fd != -1)
      {
@@ -36,8 +17,8 @@
 -                pEvdev->reopen_attempts - pEvdev->reopen_left);
 -
          pEvdev->reopen_left = 0;
+ 	pEvdev->reopen_timer = NULL;
 -        EvdevOn(pInfo->dev);
-+
 +        if (EvdevCacheCompare(pInfo, TRUE) == Success)
 +        {
 +            xf86Msg(X_INFO, "%s: Device reopened after %d attempts.\n", pInfo->name,
@@ -52,7 +33,7 @@
          return 0;
      }
  
-@@ -368,8 +377,6 @@ EvdevReadInput(InputInfoPtr pInfo)
+@@ -370,8 +378,6 @@ EvdevReadInput(InputInfoPtr pInfo)
      }
  }
  
@@ -61,7 +42,7 @@
  #define TestBit(bit, array) (array[(bit) / LONG_BITS]) & (1 << ((bit) % LONG_BITS))
  
  static void
-@@ -994,6 +1001,116 @@ EvdevConvert(InputInfoPtr pInfo, int first, int num, int v0, int v1, int v2,
+@@ -1000,6 +1006,116 @@ EvdevConvert(InputInfoPtr pInfo, int fir
      return TRUE;
  }
  
@@ -178,7 +159,7 @@
  static int
  EvdevProbe(InputInfoPtr pInfo)
  {
-@@ -1173,6 +1290,8 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+@@ -1179,6 +1295,8 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr
          return NULL;
      }
  
@@ -187,10 +168,9 @@
      return pInfo;
  }
  
-diff --git a/src/evdev.h b/src/evdev.h
-index 0f8cf4b..47bbff2 100644
---- a/src/evdev.h
-+++ b/src/evdev.h
+diff -up xf86-input-evdev-2.0.4/src/evdev.h.jx xf86-input-evdev-2.0.4/src/evdev.h
+--- xf86-input-evdev-2.0.4/src/evdev.h.jx	2008-09-12 16:04:34.000000000 -0400
++++ xf86-input-evdev-2.0.4/src/evdev.h	2008-09-12 16:04:56.000000000 -0400
 @@ -40,6 +40,9 @@
  #include <X11/extensions/XKBstr.h>
  #endif
@@ -201,10 +181,10 @@
  typedef struct {
      const char *device;
      int kernel24;
-@@ -71,6 +74,15 @@ typedef struct {
- 
+@@ -72,6 +75,15 @@ typedef struct {
      int reopen_attempts; /* max attempts to re-open after read failure */
      int reopen_left;     /* number of attempts left to re-open the device */
+     OsTimerPtr reopen_timer;
 +
 +    /* Cached info from device. */
 +    char name[1024];
@@ -217,6 +197,3 @@
  } EvdevRec, *EvdevPtr;
  
  /* Middle Button emulation */
--- 
-1.5.6.4
-

evdev-2.0.4-reopen-device.patch:

Index: evdev-2.0.4-reopen-device.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/evdev-2.0.4-reopen-device.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evdev-2.0.4-reopen-device.patch	28 Aug 2008 02:26:38 -0000	1.1
+++ evdev-2.0.4-reopen-device.patch	12 Sep 2008 20:08:52 -0000	1.2
@@ -1,31 +1,6 @@
-From 188f07089d9c91d503391d05f0c3776360d7446b Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at redhat.com>
-Date: Thu, 28 Aug 2008 10:24:33 +0930
-Subject: [PATCH] Attempt to re-open devices on read errors.
-
-Coming back from resume may leave us with a file descriptor that can be opened
-but fails on the first read (ENODEV).
-In this case, try to open the device until it becomes available or until the
-predefined count expires.
-
-Adds option "ReopenAttempts" <int>
-(cherry picked from commit b41d39a745cce9e91241453935ea4c702772c5da)
-
-Conflicts:
-
-	man/evdev.man
-	src/evdev.c
-	src/evdev.h
----
- man/evdev.man |    5 ++
- src/evdev.c   |  130 ++++++++++++++++++++++++++++++++++++++++++++++++--------
- src/evdev.h   |    4 ++
- 3 files changed, 120 insertions(+), 19 deletions(-)
-
-diff --git a/man/evdev.man b/man/evdev.man
-index f438f78..530f979 100644
---- a/man/evdev.man
-+++ b/man/evdev.man
+diff -up xf86-input-evdev-2.0.4/man/evdev.man.reopen-device xf86-input-evdev-2.0.4/man/evdev.man
+--- xf86-input-evdev-2.0.4/man/evdev.man.reopen-device	2008-08-14 22:27:13.000000000 -0400
++++ xf86-input-evdev-2.0.4/man/evdev.man	2008-09-12 15:45:50.000000000 -0400
 @@ -67,6 +67,11 @@ button event is registered.
  Sets the timeout (in milliseconds) that the driver waits before deciding
  if two buttons where pressed "simultaneously" when 3 button emulation is
@@ -38,10 +13,9 @@
  .SH AUTHORS
  Kristian H??gsberg.
  .SH "SEE ALSO"
-diff --git a/src/evdev.c b/src/evdev.c
-index a857db3..16cf67f 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
+diff -up xf86-input-evdev-2.0.4/src/evdev.c.reopen-device xf86-input-evdev-2.0.4/src/evdev.c
+--- xf86-input-evdev-2.0.4/src/evdev.c.reopen-device	2008-08-14 22:27:13.000000000 -0400
++++ xf86-input-evdev-2.0.4/src/evdev.c	2008-09-12 15:55:42.000000000 -0400
 @@ -73,6 +73,7 @@
  #define EVDEV_RELATIVE_EVENTS	(1 << 2)
  #define EVDEV_ABSOLUTE_EVENTS	(1 << 3)
@@ -59,7 +33,7 @@
  static void
  SetXkbOption(InputInfoPtr pInfo, char *name, char **option)
  {
-@@ -154,6 +157,46 @@ PostKbdEvent(InputInfoPtr pInfo, struct input_event *ev, int value)
+@@ -154,6 +157,48 @@ PostKbdEvent(InputInfoPtr pInfo, struct 
      xf86PostKeyboardEvent(pInfo->dev, code, value);
  }
  
@@ -86,6 +60,7 @@
 +                pEvdev->reopen_attempts - pEvdev->reopen_left);
 +
 +        pEvdev->reopen_left = 0;
++	pEvdev->reopen_timer = NULL;
 +        EvdevOn(pInfo->dev);
 +        return 0;
 +    }
@@ -97,6 +72,7 @@
 +        xf86Msg(X_ERROR, "%s: Failed to reopen device after %d attempts.\n",
 +                pInfo->name, pEvdev->reopen_attempts);
 +        DisableDevice(pInfo->dev);
++	pEvdev->reopen_timer = NULL;
 +        return 0;
 +    }
 +
@@ -106,7 +82,7 @@
  static void
  EvdevReadInput(InputInfoPtr pInfo)
  {
-@@ -173,6 +216,15 @@ EvdevReadInput(InputInfoPtr pInfo)
+@@ -173,6 +218,15 @@ EvdevReadInput(InputInfoPtr pInfo)
              /* The kernel promises that we always only read a complete
               * event, so len != sizeof ev is an error. */
              xf86Msg(X_ERROR, "%s: Read error: %s\n", pInfo->name, strerror(errno));
@@ -117,12 +93,12 @@
 +                close(pInfo->fd);
 +                pInfo->fd = -1;
 +                pEvdev->reopen_left = pEvdev->reopen_attempts;
-+                TimerSet(NULL, 0, 100, EvdevReopenTimer, pInfo);
++                pEvdev->reopen_timer = TimerSet(NULL, 0, 100, EvdevReopenTimer, pInfo);
 +            }
              break;
          }
  
-@@ -836,6 +888,47 @@ EvdevInit(DeviceIntPtr device)
+@@ -836,6 +890,47 @@ EvdevInit(DeviceIntPtr device)
      return Success;
  }
  
@@ -150,7 +126,7 @@
 +        close(pInfo->fd);
 +        pInfo->fd = -1;
 +        pEvdev->reopen_left = pEvdev->reopen_attempts;
-+        TimerSet(NULL, 0, 100, EvdevReopenTimer, pInfo);
++        pEvdev->reopen_timer = TimerSet(NULL, 0, 100, EvdevReopenTimer, pInfo);
 +    } else
 +    {
 +        xf86AddEnabledDevice(pInfo);
@@ -170,7 +146,7 @@
  static int
  EvdevProc(DeviceIntPtr device, int what)
  {
-@@ -851,30 +944,26 @@ EvdevProc(DeviceIntPtr device, int what)
+@@ -851,30 +946,30 @@ EvdevProc(DeviceIntPtr device, int what)
  	return EvdevInit(device);
  
      case DEVICE_ON:
@@ -209,12 +185,16 @@
      case DEVICE_CLOSE:
  	xf86Msg(X_INFO, "%s: Close\n", pInfo->name);
 -	close(pInfo->fd);
++	if (pEvdev->reopen_timer) {
++	    TimerCancel(pEvdev->reopen_timer);
++	    pEvdev->reopen_timer = NULL;
++	}
 +        if (pInfo->fd != -1)
 +            close(pInfo->fd);
  	break;
      }
  
-@@ -1060,11 +1149,12 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+@@ -1060,11 +1155,12 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr
          return NULL;
      }
  
@@ -229,7 +209,7 @@
  
      if (pInfo->fd < 0) {
          xf86Msg(X_ERROR, "Unable to open evdev device \"%s\".\n", device);
-@@ -1072,6 +1162,8 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+@@ -1072,6 +1168,8 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr
          return NULL;
      }
  
@@ -238,10 +218,9 @@
      pEvdev->noXkb = noXkbExtension;
      /* parse the XKB options during kbd setup */
  
-diff --git a/src/evdev.h b/src/evdev.h
-index cad1eed..0f8cf4b 100644
---- a/src/evdev.h
-+++ b/src/evdev.h
+diff -up xf86-input-evdev-2.0.4/src/evdev.h.reopen-device xf86-input-evdev-2.0.4/src/evdev.h
+--- xf86-input-evdev-2.0.4/src/evdev.h.reopen-device	2008-08-14 22:27:13.000000000 -0400
++++ xf86-input-evdev-2.0.4/src/evdev.h	2008-09-12 15:55:44.000000000 -0400
 @@ -41,6 +41,7 @@
  #endif
  
@@ -250,16 +229,14 @@
      int kernel24;
      int screen;
      int min_x, min_y, max_x, max_y;
-@@ -67,6 +68,9 @@ typedef struct {
+@@ -67,6 +68,10 @@ typedef struct {
          Time                expires;     /* time of expiry */
          Time                timeout;
      } emulateMB;
 +
 +    int reopen_attempts; /* max attempts to re-open after read failure */
 +    int reopen_left;     /* number of attempts left to re-open the device */
++    OsTimerPtr reopen_timer;
  } EvdevRec, *EvdevPtr;
  
  /* Middle Button emulation */
--- 
-1.5.6.4
-


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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xorg-x11-drv-evdev.spec	28 Aug 2008 02:26:38 -0000	1.30
+++ xorg-x11-drv-evdev.spec	12 Sep 2008 20:08:52 -0000	1.31
@@ -7,7 +7,7 @@
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
 Version:    2.0.4
-Release:    2%{?dist}
+Release:    3%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -35,8 +35,8 @@
 %setup -q -n %{tarball}-%{version}
 
 # apply patches
-%patch1 -p1 -b .reopen-device.patch
-%patch2 -p1 -b .cache-info.patch
+%patch1 -p1 -b .reopen-device
+%patch2 -p1 -b .cache-info
 
 %build
 autoreconf -v --install || exit 1
@@ -61,6 +61,12 @@
 %{_mandir}/man4/evdev.4*
 
 %changelog
+* Fri Sep 12 2008 Adam Jackson <ajax at redhat.com> 2.0.4-3
+- evdev-2.0.4-reopen-device.patch: When arming the reopen timer, stash it in
+  the driver private, and explicitly cancel it if the server decides to
+  close the device for real.
+- evdev-2.0.4-cache-info.patch: Rebase to account for same.
+
 * Thu Aug 28 2008 Peter Hutterer <peter.hutterer at redhat.com> 2.0.4-2
 - evdev-2.0.4-reopen-device.patch: try to reopen devices if a read error
   occurs on the fd.



From pkgdb at fedoraproject.org  Fri Sep 12 20:11:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 20:11:18 +0000
Subject: [pkgdb] libvidcap was added for spot
Message-ID: <20080912201118.7B35B208D1F@bastion.fedora.phx.redhat.com>

spot has added Package libvidcap with summary Cross-platform video capture library
spot has approved Package libvidcap
spot has added a Fedora devel branch for libvidcap with an owner of spot
spot has approved libvidcap in Fedora devel
spot has approved Package libvidcap
spot has set commit to Approved for packager on libvidcap (Fedora devel)
spot has set build to Approved for packager on libvidcap (Fedora devel)
spot has set checkout to Approved for packager on libvidcap (Fedora devel)
spot has set commit to Approved for uberpackager on libvidcap (Fedora devel)
spot has set build to Approved for uberpackager on libvidcap (Fedora devel)
spot has set checkout to Approved for uberpackager on libvidcap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvidcap



From pkgdb at fedoraproject.org  Fri Sep 12 20:11:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 20:11:20 +0000
Subject: [pkgdb] libvidcap (Fedora, 8) updated by spot
Message-ID: <20080912201120.539FD208D9E@bastion.fedora.phx.redhat.com>

spot added a Fedora 8 branch for libvidcap
spot has set commit to Approved for uberpackager on libvidcap (Fedora 8)
spot has set build to Approved for uberpackager on libvidcap (Fedora 8)
spot has set checkout to Approved for uberpackager on libvidcap (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvidcap



From pkgdb at fedoraproject.org  Fri Sep 12 20:11:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 20:11:20 +0000
Subject: [pkgdb] libvidcap (Fedora, 9) updated by spot
Message-ID: <20080912201120.1E177208D9B@bastion.fedora.phx.redhat.com>

spot added a Fedora 9 branch for libvidcap
spot has set commit to Approved for uberpackager on libvidcap (Fedora 9)
spot has set build to Approved for uberpackager on libvidcap (Fedora 9)
spot has set checkout to Approved for uberpackager on libvidcap (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvidcap



From spot at fedoraproject.org  Fri Sep 12 20:11:30 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 20:11:30 +0000 (UTC)
Subject: rpms/libvidcap - New directory
Message-ID: <20080912201130.26B1E70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/libvidcap
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsg13345/rpms/libvidcap

Log Message:
Directory /cvs/extras/rpms/libvidcap added to the repository




From spot at fedoraproject.org  Fri Sep 12 20:11:30 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 20:11:30 +0000 (UTC)
Subject: rpms/libvidcap/devel - New directory
Message-ID: <20080912201130.6177F70136@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/libvidcap/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsg13345/rpms/libvidcap/devel

Log Message:
Directory /cvs/extras/rpms/libvidcap/devel added to the repository




From spot at fedoraproject.org  Fri Sep 12 20:11:31 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 20:11:31 +0000 (UTC)
Subject: rpms/libvidcap/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080912201131.8B88670131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/libvidcap/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsg13345/rpms/libvidcap/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libvidcap


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libvidcap
# $Id: Makefile,v 1.1 2008/09/12 20:11:31 spot Exp $
NAME := libvidcap
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Fri Sep 12 20:11:31 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 20:11:31 +0000 (UTC)
Subject: rpms/libvidcap Makefile,NONE,1.1
Message-ID: <20080912201131.4BD9870131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/libvidcap
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsg13345/rpms/libvidcap

Added Files:
	Makefile 
Log Message:
Setup of module libvidcap


--- NEW FILE Makefile ---
# Top level Makefile for module libvidcap
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From mstone at fedoraproject.org  Fri Sep 12 20:14:30 2008
From: mstone at fedoraproject.org (Michael Stone)
Date: Fri, 12 Sep 2008 20:14:30 +0000 (UTC)
Subject: rpms/olpc-netutils/F-9 .cvsignore, 1.1, 1.2 olpc-netutils.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080912201430.C11AF70131@cvs1.fedora.phx.redhat.com>

Author: mstone

Update of /cvs/pkgs/rpms/olpc-netutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13800

Modified Files:
	.cvsignore olpc-netutils.spec sources 
Log Message:
- Guillaume Desmottes (2):
    Print the quantity of buddies we see.
    Use /tmp/olpc-session-bus if available; otherwise, read the sugar-xos command-line.
- Michael Stone (2):
    Cosmetic fixups to whitespace, comments, and the specfile.
    Makefile improvements.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-netutils/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Aug 2008 01:19:33 -0000	1.1
+++ .cvsignore	12 Sep 2008 20:14:00 -0000	1.2
@@ -0,0 +1 @@
+olpc-netutils-0.5.tar.bz2


Index: olpc-netutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-netutils/F-9/olpc-netutils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- olpc-netutils.spec	11 Aug 2008 02:19:02 -0000	1.1
+++ olpc-netutils.spec	12 Sep 2008 20:14:00 -0000	1.2
@@ -1,18 +1,18 @@
 Name:           olpc-netutils
-Version:        0.4
-Release:        2%{?dist}
+Version:        0.5
+Release:        1%{?dist}
 Summary:        OLPC network utilities
 
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://wiki.laptop.org/go/Olpc-netutils
 Source0:        http://dev.laptop.org/~mstone/releases/SOURCES/%{name}-%{version}.tar.bz2
-# Submitted olpc-netutils-0.4-preserve-timestamps.patch upstream via email on Fri Aug 08 2008
-Patch0:         olpc-netutils-0.4-preserve-timestamps.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  make
 
+Requires:       bash
 Requires:       python
 Requires:       dbus-python
 
@@ -26,20 +26,18 @@
 
 Requires:       iputils
 Requires:       iptables
+Requires:       dnsmasq
 
 Requires:       /sbin/modprobe
 Requires:       /bin/awk
 Requires:       /bin/grep
 
-
 %description
 olpc-netutils is a GPL-licensed collection of scripts for logging network
 status information on OLPC XOs.
 
-
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -62,11 +60,22 @@
 
 
 %changelog
-* Fri Aug 08 2008 Robin Norwood <rnorwood at redhat.com> - 0.4-2
-- Apply patch and fix change log based on package review feedback
+* Fri Sep 12 2008 Michael Stone <michael at laptop.org> - 0.5-1
+- Guillaume Desmottes (2):
+    Print the quantity of buddies we see.
+    Use /tmp/olpc-session-bus if available; otherwise, read the sugar-xos command-line.
+- Michael Stone (2):
+    Cosmetic fixups to whitespace, comments, and the specfile.
+    Makefile improvements.
+
+* Fri Aug 08 2008 Michael Stone <michael at laptop.org> - 0.4-1
+- Robin Norwood (1):
+    rh#457142: Preserve timestamps when installing files.
+- Michael Stone (1):
+    Remove disttags from ChangeLog entries.
 
-* Tue Jul 29 2008 Robin Norwood <rnorwood at redhat.com> - 0.4-1
-- Spec for F9 package review
+* Wed Jul 09 2008 Michael Stone <michael at laptop.org> - 0.3-1
+- Install dnsmasq for olpc-mpp.
 
 * Wed Jul 02 2008 Michael Stone <michael at laptop.org> - 0.2-1
 - Initial release of this spec.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-netutils/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2008 02:19:02 -0000	1.2
+++ sources	12 Sep 2008 20:14:00 -0000	1.3
@@ -1 +1 @@
-eb66bdf93e1eed8ae822a584abbc9082  olpc-netutils-0.4.tar.bz2
+9444bfa2f9d4982d44c324ee7a932998  olpc-netutils-0.5.tar.bz2



From spot at fedoraproject.org  Fri Sep 12 20:18:37 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 20:18:37 +0000 (UTC)
Subject: rpms/libvidcap/devel import.log, NONE, 1.1 libvidcap.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080912201837.CEC9170132@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/libvidcap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14728/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libvidcap.spec 
Log Message:
o
initial commit



--- NEW FILE import.log ---
libvidcap-0_2_1-2_fc10:HEAD:libvidcap-0.2.1-2.fc10.src.rpm:1221250602


--- NEW FILE libvidcap.spec ---
Name:		libvidcap
Version:	0.2.1
Release:	2%{?dist}
Summary:	Cross-platform video capture library
Group:		System Environment/Libraries
License:	LGPLv2+
URL:		http://libvidcap.sourceforge.net/
Source0:	http://downloads.sourceforge.net/libvidcap/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	kernel-headers

%description
A cross-platform library for capturing video from webcams and other video 
capture devices.

%package devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	pkgconfig

%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install INSTALL="%{_bindir}/install -p" DESTDIR=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING.LESSER
%{_libdir}/libvidcap.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/libvidcap.so
%{_libdir}/pkgconfig/vidcap.pc
%{_includedir}/vidcap/

%changelog
* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.1-2
- install with -p

* Tue Jun 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.1-1
- Initial package for Fedora



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libvidcap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2008 20:11:31 -0000	1.1
+++ .cvsignore	12 Sep 2008 20:18:07 -0000	1.2
@@ -0,0 +1 @@
+libvidcap-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libvidcap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 20:11:31 -0000	1.1
+++ sources	12 Sep 2008 20:18:07 -0000	1.2
@@ -0,0 +1 @@
+99521148426bff8319436494bbc5f0cb  libvidcap-0.2.1.tar.gz



From spot at fedoraproject.org  Fri Sep 12 20:21:55 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 20:21:55 +0000 (UTC)
Subject: rpms/libvidcap/F-8 libvidcap.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20080912202155.C167C70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/libvidcap/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15517/F-8

Modified Files:
	sources 
Added Files:
	libvidcap.spec 
Log Message:
initial branching


--- NEW FILE libvidcap.spec ---
Name:		libvidcap
Version:	0.2.1
Release:	2%{?dist}
Summary:	Cross-platform video capture library
Group:		System Environment/Libraries
License:	LGPLv2+
URL:		http://libvidcap.sourceforge.net/
Source0:	http://downloads.sourceforge.net/libvidcap/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	kernel-headers

%description
A cross-platform library for capturing video from webcams and other video 
capture devices.

%package devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	pkgconfig

%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install INSTALL="%{_bindir}/install -p" DESTDIR=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING.LESSER
%{_libdir}/libvidcap.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/libvidcap.so
%{_libdir}/pkgconfig/vidcap.pc
%{_includedir}/vidcap/

%changelog
* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.1-2
- install with -p

* Tue Jun 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.1-1
- Initial package for Fedora



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvidcap/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 20:11:31 -0000	1.1
+++ sources	12 Sep 2008 20:21:25 -0000	1.2
@@ -0,0 +1 @@
+99521148426bff8319436494bbc5f0cb  libvidcap-0.2.1.tar.gz



From spot at fedoraproject.org  Fri Sep 12 20:21:55 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 20:21:55 +0000 (UTC)
Subject: rpms/libvidcap/F-9 libvidcap.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20080912202155.E418970131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/libvidcap/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15517/F-9

Modified Files:
	sources 
Added Files:
	libvidcap.spec 
Log Message:
initial branching


--- NEW FILE libvidcap.spec ---
Name:		libvidcap
Version:	0.2.1
Release:	2%{?dist}
Summary:	Cross-platform video capture library
Group:		System Environment/Libraries
License:	LGPLv2+
URL:		http://libvidcap.sourceforge.net/
Source0:	http://downloads.sourceforge.net/libvidcap/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	kernel-headers

%description
A cross-platform library for capturing video from webcams and other video 
capture devices.

%package devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	pkgconfig

%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install INSTALL="%{_bindir}/install -p" DESTDIR=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING.LESSER
%{_libdir}/libvidcap.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/libvidcap.so
%{_libdir}/pkgconfig/vidcap.pc
%{_includedir}/vidcap/

%changelog
* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.1-2
- install with -p

* Tue Jun 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.1-1
- Initial package for Fedora



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvidcap/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 20:11:31 -0000	1.1
+++ sources	12 Sep 2008 20:21:25 -0000	1.2
@@ -0,0 +1 @@
+99521148426bff8319436494bbc5f0cb  libvidcap-0.2.1.tar.gz



From thm at fedoraproject.org  Fri Sep 12 20:24:50 2008
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri, 12 Sep 2008 20:24:50 +0000 (UTC)
Subject: rpms/monotone/devel .cvsignore, 1.20, 1.21 monotone.spec, 1.38,
	1.39 sources, 1.20, 1.21
Message-ID: <20080912202450.993CC70131@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/monotone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15925

Modified Files:
	.cvsignore monotone.spec sources 
Log Message:
- Updated for 0.41 release.
- Added mtnopt helper.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	14 Apr 2008 19:46:48 -0000	1.20
+++ .cvsignore	12 Sep 2008 20:24:20 -0000	1.21
@@ -1 +1 @@
-monotone-0.40.tar.gz
+monotone-0.41.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- monotone.spec	11 Aug 2008 15:28:30 -0000	1.38
+++ monotone.spec	12 Sep 2008 20:24:20 -0000	1.39
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.40
-Release: 2%{?dist}
+Version: 0.41
+Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -134,13 +134,14 @@
 %doc monotone.html
 
 %{_bindir}/mtn
+%{_bindir}/mtnopt
 %{_infodir}/monotone.info*
 %{_datadir}/emacs/site-lisp/monotone*.el*
 %{_sysconfdir}/bash_completion.d
 
 %files server
-%doc README.monotone-server
 %defattr(-,root,root,-)
+%doc README.monotone-server
 %{_sbindir}/monotone-server
 %{_sysconfdir}/rc.d/init.d/monotone
 %dir %attr(0755,monotone,monotone) %{_localstatedir}/run/monotone
@@ -180,6 +181,10 @@
 
 
 %changelog
+* Fri Sep 12 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.41-1
+- Updated for 0.41 release.
+- Added mtnopt helper.
+
 * Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.40-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	14 Apr 2008 19:46:48 -0000	1.20
+++ sources	12 Sep 2008 20:24:20 -0000	1.21
@@ -1 +1 @@
-4d90776beaff7445e7a2d8774378fbba  monotone-0.40.tar.gz
+f4ee37fb6853719933561fef901e2a07  monotone-0.41.tar.gz



From kkofler at fedoraproject.org  Fri Sep 12 20:32:38 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 12 Sep 2008 20:32:38 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.1.1-kdeui-widgets-fixes.patch, NONE,
	1.1 kdelibs-4.1.1-kutils-fixes.patch, NONE, 1.1 kdelibs.spec,
	1.373, 1.374
Message-ID: <20080912203238.C061570131@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17478/devel

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.1-kdeui-widgets-fixes.patch 
	kdelibs-4.1.1-kutils-fixes.patch 
Log Message:
Sync from F-9:

* Mon Sep 08 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-6
- fix crashes in plugin selector
- fix problems in various kdeui widgets

kdelibs-4.1.1-kdeui-widgets-fixes.patch:

--- NEW FILE kdelibs-4.1.1-kdeui-widgets-fixes.patch ---
Index: kdeui/widgets/krichtextedit.cpp
===================================================================
--- kdeui/widgets/krichtextedit.cpp	(revision 857817)
+++ kdeui/widgets/krichtextedit.cpp	(revision 857818)
@@ -492,7 +492,7 @@
     static QString evilline = "<p style=\" margin-top:0px; margin-bottom:0px; "
                       "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
                       "text-indent:0px; -qt-user-state:0;\">";
-        
+
     QString result;
     QStringList lines = toHtml().split("\n");
     foreach(QString tempLine, lines ) {
@@ -507,6 +507,33 @@
             result += tempLine;
         }
     }
+
+    // ### HACK to fix bug 86925: A completely empty line is ignored in HTML-mode
+    int offset = 0;
+    QRegExp paragraphFinder("<p.*>(.*)</p>");
+    QRegExp paragraphEnd("</p>");
+    paragraphFinder.setMinimal(true);
+
+    while (offset != -1) {
+
+        // Find the next paragraph
+        offset = paragraphFinder.indexIn(result, offset);
+
+        if (offset != -1) {
+
+            // If the text in the paragraph is empty, add a &nbsp there.
+            if (paragraphFinder.capturedTexts().size() == 2 &&
+                paragraphFinder.capturedTexts()[1].isEmpty()) {
+                int end = paragraphEnd.indexIn(result, offset);
+                Q_ASSERT(end != -1 && end > offset);
+                result.replace(end, paragraphEnd.pattern().length(), "<br></p>");
+            }
+
+            // Avoid finding the same match again
+            offset++;
+        }
+    }
+
     return result;
 }
 
Index: kdeui/fonts/kfontchooser.cpp
===================================================================
--- kdeui/fonts/kfontchooser.cpp	(revision 858147)
+++ kdeui/fonts/kfontchooser.cpp	(revision 858148)
@@ -444,6 +444,10 @@
     QPalette pal = d->sampleEdit->palette();
     pal.setColor( QPalette::Active, QPalette::Text, col );
     d->sampleEdit->setPalette( pal );
+    QTextCursor cursor = d->sampleEdit->textCursor();
+    d->sampleEdit->selectAll();
+    d->sampleEdit->setTextColor( col );
+    d->sampleEdit->setTextCursor( cursor );
 }
 
 QColor KFontChooser::color() const
Index: kdeui/widgets/khelpmenu.cpp
===================================================================
--- kdeui/widgets/khelpmenu.cpp	(revision 858312)
+++ kdeui/widgets/khelpmenu.cpp	(revision 858313)
@@ -162,6 +162,7 @@
       d->mWhatsThisAction = new KAction(KIcon("help-contextual"), i18n( "What's &This" ), d->mMenu);
       d->mWhatsThisAction->setShortcut(Qt::SHIFT + Qt::Key_F1);
       connect(d->mWhatsThisAction, SIGNAL(triggered(bool)), this, SLOT(contextHelpActivated()));
+      d->mMenu->addAction(d->mWhatsThisAction);
       need_separator = true;
     }
Index: kdeui/widgets/ktabwidget.cpp
===================================================================
--- kdeui/widgets/ktabwidget.cpp	(revision 858490)
+++ kdeui/widgets/ktabwidget.cpp	(revision 858491)
@@ -281,14 +281,22 @@
 
 QString KTabWidget::tabText( int index ) const
 {
-  if ( d->m_automaticResizeTabs ) {
-    if ( index >= 0 && index < count() )
-      return d->m_tabNames[ index ];
+    if ( d->m_automaticResizeTabs ) {
+        if (index >= 0 && index < count()) {
+            if (index >= d->m_tabNames.count()) {
+                // Ooops, the tab exists, but tabInserted wasn't called yet.
+                // This can happen when inserting the first tab,
+                // and calling tabText from slotCurrentChanged,
+                // see KTabWidget_UnitTest.
+                const_cast<KTabWidget*>(this)->tabInserted(index);
+            }
+            return d->m_tabNames[ index ];
+        }
+        else
+            return QString();
+    }
     else
-      return QString();
-  }
-  else
-    return QTabWidget::tabText( index );
+        return QTabWidget::tabText( index );
 }
 
 void KTabWidget::setTabText( int index, const QString &text )
Index: kdeui/widgets/ktabwidget.h
===================================================================
--- kdeui/widgets/ktabwidget.h	(revision 858490)
+++ kdeui/widgets/ktabwidget.h	(revision 858491)
@@ -187,7 +187,7 @@
      * Removes the widget, reimplemented for
      * internal reasons (keeping labels in sync).
      */
-    virtual void removeTab(int index);
+    virtual void removeTab(int index); // but it's not virtual in QTabWidget...
 
     /**
      * If \a enable is true, tab reordering with middle button will be enabled.

kdelibs-4.1.1-kutils-fixes.patch:

--- NEW FILE kdelibs-4.1.1-kutils-fixes.patch ---
Index: kutils/kpluginselector.cpp
===================================================================
--- kutils/kpluginselector.cpp	(revision 856658)
+++ kutils/kpluginselector.cpp	(revision 856659)
@@ -410,7 +410,8 @@
 
         if (!pluginEntryList.contains(pluginEntry) && !listToAdd.contains(pluginEntry) &&
              (!pluginInfo.property("X-KDE-PluginInfo-Category").isValid() ||
-              !pluginInfo.property("X-KDE-PluginInfo-Category").toString().compare(categoryKey, Qt::CaseInsensitive))) {
+              !pluginInfo.property("X-KDE-PluginInfo-Category").toString().compare(categoryKey, Qt::CaseInsensitive)) &&
+            !pluginInfo.service()->noDisplay()) {
             listToAdd << pluginEntry;
 
             if (!pluginSelector_d->showIcons && !pluginInfo.icon().isEmpty()) {
Index: kutils/kpluginselector.cpp
===================================================================
--- kutils/kpluginselector.cpp	(revision 856718)
+++ kutils/kpluginselector.cpp	(revision 856719)
@@ -411,7 +411,7 @@
         if (!pluginEntryList.contains(pluginEntry) && !listToAdd.contains(pluginEntry) &&
              (!pluginInfo.property("X-KDE-PluginInfo-Category").isValid() ||
               !pluginInfo.property("X-KDE-PluginInfo-Category").toString().compare(categoryKey, Qt::CaseInsensitive)) &&
-            !pluginInfo.service()->noDisplay()) {
+            (pluginInfo.service().isNull() || !pluginInfo.service()->noDisplay())) {
             listToAdd << pluginEntry;
 
             if (!pluginSelector_d->showIcons && !pluginInfo.icon().isEmpty()) {
Index: kutils/kcmoduleproxy.cpp
===================================================================
--- kutils/kcmoduleproxy.cpp	(revision 857917)
+++ kutils/kcmoduleproxy.cpp	(revision 857918)
@@ -228,7 +228,7 @@
     Q_Q(KCModuleProxy);
     changed = c;
     emit q->changed(c);
-    emit q->changed(this);
+    emit q->changed(q);
 }
 
 void KCModuleProxyPrivate::_k_moduleDestroyed()


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -r1.373 -r1.374
--- kdelibs.spec	4 Sep 2008 09:40:31 -0000	1.373
+++ kdelibs.spec	12 Sep 2008 20:32:08 -0000	1.374
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -84,6 +84,8 @@
 Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
 Patch101: kdelibs-4.1.1-kde#856379-cookiejar.patch
 Patch102: kdelibs-4.1.1-kde#856403-urlnav.patch
+Patch103: kdelibs-4.1.1-kutils-fixes.patch
+Patch104: kdelibs-4.1.1-kdeui-widgets-fixes.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -213,6 +215,8 @@
 %patch100 -p0 -b .kde#169447-khtml-regression
 %patch101 -p0 -b .kde#856379-cookiejar
 %patch102 -p0 -b .kde#856403-urlnav
+%patch103 -p0 -b .kutils-fixes
+%patch104 -p0 -b .kdeui-widgets-fixes
 
 %build
 
@@ -373,6 +377,10 @@
 
 
 %changelog
+* Mon Sep 08 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-6
+- fix crashes in plugin selector
+- fix problems in various kdeui widgets
+
 * Wed Sep 03 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-5
 - fixed crash on setting cookies on empty domains (like the file
   system), KDE bug #170147



From spot at fedoraproject.org  Fri Sep 12 20:35:43 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 20:35:43 +0000 (UTC)
Subject: rpms/libvidcap/F-8 libvidcap.spec,1.1,1.2
Message-ID: <20080912203543.B56B470131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/libvidcap/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18178/F-8

Modified Files:
	libvidcap.spec 
Log Message:
add pkgconfig as BR


Index: libvidcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvidcap/F-8/libvidcap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libvidcap.spec	12 Sep 2008 20:21:25 -0000	1.1
+++ libvidcap.spec	12 Sep 2008 20:35:13 -0000	1.2
@@ -1,13 +1,13 @@
 Name:		libvidcap
 Version:	0.2.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Cross-platform video capture library
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://libvidcap.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/libvidcap/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	kernel-headers
+BuildRequires:	kernel-headers, pkgconfig
 
 %description
 A cross-platform library for capturing video from webcams and other video 
@@ -54,6 +54,9 @@
 %{_includedir}/vidcap/
 
 %changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.1-3
+- BR: pkgconfig
+
 * Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.1-2
 - install with -p
 



From spot at fedoraproject.org  Fri Sep 12 20:35:43 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 20:35:43 +0000 (UTC)
Subject: rpms/libvidcap/F-9 libvidcap.spec,1.1,1.2
Message-ID: <20080912203543.D794F70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/libvidcap/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18178/F-9

Modified Files:
	libvidcap.spec 
Log Message:
add pkgconfig as BR


Index: libvidcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvidcap/F-9/libvidcap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libvidcap.spec	12 Sep 2008 20:21:25 -0000	1.1
+++ libvidcap.spec	12 Sep 2008 20:35:13 -0000	1.2
@@ -1,13 +1,13 @@
 Name:		libvidcap
 Version:	0.2.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Cross-platform video capture library
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://libvidcap.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/libvidcap/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	kernel-headers
+BuildRequires:	kernel-headers, pkgconfig
 
 %description
 A cross-platform library for capturing video from webcams and other video 
@@ -54,6 +54,9 @@
 %{_includedir}/vidcap/
 
 %changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.1-3
+- BR: pkgconfig
+
 * Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.1-2
 - install with -p
 



From spot at fedoraproject.org  Fri Sep 12 20:35:44 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 20:35:44 +0000 (UTC)
Subject: rpms/libvidcap/devel libvidcap.spec,1.1,1.2
Message-ID: <20080912203544.1DD2C70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/libvidcap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18178/devel

Modified Files:
	libvidcap.spec 
Log Message:
add pkgconfig as BR


Index: libvidcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvidcap/devel/libvidcap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libvidcap.spec	12 Sep 2008 20:18:07 -0000	1.1
+++ libvidcap.spec	12 Sep 2008 20:35:13 -0000	1.2
@@ -1,13 +1,13 @@
 Name:		libvidcap
 Version:	0.2.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Cross-platform video capture library
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://libvidcap.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/libvidcap/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	kernel-headers
+BuildRequires:	kernel-headers, pkgconfig
 
 %description
 A cross-platform library for capturing video from webcams and other video 
@@ -54,6 +54,9 @@
 %{_includedir}/vidcap/
 
 %changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.1-3
+- BR: pkgconfig
+
 * Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.1-2
 - install with -p
 



From kkofler at fedoraproject.org  Fri Sep 12 20:36:11 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 12 Sep 2008 20:36:11 +0000 (UTC)
Subject: rpms/kdelibs4/F-8 kdelibs-4.1.1-kdeui-widgets-fixes.patch, NONE,
	1.1 kdelibs-4.1.1-kutils-fixes.patch, NONE, 1.1 kdelibs4.spec,
	1.33, 1.34
Message-ID: <20080912203611.6A00670131@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18296/F-8

Modified Files:
	kdelibs4.spec 
Added Files:
	kdelibs-4.1.1-kdeui-widgets-fixes.patch 
	kdelibs-4.1.1-kutils-fixes.patch 
Log Message:
Sync from kdelibs/devel:

* Mon Sep 08 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-6
- fix crashes in plugin selector
- fix problems in various kdeui widgets

kdelibs-4.1.1-kdeui-widgets-fixes.patch:

--- NEW FILE kdelibs-4.1.1-kdeui-widgets-fixes.patch ---
Index: kdeui/widgets/krichtextedit.cpp
===================================================================
--- kdeui/widgets/krichtextedit.cpp	(revision 857817)
+++ kdeui/widgets/krichtextedit.cpp	(revision 857818)
@@ -492,7 +492,7 @@
     static QString evilline = "<p style=\" margin-top:0px; margin-bottom:0px; "
                       "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
                       "text-indent:0px; -qt-user-state:0;\">";
-        
+
     QString result;
     QStringList lines = toHtml().split("\n");
     foreach(QString tempLine, lines ) {
@@ -507,6 +507,33 @@
             result += tempLine;
         }
     }
+
+    // ### HACK to fix bug 86925: A completely empty line is ignored in HTML-mode
+    int offset = 0;
+    QRegExp paragraphFinder("<p.*>(.*)</p>");
+    QRegExp paragraphEnd("</p>");
+    paragraphFinder.setMinimal(true);
+
+    while (offset != -1) {
+
+        // Find the next paragraph
+        offset = paragraphFinder.indexIn(result, offset);
+
+        if (offset != -1) {
+
+            // If the text in the paragraph is empty, add a &nbsp there.
+            if (paragraphFinder.capturedTexts().size() == 2 &&
+                paragraphFinder.capturedTexts()[1].isEmpty()) {
+                int end = paragraphEnd.indexIn(result, offset);
+                Q_ASSERT(end != -1 && end > offset);
+                result.replace(end, paragraphEnd.pattern().length(), "<br></p>");
+            }
+
+            // Avoid finding the same match again
+            offset++;
+        }
+    }
+
     return result;
 }
 
Index: kdeui/fonts/kfontchooser.cpp
===================================================================
--- kdeui/fonts/kfontchooser.cpp	(revision 858147)
+++ kdeui/fonts/kfontchooser.cpp	(revision 858148)
@@ -444,6 +444,10 @@
     QPalette pal = d->sampleEdit->palette();
     pal.setColor( QPalette::Active, QPalette::Text, col );
     d->sampleEdit->setPalette( pal );
+    QTextCursor cursor = d->sampleEdit->textCursor();
+    d->sampleEdit->selectAll();
+    d->sampleEdit->setTextColor( col );
+    d->sampleEdit->setTextCursor( cursor );
 }
 
 QColor KFontChooser::color() const
Index: kdeui/widgets/khelpmenu.cpp
===================================================================
--- kdeui/widgets/khelpmenu.cpp	(revision 858312)
+++ kdeui/widgets/khelpmenu.cpp	(revision 858313)
@@ -162,6 +162,7 @@
       d->mWhatsThisAction = new KAction(KIcon("help-contextual"), i18n( "What's &This" ), d->mMenu);
       d->mWhatsThisAction->setShortcut(Qt::SHIFT + Qt::Key_F1);
       connect(d->mWhatsThisAction, SIGNAL(triggered(bool)), this, SLOT(contextHelpActivated()));
+      d->mMenu->addAction(d->mWhatsThisAction);
       need_separator = true;
     }
Index: kdeui/widgets/ktabwidget.cpp
===================================================================
--- kdeui/widgets/ktabwidget.cpp	(revision 858490)
+++ kdeui/widgets/ktabwidget.cpp	(revision 858491)
@@ -281,14 +281,22 @@
 
 QString KTabWidget::tabText( int index ) const
 {
-  if ( d->m_automaticResizeTabs ) {
-    if ( index >= 0 && index < count() )
-      return d->m_tabNames[ index ];
+    if ( d->m_automaticResizeTabs ) {
+        if (index >= 0 && index < count()) {
+            if (index >= d->m_tabNames.count()) {
+                // Ooops, the tab exists, but tabInserted wasn't called yet.
+                // This can happen when inserting the first tab,
+                // and calling tabText from slotCurrentChanged,
+                // see KTabWidget_UnitTest.
+                const_cast<KTabWidget*>(this)->tabInserted(index);
+            }
+            return d->m_tabNames[ index ];
+        }
+        else
+            return QString();
+    }
     else
-      return QString();
-  }
-  else
-    return QTabWidget::tabText( index );
+        return QTabWidget::tabText( index );
 }
 
 void KTabWidget::setTabText( int index, const QString &text )
Index: kdeui/widgets/ktabwidget.h
===================================================================
--- kdeui/widgets/ktabwidget.h	(revision 858490)
+++ kdeui/widgets/ktabwidget.h	(revision 858491)
@@ -187,7 +187,7 @@
      * Removes the widget, reimplemented for
      * internal reasons (keeping labels in sync).
      */
-    virtual void removeTab(int index);
+    virtual void removeTab(int index); // but it's not virtual in QTabWidget...
 
     /**
      * If \a enable is true, tab reordering with middle button will be enabled.

kdelibs-4.1.1-kutils-fixes.patch:

--- NEW FILE kdelibs-4.1.1-kutils-fixes.patch ---
Index: kutils/kpluginselector.cpp
===================================================================
--- kutils/kpluginselector.cpp	(revision 856658)
+++ kutils/kpluginselector.cpp	(revision 856659)
@@ -410,7 +410,8 @@
 
         if (!pluginEntryList.contains(pluginEntry) && !listToAdd.contains(pluginEntry) &&
              (!pluginInfo.property("X-KDE-PluginInfo-Category").isValid() ||
-              !pluginInfo.property("X-KDE-PluginInfo-Category").toString().compare(categoryKey, Qt::CaseInsensitive))) {
+              !pluginInfo.property("X-KDE-PluginInfo-Category").toString().compare(categoryKey, Qt::CaseInsensitive)) &&
+            !pluginInfo.service()->noDisplay()) {
             listToAdd << pluginEntry;
 
             if (!pluginSelector_d->showIcons && !pluginInfo.icon().isEmpty()) {
Index: kutils/kpluginselector.cpp
===================================================================
--- kutils/kpluginselector.cpp	(revision 856718)
+++ kutils/kpluginselector.cpp	(revision 856719)
@@ -411,7 +411,7 @@
         if (!pluginEntryList.contains(pluginEntry) && !listToAdd.contains(pluginEntry) &&
              (!pluginInfo.property("X-KDE-PluginInfo-Category").isValid() ||
               !pluginInfo.property("X-KDE-PluginInfo-Category").toString().compare(categoryKey, Qt::CaseInsensitive)) &&
-            !pluginInfo.service()->noDisplay()) {
+            (pluginInfo.service().isNull() || !pluginInfo.service()->noDisplay())) {
             listToAdd << pluginEntry;
 
             if (!pluginSelector_d->showIcons && !pluginInfo.icon().isEmpty()) {
Index: kutils/kcmoduleproxy.cpp
===================================================================
--- kutils/kcmoduleproxy.cpp	(revision 857917)
+++ kutils/kcmoduleproxy.cpp	(revision 857918)
@@ -228,7 +228,7 @@
     Q_Q(KCModuleProxy);
     changed = c;
     emit q->changed(c);
-    emit q->changed(this);
+    emit q->changed(q);
 }
 
 void KCModuleProxyPrivate::_k_moduleDestroyed()


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- kdelibs4.spec	4 Sep 2008 09:45:21 -0000	1.33
+++ kdelibs4.spec	12 Sep 2008 20:35:41 -0000	1.34
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -84,6 +84,8 @@
 Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
 Patch101: kdelibs-4.1.1-kde#856379-cookiejar.patch
 Patch102: kdelibs-4.1.1-kde#856403-urlnav.patch
+Patch103: kdelibs-4.1.1-kutils-fixes.patch
+Patch104: kdelibs-4.1.1-kdeui-widgets-fixes.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -213,6 +215,8 @@
 %patch100 -p0 -b .kde#169447-khtml-regression
 %patch101 -p0 -b .kde#856379-cookiejar
 %patch102 -p0 -b .kde#856403-urlnav
+%patch103 -p0 -b .kutils-fixes
+%patch104 -p0 -b .kdeui-widgets-fixes
 
 %build
 
@@ -373,6 +377,10 @@
 
 
 %changelog
+* Mon Sep 08 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-6
+- fix crashes in plugin selector
+- fix problems in various kdeui widgets
+
 * Wed Sep 03 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-5
 - fixed crash on setting cookies on empty domains (like the file
   system), KDE bug #170147



From dwalsh at fedoraproject.org  Fri Sep 12 20:36:51 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 12 Sep 2008 20:36:51 +0000 (UTC)
Subject: rpms/selinux-policy/devel .cvsignore, 1.147,
	1.148 modules-targeted.conf, 1.96, 1.97 policy-20080710.patch,
	1.29, 1.30 sources, 1.162, 1.163
Message-ID: <20080912203651.C4D3970131@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18610

Modified Files:
	.cvsignore modules-targeted.conf policy-20080710.patch sources 
Log Message:
* Thu Sep 11 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-1
- Merge upstream changes
- Add Xavier Toth patches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- .cvsignore	8 Sep 2008 21:01:42 -0000	1.147
+++ .cvsignore	12 Sep 2008 20:36:20 -0000	1.148
@@ -149,3 +149,4 @@
 serefpolicy-3.5.5.tgz
 serefpolicy-3.5.6.tgz
 serefpolicy-3.5.7.tgz
+serefpolicy-3.5.8.tgz


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- modules-targeted.conf	8 Sep 2008 20:54:44 -0000	1.96
+++ modules-targeted.conf	12 Sep 2008 20:36:20 -0000	1.97
@@ -30,7 +30,7 @@
 #
 # ada executable
 # 
-ada = base
+ada = module
 
 # Layer: modules
 # Module: awstats
@@ -44,7 +44,7 @@
 #
 # Automated backup program.
 # 
-amanda = base
+amanda = module
 
 # Layer: services
 # Module: amavis
@@ -65,7 +65,7 @@
 #
 # Apache web server
 # 
-apache = base
+apache = module
 
 # Layer: services
 # Module: apm
@@ -87,7 +87,7 @@
 #
 # Ethernet activity monitor.
 # 
-arpwatch = base
+arpwatch = module
 
 # Layer: services
 # Module: audioentropy
@@ -115,28 +115,28 @@
 #
 # mDNS/DNS-SD daemon implementing Apple ZeroConf architecture
 # 
-avahi = base
+avahi = module
 
 # Layer: services
 # Module: bind
 #
 # Berkeley internet name domain DNS server.
 # 
-bind = base
+bind = module
 
 # Layer: services
 # Module: dnsmasq
 #
 # A lightweight DHCP and caching DNS server.
 # 
-dnsmasq = base
+dnsmasq = module
 
 # Layer: services
 # Module: bluetooth
 #
 # Bluetooth tools and system services.
 # 
-bluetooth = base
+bluetooth = module
 
 # Layer: kernel
 # Module: bootloader
@@ -151,8 +151,7 @@
 #
 # Canna - kana-kanji conversion server
 # 
-canna = base
-
+canna = module
 
 # Layer: services
 # Module: ccs
@@ -195,7 +194,7 @@
 #
 # Comsat, a biff server.
 # 
-comsat = base
+comsat = module
 
 # Layer: services
 # Module: clamav
@@ -254,21 +253,21 @@
 #
 # Periodic execution of scheduled commands.
 # 
-cron = base
+cron = module 
 
 # Layer: services
 # Module: cups
 #
 # Common UNIX printing system
 # 
-cups = base
+cups = module
 
 # Layer: services
 # Module: cvs
 #
 # Concurrent versions system
 # 
-cvs = base
+cvs = module
 
 # Layer: services
 # Module: cyphesis
@@ -282,7 +281,7 @@
 #
 # Cyrus is an IMAP service intended to be run on sealed servers
 # 
-cyrus = base
+cyrus = module
 
 # Layer: system
 # Module: daemontools
@@ -296,7 +295,7 @@
 #
 # Dictionary server for the SKK Japanese input method system.
 # 
-dbskk = base
+dbskk = module
 
 # Layer: services
 # Module: dbus
@@ -305,7 +304,6 @@
 # 
 dbus = base
 
-
 # Layer: services
 # Module: dcc
 #
@@ -340,7 +338,7 @@
 #
 # Dictionary daemon
 # 
-dictd = base
+dictd = module
 
 # Layer: services
 # Module: distcc
@@ -390,7 +388,7 @@
 #
 # General Purpose Mouse driver
 # 
-gpm = base
+gpm = module
 
 # Layer: apps
 # Module: ethereal
@@ -411,7 +409,7 @@
 #
 # Remote-mail retrieval and forwarding utility
 # 
-fetchmail = base
+fetchmail = module
 
 # Layer: kernel
 # Module: files
@@ -434,7 +432,7 @@
 #
 # Finger user information service.
 # 
-finger = base
+finger = module
 
 # Layer: admin
 # Module: firstboot
@@ -456,7 +454,7 @@
 #
 # File transfer protocol service
 # 
-ftp = base
+ftp = module
 
 # Layer: apps
 # Module: games
@@ -521,7 +519,7 @@
 #
 # Port of Apple Rendezvous multicast DNS
 # 
-howl = base
+howl = module
 
 # Layer: services
 # Module: inetd
@@ -542,7 +540,7 @@
 #
 # Internet News NNTP server
 # 
-inn = base
+inn = module
 
 # Layer: system
 # Module: iptables
@@ -592,14 +590,14 @@
 #
 # java executable
 # 
-java = base
+java = module
 
 # Layer: services
 # Module: kerberos
 #
 # MIT Kerberos admin and KDC
 # 
-kerberos = base
+kerberos = module
 
 # Layer: kernel
 # Module: kernel
@@ -614,7 +612,7 @@
 #
 # KDE Talk daemon
 # 
-ktalk = base
+ktalk = module
 
 # Layer: admin
 # Module: kudzu
@@ -629,7 +627,7 @@
 #
 # OpenLDAP directory server
 # 
-ldap = base
+ldap = module
 
 # Layer: system
 # Module: libraries
@@ -685,7 +683,7 @@
 #
 # Line printer daemon
 # 
-lpd = base
+lpd = module
 
 # Layer: system
 # Module: lvm
@@ -694,14 +692,12 @@
 # 
 lvm = base
 
-
 # Layer: services
 # Module: mailman
 #
 # Mailman is for managing electronic mail discussion and e-newsletter lists
 # 
-mailman = base
-
+mailman = module
 
 # Layer: services
 # Module: mailscanner
@@ -803,7 +799,7 @@
 #
 # Policy for MySQL
 # 
-mysql = base
+mysql = module
 
 # Layer: services
 # Module: nagios
@@ -831,7 +827,7 @@
 #
 # Policy for NIS (YP) servers and clients
 # 
-nis = base
+nis = module
 
 
 # Layer: services
@@ -847,7 +843,7 @@
 #
 # Network time protocol daemon
 # 
-ntp = base
+ntp = module
 
 # Layer: services
 # Module: nx
@@ -876,7 +872,7 @@
 #
 # Policy for OPENVPN full-featured SSL VPN solution
 # 
-openvpn = base
+openvpn = module
 
 
 # Layer: service
@@ -905,43 +901,42 @@
 #
 # The Open Group Pegasus CIM/WBEM Server.
 # 
-pegasus = base
+pegasus = module
 
 # Layer: services
 # Module: postgresql
 #
 # PostgreSQL relational database
 # 
-postgresql = base
+postgresql = module
 
 # Layer: services
 # Module: portmap
 #
 # RPC port mapping service.
 # 
-portmap = base
-
+portmap = module
 
 # Layer: services
 # Module: postfix
 #
 # Postfix email server
 # 
-postfix = base
+postfix = module
 
 o# Layer: services
 # Module: postgrey
 #
 # email scanner
 # 
-postgrey = base
+postgrey = module
 
 # Layer: services
 # Module: ppp
 #
 # Point to Point Protocol daemon creates links in ppp networks
 # 
-ppp = base
+ppp = module
 
 # Layer: admin
 # Module: prelink
@@ -955,14 +950,14 @@
 #
 # Procmail mail delivery agent
 # 
-procmail = base
+procmail = module
 
 # Layer: services
 # Module: privoxy
 #
 # Privacy enhancing web proxy.
 # 
-privoxy = base
+privoxy = module
 
 # Layer: services
 # Module: publicfile
@@ -1005,22 +1000,14 @@
 #
 # RADIUS authentication and accounting server.
 # 
-radius = base
-
-# Layer: services
-# Module: radius
-#
-# RADIUS authentication and accounting server.
-# 
-radius = base
-
+radius = module
 
 # Layer: services
 # Module: radvd
 #
 # IPv6 router advertisement daemon
 # 
-radvd = base
+radvd = module
 
 # Layer: services
 # Module: razor
@@ -1048,14 +1035,14 @@
 #
 # Network router discovery daemon
 # 
-rdisc = base
+rdisc = module
 
 # Layer: services
 # Module: remotelogin
 #
 # Policy for rshd, rlogind, and telnetd.
 # 
-remotelogin = base
+remotelogin = module
 
 # Layer: services
 # Module: ricci
@@ -1069,7 +1056,7 @@
 #
 # Remote login daemon
 # 
-rlogin = base
+rlogin = module
 
 # Layer: services
 # Module: roundup
@@ -1098,14 +1085,14 @@
 #
 # Remote shell service.
 # 
-rshd = base
+rshd = module
 
 # Layer: services
 # Module: rsync
 #
 # Fast incremental file transfer for synchronization
 # 
-rsync = base
+rsync = module
 
 # Layer: services
 # Module: rwho
@@ -1119,7 +1106,7 @@
 #
 # SASL authentication server
 # 
-sasl = base
+sasl = module
 
 # Layer: services
 # Module: sendmail
@@ -1135,7 +1122,7 @@
 # name  Service  Switch  daemon for resolving names
 # from Windows NT servers.
 # 
-samba = base
+samba = module
 
 # Layer: apps
 # Module: screen
@@ -1181,7 +1168,6 @@
 # 
 slrnpull = off
 
-
 # Layer: apps
 # Module: slocate
 #
@@ -1201,21 +1187,21 @@
 #
 # Simple network management protocol services
 # 
-snmp = base
+snmp = module
 
 # Layer: services
 # Module: spamassassin
 #
 # Filter used for removing unsolicited email.
 # 
-spamassassin = base
+spamassassin = module
 
 # Layer: services
 # Module: squid
 #
 # Squid caching http proxy server
 # 
-squid = base
+squid = module
 
 # Layer: services
 # Module: ssh
@@ -1236,7 +1222,7 @@
 #
 # SSL Tunneling Proxy
 # 
-stunnel = base
+stunnel = module
 
 # Layer: admin
 # Module: su
@@ -1265,14 +1251,14 @@
 #
 # Policy for sysstat. Reports on various system states
 # 
-sysstat = base
+sysstat = module
 
 # Layer: services
 # Module: tcpd
 #
 # Policy for TCP daemon.
 # 
-tcpd = base
+tcpd = module
 
 # Layer: system
 # Module: udev
@@ -1300,7 +1286,7 @@
 #
 # wine executable
 # 
-wine = base
+wine = module
 
 # Layer: admin
 # Module: tzdata
@@ -1356,7 +1342,7 @@
 #
 # virtualization software
 # 
-xen = base
+xen = module
 
 # Layer: services
 # Module: virt
@@ -1384,7 +1370,7 @@
 #
 # Telnet daemon
 # 
-telnet = base
+telnet = module
 
 # Layer: services
 # Module: timidity
@@ -1398,14 +1384,14 @@
 #
 # Trivial file transfer protocol daemon
 # 
-tftp = base
+tftp = module
 
 # Layer: services
 # Module: uucp
 #
 # Unix to Unix Copy
 # 
-uucp = base
+uucp = module
 
 # Layer: services
 # Module: vbetool 
@@ -1419,14 +1405,14 @@
 #
 # Web server log analysis
 # 
-webalizer = base
+webalizer = module
 
 # Layer: services
 # Module: xfs
 #
 # X Windows Font Server
 # 
-xfs = base
+xfs = module
 
 # Layer: services
 # Module: xserver
@@ -1440,7 +1426,7 @@
 #
 # Zebra border gateway protocol network routing service
 # 
-zebra = base
+zebra = module
 
 # Layer: admin
 # Module: usermanage
@@ -1511,14 +1497,7 @@
 #
 # Policy for aide
 # 
-aide = base
-
-# Layer: services
-# Module: aide
-#
-# Policy for aide
-# 
-aide = base
+aide = module
 
 # Layer: services
 # Module: w3c
@@ -1630,7 +1609,7 @@
 #
 # openoffice executable
 # 
-openoffice = base
+openoffice = module
 
 # Layer: apps
 # Module: podsleuth

policy-20080710.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.29 -r 1.30 policy-20080710.patch
Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- policy-20080710.patch	12 Sep 2008 14:21:04 -0000	1.29
+++ policy-20080710.patch	12 Sep 2008 20:36:20 -0000	1.30
@@ -1,6 +1,6 @@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.8/Makefile
 --- nsaserefpolicy/Makefile	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.5.8/Makefile	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/Makefile	2008-09-12 10:59:28.000000000 -0400
 @@ -311,20 +311,22 @@
  
  # parse-rolemap modulename,outputfile
@@ -47,7 +47,7 @@
  	$(verbose) $(INSTALL) -m 644 $< $@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.8/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.5.8/Rules.modular	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/Rules.modular	2008-09-12 10:59:28.000000000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -79,7 +79,7 @@
  $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.8/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -1,15 +0,0 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -98,13 +98,13 @@
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_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.5.8/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/failsafe_context	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/failsafe_context	2008-09-12 10:59:28.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-mcs/guest_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/guest_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,6 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -114,7 +114,7 @@
 +guest_r:guest_t:s0		guest_r:guest_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/root_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/root_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
  system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -130,7 +130,7 @@
 +system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/staff_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/staff_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -5,6 +5,8 @@
  system_r:xdm_t:s0		staff_r:staff_t:s0
  staff_r:staff_su_t:s0		staff_r:staff_t:s0
@@ -142,7 +142,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -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
@@ -152,7 +152,7 @@
  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/user_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/user_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/user_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -5,4 +5,5 @@
  system_r:xdm_t:s0		user_r:user_t:s0
  user_r:user_su_t:s0		user_r:user_t:s0
@@ -162,13 +162,13 @@
 +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/userhelper_context serefpolicy-3.5.8/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/userhelper_context	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/userhelper_context	2008-09-12 10:59:28.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/xguest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-mcs/xguest_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/xguest_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -179,7 +179,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-mls/guest_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mls/guest_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -187,7 +187,7 @@
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.8/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-standard/guest_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-standard/guest_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -195,7 +195,7 @@
 +system_r:crond_t	guest_r:guest_crond_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.5.8/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-standard/root_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-standard/root_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t	unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t
  system_r:local_login_t  unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
@@ -211,7 +211,7 @@
 +system_r:sshd_t	unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.8/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-standard/xguest_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-standard/xguest_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -220,7 +220,7 @@
 +system_r:xdm_t		xguest_r:xguest_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.5.8/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/global_tunables	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/global_tunables	2008-09-12 10:59:28.000000000 -0400
 @@ -34,7 +34,7 @@
  
  ## <desc>
@@ -261,7 +261,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-3.5.8/policy/mls
 --- nsaserefpolicy/policy/mls	2008-09-05 10:28:20.000000000 -0400
-+++ serefpolicy-3.5.8/policy/mls	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/mls	2008-09-12 10:59:28.000000000 -0400
 @@ -381,11 +381,18 @@
  	 ( t1 == mlsxwinread ));
  
@@ -284,7 +284,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.5.8/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/alsa.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/alsa.te	2008-09-12 10:59:28.000000000 -0400
 @@ -51,6 +51,8 @@
  
  auth_use_nsswitch(alsa_t)
@@ -296,7 +296,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.5.8/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/anaconda.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/anaconda.te	2008-09-12 10:59:28.000000000 -0400
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -307,7 +307,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.5.8/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/certwatch.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/certwatch.te	2008-09-12 10:59:28.000000000 -0400
 @@ -15,8 +15,19 @@
  #
  # Local policy
@@ -346,7 +346,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.5.8/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/consoletype.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/consoletype.te	2008-09-12 10:59:28.000000000 -0400
 @@ -8,9 +8,11 @@
  
  type consoletype_t;
@@ -372,7 +372,7 @@
  init_use_fds(consoletype_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.5.8/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2008-08-25 09:12:31.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/firstboot.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/firstboot.te	2008-09-12 10:59:28.000000000 -0400
 @@ -118,15 +118,7 @@
  	usermanage_domtrans_admin_passwd(firstboot_t)
[...4357 lines suppressed...]
  /usr/sbin/restorecond		--	gen_context(system_u:object_r:restorecond_exec_t,s0)
  /usr/sbin/run_init		--	gen_context(system_u:object_r:run_init_exec_t,s0)
@@ -31402,7 +31162,7 @@
 +/var/lib/selinux(/.*)?			gen_context(system_u:object_r:selinux_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.5.8/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/selinuxutil.if	2008-09-12 09:56:50.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/selinuxutil.if	2008-09-12 10:59:29.000000000 -0400
 @@ -555,6 +555,59 @@
  
  ########################################
@@ -31865,7 +31625,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.8/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/selinuxutil.te	2008-09-12 09:54:05.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/selinuxutil.te	2008-09-12 10:59:29.000000000 -0400
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -32223,7 +31983,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.fc serefpolicy-3.5.8/policy/modules/system/setrans.fc
 --- nsaserefpolicy/policy/modules/system/setrans.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/setrans.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/setrans.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -1,3 +1,5 @@
 +/etc/rc\.d/init\.d/mcstrans	--	gen_context(system_u:object_r:setrans_script_exec_t,s0)
 +
@@ -32232,7 +31992,7 @@
  /var/run/setrans(/.*)?	gen_context(system_u:object_r:setrans_var_run_t,mls_systemhigh)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.5.8/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/setrans.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/setrans.if	2008-09-12 10:59:29.000000000 -0400
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1,setrans_var_run_t,setrans_var_run_t,setrans_t)
  	files_list_pids($1)
@@ -32259,7 +32019,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-3.5.8/policy/modules/system/setrans.te
 --- nsaserefpolicy/policy/modules/system/setrans.te	2008-09-11 11:28:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/setrans.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/setrans.te	2008-09-12 10:59:29.000000000 -0400
 @@ -14,6 +14,9 @@
  files_pid_file(setrans_var_run_t)
  mls_trusted_object(setrans_var_run_t)
@@ -32272,7 +32032,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.8/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -57,3 +57,5 @@
  ifdef(`distro_gentoo',`
  /var/lib/dhcpc(/.*)?		gen_context(system_u:object_r:dhcpc_state_t,s0)
@@ -32281,7 +32041,7 @@
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.5.8/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.if	2008-09-12 10:59:29.000000000 -0400
 @@ -553,6 +553,7 @@
  		type net_conf_t;
  	')
@@ -32362,7 +32122,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.8/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2008-08-11 11:23:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.te	2008-09-12 10:59:29.000000000 -0400
 @@ -20,6 +20,10 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -32546,7 +32306,7 @@
  	xen_append_log(ifconfig_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.8/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/udev.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/udev.if	2008-09-12 10:59:29.000000000 -0400
 @@ -96,6 +96,24 @@
  
  ########################################
@@ -32602,7 +32362,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.8/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/udev.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/udev.te	2008-09-12 10:59:29.000000000 -0400
 @@ -83,6 +83,7 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
@@ -32660,7 +32420,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.8/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/unconfined.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/unconfined.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -2,15 +2,11 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -32701,7 +32461,7 @@
 +/opt/real/(.*/)?realplay\.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.5.8/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/unconfined.if	2008-09-11 16:39:09.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/unconfined.if	2008-09-12 10:59:29.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -33032,7 +32792,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.8/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/unconfined.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/unconfined.te	2008-09-12 10:59:29.000000000 -0400
 @@ -1,40 +1,80 @@
  
 -policy_module(unconfined, 2.3.1)
@@ -33369,7 +33129,7 @@
 +domain_ptrace_all_domains(unconfined_notrans_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.8/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/userdomain.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/userdomain.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -1,4 +1,5 @@
 -HOME_DIR	-d	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
 -HOME_DIR/.+		gen_context(system_u:object_r:ROLE_home_t,s0)
@@ -33382,7 +33142,7 @@
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.5.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/userdomain.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/userdomain.if	2008-09-12 10:59:29.000000000 -0400
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -35944,7 +35704,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.8/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/userdomain.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/userdomain.te	2008-09-12 10:59:29.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -36061,7 +35821,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.8/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/xen.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/xen.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -20,6 +20,7 @@
  /var/run/xenconsoled\.pid --	gen_context(system_u:object_r:xenconsoled_var_run_t,s0)
  /var/run/xend(/.*)?		gen_context(system_u:object_r:xend_var_run_t,s0)
@@ -36072,7 +35832,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.8/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/xen.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/xen.if	2008-09-12 10:59:29.000000000 -0400
 @@ -167,11 +167,14 @@
  #
  interface(`xen_stream_connect',`
@@ -36116,7 +35876,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.8/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/xen.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/xen.te	2008-09-12 10:59:29.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -36355,7 +36115,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.8/policy/support/file_patterns.spt
 --- nsaserefpolicy/policy/support/file_patterns.spt	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/support/file_patterns.spt	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/support/file_patterns.spt	2008-09-12 10:59:29.000000000 -0400
 @@ -537,3 +537,18 @@
  	allow $1 $2:dir rw_dir_perms;
  	type_transition $1 $2:$4 $3;
@@ -36377,7 +36137,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.8/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/support/obj_perm_sets.spt	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/support/obj_perm_sets.spt	2008-09-12 10:59:29.000000000 -0400
 @@ -316,3 +316,13 @@
  #
  define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }')
@@ -36394,7 +36154,7 @@
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.8/policy/users
 --- nsaserefpolicy/policy/users	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/users	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/users	2008-09-12 10:59:29.000000000 -0400
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- sources	8 Sep 2008 21:01:42 -0000	1.162
+++ sources	12 Sep 2008 20:36:21 -0000	1.163
@@ -1 +1 @@
-08cbc69d40ae75771c6201f2812a2eba  serefpolicy-3.5.7.tgz
+1b4c8999f49501d5bcfc81fb2498b2e6  serefpolicy-3.5.8.tgz



From adrian at fedoraproject.org  Fri Sep 12 20:49:49 2008
From: adrian at fedoraproject.org (Adrian Reber)
Date: Fri, 12 Sep 2008 20:49:49 +0000 (UTC)
Subject: rpms/libcdio/devel libcdio.spec,1.31,1.32
Message-ID: <20080912204949.80C7170134@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/libcdio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21257

Modified Files:
	libcdio.spec 
Log Message:
* Fri Sep 12 2008 Adrian Reber <adrian at lisas.de> - 0.80-3
- fixed #462125 (Multilib conflict)



Index: libcdio.spec
===================================================================
RCS file: /cvs/extras/rpms/libcdio/devel/libcdio.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libcdio.spec	5 Jun 2008 10:00:17 -0000	1.31
+++ libcdio.spec	12 Sep 2008 20:49:19 -0000	1.32
@@ -1,6 +1,6 @@
 Name: libcdio
 Version: 0.80
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: CD-ROM input and control library
 Group: System Environment/Libraries
 License: GPLv2+
@@ -58,12 +58,15 @@
 	--disable-cddb \
 	--disable-rpath
 make %{?_smp_mflags}
+# fix timestamps of generated man-pages
+for i in iso-read iso-info cd-read cd-drive; do 
+	touch -r src/$i.help2man src/$i.1
+done
 cd doc/doxygen
 sed -i -e "s,HTML_FOOTER.*$,HTML_FOOTER = libcdio-no_date_footer.hml,g" Doxyfile
 cp %{SOURCE2} .
 ./run_doxygen
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -125,6 +128,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Adrian Reber <adrian at lisas.de> - 0.80-3
+- fixed #462125 (Multilib conflict)
+
 * Wed Jun  4 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.80-2
 - added patch enabling libcdio_paranoia.pc
 



From thm at fedoraproject.org  Fri Sep 12 21:06:51 2008
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri, 12 Sep 2008 21:06:51 +0000 (UTC)
Subject: rpms/monotone/F-9 .cvsignore, 1.20, 1.21 monotone.spec, 1.37,
	1.38 sources, 1.20, 1.21
Message-ID: <20080912210651.6FABB70131@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/monotone/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23963

Modified Files:
	.cvsignore monotone.spec sources 
Log Message:
- Updated for 0.41 release.
- Added mtnopt helper.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-9/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	14 Apr 2008 19:46:48 -0000	1.20
+++ .cvsignore	12 Sep 2008 21:06:21 -0000	1.21
@@ -1 +1 @@
-monotone-0.40.tar.gz
+monotone-0.41.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-9/monotone.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- monotone.spec	14 Apr 2008 19:46:48 -0000	1.37
+++ monotone.spec	12 Sep 2008 21:06:21 -0000	1.38
@@ -1,10 +1,10 @@
 Name: monotone
-Version: 0.40
+Version: 0.41
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
-License: GPL
+License: GPLv2+
 
 URL: http://monotone.ca/
 Source0: http://monotone.ca/downloads/%{version}/%{name}-%{version}.tar.gz
@@ -134,13 +134,14 @@
 %doc monotone.html
 
 %{_bindir}/mtn
+%{_bindir}/mtnopt
 %{_infodir}/monotone.info*
 %{_datadir}/emacs/site-lisp/monotone*.el*
 %{_sysconfdir}/bash_completion.d
 
 %files server
-%doc README.monotone-server
 %defattr(-,root,root,-)
+%doc README.monotone-server
 %{_sbindir}/monotone-server
 %{_sysconfdir}/rc.d/init.d/monotone
 %dir %attr(0755,monotone,monotone) %{_localstatedir}/run/monotone
@@ -180,6 +181,13 @@
 
 
 %changelog
+* Fri Sep 12 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.41-1
+- Updated for 0.41 release.
+- Added mtnopt helper.
+
+* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.40-2
+- fix license tag
+
 * Mon Apr 14 2008 Roland McGrath <roland at redhat.com> - 0.40-1
 - Updated for 0.40 release.
 - Tweaked trivia for packaging guidelines nits.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	14 Apr 2008 19:46:48 -0000	1.20
+++ sources	12 Sep 2008 21:06:21 -0000	1.21
@@ -1 +1 @@
-4d90776beaff7445e7a2d8774378fbba  monotone-0.40.tar.gz
+f4ee37fb6853719933561fef901e2a07  monotone-0.41.tar.gz



From pkgdb at fedoraproject.org  Fri Sep 12 21:11:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 21:11:27 +0000
Subject: [pkgdb] tcl-snack was added for spot
Message-ID: <20080912211127.D5D84208D1F@bastion.fedora.phx.redhat.com>

spot has added Package tcl-snack with summary Sound toolkit
spot has approved Package tcl-snack
spot has added a Fedora devel branch for tcl-snack with an owner of spot
spot has approved tcl-snack in Fedora devel
spot has approved Package tcl-snack
spot has set commit to Approved for packager on tcl-snack (Fedora devel)
spot has set build to Approved for packager on tcl-snack (Fedora devel)
spot has set checkout to Approved for packager on tcl-snack (Fedora devel)
spot has set commit to Approved for uberpackager on tcl-snack (Fedora devel)
spot has set build to Approved for uberpackager on tcl-snack (Fedora devel)
spot has set checkout to Approved for uberpackager on tcl-snack (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tcl-snack



From pkgdb at fedoraproject.org  Fri Sep 12 21:11:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 21:11:28 +0000
Subject: [pkgdb] tcl-snack (Fedora, 9) updated by spot
Message-ID: <20080912211128.D0FCB208D9B@bastion.fedora.phx.redhat.com>

spot added a Fedora 9 branch for tcl-snack
spot has set commit to Approved for uberpackager on tcl-snack (Fedora 9)
spot has set build to Approved for uberpackager on tcl-snack (Fedora 9)
spot has set checkout to Approved for uberpackager on tcl-snack (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tcl-snack



From pkgdb at fedoraproject.org  Fri Sep 12 21:11:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 12 Sep 2008 21:11:28 +0000
Subject: [pkgdb] tcl-snack (Fedora, 8) updated by spot
Message-ID: <20080912211128.E4BEE208D9E@bastion.fedora.phx.redhat.com>

spot added a Fedora 8 branch for tcl-snack
spot has set commit to Approved for uberpackager on tcl-snack (Fedora 8)
spot has set build to Approved for uberpackager on tcl-snack (Fedora 8)
spot has set checkout to Approved for uberpackager on tcl-snack (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tcl-snack



From spot at fedoraproject.org  Fri Sep 12 21:11:40 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 21:11:40 +0000 (UTC)
Subject: rpms/tcl-snack - New directory
Message-ID: <20080912211140.2256D70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tcl-snack
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsU25210/rpms/tcl-snack

Log Message:
Directory /cvs/extras/rpms/tcl-snack added to the repository




From spot at fedoraproject.org  Fri Sep 12 21:11:40 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 21:11:40 +0000 (UTC)
Subject: rpms/tcl-snack/devel - New directory
Message-ID: <20080912211140.5B0F470131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tcl-snack/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsU25210/rpms/tcl-snack/devel

Log Message:
Directory /cvs/extras/rpms/tcl-snack/devel added to the repository




From spot at fedoraproject.org  Fri Sep 12 21:11:41 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 21:11:41 +0000 (UTC)
Subject: rpms/tcl-snack Makefile,NONE,1.1
Message-ID: <20080912211141.37C3270131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tcl-snack
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsU25210/rpms/tcl-snack

Added Files:
	Makefile 
Log Message:
Setup of module tcl-snack


--- NEW FILE Makefile ---
# Top level Makefile for module tcl-snack
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From spot at fedoraproject.org  Fri Sep 12 21:11:41 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 21:11:41 +0000 (UTC)
Subject: rpms/tcl-snack/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080912211141.6DBE770131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tcl-snack/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsU25210/rpms/tcl-snack/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tcl-snack


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tcl-snack
# $Id: Makefile,v 1.1 2008/09/12 21:11:41 spot Exp $
NAME := tcl-snack
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From raven at fedoraproject.org  Fri Sep 12 21:15:15 2008
From: raven at fedoraproject.org (=?utf-8?q?Piotr_Dr=C4=85g?=)
Date: Fri, 12 Sep 2008 21:15:15 +0000 (UTC)
Subject: comps/po pl.po,1.18,1.19
Message-ID: <20080912211515.C9F4B70131@cvs1.fedora.phx.redhat.com>

Author: raven

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26004/comps/po

Modified Files:
	pl.po 
Log Message:
Updated Polish translation


Index: pl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pl.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pl.po	10 Sep 2008 22:57:57 -0000	1.18
+++ pl.po	12 Sep 2008 21:14:45 -0000	1.19
@@ -10,7 +10,7 @@
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-10 18:57-0400\n"
-"PO-Revision-Date: 2008-07-18 22:36+0200\n"
+"PO-Revision-Date: 2008-09-12 23:14+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"
@@ -1164,23 +1164,20 @@
 msgstr "Pakiety metod wej??cia do wpisywania mi??dzynarodowego tekstu."
 
 #: ../comps-f10.xml.in.h:108
-#, fuzzy
 msgid "Maithili Support"
-msgstr "Obs??uga marathi"
+msgstr "Obs??uga maithili"
 
 #: ../comps-f10.xml.in.h:115
-#, fuzzy
 msgid "Myanmar (Burmese) Support"
-msgstr "Obs??uga wietnamskiego"
+msgstr "Obs??uga myanmarskiego (birma??skiego)"
 
 #: ../comps-f10.xml.in.h:159
 msgid "Tajik Support"
 msgstr "Obs??uga tad??yckiego"
 
 #: ../comps-f10.xml.in.h:201
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "Obs??uga czeskiego"
+msgstr "Obs??uga uzbeckiego"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"



From spot at fedoraproject.org  Fri Sep 12 21:15:21 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 12 Sep 2008 21:15:21 +0000 (UTC)
Subject: rpms/tcl-snack/devel import.log, NONE,
	1.1 snack2.2.10-extracflags.patch, NONE,
	1.1 snack2.2.10-nomp3.patch, NONE,
	1.1 snack2.2.10-shared-stubs.patch, NONE, 1.1 tcl-snack.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080912211521.45E4A70131@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tcl-snack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25979/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log snack2.2.10-extracflags.patch 
	snack2.2.10-nomp3.patch snack2.2.10-shared-stubs.patch 
	tcl-snack.spec 
Log Message:

initial commit



--- NEW FILE import.log ---
tcl-snack-2_2_10-2_fc10:HEAD:tcl-snack-2.2.10-2.fc10.src.rpm:1221254003

snack2.2.10-extracflags.patch:

--- NEW FILE snack2.2.10-extracflags.patch ---
diff -up snack2.2.10/unix/Makefile.in.BAD snack2.2.10/unix/Makefile.in
--- snack2.2.10/unix/Makefile.in.BAD	2008-06-11 15:26:32.000000000 -0400
+++ snack2.2.10/unix/Makefile.in	2008-06-11 15:26:55.000000000 -0400
@@ -31,7 +31,9 @@ CC        = @CC@
 
 INCLUDES  = ${XINCLUDES} @TCL_INCLUDE_SPEC@ -I${TCL_INCPATH} -I${TK_INCPATH} @AINC@ @NISTINC@
 
-CFLAGS    = -O @CFLAGS@ @AFLAG@ ${INCLUDES} @TCLAPI@ -I${GENERIC_DIR} @DEFS@
+EXTRACFLAGS =
+
+CFLAGS    = -O @CFLAGS@ @AFLAG@ ${INCLUDES} ${EXTRACFLAGS} @TCLAPI@ -I${GENERIC_DIR} @DEFS@
 
 LIBSO     = -lc @ALIB@ @TCL_LIB_SPEC@
 

snack2.2.10-nomp3.patch:

--- NEW FILE snack2.2.10-nomp3.patch ---
diff -up snack2.2.10/doc/python-man.html.BAD snack2.2.10/doc/python-man.html
--- snack2.2.10/doc/python-man.html.BAD	2008-06-11 15:12:44.000000000 -0400
+++ snack2.2.10/doc/python-man.html	2008-06-11 15:13:47.000000000 -0400
@@ -158,7 +158,7 @@ than or equal to 1, or <tt>"Mono"</tt> o
 be read -- not all of them can be&nbsp;<emph>written</emph>.)</dd>
   <ul type="">
  <li> "WAV"</li>
-  <li> "MP3"</li>
+  <li> "MP3" (MP3 support is disabled in Fedora releases)</li>
   <li> "AU"</li>
   <li> "SND"</li>
   <li> "AIFF"</li>
@@ -381,7 +381,7 @@ operation</td>
   
 <h4> read (<i>filename</i>)</h4>
  Reads new sound data from a file. Current supported file formats are WAV, 
-MP3, AU, SND, AIFF, SD, SMP, CSL, and RAW binary. The command returns the 
+MP3 (disabled in Fedora), AU, SND, AIFF, SD, SMP, CSL, and RAW binary. The command returns the 
 file format detected. It is possible to force a file to be read as RAW using
 by setting the option <b>fileformat=RAW</b>. In this case, properties of
 the sound data can be specified by hand, using the <b>rate, channels, encoding,
diff -up snack2.2.10/generic/jkSound.h.BAD snack2.2.10/generic/jkSound.h
--- snack2.2.10/generic/jkSound.h.BAD	2008-06-11 15:15:03.000000000 -0400
+++ snack2.2.10/generic/jkSound.h	2008-06-11 15:15:44.000000000 -0400
@@ -413,6 +413,9 @@ extern int swapCmd(Sound *s, Tcl_Interp 
 #define MP3_STRING "MP3"
 #define CSL_STRING "CSL"
 
+/* 
+ * MP3 code is disabled due to patents.
+ *
 extern char *GuessMP3File(char *buf, int len);
 
 extern int GetMP3Header(Sound *s, Tcl_Interp *interp, Tcl_Channel ch,
@@ -434,6 +437,8 @@ extern void FreeMP3Header(Sound *s);
 
 extern int ConfigMP3Header(Sound *s, Tcl_Interp *interp, int objc,
 			   Tcl_Obj *CONST objv[]);
+ */
+
 
 typedef enum {
   SNACK_WIN_HAMMING,
diff -up snack2.2.10/unix/Makefile.in.BAD snack2.2.10/unix/Makefile.in
--- snack2.2.10/unix/Makefile.in.BAD	2008-06-11 15:09:59.000000000 -0400
+++ snack2.2.10/unix/Makefile.in	2008-06-11 15:10:14.000000000 -0400
@@ -43,13 +43,13 @@ SHLIB_SUFFIX = @SHLIB_SUFFIX@
 all: libsound${SHLIB_SUFFIX} libsnack${SHLIB_SUFFIX} @DOSTUBLIB@ @LIBNIST@ @LIBOGG@ editversion
 
 OBJSO = sound.o jkSound.o jkSoundEngine.o jkSoundEdit.o jkSoundFile.o \
-	g711.o @AOBJ@ jkFormatMP3.o jkSoundProc.o ffa.o jkPitchCmd.o \
+	g711.o @AOBJ@ jkSoundProc.o ffa.o jkPitchCmd.o \
 	@STUBINITOBJ@ jkAudio.o jkMixer.o shape.o jkFilter.o jkSynthesis.o \
 	jkFilterIIR.o jkGetF0.o sigproc.o jkFormant.o sigproc2.o
 
 OBJSN = snack.o jkSound.o jkSoundEngine.o jkSoundEdit.o jkSoundFile.o \
 	jkCanvSpeg.o jkCanvWave.o jkCanvSect.o ffa.o g711.o @AOBJ@ \
-	jkFormatMP3.o jkSoundProc.o jkPitchCmd.o @STUBINITOBJ@ \
+	jkSoundProc.o jkPitchCmd.o @STUBINITOBJ@ \
 	jkAudio.o jkMixer.o shape.o jkFilter.o jkSynthesis.o jkFilterIIR.o \
 	jkGetF0.o sigproc.o jkFormant.o sigproc2.o
 
@@ -73,9 +73,6 @@ jkSoundFile.o: $(GENERIC_DIR)/jkSoundFil
 g711.o: $(GENERIC_DIR)/g711.c
 	$(CC) -c $(CFLAGS) $(GENERIC_DIR)/g711.c
 
-jkFormatMP3.o: $(GENERIC_DIR)/jkFormatMP3.c
-	$(CC) -c $(CFLAGS) $(GENERIC_DIR)/jkFormatMP3.c
-
 jkSoundProc.o: $(GENERIC_DIR)/jkSoundProc.c
 	$(CC) -c $(CFLAGS) $(GENERIC_DIR)/jkSoundProc.c
 
diff -up snack2.2.10/unix/snack.tcl.BAD snack2.2.10/unix/snack.tcl
--- snack2.2.10/unix/snack.tcl.BAD	2008-06-11 15:10:44.000000000 -0400
+++ snack2.2.10/unix/snack.tcl	2008-06-11 15:11:26.000000000 -0400
@@ -216,7 +216,7 @@ namespace eval snack {
 	if {$::tcl_platform(platform) == "windows"} {
 	    set l [concat {{{MS Wav Files} {.wav}} {{Smp Files} {.smp}} {{Snd Files} {.snd}} {{AU Files} {.au}} {{AIFF Files} {.aif}} {{AIFF Files} {.aiff}} {{Waves Files} {.sd}} {{MP3 Files} {.mp3}} {{CSL Files} {.nsp}}} $loadTypes {{{All Files} * }}]
 	} else {
-	    set l [concat {{{MS Wav Files} {.wav .WAV}} {{Smp Files} {.smp .SMP}} {{Snd Files} {.snd .SND}} {{AU Files} {.au .AU}} {{AIFF Files} {.aif .AIF}} {{AIFF Files} {.aiff .AIFF}} {{Waves Files} {.sd .SD}} {{MP3 Files} {.mp3 .MP3}} {{CSL Files} {.nsp .NSP}}} $loadTypes {{{All Files} * }}]
+	    set l [concat {{{MS Wav Files} {.wav .WAV}} {{Smp Files} {.smp .SMP}} {{Snd Files} {.snd .SND}} {{AU Files} {.au .AU}} {{AIFF Files} {.aif .AIF}} {{AIFF Files} {.aiff .AIFF}} {{Waves Files} {.sd .SD}} {{CSL Files} {.nsp .NSP}}} $loadTypes {{{All Files} * }}]
 	}
 	return [swapListElem $l $filebox(l$fmt)]
     }
@@ -229,7 +229,6 @@ namespace eval snack {
     set filebox(SD) .sd
     set filebox(SND) .snd
     set filebox(AIFF) .aif
-    set filebox(MP3) .mp3
     set filebox(CSL) .nsp
 
     set filebox(lWAV) 0
@@ -239,7 +238,7 @@ namespace eval snack {
     set filebox(lAIFF)  4
     # skip 2 because of aif and aiff
     set filebox(lSD)  6
-    set filebox(lMP3)  7
+    # skip 1 because of mp3
     set filebox(lCSL)  8
     set filebox(lRAW) end
     # Do not forget to update indexes
@@ -350,7 +349,6 @@ namespace eval snack {
     set filebox(.sd) SD
     set filebox(.aif) AIFF
     set filebox(.aiff) AIFF
-    set filebox(.mp3) MP3
     set filebox(.nsp) CSL
     set filebox() WAV
 
diff -up snack2.2.10/generic/jkSoundFile.c.BAD snack2.2.10/generic/jkSoundFile.c
--- snack2.2.10/generic/jkSoundFile.c.BAD	2008-06-11 15:22:35.000000000 -0400
+++ snack2.2.10/generic/jkSoundFile.c	2008-06-11 15:24:16.000000000 -0400
@@ -35,9 +35,11 @@ GuessWavFile(char *buf, int len)
 {
   if (len < 21) return(QUE_STRING);
   if (strncasecmp("RIFF", buf, strlen("RIFF")) == 0) {
+/*
     if (buf[20] == 85) {
       return(MP3_STRING);
     }
+*/
     if (strncasecmp("WAVE", &buf[8], strlen("WAVE")) == 0) {
       return(WAV_STRING);
     }
@@ -3305,6 +3307,8 @@ Snack_FileFormat snackRawFormat = {
   (Snack_FileFormat *) NULL
 };
 
+/*
+
 Snack_FileFormat snackMp3Format = {
   MP3_STRING,
   GuessMP3File,
@@ -3321,6 +3325,8 @@ Snack_FileFormat snackMp3Format = {
   (Snack_FileFormat *) NULL
 };
 
+*/
+
 Snack_FileFormat snackSmpFormat = {
   SMP_STRING,
   GuessSmpFile,
@@ -3427,15 +3433,13 @@ SnackDefineFileFormats(Tcl_Interp *inter
   snackAuFormat.nextPtr   = &snackSmpFormat;
   snackSmpFormat.nextPtr  = &snackCslFormat;
   snackCslFormat.nextPtr  = &snackSdFormat;
-  snackSdFormat.nextPtr   = &snackMp3Format;
-  snackMp3Format.nextPtr  = &snackRawFormat;
+  snackSdFormat.nextPtr   = &snackRawFormat;
   snackRawFormat.nextPtr  = NULL;
 }
 */
 {
   snackFileFormats        = &snackWavFormat;
-  snackWavFormat.nextPtr  = &snackMp3Format;
-  snackMp3Format.nextPtr  = &snackAiffFormat;
+  snackWavFormat.nextPtr  = &snackAiffFormat;
   snackAiffFormat.nextPtr = &snackAuFormat;
   snackAuFormat.nextPtr   = &snackSmpFormat;
   snackSmpFormat.nextPtr  = &snackCslFormat;

snack2.2.10-shared-stubs.patch:

--- NEW FILE snack2.2.10-shared-stubs.patch ---
diff -up snack2.2.10/unix/configure.shared-stubs snack2.2.10/unix/configure
--- snack2.2.10/unix/configure.shared-stubs	2008-06-11 16:33:05.000000000 -0400
+++ snack2.2.10/unix/configure	2008-06-11 16:33:33.000000000 -0400
@@ -1663,7 +1663,7 @@ echo "${ECHO_T}will use stubs (normal)" 
     TCL_LIB_SPEC="${TCL_STUB_LIB_SPEC}"
     TK_LIB_SPEC="${TK_STUB_LIB_SPEC}"
     STUBINITOBJ="snackStubInit.o"
-    DOSTUBLIB="stublib"
+    DOSTUBLIB="libsnackstub$SNACK_VERSION${SHLIB_SUFFIX}"
     SNACK_STUB_LIB_FLAG="-lsnackstub$SNACK_VERSION"
     if test "$TCLVER" = "8.0"; then
         { echo "$as_me:$LINENO: WARNING: \"You probably forgot to specify --disable-stubs\"" >&5
diff -up snack2.2.10/unix/Makefile.in.shared-stubs snack2.2.10/unix/Makefile.in
--- snack2.2.10/unix/Makefile.in.shared-stubs	2008-06-11 16:29:57.000000000 -0400
+++ snack2.2.10/unix/Makefile.in	2008-06-11 16:32:36.000000000 -0400
@@ -164,8 +164,9 @@ libsnack${SHLIB_SUFFIX}: ${OBJSN}
 	${SHLIB_LD} ${OBJSN} ${LIBSN} -o libsnack${SHLIB_SUFFIX} 
 	sed s/.dll/${SHLIB_SUFFIX}/ < $(UNIX_DIR)/pkgIndex.tcl.dll > pkgIndex.tcl
 
-stublib: ${OBJSNST}
-	ar cr libsnackstub${VERSION}.a ${OBJSNST}
+libsnackstub${VERSION}${SHLIB_SUFFIX}: ${OBJSNST}
+	${SHLIB_LD} ${OBJSNST} -o libsnackstub${VERSION}${SHLIB_SUFFIX}
+#	ar cr libsnackstub${VERSION}.a ${OBJSNST}
 
 editversion: ${OBJSN}
 	if test "$(TCL_VERSION)" != "8.4"; then\
@@ -310,7 +311,7 @@ install:
         fi;
 	cp -f libsound${SHLIB_SUFFIX} ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/
 	cp -f libsnack${SHLIB_SUFFIX} ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/
-	if test -f libsnackstub${VERSION}.a; then cp -f libsnackstub${VERSION}.a ${DESTDIR}${SNACK_INSTALL_PATH}/; fi
+	if test -f libsnackstub${VERSION}${SHLIB_SUFFIX}; then cp -f libsnackstub${VERSION}${SHLIB_SUFFIX} ${DESTDIR}${SNACK_INSTALL_PATH}/; fi
 	if test -f libsnacksphere${SHLIB_SUFFIX}; then cp -f libsnacksphere${SHLIB_SUFFIX} ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/; fi
 	if test -f libsnackogg${SHLIB_SUFFIX}; then cp -f libsnackogg${SHLIB_SUFFIX} ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/; fi
 	cp -f $(UNIX_DIR)/snack.tcl ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/


--- NEW FILE tcl-snack.spec ---
%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define realname snack

Name:		tcl-%{realname}
Version:	2.2.10
Release:	2%{?dist}
Summary:	Sound toolkit
Group:		System Environment/Libraries
License:	GPLv2+
URL:		http://www.speech.kth.se/snack/
# The upstream source has two files which implement MP3 decoding.
# ./generic/jkFormatMP3.c and ./generic/jkFormatMP3.h
# Due to patent concerns, we cannot ship that code, thus, the modified tarball.
# Those files are not present in the tarball, all other related removals is done 
# with a patch.
# Upstream source can be found here: http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz
Source0:	%{realname}%{version}-nomp3.tar.gz
Patch0:		snack2.2.10-nomp3.patch
Patch1:		snack2.2.10-extracflags.patch
Patch2:		snack2.2.10-shared-stubs.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	tcl-devel, tk-devel, alsa-lib-devel, libogg-devel, libvorbis-devel
BuildRequires:	python-devel
Requires:	tcl(abi) = 8.5
Provides:	%{realname} = %{version}-%{release}

%description
The Snack Sound Toolkit is designed to be used with a scripting language such 
as Tcl/Tk or Python. Using Snack you can create powerful multi-platform audio 
applications with just a few lines of code. Snack has commands for basic sound 
handling, such as playback, recording, file and socket I/O. Snack also provides 
primitives for sound visualization, e.g. waveforms and spectrograms. It was 
developed mainly to handle digital recordings of speech, but is just as useful 
for general audio. Snack has also successfully been applied to other 
one-dimensional signals. The combination of Snack and a scripting language 
makes it possible to create sound tools and applications with a minimum of 
effort. This is due to the rapid development nature of scripting languages. As 
a bonus you get an application that is cross-platform from start. It is also 
easy to integrate Snack based applications with existing sound analysis 
software.

%package -n python-%{realname}
Summary:	Python bindings for Snack Sound Toolkit
Group:		System Environment/Libraries
Requires:	%{name} = %{version}-%{release}

%description -n python-%{realname}
This package contains python bindings for the Snack Sound Toolkit. Tcl, Tk, and
Tkinter are also required to use Snack.

%prep
%setup -q -n %{realname}%{version}
%patch0 -p1 -b .nomp3
%patch1 -p1 -b .extracflags
%patch2 -p1 -b .shared-stubs
chmod -x generic/*.c generic/*.h unix/*.c COPYING README demos/python/*
iconv -f iso-8859-1 -t utf-8 -o README{.utf8,}
mv README{.utf8,}
sed -i -e 's|\r||g' demos/python/*.txt

%build
cd unix/
%configure --disable-static --enable-alsa --with-tcl=%{_libdir} --with-tk=%{_libdir} --with-ogg-include=%{_includedir} --with-ogg-lib=%{_libdir}
make %{?_smp_mflags} EXTRACFLAGS="%{optflags}"
cd ../python
%{__python} setup.py build

%install
rm -rf %{buildroot}
cd unix/
make install DESTDIR=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'
cd ../python
%{__python} setup.py install --skip-build --root %{buildroot}
install -d %{buildroot}%{tcl_sitearch}
mv %{buildroot}%{_libdir}/%{realname}2.2 %{buildroot}%{tcl_sitearch}/%{realname}2.2
chmod -x %{buildroot}%{tcl_sitearch}/%{realname}2.2/snack.tcl

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_libdir}/libsnackstub2.2.so
%{tcl_sitearch}/%{realname}2.2/

%files -n python-%{realname}
%defattr(-,root,root,-)
%doc doc/python-man.html demos/python/
%{python_sitelib}/tkSnack*

%changelog
* Mon Aug  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-2
- add BR: python

* Wed Jun 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-1
- Initial package for Fedora



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcl-snack/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2008 21:11:41 -0000	1.1
+++ .cvsignore	12 Sep 2008 21:14:51 -0000	1.2
@@ -0,0 +1 @@
+snack2.2.10-nomp3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcl-snack/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 21:11:41 -0000	1.1
+++ sources	12 Sep 2008 21:14:51 -0000	1.2
@@ -0,0 +1 @@
+14ded94e2e93a28585e48536b7044ae5  snack2.2.10-nomp3.tar.gz



From jkeating at fedoraproject.org  Fri Sep 12 21:19:26 2008
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Fri, 12 Sep 2008 21:19:26 +0000 (UTC)
Subject: rpms/pungi/devel .cvsignore, 1.54, 1.55 import.log, 1.5,
	1.6 pungi.spec, 1.58, 1.59 sources, 1.55, 1.56
Message-ID: <20080912211926.E5A3B70131@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/pungi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26796/devel

Modified Files:
	.cvsignore import.log pungi.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	11 Aug 2008 15:33:20 -0000	1.54
+++ .cvsignore	12 Sep 2008 21:18:56 -0000	1.55
@@ -1 +1 @@
-pungi-2.0.4.tar.bz2
+pungi-2.0.5.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	11 Aug 2008 15:33:20 -0000	1.5
+++ import.log	12 Sep 2008 21:18:56 -0000	1.6
@@ -3,3 +3,4 @@
 pungi-2_0_2-1_fc9:HEAD:pungi-2.0.2-1.fc9.src.rpm:1215801155
 pungi-2_0_3-1_fc9:HEAD:pungi-2.0.3-1.fc9.src.rpm:1216163155
 pungi-2_0_4-1_fc9:HEAD:pungi-2.0.4-1.fc9.src.rpm:1218468659
+pungi-2_0_5-1_fc10:HEAD:pungi-2.0.5-1.fc10.src.rpm:1221253869


Index: pungi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/pungi.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- pungi.spec	11 Aug 2008 15:33:20 -0000	1.58
+++ pungi.spec	12 Sep 2008 21:18:56 -0000	1.59
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pungi
-Version:        2.0.4
+Version:        2.0.5
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -10,7 +10,7 @@
 URL:            https://fedorahosted.org/pungi
 Source0:        https://fedorahosted.org/pungi/attachment/wiki/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       anaconda-runtime >= 11.4.1.5, yum => 3.2.13, repoview, createrepo >= 0.4.11
+Requires:       anaconda-runtime >= 11.4.1.5, yum => 3.2.19, repoview, createrepo >= 0.4.11
 BuildRequires:  python-devel
 
 BuildArch:      noarch
@@ -56,6 +56,11 @@
 
 
 %changelog
+* Thu Sep 11 2008 Jesse Keating <jkeating at redhat.com> - 2.0.5-1
+- Add input-methods to pkgorder.  It's a new group, need to get ordering right.
+- Make sure we output sha1sums in binary mode.  This helps windows.
+- Yum api changed, follow so that we don't break.
+
 * Mon Aug 11 2008 Jesse Keating <jkeating at redhat.com> 2.0.4-1
 - Remove unused discs option
 - Don't try to make debuginfo repo for source arch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	11 Aug 2008 15:33:20 -0000	1.55
+++ sources	12 Sep 2008 21:18:56 -0000	1.56
@@ -1 +1 @@
-33df6123e7f8030bea78ec9059b2f2fa  pungi-2.0.4.tar.bz2
+155a73d2997759ad7de4a6fe15dc2718  pungi-2.0.5.tar.bz2



From jjohnstn at fedoraproject.org  Fri Sep 12 22:00:33 2008
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri, 12 Sep 2008 22:00:33 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-9 eclipse-cdt-autotools-fixes.patch, NONE,
	1.1 eclipse-cdt.spec, 1.92, 1.93
Message-ID: <20080912220033.6E03970131@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32685

Modified Files:
	eclipse-cdt.spec 
Added Files:
	eclipse-cdt-autotools-fixes.patch 
Log Message:

* Fri Sep 12 2008 Jeff Johnston <jjohnstn at redhat.com> 4.0.3-2
- Fix autotools project nature reference
- Fix autotools project test
- Restrict build eclipse-pde to be less than 3.4.0.
- Resolves #461647, #461201



eclipse-cdt-autotools-fixes.patch:

--- NEW FILE eclipse-cdt-autotools-fixes.patch ---
diff -up ./plugin.xml.fix ./plugin.xml
--- ./plugin.xml.fix	2008-09-11 19:01:38.000000000 -0400
+++ ./plugin.xml	2008-09-11 19:01:53.000000000 -0400
@@ -754,7 +754,7 @@
          name="%AutotoolsNature.name"
          point="org.eclipse.core.resources.natures">
       <requires-nature
-            id="org.eclipse.cdt.managedbuilder.core.mangedBuildNature">
+            id="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
       </requires-nature>
       <runtime>
          <run
diff -up ./src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java.fix ./src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
--- ./src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java.fix	2008-09-11 19:02:23.000000000 -0400
+++ ./src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java	2008-09-11 19:05:40.000000000 -0400
@@ -50,6 +50,7 @@ public class AutotoolsMakefileBuilder ex
 	public static final String BUILDER_ID = AutotoolsPlugin.getUniqueIdentifier() + "." + BUILDER_NAME; //$NON-NLS-1$
 	public static final String MANAGED_BUILDER_ID = ManagedBuilderCorePlugin.getUniqueIdentifier() + "." + BUILDER_NAME; //$NON-NLS-1$
 	public static final String AUTOTOOLS_CONFIG_ID = AutotoolsPlugin.getUniqueIdentifier() + ".configuration.build"; //$NON-NLS-1$
+	public static final String AUTOTOOLS_PROJECT_TYPE_ID = AutotoolsPlugin.getUniqueIdentifier() + ".projectType"; //$NON-NLS-1$
 	
 	private static final String BUILD_FINISHED = "AutotoolsMakefileBuilder.message.finished";	//$NON-NLS-1$
 	private static final String TYPE_CLEAN = "AutotoolsMakefileBuilder.type.clean";	//$NON-NLS-1$
@@ -76,8 +77,7 @@ public class AutotoolsMakefileBuilder ex
 			// then return true.
 			if (project.getNature(ManagedCProjectNature.MNG_NATURE_ID) != null) {
 				IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
-				IConfiguration config = info.getDefaultConfiguration();
-				if (config.getParent().getId().equals(AUTOTOOLS_CONFIG_ID)) {
+				if (info.getManagedProject().getProjectType().getId().equals(AUTOTOOLS_PROJECT_TYPE_ID)) {
 					AutotoolsProjectNature.addAutotoolsBuilder(project, new NullProgressMonitor());
 					AutotoolsPlugin.verifyScannerInfoProvider(project);
 					return true;


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-9/eclipse-cdt.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- eclipse-cdt.spec	7 Apr 2008 22:55:15 -0000	1.92
+++ eclipse-cdt.spec	12 Sep 2008 22:00:03 -0000	1.93
@@ -19,7 +19,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -107,8 +107,10 @@
 # Remove include of stropts.h in openpty.c as it is no longer included 
 # in glibc-headers package
 Patch12: %{name}-openpty.patch
+# Fixes for autotools plugin.
+Patch13: %{name}-autotools-plugin.patch
 
-BuildRequires: eclipse-pde
+BuildRequires: eclipse-pde < 3.4.0
 %if %{gcj_support}
 BuildRequires:  gcc-java >= 4.0.2
 BuildRequires:  java-gcj-compat-devel >= 1.0.64
@@ -186,6 +188,9 @@
 mkdir autotools
 pushd autotools
 tar -xzf %{SOURCE1}
+pushd com.redhat.eclipse.cdt.autotools
+%patch13
+popd
 popd
 
 # Cppunit stuff
@@ -406,6 +411,12 @@
 %{_libdir}/eclipse/plugins/org.eclipse.cdt.source*
 
 %changelog
+* Fri Sep 12 2008 Jeff Johnston <jjohnstn at redhat.com> 4.0.3-2
+- Fix autotools project nature reference
+- Fix autotools project test
+- Restrict build eclipse-pde to be less than 3.4.0.
+- Resolves #461647, #461201
+
 * Fri Apr 04 2008 Jeff Johnston <jjohnstn at redhat.com> 4.0.3-1
 - Rebase to CDT 4.0.3
 - Patch openpty code to not reference stropts.h which is no longer shipped



From thm at fedoraproject.org  Fri Sep 12 22:02:19 2008
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri, 12 Sep 2008 22:02:19 +0000 (UTC)
Subject: rpms/monotone/F-8 .cvsignore, 1.20, 1.21 monotone.spec, 1.36,
	1.37 sources, 1.20, 1.21
Message-ID: <20080912220219.AF43F70131@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/monotone/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv540

Modified Files:
	.cvsignore monotone.spec sources 
Log Message:
- Updated for 0.41 release.
- Added mtnopt helper.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-8/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	14 Apr 2008 19:44:13 -0000	1.20
+++ .cvsignore	12 Sep 2008 22:01:49 -0000	1.21
@@ -1 +1 @@
-monotone-0.40.tar.gz
+monotone-0.41.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-8/monotone.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- monotone.spec	14 Apr 2008 19:44:14 -0000	1.36
+++ monotone.spec	12 Sep 2008 22:01:49 -0000	1.37
@@ -1,10 +1,10 @@
 Name: monotone
-Version: 0.40
+Version: 0.41
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
-License: GPL
+License: GPLv2+
 
 URL: http://monotone.ca/
 Source0: http://monotone.ca/downloads/%{version}/%{name}-%{version}.tar.gz
@@ -134,13 +134,14 @@
 %doc monotone.html
 
 %{_bindir}/mtn
+%{_bindir}/mtnopt
 %{_infodir}/monotone.info*
 %{_datadir}/emacs/site-lisp/monotone*.el*
 %{_sysconfdir}/bash_completion.d
 
 %files server
-%doc README.monotone-server
 %defattr(-,root,root,-)
+%doc README.monotone-server
 %{_sbindir}/monotone-server
 %{_sysconfdir}/rc.d/init.d/monotone
 %dir %attr(0755,monotone,monotone) %{_localstatedir}/run/monotone
@@ -180,6 +181,13 @@
 
 
 %changelog
+* Fri Sep 12 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.41-1
+- Updated for 0.41 release.
+- Added mtnopt helper.
+
+* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.40-2
+- fix license tag
+
 * Mon Apr 14 2008 Roland McGrath <roland at redhat.com> - 0.40-1
 - Updated for 0.40 release.
 - Tweaked trivia for packaging guidelines nits.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-8/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	14 Apr 2008 19:44:14 -0000	1.20
+++ sources	12 Sep 2008 22:01:49 -0000	1.21
@@ -1 +1 @@
-4d90776beaff7445e7a2d8774378fbba  monotone-0.40.tar.gz
+f4ee37fb6853719933561fef901e2a07  monotone-0.41.tar.gz



From jjohnstn at fedoraproject.org  Fri Sep 12 22:03:24 2008
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri, 12 Sep 2008 22:03:24 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-9 eclipse-cdt.spec,1.93,1.94
Message-ID: <20080912220324.3B95B70131@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv837

Modified Files:
	eclipse-cdt.spec 
Log Message:

Fix autotools patch reference.



Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-9/eclipse-cdt.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- eclipse-cdt.spec	12 Sep 2008 22:00:03 -0000	1.93
+++ eclipse-cdt.spec	12 Sep 2008 22:02:54 -0000	1.94
@@ -108,7 +108,7 @@
 # in glibc-headers package
 Patch12: %{name}-openpty.patch
 # Fixes for autotools plugin.
-Patch13: %{name}-autotools-plugin.patch
+Patch13: %{name}-autotools-fixes.patch
 
 BuildRequires: eclipse-pde < 3.4.0
 %if %{gcj_support}



From mstone at fedoraproject.org  Fri Sep 12 22:13:59 2008
From: mstone at fedoraproject.org (Michael Stone)
Date: Fri, 12 Sep 2008 22:13:59 +0000 (UTC)
Subject: rpms/olpc-netutils/F-9 .cvsignore, 1.2, 1.3 olpc-netutils.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20080912221359.4D81C70131@cvs1.fedora.phx.redhat.com>

Author: mstone

Update of /cvs/pkgs/rpms/olpc-netutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2451

Modified Files:
	.cvsignore olpc-netutils.spec sources 
Log Message:
- Michael Stone (1):
    Dirty hack to make sugar-telepathies work on XOs.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-netutils/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Sep 2008 20:14:00 -0000	1.2
+++ .cvsignore	12 Sep 2008 22:13:28 -0000	1.3
@@ -1 +1 @@
-olpc-netutils-0.5.tar.bz2
+olpc-netutils-0.6.tar.bz2


Index: olpc-netutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-netutils/F-9/olpc-netutils.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- olpc-netutils.spec	12 Sep 2008 20:14:00 -0000	1.2
+++ olpc-netutils.spec	12 Sep 2008 22:13:28 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           olpc-netutils
-Version:        0.5
+Version:        0.6
 Release:        1%{?dist}
 Summary:        OLPC network utilities
 
@@ -60,6 +60,10 @@
 
 
 %changelog
+* Fri Sep 12 2008 Michael Stone <michael at laptop.org> - 0.6-1
+- Michael Stone (1):
+    Dirty hack to make sugar-telepathies work on XOs.
+
 * Fri Sep 12 2008 Michael Stone <michael at laptop.org> - 0.5-1
 - Guillaume Desmottes (2):
     Print the quantity of buddies we see.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-netutils/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Sep 2008 20:14:00 -0000	1.3
+++ sources	12 Sep 2008 22:13:28 -0000	1.4
@@ -1 +1 @@
-9444bfa2f9d4982d44c324ee7a932998  olpc-netutils-0.5.tar.bz2
+f5bda6055d907c9bfeb4bf502d7ea768  olpc-netutils-0.6.tar.bz2



From than at fedoraproject.org  Fri Sep 12 22:23:48 2008
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 12 Sep 2008 22:23:48 +0000 (UTC)
Subject: rpms/kde-filesystem/devel kde-filesystem.spec, 1.30,
	1.31 macros.kde4, 1.7, 1.8
Message-ID: <20080912222348.D19A170131@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4190

Modified Files:
	kde-filesystem.spec macros.kde4 
Log Message:
remove redundant FEDORA, use CMAKE_BUILD_TYPE=release



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- kde-filesystem.spec	14 Jul 2008 13:33:48 -0000	1.30
+++ kde-filesystem.spec	12 Sep 2008 22:23:18 -0000	1.31
@@ -11,13 +11,13 @@
 %define _kde4_bindir %_kde4_prefix/bin
 %define _kde4_sbindir %_kde4_prefix/sbin
 %define _kde4_includedir %_kde4_prefix/include/kde4
-%define _kde4_buildtype FEDORA 
-%define _kde4_macros_api 2
+%define _kde4_buildtype release
+%define _kde4_macros_api 3
 
 Summary: KDE filesystem layout
 Name: kde-filesystem
 Version: 4
-Release: 17%{?dist}
+Release: 18%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
@@ -126,8 +126,8 @@
 %%_kde4_bindir %%_kde4_prefix/bin
 %%_kde4_sbindir %%_kde4_prefix/sbin
 %%_kde4_includedir %%_kde4_prefix/include/kde4
-%%_kde4_buildtype FEDORA
-%%_kde4_macros_api 2
+%%_kde4_buildtype release
+%%_kde4_macros_api 3
 EOF
 cat %{SOURCE2} >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4
 
@@ -179,6 +179,9 @@
 
 
 %changelog
+* Sat Sep 13 2008 Than Ngo <than at redhat.com> 4-18
+- remove redundant FEDORA, use CMAKE_BUILD_TYPE=release
+
 * Mon Jul 14 2008 Rex Dieter <rdieter at fedoraproject.org> 4-17
 - + %%_kde4_sharedir/kde4
 


Index: macros.kde4
===================================================================
RCS file: /cvs/extras/rpms/kde-filesystem/devel/macros.kde4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- macros.kde4	31 Mar 2008 16:21:35 -0000	1.7
+++ macros.kde4	12 Sep 2008 22:23:18 -0000	1.8
@@ -1,5 +1,5 @@
 
-# api = 2
+# api = 3
 # initial try, including only items that vary from defaults
 #
 



From than at fedoraproject.org  Fri Sep 12 22:28:38 2008
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 12 Sep 2008 22:28:38 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.1.1-cmake.patch, NONE, 1.1 kdelibs.spec,
	1.374, 1.375 kdelibs-4.0.5-fedora-buildtype.patch, 1.1, NONE
Message-ID: <20080912222838.87A0870131@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5032

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.1-cmake.patch 
Removed Files:
	kdelibs-4.0.5-fedora-buildtype.patch 
Log Message:
- remove redundant FEDORA, use CMAKE_BUILD_TYPE=release
- fix install problem with cmake > 2.5


kdelibs-4.1.1-cmake.patch:

--- NEW FILE kdelibs-4.1.1-cmake.patch ---
diff -up kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake.orig kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake.orig	2008-09-12 23:54:36.000000000 +0200
+++ kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake	2008-09-13 00:02:50.000000000 +0200
@@ -745,6 +745,7 @@ endif(WIN32)
 # CMake generators if no build type is set.
 if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE RelWithDebInfo)
+   set(CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} CMAKE_BUILD_TYPE)
 endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
 
 
@@ -953,10 +954,6 @@ endif(MSVC)
 
 
 if (CMAKE_COMPILER_IS_GNUCXX)
-   if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-      set (CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} "Debugfull")
-   endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-
    set (KDE4_ENABLE_EXCEPTIONS -fexceptions)
    # Select flags.
    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
@@ -1063,11 +1060,6 @@ endif (CMAKE_COMPILER_IS_GNUCXX)
 
 
 if (CMAKE_C_COMPILER MATCHES "icc")
-
-   if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-      set (CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} "Debugfull")
-   endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-
    set (KDE4_ENABLE_EXCEPTIONS -fexceptions)
    # Select flags.
    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -r1.374 -r1.375
--- kdelibs.spec	12 Sep 2008 20:32:08 -0000	1.374
+++ kdelibs.spec	12 Sep 2008 22:28:08 -0000	1.375
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -28,7 +28,7 @@
 %define rest 1
 %endif
 
-BuildRequires: kde4-macros(api) >= 2
+BuildRequires: kde4-macros(api) >= 3
 BuildRequires: kde-filesystem >= 4
 Requires: dbus-x11
 Requires: hicolor-icon-theme
@@ -71,14 +71,13 @@
 # workaround for policykit
 Patch11: kdelibs-4.0.2-policykit-workaround.patch
 Patch12: kdelibs-4.1.0-xdg-menu.patch
-# Fedora build type - adds -DNDEBUG -DQT_NO_DEBUG, removes -O2 -g (already in RPM_OPT_FLAGS)
-Patch13: kdelibs-4.0.5-fedora-buildtype.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
 Patch14: kdelibs-4.0.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.0-kstandarddirs.patch
 # fix running commands in kglobalconfig before KComponentData init (#455130)
 Patch19: kdelibs-4.1.0-#455130.patch
+Patch20: kdelibs-4.1.1-cmake.patch
 
 ## upstream patches
 Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
@@ -206,10 +205,10 @@
 %patch10 -p1 -b .no-cache-kdeglobals-paths
 %patch11 -p1 -b .policykit
 %patch12 -p1 -b .Administration-menu
-%patch13 -p1 -b .fedora-buildtype
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch19 -p1 -b .#455130
+%patch20 -p1 -b .cmake
 
 ## upstream patches
 %patch100 -p0 -b .kde#169447-khtml-regression
@@ -377,6 +376,10 @@
 
 
 %changelog
+* Sat Sep 13 2008 Than Ngo <than at redhat.com> 4.1.1-7
+- remove redundant FEDORA, use CMAKE_BUILD_TYPE=release
+- fix install problem with cmake > 2.5
+
 * Mon Sep 08 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-6
 - fix crashes in plugin selector
 - fix problems in various kdeui widgets


--- kdelibs-4.0.5-fedora-buildtype.patch DELETED ---



From dwmw2 at fedoraproject.org  Fri Sep 12 22:29:35 2008
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Fri, 12 Sep 2008 22:29:35 +0000 (UTC)
Subject: rpms/bluez/devel bluez.spec,1.3,1.4
Message-ID: <20080912222935.C145570131@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5426

Modified Files:
	bluez.spec 
Log Message:
fix provides/obsoletes


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bluez.spec	12 Sep 2008 17:00:29 -0000	1.3
+++ bluez.spec	12 Sep 2008 22:29:05 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -57,7 +57,7 @@
 %package cups
 Summary: CUPS printer backend for Bluetooth printers
 Group: System Environment/Daemons
-Obsoletes: bluez-utils-cups
+Obsoletes: bluez-utils-cups < 4.5-2
 Provides: bluez-utils-cups = %{version}-%{release}
 Requires: bluez-libs = %{version}
 Requires: cups
@@ -65,12 +65,14 @@
 %package gstreamer
 Summary: GStreamer support for SBC audio format
 Group: System Environment/Daemons
-Obsoletes: bluez-utils-gstreamer
+Obsoletes: bluez-utils-gstreamer < 4.5-2
 Provides: bluez-utils-gstreamer = %{version}-%{release}
 Requires: bluez-libs = %{version}
 
 %package alsa
 Summary: ALSA support for Bluetooth audio devices
+Obsoletes: bluez-utils-alsa < 4.5-2
+Provides: bluez-utils-alsa = %{version}-%{release}
 Group: System Environment/Daemons
 Requires: bluez-libs = %{version}
 
@@ -179,6 +181,10 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Fri Sep 12 2008 - David Woodhouse <David.Woodhouse at intel.com> - 4.5-3
+- Bluez-alsa needs to provide/obsolete bluez-utils-alsa
+- Use versioned Obsoletes:
+
 * Fri Sep 12 2008 - David Woodhouse <David.Woodhouse at intel.com> - 4.5-2
 - Change main utils package name to 'bluez'; likewise its subpackages
 - Remove references to obsolete initscripts (hidd,pand,dund)



From kkofler at fedoraproject.org  Fri Sep 12 22:37:08 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 12 Sep 2008 22:37:08 +0000 (UTC)
Subject: rpms/extragear-plasma/devel dead.package, NONE, 1.1 .cvsignore, 1.6,
	NONE extragear-plasma.spec, 1.16, NONE sources, 1.6, NONE
Message-ID: <20080912223708.EA55C70131@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/extragear-plasma/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6787/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore extragear-plasma.spec sources 
Log Message:
Mark as dead.package (renamed to kdeplasma-addons in kde-4.1, already blocked from F10).


--- NEW FILE dead.package ---
renamed to kdeplasma-addons in kde-4.1


--- .cvsignore DELETED ---


--- extragear-plasma.spec DELETED ---


--- sources DELETED ---



From kkofler at fedoraproject.org  Fri Sep 12 22:37:08 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 12 Sep 2008 22:37:08 +0000 (UTC)
Subject: rpms/extragear-plasma/F-9 dead.package, NONE, 1.1 .cvsignore, 1.4, 
	NONE extragear-plasma.spec, 1.8, NONE sources, 1.4, NONE
Message-ID: <20080912223708.C021E70131@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/extragear-plasma/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6787/F-9

Added Files:
	dead.package 
Removed Files:
	.cvsignore extragear-plasma.spec sources 
Log Message:
Mark as dead.package (renamed to kdeplasma-addons in kde-4.1, already blocked from F10).


--- NEW FILE dead.package ---
renamed to kdeplasma-addons in kde-4.1


--- .cvsignore DELETED ---


--- extragear-plasma.spec DELETED ---


--- sources DELETED ---



From kkofler at fedoraproject.org  Fri Sep 12 22:39:14 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 12 Sep 2008 22:39:14 +0000 (UTC)
Subject: rpms/kdeplasmoids/F-9 dead.package, NONE, 1.1 .cvsignore, 1.1,
	NONE sources, 1.1, NONE
Message-ID: <20080912223914.4DAF770131@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeplasmoids/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7640/F-9

Added Files:
	dead.package 
Removed Files:
	.cvsignore sources 
Log Message:
Also mark as dead.package in F-9 (was never built for F9 under that name). It was called extragear-plasma in 4.0 and it's now called kdeplasma-addons in 4.1.


--- NEW FILE dead.package ---
renamed to kdeplasma-addons in kde-4.1


--- .cvsignore DELETED ---


--- sources DELETED ---



From mstone at fedoraproject.org  Fri Sep 12 22:40:35 2008
From: mstone at fedoraproject.org (Michael Stone)
Date: Fri, 12 Sep 2008 22:40:35 +0000 (UTC)
Subject: rpms/olpc-netutils/F-9 olpc-netutils.spec,1.3,1.4
Message-ID: <20080912224035.CFBC170131@cvs1.fedora.phx.redhat.com>

Author: mstone

Update of /cvs/pkgs/rpms/olpc-netutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7833

Modified Files:
	olpc-netutils.spec 
Log Message:
- Michael Stone (1):
    Pull in tcpdump for olpc-netcapture.



Index: olpc-netutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-netutils/F-9/olpc-netutils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- olpc-netutils.spec	12 Sep 2008 22:13:28 -0000	1.3
+++ olpc-netutils.spec	12 Sep 2008 22:40:05 -0000	1.4
@@ -27,6 +27,7 @@
 Requires:       iputils
 Requires:       iptables
 Requires:       dnsmasq
+Requires:       tcpdump
 
 Requires:       /sbin/modprobe
 Requires:       /bin/awk
@@ -60,6 +61,10 @@
 
 
 %changelog
+* Fri Sep 12 2008 Michael Stone <michael at laptop.org> - 0.6-2
+- Michael Stone (1):
+    Pull in tcpdump for olpc-netcapture.
+
 * Fri Sep 12 2008 Michael Stone <michael at laptop.org> - 0.6-1
 - Michael Stone (1):
     Dirty hack to make sugar-telepathies work on XOs.



From mstone at fedoraproject.org  Fri Sep 12 22:43:54 2008
From: mstone at fedoraproject.org (Michael Stone)
Date: Fri, 12 Sep 2008 22:43:54 +0000 (UTC)
Subject: rpms/olpc-netutils/F-9 olpc-netutils.spec,1.4,1.5
Message-ID: <20080912224354.C260870131@cvs1.fedora.phx.redhat.com>

Author: mstone

Update of /cvs/pkgs/rpms/olpc-netutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8259

Modified Files:
	olpc-netutils.spec 
Log Message:
- Michael Stone (1):
    Pull in tcpdump for olpc-netcapture.



Index: olpc-netutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-netutils/F-9/olpc-netutils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- olpc-netutils.spec	12 Sep 2008 22:40:05 -0000	1.4
+++ olpc-netutils.spec	12 Sep 2008 22:43:24 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           olpc-netutils
 Version:        0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OLPC network utilities
 
 Group:          System Environment/Base



From dionysos at fedoraproject.org  Fri Sep 12 22:50:18 2008
From: dionysos at fedoraproject.org (Alain Portal)
Date: Fri, 12 Sep 2008 22:50:18 +0000 (UTC)
Subject: rpms/man-pages-fr/F-8 man-pages-fr.spec,1.38,1.39
Message-ID: <20080912225018.34C9970131@cvs1.fedora.phx.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/man-pages-fr/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8768

Modified Files:
	man-pages-fr.spec 
Log Message:
- Remove pages provided by their upstream tarball
  Fix #455277 and #457663



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/extras/rpms/man-pages-fr/F-8/man-pages-fr.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- man-pages-fr.spec	7 Jun 2008 10:14:33 -0000	1.38
+++ man-pages-fr.spec	12 Sep 2008 22:49:47 -0000	1.39
@@ -4,7 +4,7 @@
 Summary:	French version of the Linux man-pages
 Name:		man-pages-fr
 Version:	2.80.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL+
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
@@ -52,6 +52,12 @@
 # This page is provided by LDP so we have to remove it from shadow-utils package
 %{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man3/getspnam.3
 
+# This page is provided by rmp package
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man8/rpm.8
+
+# This page is provided by sitecopy package
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man1/sitecopy.1
+
 LANG=fr ./cree_index_man.sh $RPM_BUILD_ROOT%{_mandir}/fr/
 
 %clean
@@ -64,6 +70,10 @@
 %{_mandir}/fr/
 
 %changelog
+* Sat Sep  6 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.80.0-3
+- Remove pages provided by their upstream tarball
+  Fix #455277 and #457663
+
 * Fri Jun  6 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.80.0-2
 - Bump release because wrong sources file
 



From than at fedoraproject.org  Fri Sep 12 22:52:36 2008
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 12 Sep 2008 22:52:36 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.1.1-cmake.patch,1.1,1.2
Message-ID: <20080912225236.B103B70131@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9074

Modified Files:
	kdelibs-4.1.1-cmake.patch 
Log Message:
typo


kdelibs-4.1.1-cmake.patch:

Index: kdelibs-4.1.1-cmake.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs-4.1.1-cmake.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.1.1-cmake.patch	12 Sep 2008 22:28:08 -0000	1.1
+++ kdelibs-4.1.1-cmake.patch	12 Sep 2008 22:52:36 -0000	1.2
@@ -5,7 +5,7 @@
  # CMake generators if no build type is set.
  if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE RelWithDebInfo)
-+   set(CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} CMAKE_BUILD_TYPE)
++   set(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE})
  endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
  
  



From dionysos at fedoraproject.org  Fri Sep 12 22:58:07 2008
From: dionysos at fedoraproject.org (Alain Portal)
Date: Fri, 12 Sep 2008 22:58:07 +0000 (UTC)
Subject: rpms/man-pages-fr/F-8 man-pages-fr.spec,1.39,1.40
Message-ID: <20080912225807.9C93170131@cvs1.fedora.phx.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/man-pages-fr/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9596

Modified Files:
	man-pages-fr.spec 
Log Message:
- Sitecopy french men page isn't yet provided by upstream



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/extras/rpms/man-pages-fr/F-8/man-pages-fr.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- man-pages-fr.spec	12 Sep 2008 22:49:47 -0000	1.39
+++ man-pages-fr.spec	12 Sep 2008 22:57:37 -0000	1.40
@@ -4,7 +4,7 @@
 Summary:	French version of the Linux man-pages
 Name:		man-pages-fr
 Version:	2.80.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL+
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
@@ -55,8 +55,9 @@
 # This page is provided by rmp package
 %{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man8/rpm.8
 
-# This page is provided by sitecopy package
-%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man1/sitecopy.1
+# This page isn't yet provided by sitecopy package
+## This page is provided by sitecopy package
+#%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man1/sitecopy.1
 
 LANG=fr ./cree_index_man.sh $RPM_BUILD_ROOT%{_mandir}/fr/
 
@@ -70,6 +71,9 @@
 %{_mandir}/fr/
 
 %changelog
+* Sat Sep 132 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.80.0-4
+- Sitecopy french men page isn't yet provided by upstream
+
 * Sat Sep  6 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.80.0-3
 - Remove pages provided by their upstream tarball
   Fix #455277 and #457663



From dionysos at fedoraproject.org  Fri Sep 12 23:06:42 2008
From: dionysos at fedoraproject.org (Alain Portal)
Date: Fri, 12 Sep 2008 23:06:42 +0000 (UTC)
Subject: rpms/man-pages-fr/F-8 man-pages-fr.spec,1.40,1.41
Message-ID: <20080912230642.895B870131@cvs1.fedora.phx.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/man-pages-fr/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10199

Modified Files:
	man-pages-fr.spec 
Log Message:
- I wanted to say rpm of course...



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/extras/rpms/man-pages-fr/F-8/man-pages-fr.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- man-pages-fr.spec	12 Sep 2008 22:57:37 -0000	1.40
+++ man-pages-fr.spec	12 Sep 2008 23:06:12 -0000	1.41
@@ -4,7 +4,7 @@
 Summary:	French version of the Linux man-pages
 Name:		man-pages-fr
 Version:	2.80.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL+
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
@@ -52,12 +52,12 @@
 # This page is provided by LDP so we have to remove it from shadow-utils package
 %{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man3/getspnam.3
 
-# This page is provided by rmp package
-%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man8/rpm.8
+# This page isn't yet provided by rpm package in F8
+## This page is provided by rmp package
+#%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man8/rpm.8
 
-# This page isn't yet provided by sitecopy package
-## This page is provided by sitecopy package
-#%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man1/sitecopy.1
+# This page is provided by sitecopy package
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man1/sitecopy.1
 
 LANG=fr ./cree_index_man.sh $RPM_BUILD_ROOT%{_mandir}/fr/
 
@@ -71,7 +71,10 @@
 %{_mandir}/fr/
 
 %changelog
-* Sat Sep 132 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.80.0-4
+* Sat Sep 13 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.80.0-5
+- I wanted to say rpm of course...
+
+* Sat Sep 13 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.80.0-4
 - Sitecopy french men page isn't yet provided by upstream
 
 * Sat Sep  6 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.80.0-3



From dionysos at fedoraproject.org  Fri Sep 12 23:13:27 2008
From: dionysos at fedoraproject.org (Alain Portal)
Date: Fri, 12 Sep 2008 23:13:27 +0000 (UTC)
Subject: rpms/man-pages-fr/F-9 man-pages-fr.spec,1.42,1.43
Message-ID: <20080912231327.195D770131@cvs1.fedora.phx.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/man-pages-fr/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10460

Modified Files:
	man-pages-fr.spec 
Log Message:
sitecopy french man page is provided by upstream.



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/extras/rpms/man-pages-fr/F-9/man-pages-fr.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- man-pages-fr.spec	7 Jun 2008 10:16:25 -0000	1.42
+++ man-pages-fr.spec	12 Sep 2008 23:12:56 -0000	1.43
@@ -4,7 +4,7 @@
 Summary:	French version of the Linux man-pages
 Name:		man-pages-fr
 Version:	2.80.0
-Release:	2%{?dist}
+Release:	5%{?dist}
 License:	GPL+
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
@@ -52,6 +52,13 @@
 # This page is provided by LDP so we have to remove it from shadow-utils package
 %{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man3/getspnam.3
 
+# This page isn't yet provided by rpm package in F8
+## This page is provided by rmp package
+#%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man8/rpm.8
+
+# This page is provided by sitecopy package
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man1/sitecopy.1
+
 LANG=fr ./cree_index_man.sh $RPM_BUILD_ROOT%{_mandir}/fr/
 
 %clean
@@ -64,6 +71,16 @@
 %{_mandir}/fr/
 
 %changelog
+* Sat Sep 13 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.80.0-5
+- I wanted to say rpm of course...
+
+* Sat Sep 13 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.80.0-4
+- Sitecopy french men page isn't yet provided by upstream
+
+* Sat Sep  6 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.80.0-3
+- Remove pages provided by their upstream tarball
+  Fix #455277 and #457663
+
 * Fri Jun  6 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.80.0-2
 - Bump release because wrong sources file
 



From dionysos at fedoraproject.org  Fri Sep 12 23:19:00 2008
From: dionysos at fedoraproject.org (Alain Portal)
Date: Fri, 12 Sep 2008 23:19:00 +0000 (UTC)
Subject: rpms/man-pages-fr/devel man-pages-fr.spec,1.43,1.44
Message-ID: <20080912231900.B131770131@cvs1.fedora.phx.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/man-pages-fr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10934

Modified Files:
	man-pages-fr.spec 
Log Message:
Bump release



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/extras/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- man-pages-fr.spec	11 Sep 2008 13:45:12 -0000	1.43
+++ man-pages-fr.spec	12 Sep 2008 23:18:30 -0000	1.44
@@ -4,7 +4,7 @@
 Summary:	French version of the Linux man-pages
 Name:		man-pages-fr
 Version:	2.80.0
-Release:	3%{?dist}
+Release:	5%{?dist}
 License:	GPL+
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
@@ -70,6 +70,9 @@
 %{_mandir}/fr/
 
 %changelog
+* Sat Sep 13 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.80.0-5
+- Bump release
+
 * Sat Sep  6 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.80.0-3
 - Remove pages provided by their upstream tarball
   Fix #455277 and #457663



From nigelj at fedoraproject.org  Fri Sep 12 23:28:48 2008
From: nigelj at fedoraproject.org (Nigel Jones)
Date: Fri, 12 Sep 2008 23:28:48 +0000 (UTC)
Subject: rpms/mediawiki-SpecialInterwiki/devel SpecialInterwiki_body.php,
	NONE, 1.1 SpecialInterwiki.i18n.php, 1.1, 1.2 SpecialInterwiki.php,
	1.1, 1.2 mediawiki-SpecialInterwiki.spec, 1.2, 1.3
Message-ID: <20080912232849.0461070131@cvs1.fedora.phx.redhat.com>

Author: nigelj

Update of /cvs/pkgs/rpms/mediawiki-SpecialInterwiki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12017

Modified Files:
	SpecialInterwiki.i18n.php SpecialInterwiki.php 
	mediawiki-SpecialInterwiki.spec 
Added Files:
	SpecialInterwiki_body.php 
Log Message:
* Sat Sep 13 2008 Nigel Jones <dev at nigelj.com> - 0-0.4.20080913svn
- Update to >= 1.12 version now that rawhide has an updated Mediawiki package




--- NEW FILE SpecialInterwiki_body.php ---
<?php
/**
 * Implements Special:Interwiki
 */
class SpecialInterwiki extends SpecialPage {
	function __construct() {
		wfLoadExtensionMessages( 'Interwiki' );
		parent::__construct( 'Interwiki' );
	}

	function execute( $par ) {
		global $wgRequest, $wgOut, $wgUser;

		$admin = $wgUser->isAllowed( 'interwiki' );

		$this->setHeaders();
		if( $admin ){
			$wgOut->setPagetitle( wfMsg( 'interwiki' ) );
		} else {
			$wgOut->setPagetitle( wfMsg( 'interwiki-title-norights' ) );
		}
		$action = $wgRequest->getVal( 'action', $par );

		// checking
		$selfTitle = $this->getTitle();

		// Protect administrative actions against malicious requests
		$safePost = $wgRequest->wasPosted() &&
			$wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) );

		switch( $action ){
		case "delete":
			if( !$admin ){
				$wgOut->permissionRequired('interwiki');
				return;
			}

			$prefix = $wgRequest->getVal( 'prefix' );
			$encPrefix = htmlspecialchars( $prefix );
			$actionUrl = $selfTitle->escapeLocalURL( "action=submit" );
			$button = wfMsgHtml( 'delete' );
			$topmessage = wfMsgHtml( 'interwiki_delquestion', $encPrefix );
			$deletingmessage = wfMsgHtml( 'interwiki_deleting', $encPrefix );
			$reasonmessage = wfMsgHtml( 'deletecomment' );
			$defaultreason = wfMsgForContent( 'interwiki_defaultreason' );
			$token = htmlspecialchars( $wgUser->editToken() );

			$wgOut->addHTML(
				"<fieldset>
				<legend>$topmessage</legend>
				<form id=\"delete\" method=\"post\" action=\"{$actionUrl}\">
				<table><tr>
				<td>$deletingmessage</td>
				</tr><tr>
				<td>$reasonmessage &nbsp; <input tabindex='1' type='text' name=\"reason\" maxlength='200' size='60' value='$defaultreason' /></td>
				</tr><tr><td>
				<input type='submit' name='delete' id=\"interwikideletebutton\" value='{$button}' />
				<input type='hidden' name='prefix' value='{$encPrefix}' />
				<input type='hidden' name='do' value='delete' />
				<input type='hidden' name='wpEditToken' value='{$token}' />
				</td></tr></table>
				</form>
				</fieldset>\n"
			);
			break;
		case "edit" :
		case "add" :
			if( !$admin ){
				$wgOut->permissionRequired( 'interwiki' );
				return;
			}
			if( $action == "edit" ){
				$prefix = $wgRequest->getVal( 'prefix' );
				$dbr = wfGetDB( DB_SLAVE );
				$row = $dbr->selectRow( 'interwiki', '*', array( 'iw_prefix' => $prefix ) );
				if( !$row ){
					$wgOut->wrapWikiMsg( '<div class="errorbox">$1</div>', array( 'interwiki_editerror', $prefix ) );
					return;
				}
				$prefix = htmlspecialchars( $row->iw_prefix );
				$defaulturl = htmlspecialchars( $row->iw_url );
				$site = ' value="' . htmlspecialchars( $row->iw_site ).'"';
				$trans = $row->iw_trans ? " checked='checked'" : '' ;
				$local = $row->iw_local ? " checked='checked'" : '';
				$old = "<input type='hidden' name='prefix' value='" . htmlspecialchars( $row->iw_prefix ) . "' />";
				$topmessage = wfMsgHtml( 'interwiki_edittext' );
				$intromessage = wfMsgHtml( 'interwiki_editintro' );
				$button = wfMsgHtml( 'edit' );
			} else {
				$prefix = "<input tabindex='1' type='text' name='prefix' maxlength='20' size='20' />";
				$local = '';
				$trans = '';
				$old = '';
				$defaulturl = wfMsgHtml( 'interwiki_defaulturl' );
				$topmessage = wfMsgHtml( 'interwiki_addtext' );
				$intromessage = wfMsgHtml( 'interwiki_addintro' );
				$button = wfMsgHtml( 'interwiki_addbutton' );
			}

			$actionUrl = $selfTitle->escapeLocalURL( 'action=submit' );
			$prefixmessage = wfMsgHtml( 'interwiki_prefix' );
			$localmessage = wfMsgHtml( 'interwiki_local' );
			$transmessage = wfMsgHtml( 'interwiki_trans' );
			$reasonmessage = wfMsgHtml( 'interwiki_reasonfield' );
			$urlmessage = wfMsgHtml( 'interwiki_url' );
			$token = htmlspecialchars( $wgUser->editToken() );
			$defaultreason = htmlspecialchars( wfMsgForContent( 'interwiki_defaultreason' ) );

			$wgOut->addHTML(
				"<fieldset>
				<legend>$topmessage</legend>
				$intromessage
				<form id='{$action}' method='post' action='{$actionUrl}'>
				<table id='interwikitable-{$action}'><tr>
				<td>$prefixmessage</td>
				<td>$prefix</td>
				</tr><tr>
				<td>$localmessage</td>
				<td><input type='checkbox' id='local' name='local' {$local}/></td>
				</tr><tr>
				<td>$transmessage</td>
				<td><input type='checkbox' id='trans' name='trans' {$trans}/></td>
				</tr><tr>
				<td>$urlmessage</td>
				<td><input tabindex='1' type='text' name='theurl' maxlength='200' size='60' value='$defaulturl' /></td>
				</tr><tr>
				<td>$reasonmessage</td>
				<td><input tabindex='1' type='text' name='reason' maxlength='200' size='60' value='$defaultreason' /></td>
				</tr></table>
				<input type='submit' name='{$action}'  id='interwiki{$action}button' value='{$button}' />
				<input type='hidden' name='do' value='{$action}' />
				$old
				<input type='hidden' name='wpEditToken' value='{$token}' />
				</form>
				</fieldset>\n"
			);
			break;
		case "submit":
			if( !$admin ){
				$wgOut->permissionRequired('interwiki');
				return;
			}
			if( !$safePost ){
				$wgOut->addWikiText( wfMsg('sessionfailure') );
				return;
			}

			$prefix = $wgRequest->getVal('prefix');
			$reason = $wgRequest->getText('reason');
			$do = $wgRequest->getVal('do');
			$dbw = wfGetDB( DB_MASTER );
			switch( $do ){
			case "delete":
				$dbw->delete( 'interwiki', array( 'iw_prefix' => $prefix ), __METHOD__ );

				if ($dbw->affectedRows() == 0) {
					$wgOut->addWikiText( '<span class="error">' . wfMsg( 'interwiki_delfailed', $prefix ) . '</span>' );
				} else {
					$wgOut->addWikiText( wfMsg( 'interwiki_deleted', $prefix ));
					$wgOut->returnToMain( false, $selfTitle );
					$log = new LogPage( 'interwiki' );
					$log->addEntry( 'iw_delete', $selfTitle, $reason, array( $prefix ) );
				}
				break;
			case "edit":
			case "add":
				$theurl = $wgRequest->getVal('theurl');
				$local = $wgRequest->getCheck('local') ? 1 : 0;
				$trans = $wgRequest->getCheck('trans') ? 1 : 0;
				$data = array( 'iw_prefix' => $prefix, 'iw_url'    => $theurl,
					'iw_local'  => $local, 'iw_trans'  => $trans );

				if( $do == 'add' ){
					$dbw->insert( 'interwiki', $data, __METHOD__, 'IGNORE' );
				} else {
					$dbw->update( 'interwiki', $data, array( 'iw_prefix' => $prefix ), __METHOD__, 'IGNORE' );
				}

				if( $dbw->affectedRows() == 0 ) {
					$wgOut->addWikiText( '<span class="error">' . wfMsg( "interwiki_{$do}failed", $prefix ) . '</span>' );
				} else {
					$wgOut->addWikiText( wfMsg( "interwiki_{$do}ed", $prefix ));
					$wgOut->returnToMain( false, $selfTitle );
					$log = new LogPage( 'interwiki' );
					$log->addEntry( 'iw_'.$do, $selfTitle, $reason, array( $prefix, $theurl, $trans, $local ) );
				}
				break;
			}
			break;
		default:
			$prefixmessage = wfMsgHtml( 'interwiki_prefix' );
			$urlmessage = wfMsgHtml( 'interwiki_url' );
			$localmessage = wfMsgHtml( 'interwiki_local' );
			$transmessage = wfMsgHtml( 'interwiki_trans' );

			$wgOut->addWikiText( wfMsg( 'interwiki_intro', '[http://www.mediawiki.org/wiki/Interwiki_table MediaWiki.org]' ) );

			if ($admin) {
				$skin = $wgUser->getSkin();
				$addtext = wfMsgHtml( 'interwiki_addtext' );
				$addlink = $skin->makeLinkObj( $selfTitle, $addtext, 'action=add' );
				$wgOut->addHTML( '<ul>' . '<li>' . $addlink . '</li>' . '</ul>' );
			}

			$out = "
			<br />
			<table width='100%' border='2' id='interwikitable'>
			<tr id='interwikitable-header'><th>$prefixmessage</th> <th>$urlmessage</th> <th>$localmessage</th> <th>$transmessage</th>";
			if( $admin ) {
				$deletemessage = wfMsgHtml( 'delete' );
				$editmessage = wfMsgHtml( 'edit' );
				$out .= "<th>$editmessage</th>";
			}

			$out .= "</tr>\n";

			$dbr = wfGetDB( DB_SLAVE );
			$res = $dbr->select( 'interwiki', '*' );
			$numrows = $dbr->numRows( $res );
			if ($numrows == 0) {
				$errormessage = wfMsgHtml('interwiki_error');
				$out .= "<br /><div class=\"error\">$errormessage</div><br />";
			}
			while( $s = $dbr->fetchObject( $res ) ) {
				$prefix = htmlspecialchars( $s->iw_prefix );
				$url = htmlspecialchars( $s->iw_url );
				$trans = htmlspecialchars( $s->iw_trans );
				$local = htmlspecialchars( $s->iw_local );
				$out .= "<tr id='interwikitable-row'>
					<td id='interwikitable-prefix'>$prefix</td>
					<td id='interwikitable-url'>$url</td>
					<td id='interwikitable-local'>$local</td>
					<td id='interwikitable-trans'>$trans</td>";
				if( $admin ) {
					$out .= '<td id="interwikitable-modify">';
					$out .= $skin->makeLinkObj( $selfTitle, $editmessage,
						'action=edit&prefix=' . urlencode( $s->iw_prefix ) );
					$out .= ', ';
					$out .= $skin->makeLinkObj( $selfTitle, $deletemessage,
						'action=delete&prefix=' . urlencode( $s->iw_prefix ) );
					$out .= '</td>';
				}

				$out .= "\n</tr>\n";
			}
			$dbr->freeResult( $res );
			$out .= "</table><br />";
			$wgOut->addHTML($out);
		}
	}
}


Index: SpecialInterwiki.i18n.php
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki-SpecialInterwiki/devel/SpecialInterwiki.i18n.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SpecialInterwiki.i18n.php	10 Jun 2008 13:25:29 -0000	1.1
+++ SpecialInterwiki.i18n.php	12 Sep 2008 23:28:18 -0000	1.2
@@ -1,5 +1,9 @@
 <?php
-/*
+/**
+ * Internationalisation file for extension Interwiki.
+ *
+ * @addtogroup Extensions
+ *
  * 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
@@ -12,432 +16,1646 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
  */
 
-$wgSpecialInterwikiMessages = array();
+$messages = array();
 
-$wgSpecialInterwikiMessages['en'] = array(
+$messages['en'] = array(
 	# general messages
-	'interwiki' => 'View and edit interwiki data',
-	'interwiki_prefix' => 'Prefix',
-	'interwiki_reasonfield' => 'Reason',
-	'interwiki_intro' => 'See $1 for more information about the interwiki table. There is a [[Special:Log/interwiki|log of changes]] to the interwiki table.',
-	'interwiki_url' => 'URL', # only translate this message if you have to change it
-	'interwiki_local' => 'Local', # only translate this message if you have to change it
-	'interwiki_trans' => 'Trans', # only translate this message if you have to change it
-	'interwiki_error' => 'ERROR: The interwiki table is empty, or something else went wrong.',
+	'interwiki'                => 'View and edit interwiki data',
+	'interwiki-title-norights' => 'View interwiki data',
+	'interwiki-desc'           => 'Adds a [[Special:Interwiki|special page]] to view and edit the interwiki table',
+	'interwiki_prefix'         => 'Prefix',
+	'interwiki_reasonfield'    => 'Reason',
+	'interwiki_intro'          => 'See $1 for more information about the interwiki table.
+There is a [[Special:Log/interwiki|log of changes]] to the interwiki table.',
+	'interwiki_url'            => 'URL', # only translate this message if you have to change it
+	'interwiki_local'          => 'Local', # only translate this message if you have to change it
+	'interwiki_trans'          => 'Trans', # only translate this message if you have to change it
+	'interwiki_error'          => 'Error: The interwiki table is empty, or something else went wrong.',
+
 	# deleting a prefix
-	'interwiki_delquestion' => 'Deleting "$1"',
-	'interwiki_deleting' => 'You are deleting prefix "$1".',
-	'interwiki_deleted' =>  'Prefix "$1" was successfully removed from the interwiki table.',
-	'interwiki_delfailed' => 'Prefix "$1" could not be removed from the interwiki table.',
+	'interwiki_delquestion'    => 'Deleting "$1"',
+	'interwiki_deleting'       => 'You are deleting prefix "$1".',
+	'interwiki_deleted'        => 'Prefix "$1" was successfully removed from the interwiki table.',
+	'interwiki_delfailed'      => 'Prefix "$1" could not be removed from the interwiki table.',
+
 	# adding a prefix
-	'interwiki_addtext' => 'Add an interwiki prefix',
-	'interwiki_addintro' => 'You are adding a new interwiki prefix. Remember that it cannot contain spaces ( ), colons (:), ampersands (&), or equal signs (=).',
-	'interwiki_addbutton' => 'Add',
-	'interwiki_added' => 'Prefix "$1" was successfully added to the interwiki table.',
-	'interwiki_addfailed' => 'Prefix "$1" could not be added to the interwiki table. Possibly he already exists in the interwiki table.',
-	'interwiki_defaulturl' => 'http://www.example.com/$1', # only translate this message if you have to change it
+	'interwiki_addtext'        => 'Add an interwiki prefix',
+	'interwiki_addintro'       => 'You are adding a new interwiki prefix.
+Remember that it cannot contain spaces ( ), colons (:), ampersands (&), or equal signs (=).',
+	'interwiki_addbutton'      => 'Add',
+	'interwiki_added'          => 'Prefix "$1" was successfully added to the interwiki table.',
+	'interwiki_addfailed'      => 'Prefix "$1" could not be added to the interwiki table.
+Possibly it already exists in the interwiki table.',
+	'interwiki_defaulturl'     => 'http://www.example.com/$1', # only translate this message if you have to change it
+
+	# editing a prefix
+	'interwiki_edittext'       => 'Editing an interwiki prefix',
+	'interwiki_editintro'      => 'You are editing an interwiki prefix.
+Remember that this can break existing links.',
+	'interwiki_edited'         => 'Prefix "$1" was successfully modified in the interwiki table.',
+	'interwiki_editerror'      => 'Prefix "$1" can not be modified in the interwiki table.
+Possibly it does not exist.',
+
 	# interwiki log
-	'interwiki_logpagename' => 'Interwiki table log',
-	'interwiki_log_added' => 'Added "$1" ($2) (trans: $3) (local: $4) to the interwiki table: $5',
-	'interwiki_log_deleted' => 'Removed prefix "$1" from the interwiki table: $2',
-	'interwiki_logpagetext' => 'This is a log of changes to the [[Special:Interwiki|interwiki table]].',
-	'interwiki_defaultreason' => 'no reason given',
-	'interwiki_logentry' => '', # do not translate this message
+	'interwiki_logpagename'    => 'Interwiki table log',
+	'interwiki_log_added'      => 'added prefix "$2" ($3) (trans: $4) (local: $5) to the interwiki table',
+	'interwiki_log_edited'     => 'modified prefix "$2" : ($3) (trans: $4) (local: $5) in the interwiki table',
+	'interwiki_log_deleted'    => 'removed prefix "$2" from the interwiki table',
+	'interwiki_logpagetext'    => 'This is a log of changes to the [[Special:Interwiki|interwiki table]].',
+	'interwiki_defaultreason'  => 'no reason given',
+	'interwiki_logentry'       => '', # do not translate this message
+
+	'right-interwiki'          => 'Edit interwiki data',
+);
+
+/** Message documentation (Message documentation)
+ * @author Jon Harald S??by
+ * @author Meno25
+ * @author SPQRobin
+ */
+$messages['qqq'] = array(
+	'interwiki' => 'Part of the interwiki extension. This message is the title of the special page [[Special:Interwiki]].',
+	'interwiki-title-norights' => 'Part of the interwiki extension. This message is the title of the special page [[Special:Interwiki]] when the user has no right to edit the interwiki data, so can only view them.',
+	'interwiki-desc' => 'Part of the interwiki extension. This message is the description shown on [[Special:Version]].',
+	'interwiki_prefix' => 'Part of the interwiki extension.',
+	'interwiki_reasonfield' => '{{Identical|Reason}}',
+	'interwiki_intro' => 'Part of the interwiki extension.
+Parameter $1 contains the following (a link): [http://www.mediawiki.org/wiki/Interwiki_table MediaWiki.org]',
+	'interwiki_error' => 'Part of the interwiki extension. This error message is shown when the Special:Interwiki page is empty.',
+	'interwiki_delquestion' => 'Part of the interwiki extension.
+Parameter $1 is the interwiki prefix you are deleting.
+
+{{Identical|Deleting $1}}',
+	'interwiki_deleting' => 'Part of the interwiki extension.',
+	'interwiki_deleted' => 'Part of the interwiki extension.',
+	'interwiki_addbutton' => 'Part of the interwiki extension. This message is the text of the button to submit the interwiki prefix you are adding.
+
+{{Identical|Add}}',
+	'interwiki_editerror' => 'Part of the interwiki extension. Error message when modifying a prefix has failed.',
+	'interwiki_logpagename' => 'Part of the interwiki extension. This message is shown as page title on Special:Log/interwiki.',
+	'interwiki_log_added' => 'Part of the interwiki extension. Shows up in "Special:Log/interwiki" when someone has added a prefix. Leave parameters and text between brackets exactly as it is.',
+	'interwiki_log_edited' => 'Part of the interwiki extension. Shows up in "Special:Log/interwiki" when someone has modified a prefix. Leave parameters and text between brackets exactly as it is.',
+	'interwiki_log_deleted' => 'Part of the interwiki extension. Shows up in "Special:Log/interwiki" when someone removed a prefix.',
+	'interwiki_logpagetext' => 'Part of the interwiki extension. Summary shown on Special:Log/interwiki.',
+	'interwiki_defaultreason' => 'Part of the interwiki extension. This message is the default reason in the interwiki log (when adding or deleting a prefix).
+
+{{Identical|No reason given}}',
+	'right-interwiki' => '{{doc-right}}',
+);
+
+/** Niuean (ko e vagahau Niu??)
+ * @author Jose77
+ */
+$messages['niu'] = array(
+	'interwiki_reasonfield' => 'Kakano',
+);
+
+/** Afrikaans (Afrikaans)
+ * @author Arnobarnard
+ */
+$messages['af'] = array(
+	'interwiki' => 'Bekyk en wysig interwiki data',
+	'interwiki-title-norights' => 'Bekyk interwiki data',
+	'interwiki-desc' => "Voeg 'n [[Special:Interwiki|spesiale bladsy]] by om die interwiki tabel te bekyk en wysig",
+	'interwiki_prefix' => 'Voorvoegsel',
+	'interwiki_reasonfield' => 'Rede',
+	'interwiki_delquestion' => 'Besig om "$1" te verwyder',
+	'interwiki_deleting' => 'U is besig om voorvoegsel "$1" te verwyder.',
+	'interwiki_addbutton' => 'Voeg by',
+	'interwiki_logpagename' => 'Interwiki tabel staaf',
+	'interwiki_defaultreason' => 'geen rede gegee',
+);
+
+/** Aragonese (Aragon??s)
+ * @author Juanpabl
+ */
+$messages['an'] = array(
+	'interwiki_reasonfield' => 'Raz??n',
 );
 
 /** Arabic (??????????????)
  * @author Meno25
+ * @author OsamaK
+ */
+$messages['ar'] = array(
+	'interwiki' => '?????? ???????????? ???????????? ????????????????????',
+	'interwiki-title-norights' => '?????? ???????????? ????????????????????',
+	'interwiki-desc' => '???????? [[Special:Interwiki|???????? ????????]] ?????????? ???????????? ???????? ????????????????????',
+	'interwiki_prefix' => '??????????',
+	'interwiki_reasonfield' => '??????',
+	'interwiki_intro' => '???????? $1 ?????????? ???? ?????????????????? ?????? ???????? ????????????????????.
+???????? [[Special:Log/interwiki|?????? ????????????????????]] ?????????? ????????????????????.',
+	'interwiki_local' => '????????',
+	'interwiki_trans' => '????????',
+	'interwiki_error' => '??????: ???????? ???????????????????? ?????????? ???? ?????? ?????? ??????.',
+	'interwiki_delquestion' => '?????? "$1"',
+	'interwiki_deleting' => '?????? ???????? ?????????????? "$1".',
+	'interwiki_deleted' => '?????????????? "$1" ?????? ?????????????? ?????????? ???? ???????? ????????????????????.',
+	'interwiki_delfailed' => '?????????????? "$1" ???? ???????? ?????????????? ???? ???????? ????????????????????.',
+	'interwiki_addtext' => '?????? ?????????? ????????????????',
+	'interwiki_addintro' => '?????? ???????? ?????????? ???????????????? ??????????.
+???????? ???????? ???? ???????? ???? ?????????? ?????? ???????????? ( )?? ???????????? ?????? ?????? (:)?? ?????????? ?? (&)?? ???? ?????????? ?????????? (=).',
+	'interwiki_addbutton' => '??????????',
+	'interwiki_added' => '?????????????? "$1" ?????? ?????????????? ?????????? ?????? ???????? ????????????????????.',
+	'interwiki_addfailed' => '?????????????? "$1" ???? ???????? ?????????????? ?????? ???????? ????????????????????.
+?????? ???????????? ???? ???????????? ???????????? ???? ???????? ????????????????????.',
+	'interwiki_edittext' => '?????????? ?????????? ????????????????',
+	'interwiki_editintro' => '?????? ???????? ?????????? ???????????????? ????????????.
+???????? ???? ?????? ???????? ???? ???????? ?????????????? ??????????????.',
+	'interwiki_edited' => '?????????????? "$1" ???? ?????????????? ?????????? ???? ???????? ????????????????????..',
+	'interwiki_editerror' => '?????????????? "$1" ???? ???????? ?????????????? ???? ???????? ????????????????????.
+???? ?????????????? ???????? ?????? ????????????.',
+	'interwiki_logpagename' => '?????? ???????? ????????????????????',
+	'interwiki_log_added' => '???????? "$2" ($3) (??????: $4) (????????: $5) ?????? ???????? ????????????????????',
+	'interwiki_log_edited' => '?????? ?????????????? "$2" : ($3) (????????: $4) (????????: $5) ???? ???????? ????????????????????',
+	'interwiki_log_deleted' => '???????? ?????????????? "$2" ???? ???????? ????????????????????',
+	'interwiki_logpagetext' => '?????? ?????? ???????????????????? ???? [[Special:Interwiki|???????? ????????????????????]].',
+	'interwiki_defaultreason' => '???? ?????? ????????',
+	'right-interwiki' => '?????????? ???????????? ????????????????????',
+);
+
+/** Egyptian Spoken Arabic (????????)
+ * @author Meno25
  */
-$wgSpecialInterwikiMessages['ar'] = array(
-	'interwiki'               => '?????? ???????????? ???????????? ????????????????????',
-	'interwiki_prefix'        => '??????????',
-	'interwiki_reasonfield'   => '??????',
-	'interwiki_intro'         => '???????? $1 ?????????? ???? ?????????????????? ?????? ???????? ????????????????????. ???????? [[Special:Log/interwiki|?????? ????????????????????]] ?????????? ????????????????????.',
-	'interwiki_local'         => '????????',
-	'interwiki_trans'         => '??????',
-	'interwiki_error'         => '??????: ???????? ???????????????????? ?????????? ???? ?????? ?????? ??????.',
-	'interwiki_delquestion'   => '?????? "$1"',
-	'interwiki_deleting'      => '?????? ???????? ?????????????? "$1".',
-	'interwiki_deleted'       => '?????????????? "$1" ?????? ?????????????? ?????????? ???? ???????? ????????????????????.',
-	'interwiki_delfailed'     => '?????????????? "$1" ???? ???????? ?????????????? ???? ???????? ????????????????????.',
-	'interwiki_addtext'       => '?????? ?????????? ????????????????',
-	'interwiki_addintro'      => '?????? ???????? ?????????? ???????????????? ??????????. ???????? ???????? ???? ???????? ???? ?????????? ?????? ???????????? ( )?? ???????????? ?????? ?????? (:)?? ?????????? ?? (&)?? ???? ?????????? ?????????? (=).',
-	'interwiki_addbutton'     => '??????????',
-	'interwiki_added'         => '?????????????? "$1" ?????? ?????????????? ?????????? ?????? ???????? ????????????????????.',
-	'interwiki_addfailed'     => '?????????????? "$1" ???? ???????? ?????????????? ?????? ???????? ????????????????????. ?????? ???????????? ???? ???????????? ???????????? ???? ???????? ????????????????????.',
-	'interwiki_logpagename'   => '?????? ???????? ????????????????????',
-	'interwiki_log_added'     => '???????? "$1" ($2) (??????: $3) (????????: $4) ?????? ???????? ????????????????????: $5',
-	'interwiki_log_deleted'   => '???????? ?????????????? "$1" ???? ???????? ????????????????????: $2',
-	'interwiki_logpagetext'   => '?????? ?????? ???????????????????? ???? [[Special:Interwiki|???????? ????????????????????]].',
+$messages['arz'] = array(
+	'interwiki' => '?????? ???????????? ???????????? ????????????????????',
+	'interwiki-title-norights' => '?????? ???????????? ????????????????????',
+	'interwiki-desc' => '???????? [[Special:Interwiki|???????? ????????]] ?????????? ???????????? ???????? ????????????????????',
+	'interwiki_prefix' => '??????????',
+	'interwiki_reasonfield' => '??????',
+	'interwiki_intro' => '???????? $1 ?????????? ???? ?????????????????? ?????? ???????? ????????????????????.
+???????? [[Special:Log/interwiki|?????? ????????????????????]] ?????????? ????????????????????.',
+	'interwiki_local' => '????????',
+	'interwiki_trans' => '????????',
+	'interwiki_error' => '??????: ???????? ???????????????????? ?????????? ???? ?????? ?????? ??????.',
+	'interwiki_delquestion' => '?????? "$1"',
+	'interwiki_deleting' => '?????? ???????? ?????????????? "$1".',
+	'interwiki_deleted' => '?????????????? "$1" ?????? ?????????????? ?????????? ???? ???????? ????????????????????.',
+	'interwiki_delfailed' => '?????????????? "$1" ???? ???????? ?????????????? ???? ???????? ????????????????????.',
+	'interwiki_addtext' => '?????? ?????????? ????????????????',
+	'interwiki_addintro' => '?????? ???????? ?????????? ???????????????? ??????????.
+???????? ???????? ???? ???????? ???? ?????????? ?????? ???????????? ( )?? ???????????? ?????? ?????? (:)?? ?????????? ?? (&)?? ???? ?????????? ?????????? (=).',
+	'interwiki_addbutton' => '??????????',
+	'interwiki_added' => '?????????????? "$1" ?????? ?????????????? ?????????? ?????? ???????? ????????????????????.',
+	'interwiki_addfailed' => '?????????????? "$1" ???? ???????? ?????????????? ?????? ???????? ????????????????????.
+?????? ???????????? ???? ???????????? ???????????? ???? ???????? ????????????????????.',
+	'interwiki_edittext' => '?????????? ?????????? ????????????????',
+	'interwiki_editintro' => '?????? ???????? ?????????? ???????????????? ????????????.
+???????? ???? ?????? ???????? ???? ???????? ?????????????? ??????????????.',
+	'interwiki_edited' => '?????????????? "$1" ???? ?????????????? ?????????? ???? ???????? ????????????????????..',
+	'interwiki_editerror' => '?????????????? "$1" ???? ???????? ?????????????? ???? ???????? ????????????????????.
+???? ?????????????? ???????? ?????? ????????????.',
+	'interwiki_logpagename' => '?????? ???????? ????????????????????',
+	'interwiki_log_added' => '???????? "$2" ($3) (??????: $4) (????????: $5) ?????? ???????? ????????????????????',
+	'interwiki_log_edited' => '?????? ?????????????? "$2" : ($3) (????????: $4) (????????: $5) ???? ???????? ????????????????????',
+	'interwiki_log_deleted' => '???????? ?????????????? "$2" ???? ???????? ????????????????????',
+	'interwiki_logpagetext' => '?????? ?????? ???????????????????? ???? [[Special:Interwiki|???????? ????????????????????]].',
 	'interwiki_defaultreason' => '???? ?????? ????????',
+	'right-interwiki' => '?????????? ???????????? ????????????????????',
+);
+
+/** Kotava (Kotava)
+ * @author Wikimistusik
+ */
+$messages['avk'] = array(
+	'interwiki' => "Wira va 'interwiki' orig isu betara",
+	'interwiki-title-norights' => "Wira va 'interwiki' orig",
+	'interwiki-desc' => "Batcoba, ta wira va 'interwiki' origak isu betara, va [[Special:Interwiki|aptafu bu]] loplekur",
+	'interwiki_prefix' => 'Abdueosta',
+	'interwiki_reasonfield' => 'Lazava',
+	'interwiki_intro' => "Ta lo giva icde 'interwiki' origak va $1 wil !
+Batcoba tir [[Special:Log/interwiki|'log' dem betaks]] va 'interwiki' origak.",
+	'interwiki_error' => "ROKLA : 'Interwiki' origak tir vlardaf oke rotaca al sokir.",
+	'interwiki_delquestion' => 'Sulara va "$1"',
+	'interwiki_deleting' => 'Rin va "$1" abdueosta dun sulal.',
+	'interwiki_deleted' => '"$1" abdueosta div \'interwiki\' origak al zo tioltenher.',
+	'interwiki_delfailed' => '"$1" abdueosta div \'interwiki\' origak me zo rotiolter.',
+	'interwiki_addtext' => "Loplekura va 'interwiki' abdueosta",
+	'interwiki_addintro' => "Rin va warzafa 'interwiki' abdueosta dun loplekul.
+Me vulkul da bata va darka ( ) ik briva (:) ik 'ampersand' (&) ik miltastaa (=) me roruldar.",
+	'interwiki_addbutton' => 'Loplekura',
+	'interwiki_added' => '"$1" abdueosta ko \'interwiki\' origak al zo loplekunhur.',
+	'interwiki_addfailed' => '"$1" abdueosta ko \'interwiki\' origak me zo roloplekur.
+Rotir koeon ixam tir.',
+	'interwiki_edittext' => "Betara va 'interwiki' abdueosta",
+	'interwiki_editintro' => "Rin va 'interwiki' abdueosta dun betal.
+Me vulkul da batcoba va kruldesi gluyasiki rotempar !",
+	'interwiki_edited' => '"$1" abdueosta koe \'interwiki\' origak al zo betanhar.',
+	'interwiki_editerror' => '"$1" abdueosta koe \'interwiki\' origak me zo robetar.
+Rotir koeon me krulder.',
+	'interwiki_logpagename' => "'Interwiki' origak 'log'",
+	'interwiki_log_added' => '"$2" abdueosta ($3) (trans: $4) (local: $5) loplekuyuna ko \'interwiki\' origak',
+	'interwiki_log_edited' => '"$2" abdueosta ($3) (trans: $4) (local: $5) betayana koe \'interwiki\' origak',
+	'interwiki_log_deleted' => '"$2" abdueosta plekuyuna div \'interwiki\' origak',
+	'interwiki_logpagetext' => "Batcoba tir 'log' dem betaks va [[Special:Interwiki|'interwiki' origak]].",
+	'interwiki_defaultreason' => 'Meka bazena lazava',
+);
+
+/** Belarusian (Tara??kievica orthography) (???????????????????? (??????????????????????))
+ * @author EugeneZelenko
+ */
+$messages['be-tarask'] = array(
+	'interwiki_reasonfield' => '??????????????',
 );
 
 /** Bulgarian (??????????????????)
  * @author DCLXVI
  */
-$wgSpecialInterwikiMessages['bg'] = array(
-	'interwiki'               => '?????????????? ?? ???????????????????? ???? ??????????????????????????',
-	'interwiki_prefix'        => '????????????????????:',
-	'interwiki_reasonfield'   => '??????????????',
-	'interwiki_intro'         => '?????????? $1 ???? ???????????? ???????????????????? ?????????????? ?????????????????? ?? ??????????????????????. ???????????????????? [[Special:Log/interwiki|?????????????? ???? ??????????????????]] ?? ?????????????????? ?? ??????????????????????.',
-	'interwiki_delquestion'   => '?????????????????? ???? "$1"',
-	'interwiki_addtext'       => '???????????????? ???? ???????? ??????????????????',
-	'interwiki_addintro'      => "''??????????????????:'' ?????????????????????????? ???? ?????????? ???? ???????????????? ?????????????????? ( ), ?????????????????? (:), ?????????????????? (&) ?????? ???????? ???? ?????????????????? (=).",
-	'interwiki_addbutton'     => '????????????????',
-	'interwiki_logpagename'   => '?????????????? ???? ??????????????????????????',
-	'interwiki_logpagetext'   => '???????? ???????????????? ?????????????? ?????????????? ???? ?????????????????? ?? [[Special:Interwiki|?????????????????? ?? ??????????????????????]].',
+$messages['bg'] = array(
+	'interwiki' => '?????????????? ?? ???????????????????? ???? ??????????????????????????',
+	'interwiki-title-norights' => '?????????????? ???? ?????????????? ???? ??????????????????????',
+	'interwiki-desc' => '???????????? [[Special:Interwiki|?????????????????? ????????????????]] ???? ?????????????? ?? ???????????????????? ???? ?????????????????? ?? ??????????????????????',
+	'interwiki_prefix' => '????????????????????:',
+	'interwiki_reasonfield' => '??????????????',
+	'interwiki_intro' => '?????????? $1 ???? ???????????? ???????????????????? ?????????????? ?????????????????? ?? ??????????????????????. ???????????????????? [[Special:Log/interwiki|?????????????? ???? ??????????????????]] ?? ?????????????????? ?? ??????????????????????.',
+	'interwiki_local' => '??????????????',
+	'interwiki_error' => '????????????: ?????????????????? ?? ?????????????????????? ?? ???????????? ?????? ?? ???????????????????? ?????????? ????????????.',
+	'interwiki_delquestion' => '?????????????????? ???? "$1"',
+	'interwiki_deleting' => '?????????????????? ???? ???????????????????????? ???$1???.',
+	'interwiki_deleted' => '???$1??? ???????? ?????????????? ???????????????????? ???? ?????????????????? ?? ??????????????????????.',
+	'interwiki_delfailed' => '???$1??? ???? ???????? ???? ???????? ???????????????????? ???? ?????????????????? ?? ??????????????????????.',
+	'interwiki_addtext' => '???????????????? ???? ???????? ??????????????????',
+	'interwiki_addintro' => "''??????????????????:'' ?????????????????????????? ???? ?????????? ???? ???????????????? ?????????????????? ( ), ?????????????????? (:), ?????????????????? (&) ?????? ???????? ???? ?????????????????? (=).",
+	'interwiki_addbutton' => '????????????????',
+	'interwiki_added' => '???$1??? ???????? ?????????????? ???????????????? ?? ?????????????????? ?? ??????????????????????.',
+	'interwiki_addfailed' => '???$1??? ???? ???????? ???? ???????? ???????????????? ?? ?????????????????? ?? ??????????????????????. ???????????????? ?? ???????? ???? ?? ???????? ???????????????? ??????.',
+	'interwiki_defaulturl' => 'http://www.????????????.com/$1',
+	'interwiki_edittext' => '?????????????????????? ???? ?????????????????? ????????????????????',
+	'interwiki_edited' => '???????????????????????? ???$1??? ???????? ?????????????? ?????????????????? ?? ?????????????????? ?? ??????????????????????.',
+	'interwiki_logpagename' => '?????????????? ???? ??????????????????????????',
+	'interwiki_log_added' => '???????????? ???$2??? ($3) (trans: $4) (??????????????: $5) ?? ?????????????????? ?? ??????????????????????',
+	'interwiki_log_deleted' => '???????????????? ???????????????????????? ???$2??? ???? ?????????????????? ?? ??????????????????????????',
+	'interwiki_logpagetext' => '???????? ???????????????? ?????????????? ?????????????? ???? ?????????????????? ?? [[Special:Interwiki|?????????????????? ?? ??????????????????????]].',
 	'interwiki_defaultreason' => '???? ?? ???????????????? ??????????????',
+	'right-interwiki' => '?????????????????????? ???? ??????????????????????????',
+);
+
+/** Breton (Brezhoneg)
+ * @author Fulup
+ */
+$messages['br'] = array(
+	'interwiki_addbutton' => 'Ouzhpenna??',
+);
+
+/** Welsh (Cymraeg)
+ * @author Lloffiwr
+ */
+$messages['cy'] = array(
+	'interwiki_defaultreason' => 'dim rheswm wedi ei roi',
+);
+
+/** Danish (Dansk)
+ * @author Jon Harald S??by
+ */
+$messages['da'] = array(
+	'interwiki_reasonfield' => 'Begrundelse',
 );
 
 /** German (Deutsch)
  * @author MF-Warburg
  * @author Raimond Spekking
  */
-$wgSpecialInterwikiMessages['de'] = array(
-	'interwiki'               => 'Interwiki-Daten betrachten und bearbeiten',
-	'interwiki_prefix'        => 'Pr??fix',
-	'interwiki_reasonfield'   => 'Grund',
-	'interwiki_intro'         => 'Siehe $1 f??r weitere Informationen ??ber die Interwiki-Tabelle. Das [[Special:Log/interwiki|Logbuch]] zeigt alle ??nderungen an der Interwiki-Tabelle.',
-	'interwiki_local'         => 'Lokal',
-	'interwiki_error'         => 'Fehler: Die Interwiki-Tabelle ist leer.',
-	'interwiki_delquestion'   => 'L??scht ???$1???',
-	'interwiki_deleted'       => '???$1??? wurde erfolgreich aus der Interwiki-Tabelle entfernt.',
-	'interwiki_delfailed'     => '???$1??? konnte nicht aus der Interwiki-Tabelle gel??scht werden.',
-	'interwiki_addtext'       => 'Ein Interwiki-Pr??fix hinzuf??gen',
-	'interwiki_addintro'      => 'Du f??gst ein neues Interwiki-Pr??fix hinzu. Beachte, dass es kein Leerzeichen ( ), Kaufm??nnisches Und (&), Gleichheitszeichen (=) und keinen Doppelpunkt (:) enthalten darf.',
-	'interwiki_addbutton'     => 'Hinzuf??gen',
-	'interwiki_added'         => '???$1??? wurde erfolgreich der Interwiki-Tabelle hinzugef??gt.',
-	'interwiki_addfailed'     => '???$1??? konnte nicht der Interwiki-Tabelle hinzugef??gt werden.',
-	'interwiki_logpagename'   => 'Interwiki-Tabellenlogbuch',
-	'interwiki_log_added'     => 'hat ???$1??? ($2) (trans: $3) (lokal: $4) der Interwiki-Tabelle hinzugef??gt: $5',
-	'interwiki_log_deleted'   => 'hat ???$1??? aus der Interwiki-Tabelle entfernt: $2',
-	'interwiki_logpagetext'   => 'In diesem Logbuch werden ??nderungen an der [[Special:Interwiki|Interwiki-Tabelle]] protokolliert.',
+$messages['de'] = array(
+	'interwiki' => 'Interwiki-Daten betrachten und bearbeiten',
+	'interwiki-desc' => '[[Special:Interwiki|Spezialseite]] zur Pflege der Interwiki-Tabelle',
+	'interwiki_prefix' => 'Pr??fix',
+	'interwiki_reasonfield' => 'Grund',
+	'interwiki_intro' => 'Siehe $1 f??r weitere Informationen ??ber die Interwiki-Tabelle. Das [[Special:Log/interwiki|Logbuch]] zeigt alle ??nderungen an der Interwiki-Tabelle.',
+	'interwiki_local' => 'Lokal',
+	'interwiki_error' => 'Fehler: Die Interwiki-Tabelle ist leer.',
+	'interwiki_delquestion' => 'L??scht ???$1???',
+	'interwiki_deleted' => '???$1??? wurde erfolgreich aus der Interwiki-Tabelle entfernt.',
+	'interwiki_delfailed' => '???$1??? konnte nicht aus der Interwiki-Tabelle gel??scht werden.',
+	'interwiki_addtext' => 'Ein Interwiki-Pr??fix hinzuf??gen',
+	'interwiki_addintro' => 'Du f??gst ein neues Interwiki-Pr??fix hinzu. Beachte, dass es kein Leerzeichen ( ), Kaufm??nnisches Und (&), Gleichheitszeichen (=) und keinen Doppelpunkt (:) enthalten darf.',
+	'interwiki_addbutton' => 'Hinzuf??gen',
+	'interwiki_added' => '???$1??? wurde erfolgreich der Interwiki-Tabelle hinzugef??gt.',
+	'interwiki_addfailed' => '???$1??? konnte nicht der Interwiki-Tabelle hinzugef??gt werden.',
+	'interwiki_logpagename' => 'Interwikitabelle-Logbuch',
+	'interwiki_log_added' => 'hat ???$2??? ($3) (trans: $4) (lokal: $5) der Interwiki-Tabelle hinzugef??gt',
+	'interwiki_log_deleted' => 'hat ???$2??? aus der Interwiki-Tabelle entfernt',
+	'interwiki_logpagetext' => 'In diesem Logbuch werden ??nderungen an der [[Special:Interwiki|Interwiki-Tabelle]] protokolliert.',
 	'interwiki_defaultreason' => 'kein Grund angegeben',
+	'right-interwiki' => 'Interwiki-Tabelle bearbeiten',
 );
 
 /** Greek (????????????????)
  * @author Consta
  */
-$wgSpecialInterwikiMessages['el'] = array(
-	'interwiki_prefix'        => '??????????????',
-	'interwiki_reasonfield'   => '??????????',
+$messages['el'] = array(
+	'interwiki_prefix' => '??????????????',
+	'interwiki_reasonfield' => '??????????',
 	'interwiki_defaultreason' => '?????? ???????????? ??????????',
 );
 
+/** Esperanto (Esperanto)
+ * @author Yekrats
+ */
+$messages['eo'] = array(
+	'interwiki' => 'Rigardu kaj redaktu intervikiajn datenojn',
+	'interwiki-title-norights' => 'Rigardu intervikiajn datenojn',
+	'interwiki-desc' => 'Aldonas [[Special:Interwiki|specialan pa??on]] por rigardi kaj redakti la intervikian tabelon',
+	'interwiki_prefix' => 'Prefikso',
+	'interwiki_reasonfield' => 'Kialo',
+	'interwiki_intro' => 'Vidu $1 por plia informo pri la intervikia tabelo.
+Ekzistas [[Special:Log/interwiki|protokolo pri ??an??oj]] por la intervikia tabelo.',
+	'interwiki_error' => 'ERARO: La intervikia tabelo estas malplena, a?? iel misfunkciis.',
+	'interwiki_delquestion' => 'Forigante "$1"',
+	'interwiki_deleting' => 'Vi forigas prefikson "$1".',
+	'interwiki_deleted' => 'Prefikso "$1" estis sukcese forigita de la intervikia tabelo.',
+	'interwiki_delfailed' => 'Prefikso "$1" ne eblis esti forigita el la intervikia tabelo.',
+	'interwiki_addtext' => 'Aldonu intervikian prefikson',
+	'interwiki_addintro' => 'Vi aldonas novan intervikian prefikson.
+Memoru ke ??i ne povas enhavi spacetojn ( ), kolojn (:), kajsignojn (&), a?? egalsignojn (=).',
+	'interwiki_addbutton' => 'Aldoni',
+	'interwiki_added' => 'Prefikso "$1" estis sukcese aldonita al la intervikia tabelo.',
+	'interwiki_addfailed' => 'Prefikso "$1" ne eblis esti aldonita al la intervikia tabelo.
+Eble ??i jam ekzistas en la intervikia tabelo.',
+	'interwiki_edittext' => 'Redaktante intervikian prefikson',
+	'interwiki_editintro' => 'Vi redaktas intervikian prefikson.
+Notu ke ??i tiu ago povas rompi ekzistantajn ligilojn.',
+	'interwiki_edited' => 'Prefikso "$1" estis sukcese modifita en la intervikian tabelon.',
+	'interwiki_editerror' => 'Prefikso "$1" ne eblis esti modifita en la intervikia tabelo.
+Ver??ajne ??i ne ekzistas.',
+	'interwiki_logpagename' => 'Loglibro pri la intervikia tabelo',
+	'interwiki_log_added' => 'Aldonis prefikson "$2" ($3) (transvikie: $4) (loke: $5) al la intervikia tabelo',
+	'interwiki_log_edited' => 'modifis prefikson "$2" : ($3) (transvikie: $4) (loke: $5) en la intervikia tabelo',
+	'interwiki_log_deleted' => 'Forigita prefikso "$2" de la intervikia tabelo',
+	'interwiki_logpagetext' => 'Jen loglibro de ??an??oj al la [[Special:Interwiki|intervikia tabelo]].',
+	'interwiki_defaultreason' => 'nenia kialo skribata',
+	'right-interwiki' => 'Redakti intervikiajn datenojn',
+);
+
+/** Spanish (Espa??ol)
+ * @author Piolinfax
+ */
+$messages['es'] = array(
+	'interwiki_defaultreason' => 'no se da ninguna raz??n',
+);
+
+/** Finnish (Suomi)
+ * @author Crt
+ * @author Jack Phoenix
+ * @author Nike
+ */
+$messages['fi'] = array(
+	'interwiki' => 'Katso ja muokkaa wikien v??lisi?? linkkej??',
+	'interwiki-title-norights' => 'Selaa interwiki-tietueita',
+	'interwiki-desc' => 'Lis???? [[Special:Interwiki|toimintosivun]], jonka avulla voi katsoa ja muokata interwiki-taulua',
+	'interwiki_prefix' => 'Etuliite',
+	'interwiki_reasonfield' => 'Syy',
+	'interwiki_intro' => 'Lis??tietoja interwiki-taulusta on sivulla $1. On olemassa [[Special:Log/interwiki|loki]] interwiki-tauluun tehdyist?? muutoksista.',
+	'interwiki_error' => 'VIRHE: interwiki-taulu on tyhj?? tai jokin muu meni pieleen.',
+	'interwiki_delquestion' => 'Poistetaan ???$1???',
+	'interwiki_deleting' => 'Olet poistamassa etuliitett?? ???$1???.',
+	'interwiki_deleted' => 'Etuliite ???$1??? poistettiin onnistuneesti interwiki-taulusta.',
+	'interwiki_delfailed' => 'Etuliitteen ???$1??? poistaminen interwiki-taulusta ep??onnistui.',
+	'interwiki_addtext' => 'Lis???? wikienv??linen etuliite',
+	'interwiki_addintro' => 'Olet lis????m??ss?? uutta wikienv??list?? etuliitett??. Se ei voi sis??lt???? v??lily??ntej?? ( ), kaksoispisteit?? (:), et-merkkej?? (&), tai yht??suuruusmerkkej?? (=).',
+	'interwiki_addbutton' => 'Lis????',
+	'interwiki_added' => 'Etuliite ???$1??? lis??ttiin onnistuneesti interwiki-tauluun.',
+	'interwiki_addfailed' => 'Etuliitteen ???$1??? lis????minen interwiki-tauluun ep??onnistui. Kyseinen etuliite saattaa jo olla interwiki-taulussa.',
+	'interwiki_edittext' => 'Muokataan interwiki-etuliitett??',
+	'interwiki_editintro' => 'Muokkaat interwiki-etuliitett??. Muista, ett?? t??m?? voi rikkoa olemassa olevia linkkej??.',
+	'interwiki_edited' => 'Etuliitett?? ???$1??? muokattiin onnistuneesti interwiki-taulukossa.',
+	'interwiki_editerror' => 'Etuliitett?? ???$1??? ei voi muokata interwiki-taulukossa. Sit?? ei mahdollisesti ole olemassa.',
+	'interwiki_logpagename' => 'Loki muutoksista interwiki-tauluun',
+	'interwiki_log_added' => 'Uusi etuliite ???$2??? ($3) (trans: $4) (paikallinen: $5) interwiki-tauluun',
+	'interwiki_log_edited' => '!muokkasi etuliitett?? $2: ($3) (trans: $4) (paikallisuus: $5) interwiki-taulussa',
+	'interwiki_log_deleted' => 'Poisti etuliitteen ???$2??? interwiki-taulusta',
+	'interwiki_logpagetext' => 'T??m?? on loki muutoksista [[Special:Interwiki|interwiki-tauluun]].',
+	'interwiki_defaultreason' => 'ei annettua syyt??',
+);
+
 /** French (Fran??ais)
  * @author Grondin
+ * @author IAlex
+ * @author Louperivois
  * @author Sherbrooke
+ * @author Urhixidur
  */
-$wgSpecialInterwikiMessages['fr'] = array(
-	'interwiki'               => 'Voir et manipuler les donn??es interwiki',
-	'interwiki_prefix'        => 'Pr??fixe',
-	'interwiki_reasonfield'   => 'Motif',
-	'interwiki_intro'         => "Voyez $1 pour obtenir plus d'informations en ce qui concerne la table interwiki. Ceci est le [[Special:Log/interwiki|journal des modifications]] de la table interwiki.",
-	'interwiki_error'         => "Erreur : la table des interwikis est vide ou un processus s'est mal d??roul??.",
-	'interwiki_delquestion'   => 'Suppression "$1"',
-	'interwiki_deleting'      => 'Vous effacez pr??sentement le pr??fixe ?? $1 ??.',
-	'interwiki_deleted'       => '$1 a ??t?? enlev??e avec succ??s de la table interwiki.',
-	'interwiki_delfailed'     => "$1 n'a pas pu ??tre enlev?? de la table interwiki.",
-	'interwiki_addtext'       => 'Ajoute un pr??fixe interwiki',
-	'interwiki_addintro'      => "Vous ??tes en train d'ajouter un pr??fixe interwiki. Rappelez-vous qu'il ne peut pas contenir d'espaces ( ), de double points (:), d'??perluettes (&) ou de signes ??gal (=)",
-	'interwiki_addbutton'     => 'Ajouter',
-	'interwiki_added'         => '$1 a ??t?? ajout?? avec succ??s dans la table interwiki.',
-	'interwiki_addfailed'     => "$1 n'a pas pu ??tre ajout?? ?? la table interwiki.",
-	'interwiki_logpagename'   => 'Journal de la table interwiki',
-	'interwiki_log_added'     => 'Ajout?? ?? $1 ?? ($2) (trans: $3) (local: $4) dans la table interwiki: $5',
-	'interwiki_log_deleted'   => 'Pr??fixe ?? $1 ?? supprim?? de la table interwiki: $2',
-	'interwiki_logpagetext'   => 'Ceci est le journal des changements dans la [[Special:Interwiki|table interwiki]].',
+$messages['fr'] = array(
+	'interwiki' => 'Voir et manipuler les donn??es interwiki',
+	'interwiki-title-norights' => 'Voir les donn??es interwiki',
+	'interwiki-desc' => 'Ajoute une [[Special:Interwiki|page sp??ciale]] pour voir et ??diter la table interwiki',
+	'interwiki_prefix' => 'Pr??fixe',
+	'interwiki_reasonfield' => 'Motif',
+	'interwiki_intro' => "Voyez $1 pour obtenir plus d'informations en ce qui concerne la table interwiki. Ceci est le [[Special:Log/interwiki|journal des modifications]] de la table interwiki.",
+	'interwiki_error' => "Erreur : la table des interwikis est vide ou un processus s'est mal d??roul??.",
+	'interwiki_delquestion' => 'Suppression de ?? $1 ??',
+	'interwiki_deleting' => 'Vous effacez pr??sentement le pr??fixe ?? $1 ??.',
+	'interwiki_deleted' => '?? $1 ?? a ??t?? enlev?? avec succ??s de la table interwiki.',
+	'interwiki_delfailed' => "?? $1 ?? n'a pas pu ??tre enlev?? de la table interwiki.",
+	'interwiki_addtext' => 'Ajouter un pr??fixe interwiki',
+	'interwiki_addintro' => "Vous ??tes en train d'ajouter un pr??fixe interwiki. Rappelez-vous qu'il ne peut pas contenir d'espaces ( ), de deux-points (:), d'esperluettes (&) ou de signes ??gal (=).",
+	'interwiki_addbutton' => 'Ajouter',
+	'interwiki_added' => '?? $1 ?? a ??t?? ajout?? avec succ??s dans la table interwiki.',
+	'interwiki_addfailed' => "?? $1 ?? n'a pas pu ??tre ajout?? ?? la table interwiki.",
+	'interwiki_edittext' => 'Modifier un pr??fixe interwiki',
+	'interwiki_editintro' => 'Vous modifiez un pr??fixe interwiki. Rappelez-vous que cela peut casser des liens existants.',
+	'interwiki_edited' => 'Le pr??fixe ?? $1 ?? a ??t?? modifi?? avec succ??s dans la table interwiki.',
+	'interwiki_editerror' => "Le pr??fixe ?? $1 ?? ne peut pas ??tre modifi??. Il se peut qu'il n'existe pas.",
+	'interwiki_logpagename' => 'Journal de la table interwiki',
+	'interwiki_log_added' => 'a ajout?? ?? $2 ?? ($3) (trans: $4) (local: $5) dans la table interwiki',
+	'interwiki_log_edited' => 'a modifi?? le pr??fixe ?? $2 ?? : ($3) (trans: $4) (local: $5) dans la table interwiki',
+	'interwiki_log_deleted' => 'a supprim?? le pr??fixe ?? $2 ?? de la table interwiki',
+	'interwiki_logpagetext' => 'Ceci est le journal des changements dans la [[Special:Interwiki|table interwiki]].',
 	'interwiki_defaultreason' => 'Aucun motif donn??',
+	'right-interwiki' => 'Modifier les donn??es interwiki',
+);
+
+/** Franco-Proven??al (Arpetan)
+ * @author ChrisPtDe
+ */
+$messages['frp'] = array(
+	'interwiki_defaulturl' => 'http://www.??gzemplo.com/$1',
+);
+
+/** Western Frisian (Frysk)
+ * @author Snakesteuben
+ */
+$messages['fy'] = array(
+	'interwiki_addbutton' => 'Tafoegje',
 );
 
 /** Galician (Galego)
  * @author Alma
+ * @author Toli??o
  * @author Xos??
  */
-$wgSpecialInterwikiMessages['gl'] = array(
-	'interwiki'               => 'Ver e manipular datos interwiki',
-	'interwiki_prefix'        => 'Prefixo',
-	'interwiki_reasonfield'   => 'Raz??n',
-	'interwiki_intro'         => 'Vexa $1 para m??is informaci??n acerca da t??boa interwiki. Hai un [[Special:Log/interwiki|rexistro de cambios]] ?? t??boa interwiki.',
-	'interwiki_error'         => 'ERRO: A t??boa interwiki est?? baleira, ou algo m??is saleu mal.',
-	'interwiki_delquestion'   => 'Eliminando "$1"',
-	'interwiki_deleting'      => 'Vai eliminar o prefixo "$1".',
-	'interwiki_deleted'       => 'Eliminouse sen problemas o prefixo "$1" da t??boa interwiki.',
-	'interwiki_delfailed'     => 'Non se puido eliminar o prefixo "$1" da t??boa interwiki.',
-	'interwiki_addtext'       => 'Engadir un prefixo interwiki',
-	'interwiki_addintro'      => 'Vostede est?? engadindo un novo prefixo interwiki. Recorde que non pode conter espazos ( ), dous puntos (:), o s??mbolo de uni??n (&), ou signos de igual (=).',
-	'interwiki_addbutton'     => 'Engadir',
-	'interwiki_added'         => 'Engadiuse sen problemas o prefixo "$1" ?? t??boa interwiki.',
-	'interwiki_addfailed'     => 'Non se puido engadir o prefixo "$1" ?? t??boa interwiki. Posibelmente xa existe na t??boa interwiki.',
-	'interwiki_logpagename'   => 'Rexistro de t??boas interwiki',
-	'interwiki_log_added'     => 'Engadir "$1" ($2) (trans: $3) (local: $4) ?? t??boa interwiki: $5',
-	'interwiki_log_deleted'   => 'Eliminouse o prefixo "$1" da t??boa interwiki: $2',
-	'interwiki_logpagetext'   => 'Este ?? un rexistro dos cambios a [[Special:Interwiki|t??boa interwiki]].',
-	'interwiki_defaultreason' => 'ningunha raz??n foi dada',
+$messages['gl'] = array(
+	'interwiki' => 'Ver e manipular datos interwiki',
+	'interwiki-title-norights' => 'Ver os datos do interwiki',
+	'interwiki-desc' => 'Engade unha [[Special:Interwiki|p??xina especial]] para ver e editar a t??boa interwiki',
+	'interwiki_prefix' => 'Prefixo',
+	'interwiki_reasonfield' => 'Raz??n',
+	'interwiki_intro' => 'Vexa $1 para m??is informaci??n acerca da t??boa interwiki. Hai un [[Special:Log/interwiki|rexistro de cambios]] ?? t??boa interwiki.',
+	'interwiki_error' => 'ERRO: A t??boa interwiki est?? baleira, ou algo m??is sa??u mal.',
+	'interwiki_delquestion' => 'Eliminando "$1"',
+	'interwiki_deleting' => 'Vai eliminar o prefixo "$1".',
+	'interwiki_deleted' => 'Eliminouse sen problemas o prefixo "$1" da t??boa interwiki.',
+	'interwiki_delfailed' => 'Non se puido eliminar o prefixo "$1" da t??boa interwiki.',
+	'interwiki_addtext' => 'Engadir un prefixo interwiki',
+	'interwiki_addintro' => 'Vostede est?? engadindo un novo prefixo interwiki. Recorde que non pode conter espazos ( ), dous puntos (:), o s??mbolo de uni??n (&), ou signos de igual (=).',
+	'interwiki_addbutton' => 'Engadir',
+	'interwiki_added' => 'Engadiuse sen problemas o prefixo "$1" ?? t??boa interwiki.',
+	'interwiki_addfailed' => 'Non se puido engadir o prefixo "$1" ?? t??boa interwiki. Posibelmente xa existe na t??boa interwiki.',
+	'interwiki_edittext' => 'Editando un prefixo interwiki',
+	'interwiki_editintro' => 'Est?? editando un prefixo interwiki. Lembre que isto pode quebrar ligaz??ns existentes.',
+	'interwiki_edited' => 'O prefixo "$1" foi modificado con ??xito na t??boa do interwiki.',
+	'interwiki_editerror' => 'O prefixo "$1" non pode ser modificado na t??boa do interwiki. Posiblemente non existe.',
+	'interwiki_logpagename' => 'Rexistro de t??boas interwiki',
+	'interwiki_log_added' => 'Engadir "$2" ($3) (trans: $4) (local: $5) ?? t??boa interwiki',
+	'interwiki_log_edited' => 'modificou o prefixo "$2": ($3) (trans: $4) (local: $5) na t??boa do interwiki',
+	'interwiki_log_deleted' => 'Eliminouse o prefixo "$2" da t??boa interwiki',
+	'interwiki_logpagetext' => 'Este ?? un rexistro dos cambios a [[Special:Interwiki|t??boa interwiki]].',
+	'interwiki_defaultreason' => 'non foi dada ningunha raz??n',
+	'right-interwiki' => 'Editar os datos do interwiki',
+);
+
+/** Gothic (????????????????????????)
+ * @author Jocke Pirat
+ */
+$messages['got'] = array(
+	'interwiki_reasonfield' => 'Fa??rina',
 );
 
 /** Gujarati (?????????????????????) */
-$wgSpecialInterwikiMessages['gu'] = array(
+$messages['gu'] = array(
 	'interwiki_reasonfield' => '????????????',
 );
 
+/** Manx (Gaelg)
+ * @author MacTire02
+ */
+$messages['gv'] = array(
+	'interwiki_reasonfield' => 'Fa',
+);
+
 /** Hawaiian (Hawai`i)
- * @author SPQRobin
+ * @author Singularity
  */
-$wgSpecialInterwikiMessages['haw'] = array(
-	'interwiki_reasonfield'   => 'Ke kumu',
+$messages['haw'] = array(
+	'interwiki_reasonfield' => 'Kumu',
+	'interwiki_addbutton' => 'Ho???ohui',
 	'interwiki_defaultreason' => '???a???ohe kumu',
 );
 
-$wgSpecialInterwikiMessages['hr'] = array(
-	'interwiki'             => 'Vidi i uredi me??uwiki podatke',
-	'interwiki_prefix'      => 'Prefiks',
-	'interwiki_local'       => 'Lokalno',
-	'interwiki_trans'       => 'Me??uwiki',
+/** Hebrew (??????????)
+ * @author Agbad
+ * @author Rotemliss
+ * @author ?????????? ??.
+ */
+$messages['he'] = array(
+	'interwiki' => '???????? ???????????? ???????? ??????????????????',
+	'interwiki-title-norights' => '???????? ???????? ??????????????????',
+	'interwiki-desc' => '?????????? [[Special:Interwiki|???? ??????????]] ?????????? ?????????????? ???????? ??????????????????',
+	'interwiki_prefix' => '????????????',
+	'interwiki_reasonfield' => '????????',
+	'interwiki_intro' => '?????? $1 ?????????? ???????? ?????????? ???????? ??????????????????.
+???????? [[Special:Log/interwiki|???????? ??????????????]] ?????????? ??????????????????.',
+	'interwiki_error' => '??????????: ???????? ?????????????????? ????????, ???? ?????? ?????????? ????????.',
+	'interwiki_addtext' => '?????????? ???????????? ????????????????',
+	'interwiki_addbutton' => '??????????',
+	'interwiki_added' => '??????????????"$1" ?????????? ???????????? ?????????? ??????????????????.',
+	'interwiki_editintro' => '???????? ???????????? ???????????? ????????????????.
+???????? ???????????? ???? ?????????? ?????????? ?????????????? ????????????.',
+	'interwiki_logpagename' => '???????? ???????? ??????????????????',
+	'interwiki_log_deleted' => '???????? ???? ?????????????? "$2" ?????????? ??????????????????',
+	'interwiki_logpagetext' => '?????? ???????? ???????????????? ???????????? ??[[Special:Interwiki|???????? ??????????????????]].',
+	'interwiki_defaultreason' => '???? ?????????? ????????',
+	'right-interwiki' => '?????????? ???????? ??????????????????',
+);
+
+/** Hindi (??????????????????)
+ * @author Kaustubh
+ */
+$messages['hi'] = array(
+	'interwiki' => '???????????????????????? ???????????? ??????????????? ????????? ???????????????',
+	'interwiki-title-norights' => '???????????????????????? ???????????? ???????????????',
+	'interwiki-desc' => '???????????????????????? ?????????????????? ????????????????????? ???????????? ?????? ??????????????? ?????? ???????????? ?????? [[Special:Interwiki|??????????????? ???????????????]]',
+	'interwiki_prefix' => '????????????',
+	'interwiki_reasonfield' => '????????????',
+	'interwiki_intro' => '???????????????????????? ?????????????????? ?????? ??????????????? ????????? ???????????? ???????????????????????? ?????? ???????????? $1 ?????????????????? ???????????? ???????????????????????? ?????????????????? ????????? ????????? [[Special:Log/interwiki|????????????????????? ?????? ????????????]] ????????????',
+	'interwiki_error' => '????????????: ???????????????????????? ?????????????????? ???????????? ?????????, ?????? ?????? ????????? ????????? ????????????',
+	'interwiki_delquestion' => '$1 ?????? ????????? ???????????? ?????????',
+	'interwiki_deleting' => '?????? "$1" ???????????? ????????? ???????????? ????????????',
+	'interwiki_deleted' => '"$1" ???????????? ???????????????????????? ???????????????????????? ????????? ???????????? ????????? ????????????',
+	'interwiki_delfailed' => '"$1" ???????????? ???????????????????????? ???????????????????????? ????????? ???????????? ?????? ???????????? ????????????',
+	'interwiki_addtext' => '?????? ???????????????????????? ???????????? ?????????',
+	'interwiki_addintro' => '?????? ?????? ????????? ???????????????????????? ???????????? ????????? ???????????? ???????????? ??????????????? ??????????????? ???????????? ?????? ??????????????? ??????????????? ( ), ?????????????????? (:), ?????? (&), ?????? ??????????????? ?????? ??????????????? (=) ???????????? ?????? ??????????????? ????????????',
+	'interwiki_addbutton' => '??????????????????',
+	'interwiki_added' => '$1" ???????????? ???????????????????????? ?????????????????? ????????? ??????????????? ????????? ????????????',
+	'interwiki_addfailed' => '"$1" ???????????? ???????????????????????? ?????????????????? ????????? ????????? ???????????? ??????????????????
+???????????? ?????? ???????????? ?????? ????????????????????????????????? ????????????',
+	'interwiki_edittext' => '?????? ???????????????????????? ???????????? ????????? ???????????? ?????????',
+	'interwiki_editintro' => '?????? ?????? ???????????????????????? ???????????? ????????? ???????????? ???????????? ??????????????? ???????????? ?????? ???????????? ?????? ????????? ????????????????????? ?????? ????????? ???????????? ????????????',
+	'interwiki_edited' => '"$1" ???????????? ???????????????????????? ?????????????????? ????????? ???????????? ????????????',
+	'interwiki_editerror' => '"$1" ???????????? ???????????????????????? ?????????????????? ????????? ????????? ???????????? ?????????????????? ???????????? ?????? ????????????????????????????????? ???????????? ????????????',
+	'interwiki_logpagename' => '???????????????????????? ?????????????????? ????????????',
+	'interwiki_log_added' => '???????????????????????? ??????????????????????????? ???????????? "$2" ($3) (trans: $4) (local: $5) ???????????????',
+	'interwiki_log_edited' => '???????????????????????? ??????????????????????????? ???????????? "$2" : ($3) (trans: $4) (local: $5) ?????? ????????????',
+	'interwiki_log_deleted' => '"$2" ???????????? ???????????????????????? ???????????????????????? ???????????????',
+	'interwiki_logpagetext' => '[[Special:Interwiki|???????????????????????? ???????????????????????????]] ????????? ??????????????????????????? ?????? ???????????? ?????????',
+	'interwiki_defaultreason' => '???????????? ???????????? ????????????',
+);
+
+/** Hiligaynon (Ilonggo)
+ * @author Jose77
+ */
+$messages['hil'] = array(
+	'interwiki_reasonfield' => 'Rason',
+);
+
+/** Croatian (Hrvatski)
+ * @author Dalibor Bosits
+ * @author SpeedyGonsales
+ */
+$messages['hr'] = array(
+	'interwiki' => 'Vidi i uredi me??uwiki podatke',
+	'interwiki-title-norights' => 'Gledanje interwiki tablice',
+	'interwiki-desc' => 'Dodaje [[Special:Interwiki|posebnu stranicu]] za gledanje i ure??ivanje interwiki tablice',
+	'interwiki_prefix' => 'Prefiks',
 	'interwiki_reasonfield' => 'Razlog',
+	'interwiki_intro' => 'Pogledajte $1 za vi??e informacija o interwiki tablici.
+Postoji [[Special:Log/interwiki|evidencija promjena]] za interwiki tablicu.',
+	'interwiki_local' => 'Lokalno',
+	'interwiki_trans' => 'Me??uwiki',
+	'interwiki_error' => 'GRE??KA: Interwiki tablica je prazna, ili je ne??to drugo neispravno.',
 	'interwiki_delquestion' => 'Bri??em "$1"',
-	'interwiki_deleting'    => 'Bri??ete prefiks "$1".',
-	'interwiki_addtext'     => 'Dodaj me??uwiki prefiks',
-	'interwiki_addbutton'   => 'Dodaj',
+	'interwiki_deleting' => 'Bri??ete prefiks "$1".',
+	'interwiki_deleted' => 'Prefiks "$1" je uspje??no uklonjen iz interwiki tablice.',
+	'interwiki_delfailed' => 'Prefiks "$1" nije mogao biti uklonjen iz interwiki tablice.',
+	'interwiki_addtext' => 'Dodaj me??uwiki prefiks',
+	'interwiki_addintro' => 'Ure??ujete novi interwiki prefiks. Upamtite, prefiks ne mo??e sadr??avati prazno mjesto ( ), dvoto??ku (:), znak za i (&), ili znakove jednakosti (=).',
+	'interwiki_addbutton' => 'Dodaj',
+	'interwiki_added' => 'Prefiks "$1" je uspje??no dodan u interwiki tablicu.',
+	'interwiki_addfailed' => 'Prefiks "$1" nije mogao biti dodan u interwiki tablicu. Vjerojatno ve?? postoji u interwiki tablici.',
+	'interwiki_edittext' => 'Ure??ivanje interwiki prefiksa',
+	'interwiki_editintro' => 'Ure??ujete interwiki prefiks. Ovo mo??e o??tetiti postoje??e poveznice.',
+	'interwiki_edited' => 'Prefiks "$1" je uspje??no promijenjen u interwiki tablici.',
+	'interwiki_editerror' => 'Prefiks "$1" ne mo??e biti promijenjen u interwiki tablici. Vjerojatno ne postoji.',
+	'interwiki_logpagename' => 'Evidencije interwiki tablice',
+	'interwiki_log_added' => 'dodan prefiks "$2" ($3) (trans: $4) (lokalno: $5) u interwiki tablicu',
+	'interwiki_log_edited' => 'promijenjen prefiks "$2" : ($3) (trans: $4) (lokalno: $5) u interwiki tablici',
+	'interwiki_log_deleted' => 'uklonjen prefiks "$2" iz interwiki tablice',
+	'interwiki_logpagetext' => 'Ovo su evidencije promjena na [[Special:Interwiki|interwiki tablici]].',
+	'interwiki_defaultreason' => 'nema razloga',
 );
 
 /** Upper Sorbian (Hornjoserbsce)
  * @author Michawiki
  */
-$wgSpecialInterwikiMessages['hsb'] = array(
-	'interwiki'               => 'Interwiki-daty wobhlada?? a zm??ni??',
-	'interwiki_prefix'        => 'Prefiks',
-	'interwiki_reasonfield'   => 'P??i??ina',
-	'interwiki_intro'         => 'Hlej $1 za dal??e informacije wo tabeli interwiki. Je [[Special:Log/interwiki|protokol zm??now]] k tabeli interwiki.',
-	'interwiki_local'         => 'Lokalny',
-	'interwiki_error'         => 'ZMYLK: Interwiki-tabela je pr??zdna abo n????to je wopak.',
-	'interwiki_delquestion'   => 'Wu??m??rnja so "$1"',
-	'interwiki_deleting'      => 'Wu??m??rnje?? prefiks "$1".',
-	'interwiki_deleted'       => 'Prefiks "$1" je so wusp????nje z interwiki-tabele wotstroni??.',
-	'interwiki_delfailed'     => 'Prefiks "$1" njeda so z interwiki-tabele wotstroni??.',
-	'interwiki_addtext'       => 'Interwiki-prefiks p??ida??',
-	'interwiki_addintro'      => 'P??idawa?? nowy prefiks interwiki. Wobked??buj, zo njesm?? mjezery ( ), dwudypki (.), et-znamje??ka (&) abo znaki runos??e (=) wobsahowa??.',
-	'interwiki_addbutton'     => 'P??ida??',
-	'interwiki_added'         => 'Prefiks "$1" je so wusp????nje interwiki-tabeli p??ida??.',
-	'interwiki_addfailed'     => 'Prefiks "$1" njeda so interwiki-tabeli p??ida??. Snano eksistuje hi??o w interwiki-tabeli.',
-	'interwiki_logpagename'   => 'Protokol interwiki-tabele',
-	'interwiki_log_added'     => 'Je "$1" ($2) (trans: $3) (lokalny: $4) interwiki-tabeli p??ida??: $5',
-	'interwiki_log_deleted'   => 'je prefiks "$1" z interwiki-tabele wotstroni??: $2',
-	'interwiki_logpagetext'   => 'To je protokol zm??now na [[Special:Interwiki|interwiki-tabeli]].',
+$messages['hsb'] = array(
+	'interwiki' => 'Interwiki-daty wobhlada?? a zm??ni??',
+	'interwiki-desc' => 'P??idawa [[Special:Interwiki|specialnu stronu]] za wobhladowanje a wobd??????owanje interwiki-tabele',
+	'interwiki_prefix' => 'Prefiks',
+	'interwiki_reasonfield' => 'P??i??ina',
+	'interwiki_intro' => 'Hlej $1 za dal??e informacije wo tabeli interwiki. Je [[Special:Log/interwiki|protokol zm??now]] k tabeli interwiki.',
+	'interwiki_local' => 'Lokalny',
+	'interwiki_error' => 'ZMYLK: Interwiki-tabela je pr??zdna abo n????to je wopak.',
+	'interwiki_delquestion' => 'Wu??m??rnja so "$1"',
+	'interwiki_deleting' => 'Wu??m??rnje?? prefiks "$1".',
+	'interwiki_deleted' => 'Prefiks "$1" je so wusp????nje z interwiki-tabele wotstroni??.',
+	'interwiki_delfailed' => 'Prefiks "$1" njeda so z interwiki-tabele wotstroni??.',
+	'interwiki_addtext' => 'Interwiki-prefiks p??ida??',
+	'interwiki_addintro' => 'P??idawa?? nowy prefiks interwiki. Wobked??buj, zo njesm?? mjezery ( ), dwudypki (.), et-znamje??ka (&) abo znaki runos??e (=) wobsahowa??.',
+	'interwiki_addbutton' => 'P??ida??',
+	'interwiki_added' => 'Prefiks "$1" je so wusp????nje interwiki-tabeli p??ida??.',
+	'interwiki_addfailed' => 'Prefiks "$1" njeda so interwiki-tabeli p??ida??. Snano eksistuje hi??o w interwiki-tabeli.',
+	'interwiki_logpagename' => 'Protokol interwiki-tabele',
+	'interwiki_log_added' => 'Je "$2" ($3) (trans: $4) (lokalny: $5) interwiki-tabeli p??ida??',
+	'interwiki_log_deleted' => 'je prefiks "$2" z interwiki-tabele wotstroni??',
+	'interwiki_logpagetext' => 'To je protokol zm??now na [[Special:Interwiki|interwiki-tabeli]].',
 	'interwiki_defaultreason' => '??ana p??i??ina podata',
 );
 
+/** Haitian (Krey??l ayisyen)
+ * @author Jvm
+ * @author Masterches
+ */
+$messages['ht'] = array(
+	'interwiki' => 'W?? epi edite enf??masyon ent??wiki yo',
+	'interwiki-title-norights' => 'W?? enf??masyon interwiki',
+	'interwiki-desc' => 'Ajoute yon [[Special:Interwiki|paj espesial]] pou w?? ak edite tab interwiki-a',
+	'interwiki_prefix' => 'Prefix',
+	'interwiki_reasonfield' => 'Rezon',
+	'interwiki_intro' => 'W?? $1 pou plis enf??masyon sou tab interwiki-a.
+Geyen yon [[Special:Log/interwiki|jounal pou chanjman yo]] nan tab interwiki-a.',
+	'interwiki_error' => 'ER??:  Tab interwiki-a vid, oubien yon l??t bagay mal mache.',
+	'interwiki_delquestion' => 'Delete "$1"',
+	'interwiki_deleting' => 'W???ap delete prefix "$1".',
+	'interwiki_deleted' => 'Prefix "$1" te retire nan tab interwiki-a av??k siks??s.',
+	'interwiki_delfailed' => 'Prefix "$1" pa t\' kapab s??ti nan tab interwiki-a.',
+	'interwiki_addtext' => 'Mete yon prefix interwiki',
+	'interwiki_addintro' => 'W???ap mete yon nouvo prefix interwiki.
+Sonje ke li pa ka genyen ladan li espace ( ), de pwen (:), anmp??sand (&), ou sign egalite (=).',
+	'interwiki_addbutton' => 'Ajoute',
+	'interwiki_added' => 'Prefix "$1" te ajoute sou tab interwiki-a av??k siks??s.',
+	'interwiki_addfailed' => 'Prefix "$1" pa t??? kapab ajoute sou tab interwiki-a.
+Posibleman paske li deja ekziste nan tab interwiki-a.',
+	'interwiki_edittext' => 'Edite yon prefix interwiki',
+	'interwiki_editintro' => 'W???ap edite yon prefix interwiki.
+Sonje ke sa ka kase ch??n ki deja ekziste.',
+	'interwiki_edited' => 'Prefix "$1" te modifye nan tab interwiki-a av??k siks??s.',
+	'interwiki_editerror' => 'Prefix "$1" pa ka modifye nan tab interwiki-a.
+Posibleman li pa ekziste.',
+	'interwiki_logpagename' => 'Jounal tab interwiki-a',
+	'interwiki_log_added' => 'te ajoute prefix "$2" ($3) (trans: $4) (local: $5) nan tab interwiki-a',
+	'interwiki_log_edited' => 'prefix ki te modifye "$2" : ($3) (trans: $4) (local: $5) nan tab interwiki-a',
+	'interwiki_log_deleted' => 'prefix ki te retire "$2" nan tab interwiki-a',
+	'interwiki_logpagetext' => 'Sa se yon jounal chanjman nan [[Special:Interwiki|tab interwiki-a]].',
+	'interwiki_defaultreason' => 'oken rezon pa t??? bay',
+);
+
+/** Hungarian (Magyar)
+ * @author Dani
+ */
+$messages['hu'] = array(
+	'interwiki' => 'Interwiki adatok megtekint??se ??s szerkeszt??se',
+	'interwiki_prefix' => 'El??tag',
+	'interwiki_reasonfield' => 'Ok',
+	'interwiki_intro' => 'L??sd a(z) $1 lapot tov??bbi inform??ci??k??rt az interwiki t??bl??kr??l. Megtekintheted az interwiki t??bl??ban bek??vetkezett [[Special:Log/interwiki|v??ltoz??sok napl??j??t]] is.',
+	'interwiki_error' => 'HIBA: az interwiki-t??bla ??res, vagy valami elromlott.',
+	'interwiki_delquestion' => '???$1??? t??rl??se',
+	'interwiki_deleting' => 'A(z) ???$1??? el??tag t??rl??s??re k??sz??lsz.',
+	'interwiki_deleted' => 'A(z) ???$1??? el??tagot sikeresen elt??vol??tottam az interwiki t??bl??b??l.',
+	'interwiki_delfailed' => 'A(z) ???$1??? el??tagot nem siker??lt elt??vol??tanom az interwiki t??bl??b??l.',
+	'interwiki_addtext' => 'Interwiki el??tag hozz??ad??sa',
+	'interwiki_addintro' => '??j interwiki el??tag hozz??ad??s??ra k??sz??lsz. ??gyelj arra, hogy ne tartalmazzon sz??k??zt ( ), kett??spontot (:), ??s- (&), vagy egyenl?? (=) jeleket.',
+	'interwiki_addbutton' => 'Hozz??ad??s',
+	'interwiki_added' => 'A(z) ???$1??? el??tagot sikeresen hozz??adtam az interwiki t??bl??hoz.',
+	'interwiki_addfailed' => 'A(z) ???$1??? el??tagot nem tudtam hozz??adni az interwiki t??bl??hoz. Val??sz??n??leg m??r l??tezik.',
+	'interwiki_logpagename' => 'Interwiki t??bla-napl??',
+	'interwiki_log_added' => '???$2??? hozz??adva ($3) (ford: $4) (helyi: $5) az interwiki t??bl??hoz',
+	'interwiki_log_deleted' => '???$2??? el??tag elt??vol??tva az interwiki t??bl??b??l',
+	'interwiki_logpagetext' => 'Ez az [[Special:Interwiki|interwiki t??bl??ban]] t??rt??nt v??ltoz??sok napl??ja.',
+	'interwiki_defaultreason' => 'nincs ok megadva',
+);
+
+/** Interlingua (Interlingua)
+ * @author McDutchie
+ */
+$messages['ia'] = array(
+	'interwiki' => 'Vider e modificar datos interwiki',
+	'interwiki-title-norights' => 'Vider datos interwiki',
+	'interwiki-desc' => 'Adde un [[Special:Interwiki|pagina special]] pro vider e modificar le tabella interwiki',
+	'interwiki_prefix' => 'Prefixo',
+	'interwiki_reasonfield' => 'Motivo',
+	'interwiki_intro' => 'Vider $1 pro ulterior informationes super le tabella interwiki.
+Existe un [[Special:Log/interwiki|registro de modificationes]] al tabella interwiki.',
+	'interwiki_error' => 'Error: Le tabella interwiki es vacue, o un altere cosa faceva falta.',
+	'interwiki_delquestion' => 'Deletion de "$1"',
+	'interwiki_deleting' => 'Tu sta super le puncto de deler le prefixo "$1".',
+	'interwiki_deleted' => 'Le prefixo "$1" ha essite removite del tabella interwiki con successo.',
+	'interwiki_delfailed' => 'Le prefixo "$1" non poteva esser removite del tabella interwiki.',
+	'interwiki_addtext' => 'Adder un prefixo interwiki',
+	'interwiki_addintro' => 'Tu sta super le puncto de adder un nove prefixo interwiki.
+Memora que illo non pote continer spatios (&nbsp;), duo punctos (:), signos et (&), o signos equal (=).',
+	'interwiki_addbutton' => 'Adder',
+	'interwiki_added' => 'Le prefixo "$1" ha essite addite al tabella interwiki con successo.',
+	'interwiki_addfailed' => 'Le prefixo "$1" non poteva esser addite al tabella interwiki.
+Es possibile que illo ja existe in le tabella interwiki.',
+	'interwiki_edittext' => 'Modificar un prefixo interwiki',
+	'interwiki_editintro' => 'Tu modifica un prefixo interwiki.
+Memora que isto pote rumper ligamines existente.',
+	'interwiki_edited' => 'Le prefixo "$1" ha essite modificate in le tabella interwiki con successo.',
+	'interwiki_editerror' => 'Le prefixo "$1" non pote esser modificate in le tabella interwiki.
+Es possibile que illo non existe.',
+	'interwiki_logpagename' => 'Registro del tabella interwiki',
+	'interwiki_log_added' => 'addeva le prefixo "$2" ($3) (trans: $4) (local: $5) al tabella interwiki',
+	'interwiki_log_edited' => 'modificava le prefixo "$2" : ($3) (trans: $4) (local: $5) in le tabella interwiki',
+	'interwiki_log_deleted' => 'removeva le prefixo "$2" del tabella interwiki',
+	'interwiki_logpagetext' => 'Isto es un registro de modificationes in le [[Special:Interwiki|tabella interwiki]].',
+	'interwiki_defaultreason' => 'nulle ration date',
+	'right-interwiki' => 'Modificar datos interwiki',
+);
+
+/** Indonesian (Bahasa Indonesia)
+ * @author Rex
+ */
+$messages['id'] = array(
+	'interwiki' => 'Lihat dan sunting data interwiki',
+	'interwiki-title-norights' => 'Lihat data interwiki',
+	'interwiki-desc' => 'Menambahkan sebuah [[Special:Interwiki|halaman istimewa]] untuk menampilkan dan menyunting tabel interwiki',
+	'interwiki_prefix' => 'Prefiks',
+	'interwiki_reasonfield' => 'Alasan',
+	'interwiki_intro' => 'Lihat $1 untuk informasi lebih lanjut mengenai tabel interwiki. Lihat [[Special:Log/interwiki|log perubahan]] tabel interwiki.',
+	'interwiki_error' => 'KESALAHAN: Tabel interwiki kosong, atau terjadi kesalahan lain.',
+	'interwiki_delquestion' => 'Menghapus "$1"',
+	'interwiki_deleting' => 'Anda menghapus prefiks "$1".',
+	'interwiki_deleted' => 'Prefiks "$1" berhasil dihapus dari tabel interwiki.',
+	'interwiki_delfailed' => 'Prefiks "$1" tidak dapat dihapuskan dari tabel interwiki.',
+	'interwiki_addtext' => 'Menambahkan sebuah prefiks interwiki',
+	'interwiki_addintro' => 'Anda akan menambahkan sebuah prefiks interwiki.
+Ingat bahwa prefiks tidak boleh mengandung tanda spasi ( ), titik dua (:), lambang dan (&), atau tanda sama dengan (=).',
+	'interwiki_addbutton' => 'Tambahkan',
+	'interwiki_added' => 'Prefiks "$1" berhasil ditambahkan ke tabel interwiki.',
+	'interwiki_addfailed' => 'Prefiks "$1" tidak dapat ditambahkan ke tabel interwiki. Kemungkinan dikarenakan prefiks ini telah ada di tabel interwiki.',
+	'interwiki_edittext' => 'Menyunting sebuah prefiks interwiki',
+	'interwiki_editintro' => 'Anda sedang menyunting sebuah prefiks interwiki.
+Ingat bahwa tindakan ini dapat mempengaruhi pranala yang telah eksis.',
+	'interwiki_edited' => 'Prefiks "$1" berhasil diubah di tabel interwiki.',
+	'interwiki_editerror' => 'Prefiks "$1" tidak dapat diubah di tabel interwiki.
+Kemungkinan karena prefiks ini tidak ada.',
+	'interwiki_logpagename' => 'Log tabel interwiki',
+	'interwiki_log_added' => 'menambahkan prefiks "$2" ($3) (trans: $4) (lokal: $5) ke tabel interwiki',
+	'interwiki_log_edited' => 'mengubah prefiks "$2" : ($3) (trans: $4) (lokal: $5) di tabel interwiki',
+	'interwiki_log_deleted' => 'menghapus prefiks "$2" dari tabel interwiki',
+	'interwiki_logpagetext' => 'Ini adalah log perubahan [[Special:Interwiki|tabel interwiki]].',
+	'interwiki_defaultreason' => 'tidak ada ringkasan penjelasan',
+	'right-interwiki' => 'Menyunting data interwiki',
+);
+
+/** Icelandic (??slenska)
+ * @author S.??rvarr.S
+ */
+$messages['is'] = array(
+	'interwiki_reasonfield' => '??st????a',
+	'interwiki_defaultreason' => 'engin ??st????a gefin',
+);
+
+/** Italian (Italiano)
+ * @author BrokenArrow
+ * @author Cruccone
+ * @author Darth Kule
+ */
+$messages['it'] = array(
+	'interwiki' => 'Visualizza e modifica i dati interwiki',
+	'interwiki-title-norights' => 'Visualizza i dati interwiki',
+	'interwiki-desc' => 'Aggiunge una [[Special:Interwiki|pagina speciale]] per visualizzare e modificare la tabella degli interwiki',
+	'interwiki_prefix' => 'Prefisso',
+	'interwiki_reasonfield' => 'Motivo',
+	'interwiki_intro' => 'Vedi $1 per maggiori informazioni sulla tabella degli interwiki.
+Esiste un [[Special:Log/interwiki|registro delle modifiche]] alla tabella degli interwiki.',
+	'interwiki_error' => "ERRORE: La tabella degli interwiki ?? vuota, o c'?? qualche altro errore.",
+	'interwiki_delquestion' => 'Cancello "$1"',
+	'interwiki_deleting' => 'Stai cancellando il prefisso "$1"',
+	'interwiki_deleted' => 'Il prefisso "$1" ?? stato cancellato con successo dalla tabella degli interwiki.',
+	'interwiki_delfailed' => 'Rimozione del prefisso "$1" dalla tabella degli interwiki fallita.',
+	'interwiki_addtext' => 'Aggiungi un prefisso interwiki',
+	'interwiki_addintro' => 'Sta per essere aggiunto un nuovo prefisso interwiki.
+Non sono ammessi i caratteri: spazio ( ), due punti (:), e commerciale (&), simbolo di uguale (=).',
+	'interwiki_addbutton' => 'Aggiungi',
+	'interwiki_added' => 'Il prefisso "$1" ?? stato aggiunto alla tabella degli interwiki.',
+	'interwiki_addfailed' => 'Impossibile aggiungere il prefisso "$1" alla tabella degli interwiki.
+Il prefisso potrebbe essere gi?? presente in tabella.',
+	'interwiki_edittext' => 'Modifica di un prefisso interwiki',
+	'interwiki_editintro' => 'Si sta modificando un prefisso interwiki.
+Ci?? pu?? rendere non funzionanti dei collegamenti esistenti.',
+	'interwiki_edited' => 'Il prefisso "$1" ?? stato modificato nella tabella degli interwiki.',
+	'interwiki_editerror' => 'Impossibile modificare il prefisso "$1" nella tabella degli interwiki.
+Il prefisso potrebbe essere inesistente.',
+	'interwiki_logpagename' => 'Registro tabella interwiki',
+	'interwiki_log_added' => 'ha aggiunto il prefisso "$2" ($3) (trans: $4) (locale: $5) alla tabella degli interwiki',
+	'interwiki_log_edited' => 'ha modificato il prefisso "$2" : ($3) (trans: $4) (locale: $5) nella tabella degli interwiki',
+	'interwiki_log_deleted' => 'ha rimosso il prefisso "$2" dalla tabella degli interwiki',
+	'interwiki_logpagetext' => 'Registro dei cambiamenti apportati alla [[Special:Interwiki|tabella degli interwiki]].',
+	'interwiki_defaultreason' => 'nessuna motivazione indicata',
+	'right-interwiki' => 'Modifica i dati interwiki',
+);
+
+/** Japanese (?????????)
+ * @author Mzm5zbC3
+ */
+$messages['ja'] = array(
+	'interwiki' => '?????????????????????????????????????????????',
+	'interwiki-desc' => '????????????????????????????????????????????????????????????????????????[[Special:Interwiki|???????????????]]???',
+	'interwiki_prefix' => '?????????????????????',
+	'interwiki_reasonfield' => '??????',
+	'interwiki_addtext' => '????????????????????????????????????',
+	'interwiki_addbutton' => '??????',
+	'interwiki_edittext' => '??????????????????????????????',
+	'interwiki_logpagename' => '?????????????????????????????????',
+	'interwiki_defaultreason' => '????????????????????????????????????',
+);
+
+/** Javanese (Basa Jawa)
+ * @author Meursault2004
+ */
+$messages['jv'] = array(
+	'interwiki' => 'Ndeleng lan nyunting data interwiki',
+	'interwiki-title-norights' => 'Ndeleng data interwiki',
+	'interwiki-desc' => 'Nambahak?? sawijining [[Special:Interwiki|kaca astam??wa]] kanggo ndeleng lan nyunting tab??l interwiki',
+	'interwiki_prefix' => 'Pr??fiks (sisipan awal)',
+	'interwiki_reasonfield' => 'Alesan',
+	'interwiki_intro' => 'Mangga mirsani $1 kanggo informasi sabanjur?? perkara tab??l interwiki.
+Ana sawijining [[Special:Log/interwiki|log owah-owahan]] perkara tab??l interwiki.',
+	'interwiki_error' => 'KALUPUTAN: Tab??l interwikin?? kosong, utawa ana masalah liya.',
+	'interwiki_delquestion' => 'Mbusak "$1"',
+	'interwiki_deleting' => 'Panjenengan mbusak pr??fiks utawa sisipan awal "$1".',
+	'interwiki_deleted' => 'Pr??fisk "$1" bisa kasil dibusak saka tab??l interwiki.',
+	'interwiki_delfailed' => 'Pr??fiks "$1" ora bisa diilangi saka tab??l interwiki.',
+	'interwiki_addtext' => 'Nambah pr??fiks interwiki',
+	'interwiki_addintro' => 'Panjenengan nambah pr??fiks utawa sisipan awal interwiki anyar.
+??linga y??n iku ora bisa ngandhut spasi ( ), pada pangkat (:), ampersands (&), utawa tandha padha (=).',
+	'interwiki_addbutton' => 'Nambah',
+	'interwiki_added' => 'Pr??fiks utawa sisipan awal "$1" bisa kasil ditambahak?? ing tab??l interwiki.',
+	'interwiki_addfailed' => 'Pr??fiks "$1" ora bisa ditambahak?? ing tab??l interwiki.
+Mbok-menawa iki panc??n wis ana ing tab??l interwiki.',
+	'interwiki_edittext' => 'Nyunting sawijining pr??fiks interwiki',
+	'interwiki_editintro' => 'Panjenengan nyunting pr??fiks interwiki.
+??linga y??n iki ora bisa nugel pranala-pranala sing wis ana.',
+	'interwiki_edited' => 'Pr??fiks "$1" bisa suks??s dimodifikasi ing tab??l interwiki.',
+	'interwiki_editerror' => 'Pr??fiks utawa sisipan awal "$1" ora bisa dimodifikasi ing tab??l interwiki.
+Mbok-menawa iki ora ana.',
+	'interwiki_logpagename' => 'Log tab??l interwiki',
+	'interwiki_log_added' => 'nambahak?? pr??fiks (sisipan awal) "$2" ($3) (trans: $4) (local: $5) ing tab??l interwiki',
+	'interwiki_log_edited' => 'modifikasi pr??fiks (sisipan awal) "$2" : ($3) (trans: $4) (local: $5) ing tab??l interwiki',
+	'interwiki_log_deleted' => 'ngilangi sisipan awal (pr??fiks) "$2" saka tab??l interwiki',
+	'interwiki_logpagetext' => 'Kaca iki log owah-owahan kanggo [[Special:Interwiki|tab??l interwiki]].',
+	'interwiki_defaultreason' => 'ora m??n??hi alesan',
+);
+
+/** Georgian (?????????????????????)
+ * @author Malafaya
+ */
+$messages['ka'] = array(
+	'interwiki_reasonfield' => '??????????????????',
+);
+
+/** Khmer (???????????????????????????)
+ * @author Chhorran
+ * @author Lovekhmer
+ * @author ???????????????????????????
+ */
+$messages['km'] = array(
+	'interwiki' => '???????????????????????????????????????????????????????????????????????????????????????',
+	'interwiki-title-norights' => '????????????????????????????????????????????????????????????',
+	'interwiki-desc' => '??????????????????[[Special:Interwiki|??????????????????????????????]]????????????????????????????????????????????????????????????????????????????????????????????????',
+	'interwiki_prefix' => '?????????????????????',
+	'interwiki_reasonfield' => '?????????????????????',
+	'interwiki_intro' => '?????????$1???????????????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????????[[Special:Log/interwiki|??????????????????????????????????????????????????????????????????]]?????????????????????????????????????????????????????????????????????',
+	'interwiki_error' => '???????????????:????????????????????????????????????????????????????????? ?????????????????????????????????????????????????????????????????????????????????',
+	'interwiki_delquestion' => '??????????????????????????? "$1"',
+	'interwiki_deleting' => '?????????????????????????????????????????????????????????????????? "$1"???',
+	'interwiki_deleted' => '?????????????????????"$1"???????????????????????????????????????????????????????????????????????????????????????????????????????????????',
+	'interwiki_delfailed' => '?????????????????????"$1"???????????????????????????????????????????????????????????????????????????????????????????????????',
+	'interwiki_addtext' => '??????????????????????????????????????????????????????????????????',
+	'interwiki_addintro' => '?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
+
+??????????????????????????????????????????????????????????????? ??????????????????( ) ????????????(:) ????????????????????????(&) ??????????????????????????????(=)??????????????????',
+	'interwiki_addbutton' => '??????????????????',
+	'interwiki_added' => '????????????????????? "$1" ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
+	'interwiki_addfailed' => '????????????????????? "$1" ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
+
+???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
+	'interwiki_defaulturl' => 'http://www.example.com/$1',
+	'interwiki_edittext' => '???????????????????????????????????????????????????????????????????????????',
+	'interwiki_editintro' => '????????????????????????????????????????????????????????????????????????????????????????????????
+
+???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
+	'interwiki_edited' => '?????????????????????"$1"?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
+	'interwiki_editerror' => '????????????????????? "$1" ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
+
+?????????????????????????????????????????????????????????????????????????????????',
+	'interwiki_logpagename' => '?????????????????????????????????????????????????????????????????????',
+	'interwiki_log_added' => '??????????????????????????? "$2" ($3) (trans: $4) (local: $5) ????????????????????????????????????????????????????????? ???',
+	'interwiki_log_edited' => '?????????????????????????????????????????? "$2" : ($3) (trans: $4) (local: $5) ???????????????????????????????????????????????????????????????',
+	'interwiki_log_deleted' => '????????????????????????????????????"$2"?????????????????????????????????????????????????????????',
+	'interwiki_logpagetext' => '????????????????????????????????????????????????????????????????????????????????????????????????[[Special:Interwiki|??????????????????????????????????????????]]???',
+	'interwiki_defaultreason' => '????????????????????????????????????????????????????????????????????????????????????',
+	'right-interwiki' => '?????????????????????????????????????????????????????????????????????',
+);
+
+/** Korean (?????????)
+ * @author ToePeu
+ */
+$messages['ko'] = array(
+	'interwiki' => '???????????? ?????? ??????/?????????',
+	'interwiki-title-norights' => '???????????? ??????',
+	'interwiki-desc' => '???????????? ?????? ????????? ?????? ??? ?????? [[Special:Interwiki|????????????]]??? ??????',
+	'interwiki_prefix' => '?????????',
+	'interwiki_reasonfield' => '??????',
+	'interwiki_intro' => '???????????? ?????? ?????? ??? ?????? ????????? $1??? ???????????????. ?????? [[Special:Log/interwiki|?????? ??????]]??? ????????????.',
+	'interwiki_error' => '??????: ???????????? ?????? ?????? ????????? ?????? ??????????????? ?????????????????????.',
+	'interwiki_delquestion' => '"$1" ?????????',
+	'interwiki_deleting' => '????????? "$1"???(???) ????????????.',
+	'interwiki_deleted' => '????????? "$1"???(???) ???????????????.',
+	'interwiki_delfailed' => '????????? "$1"???(???) ?????? ??? ????????????.',
+	'interwiki_addtext' => '????????? ?????????',
+	'interwiki_addintro' => '??? ???????????? ???????????? ????????????. ??????( ), ??????(:), &??????(&), ??????(=)??? ????????? ??? ????????????.',
+	'interwiki_addbutton' => '?????????',
+	'interwiki_added' => '????????? "$1"???(???) ???????????????.',
+	'interwiki_addfailed' => '????????? "$1"???(???) ?????? ??? ????????????. ?????? ?????? ?????? ??? ????????????.',
+	'interwiki_edittext' => '????????? ?????????',
+	'interwiki_editintro' => '???????????? ???????????? ????????????. ?????? ???????????? ??????????????? ???????????? ??? ????????? ????????? ?????????.',
+	'interwiki_edited' => '????????? "$1"???(???) ???????????????.',
+	'interwiki_editerror' => '????????? "$1"???(???) ?????? ??? ????????????. ????????? ?????? ???????????? ??? ????????????.',
+	'interwiki_logpagename' => '???????????? ?????? ??????',
+	'interwiki_log_added' => '????????? "$2" ($3) (trans: $4) (local: $5) ???(???) ???????????? ????????? ???????????????.',
+	'interwiki_log_edited' => '????????? "$2" ($3) (trans: $4) (local: $5) ???(???) ???????????? ???????????? ???????????????.',
+	'interwiki_log_deleted' => '????????? "$2"???(???) ???????????? ???????????? ???????????????.',
+	'interwiki_logpagetext' => '[[Special:Interwiki|????????????]] ????????? ?????? ???????????????.',
+	'interwiki_defaultreason' => '????????? ???????????? ???????????????.',
+);
+
+/** Ripoarisch (Ripoarisch)
+ * @author Purodha
+ */
+$messages['ksh'] = array(
+	'interwiki' => 'Engerwiki Date beloere un ??nndere',
+	'interwiki-title-norights' => 'Engerwiki Date beloore',
+	'interwiki-desc' => 'Brengk de Sondersigg [[Special:Interwiki]], ??m Engerwiki Date ze beloore un ze ??ndere.',
+	'interwiki_prefix' => 'F??rsaz',
+	'interwiki_reasonfield' => 'Aanlass',
+	'interwiki_intro' => 'Op d?? Sigg $1 fingk mer mieh do dr??ver, wat et met d?? Tab??ll met de Engerwiki Date op sich h??t.
+Et [[Special:Log/interwiki|Logbuch med de Engerwiki Date]] zeichnet all de ??nderunge aan de Engerwiki Date op.',
+	'interwiki_local' => 'Lokal',
+	'interwiki_error' => '<span style="text-transform:uppercase">F??hler:</span> de Tab??ll met de Engerwiki Date is leddisch.',
+	'interwiki_delquestion' => '???$1??? weed fottjeschme??e',
+	'interwiki_deleting' => 'Do wells d?? Engerwiki F??rsaz ???$1??? fott schmii??e.',
+	'interwiki_deleted' => 'D?? F??rsaz ???$1??? es j??z u?? d?? Engerwiki Date erusjeschmesse.',
+	'interwiki_delfailed' => 'D?? F??rsaz ???$1??? konnt nit u?? d?? Engerwiki Date jenomme w????de.',
+	'interwiki_addtext' => 'Ene Engerwiki F??rsaz dobei donn',
+	'interwiki_addintro' => 'Do bes an ennem Engerwiki F??saz am dobei donn.
+Denk draan, et d??rfe kei Zweschr??um ( ), Koufmanns-Un (&amp;), Jlisch-Zeiche (=), un kein Dubbelp??nkscher (:) do dren sin.',
+	'interwiki_addbutton' => 'Dobei donn',
+	'interwiki_added' => 'D?? F??rsaz ???$1??? es j??z bei de Engerwiki Date dobei jekomme.',
+	'interwiki_addfailed' => 'D?? F??rsaz ???$1??? konnt nit bei de Engerwiki Date dobeijedonn w??de.
+Maach sin, dat d?? en de Engerwiki Tab??ll ald dren wor un es.',
+	'interwiki_edittext' => 'Enne Engerwiki F??rsaz ??ndere',
+	'interwiki_editintro' => 'Do bes an ennem Engerwiki F??saz am ??ndere.
+Denk draan, domet k??nnts De Links em Wiki kapott maache, die velleich do drop opboue.',
+	'interwiki_edited' => 'F??z d?? F??rsaz ???$1??? sen de Engerwiki Date j??z jetuusch.',
+	'interwiki_editerror' => 'D?? F??rsaz ???$1??? konnt en de Engerwiki Date nit be??rrbeidt w??de.
+Maach sin, dat et inn nit jitt.',
+	'interwiki_logpagename' => 'Logbooch fun de Engerwiki Tab??ll',
+	'interwiki_log_added' => 'h??t d?? F??rsaz ???$2??? ($3) (Trans: $4) (Lokal: $5) en de Engerwiki Date eren jedonn',
+	'interwiki_log_edited' => 'h??t d?? F??rsaz ???$2??? ($3) (Trans: $4) (Lokal: $5) en de Engerwiki Date ??mjemodelt',
+	'interwiki_log_deleted' => 'h??t d?? F??rsaz ???$2??? es us de Engerwiki Date eru?? jeworfe',
+	'interwiki_logpagetext' => 'Hee is dat Logboch met de ??nderonge aan de [[Special:Interwiki|Engerwiki Date]].',
+	'interwiki_defaultreason' => 'Keine Aanlass aanjejovve',
+);
+
 /** Latin (Latina)
- * @author UV
  * @author SPQRobin
+ * @author UV
  */
-$wgSpecialInterwikiMessages['la'] = array(
-	'interwiki'               => 'Videre et recensere data intervica',
-	'interwiki_prefix'        => 'Praefixum',
-	'interwiki_reasonfield'   => 'Causa',
-	'interwiki_intro'         => 'De tabula intervica, vide etiam $1. Etiam sunt [[Special:Log/interwiki|acta mutationum]] tabulae intervicae.',
-	'interwiki_error'         => 'ERROR: Tabula intervica est vacua, aut aerumna alia occurrit.',
-	'interwiki_delquestion'   => 'Removens "$1"',
-	'interwiki_deleting'      => 'Delens praefixum "$1".',
-	'interwiki_deleted'       => 'Praefixum "$1" prospere remotum est ex tabula intervica.',
-	'interwiki_delfailed'     => 'Praefixum "$1" ex tabula intervica removeri non potuit.',
-	'interwiki_addtext'       => 'Addere praefixum intervicum',
-	'interwiki_addbutton'     => 'Addere',
-	'interwiki_added'         => 'Praefixum "$1" prospere in tabulam intervicam additum est.',
-	'interwiki_addfailed'     => 'Praefixum "$1" in tabulam intervicam addi non potuit. Fortasse iam est in tabula intervica.',
-	'interwiki_logpagename'   => 'Index tabulae intervicae',
-	'interwiki_log_added'     => 'addidit "$1" ($2) (trans: $3) (local: $4) in tabulam intervicam: $5',
-	'interwiki_log_deleted'   => 'removit praefixum "$1" ex tabula intervica: $2',
-	'interwiki_logpagetext'   => 'Hic est index mutationum [[Special:Interwiki|tabulae intervicae]].',
+$messages['la'] = array(
+	'interwiki' => 'Videre et recensere data intervica',
+	'interwiki_prefix' => 'Praefixum',
+	'interwiki_reasonfield' => 'Causa',
+	'interwiki_intro' => 'De tabula intervica, vide etiam $1. Etiam sunt [[Special:Log/interwiki|acta mutationum]] tabulae intervicae.',
+	'interwiki_error' => 'ERROR: Tabula intervica est vacua, aut aerumna alia occurrit.',
+	'interwiki_delquestion' => 'Removens "$1"',
+	'interwiki_deleting' => 'Delens praefixum "$1".',
+	'interwiki_deleted' => 'Praefixum "$1" prospere remotum est ex tabula intervica.',
+	'interwiki_delfailed' => 'Praefixum "$1" ex tabula intervica removeri non potuit.',
+	'interwiki_addtext' => 'Addere praefixum intervicum',
+	'interwiki_addbutton' => 'Addere',
+	'interwiki_added' => 'Praefixum "$1" prospere in tabulam intervicam additum est.',
+	'interwiki_addfailed' => 'Praefixum "$1" in tabulam intervicam addi non potuit. Fortasse iam est in tabula intervica.',
+	'interwiki_logpagename' => 'Index tabulae intervicae',
+	'interwiki_log_added' => 'addidit "$2" ($3) (trans: $4) (local: $5) in tabulam intervicam',
+	'interwiki_log_deleted' => 'removit praefixum "$2" ex tabula intervica',
+	'interwiki_logpagetext' => 'Hic est index mutationum [[Special:Interwiki|tabulae intervicae]].',
 	'interwiki_defaultreason' => 'nulla causa data',
 );
 
 /** Luxembourgish (L??tzebuergesch)
  * @author Robby
  */
-$wgSpecialInterwikiMessages['lb'] = array(
-	'interwiki'               => 'Interwiki-Date kucken a ver??nneren',
-	'interwiki_prefix'        => 'Prefix',
-	'interwiki_reasonfield'   => 'Grond',
-	'interwiki_delquestion'   => 'L??scht "$1"',
+$messages['lb'] = array(
+	'interwiki' => 'Interwiki-Date kucken a ver??nneren',
+	'interwiki-title-norights' => 'Interwiki-Date kucken',
+	'interwiki-desc' => "Setzt eng [[Special:Interwiki|Spezials??it]] derb??i fir d'Interwiki-Tabell ze gesin an z'??nneren",
+	'interwiki_prefix' => 'Prefix',
+	'interwiki_reasonfield' => 'Grond',
+	'interwiki_intro' => "Kuckt $1 fir m??i Informatiounen iwwert d'Interwiki-Tabell.
+Et g??tt eng [[Special:Log/interwiki|L??scht vun den ??nnerungen]] vun d??ser Interwiki-Tabell.",
+	'interwiki_local' => 'Lokal',
+	'interwiki_error' => "Feeler: D'Interwiki-Tabell ass eidel.",
+	'interwiki_delquestion' => 'L??scht "$1"',
+	'interwiki_addtext' => 'En Interwiki-prefix derb??isetzen',
+	'interwiki_addbutton' => 'Derb??isetzen',
+	'interwiki_defaulturl' => 'http://www.beispill.com/$1',
+	'interwiki_edittext' => 'En interwiki Prefix ??nneren',
+	'interwiki_logpagename' => 'L??scht mat der Interwikitabell',
+	'interwiki_logpagetext' => 'D??st ass eng L??scht mat den ??nnerunge vun der [[Special:Interwiki|Interwikitabell]].',
 	'interwiki_defaultreason' => 'kee Grond uginn',
+	'right-interwiki' => 'Interwiki-Daten ??nneren',
+);
+
+/** Malayalam (??????????????????)
+ * @author Shijualex
+ */
+$messages['ml'] = array(
+	'interwiki' => '????????????????????? ?????????????????? ??????????????? ???????????????????????? ???????????????????????????????????? ?????????????????????',
+	'interwiki-title-norights' => '?????????????????????????????????????????? ??????????????? ???????????????',
+	'interwiki_reasonfield' => '???????????????',
+	'interwiki_delquestion' => '"$1" ????????????????????????????????????????????????????????????????????????',
+	'interwiki_addbutton' => '??????????????????????????????',
+	'interwiki_defaultreason' => '????????????????????????????????? ?????????????????????????????????????????????????????????',
+);
+
+/** Marathi (???????????????)
+ * @author Kaustubh
+ */
+$messages['mr'] = array(
+	'interwiki' => '???????????????????????? ???????????? ????????? ??? ??????????????????',
+	'interwiki-title-norights' => '???????????????????????? ???????????? ?????????',
+	'interwiki-desc' => '???????????????????????? ??????????????? ????????????????????????????????? ??? ??????????????????????????????????????? ?????? [[Special:Interwiki|??????????????? ?????????]] ?????????????????????',
+	'interwiki_prefix' => '???????????? (????????????????????????????????????)',
+	'interwiki_reasonfield' => '????????????',
+	'interwiki_intro' => '???????????????????????? ??????????????? ??????????????? ???????????? ?????????????????????????????? $1 ?????????. ????????? ???????????????????????? ?????????????????? ????????????????????? ????????????????????? [[Special:Log/interwiki|????????????????????? ????????????]] ?????????.',
+	'interwiki_error' => '??????????????????: ???????????????????????? ??????????????? ?????????????????? ?????????, ??????????????? ????????? ????????????????????? ????????????????????? ?????????.',
+	'interwiki_delquestion' => '"$1" ???????????? ?????????',
+	'interwiki_deleting' => '?????????????????? "$1" ???????????? ???????????? ????????????.',
+	'interwiki_deleted' => '"$1" ???????????? ???????????????????????? ??????????????????????????? ???????????????????????? ??????????????? ?????????.',
+	'interwiki_delfailed' => '"$1" ???????????? ???????????????????????? ???????????????????????? ??????????????? ??????????????? ????????????.',
+	'interwiki_addtext' => '?????? ???????????????????????? ???????????? ???????????????',
+	'interwiki_addintro' => '?????????????????? ?????? ???????????? ???????????????????????? ???????????? ?????????????????? ????????????. ??????????????? ?????????????????? ???????????? ?????? ??????????????????????????? ??????????????? ( ), ?????????????????? (:), ???????????????????????? (&), ??????????????? ????????????????????? ????????? (=) ????????? ????????? ????????????.',
+	'interwiki_addbutton' => '???????????????',
+	'interwiki_added' => '"$1" ???????????? ???????????????????????? ??????????????? ??????????????? ?????????????????????????????? ??????????????? ?????????.',
+	'interwiki_addfailed' => '"$1" ???????????? ???????????????????????? ??????????????? ??????????????? ??????????????? ?????????????????? ????????????. ?????????????????? ?????? ?????????????????? ?????????????????????????????? ???????????????????????? ?????????????????? ?????????.',
+	'interwiki_edittext' => '?????? ???????????????????????? ???????????? ????????????????????? ?????????',
+	'interwiki_editintro' => '?????????????????? ?????? ???????????????????????? ???????????? ????????????????????? ????????????.
+?????????????????? ???????????? ?????? ?????????????????? ??????????????? ?????????????????? ???????????? ???????????? ???????????????.',
+	'interwiki_edited' => '???????????????????????? ?????????????????????????????? "$1" ???????????? ???????????????????????????????????? ???????????????????????? ??????????????? ?????????.',
+	'interwiki_editerror' => '???????????????????????? ?????????????????????????????? "$1" ???????????? ???????????? ????????? ????????????.
+?????????????????? ?????? ?????????????????????????????? ????????????.',
+	'interwiki_logpagename' => '???????????????????????? ??????????????? ????????????',
+	'interwiki_log_added' => '???????????????????????? ??????????????? ??????????????? "$2" ($3) (trans: $4) (local: $5) ?????????????????????',
+	'interwiki_log_edited' => '???????????????????????? ?????????????????????????????? ???????????? "$2" : ($3) (trans: $4) (local: $5) ???????????????',
+	'interwiki_log_deleted' => '"$2" ???????????? ??????????????????????????????????????? ???????????? ???????????????',
+	'interwiki_logpagetext' => '[[Special:Interwiki|???????????????????????? ??????????????????]] ???????????????????????? ????????????????????? ?????? ???????????? ?????????.',
+	'interwiki_defaultreason' => '???????????? ?????????????????? ????????????',
+	'right-interwiki' => '???????????????????????? ???????????? ????????????',
+);
+
+/** Erzya (????????????)
+ * @author Botuzhaleny-sodamo
+ */
+$messages['myv'] = array(
+	'interwiki_reasonfield' => '????????????',
+	'interwiki_defaultreason' => '???????????? ???????? ????????',
+);
+
+/** Nahuatl (N??huatl)
+ * @author Fluence
+ */
+$messages['nah'] = array(
+	'interwiki_reasonfield' => '??xtlamatiliztli',
+	'interwiki_addbutton' => 'Ticc??til??z',
+	'interwiki_defaultreason' => 'ahmo cah ??xtlamatiliztli',
+);
+
+/** Low German (Plattd????tsch)
+ * @author Slomox
+ */
+$messages['nds'] = array(
+	'interwiki_prefix' => 'Pr??fix',
+	'interwiki_reasonfield' => 'Grund',
+	'interwiki_delquestion' => '???$1??? warrt rutsmeten',
+	'interwiki_addtext' => 'Interwiki-Pr??fix tof??gen',
+	'interwiki_addbutton' => 'Tof??gen',
+	'interwiki_defaultreason' => 'keen Grund angeven',
 );
 
 /** Dutch (Nederlands)
  * @author SPQRobin
+ * @author Siebrand
  */
-$wgSpecialInterwikiMessages['nl'] = array(
-	'interwiki'               => 'Interwikigegevens bekijken en wijzigen',
-	'interwiki_prefix'        => 'Voorvoegsel',
-	'interwiki_reasonfield'   => 'Reden',
-	'interwiki_intro'         => 'Zie $1 voor meer informatie over de interwikitabel. Er is een [[Special:Log/interwiki|logboek van wijzigingen]] aan de interwikitabel.',
-	'interwiki_error'         => 'FOUT: De interwikitabel is leeg, of iets anders ging verkeerd.',
-	'interwiki_delquestion'   => '"$1" aan het verwijderen',
-	'interwiki_deleting'      => 'U bent voorvoegsel "$1" aan het verwijderen.',
-	'interwiki_deleted'       => 'Voorvoegsel "$1" is succesvol verwijderd van de interwikitabel.',
-	'interwiki_delfailed'     => 'Voorvoegsel "$1" kon niet worden verwijderd van de interwikitabel.',
-	'interwiki_addtext'       => 'Een interwikivoorvoegsel toevoegen',
-	'interwiki_addintro'      => 'U bent een nieuw interwikivoorvoegsel aan het toevoegen. Let op dat dit geen spaties ( ), dubbelepunt (:), ampersands (&), of gelijkheidstekens (=) mag bevatten.',
-	'interwiki_addbutton'     => 'Toevoegen',
-	'interwiki_added'         => 'Voorvoegsel "$1" is succesvol toegevoegd aan de interwikitabel.',
-	'interwiki_addfailed'     => 'Voorvoegsel "$1" kon niet worden toegevoegd aan de interwikitabel. Mogelijk bestaat hij al in de interwikitabel.',
-	'interwiki_logpagename'   => 'Logboek interwikitabel',
-	'interwiki_log_added'     => 'Voegde "$1" ($2) (trans: $3) (local: $4) toe aan de interwikitabel: $5',
-	'interwiki_log_deleted'   => 'Verwijderde voorvoegsel "$1" van de interwikitabel: $2',
-	'interwiki_logpagetext'   => 'Dit is een logboek van wijzigingen aan de [[Special:Interwiki|interwikitabel]].',
+$messages['nl'] = array(
+	'interwiki' => 'Interwikigegevens bekijken en wijzigen',
+	'interwiki-title-norights' => 'Interwikigegevens bekijken',
+	'interwiki-desc' => 'Voegt een [[Special:Interwiki|speciale pagina]] toe om de interwikitabel te bekijken en bewerken',
+	'interwiki_prefix' => 'Voorvoegsel',
+	'interwiki_reasonfield' => 'Reden',
+	'interwiki_intro' => 'Zie $1 voor meer informatie over de interwikitabel.
+Er is een [[Special:Log/interwiki|logboek van wijzigingen]] aan de interwikitabel.',
+	'interwiki_local' => 'Lokaal',
+	'interwiki_error' => 'FOUT: De interwikitabel is leeg, of iets anders ging verkeerd.',
+	'interwiki_delquestion' => '"$1" aan het verwijderen',
+	'interwiki_deleting' => 'U bent voorvoegsel "$1" aan het verwijderen.',
+	'interwiki_deleted' => 'Voorvoegsel "$1" is succesvol verwijderd van de interwikitabel.',
+	'interwiki_delfailed' => 'Voorvoegsel "$1" kon niet worden verwijderd van de interwikitabel.',
+	'interwiki_addtext' => 'Een interwikivoorvoegsel toevoegen',
+	'interwiki_addintro' => 'U bent een nieuw interwikivoorvoegsel aan het toevoegen. Let op dat dit geen spaties ( ), dubbelepunt (:), ampersands (&), of gelijkheidstekens (=) mag bevatten.',
+	'interwiki_addbutton' => 'Toevoegen',
+	'interwiki_added' => 'Voorvoegsel "$1" is succesvol toegevoegd aan de interwikitabel.',
+	'interwiki_addfailed' => 'Voorvoegsel "$1" kon niet worden toegevoegd aan de interwikitabel. Mogelijk bestaat hij al in de interwikitabel.',
+	'interwiki_edittext' => 'Een interwikivoorvoegsel bewerken',
+	'interwiki_editintro' => 'U bent een interwikivoorvoegsel aan het bewerken. Let op dat dit bestaande links kan breken.',
+	'interwiki_edited' => 'Voorvoegsel "$1" is succesvol gewijzigd in de interwikitabel.',
+	'interwiki_editerror' => 'Voorvoegsel "$1" kan niet worden gewijzigd in de interwikitabel. Mogelijk bestaat hij niet.',
+	'interwiki_logpagename' => 'Logboek interwikitabel',
+	'interwiki_log_added' => 'Voegde "$2" ($3) (trans: $4) (local: $5) toe aan de interwikitabel',
+	'interwiki_log_edited' => 'wijzigde voorvoegsel "$2": ($3) (trans: $4) (local: $5) in de interwikitabel',
+	'interwiki_log_deleted' => 'Verwijderde voorvoegsel "$2" van de interwikitabel',
+	'interwiki_logpagetext' => 'Dit is een logboek van wijzigingen aan de [[Special:Interwiki|interwikitabel]].',
 	'interwiki_defaultreason' => 'geen reden gegeven',
+	'right-interwiki' => 'Interwikigegevens bewerken',
+);
+
+/** Norwegian Nynorsk (???Norsk (nynorsk)???)
+ * @author Eirik
+ * @author Jon Harald S??by
+ */
+$messages['nn'] = array(
+	'interwiki' => 'Vis og endre interwikidata',
+	'interwiki-title-norights' => 'Vis interwikidata',
+	'interwiki_prefix' => 'Prefiks',
+	'interwiki_reasonfield' => '??rsak',
+	'interwiki_defaultreason' => 'inga grunngjeving',
 );
 
-$wgSpecialInterwikiMessages['no'] = array(
-	'interwiki'             => 'Vis og manipuler interwikidata',
-	'interwiki_prefix'      => 'Prefiks',
-	'interwiki_local'       => 'Lokal',
-	'interwiki_trans'       => 'Trans',#identical but defined
-	'interwiki_reasonfield' => 'Grunn',
+/** Norwegian (bokm??l)??? (???Norsk (bokm??l)???)
+ * @author Jon Harald S??by
+ */
+$messages['no'] = array(
+	'interwiki' => 'Vis og manipuler interwikidata',
+	'interwiki-title-norights' => 'Vis interwikidata',
+	'interwiki-desc' => 'Legger til en [[Special:Interwiki|spesialside]] som gj??r at man kan se og redigere interwiki-tabellen.',
+	'interwiki_prefix' => 'Prefiks',
+	'interwiki_reasonfield' => '??rsak',
+	'interwiki_intro' => 'Se $1 for mer informasjon om interwikitabellen. Det er en [[Special:Log/interwiki|logg]] over endringer i interwikitabellen.',
+	'interwiki_local' => 'Lokal',
+	'interwiki_error' => 'FEIL: Interwikitabellen er tom, eller noe gikk g??rent.',
 	'interwiki_delquestion' => 'Sletter ??$1??',
-	'interwiki_deleting'    => 'Du sletter prefikset ??$1??.',
-	'interwiki_deleted'     => 'Prefikset ??$1?? ble fjernet fra interwikitabellen.',
-	'interwiki_delfailed'   => 'Prefikset ??$1?? kunne ikke fjernes fra interwikitabellen.',
-	'interwiki_addtext'     => 'Legg til et interwikiprefiks.',
-	'interwiki_addbutton'   => 'Legg til',
-	'interwiki_added'       => 'Prefikset ??$1?? ble lagt til i interwikitabellen.',
-	'interwiki_addfailed'   => 'Prefikset ??$1?? kunne ikke legges til i interwikitabellen. Det er kanskje brukt der fra f??r.',
+	'interwiki_deleting' => 'Du sletter prefikset ??$1??.',
+	'interwiki_deleted' => 'Prefikset ??$1?? ble fjernet fra interwikitabellen.',
+	'interwiki_delfailed' => 'Prefikset ??$1?? kunne ikke fjernes fra interwikitabellen.',
+	'interwiki_addtext' => 'Legg til et interwikiprefiks.',
+	'interwiki_addintro' => 'Du legger til et nytt interwikiprefiks. Husk at det ikke kan inneholde mellomrom ( ), kolon (:), &-tegn eller likhetstegn (=).',
+	'interwiki_addbutton' => 'Legg til',
+	'interwiki_added' => 'Prefikset ??$1?? ble lagt til i interwikitabellen.',
+	'interwiki_addfailed' => 'Prefikset ??$1?? kunne ikke legges til i interwikitabellen. Det er kanskje brukt der fra f??r.',
+	'interwiki_edittext' => 'Redigerer et interwikiprefiks',
+	'interwiki_editintro' => 'Du redigerer et interwikiprefiks. Merk at dette kan ??delegge eksisterende lenker.',
+	'interwiki_edited' => 'Prefikset ??$1?? ble endret i interwikitabellen.',
+	'interwiki_editerror' => 'Prefikset ??$1?? kan ikke endres i interwikitabellen. Det finnes muligens ikke.',
 	'interwiki_logpagename' => 'Interwikitabellogg',
-	'interwiki_log_added'   => 'La til ??$1?? ($) (trans: $3) (lokal: $4) til interwikitabellen: $5',
-	'interwiki_log_deleted' => 'Fjernet prefikset ??$1?? fra interwikitabellen: $2',
+	'interwiki_log_added' => 'La til ??$2?? ($3) (trans: $4) (lokal: $5) til interwikitabellen',
+	'interwiki_log_edited' => 'endret prefikset ??$2??: ($3) (trans: $4) (lokal: $5) i interwikitabellen',
+	'interwiki_log_deleted' => 'Fjernet prefikset ??$2?? fra interwikitabellen',
 	'interwiki_logpagetext' => 'Dette er en logg over endringer i [[Special:Interwiki|interwikitabellen]].',
-	'interwiki_error'       => 'FEIL: Interwikitabellen er tom, eller noe gikk g??rent.',
+	'interwiki_defaultreason' => 'ingen grunn gitt',
+	'right-interwiki' => 'Redigere interwikidata',
+);
+
+/** Northern Sotho (Sesotho sa Leboa)
+ * @author Mohau
+ */
+$messages['nso'] = array(
+	'interwiki_reasonfield' => 'Lebaka',
+	'interwiki_delquestion' => 'Phumula "$1"',
+	'interwiki_addbutton' => 'Lokela',
+	'interwiki_defaulturl' => 'http://www.mohlala.com/$1',
+	'interwiki_defaultreason' => 'gago lebaka leo lefilwego',
 );
 
 /** Occitan (Occitan)
  * @author Cedric31
  */
-$wgSpecialInterwikiMessages['oc'] = array(
-	'interwiki'               => 'Veire e editar las donadas interwiki',
-	'interwiki_reasonfield'   => 'Motiu',
-	'interwiki_intro'         => "Vejatz $1 per obt??ner mai d'informacions per ???? que concern??s la taula interwiki. Aqu?? es lo [[Special:Log/interwiki|jornal de las modificacions]] de la taula interwiki.",
-	'interwiki_error'         => "Error : la taula dels interwikis es voida o un process??s s'es mal desenrotlat.",
-	'interwiki_delquestion'   => 'Supression "$1"',
-	'interwiki_deleting'      => 'Escafatz presentament lo prefix ?? $1 ??.',
-	'interwiki_deleted'       => '$1 es estada levada amb succ??s de la taula interwiki.',
-	'interwiki_delfailed'     => '$1 a pas pogut ??sser levat de la taula interwiki.',
-	'interwiki_addtext'       => 'Ajusta un prefix interwiki',
-	'interwiki_addintro'      => "S??tz a ajustar un prefix interwiki. Rapelatz-vos que p??t pas cont??ner d'espacis ( ), de punts dobles (:), d'eperluetas (&) o de signes egal (=)",
-	'interwiki_addbutton'     => 'Ajustar',
-	'interwiki_added'         => '$1 es estat ajustat amb succ??s dins la taula interwiki.',
-	'interwiki_addfailed'     => '$1 a pas pogut ??sser ajustat a la taula interwiki.',
-	'interwiki_logpagename'   => 'Jornal de la taula interwiki',
-	'interwiki_log_added'     => 'Ajustat ?? $1 ?? ($2) (trans: $3) (local: $4) dins la taula interwiki: $5',
-	'interwiki_log_deleted'   => 'Prefix ?? $1 ?? suprimit de la taula interwiki: $2',
-	'interwiki_logpagetext'   => 'Aqu?? es lo jornal dels cambiaments dins la [[Special:Interwiki|taula interwiki]].',
+$messages['oc'] = array(
+	'interwiki' => 'Veire e editar las donadas interwiki',
+	'interwiki-title-norights' => 'Veire las donadas interwiki',
+	'interwiki-desc' => 'Apond??s una [[Special:Interwiki|pagina especiala]] per veire e editar la taula interwiki',
+	'interwiki_prefix' => 'Prefix',
+	'interwiki_reasonfield' => 'Motiu :',
+	'interwiki_intro' => "Vejatz $1 per obt??ner mai d'entresenhas per ???? que concern??s la taula interwiki. Aqu?? es lo [[Special:Log/interwiki|jornal de las modificacions]] de la taula interwiki.",
+	'interwiki_error' => "Error : la taula dels interwikis es voida o un process??s s'es mal desenrotlat.",
+	'interwiki_delquestion' => 'Supression "$1"',
+	'interwiki_deleting' => 'Escafatz presentament lo prefix ?? $1 ??.',
+	'interwiki_deleted' => '$1 es estada levada amb succ??s de la taula interwiki.',
+	'interwiki_delfailed' => '$1 a pas pogut ??sser levat de la taula interwiki.',
+	'interwiki_addtext' => 'Apond??s un prefix interwiki',
+	'interwiki_addintro' => "S??tz a apondre un prefix interwiki. Rapelatz-vos que p??t pas cont??ner d'espacis ( ), de punts dobles (:), d'eperluetas (&) o de signes egal (=)",
+	'interwiki_addbutton' => 'Apondre',
+	'interwiki_added' => '$1 es estat apondut amb succ??s dins la taula interwiki.',
+	'interwiki_addfailed' => '$1 a pas pogut ??sser apondut a la taula interwiki.
+Benl??u i exist??s ja.',
+	'interwiki_edittext' => 'Modificar un prefix interwiki',
+	'interwiki_editintro' => "Modificatz un prefix interwiki. Rapelatz-vos qu'aqu?? p??t rompre de ligams existents.",
+	'interwiki_edited' => 'Lo prefix ?? $1 ?? es estat modificat amb succ??s dins la taula interwiki.',
+	'interwiki_editerror' => "Lo prefix ?? $1 ?? p??t pas ??sser modificat. Es possible qu'exista pas.",
+	'interwiki_logpagename' => 'Jornal de la taula interwiki',
+	'interwiki_log_added' => 'Ajustat ?? $2 ?? ($3) (trans: $4) (local: $5) dins la taula interwiki',
+	'interwiki_log_edited' => 'a modificat lo prefix ?? $2 ?? : ($3) (trans: $4) (local: $5) dins la taula interwiki',
+	'interwiki_log_deleted' => 'Prefix ?? $2 ?? suprimit de la taula interwiki',
+	'interwiki_logpagetext' => 'Aqu?? es lo jornal dels cambiaments dins la [[Special:Interwiki|taula interwiki]].',
 	'interwiki_defaultreason' => 'Cap de motiu balhat',
+	'right-interwiki' => 'Modificar las donadas interwiki',
+);
+
+/** Polish (Polski)
+ * @author McMonster
+ * @author Sp5uhe
+ */
+$messages['pl'] = array(
+	'interwiki' => 'Zobacz i edytuj dane interwiki',
+	'interwiki-title-norights' => 'Zobacz dane interwiki',
+	'interwiki-desc' => 'Dodaje [[Special:Interwiki|stron?? specjaln??]] s??u????c?? do przegl??dania i redakcji tablicy interwiki.',
+	'interwiki_prefix' => 'Przedrostek',
+	'interwiki_reasonfield' => 'Pow??d',
+	'interwiki_intro' => 'Zobacz $1 aby uzyska?? wi??cej informacji na temat tablicy interwiki.
+Histori?? zmian w tablicy interwiki mo??esz zobaczy?? w [[Special:Log/interwiki|rejestrze]].',
+	'interwiki_error' => 'B????D: Tablica interwiki jest pusta lub co?? wyst??pi?? powa??ny problem.',
+	'interwiki_delquestion' => 'Czy usun???? ???$1???',
+	'interwiki_deleting' => 'Usuwasz prefiks ???$1???.',
+	'interwiki_deleted' => 'Prefiks ???$1??? zosta?? z powodzeniem usuni??ty z tablicy interwiki.',
+	'interwiki_delfailed' => 'Prefiks ???$1??? nie mo??e zosta?? usuni??ty z tablicy interwiki.',
+	'interwiki_addtext' => 'Dodaj przedrostek interwiki',
+	'interwiki_addintro' => 'Edytujesz przedrostek interwiki.
+Pami??taj, ??e nie mo??e on zawiera?? znaku odst??pu ( ), dwukropka (:), ampersandu (&) oraz znaku r??wno??ci (=).',
+	'interwiki_addbutton' => 'Dodaj',
+	'interwiki_added' => 'Prefiks ???$1??? zosta?? z powodzeniem dodany do tablicy interwiki.',
+	'interwiki_addfailed' => 'Prefiks ???$1??? nie mo??e zosta?? dodany do tablicy interwiki.
+Prawdopodobnie ten prefiks ju?? jest w tablicy.',
+	'interwiki_edittext' => 'Edycja przedrostka interwiki',
+	'interwiki_editintro' => 'Redagujesz przedrostek interwiki. Pami??taj, ??e mo??e to zerwa?? istniej??ce powi??zania mi??dzy projektami j??zykowymi.',
+	'interwiki_edited' => 'Prefiks ???$1??? zosta?? z powodzeniem poprawiony w tablicy interwiki.',
+	'interwiki_editerror' => 'Prefiks ???$1??? nie mo??e zosta?? poprawiony w tablicy interwiki. Prawdopodobnie nie brak w tablicy.',
+	'interwiki_logpagename' => 'Rejestr tablicy interwiki',
+	'interwiki_log_added' => 'doda?? przedrostek ???$2??? ($3) (trans: $4) (local: $5) do tablicy interwiki',
+	'interwiki_log_edited' => 'zmieni?? przedrostek ???$2??? : ($3) (trans: $4) (local: $5) w tablicy interwiki',
+	'interwiki_log_deleted' => 'usun???? przedrostek ???$2??? z tablicy interwiki',
+	'interwiki_logpagetext' => 'Poni??ej znajduje si?? rejestr zmian wykonanych w [[Special:Interwiki|tablicy interwiki]].',
+	'interwiki_defaultreason' => 'nie podano powodu',
+);
+
+/** Pashto (????????)
+ * @author Ahmed-Najib-Biabani-Ibrahimkhel
+ */
+$messages['ps'] = array(
+	'interwiki_prefix' => '????????????',
+	'interwiki_reasonfield' => '??????',
+	'interwiki_delquestion' => '"$1" ?? ???????????? ???? ?????? ???? ????...',
+	'interwiki_deleting' => '???????? ?? "$1" ???????????? ??????????.',
+	'interwiki_addbutton' => '????????????',
+	'interwiki_defaultreason' => '?????? ?????? ?????? ???? ???? ???????? ??????',
 );
 
-$wgSpecialInterwikiMessages['pt'] = array(
-	'interwiki'             => 'Ver e manipular dados de interwikis',
-	'interwiki_prefix'      => 'Prefixo',
-	'interwiki_local'       => 'Local',#identical but defined
-	'interwiki_trans'       => 'Trans',#identical but defined
+/** Portuguese (Portugu??s)
+ * @author 555
+ * @author Malafaya
+ */
+$messages['pt'] = array(
+	'interwiki' => 'Ver e manipular dados de interwikis',
+	'interwiki-title-norights' => 'Ver dados interwiki',
+	'interwiki-desc' => 'Adiciona uma [[Special:Interwiki|p??gina especial]] para visualizar e editar a tabela de interwikis',
+	'interwiki_prefix' => 'Prefixo',
 	'interwiki_reasonfield' => 'Motivo',
+	'interwiki_intro' => 'Veja $1 para maiores informa????es em rela????o ?? tabela de interwikis. H?? tamb??m um [[Special:Log/interwiki|registo de altera????es]] na tabela de interwikis.',
+	'interwiki_error' => 'ERRO: A tabela de interwikis est?? vazia, ou alguma outra coisa n??o correu bem.',
 	'interwiki_delquestion' => 'A apagar "$1"',
-	'interwiki_deleting'    => 'Est?? a apagar o prefixo "$1".',
-	'interwiki_deleted'     => 'O prefixo "$1" foi removido da tabelas de interwikis com sucesso.',
-	'interwiki_delfailed'   => 'O prefixo "$1" n??o p??de ser removido da tabela de interwikis.',
-	'interwiki_addtext'     => 'Adicionar um prefixo de interwikis',
-	'interwiki_addbutton'   => 'Adicionar',
-	'interwiki_added'       => 'O prefixo "$1" foi adicionado ?? tabela de interwikis com sucesso.',
-	'interwiki_addfailed'   => 'O prefixo "$1" n??o p??de ser adicionado ?? tabela de interwikis. Possivelmente j?? existe nessa tabela.',
+	'interwiki_deleting' => 'Est?? a apagar o prefixo "$1".',
+	'interwiki_deleted' => 'O prefixo "$1" foi removido da tabelas de interwikis com sucesso.',
+	'interwiki_delfailed' => 'O prefixo "$1" n??o p??de ser removido da tabela de interwikis.',
+	'interwiki_addtext' => 'Adicionar um prefixo de interwikis',
+	'interwiki_addintro' => 'Voc?? se encontra prestes a adicionar um novo prefixo de interwiki. Lembre-se de que ele n??o pode conter espa??os ( ), dois-pontos (:), conjun????es (&) ou sinais de igualdade (=).',
+	'interwiki_addbutton' => 'Adicionar',
+	'interwiki_added' => 'O prefixo "$1" foi adicionado ?? tabela de interwikis com sucesso.',
+	'interwiki_addfailed' => 'O prefixo "$1" n??o p??de ser adicionado ?? tabela de interwikis. Possivelmente j?? existe nessa tabela.',
+	'interwiki_edittext' => 'Editando um prefixo interwiki',
+	'interwiki_editintro' => 'Voc?? est?? a editar um prefixo interwiki. Lembre-se de que isto pode quebrar liga????es existentes.',
+	'interwiki_edited' => 'O prefixo "$1" foi modificado na tabela de interwikis com sucesso.',
+	'interwiki_editerror' => 'O prefixo "$1" n??o pode ser modificado na tabela de interwikis. Possivelmente, n??o existe.',
 	'interwiki_logpagename' => 'Registo da tabela de interwikis',
-	'interwiki_log_added'   => 'Adicionado "$1" ($2) (trans: $3) (local: $4) ?? tabela de interwikis: $5',
-	'interwiki_log_deleted' => 'Removido o prefixo "$1" da tabela de interwikis: $2',
-	'interwiki_logpagetext' => 'Este ?? um registo das altera????es ?? [[{{ns:special}}:Interwiki|tabela de interwikis]].',
-	'interwiki_error'       => 'ERRO: A tabela de interwikis est?? vazia, ou alguma outra coisa n??o correu bem.',
+	'interwiki_log_added' => 'adicionado "$2" ($3) (trans: $4) (local: $5) ?? tabela de interwikis',
+	'interwiki_log_edited' => 'modificado o prefixo "$2": ($3) (trans: $4) (local: $5) na tabela de interwikis',
+	'interwiki_log_deleted' => 'removido o prefixo "$2" da tabela de interwikis',
+	'interwiki_logpagetext' => 'Este ?? um registo das altera????es ?? [[Special:Interwiki|tabela de interwikis]].',
+	'interwiki_defaultreason' => 'sem motivo especificado',
+);
+
+/** Romanian (Rom??n??)
+ * @author KlaudiuMihaila
+ */
+$messages['ro'] = array(
+	'interwiki_reasonfield' => 'Motiv',
 );
 
 /** Russian (??????????????)
- * @author Alexander Chemeris
  * @author Illusion
+ * @author ?????????????????? ??????????????
  */
-$wgSpecialInterwikiMessages['ru'] = array(
-	'interwiki'               => '???????????????? ?? ?????????????????? ?????????????????? ??????????????????',
-	'interwiki_prefix'        => '??????????????',
-	'interwiki_reasonfield'   => '??????????????',
-	'interwiki_delquestion'   => '???????????????? "$1"',
-	'interwiki_deleted'       => '?????????????? $1 ?????????????? ????????????.',
-	'interwiki_delfailed'     => '?????????????? $1 ???? ?????????? ???????? ????????????.',
-	'interwiki_addtext'       => '???????????????? ?????????? ?????????????? ??????????????????',
-	'interwiki_addintro'      => '???? ?????????????????????? ???????????????? ?????????? ?????????????? ??????????????????. ??????????????, ?????? ???? ???? ?????????? ?????????????????? ?????????????? ( ), ?????????????????? (:), ???????????????????? (&) ?? ?????????? ?????????????????? (=).',
-	'interwiki_addbutton'     => '????????????????',
-	'interwiki_added'         => '?????????????? $1 ?????????????? ????????????????.',
-	'interwiki_addfailed'     => '?????????????? $1 ???? ?????????? ???????? ????????????????.',
-	'interwiki_logpagename'   => '???????????? ?????????????????? ?????????????? ?????????????????? ??????????????????',
-	'interwiki_log_added'     => '?????????????? "$1" ($2) (trans: $3) (local: $4) ???????????????? ?? ?????????????? ??????????????????: $5',
-	'interwiki_log_deleted'   => '?????????????? "$1" ???????????? ???? ?????????????? ??????????????????: $2',
-	'interwiki_logpagetext'   => '???? ???????? ???????????????? ?????????? ?????????????? ???????????? ???????? ?????????????????? ?????????????? ??????????????????.',
+$messages['ru'] = array(
+	'interwiki' => '???????????????? ?? ?????????????????? ???????????????? ??????????????????',
+	'interwiki-title-norights' => '?????????????????????? ???????????? ???? ??????????????????',
+	'interwiki-desc' => '?????????????????? [[Special:Interwiki|?????????????????? ????????????????]] ?????? ?????????????????? ?? ???????????????????????????? ?????????????? ?????????????????? ??????????????????.',
+	'interwiki_prefix' => '??????????????????',
+	'interwiki_reasonfield' => '??????????????',
+	'interwiki_intro' => '????. $1, ?????????? ???????????????? ?????????? ?????????????????? ???????????????????? ?? ?????????????? ??????????????????. ???????????????????? ??????????  [[Special:Log/interwiki|???????????? ??????????????????]] ?????????????? ??????????????????.',
+	'interwiki_error' => '????????????: ?????????????? ?????????????????? ?????????? ?????? ??????-???? ???????????? ???????????????? ????????????????.',
+	'interwiki_delquestion' => '???????????????? ??$1??',
+	'interwiki_deleting' => '???? ???????????????? ?????????????????? ??$1??.',
+	'interwiki_deleted' => '?????????????????? ??$1?? ?????????????? ?????????????? ???? ?????????????? ??????????????????.',
+	'interwiki_delfailed' => '?????????????????? ??$1?? ???? ?????????? ???????? ?????????????? ???? ?????????????? ??????????????????.',
+	'interwiki_addtext' => '???????????????? ?????????? ??????????????????-??????????????????',
+	'interwiki_addintro' => '???? ?????????????????????? ???????????????? ?????????? ??????????????????-??????????????????. ??????????????, ?????? ?????? ???? ?????????? ?????????????????? ?????????????? ( ), ?????????????????? (:), ???????????????????? (&) ?? ?????????? ?????????????????? (=).',
+	'interwiki_addbutton' => '????????????????',
+	'interwiki_added' => '?????????????????? ??$1?? ?????????????? ?????????????????? ?? ?????????????? ??????????????????.',
+	'interwiki_addfailed' => '?????????????????? ??$1?? ???? ?????????? ???????? ?????????????????? ?? ?????????????? ??????????????????. ????????????????, ?????? ?????? ???????????????????????? ?? ?????????????? ??????????????????.',
+	'interwiki_edittext' => '???????????????????????????? ??????????????????-??????????????????',
+	'interwiki_editintro' => '???? ???????????????????????? ??????????????????-??????????????????. ??????????????, ?????? ?????? ?????????? ?????????????? ???????????????????????? ????????????.',
+	'interwiki_edited' => '?????????????????? ??$1?? ?????????????? ???????????????? ?? ??????????????????-??????????????.',
+	'interwiki_editerror' => '?????????????????? ??$1?? ???? ?????????? ???????? ???????????????? ?? ??????????????????-??????????????. ????????????????, ?????? ???? ????????????????????.',
+	'interwiki_logpagename' => '???????????? ?????????????????? ?????????????? ??????????????????',
+	'interwiki_log_added' => '?????????????????? ??$2?? ($3) (trans: $4) (local: $5) ?????????????????? ?? ?????????????? ??????????????????',
+	'interwiki_log_edited' => '?????????????? ?????????????????? ??$2??: ($3) (??????.: $4) (??????.: $5) ?? ??????????????????-??????????????',
+	'interwiki_log_deleted' => '?????????????????? ??$2?? ?????????????? ???? ?????????????? ??????????????????',
+	'interwiki_logpagetext' => '?????? ???????????? ?????????????????? [[Special:Interwiki|?????????????? ??????????????????]].',
 	'interwiki_defaultreason' => '?????????????? ???? ??????????????',
 );
 
 /** Sassaresu (Sassaresu)
  * @author Felis
  */
-$wgSpecialInterwikiMessages['sdc'] = array(
-	'interwiki'               => 'Vid?? e mud??figg?? li dati interwiki',
-	'interwiki_prefix'        => 'Prefissu',
-	'interwiki_reasonfield'   => 'Rasgioni',
-	'interwiki_delquestion'   => 'Canzillendi "$1"',
-	'interwiki_deleting'      => 'Sei canzillendi lu prefissu "$1".',
-	'interwiki_addtext'       => 'Aggiungi un prefissu interwiki',
-	'interwiki_addbutton'     => 'Aggiungi',
-	'interwiki_logpagename'   => 'Rigisthru di la table interwiki',
+$messages['sdc'] = array(
+	'interwiki' => 'Vid?? e mud??figg?? li dati interwiki',
+	'interwiki_prefix' => 'Prefissu',
+	'interwiki_reasonfield' => 'Rasgioni',
+	'interwiki_delquestion' => 'Canzillendi "$1"',
+	'interwiki_deleting' => 'Sei canzillendi lu prefissu "$1".',
+	'interwiki_addtext' => 'Aggiungi un prefissu interwiki',
+	'interwiki_addbutton' => 'Aggiungi',
+	'interwiki_logpagename' => 'Rigisthru di la table interwiki',
 	'interwiki_defaultreason' => 'nisciuna mutibazioni indicadda',
 );
 
 /** Slovak (Sloven??ina)
  * @author Helix84
  */
-$wgSpecialInterwikiMessages['sk'] = array(
-	'interwiki'               => 'Zobrazi?? a upravova?? ??daje interwiki',
-	'interwiki_prefix'        => 'Predpona',
-	'interwiki_reasonfield'   => 'D??vod',
-	'interwiki_intro'         => 'Viac inform??ci?? o tabu??ke interwiki n??jdete na $1. Existuje [[Special:Log/interwiki|z??znam zmien]] tabu??ky interwiki.',
-	'interwiki_error'         => 'CHYBA: Tabu??ka interwiki je pr??zdna alebo sa pokazilo nie??o in??.',
-	'interwiki_delquestion'   => 'Ma??e sa ???$1???',
-	'interwiki_deleting'      => 'Ma??ete predponu ???$1???.',
-	'interwiki_deleted'       => 'Predpona ???$1??? bola ??spe??ne odstr??nen?? z tabu??ky interwiki.',
-	'interwiki_delfailed'     => 'Predponu ???$1??? nebola mo??n?? odstr??ni?? z tabu??ky interwiki.',
-	'interwiki_addtext'       => 'Prida?? predponu interwiki',
-	'interwiki_addintro'      => 'Prid??vate nov?? predponu interwiki. Pam??tajte, ??e nem????e obsahova?? medzery ??? ???, dvojbodky ???:???, ampersand ???&??? ani znak rovnosti ???=???.',
-	'interwiki_addbutton'     => 'Prida??',
-	'interwiki_added'         => 'Predpona ???$1??? bola ??spe??ne pridan?? do tabu??ky interwiki.',
-	'interwiki_addfailed'     => 'Predponu ???$1??? nebola mo??n?? prida?? do tabu??ky interwiki. Je mo??n??, ??e u?? v tabu??ke interwiki existuje.',
-	'interwiki_logpagename'   => 'Z??znam zmien tabu??ky interwiki',
-	'interwiki_log_added'     => 'Pridan?? ???$1??? ($2) (trans: $3) (local: $4) do tabu??ky interwiki: $5',
-	'interwiki_log_deleted'   => 'Odstr??nen?? ???$1??? z tabu??ky interwiki: $2',
-	'interwiki_logpagetext'   => 'Toto je z??znam zmien [[Special:Interwiki|tabu??ky interwiki]].',
+$messages['sk'] = array(
+	'interwiki' => 'Zobrazi?? a upravova?? ??daje interwiki',
+	'interwiki-title-norights' => 'Zobrazi?? ??daje interwiki',
+	'interwiki-desc' => 'Prid??va [[Special:Interwiki|??peci??lnu str??nku]] na zobrazovanie a upravovanie tabu??ky interwiki',
+	'interwiki_prefix' => 'Predpona',
+	'interwiki_reasonfield' => 'D??vod',
+	'interwiki_intro' => 'Viac inform??ci?? o tabu??ke interwiki n??jdete na $1. Existuje [[Special:Log/interwiki|z??znam zmien]] tabu??ky interwiki.',
+	'interwiki_error' => 'CHYBA: Tabu??ka interwiki je pr??zdna alebo sa pokazilo nie??o in??.',
+	'interwiki_delquestion' => 'Ma??e sa ???$1???',
+	'interwiki_deleting' => 'Ma??ete predponu ???$1???.',
+	'interwiki_deleted' => 'Predpona ???$1??? bola ??spe??ne odstr??nen?? z tabu??ky interwiki.',
+	'interwiki_delfailed' => 'Predponu ???$1??? nebola mo??n?? odstr??ni?? z tabu??ky interwiki.',
+	'interwiki_addtext' => 'Prida?? predponu interwiki',
+	'interwiki_addintro' => 'Prid??vate nov?? predponu interwiki. Pam??tajte, ??e nem????e obsahova?? medzery ??? ???, dvojbodky ???:???, ampersand ???&??? ani znak rovnosti ???=???.',
+	'interwiki_addbutton' => 'Prida??',
+	'interwiki_added' => 'Predpona ???$1??? bola ??spe??ne pridan?? do tabu??ky interwiki.',
+	'interwiki_addfailed' => 'Predponu ???$1??? nebola mo??n?? prida?? do tabu??ky interwiki. Je mo??n??, ??e u?? v tabu??ke interwiki existuje.',
+	'interwiki_edittext' => 'Upravuje sa predpona interwiki',
+	'interwiki_editintro' => 'Upravujete predponu interwiki. Pam??tajte na to, ??e t??mto m????ete pokazi?? existuj??ce odkazy.',
+	'interwiki_edited' => 'Predpona ???$1??? bola ??spe??ne zmenen?? v tabu??ke interwiki.',
+	'interwiki_editerror' => 'Predponu ???$1??? nebolo mo??n?? zmeni?? v tabu??ke interwiki. Je mo??n??, ??e neexistuje.',
+	'interwiki_logpagename' => 'Z??znam zmien tabu??ky interwiki',
+	'interwiki_log_added' => 'Pridan?? ???$2??? ($3) (trans: $4) (local: $5) do tabu??ky interwiki',
+	'interwiki_log_edited' => 'zmenen?? predpona ???$2??? : ($3) (trans: $4) (lok??lna: $5) v tabu??ke interwiki',
+	'interwiki_log_deleted' => 'Odstr??nen?? ???$2??? z tabu??ky interwiki',
+	'interwiki_logpagetext' => 'Toto je z??znam zmien [[Special:Interwiki|tabu??ky interwiki]].',
 	'interwiki_defaultreason' => 'nebol uveden?? d??vod',
+	'right-interwiki' => 'Upravi?? interwiki ??daje',
+);
+
+/** Serbian Cyrillic ekavian (????????????????)
+ * @author Sasa Stefanovic
+ */
+$messages['sr-ec'] = array(
+	'interwiki_reasonfield' => '????????????',
+	'interwiki_delquestion' => '???????????? ???$1???',
+	'interwiki_addbutton' => '??????????',
 );
 
 /** Seeltersk (Seeltersk)
  * @author Pyt
  */
-$wgSpecialInterwikiMessages['stq'] = array(
-	'interwiki'               => 'Interwiki-Doaten bekiekje un beoarbaidje',
-	'interwiki_prefix'        => 'Pr??fix',
-	'interwiki_reasonfield'   => 'Gruund',
-	'interwiki_intro'         => 'Sjuch $1 foar wiedere Informatione uur ju Interwiki-Tabelle. D??t [[Special:Log/interwiki|Logbouk]] wiest aal Annerengen an ju Interwiki-Tabelle.',
-	'interwiki_error'         => 'Failer: Ju Interwiki-Tabelle is loos.',
-	'interwiki_delquestion'   => 'L??sket ???$1???',
-	'interwiki_deleting'      => 'Du hoalst Prefix "$1" w??ch.',
-	'interwiki_deleted'       => '???$1??? wuude m??d ??rfoulch uut ju Interwiki-Tabelle w??chhoald.',
-	'interwiki_delfailed'     => '???$1??? kuude nit uut ju Interwiki-Tabelle l??sked w??ide.',
-	'interwiki_addtext'       => 'N Interwiki-Pr??fix bietouf??igje',
-	'interwiki_addintro'      => 'Du f??igest n n??i Interwiki-Pr??fix bietou. Beoachte, d??t et neen Loosteeken ( ), Koopmons-Un (&), Gliekhaidsteeken (=) un naan Dubbelpunkt (:) ??nthoolde duur.',
-	'interwiki_addbutton'     => 'Bietouf??igje',
-	'interwiki_added'         => '???$1??? wuude m??d ??rfoulch ju Interwiki-Tabelle bietouf??iged.',
-	'interwiki_addfailed'     => '???$1??? kuude nit ju Interwiki-Tabelle bietouf??iged w??ide.',
-	'interwiki_logpagename'   => 'Interwiki-Tabellenlogbouk',
-	'interwiki_log_added'     => 'h??d ???$1??? ($2) (trans: $3) (lokal: $4) ju Interwiki-Tabelle bietouf??iged: $5',
-	'interwiki_log_deleted'   => 'h??d ???$1??? uut ju Interwiki-Tabelle w??chhoald: $2',
-	'interwiki_logpagetext'   => 'In dit Logbouk w??ide Annerengen an ju [[Special:Interwiki|Interwiki-Tabelle]] protokollierd.',
+$messages['stq'] = array(
+	'interwiki' => 'Interwiki-Doaten bekiekje un beoarbaidje',
+	'interwiki_prefix' => 'Pr??fix',
+	'interwiki_reasonfield' => 'Gruund',
+	'interwiki_intro' => 'Sjuch $1 foar wiedere Informatione uur ju Interwiki-Tabelle. D??t [[Special:Log/interwiki|Logbouk]] wiest aal Annerengen an ju Interwiki-Tabelle.',
+	'interwiki_error' => 'Failer: Ju Interwiki-Tabelle is loos.',
+	'interwiki_delquestion' => 'L??sket ???$1???',
+	'interwiki_deleting' => 'Du hoalst Prefix "$1" w??ch.',
+	'interwiki_deleted' => '???$1??? wuude m??d ??rfoulch uut ju Interwiki-Tabelle w??chhoald.',
+	'interwiki_delfailed' => '???$1??? kuude nit uut ju Interwiki-Tabelle l??sked w??ide.',
+	'interwiki_addtext' => 'N Interwiki-Pr??fix bietouf??igje',
+	'interwiki_addintro' => 'Du f??igest n n??i Interwiki-Pr??fix bietou. Beoachte, d??t et neen Loosteeken ( ), Koopmons-Un (&), Gliekhaidsteeken (=) un naan Dubbelpunkt (:) ??nthoolde duur.',
+	'interwiki_addbutton' => 'Bietouf??igje',
+	'interwiki_added' => '???$1??? wuude m??d ??rfoulch ju Interwiki-Tabelle bietouf??iged.',
+	'interwiki_addfailed' => '???$1??? kuude nit ju Interwiki-Tabelle bietouf??iged w??ide.',
+	'interwiki_logpagename' => 'Interwiki-Tabellenlogbouk',
+	'interwiki_log_added' => 'h??d ???$2??? ($3) (trans: $4) (lokal: $5) ju Interwiki-Tabelle bietouf??iged',
+	'interwiki_log_deleted' => 'h??d ???$2??? uut ju Interwiki-Tabelle w??chhoald',
+	'interwiki_logpagetext' => 'In dit Logbouk w??ide Annerengen an ju [[Special:Interwiki|Interwiki-Tabelle]] protokollierd.',
 	'interwiki_defaultreason' => 'naan Gruund ounroat',
 );
+
+/** Sundanese (Basa Sunda)
+ * @author Irwangatot
+ */
+$messages['su'] = array(
+	'interwiki_reasonfield' => 'Alesan',
+	'interwiki_delquestion' => 'Ngahapus "$1"',
+);
+
+/** Swedish (Svenska)
+ * @author Lejonel
+ * @author M.M.S.
+ */
+$messages['sv'] = array(
+	'interwiki' => 'Visa och redigera interwiki-data',
+	'interwiki-title-norights' => 'Visa interwiki-data',
+	'interwiki-desc' => 'L??gger till en [[Special:Interwiki|specialsida]] f??r att visa och ??ndra interwikitabellen',
+	'interwiki_prefix' => 'Prefix',
+	'interwiki_reasonfield' => 'Anledning',
+	'interwiki_intro' => 'Se $1 f??r mer information om interwikitabellen.
+Det finns en [[Special:Log/interwiki|logg]] ??ver ??ndringar av interwikitabellen.',
+	'interwiki_error' => 'FEL: Interwikitabellen ??r tom, eller s?? gick n??got fel.',
+	'interwiki_delquestion' => 'Ta bort "$1"',
+	'interwiki_deleting' => 'Du h??ller p?? att ta bort prefixet "$1".',
+	'interwiki_deleted' => 'Prefixet "$1 har raderats fr??n interwikitabellen.',
+	'interwiki_delfailed' => 'Prefixet "$1" kunde inte raderas fr??n interwikitabellen.',
+	'interwiki_addtext' => 'L??gg till ett interwikiprefix',
+	'interwiki_addintro' => 'Du h??ller p?? att l??gga till ett nytt interwikiprefix.
+Kom ih??g att det inte kan inneh??lla mellanslag ( ), kolon (:), &-tecken eller likhetstecken (=).',
+	'interwiki_addbutton' => 'L??gg till',
+	'interwiki_added' => 'Prefixet "$1" har lagts till i interwikitabellen.',
+	'interwiki_addfailed' => 'Prefixet "$1" kunde inte l??ggas till i interwikitabellen.
+Det ??r m??jligt att prefixet redan finns i tabellen.',
+	'interwiki_edittext' => 'Redigera ett interwikiprefix',
+	'interwiki_editintro' => 'Du redigerar ett interwikiprefix. Notera att detta kan f??rst??ra existerande l??nkar.',
+	'interwiki_edited' => 'Prefixet "$1" har ??ndrats i interwikitabellen.',
+	'interwiki_editerror' => 'Prefixet "$1" kan inte ??ndras i interwikitabellen. Det ??r m??jligt att det inte finns.',
+	'interwiki_logpagename' => 'Interwikitabellogg',
+	'interwiki_log_added' => 'lade till prefixet "$2" ($3) (trans: $4) (lokal: $5) i interwikitabellen',
+	'interwiki_log_edited' => '??ndrade prefixet "$2" ($3) (trans: $4) (lokal: $5) i interwikitabellen',
+	'interwiki_log_deleted' => 'tog bort prefixet "$2" fr??n interwikitabellen',
+	'interwiki_logpagetext' => 'Detta ??r en logg ??ver ??ndringar i [[Special:Interwiki|interwikitabellen]].',
+	'interwiki_defaultreason' => 'ingen anledning given',
+	'right-interwiki' => 'Redigera interwikidata',
+);
+
+/** Silesian (??l??nski)
+ * @author Herr Kriss
+ */
+$messages['szl'] = array(
+	'interwiki_reasonfield' => '??ymu',
+	'interwiki_addbutton' => 'Dodej',
+);
+
+/** Telugu (??????????????????)
+ * @author Veeven
+ */
+$messages['te'] = array(
+	'interwiki' => '??????????????????????????? ??????????????????????????? ?????????????????? ??????????????? ????????????????????????',
+	'interwiki_prefix' => '??????????????????',
+	'interwiki_reasonfield' => '???????????????',
+	'interwiki_intro' => '??????????????????????????? ?????????????????? ????????????????????? ??????????????? ????????????????????? ???????????? $1?????? ??????????????????. ??????????????????????????? ???????????????????????? [[Special:Log/interwiki|????????????????????? ?????????????????????]] ????????????.',
+	'interwiki_error' => '?????????????????????: ??????????????????????????? ?????????????????? ?????????????????? ????????????, ???????????? ????????? ??????????????? ????????????????????????.',
+	'interwiki_delquestion' => '"$1"?????? ?????????????????????????????????????????????',
+	'interwiki_deleting' => '???????????? "$1" ????????? ???????????????????????? ???????????????????????????????????????????????????.',
+	'interwiki_deleted' => '??????????????????????????? ?????????????????? ??????????????? "$1" ????????? ???????????????????????? ?????????????????????????????? ???????????????????????????.',
+	'interwiki_delfailed' => '??????????????????????????? ?????????????????? ??????????????? "$1" ????????? ???????????????????????? ?????????????????????????????????????????????.',
+	'interwiki_addtext' => '??? ??????????????????????????? ???????????????????????? ????????????????????????',
+	'interwiki_addbutton' => '??????????????????',
+	'interwiki_logpagename' => '??????????????????????????? ?????????????????? ?????????????????????',
+	'interwiki_logpagetext' => '????????? [[Special:Interwiki|??????????????????????????? ??????????????????]]?????? ?????????????????? ????????????????????? ?????????????????????.',
+	'interwiki_defaultreason' => '??????????????? ????????????????????????',
+);
+
+/** Tetum (Tetun)
+ * @author MF-Warburg
+ */
+$messages['tet'] = array(
+	'interwiki_delquestion' => 'Halakon $1',
+);
+
+/** Tajik (Cyrillic) (???????????? (Cyrillic))
+ * @author Ibrahim
+ */
+$messages['tg-cyrl'] = array(
+	'interwiki_reasonfield' => '??????????',
+	'interwiki_delquestion' => '?????? ???????? ?????????? "$1"',
+	'interwiki_addbutton' => '??????????',
+	'interwiki_defaultreason' => '???????????? ???????????????? ??????????????????',
+);
+
+/** Thai (?????????)
+ * @author Passawuth
+ */
+$messages['th'] = array(
+	'interwiki_reasonfield' => '??????????????????',
+	'interwiki_delquestion' => '?????? "$1"',
+	'interwiki_addbutton' => '???????????????',
+);
+
+/** Turkish (T??rk??e)
+ * @author Suelnur
+ */
+$messages['tr'] = array(
+	'interwiki_reasonfield' => 'Neden',
+);
+
+/** Ukrainian (????????????????????)
+ * @author Ahonc
+ */
+$messages['uk'] = array(
+	'interwiki_prefix' => '??????????????',
+	'interwiki_reasonfield' => '??????????????',
+);
+
+/** Vietnamese (Ti???ng Vi???t)
+ * @author Minh Nguyen
+ * @author Vinhtantran
+ */
+$messages['vi'] = array(
+	'interwiki' => 'Xem v?? s???a ?????i d??? li???u v??? li??n k???t li??n wiki',
+	'interwiki-title-norights' => 'Xem d??? li???u li??n wiki',
+	'interwiki-desc' => 'Th??m m???t [[Special:Interwiki|trang ?????c bi???t]] ????? xem s???a ?????i b???ng li??n wiki',
+	'interwiki_prefix' => 'Ti???n t???',
+	'interwiki_reasonfield' => 'L?? do',
+	'interwiki_intro' => 'Xem $1 ????? bi???t th??m th??ng tin v??? b???ng li??n wiki.
+????y l?? [[Special:Log/interwiki|nh???t tr??nh c??c thay ?????i]] t???i b???ng li??n wiki.',
+	'interwiki_error' => 'L???i: B???ng li??n wiki hi???n ??ang tr???ng, ho???c c?? v???n ????? g?? ???? ???? x???y ra.',
+	'interwiki_delquestion' => 'X??a ???$1???',
+	'interwiki_deleting' => 'B???n ??ang x??a ti???n t??? ???$1???.',
+	'interwiki_deleted' => 'Ti???n t??? ???$1??? ???? ???????c x??a kh???i b???ng li??n wiki.',
+	'interwiki_delfailed' => 'Ti???n t??? ???$1??? kh??ng th??? x??a kh???i b???ng li??n wiki.',
+	'interwiki_addtext' => 'Th??m ti???n t??? li??n k???t li??n wiki',
+	'interwiki_addintro' => 'B???n ??ang th??m m???t ti???n t??? li??n wiki m???i.
+H??y nh??? r???ng n?? kh??ng ch???a ???????c kho???ng tr???ng ( ), d???u hai ch???m (:), d???u v?? (&), hay d???u b???ng (=).',
+	'interwiki_addbutton' => 'Th??m',
+	'interwiki_added' => 'Ti???n t??? ???$1??? ???? ???????c th??m v??o b???ng li??n wiki.',
+	'interwiki_addfailed' => 'Ti???n t??? ???$1??? kh??ng th??? th??m v??o b???ng li??n wiki.
+C?? th??? n?? ???? t???n t???i trong b???ng li??n wiki r???i.',
+	'interwiki_edittext' => 'S???a ?????i ti???n t??? li??n wiki',
+	'interwiki_editintro' => 'B???n ??ang s???a ?????i m???t ti???n t??? li??n wiki. H??y nh??? r???ng vi???c l??m n??y c?? th??? ph?? h???ng c??c li??n h???t ???? c??.',
+	'interwiki_edited' => 'Ti???n t??? ???$1??? ???? thay ?????i xong trong b???ng li??n wiki.',
+	'interwiki_editerror' => 'Ti???n t??? ???$1??? kh??ng th??? thay ?????i trong b???ng li??n wiki. C?? th??? n?? kh??ng t???n t???i.',
+	'interwiki_logpagename' => 'Nh???t tr??nh b???ng li??n wiki',
+	'interwiki_log_added' => '???? th??m ti???n t??? ???$2??? ($3) (ngo??i: $4) (trong:$5) v??o b???ng li??n wiki',
+	'interwiki_log_edited' => '???? thay ?????i ti???n t??? ???$2??? : ($3) (ngo??i: $4) (trong: $5) trong b???ng li??n wiki',
+	'interwiki_log_deleted' => '???? x??a ti???n t??? ???$2??? kh???i b???ng li??n wiki',
+	'interwiki_logpagetext' => '????y l?? nh???t tr??nh c??c thay ?????i trong [[Special:Interwiki|b???ng li??n wiki]].',
+	'interwiki_defaultreason' => 'kh??ng ????a ra l?? do',
+);
+
+/** Volap??k (Volap??k)
+ * @author Malafaya
+ */
+$messages['vo'] = array(
+	'interwiki_reasonfield' => 'Kod',
+);
+
+/** Traditional Chinese (?????????(??????)???)
+ * @author Alexsh
+ */
+$messages['zh-hant'] = array(
+	'interwiki' => '??????????????????',
+	'interwiki-desc' => '??????[[Special:Interwiki|????????????]]????????????????????????????????????',
+	'interwiki_prefix' => '????????????',
+	'interwiki_reasonfield' => '??????',
+	'interwiki_intro' => '?????????$1???????????????????????????????????????????????????
+
+??????????????????????????????[[Special:Log/interwiki|????????????]]???',
+	'interwiki_error' => '???????????????????????????????????????????????????????????????',
+	'interwiki_delquestion' => '????????????"$1"',
+	'interwiki_deleting' => '???????????????????????????"$1"',
+	'interwiki_deleted' => '??????????????????????????????????????????"$1"',
+	'interwiki_delfailed' => '????????????????????????????????????"$1"',
+	'interwiki_addtext' => '????????????????????????',
+);
+


Index: SpecialInterwiki.php
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki-SpecialInterwiki/devel/SpecialInterwiki.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SpecialInterwiki.php	10 Jun 2008 13:25:29 -0000	1.1
+++ SpecialInterwiki.php	12 Sep 2008 23:28:18 -0000	1.2
@@ -14,239 +14,30 @@
  */
 
 if (!defined('MEDIAWIKI')) die();
-$wgExtensionFunctions[] = "Interwiki";
 
 $wgExtensionCredits['specialpage'][] = array(
-	'name' => 'SpecialInterwiki',
-	'url' => 'http://mediawiki.org/wiki/Extension:SpecialInterwiki',
-	'description' => 'Adds a [[Special:Interwiki|special page]] to view and edit the interwiki table',
-	'version' => '14-12-07',
-	'author'  => array( 'Stephanie Amanda Stevens', 'SPQRobin', 'others' ),
+	'name'           => 'SpecialInterwiki',
+	'url'            => 'http://mediawiki.org/wiki/Extension:SpecialInterwiki',
+	'description'    => 'Adds a [[Special:Interwiki|special page]] to view and edit the interwiki table',
+	'svn-date'       => '$LastChangedDate$',
+	'svn-revision'   => '$LastChangedRevision$',
+	'author'         => array( 'Stephanie Amanda Stevens', 'SPQRobin', 'others' ),
+	'descriptionmsg' => 'interwiki-desc',
 );
 
-function Interwiki() {
-	global $IP, $wgMessageCache, $wgHooks, $wgSpecialInterwikiMessages;
-	require_once( "$IP/includes/SpecialPage.php" );
-	require_once( 'SpecialInterwiki.i18n.php');
-	foreach( $wgSpecialInterwikiMessages as $key => $value ) {
-	$wgMessageCache->addMessages( $wgSpecialInterwikiMessages[$key], $key );}
-
-	# Add a new log type
-	$wgHooks['LogPageValidTypes'][] = 'wfInterwikiAddLogType';
-
-	# Add a new log type
-	$wgHooks['LogPageValidTypes'][] = 'wfInterwikiAddLogType';
-	$wgHooks['LogPageLogName'][] = 'wfInterwikiAddLogName';
-	$wgHooks['LogPageLogHeader'][] = 'wfInterwikiAddLogHeader';
-	$wgHooks['LogPageActionText'][] = 'wfInterwikiAddActionText';
-
-	class Interwiki extends SpecialPage {
-		function Interwiki() {
-			SpecialPage::SpecialPage( 'Interwiki' );
-			$this->includable( true );
-		}
-
-		function execute( $par = null ) {
-			$fname = 'Interwiki::execute';
-			global $wgOut, $wgRequest, $wgUser;
-
-			$this->setHeaders();
-			$wgOut->setPagetitle( wfMsg( 'interwiki' ) );
-			$do = $wgRequest->getVal( 'do' );
-
-			// Some common checks
-			$admin = $wgUser->isAllowed( 'interwiki' );
-			$selfTitle = Title::makeTitle( NS_SPECIAL, 'Interwiki' );
-
-			// Protect administrative actions against malicious requests
-			$safePost = $wgRequest->wasPosted() &&
-				$wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) );
-
-			if ($do == "delete") {
-				if (!$admin) { $wgOut->permissionRequired('interwiki'); return; }
-				$prefix = $wgRequest->getVal( 'prefix' );
-				$encPrefix = htmlspecialchars( $prefix );
-
-				$action = $selfTitle->escapeLocalURL( "do=delete2" );
-				$button = wfMsgHtml("delete");
-				$topmessage = wfMsgHtml('interwiki_delquestion', $prefix);
-				$deletingmessage = wfMsgHtml('interwiki_deleting', $prefix);
-				$reasonmessage = wfMsgHtml('deletecomment');
-				$defaultreason = wfMsgForContent( 'interwiki_defaultreason' );
-				$token = htmlspecialchars( $wgUser->editToken() );
-
-					$out .= "<fieldset>
-					<legend>$topmessage</legend>
-					<form id=\"delete\" method=\"post\" action=\"{$action}\">
-					<table><tr>
-					<td>$deletingmessage</td>
-					</tr><tr>
-					<td><input type=\"hidden\" name=\"prefix\" value=\"{$encPrefix}\" />
-					$reasonmessage &nbsp; <input tabindex='1' type='text' name=\"reason\" maxlength='200' size='60' value='$defaultreason' /></td>
-					</tr><tr><td>
-					<input type=\"submit\" name=\"delete\" value=\"{$button}\" />
-					<input type=\"hidden\" name=\"wpEditToken\" value=\"{$token}\"/>
-					</td></tr></table>
-					</form>
-					</fieldset>\n";
-			} elseif ($do == "delete2" && $safePost) {
-				if (!$admin) { $wgOut->permissionRequired('interwiki'); return; }
-
-				$prefix = $wgRequest->getVal('prefix');
-				$reason = $wgRequest->getText('reason');
-
-				$dbw =& wfGetDB( DB_MASTER );
-				$dbw->delete( 'interwiki', array( 'iw_prefix' => $prefix ), $fname );
-
-				if ($dbw->affectedRows() == 0) {
-					$wgOut->addWikiText( wfMsg( 'interwiki_delfailed', $prefix ) );
-				} else {
-					$wgOut->addWikiText( wfMsg( 'interwiki_deleted', $prefix ) . '<br /><br />' . wfMsg ( 'returnto', '[[Special:Log/interwiki]]' ) ); # I don't know how to add a link to Special:Interwiki
-					$log = new LogPage( 'interwiki' );
-					$log->addEntry( 'interwiki', $selfTitle, wfMsgForContent( 'interwiki_log_deleted', $prefix, $reason ) );
-				}
-			} elseif ($do == "add") {
-				if (!$admin) { $wgOut->permissionRequired('interwiki'); return; };
-				$action = $selfTitle->escapeLocalURL( "do=add2");
-				$topmessage = wfMsgHtml( 'interwiki_addtext' );
-				$intromessage = wfMsg( 'interwiki_addintro' );
-				$prefixmessage = wfMsgHtml( 'interwiki_prefix' );
-				$localmessage = wfMsgHtml( 'interwiki_local' );
-				$transmessage = wfMsgHtml( 'interwiki_trans' );
-				$reasonmessage = wfMsgHtml( 'interwiki_reasonfield' );
-				$urlmessage = wfMsgHtml( 'interwiki_url' );
-				$button = wfMsgHtml( 'interwiki_addbutton' );
-				$token = htmlspecialchars( $wgUser->editToken() );
-				$defaulturl = wfMsgHtml( 'interwiki_defaulturl' );
-				$defaultreason = wfMsgForContent( 'interwiki_defaultreason' );
-
-				$out = "<fieldset>
-					<legend>$topmessage</legend>
-					$intromessage
-					<form id='add' method='post' action='{$action}'>
-					<table id='interwikitable-add'><tr>
-					<td>$prefixmessage</td>
-					<td><input tabindex='1' type='text' name='prefix' maxlength='20' size='20' /></td>
-					</tr><tr>
-					<td>$localmessage</td>
-					<td><input type='checkbox' id='local' name='local' /></td>
-					</tr><tr>
-					<td>$transmessage</td>
-					<td><input type='checkbox' id='trans' name='trans' /></td>
-					</tr><tr>
-					<td>$urlmessage</td>
-					<td><input tabindex='1' type='text' name='theurl' maxlength='200' size='60' value='$defaulturl' /></td>
-					</tr><tr>
-					<td>$reasonmessage</td>
-					<td><input tabindex='1' type='text' name='reason' maxlength='200' size='60' value='$defaultreason' /></td>
-					</tr></table>
-					<input type='submit' name='add' value='{$button}' />
-					<input type='hidden' name='wpEditToken' value='{$token}' />
-					</form>
-					</fieldset>\n";
-			} elseif ($do == "add2" && $safePost) {
-				if (!$admin) { $wgOut->permissionRequired('interwiki'); return; }
-				$prefix = $wgRequest->getVal('prefix');
-				$reason = $wgRequest->getText('reason');
-				$theurl = $wgRequest->getVal('theurl');
-				$local = $wgRequest->getCheck('local') ? 1 : 0;
-				$trans = $wgRequest->getCheck('trans') ? 1 : 0;
-
-				$dbw =& wfGetDB( DB_MASTER );
-				$dbw->insert( 'interwiki',
-					array(
-						'iw_prefix' => $prefix,
-						'iw_url'    => $theurl,
-						'iw_local'  => $local,
-						'iw_trans'  => $trans ),
-					$fname,
-					'IGNORE' );
-
-				if( $dbw->affectedRows() == 0 ) {
-					$wgOut->addWikiText( wfMsg( 'interwiki_addfailed', $prefix ) );
-				} else {
-					$wgOut->addWikiText( wfMsg( 'interwiki_added', $prefix ) . '<br /><br />' . wfMsg ( 'returnto', '[[Special:Log/interwiki]]' ) ); # I don't know how to add a link to Special:Interwiki
-					$log = new LogPage( 'interwiki' );
-					$log->addEntry( 'interwiki', $selfTitle, wfMsgForContent( 'interwiki_log_added', $prefix, $theurl, $trans, $local, $reason ) );
-				}
-			} else {
-				$dbr =& wfGetDB( DB_SLAVE );
-				$res = $dbr->select( 'interwiki', '*' );
-
-				$prefixmessage = wfMsgHtml( 'interwiki_prefix' );
-				$urlmessage = wfMsgHtml( 'interwiki_url' );
-				$localmessage = wfMsgHtml( 'interwiki_local' );
-				$transmessage = wfMsgHtml( 'interwiki_trans' );
-				$deletemessage = wfMsgHtml( 'delete');
-				$addtext = wfMsgHtml( 'interwiki_addtext' );
-
-				if ($admin) {
-					$skin = $wgUser->getSkin();
-					$addlink = $skin->makeLinkObj( $selfTitle, $addtext, 'do=add' );
-					$wgOut->addWikiText( wfMsg( 'interwiki_intro', '[http://www.mediawiki.org/wiki/Interwiki_table MediaWiki.org]' ) );
-					$wgOut->addHTML( '<ul>' . '<li>' . $addlink . '</li>' . '</ul>' );
-				} else {
-					$wgOut->addWikiText( wfMsg( 'interwiki_intro', '[http://www.mediawiki.org/wiki/Interwiki_table MediaWiki.org]' ) );
-				}
-
-				$out .= "
-				<br />
-				<table width='100%' border='2' id='interwikitable'>
-				<tr><th>$prefixmessage</th> <th>$urlmessage</th> <th>$localmessage</th> <th>$transmessage</th>";
-				if( $admin ) {
-					$out .= "<th>$deletemessage</th>";
-				}
-
-				$out .= "</tr>\n";
-
-				$numrows = $dbr->numRows( $res );
-				if ($numrows == 0) {
-					$errormessage = wfMsgHtml('interwiki_error');
-					$out .= "<br /><div class=\"error\">$errormessage</div><br />";
-				}
-				while( $s = $dbr->fetchObject( $res ) ) {
-					$prefix = htmlspecialchars( $s->iw_prefix );
-					$url = htmlspecialchars( $s->iw_url );
-					$trans = htmlspecialchars( $s->iw_trans );
-					$local = htmlspecialchars( $s->iw_local );
-					$out .= "<tr><td>$prefix</td> <td>$url</td> <td>$local</td> <td>$trans</td>";
-					if( $admin ) {
-						$skin = $wgUser->getSkin();
-						$out .= '<td>';
-						$out .= $skin->makeLinkObj( $selfTitle, $deletemessage,
-							'do=delete&prefix=' . urlencode( $s->iw_prefix ) );
-						$out .= '</td>';
-					}
-
-					$out .= "</tr>\n";
-				}
-				$dbr->freeResult( $res );
-				$out .= "</table><br />";
-			}
-			$wgOut->addHTML($out);
-		}
-	}
-
-	SpecialPage::addPage( new Interwiki );
-}
-
-function wfInterwikiAddLogType( &$types ) {
-	if ( !in_array( 'interwiki', $types ) )
-		$types[] = 'interwiki';
-	return true;
-}
-
-function wfInterwikiAddLogName( &$names ) {
-	$names['interwiki'] = 'interwiki_logpagename';
-	return true;
-}
-
-function wfInterwikiAddLogHeader( &$headers ) {
-	$headers['interwiki'] = 'interwiki_logpagetext';
-	return true;
-}
-
-function wfInterwikiAddActionText( &$actions ) {
-	$actions['interwiki/interwiki'] = 'interwiki_logentry';
-	return true;
-}
+$dir = dirname(__FILE__) . '/';
+$wgExtensionMessagesFiles['Interwiki'] = $dir . 'SpecialInterwiki.i18n.php';
+$wgExtensionAliasesFiles['Interwiki'] = $dir . 'SpecialInterwiki.alias.php';
+
+$wgSpecialPages['Interwiki'] = 'SpecialInterwiki';
+$wgAutoloadClasses['SpecialInterwiki'] = $dir . 'SpecialInterwiki_body.php';
+
+$wgAvailableRights[] = 'interwiki';
+
+$wgLogTypes[] = 'interwiki';
+$wgLogNames['interwiki'] = 'interwiki_logpagename';
+$wgLogHeaders['interwiki'] = 'interwiki_logpagetext';
+$wgLogActions['interwiki/interwiki'] = 'interwiki_logentry';
+$wgLogActions['interwiki/iw_add'] = 'interwiki_log_added';
+$wgLogActions['interwiki/iw_delete'] = 'interwiki_log_deleted';
+$wgLogActions['interwiki/iw_edit'] = 'interwiki_log_edited';


Index: mediawiki-SpecialInterwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki-SpecialInterwiki/devel/mediawiki-SpecialInterwiki.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mediawiki-SpecialInterwiki.spec	21 Jun 2008 23:36:05 -0000	1.2
+++ mediawiki-SpecialInterwiki.spec	12 Sep 2008 23:28:18 -0000	1.3
@@ -1,19 +1,21 @@
 Name:           mediawiki-SpecialInterwiki
 Version:        0
-Release:        0.3.20080606svn%{?dist}
+Release:        0.4.20080913svn%{?dist}
 Summary:        An extension to provide an interwiki management system
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.mediawiki.org/wiki/Extension:SpecialInterwiki
-# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/Interwiki/SpecialInterwiki.php?revision=28499
+# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/Interwiki/SpecialInterwiki.php?revision=37451
 Source0:        SpecialInterwiki.php
-# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/Interwiki/SpecialInterwiki.i18n.php?revision=29241
-Source1:        SpecialInterwiki.i18n.php
+# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/Interwiki/SpecialInterwiki_body.php?revision=36822
+Source1:        SpecialInterwiki_body.php
+# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/Interwiki/SpecialInterwiki.i18n.php?revision=40706
+Source2:        SpecialInterwiki.i18n.php
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       mediawiki < 1.11
+Requires:       mediawiki >= 1.12
 
 %description
 Interwiki management extension allowing the viewing and management of InterWiki
@@ -25,7 +27,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/SpecialInterwiki
-install -cpm 644 %{SOURCE0} %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/SpecialInterwiki
+install -cpm 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/SpecialInterwiki
 
 
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -45,6 +47,8 @@
 %doc %{_docdir}/%{name}-%{version}/README.fedora
 
 %changelog
+* Sat Sep 13 2008 Nigel Jones <dev at nigelj.com> - 0-0.4.20080913svn
+- Update to >= 1.12 version now that rawhide has an updated Mediawiki package
 * Tue Jun 10 2008 Nigel Jones <dev at nigelj.com> - 0-0.3.20080606svn
 - Do away with the prep section
 



From mclasen at fedoraproject.org  Fri Sep 12 23:58:37 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 12 Sep 2008 23:58:37 +0000 (UTC)
Subject: rpms/glib2/F-9 .cvsignore, 1.89, 1.90 glib2.spec, 1.171,
	1.172 sources, 1.91, 1.92
Message-ID: <20080912235837.E73E170132@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/glib2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13938

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.16.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glib2/F-9/.cvsignore,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- .cvsignore	20 Jul 2008 03:55:24 -0000	1.89
+++ .cvsignore	12 Sep 2008 23:58:07 -0000	1.90
@@ -1 +1 @@
-glib-2.16.5.tar.bz2
+glib-2.16.6.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/extras/rpms/glib2/F-9/glib2.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- glib2.spec	20 Jul 2008 03:55:24 -0000	1.171
+++ glib2.spec	12 Sep 2008 23:58:07 -0000	1.172
@@ -2,7 +2,7 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.16.5
+Version: 2.16.6
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -128,6 +128,9 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Fri Sep 12 2008 Matthias Clasen <mclasen at redhat.com> - 2.16.6-1
+- Update to 2.16.6
+
 * Sat Jul 19 2008 Matthias Clasen <mclasen at redhat.com> - 2.16.5-1
 - Update to 2.16.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glib2/F-9/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- sources	20 Jul 2008 03:55:24 -0000	1.91
+++ sources	12 Sep 2008 23:58:07 -0000	1.92
@@ -1 +1 @@
-039f02d47d4071322a3f00abf031e5d9  glib-2.16.5.tar.bz2
+664e59093c31896a3a46b7cd93fdd3dd  glib-2.16.6.tar.bz2



From lmacken at fedoraproject.org  Sat Sep 13 00:17:22 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat, 13 Sep 2008 00:17:22 +0000 (UTC)
Subject: rpms/obby/devel .cvsignore, 1.12, 1.13 obby.spec, 1.31, 1.32 sources,
	1.12, 1.13
Message-ID: <20080913001722.F10DA70135@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/obby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15177

Modified Files:
	.cvsignore obby.spec sources 
Log Message:
Update to the latest upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obby/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	26 Jul 2008 19:04:58 -0000	1.12
+++ .cvsignore	13 Sep 2008 00:16:52 -0000	1.13
@@ -1 +1 @@
-obby-0.4.5.tar.gz
+obby-0.4.6.tar.gz


Index: obby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obby/devel/obby.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- obby.spec	26 Jul 2008 19:04:58 -0000	1.31
+++ obby.spec	13 Sep 2008 00:16:52 -0000	1.32
@@ -1,5 +1,5 @@
 Name:           obby
-Version:        0.4.5
+Version:        0.4.6
 Release:        1%{?dist}
 Summary:        A library which provides synced document buffers
 
@@ -55,7 +55,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README NEWS COPYING TODO AUTHORS
+%doc README NEWS COPYING AUTHORS
 %{_libdir}/*.so.*
 
 %files devel
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Luke Macken <lmacken at redhat.com> - 0.4.6-1
+- Update to the latest upstream release
+
 * Sat Jul 26 2008 Luke Macken <lmacken at redhat.com> - 0.4.5-1
 - Update to the latest upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/obby/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	26 Jul 2008 19:04:58 -0000	1.12
+++ sources	13 Sep 2008 00:16:52 -0000	1.13
@@ -1 +1 @@
-bc1e0d2bf7115fe53a54cb4d2d0776b7  obby-0.4.5.tar.gz
+500c23f64249967596259daddf97f711  obby-0.4.6.tar.gz



From lmacken at fedoraproject.org  Sat Sep 13 00:18:13 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat, 13 Sep 2008 00:18:13 +0000 (UTC)
Subject: rpms/gobby/devel .cvsignore, 1.14, 1.15 gobby.spec, 1.30,
	1.31 sources, 1.14, 1.15 gobby-0.4.6-gcc43.patch, 1.1, NONE
Message-ID: <20080913001813.BFF3E70135@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/gobby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15286

Modified Files:
	.cvsignore gobby.spec sources 
Removed Files:
	gobby-0.4.6-gcc43.patch 
Log Message:
Latest upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gobby/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	26 Jul 2008 19:13:11 -0000	1.14
+++ .cvsignore	13 Sep 2008 00:17:43 -0000	1.15
@@ -1 +1 @@
-gobby-0.4.6.tar.gz
+gobby-0.4.7.tar.gz


Index: gobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gobby/devel/gobby.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gobby.spec	26 Jul 2008 19:13:11 -0000	1.30
+++ gobby.spec	13 Sep 2008 00:17:43 -0000	1.31
@@ -1,5 +1,5 @@
 Name:           gobby
-Version:        0.4.6
+Version:        0.4.7
 Release:        1%{?dist}
 Summary:        Free collaborative editor
 
@@ -7,10 +7,9 @@
 License:        GPLv2
 URL:            http://gobby.0x539.de
 Source0:        http://releases.0x539.de/gobby/%{name}-%{version}.tar.gz
-Patch0:         %{name}-%{version}-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libxml++-devel, gtksourceview-devel, gtkmm24-devel, obby-devel
+BuildRequires:  libxml++-devel, gtksourceview2-devel, gtkmm24-devel, obby-devel
 BuildRequires:  desktop-file-utils, libXau-devel, libXdmcp-devel
 BuildRequires:  gnome-vfs2-devel, gettext-devel
 BuildRequires:  avahi-devel, avahi-glib-devel
@@ -29,7 +28,6 @@
 
 %prep
 %setup -q
-%patch0
 
 
 %build
@@ -71,6 +69,10 @@
 
 
 %changelog
+* Thu Sep 11 2008 Luke Macken <lmacken at redhat.com> - 0.4.7-1
+- Update to the latest upstream release.
+- Remove the gcc4.3 patch
+
 * Sat Jul 26 2008 Luke Macken <lmacken at redhat.com> - 0.4.6-1
 - Update to the latest upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gobby/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	26 Jul 2008 19:13:11 -0000	1.14
+++ sources	13 Sep 2008 00:17:43 -0000	1.15
@@ -1 +1 @@
-e6a01bf4f615a748d56b80bf6604b1e8  gobby-0.4.6.tar.gz
+88b1bd42d643f73fbaac18c8973f4853  gobby-0.4.7.tar.gz


--- gobby-0.4.6-gcc43.patch DELETED ---



From lmacken at fedoraproject.org  Sat Sep 13 00:18:49 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat, 13 Sep 2008 00:18:49 +0000 (UTC)
Subject: rpms/sobby/devel .cvsignore, 1.8, 1.9 sobby.spec, 1.18, 1.19 sources,
	1.8, 1.9
Message-ID: <20080913001849.36BB970135@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/sobby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15418

Modified Files:
	.cvsignore sobby.spec sources 
Log Message:
Latest upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sobby/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Aug 2007 20:30:19 -0000	1.8
+++ .cvsignore	13 Sep 2008 00:18:18 -0000	1.9
@@ -1 +1 @@
-sobby-0.4.4.tar.gz
+sobby-0.4.5.tar.gz


Index: sobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sobby/devel/sobby.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sobby.spec	1 Aug 2008 10:20:16 -0000	1.18
+++ sobby.spec	13 Sep 2008 00:18:18 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           sobby
-Version:        0.4.4
-Release:        5%{?dist}
+Version:        0.4.5
+Release:        1%{?dist}
 Summary:        Standalone obby server
 
 Group:          Applications/Internet
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Luke Macken <lmacken at redhat.com> - 0.4.5-1
+- Latest upstream release
+
 * Fri Aug 01 2008 Caol??n McNamara <caolanm at redhat.com> - 0.4.4-5
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sobby/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Aug 2007 20:30:19 -0000	1.8
+++ sources	13 Sep 2008 00:18:18 -0000	1.9
@@ -1 +1 @@
-805f37a544567e649e1dcbb385683486  sobby-0.4.4.tar.gz
+c59a5ea003fede807b82ed7bab7bf849  sobby-0.4.5.tar.gz



From ianweller at fedoraproject.org  Sat Sep 13 00:38:03 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Sat, 13 Sep 2008 00:38:03 +0000 (UTC)
Subject: rpms/rsstool/devel import.log, NONE, 1.1 rsstool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080913003803.939FF70134@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/rsstool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16720/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rsstool.spec 
Log Message:
importing rsstool-1.0.0-1 in devel


--- NEW FILE import.log ---
rsstool-1_0_0-1_fc9:HEAD:rsstool-1.0.0-1.fc9.src.rpm:1221266241


--- NEW FILE rsstool.spec ---
Name:           rsstool
Version:        1.0.0
Release:        1%{?dist}
Summary:        Command-line RSS/Atom parser and generator

Group:          Applications/Internet
License:        GPLv2+
URL:            http://rsstool.y7.ath.cx/
Source0:        http://download.berlios.de/%{name}/%{name}-%{version}-src.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libxml2-devel libcurl-devel

%description
rsstool parses and generates RSS and Atom feeds on the command line.


%prep
%setup -q -n %{name}-%{version}-src


%build
cd src
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install -C src DESTDIR=%{buildroot} BINDIR=%{_bindir}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc readme.html changes.html contrib.html faq.html license.html
%{_bindir}/%{name}



%changelog
* Tue Sep 09 2008 Ian Weller <ianweller at gmail.com> 1.0.0-1
- Initial package build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rsstool/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2008 03:19:42 -0000	1.1
+++ .cvsignore	13 Sep 2008 00:37:33 -0000	1.2
@@ -0,0 +1 @@
+rsstool-1.0.0-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rsstool/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 03:19:42 -0000	1.1
+++ sources	13 Sep 2008 00:37:33 -0000	1.2
@@ -0,0 +1 @@
+a3e003045d051491150385f556467a42  rsstool-1.0.0-src.tar.gz



From ianweller at fedoraproject.org  Sat Sep 13 00:39:50 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Sat, 13 Sep 2008 00:39:50 +0000 (UTC)
Subject: rpms/rsstool/EL-4 import.log, NONE, 1.1 rsstool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080913003950.D576370134@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/rsstool/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17025/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rsstool.spec 
Log Message:
importing rsstool-1.0.0-1 in EL-4


--- NEW FILE import.log ---
rsstool-1_0_0-1_fc9:EL-4:rsstool-1.0.0-1.fc9.src.rpm:1221266340


--- NEW FILE rsstool.spec ---
Name:           rsstool
Version:        1.0.0
Release:        1%{?dist}
Summary:        Command-line RSS/Atom parser and generator

Group:          Applications/Internet
License:        GPLv2+
URL:            http://rsstool.y7.ath.cx/
Source0:        http://download.berlios.de/%{name}/%{name}-%{version}-src.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libxml2-devel libcurl-devel

%description
rsstool parses and generates RSS and Atom feeds on the command line.


%prep
%setup -q -n %{name}-%{version}-src


%build
cd src
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install -C src DESTDIR=%{buildroot} BINDIR=%{_bindir}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc readme.html changes.html contrib.html faq.html license.html
%{_bindir}/%{name}



%changelog
* Tue Sep 09 2008 Ian Weller <ianweller at gmail.com> 1.0.0-1
- Initial package build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rsstool/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2008 03:19:42 -0000	1.1
+++ .cvsignore	13 Sep 2008 00:39:20 -0000	1.2
@@ -0,0 +1 @@
+rsstool-1.0.0-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rsstool/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 03:19:42 -0000	1.1
+++ sources	13 Sep 2008 00:39:20 -0000	1.2
@@ -0,0 +1 @@
+a3e003045d051491150385f556467a42  rsstool-1.0.0-src.tar.gz



From ianweller at fedoraproject.org  Sat Sep 13 00:42:11 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Sat, 13 Sep 2008 00:42:11 +0000 (UTC)
Subject: rpms/rsstool/EL-5 import.log, NONE, 1.1 rsstool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080913004211.0F40370134@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/rsstool/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17360/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rsstool.spec 
Log Message:
importing rsstool-1.0.0-1 in EL-5


--- NEW FILE import.log ---
rsstool-1_0_0-1_fc9:EL-5:rsstool-1.0.0-1.fc9.src.rpm:1221266426


--- NEW FILE rsstool.spec ---
Name:           rsstool
Version:        1.0.0
Release:        1%{?dist}
Summary:        Command-line RSS/Atom parser and generator

Group:          Applications/Internet
License:        GPLv2+
URL:            http://rsstool.y7.ath.cx/
Source0:        http://download.berlios.de/%{name}/%{name}-%{version}-src.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libxml2-devel libcurl-devel

%description
rsstool parses and generates RSS and Atom feeds on the command line.


%prep
%setup -q -n %{name}-%{version}-src


%build
cd src
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install -C src DESTDIR=%{buildroot} BINDIR=%{_bindir}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc readme.html changes.html contrib.html faq.html license.html
%{_bindir}/%{name}



%changelog
* Tue Sep 09 2008 Ian Weller <ianweller at gmail.com> 1.0.0-1
- Initial package build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rsstool/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2008 03:19:42 -0000	1.1
+++ .cvsignore	13 Sep 2008 00:41:40 -0000	1.2
@@ -0,0 +1 @@
+rsstool-1.0.0-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rsstool/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 03:19:42 -0000	1.1
+++ sources	13 Sep 2008 00:41:40 -0000	1.2
@@ -0,0 +1 @@
+a3e003045d051491150385f556467a42  rsstool-1.0.0-src.tar.gz



From mstone at fedoraproject.org  Sat Sep 13 00:43:09 2008
From: mstone at fedoraproject.org (Michael Stone)
Date: Sat, 13 Sep 2008 00:43:09 +0000 (UTC)
Subject: rpms/olpc-netutils/F-9 .cvsignore, 1.3, 1.4 olpc-netutils.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20080913004309.5C55F70134@cvs1.fedora.phx.redhat.com>

Author: mstone

Update of /cvs/pkgs/rpms/olpc-netutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17510

Modified Files:
	.cvsignore olpc-netutils.spec sources 
Log Message:
- Michael Stone (1):
    Capture disk and process status.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-netutils/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Sep 2008 22:13:28 -0000	1.3
+++ .cvsignore	13 Sep 2008 00:42:38 -0000	1.4
@@ -1 +1 @@
-olpc-netutils-0.6.tar.bz2
+olpc-netutils-0.7.tar.bz2


Index: olpc-netutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-netutils/F-9/olpc-netutils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- olpc-netutils.spec	12 Sep 2008 22:43:24 -0000	1.5
+++ olpc-netutils.spec	13 Sep 2008 00:42:39 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           olpc-netutils
-Version:        0.6
-Release:        2%{?dist}
+Version:        0.7
+Release:        1%{?dist}
 Summary:        OLPC network utilities
 
 Group:          System Environment/Base
@@ -61,6 +61,10 @@
 
 
 %changelog
+* Fri Sep 12 2008 Michael Stone <michael at laptop.org> - 0.7-1
+- Michael Stone (1):
+    Capture disk and process status.
+
 * Fri Sep 12 2008 Michael Stone <michael at laptop.org> - 0.6-2
 - Michael Stone (1):
     Pull in tcpdump for olpc-netcapture.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-netutils/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Sep 2008 22:13:28 -0000	1.4
+++ sources	13 Sep 2008 00:42:39 -0000	1.5
@@ -1 +1 @@
-f5bda6055d907c9bfeb4bf502d7ea768  olpc-netutils-0.6.tar.bz2
+203ff61ea20b0ee4f4b7f0bc453f9c31  olpc-netutils-0.7.tar.bz2



From ianweller at fedoraproject.org  Sat Sep 13 00:45:18 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Sat, 13 Sep 2008 00:45:18 +0000 (UTC)
Subject: rpms/rsstool/F-8 import.log, NONE, 1.1 rsstool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080913004518.9B10B70134@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/rsstool/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17849/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rsstool.spec 
Log Message:
importing rsstool-1.0.0-1 in F-8


--- NEW FILE import.log ---
rsstool-1_0_0-1_fc9:F-8:rsstool-1.0.0-1.fc9.src.rpm:1221266569


--- NEW FILE rsstool.spec ---
Name:           rsstool
Version:        1.0.0
Release:        1%{?dist}
Summary:        Command-line RSS/Atom parser and generator

Group:          Applications/Internet
License:        GPLv2+
URL:            http://rsstool.y7.ath.cx/
Source0:        http://download.berlios.de/%{name}/%{name}-%{version}-src.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libxml2-devel libcurl-devel

%description
rsstool parses and generates RSS and Atom feeds on the command line.


%prep
%setup -q -n %{name}-%{version}-src


%build
cd src
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install -C src DESTDIR=%{buildroot} BINDIR=%{_bindir}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc readme.html changes.html contrib.html faq.html license.html
%{_bindir}/%{name}



%changelog
* Tue Sep 09 2008 Ian Weller <ianweller at gmail.com> 1.0.0-1
- Initial package build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rsstool/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2008 03:19:42 -0000	1.1
+++ .cvsignore	13 Sep 2008 00:44:48 -0000	1.2
@@ -0,0 +1 @@
+rsstool-1.0.0-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rsstool/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 03:19:42 -0000	1.1
+++ sources	13 Sep 2008 00:44:48 -0000	1.2
@@ -0,0 +1 @@
+a3e003045d051491150385f556467a42  rsstool-1.0.0-src.tar.gz



From xulchris at fedoraproject.org  Sat Sep 13 00:47:08 2008
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Sat, 13 Sep 2008 00:47:08 +0000 (UTC)
Subject: rpms/php-pear-Pager/EL-5 .cvsignore, 1.5, 1.6 php-pear-Pager.spec,
	1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20080913004708.70F5070134@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Pager/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18160/EL-5

Modified Files:
	.cvsignore php-pear-Pager.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 May 2008 01:56:58 -0000	1.5
+++ .cvsignore	13 Sep 2008 00:46:38 -0000	1.6
@@ -1 +1 @@
-Pager-2.4.6.tgz
+Pager-2.4.7.tgz


Index: php-pear-Pager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/EL-5/php-pear-Pager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-pear-Pager.spec	23 May 2008 01:56:58 -0000	1.4
+++ php-pear-Pager.spec	13 Sep 2008 00:46:38 -0000	1.5
@@ -2,7 +2,7 @@
 %define pear_name Pager
 
 Name:           php-pear-Pager
-Version:        2.4.6
+Version:        2.4.7
 Release:        1%{?dist}
 Summary:        Data paging class
 
@@ -80,7 +80,11 @@
 %{pear_testdir}/%{pear_name}
 %{pear_phpdir}/%{pear_name}*
 
+
 %changelog
+* Fri Sep 12 2008 Christopher Stone <chris.stone at gmail.com> 2.4.7-1
+- Upstream sync
+
 * Thu May 22 2008 Christopher Stone <chris.stone at gmail.com> 2.4.6-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 May 2008 01:56:58 -0000	1.5
+++ sources	13 Sep 2008 00:46:38 -0000	1.6
@@ -1 +1 @@
-a1da8d9fef3c4ca4821998bd747b2d59  Pager-2.4.6.tgz
+412ca32d9c3e5038a801032e5ddc9b90  Pager-2.4.7.tgz



From xulchris at fedoraproject.org  Sat Sep 13 00:47:08 2008
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Sat, 13 Sep 2008 00:47:08 +0000 (UTC)
Subject: rpms/php-pear-Pager/F-8 .cvsignore, 1.5, 1.6 php-pear-Pager.spec,
	1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20080913004708.95B1270134@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Pager/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18160/F-8

Modified Files:
	.cvsignore php-pear-Pager.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 May 2008 01:57:39 -0000	1.5
+++ .cvsignore	13 Sep 2008 00:46:38 -0000	1.6
@@ -1 +1 @@
-Pager-2.4.6.tgz
+Pager-2.4.7.tgz


Index: php-pear-Pager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/F-8/php-pear-Pager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-pear-Pager.spec	23 May 2008 01:57:39 -0000	1.4
+++ php-pear-Pager.spec	13 Sep 2008 00:46:38 -0000	1.5
@@ -2,7 +2,7 @@
 %define pear_name Pager
 
 Name:           php-pear-Pager
-Version:        2.4.6
+Version:        2.4.7
 Release:        1%{?dist}
 Summary:        Data paging class
 
@@ -80,7 +80,11 @@
 %{pear_testdir}/%{pear_name}
 %{pear_phpdir}/%{pear_name}*
 
+
 %changelog
+* Fri Sep 12 2008 Christopher Stone <chris.stone at gmail.com> 2.4.7-1
+- Upstream sync
+
 * Thu May 22 2008 Christopher Stone <chris.stone at gmail.com> 2.4.6-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 May 2008 01:57:39 -0000	1.5
+++ sources	13 Sep 2008 00:46:38 -0000	1.6
@@ -1 +1 @@
-a1da8d9fef3c4ca4821998bd747b2d59  Pager-2.4.6.tgz
+412ca32d9c3e5038a801032e5ddc9b90  Pager-2.4.7.tgz



From xulchris at fedoraproject.org  Sat Sep 13 00:47:08 2008
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Sat, 13 Sep 2008 00:47:08 +0000 (UTC)
Subject: rpms/php-pear-Pager/F-9 .cvsignore, 1.5, 1.6 php-pear-Pager.spec,
	1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20080913004708.E7D7870134@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Pager/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18160/F-9

Modified Files:
	.cvsignore php-pear-Pager.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 May 2008 01:58:03 -0000	1.5
+++ .cvsignore	13 Sep 2008 00:46:38 -0000	1.6
@@ -1 +1 @@
-Pager-2.4.6.tgz
+Pager-2.4.7.tgz


Index: php-pear-Pager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/F-9/php-pear-Pager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-pear-Pager.spec	23 May 2008 01:58:03 -0000	1.4
+++ php-pear-Pager.spec	13 Sep 2008 00:46:38 -0000	1.5
@@ -2,7 +2,7 @@
 %define pear_name Pager
 
 Name:           php-pear-Pager
-Version:        2.4.6
+Version:        2.4.7
 Release:        1%{?dist}
 Summary:        Data paging class
 
@@ -80,7 +80,11 @@
 %{pear_testdir}/%{pear_name}
 %{pear_phpdir}/%{pear_name}*
 
+
 %changelog
+* Fri Sep 12 2008 Christopher Stone <chris.stone at gmail.com> 2.4.7-1
+- Upstream sync
+
 * Thu May 22 2008 Christopher Stone <chris.stone at gmail.com> 2.4.6-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 May 2008 01:58:03 -0000	1.5
+++ sources	13 Sep 2008 00:46:38 -0000	1.6
@@ -1 +1 @@
-a1da8d9fef3c4ca4821998bd747b2d59  Pager-2.4.6.tgz
+412ca32d9c3e5038a801032e5ddc9b90  Pager-2.4.7.tgz



From xulchris at fedoraproject.org  Sat Sep 13 00:47:09 2008
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Sat, 13 Sep 2008 00:47:09 +0000 (UTC)
Subject: rpms/php-pear-Pager/devel .cvsignore, 1.5, 1.6 php-pear-Pager.spec, 
	1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20080913004709.4D89B70134@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Pager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18160/devel

Modified Files:
	.cvsignore php-pear-Pager.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 May 2008 01:58:21 -0000	1.5
+++ .cvsignore	13 Sep 2008 00:46:39 -0000	1.6
@@ -1 +1 @@
-Pager-2.4.6.tgz
+Pager-2.4.7.tgz


Index: php-pear-Pager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/devel/php-pear-Pager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-pear-Pager.spec	23 May 2008 01:58:21 -0000	1.4
+++ php-pear-Pager.spec	13 Sep 2008 00:46:39 -0000	1.5
@@ -2,7 +2,7 @@
 %define pear_name Pager
 
 Name:           php-pear-Pager
-Version:        2.4.6
+Version:        2.4.7
 Release:        1%{?dist}
 Summary:        Data paging class
 
@@ -80,7 +80,11 @@
 %{pear_testdir}/%{pear_name}
 %{pear_phpdir}/%{pear_name}*
 
+
 %changelog
+* Fri Sep 12 2008 Christopher Stone <chris.stone at gmail.com> 2.4.7-1
+- Upstream sync
+
 * Thu May 22 2008 Christopher Stone <chris.stone at gmail.com> 2.4.6-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Pager/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 May 2008 01:58:21 -0000	1.5
+++ sources	13 Sep 2008 00:46:39 -0000	1.6
@@ -1 +1 @@
-a1da8d9fef3c4ca4821998bd747b2d59  Pager-2.4.6.tgz
+412ca32d9c3e5038a801032e5ddc9b90  Pager-2.4.7.tgz



From ianweller at fedoraproject.org  Sat Sep 13 00:47:16 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Sat, 13 Sep 2008 00:47:16 +0000 (UTC)
Subject: rpms/rsstool/F-9 import.log, NONE, 1.1 rsstool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080913004716.A2CE670134@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/rsstool/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18226/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rsstool.spec 
Log Message:
importing rsstool-1.0.0-1 in F-9


--- NEW FILE import.log ---
rsstool-1_0_0-1_fc9:F-9:rsstool-1.0.0-1.fc9.src.rpm:1221266752


--- NEW FILE rsstool.spec ---
Name:           rsstool
Version:        1.0.0
Release:        1%{?dist}
Summary:        Command-line RSS/Atom parser and generator

Group:          Applications/Internet
License:        GPLv2+
URL:            http://rsstool.y7.ath.cx/
Source0:        http://download.berlios.de/%{name}/%{name}-%{version}-src.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libxml2-devel libcurl-devel

%description
rsstool parses and generates RSS and Atom feeds on the command line.


%prep
%setup -q -n %{name}-%{version}-src


%build
cd src
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install -C src DESTDIR=%{buildroot} BINDIR=%{_bindir}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc readme.html changes.html contrib.html faq.html license.html
%{_bindir}/%{name}



%changelog
* Tue Sep 09 2008 Ian Weller <ianweller at gmail.com> 1.0.0-1
- Initial package build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rsstool/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2008 03:19:42 -0000	1.1
+++ .cvsignore	13 Sep 2008 00:46:46 -0000	1.2
@@ -0,0 +1 @@
+rsstool-1.0.0-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rsstool/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 03:19:42 -0000	1.1
+++ sources	13 Sep 2008 00:46:46 -0000	1.2
@@ -0,0 +1 @@
+a3e003045d051491150385f556467a42  rsstool-1.0.0-src.tar.gz



From ianweller at fedoraproject.org  Sat Sep 13 00:58:21 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Sat, 13 Sep 2008 00:58:21 +0000 (UTC)
Subject: rpms/rsstool/EL-4 rsstool.spec,1.1,1.2
Message-ID: <20080913005821.61E4970134@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/rsstool/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19168

Modified Files:
	rsstool.spec 
Log Message:
Fix build require (1.0.0-1.1)


Index: rsstool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsstool/EL-4/rsstool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rsstool.spec	13 Sep 2008 00:39:20 -0000	1.1
+++ rsstool.spec	13 Sep 2008 00:57:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           rsstool
 Version:        1.0.0
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Command-line RSS/Atom parser and generator
 
 Group:          Applications/Internet
@@ -9,7 +9,7 @@
 Source0:        http://download.berlios.de/%{name}/%{name}-%{version}-src.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libxml2-devel libcurl-devel
+BuildRequires:  libxml2-devel libcurl
 
 %description
 rsstool parses and generates RSS and Atom feeds on the command line.
@@ -42,5 +42,8 @@
 
 
 %changelog
+* Fri Sep 12 2008 Ian Weller <ianweller at gmail.com> 1.0.0-1.1
+- Fix build require
+
 * Tue Sep 09 2008 Ian Weller <ianweller at gmail.com> 1.0.0-1
 - Initial package build.



From ianweller at fedoraproject.org  Sat Sep 13 01:07:57 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Sat, 13 Sep 2008 01:07:57 +0000 (UTC)
Subject: rpms/rsstool/EL-4 rsstool.spec,1.2,1.3
Message-ID: <20080913010757.CA20C70134@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/rsstool/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20072

Modified Files:
	rsstool.spec 
Log Message:
Fix build require, again (1.0.0-1.2)


Index: rsstool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsstool/EL-4/rsstool.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rsstool.spec	13 Sep 2008 00:57:49 -0000	1.2
+++ rsstool.spec	13 Sep 2008 01:07:26 -0000	1.3
@@ -9,7 +9,7 @@
 Source0:        http://download.berlios.de/%{name}/%{name}-%{version}-src.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libxml2-devel libcurl
+BuildRequires:  libxml2-devel curl-devel
 
 %description
 rsstool parses and generates RSS and Atom feeds on the command line.
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Fri Sep 12 2008 Ian Weller <ianweller at gmail.com> 1.0.0-1.2
+- Attempt to fix build require again
+
 * Fri Sep 12 2008 Ian Weller <ianweller at gmail.com> 1.0.0-1.1
 - Fix build require
 



From ianweller at fedoraproject.org  Sat Sep 13 01:09:34 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Sat, 13 Sep 2008 01:09:34 +0000 (UTC)
Subject: rpms/rsstool/EL-4 rsstool.spec,1.3,1.4
Message-ID: <20080913010934.6633F70134@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/rsstool/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20245

Modified Files:
	rsstool.spec 
Log Message:
I suck!


Index: rsstool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsstool/EL-4/rsstool.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rsstool.spec	13 Sep 2008 01:07:26 -0000	1.3
+++ rsstool.spec	13 Sep 2008 01:09:04 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rsstool
 Version:        1.0.0
-Release:        1%{?dist}.1
+Release:        1%{?dist}.2
 Summary:        Command-line RSS/Atom parser and generator
 
 Group:          Applications/Internet



From spot at fedoraproject.org  Sat Sep 13 01:19:21 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 13 Sep 2008 01:19:21 +0000 (UTC)
Subject: rpms/tcl-snack/F-8 snack2.2.10-extracflags.patch, NONE,
	1.1 snack2.2.10-nomp3.patch, NONE,
	1.1 snack2.2.10-shared-stubs.patch, NONE, 1.1 tcl-snack.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080913011922.0374A70134@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-snack/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20645/F-8

Modified Files:
	sources 
Added Files:
	snack2.2.10-extracflags.patch snack2.2.10-nomp3.patch 
	snack2.2.10-shared-stubs.patch tcl-snack.spec 
Log Message:
initial branching

snack2.2.10-extracflags.patch:

--- NEW FILE snack2.2.10-extracflags.patch ---
diff -up snack2.2.10/unix/Makefile.in.BAD snack2.2.10/unix/Makefile.in
--- snack2.2.10/unix/Makefile.in.BAD	2008-06-11 15:26:32.000000000 -0400
+++ snack2.2.10/unix/Makefile.in	2008-06-11 15:26:55.000000000 -0400
@@ -31,7 +31,9 @@ CC        = @CC@
 
 INCLUDES  = ${XINCLUDES} @TCL_INCLUDE_SPEC@ -I${TCL_INCPATH} -I${TK_INCPATH} @AINC@ @NISTINC@
 
-CFLAGS    = -O @CFLAGS@ @AFLAG@ ${INCLUDES} @TCLAPI@ -I${GENERIC_DIR} @DEFS@
+EXTRACFLAGS =
+
+CFLAGS    = -O @CFLAGS@ @AFLAG@ ${INCLUDES} ${EXTRACFLAGS} @TCLAPI@ -I${GENERIC_DIR} @DEFS@
 
 LIBSO     = -lc @ALIB@ @TCL_LIB_SPEC@
 

snack2.2.10-nomp3.patch:

--- NEW FILE snack2.2.10-nomp3.patch ---
diff -up snack2.2.10/doc/python-man.html.BAD snack2.2.10/doc/python-man.html
--- snack2.2.10/doc/python-man.html.BAD	2008-06-11 15:12:44.000000000 -0400
+++ snack2.2.10/doc/python-man.html	2008-06-11 15:13:47.000000000 -0400
@@ -158,7 +158,7 @@ than or equal to 1, or <tt>"Mono"</tt> o
 be read -- not all of them can be&nbsp;<emph>written</emph>.)</dd>
   <ul type="">
  <li> "WAV"</li>
-  <li> "MP3"</li>
+  <li> "MP3" (MP3 support is disabled in Fedora releases)</li>
   <li> "AU"</li>
   <li> "SND"</li>
   <li> "AIFF"</li>
@@ -381,7 +381,7 @@ operation</td>
   
 <h4> read (<i>filename</i>)</h4>
  Reads new sound data from a file. Current supported file formats are WAV, 
-MP3, AU, SND, AIFF, SD, SMP, CSL, and RAW binary. The command returns the 
+MP3 (disabled in Fedora), AU, SND, AIFF, SD, SMP, CSL, and RAW binary. The command returns the 
 file format detected. It is possible to force a file to be read as RAW using
 by setting the option <b>fileformat=RAW</b>. In this case, properties of
 the sound data can be specified by hand, using the <b>rate, channels, encoding,
diff -up snack2.2.10/generic/jkSound.h.BAD snack2.2.10/generic/jkSound.h
--- snack2.2.10/generic/jkSound.h.BAD	2008-06-11 15:15:03.000000000 -0400
+++ snack2.2.10/generic/jkSound.h	2008-06-11 15:15:44.000000000 -0400
@@ -413,6 +413,9 @@ extern int swapCmd(Sound *s, Tcl_Interp 
 #define MP3_STRING "MP3"
 #define CSL_STRING "CSL"
 
+/* 
+ * MP3 code is disabled due to patents.
+ *
 extern char *GuessMP3File(char *buf, int len);
 
 extern int GetMP3Header(Sound *s, Tcl_Interp *interp, Tcl_Channel ch,
@@ -434,6 +437,8 @@ extern void FreeMP3Header(Sound *s);
 
 extern int ConfigMP3Header(Sound *s, Tcl_Interp *interp, int objc,
 			   Tcl_Obj *CONST objv[]);
+ */
+
 
 typedef enum {
   SNACK_WIN_HAMMING,
diff -up snack2.2.10/unix/Makefile.in.BAD snack2.2.10/unix/Makefile.in
--- snack2.2.10/unix/Makefile.in.BAD	2008-06-11 15:09:59.000000000 -0400
+++ snack2.2.10/unix/Makefile.in	2008-06-11 15:10:14.000000000 -0400
@@ -43,13 +43,13 @@ SHLIB_SUFFIX = @SHLIB_SUFFIX@
 all: libsound${SHLIB_SUFFIX} libsnack${SHLIB_SUFFIX} @DOSTUBLIB@ @LIBNIST@ @LIBOGG@ editversion
 
 OBJSO = sound.o jkSound.o jkSoundEngine.o jkSoundEdit.o jkSoundFile.o \
-	g711.o @AOBJ@ jkFormatMP3.o jkSoundProc.o ffa.o jkPitchCmd.o \
+	g711.o @AOBJ@ jkSoundProc.o ffa.o jkPitchCmd.o \
 	@STUBINITOBJ@ jkAudio.o jkMixer.o shape.o jkFilter.o jkSynthesis.o \
 	jkFilterIIR.o jkGetF0.o sigproc.o jkFormant.o sigproc2.o
 
 OBJSN = snack.o jkSound.o jkSoundEngine.o jkSoundEdit.o jkSoundFile.o \
 	jkCanvSpeg.o jkCanvWave.o jkCanvSect.o ffa.o g711.o @AOBJ@ \
-	jkFormatMP3.o jkSoundProc.o jkPitchCmd.o @STUBINITOBJ@ \
+	jkSoundProc.o jkPitchCmd.o @STUBINITOBJ@ \
 	jkAudio.o jkMixer.o shape.o jkFilter.o jkSynthesis.o jkFilterIIR.o \
 	jkGetF0.o sigproc.o jkFormant.o sigproc2.o
 
@@ -73,9 +73,6 @@ jkSoundFile.o: $(GENERIC_DIR)/jkSoundFil
 g711.o: $(GENERIC_DIR)/g711.c
 	$(CC) -c $(CFLAGS) $(GENERIC_DIR)/g711.c
 
-jkFormatMP3.o: $(GENERIC_DIR)/jkFormatMP3.c
-	$(CC) -c $(CFLAGS) $(GENERIC_DIR)/jkFormatMP3.c
-
 jkSoundProc.o: $(GENERIC_DIR)/jkSoundProc.c
 	$(CC) -c $(CFLAGS) $(GENERIC_DIR)/jkSoundProc.c
 
diff -up snack2.2.10/unix/snack.tcl.BAD snack2.2.10/unix/snack.tcl
--- snack2.2.10/unix/snack.tcl.BAD	2008-06-11 15:10:44.000000000 -0400
+++ snack2.2.10/unix/snack.tcl	2008-06-11 15:11:26.000000000 -0400
@@ -216,7 +216,7 @@ namespace eval snack {
 	if {$::tcl_platform(platform) == "windows"} {
 	    set l [concat {{{MS Wav Files} {.wav}} {{Smp Files} {.smp}} {{Snd Files} {.snd}} {{AU Files} {.au}} {{AIFF Files} {.aif}} {{AIFF Files} {.aiff}} {{Waves Files} {.sd}} {{MP3 Files} {.mp3}} {{CSL Files} {.nsp}}} $loadTypes {{{All Files} * }}]
 	} else {
-	    set l [concat {{{MS Wav Files} {.wav .WAV}} {{Smp Files} {.smp .SMP}} {{Snd Files} {.snd .SND}} {{AU Files} {.au .AU}} {{AIFF Files} {.aif .AIF}} {{AIFF Files} {.aiff .AIFF}} {{Waves Files} {.sd .SD}} {{MP3 Files} {.mp3 .MP3}} {{CSL Files} {.nsp .NSP}}} $loadTypes {{{All Files} * }}]
+	    set l [concat {{{MS Wav Files} {.wav .WAV}} {{Smp Files} {.smp .SMP}} {{Snd Files} {.snd .SND}} {{AU Files} {.au .AU}} {{AIFF Files} {.aif .AIF}} {{AIFF Files} {.aiff .AIFF}} {{Waves Files} {.sd .SD}} {{CSL Files} {.nsp .NSP}}} $loadTypes {{{All Files} * }}]
 	}
 	return [swapListElem $l $filebox(l$fmt)]
     }
@@ -229,7 +229,6 @@ namespace eval snack {
     set filebox(SD) .sd
     set filebox(SND) .snd
     set filebox(AIFF) .aif
-    set filebox(MP3) .mp3
     set filebox(CSL) .nsp
 
     set filebox(lWAV) 0
@@ -239,7 +238,7 @@ namespace eval snack {
     set filebox(lAIFF)  4
     # skip 2 because of aif and aiff
     set filebox(lSD)  6
-    set filebox(lMP3)  7
+    # skip 1 because of mp3
     set filebox(lCSL)  8
     set filebox(lRAW) end
     # Do not forget to update indexes
@@ -350,7 +349,6 @@ namespace eval snack {
     set filebox(.sd) SD
     set filebox(.aif) AIFF
     set filebox(.aiff) AIFF
-    set filebox(.mp3) MP3
     set filebox(.nsp) CSL
     set filebox() WAV
 
diff -up snack2.2.10/generic/jkSoundFile.c.BAD snack2.2.10/generic/jkSoundFile.c
--- snack2.2.10/generic/jkSoundFile.c.BAD	2008-06-11 15:22:35.000000000 -0400
+++ snack2.2.10/generic/jkSoundFile.c	2008-06-11 15:24:16.000000000 -0400
@@ -35,9 +35,11 @@ GuessWavFile(char *buf, int len)
 {
   if (len < 21) return(QUE_STRING);
   if (strncasecmp("RIFF", buf, strlen("RIFF")) == 0) {
+/*
     if (buf[20] == 85) {
       return(MP3_STRING);
     }
+*/
     if (strncasecmp("WAVE", &buf[8], strlen("WAVE")) == 0) {
       return(WAV_STRING);
     }
@@ -3305,6 +3307,8 @@ Snack_FileFormat snackRawFormat = {
   (Snack_FileFormat *) NULL
 };
 
+/*
+
 Snack_FileFormat snackMp3Format = {
   MP3_STRING,
   GuessMP3File,
@@ -3321,6 +3325,8 @@ Snack_FileFormat snackMp3Format = {
   (Snack_FileFormat *) NULL
 };
 
+*/
+
 Snack_FileFormat snackSmpFormat = {
   SMP_STRING,
   GuessSmpFile,
@@ -3427,15 +3433,13 @@ SnackDefineFileFormats(Tcl_Interp *inter
   snackAuFormat.nextPtr   = &snackSmpFormat;
   snackSmpFormat.nextPtr  = &snackCslFormat;
   snackCslFormat.nextPtr  = &snackSdFormat;
-  snackSdFormat.nextPtr   = &snackMp3Format;
-  snackMp3Format.nextPtr  = &snackRawFormat;
+  snackSdFormat.nextPtr   = &snackRawFormat;
   snackRawFormat.nextPtr  = NULL;
 }
 */
 {
   snackFileFormats        = &snackWavFormat;
-  snackWavFormat.nextPtr  = &snackMp3Format;
-  snackMp3Format.nextPtr  = &snackAiffFormat;
+  snackWavFormat.nextPtr  = &snackAiffFormat;
   snackAiffFormat.nextPtr = &snackAuFormat;
   snackAuFormat.nextPtr   = &snackSmpFormat;
   snackSmpFormat.nextPtr  = &snackCslFormat;

snack2.2.10-shared-stubs.patch:

--- NEW FILE snack2.2.10-shared-stubs.patch ---
diff -up snack2.2.10/unix/configure.shared-stubs snack2.2.10/unix/configure
--- snack2.2.10/unix/configure.shared-stubs	2008-06-11 16:33:05.000000000 -0400
+++ snack2.2.10/unix/configure	2008-06-11 16:33:33.000000000 -0400
@@ -1663,7 +1663,7 @@ echo "${ECHO_T}will use stubs (normal)" 
     TCL_LIB_SPEC="${TCL_STUB_LIB_SPEC}"
     TK_LIB_SPEC="${TK_STUB_LIB_SPEC}"
     STUBINITOBJ="snackStubInit.o"
-    DOSTUBLIB="stublib"
+    DOSTUBLIB="libsnackstub$SNACK_VERSION${SHLIB_SUFFIX}"
     SNACK_STUB_LIB_FLAG="-lsnackstub$SNACK_VERSION"
     if test "$TCLVER" = "8.0"; then
         { echo "$as_me:$LINENO: WARNING: \"You probably forgot to specify --disable-stubs\"" >&5
diff -up snack2.2.10/unix/Makefile.in.shared-stubs snack2.2.10/unix/Makefile.in
--- snack2.2.10/unix/Makefile.in.shared-stubs	2008-06-11 16:29:57.000000000 -0400
+++ snack2.2.10/unix/Makefile.in	2008-06-11 16:32:36.000000000 -0400
@@ -164,8 +164,9 @@ libsnack${SHLIB_SUFFIX}: ${OBJSN}
 	${SHLIB_LD} ${OBJSN} ${LIBSN} -o libsnack${SHLIB_SUFFIX} 
 	sed s/.dll/${SHLIB_SUFFIX}/ < $(UNIX_DIR)/pkgIndex.tcl.dll > pkgIndex.tcl
 
-stublib: ${OBJSNST}
-	ar cr libsnackstub${VERSION}.a ${OBJSNST}
+libsnackstub${VERSION}${SHLIB_SUFFIX}: ${OBJSNST}
+	${SHLIB_LD} ${OBJSNST} -o libsnackstub${VERSION}${SHLIB_SUFFIX}
+#	ar cr libsnackstub${VERSION}.a ${OBJSNST}
 
 editversion: ${OBJSN}
 	if test "$(TCL_VERSION)" != "8.4"; then\
@@ -310,7 +311,7 @@ install:
         fi;
 	cp -f libsound${SHLIB_SUFFIX} ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/
 	cp -f libsnack${SHLIB_SUFFIX} ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/
-	if test -f libsnackstub${VERSION}.a; then cp -f libsnackstub${VERSION}.a ${DESTDIR}${SNACK_INSTALL_PATH}/; fi
+	if test -f libsnackstub${VERSION}${SHLIB_SUFFIX}; then cp -f libsnackstub${VERSION}${SHLIB_SUFFIX} ${DESTDIR}${SNACK_INSTALL_PATH}/; fi
 	if test -f libsnacksphere${SHLIB_SUFFIX}; then cp -f libsnacksphere${SHLIB_SUFFIX} ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/; fi
 	if test -f libsnackogg${SHLIB_SUFFIX}; then cp -f libsnackogg${SHLIB_SUFFIX} ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/; fi
 	cp -f $(UNIX_DIR)/snack.tcl ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/


--- NEW FILE tcl-snack.spec ---
%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define realname snack

Name:		tcl-%{realname}
Version:	2.2.10
Release:	2%{?dist}
Summary:	Sound toolkit
Group:		System Environment/Libraries
License:	GPLv2+
URL:		http://www.speech.kth.se/snack/
# The upstream source has two files which implement MP3 decoding.
# ./generic/jkFormatMP3.c and ./generic/jkFormatMP3.h
# Due to patent concerns, we cannot ship that code, thus, the modified tarball.
# Those files are not present in the tarball, all other related removals is done 
# with a patch.
# Upstream source can be found here: http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz
Source0:	%{realname}%{version}-nomp3.tar.gz
Patch0:		snack2.2.10-nomp3.patch
Patch1:		snack2.2.10-extracflags.patch
Patch2:		snack2.2.10-shared-stubs.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	tcl-devel, tk-devel, alsa-lib-devel, libogg-devel, libvorbis-devel
BuildRequires:	python-devel
Requires:	tcl(abi) = 8.5
Provides:	%{realname} = %{version}-%{release}

%description
The Snack Sound Toolkit is designed to be used with a scripting language such 
as Tcl/Tk or Python. Using Snack you can create powerful multi-platform audio 
applications with just a few lines of code. Snack has commands for basic sound 
handling, such as playback, recording, file and socket I/O. Snack also provides 
primitives for sound visualization, e.g. waveforms and spectrograms. It was 
developed mainly to handle digital recordings of speech, but is just as useful 
for general audio. Snack has also successfully been applied to other 
one-dimensional signals. The combination of Snack and a scripting language 
makes it possible to create sound tools and applications with a minimum of 
effort. This is due to the rapid development nature of scripting languages. As 
a bonus you get an application that is cross-platform from start. It is also 
easy to integrate Snack based applications with existing sound analysis 
software.

%package -n python-%{realname}
Summary:	Python bindings for Snack Sound Toolkit
Group:		System Environment/Libraries
Requires:	%{name} = %{version}-%{release}

%description -n python-%{realname}
This package contains python bindings for the Snack Sound Toolkit. Tcl, Tk, and
Tkinter are also required to use Snack.

%prep
%setup -q -n %{realname}%{version}
%patch0 -p1 -b .nomp3
%patch1 -p1 -b .extracflags
%patch2 -p1 -b .shared-stubs
chmod -x generic/*.c generic/*.h unix/*.c COPYING README demos/python/*
iconv -f iso-8859-1 -t utf-8 -o README{.utf8,}
mv README{.utf8,}
sed -i -e 's|\r||g' demos/python/*.txt

%build
cd unix/
%configure --disable-static --enable-alsa --with-tcl=%{_libdir} --with-tk=%{_libdir} --with-ogg-include=%{_includedir} --with-ogg-lib=%{_libdir}
make %{?_smp_mflags} EXTRACFLAGS="%{optflags}"
cd ../python
%{__python} setup.py build

%install
rm -rf %{buildroot}
cd unix/
make install DESTDIR=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'
cd ../python
%{__python} setup.py install --skip-build --root %{buildroot}
install -d %{buildroot}%{tcl_sitearch}
mv %{buildroot}%{_libdir}/%{realname}2.2 %{buildroot}%{tcl_sitearch}/%{realname}2.2
chmod -x %{buildroot}%{tcl_sitearch}/%{realname}2.2/snack.tcl

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_libdir}/libsnackstub2.2.so
%{tcl_sitearch}/%{realname}2.2/

%files -n python-%{realname}
%defattr(-,root,root,-)
%doc doc/python-man.html demos/python/
%{python_sitelib}/tkSnack*

%changelog
* Mon Aug  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-2
- add BR: python

* Wed Jun 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-1
- Initial package for Fedora



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-snack/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 21:11:41 -0000	1.1
+++ sources	13 Sep 2008 01:18:50 -0000	1.2
@@ -0,0 +1 @@
+14ded94e2e93a28585e48536b7044ae5  snack2.2.10-nomp3.tar.gz



From spot at fedoraproject.org  Sat Sep 13 01:19:21 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 13 Sep 2008 01:19:21 +0000 (UTC)
Subject: rpms/tcl-snack/F-9 snack2.2.10-extracflags.patch, NONE,
	1.1 snack2.2.10-nomp3.patch, NONE,
	1.1 snack2.2.10-shared-stubs.patch, NONE, 1.1 tcl-snack.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080913011922.0982270136@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-snack/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20645/F-9

Modified Files:
	sources 
Added Files:
	snack2.2.10-extracflags.patch snack2.2.10-nomp3.patch 
	snack2.2.10-shared-stubs.patch tcl-snack.spec 
Log Message:
initial branching

snack2.2.10-extracflags.patch:

--- NEW FILE snack2.2.10-extracflags.patch ---
diff -up snack2.2.10/unix/Makefile.in.BAD snack2.2.10/unix/Makefile.in
--- snack2.2.10/unix/Makefile.in.BAD	2008-06-11 15:26:32.000000000 -0400
+++ snack2.2.10/unix/Makefile.in	2008-06-11 15:26:55.000000000 -0400
@@ -31,7 +31,9 @@ CC        = @CC@
 
 INCLUDES  = ${XINCLUDES} @TCL_INCLUDE_SPEC@ -I${TCL_INCPATH} -I${TK_INCPATH} @AINC@ @NISTINC@
 
-CFLAGS    = -O @CFLAGS@ @AFLAG@ ${INCLUDES} @TCLAPI@ -I${GENERIC_DIR} @DEFS@
+EXTRACFLAGS =
+
+CFLAGS    = -O @CFLAGS@ @AFLAG@ ${INCLUDES} ${EXTRACFLAGS} @TCLAPI@ -I${GENERIC_DIR} @DEFS@
 
 LIBSO     = -lc @ALIB@ @TCL_LIB_SPEC@
 

snack2.2.10-nomp3.patch:

--- NEW FILE snack2.2.10-nomp3.patch ---
diff -up snack2.2.10/doc/python-man.html.BAD snack2.2.10/doc/python-man.html
--- snack2.2.10/doc/python-man.html.BAD	2008-06-11 15:12:44.000000000 -0400
+++ snack2.2.10/doc/python-man.html	2008-06-11 15:13:47.000000000 -0400
@@ -158,7 +158,7 @@ than or equal to 1, or <tt>"Mono"</tt> o
 be read -- not all of them can be&nbsp;<emph>written</emph>.)</dd>
   <ul type="">
  <li> "WAV"</li>
-  <li> "MP3"</li>
+  <li> "MP3" (MP3 support is disabled in Fedora releases)</li>
   <li> "AU"</li>
   <li> "SND"</li>
   <li> "AIFF"</li>
@@ -381,7 +381,7 @@ operation</td>
   
 <h4> read (<i>filename</i>)</h4>
  Reads new sound data from a file. Current supported file formats are WAV, 
-MP3, AU, SND, AIFF, SD, SMP, CSL, and RAW binary. The command returns the 
+MP3 (disabled in Fedora), AU, SND, AIFF, SD, SMP, CSL, and RAW binary. The command returns the 
 file format detected. It is possible to force a file to be read as RAW using
 by setting the option <b>fileformat=RAW</b>. In this case, properties of
 the sound data can be specified by hand, using the <b>rate, channels, encoding,
diff -up snack2.2.10/generic/jkSound.h.BAD snack2.2.10/generic/jkSound.h
--- snack2.2.10/generic/jkSound.h.BAD	2008-06-11 15:15:03.000000000 -0400
+++ snack2.2.10/generic/jkSound.h	2008-06-11 15:15:44.000000000 -0400
@@ -413,6 +413,9 @@ extern int swapCmd(Sound *s, Tcl_Interp 
 #define MP3_STRING "MP3"
 #define CSL_STRING "CSL"
 
+/* 
+ * MP3 code is disabled due to patents.
+ *
 extern char *GuessMP3File(char *buf, int len);
 
 extern int GetMP3Header(Sound *s, Tcl_Interp *interp, Tcl_Channel ch,
@@ -434,6 +437,8 @@ extern void FreeMP3Header(Sound *s);
 
 extern int ConfigMP3Header(Sound *s, Tcl_Interp *interp, int objc,
 			   Tcl_Obj *CONST objv[]);
+ */
+
 
 typedef enum {
   SNACK_WIN_HAMMING,
diff -up snack2.2.10/unix/Makefile.in.BAD snack2.2.10/unix/Makefile.in
--- snack2.2.10/unix/Makefile.in.BAD	2008-06-11 15:09:59.000000000 -0400
+++ snack2.2.10/unix/Makefile.in	2008-06-11 15:10:14.000000000 -0400
@@ -43,13 +43,13 @@ SHLIB_SUFFIX = @SHLIB_SUFFIX@
 all: libsound${SHLIB_SUFFIX} libsnack${SHLIB_SUFFIX} @DOSTUBLIB@ @LIBNIST@ @LIBOGG@ editversion
 
 OBJSO = sound.o jkSound.o jkSoundEngine.o jkSoundEdit.o jkSoundFile.o \
-	g711.o @AOBJ@ jkFormatMP3.o jkSoundProc.o ffa.o jkPitchCmd.o \
+	g711.o @AOBJ@ jkSoundProc.o ffa.o jkPitchCmd.o \
 	@STUBINITOBJ@ jkAudio.o jkMixer.o shape.o jkFilter.o jkSynthesis.o \
 	jkFilterIIR.o jkGetF0.o sigproc.o jkFormant.o sigproc2.o
 
 OBJSN = snack.o jkSound.o jkSoundEngine.o jkSoundEdit.o jkSoundFile.o \
 	jkCanvSpeg.o jkCanvWave.o jkCanvSect.o ffa.o g711.o @AOBJ@ \
-	jkFormatMP3.o jkSoundProc.o jkPitchCmd.o @STUBINITOBJ@ \
+	jkSoundProc.o jkPitchCmd.o @STUBINITOBJ@ \
 	jkAudio.o jkMixer.o shape.o jkFilter.o jkSynthesis.o jkFilterIIR.o \
 	jkGetF0.o sigproc.o jkFormant.o sigproc2.o
 
@@ -73,9 +73,6 @@ jkSoundFile.o: $(GENERIC_DIR)/jkSoundFil
 g711.o: $(GENERIC_DIR)/g711.c
 	$(CC) -c $(CFLAGS) $(GENERIC_DIR)/g711.c
 
-jkFormatMP3.o: $(GENERIC_DIR)/jkFormatMP3.c
-	$(CC) -c $(CFLAGS) $(GENERIC_DIR)/jkFormatMP3.c
-
 jkSoundProc.o: $(GENERIC_DIR)/jkSoundProc.c
 	$(CC) -c $(CFLAGS) $(GENERIC_DIR)/jkSoundProc.c
 
diff -up snack2.2.10/unix/snack.tcl.BAD snack2.2.10/unix/snack.tcl
--- snack2.2.10/unix/snack.tcl.BAD	2008-06-11 15:10:44.000000000 -0400
+++ snack2.2.10/unix/snack.tcl	2008-06-11 15:11:26.000000000 -0400
@@ -216,7 +216,7 @@ namespace eval snack {
 	if {$::tcl_platform(platform) == "windows"} {
 	    set l [concat {{{MS Wav Files} {.wav}} {{Smp Files} {.smp}} {{Snd Files} {.snd}} {{AU Files} {.au}} {{AIFF Files} {.aif}} {{AIFF Files} {.aiff}} {{Waves Files} {.sd}} {{MP3 Files} {.mp3}} {{CSL Files} {.nsp}}} $loadTypes {{{All Files} * }}]
 	} else {
-	    set l [concat {{{MS Wav Files} {.wav .WAV}} {{Smp Files} {.smp .SMP}} {{Snd Files} {.snd .SND}} {{AU Files} {.au .AU}} {{AIFF Files} {.aif .AIF}} {{AIFF Files} {.aiff .AIFF}} {{Waves Files} {.sd .SD}} {{MP3 Files} {.mp3 .MP3}} {{CSL Files} {.nsp .NSP}}} $loadTypes {{{All Files} * }}]
+	    set l [concat {{{MS Wav Files} {.wav .WAV}} {{Smp Files} {.smp .SMP}} {{Snd Files} {.snd .SND}} {{AU Files} {.au .AU}} {{AIFF Files} {.aif .AIF}} {{AIFF Files} {.aiff .AIFF}} {{Waves Files} {.sd .SD}} {{CSL Files} {.nsp .NSP}}} $loadTypes {{{All Files} * }}]
 	}
 	return [swapListElem $l $filebox(l$fmt)]
     }
@@ -229,7 +229,6 @@ namespace eval snack {
     set filebox(SD) .sd
     set filebox(SND) .snd
     set filebox(AIFF) .aif
-    set filebox(MP3) .mp3
     set filebox(CSL) .nsp
 
     set filebox(lWAV) 0
@@ -239,7 +238,7 @@ namespace eval snack {
     set filebox(lAIFF)  4
     # skip 2 because of aif and aiff
     set filebox(lSD)  6
-    set filebox(lMP3)  7
+    # skip 1 because of mp3
     set filebox(lCSL)  8
     set filebox(lRAW) end
     # Do not forget to update indexes
@@ -350,7 +349,6 @@ namespace eval snack {
     set filebox(.sd) SD
     set filebox(.aif) AIFF
     set filebox(.aiff) AIFF
-    set filebox(.mp3) MP3
     set filebox(.nsp) CSL
     set filebox() WAV
 
diff -up snack2.2.10/generic/jkSoundFile.c.BAD snack2.2.10/generic/jkSoundFile.c
--- snack2.2.10/generic/jkSoundFile.c.BAD	2008-06-11 15:22:35.000000000 -0400
+++ snack2.2.10/generic/jkSoundFile.c	2008-06-11 15:24:16.000000000 -0400
@@ -35,9 +35,11 @@ GuessWavFile(char *buf, int len)
 {
   if (len < 21) return(QUE_STRING);
   if (strncasecmp("RIFF", buf, strlen("RIFF")) == 0) {
+/*
     if (buf[20] == 85) {
       return(MP3_STRING);
     }
+*/
     if (strncasecmp("WAVE", &buf[8], strlen("WAVE")) == 0) {
       return(WAV_STRING);
     }
@@ -3305,6 +3307,8 @@ Snack_FileFormat snackRawFormat = {
   (Snack_FileFormat *) NULL
 };
 
+/*
+
 Snack_FileFormat snackMp3Format = {
   MP3_STRING,
   GuessMP3File,
@@ -3321,6 +3325,8 @@ Snack_FileFormat snackMp3Format = {
   (Snack_FileFormat *) NULL
 };
 
+*/
+
 Snack_FileFormat snackSmpFormat = {
   SMP_STRING,
   GuessSmpFile,
@@ -3427,15 +3433,13 @@ SnackDefineFileFormats(Tcl_Interp *inter
   snackAuFormat.nextPtr   = &snackSmpFormat;
   snackSmpFormat.nextPtr  = &snackCslFormat;
   snackCslFormat.nextPtr  = &snackSdFormat;
-  snackSdFormat.nextPtr   = &snackMp3Format;
-  snackMp3Format.nextPtr  = &snackRawFormat;
+  snackSdFormat.nextPtr   = &snackRawFormat;
   snackRawFormat.nextPtr  = NULL;
 }
 */
 {
   snackFileFormats        = &snackWavFormat;
-  snackWavFormat.nextPtr  = &snackMp3Format;
-  snackMp3Format.nextPtr  = &snackAiffFormat;
+  snackWavFormat.nextPtr  = &snackAiffFormat;
   snackAiffFormat.nextPtr = &snackAuFormat;
   snackAuFormat.nextPtr   = &snackSmpFormat;
   snackSmpFormat.nextPtr  = &snackCslFormat;

snack2.2.10-shared-stubs.patch:

--- NEW FILE snack2.2.10-shared-stubs.patch ---
diff -up snack2.2.10/unix/configure.shared-stubs snack2.2.10/unix/configure
--- snack2.2.10/unix/configure.shared-stubs	2008-06-11 16:33:05.000000000 -0400
+++ snack2.2.10/unix/configure	2008-06-11 16:33:33.000000000 -0400
@@ -1663,7 +1663,7 @@ echo "${ECHO_T}will use stubs (normal)" 
     TCL_LIB_SPEC="${TCL_STUB_LIB_SPEC}"
     TK_LIB_SPEC="${TK_STUB_LIB_SPEC}"
     STUBINITOBJ="snackStubInit.o"
-    DOSTUBLIB="stublib"
+    DOSTUBLIB="libsnackstub$SNACK_VERSION${SHLIB_SUFFIX}"
     SNACK_STUB_LIB_FLAG="-lsnackstub$SNACK_VERSION"
     if test "$TCLVER" = "8.0"; then
         { echo "$as_me:$LINENO: WARNING: \"You probably forgot to specify --disable-stubs\"" >&5
diff -up snack2.2.10/unix/Makefile.in.shared-stubs snack2.2.10/unix/Makefile.in
--- snack2.2.10/unix/Makefile.in.shared-stubs	2008-06-11 16:29:57.000000000 -0400
+++ snack2.2.10/unix/Makefile.in	2008-06-11 16:32:36.000000000 -0400
@@ -164,8 +164,9 @@ libsnack${SHLIB_SUFFIX}: ${OBJSN}
 	${SHLIB_LD} ${OBJSN} ${LIBSN} -o libsnack${SHLIB_SUFFIX} 
 	sed s/.dll/${SHLIB_SUFFIX}/ < $(UNIX_DIR)/pkgIndex.tcl.dll > pkgIndex.tcl
 
-stublib: ${OBJSNST}
-	ar cr libsnackstub${VERSION}.a ${OBJSNST}
+libsnackstub${VERSION}${SHLIB_SUFFIX}: ${OBJSNST}
+	${SHLIB_LD} ${OBJSNST} -o libsnackstub${VERSION}${SHLIB_SUFFIX}
+#	ar cr libsnackstub${VERSION}.a ${OBJSNST}
 
 editversion: ${OBJSN}
 	if test "$(TCL_VERSION)" != "8.4"; then\
@@ -310,7 +311,7 @@ install:
         fi;
 	cp -f libsound${SHLIB_SUFFIX} ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/
 	cp -f libsnack${SHLIB_SUFFIX} ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/
-	if test -f libsnackstub${VERSION}.a; then cp -f libsnackstub${VERSION}.a ${DESTDIR}${SNACK_INSTALL_PATH}/; fi
+	if test -f libsnackstub${VERSION}${SHLIB_SUFFIX}; then cp -f libsnackstub${VERSION}${SHLIB_SUFFIX} ${DESTDIR}${SNACK_INSTALL_PATH}/; fi
 	if test -f libsnacksphere${SHLIB_SUFFIX}; then cp -f libsnacksphere${SHLIB_SUFFIX} ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/; fi
 	if test -f libsnackogg${SHLIB_SUFFIX}; then cp -f libsnackogg${SHLIB_SUFFIX} ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/; fi
 	cp -f $(UNIX_DIR)/snack.tcl ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/


--- NEW FILE tcl-snack.spec ---
%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define realname snack

Name:		tcl-%{realname}
Version:	2.2.10
Release:	2%{?dist}
Summary:	Sound toolkit
Group:		System Environment/Libraries
License:	GPLv2+
URL:		http://www.speech.kth.se/snack/
# The upstream source has two files which implement MP3 decoding.
# ./generic/jkFormatMP3.c and ./generic/jkFormatMP3.h
# Due to patent concerns, we cannot ship that code, thus, the modified tarball.
# Those files are not present in the tarball, all other related removals is done 
# with a patch.
# Upstream source can be found here: http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz
Source0:	%{realname}%{version}-nomp3.tar.gz
Patch0:		snack2.2.10-nomp3.patch
Patch1:		snack2.2.10-extracflags.patch
Patch2:		snack2.2.10-shared-stubs.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	tcl-devel, tk-devel, alsa-lib-devel, libogg-devel, libvorbis-devel
BuildRequires:	python-devel
Requires:	tcl(abi) = 8.5
Provides:	%{realname} = %{version}-%{release}

%description
The Snack Sound Toolkit is designed to be used with a scripting language such 
as Tcl/Tk or Python. Using Snack you can create powerful multi-platform audio 
applications with just a few lines of code. Snack has commands for basic sound 
handling, such as playback, recording, file and socket I/O. Snack also provides 
primitives for sound visualization, e.g. waveforms and spectrograms. It was 
developed mainly to handle digital recordings of speech, but is just as useful 
for general audio. Snack has also successfully been applied to other 
one-dimensional signals. The combination of Snack and a scripting language 
makes it possible to create sound tools and applications with a minimum of 
effort. This is due to the rapid development nature of scripting languages. As 
a bonus you get an application that is cross-platform from start. It is also 
easy to integrate Snack based applications with existing sound analysis 
software.

%package -n python-%{realname}
Summary:	Python bindings for Snack Sound Toolkit
Group:		System Environment/Libraries
Requires:	%{name} = %{version}-%{release}

%description -n python-%{realname}
This package contains python bindings for the Snack Sound Toolkit. Tcl, Tk, and
Tkinter are also required to use Snack.

%prep
%setup -q -n %{realname}%{version}
%patch0 -p1 -b .nomp3
%patch1 -p1 -b .extracflags
%patch2 -p1 -b .shared-stubs
chmod -x generic/*.c generic/*.h unix/*.c COPYING README demos/python/*
iconv -f iso-8859-1 -t utf-8 -o README{.utf8,}
mv README{.utf8,}
sed -i -e 's|\r||g' demos/python/*.txt

%build
cd unix/
%configure --disable-static --enable-alsa --with-tcl=%{_libdir} --with-tk=%{_libdir} --with-ogg-include=%{_includedir} --with-ogg-lib=%{_libdir}
make %{?_smp_mflags} EXTRACFLAGS="%{optflags}"
cd ../python
%{__python} setup.py build

%install
rm -rf %{buildroot}
cd unix/
make install DESTDIR=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'
cd ../python
%{__python} setup.py install --skip-build --root %{buildroot}
install -d %{buildroot}%{tcl_sitearch}
mv %{buildroot}%{_libdir}/%{realname}2.2 %{buildroot}%{tcl_sitearch}/%{realname}2.2
chmod -x %{buildroot}%{tcl_sitearch}/%{realname}2.2/snack.tcl

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_libdir}/libsnackstub2.2.so
%{tcl_sitearch}/%{realname}2.2/

%files -n python-%{realname}
%defattr(-,root,root,-)
%doc doc/python-man.html demos/python/
%{python_sitelib}/tkSnack*

%changelog
* Mon Aug  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-2
- add BR: python

* Wed Jun 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-1
- Initial package for Fedora



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-snack/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 21:11:41 -0000	1.1
+++ sources	13 Sep 2008 01:18:51 -0000	1.2
@@ -0,0 +1 @@
+14ded94e2e93a28585e48536b7044ae5  snack2.2.10-nomp3.tar.gz



From ianweller at fedoraproject.org  Sat Sep 13 03:24:44 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Sat, 13 Sep 2008 03:24:44 +0000 (UTC)
Subject: rpms/rsstool/EL-5 rsstool.spec,1.1,1.2
Message-ID: <20080913032445.1E7C670134@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/rsstool/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26672

Modified Files:
	rsstool.spec 
Log Message:
Fix build require (1.0.0-1.1)


Index: rsstool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsstool/EL-5/rsstool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rsstool.spec	13 Sep 2008 00:41:40 -0000	1.1
+++ rsstool.spec	13 Sep 2008 03:24:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           rsstool
 Version:        1.0.0
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Command-line RSS/Atom parser and generator
 
 Group:          Applications/Internet
@@ -9,7 +9,7 @@
 Source0:        http://download.berlios.de/%{name}/%{name}-%{version}-src.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libxml2-devel libcurl-devel
+BuildRequires:  libxml2-devel curl-devel
 
 %description
 rsstool parses and generates RSS and Atom feeds on the command line.
@@ -42,5 +42,8 @@
 
 
 %changelog
+* Fri Sep 12 2008 Ian Weller <ianweller at gmail.com> 1.0.0-1.1
+- Fix build require
+
 * Tue Sep 09 2008 Ian Weller <ianweller at gmail.com> 1.0.0-1
 - Initial package build.



From davej at fedoraproject.org  Sat Sep 13 03:50:21 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Sat, 13 Sep 2008 03:50:21 +0000 (UTC)
Subject: devel/microcode_ctl .cvsignore, 1.11, 1.12 microcode_ctl.spec, 1.45,
	1.46 sources, 1.9, 1.10 microcode-20080220.dat, 1.1, NONE
Message-ID: <20080913035021.215C070134@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/devel/microcode_ctl
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28041

Modified Files:
	.cvsignore microcode_ctl.spec sources 
Removed Files:
	microcode-20080220.dat 
Log Message:
update to microcode 20080910


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/microcode_ctl/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	2 Apr 2008 15:35:58 -0000	1.11
+++ .cvsignore	13 Sep 2008 03:49:50 -0000	1.12
@@ -2,3 +2,4 @@
 microcode_ctl-1.17
 microcode_ctl-1.17.tar.gz
 microcode-20080401.dat
+microcode-20080910.dat


Index: microcode_ctl.spec
===================================================================
RCS file: /cvs/pkgs/devel/microcode_ctl/microcode_ctl.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- microcode_ctl.spec	2 Apr 2008 15:35:58 -0000	1.45
+++ microcode_ctl.spec	13 Sep 2008 03:49:50 -0000	1.46
@@ -10,7 +10,7 @@
 Source1:        microcode_ctl.init
 # Microcode now distributed directly by Intel, at
 # http://downloadcenter.intel.com (just search for microcode)
-Source2:        microcode-20080401.dat
+Source2:        microcode-20080910.dat
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 Requires(pre):  /sbin/chkconfig /sbin/service
 Requires(pre):  grep gawk coreutils
@@ -78,6 +78,9 @@
 exit 0
 
 %changelog
+* Fri Sep 12 2008 Dave Jones <davej at redhat.com>
+- update to microcode 20080910
+
 * Tue Apr 01 2008 Jarod Wilson <jwilson at redhat.com>
 - Update to microcode 20080401
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/microcode_ctl/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	2 Apr 2008 15:35:58 -0000	1.9
+++ sources	13 Sep 2008 03:49:50 -0000	1.10
@@ -1,2 +1,2 @@
 98a7f06acef8459c8ef2a1b0fb86a99e  microcode_ctl-1.17.tar.gz
-9c494d95cdd60aa6381c4f8879ed2bda  microcode-20080401.dat
+85d5b27b7d9d314f8e6780971415e0ca  microcode-20080910.dat


--- microcode-20080220.dat DELETED ---



From davej at fedoraproject.org  Sat Sep 13 03:51:06 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Sat, 13 Sep 2008 03:51:06 +0000 (UTC)
Subject: devel/microcode_ctl .cvsignore,1.12,1.13
Message-ID: <20080913035106.2BE3970134@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/devel/microcode_ctl
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28097

Modified Files:
	.cvsignore 
Log Message:
update to microcode 20080910


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/microcode_ctl/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	13 Sep 2008 03:49:50 -0000	1.12
+++ .cvsignore	13 Sep 2008 03:50:35 -0000	1.13
@@ -1,5 +1,4 @@
 clog
 microcode_ctl-1.17
 microcode_ctl-1.17.tar.gz
-microcode-20080401.dat
 microcode-20080910.dat



From rcritten at fedoraproject.org  Sat Sep 13 03:59:45 2008
From: rcritten at fedoraproject.org (Robert Crittenden)
Date: Sat, 13 Sep 2008 03:59:45 +0000 (UTC)
Subject: rpms/nss_compat_ossl/devel .cvsignore, 1.5, 1.6 nss_compat_ossl.spec,
	1.9, 1.10 sources, 1.5, 1.6 nss_compat_ossl-layer.patch, 1.1, NONE
Message-ID: <20080913035945.9E12070134@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/nss_compat_ossl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28757

Modified Files:
	.cvsignore nss_compat_ossl.spec sources 
Removed Files:
	nss_compat_ossl-layer.patch 
Log Message:
update to 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Oct 2007 02:04:13 -0000	1.5
+++ .cvsignore	13 Sep 2008 03:59:15 -0000	1.6
@@ -1,3 +1 @@
-nss_compat_ossl-0.9.2.tar.gz
-nss_compat_ossl-symbol.patch
-nss_compat_ossl-link.patch
+nss_compat_ossl-0.9.3.tar.gz


Index: nss_compat_ossl.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/nss_compat_ossl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nss_compat_ossl.spec	28 Aug 2008 18:35:40 -0000	1.9
+++ nss_compat_ossl.spec	13 Sep 2008 03:59:15 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           nss_compat_ossl
-Version:        0.9.2
-Release:        6%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        Source-level compatibility library for OpenSSL to NSS porting
 
 Group:          System Environment/Libraries
@@ -8,9 +8,6 @@
 URL:            http://rcritten.fedorapeople.org/nss_compat_ossl.html
 Source0:        http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1:         nss_compat_ossl-symbol.patch
-Patch2:         nss_compat_ossl-link.patch
-Patch3:         nss_compat_ossl-layer.patch
 
 # Need > 3.11.7-7 so we have the NSS PKCS#11 flat-file reader available 
 BuildRequires:  nss-devel > 3.11.7-7
@@ -30,9 +27,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .symbol
-%patch2 -p1 -b .link
-%patch3 -p1 -b .layer
 
 %build
 
@@ -71,6 +65,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Sep 12 2008 Rob Crittenden <rcritten at redhat.com> - 0.9.3-1
+- update to 0.9.3
+
 * Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.9.2-6
 - include /usr/include/nss_compat_ossl directory
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Oct 2007 02:04:13 -0000	1.5
+++ sources	13 Sep 2008 03:59:15 -0000	1.6
@@ -1,3 +1 @@
-84ceb6df62872f8c6df3f2f5657425e6  nss_compat_ossl-0.9.2.tar.gz
-325fcb35ab1475f1d5e40b7ecaf27b60  nss_compat_ossl-symbol.patch
-1f16445aed912d036cc2c26211793c98  nss_compat_ossl-link.patch
+75d55bdbf3b89bc9420415f6446b991b  nss_compat_ossl-0.9.3.tar.gz


--- nss_compat_ossl-layer.patch DELETED ---



From ianweller at fedoraproject.org  Sat Sep 13 04:04:14 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Sat, 13 Sep 2008 04:04:14 +0000 (UTC)
Subject: rpms/rsstool/F-8 rsstool.spec,1.1,1.2
Message-ID: <20080913040414.F1DD170134@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/rsstool/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29159

Modified Files:
	rsstool.spec 
Log Message:
Fix build require (1.0.0-1.1)


Index: rsstool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsstool/F-8/rsstool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rsstool.spec	13 Sep 2008 00:44:48 -0000	1.1
+++ rsstool.spec	13 Sep 2008 04:03:44 -0000	1.2
@@ -9,7 +9,7 @@
 Source0:        http://download.berlios.de/%{name}/%{name}-%{version}-src.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libxml2-devel libcurl-devel
+BuildRequires:  libxml2-devel curl-devel
 
 %description
 rsstool parses and generates RSS and Atom feeds on the command line.
@@ -42,5 +42,8 @@
 
 
 %changelog
+* Fri Sep 12 2008 Ian Weller <ianweller at gmail.com> 1.0.0-1.1
+- Fix build require
+
 * Tue Sep 09 2008 Ian Weller <ianweller at gmail.com> 1.0.0-1
 - Initial package build.



From ianweller at fedoraproject.org  Sat Sep 13 04:05:22 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Sat, 13 Sep 2008 04:05:22 +0000 (UTC)
Subject: rpms/rsstool/F-8 rsstool.spec,1.2,1.3
Message-ID: <20080913040522.01E8D70134@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/rsstool/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29262

Modified Files:
	rsstool.spec 
Log Message:
Actually change release number


Index: rsstool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsstool/F-8/rsstool.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rsstool.spec	13 Sep 2008 04:03:44 -0000	1.2
+++ rsstool.spec	13 Sep 2008 04:04:51 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           rsstool
 Version:        1.0.0
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Command-line RSS/Atom parser and generator
 
 Group:          Applications/Internet



From dwmw2 at fedoraproject.org  Sat Sep 13 04:08:11 2008
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Sat, 13 Sep 2008 04:08:11 +0000 (UTC)
Subject: rpms/bluez/devel bluez-4.5-browse-fixes.patch, NONE, 1.1 bluez.spec,
	1.4, 1.5
Message-ID: <20080913040811.487AC70137@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29598

Modified Files:
	bluez.spec 
Added Files:
	bluez-4.5-browse-fixes.patch 
Log Message:
fix sdp browse problems

bluez-4.5-browse-fixes.patch:

--- NEW FILE bluez-4.5-browse-fixes.patch ---
--- bluez-4.5/src/device.c.orig	2008-09-11 23:59:02.000000000 -0700
+++ bluez-4.5/src/device.c	2008-09-12 21:04:40.000000000 -0700
@@ -977,8 +977,9 @@ static void browse_cb(sdp_list_t *recs, 
 	bdaddr_t src, dst;
 	uuid_t uuid;
 
-	/* Public browsing successful or Single record requested */
-	if (err < 0 || (!req->search_uuid && recs))
+	/* If we have a valid response and req->search_uuid == 1, then
+	   public browsing was successful -- we don't need any more */
+	if (err < 0 || (req->search_uuid == 1 && recs))
 		goto done;
 
 	update_services(req, recs);
@@ -987,8 +988,8 @@ static void browse_cb(sdp_list_t *recs, 
 	str2ba(device->address, &dst);
 
 	/* Search for mandatory uuids */
-	if (uuid_list[++req->search_uuid]) {
-		sdp_uuid16_create(&uuid, uuid_list[req->search_uuid]);
+	if (uuid_list[req->search_uuid]) {
+		sdp_uuid16_create(&uuid, uuid_list[req->search_uuid++]);
 		bt_search_service(&src, &dst, &uuid, browse_cb, user_data, NULL);
 		return;
 	}
@@ -1025,10 +1026,25 @@ static void init_browse(struct browse_re
 
 		for (i = 0; driver->uuids[i]; i++) {
 			char *uuid;
+			int j;
 
+			/* Eliminate duplicates of UUIDs in uuid_list[]... */
+			if (strlen(driver->uuids[i]) == 36 && 
+			    !strncmp(driver->uuids[i], "0000", 4) &&
+			    !strcasecmp(driver->uuids[i] + 8, 
+					"-0000-1000-8000-00805F9B34FB")) {
+				uint16_t uuid16 = strtol(driver->uuids[i],
+							 NULL, 16);
+				for (j = 0; uuid_list[j]; j++) {
+					if (uuid16 == uuid_list[j])
+						continue;
+				}
+					
+			}
+			/* ... and of UUIDs another driver already asked for */
 			if (g_slist_find_custom(req->uuids, driver->uuids[i],
 					(GCompareFunc) strcasecmp))
-				return;
+				continue;
 
 			uuid = g_strdup(driver->uuids[i]);
 			req->uuids = g_slist_append(req->uuids, uuid);
@@ -1062,7 +1078,7 @@ int device_browse(struct btd_device *dev
 		memcpy(&uuid, search, sizeof(uuid_t));
 		cb = search_cb;
 	} else {
-		sdp_uuid16_create(&uuid, uuid_list[req->search_uuid]);
+		sdp_uuid16_create(&uuid, uuid_list[req->search_uuid++]);
 		init_browse(req);
 		cb = browse_cb;
 	}
@@ -1076,7 +1092,7 @@ int device_browse(struct btd_device *dev
 						discover_services_req_exit,
 						device, NULL);
 
-	return bt_search_service(&src, &dst, &uuid, browse_cb, req, NULL);
+	return bt_search_service(&src, &dst, &uuid, cb, req, NULL);
 }
 
 struct btd_adapter *device_get_adapter(struct btd_device *device)


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bluez.spec	12 Sep 2008 22:29:05 -0000	1.4
+++ bluez.spec	13 Sep 2008 04:07:40 -0000	1.5
@@ -1,13 +1,14 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
 Source1: bluetooth.init
 Source2: bluetooth.conf
 Patch1: bluez-utils-oui-usage.patch
+Patch2: bluez-4.5-browse-fixes.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -96,6 +97,7 @@
 
 %setup -q
 %patch1 -p0 -b .oui
+%patch2 -p1
 
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
@@ -181,6 +183,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Fri Sep 12 2008 - David Woodhouse <David.Woodhouse at intel.com> - 4.5-4
+- SDP browse fixes
+
 * Fri Sep 12 2008 - David Woodhouse <David.Woodhouse at intel.com> - 4.5-3
 - Bluez-alsa needs to provide/obsolete bluez-utils-alsa
 - Use versioned Obsoletes:



From cebbert at fedoraproject.org  Sat Sep 13 04:14:56 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 13 Sep 2008 04:14:56 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-usb-fix-hcd-interrupt-disabling.patch, 
	NONE, 1.1 kernel.spec, 1.948, 1.949
Message-ID: <20080913041456.9426670134@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30331

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-usb-fix-hcd-interrupt-disabling.patch 
Log Message:
Fix hang in installer on PS3. (#458910)

linux-2.6-usb-fix-hcd-interrupt-disabling.patch:

--- NEW FILE linux-2.6-usb-fix-hcd-interrupt-disabling.patch ---
>From geoffrey.levand at am.sony.com  Wed Aug 27 10:58:58 2008
From: Geoff Levand <geoffrey.levand at am.sony.com>
Date: Fri, 22 Aug 2008 14:13:00 -0700
Subject: USB: fix hcd interrupt disabling
To: Greg Kroah-Hartman <gregkh at suse.de>
Cc: linux-usb at vger.kernel.org, Stefan Becker <Stefan.Becker at nokia.com>
Message-ID: <48AF2BDC.7090507 at am.sony.com>

From: Geoff Levand <geoffrey.levand at am.sony.com>

Commit de85422b94ddb23c021126815ea49414047c13dc, 'USB: fix interrupt
disabling for HCDs with shared interrupt handlers' changed usb_add_hcd()
to strip IRQF_DISABLED from irqflags prior to calling request_irq()
with the justification that such a removal was necessary for shared
interrupts to work properly.  Unfortunately, the change in that commit
unconditionally removes the IRQF_DISABLED flag, causing problems on
platforms that don't use a shared interrupt but require IRQF_DISABLED.
This change adds a check for IRQF_SHARED prior to removing the
IRQF_DISABLED flag.

Fixes the PS3 system startup hang reported with recent Fedora and
OpenSUSE kernels.

Note that this problem is hidden when CONFIG_LOCKDEP=y (ps3_defconfig),
as local_irq_enable_in_hardirq() is defined as a null statement for
that config.

CC: stable <stable at kernel.org>
Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
Cc: Alan Stern <stern at rowland.harvard.edu>
Cc: Stefan Becker <Stefan.Becker at nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 drivers/usb/core/hcd.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -1876,7 +1876,8 @@ int usb_add_hcd(struct usb_hcd *hcd,
 		 * with IRQF_SHARED. As usb_hcd_irq() will always disable
 		 * interrupts we can remove it here.
 		 */
-		irqflags &= ~IRQF_DISABLED;
+		if (irqflags & IRQF_SHARED)
+			irqflags &= ~IRQF_DISABLED;
 
 		snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d",
 				hcd->driver->description, hcd->self.busnum);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.948
retrieving revision 1.949
diff -u -r1.948 -r1.949
--- kernel.spec	12 Sep 2008 16:42:16 -0000	1.948
+++ kernel.spec	13 Sep 2008 04:14:26 -0000	1.949
@@ -634,6 +634,8 @@
 Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch
 # Fix HID usage descriptor on MS wireless desktop receiver
 Patch2301: linux-2.6-ms-wireless-receiver.patch
+# fix hang on boot on PS3
+Patch2302: linux-2.6-usb-fix-hcd-interrupt-disabling.patch
 
 # get rid of imacfb and make efifb work everywhere it was used
 Patch2600: linux-2.6-merge-efifb-imacfb.patch
@@ -1053,6 +1055,7 @@
 
 # USB
 ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch
+ApplyPatch linux-2.6-usb-fix-hcd-interrupt-disabling.patch
 
 # ACPI
 
@@ -1755,6 +1758,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sat Sep 13 2008 Chuck Ebbert <cebbert at redhat.com>
+- Fix hang in installer on PS3. (#458910)
+
 * Fri Sep 12 2008 Dave Jones <davej at redhat.com>
 - 2.6.27-rc6-git2
 



From rcritten at fedoraproject.org  Sat Sep 13 04:18:04 2008
From: rcritten at fedoraproject.org (Robert Crittenden)
Date: Sat, 13 Sep 2008 04:18:04 +0000 (UTC)
Subject: rpms/nss_compat_ossl/F-9 .cvsignore, 1.5, 1.6 nss_compat_ossl.spec, 
	1.8, 1.9 sources, 1.5, 1.6 nss_compat_ossl-layer.patch, 1.1, NONE
Message-ID: <20080913041804.CC74A70134@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/nss_compat_ossl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30495

Modified Files:
	.cvsignore nss_compat_ossl.spec sources 
Removed Files:
	nss_compat_ossl-layer.patch 
Log Message:
update to 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Oct 2007 02:04:13 -0000	1.5
+++ .cvsignore	13 Sep 2008 04:17:34 -0000	1.6
@@ -1,3 +1 @@
-nss_compat_ossl-0.9.2.tar.gz
-nss_compat_ossl-symbol.patch
-nss_compat_ossl-link.patch
+nss_compat_ossl-0.9.3.tar.gz


Index: nss_compat_ossl.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-9/nss_compat_ossl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nss_compat_ossl.spec	2 Jul 2008 17:29:16 -0000	1.8
+++ nss_compat_ossl.spec	13 Sep 2008 04:17:34 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           nss_compat_ossl
-Version:        0.9.2
-Release:        5%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        Source-level compatibility library for OpenSSL to NSS porting
 
 Group:          System Environment/Libraries
@@ -8,9 +8,6 @@
 URL:            http://rcritten.fedorapeople.org/nss_compat_ossl.html
 Source0:        http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1:         nss_compat_ossl-symbol.patch
-Patch2:         nss_compat_ossl-link.patch
-Patch3:         nss_compat_ossl-layer.patch
 
 # Need > 3.11.7-7 so we have the NSS PKCS#11 flat-file reader available 
 BuildRequires:  nss-devel > 3.11.7-7
@@ -30,9 +27,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .symbol
-%patch2 -p1 -b .link
-%patch3 -p1 -b .layer
 
 %build
 
@@ -62,6 +56,7 @@
 
 %files devel
 %defattr(-,root,root,-)
+%dir %{_includedir}/nss_compat_ossl
 %{_includedir}/nss_compat_ossl/nss_compat_ossl.h
 %{_libdir}/libnss_compat_ossl.so
 
@@ -70,6 +65,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Sep 12 2008 Rob Crittenden <rcritten at redhat.com> - 0.9.3-1
+- update to 0.9.3
+- include /usr/include/nss_compat_ossl directory
+
 * Wed Jun  2 2008 Rob Crittenden <rcritten at redhat.com> 0.9.2-5
 - Fix BIO NSPR layer (#453651)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Oct 2007 02:04:13 -0000	1.5
+++ sources	13 Sep 2008 04:17:34 -0000	1.6
@@ -1,3 +1 @@
-84ceb6df62872f8c6df3f2f5657425e6  nss_compat_ossl-0.9.2.tar.gz
-325fcb35ab1475f1d5e40b7ecaf27b60  nss_compat_ossl-symbol.patch
-1f16445aed912d036cc2c26211793c98  nss_compat_ossl-link.patch
+75d55bdbf3b89bc9420415f6446b991b  nss_compat_ossl-0.9.3.tar.gz


--- nss_compat_ossl-layer.patch DELETED ---



From rcritten at fedoraproject.org  Sat Sep 13 04:32:16 2008
From: rcritten at fedoraproject.org (Robert Crittenden)
Date: Sat, 13 Sep 2008 04:32:16 +0000 (UTC)
Subject: rpms/nss_compat_ossl/F-8 .cvsignore, 1.5, 1.6 nss_compat_ossl.spec, 
	1.7, 1.8 sources, 1.5, 1.6 nss_compat_ossl-layer.patch, 1.1, NONE
Message-ID: <20080913043216.9E6B770134@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/nss_compat_ossl/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31301

Modified Files:
	.cvsignore nss_compat_ossl.spec sources 
Removed Files:
	nss_compat_ossl-layer.patch 
Log Message:
update to 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Oct 2007 02:04:13 -0000	1.5
+++ .cvsignore	13 Sep 2008 04:31:46 -0000	1.6
@@ -1,3 +1 @@
-nss_compat_ossl-0.9.2.tar.gz
-nss_compat_ossl-symbol.patch
-nss_compat_ossl-link.patch
+nss_compat_ossl-0.9.3.tar.gz


Index: nss_compat_ossl.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-8/nss_compat_ossl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nss_compat_ossl.spec	2 Jul 2008 17:16:00 -0000	1.7
+++ nss_compat_ossl.spec	13 Sep 2008 04:31:46 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           nss_compat_ossl
-Version:        0.9.2
-Release:        4%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        Source-level compatibility library for OpenSSL to NSS porting
 
 Group:          System Environment/Libraries
@@ -8,9 +8,6 @@
 URL:            http://rcritten.fedorapeople.org/nss_compat_ossl.html
 Source0:        http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1:         nss_compat_ossl-symbol.patch
-Patch2:         nss_compat_ossl-link.patch
-Patch3:         nss_compat_ossl-layer.patch
 
 # Need > 3.11.7-7 so we have the NSS PKCS#11 flat-file reader available 
 BuildRequires:  nss-devel > 3.11.7-7
@@ -30,9 +27,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .symbol
-%patch2 -p1 -b .link
-%patch3 -p1 -b .layer
 
 %build
 
@@ -62,6 +56,7 @@
 
 %files devel
 %defattr(-,root,root,-)
+%dir %{_includedir}/nss_compat_ossl
 %{_includedir}/nss_compat_ossl/nss_compat_ossl.h
 %{_libdir}/libnss_compat_ossl.so
 
@@ -70,6 +65,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Sep 12 2008 Rob Crittenden <rcritten at redhat.com> - 0.9.3-1
+- update to 0.9.3
+- include /usr/include/nss_compat_ossl directory
+
 * Wed Jun  2 2008 Rob Crittenden <rcritten at redhat.com> 0.9.2-4
 - Fix BIO NSPR layer (#453651)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Oct 2007 02:04:13 -0000	1.5
+++ sources	13 Sep 2008 04:31:46 -0000	1.6
@@ -1,3 +1 @@
-84ceb6df62872f8c6df3f2f5657425e6  nss_compat_ossl-0.9.2.tar.gz
-325fcb35ab1475f1d5e40b7ecaf27b60  nss_compat_ossl-symbol.patch
-1f16445aed912d036cc2c26211793c98  nss_compat_ossl-link.patch
+75d55bdbf3b89bc9420415f6446b991b  nss_compat_ossl-0.9.3.tar.gz


--- nss_compat_ossl-layer.patch DELETED ---



From huzaifas at fedoraproject.org  Sat Sep 13 04:42:19 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Sat, 13 Sep 2008 04:42:19 +0000 (UTC)
Subject: rpms/hunspell-ss/devel - New directory
Message-ID: <20080913044219.72C0370134@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-ss/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsE32316/rpms/hunspell-ss/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-ss/devel added to the repository




From huzaifas at fedoraproject.org  Sat Sep 13 04:42:20 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Sat, 13 Sep 2008 04:42:20 +0000 (UTC)
Subject: rpms/hunspell-ss Makefile,NONE,1.1
Message-ID: <20080913044220.9FC2E70134@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-ss
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsE32316/rpms/hunspell-ss

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-ss


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-ss
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Sat Sep 13 04:41:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 04:41:58 +0000
Subject: [pkgdb] hunspell-ss was added for caolanm
Message-ID: <20080913044158.DF8E7208D9A@bastion.fedora.phx.redhat.com>

huzaifas has added Package hunspell-ss with summary Swati hunspell dictionaries
huzaifas has approved Package hunspell-ss
huzaifas has added a Fedora devel branch for hunspell-ss with an owner of caolanm
huzaifas has approved hunspell-ss in Fedora devel
huzaifas has approved Package hunspell-ss
huzaifas has set commit to Approved for packager on hunspell-ss (Fedora devel)
huzaifas has set build to Approved for packager on hunspell-ss (Fedora devel)
huzaifas has set checkout to Approved for packager on hunspell-ss (Fedora devel)
huzaifas has set commit to Approved for uberpackager on hunspell-ss (Fedora devel)
huzaifas has set build to Approved for uberpackager on hunspell-ss (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on hunspell-ss (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-ss



From huzaifas at fedoraproject.org  Sat Sep 13 04:42:19 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Sat, 13 Sep 2008 04:42:19 +0000 (UTC)
Subject: rpms/hunspell-ss - New directory
Message-ID: <20080913044219.301C770134@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-ss
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsE32316/rpms/hunspell-ss

Log Message:
Directory /cvs/extras/rpms/hunspell-ss added to the repository




From huzaifas at fedoraproject.org  Sat Sep 13 04:42:20 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Sat, 13 Sep 2008 04:42:20 +0000 (UTC)
Subject: rpms/hunspell-ss/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080913044220.EA56470134@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-ss/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsE32316/rpms/hunspell-ss/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-ss


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-ss
# $Id: Makefile,v 1.1 2008/09/13 04:42:20 huzaifas Exp $
NAME := hunspell-ss
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Sep 13 05:04:36 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 13 Sep 2008 05:04:36 +0000 (UTC)
Subject: rpms/gtk2/F-9 gtk+-2.12.12-lib64.patch, NONE, 1.1 .cvsignore, 1.86, 
	1.87 gtk2.spec, 1.297, 1.298 sources, 1.94, 1.95
Message-ID: <20080913050436.982A270134@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1417

Modified Files:
	.cvsignore gtk2.spec sources 
Added Files:
	gtk+-2.12.12-lib64.patch 
Log Message:
2.12.12


gtk+-2.12.12-lib64.patch:

--- NEW FILE gtk+-2.12.12-lib64.patch ---
diff -up gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c.lib64 gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c
--- gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c.lib64	2008-09-12 20:00:46.000000000 -0400
+++ gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c	2008-09-13 00:55:30.000000000 -0400
@@ -277,7 +277,17 @@ gdk_pixbuf_get_module_file (void)
   gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
 
   if (!result)
-	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
+  {
+	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", 
+				     HOST, "gdk-pixbuf.loaders", NULL);
+	  if (!g_file_test (result, G_FILE_TEST_EXISTS))
+	  {
+		  g_free (result);
+		  
+		  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", 
+					     "gdk-pixbuf.loaders", NULL);
+	  }
+  }
 
   return result;
 }
diff -up gtk+-2.12.12/gdk-pixbuf/Makefile.am.lib64 gtk+-2.12.12/gdk-pixbuf/Makefile.am
--- gtk+-2.12.12/gdk-pixbuf/Makefile.am.lib64	2008-09-12 20:00:46.000000000 -0400
+++ gtk+-2.12.12/gdk-pixbuf/Makefile.am	2008-09-13 00:57:52.000000000 -0400
@@ -311,6 +311,7 @@ INCLUDES = \
 	-I$(top_srcdir)/gdk-pixbuf 		\
 	-I$(top_builddir)/gdk-pixbuf 		\
 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
+	-DHOST=\"$(host_triplet)\"              \
 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
 	-DGTK_PREFIX=\"$(prefix)\"		\
diff -up gtk+-2.12.12/gtk/gtkrc.c.lib64 gtk+-2.12.12/gtk/gtkrc.c
--- gtk+-2.12.12/gtk/gtkrc.c.lib64	2008-09-12 20:00:39.000000000 -0400
+++ gtk+-2.12.12/gtk/gtkrc.c	2008-09-13 00:59:26.000000000 -0400
@@ -450,7 +450,17 @@ gtk_rc_get_im_module_file (void)
       if (im_module_file)
 	result = g_strdup (im_module_file);
       else
-	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
+       {
+         result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", GTK_HOST, 
+                                    "gtk.immodules", NULL);
+         if (!g_file_test (result, G_FILE_TEST_EXISTS))
+           {
+             g_free (result);
+             
+             result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", 
+                                        "gtk.immodules", NULL);
+           }
+       }
     }
 
   return result;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2/F-9/.cvsignore,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- .cvsignore	1 Jul 2008 22:05:46 -0000	1.86
+++ .cvsignore	13 Sep 2008 05:04:06 -0000	1.87
@@ -1 +1 @@
-gtk+-2.12.11.tar.bz2
+gtk+-2.12.12.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/F-9/gtk2.spec,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- gtk2.spec	8 Sep 2008 12:52:37 -0000	1.297
+++ gtk2.spec	13 Sep 2008 05:04:06 -0000	1.298
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.12.11
+%define base_version 2.12.12
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2
@@ -30,7 +30,7 @@
 Source8: gtk-print-warning-24x24.png
 
 # Biarch changes
-Patch0: gtk+-2.4.1-lib64.patch
+Patch0: gtk+-2.12.12-lib64.patch
 # Fedora patch
 Patch1: gtk+-2.11.1-set-invisible-char-to-bullet.patch
 # a workaround for some brokenness in the flash plugin
@@ -49,12 +49,8 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=204621
 Patch13: printer-paper-size.patch
 
-# fixed upstream
 Patch14: empty-modmap-crash.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=455742
-Patch15: cups-unix-domain-socket.patch
-
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -136,7 +132,6 @@
 %patch4 -p1 -b .im-setting
 %patch10 -p0 -b .printer-state
 %patch13 -p0 -b .printer-paper-size
-%patch15 -p0 -b .cuds
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -329,6 +324,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Sat Sep 13 2008 Matthias Clasen <mclasen at redhat.com> - 2.12.12-1
+- Update to 2.12.12
+
 * Mon Sep  8 2008 Marek Kasik <mkasik at redhat.com> - 2.12.11-3
 - Add a comment of the Unix domain socket connection with CUPS
   and a little modification of the previous patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2/F-9/sources,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- sources	1 Jul 2008 22:05:46 -0000	1.94
+++ sources	13 Sep 2008 05:04:06 -0000	1.95
@@ -1,4 +1,4 @@
-f7aab88e856a813386f797aade5867ad  gtk+-2.12.11.tar.bz2
+8b2df21ce70bd8e75a45889aaf0a948e  gtk+-2.12.12.tar.bz2
 64fc4a111e35939a1aee880c96351521  gtk-print-error-16x16.png
 a6b427ab6a030a298f64d23a1343b646  gtk-print-report-16x16.png
 66f36ea922eb1c39582dee559f995331  gtk-print-warning-16x16.png



From remi at fedoraproject.org  Sat Sep 13 05:22:20 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 13 Sep 2008 05:22:20 +0000 (UTC)
Subject: rpms/php-pecl-memcache/F-9 .cvsignore, 1.6,
	1.7 php-pecl-memcache.spec, 
	1.6, 1.7 sources, 1.6, 1.7 xml2changelog, 1.2, 1.3
Message-ID: <20080913052221.04E2970134@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-memcache/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2556

Modified Files:
	.cvsignore php-pecl-memcache.spec sources xml2changelog 
Log Message:
update to 2.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Feb 2008 07:50:03 -0000	1.6
+++ .cvsignore	13 Sep 2008 05:21:50 -0000	1.7
@@ -1 +1 @@
-memcache-2.2.3.tgz
+memcache-2.2.4.tgz


Index: php-pecl-memcache.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/F-9/php-pecl-memcache.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pecl-memcache.spec	9 Feb 2008 07:50:03 -0000	1.6
+++ php-pecl-memcache.spec	13 Sep 2008 05:21:50 -0000	1.7
@@ -6,7 +6,7 @@
 
 Summary:      Extension to work with the Memcached caching daemon
 Name:         php-pecl-memcache
-Version:      2.2.3
+Version:      2.2.4
 Release:      1%{?dist}
 License:      PHP
 Group:        Development/Languages
@@ -110,13 +110,17 @@
 
 %files
 %defattr(-, root, root, -)
-%doc CHANGELOG %{pecl_name}-%{version}/CREDITS %{pecl_name}-%{version}/README %{pecl_name}-%{version}/example.php
+%doc CHANGELOG %{pecl_name}-%{version}/CREDITS %{pecl_name}-%{version}/README 
+%doc %{pecl_name}-%{version}/example.php %{pecl_name}-%{version}/memcache.php
 %config(noreplace) %{_sysconfdir}/php.d/%{pecl_name}.ini
 %{php_extdir}/%{pecl_name}.so
 %{pecl_xmldir}/%{name}.xml
 
 
 %changelog
+* Fri Sep 11 2008 Remi Collet <Fedora at FamilleCollet.com> 2.2.4-1
+- new version 2.2.4 (bug fixes)
+
 * Sat Feb  9 2008 Remi Collet <Fedora at FamilleCollet.com> 2.2.3-1
 - new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Feb 2008 07:50:03 -0000	1.6
+++ sources	13 Sep 2008 05:21:50 -0000	1.7
@@ -1 +1 @@
-3e71b8ae8da28c4c907dca0fdeca5d47  memcache-2.2.3.tgz
+753f89f903717d2e27ea5bccd437e7ee  memcache-2.2.4.tgz


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/F-9/xml2changelog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xml2changelog	10 Jan 2008 19:36:38 -0000	1.2
+++ xml2changelog	13 Sep 2008 05:21:50 -0000	1.3
@@ -7,17 +7,22 @@
 if (in_array("--debug", $_SERVER['argv'])) print_r($xml);
 
 if ($xml['version'] >= "2"){ // Package.xml V 2.0
-	printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+	printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
 		$xml->version->release, $xml->stability->release, 
 		$xml->version->api, $xml->stability->api, 
 		$xml->date, $xml->notes);
+	$new=$xml->version->release;
 
 	if (isset($xml->changelog->release) && count($xml->changelog->release)) 
-	foreach($xml->changelog->release as $rel)
-		printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+	    foreach($xml->changelog->release as $rel) {
+		$old=$rel->version->release;
+		if ("$old" != "$new") {
+		    printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
 			$rel->version->release, $rel->stability->release, 
 			$rel->version->api, $rel->stability->api, 
 			$rel->date, $rel->notes);
+		}
+	    }
 } else { // Package.xml V 1.0
 	printf("* Version %s (%s) - %s\n\n%s\n\n",
 		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);



From remi at fedoraproject.org  Sat Sep 13 05:27:40 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 13 Sep 2008 05:27:40 +0000 (UTC)
Subject: rpms/php-pecl-memcache/F-8 php-pecl-memcache.spec, 1.6, 1.7 sources,
	1.6, 1.7 xml2changelog, 1.2, 1.3
Message-ID: <20080913052740.A4A2C70134@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-memcache/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2910

Modified Files:
	php-pecl-memcache.spec sources xml2changelog 
Log Message:
update to 2.2.4


Index: php-pecl-memcache.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/F-8/php-pecl-memcache.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pecl-memcache.spec	9 Feb 2008 08:03:15 -0000	1.6
+++ php-pecl-memcache.spec	13 Sep 2008 05:27:10 -0000	1.7
@@ -6,7 +6,7 @@
 
 Summary:      Extension to work with the Memcached caching daemon
 Name:         php-pecl-memcache
-Version:      2.2.3
+Version:      2.2.4
 Release:      1%{?dist}
 License:      PHP
 Group:        Development/Languages
@@ -110,13 +110,17 @@
 
 %files
 %defattr(-, root, root, -)
-%doc CHANGELOG %{pecl_name}-%{version}/CREDITS %{pecl_name}-%{version}/README %{pecl_name}-%{version}/example.php
+%doc CHANGELOG %{pecl_name}-%{version}/CREDITS %{pecl_name}-%{version}/README 
+%doc %{pecl_name}-%{version}/example.php %{pecl_name}-%{version}/memcache.php
 %config(noreplace) %{_sysconfdir}/php.d/%{pecl_name}.ini
 %{php_extdir}/%{pecl_name}.so
 %{pecl_xmldir}/%{name}.xml
 
 
 %changelog
+* Fri Sep 11 2008 Remi Collet <Fedora at FamilleCollet.com> 2.2.4-1
+- new version 2.2.4 (bug fixes)
+
 * Sat Feb  9 2008 Remi Collet <Fedora at FamilleCollet.com> 2.2.3-1
 - new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Feb 2008 08:03:15 -0000	1.6
+++ sources	13 Sep 2008 05:27:10 -0000	1.7
@@ -1 +1 @@
-3e71b8ae8da28c4c907dca0fdeca5d47  memcache-2.2.3.tgz
+753f89f903717d2e27ea5bccd437e7ee  memcache-2.2.4.tgz


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/F-8/xml2changelog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xml2changelog	11 Jan 2008 06:42:42 -0000	1.2
+++ xml2changelog	13 Sep 2008 05:27:10 -0000	1.3
@@ -7,17 +7,22 @@
 if (in_array("--debug", $_SERVER['argv'])) print_r($xml);
 
 if ($xml['version'] >= "2"){ // Package.xml V 2.0
-	printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+	printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
 		$xml->version->release, $xml->stability->release, 
 		$xml->version->api, $xml->stability->api, 
 		$xml->date, $xml->notes);
+	$new=$xml->version->release;
 
 	if (isset($xml->changelog->release) && count($xml->changelog->release)) 
-	foreach($xml->changelog->release as $rel)
-		printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+	    foreach($xml->changelog->release as $rel) {
+		$old=$rel->version->release;
+		if ("$old" != "$new") {
+		    printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
 			$rel->version->release, $rel->stability->release, 
 			$rel->version->api, $rel->stability->api, 
 			$rel->date, $rel->notes);
+		}
+	    }
 } else { // Package.xml V 1.0
 	printf("* Version %s (%s) - %s\n\n%s\n\n",
 		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);



From remi at fedoraproject.org  Sat Sep 13 05:34:01 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 13 Sep 2008 05:34:01 +0000 (UTC)
Subject: rpms/php-pecl-memcache/devel .cvsignore, 1.6,
	1.7 php-pecl-memcache.spec, 1.6, 1.7 sources, 1.6,
	1.7 xml2changelog, 1.2, 1.3
Message-ID: <20080913053401.20C9F70134@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-memcache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3376

Modified Files:
	.cvsignore php-pecl-memcache.spec sources xml2changelog 
Log Message:
update to 3.0.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Feb 2008 07:50:03 -0000	1.6
+++ .cvsignore	13 Sep 2008 05:33:30 -0000	1.7
@@ -1 +1 @@
-memcache-2.2.3.tgz
+memcache-3.0.2.tgz


Index: php-pecl-memcache.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/devel/php-pecl-memcache.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pecl-memcache.spec	9 Feb 2008 07:50:03 -0000	1.6
+++ php-pecl-memcache.spec	13 Sep 2008 05:33:30 -0000	1.7
@@ -6,7 +6,7 @@
 
 Summary:      Extension to work with the Memcached caching daemon
 Name:         php-pecl-memcache
-Version:      2.2.3
+Version:      3.0.2
 Release:      1%{?dist}
 License:      PHP
 Group:        Development/Languages
@@ -58,29 +58,36 @@
 # Drop in the bit of configuration
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d
 %{__cat} > %{buildroot}%{_sysconfdir}/php.d/%{pecl_name}.ini << 'EOF'
-; Enable %{pecl_name} extension module
+; ----- Enable %{pecl_name} extension module
 extension=%{pecl_name}.so
 
-; Options for the %{pecl_name} module
+; ----- Options for the %{pecl_name} module
 
-; Whether to transparently failover to other servers on errors
+;  Whether to transparently failover to other servers on errors
 ;memcache.allow_failover=1
-; Defines how many servers to try when setting and getting data.
-;memcache.max_failover_attempts=20
-; Data will be transferred in chunks of this size
-;memcache.chunk_size=8192
-; The default TCP port number to use when connecting to the memcached server 
+;  Data will be transferred in chunks of this size
+;memcache.chunk_size=32768
+;  The default TCP port number to use when connecting to the memcached server 
 ;memcache.default_port=11211
-; Hash function {crc32, fnv}
+;  Hash function {crc32, fnv}
 ;memcache.hash_function=crc32
-; Hash strategy {standard, consistent}
-;memcache.hash_strategy=standard
+;  Hash strategy {standard, consistent}
+;memcache.hash_strategy=consistent
+;  Defines how many servers to try when setting and getting data.
+;memcache.max_failover_attempts=20
+;  The protocol {ascii, binary} : You need a memcached >= 1.3.0 to use the binary protocol
+;  The binary protocol results in less traffic and is more efficient
+;memcache.protocol=ascii
+;  Redundancy : When enabled the client sends requests to N servers in parallel
+;memcache.redundancy=1
+;memcache.session_redundancy=2
+
 
-; Options to use the memcache session handler
+; ----- Options to use the memcache session handler
 
-; Use memcache as a session handler
+;  Use memcache as a session handler
 ;session.save_handler=memcache
-; Defines a comma separated of server urls to use for session storage
+;  Defines a comma separated of server urls to use for session storage
 ;session.save_path="tcp://localhost:11211?persistent=1&weight=1&timeout=1&retry_interval=15"
 EOF
 
@@ -110,13 +117,20 @@
 
 %files
 %defattr(-, root, root, -)
-%doc CHANGELOG %{pecl_name}-%{version}/CREDITS %{pecl_name}-%{version}/README %{pecl_name}-%{version}/example.php
+%doc CHANGELOG %{pecl_name}-%{version}/CREDITS %{pecl_name}-%{version}/README 
+%doc %{pecl_name}-%{version}/example.php %{pecl_name}-%{version}/memcache.php
 %config(noreplace) %{_sysconfdir}/php.d/%{pecl_name}.ini
 %{php_extdir}/%{pecl_name}.so
 %{pecl_xmldir}/%{name}.xml
 
 
 %changelog
+* Fri Sep 11 2008 Remi Collet <Fedora at FamilleCollet.com> 3.0.2-1
+- new version 3.0.2
+
+* Fri Sep 11 2008 Remi Collet <Fedora at FamilleCollet.com> 2.2.4-1
+- new version 2.2.4 (bug fixes)
+
 * Sat Feb  9 2008 Remi Collet <Fedora at FamilleCollet.com> 2.2.3-1
 - new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Feb 2008 07:50:03 -0000	1.6
+++ sources	13 Sep 2008 05:33:30 -0000	1.7
@@ -1 +1 @@
-3e71b8ae8da28c4c907dca0fdeca5d47  memcache-2.2.3.tgz
+06079c86e13a970a2efe40018966acb4  memcache-3.0.2.tgz


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/devel/xml2changelog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xml2changelog	10 Jan 2008 19:36:38 -0000	1.2
+++ xml2changelog	13 Sep 2008 05:33:30 -0000	1.3
@@ -7,17 +7,22 @@
 if (in_array("--debug", $_SERVER['argv'])) print_r($xml);
 
 if ($xml['version'] >= "2"){ // Package.xml V 2.0
-	printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+	printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
 		$xml->version->release, $xml->stability->release, 
 		$xml->version->api, $xml->stability->api, 
 		$xml->date, $xml->notes);
+	$new=$xml->version->release;
 
 	if (isset($xml->changelog->release) && count($xml->changelog->release)) 
-	foreach($xml->changelog->release as $rel)
-		printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+	    foreach($xml->changelog->release as $rel) {
+		$old=$rel->version->release;
+		if ("$old" != "$new") {
+		    printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
 			$rel->version->release, $rel->stability->release, 
 			$rel->version->api, $rel->stability->api, 
 			$rel->date, $rel->notes);
+		}
+	    }
 } else { // Package.xml V 1.0
 	printf("* Version %s (%s) - %s\n\n%s\n\n",
 		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);



From remi at fedoraproject.org  Sat Sep 13 05:52:07 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 13 Sep 2008 05:52:07 +0000 (UTC)
Subject: rpms/php-pear-HTTP/F-9 php-pear-HTTP.spec, 1.6, 1.7 sources, 1.2,
	1.3 xml2changelog, 1.1, 1.2
Message-ID: <20080913055207.A8A7470134@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTTP/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4662

Modified Files:
	php-pear-HTTP.spec sources xml2changelog 
Log Message:
update to 1.4.1


Index: php-pear-HTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP/F-9/php-pear-HTTP.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pear-HTTP.spec	22 Aug 2007 18:33:00 -0000	1.6
+++ php-pear-HTTP.spec	13 Sep 2008 05:51:37 -0000	1.7
@@ -4,8 +4,8 @@
 Summary:     Miscellaneous HTTP utilities
 Summary(fr): Divers utilitaires HTTP
 Name:        php-pear-HTTP
-Version:     1.4.0
-Release:     8%{?dist}
+Version:     1.4.1
+Release:     1%{?dist}
 License:     PHP
 Group:       Development/Libraries
 URL:         http://pear.php.net/package/HTTP
@@ -33,13 +33,15 @@
 
 %prep
 %setup -c -q
-%{__pear} convert package.xml package2.xml
-%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+# package.xml is V2
+%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
+mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+
 
 %build
 # Empty build section
 
+
 %install
 rm -rf %{buildroot}
 
@@ -53,30 +55,45 @@
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
 %{__install} -pm 644 %{pear_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;
 
+# Test suite - must be run as root after installation
+# pear run-tests -p HTTP
+# Should return : 10 PASSED TESTS
+
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
 %{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{pear_name}.xml  >/dev/null || :
 
+
 %postun
 # if refcount = 0 then package has been removed (not upgraded)
 if [ "$1" -eq "0" ]; then
     %{__pear} uninstall --nodeps --ignore-errors --register-only %{pear_name}  >/dev/null || :
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG
 %{pear_phpdir}/HTTP.php
 %{pear_xmldir}/HTTP.xml
+%{pear_testdir}/HTTP
+
 
 %changelog
+* Mon Sep  1 2008 Remi Collet <Fedora at FamilleCollet.com> 1.4.1-1
+- update to 1.4.1 
+- add tests
+
 * Wed Aug 22 2007 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-8
 - remove PEAR from sumnary
 - SPEC Cleanups - Fix License


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2006 20:52:08 -0000	1.2
+++ sources	13 Sep 2008 05:51:37 -0000	1.3
@@ -1 +1 @@
-62f3ef8c163e2ac11b8ea0163f2a5d3e  HTTP-1.4.0.tgz
+6fe726d7304f81ac1fe866b7725512fa  HTTP-1.4.1.tgz


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP/F-9/xml2changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml2changelog	22 Aug 2007 18:33:00 -0000	1.1
+++ xml2changelog	13 Sep 2008 05:51:37 -0000	1.2
@@ -7,16 +7,22 @@
 if (in_array("--debug", $_SERVER['argv'])) print_r($xml);
 
 if ($xml['version'] >= "2"){ // Package.xml V 2.0
-	printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+	printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
 		$xml->version->release, $xml->stability->release, 
 		$xml->version->api, $xml->stability->api, 
 		$xml->date, $xml->notes);
+	$new=$xml->version->release;
 
-	if (is_array($xml->changelog->release)) foreach($xml->changelog->release as $rel)
-		printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+	if (isset($xml->changelog->release) && count($xml->changelog->release)) 
+	    foreach($xml->changelog->release as $rel) {
+		$old=$rel->version->release;
+		if ("$old" != "$new") {
+		    printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
 			$rel->version->release, $rel->stability->release, 
 			$rel->version->api, $rel->stability->api, 
 			$rel->date, $rel->notes);
+		}
+	    }
 } else { // Package.xml V 1.0
 	printf("* Version %s (%s) - %s\n\n%s\n\n",
 		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);



From remi at fedoraproject.org  Sat Sep 13 05:56:04 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 13 Sep 2008 05:56:04 +0000 (UTC)
Subject: rpms/php-pear-HTTP/F-8 php-pear-HTTP.spec, 1.6, 1.7 sources, 1.2,
	1.3 xml2changelog, 1.1, 1.2
Message-ID: <20080913055604.8697870134@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTTP/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4970

Modified Files:
	php-pear-HTTP.spec sources xml2changelog 
Log Message:
update to 1.4.1


Index: php-pear-HTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP/F-8/php-pear-HTTP.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pear-HTTP.spec	22 Aug 2007 18:33:00 -0000	1.6
+++ php-pear-HTTP.spec	13 Sep 2008 05:55:34 -0000	1.7
@@ -4,8 +4,8 @@
 Summary:     Miscellaneous HTTP utilities
 Summary(fr): Divers utilitaires HTTP
 Name:        php-pear-HTTP
-Version:     1.4.0
-Release:     8%{?dist}
+Version:     1.4.1
+Release:     1%{?dist}
 License:     PHP
 Group:       Development/Libraries
 URL:         http://pear.php.net/package/HTTP
@@ -33,13 +33,15 @@
 
 %prep
 %setup -c -q
-%{__pear} convert package.xml package2.xml
-%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+# package.xml is V2
+%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
+mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+
 
 %build
 # Empty build section
 
+
 %install
 rm -rf %{buildroot}
 
@@ -53,30 +55,45 @@
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
 %{__install} -pm 644 %{pear_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;
 
+# Test suite - must be run as root after installation
+# pear run-tests -p HTTP
+# Should return : 10 PASSED TESTS
+
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
 %{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{pear_name}.xml  >/dev/null || :
 
+
 %postun
 # if refcount = 0 then package has been removed (not upgraded)
 if [ "$1" -eq "0" ]; then
     %{__pear} uninstall --nodeps --ignore-errors --register-only %{pear_name}  >/dev/null || :
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG
 %{pear_phpdir}/HTTP.php
 %{pear_xmldir}/HTTP.xml
+%{pear_testdir}/HTTP
+
 
 %changelog
+* Mon Sep  1 2008 Remi Collet <Fedora at FamilleCollet.com> 1.4.1-1
+- update to 1.4.1 
+- add tests
+
 * Wed Aug 22 2007 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-8
 - remove PEAR from sumnary
 - SPEC Cleanups - Fix License


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2006 20:52:08 -0000	1.2
+++ sources	13 Sep 2008 05:55:34 -0000	1.3
@@ -1 +1 @@
-62f3ef8c163e2ac11b8ea0163f2a5d3e  HTTP-1.4.0.tgz
+6fe726d7304f81ac1fe866b7725512fa  HTTP-1.4.1.tgz


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP/F-8/xml2changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml2changelog	22 Aug 2007 18:33:00 -0000	1.1
+++ xml2changelog	13 Sep 2008 05:55:34 -0000	1.2
@@ -7,16 +7,22 @@
 if (in_array("--debug", $_SERVER['argv'])) print_r($xml);
 
 if ($xml['version'] >= "2"){ // Package.xml V 2.0
-	printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+	printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
 		$xml->version->release, $xml->stability->release, 
 		$xml->version->api, $xml->stability->api, 
 		$xml->date, $xml->notes);
+	$new=$xml->version->release;
 
-	if (is_array($xml->changelog->release)) foreach($xml->changelog->release as $rel)
-		printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+	if (isset($xml->changelog->release) && count($xml->changelog->release)) 
+	    foreach($xml->changelog->release as $rel) {
+		$old=$rel->version->release;
+		if ("$old" != "$new") {
+		    printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
 			$rel->version->release, $rel->stability->release, 
 			$rel->version->api, $rel->stability->api, 
 			$rel->date, $rel->notes);
+		}
+	    }
 } else { // Package.xml V 1.0
 	printf("* Version %s (%s) - %s\n\n%s\n\n",
 		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);



From remi at fedoraproject.org  Sat Sep 13 06:07:32 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 13 Sep 2008 06:07:32 +0000 (UTC)
Subject: rpms/php-pear-HTTP/devel php-pear-HTTP.spec,1.7,1.8
Message-ID: <20080913060732.C9E9E70134@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5743

Modified Files:
	php-pear-HTTP.spec 
Log Message:
fix BR


Index: php-pear-HTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP/devel/php-pear-HTTP.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- php-pear-HTTP.spec	1 Sep 2008 05:54:16 -0000	1.7
+++ php-pear-HTTP.spec	13 Sep 2008 06:07:02 -0000	1.8
@@ -5,7 +5,7 @@
 Summary(fr): Divers utilitaires HTTP
 Name:        php-pear-HTTP
 Version:     1.4.1
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     PHP
 Group:       Development/Libraries
 URL:         http://pear.php.net/package/HTTP
@@ -14,10 +14,10 @@
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:        noarch
-BuildRequires:    php-pear(PEAR) >= 1.4.9
+BuildRequires:    php-pear(PEAR) >= 1.7.1
 Requires(post):   %{__pear}
 Requires(postun): %{__pear}
-Requires:         php-pear(PEAR) >= 1.4.9, php >= 4.0.6
+Requires:         php-pear(PEAR) >= 1.7.1
 Provides:         php-pear(%{pear_name}) = %{version}
 
 %description
@@ -31,6 +31,7 @@
 en forme des dates, la n??gociation de la langue ou les
 redirections HTTP.
 
+
 %prep
 %setup -c -q
 # package.xml is V2
@@ -90,6 +91,9 @@
 
 
 %changelog
+* Sat Sep 13 2008 Remi Collet <Fedora at FamilleCollet.com> 1.4.1-2
+- Fix BR for PEAR >= 1.7.1
+
 * Mon Sep  1 2008 Remi Collet <Fedora at FamilleCollet.com> 1.4.1-1
 - update to 1.4.1 
 - add tests



From cebbert at fedoraproject.org  Sat Sep 13 07:22:32 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 13 Sep 2008 07:22:32 +0000 (UTC)
Subject: rpms/kernel/F-9
	linux-2.6-netdev-e1000e-fix-drv-load-issues-amt.patch, 
	NONE, 1.1 kernel.spec, 1.761, 1.762
Message-ID: <20080913072232.E9B2E70134@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11630

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-netdev-e1000e-fix-drv-load-issues-amt.patch 
Log Message:
Fix problems with AMT on e1000e (#453023)

linux-2.6-netdev-e1000e-fix-drv-load-issues-amt.patch:

--- NEW FILE linux-2.6-netdev-e1000e-fix-drv-load-issues-amt.patch ---
From: Jesse Brandeburg <jesse.brandeburg at intel.com>
Date: Tue, 5 Aug 2008 00:21:40 +0000 (-0700)
Subject: e1000e: fix drv load issues
X-Git-Tag: v2.6.27-rc3~69^2~13^2~46
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c43bc57e5d72932b5e64bc5e4e7741bedbcaaf5f

e1000e: fix drv load issues

a few people seem to have problems maintaining gigabit link
and it was root caused to an interaction between the managability
firmware on the host and the driver, not communicating.

The form of communication they use is the drv_load bit.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg at intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 589e542..18f076c 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -2444,7 +2444,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
 	 * For parts with AMT enabled, let the firmware know
 	 * that the network interface is in control
 	 */
-	if ((adapter->flags & FLAG_HAS_AMT) && e1000e_check_mng_mode(hw))
+	if (adapter->flags & FLAG_HAS_AMT)
 		e1000_get_hw_control(adapter);
 
 	ew32(WUC, 0);
@@ -2634,8 +2634,7 @@ static int e1000_open(struct net_device *netdev)
 	 * If AMT is enabled, let the firmware know that the network
 	 * interface is now open
 	 */
-	if ((adapter->flags & FLAG_HAS_AMT) &&
-	    e1000e_check_mng_mode(&adapter->hw))
+	if (adapter->flags & FLAG_HAS_AMT)
 		e1000_get_hw_control(adapter);
 
 	/*
@@ -2713,8 +2712,7 @@ static int e1000_close(struct net_device *netdev)
 	 * If AMT is enabled, let the firmware know that the network
 	 * interface is now closed
 	 */
-	if ((adapter->flags & FLAG_HAS_AMT) &&
-	    e1000e_check_mng_mode(&adapter->hw))
+	if (adapter->flags & FLAG_HAS_AMT)
 		e1000_release_hw_control(adapter);
 
 	return 0;
@@ -4030,7 +4028,7 @@ static int e1000_resume(struct pci_dev *pdev)
 	 * is up.  For all other cases, let the f/w know that the h/w is now
 	 * under the control of the driver.
 	 */
-	if (!(adapter->flags & FLAG_HAS_AMT) || !e1000e_check_mng_mode(&adapter->hw))
+	if (!(adapter->flags & FLAG_HAS_AMT))
 		e1000_get_hw_control(adapter);
 
 	return 0;
@@ -4149,8 +4147,7 @@ static void e1000_io_resume(struct pci_dev *pdev)
 	 * is up.  For all other cases, let the f/w know that the h/w is now
 	 * under the control of the driver.
 	 */
-	if (!(adapter->flags & FLAG_HAS_AMT) ||
-	    !e1000e_check_mng_mode(&adapter->hw))
+	if (!(adapter->flags & FLAG_HAS_AMT))
 		e1000_get_hw_control(adapter);
 
 }
@@ -4505,8 +4502,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 	 * is up.  For all other cases, let the f/w know that the h/w is now
 	 * under the control of the driver.
 	 */
-	if (!(adapter->flags & FLAG_HAS_AMT) ||
-	    !e1000e_check_mng_mode(&adapter->hw))
+	if (!(adapter->flags & FLAG_HAS_AMT))
 		e1000_get_hw_control(adapter);
 
 	/* tell the stack to leave us alone until e1000_open() is called */
@@ -4523,19 +4519,19 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 	return 0;
 
 err_register:
-err_hw_init:
-	e1000_release_hw_control(adapter);
+	if (!(adapter->flags & FLAG_HAS_AMT))
+		e1000_release_hw_control(adapter);
 err_eeprom:
 	if (!e1000_check_reset_block(&adapter->hw))
 		e1000_phy_hw_reset(&adapter->hw);
+err_hw_init:
 
-	if (adapter->hw.flash_address)
-		iounmap(adapter->hw.flash_address);
-
-err_flashmap:
 	kfree(adapter->tx_ring);
 	kfree(adapter->rx_ring);
 err_sw_init:
+	if (adapter->hw.flash_address)
+		iounmap(adapter->hw.flash_address);
+err_flashmap:
 	iounmap(adapter->hw.hw_addr);
 err_ioremap:
 	free_netdev(netdev);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.761
retrieving revision 1.762
diff -u -r1.761 -r1.762
--- kernel.spec	11 Sep 2008 06:49:13 -0000	1.761
+++ kernel.spec	13 Sep 2008 07:22:02 -0000	1.762
@@ -662,6 +662,7 @@
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
+Patch2001: linux-2.6-netdev-e1000e-fix-drv-load-issues-amt.patch
 
 # atl2 network driver
 Patch2020: linux-2.6-netdev-atl2.patch
@@ -1222,6 +1223,7 @@
 ApplyPatch linux-2.6-lirc.patch
 
 ApplyPatch linux-2.6-e1000-ich9.patch
+ApplyPatch linux-2.6-netdev-e1000e-fix-drv-load-issues-amt.patch
 
 ApplyPatch linux-2.6-netdev-atl2.patch
 ApplyPatch linux-2.6-netdev-atl1e.patch
@@ -1839,6 +1841,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Sat Sep 13 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-35
+- Fix problems with AMT on e1000e (#453023)
+
 * Thu Sep 11 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-34
 - Don't use ahci driver for marvell controllers. (#455833)
 



From cebbert at fedoraproject.org  Sat Sep 13 07:24:27 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 13 Sep 2008 07:24:27 +0000 (UTC)
Subject: rpms/kernel/F-8
	linux-2.6-netdev-e1000e-fix-drv-load-issues-amt.patch, 
	NONE, 1.1 kernel.spec, 1.529, 1.530
Message-ID: <20080913072428.00F0470134@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11888

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-netdev-e1000e-fix-drv-load-issues-amt.patch 
Log Message:
Fix problems with AMT on e1000e (F9#453023)

linux-2.6-netdev-e1000e-fix-drv-load-issues-amt.patch:

--- NEW FILE linux-2.6-netdev-e1000e-fix-drv-load-issues-amt.patch ---
From: Jesse Brandeburg <jesse.brandeburg at intel.com>
Date: Tue, 5 Aug 2008 00:21:40 +0000 (-0700)
Subject: e1000e: fix drv load issues
X-Git-Tag: v2.6.27-rc3~69^2~13^2~46
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c43bc57e5d72932b5e64bc5e4e7741bedbcaaf5f

e1000e: fix drv load issues

a few people seem to have problems maintaining gigabit link
and it was root caused to an interaction between the managability
firmware on the host and the driver, not communicating.

The form of communication they use is the drv_load bit.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg at intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 589e542..18f076c 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -2444,7 +2444,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
 	 * For parts with AMT enabled, let the firmware know
 	 * that the network interface is in control
 	 */
-	if ((adapter->flags & FLAG_HAS_AMT) && e1000e_check_mng_mode(hw))
+	if (adapter->flags & FLAG_HAS_AMT)
 		e1000_get_hw_control(adapter);
 
 	ew32(WUC, 0);
@@ -2634,8 +2634,7 @@ static int e1000_open(struct net_device *netdev)
 	 * If AMT is enabled, let the firmware know that the network
 	 * interface is now open
 	 */
-	if ((adapter->flags & FLAG_HAS_AMT) &&
-	    e1000e_check_mng_mode(&adapter->hw))
+	if (adapter->flags & FLAG_HAS_AMT)
 		e1000_get_hw_control(adapter);
 
 	/*
@@ -2713,8 +2712,7 @@ static int e1000_close(struct net_device *netdev)
 	 * If AMT is enabled, let the firmware know that the network
 	 * interface is now closed
 	 */
-	if ((adapter->flags & FLAG_HAS_AMT) &&
-	    e1000e_check_mng_mode(&adapter->hw))
+	if (adapter->flags & FLAG_HAS_AMT)
 		e1000_release_hw_control(adapter);
 
 	return 0;
@@ -4030,7 +4028,7 @@ static int e1000_resume(struct pci_dev *pdev)
 	 * is up.  For all other cases, let the f/w know that the h/w is now
 	 * under the control of the driver.
 	 */
-	if (!(adapter->flags & FLAG_HAS_AMT) || !e1000e_check_mng_mode(&adapter->hw))
+	if (!(adapter->flags & FLAG_HAS_AMT))
 		e1000_get_hw_control(adapter);
 
 	return 0;
@@ -4149,8 +4147,7 @@ static void e1000_io_resume(struct pci_dev *pdev)
 	 * is up.  For all other cases, let the f/w know that the h/w is now
 	 * under the control of the driver.
 	 */
-	if (!(adapter->flags & FLAG_HAS_AMT) ||
-	    !e1000e_check_mng_mode(&adapter->hw))
+	if (!(adapter->flags & FLAG_HAS_AMT))
 		e1000_get_hw_control(adapter);
 
 }
@@ -4505,8 +4502,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 	 * is up.  For all other cases, let the f/w know that the h/w is now
 	 * under the control of the driver.
 	 */
-	if (!(adapter->flags & FLAG_HAS_AMT) ||
-	    !e1000e_check_mng_mode(&adapter->hw))
+	if (!(adapter->flags & FLAG_HAS_AMT))
 		e1000_get_hw_control(adapter);
 
 	/* tell the stack to leave us alone until e1000_open() is called */
@@ -4523,19 +4519,19 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 	return 0;
 
 err_register:
-err_hw_init:
-	e1000_release_hw_control(adapter);
+	if (!(adapter->flags & FLAG_HAS_AMT))
+		e1000_release_hw_control(adapter);
 err_eeprom:
 	if (!e1000_check_reset_block(&adapter->hw))
 		e1000_phy_hw_reset(&adapter->hw);
+err_hw_init:
 
-	if (adapter->hw.flash_address)
-		iounmap(adapter->hw.flash_address);
-
-err_flashmap:
 	kfree(adapter->tx_ring);
 	kfree(adapter->rx_ring);
 err_sw_init:
+	if (adapter->hw.flash_address)
+		iounmap(adapter->hw.flash_address);
+err_flashmap:
 	iounmap(adapter->hw.hw_addr);
 err_ioremap:
 	free_netdev(netdev);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.529
retrieving revision 1.530
diff -u -r1.529 -r1.530
--- kernel.spec	11 Sep 2008 06:53:04 -0000	1.529
+++ kernel.spec	13 Sep 2008 07:23:57 -0000	1.530
@@ -658,6 +658,7 @@
 Patch726: linux-2.6-netdev-atl1e.patch
 Patch727: linux-2.6-e1000-ich9.patch
 Patch728: linux-2.6-netdev-e1000e-add-support-for-82567lm-4.patch
+Patch729: linux-2.6-netdev-e1000e-fix-drv-load-issues-amt.patch
 
 #ACPI
 Patch800: linux-2.6-acpi-processor-use-signed-int.patch
@@ -1829,6 +1830,9 @@
 
 
 %changelog
+* Sat Sep 13 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-20
+- Fix problems with AMT on e1000e (F9#453023)
+
 * Thu Sep 11 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-19
 - Don't use ahci driver for marvell controllers. (F9#455833)
 



From than at fedoraproject.org  Sat Sep 13 07:26:29 2008
From: than at fedoraproject.org (Than Ngo)
Date: Sat, 13 Sep 2008 07:26:29 +0000 (UTC)
Subject: rpms/kde-filesystem/devel kde-filesystem.spec, 1.31,
	1.32 macros.kde4, 1.8, 1.9
Message-ID: <20080913072629.5FA0370134@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12155

Modified Files:
	kde-filesystem.spec macros.kde4 
Log Message:
- it's not needed to bump _kde4_macros_api
- use macro



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kde-filesystem.spec	12 Sep 2008 22:23:18 -0000	1.31
+++ kde-filesystem.spec	13 Sep 2008 07:25:58 -0000	1.32
@@ -12,12 +12,12 @@
 %define _kde4_sbindir %_kde4_prefix/sbin
 %define _kde4_includedir %_kde4_prefix/include/kde4
 %define _kde4_buildtype release
-%define _kde4_macros_api 3
+%define _kde4_macros_api 2
 
 Summary: KDE filesystem layout
 Name: kde-filesystem
 Version: 4
-Release: 18%{?dist}
+Release: 19%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
@@ -126,8 +126,8 @@
 %%_kde4_bindir %%_kde4_prefix/bin
 %%_kde4_sbindir %%_kde4_prefix/sbin
 %%_kde4_includedir %%_kde4_prefix/include/kde4
-%%_kde4_buildtype release
-%%_kde4_macros_api 3
+%%_kde4_buildtype %_kde4_buildtype
+%%_kde4_macros_api %_kde4_macros_api
 EOF
 cat %{SOURCE2} >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4
 
@@ -179,6 +179,10 @@
 
 
 %changelog
+* Sat Sep 13 2008 Than Ngo <than at redhat.com> 4-19
+- it's not needed to bump _kde4_macros_api
+- use macro
+
 * Sat Sep 13 2008 Than Ngo <than at redhat.com> 4-18
 - remove redundant FEDORA, use CMAKE_BUILD_TYPE=release
 


Index: macros.kde4
===================================================================
RCS file: /cvs/extras/rpms/kde-filesystem/devel/macros.kde4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- macros.kde4	12 Sep 2008 22:23:18 -0000	1.8
+++ macros.kde4	13 Sep 2008 07:25:59 -0000	1.9
@@ -1,5 +1,5 @@
 
-# api = 3
+# api = 2
 # initial try, including only items that vary from defaults
 #
 



From mnowak at fedoraproject.org  Sat Sep 13 09:33:34 2008
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Sat, 13 Sep 2008 09:33:34 +0000 (UTC)
Subject: rpms/eclipse-pydev/F-8 eclipse-pydev.spec,1.9,1.10
Message-ID: <20080913093334.559AC70134@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/eclipse-pydev/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24914

Modified Files:
	eclipse-pydev.spec 
Log Message:
- bump to 1.3.20




Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/F-8/eclipse-pydev.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- eclipse-pydev.spec	20 May 2008 20:26:34 -0000	1.9
+++ eclipse-pydev.spec	13 Sep 2008 09:33:04 -0000	1.10
@@ -9,15 +9,19 @@
 %define eclipse_arch   %{_arch}
 %endif
 
+%define major     1
+%define minor     3
+%define maint     20
+
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
-Version:          1.3.17
+Version:          %{major}.%{minor}.%{maint}
 Release:          1%{?dist}
-License:          Eclipse Public License
-URL:              http://pydev.sourceforge.net/
+License:          EPL
+URL:              http://pydev.sourceforge.net
 Group:            Development/Tools
 
-Source0:          http://downloads.sourceforge.net/pydev/org.python.pydev.feature-src-1_3_17.zip
+Source0:          http://downloads.sourceforge.net/pydev/org.python.pydev.feature-src-%{major}_%{minor}_%{maint}.zip
 Source1:          org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
 Source2:          fetch-pydev-mylyn.sh
 
@@ -185,6 +189,16 @@
 aot-compile-rpm
 %endif
 
+# rename cgi.py's shebang from /usr/local/bin/python to /usr/bin/env python
+sed -i 's/\/usr\/local\/bin\/python/\/usr\/bin\/env python/' ${RPM_BUILD_ROOT}%{_datadir}/eclipse/plugins/org.python.pydev.jython_%{major}.%{minor}.%{maint}/Lib/cgi.py
+
+# convert .py$ files from mode 0644 to mode 0755
+chmod 0755 `find ${RPM_BUILD_ROOT} -name '*\.py' -perm 0644 | xargs`
+
+# convert '\r\n' end-of-lines to *unix-like '\n'
+# sed -i 's/\r//' `find ${RPM_BUILD_ROOT} -name '*\.py' | xargs`
+
+
 %clean 
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -217,6 +231,15 @@
 %endif
 
 %changelog
+* Tue Aug 30 2008 Michal Nowak <mnowak at redhat.com> 1:1.3.20-1
+- bump to 1.3.20
+- fixed license tag
+- created general versioning scheme for version tag & tarball URI)
+- sed: /usr/local/bin/python -> /usr/bin/env python in Jython's cgi.py
+- convert .py$ files from mode 0644 to mode 0755
+- possibility to convert '\r\n' end-of-lines to *nix-like '\n'
+  in all '.py$' files
+
 * Tue May 20 2008 Jeff Johnston <jjohnstn at redhat.com> 1:1.3.17-1
 - Resolves Bugzilla #447455
 - 1.3.17



From till at fedoraproject.org  Sat Sep 13 11:14:54 2008
From: till at fedoraproject.org (Till Maas)
Date: Sat, 13 Sep 2008 11:14:54 +0000 (UTC)
Subject: rpms/pam_mount/F-9
	pam_mount-git-convert_pam_mount_conf-lsof_callback.patch, NONE,
	1.1 pam_mount.spec, 1.36, 1.37
Message-ID: <20080913111455.05CE570134@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20553

Modified Files:
	pam_mount.spec 
Added Files:
	pam_mount-git-convert_pam_mount_conf-lsof_callback.patch 
Log Message:
* Sat Sep 13 2008 Till Maas <opensource at till.name> - 0.48-2
- Update libHX dependencies
- remove lsof dependency
- Add patch to fix convert_pam_mount_conf.pl by Stephen P. Schaefer
  (Red Hat Bug 462155)


pam_mount-git-convert_pam_mount_conf-lsof_callback.patch:

--- NEW FILE pam_mount-git-convert_pam_mount_conf-lsof_callback.patch ---
Patch by Stephen P. Schaefer, reported in Red Hat Bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=462155

diff --git a/scripts/convert_pam_mount_conf.pl b/scripts/convert_pam_mount_conf.pl
index ca0f360..de5ebdc 100755
--- a/scripts/convert_pam_mount_conf.pl
+++ b/scripts/convert_pam_mount_conf.pl
@@ -81,6 +81,11 @@ sub callback_fsckloop
 	$writer->emptyTag("fsckloop", "device" => $fields[1]);
 }
 
+sub callback_lsof
+{
+       print STDERR "lsof no longer supported";
+}
+
 sub callback_luserconf
 {
 	my @fields = @_;


Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/F-9/pam_mount.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- pam_mount.spec	5 Sep 2008 20:34:08 -0000	1.36
+++ pam_mount.spec	13 Sep 2008 11:14:23 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           pam_mount
-Version:        0.47
-Release:        1%{?dist}
+Version:        0.48
+Release:        2%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
 Group:          System Environment/Base
@@ -8,15 +8,16 @@
 License:        LGPLv2+ and GPLv2+
 URL:            http://pam-mount.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.lzma
+Patch0:         pam_mount-git-convert_pam_mount_conf-lsof_callback.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel, pam-devel, openssl-devel
 BuildRequires:  libxml2-devel
-BuildRequires:  libHX-devel >= 1.23
+BuildRequires:  libHX-devel >= 1.25
 BuildRequires:  lzma
-Requires:       pam, lsof
+Requires:       pam
 Requires:       psmisc
-Requires:       libHX >= 1.23
+Requires:       libHX >= 1.25
 Requires(post):  perl(XML::Writer)
 
 
@@ -42,6 +43,7 @@
 %prep
 %setup -q -T -c
 lzma -c -d %SOURCE0 | tar -xvvf - -C ..
+%patch0 -p1 -b .convert_pam_mount_conf-lsof_callback
 
 
 %build
@@ -93,6 +95,15 @@
 
 
 %changelog
+* Sat Sep 13 2008 Till Maas <opensource at till.name> - 0.48-2
+- Update libHX dependencies
+- remove lsof dependency
+- Add patch to fix convert_pam_mount_conf.pl by Stephen P. Schaefer
+  (Red Hat Bug 462155)
+
+* Thu Sep 11 2008 Till Maas <opensource at till.name> - 0.48-1
+- Update to new version
+
 * Fri Sep 05 2008 Till Maas <opensource at till.name> - 0.47-1
 - Update to new version that includes a security fix:
   https://sourceforge.net/project/shownotes.php?release_id=624240



From till at fedoraproject.org  Sat Sep 13 11:15:37 2008
From: till at fedoraproject.org (Till Maas)
Date: Sat, 13 Sep 2008 11:15:37 +0000 (UTC)
Subject: rpms/pam_mount/F-8
	pam_mount-git-convert_pam_mount_conf-lsof_callback.patch, NONE,
	1.1 pam_mount.spec, 1.28, 1.29
Message-ID: <20080913111537.2D50170134@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20879

Modified Files:
	pam_mount.spec 
Added Files:
	pam_mount-git-convert_pam_mount_conf-lsof_callback.patch 
Log Message:
* Sat Sep 13 2008 Till Maas <opensource at till.name> - 0.48-2
- Update libHX dependencies
- remove lsof dependency
- Add patch to fix convert_pam_mount_conf.pl by Stephen P. Schaefer
  (Red Hat Bug 462155)


pam_mount-git-convert_pam_mount_conf-lsof_callback.patch:

--- NEW FILE pam_mount-git-convert_pam_mount_conf-lsof_callback.patch ---
Patch by Stephen P. Schaefer, reported in Red Hat Bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=462155

diff --git a/scripts/convert_pam_mount_conf.pl b/scripts/convert_pam_mount_conf.pl
index ca0f360..de5ebdc 100755
--- a/scripts/convert_pam_mount_conf.pl
+++ b/scripts/convert_pam_mount_conf.pl
@@ -81,6 +81,11 @@ sub callback_fsckloop
 	$writer->emptyTag("fsckloop", "device" => $fields[1]);
 }
 
+sub callback_lsof
+{
+       print STDERR "lsof no longer supported";
+}
+
 sub callback_luserconf
 {
 	my @fields = @_;


Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/F-8/pam_mount.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- pam_mount.spec	5 Sep 2008 20:46:13 -0000	1.28
+++ pam_mount.spec	13 Sep 2008 11:15:06 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           pam_mount
-Version:        0.47
-Release:        1%{?dist}
+Version:        0.48
+Release:        2%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
 Group:          System Environment/Base
@@ -8,15 +8,16 @@
 License:        LGPLv2+ and GPLv2+
 URL:            http://pam-mount.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.lzma
+Patch0:         pam_mount-git-convert_pam_mount_conf-lsof_callback.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel, pam-devel, openssl-devel
 BuildRequires:  libxml2-devel
-BuildRequires:  libHX-devel >= 1.23
+BuildRequires:  libHX-devel >= 1.25
 BuildRequires:  lzma
-Requires:       pam, lsof
+Requires:       pam
 Requires:       psmisc
-Requires:       libHX >= 1.23
+Requires:       libHX >= 1.25
 Requires(post):  perl(XML::Writer)
 
 
@@ -42,6 +43,7 @@
 %prep
 %setup -q -T -c
 lzma -c -d %SOURCE0 | tar -xvvf - -C ..
+%patch0 -p1 -b .convert_pam_mount_conf-lsof_callback
 
 
 %build
@@ -93,6 +95,15 @@
 
 
 %changelog
+* Sat Sep 13 2008 Till Maas <opensource at till.name> - 0.48-2
+- Update libHX dependencies
+- remove lsof dependency
+- Add patch to fix convert_pam_mount_conf.pl by Stephen P. Schaefer
+  (Red Hat Bug 462155)
+
+* Thu Sep 11 2008 Till Maas <opensource at till.name> - 0.48-1
+- Update to new version
+
 * Fri Sep 05 2008 Till Maas <opensource at till.name> - 0.47-1
 - Update to new version that includes a security fix:
   https://sourceforge.net/project/shownotes.php?release_id=624240



From till at fedoraproject.org  Sat Sep 13 11:16:18 2008
From: till at fedoraproject.org (Till Maas)
Date: Sat, 13 Sep 2008 11:16:18 +0000 (UTC)
Subject: rpms/pam_mount/devel
	pam_mount-git-convert_pam_mount_conf-lsof_callback.patch, NONE,
	1.1 pam_mount.spec, 1.43, 1.44
Message-ID: <20080913111618.219FB70134@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21194

Modified Files:
	pam_mount.spec 
Added Files:
	pam_mount-git-convert_pam_mount_conf-lsof_callback.patch 
Log Message:
* Sat Sep 13 2008 Till Maas <opensource at till.name> - 0.48-2
- Update libHX dependencies
- remove lsof dependency
- Add patch to fix convert_pam_mount_conf.pl by Stephen P. Schaefer
  (Red Hat Bug 462155)


pam_mount-git-convert_pam_mount_conf-lsof_callback.patch:

--- NEW FILE pam_mount-git-convert_pam_mount_conf-lsof_callback.patch ---
Patch by Stephen P. Schaefer, reported in Red Hat Bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=462155

diff --git a/scripts/convert_pam_mount_conf.pl b/scripts/convert_pam_mount_conf.pl
index ca0f360..de5ebdc 100755
--- a/scripts/convert_pam_mount_conf.pl
+++ b/scripts/convert_pam_mount_conf.pl
@@ -81,6 +81,11 @@ sub callback_fsckloop
 	$writer->emptyTag("fsckloop", "device" => $fields[1]);
 }
 
+sub callback_lsof
+{
+       print STDERR "lsof no longer supported";
+}
+
 sub callback_luserconf
 {
 	my @fields = @_;


Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- pam_mount.spec	11 Sep 2008 16:27:14 -0000	1.43
+++ pam_mount.spec	13 Sep 2008 11:15:47 -0000	1.44
@@ -1,6 +1,6 @@
 Name:           pam_mount
 Version:        0.48
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
 Group:          System Environment/Base
@@ -8,15 +8,16 @@
 License:        LGPLv2+ and GPLv2+
 URL:            http://pam-mount.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.lzma
+Patch0:         pam_mount-git-convert_pam_mount_conf-lsof_callback.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel, pam-devel, openssl-devel
 BuildRequires:  libxml2-devel
-BuildRequires:  libHX-devel >= 1.23
+BuildRequires:  libHX-devel >= 1.25
 BuildRequires:  lzma
-Requires:       pam, lsof
+Requires:       pam
 Requires:       psmisc
-Requires:       libHX >= 1.23
+Requires:       libHX >= 1.25
 Requires(post):  perl(XML::Writer)
 
 
@@ -42,6 +43,7 @@
 %prep
 %setup -q -T -c
 lzma -c -d %SOURCE0 | tar -xvvf - -C ..
+%patch0 -p1 -b .convert_pam_mount_conf-lsof_callback
 
 
 %build
@@ -93,6 +95,12 @@
 
 
 %changelog
+* Sat Sep 13 2008 Till Maas <opensource at till.name> - 0.48-2
+- Update libHX dependencies
+- remove lsof dependency
+- Add patch to fix convert_pam_mount_conf.pl by Stephen P. Schaefer
+  (Red Hat Bug 462155)
+
 * Thu Sep 11 2008 Till Maas <opensource at till.name> - 0.48-1
 - Update to new version
 



From till at fedoraproject.org  Sat Sep 13 11:23:53 2008
From: till at fedoraproject.org (Till Maas)
Date: Sat, 13 Sep 2008 11:23:53 +0000 (UTC)
Subject: rpms/pam_mount/F-8 sources,1.12,1.13
Message-ID: <20080913112353.379CE70134@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23427

Modified Files:
	sources 
Log Message:
* Sat Sep 13 2008 Till Maas <opensource at till.name> - 0.48-2
- Update libHX dependencies
- remove lsof dependency
- Add patch to fix convert_pam_mount_conf.pl by Stephen P. Schaefer
  (Red Hat Bug 462155)



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/F-8/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	5 Sep 2008 20:46:13 -0000	1.12
+++ sources	13 Sep 2008 11:23:22 -0000	1.13
@@ -1 +1 @@
-5ef5d12af86a3fe61d1bb0d557f034ac  pam_mount-0.47.tar.lzma
+dcbf1dd27132915d7f9c64362af9a6b0  pam_mount-0.48.tar.lzma



From till at fedoraproject.org  Sat Sep 13 11:25:07 2008
From: till at fedoraproject.org (Till Maas)
Date: Sat, 13 Sep 2008 11:25:07 +0000 (UTC)
Subject: rpms/pam_mount/F-9 sources,1.16,1.17
Message-ID: <20080913112507.2083970134@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23900

Modified Files:
	sources 
Log Message:
* Sat Sep 13 2008 Till Maas <opensource at till.name> - 0.48-2
- Update libHX dependencies
- remove lsof dependency
- Add patch to fix convert_pam_mount_conf.pl by Stephen P. Schaefer
  (Red Hat Bug 462155)



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/F-9/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	5 Sep 2008 20:34:08 -0000	1.16
+++ sources	13 Sep 2008 11:24:36 -0000	1.17
@@ -1 +1 @@
-5ef5d12af86a3fe61d1bb0d557f034ac  pam_mount-0.47.tar.lzma
+dcbf1dd27132915d7f9c64362af9a6b0  pam_mount-0.48.tar.lzma



From jcollie at fedoraproject.org  Sat Sep 13 13:45:57 2008
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sat, 13 Sep 2008 13:45:57 +0000 (UTC)
Subject: rpms/libresample/devel libresample-0.1.3-shlib-cmake.patch, NONE,
	1.1 libresample.spec, 1.5, 1.6
Message-ID: <20080913134558.47D8470134@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/libresample/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv552

Modified Files:
	libresample.spec 
Added Files:
	libresample-0.1.3-shlib-cmake.patch 
Log Message:
* Thu Sep 11 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.1.3-6
- Add a patch that switches to cmake for building and build a shared library.


libresample-0.1.3-shlib-cmake.patch:

--- NEW FILE libresample-0.1.3-shlib-cmake.patch ---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..84857e9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,16 @@
+*~
+/src/config.h
+/libresample.so*
+/cmake_install.cmake
+/CMakeCache.txt
+/.sconsign.dblite
+/CMakeFiles
+/Makefile
+/CTestTestfile.cmake
+/DartTestfile.txt
+/Testing
+/libresample.pc
+/testresample
+/compareresample
+/resample-sndfile
+/docs/html
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..e70429f
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,60 @@
+cmake_minimum_required(VERSION 2.6)
+project(libresample)
+enable_testing()
+
+include(CheckIncludeFiles)
+include(CheckTypeSize)
+include(FindPkgConfig)
+
+check_type_size("void *" POINTER_SIZE)
+
+if(${POINTER_SIZE} EQUAL 8)
+    set(LIBDIR lib64)
+elseif(${POINTER_SIZE} EQUAL 4)
+    set(LIBDIR lib)
+else(${POINTER_SIZE} EQUAL 8)
+    message(FATAL_ERROR "pointer size is not 4 bytes or 8 bytes")
+endif(${POINTER_SIZE} EQUAL 8)
+
+check_include_files(inttypes.h HAVE_INTTYPES_H)
+
+find_library(HAVE_LIBM m)
+
+pkg_check_modules(SNDFILE sndfile)
+pkg_check_modules(SAMPLERATE samplerate)
+
+find_program(DOXYGEN NAMES doxygen)
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/configtemplate.h ${CMAKE_CURRENT_BINARY_DIR}/src/config.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libresample.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libresample.pc)
+
+add_library(resample SHARED src/filterkit.c src/resample.c src/resamplesubs.c)
+set_target_properties(resample PROPERTIES VERSION 1.0 SOVERSION 1)
+install(TARGETS resample LIBRARY DESTINATION ${LIBDIR})
+install(FILES include/libresample.h DESTINATION include)
+
+add_executable(testresample tests/testresample.c)
+target_link_libraries(testresample resample m)
+add_test(testresample testresample)
+
+if(SNDFILE_FOUND)
+   add_executable(resample-sndfile tests/resample-sndfile.c)
+   target_link_libraries(resample-sndfile resample m)
+   set_target_properties(resample-sndfile PROPERTIES COMPILE_FLAGS "${SNDFILE_CFLAGS}" LINK_FLAGS "${SNDFILE_LDFLAGS}")
+   install(TARGETS resample-sndfile RUNTIME DESTINATION bin)
+endif(SNDFILE_FOUND)
+
+if(SAMPLERATE_FOUND)
+   add_executable(compareresample tests/compareresample.c)
+   target_link_libraries(compareresample resample m)
+   set_target_properties(compareresample PROPERTIES COMPILE_FLAGS "${SAMPLERATE_CFLAGS}" LINK_FLAGS "${SAMPLERATE_LDFLAGS}")
+   add_test(compareresample compareresample)
+endif(SAMPLERATE_FOUND)
+
+install(FILES libresample.pc DESTINATION ${LIBDIR}/pkgconfig)
+
+if(DOXYGEN)
+   add_custom_command(OUTPUT docs/html/index.html COMMAND ${DOXYGEN} docs/Doxyfile DEPENDS include/libresample.h)
+   add_custom_target(docs ALL DEPENDS docs/html/index.html)
+endif(DOXYGEN)
+
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index febf70a..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,57 +0,0 @@
-# Run configure to generate Makefile from Makefile.in on
-# any system supported by GNU autoconf.  For all other
-# systems, use this file as a template to create a
-# working Makefile.
-
-CC = @CC@
-CFLAGS = @CFLAGS@ -Wall
-
-LIBS = @LIBS@ -lm
-
-AR = @AR@
-RANLIB = @RANLIB@
-srcdir=@srcdir@
-
-OBJS = \
-	src/resample.c.o \
-	src/resamplesubs.c.o \
-	src/filterkit.c.o
-
-TARGETS = @TARGETS@
-DIRS=tests
-
-all: $(TARGETS)
-
-libresample.a: $(OBJS) Makefile
-	$(AR) ruv libresample.a $(OBJS)
-	ranlib libresample.a
-
-tests/testresample: libresample.a $(srcdir)/tests/testresample.c $(DIRS)
-	$(CC) -o tests/testresample \
-		$(CFLAGS) $(srcdir)/tests/testresample.c \
-		libresample.a $(LIBS)
-
-tests/compareresample: libresample.a $(srcdir)/tests/compareresample.c $(DIRS)
-	$(CC) -o tests/compareresample \
-		$(CFLAGS) $(srcdir)/tests/compareresample.c \
-		libresample.a -lsamplerate $(LIBS)
-
-tests/resample-sndfile: libresample.a $(srcdir)/tests/resample-sndfile.c $(DIRS)
-	$(CC) -o tests/resample-sndfile \
-		$(CFLAGS) $(srcdir)/tests/resample-sndfile.c \
-		libresample.a -lsndfile $(LIBS)
-
-$(DIRS):
-	mkdir $(DIRS)
-
-clean:
-	rm -f $(TARGETS) $(OBJS)
-
-dist: clean
-	rm -f Makefile
-	rm -f config.status config.cache config.log src/config.h
-	rm -f *~ src/*~ tests/*~ include/*~
-
-$(OBJS): %.c.o: $(srcdir)/%.c Makefile $(srcdir)/include/libresample.h \
-	$(srcdir)/src/resample_defs.h $(srcdir)/src/filterkit.h $(srcdir)/src/config.h
-	$(CC) -c $(CFLAGS) $< -o $@
diff --git a/config.guess b/config.guess
deleted file mode 100755
index 297e5c3..0000000
--- a/config.guess
+++ /dev/null
@@ -1,1308 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
-
-timestamp='2001-10-05'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# 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.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Per Bothner <bothner at cygnus.com>.
-# Please send patches to <config-patches at gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
[...7448 lines suppressed...]
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/libresample.pc.in b/libresample.pc.in
new file mode 100644
index 0000000..c984e74
--- /dev/null
+++ b/libresample.pc.in
@@ -0,0 +1,7 @@
+prefix=${CMAKE_INSTALL_PREFIX}
+
+Name: libresample
+Description: A real-time library for audio sampling rate conversion
+Version: 0.1.3
+Cflags: ${CMAKE_C_FLAGS}
+Libs: ${CMAKE_SHARED_LINKER_FLAGS} -lm
diff --git a/src/configtemplate.h b/src/configtemplate.h
index 94ae1ce..bc1cd71 100644
--- a/src/configtemplate.h
+++ b/src/configtemplate.h
@@ -3,5 +3,5 @@
    use this file as a template to create config.h
 */
 
-#undef HAVE_INTTYPES_H
+#cmakedefine HAVE_INTTYPES_H
 
diff --git a/src/resample_defs.h b/src/resample_defs.h
index 576c1bc..ccaf3ee 100644
--- a/src/resample_defs.h
+++ b/src/resample_defs.h
@@ -52,7 +52,7 @@
 #define SGN(x)   ((x)<0   ?(-1):((x)==0?(0):(1)))
 #endif
 
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
   #include <inttypes.h>
   typedef char           BOOL;
   typedef int32_t        WORD;
diff --git a/win/libresample.dsp b/win/libresample.dsp
deleted file mode 100644
index 4ebb51e..0000000
--- a/win/libresample.dsp
+++ /dev/null
@@ -1,116 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libresample" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libresample - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libresample.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libresample.mak" CFG="libresample - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libresample - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libresample - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libresample - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"libresample.lib"
-
-!ELSEIF  "$(CFG)" == "libresample - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"libresampled.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libresample - Win32 Release"
-# Name "libresample - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\src\filterkit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\resample.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\resamplesubs.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\src\filterkit.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\libresample.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\resample_defs.h
-# End Source File
-# End Group
-# End Target
-# End Project


Index: libresample.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libresample/devel/libresample.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libresample.spec	11 Feb 2008 20:10:02 -0000	1.5
+++ libresample.spec	13 Sep 2008 13:45:27 -0000	1.6
@@ -1,12 +1,17 @@
 Summary: A real-time library for audio sampling rate conversion
 Name: libresample
 Version: 0.1.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://ccrma-www.stanford.edu/~jos/resample/Free_Resampling_Software.html
 Source0: http://ccrma.stanford.edu/~jos/resample/libresample-%{version}.tgz
+Patch0: libresample-0.1.3-shlib-cmake.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: cmake >= 2.6
+BuildRequires: doxygen
+BuildRequires: libsndfile-devel
+BuildRequires: libsamplerate-devel
 
 %description
 A real-time library for audio sampling rate conversion providing
@@ -35,23 +40,25 @@
 %package devel
 Summary: Development files for libresample
 Group: Development/Libraries
+Requires: libresample = %{version}-%{release}
 
 %description devel
 Development files for libresample.
 
 %prep
-%setup -q
+%setup0 -q
+%patch0 -p1
 
 %build
-%configure
-make %{?_smp_mflags}
+%cmake .
+make VERBOSE=1 %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_includedir}
-mkdir -p %{buildroot}%{_libdir}
-install -m644 include/libresample.h %{buildroot}%{_includedir}
-install -m644 libresample.a %{buildroot}%{_libdir}
+make install DESTDIR=%{buildroot}
+
+%check
+ctest .
 
 %clean
 rm -rf %{buildroot}
@@ -60,13 +67,23 @@
 
 %postun -p /sbin/ldconfig
 
-%files devel
+%files
 %defattr(-,root,root,-)
 %doc LICENSE.txt README.txt
+%{_bindir}/resample-sndfile
+%{_libdir}/libresample.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%doc LICENSE.txt README.txt docs/html
 %{_includedir}/libresample.h
-%{_libdir}/libresample.a
+%{_libdir}/libresample.so
+%{_libdir}/pkgconfig/libresample.pc
 
 %changelog
+* Thu Sep 11 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.1.3-6
+- Add a patch that switches to cmake for building and build a shared library.
+
 * Mon Feb 11 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.1.3-5
 - Rebuild for GCC 4.3
 



From caolanm at fedoraproject.org  Sat Sep 13 13:59:37 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 13 Sep 2008 13:59:37 +0000 (UTC)
Subject: rpms/hunspell-ss/devel hunspell-ss.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080913135937.7AA8670134@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4648/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-ss.spec import.log 
Log Message:



--- NEW FILE hunspell-ss.spec ---
Name: hunspell-ss
Summary: Swati hunspell dictionaries
%define upstreamid 20060705
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://downloads.translate.org.za/spellchecker/swati/myspell-ss_ZA-%{upstreamid}.zip
Group: Applications/Text
URL: http://www.translate.org.za/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+
BuildArch: noarch

Requires: hunspell

%description
Swati hunspell dictionaries.

%prep
%setup -q -c -n hunspell-ss

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_ss_ZA.txt
%{_datadir}/myspell/*

%changelog
* Wed Sep 10 2008 Caolan McNamara <caolanm at redhat.com> - 0.20060705-1
- initial version


--- NEW FILE import.log ---
hunspell-ss-0_20060705-1_fc9:HEAD:hunspell-ss-0.20060705-1.fc9.src.rpm:1221314389


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ss/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2008 04:42:20 -0000	1.1
+++ .cvsignore	13 Sep 2008 13:59:07 -0000	1.2
@@ -0,0 +1 @@
+myspell-ss_ZA-20060705.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ss/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2008 04:42:20 -0000	1.1
+++ sources	13 Sep 2008 13:59:07 -0000	1.2
@@ -0,0 +1 @@
+49bd1f790f16ef190bf940692d4ea276  myspell-ss_ZA-20060705.zip



From kasal at fedoraproject.org  Sat Sep 13 14:10:45 2008
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sat, 13 Sep 2008 14:10:45 +0000 (UTC)
Subject: rpms/brltty/devel brltty-3.9-autoconf.patch, NONE,
	1.1 brltty-3.9-parallel.patch, NONE, 1.1 brltty-3.9-pyxfix.patch,
	NONE, 1.1 brltty.spec, 1.28, 1.29
Message-ID: <20080913141045.3998A70134@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/brltty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8664

Modified Files:
	brltty.spec 
Added Files:
	brltty-3.9-autoconf.patch brltty-3.9-parallel.patch 
	brltty-3.9-pyxfix.patch 
Log Message:
- add brltty-3.9-autoconf.patch to fix to build with Autoconf 2.62
- add brltty-3.9-parallel.patch to fix race condition with parallel make
- add brltty-3.9-pyxfix.patch to fix build with current pyrex
- Summary lines shall not end with a dot

brltty-3.9-autoconf.patch:

--- NEW FILE brltty-3.9-autoconf.patch ---
2008-09-12  Stepan Kasal  <skasal at redhat.com>

	* aclocal.m4 (BRLTTY_HELP_STRING, BRLTTY_TEXT_TABLE,
	BRLTTY_ATTRIBUTES_TABLE): Expand parameters to AC_HELP_STRING
	and m4_text_wrap, to be compatible with Autoconf 2.62+.

--- brltty-3.9.orig/aclocal.m4.orig	2007-10-17 17:19:31.000000000 +0200
+++ brltty-3.9.orig/aclocal.m4	2008-09-12 18:05:21.000000000 +0200
@@ -144,7 +144,7 @@
 
 AC_DEFUN([BRLTTY_HELP_STRING], [dnl
 AC_HELP_STRING([$1], patsubst([$2], [
-.*$]), [brltty_help_prefix])dnl
+.*$]), m4_defn([brltty_help_prefix]))dnl
 patsubst(patsubst([$2], [\`[^
 ]*]), [
 ], [\&brltty_help_prefix])[]dnl
@@ -384,11 +384,11 @@
 
 AC_DEFUN([BRLTTY_TEXT_TABLE], [dnl
 define([brltty_tables_text], ifdef([brltty_tables_text], [brltty_tables_text])[
-m4_text_wrap([$2], [           ], [- m4_format([%-8s ], [$1])], brltty_help_width)])])
+m4_text_wrap([$2], [           ], [- ]m4_format([%-8s ], [$1]), brltty_help_width)])])
 
 AC_DEFUN([BRLTTY_ATTRIBUTES_TABLE], [dnl
 define([brltty_tables_attributes], ifdef([brltty_tables_attributes], [brltty_tables_attributes])[
-m4_text_wrap([$2], [             ], [- m4_format([%-10s ], [$1])], brltty_help_width)])])
+m4_text_wrap([$2], [             ], [- ]m4_format([%-10s ], [$1]), brltty_help_width)])])
 
 AC_DEFUN([BRLTTY_SUMMARY_BEGIN], [dnl
 brltty_summary_lines="Options Summary:"

brltty-3.9-parallel.patch:

--- NEW FILE brltty-3.9-parallel.patch ---
2008-09-12  Stepan Kasal  <skasal at redhat.com>

	* Programs/Makefile.in (braille-drivers): Depend on `api';
	without this, make -j8 failed, because some of the drivers
	call target `brlapi'.  Recursive make is harmful.

diff -up brltty-3.9/Programs/Makefile.in.parallel brltty-3.9/Programs/Makefile.in
--- brltty-3.9/Programs/Makefile.in.parallel	2007-10-17 17:19:24.000000000 +0200
+++ brltty-3.9/Programs/Makefile.in	2008-09-12 17:44:54.000000000 +0200
@@ -381,7 +381,7 @@ apitest.$O:
 
 ###############################################################################
 
-braille-drivers: txt2hlp
+braille-drivers: txt2hlp api
 	for driver in $(BRAILLE_EXTERNAL_DRIVER_NAMES); \
 	do (cd $(BLD_TOP)$(BRL_DIR)/$$driver && $(MAKE) braille-driver braille-help) || exit 1; \
 	done

brltty-3.9-pyxfix.patch:

--- NEW FILE brltty-3.9-pyxfix.patch ---
2008-09-13  Stepan Kasal  <skasal at redhat.com>

	Backport fix to satisfy current pyrex.

	* Bindings/Python/brlapi.pyx (ignoreKeys, acceptKeys): Do not
	use keyword "type" as a name of a parameter.

--- ./Bindings/Python/brlapi.pyx.orig	2007-10-17 17:19:30.000000000 +0200
+++ ./Bindings/Python/brlapi.pyx	2008-09-12 18:08:47.000000000 +0200
@@ -484,7 +484,7 @@
 		else:
 			return { "type":ekc.type, "command":ekc.command, "argument":ekc.argument, "flags":ekc.flags }
 	
-	def ignoreKeys(self, type, set):
+	def ignoreKeys(self, key_type, set):
 		"""Ignore some key presses from the braille keyboard.
 		See brlapi_ignoreKeys(3).
 		
@@ -495,7 +495,7 @@
 		cdef c_brlapi.brlapi_rangeType_t c_type
 		cdef c_brlapi.brlapi_keyCode_t *c_set
 		cdef unsigned int c_n
-		c_type = type
+		c_type = key_type
 		c_n = len(set)
 		c_set = <c_brlapi.brlapi_keyCode_t*>c_brlapi.malloc(c_n * sizeof(c_set[0]))
 		for i from 0 <= i < c_n:
@@ -509,7 +509,7 @@
 		else:
 			return retval
 
-	def acceptKeys(self, type, set):
+	def acceptKeys(self, key_type, set):
 		"""Accept some key presses from the braille keyboard.
 		See brlapi_ignoreKeys(3).
 		
@@ -520,7 +520,7 @@
 		cdef c_brlapi.brlapi_rangeType_t c_type
 		cdef c_brlapi.brlapi_keyCode_t *c_set
 		cdef unsigned int c_n
-		c_type = type
+		c_type = key_type
 		c_n = len(set)
 		c_set = <c_brlapi.brlapi_keyCode_t*>c_brlapi.malloc(c_n * sizeof(c_set[0]))
 		for i from 0 <= i < c_n:


Index: brltty.spec
===================================================================
RCS file: /cvs/extras/rpms/brltty/devel/brltty.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- brltty.spec	28 Feb 2008 13:43:34 -0000	1.28
+++ brltty.spec	13 Sep 2008 14:10:14 -0000	1.29
@@ -9,7 +9,7 @@
 
 Name: brltty
 Version: %{pkg_version}
-Release: 2.2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
@@ -17,8 +17,11 @@
 Patch0: brltty-3.9-tcl85path.patch
 Patch1: brltty-3.9-java-svn.patch
 Patch2: brltty-3.9-gnusource.patch
+Patch3: brltty-3.9-autoconf.patch
+Patch4: brltty-3.9-pyxfix.patch
+Patch5: brltty-3.9-parallel.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-InstallRoot
-Summary: Braille display driver for Linux/Unix.
+Summary: Braille display driver for Linux/Unix
 Requires(post): coreutils
 BuildRequires: byacc, glibc-kernheaders
 # BuildRequires: ocaml
@@ -33,7 +36,7 @@
 
 %package xw
 Requires: %{name}
-Summary: XWindow driver for BRLTTY.
+Summary: XWindow driver for BRLTTY
 Group: System Environment/Daemons
 License: GPLv2+
 BuildRequires: libSM-devel libICE-devel libX11-devel libXaw-devel libXext-devel libXt-devel libXtst-devel
@@ -42,7 +45,7 @@
 
 %package at-spi
 Requires: %{name}
-Summary: AtSpi driver for BRLTTY.
+Summary: AtSpi driver for BRLTTY
 Group: System Environment/Daemons
 License: GPLv2+
 BuildRequires: at-spi-devel
@@ -53,7 +56,7 @@
 Version: %{api_version}
 Group: Applications/System
 License: LGPLv2+
-Summary: Appliation Programming Interface for BRLTTY.
+Summary: Appliation Programming Interface for BRLTTY
 %description -n brlapi
 This package provides the run-time support for the Application
 Programming Interface to BRLTTY.
@@ -66,8 +69,8 @@
 Group: Development/System
 License: LGPLv2+
 Requires: brlapi = %{api_version}
+Summary: Headers, static archive, and documentation for BrlAPI
 
-Summary: Headers, static archive, and documentation for BrlAPI.
 %description -n brlapi-devel
 This package provides the header files, static archive, shared object
 linker reference, and reference documentation for BrlAPI (the
@@ -86,7 +89,7 @@
 License: LGPLv2+
 Requires: brlapi = %{api_version}
 BuildRequires: tcl-devel tcl
-Summary: Tcl binding for BrlAPI.
+Summary: Tcl binding for BrlAPI
 %description -n tcl-brlapi
 This package provides the Tcl binding for BrlAPI.
 
@@ -96,7 +99,7 @@
 License: LGPLv2+
 Requires: brlapi = %{api_version}
 BuildRequires: Pyrex
-Summary: Python binding for BrlAPI.
+Summary: Python binding for BrlAPI
 %description -n python-brlapi
 This package provides the Python binding for BrlAPI.
 
@@ -107,7 +110,7 @@
 Requires: brlapi = %{api_version}
 BuildRequires: java-devel
 #BuildRequires: java-1.7.0-icedtea-devel
-Summary: Java binding for BrlAPI.
+Summary: Java binding for BrlAPI
 %description -n brlapi-java
 This package provides the Java binding for BrlAPI.
 
@@ -118,6 +121,9 @@
 %patch0 -p1 -b .tcl85path
 %patch1 -p1 -b .java-svn
 %patch2 -p1 -b .gnusource
+%patch3 -p1 -b .autoconf
+%patch4 -p1 -b .pyxfix
+%patch5 -p1 -b .parallel
 ./autogen
 
 %build
@@ -217,6 +223,12 @@
 
 
 %changelog
+* Wed Sep 10 2008 Stepan Kasal <skasal at redhat.com> - 3.9-3
+- add brltty-3.9-autoconf.patch to fix to build with Autoconf 2.62
+- add brltty-3.9-parallel.patch to fix race condition with parallel make
+- add brltty-3.9-pyxfix.patch to fix build with current pyrex
+- Summary lines shall not end with a dot
+
 * Thu Feb 28 2008 Tomas Janousek <tjanouse at redhat.com> - 3.9-2.2
 - glibc build fixes
 - applied java reorganisations from svn



From remi at fedoraproject.org  Sat Sep 13 14:53:32 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 13 Sep 2008 14:53:32 +0000 (UTC)
Subject: rpms/php/devel php.spec,1.159,1.160
Message-ID: <20080913145332.835CA70134@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20966

Modified Files:
	php.spec 
Log Message:
Add XPM support in GD + fix BR


Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- php.spec	20 Jul 2008 10:11:32 -0000	1.159
+++ php.spec	13 Sep 2008 14:53:02 -0000	1.160
@@ -8,7 +8,7 @@
 Summary: The PHP HTML-embedded scripting language
 Name: php
 Version: 5.2.6
-Release: 4
+Release: 5
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -43,7 +43,7 @@
 
 BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, expat-devel
 BuildRequires: gmp-devel
-BuildRequires: httpd-devel >= 2.0.46-1, libjpeg-devel, libpng-devel, pam-devel
+BuildRequires: httpd-devel >= 2.0.46-1, pam-devel
 BuildRequires: libstdc++-devel, openssl-devel, sqlite-devel >= 3.0.0
 BuildRequires: zlib-devel, pcre-devel >= 6.6, smtpdaemon, readline-devel
 BuildRequires: bzip2, perl, libtool >= 1.4.3, gcc-c++
@@ -269,7 +269,8 @@
 Summary: A module for PHP applications for using the gd graphics library
 Group: Development/Languages
 Requires: php-common = %{version}-%{release}
-BuildRequires: gd-devel, freetype-devel, t1lib-devel
+# Required to build the bundled GD library
+BuildRequires: libXpm-devel, libjpeg-devel, libpng-devel, freetype-devel, t1lib-devel
 
 %description gd
 The php-gd package contains a dynamic shared object that will add
@@ -455,6 +456,7 @@
 	--with-exec-dir=%{_bindir} \
 	--with-freetype-dir=%{_prefix} \
 	--with-png-dir=%{_prefix} \
+	--with-xpm-dir=%{_prefix} \
 	--enable-gd-native-ttf \
 	--with-t1lib=%{_prefix} \
 	--without-gdbm \
@@ -726,6 +728,10 @@
 %files pspell -f files.pspell
 
 %changelog
+* Sat Sep 13 2008 Remi Collet <Fedora at FamilleCollet.com> 5.2.6-5
+- enable XPM support in php-gd
+- Fix BR for php-gd
+
 * Sun Jul 20 2008 Remi Collet <Fedora at FamilleCollet.com> 5.2.6-4
 - enable T1lib support in php-gd
 



From athimm at fedoraproject.org  Sat Sep 13 15:18:36 2008
From: athimm at fedoraproject.org (Axel Thimm)
Date: Sat, 13 Sep 2008 15:18:36 +0000 (UTC)
Subject: rpms/smart/F-8 smart.pam,1.3,1.4 smart.spec,1.30,1.31
Message-ID: <20080913151836.9E01D70134@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28837/F-8

Modified Files:
	smart.pam smart.spec 
Log Message:
Fix bad smart.pam commit.


Index: smart.pam
===================================================================
RCS file: /cvs/extras/rpms/smart/F-8/smart.pam,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smart.pam	24 Aug 2008 09:01:43 -0000	1.3
+++ smart.pam	13 Sep 2008 15:18:06 -0000	1.4
@@ -1,7 +1,7 @@
 #%PAM-1.0
 auth       sufficient	pam_rootok.so
 auth       sufficient	pam_timestamp.so
-auth       required	pam_stack.so service=system-auth
+auth       include	system-auth
 session    required	pam_permit.so
 session    optional	pam_timestamp.so
 session    optional	pam_xauth.so


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/F-8/smart.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- smart.spec	27 Aug 2008 05:01:51 -0000	1.30
+++ smart.spec	13 Sep 2008 15:18:06 -0000	1.31
@@ -7,7 +7,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 1.0
-Release: 54%{?dist}
+Release: 55%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -203,6 +203,9 @@
 %endif
 
 %changelog
+* Sat Sep 13 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.0-55
+- Fix bad smart.pam commit.
+
 * Wed Aug 27 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.0-54
 - omit (broken) BR: qt-devel (Rex Dieter).
 - fix comment typo (Ville Skytt??).



From athimm at fedoraproject.org  Sat Sep 13 15:18:36 2008
From: athimm at fedoraproject.org (Axel Thimm)
Date: Sat, 13 Sep 2008 15:18:36 +0000 (UTC)
Subject: rpms/smart/F-9 smart.pam,1.3,1.4 smart.spec,1.34,1.35
Message-ID: <20080913151836.C3D3F70134@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28837/F-9

Modified Files:
	smart.pam smart.spec 
Log Message:
Fix bad smart.pam commit.


Index: smart.pam
===================================================================
RCS file: /cvs/extras/rpms/smart/F-9/smart.pam,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smart.pam	24 Aug 2008 09:01:43 -0000	1.3
+++ smart.pam	13 Sep 2008 15:18:06 -0000	1.4
@@ -1,7 +1,7 @@
 #%PAM-1.0
 auth       sufficient	pam_rootok.so
 auth       sufficient	pam_timestamp.so
-auth       required	pam_stack.so service=system-auth
+auth       include	system-auth
 session    required	pam_permit.so
 session    optional	pam_timestamp.so
 session    optional	pam_xauth.so


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/F-9/smart.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- smart.spec	27 Aug 2008 05:01:51 -0000	1.34
+++ smart.spec	13 Sep 2008 15:18:06 -0000	1.35
@@ -7,7 +7,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 1.0
-Release: 54%{?dist}
+Release: 55%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -203,6 +203,9 @@
 %endif
 
 %changelog
+* Sat Sep 13 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.0-55
+- Fix bad smart.pam commit.
+
 * Wed Aug 27 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.0-54
 - omit (broken) BR: qt-devel (Rex Dieter).
 - fix comment typo (Ville Skytt??).



From athimm at fedoraproject.org  Sat Sep 13 15:18:37 2008
From: athimm at fedoraproject.org (Axel Thimm)
Date: Sat, 13 Sep 2008 15:18:37 +0000 (UTC)
Subject: rpms/smart/devel smart.pam,1.3,1.4 smart.spec,1.34,1.35
Message-ID: <20080913151837.0215B70134@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28837/devel

Modified Files:
	smart.pam smart.spec 
Log Message:
Fix bad smart.pam commit.


Index: smart.pam
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/smart.pam,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smart.pam	24 Aug 2008 08:43:30 -0000	1.3
+++ smart.pam	13 Sep 2008 15:18:06 -0000	1.4
@@ -1,7 +1,7 @@
 #%PAM-1.0
 auth       sufficient	pam_rootok.so
 auth       sufficient	pam_timestamp.so
-auth       required	pam_stack.so service=system-auth
+auth       include	system-auth
 session    required	pam_permit.so
 session    optional	pam_timestamp.so
 session    optional	pam_xauth.so


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/smart.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- smart.spec	27 Aug 2008 05:01:52 -0000	1.34
+++ smart.spec	13 Sep 2008 15:18:06 -0000	1.35
@@ -7,7 +7,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 1.0
-Release: 54%{?dist}
+Release: 55%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -203,6 +203,9 @@
 %endif
 
 %changelog
+* Sat Sep 13 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.0-55
+- Fix bad smart.pam commit.
+
 * Wed Aug 27 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.0-54
 - omit (broken) BR: qt-devel (Rex Dieter).
 - fix comment typo (Ville Skytt??).



From athimm at fedoraproject.org  Sat Sep 13 15:34:58 2008
From: athimm at fedoraproject.org (Axel Thimm)
Date: Sat, 13 Sep 2008 15:34:58 +0000 (UTC)
Subject: rpms/fedora-package-config-apt/F-9 fedora-updates-newkey.list, NONE,
	1.1 fedora-package-config-apt.spec, 1.9, 1.10
Message-ID: <20080913153458.C764070134@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-apt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1546/F-9

Modified Files:
	fedora-package-config-apt.spec 
Added Files:
	fedora-updates-newkey.list 
Log Message:
Temporary location of updates for F9/F8.


--- NEW FILE fedora-updates-newkey.list ---
# Fedora 
repomd http://download.fedora.redhat.com/pub/ fedora/linux/updates/$(VERSION)/$(ARCH).newkey/

# Debug packages
#repomd http://download.fedora.redhat.com/pub/ fedora/linux/updates/$(VERSION)/$(ARCH)/debug.newkey/

# sources
#repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/updates/$(VERSION)/SRPMS.newkey/


Index: fedora-package-config-apt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/F-9/fedora-package-config-apt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-package-config-apt.spec	25 Aug 2008 12:15:07 -0000	1.9
+++ fedora-package-config-apt.spec	13 Sep 2008 15:34:28 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Fedora configuration files for the apt-rpm package manager
 Name: fedora-package-config-apt
 Version: 9
-Release: 3
+Release: 3.transitional
 # Nothing in here has copyright, much less license attribution, however,
 # since this is "upstream", we'll take this statement as the author's intent,
 # and use GPL+ here (since no version is specified).
@@ -12,6 +12,7 @@
 # 100-149 for sources.list.d
 Source100:      fedora.list
 Source101:      fedora-updates.list
+Source1010:	fedora-updates-newkey.list
 Source102:      fedora-devel.list
 
 # 150-199 for apt.conf.d
@@ -47,7 +48,7 @@
   %{buildroot}%{_sysconfdir}/apt/vendors.list.d/fedora.list
 
 # Default source list entries
-for source in %{SOURCE100} %{SOURCE101} %{SOURCE102}; do
+for source in %{SOURCE100} %{SOURCE101} %{SOURCE1010} %%{SOURCE102}; do
   install -pm 644 $source %{buildroot}%{_sysconfdir}/apt/sources.list.d/
 done
 
@@ -65,6 +66,9 @@
 
 
 %changelog
+* Sat Sep 13 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 9-3.transitional
+- Temporary location of updates for F9/F8.
+
 * Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com>
 - fix license tag
 



From athimm at fedoraproject.org  Sat Sep 13 15:34:58 2008
From: athimm at fedoraproject.org (Axel Thimm)
Date: Sat, 13 Sep 2008 15:34:58 +0000 (UTC)
Subject: rpms/fedora-package-config-apt/F-8 fedora-updates-newkey.list, NONE,
	1.1 fedora-package-config-apt.spec, 1.7, 1.8
Message-ID: <20080913153458.A088170134@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-apt/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1546/F-8

Modified Files:
	fedora-package-config-apt.spec 
Added Files:
	fedora-updates-newkey.list 
Log Message:
Temporary location of updates for F9/F8.


--- NEW FILE fedora-updates-newkey.list ---
# Fedora 
repomd http://download.fedora.redhat.com/pub/ fedora/linux/updates/$(VERSION)/$(ARCH).newkey/

# Debug packages
#repomd http://download.fedora.redhat.com/pub/ fedora/linux/updates/$(VERSION)/$(ARCH)/debug.newkey/

# sources
#repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/updates/$(VERSION)/SRPMS.newkey/


Index: fedora-package-config-apt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/F-8/fedora-package-config-apt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-package-config-apt.spec	25 Aug 2008 12:15:07 -0000	1.7
+++ fedora-package-config-apt.spec	13 Sep 2008 15:34:28 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Fedora configuration files for the apt-rpm package manager
 Name: fedora-package-config-apt
 Version: 8
-Release: 2
+Release: 2.transitional
 # Nothing in here has copyright, much less license attribution, however,
 # since this is "upstream", we'll take this statement as the author's intent,
 # and use GPL+ here (since no version is specified).
@@ -12,6 +12,7 @@
 # 100-149 for sources.list.d
 Source100:      fedora.list
 Source101:      fedora-updates.list
+Source1010:	fedora-updates-newkey.list
 Source102:      fedora-devel.list
 
 # 150-199 for apt.conf.d
@@ -47,7 +48,7 @@
   %{buildroot}%{_sysconfdir}/apt/vendors.list.d/fedora.list
 
 # Default source list entries
-for source in %{SOURCE100} %{SOURCE101} %{SOURCE102}; do
+for source in %{SOURCE100} %{SOURCE101} %{SOURCE1010} %%{SOURCE102}; do
   install -pm 644 $source %{buildroot}%{_sysconfdir}/apt/sources.list.d/
 done
 
@@ -65,6 +66,9 @@
 
 
 %changelog
+* Sat Sep 13 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 8-2.transitional
+- Temporary location of updates for F9/F8.
+
 * Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 9.89-2
 - fix license tag
 



From cebbert at fedoraproject.org  Sat Sep 13 15:39:03 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 13 Sep 2008 15:39:03 +0000 (UTC)
Subject: rpms/kerneloops/devel .cvsignore, 1.4, 1.5 kerneloops.spec, 1.13,
	1.14 sources, 1.3, 1.4
Message-ID: <20080913153903.17C9C70134@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kerneloops/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3279

Modified Files:
	.cvsignore kerneloops.spec sources 
Log Message:
kerneloops 0.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kerneloops/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Jun 2008 18:12:08 -0000	1.4
+++ .cvsignore	13 Sep 2008 15:38:32 -0000	1.5
@@ -1,3 +1,3 @@
 clog
-kerneloops-0.11
-kerneloops-0.11.tar.gz
+kerneloops-0.12
+kerneloops-0.12.tar.gz


Index: kerneloops.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kerneloops/devel/kerneloops.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kerneloops.spec	17 Jun 2008 18:12:08 -0000	1.13
+++ kerneloops.spec	13 Sep 2008 15:38:32 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		kerneloops
-Version:	0.11
+Version:	0.12
 Release:	1%{?dist}
 Summary:	Tool to automatically collect and submit kernel crash signatures
 
@@ -67,6 +67,9 @@
 %doc %{_mandir}/man8/kerneloops.8.gz
 
 %changelog
+* Tue Jun 17 2008 Chuck Ebbert <cebbert at redhat.com>  0.12-1
+- kerneloops 0.12
+
 * Tue Jun 17 2008 Chuck Ebbert <cebbert at redhat.com>  0.11-1
 - kerneloops 0.11
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kerneloops/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Jun 2008 18:12:08 -0000	1.3
+++ sources	13 Sep 2008 15:38:32 -0000	1.4
@@ -1 +1 @@
-a0daa9437f0638912a91afe66f51545b  kerneloops-0.11.tar.gz
+97e611e5b09831cb6ee31c31bf2bc286  kerneloops-0.12.tar.gz



From athimm at fedoraproject.org  Sat Sep 13 15:47:06 2008
From: athimm at fedoraproject.org (Axel Thimm)
Date: Sat, 13 Sep 2008 15:47:06 +0000 (UTC)
Subject: rpms/fedora-package-config-apt/F-8 fedora-package-config-apt.spec,
	1.8, 1.9
Message-ID: <20080913154706.9DDC570134@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-apt/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6177/F-8

Modified Files:
	fedora-package-config-apt.spec 
Log Message:
Temporary location of updates for F9/F8.


Index: fedora-package-config-apt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/F-8/fedora-package-config-apt.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-package-config-apt.spec	13 Sep 2008 15:34:28 -0000	1.8
+++ fedora-package-config-apt.spec	13 Sep 2008 15:46:36 -0000	1.9
@@ -12,7 +12,7 @@
 # 100-149 for sources.list.d
 Source100:      fedora.list
 Source101:      fedora-updates.list
-Source1010:	fedora-updates-newkey.list
+Source103:	fedora-updates-newkey.list
 Source102:      fedora-devel.list
 
 # 150-199 for apt.conf.d
@@ -48,7 +48,7 @@
   %{buildroot}%{_sysconfdir}/apt/vendors.list.d/fedora.list
 
 # Default source list entries
-for source in %{SOURCE100} %{SOURCE101} %{SOURCE1010} %%{SOURCE102}; do
+for source in %{SOURCE100} %{SOURCE101} %{SOURCE103} %%{SOURCE102}; do
   install -pm 644 $source %{buildroot}%{_sysconfdir}/apt/sources.list.d/
 done
 



From athimm at fedoraproject.org  Sat Sep 13 15:47:06 2008
From: athimm at fedoraproject.org (Axel Thimm)
Date: Sat, 13 Sep 2008 15:47:06 +0000 (UTC)
Subject: rpms/fedora-package-config-apt/F-9 fedora-package-config-apt.spec, 
	1.10, 1.11
Message-ID: <20080913154706.D254870134@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-apt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6177/F-9

Modified Files:
	fedora-package-config-apt.spec 
Log Message:
Temporary location of updates for F9/F8.


Index: fedora-package-config-apt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/F-9/fedora-package-config-apt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fedora-package-config-apt.spec	13 Sep 2008 15:34:28 -0000	1.10
+++ fedora-package-config-apt.spec	13 Sep 2008 15:46:36 -0000	1.11
@@ -12,7 +12,7 @@
 # 100-149 for sources.list.d
 Source100:      fedora.list
 Source101:      fedora-updates.list
-Source1010:	fedora-updates-newkey.list
+Source103:	fedora-updates-newkey.list
 Source102:      fedora-devel.list
 
 # 150-199 for apt.conf.d
@@ -48,7 +48,7 @@
   %{buildroot}%{_sysconfdir}/apt/vendors.list.d/fedora.list
 
 # Default source list entries
-for source in %{SOURCE100} %{SOURCE101} %{SOURCE1010} %%{SOURCE102}; do
+for source in %{SOURCE100} %{SOURCE101} %{SOURCE103} %%{SOURCE102}; do
   install -pm 644 $source %{buildroot}%{_sysconfdir}/apt/sources.list.d/
 done
 



From than at fedoraproject.org  Sat Sep 13 15:48:35 2008
From: than at fedoraproject.org (Than Ngo)
Date: Sat, 13 Sep 2008 15:48:35 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.1.1-kdeui-widgets-fixes.patch, 1.1,
	1.2 kdelibs.spec, 1.375, 1.376
Message-ID: <20080913154835.9895270134@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6877

Modified Files:
	kdelibs-4.1.1-kdeui-widgets-fixes.patch kdelibs.spec 
Log Message:
fix kdelibs-4.1.1-kdeui-widgets-fixes.patch


kdelibs-4.1.1-kdeui-widgets-fixes.patch:

Index: kdelibs-4.1.1-kdeui-widgets-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs-4.1.1-kdeui-widgets-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.1.1-kdeui-widgets-fixes.patch	12 Sep 2008 20:32:08 -0000	1.1
+++ kdelibs-4.1.1-kdeui-widgets-fixes.patch	13 Sep 2008 15:48:34 -0000	1.2
@@ -71,10 +71,11 @@
 +      d->mMenu->addAction(d->mWhatsThisAction);
        need_separator = true;
      }
+
 Index: kdeui/widgets/ktabwidget.cpp
 ===================================================================
---- kdeui/widgets/ktabwidget.cpp	(revision 858490)
-+++ kdeui/widgets/ktabwidget.cpp	(revision 858491)
+--- kdeui/widgets/ktabwidget.cpp	(Revision 858490)
++++ kdeui/widgets/ktabwidget.cpp	(Revision 858491)
 @@ -281,14 +281,22 @@
  
  QString KTabWidget::tabText( int index ) const
@@ -107,8 +108,8 @@
  void KTabWidget::setTabText( int index, const QString &text )
 Index: kdeui/widgets/ktabwidget.h
 ===================================================================
---- kdeui/widgets/ktabwidget.h	(revision 858490)
-+++ kdeui/widgets/ktabwidget.h	(revision 858491)
+--- kdeui/widgets/ktabwidget.h	(Revision 858490)
++++ kdeui/widgets/ktabwidget.h	(Revision 858491)
 @@ -187,7 +187,7 @@
       * Removes the widget, reimplemented for
       * internal reasons (keeping labels in sync).


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -r1.375 -r1.376
--- kdelibs.spec	12 Sep 2008 22:28:08 -0000	1.375
+++ kdelibs.spec	13 Sep 2008 15:48:35 -0000	1.376
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -28,7 +28,7 @@
 %define rest 1
 %endif
 
-BuildRequires: kde4-macros(api) >= 3
+BuildRequires: kde4-macros(api) >= 2
 BuildRequires: kde-filesystem >= 4
 Requires: dbus-x11
 Requires: hicolor-icon-theme
@@ -376,6 +376,9 @@
 
 
 %changelog
+* Sat Sep 13 2008 Than Ngo <than at redhat.com> 4.1.1-8
+- fix kdelibs-4.1.1-kdeui-widgets-fixes.patch
+
 * Sat Sep 13 2008 Than Ngo <than at redhat.com> 4.1.1-7
 - remove redundant FEDORA, use CMAKE_BUILD_TYPE=release
 - fix install problem with cmake > 2.5



From athimm at fedoraproject.org  Sat Sep 13 15:55:45 2008
From: athimm at fedoraproject.org (Axel Thimm)
Date: Sat, 13 Sep 2008 15:55:45 +0000 (UTC)
Subject: rpms/fedora-package-config-smart/F-9
	fedora-package-config-smart.spec, 1.12, 1.13
Message-ID: <20080913155545.B7CEF70134@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9480/F-9

Modified Files:
	fedora-package-config-smart.spec 
Log Message:
Temporary location of updates for F9/F8.


Index: fedora-package-config-smart.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/F-9/fedora-package-config-smart.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fedora-package-config-smart.spec	2 Jul 2008 17:48:28 -0000	1.12
+++ fedora-package-config-smart.spec	13 Sep 2008 15:55:15 -0000	1.13
@@ -5,7 +5,7 @@
 Summary: Fedora configuration files for the Smart package manager
 Name: fedora-package-config-smart
 Version: 9
-Release: 13.0.1
+Release: 13.0.1.transitional
 License: GPL+
 Group: System Environment/Base
 URL: http://fedoraproject.org/
@@ -27,6 +27,9 @@
   sed -e's, at ARCH@,%{_target_cpu},g' -e's, at DISTVERSION@,%{version},' < $filein > $file
 done
 
+cp fedora-updates.channel fedora-updates-newkey.channel
+perl -pi -e's,(baseurl=.*)/$,$1.newkey/,' fedora-updates-newkey.channel
+
 %if %{rawhide}
 perl -pi -e's,disabled=.*,disabled=yes,' fedora.channel fedora-updates.channel \
   fedora-updates-testing.channel
@@ -51,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
+* Sat Sep 13 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 9-13.0.1.transitional
+- Temporary location of updates for F9/F8.
+
 * Sat May 17 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 9-13
 - Switch to stable release.
 



From athimm at fedoraproject.org  Sat Sep 13 15:55:45 2008
From: athimm at fedoraproject.org (Axel Thimm)
Date: Sat, 13 Sep 2008 15:55:45 +0000 (UTC)
Subject: rpms/fedora-package-config-smart/F-8
	fedora-package-config-smart.spec, 1.10, 1.11
Message-ID: <20080913155545.915B170134@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9480/F-8

Modified Files:
	fedora-package-config-smart.spec 
Log Message:
Temporary location of updates for F9/F8.


Index: fedora-package-config-smart.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/F-8/fedora-package-config-smart.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fedora-package-config-smart.spec	2 Jul 2008 17:48:02 -0000	1.10
+++ fedora-package-config-smart.spec	13 Sep 2008 15:55:15 -0000	1.11
@@ -5,7 +5,7 @@
 Summary: Fedora configuration files for the Smart package manager
 Name: fedora-package-config-smart
 Version: 8
-Release: 12.0.1
+Release: 12.0.1.transitional
 License: GPL+
 Group: System Environment/Base
 URL: http://fedoraproject.org/
@@ -27,6 +27,9 @@
   sed -e's, at ARCH@,%{_target_cpu},g' -e's, at DISTVERSION@,%{version},' < $filein > $file
 done
 
+cp fedora-updates.channel fedora-updates-newkey.channel
+perl -pi -e's,(baseurl=.*)/$,$1.newkey/,' fedora-updates-newkey.channel
+
 %if %{rawhide}
 perl -pi -e's,disabled=.*,disabled=yes,' fedora.channel fedora-updates.channel \
   fedora-updates-testing.channel
@@ -51,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
+* Sat Sep 13 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 8-12.0.1.transitional
+- Temporary location of updates for F9/F8.
+
 * Sat Mar 22 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 8-11
 - Create common source tarball.
 



From cheese at fedoraproject.org  Sat Sep 13 16:23:13 2008
From: cheese at fedoraproject.org (josef radinger)
Date: Sat, 13 Sep 2008 16:23:13 +0000 (UTC)
Subject: rpms/bmpx/devel bmpx-libsoup24.patch,1.1,1.2 bmpx.spec,1.13,1.14
Message-ID: <20080913162313.1519C70134@cvs1.fedora.phx.redhat.com>

Author: cheese

Update of /cvs/pkgs/rpms/bmpx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18006

Modified Files:
	bmpx-libsoup24.patch bmpx.spec 
Log Message:
fix libsoup-patch, switch from cdparanoia to libcdio (for now), fix compile


bmpx-libsoup24.patch:

Index: bmpx-libsoup24.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bmpx/devel/bmpx-libsoup24.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bmpx-libsoup24.patch	15 Feb 2008 19:32:00 -0000	1.1
+++ bmpx-libsoup24.patch	13 Sep 2008 16:22:42 -0000	1.2
@@ -10,7 +10,7 @@
 +PKG_CHECK_MODULES([SOUP], [libsoup-2.4 >= 2.3.0.1])
  
  # sqlite
- PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.3])
+ PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.4])
 diff -up bmpx-0.40.13/sentinel/beep-media-player-2-sentinel.cc.libsoup24 bmpx-0.40.13/sentinel/beep-media-player-2-sentinel.cc
 --- bmpx-0.40.13/sentinel/beep-media-player-2-sentinel.cc.libsoup24	2007-10-18 19:17:06.000000000 +0200
 +++ bmpx-0.40.13/sentinel/beep-media-player-2-sentinel.cc	2008-02-15 20:26:58.000000000 +0100
@@ -26,7 +26,7 @@
 -G_END_DECLS
 -#endif
  
- #define SERVER_NAME "beep-media-player.org"
+ #define SERVER_NAME "bmpx.backtrace.info"
  
 diff -up bmpx-0.40.13/src/minisoup.hh.libsoup24 bmpx-0.40.13/src/minisoup.hh
 --- bmpx-0.40.13/src/minisoup.hh.libsoup24	2007-10-18 19:17:08.000000000 +0200


Index: bmpx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bmpx/devel/bmpx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bmpx.spec	6 Jun 2008 20:48:17 -0000	1.13
+++ bmpx.spec	13 Sep 2008 16:22:42 -0000	1.14
@@ -1,13 +1,14 @@
 Summary:	Beep Media Player eXperimental
 Name:		bmpx
 Version:	0.40.14
-Release:	5%{?dist}
+Release:	6%{?dist}
 
 License:	GPLv2
 Group:		Applications/Multimedia
 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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gcc-c++
@@ -29,7 +30,7 @@
 # BuildRequires:	libsidplay-devel
 BuildRequires:	startup-notification-devel
 BuildRequires:	libofa-devel
-BuildRequires:	cdparanoia-devel
+##BuildRequires:	cdparanoia-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	libmodplug-devel
 BuildRequires:	gettext
@@ -40,6 +41,7 @@
 BuildRequires:	dbus-glib-devel
 BuildRequires:	libSM-devel
 BuildRequires:	intltool
+BuildRequires:	libcdio-devel
 
 %description
 BMPx is an audio player that features support for specifications like XDS DnD,
@@ -77,13 +79,15 @@
 %prep
 %setup -q
 %patch0 -p1 -b .libsoup24
+%patch1 -p1 -b .hostnotfound
 
 %build
 %configure \
   --disable-hal \
   --enable-mp4v2 \
   --disable-sid \
-  --enable-modplug
+  --enable-modplug \
+  --without-cdparanoia
 #	--enable-sid \
 
 %{__make} %{?_smp_mflags}
@@ -175,6 +179,11 @@
 
 
 %changelog
+* Sat Sep 13 2008 josef radinger <cheese at nosuchhost.net> - 0.40.14-6
+- fix patch libsoup
+- add hostnotfound-patch
+- remove cdparanoia, use libcdio (for now)
+
 * Fri Jun  6 2008 Alexander Kahl <akahl at iconmobile.com> - 0.40.14-5
 - disabled sid support for now, problems on ppc
 



From athimm at fedoraproject.org  Sat Sep 13 16:42:36 2008
From: athimm at fedoraproject.org (Axel Thimm)
Date: Sat, 13 Sep 2008 16:42:36 +0000 (UTC)
Subject: rpms/fedora-package-config-apt/F-8 fedora-package-config-apt.spec,
	1.9, 1.10
Message-ID: <20080913164236.2420670134@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-apt/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24259/F-8

Modified Files:
	fedora-package-config-apt.spec 
Log Message:
Temporary location of updates for F9/F8.


Index: fedora-package-config-apt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/F-8/fedora-package-config-apt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-package-config-apt.spec	13 Sep 2008 15:46:36 -0000	1.9
+++ fedora-package-config-apt.spec	13 Sep 2008 16:42:05 -0000	1.10
@@ -12,8 +12,8 @@
 # 100-149 for sources.list.d
 Source100:      fedora.list
 Source101:      fedora-updates.list
-Source103:	fedora-updates-newkey.list
-Source102:      fedora-devel.list
+Source102:	fedora-updates-newkey.list
+Source103:      fedora-devel.list
 
 # 150-199 for apt.conf.d
 # additional "factory defaults" for fedora
@@ -48,7 +48,7 @@
   %{buildroot}%{_sysconfdir}/apt/vendors.list.d/fedora.list
 
 # Default source list entries
-for source in %{SOURCE100} %{SOURCE101} %{SOURCE103} %%{SOURCE102}; do
+for source in %{SOURCE100} %{SOURCE101} %{SOURCE102} %{SOURCE103}; do
   install -pm 644 $source %{buildroot}%{_sysconfdir}/apt/sources.list.d/
 done
 



From athimm at fedoraproject.org  Sat Sep 13 16:42:36 2008
From: athimm at fedoraproject.org (Axel Thimm)
Date: Sat, 13 Sep 2008 16:42:36 +0000 (UTC)
Subject: rpms/fedora-package-config-apt/F-9 fedora-package-config-apt.spec, 
	1.11, 1.12
Message-ID: <20080913164236.48C9770136@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-apt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24259/F-9

Modified Files:
	fedora-package-config-apt.spec 
Log Message:
Temporary location of updates for F9/F8.


Index: fedora-package-config-apt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/F-9/fedora-package-config-apt.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fedora-package-config-apt.spec	13 Sep 2008 15:46:36 -0000	1.11
+++ fedora-package-config-apt.spec	13 Sep 2008 16:42:06 -0000	1.12
@@ -12,8 +12,8 @@
 # 100-149 for sources.list.d
 Source100:      fedora.list
 Source101:      fedora-updates.list
-Source103:	fedora-updates-newkey.list
-Source102:      fedora-devel.list
+Source102:	fedora-updates-newkey.list
+Source103:      fedora-devel.list
 
 # 150-199 for apt.conf.d
 # additional "factory defaults" for fedora
@@ -48,7 +48,7 @@
   %{buildroot}%{_sysconfdir}/apt/vendors.list.d/fedora.list
 
 # Default source list entries
-for source in %{SOURCE100} %{SOURCE101} %{SOURCE103} %%{SOURCE102}; do
+for source in %{SOURCE100} %{SOURCE101} %{SOURCE102} %{SOURCE103}; do
   install -pm 644 $source %{buildroot}%{_sysconfdir}/apt/sources.list.d/
 done
 



From pkgdb at fedoraproject.org  Sat Sep 13 16:47:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:47:56 +0000
Subject: [pkgdb] ogre: atorkhov has requested watchbugzilla
Message-ID: <20080913164757.1F2AD208D9A@bastion.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on ogre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 16:48:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:48:01 +0000
Subject: [pkgdb] ogre: atorkhov has requested commit
Message-ID: <20080913164801.49428208D9E@bastion.fedora.phx.redhat.com>

atorkhov has requested the commit acl on ogre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 16:48:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:48:09 +0000
Subject: [pkgdb] ogre: atorkhov has requested watchcommits
Message-ID: <20080913164809.A35C4208D9A@bastion.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on ogre (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 16:48:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:48:03 +0000
Subject: [pkgdb] ogre: atorkhov has requested watchcommits
Message-ID: <20080913164804.37924208DA2@bastion.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on ogre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 16:48:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:48:10 +0000
Subject: [pkgdb] ogre: atorkhov has requested commit
Message-ID: <20080913164810.AABD6208DA6@bastion.fedora.phx.redhat.com>

atorkhov has requested the commit acl on ogre (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 16:48:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:48:13 +0000
Subject: [pkgdb] ogre: atorkhov has requested watchcommits
Message-ID: <20080913164813.2B9AC208DAA@bastion.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on ogre (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 16:48:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:48:12 +0000
Subject: [pkgdb] ogre: atorkhov has requested watchbugzilla
Message-ID: <20080913164813.4A41E208DAC@bastion.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on ogre (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 16:48:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:48:15 +0000
Subject: [pkgdb] ogre: atorkhov has requested watchbugzilla
Message-ID: <20080913164815.3552B208DAF@bastion.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on ogre (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 16:48:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:48:15 +0000
Subject: [pkgdb] ogre: atorkhov has requested commit
Message-ID: <20080913164815.7D323208DB2@bastion.fedora.phx.redhat.com>

atorkhov has requested the commit acl on ogre (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 16:49:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:49:18 +0000
Subject: [pkgdb] chess: atorkhov has requested watchcommits
Message-ID: <20080913164918.EF031208D9A@bastion.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on chess (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 16:49:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:49:18 +0000
Subject: [pkgdb] chess: atorkhov has requested watchbugzilla
Message-ID: <20080913164919.98AB2208DA3@bastion.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on chess (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 16:49:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:49:20 +0000
Subject: [pkgdb] chess: atorkhov has requested commit
Message-ID: <20080913164920.DB1AD208DA6@bastion.fedora.phx.redhat.com>

atorkhov has requested the commit acl on chess (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 16:49:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:49:23 +0000
Subject: [pkgdb] chess: atorkhov has requested watchbugzilla
Message-ID: <20080913164924.0ACF7208DA9@bastion.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on chess (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 16:49:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:49:25 +0000
Subject: [pkgdb] chess: atorkhov has requested watchcommits
Message-ID: <20080913164925.6036E208D9E@bastion.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on chess (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 16:49:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:49:28 +0000
Subject: [pkgdb] chess: atorkhov has requested commit
Message-ID: <20080913164928.9C45E208DA2@bastion.fedora.phx.redhat.com>

atorkhov has requested the commit acl on chess (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 16:49:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:49:29 +0000
Subject: [pkgdb] chess: atorkhov has requested watchbugzilla
Message-ID: <20080913164929.6FD6E208DAE@bastion.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on chess (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 16:49:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:49:30 +0000
Subject: [pkgdb] chess: atorkhov has requested watchcommits
Message-ID: <20080913164930.4DA48208DB1@bastion.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on chess (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 16:49:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:49:31 +0000
Subject: [pkgdb] chess: atorkhov has requested commit
Message-ID: <20080913164931.4074B208DB4@bastion.fedora.phx.redhat.com>

atorkhov has requested the commit acl on chess (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 16:49:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:49:58 +0000
Subject: [pkgdb] vegastrike: atorkhov has requested watchbugzilla
Message-ID: <20080913164958.EDAB3208DA3@bastion.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on vegastrike (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From pkgdb at fedoraproject.org  Sat Sep 13 16:50:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:50:00 +0000
Subject: [pkgdb] vegastrike: atorkhov has requested commit
Message-ID: <20080913165000.2C04C208DA0@bastion.fedora.phx.redhat.com>

atorkhov has requested the commit acl on vegastrike (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From pkgdb at fedoraproject.org  Sat Sep 13 16:50:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:50:01 +0000
Subject: [pkgdb] vegastrike: atorkhov has requested watchcommits
Message-ID: <20080913165001.2BAA7208DA7@bastion.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on vegastrike (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From pkgdb at fedoraproject.org  Sat Sep 13 16:50:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:50:07 +0000
Subject: [pkgdb] vegastrike: atorkhov has requested watchbugzilla
Message-ID: <20080913165007.4198E208DB9@bastion.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on vegastrike (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From pkgdb at fedoraproject.org  Sat Sep 13 16:50:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:50:04 +0000
Subject: [pkgdb] vegastrike: atorkhov has requested watchbugzilla
Message-ID: <20080913165005.4D958208DB6@bastion.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on vegastrike (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From pkgdb at fedoraproject.org  Sat Sep 13 16:50:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:50:07 +0000
Subject: [pkgdb] vegastrike: atorkhov has requested watchcommits
Message-ID: <20080913165008.00534208DBC@bastion.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on vegastrike (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From pkgdb at fedoraproject.org  Sat Sep 13 16:50:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:50:09 +0000
Subject: [pkgdb] vegastrike: atorkhov has requested watchcommits
Message-ID: <20080913165009.52A13208DBE@bastion.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on vegastrike (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From pkgdb at fedoraproject.org  Sat Sep 13 16:50:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:50:09 +0000
Subject: [pkgdb] vegastrike: atorkhov has requested commit
Message-ID: <20080913165009.885BE208DC1@bastion.fedora.phx.redhat.com>

atorkhov has requested the commit acl on vegastrike (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From pkgdb at fedoraproject.org  Sat Sep 13 16:50:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 16:50:11 +0000
Subject: [pkgdb] vegastrike: atorkhov has requested commit
Message-ID: <20080913165011.B53D9208DAB@bastion.fedora.phx.redhat.com>

atorkhov has requested the commit acl on vegastrike (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From mtasaka at fedoraproject.org  Sat Sep 13 17:14:39 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 13 Sep 2008 17:14:39 +0000 (UTC)
Subject: rpms/mfiler3/F-8 mfiler3-2.0.7-upgrade-compat.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 mfiler3.spec, 1.8, 1.9 sources, 1.8, 1.9
Message-ID: <20080913171439.78F6C70134@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mfiler3/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1995/F-8

Modified Files:
	.cvsignore mfiler3.spec sources 
Added Files:
	mfiler3-2.0.7-upgrade-compat.patch 
Log Message:
* Mon Sep 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.7-2
- 2.0.7
- Workaround patch to deal with segv after upgrade


mfiler3-2.0.7-upgrade-compat.patch:

--- NEW FILE mfiler3-2.0.7-upgrade-compat.patch ---
--- src/etc/.mfiler3.rb.upcompat	2008-09-13 01:52:40.000000000 +0900
+++ src/etc/.mfiler3.rb	2008-09-14 01:32:41.000000000 +0900
@@ -792,7 +792,12 @@
         i += 1
     end
 
-    n2 = f.gets.chomp!.to_i
+    tmp = f.gets
+    if tmp
+        n2 = tmp.chomp!.to_i
+    else
+        n2 = 0
+    end
 
     i=0
     while i<n2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-8/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Aug 2008 11:19:58 -0000	1.8
+++ .cvsignore	13 Sep 2008 17:14:08 -0000	1.9
@@ -1 +1 @@
-mfiler3-2.0.6.tgz
+mfiler3-2.0.7.tgz


Index: mfiler3.spec
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-8/mfiler3.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mfiler3.spec	28 Aug 2008 11:42:03 -0000	1.8
+++ mfiler3.spec	13 Sep 2008 17:14:09 -0000	1.9
@@ -2,7 +2,7 @@
 %define			rubyabi			1.8
 
 Name:		mfiler3
-Version:	2.0.6
+Version:	2.0.7
 Release:	2%{?dist}
 Summary:	Two pane file manager under UNIX console
 
@@ -12,6 +12,7 @@
 Source0:	http://www.geocities.jp/daisuke530221jp/%{name}-%{version}.tgz
 Source10:	mfiler3.sh
 Patch0:		mfiler3-2.0.5-use-external.patch
+Patch1:		mfiler3-2.0.7-upgrade-compat.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmigemo-devel
@@ -46,6 +47,7 @@
 %{__sed} -i.debuginfo -e 's|-g -w||' configure
 
 %patch0 -p1 -b .ext
+%patch1 -p0 -b .upcompat
 # Remove unneeded internal directories to make it sure that
 # we are using external libraries
 %{__rm} -rf \
@@ -95,6 +97,10 @@
 
 
 %changelog
+* Mon Sep 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.7-2
+- 2.0.7
+- Workaround patch to deal with segv after upgrade
+
 * Thu Aug 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.6-2
 - 2.0.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-8/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Aug 2008 11:19:58 -0000	1.8
+++ sources	13 Sep 2008 17:14:09 -0000	1.9
@@ -1 +1 @@
-8748d4d3ac86df53c64ed2c813e46050  mfiler3-2.0.6.tgz
+ada5c7ea7dc58840113e5958f89cf16c  mfiler3-2.0.7.tgz



From mtasaka at fedoraproject.org  Sat Sep 13 17:14:39 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 13 Sep 2008 17:14:39 +0000 (UTC)
Subject: rpms/mfiler3/F-9 mfiler3-2.0.7-upgrade-compat.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 mfiler3.spec, 1.8, 1.9 sources, 1.8, 1.9
Message-ID: <20080913171439.9E9B970134@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mfiler3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1995/F-9

Modified Files:
	.cvsignore mfiler3.spec sources 
Added Files:
	mfiler3-2.0.7-upgrade-compat.patch 
Log Message:
* Mon Sep 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.7-2
- 2.0.7
- Workaround patch to deal with segv after upgrade


mfiler3-2.0.7-upgrade-compat.patch:

--- NEW FILE mfiler3-2.0.7-upgrade-compat.patch ---
--- src/etc/.mfiler3.rb.upcompat	2008-09-13 01:52:40.000000000 +0900
+++ src/etc/.mfiler3.rb	2008-09-14 01:32:41.000000000 +0900
@@ -792,7 +792,12 @@
         i += 1
     end
 
-    n2 = f.gets.chomp!.to_i
+    tmp = f.gets
+    if tmp
+        n2 = tmp.chomp!.to_i
+    else
+        n2 = 0
+    end
 
     i=0
     while i<n2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Aug 2008 11:19:59 -0000	1.8
+++ .cvsignore	13 Sep 2008 17:14:09 -0000	1.9
@@ -1 +1 @@
-mfiler3-2.0.6.tgz
+mfiler3-2.0.7.tgz


Index: mfiler3.spec
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-9/mfiler3.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mfiler3.spec	28 Aug 2008 11:42:03 -0000	1.8
+++ mfiler3.spec	13 Sep 2008 17:14:09 -0000	1.9
@@ -2,7 +2,7 @@
 %define			rubyabi			1.8
 
 Name:		mfiler3
-Version:	2.0.6
+Version:	2.0.7
 Release:	2%{?dist}
 Summary:	Two pane file manager under UNIX console
 
@@ -12,6 +12,7 @@
 Source0:	http://www.geocities.jp/daisuke530221jp/%{name}-%{version}.tgz
 Source10:	mfiler3.sh
 Patch0:		mfiler3-2.0.5-use-external.patch
+Patch1:		mfiler3-2.0.7-upgrade-compat.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmigemo-devel
@@ -46,6 +47,7 @@
 %{__sed} -i.debuginfo -e 's|-g -w||' configure
 
 %patch0 -p1 -b .ext
+%patch1 -p0 -b .upcompat
 # Remove unneeded internal directories to make it sure that
 # we are using external libraries
 %{__rm} -rf \
@@ -95,6 +97,10 @@
 
 
 %changelog
+* Mon Sep 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.7-2
+- 2.0.7
+- Workaround patch to deal with segv after upgrade
+
 * Thu Aug 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.6-2
 - 2.0.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Aug 2008 11:19:59 -0000	1.8
+++ sources	13 Sep 2008 17:14:09 -0000	1.9
@@ -1 +1 @@
-8748d4d3ac86df53c64ed2c813e46050  mfiler3-2.0.6.tgz
+ada5c7ea7dc58840113e5958f89cf16c  mfiler3-2.0.7.tgz



From mtasaka at fedoraproject.org  Sat Sep 13 17:14:39 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 13 Sep 2008 17:14:39 +0000 (UTC)
Subject: rpms/mfiler3/devel mfiler3-2.0.7-upgrade-compat.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 mfiler3.spec, 1.8, 1.9 sources, 1.8, 1.9
Message-ID: <20080913171439.DC0F270134@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mfiler3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1995/devel

Modified Files:
	.cvsignore mfiler3.spec sources 
Added Files:
	mfiler3-2.0.7-upgrade-compat.patch 
Log Message:
* Mon Sep 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.7-2
- 2.0.7
- Workaround patch to deal with segv after upgrade


mfiler3-2.0.7-upgrade-compat.patch:

--- NEW FILE mfiler3-2.0.7-upgrade-compat.patch ---
--- src/etc/.mfiler3.rb.upcompat	2008-09-13 01:52:40.000000000 +0900
+++ src/etc/.mfiler3.rb	2008-09-14 01:32:41.000000000 +0900
@@ -792,7 +792,12 @@
         i += 1
     end
 
-    n2 = f.gets.chomp!.to_i
+    tmp = f.gets
+    if tmp
+        n2 = tmp.chomp!.to_i
+    else
+        n2 = 0
+    end
 
     i=0
     while i<n2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Aug 2008 11:19:59 -0000	1.8
+++ .cvsignore	13 Sep 2008 17:14:09 -0000	1.9
@@ -1 +1 @@
-mfiler3-2.0.6.tgz
+mfiler3-2.0.7.tgz


Index: mfiler3.spec
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/devel/mfiler3.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mfiler3.spec	28 Aug 2008 11:42:04 -0000	1.8
+++ mfiler3.spec	13 Sep 2008 17:14:09 -0000	1.9
@@ -2,7 +2,7 @@
 %define			rubyabi			1.8
 
 Name:		mfiler3
-Version:	2.0.6
+Version:	2.0.7
 Release:	2%{?dist}
 Summary:	Two pane file manager under UNIX console
 
@@ -12,6 +12,7 @@
 Source0:	http://www.geocities.jp/daisuke530221jp/%{name}-%{version}.tgz
 Source10:	mfiler3.sh
 Patch0:		mfiler3-2.0.5-use-external.patch
+Patch1:		mfiler3-2.0.7-upgrade-compat.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmigemo-devel
@@ -46,6 +47,7 @@
 %{__sed} -i.debuginfo -e 's|-g -w||' configure
 
 %patch0 -p1 -b .ext
+%patch1 -p0 -b .upcompat
 # Remove unneeded internal directories to make it sure that
 # we are using external libraries
 %{__rm} -rf \
@@ -95,6 +97,10 @@
 
 
 %changelog
+* Mon Sep 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.7-2
+- 2.0.7
+- Workaround patch to deal with segv after upgrade
+
 * Thu Aug 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.6-2
 - 2.0.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Aug 2008 11:19:59 -0000	1.8
+++ sources	13 Sep 2008 17:14:09 -0000	1.9
@@ -1 +1 @@
-8748d4d3ac86df53c64ed2c813e46050  mfiler3-2.0.6.tgz
+ada5c7ea7dc58840113e5958f89cf16c  mfiler3-2.0.7.tgz



From cebbert at fedoraproject.org  Sat Sep 13 17:18:28 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 13 Sep 2008 17:18:28 +0000 (UTC)
Subject: rpms/kerneloops/F-9 .cvsignore, 1.4, 1.5 kerneloops.spec, 1.13,
	1.14 sources, 1.3, 1.4
Message-ID: <20080913171828.6366C70134@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kerneloops/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3565

Modified Files:
	.cvsignore kerneloops.spec sources 
Log Message:
kerneloops 0.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kerneloops/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 May 2008 16:22:27 -0000	1.4
+++ .cvsignore	13 Sep 2008 17:17:57 -0000	1.5
@@ -1,3 +1,3 @@
 clog
-kerneloops-0.11
-kerneloops-0.11.tar.gz
+kerneloops-0.12
+kerneloops-0.12.tar.gz


Index: kerneloops.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kerneloops/F-9/kerneloops.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kerneloops.spec	16 May 2008 16:22:27 -0000	1.13
+++ kerneloops.spec	13 Sep 2008 17:17:57 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		kerneloops
-Version:	0.11
+Version:	0.12
 Release:	1%{?dist}
 Summary:	Tool to automatically collect and submit kernel crash signatures
 
@@ -67,6 +67,9 @@
 %doc %{_mandir}/man8/kerneloops.8.gz
 
 %changelog
+* Tue Jun 17 2008 Chuck Ebbert <cebbert at redhat.com>  0.12-1
+- kerneloops 0.12
+
 * Fri May 16 2008 Chuck Ebbert <cebbert at redhat.com>  0.11-1
 - Update to version 0.11
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kerneloops/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 May 2008 16:22:27 -0000	1.3
+++ sources	13 Sep 2008 17:17:57 -0000	1.4
@@ -1 +1 @@
-a0daa9437f0638912a91afe66f51545b  kerneloops-0.11.tar.gz
+97e611e5b09831cb6ee31c31bf2bc286  kerneloops-0.12.tar.gz



From cheese at fedoraproject.org  Sat Sep 13 17:40:24 2008
From: cheese at fedoraproject.org (josef radinger)
Date: Sat, 13 Sep 2008 17:40:24 +0000 (UTC)
Subject: rpms/bmpx/devel bmpx-hostnotfound.patch,NONE,1.1
Message-ID: <20080913174024.4327570134@cvs1.fedora.phx.redhat.com>

Author: cheese

Update of /cvs/pkgs/rpms/bmpx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11162

Added Files:
	bmpx-hostnotfound.patch 
Log Message:
add patch


bmpx-hostnotfound.patch:

--- NEW FILE bmpx-hostnotfound.patch ---
--- bmpx-0.40.14/src/network.cc.orig	2008-09-13 12:02:00.000000000 +0200
+++ bmpx-0.40.14/src/network.cc	2008-09-13 12:03:17.000000000 +0200
@@ -37,6 +37,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#undef HOST_NOT_FOUND
 #include <stdio.h>
 #include <unistd.h>
 



From athimm at fedoraproject.org  Sat Sep 13 17:48:50 2008
From: athimm at fedoraproject.org (Axel Thimm)
Date: Sat, 13 Sep 2008 17:48:50 +0000 (UTC)
Subject: rpms/fedora-package-config-smart/F-9
	fedora-package-config-smart.spec, 1.13, 1.14
Message-ID: <20080913174850.BA8D970134@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14229/F-9

Modified Files:
	fedora-package-config-smart.spec 
Log Message:
Temporary location of updates for F9/F8.


Index: fedora-package-config-smart.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/F-9/fedora-package-config-smart.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fedora-package-config-smart.spec	13 Sep 2008 15:55:15 -0000	1.13
+++ fedora-package-config-smart.spec	13 Sep 2008 17:48:20 -0000	1.14
@@ -29,6 +29,7 @@
 
 cp fedora-updates.channel fedora-updates-newkey.channel
 perl -pi -e's,(baseurl=.*)/$,$1.newkey/,' fedora-updates-newkey.channel
+perl -pi -e's,],-newkey],' fedora-updates-newkey.channel
 
 %if %{rawhide}
 perl -pi -e's,disabled=.*,disabled=yes,' fedora.channel fedora-updates.channel \



From athimm at fedoraproject.org  Sat Sep 13 17:48:50 2008
From: athimm at fedoraproject.org (Axel Thimm)
Date: Sat, 13 Sep 2008 17:48:50 +0000 (UTC)
Subject: rpms/fedora-package-config-smart/F-8
	fedora-package-config-smart.spec, 1.11, 1.12
Message-ID: <20080913174850.9D1E570134@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14229/F-8

Modified Files:
	fedora-package-config-smart.spec 
Log Message:
Temporary location of updates for F9/F8.


Index: fedora-package-config-smart.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/F-8/fedora-package-config-smart.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fedora-package-config-smart.spec	13 Sep 2008 15:55:15 -0000	1.11
+++ fedora-package-config-smart.spec	13 Sep 2008 17:48:20 -0000	1.12
@@ -29,6 +29,7 @@
 
 cp fedora-updates.channel fedora-updates-newkey.channel
 perl -pi -e's,(baseurl=.*)/$,$1.newkey/,' fedora-updates-newkey.channel
+perl -pi -e's,],-newkey],' fedora-updates-newkey.channel
 
 %if %{rawhide}
 perl -pi -e's,disabled=.*,disabled=yes,' fedora.channel fedora-updates.channel \



From erikos at fedoraproject.org  Sat Sep 13 18:12:28 2008
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Sat, 13 Sep 2008 18:12:28 +0000 (UTC)
Subject: rpms/sugar/OLPC-3 .cvsignore, 1.17, 1.18 sources, 1.18,
	1.19 sugar.spec, 1.21, 1.22
Message-ID: <20080913181228.F27BE70137@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21723

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Sat Sep 13 2008 Simon Schampijer <simon at laptop.org> - 0.82.6-1
- #8438 control panel fails when run with python -OO
- #8470 SpreadLayout leaks self._collisions
- #8375 gst usage in the shell wastes 2.6mb
- #8372 Remove numpy usage from the shell




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	11 Sep 2008 10:01:28 -0000	1.17
+++ .cvsignore	13 Sep 2008 18:11:58 -0000	1.18
@@ -1 +1 @@
-sugar-0.82.4.tar.bz2
+sugar-0.82.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	12 Sep 2008 16:30:12 -0000	1.18
+++ sources	13 Sep 2008 18:11:58 -0000	1.19
@@ -1 +1 @@
-b013856f373c16c3946805217fad93fe  sugar-0.82.5.tar.bz2
+dacc98607ddd4a083a1ed9a04b5985cf  sugar-0.82.6.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sugar.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sugar.spec	12 Sep 2008 16:30:12 -0000	1.21
+++ sugar.spec	13 Sep 2008 18:11:58 -0000	1.22
@@ -3,7 +3,7 @@
 
 Summary: OLPC desktop environment
 Name: sugar
-Version: 0.82.5
+Version: 0.82.6
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
@@ -94,6 +94,12 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Sat Sep 13 2008 Simon Schampijer <simon at laptop.org> - 0.82.6-1
+- #8438 control panel fails when run with python -OO
+- #8470 SpreadLayout leaks self._collisions
+- #8375 gst usage in the shell wastes 2.6mb
+- #8372 Remove numpy usage from the shell
+
 * Thu Sep 12 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.5-1
 - #8427 Sugar does not send SetActive(True)
 - #8409 Sugar does not save network's BSSIDs in networks.cfg



From erikos at fedoraproject.org  Sat Sep 13 18:16:57 2008
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Sat, 13 Sep 2008 18:16:57 +0000 (UTC)
Subject: rpms/sugar-toolkit/OLPC-3 .cvsignore, 1.13, 1.14 sources, 1.14,
	1.15 sugar-toolkit.spec, 1.18, 1.19
Message-ID: <20080913181657.DA97670134@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-toolkit/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23475

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Sat Sep 13 2008 Simon Schampijer <simon at laptop.org> - 0.82.7-1
- #8375 gst usage in the shell wastes 2.6mb
- #8394 sugar shell leaks presence service info
- #8469 palette.menu is leaked 




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	11 Sep 2008 09:58:04 -0000	1.13
+++ .cvsignore	13 Sep 2008 18:16:26 -0000	1.14
@@ -1 +1 @@
-sugar-toolkit-0.82.6.tar.bz2
+sugar-toolkit-0.82.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	11 Sep 2008 09:58:04 -0000	1.14
+++ sources	13 Sep 2008 18:16:27 -0000	1.15
@@ -1 +1 @@
-ce1a33591f0242bf815e3cfa06ee62c9  sugar-toolkit-0.82.6.tar.bz2
+2e83dd9497f29f83c731e78e6016d084  sugar-toolkit-0.82.7.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sugar-toolkit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sugar-toolkit.spec	11 Sep 2008 09:58:04 -0000	1.18
+++ sugar-toolkit.spec	13 Sep 2008 18:16:27 -0000	1.19
@@ -5,7 +5,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.82.6
+Version: 0.82.7
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
@@ -25,6 +25,7 @@
 BuildRequires: gtk2-devel
 BuildRequires: perl-XML-Parser
 BuildRequires: libSM-devel
+BuildRequires: alsa-lib-devel
 
 Requires: gnome-python2-rsvg
 Requires: dbus-python
@@ -65,6 +66,11 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Sat Sep 13 2008 Simon Schampijer <simon at laptop.org> - 0.82.7-1
+- #8375 gst usage in the shell wastes 2.6mb
+- #8394 sugar shell leaks presence service info
+- #8469 palette.menu is leaked 
+
 * Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.6-1
 - #8394 sugar shell leaks presence service info
 - #8392 Remove "dynamic" font height computation



From epienbro at fedoraproject.org  Sat Sep 13 18:54:11 2008
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Sat, 13 Sep 2008 18:54:11 +0000 (UTC)
Subject: rpms/nntpgrab/F-8 nntpgrab_use_nss_compat_ossl.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 nntpgrab.spec, 1.11, 1.12 sources, 1.10, 1.11
Message-ID: <20080913185411.B0B2270134@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3095/F-8

Modified Files:
	.cvsignore nntpgrab.spec sources 
Added Files:
	nntpgrab_use_nss_compat_ossl.patch 
Log Message:
- Update to 0.3.91
- Added a patch to use NSS instead of OpenSSL (with the help of nss_compat_ossl)
- The .htaccess file was missing in the nntpgrab-web subpackage
- Include %_libdir/nntpgrab directory (for F-8 and F-9, devel was already done)


nntpgrab_use_nss_compat_ossl.patch:

--- NEW FILE nntpgrab_use_nss_compat_ossl.patch ---
Index: plugins/nntp/nntp.c
===================================================================
--- plugins/nntp/nntp.c	(revision 1026)
+++ plugins/nntp/nntp.c	(working copy)
@@ -35,8 +35,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #endif
-#include <openssl/ssl.h>
-#include <openssl/err.h>
+#include <nss_compat_ossl/nss_compat_ossl.h>
 
 #ifdef _MSC_VER
 #include "config.h.win32"
Index: plugins/nntp/Makefile.am
===================================================================
--- plugins/nntp/Makefile.am	(revision 1026)
+++ plugins/nntp/Makefile.am	(working copy)
@@ -2,9 +2,9 @@
 plugin_LTLIBRARIES = libnntpgrab_plugin_nntp.la
 
 libnntpgrab_plugin_nntp_la_SOURCES = nntp.c
-libnntpgrab_plugin_nntp_la_CFLAGS = -I$(top_srcdir)/plugins -I$(top_srcdir)/base $(GLIB_CFLAGS) $(OPENSSL_CFLAGS)
+libnntpgrab_plugin_nntp_la_CFLAGS = -I$(top_srcdir)/plugins -I$(top_srcdir)/base $(GLIB_CFLAGS) $(NSS_CFLAGS)
 libnntpgrab_plugin_nntp_la_LDFLAGS = -module -no-undefined -version-info 0:0:0 -export-symbols ../nntpgrab_plugin_nntp.def 
-libnntpgrab_plugin_nntp_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
+libnntpgrab_plugin_nntp_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS) -lnss_compat_ossl
 
 if WIN32
 libnntpgrab_plugin_nntp_la_SOURCES += strptime.c
Index: configure.in
===================================================================
--- configure.in	(revision 1029)
+++ configure.in	(working copy)
@@ -33,6 +33,7 @@
 #PKG_CHECK_MODULES(SQLITE3, sqlite3,,[AC_MSG_ERROR([* SQLite 3.0 of hoger kan niet gevonden worden (is the package sqlite-devel installed?)])])
 PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.60,have_dbus=true,[AC_MSG_RESULT([* DBUS-Glib 0.60 or higher could not be found (is the package dbus-devel and/or dbus-glib-devel installed?).])]; have_dbus=false)
 PKG_CHECK_MODULES(SOUP, libsoup-2.4, have_soup=true,[AC_MSG_RESULT([* libsoup 2.4 or higher could not be found (is the package libsoup-devel installed?). Without libsoup, the NZBCreator service can't be accessed])]; have_soup=false)
+PKG_CHECK_MODULES(NSS, nss,,[AC_MSG_ERROR([* NSS could not be found (is the package nss-devel installed?)])])
 #PKG_CHECK_MODULES(GLIB_SHARP, glib-sharp-2.0,,[AC_MSG_ERROR([* GLib-sharp 2.0 or higher could not be found (is the package glib-sharp2-devel installed?)])])
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_CFLAGS)
@@ -48,6 +49,8 @@
 AC_SUBST(SOUP_LIBS)
 AC_SUBST(SOUP_CFLAGS)
 AM_CONDITIONAL(HAVE_SOUP, $have_soup)
+AC_SUBST(NSS_LIBS)
+AC_SUBST(NSS_CFLAGS)
 #AC_SUBST(GLIB_SHARP_LIBS)
 #AC_SUBST(GLIB_SHARP_CFLAGS)
 
@@ -347,20 +350,10 @@
         [Curl headers could be found],
         curl)
 
-AC_FIND_LIB2(ssl, $ac_default_lib_searchpath, openssl_libraries,
-        [OpenSSL libraries.],
-        [OpenSSL bibliotheek niet gevonden.])
-
-AC_FIND_HEADER2(openssl/md5.h, $ac_default_inc_searchpath, openssl_headers,
-        [OpenSSL headers.],
-        [OpenSSL header bestanden niet gevonden.])
-
 AC_SUBST(PCRE_CFLAGS, $pcre_headers_CFLAGS)
 AC_SUBST(PCRE_LIBS, $pcre_libraries_LIBS)
 AC_SUBST(CURL_CFLAGS, $libcurl_headers_CFLAGS)
 AC_SUBST(CURL_LIBS, $libcurl_libraries_LIBS)
-AC_SUBST(OPENSSL_CFLAGS, $openssl_headers_CFLAGS)
-AC_SUBST(OPENSSL_LIBS, "$openssl_libraries_LIBS -lcrypto")
 
 # gettext
 AC_PROG_INTLTOOL([0.21], [no-xml])


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Aug 2008 19:51:52 -0000	1.4
+++ .cvsignore	13 Sep 2008 18:53:41 -0000	1.5
@@ -1 +1 @@
-nntpgrab-0.3.90.tar.bz2
+nntpgrab-0.3.91.tar.bz2


Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-8/nntpgrab.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nntpgrab.spec	22 Aug 2008 19:51:53 -0000	1.11
+++ nntpgrab.spec	13 Sep 2008 18:53:41 -0000	1.12
@@ -1,6 +1,6 @@
 Summary: NNTPGrab is a program to download files from the usenet
 Name: nntpgrab
-Version: 0.3.90
+Version: 0.3.91
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
@@ -28,13 +28,16 @@
 BuildRequires:	curl-devel
 BuildRequires:	libnotify-devel
 BuildRequires:	sqlite-devel
-BuildRequires:	openssl-devel
+BuildRequires:	nss-devel
 BuildRequires:	php-devel
 BuildRequires:	dbus-devel
 BuildRequires:	intltool
 BuildRequires:	libsoup-devel
 BuildRequires:	par2cmdline
 
+# necessary for the NSS patch
+BuildRequires:	nss_compat_ossl-devel
+
 %description
 With this program it is possible to download files from the usenet
 
@@ -130,6 +133,11 @@
 %prep
 %setup -q
 
+# Use NSS instead of OpenSSL
+%patch0 -p0
+aclocal
+autoconf
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -189,6 +197,7 @@
 # Install the webinterface to /usr/share/nntpgrab/web
 mkdir -p %{buildroot}/%{_datadir}/%{name}/web
 cp -ad client/web/* %{buildroot}/%{_datadir}/%{name}/web
+cp -ad client/web/.htaccess %{buildroot}/%{_datadir}/%{name}/web
 rm -rf %{buildroot}/%{_datadir}/%{name}/web/module
 rm -f %{buildroot}%{_datadir}/%{name}/web/Makefile*
 
@@ -231,6 +240,7 @@
 %{_libdir}/libnntpgrab.so.0.0.0
 %{_libdir}/libnntpgrab_automation.so.0
 %{_libdir}/libnntpgrab_automation.so.0.0.0
+%dir %{_libdir}/nntpgrab
 %{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so
@@ -276,6 +286,12 @@
 %{_datadir}/nntpgrab/web
 
 %changelog
+* Sat Sep 13 2008 Erik van Pienbroek <info at nntpgrab.nl> - 0.3.91-1
+- Update to 0.3.91
+- Added a patch to use NSS instead of OpenSSL (with the help of nss_compat_ossl)
+- The .htaccess file was missing in the nntpgrab-web subpackage
+- Include %%_libdir/nntpgrab directory
+
 * Fri Aug 22 2008 Erik van Pienbroek <info at nntpgrab.nl> - 0.3.90-1
 - Update to version 0.3.90 (0.4 beta 1)
 - Upstream has changed a lot in the infrastructure:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-8/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	22 Aug 2008 19:51:53 -0000	1.10
+++ sources	13 Sep 2008 18:53:41 -0000	1.11
@@ -1 +1 @@
-a22b9a71fa5e4dcd8c079fd6693421f0  nntpgrab-0.3.90.tar.bz2
+1f14c2a3df74e5bd46218afc26121293  nntpgrab-0.3.91.tar.bz2



From epienbro at fedoraproject.org  Sat Sep 13 18:54:11 2008
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Sat, 13 Sep 2008 18:54:11 +0000 (UTC)
Subject: rpms/nntpgrab/F-9 nntpgrab_use_nss_compat_ossl.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 nntpgrab.spec, 1.16, 1.17 sources,
	1.14, 1.15
Message-ID: <20080913185411.E4AD070134@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3095/F-9

Modified Files:
	.cvsignore nntpgrab.spec sources 
Added Files:
	nntpgrab_use_nss_compat_ossl.patch 
Log Message:
- Update to 0.3.91
- Added a patch to use NSS instead of OpenSSL (with the help of nss_compat_ossl)
- The .htaccess file was missing in the nntpgrab-web subpackage
- Include %_libdir/nntpgrab directory (for F-8 and F-9, devel was already done)


nntpgrab_use_nss_compat_ossl.patch:

--- NEW FILE nntpgrab_use_nss_compat_ossl.patch ---
Index: plugins/nntp/nntp.c
===================================================================
--- plugins/nntp/nntp.c	(revision 1026)
+++ plugins/nntp/nntp.c	(working copy)
@@ -35,8 +35,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #endif
-#include <openssl/ssl.h>
-#include <openssl/err.h>
+#include <nss_compat_ossl/nss_compat_ossl.h>
 
 #ifdef _MSC_VER
 #include "config.h.win32"
Index: plugins/nntp/Makefile.am
===================================================================
--- plugins/nntp/Makefile.am	(revision 1026)
+++ plugins/nntp/Makefile.am	(working copy)
@@ -2,9 +2,9 @@
 plugin_LTLIBRARIES = libnntpgrab_plugin_nntp.la
 
 libnntpgrab_plugin_nntp_la_SOURCES = nntp.c
-libnntpgrab_plugin_nntp_la_CFLAGS = -I$(top_srcdir)/plugins -I$(top_srcdir)/base $(GLIB_CFLAGS) $(OPENSSL_CFLAGS)
+libnntpgrab_plugin_nntp_la_CFLAGS = -I$(top_srcdir)/plugins -I$(top_srcdir)/base $(GLIB_CFLAGS) $(NSS_CFLAGS)
 libnntpgrab_plugin_nntp_la_LDFLAGS = -module -no-undefined -version-info 0:0:0 -export-symbols ../nntpgrab_plugin_nntp.def 
-libnntpgrab_plugin_nntp_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
+libnntpgrab_plugin_nntp_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS) -lnss_compat_ossl
 
 if WIN32
 libnntpgrab_plugin_nntp_la_SOURCES += strptime.c
Index: configure.in
===================================================================
--- configure.in	(revision 1029)
+++ configure.in	(working copy)
@@ -33,6 +33,7 @@
 #PKG_CHECK_MODULES(SQLITE3, sqlite3,,[AC_MSG_ERROR([* SQLite 3.0 of hoger kan niet gevonden worden (is the package sqlite-devel installed?)])])
 PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.60,have_dbus=true,[AC_MSG_RESULT([* DBUS-Glib 0.60 or higher could not be found (is the package dbus-devel and/or dbus-glib-devel installed?).])]; have_dbus=false)
 PKG_CHECK_MODULES(SOUP, libsoup-2.4, have_soup=true,[AC_MSG_RESULT([* libsoup 2.4 or higher could not be found (is the package libsoup-devel installed?). Without libsoup, the NZBCreator service can't be accessed])]; have_soup=false)
+PKG_CHECK_MODULES(NSS, nss,,[AC_MSG_ERROR([* NSS could not be found (is the package nss-devel installed?)])])
 #PKG_CHECK_MODULES(GLIB_SHARP, glib-sharp-2.0,,[AC_MSG_ERROR([* GLib-sharp 2.0 or higher could not be found (is the package glib-sharp2-devel installed?)])])
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_CFLAGS)
@@ -48,6 +49,8 @@
 AC_SUBST(SOUP_LIBS)
 AC_SUBST(SOUP_CFLAGS)
 AM_CONDITIONAL(HAVE_SOUP, $have_soup)
+AC_SUBST(NSS_LIBS)
+AC_SUBST(NSS_CFLAGS)
 #AC_SUBST(GLIB_SHARP_LIBS)
 #AC_SUBST(GLIB_SHARP_CFLAGS)
 
@@ -347,20 +350,10 @@
         [Curl headers could be found],
         curl)
 
-AC_FIND_LIB2(ssl, $ac_default_lib_searchpath, openssl_libraries,
-        [OpenSSL libraries.],
-        [OpenSSL bibliotheek niet gevonden.])
-
-AC_FIND_HEADER2(openssl/md5.h, $ac_default_inc_searchpath, openssl_headers,
-        [OpenSSL headers.],
-        [OpenSSL header bestanden niet gevonden.])
-
 AC_SUBST(PCRE_CFLAGS, $pcre_headers_CFLAGS)
 AC_SUBST(PCRE_LIBS, $pcre_libraries_LIBS)
 AC_SUBST(CURL_CFLAGS, $libcurl_headers_CFLAGS)
 AC_SUBST(CURL_LIBS, $libcurl_libraries_LIBS)
-AC_SUBST(OPENSSL_CFLAGS, $openssl_headers_CFLAGS)
-AC_SUBST(OPENSSL_LIBS, "$openssl_libraries_LIBS -lcrypto")
 
 # gettext
 AC_PROG_INTLTOOL([0.21], [no-xml])


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	22 Aug 2008 19:51:53 -0000	1.11
+++ .cvsignore	13 Sep 2008 18:53:41 -0000	1.12
@@ -1 +1 @@
-nntpgrab-0.3.90.tar.bz2
+nntpgrab-0.3.91.tar.bz2


Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-9/nntpgrab.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nntpgrab.spec	22 Aug 2008 19:51:53 -0000	1.16
+++ nntpgrab.spec	13 Sep 2008 18:53:41 -0000	1.17
@@ -1,12 +1,13 @@
 Summary: NNTPGrab is a program to download files from the usenet
 Name: nntpgrab
-Version: 0.3.90
+Version: 0.3.91
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2
 Source1: nntpgrab_php.ini
 Source2: nntpgrab_apache.conf
+Patch0:  nntpgrab_use_nss_compat_ossl.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL: http://www.nntpgrab.nl
@@ -28,13 +29,16 @@
 BuildRequires:	curl-devel
 BuildRequires:	libnotify-devel
 BuildRequires:	sqlite-devel
-BuildRequires:	openssl-devel
+BuildRequires:	nss-devel
 BuildRequires:	php-devel
 BuildRequires:	dbus-devel
 BuildRequires:	intltool
 BuildRequires:	libsoup-devel
 BuildRequires:	par2cmdline
 
+# necessary for the NSS patch
+BuildRequires:	nss_compat_ossl-devel
+
 %description
 With this program it is possible to download files from the usenet
 
@@ -130,13 +134,17 @@
 %prep
 %setup -q
 
+# Use NSS instead of OpenSSL
+%patch0 -p0
+aclocal
+autoconf
+
 %build
 %configure
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-mkdir %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot}
 
 desktop-file-install --vendor fedora --delete-original \
@@ -189,6 +197,7 @@
 # Install the webinterface to /usr/share/nntpgrab/web
 mkdir -p %{buildroot}/%{_datadir}/%{name}/web
 cp -ad client/web/* %{buildroot}/%{_datadir}/%{name}/web
+cp -ad client/web/.htaccess %{buildroot}/%{_datadir}/%{name}/web
 rm -rf %{buildroot}/%{_datadir}/%{name}/web/module
 rm -f %{buildroot}%{_datadir}/%{name}/web/Makefile*
 
@@ -231,6 +240,7 @@
 %{_libdir}/libnntpgrab.so.0.0.0
 %{_libdir}/libnntpgrab_automation.so.0
 %{_libdir}/libnntpgrab_automation.so.0.0.0
+%dir %{_libdir}/nntpgrab
 %{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so
@@ -276,6 +286,12 @@
 %{_datadir}/nntpgrab/web
 
 %changelog
+* Sat Sep 13 2008 Erik van Pienbroek <info at nntpgrab.nl> - 0.3.91-1
+- Update to 0.3.91
+- Added a patch to use NSS instead of OpenSSL (with the help of nss_compat_ossl)
+- The .htaccess file was missing in the nntpgrab-web subpackage
+- Include %%_libdir/nntpgrab directory
+
 * Fri Aug 22 2008 Erik van Pienbroek <info at nntpgrab.nl> - 0.3.90-1
 - Update to version 0.3.90 (0.4 beta 1)
 - Upstream has changed a lot in the infrastructure:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	22 Aug 2008 19:51:53 -0000	1.14
+++ sources	13 Sep 2008 18:53:41 -0000	1.15
@@ -1 +1 @@
-a22b9a71fa5e4dcd8c079fd6693421f0  nntpgrab-0.3.90.tar.bz2
+1f14c2a3df74e5bd46218afc26121293  nntpgrab-0.3.91.tar.bz2



From epienbro at fedoraproject.org  Sat Sep 13 18:54:12 2008
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Sat, 13 Sep 2008 18:54:12 +0000 (UTC)
Subject: rpms/nntpgrab/devel nntpgrab_use_nss_compat_ossl.patch, NONE,
	1.1 .cvsignore, 1.12, 1.13 nntpgrab.spec, 1.17, 1.18 sources,
	1.13, 1.14
Message-ID: <20080913185412.2856870134@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3095/devel

Modified Files:
	.cvsignore nntpgrab.spec sources 
Added Files:
	nntpgrab_use_nss_compat_ossl.patch 
Log Message:
- Update to 0.3.91
- Added a patch to use NSS instead of OpenSSL (with the help of nss_compat_ossl)
- The .htaccess file was missing in the nntpgrab-web subpackage
- Include %_libdir/nntpgrab directory (for F-8 and F-9, devel was already done)


nntpgrab_use_nss_compat_ossl.patch:

--- NEW FILE nntpgrab_use_nss_compat_ossl.patch ---
Index: plugins/nntp/nntp.c
===================================================================
--- plugins/nntp/nntp.c	(revision 1026)
+++ plugins/nntp/nntp.c	(working copy)
@@ -35,8 +35,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #endif
-#include <openssl/ssl.h>
-#include <openssl/err.h>
+#include <nss_compat_ossl/nss_compat_ossl.h>
 
 #ifdef _MSC_VER
 #include "config.h.win32"
Index: plugins/nntp/Makefile.am
===================================================================
--- plugins/nntp/Makefile.am	(revision 1026)
+++ plugins/nntp/Makefile.am	(working copy)
@@ -2,9 +2,9 @@
 plugin_LTLIBRARIES = libnntpgrab_plugin_nntp.la
 
 libnntpgrab_plugin_nntp_la_SOURCES = nntp.c
-libnntpgrab_plugin_nntp_la_CFLAGS = -I$(top_srcdir)/plugins -I$(top_srcdir)/base $(GLIB_CFLAGS) $(OPENSSL_CFLAGS)
+libnntpgrab_plugin_nntp_la_CFLAGS = -I$(top_srcdir)/plugins -I$(top_srcdir)/base $(GLIB_CFLAGS) $(NSS_CFLAGS)
 libnntpgrab_plugin_nntp_la_LDFLAGS = -module -no-undefined -version-info 0:0:0 -export-symbols ../nntpgrab_plugin_nntp.def 
-libnntpgrab_plugin_nntp_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
+libnntpgrab_plugin_nntp_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS) -lnss_compat_ossl
 
 if WIN32
 libnntpgrab_plugin_nntp_la_SOURCES += strptime.c
Index: configure.in
===================================================================
--- configure.in	(revision 1029)
+++ configure.in	(working copy)
@@ -33,6 +33,7 @@
 #PKG_CHECK_MODULES(SQLITE3, sqlite3,,[AC_MSG_ERROR([* SQLite 3.0 of hoger kan niet gevonden worden (is the package sqlite-devel installed?)])])
 PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.60,have_dbus=true,[AC_MSG_RESULT([* DBUS-Glib 0.60 or higher could not be found (is the package dbus-devel and/or dbus-glib-devel installed?).])]; have_dbus=false)
 PKG_CHECK_MODULES(SOUP, libsoup-2.4, have_soup=true,[AC_MSG_RESULT([* libsoup 2.4 or higher could not be found (is the package libsoup-devel installed?). Without libsoup, the NZBCreator service can't be accessed])]; have_soup=false)
+PKG_CHECK_MODULES(NSS, nss,,[AC_MSG_ERROR([* NSS could not be found (is the package nss-devel installed?)])])
 #PKG_CHECK_MODULES(GLIB_SHARP, glib-sharp-2.0,,[AC_MSG_ERROR([* GLib-sharp 2.0 or higher could not be found (is the package glib-sharp2-devel installed?)])])
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_CFLAGS)
@@ -48,6 +49,8 @@
 AC_SUBST(SOUP_LIBS)
 AC_SUBST(SOUP_CFLAGS)
 AM_CONDITIONAL(HAVE_SOUP, $have_soup)
+AC_SUBST(NSS_LIBS)
+AC_SUBST(NSS_CFLAGS)
 #AC_SUBST(GLIB_SHARP_LIBS)
 #AC_SUBST(GLIB_SHARP_CFLAGS)
 
@@ -347,20 +350,10 @@
         [Curl headers could be found],
         curl)
 
-AC_FIND_LIB2(ssl, $ac_default_lib_searchpath, openssl_libraries,
-        [OpenSSL libraries.],
-        [OpenSSL bibliotheek niet gevonden.])
-
-AC_FIND_HEADER2(openssl/md5.h, $ac_default_inc_searchpath, openssl_headers,
-        [OpenSSL headers.],
-        [OpenSSL header bestanden niet gevonden.])
-
 AC_SUBST(PCRE_CFLAGS, $pcre_headers_CFLAGS)
 AC_SUBST(PCRE_LIBS, $pcre_libraries_LIBS)
 AC_SUBST(CURL_CFLAGS, $libcurl_headers_CFLAGS)
 AC_SUBST(CURL_LIBS, $libcurl_libraries_LIBS)
-AC_SUBST(OPENSSL_CFLAGS, $openssl_headers_CFLAGS)
-AC_SUBST(OPENSSL_LIBS, "$openssl_libraries_LIBS -lcrypto")
 
 # gettext
 AC_PROG_INTLTOOL([0.21], [no-xml])


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 Aug 2008 19:51:53 -0000	1.12
+++ .cvsignore	13 Sep 2008 18:53:41 -0000	1.13
@@ -1 +1 @@
-nntpgrab-0.3.90.tar.bz2
+nntpgrab-0.3.91.tar.bz2


Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/devel/nntpgrab.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nntpgrab.spec	28 Aug 2008 18:34:24 -0000	1.17
+++ nntpgrab.spec	13 Sep 2008 18:53:41 -0000	1.18
@@ -1,12 +1,13 @@
 Summary: NNTPGrab is a program to download files from the usenet
 Name: nntpgrab
-Version: 0.3.90
-Release: 3%{?dist}
+Version: 0.3.91
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2
 Source1: nntpgrab_php.ini
 Source2: nntpgrab_apache.conf
+Patch0:  nntpgrab_use_nss_compat_ossl.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL: http://www.nntpgrab.nl
@@ -28,13 +29,16 @@
 BuildRequires:	curl-devel
 BuildRequires:	libnotify-devel
 BuildRequires:	sqlite-devel
-BuildRequires:	openssl-devel
+BuildRequires:	nss-devel
 BuildRequires:	php-devel
 BuildRequires:	dbus-devel
 BuildRequires:	intltool
 BuildRequires:	libsoup-devel
 BuildRequires:	par2cmdline
 
+# necessary for the NSS patch
+BuildRequires:	nss_compat_ossl-devel
+
 %description
 With this program it is possible to download files from the usenet
 
@@ -130,6 +134,11 @@
 %prep
 %setup -q
 
+# Use NSS instead of OpenSSL
+%patch0 -p0
+aclocal
+autoconf
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -188,6 +197,7 @@
 # Install the webinterface to /usr/share/nntpgrab/web
 mkdir -p %{buildroot}/%{_datadir}/%{name}/web
 cp -ad client/web/* %{buildroot}/%{_datadir}/%{name}/web
+cp -ad client/web/.htaccess %{buildroot}/%{_datadir}/%{name}/web
 rm -rf %{buildroot}/%{_datadir}/%{name}/web/module
 rm -f %{buildroot}%{_datadir}/%{name}/web/Makefile*
 
@@ -276,6 +286,11 @@
 %{_datadir}/nntpgrab/web
 
 %changelog
+* Sat Sep 13 2008 Erik van Pienbroek <info at nntpgrab.nl> - 0.3.91-1
+- Update to 0.3.91
+- Added a patch to use NSS instead of OpenSSL (with the help of nss_compat_ossl)
+- The .htaccess file was missing in the nntpgrab-web subpackage
+
 * Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.3.90-3
 - Include %%_libdir/nntpgrab directory.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Aug 2008 19:51:53 -0000	1.13
+++ sources	13 Sep 2008 18:53:41 -0000	1.14
@@ -1 +1 @@
-a22b9a71fa5e4dcd8c079fd6693421f0  nntpgrab-0.3.90.tar.bz2
+1f14c2a3df74e5bd46218afc26121293  nntpgrab-0.3.91.tar.bz2



From erikos at fedoraproject.org  Sat Sep 13 19:13:04 2008
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Sat, 13 Sep 2008 19:13:04 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.14, 1.15 sources, 1.16,
	1.17 sugar-toolkit.spec, 1.21, 1.22
Message-ID: <20080913191304.61D6F70134@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9153

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Sat Sep 13 2008 Simon Schampijer <simon at laptop.org> - 0.82.7-1
- #8375 gst usage in the shell wastes 2.6mb                                                                               
- #8394 sugar shell leaks presence service info                                                          
- #8469 palette.menu is leaked




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	1 Sep 2008 15:01:00 -0000	1.14
+++ .cvsignore	13 Sep 2008 19:12:34 -0000	1.15
@@ -1 +1 @@
-sugar-toolkit-0.82.5.tar.bz2
+sugar-toolkit-0.82.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	11 Sep 2008 10:28:22 -0000	1.16
+++ sources	13 Sep 2008 19:12:34 -0000	1.17
@@ -1 +1 @@
-ce1a33591f0242bf815e3cfa06ee62c9  sugar-toolkit-0.82.6.tar.bz2
+2e83dd9497f29f83c731e78e6016d084  sugar-toolkit-0.82.7.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sugar-toolkit.spec	11 Sep 2008 10:28:23 -0000	1.21
+++ sugar-toolkit.spec	13 Sep 2008 19:12:34 -0000	1.22
@@ -5,7 +5,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.82.6
+Version: 0.82.7
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
@@ -25,6 +25,7 @@
 BuildRequires: gtk2-devel
 BuildRequires: perl-XML-Parser
 BuildRequires: libSM-devel
+BuildRequires: alsa-lib-devel
 
 Requires: gnome-python2-rsvg
 Requires: dbus-python
@@ -67,6 +68,11 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Sat Sep 13 2008 Simon Schampijer <simon at laptop.org> - 0.82.7-1
+- #8375 gst usage in the shell wastes 2.6mb                                                                               
+- #8394 sugar shell leaks presence service info                                                          
+- #8469 palette.menu is leaked
+
 * Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.6-1
 - #8394 sugar shell leaks presence service info
 - #8392 Remove "dynamic" font height computation



From erikos at fedoraproject.org  Sat Sep 13 19:18:30 2008
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Sat, 13 Sep 2008 19:18:30 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.17, 1.18 sources, 1.18,
	1.19 sugar.spec, 1.25, 1.26
Message-ID: <20080913191830.A7F5270134@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11353

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Sat Sep 13 2008 Simon Schampijer <simon at laptop.org> - 0.82.6-1
- #8438 control panel fails when run with python -OO                                                                         
- #8470 SpreadLayout leaks self._collisions                                                                               
- #8375 gst usage in the shell wastes 2.6mb                                                                                        
- #8372 Remove numpy usage from the shell




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	12 Sep 2008 16:28:43 -0000	1.17
+++ .cvsignore	13 Sep 2008 19:18:00 -0000	1.18
@@ -1 +1 @@
-sugar-0.82.5.tar.bz2
+sugar-0.82.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	12 Sep 2008 16:28:43 -0000	1.18
+++ sources	13 Sep 2008 19:18:00 -0000	1.19
@@ -1 +1 @@
-b013856f373c16c3946805217fad93fe  sugar-0.82.5.tar.bz2
+dacc98607ddd4a083a1ed9a04b5985cf  sugar-0.82.6.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sugar.spec	12 Sep 2008 16:28:43 -0000	1.25
+++ sugar.spec	13 Sep 2008 19:18:00 -0000	1.26
@@ -3,7 +3,7 @@
 
 Summary: OLPC desktop environment
 Name: sugar
-Version: 0.82.5
+Version: 0.82.6
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
@@ -94,6 +94,12 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Sat Sep 13 2008 Simon Schampijer <simon at laptop.org> - 0.82.6-1
+- #8438 control panel fails when run with python -OO                                                                         
+- #8470 SpreadLayout leaks self._collisions                                                                               
+- #8375 gst usage in the shell wastes 2.6mb                                                                                        
+- #8372 Remove numpy usage from the shell
+
 * Thu Sep 12 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.5-1
 - #8427 Sugar does not send SetActive(True)
 - #8409 Sugar does not save network's BSSIDs in networks.cfg



From hadess at fedoraproject.org  Sat Sep 13 19:25:58 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat, 13 Sep 2008 19:25:58 +0000 (UTC)
Subject: rpms/bluez-gnome/devel .cvsignore, 1.24, 1.25 bluez-gnome.spec, 1.53,
	1.54 sources, 1.24, 1.25
Message-ID: <20080913192558.57C6070134@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13732

Modified Files:
	.cvsignore bluez-gnome.spec sources 
Log Message:
* Sat Sep 13 2008 - Bastien Nocera <bnocera at redhat.com> - 1.4-1
- Update to 1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	11 Sep 2008 02:16:12 -0000	1.24
+++ .cvsignore	13 Sep 2008 19:25:27 -0000	1.25
@@ -1 +1 @@
-bluez-gnome-1.3.tar.gz
+bluez-gnome-1.4.tar.gz


Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- bluez-gnome.spec	11 Sep 2008 02:16:13 -0000	1.53
+++ bluez-gnome.spec	13 Sep 2008 19:25:27 -0000	1.54
@@ -1,5 +1,5 @@
 Name:		bluez-gnome
-Version:	1.3
+Version:	1.4
 Release:	1%{?dist}
 Summary:	Bluetooth pairing and control applet
 
@@ -136,6 +136,9 @@
 %{_datadir}/man/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Sat Sep 13 2008 - Bastien Nocera <bnocera at redhat.com> - 1.4-1
+- Update to 1.4
+
 * Wed Sep 10 2008 - David Woodhouse <David.Woodhouse at intel.com> - 1.3-1
 - Update to 1.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	11 Sep 2008 02:16:13 -0000	1.24
+++ sources	13 Sep 2008 19:25:27 -0000	1.25
@@ -1 +1 @@
-dc824a04adcef5ee6567beb660cf5bcc  bluez-gnome-1.3.tar.gz
+998dd07436f77bf4ab360f5185fe6224  bluez-gnome-1.4.tar.gz



From epienbro at fedoraproject.org  Sat Sep 13 19:27:50 2008
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Sat, 13 Sep 2008 19:27:50 +0000 (UTC)
Subject: rpms/nntpgrab/F-8 nntpgrab.spec,1.12,1.13
Message-ID: <20080913192750.5C2D370134@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14802/F-8

Modified Files:
	nntpgrab.spec 
Log Message:
BR: libtool added



Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-8/nntpgrab.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nntpgrab.spec	13 Sep 2008 18:53:41 -0000	1.12
+++ nntpgrab.spec	13 Sep 2008 19:27:20 -0000	1.13
@@ -36,6 +36,7 @@
 BuildRequires:	par2cmdline
 
 # necessary for the NSS patch
+BuildRequires:	libtool
 BuildRequires:	nss_compat_ossl-devel
 
 %description



From epienbro at fedoraproject.org  Sat Sep 13 19:27:50 2008
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Sat, 13 Sep 2008 19:27:50 +0000 (UTC)
Subject: rpms/nntpgrab/F-9 nntpgrab.spec,1.17,1.18
Message-ID: <20080913192750.8DF2870134@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14802/F-9

Modified Files:
	nntpgrab.spec 
Log Message:
BR: libtool added



Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-9/nntpgrab.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nntpgrab.spec	13 Sep 2008 18:53:41 -0000	1.17
+++ nntpgrab.spec	13 Sep 2008 19:27:20 -0000	1.18
@@ -37,6 +37,7 @@
 BuildRequires:	par2cmdline
 
 # necessary for the NSS patch
+BuildRequires:	libtool
 BuildRequires:	nss_compat_ossl-devel
 
 %description



From epienbro at fedoraproject.org  Sat Sep 13 19:27:50 2008
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Sat, 13 Sep 2008 19:27:50 +0000 (UTC)
Subject: rpms/nntpgrab/devel nntpgrab.spec,1.18,1.19
Message-ID: <20080913192750.D020370134@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14802/devel

Modified Files:
	nntpgrab.spec 
Log Message:
BR: libtool added



Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/devel/nntpgrab.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nntpgrab.spec	13 Sep 2008 18:53:41 -0000	1.18
+++ nntpgrab.spec	13 Sep 2008 19:27:20 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: NNTPGrab is a program to download files from the usenet
 Name: nntpgrab
 Version: 0.3.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2
@@ -37,6 +37,7 @@
 BuildRequires:	par2cmdline
 
 # necessary for the NSS patch
+BuildRequires:	libtool
 BuildRequires:	nss_compat_ossl-devel
 
 %description
@@ -286,6 +287,9 @@
 %{_datadir}/nntpgrab/web
 
 %changelog
+* Sat Sep 13 2008 Erik van Pienbroek <info at nntpgrab.nl> - 0.3.91-2
+- BR: libtool added
+
 * Sat Sep 13 2008 Erik van Pienbroek <info at nntpgrab.nl> - 0.3.91-1
 - Update to 0.3.91
 - Added a patch to use NSS instead of OpenSSL (with the help of nss_compat_ossl)



From hadess at fedoraproject.org  Sat Sep 13 19:32:15 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat, 13 Sep 2008 19:32:15 +0000 (UTC)
Subject: rpms/bluez-gnome/devel bluez-gnome.spec, 1.54,
	1.55 bluez-gnome-1.3-input.patch, 1.1, NONE
Message-ID: <20080913193215.46DA870134@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16387

Modified Files:
	bluez-gnome.spec 
Removed Files:
	bluez-gnome-1.3-input.patch 
Log Message:
* Sat Sep 13 2008 - Bastien Nocera <bnocera at redhat.com> - 1.4-2
- Remove obsolete patch



Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- bluez-gnome.spec	13 Sep 2008 19:25:27 -0000	1.54
+++ bluez-gnome.spec	13 Sep 2008 19:31:44 -0000	1.55
@@ -1,13 +1,12 @@
 Name:		bluez-gnome
 Version:	1.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://www.bluez.org/
 Source0:	http://bluez.sf.net/download/%{name}-%{version}.tar.gz
-Patch1:		bluez-gnome-1.3-input.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,7 +44,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .input
 
 %build
 %configure --disable-mime-update --disable-desktop-update --disable-icon-update
@@ -136,6 +134,9 @@
 %{_datadir}/man/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Sat Sep 13 2008 - Bastien Nocera <bnocera at redhat.com> - 1.4-2
+- Remove obsolete patch
+
 * Sat Sep 13 2008 - Bastien Nocera <bnocera at redhat.com> - 1.4-1
 - Update to 1.4
 


--- bluez-gnome-1.3-input.patch DELETED ---



From pkgdb at fedoraproject.org  Sat Sep 13 19:43:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 19:43:53 +0000
Subject: [pkgdb] perl-Locale-Maketext-Simple had acl change status
Message-ID: <20080913194353.D5C9B208D9A@bastion.fedora.phx.redhat.com>

steve has set the watchbugzilla acl on perl-Locale-Maketext-Simple (Fedora EPEL 5) to Approved for iburrell

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Simple



From pkgdb at fedoraproject.org  Sat Sep 13 19:44:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 19:44:02 +0000
Subject: [pkgdb] perl-Locale-Maketext-Simple had acl change status
Message-ID: <20080913194402.3163C208D5F@bastion.fedora.phx.redhat.com>

steve has set the watchcommits acl on perl-Locale-Maketext-Simple (Fedora EPEL 5) to Approved for iburrell

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Simple



From pkgdb at fedoraproject.org  Sat Sep 13 19:44:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 19:44:06 +0000
Subject: [pkgdb] perl-Locale-Maketext-Simple had acl change status
Message-ID: <20080913194406.B8EB5208D9A@bastion.fedora.phx.redhat.com>

steve has set the commit acl on perl-Locale-Maketext-Simple (Fedora EPEL 5) to Approved for iburrell

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Simple



From epienbro at fedoraproject.org  Sat Sep 13 19:44:25 2008
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Sat, 13 Sep 2008 19:44:25 +0000 (UTC)
Subject: rpms/nntpgrab/F-8 nntpgrab.spec,1.13,1.14
Message-ID: <20080913194425.CDBF270134@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20883

Modified Files:
	nntpgrab.spec 
Log Message:
Patch was missing..



Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-8/nntpgrab.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nntpgrab.spec	13 Sep 2008 19:27:20 -0000	1.13
+++ nntpgrab.spec	13 Sep 2008 19:43:55 -0000	1.14
@@ -1,12 +1,13 @@
 Summary: NNTPGrab is a program to download files from the usenet
 Name: nntpgrab
 Version: 0.3.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2
 Source1: nntpgrab_php.ini
 Source2: nntpgrab_apache.conf
+Patch0:  nntpgrab_use_nss_compat_ossl.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL: http://www.nntpgrab.nl
@@ -287,6 +288,9 @@
 %{_datadir}/nntpgrab/web
 
 %changelog
+* Sat Sep 13 2008 Erik van Pienbroek <info at nntpgrab.nl> - 0.3.91-2
+- Patch was missing
+
 * Sat Sep 13 2008 Erik van Pienbroek <info at nntpgrab.nl> - 0.3.91-1
 - Update to 0.3.91
 - Added a patch to use NSS instead of OpenSSL (with the help of nss_compat_ossl)



From dwmw2 at fedoraproject.org  Sat Sep 13 21:02:18 2008
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Sat, 13 Sep 2008 21:02:18 +0000 (UTC)
Subject: rpms/bluez-gnome/F-9 bluez-gnome-0.28-services-running.patch, NONE, 
	1.1 .cvsignore, 1.21, 1.22 bluez-gnome.spec, 1.48, 1.49 sources,
	1.21, 1.22 bluez-gnome-sendto-palm.patch, 1.1, NONE
Message-ID: <20080913210218.B689570134@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-gnome/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16399

Modified Files:
	.cvsignore bluez-gnome.spec sources 
Added Files:
	bluez-gnome-0.28-services-running.patch 
Removed Files:
      Tag: bluez-gnome-0_26-1_fc9
	bluez-gnome-sendto-palm.patch 
Log Message:
0.28, fix input pairin

bluez-gnome-0.28-services-running.patch:

--- NEW FILE bluez-gnome-0.28-services-running.patch ---
--- bluez-gnome-0.28/properties/service.c~	2008-09-13 12:56:31.000000000 -0700
+++ bluez-gnome-0.28/properties/service.c	2008-09-13 12:46:09.000000000 -0700
@@ -264,7 +264,7 @@ static void add_service(const char *path
 	GList *list;
 	struct service_data *service;
 	const char *identifier = NULL;
-	gboolean running = FALSE;
+	gboolean running = TRUE;
 
 	list = g_list_find_custom(service_list, path, service_compare);
 	if (list && list->data) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/F-9/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	8 Apr 2008 16:00:42 -0000	1.21
+++ .cvsignore	13 Sep 2008 21:02:18 -0000	1.22
@@ -1 +1 @@
-bluez-gnome-0.26.tar.gz
+bluez-gnome-0.28.tar.gz


Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/F-9/bluez-gnome.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- bluez-gnome.spec	8 Apr 2008 16:00:42 -0000	1.48
+++ bluez-gnome.spec	13 Sep 2008 21:02:18 -0000	1.49
@@ -1,5 +1,5 @@
 Name:		bluez-gnome
-Version:	0.26
+Version:	0.28
 Release:	1%{?dist}
 Summary:	Bluetooth pairing and control applet
 
@@ -8,8 +8,8 @@
 URL:		http://www.bluez.org/
 Source0:	http://bluez.sf.net/download/%{name}-%{version}.tar.gz
 Patch1:		bluez-gnome-remove-class-file-sharing.patch
-Patch2:		bluez-gnome-sendto-palm.patch
-
+Patch2:		bluez-gnome-0.26-handle-error.patch
+Patch3:		bluez-gnome-0.28-services-running.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExcludeArch:	s390 s390x
@@ -47,7 +47,8 @@
 %prep
 %setup -q
 %patch1 -p0 -b .remove-class
-%patch2 -p0 -b .sendto
+%patch2 -p1 -b .error
+%patch3 -p1 -b .services
 
 %build
 %configure --disable-mime-update --disable-desktop-update --disable-icon-update
@@ -136,6 +137,10 @@
 %{_datadir}/man/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Sat Sep 13 2008 - David Woodhouse <David.Woodhouse at intel.com> - 0.28-1
+- Update to 0.28
+- Fix crash on input device pairing failure
+
 * Tue Apr 08 2008 - Bastien Nocera <bnocera at redhat.com> - 0.26-1
 - Update to 0.26
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/F-9/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	8 Apr 2008 16:00:42 -0000	1.21
+++ sources	13 Sep 2008 21:02:18 -0000	1.22
@@ -1 +1 @@
-d1e68cf63458472eaeb70ef1b3f1df5d  bluez-gnome-0.26.tar.gz
+f2afcb04e998fdc6aa545633190bc941  bluez-gnome-0.28.tar.gz


--- bluez-gnome-sendto-palm.patch DELETED ---



From dwmw2 at fedoraproject.org  Sat Sep 13 21:02:50 2008
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Sat, 13 Sep 2008 21:02:50 +0000 (UTC)
Subject: rpms/bluez-gnome/F-9 bluez-gnome-0.26-handle-error.patch,NONE,1.1
Message-ID: <20080913210250.6257470134@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-gnome/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16636

Added Files:
	bluez-gnome-0.26-handle-error.patch 
Log Message:
error handling patch

bluez-gnome-0.26-handle-error.patch:

--- NEW FILE bluez-gnome-0.26-handle-error.patch ---
--- bluez-gnome-0.26/properties/input.c~	2008-02-05 12:55:17.000000000 -0800
+++ bluez-gnome-0.26/properties/input.c	2008-09-13 12:37:13.000000000 -0700
@@ -50,6 +50,7 @@ static void proxy_callback(DBusGProxy *p
 				DBusGProxyCall *call, void *user_data)
 {
 	GtkWidget *notebook = user_data;
+	GError *error = NULL;
 	GtkWidget *button;
 	GtkWidget *label;
 	DBusGProxy *client;
@@ -59,7 +60,7 @@ static void proxy_callback(DBusGProxy *p
 
 	g_object_set_data(G_OBJECT(notebook), "call", NULL);
 
-	dbus_g_proxy_end_call(proxy, call, NULL,
+	dbus_g_proxy_end_call(proxy, call, &error,
 				G_TYPE_STRING, &path, G_TYPE_INVALID);
 
 	button = g_object_get_data(G_OBJECT(notebook), "cancel");
@@ -68,6 +69,16 @@ static void proxy_callback(DBusGProxy *p
 	button = g_object_get_data(G_OBJECT(notebook), "close");
 	gtk_widget_set_sensitive(button, TRUE);
 
+	if (error) {
+		label = g_object_get_data(G_OBJECT(notebook), "label");
+		text = g_strdup_printf("<b>%s: %s</b>",
+				       _("Connection failed"),
+				       error->message);
+		gtk_label_set_markup(GTK_LABEL(label), text);
+		g_free(text);
+		goto out;
+	}
+
 	busname = dbus_g_proxy_get_bus_name(proxy);
 
 	client = dbus_g_proxy_new_for_name(connection, busname,
@@ -90,6 +101,7 @@ static void proxy_callback(DBusGProxy *p
 
 	set_trusted(adapter, address);
 
+ out:
 	g_object_unref(client);
 }
 



From pkgdb at fedoraproject.org  Sat Sep 13 21:17:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:17:09 +0000
Subject: [pkgdb] ogre had acl change status
Message-ID: <20080913211709.B5B34208D9A@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on ogre (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 21:17:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:17:13 +0000
Subject: [pkgdb] ogre had acl change status
Message-ID: <20080913211713.823D4208D9E@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on ogre (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 21:17:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:17:14 +0000
Subject: [pkgdb] ogre had acl change status
Message-ID: <20080913211714.C446F208DA2@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on ogre (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 21:17:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:17:17 +0000
Subject: [pkgdb] ogre had acl change status
Message-ID: <20080913211718.01525208DA6@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on ogre (Fedora 8) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 21:17:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:17:19 +0000
Subject: [pkgdb] ogre had acl change status
Message-ID: <20080913211719.25550208DA9@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on ogre (Fedora 8) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 21:17:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:17:20 +0000
Subject: [pkgdb] ogre had acl change status
Message-ID: <20080913211720.E1B8E208DAC@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on ogre (Fedora 8) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 21:17:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:17:22 +0000
Subject: [pkgdb] ogre had acl change status
Message-ID: <20080913211722.7F575208D9A@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on ogre (Fedora 9) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 21:17:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:17:26 +0000
Subject: [pkgdb] ogre had acl change status
Message-ID: <20080913211726.B24E4208DB3@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on ogre (Fedora 9) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 21:17:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:17:29 +0000
Subject: [pkgdb] ogre had acl change status
Message-ID: <20080913211729.63A5A208DB7@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on ogre (Fedora 9) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 21:17:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:17:26 +0000
Subject: [pkgdb] ogre had acl change status
Message-ID: <20080913211726.9AB71208DB0@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on ogre (Fedora 9) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 21:17:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:17:32 +0000
Subject: [pkgdb] ogre had acl change status
Message-ID: <20080913211732.5AB5B208DBA@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on ogre (Fedora 8) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 21:17:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:17:36 +0000
Subject: [pkgdb] ogre had acl change status
Message-ID: <20080913211736.8FEB3208D9C@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on ogre (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 21:17:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:17:39 +0000
Subject: [pkgdb] ogre had acl change status
Message-ID: <20080913211739.4FEA2208DBC@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on ogre (Fedora devel) to Approved for dtimms

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 21:17:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:17:44 +0000
Subject: [pkgdb] ogre had acl change status
Message-ID: <20080913211744.87A08208DA4@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on ogre (Fedora 9) to Approved for dtimms

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogre



From pkgdb at fedoraproject.org  Sat Sep 13 21:18:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:18:36 +0000
Subject: [pkgdb] chess had acl change status
Message-ID: <20080913211836.64888208D9A@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on chess (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 21:18:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:18:36 +0000
Subject: [pkgdb] chess had acl change status
Message-ID: <20080913211836.DFE37208DAD@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on chess (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 21:18:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:18:38 +0000
Subject: [pkgdb] chess had acl change status
Message-ID: <20080913211838.5A55F208DB2@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on chess (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 21:18:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:18:39 +0000
Subject: [pkgdb] chess had acl change status
Message-ID: <20080913211839.5E3A8208DB4@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on chess (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 21:18:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:18:44 +0000
Subject: [pkgdb] chess had acl change status
Message-ID: <20080913211844.4029B208D9C@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on chess (Fedora 9) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 21:18:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:18:46 +0000
Subject: [pkgdb] chess had acl change status
Message-ID: <20080913211846.DA262208DB9@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on chess (Fedora 9) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 21:18:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:18:47 +0000
Subject: [pkgdb] chess had acl change status
Message-ID: <20080913211847.220E6208DBF@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on chess (Fedora 9) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 21:18:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:18:48 +0000
Subject: [pkgdb] chess had acl change status
Message-ID: <20080913211848.7742B208DC2@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on chess (Fedora 9) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 21:19:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:19:06 +0000
Subject: [pkgdb] vegastrike had acl change status
Message-ID: <20080913211906.EF505208DA3@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on vegastrike (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From pkgdb at fedoraproject.org  Sat Sep 13 21:19:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:19:09 +0000
Subject: [pkgdb] vegastrike had acl change status
Message-ID: <20080913211909.841E9208DBD@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on vegastrike (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From pkgdb at fedoraproject.org  Sat Sep 13 21:19:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:19:09 +0000
Subject: [pkgdb] vegastrike had acl change status
Message-ID: <20080913211909.8C75C208DC5@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on vegastrike (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From pkgdb at fedoraproject.org  Sat Sep 13 21:19:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:19:10 +0000
Subject: [pkgdb] vegastrike had acl change status
Message-ID: <20080913211911.0FA5D208DC7@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on vegastrike (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From pkgdb at fedoraproject.org  Sat Sep 13 21:19:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:19:14 +0000
Subject: [pkgdb] vegastrike had acl change status
Message-ID: <20080913211914.331F5208D9A@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on vegastrike (Fedora 8) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From pkgdb at fedoraproject.org  Sat Sep 13 21:19:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:19:16 +0000
Subject: [pkgdb] vegastrike had acl change status
Message-ID: <20080913211916.68C15208DCC@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on vegastrike (Fedora 8) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From dwmw2 at fedoraproject.org  Sat Sep 13 21:19:18 2008
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Sat, 13 Sep 2008 21:19:18 +0000 (UTC)
Subject: rpms/bluez-libs/F-9 .cvsignore, 1.39, 1.40 bluez-libs.spec, 1.56,
	1.57 sources, 1.39, 1.40
Message-ID: <20080913211918.733A570134@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-libs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21791

Modified Files:
	.cvsignore bluez-libs.spec sources 
Log Message:
3.36


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-libs/F-9/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	3 Jul 2008 15:51:27 -0000	1.39
+++ .cvsignore	13 Sep 2008 21:18:47 -0000	1.40
@@ -1 +1 @@
-bluez-libs-3.35.tar.gz
+bluez-libs-3.36.tar.gz


Index: bluez-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-libs/F-9/bluez-libs.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- bluez-libs.spec	3 Jul 2008 15:51:27 -0000	1.56
+++ bluez-libs.spec	13 Sep 2008 21:18:48 -0000	1.57
@@ -1,6 +1,6 @@
 Summary: Bluetooth libraries
 Name: bluez-libs
-Version: 3.35
+Version: 3.36
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -63,6 +63,9 @@
 %{_libdir}/pkgconfig/bluez.pc
 
 %changelog
+* Sat Sep 13 2008 - David Woodhouse <David.Woodhouse at intel.com> - 3.36-1
+- Update to 3.36
+
 * Thu Jul 03 2008 - Bastien Nocera <bnocera at redhat.com> - 3.35-1
 - Update to 3.35
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-libs/F-9/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	3 Jul 2008 15:51:27 -0000	1.39
+++ sources	13 Sep 2008 21:18:48 -0000	1.40
@@ -1 +1 @@
-2682b84da32cd78b48982d1d69ba637c  bluez-libs-3.35.tar.gz
+8c2ca546c0e7bb73dbd0e906fce7f6b1  bluez-libs-3.36.tar.gz



From pkgdb at fedoraproject.org  Sat Sep 13 21:19:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:19:17 +0000
Subject: [pkgdb] vegastrike had acl change status
Message-ID: <20080913211917.9BBED208DCF@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on vegastrike (Fedora 8) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From pkgdb at fedoraproject.org  Sat Sep 13 21:19:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:19:18 +0000
Subject: [pkgdb] vegastrike had acl change status
Message-ID: <20080913211919.18A7B208DD3@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on vegastrike (Fedora 8) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From pkgdb at fedoraproject.org  Sat Sep 13 21:19:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:19:19 +0000
Subject: [pkgdb] vegastrike had acl change status
Message-ID: <20080913211919.7E684208DD6@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on vegastrike (Fedora 9) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From pkgdb at fedoraproject.org  Sat Sep 13 21:19:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:19:21 +0000
Subject: [pkgdb] vegastrike had acl change status
Message-ID: <20080913211921.765E4208DAA@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on vegastrike (Fedora 9) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From pkgdb at fedoraproject.org  Sat Sep 13 21:19:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:19:23 +0000
Subject: [pkgdb] vegastrike had acl change status
Message-ID: <20080913211923.4C7F7208DAC@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on vegastrike (Fedora 9) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From pkgdb at fedoraproject.org  Sat Sep 13 21:19:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:19:25 +0000
Subject: [pkgdb] vegastrike had acl change status
Message-ID: <20080913211925.6FEB6208DDA@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on vegastrike (Fedora 9) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vegastrike



From pkgdb at fedoraproject.org  Sat Sep 13 21:19:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:19:33 +0000
Subject: [pkgdb] chess had acl change status
Message-ID: <20080913211933.8D3F2208DAF@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on chess (Fedora 8) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 21:19:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:19:34 +0000
Subject: [pkgdb] chess had acl change status
Message-ID: <20080913211934.A6442208DDD@bastion.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on chess (Fedora 8) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 21:19:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:19:34 +0000
Subject: [pkgdb] chess had acl change status
Message-ID: <20080913211934.B71A5208DE0@bastion.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on chess (Fedora 8) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From pkgdb at fedoraproject.org  Sat Sep 13 21:19:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:19:35 +0000
Subject: [pkgdb] chess had acl change status
Message-ID: <20080913211935.ABCCB208DE2@bastion.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on chess (Fedora 8) to Approved for atorkhov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chess



From dwmw2 at fedoraproject.org  Sat Sep 13 21:20:55 2008
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Sat, 13 Sep 2008 21:20:55 +0000 (UTC)
Subject: rpms/bluez-utils/F-9 bluez-utils-3.36-input-no-sdp.patch, NONE,
	1.1 bluetooth.init, 1.10, 1.11 bluez-utils.spec, 1.106,
	1.107 sources, 1.37, 1.38
Message-ID: <20080913212055.85D6470137@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22534

Modified Files:
	bluetooth.init bluez-utils.spec sources 
Added Files:
	bluez-utils-3.36-input-no-sdp.patch 
Log Message:
3.36

bluez-utils-3.36-input-no-sdp.patch:

--- NEW FILE bluez-utils-3.36-input-no-sdp.patch ---
--- bluez-utils-3.36/input/manager.c~	2008-06-18 09:24:55.000000000 -0700
+++ bluez-utils-3.36/input/manager.c	2008-09-09 18:17:54.000000000 -0700
@@ -413,16 +413,15 @@ static void pnp_record_cb(sdp_list_t *re
 	if (err < 0) {
-		error_not_supported(pr->conn, pr->msg);
 		error("SDP search error: %s (%d)", strerror(-err), -err);
-		goto fail;
+		goto no_pnp;
 	}
 
 	if (!recs || !recs->data) {
-		error_not_supported(pr->conn, pr->msg);
 		error("Invalid PnP service record length");
-		goto fail;
+		goto no_pnp;
 	}
 
 	pr->pnp_recs = recs;
+ no_pnp:
 	sdp_uuid16_create(&uuid, HID_SVCLASS_ID);
 	err = bt_search_service(&pr->src, &pr->dst, &uuid, hid_record_cb,
 			pr, NULL);


Index: bluetooth.init
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/F-9/bluetooth.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bluetooth.init	12 Sep 2008 09:42:05 -0000	1.10
+++ bluetooth.init	13 Sep 2008 21:20:25 -0000	1.11
@@ -35,7 +35,7 @@
 start()
 {
 	echo -n $"Starting Bluetooth services:"
-	daemon /usr/sbin/hcid -s
+	daemon /usr/sbin/hcid -s -x
 	RETVAL=$?
 	[ $RETVAL = 0 ] && touch /var/lock/subsys/hcid
 	[ "$HID2HCI_ENABLE" = "true" ] && hid2hci --tohci > /dev/null 2>&1 || :


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/F-9/bluez-utils.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- bluez-utils.spec	12 Sep 2008 09:42:05 -0000	1.106
+++ bluez-utils.spec	13 Sep 2008 21:20:25 -0000	1.107
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
-Version: 3.35
-Release: 5%{?dist}
+Version: 3.36
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -13,10 +13,11 @@
 Source9: bluetooth.conf
 Patch0: bluez-utils-2.3-conf.patch
 Patch1: bluez-utils-oui-usage.patch
+Patch2: bluez-utils-3.36-input-no-sdp.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
-BuildRequires: bluez-libs-devel >= %{version}
+BuildRequires: bluez-libs-devel >= 3.35
 BuildRequires: flex
 BuildRequires: dbus-devel >= 0.90
 BuildRequires: libusb-devel, glib2-devel, alsa-lib-devel
@@ -74,6 +75,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p0 -b .oui
+%patch2 -p1
 
 %build
 %configure --with-bluez-libs=%{_libdir} --enable-pie --enable-debug \
@@ -81,7 +83,7 @@
 	   --enable-avctrl --enable-glib --enable-input --enable-echo \
 	   --enable-serial --disable-sdpd --enable-audio --disable-sync \
 	   --disable-obex --enable-network --enable-cups --enable-pcmciarules \
-	   --enable-hidd --enable-hid2hci --enable-dund
+	   --enable-hidd --enable-hid2hci --enable-dund --enable-pand
 make
 
 %install
@@ -158,6 +160,12 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Sat Sep 13 2008 - David Woodhouse <David.Woodhouse at intel.com> - 3.36-1
+- Update to 3.36  
+- Re-enable pand
+- Add -x to hcid args to enable BlueZ 4.0 APIs
+- Don't fail when input device has no PnP record
+
 * Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 3.35-5
 - Re-add chkconfig code to the initscript (#448888)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/F-9/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	3 Jul 2008 16:00:54 -0000	1.37
+++ sources	13 Sep 2008 21:20:25 -0000	1.38
@@ -1 +1 @@
-21dc2f8c03dae9db87da351c735510bb  bluez-utils-3.35.tar.gz
+4fc292b635ba7b442c7aaf5680199012  bluez-utils-3.36.tar.gz



From pkgdb at fedoraproject.org  Sat Sep 13 21:47:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:47:21 +0000
Subject: [pkgdb] kdewebdev: tuxbrewr has requested watchbugzilla
Message-ID: <20080913214721.F3432208D9E@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdewebdev (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdewebdev



From pkgdb at fedoraproject.org  Sat Sep 13 21:47:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:47:25 +0000
Subject: [pkgdb] kdewebdev: tuxbrewr has requested watchcommits
Message-ID: <20080913214725.34A2E208DA4@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdewebdev (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdewebdev



From pkgdb at fedoraproject.org  Sat Sep 13 21:47:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:47:32 +0000
Subject: [pkgdb] kdewebdev: tuxbrewr has requested watchbugzilla
Message-ID: <20080913214733.0AD09208DA9@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdewebdev (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdewebdev



From pkgdb at fedoraproject.org  Sat Sep 13 21:47:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:47:36 +0000
Subject: [pkgdb] kdewebdev: tuxbrewr has requested watchcommits
Message-ID: <20080913214736.DEEB0208DAC@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdewebdev (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdewebdev



From pkgdb at fedoraproject.org  Sat Sep 13 21:48:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:48:32 +0000
Subject: [pkgdb] kdevelop: tuxbrewr has requested watchbugzilla
Message-ID: <20080913214833.18736208D9E@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdevelop (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Sat Sep 13 21:48:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:48:34 +0000
Subject: [pkgdb] kdevelop: tuxbrewr has requested watchcommits
Message-ID: <20080913214834.C75DB208DA4@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdevelop (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Sat Sep 13 21:48:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:48:42 +0000
Subject: [pkgdb] kdevelop: tuxbrewr has requested watchbugzilla
Message-ID: <20080913214842.D3F9F208DAA@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdevelop (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Sat Sep 13 21:48:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 13 Sep 2008 21:48:46 +0000
Subject: [pkgdb] kdevelop: tuxbrewr has requested watchcommits
Message-ID: <20080913214846.3CC11208DAD@bastion.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdevelop (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdevelop



From hadess at fedoraproject.org  Sat Sep 13 23:37:09 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat, 13 Sep 2008 23:37:09 +0000 (UTC)
Subject: rpms/bluez-gnome/devel bluez-gnome.spec,1.55,1.56
Message-ID: <20080913233710.056B070134@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1735

Modified Files:
	bluez-gnome.spec 
Log Message:
* Sun Sep 14 2008 - Bastien Nocera <bnocera at redhat.com> - 1.4-3
- Add missing files to the list



Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- bluez-gnome.spec	13 Sep 2008 19:31:44 -0000	1.55
+++ bluez-gnome.spec	13 Sep 2008 23:36:39 -0000	1.56
@@ -1,6 +1,6 @@
 Name:		bluez-gnome
 Version:	1.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
@@ -117,6 +117,7 @@
 %{_bindir}/bluetooth-properties
 %{_bindir}/bluetooth-sendto
 %{_bindir}/bluetooth-wizard
+%{_bindir}/bluetooth-browse
 %config %{_sysconfdir}/gconf/schemas/*
 %{_datadir}/gnome/autostart/bluetooth-applet.desktop
 %{_datadir}/man/man1/bluetooth-applet.1.gz
@@ -126,6 +127,7 @@
 %{_datadir}/mime/packages/bluetooth-manager.xml
 %{_datadir}/icons/hicolor/*/apps/*
 %{_mandir}/man1/bluetooth-sendto.1.gz
+%{_mandir}/man1/bluetooth-browse.1.gz
 %doc README COPYING AUTHORS ChangeLog
 
 %files analyzer
@@ -134,6 +136,9 @@
 %{_datadir}/man/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Sun Sep 14 2008 - Bastien Nocera <bnocera at redhat.com> - 1.4-3
+- Add missing files to the list
+
 * Sat Sep 13 2008 - Bastien Nocera <bnocera at redhat.com> - 1.4-2
 - Remove obsolete patch
 



From smilner at fedoraproject.org  Sun Sep 14 00:42:50 2008
From: smilner at fedoraproject.org (Steve Milner)
Date: Sun, 14 Sep 2008 00:42:50 +0000 (UTC)
Subject: rpms/python-virtualenv/F-9 import.log, NONE,
	1.1 python-virtualenv.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080914004250.41E1770136@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-virtualenv/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22526/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-virtualenv.spec 
Log Message:
Import into F-9 branch.



--- NEW FILE import.log ---
python-virtualenv-1_2-1_fc10:F-9:python-virtualenv-1.2-1.fc10.src.rpm:1221352884


--- NEW FILE python-virtualenv.spec ---
# sitelib for noarch packages
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-virtualenv
Version:        1.2
Release:        1%{?dist}
Summary:        Tool to create isolated Python environments

Group:          Development/Languages
License:        MIT
URL:            http://pypi.python.org/pypi/virtualenv
Source0:        http://pypi.python.org/packages/source/v/virtualenv/virtualenv-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, python-setuptools-devel


%description
virtualenv is a tool to create isolated Python environments. virtualenv
is a successor to workingenv, and an extension of virtual-python. It is
written by Ian Bicking, and sponsored by the Open Planning Project. It is
licensed under an MIT-style permissive license.


%prep
%setup -q -n virtualenv-%{version}
%{__sed} -i -e "s|#!/usr/bin/env python||" virtualenv.py 


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs/index.txt docs/license.txt PKG-INFO
# For noarch packages: sitelib
%{python_sitelib}/*
%attr(755,root,root) %{_bindir}/virtualenv
%exclude %{python_sitelib}/support-files


%changelog
* Sat Aug 30 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.2-1
- Updated for upstream release

* Fri Aug 29 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.1-3
- Updated from review notes

* Thu Aug 28 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.1-2
- Updated from review notes

* Tue Aug 26 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.1-1
- Initial Version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:29:55 -0000	1.1
+++ .cvsignore	14 Sep 2008 00:42:19 -0000	1.2
@@ -0,0 +1 @@
+virtualenv-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:29:55 -0000	1.1
+++ sources	14 Sep 2008 00:42:19 -0000	1.2
@@ -0,0 +1 @@
+7ad454e52f025cad631d03331ade4aaf  virtualenv-1.2.tar.gz



From smilner at fedoraproject.org  Sun Sep 14 00:49:05 2008
From: smilner at fedoraproject.org (Steve Milner)
Date: Sun, 14 Sep 2008 00:49:05 +0000 (UTC)
Subject: rpms/python-virtualenv/EL-5 import.log, NONE,
	1.1 python-virtualenv.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080914004905.567B570136@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-virtualenv/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24899/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-virtualenv.spec 
Log Message:
Import of python-virtualenv into EPEL



--- NEW FILE import.log ---
python-virtualenv-1_2-1_fc10:EL-5:python-virtualenv-1.2-1.fc10.src.rpm:1221353277


--- NEW FILE python-virtualenv.spec ---
# sitelib for noarch packages
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-virtualenv
Version:        1.2
Release:        1%{?dist}
Summary:        Tool to create isolated Python environments

Group:          Development/Languages
License:        MIT
URL:            http://pypi.python.org/pypi/virtualenv
Source0:        http://pypi.python.org/packages/source/v/virtualenv/virtualenv-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, python-setuptools-devel


%description
virtualenv is a tool to create isolated Python environments. virtualenv
is a successor to workingenv, and an extension of virtual-python. It is
written by Ian Bicking, and sponsored by the Open Planning Project. It is
licensed under an MIT-style permissive license.


%prep
%setup -q -n virtualenv-%{version}
%{__sed} -i -e "s|#!/usr/bin/env python||" virtualenv.py 


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs/index.txt docs/license.txt PKG-INFO
# For noarch packages: sitelib
%{python_sitelib}/*
%attr(755,root,root) %{_bindir}/virtualenv
%exclude %{python_sitelib}/support-files


%changelog
* Sat Aug 30 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.2-1
- Updated for upstream release

* Fri Aug 29 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.1-3
- Updated from review notes

* Thu Aug 28 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.1-2
- Updated from review notes

* Tue Aug 26 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.1-1
- Initial Version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:29:55 -0000	1.1
+++ .cvsignore	14 Sep 2008 00:48:35 -0000	1.2
@@ -0,0 +1 @@
+virtualenv-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:29:55 -0000	1.1
+++ sources	14 Sep 2008 00:48:35 -0000	1.2
@@ -0,0 +1 @@
+7ad454e52f025cad631d03331ade4aaf  virtualenv-1.2.tar.gz



From cebbert at fedoraproject.org  Sun Sep 14 01:01:54 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun, 14 Sep 2008 01:01:54 +0000 (UTC)
Subject: rpms/kernel/F-9
	linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch, 
	NONE, 1.1 kernel.spec, 1.762, 1.763
Message-ID: <20080914010154.5FE3470136@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29644

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch 
Log Message:
x86: fix memmap=exactmap argument, fixing kdump in some cases (#459103)

linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch:

--- NEW FILE linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch ---
From: Prarit Bhargava <prarit at redhat.com>
Date: Tue, 9 Sep 2008 13:56:08 +0000 (-0400)
Subject: x86: fix memmap=exactmap boot argument
X-Git-Tag: v2.6.27-rc6~4^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d6be118a97ce51ca84035270f91c2bccecbfac5f

x86: fix memmap=exactmap boot argument

When using kdump modifying the e820 map is yielding strange results.

For example starting with

 BIOS-provided physical RAM map:
 BIOS-e820: 0000000000000100 - 0000000000093400 (usable)
 BIOS-e820: 0000000000093400 - 00000000000a0000 (reserved)
 BIOS-e820: 0000000000100000 - 000000003fee0000 (usable)
 BIOS-e820: 000000003fee0000 - 000000003fef3000 (ACPI data)
 BIOS-e820: 000000003fef3000 - 000000003ff80000 (ACPI NVS)
 BIOS-e820: 000000003ff80000 - 0000000040000000 (reserved)
 BIOS-e820: 00000000e0000000 - 00000000f0000000 (reserved)
 BIOS-e820: 00000000fec00000 - 00000000fec10000 (reserved)
 BIOS-e820: 00000000fee00000 - 00000000fee01000 (reserved)
 BIOS-e820: 00000000ff000000 - 0000000100000000 (reserved)

and booting with args

memmap=exactmap memmap=640K at 0K memmap=5228K at 16384K memmap=125188K at 22252K memmap=76K#1047424K memmap=564K#1047500K

resulted in:

 user-defined physical RAM map:
 user: 0000000000000000 - 0000000000093400 (usable)
 user: 0000000000093400 - 00000000000a0000 (reserved)
 user: 0000000000100000 - 000000003fee0000 (usable)
 user: 000000003fee0000 - 000000003fef3000 (ACPI data)
 user: 000000003fef3000 - 000000003ff80000 (ACPI NVS)
 user: 000000003ff80000 - 0000000040000000 (reserved)
 user: 00000000e0000000 - 00000000f0000000 (reserved)
 user: 00000000fec00000 - 00000000fec10000 (reserved)
 user: 00000000fee00000 - 00000000fee01000 (reserved)
 user: 00000000ff000000 - 0000000100000000 (reserved)

But should have resulted in:

 user-defined physical RAM map:
 user: 0000000000000000 - 00000000000a0000 (usable)
 user: 0000000001000000 - 000000000151b000 (usable)
 user: 00000000015bb000 - 0000000008ffc000 (usable)
 user: 000000003fee0000 - 000000003ff80000 (ACPI data)

This is happening because of an improper usage of strcmp() in the
e820 parsing code.  The strcmp() always returns !0 and never resets the
value for e820.nr_map and returns an incorrect user-defined map.

This patch fixes the problem.

Signed-off-by: Prarit Bhargava <prarit at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Backport: Chuck Ebbert <cebbert at redhat.com>

---

Index: linux-2.6.26.noarch/arch/x86/kernel/e820_32.c
===================================================================
--- linux-2.6.26.noarch.orig/arch/x86/kernel/e820_32.c
+++ linux-2.6.26.noarch/arch/x86/kernel/e820_32.c
@@ -697,7 +697,7 @@ static int __init parse_memmap(char *arg
 	if (!arg)
 		return -EINVAL;
 
-	if (strcmp(arg, "exactmap") == 0) {
+	if (strncmp(arg, "exactmap", 8) == 0) {
 #ifdef CONFIG_CRASH_DUMP
 		/* If we are doing a crash dump, we
 		 * still need to know the real mem
Index: linux-2.6.26.noarch/arch/x86/kernel/e820_64.c
===================================================================
--- linux-2.6.26.noarch.orig/arch/x86/kernel/e820_64.c
+++ linux-2.6.26.noarch/arch/x86/kernel/e820_64.c
@@ -776,7 +776,7 @@ static int __init parse_memmap_opt(char 
 	char *oldp;
 	unsigned long long start_at, mem_size;
 
-	if (!strcmp(p, "exactmap")) {
+	if (!strncmp(p, "exactmap", 8)) {
 #ifdef CONFIG_CRASH_DUMP
 		/*
 		 * If we are doing a crash dump, we still need to know


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.762
retrieving revision 1.763
diff -u -r1.762 -r1.763
--- kernel.spec	13 Sep 2008 07:22:02 -0000	1.762
+++ kernel.spec	14 Sep 2008 01:01:23 -0000	1.763
@@ -589,7 +589,7 @@
 Patch95: linux-2.6-x86-hpet-02-read-back-compare-register.patch
 Patch96: linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch
 Patch97: linux-2.6-x86-hpet-04-workaround-sb700-bios.patch
-
+Patch98: linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch
 
 # ppc
 Patch140: linux-2.6-ps3-ehci-iso.patch
@@ -1052,6 +1052,8 @@
 ApplyPatch linux-2.6-x86-hpet-02-read-back-compare-register.patch
 ApplyPatch linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch
 ApplyPatch linux-2.6-x86-hpet-04-workaround-sb700-bios.patch
+# fix memmap=exactmap, so kdump kernels work
+ApplyPatch linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch
 
 #
 # PowerPC
@@ -1841,6 +1843,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Sat Sep 13 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-36
+- x86: fix memmap=exactmap argument, fixing kdump in some cases (#459103)
+
 * Sat Sep 13 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-35
 - Fix problems with AMT on e1000e (#453023)
 



From cebbert at fedoraproject.org  Sun Sep 14 01:29:53 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun, 14 Sep 2008 01:29:53 +0000 (UTC)
Subject: rpms/kernel/F-9 linux-2.6-sched-clock-fix-nohz-interaction.patch,
	NONE, 
	1.1 linux-2.6-sched-fix-process-time-monotonicity.patch, NONE,
	1.1 kernel.spec, 1.763, 1.764
Message-ID: <20080914012953.8B4E970136@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6200

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-sched-clock-fix-nohz-interaction.patch 
	linux-2.6-sched-fix-process-time-monotonicity.patch 
Log Message:
Fix problems with scheduler clock going backwards (#453257)

linux-2.6-sched-clock-fix-nohz-interaction.patch:

--- NEW FILE linux-2.6-sched-clock-fix-nohz-interaction.patch ---
From: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Mon, 1 Sep 2008 14:44:23 +0000 (+0200)
Subject: sched_clock: fix NOHZ interaction
X-Git-Tag: v2.6.27-rc6~15^2~2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=56c7426b3951e4f35a71d695f1c982989399d6fd

sched_clock: fix NOHZ interaction

If HLT stops the TSC, we'll fail to account idle time, thereby inflating the
actual process times. Fix this by re-calibrating the clock against GTOD when
leaving nohz mode.

Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Tested-by: Avi Kivity <avi at qumranet.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 7a46bde..a87b046 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -162,6 +162,8 @@ void tick_nohz_stop_idle(int cpu)
 		ts->idle_lastupdate = now;
 		ts->idle_sleeptime = ktime_add(ts->idle_sleeptime, delta);
 		ts->idle_active = 0;
+
+		sched_clock_idle_wakeup_event(0);
 	}
 }
 
@@ -177,6 +179,7 @@ static ktime_t tick_nohz_start_idle(struct tick_sched *ts)
 	}
 	ts->idle_entrytime = now;
 	ts->idle_active = 1;
+	sched_clock_idle_sleep_event();
 	return now;
 }
 

linux-2.6-sched-fix-process-time-monotonicity.patch:

--- NEW FILE linux-2.6-sched-fix-process-time-monotonicity.patch ---
From: Balbir Singh <balbir at linux.vnet.ibm.com>
Date: Fri, 5 Sep 2008 16:12:23 +0000 (+0200)
Subject: sched: fix process time monotonicity
X-Git-Tag: v2.6.27-rc6~15^2~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=49048622eae698e5c4ae61f7e71200f265ccc529

sched: fix process time monotonicity

Spencer reported a problem where utime and stime were going negative despite
the fixes in commit b27f03d4bdc145a09fb7b0c0e004b29f1ee555fa. The suspected
reason for the problem is that signal_struct maintains it's own utime and
stime (of exited tasks), these are not updated using the new task_utime()
routine, hence sig->utime can go backwards and cause the same problem
to occur (sig->utime, adds tsk->utime and not task_utime()). This patch
fixes the problem

TODO: using max(task->prev_utime, derived utime) works for now, but a more
generic solution is to implement cputime_max() and use the cputime_gt()
function for comparison.

Reported-by: spencer at bluehost.com
Signed-off-by: Balbir Singh <balbir at linux.vnet.ibm.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/fs/proc/array.c b/fs/proc/array.c
index 0d6eb33..71c9be5 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -337,65 +337,6 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
 	return 0;
 }
 
-/*
- * Use precise platform statistics if available:
- */
-#ifdef CONFIG_VIRT_CPU_ACCOUNTING
-static cputime_t task_utime(struct task_struct *p)
-{
-	return p->utime;
-}
-
-static cputime_t task_stime(struct task_struct *p)
-{
-	return p->stime;
-}
-#else
-static cputime_t task_utime(struct task_struct *p)
-{
-	clock_t utime = cputime_to_clock_t(p->utime),
-		total = utime + cputime_to_clock_t(p->stime);
-	u64 temp;
-
-	/*
-	 * Use CFS's precise accounting:
-	 */
-	temp = (u64)nsec_to_clock_t(p->se.sum_exec_runtime);
-
-	if (total) {
-		temp *= utime;
-		do_div(temp, total);
-	}
-	utime = (clock_t)temp;
-
-	p->prev_utime = max(p->prev_utime, clock_t_to_cputime(utime));
-	return p->prev_utime;
-}
-
-static cputime_t task_stime(struct task_struct *p)
-{
-	clock_t stime;
-
-	/*
-	 * Use CFS's precise accounting. (we subtract utime from
-	 * the total, to make sure the total observed by userspace
-	 * grows monotonically - apps rely on that):
-	 */
-	stime = nsec_to_clock_t(p->se.sum_exec_runtime) -
-			cputime_to_clock_t(task_utime(p));
-
-	if (stime >= 0)
-		p->prev_stime = max(p->prev_stime, clock_t_to_cputime(stime));
-
-	return p->prev_stime;
-}
-#endif
-
-static cputime_t task_gtime(struct task_struct *p)
-{
-	return p->gtime;
-}
-
 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
 			struct pid *pid, struct task_struct *task, int whole)
 {
diff --git a/include/linux/sched.h b/include/linux/sched.h
index cfb0d87..3d9120c 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1475,6 +1475,10 @@ static inline void put_task_struct(struct task_struct *t)
 		__put_task_struct(t);
 }
 
+extern cputime_t task_utime(struct task_struct *p);
+extern cputime_t task_stime(struct task_struct *p);
+extern cputime_t task_gtime(struct task_struct *p);
+
 /*
  * Per process flags
  */
diff --git a/kernel/exit.c b/kernel/exit.c
index 25ed2ad..1639564 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -112,9 +112,9 @@ static void __exit_signal(struct task_struct *tsk)
 		 * We won't ever get here for the group leader, since it
 		 * will have been the last reference on the signal_struct.
 		 */
-		sig->utime = cputime_add(sig->utime, tsk->utime);
-		sig->stime = cputime_add(sig->stime, tsk->stime);
-		sig->gtime = cputime_add(sig->gtime, tsk->gtime);
+		sig->utime = cputime_add(sig->utime, task_utime(tsk));
+		sig->stime = cputime_add(sig->stime, task_stime(tsk));
+		sig->gtime = cputime_add(sig->gtime, task_gtime(tsk));
 		sig->min_flt += tsk->min_flt;
 		sig->maj_flt += tsk->maj_flt;
 		sig->nvcsw += tsk->nvcsw;
diff --git a/kernel/sched.c b/kernel/sched.c
index 9a1ddb8..1a5f73c 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4179,6 +4179,65 @@ void account_steal_time(struct task_struct *p, cputime_t steal)
 }
 
 /*
+ * Use precise platform statistics if available:
+ */
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING
+cputime_t task_utime(struct task_struct *p)
+{
+	return p->utime;
+}
+
+cputime_t task_stime(struct task_struct *p)
+{
+	return p->stime;
+}
+#else
+cputime_t task_utime(struct task_struct *p)
+{
+	clock_t utime = cputime_to_clock_t(p->utime),
+		total = utime + cputime_to_clock_t(p->stime);
+	u64 temp;
+
+	/*
+	 * Use CFS's precise accounting:
+	 */
+	temp = (u64)nsec_to_clock_t(p->se.sum_exec_runtime);
+
+	if (total) {
+		temp *= utime;
+		do_div(temp, total);
+	}
+	utime = (clock_t)temp;
+
+	p->prev_utime = max(p->prev_utime, clock_t_to_cputime(utime));
+	return p->prev_utime;
+}
+
+cputime_t task_stime(struct task_struct *p)
+{
+	clock_t stime;
+
+	/*
+	 * Use CFS's precise accounting. (we subtract utime from
+	 * the total, to make sure the total observed by userspace
+	 * grows monotonically - apps rely on that):
+	 */
+	stime = nsec_to_clock_t(p->se.sum_exec_runtime) -
+			cputime_to_clock_t(task_utime(p));
+
+	if (stime >= 0)
+		p->prev_stime = max(p->prev_stime, clock_t_to_cputime(stime));
+
+	return p->prev_stime;
+}
+#endif
+
+inline cputime_t task_gtime(struct task_struct *p)
+{
+	return p->gtime;
+}
+
+/*
  * This function gets called by the timer code, with HZ frequency.
  * We call it with interrupts disabled.
  *


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.763
retrieving revision 1.764
diff -u -r1.763 -r1.764
--- kernel.spec	14 Sep 2008 01:01:23 -0000	1.763
+++ kernel.spec	14 Sep 2008 01:29:23 -0000	1.764
@@ -576,7 +576,10 @@
 Patch22: linux-2.6-utrace.patch
 
 Patch41: linux-2.6-sysrq-c.patch
-Patch42: linux-2.6-x86-tune-generic.patch
+Patch42: linux-2.6-sched-clock-fix-nohz-interaction.patch
+Patch43: linux-2.6-sched-fix-process-time-monotonicity.patch
+
+Patch70: linux-2.6-x86-tune-generic.patch
 Patch75: linux-2.6-x86-debug-boot.patch
 Patch87: linux-2.6-x86-apic-dump-all-regs-v3.patch
 Patch88: linux-2.6-x86-64-fix-overlap-of-modules-and-fixmap-areas.patch
@@ -1029,6 +1032,10 @@
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
 
+# fix sched clock monotonicity bugs
+ApplyPatch linux-2.6-sched-clock-fix-nohz-interaction.patch
+ApplyPatch linux-2.6-sched-fix-process-time-monotonicity.patch
+
 # Architecture patches
 # x86(-64)
 # Compile 686 kernels tuned for Pentium4.
@@ -1843,6 +1850,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Sat Sep 13 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-37
+- Fix problems with scheduler clock going backwards (#453257)
+
 * Sat Sep 13 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-36
 - x86: fix memmap=exactmap argument, fixing kdump in some cases (#459103)
 



From cebbert at fedoraproject.org  Sun Sep 14 01:44:04 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun, 14 Sep 2008 01:44:04 +0000 (UTC)
Subject: rpms/kernel/F-9
	linux-2.6-fs-cifs-fix-plaintext-authentication.patch, NONE,
	1.1 linux-2.6-mm-mark-correct-zone-full-when-scanning-zonelists.patch,
	NONE, 1.1 kernel.spec, 1.764, 1.765
Message-ID: <20080914014404.67CFA70136@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10854

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-fs-cifs-fix-plaintext-authentication.patch 
	linux-2.6-mm-mark-correct-zone-full-when-scanning-zonelists.patch 
Log Message:
Add two patches scheduled for 2.6.26-stable:
  cifs: fix plaintext authentication
  mm:   mark correct zone full when scanning zonelists

linux-2.6-fs-cifs-fix-plaintext-authentication.patch:

--- NEW FILE linux-2.6-fs-cifs-fix-plaintext-authentication.patch ---

# HG changeset patch
# User Steve French <sfrench at us.ibm.com>
# Date 1219872622 0
# Node ID 162cdc8faa8cd3f5a0128d99c5697184f95f3d4b
# Parent fc091f471c790bfc1a60b82c04c6bcb7a5d8e19a
[CIFS] Fix plaintext authentication

The last eight bytes of the password field were not cleared when doing lanman plaintext password authentication. This patch fixes that.

I tested it with Samba by setting password
encryption to no in the server's smb.conf.  Other servers also can be
configured to force plaintext authentication.    Note that plaintexti
authentication requires setting /proc/fs/cifs/SecurityFlags to 0x30030
on the client (enabling both LANMAN and also plaintext password support).
Also note that LANMAN support (and thus plaintext password support) requires
CONFIG_CIFS_WEAK_PW_HASH to be enabled in menuconfig.

CC: Jeff Layton <jlayton at redhat.com>
CC: Stable Kernel <stable at vger.kernel.org>
Signed-off-by: Steve French <sfrench at us.ibm.com>

committer: Steve French <sfrench at us.ibm.com>

--- a/fs/cifs/cifsencrypt.c	Wed Aug 27 21:17:41 2008 +0000
+++ b/fs/cifs/cifsencrypt.c	Wed Aug 27 21:30:22 2008 +0000
@@ -294,6 +294,7 @@
 
 	if ((ses->server->secMode & SECMODE_PW_ENCRYPT) == 0)
 		if (extended_security & CIFSSEC_MAY_PLNTXT) {
+			memset(lnm_session_key, 0, CIFS_SESS_KEY_SIZE);
 			memcpy(lnm_session_key, password_with_pad,
 				CIFS_ENCPWD_SIZE);
 			return;


linux-2.6-mm-mark-correct-zone-full-when-scanning-zonelists.patch:

--- NEW FILE linux-2.6-mm-mark-correct-zone-full-when-scanning-zonelists.patch ---
From: Mel Gorman <mel at csn.ul.ie>
Date: Sat, 13 Sep 2008 09:33:19 +0000 (-0700)
Subject: mm: mark the correct zone as full when scanning zonelists
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=5bead2a0680687b9576d57c177988e8aa082b922

mm: mark the correct zone as full when scanning zonelists

The iterator for_each_zone_zonelist() uses a struct zoneref *z cursor when
scanning zonelists to keep track of where in the zonelist it is.  The
zoneref that is returned corresponds to the the next zone that is to be
scanned, not the current one.  It was intended to be treated as an opaque
list.

When the page allocator is scanning a zonelist, it marks elements in the
zonelist corresponding to zones that are temporarily full.  As the
zonelist is being updated, it uses the cursor here;

  if (NUMA_BUILD)
        zlc_mark_zone_full(zonelist, z);

This is intended to prevent rescanning in the near future but the zoneref
cursor does not correspond to the zone that has been found to be full.
This is an easy misunderstanding to make so this patch corrects the
problem by changing zoneref cursor to be the current zone being scanned
instead of the next one.

Signed-off-by: Mel Gorman <mel at csn.ul.ie>
Cc: Andy Whitcroft <apw at shadowen.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: <stable at kernel.org>		[2.6.26.x]
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 443bc7c..428328a 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -751,8 +751,9 @@ static inline int zonelist_node_idx(struct zoneref *zoneref)
  *
  * This function returns the next zone at or below a given zone index that is
  * within the allowed nodemask using a cursor as the starting point for the
- * search. The zoneref returned is a cursor that is used as the next starting
- * point for future calls to next_zones_zonelist().
+ * search. The zoneref returned is a cursor that represents the current zone
+ * being examined. It should be advanced by one before calling
+ * next_zones_zonelist again.
  */
 struct zoneref *next_zones_zonelist(struct zoneref *z,
 					enum zone_type highest_zoneidx,
@@ -768,9 +769,8 @@ struct zoneref *next_zones_zonelist(struct zoneref *z,
  *
  * This function returns the first zone at or below a given zone index that is
  * within the allowed nodemask. The zoneref returned is a cursor that can be
- * used to iterate the zonelist with next_zones_zonelist. The cursor should
- * not be used by the caller as it does not match the value of the zone
- * returned.
+ * used to iterate the zonelist with next_zones_zonelist by advancing it by
+ * one before calling.
  */
 static inline struct zoneref *first_zones_zonelist(struct zonelist *zonelist,
 					enum zone_type highest_zoneidx,
@@ -795,7 +795,7 @@ static inline struct zoneref *first_zones_zonelist(struct zonelist *zonelist,
 #define for_each_zone_zonelist_nodemask(zone, z, zlist, highidx, nodemask) \
 	for (z = first_zones_zonelist(zlist, highidx, nodemask, &zone);	\
 		zone;							\
-		z = next_zones_zonelist(z, highidx, nodemask, &zone))	\
+		z = next_zones_zonelist(++z, highidx, nodemask, &zone))	\
 
 /**
  * for_each_zone_zonelist - helper macro to iterate over valid zones in a zonelist at or below a given zone index
diff --git a/mm/mmzone.c b/mm/mmzone.c
index 486ed59..16ce8b9 100644
--- a/mm/mmzone.c
+++ b/mm/mmzone.c
@@ -69,6 +69,6 @@ struct zoneref *next_zones_zonelist(struct zoneref *z,
 				(z->zone && !zref_in_nodemask(z, nodes)))
 			z++;
 
-	*zone = zonelist_zone(z++);
+	*zone = zonelist_zone(z);
 	return z;
 }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.764
retrieving revision 1.765
diff -u -r1.764 -r1.765
--- kernel.spec	14 Sep 2008 01:29:23 -0000	1.764
+++ kernel.spec	14 Sep 2008 01:43:33 -0000	1.765
@@ -622,6 +622,7 @@
 # filesystem patches
 Patch420: linux-2.6-fs-cifs-turn-off-unicode-during-session-establishment.patch
 Patch421: linux-2.6-squashfs.patch
+Patch422: linux-2.6-fs-cifs-fix-plaintext-authentication.patch
 
 Patch430: linux-2.6-net-silence-noisy-printks.patch
 
@@ -655,6 +656,7 @@
 Patch830: linux-2.6-cpuidle-3-make-ladder-governor-honor-latency-requirements.patch
 
 Patch900: linux-2.6-mm-dirty-page-tracking-race-fix.patch
+Patch901: linux-2.6-mm-mark-correct-zone-full-when-scanning-zonelists.patch
 
 Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch
 Patch1400: linux-2.6-smarter-relatime.patch
@@ -1118,6 +1120,8 @@
 # mm
 # possible data corruption, esp. on ppc
 ApplyPatch linux-2.6-mm-dirty-page-tracking-race-fix.patch
+# mm zone scan patch scheduled for -stable
+ApplyPatch linux-2.6-mm-mark-correct-zone-full-when-scanning-zonelists.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1161,6 +1165,8 @@
 ApplyPatch linux-2.6-fs-cifs-turn-off-unicode-during-session-establishment.patch
 # Squashfs
 ApplyPatch linux-2.6-squashfs.patch
+# fix CIFS plaintext passwords
+ApplyPatch linux-2.6-fs-cifs-fix-plaintext-authentication.patch
 
 # Networking
 # Disable easy to trigger printk's.
@@ -1850,6 +1856,11 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Sat Sep 13 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-38
+- Add two patches scheduled for 2.6.26-stable:
+  cifs: fix plaintext authentication
+  mm:   mark correct zone full when scanning zonelists
+
 * Sat Sep 13 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-37
 - Fix problems with scheduler clock going backwards (#453257)
 



From cebbert at fedoraproject.org  Sun Sep 14 01:57:56 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun, 14 Sep 2008 01:57:56 +0000 (UTC)
Subject: rpms/kernel/F-9
	linux-2.6-libata-fix-a-large-collection-of-DMA-mode-mismatches.patch, 
	NONE, 1.1 linux-2.6-libata-lba-28-48-off-by-one-in-ata.h.patch,
	NONE, 1.1 kernel.spec, 1.765, 1.766
Message-ID: <20080914015756.06D2F70136@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15271

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-libata-fix-a-large-collection-of-DMA-mode-mismatches.patch 
	linux-2.6-libata-lba-28-48-off-by-one-in-ata.h.patch 
Log Message:
libata: fix DMA mode mistmatches
libata: interpret the LBA28 spec properly

linux-2.6-libata-fix-a-large-collection-of-DMA-mode-mismatches.patch:

--- NEW FILE linux-2.6-libata-fix-a-large-collection-of-DMA-mode-mismatches.patch ---
From: Alan Cox <alan at redhat.com>
Date: Fri, 1 Aug 2008 08:18:34 +0000 (+0100)
Subject: libata: Fix a large collection of DMA mode mismatches
X-Git-Tag: v2.6.27-rc5~51^2~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=b15b3ebae102f89c25ccbcae0b2099af312f2e82

libata: Fix a large collection of DMA mode mismatches

Dave M????ller sent a diff for the pata_oldpiix that highlighted a problem
where a lot of the ATA drivers assume dma_mode == 0 means "no DMA" while
the core code uses 0xFF.

This turns out to have other consequences such as code doing >= XFER_UDMA_0
also catching 0xFF as UDMAlots. Fortunately it doesn't generally affect
set_dma_mode, although some drivers call back into their own set mode code
from other points.

Having been through the drivers I've added helpers for using_udma/using_mwdma
dma_enabled so that people don't open code ranges that may change (eg if UDMA8
appears somewhere)

Thanks to David for the initial bits
[and added fix for pata_oldpiix from and signed-off-by Dave Mueller
 <dave.mueller at gmx.ch>  -jg]

Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 5f8f57a..79e3a8e 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -3288,7 +3288,7 @@ int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)
 		dev->dma_mode = ata_xfer_mask2mode(dma_mask);
 
 		found = 1;
-		if (dev->dma_mode != 0xff)
+		if (ata_dma_enabled(dev))
 			used_dma = 1;
 	}
 	if (!found)
@@ -3313,7 +3313,7 @@ int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)
 
 	/* step 3: set host DMA timings */
 	ata_link_for_each_dev(dev, link) {
-		if (!ata_dev_enabled(dev) || dev->dma_mode == 0xff)
+		if (!ata_dev_enabled(dev) || !ata_dma_enabled(dev))
 			continue;
 
 		dev->xfer_mode = dev->dma_mode;
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
index fbe6057..eb919c1 100644
--- a/drivers/ata/pata_acpi.c
+++ b/drivers/ata/pata_acpi.c
@@ -181,7 +181,7 @@ static unsigned int pacpi_qc_issue(struct ata_queued_cmd *qc)
 
 	if (adev != acpi->last) {
 		pacpi_set_piomode(ap, adev);
-		if (adev->dma_mode)
+		if (ata_dma_enabled(adev))
 			pacpi_set_dmamode(ap, adev);
 		acpi->last = adev;
 	}
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index d7de7ba..e8a0d99 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -183,7 +183,7 @@ static void atiixp_bmdma_start(struct ata_queued_cmd *qc)
 	u16 tmp16;
 
 	pci_read_config_word(pdev, ATIIXP_IDE_UDMA_CONTROL, &tmp16);
-	if (adev->dma_mode >= XFER_UDMA_0)
+	if (ata_using_udma(adev))
 		tmp16 |= (1 << dn);
 	else
 		tmp16 &= ~(1 << dn);
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index 744beeb..0c4b271 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -149,10 +149,10 @@ static unsigned int cs5530_qc_issue(struct ata_queued_cmd *qc)
 	struct ata_device *prev = ap->private_data;
 
 	/* See if the DMA settings could be wrong */
-	if (adev->dma_mode != 0 && adev != prev && prev != NULL) {
+	if (ata_dma_enabled(adev) && adev != prev && prev != NULL) {
 		/* Maybe, but do the channels match MWDMA/UDMA ? */
-		if ((adev->dma_mode >= XFER_UDMA_0 && prev->dma_mode < XFER_UDMA_0) ||
-		    (adev->dma_mode < XFER_UDMA_0 && prev->dma_mode >= XFER_UDMA_0))
+		if ((ata_using_udma(adev) && !ata_using_udma(prev)) ||
+		    (ata_using_udma(prev) && !ata_using_udma(adev)))
 		    	/* Switch the mode bits */
 		    	cs5530_set_dmamode(ap, adev);
 	}
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index e678af3..df64f24 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -198,7 +198,7 @@ static unsigned int oldpiix_qc_issue(struct ata_queued_cmd *qc)
 
 	if (adev != ap->private_data) {
 		oldpiix_set_piomode(ap, adev);
-		if (adev->dma_mode)
+		if (ata_dma_enabled(adev))
 			oldpiix_set_dmamode(ap, adev);
 	}
 	return ata_sff_qc_issue(qc);
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index cbab397..0278fd2 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -167,10 +167,10 @@ static unsigned int sc1200_qc_issue(struct ata_queued_cmd *qc)
 	struct ata_device *prev = ap->private_data;
 
 	/* See if the DMA settings could be wrong */
-	if (adev->dma_mode != 0 && adev != prev && prev != NULL) {
+	if (ata_dma_enabled(adev) && adev != prev && prev != NULL) {
 		/* Maybe, but do the channels match MWDMA/UDMA ? */
-		if ((adev->dma_mode >= XFER_UDMA_0 && prev->dma_mode < XFER_UDMA_0) ||
-		    (adev->dma_mode < XFER_UDMA_0 && prev->dma_mode >= XFER_UDMA_0))
+		if ((ata_using_udma(adev) && !ata_using_udma(prev)) ||
+		    (ata_using_udma(prev) && !ata_using_udma(adev)))
 		    	/* Switch the mode bits */
 		    	sc1200_set_dmamode(ap, adev);
 	}
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 80233fd..225bfc5 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1429,6 +1429,28 @@ static inline unsigned long ata_deadline(unsigned long from_jiffies,
 	return from_jiffies + msecs_to_jiffies(timeout_msecs);
 }
 
+/* Don't open code these in drivers as there are traps. Firstly the range may
+   change in future hardware and specs, secondly 0xFF means 'no DMA' but is
+   > UDMA_0. Dyma ddreigiau */
+
+static inline int ata_using_mwdma(struct ata_device *adev)
+{
+	if (adev->dma_mode >= XFER_MW_DMA_0 && adev->dma_mode <= XFER_MW_DMA_4)
+		return 1;
+	return 0;
+}
+
+static inline int ata_using_udma(struct ata_device *adev)
+{
+	if (adev->dma_mode >= XFER_UDMA_0 && adev->dma_mode <= XFER_UDMA_7)
+		return 1;
+	return 0;
+}
+
+static inline int ata_dma_enabled(struct ata_device *adev)
+{
+	return (adev->dma_mode == 0xFF ? 0 : 1);
+}
 
 /**************************************************************************
  * PMP - drivers/ata/libata-pmp.c

linux-2.6-libata-lba-28-48-off-by-one-in-ata.h.patch:

--- NEW FILE linux-2.6-libata-lba-28-48-off-by-one-in-ata.h.patch ---
From: Taisuke Yamada <tai at rakugaki.org>
Date: Sat, 13 Sep 2008 20:46:15 +0000 (-0400)
Subject: [libata] LBA28/LBA48 off-by-one bug in ata.h
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=97b697a11b07e2ebfa69c488132596cc5eb24119

[libata] LBA28/LBA48 off-by-one bug in ata.h

I recently bought 3 HGST P7K500-series 500GB SATA drives and
had trouble accessing the block right on the LBA28-LBA48 border.
Here's how it fails (same for all 3 drives):

  # dd if=/dev/sdc bs=512 count=1 skip=268435455 > /dev/null
  dd: reading `/dev/sdc': Input/output error
  0+0 records in
  0+0 records out
  0 bytes (0 B) copied, 0.288033 seconds, 0.0 kB/s
  # dmesg
  ata1.00: exception Emask 0x0 SAct 0x0 SErr 0x0 action 0x0
  ata1.00: BMDMA stat 0x25
  ata1.00: cmd c8/00:08:f8:ff:ff/00:00:00:00:00/ef tag 0 dma 4096 in
  res 51/04:08:f8:ff:ff/00:00:00:00:00/ef Emask 0x1 (device error)
  ata1.00: status: { DRDY ERR }
  ata1.00: error: { ABRT }
  ata1.00: configured for UDMA/33
  ata1: EH complete
  ...

After some investigations, it turned out this seems to be caused
by misinterpretation of the ATA specification on LBA28 access.
Following part is the code in question:

  === include/linux/ata.h ===
  static inline int lba_28_ok(u64 block, u32 n_block)
  {
    /* check the ending block number */
    return ((block + n_block - 1) < ((u64)1 << 28)) && (n_block <= 256);
  }

HGST drive (sometimes) fails with LBA28 access of {block = 0xfffffff,
n_block = 1}, and this behavior seems to be comformant. Other drives,
including other HGST drives are not that strict, through.

>From the ATA specification:
(http://www.t13.org/Documents/UploadedDocuments/project/d1410r3b-ATA-ATAPI-6.pdf)

  8.15.29  Word (61:60): Total number of user addressable sectors
  This field contains a value that is one greater than the total number
  of user addressable sectors (see 6.2). The maximum value that shall
  be placed in this field is 0FFFFFFFh.

So the driver shouldn't use the value of 0xfffffff for LBA28 request
as this exceeds maximum user addressable sector. The logical maximum
value for LBA28 is 0xffffffe.

The obvious fix is to cut "- 1" part, and the patch attached just do
that. I've been using the patched kernel for about a month now, and
the same fix is also floating on the net for some time. So I believe
this fix works reliably.

Just FYI, many Windows/Intel platform users also seems to be struck
by this, and HGST has issued a note pointing to Intel ICH8/9 driver.

  "28-bit LBA command is being used to access LBAs 29-bits in length"
http://www.hitachigst.com/hddt/knowtree.nsf/cffe836ed7c12018862565b000530c74/b531b8bce8745fb78825740f00580e23

Also, *BSDs seems to have similar fix included sometime around ~2004,
through I have not checked out exact portion of the code.

Signed-off-by: Taisuke Yamada <tai at rakugaki.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 1ce19c1..8a12d71 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -745,7 +745,7 @@ static inline int ata_ok(u8 status)
 static inline int lba_28_ok(u64 block, u32 n_block)
 {
 	/* check the ending block number */
-	return ((block + n_block - 1) < ((u64)1 << 28)) && (n_block <= 256);
+	return ((block + n_block) < ((u64)1 << 28)) && (n_block <= 256);
 }
 
 static inline int lba_48_ok(u64 block, u32 n_block)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.765
retrieving revision 1.766
diff -u -r1.765 -r1.766
--- kernel.spec	14 Sep 2008 01:43:33 -0000	1.765
+++ kernel.spec	14 Sep 2008 01:57:25 -0000	1.766
@@ -640,6 +640,8 @@
 Patch671: linux-2.6-libata-pata_it821x-driver-updates-and-reworking.patch
 Patch674: linux-2.6-sata-eeepc-faster.patch
 Patch675: linux-2.6-libata-pata_marvell-play-nice-with-ahci.patch
+Patch676: linux-2.6-libata-fix-a-large-collection-of-DMA-mode-mismatches.patch
+Patch677: linux-2.6-libata-lba-28-48-off-by-one-in-ata.h.patch
 
 Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
@@ -1203,6 +1205,10 @@
 ApplyPatch linux-2.6-sata-eeepc-faster.patch
 # don't use ahci for pata_marvell adapters
 ApplyPatch linux-2.6-libata-pata_marvell-play-nice-with-ahci.patch
+# fix drivers making wrong assumptions about what dma values mean
+ApplyPatch linux-2.6-libata-fix-a-large-collection-of-DMA-mode-mismatches.patch
+# libata breaks lba28 rules
+ApplyPatch linux-2.6-libata-lba-28-48-off-by-one-in-ata.h.patch
 
 # wireless patches headed for 2.6.26
 #ApplyPatch linux-2.6-wireless.patch
@@ -1856,6 +1862,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Sat Sep 13 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-39
+- libata: fix DMA mode mistmatches
+- libata: interpret the LBA28 spec properly
+
 * Sat Sep 13 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-38
 - Add two patches scheduled for 2.6.26-stable:
   cifs: fix plaintext authentication



From athimm at fedoraproject.org  Sun Sep 14 02:11:01 2008
From: athimm at fedoraproject.org (Axel Thimm)
Date: Sun, 14 Sep 2008 02:11:01 +0000 (UTC)
Subject: rpms/fedora-package-config-smart/F-8
	fedora-package-config-smart.spec, 1.12, 1.13
Message-ID: <20080914021101.0D89270136@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19736/F-8

Modified Files:
	fedora-package-config-smart.spec 
Log Message:
Temporary location of updates for F9/F8.


Index: fedora-package-config-smart.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/F-8/fedora-package-config-smart.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fedora-package-config-smart.spec	13 Sep 2008 17:48:20 -0000	1.12
+++ fedora-package-config-smart.spec	14 Sep 2008 02:10:30 -0000	1.13
@@ -5,7 +5,7 @@
 Summary: Fedora configuration files for the Smart package manager
 Name: fedora-package-config-smart
 Version: 8
-Release: 12.0.1.transitional
+Release: 12.0.2.transitional
 License: GPL+
 Group: System Environment/Base
 URL: http://fedoraproject.org/
@@ -55,7 +55,7 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
-* Sat Sep 13 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 8-12.0.1.transitional
+* Sat Sep 13 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 8-12.0.2.transitional
 - Temporary location of updates for F9/F8.
 
 * Sat Mar 22 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 8-11



From athimm at fedoraproject.org  Sun Sep 14 02:11:01 2008
From: athimm at fedoraproject.org (Axel Thimm)
Date: Sun, 14 Sep 2008 02:11:01 +0000 (UTC)
Subject: rpms/fedora-package-config-smart/F-9
	fedora-package-config-smart.spec, 1.14, 1.15
Message-ID: <20080914021101.367C270136@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19736/F-9

Modified Files:
	fedora-package-config-smart.spec 
Log Message:
Temporary location of updates for F9/F8.


Index: fedora-package-config-smart.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/F-9/fedora-package-config-smart.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fedora-package-config-smart.spec	13 Sep 2008 17:48:20 -0000	1.14
+++ fedora-package-config-smart.spec	14 Sep 2008 02:10:30 -0000	1.15
@@ -5,7 +5,7 @@
 Summary: Fedora configuration files for the Smart package manager
 Name: fedora-package-config-smart
 Version: 9
-Release: 13.0.1.transitional
+Release: 13.0.2.transitional
 License: GPL+
 Group: System Environment/Base
 URL: http://fedoraproject.org/
@@ -55,7 +55,7 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
-* Sat Sep 13 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 9-13.0.1.transitional
+* Sat Sep 13 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 9-13.0.2.transitional
 - Temporary location of updates for F9/F8.
 
 * Sat May 17 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 9-13



From pkgdb at fedoraproject.org  Sun Sep 14 03:01:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 03:01:32 +0000
Subject: [pkgdb] kdevelop had acl change status
Message-ID: <20080914030132.C95F8208D9E@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdevelop (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Sun Sep 14 03:01:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 03:01:33 +0000
Subject: [pkgdb] kdevelop had acl change status
Message-ID: <20080914030133.BED45208DA4@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdevelop (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Sun Sep 14 03:01:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 03:01:42 +0000
Subject: [pkgdb] kdevelop had acl change status
Message-ID: <20080914030142.AC7D7208DAC@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdevelop (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Sun Sep 14 03:01:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 03:01:42 +0000
Subject: [pkgdb] kdevelop had acl change status
Message-ID: <20080914030142.B02BE208DAD@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdevelop (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdevelop



From pkgdb at fedoraproject.org  Sun Sep 14 03:01:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 03:01:45 +0000
Subject: [pkgdb] kdewebdev had acl change status
Message-ID: <20080914030145.A95F7208DB1@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdewebdev (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdewebdev



From pkgdb at fedoraproject.org  Sun Sep 14 03:01:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 03:01:47 +0000
Subject: [pkgdb] kdewebdev had acl change status
Message-ID: <20080914030147.89874208DB6@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdewebdev (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdewebdev



From pkgdb at fedoraproject.org  Sun Sep 14 03:01:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 03:01:50 +0000
Subject: [pkgdb] kdewebdev had acl change status
Message-ID: <20080914030151.058AC208DBB@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdewebdev (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdewebdev



From pkgdb at fedoraproject.org  Sun Sep 14 03:01:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 03:01:54 +0000
Subject: [pkgdb] kdewebdev had acl change status
Message-ID: <20080914030154.32257208DC0@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdewebdev (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdewebdev



From pkgdb at fedoraproject.org  Sun Sep 14 03:02:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 03:02:09 +0000
Subject: [pkgdb] tcl-tile (Fedora, 9) updated by spot
Message-ID: <20080914030209.90E85208DA0@bastion.fedora.phx.redhat.com>

spot added a Fedora 9 branch for tcl-tile
spot has set commit to Approved for uberpackager on tcl-tile (Fedora 9)
spot has set build to Approved for uberpackager on tcl-tile (Fedora 9)
spot has set checkout to Approved for uberpackager on tcl-tile (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tcl-tile



From pkgdb at fedoraproject.org  Sun Sep 14 03:02:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 03:02:08 +0000
Subject: [pkgdb] tcl-tile was added for spot
Message-ID: <20080914030208.B9622208D9E@bastion.fedora.phx.redhat.com>

spot has added Package tcl-tile with summary Modified Tk styling engine
spot has approved Package tcl-tile
spot has added a Fedora devel branch for tcl-tile with an owner of spot
spot has approved tcl-tile in Fedora devel
spot has approved Package tcl-tile
spot has set commit to Approved for packager on tcl-tile (Fedora devel)
spot has set build to Approved for packager on tcl-tile (Fedora devel)
spot has set checkout to Approved for packager on tcl-tile (Fedora devel)
spot has set commit to Approved for uberpackager on tcl-tile (Fedora devel)
spot has set build to Approved for uberpackager on tcl-tile (Fedora devel)
spot has set checkout to Approved for uberpackager on tcl-tile (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tcl-tile



From spot at fedoraproject.org  Sun Sep 14 03:02:18 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun, 14 Sep 2008 03:02:18 +0000 (UTC)
Subject: rpms/tcl-tile/devel - New directory
Message-ID: <20080914030218.6CD9C70138@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tcl-tile/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvstb4325/rpms/tcl-tile/devel

Log Message:
Directory /cvs/extras/rpms/tcl-tile/devel added to the repository




From pkgdb at fedoraproject.org  Sun Sep 14 03:02:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 03:02:09 +0000
Subject: [pkgdb] tcl-tile (Fedora, 8) updated by spot
Message-ID: <20080914030209.96E5F208DA3@bastion.fedora.phx.redhat.com>

spot added a Fedora 8 branch for tcl-tile
spot has set commit to Approved for uberpackager on tcl-tile (Fedora 8)
spot has set build to Approved for uberpackager on tcl-tile (Fedora 8)
spot has set checkout to Approved for uberpackager on tcl-tile (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tcl-tile



From spot at fedoraproject.org  Sun Sep 14 03:02:18 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun, 14 Sep 2008 03:02:18 +0000 (UTC)
Subject: rpms/tcl-tile - New directory
Message-ID: <20080914030218.39A0F70136@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tcl-tile
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvstb4325/rpms/tcl-tile

Log Message:
Directory /cvs/extras/rpms/tcl-tile added to the repository




From spot at fedoraproject.org  Sun Sep 14 03:02:19 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun, 14 Sep 2008 03:02:19 +0000 (UTC)
Subject: rpms/tcl-tile/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080914030219.7F24F70136@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tcl-tile/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvstb4325/rpms/tcl-tile/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tcl-tile


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tcl-tile
# $Id: Makefile,v 1.1 2008/09/14 03:02:19 spot Exp $
NAME := tcl-tile
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sun Sep 14 03:02:19 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun, 14 Sep 2008 03:02:19 +0000 (UTC)
Subject: rpms/tcl-tile Makefile,NONE,1.1
Message-ID: <20080914030219.49ACF70136@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tcl-tile
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvstb4325/rpms/tcl-tile

Added Files:
	Makefile 
Log Message:
Setup of module tcl-tile


--- NEW FILE Makefile ---
# Top level Makefile for module tcl-tile
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From spot at fedoraproject.org  Sun Sep 14 03:04:40 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun, 14 Sep 2008 03:04:40 +0000 (UTC)
Subject: rpms/tcl-tile/devel import.log, NONE, 1.1 tcl-tile.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080914030440.C4EBF70137@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/tcl-tile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5229/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tcl-tile.spec 
Log Message:

initial commit



--- NEW FILE import.log ---
tcl-tile-0_8_2-2_fc10:HEAD:tcl-tile-0.8.2-2.fc10.src.rpm:1221361354


--- NEW FILE tcl-tile.spec ---
%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
%define realname tile

Name:		tcl-%{realname}
Version:	0.8.2
Release:	2%{?dist}
Summary:	Modified Tk styling engine
Group:		System Environment/Libraries
License:	TCL
URL:		http://tktable.sourceforge.net/
Source0:	http://downloads.sourceforge.net/tktable/%{realname}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Provides:	%{realname} = %{version}-%{release}
Provides:	tk-%{realname} = %{version}-%{release}
BuildRequires:	tcl-devel, tk-devel, libX11-devel
Requires:	tcl(abi) = 8.5

%description
The Tile Widget Set is an experimental reimplementation of
some of the core Tk widgets.  The primary purpose is
to generate ideas for how to build the next generation of Tk,
when the asteroid strikes and we prepare for the 9.0 release.

%package devel
Summary:	Development libraries and headers for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Provides:	%{realname}-devel = %{version}-%{release}
Provides:	tk-%{realname}-devel = %{version}-%{release}
Provides:	%{name}-static = %{version}-%{release}
Provides:	%{realname}-static = %{version}-%{release}
Provides:	tk-%{realname}-static = %{version}-%{release}

%description devel
Development libraries and headers for %{name}.

%prep
%setup -q -n %{realname}-%{version}

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
install -d %{buildroot}%{tcl_sitearch}
mv %{buildroot}%{_libdir}/%{realname}%{version} %{buildroot}%{tcl_sitearch}/%{realname}%{version}
chmod -x %{buildroot}%{_libdir}/libttkstub.a

%clean
rm -rf %{buildroot}

# There are tests, and they all pass when run on an active X display, but some of them
# fail under Xvfb, thus, we have no good way of running them.

%files
%defattr(-,root,root,-)
%doc README.txt license.terms ChangeLog ANNOUNCE.txt
%{tcl_sitearch}/%{realname}%{version}/

%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h
%{_libdir}/libttkstub.a

%changelog
* Mon Aug 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-2
- fix license tag

* Wed Jun 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-1
- initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcl-tile/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2008 03:02:19 -0000	1.1
+++ .cvsignore	14 Sep 2008 03:04:10 -0000	1.2
@@ -0,0 +1 @@
+tile-0.8.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcl-tile/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2008 03:02:19 -0000	1.1
+++ sources	14 Sep 2008 03:04:10 -0000	1.2
@@ -0,0 +1 @@
+7ffdd0350270a59bc1318e9e90acc4fd  tile-0.8.2.tar.gz



From spot at fedoraproject.org  Sun Sep 14 03:06:08 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun, 14 Sep 2008 03:06:08 +0000 (UTC)
Subject: rpms/tcl-tile/F-8 tcl-tile.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20080914030608.0462B70136@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-tile/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6121/F-8

Modified Files:
	sources 
Added Files:
	tcl-tile.spec 
Log Message:
initial branching


--- NEW FILE tcl-tile.spec ---
%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
%define realname tile

Name:		tcl-%{realname}
Version:	0.8.2
Release:	2%{?dist}
Summary:	Modified Tk styling engine
Group:		System Environment/Libraries
License:	TCL
URL:		http://tktable.sourceforge.net/
Source0:	http://downloads.sourceforge.net/tktable/%{realname}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Provides:	%{realname} = %{version}-%{release}
Provides:	tk-%{realname} = %{version}-%{release}
BuildRequires:	tcl-devel, tk-devel, libX11-devel
Requires:	tcl(abi) = 8.5

%description
The Tile Widget Set is an experimental reimplementation of
some of the core Tk widgets.  The primary purpose is
to generate ideas for how to build the next generation of Tk,
when the asteroid strikes and we prepare for the 9.0 release.

%package devel
Summary:	Development libraries and headers for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Provides:	%{realname}-devel = %{version}-%{release}
Provides:	tk-%{realname}-devel = %{version}-%{release}
Provides:	%{name}-static = %{version}-%{release}
Provides:	%{realname}-static = %{version}-%{release}
Provides:	tk-%{realname}-static = %{version}-%{release}

%description devel
Development libraries and headers for %{name}.

%prep
%setup -q -n %{realname}-%{version}

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
install -d %{buildroot}%{tcl_sitearch}
mv %{buildroot}%{_libdir}/%{realname}%{version} %{buildroot}%{tcl_sitearch}/%{realname}%{version}
chmod -x %{buildroot}%{_libdir}/libttkstub.a

%clean
rm -rf %{buildroot}

# There are tests, and they all pass when run on an active X display, but some of them
# fail under Xvfb, thus, we have no good way of running them.

%files
%defattr(-,root,root,-)
%doc README.txt license.terms ChangeLog ANNOUNCE.txt
%{tcl_sitearch}/%{realname}%{version}/

%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h
%{_libdir}/libttkstub.a

%changelog
* Mon Aug 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-2
- fix license tag

* Wed Jun 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-1
- initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-tile/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2008 03:02:19 -0000	1.1
+++ sources	14 Sep 2008 03:05:37 -0000	1.2
@@ -0,0 +1 @@
+7ffdd0350270a59bc1318e9e90acc4fd  tile-0.8.2.tar.gz



From spot at fedoraproject.org  Sun Sep 14 03:06:08 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun, 14 Sep 2008 03:06:08 +0000 (UTC)
Subject: rpms/tcl-tile/F-9 tcl-tile.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20080914030608.3DCEF70136@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-tile/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6121/F-9

Modified Files:
	sources 
Added Files:
	tcl-tile.spec 
Log Message:
initial branching


--- NEW FILE tcl-tile.spec ---
%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
%define realname tile

Name:		tcl-%{realname}
Version:	0.8.2
Release:	2%{?dist}
Summary:	Modified Tk styling engine
Group:		System Environment/Libraries
License:	TCL
URL:		http://tktable.sourceforge.net/
Source0:	http://downloads.sourceforge.net/tktable/%{realname}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Provides:	%{realname} = %{version}-%{release}
Provides:	tk-%{realname} = %{version}-%{release}
BuildRequires:	tcl-devel, tk-devel, libX11-devel
Requires:	tcl(abi) = 8.5

%description
The Tile Widget Set is an experimental reimplementation of
some of the core Tk widgets.  The primary purpose is
to generate ideas for how to build the next generation of Tk,
when the asteroid strikes and we prepare for the 9.0 release.

%package devel
Summary:	Development libraries and headers for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Provides:	%{realname}-devel = %{version}-%{release}
Provides:	tk-%{realname}-devel = %{version}-%{release}
Provides:	%{name}-static = %{version}-%{release}
Provides:	%{realname}-static = %{version}-%{release}
Provides:	tk-%{realname}-static = %{version}-%{release}

%description devel
Development libraries and headers for %{name}.

%prep
%setup -q -n %{realname}-%{version}

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
install -d %{buildroot}%{tcl_sitearch}
mv %{buildroot}%{_libdir}/%{realname}%{version} %{buildroot}%{tcl_sitearch}/%{realname}%{version}
chmod -x %{buildroot}%{_libdir}/libttkstub.a

%clean
rm -rf %{buildroot}

# There are tests, and they all pass when run on an active X display, but some of them
# fail under Xvfb, thus, we have no good way of running them.

%files
%defattr(-,root,root,-)
%doc README.txt license.terms ChangeLog ANNOUNCE.txt
%{tcl_sitearch}/%{realname}%{version}/

%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h
%{_libdir}/libttkstub.a

%changelog
* Mon Aug 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-2
- fix license tag

* Wed Jun 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-1
- initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-tile/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2008 03:02:19 -0000	1.1
+++ sources	14 Sep 2008 03:05:38 -0000	1.2
@@ -0,0 +1 @@
+7ffdd0350270a59bc1318e9e90acc4fd  tile-0.8.2.tar.gz



From cebbert at fedoraproject.org  Sun Sep 14 03:57:32 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun, 14 Sep 2008 03:57:32 +0000 (UTC)
Subject: rpms/kernel/F-8
	linux-2.6-fs-cifs-fix-plaintext-authentication.patch, NONE, 1.1
	linux-2.6-libata-fix-a-large-collection-of-DMA-mode-mismatches.patch, 
	NONE, 1.1 linux-2.6-libata-lba-28-48-off-by-one-in-ata.h.patch, NONE, 
	1.1 linux-2.6-mm-mark-correct-zone-full-when-scanning-zonelists.patch,
	NONE, 1.1 linux-2.6-sched-clock-fix-nohz-interaction.patch, NONE,
	1.1 linux-2.6-sched-fix-process-time-monotonicity.patch, NONE,
	1.1 linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch, NONE,
	1.1 kernel.spec, 1.530, 1.531
Message-ID: <20080914035732.7843770136@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22458

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-fs-cifs-fix-plaintext-authentication.patch 
	linux-2.6-libata-fix-a-large-collection-of-DMA-mode-mismatches.patch 
	linux-2.6-libata-lba-28-48-off-by-one-in-ata.h.patch 
	linux-2.6-mm-mark-correct-zone-full-when-scanning-zonelists.patch 
	linux-2.6-sched-clock-fix-nohz-interaction.patch 
	linux-2.6-sched-fix-process-time-monotonicity.patch 
	linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch 
Log Message:
Copy F9 patches into F8:
    libata: fix DMA mode mismatches
    libata: interpret the LBA28 spec properly
    Add two patches scheduled for 2.6.26-stable:
      cifs: fix plaintext authentication
      mm:   mark correct zone full when scanning zonelists
    Fix problems with scheduler clock going backwards (F9#453257)
    x86: fix memmap=exactmap argument, fixing kdump in some cases (F9#459103)

linux-2.6-fs-cifs-fix-plaintext-authentication.patch:

--- NEW FILE linux-2.6-fs-cifs-fix-plaintext-authentication.patch ---

# HG changeset patch
# User Steve French <sfrench at us.ibm.com>
# Date 1219872622 0
# Node ID 162cdc8faa8cd3f5a0128d99c5697184f95f3d4b
# Parent fc091f471c790bfc1a60b82c04c6bcb7a5d8e19a
[CIFS] Fix plaintext authentication

The last eight bytes of the password field were not cleared when doing lanman plaintext password authentication. This patch fixes that.

I tested it with Samba by setting password
encryption to no in the server's smb.conf.  Other servers also can be
configured to force plaintext authentication.    Note that plaintexti
authentication requires setting /proc/fs/cifs/SecurityFlags to 0x30030
on the client (enabling both LANMAN and also plaintext password support).
Also note that LANMAN support (and thus plaintext password support) requires
CONFIG_CIFS_WEAK_PW_HASH to be enabled in menuconfig.

CC: Jeff Layton <jlayton at redhat.com>
CC: Stable Kernel <stable at vger.kernel.org>
Signed-off-by: Steve French <sfrench at us.ibm.com>

committer: Steve French <sfrench at us.ibm.com>

--- a/fs/cifs/cifsencrypt.c	Wed Aug 27 21:17:41 2008 +0000
+++ b/fs/cifs/cifsencrypt.c	Wed Aug 27 21:30:22 2008 +0000
@@ -294,6 +294,7 @@
 
 	if ((ses->server->secMode & SECMODE_PW_ENCRYPT) == 0)
 		if (extended_security & CIFSSEC_MAY_PLNTXT) {
+			memset(lnm_session_key, 0, CIFS_SESS_KEY_SIZE);
 			memcpy(lnm_session_key, password_with_pad,
 				CIFS_ENCPWD_SIZE);
 			return;


linux-2.6-libata-fix-a-large-collection-of-DMA-mode-mismatches.patch:

--- NEW FILE linux-2.6-libata-fix-a-large-collection-of-DMA-mode-mismatches.patch ---
From: Alan Cox <alan at redhat.com>
Date: Fri, 1 Aug 2008 08:18:34 +0000 (+0100)
Subject: libata: Fix a large collection of DMA mode mismatches
X-Git-Tag: v2.6.27-rc5~51^2~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=b15b3ebae102f89c25ccbcae0b2099af312f2e82

libata: Fix a large collection of DMA mode mismatches

Dave M????ller sent a diff for the pata_oldpiix that highlighted a problem
where a lot of the ATA drivers assume dma_mode == 0 means "no DMA" while
the core code uses 0xFF.

This turns out to have other consequences such as code doing >= XFER_UDMA_0
also catching 0xFF as UDMAlots. Fortunately it doesn't generally affect
set_dma_mode, although some drivers call back into their own set mode code
from other points.

Having been through the drivers I've added helpers for using_udma/using_mwdma
dma_enabled so that people don't open code ranges that may change (eg if UDMA8
appears somewhere)

Thanks to David for the initial bits
[and added fix for pata_oldpiix from and signed-off-by Dave Mueller
 <dave.mueller at gmx.ch>  -jg]

Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 5f8f57a..79e3a8e 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -3288,7 +3288,7 @@ int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)
 		dev->dma_mode = ata_xfer_mask2mode(dma_mask);
 
 		found = 1;
-		if (dev->dma_mode != 0xff)
+		if (ata_dma_enabled(dev))
 			used_dma = 1;
 	}
 	if (!found)
@@ -3313,7 +3313,7 @@ int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)
 
 	/* step 3: set host DMA timings */
 	ata_link_for_each_dev(dev, link) {
-		if (!ata_dev_enabled(dev) || dev->dma_mode == 0xff)
+		if (!ata_dev_enabled(dev) || !ata_dma_enabled(dev))
 			continue;
 
 		dev->xfer_mode = dev->dma_mode;
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
index fbe6057..eb919c1 100644
--- a/drivers/ata/pata_acpi.c
+++ b/drivers/ata/pata_acpi.c
@@ -181,7 +181,7 @@ static unsigned int pacpi_qc_issue(struct ata_queued_cmd *qc)
 
 	if (adev != acpi->last) {
 		pacpi_set_piomode(ap, adev);
-		if (adev->dma_mode)
+		if (ata_dma_enabled(adev))
 			pacpi_set_dmamode(ap, adev);
 		acpi->last = adev;
 	}
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index d7de7ba..e8a0d99 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -183,7 +183,7 @@ static void atiixp_bmdma_start(struct ata_queued_cmd *qc)
 	u16 tmp16;
 
 	pci_read_config_word(pdev, ATIIXP_IDE_UDMA_CONTROL, &tmp16);
-	if (adev->dma_mode >= XFER_UDMA_0)
+	if (ata_using_udma(adev))
 		tmp16 |= (1 << dn);
 	else
 		tmp16 &= ~(1 << dn);
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index 744beeb..0c4b271 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -149,10 +149,10 @@ static unsigned int cs5530_qc_issue(struct ata_queued_cmd *qc)
 	struct ata_device *prev = ap->private_data;
 
 	/* See if the DMA settings could be wrong */
-	if (adev->dma_mode != 0 && adev != prev && prev != NULL) {
+	if (ata_dma_enabled(adev) && adev != prev && prev != NULL) {
 		/* Maybe, but do the channels match MWDMA/UDMA ? */
-		if ((adev->dma_mode >= XFER_UDMA_0 && prev->dma_mode < XFER_UDMA_0) ||
-		    (adev->dma_mode < XFER_UDMA_0 && prev->dma_mode >= XFER_UDMA_0))
+		if ((ata_using_udma(adev) && !ata_using_udma(prev)) ||
+		    (ata_using_udma(prev) && !ata_using_udma(adev)))
 		    	/* Switch the mode bits */
 		    	cs5530_set_dmamode(ap, adev);
 	}
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index e678af3..df64f24 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -198,7 +198,7 @@ static unsigned int oldpiix_qc_issue(struct ata_queued_cmd *qc)
 
 	if (adev != ap->private_data) {
 		oldpiix_set_piomode(ap, adev);
-		if (adev->dma_mode)
+		if (ata_dma_enabled(adev))
 			oldpiix_set_dmamode(ap, adev);
 	}
 	return ata_sff_qc_issue(qc);
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index cbab397..0278fd2 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -167,10 +167,10 @@ static unsigned int sc1200_qc_issue(struct ata_queued_cmd *qc)
 	struct ata_device *prev = ap->private_data;
 
 	/* See if the DMA settings could be wrong */
-	if (adev->dma_mode != 0 && adev != prev && prev != NULL) {
+	if (ata_dma_enabled(adev) && adev != prev && prev != NULL) {
 		/* Maybe, but do the channels match MWDMA/UDMA ? */
-		if ((adev->dma_mode >= XFER_UDMA_0 && prev->dma_mode < XFER_UDMA_0) ||
-		    (adev->dma_mode < XFER_UDMA_0 && prev->dma_mode >= XFER_UDMA_0))
+		if ((ata_using_udma(adev) && !ata_using_udma(prev)) ||
+		    (ata_using_udma(prev) && !ata_using_udma(adev)))
 		    	/* Switch the mode bits */
 		    	sc1200_set_dmamode(ap, adev);
 	}
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 80233fd..225bfc5 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1429,6 +1429,28 @@ static inline unsigned long ata_deadline(unsigned long from_jiffies,
 	return from_jiffies + msecs_to_jiffies(timeout_msecs);
 }
 
+/* Don't open code these in drivers as there are traps. Firstly the range may
+   change in future hardware and specs, secondly 0xFF means 'no DMA' but is
+   > UDMA_0. Dyma ddreigiau */
+
+static inline int ata_using_mwdma(struct ata_device *adev)
+{
+	if (adev->dma_mode >= XFER_MW_DMA_0 && adev->dma_mode <= XFER_MW_DMA_4)
+		return 1;
+	return 0;
+}
+
+static inline int ata_using_udma(struct ata_device *adev)
+{
+	if (adev->dma_mode >= XFER_UDMA_0 && adev->dma_mode <= XFER_UDMA_7)
+		return 1;
+	return 0;
+}
+
+static inline int ata_dma_enabled(struct ata_device *adev)
+{
+	return (adev->dma_mode == 0xFF ? 0 : 1);
+}
 
 /**************************************************************************
  * PMP - drivers/ata/libata-pmp.c

linux-2.6-libata-lba-28-48-off-by-one-in-ata.h.patch:

--- NEW FILE linux-2.6-libata-lba-28-48-off-by-one-in-ata.h.patch ---
From: Taisuke Yamada <tai at rakugaki.org>
Date: Sat, 13 Sep 2008 20:46:15 +0000 (-0400)
Subject: [libata] LBA28/LBA48 off-by-one bug in ata.h
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=97b697a11b07e2ebfa69c488132596cc5eb24119

[libata] LBA28/LBA48 off-by-one bug in ata.h

I recently bought 3 HGST P7K500-series 500GB SATA drives and
had trouble accessing the block right on the LBA28-LBA48 border.
Here's how it fails (same for all 3 drives):

  # dd if=/dev/sdc bs=512 count=1 skip=268435455 > /dev/null
  dd: reading `/dev/sdc': Input/output error
  0+0 records in
  0+0 records out
  0 bytes (0 B) copied, 0.288033 seconds, 0.0 kB/s
  # dmesg
  ata1.00: exception Emask 0x0 SAct 0x0 SErr 0x0 action 0x0
  ata1.00: BMDMA stat 0x25
  ata1.00: cmd c8/00:08:f8:ff:ff/00:00:00:00:00/ef tag 0 dma 4096 in
  res 51/04:08:f8:ff:ff/00:00:00:00:00/ef Emask 0x1 (device error)
  ata1.00: status: { DRDY ERR }
  ata1.00: error: { ABRT }
  ata1.00: configured for UDMA/33
  ata1: EH complete
  ...

After some investigations, it turned out this seems to be caused
by misinterpretation of the ATA specification on LBA28 access.
Following part is the code in question:

  === include/linux/ata.h ===
  static inline int lba_28_ok(u64 block, u32 n_block)
  {
    /* check the ending block number */
    return ((block + n_block - 1) < ((u64)1 << 28)) && (n_block <= 256);
  }

HGST drive (sometimes) fails with LBA28 access of {block = 0xfffffff,
n_block = 1}, and this behavior seems to be comformant. Other drives,
including other HGST drives are not that strict, through.

>From the ATA specification:
(http://www.t13.org/Documents/UploadedDocuments/project/d1410r3b-ATA-ATAPI-6.pdf)

  8.15.29  Word (61:60): Total number of user addressable sectors
  This field contains a value that is one greater than the total number
  of user addressable sectors (see 6.2). The maximum value that shall
  be placed in this field is 0FFFFFFFh.

So the driver shouldn't use the value of 0xfffffff for LBA28 request
as this exceeds maximum user addressable sector. The logical maximum
value for LBA28 is 0xffffffe.

The obvious fix is to cut "- 1" part, and the patch attached just do
that. I've been using the patched kernel for about a month now, and
the same fix is also floating on the net for some time. So I believe
this fix works reliably.

Just FYI, many Windows/Intel platform users also seems to be struck
by this, and HGST has issued a note pointing to Intel ICH8/9 driver.

  "28-bit LBA command is being used to access LBAs 29-bits in length"
http://www.hitachigst.com/hddt/knowtree.nsf/cffe836ed7c12018862565b000530c74/b531b8bce8745fb78825740f00580e23

Also, *BSDs seems to have similar fix included sometime around ~2004,
through I have not checked out exact portion of the code.

Signed-off-by: Taisuke Yamada <tai at rakugaki.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 1ce19c1..8a12d71 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -745,7 +745,7 @@ static inline int ata_ok(u8 status)
 static inline int lba_28_ok(u64 block, u32 n_block)
 {
 	/* check the ending block number */
-	return ((block + n_block - 1) < ((u64)1 << 28)) && (n_block <= 256);
+	return ((block + n_block) < ((u64)1 << 28)) && (n_block <= 256);
 }
 
 static inline int lba_48_ok(u64 block, u32 n_block)

linux-2.6-mm-mark-correct-zone-full-when-scanning-zonelists.patch:

--- NEW FILE linux-2.6-mm-mark-correct-zone-full-when-scanning-zonelists.patch ---
From: Mel Gorman <mel at csn.ul.ie>
Date: Sat, 13 Sep 2008 09:33:19 +0000 (-0700)
Subject: mm: mark the correct zone as full when scanning zonelists
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=5bead2a0680687b9576d57c177988e8aa082b922

mm: mark the correct zone as full when scanning zonelists

The iterator for_each_zone_zonelist() uses a struct zoneref *z cursor when
scanning zonelists to keep track of where in the zonelist it is.  The
zoneref that is returned corresponds to the the next zone that is to be
scanned, not the current one.  It was intended to be treated as an opaque
list.

When the page allocator is scanning a zonelist, it marks elements in the
zonelist corresponding to zones that are temporarily full.  As the
zonelist is being updated, it uses the cursor here;

  if (NUMA_BUILD)
        zlc_mark_zone_full(zonelist, z);

This is intended to prevent rescanning in the near future but the zoneref
cursor does not correspond to the zone that has been found to be full.
This is an easy misunderstanding to make so this patch corrects the
problem by changing zoneref cursor to be the current zone being scanned
instead of the next one.

Signed-off-by: Mel Gorman <mel at csn.ul.ie>
Cc: Andy Whitcroft <apw at shadowen.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: <stable at kernel.org>		[2.6.26.x]
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 443bc7c..428328a 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -751,8 +751,9 @@ static inline int zonelist_node_idx(struct zoneref *zoneref)
  *
  * This function returns the next zone at or below a given zone index that is
  * within the allowed nodemask using a cursor as the starting point for the
- * search. The zoneref returned is a cursor that is used as the next starting
- * point for future calls to next_zones_zonelist().
+ * search. The zoneref returned is a cursor that represents the current zone
+ * being examined. It should be advanced by one before calling
+ * next_zones_zonelist again.
  */
 struct zoneref *next_zones_zonelist(struct zoneref *z,
 					enum zone_type highest_zoneidx,
@@ -768,9 +769,8 @@ struct zoneref *next_zones_zonelist(struct zoneref *z,
  *
  * This function returns the first zone at or below a given zone index that is
  * within the allowed nodemask. The zoneref returned is a cursor that can be
- * used to iterate the zonelist with next_zones_zonelist. The cursor should
- * not be used by the caller as it does not match the value of the zone
- * returned.
+ * used to iterate the zonelist with next_zones_zonelist by advancing it by
+ * one before calling.
  */
 static inline struct zoneref *first_zones_zonelist(struct zonelist *zonelist,
 					enum zone_type highest_zoneidx,
@@ -795,7 +795,7 @@ static inline struct zoneref *first_zones_zonelist(struct zonelist *zonelist,
 #define for_each_zone_zonelist_nodemask(zone, z, zlist, highidx, nodemask) \
 	for (z = first_zones_zonelist(zlist, highidx, nodemask, &zone);	\
 		zone;							\
-		z = next_zones_zonelist(z, highidx, nodemask, &zone))	\
+		z = next_zones_zonelist(++z, highidx, nodemask, &zone))	\
 
 /**
  * for_each_zone_zonelist - helper macro to iterate over valid zones in a zonelist at or below a given zone index
diff --git a/mm/mmzone.c b/mm/mmzone.c
index 486ed59..16ce8b9 100644
--- a/mm/mmzone.c
+++ b/mm/mmzone.c
@@ -69,6 +69,6 @@ struct zoneref *next_zones_zonelist(struct zoneref *z,
 				(z->zone && !zref_in_nodemask(z, nodes)))
 			z++;
 
-	*zone = zonelist_zone(z++);
+	*zone = zonelist_zone(z);
 	return z;
 }

linux-2.6-sched-clock-fix-nohz-interaction.patch:

--- NEW FILE linux-2.6-sched-clock-fix-nohz-interaction.patch ---
From: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Mon, 1 Sep 2008 14:44:23 +0000 (+0200)
Subject: sched_clock: fix NOHZ interaction
X-Git-Tag: v2.6.27-rc6~15^2~2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=56c7426b3951e4f35a71d695f1c982989399d6fd

sched_clock: fix NOHZ interaction

If HLT stops the TSC, we'll fail to account idle time, thereby inflating the
actual process times. Fix this by re-calibrating the clock against GTOD when
leaving nohz mode.

Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Tested-by: Avi Kivity <avi at qumranet.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 7a46bde..a87b046 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -162,6 +162,8 @@ void tick_nohz_stop_idle(int cpu)
 		ts->idle_lastupdate = now;
 		ts->idle_sleeptime = ktime_add(ts->idle_sleeptime, delta);
 		ts->idle_active = 0;
+
+		sched_clock_idle_wakeup_event(0);
 	}
 }
 
@@ -177,6 +179,7 @@ static ktime_t tick_nohz_start_idle(struct tick_sched *ts)
 	}
 	ts->idle_entrytime = now;
 	ts->idle_active = 1;
+	sched_clock_idle_sleep_event();
 	return now;
 }
 

linux-2.6-sched-fix-process-time-monotonicity.patch:

--- NEW FILE linux-2.6-sched-fix-process-time-monotonicity.patch ---
From: Balbir Singh <balbir at linux.vnet.ibm.com>
Date: Fri, 5 Sep 2008 16:12:23 +0000 (+0200)
Subject: sched: fix process time monotonicity
X-Git-Tag: v2.6.27-rc6~15^2~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=49048622eae698e5c4ae61f7e71200f265ccc529

sched: fix process time monotonicity

Spencer reported a problem where utime and stime were going negative despite
the fixes in commit b27f03d4bdc145a09fb7b0c0e004b29f1ee555fa. The suspected
reason for the problem is that signal_struct maintains it's own utime and
stime (of exited tasks), these are not updated using the new task_utime()
routine, hence sig->utime can go backwards and cause the same problem
to occur (sig->utime, adds tsk->utime and not task_utime()). This patch
fixes the problem

TODO: using max(task->prev_utime, derived utime) works for now, but a more
generic solution is to implement cputime_max() and use the cputime_gt()
function for comparison.

Reported-by: spencer at bluehost.com
Signed-off-by: Balbir Singh <balbir at linux.vnet.ibm.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/fs/proc/array.c b/fs/proc/array.c
index 0d6eb33..71c9be5 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -337,65 +337,6 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
 	return 0;
 }
 
-/*
- * Use precise platform statistics if available:
- */
-#ifdef CONFIG_VIRT_CPU_ACCOUNTING
-static cputime_t task_utime(struct task_struct *p)
-{
-	return p->utime;
-}
-
-static cputime_t task_stime(struct task_struct *p)
-{
-	return p->stime;
-}
-#else
-static cputime_t task_utime(struct task_struct *p)
-{
-	clock_t utime = cputime_to_clock_t(p->utime),
-		total = utime + cputime_to_clock_t(p->stime);
-	u64 temp;
-
-	/*
-	 * Use CFS's precise accounting:
-	 */
-	temp = (u64)nsec_to_clock_t(p->se.sum_exec_runtime);
-
-	if (total) {
-		temp *= utime;
-		do_div(temp, total);
-	}
-	utime = (clock_t)temp;
-
-	p->prev_utime = max(p->prev_utime, clock_t_to_cputime(utime));
-	return p->prev_utime;
-}
-
-static cputime_t task_stime(struct task_struct *p)
-{
-	clock_t stime;
-
-	/*
-	 * Use CFS's precise accounting. (we subtract utime from
-	 * the total, to make sure the total observed by userspace
-	 * grows monotonically - apps rely on that):
-	 */
-	stime = nsec_to_clock_t(p->se.sum_exec_runtime) -
-			cputime_to_clock_t(task_utime(p));
-
-	if (stime >= 0)
-		p->prev_stime = max(p->prev_stime, clock_t_to_cputime(stime));
-
-	return p->prev_stime;
-}
-#endif
-
-static cputime_t task_gtime(struct task_struct *p)
-{
-	return p->gtime;
-}
-
 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
 			struct pid *pid, struct task_struct *task, int whole)
 {
diff --git a/include/linux/sched.h b/include/linux/sched.h
index cfb0d87..3d9120c 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1475,6 +1475,10 @@ static inline void put_task_struct(struct task_struct *t)
 		__put_task_struct(t);
 }
 
+extern cputime_t task_utime(struct task_struct *p);
+extern cputime_t task_stime(struct task_struct *p);
+extern cputime_t task_gtime(struct task_struct *p);
+
 /*
  * Per process flags
  */
diff --git a/kernel/exit.c b/kernel/exit.c
index 25ed2ad..1639564 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -112,9 +112,9 @@ static void __exit_signal(struct task_struct *tsk)
 		 * We won't ever get here for the group leader, since it
 		 * will have been the last reference on the signal_struct.
 		 */
-		sig->utime = cputime_add(sig->utime, tsk->utime);
-		sig->stime = cputime_add(sig->stime, tsk->stime);
-		sig->gtime = cputime_add(sig->gtime, tsk->gtime);
+		sig->utime = cputime_add(sig->utime, task_utime(tsk));
+		sig->stime = cputime_add(sig->stime, task_stime(tsk));
+		sig->gtime = cputime_add(sig->gtime, task_gtime(tsk));
 		sig->min_flt += tsk->min_flt;
 		sig->maj_flt += tsk->maj_flt;
 		sig->nvcsw += tsk->nvcsw;
diff --git a/kernel/sched.c b/kernel/sched.c
index 9a1ddb8..1a5f73c 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4179,6 +4179,65 @@ void account_steal_time(struct task_struct *p, cputime_t steal)
 }
 
 /*
+ * Use precise platform statistics if available:
+ */
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING
+cputime_t task_utime(struct task_struct *p)
+{
+	return p->utime;
+}
+
+cputime_t task_stime(struct task_struct *p)
+{
+	return p->stime;
+}
+#else
+cputime_t task_utime(struct task_struct *p)
+{
+	clock_t utime = cputime_to_clock_t(p->utime),
+		total = utime + cputime_to_clock_t(p->stime);
+	u64 temp;
+
+	/*
+	 * Use CFS's precise accounting:
+	 */
+	temp = (u64)nsec_to_clock_t(p->se.sum_exec_runtime);
+
+	if (total) {
+		temp *= utime;
+		do_div(temp, total);
+	}
+	utime = (clock_t)temp;
+
+	p->prev_utime = max(p->prev_utime, clock_t_to_cputime(utime));
+	return p->prev_utime;
+}
+
+cputime_t task_stime(struct task_struct *p)
+{
+	clock_t stime;
+
+	/*
+	 * Use CFS's precise accounting. (we subtract utime from
+	 * the total, to make sure the total observed by userspace
+	 * grows monotonically - apps rely on that):
+	 */
+	stime = nsec_to_clock_t(p->se.sum_exec_runtime) -
+			cputime_to_clock_t(task_utime(p));
+
+	if (stime >= 0)
+		p->prev_stime = max(p->prev_stime, clock_t_to_cputime(stime));
+
+	return p->prev_stime;
+}
+#endif
+
+inline cputime_t task_gtime(struct task_struct *p)
+{
+	return p->gtime;
+}
+
+/*
  * This function gets called by the timer code, with HZ frequency.
  * We call it with interrupts disabled.
  *

linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch:

--- NEW FILE linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch ---
From: Prarit Bhargava <prarit at redhat.com>
Date: Tue, 9 Sep 2008 13:56:08 +0000 (-0400)
Subject: x86: fix memmap=exactmap boot argument
X-Git-Tag: v2.6.27-rc6~4^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d6be118a97ce51ca84035270f91c2bccecbfac5f

x86: fix memmap=exactmap boot argument

When using kdump modifying the e820 map is yielding strange results.

For example starting with

 BIOS-provided physical RAM map:
 BIOS-e820: 0000000000000100 - 0000000000093400 (usable)
 BIOS-e820: 0000000000093400 - 00000000000a0000 (reserved)
 BIOS-e820: 0000000000100000 - 000000003fee0000 (usable)
 BIOS-e820: 000000003fee0000 - 000000003fef3000 (ACPI data)
 BIOS-e820: 000000003fef3000 - 000000003ff80000 (ACPI NVS)
 BIOS-e820: 000000003ff80000 - 0000000040000000 (reserved)
 BIOS-e820: 00000000e0000000 - 00000000f0000000 (reserved)
 BIOS-e820: 00000000fec00000 - 00000000fec10000 (reserved)
 BIOS-e820: 00000000fee00000 - 00000000fee01000 (reserved)
 BIOS-e820: 00000000ff000000 - 0000000100000000 (reserved)

and booting with args

memmap=exactmap memmap=640K at 0K memmap=5228K at 16384K memmap=125188K at 22252K memmap=76K#1047424K memmap=564K#1047500K

resulted in:

 user-defined physical RAM map:
 user: 0000000000000000 - 0000000000093400 (usable)
 user: 0000000000093400 - 00000000000a0000 (reserved)
 user: 0000000000100000 - 000000003fee0000 (usable)
 user: 000000003fee0000 - 000000003fef3000 (ACPI data)
 user: 000000003fef3000 - 000000003ff80000 (ACPI NVS)
 user: 000000003ff80000 - 0000000040000000 (reserved)
 user: 00000000e0000000 - 00000000f0000000 (reserved)
 user: 00000000fec00000 - 00000000fec10000 (reserved)
 user: 00000000fee00000 - 00000000fee01000 (reserved)
 user: 00000000ff000000 - 0000000100000000 (reserved)

But should have resulted in:

 user-defined physical RAM map:
 user: 0000000000000000 - 00000000000a0000 (usable)
 user: 0000000001000000 - 000000000151b000 (usable)
 user: 00000000015bb000 - 0000000008ffc000 (usable)
 user: 000000003fee0000 - 000000003ff80000 (ACPI data)

This is happening because of an improper usage of strcmp() in the
e820 parsing code.  The strcmp() always returns !0 and never resets the
value for e820.nr_map and returns an incorrect user-defined map.

This patch fixes the problem.

Signed-off-by: Prarit Bhargava <prarit at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Backport: Chuck Ebbert <cebbert at redhat.com>

---

Index: linux-2.6.26.noarch/arch/x86/kernel/e820_32.c
===================================================================
--- linux-2.6.26.noarch.orig/arch/x86/kernel/e820_32.c
+++ linux-2.6.26.noarch/arch/x86/kernel/e820_32.c
@@ -697,7 +697,7 @@ static int __init parse_memmap(char *arg
 	if (!arg)
 		return -EINVAL;
 
-	if (strcmp(arg, "exactmap") == 0) {
+	if (strncmp(arg, "exactmap", 8) == 0) {
 #ifdef CONFIG_CRASH_DUMP
 		/* If we are doing a crash dump, we
 		 * still need to know the real mem
Index: linux-2.6.26.noarch/arch/x86/kernel/e820_64.c
===================================================================
--- linux-2.6.26.noarch.orig/arch/x86/kernel/e820_64.c
+++ linux-2.6.26.noarch/arch/x86/kernel/e820_64.c
@@ -776,7 +776,7 @@ static int __init parse_memmap_opt(char 
 	char *oldp;
 	unsigned long long start_at, mem_size;
 
-	if (!strcmp(p, "exactmap")) {
+	if (!strncmp(p, "exactmap", 8)) {
 #ifdef CONFIG_CRASH_DUMP
 		/*
 		 * If we are doing a crash dump, we still need to know


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.530
retrieving revision 1.531
diff -u -r1.530 -r1.531
--- kernel.spec	13 Sep 2008 07:23:57 -0000	1.530
+++ kernel.spec	14 Sep 2008 03:57:31 -0000	1.531
@@ -575,6 +575,9 @@
 Patch22: linux-2.6-utrace.patch
 
 Patch41: linux-2.6-sysrq-c.patch
+Patch42: linux-2.6-sched-clock-fix-nohz-interaction.patch
+Patch43: linux-2.6-sched-fix-process-time-monotonicity.patch
+
 Patch60: linux-2.6-x86-tune-generic.patch
 Patch75: linux-2.6-x86-debug-boot.patch
 Patch87: linux-2.6-x86-apic-dump-all-regs-v3.patch
@@ -587,6 +590,7 @@
 Patch95: linux-2.6-x86-hpet-02-read-back-compare-register.patch
 Patch96: linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch
 Patch97: linux-2.6-x86-hpet-04-workaround-sb700-bios.patch
+Patch98: linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch
 
 #ALSA
 
@@ -624,6 +628,7 @@
 # filesystem patches
 Patch420: linux-2.6-fs-cifs-turn-off-unicode-during-session-establishment.patch
 Patch421: linux-2.6-squashfs.patch
+Patch422: linux-2.6-fs-cifs-fix-plaintext-authentication.patch
 Patch424: linux-2.6-gfs-locking-exports.patch
 Patch425: linux-2.6-nfs-client-mounts-hang.patch
 
@@ -642,6 +647,8 @@
 Patch670: linux-2.6-ata-quirk.patch
 Patch674: linux-2.6-sata-eeepc-faster.patch
 Patch675: linux-2.6-libata-pata_marvell-play-nice-with-ahci.patch
+Patch676: linux-2.6-libata-fix-a-large-collection-of-DMA-mode-mismatches.patch
+Patch677: linux-2.6-libata-lba-28-48-off-by-one-in-ata.h.patch
 
 Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
@@ -667,6 +674,7 @@
 Patch830: linux-2.6-cpuidle-3-make-ladder-governor-honor-latency-requirements.patch
 
 Patch900: linux-2.6-mm-dirty-page-tracking-race-fix.patch
+Patch901: linux-2.6-mm-mark-correct-zone-full-when-scanning-zonelists.patch
 
 Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch
 
@@ -1005,6 +1013,9 @@
 
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
+# fix sched clock monotonicity bugs
+ApplyPatch linux-2.6-sched-clock-fix-nohz-interaction.patch
+ApplyPatch linux-2.6-sched-fix-process-time-monotonicity.patch
 
 # Architecture patches
 # IA64
@@ -1030,6 +1041,8 @@
 ApplyPatch linux-2.6-x86-hpet-02-read-back-compare-register.patch
 ApplyPatch linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch
 ApplyPatch linux-2.6-x86-hpet-04-workaround-sb700-bios.patch
+# fix memmap=exactmap, so kdump kernels work
+ApplyPatch linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch
 
 #
 # PowerPC
@@ -1111,6 +1124,8 @@
 ApplyPatch linux-2.6-fs-cifs-turn-off-unicode-during-session-establishment.patch
 # Squashfs
 ApplyPatch linux-2.6-squashfs.patch
+# fix CIFS plaintext passwords
+ApplyPatch linux-2.6-fs-cifs-fix-plaintext-authentication.patch
 # export symbols for gfs2 locking modules
 ApplyPatch linux-2.6-gfs-locking-exports.patch
 # fix nfs mount hang
@@ -1155,6 +1170,10 @@
 ApplyPatch linux-2.6-sata-eeepc-faster.patch
 # don't use ahci for pata_marvell adapters
 ApplyPatch linux-2.6-libata-pata_marvell-play-nice-with-ahci.patch
+# fix drivers making wrong assumptions about what dma values mean
+ApplyPatch linux-2.6-libata-fix-a-large-collection-of-DMA-mode-mismatches.patch
+# libata breaks lba28 rules
+ApplyPatch linux-2.6-libata-lba-28-48-off-by-one-in-ata.h.patch
 
 # wireless
 #
@@ -1205,6 +1224,8 @@
 # mm
 # possible data corruption, esp. on ppc
 ApplyPatch linux-2.6-mm-dirty-page-tracking-race-fix.patch
+# mm zone scan patch scheduled for -stable
+ApplyPatch linux-2.6-mm-mark-correct-zone-full-when-scanning-zonelists.patch
 
 # dm / md
 
@@ -1830,6 +1851,16 @@
 
 
 %changelog
+* Sat Sep 13 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-21
+- Copy F9 patches into F8:
+    libata: fix DMA mode mismatches
+    libata: interpret the LBA28 spec properly
+    Add two patches scheduled for 2.6.26-stable:
+      cifs: fix plaintext authentication
+      mm:   mark correct zone full when scanning zonelists
+    Fix problems with scheduler clock going backwards (F9#453257)
+    x86: fix memmap=exactmap argument, fixing kdump in some cases (F9#459103)
+
 * Sat Sep 13 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-20
 - Fix problems with AMT on e1000e (F9#453023)
 



From agoode at fedoraproject.org  Sun Sep 14 04:56:43 2008
From: agoode at fedoraproject.org (Adam Goode)
Date: Sun, 14 Sep 2008 04:56:43 +0000 (UTC)
Subject: rpms/coda/devel coda-6.9.4-rc2-no-default-krb.patch, NONE,
	1.1 coda.spec, 1.6, 1.7
Message-ID: <20080914045643.B318C70136@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/coda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10002

Modified Files:
	coda.spec 
Added Files:
	coda-6.9.4-rc2-no-default-krb.patch 
Log Message:
* Sun Sep 14 2008 Adam Goode <adam at spicenitz.org> - 6.9.4-0.3.rc2
- Do not change the default behavior of clog when building with krb5
  (rh 462179)


coda-6.9.4-rc2-no-default-krb.patch:

--- NEW FILE coda-6.9.4-rc2-no-default-krb.patch ---
diff -ur coda-6.9.4~rc2~/coda-src/auth2/clog.c coda-6.9.4~rc2/coda-src/auth2/clog.c
--- coda-6.9.4~rc2~/coda-src/auth2/clog.c	2007-12-17 11:26:57.000000000 -0500
+++ coda-6.9.4~rc2/coda-src/auth2/clog.c	2008-09-14 00:20:03.000000000 -0400
@@ -106,15 +106,6 @@
     char *fromfile = NULL;
     char *runas = NULL;
 
-/* Make intelligent default decisions, depending on how we were built..
-		-- Troy <hozer at drgw.net> */
-#ifdef HAVE_KRB4
-    authmethod = AUTH_METHOD_KERBEROS4;
-#endif
-#ifdef HAVE_KRB5
-    authmethod = AUTH_METHOD_KERBEROS5;
-#endif 
-
     i = 1;
     while (i < argc) {
 	    if (U_GetAuthMethod(argv[i], &authmethod)) {
Only in coda-6.9.4~rc2/coda-src/auth2: clog.c~


Index: coda.spec
===================================================================
RCS file: /cvs/extras/rpms/coda/devel/coda.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- coda.spec	10 Sep 2008 03:39:56 -0000	1.6
+++ coda.spec	14 Sep 2008 04:56:13 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           coda
 Version:        6.9.4
-Release:        0.2.%{rcver}%{?dist}
+Release:        0.3.%{rcver}%{?dist}
 Summary:        Coda distributed file system
 Group:          System Environment/Daemons
 License:        GPLv2
@@ -15,6 +15,7 @@
 Patch0:         coda-6.9.3-codasrv-sigterm.patch
 Patch1:         coda-6.9.3-sudo.patch
 Patch2:         coda-6.9.3-client-fhs.patch
+Patch3:		coda-6.9.4-rc2-no-default-krb.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  lwp-devel rpc2-devel rvm-devel rvm-tools readline-devel
 BuildRequires:  fltk-devel fltk-fluid flex bison python perl krb5-devel
@@ -83,6 +84,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 
 %build
@@ -293,6 +295,10 @@
 
 
 %changelog
+* Sun Sep 14 2008 Adam Goode <adam at spicenitz.org> - 6.9.4-0.3.rc2
+- Do not change the default behavior of clog when building with krb5
+  (rh 462179)
+
 * Tue Sep 09 2008 Neil Horman <nhorman at redhat.com> 6.9.4-0.2.rc2
 - Enabling krb5 support (bz 461041)
 
@@ -301,7 +307,7 @@
 
 * Tue May 20 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 6.9.3-2
 - Make coda-client package put everything in FHS locations like Debian does,
-  rename coda-client initscript / service from venus to coda-client (rh 446653)    
+  rename coda-client initscript / service from venus to coda-client (rh 446653)
 
 * Mon May 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 6.9.3-1
 - Initial Fedora package



From agoode at fedoraproject.org  Sun Sep 14 04:59:40 2008
From: agoode at fedoraproject.org (Adam Goode)
Date: Sun, 14 Sep 2008 04:59:40 +0000 (UTC)
Subject: rpms/coda/F-9 coda-6.9.4-rc2-no-default-krb.patch, NONE,
	1.1 coda.spec, 1.5, 1.6
Message-ID: <20080914045940.39D3E70136@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/coda/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11184

Modified Files:
	coda.spec 
Added Files:
	coda-6.9.4-rc2-no-default-krb.patch 
Log Message:
* Sun Sep 14 2008 Adam Goode <adam at spicenitz.org> - 6.9.4-0.3.rc2
- Do not change the default behavior of clog when building with krb5
  (rh 462179)


coda-6.9.4-rc2-no-default-krb.patch:

--- NEW FILE coda-6.9.4-rc2-no-default-krb.patch ---
diff -ur coda-6.9.4~rc2~/coda-src/auth2/clog.c coda-6.9.4~rc2/coda-src/auth2/clog.c
--- coda-6.9.4~rc2~/coda-src/auth2/clog.c	2007-12-17 11:26:57.000000000 -0500
+++ coda-6.9.4~rc2/coda-src/auth2/clog.c	2008-09-14 00:20:03.000000000 -0400
@@ -106,15 +106,6 @@
     char *fromfile = NULL;
     char *runas = NULL;
 
-/* Make intelligent default decisions, depending on how we were built..
-		-- Troy <hozer at drgw.net> */
-#ifdef HAVE_KRB4
-    authmethod = AUTH_METHOD_KERBEROS4;
-#endif
-#ifdef HAVE_KRB5
-    authmethod = AUTH_METHOD_KERBEROS5;
-#endif 
-
     i = 1;
     while (i < argc) {
 	    if (U_GetAuthMethod(argv[i], &authmethod)) {
Only in coda-6.9.4~rc2/coda-src/auth2: clog.c~


Index: coda.spec
===================================================================
RCS file: /cvs/extras/rpms/coda/F-9/coda.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- coda.spec	9 Sep 2008 17:36:19 -0000	1.5
+++ coda.spec	14 Sep 2008 04:59:09 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           coda
 Version:        6.9.4
-Release:        0.2.%{rcver}%{?dist}
+Release:        0.3.%{rcver}%{?dist}
 Summary:        Coda distributed file system
 Group:          System Environment/Daemons
 License:        GPLv2
@@ -15,6 +15,7 @@
 Patch0:         coda-6.9.3-codasrv-sigterm.patch
 Patch1:         coda-6.9.3-sudo.patch
 Patch2:         coda-6.9.3-client-fhs.patch
+Patch3:		coda-6.9.4-rc2-no-default-krb.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  lwp-devel rpc2-devel rvm-devel rvm-tools readline-devel
 BuildRequires:  fltk-devel fltk-fluid flex bison python perl krb5-devel
@@ -83,9 +84,11 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 
 %build
+# note: remove the -I and -l here when upstream releases fix for krb5 building
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -I/usr/include/et"
 export LIBS="-lkrb5 -lcom_err -lstdc++"
 %configure --with-vcodacon --with-krb5
@@ -292,6 +295,10 @@
 
 
 %changelog
+* Sun Sep 14 2008 Adam Goode <adam at spicenitz.org> - 6.9.4-0.3.rc2
+- Do not change the default behavior of clog when building with krb5
+  (rh 462179)
+
 * Tue Sep 09 2008 Neil Horman <nhorman at redhat.com> 6.9.4-0.2.rc2
 - Enabling krb5 support (bz 461041)
 
@@ -300,7 +307,7 @@
 
 * Tue May 20 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 6.9.3-2
 - Make coda-client package put everything in FHS locations like Debian does,
-  rename coda-client initscript / service from venus to coda-client (rh 446653)    
+  rename coda-client initscript / service from venus to coda-client (rh 446653)
 
 * Mon May 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 6.9.3-1
 - Initial Fedora package



From pgordon at fedoraproject.org  Sun Sep 14 05:52:26 2008
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Sun, 14 Sep 2008 05:52:26 +0000 (UTC)
Subject: rpms/nemiver/devel .cvsignore, 1.9, 1.10 nemiver.spec, 1.16,
	1.17 sources, 1.9, 1.10
Message-ID: <20080914055226.C901D70136@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/nemiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29131

Modified Files:
	.cvsignore nemiver.spec sources 
Log Message:
Bump to 0.6.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	1 Aug 2008 04:00:42 -0000	1.9
+++ .cvsignore	14 Sep 2008 05:51:56 -0000	1.10
@@ -1 +1 @@
-nemiver-0.6.1.tar.bz2
+nemiver-0.6.2.tar.bz2


Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/nemiver.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nemiver.spec	6 Aug 2008 04:08:14 -0000	1.16
+++ nemiver.spec	14 Sep 2008 05:51:56 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		nemiver
-Version:	0.6.1
-Release:	3%{?dist}
+Version:	0.6.2
+Release:	1%{?dist}
 Summary:	A C/C++ Debugger for GNOME - point, click, debug!
 
 Group:		Development/Debuggers
@@ -152,6 +152,9 @@
 
 
 %changelog
+* Sat Sep 13 2008 Peter Gordon <peter at thecodergeek.com> - 0.6.2-1
+- Update to new upstream release (0.6.2).
+
 * Wed Aug  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.1-3
 - bump to rebuild against old libgtksourceviewmm
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	1 Aug 2008 04:00:42 -0000	1.9
+++ sources	14 Sep 2008 05:51:56 -0000	1.10
@@ -1 +1 @@
-69e379fca326ad0d2d8e832e1db0ba2d  nemiver-0.6.1.tar.bz2
+30e5710b0ab2907e0095ab16ee202a27  nemiver-0.6.2.tar.bz2



From thm at fedoraproject.org  Sun Sep 14 07:27:26 2008
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sun, 14 Sep 2008 07:27:26 +0000 (UTC)
Subject: rpms/monotone/EL-5 .cvsignore, 1.20, 1.21 monotone.spec, 1.34,
	1.35 sources, 1.20, 1.21
Message-ID: <20080914072726.BBBAC70136@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/monotone/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24902

Modified Files:
	.cvsignore monotone.spec sources 
Log Message:
- Updated for 0.41 release.
- Added mtnopt helper.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/EL-5/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	14 Apr 2008 19:47:24 -0000	1.20
+++ .cvsignore	14 Sep 2008 07:26:56 -0000	1.21
@@ -1 +1 @@
-monotone-0.40.tar.gz
+monotone-0.41.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/EL-5/monotone.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- monotone.spec	14 Apr 2008 19:47:24 -0000	1.34
+++ monotone.spec	14 Sep 2008 07:26:56 -0000	1.35
@@ -1,10 +1,10 @@
 Name: monotone
-Version: 0.40
+Version: 0.41
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
-License: GPL
+License: GPLv2+
 
 URL: http://monotone.ca/
 Source0: http://monotone.ca/downloads/%{version}/%{name}-%{version}.tar.gz
@@ -134,13 +134,14 @@
 %doc monotone.html
 
 %{_bindir}/mtn
+%{_bindir}/mtnopt
 %{_infodir}/monotone.info*
 %{_datadir}/emacs/site-lisp/monotone*.el*
 %{_sysconfdir}/bash_completion.d
 
 %files server
-%doc README.monotone-server
 %defattr(-,root,root,-)
+%doc README.monotone-server
 %{_sbindir}/monotone-server
 %{_sysconfdir}/rc.d/init.d/monotone
 %dir %attr(0755,monotone,monotone) %{_localstatedir}/run/monotone
@@ -180,6 +181,13 @@
 
 
 %changelog
+* Fri Sep 12 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.41-1
+- Updated for 0.41 release.
+- Added mtnopt helper.
+
+* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.40-2
+- fix license tag
+
 * Mon Apr 14 2008 Roland McGrath <roland at redhat.com> - 0.40-1
 - Updated for 0.40 release.
 - Tweaked trivia for packaging guidelines nits.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/EL-5/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	14 Apr 2008 19:47:24 -0000	1.20
+++ sources	14 Sep 2008 07:26:56 -0000	1.21
@@ -1 +1 @@
-4d90776beaff7445e7a2d8774378fbba  monotone-0.40.tar.gz
+f4ee37fb6853719933561fef901e2a07  monotone-0.41.tar.gz



From cheese at fedoraproject.org  Sun Sep 14 08:07:48 2008
From: cheese at fedoraproject.org (josef radinger)
Date: Sun, 14 Sep 2008 08:07:48 +0000 (UTC)
Subject: rpms/bmpx/devel bmpx.spec,1.14,1.15
Message-ID: <20080914080748.2ECC970136@cvs1.fedora.phx.redhat.com>

Author: cheese

Update of /cvs/pkgs/rpms/bmpx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3435/devel

Modified Files:
	bmpx.spec 
Log Message:
cvs problems



Index: bmpx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bmpx/devel/bmpx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bmpx.spec	13 Sep 2008 16:22:42 -0000	1.14
+++ bmpx.spec	14 Sep 2008 08:07:17 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:	Beep Media Player eXperimental
 Name:		bmpx
 Version:	0.40.14
-Release:	6%{?dist}
+Release:	7%{?dist}
 
 License:	GPLv2
 Group:		Applications/Multimedia
@@ -179,6 +179,9 @@
 
 
 %changelog
+* Sun Sep 14 2008 josef radinger <cheese at nosuchhost.net> - 0.40.14-7
+- cvs problems
+
 * Sat Sep 13 2008 josef radinger <cheese at nosuchhost.net> - 0.40.14-6
 - fix patch libsoup
 - add hostnotfound-patch



From belegdol at fedoraproject.org  Sun Sep 14 08:32:47 2008
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Sun, 14 Sep 2008 08:32:47 +0000 (UTC)
Subject: rpms/gnome-chemistry-utils/devel .cvsignore, 1.11,
	1.12 gnome-chemistry-utils.spec, 1.23, 1.24 sources, 1.11,
	1.12 gnome-chemistry-utils-0.9.90-ppc.patch, 1.2, NONE
Message-ID: <20080914083247.ADD0470136@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9622

Modified Files:
	.cvsignore gnome-chemistry-utils.spec sources 
Removed Files:
	gnome-chemistry-utils-0.9.90-ppc.patch 
Log Message:
* Sun Sep 14 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.91-1
- Updated to 0.9.91
- Dropped the ppc build patch (merged upstream)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Sep 2008 13:44:09 -0000	1.11
+++ .cvsignore	14 Sep 2008 08:32:17 -0000	1.12
@@ -1 +1 @@
-gnome-chemistry-utils-0.9.90.tar.bz2
+gnome-chemistry-utils-0.9.91.tar.bz2


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/gnome-chemistry-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gnome-chemistry-utils.spec	8 Sep 2008 23:05:55 -0000	1.23
+++ gnome-chemistry-utils.spec	14 Sep 2008 08:32:17 -0000	1.24
@@ -1,13 +1,12 @@
 Name:           gnome-chemistry-utils
-Version:        0.9.90
-Release:        2%{?dist}
+Version:        0.9.91
+Release:        1%{?dist}
 Summary:        A set of chemical utilities
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://www.nongnu.org/gchemutils/
 Source0:        http://download.savannah.nongnu.org/releases/gchemutils/%{name}-%{version}.tar.bz2
-Patch0:         gnome-chemistry-utils-0.9.90-ppc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bodr
@@ -70,7 +69,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .ppc
 
 
 %build
@@ -178,7 +176,6 @@
 %{_datadir}/applications/fedora-gcrystal-0.10.desktop
 %{_datadir}/applications/fedora-gspectrum-0.10.desktop
 %{_datadir}/gchemutils
-%{_datadir}/gnome-chemistry-utils
 %{_datadir}/gnome/help/gchem3d-0.10
 %{_datadir}/gnome/help/gchemcalc-0.10
 %{_datadir}/gnome/help/gchempaint-0.10
@@ -209,6 +206,10 @@
 
 
 %changelog
+* Sun Sep 14 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.91-1
+- Updated to 0.9.91
+- Dropped the ppc build patch (merged upstream)
+
 * Sun Sep  7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.90-2
 - Patched the ppc build failure, thanks to Tom Callaway and Jean Br??fort
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Sep 2008 13:44:09 -0000	1.11
+++ sources	14 Sep 2008 08:32:17 -0000	1.12
@@ -1 +1 @@
-732b27240da772dab26f6b8808a95cdd  gnome-chemistry-utils-0.9.90.tar.bz2
+d35d8a1321715bc0d41493c5d7b04c3a  gnome-chemistry-utils-0.9.91.tar.bz2


--- gnome-chemistry-utils-0.9.90-ppc.patch DELETED ---



From than at fedoraproject.org  Sun Sep 14 08:56:52 2008
From: than at fedoraproject.org (Than Ngo)
Date: Sun, 14 Sep 2008 08:56:52 +0000 (UTC)
Subject: rpms/kde-plasma-lancelot/F-9 .cvsignore, 1.2,
	1.3 kde-plasma-lancelot.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20080914085652.0A65770136@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-plasma-lancelot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14912

Modified Files:
	.cvsignore kde-plasma-lancelot.spec sources 
Log Message:
1.0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-plasma-lancelot/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Sep 2008 11:47:14 -0000	1.2
+++ .cvsignore	14 Sep 2008 08:56:21 -0000	1.3
@@ -1 +1,2 @@
 lancelot-1.0.2.tar.bz2
+lancelot-1.0.3.tar.bz2


Index: kde-plasma-lancelot.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-plasma-lancelot/F-9/kde-plasma-lancelot.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kde-plasma-lancelot.spec	12 Sep 2008 17:25:43 -0000	1.6
+++ kde-plasma-lancelot.spec	14 Sep 2008 08:56:21 -0000	1.7
@@ -1,15 +1,13 @@
 Name:           kde-plasma-lancelot
-Version:        1.0.2
-Release:        3%{?dist}
+Version:        1.0.3
+Release:        1%{?dist}
 Summary:        An alternative application launcher
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://www.kde-apps.org/content/show.php/Lancelot?content=87914
 Source0:        http://downloads.sourceforge.net/lancelot-menu/lancelot-%{version}.tar.bz2
-Patch0:         lancelot-1.0.2-cmake.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  kde-filesystem >= 4
 BuildRequires:  kdelibs4-devel >= 4.1
 BuildRequires:  kdebase-workspace-devel >= 4.1
@@ -24,8 +22,6 @@
 %prep
 %setup -qn lancelot
 
-%patch0 -p1 -b .cmake
-
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -69,8 +65,9 @@
 
 
 %changelog
-* Fri Sep 12 2008 Than Ngo <than at redhat.com> 1.0.2-3
-- bump release
+* Sun Sep 14 2008 Than Ngo <than at redhat.com> 1.0.3-1
+- 1.0.3
+- drop cmake patch merged in 1.0.3
 
 * Thu Sep 11 2008 Than Ngo <than at redhat.com> 1.0.2-2
 - use %%version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-plasma-lancelot/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Sep 2008 11:47:14 -0000	1.3
+++ sources	14 Sep 2008 08:56:21 -0000	1.4
@@ -1 +1 @@
-85a596521cdcf3c4214626f151506bd1  lancelot-1.0.2.tar.bz2
+0c242be2c69ac16d35f8ee96c466962e  lancelot-1.0.3.tar.bz2



From than at fedoraproject.org  Sun Sep 14 08:57:45 2008
From: than at fedoraproject.org (Than Ngo)
Date: Sun, 14 Sep 2008 08:57:45 +0000 (UTC)
Subject: rpms/kde-plasma-lancelot/F-9 lancelot-1.0.2-cmake.patch,1.1,NONE
Message-ID: <20080914085745.0AFEE70136@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-plasma-lancelot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15320

Removed Files:
	lancelot-1.0.2-cmake.patch 
Log Message:
drop lancelot-1.0.2-cmake.patch



--- lancelot-1.0.2-cmake.patch DELETED ---



From than at fedoraproject.org  Sun Sep 14 08:57:56 2008
From: than at fedoraproject.org (Than Ngo)
Date: Sun, 14 Sep 2008 08:57:56 +0000 (UTC)
Subject: rpms/kde-plasma-lancelot/devel kde-plasma-lancelot.spec, 1.2,
	1.3 sources, 1.3, 1.4 lancelot-1.0.2-cmake.patch, 1.1, NONE
Message-ID: <20080914085756.683B370136@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-plasma-lancelot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15216

Modified Files:
	kde-plasma-lancelot.spec sources 
Removed Files:
	lancelot-1.0.2-cmake.patch 
Log Message:
1.0.3



Index: kde-plasma-lancelot.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-plasma-lancelot/devel/kde-plasma-lancelot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde-plasma-lancelot.spec	12 Sep 2008 17:13:39 -0000	1.2
+++ kde-plasma-lancelot.spec	14 Sep 2008 08:57:26 -0000	1.3
@@ -1,15 +1,13 @@
 Name:           kde-plasma-lancelot
-Version:        1.0.2
-Release:        3%{?dist}
+Version:        1.0.3
+Release:        1%{?dist}
 Summary:        An alternative application launcher
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://www.kde-apps.org/content/show.php/Lancelot?content=87914
 Source0:        http://downloads.sourceforge.net/lancelot-menu/lancelot-%{version}.tar.bz2
-Patch0:         lancelot-1.0.2-cmake.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  kde-filesystem >= 4
 BuildRequires:  kdelibs4-devel >= 4.1
 BuildRequires:  kdebase-workspace-devel >= 4.1
@@ -24,8 +22,6 @@
 %prep
 %setup -qn lancelot
 
-%patch0 -p1 -b .cmake
-
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -69,8 +65,9 @@
 
 
 %changelog
-* Fri Sep 12 2008 Than Ngo <than at redhat.com> 1.0.2-3
-- bump release
+* Sun Sep 14 2008 Than Ngo <than at redhat.com> 1.0.3-1
+- 1.0.3
+- drop cmake patch merged in 1.0.3
 
 * Thu Sep 11 2008 Than Ngo <than at redhat.com> 1.0.2-2
 - use %%version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-plasma-lancelot/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Sep 2008 17:13:39 -0000	1.3
+++ sources	14 Sep 2008 08:57:26 -0000	1.4
@@ -1 +1 @@
-85a596521cdcf3c4214626f151506bd1  lancelot-1.0.2.tar.bz2
+0c242be2c69ac16d35f8ee96c466962e  lancelot-1.0.3.tar.bz2


--- lancelot-1.0.2-cmake.patch DELETED ---



From pkgdb at fedoraproject.org  Sun Sep 14 09:11:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 09:11:21 +0000
Subject: [pkgdb] gputils ownership updated
Message-ID: <20080914091121.4A539208D98@bastion.fedora.phx.redhat.com>

Package gputils in Fedora devel is now owned by rrankin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Sun Sep 14 09:12:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 09:12:39 +0000
Subject: [pkgdb] gputils ownership updated
Message-ID: <20080914091239.6BE4E208D98@bastion.fedora.phx.redhat.com>

Package gputils in Fedora 8 is now owned by rrankin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Sun Sep 14 09:13:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 09:13:35 +0000
Subject: [pkgdb] gpsim ownership updated
Message-ID: <20080914091335.AD9C8208D9C@bastion.fedora.phx.redhat.com>

Package gpsim in Fedora 8 is now owned by rrankin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsim



From pkgdb at fedoraproject.org  Sun Sep 14 09:14:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 09:14:03 +0000
Subject: [pkgdb] gpsim ownership updated
Message-ID: <20080914091403.B1B41208D98@bastion.fedora.phx.redhat.com>

Package gpsim in Fedora 9 is now owned by rrankin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsim



From atorkhov at fedoraproject.org  Sun Sep 14 09:25:44 2008
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Sun, 14 Sep 2008 09:25:44 +0000 (UTC)
Subject: rpms/ogre/devel ogre-1.6.0-system-glew.patch, NONE,
	1.1 ogre-1.6.0rc1-openexr-fix.patch, NONE, 1.1 .cvsignore, 1.13,
	1.14 ogre.spec, 1.31, 1.32 sources, 1.13,
	1.14 ogre-1.4.6-system-glew.patch, 1.1, NONE
Message-ID: <20080914092544.EFE7770136@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/ogre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22010

Modified Files:
	.cvsignore ogre.spec sources 
Added Files:
	ogre-1.6.0-system-glew.patch ogre-1.6.0rc1-openexr-fix.patch 
Removed Files:
	ogre-1.4.6-system-glew.patch 
Log Message:
Update to 1.6.0rc1.

ogre-1.6.0-system-glew.patch:

--- NEW FILE ogre-1.6.0-system-glew.patch ---
diff -Naur ogre-1.6.0rc1/RenderSystems/GL/src/GLX/OgreGLXGLSupport.cpp ogre-1.6.0rc1.new/RenderSystems/GL/src/GLX/OgreGLXGLSupport.cpp
--- ogre-1.6.0rc1/RenderSystems/GL/src/GLX/OgreGLXGLSupport.cpp	2008-06-12 18:10:57.000000000 +0400
+++ ogre-1.6.0rc1.new/RenderSystems/GL/src/GLX/OgreGLXGLSupport.cpp	2008-09-13 22:40:32.000000000 +0400
@@ -39,7 +39,9 @@
 
 #include <X11/extensions/Xrandr.h>
 
-GLenum glxewContextInit(Ogre::GLSupport *glSupport);
+extern "C" {
+GLenum glxewContextInit();
+}
 
 static Display *_currentDisplay;
 static Display *_getCurrentDisplay(void) { return _currentDisplay; }
@@ -942,7 +944,7 @@
 		
 		glXGetCurrentDisplay = (PFNGLXGETCURRENTDISPLAYPROC)_getCurrentDisplay;
 		
-		if (glxewContextInit(this) != GLEW_OK)
+		if (glxewContextInit() != GLEW_OK)
 		{
 			XCloseDisplay (mGLDisplay);
 			XCloseDisplay (mXDisplay);
diff -Naur ogre-1.6.0rc1/RenderSystems/GL/src/Makefile.am ogre-1.6.0rc1.new/RenderSystems/GL/src/Makefile.am
--- ogre-1.6.0rc1/RenderSystems/GL/src/Makefile.am	2008-08-22 14:35:06.000000000 +0400
+++ ogre-1.6.0rc1.new/RenderSystems/GL/src/Makefile.am	2008-09-13 22:01:14.000000000 +0400
@@ -33,8 +33,7 @@
                              OgreGLFBORenderTexture.cpp \
                              OgreGLPBRenderTexture.cpp \
                              OgreGLFBOMultiRenderTarget.cpp \
-                             OgreGLFrameBufferObject.cpp \
-                             glew.cpp
+                             OgreGLFrameBufferObject.cpp
 
 RenderSystem_GL_la_LDFLAGS = -module $(PLUGIN_FLAGS) -L$(top_builddir)/OgreMain/src -Wl,-z,defs
 RenderSystem_GL_la_LIBADD = \
@@ -42,4 +41,4 @@
     $(top_builddir)/RenderSystems/GL/src/GLSL/src/libGLSL.la \
     $(top_builddir)/RenderSystems/GL/src/nvparse/libnvparse.la \
     $(top_builddir)/RenderSystems/GL/src/atifs/src/libatifs.la \
-    $(GL_LIBS) $(GLSUPPORT_LIBS) -lOgreMain $(OGRE_THREAD_LIBS)
+    $(GL_LIBS) $(GLSUPPORT_LIBS) -lOgreMain $(OGRE_THREAD_LIBS) -lGLEW
diff -Naur ogre-1.6.0rc1/RenderSystems/GL/src/Makefile.in ogre-1.6.0rc1.new/RenderSystems/GL/src/Makefile.in
--- ogre-1.6.0rc1/RenderSystems/GL/src/Makefile.in	2008-08-28 14:41:30.000000000 +0400
+++ ogre-1.6.0rc1.new/RenderSystems/GL/src/Makefile.in	2008-09-13 22:01:14.000000000 +0400
@@ -76,7 +76,7 @@
 	OgreGLPixelFormat.lo OgreGLRenderTexture.lo \
 	OgreGLRenderToVertexBuffer.lo OgreGLFBORenderTexture.lo \
 	OgreGLPBRenderTexture.lo OgreGLFBOMultiRenderTarget.lo \
-	OgreGLFrameBufferObject.lo glew.lo
+	OgreGLFrameBufferObject.lo
 RenderSystem_GL_la_OBJECTS = $(am_RenderSystem_GL_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/OgreMain/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -303,8 +303,7 @@
                              OgreGLFBORenderTexture.cpp \
                              OgreGLPBRenderTexture.cpp \
                              OgreGLFBOMultiRenderTarget.cpp \
-                             OgreGLFrameBufferObject.cpp \
-                             glew.cpp
+                             OgreGLFrameBufferObject.cpp
 
 RenderSystem_GL_la_LDFLAGS = -module $(PLUGIN_FLAGS) -L$(top_builddir)/OgreMain/src -Wl,-z,defs
 RenderSystem_GL_la_LIBADD = \
@@ -312,7 +311,7 @@
     $(top_builddir)/RenderSystems/GL/src/GLSL/src/libGLSL.la \
     $(top_builddir)/RenderSystems/GL/src/nvparse/libnvparse.la \
     $(top_builddir)/RenderSystems/GL/src/atifs/src/libatifs.la \
-    $(GL_LIBS) $(GLSUPPORT_LIBS) -lOgreMain $(OGRE_THREAD_LIBS)
+    $(GL_LIBS) $(GLSUPPORT_LIBS) -lOgreMain $(OGRE_THREAD_LIBS) -lGLEW
 
 all: all-recursive
 
@@ -406,7 +405,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreGLSupport.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreGLTexture.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreGLTextureManager.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/glew.Plo at am__quote@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
diff -Naur ogre-1.6.0rc1/RenderSystems/GL/src/OgreGLRenderSystem.cpp ogre-1.6.0rc1.new/RenderSystems/GL/src/OgreGLRenderSystem.cpp
--- ogre-1.6.0rc1/RenderSystems/GL/src/OgreGLRenderSystem.cpp	2008-08-25 14:42:20.000000000 +0400
+++ ogre-1.6.0rc1.new/RenderSystems/GL/src/OgreGLRenderSystem.cpp	2008-09-13 22:01:14.000000000 +0400
@@ -54,7 +54,6 @@
 
 // Convenience macro from ARB_vertex_buffer_object spec
 #define VBO_BUFFER_OFFSET(i) ((char *)NULL + (i))
-GLenum glewContextInit (Ogre::GLSupport *glSupport);
 
 namespace Ogre {
 
@@ -989,7 +988,7 @@
 		LogManager::getSingleton().logMessage("***************************");
 
 		// Get extension function pointers
-		glewContextInit(mGLSupport);
+		glewInit();
 	}
 
 

ogre-1.6.0rc1-openexr-fix.patch:

--- NEW FILE ogre-1.6.0rc1-openexr-fix.patch ---
diff -Naur ogre-1.6.0rc1-clean/PlugIns/EXRCodec/src/Makefile.am ogre-1.6.0rc1-clean.new/PlugIns/EXRCodec/src/Makefile.am
--- ogre-1.6.0rc1-clean/PlugIns/EXRCodec/src/Makefile.am	2008-06-12 18:10:57.000000000 +0400
+++ ogre-1.6.0rc1-clean.new/PlugIns/EXRCodec/src/Makefile.am	2008-09-13 19:56:20.000000000 +0400
@@ -3,8 +3,7 @@
 pkglib_LTLIBRARIES = Plugin_EXRCodec.la
 
 Plugin_EXRCodec_la_SOURCES = OgreEXRCodec.cpp \
-			     O_IStream.cpp \
-                             OgreEXRCodecDll.cpp 
+			     O_IStream.cpp
 
 Plugin_EXRCodec_la_LDFLAGS = -module $(PLUGIN_FLAGS) -L$(top_builddir)/OgreMain/src -Wl,-z,defs
 Plugin_EXRCodec_la_LIBADD = -lOgreMain $(OPENEXR_LIBS) $(OGRE_THREAD_LIBS)
diff -Naur ogre-1.6.0rc1-clean/PlugIns/EXRCodec/src/Makefile.in ogre-1.6.0rc1-clean.new/PlugIns/EXRCodec/src/Makefile.in
--- ogre-1.6.0rc1-clean/PlugIns/EXRCodec/src/Makefile.in	2008-08-28 14:41:24.000000000 +0400
+++ ogre-1.6.0rc1-clean.new/PlugIns/EXRCodec/src/Makefile.in	2008-09-13 19:56:34.000000000 +0400
@@ -61,8 +61,7 @@
 am__DEPENDENCIES_1 =
 Plugin_EXRCodec_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-am_Plugin_EXRCodec_la_OBJECTS = OgreEXRCodec.lo O_IStream.lo \
-	OgreEXRCodecDll.lo
+am_Plugin_EXRCodec_la_OBJECTS = OgreEXRCodec.lo O_IStream.lo
 Plugin_EXRCodec_la_OBJECTS = $(am_Plugin_EXRCodec_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/OgreMain/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -253,8 +252,7 @@
 INCLUDES = $(STLPORT_CFLAGS) -I$(top_srcdir)/PlugIns/EXRCodec/include -I$(top_srcdir)/OgreMain/include $(OPENEXR_CFLAGS)
 pkglib_LTLIBRARIES = Plugin_EXRCodec.la
 Plugin_EXRCodec_la_SOURCES = OgreEXRCodec.cpp \
-			     O_IStream.cpp \
-                             OgreEXRCodecDll.cpp 
+			     O_IStream.cpp
 
 Plugin_EXRCodec_la_LDFLAGS = -module $(PLUGIN_FLAGS) -L$(top_builddir)/OgreMain/src -Wl,-z,defs
 Plugin_EXRCodec_la_LIBADD = -lOgreMain $(OPENEXR_LIBS) $(OGRE_THREAD_LIBS)
@@ -329,7 +327,6 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/O_IStream.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreEXRCodec.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreEXRCodecDll.Plo at am__quote@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	2 Jul 2008 12:21:23 -0000	1.13
+++ .cvsignore	14 Sep 2008 09:25:14 -0000	1.14
@@ -1 +1 @@
-ogre-1.4.9-clean.tar.bz2
+ogre-1.6.0rc1-clean.tar.bz2


Index: ogre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ogre.spec	11 Jul 2008 07:25:59 -0000	1.31
+++ ogre.spec	14 Sep 2008 09:25:14 -0000	1.32
@@ -1,17 +1,18 @@
 Name:           ogre
-Version:        1.4.9
-Release:        2%{?dist}
+Version:        1.6.0
+Release:        0.1.rc1%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 License:        LGPLv2+
 Group:          System Environment/Libraries
 URL:            http://www.ogre3d.org/
 # This is http://downloads.sourceforge.net/ogre/ogre-v%(echo %{version} | tr . -).tar.bz2
 # With the non free licensed headers under RenderSystems/GL/include/GL removed
-Source0:        ogre-%{version}-clean.tar.bz2
+Source0:        ogre-1.6.0rc1-clean.tar.bz2
 Source1:        ogre-samples.sh
 Patch0:         ogre-1.2.1-rpath.patch
-Patch1:         ogre-1.4.6-system-glew.patch
+Patch1:         ogre-1.6.0-system-glew.patch
 Patch2:         ogre-1.4.7-system-tinyxml.patch
+Patch3:         ogre-1.6.0rc1-openexr-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cegui-devel zziplib-devel freetype-devel gtk2-devel
 BuildRequires:  libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel
@@ -66,6 +67,7 @@
 %patch0 -p1 -z .rpath
 %patch1 -p1 -z .glew
 %patch2 -p1 -z .sys-tinyxml
+%patch3 -p1
 # remove execute bits from src-files for -debuginfo package
 chmod -x `find RenderSystems/GL -type f` \
   `find Samples/DeferredShading -type f` Samples/DynTex/src/DynTex.cpp
@@ -147,6 +149,7 @@
 %doc AUTHORS BUGS COPYING 
 %doc Docs/ChangeLog.html Docs/ReadMe.html Docs/style.css Docs/ogre-logo.gif
 %{_bindir}/Ogre*
+%{_bindir}/rcapsdump
 %{_libdir}/lib*Ogre*-%{version}.so
 %{_libdir}/OGRE
 %{_datadir}/OGRE
@@ -173,6 +176,9 @@
 
 
 %changelog
+* Sat Sep 13 2008 Alexey Torkhov <atorkhov at gmail.com> 1.6.0-0.1rc1
+- New upstream release 1.6.0rc1
+
 * Fri Jul 11 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.9-2
 - Rebuild for new cegui
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	2 Jul 2008 12:21:24 -0000	1.13
+++ sources	14 Sep 2008 09:25:14 -0000	1.14
@@ -1 +1 @@
-a01915f5afc5ffba6009d39b1f454d3a  ogre-1.4.9-clean.tar.bz2
+6befec25a9ac9c84aa1ccd1256522fc9  ogre-1.6.0rc1-clean.tar.bz2


--- ogre-1.4.6-system-glew.patch DELETED ---



From pkgdb at fedoraproject.org  Sun Sep 14 09:35:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 09:35:03 +0000
Subject: [pkgdb] gtk+extra ownership updated
Message-ID: <20080914093503.8CC35208D9C@bastion.fedora.phx.redhat.com>

Package gtk+extra in Fedora 8 is now owned by rrankin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+extra



From pkgdb at fedoraproject.org  Sun Sep 14 09:35:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 09:35:12 +0000
Subject: [pkgdb] gtk+extra ownership updated
Message-ID: <20080914093512.AA745208D9E@bastion.fedora.phx.redhat.com>

Package gtk+extra in Fedora 9 is now owned by rrankin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+extra



From pkgdb at fedoraproject.org  Sun Sep 14 09:46:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 09:46:36 +0000
Subject: [pkgdb] gputils ownership updated
Message-ID: <20080914094636.A4D31208D5F@bastion.fedora.phx.redhat.com>

Package gputils in Fedora 9 is now owned by rrankin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From thm at fedoraproject.org  Sun Sep 14 09:58:37 2008
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sun, 14 Sep 2008 09:58:37 +0000 (UTC)
Subject: rpms/ikiwiki/F-9 .cvsignore, 1.4, 1.5 ikiwiki.spec, 1.3,
	1.4 import.log, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20080914095837.CEA4B70136@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29516/F-9

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Log Message:
Update to 2.63.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Aug 2008 16:51:44 -0000	1.4
+++ .cvsignore	14 Sep 2008 09:58:07 -0000	1.5
@@ -1 +1 @@
-ikiwiki_2.62.1.tar.gz
+ikiwiki_2.63.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-9/ikiwiki.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ikiwiki.spec	30 Aug 2008 16:51:44 -0000	1.3
+++ ikiwiki.spec	14 Sep 2008 09:58:07 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        2.62.1
+Version:        2.63
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
@@ -58,7 +58,7 @@
 
 # Filter Requires, all used by plugins
 # - Monotone: see bz 450267
-# - RPC::XML: see bz 435835
+# - RPC::XML: see bz 459933
 %{__cat} << \EOF > %{name}-req
 #!/bin/sh
 %{__perl_requires} $* |\
@@ -147,6 +147,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.63-1
+- Update to 2.63.
+
 * Sat Aug 30 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.62.1-1
 - Update to 2.62.1. Add /etc/ikiwiki.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	30 Aug 2008 16:51:44 -0000	1.3
+++ import.log	14 Sep 2008 09:58:07 -0000	1.4
@@ -1,3 +1,4 @@
 ikiwiki-2_51-1_fc9:F-9:ikiwiki-2.51-1.fc9.src.rpm:1215354983
 ikiwiki-2_56-1_fc9:F-9:ikiwiki-2.56-1.fc9.src.rpm:1218098277
 ikiwiki-2_62_1-1_fc9:F-9:ikiwiki-2.62.1-1.fc9.src.rpm:1220115042
+ikiwiki-2_63-1_fc9:F-9:ikiwiki-2.63-1.fc9.src.rpm:1221386213


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Aug 2008 16:51:44 -0000	1.4
+++ sources	14 Sep 2008 09:58:07 -0000	1.5
@@ -1 +1 @@
-87d371e9705beef27143f8151bbff64d  ikiwiki_2.62.1.tar.gz
+33eeeab36333deb7a088141f74df21f4  ikiwiki_2.63.tar.gz



From laxathom at fedoraproject.org  Sun Sep 14 11:34:22 2008
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Sun, 14 Sep 2008 11:34:22 +0000 (UTC)
Subject: rpms/python-gammu/devel python-gammu.spec,1.10,1.11
Message-ID: <20080914113422.20DC670136@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/python-gammu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17069

Modified Files:
	python-gammu.spec 
Log Message:
rebuild


Index: python-gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gammu/devel/python-gammu.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-gammu.spec	3 Sep 2008 16:49:41 -0000	1.10
+++ python-gammu.spec	14 Sep 2008 11:33:50 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:		python-gammu
 Version:	0.26        
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Python bindings for Gammu
 
 Group:		Development/Languages
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Sep 14 2008 Xavier Lamien <lxtnow at gmail.com> - 0.26-3
+- Rebuild.
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.26-2
 - fix license tag
 



From sgrubb at fedoraproject.org  Sun Sep 14 12:11:45 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Sun, 14 Sep 2008 12:11:45 +0000 (UTC)
Subject: rpms/libpreludedb/devel .cvsignore, 1.5, 1.6 libpreludedb.spec, 1.16,
	1.17 sources, 1.5, 1.6
Message-ID: <20080914121145.DAC6370136@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libpreludedb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25249

Modified Files:
	.cvsignore libpreludedb.spec sources 
Log Message:
* Sun Sep 14 2008 Steve Grubb <sgrubb at redhat.com> 0.9.15.1-1
- new upstream bugfix release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpreludedb/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Aug 2008 20:51:55 -0000	1.5
+++ .cvsignore	14 Sep 2008 12:11:14 -0000	1.6
@@ -1,3 +1,4 @@
 libpreludedb-0.9.11.1.tar.gz
 libpreludedb-0.9.14.1.tar.gz
 libpreludedb-0.9.15.tar.gz
+libpreludedb-0.9.15.1.tar.gz


Index: libpreludedb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpreludedb/devel/libpreludedb.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libpreludedb.spec	27 Aug 2008 20:51:55 -0000	1.16
+++ libpreludedb.spec	14 Sep 2008 12:11:15 -0000	1.17
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		libpreludedb		           
-Version:	0.9.15 
+Version:	0.9.15.1 
 Release:	1%{?dist}
 Summary:	Provide the framework for easy access to the Prelude database
 Group:		System Environment/Libraries
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Sun Sep 14 2008 Steve Grubb <sgrubb at redhat.com> 0.9.15.1-1
+- new upstream bugfix release
+
 * Wed Aug 27 2008 Steve Grubb <sgrubb at redhat.com> 0.9.15-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpreludedb/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Aug 2008 20:51:55 -0000	1.5
+++ sources	14 Sep 2008 12:11:15 -0000	1.6
@@ -1 +1 @@
-96a85f4ba47042e7a2243aed4bb00e98  libpreludedb-0.9.15.tar.gz
+792b6ce058e4b9db44279409dbc662a3  libpreludedb-0.9.15.1.tar.gz



From sgrubb at fedoraproject.org  Sun Sep 14 12:36:55 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Sun, 14 Sep 2008 12:36:55 +0000 (UTC)
Subject: rpms/libprelude/F-9 libprelude.spec,1.13,1.14 sources,1.9,1.10
Message-ID: <20080914123655.8A92E70136@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv628

Modified Files:
	libprelude.spec sources 
Log Message:
* Sun Sep 15 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.20.2-1
- New upstream release with ruby bindings



Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/F-9/libprelude.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libprelude.spec	4 Jul 2008 16:50:52 -0000	1.13
+++ libprelude.spec	14 Sep 2008 12:36:25 -0000	1.14
@@ -1,18 +1,23 @@
 %{!?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.17.2
+Version:	0.9.20.2
 Release:	1%{?dist}
 Summary:	The prelude library        
-
 Group:		System Environment/Libraries 
 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
+%ifnarch ppc ppc64
+BuildRequires:  valgrind
+%endif
 
 %description
 The Prelude Library is a collection of generic functions providing
@@ -61,14 +66,23 @@
 %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-perl-installdirs=vendor
+		--with-perl-installdirs=vendor \
+		--enable-easy-bindings
 
 # removing rpath
 sed -i.rpath -e 's|LD_RUN_PATH=""||' bindings/Makefile.in
@@ -87,10 +101,21 @@
 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/*
 
+# PPC strips ld.so so valgrind can't run
+%ifnarch ppc ppc64
+%check
+make check
+%endif
+
 %clean
 rm -rf %{buildroot}
 
@@ -115,6 +140,7 @@
 %{_libdir}/*.so
 %dir %{_includedir}/libprelude/
 %{_includedir}/libprelude/*
+%{_includedir}/libpreludecpp/*
 %{_datadir}/aclocal/libprelude.m4
 
 %files python
@@ -123,11 +149,17 @@
 
 %files perl
 %defattr(0755,root,root)
-%attr(0644,root,root) %{perl_vendorarch}/Prelude.pm
-%{perl_vendorarch}/auto/Prelude/
+%attr(0644,root,root) %{perl_vendorarch}/Prelude*.pm
+%{perl_vendorarch}/auto/Prelude*/
 
+%files ruby
+%defattr(-,root,root)
+%{ruby_sitearch}/PreludeEasy.so
 
 %changelog
+* Sun Sep 15 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.20.2-1
+- New upstream release with ruby bindings
+
 * 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)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Jul 2008 16:50:52 -0000	1.9
+++ sources	14 Sep 2008 12:36:25 -0000	1.10
@@ -1 +1 @@
-7c769293b4d79be2667993b8a88d42ac  libprelude-0.9.17.2.tar.gz
+4980065cc9fc7f8d6f0ca25e902b745d  libprelude-0.9.20.2.tar.gz



From cheese at fedoraproject.org  Sun Sep 14 12:40:30 2008
From: cheese at fedoraproject.org (josef radinger)
Date: Sun, 14 Sep 2008 12:40:30 +0000 (UTC)
Subject: rpms/bmpx/F-9 bmpx-hostnotfound.patch, NONE,
	1.1 bmpx-libsoup24.patch, 1.1, 1.2 bmpx.spec, 1.11, 1.12
Message-ID: <20080914124030.275A470136@cvs1.fedora.phx.redhat.com>

Author: cheese

Update of /cvs/pkgs/rpms/bmpx/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1691/F-9

Modified Files:
	bmpx-libsoup24.patch bmpx.spec 
Added Files:
	bmpx-hostnotfound.patch 
Log Message:
fix compile problems, massage patch, remove cdparanoia


bmpx-hostnotfound.patch:

--- NEW FILE bmpx-hostnotfound.patch ---
--- bmpx-0.40.14/src/network.cc.orig	2008-09-13 12:02:00.000000000 +0200
+++ bmpx-0.40.14/src/network.cc	2008-09-13 12:03:17.000000000 +0200
@@ -37,6 +37,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#undef HOST_NOT_FOUND
 #include <stdio.h>
 #include <unistd.h>
 

bmpx-libsoup24.patch:

Index: bmpx-libsoup24.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bmpx/F-9/bmpx-libsoup24.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bmpx-libsoup24.patch	15 Feb 2008 19:32:00 -0000	1.1
+++ bmpx-libsoup24.patch	14 Sep 2008 12:39:59 -0000	1.2
@@ -10,7 +10,7 @@
 +PKG_CHECK_MODULES([SOUP], [libsoup-2.4 >= 2.3.0.1])
  
  # sqlite
- PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.3])
+ PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.4])
 diff -up bmpx-0.40.13/sentinel/beep-media-player-2-sentinel.cc.libsoup24 bmpx-0.40.13/sentinel/beep-media-player-2-sentinel.cc
 --- bmpx-0.40.13/sentinel/beep-media-player-2-sentinel.cc.libsoup24	2007-10-18 19:17:06.000000000 +0200
 +++ bmpx-0.40.13/sentinel/beep-media-player-2-sentinel.cc	2008-02-15 20:26:58.000000000 +0100
@@ -26,7 +26,7 @@
 -G_END_DECLS
 -#endif
  
- #define SERVER_NAME "beep-media-player.org"
+ #define SERVER_NAME "bmpx.backtrace.info"
  
 diff -up bmpx-0.40.13/src/minisoup.hh.libsoup24 bmpx-0.40.13/src/minisoup.hh
 --- bmpx-0.40.13/src/minisoup.hh.libsoup24	2007-10-18 19:17:08.000000000 +0200


Index: bmpx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bmpx/F-9/bmpx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bmpx.spec	6 Jun 2008 22:31:42 -0000	1.11
+++ bmpx.spec	14 Sep 2008 12:39:59 -0000	1.12
@@ -1,13 +1,14 @@
 Summary:	Beep Media Player eXperimental
 Name:		bmpx
 Version:	0.40.14
-Release:	5%{?dist}
+Release:	6%{?dist}
 
 License:	GPLv2
 Group:		Applications/Multimedia
 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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-c++
@@ -30,7 +31,8 @@
 # BuildRequires:  libsidplay-devel
 BuildRequires:  startup-notification-devel
 BuildRequires:  libofa-devel
-BuildRequires:  cdparanoia-devel
+# disabled for now
+#BuildRequires:  cdparanoia-devel
 BuildRequires:  alsa-lib-devel
 BuildRequires:  libmodplug-devel
 BuildRequires:  gettext
@@ -40,8 +42,8 @@
 BuildRequires:  dbus-glib-devel
 BuildRequires:  libSM-devel
 BuildRequires:  libtool
-BuildRequires:  intltool
-
+BuildRequires:	intltool
+BuildRequires:	libcdio-devel
 %description
 BMPx is an audio player that features support for specifications like XDS DnD,
 XSPF and DBus. BMPx is highly interoperable and integrates well with other
@@ -83,7 +85,8 @@
 %configure \
 	--disable-hal \
 	--enable-mp4v2 \
-	--enable-modplug
+	--enable-modplug \
+	--without-cdparanoia
 #	--enable-sid \
 
 
@@ -176,6 +179,11 @@
 
 
 %changelog
+* Sun Sep 14 2008 josef radinger <cheese at nosuchhost.net> - 0.40.14-6 
+- fix patch libsoup
+- add hostnotfound-patch
+- remove cdparanoia, use libcdio (for now)
+
 * Sat Jun  7 2008 Alexander Kahl <akahl at iconmobile.com> - 0.40.14-5
 - explicitly added intltool build requirement
 



From cheese at fedoraproject.org  Sun Sep 14 12:43:18 2008
From: cheese at fedoraproject.org (josef radinger)
Date: Sun, 14 Sep 2008 12:43:18 +0000 (UTC)
Subject: rpms/bmpx/F-9 bmpx.spec,1.12,1.13
Message-ID: <20080914124318.DAAE770136@cvs1.fedora.phx.redhat.com>

Author: cheese

Update of /cvs/pkgs/rpms/bmpx/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2684

Modified Files:
	bmpx.spec 
Log Message:
forgot patch



Index: bmpx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bmpx/F-9/bmpx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bmpx.spec	14 Sep 2008 12:39:59 -0000	1.12
+++ bmpx.spec	14 Sep 2008 12:42:48 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:	Beep Media Player eXperimental
 Name:		bmpx
 Version:	0.40.14
-Release:	6%{?dist}
+Release:	7%{?dist}
 
 License:	GPLv2
 Group:		Applications/Multimedia
@@ -80,6 +80,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .libsoup24
+%patch1 -p1 -b .hostnotfound
 
 %build
 %configure \
@@ -179,7 +180,10 @@
 
 
 %changelog
-* Sun Sep 14 2008 josef radinger <cheese at nosuchhost.net> - 0.40.14-6 
+* Sun Sep 14 2008 josef radinger <cheese at nosuchhost.net> - 0.40.14-7
+- forgot the actual patch
+
+* Sun Sep 14 2008 josef radinger <cheese at nosuchhost.net> - 0.40.14-6
 - fix patch libsoup
 - add hostnotfound-patch
 - remove cdparanoia, use libcdio (for now)



From cheese at fedoraproject.org  Sun Sep 14 12:45:10 2008
From: cheese at fedoraproject.org (josef radinger)
Date: Sun, 14 Sep 2008 12:45:10 +0000 (UTC)
Subject: rpms/bmpx/F-9 bmpx.spec,1.13,1.14
Message-ID: <20080914124510.51FBC70136@cvs1.fedora.phx.redhat.com>

Author: cheese

Update of /cvs/pkgs/rpms/bmpx/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3350

Modified Files:
	bmpx.spec 
Log Message:
fix typo


Index: bmpx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bmpx/F-9/bmpx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bmpx.spec	14 Sep 2008 12:42:48 -0000	1.13
+++ bmpx.spec	14 Sep 2008 12:44:39 -0000	1.14
@@ -1,14 +1,14 @@
 Summary:	Beep Media Player eXperimental
 Name:		bmpx
 Version:	0.40.14
-Release:	7%{?dist}
+Release:	8%{?dist}
 
 License:	GPLv2
 Group:		Applications/Multimedia
 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
+Patch1:		bmpx-hostnotfound.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-c++
@@ -180,6 +180,9 @@
 
 
 %changelog
+* Sun Sep 14 2008 josef radinger <cheese at nosuchhost.net> - 0.40.14-8
+- fix typo
+
 * Sun Sep 14 2008 josef radinger <cheese at nosuchhost.net> - 0.40.14-7
 - forgot the actual patch
 



From sgrubb at fedoraproject.org  Sun Sep 14 13:01:17 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Sun, 14 Sep 2008 13:01:17 +0000 (UTC)
Subject: rpms/libprelude/F-9 libprelude-0.9.20.2-debug.patch, NONE,
	1.1 libprelude.spec, 1.14, 1.15
Message-ID: <20080914130117.1F9C970136@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8467

Modified Files:
	libprelude.spec 
Added Files:
	libprelude-0.9.20.2-debug.patch 
Log Message:
need to debug getaddrinfo failures


libprelude-0.9.20.2-debug.patch:

--- NEW FILE libprelude-0.9.20.2-debug.patch ---
diff -urp libprelude-0.9.20.2.orig/libmissing/tests/test-getaddrinfo.c libprelude-0.9.20.2/libmissing/tests/test-getaddrinfo.c
--- libprelude-0.9.20.2.orig/libmissing/tests/test-getaddrinfo.c	2008-09-14 08:58:14.000000000 -0400
+++ libprelude-0.9.20.2/libmissing/tests/test-getaddrinfo.c	2008-09-14 08:58:41.000000000 -0400
@@ -25,7 +25,7 @@
 #include <string.h>
 
 /* Whether to print debugging messages.  */
-#define ENABLE_DEBUGGING 0
+#define ENABLE_DEBUGGING 1
 
 #if ENABLE_DEBUGGING
 # define dbgprintf printf


Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/F-9/libprelude.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libprelude.spec	14 Sep 2008 12:36:25 -0000	1.14
+++ libprelude.spec	14 Sep 2008 13:00:46 -0000	1.15
@@ -11,6 +11,7 @@
 License:	GPLv2+
 URL:		http://prelude-ids.org/
 Source0:	http://www.prelude-ids.org/download/releases/%{name}/%{name}-%{version}.tar.gz
+Patch1: libprelude-0.9.20.2-debug.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gnutls-devel, python-devel, ruby, ruby-devel, lua-devel 
@@ -77,6 +78,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure	--disable-static \



From hadess at fedoraproject.org  Sun Sep 14 13:21:24 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sun, 14 Sep 2008 13:21:24 +0000 (UTC)
Subject: rpms/gstreamer/devel gstreamer.prov, 1.2, 1.3 gstreamer.spec, 1.85,
	1.86
Message-ID: <20080914132124.3D21470136@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15300

Modified Files:
	gstreamer.prov gstreamer.spec 
Log Message:
* Sun Sep 14 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-6
- Hopefully fix RPM provides problem when the GStreamer plugin
  requires a library installed by the package itself



Index: gstreamer.prov
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer.prov,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gstreamer.prov	11 Sep 2008 23:48:12 -0000	1.2
+++ gstreamer.prov	14 Sep 2008 13:20:53 -0000	1.3
@@ -26,9 +26,16 @@
 		grep "ELF 64-bit" >/dev/null; then echo -n "$mark64"; fi`
 }
 
+function libdir()
+{
+	buildlibdir=`dirname $1`
+	buildlibdir=`dirname $buildlibdir`
+}
+
 for so in $solist ; do
 	getmark $so
-	gst-inspect --print-plugin-auto-install-info --rpm $so 2> /dev/null | while read line ; do
+	libdir $so
+	LD_LIBRARY_PATH=$buildlibdir gst-inspect --print-plugin-auto-install-info --rpm $so 2> /dev/null | while read line ; do
 		echo -n "$line";
 		echo -n "$lib64"
 		echo


Index: gstreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- gstreamer.spec	11 Sep 2008 23:48:12 -0000	1.85
+++ gstreamer.spec	14 Sep 2008 13:20:53 -0000	1.86
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}
 Version: 	0.10.20
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -212,6 +212,10 @@
 %{_sysconfdir}/rpm/macros.gstreamer
 
 %changelog
+* Sun Sep 14 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-6
+- Hopefully fix RPM provides problem when the GStreamer plugin
+  requires a library installed by the package itself
+
 * Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-5
 - Update rpm provides script and patch to:
   - filter out errors



From sgrubb at fedoraproject.org  Sun Sep 14 13:22:24 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Sun, 14 Sep 2008 13:22:24 +0000 (UTC)
Subject: rpms/libprelude/F-9 libprelude.spec,1.15,1.16
Message-ID: <20080914132224.0B75370136@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15984

Modified Files:
	libprelude.spec 
Log Message:
* Sun Sep 15 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.20.2-2
- release engineering took make force-tag away and I have to
 apply a patch for troubleshooting.



Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/F-9/libprelude.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libprelude.spec	14 Sep 2008 13:00:46 -0000	1.15
+++ libprelude.spec	14 Sep 2008 13:21:53 -0000	1.16
@@ -5,7 +5,7 @@
 
 Name:		libprelude
 Version:	0.9.20.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The prelude library        
 Group:		System Environment/Libraries 
 License:	GPLv2+
@@ -159,6 +159,10 @@
 %{ruby_sitearch}/PreludeEasy.so
 
 %changelog
+* Sun Sep 15 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.20.2-2
+- release engineering took make force-tag away and I have to
+ apply a patch for troubleshooting.
+
 * Sun Sep 15 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.20.2-1
 - New upstream release with ruby bindings
 



From sgrubb at fedoraproject.org  Sun Sep 14 13:40:54 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Sun, 14 Sep 2008 13:40:54 +0000 (UTC)
Subject: rpms/libprelude/F-9 libprelude-0.9.20.2-getaddrinfo-test.patch, NONE,
	1.1 libprelude.spec, 1.16, 1.17
Message-ID: <20080914134054.397F370136@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24361

Modified Files:
	libprelude.spec 
Added Files:
	libprelude-0.9.20.2-getaddrinfo-test.patch 
Log Message:
* Sun Sep 15 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.20.2-3
- release engineering took make force-tag away and I have to
 apply a new patch to disable the failing test.


libprelude-0.9.20.2-getaddrinfo-test.patch:

--- NEW FILE libprelude-0.9.20.2-getaddrinfo-test.patch ---
diff -urp libprelude-0.9.20.2.orig/libmissing/tests/Makefile.in libprelude-0.9.20.2/libmissing/tests/Makefile.in
--- libprelude-0.9.20.2.orig/libmissing/tests/Makefile.in	2008-09-14 08:58:14.000000000 -0400
+++ libprelude-0.9.20.2/libmissing/tests/Makefile.in	2008-09-14 09:35:07.000000000 -0400
@@ -52,7 +52,7 @@ target_triplet = @target@
 noinst_PROGRAMS =
 check_PROGRAMS = test-EOVERFLOW$(EXEEXT) test-alloca-opt$(EXEEXT) \
 	test-arpa_inet$(EXEEXT) test-cond$(EXEEXT) \
-	test-fseeko$(EXEEXT) test-getaddrinfo$(EXEEXT) \
+	test-fseeko$(EXEEXT) \
 	test-getdelim$(EXEEXT) test-getline$(EXEEXT) \
 	test-gettimeofday$(EXEEXT) test-lock$(EXEEXT) \
 	test-lseek$(EXEEXT) test-memchr$(EXEEXT) test-memcmp$(EXEEXT) \
@@ -853,7 +853,7 @@ target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = 1.5 foreign
 SUBDIRS = 
 TESTS = test-EOVERFLOW test-alloca-opt test-arpa_inet test-cond \
-	test-fseeko.sh test-getaddrinfo test-getdelim test-getline \
+	test-fseeko.sh test-getdelim test-getline \
 	test-gettimeofday test-lock test-lseek.sh test-memchr \
 	test-memcmp test-memmem test-netinet_in test-snprintf \
 	test-stdbool test-stdint test-stdio test-stdlib \


Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/F-9/libprelude.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libprelude.spec	14 Sep 2008 13:21:53 -0000	1.16
+++ libprelude.spec	14 Sep 2008 13:40:23 -0000	1.17
@@ -5,13 +5,13 @@
 
 Name:		libprelude
 Version:	0.9.20.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The prelude library        
 Group:		System Environment/Libraries 
 License:	GPLv2+
 URL:		http://prelude-ids.org/
 Source0:	http://www.prelude-ids.org/download/releases/%{name}/%{name}-%{version}.tar.gz
-Patch1: libprelude-0.9.20.2-debug.patch
+Patch1:		libprelude-0.9.20.2-getaddrinfo-test.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gnutls-devel, python-devel, ruby, ruby-devel, lua-devel 
@@ -159,6 +159,10 @@
 %{ruby_sitearch}/PreludeEasy.so
 
 %changelog
+* Sun Sep 15 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.20.2-3
+- release engineering took make force-tag away and I have to
+ apply a new patch to disable the failing test.
+
 * Sun Sep 15 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.20.2-2
 - release engineering took make force-tag away and I have to
  apply a patch for troubleshooting.



From mtasaka at fedoraproject.org  Sun Sep 14 14:01:17 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 14 Sep 2008 14:01:17 +0000 (UTC)
Subject: rpms/jd/F-8 .cvsignore, 1.284, 1.285 jd.spec, 1.318, 1.319 sources, 
	1.285, 1.286 jd-svn2312-set-Fedora-default.patch, 1.1, NONE
Message-ID: <20080914140117.E4A6F70136@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv627/F-8

Modified Files:
	.cvsignore jd.spec sources 
Removed Files:
	jd-svn2312-set-Fedora-default.patch 
Log Message:
* Sun Sep 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-1
- 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- .cvsignore	9 Sep 2008 15:54:52 -0000	1.284
+++ .cvsignore	14 Sep 2008 14:00:47 -0000	1.285
@@ -1 +1 @@
-jd-2.0.1-rc080909.tgz
+jd-2.0.1-080914.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- jd.spec	9 Sep 2008 15:54:52 -0000	1.318
+++ jd.spec	14 Sep 2008 14:00:47 -0000	1.319
@@ -10,16 +10,16 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.1
-%define         strtag        rc080909
-%define         repoid        32826
+%define         strtag        080914
+%define         repoid        32887
 # Define this if this is pre-version
-%define         pre_release   1
+%define         pre_release   0
 ##########################################
 
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    3
+%define         vendor_rel    1
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -135,6 +135,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Sep 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-1
+- 2.0.1
+
 * Wed Sep 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.3.rc080909
 - 2.0.1 rc 080909
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/sources,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- sources	9 Sep 2008 15:54:53 -0000	1.285
+++ sources	14 Sep 2008 14:00:47 -0000	1.286
@@ -1 +1 @@
-648920936589ccf910a44d479052ae9b  jd-2.0.1-rc080909.tgz
+acddaac88539f460023def208b08d120  jd-2.0.1-080914.tgz


--- jd-svn2312-set-Fedora-default.patch DELETED ---



From mtasaka at fedoraproject.org  Sun Sep 14 14:01:18 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 14 Sep 2008 14:01:18 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.291, 1.292 jd.spec, 1.329, 1.330 sources, 
	1.292, 1.293 jd-svn2312-set-Fedora-default.patch, 1.1, NONE
Message-ID: <20080914140118.3962A70136@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv627/F-9

Modified Files:
	.cvsignore jd.spec sources 
Removed Files:
	jd-svn2312-set-Fedora-default.patch 
Log Message:
* Sun Sep 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-1
- 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- .cvsignore	9 Sep 2008 15:54:53 -0000	1.291
+++ .cvsignore	14 Sep 2008 14:00:47 -0000	1.292
@@ -1 +1 @@
-jd-2.0.1-rc080909.tgz
+jd-2.0.1-080914.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- jd.spec	9 Sep 2008 15:54:53 -0000	1.329
+++ jd.spec	14 Sep 2008 14:00:47 -0000	1.330
@@ -10,16 +10,16 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.1
-%define         strtag        rc080909
-%define         repoid        32826
+%define         strtag        080914
+%define         repoid        32887
 # Define this if this is pre-version
-%define         pre_release   1
+%define         pre_release   0
 ##########################################
 
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    3
+%define         vendor_rel    1
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -135,6 +135,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Sep 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-1
+- 2.0.1
+
 * Wed Sep 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.3.rc080909
 - 2.0.1 rc 080909
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- sources	9 Sep 2008 15:54:53 -0000	1.292
+++ sources	14 Sep 2008 14:00:47 -0000	1.293
@@ -1 +1 @@
-648920936589ccf910a44d479052ae9b  jd-2.0.1-rc080909.tgz
+acddaac88539f460023def208b08d120  jd-2.0.1-080914.tgz


--- jd-svn2312-set-Fedora-default.patch DELETED ---



From mtasaka at fedoraproject.org  Sun Sep 14 14:01:19 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 14 Sep 2008 14:01:19 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.291, 1.292 jd.spec, 1.339, 1.340 sources,
	1.292, 1.293 jd-svn2312-set-Fedora-default.patch, 1.1, NONE
Message-ID: <20080914140119.0D43170136@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv627/devel

Modified Files:
	.cvsignore jd.spec sources 
Removed Files:
	jd-svn2312-set-Fedora-default.patch 
Log Message:
* Sun Sep 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-1
- 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- .cvsignore	9 Sep 2008 15:41:50 -0000	1.291
+++ .cvsignore	14 Sep 2008 14:00:48 -0000	1.292
@@ -1 +1 @@
-jd-2.0.1-rc080909.tgz
+jd-2.0.1-080914.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- jd.spec	9 Sep 2008 15:54:53 -0000	1.339
+++ jd.spec	14 Sep 2008 14:00:48 -0000	1.340
@@ -10,16 +10,16 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.1
-%define         strtag        rc080909
-%define         repoid        32826
+%define         strtag        080914
+%define         repoid        32887
 # Define this if this is pre-version
-%define         pre_release   1
+%define         pre_release   0
 ##########################################
 
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    3
+%define         vendor_rel    1
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -135,6 +135,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Sep 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-1
+- 2.0.1
+
 * Wed Sep 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-0.3.rc080909
 - 2.0.1 rc 080909
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- sources	9 Sep 2008 15:41:50 -0000	1.292
+++ sources	14 Sep 2008 14:00:48 -0000	1.293
@@ -1 +1 @@
-648920936589ccf910a44d479052ae9b  jd-2.0.1-rc080909.tgz
+acddaac88539f460023def208b08d120  jd-2.0.1-080914.tgz


--- jd-svn2312-set-Fedora-default.patch DELETED ---



From adrian at fedoraproject.org  Sun Sep 14 14:17:50 2008
From: adrian at fedoraproject.org (Adrian Reber)
Date: Sun, 14 Sep 2008 14:17:50 +0000 (UTC)
Subject: rpms/udns/devel udns.spec,1.1,1.2
Message-ID: <20080914141750.0D0DE70136@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/udns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7720

Modified Files:
	udns.spec 
Log Message:
* Sun Sep 14 2008 Adrian Reber <adrian at lisas.de> - 0.0.9-3
- removed rblcheck binary to resolve conflict with package rblcheck



Index: udns.spec
===================================================================
RCS file: /cvs/extras/rpms/udns/devel/udns.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udns.spec	16 Jul 2008 19:59:05 -0000	1.1
+++ udns.spec	14 Sep 2008 14:17:19 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: DNS resolver library for both synchronous and asynchronous DNS queries
 Name: udns
 Version: 0.0.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.corpit.ru/mjt/udns.html
@@ -34,9 +34,7 @@
 %{__install} -Dp -m0755 libudns.so.0 %{buildroot}%{_libdir}/libudns.so.0
 %{__ln_s} -f libudns.so.0 %{buildroot}%{_libdir}/libudns.so
 %{__install} -Dp -m0755 dnsget %{buildroot}%{_bindir}/dnsget
-%{__install} -Dp -m0755 rblcheck %{buildroot}%{_bindir}/rblcheck
 %{__install} -Dp -m0444 dnsget.1 %{buildroot}%{_mandir}/man1/dnsget.1
-%{__install} -Dp -m0444 rblcheck.1 %{buildroot}%{_mandir}/man1/rblcheck.1
 
 %{__install} -Dp -m0444 udns.3 %{buildroot}%{_mandir}/man3/udns.3
 %{__install} -Dp -m0644 udns.h %{buildroot}%{_includedir}/udns.h
@@ -51,9 +49,7 @@
 %defattr(-, root, root, 0755)
 %doc COPYING.LGPL NEWS NOTES TODO
 %doc %{_mandir}/man1/dnsget.1*
-%doc %{_mandir}/man1/rblcheck.1*
 %{_bindir}/dnsget
-%{_bindir}/rblcheck
 %{_libdir}/libudns.so.*
 
 %files devel
@@ -63,6 +59,9 @@
 %{_libdir}/libudns.so
 
 %changelog
+* Sun Sep 14 2008 Adrian Reber <adrian at lisas.de> - 0.0.9-3
+- removed rblcheck binary to resolve conflict with package rblcheck
+
 * Wed Jul 16 2008 Adrian Reber <adrian at lisas.de> - 0.0.9-2
 - removed static library
 - added correct optflags



From kkofler at fedoraproject.org  Sun Sep 14 14:29:46 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 14 Sep 2008 14:29:46 +0000 (UTC)
Subject: rpms/libprelude/devel libprelude.spec,1.29,1.30
Message-ID: <20080914142946.104F570136@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/libprelude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12382/devel

Modified Files:
	libprelude.spec 
Log Message:
* Sun Sep 14 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.9.20.2-3
- Bump for upgrade path

Next time bump Release AFTER the disttag for branch-only fixes!!!
E.g. 1%{?dist} -> 1%{?dist}.1 -> 1%{?dist}.2 -> 1%{?dist}.3 -> ...
That way this sort of pointless rebuilds is not needed.


Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libprelude.spec	9 Sep 2008 14:11:04 -0000	1.29
+++ libprelude.spec	14 Sep 2008 14:29:15 -0000	1.30
@@ -5,7 +5,7 @@
 
 Name:		libprelude
 Version:	0.9.20.2
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	The prelude library        
 Group:		System Environment/Libraries 
 License:	GPLv2+
@@ -157,6 +157,9 @@
 %{ruby_sitearch}/PreludeEasy.so
 
 %changelog
+* Sun Sep 14 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.9.20.2-3
+- Bump for upgrade path
+
 * Tue Sep 09 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.20.2-1
 - New upstream bugfix release
 



From ianweller at fedoraproject.org  Sun Sep 14 16:04:32 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Sun, 14 Sep 2008 16:04:32 +0000 (UTC)
Subject: rpms/gwibber/devel .cvsignore, 1.2, 1.3 gwibber.spec, 1.1,
	1.2 import.log, 1.1, 1.2 sources, 1.2,
	1.3 gwibbler-61bzr-patches.diff, 1.1, NONE
Message-ID: <20080914160432.D61E670136@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19542/devel

Modified Files:
	.cvsignore gwibber.spec import.log sources 
Removed Files:
	gwibbler-61bzr-patches.diff 
Log Message:
import gwibber-0.7-4.102bzr in devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Aug 2008 07:07:34 -0000	1.2
+++ .cvsignore	14 Sep 2008 16:04:02 -0000	1.3
@@ -1 +1 @@
-gwibber-61bzr.tar.gz
+gwibber-102bzr.tar.gz


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/gwibber.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gwibber.spec	10 Aug 2008 07:07:34 -0000	1.1
+++ gwibber.spec	14 Sep 2008 16:04:02 -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 bzr_rev        61
+%define bzr_rev        102
 
 Name:           gwibber
 Version:        0.7
-Release:        2.%{bzr_rev}bzr%{?dist}
+Release:        4.%{bzr_rev}bzr%{?dist}
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
 Group:          Applications/Internet
@@ -15,12 +15,12 @@
 #  bzr branch -r %{bzr_rev} lp:gwibber
 #  tar -czvf gwibber-%{bzr_rev}bzr.tar.gz gwibber
 Source0:        %{name}-%{bzr_rev}bzr.tar.gz
-Patch0:         gwibbler-61bzr-patches.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       python pygtk2 dbus-python python-simplejson gnome-python2-gconf PyXML
-BuildArch:      noarch
+Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML pywebkitgtk
+Requires:       python-simplejson >= 1.9.1
 BuildRequires:  python-devel desktop-file-utils
+BuildArch:      noarch
 
 %description
 Gwibber is an open source microblogging client for GNOME developed with Python
@@ -29,7 +29,6 @@
 
 %prep
 %setup -q -n gwibber
-%patch0 -p1
 
 
 %build
@@ -39,7 +38,8 @@
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-sed -i '/#! \?\/usr\/bin\/env python/d' %{buildroot}%{python_sitelib}/%{name}/*.py
+sed -i '/#! \?\/usr\/bin\/env python/d' $(find %{buildroot}%{python_sitelib}/%{name}/ | grep "\.py$")
+rm -rf %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{name}.desktop
 
  
@@ -58,7 +58,15 @@
 
 
 %changelog
-* Tue Aug 05 2008 Ian Weller <ianweller at gmail.com> 0.7-1.61bzr
+* Thu Sep 11 2008 Ian Weller <ianweller at gmail.com> 0.7-4.102bzr
+- Update upstream
+- Fix requires: s/pywebkitgui/pywebkitgtk/
+- Fix requires: python-simplejson >= 1.9.1
+
+* Sat Aug 30 2008 Ian Weller <ianweller at gmail.com> 0.7-3.101bzr
+- Update upstream to webkitui branch
+
+* Tue Aug 05 2008 Ian Weller <ianweller at gmail.com> 0.7-2.61bzr
 - Patch facebook.py to find ui/preferences.glade in the right location
 
 * Mon Aug 04 2008 Ian Weller <ianweller at gmail.com> 0.7-1.61bzr


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Aug 2008 07:07:34 -0000	1.1
+++ import.log	14 Sep 2008 16:04:02 -0000	1.2
@@ -1 +1,2 @@
 gwibber-0_7-2_61bzr_fc9:HEAD:gwibber-0.7-2.61bzr.fc9.src.rpm:1218352037
+gwibber-0_7-4_102bzr_fc9:HEAD:gwibber-0.7-4.102bzr.fc9.src.rpm:1221406846


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Aug 2008 07:07:34 -0000	1.2
+++ sources	14 Sep 2008 16:04:02 -0000	1.3
@@ -1 +1 @@
-debf3a59379f67bafc9a01d65562d784  gwibber-61bzr.tar.gz
+b59556b290901a515da1fdf6b9838eca  gwibber-102bzr.tar.gz


--- gwibbler-61bzr-patches.diff DELETED ---



From ianweller at fedoraproject.org  Sun Sep 14 16:05:33 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Sun, 14 Sep 2008 16:05:33 +0000 (UTC)
Subject: rpms/gwibber/F-9 .cvsignore, 1.2, 1.3 gwibber.spec, 1.1,
	1.2 import.log, 1.1, 1.2 sources, 1.2,
	1.3 gwibbler-61bzr-patches.diff, 1.1, NONE
Message-ID: <20080914160533.A512470136@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20163/F-9

Modified Files:
	.cvsignore gwibber.spec import.log sources 
Removed Files:
	gwibbler-61bzr-patches.diff 
Log Message:
import gwibber-0.7-4.102bzr in F-9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Aug 2008 07:06:20 -0000	1.2
+++ .cvsignore	14 Sep 2008 16:05:03 -0000	1.3
@@ -1 +1 @@
-gwibber-61bzr.tar.gz
+gwibber-102bzr.tar.gz


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-9/gwibber.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gwibber.spec	10 Aug 2008 07:06:20 -0000	1.1
+++ gwibber.spec	14 Sep 2008 16:05:03 -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 bzr_rev        61
+%define bzr_rev        102
 
 Name:           gwibber
 Version:        0.7
-Release:        2.%{bzr_rev}bzr%{?dist}
+Release:        4.%{bzr_rev}bzr%{?dist}
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
 Group:          Applications/Internet
@@ -15,12 +15,12 @@
 #  bzr branch -r %{bzr_rev} lp:gwibber
 #  tar -czvf gwibber-%{bzr_rev}bzr.tar.gz gwibber
 Source0:        %{name}-%{bzr_rev}bzr.tar.gz
-Patch0:         gwibbler-61bzr-patches.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       python pygtk2 dbus-python python-simplejson gnome-python2-gconf PyXML
-BuildArch:      noarch
+Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML pywebkitgtk
+Requires:       python-simplejson >= 1.9.1
 BuildRequires:  python-devel desktop-file-utils
+BuildArch:      noarch
 
 %description
 Gwibber is an open source microblogging client for GNOME developed with Python
@@ -29,7 +29,6 @@
 
 %prep
 %setup -q -n gwibber
-%patch0 -p1
 
 
 %build
@@ -39,7 +38,8 @@
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-sed -i '/#! \?\/usr\/bin\/env python/d' %{buildroot}%{python_sitelib}/%{name}/*.py
+sed -i '/#! \?\/usr\/bin\/env python/d' $(find %{buildroot}%{python_sitelib}/%{name}/ | grep "\.py$")
+rm -rf %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{name}.desktop
 
  
@@ -58,7 +58,15 @@
 
 
 %changelog
-* Tue Aug 05 2008 Ian Weller <ianweller at gmail.com> 0.7-1.61bzr
+* Thu Sep 11 2008 Ian Weller <ianweller at gmail.com> 0.7-4.102bzr
+- Update upstream
+- Fix requires: s/pywebkitgui/pywebkitgtk/
+- Fix requires: python-simplejson >= 1.9.1
+
+* Sat Aug 30 2008 Ian Weller <ianweller at gmail.com> 0.7-3.101bzr
+- Update upstream to webkitui branch
+
+* Tue Aug 05 2008 Ian Weller <ianweller at gmail.com> 0.7-2.61bzr
 - Patch facebook.py to find ui/preferences.glade in the right location
 
 * Mon Aug 04 2008 Ian Weller <ianweller at gmail.com> 0.7-1.61bzr


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Aug 2008 07:06:20 -0000	1.1
+++ import.log	14 Sep 2008 16:05:03 -0000	1.2
@@ -1 +1,2 @@
 gwibber-0_7-2_61bzr_fc9:F-9:gwibber-0.7-2.61bzr.fc9.src.rpm:1218351939
+gwibber-0_7-4_102bzr_fc9:F-9:gwibber-0.7-4.102bzr.fc9.src.rpm:1221408293


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Aug 2008 07:06:20 -0000	1.2
+++ sources	14 Sep 2008 16:05:03 -0000	1.3
@@ -1 +1 @@
-debf3a59379f67bafc9a01d65562d784  gwibber-61bzr.tar.gz
+b59556b290901a515da1fdf6b9838eca  gwibber-102bzr.tar.gz


--- gwibbler-61bzr-patches.diff DELETED ---



From ianweller at fedoraproject.org  Sun Sep 14 16:06:38 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Sun, 14 Sep 2008 16:06:38 +0000 (UTC)
Subject: rpms/gwibber/F-8 .cvsignore, 1.2, 1.3 gwibber.spec, 1.1,
	1.2 import.log, 1.1, 1.2 sources, 1.2,
	1.3 gwibbler-61bzr-patches.diff, 1.1, NONE
Message-ID: <20080914160638.5459E70136@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20801/F-8

Modified Files:
	.cvsignore gwibber.spec import.log sources 
Removed Files:
	gwibbler-61bzr-patches.diff 
Log Message:
import gwibber-0.7-4.102bzr in F-8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Aug 2008 07:04:43 -0000	1.2
+++ .cvsignore	14 Sep 2008 16:06:07 -0000	1.3
@@ -1 +1 @@
-gwibber-61bzr.tar.gz
+gwibber-102bzr.tar.gz


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-8/gwibber.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gwibber.spec	10 Aug 2008 07:04:43 -0000	1.1
+++ gwibber.spec	14 Sep 2008 16:06:07 -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 bzr_rev        61
+%define bzr_rev        102
 
 Name:           gwibber
 Version:        0.7
-Release:        2.%{bzr_rev}bzr%{?dist}
+Release:        4.%{bzr_rev}bzr%{?dist}
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
 Group:          Applications/Internet
@@ -15,12 +15,12 @@
 #  bzr branch -r %{bzr_rev} lp:gwibber
 #  tar -czvf gwibber-%{bzr_rev}bzr.tar.gz gwibber
 Source0:        %{name}-%{bzr_rev}bzr.tar.gz
-Patch0:         gwibbler-61bzr-patches.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       python pygtk2 dbus-python python-simplejson gnome-python2-gconf PyXML
-BuildArch:      noarch
+Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML pywebkitgtk
+Requires:       python-simplejson >= 1.9.1
 BuildRequires:  python-devel desktop-file-utils
+BuildArch:      noarch
 
 %description
 Gwibber is an open source microblogging client for GNOME developed with Python
@@ -29,7 +29,6 @@
 
 %prep
 %setup -q -n gwibber
-%patch0 -p1
 
 
 %build
@@ -39,7 +38,8 @@
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-sed -i '/#! \?\/usr\/bin\/env python/d' %{buildroot}%{python_sitelib}/%{name}/*.py
+sed -i '/#! \?\/usr\/bin\/env python/d' $(find %{buildroot}%{python_sitelib}/%{name}/ | grep "\.py$")
+rm -rf %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{name}.desktop
 
  
@@ -58,7 +58,15 @@
 
 
 %changelog
-* Tue Aug 05 2008 Ian Weller <ianweller at gmail.com> 0.7-1.61bzr
+* Thu Sep 11 2008 Ian Weller <ianweller at gmail.com> 0.7-4.102bzr
+- Update upstream
+- Fix requires: s/pywebkitgui/pywebkitgtk/
+- Fix requires: python-simplejson >= 1.9.1
+
+* Sat Aug 30 2008 Ian Weller <ianweller at gmail.com> 0.7-3.101bzr
+- Update upstream to webkitui branch
+
+* Tue Aug 05 2008 Ian Weller <ianweller at gmail.com> 0.7-2.61bzr
 - Patch facebook.py to find ui/preferences.glade in the right location
 
 * Mon Aug 04 2008 Ian Weller <ianweller at gmail.com> 0.7-1.61bzr


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-8/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Aug 2008 07:04:43 -0000	1.1
+++ import.log	14 Sep 2008 16:06:08 -0000	1.2
@@ -1 +1,2 @@
 gwibber-0_7-2_61bzr_fc9:F-8:gwibber-0.7-2.61bzr.fc9.src.rpm:1218351868
+gwibber-0_7-4_102bzr_fc9:F-8:gwibber-0.7-4.102bzr.fc9.src.rpm:1221408348


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Aug 2008 07:04:43 -0000	1.2
+++ sources	14 Sep 2008 16:06:08 -0000	1.3
@@ -1 +1 @@
-debf3a59379f67bafc9a01d65562d784  gwibber-61bzr.tar.gz
+b59556b290901a515da1fdf6b9838eca  gwibber-102bzr.tar.gz


--- gwibbler-61bzr-patches.diff DELETED ---



From transif at fedoraproject.org  Sun Sep 14 16:32:37 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Sun, 14 Sep 2008 16:32:37 +0000 (UTC)
Subject: comps/po it.po,1.18,1.19
Message-ID: <20080914163237.204DE70136@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32197/po

Modified Files:
	it.po 
Log Message:
    2008-09-14  Francesco Tombolini <tombo at adamantio.net> (via
tombo at fedoraproject.org)
    
      * po/it.po: small update in italian translation
    



Index: it.po
===================================================================
RCS file: /cvs/pkgs/comps/po/it.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- it.po	10 Sep 2008 22:57:56 -0000	1.18
+++ it.po	14 Sep 2008 16:32:06 -0000	1.19
@@ -1,4 +1,4 @@
-# translation of it.po to Italiano
+# translation of comps.HEAD.it.po to Italiano
 #
 #
 # Francesco Valente <fvalen at redhat.com>, 2002, 2003, 2004.
@@ -6,23 +6,22 @@
 # Francesco Tombolini <tombo at adamantio.net>, 2006, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: it\n"
+"Project-Id-Version: comps.HEAD.it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-10 18:57-0400\n"
-"PO-Revision-Date: 2008-07-24 07:11+0200\n"
+"POT-Creation-Date: 2008-09-14 09:24+0000\n"
+"PO-Revision-Date: 2008-09-14 18:28+0200\n"
 "Last-Translator: Francesco Tombolini <tombo at adamantio.net>\n"
-"Language-Team: Italian <fedora-trans-it at redhat.com>\n"
+"Language-Team: Italiano <fedora-trans-it at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KAider 0.1\n"
+"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
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
-"Un ambiente desktop leggero che funziona bene con macchine di basso livello."
+msgstr "Un ambiente desktop leggero che funziona bene con macchine di basso livello."
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
 #: ../comps-f10.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
@@ -398,21 +397,18 @@
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
 #: ../comps-f10.xml.in.h:80 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
-msgstr ""
-"Installare questi pacchetti per sviluppare le applicazioni grafiche QT e KDE."
+msgstr "Installare questi pacchetti per sviluppare le applicazioni grafiche QT e KDE."
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:81
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "Installare questi strumenti per permettere al sistema di stampare o fungere "
 "da server di stampa."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
 #: ../comps-f10.xml.in.h:82 ../comps-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 ""
 "Installare questo gruppo di pacchetti per usare l'interfaccia utente grafica "
 "(X) di base."
@@ -652,10 +648,8 @@
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
 #: ../comps-f10.xml.in.h:141 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
-msgstr ""
-"Semplici window managers che non sono parte di grandi ambienti desktop."
+msgid "Simple window managers that aren't part of a larger desktop environment."
+msgstr "Semplici window managers che non sono parte di grandi ambienti desktop."
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:137
 #: ../comps-f10.xml.in.h:142
@@ -717,55 +711,54 @@
 msgstr "Supporto per lo spagnolo"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:153 ../comps-el4.xml.in.h:46
+#: ../comps-f10.xml.in.h:154 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
-msgstr ""
-"Supporto per sviluppare programmi nel linguaggio di programmazione Java."
+msgstr "Supporto per sviluppare programmi nel linguaggio di programmazione Java."
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:154 ../comps-el4.xml.in.h:47
+#: ../comps-f10.xml.in.h:155 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr ""
 "Supporto per eseguire programmi scritti nel linguaggio di programmazione "
 "Java."
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:155
+#: ../comps-f10.xml.in.h:156
 msgid "Swati Support"
 msgstr "Supporto per lo Swati"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:156
+#: ../comps-f10.xml.in.h:157
 msgid "Swedish Support"
 msgstr "Supporto per lo svedese"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:157 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
+#: ../comps-f10.xml.in.h:158 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "Strumenti di sistema"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:158
+#: ../comps-f10.xml.in.h:159
 msgid "Tagalog Support"
 msgstr "Supporto per il filippino"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:160
+#: ../comps-f10.xml.in.h:161
 msgid "Tamil Support"
 msgstr "Supporto per il tamil"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:161
+#: ../comps-f10.xml.in.h:162
 msgid "Telugu Support"
 msgstr "Supporto per il telegu"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:162 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
+#: ../comps-f10.xml.in.h:163 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "Internet text-based"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:163
+#: ../comps-f10.xml.in.h:164
 msgid "Thai Support"
 msgstr "Supporto per il thai"
 
@@ -774,52 +767,47 @@
 msgstr "L'ambiente di sviluppo integrato Eclipse"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:164 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
+#: ../comps-f10.xml.in.h:165 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr ""
 "Le applicazioni includono pacchetti per l'ufficio, programmi per "
 "visualizzare i PDF e altro."
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:165
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+#: ../comps-f10.xml.in.h:166
+msgid "The packages in this group are core libraries needed to develop applications."
 msgstr ""
 "I pacchetti di questo gruppo sono le principali librerie di sviluppo delle "
 "applicazioni."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:166 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
+#: ../comps-f10.xml.in.h:167 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
-msgstr ""
-"Questi pacchetti consentono di configurare un server di posta IMAP o SMTP."
+msgstr "Questi pacchetti consentono di configurare un server di posta IMAP o SMTP."
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:167
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+#: ../comps-f10.xml.in.h:168
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr ""
 "Questi pacchetti consentono di sviluppare applicazioni per il sistema X "
 "Window."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:168 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+#: ../comps-f10.xml.in.h:169 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr ""
 "Questi pacchetti sono d'aiuto quando si sviluppano applicazioni web o pagine "
 "web."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:169
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+#: ../comps-f10.xml.in.h:170
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
 "Questi pacchetti includono server basati sulla rete come ad esempio DHCP, "
 "Kerberos e NIS."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:170
+#: ../comps-f10.xml.in.h:171
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -828,18 +816,17 @@
 "telnet."
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:171
+#: ../comps-f10.xml.in.h:172
 msgid "These packages provide a virtualization environment."
 msgstr "Questi pacchetti forniscono un ambiente di virtualizzazione."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:172
+#: ../comps-f10.xml.in.h:173
 msgid "These packages provide compatibility with previous releases."
-msgstr ""
-"Questi pacchetti forniscono la compatibilit?? con le versioni precedenti."
+msgstr "Questi pacchetti forniscono la compatibilit?? con le versioni precedenti."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:173
+#: ../comps-f10.xml.in.h:174
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -848,7 +835,7 @@
 "caratteri ed i metodi di input."
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:174
+#: ../comps-f10.xml.in.h:175
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -857,17 +844,17 @@
 "convertirli in HTML, PDF, Postscript e testo."
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
+#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "Questi tool consentono di eseguire un Web server sul sistema."
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
+#: ../comps-f10.xml.in.h:177 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "Questi strumenti consentono di eseguire un server FTP sul sistema."
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:177 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
+#: ../comps-f10.xml.in.h:178 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -876,19 +863,19 @@
 "gcc, perl, python, ed i debugger."
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:178 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
+#: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "Questo gruppo consente di configurare il sistema come server news."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:179
+#: ../comps-f10.xml.in.h:180
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr ""
 "Questo gruppo contiene tutti gli strumenti per personalizzare la "
 "configurazione del server Red Hat."
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:180
+#: ../comps-f10.xml.in.h:181
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -897,12 +884,12 @@
 "di piccoli router/firewall, per esempio."
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
+#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "Questo gruppo include client grafici email, Web e chat."
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
+#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -911,14 +898,14 @@
 "matematiche e scientifiche, nonch?? la conversione di unit??."
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
+#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr ""
 "Questo gruppo include i pacchetti per la manipolazione e la scansione delle "
 "immagini."
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
+#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -927,7 +914,7 @@
 "applicazioni non richiedono il sistema X Window."
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
+#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -937,23 +924,21 @@
 "l'hardware di sistema."
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:186 ../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."
+#: ../comps-f10.xml.in.h:187 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr ""
 "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti "
 "armeni."
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:187 ../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."
+#: ../comps-f10.xml.in.h:188 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
+msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr ""
 "Questo gruppo ?? una collezione di strumenti per varie utilit?? specifiche "
 "hardware."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:188 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
+#: ../comps-f10.xml.in.h:189 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
 "client for connecting to SMB shares and tools to monitor network traffic."
@@ -963,15 +948,14 @@
 "monitorare il traffico di rete."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:189
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+#: ../comps-f10.xml.in.h:190
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
 "Questo gruppo di pacchetti consente di eseguire un server dei nomi DNS "
 "(BIND) sul sistema."
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:190
+#: ../comps-f10.xml.in.h:191
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -980,132 +964,132 @@
 "e MS Windows(tm)."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:191
+#: ../comps-f10.xml.in.h:192
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "Questo gruppo contiene pacchetti utili per l'utilizzo con MySQL."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:192
+#: ../comps-f10.xml.in.h:193
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "Questo gruppo include pacchetti utili per l'utilizzo con Postgresql."
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:193
+#: ../comps-f10.xml.in.h:194
 msgid "Tibetan Support"
 msgstr "Supporto per il tibetano"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:194
+#: ../comps-f10.xml.in.h:195
 msgid "Tonga Support"
 msgstr "Supporto per il tonga"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:195 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
+#: ../comps-f10.xml.in.h:196 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Strumenti ed utilit?? necessarie per un Fedora Packager"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:196
+#: ../comps-f10.xml.in.h:197
 msgid "Tsonga Support"
 msgstr "Supporto per il Tsonga"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:197
+#: ../comps-f10.xml.in.h:198
 msgid "Tswana Support"
 msgstr "Supporto per il tswana "
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:198
+#: ../comps-f10.xml.in.h:199
 msgid "Turkish Support"
 msgstr "Supporto per il turco"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:199
+#: ../comps-f10.xml.in.h:200
 msgid "Ukrainian Support"
 msgstr "Supporto per l'ucraino"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:200
+#: ../comps-f10.xml.in.h:201
 msgid "Urdu Support"
 msgstr "Supporto per lo urdu"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:202 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
+#: ../comps-f10.xml.in.h:203 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "Varie parti cuore del sistema."
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:203 ../comps-el5.xml.in.h:72
+#: ../comps-f10.xml.in.h:204 ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "Vari modi per rilassarsi e passare il tempo libero."
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:204
+#: ../comps-f10.xml.in.h:205
 msgid "Venda Support"
 msgstr "Supporto per il venda"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:205
+#: ../comps-f10.xml.in.h:206
 msgid "Vietnamese Support"
 msgstr "Supporto per il vietnamita"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:206
+#: ../comps-f10.xml.in.h:207
 msgid "Virtualization"
 msgstr "Virtualizzazione"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:201
-#: ../comps-f10.xml.in.h:208 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
+#: ../comps-f10.xml.in.h:209 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "Sviluppo Web"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:209 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
+#: ../comps-f10.xml.in.h:210 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "Server Web"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:210
+#: ../comps-f10.xml.in.h:211
 msgid "Welsh Support"
 msgstr "Supporto per il gallese"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:211 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
+#: ../comps-f10.xml.in.h:212 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "Window Managers"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:212
+#: ../comps-f10.xml.in.h:213
 msgid "Windows File Server"
 msgstr "File server Windows"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:213
+#: ../comps-f10.xml.in.h:214
 msgid "X Software Development"
 msgstr "Sviluppo del software X"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:214 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
+#: ../comps-f10.xml.in.h:215 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "Sistema X Window"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:215
+#: ../comps-f10.xml.in.h:216
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:216
+#: ../comps-f10.xml.in.h:217
 msgid "XFCE Software Development"
 msgstr "Sviluppo del software XFCE"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:217
+#: ../comps-f10.xml.in.h:218
 msgid "Xhosa Support"
 msgstr "Supporto per il Xhosa "
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:218
+#: ../comps-f10.xml.in.h:219
 msgid "Zulu Support"
 msgstr "Supporto per lo Zulu"
 
@@ -1173,13 +1157,13 @@
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR ?? l'ambiente desktop sviluppato per l'OLPC XO."
 
-#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:207
+#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:208
 msgid "Walloon Support"
 msgstr "Supporto per il walloon"
 
 #: ../comps-f10.xml.in.h:70
-msgid "Haskell"
-msgstr "Haskell"
+msgid "Haskell Development"
+msgstr "Sviluppo Haskell"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
@@ -1190,23 +1174,24 @@
 msgstr "Pacchetti dei metodi di input per l'input di testo internazionale."
 
 #: ../comps-f10.xml.in.h:108
-#, fuzzy
 msgid "Maithili Support"
-msgstr "Supporto per il marathi"
+msgstr "Supporto maithili"
 
 #: ../comps-f10.xml.in.h:115
-#, fuzzy
 msgid "Myanmar (Burmese) Support"
-msgstr "Supporto per il vietnamita"
+msgstr "Supporto myanmar (Burmese)"
 
-#: ../comps-f10.xml.in.h:159
+#: ../comps-f10.xml.in.h:153
+msgid "Support for developing programs in the Haskell programming language."
+msgstr "Supporto per sviluppare programmi nel linguaggio di programmazione Haskell."
+
+#: ../comps-f10.xml.in.h:160
 msgid "Tajik Support"
 msgstr "Supporto per il Tajik"
 
-#: ../comps-f10.xml.in.h:201
-#, fuzzy
+#: ../comps-f10.xml.in.h:202
 msgid "Uzbek Support"
-msgstr "Supporto per il ceco"
+msgstr "Supporto per lo uzbek"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1257,22 +1242,19 @@
 msgstr "Questo gruppo ?? una collezione di servers di rete per scopi specifici"
 
 #: ../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 ""
 "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti "
 "arabici."
 
 #: ../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 ""
 "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti "
 "ebraici."
 
 #: ../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 ""
 "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti "
 "giapponesi."
@@ -1282,73 +1264,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
-msgstr ""
-"Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti cechi."
-
-#~ msgid "British Support"
-#~ msgstr "Supporto per il britannico"
-
-#~ msgid "Cluster Storage"
-#~ msgstr "Cluster Storage"
-
-#~ msgid "Clustering Support."
-#~ msgstr "Supporto cluster."
-
-#~ msgid "Libraries for applications built on older releases."
-#~ msgstr "Librerie per applicazioni fatte su vecchie versioni."
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "Pacchetti miscellanei inclusi"
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "Pacchetti che forniscono supporto per gli storage dei cluster."
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "Pacchetti che forniscono supporto per GFS su nodo singolo."
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "Supporto per il GFS su nodo singolo"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr ""
-#~ "Questi pacchetti forniscono la compatibilit?? con le versioni precedenti."
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "Ambienti Java Runtime e kit di sviluppo"
-
-#~ msgid "Misc"
-#~ msgstr "Misc"
-
-#~ msgid "Misc packages"
-#~ msgstr "Pacchetti misc"
-
-#~ msgid "Multimedia"
-#~ msgstr "Multimedia"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "Applicazioni multimediali"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr ""
-#~ "Pacchetti che forniscono ulteriori funzionalit?? per Red Hat Enterprise "
-#~ "Linux"
-
-#~ msgid "Red Hat Enterprise Linux Supplementary"
-#~ msgstr "Supplementi Red Hat Enterprise Linux"
-
-#~ msgid ""
-#~ "Components used for high performance networking and clustering, such as "
-#~ "Infiniband and RDMA."
-#~ msgstr ""
-#~ "Componenti usati per il networking ad alte prestazioni ed il clustering, "
-#~ "come Infiniband e RDMA."
-
-#~ msgid "OpenFabrics Enterprise Distribution"
-#~ msgstr "OpenFabrics Enterprise Distribution"
+msgid "This group is a collection of tools and resources of Czech environments."
+msgstr "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti cechi."
 
-#~ msgid "Virtualization Support."
-#~ msgstr "Supporto per la virtualizzazione."



From claudiotomasoni at fedoraproject.org  Sun Sep 14 17:01:31 2008
From: claudiotomasoni at fedoraproject.org (Claudio Tomasoni)
Date: Sun, 14 Sep 2008 17:01:31 +0000 (UTC)
Subject: rpms/tennix/devel import.log,1.1,1.2
Message-ID: <20080914170131.5DFD970136@cvs1.fedora.phx.redhat.com>

Author: claudiotomasoni

Update of /cvs/pkgs/rpms/tennix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11598/devel

Modified Files:
	import.log 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tennix/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Sep 2008 18:43:37 -0000	1.1
+++ import.log	14 Sep 2008 17:01:00 -0000	1.2
@@ -1 +1,2 @@
 tennix-0_6_1-4_fc9:HEAD:tennix-0.6.1-4.fc9.src.rpm:1220985773
+tennix-0_6_1-4_fc9:HEAD:tennix-0.6.1-4.fc9.src.rpm:1221411616



From scop at fedoraproject.org  Sun Sep 14 17:28:55 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 14 Sep 2008 17:28:55 +0000 (UTC)
Subject: rpms/em8300/devel em8300.spec,1.22,1.23
Message-ID: <20080914172855.0884970136@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23134

Modified Files:
	em8300.spec 
Log Message:
* Sun Sep 14 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.17.1-2
- Adapt to a couple of different alsa/cards dir locations.



Index: em8300.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300/devel/em8300.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- em8300.spec	22 Aug 2008 17:43:10 -0000	1.22
+++ em8300.spec	14 Sep 2008 17:28:24 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           em8300
 Version:        0.17.1
-Release:        1%{?prever:.%{prever}}%{?dist}
+Release:        2%{?prever:.%{prever}}%{?dist}
 Summary:        DXR3/Hollywood Plus MPEG decoder card support tools
 
 Group:          Applications/System
@@ -16,9 +16,10 @@
 
 BuildRequires:  gtk2-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  alsa-lib
 #Requires:       em8300-kmod >= %{version}
 Requires:       udev
-Requires:       %{_sysconfdir}/alsa/cards
+Requires:       alsa-lib
 Requires:       %{_sysconfdir}/security/console.perms.d
 Requires(pre):  shadow-utils
 Provides:       em8300-kmod-common = %{version}-%{release}
@@ -52,7 +53,7 @@
 
 
 %build
-%configure --disable-dependency-tracking --with-alsa-dir=%{_sysconfdir}/alsa
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -77,6 +78,18 @@
 mv $RPM_BUILD_ROOT%{_datadir}/em8300/microcode_extract.pl \
   $RPM_BUILD_ROOT%{_bindir}/em8300-mc_ex
 
+cat /dev/null > %{name}.files
+for alsadir in %{_datadir}/alsa %{_sysconfdir}/alsa ; do
+    if [ -f "$RPM_BUILD_ROOT$alsadir/cards/EM8300.conf" ] ; then
+        echo "$alsadir/cards/EM8300.conf" > %{name}.files
+        break
+    fi
+done
+if [ ! -s %{name}.files ] ; then
+    echo "ERROR: EM8300.conf not installed in expected location"
+    exit 1
+fi
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,12 +113,11 @@
 :
 
 
-%files
+%files -f %{name}.files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README* modules/README-modoptions
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*-%{name}.perms
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules
-%config(noreplace) %{_sysconfdir}/alsa/cards/EM8300.conf
 %{_bindir}/em8300setup
 %{_mandir}/man1/em8300setup.1*
 
@@ -126,6 +138,9 @@
 
 
 %changelog
+* Sun Sep 14 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.17.1-2
+- Adapt to a couple of different alsa/cards dir locations.
+
 * Thu Aug 14 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.17.1-1
 - 0.17.1.
 



From pbrobinson at fedoraproject.org  Sun Sep 14 17:39:46 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 14 Sep 2008 17:39:46 +0000 (UTC)
Subject: rpms/opal/devel .cvsignore, 1.11, 1.12 opal.spec, 1.26, 1.27 sources,
	1.12, 1.13
Message-ID: <20080914173946.E69ED70136@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/opal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28196

Modified Files:
	.cvsignore opal.spec sources 
Log Message:
- opal 3.3.1 for ekiga 3 beta



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	18 Sep 2007 14:38:47 -0000	1.11
+++ .cvsignore	14 Sep 2008 17:39:16 -0000	1.12
@@ -1,8 +1 @@
-opal-2.2.3.tar.gz
-opal-2.2.4.tar.gz
-opal-2.2.5.tar.gz
-opal-2.2.6.tar.gz
-opal-2.2.7.tar.gz
-opal-2.2.8.tar.gz
-opal-2.2.10.tar.gz
-opal-2.2.11.tar.gz
+opal-3.3.1.tar.bz2


Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- opal.spec	11 Aug 2008 21:02:14 -0000	1.26
+++ opal.spec	14 Sep 2008 17:39:16 -0000	1.27
@@ -1,38 +1,44 @@
-Summary: Open Phone Abstraction Library
-Name: opal
-Version: 2.2.11
-Release: 5%{?dist}
-URL: http://www.openh323.org/
-Source0: http://www.ekiga.org/%{name}-%{version}.tar.gz
-License: MPLv1.0
-Group: System Environment/Libraries
-Requires: pwlib >= 1.10.10
-BuildRequires: pwlib-devel >= 1.10.10
-BuildRequires: openldap-devel
-BuildRequires: SDL-devel
-BuildRoot: %{_tmppath}/%{name}-root
-Obsoletes: openh323
+Name:		opal
+Summary:	Open Phone Abstraction Library
+Version:	3.3.1
+Release:	1%{?dist}
+URL:		http://www.opalvoip.org/
+Source0:	ftp://ftp.gnome.org/pub/gnome/sources/opal/3.3/%{name}-%{version}.tar.bz2
+License:	MPLv1.0
+Group:		System Environment/Libraries
+BuildRequires:	ptlib-devel >= 2.3.1
+BuildRequires:	openldap-devel
+BuildRequires:	openssl-devel
+BuildRequires:	SDL-devel
+BuildRequires:	libtheora-devel
+BuildRequires:	speex-devel
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Obsoletes:	openh323
 
 %description
 Open Phone Abstraction Library, implementation of the ITU H.323
 teleconferencing protocol, and successor of the openh323 library.
 
 %package devel
-Summary: Development package for opal
-Group: Development/Libraries
-Requires: opal = %{PACKAGE_VERSION}
-Requires: pwlib-devel >= 1.10.10
-Obsoletes: openh323-devel
+Summary:	Development package for opal
+Group:		Development/Libraries
+Requires:	opal = %{version}-%{release}
+Requires:	ptlib-devel >= 2.3.1
+Requires:	pkgconfig
+Obsoletes:	openh323-devel
+
 %description devel
-Static libraries and header files for development with opal.
+The opal-devel package includes the development libraries and 
+header files for opal.
 
 %prep
 %setup -q 
 
 %build
-%configure --enable-localspeex
+%configure --prefix=/usr
 
-make optshared OPTCCFLAGS="$RPM_OPT_FLAGS"
+make optshared OPTCCFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -40,6 +46,8 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 
 rm -f $RPM_BUILD_ROOT/%{_datadir}/opal/opal_inc.mak
+# Remove empty header from build
+rm -f $RPM_BUILD_ROOT/%{_includedir}/opal/sip/sdpcaps.h
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -51,14 +59,21 @@
 %defattr(-,root,root)
 %doc  mpl-1.0.htm
 %{_libdir}/*.so.*
+%{_libdir}/ptlib/plugins/codec/audio/*.so
+%{_libdir}/ptlib/plugins/codec/video/*.so
+%{_libdir}/ptlib/plugins/lid/*.so
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/*
 %{_datadir}/opal
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/opal.pc
 
 %changelog
+* Thu Sep 11 2008 Peter Robinson <pbrobinson at gmail.com> - 3.3.1-1
+- Update release to 3.3.1 for ekiga 3 beta
+
 * Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.2.11-5
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	18 Sep 2007 14:38:47 -0000	1.12
+++ sources	14 Sep 2008 17:39:16 -0000	1.13
@@ -1 +1 @@
-eb4a9c0c9ea93ec95c876aaeadf83936  opal-2.2.11.tar.gz
+6e7525b440c9fb2d68b8767996ab4a76  opal-3.3.1.tar.bz2



From pbrobinson at fedoraproject.org  Sun Sep 14 17:46:15 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 14 Sep 2008 17:46:15 +0000 (UTC)
Subject: rpms/ekiga/devel .cvsignore, 1.12, 1.13 ekiga.spec, 1.47,
	1.48 sources, 1.14, 1.15
Message-ID: <20080914174615.C0B6E70136@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31300

Modified Files:
	.cvsignore ekiga.spec sources 
Log Message:
- ekiga 3 beta 1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	13 Mar 2008 12:43:12 -0000	1.12
+++ .cvsignore	14 Sep 2008 17:45:45 -0000	1.13
@@ -1,7 +1 @@
-ekiga-2.0.3.tar.bz2
-ekiga-2.0.4.tar.gz
-ekiga-2.0.5.tar.gz
-ekiga-2.0.7.tar.gz
-ekiga-2.0.9.tar.gz
-ekiga-2.0.11.tar.gz
-ekiga-2.0.12.tar.gz
+ekiga-2.9.90.tar.bz2


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ekiga.spec	12 May 2008 19:28:22 -0000	1.47
+++ ekiga.spec	14 Sep 2008 17:45:45 -0000	1.48
@@ -1,45 +1,39 @@
-Summary: A Gnome based SIP/H323 teleconferencing application
-Name: ekiga
-Version: 2.0.12
-Release: 2%{?dist}
-URL: http://www.ekiga.org/
-Source0: http://download.gnome.org/sources/ekiga/2.0/%{name}-%{version}.tar.gz
-License: GPLv2+
-Group: Applications/Communications
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: pwlib >= 1.10.10
-Requires: opal >= 2.2.11
-Requires: GConf2 >= 1.2.1
-Requires: libgnomeui >= 2.0
-Requires: libgnome >= 2.0
-Requires: avahi >= 0.6.9
-Requires: avahi-glib >= 0.6.9
-Requires: evolution-data-server
-Requires(pre):    scrollkeeper
-BuildRequires: gtk2-devel >= 2.0.0
-BuildRequires: GConf2-devel >= 1.2.1
-BuildRequires: libgnomeui-devel >= 2.0
-BuildRequires: libgnome-devel >= 2.0
-BuildRequires: avahi-devel >= 0.6.9
-BuildRequires: avahi-glib-devel >= 0.6.9
-BuildRequires: openldap-devel
-BuildRequires: pwlib-devel >= 1.10.10
-BuildRequires: opal-devel >= 2.2.11
-BuildRequires: libxml2-devel >= 2.5.0
-BuildRequires: SDL-devel
-BuildRequires: intltool >= 0.22
-BuildRequires: pkgconfig
-BuildRequires: scrollkeeper
-BuildRequires: alsa-lib-devel
-BuildRequires: gettext
-BuildRequires: evolution-data-server-devel
-BuildRequires: gnome-doc-utils >= 0.3.2
-BuildRequires: desktop-file-utils
-BuildRequires: dbus-devel
-Requires(post): GConf2, scrollkeeper
-Requires(postun): scrollkeeper
-Obsoletes: gnomemeeting <= 1.2.3
-Provides: gnomemeeting
+Summary:	A Gnome based SIP/H323 teleconferencing application
+Name:		ekiga
+Version:	2.9.90
+Release:	1%{?dist}
+URL:		http://www.ekiga.org/
+Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/2.9/%{name}-%{version}.tar.bz2
+License:	GPLv2+
+Group:		Applications/Communications
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires:	ptlib >= 2.3.1
+Requires:	opal >= 3.3.1
+Requires:	evolution-data-server
+Requires:	GConf2, scrollkeeper
+BuildRequires:	gtk2-devel >= 2.12
+BuildRequires:	GConf2-devel >= 2.2.0
+BuildRequires:	libgnomeui-devel >= 2.0
+BuildRequires:	libgnome-devel >= 2.0
+BuildRequires:	avahi-devel >= 0.6.9
+BuildRequires:	avahi-glib-devel >= 0.6.9
+BuildRequires:	dbus-glib-devel >= 0.70
+BuildRequires:	openldap-devel
+BuildRequires:	ptlib-devel >= 2.3.1
+BuildRequires:	opal-devel >= 3.3.1
+BuildRequires:	libxml2-devel >= 2.5.0
+BuildRequires:	SDL-devel
+BuildRequires:	intltool >= 0.22
+BuildRequires:	pkgconfig
+BuildRequires:	scrollkeeper
+BuildRequires:	alsa-lib-devel
+BuildRequires:	gettext
+BuildRequires:	evolution-data-server-devel
+BuildRequires:	gnome-doc-utils >= 0.3.2
+BuildRequires:	desktop-file-utils
+BuildRequires:	libsigc++20-devel
+Obsoletes:	gnomemeeting
 
 %description
 Ekiga is a tool to communicate with video and audio over the internet.
@@ -50,8 +44,8 @@
 
 %build
 CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC"
-%configure --disable-scrollkeeper  --enable-dbus
-make
+%configure --disable-scrollkeeper 
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -87,17 +81,20 @@
 %{_bindir}/ekiga
 %{_bindir}/ekiga-helper
 %{_bindir}/ekiga-config-tool
-%{_libdir}/bonobo/servers/ekiga.server
-%{_datadir}/dbus-1/services/net.ekiga.*.service
 %{_datadir}/applications/gnome-ekiga.desktop
+%{_datadir}/pixmaps/ekiga
 %{_datadir}/gnome/help/ekiga
 %{_datadir}/omf/ekiga
-%{_datadir}/pixmaps/*
 %{_datadir}/man/*/*
 %{_datadir}/sounds/ekiga
+%{_datadir}/dbus-1/services/org.ekiga.*
+%{_datadir}/icons/hicolor/*/apps/ekiga.png
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Thu Sep 11 2008 Peter Robinson <pbrobinson at gmail.com> - 2.9.90-1
+- First beta of ekiga 3
+
 * Mon May 12 2008 Paul W. Frields <stickster at gmail.com> - 2.0.12-2
 - Rebuild against new opal (#441202)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	13 Mar 2008 12:43:12 -0000	1.14
+++ sources	14 Sep 2008 17:45:45 -0000	1.15
@@ -1 +1 @@
-4df27d7715233984013fb9728db15ce8  ekiga-2.0.12.tar.gz
+306982219c94f4866bbd0a5873da7b8a  ekiga-2.9.90.tar.bz2



From kyle at fedoraproject.org  Sun Sep 14 18:15:45 2008
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sun, 14 Sep 2008 18:15:45 +0000 (UTC)
Subject: rpms/kernel/F-9
	linux-2.6-wireless-rt2500pci-restoring-missing-line.patch, NONE,
	1.1 kernel.spec, 1.766, 1.767
Message-ID: <20080914181545.D52A370136@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11492

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-wireless-rt2500pci-restoring-missing-line.patch 
Log Message:
* Sun Sep 14 2008 Kyle McMartin <kyle at redhat.com> 2.6.26.5-40
- wireless: rt2500pci: restoring missing line


linux-2.6-wireless-rt2500pci-restoring-missing-line.patch:

--- NEW FILE linux-2.6-wireless-rt2500pci-restoring-missing-line.patch ---
>From bf4634afd8bb72936d2d56425ec792ca1bfa92a2 Mon Sep 17 00:00:00 2001
From: Peter Chubb <peterc at gelato.unsw.edu.au>
Date: Thu, 31 Jul 2008 10:56:34 +1000
Subject: rt2500pci: restoring missing line

In kernel version 2.6.26-rc9 my wireless LAN card worked; but in the
released 2.6.26, my RaLink rt2500 card wouldn't associate.

Git-bisect led me to this patch:

	61486e0f68d1f8966c09b734566a187d42d65c54
	rt2x00: Remove ieee80211_tx_control argument from write_tx_desc()

I believe that there is a problem with that patch --- it
(inadvertantly) removes an extra line of code, that used to set the
DATABYTE_COUNT field.

This patch reinstates that line, and with it my card works again.

Signed-off-by: Peter Chubb <peterc at gelato.unsw.edu.au>
Acked-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
 drivers/net/wireless/rt2x00/rt2500pci.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index aa6dfb8..181a146 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1220,6 +1220,7 @@ static void rt2500pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
 	rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->ifs);
 	rt2x00_set_field32(&word, TXD_W0_RETRY_MODE,
 			   test_bit(ENTRY_TXD_RETRY_MODE, &txdesc->flags));
+	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, skb->len);
 	rt2x00_set_field32(&word, TXD_W0_CIPHER_ALG, CIPHER_NONE);
 	rt2x00_desc_write(txd, 0, word);
 }
-- 
1.5.5.1



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.766
retrieving revision 1.767
diff -u -r1.766 -r1.767
--- kernel.spec	14 Sep 2008 01:57:25 -0000	1.766
+++ kernel.spec	14 Sep 2008 18:15:14 -0000	1.767
@@ -648,6 +648,7 @@
 #Patch682: linux-2.6-wireless-fixups.patch
 Patch683: linux-2.6-wireless-stable-backports.patch
 Patch685: linux-2.6-rt2500usb-fix.patch
+Patch686: linux-2.6-wireless-rt2500pci-restoring-missing-line.patch
 Patch690: linux-2.6-at76.patch
 
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
@@ -1231,6 +1232,9 @@
 # fix for long-standing rt2500usb issues
 ApplyPatch linux-2.6-rt2500usb-fix.patch
 
+# bf4634afd8bb72936d2d56425ec792ca1bfa92a2
+ApplyPatch linux-2.6-wireless-rt2500pci-restoring-missing-line.patch
+
 # implement smarter atime updates support.
 ApplyPatch linux-2.6-smarter-relatime.patch
 
@@ -1862,6 +1866,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Sun Sep 14 2008 Kyle McMartin <kyle at redhat.com> 2.6.26.5-40
+- wireless: rt2500pci: restoring missing line
+
 * Sat Sep 13 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-39
 - libata: fix DMA mode mistmatches
 - libata: interpret the LBA28 spec properly



From phuang at fedoraproject.org  Sun Sep 14 18:19:26 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Sun, 14 Sep 2008 18:19:26 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.9, 1.10 ibus.spec, 1.12, 1.13 sources,
	1.10, 1.11
Message-ID: <20080914181926.9A2BF70136@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12927

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 0.1.1.20080914


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	8 Sep 2008 08:04:39 -0000	1.9
+++ .cvsignore	14 Sep 2008 18:18:56 -0000	1.10
@@ -1 +1 @@
-ibus-0.1.1.20080908.tar.gz
+ibus-0.1.1.20080914.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ibus.spec	8 Sep 2008 08:04:39 -0000	1.12
+++ ibus.spec	14 Sep 2008 18:18:56 -0000	1.13
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define mod_path ibus-0.1
 Name:       ibus
-Version:    0.1.1.20080908
+Version:    0.1.1.20080914
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -120,6 +120,9 @@
 %{_libdir}/qt4/plugins/inputmethods/libibus.so
 
 %changelog
+* Mon Sep 15 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080914-1
+- Update to 0.1.1.20080914.
+
 * Mon Sep 08 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080908-1
 - Update to 0.1.1.20080908.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	8 Sep 2008 08:04:39 -0000	1.10
+++ sources	14 Sep 2008 18:18:56 -0000	1.11
@@ -1 +1 @@
-610aedfc52826222a61420592bb1c22e  ibus-0.1.1.20080908.tar.gz
+00cbad394930d17bce4df99e514fd7fd  ibus-0.1.1.20080914.tar.gz



From phuang at fedoraproject.org  Sun Sep 14 18:29:37 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Sun, 14 Sep 2008 18:29:37 +0000 (UTC)
Subject: rpms/ibus/F-9 .cvsignore,1.6,1.7 ibus.spec,1.8,1.9 sources,1.8,1.9
Message-ID: <20080914182937.CC3F170136@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16411

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 0.1.1.20080914


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Sep 2008 08:13:47 -0000	1.6
+++ .cvsignore	14 Sep 2008 18:29:07 -0000	1.7
@@ -1 +1 @@
-ibus-0.1.1.20080908.tar.gz
+ibus-0.1.1.20080914.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/ibus.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ibus.spec	8 Sep 2008 08:13:47 -0000	1.8
+++ ibus.spec	14 Sep 2008 18:29:07 -0000	1.9
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define mod_path ibus-0.1
 Name:       ibus
-Version:    0.1.1.20080908
+Version:    0.1.1.20080914
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -120,6 +120,9 @@
 %{_libdir}/qt4/plugins/inputmethods/libibus.so
 
 %changelog
+* Mon Sep 15 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080914-1
+- Update to 0.1.1.20080914.
+
 * Mon Sep 08 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080908-1
 - Update to 0.1.1.20080908.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Sep 2008 08:13:47 -0000	1.8
+++ sources	14 Sep 2008 18:29:07 -0000	1.9
@@ -1 +1 @@
-610aedfc52826222a61420592bb1c22e  ibus-0.1.1.20080908.tar.gz
+00cbad394930d17bce4df99e514fd7fd  ibus-0.1.1.20080914.tar.gz



From jwrdegoede at fedoraproject.org  Sun Sep 14 19:17:21 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 14 Sep 2008 19:17:21 +0000 (UTC)
Subject: rpms/lostlabyrinth-graphics/devel .cvsignore, 1.2,
	1.3 lostlabyrinth-graphics.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080914191721.3195770136@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lostlabyrinth-graphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29475

Modified Files:
	.cvsignore lostlabyrinth-graphics.spec sources 
Log Message:
* Sun Sep 14 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.1-1
- New upstream version 3.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lostlabyrinth-graphics/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jun 2008 10:07:18 -0000	1.2
+++ .cvsignore	14 Sep 2008 19:16:50 -0000	1.3
@@ -1 +1 @@
-resources.tar.gz
+resources-20080914.tar.gz


Index: lostlabyrinth-graphics.spec
===================================================================
RCS file: /cvs/extras/rpms/lostlabyrinth-graphics/devel/lostlabyrinth-graphics.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lostlabyrinth-graphics.spec	18 Jun 2008 10:07:18 -0000	1.1
+++ lostlabyrinth-graphics.spec	14 Sep 2008 19:16:50 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           lostlabyrinth-graphics
-Version:        2.9.0
-Release:        2%{?dist}
+Version:        3.2.1
+Release:        1%{?dist}
 Summary:        Lost Labyrinth graphics
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.lostlabyrinth.com/
-# <sigh> not versioned, need to check if there is a newer version each release
-Source0:        http://www.lostlabyrinth.com/download/resources.tar.gz
+# no URL as the upstream provided tarballs are obsolete, instead we use svn
+Source0:        resources-20080914.tar.gz
 Source1:        license-clarification.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -27,12 +27,14 @@
 
 
 %prep
-%setup -q -n tiles
+%setup -c -q
 cp -a %{SOURCE1} .
 
 
 %build
+pushd tiles
 lostlabyrinth_pack_graphics
+popd
 
 
 %install
@@ -52,6 +54,9 @@
 
 
 %changelog
+* Sun Sep 14 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.1-1
+- New upstream version 3.2.1
+
 * Sat May 31 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.9.0-2
 - Add a text file clarifying the Lost Labyrinth license
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lostlabyrinth-graphics/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jun 2008 10:07:18 -0000	1.2
+++ sources	14 Sep 2008 19:16:50 -0000	1.3
@@ -1 +1 @@
-a12b760e4aa4c1174ac45d6a42d10ca9  resources.tar.gz
+373bb94a0c45a545695447e218d1a3be  resources-20080914.tar.gz



From jwrdegoede at fedoraproject.org  Sun Sep 14 19:18:25 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 14 Sep 2008 19:18:25 +0000 (UTC)
Subject: rpms/lostlabyrinth/devel .cvsignore, 1.3, 1.4 lostlabyrinth.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20080914191825.0CA5E70136@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lostlabyrinth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29918

Modified Files:
	.cvsignore lostlabyrinth.spec sources 
Log Message:
* Sun Sep 14 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.1-1
- New upstream release 3.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lostlabyrinth/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Jul 2008 21:18:30 -0000	1.3
+++ .cvsignore	14 Sep 2008 19:17:54 -0000	1.4
@@ -1,2 +1,2 @@
-labysource_3.0.2.tar.gz
-lostlabyrinth-docs-3.0.2.tar.gz
+labysource_3.2.1.tar.gz
+lostlabyrinth-docs-3.2.1.tar.gz


Index: lostlabyrinth.spec
===================================================================
RCS file: /cvs/extras/rpms/lostlabyrinth/devel/lostlabyrinth.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lostlabyrinth.spec	30 Jul 2008 21:18:30 -0000	1.2
+++ lostlabyrinth.spec	14 Sep 2008 19:17:54 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           lostlabyrinth 
-Version:        3.0.2
+Version:        3.2.1
 Release:        1%{?dist}
 Summary:        Lost Labyrinth is a coffeebreak dungeon crawling game
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.lostlabyrinth.com/
-Source0:        http://www.lostlabyrinth.com/download/labysource_%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/lostlaby/labysource_%{version}.tar.gz
 # This are the docs taken from one of the binary releases as they are not
 # shipped with the sources nor with the data tarbals
 Source1:        lostlabyrinth-docs-%{version}.tar.gz
@@ -14,8 +14,8 @@
 Source4:        %{name}.png
 Source5:        license-clarification.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  elice >= 0.289, desktop-file-utils
-Requires:       lostlabyrinth-graphics = 2.9.0, lostlabyrinth-sounds = 2.5.2
+BuildRequires:  elice >= 0.313, desktop-file-utils
+Requires:       lostlabyrinth-graphics = 3.2.1, lostlabyrinth-sounds = 3.2.1
 Requires:       hicolor-icon-theme
 
 %description
@@ -36,9 +36,10 @@
 
 %build
 elice laby.pb > laby.cpp
+elice $RPM_OPT_FLAGS laby.pb -o %{name}.bin
 # "-g" should really be $RPM_OPT_FLAGS, but this fails due to rh bug 448273
-g++ -g -I/usr/include/SDL -o %{name}.bin laby.cpp \
-  -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image -lSDL_gfx
+# g++ -g -I/usr/include/SDL -o %{name}.bin laby.cpp \
+#   -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image -lSDL_gfx
 
 
 %install
@@ -91,6 +92,9 @@
 
 
 %changelog
+* Sun Sep 14 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.1-1
+- New upstream release 3.2.1
+
 * Wed Jul 30 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0.2-1
 - New upstream release 3.0.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lostlabyrinth/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Jul 2008 21:18:30 -0000	1.3
+++ sources	14 Sep 2008 19:17:54 -0000	1.4
@@ -1,2 +1,2 @@
-edd874fab768ab4edf43cabddd1dc10c  labysource_3.0.2.tar.gz
-464a9b03611a646a3efb70dbc2367ffe  lostlabyrinth-docs-3.0.2.tar.gz
+454767fc006c4c3032dec9b14a0a987b  labysource_3.2.1.tar.gz
+1a0183f7107e1c6041b1c95b1799f6a3  lostlabyrinth-docs-3.2.1.tar.gz



From jwrdegoede at fedoraproject.org  Sun Sep 14 19:18:33 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 14 Sep 2008 19:18:33 +0000 (UTC)
Subject: rpms/lostlabyrinth-sounds/devel lostlabyrinth-sounds.spec,1.1,1.2
Message-ID: <20080914191833.A15F370136@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lostlabyrinth-sounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30019

Modified Files:
	lostlabyrinth-sounds.spec 
Log Message:
* Sun Sep 14 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.1-1
- Same old sounds as from the 2.5.2 release, but now packaged with the new
  3.2.1 sound packer



Index: lostlabyrinth-sounds.spec
===================================================================
RCS file: /cvs/extras/rpms/lostlabyrinth-sounds/devel/lostlabyrinth-sounds.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lostlabyrinth-sounds.spec	18 Jun 2008 10:03:39 -0000	1.1
+++ lostlabyrinth-sounds.spec	14 Sep 2008 19:18:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           lostlabyrinth-sounds
-Version:        2.5.2
-Release:        2%{?dist}
+Version:        3.2.1
+Release:        1%{?dist}
 Summary:        Lost Labyrinth sounds
 Group:          Amusements/Games
 License:        GPLv2+
@@ -27,7 +27,7 @@
 
 
 %prep
-%setup -q -n sounds_%{version}
+%setup -q -n sounds_2.5.2
 cp -a %{SOURCE1} .
 
 
@@ -40,7 +40,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/lostlabyrinth
-install -m 644 sounds/sounds.pak $RPM_BUILD_ROOT/%{_datadir}/lostlabyrinth
+install -m 644 sounds.pak $RPM_BUILD_ROOT/%{_datadir}/lostlabyrinth
 
 
 %clean
@@ -54,6 +54,10 @@
 
 
 %changelog
+* Sun Sep 14 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.1-1
+- Same old sounds as from the 2.5.2 release, but now packaged with the new
+  3.2.1 sound packer
+
 * Sat May 31 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.5.2-2
 - Add a text file clarifying the Lost Labyrinth license
 



From anyremote at fedoraproject.org  Sun Sep 14 20:03:00 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Sun, 14 Sep 2008 20:03:00 +0000 (UTC)
Subject: rpms/anyremote2html/devel anyremote2html.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080914200300.8679970136@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote2html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9133/devel

Modified Files:
	.cvsignore sources 
Added Files:
	anyremote2html.spec import.log 
Log Message:
build


--- NEW FILE anyremote2html.spec ---
Summary: WEB interface for anyRemote
Name: anyremote2html
Version: 0.5.2.2
Release: 1
License: GPLv2+
Group: Applications/System
Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
Requires:python >= 2.4, anyremote >= 4.5 
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://anyremote.sourceforge.net/
BuildArch: noarch

%description
WEB interface for anyRemote - http://anyremote.sourceforge.net/ - remote 
control software through bluetooth, IR or TCP/IP connection. anyRemote2html 
acts as HTTP server and translates anyRemote commands to HTML.

%prep
%setup -q

%build
%configure

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT
  
%files
%defattr(-,root,root,-)
%{_datadir}/pixmaps/%{name}
%{_bindir}/%{name}
%{_defaultdocdir}/%{name}


--- NEW FILE import.log ---
anyremote2html-0_5_2_2-1:HEAD:anyremote2html-0.5.2.2-1.src.rpm:1221422490


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2008 10:25:54 -0000	1.1
+++ .cvsignore	14 Sep 2008 20:02:30 -0000	1.2
@@ -0,0 +1 @@
+anyremote2html-0.5.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 10:25:54 -0000	1.1
+++ sources	14 Sep 2008 20:02:30 -0000	1.2
@@ -0,0 +1 @@
+3daa03b6bbe423839498163ac86f075c  anyremote2html-0.5.2.2.tar.gz



From anyremote at fedoraproject.org  Sun Sep 14 20:03:13 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Sun, 14 Sep 2008 20:03:13 +0000 (UTC)
Subject: rpms/anyremote2html/F-8 anyremote2html.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080914200313.DB98070136@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote2html/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9238/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	anyremote2html.spec import.log 
Log Message:
build


--- NEW FILE anyremote2html.spec ---
Summary: WEB interface for anyRemote
Name: anyremote2html
Version: 0.5.2.2
Release: 1
License: GPLv2+
Group: Applications/System
Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
Requires:python >= 2.4, anyremote >= 4.5 
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://anyremote.sourceforge.net/
BuildArch: noarch

%description
WEB interface for anyRemote - http://anyremote.sourceforge.net/ - remote 
control software through bluetooth, IR or TCP/IP connection. anyRemote2html 
acts as HTTP server and translates anyRemote commands to HTML.

%prep
%setup -q

%build
%configure

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT
  
%files
%defattr(-,root,root,-)
%{_datadir}/pixmaps/%{name}
%{_bindir}/%{name}
%{_defaultdocdir}/%{name}


--- NEW FILE import.log ---
anyremote2html-0_5_2_2-1:F-8:anyremote2html-0.5.2.2-1.src.rpm:1221422516


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2008 10:25:54 -0000	1.1
+++ .cvsignore	14 Sep 2008 20:02:43 -0000	1.2
@@ -0,0 +1 @@
+anyremote2html-0.5.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 10:25:54 -0000	1.1
+++ sources	14 Sep 2008 20:02:43 -0000	1.2
@@ -0,0 +1 @@
+3daa03b6bbe423839498163ac86f075c  anyremote2html-0.5.2.2.tar.gz



From pbrobinson at fedoraproject.org  Sun Sep 14 20:03:43 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 14 Sep 2008 20:03:43 +0000 (UTC)
Subject: rpms/ekiga/devel ekiga.spec,1.48,1.49
Message-ID: <20080914200343.3A98270136@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9336

Modified Files:
	ekiga.spec 
Log Message:
- rawhide build fixes



Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ekiga.spec	14 Sep 2008 17:45:45 -0000	1.48
+++ ekiga.spec	14 Sep 2008 20:03:12 -0000	1.49
@@ -1,7 +1,7 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
 Version:	2.9.90
-Release:	1%{?dist}
+Release:	2%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/2.9/%{name}-%{version}.tar.bz2
 License:	GPLv2+
@@ -23,6 +23,7 @@
 BuildRequires:	ptlib-devel >= 2.3.1
 BuildRequires:	opal-devel >= 3.3.1
 BuildRequires:	libxml2-devel >= 2.5.0
+BuildRequires:	libXv-devel
 BuildRequires:	SDL-devel
 BuildRequires:	intltool >= 0.22
 BuildRequires:	pkgconfig
@@ -92,6 +93,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Sun Sep 14 2008 Peter Robinson <pbrobinson at gmail.com> - 2.9.90-2
+- rawhide build fixes
+
 * Thu Sep 11 2008 Peter Robinson <pbrobinson at gmail.com> - 2.9.90-1
 - First beta of ekiga 3
 



From anyremote at fedoraproject.org  Sun Sep 14 20:04:06 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Sun, 14 Sep 2008 20:04:06 +0000 (UTC)
Subject: rpms/anyremote2html/F-9 anyremote2html.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080914200406.178E570136@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote2html/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9716/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	anyremote2html.spec import.log 
Log Message:
build


--- NEW FILE anyremote2html.spec ---
Summary: WEB interface for anyRemote
Name: anyremote2html
Version: 0.5.2.2
Release: 1
License: GPLv2+
Group: Applications/System
Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
Requires:python >= 2.4, anyremote >= 4.5 
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://anyremote.sourceforge.net/
BuildArch: noarch

%description
WEB interface for anyRemote - http://anyremote.sourceforge.net/ - remote 
control software through bluetooth, IR or TCP/IP connection. anyRemote2html 
acts as HTTP server and translates anyRemote commands to HTML.

%prep
%setup -q

%build
%configure

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT
  
%files
%defattr(-,root,root,-)
%{_datadir}/pixmaps/%{name}
%{_bindir}/%{name}
%{_defaultdocdir}/%{name}


--- NEW FILE import.log ---
anyremote2html-0_5_2_2-1:F-9:anyremote2html-0.5.2.2-1.src.rpm:1221422534


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2008 10:25:54 -0000	1.1
+++ .cvsignore	14 Sep 2008 20:03:35 -0000	1.2
@@ -0,0 +1 @@
+anyremote2html-0.5.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2008 10:25:54 -0000	1.1
+++ sources	14 Sep 2008 20:03:35 -0000	1.2
@@ -0,0 +1 @@
+3daa03b6bbe423839498163ac86f075c  anyremote2html-0.5.2.2.tar.gz



From anyremote at fedoraproject.org  Sun Sep 14 20:09:15 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Sun, 14 Sep 2008 20:09:15 +0000 (UTC)
Subject: rpms/anyremote2html/F-9 anyremote2html.spec, 1.1, 1.2 import.log,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080914200915.4ED1870136@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote2html/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11515/F-9

Modified Files:
	anyremote2html.spec import.log sources 
Log Message:
build


Index: anyremote2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/F-9/anyremote2html.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anyremote2html.spec	14 Sep 2008 20:03:35 -0000	1.1
+++ anyremote2html.spec	14 Sep 2008 20:08:44 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: WEB interface for anyRemote
 Name: anyremote2html
 Version: 0.5.2.2
-Release: 1
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
@@ -23,11 +23,43 @@
 
 %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
+
+%changelog
+
+* Fri Sep 11 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.2.2-1  
+- Corrected autotools issue.  
+
+* Fri Sep 5 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.2.1-1  
+- Corrected spec file.  
+
+* Thu Sep 4 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.2-3  
+- Corrected spec file.  
+
+* Sun Aug 24 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.2-2  
+- Corrected files permissions and specs.  
+
+* Wed Aug 20 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.2  
+- Corrected files permissions and specs.  
+
+* Sun May 25 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.1  
+- Change default web port to 5550.   
+  
+* Mon May 19 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5  
+- Better integration with anyRemote.  
+  
+* Tue Apr 08 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.4  
+- Minor bugfix  
   
+* Tue Mar 04 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.3  
+- Several icons were added. Use autotools to create makefile.  
+  
+* Thu Aug 23 2007 Mikhail Fedotov <anyremote at mail.ru> - 0.2  
+- Initial release
+
 %files
 %defattr(-,root,root,-)
 %{_datadir}/pixmaps/%{name}


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Sep 2008 20:03:35 -0000	1.1
+++ import.log	14 Sep 2008 20:08:44 -0000	1.2
@@ -1 +1,2 @@
 anyremote2html-0_5_2_2-1:F-9:anyremote2html-0.5.2.2-1.src.rpm:1221422534
+anyremote2html-0_5_2_2-2_fc9:F-9:anyremote2html-0.5.2.2-2.fc9.src.rpm:1221422875


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2008 20:03:35 -0000	1.2
+++ sources	14 Sep 2008 20:08:44 -0000	1.3
@@ -1 +1 @@
-3daa03b6bbe423839498163ac86f075c  anyremote2html-0.5.2.2.tar.gz
+73b189accc4bd494fa356a5eb56cfc9b  anyremote2html-0.5.2.2.tar.gz



From anyremote at fedoraproject.org  Sun Sep 14 20:09:21 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Sun, 14 Sep 2008 20:09:21 +0000 (UTC)
Subject: rpms/anyremote2html/devel anyremote2html.spec, 1.1, 1.2 import.log, 
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080914200921.F24CF70136@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote2html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11565/devel

Modified Files:
	anyremote2html.spec import.log sources 
Log Message:
build


Index: anyremote2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/devel/anyremote2html.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anyremote2html.spec	14 Sep 2008 20:02:30 -0000	1.1
+++ anyremote2html.spec	14 Sep 2008 20:08:51 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: WEB interface for anyRemote
 Name: anyremote2html
 Version: 0.5.2.2
-Release: 1
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
@@ -23,11 +23,43 @@
 
 %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
+
+%changelog
+
+* Fri Sep 11 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.2.2-1  
+- Corrected autotools issue.  
+
+* Fri Sep 5 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.2.1-1  
+- Corrected spec file.  
+
+* Thu Sep 4 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.2-3  
+- Corrected spec file.  
+
+* Sun Aug 24 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.2-2  
+- Corrected files permissions and specs.  
+
+* Wed Aug 20 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.2  
+- Corrected files permissions and specs.  
+
+* Sun May 25 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.1  
+- Change default web port to 5550.   
+  
+* Mon May 19 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5  
+- Better integration with anyRemote.  
+  
+* Tue Apr 08 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.4  
+- Minor bugfix  
   
+* Tue Mar 04 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.3  
+- Several icons were added. Use autotools to create makefile.  
+  
+* Thu Aug 23 2007 Mikhail Fedotov <anyremote at mail.ru> - 0.2  
+- Initial release
+
 %files
 %defattr(-,root,root,-)
 %{_datadir}/pixmaps/%{name}


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Sep 2008 20:02:30 -0000	1.1
+++ import.log	14 Sep 2008 20:08:51 -0000	1.2
@@ -1 +1,2 @@
 anyremote2html-0_5_2_2-1:HEAD:anyremote2html-0.5.2.2-1.src.rpm:1221422490
+anyremote2html-0_5_2_2-2_fc9:HEAD:anyremote2html-0.5.2.2-2.fc9.src.rpm:1221422858


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2008 20:02:30 -0000	1.2
+++ sources	14 Sep 2008 20:08:51 -0000	1.3
@@ -1 +1 @@
-3daa03b6bbe423839498163ac86f075c  anyremote2html-0.5.2.2.tar.gz
+73b189accc4bd494fa356a5eb56cfc9b  anyremote2html-0.5.2.2.tar.gz



From pbrobinson at fedoraproject.org  Sun Sep 14 20:18:33 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 14 Sep 2008 20:18:33 +0000 (UTC)
Subject: rpms/ekiga/devel ekiga.spec,1.49,1.50
Message-ID: <20080914201833.7315570136@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14024

Modified Files:
	ekiga.spec 
Log Message:
- more rawhide build fixes



Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ekiga.spec	14 Sep 2008 20:03:12 -0000	1.49
+++ ekiga.spec	14 Sep 2008 20:18:03 -0000	1.50
@@ -1,7 +1,7 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
 Version:	2.9.90
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/2.9/%{name}-%{version}.tar.bz2
 License:	GPLv2+
@@ -20,6 +20,7 @@
 BuildRequires:	avahi-glib-devel >= 0.6.9
 BuildRequires:	dbus-glib-devel >= 0.70
 BuildRequires:	openldap-devel
+BuildRequires:	openssl-devel
 BuildRequires:	ptlib-devel >= 2.3.1
 BuildRequires:	opal-devel >= 3.3.1
 BuildRequires:	libxml2-devel >= 2.5.0
@@ -93,6 +94,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Sun Sep 14 2008 Peter Robinson <pbrobinson at gmail.com> - 2.9.90-3
+- more rawhide build fixes
+
 * Sun Sep 14 2008 Peter Robinson <pbrobinson at gmail.com> - 2.9.90-2
 - rawhide build fixes
 



From jwrdegoede at fedoraproject.org  Sun Sep 14 20:24:50 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 14 Sep 2008 20:24:50 +0000 (UTC)
Subject: rpms/elice/devel .cvsignore, 1.3, 1.4 elice.spec, 1.2, 1.3 sources, 
	1.3, 1.4
Message-ID: <20080914202450.CB39F70136@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/elice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15990

Modified Files:
	.cvsignore elice.spec sources 
Log Message:
* Sun Sep 14 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.313-1
- New upstream release 0.313



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/elice/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Jul 2008 21:15:23 -0000	1.3
+++ .cvsignore	14 Sep 2008 20:24:19 -0000	1.4
@@ -1 +1,2 @@
-elice-0.289.tar.gz
+elice-0.313.tar.gz
+labytools-20080914.tar.gz


Index: elice.spec
===================================================================
RCS file: /cvs/extras/rpms/elice/devel/elice.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- elice.spec	30 Jul 2008 21:15:23 -0000	1.2
+++ elice.spec	14 Sep 2008 20:24:20 -0000	1.3
@@ -1,11 +1,14 @@
 Name:           elice
-Version:        0.289
+Version:        0.313
 Release:        1%{?dist}
 Summary:        Elice is a PureBasic to C++ translator / compiler
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://clueonic.org/elice/archive/
 Source0:        http://clueonic.org/elice/archive/elice-%{version}.tar.gz
+# Tools needed to pack lostlabyrinth resources, traditionaly part of elice
+# These can now only be found in lostlaby svn
+Source1:        labytools-20080914.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ruby ruby-racc
 Requires:       ruby(abi) = 1.8
@@ -21,28 +24,31 @@
 
 
 %prep
-%setup -q
-# remove included prebuild elice binary
-rm elice
+%setup -c -q -a 1
 
 
 %build
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %{name} buildlaby/pack_sounds \
-  buildlaby/pack_graphics
+pushd %{name}-%{version}
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %{name} buildlaby/PackerGraphics \
+  buildlaby/PackerSound
+popd
 
 
 %check
+pushd %{name}-%{version}
 make check
+popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
-install -m 755 buildlaby/pack_sounds \
+pushd %{name}-%{version}
+make install prefix=%{_prefix} DESTDIR=$RPM_BUILD_ROOT
+install -m 755 buildlaby/PackerSound \
   $RPM_BUILD_ROOT%{_bindir}/lostlabyrinth_pack_sounds
-install -m 755 buildlaby/pack_graphics \
+install -m 755 buildlaby/PackerGraphics \
   $RPM_BUILD_ROOT%{_bindir}/lostlabyrinth_pack_graphics
+popd
 
 
 %clean
@@ -51,12 +57,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING GPL-2 PACKFORMAT
+%doc %{_docdir}/%{name}
 %{_bindir}/%{name}
 %{_bindir}/lostlabyrinth_pack_*
+%{_mandir}/man1/%{name}.1.gz
 
 
 %changelog
+* Sun Sep 14 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.313-1
+- New upstream release 0.313
+
 * Wed Jul 30 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.289-1
 - New upstream release 0.289
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/elice/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Jul 2008 21:15:23 -0000	1.3
+++ sources	14 Sep 2008 20:24:20 -0000	1.4
@@ -1 +1,2 @@
-9b7e24b97689417069c2099123613b03  elice-0.289.tar.gz
+b17209d9bd04f0d2850ade7d2b58bc7c  elice-0.313.tar.gz
+fbceec0a5b0f4dd24f2dd699444142a8  labytools-20080914.tar.gz



From transif at fedoraproject.org  Sun Sep 14 20:27:28 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Sun, 14 Sep 2008 20:27:28 +0000 (UTC)
Subject: comps/po pt_BR.po,1.19,1.20
Message-ID: <20080914202728.C036A70136@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17041/po

Modified Files:
	pt_BR.po 
Log Message:
    2008-09-14  Igor Pires Soares <igorsoares at gmail.com> (via
igor at fedoraproject.org)
    
      * po/pt_BR.po: Updated Brazilian Portuguese translation
    



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.19 -r 1.20 pt_BR.po
Index: pt_BR.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pt_BR.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pt_BR.po	10 Sep 2008 22:57:57 -0000	1.19
+++ pt_BR.po	14 Sep 2008 20:26:57 -0000	1.20
@@ -19,7 +19,7 @@
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-10 18:57-0400\n"
-"PO-Revision-Date: 2008-07-19 16:51-0300\n"
+"PO-Revision-Date: 2008-09-14 17:26-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"
@@ -29,188 +29,282 @@
 "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-f7.xml.in.h:1
+#: ../comps-f8.xml.in.h:1
+#: ../comps-f9.xml.in.h:1
 #: ../comps-f10.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:2 ../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:2
+#: ../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-f7.xml.in.h:3
+#: ../comps-f8.xml.in.h:3
+#: ../comps-f9.xml.in.h:3
 #: ../comps-f10.xml.in.h:3
 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-f7.xml.in.h:4
+#: ../comps-f8.xml.in.h:4
+#: ../comps-f9.xml.in.h:4
 #: ../comps-f10.xml.in.h:4
 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:5 ../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:5
+#: ../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-f7.xml.in.h:6
+#: ../comps-f8.xml.in.h:6
+#: ../comps-f9.xml.in.h:6
 #: ../comps-f10.xml.in.h:6
 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:7 ../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:7
+#: ../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:8 ../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:8
+#: ../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-f7.xml.in.h:9
+#: ../comps-f8.xml.in.h:9
+#: ../comps-f9.xml.in.h:9
 #: ../comps-f10.xml.in.h:9
 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:10 ../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:10
+#: ../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-f7.xml.in.h:11
+#: ../comps-f8.xml.in.h:11
+#: ../comps-f9.xml.in.h:11
 #: ../comps-f10.xml.in.h:11
 msgid "Base"
 msgstr "Base"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-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:12
+#: ../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-f7.xml.in.h:13
+#: ../comps-f8.xml.in.h:13
+#: ../comps-f9.xml.in.h:13
 #: ../comps-f10.xml.in.h:13
 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-f7.xml.in.h:14
+#: ../comps-f8.xml.in.h:14
+#: ../comps-f9.xml.in.h:14
 #: ../comps-f10.xml.in.h:14
 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-f7.xml.in.h:15
+#: ../comps-f8.xml.in.h:15
+#: ../comps-f9.xml.in.h:15
 #: ../comps-f10.xml.in.h:15
 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-f7.xml.in.h:16
+#: ../comps-f8.xml.in.h:16
+#: ../comps-f9.xml.in.h:16
 #: ../comps-f10.xml.in.h:16
 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-f7.xml.in.h:17
+#: ../comps-f8.xml.in.h:17
+#: ../comps-f9.xml.in.h:17
 #: ../comps-f10.xml.in.h:17
 msgid "Bhutanese Support"
 msgstr "Suporte ?? Butan??s"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
+#: ../comps-f7.xml.in.h:18
+#: ../comps-f8.xml.in.h:18
+#: ../comps-f9.xml.in.h:18
 #: ../comps-f10.xml.in.h:18
 msgid "Bosnian Support"
 msgstr "Suporte ?? B??snio"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
+#: ../comps-f7.xml.in.h:19
+#: ../comps-f8.xml.in.h:19
+#: ../comps-f9.xml.in.h:19
 #: ../comps-f10.xml.in.h:19
 msgid "Brazilian Portuguese Support"
 msgstr "Suporte ?? Portugu??s Brasileiro"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
+#: ../comps-f7.xml.in.h:20
+#: ../comps-f8.xml.in.h:20
+#: ../comps-f9.xml.in.h:20
 #: ../comps-f10.xml.in.h:20
 msgid "Breton Support"
 msgstr "Suporte ?? Bret??o"
[...1875 lines suppressed...]
+msgstr "Suporte ?? Maithili"
 
 #: ../comps-f10.xml.in.h:115
-#, fuzzy
 msgid "Myanmar (Burmese) Support"
-msgstr "Suporte ?? Vietnamita"
+msgstr "Suporte ?? Myanmar (Birman??s)"
 
 #: ../comps-f10.xml.in.h:159
 msgid "Tajik Support"
 msgstr "Suporte ?? Tajik"
 
 #: ../comps-f10.xml.in.h:201
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "Suporte ?? Checo"
+msgstr "Suporte ?? Uzbeque"
 
-#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
+#: ../comps-el4.xml.in.h:3
+#: ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Aplica????es para uma variedade de tarefas"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12
+#: ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "Suporte ?? Rede Dialup"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
-msgid ""
-"GNOME is a powerful, graphical user interface which includes a panel, "
-"desktop, system icons, and a graphical file manager."
-msgstr ""
-"O GNOME ?? uma poderosa interface gr??fica que inclui um painel, uma ??rea de "
-"trabalho, ??cones de sistema e um gerenciador de arquivos gr??fico."
-
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
-msgid ""
-"KDE is a powerful, graphical user interface which includes a panel, desktop, "
-"system icons, and a graphical file manager."
-msgstr ""
-"O KDE ?? uma poderosa interface gr??fica que inclui um painel, uma ??rea de "
-"trabalho, ??cones de sistema e um gerenciador de arquivos gr??fico."
-
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
-msgid ""
-"Sometimes called text editors, these are programs that allow you to create "
-"and edit files. These include Emacs and Vi."
-msgstr ""
-"Algumas vezes chamados de editores de texto, estes programas permitem criar "
-"e editar arquivos. Isto inclui o Emacs e o Vi."
+#: ../comps-el4.xml.in.h:22
+#: ../comps-el5.xml.in.h:23
+msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "O GNOME ?? uma poderosa interface gr??fica que inclui um painel, uma ??rea de trabalho, ??cones de sistema e um gerenciador de arquivos gr??fico."
+
+#: ../comps-el4.xml.in.h:35
+#: ../comps-el5.xml.in.h:35
+msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "O KDE ?? uma poderosa interface gr??fica que inclui um painel, uma ??rea de trabalho, ??cones de sistema e um gerenciador de arquivos gr??fico."
+
+#: ../comps-el4.xml.in.h:44
+#: ../comps-el5.xml.in.h:44
+msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi."
+msgstr "Algumas vezes chamados de editores de texto, estes programas permitem criar e editar arquivos. Isto inclui o Emacs e o Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50
+#: ../comps-el5.xml.in.h:48
 msgid "The XEmacs text editor."
 msgstr "O editor de texto XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
-msgid ""
-"These tools allow you to create documentation in the DocBook format and "
-"convert them to HTML, PDF, Postscript, and text."
-msgstr ""
-"Estas ferramentas permitem criar documenta????o no formato DocBook e convert??-"
-"la para HTML, PDF, PostScript e texto."
+#: ../comps-el4.xml.in.h:54
+#: ../comps-el5.xml.in.h:52
+msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text."
+msgstr "Estas ferramentas permitem criar documenta????o no formato DocBook e convert??-la para HTML, PDF, PostScript e texto."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64
+#: ../comps-el5.xml.in.h:62
 msgid "This group is a collection of network servers for specific purposes"
-msgstr ""
-"Este grupo ?? uma cole????o de servidores de redes para prop??sitos espec??ficos."
+msgstr "Este grupo ?? uma cole????o de servidores de redes para prop??sitos espec??ficos."
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+#: ../comps-el4.xml.in.h:65
+#: ../comps-el5.xml.in.h:63
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "Este grupo ?? um cole????o de ferramentas e recursos de ambientes ??rabes."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
-msgstr ""
-"Este grupo ?? um cole????o de ferramentas e recursos de ambientes hebraicos."
-
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
-msgstr ""
-"Este grupo ?? um cole????o de ferramentas e recursos de ambientes japoneses."
+#: ../comps-el4.xml.in.h:67
+#: ../comps-el5.xml.in.h:66
+msgid "This group is a collection of tools and resources of Hebrew environments."
+msgstr "Este grupo ?? um cole????o de ferramentas e recursos de ambientes hebraicos."
+
+#: ../comps-el4.xml.in.h:68
+#: ../comps-el5.xml.in.h:67
+msgid "This group is a collection of tools and resources of Japanese environments."
+msgstr "Este grupo ?? um cole????o de ferramentas e recursos de ambientes japoneses."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77
+#: ../comps-el5.xml.in.h:77
 msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "Este grupo ?? um cole????o de ferramentas e recursos de ambientes checos."
 
 #~ msgid "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 akahl at fedoraproject.org  Sun Sep 14 20:30:23 2008
From: akahl at fedoraproject.org (Alexander Kahl)
Date: Sun, 14 Sep 2008 20:30:23 +0000 (UTC)
Subject: rpms/php-ZendFramework/devel .cvsignore, 1.2,
	1.3 php-ZendFramework.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080914203023.B111470136@cvs1.fedora.phx.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/php-ZendFramework/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17807

Modified Files:
	.cvsignore php-ZendFramework.spec sources 
Log Message:
* new sources and specfile for 1.6.0 stable



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Aug 2008 09:19:19 -0000	1.2
+++ .cvsignore	14 Sep 2008 20:29:53 -0000	1.3
@@ -1 +1 @@
-ZendFramework-1.6.0RC1.tar.gz
+ZendFramework-1.6.0.tar.gz


Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/devel/php-ZendFramework.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-ZendFramework.spec	7 Aug 2008 09:19:19 -0000	1.1
+++ php-ZendFramework.spec	14 Sep 2008 20:29:53 -0000	1.2
@@ -3,11 +3,11 @@
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
 Version:         1.6.0
-Release:         0.2.rc1%{?dist}
+Release:         1%{?dist}
 
 License:         BSD
 Group:           Development/Libraries
-Source0:         http://framework.zend.com/releases/%{php_name}-%{version}RC1/%{php_name}-%{version}RC1.tar.gz
+Source0:         http://framework.zend.com/releases/%{php_name}-%{version}/%{php_name}-%{version}.tar.gz
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL:             http://framework.zend.com/
 
@@ -29,7 +29,7 @@
 Requires: php-spl
 Requires: php-zlib
 Requires: php-Fileinfo
-
+BuildRequires: symlinks
 
 %description
 Extending the art & spirit of PHP, Zend Framework is based on simplicity,
@@ -93,6 +93,26 @@
 # via sqlite databases.
 
 
+%package Captcha
+Summary:  Zend Framework CAPTCHA component
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: php-gd
+
+%description Captcha
+This package contains the Zend Framework CAPTCHA extension.
+
+
+%package Dojo
+Summary:  Zend Framework Dojo Toolkit integration component
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description Dojo
+This package contains the Zend Framework Dojo Toolkit component as well as a
+copy of Dojo itself.
+
+
 %package Db-Adapter-Mysqli
 Summary:  Zend Framework database adapter for mysqli
 Group:    Development/Libraries
@@ -227,10 +247,16 @@
 
 
 %prep
-%setup -qn %{php_name}-1.6RC1
+%setup -qn %{php_name}-%{version}
 
 %build
-find . -type f -perm /111 -exec chmod -x '{}' \; >/dev/null
+find . -type f -perm /111 \
+  -fprint executables -exec %{__chmod} -x '{}' \; >/dev/null
+
+find . -type f -name \*.sh \
+  -fprint valid_executables -exec %{__chmod} +x '{}' \; >/dev/null
+
+%{__cat} executables valid_executables|sort|uniq -u > invalid_executables
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -239,7 +265,16 @@
 %{__cp} -pr library/Zend $RPM_BUILD_ROOT%{_datadir}/php
 %{__cp} -pr demos/Zend $RPM_BUILD_ROOT%{_datadir}/php/Zend/demos
 %{__cp} -pr tests $RPM_BUILD_ROOT%{_datadir}/php/Zend
+%{__cp} -pr externals $RPM_BUILD_ROOT%{_datadir}/php/Zend
 
+%{__cp} -pr laboratory/Zend_Tool/library/ZendL $RPM_BUILD_ROOT%{_datadir}/php
+%{__cp} -pr laboratory/Zend_Tool/tests $RPM_BUILD_ROOT%{_datadir}/php/ZendL
+%{__cp} -pr laboratory/Zend_Tool/bin/zf.{php,sh} \
+  $RPM_BUILD_ROOT%{_datadir}/php/ZendL
+%{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}
+%{__ln_s} $RPM_BUILD_ROOT%{_datadir}/php/ZendL/zf.sh \
+  $RPM_BUILD_ROOT%{_bindir}/zf
+symlinks -c $RPM_BUILD_ROOT%{_bindir} > /dev/null
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -252,6 +287,9 @@
 %exclude %{_datadir}/php/Zend/tests
 %exclude %{_datadir}/php/Zend/Cache/Backend/Apc.php
 %exclude %{_datadir}/php/Zend/Cache/Backend/Memcached.php
+%exclude %{_datadir}/php/Zend/Captcha
+%exclude %{_datadir}/php/Zend/Dojo.php
+%exclude %{_datadir}/php/Zend/Dojo
 %exclude %{_datadir}/php/Zend/Feed.php
 %exclude %{_datadir}/php/Zend/Feed
 %exclude %{_datadir}/php/Zend/Gdata.php
@@ -269,6 +307,8 @@
 %exclude %{_datadir}/php/Zend/Service/Flickr
 %exclude %{_datadir}/php/Zend/Service/Nirvanix.php
 %exclude %{_datadir}/php/Zend/Service/Nirvanix
+%exclude %{_datadir}/php/Zend/Service/ReCaptcha.php
+%exclude %{_datadir}/php/Zend/Service/ReCaptcha
 %exclude %{_datadir}/php/Zend/Service/Simpy.php
 %exclude %{_datadir}/php/Zend/Service/Simpy
 %exclude %{_datadir}/php/Zend/Service/SlideShare.php
@@ -279,6 +319,9 @@
 %exclude %{_datadir}/php/Zend/Service/Technorati
 %exclude %{_datadir}/php/Zend/Service/Yahoo.php
 %exclude %{_datadir}/php/Zend/Service/Yahoo
+%exclude %{_datadir}/php/Zend/externals/dojo
+%{_datadir}/php/ZendL
+%{_bindir}/zf
 
 %doc LICENSE.txt INSTALL.txt README.txt
 
@@ -302,6 +345,18 @@
 %{_datadir}/php/Zend/Cache/Backend/Memcached.php
 %doc LICENSE.txt
 
+%files Captcha
+%defattr(-,root,root,-)
+%{_datadir}/php/Zend/Captcha
+%doc LICENSE.txt
+
+%files Dojo
+%defattr(-,root,root,-)
+%{_datadir}/php/Zend/Dojo.php
+%{_datadir}/php/Zend/Dojo
+%{_datadir}/php/Zend/externals/dojo
+%doc LICENSE.txt
+
 %files Feed
 %defattr(-,root,root,-)
 %{_datadir}/php/Zend/Feed.php
@@ -337,6 +392,8 @@
 %{_datadir}/php/Zend/Service/Flickr
 %{_datadir}/php/Zend/Service/Nirvanix.php
 %{_datadir}/php/Zend/Service/Nirvanix
+%{_datadir}/php/Zend/Service/ReCaptcha.php
+%{_datadir}/php/Zend/Service/ReCaptcha
 %{_datadir}/php/Zend/Service/Simpy.php
 %{_datadir}/php/Zend/Service/Simpy
 %{_datadir}/php/Zend/Service/SlideShare.php
@@ -351,6 +408,12 @@
 
 
 %changelog
+* Sat Sep 13 2008 Alexander Kahl <akahl at iconmobile.com> - 1.6.0-1
+- update to 1.6.0 stable (full version)
+- create list of invalid executables in %%build for upstream
+- new components Captcha, Dojo, Service-ReCaptcha, Wildfire, Zend_Tool
+- BuildRequire symlinks to sanitize zf -> zf.sh symlink
+
 * Sat Aug  2 2008 Alexander Kahl <akahl at iconmobile.com> - 1.6.0-0.2.rc1
 - added license file to all packages to silence rpmline
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Aug 2008 09:19:19 -0000	1.2
+++ sources	14 Sep 2008 20:29:53 -0000	1.3
@@ -1 +1 @@
-196aef8904be20c199e536480f92c5c9  ZendFramework-1.6.0RC1.tar.gz
+bea1189701382f5f19b5167116c0ca0e  ZendFramework-1.6.0.tar.gz



From pbrobinson at fedoraproject.org  Sun Sep 14 20:38:41 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 14 Sep 2008 20:38:41 +0000 (UTC)
Subject: rpms/ekiga/devel ekiga.spec,1.50,1.51
Message-ID: <20080914203841.ADF7370136@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20129

Modified Files:
	ekiga.spec 
Log Message:
- Remove double included files due to language



Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ekiga.spec	14 Sep 2008 20:18:03 -0000	1.50
+++ ekiga.spec	14 Sep 2008 20:38:11 -0000	1.51
@@ -85,8 +85,6 @@
 %{_bindir}/ekiga-config-tool
 %{_datadir}/applications/gnome-ekiga.desktop
 %{_datadir}/pixmaps/ekiga
-%{_datadir}/gnome/help/ekiga
-%{_datadir}/omf/ekiga
 %{_datadir}/man/*/*
 %{_datadir}/sounds/ekiga
 %{_datadir}/dbus-1/services/org.ekiga.*



From dwmw2 at fedoraproject.org  Sun Sep 14 21:08:01 2008
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Sun, 14 Sep 2008 21:08:01 +0000 (UTC)
Subject: rpms/bluez-gnome/devel bluez-gnome.spec,1.56,1.57
Message-ID: <20080914210801.8780570136@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28108

Modified Files:
	bluez-gnome.spec 
Log Message:
cosmetic changes


Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- bluez-gnome.spec	13 Sep 2008 23:36:39 -0000	1.56
+++ bluez-gnome.spec	14 Sep 2008 21:07:30 -0000	1.57
@@ -6,7 +6,7 @@
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://www.bluez.org/
-Source0:	http://bluez.sf.net/download/%{name}-%{version}.tar.gz
+Source0:	http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -120,12 +120,12 @@
 %{_bindir}/bluetooth-browse
 %config %{_sysconfdir}/gconf/schemas/*
 %{_datadir}/gnome/autostart/bluetooth-applet.desktop
-%{_datadir}/man/man1/bluetooth-applet.1.gz
-%{_datadir}/man/man1/bluetooth-properties.1.gz
-%{_datadir}/man/man1/bluetooth-wizard.1.gz
 %{_datadir}/applications/bluetooth-properties.desktop
 %{_datadir}/mime/packages/bluetooth-manager.xml
 %{_datadir}/icons/hicolor/*/apps/*
+%{_mandir}/man1/bluetooth-applet.1.gz
+%{_mandir}/man1/bluetooth-properties.1.gz
+%{_mandir}/man1/bluetooth-wizard.1.gz
 %{_mandir}/man1/bluetooth-sendto.1.gz
 %{_mandir}/man1/bluetooth-browse.1.gz
 %doc README COPYING AUTHORS ChangeLog
@@ -133,9 +133,12 @@
 %files analyzer
 %{_datadir}/applications/bluetooth-analyzer.desktop
 %{_bindir}/bluetooth-analyzer
-%{_datadir}/man/man1/bluetooth-analyzer.1.gz
+%{_mandir}/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Sun Sep 14 2008 - David Woodhouse <David.Woodhouse at intel.com>
+- Tidy up specfile, fix source URL
+
 * Sun Sep 14 2008 - Bastien Nocera <bnocera at redhat.com> - 1.4-3
 - Add missing files to the list
 



From dwmw2 at fedoraproject.org  Sun Sep 14 21:11:55 2008
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Sun, 14 Sep 2008 21:11:55 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.3, 1.4 bluez.spec, 1.5, 1.6 sources, 
	1.3, 1.4 bluez-4.5-browse-fixes.patch, 1.1, NONE
Message-ID: <20080914211155.6C56270136@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29299

Modified Files:
	.cvsignore bluez.spec sources 
Removed Files:
	bluez-4.5-browse-fixes.patch 
Log Message:
4.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Sep 2008 09:34:04 -0000	1.3
+++ .cvsignore	14 Sep 2008 21:11:24 -0000	1.4
@@ -1 +1 @@
-bluez-4.5.tar.gz
+bluez-4.6.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bluez.spec	13 Sep 2008 04:07:40 -0000	1.5
+++ bluez.spec	14 Sep 2008 21:11:24 -0000	1.6
@@ -1,14 +1,13 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.5
-Release: 4%{?dist}
+Version: 4.6
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
 Source1: bluetooth.init
 Source2: bluetooth.conf
 Patch1: bluez-utils-oui-usage.patch
-Patch2: bluez-4.5-browse-fixes.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -97,7 +96,6 @@
 
 %setup -q
 %patch1 -p0 -b .oui
-%patch2 -p1
 
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
@@ -183,6 +181,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Sun Sep 14 2008 - David Woodhouse <David.Woodhouse at intel.com> - 4.6-1
+- Update to 4.6
+
 * Fri Sep 12 2008 - David Woodhouse <David.Woodhouse at intel.com> - 4.5-4
 - SDP browse fixes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Sep 2008 09:34:05 -0000	1.3
+++ sources	14 Sep 2008 21:11:24 -0000	1.4
@@ -1 +1 @@
-97d4dfad90ed924952d013bd0b03bedd  bluez-4.5.tar.gz
+c10774d08fb04af4b4a6d148ffcb820a  bluez-4.6.tar.gz


--- bluez-4.5-browse-fixes.patch DELETED ---



From akahl at fedoraproject.org  Sun Sep 14 21:44:49 2008
From: akahl at fedoraproject.org (Alexander Kahl)
Date: Sun, 14 Sep 2008 21:44:49 +0000 (UTC)
Subject: rpms/php-ZendFramework/F-9 .cvsignore, 1.1,
	1.2 php-ZendFramework.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080914214449.B462870136@cvs1.fedora.phx.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/php-ZendFramework/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6237

Modified Files:
	.cvsignore php-ZendFramework.spec sources 
Log Message:
* devel -> F-9 (1.6.0 stable)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Aug 2008 17:40:03 -0000	1.1
+++ .cvsignore	14 Sep 2008 21:44:18 -0000	1.2
@@ -0,0 +1 @@
+ZendFramework-1.6.0.tar.gz


Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-9/php-ZendFramework.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-ZendFramework.spec	7 Aug 2008 09:23:03 -0000	1.1
+++ php-ZendFramework.spec	14 Sep 2008 21:44:18 -0000	1.2
@@ -3,11 +3,11 @@
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
 Version:         1.6.0
-Release:         0.2.rc1%{?dist}
+Release:         1%{?dist}
 
 License:         BSD
 Group:           Development/Libraries
-Source0:         http://framework.zend.com/releases/%{php_name}-%{version}RC1/%{php_name}-%{version}RC1.tar.gz
+Source0:         http://framework.zend.com/releases/%{php_name}-%{version}/%{php_name}-%{version}.tar.gz
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL:             http://framework.zend.com/
 
@@ -29,7 +29,7 @@
 Requires: php-spl
 Requires: php-zlib
 Requires: php-Fileinfo
-
+BuildRequires: symlinks
 
 %description
 Extending the art & spirit of PHP, Zend Framework is based on simplicity,
@@ -93,6 +93,26 @@
 # via sqlite databases.
 
 
+%package Captcha
+Summary:  Zend Framework CAPTCHA component
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: php-gd
+
+%description Captcha
+This package contains the Zend Framework CAPTCHA extension.
+
+
+%package Dojo
+Summary:  Zend Framework Dojo Toolkit integration component
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description Dojo
+This package contains the Zend Framework Dojo Toolkit component as well as a
+copy of Dojo itself.
+
+
 %package Db-Adapter-Mysqli
 Summary:  Zend Framework database adapter for mysqli
 Group:    Development/Libraries
@@ -227,10 +247,16 @@
 
 
 %prep
-%setup -qn %{php_name}-1.6RC1
+%setup -qn %{php_name}-%{version}
 
 %build
-find . -type f -perm /111 -exec chmod -x '{}' \; >/dev/null
+find . -type f -perm /111 \
+  -fprint executables -exec %{__chmod} -x '{}' \; >/dev/null
+
+find . -type f -name \*.sh \
+  -fprint valid_executables -exec %{__chmod} +x '{}' \; >/dev/null
+
+%{__cat} executables valid_executables|sort|uniq -u > invalid_executables
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -239,7 +265,16 @@
 %{__cp} -pr library/Zend $RPM_BUILD_ROOT%{_datadir}/php
 %{__cp} -pr demos/Zend $RPM_BUILD_ROOT%{_datadir}/php/Zend/demos
 %{__cp} -pr tests $RPM_BUILD_ROOT%{_datadir}/php/Zend
+%{__cp} -pr externals $RPM_BUILD_ROOT%{_datadir}/php/Zend
 
+%{__cp} -pr laboratory/Zend_Tool/library/ZendL $RPM_BUILD_ROOT%{_datadir}/php
+%{__cp} -pr laboratory/Zend_Tool/tests $RPM_BUILD_ROOT%{_datadir}/php/ZendL
+%{__cp} -pr laboratory/Zend_Tool/bin/zf.{php,sh} \
+  $RPM_BUILD_ROOT%{_datadir}/php/ZendL
+%{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}
+%{__ln_s} $RPM_BUILD_ROOT%{_datadir}/php/ZendL/zf.sh \
+  $RPM_BUILD_ROOT%{_bindir}/zf
+symlinks -c $RPM_BUILD_ROOT%{_bindir} > /dev/null
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -252,6 +287,9 @@
 %exclude %{_datadir}/php/Zend/tests
 %exclude %{_datadir}/php/Zend/Cache/Backend/Apc.php
 %exclude %{_datadir}/php/Zend/Cache/Backend/Memcached.php
+%exclude %{_datadir}/php/Zend/Captcha
+%exclude %{_datadir}/php/Zend/Dojo.php
+%exclude %{_datadir}/php/Zend/Dojo
 %exclude %{_datadir}/php/Zend/Feed.php
 %exclude %{_datadir}/php/Zend/Feed
 %exclude %{_datadir}/php/Zend/Gdata.php
@@ -269,6 +307,8 @@
 %exclude %{_datadir}/php/Zend/Service/Flickr
 %exclude %{_datadir}/php/Zend/Service/Nirvanix.php
 %exclude %{_datadir}/php/Zend/Service/Nirvanix
+%exclude %{_datadir}/php/Zend/Service/ReCaptcha.php
+%exclude %{_datadir}/php/Zend/Service/ReCaptcha
 %exclude %{_datadir}/php/Zend/Service/Simpy.php
 %exclude %{_datadir}/php/Zend/Service/Simpy
 %exclude %{_datadir}/php/Zend/Service/SlideShare.php
@@ -279,6 +319,9 @@
 %exclude %{_datadir}/php/Zend/Service/Technorati
 %exclude %{_datadir}/php/Zend/Service/Yahoo.php
 %exclude %{_datadir}/php/Zend/Service/Yahoo
+%exclude %{_datadir}/php/Zend/externals/dojo
+%{_datadir}/php/ZendL
+%{_bindir}/zf
 
 %doc LICENSE.txt INSTALL.txt README.txt
 
@@ -302,6 +345,18 @@
 %{_datadir}/php/Zend/Cache/Backend/Memcached.php
 %doc LICENSE.txt
 
+%files Captcha
+%defattr(-,root,root,-)
+%{_datadir}/php/Zend/Captcha
+%doc LICENSE.txt
+
+%files Dojo
+%defattr(-,root,root,-)
+%{_datadir}/php/Zend/Dojo.php
+%{_datadir}/php/Zend/Dojo
+%{_datadir}/php/Zend/externals/dojo
+%doc LICENSE.txt
+
 %files Feed
 %defattr(-,root,root,-)
 %{_datadir}/php/Zend/Feed.php
@@ -337,6 +392,8 @@
 %{_datadir}/php/Zend/Service/Flickr
 %{_datadir}/php/Zend/Service/Nirvanix.php
 %{_datadir}/php/Zend/Service/Nirvanix
+%{_datadir}/php/Zend/Service/ReCaptcha.php
+%{_datadir}/php/Zend/Service/ReCaptcha
 %{_datadir}/php/Zend/Service/Simpy.php
 %{_datadir}/php/Zend/Service/Simpy
 %{_datadir}/php/Zend/Service/SlideShare.php
@@ -351,6 +408,12 @@
 
 
 %changelog
+* Sat Sep 13 2008 Alexander Kahl <akahl at iconmobile.com> - 1.6.0-1
+- update to 1.6.0 stable (full version)
+- create list of invalid executables in %%build for upstream
+- new components Captcha, Dojo, Service-ReCaptcha, Wildfire, Zend_Tool
+- BuildRequire symlinks to sanitize zf -> zf.sh symlink
+
 * Sat Aug  2 2008 Alexander Kahl <akahl at iconmobile.com> - 1.6.0-0.2.rc1
 - added license file to all packages to silence rpmline
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Aug 2008 09:23:03 -0000	1.2
+++ sources	14 Sep 2008 21:44:18 -0000	1.3
@@ -1 +1 @@
-196aef8904be20c199e536480f92c5c9  ZendFramework-1.6.0RC1.tar.gz
+bea1189701382f5f19b5167116c0ca0e  ZendFramework-1.6.0.tar.gz



From rdieter at fedoraproject.org  Sun Sep 14 22:08:33 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 14 Sep 2008 22:08:33 +0000 (UTC)
Subject: rpms/kmymoney2/devel .cvsignore, 1.12, 1.13 kmymoney2.spec, 1.33,
	1.34 sources, 1.11, 1.12
Message-ID: <20080914220833.C7F0C70136@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12515

Modified Files:
	.cvsignore kmymoney2.spec sources 
Log Message:
* Sun Sep 14 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9.2-1
- kmymoney2-0.9.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	14 May 2008 16:25:01 -0000	1.12
+++ .cvsignore	14 Sep 2008 22:08:03 -0000	1.13
@@ -1 +1 @@
-kmymoney2-0.9.tar.bz2
+kmymoney2-0.9.2.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- kmymoney2.spec	9 Sep 2008 17:03:33 -0000	1.33
+++ kmymoney2.spec	14 Sep 2008 22:08:03 -0000	1.34
@@ -15,8 +15,8 @@
 
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 0.9
-Release: 2%{?dist}
+Version: 0.9.2
+Release: 1%{?dist}
 
 License: GPLv2+
 Url:	 http://kmymoney2.sourceforge.net/
@@ -187,6 +187,9 @@
 
 
 %changelog
+* Sun Sep 14 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9.2-1
+- kmymoney2-0.9.2
+
 * Tue Sep  9 2008 Bill Nottingham <notting at redhat.com> 0.9-2
 - rebuild for new libofx ABI
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 May 2008 16:25:01 -0000	1.11
+++ sources	14 Sep 2008 22:08:03 -0000	1.12
@@ -1 +1 @@
-63f8e45bba1d333e3955bd22a2235883  kmymoney2-0.9.tar.bz2
+5d4edb7c4dc8d894243a26c7bc91efb6  kmymoney2-0.9.2.tar.bz2



From pkgdb at fedoraproject.org  Sun Sep 14 22:20:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 22:20:56 +0000
Subject: [pkgdb] purple-microblog was added for mcepl
Message-ID: <20080914222056.50028208D9C@bastion.fedora.phx.redhat.com>

kevin has added Package purple-microblog with summary Libpurple plug-in supporting microblog services like Twitter
kevin has approved Package purple-microblog
kevin has added a Fedora devel branch for purple-microblog with an owner of mcepl
kevin has approved purple-microblog in Fedora devel
kevin has approved Package purple-microblog
kevin has set commit to Approved for packager on purple-microblog (Fedora devel)
kevin has set build to Approved for packager on purple-microblog (Fedora devel)
kevin has set checkout to Approved for packager on purple-microblog (Fedora devel)
kevin has set commit to Approved for uberpackager on purple-microblog (Fedora devel)
kevin has set build to Approved for uberpackager on purple-microblog (Fedora devel)
kevin has set checkout to Approved for uberpackager on purple-microblog (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Sun Sep 14 22:21:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 22:21:02 +0000
Subject: [pkgdb] purple-microblog (Fedora, 8) updated by kevin
Message-ID: <20080914222102.C2E87208DA0@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for purple-microblog
kevin has set commit to Approved for uberpackager on purple-microblog (Fedora 8)
kevin has set build to Approved for uberpackager on purple-microblog (Fedora 8)
kevin has set checkout to Approved for uberpackager on purple-microblog (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/purple-microblog



From kevin at fedoraproject.org  Sun Sep 14 22:21:08 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:21:08 +0000 (UTC)
Subject: rpms/purple-microblog - New directory
Message-ID: <20080914222108.4077C70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/purple-microblog
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst15857/rpms/purple-microblog

Log Message:
Directory /cvs/extras/rpms/purple-microblog added to the repository




From kevin at fedoraproject.org  Sun Sep 14 22:21:08 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:21:08 +0000 (UTC)
Subject: rpms/purple-microblog/devel - New directory
Message-ID: <20080914222108.827DA70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/purple-microblog/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst15857/rpms/purple-microblog/devel

Log Message:
Directory /cvs/extras/rpms/purple-microblog/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 14 22:21:09 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:21:09 +0000 (UTC)
Subject: rpms/purple-microblog Makefile,NONE,1.1
Message-ID: <20080914222109.CA8F970136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/purple-microblog
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst15857/rpms/purple-microblog

Added Files:
	Makefile 
Log Message:
Setup of module purple-microblog


--- NEW FILE Makefile ---
# Top level Makefile for module purple-microblog
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Sun Sep 14 22:21:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 22:21:02 +0000
Subject: [pkgdb] purple-microblog (Fedora, 9) updated by kevin
Message-ID: <20080914222102.CB125208DA4@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for purple-microblog
kevin has set commit to Approved for uberpackager on purple-microblog (Fedora 9)
kevin has set build to Approved for uberpackager on purple-microblog (Fedora 9)
kevin has set checkout to Approved for uberpackager on purple-microblog (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/purple-microblog



From kevin at fedoraproject.org  Sun Sep 14 22:21:10 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:21:10 +0000 (UTC)
Subject: rpms/purple-microblog/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080914222110.38ECA70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/purple-microblog/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst15857/rpms/purple-microblog/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module purple-microblog


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: purple-microblog
# $Id: Makefile,v 1.1 2008/09/14 22:21:10 kevin Exp $
NAME := purple-microblog
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 14 22:25:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 22:25:46 +0000
Subject: [pkgdb] orsa was added for mjakubicek
Message-ID: <20080914222546.7305C208D9B@bastion.fedora.phx.redhat.com>

kevin has added Package orsa with summary Orbit Reconstruction, Simulation and Analysis
kevin has approved Package orsa
kevin has added a Fedora devel branch for orsa with an owner of mjakubicek
kevin has approved orsa in Fedora devel
kevin has approved Package orsa
kevin has set commit to Approved for packager on orsa (Fedora devel)
kevin has set build to Approved for packager on orsa (Fedora devel)
kevin has set checkout to Approved for packager on orsa (Fedora devel)
kevin has set commit to Approved for uberpackager on orsa (Fedora devel)
kevin has set build to Approved for uberpackager on orsa (Fedora devel)
kevin has set checkout to Approved for uberpackager on orsa (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/orsa



From pkgdb at fedoraproject.org  Sun Sep 14 22:25:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 22:25:47 +0000
Subject: [pkgdb] orsa (Fedora, devel) updated by kevin
Message-ID: <20080914222547.89FE7208D9F@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on orsa (Fedora devel) for mmahut
kevin approved watchcommits on orsa (Fedora devel) for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/orsa



From pkgdb at fedoraproject.org  Sun Sep 14 22:25:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 22:25:47 +0000
Subject: [pkgdb] orsa (Fedora, 8) updated by kevin
Message-ID: <20080914222547.96196208DA3@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for orsa
kevin has set commit to Approved for uberpackager on orsa (Fedora 8)
kevin has set build to Approved for uberpackager on orsa (Fedora 8)
kevin has set checkout to Approved for uberpackager on orsa (Fedora 8)
kevin approved watchbugzilla on orsa (Fedora 8) for mmahut
kevin approved watchcommits on orsa (Fedora 8) for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/orsa



From pkgdb at fedoraproject.org  Sun Sep 14 22:25:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 22:25:47 +0000
Subject: [pkgdb] orsa (Fedora, 9) updated by kevin
Message-ID: <20080914222547.A288E208DA6@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for orsa
kevin has set commit to Approved for uberpackager on orsa (Fedora 9)
kevin has set build to Approved for uberpackager on orsa (Fedora 9)
kevin has set checkout to Approved for uberpackager on orsa (Fedora 9)
kevin approved watchbugzilla on orsa (Fedora 9) for mmahut
kevin approved watchcommits on orsa (Fedora 9) for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/orsa



From kevin at fedoraproject.org  Sun Sep 14 22:26:10 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:26:10 +0000 (UTC)
Subject: rpms/orsa - New directory
Message-ID: <20080914222610.2D47B70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orsa
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh17331/rpms/orsa

Log Message:
Directory /cvs/extras/rpms/orsa added to the repository




From kevin at fedoraproject.org  Sun Sep 14 22:26:10 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:26:10 +0000 (UTC)
Subject: rpms/orsa/devel - New directory
Message-ID: <20080914222610.7C9CE70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orsa/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh17331/rpms/orsa/devel

Log Message:
Directory /cvs/extras/rpms/orsa/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 14 22:26:11 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:26:11 +0000 (UTC)
Subject: rpms/orsa Makefile,NONE,1.1
Message-ID: <20080914222611.C9FB770136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orsa
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh17331/rpms/orsa

Added Files:
	Makefile 
Log Message:
Setup of module orsa


--- NEW FILE Makefile ---
# Top level Makefile for module orsa
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 14 22:26:12 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:26:12 +0000 (UTC)
Subject: rpms/orsa/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20080914222612.3289670136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orsa/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh17331/rpms/orsa/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module orsa


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: orsa
# $Id: Makefile,v 1.1 2008/09/14 22:26:12 kevin Exp $
NAME := orsa
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 14 22:27:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 22:27:41 +0000
Subject: [pkgdb] clutter-cairomm was added for denis
Message-ID: <20080914222741.60CC1208D9B@bastion.fedora.phx.redhat.com>

kevin has added Package clutter-cairomm with summary C++ wrapper for clutter-cairo library
kevin has approved Package clutter-cairomm
kevin has added a Fedora devel branch for clutter-cairomm with an owner of denis
kevin has approved clutter-cairomm in Fedora devel
kevin has approved Package clutter-cairomm
kevin has set commit to Approved for packager on clutter-cairomm (Fedora devel)
kevin has set build to Approved for packager on clutter-cairomm (Fedora devel)
kevin has set checkout to Approved for packager on clutter-cairomm (Fedora devel)
kevin has set commit to Approved for uberpackager on clutter-cairomm (Fedora devel)
kevin has set build to Approved for uberpackager on clutter-cairomm (Fedora devel)
kevin has set checkout to Approved for uberpackager on clutter-cairomm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clutter-cairomm



From pkgdb at fedoraproject.org  Sun Sep 14 22:27:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 22:27:45 +0000
Subject: [pkgdb] clutter-cairomm (Fedora, 9) updated by kevin
Message-ID: <20080914222745.E0603208D9F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for clutter-cairomm
kevin has set commit to Approved for uberpackager on clutter-cairomm (Fedora 9)
kevin has set build to Approved for uberpackager on clutter-cairomm (Fedora 9)
kevin has set checkout to Approved for uberpackager on clutter-cairomm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clutter-cairomm



From kevin at fedoraproject.org  Sun Sep 14 22:27:57 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:27:57 +0000 (UTC)
Subject: rpms/clutter-cairomm - New directory
Message-ID: <20080914222757.3326770136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/clutter-cairomm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq17962/rpms/clutter-cairomm

Log Message:
Directory /cvs/extras/rpms/clutter-cairomm added to the repository




From kevin at fedoraproject.org  Sun Sep 14 22:27:57 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:27:57 +0000 (UTC)
Subject: rpms/clutter-cairomm/devel - New directory
Message-ID: <20080914222757.7859770136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/clutter-cairomm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq17962/rpms/clutter-cairomm/devel

Log Message:
Directory /cvs/extras/rpms/clutter-cairomm/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 14 22:27:59 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:27:59 +0000 (UTC)
Subject: rpms/clutter-cairomm Makefile,NONE,1.1
Message-ID: <20080914222759.1921370136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/clutter-cairomm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq17962/rpms/clutter-cairomm

Added Files:
	Makefile 
Log Message:
Setup of module clutter-cairomm


--- NEW FILE Makefile ---
# Top level Makefile for module clutter-cairomm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 14 22:27:59 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:27:59 +0000 (UTC)
Subject: rpms/clutter-cairomm/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080914222759.737FE70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/clutter-cairomm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq17962/rpms/clutter-cairomm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module clutter-cairomm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: clutter-cairomm
# $Id: Makefile,v 1.1 2008/09/14 22:27:59 kevin Exp $
NAME := clutter-cairomm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 14 22:29:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 22:29:28 +0000
Subject: [pkgdb] clutter-gtkmm was added for denis
Message-ID: <20080914222928.2298B208D9E@bastion.fedora.phx.redhat.com>

kevin has added Package clutter-gtkmm with summary C++ wrapper for clutter-gtk library
kevin has approved Package clutter-gtkmm
kevin has added a Fedora devel branch for clutter-gtkmm with an owner of denis
kevin has approved clutter-gtkmm in Fedora devel
kevin has approved Package clutter-gtkmm
kevin has set commit to Approved for packager on clutter-gtkmm (Fedora devel)
kevin has set build to Approved for packager on clutter-gtkmm (Fedora devel)
kevin has set checkout to Approved for packager on clutter-gtkmm (Fedora devel)
kevin has set commit to Approved for uberpackager on clutter-gtkmm (Fedora devel)
kevin has set build to Approved for uberpackager on clutter-gtkmm (Fedora devel)
kevin has set checkout to Approved for uberpackager on clutter-gtkmm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clutter-gtkmm



From pkgdb at fedoraproject.org  Sun Sep 14 22:29:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 22:29:29 +0000
Subject: [pkgdb] clutter-gtkmm (Fedora, 9) updated by kevin
Message-ID: <20080914222929.5FBED208DA2@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for clutter-gtkmm
kevin has set commit to Approved for uberpackager on clutter-gtkmm (Fedora 9)
kevin has set build to Approved for uberpackager on clutter-gtkmm (Fedora 9)
kevin has set checkout to Approved for uberpackager on clutter-gtkmm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clutter-gtkmm



From kevin at fedoraproject.org  Sun Sep 14 22:29:48 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:29:48 +0000 (UTC)
Subject: rpms/clutter-gtkmm - New directory
Message-ID: <20080914222948.422FA70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/clutter-gtkmm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb18536/rpms/clutter-gtkmm

Log Message:
Directory /cvs/extras/rpms/clutter-gtkmm added to the repository




From kevin at fedoraproject.org  Sun Sep 14 22:29:48 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:29:48 +0000 (UTC)
Subject: rpms/clutter-gtkmm/devel - New directory
Message-ID: <20080914222948.BE74570136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/clutter-gtkmm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb18536/rpms/clutter-gtkmm/devel

Log Message:
Directory /cvs/extras/rpms/clutter-gtkmm/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 14 22:29:50 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:29:50 +0000 (UTC)
Subject: rpms/clutter-gtkmm Makefile,NONE,1.1
Message-ID: <20080914222950.8141370136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/clutter-gtkmm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb18536/rpms/clutter-gtkmm

Added Files:
	Makefile 
Log Message:
Setup of module clutter-gtkmm


--- NEW FILE Makefile ---
# Top level Makefile for module clutter-gtkmm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 14 22:29:50 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:29:50 +0000 (UTC)
Subject: rpms/clutter-gtkmm/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080914222950.E32BB70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/clutter-gtkmm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb18536/rpms/clutter-gtkmm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module clutter-gtkmm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: clutter-gtkmm
# $Id: Makefile,v 1.1 2008/09/14 22:29:50 kevin Exp $
NAME := clutter-gtkmm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Sun Sep 14 22:31:13 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:31:13 +0000 (UTC)
Subject: rpms/python-ethtool/devel - New directory
Message-ID: <20080914223113.BE0E270136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-ethtool/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso19026/rpms/python-ethtool/devel

Log Message:
Directory /cvs/extras/rpms/python-ethtool/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 14 22:31:13 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:31:13 +0000 (UTC)
Subject: rpms/python-ethtool - New directory
Message-ID: <20080914223113.4C26770136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-ethtool
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso19026/rpms/python-ethtool

Log Message:
Directory /cvs/extras/rpms/python-ethtool added to the repository




From kevin at fedoraproject.org  Sun Sep 14 22:31:15 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:31:15 +0000 (UTC)
Subject: rpms/python-ethtool Makefile,NONE,1.1
Message-ID: <20080914223115.6997170136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-ethtool
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso19026/rpms/python-ethtool

Added Files:
	Makefile 
Log Message:
Setup of module python-ethtool


--- NEW FILE Makefile ---
# Top level Makefile for module python-ethtool
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 14 22:31:15 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:31:15 +0000 (UTC)
Subject: rpms/python-ethtool/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080914223115.E211970136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-ethtool/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso19026/rpms/python-ethtool/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-ethtool


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-ethtool
# $Id: Makefile,v 1.1 2008/09/14 22:31:15 kevin Exp $
NAME := python-ethtool
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 14 22:31:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 22:31:04 +0000
Subject: [pkgdb] python-ethtool was added for acme
Message-ID: <20080914223104.3323A208D9C@bastion.fedora.phx.redhat.com>

kevin has added Package python-ethtool with summary Ethernet settings python bindings
kevin has approved Package python-ethtool
kevin has added a Fedora devel branch for python-ethtool with an owner of acme
kevin has approved python-ethtool in Fedora devel
kevin has approved Package python-ethtool
kevin has set commit to Approved for packager on python-ethtool (Fedora devel)
kevin has set build to Approved for packager on python-ethtool (Fedora devel)
kevin has set checkout to Approved for packager on python-ethtool (Fedora devel)
kevin has set commit to Approved for uberpackager on python-ethtool (Fedora devel)
kevin has set build to Approved for uberpackager on python-ethtool (Fedora devel)
kevin has set checkout to Approved for uberpackager on python-ethtool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-ethtool



From mso at fedoraproject.org  Sun Sep 14 22:31:53 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Sun, 14 Sep 2008 22:31:53 +0000 (UTC)
Subject: rpms/gtk-nodoka-engine/F-9 gtk-nodoka-engine-leak.patch, NONE,
	1.1 gtk-nodoka-engine.spec, 1.21, 1.22
Message-ID: <20080914223153.02E1370136@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/gtk-nodoka-engine/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18779/F-9

Modified Files:
	gtk-nodoka-engine.spec 
Added Files:
	gtk-nodoka-engine-leak.patch 
Log Message:


Fix cairo context leak (rhbz #462259).

Credits: Matthias Clasen



gtk-nodoka-engine-leak.patch:

--- NEW FILE gtk-nodoka-engine-leak.patch ---
diff -up gtk-nodoka-engine-0.7.1/src/GTKEngine/nodoka_style.c.leak gtk-nodoka-engine-0.7.1/src/GTKEngine/nodoka_style.c
--- gtk-nodoka-engine-0.7.1/src/GTKEngine/nodoka_style.c.leak	2008-09-14 17:53:56.000000000 -0400
+++ gtk-nodoka-engine-0.7.1/src/GTKEngine/nodoka_style.c	2008-09-14 17:54:16.000000000 -0400
@@ -144,6 +144,8 @@ nodoka_style_draw_flat_box (DRAW_ARGS)
 		nodoka_sanitize_size (window, &width, &height);
 
 		nodoka_draw_tooltip (cr, colors, &params, x, y, width, height);
+
+		cairo_destroy (cr);
 	}
 	else if (DETAIL ("entry_bg") && !(widget && widget->parent && GTK_IS_TREE_VIEW (widget->parent)))
 	{



Index: gtk-nodoka-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-nodoka-engine/F-9/gtk-nodoka-engine.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gtk-nodoka-engine.spec	22 Jul 2008 20:29:22 -0000	1.21
+++ gtk-nodoka-engine.spec	14 Sep 2008 22:31:22 -0000	1.22
@@ -3,13 +3,14 @@
 
 Name:           gtk-nodoka-engine
 Version:        0.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Nodoka GTK Theme Engine
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://fedorahosted.org/nodoka
 Source0:        https://fedorahosted.org/releases/n/o/gtk-nodoka-engine-%{version}.tar.gz
+Patch0:         gtk-nodoka-engine-leak.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -18,6 +19,7 @@
 %else
 Requires:       gtk2 >= %{?gtk2version}
 %endif
+Requires:       nodoka-filesystem
 
 %description
 Nodoka is a Murrine engine based gtk2 theme engine. The package is shipped with 
@@ -34,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .leak
 
 %build
 %configure
@@ -56,7 +59,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README TODO
 %{_libdir}/gtk-2.0/2.10.0/engines/libnodoka.so
-%{_datadir}/themes/Nodoka
+%{_datadir}/themes/Nodoka/*
 
 %files extras
 %defattr(-,root,root,-)
@@ -65,9 +68,14 @@
 
 
 %changelog
+* Mon Sep 15 2008 Martin Sourada <martin.sourada at gmail.com> - 0.7.1-2
+
 * Tue Jul 22 2008 Martin Sourada <martin.sourada at gmail.com> - 0.7.1-1
 - New bugfix release
 
+* Tue May 20 2008 Martin Sourada <martin.sourada at gmail.com> - 0.7.0-2
+- Don't own %%{_datadir}/themes/Nodoka dir, instead require nodoka-filesystem
+
 * Mon Apr 14 2008 Martin Sourada <martin.sourada at gmail.com> - 0.7.0-1
 - Update to stable
 



From mso at fedoraproject.org  Sun Sep 14 22:31:53 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Sun, 14 Sep 2008 22:31:53 +0000 (UTC)
Subject: rpms/gtk-nodoka-engine/devel gtk-nodoka-engine-leak.patch, NONE,
	1.1 gtk-nodoka-engine.spec, 1.22, 1.23
Message-ID: <20080914223153.AE62B70136@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/gtk-nodoka-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18779/devel

Modified Files:
	gtk-nodoka-engine.spec 
Added Files:
	gtk-nodoka-engine-leak.patch 
Log Message:


Fix cairo context leak (rhbz #462259).

Credits: Matthias Clasen



gtk-nodoka-engine-leak.patch:

--- NEW FILE gtk-nodoka-engine-leak.patch ---
diff -up gtk-nodoka-engine-0.7.1/src/GTKEngine/nodoka_style.c.leak gtk-nodoka-engine-0.7.1/src/GTKEngine/nodoka_style.c
--- gtk-nodoka-engine-0.7.1/src/GTKEngine/nodoka_style.c.leak	2008-09-14 17:53:56.000000000 -0400
+++ gtk-nodoka-engine-0.7.1/src/GTKEngine/nodoka_style.c	2008-09-14 17:54:16.000000000 -0400
@@ -144,6 +144,8 @@ nodoka_style_draw_flat_box (DRAW_ARGS)
 		nodoka_sanitize_size (window, &width, &height);
 
 		nodoka_draw_tooltip (cr, colors, &params, x, y, width, height);
+
+		cairo_destroy (cr);
 	}
 	else if (DETAIL ("entry_bg") && !(widget && widget->parent && GTK_IS_TREE_VIEW (widget->parent)))
 	{



Index: gtk-nodoka-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/gtk-nodoka-engine.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gtk-nodoka-engine.spec	22 Jul 2008 20:19:02 -0000	1.22
+++ gtk-nodoka-engine.spec	14 Sep 2008 22:31:23 -0000	1.23
@@ -3,13 +3,14 @@
 
 Name:           gtk-nodoka-engine
 Version:        0.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Nodoka GTK Theme Engine
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://fedorahosted.org/nodoka
 Source0:        https://fedorahosted.org/releases/n/o/gtk-nodoka-engine-%{version}.tar.gz
+Patch0:         gtk-nodoka-engine-leak.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .leak
 
 %build
 %configure
@@ -66,6 +68,8 @@
 
 
 %changelog
+* Mon Sep 15 2008 Martin Sourada <martin.sourada at gmail.com> - 0.7.1-2
+
 * Tue Jul 22 2008 Martin Sourada <martin.sourada at gmail.com> - 0.7.1-1
 - New bugfix release
 



From kevin at fedoraproject.org  Sun Sep 14 22:32:05 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:32:05 +0000 (UTC)
Subject: rpms/hunspell-st - New directory
Message-ID: <20080914223205.2662870136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-st
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI19400/rpms/hunspell-st

Log Message:
Directory /cvs/extras/rpms/hunspell-st added to the repository




From kevin at fedoraproject.org  Sun Sep 14 22:32:05 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:32:05 +0000 (UTC)
Subject: rpms/hunspell-st/devel - New directory
Message-ID: <20080914223205.9B19070136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-st/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI19400/rpms/hunspell-st/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-st/devel added to the repository




From pkgdb at fedoraproject.org  Sun Sep 14 22:31:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 22:31:55 +0000
Subject: [pkgdb] hunspell-st was added for caolanm
Message-ID: <20080914223155.DAA91208D9F@bastion.fedora.phx.redhat.com>

kevin has added Package hunspell-st with summary Southern Sotho dictionaries
kevin has approved Package hunspell-st
kevin has added a Fedora devel branch for hunspell-st with an owner of caolanm
kevin has approved hunspell-st in Fedora devel
kevin has approved Package hunspell-st
kevin has set commit to Approved for packager on hunspell-st (Fedora devel)
kevin has set build to Approved for packager on hunspell-st (Fedora devel)
kevin has set checkout to Approved for packager on hunspell-st (Fedora devel)
kevin has set commit to Approved for uberpackager on hunspell-st (Fedora devel)
kevin has set build to Approved for uberpackager on hunspell-st (Fedora devel)
kevin has set checkout to Approved for uberpackager on hunspell-st (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-st



From kevin at fedoraproject.org  Sun Sep 14 22:32:06 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:32:06 +0000 (UTC)
Subject: rpms/hunspell-st Makefile,NONE,1.1
Message-ID: <20080914223206.D72EB70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-st
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI19400/rpms/hunspell-st

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-st


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-st
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 14 22:32:07 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:32:07 +0000 (UTC)
Subject: rpms/hunspell-st/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080914223207.4EF8270136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-st/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI19400/rpms/hunspell-st/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-st


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-st
# $Id: Makefile,v 1.1 2008/09/14 22:32:07 kevin Exp $
NAME := hunspell-st
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Sun Sep 14 22:32:41 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:32:41 +0000 (UTC)
Subject: rpms/hunspell-nso/devel - New directory
Message-ID: <20080914223241.DFAAE70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-nso/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd19708/rpms/hunspell-nso/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-nso/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 14 22:32:41 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:32:41 +0000 (UTC)
Subject: rpms/hunspell-nso - New directory
Message-ID: <20080914223241.5DEEC70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-nso
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd19708/rpms/hunspell-nso

Log Message:
Directory /cvs/extras/rpms/hunspell-nso added to the repository




From kevin at fedoraproject.org  Sun Sep 14 22:32:43 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:32:43 +0000 (UTC)
Subject: rpms/hunspell-nso Makefile,NONE,1.1
Message-ID: <20080914223243.CD4DA70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-nso
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd19708/rpms/hunspell-nso

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-nso


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-nso
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Sun Sep 14 22:32:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 22:32:29 +0000
Subject: [pkgdb] hunspell-nso was added for caolanm
Message-ID: <20080914223229.8DC16208D9F@bastion.fedora.phx.redhat.com>

kevin has added Package hunspell-nso with summary Northern Sotho dictionaries
kevin has approved Package hunspell-nso
kevin has added a Fedora devel branch for hunspell-nso with an owner of caolanm
kevin has approved hunspell-nso in Fedora devel
kevin has approved Package hunspell-nso
kevin has set commit to Approved for packager on hunspell-nso (Fedora devel)
kevin has set build to Approved for packager on hunspell-nso (Fedora devel)
kevin has set checkout to Approved for packager on hunspell-nso (Fedora devel)
kevin has set commit to Approved for uberpackager on hunspell-nso (Fedora devel)
kevin has set build to Approved for uberpackager on hunspell-nso (Fedora devel)
kevin has set checkout to Approved for uberpackager on hunspell-nso (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-nso



From kevin at fedoraproject.org  Sun Sep 14 22:32:44 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 14 Sep 2008 22:32:44 +0000 (UTC)
Subject: rpms/hunspell-nso/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080914223244.5CDBA70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-nso/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd19708/rpms/hunspell-nso/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-nso


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-nso
# $Id: Makefile,v 1.1 2008/09/14 22:32:44 kevin Exp $
NAME := hunspell-nso
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sun Sep 14 22:33:12 2008
From: smilner at fedoraproject.org (Steve Milner)
Date: Sun, 14 Sep 2008 22:33:12 +0000 (UTC)
Subject: rpms/python-pp/devel import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 python-pp.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <20080914223312.A395E70136@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-pp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19603/devel

Modified Files:
	.cvsignore python-pp.spec sources 
Added Files:
	import.log 
Log Message:
Updating for the 1.5.6 release



--- NEW FILE import.log ---
python-pp-1_5_6-1_fc10:HEAD:python-pp-1.5.6-1.fc10.src.rpm:1221431531


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pp/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Aug 2008 22:28:44 -0000	1.7
+++ .cvsignore	14 Sep 2008 22:32:42 -0000	1.8
@@ -1 +1 @@
-pp-1.5.5.tar.gz
+pp-1.5.6.tar.gz


Index: python-pp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pp/devel/python-pp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-pp.spec	12 Aug 2008 22:28:44 -0000	1.8
+++ python-pp.spec	14 Sep 2008 22:32:42 -0000	1.9
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-pp
-Version:        1.5.5
+Version:        1.5.6
 Release:        1%{?dist}
 Summary:        Parallel execution of python on smp
 
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Sun Sep 14 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.5.6-1
+- Updated to upstream latest stable.
+
 * Fri Aug 12 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.5.5-1
 - Updated to upstream latest stable.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pp/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Aug 2008 22:28:44 -0000	1.7
+++ sources	14 Sep 2008 22:32:42 -0000	1.8
@@ -1 +1 @@
-c98807a215b69430dec956ebdf87700f  pp-1.5.5.tar.gz
+9482fe49bcce571a90e8544ded12f94d  pp-1.5.6.tar.gz



From pkgdb at fedoraproject.org  Sun Sep 14 22:36:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 14 Sep 2008 22:36:27 +0000
Subject: [pkgdb] perl-Algorithm-FastPermute (Fedora EPEL, 5) updated by kevin
Message-ID: <20080914223627.16149208D98@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-Algorithm-FastPermute
kevin has set commit to Approved for uberpackager on perl-Algorithm-FastPermute (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on perl-Algorithm-FastPermute (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on perl-Algorithm-FastPermute (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Algorithm-FastPermute



From mso at fedoraproject.org  Sun Sep 14 22:38:13 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Sun, 14 Sep 2008 22:38:13 +0000 (UTC)
Subject: rpms/gtk-nodoka-engine/F-9 gtk-nodoka-engine.spec,1.22,1.23
Message-ID: <20080914223813.E409070136@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/gtk-nodoka-engine/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20978/F-9

Modified Files:
	gtk-nodoka-engine.spec 
Log Message:


Fix mistakes in last commit, add actual changelog entry...




Index: gtk-nodoka-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-nodoka-engine/F-9/gtk-nodoka-engine.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gtk-nodoka-engine.spec	14 Sep 2008 22:31:22 -0000	1.22
+++ gtk-nodoka-engine.spec	14 Sep 2008 22:37:43 -0000	1.23
@@ -19,7 +19,6 @@
 %else
 Requires:       gtk2 >= %{?gtk2version}
 %endif
-Requires:       nodoka-filesystem
 
 %description
 Nodoka is a Murrine engine based gtk2 theme engine. The package is shipped with 
@@ -59,7 +58,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README TODO
 %{_libdir}/gtk-2.0/2.10.0/engines/libnodoka.so
-%{_datadir}/themes/Nodoka/*
+%{_datadir}/themes/Nodoka
 
 %files extras
 %defattr(-,root,root,-)
@@ -68,14 +67,12 @@
 
 
 %changelog
-* Mon Sep 15 2008 Martin Sourada <martin.sourada at gmail.com> - 0.7.1-2
+* Mon Sep 15 2008 Martin Sourada <mso at fedoraproject.org> - 0.7.1-2
+- Fix cairo context leak (rhbz #462259)
 
 * Tue Jul 22 2008 Martin Sourada <martin.sourada at gmail.com> - 0.7.1-1
 - New bugfix release
 
-* Tue May 20 2008 Martin Sourada <martin.sourada at gmail.com> - 0.7.0-2
-- Don't own %%{_datadir}/themes/Nodoka dir, instead require nodoka-filesystem
-
 * Mon Apr 14 2008 Martin Sourada <martin.sourada at gmail.com> - 0.7.0-1
 - Update to stable
 



From mso at fedoraproject.org  Sun Sep 14 22:38:14 2008
From: mso at fedoraproject.org (Martin Sourada)
Date: Sun, 14 Sep 2008 22:38:14 +0000 (UTC)
Subject: rpms/gtk-nodoka-engine/devel gtk-nodoka-engine.spec,1.23,1.24
Message-ID: <20080914223814.1328370136@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/gtk-nodoka-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20978/devel

Modified Files:
	gtk-nodoka-engine.spec 
Log Message:


Fix mistakes in last commit, add actual changelog entry...




Index: gtk-nodoka-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/gtk-nodoka-engine.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gtk-nodoka-engine.spec	14 Sep 2008 22:31:23 -0000	1.23
+++ gtk-nodoka-engine.spec	14 Sep 2008 22:37:43 -0000	1.24
@@ -68,7 +68,8 @@
 
 
 %changelog
-* Mon Sep 15 2008 Martin Sourada <martin.sourada at gmail.com> - 0.7.1-2
+* Mon Sep 15 2008 Martin Sourada <mso at fedoraproject.org> - 0.7.1-2
+- Fix cairo context leak (rhbz #462259)
 
 * Tue Jul 22 2008 Martin Sourada <martin.sourada at gmail.com> - 0.7.1-1
 - New bugfix release



From smilner at fedoraproject.org  Sun Sep 14 22:42:08 2008
From: smilner at fedoraproject.org (Steve Milner)
Date: Sun, 14 Sep 2008 22:42:08 +0000 (UTC)
Subject: rpms/python-pp/F-9 import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 python-pp.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <20080914224208.6052270136@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-pp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22124/F-9

Modified Files:
	.cvsignore python-pp.spec sources 
Added Files:
	import.log 
Log Message:
Updating for upstream 1.5.6 release.



--- NEW FILE import.log ---
python-pp-1_5_6-1_fc10:F-9:python-pp-1.5.6-1.fc10.src.rpm:1221431977


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pp/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Aug 2008 22:43:34 -0000	1.7
+++ .cvsignore	14 Sep 2008 22:41:37 -0000	1.8
@@ -1 +1 @@
-pp-1.5.5.tar.gz
+pp-1.5.6.tar.gz


Index: python-pp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pp/F-9/python-pp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-pp.spec	12 Aug 2008 22:43:34 -0000	1.8
+++ python-pp.spec	14 Sep 2008 22:41:37 -0000	1.9
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-pp
-Version:        1.5.5
+Version:        1.5.6
 Release:        1%{?dist}
 Summary:        Parallel execution of python on smp
 
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Sun Sep 14 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.5.6-1
+- Updated to upstream latest stable.
+
 * Fri Aug 12 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.5.5-1
 - Updated to upstream latest stable.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pp/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Aug 2008 22:43:34 -0000	1.7
+++ sources	14 Sep 2008 22:41:37 -0000	1.8
@@ -1 +1 @@
-c98807a215b69430dec956ebdf87700f  pp-1.5.5.tar.gz
+9482fe49bcce571a90e8544ded12f94d  pp-1.5.6.tar.gz



From wolfy at fedoraproject.org  Sun Sep 14 22:45:49 2008
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Sun, 14 Sep 2008 22:45:49 +0000 (UTC)
Subject: rpms/itpp/devel itpp-gcc43.patch,NONE,1.1 itpp.spec,1.10,1.11
Message-ID: <20080914224549.08AE670136@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/itpp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23373

Modified Files:
	itpp.spec 
Added Files:
	itpp-gcc43.patch 
Log Message:
* Sun Sep 14 2008 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 4.0.0-5
- Fix building with gcc4.3


itpp-gcc43.patch:

--- NEW FILE itpp-gcc43.patch ---
diff -up itpp-4.0.0/itpp/base/copy_vector.h.orig itpp-4.0.0/itpp/base/copy_vector.h
--- itpp-4.0.0/itpp/base/copy_vector.h.orig	2008-09-15 00:06:24.000000000 +0300
+++ itpp-4.0.0/itpp/base/copy_vector.h	2008-09-15 00:06:46.000000000 +0300
@@ -41,6 +41,7 @@
 #endif
 
 #include <itpp/base/binary.h>
+#include <cstring>
 
 
 //! \cond
diff -up itpp-4.0.0/itpp/base/operators.cpp.orig itpp-4.0.0/itpp/base/operators.cpp
--- itpp-4.0.0/itpp/base/operators.cpp.orig	2008-09-15 01:13:47.000000000 +0300
+++ itpp-4.0.0/itpp/base/operators.cpp	2008-09-15 01:15:46.000000000 +0300
@@ -435,7 +435,7 @@ namespace itpp {
 
     for (int i=0;i<a.rows();i++) {
       for (int j=0;j<a.cols();j++) {
-	temp(i,j)+=(std::complex<double>)a(i,j);
+	temp(i,j) += std::complex<double>(static_cast<double>(a(i,j)), 0.0);
       }
     }
     return temp;
@@ -461,7 +461,7 @@ namespace itpp {
 
     for (int i=0;i<a.rows();i++) {
       for (int j=0;j<a.cols();j++) {
-	temp(i,j)+=(std::complex<double>)a(i,j);
+	temp(i,j) += std::complex<double>(static_cast<double>(a(i,j)), 0.0);
       }
     }
     return temp;
@@ -474,7 +474,7 @@ namespace itpp {
 
     for (int i=0;i<a.rows();i++) {
       for (int j=0;j<a.cols();j++) {
-	temp(i,j)+=(std::complex<double>)a(i,j);
+	temp(i,j) += std::complex<double>(static_cast<double>(a(i,j)), 0.0);
       }
     }
     return temp;
diff -up itpp-4.0.0/itpp/base/binfile.cpp.orig itpp-4.0.0/itpp/base/binfile.cpp
--- itpp-4.0.0/itpp/base/binfile.cpp.orig	2008-09-15 00:53:04.000000000 +0300
+++ itpp-4.0.0/itpp/base/binfile.cpp	2008-09-15 00:53:27.000000000 +0300
@@ -29,7 +29,7 @@
 
 #include <itpp/base/binfile.h>
 #include <itpp/base/math/misc.h>
-
+#include <cstring>
 
 using std::ofstream;
 using std::ifstream;


Index: itpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/itpp/devel/itpp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- itpp.spec	23 May 2008 22:39:45 -0000	1.10
+++ itpp.spec	14 Sep 2008 22:45:18 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           itpp
 Version:        4.0.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        C++ library for math, signal/speech processing, and communications
 
 Group:          System Environment/Libraries
@@ -8,6 +8,7 @@
 URL:            http://itpp.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/itpp/itpp-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:		itpp-gcc43.patch
 
 BuildRequires:  gcc-gfortran, atlas-devel, fftw-devel
 BuildRequires:  tetex-latex
@@ -45,7 +46,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .gcc43
 
 %build
 export LDFLAGS="-L"%{_libdir}"/atlas"
@@ -102,6 +103,9 @@
 
 
 %changelog
+* Sun Sep 14 2008 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 4.0.0-5
+- Fix building with gcc4.3
+
 * Fri May 23 2008 Jon Stanley <jonstanley at gmail.com> - 4.0.0-4
 - Fix license tag
 



From rdieter at fedoraproject.org  Sun Sep 14 22:48:45 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 14 Sep 2008 22:48:45 +0000 (UTC)
Subject: rpms/libkipi/devel dead.package, NONE, 1.1 .cvsignore, 1.7,
	1.8 sources, 1.8, 1.9 libkipi.spec, 1.19, NONE
Message-ID: <20080914224845.703FC70136@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkipi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24108

Modified Files:
	.cvsignore sources 
Added Files:
	dead.package 
Removed Files:
	libkipi.spec 
Log Message:
Obsoleted by kdegraphics-4.1.0



--- NEW FILE dead.package ---
Obsoleted by kdegraphics-4.1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkipi/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 May 2008 12:32:59 -0000	1.7
+++ .cvsignore	14 Sep 2008 22:48:14 -0000	1.8
@@ -1 +0,0 @@
-libkipi-0.1.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkipi/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 May 2008 12:32:59 -0000	1.8
+++ sources	14 Sep 2008 22:48:15 -0000	1.9
@@ -1 +0,0 @@
-6fd010aa8eab7039143f69543e806c65  libkipi-0.1.6.tar.bz2


--- libkipi.spec DELETED ---



From rdieter at fedoraproject.org  Sun Sep 14 22:49:56 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 14 Sep 2008 22:49:56 +0000 (UTC)
Subject: rpms/libkexiv2/devel dead.package, NONE, 1.1 .cvsignore, 1.7,
	1.8 sources, 1.7, 1.8 libkexiv2.spec, 1.12, NONE
Message-ID: <20080914224956.87A6070136@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkexiv2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24528

Modified Files:
	.cvsignore sources 
Added Files:
	dead.package 
Removed Files:
	libkexiv2.spec 
Log Message:
Obsoleted by kdegraphics-4.1.0



--- NEW FILE dead.package ---
Obsoleted by kdegraphics-4.1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkexiv2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 May 2008 13:46:47 -0000	1.7
+++ .cvsignore	14 Sep 2008 22:49:26 -0000	1.8
@@ -1 +0,0 @@
-libkexiv2-0.1.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkexiv2/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 May 2008 13:46:47 -0000	1.7
+++ sources	14 Sep 2008 22:49:26 -0000	1.8
@@ -1 +0,0 @@
-adfd55e11f919533ba450d4d49ef078f  libkexiv2-0.1.7.tar.bz2


--- libkexiv2.spec DELETED ---



From smilner at fedoraproject.org  Sun Sep 14 22:50:10 2008
From: smilner at fedoraproject.org (Steve Milner)
Date: Sun, 14 Sep 2008 22:50:10 +0000 (UTC)
Subject: rpms/python-pp/EL-5 import.log, NONE, 1.1 .cvsignore, 1.5,
	1.6 python-pp.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20080914225010.0560770136@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-pp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24557/EL-5

Modified Files:
	.cvsignore python-pp.spec sources 
Added Files:
	import.log 
Log Message:
Importing 1.5.6 in for EL-5



--- NEW FILE import.log ---
python-pp-1_5_6-1_fc10:EL-5:python-pp-1.5.6-1.fc10.src.rpm:1221432559


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pp/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Aug 2008 22:50:50 -0000	1.5
+++ .cvsignore	14 Sep 2008 22:49:39 -0000	1.6
@@ -1 +1 @@
-pp-1.5.5.tar.gz
+pp-1.5.6.tar.gz


Index: python-pp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pp/EL-5/python-pp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-pp.spec	12 Aug 2008 22:50:50 -0000	1.4
+++ python-pp.spec	14 Sep 2008 22:49:39 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-pp
-Version:        1.5.5
+Version:        1.5.6
 Release:        1%{?dist}
 Summary:        Parallel execution of python on smp
 
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Sun Sep 14 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.5.6-1
+- Updated to upstream latest stable.
+
 * Fri Aug 12 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.5.5-1
 - Updated to upstream latest stable.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pp/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Aug 2008 22:50:50 -0000	1.5
+++ sources	14 Sep 2008 22:49:39 -0000	1.6
@@ -1 +1 @@
-c98807a215b69430dec956ebdf87700f  pp-1.5.5.tar.gz
+9482fe49bcce571a90e8544ded12f94d  pp-1.5.6.tar.gz



From rdieter at fedoraproject.org  Sun Sep 14 22:51:26 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 14 Sep 2008 22:51:26 +0000 (UTC)
Subject: rpms/libkdcraw/devel dead.package, NONE, 1.1 .cvsignore, 1.6,
	1.7 sources, 1.6, 1.7 libkdcraw.spec, 1.11, NONE
Message-ID: <20080914225126.3A02270136@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkdcraw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24912

Modified Files:
	.cvsignore sources 
Added Files:
	dead.package 
Removed Files:
	libkdcraw.spec 
Log Message:
Obsoleted by kdegraphics-4.1.0



--- NEW FILE dead.package ---
Obsoleted by kdegraphics-4.1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Mar 2008 17:51:35 -0000	1.6
+++ .cvsignore	14 Sep 2008 22:50:55 -0000	1.7
@@ -1 +0,0 @@
-libkdcraw-0.1.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Mar 2008 17:51:35 -0000	1.6
+++ sources	14 Sep 2008 22:50:55 -0000	1.7
@@ -1 +0,0 @@
-4fa5de407e9acf2eb5650d3fb5836f7d  libkdcraw-0.1.4.tar.bz2


--- libkdcraw.spec DELETED ---



From smilner at fedoraproject.org  Sun Sep 14 22:56:29 2008
From: smilner at fedoraproject.org (Steve Milner)
Date: Sun, 14 Sep 2008 22:56:29 +0000 (UTC)
Subject: rpms/python-pygments/devel import.log, NONE, 1.1 .cvsignore, 1.4,
	1.5 python-pygments.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20080914225629.898BF70136@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-pygments/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26515/devel

Modified Files:
	.cvsignore python-pygments.spec sources 
Added Files:
	import.log 
Log Message:
Updating to 0.11.1 per upstream release.



--- NEW FILE import.log ---
python-pygments-0_11_1-1_fc10:HEAD:python-pygments-0.11.1-1.fc10.src.rpm:1221432893


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jul 2008 01:39:28 -0000	1.4
+++ .cvsignore	14 Sep 2008 22:55:58 -0000	1.5
@@ -1 +1 @@
-Pygments-0.10.tar.gz
+Pygments-0.11.1.tar.gz


Index: python-pygments.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/devel/python-pygments.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-pygments.spec	22 Jul 2008 01:39:28 -0000	1.6
+++ python-pygments.spec	14 Sep 2008 22:55:59 -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:           python-pygments
-Version:        0.10
+Version:        0.11.1
 Release:        1%{?dist}
 Summary:        A syntax highlighting engine written in Python
 
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Sun Sep 14 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.11.1-1
+- Updated for upstream 0.11.
+
 * Mon Jul 21 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.10-1
 - Updated for upstream 0.10.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jul 2008 01:39:28 -0000	1.4
+++ sources	14 Sep 2008 22:55:59 -0000	1.5
@@ -1 +1 @@
-1f24bee773010d0d53690a6f4bdc8bdb  Pygments-0.10.tar.gz
+a7dc555f316437ba5241855ac306209a  Pygments-0.11.1.tar.gz



From smilner at fedoraproject.org  Sun Sep 14 23:22:10 2008
From: smilner at fedoraproject.org (Steve Milner)
Date: Sun, 14 Sep 2008 23:22:10 +0000 (UTC)
Subject: rpms/python-pygments/F-9 import.log, NONE, 1.1 .cvsignore, 1.4,
	1.5 python-pygments.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20080914232210.CC85F70136@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-pygments/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1211/F-9

Modified Files:
	.cvsignore python-pygments.spec sources 
Added Files:
	import.log 
Log Message:
Update per 0.11.1 upstream for F-9.



--- NEW FILE import.log ---
python-pygments-0_11_1-1_fc10:F-9:python-pygments-0.11.1-1.fc10.src.rpm:1221434473


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jul 2008 01:51:29 -0000	1.4
+++ .cvsignore	14 Sep 2008 23:21:40 -0000	1.5
@@ -1 +1 @@
-Pygments-0.10.tar.gz
+Pygments-0.11.1.tar.gz


Index: python-pygments.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/F-9/python-pygments.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-pygments.spec	22 Jul 2008 01:51:29 -0000	1.6
+++ python-pygments.spec	14 Sep 2008 23:21:40 -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:           python-pygments
-Version:        0.10
+Version:        0.11.1
 Release:        1%{?dist}
 Summary:        A syntax highlighting engine written in Python
 
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Sun Sep 14 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.11.1-1
+- Updated for upstream 0.11.
+
 * Mon Jul 21 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.10-1
 - Updated for upstream 0.10.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pygments/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jul 2008 01:51:29 -0000	1.4
+++ sources	14 Sep 2008 23:21:40 -0000	1.5
@@ -1 +1 @@
-1f24bee773010d0d53690a6f4bdc8bdb  Pygments-0.10.tar.gz
+a7dc555f316437ba5241855ac306209a  Pygments-0.11.1.tar.gz



From mbooth at fedoraproject.org  Sun Sep 14 23:26:27 2008
From: mbooth at fedoraproject.org (Mat Booth)
Date: Sun, 14 Sep 2008 23:26:27 +0000 (UTC)
Subject: rpms/eclipse-phpeclipse/devel
	eclipse-phpeclipse-httpd-integration.patch, 1.4,
	1.5 eclipse-phpeclipse.spec, 1.7, 1.8
Message-ID: <20080914232627.64F7A70136@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-phpeclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2650

Modified Files:
	eclipse-phpeclipse-httpd-integration.patch 
	eclipse-phpeclipse.spec 
Log Message:
* Tue Sep 09 2008 Mat Booth <fedora at matbooth.co.uk> 1.2.0-0.4.svn1573
- Fix FTBFS due to patch fuzz.



eclipse-phpeclipse-httpd-integration.patch:

Index: eclipse-phpeclipse-httpd-integration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse-httpd-integration.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-phpeclipse-httpd-integration.patch	29 Jun 2008 18:30:45 -0000	1.4
+++ eclipse-phpeclipse-httpd-integration.patch	14 Sep 2008 23:26:26 -0000	1.5
@@ -1,6 +1,6 @@
---- net.sourceforge.phpeclipse.externaltools/prefs/default_linux.properties	2005-10-13 19:38:40.000000000 +0100
-+++ net.sourceforge.phpeclipse.externaltools/prefs/default_linux.properties	2008-06-15 11:18:01.000000000 +0100
-@@ -1,14 +1,14 @@
+--- net.sourceforge.phpeclipse.externaltools/prefs/default_linux.properties	2008-09-09 17:59:31.000000000 +0100
++++ net.sourceforge.phpeclipse.externaltools/prefs/default_linux.properties	2008-09-09 18:01:44.000000000 +0100
+@@ -1,13 +1,13 @@
 -_php_run_pref=/opt/lamp/php/php
 -_external_parser=/opt/lamp/php/php -l -f {0}
 -_mysql_run_pref=/opt/lampp/lampp startmysql
@@ -24,7 +24,6 @@
  _mysql_start_background=true
  _apache_start_background=true
  _apache_stop_background=true
- _apache_restart_background=true
 --- net.sourceforge.phpeclipse.externaltools/conf/httpd.conf	1970-01-01 01:00:00.000000000 +0100
 +++ net.sourceforge.phpeclipse.externaltools/conf/httpd.conf	2008-06-22 13:09:36.000000000 +0100
 @@ -0,0 +1,23 @@


Index: eclipse-phpeclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-phpeclipse.spec	7 Sep 2008 23:00:03 -0000	1.7
+++ eclipse-phpeclipse.spec	14 Sep 2008 23:26:26 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:      eclipse-phpeclipse
 Version:   1.2.0
-Release:   0.3.svn1573%{?dist}
+Release:   0.4.svn1573%{?dist}
 Summary:   PHP Eclipse plugin
 Group:     Development/Tools
 License:   CPL
@@ -136,6 +136,9 @@
 %endif
 
 %changelog
+* Tue Sep 09 2008 Mat Booth <fedora at matbooth.co.uk> 1.2.0-0.4.svn1573
+- Fix FTBFS due to patch fuzz.
+
 * Wed Jul 30 2008 Andrew Overholt <overholt at redhat.com> 1.2.0-0.3.svn1573
 - Update for building against Eclipse SDK 3.4.
 



From mclasen at fedoraproject.org  Mon Sep 15 00:26:11 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 15 Sep 2008 00:26:11 +0000 (UTC)
Subject: rpms/gnome-session/devel ListenObjs-leak.patch, NONE,
	1.1 inhibitor-leak.patch, NONE, 1.1 previous_id-leak.patch, NONE,
	1.1 gnome-session.spec, 1.189, 1.190
Message-ID: <20080915002611.7801D70137@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16385

Modified Files:
	gnome-session.spec 
Added Files:
	ListenObjs-leak.patch inhibitor-leak.patch 
	previous_id-leak.patch 
Log Message:
Plug some memory leaks


ListenObjs-leak.patch:

--- NEW FILE ListenObjs-leak.patch ---
diff -up gnome-session-2.23.92/gnome-session/gsm-xsmp-server.c.ListenObj-leak gnome-session-2.23.92/gnome-session/gsm-xsmp-server.c
--- gnome-session-2.23.92/gnome-session/gsm-xsmp-server.c.ListenObj-leak	2008-09-14 13:36:09.000000000 -0400
+++ gnome-session-2.23.92/gnome-session/gsm-xsmp-server.c	2008-09-14 13:38:00.000000000 -0400
@@ -606,6 +606,9 @@ gsm_xsmp_server_finalize (GObject *objec
 
         g_return_if_fail (xsmp_server->priv != NULL);
 
+        IceFreeListenObjs (xsmp_server->priv->num_xsmp_sockets, 
+                           xsmp_server->priv->xsmp_sockets);
+
         if (xsmp_server->priv->client_store != NULL) {
                 g_object_unref (xsmp_server->priv->client_store);
         }

inhibitor-leak.patch:

--- NEW FILE inhibitor-leak.patch ---
diff -up gnome-session-2.23.92/gnome-session/gsm-inhibit-dialog.c.inhibitor-leak gnome-session-2.23.92/gnome-session/gsm-inhibit-dialog.c
--- gnome-session-2.23.92/gnome-session/gsm-inhibit-dialog.c.inhibitor-leak	2008-09-14 19:48:46.000000000 -0400
+++ gnome-session-2.23.92/gnome-session/gsm-inhibit-dialog.c	2008-09-14 19:47:48.000000000 -0400
@@ -496,6 +496,7 @@ add_inhibitor (GsmInhibitDialog *dialog,
 
         /* FIXME: get info from xid */
 
+        desktop_file = NULL;
         name = NULL;
         pixbuf = NULL;
         freeme = NULL;
@@ -602,6 +603,9 @@ add_inhibitor (GsmInhibitDialog *dialog,
         if (pixbuf != NULL) {
                 g_object_unref (pixbuf);
         }
+        if (desktop_file != NULL) {
+                egg_desktop_file_free (desktop_file);
+        }
 }
 
 static gboolean

previous_id-leak.patch:

--- NEW FILE previous_id-leak.patch ---
diff -up gnome-session-2.23.92/gnome-session/gsm-xsmp-client.c.previous_id-leak.patch gnome-session-2.23.92/gnome-session/gsm-xsmp-client.c
--- gnome-session-2.23.92/gnome-session/gsm-xsmp-client.c.previous_id-leak.patch	2008-09-14 18:57:14.000000000 -0400
+++ gnome-session-2.23.92/gnome-session/gsm-xsmp-client.c	2008-09-14 18:57:30.000000000 -0400
@@ -857,13 +857,12 @@ register_client_callback (SmsConn    con
                 g_debug ("GsmXSMPClient: Sending initial SaveYourself");
                 SmsSaveYourself (conn, SmSaveLocal, False, SmInteractStyleNone, False);
                 client->priv->current_save_yourself = SmSaveLocal;
-
-                free (previous_id);
         }
 
         gsm_client_set_status (GSM_CLIENT (client), GSM_CLIENT_REGISTERED);
 
         g_free (id);
+        free (previous_id);
 
         return TRUE;
 }


Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- gnome-session.spec	8 Sep 2008 23:48:28 -0000	1.189
+++ gnome-session.spec	15 Sep 2008 00:25:40 -0000	1.190
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.23.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -63,6 +63,13 @@
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(preun): GConf2 >= %{gconf2_version}
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=552292
+Patch0: ListenObjs-leak.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=552293
+Patch1: previous_id-leak.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=552294
+Patch2: inhibitor-leak.patch
+
 %description
 
 gnome-session manages a GNOME desktop session. It starts up the other core
@@ -70,6 +77,9 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .ListenObjs-leak
+%patch1 -p1 -b .previous_id-leak
+%patch2 -p1 -b .inhibitor-leak
 
 %build
 
@@ -168,6 +178,9 @@
 
 
 %changelog
+* Sun Sep 14 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.92-2
+- Plug memory leaks
+
 * Mon Sep  8 2008 Jon McCann  <jmccann at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 



From rrankin at fedoraproject.org  Mon Sep 15 01:03:15 2008
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Mon, 15 Sep 2008 01:03:15 +0000 (UTC)
Subject: rpms/gputils/F-8 .cvsignore, 1.5, 1.6 gputils.spec, 1.13,
	1.14 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: <20080915010315.8544670137@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/gputils/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26202

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 version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gputils/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Oct 2007 15:52:13 -0000	1.5
+++ .cvsignore	15 Sep 2008 01:02:44 -0000	1.6
@@ -1 +1 @@
-gputils-0.13.5.tar.gz
+gputils-0.13.6.tar.gz


Index: gputils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gputils/F-8/gputils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gputils.spec	28 Oct 2007 15:52:13 -0000	1.13
+++ gputils.spec	15 Sep 2008 01:02:45 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		gputils
-Version:	0.13.5
+Version:	0.13.6
 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)
@@ -8,8 +8,6 @@
 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 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -56,6 +52,9 @@
 %{_mandir}/fr/man1/*
 
 %changelog
+* Mon Sep 15 2008 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> 0.13.6-1
+  - New upstream version
+
 * 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/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Oct 2007 15:52:13 -0000	1.5
+++ sources	15 Sep 2008 01:02:45 -0000	1.6
@@ -1 +1 @@
-6d8e5ee2a80fbaffa780466e2eb8644b  gputils-0.13.5.tar.gz
+a95744578c6f7d616235434be1dc3603  gputils-0.13.6.tar.gz


--- gputils-0.13.5.man-fr.patch DELETED ---


--- gputils-0.13.5.man.patch DELETED ---



From rrankin at fedoraproject.org  Mon Sep 15 01:31:53 2008
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Mon, 15 Sep 2008 01:31:53 +0000 (UTC)
Subject: rpms/gputils/F-9 .cvsignore, 1.5, 1.6 gputils.spec, 1.14,
	1.15 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: <20080915013153.4898970137@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/gputils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv472

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 Version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gputils/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Oct 2007 15:45:42 -0000	1.5
+++ .cvsignore	15 Sep 2008 01:31:22 -0000	1.6
@@ -1 +1 @@
-gputils-0.13.5.tar.gz
+gputils-0.13.6.tar.gz


Index: gputils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gputils/F-9/gputils.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gputils.spec	19 Feb 2008 01:37:25 -0000	1.14
+++ gputils.spec	15 Sep 2008 01:31:22 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		gputils
-Version:	0.13.5
-Release:	2%{?dist}
+Version:	0.13.6
+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)
 
@@ -8,8 +8,6 @@
 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,19 +30,17 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
 %{__make} %{?_smp_mflags}
 
 %install
-%{__rm}  -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
-%{__rm}  -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
@@ -56,8 +52,8 @@
 %{_mandir}/fr/man1/*
 
 %changelog
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.13.5-2
-- Autorebuild for GCC 4.3
+* Mon Sep 15 2008 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> 0.13.6-1
+  - New upstream version
 
 * Sun Oct 28 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.13.5-1
   - New upstream version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gputils/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Oct 2007 15:45:42 -0000	1.5
+++ sources	15 Sep 2008 01:31:22 -0000	1.6
@@ -1 +1 @@
-6d8e5ee2a80fbaffa780466e2eb8644b  gputils-0.13.5.tar.gz
+a95744578c6f7d616235434be1dc3603  gputils-0.13.6.tar.gz


--- gputils-0.13.5.man-fr.patch DELETED ---


--- gputils-0.13.5.man.patch DELETED ---



From rrankin at fedoraproject.org  Mon Sep 15 01:33:27 2008
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Mon, 15 Sep 2008 01:33:27 +0000 (UTC)
Subject: rpms/gputils/devel .cvsignore, 1.5, 1.6 gputils.spec, 1.14,
	1.15 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: <20080915013327.A25BD70137@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/gputils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv913

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 Version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gputils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Oct 2007 15:45:42 -0000	1.5
+++ .cvsignore	15 Sep 2008 01:32:57 -0000	1.6
@@ -1 +1 @@
-gputils-0.13.5.tar.gz
+gputils-0.13.6.tar.gz


Index: gputils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gputils/devel/gputils.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gputils.spec	19 Feb 2008 01:37:25 -0000	1.14
+++ gputils.spec	15 Sep 2008 01:32:57 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		gputils
-Version:	0.13.5
-Release:	2%{?dist}
+Version:	0.13.6
+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)
 
@@ -8,8 +8,6 @@
 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,19 +30,17 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
 %{__make} %{?_smp_mflags}
 
 %install
-%{__rm}  -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
-%{__rm}  -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
@@ -56,8 +52,8 @@
 %{_mandir}/fr/man1/*
 
 %changelog
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.13.5-2
-- Autorebuild for GCC 4.3
+* Mon Sep 15 2008 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> 0.13.6-1
+  - New upstream version
 
 * Sun Oct 28 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.13.5-1
   - New upstream version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gputils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Oct 2007 15:45:42 -0000	1.5
+++ sources	15 Sep 2008 01:32:57 -0000	1.6
@@ -1 +1 @@
-6d8e5ee2a80fbaffa780466e2eb8644b  gputils-0.13.5.tar.gz
+a95744578c6f7d616235434be1dc3603  gputils-0.13.6.tar.gz


--- gputils-0.13.5.man-fr.patch DELETED ---


--- gputils-0.13.5.man.patch DELETED ---



From mclasen at fedoraproject.org  Mon Sep 15 01:51:19 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 15 Sep 2008 01:51:19 +0000 (UTC)
Subject: rpms/gnome-session/devel empty-string-leak.patch, NONE,
	1.1 gnome-session.spec, 1.190, 1.191
Message-ID: <20080915015119.EC4A670137@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5426

Modified Files:
	gnome-session.spec 
Added Files:
	empty-string-leak.patch 
Log Message:
plug memory leaks


empty-string-leak.patch:

--- NEW FILE empty-string-leak.patch ---
diff -up gnome-session-2.23.92/gnome-session/gsm-manager.c.empty-string-leak gnome-session-2.23.92/gnome-session/gsm-manager.c
--- gnome-session-2.23.92/gnome-session/gsm-manager.c.empty-string-leak	2008-09-14 21:44:18.000000000 -0400
+++ gnome-session-2.23.92/gnome-session/gsm-manager.c	2008-09-14 21:48:06.000000000 -0400
@@ -913,6 +913,7 @@ _on_query_end_session_timeout (GsmManage
                 app_id = g_strdup (gsm_client_peek_app_id (l->data));
                 if (IS_STRING_EMPTY (app_id)) {
                         /* XSMP clients don't give us an app id unless we start them */
+                        g_free (app_id);
                         app_id = gsm_client_get_app_name (l->data);
                 }
 
@@ -1529,6 +1530,7 @@ on_client_end_session_response (GsmClien
                 app_id = g_strdup (gsm_client_peek_app_id (client));
                 if (IS_STRING_EMPTY (app_id)) {
                         /* XSMP clients don't give us an app id unless we start them */
+                        g_free (app_id);
                         app_id = gsm_client_get_app_name (client);
                 }
 


Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- gnome-session.spec	15 Sep 2008 00:25:40 -0000	1.190
+++ gnome-session.spec	15 Sep 2008 01:50:49 -0000	1.191
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.23.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -69,6 +69,8 @@
 Patch1: previous_id-leak.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=552294
 Patch2: inhibitor-leak.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=552302
+Patch3: empty-string-leak.patch
 
 %description
 
@@ -80,6 +82,7 @@
 %patch0 -p1 -b .ListenObjs-leak
 %patch1 -p1 -b .previous_id-leak
 %patch2 -p1 -b .inhibitor-leak
+%patch3 -p1 -b .empty-string-leak
 
 %build
 
@@ -178,6 +181,9 @@
 
 
 %changelog
+* Sun Sep 14 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.92-3
+- Plug memory leaks
+
 * Sun Sep 14 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.92-2
 - Plug memory leaks
 



From kyle at fedoraproject.org  Mon Sep 15 02:22:25 2008
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 15 Sep 2008 02:22:25 +0000 (UTC)
Subject: rpms/kernel/F-8 config-ia64-generic, 1.8, 1.9 config-x86-generic,
	1.24, 
	1.25 config-x86_64-generic, 1.25, 1.26 kernel.spec, 1.531, 1.532
Message-ID: <20080915022225.CC3CE70137@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13191

Modified Files:
	config-ia64-generic config-x86-generic config-x86_64-generic 
	kernel.spec 
Log Message:
* Sun Sep 14 2008 Kyle McMartin <kyle at redhat.com> 2.6.26.5-22
- Turn off CONFIG_ACPI_SYSFS_POWER again, got enabled by mistake when
  the (unaffected, since hal is newer) Fedora 9 config files were copied
  for Fedora 8. (F8#452356,F8#373041)



Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-ia64-generic,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config-ia64-generic	8 Aug 2008 18:56:00 -0000	1.8
+++ config-ia64-generic	15 Sep 2008 02:21:55 -0000	1.9
@@ -115,7 +115,7 @@
 CONFIG_ACPI_AC=m
 # CONFIG_ACPI_ASUS is not set
 CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_SYSFS_POWER=y
+# CONFIG_ACPI_SYSFS_POWER is not set
 # CONFIG_ACPI_BAY is not set
 # CONFIG_ACPI_BATTERY is not set
 CONFIG_ACPI_BLACKLIST_YEAR=0


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-x86-generic,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- config-x86-generic	8 Aug 2008 18:56:00 -0000	1.24
+++ config-x86-generic	15 Sep 2008 02:21:55 -0000	1.25
@@ -129,7 +129,7 @@
 CONFIG_ACPI_AC=m
 # CONFIG_ACPI_ASUS is not set
 CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_SYSFS_POWER=y
+# CONFIG_ACPI_SYSFS_POWER is not set
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BAY=m
 CONFIG_ACPI_BLACKLIST_YEAR=1999


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-x86_64-generic,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- config-x86_64-generic	8 Aug 2008 18:56:00 -0000	1.25
+++ config-x86_64-generic	15 Sep 2008 02:21:55 -0000	1.26
@@ -73,7 +73,7 @@
 CONFIG_ACPI_AC=m
 # CONFIG_ACPI_ASUS is not set
 CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_SYSFS_POWER=y
+# CONFIG_ACPI_SYSFS_POWER is not set
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BAY=m
 CONFIG_ACPI_BLACKLIST_YEAR=0


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.531
retrieving revision 1.532
diff -u -r1.531 -r1.532
--- kernel.spec	14 Sep 2008 03:57:31 -0000	1.531
+++ kernel.spec	15 Sep 2008 02:21:55 -0000	1.532
@@ -1851,6 +1851,11 @@
 
 
 %changelog
+* Sun Sep 14 2008 Kyle McMartin <kyle at redhat.com> 2.6.26.5-22
+- Turn off CONFIG_ACPI_SYSFS_POWER again, got enabled by mistake when
+  the (unaffected, since hal is newer) Fedora 9 config files were copied
+  for Fedora 8. (F8#452356,F8#373041)
+
 * Sat Sep 13 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-21
 - Copy F9 patches into F8:
     libata: fix DMA mode mismatches



From pkgdb at fedoraproject.org  Mon Sep 15 03:24:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 03:24:11 +0000
Subject: [pkgdb] mx: mdomsch has requested commit
Message-ID: <20080915032411.3E511208DA5@bastion.fedora.phx.redhat.com>

mdomsch has requested the commit acl on mx (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mx



From pkgdb at fedoraproject.org  Mon Sep 15 03:24:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 03:24:20 +0000
Subject: [pkgdb] mx: mdomsch has requested approveacls
Message-ID: <20080915032420.9F861208DA7@bastion.fedora.phx.redhat.com>

mdomsch has requested the approveacls acl on mx (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mx



From rdieter at fedoraproject.org  Mon Sep 15 05:06:43 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 15 Sep 2008 05:06:43 +0000 (UTC)
Subject: rpms/kmymoney2/devel .cvsignore, 1.13, 1.14 kmymoney2.spec, 1.34,
	1.35 sources, 1.12, 1.13
Message-ID: <20080915050643.B631570137@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21975

Modified Files:
	.cvsignore kmymoney2.spec sources 
Log Message:
* Mon Sep 15 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9.2-2
- respun tarball 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	14 Sep 2008 22:08:03 -0000	1.13
+++ .cvsignore	15 Sep 2008 05:06:12 -0000	1.14
@@ -1 +1 @@
-kmymoney2-0.9.2.tar.bz2
+kmymoney2-0.9.2-1.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- kmymoney2.spec	14 Sep 2008 22:08:03 -0000	1.34
+++ kmymoney2.spec	15 Sep 2008 05:06:12 -0000	1.35
@@ -16,12 +16,12 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 Url:	 http://kmymoney2.sourceforge.net/
 Group:	 Applications/Productivity
-Source0: http://downloads.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}-1.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 # Upstream (and rpmforge) call this kmymoney, so we'll get ready.
@@ -187,6 +187,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9.2-2
+- respun tarball 
+
 * Sun Sep 14 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9.2-1
 - kmymoney2-0.9.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	14 Sep 2008 22:08:03 -0000	1.12
+++ sources	15 Sep 2008 05:06:12 -0000	1.13
@@ -1 +1 @@
-5d4edb7c4dc8d894243a26c7bc91efb6  kmymoney2-0.9.2.tar.bz2
+e5c164cb0d654087fa018a3779aa8fe9  kmymoney2-0.9.2-1.tar.bz2



From dchen at fedoraproject.org  Mon Sep 15 07:16:38 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon, 15 Sep 2008 07:16:38 +0000 (UTC)
Subject: rpms/man-pages-ko/devel import.log, 1.1, 1.2 man-pages-ko.spec, 1.18,
	1.19
Message-ID: <20080915071638.30D3B70137@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/man-pages-ko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20801/devel

Modified Files:
	import.log man-pages-ko.spec 
Log Message:
Bug 462197


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ko/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Aug 2008 03:12:24 -0000	1.1
+++ import.log	15 Sep 2008 07:16:07 -0000	1.2
@@ -1 +1,2 @@
 man-pages-ko-20050219-4_fc9:HEAD:man-pages-ko-20050219-4.fc9.src.rpm:1217819541
+man-pages-ko-20050219-5_fc9:HEAD:man-pages-ko-20050219-5.fc9.src.rpm:1221462843


Index: man-pages-ko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ko/devel/man-pages-ko.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- man-pages-ko.spec	4 Aug 2008 03:12:24 -0000	1.18
+++ man-pages-ko.spec	15 Sep 2008 07:16:07 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Korean(Hangul) Man(manual) Pages from the Korean Manpage Project
 Name: man-pages-ko
 Version: 20050219
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: Copyright only
 Epoch: 2
 Group: Documentation
@@ -38,15 +38,16 @@
 #conflict with shadow-utils in Fedora 9
 rm -f ./man8/vipw.8
 #conflict with rpms in Fedora 9
-rm -f ./man8/rpm.8 ./man8/rpmcpio.8
+rm -f ./man8/rpm.8 ./man8/rpm2cpio.8
 
 
+%build 
 for i in `find . -type f -name \*.gz`; do
     gunzip $i
 done
 for i in 1 1x 2 3 4 5 6 7 8 9; do
     for j in `find . -type f -name \*.$i`; do
-        case "$j" in
+        case "$j" in 
             './man7/iso_8859-1.7' | './man7/iso_8859-7.7')
                 #Already in UTF-8
                 iconv -f UTF-8 -t UTF-8 $j -o $j.out
@@ -61,14 +62,12 @@
                 gzip $j
                 ;;
         esac
-
     done
     for j in `find . -type f -name \*.$i.bak`; do
         rm -f $j
     done
 done
 
-%build 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -86,6 +85,9 @@
 %{_mandir}/ko
 
 %changelog
+* Mon Sep 15 2008 Ding-Yi Chen <dchen at redhat dot com> - 2:20050219-5
+- Fix Bug 462197 -  File conflict between man-pages-ko and rpm
+
 * Mon Aug 04 2008 Ding-Yi Chen <dchen at redhat dot com> - 2:20050219-4
 - Fix the file conflict with rpm-4.5.90
 



From dchen at fedoraproject.org  Mon Sep 15 07:18:16 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon, 15 Sep 2008 07:18:16 +0000 (UTC)
Subject: rpms/man-pages-ko/F-7 import.log, 1.1, 1.2 man-pages-ko.spec, 1.18,
	1.19
Message-ID: <20080915071816.1309F70137@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/man-pages-ko/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21344/F-7

Modified Files:
	import.log man-pages-ko.spec 
Log Message:
Bug 462197


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ko/F-7/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Aug 2008 03:14:48 -0000	1.1
+++ import.log	15 Sep 2008 07:17:45 -0000	1.2
@@ -1 +1,2 @@
 man-pages-ko-20050219-4_fc9:F-7:man-pages-ko-20050219-4.fc9.src.rpm:1217819693
+man-pages-ko-20050219-5_fc9:F-7:man-pages-ko-20050219-5.fc9.src.rpm:1221463057


Index: man-pages-ko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ko/F-7/man-pages-ko.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- man-pages-ko.spec	4 Aug 2008 03:14:48 -0000	1.18
+++ man-pages-ko.spec	15 Sep 2008 07:17:45 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Korean(Hangul) Man(manual) Pages from the Korean Manpage Project
 Name: man-pages-ko
 Version: 20050219
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: Copyright only
 Epoch: 2
 Group: Documentation
@@ -38,15 +38,16 @@
 #conflict with shadow-utils in Fedora 9
 rm -f ./man8/vipw.8
 #conflict with rpms in Fedora 9
-rm -f ./man8/rpm.8 ./man8/rpmcpio.8
+rm -f ./man8/rpm.8 ./man8/rpm2cpio.8
 
 
+%build 
 for i in `find . -type f -name \*.gz`; do
     gunzip $i
 done
 for i in 1 1x 2 3 4 5 6 7 8 9; do
     for j in `find . -type f -name \*.$i`; do
-        case "$j" in
+        case "$j" in 
             './man7/iso_8859-1.7' | './man7/iso_8859-7.7')
                 #Already in UTF-8
                 iconv -f UTF-8 -t UTF-8 $j -o $j.out
@@ -61,14 +62,12 @@
                 gzip $j
                 ;;
         esac
-
     done
     for j in `find . -type f -name \*.$i.bak`; do
         rm -f $j
     done
 done
 
-%build 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -86,6 +85,9 @@
 %{_mandir}/ko
 
 %changelog
+* Mon Sep 15 2008 Ding-Yi Chen <dchen at redhat dot com> - 2:20050219-5
+- Fix Bug 462197 -  File conflict between man-pages-ko and rpm
+
 * Mon Aug 04 2008 Ding-Yi Chen <dchen at redhat dot com> - 2:20050219-4
 - Fix the file conflict with rpm-4.5.90
 



From dchen at fedoraproject.org  Mon Sep 15 07:19:47 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon, 15 Sep 2008 07:19:47 +0000 (UTC)
Subject: rpms/man-pages-ko/F-8 import.log, 1.1, 1.2 man-pages-ko.spec, 1.18,
	1.19
Message-ID: <20080915071947.8C68C70137@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/man-pages-ko/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21791/F-8

Modified Files:
	import.log man-pages-ko.spec 
Log Message:
Bug 462197


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ko/F-8/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Aug 2008 03:16:01 -0000	1.1
+++ import.log	15 Sep 2008 07:19:17 -0000	1.2
@@ -1 +1,2 @@
 man-pages-ko-20050219-4_fc9:F-8:man-pages-ko-20050219-4.fc9.src.rpm:1217819769
+man-pages-ko-20050219-5_fc9:F-8:man-pages-ko-20050219-5.fc9.src.rpm:1221463129


Index: man-pages-ko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ko/F-8/man-pages-ko.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- man-pages-ko.spec	4 Aug 2008 03:16:01 -0000	1.18
+++ man-pages-ko.spec	15 Sep 2008 07:19:17 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Korean(Hangul) Man(manual) Pages from the Korean Manpage Project
 Name: man-pages-ko
 Version: 20050219
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: Copyright only
 Epoch: 2
 Group: Documentation
@@ -38,15 +38,16 @@
 #conflict with shadow-utils in Fedora 9
 rm -f ./man8/vipw.8
 #conflict with rpms in Fedora 9
-rm -f ./man8/rpm.8 ./man8/rpmcpio.8
+rm -f ./man8/rpm.8 ./man8/rpm2cpio.8
 
 
+%build 
 for i in `find . -type f -name \*.gz`; do
     gunzip $i
 done
 for i in 1 1x 2 3 4 5 6 7 8 9; do
     for j in `find . -type f -name \*.$i`; do
-        case "$j" in
+        case "$j" in 
             './man7/iso_8859-1.7' | './man7/iso_8859-7.7')
                 #Already in UTF-8
                 iconv -f UTF-8 -t UTF-8 $j -o $j.out
@@ -61,14 +62,12 @@
                 gzip $j
                 ;;
         esac
-
     done
     for j in `find . -type f -name \*.$i.bak`; do
         rm -f $j
     done
 done
 
-%build 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -86,6 +85,9 @@
 %{_mandir}/ko
 
 %changelog
+* Mon Sep 15 2008 Ding-Yi Chen <dchen at redhat dot com> - 2:20050219-5
+- Fix Bug 462197 -  File conflict between man-pages-ko and rpm
+
 * Mon Aug 04 2008 Ding-Yi Chen <dchen at redhat dot com> - 2:20050219-4
 - Fix the file conflict with rpm-4.5.90
 



From pkgdb at fedoraproject.org  Mon Sep 15 07:21:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 07:21:55 +0000
Subject: [pkgdb] fcron had acl change status
Message-ID: <20080915072155.9A3D1208DA3@bastion.fedora.phx.redhat.com>

dionysos has set the approveacls acl on fcron (Fedora devel) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fcron



From pkgdb at fedoraproject.org  Mon Sep 15 07:21:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 07:21:48 +0000
Subject: [pkgdb] fcron had acl change status
Message-ID: <20080915072148.40284208D9F@bastion.fedora.phx.redhat.com>

dionysos has set the commit acl on fcron (Fedora devel) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fcron



From pkgdb at fedoraproject.org  Mon Sep 15 07:21:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 07:21:59 +0000
Subject: [pkgdb] fcron had acl change status
Message-ID: <20080915072159.7A908208DA4@bastion.fedora.phx.redhat.com>

dionysos has set the commit acl on fcron (Fedora 8) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fcron



From pkgdb at fedoraproject.org  Mon Sep 15 07:22:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 07:22:03 +0000
Subject: [pkgdb] fcron had acl change status
Message-ID: <20080915072203.93119208DA8@bastion.fedora.phx.redhat.com>

dionysos has set the commit acl on fcron (Fedora 9) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fcron



From pkgdb at fedoraproject.org  Mon Sep 15 07:22:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 07:22:05 +0000
Subject: [pkgdb] fcron had acl change status
Message-ID: <20080915072205.521BB208DB4@bastion.fedora.phx.redhat.com>

dionysos has set the approveacls acl on fcron (Fedora 8) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fcron



From pkgdb at fedoraproject.org  Mon Sep 15 07:22:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 07:22:06 +0000
Subject: [pkgdb] fcron had acl change status
Message-ID: <20080915072206.67C28208DB7@bastion.fedora.phx.redhat.com>

dionysos has set the approveacls acl on fcron (Fedora 9) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fcron



From caolanm at fedoraproject.org  Mon Sep 15 07:23:57 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 15 Sep 2008 07:23:57 +0000 (UTC)
Subject: rpms/hunspell-st/devel hunspell-st.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080915072357.0939C70137@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-st/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23016/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-st.spec import.log 
Log Message:



--- NEW FILE hunspell-st.spec ---
Name: hunspell-st
Summary: Southern Sotho hunspell dictionaries
%define upstreamid 20060123
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://downloads.translate.org.za/spellchecker/southern_sotho/myspell-st_ZA-%{upstreamid}.zip
Group: Applications/Text
URL: http://www.translate.org.za/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+
BuildArch: noarch

Requires: hunspell

%description
Southern Sotho hunspell dictionaries.

%prep
%setup -q -c -n hunspell-st

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_st_ZA.txt
%{_datadir}/myspell/*

%changelog
* Thu Sep 11 2008 Caolan McNamara <caolanm at redhat.com> - 0.20060123-1
- initial version


--- NEW FILE import.log ---
hunspell-st-0_20060123-1_fc9:HEAD:hunspell-st-0.20060123-1.fc9.src.rpm:1221463457


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-st/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2008 22:32:07 -0000	1.1
+++ .cvsignore	15 Sep 2008 07:23:26 -0000	1.2
@@ -0,0 +1 @@
+myspell-st_ZA-20060123.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-st/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2008 22:32:07 -0000	1.1
+++ sources	15 Sep 2008 07:23:26 -0000	1.2
@@ -0,0 +1 @@
+66a8ea99f42a07423db3724109306cd9  myspell-st_ZA-20060123.zip



From caolanm at fedoraproject.org  Mon Sep 15 07:29:11 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 15 Sep 2008 07:29:11 +0000 (UTC)
Subject: rpms/hunspell-nso/devel hunspell-nso.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080915072911.AD73F70137@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-nso/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24481/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-nso.spec import.log 
Log Message:



--- NEW FILE hunspell-nso.spec ---
Name: hunspell-nso
Summary: Northern Sotho hunspell dictionaries
%define upstreamid 20060120
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://downloads.translate.org.za/spellchecker/northern_sotho/myspell-ns_ZA-%{upstreamid}.zip
Group: Applications/Text
URL: http://www.translate.org.za/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+
BuildArch: noarch

Requires: hunspell

%description
Northern Sotho hunspell dictionaries.

%prep
%setup -q -c -n hunspell-nso

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p ns_ZA.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/nso_ZA.dic
cp -p ns_ZA.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/nso_ZA.aff

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_ns_ZA.txt
%{_datadir}/myspell/*

%changelog
* Fri Sep 12 2008 Caolan McNamara <caolanm at redhat.com> - 0.20060120-1
- initial version


--- NEW FILE import.log ---
hunspell-nso-0_20060120-1_fc9:HEAD:hunspell-nso-0.20060120-1.fc9.src.rpm:1221463671


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-nso/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2008 22:32:43 -0000	1.1
+++ .cvsignore	15 Sep 2008 07:28:41 -0000	1.2
@@ -0,0 +1 @@
+myspell-ns_ZA-20060120.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-nso/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2008 22:32:44 -0000	1.1
+++ sources	15 Sep 2008 07:28:41 -0000	1.2
@@ -0,0 +1 @@
+0a625b4866e6c8acf35c1d92e2130b7d  myspell-ns_ZA-20060120.zip



From dchen at fedoraproject.org  Mon Sep 15 07:42:32 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon, 15 Sep 2008 07:42:32 +0000 (UTC)
Subject: rpms/man-pages-ko/F-9 import.log, 1.1, 1.2 man-pages-ko.spec, 1.18,
	1.19
Message-ID: <20080915074232.59CEB70137@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/man-pages-ko/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28966/F-9

Modified Files:
	import.log man-pages-ko.spec 
Log Message:
Bug 462197


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ko/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Aug 2008 03:18:20 -0000	1.1
+++ import.log	15 Sep 2008 07:42:01 -0000	1.2
@@ -1 +1,2 @@
 man-pages-ko-20050219-4_fc9:F-9:man-pages-ko-20050219-4.fc9.src.rpm:1217819857
+man-pages-ko-20050219-5_fc9:F-9:man-pages-ko-20050219-5.fc9.src.rpm:1221464517


Index: man-pages-ko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ko/F-9/man-pages-ko.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- man-pages-ko.spec	4 Aug 2008 03:18:20 -0000	1.18
+++ man-pages-ko.spec	15 Sep 2008 07:42:01 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Korean(Hangul) Man(manual) Pages from the Korean Manpage Project
 Name: man-pages-ko
 Version: 20050219
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: Copyright only
 Epoch: 2
 Group: Documentation
@@ -38,15 +38,16 @@
 #conflict with shadow-utils in Fedora 9
 rm -f ./man8/vipw.8
 #conflict with rpms in Fedora 9
-rm -f ./man8/rpm.8 ./man8/rpmcpio.8
+rm -f ./man8/rpm.8 ./man8/rpm2cpio.8
 
 
+%build 
 for i in `find . -type f -name \*.gz`; do
     gunzip $i
 done
 for i in 1 1x 2 3 4 5 6 7 8 9; do
     for j in `find . -type f -name \*.$i`; do
-        case "$j" in
+        case "$j" in 
             './man7/iso_8859-1.7' | './man7/iso_8859-7.7')
                 #Already in UTF-8
                 iconv -f UTF-8 -t UTF-8 $j -o $j.out
@@ -61,14 +62,12 @@
                 gzip $j
                 ;;
         esac
-
     done
     for j in `find . -type f -name \*.$i.bak`; do
         rm -f $j
     done
 done
 
-%build 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -86,6 +85,9 @@
 %{_mandir}/ko
 
 %changelog
+* Mon Sep 15 2008 Ding-Yi Chen <dchen at redhat dot com> - 2:20050219-5
+- Fix Bug 462197 -  File conflict between man-pages-ko and rpm
+
 * Mon Aug 04 2008 Ding-Yi Chen <dchen at redhat dot com> - 2:20050219-4
 - Fix the file conflict with rpm-4.5.90
 



From jreznik at fedoraproject.org  Mon Sep 15 07:50:14 2008
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Mon, 15 Sep 2008 07:50:14 +0000 (UTC)
Subject: rpms/system-config-bind/devel .cvsignore, 1.36, 1.37 sources, 1.53, 
	1.54 system-config-bind.spec, 1.75, 1.76
Message-ID: <20080915075014.68A1370137@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/system-config-bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31177

Modified Files:
	.cvsignore sources system-config-bind.spec 
Log Message:
* Mon Sep 15 2008 Jaroslav Reznik <jreznik at redhat.com> - 4.0.10-1
- Fixes listen-on ACL bug (rhbz#449046)                          
- Repackage with new translations 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	26 Aug 2008 13:31:21 -0000	1.36
+++ .cvsignore	15 Sep 2008 07:49:43 -0000	1.37
@@ -1 +1 @@
-system-config-bind-4.0.9.tar.gz
+system-config-bind-4.0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	26 Aug 2008 13:31:21 -0000	1.53
+++ sources	15 Sep 2008 07:49:43 -0000	1.54
@@ -1 +1 @@
-1a763f04661918e189b49d248de5ba13  system-config-bind-4.0.9.tar.gz
+f4140eda66812ec7cb0207204988dae9  system-config-bind-4.0.10.tar.gz


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/devel/system-config-bind.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- system-config-bind.spec	26 Aug 2008 13:31:21 -0000	1.75
+++ system-config-bind.spec	15 Sep 2008 07:49:43 -0000	1.76
@@ -1,6 +1,6 @@
 Summary:        BIND DNS Configuration Tool
 Name:           system-config-bind
-Version:        4.0.9
+Version:        4.0.10
 Release:        1%{?dist}
 URL:            http://fedorahosted.org/system-config-bind
 License:        GPLv2
@@ -81,6 +81,10 @@
 fi;
 
 %changelog
+* Mon Sep 15 2008 Jaroslav Reznik <jreznik at redhat.com> - 4.0.10-1
+- Fixes listen-on ACL bug (rhbz#449046)
+- Repackage with new translations
+
 * Tue Aug 26 2008 Jaroslav Reznik <jreznik at redhat.com> - 4.0.9-1
 - New gnome style manual (bz#326091)
 - Fixes hang when signing zone (bz#219788)



From mcepl at fedoraproject.org  Mon Sep 15 07:58:41 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Mon, 15 Sep 2008 07:58:41 +0000 (UTC)
Subject: rpms/purple-microblog/devel 0001-Clean-out-compiler-warnings.patch, 
	NONE, 1.1 0002-Fixing-build-system.patch, NONE, 1.1 import.log,
	NONE, 1.1 mbpurple-MC-build.patch, NONE,
	1.1 purple-microblog.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080915075841.5376D70137@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/purple-microblog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1521/devel

Modified Files:
	.cvsignore sources 
Added Files:
	0001-Clean-out-compiler-warnings.patch 
	0002-Fixing-build-system.patch import.log 
	mbpurple-MC-build.patch purple-microblog.spec 
Log Message:
Initial upload.


0001-Clean-out-compiler-warnings.patch:

--- NEW FILE 0001-Clean-out-compiler-warnings.patch ---
>From fe055b25b4a6442c3a5a94595c7f36d962966591 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl at redhat.com>
Date: Thu, 11 Sep 2008 14:50:56 +0200
Subject: [PATCH] Clean out compiler warnings.

The last item in struct PurpleProtocolOptions (cursed be the one who
created struct of this size!) should be unsigned int not gpointer.

Also, one missing casting and one unused function were cleaned up.
---
 microblog/mb_http.c |    2 +-
 microblog/twitter.c |    2 +-
 twitgin/twitgin.c   |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/microblog/mb_http.c b/microblog/mb_http.c
index 1e290ab..2e0fa18 100644
--- a/microblog/mb_http.c
+++ b/microblog/mb_http.c
@@ -429,7 +429,7 @@ static void mb_http_data_prepare_write(MbHttpData * data)
 	
 	// content-length, if needed
 	if(data->content) {
-		len = sprintf(cur_packet, "Content-Length: %d\r\n", data->content->len);
+		len = sprintf(cur_packet, "Content-Length: %d\r\n", (int)data->content->len);
 		cur_packet += len;
 	}
 	
diff --git a/microblog/twitter.c b/microblog/twitter.c
index 8ab48e3..dd22d00 100644
--- a/microblog/twitter.c
+++ b/microblog/twitter.c
@@ -971,7 +971,7 @@ PurplePluginProtocolInfo twitter_prpl_info = {
 	NULL,                   /* unregister_user */
 	NULL,                   /* send_attention */
 	NULL,                   /* attention_types */
-	(gpointer)sizeof(PurplePluginProtocolInfo) /* struct_size */
+	sizeof(PurplePluginProtocolInfo) /* struct_size */
 };
 
 #ifndef TWITTER_API
diff --git a/twitgin/twitgin.c b/twitgin/twitgin.c
index cede034..8498290 100644
--- a/twitgin/twitgin.c
+++ b/twitgin/twitgin.c
@@ -77,12 +77,12 @@ static void twitgin_entry_buffer_on_changed(PidginConversation *gtkconv) {
 }
 
 /* Editable stuff */
-static void twitgin_preinsert_cb(GtkTextBuffer *buffer, GtkTextIter *iter, gchar *text, gint len, GtkIMHtml *imhtml) {
+//static void twitgin_preinsert_cb(GtkTextBuffer *buffer, GtkTextIter *iter, gchar *text, gint len, GtkIMHtml *imhtml) {
 	// TODO: 
 	// if(strcmp(text,"tw:")==0) {
 	//	g_signal_stop_emission_by_name(buffer, "insert-text");	
 	// }	
-}
+//}
 
 static void create_twitter_label(PidginConversation *gtkconv) {
 	GtkWidget *label = gtk_label_new(TW_MAX_MESSAGE_SIZE_TEXT);
-- 
1.6.0.1


0002-Fixing-build-system.patch:

--- NEW FILE 0002-Fixing-build-system.patch ---
diff -up mbpurple-0.1.2/Makefile.fix-Makefile mbpurple-0.1.2/Makefile
--- mbpurple-0.1.2/Makefile.fix-Makefile	2008-09-09 08:13:00.000000000 +0200
+++ mbpurple-0.1.2/Makefile	2008-09-11 15:51:58.000000000 +0200
@@ -5,6 +5,7 @@
 include version.mak
 
 SUBDIRS = microblog twitgin
+DISTFILES = COPYING global.mak Makefile mbpurple.nsi README.txt version.mak
 
 .PHONY: all install clean build distdir
 
@@ -21,6 +22,7 @@ distdir: 
 	for dir in $(SUBDIRS); do \
 		make -C "$$dir" dist; \
 	done
+	cp -f $(DISTFILES) $(PACKAGE)-$(VERSION)/
 
 dist: distdir
 	tar -zcvf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
diff -up mbpurple-0.1.2/version.mak.fix-Makefile mbpurple-0.1.2/version.mak
--- mbpurple-0.1.2/version.mak.fix-Makefile	2008-09-09 08:13:00.000000000 +0200
+++ mbpurple-0.1.2/version.mak	2008-09-11 15:51:12.000000000 +0200
@@ -1,2 +1,2 @@
-PACKAGE := mbpurple
-VERSION := 0.2.1
\ Chyb?? znak konce ????dku na konci souboru
+PACKAGE := mbpurple
+VERSION := 0.1.2


--- NEW FILE import.log ---
purple-microblog-0_1_2-2_20080911svn148_fc9:HEAD:purple-microblog-0.1.2-2.20080911svn148.fc9.src.rpm:1221465448

mbpurple-MC-build.patch:

--- NEW FILE mbpurple-MC-build.patch ---
diff -up mbpurple-0.1.2/global.mak.RH-build mbpurple-0.1.2/global.mak
--- mbpurple-0.1.2/global.mak.RH-build	2008-09-09 08:13:00.000000000 +0200
+++ mbpurple-0.1.2/global.mak	2008-09-13 22:08:26.000000000 +0200
@@ -54,18 +54,21 @@ PLUGIN_SUFFIX := .dll
 else
 # LINUX and others, use pkg-config
 PURPLE_LIBS = $(shell pkg-config --libs purple)
-PURPLE_CFLAGS = -DPURPLE_PLUGINS -DENABLE_NLS -DMBPURPLE_VERSION=\"$(VERSION)\"
+PURPLE_CFLAGS := $(CFLAGS) -DPURPLE_PLUGINS -DENABLE_NLS -DMBPURPLE_VERSION=\"$(VERSION)\"
 PURPLE_CFLAGS += $(shell pkg-config --cflags purple)
 PURPLE_CFLAGS += -Wall -pthread -I. -g -O2 -pipe -fPIC -DPIC 
 PLUGIN_SUFFIX := .so
 
 PURPLE_PROTOCOL_PIXMAP_DIR := $(DESTDIR)$(PREFIX)/share/pixmaps/pidgin/protocols
-PURPLE_PLUGIN_DIR := $(DESTDIR)$(PREFIX)/lib/purple-2
+PURPLE_PLUGIN_DIR := $(DESTDIR)$(LIBDIR)/purple-2
 
 PIDGIN_LIBS = $(shell pkg-config --libs pidgin)
-PIDGIN_CFLAGS = -DPIDGIN_PLUGINS -DENABLE_NLS -DMBPURPLE_VERSION=\"$(VERSION)\"
+PIDGIN_CFLAGS := $(CFLAGS) -DPIDGIN_PLUGINS -DENABLE_NLS -DMBPURPLE_VERSION=\"$(VERSION)\"
 PIDGIN_CFLAGS += $(shell pkg-config --cflags pidgin)
 PIDGIN_CFLAGS += -Wall -pthread -I. -g -O2 -pipe -fPIC -DPIC 
+
+LDFLAGS := $(shell (echo $(PIDGIN_CFLAGS) $(PURPLE_CFLAGS)| tr ' ' '\n' | awk '!a[$$0]++' | tr '\n' ' '))
+
 endif
 
 dist: $(DISTFILES)


--- NEW FILE purple-microblog.spec ---
Name:           purple-microblog
Version:        0.1.2
Release:        2.20080911svn148%{?dist}
Summary:        Libpurple plug-in supporting microblog services like Twitter

Group:          Applications/Internet     
License:        GPLv3+
URL:            http://code.google.com/p/microblog-purple/
# The source for this package was pulled from upstream's vcs.  Use the
# following commands to generate the tarball:
#  svn export -r 148 http://microblog-purple.googlecode.com/svn/trunk mbpurple-%{version}
#  tar -czvf mbpurple-svn148.tar.gz mbpurple-%{version}
Source0:        http://microblog-purple.googlecode.com/files/mbpurple-svn148.tar.gz
Patch0:         0001-Clean-out-compiler-warnings.patch
Patch1:         0002-Fixing-build-system.patch
Patch9:         mbpurple-MC-build.patch        
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  pidgin-devel, ElectricFence

%description
The project aims is to develop a set of microblog support in LibPurple base
client like Pidgin. Currently it only support Twitter through the conversation
windows.

Currently the source can be built and run on Windows Vista and Ubuntu 8.04.1.
Other platform with LibPurple should works, but we don't have time (yet) to
test it. 

%prep
%setup -q -n mbpurple-%{version}
%patch0 -p1 -b .compiler-warnings
%patch1 -p1 -b .fix-Makefile
%patch9 -p1 -b .RH-build

%build
export CFLAGS="$RPM_OPT_FLAGS"
make LIBDIR=%{_libdir}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
chmod 0755 $RPM_BUILD_ROOT%{_libdir}/purple-2/libtwitter.so

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING README.txt
%{_libdir}/purple-2/*.so
%{_datadir}/pixmaps/pidgin/protocols/*/twitter.png

%changelog
* Sat Sep 13 2008 Mat??j Cepl <mcepl at redhat.com> 0.1.2-2.20080911svn148
- Updated according to reviewer's comments after approval.

* Sat Sep 13 2008 Mat??j Cepl <mcepl at redhat.com> 0.1.2-1.20080911svn148.1
- Fixing package reviewer's comments.

* Thu Sep 11 2008 Matej Cepl <mcepl at redhat.com> 0.1.2-0.20080911svn148
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/purple-microblog/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2008 22:21:09 -0000	1.1
+++ .cvsignore	15 Sep 2008 07:58:10 -0000	1.2
@@ -0,0 +1 @@
+mbpurple-svn148.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/purple-microblog/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2008 22:21:10 -0000	1.1
+++ sources	15 Sep 2008 07:58:10 -0000	1.2
@@ -0,0 +1 @@
+1b2eef67656c66fb361273f56a317eb1  mbpurple-svn148.tar.gz



From jreznik at fedoraproject.org  Mon Sep 15 08:17:59 2008
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Mon, 15 Sep 2008 08:17:59 +0000 (UTC)
Subject: rpms/system-config-bind/F-9 .cvsignore, 1.35, 1.36 sources, 1.52,
	1.53 system-config-bind.spec, 1.75,
	1.76 system-config-bind-4.0.8-listen-on-changing-fix.patch, 1.1,
	NONE system-config-bind-4.0.8-rndc-file-handling-fix.patch, 1.1, NONE
Message-ID: <20080915081759.599B770137@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/system-config-bind/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7228

Modified Files:
	.cvsignore sources system-config-bind.spec 
Removed Files:
	system-config-bind-4.0.8-listen-on-changing-fix.patch 
	system-config-bind-4.0.8-rndc-file-handling-fix.patch 
Log Message:
* Mon Sep 15 2008 Jaroslav Reznik <jreznik at redhat.com> - 4.0.10-1
- Fixes listen-on ACL bug (rhbz#449046)                          
- Repackage with new translations                                

* Tue Aug 26 2008 Jaroslav Reznik <jreznik at redhat.com> - 4.0.9-1
- New gnome style manual (bz#326091)                            
- Fixes hang when signing zone (bz#219788)                      
- Fixes Bind package changes (bz#457369)                        
- Fixes icon reference (bz#457713)                              
- Repackage with new translations                               
- Other changes     



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/F-9/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	26 May 2008 14:59:39 -0000	1.35
+++ .cvsignore	15 Sep 2008 08:17:28 -0000	1.36
@@ -1 +1 @@
-system-config-bind-4.0.8.tar.gz
+system-config-bind-4.0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/F-9/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	26 May 2008 14:59:39 -0000	1.52
+++ sources	15 Sep 2008 08:17:28 -0000	1.53
@@ -1 +1 @@
-ccfa81a4d6c189a52366feb8006b250d  system-config-bind-4.0.8.tar.gz
+f4140eda66812ec7cb0207204988dae9  system-config-bind-4.0.10.tar.gz


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/F-9/system-config-bind.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- system-config-bind.spec	5 Aug 2008 09:53:47 -0000	1.75
+++ system-config-bind.spec	15 Sep 2008 08:17:28 -0000	1.76
@@ -1,7 +1,7 @@
 Summary:        BIND DNS Configuration Tool
 Name:           system-config-bind
-Version:        4.0.8
-Release:        2%{?dist}
+Version:        4.0.10
+Release:        1%{?dist}
 URL:            http://fedorahosted.org/system-config-bind
 License:        GPLv2
 Group:          Applications/System
@@ -9,11 +9,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 BuildRequires:  python, gettext, make, intltool, desktop-file-utils
+BuildRequires:  gnome-doc-utils, docbook-dtds, scrollkeeper
 Requires:       pygtk2, gnome-python2, pygtk2-libglade, gnome-python2-canvas
 Requires:       bind, bind-utils, usermode, xdg-utils
 Requires(post): hicolor-icon-theme
-Patch:          system-config-bind-4.0.8-rndc-file-handling-fix.patch
-Patch1:         system-config-bind-4.0.8-listen-on-changing-fix.patch
 
 %description
 The system-config-bind package provides a graphical user interface (GUI) to
@@ -24,8 +23,6 @@
 
 %prep
 %setup -q
-%patch -p1
-%patch1 -p1
 
 %build
 make 
@@ -58,14 +55,13 @@
 %{_bindir}/bindconf
 %{_datadir}/system-config-bind
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/48x48/apps/system-config-bind.png
+%{_datadir}/icons/hicolor/48x48/apps/preferences-network-dns.png
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-bind
 %config(noreplace) %{_sysconfdir}/security/console.apps/bindconf
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-bind
 %config(noreplace) %{_sysconfdir}/pam.d/bindconf
-%doc docs/scb_manual.html
-%doc docs/rhdocs-man.css
-%doc docs/figs
+%doc %{_datadir}/omf/system-config-bind
+%doc %{_datadir}/gnome/help/system-config-bind
 %doc COPYING
 
 %post
@@ -85,9 +81,17 @@
 fi;
 
 %changelog
-* Thu Aug 05 2008 Jaroslav Reznik <jreznik at redhat.com> - 4.0.8-2
-- fix rndc.key file handling (bz#323161)
-- fix listen-on changing (bz#449046, bz#359781)
+* Mon Sep 15 2008 Jaroslav Reznik <jreznik at redhat.com> - 4.0.10-1
+- Fixes listen-on ACL bug (rhbz#449046)
+- Repackage with new translations
+
+* Tue Aug 26 2008 Jaroslav Reznik <jreznik at redhat.com> - 4.0.9-1
+- New gnome style manual (bz#326091)
+- Fixes hang when signing zone (bz#219788)
+- Fixes Bind package changes (bz#457369)
+- Fixes icon reference (bz#457713)
+- Repackage with new translations
+- Other changes
 
 * Mon May 26 2008 Radek Brich <rbrich at redhat.com> - 4.0.8-1
 - fix delegation-only zone creation (bz#323291)


--- system-config-bind-4.0.8-listen-on-changing-fix.patch DELETED ---


--- system-config-bind-4.0.8-rndc-file-handling-fix.patch DELETED ---



From denis at fedoraproject.org  Mon Sep 15 08:18:26 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon, 15 Sep 2008 08:18:26 +0000 (UTC)
Subject: rpms/brasero/devel .cvsignore, 1.12, 1.13 brasero.spec, 1.29,
	1.30 sources, 1.12, 1.13
Message-ID: <20080915081826.E460370137@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/brasero/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7402

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
Update to upstream 0.8.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	29 Aug 2008 10:20:10 -0000	1.12
+++ .cvsignore	15 Sep 2008 08:17:55 -0000	1.13
@@ -1 +1 @@
-brasero-0.8.1.tar.bz2
+brasero-0.8.2.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- brasero.spec	29 Aug 2008 10:20:10 -0000	1.29
+++ brasero.spec	15 Sep 2008 08:17:56 -0000	1.30
@@ -1,6 +1,6 @@
 
 Name:      brasero
-Version:   0.8.1
+Version:   0.8.2
 Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
@@ -131,6 +131,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Denis Leroy <denis at poolshark.org> - 0.8.2-1
+- Update to upstream 0.8.2
+
 * Wed Aug 27 2008 Denis Leroy <denis at poolshark.org> - 0.8.1-1
 - Update to upstream 0.8.1
 - Desktop patch upstreamed


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	29 Aug 2008 10:20:10 -0000	1.12
+++ sources	15 Sep 2008 08:17:56 -0000	1.13
@@ -1 +1 @@
-d330593a1f4b701c015259ba80e8cb8b  brasero-0.8.1.tar.bz2
+a15a8176e17c7b25315fc6097206b032  brasero-0.8.2.tar.bz2



From mcepl at fedoraproject.org  Mon Sep 15 08:18:56 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Mon, 15 Sep 2008 08:18:56 +0000 (UTC)
Subject: rpms/purple-microblog/F-8 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20080915081856.C4AB570137@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/purple-microblog/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7592

Modified Files:
	.cvsignore sources 
Log Message:
Initial upload


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/purple-microblog/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2008 22:21:09 -0000	1.1
+++ .cvsignore	15 Sep 2008 08:18:26 -0000	1.2
@@ -0,0 +1 @@
+mbpurple-svn148.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/purple-microblog/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2008 22:21:10 -0000	1.1
+++ sources	15 Sep 2008 08:18:26 -0000	1.2
@@ -0,0 +1 @@
+1b2eef67656c66fb361273f56a317eb1  mbpurple-svn148.tar.gz



From mcepl at fedoraproject.org  Mon Sep 15 08:19:30 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Mon, 15 Sep 2008 08:19:30 +0000 (UTC)
Subject: rpms/purple-microblog/F-8 0001-Clean-out-compiler-warnings.patch,
	NONE, 1.1 0002-Fixing-build-system.patch, NONE,
	1.1 mbpurple-MC-build.patch, NONE, 1.1
Message-ID: <20080915081930.ACBEB70137@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/purple-microblog/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8039

Added Files:
	0001-Clean-out-compiler-warnings.patch 
	0002-Fixing-build-system.patch mbpurple-MC-build.patch 
Log Message:
Adding patches

0001-Clean-out-compiler-warnings.patch:

--- NEW FILE 0001-Clean-out-compiler-warnings.patch ---
>From fe055b25b4a6442c3a5a94595c7f36d962966591 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl at redhat.com>
Date: Thu, 11 Sep 2008 14:50:56 +0200
Subject: [PATCH] Clean out compiler warnings.

The last item in struct PurpleProtocolOptions (cursed be the one who
created struct of this size!) should be unsigned int not gpointer.

Also, one missing casting and one unused function were cleaned up.
---
 microblog/mb_http.c |    2 +-
 microblog/twitter.c |    2 +-
 twitgin/twitgin.c   |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/microblog/mb_http.c b/microblog/mb_http.c
index 1e290ab..2e0fa18 100644
--- a/microblog/mb_http.c
+++ b/microblog/mb_http.c
@@ -429,7 +429,7 @@ static void mb_http_data_prepare_write(MbHttpData * data)
 	
 	// content-length, if needed
 	if(data->content) {
-		len = sprintf(cur_packet, "Content-Length: %d\r\n", data->content->len);
+		len = sprintf(cur_packet, "Content-Length: %d\r\n", (int)data->content->len);
 		cur_packet += len;
 	}
 	
diff --git a/microblog/twitter.c b/microblog/twitter.c
index 8ab48e3..dd22d00 100644
--- a/microblog/twitter.c
+++ b/microblog/twitter.c
@@ -971,7 +971,7 @@ PurplePluginProtocolInfo twitter_prpl_info = {
 	NULL,                   /* unregister_user */
 	NULL,                   /* send_attention */
 	NULL,                   /* attention_types */
-	(gpointer)sizeof(PurplePluginProtocolInfo) /* struct_size */
+	sizeof(PurplePluginProtocolInfo) /* struct_size */
 };
 
 #ifndef TWITTER_API
diff --git a/twitgin/twitgin.c b/twitgin/twitgin.c
index cede034..8498290 100644
--- a/twitgin/twitgin.c
+++ b/twitgin/twitgin.c
@@ -77,12 +77,12 @@ static void twitgin_entry_buffer_on_changed(PidginConversation *gtkconv) {
 }
 
 /* Editable stuff */
-static void twitgin_preinsert_cb(GtkTextBuffer *buffer, GtkTextIter *iter, gchar *text, gint len, GtkIMHtml *imhtml) {
+//static void twitgin_preinsert_cb(GtkTextBuffer *buffer, GtkTextIter *iter, gchar *text, gint len, GtkIMHtml *imhtml) {
 	// TODO: 
 	// if(strcmp(text,"tw:")==0) {
 	//	g_signal_stop_emission_by_name(buffer, "insert-text");	
 	// }	
-}
+//}
 
 static void create_twitter_label(PidginConversation *gtkconv) {
 	GtkWidget *label = gtk_label_new(TW_MAX_MESSAGE_SIZE_TEXT);
-- 
1.6.0.1


0002-Fixing-build-system.patch:

--- NEW FILE 0002-Fixing-build-system.patch ---
diff -up mbpurple-0.1.2/Makefile.fix-Makefile mbpurple-0.1.2/Makefile
--- mbpurple-0.1.2/Makefile.fix-Makefile	2008-09-09 08:13:00.000000000 +0200
+++ mbpurple-0.1.2/Makefile	2008-09-11 15:51:58.000000000 +0200
@@ -5,6 +5,7 @@
 include version.mak
 
 SUBDIRS = microblog twitgin
+DISTFILES = COPYING global.mak Makefile mbpurple.nsi README.txt version.mak
 
 .PHONY: all install clean build distdir
 
@@ -21,6 +22,7 @@ distdir: 
 	for dir in $(SUBDIRS); do \
 		make -C "$$dir" dist; \
 	done
+	cp -f $(DISTFILES) $(PACKAGE)-$(VERSION)/
 
 dist: distdir
 	tar -zcvf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
diff -up mbpurple-0.1.2/version.mak.fix-Makefile mbpurple-0.1.2/version.mak
--- mbpurple-0.1.2/version.mak.fix-Makefile	2008-09-09 08:13:00.000000000 +0200
+++ mbpurple-0.1.2/version.mak	2008-09-11 15:51:12.000000000 +0200
@@ -1,2 +1,2 @@
-PACKAGE := mbpurple
-VERSION := 0.2.1
\ Chyb?? znak konce ????dku na konci souboru
+PACKAGE := mbpurple
+VERSION := 0.1.2

mbpurple-MC-build.patch:

--- NEW FILE mbpurple-MC-build.patch ---
diff -up mbpurple-0.1.2/global.mak.RH-build mbpurple-0.1.2/global.mak
--- mbpurple-0.1.2/global.mak.RH-build	2008-09-09 08:13:00.000000000 +0200
+++ mbpurple-0.1.2/global.mak	2008-09-13 22:08:26.000000000 +0200
@@ -54,18 +54,21 @@ PLUGIN_SUFFIX := .dll
 else
 # LINUX and others, use pkg-config
 PURPLE_LIBS = $(shell pkg-config --libs purple)
-PURPLE_CFLAGS = -DPURPLE_PLUGINS -DENABLE_NLS -DMBPURPLE_VERSION=\"$(VERSION)\"
+PURPLE_CFLAGS := $(CFLAGS) -DPURPLE_PLUGINS -DENABLE_NLS -DMBPURPLE_VERSION=\"$(VERSION)\"
 PURPLE_CFLAGS += $(shell pkg-config --cflags purple)
 PURPLE_CFLAGS += -Wall -pthread -I. -g -O2 -pipe -fPIC -DPIC 
 PLUGIN_SUFFIX := .so
 
 PURPLE_PROTOCOL_PIXMAP_DIR := $(DESTDIR)$(PREFIX)/share/pixmaps/pidgin/protocols
-PURPLE_PLUGIN_DIR := $(DESTDIR)$(PREFIX)/lib/purple-2
+PURPLE_PLUGIN_DIR := $(DESTDIR)$(LIBDIR)/purple-2
 
 PIDGIN_LIBS = $(shell pkg-config --libs pidgin)
-PIDGIN_CFLAGS = -DPIDGIN_PLUGINS -DENABLE_NLS -DMBPURPLE_VERSION=\"$(VERSION)\"
+PIDGIN_CFLAGS := $(CFLAGS) -DPIDGIN_PLUGINS -DENABLE_NLS -DMBPURPLE_VERSION=\"$(VERSION)\"
 PIDGIN_CFLAGS += $(shell pkg-config --cflags pidgin)
 PIDGIN_CFLAGS += -Wall -pthread -I. -g -O2 -pipe -fPIC -DPIC 
+
+LDFLAGS := $(shell (echo $(PIDGIN_CFLAGS) $(PURPLE_CFLAGS)| tr ' ' '\n' | awk '!a[$$0]++' | tr '\n' ' '))
+
 endif
 
 dist: $(DISTFILES)



From varekova at fedoraproject.org  Mon Sep 15 08:22:27 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 15 Sep 2008 08:22:27 +0000 (UTC)
Subject: rpms/man-pages/devel man-pages.spec,1.104,1.105
Message-ID: <20080915082227.B9AB270137@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8639

Modified Files:
	man-pages.spec 
Log Message:
- remove numa_maps.5 man page (part of numactl)



Index: man-pages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- man-pages.spec	12 Sep 2008 07:42:13 -0000	1.104
+++ man-pages.spec	15 Sep 2008 08:21:57 -0000	1.105
@@ -4,7 +4,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
 Version: 3.09
-Release: 1%{?dist}
+Release: 2%{?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/
@@ -79,6 +79,9 @@
 # Part of squid
 rm -v man8/ncsa_auth.8
 
+# Part of numactl package
+rm -v man5/numa_maps.5
+
 %build
 : Nothing to build.
 
@@ -117,6 +120,9 @@
 %lang(en) %{_mandir}/en/man*
 
 %changelog
+* Mon Sep 15 2008 Ivana Varekova <varekova at redhat.com> - 3.09-2
+- remove numa_maps.5 man page (part of numactl)
+
 * Fri Sep 12 2008 Ivana Varekova <varekova at redhat.com> - 3.09-1
 - update to 3.09
 



From pkgdb at fedoraproject.org  Mon Sep 15 08:22:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 08:22:22 +0000
Subject: [pkgdb] system-config-bind had acl change status
Message-ID: <20080915082222.EBF0C208D9E@bastion.fedora.phx.redhat.com>

jreznik has set the watchcommits acl on system-config-bind (Fedora 8) to Obsolete for odvorace

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-bind



From pkgdb at fedoraproject.org  Mon Sep 15 08:22:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 08:22:30 +0000
Subject: [pkgdb] system-config-bind had acl change status
Message-ID: <20080915082231.8B9B8208DA6@bastion.fedora.phx.redhat.com>

jreznik has set the watchbugzilla acl on system-config-bind (Fedora 8) to Obsolete for odvorace

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-bind



From pkgdb at fedoraproject.org  Mon Sep 15 08:22:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 08:22:58 +0000
Subject: [pkgdb] system-config-bind had acl change status
Message-ID: <20080915082258.34084208DA0@bastion.fedora.phx.redhat.com>

jreznik has set the watchbugzilla acl on system-config-bind (Fedora 9) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-bind



From pkgdb at fedoraproject.org  Mon Sep 15 08:23:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 08:23:01 +0000
Subject: [pkgdb] system-config-bind had acl change status
Message-ID: <20080915082301.D8D89208DA4@bastion.fedora.phx.redhat.com>

jreznik has set the watchcommits acl on system-config-bind (Fedora 9) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-bind



From pkgdb at fedoraproject.org  Mon Sep 15 08:23:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 08:23:05 +0000
Subject: [pkgdb] system-config-bind had acl change status
Message-ID: <20080915082305.291C8208DA8@bastion.fedora.phx.redhat.com>

jreznik has set the commit acl on system-config-bind (Fedora 9) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-bind



From pkgdb at fedoraproject.org  Mon Sep 15 08:23:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 08:23:07 +0000
Subject: [pkgdb] system-config-bind had acl change status
Message-ID: <20080915082307.E4F86208DAA@bastion.fedora.phx.redhat.com>

jreznik has set the approveacls acl on system-config-bind (Fedora 9) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-bind



From mcepl at fedoraproject.org  Mon Sep 15 08:32:36 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Mon, 15 Sep 2008 08:32:36 +0000 (UTC)
Subject: rpms/purple-microblog/F-9 0001-Clean-out-compiler-warnings.patch,
	NONE, 
	1.1 0002-Fixing-build-system.patch, NONE, 1.1 import.log, NONE,
	1.1 mbpurple-MC-build.patch, NONE, 1.1 purple-microblog.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080915083236.51BE670137@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/purple-microblog/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11327/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	0001-Clean-out-compiler-warnings.patch 
	0002-Fixing-build-system.patch import.log 
	mbpurple-MC-build.patch purple-microblog.spec 
Log Message:
Initial commit.


0001-Clean-out-compiler-warnings.patch:

--- NEW FILE 0001-Clean-out-compiler-warnings.patch ---
>From fe055b25b4a6442c3a5a94595c7f36d962966591 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl at redhat.com>
Date: Thu, 11 Sep 2008 14:50:56 +0200
Subject: [PATCH] Clean out compiler warnings.

The last item in struct PurpleProtocolOptions (cursed be the one who
created struct of this size!) should be unsigned int not gpointer.

Also, one missing casting and one unused function were cleaned up.
---
 microblog/mb_http.c |    2 +-
 microblog/twitter.c |    2 +-
 twitgin/twitgin.c   |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/microblog/mb_http.c b/microblog/mb_http.c
index 1e290ab..2e0fa18 100644
--- a/microblog/mb_http.c
+++ b/microblog/mb_http.c
@@ -429,7 +429,7 @@ static void mb_http_data_prepare_write(MbHttpData * data)
 	
 	// content-length, if needed
 	if(data->content) {
-		len = sprintf(cur_packet, "Content-Length: %d\r\n", data->content->len);
+		len = sprintf(cur_packet, "Content-Length: %d\r\n", (int)data->content->len);
 		cur_packet += len;
 	}
 	
diff --git a/microblog/twitter.c b/microblog/twitter.c
index 8ab48e3..dd22d00 100644
--- a/microblog/twitter.c
+++ b/microblog/twitter.c
@@ -971,7 +971,7 @@ PurplePluginProtocolInfo twitter_prpl_info = {
 	NULL,                   /* unregister_user */
 	NULL,                   /* send_attention */
 	NULL,                   /* attention_types */
-	(gpointer)sizeof(PurplePluginProtocolInfo) /* struct_size */
+	sizeof(PurplePluginProtocolInfo) /* struct_size */
 };
 
 #ifndef TWITTER_API
diff --git a/twitgin/twitgin.c b/twitgin/twitgin.c
index cede034..8498290 100644
--- a/twitgin/twitgin.c
+++ b/twitgin/twitgin.c
@@ -77,12 +77,12 @@ static void twitgin_entry_buffer_on_changed(PidginConversation *gtkconv) {
 }
 
 /* Editable stuff */
-static void twitgin_preinsert_cb(GtkTextBuffer *buffer, GtkTextIter *iter, gchar *text, gint len, GtkIMHtml *imhtml) {
+//static void twitgin_preinsert_cb(GtkTextBuffer *buffer, GtkTextIter *iter, gchar *text, gint len, GtkIMHtml *imhtml) {
 	// TODO: 
 	// if(strcmp(text,"tw:")==0) {
 	//	g_signal_stop_emission_by_name(buffer, "insert-text");	
 	// }	
-}
+//}
 
 static void create_twitter_label(PidginConversation *gtkconv) {
 	GtkWidget *label = gtk_label_new(TW_MAX_MESSAGE_SIZE_TEXT);
-- 
1.6.0.1


0002-Fixing-build-system.patch:

--- NEW FILE 0002-Fixing-build-system.patch ---
diff -up mbpurple-0.1.2/Makefile.fix-Makefile mbpurple-0.1.2/Makefile
--- mbpurple-0.1.2/Makefile.fix-Makefile	2008-09-09 08:13:00.000000000 +0200
+++ mbpurple-0.1.2/Makefile	2008-09-11 15:51:58.000000000 +0200
@@ -5,6 +5,7 @@
 include version.mak
 
 SUBDIRS = microblog twitgin
+DISTFILES = COPYING global.mak Makefile mbpurple.nsi README.txt version.mak
 
 .PHONY: all install clean build distdir
 
@@ -21,6 +22,7 @@ distdir: 
 	for dir in $(SUBDIRS); do \
 		make -C "$$dir" dist; \
 	done
+	cp -f $(DISTFILES) $(PACKAGE)-$(VERSION)/
 
 dist: distdir
 	tar -zcvf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
diff -up mbpurple-0.1.2/version.mak.fix-Makefile mbpurple-0.1.2/version.mak
--- mbpurple-0.1.2/version.mak.fix-Makefile	2008-09-09 08:13:00.000000000 +0200
+++ mbpurple-0.1.2/version.mak	2008-09-11 15:51:12.000000000 +0200
@@ -1,2 +1,2 @@
-PACKAGE := mbpurple
-VERSION := 0.2.1
\ Chyb?? znak konce ????dku na konci souboru
+PACKAGE := mbpurple
+VERSION := 0.1.2


--- NEW FILE import.log ---
purple-microblog-0_1_2-2_20080911svn148_fc9:F-9:purple-microblog-0.1.2-2.20080911svn148.fc9.src.rpm:1221467286

mbpurple-MC-build.patch:

--- NEW FILE mbpurple-MC-build.patch ---
diff -up mbpurple-0.1.2/global.mak.RH-build mbpurple-0.1.2/global.mak
--- mbpurple-0.1.2/global.mak.RH-build	2008-09-09 08:13:00.000000000 +0200
+++ mbpurple-0.1.2/global.mak	2008-09-13 22:08:26.000000000 +0200
@@ -54,18 +54,21 @@ PLUGIN_SUFFIX := .dll
 else
 # LINUX and others, use pkg-config
 PURPLE_LIBS = $(shell pkg-config --libs purple)
-PURPLE_CFLAGS = -DPURPLE_PLUGINS -DENABLE_NLS -DMBPURPLE_VERSION=\"$(VERSION)\"
+PURPLE_CFLAGS := $(CFLAGS) -DPURPLE_PLUGINS -DENABLE_NLS -DMBPURPLE_VERSION=\"$(VERSION)\"
 PURPLE_CFLAGS += $(shell pkg-config --cflags purple)
 PURPLE_CFLAGS += -Wall -pthread -I. -g -O2 -pipe -fPIC -DPIC 
 PLUGIN_SUFFIX := .so
 
 PURPLE_PROTOCOL_PIXMAP_DIR := $(DESTDIR)$(PREFIX)/share/pixmaps/pidgin/protocols
-PURPLE_PLUGIN_DIR := $(DESTDIR)$(PREFIX)/lib/purple-2
+PURPLE_PLUGIN_DIR := $(DESTDIR)$(LIBDIR)/purple-2
 
 PIDGIN_LIBS = $(shell pkg-config --libs pidgin)
-PIDGIN_CFLAGS = -DPIDGIN_PLUGINS -DENABLE_NLS -DMBPURPLE_VERSION=\"$(VERSION)\"
+PIDGIN_CFLAGS := $(CFLAGS) -DPIDGIN_PLUGINS -DENABLE_NLS -DMBPURPLE_VERSION=\"$(VERSION)\"
 PIDGIN_CFLAGS += $(shell pkg-config --cflags pidgin)
 PIDGIN_CFLAGS += -Wall -pthread -I. -g -O2 -pipe -fPIC -DPIC 
+
+LDFLAGS := $(shell (echo $(PIDGIN_CFLAGS) $(PURPLE_CFLAGS)| tr ' ' '\n' | awk '!a[$$0]++' | tr '\n' ' '))
+
 endif
 
 dist: $(DISTFILES)


--- NEW FILE purple-microblog.spec ---
Name:           purple-microblog
Version:        0.1.2
Release:        2.20080911svn148%{?dist}
Summary:        Libpurple plug-in supporting microblog services like Twitter

Group:          Applications/Internet     
License:        GPLv3+
URL:            http://code.google.com/p/microblog-purple/
# The source for this package was pulled from upstream's vcs.  Use the
# following commands to generate the tarball:
#  svn export -r 148 http://microblog-purple.googlecode.com/svn/trunk mbpurple-%{version}
#  tar -czvf mbpurple-svn148.tar.gz mbpurple-%{version}
Source0:        http://microblog-purple.googlecode.com/files/mbpurple-svn148.tar.gz
Patch0:         0001-Clean-out-compiler-warnings.patch
Patch1:         0002-Fixing-build-system.patch
Patch9:         mbpurple-MC-build.patch        
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  pidgin-devel, ElectricFence

%description
The project aims is to develop a set of microblog support in LibPurple base
client like Pidgin. Currently it only support Twitter through the conversation
windows.

Currently the source can be built and run on Windows Vista and Ubuntu 8.04.1.
Other platform with LibPurple should works, but we don't have time (yet) to
test it. 

%prep
%setup -q -n mbpurple-%{version}
%patch0 -p1 -b .compiler-warnings
%patch1 -p1 -b .fix-Makefile
%patch9 -p1 -b .RH-build

%build
export CFLAGS="$RPM_OPT_FLAGS"
make LIBDIR=%{_libdir}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
chmod 0755 $RPM_BUILD_ROOT%{_libdir}/purple-2/libtwitter.so

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING README.txt
%{_libdir}/purple-2/*.so
%{_datadir}/pixmaps/pidgin/protocols/*/twitter.png

%changelog
* Sat Sep 13 2008 Mat??j Cepl <mcepl at redhat.com> 0.1.2-2.20080911svn148
- Updated according to reviewer's comments after approval.

* Sat Sep 13 2008 Mat??j Cepl <mcepl at redhat.com> 0.1.2-1.20080911svn148.1
- Fixing package reviewer's comments.

* Thu Sep 11 2008 Matej Cepl <mcepl at redhat.com> 0.1.2-0.20080911svn148
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/purple-microblog/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2008 22:21:09 -0000	1.1
+++ .cvsignore	15 Sep 2008 08:32:05 -0000	1.2
@@ -0,0 +1 @@
+mbpurple-svn148.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/purple-microblog/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2008 22:21:10 -0000	1.1
+++ sources	15 Sep 2008 08:32:05 -0000	1.2
@@ -0,0 +1 @@
+1b2eef67656c66fb361273f56a317eb1  mbpurple-svn148.tar.gz



From mjakubicek at fedoraproject.org  Mon Sep 15 08:32:57 2008
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 15 Sep 2008 08:32:57 +0000 (UTC)
Subject: rpms/orsa/devel import.log, NONE, 1.1 orsa-configure.patch, NONE,
	1.1 orsa-gcc43.patch, NONE, 1.1 orsa.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080915083257.924F570137@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/orsa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11285/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log orsa-configure.patch orsa-gcc43.patch orsa.spec 
Log Message:
-Initial release.




--- NEW FILE import.log ---
orsa-0_7_0-2_fc9:HEAD:orsa-0.7.0-2.fc9.src.rpm:1221467492

orsa-configure.patch:

--- NEW FILE orsa-configure.patch ---
--- orsa-0.7.0/configure.orig	2005-01-11 22:35:31.000000000 +0100
+++ orsa-0.7.0/configure	2008-09-07 17:06:37.000000000 +0200
@@ -20362,9 +20362,9 @@
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
     cln_min_micro_version=`echo $cln_min_version | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-    CLN_CPPFLAGS=`$CLN_CONFIG $cln_config_args --cppflags`
+    CLN_CPPFLAGS=`$CLN_CONFIG $cln_config_args --cflags`
     CLN_LIBS=`$CLN_CONFIG $cln_config_args --libs`
-    cln_config_version=`$CLN_CONFIG $cln_config_args --version`
+    cln_config_version=`$CLN_CONFIG $cln_config_args --modversion`
     cln_config_major_version=`echo $cln_config_version | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
     cln_config_minor_version=`echo $cln_config_version | \
@@ -20637,9 +20637,9 @@
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
     ginac_min_micro_version=`echo $ginac_min_version | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-    GINACLIB_CPPFLAGS=`$GINACLIB_CONFIG $ginac_args --cppflags`
+    GINACLIB_CPPFLAGS=`$GINACLIB_CONFIG $ginac_args --cflags`
     GINACLIB_LIBS=`$GINACLIB_CONFIG $ginac_args --libs`
-    ginac_config_version=`$GINACLIB_CONFIG $ginac_args --version`
+    ginac_config_version=`$GINACLIB_CONFIG $ginac_args --modversion`
     ginac_config_major_version=`echo $ginac_config_version | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
     ginac_config_minor_version=`echo $ginac_config_version | \
@@ -27012,7 +27012,7 @@
 echo "${ECHO_T}$ac_cv_have_fftw" >&6
     if test "$ac_cv_have_fftw" != "no"; then
         ac_save_LIBS="$LIBS"
-        LIBS="-lfftw $ac_save_LIBS"
+        LIBS="-lfftw -lm $ac_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27021,7 +27021,7 @@
 /* end confdefs.h.  */
 
            #include <fftw.h>
-
+           #include <math.h>
 int
 main ()
 {

orsa-gcc43.patch:

--- NEW FILE orsa-gcc43.patch ---
--- orsa-0.7.0/src/liborsa/orsa_coord.cc.orig	2004-09-21 21:44:20.000000000 +0200
+++ orsa-0.7.0/src/liborsa/orsa_coord.cc	2008-09-05 12:42:25.000000000 +0200
@@ -26,6 +26,7 @@
 
 #include <cmath>
 #include <iostream>
+#include <cstdlib>
 
 using namespace std;
 
--- orsa-0.7.0/src/liborsa/orsa_interaction.cc.orig	2005-01-04 23:31:25.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_interaction.cc	2008-09-05 12:48:19.000000000 +0200
@@ -29,6 +29,7 @@
 
 #include <cmath>
 #include <iostream>
+#include <cstdlib>
 
 using namespace std;
 
--- orsa-0.7.0/src/liborsa/orsa_interaction_tree.cc.orig	2004-10-02 02:04:30.000000000 +0200
+++ orsa-0.7.0/src/liborsa/orsa_interaction_tree.cc	2008-09-05 13:06:00.000000000 +0200
@@ -30,6 +30,7 @@
 #include <list>
 #include <stack>
 #include <map>
+#include <cstring>
 
 using namespace std;
 
--- orsa-0.7.0/src/liborsa/orsa_units.h.orig	2005-01-05 04:54:27.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_units.h	2008-09-05 18:26:01.000000000 +0200
@@ -25,6 +25,7 @@
 #ifndef _ORSA_UNITS_H
 #define _ORSA_UNITS_H
 
+#include <cstdlib>
 #include <cmath>
 #include <string>
 #include <cstdio>
--- orsa-0.7.0/src/liborsa/orsa_body.h.orig	2004-12-30 04:58:03.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_body.h	2008-09-05 18:30:26.000000000 +0200
@@ -183,7 +183,7 @@
     inline void SetVelocity(const double x, const double y, const double z) { Vector v(x,y,z); SetVelocity(v); }
     
     // b position - this position
-    inline Vector Body::distanceVector(const Body & b) const { return b.position()-position(); }
+    inline Vector distanceVector(const Body & b) const { return b.position()-position(); }
     inline double distance(const Body & b) const { return distanceVector(b).Length(); }
     
     // alias
--- orsa-0.7.0/src/liborsa/orsa_file_jpl.cc.orig	2005-01-05 03:25:06.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_file_jpl.cc	2008-09-05 18:33:41.000000000 +0200
@@ -22,6 +22,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+#include <cstring>
 #include "orsa_file.h"
 #include "orsa_error.h"
 #include "orsa_secure_math.h"
--- orsa-0.7.0/src/liborsa/orsa_file.cc.orig	2005-01-11 02:01:11.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_file.cc	2008-09-05 18:43:03.000000000 +0200
@@ -52,6 +52,9 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
+#include <cstring>
+#include <algorithm>
+
 using namespace std;
 
 namespace orsa {
--- orsa-0.7.0/src/libxorsa/xorsa_import_astorb_objects.h.orig	2005-01-05 04:04:17.000000000 +0100
+++ orsa-0.7.0/src/libxorsa/xorsa_import_astorb_objects.h	2008-09-05 18:49:29.000000000 +0200
@@ -600,7 +600,7 @@
   inline XOrsaAstorbObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null) : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8) { };
   
  public:
-  inline int XOrsaAstorbObjectItem::compare(QListViewItem *i, int col, bool ascending) const {
+  inline int compare(QListViewItem *i, int col, bool ascending) const {
 
     using std::atof;
         
--- orsa-0.7.0/src/libxorsa/xorsa_plot_area.h.orig	2005-01-05 03:25:06.000000000 +0100
+++ orsa-0.7.0/src/libxorsa/xorsa_plot_area.h	2008-09-05 18:58:44.000000000 +0200
@@ -57,7 +57,13 @@
   }
 }
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 extern char *MonthNameShort[13]; // sdncal.h
+#ifdef __cplusplus
+}
+#endif // __cplusplus
 
 void FineDate(QString & label, const orsa::UniverseTypeAwareTime & t, bool=true);
 void FineDate_HMS(QString & label, const orsa::UniverseTypeAwareTime & t);
--- orsa-0.7.0/src/libxorsa/xorsa_object_selector.cc.orig	2004-06-25 05:12:57.000000000 +0200
+++ orsa-0.7.0/src/libxorsa/xorsa_object_selector.cc	2008-09-05 19:01:33.000000000 +0200
@@ -40,7 +40,7 @@
   XOrsaObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null);
   
  public:
-  int XOrsaObjectItem::compare(QListViewItem * i, int col, bool ascending) const;    
+  int compare(QListViewItem * i, int col, bool ascending) const;    
   
 };
 
--- orsa-0.7.0/src/orsa/xorsa.h.orig	2004-07-13 04:21:19.000000000 +0200
+++ orsa-0.7.0/src/orsa/xorsa.h	2008-09-05 19:10:14.000000000 +0200
@@ -62,7 +62,7 @@
   ObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null);
   
  public:
-  int ObjectItem::compare(QListViewItem * i, int col, bool ascending) const;    
+  int compare(QListViewItem * i, int col, bool ascending) const;    
   
 };
 
--- orsa-0.7.0/src/libxorsa/xorsa_analysis.h.orig	2004-06-25 02:58:30.000000000 +0200
+++ orsa-0.7.0/src/libxorsa/xorsa_analysis.h	2008-09-07 17:26:55.000000000 +0200
@@ -129,7 +129,7 @@
   XOrsaPeaksListItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null);
   
  public:
-  int XOrsaPeaksListItem::compare(QListViewItem * i, int col, bool ascending) const;    
+  int compare(QListViewItem * i, int col, bool ascending) const;    
   
 };
 


--- NEW FILE orsa.spec ---
Name:			orsa
Version:		0.7.0
Release:		2%{?dist}
Summary:		Orbit Reconstruction, Simulation and Analysis

Group:			Amusements/Graphics
License:		GPLv2+ 
URL:			http://orsa.sourceforge.net
Source0:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# Patch to build with GCC 4.3
# Reported into upstream bugtracker as
# http://sourceforge.net/tracker/index.php?func=detail&aid=2099077&group_id=44502&atid=439768
Patch0:			%{name}-gcc43.patch
# Patching configure in order to:
# - make it find the fftw2 library properly (-lm was missing but needed)
# - make it find the cln and ginac libraries properly as they do not use 
# {cln,ginac}-config anymore but rely on pkg-config instead in F9 and higher
# Reported into upstream bugtracker as
# http://sourceforge.net/tracker/index.php?func=detail&aid=2099054&group_id=44502&atid=439768
Patch1:			%{name}-configure.patch
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	readline-devel
BuildRequires:	qt3-devel
BuildRequires:	mesa-libGL-devel
BuildRequires:	fftw2-devel
BuildRequires:	gsl-devel
BuildRequires:	cln-devel
BuildRequires:	ginac-devel
BuildRequires:	openmpi-devel

%description
ORSA is an interactive tool for scientific grade Celestial Mechanics
computations. Asteroids, comets, artificial satellites, Solar and extra-Solar
planetary systems can be accurately reproduced, simulated, and analyzed. 

%package devel
Summary:	Development files for %{name}
Group:		Development/Libraries

Requires:	fftw2-devel
Requires:	gsl-devel
Requires:	zlib-devel
Requires:	%{name} = %{version}-%{release}

%description devel
This package contains development files for %{name}.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%build
# 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
%configure --disable-static --with-mpi "CLN_CONFIG=`which pkg-config` cln" "GINACLIB_CONFIG=`which pkg-config` ginac"
# 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}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# we don't want to ship libtool archives:
rm $RPM_BUILD_ROOT%{_libdir}/liborsa.la $RPM_BUILD_ROOT%{_libdir}/libxorsa.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING DEVELOPERS
%{_bindir}/xorsa
%{_libdir}/liborsa.so.*
%{_libdir}/libxorsa.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/liborsa.so
%{_libdir}/libxorsa.so

%changelog
* Wed Sep 10 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 0.7.0-2
- Patched configure to honor $RPM_OPT_FLAGS
- Added missing Requires: to the -devel subpackage

* Fri Sep 5 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 0.7.0-1
- Initial release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/orsa/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2008 22:26:11 -0000	1.1
+++ .cvsignore	15 Sep 2008 08:32:27 -0000	1.2
@@ -0,0 +1 @@
+orsa-0.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/orsa/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2008 22:26:12 -0000	1.1
+++ sources	15 Sep 2008 08:32:27 -0000	1.2
@@ -0,0 +1 @@
+16c86f3aa73920631f9768d8c70cce70  orsa-0.7.0.tar.gz



From mjakubicek at fedoraproject.org  Mon Sep 15 08:36:41 2008
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 15 Sep 2008 08:36:41 +0000 (UTC)
Subject: rpms/orsa/F-9 import.log, NONE, 1.1 orsa-configure.patch, NONE,
	1.1 orsa-gcc43.patch, NONE, 1.1 orsa.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080915083641.7807270137@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/orsa/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12261/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log orsa-configure.patch orsa-gcc43.patch orsa.spec 
Log Message:
- Initial release.




--- NEW FILE import.log ---
orsa-0_7_0-2_fc9:F-9:orsa-0.7.0-2.fc9.src.rpm:1221467642

orsa-configure.patch:

--- NEW FILE orsa-configure.patch ---
--- orsa-0.7.0/configure.orig	2005-01-11 22:35:31.000000000 +0100
+++ orsa-0.7.0/configure	2008-09-07 17:06:37.000000000 +0200
@@ -20362,9 +20362,9 @@
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
     cln_min_micro_version=`echo $cln_min_version | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-    CLN_CPPFLAGS=`$CLN_CONFIG $cln_config_args --cppflags`
+    CLN_CPPFLAGS=`$CLN_CONFIG $cln_config_args --cflags`
     CLN_LIBS=`$CLN_CONFIG $cln_config_args --libs`
-    cln_config_version=`$CLN_CONFIG $cln_config_args --version`
+    cln_config_version=`$CLN_CONFIG $cln_config_args --modversion`
     cln_config_major_version=`echo $cln_config_version | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
     cln_config_minor_version=`echo $cln_config_version | \
@@ -20637,9 +20637,9 @@
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
     ginac_min_micro_version=`echo $ginac_min_version | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-    GINACLIB_CPPFLAGS=`$GINACLIB_CONFIG $ginac_args --cppflags`
+    GINACLIB_CPPFLAGS=`$GINACLIB_CONFIG $ginac_args --cflags`
     GINACLIB_LIBS=`$GINACLIB_CONFIG $ginac_args --libs`
-    ginac_config_version=`$GINACLIB_CONFIG $ginac_args --version`
+    ginac_config_version=`$GINACLIB_CONFIG $ginac_args --modversion`
     ginac_config_major_version=`echo $ginac_config_version | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
     ginac_config_minor_version=`echo $ginac_config_version | \
@@ -27012,7 +27012,7 @@
 echo "${ECHO_T}$ac_cv_have_fftw" >&6
     if test "$ac_cv_have_fftw" != "no"; then
         ac_save_LIBS="$LIBS"
-        LIBS="-lfftw $ac_save_LIBS"
+        LIBS="-lfftw -lm $ac_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27021,7 +27021,7 @@
 /* end confdefs.h.  */
 
            #include <fftw.h>
-
+           #include <math.h>
 int
 main ()
 {

orsa-gcc43.patch:

--- NEW FILE orsa-gcc43.patch ---
--- orsa-0.7.0/src/liborsa/orsa_coord.cc.orig	2004-09-21 21:44:20.000000000 +0200
+++ orsa-0.7.0/src/liborsa/orsa_coord.cc	2008-09-05 12:42:25.000000000 +0200
@@ -26,6 +26,7 @@
 
 #include <cmath>
 #include <iostream>
+#include <cstdlib>
 
 using namespace std;
 
--- orsa-0.7.0/src/liborsa/orsa_interaction.cc.orig	2005-01-04 23:31:25.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_interaction.cc	2008-09-05 12:48:19.000000000 +0200
@@ -29,6 +29,7 @@
 
 #include <cmath>
 #include <iostream>
+#include <cstdlib>
 
 using namespace std;
 
--- orsa-0.7.0/src/liborsa/orsa_interaction_tree.cc.orig	2004-10-02 02:04:30.000000000 +0200
+++ orsa-0.7.0/src/liborsa/orsa_interaction_tree.cc	2008-09-05 13:06:00.000000000 +0200
@@ -30,6 +30,7 @@
 #include <list>
 #include <stack>
 #include <map>
+#include <cstring>
 
 using namespace std;
 
--- orsa-0.7.0/src/liborsa/orsa_units.h.orig	2005-01-05 04:54:27.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_units.h	2008-09-05 18:26:01.000000000 +0200
@@ -25,6 +25,7 @@
 #ifndef _ORSA_UNITS_H
 #define _ORSA_UNITS_H
 
+#include <cstdlib>
 #include <cmath>
 #include <string>
 #include <cstdio>
--- orsa-0.7.0/src/liborsa/orsa_body.h.orig	2004-12-30 04:58:03.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_body.h	2008-09-05 18:30:26.000000000 +0200
@@ -183,7 +183,7 @@
     inline void SetVelocity(const double x, const double y, const double z) { Vector v(x,y,z); SetVelocity(v); }
     
     // b position - this position
-    inline Vector Body::distanceVector(const Body & b) const { return b.position()-position(); }
+    inline Vector distanceVector(const Body & b) const { return b.position()-position(); }
     inline double distance(const Body & b) const { return distanceVector(b).Length(); }
     
     // alias
--- orsa-0.7.0/src/liborsa/orsa_file_jpl.cc.orig	2005-01-05 03:25:06.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_file_jpl.cc	2008-09-05 18:33:41.000000000 +0200
@@ -22,6 +22,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+#include <cstring>
 #include "orsa_file.h"
 #include "orsa_error.h"
 #include "orsa_secure_math.h"
--- orsa-0.7.0/src/liborsa/orsa_file.cc.orig	2005-01-11 02:01:11.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_file.cc	2008-09-05 18:43:03.000000000 +0200
@@ -52,6 +52,9 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
+#include <cstring>
+#include <algorithm>
+
 using namespace std;
 
 namespace orsa {
--- orsa-0.7.0/src/libxorsa/xorsa_import_astorb_objects.h.orig	2005-01-05 04:04:17.000000000 +0100
+++ orsa-0.7.0/src/libxorsa/xorsa_import_astorb_objects.h	2008-09-05 18:49:29.000000000 +0200
@@ -600,7 +600,7 @@
   inline XOrsaAstorbObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null) : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8) { };
   
  public:
-  inline int XOrsaAstorbObjectItem::compare(QListViewItem *i, int col, bool ascending) const {
+  inline int compare(QListViewItem *i, int col, bool ascending) const {
 
     using std::atof;
         
--- orsa-0.7.0/src/libxorsa/xorsa_plot_area.h.orig	2005-01-05 03:25:06.000000000 +0100
+++ orsa-0.7.0/src/libxorsa/xorsa_plot_area.h	2008-09-05 18:58:44.000000000 +0200
@@ -57,7 +57,13 @@
   }
 }
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 extern char *MonthNameShort[13]; // sdncal.h
+#ifdef __cplusplus
+}
+#endif // __cplusplus
 
 void FineDate(QString & label, const orsa::UniverseTypeAwareTime & t, bool=true);
 void FineDate_HMS(QString & label, const orsa::UniverseTypeAwareTime & t);
--- orsa-0.7.0/src/libxorsa/xorsa_object_selector.cc.orig	2004-06-25 05:12:57.000000000 +0200
+++ orsa-0.7.0/src/libxorsa/xorsa_object_selector.cc	2008-09-05 19:01:33.000000000 +0200
@@ -40,7 +40,7 @@
   XOrsaObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null);
   
  public:
-  int XOrsaObjectItem::compare(QListViewItem * i, int col, bool ascending) const;    
+  int compare(QListViewItem * i, int col, bool ascending) const;    
   
 };
 
--- orsa-0.7.0/src/orsa/xorsa.h.orig	2004-07-13 04:21:19.000000000 +0200
+++ orsa-0.7.0/src/orsa/xorsa.h	2008-09-05 19:10:14.000000000 +0200
@@ -62,7 +62,7 @@
   ObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null);
   
  public:
-  int ObjectItem::compare(QListViewItem * i, int col, bool ascending) const;    
+  int compare(QListViewItem * i, int col, bool ascending) const;    
   
 };
 
--- orsa-0.7.0/src/libxorsa/xorsa_analysis.h.orig	2004-06-25 02:58:30.000000000 +0200
+++ orsa-0.7.0/src/libxorsa/xorsa_analysis.h	2008-09-07 17:26:55.000000000 +0200
@@ -129,7 +129,7 @@
   XOrsaPeaksListItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null);
   
  public:
-  int XOrsaPeaksListItem::compare(QListViewItem * i, int col, bool ascending) const;    
+  int compare(QListViewItem * i, int col, bool ascending) const;    
   
 };
 


--- NEW FILE orsa.spec ---
Name:			orsa
Version:		0.7.0
Release:		2%{?dist}
Summary:		Orbit Reconstruction, Simulation and Analysis

Group:			Amusements/Graphics
License:		GPLv2+ 
URL:			http://orsa.sourceforge.net
Source0:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# Patch to build with GCC 4.3
# Reported into upstream bugtracker as
# http://sourceforge.net/tracker/index.php?func=detail&aid=2099077&group_id=44502&atid=439768
Patch0:			%{name}-gcc43.patch
# Patching configure in order to:
# - make it find the fftw2 library properly (-lm was missing but needed)
# - make it find the cln and ginac libraries properly as they do not use 
# {cln,ginac}-config anymore but rely on pkg-config instead in F9 and higher
# Reported into upstream bugtracker as
# http://sourceforge.net/tracker/index.php?func=detail&aid=2099054&group_id=44502&atid=439768
Patch1:			%{name}-configure.patch
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	readline-devel
BuildRequires:	qt3-devel
BuildRequires:	mesa-libGL-devel
BuildRequires:	fftw2-devel
BuildRequires:	gsl-devel
BuildRequires:	cln-devel
BuildRequires:	ginac-devel
BuildRequires:	openmpi-devel

%description
ORSA is an interactive tool for scientific grade Celestial Mechanics
computations. Asteroids, comets, artificial satellites, Solar and extra-Solar
planetary systems can be accurately reproduced, simulated, and analyzed. 

%package devel
Summary:	Development files for %{name}
Group:		Development/Libraries

Requires:	fftw2-devel
Requires:	gsl-devel
Requires:	zlib-devel
Requires:	%{name} = %{version}-%{release}

%description devel
This package contains development files for %{name}.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%build
# 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
%configure --disable-static --with-mpi "CLN_CONFIG=`which pkg-config` cln" "GINACLIB_CONFIG=`which pkg-config` ginac"
# 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}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# we don't want to ship libtool archives:
rm $RPM_BUILD_ROOT%{_libdir}/liborsa.la $RPM_BUILD_ROOT%{_libdir}/libxorsa.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING DEVELOPERS
%{_bindir}/xorsa
%{_libdir}/liborsa.so.*
%{_libdir}/libxorsa.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/liborsa.so
%{_libdir}/libxorsa.so

%changelog
* Wed Sep 10 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 0.7.0-2
- Patched configure to honor $RPM_OPT_FLAGS
- Added missing Requires: to the -devel subpackage

* Fri Sep 5 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 0.7.0-1
- Initial release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/orsa/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2008 22:26:11 -0000	1.1
+++ .cvsignore	15 Sep 2008 08:36:10 -0000	1.2
@@ -0,0 +1 @@
+orsa-0.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/orsa/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2008 22:26:12 -0000	1.1
+++ sources	15 Sep 2008 08:36:11 -0000	1.2
@@ -0,0 +1 @@
+16c86f3aa73920631f9768d8c70cce70  orsa-0.7.0.tar.gz



From caolanm at fedoraproject.org  Mon Sep 15 08:39:09 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 15 Sep 2008 08:39:09 +0000 (UTC)
Subject: rpms/hunspell/devel hunspell.spec,1.50,1.51
Message-ID: <20080915083909.B0C3070137@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13401

Modified Files:
	hunspell.spec 
Log Message:
Workaround rhbz#462184 uniq/sort problems with viramas


Index: hunspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/devel/hunspell.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- hunspell.spec	9 Sep 2008 08:59:14 -0000	1.50
+++ hunspell.spec	15 Sep 2008 08:38:38 -0000	1.51
@@ -1,7 +1,7 @@
 Name:      hunspell
 Summary:   Hunspell is a spell checker and morphological analyzer library
 Version:   1.2.7
-Release:   2%{?dist}
+Release:   3%{?dist}
 Source0:   http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz
 Source1:   http://people.debian.org/~agmartin/misc/ispellaff2myspell
 Source2:   http://people.redhat.com/caolanm/hunspell/wordlist2hunspell
@@ -97,6 +97,9 @@
 %{_mandir}/man3/hunspell.3.gz
 
 %changelog
+* Mon Sep 15 2008 Caolan McNamara <caolanm at redhat.com> - 1.2.7-3
+- Workaround rhbz#462184 uniq/sort problems with viramas
+
 * Tue Sep 09 2008 Caolan McNamara <caolanm at redhat.com> - 1.2.7-2
 - add wordlist2hunspell
 



From denis at fedoraproject.org  Mon Sep 15 08:39:23 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon, 15 Sep 2008 08:39:23 +0000 (UTC)
Subject: rpms/clutter-cairomm/devel clutter-cairomm-0.7.2-pclib.patch, NONE, 
	1.1 clutter-cairomm.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080915083923.DC04A70137@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/clutter-cairomm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13108/devel

Modified Files:
	.cvsignore sources 
Added Files:
	clutter-cairomm-0.7.2-pclib.patch clutter-cairomm.spec 
	import.log 
Log Message:
Initial version


clutter-cairomm-0.7.2-pclib.patch:

--- NEW FILE clutter-cairomm-0.7.2-pclib.patch ---
--- clutter-cairomm-0.7.2/clutter-cairo/clutter-cairomm.pc.in.orig	2008-09-07 23:59:55.000000000 +0200
+++ clutter-cairomm-0.7.2/clutter-cairo/clutter-cairomm.pc.in	2008-09-08 00:00:08.000000000 +0200
@@ -7,5 +7,5 @@
 Description: C++ wrapper for clutter
 Requires: clutter- at API_VER@ cluttermm- at API_VER@ cairomm-1.0
 Version: @VERSION@
-Libs: -L${libdir} -lcluttermm-cairo- at API_VER@
+Libs: -L${libdir} -lclutter-cairomm- at API_VER@
 Cflags: -I${includedir}/clutter-cairomm- at API_VER@


--- NEW FILE clutter-cairomm.spec ---
%define api_ver 0.8

Name:           clutter-cairomm
Version:        0.7.2
Release:        1%{?dist}

Summary:        C++ wrapper for clutter-cairo library

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.gtkmm.org/
Source0:        http://ftp.gnome.org/pub/GNOME/sources/clutter-cairomm/0.7/%{name}-%{version}.tar.bz2
Patch0:         clutter-cairomm-0.7.2-pclib.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: clutter-cairo-devel
BuildRequires: cluttermm-devel
BuildRequires: cairomm-devel
BuildRequires: doxygen graphviz


%description
Clutter-cairomm is a C++ wrapper library for clutter-cairo: a library
that allows clutter to be embedded in cairo applications. Clutter is
an OpenGL-based library for creating fast, visually rich and animated
graphical user interfaces.


%package        devel
Summary:        Headers for developing programs that will use %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       cluttermm-devel
Requires:       cairomm-devel
Requires:       pkgconfig


%description devel
This package contains the static libraries and header files needed for
developing %{name} applications.


%prep
%setup -q
%patch0 -p1 -b .pclib


%build
%configure --enable-shared --disable-dependency-tracking
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
# Remove files related to code generation
rm -rf $RPM_BUILD_ROOT%{_libdir}/clutter-cairomm-%{api_ver}
rm -rf $RPM_BUILD_ROOT%{_libdir}/cluttermm-%{api_ver}


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-, root, root, -)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_libdir}/libclutter-cairomm-0.8.so.*


%files devel
%defattr(-, root, root, -)
%doc docs/reference/html/ examples/test-actors.cc
%{_includedir}/clutter-cairomm-%{api_ver}
%{_libdir}/libclutter-cairomm-%{api_ver}.so
%{_libdir}/pkgconfig/%{name}-%{api_ver}.pc


%changelog
* Sun Sep  7 2008 Denis Leroy <denis at poolshark.org> - 0.7.2-1
- Initial version



--- NEW FILE import.log ---
clutter-cairomm-0_7_2-1_fc10:HEAD:clutter-cairomm-0.7.2-1.fc10.src.rpm:1221467762


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-cairomm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2008 22:27:59 -0000	1.1
+++ .cvsignore	15 Sep 2008 08:38:53 -0000	1.2
@@ -0,0 +1 @@
+clutter-cairomm-0.7.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-cairomm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2008 22:27:59 -0000	1.1
+++ sources	15 Sep 2008 08:38:53 -0000	1.2
@@ -0,0 +1 @@
+0bf1158ba3dd1ce9669154e76faba9a8  clutter-cairomm-0.7.2.tar.bz2



From mcepl at fedoraproject.org  Mon Sep 15 08:41:28 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Mon, 15 Sep 2008 08:41:28 +0000 (UTC)
Subject: rpms/purple-microblog/F-8 import.log, NONE,
	1.1 purple-microblog.spec, NONE, 1.1
Message-ID: <20080915084128.C5F3E70137@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/purple-microblog/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13984/F-8

Added Files:
	import.log purple-microblog.spec 
Log Message:
Initial commit.



--- NEW FILE import.log ---
purple-microblog-0_1_2-2_20080911svn148_fc9:F-8:purple-microblog-0.1.2-2.20080911svn148.fc9.src.rpm:1221468028


--- NEW FILE purple-microblog.spec ---
Name:           purple-microblog
Version:        0.1.2
Release:        2.20080911svn148%{?dist}
Summary:        Libpurple plug-in supporting microblog services like Twitter

Group:          Applications/Internet     
License:        GPLv3+
URL:            http://code.google.com/p/microblog-purple/
# The source for this package was pulled from upstream's vcs.  Use the
# following commands to generate the tarball:
#  svn export -r 148 http://microblog-purple.googlecode.com/svn/trunk mbpurple-%{version}
#  tar -czvf mbpurple-svn148.tar.gz mbpurple-%{version}
Source0:        http://microblog-purple.googlecode.com/files/mbpurple-svn148.tar.gz
Patch0:         0001-Clean-out-compiler-warnings.patch
Patch1:         0002-Fixing-build-system.patch
Patch9:         mbpurple-MC-build.patch        
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  pidgin-devel, ElectricFence

%description
The project aims is to develop a set of microblog support in LibPurple base
client like Pidgin. Currently it only support Twitter through the conversation
windows.

Currently the source can be built and run on Windows Vista and Ubuntu 8.04.1.
Other platform with LibPurple should works, but we don't have time (yet) to
test it. 

%prep
%setup -q -n mbpurple-%{version}
%patch0 -p1 -b .compiler-warnings
%patch1 -p1 -b .fix-Makefile
%patch9 -p1 -b .RH-build

%build
export CFLAGS="$RPM_OPT_FLAGS"
make LIBDIR=%{_libdir}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
chmod 0755 $RPM_BUILD_ROOT%{_libdir}/purple-2/libtwitter.so

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING README.txt
%{_libdir}/purple-2/*.so
%{_datadir}/pixmaps/pidgin/protocols/*/twitter.png

%changelog
* Sat Sep 13 2008 Mat??j Cepl <mcepl at redhat.com> 0.1.2-2.20080911svn148
- Updated according to reviewer's comments after approval.

* Sat Sep 13 2008 Mat??j Cepl <mcepl at redhat.com> 0.1.2-1.20080911svn148.1
- Fixing package reviewer's comments.

* Thu Sep 11 2008 Matej Cepl <mcepl at redhat.com> 0.1.2-0.20080911svn148
- Initial build.



From mjakubicek at fedoraproject.org  Mon Sep 15 08:45:59 2008
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 15 Sep 2008 08:45:59 +0000 (UTC)
Subject: rpms/orsa/F-8 import.log, NONE, 1.1 orsa-configure.patch, NONE,
	1.1 orsa-gcc43.patch, NONE, 1.1 orsa.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080915084559.91DE670137@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/orsa/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14431/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log orsa-configure.patch orsa-gcc43.patch orsa.spec 
Log Message:
- Initial release




--- NEW FILE import.log ---
orsa-0_7_0-2_fc9:F-8:orsa-0.7.0-2.fc9.src.rpm:1221468295

orsa-configure.patch:

--- NEW FILE orsa-configure.patch ---
--- orsa-0.7.0/configure.orig	2005-01-11 22:35:31.000000000 +0100
+++ orsa-0.7.0/configure	2008-09-07 17:06:37.000000000 +0200
@@ -20362,9 +20362,9 @@
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
     cln_min_micro_version=`echo $cln_min_version | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-    CLN_CPPFLAGS=`$CLN_CONFIG $cln_config_args --cppflags`
+    CLN_CPPFLAGS=`$CLN_CONFIG $cln_config_args --cflags`
     CLN_LIBS=`$CLN_CONFIG $cln_config_args --libs`
-    cln_config_version=`$CLN_CONFIG $cln_config_args --version`
+    cln_config_version=`$CLN_CONFIG $cln_config_args --modversion`
     cln_config_major_version=`echo $cln_config_version | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
     cln_config_minor_version=`echo $cln_config_version | \
@@ -20637,9 +20637,9 @@
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
     ginac_min_micro_version=`echo $ginac_min_version | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-    GINACLIB_CPPFLAGS=`$GINACLIB_CONFIG $ginac_args --cppflags`
+    GINACLIB_CPPFLAGS=`$GINACLIB_CONFIG $ginac_args --cflags`
     GINACLIB_LIBS=`$GINACLIB_CONFIG $ginac_args --libs`
-    ginac_config_version=`$GINACLIB_CONFIG $ginac_args --version`
+    ginac_config_version=`$GINACLIB_CONFIG $ginac_args --modversion`
     ginac_config_major_version=`echo $ginac_config_version | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
     ginac_config_minor_version=`echo $ginac_config_version | \
@@ -27012,7 +27012,7 @@
 echo "${ECHO_T}$ac_cv_have_fftw" >&6
     if test "$ac_cv_have_fftw" != "no"; then
         ac_save_LIBS="$LIBS"
-        LIBS="-lfftw $ac_save_LIBS"
+        LIBS="-lfftw -lm $ac_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27021,7 +27021,7 @@
 /* end confdefs.h.  */
 
            #include <fftw.h>
-
+           #include <math.h>
 int
 main ()
 {

orsa-gcc43.patch:

--- NEW FILE orsa-gcc43.patch ---
--- orsa-0.7.0/src/liborsa/orsa_coord.cc.orig	2004-09-21 21:44:20.000000000 +0200
+++ orsa-0.7.0/src/liborsa/orsa_coord.cc	2008-09-05 12:42:25.000000000 +0200
@@ -26,6 +26,7 @@
 
 #include <cmath>
 #include <iostream>
+#include <cstdlib>
 
 using namespace std;
 
--- orsa-0.7.0/src/liborsa/orsa_interaction.cc.orig	2005-01-04 23:31:25.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_interaction.cc	2008-09-05 12:48:19.000000000 +0200
@@ -29,6 +29,7 @@
 
 #include <cmath>
 #include <iostream>
+#include <cstdlib>
 
 using namespace std;
 
--- orsa-0.7.0/src/liborsa/orsa_interaction_tree.cc.orig	2004-10-02 02:04:30.000000000 +0200
+++ orsa-0.7.0/src/liborsa/orsa_interaction_tree.cc	2008-09-05 13:06:00.000000000 +0200
@@ -30,6 +30,7 @@
 #include <list>
 #include <stack>
 #include <map>
+#include <cstring>
 
 using namespace std;
 
--- orsa-0.7.0/src/liborsa/orsa_units.h.orig	2005-01-05 04:54:27.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_units.h	2008-09-05 18:26:01.000000000 +0200
@@ -25,6 +25,7 @@
 #ifndef _ORSA_UNITS_H
 #define _ORSA_UNITS_H
 
+#include <cstdlib>
 #include <cmath>
 #include <string>
 #include <cstdio>
--- orsa-0.7.0/src/liborsa/orsa_body.h.orig	2004-12-30 04:58:03.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_body.h	2008-09-05 18:30:26.000000000 +0200
@@ -183,7 +183,7 @@
     inline void SetVelocity(const double x, const double y, const double z) { Vector v(x,y,z); SetVelocity(v); }
     
     // b position - this position
-    inline Vector Body::distanceVector(const Body & b) const { return b.position()-position(); }
+    inline Vector distanceVector(const Body & b) const { return b.position()-position(); }
     inline double distance(const Body & b) const { return distanceVector(b).Length(); }
     
     // alias
--- orsa-0.7.0/src/liborsa/orsa_file_jpl.cc.orig	2005-01-05 03:25:06.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_file_jpl.cc	2008-09-05 18:33:41.000000000 +0200
@@ -22,6 +22,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+#include <cstring>
 #include "orsa_file.h"
 #include "orsa_error.h"
 #include "orsa_secure_math.h"
--- orsa-0.7.0/src/liborsa/orsa_file.cc.orig	2005-01-11 02:01:11.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_file.cc	2008-09-05 18:43:03.000000000 +0200
@@ -52,6 +52,9 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
+#include <cstring>
+#include <algorithm>
+
 using namespace std;
 
 namespace orsa {
--- orsa-0.7.0/src/libxorsa/xorsa_import_astorb_objects.h.orig	2005-01-05 04:04:17.000000000 +0100
+++ orsa-0.7.0/src/libxorsa/xorsa_import_astorb_objects.h	2008-09-05 18:49:29.000000000 +0200
@@ -600,7 +600,7 @@
   inline XOrsaAstorbObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null) : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8) { };
   
  public:
-  inline int XOrsaAstorbObjectItem::compare(QListViewItem *i, int col, bool ascending) const {
+  inline int compare(QListViewItem *i, int col, bool ascending) const {
 
     using std::atof;
         
--- orsa-0.7.0/src/libxorsa/xorsa_plot_area.h.orig	2005-01-05 03:25:06.000000000 +0100
+++ orsa-0.7.0/src/libxorsa/xorsa_plot_area.h	2008-09-05 18:58:44.000000000 +0200
@@ -57,7 +57,13 @@
   }
 }
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 extern char *MonthNameShort[13]; // sdncal.h
+#ifdef __cplusplus
+}
+#endif // __cplusplus
 
 void FineDate(QString & label, const orsa::UniverseTypeAwareTime & t, bool=true);
 void FineDate_HMS(QString & label, const orsa::UniverseTypeAwareTime & t);
--- orsa-0.7.0/src/libxorsa/xorsa_object_selector.cc.orig	2004-06-25 05:12:57.000000000 +0200
+++ orsa-0.7.0/src/libxorsa/xorsa_object_selector.cc	2008-09-05 19:01:33.000000000 +0200
@@ -40,7 +40,7 @@
   XOrsaObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null);
   
  public:
-  int XOrsaObjectItem::compare(QListViewItem * i, int col, bool ascending) const;    
+  int compare(QListViewItem * i, int col, bool ascending) const;    
   
 };
 
--- orsa-0.7.0/src/orsa/xorsa.h.orig	2004-07-13 04:21:19.000000000 +0200
+++ orsa-0.7.0/src/orsa/xorsa.h	2008-09-05 19:10:14.000000000 +0200
@@ -62,7 +62,7 @@
   ObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null);
   
  public:
-  int ObjectItem::compare(QListViewItem * i, int col, bool ascending) const;    
+  int compare(QListViewItem * i, int col, bool ascending) const;    
   
 };
 
--- orsa-0.7.0/src/libxorsa/xorsa_analysis.h.orig	2004-06-25 02:58:30.000000000 +0200
+++ orsa-0.7.0/src/libxorsa/xorsa_analysis.h	2008-09-07 17:26:55.000000000 +0200
@@ -129,7 +129,7 @@
   XOrsaPeaksListItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null);
   
  public:
-  int XOrsaPeaksListItem::compare(QListViewItem * i, int col, bool ascending) const;    
+  int compare(QListViewItem * i, int col, bool ascending) const;    
   
 };
 


--- NEW FILE orsa.spec ---
Name:			orsa
Version:		0.7.0
Release:		2%{?dist}
Summary:		Orbit Reconstruction, Simulation and Analysis

Group:			Amusements/Graphics
License:		GPLv2+ 
URL:			http://orsa.sourceforge.net
Source0:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# Patch to build with GCC 4.3
# Reported into upstream bugtracker as
# http://sourceforge.net/tracker/index.php?func=detail&aid=2099077&group_id=44502&atid=439768
Patch0:			%{name}-gcc43.patch
# Patching configure in order to:
# - make it find the fftw2 library properly (-lm was missing but needed)
# - make it find the cln and ginac libraries properly as they do not use 
# {cln,ginac}-config anymore but rely on pkg-config instead in F9 and higher
# Reported into upstream bugtracker as
# http://sourceforge.net/tracker/index.php?func=detail&aid=2099054&group_id=44502&atid=439768
Patch1:			%{name}-configure.patch
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	readline-devel
BuildRequires:	qt3-devel
BuildRequires:	mesa-libGL-devel
BuildRequires:	fftw2-devel
BuildRequires:	gsl-devel
BuildRequires:	cln-devel
BuildRequires:	ginac-devel
BuildRequires:	openmpi-devel

%description
ORSA is an interactive tool for scientific grade Celestial Mechanics
computations. Asteroids, comets, artificial satellites, Solar and extra-Solar
planetary systems can be accurately reproduced, simulated, and analyzed. 

%package devel
Summary:	Development files for %{name}
Group:		Development/Libraries

Requires:	fftw2-devel
Requires:	gsl-devel
Requires:	zlib-devel
Requires:	%{name} = %{version}-%{release}

%description devel
This package contains development files for %{name}.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%build
# 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
%configure --disable-static --with-mpi "CLN_CONFIG=`which pkg-config` cln" "GINACLIB_CONFIG=`which pkg-config` ginac"
# 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}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# we don't want to ship libtool archives:
rm $RPM_BUILD_ROOT%{_libdir}/liborsa.la $RPM_BUILD_ROOT%{_libdir}/libxorsa.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING DEVELOPERS
%{_bindir}/xorsa
%{_libdir}/liborsa.so.*
%{_libdir}/libxorsa.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/liborsa.so
%{_libdir}/libxorsa.so

%changelog
* Wed Sep 10 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 0.7.0-2
- Patched configure to honor $RPM_OPT_FLAGS
- Added missing Requires: to the -devel subpackage

* Fri Sep 5 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 0.7.0-1
- Initial release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/orsa/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2008 22:26:11 -0000	1.1
+++ .cvsignore	15 Sep 2008 08:45:28 -0000	1.2
@@ -0,0 +1 @@
+orsa-0.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/orsa/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2008 22:26:12 -0000	1.1
+++ sources	15 Sep 2008 08:45:29 -0000	1.2
@@ -0,0 +1 @@
+16c86f3aa73920631f9768d8c70cce70  orsa-0.7.0.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 15 09:27:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:27:41 +0000
Subject: [pkgdb] avogadro was added for sdz
Message-ID: <20080915092741.E66AD208D9F@bastion.fedora.phx.redhat.com>

huzaifas has added Package avogadro with summary Avogadro is an advanced Molecular editor
huzaifas has approved Package avogadro
huzaifas has added a Fedora devel branch for avogadro with an owner of sdz
huzaifas has approved avogadro in Fedora devel
huzaifas has approved Package avogadro
huzaifas has set commit to Approved for packager on avogadro (Fedora devel)
huzaifas has set build to Approved for packager on avogadro (Fedora devel)
huzaifas has set checkout to Approved for packager on avogadro (Fedora devel)
huzaifas has set commit to Approved for uberpackager on avogadro (Fedora devel)
huzaifas has set build to Approved for uberpackager on avogadro (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on avogadro (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/avogadro



From pkgdb at fedoraproject.org  Mon Sep 15 09:27:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:27:43 +0000
Subject: [pkgdb] avogadro (Fedora, 9) updated by huzaifas
Message-ID: <20080915092743.7A4C6208DA3@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for avogadro
huzaifas has set commit to Approved for uberpackager on avogadro (Fedora 9)
huzaifas has set build to Approved for uberpackager on avogadro (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on avogadro (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/avogadro



From pkgdb at fedoraproject.org  Mon Sep 15 09:27:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:27:43 +0000
Subject: [pkgdb] avogadro (Fedora, 8) updated by huzaifas
Message-ID: <20080915092743.92CD6208DA6@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for avogadro
huzaifas has set commit to Approved for uberpackager on avogadro (Fedora 8)
huzaifas has set build to Approved for uberpackager on avogadro (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on avogadro (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/avogadro



From huzaifas at fedoraproject.org  Mon Sep 15 09:28:12 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 09:28:12 +0000 (UTC)
Subject: rpms/avogadro - New directory
Message-ID: <20080915092812.4561C70137@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/avogadro
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvso21285/rpms/avogadro

Log Message:
Directory /cvs/extras/rpms/avogadro added to the repository




From huzaifas at fedoraproject.org  Mon Sep 15 09:28:12 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 09:28:12 +0000 (UTC)
Subject: rpms/avogadro/devel - New directory
Message-ID: <20080915092812.82BBA7013B@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/avogadro/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvso21285/rpms/avogadro/devel

Log Message:
Directory /cvs/extras/rpms/avogadro/devel added to the repository




From huzaifas at fedoraproject.org  Mon Sep 15 09:28:14 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 09:28:14 +0000 (UTC)
Subject: rpms/avogadro/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080915092814.1E15B70137@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/avogadro/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvso21285/rpms/avogadro/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module avogadro


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: avogadro
# $Id: Makefile,v 1.1 2008/09/15 09:28:13 huzaifas Exp $
NAME := avogadro
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From huzaifas at fedoraproject.org  Mon Sep 15 09:28:13 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 09:28:13 +0000 (UTC)
Subject: rpms/avogadro Makefile,NONE,1.1
Message-ID: <20080915092813.CABB470137@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/avogadro
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvso21285/rpms/avogadro

Added Files:
	Makefile 
Log Message:
Setup of module avogadro


--- NEW FILE Makefile ---
# Top level Makefile for module avogadro
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep 15 09:30:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:30:54 +0000
Subject: [pkgdb] moe was added for bonii
Message-ID: <20080915093054.8EBD5208DA2@bastion.fedora.phx.redhat.com>

huzaifas has added Package moe with summary A powerful clean text editor
huzaifas has approved Package moe
huzaifas has added a Fedora devel branch for moe with an owner of bonii
huzaifas has approved moe in Fedora devel
huzaifas has approved Package moe
huzaifas has set commit to Approved for packager on moe (Fedora devel)
huzaifas has set build to Approved for packager on moe (Fedora devel)
huzaifas has set checkout to Approved for packager on moe (Fedora devel)
huzaifas has set commit to Approved for uberpackager on moe (Fedora devel)
huzaifas has set build to Approved for uberpackager on moe (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on moe (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moe



From pkgdb at fedoraproject.org  Mon Sep 15 09:30:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:30:57 +0000
Subject: [pkgdb] moe (Fedora, 8) updated by huzaifas
Message-ID: <20080915093100.9EF79208DA7@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for moe
huzaifas has set commit to Approved for uberpackager on moe (Fedora 8)
huzaifas has set build to Approved for uberpackager on moe (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on moe (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moe



From pkgdb at fedoraproject.org  Mon Sep 15 09:30:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:30:57 +0000
Subject: [pkgdb] moe (Fedora, 9) updated by huzaifas
Message-ID: <20080915093058.2D697208DA4@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for moe
huzaifas has set commit to Approved for uberpackager on moe (Fedora 9)
huzaifas has set build to Approved for uberpackager on moe (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on moe (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moe



From huzaifas at fedoraproject.org  Mon Sep 15 09:31:26 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 09:31:26 +0000 (UTC)
Subject: rpms/moe Makefile,NONE,1.1
Message-ID: <20080915093126.0D1A070137@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/moe
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsB22060/rpms/moe

Added Files:
	Makefile 
Log Message:
Setup of module moe


--- NEW FILE Makefile ---
# Top level Makefile for module moe
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Mon Sep 15 09:31:24 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 09:31:24 +0000 (UTC)
Subject: rpms/moe - New directory
Message-ID: <20080915093124.3271B70137@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/moe
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsB22060/rpms/moe

Log Message:
Directory /cvs/extras/rpms/moe added to the repository




From huzaifas at fedoraproject.org  Mon Sep 15 09:31:24 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 09:31:24 +0000 (UTC)
Subject: rpms/moe/devel - New directory
Message-ID: <20080915093124.84CCC70137@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/moe/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsB22060/rpms/moe/devel

Log Message:
Directory /cvs/extras/rpms/moe/devel added to the repository




From huzaifas at fedoraproject.org  Mon Sep 15 09:31:26 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 09:31:26 +0000 (UTC)
Subject: rpms/moe/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080915093126.6CA4B70137@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/moe/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsB22060/rpms/moe/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module moe


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: moe
# $Id: Makefile,v 1.1 2008/09/15 09:31:26 huzaifas Exp $
NAME := moe
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From denis at fedoraproject.org  Mon Sep 15 09:34:28 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon, 15 Sep 2008 09:34:28 +0000 (UTC)
Subject: rpms/cluttermm/devel cluttermm.spec,1.2,1.3
Message-ID: <20080915093428.13CE970137@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/cluttermm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22624

Modified Files:
	cluttermm.spec 
Log Message:
Fixed devel requires


Index: cluttermm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluttermm/devel/cluttermm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cluttermm.spec	7 Sep 2008 21:17:32 -0000	1.2
+++ cluttermm.spec	15 Sep 2008 09:33:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           cluttermm
 Version:        0.7.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        C++ wrapper for clutter library
 
@@ -27,7 +27,10 @@
 Summary:        Headers for developing programs that will use %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       gtkmm24-devel clutter-devel pkgconfig
+Requires:       glibmm24-devel
+Requires:       pangomm-devel
+Requires:       clutter-devel
+Requires:       pkgconfig
 
 
 %description devel
@@ -77,6 +80,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Denis Leroy <denis at poolshark.org> - 0.7.3-2
+- Fixed devel requires
+
 * Sun Sep  7 2008 Denis Leroy <denis at poolshark.org> - 0.7.3-1
 - Update to upstream 0.7.3
 - Cairo and gtk parts are forked into their own tarballs



From denis at fedoraproject.org  Mon Sep 15 09:39:43 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon, 15 Sep 2008 09:39:43 +0000 (UTC)
Subject: rpms/clutter-gtkmm/devel clutter-gtkmm.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080915093943.A90F170137@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/clutter-gtkmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23459

Modified Files:
	.cvsignore sources 
Added Files:
	clutter-gtkmm.spec 
Log Message:
initial check-in


--- NEW FILE clutter-gtkmm.spec ---
%define api_ver 0.8

Name:           clutter-gtkmm
Version:        0.7.2
Release:        1%{?dist}

Summary:        C++ wrapper for clutter-gtk library

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.gtkmm.org/
Source0:        http://ftp.gnome.org/pub/GNOME/sources/clutter-gtkmm/0.7/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: clutter-gtk-devel
BuildRequires: cluttermm-devel
BuildRequires: gtkmm24-devel
BuildRequires: doxygen graphviz


%description
clutter-gtkmm is a C++ wrapper library for clutter-gtk: a library that
allows clutter to be embedded in GTK applications. Clutter is an
OpenGL-based library for creating fast, visually rich and animated
graphical user interfaces.


%package        devel
Summary:        Headers for developing programs that will use %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       clutter-gtk-devel
Requires:       cluttermm-devel
Requires:       gtkmm24-devel
Requires:       pkgconfig


%description devel
This package contains the static libraries and header files needed for
developing %{name} applications.


%prep
%setup -q


%build
%configure --enable-shared --disable-dependency-tracking
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
# Package examples in documentation
mkdir -p docs-to-include/examples
mv docs/reference/html docs-to-include/
cp examples/*.cc docs-to-include/examples/
cp examples/*.png docs-to-include/examples/
# Remove files related to code generation
rm -rf $RPM_BUILD_ROOT%{_libdir}/clutter-gtkmm-%{api_ver}
rm -rf $RPM_BUILD_ROOT%{_libdir}/cluttermm-%{api_ver}


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-, root, root, -)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_libdir}/libclutter-gtkmm-0.8.so.*


%files devel
%defattr(-, root, root, -)
%doc docs-to-include/*
%{_includedir}/clutter-gtkmm-%{api_ver}
%{_libdir}/libclutter-gtkmm-%{api_ver}.so
%{_libdir}/pkgconfig/%{name}-%{api_ver}.pc


%changelog
* Sun Sep  7 2008 Denis Leroy <denis at poolshark.org> - 0.7.2-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gtkmm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2008 22:29:50 -0000	1.1
+++ .cvsignore	15 Sep 2008 09:39:13 -0000	1.2
@@ -0,0 +1 @@
+clutter-gtkmm-0.7.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gtkmm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2008 22:29:50 -0000	1.1
+++ sources	15 Sep 2008 09:39:13 -0000	1.2
@@ -0,0 +1 @@
+c9681fa6a9be399f81fcfbec291d50e9  clutter-gtkmm-0.7.2.tar.bz2



From pkgdb at fedoraproject.org  Mon Sep 15 09:53:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:53:55 +0000
Subject: [pkgdb] ksh ownership updated
Message-ID: <20080915095355.8AD53208D5F@bastion.fedora.phx.redhat.com>

Package ksh in Fedora devel was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksh



From pkgdb at fedoraproject.org  Mon Sep 15 09:54:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:54:24 +0000
Subject: [pkgdb] ksh ownership updated
Message-ID: <20080915095424.E702A208D9E@bastion.fedora.phx.redhat.com>

Package ksh in Fedora 7 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksh



From pkgdb at fedoraproject.org  Mon Sep 15 09:54:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:54:29 +0000
Subject: [pkgdb] ksh ownership updated
Message-ID: <20080915095429.1B70A208DA5@bastion.fedora.phx.redhat.com>

Package ksh in Fedora 8 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksh



From pkgdb at fedoraproject.org  Mon Sep 15 09:54:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:54:39 +0000
Subject: [pkgdb] ksh ownership updated
Message-ID: <20080915095442.54CFF208DA2@bastion.fedora.phx.redhat.com>

Package ksh in Fedora devel is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksh



From pkgdb at fedoraproject.org  Mon Sep 15 09:54:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:54:34 +0000
Subject: [pkgdb] ksh ownership updated
Message-ID: <20080915095434.4E374208D5F@bastion.fedora.phx.redhat.com>

Package ksh in Fedora 9 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksh



From pkgdb at fedoraproject.org  Mon Sep 15 09:55:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:55:08 +0000
Subject: [pkgdb] ksh ownership updated
Message-ID: <20080915095508.5E27E208DA2@bastion.fedora.phx.redhat.com>

Package ksh in Fedora 8 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksh



From pkgdb at fedoraproject.org  Mon Sep 15 09:55:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:55:13 +0000
Subject: [pkgdb] ksh ownership updated
Message-ID: <20080915095513.D3546208D9F@bastion.fedora.phx.redhat.com>

Package ksh in Fedora 9 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksh



From pkgdb at fedoraproject.org  Mon Sep 15 09:56:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:56:44 +0000
Subject: [pkgdb] smartmontools ownership updated
Message-ID: <20080915095644.47238208D5F@bastion.fedora.phx.redhat.com>

Package smartmontools in Fedora devel was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smartmontools



From pkgdb at fedoraproject.org  Mon Sep 15 09:56:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:56:47 +0000
Subject: [pkgdb] smartmontools ownership updated
Message-ID: <20080915095647.BD44E208D9F@bastion.fedora.phx.redhat.com>

Package smartmontools in Fedora devel is now owned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smartmontools



From pkgdb at fedoraproject.org  Mon Sep 15 09:56:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:56:54 +0000
Subject: [pkgdb] smartmontools ownership updated
Message-ID: <20080915095654.A2344208DA2@bastion.fedora.phx.redhat.com>

Package smartmontools in Fedora devel was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smartmontools



From pkgdb at fedoraproject.org  Mon Sep 15 09:57:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:57:04 +0000
Subject: [pkgdb] smartmontools ownership updated
Message-ID: <20080915095704.B7C51208D5F@bastion.fedora.phx.redhat.com>

Package smartmontools in Fedora 8 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smartmontools



From pkgdb at fedoraproject.org  Mon Sep 15 09:57:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:57:31 +0000
Subject: [pkgdb] smartmontools ownership updated
Message-ID: <20080915095731.8DB62208D9F@bastion.fedora.phx.redhat.com>

Package smartmontools in Fedora devel is now owned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smartmontools



From pkgdb at fedoraproject.org  Mon Sep 15 09:57:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:57:46 +0000
Subject: [pkgdb] smartmontools ownership updated
Message-ID: <20080915095746.23DB6208DA2@bastion.fedora.phx.redhat.com>

Package smartmontools in Fedora 8 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smartmontools



From pkgdb at fedoraproject.org  Mon Sep 15 09:58:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:58:28 +0000
Subject: [pkgdb] smartmontools ownership updated
Message-ID: <20080915095828.181E5208D5F@bastion.fedora.phx.redhat.com>

Package smartmontools in Fedora devel was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smartmontools



From pkgdb at fedoraproject.org  Mon Sep 15 09:58:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:58:47 +0000
Subject: [pkgdb] smartmontools ownership updated
Message-ID: <20080915095847.F1026208D5F@bastion.fedora.phx.redhat.com>

Package smartmontools in Fedora devel is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smartmontools



From pkgdb at fedoraproject.org  Mon Sep 15 09:59:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:59:05 +0000
Subject: [pkgdb] mpage ownership updated
Message-ID: <20080915095905.6CCB7208D9E@bastion.fedora.phx.redhat.com>

Package mpage in Fedora devel was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mpage



From pkgdb at fedoraproject.org  Mon Sep 15 09:59:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:59:36 +0000
Subject: [pkgdb] mpage ownership updated
Message-ID: <20080915095936.DB3C8208D9E@bastion.fedora.phx.redhat.com>

Package mpage in Fedora devel is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mpage



From pkgdb at fedoraproject.org  Mon Sep 15 09:59:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:59:40 +0000
Subject: [pkgdb] mpage ownership updated
Message-ID: <20080915095940.4DC0F208D5F@bastion.fedora.phx.redhat.com>

Package mpage in Fedora devel was orphaned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mpage



From pkgdb at fedoraproject.org  Mon Sep 15 09:59:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 09:59:57 +0000
Subject: [pkgdb] mpage ownership updated
Message-ID: <20080915095957.2000A208D5F@bastion.fedora.phx.redhat.com>

Package mpage in Fedora devel is now owned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mpage



From pkgdb at fedoraproject.org  Mon Sep 15 10:00:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:00:11 +0000
Subject: [pkgdb] mpage ownership updated
Message-ID: <20080915100011.452E5208D9F@bastion.fedora.phx.redhat.com>

Package mpage in Fedora 7 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mpage



From pkgdb at fedoraproject.org  Mon Sep 15 10:00:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:00:08 +0000
Subject: [pkgdb] mpage ownership updated
Message-ID: <20080915100008.7423B208D5F@bastion.fedora.phx.redhat.com>

Package mpage in Fedora devel was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mpage



From pkgdb at fedoraproject.org  Mon Sep 15 10:00:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:00:15 +0000
Subject: [pkgdb] mpage ownership updated
Message-ID: <20080915100015.6DEA7208DA5@bastion.fedora.phx.redhat.com>

Package mpage in Fedora 8 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mpage



From pkgdb at fedoraproject.org  Mon Sep 15 10:00:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:00:18 +0000
Subject: [pkgdb] mpage ownership updated
Message-ID: <20080915100018.E983B208DA2@bastion.fedora.phx.redhat.com>

Package mpage in Fedora 9 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mpage



From rezso at fedoraproject.org  Mon Sep 15 10:00:31 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Mon, 15 Sep 2008 10:00:31 +0000 (UTC)
Subject: rpms/libgeotiff/devel import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 libgeotiff.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20080915100031.A308270137@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/libgeotiff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26474/devel

Modified Files:
	.cvsignore libgeotiff.spec sources 
Added Files:
	import.log 
Log Message:
- new bugfix release
 ----------------------------------------------------------------------
 Modified Files:
 	devel/.cvsignore devel/libgeotiff.spec devel/sources 
 Added Files:
 	devel/import.log 
 ----------------------------------------------------------------------



--- NEW FILE import.log ---
libgeotiff-1_2_5-1_fc10:HEAD:libgeotiff-1.2.5-1.fc10.src.rpm:1221472762


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgeotiff/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Jan 2008 00:09:09 -0000	1.3
+++ .cvsignore	15 Sep 2008 09:59:59 -0000	1.4
@@ -1 +1 @@
-libgeotiff-1.2.4.tar.gz
+libgeotiff-1.2.5.tar.gz


Index: libgeotiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgeotiff/devel/libgeotiff.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libgeotiff.spec	19 Feb 2008 21:32:30 -0000	1.6
+++ libgeotiff.spec	15 Sep 2008 10:00:00 -0000	1.7
@@ -1,6 +1,6 @@
 Name:      libgeotiff
-Version:   1.2.4
-Release:   3%{?dist}
+Version:   1.2.5
+Release:   1%{?dist}
 Summary:   GeoTIFF format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -127,6 +127,9 @@
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Sep 15 2008 Balint Cristian <rezso at rdsor.ro> - 1.2.5-1
+- new bugfix release
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.4-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgeotiff/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Jan 2008 00:09:09 -0000	1.3
+++ sources	15 Sep 2008 10:00:00 -0000	1.4
@@ -1 +1 @@
-62cd4a515d1f3ba7b41cb4ed9061aa76  libgeotiff-1.2.4.tar.gz
+000f247a88510f1b38d4b314d1e47048  libgeotiff-1.2.5.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 15 10:00:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:00:37 +0000
Subject: [pkgdb] mpage ownership updated
Message-ID: <20080915100037.C012F208D9F@bastion.fedora.phx.redhat.com>

Package mpage in Fedora devel is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mpage



From pkgdb at fedoraproject.org  Mon Sep 15 10:01:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:01:37 +0000
Subject: [pkgdb] mpage ownership updated
Message-ID: <20080915100137.DFA27208D9E@bastion.fedora.phx.redhat.com>

Package mpage in Fedora 9 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mpage



From pkgdb at fedoraproject.org  Mon Sep 15 10:01:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:01:40 +0000
Subject: [pkgdb] mpage ownership updated
Message-ID: <20080915100140.C98A0208DA3@bastion.fedora.phx.redhat.com>

Package mpage in Fedora 8 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mpage



From pkgdb at fedoraproject.org  Mon Sep 15 10:01:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:01:44 +0000
Subject: [pkgdb] mpage ownership updated
Message-ID: <20080915100144.9D693208D5F@bastion.fedora.phx.redhat.com>

Package mpage in Fedora 9 was orphaned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mpage



From pkgdb at fedoraproject.org  Mon Sep 15 10:02:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:02:00 +0000
Subject: [pkgdb] mpage ownership updated
Message-ID: <20080915100200.605AE208D5F@bastion.fedora.phx.redhat.com>

Package mpage in Fedora 9 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mpage



From pkgdb at fedoraproject.org  Mon Sep 15 10:03:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:03:09 +0000
Subject: [pkgdb] smartmontools ownership updated
Message-ID: <20080915100309.7E7F6208D5F@bastion.fedora.phx.redhat.com>

Package smartmontools in Fedora 9 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smartmontools



From pkgdb at fedoraproject.org  Mon Sep 15 10:03:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:03:36 +0000
Subject: [pkgdb] smartmontools ownership updated
Message-ID: <20080915100336.67346208DA2@bastion.fedora.phx.redhat.com>

Package smartmontools in Fedora 9 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smartmontools



From pkgdb at fedoraproject.org  Mon Sep 15 10:04:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:04:52 +0000
Subject: [pkgdb] nmap ownership updated
Message-ID: <20080915100453.05CB5208D5F@bastion.fedora.phx.redhat.com>

Package nmap in Fedora devel was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nmap



From pkgdb at fedoraproject.org  Mon Sep 15 10:05:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:05:09 +0000
Subject: [pkgdb] nmap ownership updated
Message-ID: <20080915100509.C7FBA208D9E@bastion.fedora.phx.redhat.com>

Package nmap in Fedora 8 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nmap



From pkgdb at fedoraproject.org  Mon Sep 15 10:04:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:04:57 +0000
Subject: [pkgdb] nmap ownership updated
Message-ID: <20080915100457.C141B208D9F@bastion.fedora.phx.redhat.com>

Package nmap in Fedora 7 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nmap



From pkgdb at fedoraproject.org  Mon Sep 15 10:05:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:05:19 +0000
Subject: [pkgdb] nmap ownership updated
Message-ID: <20080915100520.0F7AC208D5F@bastion.fedora.phx.redhat.com>

Package nmap in Fedora 9 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nmap



From pkgdb at fedoraproject.org  Mon Sep 15 10:05:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:05:37 +0000
Subject: [pkgdb] nmap ownership updated
Message-ID: <20080915100537.37305208D9E@bastion.fedora.phx.redhat.com>

Package nmap in Fedora devel is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nmap



From pkgdb at fedoraproject.org  Mon Sep 15 10:06:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:06:09 +0000
Subject: [pkgdb] nmap ownership updated
Message-ID: <20080915100609.7369D208D9F@bastion.fedora.phx.redhat.com>

Package nmap in Fedora 8 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nmap



From pkgdb at fedoraproject.org  Mon Sep 15 10:06:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:06:22 +0000
Subject: [pkgdb] nmap ownership updated
Message-ID: <20080915100622.9FD3A208D5F@bastion.fedora.phx.redhat.com>

Package nmap in Fedora 9 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nmap



From pkgdb at fedoraproject.org  Mon Sep 15 10:07:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:07:22 +0000
Subject: [pkgdb] hunspell-xh was added for caolanm
Message-ID: <20080915100722.E1D88208DA0@bastion.fedora.phx.redhat.com>

huzaifas has added Package hunspell-xh with summary Xhosa Hunspell dictionaries
huzaifas has approved Package hunspell-xh
huzaifas has added a Fedora devel branch for hunspell-xh with an owner of caolanm
huzaifas has approved hunspell-xh in Fedora devel
huzaifas has approved Package hunspell-xh
huzaifas has set commit to Approved for packager on hunspell-xh (Fedora devel)
huzaifas has set build to Approved for packager on hunspell-xh (Fedora devel)
huzaifas has set checkout to Approved for packager on hunspell-xh (Fedora devel)
huzaifas has set commit to Approved for uberpackager on hunspell-xh (Fedora devel)
huzaifas has set build to Approved for uberpackager on hunspell-xh (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on hunspell-xh (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-xh



From huzaifas at fedoraproject.org  Mon Sep 15 10:07:45 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 10:07:45 +0000 (UTC)
Subject: rpms/hunspell-xh/devel - New directory
Message-ID: <20080915100745.6E48670137@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-xh/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsF27609/rpms/hunspell-xh/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-xh/devel added to the repository




From huzaifas at fedoraproject.org  Mon Sep 15 10:07:46 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 10:07:46 +0000 (UTC)
Subject: rpms/hunspell-xh Makefile,NONE,1.1
Message-ID: <20080915100746.7409670137@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-xh
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsF27609/rpms/hunspell-xh

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-xh


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-xh
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Mon Sep 15 10:07:45 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 10:07:45 +0000 (UTC)
Subject: rpms/hunspell-xh - New directory
Message-ID: <20080915100745.2DF1870137@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-xh
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsF27609/rpms/hunspell-xh

Log Message:
Directory /cvs/extras/rpms/hunspell-xh added to the repository




From huzaifas at fedoraproject.org  Mon Sep 15 10:07:46 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 10:07:46 +0000 (UTC)
Subject: rpms/hunspell-xh/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080915100746.B70617013A@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-xh/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsF27609/rpms/hunspell-xh/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-xh


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-xh
# $Id: Makefile,v 1.1 2008/09/15 10:07:46 huzaifas Exp $
NAME := hunspell-xh
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 15 10:07:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:07:48 +0000
Subject: [pkgdb] nut ownership updated
Message-ID: <20080915100748.981BD208DA0@bastion.fedora.phx.redhat.com>

Package nut in Fedora devel was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nut



From pkgdb at fedoraproject.org  Mon Sep 15 10:07:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:07:57 +0000
Subject: [pkgdb] nut ownership updated
Message-ID: <20080915100758.0A624208D5F@bastion.fedora.phx.redhat.com>

Package nut in Fedora 7 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nut



From pkgdb at fedoraproject.org  Mon Sep 15 10:08:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:08:12 +0000
Subject: [pkgdb] nut ownership updated
Message-ID: <20080915100812.5E865208D5F@bastion.fedora.phx.redhat.com>

Package nut in Fedora EPEL 4 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nut



From pkgdb at fedoraproject.org  Mon Sep 15 10:08:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:08:19 +0000
Subject: [pkgdb] nut ownership updated
Message-ID: <20080915100819.35E8B208D9F@bastion.fedora.phx.redhat.com>

Package nut in Fedora EPEL 5 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nut



From pkgdb at fedoraproject.org  Mon Sep 15 10:08:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:08:29 +0000
Subject: [pkgdb] nut ownership updated
Message-ID: <20080915100829.D56EF208D5F@bastion.fedora.phx.redhat.com>

Package nut in Fedora devel is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nut



From pkgdb at fedoraproject.org  Mon Sep 15 10:08:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:08:32 +0000
Subject: [pkgdb] hunspell-ve was added for caolanm
Message-ID: <20080915100832.92310208DA3@bastion.fedora.phx.redhat.com>

huzaifas has added Package hunspell-ve with summary Venda Hunspell dictionaries
huzaifas has approved Package hunspell-ve
huzaifas has added a Fedora devel branch for hunspell-ve with an owner of caolanm
huzaifas has approved hunspell-ve in Fedora devel
huzaifas has approved Package hunspell-ve
huzaifas has set commit to Approved for packager on hunspell-ve (Fedora devel)
huzaifas has set build to Approved for packager on hunspell-ve (Fedora devel)
huzaifas has set checkout to Approved for packager on hunspell-ve (Fedora devel)
huzaifas has set commit to Approved for uberpackager on hunspell-ve (Fedora devel)
huzaifas has set build to Approved for uberpackager on hunspell-ve (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on hunspell-ve (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-ve



From pkgdb at fedoraproject.org  Mon Sep 15 10:08:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:08:32 +0000
Subject: [pkgdb] nut ownership updated
Message-ID: <20080915100832.9E3A2208DA4@bastion.fedora.phx.redhat.com>

Package nut in Fedora 8 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nut



From pkgdb at fedoraproject.org  Mon Sep 15 10:08:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:08:41 +0000
Subject: [pkgdb] nut ownership updated
Message-ID: <20080915100841.A9118208D5F@bastion.fedora.phx.redhat.com>

Package nut in Fedora 9 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nut



From pkgdb at fedoraproject.org  Mon Sep 15 10:08:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:08:54 +0000
Subject: [pkgdb] nut ownership updated
Message-ID: <20080915100854.AA9DB208D9F@bastion.fedora.phx.redhat.com>

Package nut in Fedora EPEL 4 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nut



From pkgdb at fedoraproject.org  Mon Sep 15 10:08:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:08:57 +0000
Subject: [pkgdb] nut ownership updated
Message-ID: <20080915100858.01988208DA3@bastion.fedora.phx.redhat.com>

Package nut in Fedora EPEL 5 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nut



From pkgdb at fedoraproject.org  Mon Sep 15 10:09:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:09:00 +0000
Subject: [pkgdb] nut ownership updated
Message-ID: <20080915100900.D26BD208DA5@bastion.fedora.phx.redhat.com>

Package nut in Fedora 8 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nut



From huzaifas at fedoraproject.org  Mon Sep 15 10:09:22 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 10:09:22 +0000 (UTC)
Subject: rpms/hunspell-ve - New directory
Message-ID: <20080915100922.287CB70137@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-ve
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvst27827/rpms/hunspell-ve

Log Message:
Directory /cvs/extras/rpms/hunspell-ve added to the repository




From huzaifas at fedoraproject.org  Mon Sep 15 10:09:22 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 10:09:22 +0000 (UTC)
Subject: rpms/hunspell-ve/devel - New directory
Message-ID: <20080915100922.652307013D@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-ve/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvst27827/rpms/hunspell-ve/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-ve/devel added to the repository




From huzaifas at fedoraproject.org  Mon Sep 15 10:09:23 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 10:09:23 +0000 (UTC)
Subject: rpms/hunspell-ve Makefile,NONE,1.1
Message-ID: <20080915100923.521DC70137@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-ve
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvst27827/rpms/hunspell-ve

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-ve


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-ve
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Mon Sep 15 10:09:24 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 10:09:24 +0000 (UTC)
Subject: rpms/hunspell-ve/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080915100924.3622D70137@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-ve/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvst27827/rpms/hunspell-ve/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-ve


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-ve
# $Id: Makefile,v 1.1 2008/09/15 10:09:23 huzaifas Exp $
NAME := hunspell-ve
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 15 10:09:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:09:39 +0000
Subject: [pkgdb] nut ownership updated
Message-ID: <20080915100939.25EFA208DA2@bastion.fedora.phx.redhat.com>

Package nut in Fedora 9 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nut



From pkgdb at fedoraproject.org  Mon Sep 15 10:10:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:10:55 +0000
Subject: [pkgdb] apcupsd ownership updated
Message-ID: <20080915101056.0764C208DA7@bastion.fedora.phx.redhat.com>

Package apcupsd in Fedora devel was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apcupsd



From pkgdb at fedoraproject.org  Mon Sep 15 10:10:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:10:59 +0000
Subject: [pkgdb] apcupsd ownership updated
Message-ID: <20080915101059.8D950208D5F@bastion.fedora.phx.redhat.com>

Package apcupsd in Fedora EPEL 4 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apcupsd



From pkgdb at fedoraproject.org  Mon Sep 15 10:11:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:11:03 +0000
Subject: [pkgdb] apcupsd ownership updated
Message-ID: <20080915101103.71524208D9F@bastion.fedora.phx.redhat.com>

Package apcupsd in Fedora EPEL 5 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apcupsd



From pkgdb at fedoraproject.org  Mon Sep 15 10:11:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:11:14 +0000
Subject: [pkgdb] apcupsd ownership updated
Message-ID: <20080915101114.3E882208D5F@bastion.fedora.phx.redhat.com>

Package apcupsd in Fedora 7 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apcupsd



From pkgdb at fedoraproject.org  Mon Sep 15 10:11:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:11:22 +0000
Subject: [pkgdb] apcupsd ownership updated
Message-ID: <20080915101122.901D8208D9E@bastion.fedora.phx.redhat.com>

Package apcupsd in Fedora 8 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apcupsd



From pkgdb at fedoraproject.org  Mon Sep 15 10:11:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:11:51 +0000
Subject: [pkgdb] apcupsd ownership updated
Message-ID: <20080915101152.F2947208DA3@bastion.fedora.phx.redhat.com>

Package apcupsd in Fedora 9 was orphaned by tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apcupsd



From pkgdb at fedoraproject.org  Mon Sep 15 10:11:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:11:46 +0000
Subject: [pkgdb] hunspell-ts was added for caolanm
Message-ID: <20080915101147.4CB40208DA2@bastion.fedora.phx.redhat.com>

huzaifas has added Package hunspell-ts with summary Tsonga Hunspell dictionaries
huzaifas has approved Package hunspell-ts
huzaifas has added a Fedora devel branch for hunspell-ts with an owner of caolanm
huzaifas has approved hunspell-ts in Fedora devel
huzaifas has approved Package hunspell-ts
huzaifas has set commit to Approved for packager on hunspell-ts (Fedora devel)
huzaifas has set build to Approved for packager on hunspell-ts (Fedora devel)
huzaifas has set checkout to Approved for packager on hunspell-ts (Fedora devel)
huzaifas has set commit to Approved for uberpackager on hunspell-ts (Fedora devel)
huzaifas has set build to Approved for uberpackager on hunspell-ts (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on hunspell-ts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-ts



From pkgdb at fedoraproject.org  Mon Sep 15 10:11:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:11:57 +0000
Subject: [pkgdb] apcupsd ownership updated
Message-ID: <20080915101157.5564C208D5F@bastion.fedora.phx.redhat.com>

Package apcupsd in Fedora devel is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apcupsd



From pkgdb at fedoraproject.org  Mon Sep 15 10:11:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:11:59 +0000
Subject: [pkgdb] apcupsd ownership updated
Message-ID: <20080915101159.BAD9E208D9E@bastion.fedora.phx.redhat.com>

Package apcupsd in Fedora EPEL 4 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apcupsd



From pkgdb at fedoraproject.org  Mon Sep 15 10:12:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:12:03 +0000
Subject: [pkgdb] apcupsd ownership updated
Message-ID: <20080915101203.213C8208DA8@bastion.fedora.phx.redhat.com>

Package apcupsd in Fedora EPEL 5 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apcupsd



From huzaifas at fedoraproject.org  Mon Sep 15 10:12:19 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 10:12:19 +0000 (UTC)
Subject: rpms/hunspell-ts - New directory
Message-ID: <20080915101219.21BAA7013B@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-ts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsr28251/rpms/hunspell-ts

Log Message:
Directory /cvs/extras/rpms/hunspell-ts added to the repository




From pkgdb at fedoraproject.org  Mon Sep 15 10:12:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:12:10 +0000
Subject: [pkgdb] apcupsd ownership updated
Message-ID: <20080915101210.BBC05208DA0@bastion.fedora.phx.redhat.com>

Package apcupsd in Fedora 8 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apcupsd



From huzaifas at fedoraproject.org  Mon Sep 15 10:12:19 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 10:12:19 +0000 (UTC)
Subject: rpms/hunspell-ts/devel - New directory
Message-ID: <20080915101219.77FC07013D@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-ts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsr28251/rpms/hunspell-ts/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-ts/devel added to the repository




From huzaifas at fedoraproject.org  Mon Sep 15 10:12:21 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 10:12:21 +0000 (UTC)
Subject: rpms/hunspell-ts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080915101221.048967013E@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-ts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsr28251/rpms/hunspell-ts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-ts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-ts
# $Id: Makefile,v 1.1 2008/09/15 10:12:20 huzaifas Exp $
NAME := hunspell-ts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From huzaifas at fedoraproject.org  Mon Sep 15 10:12:20 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 15 Sep 2008 10:12:20 +0000 (UTC)
Subject: rpms/hunspell-ts Makefile,NONE,1.1
Message-ID: <20080915101220.A9EFA7013B@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-ts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsr28251/rpms/hunspell-ts

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-ts


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-ts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep 15 10:12:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:12:46 +0000
Subject: [pkgdb] apcupsd ownership updated
Message-ID: <20080915101246.0FC34208D9E@bastion.fedora.phx.redhat.com>

Package apcupsd in Fedora 9 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apcupsd



From rezso at fedoraproject.org  Mon Sep 15 10:16:40 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Mon, 15 Sep 2008 10:16:40 +0000 (UTC)
Subject: rpms/libgeotiff/devel import.log,1.1,1.2 libgeotiff.spec,1.7,1.8
Message-ID: <20080915101640.3E73670137@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/libgeotiff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28790/devel

Modified Files:
	import.log libgeotiff.spec 
Log Message:
- disable smp build for koji
 ----------------------------------------------------------------------
 Modified Files:
 	devel/import.log devel/libgeotiff.spec 
 ----------------------------------------------------------------------



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libgeotiff/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Sep 2008 10:00:00 -0000	1.1
+++ import.log	15 Sep 2008 10:16:09 -0000	1.2
@@ -1 +1,2 @@
 libgeotiff-1_2_5-1_fc10:HEAD:libgeotiff-1.2.5-1.fc10.src.rpm:1221472762
+libgeotiff-1_2_5-2_fc10:HEAD:libgeotiff-1.2.5-2.fc10.src.rpm:1221473735


Index: libgeotiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgeotiff/devel/libgeotiff.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libgeotiff.spec	15 Sep 2008 10:00:00 -0000	1.7
+++ libgeotiff.spec	15 Sep 2008 10:16:09 -0000	1.8
@@ -1,6 +1,6 @@
 Name:      libgeotiff
 Version:   1.2.5
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   GeoTIFF format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -64,9 +64,12 @@
         --with-tiff               \
         --with-jpeg               \
         --with-zip
+# WARNING
+# disable %{?_smp_mflags}
+# it breaks compile
+
+make
 
-make %{?_smp_mflags}
- 
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -127,6 +130,9 @@
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Sep 15 2008 Balint Cristian <rezso at rdsor.ro> - 1.2.5-2
+- disable smp build for koji
+
 * Mon Sep 15 2008 Balint Cristian <rezso at rdsor.ro> - 1.2.5-1
 - new bugfix release
 



From rezso at fedoraproject.org  Mon Sep 15 10:28:09 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Mon, 15 Sep 2008 10:28:09 +0000 (UTC)
Subject: rpms/libgeotiff/F-9 import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 libgeotiff.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20080915102809.579DA70137@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/libgeotiff/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29641/F-9

Modified Files:
	.cvsignore libgeotiff.spec sources 
Added Files:
	import.log 
Log Message:
- disable smp build for koji
- new bugfix release
 ----------------------------------------------------------------------
 Modified Files:
 	F-9/.cvsignore F-9/libgeotiff.spec F-9/sources 
 Added Files:
 	F-9/import.log 
 ----------------------------------------------------------------------



--- NEW FILE import.log ---
libgeotiff-1_2_5-2_fc10:F-9:libgeotiff-1.2.5-2.fc10.src.rpm:1221474419


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgeotiff/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Jan 2008 00:09:09 -0000	1.3
+++ .cvsignore	15 Sep 2008 10:27:38 -0000	1.4
@@ -1 +1 @@
-libgeotiff-1.2.4.tar.gz
+libgeotiff-1.2.5.tar.gz


Index: libgeotiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgeotiff/F-9/libgeotiff.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libgeotiff.spec	19 Feb 2008 21:32:30 -0000	1.6
+++ libgeotiff.spec	15 Sep 2008 10:27:38 -0000	1.7
@@ -1,6 +1,6 @@
 Name:      libgeotiff
-Version:   1.2.4
-Release:   3%{?dist}
+Version:   1.2.5
+Release:   2%{?dist}
 Summary:   GeoTIFF format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -64,9 +64,12 @@
         --with-tiff               \
         --with-jpeg               \
         --with-zip
+# WARNING
+# disable %{?_smp_mflags}
+# it breaks compile
+
+make
 
-make %{?_smp_mflags}
- 
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -127,6 +130,12 @@
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Sep 15 2008 Balint Cristian <rezso at rdsor.ro> - 1.2.5-2
+- disable smp build for koji
+
+* Mon Sep 15 2008 Balint Cristian <rezso at rdsor.ro> - 1.2.5-1
+- new bugfix release
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.4-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgeotiff/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Jan 2008 00:09:09 -0000	1.3
+++ sources	15 Sep 2008 10:27:38 -0000	1.4
@@ -1 +1 @@
-62cd4a515d1f3ba7b41cb4ed9061aa76  libgeotiff-1.2.4.tar.gz
+000f247a88510f1b38d4b314d1e47048  libgeotiff-1.2.5.tar.gz



From rezso at fedoraproject.org  Mon Sep 15 10:30:42 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Mon, 15 Sep 2008 10:30:42 +0000 (UTC)
Subject: rpms/libgeotiff/F-8 import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 libgeotiff.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20080915103043.21A1470137@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/libgeotiff/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30030/F-8

Modified Files:
	.cvsignore libgeotiff.spec sources 
Added Files:
	import.log 
Log Message:
- disable smp build for koji
- new bugfix release
 ----------------------------------------------------------------------
 Modified Files:
 	F-8/.cvsignore F-8/libgeotiff.spec F-8/sources 
 Added Files:
 	F-8/import.log 
 ----------------------------------------------------------------------



--- NEW FILE import.log ---
libgeotiff-1_2_5-2_fc10:F-8:libgeotiff-1.2.5-2.fc10.src.rpm:1221474565


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgeotiff/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 May 2008 15:52:45 -0000	1.3
+++ .cvsignore	15 Sep 2008 10:30:12 -0000	1.4
@@ -1 +1 @@
-libgeotiff-1.2.4.tar.gz
+libgeotiff-1.2.5.tar.gz


Index: libgeotiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgeotiff/F-8/libgeotiff.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libgeotiff.spec	26 May 2008 15:52:45 -0000	1.4
+++ libgeotiff.spec	15 Sep 2008 10:30:12 -0000	1.5
@@ -1,6 +1,6 @@
 Name:      libgeotiff
-Version:   1.2.4
-Release:   3%{?dist}
+Version:   1.2.5
+Release:   2%{?dist}
 Summary:   GeoTIFF format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -64,9 +64,12 @@
         --with-tiff               \
         --with-jpeg               \
         --with-zip
+# WARNING
+# disable %{?_smp_mflags}
+# it breaks compile
+
+make
 
-make %{?_smp_mflags}
- 
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -127,6 +130,12 @@
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Sep 15 2008 Balint Cristian <rezso at rdsor.ro> - 1.2.5-2
+- disable smp build for koji
+
+* Mon Sep 15 2008 Balint Cristian <rezso at rdsor.ro> - 1.2.5-1
+- new bugfix release
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.4-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgeotiff/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 May 2008 15:52:45 -0000	1.3
+++ sources	15 Sep 2008 10:30:12 -0000	1.4
@@ -1 +1 @@
-62cd4a515d1f3ba7b41cb4ed9061aa76  libgeotiff-1.2.4.tar.gz
+000f247a88510f1b38d4b314d1e47048  libgeotiff-1.2.5.tar.gz



From rezso at fedoraproject.org  Mon Sep 15 10:32:59 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Mon, 15 Sep 2008 10:32:59 +0000 (UTC)
Subject: rpms/libgeotiff/F-7 import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 libgeotiff.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20080915103259.AFB3E70137@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/libgeotiff/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30585/F-7

Modified Files:
	.cvsignore libgeotiff.spec sources 
Added Files:
	import.log 
Log Message:
- disable smp build for koji
- new bugfix release
 ----------------------------------------------------------------------
 Modified Files:
 	F-7/.cvsignore F-7/libgeotiff.spec F-7/sources 
 Added Files:
 	F-7/import.log 
 ----------------------------------------------------------------------



--- NEW FILE import.log ---
libgeotiff-1_2_5-2_fc10:F-7:libgeotiff-1.2.5-2.fc10.src.rpm:1221474704


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgeotiff/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 May 2008 15:54:47 -0000	1.3
+++ .cvsignore	15 Sep 2008 10:32:29 -0000	1.4
@@ -1 +1 @@
-libgeotiff-1.2.4.tar.gz
+libgeotiff-1.2.5.tar.gz


Index: libgeotiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgeotiff/F-7/libgeotiff.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgeotiff.spec	26 May 2008 15:54:47 -0000	1.2
+++ libgeotiff.spec	15 Sep 2008 10:32:29 -0000	1.3
@@ -1,6 +1,6 @@
 Name:      libgeotiff
-Version:   1.2.4
-Release:   3%{?dist}
+Version:   1.2.5
+Release:   2%{?dist}
 Summary:   GeoTIFF format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -64,9 +64,12 @@
         --with-tiff               \
         --with-jpeg               \
         --with-zip
+# WARNING
+# disable %{?_smp_mflags}
+# it breaks compile
+
+make
 
-make %{?_smp_mflags}
- 
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -127,6 +130,12 @@
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Sep 15 2008 Balint Cristian <rezso at rdsor.ro> - 1.2.5-2
+- disable smp build for koji
+
+* Mon Sep 15 2008 Balint Cristian <rezso at rdsor.ro> - 1.2.5-1
+- new bugfix release
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.4-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgeotiff/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 May 2008 15:54:47 -0000	1.3
+++ sources	15 Sep 2008 10:32:29 -0000	1.4
@@ -1 +1 @@
-62cd4a515d1f3ba7b41cb4ed9061aa76  libgeotiff-1.2.4.tar.gz
+000f247a88510f1b38d4b314d1e47048  libgeotiff-1.2.5.tar.gz



From kwizart at fedoraproject.org  Mon Sep 15 10:33:15 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon, 15 Sep 2008 10:33:15 +0000 (UTC)
Subject: rpms/afflib/devel afflib.spec, 1.17, 1.18 sources, 1.9,
	1.10 .cvsignore, 1.9, 1.10
Message-ID: <20080915103315.8A1B370137@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/afflib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30629

Modified Files:
	afflib.spec sources .cvsignore 
Log Message:
Update to 3.3.3



Index: afflib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/afflib.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- afflib.spec	4 Sep 2008 16:40:43 -0000	1.17
+++ afflib.spec	15 Sep 2008 10:32:45 -0000	1.18
@@ -1,8 +1,8 @@
 %define _default_patch_fuzz 2
 
 Name:           afflib
-Version:        3.3.2
-Release:        2%{?dist}
+Version:        3.3.3
+Release:        1%{?dist}
 Summary:        Library to support the Advanced Forensic Format
 
 Group:          System Environment/Libraries
@@ -10,7 +10,6 @@
 URL:            http://www.afflib.org
 Source0:        http://www.afflib.org/downloads/afflib-%{version}.tar.gz
 Patch0:         afflib-3.0.1-WCtype.patch
-Patch1:         afflib-3.3.2-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtool
@@ -60,7 +59,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .WCtype
-%patch1 -p1 -b .gcc43
 # prevent internal lzma to be built - testing
 #rm -rf lzma443
 
@@ -68,8 +66,6 @@
 find lzma443 -type f -exec chmod 0644 {} ';'
 chmod 0644 lib/base64.cpp
 
-sed -i -e 's/-static/-lrt/' lib/Makefile.am lib/Makefile.in
-
 # Autoreconf
 autoreconf
 
@@ -126,13 +122,16 @@
 
 
 %changelog
+* Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 3.3.3-1
+- Update to 3.3.3
+
 * Thu Sep  4 2008 kwizart < kwizart at gmail.com > - 3.3.2-2
 - Update gcc43 patch
 
 * Thu Sep  4 2008 kwizart < kwizart at gmail.com > - 3.3.2-1
 - Update to 3.3.2
 - Remove Requires for ewftools from afftools
-- Qemu image support is disabled (experimental)
+- Qemu image support is disabled
 
 * Mon Sep  1 2008 kwizart < kwizart at gmail.com > - 3.3.1-1
 - Update to 3.3.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Sep 2008 16:00:31 -0000	1.9
+++ sources	15 Sep 2008 10:32:45 -0000	1.10
@@ -1 +1 @@
-cc96dc62d380fcc3c6679d2404c61306  afflib-3.3.2.tar.gz
+cac3d4e45ba46ffe29756e40f4ba0a38  afflib-3.3.3.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Sep 2008 16:00:31 -0000	1.9
+++ .cvsignore	15 Sep 2008 10:32:45 -0000	1.10
@@ -1 +1 @@
-afflib-3.3.2.tar.gz
+afflib-3.3.3.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 15 10:33:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:33:57 +0000
Subject: [pkgdb] id3-py ownership updated
Message-ID: <20080915103357.8B4E5208D9F@bastion.fedora.phx.redhat.com>

Package id3-py in Fedora devel was orphaned by mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3-py



From pkgdb at fedoraproject.org  Mon Sep 15 10:34:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:34:06 +0000
Subject: [pkgdb] id3-py ownership updated
Message-ID: <20080915103406.3F5E2208DA0@bastion.fedora.phx.redhat.com>

Package id3-py in Fedora 9 was orphaned by mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/id3-py



From pkgdb at fedoraproject.org  Mon Sep 15 10:35:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:35:36 +0000
Subject: [pkgdb] python-libgmail ownership updated
Message-ID: <20080915103536.D4ECC208D9B@bastion.fedora.phx.redhat.com>

Package python-libgmail in Fedora EPEL 4 is now owned by mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-libgmail



From pkgdb at fedoraproject.org  Mon Sep 15 10:35:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:35:39 +0000
Subject: [pkgdb] python-libgmail ownership updated
Message-ID: <20080915103539.64E44208DA0@bastion.fedora.phx.redhat.com>

Package python-libgmail in Fedora EPEL 5 is now owned by mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-libgmail



From mjakubicek at fedoraproject.org  Mon Sep 15 10:36:06 2008
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 15 Sep 2008 10:36:06 +0000 (UTC)
Subject: rpms/orsa/F-8 orsa.spec,1.1,1.2
Message-ID: <20080915103606.668D870137@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/orsa/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30945

Modified Files:
	orsa.spec 
Log Message:
- BR qt-devel instead of qt3-devel



Index: orsa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orsa/F-8/orsa.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- orsa.spec	15 Sep 2008 08:45:29 -0000	1.1
+++ orsa.spec	15 Sep 2008 10:35:35 -0000	1.2
@@ -21,7 +21,7 @@
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	readline-devel
-BuildRequires:	qt3-devel
+BuildRequires:	qt-devel
 BuildRequires:	mesa-libGL-devel
 BuildRequires:	fftw2-devel
 BuildRequires:	gsl-devel



From kwizart at fedoraproject.org  Mon Sep 15 10:36:32 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon, 15 Sep 2008 10:36:32 +0000 (UTC)
Subject: rpms/afflib/devel afflib-3.3.2-gcc43.patch,1.1,NONE
Message-ID: <20080915103632.259E370137@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/afflib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31052

Removed Files:
	afflib-3.3.2-gcc43.patch 
Log Message:
Clean



--- afflib-3.3.2-gcc43.patch DELETED ---



From kwizart at fedoraproject.org  Mon Sep 15 10:43:06 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon, 15 Sep 2008 10:43:06 +0000 (UTC)
Subject: rpms/afflib/devel afflib.spec,1.18,1.19
Message-ID: <20080915104306.73B0170137@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/afflib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31654

Modified Files:
	afflib.spec 
Log Message:
Want to play this ?



Index: afflib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/afflib.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- afflib.spec	15 Sep 2008 10:32:45 -0000	1.18
+++ afflib.spec	15 Sep 2008 10:42:36 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:           afflib
 Version:        3.3.3
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Library to support the Advanced Forensic Format
 
 Group:          System Environment/Libraries
@@ -122,7 +122,7 @@
 
 
 %changelog
-* Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 3.3.3-1
+* Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 3.3.3-3
 - Update to 3.3.3
 
 * Thu Sep  4 2008 kwizart < kwizart at gmail.com > - 3.3.2-2



From pkgdb at fedoraproject.org  Mon Sep 15 10:45:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:45:25 +0000
Subject: [pkgdb] python-libgmail-docs ownership updated
Message-ID: <20080915104525.BD84C208D9B@bastion.fedora.phx.redhat.com>

Package python-libgmail-docs in Fedora 8 is now owned by mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-libgmail-docs



From pkgdb at fedoraproject.org  Mon Sep 15 10:45:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:45:58 +0000
Subject: [pkgdb] python-libgmail-docs ownership updated
Message-ID: <20080915104558.AD32B208DA3@bastion.fedora.phx.redhat.com>

Package python-libgmail-docs in Fedora EPEL 5 is now owned by mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-libgmail-docs



From pkgdb at fedoraproject.org  Mon Sep 15 10:45:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:45:54 +0000
Subject: [pkgdb] python-libgmail-docs ownership updated
Message-ID: <20080915104554.C416F208DA0@bastion.fedora.phx.redhat.com>

Package python-libgmail-docs in Fedora EPEL 4 is now owned by mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-libgmail-docs



From pkgdb at fedoraproject.org  Mon Sep 15 10:46:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:46:29 +0000
Subject: [pkgdb] python-libgmail: mnowak has requested commit
Message-ID: <20080915104629.97F2A208D9F@bastion.fedora.phx.redhat.com>

mnowak has requested the commit acl on python-libgmail (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-libgmail



From pkgdb at fedoraproject.org  Mon Sep 15 10:46:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:46:59 +0000
Subject: [pkgdb] python-libgmail-docs: mnowak has requested watchcommits
Message-ID: <20080915104659.295E7208D9F@bastion.fedora.phx.redhat.com>

mnowak has requested the watchcommits acl on python-libgmail-docs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-libgmail-docs



From pkgdb at fedoraproject.org  Mon Sep 15 10:47:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:47:14 +0000
Subject: [pkgdb] python-libgmail: mnowak has requested watchcommits
Message-ID: <20080915104714.72F15208DA2@bastion.fedora.phx.redhat.com>

mnowak has requested the watchcommits acl on python-libgmail (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-libgmail



From pkgdb at fedoraproject.org  Mon Sep 15 10:47:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:47:35 +0000
Subject: [pkgdb] fuse-gmailfs: mnowak has requested watchcommits
Message-ID: <20080915104736.3745A208DA0@bastion.fedora.phx.redhat.com>

mnowak has requested the watchcommits acl on fuse-gmailfs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fuse-gmailfs



From pkgdb at fedoraproject.org  Mon Sep 15 10:47:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:47:47 +0000
Subject: [pkgdb] fuse-gmailfs ownership updated
Message-ID: <20080915104747.895B1208DA3@bastion.fedora.phx.redhat.com>

Package fuse-gmailfs in Fedora EPEL 5 is now owned by mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fuse-gmailfs



From pkgdb at fedoraproject.org  Mon Sep 15 10:47:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:47:43 +0000
Subject: [pkgdb] fuse-gmailfs ownership updated
Message-ID: <20080915104743.1652D208DA2@bastion.fedora.phx.redhat.com>

Package fuse-gmailfs in Fedora EPEL 4 is now owned by mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fuse-gmailfs



From pkgdb at fedoraproject.org  Mon Sep 15 10:48:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:48:05 +0000
Subject: [pkgdb] python-libgmail: mnowak has requested watchcommits
Message-ID: <20080915104805.2F6ED208DA4@bastion.fedora.phx.redhat.com>

mnowak has requested the watchcommits acl on python-libgmail (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-libgmail



From pkgdb at fedoraproject.org  Mon Sep 15 10:48:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:48:02 +0000
Subject: [pkgdb] python-libgmail: mnowak has given up watchcommits
Message-ID: <20080915104802.312E4208DA2@bastion.fedora.phx.redhat.com>

mnowak has given up the watchcommits acl on python-libgmail (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-libgmail



From pkgdb at fedoraproject.org  Mon Sep 15 10:48:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 10:48:08 +0000
Subject: [pkgdb] python-libgmail: mnowak has given up commit
Message-ID: <20080915104808.8F247208DA5@bastion.fedora.phx.redhat.com>

mnowak has given up the commit acl on python-libgmail (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-libgmail



From caolanm at fedoraproject.org  Mon Sep 15 10:57:57 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 15 Sep 2008 10:57:57 +0000 (UTC)
Subject: rpms/hunspell-ts/devel hunspell-ts.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080915105757.9839E70137@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv420/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-ts.spec import.log 
Log Message:



--- NEW FILE hunspell-ts.spec ---
Name: hunspell-ts
Summary: Tsonga hunspell dictionaries
%define upstreamid 20060123
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://downloads.translate.org.za/spellchecker/tsonga/myspell-ts_ZA-%{upstreamid}.zip
Group: Applications/Text
URL: http://translate.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+
BuildArch: noarch

Requires: hunspell

%description
Tsonga hunspell dictionaries.

%prep
%setup -q -c -n hunspell-ts

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_ts_ZA.txt
%{_datadir}/myspell/*

%changelog
* Fri Sep 12 2008 Caolan McNamara <caolanm at redhat.com> - 0.20060123-1
- initial version


--- NEW FILE import.log ---
hunspell-ts-0_20060123-1_fc9:HEAD:hunspell-ts-0.20060123-1.fc9.src.rpm:1221476337


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2008 10:12:20 -0000	1.1
+++ .cvsignore	15 Sep 2008 10:57:25 -0000	1.2
@@ -0,0 +1 @@
+myspell-ts_ZA-20060123.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2008 10:12:20 -0000	1.1
+++ sources	15 Sep 2008 10:57:26 -0000	1.2
@@ -0,0 +1 @@
+b5afad1cc483b5523781c08fbc8a6919  myspell-ts_ZA-20060123.zip



From caolanm at fedoraproject.org  Mon Sep 15 11:04:32 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 15 Sep 2008 11:04:32 +0000 (UTC)
Subject: rpms/hunspell-ve/devel hunspell-ve.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080915110432.C9A7170137@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ve/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1144/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-ve.spec import.log 
Log Message:



--- NEW FILE hunspell-ve.spec ---
Name: hunspell-ve
Summary: Venda hunspell dictionaries
%define upstreamid 20060706
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://downloads.translate.org.za/spellchecker/venda/myspell-ve_ZA-%{upstreamid}.zip
Group: Applications/Text
URL: http://translate.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+
BuildArch: noarch

Requires: hunspell

%description
Venda hunspell dictionaries.

%prep
%setup -q -c -n hunspell-ve

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_ve_ZA.txt
%{_datadir}/myspell/*

%changelog
* Fri Sep 12 2008 Caolan McNamara <caolanm at redhat.com> - 0.20060706-1
- initial version


--- NEW FILE import.log ---
hunspell-ve-0_20060706-1_fc9:HEAD:hunspell-ve-0.20060706-1.fc9.src.rpm:1221476735


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ve/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2008 10:09:23 -0000	1.1
+++ .cvsignore	15 Sep 2008 11:04:02 -0000	1.2
@@ -0,0 +1 @@
+myspell-ve_ZA-20060706.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ve/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2008 10:09:24 -0000	1.1
+++ sources	15 Sep 2008 11:04:02 -0000	1.2
@@ -0,0 +1 @@
+0cc3d5ed531d5d78a9d6fe54023bb269  myspell-ve_ZA-20060706.zip



From caolanm at fedoraproject.org  Mon Sep 15 11:11:18 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 15 Sep 2008 11:11:18 +0000 (UTC)
Subject: rpms/hunspell-xh/devel hunspell-xh.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080915111118.B459A70137@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-xh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1927/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-xh.spec import.log 
Log Message:



--- NEW FILE hunspell-xh.spec ---
Name: hunspell-xh
Summary: Xhosa hunspell dictionaries
%define upstreamid 20060123
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://downloads.translate.org.za/spellchecker/xhosa/myspell-xh_ZA-%{upstreamid}.zip
Group: Applications/Text
URL: http://translate.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+
BuildArch: noarch

Requires: hunspell

%description
Xhosa hunspell dictionaries.

%prep
%setup -q -c -n hunspell-xh

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_xh_ZA.txt
%{_datadir}/myspell/*

%changelog
* Fri Sep 12 2008 Caolan McNamara <caolanm at redhat.com> - 0.20060123-1
- initial version


--- NEW FILE import.log ---
hunspell-xh-0_20060123-1_fc9:HEAD:hunspell-xh-0.20060123-1.fc9.src.rpm:1221477137


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-xh/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2008 10:07:46 -0000	1.1
+++ .cvsignore	15 Sep 2008 11:10:48 -0000	1.2
@@ -0,0 +1 @@
+myspell-xh_ZA-20060123.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-xh/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2008 10:07:46 -0000	1.1
+++ sources	15 Sep 2008 11:10:48 -0000	1.2
@@ -0,0 +1 @@
+d7d2f996475c4cbdb16b99272efbd90b  myspell-xh_ZA-20060123.zip



From varekova at fedoraproject.org  Mon Sep 15 11:28:42 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 15 Sep 2008 11:28:42 +0000 (UTC)
Subject: rpms/logwatch/devel logwatch-7.3.6-postfix2.patch, NONE,
	1.1 logwatch.spec, 1.96, 1.97
Message-ID: <20080915112842.9632570137@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/logwatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3355

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-postfix2.patch 
Log Message:
- fix postfix script problem
  (#462174)


logwatch-7.3.6-postfix2.patch:

--- NEW FILE logwatch-7.3.6-postfix2.patch ---
diff -up logwatch-7.3.6/scripts/services/postfix.pom logwatch-7.3.6/scripts/services/postfix
--- logwatch-7.3.6/scripts/services/postfix.pom	2008-09-15 13:13:29.000000000 +0200
+++ logwatch-7.3.6/scripts/services/postfix	2008-09-15 13:09:26.000000000 +0200
@@ -1530,8 +1530,9 @@ while ( <> ) {
    # end of $re_QID section
 
    # see also ConnectionLost in $re_QID section
-   elsif ( ($reason,$host,$hostip) = ($p1 =~ /lost connection (after [^ ]*) from ([^[]*)\[($re_IP|unknown)\]$/o )) {
+   elsif ( ($reason,$host,$hostip) = ($p1 =~ /lost connection (after [^ ]*) (\(\d+ bytes\) )?from ([^[]*)\[($re_IP|unknown)\]$/o )) {
       unless ($hostip =~ /unknown/) {
+         #TD lost connection after DATA (0 bytes) from mail.example.com[192.168.0.1]    
          #TD lost connection after CONNECT from mail.example.com[192.168.0.1] 
          $Totals{'ConnectionLost'}++;
          $Counts{'ConnectionLost'}{"\u$reason"}{formathost($hostip,$host)}++;
@@ -1570,7 +1571,8 @@ while ( <> ) {
    }
 
    # see also TimeoutInbound in $re_QID section
-   elsif ( ($reason,$host,$hostip) = ($p1 =~ /^timeout (after [^ ]*) from ([^[]*)\[($re_IP)\]$/o)) {
+   elsif ( ($reason,$host,$hostip) = ($p1 =~ /^timeout (after [^ ]*) (\(\d+ bytes\) )?from ([^[]*)\[($re_IP)\]$/o)) {
+      #TD timeout after DATA (0 bytes) from unknown[85.102.182.31]
       #TD timeout after RSET from example.com[192.168.0.1]
       $Totals{'TimeoutInbound'}++;
       $Counts{'TimeoutInbound'}{"\u$reason"}{formathost($hostip,$host)}++;
@@ -1593,7 +1595,8 @@ while ( <> ) {
 
    ### smtpd_tls_loglevel >= 1
    # Server TLS messages
-   elsif ( ($status,$host,$hostip,$type) = ($p1 =~ /^(?:(Trusted|Untrusted) )?TLS connection established from ([^[]+)\[($re_IP)\]: (.*)$/o )) {
+   elsif ( ($status,$host,$hostip,$type) = ($p1 =~ /^(?:(Trusted|Untrusted|Anonymous) )?TLS connection established from ([^[]+)\[($re_IP)\]: (.*)$/o )) {
+      #DT Anonymous TLS connection established from fractal.kaosol.net[216.150.215.72]: TLSv1 with cipher EDH-RSA-DES-CBC3-SHA (168/168 bits)
       #TD TLS connection established from example.com[192.168.0.1]: TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits) 
       # Postfix 2.5+: status: Untrusted or Trusted
       #TD Untrusted TLS connection established from example.com[192.168.0.1]: TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits) 
@@ -1625,6 +1628,11 @@ while ( <> ) {
       $Totals{'TlsUnverified'}++;
       $Counts{'TlsUnverified'}{$cert}++; 
 
+   } elsif ( ($cert) = ($p1 =~ /: Untrusted: (subject_CN=.*)/)) {
+      #TD Untrusted: subject_CN=EXAMPLE-MAIL, issuer=EXAMPLE-MAIL,
+      $Totals{'TlsUnverified'}++;
+      $Counts{'TlsUnverified'}{$cert}++; 
+
    } elsif ( ($p1 =~ m/(lookup )?table ([^ ]+ )?has changed -- (restarting|exiting)$/)) {
       #TD table hash:/etc/postfix/helo_checks has changed -- restarting
       $Totals{'TableChanged'}++;


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- logwatch.spec	26 Aug 2008 11:09:09 -0000	1.96
+++ logwatch.spec	15 Sep 2008 11:28:12 -0000	1.97
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 27%{?dist}
+Release: 28%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -44,6 +44,7 @@
 Patch39: logwatch-7.3.6-init.patch
 Patch40: logwatch-7.3.6-cron5.patch
 Patch41: logwatch-7.3.6-logrotate.patch
+Patch42: logwatch-7.3.6-postfix2.patch
 
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
@@ -96,6 +97,7 @@
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
+%patch42 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -209,6 +211,10 @@
 %doc License project/CHANGES 
 
 %changelog
+* Mon Sep 15 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-28
+- fix postfix script problem
+  (#462174)
+
 * Tue Aug 26 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-27
 - fix init script problem
   (#459887)



From pkgdb at fedoraproject.org  Mon Sep 15 11:54:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 11:54:57 +0000
Subject: [pkgdb] dovecot: mhlavink has requested watchbugzilla
Message-ID: <20080915115458.D8DD0208D9F@bastion.fedora.phx.redhat.com>

mhlavink has requested the watchbugzilla acl on dovecot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 11:55:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 11:55:01 +0000
Subject: [pkgdb] dovecot: mhlavink has given up watchbugzilla
Message-ID: <20080915115501.9B4A9208DA2@bastion.fedora.phx.redhat.com>

mhlavink has given up the watchbugzilla acl on dovecot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 11:58:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 11:58:07 +0000
Subject: [pkgdb] dovecot: mhlavink has requested watchbugzilla
Message-ID: <20080915115807.72494208D9E@bastion.fedora.phx.redhat.com>

mhlavink has requested the watchbugzilla acl on dovecot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 11:58:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 11:58:09 +0000
Subject: [pkgdb] dovecot: mhlavink has requested commit
Message-ID: <20080915115809.E6742208DA2@bastion.fedora.phx.redhat.com>

mhlavink has requested the commit acl on dovecot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 11:58:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 11:58:10 +0000
Subject: [pkgdb] dovecot: mhlavink has requested watchcommits
Message-ID: <20080915115810.9598F208DA5@bastion.fedora.phx.redhat.com>

mhlavink has requested the watchcommits acl on dovecot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 11:58:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 11:58:11 +0000
Subject: [pkgdb] dovecot: mhlavink has requested approveacls
Message-ID: <20080915115811.6E30E208DA8@bastion.fedora.phx.redhat.com>

mhlavink has requested the approveacls acl on dovecot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 11:58:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 11:58:20 +0000
Subject: [pkgdb] dovecot: mhlavink has requested commit
Message-ID: <20080915115820.C5EC9208D9E@bastion.fedora.phx.redhat.com>

mhlavink has requested the commit acl on dovecot (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 11:58:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 11:58:21 +0000
Subject: [pkgdb] dovecot: mhlavink has requested approveacls
Message-ID: <20080915115821.117EC208DAC@bastion.fedora.phx.redhat.com>

mhlavink has requested the approveacls acl on dovecot (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 11:58:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 11:58:21 +0000
Subject: [pkgdb] dovecot: mhlavink has requested watchcommits
Message-ID: <20080915115821.700CD208DAF@bastion.fedora.phx.redhat.com>

mhlavink has requested the watchcommits acl on dovecot (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 11:58:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 11:58:24 +0000
Subject: [pkgdb] dovecot: mhlavink has requested watchbugzilla
Message-ID: <20080915115824.D2152208DB5@bastion.fedora.phx.redhat.com>

mhlavink has requested the watchbugzilla acl on dovecot (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 11:58:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 11:58:21 +0000
Subject: [pkgdb] dovecot: mhlavink has requested watchbugzilla
Message-ID: <20080915115821.768FF208DB2@bastion.fedora.phx.redhat.com>

mhlavink has requested the watchbugzilla acl on dovecot (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 11:58:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 11:58:26 +0000
Subject: [pkgdb] dovecot: mhlavink has requested commit
Message-ID: <20080915115826.AFE6E208DB8@bastion.fedora.phx.redhat.com>

mhlavink has requested the commit acl on dovecot (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 11:58:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 11:58:30 +0000
Subject: [pkgdb] dovecot: mhlavink has requested watchcommits
Message-ID: <20080915115830.4EBE2208DA0@bastion.fedora.phx.redhat.com>

mhlavink has requested the watchcommits acl on dovecot (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 11:58:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 11:58:30 +0000
Subject: [pkgdb] dovecot: mhlavink has requested approveacls
Message-ID: <20080915115830.6AE8B208DBB@bastion.fedora.phx.redhat.com>

mhlavink has requested the approveacls acl on dovecot (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 12:03:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:03:06 +0000
Subject: [pkgdb] cyrus-imapd: mhlavink has requested commit
Message-ID: <20080915120306.8F16A208DA9@bastion.fedora.phx.redhat.com>

mhlavink has requested the commit acl on cyrus-imapd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:03:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:03:06 +0000
Subject: [pkgdb] cyrus-imapd: mhlavink has requested watchbugzilla
Message-ID: <20080915120306.58F10208DA6@bastion.fedora.phx.redhat.com>

mhlavink has requested the watchbugzilla acl on cyrus-imapd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:03:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:03:16 +0000
Subject: [pkgdb] dovecot had acl change status
Message-ID: <20080915120316.5348D208DAB@bastion.fedora.phx.redhat.com>

sharkcz has set the watchbugzilla acl on dovecot (Fedora devel) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 12:03:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:03:20 +0000
Subject: [pkgdb] cyrus-imapd: mhlavink has requested commit
Message-ID: <20080915120320.AF0BF208DB0@bastion.fedora.phx.redhat.com>

mhlavink has requested the commit acl on cyrus-imapd (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:03:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:03:20 +0000
Subject: [pkgdb] cyrus-imapd: mhlavink has requested watchbugzilla
Message-ID: <20080915120320.969B8208DAD@bastion.fedora.phx.redhat.com>

mhlavink has requested the watchbugzilla acl on cyrus-imapd (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:03:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:03:20 +0000
Subject: [pkgdb] cyrus-imapd: mhlavink has requested approveacls
Message-ID: <20080915120320.E310A208DB3@bastion.fedora.phx.redhat.com>

mhlavink has requested the approveacls acl on cyrus-imapd (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:03:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:03:21 +0000
Subject: [pkgdb] dovecot had acl change status
Message-ID: <20080915120321.70D4C208DB7@bastion.fedora.phx.redhat.com>

sharkcz has set the watchcommits acl on dovecot (Fedora devel) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 12:03:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:03:32 +0000
Subject: [pkgdb] cyrus-imapd: mhlavink has requested watchcommits
Message-ID: <20080915120333.26819208DA0@bastion.fedora.phx.redhat.com>

mhlavink has requested the watchcommits acl on cyrus-imapd (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:03:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:03:33 +0000
Subject: [pkgdb] dovecot had acl change status
Message-ID: <20080915120333.7F7B4208DA8@bastion.fedora.phx.redhat.com>

sharkcz has set the commit acl on dovecot (Fedora devel) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 12:03:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:03:34 +0000
Subject: [pkgdb] cyrus-imapd: mhlavink has requested watchbugzilla
Message-ID: <20080915120334.D5678208DB9@bastion.fedora.phx.redhat.com>

mhlavink has requested the watchbugzilla acl on cyrus-imapd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:03:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:03:40 +0000
Subject: [pkgdb] cyrus-imapd: mhlavink has requested commit
Message-ID: <20080915120340.2E865208DA7@bastion.fedora.phx.redhat.com>

mhlavink has requested the commit acl on cyrus-imapd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:03:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:03:41 +0000
Subject: [pkgdb] cyrus-imapd: mhlavink has requested approveacls
Message-ID: <20080915120341.50503208DBB@bastion.fedora.phx.redhat.com>

mhlavink has requested the approveacls acl on cyrus-imapd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:03:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:03:42 +0000
Subject: [pkgdb] cyrus-imapd: mhlavink has requested watchcommits
Message-ID: <20080915120342.59450208DBE@bastion.fedora.phx.redhat.com>

mhlavink has requested the watchcommits acl on cyrus-imapd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:03:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:03:43 +0000
Subject: [pkgdb] dovecot had acl change status
Message-ID: <20080915120343.37CC5208DC2@bastion.fedora.phx.redhat.com>

sharkcz has set the approveacls acl on dovecot (Fedora devel) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 12:03:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:03:55 +0000
Subject: [pkgdb] dovecot had acl change status
Message-ID: <20080915120356.19460208DAA@bastion.fedora.phx.redhat.com>

sharkcz has set the watchbugzilla acl on dovecot (Fedora 8) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 12:04:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:04:00 +0000
Subject: [pkgdb] dovecot had acl change status
Message-ID: <20080915120400.2B800208DAD@bastion.fedora.phx.redhat.com>

sharkcz has set the watchcommits acl on dovecot (Fedora 8) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 12:04:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:04:10 +0000
Subject: [pkgdb] dovecot had acl change status
Message-ID: <20080915120411.2B78E208DB0@bastion.fedora.phx.redhat.com>

sharkcz has set the commit acl on dovecot (Fedora 8) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 12:04:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:04:14 +0000
Subject: [pkgdb] dovecot had acl change status
Message-ID: <20080915120414.441C5208DB3@bastion.fedora.phx.redhat.com>

sharkcz has set the approveacls acl on dovecot (Fedora 8) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 12:04:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:04:19 +0000
Subject: [pkgdb] dovecot had acl change status
Message-ID: <20080915120419.A39D0208DA3@bastion.fedora.phx.redhat.com>

sharkcz has set the watchbugzilla acl on dovecot (Fedora 9) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 12:04:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:04:23 +0000
Subject: [pkgdb] dovecot had acl change status
Message-ID: <20080915120423.61BA4208DC4@bastion.fedora.phx.redhat.com>

sharkcz has set the watchcommits acl on dovecot (Fedora 9) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 12:04:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:04:26 +0000
Subject: [pkgdb] dovecot had acl change status
Message-ID: <20080915120426.9BD21208DC6@bastion.fedora.phx.redhat.com>

sharkcz has set the commit acl on dovecot (Fedora 9) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Mon Sep 15 12:04:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:04:29 +0000
Subject: [pkgdb] dovecot had acl change status
Message-ID: <20080915120430.07466208DB8@bastion.fedora.phx.redhat.com>

sharkcz has set the approveacls acl on dovecot (Fedora 9) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From nphilipp at fedoraproject.org  Mon Sep 15 12:05:10 2008
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 15 Sep 2008 12:05:10 +0000 (UTC)
Subject: rpms/python-slip/devel .cvsignore, 1.12, 1.13 python-slip.spec, 1.11,
	1.12 sources, 1.13, 1.14
Message-ID: <20080915120510.5097E70137@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/python-slip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5985

Modified Files:
	.cvsignore python-slip.spec sources 
Log Message:
clarify examples a bit



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	9 Sep 2008 15:20:01 -0000	1.12
+++ .cvsignore	15 Sep 2008 12:04:39 -0000	1.13
@@ -1 +1 @@
-python-slip-0.1.13.tar.bz2
+python-slip-0.1.14.tar.bz2


Index: python-slip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/python-slip.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-slip.spec	9 Sep 2008 15:20:01 -0000	1.11
+++ python-slip.spec	15 Sep 2008 12:04:39 -0000	1.12
@@ -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.1.13
+Version:    0.1.14
 Release:    1%{?dist}
 Summary:    Miscellaneous convenience, extension and workaround code for Python
 
@@ -85,6 +85,9 @@
 %{python_sitelib}/slip.gtk-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Mon Sep 15 2008 Nils Philippsen <nphilipp at redhat.com> - 0.1.14
+- clarify examples a bit
+
 * Tue Sep 09 2008 Nils Philippsen <nphilipp at redhat.com> - 0.1.13
 - add working examples
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	9 Sep 2008 15:20:01 -0000	1.13
+++ sources	15 Sep 2008 12:04:39 -0000	1.14
@@ -1 +1 @@
-c92fc8c8a11ae922ca9b2438ba87af82  python-slip-0.1.13.tar.bz2
+d2111550338c22d46881cf7858d7fa4b  python-slip-0.1.14.tar.bz2



From pkgdb at fedoraproject.org  Mon Sep 15 12:05:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:05:16 +0000
Subject: [pkgdb] cyrus-imapd had acl change status
Message-ID: <20080915120517.2CBEB208DA7@bastion.fedora.phx.redhat.com>

sharkcz has set the watchbugzilla acl on cyrus-imapd (Fedora devel) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:05:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:05:21 +0000
Subject: [pkgdb] cyrus-imapd had acl change status
Message-ID: <20080915120521.6F7C9208DAB@bastion.fedora.phx.redhat.com>

sharkcz has set the watchcommits acl on cyrus-imapd (Fedora devel) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:05:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:05:24 +0000
Subject: [pkgdb] cyrus-imapd had acl change status
Message-ID: <20080915120524.64CA8208DAE@bastion.fedora.phx.redhat.com>

sharkcz has set the commit acl on cyrus-imapd (Fedora devel) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:05:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:05:27 +0000
Subject: [pkgdb] cyrus-imapd had acl change status
Message-ID: <20080915120527.BF1A7208DBE@bastion.fedora.phx.redhat.com>

sharkcz has set the approveacls acl on cyrus-imapd (Fedora devel) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:05:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:05:35 +0000
Subject: [pkgdb] cyrus-imapd had acl change status
Message-ID: <20080915120535.E4175208DA3@bastion.fedora.phx.redhat.com>

sharkcz has set the watchbugzilla acl on cyrus-imapd (Fedora 8) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:05:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:05:39 +0000
Subject: [pkgdb] cyrus-imapd had acl change status
Message-ID: <20080915120539.8593F208DC0@bastion.fedora.phx.redhat.com>

sharkcz has set the watchcommits acl on cyrus-imapd (Fedora 8) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:05:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:05:46 +0000
Subject: [pkgdb] cyrus-imapd had acl change status
Message-ID: <20080915120546.BE620208DC3@bastion.fedora.phx.redhat.com>

sharkcz has set the commit acl on cyrus-imapd (Fedora 8) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:05:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:05:50 +0000
Subject: [pkgdb] cyrus-imapd had acl change status
Message-ID: <20080915120550.7A207208DCB@bastion.fedora.phx.redhat.com>

sharkcz has set the approveacls acl on cyrus-imapd (Fedora 8) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:05:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:05:54 +0000
Subject: [pkgdb] cyrus-imapd had acl change status
Message-ID: <20080915120555.186D8208DC5@bastion.fedora.phx.redhat.com>

sharkcz has set the watchbugzilla acl on cyrus-imapd (Fedora 9) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:05:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:05:58 +0000
Subject: [pkgdb] cyrus-imapd had acl change status
Message-ID: <20080915120559.68286208DCF@bastion.fedora.phx.redhat.com>

sharkcz has set the watchcommits acl on cyrus-imapd (Fedora 9) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:06:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:06:07 +0000
Subject: [pkgdb] cyrus-imapd had acl change status
Message-ID: <20080915120607.7F66B208DB8@bastion.fedora.phx.redhat.com>

sharkcz has set the commit acl on cyrus-imapd (Fedora 9) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:06:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:06:10 +0000
Subject: [pkgdb] cyrus-imapd had acl change status
Message-ID: <20080915120610.A68C2208DC7@bastion.fedora.phx.redhat.com>

sharkcz has set the approveacls acl on cyrus-imapd (Fedora 9) to Approved for mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From jwrdegoede at fedoraproject.org  Mon Sep 15 12:07:45 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 15 Sep 2008 12:07:45 +0000 (UTC)
Subject: rpms/libv4l/devel .cvsignore, 1.6, 1.7 libv4l.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <20080915120745.2008E70137@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libv4l/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6359

Modified Files:
	.cvsignore libv4l.spec sources 
Log Message:
* Mon Sep 15 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5.0-1
- New upstream release 0.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libv4l/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Aug 2008 20:03:31 -0000	1.6
+++ .cvsignore	15 Sep 2008 12:07:14 -0000	1.7
@@ -1 +1 @@
-libv4l-0.4.2.tar.gz
+libv4l-0.5.0.tar.gz


Index: libv4l.spec
===================================================================
RCS file: /cvs/extras/rpms/libv4l/devel/libv4l.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libv4l.spec	30 Aug 2008 20:03:31 -0000	1.5
+++ libv4l.spec	15 Sep 2008 12:07:14 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           libv4l
-Version:        0.4.2
+Version:        0.5.0
 Release:        1%{?dist}
 Summary:        Collection of video4linux support libraries 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5.0-1
+- New upstream release 0.5.0
+
 * Fri Aug 29 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.2-1
 - New upstream release 0.4.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libv4l/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Aug 2008 20:03:31 -0000	1.6
+++ sources	15 Sep 2008 12:07:14 -0000	1.7
@@ -1 +1 @@
-c439348bde5d939b39d1f196136580dc  libv4l-0.4.2.tar.gz
+e29317735375c914d70e4179c18c4dbb  libv4l-0.5.0.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 15 12:03:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:03:04 +0000
Subject: [pkgdb] cyrus-imapd: mhlavink has requested approveacls
Message-ID: <20080915120304.9E2B6208DA3@bastion.fedora.phx.redhat.com>

mhlavink has requested the approveacls acl on cyrus-imapd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From pkgdb at fedoraproject.org  Mon Sep 15 12:03:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:03:02 +0000
Subject: [pkgdb] cyrus-imapd: mhlavink has requested watchcommits
Message-ID: <20080915120302.D8E03208D9F@bastion.fedora.phx.redhat.com>

mhlavink has requested the watchcommits acl on cyrus-imapd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cyrus-imapd



From varekova at fedoraproject.org  Mon Sep 15 12:02:56 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 15 Sep 2008 12:02:56 +0000 (UTC)
Subject: rpms/logwatch/F-9 logwatch-7.3.6-postfix2.patch, NONE,
	1.1 logwatch.spec, 1.91, 1.92
Message-ID: <20080915120256.A0F2A70137@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/logwatch/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5763

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-postfix2.patch 
Log Message:
- fix postfix script problem
  (#462174)


logwatch-7.3.6-postfix2.patch:

--- NEW FILE logwatch-7.3.6-postfix2.patch ---
diff -up logwatch-7.3.6/scripts/services/postfix.pom logwatch-7.3.6/scripts/services/postfix
--- logwatch-7.3.6/scripts/services/postfix.pom	2008-09-15 12:15:12.000000000 +0200
+++ logwatch-7.3.6/scripts/services/postfix	2008-09-15 13:26:55.000000000 +0200
@@ -1530,8 +1530,9 @@ while ( <> ) {
    # end of $re_QID section
 
    # see also ConnectionLost in $re_QID section
-   elsif ( ($reason,$host,$hostip) = ($p1 =~ /lost connection (after [^ ]*) from ([^[]*)\[($re_IP|unknown)\]$/o )) {
+   elsif ( ($reason,$host,$hostip) = ($p1 =~ /lost connection (after [^ ]*) (\(\d+ bytes\) )?from ([^[]*)\[($re_IP|unknown)\]$/o )) {
       unless ($hostip =~ /unknown/) {
+         #TD lost connection after DATA (0 bytes) from mail.example.com[192.168.0.1]    
          #TD lost connection after CONNECT from mail.example.com[192.168.0.1] 
          $Totals{'ConnectionLost'}++;
          $Counts{'ConnectionLost'}{"\u$reason"}{formathost($hostip,$host)}++;
@@ -1570,7 +1571,8 @@ while ( <> ) {
    }
 
    # see also TimeoutInbound in $re_QID section
-   elsif ( ($reason,$host,$hostip) = ($p1 =~ /^timeout (after [^ ]*) from ([^[]*)\[($re_IP)\]$/o)) {
+   elsif ( ($reason,$host,$hostip) = ($p1 =~ /^timeout (after [^ ]*) (\(\d+ bytes\) )?from ([^[]*)\[($re_IP)\]$/o)) {
+      #TD timeout after DATA (0 bytes) from unknown[85.102.182.31]
       #TD timeout after RSET from example.com[192.168.0.1]
       $Totals{'TimeoutInbound'}++;
       $Counts{'TimeoutInbound'}{"\u$reason"}{formathost($hostip,$host)}++;
@@ -1593,7 +1595,8 @@ while ( <> ) {
 
    ### smtpd_tls_loglevel >= 1
    # Server TLS messages
-   elsif ( ($status,$host,$hostip,$type) = ($p1 =~ /^(?:(Trusted|Untrusted) )?TLS connection established from ([^[]+)\[($re_IP)\]: (.*)$/o )) {
+   elsif ( ($status,$host,$hostip,$type) = ($p1 =~ /^(?:(Trusted|Untrusted|Anonymous) )?TLS connection established from ([^[]+)\[($re_IP)\]: (.*)$/o )) {
+      #DT Anonymous TLS connection established from fractal.kaosol.net[216.150.215.72]: TLSv1 with cipher EDH-RSA-DES-CBC3-SHA (168/168 bits)
       #TD TLS connection established from example.com[192.168.0.1]: TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits) 
       # Postfix 2.5+: status: Untrusted or Trusted
       #TD Untrusted TLS connection established from example.com[192.168.0.1]: TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits) 
@@ -1625,6 +1628,11 @@ while ( <> ) {
       $Totals{'TlsUnverified'}++;
       $Counts{'TlsUnverified'}{$cert}++; 
 
+   } elsif ( ($cert) = ($p1 =~ /: Untrusted: (subject_CN=.*)/)) {
+      #TD Untrusted: subject_CN=EXAMPLE-MAIL, issuer=EXAMPLE-MAIL,
+      $Totals{'TlsUnverified'}++;
+      $Counts{'TlsUnverified'}{$cert}++; 
+
    } elsif ( ($p1 =~ m/(lookup )?table ([^ ]+ )?has changed -- (restarting|exiting)$/)) {
       #TD table hash:/etc/postfix/helo_checks has changed -- restarting
       $Totals{'TableChanged'}++;


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/F-9/logwatch.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- logwatch.spec	10 Jun 2008 12:19:38 -0000	1.91
+++ logwatch.spec	15 Sep 2008 12:02:22 -0000	1.92
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -39,6 +39,7 @@
 Patch34: logwatch-7.3.6-dovecot_back.patch
 Patch35: logwatch-7.3.6-audit2.patch
 Patch36: logwatch-7.3.6-openvpn2.patch
+Patch37: logwatch-7.3.6-postfix2.patch
 
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
@@ -86,6 +87,7 @@
 %patch34 -p1
 %patch35 -p1
 %patch36 -p1
+%patch37 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -199,6 +201,10 @@
 %doc License project/CHANGES 
 
 %changelog
+* Mon Sep 15 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-23
+- fix postfix script problem 
+  (#462174)
+
 * Tue Jun 10 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-22
 - Resolves: #450494
   MailTo configuration parameter is ignored



From rdieter at fedoraproject.org  Mon Sep 15 12:12:05 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 15 Sep 2008 12:12:05 +0000 (UTC)
Subject: rpms/kmymoney2/devel kmymoney2.spec,1.35,1.36
Message-ID: <20080915121205.73F9470137@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6744

Modified Files:
	kmymoney2.spec 
Log Message:
fix %files



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kmymoney2.spec	15 Sep 2008 05:06:12 -0000	1.35
+++ kmymoney2.spec	15 Sep 2008 12:11:34 -0000	1.36
@@ -16,7 +16,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.9.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 Url:	 http://kmymoney2.sourceforge.net/
@@ -162,6 +162,7 @@
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
 %if "%{?_enable_ofxbanking:1}" == "1"
+%{_datadir}/apps/kmm_ofximport/
 %{_libdir}/kde3/kmm_ofximport.*
 %endif
 %if "%{?_enable_kbanking:1}" == "1"
@@ -187,7 +188,7 @@
 
 
 %changelog
-* Mon Sep 15 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9.2-2
+* Mon Sep 15 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9.2-3
 - respun tarball 
 
 * Sun Sep 14 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9.2-1



From jreznik at fedoraproject.org  Mon Sep 15 12:12:45 2008
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Mon, 15 Sep 2008 12:12:45 +0000 (UTC)
Subject: rpms/system-config-bind/F-8
	system-config-bind-4.0.2-listen-on.patch, 
	NONE, 1.1 system-config-bind.spec, 1.71, 1.72
Message-ID: <20080915121245.9BC0A70137@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/system-config-bind/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6787

Modified Files:
	system-config-bind.spec 
Added Files:
	system-config-bind-4.0.2-listen-on.patch 
Log Message:
* Mon Sep 15 2008 Jaroslav Reznik <jreznik at redhat.com> - 4.0.2-11
- Fixes error when adding listen-on (rhbz#449046)


system-config-bind-4.0.2-listen-on.patch:

--- NEW FILE system-config-bind-4.0.2-listen-on.patch ---
diff -up system-config-bind-4.0.2/NamedConfOptions.py.listen-on system-config-bind-4.0.2/NamedConfOptions.py
--- system-config-bind-4.0.2/NamedConfOptions.py.listen-on	2005-08-03 16:45:38.000000000 +0200
+++ system-config-bind-4.0.2/NamedConfOptions.py	2008-09-15 13:26:21.000000000 +0200
@@ -376,6 +376,7 @@ O = { 
             'type': int,
             'range': [0,65535],
             'syntax': True,
+	    'port': True,
             'default': 53
           }
         },
@@ -398,6 +399,7 @@ O = { 
             'type': int,
             'range': [0,65535],
             'syntax': True,
+	    'port': True,
             'default': 53
           }
         },
@@ -1006,6 +1008,7 @@ O = { 
       'attrs': [ { 'port':
                    {  'name': _('Port'),
                       'syntax': True,
+		      'port': True,
                       'type': int,
                       'range':[0,65535],
                       'default':53
diff -up system-config-bind-4.0.2/Options.py.listen-on system-config-bind-4.0.2/Options.py
--- system-config-bind-4.0.2/Options.py.listen-on	2005-05-05 05:40:26.000000000 +0200
+++ system-config-bind-4.0.2/Options.py	2008-09-15 13:25:28.000000000 +0200
@@ -101,6 +101,30 @@ class Options:
                                                     break
                                         name=aname
                                     debug( '    ATTR <',name,'> =',v)
+                                elif( attr.has_key('port') ):
+                                    # this hack is due to rhbz#449046 - parser serves everything
+                                    # before { token as one big key; so we have to correct it here
+                                    debug( '    ATTR PORT HACK',name)
+                                    aname = vals.pop(0)
+                                    if(type(aname)!=dict):
+                                        debug( '    ATTR SKIP',name)
+                                        value[name]=None
+                                        continue
+                                    for dictkey in aname.keys():
+                                        if (dictkey.find(name)==0):
+                                            debug('    ATTR PORT in', dictkey)
+                                            # parse name attr's value  
+                                            v=dictkey.split(' ')[1]   
+                                            value[name]=v
+                                            debug( '    ATTR <',name,'> =',v)                                          
+                                            # now repair vals with proper values
+                                            vals=[aname[dictkey]]
+                                            debug('    ATTR PORT HACK NEW VALS', vals)
+                                    if(len(vals)==0):
+                                        vals=[aname]
+                                        value[name]=None
+                                        debug('    ATTR PORT HACK NEW VALS', vals)   
+                                        continue				    
                                 elif( attr.has_key('syntax') ):
                                     debug( '    ATTR SKIP',name)
                                     value[name]=None
@@ -282,8 +306,15 @@ class Options:
                 if v.has_key(name):
                     if attr.has_key('syntax'):
                         s += name + ' '
-                    s+=str(v[name]) + ' '        
-        return s[:-1]+';'
+                    if( hasattr(v[name],'out')):
+                        s += v[name].out() + ' '
+                    else:
+                        s+=str(v[name]) + ' ' 
+        # ACL output is terminated by ';' - we don't need it
+        if (s[-2]==';'):
+            return s[:-1]
+        else:     
+            return s[:-1]+';'
 
     def update(s):
         debug( 'UPDATE OPTIONS', s.key)


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/F-8/system-config-bind.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- system-config-bind.spec	26 May 2008 15:17:11 -0000	1.71
+++ system-config-bind.spec	15 Sep 2008 12:12:15 -0000	1.72
@@ -1,7 +1,7 @@
 Summary: 	BIND DNS Configuration Tool
 Name: 		system-config-bind
 Version: 	4.0.2
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 URL:            http://fedorahosted.org/system-config-bind
 License: 	GPLv2+
 Group: 		Applications/System
@@ -15,6 +15,7 @@
 Patch6:		system-config-bind-4.0.2-DNSSECkey-record-column.patch
 Patch7:		system-config-bind-4.0.4-srv.patch
 Patch8:		system-config-bind-4.0.2-slaves-perm.patch
+Patch9:		system-config-bind-4.0.2-listen-on.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: 	noarch
 BuildRequires:  python, gettext, make, intltool
@@ -45,6 +46,7 @@
 %patch6 -p1
 %patch7 -p2 -b .srv
 %patch8 -p2 -b .slaves-perm
+%patch9 -p1 -b .listen-on
 
 %build
 make 
@@ -111,6 +113,9 @@
 fi
 
 %changelog
+* Mon Sep 15 2008 Jaroslav Reznik <jreznik at redhat.com> - 4.0.2-11
+- Fixes error when adding listen-on (rhbz#449046)
+
 * Mon May 26 2008 Radek Brich <rbrich at redhat.com> - 4.0.2-10
 - set proper permissions on zone files moved to slaves/
   (bz#444285, bz#444286)



From jorton at fedoraproject.org  Mon Sep 15 12:20:14 2008
From: jorton at fedoraproject.org (Joe Orton)
Date: Mon, 15 Sep 2008 12:20:14 +0000 (UTC)
Subject: rpms/mod_perl/devel mod_perl.spec,1.65,1.66
Message-ID: <20080915122015.0BEB170137@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7867

Modified Files:
	mod_perl.spec 
Log Message:
* Wed Aug  6 2008 Joe Orton <jorton at redhat.com> 2.0.4-5
- rebuild to fix patch fuzz (#427758)



Index: mod_perl.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_perl/devel/mod_perl.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- mod_perl.spec	6 Aug 2008 11:29:09 -0000	1.65
+++ mod_perl.spec	15 Sep 2008 12:19:43 -0000	1.66
@@ -2,7 +2,7 @@
 
 Name:           mod_perl
 Version:        2.0.4
-Release:        5
+Release:        6
 Summary:        An embedded Perl interpreter for the Apache HTTP Server
 
 Group:          System Environment/Daemons



From pkgdb at fedoraproject.org  Mon Sep 15 12:24:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:24:30 +0000
Subject: [pkgdb] squirrelmail ownership updated
Message-ID: <20080915122431.26939208D9B@bastion.fedora.phx.redhat.com>

Package squirrelmail in Fedora devel was orphaned by mbacovsk

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squirrelmail



From pkgdb at fedoraproject.org  Mon Sep 15 12:25:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:25:17 +0000
Subject: [pkgdb] squirrelmail ownership updated
Message-ID: <20080915122517.7AEB9208D9B@bastion.fedora.phx.redhat.com>

Package squirrelmail in Fedora 8 was orphaned by mbacovsk

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squirrelmail



From pkgdb at fedoraproject.org  Mon Sep 15 12:25:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:25:25 +0000
Subject: [pkgdb] squirrelmail ownership updated
Message-ID: <20080915122525.3B0BD208D9F@bastion.fedora.phx.redhat.com>

Package squirrelmail in Fedora devel is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squirrelmail



From pkgdb at fedoraproject.org  Mon Sep 15 12:25:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:25:58 +0000
Subject: [pkgdb] squirrelmail ownership updated
Message-ID: <20080915122558.E8542208D9B@bastion.fedora.phx.redhat.com>

Package squirrelmail in Fedora 8 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squirrelmail



From pkgdb at fedoraproject.org  Mon Sep 15 12:26:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:26:20 +0000
Subject: [pkgdb] squirrelmail ownership updated
Message-ID: <20080915122620.99483208D5F@bastion.fedora.phx.redhat.com>

Package squirrelmail in Fedora 7 was orphaned by mbacovsk

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squirrelmail



From pkgdb at fedoraproject.org  Mon Sep 15 12:26:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:26:29 +0000
Subject: [pkgdb] squirrelmail ownership updated
Message-ID: <20080915122629.89DB3208DA7@bastion.fedora.phx.redhat.com>

Package squirrelmail in Fedora 7 is now owned by mbacovsk

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squirrelmail



From pkgdb at fedoraproject.org  Mon Sep 15 12:26:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:26:35 +0000
Subject: [pkgdb] squirrelmail ownership updated
Message-ID: <20080915122636.15DC1208DAB@bastion.fedora.phx.redhat.com>

Package squirrelmail in Fedora 9 was orphaned by mbacovsk

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squirrelmail



From pkgdb at fedoraproject.org  Mon Sep 15 12:27:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:27:19 +0000
Subject: [pkgdb] squirrelmail ownership updated
Message-ID: <20080915122719.1D4D1208D5F@bastion.fedora.phx.redhat.com>

Package squirrelmail in Fedora 7 was orphaned by mbacovsk

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squirrelmail



From pkgdb at fedoraproject.org  Mon Sep 15 12:27:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 12:27:54 +0000
Subject: [pkgdb] squirrelmail ownership updated
Message-ID: <20080915122754.8C113208D5F@bastion.fedora.phx.redhat.com>

Package squirrelmail in Fedora 9 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squirrelmail



From pvrabec at fedoraproject.org  Mon Sep 15 12:40:05 2008
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Mon, 15 Sep 2008 12:40:05 +0000 (UTC)
Subject: rpms/rsyslog/devel rsyslog.init, 1.1, 1.2 rsyslog.log, 1.1,
	1.2 rsyslog.spec, 1.50, 1.51
Message-ID: <20080915124005.6547470137@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/rsyslog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10506

Modified Files:
	rsyslog.init rsyslog.log rsyslog.spec 
Log Message:
- use RPM_OPT_FLAGS
- use same pid file and logrotate file as syslog-ng (#441664)
- mark config files as noreplace (#428155)



Index: rsyslog.init
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rsyslog.init	11 Jul 2008 11:37:05 -0000	1.1
+++ rsyslog.init	15 Sep 2008 12:39:34 -0000	1.2
@@ -51,7 +51,7 @@
 }
 reload()  {
     RETVAL=1
-    syslog=`cat /var/run/rsyslogd.pid 2>/dev/null`
+    syslog=`cat /var/run/syslogd.pid 2>/dev/null`
     echo -n "Reloading system logger..."
     if [ -n "${syslog}" ] && [ -e /proc/"${syslog}" ]; then
 	kill -HUP "$syslog";


Index: rsyslog.log
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rsyslog.log	11 Jul 2008 11:37:05 -0000	1.1
+++ rsyslog.log	15 Sep 2008 12:39:34 -0000	1.2
@@ -1,6 +1,6 @@
 /var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {
     sharedscripts
     postrotate
-        /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
+	/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
     endscript
 }


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- rsyslog.spec	1 Sep 2008 14:16:02 -0000	1.50
+++ rsyslog.spec	15 Sep 2008 12:39:34 -0000	1.51
@@ -3,7 +3,7 @@
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
 Version: 3.21.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -93,6 +93,7 @@
 %patch1 -p1 -b .manual
 
 %build
+export CFLAGS="$RPM_OPT_FLAGS -DSYSLOGD_PIDNAME=\\\"syslogd.pid\\\""
 %configure	--sbindir=%{sbindir} \
 		--disable-static \
 		--enable-mysql \
@@ -162,8 +163,8 @@
 %{_libdir}/rsyslog/lmtcpsrv.so
 %{_libdir}/rsyslog/lmnetstrms.so
 %{_libdir}/rsyslog/lmnsd_ptcp.so
-%config %{_sysconfdir}/rsyslog.conf
-%config %{_sysconfdir}/sysconfig/rsyslog
+%config(noreplace) %{_sysconfdir}/rsyslog.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/rsyslog
 %config(noreplace) %{_sysconfdir}/logrotate.d/syslog
 %{_initrddir}/rsyslog
 %{sbindir}/rsyslogd
@@ -195,6 +196,11 @@
 %{_libdir}/rsyslog/lmnsd_gtls.so
 
 %changelog
+* Mon Sep 15 2008 Peter Vrabec <pvrabec at redhat.com> 3.21.3-4
+- use RPM_OPT_FLAGS
+- use same pid file and logrotate file as syslog-ng (#441664)
+- mark config files as noreplace (#428155)
+
 * Mon Sep 01 2008 Tomas Heinrich <theinric at redhat.com> 3.21.3-3
 - fix a wrong module name in the rsyslog.conf manual page (#455086)
 - expand the rsyslog.conf manual page (#456030)



From spot at fedoraproject.org  Mon Sep 15 12:45:19 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 15 Sep 2008 12:45:19 +0000 (UTC)
Subject: rpms/perl-IO-Multiplex/devel .cvsignore, 1.3,
	1.4 perl-IO-Multiplex.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20080915124519.65A2470137@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-IO-Multiplex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11071

Modified Files:
	.cvsignore perl-IO-Multiplex.spec sources 
Log Message:
update to 1.10, fix licensing


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Multiplex/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Mar 2008 15:07:21 -0000	1.3
+++ .cvsignore	15 Sep 2008 12:44:48 -0000	1.4
@@ -1 +1 @@
-IO-Multiplex-1.09.tar.gz
+IO-Multiplex-1.10.tar.gz


Index: perl-IO-Multiplex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Multiplex/devel/perl-IO-Multiplex.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-IO-Multiplex.spec	6 Mar 2008 15:07:21 -0000	1.4
+++ perl-IO-Multiplex.spec	15 Sep 2008 12:44:48 -0000	1.5
@@ -1,8 +1,8 @@
 Summary: IO-Multiplex module for perl
 Name: perl-IO-Multiplex
-Version: 1.09
+Version: 1.10
 Release: 1%{?dist}
-License: Artistic
+License: GPL+ or Artistic
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/IO-Multiplex/
 
@@ -46,6 +46,9 @@
 %{perl_vendorlib}/IO/
 
 %changelog
+* Mon Sep 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.10-1
+- update to 1.10, upstream found and relicensing has happened!
+
 * Thu Mar  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.09-1
 - rebuild for new perl
 - 1.09


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Multiplex/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Mar 2008 15:07:21 -0000	1.3
+++ sources	15 Sep 2008 12:44:48 -0000	1.4
@@ -1 +1 @@
-cf459a39f2964d5ec6c32622759c9e90  IO-Multiplex-1.09.tar.gz
+ce230ee0a4afbff59da66f0c42e0340b  IO-Multiplex-1.10.tar.gz



From acme at fedoraproject.org  Mon Sep 15 12:52:52 2008
From: acme at fedoraproject.org (Arnaldo Carvalho de Melo)
Date: Mon, 15 Sep 2008 12:52:52 +0000 (UTC)
Subject: rpms/python-ethtool/devel import.log, NONE, 1.1 python-ethtool.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080915125252.71ACA70137@cvs1.fedora.phx.redhat.com>

Author: acme

Update of /cvs/pkgs/rpms/python-ethtool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11622/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-ethtool.spec 
Log Message:
Adopt python-ethtool, python bindings for the ethtool kernel interface, to be
used in tools such as tuna, that will be submitted for review soon. Comes with
pethtool, a ethtool clone used as a demonstration.

Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>



--- NEW FILE import.log ---
python-ethtool-0_3-2_fc10:HEAD:python-ethtool-0.3-2.fc10.src.rpm:1221482472


--- NEW FILE python-ethtool.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?python_ver: %define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")}

Summary: Ethernet settings python bindings
Name: python-ethtool
Version: 0.3
Release: 2%{?dist}
URL: http://git.kernel.org/?p=linux/kernel/git/acme/python-ethtool.git
Source: http://userweb.kernel.org/~acme/python-ethtool/%{name}-%{version}.tar.bz2
License: GPLv2
Group: System Environment/Libraries
BuildRequires: python-devel
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Python bindings for the ethtool kernel interface, that allows querying and
changing of ethernet card settings, such as speed, port, autonegotiation, and
PCI locations.

%prep
%setup -q

%build
%{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}
mkdir -p %{buildroot}%{_sbindir}
cp -p pethtool.py %{buildroot}%{_sbindir}/pethtool
cp -p pifconfig.py %{buildroot}%{_sbindir}/pifconfig

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc COPYING
%{_sbindir}/pethtool
%{_sbindir}/pifconfig
%{python_sitearch}/ethtool.so
%if "%{python_ver}" >= "2.5"
%{python_sitearch}/*.egg-info
%endif

%changelog
* Fri Sep  5 2008 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.3-2
- Rewrote build and install sections as part of the fedora review process
  BZ #459549

* Tue Aug 26 2008 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.3-1
- Add get_flags method from the first python-ethtool contributor, yay
- Add pifconfig command, that mimics the ifconfig tool using the
  bindings available

* Wed Aug 20 2008 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.2-1
- Expand description and summary fields, as part of the fedora
  review process.

* Tue Jun 10 2008 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.1-3
- add dist to the release tag

* Tue Dec 18 2007 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.1-2
- First build into MRG repo

* Tue Dec 18 2007 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.1-1
- Get ethtool code from rhpl 0.212


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-ethtool/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2008 22:31:15 -0000	1.1
+++ .cvsignore	15 Sep 2008 12:52:21 -0000	1.2
@@ -0,0 +1 @@
+python-ethtool-0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-ethtool/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2008 22:31:15 -0000	1.1
+++ sources	15 Sep 2008 12:52:22 -0000	1.2
@@ -0,0 +1 @@
+a299829e6d05edeb21b2a3e5580eb8c2  python-ethtool-0.3.tar.bz2



From pvrabec at fedoraproject.org  Mon Sep 15 13:02:41 2008
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Mon, 15 Sep 2008 13:02:41 +0000 (UTC)
Subject: rpms/syslog-ng/devel syslog-ng.spec,1.36,1.37
Message-ID: <20080915130241.6565770137@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/syslog-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12845

Modified Files:
	syslog-ng.spec 
Log Message:
- do not conflicts with rsyslog, both rsyslog and syslog-ng use
  same pidfile and logrotate file (#441664)



Index: syslog-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/devel/syslog-ng.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- syslog-ng.spec	6 Sep 2008 19:17:43 -0000	1.36
+++ syslog-ng.spec	15 Sep 2008 13:02:10 -0000	1.37
@@ -41,7 +41,6 @@
 # Keep initscripts and vixie-cron happy
 #
 Provides:         syslog
-Conflicts:        rsyslog
 
 %description
 syslog-ng, as the name shows, is a syslogd replacement, but with new
@@ -176,6 +175,10 @@
 
 
 %changelog
+* Mon Sep 15 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.8-3
+- do not conflicts with rsyslog, both rsyslog and syslog-ng use 
+  same pidfile and logrotate file (#441664)
+
 * Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-2
 - fix license tag
 



From pvrabec at fedoraproject.org  Mon Sep 15 13:07:50 2008
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Mon, 15 Sep 2008 13:07:50 +0000 (UTC)
Subject: rpms/syslog-ng/devel syslog-ng.spec,1.37,1.38
Message-ID: <20080915130750.935CE70137@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/syslog-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13427

Modified Files:
	syslog-ng.spec 
Log Message:
increase release number



Index: syslog-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/devel/syslog-ng.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- syslog-ng.spec	15 Sep 2008 13:02:10 -0000	1.37
+++ syslog-ng.spec	15 Sep 2008 13:07:20 -0000	1.38
@@ -10,7 +10,7 @@
 
 Name:             syslog-ng
 Version:          2.0.8
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Syslog replacement daemon
 
 Group:            System Environment/Daemons



From jcollie at fedoraproject.org  Mon Sep 15 13:18:21 2008
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Mon, 15 Sep 2008 13:18:21 +0000 (UTC)
Subject: rpms/schroedinger/devel schroedinger.spec,1.9,1.10
Message-ID: <20080915131821.885F770137@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/schroedinger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14152

Modified Files:
	schroedinger.spec 
Log Message:
* Fri Sep 12 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.0.5-3
- Bump release and rebuild against latest gstreamer-* packages to pick
- up special gstreamer codec provides.



Index: schroedinger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/devel/schroedinger.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- schroedinger.spec	4 Sep 2008 15:37:39 -0000	1.9
+++ schroedinger.spec	15 Sep 2008 13:17:51 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           schroedinger
 Version:        1.0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Portable libraries for the high quality Dirac video codec
 
 Group:          System Environment/Libraries
@@ -80,6 +80,10 @@
 %{_libdir}/gstreamer-0.10/libgstschro.so
 
 %changelog
+* Fri Sep 12 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.0.5-3
+- Bump release and rebuild against latest gstreamer-* packages to pick
+- up special gstreamer codec provides.
+
 * Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.5-2
 - fix license tag
 



From pmachata at fedoraproject.org  Mon Sep 15 13:18:27 2008
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 15 Sep 2008 13:18:27 +0000 (UTC)
Subject: rpms/bison/devel bison.spec,1.33,1.34
Message-ID: <20080915131827.5AC2A70137@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/bison/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14108

Modified Files:
	bison.spec 
Log Message:
Cleanup per merge review



Index: bison.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bison/devel/bison.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- bison.spec	19 Feb 2008 19:53:29 -0000	1.33
+++ bison.spec	15 Sep 2008 13:17:57 -0000	1.34
@@ -1,7 +1,7 @@
-Summary: A GNU general-purpose parser generator.
+Summary: A GNU general-purpose parser generator
 Name: bison
 Version: 2.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2
@@ -81,6 +81,8 @@
   /sbin/install-info --delete %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison).                        The GNU parser generator." || :
 fi
 
+# The distribution contains also source files.  These are used by m4
+# when the target parser file is generated.
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog NEWS OChangeLog README THANKS TODO
@@ -100,6 +102,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Sep 15 2008 Petr Machata <pmachata at redhat.com> - 2.3-6
+- Merge review:
+  - Drop terminating dot from Summary
+  - Escape macros inadvertently left in changelog
+  - Explain why are there source files in the main package
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.3-5
 - Autorebuild for GCC 4.3
 
@@ -148,7 +156,7 @@
 - update upstream URLs, add doc files (#144346)
 
 * Thu Jan  6 2005 Roland McGrath <roland at redhat.com> - 2.0-3
-- missing %defattr for subpackage
+- missing %%defattr for subpackage
 
 * Thu Jan  6 2005 Roland McGrath <roland at redhat.com> - 2.0-2
 - split liby.a into bison-devel package



From pkgdb at fedoraproject.org  Mon Sep 15 13:23:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 13:23:12 +0000
Subject: [pkgdb] mx: pfj has requested commit
Message-ID: <20080915132312.36E94208DA0@bastion.fedora.phx.redhat.com>

pfj has requested the commit acl on mx (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mx



From caolanm at fedoraproject.org  Mon Sep 15 13:23:12 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 15 Sep 2008 13:23:12 +0000 (UTC)
Subject: rpms/hunspell-ca/devel .cvsignore, 1.5, 1.6 hunspell-ca.spec, 1.6, 
	1.7 sources, 1.5, 1.6
Message-ID: <20080915132312.4097270137@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14655

Modified Files:
	.cvsignore hunspell-ca.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Jul 2008 11:18:51 -0000	1.5
+++ .cvsignore	15 Sep 2008 13:22:41 -0000	1.6
@@ -1 +1 @@
-hunspell-ca-20080706.tar.bz2
+hunspell-ca-20080915.tar.bz2


Index: hunspell-ca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/hunspell-ca.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hunspell-ca.spec	8 Jul 2008 14:13:22 -0000	1.6
+++ hunspell-ca.spec	15 Sep 2008 13:22:41 -0000	1.7
@@ -1,8 +1,8 @@
 Name: hunspell-ca
 Summary: Catalan hunspell dictionaries
-%define upstreamid 20080706
+%define upstreamid 20080915
 Version: 0.%{upstreamid}
-Release: 2%{?dist}
+Release: 1%{?dist}
 #svn checkout svn://softcatala.org/corrector/trunk/resultats/hunspell
 Source: hunspell-ca-%{upstreamid}.tar.bz2
 Group: Applications/Text
@@ -43,6 +43,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Mon Sep 15 2008 Caolan McNamara <caolanm at redhat.com> - 0.20080915-1
+- latest version
+
 * Tue Jul 08 2008 Caolan McNamara <caolanm at redhat.com> - 0.20080706-2
 - Catalan is spoken in Andora, France and Italy as well
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Jul 2008 11:18:51 -0000	1.5
+++ sources	15 Sep 2008 13:22:41 -0000	1.6
@@ -1 +1 @@
-49e5c7f6ad8abc5e453ab3f8c57f8cf8  hunspell-ca-20080706.tar.bz2
+b25d9bbfdcd2a03a53bb5dd6e454e44d  hunspell-ca-20080915.tar.bz2



From pkgdb at fedoraproject.org  Mon Sep 15 13:23:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 13:23:17 +0000
Subject: [pkgdb] mx: pfj has requested approveacls
Message-ID: <20080915132317.52EC9208DA5@bastion.fedora.phx.redhat.com>

pfj has requested the approveacls acl on mx (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mx



From pkgdb at fedoraproject.org  Mon Sep 15 13:23:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 13:23:29 +0000
Subject: [pkgdb] mx: pfj has requested commit
Message-ID: <20080915132329.CCDDA208DA6@bastion.fedora.phx.redhat.com>

pfj has requested the commit acl on mx (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mx



From pkgdb at fedoraproject.org  Mon Sep 15 13:23:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 13:23:31 +0000
Subject: [pkgdb] mx: pfj has requested approveacls
Message-ID: <20080915132331.23578208DA8@bastion.fedora.phx.redhat.com>

pfj has requested the approveacls acl on mx (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mx



From pkgdb at fedoraproject.org  Mon Sep 15 13:23:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 13:23:55 +0000
Subject: [pkgdb] mx: pfj has requested commit
Message-ID: <20080915132355.5E203208DA3@bastion.fedora.phx.redhat.com>

pfj has requested the commit acl on mx (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mx



From pkgdb at fedoraproject.org  Mon Sep 15 13:24:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 13:24:02 +0000
Subject: [pkgdb] mx: pfj has requested approveacls
Message-ID: <20080915132403.05239208DA5@bastion.fedora.phx.redhat.com>

pfj has requested the approveacls acl on mx (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mx



From belegdol at fedoraproject.org  Mon Sep 15 13:38:06 2008
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Mon, 15 Sep 2008 13:38:06 +0000 (UTC)
Subject: rpms/gnome-chemistry-utils/devel gnome-chemistry-utils.spec, 1.24, 
	1.25
Message-ID: <20080915133806.C092A70137@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15890

Modified Files:
	gnome-chemistry-utils.spec 
Log Message:
* Mon Sep 15 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.91-2
- Added bodr to Requires
- Added chrpath to BuildRequires
- Switched to chrpath as a method to eliminate rpaths



Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/gnome-chemistry-utils.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnome-chemistry-utils.spec	14 Sep 2008 08:32:17 -0000	1.24
+++ gnome-chemistry-utils.spec	15 Sep 2008 13:37:36 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           gnome-chemistry-utils
 Version:        0.9.91
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A set of chemical utilities
 
 Group:          Applications/Engineering
@@ -11,6 +11,7 @@
 
 BuildRequires:  bodr
 BuildRequires:  chemical-mime-data
+BuildRequires:  chrpath
 BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen
 BuildRequires:  gettext
@@ -26,6 +27,7 @@
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  scrollkeeper
 
+Requires:       bodr
 Requires:       chemical-mime-data
 
 Requires(pre):  GConf2
@@ -76,8 +78,6 @@
            --disable-schemas-install \
            --disable-scrollkeeper \
            --with-mozilla-libdir=%{_libdir}/mozilla
-#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}
 
 
@@ -95,6 +95,17 @@
 #kill intrusive docs
 rm -rf $RPM_BUILD_ROOT%{_docdir}/gchemutils
 
+#kill rpaths
+chrpath --delete  $RPM_BUILD_ROOT%{_bindir}/gchem3d-0.10
+chrpath --delete  $RPM_BUILD_ROOT%{_bindir}/gchempaint-0.10
+chrpath --delete  $RPM_BUILD_ROOT%{_bindir}/gchemcalc-0.10
+chrpath --delete  $RPM_BUILD_ROOT%{_bindir}/gcrystal-0.10
+chrpath --delete  $RPM_BUILD_ROOT%{_bindir}/gspectrum-0.10
+chrpath --delete  $RPM_BUILD_ROOT%{_bindir}/gchemtable-0.10
+chrpath --delete  $RPM_BUILD_ROOT%{_libdir}/goffice/0.6.5/plugins/gchemutils/gchemutils.so
+chrpath --delete  $RPM_BUILD_ROOT%{_libdir}/libgchempaint-0.10.so.%{version}
+chrpath --delete  $RPM_BUILD_ROOT%{_libexecdir}/chem-viewer
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -206,6 +217,11 @@
 
 
 %changelog
+* Mon Sep 15 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.91-2
+- Added bodr to Requires
+- Added chrpath to BuildRequires
+- Switched to chrpath as a method to eliminate rpaths
+
 * Sun Sep 14 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.91-1
 - Updated to 0.9.91
 - Dropped the ppc build patch (merged upstream)



From kwizart at fedoraproject.org  Mon Sep 15 13:55:13 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon, 15 Sep 2008 13:55:13 +0000 (UTC)
Subject: rpms/perl-HTML-FromText/F-9 perl-HTML-FromText.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20080915135513.6C62C70137@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-HTML-FromText/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18664

Modified Files:
	sources 
Added Files:
	perl-HTML-FromText.spec 
Log Message:
Import for F-9



--- NEW FILE perl-HTML-FromText.spec ---
Name:           perl-HTML-FromText
Version:        2.05
Release:        2%{?dist}
Summary:        Convert plain text to HTML

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/HTML-FromText/
Source0:        http://search.cpan.org/CPAN/authors/id/C/CW/CWEST/HTML-FromText-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Email::Find::addrspec) >= 0.09
BuildRequires:  perl(Exporter::Lite) >= 0.01
BuildRequires:  perl(Scalar::Util) >= 1.12
BuildRequires:  perl(HTML::Entities) >= 1.26
BuildRequires:  perl(Text::Tabs) >= 98.1128
BuildRequires:  perl(Test::More) >= 0.47

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
"HTML::FromText" converts plain text to HTML. There are a handfull of
options that shape the conversion. There is a utility function,
"text2html", that's exported by default. This function is simply a
short- cut to the Object Oriented interface described in detail below.


%prep
%setup -q -n HTML-FromText-%{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
#Theses test are known to fail
rm t/01_features.t
rm t/02_v2.01.t
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{_bindir}/text2html
%{perl_vendorlib}/HTML/
%{_mandir}/man3/*.3*
%{_mandir}/man1/text2html.1.gz


%changelog
* Tue Sep  2 2008 kwizart < kwizart at gmail.com > - 2.05-2
- Add fixperms

* Thu Jul 31 2008 kwizart < kwizart at gmail.com > - 2.05-1
- Initial package for Fedora



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-FromText/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:51:56 -0000	1.1
+++ sources	15 Sep 2008 13:54:41 -0000	1.2
@@ -0,0 +1 @@
+fb8ae4ab0cae0b57101f78b046b3927b  HTML-FromText-2.05.tar.gz



From kwizart at fedoraproject.org  Mon Sep 15 13:58:17 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon, 15 Sep 2008 13:58:17 +0000 (UTC)
Subject: rpms/perl-HTML-FromText/F-8 perl-HTML-FromText.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20080915135817.2FF2C70137@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-HTML-FromText/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19161

Modified Files:
	sources 
Added Files:
	perl-HTML-FromText.spec 
Log Message:
Initial import for F-8



--- NEW FILE perl-HTML-FromText.spec ---
Name:           perl-HTML-FromText
Version:        2.05
Release:        2%{?dist}
Summary:        Convert plain text to HTML

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/HTML-FromText/
Source0:        http://search.cpan.org/CPAN/authors/id/C/CW/CWEST/HTML-FromText-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Email::Find::addrspec) >= 0.09
BuildRequires:  perl(Exporter::Lite) >= 0.01
BuildRequires:  perl(Scalar::Util) >= 1.12
BuildRequires:  perl(HTML::Entities) >= 1.26
BuildRequires:  perl(Text::Tabs) >= 98.1128
BuildRequires:  perl(Test::More) >= 0.47

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
"HTML::FromText" converts plain text to HTML. There are a handfull of
options that shape the conversion. There is a utility function,
"text2html", that's exported by default. This function is simply a
short- cut to the Object Oriented interface described in detail below.


%prep
%setup -q -n HTML-FromText-%{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
#Theses test are known to fail
rm t/01_features.t
rm t/02_v2.01.t
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{_bindir}/text2html
%{perl_vendorlib}/HTML/
%{_mandir}/man3/*.3*
%{_mandir}/man1/text2html.1.gz


%changelog
* Tue Sep  2 2008 kwizart < kwizart at gmail.com > - 2.05-2
- Add fixperms

* Thu Jul 31 2008 kwizart < kwizart at gmail.com > - 2.05-1
- Initial package for Fedora



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-FromText/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2008 16:51:56 -0000	1.1
+++ sources	15 Sep 2008 13:57:46 -0000	1.2
@@ -0,0 +1 @@
+fb8ae4ab0cae0b57101f78b046b3927b  HTML-FromText-2.05.tar.gz



From nhorman at fedoraproject.org  Mon Sep 15 13:59:08 2008
From: nhorman at fedoraproject.org (Neil Horman)
Date: Mon, 15 Sep 2008 13:59:08 +0000 (UTC)
Subject: rpms/kexec-tools/devel kdump.sysconfig.i386, 1.2,
	1.3 kdump.sysconfig.x86_64, 1.2, 1.3 kexec-tools.spec, 1.122, 1.123
Message-ID: <20080915135908.A91EA70137@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19447

Modified Files:
	kdump.sysconfig.i386 kdump.sysconfig.x86_64 kexec-tools.spec 
Log Message:
Resolves bz 461615


Index: kdump.sysconfig.i386
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kdump.sysconfig.i386,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdump.sysconfig.i386	5 Jun 2008 15:18:53 -0000	1.2
+++ kdump.sysconfig.i386	15 Sep 2008 13:58:38 -0000	1.3
@@ -20,7 +20,7 @@
 #
 # Example:
 #   KEXEC_ARGS="--elf32-core-headers"
-KEXEC_ARGS=" --args-linux"
+KEXEC_ARGS=""
 
 #Where to find the boot image
 KDUMP_BOOTDIR="/boot"


Index: kdump.sysconfig.x86_64
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kdump.sysconfig.x86_64,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdump.sysconfig.x86_64	5 Jun 2008 15:18:53 -0000	1.2
+++ kdump.sysconfig.x86_64	15 Sep 2008 13:58:38 -0000	1.3
@@ -20,7 +20,7 @@
 #
 # Example:
 #   KEXEC_ARGS="--elf32-core-headers"
-KEXEC_ARGS=" --args-linux"
+KEXEC_ARGS=""
 
 #Where to find the boot image
 KDUMP_BOOTDIR="/boot"


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- kexec-tools.spec	27 Aug 2008 11:58:35 -0000	1.122
+++ kexec-tools.spec	15 Sep 2008 13:58:38 -0000	1.123
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -239,6 +239,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Neil Horman <nhorman at redhat.com> - 2.0.0-2
+- Fix sysconfig files to not specify --args-linux on x86 (bz 461615)
+
 * Wed Aug 27 2008 Neil Horman <nhorman at redhat.com> - 2.0.0-1
 - Update kexec-tools to latest upstream version
 



From airlied at fedoraproject.org  Mon Sep 15 14:02:44 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 15 Sep 2008 14:02:44 +0000 (UTC)
Subject: rpms/kernel/devel drm-intel-fix-irqs.patch, NONE, 1.1 kernel.spec, 
	1.949, 1.950
Message-ID: <20080915140244.D563B70137@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19871

Modified Files:
	kernel.spec 
Added Files:
	drm-intel-fix-irqs.patch 
Log Message:
* Tue Sep 16 2008 Dave Airlie <airlied at redhat.com>
- fix from Intel for irqs hopefully


drm-intel-fix-irqs.patch:

--- NEW FILE drm-intel-fix-irqs.patch ---
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index a0be952..c63c162 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -259,12 +259,9 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 	struct drm_device *dev = (struct drm_device *) arg;
 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 	struct drm_i915_master_private *master_priv;
-	u32 pipea_stats, pipeb_stats;
+	u32 pipea_stats = 0, pipeb_stats = 0;
 	u32 iir;
 
-	pipea_stats = I915_READ(PIPEASTAT);
-	pipeb_stats = I915_READ(PIPEBSTAT);
-
 	if (dev->pdev->msi_enabled)
 		I915_WRITE(IMR, ~0);
 	iir = I915_READ(IIR);
@@ -278,8 +275,14 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 		return IRQ_NONE;
 	}
 
-	I915_WRITE(PIPEASTAT, pipea_stats);
-	I915_WRITE(PIPEBSTAT, pipeb_stats);
+	if (iir & I915_DISPLAY_PIPE_A_EVENT_INTERRUPT) {
+		pipea_stats = I915_READ(PIPEASTAT);
+		I915_WRITE(PIPEASTAT, pipea_stats);
+	}
+	if (iir & I915_DISPLAY_PIPE_B_EVENT_INTERRUPT) {
+		pipeb_stats = I915_READ(PIPEBSTAT);
+		I915_WRITE(PIPEBSTAT, pipeb_stats);
+	}
 
 	I915_WRITE(IIR, iir);
 	if (dev->pdev->msi_enabled)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.949
retrieving revision 1.950
diff -u -r1.949 -r1.950
--- kernel.spec	13 Sep 2008 04:14:26 -0000	1.949
+++ kernel.spec	15 Sep 2008 14:02:14 -0000	1.950
@@ -609,6 +609,7 @@
 Patch1811: drm-modesetting-radeon.patch
 Patch1812: drm-modesetting-i915.patch
 Patch1813: drm-nouveau.patch
+Patch1814: drm-intel-fix-irqs.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1167,6 +1168,7 @@
 ApplyPatch drm-modesetting-radeon.patch
 ApplyPatch drm-modesetting-i915.patch
 ApplyPatch drm-nouveau.patch
+ApplyPatch drm-intel-fix-irqs.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1758,6 +1760,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Sep 16 2008 Dave Airlie <airlied at redhat.com>
+- fix from Intel for irqs hopefully
+
 * Sat Sep 13 2008 Chuck Ebbert <cebbert at redhat.com>
 - Fix hang in installer on PS3. (#458910)
 



From limb at fedoraproject.org  Mon Sep 15 14:06:04 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 15 Sep 2008 14:06:04 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.105,1.106 comps-f9.xml.in,1.387,1.388
Message-ID: <20080915140604.267AC70137@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20226

Modified Files:
	comps-f10.xml.in comps-f9.xml.in 
Log Message:
Add apricots to comps.



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- comps-f10.xml.in	12 Sep 2008 16:57:57 -0000	1.105
+++ comps-f10.xml.in	15 Sep 2008 14:05:33 -0000	1.106
@@ -1554,6 +1554,7 @@
       <packagereq type="optional">amoebax</packagereq>
       <packagereq type="optional">angrydd</packagereq>
       <packagereq type="optional">ants</packagereq>
+      <packagereq type="optional">apricots</packagereq>
       <packagereq type="optional">armacycles-ad</packagereq>
       <packagereq type="optional">arrows</packagereq>
       <packagereq type="optional">asc</packagereq>


Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- comps-f9.xml.in	10 Sep 2008 09:53:50 -0000	1.387
+++ comps-f9.xml.in	15 Sep 2008 14:05:33 -0000	1.388
@@ -1507,6 +1507,7 @@
       <packagereq type="optional">amoebax</packagereq>
       <packagereq type="optional">angrydd</packagereq>
       <packagereq type="optional">ants</packagereq>
+      <packagereq type="optional">apricots</packagereq>
       <packagereq type="optional">armacycles-ad</packagereq>
       <packagereq type="optional">arrows</packagereq>
       <packagereq type="optional">asc</packagereq>



From jwilson at fedoraproject.org  Mon Sep 15 14:25:27 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 15 Sep 2008 14:25:27 +0000 (UTC)
Subject: rpms/rrdtool/devel .cvsignore, 1.29, 1.30 rrdtool.spec, 1.69,
	1.70 sources, 1.32, 1.33
Message-ID: <20080915142528.1650470137@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/rrdtool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21408

Modified Files:
	.cvsignore rrdtool.spec sources 
Log Message:
* Mon Sep 15 2008 Jarod Wilson <jarod at redhat.com> 1.3.3-1
- Update to rrdtool 1.3.3
  * fixes segfault on graph creation regression in 1.3.2 (#462301)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	7 Sep 2008 01:50:54 -0000	1.29
+++ .cvsignore	15 Sep 2008 14:24:56 -0000	1.30
@@ -1,4 +1,2 @@
 php4-r1190.tar.gz
-rrdtool-1.3.0.tar.gz
-rrdtool-1.3.1.tar.gz
-rrdtool-1.3.2.tar.gz
+rrdtool-1.3.3.tar.gz


Index: rrdtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/rrdtool.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- rrdtool.spec	7 Sep 2008 01:50:54 -0000	1.69
+++ rrdtool.spec	15 Sep 2008 14:24:56 -0000	1.70
@@ -8,7 +8,7 @@
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.3.2
+Version: 1.3.3
 Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Databases
@@ -327,6 +327,10 @@
 %endif
 
 %changelog
+* Mon Sep 15 2008 Jarod Wilson <jarod at redhat.com> 1.3.3-1
+- Update to rrdtool 1.3.3
+  * fixes segfault on graph creation regression in 1.3.2 (#462301)
+
 * Sat Sep 06 2008 Jarod Wilson <jwilson at redhat.com> 1.3.2-1
 - Update to rrdtool 1.3.2
   * fixes a data corruption bug when rrd wraps around


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	7 Sep 2008 01:50:54 -0000	1.32
+++ sources	15 Sep 2008 14:24:56 -0000	1.33
@@ -1,2 +1,2 @@
 28074a9c368af013462631959ab90558  php4-r1190.tar.gz
-c3ace16b360547fe2de1bef8390a6fcc  rrdtool-1.3.2.tar.gz
+42e7a5b7d5eeaa63959b75822f9f1e2c  rrdtool-1.3.3.tar.gz



From jwilson at fedoraproject.org  Mon Sep 15 14:35:14 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 15 Sep 2008 14:35:14 +0000 (UTC)
Subject: rpms/rrdtool/F-9 .cvsignore, 1.25, 1.26 rrdtool.spec, 1.65,
	1.66 sources, 1.28, 1.29
Message-ID: <20080915143515.23D9E70137@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/rrdtool/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22742

Modified Files:
	.cvsignore rrdtool.spec sources 
Log Message:
* Mon Sep 15 2008 Jarod Wilson <jarod at redhat.com> 1.3.3-1
- Update to rrdtool 1.3.3
  * fixes segfault on graph creation regression in 1.3.2 (#462301)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-9/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	7 Sep 2008 02:37:13 -0000	1.25
+++ .cvsignore	15 Sep 2008 14:34:44 -0000	1.26
@@ -1,4 +1,2 @@
 php4-r1190.tar.gz
-rrdtool-1.3.0.tar.gz
-rrdtool-1.3.1.tar.gz
-rrdtool-1.3.2.tar.gz
+rrdtool-1.3.3.tar.gz


Index: rrdtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-9/rrdtool.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- rrdtool.spec	7 Sep 2008 02:37:13 -0000	1.65
+++ rrdtool.spec	15 Sep 2008 14:34:44 -0000	1.66
@@ -8,7 +8,7 @@
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.3.2
+Version: 1.3.3
 Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Databases
@@ -327,6 +327,10 @@
 %endif
 
 %changelog
+* Mon Sep 15 2008 Jarod Wilson <jarod at redhat.com> 1.3.3-1
+- Update to rrdtool 1.3.3
+  * fixes segfault on graph creation regression in 1.3.2 (#462301)
+
 * Sat Sep 06 2008 Jarod Wilson <jwilson at redhat.com> 1.3.2-1
 - Update to rrdtool 1.3.2
   * fixes a data corruption bug when rrd wraps around


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-9/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	7 Sep 2008 02:37:13 -0000	1.28
+++ sources	15 Sep 2008 14:34:44 -0000	1.29
@@ -1,2 +1,2 @@
 28074a9c368af013462631959ab90558  php4-r1190.tar.gz
-c3ace16b360547fe2de1bef8390a6fcc  rrdtool-1.3.2.tar.gz
+42e7a5b7d5eeaa63959b75822f9f1e2c  rrdtool-1.3.3.tar.gz



From dnovotny at fedoraproject.org  Mon Sep 15 14:37:59 2008
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Mon, 15 Sep 2008 14:37:59 +0000 (UTC)
Subject: rpms/file/devel .cvsignore, 1.22, 1.23 file.spec, 1.78, 1.79 sources,
	1.22, 1.23
Message-ID: <20080915143759.B006470137@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/file/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22990

Modified Files:
	.cvsignore file.spec sources 
Log Message:


new upstream version: fixes #462064



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/file/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	21 Jul 2008 10:02:20 -0000	1.22
+++ .cvsignore	15 Sep 2008 14:37:29 -0000	1.23
@@ -1 +1 @@
-file-4.25.tar.gz
+file-4.26.tar.gz


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/devel/file.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- file.spec	21 Jul 2008 10:02:20 -0000	1.78
+++ file.spec	15 Sep 2008 14:37:29 -0000	1.79
@@ -4,7 +4,7 @@
 
 Summary: A utility for determining file types
 Name: file
-Version: 4.25
+Version: 4.26
 Release: 1%{?dist}
 License: BSD
 Group: Applications/File
@@ -130,6 +130,9 @@
 %endif
 
 %changelog
+* Mon Sep 15 2008 Daniel Novotny <dnovotny at redhat.com> 4.26-1
+- new upstream version: fixes #462064
+
 * Mon Jul 21 2008 Tomas Smetana <tsmetana at redhat.com> - 4.25-1
 - new upstream version; drop upstreamed patches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/file/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	21 Jul 2008 10:02:20 -0000	1.22
+++ sources	15 Sep 2008 14:37:29 -0000	1.23
@@ -1 +1 @@
-cdf1f90d2704e71118353c16c19898ba  file-4.25.tar.gz
+74cd5466416136da30a4e69f74dbc7a0  file-4.26.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 15 14:38:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:38:09 +0000
Subject: [pkgdb] alsa-lib: stransky has given up watchbugzilla
Message-ID: <20080915143809.11CFD208D9B@bastion.fedora.phx.redhat.com>

stransky has given up the watchbugzilla acl on alsa-lib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Mon Sep 15 14:38:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:38:15 +0000
Subject: [pkgdb] alsa-lib: stransky has given up watchcommits
Message-ID: <20080915143816.0AA03208DA2@bastion.fedora.phx.redhat.com>

stransky has given up the watchcommits acl on alsa-lib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Mon Sep 15 14:38:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:38:17 +0000
Subject: [pkgdb] alsa-lib: stransky has given up watchbugzilla
Message-ID: <20080915143817.8F6C0208DA8@bastion.fedora.phx.redhat.com>

stransky has given up the watchbugzilla acl on alsa-lib (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Mon Sep 15 14:38:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:38:16 +0000
Subject: [pkgdb] alsa-lib: stransky has given up commit
Message-ID: <20080915143816.15337208DA5@bastion.fedora.phx.redhat.com>

stransky has given up the commit acl on alsa-lib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Mon Sep 15 14:38:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:38:18 +0000
Subject: [pkgdb] alsa-lib: stransky has given up approveacls
Message-ID: <20080915143819.085CE208DAB@bastion.fedora.phx.redhat.com>

stransky has given up the approveacls acl on alsa-lib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Mon Sep 15 14:38:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:38:19 +0000
Subject: [pkgdb] alsa-lib: stransky has given up commit
Message-ID: <20080915143819.200AD208DAE@bastion.fedora.phx.redhat.com>

stransky has given up the commit acl on alsa-lib (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Mon Sep 15 14:38:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:38:20 +0000
Subject: [pkgdb] alsa-lib: stransky has given up watchcommits
Message-ID: <20080915143820.5C917208DB2@bastion.fedora.phx.redhat.com>

stransky has given up the watchcommits acl on alsa-lib (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Mon Sep 15 14:38:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:38:21 +0000
Subject: [pkgdb] alsa-lib: stransky has given up watchbugzilla
Message-ID: <20080915143821.E03C8208D9A@bastion.fedora.phx.redhat.com>

stransky has given up the watchbugzilla acl on alsa-lib (Fedora 1)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Mon Sep 15 14:38:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:38:23 +0000
Subject: [pkgdb] alsa-lib: stransky has given up watchcommits
Message-ID: <20080915143823.4ACA9208DB3@bastion.fedora.phx.redhat.com>

stransky has given up the watchcommits acl on alsa-lib (Fedora 1)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Mon Sep 15 14:38:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:38:27 +0000
Subject: [pkgdb] alsa-lib: stransky has given up approveacls
Message-ID: <20080915143827.4B9FB208DB7@bastion.fedora.phx.redhat.com>

stransky has given up the approveacls acl on alsa-lib (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Mon Sep 15 14:38:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:38:27 +0000
Subject: [pkgdb] alsa-lib: stransky has given up commit
Message-ID: <20080915143827.6FC6D208DB9@bastion.fedora.phx.redhat.com>

stransky has given up the commit acl on alsa-lib (Fedora 1)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Mon Sep 15 14:38:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:38:28 +0000
Subject: [pkgdb] alsa-lib: stransky has given up approveacls
Message-ID: <20080915143828.C40FD208DBB@bastion.fedora.phx.redhat.com>

stransky has given up the approveacls acl on alsa-lib (Fedora 1)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Mon Sep 15 14:38:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:38:30 +0000
Subject: [pkgdb] alsa-lib: stransky has given up watchcommits
Message-ID: <20080915143830.420B0208DBE@bastion.fedora.phx.redhat.com>

stransky has given up the watchcommits acl on alsa-lib (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Mon Sep 15 14:38:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:38:31 +0000
Subject: [pkgdb] alsa-lib: stransky has given up commit
Message-ID: <20080915143831.C7DB2208D9E@bastion.fedora.phx.redhat.com>

stransky has given up the commit acl on alsa-lib (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Mon Sep 15 14:38:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:38:33 +0000
Subject: [pkgdb] alsa-lib: stransky has given up approveacls
Message-ID: <20080915143833.83760208DA2@bastion.fedora.phx.redhat.com>

stransky has given up the approveacls acl on alsa-lib (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Mon Sep 15 14:38:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:38:35 +0000
Subject: [pkgdb] alsa-lib: stransky has given up watchbugzilla
Message-ID: <20080915143835.197D8208DC1@bastion.fedora.phx.redhat.com>

stransky has given up the watchbugzilla acl on alsa-lib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Mon Sep 15 14:38:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:38:38 +0000
Subject: [pkgdb] alsa-lib: stransky has given up watchbugzilla
Message-ID: <20080915143838.C9E58208DC3@bastion.fedora.phx.redhat.com>

stransky has given up the watchbugzilla acl on alsa-lib (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Mon Sep 15 14:38:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:38:47 +0000
Subject: [pkgdb] alsa-lib: stransky has given up watchcommits
Message-ID: <20080915143847.5C304208DA8@bastion.fedora.phx.redhat.com>

stransky has given up the watchcommits acl on alsa-lib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib



From hadess at fedoraproject.org  Mon Sep 15 14:46:31 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 15 Sep 2008 14:46:31 +0000 (UTC)
Subject: rpms/obex-data-server/devel .cvsignore, 1.8,
	1.9 obex-data-server.spec, 
	1.11, 1.12 sources, 1.8, 1.9 obex-data-server-0.3.4-bluez4.patch,
	1.3, NONE
Message-ID: <20080915144631.290B770137@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/obex-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23789

Modified Files:
	.cvsignore obex-data-server.spec sources 
Removed Files:
	obex-data-server-0.3.4-bluez4.patch 
Log Message:
* Mon Sep 15 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-6
- Update to latest SVN trunk, with BlueZ 4 patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obex-data-server/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Aug 2008 23:41:56 -0000	1.8
+++ .cvsignore	15 Sep 2008 14:46:00 -0000	1.9
@@ -1 +1 @@
-obex-data-server-0.3.4.tar.gz
+obex-data-server-0.4svn-r1881.tar.gz


Index: obex-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obex-data-server/devel/obex-data-server.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- obex-data-server.spec	12 Sep 2008 17:19:55 -0000	1.11
+++ obex-data-server.spec	15 Sep 2008 14:46:00 -0000	1.12
@@ -1,12 +1,13 @@
 Name:		obex-data-server
 Version:	0.3.4
-Release:	5%{?dist}
+Release:	6%{?dist}
 Epoch:		1
 Summary:	D-Bus service for Obex access
 
 Group:		System Environment/Daemons
 License:	GPLv2+
-Source0:	http://tadas.dailyda.com/software/%{name}-%{version}.tar.gz
+#Source0:	http://tadas.dailyda.com/software/%{name}-%{version}.tar.gz
+Source0:	obex-data-server-0.4svn-r1881.tar.gz
 Url:		http://tadas.dailyda.com/blog
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -16,7 +17,7 @@
 BuildRequires:	glib2-devel
 BuildRequires:	libtool
 
-Patch0:		obex-data-server-0.3.4-bluez4.patch
+Patch0:		obex-data-server-0.4-bluez4.patch
 
 %description
 obex-data-server is a D-Bus service to allow sending and receiving files
@@ -24,8 +25,8 @@
 other Bluetooth-equipped devices.
 
 %prep
-%setup -q
-%patch0 -p1 -b .bluez4
+%setup -q -n obex-data-server-0.4svn
+%patch0 -p0 -b .bluez4
 
 %build
 %configure
@@ -59,10 +60,14 @@
 %defattr(-,root,root,-)
 %doc README COPYING dbus-api.txt test/ods-dbus-test.c test/ods-server-test.py test/ods-session-test.py
 %{_bindir}/obex-data-server
+%{_sysconfdir}/obex-data-server/
 %{_datadir}/dbus-1/services/obex-data-server.service
 %{_mandir}/man1/obex-data-server.1.gz
 
 %changelog
+* Mon Sep 15 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-6
+- Update to latest SVN trunk, with BlueZ 4 patch
+
 * Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-5
 - Another BlueZ 4.x patch update
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/obex-data-server/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Aug 2008 23:41:56 -0000	1.8
+++ sources	15 Sep 2008 14:46:00 -0000	1.9
@@ -1 +1 @@
-5c71d24e8d471cc294d9d47a8f8de971  obex-data-server-0.3.4.tar.gz
+7fbc9c57752d01267432b1b82d21241a  obex-data-server-0.4svn-r1881.tar.gz


--- obex-data-server-0.3.4-bluez4.patch DELETED ---



From hadess at fedoraproject.org  Mon Sep 15 14:46:57 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 15 Sep 2008 14:46:57 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs-obexftp-updated-apis.patch, NONE, 1.1 gvfs.spec,
	1.72, 1.73
Message-ID: <20080915144657.DC07670137@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23825

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-obexftp-updated-apis.patch 
Log Message:
* Mon Sep 15 2008 - Bastien Nocera <bnocera at redhat.com> - 0.99.7.1-4
- Update for BlueZ and obex-data-server D-Bus API changes


gvfs-obexftp-updated-apis.patch:

--- NEW FILE gvfs-obexftp-updated-apis.patch ---
Index: daemon/obexftp-marshal.list
===================================================================
--- daemon/obexftp-marshal.list	(revision 1964)
+++ daemon/obexftp-marshal.list	(working copy)
@@ -1,2 +1,4 @@
+VOID:STRING
 VOID:STRING,STRING
+VOID:STRING,STRING,STRING
 VOID:STRING,STRING,UINT64
Index: daemon/gvfsbackendobexftp.c
===================================================================
--- daemon/gvfsbackendobexftp.c	(revision 1964)
+++ daemon/gvfsbackendobexftp.c	(working copy)
@@ -96,6 +96,15 @@
 
 G_DEFINE_TYPE (GVfsBackendObexftp, g_vfs_backend_obexftp, G_VFS_TYPE_BACKEND);
 
+static void session_connect_error_cb (DBusGProxy *proxy,
+                                      const char *session_object,
+                                      const gchar *error_name,
+                                      const gchar *error_message,
+                                      gpointer user_data);
+static void session_connected_cb (DBusGProxy *proxy,
+                                  const char *session_object,
+                                  gpointer user_data);
+
 /* This should all live in bluez-gnome, and we
  * should depend on it */
 enum {
@@ -207,66 +216,86 @@
   return g_str_has_prefix(bdaddr, "00:60:57");
 }
 
+static char *
+get_name_and_class (DBusGProxy *device, guint32 *type)
+{
+  GHashTable *hash;
+
+  if (dbus_g_proxy_call (device, "GetProperties", NULL,
+                         G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE),
+                         &hash, G_TYPE_INVALID) != FALSE)
+    {
+      GValue *value;
+      char *name;
+
+      value = g_hash_table_lookup (hash, "Name");
+      name = value ? g_value_dup_string(value) : NULL;
+
+      value = g_hash_table_lookup (hash, "Class");
+      if (value)
+        {
+          *type = _get_type_from_class (g_value_get_uint (value));
+        }
+      else
+        {
+          *type = BLUETOOTH_TYPE_ANY;
+        }
+      return name;
+    }
+
+  return NULL;
+}
+
 static gchar *
 _get_device_properties (const char *bdaddr, guint32 *type)
 {
   DBusGConnection *connection;
   DBusGProxy *manager;
-  gchar *name, **adapters;
+  GPtrArray *adapters;
+  gchar *name;
   guint i;
 
   name = NULL;
 
   connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
   if (connection == NULL)
-        return NULL;
+        return name;
 
   manager = dbus_g_proxy_new_for_name (connection, "org.bluez",
-                                       "/org/bluez", "org.bluez.Manager");
+                                       "/", "org.bluez.Manager");
   if (manager == NULL)
     {
       dbus_g_connection_unref (connection);
-      return NULL;
+      return name;
     }
 
-  if (dbus_g_proxy_call (manager, "ListAdapters", NULL, G_TYPE_INVALID, G_TYPE_STRV, &adapters, G_TYPE_INVALID) == FALSE)
+  if (dbus_g_proxy_call (manager, "ListAdapters", NULL, G_TYPE_INVALID, dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &adapters, G_TYPE_INVALID) == FALSE)
     {
       g_object_unref (manager);
       dbus_g_connection_unref (connection);
-      return NULL;
+      return name;
     }
 
-  for (i = 0; adapters[i] != NULL; i++)
+  for (i = 0; i < adapters->len && name == NULL; i++)
     {
       DBusGProxy *adapter;
+      char *device_path;
 
       adapter = dbus_g_proxy_new_for_name (connection, "org.bluez",
-                                           adapters[i], "org.bluez.Adapter");
-      if (dbus_g_proxy_call (adapter, "GetRemoteName", NULL,
+                                           g_ptr_array_index (adapters, i), "org.bluez.Adapter");
+      if (dbus_g_proxy_call (adapter, "FindDevice", NULL,
                              G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
-                             G_TYPE_STRING, &name, G_TYPE_INVALID) != FALSE)
+                             DBUS_TYPE_G_OBJECT_PATH, &device_path, G_TYPE_INVALID) != FALSE)
         {
-          if (name != NULL && name[0] != '\0')
-            {
-              guint32 class;
-
-              if (dbus_g_proxy_call(adapter, "GetRemoteClass", NULL,
-                                    G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
-                                    G_TYPE_UINT, &class, G_TYPE_INVALID) != FALSE)
-                {
-                  *type = _get_type_from_class (class);
-                }
-              else
-                {
-                  *type = BLUETOOTH_TYPE_ANY;
-                }
-              g_object_unref (adapter);
-              break;
-            }
+          DBusGProxy *device;
+          device = dbus_g_proxy_new_for_name (connection, "org.bluez", device_path, "org.bluez.Device");
+          name = get_name_and_class (device, type);
+          g_object_unref (device);
         }
       g_object_unref (adapter);
     }
 
+  g_ptr_array_free (adapters, TRUE);
   g_object_unref (manager);
   dbus_g_connection_unref (connection);
 
@@ -312,6 +341,15 @@
                                                       "org.openobex",
                                                       "/org/openobex",
                                                       "org.openobex.Manager");
+
+  dbus_g_proxy_add_signal(backend->manager_proxy, "SessionConnectError",
+                          DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(backend->manager_proxy, "SessionConnectError",
+                              G_CALLBACK(session_connect_error_cb), backend, NULL);
+  dbus_g_proxy_add_signal(backend->manager_proxy, "SessionConnected",
+                          DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(backend->manager_proxy, "SessionConnected",
+                              G_CALLBACK(session_connected_cb), backend, NULL);
 }
 
 static gboolean
@@ -531,6 +569,37 @@
 }
 
 static void
+session_connect_error_cb (DBusGProxy *proxy,
+                          const char *session_object,
+                          const gchar *error_name,
+                          const gchar *error_message,
+                          gpointer user_data)
+{
+  GVfsBackendObexftp *op_backend = G_VFS_BACKEND_OBEXFTP (user_data);
+
+  g_mutex_lock (op_backend->mutex);
+  op_backend->status = ASYNC_ERROR;
+  op_backend->error = g_error_new_literal (DBUS_GERROR,
+                                           DBUS_GERROR_REMOTE_EXCEPTION,
+                                           error_message);
+  g_cond_signal (op_backend->cond);
+  g_mutex_unlock (op_backend->mutex);
+}
+
+static void
+session_connected_cb (DBusGProxy *proxy,
+                      const char *session_object,
+                      gpointer user_data)
+{
+  GVfsBackendObexftp *op_backend = G_VFS_BACKEND_OBEXFTP (user_data);
+
+  g_mutex_lock (op_backend->mutex);
+  op_backend->status = ASYNC_SUCCESS;
+  g_cond_signal (op_backend->cond);
+  g_mutex_unlock (op_backend->mutex);
+}
+
+static void
 cancelled_cb (DBusGProxy *proxy, gpointer user_data)
 {
   GVfsBackendObexftp *op_backend = G_VFS_BACKEND_OBEXFTP (user_data);
@@ -559,24 +628,6 @@
   _exit (1);
 }
 
-static int
-is_connected (DBusGProxy *session_proxy, GVfsJob *job)
-{
-  GError *error = NULL;
-  gboolean connected;
-
-  if (dbus_g_proxy_call (session_proxy, "IsConnected", &error,
-                         G_TYPE_INVALID,
-                         G_TYPE_BOOLEAN, &connected, G_TYPE_INVALID) == FALSE)
-    {
-      g_vfs_job_failed_from_error (job, error);
-      g_error_free (error);
-      return -1;
-    }
-
-  return connected;
-}
-
 static void
 do_mount (GVfsBackend *backend,
           GVfsJobMount *job,
@@ -590,7 +641,6 @@
   const gchar *path = NULL;
   char *server;
   GMountSpec *obexftp_mount_spec;
-  gboolean connected;
 
   g_print ("+ do_mount\n");
 
@@ -616,10 +666,11 @@
     }
 
   /* FIXME, Have a way for the mount to be cancelled, see:
-   * http://bugs.muiline.com/view.php?id=51 */
+   * Use CancelSessionConnect */
+  op_backend->status = ASYNC_PENDING;
 
   if (dbus_g_proxy_call (op_backend->manager_proxy, "CreateBluetoothSession", &error,
-                         G_TYPE_STRING, op_backend->bdaddr, G_TYPE_STRING, "ftp", G_TYPE_INVALID,
+                         G_TYPE_STRING, op_backend->bdaddr, G_TYPE_STRING, "00:00:00:00:00:00", G_TYPE_STRING, "ftp", G_TYPE_INVALID,
                          DBUS_TYPE_G_OBJECT_PATH, &path, G_TYPE_INVALID) == FALSE)
     {
       g_free (op_backend->bdaddr);
@@ -676,14 +727,10 @@
                           G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_INVALID);
 
   /* Now wait until the device is connected */
-  connected = is_connected (op_backend->session_proxy, G_VFS_JOB (job));
-  while (connected == FALSE)
-    {
-      g_usleep (G_USEC_PER_SEC / 100);
-      connected = is_connected (op_backend->session_proxy, G_VFS_JOB (job));
-    }
+  while (op_backend->status == ASYNC_PENDING)
+        g_cond_wait (op_backend->cond, op_backend->mutex);
 
-  if (connected < 0)
+  if (op_backend->status == ASYNC_ERROR)
     {
       g_message ("mount failed, didn't connect");
 
@@ -694,11 +741,10 @@
       g_object_unref (op_backend->session_proxy);
       op_backend->session_proxy = NULL;
 
-      g_vfs_job_failed (G_VFS_JOB (job),
-                        G_IO_ERROR, G_IO_ERROR_BUSY,
-                        _("Connection to the device lost"));
+      g_vfs_job_failed_from_error (G_VFS_JOB (job), op_backend->error);
       return;
     }
+  op_backend->status = ASYNC_PENDING;
 
   g_vfs_job_succeeded (G_VFS_JOB (job));
 
@@ -1482,6 +1528,12 @@
   /* TransferStarted */
   dbus_g_object_register_marshaller(obexftp_marshal_VOID__STRING_STRING_UINT64,
                                     G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_INVALID);
+  /* SessionConnected */
+  dbus_g_object_register_marshaller(obexftp_marshal_VOID__STRING,
+                                    G_TYPE_NONE, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
+  /* SessionConnectError */
+  dbus_g_object_register_marshaller (obexftp_marshal_VOID__STRING_STRING_STRING,
+                                     G_TYPE_NONE, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
 }
 
 /*


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- gvfs.spec	11 Sep 2008 05:20:08 -0000	1.72
+++ gvfs.spec	15 Sep 2008 14:46:27 -0000	1.73
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 0.99.7.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -30,6 +30,8 @@
 BuildRequires: libtool
 Patch1: gvfs-0.99.2-archive-integration.patch
 
+Patch2: gvfs-obexftp-updated-apis.patch
+
 %description
 The gvfs package provides backend implementations for the gio 
 framework in GLib. It includes ftp, sftp, cifs. 
@@ -110,6 +112,7 @@
 %prep
 %setup -q
 %patch1 -p0 -b .archive-integration
+%patch2 -p0 -b .bluez-ods
 
 %build
 
@@ -247,6 +250,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 - Bastien Nocera <bnocera at redhat.com> - 0.99.7.1-4
+- Update for BlueZ and obex-data-server D-Bus API changes
+
 * Thu Sep 11 2008 Matthias Clasen <mclasen at redhat.com>  - 0.99.7.1-3
 - Rebuild 
 



From hadess at fedoraproject.org  Mon Sep 15 14:48:09 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 15 Sep 2008 14:48:09 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs.spec,1.73,1.74
Message-ID: <20080915144809.338D670137@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24017

Modified Files:
	gvfs.spec 
Log Message:
* Mon Sep 15 2008 - Bastien Nocera <bnocera at redhat.com> - 0.99.7.1-4
- Update for BlueZ and obex-data-server D-Bus API changes



Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- gvfs.spec	15 Sep 2008 14:46:27 -0000	1.73
+++ gvfs.spec	15 Sep 2008 14:47:38 -0000	1.74
@@ -85,6 +85,7 @@
 Summary: ObexFTP support for gvfs
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: obex-data-server >= 0.3.4-6
 BuildRequires: bluez-libs-devel >= 3.12
 BuildRequires: expat-devel
 



From pkgdb at fedoraproject.org  Mon Sep 15 14:49:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:49:19 +0000
Subject: [pkgdb] setools: mgrepl has requested commit
Message-ID: <20080915144919.F17E2208DA0@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on setools (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 14:49:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:49:21 +0000
Subject: [pkgdb] setools: mgrepl has given up commit
Message-ID: <20080915144921.E5AAF208DA5@bastion.fedora.phx.redhat.com>

mgrepl has given up the commit acl on setools (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From hadess at fedoraproject.org  Mon Sep 15 14:50:40 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 15 Sep 2008 14:50:40 +0000 (UTC)
Subject: rpms/obex-data-server/devel obex-data-server-0.4-bluez4.patch, NONE,
	1.1 obex-data-server.spec, 1.12, 1.13
Message-ID: <20080915145040.8FE5070137@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/obex-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24403

Modified Files:
	obex-data-server.spec 
Added Files:
	obex-data-server-0.4-bluez4.patch 
Log Message:
* Mon Sep 15 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-7
- Add missing patch


obex-data-server-0.4-bluez4.patch:

--- NEW FILE obex-data-server-0.4-bluez4.patch ---
Index: src/ods-bluez.c
===================================================================
--- src/ods-bluez.c	(revision 1891)
+++ src/ods-bluez.c	(working copy)
@@ -116,11 +116,11 @@
 
 	bluez->priv->manager_proxy = dbus_g_proxy_new_for_name (klass->connection,
 															"org.bluez",
-															"/org/bluez",
+															"/",
 															"org.bluez.Manager");
 	if (!dbus_g_proxy_call (bluez->priv->manager_proxy, "DefaultAdapter", &error,
 								G_TYPE_INVALID,
-								G_TYPE_STRING, &adapter_object,
+								DBUS_TYPE_G_OBJECT_PATH, &adapter_object,
 								G_TYPE_INVALID)) {
 		g_warning("Unable to connect to dbus: %s", error->message);
 		g_clear_error (&error);
@@ -326,7 +326,7 @@
     g_clear_error (&error);
 }
 
-
+#if 0
 static void
 get_remote_service_record_cb (DBusGProxy *proxy, DBusGProxyCall *call,
 								OdsBluezCancellable *cb_data)
@@ -349,7 +349,7 @@
 		goto err;
 	}
 
-	sdp_record = sdp_extract_pdu ((uint8_t *)record_array->data, &scanned);
+	sdp_record = sdp_extract_pdu ((uint8_t *)record_array->data, record_array->len, &scanned);
 
 	/* get channel for this service */
 	if (sdp_get_access_protos (sdp_record, &protos) != 0) {
@@ -406,59 +406,135 @@
 	ods_bluez_cancellable_free (cb_data);
 	g_clear_error (&error);
 }
+#endif
 
+typedef struct {
+	int channel;
+	gboolean in_attr;
+	gboolean done;
+} ctxdata;
+
 static void
+record_parse_start_tag (GMarkupParseContext *context,
+			const gchar         *element_name,
+			const gchar        **attribute_names,
+			const gchar        **attribute_values,
+			gpointer             user_data,
+			GError             **error)
+{
+	ctxdata *data = (ctxdata *) user_data;
+
+	if (data->done
+	    || attribute_names == NULL
+	    || attribute_values == NULL)
+	    	return;
+	if (g_str_equal (element_name, "attribute")
+	    && g_str_equal (*attribute_names, "id")
+	    && g_str_equal (*attribute_values, "0x0004")) {
+	    	data->in_attr = TRUE;
+	    	return;
+	}
+	if (!data->in_attr)
+		return;
+	if (g_str_equal (element_name, "uint8")
+	    && g_str_equal (*attribute_names, "value")) {
+	    	double channel;
+	    	channel = g_ascii_strtod (*attribute_values, NULL);
+	    	data->channel = channel;
+	    	data->done = TRUE;
+	}
+}
+
+static gboolean
+parse_record (const char *record, int *ret_channel)
+{
+	GError *error = NULL;
+	GMarkupParseContext *ctx;
+	GMarkupParser parser = {
+		record_parse_start_tag, NULL, NULL, NULL, NULL
+	};
+	ctxdata *data;
+
+	data = g_new0 (ctxdata, 1);
+	data->channel = -1;
+
+	ctx = g_markup_parse_context_new (&parser, 0, data, NULL);
+
+	if (!g_markup_parse_context_parse (ctx, record, strlen (record), &error)) {
+		g_warning ("Couldn't parse service record: %s", error->message);
+		g_error_free (error);
+		g_markup_parse_context_free (ctx);
+		return FALSE;
+	}
+
+	if (data->channel != -1)
+		*ret_channel = data->channel;
+	return (data->channel != -1);
+}
+
+static void
 get_remote_service_handles_cb (DBusGProxy *proxy, DBusGProxyCall *call,
 								OdsBluezCancellable *cb_data)
 {
 	OdsBluezFunc	cb = cb_data->cb;
 	gboolean		ret;
 	GError			*error = NULL;
-	GArray			*handle_array = NULL;
-	guint32			service_handle = 0;
+	GHashTable		*handle_hash = NULL;
+	GList			*list, *l;
+	int			channel;
 
 	ret = dbus_g_proxy_end_call (proxy, call, &error,
-								DBUS_TYPE_G_UINT_ARRAY, &handle_array,
-								G_TYPE_INVALID);
+				     dbus_g_type_get_map ("GHashTable", G_TYPE_UINT, G_TYPE_STRING),
+				     &handle_hash, G_TYPE_INVALID);
 
 	/* check if we were looking for Nokia specific FTP service and failed */
-	if (ret && handle_array->len == 0 && !strcmp (cb_data->uuid, OBEX_NOKIAFTP_UUID)) {
+	if (ret && g_hash_table_size (handle_hash) == 0 && !strcmp (cb_data->uuid, OBEX_NOKIAFTP_UUID)) {
 		g_free (cb_data->uuid);
 		cb_data->uuid = g_strdup (OBEX_FTP_UUID);
 		cb_data->dbus_call = dbus_g_proxy_begin_call (proxy,
-								"GetRemoteServiceHandles",
+								"DiscoverServices",
 								(DBusGProxyCallNotify) get_remote_service_handles_cb,
 								cb_data, NULL,
-								G_TYPE_STRING, cb_data->target_address,
 								G_TYPE_STRING, cb_data->uuid,
 								G_TYPE_INVALID);
 		return;
 	}
 	/* service search failed */
-	if (!ret || handle_array->len == 0) {
+	if (!ret || g_hash_table_size (handle_hash) == 0) {
 		g_clear_error (&error);
 		g_set_error (&error, ODS_ERROR, ODS_ERROR_CONNECTION_ATTEMPT_FAILED,
 						"Service search failed");
 		cb (-1, cb_data->imagingdata, error, cb_data->cb_data);
-		ods_bluez_cancellable_free (cb_data);
 		g_clear_error (&error);
 		goto out;
 	}
 
-	memcpy(&service_handle, handle_array->data, sizeof(service_handle));
+	channel = -1;
+	list = g_hash_table_get_values (handle_hash);
+	for (l = list; l != NULL; l = l->next) {
+		char *record = l->data;
+		if (parse_record (record, &channel) != FALSE) {
+			break;
+		}
+	}
+	g_list_free (list);
 
-	/* Now get service record */
-	cb_data->dbus_call = dbus_g_proxy_begin_call (proxy,
-							"GetRemoteServiceRecord",
-							(DBusGProxyCallNotify) get_remote_service_record_cb,
-							cb_data, NULL,
-							G_TYPE_STRING, cb_data->target_address,
-							G_TYPE_UINT, service_handle,
-							G_TYPE_INVALID);
+	if (channel != -1) {
+		rfcomm_connect (cb_data, channel);
+		g_object_unref (proxy);
+		g_hash_table_destroy (handle_hash);
+		return;
+	} else {
+		g_set_error (&error, ODS_ERROR, ODS_ERROR_FAILED,
+			     "Could not get service channel");
+		cb (-1, cb_data->imagingdata, error, cb_data->cb_data);
+		g_clear_error (&error);
+	}
 
 out:
-	if (handle_array != NULL)
-		g_array_free (handle_array, TRUE);
+	ods_bluez_cancellable_free (cb_data);
+	g_object_unref (proxy);
+	g_hash_table_destroy (handle_hash);
 }
 
 OdsBluezCancellable*
@@ -472,6 +548,7 @@
 								gpointer data)
 {
 	OdsBluezCancellable *cb_data;
+	OdsBluezClass *klass = ODS_BLUEZ_GET_CLASS (bluez);
 
 	cb_data = g_new0 (OdsBluezCancellable, 1);
 	cb_data->cb = func;
@@ -496,12 +573,27 @@
 
 	/* Discover channel for needed service only if we don't know it yet */
 	if (channel == 0) {
+		char *device_path;
+		DBusGProxy *device;
+
+		if (dbus_g_proxy_call (bluez->priv->adapter_proxy, "FindDevice", NULL,
+				   G_TYPE_STRING, cb_data->target_address, G_TYPE_INVALID,
+				   DBUS_TYPE_G_OBJECT_PATH, &device_path, G_TYPE_INVALID) == FALSE) {
+			GError *error = NULL;
+			g_set_error (&error, ODS_ERROR, ODS_ERROR_CONNECTION_ATTEMPT_FAILED,
+				     "Device not available");
+			func (-1, cb_data->imagingdata, error, cb_data->cb_data);
+			ods_bluez_cancellable_free (cb_data);
+			g_clear_error (&error);
+			return NULL;
+		}
+		device = dbus_g_proxy_new_for_name (klass->connection, "org.bluez", device_path, "org.bluez.Device");
+
 		/* find services that match our UUID */
-		cb_data->dbus_call = dbus_g_proxy_begin_call (bluez->priv->adapter_proxy,
-								"GetRemoteServiceHandles",
+		cb_data->dbus_call = dbus_g_proxy_begin_call (device,
+								"DiscoverServices",
 								(DBusGProxyCallNotify) get_remote_service_handles_cb,
 								cb_data, NULL,
-								G_TYPE_STRING, cb_data->target_address,
 								G_TYPE_STRING, cb_data->uuid,
 								G_TYPE_INVALID);
 	} else {


Index: obex-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obex-data-server/devel/obex-data-server.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- obex-data-server.spec	15 Sep 2008 14:46:00 -0000	1.12
+++ obex-data-server.spec	15 Sep 2008 14:50:10 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		obex-data-server
 Version:	0.3.4
-Release:	6%{?dist}
+Release:	7%{?dist}
 Epoch:		1
 Summary:	D-Bus service for Obex access
 
@@ -65,6 +65,9 @@
 %{_mandir}/man1/obex-data-server.1.gz
 
 %changelog
+* Mon Sep 15 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-7
+- Add missing patch
+
 * Mon Sep 15 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-6
 - Update to latest SVN trunk, with BlueZ 4 patch
 



From pkgdb at fedoraproject.org  Mon Sep 15 14:54:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:54:56 +0000
Subject: [pkgdb] checkpolicy: mgrepl has requested commit
Message-ID: <20080915145456.52B62208DA4@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on checkpolicy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From pkgdb at fedoraproject.org  Mon Sep 15 14:54:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:54:53 +0000
Subject: [pkgdb] checkpolicy: mgrepl has requested watchbugzilla
Message-ID: <20080915145453.2C398208D9E@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on checkpolicy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From pkgdb at fedoraproject.org  Mon Sep 15 14:55:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:55:00 +0000
Subject: [pkgdb] checkpolicy: mgrepl has requested approveacls
Message-ID: <20080915145500.6FA45208DA9@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on checkpolicy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From pkgdb at fedoraproject.org  Mon Sep 15 14:54:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:54:59 +0000
Subject: [pkgdb] checkpolicy: mgrepl has requested watchcommits
Message-ID: <20080915145459.AE6A3208DA6@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on checkpolicy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From pkgdb at fedoraproject.org  Mon Sep 15 14:55:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:55:15 +0000
Subject: [pkgdb] checkpolicy: mgrepl has requested watchbugzilla
Message-ID: <20080915145515.E0911208D9E@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on checkpolicy (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From pkgdb at fedoraproject.org  Mon Sep 15 14:55:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:55:17 +0000
Subject: [pkgdb] checkpolicy: mgrepl has requested watchcommits
Message-ID: <20080915145518.1C49E208DA4@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on checkpolicy (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From pkgdb at fedoraproject.org  Mon Sep 15 14:55:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:55:18 +0000
Subject: [pkgdb] checkpolicy: mgrepl has requested commit
Message-ID: <20080915145518.F1253208DAC@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on checkpolicy (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From pkgdb at fedoraproject.org  Mon Sep 15 14:55:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:55:21 +0000
Subject: [pkgdb] checkpolicy: mgrepl has requested approveacls
Message-ID: <20080915145521.6AF97208DAE@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on checkpolicy (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From pkgdb at fedoraproject.org  Mon Sep 15 14:55:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:55:28 +0000
Subject: [pkgdb] checkpolicy: mgrepl has requested watchbugzilla
Message-ID: <20080915145528.B52EE208DAF@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on checkpolicy (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From pkgdb at fedoraproject.org  Mon Sep 15 14:55:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:55:29 +0000
Subject: [pkgdb] checkpolicy: mgrepl has requested watchcommits
Message-ID: <20080915145529.A0EC2208DB0@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on checkpolicy (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From pkgdb at fedoraproject.org  Mon Sep 15 14:55:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:55:37 +0000
Subject: [pkgdb] checkpolicy: mgrepl has requested commit
Message-ID: <20080915145537.ED1F6208DB5@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on checkpolicy (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From pkgdb at fedoraproject.org  Mon Sep 15 14:55:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:55:37 +0000
Subject: [pkgdb] checkpolicy: mgrepl has requested approveacls
Message-ID: <20080915145538.014F9208DB8@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on checkpolicy (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From pkgdb at fedoraproject.org  Mon Sep 15 14:57:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:57:00 +0000
Subject: [pkgdb] libselinux: mgrepl has requested watchcommits
Message-ID: <20080915145700.89C21208DB0@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on libselinux (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 14:57:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:57:01 +0000
Subject: [pkgdb] libselinux: mgrepl has requested commit
Message-ID: <20080915145701.909E1208DB4@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on libselinux (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 14:57:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:57:06 +0000
Subject: [pkgdb] libselinux: mgrepl has requested watchcommits
Message-ID: <20080915145706.478D4208DA0@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on libselinux (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 14:57:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:57:06 +0000
Subject: [pkgdb] libselinux: mgrepl has requested approveacls
Message-ID: <20080915145706.BF9D4208DB5@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on libselinux (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 14:57:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:57:06 +0000
Subject: [pkgdb] libselinux: mgrepl has requested watchbugzilla
Message-ID: <20080915145706.D861C208DB8@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on libselinux (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 14:57:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:57:06 +0000
Subject: [pkgdb] libselinux: mgrepl has requested commit
Message-ID: <20080915145707.0ECB8208DBB@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on libselinux (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 14:57:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:57:13 +0000
Subject: [pkgdb] libselinux: mgrepl has requested approveacls
Message-ID: <20080915145713.B545A208DBC@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on libselinux (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 14:57:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:57:34 +0000
Subject: [pkgdb] libsemanage: mgrepl has requested watchbugzilla
Message-ID: <20080915145734.38A24208DA4@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on libsemanage (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 14:57:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:57:36 +0000
Subject: [pkgdb] libsemanage: mgrepl has requested commit
Message-ID: <20080915145736.42A03208DA9@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on libsemanage (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 14:57:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:57:36 +0000
Subject: [pkgdb] libsemanage: mgrepl has requested watchcommits
Message-ID: <20080915145737.157D2208DAC@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on libsemanage (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 14:57:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:57:37 +0000
Subject: [pkgdb] libsemanage: mgrepl has requested approveacls
Message-ID: <20080915145737.7980A208DAF@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on libsemanage (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 14:57:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:57:43 +0000
Subject: [pkgdb] libsemanage: mgrepl has requested commit
Message-ID: <20080915145743.3E6CE208DC1@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on libsemanage (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 14:57:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:57:41 +0000
Subject: [pkgdb] libsemanage: mgrepl has requested watchbugzilla
Message-ID: <20080915145741.68323208DBF@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on libsemanage (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 14:57:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:57:44 +0000
Subject: [pkgdb] libsemanage: mgrepl has requested watchcommits
Message-ID: <20080915145744.F14842D0020@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on libsemanage (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 14:57:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:57:47 +0000
Subject: [pkgdb] libsemanage: mgrepl has requested approveacls
Message-ID: <20080915145747.695562E0002@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on libsemanage (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 14:57:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:57:48 +0000
Subject: [pkgdb] libsemanage: mgrepl has requested watchcommits
Message-ID: <20080915145748.6E1A4208DC4@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on libsemanage (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 14:57:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:57:49 +0000
Subject: [pkgdb] libsemanage: mgrepl has requested commit
Message-ID: <20080915145749.37C702E0004@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on libsemanage (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 14:57:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:57:54 +0000
Subject: [pkgdb] libsemanage: mgrepl has requested watchbugzilla
Message-ID: <20080915145754.DBC5E2E0007@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on libsemanage (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 14:57:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:57:55 +0000
Subject: [pkgdb] libsemanage: mgrepl has requested approveacls
Message-ID: <20080915145755.157842E000B@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on libsemanage (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 14:58:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:58:19 +0000
Subject: [pkgdb] libsepol: mgrepl has requested watchbugzilla
Message-ID: <20080915145819.D64EF208DB6@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on libsepol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 14:58:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:58:22 +0000
Subject: [pkgdb] libsepol: mgrepl has requested commit
Message-ID: <20080915145822.1ABF4208DB9@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on libsepol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 14:58:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:58:23 +0000
Subject: [pkgdb] libsepol: mgrepl has requested approveacls
Message-ID: <20080915145823.379EF208DC7@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on libsepol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 14:58:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:58:24 +0000
Subject: [pkgdb] libsepol: mgrepl has requested watchcommits
Message-ID: <20080915145824.DA2A8208DCA@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on libsepol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 14:58:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:58:54 +0000
Subject: [pkgdb] libsepol: mgrepl has requested watchbugzilla
Message-ID: <20080915145854.C7750208DAD@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on libsepol (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 14:58:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:58:55 +0000
Subject: [pkgdb] libsepol: mgrepl has requested watchcommits
Message-ID: <20080915145856.0C1352E000C@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on libsepol (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 14:58:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:58:57 +0000
Subject: [pkgdb] libsepol: mgrepl has requested approveacls
Message-ID: <20080915145857.2579D2E0010@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on libsepol (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 14:58:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:58:59 +0000
Subject: [pkgdb] libsepol: mgrepl has given up approveacls
Message-ID: <20080915145859.CBE4D2E0012@bastion.fedora.phx.redhat.com>

mgrepl has given up the approveacls acl on libsepol (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 14:59:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:59:04 +0000
Subject: [pkgdb] libsepol: mgrepl has requested commit
Message-ID: <20080915145904.2EFF2208DBE@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on libsepol (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 14:59:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:59:07 +0000
Subject: [pkgdb] libsepol: mgrepl has given up watchbugzilla
Message-ID: <20080915145907.3CDA02E0013@bastion.fedora.phx.redhat.com>

mgrepl has given up the watchbugzilla acl on libsepol (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 14:59:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:59:08 +0000
Subject: [pkgdb] libsepol: mgrepl has given up commit
Message-ID: <20080915145908.6FB90208DC1@bastion.fedora.phx.redhat.com>

mgrepl has given up the commit acl on libsepol (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 14:59:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:59:09 +0000
Subject: [pkgdb] libsepol: mgrepl has requested watchbugzilla
Message-ID: <20080915145910.19B48208DCD@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on libsepol (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 14:59:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:59:11 +0000
Subject: [pkgdb] libsepol: mgrepl has requested watchcommits
Message-ID: <20080915145911.1F4CA208DD0@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on libsepol (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 14:59:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:59:11 +0000
Subject: [pkgdb] libsepol: mgrepl has requested commit
Message-ID: <20080915145912.1D9CD208DD3@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on libsepol (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 14:59:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:59:12 +0000
Subject: [pkgdb] libsepol: mgrepl has requested approveacls
Message-ID: <20080915145912.EFD09208DD6@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on libsepol (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 14:59:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:59:17 +0000
Subject: [pkgdb] libsepol: mgrepl has requested watchbugzilla
Message-ID: <20080915145917.2B650208DD7@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on libsepol (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 14:59:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:59:19 +0000
Subject: [pkgdb] libsepol: mgrepl has requested commit
Message-ID: <20080915145919.593FA208DD9@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on libsepol (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 14:59:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:59:18 +0000
Subject: [pkgdb] libsepol: mgrepl has given up watchcommits
Message-ID: <20080915145921.E2358208DDB@bastion.fedora.phx.redhat.com>

mgrepl has given up the watchcommits acl on libsepol (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 14:59:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:59:24 +0000
Subject: [pkgdb] libsepol: mgrepl has requested watchcommits
Message-ID: <20080915145924.19FB7208DDF@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on libsepol (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 14:59:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:59:25 +0000
Subject: [pkgdb] libsepol: mgrepl has requested approveacls
Message-ID: <20080915145928.48417208DC5@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on libsepol (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From jwilson at fedoraproject.org  Mon Sep 15 14:59:56 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 15 Sep 2008 14:59:56 +0000 (UTC)
Subject: rpms/rrdtool/F-8 .cvsignore, 1.23, 1.24 rrdtool.spec, 1.59,
	1.60 sources, 1.28, 1.29
Message-ID: <20080915145956.0ED2A7013B@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/rrdtool/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25512

Modified Files:
	.cvsignore rrdtool.spec sources 
Log Message:
* Mon Sep 15 2008 Jarod Wilson <jarod at redhat.com> 1.3.3-1
- Update to rrdtool 1.3.3
  * fixes segfault on graph creation regression in 1.3.2 (#462301)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-8/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	7 Sep 2008 02:50:15 -0000	1.23
+++ .cvsignore	15 Sep 2008 14:59:55 -0000	1.24
@@ -1,4 +1,2 @@
 php4-r1190.tar.gz
-rrdtool-1.3.0.tar.gz
-rrdtool-1.3.1.tar.gz
-rrdtool-1.3.2.tar.gz
+rrdtool-1.3.3.tar.gz


Index: rrdtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-8/rrdtool.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- rrdtool.spec	7 Sep 2008 03:01:08 -0000	1.59
+++ rrdtool.spec	15 Sep 2008 14:59:55 -0000	1.60
@@ -8,7 +8,7 @@
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.3.2
+Version: 1.3.3
 Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Databases
@@ -326,6 +326,10 @@
 %endif
 
 %changelog
+* Mon Sep 15 2008 Jarod Wilson <jarod at redhat.com> 1.3.3-1
+- Update to rrdtool 1.3.3
+  * fixes segfault on graph creation regression in 1.3.2 (#462301)
+
 * Sat Sep 06 2008 Jarod Wilson <jwilson at redhat.com> 1.3.2-1
 - Update to rrdtool 1.3.2
   * fixes a data corruption bug when rrd wraps around


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-8/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	7 Sep 2008 02:50:15 -0000	1.28
+++ sources	15 Sep 2008 14:59:55 -0000	1.29
@@ -1,2 +1,2 @@
 28074a9c368af013462631959ab90558  php4-r1190.tar.gz
-c3ace16b360547fe2de1bef8390a6fcc  rrdtool-1.3.2.tar.gz
+42e7a5b7d5eeaa63959b75822f9f1e2c  rrdtool-1.3.3.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 15 15:00:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:00:34 +0000
Subject: [pkgdb] mcstrans: mgrepl has requested watchbugzilla
Message-ID: <20080915150034.9D67F208DA4@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on mcstrans (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:00:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:00:35 +0000
Subject: [pkgdb] mcstrans: mgrepl has requested watchcommits
Message-ID: <20080915150035.83282208DC6@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on mcstrans (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:00:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:00:36 +0000
Subject: [pkgdb] mcstrans: mgrepl has requested commit
Message-ID: <20080915150036.48ED0208DC9@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on mcstrans (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:00:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:00:43 +0000
Subject: [pkgdb] mcstrans: mgrepl has requested approveacls
Message-ID: <20080915150043.F1E9B208DA9@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on mcstrans (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:00:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:00:45 +0000
Subject: [pkgdb] mcstrans: mgrepl has requested watchcommits
Message-ID: <20080915150045.D5299208DCA@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on mcstrans (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:00:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:00:47 +0000
Subject: [pkgdb] mcstrans: mgrepl has requested approveacls
Message-ID: <20080915150047.A8A91208DE4@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on mcstrans (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:00:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:00:50 +0000
Subject: [pkgdb] mcstrans: mgrepl has requested watchbugzilla
Message-ID: <20080915150050.4E4C3208DE7@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on mcstrans (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:00:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:00:54 +0000
Subject: [pkgdb] mcstrans: mgrepl has requested watchbugzilla
Message-ID: <20080915150054.E441E208DEA@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on mcstrans (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:00:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:00:54 +0000
Subject: [pkgdb] mcstrans: mgrepl has requested approveacls
Message-ID: <20080915150054.E41F2208DE9@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on mcstrans (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:00:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:00:54 +0000
Subject: [pkgdb] mcstrans: mgrepl has requested commit
Message-ID: <20080915150054.F196E208DED@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on mcstrans (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:00:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:00:55 +0000
Subject: [pkgdb] mcstrans: mgrepl has requested watchcommits
Message-ID: <20080915150055.52444208DF0@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on mcstrans (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:00:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:00:55 +0000
Subject: [pkgdb] mcstrans: mgrepl has requested commit
Message-ID: <20080915150055.5B156208DF3@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on mcstrans (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:13 +0000
Subject: [pkgdb] openssh: mgrepl has requested watchbugzilla
Message-ID: <20080915150113.EA7E9208DF5@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on openssh (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:16 +0000
Subject: [pkgdb] openssh: mgrepl has requested approveacls
Message-ID: <20080915150116.9861B208DFA@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on openssh (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:20 +0000
Subject: [pkgdb] openssh: mgrepl has requested watchcommits
Message-ID: <20080915150120.3BDFC208E03@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on openssh (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:19 +0000
Subject: [pkgdb] openssh: mgrepl has requested watchbugzilla
Message-ID: <20080915150119.553A4208DFF@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on openssh (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:21 +0000
Subject: [pkgdb] openssh: mgrepl has requested commit
Message-ID: <20080915150121.2CA85208E05@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on openssh (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:21 +0000
Subject: [pkgdb] openssh: mgrepl has requested watchcommits
Message-ID: <20080915150122.5EBD1208E07@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on openssh (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:42 +0000
Subject: [pkgdb] openssh: mgrepl has given up commit
Message-ID: <20080915150143.AE823208DCF@bastion.fedora.phx.redhat.com>

mgrepl has given up the commit acl on openssh (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:45 +0000
Subject: [pkgdb] openssh: mgrepl has given up watchbugzilla
Message-ID: <20080915150145.AA9CB208E2C@bastion.fedora.phx.redhat.com>

mgrepl has given up the watchbugzilla acl on openssh (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:45 +0000
Subject: [pkgdb] openssh: mgrepl has requested approveacls
Message-ID: <20080915150145.EDB6B208E2F@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on openssh (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:54 +0000
Subject: [pkgdb] openssh: mgrepl has requested watchcommits
Message-ID: <20080915150155.126BE208DD4@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on openssh (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:50 +0000
Subject: [pkgdb] openssh: mgrepl has requested watchbugzilla
Message-ID: <20080915150150.AEFC3208E34@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on openssh (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:52 +0000
Subject: [pkgdb] openssh: mgrepl has requested commit
Message-ID: <20080915150152.CB334208E36@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on openssh (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:55 +0000
Subject: [pkgdb] openssh: mgrepl has requested approveacls
Message-ID: <20080915150155.7D118208E39@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on openssh (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 15:02:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:02:39 +0000
Subject: [pkgdb] policycoreutils: mgrepl has requested watchbugzilla
Message-ID: <20080915150239.3CBDD208DC4@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on policycoreutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:02:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:02:39 +0000
Subject: [pkgdb] policycoreutils: mgrepl has requested watchcommits
Message-ID: <20080915150239.A6B68208D9A@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on policycoreutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:02:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:02:40 +0000
Subject: [pkgdb] policycoreutils: mgrepl has requested commit
Message-ID: <20080915150240.78D7D208DDB@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on policycoreutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:02:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:02:46 +0000
Subject: [pkgdb] policycoreutils: mgrepl has requested watchbugzilla
Message-ID: <20080915150246.C1F8F208DE1@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on policycoreutils (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:02:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:02:46 +0000
Subject: [pkgdb] policycoreutils: mgrepl has requested approveacls
Message-ID: <20080915150247.C5492208DDD@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on policycoreutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:02:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:02:48 +0000
Subject: [pkgdb] policycoreutils: mgrepl has requested commit
Message-ID: <20080915150248.A5FE0208DDF@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on policycoreutils (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:02:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:02:49 +0000
Subject: [pkgdb] policycoreutils: mgrepl has requested approveacls
Message-ID: <20080915150249.791EA208E3F@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on policycoreutils (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:02:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:02:51 +0000
Subject: [pkgdb] policycoreutils: mgrepl has requested watchcommits
Message-ID: <20080915150252.11C86208E40@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on policycoreutils (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:02:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:02:52 +0000
Subject: [pkgdb] policycoreutils: mgrepl has requested watchbugzilla
Message-ID: <20080915150252.65701208E42@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on policycoreutils (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:02:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:02:54 +0000
Subject: [pkgdb] policycoreutils: mgrepl has requested commit
Message-ID: <20080915150254.81C2F208E46@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on policycoreutils (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:35 +0000
Subject: [pkgdb] openssh: mgrepl has requested commit
Message-ID: <20080915150135.21BB2208E1A@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on openssh (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:27 +0000
Subject: [pkgdb] openssh: mgrepl has given up approveacls
Message-ID: <20080915150127.8F83D208E0F@bastion.fedora.phx.redhat.com>

mgrepl has given up the approveacls acl on openssh (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:29 +0000
Subject: [pkgdb] openssh: mgrepl has given up watchcommits
Message-ID: <20080915150129.7CFC2208E10@bastion.fedora.phx.redhat.com>

mgrepl has given up the watchcommits acl on openssh (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:34 +0000
Subject: [pkgdb] openssh: mgrepl has requested watchcommits
Message-ID: <20080915150134.880F8208E17@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on openssh (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 14:56:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:56:52 +0000
Subject: [pkgdb] libselinux: mgrepl has requested commit
Message-ID: <20080915145652.6E76D208DA6@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on libselinux (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:32 +0000
Subject: [pkgdb] openssh: mgrepl has requested watchbugzilla
Message-ID: <20080915150132.B9C55208E14@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on openssh (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 14:56:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:56:53 +0000
Subject: [pkgdb] libselinux: mgrepl has requested approveacls
Message-ID: <20080915145653.3DC33208DA4@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on libselinux (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 14:56:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:56:50 +0000
Subject: [pkgdb] libselinux: mgrepl has requested watchcommits
Message-ID: <20080915145650.6F272208D9E@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on libselinux (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 15:02:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:02:59 +0000
Subject: [pkgdb] policycoreutils: mgrepl has requested watchcommits
Message-ID: <20080915150259.60022208DB6@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on policycoreutils (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 14:56:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:56:59 +0000
Subject: [pkgdb] libselinux: mgrepl has requested watchbugzilla
Message-ID: <20080915145659.B371D208DAD@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on libselinux (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 14:56:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 14:56:53 +0000
Subject: [pkgdb] libselinux: mgrepl has requested watchbugzilla
Message-ID: <20080915145653.E7706208DAC@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on libselinux (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From hadess at fedoraproject.org  Mon Sep 15 15:03:10 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 15 Sep 2008 15:03:10 +0000 (UTC)
Subject: rpms/obex-data-server/devel obex-data-server.spec,1.13,1.14
Message-ID: <20080915150310.209A170137@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/obex-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25980

Modified Files:
	obex-data-server.spec 
Log Message:
* Mon Sep 15 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-8
- Add ImageMagic BR



Index: obex-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obex-data-server/devel/obex-data-server.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- obex-data-server.spec	15 Sep 2008 14:50:10 -0000	1.13
+++ obex-data-server.spec	15 Sep 2008 15:02:39 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		obex-data-server
 Version:	0.3.4
-Release:	7%{?dist}
+Release:	8%{?dist}
 Epoch:		1
 Summary:	D-Bus service for Obex access
 
@@ -14,6 +14,7 @@
 BuildRequires:	dbus-glib-devel
 BuildRequires:	bluez-libs-devel
 BuildRequires:	openobex-devel
+BuildRequires:	ImageMagick-devel
 BuildRequires:	glib2-devel
 BuildRequires:	libtool
 
@@ -65,6 +66,9 @@
 %{_mandir}/man1/obex-data-server.1.gz
 
 %changelog
+* Mon Sep 15 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-8
+- Add ImageMagic BR
+
 * Mon Sep 15 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-7
 - Add missing patch
 



From pkgdb at fedoraproject.org  Mon Sep 15 15:02:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:02:59 +0000
Subject: [pkgdb] policycoreutils: mgrepl has requested approveacls
Message-ID: <20080915150259.6B33D208E49@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on policycoreutils (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:04:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:04:39 +0000
Subject: [pkgdb] selinux-doc: mgrepl has requested watchbugzilla
Message-ID: <20080915150439.98188208DE5@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on selinux-doc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:04:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:04:40 +0000
Subject: [pkgdb] selinux-doc: mgrepl has requested watchcommits
Message-ID: <20080915150440.2B091208DE8@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on selinux-doc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:04:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:04:45 +0000
Subject: [pkgdb] selinux-doc: mgrepl has requested watchbugzilla
Message-ID: <20080915150445.91AC7208DED@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on selinux-doc (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:04:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:04:46 +0000
Subject: [pkgdb] selinux-doc: mgrepl has requested commit
Message-ID: <20080915150446.D28E0208DF3@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on selinux-doc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:04:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:04:46 +0000
Subject: [pkgdb] selinux-doc: mgrepl has requested watchcommits
Message-ID: <20080915150446.EF50E208DF2@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on selinux-doc (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:04:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:04:50 +0000
Subject: [pkgdb] selinux-doc: mgrepl has requested approveacls
Message-ID: <20080915150450.31E3D208DF8@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on selinux-doc (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:04:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:04:46 +0000
Subject: [pkgdb] selinux-doc: mgrepl has requested approveacls
Message-ID: <20080915150454.1D8F6208E4B@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on selinux-doc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:04:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:04:54 +0000
Subject: [pkgdb] selinux-doc: mgrepl has requested watchbugzilla
Message-ID: <20080915150455.6569E208E51@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on selinux-doc (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:04:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:04:54 +0000
Subject: [pkgdb] selinux-doc: mgrepl has requested commit
Message-ID: <20080915150455.82A3C208DFC@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on selinux-doc (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:04:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:04:56 +0000
Subject: [pkgdb] selinux-doc: mgrepl has requested commit
Message-ID: <20080915150456.DE68B208DFD@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on selinux-doc (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:04:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:04:59 +0000
Subject: [pkgdb] selinux-doc: mgrepl has requested approveacls
Message-ID: <20080915150459.80BFC208E53@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on selinux-doc (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:05:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:05:04 +0000
Subject: [pkgdb] selinux-doc: mgrepl has requested watchcommits
Message-ID: <20080915150505.51D85208E56@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on selinux-doc (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:06:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:06:21 +0000
Subject: [pkgdb] selinux-policy: mgrepl has requested watchbugzilla
Message-ID: <20080915150621.EC5FD208E01@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on selinux-policy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:06:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:06:24 +0000
Subject: [pkgdb] selinux-policy: mgrepl has requested commit
Message-ID: <20080915150624.41723208E05@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on selinux-policy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:06:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:06:24 +0000
Subject: [pkgdb] selinux-policy: mgrepl has requested watchcommits
Message-ID: <20080915150624.B56DF208E09@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on selinux-policy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:06:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:06:30 +0000
Subject: [pkgdb] selinux-policy: mgrepl has requested watchbugzilla
Message-ID: <20080915150630.2BA51208E0C@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on selinux-policy (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:06:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:06:30 +0000
Subject: [pkgdb] selinux-policy: mgrepl has requested approveacls
Message-ID: <20080915150630.9D657208E10@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on selinux-policy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:06:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:06:31 +0000
Subject: [pkgdb] selinux-policy: mgrepl has requested watchcommits
Message-ID: <20080915150631.38FDC208E15@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on selinux-policy (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:06:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:06:37 +0000
Subject: [pkgdb] selinux-policy: mgrepl has requested watchbugzilla
Message-ID: <20080915150637.DB0B4208E17@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on selinux-policy (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:06:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:06:39 +0000
Subject: [pkgdb] selinux-policy: mgrepl has requested commit
Message-ID: <20080915150639.95218208E1C@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on selinux-policy (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:06:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:06:37 +0000
Subject: [pkgdb] selinux-policy: mgrepl has requested commit
Message-ID: <20080915150640.6D5CB208E20@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on selinux-policy (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:06:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:06:39 +0000
Subject: [pkgdb] selinux-policy: mgrepl has requested approveacls
Message-ID: <20080915150640.7CE90208E26@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on selinux-policy (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:06:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:06:40 +0000
Subject: [pkgdb] selinux-policy: mgrepl has requested watchcommits
Message-ID: <20080915150640.D26F4208E5D@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on selinux-policy (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:06:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:06:40 +0000
Subject: [pkgdb] selinux-policy: mgrepl has requested approveacls
Message-ID: <20080915150640.A06A6208E59@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on selinux-policy (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:08:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:08:09 +0000
Subject: [pkgdb] setools: mgrepl has requested watchbugzilla
Message-ID: <20080915150809.300F1208DD1@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on setools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:08:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:08:10 +0000
Subject: [pkgdb] setools: mgrepl has requested watchcommits
Message-ID: <20080915150810.1ED43208DD5@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on setools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:08:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:08:11 +0000
Subject: [pkgdb] setools: mgrepl has requested commit
Message-ID: <20080915150811.7849F208E23@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on setools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:08:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:08:11 +0000
Subject: [pkgdb] setools: mgrepl has requested approveacls
Message-ID: <20080915150811.ECE39208E29@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on setools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:08:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:08:18 +0000
Subject: [pkgdb] setools: mgrepl has requested watchcommits
Message-ID: <20080915150818.AE146208E2A@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on setools (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:08:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:08:19 +0000
Subject: [pkgdb] setools: mgrepl has requested commit
Message-ID: <20080915150819.60888208E2E@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on setools (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:08:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:08:19 +0000
Subject: [pkgdb] setools: mgrepl has requested watchbugzilla
Message-ID: <20080915150819.9237F208E32@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on setools (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:08:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:08:21 +0000
Subject: [pkgdb] setools: mgrepl has requested approveacls
Message-ID: <20080915150821.DFA47208E35@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on setools (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:08:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:08:28 +0000
Subject: [pkgdb] setools: mgrepl has requested watchcommits
Message-ID: <20080915150828.B3A20208E37@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on setools (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:08:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:08:30 +0000
Subject: [pkgdb] setools: mgrepl has requested approveacls
Message-ID: <20080915150830.AAFB7208E38@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on setools (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:08:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:08:35 +0000
Subject: [pkgdb] setools: mgrepl has requested watchbugzilla
Message-ID: <20080915150835.E47D0208E3B@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on setools (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:08:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:08:35 +0000
Subject: [pkgdb] setools: mgrepl has requested commit
Message-ID: <20080915150836.730A9208E61@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on setools (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:08:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:08:58 +0000
Subject: [pkgdb] setroubleshoot: mgrepl has requested watchcommits
Message-ID: <20080915150858.34ECD208E40@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on setroubleshoot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:08:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:08:59 +0000
Subject: [pkgdb] setroubleshoot: mgrepl has requested commit
Message-ID: <20080915150859.6AC59208E66@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on setroubleshoot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:08:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:08:58 +0000
Subject: [pkgdb] setroubleshoot: mgrepl has requested watchbugzilla
Message-ID: <20080915150902.BF231208E42@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on setroubleshoot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:09:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:09:03 +0000
Subject: [pkgdb] setroubleshoot: mgrepl has requested watchbugzilla
Message-ID: <20080915150903.660FC208E6A@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on setroubleshoot (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:09:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:09:04 +0000
Subject: [pkgdb] setroubleshoot: mgrepl has requested commit
Message-ID: <20080915150904.A1F1C208E6F@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on setroubleshoot (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:09:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:09:05 +0000
Subject: [pkgdb] setroubleshoot: mgrepl has requested approveacls
Message-ID: <20080915150905.52AC9208E73@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on setroubleshoot (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:09:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:09:05 +0000
Subject: [pkgdb] setroubleshoot: mgrepl has requested approveacls
Message-ID: <20080915150905.A4DE4208E77@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on setroubleshoot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:09:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:09:05 +0000
Subject: [pkgdb] setroubleshoot: mgrepl has requested watchcommits
Message-ID: <20080915150907.7E94D208E7A@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on setroubleshoot (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:09:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:09:10 +0000
Subject: [pkgdb] setroubleshoot: mgrepl has requested watchbugzilla
Message-ID: <20080915150910.CBA9A208E7D@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on setroubleshoot (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:09:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:09:11 +0000
Subject: [pkgdb] setroubleshoot: mgrepl has requested watchcommits
Message-ID: <20080915150911.8804B208E82@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on setroubleshoot (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:09:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:09:13 +0000
Subject: [pkgdb] setroubleshoot: mgrepl has requested commit
Message-ID: <20080915150913.714A1208E87@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on setroubleshoot (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:09:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:09:17 +0000
Subject: [pkgdb] setroubleshoot: mgrepl has requested approveacls
Message-ID: <20080915150917.E27A7208E8B@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on setroubleshoot (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:09:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:09:42 +0000
Subject: [pkgdb] setroubleshoot-plugins: mgrepl has requested watchbugzilla
Message-ID: <20080915150942.7B763208DB9@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on setroubleshoot-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:09:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:09:44 +0000
Subject: [pkgdb] setroubleshoot-plugins: mgrepl has requested commit
Message-ID: <20080915150944.9D84D208DBC@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on setroubleshoot-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:09:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:09:45 +0000
Subject: [pkgdb] setroubleshoot-plugins: mgrepl has requested approveacls
Message-ID: <20080915150945.85035208E8E@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on setroubleshoot-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:09:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:09:45 +0000
Subject: [pkgdb] setroubleshoot-plugins: mgrepl has requested watchcommits
Message-ID: <20080915150945.7F5BE208E8D@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on setroubleshoot-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:09:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:09:59 +0000
Subject: [pkgdb] setroubleshoot-plugins: mgrepl has requested commit
Message-ID: <20080915150959.D957E208DA9@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on setroubleshoot-plugins (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:10:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:10:00 +0000
Subject: [pkgdb] setroubleshoot-plugins: mgrepl has requested approveacls
Message-ID: <20080915151000.AC9E6208DAB@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on setroubleshoot-plugins (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:10:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:10:04 +0000
Subject: [pkgdb] setroubleshoot-plugins: mgrepl has requested watchcommits
Message-ID: <20080915151004.4EF37208E94@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on setroubleshoot-plugins (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:10:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:10:04 +0000
Subject: [pkgdb] setroubleshoot-plugins: mgrepl has requested watchbugzilla
Message-ID: <20080915151004.67E32208E98@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on setroubleshoot-plugins (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:10:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:10:05 +0000
Subject: [pkgdb] setroubleshoot-plugins: mgrepl has requested watchcommits
Message-ID: <20080915151005.93FFC2D0020@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on setroubleshoot-plugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:10:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:10:06 +0000
Subject: [pkgdb] setroubleshoot-plugins: mgrepl has requested watchbugzilla
Message-ID: <20080915151006.5C2D12E0008@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on setroubleshoot-plugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:10:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:10:06 +0000
Subject: [pkgdb] setroubleshoot-plugins: mgrepl has requested commit
Message-ID: <20080915151006.67C702E000A@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on setroubleshoot-plugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:10:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:10:07 +0000
Subject: [pkgdb] setroubleshoot-plugins: mgrepl has requested approveacls
Message-ID: <20080915151007.AC4922E0010@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on setroubleshoot-plugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:11:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:11:14 +0000
Subject: [pkgdb] xguest: mgrepl has requested watchbugzilla
Message-ID: <20080915151115.232A82E0020@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on xguest (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:11:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:11:15 +0000
Subject: [pkgdb] xguest: mgrepl has requested watchcommits
Message-ID: <20080915151115.81E3D2E0023@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on xguest (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:11:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:11:16 +0000
Subject: [pkgdb] xguest: mgrepl has requested commit
Message-ID: <20080915151116.8BC8C2E0026@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on xguest (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:11:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:11:20 +0000
Subject: [pkgdb] xguest: mgrepl has requested approveacls
Message-ID: <20080915151120.CDA592E0029@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on xguest (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:11:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:11:29 +0000
Subject: [pkgdb] xguest: mgrepl has requested commit
Message-ID: <20080915151129.67A2F2E002C@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on xguest (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:11:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:11:29 +0000
Subject: [pkgdb] xguest: mgrepl has requested approveacls
Message-ID: <20080915151130.72C662E0031@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on xguest (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:11:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:11:30 +0000
Subject: [pkgdb] xguest: mgrepl has requested watchbugzilla
Message-ID: <20080915151130.9AA8B208DE4@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on xguest (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:11:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:11:31 +0000
Subject: [pkgdb] xguest: mgrepl has requested watchbugzilla
Message-ID: <20080915151131.C7ED52E0034@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchbugzilla acl on xguest (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:21 +0000
Subject: [pkgdb] openssh: mgrepl has requested commit
Message-ID: <20080915150122.8FB1B208E09@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on openssh (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 15:01:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:01:24 +0000
Subject: [pkgdb] openssh: mgrepl has requested approveacls
Message-ID: <20080915150124.EA8C9208E0B@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on openssh (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Mon Sep 15 15:11:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:11:30 +0000
Subject: [pkgdb] xguest: mgrepl has requested watchcommits
Message-ID: <20080915151131.EBE242E0037@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on xguest (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:11:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:11:32 +0000
Subject: [pkgdb] xguest: mgrepl has requested watchcommits
Message-ID: <20080915151132.AEAC02E003B@bastion.fedora.phx.redhat.com>

mgrepl has requested the watchcommits acl on xguest (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:11:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:11:33 +0000
Subject: [pkgdb] xguest: mgrepl has requested approveacls
Message-ID: <20080915151134.068212E003D@bastion.fedora.phx.redhat.com>

mgrepl has requested the approveacls acl on xguest (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:11:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:11:37 +0000
Subject: [pkgdb] xguest: mgrepl has requested commit
Message-ID: <20080915151137.5DE9A2E0040@bastion.fedora.phx.redhat.com>

mgrepl has requested the commit acl on xguest (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:15:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:15:35 +0000
Subject: [pkgdb] libsemanage: mgrepl has given up approveacls
Message-ID: <20080915151536.221622E005D@bastion.fedora.phx.redhat.com>

mgrepl has given up the approveacls acl on libsemanage (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pmachata at fedoraproject.org  Mon Sep 15 15:21:33 2008
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 15 Sep 2008 15:21:33 +0000 (UTC)
Subject: rpms/bison/devel bison.spec,1.34,1.35
Message-ID: <20080915152134.1A1A570137@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/bison/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27530

Modified Files:
	bison.spec 
Log Message:
More merge review changes.



Index: bison.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bison/devel/bison.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- bison.spec	15 Sep 2008 13:17:57 -0000	1.34
+++ bison.spec	15 Sep 2008 15:21:02 -0000	1.35
@@ -38,6 +38,16 @@
 is not required by all Bison-generated parsers, but may be employed by
 simple programs to supply minimal support for the generated parsers.
 
+# -ly is kept static.  It only contains two symbols: main and yyerror,
+# and both of these are extremely simple (couple lines of C total).
+# It doesn't really pay off to introduce a shared library for that.
+#
+# Therefore -devel subpackage could have been created as -static, but
+# the split was done in Jan 2005, which predates current guidelines.
+# Besides there is logic to that: the library is devel in the sense
+# that the generated parser could be distributed together with other
+# sources, and only bison-devel would be necessary to wrap the build.
+
 %package runtime
 Summary: Runtime support files used by Bison-generated parsers
 Group: Development/Libraries



From pkgdb at fedoraproject.org  Mon Sep 15 15:46:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:46:36 +0000
Subject: [pkgdb] setools had acl change status
Message-ID: <20080915154636.6A7782E01CA@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on setools (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:46:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:46:38 +0000
Subject: [pkgdb] setools had acl change status
Message-ID: <20080915154638.A772D2E01CE@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on setools (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:46:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:46:40 +0000
Subject: [pkgdb] setools had acl change status
Message-ID: <20080915154640.703F12E01D2@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on setools (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:46:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:46:50 +0000
Subject: [pkgdb] setools had acl change status
Message-ID: <20080915154650.B55982E01D7@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on setools (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:46:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:46:52 +0000
Subject: [pkgdb] setools had acl change status
Message-ID: <20080915154652.90B062E01DB@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on setools (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:46:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:46:53 +0000
Subject: [pkgdb] setools had acl change status
Message-ID: <20080915154653.CC9F92E01DF@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on setools (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:46:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:46:56 +0000
Subject: [pkgdb] setools had acl change status
Message-ID: <20080915154656.6A3C32E01E3@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on setools (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:47:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:47:01 +0000
Subject: [pkgdb] setools had acl change status
Message-ID: <20080915154701.393E22E01E8@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on setools (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:47:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:47:02 +0000
Subject: [pkgdb] setools had acl change status
Message-ID: <20080915154703.05E2B2E01EC@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on setools (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:43:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:43:39 +0000
Subject: [pkgdb] mcstrans had acl change status
Message-ID: <20080915154339.66E882E0105@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on mcstrans (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:43:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:43:28 +0000
Subject: [pkgdb] mcstrans had acl change status
Message-ID: <20080915154328.862BC2E00DF@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on mcstrans (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:44:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:44:47 +0000
Subject: [pkgdb] policycoreutils had acl change status
Message-ID: <20080915154447.CE28D2E0164@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on policycoreutils (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:45:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:45:30 +0000
Subject: [pkgdb] selinux-doc had acl change status
Message-ID: <20080915154530.59FB52E018D@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on selinux-doc (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:44:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:44:36 +0000
Subject: [pkgdb] policycoreutils had acl change status
Message-ID: <20080915154436.CF6F32E0152@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on policycoreutils (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:46:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:46:07 +0000
Subject: [pkgdb] selinux-policy had acl change status
Message-ID: <20080915154607.0B52E2E01B4@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on selinux-policy (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:43:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:43:05 +0000
Subject: [pkgdb] libsepol had acl change status
Message-ID: <20080915154305.A70D92E00D0@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on libsepol (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 15:41:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:41:58 +0000
Subject: [pkgdb] libsemanage had acl change status
Message-ID: <20080915154158.8BC142E0085@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on libsemanage (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 15:44:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:44:49 +0000
Subject: [pkgdb] policycoreutils had acl change status
Message-ID: <20080915154449.982A22E0167@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on policycoreutils (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:48:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:48:25 +0000
Subject: [pkgdb] setroubleshoot-plugins had acl change status
Message-ID: <20080915154826.6B0522E0241@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on setroubleshoot-plugins (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:48:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:48:09 +0000
Subject: [pkgdb] setroubleshoot-plugins had acl change status
Message-ID: <20080915154809.9D6CA2E0231@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on setroubleshoot-plugins (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:47:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:47:37 +0000
Subject: [pkgdb] setroubleshoot had acl change status
Message-ID: <20080915154737.4B94E2E020D@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on setroubleshoot (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:18 +0000
Subject: [pkgdb] libsemanage had acl change status
Message-ID: <20080915154218.3F74A2E009F@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on libsemanage (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 15:45:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:45:08 +0000
Subject: [pkgdb] selinux-doc had acl change status
Message-ID: <20080915154508.5A5C62E016B@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on selinux-doc (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:09 +0000
Subject: [pkgdb] libsemanage had acl change status
Message-ID: <20080915154209.B9FC32E0095@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on libsemanage (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 15:43:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:43:01 +0000
Subject: [pkgdb] libsepol had acl change status
Message-ID: <20080915154301.8E2722E00CA@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on libsepol (Fedora 9) to Obsolete for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 15:46:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:46:08 +0000
Subject: [pkgdb] selinux-policy had acl change status
Message-ID: <20080915154608.7104B2E01B8@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on selinux-policy (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:43:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:43:29 +0000
Subject: [pkgdb] mcstrans had acl change status
Message-ID: <20080915154329.CC1C82E00E3@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on mcstrans (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:43 +0000
Subject: [pkgdb] libsepol had acl change status
Message-ID: <20080915154243.60B2D2E00AF@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on libsepol (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 15:41:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:41:14 +0000
Subject: [pkgdb] libselinux had acl change status
Message-ID: <20080915154114.2E7972E0052@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on libselinux (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 15:45:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:45:25 +0000
Subject: [pkgdb] selinux-doc had acl change status
Message-ID: <20080915154525.CD5002E0184@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on selinux-doc (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:45:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:45:20 +0000
Subject: [pkgdb] selinux-doc had acl change status
Message-ID: <20080915154520.581012E017A@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on selinux-doc (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:13 +0000
Subject: [pkgdb] libsemanage had acl change status
Message-ID: <20080915154213.9494F2E0098@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on libsemanage (Fedora 9) to Obsolete for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 15:46:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:46:34 +0000
Subject: [pkgdb] setools had acl change status
Message-ID: <20080915154634.40D3F2E01C7@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on setools (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:59 +0000
Subject: [pkgdb] libsepol had acl change status
Message-ID: <20080915154300.0915D2E00C7@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on libsepol (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:41 +0000
Subject: [pkgdb] libsepol had acl change status
Message-ID: <20080915154241.CA7932E00AC@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on libsepol (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 15:48:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:48:33 +0000
Subject: [pkgdb] setroubleshoot-plugins had acl change status
Message-ID: <20080915154833.BE3172E0249@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on setroubleshoot-plugins (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:45:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:45:22 +0000
Subject: [pkgdb] selinux-doc had acl change status
Message-ID: <20080915154523.1477F2E0180@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on selinux-doc (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:45:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:45:09 +0000
Subject: [pkgdb] selinux-doc had acl change status
Message-ID: <20080915154509.D52C92E016E@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on selinux-doc (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:43:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:43:37 +0000
Subject: [pkgdb] mcstrans had acl change status
Message-ID: <20080915154337.564A22E0102@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on mcstrans (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:41:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:41:55 +0000
Subject: [pkgdb] libsemanage had acl change status
Message-ID: <20080915154155.7B3C32E007E@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on libsemanage (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 15:47:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:47:25 +0000
Subject: [pkgdb] setroubleshoot had acl change status
Message-ID: <20080915154726.0F47A2E01F9@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on setroubleshoot (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:44:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:44:26 +0000
Subject: [pkgdb] policycoreutils had acl change status
Message-ID: <20080915154426.E86E42E0149@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on policycoreutils (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:47:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:47:29 +0000
Subject: [pkgdb] setroubleshoot had acl change status
Message-ID: <20080915154729.93DC82E0205@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on setroubleshoot (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:48:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:48:06 +0000
Subject: [pkgdb] setroubleshoot-plugins had acl change status
Message-ID: <20080915154806.113BB2E022D@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on setroubleshoot-plugins (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:46:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:46:10 +0000
Subject: [pkgdb] selinux-policy had acl change status
Message-ID: <20080915154610.991992E01BC@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on selinux-policy (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:43:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:43:45 +0000
Subject: [pkgdb] mcstrans had acl change status
Message-ID: <20080915154345.ADAD32E010E@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on mcstrans (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:48:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:48:33 +0000
Subject: [pkgdb] setroubleshoot-plugins had acl change status
Message-ID: <20080915154834.441CD2E024D@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on setroubleshoot-plugins (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:52 +0000
Subject: [pkgdb] libsepol had acl change status
Message-ID: <20080915154252.412952E0066@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on libsepol (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 15:44:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:44:45 +0000
Subject: [pkgdb] policycoreutils had acl change status
Message-ID: <20080915154445.53F4F2E015E@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on policycoreutils (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:44:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:44:40 +0000
Subject: [pkgdb] policycoreutils had acl change status
Message-ID: <20080915154440.C7F9D2E0159@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on policycoreutils (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:07 +0000
Subject: [pkgdb] libsemanage had acl change status
Message-ID: <20080915154207.24F142E0092@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on libsemanage (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 15:43:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:43:44 +0000
Subject: [pkgdb] mcstrans had acl change status
Message-ID: <20080915154344.0F4312E010B@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on mcstrans (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:41:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:41:36 +0000
Subject: [pkgdb] libselinux had acl change status
Message-ID: <20080915154137.4B6D92E0041@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on libselinux (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:45 +0000
Subject: [pkgdb] libsepol had acl change status
Message-ID: <20080915154246.110A12E00B5@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on libsepol (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 15:43:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:43:08 +0000
Subject: [pkgdb] libsepol had acl change status
Message-ID: <20080915154308.DFE702E00D3@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on libsepol (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 15:41:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:41:15 +0000
Subject: [pkgdb] libselinux had acl change status
Message-ID: <20080915154115.ED5922E0056@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on libselinux (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 15:47:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:47:38 +0000
Subject: [pkgdb] setroubleshoot had acl change status
Message-ID: <20080915154738.4468A2E0211@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on setroubleshoot (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:50 +0000
Subject: [pkgdb] libsepol had acl change status
Message-ID: <20080915154250.8C4702E00B8@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on libsepol (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 15:45:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:45:11 +0000
Subject: [pkgdb] selinux-doc had acl change status
Message-ID: <20080915154511.4FED52E0171@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on selinux-doc (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:41:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:41:56 +0000
Subject: [pkgdb] libsemanage had acl change status
Message-ID: <20080915154156.E83E22E0081@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on libsemanage (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:21 +0000
Subject: [pkgdb] libsemanage had acl change status
Message-ID: <20080915154221.4C8852E00A4@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on libsemanage (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 15:41:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:41:12 +0000
Subject: [pkgdb] libselinux had acl change status
Message-ID: <20080915154112.C174D2E004A@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on libselinux (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 15:41:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:41:38 +0000
Subject: [pkgdb] libselinux had acl change status
Message-ID: <20080915154138.A044E2E0079@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on libselinux (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 15:46:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:46:00 +0000
Subject: [pkgdb] selinux-policy had acl change status
Message-ID: <20080915154600.874F52E01A8@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on selinux-policy (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:44:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:44:46 +0000
Subject: [pkgdb] policycoreutils had acl change status
Message-ID: <20080915154446.31F152E0161@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on policycoreutils (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:43:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:43:33 +0000
Subject: [pkgdb] mcstrans had acl change status
Message-ID: <20080915154333.939ED2E00F8@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on mcstrans (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:47:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:47:47 +0000
Subject: [pkgdb] setroubleshoot had acl change status
Message-ID: <20080915154747.4A63F2E0225@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on setroubleshoot (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:45:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:45:18 +0000
Subject: [pkgdb] selinux-doc had acl change status
Message-ID: <20080915154518.CFFD52E0177@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on selinux-doc (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:44 +0000
Subject: [pkgdb] libsepol had acl change status
Message-ID: <20080915154244.B93ED2E00B2@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on libsepol (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 15:45:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:45:21 +0000
Subject: [pkgdb] selinux-doc had acl change status
Message-ID: <20080915154521.B10962E017D@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on selinux-doc (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:41:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:41:09 +0000
Subject: [pkgdb] libselinux had acl change status
Message-ID: <20080915154110.06AE82E0046@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on libselinux (Fedora devel) to Approved for agk

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From dwalluck at fedoraproject.org  Mon Sep 15 16:18:21 2008
From: dwalluck at fedoraproject.org (David Walluck)
Date: Mon, 15 Sep 2008 16:18:21 +0000 (UTC)
Subject: rpms/tomcat5/F-8 tomcat5.spec,1.110,1.111
Message-ID: <20080915161821.2F9BD70137@cvs1.fedora.phx.redhat.com>

Author: dwalluck

Update of /cvs/pkgs/rpms/tomcat5/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32592

Modified Files:
	tomcat5.spec 
Log Message:
- fix build


Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/F-8/tomcat5.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- tomcat5.spec	15 Sep 2008 15:34:05 -0000	1.110
+++ tomcat5.spec	15 Sep 2008 16:17:50 -0000	1.111
@@ -589,8 +589,8 @@
 %if %{with_ecj}
 mkdir org.apache.jasper
 pushd org.apache.jasper
-unzip -qq ../apache-tomcat-5.5.26-src/build/build/common/lib/jasper-compiler.jar
-unzip -qq ../apache-tomcat-5.5.26-src/build/build/common/lib/jasper-runtime.jar \
+unzip -qq ../apache-tomcat-%{version}-src/build/build/common/lib/jasper-compiler.jar
+unzip -qq ../apache-tomcat-%{version}-src/build/build/common/lib/jasper-runtime.jar \
   -x META-INF/MANIFEST.MF org/apache/jasper/compiler/Localizer.class
 unzip -qq %{_javadir}/jdtcore.jar -x META-INF/MANIFEST.MF
 cp %{SOURCE6} META-INF/MANIFEST.MF



From rdieter at fedoraproject.org  Mon Sep 15 16:18:59 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 15 Sep 2008 16:18:59 +0000 (UTC)
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.48,1.49
Message-ID: <20080915161859.5E6EB70137@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32690

Modified Files:
	kdepimlibs.spec 
Log Message:
note rh bug too



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kdepimlibs.spec	5 Sep 2008 14:43:10 -0000	1.48
+++ kdepimlibs.spec	15 Sep 2008 16:18:29 -0000	1.49
@@ -172,7 +172,7 @@
 
 %changelog
 * Fri Sep 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-2
-- invitations crasher/regression (kde #170203)
+- invitations crasher/regression (kde #170203, rh#462103)
 
 * Thu Aug 28 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1



From pkgdb at fedoraproject.org  Mon Sep 15 15:47:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:47:04 +0000
Subject: [pkgdb] setools had acl change status
Message-ID: <20080915154704.EBC822E01F0@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on setools (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:47:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:47:06 +0000
Subject: [pkgdb] setools had acl change status
Message-ID: <20080915154706.7C0372E01F5@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on setools (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setools



From pkgdb at fedoraproject.org  Mon Sep 15 15:43:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:43:03 +0000
Subject: [pkgdb] libsepol had acl change status
Message-ID: <20080915154304.0CF932E00CD@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on libsepol (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:58 +0000
Subject: [pkgdb] libsepol had acl change status
Message-ID: <20080915154258.8885B2E00C4@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on libsepol (Fedora 9) to Approved for agk

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:53 +0000
Subject: [pkgdb] libsepol had acl change status
Message-ID: <20080915154253.B13B02E00BE@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on libsepol (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 15:41:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:41:35 +0000
Subject: [pkgdb] libselinux had acl change status
Message-ID: <20080915154135.632952E0071@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on libselinux (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 15:43:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:43:35 +0000
Subject: [pkgdb] mcstrans had acl change status
Message-ID: <20080915154335.8F1902E00FF@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on mcstrans (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:43:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:43:43 +0000
Subject: [pkgdb] mcstrans had acl change status
Message-ID: <20080915154343.A0F982E0108@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on mcstrans (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:43:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:43:47 +0000
Subject: [pkgdb] mcstrans had acl change status
Message-ID: <20080915154347.21B5A2E0111@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on mcstrans (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:41:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:41:31 +0000
Subject: [pkgdb] libselinux had acl change status
Message-ID: <20080915154131.AC3D32E006B@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on libselinux (Fedora 9) to Approved for agk

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 15:41:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:41:25 +0000
Subject: [pkgdb] libselinux had acl change status
Message-ID: <20080915154125.E35D52E0062@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on libselinux (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:55 +0000
Subject: [pkgdb] libsepol had acl change status
Message-ID: <20080915154255.5C0632E0069@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on libsepol (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 15:43:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:43:26 +0000
Subject: [pkgdb] mcstrans had acl change status
Message-ID: <20080915154327.0D7CD2E00DC@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on mcstrans (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:40 +0000
Subject: [pkgdb] libsepol had acl change status
Message-ID: <20080915154240.0DFD22E00A9@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on libsepol (Fedora devel) to Approved for agk

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsepol



From pkgdb at fedoraproject.org  Mon Sep 15 15:41:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:41:24 +0000
Subject: [pkgdb] libselinux had acl change status
Message-ID: <20080915154124.807D02E005F@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on libselinux (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 15:41:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:41:29 +0000
Subject: [pkgdb] libselinux had acl change status
Message-ID: <20080915154129.6108D2E0068@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on libselinux (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:19 +0000
Subject: [pkgdb] libsemanage had acl change status
Message-ID: <20080915154219.990842E00A1@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on libsemanage (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 15:45:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:45:28 +0000
Subject: [pkgdb] selinux-doc had acl change status
Message-ID: <20080915154528.31F202E018A@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on selinux-doc (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:43:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:43:25 +0000
Subject: [pkgdb] mcstrans had acl change status
Message-ID: <20080915154325.EAC042E00D9@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on mcstrans (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcstrans



From pkgdb at fedoraproject.org  Mon Sep 15 15:41:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:41:22 +0000
Subject: [pkgdb] libselinux had acl change status
Message-ID: <20080915154122.D56D72E005C@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on libselinux (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 15:41:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:41:17 +0000
Subject: [pkgdb] libselinux had acl change status
Message-ID: <20080915154117.D79532E0059@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on libselinux (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 15:41:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:41:32 +0000
Subject: [pkgdb] libselinux had acl change status
Message-ID: <20080915154132.CB9D72E006E@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on libselinux (Fedora 9) to Obsolete for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 15:41:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:41:29 +0000
Subject: [pkgdb] libselinux had acl change status
Message-ID: <20080915154129.48E2F2E0064@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on libselinux (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libselinux



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:05 +0000
Subject: [pkgdb] libsemanage had acl change status
Message-ID: <20080915154205.A8D062E008F@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on libsemanage (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:16 +0000
Subject: [pkgdb] libsemanage had acl change status
Message-ID: <20080915154216.919702E009C@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on libsemanage (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:04 +0000
Subject: [pkgdb] libsemanage had acl change status
Message-ID: <20080915154204.74AC02E008B@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on libsemanage (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 15:47:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:47:45 +0000
Subject: [pkgdb] setroubleshoot had acl change status
Message-ID: <20080915154745.A68A82E0221@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on setroubleshoot (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:46:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:46:02 +0000
Subject: [pkgdb] selinux-policy had acl change status
Message-ID: <20080915154602.991702E01AC@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on selinux-policy (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:45:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:45:12 +0000
Subject: [pkgdb] selinux-doc had acl change status
Message-ID: <20080915154512.B05E22E0174@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on selinux-doc (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:45:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:45:27 +0000
Subject: [pkgdb] selinux-doc had acl change status
Message-ID: <20080915154527.528C72E0186@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on selinux-doc (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-doc



From pkgdb at fedoraproject.org  Mon Sep 15 15:42:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:42:00 +0000
Subject: [pkgdb] libsemanage had acl change status
Message-ID: <20080915154200.57DE12E0088@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on libsemanage (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsemanage



From pkgdb at fedoraproject.org  Mon Sep 15 15:47:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:47:26 +0000
Subject: [pkgdb] setroubleshoot had acl change status
Message-ID: <20080915154726.D77C32E01FD@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on setroubleshoot (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:45:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:45:51 +0000
Subject: [pkgdb] selinux-policy had acl change status
Message-ID: <20080915154551.6CC102E0199@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on selinux-policy (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:46:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:46:11 +0000
Subject: [pkgdb] selinux-policy had acl change status
Message-ID: <20080915154611.BC28F2E01C0@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on selinux-policy (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:47:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:47:44 +0000
Subject: [pkgdb] setroubleshoot had acl change status
Message-ID: <20080915154744.6D01E2E0219@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on setroubleshoot (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:45:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:45:58 +0000
Subject: [pkgdb] selinux-policy had acl change status
Message-ID: <20080915154558.910212E01A4@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on selinux-policy (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:46:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:46:04 +0000
Subject: [pkgdb] selinux-policy had acl change status
Message-ID: <20080915154604.237DA2E01B0@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on selinux-policy (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:47:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:47:34 +0000
Subject: [pkgdb] setroubleshoot had acl change status
Message-ID: <20080915154735.048952E0209@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on setroubleshoot (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:47:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:47:40 +0000
Subject: [pkgdb] setroubleshoot had acl change status
Message-ID: <20080915154741.07DD22E0215@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on setroubleshoot (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From chitlesh at fedoraproject.org  Mon Sep 15 16:23:30 2008
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon, 15 Sep 2008 16:23:30 +0000 (UTC)
Subject: rpms/alliance/F-8 import.log, NONE, 1.1 alliance-env.patch, 1.4,
	1.5 alliance.spec, 1.6, 1.7
Message-ID: <20080915162330.7061170137@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/alliance/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1343/F-8

Modified Files:
	alliance-env.patch alliance.spec 
Added Files:
	import.log 
Log Message:



--- NEW FILE import.log ---
alliance-5_0-21_20070718snap_fc9:F-8:alliance-5.0-21.20070718snap.fc9.src.rpm:1221495749

alliance-env.patch:

Index: alliance-env.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-8/alliance-env.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- alliance-env.patch	2 Jun 2008 19:47:32 -0000	1.4
+++ alliance-env.patch	15 Sep 2008 16:22:59 -0000	1.5
@@ -5,7 +5,7 @@
  # System environment variables.
   if ( $?PATH ) then
 -   setenv PATH "${ALLIANCE_TOP}/bin:$PATH"
-+   setenv PATH "${PATH}:${ALLIANCE_TOP}/bin:"
++   setenv PATH "${PATH}:${ALLIANCE_TOP}/bin"
   else
     setenv PATH "${ALLIANCE_TOP}/bin"
   endif
@@ -13,7 +13,7 @@
  # 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:"
++   setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ALLIANCE_TOP}/lib"
   else
     setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib"
   endif
@@ -24,7 +24,7 @@
 +  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.
@@ -36,7 +36,7 @@
 
  # System environment variables.
 - PATH=$ALLIANCE_TOP/bin:$PATH
-+ PATH=$PATH:$ALLIANCE_TOP/bin:
++ PATH=$PATH:$ALLIANCE_TOP/bin
   export PATH
 
  # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
@@ -44,15 +44,16 @@
     LD_LIBRARY_PATH=$ALLIANCE_TOP/lib
   else
 -   LD_LIBRARY_PATH=$ALLIANCE_TOP/lib:$LD_LIBRARY_PATH
-+   LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib:
++   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
   else
 -   MANPATH=$ALLIANCE_TOP/man:$MANPATH
-+   MANPATH=$MANPATH:$ALLIANCE_TOP/man:
++   MANPATH=$MANPATH:$ALLIANCE_TOP/man
   fi
   export MANPATH
 +


Index: alliance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-8/alliance.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alliance.spec	2 Jun 2008 19:47:32 -0000	1.6
+++ alliance.spec	15 Sep 2008 16:22:59 -0000	1.7
@@ -1,9 +1,10 @@
 %define        prefix    %{_libdir}/%{name}
 %define        snapshot  20070718
+%define        _default_patch_fuzz  2
 
 Name:          alliance
 Version:       5.0
-Release:       16.%{snapshot}snap%{?dist}
+Release:       21.%{snapshot}snap%{?dist}
 Summary:       Alliance VLSI CAD Sytem
 
 License:       GPLv2
@@ -42,7 +43,7 @@
 BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4
 BuildRequires: transfig ghostscript
 
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 # 442379
 Requires(post): %{name}-libs = %{version}-%{release}
 
@@ -291,6 +292,17 @@
 
 
 %changelog
+* Mon Sep 15 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-21.20070718snap
+- Bugfix : Alliance incorrectly mungs your path and adds the cwd to the path #459336
+- Bugfix : Latest alc_env fixes broken system man path #452645
+
+* Mon Aug 04 2008 Aanjhan Ranganathan <aanjhan [AT] tuxmaniac DOT com> - 5.0-20.20070718snap
+- Bumped release version to match changelog
+
+* Fri Aug 01 2008 Aanjhan Ranganathan <aanjhan [AT] tuxmaniac DOT com> - 5.0-16.20070718snap
+- Rebuild using latest lesstif-devel. For #368441
+- Temporarily set fuzz parameter of patch system to be 2
+
 * Fri May 30 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-16.20070718snap
 - Bugfix /etc/profile.d/alc_env.csh problem #449062 #448480
 



From pkgdb at fedoraproject.org  Mon Sep 15 15:44:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:44:42 +0000
Subject: [pkgdb] policycoreutils had acl change status
Message-ID: <20080915154442.218EE2E015B@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on policycoreutils (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:44:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:44:30 +0000
Subject: [pkgdb] policycoreutils had acl change status
Message-ID: <20080915154430.3A0A72E014C@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on policycoreutils (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:45:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:45:50 +0000
Subject: [pkgdb] selinux-policy had acl change status
Message-ID: <20080915154550.68A082E0195@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on selinux-policy (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:47:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:47:44 +0000
Subject: [pkgdb] setroubleshoot had acl change status
Message-ID: <20080915154745.375CD2E021D@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on setroubleshoot (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:44:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:44:39 +0000
Subject: [pkgdb] policycoreutils had acl change status
Message-ID: <20080915154439.3D6302E0155@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on policycoreutils (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:45:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:45:48 +0000
Subject: [pkgdb] selinux-policy had acl change status
Message-ID: <20080915154548.84AF92E0191@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on selinux-policy (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:45:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:45:53 +0000
Subject: [pkgdb] selinux-policy had acl change status
Message-ID: <20080915154553.75AB22E019E@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on selinux-policy (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/selinux-policy



From pkgdb at fedoraproject.org  Mon Sep 15 15:47:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:47:27 +0000
Subject: [pkgdb] setroubleshoot had acl change status
Message-ID: <20080915154727.B17E42E0201@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on setroubleshoot (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot



From pkgdb at fedoraproject.org  Mon Sep 15 15:44:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:44:25 +0000
Subject: [pkgdb] policycoreutils had acl change status
Message-ID: <20080915154425.694BE2E0146@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on policycoreutils (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:44:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:44:31 +0000
Subject: [pkgdb] policycoreutils had acl change status
Message-ID: <20080915154431.EDEA22E014F@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on policycoreutils (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/policycoreutils



From pkgdb at fedoraproject.org  Mon Sep 15 15:48:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:48:28 +0000
Subject: [pkgdb] setroubleshoot-plugins had acl change status
Message-ID: <20080915154828.E60932E0245@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on setroubleshoot-plugins (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:48:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:48:23 +0000
Subject: [pkgdb] setroubleshoot-plugins had acl change status
Message-ID: <20080915154824.374CD2E023D@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on setroubleshoot-plugins (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:48:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:48:21 +0000
Subject: [pkgdb] setroubleshoot-plugins had acl change status
Message-ID: <20080915154821.3C5772E0239@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on setroubleshoot-plugins (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:48:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:48:11 +0000
Subject: [pkgdb] setroubleshoot-plugins had acl change status
Message-ID: <20080915154811.D1CBF2E0235@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on setroubleshoot-plugins (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:48:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:48:05 +0000
Subject: [pkgdb] setroubleshoot-plugins had acl change status
Message-ID: <20080915154805.60BFD2E0229@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on setroubleshoot-plugins (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From dwalsh at fedoraproject.org  Mon Sep 15 16:25:01 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 15 Sep 2008 16:25:01 +0000 (UTC)
Subject: rpms/libsemanage/devel .cvsignore, 1.95, 1.96 libsemanage-rhat.patch,
	1.40, 1.41 libsemanage.spec, 1.162, 1.163 sources, 1.97, 1.98
Message-ID: <20080915162501.DBB2B70137@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1739

Modified Files:
	.cvsignore libsemanage-rhat.patch libsemanage.spec sources 
Log Message:
* Mon Sep 15 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.28-1
- Update to upstream
	* allow fcontext and seuser changes without rebuilding the policy from Dan Walsh



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- .cvsignore	5 Aug 2008 14:29:44 -0000	1.95
+++ .cvsignore	15 Sep 2008 16:24:30 -0000	1.96
@@ -101,3 +101,4 @@
 libsemanage-2.0.25.tgz
 libsemanage-2.0.26.tgz
 libsemanage-2.0.27.tgz
+libsemanage-2.0.28.tgz

libsemanage-rhat.patch:

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libsemanage-rhat.patch	10 Sep 2008 14:37:31 -0000	1.40
+++ libsemanage-rhat.patch	15 Sep 2008 16:24:30 -0000	1.41
@@ -1,223 +1,3 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.27/src/direct_api.c
---- nsalibsemanage/src/direct_api.c	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.27/src/direct_api.c	2008-09-10 10:22:42.000000000 -0400
-@@ -430,6 +430,58 @@
- 	}
- 	return 0;
- }
-+static int semanage_direct_update_user_extra(semanage_handle_t * sh, sepol_module_package_t *base ) {
-+	const char *ofilename = NULL;
-+	int retval = -1;
-+
-+	dbase_config_t *pusers_extra = semanage_user_extra_dbase_policy(sh);
-+
-+	if (sepol_module_package_get_user_extra_len(base)) {
-+		ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_USERS_EXTRA);
-+		if (ofilename == NULL) {
-+			return retval;
-+		}
-+		retval = write_file(sh, ofilename,
-+				    sepol_module_package_get_user_extra(base),
-+				    sepol_module_package_get_user_extra_len(base));
-+		if (retval < 0)
-+			return retval;
-+
-+		pusers_extra->dtable->drop_cache(pusers_extra->dbase);
-+		
-+	} else {
-+		retval =  pusers_extra->dtable->clear(sh, pusers_extra->dbase);
-+	}
-+
-+	return retval;
-+}
-+	
-+
-+static int semanage_direct_update_seuser(semanage_handle_t * sh, sepol_module_package_t *base ) {
-+
-+	const char *ofilename = NULL;
-+	int retval = -1;
-+
-+	dbase_config_t *pseusers = semanage_seuser_dbase_policy(sh);
-+
-+	if (sepol_module_package_get_seusers_len(base)) {
-+		ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_SEUSERS);
-+		if (ofilename == NULL) {
-+			return -1;
-+		}
-+		retval = write_file(sh, ofilename,
-+				    sepol_module_package_get_seusers(base),
-+				    sepol_module_package_get_seusers_len(base));
-+		if (retval < 0)
-+			return retval;
-+		
-+		pseusers->dtable->drop_cache(pseusers->dbase);
-+		
-+	} else {
-+		retval = pseusers->dtable->clear(sh, pseusers->dbase);
-+	}
-+	return retval;
-+}
- 
- /********************* direct API functions ********************/
- 
-@@ -453,7 +505,6 @@
- 	dbase_config_t *users_base = semanage_user_base_dbase_local(sh);
- 	dbase_config_t *pusers_base = semanage_user_base_dbase_policy(sh);
- 	dbase_config_t *users_extra = semanage_user_extra_dbase_local(sh);
--	dbase_config_t *pusers_extra = semanage_user_extra_dbase_policy(sh);
- 	dbase_config_t *ports = semanage_port_dbase_local(sh);
- 	dbase_config_t *pports = semanage_port_dbase_policy(sh);
- 	dbase_config_t *bools = semanage_bool_dbase_local(sh);
-@@ -465,7 +516,6 @@
- 	dbase_config_t *fcontexts = semanage_fcontext_dbase_local(sh);
- 	dbase_config_t *pfcontexts = semanage_fcontext_dbase_policy(sh);
- 	dbase_config_t *seusers = semanage_seuser_dbase_local(sh);
--	dbase_config_t *pseusers = semanage_seuser_dbase_policy(sh);
- 
- 	/* Before we do anything else, flush the join to its component parts.
- 	 * This *does not* flush to disk automatically */
-@@ -489,12 +539,6 @@
- 	modified |= ifaces->dtable->is_modified(ifaces->dbase);
- 	modified |= nodes->dtable->is_modified(nodes->dbase);
- 
--	/* FIXME: get rid of these, once we support loading the existing policy,
--	 * instead of rebuilding it */
--	modified |= seusers_modified;
--	modified |= fcontexts_modified;
--	modified |= users_extra_modified;
--
- 	/* If there were policy changes, or explicitly requested, rebuild the policy */
- 	if (sh->do_rebuild || modified) {
- 
-@@ -575,46 +619,13 @@
- 
- 		pfcontexts->dtable->drop_cache(pfcontexts->dbase);
- 
--		/* Seusers */
--		if (sepol_module_package_get_seusers_len(base)) {
--			ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_SEUSERS);
--			if (ofilename == NULL) {
--				retval = -1;
--				goto cleanup;
--			}
--			retval = write_file(sh, ofilename,
--					    sepol_module_package_get_seusers(base),
--					    sepol_module_package_get_seusers_len(base));
--			if (retval < 0)
--				goto cleanup;
--
--			pseusers->dtable->drop_cache(pseusers->dbase);
--
--		} else {
--			retval = pseusers->dtable->clear(sh, pseusers->dbase);
--			if (retval < 0)
--				goto cleanup;
--		}
--
--		/* Users_extra */
--		if (sepol_module_package_get_user_extra_len(base)) {
--			ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_USERS_EXTRA);
--			if (ofilename == NULL) {
--				retval = -1;
--				goto cleanup;
--			}
--			retval = write_file(sh, ofilename,
--					    sepol_module_package_get_user_extra(base),
--					    sepol_module_package_get_user_extra_len(base));
--			if (retval < 0)
--				goto cleanup;
--			pusers_extra->dtable->drop_cache(pusers_extra->dbase);
-+		retval = semanage_direct_update_seuser(sh, base );
-+		if (retval < 0)
-+			goto cleanup;
- 
--		} else {
--			retval = pusers_extra->dtable->clear(sh, pusers_extra->dbase);
--			if (retval < 0)
--				goto cleanup;
--		}
-+		retval = semanage_direct_update_user_extra(sh, base );
-+		if (retval < 0)
-+			goto cleanup;
- 
- 		/* Netfilter Contexts */
- 		/* Sort the netfilter contexts. */
-@@ -667,11 +678,41 @@
- 		retval = semanage_verify_kernel(sh);
- 		if (retval < 0)
- 			goto cleanup;
--	}
-+	} else {
-+		retval = sepol_policydb_create(&out);
-+		if (retval < 0)
-+			goto cleanup;
-+
-+		retval = semanage_read_policydb(sh, out);
-+		if (retval < 0)
-+			goto cleanup;
-+		
-+		if (seusers_modified || users_extra_modified) {
-+			retval = semanage_link_base(sh, &base);
-+			if (retval < 0)
-+				goto cleanup;
-+
-+			if (seusers_modified) {
-+				retval = semanage_direct_update_seuser(sh, base );
-+				if (retval < 0)
-+					goto cleanup;
-+			}
-+			if (users_extra_modified) {
-+				/* Users_extra */
-+				retval = semanage_direct_update_user_extra(sh, base );
-+				if (retval < 0)
-+					goto cleanup;
-+			}
- 
--	/* FIXME: else if !modified, but seusers_modified, 
--	 * load the existing policy instead of rebuilding */
-+			sepol_module_package_free(base);
-+			base = NULL;
-+		}
- 
-+		retval = semanage_base_merge_components(sh);
-+		if (retval < 0)
-+		  goto cleanup;
-+
-+	}
- 	/* ======= Post-process: Validate non-policydb components ===== */
- 
- 	/* Validate local modifications to file contexts.
-@@ -724,7 +765,8 @@
- 	sepol_policydb_free(out);
- 	out = NULL;
- 
--	if (sh->do_rebuild || modified) {
-+	if (sh->do_rebuild || modified || 
-+	    seusers_modified || fcontexts_modified || users_extra_modified) {
- 		retval = semanage_install_sandbox(sh);
- 	}
- 
-@@ -733,12 +775,14 @@
- 		free(mod_filenames[i]);
- 	}
- 
--	/* Detach from policydb, so it can be freed */
--	dbase_policydb_detach((dbase_policydb_t *) pusers_base->dbase);
--	dbase_policydb_detach((dbase_policydb_t *) pports->dbase);
--	dbase_policydb_detach((dbase_policydb_t *) pifaces->dbase);
--	dbase_policydb_detach((dbase_policydb_t *) pnodes->dbase);
--	dbase_policydb_detach((dbase_policydb_t *) pbools->dbase);
-+	if (modified) {
-+		/* Detach from policydb, so it can be freed */
-+		dbase_policydb_detach((dbase_policydb_t *) pusers_base->dbase);
-+		dbase_policydb_detach((dbase_policydb_t *) pports->dbase);
-+		dbase_policydb_detach((dbase_policydb_t *) pifaces->dbase);
-+		dbase_policydb_detach((dbase_policydb_t *) pnodes->dbase);
-+		dbase_policydb_detach((dbase_policydb_t *) pbools->dbase);
-+	}
- 
- 	free(mod_filenames);
- 	sepol_policydb_free(out);
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.27/src/genhomedircon.c
 --- nsalibsemanage/src/genhomedircon.c	2008-08-28 09:34:24.000000000 -0400
 +++ libsemanage-2.0.27/src/genhomedircon.c	2008-09-10 10:22:42.000000000 -0400
@@ -246,192 +26,3 @@
  #policy-version = 19
 -
 +expand-check=0
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.27/src/semanage_store.c
---- nsalibsemanage/src/semanage_store.c	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.27/src/semanage_store.c	2008-09-10 10:24:12.000000000 -0400
-@@ -1608,6 +1608,41 @@
- 	return retval;
- }
- 
-+/* Links only the base module within the sandbox into the base module.
-+ * '*base' will point to the module package that contains everything
-+ * linked together (caller must call sepol_module_package_destroy() on
-+ * it afterwards).  '*base' will be set to NULL upon entering this
-+ * function.  Returns 0 on success, -1 on error.
-+ */
-+int semanage_link_base(semanage_handle_t * sh,
-+			  sepol_module_package_t ** base)
-+{
-+	const char *base_filename = NULL;
-+	int retval = -1;
-+
-+	*base = NULL;
-+
-+	/* first make sure that base module is readable */
-+	if ((base_filename =
-+	     semanage_path(SEMANAGE_TMP, SEMANAGE_BASE)) == NULL) {
-+		goto cleanup;
-+	}
-+	if (access(base_filename, R_OK) == -1) {
-+		ERR(sh, "Could not access sandbox base file %s.",
-+		    base_filename);
-+		goto cleanup;
-+	}
-+
-+	if (semanage_load_module(sh, base_filename, base) == -1) {
-+		goto cleanup;
-+	}
-+
-+	retval = 0;
-+
-+      cleanup:
-+	return retval;
-+}
-+
- /* 
-  * Expands the policy contained within *base 
-  */
-@@ -1648,6 +1683,47 @@
- }
- 
- /**
-+ * Read the policy from the sandbox (kernel)
-+ */
-+int semanage_read_policydb(semanage_handle_t * sh, sepol_policydb_t * in)
-+{
-+
-+	int retval = STATUS_ERR;
-+	const char *kernel_filename = NULL;
-+	struct sepol_policy_file *pf = NULL;
-+	FILE *infile = NULL;
-+
-+	if ((kernel_filename =
-+	     semanage_path(SEMANAGE_ACTIVE, SEMANAGE_KERNEL)) == NULL) {
-+		goto cleanup;
-+	}
-+	if ((infile = fopen(kernel_filename, "r")) == NULL) {
-+		ERR(sh, "Could not open kernel policy %s for reading.",
-+		    kernel_filename);
-+		goto cleanup;
-+	}
-+	__fsetlocking(infile, FSETLOCKING_BYCALLER);
-+	if (sepol_policy_file_create(&pf)) {
-+		ERR(sh, "Out of memory!");
-+		goto cleanup;
-+	}
-+	sepol_policy_file_set_fp(pf, infile);
-+	sepol_policy_file_set_handle(pf, sh->sepolh);
-+	if (sepol_policydb_read(in, pf) == -1) {
-+		ERR(sh, "Error while reading kernel policy from %s.",
-+		    kernel_filename);
-+		goto cleanup;
-+	}
-+	retval = STATUS_SUCCESS;
-+
-+      cleanup:
-+	if (infile != NULL) {
-+		fclose(infile);
-+	}
-+	sepol_policy_file_free(pf);
-+	return retval;
-+}
-+/**
-  * Writes the final policy to the sandbox (kernel)
-  */
- int semanage_write_policydb(semanage_handle_t * sh, sepol_policydb_t * out)
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.h libsemanage-2.0.27/src/semanage_store.h
---- nsalibsemanage/src/semanage_store.h	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.27/src/semanage_store.h	2008-09-10 10:22:42.000000000 -0400
-@@ -93,10 +93,16 @@
- int semanage_link_sandbox(semanage_handle_t * sh,
- 			  sepol_module_package_t ** base);
- 
-+int semanage_link_base(semanage_handle_t * sh,
-+		       sepol_module_package_t ** base);
-+
- int semanage_expand_sandbox(semanage_handle_t * sh,
- 			    sepol_module_package_t * base,
- 			    sepol_policydb_t ** policydb);
- 
-+int semanage_read_policydb(semanage_handle_t * sh,
-+			    sepol_policydb_t * policydb);
-+
- int semanage_write_policydb(semanage_handle_t * sh,
- 			    sepol_policydb_t * policydb);
- 
-diff --exclude-from=exclude -N -u -r nsalibsemanage/tests/test_fcontext.c libsemanage-2.0.27/tests/test_fcontext.c
---- nsalibsemanage/tests/test_fcontext.c	1969-12-31 19:00:00.000000000 -0500
-+++ libsemanage-2.0.27/tests/test_fcontext.c	2008-09-10 10:22:42.000000000 -0400
-@@ -0,0 +1,72 @@
-+#include <semanage/fcontext_record.h>
-+#include <semanage/semanage.h>
-+#include <semanage/fcontexts_local.h>
-+#include <sepol/sepol.h>
-+
-+#include <errno.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+int main(const int argc, const char **argv) {
-+	semanage_handle_t *sh = NULL;
-+	semanage_fcontext_t *fcontext;
-+	semanage_context_t *con;
-+	semanage_fcontext_key_t *k;
-+
-+	int exist = 0;
-+	sh = semanage_handle_create();
-+	if (sh == NULL) { 
-+		perror("Can't create semanage handle\n");
-+		return -1;
-+	}
-+        if (semanage_access_check(sh) < 0) {
-+		perror("Semanage access check failed\n");
-+		return -1;
-+	}
-+        if (semanage_connect(sh) < 0) {
-+		perror("Semanage connect failed\n");
-+		return -1;
-+	}
-+
-+	if (semanage_fcontext_key_create(sh, argv[2], SEMANAGE_FCONTEXT_REG, &k) < 0) {
-+		fprintf(stderr, "Could not create key for %s", argv[2]);
-+		return -1;
-+	}
-+
-+	if(semanage_fcontext_exists(sh, k, &exist) < 0) {
-+		fprintf(stderr,"Could not check if key exists for %s", argv[2]);
-+		return -1;
-+	}
-+	if (exist) {
-+		fprintf(stderr,"Could create %s mapping already exists", argv[2]);
-+		return -1;
-+	}
-+
-+	if (semanage_fcontext_create(sh, &fcontext) < 0) {
-+		fprintf(stderr,"Could not create file context for %s", argv[2]);
-+		return -1;
-+	}
-+	semanage_fcontext_set_expr(sh, fcontext, argv[2]);
-+
-+	if (semanage_context_from_string(sh, argv[1], &con)) {
-+		fprintf(stderr,"Could not create context using %s for file context %s", argv[1], argv[2]);
-+		return -1;
-+	}
-+
-+	if (semanage_fcontext_set_con(sh, fcontext, con) < 0) {
-+		fprintf(stderr,"Could not set file context for %s", argv[2]);
-+		return -1;
-+	}
-+
-+	semanage_fcontext_set_type(fcontext, SEMANAGE_FCONTEXT_REG);
-+
-+	if(semanage_fcontext_modify_local(sh, k, fcontext) < 0) {
-+		fprintf(stderr,"Could not add file context for %s", argv[2]);
-+		return -1;
-+	}
-+	semanage_fcontext_key_free(k);
-+	semanage_fcontext_free(fcontext);
-+
-+	return 0;
-+}
-+


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- libsemanage.spec	10 Sep 2008 14:37:31 -0000	1.162
+++ libsemanage.spec	15 Sep 2008 16:24:31 -0000	1.163
@@ -2,8 +2,8 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.27
-Release: 3%{?dist}
+Version: 2.0.28
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -89,6 +89,10 @@
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Mon Sep 15 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.28-1
+- Update to upstream
+	* allow fcontext and seuser changes without rebuilding the policy from Dan Walsh
+
 * Wed Sep 10 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.27-3
 - Additional fixes for Don't rebuild on fcontext or seuser modifications
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- sources	5 Aug 2008 14:29:44 -0000	1.97
+++ sources	15 Sep 2008 16:24:31 -0000	1.98
@@ -1 +1 @@
-783686e357b1931c27b540c0ca8d5514  libsemanage-2.0.27.tgz
+65fe04c02a3879d2224fc4036dc4e9c5  libsemanage-2.0.28.tgz



From chitlesh at fedoraproject.org  Mon Sep 15 16:29:12 2008
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon, 15 Sep 2008 16:29:12 +0000 (UTC)
Subject: rpms/alliance/F-9 alliance-env.patch, 1.4, 1.5 alliance.spec, 1.12, 
	1.13 import.log, 1.1, 1.2
Message-ID: <20080915162912.46D3170137@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/alliance/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2695/F-9

Modified Files:
	alliance-env.patch alliance.spec import.log 
Log Message:
bug fix 2

alliance-env.patch:

Index: alliance-env.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-9/alliance-env.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- alliance-env.patch	30 May 2008 17:38:18 -0000	1.4
+++ alliance-env.patch	15 Sep 2008 16:29:11 -0000	1.5
@@ -5,7 +5,7 @@
  # System environment variables.
   if ( $?PATH ) then
 -   setenv PATH "${ALLIANCE_TOP}/bin:$PATH"
-+   setenv PATH "${PATH}:${ALLIANCE_TOP}/bin:"
++   setenv PATH "${PATH}:${ALLIANCE_TOP}/bin"
   else
     setenv PATH "${ALLIANCE_TOP}/bin"
   endif
@@ -13,7 +13,7 @@
  # 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:"
++   setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ALLIANCE_TOP}/lib"
   else
     setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib"
   endif
@@ -24,7 +24,7 @@
 +  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.
@@ -36,7 +36,7 @@
 
  # System environment variables.
 - PATH=$ALLIANCE_TOP/bin:$PATH
-+ PATH=$PATH:$ALLIANCE_TOP/bin:
++ PATH=$PATH:$ALLIANCE_TOP/bin
   export PATH
 
  # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
@@ -44,15 +44,16 @@
     LD_LIBRARY_PATH=$ALLIANCE_TOP/lib
   else
 -   LD_LIBRARY_PATH=$ALLIANCE_TOP/lib:$LD_LIBRARY_PATH
-+   LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib:
++   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
   else
 -   MANPATH=$ALLIANCE_TOP/man:$MANPATH
-+   MANPATH=$MANPATH:$ALLIANCE_TOP/man:
++   MANPATH=$MANPATH:$ALLIANCE_TOP/man
   fi
   export MANPATH
 +


Index: alliance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-9/alliance.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- alliance.spec	10 Aug 2008 07:19:33 -0000	1.12
+++ alliance.spec	15 Sep 2008 16:29:11 -0000	1.13
@@ -4,7 +4,7 @@
 
 Name:          alliance
 Version:       5.0
-Release:       20.%{snapshot}snap%{?dist}
+Release:       21.%{snapshot}snap%{?dist}
 Summary:       Alliance VLSI CAD Sytem
 
 License:       GPLv2
@@ -43,7 +43,7 @@
 BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4
 BuildRequires: transfig ghostscript
 
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 # 442379
 Requires(post): %{name}-libs = %{version}-%{release}
 
@@ -292,6 +292,10 @@
 
 
 %changelog
+* Mon Sep 15 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-21.20070718snap
+- Bugfix : Alliance incorrectly mungs your path and adds the cwd to the path #459336
+- Bugfix : Latest alc_env fixes broken system man path #452645
+
 * Mon Aug 04 2008 Aanjhan Ranganathan <aanjhan [AT] tuxmaniac DOT com> - 5.0-20.20070718snap
 - Bumped release version to match changelog
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Aug 2008 07:19:33 -0000	1.1
+++ import.log	15 Sep 2008 16:29:11 -0000	1.2
@@ -1 +1,2 @@
 alliance-5_0-20_20070718snap_fc10:F-9:alliance-5.0-20.20070718snap.fc10.src.rpm:1218332940
+alliance-5_0-21_20070718snap_fc9:F-9:alliance-5.0-21.20070718snap.fc9.src.rpm:1221496105



From chitlesh at fedoraproject.org  Mon Sep 15 16:30:34 2008
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon, 15 Sep 2008 16:30:34 +0000 (UTC)
Subject: rpms/alliance/devel import.log, NONE, 1.1 alliance-env.patch, 1.4, 
	1.5 alliance.spec, 1.15, 1.16
Message-ID: <20080915163034.A947270137@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/alliance/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3002/devel

Modified Files:
	alliance-env.patch alliance.spec 
Added Files:
	import.log 
Log Message:
bug fix 2


--- NEW FILE import.log ---
alliance-5_0-21_20070718snap_fc9:HEAD:alliance-5.0-21.20070718snap.fc9.src.rpm:1221496180

alliance-env.patch:

Index: alliance-env.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/alliance-env.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- alliance-env.patch	2 Jun 2008 19:52:32 -0000	1.4
+++ alliance-env.patch	15 Sep 2008 16:30:04 -0000	1.5
@@ -5,7 +5,7 @@
  # System environment variables.
   if ( $?PATH ) then
 -   setenv PATH "${ALLIANCE_TOP}/bin:$PATH"
-+   setenv PATH "${PATH}:${ALLIANCE_TOP}/bin:"
++   setenv PATH "${PATH}:${ALLIANCE_TOP}/bin"
   else
     setenv PATH "${ALLIANCE_TOP}/bin"
   endif
@@ -13,7 +13,7 @@
  # 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:"
++   setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ALLIANCE_TOP}/lib"
   else
     setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib"
   endif
@@ -24,7 +24,7 @@
 +  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.
@@ -36,7 +36,7 @@
 
  # System environment variables.
 - PATH=$ALLIANCE_TOP/bin:$PATH
-+ PATH=$PATH:$ALLIANCE_TOP/bin:
++ PATH=$PATH:$ALLIANCE_TOP/bin
   export PATH
 
  # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
@@ -44,15 +44,16 @@
     LD_LIBRARY_PATH=$ALLIANCE_TOP/lib
   else
 -   LD_LIBRARY_PATH=$ALLIANCE_TOP/lib:$LD_LIBRARY_PATH
-+   LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib:
++   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
   else
 -   MANPATH=$ALLIANCE_TOP/man:$MANPATH
-+   MANPATH=$MANPATH:$ALLIANCE_TOP/man:
++   MANPATH=$MANPATH:$ALLIANCE_TOP/man
   fi
   export MANPATH
 +


Index: alliance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/alliance.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- alliance.spec	3 Aug 2008 19:42:43 -0000	1.15
+++ alliance.spec	15 Sep 2008 16:30:04 -0000	1.16
@@ -4,7 +4,7 @@
 
 Name:          alliance
 Version:       5.0
-Release:       20.%{snapshot}snap%{?dist}
+Release:       21.%{snapshot}snap%{?dist}
 Summary:       Alliance VLSI CAD Sytem
 
 License:       GPLv2
@@ -43,7 +43,7 @@
 BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4
 BuildRequires: transfig ghostscript
 
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 # 442379
 Requires(post): %{name}-libs = %{version}-%{release}
 
@@ -292,6 +292,10 @@
 
 
 %changelog
+* Mon Sep 15 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-21.20070718snap
+- Bugfix : Alliance incorrectly mungs your path and adds the cwd to the path #459336
+- Bugfix : Latest alc_env fixes broken system man path #452645
+
 * Mon Aug 04 2008 Aanjhan Ranganathan <aanjhan [AT] tuxmaniac DOT com> - 5.0-20.20070718snap
 - Bumped release version to match changelog
 



From pkgdb at fedoraproject.org  Mon Sep 15 15:40:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:40:43 +0000
Subject: [pkgdb] checkpolicy had acl change status
Message-ID: <20080915154043.DD91B2E003C@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on checkpolicy (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From pkgdb at fedoraproject.org  Mon Sep 15 15:48:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:48:54 +0000
Subject: [pkgdb] xguest had acl change status
Message-ID: <20080915154854.454762E0258@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on xguest (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:49:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:49:05 +0000
Subject: [pkgdb] xguest had acl change status
Message-ID: <20080915154905.6D7412E0268@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on xguest (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:48:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:48:35 +0000
Subject: [pkgdb] setroubleshoot-plugins had acl change status
Message-ID: <20080915154835.BAF092E0251@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on setroubleshoot-plugins (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From kwizart at fedoraproject.org  Mon Sep 15 16:14:06 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon, 15 Sep 2008 16:14:06 +0000 (UTC)
Subject: rpms/libewf/devel libewf.spec, 1.8, 1.9 sources, 1.6, 1.7 .cvsignore,
	1.5, 1.6
Message-ID: <20080915161406.9A94170137@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libewf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31889

Modified Files:
	libewf.spec sources .cvsignore 
Log Message:
- Update mount_ewf to 20080910
- Switch URL to sourceforge site



Index: libewf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libewf/devel/libewf.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libewf.spec	7 Jun 2008 11:17:00 -0000	1.8
+++ libewf.spec	15 Sep 2008 16:13:36 -0000	1.9
@@ -1,13 +1,13 @@
 Name:           libewf
 Version:        20080501
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library for the Expert Witness Compression Format (EWF)
 
 Group:          System Environment/Libraries
 License:        BSD
-URL:            https://www.uitwisselplatform.nl/projects/libewf/
-Source0:        http://www.uitwisselplatform.nl/frs/download.php/529/libewf-%{version}.tar.gz
-Source1:        http://www.uitwisselplatform.nl/frs/download.php/531/mount_ewf-20080513.py
+URL:            https://sourceforge.net/projects/libewf/
+Source0:        http://downloads.sourceforge.net/libewf/libewf-%{version}.tar.gz
+Source1:        http://downloads.sourceforge.net/libewf/mount_ewf-20080910.py
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  e2fsprogs-devel
@@ -108,6 +108,10 @@
 %{_mandir}/man3/*.gz
 
 %changelog
+* Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 20080501-3
+- Update mount_ewf to 20080910
+- Switch URL to sourceforge site
+
 * Sat Jun  7 2008 kwizart < kwizart at gmail.com > - 20080501-2
 - Update mount_ewf to 20080513
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libewf/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Jun 2008 11:17:00 -0000	1.6
+++ sources	15 Sep 2008 16:13:36 -0000	1.7
@@ -1,2 +1,2 @@
 be28a11d32ca72c328b081d38849d5bd  libewf-20080501.tar.gz
-65bb7d1c0e6bea1d40bbcdf4e2d7222d  mount_ewf-20080513.py
+4339cd5e658c968e17c45ada949f9116  mount_ewf-20080910.py


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libewf/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Jun 2008 11:17:00 -0000	1.5
+++ .cvsignore	15 Sep 2008 16:13:36 -0000	1.6
@@ -1,2 +1,2 @@
 libewf-20080501.tar.gz
-mount_ewf-20080513.py
+mount_ewf-20080910.py



From pkgdb at fedoraproject.org  Mon Sep 15 15:40:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:40:45 +0000
Subject: [pkgdb] checkpolicy had acl change status
Message-ID: <20080915154045.554092E003F@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on checkpolicy (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From pkgdb at fedoraproject.org  Mon Sep 15 15:49:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:49:03 +0000
Subject: [pkgdb] xguest had acl change status
Message-ID: <20080915154903.DB77C2E0264@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on xguest (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:49:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:49:16 +0000
Subject: [pkgdb] xguest had acl change status
Message-ID: <20080915154916.99F852E027C@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on xguest (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:48:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:48:55 +0000
Subject: [pkgdb] xguest had acl change status
Message-ID: <20080915154855.3BC5A2E025B@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on xguest (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:40:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:40:36 +0000
Subject: [pkgdb] checkpolicy had acl change status
Message-ID: <20080915154036.465EA2E0032@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on checkpolicy (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From pkgdb at fedoraproject.org  Mon Sep 15 15:48:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:48:36 +0000
Subject: [pkgdb] setroubleshoot-plugins had acl change status
Message-ID: <20080915154836.B75CE2E0255@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on setroubleshoot-plugins (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setroubleshoot-plugins



From pkgdb at fedoraproject.org  Mon Sep 15 15:37:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:37:37 +0000
Subject: [pkgdb] checkpolicy had acl change status
Message-ID: <20080915153737.E526F2E0021@bastion.fedora.phx.redhat.com>

toshio has set the watchbugzilla acl on checkpolicy (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From pkgdb at fedoraproject.org  Mon Sep 15 15:40:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:40:34 +0000
Subject: [pkgdb] checkpolicy had acl change status
Message-ID: <20080915154034.A5AE92E002F@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on checkpolicy (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From pkgdb at fedoraproject.org  Mon Sep 15 15:40:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:40:37 +0000
Subject: [pkgdb] checkpolicy had acl change status
Message-ID: <20080915154037.B721C2E0035@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on checkpolicy (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From dwalluck at fedoraproject.org  Mon Sep 15 15:34:36 2008
From: dwalluck at fedoraproject.org (David Walluck)
Date: Mon, 15 Sep 2008 15:34:36 +0000 (UTC)
Subject: rpms/tomcat5/F-8 .cvsignore, 1.14, 1.15 sources, 1.12,
	1.13 tomcat5.spec, 1.109, 1.110
Message-ID: <20080915153436.5E94E70137@cvs1.fedora.phx.redhat.com>

Author: dwalluck

Update of /cvs/pkgs/rpms/tomcat5/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28655

Modified Files:
	.cvsignore sources tomcat5.spec 
Log Message:
- 5.5.27
  Resolves: rhbz#456120
  Resolves: rhbz#457934
  Resolves: rhbz#446393
  Resolves: rhbz#457597



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/F-8/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	8 Feb 2008 23:39:22 -0000	1.14
+++ .cvsignore	15 Sep 2008 15:34:05 -0000	1.15
@@ -1 +1 @@
-apache-tomcat-5.5.26-src.tar.gz
+apache-tomcat-5.5.27-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/F-8/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	8 Feb 2008 23:39:22 -0000	1.12
+++ sources	15 Sep 2008 15:34:05 -0000	1.13
@@ -1 +1 @@
-642b6526354cb18c5b5d77ebef8109ae  apache-tomcat-5.5.26-src.tar.gz
+eb3f196013550b9b1684e4ff18593a8e  apache-tomcat-5.5.27-src.tar.gz


Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/F-8/tomcat5.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- tomcat5.spec	12 Feb 2008 19:49:31 -0000	1.109
+++ tomcat5.spec	15 Sep 2008 15:34:05 -0000	1.110
@@ -68,8 +68,8 @@
 
 Name: tomcat5
 Epoch: 0
-Version: 5.5.26
-Release: 1jpp.2%{?dist}
+Version: 5.5.27
+Release: 0jpp.1%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 
 Group: Networking/Daemons
@@ -1298,6 +1298,13 @@
 %endif
 
 %changelog
+* Mon Sep 15 2008 David Walluck <dwalluck at redhat.com> 0:5.5.27-0jpp.1
+- 5.5.27
+  Resolves: rhbz#456120
+  Resolves: rhbz#457934
+  Resolves: rhbz#446393
+  Resolves: rhbz#457597
+
 * Tue Feb 12 2008 Devrim GUNDUZ <devrim at commandprompt.com> 0:5.5.26-1jpp.2
 - Rebuilt
 



From spot at fedoraproject.org  Mon Sep 15 15:58:53 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 15 Sep 2008 15:58:53 +0000 (UTC)
Subject: rpms/tuxtype2/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 tuxtype2.spec, 1.11, 1.12
Message-ID: <20080915155853.AC1CE70137@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tuxtype2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30314

Modified Files:
	.cvsignore sources tuxtype2.spec 
Log Message:
significantly overdue update


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tuxtype2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Feb 2006 20:39:22 -0000	1.3
+++ .cvsignore	15 Sep 2008 15:58:21 -0000	1.4
@@ -1 +1 @@
-tuxtype2-1.5.3.tar.bz2
+tuxtype_w_fonts-1.5.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuxtype2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Feb 2006 20:39:22 -0000	1.3
+++ sources	15 Sep 2008 15:58:21 -0000	1.4
@@ -1 +1 @@
-ca04e65d3b19ddeeedb8a49147ed642b  tuxtype2-1.5.3.tar.bz2
+c2db518f7475e5be5b00a341022883d8  tuxtype_w_fonts-1.5.17.tar.gz


Index: tuxtype2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxtype2/devel/tuxtype2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tuxtype2.spec	8 Sep 2008 22:11:00 -0000	1.11
+++ tuxtype2.spec	15 Sep 2008 15:58:21 -0000	1.12
@@ -1,15 +1,15 @@
 Name:           tuxtype2
-Version:        1.5.3
-Release:        4%{?dist}
+Version:        1.5.17
+Release:        1%{?dist}
 
 Summary:        Tux Typing, an educational typing tutor for children
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://tuxtype.sourceforge.net/
-Source0:        http://dl.sf.net/tuxtype/%{name}-%{version}.tar.bz2
+Source0:        http://alioth.debian.org/tuxtype_w_fonts-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  SDL-devel >= 1.2.5, SDL_image-devel, SDL_mixer-devel
+BuildRequires:  SDL-devel >= 1.2.5, SDL_image-devel, SDL_mixer-devel, SDL_Pango-devel
 BuildRequires:  SDL_ttf-devel, ImageMagick, desktop-file-utils
 BuildRequires:  automake, autoconf
 
@@ -19,12 +19,10 @@
 
 
 %prep
-%setup -q
+%setup -q -n tuxtype_w_fonts-%{version}
 
 
 %build
-aclocal
-autoconf
 %configure
 make %{?_smp_mflags}
 
@@ -32,6 +30,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT/%{_usr}/doc
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
@@ -40,15 +39,15 @@
 [Desktop Entry]
 Name=Tux Typing
 Comment=An educational typing tutor for children.
-Exec=tuxtype2
-Icon=tuxtype.png
+Exec=tuxtype
+Icon=tuxtype
 Terminal=false
 Type=Application
 Encoding=UTF-8
 Categories=Game;Application;
 EOF
 
-convert -size 48x48 tuxtype2.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/tuxtype.png
+convert -size 48x48 tuxtype.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/tuxtype.png
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ \
 		     --add-category X-Fedora \
 		     --vendor fedora \
@@ -59,13 +58,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO tuxtype/docs/en/howtotheme.html
+%doc AUTHORS COPYING ChangeLog README TODO tuxtype/docs/en/howtotheme.html tuxtype/docs/en/TuxType_port_Mac.txt
 %{_bindir}/*
-%{_datadir}/%{name}
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
+%{_datadir}/tuxtype
 
 %changelog
+* Mon Sep 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5.17-1
+- update to 1.5.17 (incorporate Jonathan Dieter's changes)
+
 * Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5.3-4
 - fix license tag
 



From pkgdb at fedoraproject.org  Mon Sep 15 15:49:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:49:07 +0000
Subject: [pkgdb] xguest had acl change status
Message-ID: <20080915154907.43BC72E026C@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on xguest (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:48:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:48:59 +0000
Subject: [pkgdb] xguest had acl change status
Message-ID: <20080915154859.D1C8E2E0153@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on xguest (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:48:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:48:56 +0000
Subject: [pkgdb] xguest had acl change status
Message-ID: <20080915154856.DE2F62E025E@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on xguest (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:49:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:49:08 +0000
Subject: [pkgdb] xguest had acl change status
Message-ID: <20080915154908.6E8F82E026E@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on xguest (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:49:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:49:15 +0000
Subject: [pkgdb] xguest had acl change status
Message-ID: <20080915154915.031F42E015A@bastion.fedora.phx.redhat.com>

dwalsh has set the commit acl on xguest (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:49:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:49:11 +0000
Subject: [pkgdb] xguest had acl change status
Message-ID: <20080915154911.9C9972E0272@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on xguest (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:49:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:49:12 +0000
Subject: [pkgdb] xguest had acl change status
Message-ID: <20080915154913.0E1022E0275@bastion.fedora.phx.redhat.com>

dwalsh has set the watchcommits acl on xguest (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xguest



From pkgdb at fedoraproject.org  Mon Sep 15 15:40:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:40:47 +0000
Subject: [pkgdb] checkpolicy had acl change status
Message-ID: <20080915154047.8D7C92E0042@bastion.fedora.phx.redhat.com>

dwalsh has set the approveacls acl on checkpolicy (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From pkgdb at fedoraproject.org  Mon Sep 15 15:40:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:40:30 +0000
Subject: [pkgdb] checkpolicy had acl change status
Message-ID: <20080915154030.E72DE2E002C@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on checkpolicy (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From pkgdb at fedoraproject.org  Mon Sep 15 15:40:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 15:40:42 +0000
Subject: [pkgdb] checkpolicy had acl change status
Message-ID: <20080915154042.86EE92E0039@bastion.fedora.phx.redhat.com>

dwalsh has set the watchbugzilla acl on checkpolicy (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/checkpolicy



From dwalluck at fedoraproject.org  Mon Sep 15 16:34:57 2008
From: dwalluck at fedoraproject.org (David Walluck)
Date: Mon, 15 Sep 2008 16:34:57 +0000 (UTC)
Subject: rpms/tomcat5/F-8 tomcat5.spec,1.111,1.112
Message-ID: <20080915163458.041CA7013B@cvs1.fedora.phx.redhat.com>

Author: dwalluck

Update of /cvs/pkgs/rpms/tomcat5/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3765

Modified Files:
	tomcat5.spec 
Log Message:
- add requirement on jakarta-commons-io


Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/F-8/tomcat5.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- tomcat5.spec	15 Sep 2008 16:17:50 -0000	1.111
+++ tomcat5.spec	15 Sep 2008 16:34:27 -0000	1.112
@@ -127,8 +127,9 @@
 BuildRequires: jakarta-commons-daemon >= 1.0
 BuildRequires: jakarta-commons-dbcp >= 0:1.2.1
 BuildRequires: jakarta-commons-digester >= 0:1.7
-BuildRequires: jakarta-commons-logging >= 0:1.0.4
 BuildRequires: jakarta-commons-fileupload >= 0:1.0
+BuildRequires: jakarta-commons-io >= 0:1.3.2
+BuildRequires: jakarta-commons-logging >= 0:1.0.4
 BuildRequires: jakarta-commons-modeler >= 2.0
 BuildRequires: jakarta-commons-pool >= 0:1.2
 BuildRequires: jakarta-commons-launcher >= 0:0.9
@@ -182,6 +183,7 @@
 Requires: xml-commons-apis >= 1.3
 # jakarta-commons packages
 Requires: jakarta-commons-daemon >= 1.0.1
+Requires: jakarta-commons-io >= 1.3.2
 Requires: jakarta-commons-launcher >= 0:0.9
 # alternatives
 Requires: java-devel >= 0:1.4.2
@@ -493,6 +495,7 @@
 commons-collections.jar=$(build-classpath commons-collections)
 commons-logging.jar=$(build-classpath commons-logging)
 commons-daemon.jar=$(build-classpath commons-daemon)
+commons-io.jar=$(build-classpath commons-io)
 junit.jar=$(build-classpath junit)
 jasper-compiler-jdt.jar=$(build-classpath eclipse-ecj)
 EOBP
@@ -514,6 +517,7 @@
 commons-dbcp.jar=$(build-classpath commons-dbcp)
 commons-digester.jar=$(build-classpath commons-digester)
 commons-el.jar=$(build-classpath commons-el)
+commons-io.jar=$(build-classpath commons-io)
 commons-launcher.jar=$(build-classpath commons-launcher)
 commons-logging.jar=$(build-classpath commons-logging)
 commons-logging-api.jar=$(build-classpath commons-logging-api)
@@ -562,6 +566,7 @@
 commons-daemon.jar=$(build-classpath commons-daemon)
 commons-digester.jar=$(build-classpath commons-digester)
 commons-fileupload.jar=$(build-classpath commons-fileupload)
+commons-io.jar=$(build-classpath commons-io)
 commons-logging.jar=$(build-classpath commons-logging)
 commons-logging-api.jar=$(build-classpath commons-logging-api)
 commons-modeler.jar=$(build-classpath commons-modeler)
@@ -1167,6 +1172,7 @@
 %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/bootstrap*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/commons-daemon*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-io*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/commons-logging-api*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-juli*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-jkstatus-ant*



From caolanm at fedoraproject.org  Mon Sep 15 16:35:53 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 15 Sep 2008 16:35:53 +0000 (UTC)
Subject: rpms/openoffice.org/devel .cvsignore, 1.186,
	1.187 openoffice.org.spec, 1.1647, 1.1648 sources, 1.315, 1.316
Message-ID: <20080915163553.0D34370137@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4106

Modified Files:
	.cvsignore openoffice.org.spec sources 
Log Message:
next candidate


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- .cvsignore	5 Sep 2008 14:59:56 -0000	1.186
+++ .cvsignore	15 Sep 2008 16:35:22 -0000	1.187
@@ -5,4 +5,4 @@
 redhat-templates.tar.gz
 redhat-registry.tar.gz
 redhat-langpacks.tar.gz
-OOO300_m5.tar.bz2
+OOO300_m6.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1647
retrieving revision 1.1648
diff -u -r1.1647 -r1.1648
--- openoffice.org.spec	10 Sep 2008 07:58:14 -0000	1.1647
+++ openoffice.org.spec	15 Sep 2008 16:35:22 -0000	1.1648
@@ -1,6 +1,6 @@
 %define oootag OOO300
-%define ooomilestone 5
-%define rh_rpm_release 2
+%define ooomilestone 6
+%define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -3662,7 +3662,8 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Sep 10 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-5.2
+* Mon Sep 15 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-6.1
+- next candidate
 - use system jfreereport
 - Basque spellchecker
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- sources	5 Sep 2008 14:59:56 -0000	1.315
+++ sources	15 Sep 2008 16:35:22 -0000	1.316
@@ -5,4 +5,4 @@
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 5ff04a5d754f6770f07e679856d682f3  redhat-registry.tar.gz
 3a53d26158236a7a6a23fe836de721a8  redhat-langpacks.tar.gz
-cced643cb2a7261a28944b2096c1c649  OOO300_m5.tar.bz2
+317b1db9aa48b64d48365943bf601c02  OOO300_m6.tar.bz2



From caolanm at fedoraproject.org  Mon Sep 15 16:37:09 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 15 Sep 2008 16:37:09 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1648,1.1649
Message-ID: <20080915163709.2B13470137@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4404

Modified Files:
	openoffice.org.spec 
Log Message:
next candidate


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1648
retrieving revision 1.1649
diff -u -r1.1648 -r1.1649
--- openoffice.org.spec	15 Sep 2008 16:35:22 -0000	1.1648
+++ openoffice.org.spec	15 Sep 2008 16:36:38 -0000	1.1649
@@ -920,6 +920,7 @@
 Summary: Southern Ndebele language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-nr
 
 %description langpack-nr_ZA
 Provides additional Southern Ndebele translations and resources for 
@@ -1012,6 +1013,7 @@
 Summary: Swati language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-ss
 
 %description langpack-ss_ZA
 Provides additional swati translations and resources for %{name}.
@@ -1020,6 +1022,7 @@
 Summary: Southern Sotho language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-st
 
 %description langpack-st_ZA
 Provides additional Southern Sotho translations and resources for 
@@ -1065,6 +1068,7 @@
 Summary: Northern Sotho language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-nso
 Obsoletes: openoffice.org2-langpack-nso_ZA
 
 %description langpack-nso_ZA
@@ -1085,6 +1089,7 @@
 Summary: Tsonga language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-ts
 Obsoletes: openoffice.org2-langpack-ts_ZA
 Obsoletes: openoffice.org-langpack-ts
 
@@ -1106,6 +1111,7 @@
 Summary: Venda language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-ve
 
 %description langpack-ve_ZA
 Provides additional venda translations and resources for %{name}.
@@ -1114,6 +1120,7 @@
 Summary: Xhosa language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-xh
 
 %description langpack-xh_ZA
 Provides additional xhosa translations and resources for %{name}.
@@ -1405,6 +1412,7 @@
 source Linux*Env.Set.sh
 #figure out the icon version
 export `grep "^PRODUCTVERSIONSHORT =" sysui/desktop/productversion.mk | sed -e "s/ //g"`
+export `grep "PRODUCTVERSION[ ]*=[ ]*" sysui/desktop/productversion.mk | sed -e "s/ //g"`
 unset HAVE_LD_HASH_STYLE
 #don't duplicate english helpcontent about the place
 unset DEFAULT_TO_ENGLISH_FOR_PACKING
@@ -1889,6 +1897,8 @@
 for file in *.desktop; do
     # rhbz#156067 don't version the icons
     sed -i -e "s/$PRODUCTVERSIONSHORT//g" $file
+    # rhbz#156677 remove the version from Name=
+    sed -i -e "s/$PRODUCTVERSION //g" $file
 done
 echo "StartupNotify=true" >> base.desktop
 echo "StartupNotify=true" >> calc.desktop
@@ -1952,6 +1962,8 @@
 for file in *.desktop; do
     # rhbz#156067 don't version the icons
     sed -i -e "s/$PRODUCTVERSIONSHORT//g" $file
+    # rhbz#156677 remove the version from Name=
+    sed -i -e "s/$PRODUCTVERSION //g" $file
     # use broffice.org launcher
     sed -i -e "s/openoffice/broffice/g" $file
 done
@@ -3665,7 +3677,8 @@
 * Mon Sep 15 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-6.1
 - next candidate
 - use system jfreereport
-- Basque spellchecker
+- Basque, Ndebele, Swati, Southern Sotho, Northern Sotho, Tsonga,
+  Venda, Xhosa spellcheckers
 
 * Sun Sep 07 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-5.1
 - next candidate



From s4504kr at fedoraproject.org  Mon Sep 15 16:44:44 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon, 15 Sep 2008 16:44:44 +0000 (UTC)
Subject: rpms/highlight/F-9 highlight.spec,1.33,1.34
Message-ID: <20080915164444.F0BD670137@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5369

Modified Files:
	highlight.spec 
Log Message:
Remove unnec. requieres and provides


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-9/highlight.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- highlight.spec	8 Sep 2008 15:42:12 -0000	1.33
+++ highlight.spec	15 Sep 2008 16:44:14 -0000	1.34
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
 Version:	2.6.12
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		Development/Tools
 License:	GPLv2
@@ -26,6 +26,23 @@
 %setup -q
 %patch1 -p1 -b .mak
 
+# Provides: exclude perl(highlight_pipe) from example
+cat <<__EOF__ > %{name}-perl.prov
+#!/bin/sh
+/usr/lib/rpm/perl.prov \$* | grep -v '^perl(highlight_pipe)$'
+__EOF__
+%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-perl.prov
+chmod +x %{__perl_provides}
+
+# Requires: exclude perl(IPC::Open3) from example
+cat <<__EOF__ > %{name}-perl.req
+#!/bin/sh
+/usr/lib/rpm/perl.req \$* | grep -v '^perl(IPC::Open3)$'
+__EOF__
+%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-perl.req
+chmod +x %{__perl_requires}
+
+
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
 
@@ -34,6 +51,10 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# Packaging this example causes lots of incorrect perl provides and 
+# requires. Since it isn't going to work out of the box, I'm nuking it.
+rm -rf examples/plugins/movabletype
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -49,6 +70,11 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.12-2
+- don't package broken examples, causes bogus perl provides/requires
+- don't claim to Provide: perl(highlight_pipe)
+- don't claim to Requires: perl(IPC::Open3)
+
 * Mon Aug 18 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.12-1
 - New upstream release
 



From s4504kr at fedoraproject.org  Mon Sep 15 16:49:40 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon, 15 Sep 2008 16:49:40 +0000 (UTC)
Subject: rpms/open-cobol/devel open-cobol.spec,1.2,1.3
Message-ID: <20080915164940.241C270137@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/open-cobol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6002

Modified Files:
	open-cobol.spec 
Log Message:
Remove _FORTIFY_SOURCE as adviced by upstream


Index: open-cobol.spec
===================================================================
RCS file: /cvs/extras/rpms/open-cobol/devel/open-cobol.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- open-cobol.spec	11 Sep 2008 20:21:34 -0000	1.2
+++ open-cobol.spec	15 Sep 2008 16:49:09 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:		open-cobol
 Version:	1.0.90
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	OpenCOBOL - COBOL compiler
 
 Group:		Development/Languages
@@ -45,9 +45,11 @@
 
 %prep
 %setup -q -n %{name}-%{cobvers}
-(cd libcob; sed -i -e 's/\-\-mode=compile $(CC)/--mode=compile $(CC) -no-suppress/g' Makefile.in)
 
 %build
+# Remove _FORTIFY_SOURCE as adviced by the upstram
+export CFLAGS=$(echo "$RPM_OPT_FLAGS" | sed -e 's/\-Wp,\-D_FORTIFY_SOURCE=2//g')
+echo $CFLAGS
 %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
@@ -58,7 +60,7 @@
 BUILDFLAGS="-D__NO_STRING_INLINES=1"
 %endif
 
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS $BUILDFLAGS"
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -104,6 +106,9 @@
 %postun -n libcob -p /sbin/ldconfig
 
 %changelog
+* Mon Sep 15 2008 Jochen Schmitt <Jochen herr-schmitt de> 1.0.90-4
+- Remove _FORTIFY_SOURCE as adviced by the upstream
+
 * Thu Sep 11 2008 Jochen Schmitt <Jochen herr-schmitt de> 1.0.90-3
 - Add -D__NO_STRING_INLINES for the i86 arch
 



From spot at fedoraproject.org  Mon Sep 15 16:55:56 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 15 Sep 2008 16:55:56 +0000 (UTC)
Subject: rpms/tuxtype2/F-8 sources,1.3,1.4 tuxtype2.spec,1.9,1.10
Message-ID: <20080915165556.7931970137@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tuxtype2/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6743/F-8

Modified Files:
	sources tuxtype2.spec 
Log Message:
update stable branches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuxtype2/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Feb 2006 20:39:22 -0000	1.3
+++ sources	15 Sep 2008 16:55:25 -0000	1.4
@@ -1 +1 @@
-ca04e65d3b19ddeeedb8a49147ed642b  tuxtype2-1.5.3.tar.bz2
+c2db518f7475e5be5b00a341022883d8  tuxtype_w_fonts-1.5.17.tar.gz


Index: tuxtype2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxtype2/F-8/tuxtype2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tuxtype2.spec	28 Aug 2006 18:41:49 -0000	1.9
+++ tuxtype2.spec	15 Sep 2008 16:55:26 -0000	1.10
@@ -1,15 +1,15 @@
 Name:           tuxtype2
-Version:        1.5.3
-Release:        2%{?dist}
+Version:        1.5.17
+Release:        1%{?dist}
 
 Summary:        Tux Typing, an educational typing tutor for children
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://tuxtype.sourceforge.net/
-Source0:        http://dl.sf.net/tuxtype/%{name}-%{version}.tar.bz2
+Source0:        http://alioth.debian.org/tuxtype_w_fonts-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  SDL-devel >= 1.2.5, SDL_image-devel, SDL_mixer-devel
+BuildRequires:  SDL-devel >= 1.2.5, SDL_image-devel, SDL_mixer-devel, SDL_Pango-devel
 BuildRequires:  SDL_ttf-devel, ImageMagick, desktop-file-utils
 BuildRequires:  automake, autoconf
 
@@ -19,12 +19,10 @@
 
 
 %prep
-%setup -q
+%setup -q -n tuxtype_w_fonts-%{version}
 
 
 %build
-aclocal
-autoconf
 %configure
 make %{?_smp_mflags}
 
@@ -32,6 +30,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT/%{_usr}/doc
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
@@ -40,15 +39,15 @@
 [Desktop Entry]
 Name=Tux Typing
 Comment=An educational typing tutor for children.
-Exec=tuxtype2
-Icon=tuxtype.png
+Exec=tuxtype
+Icon=tuxtype
 Terminal=false
 Type=Application
 Encoding=UTF-8
 Categories=Game;Application;
 EOF
 
-convert -size 48x48 tuxtype2.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/tuxtype.png
+convert -size 48x48 tuxtype.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/tuxtype.png
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ \
 		     --add-category X-Fedora \
 		     --vendor fedora \
@@ -59,13 +58,22 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO tuxtype/docs/en/howtotheme.html
+%doc AUTHORS COPYING ChangeLog README TODO tuxtype/docs/en/howtotheme.html tuxtype/docs/en/TuxType_port_Mac.txt
 %{_bindir}/*
-%{_datadir}/%{name}
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
+%{_datadir}/tuxtype
 
 %changelog
+* Mon Sep 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5.17-1
+- update to 1.5.17 (incorporate Jonathan Dieter's changes)
+
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5.3-4
+- fix license tag
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.5.3-3
+- Autorebuild for GCC 4.3
+
 * Mon Aug 28 2006 Steven Pritchard <steve at kspei.com> 1.5.3-2
 - Rebuild.
 - Use "make install DESTDIR=..." instead of the macro.



From spot at fedoraproject.org  Mon Sep 15 16:55:56 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 15 Sep 2008 16:55:56 +0000 (UTC)
Subject: rpms/tuxtype2/F-9 sources,1.3,1.4 tuxtype2.spec,1.10,1.11
Message-ID: <20080915165556.9BEFD70137@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tuxtype2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6743/F-9

Modified Files:
	sources tuxtype2.spec 
Log Message:
update stable branches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuxtype2/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Feb 2006 20:39:22 -0000	1.3
+++ sources	15 Sep 2008 16:55:26 -0000	1.4
@@ -1 +1 @@
-ca04e65d3b19ddeeedb8a49147ed642b  tuxtype2-1.5.3.tar.bz2
+c2db518f7475e5be5b00a341022883d8  tuxtype_w_fonts-1.5.17.tar.gz


Index: tuxtype2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxtype2/F-9/tuxtype2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tuxtype2.spec	20 Feb 2008 03:12:09 -0000	1.10
+++ tuxtype2.spec	15 Sep 2008 16:55:26 -0000	1.11
@@ -1,15 +1,15 @@
 Name:           tuxtype2
-Version:        1.5.3
-Release:        3%{?dist}
+Version:        1.5.17
+Release:        1%{?dist}
 
 Summary:        Tux Typing, an educational typing tutor for children
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://tuxtype.sourceforge.net/
-Source0:        http://dl.sf.net/tuxtype/%{name}-%{version}.tar.bz2
+Source0:        http://alioth.debian.org/tuxtype_w_fonts-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  SDL-devel >= 1.2.5, SDL_image-devel, SDL_mixer-devel
+BuildRequires:  SDL-devel >= 1.2.5, SDL_image-devel, SDL_mixer-devel, SDL_Pango-devel
 BuildRequires:  SDL_ttf-devel, ImageMagick, desktop-file-utils
 BuildRequires:  automake, autoconf
 
@@ -19,12 +19,10 @@
 
 
 %prep
-%setup -q
+%setup -q -n tuxtype_w_fonts-%{version}
 
 
 %build
-aclocal
-autoconf
 %configure
 make %{?_smp_mflags}
 
@@ -32,6 +30,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT/%{_usr}/doc
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
@@ -40,15 +39,15 @@
 [Desktop Entry]
 Name=Tux Typing
 Comment=An educational typing tutor for children.
-Exec=tuxtype2
-Icon=tuxtype.png
+Exec=tuxtype
+Icon=tuxtype
 Terminal=false
 Type=Application
 Encoding=UTF-8
 Categories=Game;Application;
 EOF
 
-convert -size 48x48 tuxtype2.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/tuxtype.png
+convert -size 48x48 tuxtype.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/tuxtype.png
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ \
 		     --add-category X-Fedora \
 		     --vendor fedora \
@@ -59,13 +58,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO tuxtype/docs/en/howtotheme.html
+%doc AUTHORS COPYING ChangeLog README TODO tuxtype/docs/en/howtotheme.html tuxtype/docs/en/TuxType_port_Mac.txt
 %{_bindir}/*
-%{_datadir}/%{name}
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
+%{_datadir}/tuxtype
 
 %changelog
+* Mon Sep 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5.17-1
+- update to 1.5.17 (incorporate Jonathan Dieter's changes)
+
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5.3-4
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.5.3-3
 - Autorebuild for GCC 4.3
 



From s4504kr at fedoraproject.org  Mon Sep 15 17:01:45 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon, 15 Sep 2008 17:01:45 +0000 (UTC)
Subject: rpms/highlight/F-8 highlight.spec,1.30,1.31
Message-ID: <20080915170145.5E9F070137@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7542

Modified Files:
	highlight.spec 
Log Message:
Remove unnec. requieres and provides


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-8/highlight.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- highlight.spec	8 Sep 2008 15:44:14 -0000	1.30
+++ highlight.spec	15 Sep 2008 17:01:15 -0000	1.31
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
 Version:	2.6.12
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		Development/Tools
 License:	GPLv2
@@ -26,6 +26,23 @@
 %setup -q
 %patch1 -p1 -b .mak
 
+# Provides: exclude perl(highlight_pipe) from example
+cat <<__EOF__ > %{name}-perl.prov
+#!/bin/sh
+/usr/lib/rpm/perl.prov \$* | grep -v '^perl(highlight_pipe)$'
+__EOF__
+%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-perl.prov
+chmod +x %{__perl_provides}
+
+# Requires: exclude perl(IPC::Open3) from example
+cat <<__EOF__ > %{name}-perl.req
+#!/bin/sh
+/usr/lib/rpm/perl.req \$* | grep -v '^perl(IPC::Open3)$'
+__EOF__
+%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-perl.req
+chmod +x %{__perl_requires}
+
+
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
 
@@ -34,6 +51,10 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# Packaging this example causes lots of incorrect perl provides and 
+# requires. Since it isn't going to work out of the box, I'm nuking it.
+rm -rf examples/plugins/movabletype
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -49,6 +70,11 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.12-2
+- don't package broken examples, causes bogus perl provides/requires
+- don't claim to Provide: perl(highlight_pipe)
+- don't claim to Requires: perl(IPC::Open3)
+
 * Mon Aug 18 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.12-1
 - New upstream release
 



From pkgdb at fedoraproject.org  Mon Sep 15 17:05:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 17:05:08 +0000
Subject: [pkgdb] Django: smilner has requested watchcommits
Message-ID: <20080915170509.0287B208DA3@bastion.fedora.phx.redhat.com>

smilner 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  Mon Sep 15 17:05:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 17:05:08 +0000
Subject: [pkgdb] Django: smilner has requested watchbugzilla
Message-ID: <20080915170508.88BB3208D9F@bastion.fedora.phx.redhat.com>

smilner 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  Mon Sep 15 17:05:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 17:05:13 +0000
Subject: [pkgdb] Django: smilner has requested commit
Message-ID: <20080915170513.366C2208DA6@bastion.fedora.phx.redhat.com>

smilner 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  Mon Sep 15 17:05:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 17:05:15 +0000
Subject: [pkgdb] Django: smilner has requested approveacls
Message-ID: <20080915170516.03ADF208DA9@bastion.fedora.phx.redhat.com>

smilner 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  Mon Sep 15 17:05:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 17:05:18 +0000
Subject: [pkgdb] Django: smilner has given up approveacls
Message-ID: <20080915170518.451A3208DAC@bastion.fedora.phx.redhat.com>

smilner has given up 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  Mon Sep 15 17:05:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 17:05:27 +0000
Subject: [pkgdb] Django: smilner has requested watchbugzilla
Message-ID: <20080915170527.95D43208DAF@bastion.fedora.phx.redhat.com>

smilner has requested the watchbugzilla acl on Django (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Mon Sep 15 17:05:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 17:05:29 +0000
Subject: [pkgdb] Django: smilner has requested commit
Message-ID: <20080915170529.A89722E0005@bastion.fedora.phx.redhat.com>

smilner has requested the commit acl on Django (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Mon Sep 15 17:05:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 17:05:27 +0000
Subject: [pkgdb] Django: smilner has requested watchcommits
Message-ID: <20080915170528.0E6552E0002@bastion.fedora.phx.redhat.com>

smilner has requested the watchcommits acl on Django (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Mon Sep 15 17:05:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 17:05:30 +0000
Subject: [pkgdb] Django: smilner has requested watchbugzilla
Message-ID: <20080915170530.CA47F2E0008@bastion.fedora.phx.redhat.com>

smilner has requested the watchbugzilla acl on Django (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Mon Sep 15 17:05:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 17:05:31 +0000
Subject: [pkgdb] Django: smilner has requested watchcommits
Message-ID: <20080915170531.75A552E000B@bastion.fedora.phx.redhat.com>

smilner has requested the watchcommits acl on Django (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Mon Sep 15 17:05:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 17:05:33 +0000
Subject: [pkgdb] Django: smilner has requested commit
Message-ID: <20080915170533.1F6442E000F@bastion.fedora.phx.redhat.com>

smilner has requested the commit acl on Django (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Mon Sep 15 17:05:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 17:05:41 +0000
Subject: [pkgdb] Django: smilner has requested watchbugzilla
Message-ID: <20080915170541.C32DA208DA2@bastion.fedora.phx.redhat.com>

smilner 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  Mon Sep 15 17:05:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 17:05:43 +0000
Subject: [pkgdb] Django: smilner has requested watchcommits
Message-ID: <20080915170543.A86512E0011@bastion.fedora.phx.redhat.com>

smilner 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  Mon Sep 15 17:05:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 15 Sep 2008 17:05:45 +0000
Subject: [pkgdb] Django: smilner has requested commit
Message-ID: <20080915170545.3770A2E0013@bastion.fedora.phx.redhat.com>

smilner 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 thias at fedoraproject.org  Mon Sep 15 17:07:50 2008
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 15 Sep 2008 17:07:50 +0000 (UTC)
Subject: rpms/csmash/devel csmash.desktop,1.1,1.2 csmash.spec,1.19,1.20
Message-ID: <20080915170750.99BD270137@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/csmash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8457

Modified Files:
	csmash.desktop csmash.spec 
Log Message:
Fix desktop file (#462261) and convert README file to UTF-8.



Index: csmash.desktop
===================================================================
RCS file: /cvs/extras/rpms/csmash/devel/csmash.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csmash.desktop	20 Jun 2007 10:55:01 -0000	1.1
+++ csmash.desktop	15 Sep 2008 17:07:20 -0000	1.2
@@ -5,5 +5,5 @@
 Icon=csmash
 Terminal=false
 Type=Application
-Categories=Game;
+Categories=Game;SportsGame;
 Encoding=UTF-8


Index: csmash.spec
===================================================================
RCS file: /cvs/extras/rpms/csmash/devel/csmash.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- csmash.spec	20 Feb 2008 04:01:47 -0000	1.19
+++ csmash.spec	15 Sep 2008 17:07:20 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: 3D tabletennis game
 Name: csmash
 Version: 0.6.6
-Release: 18
+Release: 19
 License: GPLv2+
 Group: Amusements/Games
 URL: http://cannonsmash.sourceforge.net/
@@ -35,6 +35,11 @@
 %patch2 -p1 -b .configure
 %patch3 -p1 -b .datadir
 autoreconf --force --install -Im4
+# Convert to UTF-8 while keeping the original timestamps
+iconv -f iso8859-1 -t utf-8 README > tmp
+touch -r README tmp
+mv -f tmp README
+chmod 0644 README
 
 
 %build
@@ -82,7 +87,11 @@
 
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.6.6-18
+* Mon Sep 15 2008 Matthias Saou <http://freshrpms.net/> 0.6.6-19
+- Fix desktop file (#462261).
+- Convert README file to UTF-8.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
 - Autorebuild for GCC 4.3
 
 * Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 0.6.6-17



From jkratoch at fedoraproject.org  Mon Sep 15 17:16:52 2008
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 15 Sep 2008 17:16:52 +0000 (UTC)
Subject: rpms/binutils/devel binutils.spec,1.137,1.138
Message-ID: <20080915171652.8EEB070137@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9721

Modified Files:
	binutils.spec 
Log Message:
* Mon Sep 15 2008 Jan Kratochvil <jan.kratochvil at redhat.com> 2.18.50.0.9-2
- Package review, analysed by Jon Ciesla and Patrice Dumas (BZ 225615).
 - build back in the sourcedir without problems as gasp is no longer included.
 - Fix the install-info requirement.
 - Drop the needless gzipping of the info files.
 - Provide Obsoletes versions.
 - Use the %configure macro.



Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- binutils.spec	30 Aug 2008 18:28:42 -0000	1.137
+++ binutils.spec	15 Sep 2008 17:16:21 -0000	1.138
@@ -14,10 +14,10 @@
 %define enable_shared 0
 %endif
 
-Summary: A GNU collection of binary utilities.
+Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.18.50.0.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -49,9 +49,10 @@
 BuildRequires: zlib-static
 %endif
 Conflicts: gcc-c++ < 4.0.0
-Prereq: /sbin/install-info
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 %ifarch ia64
-Obsoletes: gnupro
+Obsoletes: gnupro <= 1117-1
 %endif
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
@@ -76,7 +77,8 @@
 Summary: BFD and opcodes static libraries and header files
 Group: System Environment/Libraries
 Conflicts: binutils < 2.17.50.0.3-4
-Prereq: /sbin/install-info
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description devel
 This package contains BFD and opcodes static libraries and associated
@@ -142,9 +144,6 @@
   ;;
 esac
 
-mkdir build-%{binutils_target}
-cd build-%{binutils_target}
-
 %if 0%{?_with_debug:1}
 CFLAGS="$CFLAGS -O0 -ggdb2"
 %define enable_shared 0
@@ -152,10 +151,8 @@
 
 # We could optimize the cross builds size by --enable-shared but the produced
 # binaries may be less convenient in the embedded environment.
-CC="gcc -L`pwd`/bfd/.libs/" ../configure \
-%if %{isnative}
-  %{binutils_target} \
-%else
+%configure \
+%if !%{isnative}
   --target %{binutils_target} --enable-targets=%{_host} \
   --with-sysroot=%{_prefix}/%{binutils_target}/sys-root \
 %endif
@@ -165,12 +162,7 @@
   --disable-shared \
 %endif
   $CARGS \
-  --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
-  --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
-  --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \
-  --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \
-  --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
-  --infodir=%{_infodir} --disable-werror \
+  --disable-werror \
   --with-bugurl=http://bugzilla.redhat.com/bugzilla/
 make %{_smp_mflags} tooldir=%{_prefix} all
 make %{_smp_mflags} tooldir=%{_prefix} info
@@ -184,17 +176,13 @@
 echo ====================TESTING=========================
 cat check.log
 echo ====================TESTING END=====================
-cd ..
 %endif
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_prefix}
-cd build-%{binutils_target}
 %makeinstall
 %if %{isnative}
 make prefix=%{buildroot}%{_prefix} infodir=%{buildroot}%{_infodir} install-info
-gzip -q9f %{buildroot}%{_infodir}/*.info*
 
 # Rebuild libiberty.a with -fPIC.
 # Future: Remove it together with its header file, projects should bundle it.
@@ -209,7 +197,7 @@
 
 install -m 644 bfd/libbfd.a %{buildroot}%{_prefix}/%{_lib}
 install -m 644 libiberty/libiberty.a %{buildroot}%{_prefix}/%{_lib}
-install -m 644 ../include/libiberty.h %{buildroot}%{_prefix}/include
+install -m 644 include/libiberty.h %{buildroot}%{_prefix}/include
 # Remove Windows/Novell only man pages
 rm -f %{buildroot}%{_mandir}/man1/{dlltool,nlmconv,windres}*
 
@@ -239,7 +227,7 @@
     -e 's/^#define BFD_HOST_U_64_BIT unsigned \(long \)\?long *$/#define BFD_HOST_U_64_BIT unsigned BFD_HOST_64_BIT/' \
     %{buildroot}%{_prefix}/include/bfd.h
 %endif
-touch -r ../bfd/bfd-in2.h %{buildroot}%{_prefix}/include/bfd.h
+touch -r bfd/bfd-in2.h %{buildroot}%{_prefix}/include/bfd.h
 
 %else # !%{isnative}
 # For cross-binutils we drop the documentation.
@@ -254,7 +242,6 @@
 rm -f %{buildroot}%{_infodir}/dir
 rm -rf %{buildroot}%{_prefix}/%{binutils_target}
 
-cd ..
 %find_lang %{?cross}binutils
 %find_lang %{?cross}opcodes
 %find_lang %{?cross}bfd
@@ -273,38 +260,38 @@
 %if %{isnative}
 %post
 /sbin/ldconfig
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/configure.info.gz
+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info
+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info
+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info
+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info
+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info
+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/configure.info
 exit 0
 
 %preun
 if [ $1 = 0 ] ;then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/configure.info.gz
+  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info
+  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info
+  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info
+  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info
+  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info
+  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/configure.info
 fi
 exit 0
 
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info
 
 %preun devel
 if [ $1 = 0 ] ;then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
+  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info
 fi
 %endif # %{isnative}
 
 %files -f %{?cross}binutils.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README
 %{_prefix}/bin/*
 %{_mandir}/man1/*
@@ -316,13 +303,21 @@
 %{_infodir}/binutils*info*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_prefix}/include/*
 %{_prefix}/%{_lib}/lib*.a
 %{_infodir}/bfd*info*
 %endif # %{isnative}
 
 %changelog
+* Mon Sep 15 2008 Jan Kratochvil <jan.kratochvil at redhat.com> 2.18.50.0.9-2
+- Package review, analysed by Jon Ciesla and Patrice Dumas (BZ 225615).
+ - build back in the sourcedir without problems as gasp is no longer included.
+ - Fix the install-info requirement.
+ - Drop the needless gzipping of the info files.
+ - Provide Obsoletes versions.
+ - Use the %%configure macro.
+
 * Sat Aug 30 2008 Jan Kratochvil <jan.kratochvil at redhat.com> 2.18.50.0.9-1
 - Update to 2.18.50.0.9.
   - Drop the ppc-only spu target pre-build stage (BZ 455242).



From mtasaka at fedoraproject.org  Mon Sep 15 17:22:34 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 15 Sep 2008 17:22:34 +0000 (UTC)
Subject: rpms/jd/F-8 jd-2.0.1-cookie-change.patch, NONE, 1.1 jd.spec, 1.319, 
	1.320
Message-ID: <20080915172234.5F7A170137@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10650/F-8

Modified Files:
	jd.spec 
Added Files:
	jd-2.0.1-cookie-change.patch 
Log Message:
* Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
- Patch to cope with occasional cookie change


jd-2.0.1-cookie-change.patch:

--- NEW FILE jd-2.0.1-cookie-change.patch ---
Index: src/message/post.cpp
===================================================================
--- src/message/post.cpp	(revision 2342)
+++ src/message/post.cpp	(working copy)
@@ -201,6 +201,7 @@
     std::string tag_2ch;
     std::string msg;
     std::string hana;
+    std::string cookie_type, cookie_value;
     std::string conf;
 
     bool ret;
@@ -266,6 +267,16 @@
     regex.exec( ".*<input +type=hidden +name=\"?hana\"? +value=\"?([^\"]*)\"?.*", str, 0, false, false );
     hana = MISC::remove_space( regex.str( 1 ) );
 
+    // 2ch ??? hana ???????????????
+    // ??????????????????????????????
+    regex.exec( ".*<input +type=hidden +name=\"([^\"]+)\" +value=\"[^\"]+\".*", str, 0, false, false );
+    cookie_type = MISC::remove_space( regex.str( 1 ) );
+    regex.exec( ".*<input +type=hidden +name=\"[^\"]+\" +value=\"([^\"]+)\".*", str, 0, false, false );
+    cookie_value = MISC::remove_space( regex.str( 1 ) );
+
+    if( m_msg.find( cookie_type + "=" ) == std::string::npos ) 
+	m_msg += "&" + cookie_type + "=" + cookie_value;
+
 #ifdef _DEBUG
     std::cout << "TITLE: [" << title << "]\n";
     std::cout << "2ch_X: [" << tag_2ch << "]\n";


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -r1.319 -r1.320
--- jd.spec	14 Sep 2008 14:00:47 -0000	1.319
+++ jd.spec	15 Sep 2008 17:22:03 -0000	1.320
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -51,6 +51,7 @@
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Patch0:		jd-2.0.1-cookie-change.patch
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -74,6 +75,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
+%patch0 -p0 -b .cookie
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %if 0%{?fedora} >= 10
@@ -135,6 +137,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
+- Patch to cope with occasional cookie change
+
 * Sun Sep 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-1
 - 2.0.1
 



From mtasaka at fedoraproject.org  Mon Sep 15 17:22:34 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 15 Sep 2008 17:22:34 +0000 (UTC)
Subject: rpms/jd/F-9 jd-2.0.1-cookie-change.patch, NONE, 1.1 jd.spec, 1.330, 
	1.331
Message-ID: <20080915172234.B106570137@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10650/F-9

Modified Files:
	jd.spec 
Added Files:
	jd-2.0.1-cookie-change.patch 
Log Message:
* Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
- Patch to cope with occasional cookie change


jd-2.0.1-cookie-change.patch:

--- NEW FILE jd-2.0.1-cookie-change.patch ---
Index: src/message/post.cpp
===================================================================
--- src/message/post.cpp	(revision 2342)
+++ src/message/post.cpp	(working copy)
@@ -201,6 +201,7 @@
     std::string tag_2ch;
     std::string msg;
     std::string hana;
+    std::string cookie_type, cookie_value;
     std::string conf;
 
     bool ret;
@@ -266,6 +267,16 @@
     regex.exec( ".*<input +type=hidden +name=\"?hana\"? +value=\"?([^\"]*)\"?.*", str, 0, false, false );
     hana = MISC::remove_space( regex.str( 1 ) );
 
+    // 2ch ??? hana ???????????????
+    // ??????????????????????????????
+    regex.exec( ".*<input +type=hidden +name=\"([^\"]+)\" +value=\"[^\"]+\".*", str, 0, false, false );
+    cookie_type = MISC::remove_space( regex.str( 1 ) );
+    regex.exec( ".*<input +type=hidden +name=\"[^\"]+\" +value=\"([^\"]+)\".*", str, 0, false, false );
+    cookie_value = MISC::remove_space( regex.str( 1 ) );
+
+    if( m_msg.find( cookie_type + "=" ) == std::string::npos ) 
+	m_msg += "&" + cookie_type + "=" + cookie_value;
+
 #ifdef _DEBUG
     std::cout << "TITLE: [" << title << "]\n";
     std::cout << "2ch_X: [" << tag_2ch << "]\n";


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -r1.330 -r1.331
--- jd.spec	14 Sep 2008 14:00:47 -0000	1.330
+++ jd.spec	15 Sep 2008 17:22:04 -0000	1.331
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -51,6 +51,7 @@
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Patch0:		jd-2.0.1-cookie-change.patch
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -74,6 +75,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
+%patch0 -p0 -b .cookie
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %if 0%{?fedora} >= 10
@@ -135,6 +137,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
+- Patch to cope with occasional cookie change
+
 * Sun Sep 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-1
 - 2.0.1
 



From mtasaka at fedoraproject.org  Mon Sep 15 17:22:35 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 15 Sep 2008 17:22:35 +0000 (UTC)
Subject: rpms/jd/devel jd-2.0.1-cookie-change.patch, NONE, 1.1 jd.spec, 1.340,
	1.341
Message-ID: <20080915172235.186DD70137@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10650/devel

Modified Files:
	jd.spec 
Added Files:
	jd-2.0.1-cookie-change.patch 
Log Message:
* Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
- Patch to cope with occasional cookie change


jd-2.0.1-cookie-change.patch:

--- NEW FILE jd-2.0.1-cookie-change.patch ---
Index: src/message/post.cpp
===================================================================
--- src/message/post.cpp	(revision 2342)
+++ src/message/post.cpp	(working copy)
@@ -201,6 +201,7 @@
     std::string tag_2ch;
     std::string msg;
     std::string hana;
+    std::string cookie_type, cookie_value;
     std::string conf;
 
     bool ret;
@@ -266,6 +267,16 @@
     regex.exec( ".*<input +type=hidden +name=\"?hana\"? +value=\"?([^\"]*)\"?.*", str, 0, false, false );
     hana = MISC::remove_space( regex.str( 1 ) );
 
+    // 2ch ??? hana ???????????????
+    // ??????????????????????????????
+    regex.exec( ".*<input +type=hidden +name=\"([^\"]+)\" +value=\"[^\"]+\".*", str, 0, false, false );
+    cookie_type = MISC::remove_space( regex.str( 1 ) );
+    regex.exec( ".*<input +type=hidden +name=\"[^\"]+\" +value=\"([^\"]+)\".*", str, 0, false, false );
+    cookie_value = MISC::remove_space( regex.str( 1 ) );
+
+    if( m_msg.find( cookie_type + "=" ) == std::string::npos ) 
+	m_msg += "&" + cookie_type + "=" + cookie_value;
+
 #ifdef _DEBUG
     std::cout << "TITLE: [" << title << "]\n";
     std::cout << "2ch_X: [" << tag_2ch << "]\n";


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- jd.spec	14 Sep 2008 14:00:48 -0000	1.340
+++ jd.spec	15 Sep 2008 17:22:04 -0000	1.341
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -51,6 +51,7 @@
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Patch0:		jd-2.0.1-cookie-change.patch
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -74,6 +75,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
+%patch0 -p0 -b .cookie
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %if 0%{?fedora} >= 10
@@ -135,6 +137,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
+- Patch to cope with occasional cookie change
+
 * Sun Sep 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-1
 - 2.0.1
 



From rmeggins at fedoraproject.org  Mon Sep 15 17:38:07 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Mon, 15 Sep 2008 17:38:07 +0000 (UTC)
Subject: rpms/fedora-ds-admin/devel fedora-ds-admin.spec,1.4,1.5
Message-ID: <20080915173807.BFC1670138@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13582

Modified Files:
	fedora-ds-admin.spec 
Log Message:
patch for bug 451702 not required anymore - in upstream now



Index: fedora-ds-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/fedora-ds-admin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-ds-admin.spec	4 Sep 2008 14:53:00 -0000	1.4
+++ fedora-ds-admin.spec	15 Sep 2008 17:37:37 -0000	1.5
@@ -4,7 +4,7 @@
 Summary:          Fedora Administration Server (admin)
 Name:             fedora-ds-admin
 Version:          1.1.6
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -36,7 +36,6 @@
 Source0:          http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2
 # fedora-ds-cvs.sh should be used to generate the source tarball from CVS
 Source1:          %{name}-cvs.sh
-Patch0:           bug451702.patch
 
 %description
 Fedora Administration Server is an HTTP agent that provides management features
@@ -46,7 +45,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0
 
 %build
 %configure --disable-rpath
@@ -104,6 +102,9 @@
 %{_libdir}/%{pkgname}
 
 %changelog
+* Mon Sep 15 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.6-2
+- patch for bug 451702 not required anymore - in upstream now
+
 * Wed Jul  2 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.6-1
 - add patch for bug 451702
 - The 1.1.6 release



From dwalluck at fedoraproject.org  Mon Sep 15 17:46:42 2008
From: dwalluck at fedoraproject.org (David Walluck)
Date: Mon, 15 Sep 2008 17:46:42 +0000 (UTC)
Subject: rpms/tomcat5/F-8 tomcat5.spec,1.112,1.113
Message-ID: <20080915174642.4167170137@cvs1.fedora.phx.redhat.com>

Author: dwalluck

Update of /cvs/pkgs/rpms/tomcat5/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15338

Modified Files:
	tomcat5.spec 
Log Message:
- fix commons-io version requirements


Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/F-8/tomcat5.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- tomcat5.spec	15 Sep 2008 16:34:27 -0000	1.112
+++ tomcat5.spec	15 Sep 2008 17:46:11 -0000	1.113
@@ -128,7 +128,7 @@
 BuildRequires: jakarta-commons-dbcp >= 0:1.2.1
 BuildRequires: jakarta-commons-digester >= 0:1.7
 BuildRequires: jakarta-commons-fileupload >= 0:1.0
-BuildRequires: jakarta-commons-io >= 0:1.3.2
+BuildRequires: jakarta-commons-io >= 0:1.2
 BuildRequires: jakarta-commons-logging >= 0:1.0.4
 BuildRequires: jakarta-commons-modeler >= 2.0
 BuildRequires: jakarta-commons-pool >= 0:1.2
@@ -183,7 +183,7 @@
 Requires: xml-commons-apis >= 1.3
 # jakarta-commons packages
 Requires: jakarta-commons-daemon >= 1.0.1
-Requires: jakarta-commons-io >= 1.3.2
+Requires: jakarta-commons-io >= 0:1.2
 Requires: jakarta-commons-launcher >= 0:0.9
 # alternatives
 Requires: java-devel >= 0:1.4.2
@@ -1172,7 +1172,6 @@
 %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/bootstrap*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/commons-daemon*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-io*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/commons-logging-api*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-juli*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-jkstatus-ant*



From pwouters at fedoraproject.org  Mon Sep 15 17:51:54 2008
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Mon, 15 Sep 2008 17:51:54 +0000 (UTC)
Subject: rpms/sshfp/EL-5 sources,1.4,1.5 sshfp.spec,1.3,1.4
Message-ID: <20080915175154.8D8F870137@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/sshfp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16653

Modified Files:
	sources sshfp.spec 
Log Message:
updated to 1.1.3



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sshfp/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Apr 2007 17:58:08 -0000	1.4
+++ sources	15 Sep 2008 17:51:23 -0000	1.5
@@ -1,3 +1,4 @@
 a96cb60af373ab18c260cb1b202c6240  sshfp-1.1.0.tar.gz
 5424ed55c50d2038934940737680e8da  sshfp-1.1.1.tar.gz
 807626e651a0a7619f67eb088eb04ece  sshfp-1.1.2.tar.gz
+c354b2f7d7c910fd75e3f16f05d8007b  sshfp-1.1.3.tar.gz


Index: sshfp.spec
===================================================================
RCS file: /cvs/extras/rpms/sshfp/EL-5/sshfp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sshfp.spec	9 Apr 2007 17:58:08 -0000	1.3
+++ sshfp.spec	15 Sep 2008 17:51:24 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: Generate SSHFP DNS records from knownhosts files or ssh-keyscan
 Name: sshfp
-Version: 1.1.2
+Version: 1.1.3
 Release: 1%{?dist}
 License: GPL
 Url: http://www.xelerance.com/software/%{name}
@@ -40,6 +40,9 @@
 %doc %{_mandir}/man1/*
 
 %changelog
+* Mon Sep 15 2008 Paul Wouters <paul at xelerance.com> - 1.1.3-1
+- Upgraded to 1.1.3
+
 * Mon Apr  9 2007 Paul Wouters <paul at xelerance.com> - 1.1.2-1
 - Upgraded to 1.1.2
 



From pwouters at fedoraproject.org  Mon Sep 15 17:54:46 2008
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Mon, 15 Sep 2008 17:54:46 +0000 (UTC)
Subject: rpms/sshfp/EL-5 sshfp.spec,1.4,1.5
Message-ID: <20080915175446.5719F70137@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/sshfp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17455

Modified Files:
	sshfp.spec 
Log Message:
bump due to commit problems



Index: sshfp.spec
===================================================================
RCS file: /cvs/extras/rpms/sshfp/EL-5/sshfp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sshfp.spec	15 Sep 2008 17:51:24 -0000	1.4
+++ sshfp.spec	15 Sep 2008 17:54:15 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Generate SSHFP DNS records from knownhosts files or ssh-keyscan
 Name: sshfp
 Version: 1.1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Url: http://www.xelerance.com/software/%{name}
 Source: ftp://ftp.xelerance.com/%{name}/%{name}-%{version}.tar.gz
@@ -40,7 +40,7 @@
 %doc %{_mandir}/man1/*
 
 %changelog
-* Mon Sep 15 2008 Paul Wouters <paul at xelerance.com> - 1.1.3-1
+* Mon Sep 15 2008 Paul Wouters <paul at xelerance.com> - 1.1.3-2
 - Upgraded to 1.1.3
 
 * Mon Apr  9 2007 Paul Wouters <paul at xelerance.com> - 1.1.2-1



From remi at fedoraproject.org  Mon Sep 15 17:55:08 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 15 Sep 2008 17:55:08 +0000 (UTC)
Subject: rpms/glpi/devel .cvsignore, 1.10, 1.11 glpi.spec, 1.17, 1.18 sources,
	1.12, 1.13
Message-ID: <20080915175508.3A11B70137@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17629

Modified Files:
	.cvsignore glpi.spec sources 
Log Message:
update to 0.71.2 (bugfixes)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	1 Aug 2008 16:33:39 -0000	1.10
+++ .cvsignore	15 Sep 2008 17:54:37 -0000	1.11
@@ -1 +1 @@
-glpi-0.71.1.tar.gz
+glpi-0.71.2.tar.gz


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/glpi.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- glpi.spec	9 Aug 2008 12:49:08 -0000	1.17
+++ glpi.spec	15 Sep 2008 17:54:37 -0000	1.18
@@ -5,8 +5,8 @@
 %endif
 
 Name:           glpi
-Version:        0.71.1
-Release:        2%{?dist}
+Version:        0.71.2
+Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
@@ -228,6 +228,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.2-1
+- update to 0.71.1 bugfix
+
 * Sat Aug 09 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.1-2
 - fix SElinux bug on install test (glpi-check.patch)
 - add create option on logrotate conf


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	1 Aug 2008 16:33:39 -0000	1.12
+++ sources	15 Sep 2008 17:54:37 -0000	1.13
@@ -1 +1 @@
-b490c23a0fe5388da6ad6bcb51b65e0f  glpi-0.71.1.tar.gz
+404265b0efa8300a0f303665ff2c741b  glpi-0.71.2.tar.gz



From ausil at fedoraproject.org  Mon Sep 15 17:55:45 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 15 Sep 2008 17:55:45 +0000 (UTC)
Subject: rpms/mysql-gui-tools/devel gtk_deprecated_typedefs.patch, NONE,
	1.1 mysql-gui-tools.spec, 1.9, 1.10
Message-ID: <20080915175545.A1B0570137@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mysql-gui-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17760

Modified Files:
	mysql-gui-tools.spec 
Added Files:
	gtk_deprecated_typedefs.patch 
Log Message:
add patch from Pavel Alexeev fixing FTBFS


gtk_deprecated_typedefs.patch:

--- NEW FILE gtk_deprecated_typedefs.patch ---
diff -NaurEbBH mysql-gui-tools-5.0r12.ORIG/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in
--- mysql-gui-tools-5.0r12.ORIG/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in	2008-09-15 03:03:13.000000000 +0400
+++ mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in	2008-09-15 12:28:00.000000000 +0400
@@ -202,8 +202,6 @@
 INCLUDES = \
 	-DDATADIR=\""$(datadir)"\" 	\
 	-DG_LOG_DOMAIN=\"GtkSourceView\"\
-	-DG_DISABLE_DEPRECATED 		\
-	-DGTK_DISABLE_DEPRECATED 	\
 	-DGDK_DISABLE_DEPRECATED 	\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
 	-I$(top_srcdir) -I$(srcdir) 	\


Index: mysql-gui-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-gui-tools/devel/mysql-gui-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mysql-gui-tools.spec	8 Jul 2008 19:46:55 -0000	1.9
+++ mysql-gui-tools.spec	15 Sep 2008 17:55:15 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           mysql-gui-tools
 Version:        5.0r12
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        GUI tools to manage mysql Databases
 
 Group:          Applications/Databases
@@ -8,11 +8,12 @@
 URL:            http://www.mysql.com/products/tools/administrator/index.html
 Source0:        http://dev.mysql.com/get/Downloads/MySQLAdministrationSuite/mysql-gui-tools-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:         mysql-administrator-1.1.5-shellbang.patch
+Patch0:         mysql-gui-tools-5.0r12-DEBUG.patch
 Patch1:		mysql-query-browser-default_schema_infinite_loop.patch
 Patch2:		mysql-gui-tools-5.0_p12-gcc-4.3.patch
 Patch3:         mysql-gui-tools-5.0_p12-libsigc++-2.2.patch
 Patch4:         mysql-gui-tools-gtksourceview-cflags.patch
+Patch5:         gtk_deprecated_typedefs.patch
 
 BuildRequires:  libglade2-devel, gtkmm24-devel >= 2.6 , pcre-devel, mysql-devel >= 4.0
 BuildRequires:  openssl-devel, gtkhtml3-devel, desktop-file-utils, gettext
@@ -72,6 +73,7 @@
 %patch2 -p0 -b .gcc43
 %patch3 -p1 -b .sigc++
 %patch4 -p1
+%patch5 -p1
 
 %build
 pushd  mysql-gui-common
@@ -176,6 +178,10 @@
 
 
 %changelog
+* Mon Sep 15 2008 Dennis Gilmore <dennis at ausil.us> - 5.0r12-9
+- apply patch from Pavel Alexeev for gtk 
+- bugzilla #433987
+
 * Tue Jul 08 2008 Dennis Gilmore <dennis at ausil.us> - 5.0r12-8
 - apply patch for gcc-4.3  from gentoo
 - use openjdk for building 



From remi at fedoraproject.org  Mon Sep 15 17:59:51 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 15 Sep 2008 17:59:51 +0000 (UTC)
Subject: rpms/glpi/F-9 glpi.spec,1.17,1.18 sources,1.12,1.13
Message-ID: <20080915175952.01ED270137@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19036

Modified Files:
	glpi.spec sources 
Log Message:
update to 0.71.2 (bugfixes)


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-9/glpi.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- glpi.spec	9 Aug 2008 12:59:00 -0000	1.17
+++ glpi.spec	15 Sep 2008 17:59:21 -0000	1.18
@@ -5,8 +5,8 @@
 %endif
 
 Name:           glpi
-Version:        0.71.1
-Release:        2%{?dist}
+Version:        0.71.2
+Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
@@ -228,6 +228,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.2-1
+- update to 0.71.1 bugfix
+
 * Sat Aug 09 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.1-2
 - fix SElinux bug on install test (glpi-check.patch)
 - add create option on logrotate conf


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	1 Aug 2008 16:44:35 -0000	1.12
+++ sources	15 Sep 2008 17:59:21 -0000	1.13
@@ -1 +1 @@
-b490c23a0fe5388da6ad6bcb51b65e0f  glpi-0.71.1.tar.gz
+404265b0efa8300a0f303665ff2c741b  glpi-0.71.2.tar.gz



From remi at fedoraproject.org  Mon Sep 15 18:04:21 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 15 Sep 2008 18:04:21 +0000 (UTC)
Subject: rpms/glpi/F-8 glpi.spec,1.13,1.14 sources,1.11,1.12
Message-ID: <20080915180421.2C12670137@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20164

Modified Files:
	glpi.spec sources 
Log Message:
update to 0.71.2 (bugfixes)


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-8/glpi.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- glpi.spec	9 Aug 2008 13:04:44 -0000	1.13
+++ glpi.spec	15 Sep 2008 18:03:50 -0000	1.14
@@ -5,8 +5,8 @@
 %endif
 
 Name:           glpi
-Version:        0.71.1
-Release:        2%{?dist}
+Version:        0.71.2
+Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
@@ -228,6 +228,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.2-1
+- update to 0.71.1 bugfix
+
 * Sat Aug 09 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.1-2
 - fix SElinux bug on install test (glpi-check.patch)
 - add create option on logrotate conf


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-8/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Aug 2008 16:53:31 -0000	1.11
+++ sources	15 Sep 2008 18:03:50 -0000	1.12
@@ -1 +1 @@
-b490c23a0fe5388da6ad6bcb51b65e0f  glpi-0.71.1.tar.gz
+404265b0efa8300a0f303665ff2c741b  glpi-0.71.2.tar.gz



From ausil at fedoraproject.org  Mon Sep 15 18:06:24 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 15 Sep 2008 18:06:24 +0000 (UTC)
Subject: rpms/mysql-gui-tools/devel mysql-gui-tools-5.0r12-DEBUG.patch, NONE,
	1.1
Message-ID: <20080915180624.BCACE70137@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mysql-gui-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20815

Added Files:
	mysql-gui-tools-5.0r12-DEBUG.patch 
Log Message:
add patch


mysql-gui-tools-5.0r12-DEBUG.patch:

--- NEW FILE mysql-gui-tools-5.0r12-DEBUG.patch ---
--- mysql-gui-tools-5.0r12/mysql-administrator/source/linux/mysql-administrator.BAD	2008-09-08 08:32:19.000000000 -0500
+++ mysql-gui-tools-5.0r12/mysql-administrator/source/linux/mysql-administrator	2008-09-08 08:32:36.000000000 -0500
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 PRG="$0"
+export DEBUG_DONT_SPAWN_FETCHES=1
 
 # need this for relative symlinks
 while [ -h "$PRG" ] ; do



From mtasaka at fedoraproject.org  Mon Sep 15 18:08:16 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 15 Sep 2008 18:08:16 +0000 (UTC)
Subject: rpms/jd/F-8 jd-2.0.1-cookie-change.patch,1.1,1.2
Message-ID: <20080915180816.26DEA70137@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21275/F-8

Modified Files:
	jd-2.0.1-cookie-change.patch 
Log Message:
fix patch (still need improvement, however it works)

jd-2.0.1-cookie-change.patch:

Index: jd-2.0.1-cookie-change.patch
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd-2.0.1-cookie-change.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jd-2.0.1-cookie-change.patch	15 Sep 2008 17:22:03 -0000	1.1
+++ jd-2.0.1-cookie-change.patch	15 Sep 2008 18:07:45 -0000	1.2
@@ -10,7 +10,7 @@
      std::string conf;
  
      bool ret;
-@@ -266,6 +267,16 @@
+@@ -266,6 +267,13 @@
      regex.exec( ".*<input +type=hidden +name=\"?hana\"? +value=\"?([^\"]*)\"?.*", str, 0, false, false );
      hana = MISC::remove_space( regex.str( 1 ) );
  
@@ -21,9 +21,58 @@
 +    regex.exec( ".*<input +type=hidden +name=\"[^\"]+\" +value=\"([^\"]+)\".*", str, 0, false, false );
 +    cookie_value = MISC::remove_space( regex.str( 1 ) );
 +
-+    if( m_msg.find( cookie_type + "=" ) == std::string::npos ) 
-+	m_msg += "&" + cookie_type + "=" + cookie_value;
-+
  #ifdef _DEBUG
      std::cout << "TITLE: [" << title << "]\n";
      std::cout << "2ch_X: [" << tag_2ch << "]\n";
+@@ -325,7 +333,7 @@
+             if( mdiag.get_chkbutton().get_active() ) CONFIG::set_always_write_ok( true );
+         }
+ 
+-        set_cookies_and_hana( SKELETON::Loadable::cookies(), hana );
++        set_cookies_and_hana( SKELETON::Loadable::cookies(), cookie_type, cookie_value );
+ 
+         ++m_count; // ?????????????????????
+         post_msg();
+@@ -337,7 +345,7 @@
+     else if( m_count < 1 // ?????????????????????
+              && ! m_subbbs && conf.find( "??????????????????" ) != std::string::npos ){
+ 
+-        set_cookies_and_hana( SKELETON::Loadable::cookies(), hana );
++        set_cookies_and_hana( SKELETON::Loadable::cookies(), cookie_type, cookie_value );
+ 
+         // subbbs.cgi ???????????????????????????????????????????????????
+         m_subbbs = true;
+@@ -367,15 +375,17 @@
+ //
+ // ????????????????????????????????????hana?????????
+ //
+-void Post::set_cookies_and_hana( const std::list< std::string >& cookies, const std::string& hana )
++void Post::set_cookies_and_hana( const std::list< std::string >& cookies, 
++	const std::string& cookie_type, const std::string& cookie_value )
+ {
++    std::string hana = "&" + cookie_type + "=" + cookie_value;
+     if( ! cookies.empty() ) DBTREE::board_set_list_cookies_for_write( m_url, cookies );
+ 
+     if( ! hana.empty() ){
+         DBTREE::board_set_hana_for_write( m_url, hana );
+ 
+         // ??????????????????????????????
+-        if( m_msg.find( "hana=" ) == std::string::npos ) m_msg += "&hana=" + hana;
++        if( m_msg.find( cookie_type + "=" ) == std::string::npos ) m_msg += hana;
+     }
+ }
+ 
+Index: src/message/post.h
+===================================================================
+--- src/message/post.h	(revision 2342)
++++ src/message/post.h	(working copy)
+@@ -58,7 +58,8 @@
+         virtual void receive_data( const char* data, size_t size );
+         virtual void receive_finish();
+ 
+-        void set_cookies_and_hana( const std::list< std::string >& cookies, const std::string& hana );
++        void set_cookies_and_hana( const std::list< std::string >& cookies, 
++		const std::string& cookie_type, const std::string& cookie_value );
+     };
+     
+ }



From mtasaka at fedoraproject.org  Mon Sep 15 18:08:16 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 15 Sep 2008 18:08:16 +0000 (UTC)
Subject: rpms/jd/F-9 jd-2.0.1-cookie-change.patch,1.1,1.2
Message-ID: <20080915180816.566F270137@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21275/F-9

Modified Files:
	jd-2.0.1-cookie-change.patch 
Log Message:
fix patch (still need improvement, however it works)

jd-2.0.1-cookie-change.patch:

Index: jd-2.0.1-cookie-change.patch
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd-2.0.1-cookie-change.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jd-2.0.1-cookie-change.patch	15 Sep 2008 17:22:04 -0000	1.1
+++ jd-2.0.1-cookie-change.patch	15 Sep 2008 18:07:46 -0000	1.2
@@ -10,7 +10,7 @@
      std::string conf;
  
      bool ret;
-@@ -266,6 +267,16 @@
+@@ -266,6 +267,13 @@
      regex.exec( ".*<input +type=hidden +name=\"?hana\"? +value=\"?([^\"]*)\"?.*", str, 0, false, false );
      hana = MISC::remove_space( regex.str( 1 ) );
  
@@ -21,9 +21,58 @@
 +    regex.exec( ".*<input +type=hidden +name=\"[^\"]+\" +value=\"([^\"]+)\".*", str, 0, false, false );
 +    cookie_value = MISC::remove_space( regex.str( 1 ) );
 +
-+    if( m_msg.find( cookie_type + "=" ) == std::string::npos ) 
-+	m_msg += "&" + cookie_type + "=" + cookie_value;
-+
  #ifdef _DEBUG
      std::cout << "TITLE: [" << title << "]\n";
      std::cout << "2ch_X: [" << tag_2ch << "]\n";
+@@ -325,7 +333,7 @@
+             if( mdiag.get_chkbutton().get_active() ) CONFIG::set_always_write_ok( true );
+         }
+ 
+-        set_cookies_and_hana( SKELETON::Loadable::cookies(), hana );
++        set_cookies_and_hana( SKELETON::Loadable::cookies(), cookie_type, cookie_value );
+ 
+         ++m_count; // ?????????????????????
+         post_msg();
+@@ -337,7 +345,7 @@
+     else if( m_count < 1 // ?????????????????????
+              && ! m_subbbs && conf.find( "??????????????????" ) != std::string::npos ){
+ 
+-        set_cookies_and_hana( SKELETON::Loadable::cookies(), hana );
++        set_cookies_and_hana( SKELETON::Loadable::cookies(), cookie_type, cookie_value );
+ 
+         // subbbs.cgi ???????????????????????????????????????????????????
+         m_subbbs = true;
+@@ -367,15 +375,17 @@
+ //
+ // ????????????????????????????????????hana?????????
+ //
+-void Post::set_cookies_and_hana( const std::list< std::string >& cookies, const std::string& hana )
++void Post::set_cookies_and_hana( const std::list< std::string >& cookies, 
++	const std::string& cookie_type, const std::string& cookie_value )
+ {
++    std::string hana = "&" + cookie_type + "=" + cookie_value;
+     if( ! cookies.empty() ) DBTREE::board_set_list_cookies_for_write( m_url, cookies );
+ 
+     if( ! hana.empty() ){
+         DBTREE::board_set_hana_for_write( m_url, hana );
+ 
+         // ??????????????????????????????
+-        if( m_msg.find( "hana=" ) == std::string::npos ) m_msg += "&hana=" + hana;
++        if( m_msg.find( cookie_type + "=" ) == std::string::npos ) m_msg += hana;
+     }
+ }
+ 
+Index: src/message/post.h
+===================================================================
+--- src/message/post.h	(revision 2342)
++++ src/message/post.h	(working copy)
+@@ -58,7 +58,8 @@
+         virtual void receive_data( const char* data, size_t size );
+         virtual void receive_finish();
+ 
+-        void set_cookies_and_hana( const std::list< std::string >& cookies, const std::string& hana );
++        void set_cookies_and_hana( const std::list< std::string >& cookies, 
++		const std::string& cookie_type, const std::string& cookie_value );
+     };
+     
+ }



From mtasaka at fedoraproject.org  Mon Sep 15 18:08:16 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 15 Sep 2008 18:08:16 +0000 (UTC)
Subject: rpms/jd/devel jd-2.0.1-cookie-change.patch,1.1,1.2
Message-ID: <20080915180816.C99B570137@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21275/devel

Modified Files:
	jd-2.0.1-cookie-change.patch 
Log Message:
fix patch (still need improvement, however it works)

jd-2.0.1-cookie-change.patch:

Index: jd-2.0.1-cookie-change.patch
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd-2.0.1-cookie-change.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jd-2.0.1-cookie-change.patch	15 Sep 2008 17:22:04 -0000	1.1
+++ jd-2.0.1-cookie-change.patch	15 Sep 2008 18:07:46 -0000	1.2
@@ -10,7 +10,7 @@
      std::string conf;
  
      bool ret;
-@@ -266,6 +267,16 @@
+@@ -266,6 +267,13 @@
      regex.exec( ".*<input +type=hidden +name=\"?hana\"? +value=\"?([^\"]*)\"?.*", str, 0, false, false );
      hana = MISC::remove_space( regex.str( 1 ) );
  
@@ -21,9 +21,58 @@
 +    regex.exec( ".*<input +type=hidden +name=\"[^\"]+\" +value=\"([^\"]+)\".*", str, 0, false, false );
 +    cookie_value = MISC::remove_space( regex.str( 1 ) );
 +
-+    if( m_msg.find( cookie_type + "=" ) == std::string::npos ) 
-+	m_msg += "&" + cookie_type + "=" + cookie_value;
-+
  #ifdef _DEBUG
      std::cout << "TITLE: [" << title << "]\n";
      std::cout << "2ch_X: [" << tag_2ch << "]\n";
+@@ -325,7 +333,7 @@
+             if( mdiag.get_chkbutton().get_active() ) CONFIG::set_always_write_ok( true );
+         }
+ 
+-        set_cookies_and_hana( SKELETON::Loadable::cookies(), hana );
++        set_cookies_and_hana( SKELETON::Loadable::cookies(), cookie_type, cookie_value );
+ 
+         ++m_count; // ?????????????????????
+         post_msg();
+@@ -337,7 +345,7 @@
+     else if( m_count < 1 // ?????????????????????
+              && ! m_subbbs && conf.find( "??????????????????" ) != std::string::npos ){
+ 
+-        set_cookies_and_hana( SKELETON::Loadable::cookies(), hana );
++        set_cookies_and_hana( SKELETON::Loadable::cookies(), cookie_type, cookie_value );
+ 
+         // subbbs.cgi ???????????????????????????????????????????????????
+         m_subbbs = true;
+@@ -367,15 +375,17 @@
+ //
+ // ????????????????????????????????????hana?????????
+ //
+-void Post::set_cookies_and_hana( const std::list< std::string >& cookies, const std::string& hana )
++void Post::set_cookies_and_hana( const std::list< std::string >& cookies, 
++	const std::string& cookie_type, const std::string& cookie_value )
+ {
++    std::string hana = "&" + cookie_type + "=" + cookie_value;
+     if( ! cookies.empty() ) DBTREE::board_set_list_cookies_for_write( m_url, cookies );
+ 
+     if( ! hana.empty() ){
+         DBTREE::board_set_hana_for_write( m_url, hana );
+ 
+         // ??????????????????????????????
+-        if( m_msg.find( "hana=" ) == std::string::npos ) m_msg += "&hana=" + hana;
++        if( m_msg.find( cookie_type + "=" ) == std::string::npos ) m_msg += hana;
+     }
+ }
+ 
+Index: src/message/post.h
+===================================================================
+--- src/message/post.h	(revision 2342)
++++ src/message/post.h	(working copy)
+@@ -58,7 +58,8 @@
+         virtual void receive_data( const char* data, size_t size );
+         virtual void receive_finish();
+ 
+-        void set_cookies_and_hana( const std::list< std::string >& cookies, const std::string& hana );
++        void set_cookies_and_hana( const std::list< std::string >& cookies, 
++		const std::string& cookie_type, const std::string& cookie_value );
+     };
+     
+ }



From remi at fedoraproject.org  Mon Sep 15 18:13:17 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 15 Sep 2008 18:13:17 +0000 (UTC)
Subject: rpms/glpi/EL-5 glpi-config_path.php, 1.1, 1.2 glpi-httpd.conf, 1.1, 
	1.2 glpi-logrotate, 1.1, 1.2 glpi.spec, 1.7, 1.8 sources, 1.5,
	1.6 glpi.patch, 1.2, NONE
Message-ID: <20080915181317.3688070137@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22699

Modified Files:
	glpi-config_path.php glpi-httpd.conf glpi-logrotate glpi.spec 
	sources 
Removed Files:
	glpi.patch 
Log Message:
update to 0.71.2


Index: glpi-config_path.php
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-5/glpi-config_path.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glpi-config_path.php	29 Dec 2007 07:55:57 -0000	1.1
+++ glpi-config_path.php	15 Sep 2008 18:12:46 -0000	1.2
@@ -11,5 +11,6 @@
 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");
 ?>


Index: glpi-httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-5/glpi-httpd.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glpi-httpd.conf	29 Dec 2007 07:55:57 -0000	1.1
+++ glpi-httpd.conf	15 Sep 2008 18:12:46 -0000	1.2
@@ -4,10 +4,20 @@
     Options None
     AllowOverride Limit Options FileInfo
 
+    php_value memory_limit 64M
+
     Order Deny,Allow
     Allow from all
 </Directory>
 
+<Directory /usr/share/glpi/install>
+
+    # 15" should be enough for migration in most case
+    php_value max_execution_time 900
+    php_value memory_limit 128M
+
+</Directory>
+
 <Directory /usr/share/glpi/config>
     Order Allow,Deny
     Deny from all


Index: glpi-logrotate
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-5/glpi-logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glpi-logrotate	29 Dec 2007 07:55:57 -0000	1.1
+++ glpi-logrotate	15 Sep 2008 18:12:46 -0000	1.2
@@ -6,4 +6,5 @@
 	compress
 	notifempty
 	missingok
+	create 644 apache apache
 }


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-5/glpi.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- glpi.spec	30 Jan 2008 19:01:17 -0000	1.7
+++ glpi.spec	15 Sep 2008 18:12:46 -0000	1.8
@@ -5,8 +5,8 @@
 %endif
 
 Name:           glpi
-Version:        0.70.2
-Release:        2%{?dist}.1
+Version:        0.71.2
+Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
@@ -19,6 +19,10 @@
 Source2:        glpi-config_path.php
 Source3:        glpi-logrotate
 
+# Avoid SELinux AVC when testing write access to log file.
+Patch0:         glpi-check.patch
+
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -27,6 +31,7 @@
 Requires:       php-domxml
 %else
 Requires:       php-xml
+Requires:       php-pear(Cache_Lite) >= 1.7.4
 %endif
 Requires:       %{_sysconfdir}/logrotate.d
 Requires(postun): /sbin/service
@@ -34,8 +39,9 @@
 BuildRequires:  dos2unix
 %if %{useselinux}
 Requires:       policycoreutils
-BuildRequires:  selinux-policy-devel, checkpolicy
 %endif
+Requires:       %{_sysconfdir}/cron.d
+
 
 %description
 GLPI is the Information Resource-Manager with an additional Administration-
@@ -59,42 +65,36 @@
 %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
+
+# Use system lib
+rm -rf lib/cache_lite
+cp %{SOURCE2} config/config_path.php 
+
+%endif
 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
 
-%if %{useselinux}
-mkdir selinux
-pushd selinux
-
-cat >%{name}.te <<EOF
-policy_module(%{name},0.70)
-require {
-  type httpd_sys_content_t;
-  type httpd_log_t;
-  type httpd_var_lib_t;
-}
+cat >cron <<EOF
+# GLPI core
+# Run cron from to execute task even when no user connected
+*/4 * * * * apache %{_bindir}/php %{_datadir}/%{name}/front/cron.php
 EOF
 
-cat >%{name}.fc <<EOF
-%{_sysconfdir}/%{name}(/.*)?          root:object_r:httpd_sys_content_t:s0
-%{_localstatedir}/log/%{name}(/.*)?   system_u:object_r:httpd_sys_content_t:s0
-%{_localstatedir}/lib/%{name}(/.*)?   system_u:object_r:httpd_sys_content_t:s0
-EOF
-popd
-%endif
-
 
 %build
-%if %{useselinux}
-# SElinux 
-pushd selinux
-make -f %{_datadir}/selinux/devel/Makefile
-popd
-%endif
+# empty build
 
 
 %install
@@ -117,7 +117,6 @@
 
 # ===== config =====
 cp -ar config %{buildroot}/%{_datadir}/%{name}/config
-install --mode 644 %{SOURCE2} %{buildroot}/%{_datadir}/%{name}/config/config_path.php
 
 mkdir -p %{buildroot}/%{_sysconfdir}/%{name}
 touch %{buildroot}%{_sysconfdir}/%{name}/config_db.php
@@ -133,6 +132,10 @@
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 
+# ====== Cron =====
+mkdir -p %{buildroot}%{_sysconfdir}/cron.d
+install -m 644 cron %{buildroot}%{_sysconfdir}/cron.d/%{name}
+
 # cleanup
 find %{buildroot} -name remove.txt -exec rm -f {} \; -print
 
@@ -144,11 +147,6 @@
 rm -f %{buildroot}%{_datadir}/%{name}/config/.htaccess
 rm -f %{buildroot}%{_datadir}/%{name}/scripts/.htaccess
 
-%if %{useselinux}
-# SElinux 
-mkdir -p %{buildroot}%{_datadir}/selinux/packages/%{name}
-install -m644 selinux/%{name}.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/%{name}.pp
-%endif
 
 # Lang
 for i in %{buildroot}%{_datadir}/%{name}/locales/*
@@ -164,26 +162,37 @@
 
 %post
 %if %{useselinux}
-# Install/update Selinux policy
-semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp
-# files owned by RPM
-fixfiles -R %{name} restore
+(
+# 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(/.*)?"
+# keep httpd_sys_script_rw_t (httpd_var_lib_t prevent dir creation)
+semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/lib/glpi(/.*)?"
 # files created by app
 restorecon -R %{_sysconfdir}/%{name}
 restorecon -R %{_localstatedir}/lib/%{name}
 restorecon -R %{_localstatedir}/log/%{name}
+) &>/dev/null
 %endif
 /sbin/service httpd condrestart > /dev/null 2>&1 || :
 
 
 %postun
-/sbin/service httpd condrestart > /dev/null 2>&1 || :
 %if %{useselinux}
 if [ "$1" -eq "0" ]; then
-    # Remove the SElinux policy.
-    semodule -r %{name} || :
+    # Remove the File Context
+    (
+    semanage fcontext -d "%{_sysconfdir}/glpi(/.*)?"
+    semanage fcontext -d "%{_localstatedir}/log/glpi(/.*)?"
+    semanage fcontext -d "%{_localstatedir}/lib/glpi(/.*)?"
+    ) &>/dev/null
 fi
 %endif
+/sbin/service httpd condrestart > /dev/null 2>&1 || :
 
 
 %files -f %{name}.lang
@@ -194,7 +203,9 @@
 %ghost %config(noreplace,missingok) %{_sysconfdir}/%{name}/config_db.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/glpi.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/cron.d/%{name}
 
+# This folder can contain private information (sessions, docs, ...)
 %dir %_localstatedir/lib/%{name}
 %attr(750,apache,root) %{_localstatedir}/lib/%{name}/files
 
@@ -215,13 +226,26 @@
 %attr(750,apache,root) %dir %{_localstatedir}/log/%{name}
 %dir %{_datadir}/%{name}/locales
 
-%if %{useselinux}
-%{_datadir}/selinux/packages/%{name}/%{name}.pp
-%endif
 
 %changelog
-* Wed Jan 30 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.70.2-2.el5.1
-- enable SELinux in EL-5
+* Mon Sep 15 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.2-1
+- update to 0.71.1 bugfix
+
+* Sat Aug 09 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.1-2
+- fix SElinux bug on install test (glpi-check.patch)
+- add create option on logrotate conf
+
+* Fri Aug 01 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.1-1
+- update to 0.71.1 bugfix
+- use system cron
+- increase memory_limit / max_execution_time for upgrade
+
+* Fri Jul 11 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71-1
+- update to 0.71 stable
+- fix bug #452353 (selinux)
+
+* Fri Apr 25 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.70.2-3
+- remplace module policy by simple semanage (#442706)
 
 * Mon Jan 28 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.70.2-2
 - rebuild (fix sources tarball)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Jan 2008 18:15:42 -0000	1.5
+++ sources	15 Sep 2008 18:12:46 -0000	1.6
@@ -1 +1 @@
-5e755472c887a54bc532569ec36add99  glpi-0.70.2.tar.gz
+404265b0efa8300a0f303665ff2c741b  glpi-0.71.2.tar.gz


--- glpi.patch DELETED ---



From remi at fedoraproject.org  Mon Sep 15 18:14:54 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 15 Sep 2008 18:14:54 +0000 (UTC)
Subject: rpms/glpi-pdf/EL-5 glpi-pdf.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20080915181454.A15DF70137@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-pdf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23288

Modified Files:
	glpi-pdf.spec sources 
Log Message:
update to 0.5 for glpi 0.71.2


Index: glpi-pdf.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-pdf/EL-5/glpi-pdf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glpi-pdf.spec	17 Feb 2008 07:21:36 -0000	1.1
+++ glpi-pdf.spec	15 Sep 2008 18:14:24 -0000	1.2
@@ -1,7 +1,7 @@
 %define pluginname   pdf
 
 Name:           glpi-pdf
-Version:        0.4
+Version:        0.5
 Release:        1%{?dist}
 Summary:        GLPI Plugin to print PDF of computers
 Summary(fr):    Extension GLPI pour cr??er des PDF des ordinateurs
@@ -15,7 +15,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.70
+Requires:       glpi >= 0.71
 
 %description
 This GLPI plugin enables you to print with format pdf all the mitres of a
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Sat Jul 12 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.5-1
+- update to 0.5 finale for glpi 0.71
+
 * Thu Dec 27 2007 Remi Collet <Fedora at FamilleCollet.com> - 0.4-1
 - update to 0.4 finale
 - Initial RPM for Fedora review


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-pdf/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Feb 2008 07:21:36 -0000	1.2
+++ sources	15 Sep 2008 18:14:24 -0000	1.3
@@ -1 +1 @@
-6ba78069113b8cddb40d3d826751d72b  glpi-pdf-0.4.tar.gz
+6b10df91a8499f7e67d7a33e3b9085fb  glpi-pdf-0.5.tar.gz



From remi at fedoraproject.org  Mon Sep 15 18:18:09 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 15 Sep 2008 18:18:09 +0000 (UTC)
Subject: rpms/glpi/EL-5 glpi-check.patch,NONE,1.1 glpi.spec,1.8,1.9
Message-ID: <20080915181809.724D170137@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24299

Modified Files:
	glpi.spec 
Added Files:
	glpi-check.patch 
Log Message:
missing patch

glpi-check.patch:

--- NEW FILE glpi-check.patch ---
--- inc/common.function.php.orig	2008-08-09 14:14:22.000000000 +0200
+++ inc/common.function.php	2008-08-09 14:21:16.000000000 +0200
@@ -601,8 +601,7 @@
 		GLPI_CONFIG_DIR => $LANG["install"][23],
 		GLPI_SESSION_DIR => $LANG["install"][50],
 		GLPI_CRON_DIR => $LANG["install"][52],
-		GLPI_CACHE_DIR => $LANG["install"][99],
-		GLPI_LOG_DIR => $LANG["install"][53]
+		GLPI_CACHE_DIR => $LANG["install"][99]
 	);
 	$error=0;	
 	foreach ($dir_to_check as $dir => $message){
@@ -633,6 +632,13 @@
 				break;
 		}
 	}
+	echo "<tr class='tab_bg_1'><td><strong>".$LANG["install"][53]."</strong></td>";
+	if (error_log("Test\n", 3, GLPI_LOG_DIR."/php-errors.log")) {
+		echo "<td>".$LANG["install"][20]."</td></tr>";
+	} else {
+		echo "<td><p class='red'>".$LANG["install"][19]."</p> ".$LANG["install"][97]."'".GLPI_LOG_DIR."'. ".$LANG["install"][98]."</td></tr>";
+		$error=1;
+	}
 	return $error;
 }
 


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-5/glpi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- glpi.spec	15 Sep 2008 18:12:46 -0000	1.8
+++ glpi.spec	15 Sep 2008 18:17:39 -0000	1.9
@@ -6,7 +6,7 @@
 
 Name:           glpi
 Version:        0.71.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
@@ -228,6 +228,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.2-1.el5.1
+- missing patch
+
 * Mon Sep 15 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.2-1
 - update to 0.71.1 bugfix
 



From remi at fedoraproject.org  Mon Sep 15 18:20:32 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 15 Sep 2008 18:20:32 +0000 (UTC)
Subject: rpms/glpi-data-injection/EL-5 glpi-data-injection-1.2.patch, NONE, 
	1.1 glpi-data-injection.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20080915182032.6F5B170137@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-data-injection/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24854

Modified Files:
	glpi-data-injection.spec sources 
Added Files:
	glpi-data-injection-1.2.patch 
Log Message:
update to 1.2 for glpi 0.71.2

glpi-data-injection-1.2.patch:

--- NEW FILE glpi-data-injection-1.2.patch ---
Index: inc/plugin_data_injection.config.function.php
===================================================================
--- inc/plugin_data_injection.config.function.php	(r??vision 6827)
+++ inc/plugin_data_injection.config.function.php	(copie de travail)
@@ -265,7 +265,7 @@
 		if (function_exists($function)) {
 			$function ($type, $params);
 		}
-	} else {
+	} else if (isset($PLUGIN_HOOKS['plugin_types'])){
 		//Browse all plugins
 		foreach ($PLUGIN_HOOKS['plugin_types'] as $type => $name) {
 			$function = 'plugin_' . $name . '_data_injection_' . $hook_name;


Index: glpi-data-injection.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/EL-5/glpi-data-injection.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glpi-data-injection.spec	22 Feb 2008 20:57:56 -0000	1.2
+++ glpi-data-injection.spec	15 Sep 2008 18:20:01 -0000	1.3
@@ -1,8 +1,8 @@
 %define pluginname   data_injection
 
 Name:           glpi-data-injection
-Version:        1.1
-Release:        1%{?dist}.1
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Plugin for importing data into GLPI
 Summary(fr):    Extension pour importer des donn??es dans GLPI
 
@@ -12,10 +12,12 @@
 
 Source0:        http://www.glpi-project.org/IMG/gz/glpi-%{pluginname}-%{version}.tar.gz
 
+Patch0:         %{name}-1.2.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.70
+Requires:       glpi >= 0.71
 
 %description
 Plugin for importing data into GLPI
@@ -39,6 +41,10 @@
 %prep
 %setup -q -c
 
+pushd %{pluginname}
+%patch0 -p0
+popd
+
 # dos2unix to avoid rpmlint warnings
 mv %{pluginname}/docs docs
 find %{pluginname} -name \*php -exec sed -i -e 's/\r//' {} \;
@@ -59,7 +65,7 @@
 do
   lang=$(basename $i)
   echo "%lang(${lang:0:2}) %{_datadir}/glpi/plugins/%{pluginname}/locales/${lang}"
-done >%{name}.lang
+done | tee %{name}.lang
 
 %clean
 rm -rf %{buildroot} 
@@ -70,10 +76,12 @@
 %doc docs/*
 %{_datadir}/glpi/plugins/%{pluginname}
 %dir %{_datadir}/glpi/plugins/%{pluginname}/locales
-%{_datadir}/glpi/plugins/%{pluginname}/locales/*
 
 
 %changelog
+* Sat Jul 12 2008 Remi Collet <Fedora at FamilleCollet.com> - 1.2-1
+- update to 1.2 for glpi 0.71
+
 * Sun Jan 13 2008 Remi Collet <Fedora at FamilleCollet.com> - 1.1-1
 - update to 1.1
 - tag lang files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Feb 2008 20:51:39 -0000	1.2
+++ sources	15 Sep 2008 18:20:02 -0000	1.3
@@ -1 +1 @@
-e8339290b31627e5107e692dc3c47aae  glpi-data_injection-1.1.tar.gz
+697b7e035d3a50a8e1bb4cfa3c6ae267  glpi-data_injection-1.2.tar.gz



From remi at fedoraproject.org  Mon Sep 15 18:22:08 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 15 Sep 2008 18:22:08 +0000 (UTC)
Subject: rpms/glpi-mass-ocs-import/EL-5 glpi-mass-ocs-import.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080915182208.B249B70137@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-mass-ocs-import/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25352

Modified Files:
	glpi-mass-ocs-import.spec sources 
Log Message:
update to 1.2 for glpi 0.71.2


Index: glpi-mass-ocs-import.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/EL-5/glpi-mass-ocs-import.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glpi-mass-ocs-import.spec	17 Feb 2008 07:47:48 -0000	1.1
+++ glpi-mass-ocs-import.spec	15 Sep 2008 18:21:38 -0000	1.2
@@ -2,7 +2,7 @@
 %define lockname     mass_ocs_import.lock
 
 Name:           glpi-mass-ocs-import
-Version:        1.1
+Version:        1.2
 Release:        1%{?dist}
 Summary:        GLPI Plugin for OCS Massive import
 Summary(fr):    Extension GLPI d'import en masse OCS
@@ -18,7 +18,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.70
+Requires:       glpi >= 0.71
 Requires:       %{_sysconfdir}/cron.d
 
 %description
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Sat Jul 12 2008 Remi Collet <Fedora at FamilleCollet.com> - 1.2-1
+- update to 1.2 for glpi 0.71
+
 * Thu Feb 14 2008 Remi Collet <Fedora at FamilleCollet.com> - 1.1-1
 - update to 1.1 (setup bug fixes)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Feb 2008 07:47:48 -0000	1.2
+++ sources	15 Sep 2008 18:21:38 -0000	1.3
@@ -1 +1 @@
-493ae5565f18b8f1318b8e39062818c2  glpi-mass_ocs_import-1.1.tar.gz
+725e8b7c7d230fda2e049e3bef058d5c  glpi-mass_ocs_import-1.2.tar.gz



From remi at fedoraproject.org  Mon Sep 15 18:27:24 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 15 Sep 2008 18:27:24 +0000 (UTC)
Subject: rpms/glpi/EL-4 glpi-check.patch, NONE, 1.1 glpi-config_path.php, 1.1,
	1.2 glpi-httpd.conf, 1.1, 1.2 glpi-logrotate, 1.1, 1.2 glpi.spec,
	1.5, 1.6 sources, 1.5, 1.6 glpi.patch, 1.2, NONE
Message-ID: <20080915182724.6A74B70137@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26493

Modified Files:
	glpi-config_path.php glpi-httpd.conf glpi-logrotate glpi.spec 
	sources 
Added Files:
	glpi-check.patch 
Removed Files:
	glpi.patch 
Log Message:
update to 0.71.2

glpi-check.patch:

--- NEW FILE glpi-check.patch ---
--- inc/common.function.php.orig	2008-08-09 14:14:22.000000000 +0200
+++ inc/common.function.php	2008-08-09 14:21:16.000000000 +0200
@@ -601,8 +601,7 @@
 		GLPI_CONFIG_DIR => $LANG["install"][23],
 		GLPI_SESSION_DIR => $LANG["install"][50],
 		GLPI_CRON_DIR => $LANG["install"][52],
-		GLPI_CACHE_DIR => $LANG["install"][99],
-		GLPI_LOG_DIR => $LANG["install"][53]
+		GLPI_CACHE_DIR => $LANG["install"][99]
 	);
 	$error=0;	
 	foreach ($dir_to_check as $dir => $message){
@@ -633,6 +632,13 @@
 				break;
 		}
 	}
+	echo "<tr class='tab_bg_1'><td><strong>".$LANG["install"][53]."</strong></td>";
+	if (error_log("Test\n", 3, GLPI_LOG_DIR."/php-errors.log")) {
+		echo "<td>".$LANG["install"][20]."</td></tr>";
+	} else {
+		echo "<td><p class='red'>".$LANG["install"][19]."</p> ".$LANG["install"][97]."'".GLPI_LOG_DIR."'. ".$LANG["install"][98]."</td></tr>";
+		$error=1;
+	}
 	return $error;
 }
 


Index: glpi-config_path.php
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-4/glpi-config_path.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glpi-config_path.php	29 Dec 2007 07:57:37 -0000	1.1
+++ glpi-config_path.php	15 Sep 2008 18:26:53 -0000	1.2
@@ -11,5 +11,6 @@
 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");
 ?>


Index: glpi-httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-4/glpi-httpd.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glpi-httpd.conf	29 Dec 2007 07:57:37 -0000	1.1
+++ glpi-httpd.conf	15 Sep 2008 18:26:53 -0000	1.2
@@ -4,10 +4,20 @@
     Options None
     AllowOverride Limit Options FileInfo
 
+    php_value memory_limit 64M
+
     Order Deny,Allow
     Allow from all
 </Directory>
 
+<Directory /usr/share/glpi/install>
+
+    # 15" should be enough for migration in most case
+    php_value max_execution_time 900
+    php_value memory_limit 128M
+
+</Directory>
+
 <Directory /usr/share/glpi/config>
     Order Allow,Deny
     Deny from all


Index: glpi-logrotate
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-4/glpi-logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glpi-logrotate	29 Dec 2007 07:57:37 -0000	1.1
+++ glpi-logrotate	15 Sep 2008 18:26:53 -0000	1.2
@@ -6,4 +6,5 @@
 	compress
 	notifempty
 	missingok
+	create 644 apache apache
 }


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-4/glpi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- glpi.spec	28 Jan 2008 18:16:56 -0000	1.5
+++ glpi.spec	15 Sep 2008 18:26:53 -0000	1.6
@@ -1,12 +1,12 @@
-%if %{?fedora}%{?rhel} >= 6
+%if %{?fedora}%{?rhel} >= 5
 %define useselinux 1
 %else
 %define useselinux 0
 %endif
 
 Name:           glpi
-Version:        0.70.2
-Release:        2%{?dist}
+Version:        0.71.2
+Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
@@ -19,6 +19,10 @@
 Source2:        glpi-config_path.php
 Source3:        glpi-logrotate
 
+# Avoid SELinux AVC when testing write access to log file.
+Patch0:         glpi-check.patch
+
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -27,6 +31,7 @@
 Requires:       php-domxml
 %else
 Requires:       php-xml
+Requires:       php-pear(Cache_Lite) >= 1.7.4
 %endif
 Requires:       %{_sysconfdir}/logrotate.d
 Requires(postun): /sbin/service
@@ -34,8 +39,9 @@
 BuildRequires:  dos2unix
 %if %{useselinux}
 Requires:       policycoreutils
-BuildRequires:  selinux-policy-devel, checkpolicy
 %endif
+Requires:       %{_sysconfdir}/cron.d
+
 
 %description
 GLPI is the Information Resource-Manager with an additional Administration-
@@ -59,42 +65,36 @@
 %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
+
+# Use system lib
+rm -rf lib/cache_lite
+cp %{SOURCE2} config/config_path.php 
+
+%endif
 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
 
-%if %{useselinux}
-mkdir selinux
-pushd selinux
-
-cat >%{name}.te <<EOF
-policy_module(%{name},0.70)
-require {
-  type httpd_sys_content_t;
-  type httpd_log_t;
-  type httpd_var_lib_t;
-}
-EOF
-
-cat >%{name}.fc <<EOF
-%{_sysconfdir}/%{name}(/.*)?          root:object_r:httpd_sys_content_t:s0
-%{_localstatedir}/log/%{name}(/.*)?   system_u:object_r:httpd_sys_content_t:s0
-%{_localstatedir}/lib/%{name}(/.*)?   system_u:object_r:httpd_sys_content_t:s0
+cat >cron <<EOF
+# GLPI core
+# Run cron from to execute task even when no user connected
+*/4 * * * * apache %{_bindir}/php %{_datadir}/%{name}/front/cron.php
 EOF
-popd
-%endif
 
 
 %build
-%if %{useselinux}
-# SElinux 
-pushd selinux
-make -f %{_datadir}/selinux/devel/Makefile
-popd
-%endif
+# empty build
 
 
 %install
@@ -117,7 +117,6 @@
 
 # ===== config =====
 cp -ar config %{buildroot}/%{_datadir}/%{name}/config
-install --mode 644 %{SOURCE2} %{buildroot}/%{_datadir}/%{name}/config/config_path.php
 
 mkdir -p %{buildroot}/%{_sysconfdir}/%{name}
 touch %{buildroot}%{_sysconfdir}/%{name}/config_db.php
@@ -133,6 +132,10 @@
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 
+# ====== Cron =====
+mkdir -p %{buildroot}%{_sysconfdir}/cron.d
+install -m 644 cron %{buildroot}%{_sysconfdir}/cron.d/%{name}
+
 # cleanup
 find %{buildroot} -name remove.txt -exec rm -f {} \; -print
 
@@ -144,11 +147,6 @@
 rm -f %{buildroot}%{_datadir}/%{name}/config/.htaccess
 rm -f %{buildroot}%{_datadir}/%{name}/scripts/.htaccess
 
-%if %{useselinux}
-# SElinux 
-mkdir -p %{buildroot}%{_datadir}/selinux/packages/%{name}
-install -m644 selinux/%{name}.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/%{name}.pp
-%endif
 
 # Lang
 for i in %{buildroot}%{_datadir}/%{name}/locales/*
@@ -164,26 +162,37 @@
 
 %post
 %if %{useselinux}
-# Install/update Selinux policy
-semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp
-# files owned by RPM
-fixfiles -R %{name} restore
+(
+# 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(/.*)?"
+# keep httpd_sys_script_rw_t (httpd_var_lib_t prevent dir creation)
+semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/lib/glpi(/.*)?"
 # files created by app
 restorecon -R %{_sysconfdir}/%{name}
 restorecon -R %{_localstatedir}/lib/%{name}
 restorecon -R %{_localstatedir}/log/%{name}
+) &>/dev/null
 %endif
 /sbin/service httpd condrestart > /dev/null 2>&1 || :
 
 
 %postun
-/sbin/service httpd condrestart > /dev/null 2>&1 || :
 %if %{useselinux}
 if [ "$1" -eq "0" ]; then
-    # Remove the SElinux policy.
-    semodule -r %{name} || :
+    # Remove the File Context
+    (
+    semanage fcontext -d "%{_sysconfdir}/glpi(/.*)?"
+    semanage fcontext -d "%{_localstatedir}/log/glpi(/.*)?"
+    semanage fcontext -d "%{_localstatedir}/lib/glpi(/.*)?"
+    ) &>/dev/null
 fi
 %endif
+/sbin/service httpd condrestart > /dev/null 2>&1 || :
 
 
 %files -f %{name}.lang
@@ -194,7 +203,9 @@
 %ghost %config(noreplace,missingok) %{_sysconfdir}/%{name}/config_db.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/glpi.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/cron.d/%{name}
 
+# This folder can contain private information (sessions, docs, ...)
 %dir %_localstatedir/lib/%{name}
 %attr(750,apache,root) %{_localstatedir}/lib/%{name}/files
 
@@ -215,11 +226,27 @@
 %attr(750,apache,root) %dir %{_localstatedir}/log/%{name}
 %dir %{_datadir}/%{name}/locales
 
-%if %{useselinux}
-%{_datadir}/selinux/packages/%{name}/%{name}.pp
-%endif
 
 %changelog
+* Mon Sep 15 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.2-1
+- update to 0.71.2 bugfix
+
+* Sat Aug 09 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.1-2
+- fix SElinux bug on install test (glpi-check.patch)
+- add create option on logrotate conf
+
+* Fri Aug 01 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.1-1
+- update to 0.71.1 bugfix
+- use system cron
+- increase memory_limit / max_execution_time for upgrade
+
+* Fri Jul 11 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71-1
+- update to 0.71 stable
+- fix bug #452353 (selinux)
+
+* Fri Apr 25 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.70.2-3
+- remplace module policy by simple semanage (#442706)
+
 * Mon Jan 28 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.70.2-2
 - rebuild (fix sources tarball)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Jan 2008 18:16:56 -0000	1.5
+++ sources	15 Sep 2008 18:26:53 -0000	1.6
@@ -1 +1 @@
-5e755472c887a54bc532569ec36add99  glpi-0.70.2.tar.gz
+404265b0efa8300a0f303665ff2c741b  glpi-0.71.2.tar.gz


--- glpi.patch DELETED ---



From dwalluck at fedoraproject.org  Mon Sep 15 18:29:15 2008
From: dwalluck at fedoraproject.org (David Walluck)
Date: Mon, 15 Sep 2008 18:29:15 +0000 (UTC)
Subject: rpms/tomcat5/F-9 .cvsignore, 1.14, 1.15 sources, 1.12,
	1.13 tomcat5.spec, 1.111, 1.112
Message-ID: <20080915182915.ABAA670137@cvs1.fedora.phx.redhat.com>

Author: dwalluck

Update of /cvs/pkgs/rpms/tomcat5/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27017

Modified Files:
	.cvsignore sources tomcat5.spec 
Log Message:
- 5.5.27
  Resolves: rhbz#456120
  Resolves: rhbz#457934
  Resolves: rhbz#446393
  Resolves: rhbz#457597



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	8 Feb 2008 22:06:50 -0000	1.14
+++ .cvsignore	15 Sep 2008 18:28:45 -0000	1.15
@@ -1 +1 @@
-apache-tomcat-5.5.26-src.tar.gz
+apache-tomcat-5.5.27-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	8 Feb 2008 22:06:50 -0000	1.12
+++ sources	15 Sep 2008 18:28:45 -0000	1.13
@@ -1 +1 @@
-642b6526354cb18c5b5d77ebef8109ae  apache-tomcat-5.5.26-src.tar.gz
+eb3f196013550b9b1684e4ff18593a8e  apache-tomcat-5.5.27-src.tar.gz


Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/F-9/tomcat5.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- tomcat5.spec	12 Feb 2008 19:49:21 -0000	1.111
+++ tomcat5.spec	15 Sep 2008 18:28:45 -0000	1.112
@@ -68,8 +68,8 @@
 
 Name: tomcat5
 Epoch: 0
-Version: 5.5.26
-Release: 1jpp.2%{?dist}
+Version: 5.5.27
+Release: 0jpp.1%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 
 Group: Networking/Daemons
@@ -127,8 +127,9 @@
 BuildRequires: jakarta-commons-daemon >= 1.0
 BuildRequires: jakarta-commons-dbcp >= 0:1.2.1
 BuildRequires: jakarta-commons-digester >= 0:1.7
-BuildRequires: jakarta-commons-logging >= 0:1.0.4
 BuildRequires: jakarta-commons-fileupload >= 0:1.0
+BuildRequires: jakarta-commons-io >= 0:1.2
+BuildRequires: jakarta-commons-logging >= 0:1.0.4
 BuildRequires: jakarta-commons-modeler >= 2.0
 BuildRequires: jakarta-commons-pool >= 0:1.2
 BuildRequires: jakarta-commons-launcher >= 0:0.9
@@ -182,6 +183,7 @@
 Requires: xml-commons-apis >= 1.3
 # jakarta-commons packages
 Requires: jakarta-commons-daemon >= 1.0.1
+Requires: jakarta-commons-io >= 0:1.2
 Requires: jakarta-commons-launcher >= 0:0.9
 # alternatives
 Requires: java-devel >= 0:1.4.2
@@ -493,6 +495,7 @@
 commons-collections.jar=$(build-classpath commons-collections)
 commons-logging.jar=$(build-classpath commons-logging)
 commons-daemon.jar=$(build-classpath commons-daemon)
+commons-io.jar=$(build-classpath commons-io)
 junit.jar=$(build-classpath junit)
 jasper-compiler-jdt.jar=$(build-classpath eclipse-ecj)
 EOBP
@@ -514,6 +517,7 @@
 commons-dbcp.jar=$(build-classpath commons-dbcp)
 commons-digester.jar=$(build-classpath commons-digester)
 commons-el.jar=$(build-classpath commons-el)
+commons-io.jar=$(build-classpath commons-io)
 commons-launcher.jar=$(build-classpath commons-launcher)
 commons-logging.jar=$(build-classpath commons-logging)
 commons-logging-api.jar=$(build-classpath commons-logging-api)
@@ -562,6 +566,7 @@
 commons-daemon.jar=$(build-classpath commons-daemon)
 commons-digester.jar=$(build-classpath commons-digester)
 commons-fileupload.jar=$(build-classpath commons-fileupload)
+commons-io.jar=$(build-classpath commons-io)
 commons-logging.jar=$(build-classpath commons-logging)
 commons-logging-api.jar=$(build-classpath commons-logging-api)
 commons-modeler.jar=$(build-classpath commons-modeler)
@@ -589,8 +594,8 @@
 %if %{with_ecj}
 mkdir org.apache.jasper
 pushd org.apache.jasper
-unzip -qq ../apache-tomcat-5.5.26-src/build/build/common/lib/jasper-compiler.jar
-unzip -qq ../apache-tomcat-5.5.26-src/build/build/common/lib/jasper-runtime.jar \
+unzip -qq ../apache-tomcat-%{version}-src/build/build/common/lib/jasper-compiler.jar
+unzip -qq ../apache-tomcat-%{version}-src/build/build/common/lib/jasper-runtime.jar \
   -x META-INF/MANIFEST.MF org/apache/jasper/compiler/Localizer.class
 unzip -qq %{_javadir}/jdtcore.jar -x META-INF/MANIFEST.MF
 cp %{SOURCE6} META-INF/MANIFEST.MF
@@ -1299,6 +1304,13 @@
 %endif
 
 %changelog
+* Mon Sep 15 2008 David Walluck <dwalluck at redhat.com> 0:5.5.27-0jpp.1
+- 5.5.27
+  Resolves: rhbz#456120
+  Resolves: rhbz#457934
+  Resolves: rhbz#446393
+  Resolves: rhbz#457597
+
 * Tue Feb 12 2008 Devrim GUNDUZ <devrim at commandprompt.com> 0:5.5.26-1jpp.2
 - Rebuilt
 



From notting at fedoraproject.org  Mon Sep 15 18:35:10 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon, 15 Sep 2008 18:35:10 +0000 (UTC)
Subject: rpms/mash/devel .cvsignore, 1.31, 1.32 mash.spec, 1.31, 1.32 sources,
	1.33, 1.34
Message-ID: <20080915183510.57315700EC@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28152

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
0.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	23 Jul 2008 03:39:56 -0000	1.31
+++ .cvsignore	15 Sep 2008 18:34:39 -0000	1.32
@@ -1 +1 @@
-mash-0.4.0.tar.gz
+mash-0.4.1.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mash.spec	7 Aug 2008 21:34:40 -0000	1.31
+++ mash.spec	15 Sep 2008 18:34:39 -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:           mash
-Version:        0.4.0
-Release:        2%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPLv2
@@ -44,6 +44,9 @@
 /var/cache/mash
 
 %changelog
+* Mon Sep 15 2008 Bill Nottingham <notting at redhat.com> 0.4.1-1
+- Adjust for new keys
+
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.4.0-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	23 Jul 2008 03:39:56 -0000	1.33
+++ sources	15 Sep 2008 18:34:39 -0000	1.34
@@ -1 +1 @@
-1460910cb3b41a8381647dae926b5dfa  mash-0.4.0.tar.gz
+4aa3acb74d92b4ec3d7c92b217736f11  mash-0.4.1.tar.gz



From remi at fedoraproject.org  Mon Sep 15 18:38:00 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 15 Sep 2008 18:38:00 +0000 (UTC)
Subject: rpms/glpi-pdf/EL-4 glpi-pdf.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20080915183800.8EB65700EC@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-pdf/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29274

Modified Files:
	glpi-pdf.spec sources 
Log Message:
update to 0.5 for glpi 0.71.2


Index: glpi-pdf.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-pdf/EL-4/glpi-pdf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glpi-pdf.spec	17 Feb 2008 07:22:50 -0000	1.1
+++ glpi-pdf.spec	15 Sep 2008 18:37:30 -0000	1.2
@@ -1,7 +1,7 @@
 %define pluginname   pdf
 
 Name:           glpi-pdf
-Version:        0.4
+Version:        0.5
 Release:        1%{?dist}
 Summary:        GLPI Plugin to print PDF of computers
 Summary(fr):    Extension GLPI pour cr??er des PDF des ordinateurs
@@ -15,7 +15,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.70
+Requires:       glpi >= 0.71
 
 %description
 This GLPI plugin enables you to print with format pdf all the mitres of a
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Sat Jul 12 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.5-1
+- update to 0.5 finale for glpi 0.71
+
 * Thu Dec 27 2007 Remi Collet <Fedora at FamilleCollet.com> - 0.4-1
 - update to 0.4 finale
 - Initial RPM for Fedora review


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-pdf/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Feb 2008 07:22:50 -0000	1.2
+++ sources	15 Sep 2008 18:37:30 -0000	1.3
@@ -1 +1 @@
-6ba78069113b8cddb40d3d826751d72b  glpi-pdf-0.4.tar.gz
+6b10df91a8499f7e67d7a33e3b9085fb  glpi-pdf-0.5.tar.gz



From remi at fedoraproject.org  Mon Sep 15 18:40:33 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 15 Sep 2008 18:40:33 +0000 (UTC)
Subject: rpms/glpi-mass-ocs-import/EL-4 glpi-mass-ocs-import.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080915184033.27524700EC@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-mass-ocs-import/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29803

Modified Files:
	glpi-mass-ocs-import.spec sources 
Log Message:
update to 1.2 for glpi 0.71.2


Index: glpi-mass-ocs-import.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/EL-4/glpi-mass-ocs-import.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glpi-mass-ocs-import.spec	22 Feb 2008 21:06:05 -0000	1.1
+++ glpi-mass-ocs-import.spec	15 Sep 2008 18:40:02 -0000	1.2
@@ -2,7 +2,7 @@
 %define lockname     mass_ocs_import.lock
 
 Name:           glpi-mass-ocs-import
-Version:        1.1
+Version:        1.2
 Release:        1%{?dist}
 Summary:        GLPI Plugin for OCS Massive import
 Summary(fr):    Extension GLPI d'import en masse OCS
@@ -18,7 +18,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.70
+Requires:       glpi >= 0.71
 Requires:       %{_sysconfdir}/cron.d
 
 %description
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Sat Jul 12 2008 Remi Collet <Fedora at FamilleCollet.com> - 1.2-1
+- update to 1.2 for glpi 0.71
+
 * Thu Feb 14 2008 Remi Collet <Fedora at FamilleCollet.com> - 1.1-1
 - update to 1.1 (setup bug fixes)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Feb 2008 21:06:05 -0000	1.2
+++ sources	15 Sep 2008 18:40:02 -0000	1.3
@@ -1 +1 @@
-493ae5565f18b8f1318b8e39062818c2  glpi-mass_ocs_import-1.1.tar.gz
+725e8b7c7d230fda2e049e3bef058d5c  glpi-mass_ocs_import-1.2.tar.gz



From mitr at fedoraproject.org  Mon Sep 15 18:46:51 2008
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Mon, 15 Sep 2008 18:46:51 +0000 (UTC)
Subject: rpms/foobillard/devel foobillard.spec,1.13,1.14
Message-ID: <20080915184651.48459700EC@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/foobillard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30917

Modified Files:
	foobillard.spec 
Log Message:
* Mon Sep 15 2008 Miloslav Trma?? <mitr at volny.cz> - 3.0a-8
- Add missing Requires: dejavu-fonts
  Resolves: #462168



Index: foobillard.spec
===================================================================
RCS file: /cvs/extras/rpms/foobillard/devel/foobillard.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- foobillard.spec	19 Jul 2008 21:19:02 -0000	1.13
+++ foobillard.spec	15 Sep 2008 18:46:20 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           foobillard
 Version:        3.0a
-Release:        7
+Release:        8%{?dist}
 
 Summary:        OpenGL billard game
 
@@ -14,6 +14,7 @@
 Patch0:         foobillard-3.0a-nonv.patch
 Patch1:         foobillard-3.0a-no-fonts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires:       dejavu-fonts
 BuildRequires:  SDL-devel ImageMagick alsa-lib-devel
 BuildRequires:  freetype-devel libpng-devel perl zlib-devel
 BuildRequires:  libGL-devel libGLU-devel libX11-devel libXaw-devel libXi-devel
@@ -64,6 +65,10 @@
 
 
 %changelog
+* Mon Sep 15 2008 Miloslav Trma?? <mitr at volny.cz> - 3.0a-8
+- Add missing Requires: dejavu-fonts
+  Resolves: #462168
+
 * Sat Jul 19 2008 Miloslav Trma?? <mitr at volny.cz> - 3.0a-7
 - Don't ship the non-free fonts
 - Update License:



From spot at fedoraproject.org  Mon Sep 15 18:48:00 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 15 Sep 2008 18:48:00 +0000 (UTC)
Subject: rpms/python-simpletal/devel python-simpletal.spec,1.12,1.13
Message-ID: <20080915184800.2BD0F700EC@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-simpletal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31194

Modified Files:
	python-simpletal.spec 
Log Message:
fix missing egg-info


Index: python-simpletal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-simpletal/devel/python-simpletal.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- python-simpletal.spec	3 Sep 2008 19:01:45 -0000	1.12
+++ python-simpletal.spec	15 Sep 2008 18:47:29 -0000	1.13
@@ -4,7 +4,7 @@
 
 Name:           python-simpletal
 Version:        4.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        An XML based template processor for TAL, TALES and METAL specifications.
 
@@ -44,8 +44,12 @@
 %{python_sitelib}/simpletal/*.py
 %{python_sitelib}/simpletal/*.pyc
 %{python_sitelib}/simpletal/*.pyo
+%{python_sitelib}/SimpleTAL-%{version}-py*.egg-info
 
 %changelog
+* Mon Sep 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.1-8
+- fix missing egg-info
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.1-7
 - drop old abi Requires
 



From dwalluck at fedoraproject.org  Mon Sep 15 18:53:54 2008
From: dwalluck at fedoraproject.org (David Walluck)
Date: Mon, 15 Sep 2008 18:53:54 +0000 (UTC)
Subject: rpms/tomcat5/F-9 tomcat5.spec,1.112,1.113
Message-ID: <20080915185354.37AE5700EC@cvs1.fedora.phx.redhat.com>

Author: dwalluck

Update of /cvs/pkgs/rpms/tomcat5/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32115

Modified Files:
	tomcat5.spec 
Log Message:
- create commons-io symlink


Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/F-9/tomcat5.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- tomcat5.spec	15 Sep 2008 18:28:45 -0000	1.112
+++ tomcat5.spec	15 Sep 2008 18:53:23 -0000	1.113
@@ -1014,6 +1014,9 @@
     %{name}/catalina-host-manager 2>&1
 build-jar-repository %{serverdir}/webapps/manager/WEB-INF/lib \
     commons-fileupload %{name}/catalina-manager 2>&1
+build-jar-repository %{serverdir}/webapps/manager/WEB-INF/lib \
+    commons-io %{name}/catalina-manager 2>&1
+
 %if %{gcj_support}
     %{_bindir}/rebuild-gcj-db
 %endif



From mitr at fedoraproject.org  Mon Sep 15 18:55:00 2008
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Mon, 15 Sep 2008 18:55:00 +0000 (UTC)
Subject: rpms/foobillard/F-9 foobillard.spec,1.13,1.14
Message-ID: <20080915185500.BCB1B700EC@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/foobillard/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32355

Modified Files:
	foobillard.spec 
Log Message:
* Mon Sep 15 2008 Miloslav Trma?? <mitr at volny.cz> - 3.0a-8
- Add missing Requires: dejavu-fonts
  Resolves: #462168



Index: foobillard.spec
===================================================================
RCS file: /cvs/extras/rpms/foobillard/F-9/foobillard.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- foobillard.spec	21 Jul 2008 04:00:56 -0000	1.13
+++ foobillard.spec	15 Sep 2008 18:54:30 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           foobillard
 Version:        3.0a
-Release:        6%{?dist}
+Release:        8%{?dist}
 
 Summary:        OpenGL billard game
 
@@ -14,6 +14,7 @@
 Patch0:         foobillard-3.0a-nonv.patch
 Patch1:         foobillard-3.0a-no-fonts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires:       dejavu-fonts
 BuildRequires:  SDL-devel ImageMagick alsa-lib-devel
 BuildRequires:  freetype-devel libpng-devel perl zlib-devel
 BuildRequires:  libGL-devel libGLU-devel libX11-devel libXaw-devel libXi-devel
@@ -64,6 +65,10 @@
 
 
 %changelog
+* Mon Sep 15 2008 Miloslav Trma?? <mitr at volny.cz> - 3.0a-8
+- Add missing Requires: dejavu-fonts
+  Resolves: #462168
+
 * Sat Jul 19 2008 Miloslav Trma?? <mitr at volny.cz> - 3.0a-7
 - Don't ship the non-free fonts
 - Update License:



From mitr at fedoraproject.org  Mon Sep 15 19:02:22 2008
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Mon, 15 Sep 2008 19:02:22 +0000 (UTC)
Subject: rpms/foobillard/F-8 foobillard.spec,1.12,1.13
Message-ID: <20080915190222.ADF47700EC@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/foobillard/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1145

Modified Files:
	foobillard.spec 
Log Message:
* Mon Sep 15 2008 Miloslav Trma?? <mitr at volny.cz> - 3.0a-8
- Add missing Requires: dejavu-fonts
  Resolves: #462168



Index: foobillard.spec
===================================================================
RCS file: /cvs/extras/rpms/foobillard/F-8/foobillard.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- foobillard.spec	21 Jul 2008 04:00:30 -0000	1.12
+++ foobillard.spec	15 Sep 2008 19:01:52 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           foobillard
 Version:        3.0a
-Release:        6%{?dist}
+Release:        8%{?dist}
 
 Summary:        OpenGL billard game
 
@@ -14,6 +14,7 @@
 Patch0:         foobillard-3.0a-nonv.patch
 Patch1:         foobillard-3.0a-no-fonts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires:       dejavu-fonts
 BuildRequires:  SDL-devel ImageMagick alsa-lib-devel
 BuildRequires:  freetype-devel libpng-devel perl zlib-devel
 BuildRequires:  libGL-devel libGLU-devel libX11-devel libXaw-devel libXi-devel
@@ -64,6 +65,10 @@
 
 
 %changelog
+* Mon Sep 15 2008 Miloslav Trma?? <mitr at volny.cz> - 3.0a-8
+- Add missing Requires: dejavu-fonts
+  Resolves: #462168
+
 * Sat Jul 19 2008 Miloslav Trma?? <mitr at volny.cz> - 3.0a-7
 - Don't ship the non-free fonts
 - Update License:



From dwalluck at fedoraproject.org  Mon Sep 15 19:03:49 2008
From: dwalluck at fedoraproject.org (David Walluck)
Date: Mon, 15 Sep 2008 19:03:49 +0000 (UTC)
Subject: rpms/tomcat5/F-8 tomcat5.spec,1.113,1.114
Message-ID: <20080915190349.E6FE1700EC@cvs1.fedora.phx.redhat.com>

Author: dwalluck

Update of /cvs/pkgs/rpms/tomcat5/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1502

Modified Files:
	tomcat5.spec 
Log Message:
- add commons-io symlink


Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/F-8/tomcat5.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- tomcat5.spec	15 Sep 2008 17:46:11 -0000	1.113
+++ tomcat5.spec	15 Sep 2008 19:03:19 -0000	1.114
@@ -69,7 +69,7 @@
 Name: tomcat5
 Epoch: 0
 Version: 5.5.27
-Release: 0jpp.1%{?dist}
+Release: 0jpp.2%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 
 Group: Networking/Daemons
@@ -495,7 +495,6 @@
 commons-collections.jar=$(build-classpath commons-collections)
 commons-logging.jar=$(build-classpath commons-logging)
 commons-daemon.jar=$(build-classpath commons-daemon)
-commons-io.jar=$(build-classpath commons-io)
 junit.jar=$(build-classpath junit)
 jasper-compiler-jdt.jar=$(build-classpath eclipse-ecj)
 EOBP
@@ -1013,6 +1012,8 @@
     %{name}/catalina-host-manager 2>&1
 build-jar-repository %{serverdir}/webapps/manager/WEB-INF/lib \
     commons-fileupload %{name}/catalina-manager 2>&1
+build-jar-repository %{serverdir}/webapps/manager/WEB-INF/lib \
+    commons-io %{name}/catalina-manager 2>&1
 %if %{gcj_support}
     %{_bindir}/rebuild-gcj-db
 %endif
@@ -1303,6 +1304,9 @@
 %endif
 
 %changelog
+* Mon Sep 15 2008 David Walluck <dwalluck at redhat.com> 0:5.5.27-0jpp.2
+- add commons-io symlink
+
 * Mon Sep 15 2008 David Walluck <dwalluck at redhat.com> 0:5.5.27-0jpp.1
 - 5.5.27
   Resolves: rhbz#456120



From pingou at fedoraproject.org  Mon Sep 15 19:14:30 2008
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Mon, 15 Sep 2008 19:14:30 +0000 (UTC)
Subject: rpms/R-maanova/F-9 R-maanova.spec,1.2,1.3
Message-ID: <20080915191431.1100670138@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-maanova/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3175

Modified Files:
	R-maanova.spec 
Log Message:



Index: R-maanova.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-maanova/F-9/R-maanova.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- R-maanova.spec	19 Feb 2008 19:32:50 -0000	1.2
+++ R-maanova.spec	15 Sep 2008 19:14:00 -0000	1.3
@@ -1,15 +1,16 @@
 %define packname  maanova
+%define bioc      2.2
 
 Name:             R-%{packname}
-Version:          1.9.0 
-Release:          2%{?dist}
+Version:          1.10.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
 
 Group:            Applications/Productivity
 License:          GPLv2+ 
-URL:              http://www.bioconductor.org/packages/2.1/bioc/html/maanova.html
-Source0:          http://www.bioconductor.org/packages/2.2/bioc/src/contrib/%{packname}_%{version}.tar.gz
+URL:              http://www.bioconductor.org/packages/%{bioc}/bioc/html/maanova.html
+Source0:          http://www.bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:         R-qvalue
@@ -38,6 +39,9 @@
 chmod -x %{packname}/inst/*.txt
 chmod -x %{packname}/src/*.c
 %{__sed} -i -e 's/\r$//'  %{packname}/DESCRIPTION
+# With this it can build, but leads to lot of warning
+# 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
 
 
@@ -89,6 +93,9 @@
 
 
 %changelog
+* Fri May 02 2008 Pingou <pingoufc4 at yahoo.fr> 1.10.0-1
+- Update to bioconductor 2.2
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.9.0-2
 - Autorebuild for GCC 4.3
 



From pingou at fedoraproject.org  Mon Sep 15 19:15:04 2008
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Mon, 15 Sep 2008 19:15:04 +0000 (UTC)
Subject: rpms/R-maanova/F-9 sources,1.2,1.3
Message-ID: <20080915191504.2721570138@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-maanova/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3332

Modified Files:
	sources 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-maanova/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jan 2008 18:56:15 -0000	1.2
+++ sources	15 Sep 2008 19:14:33 -0000	1.3
@@ -1 +1 @@
-2a940b10b5140c72ad24a4db9c63289e  maanova_1.9.0.tar.gz
+04f1b6d5c7695aa5e333bc9aaa5bb374  maanova_1.10.0.tar.gz



From pingou at fedoraproject.org  Mon Sep 15 19:18:47 2008
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Mon, 15 Sep 2008 19:18:47 +0000 (UTC)
Subject: rpms/R-maanova/F-8 R-maanova.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20080915191847.61C5E700EC@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-maanova/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4023

Modified Files:
	R-maanova.spec sources 
Log Message:



Index: R-maanova.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-maanova/F-8/R-maanova.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- R-maanova.spec	19 Jan 2008 18:59:28 -0000	1.1
+++ R-maanova.spec	15 Sep 2008 19:18:16 -0000	1.2
@@ -1,15 +1,16 @@
 %define packname  maanova
+%define bioc      2.2
 
 Name:             R-%{packname}
-Version:          1.9.0 
+Version:          1.10.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
 
 Group:            Applications/Productivity
 License:          GPLv2+ 
-URL:              http://www.bioconductor.org/packages/2.1/bioc/html/maanova.html
-Source0:          http://www.bioconductor.org/packages/2.2/bioc/src/contrib/%{packname}_%{version}.tar.gz
+URL:              http://www.bioconductor.org/packages/%{bioc}/bioc/html/maanova.html
+Source0:          http://www.bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:         R-qvalue
@@ -38,6 +39,9 @@
 chmod -x %{packname}/inst/*.txt
 chmod -x %{packname}/src/*.c
 %{__sed} -i -e 's/\r$//'  %{packname}/DESCRIPTION
+# With this it can build, but leads to lot of warning
+# 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
 
 
@@ -89,6 +93,12 @@
 
 
 %changelog
+* Fri May 02 2008 Pingou <pingoufc4 at yahoo.fr> 1.10.0-1
+- Update to bioconductor 2.2
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.9.0-2
+- Autorebuild for GCC 4.3
+
 * Wed Jan 16 2008 Pingou <pingoufc4 at yahoo.fr> 1.9.0-1
 - Update to version 1.9.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-maanova/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jan 2008 18:59:28 -0000	1.2
+++ sources	15 Sep 2008 19:18:16 -0000	1.3
@@ -1 +1 @@
-2a940b10b5140c72ad24a4db9c63289e  maanova_1.9.0.tar.gz
+04f1b6d5c7695aa5e333bc9aaa5bb374  maanova_1.10.0.tar.gz



From pingou at fedoraproject.org  Mon Sep 15 19:27:48 2008
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Mon, 15 Sep 2008 19:27:48 +0000 (UTC)
Subject: rpms/R-maanova/F-8 R-maanova.spec,1.2,1.3
Message-ID: <20080915192748.B9AB6700EC@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-maanova/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5364

Modified Files:
	R-maanova.spec 
Log Message:



Index: R-maanova.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-maanova/F-8/R-maanova.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- R-maanova.spec	15 Sep 2008 19:18:16 -0000	1.2
+++ R-maanova.spec	15 Sep 2008 19:27:18 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:             R-%{packname}
 Version:          1.10.0 
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Analysis of N-dye Micro Array using mixed model effect
 Summary(fr):      Analise de puce ?? ADN ?? N marqueurs par different mod??le
 
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Pingou <pingoufc4 at yahoo.fr> 1.10.0-2
+- Increase release for buile
+
 * Fri May 02 2008 Pingou <pingoufc4 at yahoo.fr> 1.10.0-1
 - Update to bioconductor 2.2
 



From pingou at fedoraproject.org  Mon Sep 15 19:29:26 2008
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Mon, 15 Sep 2008 19:29:26 +0000 (UTC)
Subject: rpms/R-maanova/F-9 R-maanova.spec,1.3,1.4
Message-ID: <20080915192926.07826700EC@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-maanova/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5657

Modified Files:
	R-maanova.spec 
Log Message:



Index: R-maanova.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-maanova/F-9/R-maanova.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- R-maanova.spec	15 Sep 2008 19:14:00 -0000	1.3
+++ R-maanova.spec	15 Sep 2008 19:28:55 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:             R-%{packname}
 Version:          1.10.0 
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Analysis of N-dye Micro Array using mixed model effect
 Summary(fr):      Analise de puce ?? ADN ?? N marqueurs par different mod??le
 
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Pingou <pingoufc4 at yahoo.fr> 1.10.0-2
+- Increase release for buile
+
 * Fri May 02 2008 Pingou <pingoufc4 at yahoo.fr> 1.10.0-1
 - Update to bioconductor 2.2
 



From spot at fedoraproject.org  Mon Sep 15 19:33:05 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 15 Sep 2008 19:33:05 +0000 (UTC)
Subject: rpms/R-Matrix/devel .cvsignore, 1.2, 1.3 R-Matrix.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080915193305.07DBA700EC@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R-Matrix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6203

Modified Files:
	.cvsignore R-Matrix.spec sources 
Log Message:
update to packrel 14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-Matrix/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Feb 2008 04:14:07 -0000	1.2
+++ .cvsignore	15 Sep 2008 19:32:34 -0000	1.3
@@ -1 +1 @@
-Matrix_0.999375-4.tar.gz
+Matrix_0.999375-14.tar.gz


Index: R-Matrix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Matrix/devel/R-Matrix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- R-Matrix.spec	12 Feb 2008 04:14:07 -0000	1.1
+++ R-Matrix.spec	15 Sep 2008 19:32:34 -0000	1.2
@@ -1,9 +1,9 @@
-%define packrel  4
+%define packrel  14
 %define packname Matrix
 
 Name:           R-%{packname}
 Version:        0.999375
-Release:        4%{?dist}
+Release:        5%{?dist}
 Source0:        ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz
 License:        GPLv2+
 #GPL version 2 or later.
@@ -11,7 +11,7 @@
 # from the University of Florida sparse matrix library maintained by Tim
 # Davis.  All sections of that code are covered by the GPL or LGPL
 # licenses.  See the directory doc/UFsparse for details.
-URL:            http://cran.r-project.org/contrib/main/Descriptions/Matrix.html
+URL:            http://cran.r-project.org/web/packages/Matrix/index.html
 Group:          Applications/Engineering
 Summary: R module, Classes etc. for dense and sparse matrices and matrix ops
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -94,6 +94,9 @@
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Mon Sep 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.999375-5
+- update to packrel=14
+
 * Sat Jan 26 2008 Tom Moertel <tom at moertel.com> - 0.999375-4
 - Updated for Matrix 0.999375 (packrel=4)
 - Made tweaks per most-recent Fedora R-packaging guidelines


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Matrix/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Feb 2008 04:14:07 -0000	1.2
+++ sources	15 Sep 2008 19:32:34 -0000	1.3
@@ -1 +1 @@
-08ba8e0269e0ae28df54887e59842823  Matrix_0.999375-4.tar.gz
+cdbca53dc7457a2d1479c1dd5f76b50b  Matrix_0.999375-14.tar.gz



From pwouters at fedoraproject.org  Mon Sep 15 19:34:57 2008
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Mon, 15 Sep 2008 19:34:57 +0000 (UTC)
Subject: rpms/libotr/EL-5 libotr.spec,1.13,1.14
Message-ID: <20080915193457.9332E700EC@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/libotr/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6528

Modified Files:
	libotr.spec 
Log Message:
* Mon Sep 15 2008 Paul Wouters <paul at cypherpunks.ca> 3.1.0-2
- Fix license tag



Index: libotr.spec
===================================================================
RCS file: /cvs/extras/rpms/libotr/EL-5/libotr.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libotr.spec	7 Aug 2007 17:57:44 -0000	1.13
+++ libotr.spec	15 Sep 2008 19:34:27 -0000	1.14
@@ -1,8 +1,8 @@
 Summary: Off-The-Record Messaging library and toolkit
 Name: libotr
 Version: 3.1.0
-Release: 1%{?dist}
-License: GPL, LGPL
+Release: 2%{?dist}
+License: GPLv2 and LGPLv2
 Group: System Environment/Libraries
 Source0: http://otr.cypherpunks.ca/%{name}-%{version}.tar.gz
 Url: http://otr.cypherpunks.ca/
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Paul Wouters <paul at cypherpunks.ca> 3.1.0-2
+- Fix license tag
+
 * Wed Aug  1 2007 Paul Wouters <paul at cypherpunks.ca> 3.1.0-1
 - Upgraded to current version
 - Updated URLS and configure line



From dwalluck at fedoraproject.org  Mon Sep 15 19:49:21 2008
From: dwalluck at fedoraproject.org (David Walluck)
Date: Mon, 15 Sep 2008 19:49:21 +0000 (UTC)
Subject: rpms/tomcat5/F-9 tomcat5.spec,1.113,1.114
Message-ID: <20080915194921.F27FE700EC@cvs1.fedora.phx.redhat.com>

Author: dwalluck

Update of /cvs/pkgs/rpms/tomcat5/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8730

Modified Files:
	tomcat5.spec 
Log Message:
- add commons-io symlink


Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/F-9/tomcat5.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- tomcat5.spec	15 Sep 2008 18:53:23 -0000	1.113
+++ tomcat5.spec	15 Sep 2008 19:48:51 -0000	1.114
@@ -69,7 +69,7 @@
 Name: tomcat5
 Epoch: 0
 Version: 5.5.27
-Release: 0jpp.1%{?dist}
+Release: 0jpp.2%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 
 Group: Networking/Daemons
@@ -495,7 +495,6 @@
 commons-collections.jar=$(build-classpath commons-collections)
 commons-logging.jar=$(build-classpath commons-logging)
 commons-daemon.jar=$(build-classpath commons-daemon)
-commons-io.jar=$(build-classpath commons-io)
 junit.jar=$(build-classpath junit)
 jasper-compiler-jdt.jar=$(build-classpath eclipse-ecj)
 EOBP
@@ -1307,6 +1306,9 @@
 %endif
 
 %changelog
+* Mon Sep 15 2008 David Walluck <dwalluck at redhat.com> 0:5.5.27-0jpp.2
+- add commons-io symlink
+
 * Mon Sep 15 2008 David Walluck <dwalluck at redhat.com> 0:5.5.27-0jpp.1
 - 5.5.27
   Resolves: rhbz#456120



From nalin at fedoraproject.org  Mon Sep 15 19:49:33 2008
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 15 Sep 2008 19:49:33 +0000 (UTC)
Subject: rpms/libgcrypt/devel libgcrypt.spec,1.29,1.30
Message-ID: <20080915194933.63E2C700EC@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/libgcrypt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8821

Modified Files:
	libgcrypt.spec 
Log Message:
- invoke make with %%{?_smp_mflags} to build faster on multi-processor
  systems (Steve Grubb)



Index: libgcrypt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/devel/libgcrypt.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libgcrypt.spec	8 Sep 2008 23:05:08 -0000	1.29
+++ libgcrypt.spec	15 Sep 2008 19:49:03 -0000	1.30
@@ -32,7 +32,7 @@
 
 %build
 %configure --disable-static --enable-noexecstack
-make
+make %{?_smp_mflags}
 
 %check
 make check
@@ -114,6 +114,10 @@
 %{_infodir}/gcrypt.info*
 
 %changelog
+* Mon Sep 15 2008 Nalin Dahyabhai <nalin at redhat.com>
+- invoke make with %%{?_smp_mflags} to build faster on multi-processor
+  systems (Steve Grubb)
+
 * Mon Sep  8 2008 Nalin Dahyabhai <nalin at redhat.com> 1.4.2-1
 - update to 1.4.2
 



From michich at fedoraproject.org  Mon Sep 15 20:17:33 2008
From: michich at fedoraproject.org (Michal Schmidt)
Date: Mon, 15 Sep 2008 20:17:33 +0000 (UTC)
Subject: rpms/jabbim/devel jabbim-0.4-stringlists-in-QVariants.diff, NONE,
	1.1 jabbim.spec, 1.22, 1.23
Message-ID: <20080915201733.C9FC370138@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12426

Modified Files:
	jabbim.spec 
Added Files:
	jabbim-0.4-stringlists-in-QVariants.diff 
Log Message:
* Mon Sep 15 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4.3-2
- Doubleclicking on bookmarks did not open the chat window.
  Caused by a change in PyQt in constructing QVariants from lists of strings.


jabbim-0.4-stringlists-in-QVariants.diff:

--- NEW FILE jabbim-0.4-stringlists-in-QVariants.diff ---
QtCore.QVariant([...]) does not seem to work as expected with F10's Qt version.
Let's be explicit and always make a QStringList first.

Current SVN upstream does it this way too (at least for the bookmarks code
which is where the problem was reported).

Patch created using:
find . -name '*.py' | while read f; do sed -i -e 's/QVariant(\(\[[^]]*\]\)/QVariant(QtCore.QStringList(\1)/' $f; done

diff -Nurp jabbim-0.4.3.orig/jabbim.py jabbim-0.4.3/jabbim.py
--- jabbim-0.4.3.orig/jabbim.py	2008-07-02 15:02:20.000000000 +0200
+++ jabbim-0.4.3/jabbim.py	2008-09-15 22:03:08.000000000 +0200
@@ -2855,7 +2855,7 @@ class mainWindow(QtGui.QMainWindow):
 			t = self.activities['none']
 			action = activity.addAction(t)
 			action.setObjectName('activity')
-			action.setData(QtCore.QVariant(['none']))
+			action.setData(QtCore.QVariant(QtCore.QStringList(['none'])))
 			activity.addSeparator()
 			for group, txt in self.activityGroups.iteritems():
 				menu = activity.addMenu(txt[0])
@@ -2865,7 +2865,7 @@ class mainWindow(QtGui.QMainWindow):
 					t = self.activities[a]
 					action = menu.addAction(t)
 					action.setObjectName('activity')
-					action.setData(QtCore.QVariant([group, a]))
+					action.setData(QtCore.QVariant(QtCore.QStringList([group, a])))
 			moodButtonRoot.addMenu(activity)
 			self.ui.moodButton.setMenu(moodButtonRoot)
 		else:
@@ -2924,7 +2924,7 @@ class mainWindow(QtGui.QMainWindow):
 					if separator and len(config[key])!=0:
 						menu.addSeparator()
 					action=menu.addAction(self.getIcon("1@"+transport,status=key,size="16x16"),self.status[key])
-					action.setData(QtCore.QVariant([key,unicode(transport)]))
+					action.setData(QtCore.QVariant(QtCore.QStringList([key,unicode(transport)])))
 					if len(config[key])!=0:
 						for val in config[key]:
 							status=val[0]
@@ -2934,7 +2934,7 @@ class mainWindow(QtGui.QMainWindow):
 							else:
 								action=menu.addAction(self.getIcon("1@"+transport,status=key,size="16x16"),unicode(status))
 							# [show_idOfMessage,jidOfTransport]
-							action.setData(QtCore.QVariant([key+"_"+unicode(index),unicode(transport)]))
+							action.setData(QtCore.QVariant(QtCore.QStringList([key+"_"+unicode(index),unicode(transport)])))
 							font=action.font()
 							font.setItalic(True)
 							action.setFont(font)
@@ -2943,7 +2943,7 @@ class mainWindow(QtGui.QMainWindow):
 					else:
 						separator=True
 				action=menu.addAction(self.getIcon('1@'+transport,status="offline",size="16x16"),self.tr("Log out"))
-				action.setData(QtCore.QVariant(['offline',unicode(transport)]))
+				action.setData(QtCore.QVariant(QtCore.QStringList(['offline',unicode(transport)])))
 				if separator:
 					menu.addSeparator()
 
@@ -3669,7 +3669,7 @@ class mainWindow(QtGui.QMainWindow):
 			item=QtGui.QTreeWidgetItem(self.ui.bookmarks)
 			item.setText(0,unicode(v.name))
 			item.setText(1,unicode(v.jid.full()))
-			item.setData(0,32,QtCore.QVariant([unicode(v.jid.full()),unicode(v.nick),unicode(v.password)]))
+			item.setData(0,32,QtCore.QVariant(QtCore.QStringList([unicode(v.jid.full()),unicode(v.nick),unicode(v.password)])))
 			item.setIcon(0,QtGui.QIcon("images/16x16/categories/muc.png"))
 
 	def autoJoinGroupchat(self):
diff -Nurp jabbim-0.4.3.orig/plugins/jdm/jdm.py jabbim-0.4.3/plugins/jdm/jdm.py
--- jabbim-0.4.3.orig/plugins/jdm/jdm.py	2008-06-21 18:39:42.000000000 +0200
+++ jabbim-0.4.3/plugins/jdm/jdm.py	2008-09-15 22:03:11.000000000 +0200
@@ -350,7 +350,7 @@ class Plugin(plugins.PluginBase):
 			size=file[1]
 			ext=name.split('.')[-1]
 			item=QtGui.QListWidgetItem(unicode(name))
-			item.setData(32,QtCore.QVariant([unicode(size)]))
+			item.setData(32,QtCore.QVariant(QtCore.QStringList([unicode(size)])))
 			if ext in ["exe","run","sh","bin"]: 
 				item.setIcon(QtGui.QIcon(self.pluginDir+"/application-x-executable.png"))
 			elif ext in ["svg","jpg","png","gif","tif","tiff","bmp","ico","xcf"]: 
diff -Nurp jabbim-0.4.3.orig/widgets/commands.py jabbim-0.4.3/widgets/commands.py
--- jabbim-0.4.3.orig/widgets/commands.py	2008-06-21 18:39:42.000000000 +0200
+++ jabbim-0.4.3/widgets/commands.py	2008-09-15 22:03:09.000000000 +0200
@@ -147,7 +147,7 @@ class Commands:
 		for command in commands:
 			action=self.submenu.addAction(command["name"])
 			action.setObjectName("ad_hoc_command")
-			action.setData(QtCore.QVariant([command['node'], command['name']]))
+			action.setData(QtCore.QVariant(QtCore.QStringList([command['node']), command['name']]))
 			button = QtGui.QPushButton(self.dialog)
 			button.setText(unicode(command["name"]))
 			#button.setObjectName(unicode(command["node"])) # ? + jid
diff -Nurp jabbim-0.4.3.orig/widgets/groupchat.py jabbim-0.4.3/widgets/groupchat.py
--- jabbim-0.4.3.orig/widgets/groupchat.py	2008-07-02 22:40:06.000000000 +0200
+++ jabbim-0.4.3/widgets/groupchat.py	2008-09-15 22:03:08.000000000 +0200
@@ -344,7 +344,7 @@ class groupChatWidget(abstractChatWidget
 				if user.truejid != None:
 					tjid = jidT.JID(user.truejid).userhost()
 					action=menu.addAction(self.tr("Add to roster"))
-					action.setData(QtCore.QVariant([tjid, name]))
+					action.setData(QtCore.QVariant(QtCore.QStringList([tjid, name])))
 					action.setIcon(QtGui.QIcon("images/16x16/actions/add-user.png"))
 					action.setObjectName("add-user")
 			# vcard action
diff -Nurp jabbim-0.4.3.orig/widgets/rosterLiveWidget.py jabbim-0.4.3/widgets/rosterLiveWidget.py
--- jabbim-0.4.3.orig/widgets/rosterLiveWidget.py	2008-06-24 21:59:27.000000000 +0200
+++ jabbim-0.4.3/widgets/rosterLiveWidget.py	2008-09-15 22:03:09.000000000 +0200
@@ -1882,7 +1882,7 @@ class rosterWidget(QtGui.QWidget):
 			submenu = contactMenu.addMenu(QtGui.QIcon("images/16x16/categories/muc.png"),self.tr("Invite to conference"))
 			for gc in self.main.client.groupchats.keys():
 				action = submenu.addAction(gc)
-				action.setData(QtCore.QVariant([jid.full(), gc]))
+				action.setData(QtCore.QVariant(QtCore.QStringList([jid.full(), gc])))
 				action.setObjectName("invite_gc")
 
 
@@ -1894,7 +1894,7 @@ class rosterWidget(QtGui.QWidget):
 		for status in ["online", "chat", "away", "xa", "dnd", "offline"]:
 			action=submenu.addAction(self.main.getIcon(status=status,size="32x32"),self.main.status[status])
 			action.setObjectName("custom_status")
-			action.setData(QtCore.QVariant([unicode(status), unicode(jid.userhost())]))
+			action.setData(QtCore.QVariant(QtCore.QStringList([unicode(status), unicode(jid.userhost())])))
 
 		# separator
 		contactMenu.addSeparator()
@@ -1929,7 +1929,7 @@ class rosterWidget(QtGui.QWidget):
 		## delete from group
 		#if group!=None and len(self.main.client.roster['users'][jid].groups)>1:
 			#action=contactMenu.addAction(self.tr("Delete from group"))
-			#action.setData(QtCore.QVariant([unicode(jid),u"-"+group]))
+			#action.setData(QtCore.QVariant(QtCore.QStringList([unicode(jid),u"-"+group])))
 			#action.setObjectName("check_group")
 		## delete from roster
 		#action=contactMenu.addAction(self.tr("Delete from roster"))
@@ -1970,17 +1970,17 @@ class rosterWidget(QtGui.QWidget):
 			##if len(self.main.client.roster['users'][jid].groups)==0:
 				##if k=="Unknown":
 					##action.setChecked(True)
-					##action.setData(QtCore.QVariant([unicode(jid),u"-"+unicode(k)]))
+					##action.setData(QtCore.QVariant(QtCore.QStringList([unicode(jid),u"-"+unicode(k)])))
 				##else:
-					##action.setData(QtCore.QVariant([unicode(jid),u"+"+unicode(k)]))
+					##action.setData(QtCore.QVariant(QtCore.QStringList([unicode(jid),u"+"+unicode(k)])))
 			##else:
 				#if k in self.main.client.roster['users'][jid].groups:
 					#action.setChecked(True)
-					#action.setData(QtCore.QVariant([unicode(jid),u"-"+unicode(k)]))
+					#action.setData(QtCore.QVariant(QtCore.QStringList([unicode(jid),u"-"+unicode(k)])))
 					#if len(self.main.client.roster['users'][jid].groups)<=1:
 						#action.setEnabled(False)
 				#else:
-					#action.setData(QtCore.QVariant([unicode(jid),u"+"+unicode(k)]))
+					#action.setData(QtCore.QVariant(QtCore.QStringList([unicode(jid),u"+"+unicode(k)])))
 				
 		if self.main.client.privacy:
 			if self.main.client.privacy.active:
@@ -2057,7 +2057,7 @@ class rosterWidget(QtGui.QWidget):
 			if oneres:
 				for gc in self.main.client.groupchats.keys():
 					action = submenu.addAction(gc)
-					action.setData(QtCore.QVariant([jid, gc]))
+					action.setData(QtCore.QVariant(QtCore.QStringList([jid, gc])))
 					action.setObjectName("invite_gc")
 			else:
 				for gc in self.main.client.groupchats.keys():
@@ -2065,7 +2065,7 @@ class rosterWidget(QtGui.QWidget):
 					for res in contact.resources.keys():
 						if res != None:
 							action = submenu2.addAction(res)
-							action.setData(QtCore.QVariant(["%s/%s" % (jid, res), gc]))
+							action.setData(QtCore.QVariant(QtCore.QStringList(["%s/%s" % (jid, res), gc])))
 							action.setObjectName("invite_gc")
 		# one2one -> muc
 		lst = []
@@ -2079,7 +2079,7 @@ class rosterWidget(QtGui.QWidget):
 				for name in lst:
 					action = submenu.addAction(self.getNameByJID(name))
 					action.setObjectName("invite_chat")
-					action.setData(QtCore.QVariant([unicode(name), jid]))
+					action.setData(QtCore.QVariant(QtCore.QStringList([unicode(name), jid])))
 			else:
 				for name in lst:
 					submenu2 = submenu.addMenu(self.getNameByJID(name))
@@ -2087,7 +2087,7 @@ class rosterWidget(QtGui.QWidget):
 						if res != None:
 							action = submenu2.addAction(res)
 							action.setObjectName("invite_chat")
-							action.setData(QtCore.QVariant([unicode(name),"%s/%s" % (jid, res) ])) # kam pozyvame, koho
+							action.setData(QtCore.QVariant(QtCore.QStringList([unicode(name),"%s/%s" % (jid, res) ]))) # kam pozyvame, koho
 					
 		# custom status
 		submenu=contactMenu.addMenu(self.tr("Custom status"))
@@ -2095,7 +2095,7 @@ class rosterWidget(QtGui.QWidget):
 		for status in ["online", "chat", "away", "xa", "dnd", "offline"]:
 			action=submenu.addAction(self.main.getIcon(status=status,size="32x32"),self.main.status[status])
 			action.setObjectName("custom_status")
-			action.setData(QtCore.QVariant([unicode(status), unicode(jid)]))
+			action.setData(QtCore.QVariant(QtCore.QStringList([unicode(status), unicode(jid)])))
 
 		# separator
 		contactMenu.addSeparator()
@@ -2158,7 +2158,7 @@ class rosterWidget(QtGui.QWidget):
 		# delete from group
 		if group!=None and len(self.main.client.roster['users'][jid].groups)>1:
 			action=contactMenu.addAction(self.tr("Delete from group"))
-			action.setData(QtCore.QVariant([unicode(jid),u"-"+group]))
+			action.setData(QtCore.QVariant(QtCore.QStringList([unicode(jid),u"-"+group])))
 			action.setObjectName("check_group")
 		# delete from roster
 		action=contactMenu.addAction(self.tr("Delete from roster"))
@@ -2199,17 +2199,17 @@ class rosterWidget(QtGui.QWidget):
 			#if len(self.main.client.roster['users'][jid].groups)==0:
 				#if k=="Unknown":
 					#action.setChecked(True)
-					#action.setData(QtCore.QVariant([unicode(jid),u"-"+unicode(k)]))
+					#action.setData(QtCore.QVariant(QtCore.QStringList([unicode(jid),u"-"+unicode(k)])))
 				#else:
-					#action.setData(QtCore.QVariant([unicode(jid),u"+"+unicode(k)]))
+					#action.setData(QtCore.QVariant(QtCore.QStringList([unicode(jid),u"+"+unicode(k)])))
 			#else:
 				if k in self.main.client.roster['users'][jid].groups:
 					action.setChecked(True)
-					action.setData(QtCore.QVariant([unicode(jid),u"-"+unicode(k)]))
+					action.setData(QtCore.QVariant(QtCore.QStringList([unicode(jid),u"-"+unicode(k)])))
 					if len(self.main.client.roster['users'][jid].groups)<=1:
 						action.setEnabled(False)
 				else:
-					action.setData(QtCore.QVariant([unicode(jid),u"+"+unicode(k)]))
+					action.setData(QtCore.QVariant(QtCore.QStringList([unicode(jid),u"+"+unicode(k)])))
 				
 		if self.main.client.privacy:
 			if self.main.client.privacy.active:
@@ -2285,7 +2285,7 @@ class rosterWidget(QtGui.QWidget):
 		for status in ["online", "chat", "away", "xa", "dnd", "offline"]:
 			action=submenu.addAction(self.main.getIcon(status=status,size="32x32"),self.main.status[status])
 			action.setObjectName("custom_status")
-			action.setData(QtCore.QVariant([unicode(status), unicode(name)]))
+			action.setData(QtCore.QVariant(QtCore.QStringList([unicode(status), unicode(name)])))
 		
 		# signal
 		contactMenu.connect(contactMenu, QtCore.SIGNAL("triggered ( QAction * )"),self.groupMenuTriggered)
diff -Nurp jabbim-0.4.3.orig/widgets/rosterWidget.py jabbim-0.4.3/widgets/rosterWidget.py
--- jabbim-0.4.3.orig/widgets/rosterWidget.py	2008-06-21 18:39:42.000000000 +0200
+++ jabbim-0.4.3/widgets/rosterWidget.py	2008-09-15 22:03:09.000000000 +0200
@@ -220,7 +220,7 @@ class rosterWidget(QtGui.QTreeWidget):
 		item=QtGui.QTreeWidgetItem(parent)
 		item.setText(1,"9")
 		# add new resource called 'name', JID 'jid' with QTreeWidgetItem 'user'
-		item.setData(32,0,QtCore.QVariant([unicode(tag),unicode("metaparent")]))
+		item.setData(32,0,QtCore.QVariant(QtCore.QStringList([unicode(tag),unicode("metaparent")])))
 		item.setData(32,1,QtCore.QVariant(unicode(tag)))
 		if offline!=False:
 			self.setItemHidden(item, True)
@@ -241,7 +241,7 @@ class rosterWidget(QtGui.QTreeWidget):
 		item.setText(1,"9"+unicode(name).lower())
 		item.setText(2,unicode(name))
 		item.setText(4,unicode(jid))
-		item.setData(32,0,QtCore.QVariant([unicode(jid),unicode("meta")]))
+		item.setData(32,0,QtCore.QVariant(QtCore.QStringList([unicode(jid),unicode("meta")])))
 		if offline!=False:
 			self.setItemHidden(item, True)
 		self.sortItems(1,QtCore.Qt.AscendingOrder)
@@ -258,7 +258,7 @@ class rosterWidget(QtGui.QTreeWidget):
 		item.setText(0,unicode(name))
 		item.setText(1,"9"+unicode(name).lower())
 		item.setText(2,unicode(name))
-		item.setData(32,0,QtCore.QVariant([unicode(jid),unicode("resource")]))
+		item.setData(32,0,QtCore.QVariant(QtCore.QStringList([unicode(jid),unicode("resource")])))
 		self.sortItems(1,QtCore.Qt.AscendingOrder)
 		return item
 
@@ -324,7 +324,7 @@ class rosterWidget(QtGui.QTreeWidget):
 ###				print "not contact"
 				#return False
 			#i=self.getUserItems(jid)[0].clone() # clone contact item
-			#i.setData(32,0,QtCore.QVariant([unicode(jid),unicode("meta")]))
+			#i.setData(32,0,QtCore.QVariant(QtCore.QStringList([unicode(jid),unicode("meta")])))
 			#for contact in self.getUserItems(jid):
 				#it=contact.data(32,0)
 				#it=it.toList()
@@ -342,9 +342,9 @@ class rosterWidget(QtGui.QTreeWidget):
 		## Vytvoreni noveho metakontaktu sloucenim dvou kontaktu
 		#elif newParentTyp=="contact" and typ=="contact":
 			#i=self.getUserItems(jid)[0].clone() # clone contact item
-			#i.setData(32,0,QtCore.QVariant([unicode(jid),unicode("meta")]))
+			#i.setData(32,0,QtCore.QVariant(QtCore.QStringList([unicode(jid),unicode("meta")])))
 			#i2=self.getUserItems(newParentJid)[0].clone() # clone contact item
-			#i2.setData(32,0,QtCore.QVariant([unicode(newParentJid),unicode("meta")]))
+			#i2.setData(32,0,QtCore.QVariant(QtCore.QStringList([unicode(newParentJid),unicode("meta")])))
 
 			#self.main.client.metaParents[newParentJid]=self.addMetaParent(newParentJid,newParent.parent())
 			#self.main.client.metaParents[newParentJid].addChild(i)
@@ -379,7 +379,7 @@ class rosterWidget(QtGui.QTreeWidget):
 ###				print "not contact"
 				#return False
 			#i=self.getUserItems(jid,"meta")[0].clone() # clone contact item
-			#i.setData(32,0,QtCore.QVariant([unicode(jid),unicode("contact")]))
+			#i.setData(32,0,QtCore.QVariant(QtCore.QStringList([unicode(jid),unicode("contact")])))
 			
 			#oldParent.takeChild(oldParent.indexOfChild(item))
 	
@@ -403,13 +403,13 @@ class rosterWidget(QtGui.QTreeWidget):
 				#if len(groups)==0:
 					## add user item to Unknown group
 					#i=self.getUserItems(jid)[0].clone() # clone contact item
-					#i.setData(32,0,QtCore.QVariant([unicode(jid),unicode("contact")]))
+					#i.setData(32,0,QtCore.QVariant(QtCore.QStringList([unicode(jid),unicode("contact")])))
 					#self.main.client.roster['groups']['Unknown'].addChild(i)
 				#else:
 					#for group in groups:
 						## add user item to the group
 						#i=self.getUserItems(jid)[0].clone() # clone contact item
-						#i.setData(32,0,QtCore.QVariant([unicode(jid),unicode("contact")]))
+						#i.setData(32,0,QtCore.QVariant(QtCore.QStringList([unicode(jid),unicode("contact")])))
 						#self.main.client.roster['groups'][group].addChild(i)
 				#oldParent.takeChild(0)
 			#if int(oldParent.childCount())<=1:
@@ -576,7 +576,7 @@ class rosterWidget(QtGui.QTreeWidget):
 		parent.setText(2,item.text(2))
 		parent.setText(4,item.text(4))
 		parent.setIcon(0,item.icon(0))
-		parent.setData(32,0,QtCore.QVariant([unicode(jid),unicode("metaparent")]))
+		parent.setData(32,0,QtCore.QVariant(QtCore.QStringList([unicode(jid),unicode("metaparent")])))
 		#parent.setData(32,0,item.data(32,0))
 		parent.setData(32,4,item.data(32,4))
 
@@ -619,7 +619,7 @@ class rosterWidget(QtGui.QTreeWidget):
 			item.setText(0,name)
 		item.setText(1,"11111"+unicode(name).lower())
 		item.setText(2,name)
-		item.setData(32,0,QtCore.QVariant([unicode(""),unicode("group")]))
+		item.setData(32,0,QtCore.QVariant(QtCore.QStringList([unicode(""),unicode("group")])))
 		item.setIcon(0,QtGui.QIcon("images/"+self.main.config['rosterIconSize']+"/icons/group-closed.png"))
 		color=self.main.ui.groupStyleWidget.palette().color(QtGui.QPalette.Window)
 		item.setBackgroundColor(0,color)
@@ -646,7 +646,7 @@ class rosterWidget(QtGui.QTreeWidget):
 		item.setText(1,"9"+unicode(name).lower())
 		item.setText(2,unicode(name))
 		item.setText(4,unicode(jid))
-		item.setData(32,0,QtCore.QVariant([unicode(jid),unicode("contact")]))
+		item.setData(32,0,QtCore.QVariant(QtCore.QStringList([unicode(jid),unicode("contact")])))
 		item.setIcon(0,self.main.getIcon(size=str(self.main.config['rosterIconSize']),status=self.main.icons["9"]))
 		item.setFlags(item.flags()|QtCore.Qt.ItemIsEditable|QtCore.Qt.ItemIsDragEnabled)
 		color=self.main.ui.userStyleWidget.palette().color(QtGui.QPalette.Window)
@@ -700,7 +700,7 @@ class rosterWidget(QtGui.QTreeWidget):
 		# delete from group
 		if group!=None and len(self.main.client.roster['users'][jid].groups)>1:
 			action=contactMenu.addAction(self.tr("Delete from group"))
-			action.setData(QtCore.QVariant([unicode(jid),u"-"+group.text(2)]))
+			action.setData(QtCore.QVariant(QtCore.QStringList([unicode(jid),u"-"+group.text(2)])))
 			action.setObjectName("check_group")
 		# delete from roster
 		action=contactMenu.addAction(self.tr("Delete from roster"))
@@ -726,17 +726,17 @@ class rosterWidget(QtGui.QTreeWidget):
 			#if len(self.main.client.roster['users'][jid].groups)==0:
 				#if k=="Unknown":
 					#action.setChecked(True)
-					#action.setData(QtCore.QVariant([unicode(jid),u"-"+unicode(k)]))
+					#action.setData(QtCore.QVariant(QtCore.QStringList([unicode(jid),u"-"+unicode(k)])))
 				#else:
-					#action.setData(QtCore.QVariant([unicode(jid),u"+"+unicode(k)]))
+					#action.setData(QtCore.QVariant(QtCore.QStringList([unicode(jid),u"+"+unicode(k)])))
 			#else:
 				if k in self.main.client.roster['users'][jid].groups:
 					action.setChecked(True)
-					action.setData(QtCore.QVariant([unicode(jid),u"-"+unicode(k)]))
+					action.setData(QtCore.QVariant(QtCore.QStringList([unicode(jid),u"-"+unicode(k)])))
 					if len(self.main.client.roster['users'][jid].groups)<=1:
 						action.setEnabled(False)
 				else:
-					action.setData(QtCore.QVariant([unicode(jid),u"+"+unicode(k)]))
+					action.setData(QtCore.QVariant(QtCore.QStringList([unicode(jid),u"+"+unicode(k)])))
 				
 		# signal
 		contactMenu.connect(contactMenu, QtCore.SIGNAL("triggered ( QAction * )"),self.contactMenuTriggered)


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jabbim.spec	3 Jul 2008 15:27:22 -0000	1.22
+++ jabbim.spec	15 Sep 2008 20:17:02 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		jabbim
 Version:	0.4.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
@@ -12,6 +12,7 @@
 Source0:	jabbim-0.4.3.tar.bz2
 Source1:	jabbim.in
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
+Patch1:		jabbim-0.4-stringlists-in-QVariants.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,6 +39,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 # fill in the template for the starting script
 sed -e 's|@JABBIMDATA@|%{jabbimdata}|g' %{SOURCE1} > jabbim
 
@@ -112,6 +114,10 @@
 
 
 %changelog
+* Mon Sep 15 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4.3-2
+- Doubleclicking on bookmarks did not open the chat window.
+  Caused by a change in PyQt in constructing QVariants from lists of strings.
+
 * Thu Jul 03 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4.3-1
 - Upstream release 0.4.3.
 - Dropped the tune plugin patch, now merged.



From nalin at fedoraproject.org  Mon Sep 15 20:31:40 2008
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 15 Sep 2008 20:31:40 +0000 (UTC)
Subject: rpms/nss_ldap/devel sources,1.42,1.43
Message-ID: <20080915203140.B55F7700EC@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14607

Modified Files:
	sources 
Log Message:
- add the next version, even if we're past freeze and don't want to use it yet



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	16 Jul 2008 18:22:25 -0000	1.42
+++ sources	15 Sep 2008 20:31:09 -0000	1.43
@@ -1,2 +1,3 @@
 1057ce8b586c507f65657353bce97791  nss_ldap-261.tar.gz
 01bf1ad8576f0d1b58d9eddc68987a47  pam_ldap-184.tar.gz
+ea26f67636d1ef91880465b453d338ff  nss_ldap-262.tar.gz



From chitlesh at fedoraproject.org  Mon Sep 15 20:32:24 2008
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon, 15 Sep 2008 20:32:24 +0000 (UTC)
Subject: rpms/netgen/devel netgen.spec,1.6,1.7
Message-ID: <20080915203224.E9409700EC@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/netgen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14741

Modified Files:
	netgen.spec 
Log Message:
rebuild for rawhide


Index: netgen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netgen/devel/netgen.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- netgen.spec	8 Apr 2008 18:16:33 -0000	1.6
+++ netgen.spec	15 Sep 2008 20:31:54 -0000	1.7
@@ -1,6 +1,6 @@
 Name:             netgen
 Version:          1.3.7
-Release:          16%{?dist}
+Release:          17%{?dist}
 Summary:          LVS netlist comparison tool for VLSI
 
 License:          GPL+
@@ -120,6 +120,9 @@
 
 
 %Changelog
+* Mon Sep 15 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.3.7-16
+- rebuild for rawhide
+
 * Sun Apr 6 2008 Thibault North <tnorth [AT] fedoraproject DOT org> -1.3.7-15
 - fixed compilation for current Tk version
 



From nalin at fedoraproject.org  Mon Sep 15 20:34:51 2008
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 15 Sep 2008 20:34:51 +0000 (UTC)
Subject: rpms/nss_ldap/devel nss_ldap-253-netgroups.patch, NONE,
	1.1 nss_ldap.spec, 1.97, 1.98
Message-ID: <20080915203451.DFF1E700EC@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14709

Modified Files:
	nss_ldap.spec 
Added Files:
	nss_ldap-253-netgroups.patch 
Log Message:
- return 0 (fail) instead of 1 (success) when setnetgrent() is called for
  a netgroup which doesn't actually exist or which has no members (#445972,
  upstream #374)


nss_ldap-253-netgroups.patch:

--- NEW FILE nss_ldap-253-netgroups.patch ---
In _nss_ldap_search_s(), after we've cycled through how ever many search
descriptors we need to in order to try to find an entry, return NOTFOUND
if we run out of descriptors before we find an entry.

In setnetgrent(), if _nss_ldap_getbyname returns NOTFOUND, return an
error rather than postponing it to a subsequent call to getnetgrent().

Original patch from Jose Plans, modification to handle multiple search
descriptors.

diff -up nss_ldap/ldap-netgrp.c nss_ldap/ldap-netgrp.c
--- nss_ldap/ldap-netgrp.c	2008-03-26 14:03:59.000000000 -0400
+++ nss_ldap/ldap-netgrp.c	2008-03-26 14:19:21.000000000 -0400
@@ -372,6 +372,9 @@ _nss_ldap_setnetgrent (char *group, stru
 			 _nss_ldap_filt_getnetgrent, LM_NETGROUP,
 			 _nss_ldap_load_netgr);
 
+  if (stat == NSS_NOTFOUND)
+    return stat;
+
   LOOKUP_SETENT (_ngbe);
 }
 
diff -up nss_ldap/ldap-nss.c nss_ldap/ldap-nss.c
--- nss_ldap/ldap-nss.c	2008-03-26 14:06:58.000000000 -0400
+++ nss_ldap/ldap-nss.c	2008-03-26 14:23:00.000000000 -0400
@@ -3073,6 +3073,10 @@ _nss_ldap_search_s (const ldap_args_t * 
 	}
     }
 
+  if ((stat == NSS_SUCCESS) &&
+      (ldap_count_entries (__session.ls_conn, *res) == 0)) /* No results */
+    stat = NSS_NOTFOUND;
+
   debug ("<== _nss_ldap_search_s");
 
   return stat;


Index: nss_ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/devel/nss_ldap.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- nss_ldap.spec	11 Sep 2008 21:06:29 -0000	1.97
+++ nss_ldap.spec	15 Sep 2008 20:34:21 -0000	1.98
@@ -23,6 +23,7 @@
 Patch15: nss_ldap-257-mozldap.patch
 Patch16: pam_ldap-184-referral-passwd2.patch
 Patch17: nss_ldap-259-res_init.patch
+Patch18: nss_ldap-253-netgroups.patch
 
 URL: http://www.padl.com/
 License: LGPLv2+
@@ -63,6 +64,7 @@
 %patch2 -p1 -b .parse2
 %patch8 -p1 -b .soname
 %patch17 -p1 -b .res_init
+%patch18 -p1 -b .netgroups
 autoreconf -f -i
 popd
 
@@ -188,6 +190,11 @@
 %doc pam_ldap-%{pam_ldap_version}/ns-pwd-policy.schema
 
 %changelog
+* Mon Sep 15 2008 Nalin Dahyabhai <nalin at redhat.com>
+- return 0 (fail) instead of 1 (success) when setnetgrent() is called for
+  a netgroup which doesn't actually exist or which has no members (#445972,
+  upstream #374)
+
 * Thu Sep 11 2008 Nalin Dahyabhai <nalin at redhat.com> - 261-3
 - promote the previous change from a scratch build to the real thing
 



From michich at fedoraproject.org  Mon Sep 15 20:35:36 2008
From: michich at fedoraproject.org (Michal Schmidt)
Date: Mon, 15 Sep 2008 20:35:36 +0000 (UTC)
Subject: rpms/jabbim/devel jabbim-0.4-stringlists-in-QVariants.diff, 1.1,
	1.2 jabbim.spec, 1.23, 1.24
Message-ID: <20080915203536.B7C84700EC@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15297

Modified Files:
	jabbim-0.4-stringlists-in-QVariants.diff jabbim.spec 
Log Message:
* Mon Sep 15 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4.3-3
- Fix mistaken parentheses in the previous patch.


jabbim-0.4-stringlists-in-QVariants.diff:

Index: jabbim-0.4-stringlists-in-QVariants.diff
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim-0.4-stringlists-in-QVariants.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jabbim-0.4-stringlists-in-QVariants.diff	15 Sep 2008 20:17:01 -0000	1.1
+++ jabbim-0.4-stringlists-in-QVariants.diff	15 Sep 2008 20:35:06 -0000	1.2
@@ -6,6 +6,7 @@
 
 Patch created using:
 find . -name '*.py' | while read f; do sed -i -e 's/QVariant(\(\[[^]]*\]\)/QVariant(QtCore.QStringList(\1)/' $f; done
+with just one hand-made fix where the regexp did the wrong thing.
 
 diff -Nurp jabbim-0.4.3.orig/jabbim.py jabbim-0.4.3/jabbim.py
 --- jabbim-0.4.3.orig/jabbim.py	2008-07-02 15:02:20.000000000 +0200
@@ -84,7 +85,7 @@
  			action=self.submenu.addAction(command["name"])
  			action.setObjectName("ad_hoc_command")
 -			action.setData(QtCore.QVariant([command['node'], command['name']]))
-+			action.setData(QtCore.QVariant(QtCore.QStringList([command['node']), command['name']]))
++			action.setData(QtCore.QVariant(QtCore.QStringList([command['node'], command['name']])))
  			button = QtGui.QPushButton(self.dialog)
  			button.setText(unicode(command["name"]))
  			#button.setObjectName(unicode(command["node"])) # ? + jid


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jabbim.spec	15 Sep 2008 20:17:02 -0000	1.23
+++ jabbim.spec	15 Sep 2008 20:35:06 -0000	1.24
@@ -1,6 +1,6 @@
 Name:		jabbim
 Version:	0.4.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4.3-3
+- Fix mistaken parentheses in the previous patch.
+
 * Mon Sep 15 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4.3-2
 - Doubleclicking on bookmarks did not open the chat window.
   Caused by a change in PyQt in constructing QVariants from lists of strings.



From rstrode at fedoraproject.org  Mon Sep 15 20:38:19 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 15 Sep 2008 20:38:19 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec,1.51,1.52 sources,1.20,1.21
Message-ID: <20080915203819.BA1EF700EC@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15654

Modified Files:
	plymouth.spec sources 
Log Message:
- add quit command with --retain-splash option to client



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- plymouth.spec	10 Sep 2008 19:05:14 -0000	1.51
+++ plymouth.spec	15 Sep 2008 20:37:49 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: Plymouth Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.6.0
-Release: 0.2008.09.10.1%{?dist}
+Release: 0.2008.09.15.1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -226,6 +226,9 @@
 %{_libdir}/plymouth/spinfinity.so
 
 %changelog
+* Mon Sep 15 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.15.1
+- add quit command with --retain-splash option to client
+
 * Wed Sep 10 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.10.1
 - Fix text rendering for certain machines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	10 Sep 2008 18:25:53 -0000	1.20
+++ sources	15 Sep 2008 20:37:49 -0000	1.21
@@ -1 +1 @@
-7cb1f9c6984ff6d86084a1c7e869f2ed  plymouth-0.6.0.tar.bz2
+6118b5282105817d1baf2190ba7f1eb8  plymouth-0.6.0.tar.bz2



From spot at fedoraproject.org  Mon Sep 15 20:39:44 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 15 Sep 2008 20:39:44 +0000 (UTC)
Subject: rpms/fish/devel fish-1.23.0-ARG_MAX.patch, NONE, 1.1 fish.spec, 1.25,
	1.26
Message-ID: <20080915203944.DE9DD700EC@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fish/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15967

Modified Files:
	fish.spec 
Added Files:
	fish-1.23.0-ARG_MAX.patch 
Log Message:
fix FTBFS

fish-1.23.0-ARG_MAX.patch:

--- NEW FILE fish-1.23.0-ARG_MAX.patch ---
diff -up fish-1.23.0/exec.c.BAD fish-1.23.0/exec.c
--- fish-1.23.0/exec.c.BAD	2008-09-15 16:28:52.000000000 -0400
+++ fish-1.23.0/exec.c	2008-09-15 16:29:56.000000000 -0400
@@ -24,6 +24,14 @@
 #include <dirent.h>
 #include <time.h>
 
+#if defined(_SC_ARG_MAX)
+# if defined(ARG_MAX)
+#  undef ARG_MAX
+# endif
+# define ARG_MAX sysconf (_SC_ARG_MAX)
+#endif
+
+
 #ifdef HAVE_SIGINFO_H
 #include <siginfo.h>
 #endif


Index: fish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fish/devel/fish.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- fish.spec	7 Jul 2008 17:31:04 -0000	1.25
+++ fish.spec	15 Sep 2008 20:39:14 -0000	1.26
@@ -1,77 +1,35 @@
 Summary:                A friendly interactive shell
 Name:                   fish
-
 Version:                1.23.0
-Release:                5%{?dist}
-
+Release:                6%{?dist}
 License:                GPLv2
 Group:                  System Environment/Shells
 URL:                    http://fishshell.org/
-
 Source0:                http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2
-
+# Emailed to upstream
+Patch0:                 fish-1.23.0-ARG_MAX.patch
 BuildRoot:              %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:          ncurses-devel gettext groff doxygen
 BuildRequires:          autoconf
-
-
-# Locate correct build time-dependencies for providing X headers
-%if 0%{?fedora} >= 5
-
-# Modern Fedora version, has modular X.org
 BuildRequires:          xorg-x11-proto-devel libX11-devel libXt-devel libXext-devel
 
-%endif
-
-%if 0%{?fedora} < 5
-%if 0%{?fedora} >= 3
-
-# Semi-old Fedora version, has non-modular X.org
-BuildRequires:          xorg-x11-devel
-
-%endif
-%endif
-
-%if 0%{?fedora}
-%if 0%{?fedora} < 3
-
-# Ancient Fedora version, has XFree86
-BuildRequires:          XFree86-devel
-
-%endif
-%else
-
-# The %fedora variable has not been correctly defined, or this is is
-# not a Fedora system, try guessing BuildRequires by looking at the
-# directory structure
-%define xinclude /usr%(if [ -d /usr/X11R6/include ]; then echo /X11R6; fi)/include
-BuildRequires:          %{xinclude}/X11/StringDefs.h, %{xinclude}/X11/Xlib.h
-BuildRequires:          %{xinclude}/X11/Intrinsic.h,  %{xinclude}/X11/Xatom.h
-
-%endif
-
-
 %description 
-
 fish is a shell geared towards interactive use. Its features are 
 focused on user friendliness and discoverability. The language syntax 
 is simple but incompatible with other shell languages.
 
-
 %prep
 %setup -q
-
+%patch0 -p1 -b .ARG_MAX
 
 %build
-# The docdir argument is to make the name of the cosumantation
+# The docdir argument is to make the name of the documentation
 # directory 'fish-VERSION', instead of the default, which is simply
 # 'fish'.
-%configure docdir=%_datadir/doc/%{name}-%{version}
+%configure docdir=%{_datadir}/doc/%{name}-%{version}
 make %{?_smp_mflags}
 
 
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT" 
@@ -80,100 +38,71 @@
 %find_lang %{name}.\*
 
 # In case...
-mv $RPM_BUILD_ROOT%_datadir/fish/man/*.1 $RPM_BUILD_ROOT%_mandir/man1/
-
+mv $RPM_BUILD_ROOT%{_datadir}/fish/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-
-
 %post
 # Add fish to the list of allowed shells in /etc/shells
-if ! grep %_bindir/fish %_sysconfdir/shells >/dev/null; then
-	echo %_bindir/fish >>%_sysconfdir/shells
+if ! grep %{_bindir}/fish %{_sysconfdir}/shells >/dev/null; then
+        echo %{_bindir}/fish >>%{_sysconfdir}/shells
 fi
 
-
-
-
 %postun
 # Remove fish from the list of allowed shells in /etc/shells
 if [ "$1" = 0 ]; then
-	grep -v %_bindir/fish %_sysconfdir/shells >%_sysconfdir/fish.tmp
-	mv %_sysconfdir/fish.tmp %_sysconfdir/shells
+        grep -v %{_bindir}/fish %{_sysconfdir}/shells >%{_sysconfdir}/fish.tmp
+        mv %{_sysconfdir}/fish.tmp %{_sysconfdir}/shells
 fi
 
-
-
-
 %files -f %{name}.\*.lang
 
 %defattr(-,root,root,-)
-
-# The documentation directory
-%doc %_datadir/doc/%{name}-%{version}
-
-# man files
-%_mandir/man1/*.1*
-%exclude %_mandir/man1/count*
-%exclude %_mandir/man1/alias*
-%exclude %_mandir/man1/bg*
-%exclude %_mandir/man1/bind*
-%exclude %_mandir/man1/break*
-%exclude %_mandir/man1/builtin*
-%exclude %_mandir/man1/cd*
-%exclude %_mandir/man1/command*
-%exclude %_mandir/man1/complete*
-%exclude %_mandir/man1/continue*
-%exclude %_mandir/man1/dirs*
-%exclude %_mandir/man1/eval*
-%exclude %_mandir/man1/exec*
-%exclude %_mandir/man1/exit*
-%exclude %_mandir/man1/fg*
-%exclude %_mandir/man1/help*
-%exclude %_mandir/man1/jobs*
-%exclude %_mandir/man1/popd*
-%exclude %_mandir/man1/pushd*
-%exclude %_mandir/man1/read*
-%exclude %_mandir/man1/return*
-%exclude %_mandir/man1/set*
-%exclude %_mandir/man1/source*
-%exclude %_mandir/man1/trap*
-%exclude %_mandir/man1/type*
-%exclude %_mandir/man1/ulimit*
-%exclude %_mandir/man1/umask*
-
-# The program binaries
-%attr(0755,root,root) %_bindir/fish
-%attr(0755,root,root) %_bindir/fishd
-%attr(0755,root,root) %_bindir/fish_pager
-%attr(0755,root,root) %_bindir/fish_indent
-%attr(0755,root,root) %_bindir/xsel
-%attr(0755,root,root) %_bindir/set_color
-%attr(0755,root,root) %_bindir/mimedb
-
-# Configuration files
-%config %_sysconfdir/fish
-#%config %_sysconfdir/fish_inputrc
-#%dir %_sysconfdir/fish.d
-#%config %_sysconfdir/fish.d/fish_*.fish
-
-# Non-configuration initialization files
-%dir %_datadir/fish
-%_datadir/fish/config*.fish
-
-# Program specific tab-completions
-%dir %_datadir/fish/completions
-%_datadir/fish/completions/*.fish
-
-# Dynamically loaded shellscript functions
-%dir %_datadir/fish/functions
-%_datadir/fish/functions/*.fish
-
+%doc %{_datadir}/doc/%{name}-%{version}
+%{_mandir}/man1/*.1*
+%exclude %{_mandir}/man1/count*
+%exclude %{_mandir}/man1/alias*
+%exclude %{_mandir}/man1/bg*
+%exclude %{_mandir}/man1/bind*
+%exclude %{_mandir}/man1/break*
+%exclude %{_mandir}/man1/builtin*
+%exclude %{_mandir}/man1/cd*
+%exclude %{_mandir}/man1/command*
+%exclude %{_mandir}/man1/complete*
+%exclude %{_mandir}/man1/continue*
+%exclude %{_mandir}/man1/dirs*
+%exclude %{_mandir}/man1/eval*
+%exclude %{_mandir}/man1/exec*
+%exclude %{_mandir}/man1/exit*
+%exclude %{_mandir}/man1/fg*
+%exclude %{_mandir}/man1/help*
+%exclude %{_mandir}/man1/jobs*
+%exclude %{_mandir}/man1/popd*
+%exclude %{_mandir}/man1/pushd*
+%exclude %{_mandir}/man1/read*
+%exclude %{_mandir}/man1/return*
+%exclude %{_mandir}/man1/set*
+%exclude %{_mandir}/man1/source*
+%exclude %{_mandir}/man1/trap*
+%exclude %{_mandir}/man1/type*
+%exclude %{_mandir}/man1/ulimit*
+%exclude %{_mandir}/man1/umask*
+%attr(0755,root,root) %{_bindir}/fish
+%attr(0755,root,root) %{_bindir}/fishd
+%attr(0755,root,root) %{_bindir}/fish_pager
+%attr(0755,root,root) %{_bindir}/fish_indent
+%attr(0755,root,root) %{_bindir}/xsel
+%attr(0755,root,root) %{_bindir}/set_color
+%attr(0755,root,root) %{_bindir}/mimedb
+%config(noreplace) %{_sysconfdir}/fish
+%{_datadir}/fish/
 
 %changelog
+* Mon Sep 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.23.0-6
+- cleanups
+- define ARG_MAX properly so it compiles
+
 * Mon Jul 07 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.23.0-5
 - fix conditional comparison
 



From mclasen at fedoraproject.org  Mon Sep 15 20:40:56 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 15 Sep 2008 20:40:56 +0000 (UTC)
Subject: rpms/gnome-session/devel ice-leak.patch, NONE,
	1.1 gnome-session.spec, 1.191, 1.192
Message-ID: <20080915204056.3818C700EC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16333

Modified Files:
	gnome-session.spec 
Added Files:
	ice-leak.patch 
Log Message:
Another memory leak plugged


ice-leak.patch:

--- NEW FILE ice-leak.patch ---
Index: gnome-session/gsm-xsmp-client.c
===================================================================
--- gnome-session/gsm-xsmp-client.c	(revision 5088)
+++ gnome-session/gsm-xsmp-client.c	(working copy)
@@ -78,25 +78,37 @@ client_iochannel_watch (GIOChannel    *c
                         GIOCondition   condition,
                         GsmXSMPClient *client)
 {
+        gboolean keep_going;
 
+        g_object_ref (client);
         switch (IceProcessMessages (client->priv->ice_connection, NULL, NULL)) {
         case IceProcessMessagesSuccess:
-                return TRUE;
+                keep_going = TRUE;
+                break;
 
         case IceProcessMessagesIOError:
                 g_debug ("GsmXSMPClient: IceProcessMessagesIOError on '%s'", client->priv->description);
                 gsm_client_set_status (GSM_CLIENT (client), GSM_CLIENT_FAILED);
+                /* Emitting "disconnected" will eventually cause
+                 * IceCloseConnection() to be called.
+                 */
                 gsm_client_disconnected (GSM_CLIENT (client));
-                return FALSE;
+                keep_going = FALSE;
+                break;
 
         case IceProcessMessagesConnectionClosed:
                 g_debug ("GsmXSMPClient: IceProcessMessagesConnectionClosed on '%s'",
                          client->priv->description);
-                return FALSE;
+                client->priv->ice_connection = NULL;
+                keep_going = FALSE;
+                break;
 
         default:
                 g_assert_not_reached ();
         }
+        g_object_unref (client);
+
+        return keep_going;
 }
 
 /* Called if too much time passes between the initial connection and
@@ -621,7 +633,9 @@ gsm_xsmp_client_disconnect (GsmXSMPClien
 
         if (client->priv->conn != NULL) {
                 SmsCleanUp (client->priv->conn);
-        } else {
+        }
+
+        if (client->priv->ice_connection != NULL) {
                 IceCloseConnection (client->priv->ice_connection);
         }
 


Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- gnome-session.spec	15 Sep 2008 01:50:49 -0000	1.191
+++ gnome-session.spec	15 Sep 2008 20:40:25 -0000	1.192
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.23.92
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -71,6 +71,8 @@
 Patch2: inhibitor-leak.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=552302
 Patch3: empty-string-leak.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=552255
+Patch4: ice-leak.patch
 
 %description
 
@@ -83,6 +85,7 @@
 %patch1 -p1 -b .previous_id-leak
 %patch2 -p1 -b .inhibitor-leak
 %patch3 -p1 -b .empty-string-leak
+%patch4 -p0 -b .ice-leak
 
 %build
 
@@ -181,6 +184,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.92-4
+- Plug memory leaks
+
 * Sun Sep 14 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.92-3
 - Plug memory leaks
 



From chitlesh at fedoraproject.org  Mon Sep 15 20:49:41 2008
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon, 15 Sep 2008 20:49:41 +0000 (UTC)
Subject: rpms/compat-guile-16/devel dead.package, NONE,
	1.1 compat-guile-16.spec, 1.4, NONE guile-1.6.0-ppc64.patch, 1.1,
	NONE guile-1.6.0-unknown_arch.patch, 1.1,
	NONE guile-1.6.7-64bit.patch, 1.1, NONE guile-1.6.7-ltdl.patch,
	1.1, NONE guile-1.6.7-noexecstack.patch, 1.1,
	NONE guile-1.6.7-rpath.patch, 1.1, NONE sources, 1.2, NONE
Message-ID: <20080915204941.7BF6770138@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/compat-guile-16/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17649/devel

Added Files:
	dead.package 
Removed Files:
	compat-guile-16.spec guile-1.6.0-ppc64.patch 
	guile-1.6.0-unknown_arch.patch guile-1.6.7-64bit.patch 
	guile-1.6.7-ltdl.patch guile-1.6.7-noexecstack.patch 
	guile-1.6.7-rpath.patch sources 
Log Message:
using guile-1.8 instead on guile-1.6


--- NEW FILE dead.package ---
Reason: Guile 1.8 is the latest version and for more than a year Guile 1.6 is useless under the fedora umbrella.

Chitlesh GOORAH
15 September 2008


--- compat-guile-16.spec DELETED ---


--- guile-1.6.0-ppc64.patch DELETED ---


--- guile-1.6.0-unknown_arch.patch DELETED ---


--- guile-1.6.7-64bit.patch DELETED ---


--- guile-1.6.7-ltdl.patch DELETED ---


--- guile-1.6.7-noexecstack.patch DELETED ---


--- guile-1.6.7-rpath.patch DELETED ---


--- sources DELETED ---



From chitlesh at fedoraproject.org  Mon Sep 15 20:57:00 2008
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon, 15 Sep 2008 20:57:00 +0000 (UTC)
Subject: rpms/katapult/devel dead.package, NONE, 1.1 katapult.spec, 1.8,
	NONE sources, 1.4, NONE
Message-ID: <20080915205700.C1D67700EC@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/katapult/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18916/devel

Added Files:
	dead.package 
Removed Files:
	katapult.spec sources 
Log Message:
Alternative : Alt-F2 on KDE4


--- NEW FILE dead.package ---
KDE4 has been fully deployed for F10 and katapult is not longer a good option.
Use the default Alt-F2

Chitlesh GOORAH
15 September 2008


--- katapult.spec DELETED ---


--- sources DELETED ---



From rrelyea at fedoraproject.org  Mon Sep 15 20:58:09 2008
From: rrelyea at fedoraproject.org (Robert Relyea)
Date: Mon, 15 Sep 2008 20:58:09 +0000 (UTC)
Subject: rpms/coolkey/devel coolkey.spec,1.27,1.28
Message-ID: <20080915205809.F1B61700EC@cvs1.fedora.phx.redhat.com>

Author: rrelyea

Update of /cvs/extras/rpms/coolkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18961

Modified Files:
	coolkey.spec 
Log Message:

BR: nss-devel not mozilla-nss-devel (FTBFS BZ#440753)
patch by matt domsch (thanks!).





Index: coolkey.spec
===================================================================
RCS file: /cvs/extras/rpms/coolkey/devel/coolkey.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- coolkey.spec	14 Feb 2008 23:51:04 -0000	1.27
+++ coolkey.spec	15 Sep 2008 20:57:39 -0000	1.28
@@ -22,7 +22,7 @@
 
 Name: coolkey
 Version: 1.1.0
-Release: 6%{dist}
+Release: 7%{dist}
 Summary: CoolKey PKCS #11 module
 License: LGPLv2
 URL: http://directory.fedora.redhat.com/wiki/CoolKey
@@ -34,7 +34,7 @@
 BuildRequires: autoconf
 BuildRequires: pcsc-lite-devel
 BuildRequires: zlib-devel
-BuildRequires: mozilla-nss-devel
+BuildRequires: nss-devel
 Requires: nss-tools
 Requires: pcsc-lite 
 Requires: pcsc-lite-libs
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Sun Sep 14 2008 Matt Domsch <mdomsch at fedoraproject.org> - 1.1.0-7
+- BR: nss-devel not mozilla-nss-devel (FTBFS BZ#440753)
+
 * Wed Feb 13 2008 Jack magne <jmagne at redhat.com>  - 1.1.0-6
 - Clean up building with gcc 4.3.
 * Thu Sep 27 2007 Jack Magne <jmagne at redhat.com>  - 1.1.0-5



From chitlesh at fedoraproject.org  Mon Sep 15 21:01:08 2008
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon, 15 Sep 2008 21:01:08 +0000 (UTC)
Subject: rpms/kleansweep/devel dead.package, NONE,
	1.1 kleansweep-generic.patch, 
	1.1, NONE kleansweep-helper.patch, 1.1, NONE kleansweep.spec,
	1.6, NONE sources, 1.2, NONE
Message-ID: <20080915210108.EB4A5700EC@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/kleansweep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19752/devel

Added Files:
	dead.package 
Removed Files:
	kleansweep-generic.patch kleansweep-helper.patch 
	kleansweep.spec sources 
Log Message:
kde4 equivalent application is available


--- NEW FILE dead.package ---
An alternate KDE4 application of kleansweep is already available by default on KDE4.

Chitlesh GOORAH
15 September 2008


--- kleansweep-generic.patch DELETED ---


--- kleansweep-helper.patch DELETED ---


--- kleansweep.spec DELETED ---


--- sources DELETED ---



From glommer at fedoraproject.org  Mon Sep 15 21:08:26 2008
From: glommer at fedoraproject.org (Glauber Costa)
Date: Mon, 15 Sep 2008 21:08:26 +0000 (UTC)
Subject: rpms/kvm/devel kvm-74-page-find.patch,NONE,1.1 kvm.spec,1.70,1.71
Message-ID: <20080915210827.0572B700EC@cvs1.fedora.phx.redhat.com>

Author: glommer

Update of /cvs/pkgs/rpms/kvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20685

Modified Files:
	kvm.spec 
Added Files:
	kvm-74-page-find.patch 
Log Message:
fix page_find out of bounds access - #462380



kvm-74-page-find.patch:

--- NEW FILE kvm-74-page-find.patch ---
commit 434929bf11f0573d953c24287badbc2431a042ef
Author: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
Date:   Mon Sep 15 15:56:30 2008 +0000

    Make page_find() return 0 for too-large addresses (Eduardo Habkost)
    
    On some cases, such as under KVM, tb_invalidate_phys_page_range()
    may be called for large addresses, when qemu is configured to more than
    4GB of RAM.
    
    On these cases, qemu was crashing because it was using an index too
    large for l1_map[], that supports only 32-bit addresses when compiling
    without CONFIG_USER_ONLY.
    
    Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
    Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
    
    
    
    git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk at 5227 c046a42c-6fe2-441c-8c8c-71466251a162

Index: kvm-74/qemu/exec.c
===================================================================
--- kvm-74.orig/qemu/exec.c
+++ kvm-74/qemu/exec.c
@@ -286,17 +286,24 @@ static void page_init(void)
 #endif
 }
 
-static inline PageDesc *page_find_alloc(target_ulong index)
+static inline PageDesc **page_l1_map(target_ulong index)
 {
-    PageDesc **lp, *p;
-
 #if TARGET_LONG_BITS > 32
     /* Host memory outside guest VM.  For 32-bit targets we have already
        excluded high addresses.  */
     if (index > ((target_ulong)L2_SIZE * L1_SIZE * TARGET_PAGE_SIZE))
         return NULL;
 #endif
-    lp = &l1_map[index >> L2_BITS];
+    return &l1_map[index >> L2_BITS];
+}
+
+static inline PageDesc *page_find_alloc(target_ulong index)
+{
+    PageDesc **lp, *p;
+    lp = page_l1_map(index);
+    if (!lp)
+        return NULL;
+
     p = *lp;
     if (!p) {
         /* allocate if not found */
@@ -323,9 +330,12 @@ static inline PageDesc *page_find_alloc(
 
 static inline PageDesc *page_find(target_ulong index)
 {
-    PageDesc *p;
+    PageDesc **lp, *p;
+    lp = page_l1_map(index);
+    if (!lp)
+        return NULL;
 
-    p = l1_map[index >> L2_BITS];
+    p = *lp;
     if (!p)
         return 0;
     return p + (index & (L2_SIZE - 1));


Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kvm.spec	9 Sep 2008 15:46:26 -0000	1.70
+++ kvm.spec	15 Sep 2008 21:07:56 -0000	1.71
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 74
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://%{name}.sf.net
@@ -11,6 +11,7 @@
 Patch0: %{name}-bootmenu.patch
 Patch1: %{name}-62-block-rw-range-check.patch
 Patch2: %{name}-74-pxe-boot.patch
+Patch3: %{name}-74-page-find.patch
 # patches from upstream qemu
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel
@@ -40,6 +41,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 
@@ -110,6 +112,9 @@
 %{_sysconfdir}/sysconfig/modules/%{name}.modules
 
 %changelog
+* Mon Sep 15 2008 Glauber Costa <glommer at redhat.com> - 74-4
+- fix page_find out of bounds access - #462380
+
 * Tue Sep 09 2008 Glauber Costa <glommer at redhat.com> - 74-3
 - fix pxe booting. Needed for oVirt
 



From jwrdegoede at fedoraproject.org  Mon Sep 15 21:17:20 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 15 Sep 2008 21:17:20 +0000 (UTC)
Subject: rpms/ode/devel .cvsignore, 1.7, 1.8 ode.spec, 1.13, 1.14 sources,
	1.7, 1.8
Message-ID: <20080915211720.8862D700EC@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22007

Modified Files:
	.cvsignore ode.spec sources 
Log Message:
* Mon Sep 15 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.1-1
- New upstream release 0.10.1 (bz 460033)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Oct 2007 20:53:59 -0000	1.7
+++ .cvsignore	15 Sep 2008 21:16:49 -0000	1.8
@@ -1 +1 @@
-ode-src-0.9.zip
+ode-0.10.1.tar.bz2


Index: ode.spec
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/ode.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ode.spec	3 Apr 2008 13:07:56 -0000	1.13
+++ ode.spec	15 Sep 2008 21:16:50 -0000	1.14
@@ -1,13 +1,15 @@
 Name:           ode
-Version:        0.9
-Release:        4%{?dist}
+Version:        0.10.1
+Release:        1%{?dist}
 Summary:        High performance library for simulating rigid body dynamics
 Group:          System Environment/Libraries
 License:        BSD or LGPLv2+
 URL:            http://www.ode.org
-Source0:        http://downloads.sourceforge.net/opende/ode-src-%{version}.zip
-Patch0:         ode-0.6-configure.patch
-Patch1:         ode-0.8-install.patch
+Source0:        http://downloads.sourceforge.net/opende/ode-%{version}.tar.bz2
+# This works around a bug in rpmbuild, where with localbuilds it will pass
+# the machine being build on as host param to configure instead of the machine
+# on which the code will run
+Patch0:         ode-0.10.0-no-pentium-on-i386.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libGL-devel libGLU-devel
 
@@ -32,29 +34,25 @@
 
 %prep
 %setup -q
-%patch0 -p1 -z .configure
-%patch1 -p1 -z .install
-# sigh stop autoxxx from rerunning because of our patches above.
-touch aclocal.m4
-touch configure
-touch Makefile.in
-touch include/ode/config.h.in
-touch ode/src/Makefile.in
+%patch0 -p1
+# to stop autoxxx from getting regenerated because of our configure patch
+touch -r CHANGELOG.txt configure.in
 # stop rpmlint from complaining about executable files in the debug package
-chmod -x ode/src/stepfast.cpp include/ode/collision_trimesh.h
+chmod -x ode/src/stepfast.cpp include/ode/collision_trimesh.h \
+  include/ode/odeconfig.h
 
 
 %build
-%configure --enable-shared --enable-soname
-# <sigh> ./configure doesn't properly pick up our CFLAGS
-make %{?_smp_mflags} CFLAGS="%{optflags} -ffast-math" \
-  CXXFLAGS="%{optflags} -ffast-math"
+CFLAGS="%{optflags} -ffast-math"
+CXXFLAGS="%{optflags} -ffast-math"
+%configure --enable-shared --disable-static
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/libode.a
+rm $RPM_BUILD_ROOT%{_libdir}/libode.la
 
 
 %clean
@@ -69,7 +67,7 @@
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG.txt LICENSE*.TXT README.txt
-%{_libdir}/libode.so.*
+%{_libdir}/libode.so.1*
 
 %files devel
 %defattr(-,root,root,-)
@@ -79,6 +77,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.1-1
+- New upstream release 0.10.1 (bz 460033)
+
 * Thu Apr  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9-4
 - Force proper use of RPM_OPT_FLAGS during build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Oct 2007 20:53:59 -0000	1.7
+++ sources	15 Sep 2008 21:16:50 -0000	1.8
@@ -1 +1 @@
-4c03759b76a0649a6d5108c8e172e1e4  ode-src-0.9.zip
+91c396b915539a760617437d56eb1681  ode-0.10.1.tar.bz2



From spot at fedoraproject.org  Mon Sep 15 21:39:05 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 15 Sep 2008 21:39:05 +0000 (UTC)
Subject: rpms/fontypython/devel .cvsignore, 1.2, 1.3 fontypython.spec, 1.4, 
	1.5 sources, 1.2, 1.3 fontypython.desktop, 1.2, NONE
Message-ID: <20080915213905.7E465700EC@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fontypython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25143

Modified Files:
	.cvsignore fontypython.spec sources 
Removed Files:
	fontypython.desktop 
Log Message:
update to 0.3.6, fix FTBFS


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fontypython/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Dec 2006 16:14:32 -0000	1.2
+++ .cvsignore	15 Sep 2008 21:38:33 -0000	1.3
@@ -1 +1 @@
-fontypython-0.2.0.tar.gz
+fontypython-0.3.6.tar.gz


Index: fontypython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontypython/devel/fontypython.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fontypython.spec	22 May 2008 19:27:16 -0000	1.4
+++ fontypython.spec	15 Sep 2008 21:38:33 -0000	1.5
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           fontypython
-Version:        0.2.0
-Release:        7%{?dist}
+Version:        0.3.6
+Release:        1%{?dist}
 Summary:        TTF font manager
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            https://savannah.nongnu.org/projects/fontypython/
 Source0:        http://download.savannah.nongnu.org/releases/fontypython/%{name}-%{version}.tar.gz
-Source1:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -38,11 +37,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+sed -i 's|fontypython.png|fontypython|g' ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 desktop-file-install --vendor="fedora"                          \
         --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        %{SOURCE1}
-mkdir ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
-cp -p fontypython/things/fplogo.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
+        --delete-original                                       \
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 mv ${RPM_BUILD_ROOT}%{_bindir}/fp ${RPM_BUILD_ROOT}%{_bindir}/fontypython
 
 %clean
@@ -53,12 +52,23 @@
 %defattr(-,root,root,-)
 %{_bindir}/fontypython
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/fplogo.png
+%{_datadir}/pixmaps/fontypython.png
 %doc README COPYING 
+%dir %{python_sitelib}/fontypythonmodules/
+%{python_sitelib}/fontypythonmodules/*.py*
+%{python_sitelib}/fontypythonmodules/help/
+%{python_sitelib}/fontypythonmodules/pofiles/
+%{python_sitelib}/fontypythonmodules/things/
+%dir %{python_sitelib}/fontypythonmodules/locale/
+%lang(fr) %{python_sitelib}/fontypythonmodules/locale/fr/
+%lang(it) %{python_sitelib}/fontypythonmodules/locale/it/
+%{python_sitelib}/%{name}-%{version}-py*.egg-info
 
-%{python_sitelib}/*
 
 %changelog
+* Mon Sep 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.6-1
+- update to 0.3.6
+
 * Thu May 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.0-7
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fontypython/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Dec 2006 16:14:32 -0000	1.2
+++ sources	15 Sep 2008 21:38:33 -0000	1.3
@@ -1 +1 @@
-7ab01bdffe925bb243af984b000bd635  fontypython-0.2.0.tar.gz
+bb0dcc33311cf47ba2eb80439c9b6106  fontypython-0.3.6.tar.gz


--- fontypython.desktop DELETED ---



From caolanm at fedoraproject.org  Mon Sep 15 21:50:38 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 15 Sep 2008 21:50:38 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.cmcfixes48.patch,1.3,1.4
Message-ID: <20080915215038.0AD15700EC@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26768

Modified Files:
	workspace.cmcfixes48.patch 
Log Message:
fixup patch

workspace.cmcfixes48.patch:

Index: workspace.cmcfixes48.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes48.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.cmcfixes48.patch	11 Aug 2008 15:39:57 -0000	1.3
+++ workspace.cmcfixes48.patch	15 Sep 2008 21:50:07 -0000	1.4
@@ -2200,12 +2200,12 @@
 diff -u dba/dbaccess/source/ui/app/AppController.hxx:1.30 dba/dbaccess/source/ui/app/AppController.hxx:1.30.16.1
 --- dba/dbaccess/source/ui/app/AppController.hxx:1.30	Wed Jun 25 05:35:42 2008
 +++ dba/dbaccess/source/ui/app/AppController.hxx	Wed Jul 30 07:31:42 2008
-@@ -137,7 +137,7 @@
+@@ -136,7 +136,7 @@
+         OTableCopyHelper        m_aTableCopyHelper;
  		TransferableClipboardListener*
  								m_pClipbordNotifier;		// notifier for changes in the clipboard
- 		mutable ::rtl::OUString	m_sDatabaseName;
 -		sal_Int32				m_nAsyncDrop;
-+		ULONG					m_nAsyncDrop;
++		ULONG				m_nAsyncDrop;
          OAsyncronousLink        m_aControllerConnectedEvent;
          OAsyncronousLink        m_aSelectContainerEvent;
  		PreviewMode				m_ePreviewMode;				// the mode of the preview



From jwrdegoede at fedoraproject.org  Mon Sep 15 21:52:58 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 15 Sep 2008 21:52:58 +0000 (UTC)
Subject: rpms/ode/devel ode-0.10.0-no-pentium-on-i386.patch,NONE,1.1
Message-ID: <20080915215258.78926700EC@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27502

Added Files:
	ode-0.10.0-no-pentium-on-i386.patch 
Log Message:
* Mon Sep 15 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.1-1
- New upstream release 0.10.1 (bz 460033)


ode-0.10.0-no-pentium-on-i386.patch:

--- NEW FILE ode-0.10.0-no-pentium-on-i386.patch ---
diff -up ode-0.10.0/configure.in~ ode-0.10.0/configure.in
--- ode-0.10.0/configure.in~	2008-07-02 11:41:50.000000000 +0200
+++ ode-0.10.0/configure.in	2008-07-02 11:41:50.000000000 +0200
@@ -60,7 +60,7 @@ dnl this may NOT be the machine on which
 dnl so allow users to compile programs for their target machine.
 pentium=no
 cpu64=no
-case "$host_cpu" in
+case "$target_cpu" in
   i586 | i686 | i786 )
         pentium=yes
         AC_DEFINE(PENTIUM,1,[compiling for a pentium on a gcc-based platform?])
diff -up ode-0.10.0/configure~ ode-0.10.0/configure
--- ode-0.10.0/configure~	2008-07-02 11:41:48.000000000 +0200
+++ ode-0.10.0/configure	2008-07-02 11:41:48.000000000 +0200
@@ -20857,7 +20857,7 @@ echo "${ECHO_T}$enable_demos" >&6; }
 
 pentium=no
 cpu64=no
-case "$host_cpu" in
+case "$target_cpu" in
   i586 | i686 | i786 )
         pentium=yes
 



From kevin at fedoraproject.org  Mon Sep 15 21:55:52 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 15 Sep 2008 21:55:52 +0000 (UTC)
Subject: rpms/rkhunter/devel rkhunter-1.3.2-debugtmp.patch, NONE,
	1.1 rkhunter.spec, 1.16, 1.17
Message-ID: <20080915215552.3A16E700EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rkhunter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28297

Modified Files:
	rkhunter.spec 
Added Files:
	rkhunter-1.3.2-debugtmp.patch 
Log Message:
Patch debug tmp file issue - bug #460628


rkhunter-1.3.2-debugtmp.patch:

--- NEW FILE rkhunter-1.3.2-debugtmp.patch ---
diff -Nur rkhunter-1.3.2.orig/files/rkhunter rkhunter-1.3.2/files/rkhunter
--- rkhunter-1.3.2.orig/files/rkhunter	2008-02-27 08:59:22.000000000 -0700
+++ rkhunter-1.3.2/files/rkhunter	2008-08-31 10:22:20.000000000 -0600
@@ -41,18 +41,18 @@
 fi
 
 if [ "$1" = "--debug" ]; then
-	if [ -e "/tmp/rkhunter-debug" ]; then
-		if [ -f "/tmp/rkhunter-debug" -a ! -h "/tmp/rkhunter-debug" ]; then
-			rm -f /tmp/rkhunter-debug >/dev/null 2>&1
-		else
-			echo "Cannot use '--debug' option. /tmp/rkhunter-debug already exists, but it is not a file."
-			exit 1
-		fi
-	fi
-
-	DEBUG_OPT=1
-
-	exec 1>/tmp/rkhunter-debug 2>&1
+      DEBUG_FILE=`mktemp -t rkhunter-debug.XXXXXXXXXX`
+      if [ -e "$DEBUG_FILE" ]; then
+              if [ -f "$DEBUG_FILE" -a ! -h "$DEBUG_FILE" ]; then
+                      rm -f $DEBUG_FILE >/dev/null 2>&1
+              else
+                      echo "Cannot use '--debug' option. $DEBUG_FILE already exists, but it is not a file."
+                       exit 1
+               fi
+        fi
+ 
+        DEBUG_OPT=1
+        exec 1>$DEBUG_FILE 2>&1
 	set -x
 else
 	DEBUG_OPT=0


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rkhunter.spec	17 Jun 2008 18:48:04 -0000	1.16
+++ rkhunter.spec	15 Sep 2008 21:55:21 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           rkhunter
 Version:        1.3.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
@@ -10,6 +10,7 @@
 Source1:        http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.2.tar.gz.sha1.txt
 Source2:        01-rkhunter
 Source3:        rkhunter.sysconfig
+Patch0:		rkhunter-1.3.2-debugtmp.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +70,8 @@
 }
 EOF
 
+%patch0 -p1
+
 %build
 # Nothing to be built
 
@@ -136,6 +139,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Sep 03 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-5
+- Patch debug tmp file issue - bug #460628
+
 * Mon Jun 16 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-4
 - Fix cron script to only mail on warn/error - bug #450703
 - Fix conditional to account for fc10 rsyslog



From mclasen at fedoraproject.org  Mon Sep 15 21:57:40 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 15 Sep 2008 21:57:40 +0000 (UTC)
Subject: rpms/fedora-icon-theme/devel fedora-icon-theme.spec,1.3,1.4
Message-ID: <20080915215740.A3D30700EC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/fedora-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28688

Modified Files:
	fedora-icon-theme.spec 
Log Message:
Require echo-icon-theme



Index: fedora-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-icon-theme/devel/fedora-icon-theme.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-icon-theme.spec	5 Sep 2008 13:57:58 -0000	1.3
+++ fedora-icon-theme.spec	15 Sep 2008 21:57:10 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Fedora icon theme
 Name: fedora-icon-theme
 Version: 1.0.0
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 BuildArch: noarch
 License: GPL+
 Group: User Interface/Desktops
@@ -12,6 +12,7 @@
 
 BuildRequires: perl(XML::Parser)
 Requires: gnome-themes
+Requires: echo-icon-theme
 
 Provides: system-icon-theme
 
@@ -72,6 +73,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Mon Sep 15 2008 Matthias Clasen <mclasen at redhat.com> - 1.0.0-3
+- Require echo-icon-theme
+
 * Fri Sep  5 2008 Matthias Clasen <mclasen at redhat.com> - 1.0.0-2
 - Switch to Echo as the default icon theme
 



From kevin at fedoraproject.org  Mon Sep 15 22:03:07 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 15 Sep 2008 22:03:07 +0000 (UTC)
Subject: rpms/rkhunter/F-9 rkhunter-1.3.2-debugtmp.patch, NONE,
	1.1 rkhunter.spec, 1.16, 1.17
Message-ID: <20080915220307.BDAC2700EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rkhunter/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29582

Modified Files:
	rkhunter.spec 
Added Files:
	rkhunter-1.3.2-debugtmp.patch 
Log Message:
Patch debug tmp file issue - bug #460628


rkhunter-1.3.2-debugtmp.patch:

--- NEW FILE rkhunter-1.3.2-debugtmp.patch ---
diff -Nur rkhunter-1.3.2.orig/files/rkhunter rkhunter-1.3.2/files/rkhunter
--- rkhunter-1.3.2.orig/files/rkhunter	2008-02-27 08:59:22.000000000 -0700
+++ rkhunter-1.3.2/files/rkhunter	2008-08-31 10:22:20.000000000 -0600
@@ -41,18 +41,18 @@
 fi
 
 if [ "$1" = "--debug" ]; then
-	if [ -e "/tmp/rkhunter-debug" ]; then
-		if [ -f "/tmp/rkhunter-debug" -a ! -h "/tmp/rkhunter-debug" ]; then
-			rm -f /tmp/rkhunter-debug >/dev/null 2>&1
-		else
-			echo "Cannot use '--debug' option. /tmp/rkhunter-debug already exists, but it is not a file."
-			exit 1
-		fi
-	fi
-
-	DEBUG_OPT=1
-
-	exec 1>/tmp/rkhunter-debug 2>&1
+      DEBUG_FILE=`mktemp -t rkhunter-debug.XXXXXXXXXX`
+      if [ -e "$DEBUG_FILE" ]; then
+              if [ -f "$DEBUG_FILE" -a ! -h "$DEBUG_FILE" ]; then
+                      rm -f $DEBUG_FILE >/dev/null 2>&1
+              else
+                      echo "Cannot use '--debug' option. $DEBUG_FILE already exists, but it is not a file."
+                       exit 1
+               fi
+        fi
+ 
+        DEBUG_OPT=1
+        exec 1>$DEBUG_FILE 2>&1
 	set -x
 else
 	DEBUG_OPT=0


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/F-9/rkhunter.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rkhunter.spec	17 Jun 2008 18:55:09 -0000	1.16
+++ rkhunter.spec	15 Sep 2008 22:02:37 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           rkhunter
 Version:        1.3.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
@@ -10,6 +10,7 @@
 Source1:        http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.2.tar.gz.sha1.txt
 Source2:        01-rkhunter
 Source3:        rkhunter.sysconfig
+Patch0:		rkhunter-1.3.2-debugtmp.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +70,8 @@
 }
 EOF
 
+%patch0 -p1
+
 %build
 # Nothing to be built
 
@@ -136,6 +139,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Sep 03 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-5
+- Patch debug tmp file issue - bug #460628
+
 * Mon Jun 16 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-4
 - Fix cron script to only mail on warn/error - bug #450703
 - Fix conditional to account for fc10 rsyslog



From fschwarz at fedoraproject.org  Mon Sep 15 22:13:50 2008
From: fschwarz at fedoraproject.org (Felix Schwarz)
Date: Mon, 15 Sep 2008 22:13:50 +0000 (UTC)
Subject: rpms/pyPdf/devel .cvsignore, 1.3, 1.4 pyPdf.spec, 1.2, 1.3 sources, 
	1.3, 1.4
Message-ID: <20080915221350.7F435700EC@cvs1.fedora.phx.redhat.com>

Author: fschwarz

Update of /cvs/pkgs/rpms/pyPdf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31241

Modified Files:
	.cvsignore pyPdf.spec sources 
Log Message:
update pyPdf to 1.12 (devel)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyPdf/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Jun 2008 08:46:07 -0000	1.3
+++ .cvsignore	15 Sep 2008 22:13:19 -0000	1.4
@@ -1 +1 @@
-pyPdf-1.11.tar.gz
+pyPdf-1.12.tar.gz


Index: pyPdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyPdf/devel/pyPdf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pyPdf.spec	15 Jun 2008 08:46:07 -0000	1.2
+++ pyPdf.spec	15 Sep 2008 22:13:20 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pyPdf
-Version:        1.11
+Version:        1.12
 Release:        1%{?dist}
 Summary:        PDF toolkit
 
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Felix Schwarz <felix.schwarz at oss.schwarz.eu> 1.12-1
+- update to 1.12
+
 * Sun Jun 15 2008 Felix Schwarz <felix.schwarz at oss.schwarz.eu> 1.11-1
 - update to 1.11
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyPdf/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Jun 2008 08:46:07 -0000	1.3
+++ sources	15 Sep 2008 22:13:20 -0000	1.4
@@ -1 +1 @@
-3aed4776bd086fe2d903d20f84252c6a  pyPdf-1.11.tar.gz
+7be5f7f4659f64fd194e9eb9a38ad425  pyPdf-1.12.tar.gz



From kevin at fedoraproject.org  Mon Sep 15 22:15:12 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 15 Sep 2008 22:15:12 +0000 (UTC)
Subject: rpms/rkhunter/F-8 rkhunter-1.3.2-debugtmp.patch, NONE,
	1.1 rkhunter.spec, 1.13, 1.14
Message-ID: <20080915221512.76DD5700EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rkhunter/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31595

Modified Files:
	rkhunter.spec 
Added Files:
	rkhunter-1.3.2-debugtmp.patch 
Log Message:
Patch debug tmp file issue - bug #460628


rkhunter-1.3.2-debugtmp.patch:

--- NEW FILE rkhunter-1.3.2-debugtmp.patch ---
diff -Nur rkhunter-1.3.2.orig/files/rkhunter rkhunter-1.3.2/files/rkhunter
--- rkhunter-1.3.2.orig/files/rkhunter	2008-02-27 08:59:22.000000000 -0700
+++ rkhunter-1.3.2/files/rkhunter	2008-08-31 10:22:20.000000000 -0600
@@ -41,18 +41,18 @@
 fi
 
 if [ "$1" = "--debug" ]; then
-	if [ -e "/tmp/rkhunter-debug" ]; then
-		if [ -f "/tmp/rkhunter-debug" -a ! -h "/tmp/rkhunter-debug" ]; then
-			rm -f /tmp/rkhunter-debug >/dev/null 2>&1
-		else
-			echo "Cannot use '--debug' option. /tmp/rkhunter-debug already exists, but it is not a file."
-			exit 1
-		fi
-	fi
-
-	DEBUG_OPT=1
-
-	exec 1>/tmp/rkhunter-debug 2>&1
+      DEBUG_FILE=`mktemp -t rkhunter-debug.XXXXXXXXXX`
+      if [ -e "$DEBUG_FILE" ]; then
+              if [ -f "$DEBUG_FILE" -a ! -h "$DEBUG_FILE" ]; then
+                      rm -f $DEBUG_FILE >/dev/null 2>&1
+              else
+                      echo "Cannot use '--debug' option. $DEBUG_FILE already exists, but it is not a file."
+                       exit 1
+               fi
+        fi
+ 
+        DEBUG_OPT=1
+        exec 1>$DEBUG_FILE 2>&1
 	set -x
 else
 	DEBUG_OPT=0


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/F-8/rkhunter.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rkhunter.spec	17 Jun 2008 19:07:00 -0000	1.13
+++ rkhunter.spec	15 Sep 2008 22:14:42 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           rkhunter
 Version:        1.3.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
@@ -10,6 +10,7 @@
 Source1:        http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.2.tar.gz.sha1.txt
 Source2:        01-rkhunter
 Source3:        rkhunter.sysconfig
+Patch0:		rkhunter-1.3.2-debugtmp.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +70,8 @@
 }
 EOF
 
+%patch0 -p1
+
 %build
 # Nothing to be built
 
@@ -136,6 +139,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Sep 03 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-5
+- Patch debug tmp file issue - bug #460628
+
 * Mon Jun 16 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-4
 - Fix cron script to only mail on warn/error - bug #450703
 - Fix conditional to account for fc10 rsyslog



From caolanm at fedoraproject.org  Mon Sep 15 22:18:36 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 15 Sep 2008 22:18:36 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.cmcfixes50.patch,1.1,1.2
Message-ID: <20080915221836.72720700EC@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32065

Modified Files:
	workspace.cmcfixes50.patch 
Log Message:
fixup configure

workspace.cmcfixes50.patch:

Index: workspace.cmcfixes50.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes50.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.cmcfixes50.patch	5 Sep 2008 15:04:06 -0000	1.1
+++ workspace.cmcfixes50.patch	15 Sep 2008 22:18:05 -0000	1.2
@@ -203,3 +203,318 @@
      void cancel();
      ~RunDialog();
  };
+Index: configure.in
+===================================================================
+RCS file: /cvs/tools/config_office/configure.in,v
+retrieving revision 1.290
+retrieving revision 1.285.8.4
+diff -u -r1.290 -r1.285.8.4
+--- openoffice.org.orig/config_office/configure.in	8 Sep 2008 07:38:40 -0000	1.290
++++ openoffice.org/config_office/configure.in	9 Sep 2008 08:04:45 -0000	1.285.8.4
+@@ -441,6 +441,10 @@
+ [  --with-liblayout-jar=JARFILE   Specify path to jarfile manually ],
+ [ LIBLAYOUT_JAR="$withval"
+ ])
++AC_ARG_WITH(libloader-jar,
++[  --with-libloader-jar=JARFILE   Specify path to jarfile manually ],
++[ LIBLOADER_JAR="$withval"
++])
+ AC_ARG_WITH(libformula-jar,
+ [  --with-libformula-jar=JARFILE   Specify path to jarfile manually ],
+ [ LIBFORMULA_JAR="$withval"
+@@ -3675,15 +3679,34 @@
+         AC_MSG_RESULT([external])
+         SYSTEM_LUCENE=YES
+         if test -z $LUCENE_CORE_JAR; then
+-               LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar
+-        fi
+-        AC_CHECK_FILE($LUCENE_CORE_JAR, [],
++          AC_CHECK_FILE(/usr/share/java/lucene-core-2.3.jar, 
++            [ LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar ],
++            [
++              AC_CHECK_FILE(/usr/share/java/lucene.jar, 
++                [ LUCENE_CORE_JAR=/usr/share/java/lucene.jar ],
++                [ AC_MSG_ERROR(lucene-core.jar replacement not found)]
++              )
++            ]
++          )
++        else
++          AC_CHECK_FILE($LUCENE_CORE_JAR, [],
+                [AC_MSG_ERROR(lucene-core.jar not found.)], [])
++        fi
++
+         if test -z $LUCENE_ANALYZERS_JAR; then
+-               LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers-2.3.jar
++          AC_CHECK_FILE(/usr/share/java/lucene-analyzers-2.3.jar, 
++            [ LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers-2.3.jar ],
++            [
++              AC_CHECK_FILE(/usr/share/java/lucene-contrib/lucene-analyzers.jar, 
++                [ LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-contrib/lucene-analyzers.jar ],
++                [ AC_MSG_ERROR(lucene-analyzers.jar replacement not found.)]
++              )
++            ]
++          )
++        else
++          AC_CHECK_FILE($LUCENE_CORE_JAR, [],
++               [ AC_MSG_ERROR(lucene-analyzers.jar not found.)], [])
+         fi
+-        AC_CHECK_FILE($LUCENE_ANALYZERS_JAR, [],
+-               [AC_MSG_ERROR(lucene-analyzers.jar not found.)], [])
+ else
+     AC_MSG_RESULT([internal])
+     SYSTEM_LUCENE=NO
+@@ -5359,23 +5382,33 @@
+ 	if test -z "$COMMONS_CODEC_JAR"; then
+ 		COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar
+ 	fi
+-        AC_CHECK_FILE($COMMONS_CODEC_JAR, [],
+-               [AC_MSG_ERROR(commons-codec.jar not found.)], [])
++   AC_CHECK_FILE($COMMONS_CODEC_JAR, [],
++        [AC_MSG_ERROR(commons-codec.jar not found.)], [])
+ 	if test -z "$COMMONS_LANG_JAR"; then
+ 		COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar
+ 	fi
+-        AC_CHECK_FILE($COMMONS_LANG_JAR, [],
+-               [AC_MSG_ERROR(commons-lang.jar not found.)], [])
++   AC_CHECK_FILE($COMMONS_LANG_JAR, [],
++        [AC_MSG_ERROR(commons-lang.jar not found.)], [])
+ 	if test -z "$COMMONS_HTTPCLIENT_JAR"; then
+ 		COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar
+ 	fi
+-        AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
+-               [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
+-	if test -z "$COMMONS_LOGGING_JAR"; then
+-		COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar
+-	fi
+-        AC_CHECK_FILE($COMMONS_LOGGING_JAR, [],
+-               [AC_MSG_ERROR(commons-logging.jar not found.)], [])
++   AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
++        [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
++
++   if test -z $COMMONS_LOGGING_JAR; then
++     AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar, 
++       [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ],
++       [
++         AC_CHECK_FILE(/usr/share/java/commons-logging.jar, 
++           [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ],
++           [AC_MSG_ERROR(commons-logging.jar replacement not found.)]
++         )
++       ]
++     )
++   else
++     AC_CHECK_FILE($COMMONS_LOGGING_JAR, [],
++          [AC_MSG_ERROR(commons-logging.jar not found.)], [])
++   fi
+   else
+ 	AC_MSG_RESULT([internal])
+   	SYSTEM_APACHE_COMMONS=NO
+@@ -5419,62 +5452,163 @@
+   AC_MSG_CHECKING([which jfreereport libs to use])
+   if test "$with_system_jfreereport" == "yes"; then
+    	SYSTEM_JFREEREPORT=YES
+-  	AC_MSG_RESULT([external])
+-        if test -z $JCOMMON_JAR; then
+-               JCOMMON_JAR=/usr/share/java/jcommon-1.0.10.jar
+-        fi
++  	   AC_MSG_RESULT([external])
++      if test -z $JCOMMON_JAR; then
++        AC_CHECK_FILE(/usr/share/java/jcommon-1.0.10.jar, 
++          [ JCOMMON_JAR=/usr/share/java/jcommon-1.0.10.jar ],
++          [
++            AC_CHECK_FILE(/usr/share/java/jcommon.jar, 
++              [ JCOMMON_JAR=/usr/share/java/jcommon.jar ],
++              [AC_MSG_ERROR(jcommon.jar replacement not found.)]
++            )
++          ]
++        )
++      else
+         AC_CHECK_FILE($JCOMMON_JAR, [],
+-               [AC_MSG_ERROR(jcommon.jar not found.)], [])
+-        if test -z $SAC_JAR; then
+-               SAC_JAR=/usr/share/java/sac.jar
+-        fi
+-        AC_CHECK_FILE($SAC_JAR, [],
+-               [AC_MSG_ERROR(sac.jar not found.)], [])
+-        if test -z $LIBXML_JAR; then
+-               LIBXML_JAR=/usr/share/java/libxml-0.9.9.jar
+-        fi
++             [AC_MSG_ERROR(jcommon.jar not found.)], [])
++      fi
++
++      if test -z $SAC_JAR; then
++             SAC_JAR=/usr/share/java/sac.jar
++      fi
++      AC_CHECK_FILE($SAC_JAR, [],
++             [AC_MSG_ERROR(sac.jar not found.)], [])
++
++      if test -z $LIBXML_JAR; then
++        AC_CHECK_FILE(/usr/share/java/libxml-0.9.9.jar, 
++          [ LIBXML_JAR=/usr/share/java/libxml-0.9.9.jar ],
++          [
++            AC_CHECK_FILE(/usr/share/java/libxml.jar, 
++              [ LIBXML_JAR=/usr/share/java/libxml.jar ],
++              [AC_MSG_ERROR(libxml.jar replacement not found.)]
++            )
++          ]
++        )
++      else
+         AC_CHECK_FILE($LIBXML_JAR, [],
+-               [AC_MSG_ERROR(libxml.jar not found.)], [])
+-        if test -z $FLUTE_JAR; then
+-               FLUTE_JAR=/usr/share/java/flute-1.3-jfree-20061107.jar
+-        fi
++             [AC_MSG_ERROR(libxml.jar not found.)], [])
++      fi
++
++      if test -z $FLUTE_JAR; then
++        AC_CHECK_FILE(/usr/share/java/flute-1.3-jfree-20061107.jar, 
++          [ FLUTE_JAR=/usr/share/java/flute-1.3-jfree-20061107.jar ],
++          [
++            AC_CHECK_FILE(/usr/share/java/flute.jar, 
++              [ FLUTE_JAR=/usr/share/java/flute.jar ],
++              [ AC_MSG_ERROR(flute-1.3-jfree.jar replacement not found.)]
++            )
++          ]
++        )
++      else
+         AC_CHECK_FILE($FLUTE_JAR, [],
+-               [AC_MSG_ERROR(flute-1.3-jfree.jar not found.)], [])
+-        if test -z $JFREEREPORT_JAR; then
+-               JFREEREPORT_JAR=/usr/share/java/pentaho-reporting-flow-engine-0.9.2.jar
+-        fi
++             [AC_MSG_ERROR(flute-1.3-jfree.jar not found.)], [])
++      fi
++
++      if test -z $JFREEREPORT_JAR; then
++        AC_CHECK_FILE(/usr/share/java/pentaho-reporting-flow-engine-0.9.2.jar, 
++          [ JFREEREPORT_JAR=/usr/share/java/pentaho-reporting-flow-engine-0.9.2.jar ],
++          [
++            AC_CHECK_FILE(/usr/share/java/pentaho-reporting-flow-engine.jar, 
++              [ JFREEREPORT_JAR=/usr/share/java/pentaho-reporting-flow-engine.jar ],
++              [AC_MSG_ERROR(jfreereport.jar replacement not found.)]
++            )
++          ]
++        )
++      else
+         AC_CHECK_FILE($JFREEREPORT_JAR, [],
+-               [AC_MSG_ERROR(jfreereport.jar not found.)], [])
+-        if test -z $LIBLAYOUT_JAR; then
+-               LIBLAYOUT_JAR=/usr/share/java/liblayout-0.2.8.jar
+-        fi
++             [AC_MSG_ERROR(jfreereport.jar not found.)], [])
++      fi
++
++      if test -z $LIBLAYOUT_JAR; then
++        AC_CHECK_FILE(/usr/share/java/liblayout-0.2.8.jar, 
++          [ LIBLAYOUT_JAR=/usr/share/java/liblayout-0.2.8.jar ],
++          [
++            AC_CHECK_FILE(/usr/share/java/liblayout.jar, 
++              [ LIBLAYOUT_JAR=/usr/share/java/liblayout.jar ],
++              [AC_MSG_ERROR(liblayout.jar replacement not found.)]
++            )
++          ]
++        )
++      else
+         AC_CHECK_FILE($LIBLAYOUT_JAR, [],
+-               [AC_MSG_ERROR(liblayout.jar not found.)], [])
+-        if test -z $LIBLOADER_JAR; then
+-               LIBLOADER_JAR=/usr/share/java/libloader-0.3.6.jar
+-        fi
++             [AC_MSG_ERROR(liblayout.jar not found.)], [])
++      fi
++
++      if test -z $LIBLOADER_JAR; then
++        AC_CHECK_FILE(/usr/share/java/libloader-0.3.6.jar, 
++          [ LIBLOADER_JAR=/usr/share/java/libloader-0.3.6.jar ],
++          [
++            AC_CHECK_FILE(/usr/share/java/libloader.jar, 
++              [ LIBLOADER_JAR=/usr/share/java/libloader.jar ],
++              [AC_MSG_ERROR(libloader.jar replacement not found.)]
++            )
++          ]
++        )
++      else
+         AC_CHECK_FILE($LIBLOADER_JAR, [],
+-               [AC_MSG_ERROR(libloader.jar not found.)], [])
+-        if test -z $LIBFORMULA_JAR; then
+-               LIBFORMULA_JAR=/usr/share/java/libformula-0.1.14.jar
+-        fi
++             [AC_MSG_ERROR(libloader.jar not found.)], [])
++      fi
++
++      if test -z $LIBFORMULA_JAR; then
++        AC_CHECK_FILE(/usr/share/java/libformula-0.1.14.jar, 
++          [ LIBFORMULA_JAR=/usr/share/java/libformula-0.1.14.jar ],
++          [
++            AC_CHECK_FILE(/usr/share/java/libformula.jar, 
++              [ LIBFORMULA_JAR=/usr/share/java/libformula.jar ],
++              [AC_MSG_ERROR(libformula.jar replacement not found.)]
++            )
++          ]
++        )
++      else
+         AC_CHECK_FILE($LIBFORMULA_JAR, [],
+-               [AC_MSG_ERROR(libformula.jar not found.)], [])
+-        if test -z $LIBREPOSITORY_JAR; then
+-               LIBREPOSITORY_JAR=/usr/share/java/librepository-0.1.4.jar
+-        fi
++             [AC_MSG_ERROR(libformula.jar not found.)], [])
++      fi
++
++      if test -z $LIBREPOSITORY_JAR; then
++        AC_CHECK_FILE(/usr/share/java/librepository-0.1.4.jar, 
++          [ LIBREPOSITORY_JAR=/usr/share/java/librepository-0.1.4.jar ],
++          [
++            AC_CHECK_FILE(/usr/share/java/librepository.jar, 
++              [ LIBREPOSITORY_JAR=/usr/share/java/librepository.jar ],
++              [AC_MSG_ERROR(librepository.jar replacement not found.)]
++            )
++          ]
++        )
++      else
+         AC_CHECK_FILE($LIBREPOSITORY_JAR, [],
+-               [AC_MSG_ERROR(librepository.jar not found.)], [])
+-        if test -z $LIBFONTS_JAR; then
+-               LIBFONTS_JAR=/usr/share/java/libfonts-0.3.3.jar
+-        fi
++             [AC_MSG_ERROR(librepository.jar not found.)], [])
++      fi
++
++      if test -z $LIBFONTS_JAR; then
++        AC_CHECK_FILE(/usr/share/java/libfonts-0.3.3.jar, 
++          [ LIBFONTS_JAR=/usr/share/java/libfonts-0.3.3.jar ],
++          [
++            AC_CHECK_FILE(/usr/share/java/libfonts.jar, 
++              [ LIBFONTS_JAR=/usr/share/java/libfonts.jar ],
++              [AC_MSG_ERROR(libfonts.jar replacement not found.)]
++            )
++          ]
++        )
++      else
+         AC_CHECK_FILE($LIBFONTS_JAR, [],
+-               [AC_MSG_ERROR(libfonts.jar not found.)], [])
+-        if test -z $JCOMMON_SERIALIZER_JAR; then
+-               JCOMMON_SERIALIZER_JAR=/usr/share/java/jcommon-serializer-0.2.0.jar
+-        fi
++             [AC_MSG_ERROR(libfonts.jar not found.)], [])
++      fi
++
++      if test -z $JCOMMON_SERIALIZER_JAR; then
++        AC_CHECK_FILE(/usr/share/java/jcommon-serializer-0.2.0.jar, 
++          [ JCOMMON_SERIALIZER_JAR=/usr/share/java/jcommon-serializer-0.2.0.jar ],
++          [
++            AC_CHECK_FILE(/usr/share/java/jcommon-serializer.jar, 
++              [ JCOMMON_SERIALIZER_JAR=/usr/share/java/jcommon-serializer.jar ],
++              [AC_MSG_ERROR(jcommon-serializer.jar replacement not found.)]
++            )
++          ]
++        )
++      else
+         AC_CHECK_FILE($JCOMMON_SERIALIZER_JAR, [],
+-               [AC_MSG_ERROR(jcommon-serializer.jar not found.)], [])
++             [AC_MSG_ERROR(jcommon-serializer.jar not found.)], [])
++      fi
++
+   else
+      AC_MSG_RESULT([internal])
+      SYSTEM_JFREEREPORT=NO



From fschwarz at fedoraproject.org  Mon Sep 15 22:25:22 2008
From: fschwarz at fedoraproject.org (Felix Schwarz)
Date: Mon, 15 Sep 2008 22:25:22 +0000 (UTC)
Subject: rpms/pyPdf/F-9 pyPdf.spec,1.1,1.2
Message-ID: <20080915222522.2B52D7013B@cvs1.fedora.phx.redhat.com>

Author: fschwarz

Update of /cvs/pkgs/rpms/pyPdf/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv802

Modified Files:
	pyPdf.spec 
Log Message:
Updating pyPdf in F9 to 1.12


Index: pyPdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyPdf/F-9/pyPdf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyPdf.spec	5 Apr 2008 13:44:37 -0000	1.1
+++ pyPdf.spec	15 Sep 2008 22:24:51 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pyPdf
-Version:        1.10
-Release:        4%{?dist}
+Version:        1.12
+Release:        1%{?dist}
 Summary:        PDF toolkit
 
 Group:          Development/Languages
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Felix Schwarz <felix.schwarz at oss.schwarz.eu> 1.12-1
+- update to 1.12
+
 * Tue Apr 01 2008 Felix Schwarz <felix.schwarz at oss.schwarz.eu> 1.10-4
 - added CHANGELOG to doc, more specific file list
 



From kevin at fedoraproject.org  Mon Sep 15 22:26:26 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 15 Sep 2008 22:26:26 +0000 (UTC)
Subject: rpms/rkhunter/EL-5 rkhunter-1.3.2-debugtmp.patch, NONE,
	1.1 rkhunter.spec, 1.15, 1.16
Message-ID: <20080915222626.1D4A870138@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rkhunter/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1044

Modified Files:
	rkhunter.spec 
Added Files:
	rkhunter-1.3.2-debugtmp.patch 
Log Message:
Patch debug tmp file issue - bug #460628


rkhunter-1.3.2-debugtmp.patch:

--- NEW FILE rkhunter-1.3.2-debugtmp.patch ---
diff -Nur rkhunter-1.3.2.orig/files/rkhunter rkhunter-1.3.2/files/rkhunter
--- rkhunter-1.3.2.orig/files/rkhunter	2008-02-27 08:59:22.000000000 -0700
+++ rkhunter-1.3.2/files/rkhunter	2008-08-31 10:22:20.000000000 -0600
@@ -41,18 +41,18 @@
 fi
 
 if [ "$1" = "--debug" ]; then
-	if [ -e "/tmp/rkhunter-debug" ]; then
-		if [ -f "/tmp/rkhunter-debug" -a ! -h "/tmp/rkhunter-debug" ]; then
-			rm -f /tmp/rkhunter-debug >/dev/null 2>&1
-		else
-			echo "Cannot use '--debug' option. /tmp/rkhunter-debug already exists, but it is not a file."
-			exit 1
-		fi
-	fi
-
-	DEBUG_OPT=1
-
-	exec 1>/tmp/rkhunter-debug 2>&1
+      DEBUG_FILE=`mktemp -t rkhunter-debug.XXXXXXXXXX`
+      if [ -e "$DEBUG_FILE" ]; then
+              if [ -f "$DEBUG_FILE" -a ! -h "$DEBUG_FILE" ]; then
+                      rm -f $DEBUG_FILE >/dev/null 2>&1
+              else
+                      echo "Cannot use '--debug' option. $DEBUG_FILE already exists, but it is not a file."
+                       exit 1
+               fi
+        fi
+ 
+        DEBUG_OPT=1
+        exec 1>$DEBUG_FILE 2>&1
 	set -x
 else
 	DEBUG_OPT=0


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/EL-5/rkhunter.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rkhunter.spec	17 Jun 2008 19:16:18 -0000	1.15
+++ rkhunter.spec	15 Sep 2008 22:25:55 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           rkhunter
 Version:        1.3.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
@@ -10,6 +10,7 @@
 Source1:        http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.2.tar.gz.sha1.txt
 Source2:        01-rkhunter
 Source3:        rkhunter.sysconfig
+Patch0:		rkhunter-1.3.2-debugtmp.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +70,8 @@
 }
 EOF
 
+%patch0 -p1
+
 %build
 # Nothing to be built
 
@@ -136,6 +139,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Sep 03 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-5
+- Patch debug tmp file issue - bug #460628
+
 * Mon Jun 16 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-4
 - Fix cron script to only mail on warn/error - bug #450703
 - Fix conditional to account for fc10 rsyslog



From fschwarz at fedoraproject.org  Mon Sep 15 22:30:11 2008
From: fschwarz at fedoraproject.org (Felix Schwarz)
Date: Mon, 15 Sep 2008 22:30:11 +0000 (UTC)
Subject: rpms/pyPdf/F-9 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20080915223011.43695700EC@cvs1.fedora.phx.redhat.com>

Author: fschwarz

Update of /cvs/pkgs/rpms/pyPdf/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1832

Modified Files:
	.cvsignore sources 
Log Message:
forgot to upload the new source file for F9 branch (pyPdf 1.12)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyPdf/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Apr 2008 13:44:37 -0000	1.2
+++ .cvsignore	15 Sep 2008 22:29:40 -0000	1.3
@@ -1 +1 @@
-pyPdf-1.10.tar.gz
+pyPdf-1.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyPdf/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Apr 2008 13:44:37 -0000	1.2
+++ sources	15 Sep 2008 22:29:40 -0000	1.3
@@ -1 +1 @@
-e15eca1a3ed4d5c0d86370784e552a92  pyPdf-1.10.tar.gz
+7be5f7f4659f64fd194e9eb9a38ad425  pyPdf-1.12.tar.gz



From kevin at fedoraproject.org  Mon Sep 15 22:34:17 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 15 Sep 2008 22:34:17 +0000 (UTC)
Subject: rpms/rkhunter/EL-4 rkhunter-1.3.2-debugtmp.patch, NONE,
	1.1 rkhunter.spec, 1.9, 1.10
Message-ID: <20080915223417.4A4B4700EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rkhunter/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2402

Modified Files:
	rkhunter.spec 
Added Files:
	rkhunter-1.3.2-debugtmp.patch 
Log Message:
Patch debug tmp file issue - bug #460628


rkhunter-1.3.2-debugtmp.patch:

--- NEW FILE rkhunter-1.3.2-debugtmp.patch ---
diff -Nur rkhunter-1.3.2.orig/files/rkhunter rkhunter-1.3.2/files/rkhunter
--- rkhunter-1.3.2.orig/files/rkhunter	2008-02-27 08:59:22.000000000 -0700
+++ rkhunter-1.3.2/files/rkhunter	2008-08-31 10:22:20.000000000 -0600
@@ -41,18 +41,18 @@
 fi
 
 if [ "$1" = "--debug" ]; then
-	if [ -e "/tmp/rkhunter-debug" ]; then
-		if [ -f "/tmp/rkhunter-debug" -a ! -h "/tmp/rkhunter-debug" ]; then
-			rm -f /tmp/rkhunter-debug >/dev/null 2>&1
-		else
-			echo "Cannot use '--debug' option. /tmp/rkhunter-debug already exists, but it is not a file."
-			exit 1
-		fi
-	fi
-
-	DEBUG_OPT=1
-
-	exec 1>/tmp/rkhunter-debug 2>&1
+      DEBUG_FILE=`mktemp -t rkhunter-debug.XXXXXXXXXX`
+      if [ -e "$DEBUG_FILE" ]; then
+              if [ -f "$DEBUG_FILE" -a ! -h "$DEBUG_FILE" ]; then
+                      rm -f $DEBUG_FILE >/dev/null 2>&1
+              else
+                      echo "Cannot use '--debug' option. $DEBUG_FILE already exists, but it is not a file."
+                       exit 1
+               fi
+        fi
+ 
+        DEBUG_OPT=1
+        exec 1>$DEBUG_FILE 2>&1
 	set -x
 else
 	DEBUG_OPT=0


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/EL-4/rkhunter.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rkhunter.spec	17 Jun 2008 19:22:34 -0000	1.9
+++ rkhunter.spec	15 Sep 2008 22:33:46 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           rkhunter
 Version:        1.3.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
@@ -10,6 +10,7 @@
 Source1:        http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.2.tar.gz.sha1.txt
 Source2:        01-rkhunter
 Source3:        rkhunter.sysconfig
+Patch0:		rkhunter-1.3.2-debugtmp.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +70,8 @@
 }
 EOF
 
+%patch0 -p1
+
 %build
 # Nothing to be built
 
@@ -136,6 +139,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Sep 03 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-5
+- Patch debug tmp file issue - bug #460628
+
 * Mon Jun 16 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-4
 - Fix cron script to only mail on warn/error - bug #450703
 - Fix conditional to account for fc10 rsyslog



From than at fedoraproject.org  Mon Sep 15 22:38:01 2008
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 15 Sep 2008 22:38:01 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.38, 1.39 kde-settings.spec,
	1.54, 1.55 sources, 1.37, 1.38
Message-ID: <20080915223801.B4BE7700EC@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3054

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
- fix, systemsettings->icons doesn't show icons by Fedora-KDE
  icon theme



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	30 Jul 2008 13:26:48 -0000	1.38
+++ .cvsignore	15 Sep 2008 22:37:31 -0000	1.39
@@ -1 +1,2 @@
 kde-settings-4.0-25.tar.bz2
+kde-settings-4.0-26.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kde-settings.spec	30 Jul 2008 13:26:48 -0000	1.54
+++ kde-settings.spec	15 Sep 2008 22:37:31 -0000	1.55
@@ -1,7 +1,7 @@
 # THIS SPECFILE IS FOR F9+ ONLY!
 # Sorry, it is just too different for conditionals to be worth it.
 
-%define rel 25
+%define rel 26
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -153,6 +153,10 @@
 
 
 %changelog
+* Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.0-26
+- fix, systemsettings->icons doesn't show icons by Fedora-KDE
+  icon theme
+
 * Wed Jul 30 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0-25
 - kcminputrc: [Mouse] cursorTheme=default
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	30 Jul 2008 13:26:48 -0000	1.37
+++ sources	15 Sep 2008 22:37:31 -0000	1.38
@@ -1 +1 @@
-ce867a88875c6e27a4c2a16feb6de707  kde-settings-4.0-25.tar.bz2
+c67cc9ba9e899830103b3d0cc765896a  kde-settings-4.0-26.tar.bz2



From airlied at fedoraproject.org  Mon Sep 15 22:49:21 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 15 Sep 2008 22:49:21 +0000 (UTC)
Subject: rpms/kernel/devel drm-modesetting-i915.patch, 1.1, 1.2 kernel.spec, 
	1.950, 1.951
Message-ID: <20080915224921.16033700EC@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4643

Modified Files:
	drm-modesetting-i915.patch kernel.spec 
Log Message:
* Tue Sep 16 2008 Dave Airlie <airlied at redhat.com>
- properly fix issues with Intel interrupts


drm-modesetting-i915.patch:

Index: drm-modesetting-i915.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-i915.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drm-modesetting-i915.patch	9 Sep 2008 06:16:19 -0000	1.1
+++ drm-modesetting-i915.patch	15 Sep 2008 22:49:20 -0000	1.2
@@ -1,3 +1,68 @@
+commit 30ff7e1eb97ba42a7e71890a77345a495f022eb5
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Tue Sep 16 08:46:41 2008 +1000
+
+    drm/i915: fixup irqs and make i915 ints work again
+
+commit df3fafd56d88d44b7f691bc275406f19ac555869
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Tue Sep 16 06:59:58 2008 +1000
+
+    enable msi interrupts
+
+commit 6fbaf1dee397b1f2240b3026dc89d0d39b789641
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Tue Sep 16 05:10:56 2008 +1000
+
+    i915: fix issues with interrupts
+
+commit f0f6b59a6ab4f6a54780a4b7a8807659b3b9799a
+Author: Dave Airlie <airlied at panoply-rh.(none)>
+Date:   Tue Sep 9 16:03:12 2008 +1000
+
+    i915: fixup hws page
+
+commit dae9cc44a08b0d5e79dec6b3cccc7f8f70cbe542
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Mon Sep 8 17:08:29 2008 +1000
+
+    drm/i915: add modeset default config option support
+
+commit e4143dd833eec57e7f3ad9d54dc2e4d2315b10c0
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Mon Sep 8 17:08:04 2008 +1000
+
+    drm: export drm_mm_takedown
+
+commit 54608765a84591ecc16fe4fb468db12f8b603124
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Mon Sep 8 17:07:30 2008 +1000
+
+    i915: fix master priv accesses
+
+commit 948a856992c8ebd2615c1c9b6d74a757d4e34e64
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Sep 8 13:45:34 2008 +1000
+
+    intel: make build
+
+commit b8f2747a954a95e426baac1da0bb4cfee4dd534e
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Sep 8 13:28:52 2008 +1000
+
+    jbarnes: add gtt map code
+
+commit 661f42dd5878bbea4f1c785bbe8b290bb2495437
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Sep 8 13:27:53 2008 +1000
+
+    jbarnes: add mmap_io_region
+
+commit d8dfa0ecb3fd079dbc7d0c709692ff417b86a6c7
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Sep 8 13:25:58 2008 +1000
+
+    i915: add initial modesetting files
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
 index 649757f..a1ed52b 100644
 --- a/drivers/gpu/drm/Kconfig
@@ -18,6 +83,34 @@
  config DRM_MGA
  	tristate "Matrox g200/g400"
  	depends on DRM
+diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
+index a1c7b38..634e387 100644
+--- a/drivers/gpu/drm/drm_irq.c
++++ b/drivers/gpu/drm/drm_irq.c
+@@ -63,8 +63,6 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,
+ 	    p->devnum != PCI_SLOT(dev->pdev->devfn) || p->funcnum != PCI_FUNC(dev->pdev->devfn))
+ 		return -EINVAL;
+ 
+-	p->irq = dev->pdev->irq;
+-
+ 	DRM_DEBUG("%d:%d:%d => IRQ %d\n", p->busnum, p->devnum, p->funcnum,
+ 		  p->irq);
+ 
+@@ -127,12 +125,9 @@ int drm_irq_install(struct drm_device *dev)
+ 	if (drm_core_check_feature(dev, DRIVER_IRQ_SHARED))
+ 		sh_flags = IRQF_SHARED;
+ 
+-	ret = request_irq(dev->pdev->irq, dev->driver->irq_handler,
++	ret = request_irq(drm_dev_to_irq(dev), dev->driver->irq_handler,
+ 			  sh_flags, dev->devname, dev);
+-	/* Expose the device irq number to drivers that want to export it for
+-	 * whatever reason.
+-	 */
+-	dev->irq = dev->pdev->irq;
++
+ 	if (ret < 0) {
+ 		mutex_lock(&dev->struct_mutex);
+ 		dev->irq_enabled = 0;
 diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
 index 217ad7d..367c590 100644
 --- a/drivers/gpu/drm/drm_mm.c
@@ -27,6 +120,18 @@
  	drm_free(entry, sizeof(*entry), DRM_MEM_MM);
  }
 +EXPORT_SYMBOL(drm_mm_takedown);
+diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
+index 1dc2965..47c1c4e 100644
+--- a/drivers/gpu/drm/drm_stub.c
++++ b/drivers/gpu/drm/drm_stub.c
+@@ -214,7 +214,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
+ #ifdef __alpha__
+ 	dev->hose = pdev->sysdata;
+ #endif
+-	dev->irq = pdev->irq;
+ 
+ 	if (drm_ht_create(&dev->map_hash, DRM_MAP_HASH_ORDER)) {
+ 		return -ENOMEM;
 diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
 index 362d419..57aa9da 100644
 --- a/drivers/gpu/drm/i915/Makefile
@@ -3268,10 +3373,10 @@
  	ret = i915_gem_idle(dev);
  	if (ret == 0)
 diff --git a/drivers/gpu/drm/i915/i915_init.c b/drivers/gpu/drm/i915/i915_init.c
-index 06f2ecb..b67dd3a 100644
+index 06f2ecb..605565a 100644
 --- a/drivers/gpu/drm/i915/i915_init.c
 +++ b/drivers/gpu/drm/i915/i915_init.c
-@@ -7,6 +7,367 @@
+@@ -7,6 +7,373 @@
  #include "i915_drm.h"
  #include "i915_drv.h"
  #include "drm_sarea.h"
@@ -3531,6 +3636,9 @@
 +
 +	i915_gem_load(dev);
 +
++	if (!IS_I945G(dev) && !IS_I945GM(dev))
++		pci_enable_msi(dev->pdev);
++
 +	intel_opregion_init(dev);
 +
 +	tmp = I915_READ(PIPEASTAT);
@@ -3618,6 +3726,9 @@
 +		destroy_workqueue(dev_priv->wq);
 +	}
 +
++	if (dev->pdev->msi_enabled)
++		pci_disable_msi(dev->pdev);
++
 +	i915_free_hws(dev);
 +	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 +		mutex_lock(&dev->struct_mutex);
@@ -3639,7 +3750,7 @@
  
  int i915_master_create(struct drm_device *dev, struct drm_master *master)
  {
-@@ -33,3 +394,58 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master)
+@@ -33,3 +400,58 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master)
  
  	master->driver_priv = NULL;
  }
@@ -3699,10 +3810,10 @@
 +	return 0;
 +}
 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 965ec74..a0be952 100644
+index 965ec74..3c2fc12 100644
 --- a/drivers/gpu/drm/i915/i915_irq.c
 +++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -30,6 +30,7 @@
+@@ -30,16 +30,27 @@
  #include "drm.h"
  #include "i915_drm.h"
  #include "i915_drv.h"
@@ -3710,16 +3821,44 @@
  
  #define MAX_NOPID ((u32)~0)
  
-@@ -257,7 +258,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
++static void i915_vblank_configure(struct drm_device *dev, int pipe);
++
+ /** These are the interrupts used by the driver */
+ #define I915_INTERRUPT_ENABLE_MASK (I915_USER_INTERRUPT |		\
+-				    I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT | \
+-				    I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT | \
+ 				    I915_ASLE_INTERRUPT |		\
++				    I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | \
+ 				    I915_DISPLAY_PIPE_B_EVENT_INTERRUPT)
+ 
++#define I915_PIPE_VBLANK_STATUS	(PIPE_START_VBLANK_INTERRUPT_STATUS |\
++				 PIPE_VBLANK_INTERRUPT_STATUS)
++
++#define I915_PIPE_VBLANK_ENABLE	(PIPE_START_VBLANK_INTERRUPT_ENABLE |\
++				 PIPE_VBLANK_INTERRUPT_ENABLE)
++
++#define DRM_I915_VBLANK_PIPE_ALL	(DRM_I915_VBLANK_PIPE_A | \
++					 DRM_I915_VBLANK_PIPE_B)
++
+ void
+ i915_enable_irq(drm_i915_private_t *dev_priv, u32 mask)
+ {
+@@ -257,19 +268,16 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
  {
  	struct drm_device *dev = (struct drm_device *) arg;
  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 -	struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
+-	u32 pipea_stats, pipeb_stats;
 +	struct drm_i915_master_private *master_priv;
- 	u32 pipea_stats, pipeb_stats;
++	u32 pipea_stats = 0, pipeb_stats = 0;
  	u32 iir;
+-
+-	pipea_stats = I915_READ(PIPEASTAT);
+-	pipeb_stats = I915_READ(PIPEBSTAT);
++	int vblank_pipe = dev_priv->vblank_pipe;
  
-@@ -269,7 +270,6 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
+ 	if (dev->pdev->msi_enabled)
+ 		I915_WRITE(IMR, ~0);
  	iir = I915_READ(IIR);
  
  	DRM_DEBUG("iir=%08x\n", iir);
@@ -3727,7 +3866,25 @@
  	if (iir == 0) {
  		if (dev->pdev->msi_enabled) {
  			I915_WRITE(IMR, dev_priv->irq_mask_reg);
-@@ -286,8 +286,11 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -278,38 +286,47 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
+ 		return IRQ_NONE;
+ 	}
+ 
+-	I915_WRITE(PIPEASTAT, pipea_stats);
+-	I915_WRITE(PIPEBSTAT, pipeb_stats);
++	if (iir & I915_DISPLAY_PIPE_A_EVENT_INTERRUPT) {
++		pipea_stats = I915_READ(PIPEASTAT);
++		I915_WRITE(PIPEASTAT, pipea_stats);
++	}
++	if (iir & I915_DISPLAY_PIPE_B_EVENT_INTERRUPT) {
++		pipeb_stats = I915_READ(PIPEBSTAT);
++ 		if ((vblank_pipe & DRM_I915_VBLANK_PIPE_B) == 0)
++ 			pipeb_stats &= ~(I915_VBLANK_INTERRUPT_ENABLE);
++		I915_WRITE(PIPEBSTAT, pipeb_stats);
++	}
+ 
+ 	I915_WRITE(IIR, iir);
+ 	if (dev->pdev->msi_enabled)
  		I915_WRITE(IMR, dev_priv->irq_mask_reg);
  	(void) I915_READ(IIR); /* Flush posted writes */
  
@@ -3741,7 +3898,41 @@
  
  	if (iir & I915_USER_INTERRUPT) {
  		dev_priv->mm.irq_gem_seqno = i915_get_gem_seqno(dev);
-@@ -485,6 +488,78 @@ int i915_irq_wait(struct drm_device *dev, void *data,
+ 		DRM_WAKEUP(&dev_priv->irq_queue);
+ 	}
+ 
+-	if (iir & (I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT |
+-		   I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT)) {
+-		int vblank_pipe = dev_priv->vblank_pipe;
+-
+-		if ((vblank_pipe &
+-		     (DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B))
+-		    == (DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B)) {
+-			if (iir & I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT)
++	if ((pipeb_stats|pipea_stats) & I915_PIPE_VBLANK_STATUS) {
++ 		/* When tracking both pipes, split the counts */
++ 		if ((vblank_pipe & DRM_I915_VBLANK_PIPE_ALL) ==
++ 		    DRM_I915_VBLANK_PIPE_ALL) {
++ 			if (pipea_stats & I915_PIPE_VBLANK_STATUS)
+ 				atomic_inc(&dev->vbl_received);
+-			if (iir & I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT)
++ 			if (pipeb_stats & I915_PIPE_VBLANK_STATUS)
+ 				atomic_inc(&dev->vbl_received2);
+-		} else if (((iir & I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT) &&
+-			    (vblank_pipe & DRM_I915_VBLANK_PIPE_A)) ||
+-			   ((iir & I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT) &&
+-			    (vblank_pipe & DRM_I915_VBLANK_PIPE_B)))
+-			atomic_inc(&dev->vbl_received);
++
++		} else if (((pipea_stats & I915_PIPE_VBLANK_STATUS) &&
++  			    (vblank_pipe & DRM_I915_VBLANK_PIPE_A)) ||
++			   ((pipeb_stats & I915_PIPE_VBLANK_STATUS) &&
++  			    (vblank_pipe & DRM_I915_VBLANK_PIPE_B)))
++  			atomic_inc(&dev->vbl_received);
+ 
+ 		DRM_WAKEUP(&dev->vbl_queue);
+ 		drm_vbl_send_signals(dev);
+@@ -485,6 +502,120 @@ int i915_irq_wait(struct drm_device *dev, void *data,
  	return i915_wait_irq(dev, irqwait->irq_seq);
  }
  
@@ -3749,10 +3940,9 @@
 +void i915_enable_interrupt (struct drm_device *dev)
 +{
 +	struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
++#if 0
 +	struct drm_connector *o;
 +	
-+	dev_priv->irq_mask_reg &= ~0;
-+
 +	if (IS_I9XX(dev) && !IS_I915G(dev) && !IS_I915GM(dev)) {
 +		if (dev->mode_config.num_connector)
 +			dev_priv->irq_mask_reg &= ~I915_DISPLAY_PORT_INTERRUPT;
@@ -3812,15 +4002,121 @@
 +			I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
 +		}
 +	}
-+
++#endif
++ 	i915_vblank_configure(dev, dev_priv->vblank_pipe);
 +	opregion_enable_asle(dev);
 +	dev_priv->irq_enabled = 1;
 +}
 +
++static void i915_vblank_configure(struct drm_device *dev, int pipe)
++{
++	drm_i915_private_t *dev_priv = dev->dev_private;
++	u32 enable_a_mask = 0, disable_a_mask = 0;
++	u32 enable_b_mask = 0, disable_b_mask = 0;
++	u32 mask;
++	u32 pipe_a_stat, pipe_b_stat;
++
++	/*
++	 * For newer chips, use START_VBLANK_INTERRUPT_ENABLE
++	 * as the VBLANK_INTERRUPT_ENABLE signal occurs much
++	 * later
++	 */
++	if (IS_I965G(dev))
++		mask = PIPE_START_VBLANK_INTERRUPT_ENABLE;
++	else
++		mask = PIPE_VBLANK_INTERRUPT_ENABLE;
++	
++	if (pipe & DRM_I915_VBLANK_PIPE_A)
++		enable_a_mask |= mask;
++	else
++		disable_a_mask |= mask;
++
++	if (pipe & DRM_I915_VBLANK_PIPE_B)
++		enable_b_mask |= mask;
++	else
++		disable_b_mask |= mask;
++
++	pipe_a_stat = I915_READ (PIPEASTAT);
++	pipe_a_stat |= enable_a_mask;
++	pipe_a_stat &= ~disable_a_mask;
++	I915_WRITE (PIPEASTAT, pipe_a_stat);
++	
++	pipe_b_stat = I915_READ (PIPEBSTAT);
++	pipe_b_stat |= enable_b_mask;
++	pipe_b_stat &= ~disable_b_mask;
++	I915_WRITE (PIPEBSTAT, pipe_b_stat);
++
++	/* post writes */
++	(void) I915_READ(PIPEBSTAT);
++}
++
  /* Set the vblank monitor pipe
   */
  int i915_vblank_pipe_set(struct drm_device *dev, void *data,
-@@ -670,24 +745,10 @@ void i915_driver_irq_postinstall(struct drm_device * dev)
+@@ -492,7 +623,6 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
+ {
+ 	drm_i915_private_t *dev_priv = dev->dev_private;
+ 	drm_i915_vblank_pipe_t *pipe = data;
+-	u32 enable_mask = 0, disable_mask = 0;
+ 
+ 	if (!dev_priv) {
+ 		DRM_ERROR("called with no initialization\n");
+@@ -504,18 +634,10 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
+ 		return -EINVAL;
+ 	}
+ 
+-	if (pipe->pipe & DRM_I915_VBLANK_PIPE_A)
+-		enable_mask |= I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT;
+-	else
+-		disable_mask |= I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT;
++	i915_vblank_configure(dev, pipe->pipe);
+ 
+-	if (pipe->pipe & DRM_I915_VBLANK_PIPE_B)
+-		enable_mask |= I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT;
+-	else
+-		disable_mask |= I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT;
+-
+-	i915_enable_irq(dev_priv, enable_mask);
+-	i915_disable_irq(dev_priv, disable_mask);
++	i915_enable_irq(dev_priv, I915_DISPLAY_PIPE_A_EVENT_INTERRUPT);
++	i915_enable_irq(dev_priv, I915_DISPLAY_PIPE_B_EVENT_INTERRUPT);
+ 
+ 	dev_priv->vblank_pipe = pipe->pipe;
+ 
+@@ -527,18 +649,19 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
+ {
+ 	drm_i915_private_t *dev_priv = dev->dev_private;
+ 	drm_i915_vblank_pipe_t *pipe = data;
+-	u16 flag;
++	u32 pipe_a_stat, pipe_b_stat;
+ 
+ 	if (!dev_priv) {
+ 		DRM_ERROR("called with no initialization\n");
+ 		return -EINVAL;
+ 	}
+ 
+-	flag = I915_READ(IMR);
++	pipe_a_stat = I915_READ(PIPEASTAT);
++	pipe_b_stat = I915_READ(PIPEBSTAT);
+ 	pipe->pipe = 0;
+-	if (flag & I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT)
++	if (pipe_a_stat & I915_PIPE_VBLANK_ENABLE)
+ 		pipe->pipe |= DRM_I915_VBLANK_PIPE_A;
+-	if (flag & I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT)
++	if (pipe_b_stat & I915_PIPE_VBLANK_ENABLE)
+ 		pipe->pipe |= DRM_I915_VBLANK_PIPE_B;
+ 
+ 	return 0;
+@@ -657,7 +780,7 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
+ {
+ 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+ 
+-	I915_WRITE(HWSTAM, 0xfffe);
++	I915_WRITE(HWSTAM, 0xeffe);
+ 	I915_WRITE(IMR, 0x0);
+ 	I915_WRITE(IER, 0x0);
+ }
+@@ -670,24 +793,11 @@ void i915_driver_irq_postinstall(struct drm_device * dev)
  	INIT_LIST_HEAD(&dev_priv->vbl_swaps.head);
  	dev_priv->swaps_pending = 0;
  
@@ -3828,7 +4124,7 @@
 -		dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A;
  
  	/* Set initial unmasked IRQs to just the selected vblank pipes. */
- 	dev_priv->irq_mask_reg = ~0;
+-	dev_priv->irq_mask_reg = ~0;
 -	if (dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_A)
 -		dev_priv->irq_mask_reg &= ~I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT;
 -	if (dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_B)
@@ -3837,7 +4133,8 @@
 -	dev_priv->irq_mask_reg &= I915_INTERRUPT_ENABLE_MASK;
 -
 -	I915_WRITE(IMR, dev_priv->irq_mask_reg);
--	I915_WRITE(IER, I915_INTERRUPT_ENABLE_MASK);
++ 	dev_priv->irq_mask_reg = I915_INTERRUPT_ENABLE_MASK;
+ 	I915_WRITE(IER, I915_INTERRUPT_ENABLE_MASK);
 -	(void) I915_READ(IER);
 -
 -	opregion_enable_asle(dev);
@@ -12404,6 +12701,97 @@
 +out:
 +	drm_sysfs_connector_add(connector);
 +}
+diff --git a/drivers/gpu/drm/mga/mga_state.c b/drivers/gpu/drm/mga/mga_state.c
+index d3f8aad..b710fab 100644
+--- a/drivers/gpu/drm/mga/mga_state.c
++++ b/drivers/gpu/drm/mga/mga_state.c
+@@ -1022,7 +1022,7 @@ static int mga_getparam(struct drm_device *dev, void *data, struct drm_file *fil
+ 
+ 	switch (param->param) {
+ 	case MGA_PARAM_IRQ_NR:
+-		value = dev->irq;
++		value = drm_dev_to_irq(dev);
+ 		break;
+ 	case MGA_PARAM_CARD_TYPE:
+ 		value = dev_priv->chipset;
+diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
+index 51a9afc..f7a5b57 100644
+--- a/drivers/gpu/drm/r128/r128_state.c
++++ b/drivers/gpu/drm/r128/r128_state.c
+@@ -1629,7 +1629,7 @@ static int r128_getparam(struct drm_device *dev, void *data, struct drm_file *fi
+ 
+ 	switch (param->param) {
+ 	case R128_PARAM_IRQ_NR:
+-		value = dev->irq;
++		value = drm_dev_to_irq(dev);
+ 		break;
+ 	default:
+ 		return -EINVAL;
+diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
+index dcf5922..399471f 100644
+--- a/drivers/gpu/drm/radeon/radeon_state.c
++++ b/drivers/gpu/drm/radeon/radeon_state.c
+@@ -3029,7 +3029,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
+ 		value = GET_SCRATCH(2);
+ 		break;
+ 	case RADEON_PARAM_IRQ_NR:
+-		value = dev->irq;
++		value = drm_dev_to_irq(dev);
+ 		break;
+ 	case RADEON_PARAM_GART_BASE:
+ 		value = dev_priv->gart_vm_start;
+diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
+index c6bb978..53d90b3 100644
+--- a/drivers/gpu/drm/via/via_irq.c
++++ b/drivers/gpu/drm/via/via_irq.c
+@@ -339,9 +339,6 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
+ 	drm_via_irq_t *cur_irq = dev_priv->via_irqs;
+ 	int force_sequence;
+ 
+-	if (!dev->irq)
+-		return -EINVAL;
+-
+ 	if (irqwait->request.irq >= dev_priv->num_irqs) {
+ 		DRM_ERROR("Trying to wait on unknown irq %d\n",
+ 			  irqwait->request.irq);
+diff --git a/drivers/gpu/drm/via/via_mm.c b/drivers/gpu/drm/via/via_mm.c
+index e640949..f694cb5 100644
+--- a/drivers/gpu/drm/via/via_mm.c
++++ b/drivers/gpu/drm/via/via_mm.c
+@@ -93,8 +93,7 @@ int via_final_context(struct drm_device *dev, int context)
+ 	/* Last context, perform cleanup */
+ 	if (dev->ctx_count == 1 && dev->dev_private) {
+ 		DRM_DEBUG("Last Context\n");
+-		if (dev->irq)
+-			drm_irq_uninstall(dev);
++		drm_irq_uninstall(dev);
+ 		via_cleanup_futex(dev_priv);
+ 		via_do_cleanup_map(dev);
+ 	}
+diff --git a/include/drm/drmP.h b/include/drm/drmP.h
+index 31e2f17..a67618a 100644
+--- a/include/drm/drmP.h
++++ b/include/drm/drmP.h
+@@ -842,7 +842,6 @@ struct drm_device {
+ 
+ 	/** \name Context support */
+ 	/*@{ */
+-	int irq;			/**< Interrupt used by board */
+ 	int irq_enabled;		/**< True if irq handler is enabled */
+ 	__volatile__ long context_flag;	/**< Context swapping flag */
+ 	__volatile__ long interrupt_flag; /**< Interruption handler flag */
+@@ -944,6 +943,11 @@ struct ati_pcigart_ttm_backend {
+ };
+ extern struct drm_ttm_backend *ati_pcigart_init_ttm(struct drm_device *dev, struct drm_ati_pcigart_info *info, void (*gart_flush_fn)(struct drm_device *dev));
+ 
++static inline int drm_dev_to_irq(struct drm_device *dev)
++{
++	return dev->pdev->irq;
++}
++
+ static __inline__ int drm_core_check_feature(struct drm_device *dev,
+ 					     int feature)
+ {
 diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
 index 7d88a21..5525c91 100644
 --- a/include/drm/i915_drm.h


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.950
retrieving revision 1.951
diff -u -r1.950 -r1.951
--- kernel.spec	15 Sep 2008 14:02:14 -0000	1.950
+++ kernel.spec	15 Sep 2008 22:49:20 -0000	1.951
@@ -1761,6 +1761,9 @@
 
 %changelog
 * Tue Sep 16 2008 Dave Airlie <airlied at redhat.com>
+- properly fix issues with Intel interrupts
+
+* Tue Sep 16 2008 Dave Airlie <airlied at redhat.com>
 - fix from Intel for irqs hopefully
 
 * Sat Sep 13 2008 Chuck Ebbert <cebbert at redhat.com>



From fschwarz at fedoraproject.org  Mon Sep 15 22:56:04 2008
From: fschwarz at fedoraproject.org (Felix Schwarz)
Date: Mon, 15 Sep 2008 22:56:04 +0000 (UTC)
Subject: rpms/pyPdf/F-9 pyPdf.spec,1.2,1.3
Message-ID: <20080915225604.765D9700EC@cvs1.fedora.phx.redhat.com>

Author: fschwarz

Update of /cvs/pkgs/rpms/pyPdf/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5546

Modified Files:
	pyPdf.spec 
Log Message:
forgot to commit the sources in 1.12-1 (F9) so I have to bump the release number



Index: pyPdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyPdf/F-9/pyPdf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pyPdf.spec	15 Sep 2008 22:24:51 -0000	1.2
+++ pyPdf.spec	15 Sep 2008 22:55:33 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           pyPdf
 Version:        1.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PDF toolkit
 
 Group:          Development/Languages
@@ -47,6 +47,10 @@
 
 
 %changelog
+* Mon Sep 15 2008 Felix Schwarz <felix.schwarz at oss.schwarz.eu> 1.12-2
+- forgot to add the new tar.gz to the Fedora build system, therefore
+  bumping the release number
+
 * Mon Sep 15 2008 Felix Schwarz <felix.schwarz at oss.schwarz.eu> 1.12-1
 - update to 1.12
 



From airlied at fedoraproject.org  Mon Sep 15 22:59:56 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 15 Sep 2008 22:59:56 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.951, 1.952 drm-intel-fix-irqs.patch,
	1.1, NONE
Message-ID: <20080915225956.9BFF5700EC@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6287

Modified Files:
	kernel.spec 
Removed Files:
	drm-intel-fix-irqs.patch 
Log Message:
* Tue Sep 16 2008 Dave Airlie <airlied at redhat.com>
- removed previous attempted fix



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.951
retrieving revision 1.952
diff -u -r1.951 -r1.952
--- kernel.spec	15 Sep 2008 22:49:20 -0000	1.951
+++ kernel.spec	15 Sep 2008 22:59:26 -0000	1.952
@@ -609,7 +609,6 @@
 Patch1811: drm-modesetting-radeon.patch
 Patch1812: drm-modesetting-i915.patch
 Patch1813: drm-nouveau.patch
-Patch1814: drm-intel-fix-irqs.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1168,7 +1167,6 @@
 ApplyPatch drm-modesetting-radeon.patch
 ApplyPatch drm-modesetting-i915.patch
 ApplyPatch drm-nouveau.patch
-ApplyPatch drm-intel-fix-irqs.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1761,6 +1759,9 @@
 
 %changelog
 * Tue Sep 16 2008 Dave Airlie <airlied at redhat.com>
+- removed previous attempted fix
+
+* Tue Sep 16 2008 Dave Airlie <airlied at redhat.com>
 - properly fix issues with Intel interrupts
 
 * Tue Sep 16 2008 Dave Airlie <airlied at redhat.com>


--- drm-intel-fix-irqs.patch DELETED ---



From tuxbrewr at fedoraproject.org  Mon Sep 15 23:30:41 2008
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Mon, 15 Sep 2008 23:30:41 +0000 (UTC)
Subject: rpms/powerman/devel .cvsignore, 1.6, 1.7 powerman.spec, 1.14,
	1.15 sources, 1.6, 1.7
Message-ID: <20080915233042.00FC77013A@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/powerman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10270

Modified Files:
	.cvsignore powerman.spec sources 
Log Message:
New Upstream Release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/powerman/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Jun 2008 20:20:34 -0000	1.6
+++ .cvsignore	15 Sep 2008 23:30:09 -0000	1.7
@@ -1 +1 @@
-powerman-2.1.tar.bz2
+powerman-2.2.tar.bz2


Index: powerman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powerman/devel/powerman.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- powerman.spec	28 Aug 2008 21:33:49 -0000	1.14
+++ powerman.spec	15 Sep 2008 23:30:10 -0000	1.15
@@ -1,6 +1,6 @@
 Name: powerman
-Version: 2.1
-Release: 2%{?dist}
+Version: 2.2
+Release: 1%{?dist}
 Summary: PowerMan - Power to the Cluster
 
 Group: Applications/System
@@ -40,8 +40,8 @@
 rm $RPM_BUILD_ROOT/%{_bindir}/pm
 pushd $RPM_BUILD_ROOT/%{_bindir};ln -s powerman pm; popd
 # install a default config file
-cp examples/%{name}.conf-small \
-    $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
+#cp examples/%{name}.conf-small \
+#    $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
 # get rid of execute bit on powerman script files to fix rpmlint errror
 chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/*
 # Don't turn on by default
@@ -69,9 +69,10 @@
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog DISCLAIMER COPYING NEWS TODO
-%doc examples/powerman.conf-*
+#%doc examples/powerman.conf-*
 %{_bindir}/powerman
 %{_bindir}/pm
+%{_sbindir}/plmpower
 %{_sbindir}/powermand
 %{_sbindir}/httppower
 %dir %{_sysconfdir}/%{name}/
@@ -80,6 +81,9 @@
 %{_sysconfdir}/init.d/%{name}
 
 %changelog
+* Mon Sep 15 2008 Steven M. Parrish <smparrish at shallowcreek.net> 2.2-1
+- New upstream release
+
 * Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/powerman/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Jun 2008 20:20:34 -0000	1.6
+++ sources	15 Sep 2008 23:30:10 -0000	1.7
@@ -1 +1 @@
-45499604a413dcfe48ac7e9f21e61be4  powerman-2.1.tar.bz2
+3d1ea7193693a385c24e9a21af937e45  powerman-2.2.tar.bz2



From davej at fedoraproject.org  Mon Sep 15 23:31:47 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Mon, 15 Sep 2008 23:31:47 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc6-git4.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.924, 1.925 kernel.spec, 1.952, 1.953 sources, 1.886,
	1.887 upstream, 1.798, 1.799
Message-ID: <20080915233147.879FC700EC@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10641

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.27-rc6-git4.bz2.sign 
Log Message:
2.6.27-rc6-git4


--- NEW FILE patch-2.6.27-rc6-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIzk6+yGugalF9Dw4RAjGhAJ48UudHGUfZHfqhY2oY99UdRFaBbACdFMY5
OVty+S0ATsAhdnEuope62EY=
=W28g
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.924
retrieving revision 1.925
diff -u -r1.924 -r1.925
--- .cvsignore	12 Sep 2008 16:42:16 -0000	1.924
+++ .cvsignore	15 Sep 2008 23:31:16 -0000	1.925
@@ -5,4 +5,4 @@
 kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc6.bz2
-patch-2.6.27-rc6-git2.bz2
+patch-2.6.27-rc6-git4.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.952
retrieving revision 1.953
diff -u -r1.952 -r1.953
--- kernel.spec	15 Sep 2008 22:59:26 -0000	1.952
+++ kernel.spec	15 Sep 2008 23:31:16 -0000	1.953
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 2
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1758,15 +1758,21 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Tue Sep 16 2008 Dave Airlie <airlied at redhat.com>
+* Mon Sep 15 2008 Dave Jones <davej at redhat.com>
+- 2.6.27-rc6-git4
+
+* Mon Sep 15 2008 Dave Airlie <airlied at redhat.com>
 - removed previous attempted fix
 
-* Tue Sep 16 2008 Dave Airlie <airlied at redhat.com>
+* Mon Sep 15 2008 Dave Airlie <airlied at redhat.com>
 - properly fix issues with Intel interrupts
 
-* Tue Sep 16 2008 Dave Airlie <airlied at redhat.com>
+* Mon Sep 15 2008 Dave Airlie <airlied at redhat.com>
 - fix from Intel for irqs hopefully
 
+* Sat Sep 13 2008 Dave Jones <davej at redhat.com>
+- 2.6.27-rc6-git3
+
 * Sat Sep 13 2008 Chuck Ebbert <cebbert at redhat.com>
 - Fix hang in installer on PS3. (#458910)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.886
retrieving revision 1.887
diff -u -r1.886 -r1.887
--- sources	12 Sep 2008 16:42:16 -0000	1.886
+++ sources	15 Sep 2008 23:31:17 -0000	1.887
@@ -1,3 +1,3 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 d3a173a00e15a6bf3c76068537a5c069  patch-2.6.27-rc6.bz2
-d487da311055fd8f952a5db4e736c322  patch-2.6.27-rc6-git2.bz2
+71df31086a80b21d51a52a00958ed3fa  patch-2.6.27-rc6-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.798
retrieving revision 1.799
diff -u -r1.798 -r1.799
--- upstream	12 Sep 2008 16:42:16 -0000	1.798
+++ upstream	15 Sep 2008 23:31:17 -0000	1.799
@@ -1,3 +1,3 @@
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc6.bz2
-patch-2.6.27-rc6-git2.bz2
+patch-2.6.27-rc6-git4.bz2



From toshio at fedoraproject.org  Mon Sep 15 23:34:35 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 15 Sep 2008 23:34:35 +0000 (UTC)
Subject: rpms/python-fedora/devel .cvsignore, 1.22, 1.23 python-fedora.spec, 
	1.24, 1.25 sources, 1.23, 1.24
Message-ID: <20080915233435.CEAC6700EC@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10987

Modified Files:
	.cvsignore python-fedora.spec sources 
Log Message:

* Mon Sep 15 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.6-1
- New upstream.  No longer deps on koji.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	25 Aug 2008 18:01:28 -0000	1.22
+++ .cvsignore	15 Sep 2008 23:34:05 -0000	1.23
@@ -1 +1 @@
-python-fedora-0.3.5.tar.gz
+python-fedora-0.3.6.tar.gz


Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/python-fedora.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- python-fedora.spec	25 Aug 2008 18:01:28 -0000	1.24
+++ python-fedora.spec	15 Sep 2008 23:34:05 -0000	1.25
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fedora
-Version:        0.3.5
+Version:        0.3.6
 Release:        1%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
@@ -17,7 +17,10 @@
 Requires:       python-bugzilla
 Requires:       python-feedparser
 Requires:       python-sqlalchemy
-Requires:       koji
+# These are now optional dependencies.  Some bodhi methods will not work if
+# they aren't installed but they aren't needed for most functionality of the
+# module.
+#Requires:       koji python-iniparse yum
 Provides:       python-fedora-infrastructure = %{version}-%{release}
 Obsoletes:      python-fedora-infrastructure < %{version}-%{release}
 
@@ -33,13 +36,13 @@
 
 %build
 paver build
-
+paver html
 
 %install
 rm -rf $RPM_BUILD_ROOT
 paver install --skip-build --root $RPM_BUILD_ROOT
+mv build-doc/html doc/
 
- 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -50,6 +53,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Mon Sep 15 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.6-1
+- New upstream.  No longer deps on koji.
+
 * Mon Aug 25 2008 Luke Macken <lmacken at redhat.com> - 0.3.5-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	25 Aug 2008 18:01:28 -0000	1.23
+++ sources	15 Sep 2008 23:34:05 -0000	1.24
@@ -1 +1 @@
-0d6cf8d8cb5aaeb60573b8edcd9183b9  python-fedora-0.3.5.tar.gz
+d5ab6c21460f91df20df5fd6e0d36221  python-fedora-0.3.6.tar.gz



From toshio at fedoraproject.org  Mon Sep 15 23:47:46 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 15 Sep 2008 23:47:46 +0000 (UTC)
Subject: rpms/python-fedora/devel python-fedora.spec,1.25,1.26
Message-ID: <20080915234746.14576700EC@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12792

Modified Files:
	python-fedora.spec 
Log Message:
Ass python-sphinxas a BR.



Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/python-fedora.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- python-fedora.spec	15 Sep 2008 23:34:05 -0000	1.25
+++ python-fedora.spec	15 Sep 2008 23:47:15 -0000	1.26
@@ -2,7 +2,7 @@
 
 Name:           python-fedora
 Version:        0.3.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
 Group:          Development/Languages
@@ -12,7 +12,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel python-setuptools-devel python-paver
+BuildRequires:  python-devel
+BuildRequires:  python-setuptools-devel
+BuildRequires:  python-paver
+BuildRequires:  python-sphinx
 Requires:       python-simplejson
 Requires:       python-bugzilla
 Requires:       python-feedparser
@@ -53,6 +56,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Mon Sep 15 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.6-2
+- Add python-sphinx to the buildrequires.
+
 * Mon Sep 15 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.6-1
 - New upstream.  No longer deps on koji.
 



From roland at fedoraproject.org  Mon Sep 15 23:51:09 2008
From: roland at fedoraproject.org (Roland McGrath)
Date: Mon, 15 Sep 2008 23:51:09 +0000 (UTC)
Subject: rpms/kernel/F-9 kernel.spec, 1.767, 1.768 linux-2.6-utrace.patch,
	1.78, 1.79
Message-ID: <20080915235109.68DA9700EC@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13349

Modified Files:
	kernel.spec linux-2.6-utrace.patch 
Log Message:
* Mon Sep 15 2008 Roland McGrath <roland at redhat.com> - 2.6.26.5-41
- utrace: Fix common oops in ptrace EPERM case.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.767
retrieving revision 1.768
diff -u -r1.767 -r1.768
--- kernel.spec	14 Sep 2008 18:15:14 -0000	1.767
+++ kernel.spec	15 Sep 2008 23:50:36 -0000	1.768
@@ -1866,6 +1866,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Mon Sep 15 2008 Roland McGrath <roland at redhat.com> - 2.6.26.5-41
+- utrace: Fix common oops in ptrace EPERM case.
+
 * Sun Sep 14 2008 Kyle McMartin <kyle at redhat.com> 2.6.26.5-40
 - wireless: rt2500pci: restoring missing line
 

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-utrace.patch,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- linux-2.6-utrace.patch	4 Aug 2008 22:20:04 -0000	1.78
+++ linux-2.6-utrace.patch	15 Sep 2008 23:50:37 -0000	1.79
@@ -1994,7 +1994,7 @@
 +	if (IS_ERR(engine))
 +		return engine;
 +	if (likely(!ptrace_update_utrace(child, engine)))
-+		return 0;
++		return engine;
 +	ptrace_detach_utrace(child, engine);
 +	return ERR_PTR(-ESRCH);
 +}



From toshio at fedoraproject.org  Tue Sep 16 00:02:32 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 16 Sep 2008 00:02:32 +0000 (UTC)
Subject: rpms/python-fedora/EL-5 .cvsignore, 1.12, 1.13 python-fedora.spec, 
	1.12, 1.13 sources, 1.13, 1.14
Message-ID: <20080916000232.1E88670138@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14952/EL-5

Modified Files:
	.cvsignore python-fedora.spec sources 
Log Message:
* Mon Sep 15 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.6-1
- New upstream.  No longer deps on koji.
- BuildRequires python-sphinx



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	28 Jul 2008 22:36:26 -0000	1.12
+++ .cvsignore	16 Sep 2008 00:02:01 -0000	1.13
@@ -1 +1 @@
-python-fedora-0.3.4.tar.gz
+python-fedora-0.3.6.tar.gz


Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/python-fedora.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- python-fedora.spec	28 Aug 2008 00:49:19 -0000	1.12
+++ python-fedora.spec	16 Sep 2008 00:02:01 -0000	1.13
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fedora
-Version:        0.3.5
-Release:        1%{?dist}
+Version:        0.3.6
+Release:        2%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
 Group:          Development/Languages
@@ -12,12 +12,18 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel python-setuptools-devel python-paver
+BuildRequires:  python-devel
+BuildRequires:  python-setuptools-devel
+BuildRequires:  python-paver
+BuildRequires:  python-sphinx
 Requires:       python-simplejson
 Requires:       python-bugzilla
 Requires:       python-feedparser
 Requires:       python-sqlalchemy
-Requires:       koji
+# These are now optional dependencies.  Some bodhi methods will not work if
+# they aren't installed but they aren't needed for most functionality of the
+# module.
+#Requires:       koji python-iniparse yum
 Provides:       python-fedora-infrastructure = %{version}-%{release}
 Obsoletes:      python-fedora-infrastructure < %{version}-%{release}
 
@@ -33,13 +39,13 @@
 
 %build
 paver build
-
+paver html
 
 %install
 rm -rf $RPM_BUILD_ROOT
 paver install --skip-build --root $RPM_BUILD_ROOT
+mv build-doc/html doc/
 
- 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -50,6 +56,12 @@
 %{python_sitelib}/*
 
 %changelog
+* Mon Sep 15 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.6-2
+- Add python-sphinx to the buildrequires.
+
+* Mon Sep 15 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.6-1
+- New upstream.  No longer deps on koji.
+
 * Mon Aug 25 2008 Luke Macken <lmacken at redhat.com> - 0.3.5-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	28 Aug 2008 00:49:19 -0000	1.13
+++ sources	16 Sep 2008 00:02:01 -0000	1.14
@@ -1 +1 @@
-0d6cf8d8cb5aaeb60573b8edcd9183b9  python-fedora-0.3.5.tar.gz
+d5ab6c21460f91df20df5fd6e0d36221  python-fedora-0.3.6.tar.gz



From toshio at fedoraproject.org  Tue Sep 16 00:02:32 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 16 Sep 2008 00:02:32 +0000 (UTC)
Subject: rpms/python-fedora/F-8 .cvsignore, 1.16, 1.17 python-fedora.spec,
	1.18, 1.19 sources, 1.19, 1.20
Message-ID: <20080916000232.89C0970138@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14952/F-8

Modified Files:
	.cvsignore python-fedora.spec sources 
Log Message:
* Mon Sep 15 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.6-1
- New upstream.  No longer deps on koji.
- BuildRequires python-sphinx



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-8/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	28 Jul 2008 22:36:26 -0000	1.16
+++ .cvsignore	16 Sep 2008 00:02:02 -0000	1.17
@@ -1 +1 @@
-python-fedora-0.3.4.tar.gz
+python-fedora-0.3.6.tar.gz


Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-8/python-fedora.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- python-fedora.spec	25 Aug 2008 21:25:57 -0000	1.18
+++ python-fedora.spec	16 Sep 2008 00:02:02 -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:           python-fedora
-Version:        0.3.5
-Release:        1%{?dist}
+Version:        0.3.6
+Release:        2%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
 Group:          Development/Languages
@@ -12,12 +12,18 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel python-setuptools-devel python-paver
+BuildRequires:  python-devel
+BuildRequires:  python-setuptools-devel
+BuildRequires:  python-paver
+BuildRequires:  python-sphinx
 Requires:       python-simplejson
 Requires:       python-bugzilla
 Requires:       python-feedparser
 Requires:       python-sqlalchemy
-Requires:       koji
+# These are now optional dependencies.  Some bodhi methods will not work if
+# they aren't installed but they aren't needed for most functionality of the
+# module.
+#Requires:       koji python-iniparse yum
 Provides:       python-fedora-infrastructure = %{version}-%{release}
 Obsoletes:      python-fedora-infrastructure < %{version}-%{release}
 
@@ -33,13 +39,13 @@
 
 %build
 paver build
-
+paver html
 
 %install
 rm -rf $RPM_BUILD_ROOT
 paver install --skip-build --root $RPM_BUILD_ROOT
+mv build-doc/html doc/
 
- 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -50,6 +56,12 @@
 %{python_sitelib}/*
 
 %changelog
+* Mon Sep 15 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.6-2
+- Add python-sphinx to the buildrequires.
+
+* Mon Sep 15 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.6-1
+- New upstream.  No longer deps on koji.
+
 * Mon Aug 25 2008 Luke Macken <lmacken at redhat.com> - 0.3.5-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-8/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	25 Aug 2008 21:25:57 -0000	1.19
+++ sources	16 Sep 2008 00:02:02 -0000	1.20
@@ -1 +1 @@
-0d6cf8d8cb5aaeb60573b8edcd9183b9  python-fedora-0.3.5.tar.gz
+d5ab6c21460f91df20df5fd6e0d36221  python-fedora-0.3.6.tar.gz



From toshio at fedoraproject.org  Tue Sep 16 00:02:33 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 16 Sep 2008 00:02:33 +0000 (UTC)
Subject: rpms/python-fedora/F-9 .cvsignore, 1.19, 1.20 python-fedora.spec,
	1.23, 1.24 sources, 1.21, 1.22
Message-ID: <20080916000233.0956070138@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14952/F-9

Modified Files:
	.cvsignore python-fedora.spec sources 
Log Message:
* Mon Sep 15 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.6-1
- New upstream.  No longer deps on koji.
- BuildRequires python-sphinx



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-9/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	26 Aug 2008 23:44:51 -0000	1.19
+++ .cvsignore	16 Sep 2008 00:02:02 -0000	1.20
@@ -1 +1 @@
-python-fedora-0.3.5.tar.gz
+python-fedora-0.3.6.tar.gz


Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-9/python-fedora.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- python-fedora.spec	26 Aug 2008 23:44:51 -0000	1.23
+++ python-fedora.spec	16 Sep 2008 00:02:02 -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-fedora
-Version:        0.3.5
-Release:        1%{?dist}
+Version:        0.3.6
+Release:        2%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
 Group:          Development/Languages
@@ -12,12 +12,18 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel python-setuptools-devel python-paver
+BuildRequires:  python-devel
+BuildRequires:  python-setuptools-devel
+BuildRequires:  python-paver
+BuildRequires:  python-sphinx
 Requires:       python-simplejson
 Requires:       python-bugzilla
 Requires:       python-feedparser
 Requires:       python-sqlalchemy
-Requires:       koji
+# These are now optional dependencies.  Some bodhi methods will not work if
+# they aren't installed but they aren't needed for most functionality of the
+# module.
+#Requires:       koji python-iniparse yum
 Provides:       python-fedora-infrastructure = %{version}-%{release}
 Obsoletes:      python-fedora-infrastructure < %{version}-%{release}
 
@@ -33,13 +39,13 @@
 
 %build
 paver build
-
+paver html
 
 %install
 rm -rf $RPM_BUILD_ROOT
 paver install --skip-build --root $RPM_BUILD_ROOT
+mv build-doc/html doc/
 
- 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -50,6 +56,12 @@
 %{python_sitelib}/*
 
 %changelog
+* Mon Sep 15 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.6-2
+- Add python-sphinx to the buildrequires.
+
+* Mon Sep 15 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.6-1
+- New upstream.  No longer deps on koji.
+
 * Mon Aug 25 2008 Luke Macken <lmacken at redhat.com> - 0.3.5-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-9/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	26 Aug 2008 23:44:51 -0000	1.21
+++ sources	16 Sep 2008 00:02:02 -0000	1.22
@@ -1 +1 @@
-0d6cf8d8cb5aaeb60573b8edcd9183b9  python-fedora-0.3.5.tar.gz
+d5ab6c21460f91df20df5fd6e0d36221  python-fedora-0.3.6.tar.gz



From jkeating at fedoraproject.org  Tue Sep 16 00:07:50 2008
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 16 Sep 2008 00:07:50 +0000 (UTC)
Subject: fedora-release/compose fedora-live-base.ks, NONE,
	1.1 fedora-livecd-desktop-default.ks, NONE,
	1.1 fedora-livecd-kde.ks, NONE, 1.1 rawhide-fedora.ks, 1.1,
	1.2 livecd-fedora-base-desktop.ks, 1.2,
	NONE livecd-fedora-desktop.ks, 1.2, NONE livecd-fedora-kde.ks,
	1.2, NONE livedvd-fedora-kde.ks, 1.1, NONE
Message-ID: <20080916000750.87DB27013A@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release/compose
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15914/compose

Modified Files:
	rawhide-fedora.ks 
Added Files:
	fedora-live-base.ks fedora-livecd-desktop-default.ks 
	fedora-livecd-kde.ks 
Removed Files:
	livecd-fedora-base-desktop.ks livecd-fedora-desktop.ks 
	livecd-fedora-kde.ks livedvd-fedora-kde.ks 
Log Message:
- Update for Fedora 10 beta
- Add the new keys for F10
- Remove F8/9 keys
- Update compose configs
- Clarify rawhide repo definition




--- NEW FILE fedora-live-base.ks ---
# fedora-live-base.ks
#
# Defines the basics for all kickstarts in the fedora-live branch
# Does not include package selection (other then mandatory)
# Does not include localization packages or configuration
#
# Does includes "default" language configuration (kickstarts including
# this template can override these settings)

lang en_US.UTF-8
keyboard us
timezone US/Eastern
auth --useshadow --enablemd5
selinux --enforcing
firewall --disabled
xconfig --startxonboot
part / --size 4096
services --enabled=NetworkManager --disabled=network,sshd

# To compose against the current release tree, use the following "repo" (enabled by default)
#repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch
# To include updates, use the following "repo" (enabled by default)
#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=$basearch

# To compose against rawhide, use the following "repo" (disabled by default)
repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch

# To compose against local trees, (edit and) use:
#repo --name=f9 --baseurl=http://localrepo/fedora/releases/9/Everything/$basearch/os/
#repo --name=f9-updates --baseurl=http://localrepo/fedora/updates/9/$basearch/

%packages
@base-x
@base
@core
@fonts
@admin-tools
@dial-up
@hardware-support
@printing
kernel
memtest86+
firstaidkit-plugin-all

# save some space
-specspo
-esc
-samba-client
-a2ps
-mpage
-redhat-lsb
-sox
-hplip
-hpijs
# smartcards won't really work on the livecd.
-coolkey
-ccid
# duplicate functionality
-pinfo
-vorbis-tools
-wget
# lose the compat stuff
-compat*

# qlogic firmwares
-ql2100-firmware
-ql2200-firmware
-ql23xx-firmware
-ql2400-firmware

# scanning takes quite a bit of space :/
-xsane
-xsane-gimp
-sane-backends

# livecd bits to set up the livecd and be able to install
anaconda
isomd5sum

# make sure debuginfo doesn't end up on the live image
-*debuginfo
%end

%post
# FIXME: it'd be better to get this installed from a package
cat > /etc/rc.d/init.d/fedora-live << EOF
#!/bin/bash
#
# live: Init script for live image
#
# chkconfig: 345 00 99
# description: Init script for live image.

. /etc/init.d/functions

if ! strstr "\`cat /proc/cmdline\`" liveimg || [ "\$1" != "start" ] || [ -e /.liveimg-configured ] ; then
    exit 0
fi

exists() {
    which \$1 >/dev/null 2>&1 || return
    \$*
}

touch /.liveimg-configured

# mount live image
if [ -b \`readlink -f /dev/live\` ]; then
   mkdir -p /mnt/live
   mount -o ro /dev/live /mnt/live
fi

# enable swaps unless requested otherwise
swaps=\`blkid -t TYPE=swap -o device\`
if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then
  for s in \$swaps ; do
    action "Enabling swap partition \$s" swapon \$s
  done
fi

mountPersistentHome() {
  # support label/uuid
  if [ "\${homedev##LABEL=}" != "\${homedev}" -o "\${homedev##UUID=}" != "\${homedev}" ]; then
    homedev=\`/sbin/blkid -o device -t "\$homedev"\`
  fi

  # if we're given a file rather than a blockdev, loopback it
  if [ ! -b "\$homedev" ]; then
    loopdev=\`losetup -f\`
    if [ "\${homedev##/mnt/live}" != "\${homedev}" ]; then
      action "Remounting live store r/w" mount -o remount,rw /mnt/live
    fi
    losetup \$loopdev \$homedev
    homedev=\$loopdev
  fi

  # if it's encrypted, we need to unlock it
  if [ "\$(/lib/udev/vol_id -t \$homedev)" = "crypto_LUKS" ]; then
    echo
    echo "Setting up encrypted /home device"
    plymouth ask-for-password --command="cryptsetup luksOpen \$homedev EncHome"
    homedev=/dev/mapper/EncHome
  fi

  # and finally do the mount
  mount \$homedev /home
  [ -x /sbin/restorecon ] && /sbin/restorecon /home
  if [ -d /home/fedora ]; then USERADDARGS="-M" ; fi
}

findPersistentHome() {
  for arg in \`cat /proc/cmdline\` ; do
    if [ "\${arg##persistenthome=}" != "\${arg}" ]; then
      homedev=\${arg##persistenthome=}
      return
    fi
  done
}

if strstr "\`cat /proc/cmdline\`" persistenthome= ; then
  findPersistentHome
elif [ -e /mnt/live/LiveOS/home.img ]; then
  homedev=/mnt/live/LiveOS/home.img
fi

# if we have a persistent /home, then we want to go ahead and mount it
if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; then
  action "Mounting persistent /home" mountPersistentHome
fi

# add fedora user with no passwd
action "Adding fedora user" useradd \$USERADDARGS -c "Fedora Live" fedora
passwd -d fedora > /dev/null

# turn off firstboot for livecd boots
chkconfig --level 345 firstboot off 2>/dev/null

# don't start yum-updatesd for livecd boots
chkconfig --level 345 yum-updatesd off 2>/dev/null

# don't do packagekit checking by default
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/frequency_get_updates never >/dev/null
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/frequency_get_upgrades never >/dev/null
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/frequency_refresh_cache never >/dev/null
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/notify_available false >/dev/null
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/notify_distro_upgrades false >/dev/null
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/prompt_firmware false >/dev/null


# don't start cron/at as they tend to spawn things which are
# disk intensive that are painful on a live image
chkconfig --level 345 crond off 2>/dev/null
chkconfig --level 345 atd off 2>/dev/null
chkconfig --level 345 anacron off 2>/dev/null
chkconfig --level 345 readahead_early off 2>/dev/null
chkconfig --level 345 readahead_later off 2>/dev/null

# make it so that we don't do writing to the overlay for things which
# are just tmpdirs/caches
mount -t tmpfs varcacheyum /var/cache/yum
mount -t tmpfs tmp /tmp
mount -t tmpfs vartmp /var/tmp
[ -x /sbin/restorecon ] && /sbin/restorecon /var/cache/yum /tmp /var/tmp >/dev/null 2>&1

# Stopgap fix for RH #217966; should be fixed in HAL instead
touch /media/.hal-mtab

# workaround clock syncing on shutdown that we don't want (#297421)
sed -i -e 's/hwclock/no-such-hwclock/g' /etc/rc.d/init.d/halt

# and hack so that we eject the cd on shutdown if we're using a CD...
if strstr "\`cat /proc/cmdline\`" CDLABEL= ; then
  cat >> /sbin/halt.local << FOE
#!/bin/bash
# we want to eject the cd on halt, but let's also try to avoid
# io errors due to not being able to get files...
cat /sbin/halt > /dev/null
cat /sbin/reboot > /dev/null
/usr/sbin/eject -p -m \$(readlink -f /dev/live) >/dev/null 2>&1
FOE
chmod +x /sbin/halt.local
fi

EOF

# bah, hal starts way too late
cat > /etc/rc.d/init.d/fedora-late-live << EOF
#!/bin/bash
#
# live: Late init script for live image
#
# chkconfig: 345 99 01
# description: Late init script for live image.

. /etc/init.d/functions

if ! strstr "\`cat /proc/cmdline\`" liveimg || [ "\$1" != "start" ] || [ -e /.liveimg-late-configured ] ; then
    exit 0
fi

exists() {
    which \$1 >/dev/null 2>&1 || return
    \$*
}

touch /.liveimg-late-configured

# read some variables out of /proc/cmdline
for o in \`cat /proc/cmdline\` ; do
    case \$o in
    ks=*)
        ks="\${o#ks=}"
        ;;
    xdriver=*)
        xdriver="--set-driver=\${o#xdriver=}"
        ;;
    esac
done


# if liveinst or textinst is given, start anaconda
if strstr "\`cat /proc/cmdline\`" liveinst ; then
   /usr/sbin/liveinst \$ks
fi
if strstr "\`cat /proc/cmdline\`" textinst ; then
   /usr/sbin/liveinst --text \$ks
fi

# configure X, allowing user to override xdriver
if [ -n "\$xdriver" ]; then
   exists system-config-display --noui --reconfig --set-depth=24 \$xdriver
fi

EOF

# workaround avahi segfault (#279301)
touch /etc/resolv.conf
/sbin/restorecon /etc/resolv.conf

chmod 755 /etc/rc.d/init.d/fedora-live
/sbin/restorecon /etc/rc.d/init.d/fedora-live
/sbin/chkconfig --add fedora-live

chmod 755 /etc/rc.d/init.d/fedora-late-live
/sbin/restorecon /etc/rc.d/init.d/fedora-late-live
/sbin/chkconfig --add fedora-late-live

# work around for poor key import UI in PackageKit
rm -f /var/lib/rpm/__db*
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora

# go ahead and pre-make the man -k cache (#455968)
/usr/sbin/makewhatis -w

# save a little bit of space at least...
rm -f /boot/initrd*
# make sure there aren't core files lying around
rm -f /core*

%end


%post --nochroot
cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL
cp $INSTALL_ROOT/usr/share/doc/HTML/readme-live-image/en_US/readme-live-image-en_US.txt $LIVE_ROOT/README

# only works on x86, x86_64
if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
  if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
  cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
fi
%end


--- NEW FILE fedora-livecd-desktop-default.ks ---
# fedora-livecd-desktop-default.ks
#
# Includes all languages with a default of en_US locale settings
#

%include fedora-livecd-desktop.ks

lang en_US.UTF-8
keyboard us
timezone US/Eastern

%packages
@albanian-support
@arabic-support
@assamese-support
@basque-support
@belarusian-support
@bengali-support
@brazilian-support
@british-support
@bulgarian-support
@catalan-support
@chinese-support
@czech-support
@danish-support
@dutch-support
@estonian-support
@finnish-support
@french-support
@galician-support
@georgian-support
@german-support
@greek-support
@gujarati-support
@hebrew-support
@hindi-support
@hungarian-support
@indonesian-support
@italian-support
@japanese-support
@kannada-support
@korean-support
@latvian-support
@lithuanian-support
@macedonian-support
@malayalam-support
@marathi-support
@nepali-support
@norwegian-support
@oriya-support
@persian-support
@polish-support
@portuguese-support
@punjabi-support
@romanian-support
@russian-support
@serbian-support
@slovak-support
@slovenian-support
@spanish-support
@swedish-support
@tamil-support
@telugu-support
@thai-support
@turkish-support
@ukrainian-support
@vietnamese-support
@welsh-support

# The following locales have less than 50% translation coverage for the core
# GNOME stack, as found at http://l10n.gnome.org/languages/

#@afrikaans-support
#@armenian-support
#@bhutanese-support
#@bosnian-support
#@breton-support
#@croatian-support
#@esperanto-support
#@ethiopic-support
#@faeroese-support
#@filipino-support
#@gaelic-support
#@icelandic-support
#@inuktitut-support
#@irish-support
#@khmer-support
#@lao-support
#@low-saxon-support
#@malay-support
#@maori-support
#@mongolian-support
#@northern-sami-support
#@northern-sotho-support
#@samoan-support
#@sinhala-support
#@somali-support
#@southern-ndebele-support
#@southern-sotho-support
#@swati-support
#@tagalog-support
#@tibetan-support
#@tonga-support
#@tsonga-support
#@tswana-support
#@urdu-support
#@venda-support
#@walloon-support
#@xhosa-support
#@zulu-support

# These fonts are only used in the commented-out locales above
-lklug-fonts
-abyssinica-fonts
-jomolhari-fonts

%end


--- NEW FILE fedora-livecd-kde.ks ---
# fedora-livecd-kde.ks
#
# Description:
# - Fedora Live Spin with the K Desktop Environment (KDE)
#
# Maintainer(s):
# - Sebastian Vahl <fedora at deadbabylon.de>
# - Fedora KDE SIG

%include fedora-live-base.ks

%packages

@kde-desktop

# unwanted packages from @kde-desktop
# don't include these for now to fit on a cd

### amarok has duplicate functionality with juk (~14 megs)
#-amarok
### digikam has duplicate functionality with gwenview (~11 megs)
-digikam
### kdeedu is too big for the live images
-kdeedu
### scribus is too big for the live images
-scribus
### kget has also basic torrent features (~3 megs)
-ktorrent
### konqueror is also able to browse ftp shares (~1 megs)
#-kftpgrabber*
### kaffeine has duplicate functionality with dragonplayer (~3 megs)
-kaffeine*
### the removal of kdegames will free ~31 megs
#-kdegames


# Useful additional KDE3 applications
koffice-kword
koffice-kspread
koffice-kpresenter
koffice-filters
k3b
filelight
# twinkle (~10 megs)
#twinkle


# some extras
fuse
pavucontrol


# additional fonts
@fonts
#fonts-ISO8859-2 
#cjkunifonts-ukai 
#madan-fonts 
#fonts-KOI8-R 
#fonts-KOI8-R-100dpi 
#tibetan-machine-uni-fonts


# FIXME/TODO: recheck the removals here
# try to remove some packages from fedora-live-base.ks
-gdm
-authconfig-gtk

# save some space (from @base)
-make
-nss_db
-autofs

%end

%post

# create /etc/sysconfig/desktop (needed for installation)
cat > /etc/sysconfig/desktop <<EOF
DESKTOP="KDE"
DISPLAYMANAGER="KDM"
EOF

# add initscript
cat >> /etc/rc.d/init.d/fedora-live << EOF

if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
    # use image also for kdm
    mkdir -p /usr/share/apps/kdm/faces
    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon
fi

# make fedora user use KDE
echo "startkde" > /home/fedora/.xsession
chmod a+x /home/fedora/.xsession
chown fedora:fedora /home/fedora/.xsession

# set up autologin for user fedora
sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
sed -i 's/#AutoLoginUser=fred/AutoLoginUser=fedora/' /etc/kde/kdm/kdmrc

# set up user fedora as default user and preselected user
sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
sed -i 's/#DefaultUser=johndoe/DefaultUser=fedora/' /etc/kde/kdm/kdmrc

# add liveinst.desktop to favorites menu
mkdir -p /home/fedora/.kde/share/config/
cat > /home/fedora/.kde/share/config/kickoffrc << MENU_EOF
[Favorites]
FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop,/usr/share/applications/liveinst.desktop
MENU_EOF
chown -R fedora:fedora /home/fedora/.kde/

# show liveinst.desktop on and in menu
sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop

EOF

%end


Index: rawhide-fedora.ks
===================================================================
RCS file: /cvs/fedora/fedora-release/compose/rawhide-fedora.ks,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rawhide-fedora.ks	13 Mar 2008 16:05:58 -0000	1.1
+++ rawhide-fedora.ks	16 Sep 2008 00:07:50 -0000	1.2
@@ -16,8 +16,10 @@
 tcsh
 @base-x
 kernel*
--kernel*-debug*
+-kernel*debug*
 -kernel*-devel*
+-kernel-kdump*
+-syslog-ng
 # Hardware stuff
 @hardware-support
 @dial-up
@@ -26,11 +28,14 @@
 @kde-desktop
 echo-icon-theme
 tracker
-gnash
+swfdec
+libflashsupport
+nspluginwrapper
 liferea
 esc
 thunderbird
 # apps
+ at admin-tools
 @authoring-and-publishing
 @eclipse
 @editors
@@ -93,6 +98,7 @@
 @czech-support
 @danish-support
 @dutch-support
+ at esperanto-support
 @estonian-support
 @ethiopic-support
 @faeroese-support
@@ -115,18 +121,21 @@
 @italian-support
 @japanese-support
 @kannada-support
+ at kashubian-support
 @khmer-support
 @korean-support
 @lao-support
 @latvian-support
 @lithuanian-support
 @low-saxon-support
+ at macedonian-support
 @malay-support
 @malayalam-support
 @maori-support
 @marathi-support
 @mongolian-support
 @nepali-support
+ at northern-sami-support
 @northern-sotho-support
 @norwegian-support
 @oriya-support
@@ -160,13 +169,17 @@
 @urdu-support
 @venda-support
 @vietnamese-support
+ at walloon-support
 @welsh-support
 @xhosa-support
 @zulu-support
-# Compose Needs
-anaconda-runtime
-cracklib-python
-iscsi-initiator-utils
-memtest86+
-vnc-server
+# Size removals
+-gimp-help
+-java-1.6.0-openjdk-src
+-xorg-x11-docs
+-kernel-doc
+-java-1.5.0-gcj-src
+-java-1.5.0-gcj-devel
+-libgcj-src
+-*javadoc*
 %end


--- livecd-fedora-base-desktop.ks DELETED ---


--- livecd-fedora-desktop.ks DELETED ---


--- livecd-fedora-kde.ks DELETED ---


--- livedvd-fedora-kde.ks DELETED ---



From jkeating at fedoraproject.org  Tue Sep 16 00:08:19 2008
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 16 Sep 2008 00:08:19 +0000 (UTC)
Subject: fedora-release RPM-GPG-KEY-fedora-10-primary, NONE,
	1.1 RPM-GPG-KEY-fedora-test-10-primary, NONE,
	1.1 fedora-rawhide.repo, 1.2, 1.3 fedora-release.spec, 1.65,
	1.66 RPM-GPG-KEY-fedora-8-and-9-primary, 1.1,
	NONE RPM-GPG-KEY-fedora-test-8-and-9-primary, 1.1, NONE
Message-ID: <20080916000819.7795A7013A@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15914

Modified Files:
	fedora-rawhide.repo fedora-release.spec 
Added Files:
	RPM-GPG-KEY-fedora-10-primary 
	RPM-GPG-KEY-fedora-test-10-primary 
Removed Files:
	RPM-GPG-KEY-fedora-8-and-9-primary 
	RPM-GPG-KEY-fedora-test-8-and-9-primary 
Log Message:
- Update for Fedora 10 beta
- Add the new keys for F10
- Remove F8/9 keys
- Update compose configs
- Clarify rawhide repo definition




--- NEW FILE RPM-GPG-KEY-fedora-10-primary ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.9 (GNU/Linux)

mQGiBEi12/MRBADL6fpbRejYViiVzY/Y0T6pmgChOykrsq1oc9mX9+ss1lZZit1z
DRrgvOYG67wnRQaskXnKulw3XoNEAT/OjCNzDwrS3gMbHaz+T9wQN5WeO52ihozp
ZLo/aNnIW9a7W5KxMyrmDobo5919wjiHXFXbVyH5kgm1B36ZG09/HlwtpwCgyW/Z
qczIsg9OhIrwYZRUJ8BHNdED/R6SFCF2p4AqMkpo6bO9+N5BLvTRPythuWyfTpOa
XGLPDzkDisIW72DDmCrVI4RQnLW5u0xko7L1o8zwOmmFg6C8HLeeHpfg40MVLDDJ
OtX1UTPmKms6eqKYWn15266y8Bga5QnVNGMRRPXK0YJhog8K4h7MV5i/B7F2Byhu
rcT2A/42Ikj3qoA7mxIEgU3DDrxboKWZghAIWaMn8xqIl0/fIMmx/x3k6lDakQRq
+E6kdTvrWxsKbu5ESTzCDIjhHyVIECLGJ+EbB+etIa3N1+ek3gKEBcDHBtvbdc57
NcYCWvDvL3O/SNpkKetm4kzrvAqL0Q6mvmGjSY4odoIPczhSlbQmRmVkb3JhICgx
MCkgPGZlZG9yYUBmZWRvcmFwcm9qZWN0Lm9yZz6IYAQTEQIAIAUCSLXb8wIbAwYL
CQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEL8ib8xOv8JzaaEAnjrJTa3QCZr9C91r
MYJ2uNQvMQ5rAKCfqGK2Q2AVxK3pK1QHtc972g5gTrkEDQRItdvzEBAAz4E9yA4G
epLon5F70Ak4/OgpJqHvXFN2xMGazpExkh+3/bjil3/J6rucXtLutPP4kIIu6LgW
sbDF3HUafWpeOQI7YxlMwLXTfZ0Mevrsm4wEBSYoC8U4zygVyz2m6Rz2i62hbj/W
AYIayW2sxg7VwbFoJxjjZfw2d6jTNQW9EI3GVffYUN+V7BSeQw7Y6v18pxFUxCur
qOGXwNSUdUUmdh1h2O+CmvdSiYJApEU/fBHNioTDNVynTVN1ayobTs/5xANnpG+K
7Lhiz2HrY6tTv34DaDMwv2aMoDxq5BTfi+H7rTzXlpF5fAjHNGsXQIJjKhEgpkHo
hr+in0s6CsDpERpleS8FKIhjNwcGksoviVpEItnsHTOV0yOV5ZiuZpZ8M6ZS4Vf/
JhvRCK2CeCkeyaAgxsGngN/QeTHE4e35m/dqUnBrUKRNkpcJ8jJO11eVNj0Xe/EG
Vcy345TvIUCYG6kr1wJJt0xJm1wDricUHnR2X5motCOT/k6BF0ucofvcy1Ou62+N
DKgI0E/o3BMo9XfPJVteheMOhwRMfNwmbFdr13rKk/GZyVeZmLwlFx1byH5r4J5T
4vE9JmgeM2bVu/TiMFlBszQM39xcE3SycjX5knBEglzad23kzyIerlv8RZUdQJ/L
qfmRXc+0x0H565YLwGC79XCKUp7dlGBYhL8ABAsP/1DrF/SzkNki1KWMeK8DP34q
GBDWtUIVTiMqHZclUylHRT3bp2Ae2/+xy7NAy/Y/G5aZqkAMvaqiG3ps5LDVJo+1
WAQBOgnwrZtVn6FU6H59a4h79hKoFoBEI1gd9XKzzgA+RF4cEHJiuFQh2boxdr7/
n64tzrS6HkUcD15wIcYoyl6iOHBfbazbyZifeKMu0USkrfzLRLPec2V3p9bXqg1W
h+SBCpD9uhSzBeKs636ipOL3WZ9UUMQMPNKyyFxx9cKcZY9aP0Leub2kvnFIZiG7
ljbRP1dNJlhimTxTjZzfOicxu5MaSTyIlg9ZVEPXOmPwi/a8POP82pLZYZDi8Scx
zQFNi+22VdSrQkj6Jkan3GoqBOBoSv9iQ7EJp7wpMBRhoacW3wtJ4m0+cAR8IX9X
6DTklAU9zoZzdvg063GnjgPCi3Ohwl2jvM1NUcn4vdI5UUTd7DAPaysueJPqfFCg
CSgrOcCyfQL4vL0iRp82NNQtUS9ZdyUw8t6w/GuFnsymBSTqt2t1n+mhS7RAejaV
1QV/KmwijbaVh2LjTP0YzPWZcBy8XHzOsnuWufFmRTgFOUmWT9o82RSde6ubvnDN
WfWWGzriIpJd3JCBpkVb2aiEkU4958Ai36I/splnxOrAJZV/4ZIHHnGMwn23/DNh
gX4TCgPMjjjT0hmTfDpliEkEGBECAAkFAki12/MCGwwACgkQvyJvzE6/wnM+4wCe
KkKsIfsmCT0MpuYxHh4vRS/ix58AoLfjES8VpN+3ku9hC3QT97Fa/bK4
=s6iX
-----END PGP PUBLIC KEY BLOCK-----


--- NEW FILE RPM-GPG-KEY-fedora-test-10-primary ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.9 (GNU/Linux)

mQGiBEi13W8RBADWLvpDV7NziJYLMfXJzOLCEHRYaeDNowm4NV6399dkOd0Meuep
AdiWjq4dymgml7N5guT7OjzuMcZXYqOQ8ge7FR/M3m1nKS9XSZPCwWadgcDejRzd
ybTFnho9MiVH4TT4ozmI1pMQ6UcMb2TAiFF9C6cvHlboauRGLAsKOiuW+wCg1NGE
+KZr2ZAc3OKOZgJVq/0sQQ0D/3c041/hvaOb848PKAArlUhyTDPwFgxjaqzc70pL
RVmYydYa8jaPvop1q/HCmVYCOJZEHGtaDbzhJl8L/Qy1yfQzWeuer0NB1xOUPtKj
BvXP/KKpR7Kvz06jxWLc5hOg6D4Mf6Xy4AetMRnkeMQZ0qUANj+WQvqd/QyV7/1z
lLgsA/wIGWy9dMJPXOVLuT6pMBAMkVvQDh5dAbYhCI70rNVGJplpksNXpBWBEkSQ
z5DRR6d0ADBtJ1LaZWL0BC9dirJOJJyMxaM4G21Mgoc+XAehbKtVBZeF5pXwb2ch
f4xqsuo0MRv8pvkbOm5WPGagUygfgUWmCOAreRTpTmrBVleT2LQuRmVkb3JhICgx
MCB0ZXN0aW5nKSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPohgBBMRAgAgBQJI
td1vAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQkqECPQuGJ05MHACcCkTz
QbIa1W74Dixo1WQSShB8P44AoL0wTcLLNjmgStugcUEnJ/dg8VAxuQQNBEi13W8Q
EADZI/3ySMJtnSDFYsUis9dezKNoi4IbuAiY/CdaMUPRg1rNGpkn/tz4LE9o0bke
ktXMCs5Xohv6e1fEOvm3bZNFZYSGea7cwp6sKD6jootHzLPAtJs9uyGiZbAXx29Q
11HHr66Gna/VdyVGNuRuy5Ygpbn7XXGO6hJci/lbvUOxi1Fui4sjQdnpLuH5mPrl
aXVMZSonn5lqLhAAQc9igPQVjFmbzhZA6x9z57ZvdjOWCkV1EdOIQUrhS3r5gnCv
vUCjLBhhKmKtKNLAlaaRXSP+/3el6GZiXnOFOECy7u7CFaR+Qb9w7IF+tuE9lIVB
r8UQNHpAzIzdxg376fXYwpkNbCOWMzqL9Y3HBXkdt58XQ+sR6yHzRlCc2mh9H8Pk
SkYHcWvPL8njwQzrHWPp0PZEjdImSQL+hfY2IOq/vfd5toCypPFoLen79K4YaB2x
F9W9vXs7W5kIviWTS/MOPMt16a3Sen31NPSNQN9q4zXOkAcus9jn0DBs6mozBE0H
ojd+59p5Gh1zTYmPmgtURd4bWgHKOGHgnY9TuvAPPR4AXC5zcBZWhi7hbXeLyjyc
+8BdP/oX/FNVsFDZfBEvie+8TFsC5H6PEb00CXSCoKX+6FzyoLH/ASO+tXaMcm3U
HabRf67bm60RReWCmHrMyKpLg3rP2K4kjMpDX5dyVRoumwADBQ//cUVFskjAVJ+p
eAefeay9gxHg7Y4vGxylMc8EsIhw5R3+uf0rpAT0iPdtRLJwt1LUC/kRavGNpeGP
4zeDXo1OItkxsAfMmnX6M5asm/OVHypl/Ubthp2/CuJk4hMTOG6a03SJsAAbrSDO
on6uF+fpetIH5J0zhSkQXQClRtQEPd54tgmKxNsRTkzz/3TSnlCsMILamsjrMSE+
WWxAWKclLe2wXAHCfRwuI5Zen8r5+t3JJaYVtcxrw3jeqGjM+obaoDTAhx1jWY0P
I6ulowaFdNj3ZXOrFu5cVCmSDhidDV5yABpObPtw1s1GhJpMJfkja3hQH/v8MRyo
hWZVhYvgj6HACNsMXvGqUh8IgpaK9nSeCBJw5w6xwD8D8F3LSCrDUbXIu7QPJ3Ty
A9sZdjtSJeCyOFd4rP9yxcOAwTu/cerev/riGpEhAiUa0WQoR57N5x1aQTs/OoJx
o6KolUrEkUaYAwYFJjn+Lr0mzQzPFFqAPwjr2c9G6hgLy4C10fWY5cpxHwc1ayo0
sVeEFfmtcxrk074tZU4kRfgjz2j+e9dGCdi423DBSau7DEjuQe+N8JUbMSr2+nvm
za/jGDwA4hD7/SBohBzVJq7MsCm0pXXvimaviYP72ghrXTmVd2obU29h5tTDXObW
88SChY+u1OrgnABGsBl8Q7hqOk7R3fyISQQYEQIACQUCSLXdbwIbDAAKCRCSoQI9
C4YnTkQyAJ9R/UthQ4rWFEZfNfZp7Glgo6e02QCfaGiQ0wvRd1xIME6O6HTsEOlC
MC0=
=we9R
-----END PGP PUBLIC KEY BLOCK-----


Index: fedora-rawhide.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-rawhide.repo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-rawhide.repo	23 Jun 2008 20:24:13 -0000	1.2
+++ fedora-rawhide.repo	16 Sep 2008 00:07:48 -0000	1.3
@@ -19,7 +19,7 @@
 # Version: rawhide
 
 [rawhide]
-name=Fedora - Rawhide
+name=Fedora - Rawhide - Developmental packages for the next Fedora release
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- fedora-release.spec	23 Jun 2008 20:34:46 -0000	1.65
+++ fedora-release.spec	16 Sep 2008 00:07:48 -0000	1.66
@@ -3,7 +3,7 @@
 
 Summary:	Fedora release files
 Name:		fedora-release
-Version:	9.90.1
+Version:	9.91
 Release:	1
 License:	GPLv2
 Group:		System Environment/Base
@@ -49,11 +49,11 @@
 pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 for arch in i386 x86_64 ppc ppc64
   do
-  ln -s RPM-GPG-KEY-fedora-primary RPM-GPG-KEY-fedora-$arch
-  ln -s RPM-GPG-KEY-fedora-test-primary RPM-GPG-KEY-fedora-test-$arch
+  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-primary RPM-GPG-KEY-fedora
-ln -s RPM-GPG-KEY-fedora-test-primary RPM-GPG-KEY-fedora-test
+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
@@ -97,6 +97,13 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Mon Sep 15 2008 Jesse Keating <jkeating at redhat.com> - 9.91-1
+- Update for Fedora 10 beta
+- Add the new keys for F10
+- Remove F8/9 keys
+- Update compose configs
+- Clarify rawhide repo definition
+
 * Wed Jun 11 2008 Jesse Keating <jkeating at redhat.com> - 9.90-2
 - Package up the ia64 key as the first secondary arch
 - Mark config files correctly


--- RPM-GPG-KEY-fedora-8-and-9-primary DELETED ---


--- RPM-GPG-KEY-fedora-test-8-and-9-primary DELETED ---



From jkeating at fedoraproject.org  Tue Sep 16 00:13:26 2008
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 16 Sep 2008 00:13:26 +0000 (UTC)
Subject: rpms/fedora-release/devel .cvsignore, 1.33, 1.34 fedora-release.spec,
	1.67, 1.68 sources, 1.55, 1.56
Message-ID: <20080916001326.EB6F57013A@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16519

Modified Files:
	.cvsignore fedora-release.spec sources 
Log Message:
Updated for 10 Beta



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	24 Jun 2008 14:53:31 -0000	1.33
+++ .cvsignore	16 Sep 2008 00:12:56 -0000	1.34
@@ -1 +1 @@
-fedora-release-9.90.1.tar.gz
+fedora-release-9.91.tar.gz


Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- fedora-release.spec	24 Jun 2008 14:53:31 -0000	1.67
+++ fedora-release.spec	16 Sep 2008 00:12:56 -0000	1.68
@@ -3,7 +3,7 @@
 
 Summary:	Fedora release files
 Name:		fedora-release
-Version:	9.90.1
+Version:	9.91
 Release:	1
 License:	GPLv2
 Group:		System Environment/Base
@@ -49,11 +49,11 @@
 pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 for arch in i386 x86_64 ppc ppc64
   do
-  ln -s RPM-GPG-KEY-fedora-primary RPM-GPG-KEY-fedora-$arch
-  ln -s RPM-GPG-KEY-fedora-test-primary RPM-GPG-KEY-fedora-test-$arch
+  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-primary RPM-GPG-KEY-fedora
-ln -s RPM-GPG-KEY-fedora-test-primary RPM-GPG-KEY-fedora-test
+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
@@ -97,6 +97,13 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Mon Sep 15 2008 Jesse Keating <jkeating at redhat.com> - 9.91-1
+- Update for Fedora 10 beta
+- Add the new keys for F10
+- Remove F8/9 keys
+- Update compose configs
+- Clarify rawhide repo definition
+
 * Wed Jun 11 2008 Jesse Keating <jkeating at redhat.com> - 9.90-2
 - Package up the ia64 key as the first secondary arch
 - Mark config files correctly


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	24 Jun 2008 14:53:31 -0000	1.55
+++ sources	16 Sep 2008 00:12:56 -0000	1.56
@@ -1 +1 @@
-13288e8f0f31a2d6b1dfcf2d6a832037  fedora-release-9.90.1.tar.gz
+a676a1fb6881f551b78d303788b4ece2  fedora-release-9.91.tar.gz



From tuxbrewr at fedoraproject.org  Tue Sep 16 00:42:19 2008
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue, 16 Sep 2008 00:42:19 +0000 (UTC)
Subject: rpms/powerman/F-9 .cvsignore, 1.6, 1.7 powerman.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <20080916004219.BDD6D70138@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/powerman/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19881

Modified Files:
	.cvsignore powerman.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/powerman/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Jun 2008 20:42:26 -0000	1.6
+++ .cvsignore	16 Sep 2008 00:41:47 -0000	1.7
@@ -1 +1 @@
-powerman-2.1.tar.bz2
+powerman-2.2.tar.bz2


Index: powerman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powerman/F-9/powerman.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- powerman.spec	18 Jun 2008 20:42:26 -0000	1.13
+++ powerman.spec	16 Sep 2008 00:41:47 -0000	1.14
@@ -1,10 +1,10 @@
 Name: powerman
-Version: 2.1
+Version: 2.2
 Release: 1%{?dist}
 Summary: PowerMan - Power to the Cluster
 
 Group: Applications/System
-License: GPL
+License: GPLv2+
 Url: http://sourceforge.net/projects/powerman
 Source0: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -40,8 +40,8 @@
 rm $RPM_BUILD_ROOT/%{_bindir}/pm
 pushd $RPM_BUILD_ROOT/%{_bindir};ln -s powerman pm; popd
 # install a default config file
-cp examples/%{name}.conf-small \
-    $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
+#cp examples/%{name}.conf-small \
+#    $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
 # get rid of execute bit on powerman script files to fix rpmlint errror
 chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/*
 # Don't turn on by default
@@ -69,9 +69,10 @@
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog DISCLAIMER COPYING NEWS TODO
-%doc examples/powerman.conf-*
+#%doc examples/powerman.conf-*
 %{_bindir}/powerman
 %{_bindir}/pm
+%{_sbindir}/plmpower
 %{_sbindir}/powermand
 %{_sbindir}/httppower
 %dir %{_sysconfdir}/%{name}/
@@ -80,6 +81,12 @@
 %{_sysconfdir}/init.d/%{name}
 
 %changelog
+* Mon Sep 15 2008 Steven M. Parrish <smparrish at shallowcreek.net> 2.2-1
+- New upstream release
+
+* Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-2
+- fix license tag
+
 * Wed Jun 18 2008 Steven Parrish <smparrish[at]shallowcreek.net> 2.1-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/powerman/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Jun 2008 20:42:26 -0000	1.6
+++ sources	16 Sep 2008 00:41:47 -0000	1.7
@@ -1 +1 @@
-45499604a413dcfe48ac7e9f21e61be4  powerman-2.1.tar.bz2
+3d1ea7193693a385c24e9a21af937e45  powerman-2.2.tar.bz2



From tuxbrewr at fedoraproject.org  Tue Sep 16 00:50:11 2008
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue, 16 Sep 2008 00:50:11 +0000 (UTC)
Subject: rpms/powerman/F-9 powerman.spec,1.14,1.15
Message-ID: <20080916005011.C9DC670138@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/powerman/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20873

Modified Files:
	powerman.spec 
Log Message:
New upstream release


Index: powerman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powerman/F-9/powerman.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- powerman.spec	16 Sep 2008 00:41:47 -0000	1.14
+++ powerman.spec	16 Sep 2008 00:49:41 -0000	1.15
@@ -1,6 +1,6 @@
 Name: powerman
 Version: 2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: PowerMan - Power to the Cluster
 
 Group: Applications/System
@@ -81,6 +81,9 @@
 %{_sysconfdir}/init.d/%{name}
 
 %changelog
+* Mon Sep 15 2008 Steven M. Parrish <smparrish at shallowcreek.net> 2.2-2
+- Bump tag since we have no Force-tag anymore
+
 * Mon Sep 15 2008 Steven M. Parrish <smparrish at shallowcreek.net> 2.2-1
 - New upstream release
 



From tuxbrewr at fedoraproject.org  Tue Sep 16 00:56:18 2008
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue, 16 Sep 2008 00:56:18 +0000 (UTC)
Subject: rpms/powerman/F-8 .cvsignore, 1.4, 1.5 powerman.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20080916005618.A3D8D70138@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/powerman/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21676

Modified Files:
	.cvsignore powerman.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/powerman/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Jun 2008 21:03:08 -0000	1.4
+++ .cvsignore	16 Sep 2008 00:55:47 -0000	1.5
@@ -1 +1 @@
-powerman-2.1.tar.bz2
+powerman-2.2.tar.bz2


Index: powerman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powerman/F-8/powerman.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- powerman.spec	18 Jun 2008 21:03:08 -0000	1.6
+++ powerman.spec	16 Sep 2008 00:55:48 -0000	1.7
@@ -1,10 +1,10 @@
 Name: powerman
-Version: 2.1
+Version: 2.2
 Release: 1%{?dist}
 Summary: PowerMan - Power to the Cluster
 
 Group: Applications/System
-License: GPL
+License: GPLv2+
 Url: http://sourceforge.net/projects/powerman
 Source0: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -40,8 +40,8 @@
 rm $RPM_BUILD_ROOT/%{_bindir}/pm
 pushd $RPM_BUILD_ROOT/%{_bindir};ln -s powerman pm; popd
 # install a default config file
-cp examples/%{name}.conf-small \
-    $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
+#cp examples/%{name}.conf-small \
+#    $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
 # get rid of execute bit on powerman script files to fix rpmlint errror
 chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/*
 # Don't turn on by default
@@ -69,9 +69,10 @@
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog DISCLAIMER COPYING NEWS TODO
-%doc examples/powerman.conf-*
+#%doc examples/powerman.conf-*
 %{_bindir}/powerman
 %{_bindir}/pm
+%{_sbindir}/plmpower
 %{_sbindir}/powermand
 %{_sbindir}/httppower
 %dir %{_sysconfdir}/%{name}/
@@ -80,6 +81,12 @@
 %{_sysconfdir}/init.d/%{name}
 
 %changelog
+* Mon Sep 15 2008 Steven M. Parrish <smparrish at shallowcreek.net> 2.2-1
+- New upstream release
+
+* Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-2
+- fix license tag
+
 * Wed Jun 18 2008 Steven Parrish <smparrish[at]shallowcreek.net> 2.1-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/powerman/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Jun 2008 21:03:08 -0000	1.4
+++ sources	16 Sep 2008 00:55:48 -0000	1.5
@@ -1 +1 @@
-45499604a413dcfe48ac7e9f21e61be4  powerman-2.1.tar.bz2
+3d1ea7193693a385c24e9a21af937e45  powerman-2.2.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 16 01:12:47 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 16 Sep 2008 01:12:47 +0000 (UTC)
Subject: rpms/gvfs/devel .cvsignore, 1.24, 1.25 gvfs.spec, 1.74, 1.75 sources,
	1.24, 1.25
Message-ID: <20080916011247.AA04E70138@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23682

Modified Files:
	.cvsignore gvfs.spec sources 
Log Message:
0.99.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	9 Sep 2008 09:33:54 -0000	1.24
+++ .cvsignore	16 Sep 2008 01:12:16 -0000	1.25
@@ -1 +1 @@
-gvfs-0.99.7.1.tar.gz
+gvfs-0.99.8.tar.bz2


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- gvfs.spec	15 Sep 2008 14:47:38 -0000	1.74
+++ gvfs.spec	16 Sep 2008 01:12:16 -0000	1.75
@@ -1,11 +1,11 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 0.99.7.1
-Release: 4%{?dist}
+Version: 0.99.8
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
-Source: http://download.gnome.org/sources/gvfs/0.99/gvfs-%{version}.tar.gz
+Source: http://download.gnome.org/sources/gvfs/0.99/gvfs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig
 BuildRequires: glib2-devel >= 2.17.4
@@ -251,6 +251,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Matthias Clasen <mclasen at redhat.com>  - 0.99.8-1
+- Update to 0.99.8
+
 * Mon Sep 15 2008 - Bastien Nocera <bnocera at redhat.com> - 0.99.7.1-4
 - Update for BlueZ and obex-data-server D-Bus API changes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	9 Sep 2008 09:33:54 -0000	1.24
+++ sources	16 Sep 2008 01:12:16 -0000	1.25
@@ -1 +1 @@
-42309331c1ee3282eab949a62875bc82  gvfs-0.99.7.1.tar.gz
+5a2caa410d2fb75317e3c07e437d79a7  gvfs-0.99.8.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 16 01:14:28 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 16 Sep 2008 01:14:28 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs.spec,1.75,1.76
Message-ID: <20080916011428.E97D670138@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23985

Modified Files:
	gvfs.spec 
Log Message:
blargh, tag failed



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- gvfs.spec	16 Sep 2008 01:12:16 -0000	1.75
+++ gvfs.spec	16 Sep 2008 01:13:58 -0000	1.76
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 0.99.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -251,7 +251,7 @@
 
 
 %changelog
-* Mon Sep 15 2008 Matthias Clasen <mclasen at redhat.com>  - 0.99.8-1
+* Mon Sep 15 2008 Matthias Clasen <mclasen at redhat.com>  - 0.99.8-2
 - Update to 0.99.8
 
 * Mon Sep 15 2008 - Bastien Nocera <bnocera at redhat.com> - 0.99.7.1-4



From mclasen at fedoraproject.org  Tue Sep 16 01:27:53 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 16 Sep 2008 01:27:53 +0000 (UTC)
Subject: rpms/gmime/devel .cvsignore, 1.17, 1.18 gmime.spec, 1.38,
	1.39 sources, 1.17, 1.18
Message-ID: <20080916012753.E900E70138@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gmime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25816

Modified Files:
	.cvsignore gmime.spec sources 
Log Message:
2.2.23



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gmime/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	28 May 2008 03:01:17 -0000	1.17
+++ .cvsignore	16 Sep 2008 01:27:22 -0000	1.18
@@ -1 +1 @@
-gmime-2.2.21.tar.bz2
+gmime-2.2.23.tar.bz2


Index: gmime.spec
===================================================================
RCS file: /cvs/extras/rpms/gmime/devel/gmime.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gmime.spec	28 May 2008 03:01:17 -0000	1.38
+++ gmime.spec	16 Sep 2008 01:27:22 -0000	1.39
@@ -1,5 +1,5 @@
 Name:           gmime
-Version:        2.2.21
+Version:        2.2.23
 Release:        1%{?dist}
 Summary:        Library for creating and parsing MIME messages
 
@@ -72,7 +72,7 @@
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 MONO_ARGS="--enable-mono"
 %endif
-%configure $MONO_ARGS
+%configure $MONO_ARGS --disable-static
 make %{?_smp_mflags}
 
 
@@ -104,7 +104,6 @@
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/gmime-config
-%{_libdir}/lib*.a
 %{_libdir}/lib*.so
 %{_libdir}/gmimeConf.sh
 %{_libdir}/pkgconfig/gmime-2.0.pc
@@ -121,6 +120,10 @@
 %endif
 
 %changelog
+* Mon Sep 15 2008 Matthias Clasen <mclasen at redhat.com> - 2.2.23-1
+- Update to 2.2.23
+- Drop static libraries from -devel
+
 * Tue May 27 2008 Matthias Clasen <mclasen at redhat.com> - 2.2.21-1
 - Update to 2.2.21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gmime/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	28 May 2008 03:01:17 -0000	1.17
+++ sources	16 Sep 2008 01:27:22 -0000	1.18
@@ -1 +1 @@
-16acf7ed0287f4aae419ad71e737762f  gmime-2.2.21.tar.bz2
+9f254eb989e0506243da6fde7f164998  gmime-2.2.23.tar.bz2



From jfearn at fedoraproject.org  Tue Sep 16 01:30:20 2008
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Tue, 16 Sep 2008 01:30:20 +0000 (UTC)
Subject: rpms/publican/F-8 publican.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <20080916013020.B812F70138@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/publican/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26128

Modified Files:
	publican.spec sources 
Log Message:
update to version 0.37



Index: publican.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-8/publican.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- publican.spec	1 Aug 2008 05:52:13 -0000	1.5
+++ publican.spec	16 Sep 2008 01:29:49 -0000	1.6
@@ -4,8 +4,8 @@
 %define PREMOLESTATION 0
 
 Name:		publican	
-Summary:	Common files and scripts for publishing Documentation
-Version:	0.34
+Summary:	Common files and scripts for publishing with DocBook XML
+Version:	0.37
 Release:	0%{?dist}
 License:	GPLv2+ and GFDL
 # The following directories are licensed under the GFDL:
@@ -16,26 +16,27 @@
 Buildarch:	noarch
 Source:		https://fedorahosted.org/releases/p/u/publican/%{name}-%{version}.tgz
 # need kdesdk for po2xml & xml2pot
-Requires:	gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl elinks aspell
+Requires:	gettext libxslt perl(XML::TreeBuilder) docbook-dtds docbook-style-xsl elinks aspell
 Requires:	%{_bindir}/xml2pot %{_bindir}/po2xml
 Requires:	perl-ParseLex perl-HTML-Template make
 Requires:	fop batik saxon ImageMagick
-#Requires:	xslthl
+Requires:	xerces-j2 rpm-build
 
-BuildRequires:	gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl aspell
+BuildRequires:	gettext libxslt perl(XML::TreeBuilder) docbook-dtds docbook-style-xsl aspell
 BuildRequires:	%{_bindir}/xml2pot %{_bindir}/po2xml
 BuildRequires:	desktop-file-utils
-# FOP is required to build the mont metrics.
-BuildRequires:	fop saxon
+# FOP is required to build the font metrics.
+BuildRequires:	fop saxon ImageMagick
 #BuildRequires:	xslthl
 # *&%^*&^ decided to rename font packages and change font paths.
 # No actual real changes.
 %if %{PREMOLESTATION}
+Requires:	xslthl
 Requires:	fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati
 Requires:	fonts-hindi fonts-japanese fonts-kannada fonts-korean
 Requires:	fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala
 Requires:	fonts-tamil fonts-telugu liberation-fonts
-
+BuildRequires:	xslthl
 BuildRequires:	fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati
 BuildRequires:	fonts-hindi fonts-japanese fonts-kannada fonts-korean
 BuildRequires:	fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala
@@ -44,14 +45,12 @@
 Requires:	lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati
 Requires:	lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada
 Requires:	lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
-Requires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts
-# fonts-korean
+Requires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang
 
 BuildRequires:	lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati
 BuildRequires:	lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada
 BuildRequires:	lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
-BuildRequires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts
-#  fonts-korean
+BuildRequires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang
 %endif
 
 URL:		https://fedorahosted.org/publican
@@ -59,7 +58,9 @@
 Obsoletes:	perl-SGML-Translate <= 0.37-3
 
 %description
-Common files and scripts for publishing documentation.
+Publican is a DocBook publication system, not just a DocBook processing tool.
+As well as ensuring your DocBook XML is valid, publican works to ensure
+your XML is up to publishable standard.
 
 %package doc
 Group:		Documentation
@@ -71,7 +72,10 @@
 %endif
 
 %description doc
-Documentation for the Publican publishing tool chain.
+Publican is a tool for publishing material authored in DocBook XML.
+This guide explains how to  to create and build books and articles
+using publican. It is not a DocBook XML tutorial and concentrates
+solely on using the publican tools.
 
 %prep
 %setup -q
@@ -91,7 +95,7 @@
 %{__perl} -p -i -e 's|^#CATALOGS_OVERRIDE$|CATALOGS\t= XML_CATALOG_FILES="%{_datadir}/%{name}/xsl/docbook/dtd-4.5/catalog.xml %{_datadir}/%{name}/xsl/docbook/1.72.0/catalog.xml"|g' make/Makefile.templates
 %endif
 
-for i in fop make xsl Common_Content templates; do
+for i in fop make xsl Common_Content templates maven; do
 	cp -rf $i $RPM_BUILD_ROOT%{_datadir}/%{name}/$i
 done
 cp -rf Book_Template $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates/common-Book_Template
@@ -143,6 +147,44 @@
 %doc fdl.txt
 
 %changelog
+* Wed Sep 3 2008 Jeff Fearn <jfearn at redhat.com> 0.37
+- Fix Bug in web rpm upgrade script.
+- Fix Article not building rpms.
+- Switch ja-JP  font name in pdf from SazanamiMincho to SazanamiGothic
+- Remove empty para tags to break en-US HTML build so writers stop breaking translations.
+- Changed docs reference from --revision to --edition for create_book option
+- Fixed Article layout not matching Book Layout. BZ #460969
+- Fixed Part not ledded properly in TOC BZ #460976
+- Fix duplicate IDs in XHTML output.
+- Made background of remark a pretty yellow. BZ #459213
+- Fix Accessibility typo. BZ #460856
+- Fix spurious hyphenation in verbatim.
+- Fix broken RPM packages when titles have been translated.
+- Fix display bug in html-single. BZ #461375
+- Added FAQ entry for Java weirdness. BZ #460738
+- Add default encoding to XML files. BZ #461379
+- Removed corpauthor from template. BZ #461222
+- Fixed create_book help text. BZ #460736
+- Added menuchoice tag. BZ #459671
+
+* Mon Sep 1 2008 Jeff Fearn <jfearn at redhat.com> 0.35-0
+- Add missing xerces-j2 Requires. BZ #457497
+- Fixed css path for tranlation reports.
+- Fixed font path for Fedora, ensured build fails if font metric creation fails. BZ #458003
+- Set vertical-align:top for TD - BZ #457851
+- Added WARNING for ENTITIES declared in XML files. BZ #456170
+- Added check to ensure PRODUCT has a valid format.
+- Only check xml files for revision history. BZ #458740
+- Made VERSION and RELEASE over-rideable. BZ #458421
+- Fixed display of OL nested in UL. BZ #457915
+- Added "make pom" to output a basic maven pom file.
+- Updated doco. BZ #458764
+- Updated Conventions.xml. BZ #456026 #459216
+- Made PDF and HTML display product version in similar style. BZ #456486
+- Remove ID's from common files. BZ #460770
+- Allowed footnote to keep ID. BZ #460790
+- Fixed bogus verbatim layout. BZ #460771
+
 * Fri Apr 11 2008 Jeff Fearn <jfearn at redhat.com> 0.34-0
 - Fix PO file name missing from translation status report
 - Modify xmlClean to output dummy content for empty files (beta)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2008 05:52:13 -0000	1.5
+++ sources	16 Sep 2008 01:29:50 -0000	1.6
@@ -1 +1 @@
-6a2f366acfaa8af0119f8c5fde2d9f05  publican-0.34.tgz
+b49ac8772041f3679f151eb1a724caa5  publican-0.37.tgz



From jfearn at fedoraproject.org  Tue Sep 16 01:31:36 2008
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Tue, 16 Sep 2008 01:31:36 +0000 (UTC)
Subject: rpms/publican-fedora/F-8 publican-fedora.spec, 1.2, 1.3 sources, 1.3,
	1.4
Message-ID: <20080916013136.D2DD870138@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/publican-fedora/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26392

Modified Files:
	publican-fedora.spec sources 
Log Message:
update to version 0.15


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-8/publican-fedora.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- publican-fedora.spec	8 Apr 2008 21:47:17 -0000	1.2
+++ publican-fedora.spec	16 Sep 2008 01:31:06 -0000	1.3
@@ -2,13 +2,13 @@
 
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
-Version:	0.12
+Version:	0.15
 Release:	0%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildarch:	noarch
-Source:		http://svn.fedorahosted.org/svn/publican/trunk/Files/%{name}-%{version}.tgz
+Source:		https://fedorahosted.org/releases/p/u/publican/%{name}-%{version}.tgz
 Requires:	publican
 BuildRequires:	publican
 URL:		https://fedorahosted.org/publican
@@ -28,9 +28,13 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/Templates
 mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/make
+mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/xsl/%{brand}
 cp -rf Common_Content $RPM_BUILD_ROOT%{_datadir}/publican/
 cp -rf Book_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Book_Template
+cp -rf Set_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Set_Template
+cp -rf Article_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Article_Template
 install -m 755 make/Makefile.%{brand} $RPM_BUILD_ROOT%{_datadir}/publican/make/.
+install -m 755 xsl/*.xsl $RPM_BUILD_ROOT%{_datadir}/publican/xsl/%{brand}/.
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,10 +44,27 @@
 %doc README
 %doc COPYING
 %{_datadir}/publican/Common_Content/%{brand}
-%{_datadir}/publican/Templates/%{brand}-Book_Template
+%{_datadir}/publican/Templates/%{brand}-*_Template
 %{_datadir}/publican/make/Makefile.%{brand}
+%{_datadir}/publican/xsl/%{brand}
 
 %changelog
+* Tue Sep 9 2008 Jeff Fearn <jfearn at redhat.com> 0.15
+- Removed corpauthor from template. BZ #461222
+- Updated Fedora legal notice. BZ #448022
+
+* Mon Sep 1 2008 Jeff Fearn <jfearn at redhat.com> 0.14-0
+- Fix styles for publican 0.35 mods
+- Removed common entity files as they break translation
+- Remove ID's from common files. BZ #460770
+
+* Mon Apr 14 2008 Jeff Fearn <jfearn at redhat.com> 0.13-0
+- Fix missing list image in html-single articles
+- QANDA set css fix BZ #442674
+- Override PDF Theme
+- Added package tag BZ #444908
+- Added Article and Set Templates
+
 * Mon Apr 7 2008 Jeff Fearn <jfearn at redhat.com> 0.12-0
 - Add Desktop css customisations
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Apr 2008 21:47:17 -0000	1.3
+++ sources	16 Sep 2008 01:31:06 -0000	1.4
@@ -1 +1 @@
-3258bb5285dcaa11d359dc91de81ae07  publican-fedora-0.12.tgz
+b17d2cc7c95f2fd739cd26511cac3db8  publican-fedora-0.15.tgz



From corsepiu at fedoraproject.org  Tue Sep 16 01:46:42 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 16 Sep 2008 01:46:42 +0000 (UTC)
Subject: rpms/perl-Perl-MinimumVersion/F-9 .cvsignore, 1.3,
	1.4 perl-Perl-MinimumVersion.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <20080916014642.2354370138@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28047/F-9

Modified Files:
	.cvsignore perl-Perl-MinimumVersion.spec sources 
Log Message:
* Mon Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Aug 2008 03:16:47 -0000	1.3
+++ .cvsignore	16 Sep 2008 01:46:11 -0000	1.4
@@ -1 +1 @@
-Perl-MinimumVersion-1.18.tar.gz
+Perl-MinimumVersion-1.19.tar.gz


Index: perl-Perl-MinimumVersion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-9/perl-Perl-MinimumVersion.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Perl-MinimumVersion.spec	26 Aug 2008 03:16:47 -0000	1.7
+++ perl-Perl-MinimumVersion.spec	16 Sep 2008 01:46:11 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Perl-MinimumVersion
-Version:        1.18
+Version:        1.19
 Release:        1%{?dist}
 Summary:        Find a minimum required version of perl for Perl code
 License:        GPL+ or Artistic
@@ -15,11 +15,19 @@
 BuildRequires: perl(PPI) >= 1.118
 BuildRequires: perl(Test::Script) >= 1.02
 BuildRequires: perl(version)
-BuildRequires: perl(File::Find::Rule)
+BuildRequires: perl(File::Find::Rule) >= 0.30
+BuildRequires: perl(File::Find::Rule::Perl) >= 1.04
 BuildRequires: perl(File::Spec) >= 0.80
 BuildRequires: perl(Test::More) >= 0.47
 
+# For improved tests
 BuildRequires: perl(Test::Pod) >= 1.00
+BuildRequires: perl(Test::CPAN::Meta) >= 0.12
+# n/a in Fedora
+# BuildRequires: perl(Pod::Simple) >= 3.07
+BuildRequires: perl(Pod::Simple)
+BuildRequires: perl(Test::MinimumVersion) >= 0.008
+
 
 %description
 Find a minimum required version of perl for Perl code
@@ -53,6 +61,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
+- Upstream update.
+
 * Mon Aug 25 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.18-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Aug 2008 03:16:47 -0000	1.3
+++ sources	16 Sep 2008 01:46:11 -0000	1.4
@@ -1 +1 @@
-e159a53f2657ca1bf3a8aa841e6fd09c  Perl-MinimumVersion-1.18.tar.gz
+dfce4d3fbb12bc6a23fdaf78b1195a3f  Perl-MinimumVersion-1.19.tar.gz



From corsepiu at fedoraproject.org  Tue Sep 16 01:46:41 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 16 Sep 2008 01:46:41 +0000 (UTC)
Subject: rpms/perl-Perl-MinimumVersion/devel .cvsignore, 1.3,
	1.4 perl-Perl-MinimumVersion.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <20080916014641.B809370138@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Perl-MinimumVersion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28047/devel

Modified Files:
	.cvsignore perl-Perl-MinimumVersion.spec sources 
Log Message:
* Mon Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Aug 2008 03:17:29 -0000	1.3
+++ .cvsignore	16 Sep 2008 01:46:11 -0000	1.4
@@ -1 +1 @@
-Perl-MinimumVersion-1.18.tar.gz
+Perl-MinimumVersion-1.19.tar.gz


Index: perl-Perl-MinimumVersion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/devel/perl-Perl-MinimumVersion.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Perl-MinimumVersion.spec	26 Aug 2008 03:17:29 -0000	1.7
+++ perl-Perl-MinimumVersion.spec	16 Sep 2008 01:46:11 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Perl-MinimumVersion
-Version:        1.18
+Version:        1.19
 Release:        1%{?dist}
 Summary:        Find a minimum required version of perl for Perl code
 License:        GPL+ or Artistic
@@ -15,11 +15,19 @@
 BuildRequires: perl(PPI) >= 1.118
 BuildRequires: perl(Test::Script) >= 1.02
 BuildRequires: perl(version)
-BuildRequires: perl(File::Find::Rule)
+BuildRequires: perl(File::Find::Rule) >= 0.30
+BuildRequires: perl(File::Find::Rule::Perl) >= 1.04
 BuildRequires: perl(File::Spec) >= 0.80
 BuildRequires: perl(Test::More) >= 0.47
 
+# For improved tests
 BuildRequires: perl(Test::Pod) >= 1.00
+BuildRequires: perl(Test::CPAN::Meta) >= 0.12
+# n/a in Fedora
+# BuildRequires: perl(Pod::Simple) >= 3.07
+BuildRequires: perl(Pod::Simple)
+BuildRequires: perl(Test::MinimumVersion) >= 0.008
+
 
 %description
 Find a minimum required version of perl for Perl code
@@ -53,6 +61,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
+- Upstream update.
+
 * Mon Aug 25 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.18-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Aug 2008 03:17:29 -0000	1.3
+++ sources	16 Sep 2008 01:46:11 -0000	1.4
@@ -1 +1 @@
-e159a53f2657ca1bf3a8aa841e6fd09c  Perl-MinimumVersion-1.18.tar.gz
+dfce4d3fbb12bc6a23fdaf78b1195a3f  Perl-MinimumVersion-1.19.tar.gz



From corsepiu at fedoraproject.org  Tue Sep 16 01:46:42 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 16 Sep 2008 01:46:42 +0000 (UTC)
Subject: rpms/perl-Perl-MinimumVersion/F-8 .cvsignore, 1.3,
	1.4 perl-Perl-MinimumVersion.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20080916014642.792B370138@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28047/F-8

Modified Files:
	.cvsignore perl-Perl-MinimumVersion.spec sources 
Log Message:
* Mon Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Aug 2008 03:16:47 -0000	1.3
+++ .cvsignore	16 Sep 2008 01:46:12 -0000	1.4
@@ -1 +1 @@
-Perl-MinimumVersion-1.18.tar.gz
+Perl-MinimumVersion-1.19.tar.gz


Index: perl-Perl-MinimumVersion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-8/perl-Perl-MinimumVersion.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Perl-MinimumVersion.spec	26 Aug 2008 03:16:47 -0000	1.4
+++ perl-Perl-MinimumVersion.spec	16 Sep 2008 01:46:12 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Perl-MinimumVersion
-Version:        1.18
+Version:        1.19
 Release:        1%{?dist}
 Summary:        Find a minimum required version of perl for Perl code
 License:        GPL+ or Artistic
@@ -15,11 +15,19 @@
 BuildRequires: perl(PPI) >= 1.118
 BuildRequires: perl(Test::Script) >= 1.02
 BuildRequires: perl(version)
-BuildRequires: perl(File::Find::Rule)
+BuildRequires: perl(File::Find::Rule) >= 0.30
+BuildRequires: perl(File::Find::Rule::Perl) >= 1.04
 BuildRequires: perl(File::Spec) >= 0.80
 BuildRequires: perl(Test::More) >= 0.47
 
+# For improved tests
 BuildRequires: perl(Test::Pod) >= 1.00
+BuildRequires: perl(Test::CPAN::Meta) >= 0.12
+# n/a in Fedora
+# BuildRequires: perl(Pod::Simple) >= 3.07
+BuildRequires: perl(Pod::Simple)
+BuildRequires: perl(Test::MinimumVersion) >= 0.008
+
 
 %description
 Find a minimum required version of perl for Perl code
@@ -53,6 +61,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
+- Upstream update.
+
 * Mon Aug 25 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.18-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Aug 2008 03:16:47 -0000	1.3
+++ sources	16 Sep 2008 01:46:12 -0000	1.4
@@ -1 +1 @@
-e159a53f2657ca1bf3a8aa841e6fd09c  Perl-MinimumVersion-1.18.tar.gz
+dfce4d3fbb12bc6a23fdaf78b1195a3f  Perl-MinimumVersion-1.19.tar.gz



From corsepiu at fedoraproject.org  Tue Sep 16 01:48:58 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 16 Sep 2008 01:48:58 +0000 (UTC)
Subject: rpms/perl-Perl-MinimumVersion/devel perl-Perl-MinimumVersion.spec,
	1.8, 1.9
Message-ID: <20080916014858.494DE70138@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Perl-MinimumVersion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28272/devel

Modified Files:
	perl-Perl-MinimumVersion.spec 
Log Message:
Fix date.


Index: perl-Perl-MinimumVersion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/devel/perl-Perl-MinimumVersion.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Perl-MinimumVersion.spec	16 Sep 2008 01:46:11 -0000	1.8
+++ perl-Perl-MinimumVersion.spec	16 Sep 2008 01:48:27 -0000	1.9
@@ -61,7 +61,7 @@
 %{_mandir}/man3/*
 
 %changelog
-* Mon Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
+* Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
 - Upstream update.
 
 * Mon Aug 25 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.18-1



From corsepiu at fedoraproject.org  Tue Sep 16 01:48:58 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 16 Sep 2008 01:48:58 +0000 (UTC)
Subject: rpms/perl-Perl-MinimumVersion/F-8 perl-Perl-MinimumVersion.spec, 1.5,
	1.6
Message-ID: <20080916014858.67A8570138@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28272/F-8

Modified Files:
	perl-Perl-MinimumVersion.spec 
Log Message:
Fix date.


Index: perl-Perl-MinimumVersion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-8/perl-Perl-MinimumVersion.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Perl-MinimumVersion.spec	16 Sep 2008 01:46:12 -0000	1.5
+++ perl-Perl-MinimumVersion.spec	16 Sep 2008 01:48:28 -0000	1.6
@@ -61,7 +61,7 @@
 %{_mandir}/man3/*
 
 %changelog
-* Mon Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
+* Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
 - Upstream update.
 
 * Mon Aug 25 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.18-1



From corsepiu at fedoraproject.org  Tue Sep 16 01:48:58 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 16 Sep 2008 01:48:58 +0000 (UTC)
Subject: rpms/perl-Perl-MinimumVersion/F-9 perl-Perl-MinimumVersion.spec, 1.8,
	1.9
Message-ID: <20080916014858.A40CA70138@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28272/F-9

Modified Files:
	perl-Perl-MinimumVersion.spec 
Log Message:
Fix date.


Index: perl-Perl-MinimumVersion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-9/perl-Perl-MinimumVersion.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Perl-MinimumVersion.spec	16 Sep 2008 01:46:11 -0000	1.8
+++ perl-Perl-MinimumVersion.spec	16 Sep 2008 01:48:28 -0000	1.9
@@ -61,7 +61,7 @@
 %{_mandir}/man3/*
 
 %changelog
-* Mon Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
+* Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
 - Upstream update.
 
 * Mon Aug 25 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.18-1



From phuang at fedoraproject.org  Tue Sep 16 02:04:32 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 16 Sep 2008 02:04:32 +0000 (UTC)
Subject: rpms/scim-bridge/devel scim-bridge-0.4.15-bz461373.patch, NONE,
	1.1 scim-bridge.spec, 1.64, 1.65
Message-ID: <20080916020432.3472E70138@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/scim-bridge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30771

Modified Files:
	scim-bridge.spec 
Added Files:
	scim-bridge-0.4.15-bz461373.patch 
Log Message:
Resolve bug 461373

scim-bridge-0.4.15-bz461373.patch:

--- NEW FILE scim-bridge-0.4.15-bz461373.patch ---
diff -up scim-bridge-0.4.15/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp.bz461373 scim-bridge-0.4.15/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp
--- scim-bridge-0.4.15/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp.bz461373	2008-09-16 09:54:29.000000000 +0800
+++ scim-bridge-0.4.15/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp	2008-09-16 09:58:47.000000000 +0800
@@ -220,7 +220,12 @@ void ScimBridgeClientIMContextImpl::setF
 {
     scim_bridge_pdebugln (4, "ScimBridgeClientIMContextImpl::setFocusWidget ()");
     QInputContext::setFocusWidget (widget);
-    focus_in ();
+	if (widget == NULL) {
+    	focus_out ();
+	}
+	else {
+    	focus_in ();
+	}
     update ();
 }
 
@@ -442,8 +447,10 @@ void ScimBridgeClientIMContextImpl::focu
         }
     }
 
-    set_preedit_shown (false);
-    update_preedit ();
+	if (preedit_shown) {
+    	set_preedit_shown (false);
+    	update_preedit ();
+	}
 
     focused_imcontext = NULL;
 }


Index: scim-bridge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-bridge/devel/scim-bridge.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- scim-bridge.spec	24 Jun 2008 00:53:27 -0000	1.64
+++ scim-bridge.spec	16 Sep 2008 02:04:01 -0000	1.65
@@ -6,7 +6,7 @@
 Name:           scim-bridge
 
 Version:        0.4.15
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        SCIM Bridge Gtk IM module
 
 Group:          System Environment/Libraries
@@ -25,6 +25,7 @@
 Requires:       scim >= 1.4.6
 Patch0:         scim-bridge-0.4.15-fix-gdm.patch
 Patch1:         scim-bridge-0.4.15-hotkey-help.patch
+Patch2:			scim-bridge-0.4.15-bz461373.patch
 
 
 %description
@@ -77,6 +78,7 @@
 %setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}}
 %patch0 -p1 -b .0-fix-gdm
 %patch1 -p1 -b .1-hotkey-help
+%patch2 -p1 -b .2-bz461373
 
 %if %{snapshot}
 mkdir m4
@@ -147,7 +149,10 @@
 
 
 %changelog
-* Mon Apr 21 2008 Caius Chance <cchance at redhat.com> - 0.4.15-6.fc10
+* Tue Sep 16 2008 Huang Peng <phuang at redhat.com> - 0.4.15-7
+- Resolves: bug 461373 (Focus switch causes selected text to be deleted)
+
+* Mon Apr 21 2008 Caius Chance <cchance at redhat.com> - 0.4.15-6
 - Resolves: rhbz#199389 (Add global hotkey list in help window.)
 
 * Thu Apr 03 2008 Huang Peng <phuang at redhat.com> -0.4.15-5



From mclasen at fedoraproject.org  Tue Sep 16 02:13:37 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 16 Sep 2008 02:13:37 +0000 (UTC)
Subject: rpms/pulseaudio/devel dotpulse.patch, NONE, 1.1 pulseaudio.spec,
	1.54, 1.55
Message-ID: <20080916021338.01F8E70138@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32233

Modified Files:
	pulseaudio.spec 
Added Files:
	dotpulse.patch 
Log Message:
survive a missing ~/.pulse


dotpulse.patch:

--- NEW FILE dotpulse.patch ---
diff -up pulseaudio-0.9.12/src/pulsecore/core-util.c.dotpulse pulseaudio-0.9.12/src/pulsecore/core-util.c
--- pulseaudio-0.9.12/src/pulsecore/core-util.c.dotpulse	2008-09-15 22:06:10.000000000 -0400
+++ pulseaudio-0.9.12/src/pulsecore/core-util.c	2008-09-15 22:08:39.000000000 -0400
@@ -1370,6 +1370,7 @@ static int make_random_dir_and_link(mode
 char *pa_get_runtime_dir(void) {
     char *d, *k = NULL, *p = NULL, *t = NULL, *mid;
     struct stat st;
+    mode_t m;
 
     /* The runtime directory shall contain dynamic data that needs NOT
      * to be kept accross reboots and is usuallly private to the user,
@@ -1378,10 +1379,9 @@ char *pa_get_runtime_dir(void) {
      * this directory, we link it to a random subdir in /tmp, if it
      * was not explicitly configured. */
 
-    if ((d = getenv("PULSE_RUNTIME_PATH"))) {
-        mode_t m;
+    m = pa_in_system_mode() ? 0755U : 0700U;
 
-        m = pa_in_system_mode() ? 0755U : 0700U;
+    if ((d = getenv("PULSE_RUNTIME_PATH"))) {
 
         if (pa_make_secure_dir(d, m, (uid_t) -1, (gid_t) -1) < 0)  {
             pa_log_error("Failed to create secure directory: %s", pa_cstrerror(errno));
@@ -1394,6 +1394,11 @@ char *pa_get_runtime_dir(void) {
     if (!(d = get_pulse_home()))
         goto fail;
 
+    if (pa_make_secure_dir(d, m, (uid_t) -1, (gid_t) -1) < 0)  { 
+        pa_log_error("Failed to create secure directory: %s", pa_cstrerror(errno)); 
+ 	goto fail; 
+    } 
+
     if (!(mid = pa_machine_id())) {
         pa_xfree(d);
         goto fail;


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/extras/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- pulseaudio.spec	11 Sep 2008 15:06:51 -0000	1.54
+++ pulseaudio.spec	16 Sep 2008 02:13:07 -0000	1.55
@@ -3,7 +3,7 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.12
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -18,7 +18,7 @@
 # Libtool is dragging in rpaths.  Fedora's libtool should get rid of the
 # unneccessary ones.
 BuildRequires: libtool
-BuildRequires:	libXt-devel, xorg-x11-proto-devel
+BuildRequires: libXt-devel, xorg-x11-proto-devel
 BuildRequires: openssl-devel
 BuildRequires: gdbm-devel speex-devel libasyncns-devel
 BuildRequires: intltool
@@ -34,6 +34,8 @@
 #Patch9:	pulseaudio-0.9.8-cputime-abort.patch
 #Patch10: 	wrong-assert.patch
 #Patch11:        pa-ck-api-change.patch
+# from upstream, https://bugzilla.redhat.com/show_bug.cgi?id=462407
+Patch12:	dotpulse.patch
 
 %description
 PulseAudio is a sound server for Linux and other Unix like operating 
@@ -180,6 +182,7 @@
 #%patch9 -p1 -b .cputime-abort
 #%patch10 -p1 -b .wrong-assert
 #%patch11 -p1 -b .api-change
+%patch12 -p1 -b .dotpulse
 
 %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
@@ -406,6 +409,9 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Mon Sep 15 2008 Matthias Clasen <mclasen at redhat.com> 0.9.12-6
+- Survive a missing ~/.pulse (#462407)
+
 * Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> 0.9.12-5
 - Rebuild
 



From corsepiu at fedoraproject.org  Tue Sep 16 02:21:58 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 16 Sep 2008 02:21:58 +0000 (UTC)
Subject: rpms/perl-Test-ClassAPI/F-9 perl-Test-ClassAPI.spec,1.11,1.12
Message-ID: <20080916022158.A1ECC7013A@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-ClassAPI/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1071/F-9

Modified Files:
	perl-Test-ClassAPI.spec 
Log Message:
* Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.05-3
- Reflect perl(Test::CPAN::Meta) >= 0.12 finally being available in Fedora.



Index: perl-Test-ClassAPI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-ClassAPI/F-9/perl-Test-ClassAPI.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Test-ClassAPI.spec	26 Aug 2008 03:44:34 -0000	1.11
+++ perl-Test-ClassAPI.spec	16 Sep 2008 02:21:28 -0000	1.12
@@ -1,6 +1,6 @@
 Name: 		perl-Test-ClassAPI
 Version: 	1.05
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Provides basic first-pass API testing for large class trees
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -22,9 +22,7 @@
 BuildRequires:  perl(Test::Pod)
 
 # For improved tests
-# FIXME: perl(Test::CPAN::Meta) is too old
-# BuildRequires: perl(Test::CPAN::Meta) >= 0.12
-BuildRequires: perl(Test::CPAN::Meta)
+BuildRequires: perl(Test::CPAN::Meta) >= 0.12
 # FIXME: Fedora's perl(Pod::Simple) is too old
 # BuildRequires: perl(Pod::Simple) >= 3.07
 BuildRequires: perl(Pod::Simple)
@@ -66,6 +64,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.05-3
+- Reflect perl(Test::CPAN::Meta) >= 0.12 finally being available in Fedora.
+
 * Tue Aug 26 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.05-2
 - Bump release.
 



From corsepiu at fedoraproject.org  Tue Sep 16 02:21:58 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 16 Sep 2008 02:21:58 +0000 (UTC)
Subject: rpms/perl-Test-ClassAPI/devel perl-Test-ClassAPI.spec,1.11,1.12
Message-ID: <20080916022158.8200A70138@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-ClassAPI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1071/devel

Modified Files:
	perl-Test-ClassAPI.spec 
Log Message:
* Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.05-3
- Reflect perl(Test::CPAN::Meta) >= 0.12 finally being available in Fedora.



Index: perl-Test-ClassAPI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-ClassAPI/devel/perl-Test-ClassAPI.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Test-ClassAPI.spec	26 Aug 2008 03:44:34 -0000	1.11
+++ perl-Test-ClassAPI.spec	16 Sep 2008 02:21:27 -0000	1.12
@@ -1,6 +1,6 @@
 Name: 		perl-Test-ClassAPI
 Version: 	1.05
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Provides basic first-pass API testing for large class trees
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -22,9 +22,7 @@
 BuildRequires:  perl(Test::Pod)
 
 # For improved tests
-# FIXME: perl(Test::CPAN::Meta) is too old
-# BuildRequires: perl(Test::CPAN::Meta) >= 0.12
-BuildRequires: perl(Test::CPAN::Meta)
+BuildRequires: perl(Test::CPAN::Meta) >= 0.12
 # FIXME: Fedora's perl(Pod::Simple) is too old
 # BuildRequires: perl(Pod::Simple) >= 3.07
 BuildRequires: perl(Pod::Simple)
@@ -66,6 +64,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.05-3
+- Reflect perl(Test::CPAN::Meta) >= 0.12 finally being available in Fedora.
+
 * Tue Aug 26 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.05-2
 - Bump release.
 



From corsepiu at fedoraproject.org  Tue Sep 16 02:21:58 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 16 Sep 2008 02:21:58 +0000 (UTC)
Subject: rpms/perl-Test-ClassAPI/F-8 perl-Test-ClassAPI.spec,1.9,1.10
Message-ID: <20080916022158.CB7D87013A@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-ClassAPI/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1071/F-8

Modified Files:
	perl-Test-ClassAPI.spec 
Log Message:
* Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.05-3
- Reflect perl(Test::CPAN::Meta) >= 0.12 finally being available in Fedora.



Index: perl-Test-ClassAPI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-ClassAPI/F-8/perl-Test-ClassAPI.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Test-ClassAPI.spec	26 Aug 2008 03:44:34 -0000	1.9
+++ perl-Test-ClassAPI.spec	16 Sep 2008 02:21:28 -0000	1.10
@@ -1,6 +1,6 @@
 Name: 		perl-Test-ClassAPI
 Version: 	1.05
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Provides basic first-pass API testing for large class trees
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -22,9 +22,7 @@
 BuildRequires:  perl(Test::Pod)
 
 # For improved tests
-# FIXME: perl(Test::CPAN::Meta) is too old
-# BuildRequires: perl(Test::CPAN::Meta) >= 0.12
-BuildRequires: perl(Test::CPAN::Meta)
+BuildRequires: perl(Test::CPAN::Meta) >= 0.12
 # FIXME: Fedora's perl(Pod::Simple) is too old
 # BuildRequires: perl(Pod::Simple) >= 3.07
 BuildRequires: perl(Pod::Simple)
@@ -66,6 +64,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.05-3
+- Reflect perl(Test::CPAN::Meta) >= 0.12 finally being available in Fedora.
+
 * Tue Aug 26 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.05-2
 - Bump release.
 



From petersen at fedoraproject.org  Tue Sep 16 02:22:10 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 16 Sep 2008 02:22:10 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.106,1.107
Message-ID: <20080916022210.5D5A270138@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv773

Modified Files:
	comps-f10.xml.in 
Log Message:
- add lohit-fonts-kashmiri, lohit-fonts-konkani, lohit-fonts-maithili, lohit-fonts-marathi
  lohit-fonts-nepali, lohit-fonts-sindhi
- add kashmiri-support, konkani-support, sindhi-support



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- comps-f10.xml.in	15 Sep 2008 14:05:33 -0000	1.106
+++ comps-f10.xml.in	16 Sep 2008 02:21:39 -0000	1.107
@@ -1422,6 +1422,12 @@
       <packagereq type="optional">khmeros-fonts-muol</packagereq>
       <packagereq type="optional">khmeros-fonts-siemreap</packagereq>
       <packagereq type="optional">linux-libertine-fonts</packagereq>
+      <packagereq type="optional">lohit-fonts-kashmiri</packagereq>
+      <packagereq type="optional">lohit-fonts-konkani</packagereq>
+      <packagereq type="optional">lohit-fonts-maithili</packagereq>
+      <packagereq type="optional">lohit-fonts-marathi</packagereq>
+      <packagereq type="optional">lohit-fonts-nepali</packagereq>
+      <packagereq type="optional">lohit-fonts-sindhi</packagereq>
       <packagereq type="optional">madan-fonts</packagereq>
       <packagereq type="optional">mathml-fonts</packagereq>
       <packagereq type="optional">mgopen-fonts</packagereq>
@@ -2772,6 +2778,17 @@
     </packagelist>
   </group>
   <group>
+    <id>kashmiri-support</id>
+    <_name>Kashmiri Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>ks</langonly>
+    <packagelist>
+      <packagereq type="mandatory">lohit-fonts-kashmiri</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>kashubian-support</id>
     <_name>Kashubian Support</_name>
     <_description/>
@@ -2926,6 +2943,17 @@
     </packagelist>
   </group>
   <group>
+    <id>konkani-support</id>
+    <_name>Konkani Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>kok</langonly>
+    <packagelist>
+      <packagereq type="mandatory">lohit-fonts-konkani</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>korean-support</id>
     <_name>Korean Support</_name>
     <_description/>
@@ -3278,7 +3306,7 @@
     <uservisible>false</uservisible>
     <langonly>ne</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-fonts-hindi</packagereq>
+      <packagereq type="mandatory">lohit-fonts-nepali</packagereq>
       <packagereq type="mandatory">m17n-contrib-nepali</packagereq>
       <packagereq type="mandatory">madan-fonts</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ne</packagereq>
@@ -3692,6 +3720,18 @@
     </packagelist>
   </group>
   <group>
+    <id>sindhi-support</id>
+    <_name>Sindhi Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>sd</langonly>
+    <packagelist>
+      <packagereq type="mandatory">lohit-fonts-sindhi</packagereq>
+      <packagereq type="mandatory">m17n-contrib-sindhi</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>sinhala-support</id>
     <_name>Sinhala Support</_name>
     <_description/>



From dcantrel at fedoraproject.org  Tue Sep 16 03:55:56 2008
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 16 Sep 2008 03:55:56 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.566, 1.567 anaconda.spec, 1.708, 
	1.709 sources, 1.700, 1.701
Message-ID: <20080916035556.7BCE870138@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11553

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Mon Sep 15 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.35-1
- Call network.bringDeviceUp() instead of old isys functions. (dcantrell)
- Pass device name to network.setDNS() and network.setGateway(). (dcantrell)
- NetworkManager fixes in network.py (dcantrell)
- Remove code from isys not needed for NetworkManager. (dcantrell)
- Avoid writing out NM_CONTROLLED more than once. (dcantrell)
- Write out final ifcfg-DEVICE files correctly. (dcantrell)
- Use POSIX and LSB hostname length limit. (dcantrell)
- Consistent whitespace usage in network.py (dcantrell)
- Do not try to start hald or dbus-daemon from anaconda. (dcantrell)
- On HDISO installs, mark LABEL= and UUID= partitions as protected. (clumens)
- Do encrypted device passphrase retrofits while activating partitioning.
  (dlehman)
- Use one passphrase for all new LUKS devices and offer retrofit to old
  ones. (dlehman)
- There's only one passphrase member (encryptionPassphrase) in Partitions.
  (dlehman)
- Only add LUKSDevice instances to PV requests as needed. (dlehman)
- New device passphrase is now always global w/ option to retrofit. (dlehman)
- Don't prompt for a passphrase when creating encrypted devices. (dlehman)
- Define a method to add a passphrase to an existing LUKS device. (dlehman)
- Fix a traceback when starting a shell in rescue mode (#462148). (clumens)
- md, lock_nolock, and dm_emc kernel modules no longer exist. (clumens)
- Fix iscsi disk detection with newer kernels (rh 461839, 461841) (hans)
- Fix the crash reported in bug 454135 (hans)
- Make iBFT reading explicit from a higher level (hans)
- Add ibft flag to ease in testing. (hans)
- Support iSCSI CHAP and Reverse CHAP authentication (rhbz#402431,
  rhbz#432819) (hans)
- Don't set iscsi devices to autostart (rhbz#437891) (hans)
- Add full CHAP support to iSCSI. (rhbz#432819) (hans)
- Do not try to initialize iSCSI, when no portal (#435173) (hans)
- Fix wrong function names for iscsi login/start (rhbz#295154) (hans)
- Set an attribute when iscsid is started (#431904). (hans)
- Better fixes for iscsi probing (patch from jlaska) (hans)
- Make sure ISCSIADM and such are defined (rhbz#431924) (hans)
- Fix iscsi so that mkinitrd can actually talk to the running daemon (hans)
- Make iscsi/ibft work (hans)
- Add mk-images changes forgotten in previous commit (hans)
- Add support for iSCSI iBFT table (#307761) (hans)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.566
retrieving revision 1.567
diff -u -r1.566 -r1.567
--- .cvsignore	11 Sep 2008 22:58:12 -0000	1.566
+++ .cvsignore	16 Sep 2008 03:55:24 -0000	1.567
@@ -1,3 +1 @@
-anaconda-11.4.1.32.tar.bz2
-anaconda-11.4.1.33.tar.bz2
-anaconda-11.4.1.34.tar.bz2
+anaconda-11.4.1.35.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.708
retrieving revision 1.709
diff -u -r1.708 -r1.709
--- anaconda.spec	11 Sep 2008 22:58:12 -0000	1.708
+++ anaconda.spec	16 Sep 2008 03:55:24 -0000	1.709
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.4.1.34
+Version: 11.4.1.35
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -218,6 +218,47 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Sep 15 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.35-1
+- Call network.bringDeviceUp() instead of old isys functions. (dcantrell)
+- Pass device name to network.setDNS() and network.setGateway(). (dcantrell)
+- NetworkManager fixes in network.py (dcantrell)
+- Remove code from isys not needed for NetworkManager. (dcantrell)
+- Avoid writing out NM_CONTROLLED more than once. (dcantrell)
+- Write out final ifcfg-DEVICE files correctly. (dcantrell)
+- Use POSIX and LSB hostname length limit. (dcantrell)
+- Consistent whitespace usage in network.py (dcantrell)
+- Do not try to start hald or dbus-daemon from anaconda. (dcantrell)
+- On HDISO installs, mark LABEL= and UUID= partitions as protected. (clumens)
+- Do encrypted device passphrase retrofits while activating partitioning.
+  (dlehman)
+- Use one passphrase for all new LUKS devices and offer retrofit to old
+  ones. (dlehman)
+- There's only one passphrase member (encryptionPassphrase) in Partitions.
+  (dlehman)
+- Only add LUKSDevice instances to PV requests as needed. (dlehman)
+- New device passphrase is now always global w/ option to retrofit. (dlehman)
+- Don't prompt for a passphrase when creating encrypted devices. (dlehman)
+- Define a method to add a passphrase to an existing LUKS device. (dlehman)
+- Fix a traceback when starting a shell in rescue mode (#462148). (clumens)
+- md, lock_nolock, and dm_emc kernel modules no longer exist. (clumens)
+- Fix iscsi disk detection with newer kernels (rh 461839, 461841) (hans)
+- Fix the crash reported in bug 454135 (hans)
+- Make iBFT reading explicit from a higher level (hans)
+- Add ibft flag to ease in testing. (hans)
+- Support iSCSI CHAP and Reverse CHAP authentication (rhbz#402431,
+  rhbz#432819) (hans)
+- Don't set iscsi devices to autostart (rhbz#437891) (hans)
+- Add full CHAP support to iSCSI. (rhbz#432819) (hans)
+- Do not try to initialize iSCSI, when no portal (#435173) (hans)
+- Fix wrong function names for iscsi login/start (rhbz#295154) (hans)
+- Set an attribute when iscsid is started (#431904). (hans)
+- Better fixes for iscsi probing (patch from jlaska) (hans)
+- Make sure ISCSIADM and such are defined (rhbz#431924) (hans)
+- Fix iscsi so that mkinitrd can actually talk to the running daemon (hans)
+- Make iscsi/ibft work (hans)
+- Add mk-images changes forgotten in previous commit (hans)
+- Add support for iSCSI iBFT table (#307761) (hans)
+
 * Thu Sep 11 2008 Chris Lumens <clumens at redhat.com> - 11.4.1.34-1
 - Always start NM so we can talk to it in the boot.iso case (#461071).
   (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.700
retrieving revision 1.701
diff -u -r1.700 -r1.701
--- sources	11 Sep 2008 22:58:12 -0000	1.700
+++ sources	16 Sep 2008 03:55:24 -0000	1.701
@@ -1 +1 @@
-e3948ec1d6f1dca31abe98ad4210d5be  anaconda-11.4.1.34.tar.bz2
+95da969b6dfdec9dc6a3de1bcda9b329  anaconda-11.4.1.35.tar.bz2



From dcantrel at fedoraproject.org  Tue Sep 16 05:07:55 2008
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 16 Sep 2008 05:07:55 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.567, 1.568 anaconda.spec, 1.709, 
	1.710 sources, 1.701, 1.702
Message-ID: <20080916050755.4D02270138@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20212

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Mon Sep 15 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.36-1
- Remove invalid i18n stuff to let anaconda build. (dcantrell)
- Remove doConfigNetDevice() prototype. (dcantrell)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -r1.567 -r1.568
--- .cvsignore	16 Sep 2008 03:55:24 -0000	1.567
+++ .cvsignore	16 Sep 2008 05:07:24 -0000	1.568
@@ -1 +1 @@
-anaconda-11.4.1.35.tar.bz2
+anaconda-11.4.1.36.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.709
retrieving revision 1.710
diff -u -r1.709 -r1.710
--- anaconda.spec	16 Sep 2008 03:55:24 -0000	1.709
+++ anaconda.spec	16 Sep 2008 05:07:24 -0000	1.710
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.4.1.35
+Version: 11.4.1.36
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -218,6 +218,10 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Sep 15 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.36-1
+- Remove invalid i18n stuff to let anaconda build. (dcantrell)
+- Remove doConfigNetDevice() prototype. (dcantrell)
+
 * Mon Sep 15 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.35-1
 - Call network.bringDeviceUp() instead of old isys functions. (dcantrell)
 - Pass device name to network.setDNS() and network.setGateway(). (dcantrell)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.701
retrieving revision 1.702
diff -u -r1.701 -r1.702
--- sources	16 Sep 2008 03:55:24 -0000	1.701
+++ sources	16 Sep 2008 05:07:24 -0000	1.702
@@ -1 +1 @@
-95da969b6dfdec9dc6a3de1bcda9b329  anaconda-11.4.1.35.tar.bz2
+ce732d7cf59e09901d3d82a555e9b551  anaconda-11.4.1.36.tar.bz2



From sdz at fedoraproject.org  Tue Sep 16 05:20:38 2008
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue, 16 Sep 2008 05:20:38 +0000 (UTC)
Subject: rpms/avogadro/devel avogadro.desktop, NONE, 1.1 avogadro.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080916052038.6986F7013D@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/avogadro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21439/devel

Modified Files:
	.cvsignore sources 
Added Files:
	avogadro.desktop avogadro.spec import.log 
Log Message:
initial import (bug #458030)



--- NEW FILE avogadro.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Avogadro
GenericName=Avogadro
Exec=avogadro
Icon=avogadro
Terminal=false
Categories=KDE;Education;Chemistry;
Type=Application


--- NEW FILE avogadro.spec ---
Name:           avogadro
Version:        0.8.1
Release:        6%{?dist}
Summary:        Avogadro is an advanced Molecular editor

Group:          Applications/Editors
License:        GPLv2
URL:            http://avogadro.openmolecules.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Source1:        %{name}.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cmake >= 2.4.5
BuildRequires:  qt4-devel >= 4.3.0
BuildRequires:  eigen-devel >= 1.0.5
BuildRequires:  openbabel-devel >= 2.2.0
BuildRequires:  python-devel >= 2.5.1
BuildRequires:  desktop-file-utils
BuildRequires:  docbook-utils
BuildRequires:  docbook-utils-pdf

%description
Avogadro is an advanced molecular editor designed
for cross-platform use in computational chemistry,
molecular modeling, bioinformatics, materials science,
and related areas. It offers flexible rendering and
a powerful plugin architecture.


%package libs
Summary:        Shared libraries for Avogadro
Group:          System Environment/Libraries

%description libs
This package contains the shared libraries for the
molecular editor Avogadro.


%package devel
Summary:        Development files for Avogadro
Group:          Development/Libraries
Requires:       %{name}-libs = %{version}-%{release} 

%description devel
This package contains files to develop applications using 
Avogadros libraries.


%prep
%setup -q
# permissions set by upstream would lead to rpmlint warning
# spurious-executable-perm in debuginfo package
chmod 0644 libavogadro/src/engines/iso.h
chmod 0644 libavogadro/src/tools/autoopttool.cpp
chmod 0644 libavogadro/src/tools/autoopttool.h


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake} %{?BUILD_TESTS} -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_lib} ..
popd
make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}

# app icon
install -p -D -m644 ./avogadro/src/icons/avogadro.svg $RPM_BUILD_ROOT/%{_datadir}/pixmaps/avogadro.svg

# system menu entry
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor=""                 \
  --dir=$RPM_BUILD_ROOT%{_datadir}/applications  \
  %{SOURCE1}


%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING ./doc/pdf/index.pdf
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/pixmaps/%{name}.svg
%{_datadir}/applications/%{name}.desktop


%files devel
%defattr(-,root,root,-)
%{_datadir}/libavogadro
%{_includedir}/%{name}
%{_libdir}/*.so


%files libs
%defattr(-,root,root,-)
%{_libdir}/%{name}
%{_libdir}/*.so.*


%changelog
* Sun Sep 14 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-6
- add handbook to docs

* Sun Sep 14 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-5
- add build requirements and fix group names

* Wed Aug 13 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-4
- fix typos

* Sat Aug  9 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-3
- reorganize spec file

* Sat Aug  9 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-2
- rename shared library package and structure spec file

* Sun Aug  3 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-1
- initial pacakging release based on PackMan release


--- NEW FILE import.log ---
avogadro-0_8_1-6_fc9:HEAD:avogadro-0.8.1-6.fc9.src.rpm:1221542097


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2008 09:28:13 -0000	1.1
+++ .cvsignore	16 Sep 2008 05:20:07 -0000	1.2
@@ -0,0 +1 @@
+avogadro-0.8.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2008 09:28:13 -0000	1.1
+++ sources	16 Sep 2008 05:20:08 -0000	1.2
@@ -0,0 +1 @@
+a74d11a9a8240d018db8638e82dd915c  avogadro-0.8.1.tar.bz2



From mtasaka at fedoraproject.org  Tue Sep 16 06:04:00 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 16 Sep 2008 06:04:00 +0000 (UTC)
Subject: rpms/kita/F-8 kita-0.177.3-cookie-change.patch, NONE, 1.1 kita.spec,
	1.10, 1.11
Message-ID: <20080916060400.286E170138@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kita/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27072/F-8

Modified Files:
	kita.spec 
Added Files:
	kita-0.177.3-cookie-change.patch 
Log Message:
* Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-14
- Workaround to 2ch cookie style change


kita-0.177.3-cookie-change.patch:

--- NEW FILE kita-0.177.3-cookie-change.patch ---
--- kita-0.177.3/kita/src/write/writeview.cpp.debug	2006-05-30 01:27:36.000000000 +0900
+++ kita-0.177.3/kita/src/write/writeview.cpp	2008-09-16 14:14:20.000000000 +0900
@@ -43,6 +43,9 @@
 #include <qcheckbox.h>
 #include <qlayout.h>
 
+#include <cstring>
+#include <cstdlib>
+
 /* result code */
 enum{
     K2ch_Unknown,
@@ -191,6 +194,10 @@
     for ( it = list.begin(); it != list.end(); ++it ) {
         faceCombo->insertItem( *it );
     }
+
+    cookie_type = NULL;
+    cookie_value = NULL;
+
 }
 
 
@@ -344,12 +351,48 @@
     m_array.append( data.data() );
 }
 
+void KitaWriteView::find_cookie_typevalue( const char *response ){
+	char *str_cmp, *str;
+	static char *cookie_type_static = NULL;
+	static char *cookie_value_static = NULL;
+	cookie_type = cookie_value = NULL;
+
+	str_cmp = "<input type=hidden name=\"";
+	str = strstr(response, str_cmp);
+	if (str){
+		char *str2 = strstr(str, "\"");
+		char *str3 = NULL;
+		str2++;
+		if ((!cookie_type_static) || (!(strstr(str2, cookie_type_static)))){
+			free(cookie_type_static);
+			free(cookie_value_static);
+
+			cookie_type_static = strdup(str2);
+			str3 = strstr(cookie_type_static, "\"");
+			*str3 = 0;
+
+			str = str2;
+			str2 = strstr(str, "value=\"");
+			str = str2;
+			str2 = strstr(str, "\"");
+			str2++;
+			cookie_value_static = strdup(str2);
+			str3 = strstr(cookie_value_static, "\"");
+			*str3 = 0;
+		}
+	}
+	cookie_type = cookie_type_static;
+	cookie_value = cookie_value_static;
+}
+
+
 
 /* This slot is called when posting is done. */
 /* see also slotPostMessage()                */ /* private slot */
 void KitaWriteView::slotPostFinished( KIO::Job* )
 {
     QString response;
+    const char *response_ascii;
 
     // x-euc-jp & euc-jp
     if ( m_array.contains( "euc-jp" ) ) {
@@ -401,6 +444,9 @@
         /* eat cookie, then re-post message */
     case K2ch_Cookie:
 
+	response_ascii = (const char *) QString::fromLocal8Bit(response).utf8();
+	find_cookie_typevalue(response_ascii);
+
         if ( KMessageBox::questionYesNo( 0,
                                          QTextCodec::codecForName( "utf8" ) ->toUnicode( KITAUTF8_WRITECOOKIEMSG ),
                                          resultTitle( response ) )
@@ -510,6 +556,12 @@
     ( ret += "&MESSAGE=" ) += KURL::encode_string( bodyText->text(), mib );
     ( ret += "&bbs=" ) += Kita::BoardManager::boardID( m_datURL );
     ( ret += "&hana=mogera" );
+    if (cookie_type) {
+	ret += "&" ;
+	ret += cookie_type;
+	ret += "=";
+	ret += cookie_value;
+    }
 
     /* key */
     if ( m_mode == WRITEMODE_NORMAL ) ( ret += "&key=" ) += Kita::DatManager::threadID( m_datURL );
--- kita-0.177.3/kita/src/write/writeview.h.debug	2006-05-30 01:27:36.000000000 +0900
+++ kita-0.177.3/kita/src/write/writeview.h	2008-09-16 13:23:22.000000000 +0900
@@ -45,6 +45,9 @@
 
     static QCp932Codec* m_cp932Codec;
 
+    char *cookie_type;
+    char *cookie_value;
+
 public:
 
     KitaWriteView( QWidget* parent, const char* name, const KURL& url, int mode, const QString& newThreadName = QString::null );
@@ -70,6 +73,7 @@
     void slotRecieveData( KIO::Job*, const QByteArray& );
     void slotPostFinished( KIO::Job* );
     void slotCurrentChanged ( QWidget * w );
+    void find_cookie_typevalue( const char *response );
     bool slotBodyTextChanged();
 
 private:


Index: kita.spec
===================================================================
RCS file: /cvs/extras/rpms/kita/F-8/kita.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kita.spec	21 Aug 2007 18:32:09 -0000	1.10
+++ kita.spec	16 Sep 2008 06:03:29 -0000	1.11
@@ -3,9 +3,10 @@
 Summary:    2ch client for KDE
 Name:       kita
 Version:    %{version}
-Release:    11%{?dist}.1
-Source:     http://keihanna.dl.sourceforge.jp/kita/20336/kita-%{version}.tar.gz
+Release:    14%{?dist}
+Source:     http://downloads.sourceforge.jp/kita/20336/kita-%{version}.tar.gz
 Patch0:     kita-0.177.3-nonweak-symbol.patch
+Patch1:	    kita-0.177.3-cookie-change.patch
 License:    GPLv2+
 URL:        http://sourceforge.jp/projects/kita/
 Group:      Applications/Internet
@@ -13,12 +14,20 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:       libart_lgpl-devel
+%if 0%{?fedora} >= 8
+BuildRequires:       kdelibs3-devel
+%else
 BuildRequires:       kdelibs-devel
+%endif
 BuildRequires:       desktop-file-utils
 
 Requires(post):      /sbin/ldconfig 
 Requires(postun):    /sbin/ldconfig
+%if 0%{?fedora} >= 10
+Requires:            VLGothic-fonts
+%else
 Requires:            fonts-japanese
+%endif
 
 %description
 Kita is a 2ch client for KDE.
@@ -27,6 +36,7 @@
 %setup -q
 
 %patch0 -p2 -b .link
+%patch1 -p1 -b .cookie
 
 %{__sed} -i.soname \
    -e 's|^kita\([\._][lL]\)|libkitamain\1|' \
@@ -62,7 +72,6 @@
       --delete-original \
       --vendor fedora \
       --dir %{buildroot}%{_datadir}/applications \
-      --add-category X-Fedora \
       --add-category KDE \
       --add-category Qt \
       %{buildroot}/%{name}.desktop
@@ -91,15 +100,17 @@
 
 %post
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-%{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || :
+touch --no-create %{_datadir}/icons/hicolor
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+%{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null
+exit 0
 
 %postun
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-%{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || :
+touch --no-create %{_datadir}/icons/hicolor
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+%{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null
+exit 0
 
 %files -f %{name}.lang
 %defattr(-, root, root)
@@ -112,6 +123,18 @@
 %{_datadir}/doc/HTML/en/kita/
 
 %changelog
+* Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-14
+- Workaround to 2ch cookie style change
+
+* Mon Jul 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-13
+- Change Japanese fonts Requires (F-10+)
+
+* Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Rebuild against gcc43 (F-9)
+
+* Sat Dec  8 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-12
+- kdelibs3-devel switch (F-9)
+
 * Wed Aug 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-11.dist.1
 - Mass rebuild (buildID or binutils issue)
 



From mtasaka at fedoraproject.org  Tue Sep 16 06:04:00 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 16 Sep 2008 06:04:00 +0000 (UTC)
Subject: rpms/kita/F-9 kita-0.177.3-cookie-change.patch, NONE, 1.1 kita.spec,
	1.12, 1.13
Message-ID: <20080916060400.4CA917013D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kita/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27072/F-9

Modified Files:
	kita.spec 
Added Files:
	kita-0.177.3-cookie-change.patch 
Log Message:
* Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-14
- Workaround to 2ch cookie style change


kita-0.177.3-cookie-change.patch:

--- NEW FILE kita-0.177.3-cookie-change.patch ---
--- kita-0.177.3/kita/src/write/writeview.cpp.debug	2006-05-30 01:27:36.000000000 +0900
+++ kita-0.177.3/kita/src/write/writeview.cpp	2008-09-16 14:14:20.000000000 +0900
@@ -43,6 +43,9 @@
 #include <qcheckbox.h>
 #include <qlayout.h>
 
+#include <cstring>
+#include <cstdlib>
+
 /* result code */
 enum{
     K2ch_Unknown,
@@ -191,6 +194,10 @@
     for ( it = list.begin(); it != list.end(); ++it ) {
         faceCombo->insertItem( *it );
     }
+
+    cookie_type = NULL;
+    cookie_value = NULL;
+
 }
 
 
@@ -344,12 +351,48 @@
     m_array.append( data.data() );
 }
 
+void KitaWriteView::find_cookie_typevalue( const char *response ){
+	char *str_cmp, *str;
+	static char *cookie_type_static = NULL;
+	static char *cookie_value_static = NULL;
+	cookie_type = cookie_value = NULL;
+
+	str_cmp = "<input type=hidden name=\"";
+	str = strstr(response, str_cmp);
+	if (str){
+		char *str2 = strstr(str, "\"");
+		char *str3 = NULL;
+		str2++;
+		if ((!cookie_type_static) || (!(strstr(str2, cookie_type_static)))){
+			free(cookie_type_static);
+			free(cookie_value_static);
+
+			cookie_type_static = strdup(str2);
+			str3 = strstr(cookie_type_static, "\"");
+			*str3 = 0;
+
+			str = str2;
+			str2 = strstr(str, "value=\"");
+			str = str2;
+			str2 = strstr(str, "\"");
+			str2++;
+			cookie_value_static = strdup(str2);
+			str3 = strstr(cookie_value_static, "\"");
+			*str3 = 0;
+		}
+	}
+	cookie_type = cookie_type_static;
+	cookie_value = cookie_value_static;
+}
+
+
 
 /* This slot is called when posting is done. */
 /* see also slotPostMessage()                */ /* private slot */
 void KitaWriteView::slotPostFinished( KIO::Job* )
 {
     QString response;
+    const char *response_ascii;
 
     // x-euc-jp & euc-jp
     if ( m_array.contains( "euc-jp" ) ) {
@@ -401,6 +444,9 @@
         /* eat cookie, then re-post message */
     case K2ch_Cookie:
 
+	response_ascii = (const char *) QString::fromLocal8Bit(response).utf8();
+	find_cookie_typevalue(response_ascii);
+
         if ( KMessageBox::questionYesNo( 0,
                                          QTextCodec::codecForName( "utf8" ) ->toUnicode( KITAUTF8_WRITECOOKIEMSG ),
                                          resultTitle( response ) )
@@ -510,6 +556,12 @@
     ( ret += "&MESSAGE=" ) += KURL::encode_string( bodyText->text(), mib );
     ( ret += "&bbs=" ) += Kita::BoardManager::boardID( m_datURL );
     ( ret += "&hana=mogera" );
+    if (cookie_type) {
+	ret += "&" ;
+	ret += cookie_type;
+	ret += "=";
+	ret += cookie_value;
+    }
 
     /* key */
     if ( m_mode == WRITEMODE_NORMAL ) ( ret += "&key=" ) += Kita::DatManager::threadID( m_datURL );
--- kita-0.177.3/kita/src/write/writeview.h.debug	2006-05-30 01:27:36.000000000 +0900
+++ kita-0.177.3/kita/src/write/writeview.h	2008-09-16 13:23:22.000000000 +0900
@@ -45,6 +45,9 @@
 
     static QCp932Codec* m_cp932Codec;
 
+    char *cookie_type;
+    char *cookie_value;
+
 public:
 
     KitaWriteView( QWidget* parent, const char* name, const KURL& url, int mode, const QString& newThreadName = QString::null );
@@ -70,6 +73,7 @@
     void slotRecieveData( KIO::Job*, const QByteArray& );
     void slotPostFinished( KIO::Job* );
     void slotCurrentChanged ( QWidget * w );
+    void find_cookie_typevalue( const char *response );
     bool slotBodyTextChanged();
 
 private:


Index: kita.spec
===================================================================
RCS file: /cvs/extras/rpms/kita/F-9/kita.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kita.spec	9 Feb 2008 04:21:15 -0000	1.12
+++ kita.spec	16 Sep 2008 06:03:30 -0000	1.13
@@ -3,9 +3,10 @@
 Summary:    2ch client for KDE
 Name:       kita
 Version:    %{version}
-Release:    12%{?dist}.2
+Release:    14%{?dist}
 Source:     http://downloads.sourceforge.jp/kita/20336/kita-%{version}.tar.gz
 Patch0:     kita-0.177.3-nonweak-symbol.patch
+Patch1:	    kita-0.177.3-cookie-change.patch
 License:    GPLv2+
 URL:        http://sourceforge.jp/projects/kita/
 Group:      Applications/Internet
@@ -22,7 +23,11 @@
 
 Requires(post):      /sbin/ldconfig 
 Requires(postun):    /sbin/ldconfig
+%if 0%{?fedora} >= 10
+Requires:            VLGothic-fonts
+%else
 Requires:            fonts-japanese
+%endif
 
 %description
 Kita is a 2ch client for KDE.
@@ -31,6 +36,7 @@
 %setup -q
 
 %patch0 -p2 -b .link
+%patch1 -p1 -b .cookie
 
 %{__sed} -i.soname \
    -e 's|^kita\([\._][lL]\)|libkitamain\1|' \
@@ -117,11 +123,17 @@
 %{_datadir}/doc/HTML/en/kita/
 
 %changelog
+* Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-14
+- Workaround to 2ch cookie style change
+
+* Mon Jul 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-13
+- Change Japanese fonts Requires (F-10+)
+
 * Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- Rebuild against gcc43
+- Rebuild against gcc43 (F-9)
 
 * Sat Dec  8 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-12
-- kdelibs3-devel switch
+- kdelibs3-devel switch (F-9)
 
 * Wed Aug 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-11.dist.1
 - Mass rebuild (buildID or binutils issue)



From mtasaka at fedoraproject.org  Tue Sep 16 06:04:00 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 16 Sep 2008 06:04:00 +0000 (UTC)
Subject: rpms/kita/devel kita-0.177.3-cookie-change.patch, NONE,
	1.1 kita.spec, 1.14, 1.15
Message-ID: <20080916060400.8883570138@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kita/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27072/devel

Modified Files:
	kita.spec 
Added Files:
	kita-0.177.3-cookie-change.patch 
Log Message:
* Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-14
- Workaround to 2ch cookie style change


kita-0.177.3-cookie-change.patch:

--- NEW FILE kita-0.177.3-cookie-change.patch ---
--- kita-0.177.3/kita/src/write/writeview.cpp.debug	2006-05-30 01:27:36.000000000 +0900
+++ kita-0.177.3/kita/src/write/writeview.cpp	2008-09-16 14:14:20.000000000 +0900
@@ -43,6 +43,9 @@
 #include <qcheckbox.h>
 #include <qlayout.h>
 
+#include <cstring>
+#include <cstdlib>
+
 /* result code */
 enum{
     K2ch_Unknown,
@@ -191,6 +194,10 @@
     for ( it = list.begin(); it != list.end(); ++it ) {
         faceCombo->insertItem( *it );
     }
+
+    cookie_type = NULL;
+    cookie_value = NULL;
+
 }
 
 
@@ -344,12 +351,48 @@
     m_array.append( data.data() );
 }
 
+void KitaWriteView::find_cookie_typevalue( const char *response ){
+	char *str_cmp, *str;
+	static char *cookie_type_static = NULL;
+	static char *cookie_value_static = NULL;
+	cookie_type = cookie_value = NULL;
+
+	str_cmp = "<input type=hidden name=\"";
+	str = strstr(response, str_cmp);
+	if (str){
+		char *str2 = strstr(str, "\"");
+		char *str3 = NULL;
+		str2++;
+		if ((!cookie_type_static) || (!(strstr(str2, cookie_type_static)))){
+			free(cookie_type_static);
+			free(cookie_value_static);
+
+			cookie_type_static = strdup(str2);
+			str3 = strstr(cookie_type_static, "\"");
+			*str3 = 0;
+
+			str = str2;
+			str2 = strstr(str, "value=\"");
+			str = str2;
+			str2 = strstr(str, "\"");
+			str2++;
+			cookie_value_static = strdup(str2);
+			str3 = strstr(cookie_value_static, "\"");
+			*str3 = 0;
+		}
+	}
+	cookie_type = cookie_type_static;
+	cookie_value = cookie_value_static;
+}
+
+
 
 /* This slot is called when posting is done. */
 /* see also slotPostMessage()                */ /* private slot */
 void KitaWriteView::slotPostFinished( KIO::Job* )
 {
     QString response;
+    const char *response_ascii;
 
     // x-euc-jp & euc-jp
     if ( m_array.contains( "euc-jp" ) ) {
@@ -401,6 +444,9 @@
         /* eat cookie, then re-post message */
     case K2ch_Cookie:
 
+	response_ascii = (const char *) QString::fromLocal8Bit(response).utf8();
+	find_cookie_typevalue(response_ascii);
+
         if ( KMessageBox::questionYesNo( 0,
                                          QTextCodec::codecForName( "utf8" ) ->toUnicode( KITAUTF8_WRITECOOKIEMSG ),
                                          resultTitle( response ) )
@@ -510,6 +556,12 @@
     ( ret += "&MESSAGE=" ) += KURL::encode_string( bodyText->text(), mib );
     ( ret += "&bbs=" ) += Kita::BoardManager::boardID( m_datURL );
     ( ret += "&hana=mogera" );
+    if (cookie_type) {
+	ret += "&" ;
+	ret += cookie_type;
+	ret += "=";
+	ret += cookie_value;
+    }
 
     /* key */
     if ( m_mode == WRITEMODE_NORMAL ) ( ret += "&key=" ) += Kita::DatManager::threadID( m_datURL );
--- kita-0.177.3/kita/src/write/writeview.h.debug	2006-05-30 01:27:36.000000000 +0900
+++ kita-0.177.3/kita/src/write/writeview.h	2008-09-16 13:23:22.000000000 +0900
@@ -45,6 +45,9 @@
 
     static QCp932Codec* m_cp932Codec;
 
+    char *cookie_type;
+    char *cookie_value;
+
 public:
 
     KitaWriteView( QWidget* parent, const char* name, const KURL& url, int mode, const QString& newThreadName = QString::null );
@@ -70,6 +73,7 @@
     void slotRecieveData( KIO::Job*, const QByteArray& );
     void slotPostFinished( KIO::Job* );
     void slotCurrentChanged ( QWidget * w );
+    void find_cookie_typevalue( const char *response );
     bool slotBodyTextChanged();
 
 private:


Index: kita.spec
===================================================================
RCS file: /cvs/extras/rpms/kita/devel/kita.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kita.spec	28 Jul 2008 05:02:32 -0000	1.14
+++ kita.spec	16 Sep 2008 06:03:30 -0000	1.15
@@ -3,9 +3,10 @@
 Summary:    2ch client for KDE
 Name:       kita
 Version:    %{version}
-Release:    13%{?dist}.1
+Release:    14%{?dist}
 Source:     http://downloads.sourceforge.jp/kita/20336/kita-%{version}.tar.gz
 Patch0:     kita-0.177.3-nonweak-symbol.patch
+Patch1:	    kita-0.177.3-cookie-change.patch
 License:    GPLv2+
 URL:        http://sourceforge.jp/projects/kita/
 Group:      Applications/Internet
@@ -35,6 +36,7 @@
 %setup -q
 
 %patch0 -p2 -b .link
+%patch1 -p1 -b .cookie
 
 %{__sed} -i.soname \
    -e 's|^kita\([\._][lL]\)|libkitamain\1|' \
@@ -121,14 +123,17 @@
 %{_datadir}/doc/HTML/en/kita/
 
 %changelog
+* Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-14
+- Workaround to 2ch cookie style change
+
 * Mon Jul 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-13
 - Change Japanese fonts Requires (F-10+)
 
 * Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- Rebuild against gcc43
+- Rebuild against gcc43 (F-9)
 
 * Sat Dec  8 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-12
-- kdelibs3-devel switch
+- kdelibs3-devel switch (F-9)
 
 * Wed Aug 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-11.dist.1
 - Mass rebuild (buildID or binutils issue)



From jreznik at fedoraproject.org  Tue Sep 16 07:06:51 2008
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue, 16 Sep 2008 07:06:51 +0000 (UTC)
Subject: rpms/system-config-bind/devel .cvsignore, 1.37, 1.38 sources, 1.54, 
	1.55 system-config-bind.spec, 1.76, 1.77
Message-ID: <20080916070651.9D3A070138@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/system-config-bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2782

Modified Files:
	.cvsignore sources system-config-bind.spec 
Log Message:
* Tue Sep 16 2008 Jaroslav Reznik <jreznik at redhat.com> - 4.0.11-1
- Missing translations 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	15 Sep 2008 07:49:43 -0000	1.37
+++ .cvsignore	16 Sep 2008 07:06:21 -0000	1.38
@@ -1 +1 @@
-system-config-bind-4.0.10.tar.gz
+system-config-bind-4.0.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	15 Sep 2008 07:49:43 -0000	1.54
+++ sources	16 Sep 2008 07:06:21 -0000	1.55
@@ -1 +1 @@
-f4140eda66812ec7cb0207204988dae9  system-config-bind-4.0.10.tar.gz
+52f7916994666c8f8238fbb6e623e9b5  system-config-bind-4.0.11.tar.gz


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/devel/system-config-bind.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- system-config-bind.spec	15 Sep 2008 07:49:43 -0000	1.76
+++ system-config-bind.spec	16 Sep 2008 07:06:21 -0000	1.77
@@ -1,6 +1,6 @@
 Summary:        BIND DNS Configuration Tool
 Name:           system-config-bind
-Version:        4.0.10
+Version:        4.0.11
 Release:        1%{?dist}
 URL:            http://fedorahosted.org/system-config-bind
 License:        GPLv2
@@ -81,6 +81,9 @@
 fi;
 
 %changelog
+* Tue Sep 16 2008 Jaroslav Reznik <jreznik at redhat.com> - 4.0.11-1
+- Missing translations
+
 * Mon Sep 15 2008 Jaroslav Reznik <jreznik at redhat.com> - 4.0.10-1
 - Fixes listen-on ACL bug (rhbz#449046)
 - Repackage with new translations



From pkgdb at fedoraproject.org  Tue Sep 16 07:29:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 07:29:46 +0000
Subject: [pkgdb] nut: tsmetana has requested commit
Message-ID: <20080916072946.4DD62208D9A@bastion.fedora.phx.redhat.com>

tsmetana has requested the commit acl on nut (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nut



From pkgdb at fedoraproject.org  Tue Sep 16 07:31:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 07:31:29 +0000
Subject: [pkgdb] nut had acl change status
Message-ID: <20080916073129.C4BC8208D62@bastion.fedora.phx.redhat.com>

mhlavink has set the commit acl on nut (Fedora devel) to Approved for tsmetana

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nut



From caolanm at fedoraproject.org  Tue Sep 16 07:39:30 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 16 Sep 2008 07:39:30 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.cmcfixes50.patch,1.2,1.3
Message-ID: <20080916073930.74A4970138@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6695

Modified Files:
	workspace.cmcfixes50.patch 
Log Message:
fuzz

workspace.cmcfixes50.patch:

Index: workspace.cmcfixes50.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes50.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.cmcfixes50.patch	15 Sep 2008 22:18:05 -0000	1.2
+++ workspace.cmcfixes50.patch	16 Sep 2008 07:39:00 -0000	1.3
@@ -211,7 +211,7 @@
 diff -u -r1.290 -r1.285.8.4
 --- openoffice.org.orig/config_office/configure.in	8 Sep 2008 07:38:40 -0000	1.290
 +++ openoffice.org/config_office/configure.in	9 Sep 2008 08:04:45 -0000	1.285.8.4
-@@ -441,6 +441,10 @@
+@@ -438,6 +438,10 @@
  [  --with-liblayout-jar=JARFILE   Specify path to jarfile manually ],
  [ LIBLAYOUT_JAR="$withval"
  ])
@@ -222,7 +222,7 @@
  AC_ARG_WITH(libformula-jar,
  [  --with-libformula-jar=JARFILE   Specify path to jarfile manually ],
  [ LIBFORMULA_JAR="$withval"
-@@ -3675,15 +3679,34 @@
+@@ -3660,15 +3664,34 @@
          AC_MSG_RESULT([external])
          SYSTEM_LUCENE=YES
          if test -z $LUCENE_CORE_JAR; then
@@ -263,7 +263,7 @@
  else
      AC_MSG_RESULT([internal])
      SYSTEM_LUCENE=NO
-@@ -5359,23 +5382,33 @@
+@@ -5453,23 +5476,33 @@
  	if test -z "$COMMONS_CODEC_JAR"; then
  		COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar
  	fi
@@ -308,7 +308,7 @@
    else
  	AC_MSG_RESULT([internal])
    	SYSTEM_APACHE_COMMONS=NO
-@@ -5419,62 +5452,163 @@
+@@ -5519,62 +5552,163 @@
    AC_MSG_CHECKING([which jfreereport libs to use])
    if test "$with_system_jfreereport" == "yes"; then
     	SYSTEM_JFREEREPORT=YES
@@ -517,4 +517,4 @@
 +
    else
       AC_MSG_RESULT([internal])
-      SYSTEM_JFREEREPORT=NO
+      AC_MSG_CHECKING([for jfreereport module])



From varekova at fedoraproject.org  Tue Sep 16 07:48:37 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 16 Sep 2008 07:48:37 +0000 (UTC)
Subject: rpms/gsl/devel gsl.spec,1.44,1.45
Message-ID: <20080916074837.1AB7470138@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7906

Modified Files:
	gsl.spec 
Log Message:
- Resolves: #462369 - remove %%{_datadir}/aclocal
- add automake dependency



Index: gsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/gsl.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gsl.spec	28 Jul 2008 10:42:20 -0000	1.44
+++ gsl.spec	16 Sep 2008 07:48:06 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: The GNU Scientific Library for numerical analysis
 Name: gsl
 Version: 1.11
-Release: 3%{?dist}
+Release: 4%{?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
@@ -23,7 +23,7 @@
 Requires: %{name} = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info 
-Requires: pkgconfig
+Requires: pkgconfig, automake
 
 %description devel
 The gsl-devel package contains the header files necessary for 
@@ -84,7 +84,6 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_bindir}/gsl-config*
-%dir %{_datadir}/aclocal
 %{_datadir}/aclocal/*
 %{_includedir}/*
 %{_infodir}/*info*
@@ -99,6 +98,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Tue Sep 16 2008 Ivana Varekova <varekova at redhat.com> - 1.11-4
+- Resolves: #462369 - remove %%{_datadir}/aclocal
+- add automake dependency
+
 * Mon Jul 28 2008 Ivana Varekova <varekova at redhat.com> - 1.11-3
 - add -fgnu89-inline flag to solve gcc4.3 problem 
   remove gcc43 patch



From robert at fedoraproject.org  Tue Sep 16 07:51:10 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 16 Sep 2008 07:51:10 +0000 (UTC)
Subject: rpms/phpMyAdmin/EL-4 .cvsignore, 1.21, 1.22 phpMyAdmin.spec, 1.29, 
	1.30 sources, 1.25, 1.26
Message-ID: <20080916075110.49EC470138@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8373/EL-4

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 2.11.9.1 (#462430)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	29 Aug 2008 18:17:57 -0000	1.21
+++ .cvsignore	16 Sep 2008 07:50:39 -0000	1.22
@@ -1 +1 @@
-phpMyAdmin-2.11.9-all-languages.tar.bz2
+phpMyAdmin-2.11.9.1-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/phpMyAdmin.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- phpMyAdmin.spec	29 Aug 2008 18:17:57 -0000	1.29
+++ phpMyAdmin.spec	16 Sep 2008 07:50:39 -0000	1.30
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 2.11.9
+Version: 2.11.9.1
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Tue Sep 16 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9.1-1
+- Upstream released 2.11.9.1 (#462430)
+
 * Fri Aug 29 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9-1
 - Upstream released 2.11.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	29 Aug 2008 18:17:57 -0000	1.25
+++ sources	16 Sep 2008 07:50:39 -0000	1.26
@@ -1 +1 @@
-692805538f33b1e1d24430476e3ae426  phpMyAdmin-2.11.9-all-languages.tar.bz2
+04bebba1ef0f260018cbeec2a1e9b9ff  phpMyAdmin-2.11.9.1-all-languages.tar.bz2



From robert at fedoraproject.org  Tue Sep 16 07:51:10 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 16 Sep 2008 07:51:10 +0000 (UTC)
Subject: rpms/phpMyAdmin/EL-5 .cvsignore, 1.21, 1.22 phpMyAdmin.spec, 1.29, 
	1.30 sources, 1.25, 1.26
Message-ID: <20080916075110.88B5170138@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8373/EL-5

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 2.11.9.1 (#462430)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	29 Aug 2008 18:17:57 -0000	1.21
+++ .cvsignore	16 Sep 2008 07:50:40 -0000	1.22
@@ -1 +1 @@
-phpMyAdmin-2.11.9-all-languages.tar.bz2
+phpMyAdmin-2.11.9.1-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/phpMyAdmin.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- phpMyAdmin.spec	29 Aug 2008 18:17:57 -0000	1.29
+++ phpMyAdmin.spec	16 Sep 2008 07:50:40 -0000	1.30
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 2.11.9
+Version: 2.11.9.1
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Tue Sep 16 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9.1-1
+- Upstream released 2.11.9.1 (#462430)
+
 * Fri Aug 29 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9-1
 - Upstream released 2.11.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	29 Aug 2008 18:17:57 -0000	1.25
+++ sources	16 Sep 2008 07:50:40 -0000	1.26
@@ -1 +1 @@
-692805538f33b1e1d24430476e3ae426  phpMyAdmin-2.11.9-all-languages.tar.bz2
+04bebba1ef0f260018cbeec2a1e9b9ff  phpMyAdmin-2.11.9.1-all-languages.tar.bz2



From robert at fedoraproject.org  Tue Sep 16 07:51:10 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 16 Sep 2008 07:51:10 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-8 .cvsignore, 1.22, 1.23 phpMyAdmin.spec, 1.29,
	1.30 sources, 1.25, 1.26
Message-ID: <20080916075110.E1D2970138@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8373/F-8

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 2.11.9.1 (#462430)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-8/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	29 Aug 2008 18:17:57 -0000	1.22
+++ .cvsignore	16 Sep 2008 07:50:40 -0000	1.23
@@ -1 +1 @@
-phpMyAdmin-2.11.9-all-languages.tar.bz2
+phpMyAdmin-2.11.9.1-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-8/phpMyAdmin.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- phpMyAdmin.spec	29 Aug 2008 18:17:57 -0000	1.29
+++ phpMyAdmin.spec	16 Sep 2008 07:50:40 -0000	1.30
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 2.11.9
+Version: 2.11.9.1
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Tue Sep 16 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9.1-1
+- Upstream released 2.11.9.1 (#462430)
+
 * Fri Aug 29 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9-1
 - Upstream released 2.11.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-8/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	29 Aug 2008 18:17:57 -0000	1.25
+++ sources	16 Sep 2008 07:50:40 -0000	1.26
@@ -1 +1 @@
-692805538f33b1e1d24430476e3ae426  phpMyAdmin-2.11.9-all-languages.tar.bz2
+04bebba1ef0f260018cbeec2a1e9b9ff  phpMyAdmin-2.11.9.1-all-languages.tar.bz2



From robert at fedoraproject.org  Tue Sep 16 07:51:11 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 16 Sep 2008 07:51:11 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-9 .cvsignore, 1.25, 1.26 phpMyAdmin.spec, 1.29,
	1.30 sources, 1.25, 1.26
Message-ID: <20080916075111.3DE0870138@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8373/F-9

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 2.11.9.1 (#462430)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	29 Aug 2008 18:17:57 -0000	1.25
+++ .cvsignore	16 Sep 2008 07:50:40 -0000	1.26
@@ -1 +1 @@
-phpMyAdmin-2.11.9-all-languages.tar.bz2
+phpMyAdmin-2.11.9.1-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/phpMyAdmin.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- phpMyAdmin.spec	29 Aug 2008 18:17:57 -0000	1.29
+++ phpMyAdmin.spec	16 Sep 2008 07:50:40 -0000	1.30
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 2.11.9
+Version: 2.11.9.1
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Tue Sep 16 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9.1-1
+- Upstream released 2.11.9.1 (#462430)
+
 * Fri Aug 29 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9-1
 - Upstream released 2.11.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	29 Aug 2008 18:17:57 -0000	1.25
+++ sources	16 Sep 2008 07:50:40 -0000	1.26
@@ -1 +1 @@
-692805538f33b1e1d24430476e3ae426  phpMyAdmin-2.11.9-all-languages.tar.bz2
+04bebba1ef0f260018cbeec2a1e9b9ff  phpMyAdmin-2.11.9.1-all-languages.tar.bz2



From robert at fedoraproject.org  Tue Sep 16 07:51:11 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 16 Sep 2008 07:51:11 +0000 (UTC)
Subject: rpms/phpMyAdmin/devel .cvsignore, 1.25, 1.26 phpMyAdmin.spec, 1.29, 
	1.30 sources, 1.25, 1.26
Message-ID: <20080916075111.90E7870138@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8373/devel

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 2.11.9.1 (#462430)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	29 Aug 2008 18:17:58 -0000	1.25
+++ .cvsignore	16 Sep 2008 07:50:41 -0000	1.26
@@ -1 +1 @@
-phpMyAdmin-2.11.9-all-languages.tar.bz2
+phpMyAdmin-2.11.9.1-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- phpMyAdmin.spec	29 Aug 2008 18:17:58 -0000	1.29
+++ phpMyAdmin.spec	16 Sep 2008 07:50:41 -0000	1.30
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 2.11.9
+Version: 2.11.9.1
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Tue Sep 16 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9.1-1
+- Upstream released 2.11.9.1 (#462430)
+
 * Fri Aug 29 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9-1
 - Upstream released 2.11.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	29 Aug 2008 18:17:58 -0000	1.25
+++ sources	16 Sep 2008 07:50:41 -0000	1.26
@@ -1 +1 @@
-692805538f33b1e1d24430476e3ae426  phpMyAdmin-2.11.9-all-languages.tar.bz2
+04bebba1ef0f260018cbeec2a1e9b9ff  phpMyAdmin-2.11.9.1-all-languages.tar.bz2



From varekova at fedoraproject.org  Tue Sep 16 07:53:34 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 16 Sep 2008 07:53:34 +0000 (UTC)
Subject: rpms/gsl/F-9 gsl.spec,1.40,1.41
Message-ID: <20080916075334.EE3B370138@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gsl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9033

Modified Files:
	gsl.spec 
Log Message:
- Resolves: #462369 - remove %%{_datadir}/aclocal
- add automake dependency



Index: gsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/F-9/gsl.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gsl.spec	20 Feb 2008 06:34:50 -0000	1.40
+++ gsl.spec	16 Sep 2008 07:53:04 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: The GNU Scientific Library for numerical analysis
 Name: gsl
 Version: 1.10
-Release: 10%{?dist}
+Release: 11%{?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
@@ -23,7 +23,7 @@
 Requires: %{name} = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info 
-Requires: pkgconfig
+Requires: pkgconfig, automake
 
 %description devel
 The gsl-devel package contains the header files necessary for 
@@ -84,7 +84,6 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_bindir}/gsl-config*
-%dir %{_datadir}/aclocal
 %{_datadir}/aclocal/*
 %{_includedir}/*
 %{_infodir}/*info*
@@ -99,6 +98,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Tue Sep 16 2008 Ivana Varekova <varekova at redhat.com> - 1.10-11
+- Resolves: #462369 - remove %%{_datadir}/aclocal
+- add automake dependency
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.10-10
 - Autorebuild for GCC 4.3
 



From tsmetana at fedoraproject.org  Tue Sep 16 08:20:49 2008
From: tsmetana at fedoraproject.org (Tomas Smetana)
Date: Tue, 16 Sep 2008 08:20:49 +0000 (UTC)
Subject: rpms/nut/devel nut.spec,1.63,1.64
Message-ID: <20080916082049.323E570138@cvs1.fedora.phx.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/nut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13280

Modified Files:
	nut.spec 
Log Message:
* Mon Sep 15 2008 Tomas Smetana <tsmetana at redhat.com> 2.2.2-3
- fix #461374 - add missing udev rules



Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/nut.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- nut.spec	9 Sep 2008 08:22:51 -0000	1.63
+++ nut.spec	16 Sep 2008 08:20:18 -0000	1.64
@@ -9,7 +9,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -227,6 +227,7 @@
 %config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.conf
 %config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.users
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/ups
+%config %attr(644,root,root) %{_sysconfdir}/udev/rules.d/*
 %{modeldir}/*
 %exclude %{modeldir}/netxml-ups
 %{_sbindir}/upsd
@@ -339,6 +340,9 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Mon Sep 15 2008 Tomas Smetana <tsmetana at redhat.com> 2.2.2-3
+- fix #461374 - add missing udev rules
+
 * Mon Aug 25 2008 Tomas Smetana <tsmetana at redhat.com> 2.2.2-2
 - fix requirements in spec file
 - build a separate hal package



From jsafrane at fedoraproject.org  Tue Sep 16 08:29:17 2008
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Tue, 16 Sep 2008 08:29:17 +0000 (UTC)
Subject: rpms/net-snmp/devel net-snmp.spec,1.155,1.156
Message-ID: <20080916082917.D544070138@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14404

Modified Files:
	net-snmp.spec 
Log Message:
add net-snmp-python
Resolves: #461947


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- net-snmp.spec	25 Jul 2008 11:03:32 -0000	1.155
+++ net-snmp.spec	16 Sep 2008 08:28:47 -0000	1.156
@@ -1,3 +1,4 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?tcp_wrappers:%define tcp_wrappers 1}
 
 # Arches on which we need to prevent arch conflicts on net-snmp-config.h
@@ -7,7 +8,7 @@
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: %{major_ver}
-Release: 21%{?dist}
+Release: 22%{?dist}
 Epoch: 1
 
 License: BSD and MIT
@@ -54,6 +55,7 @@
 BuildRequires: openssl-devel, bzip2-devel, elfutils-devel
 BuildRequires: libselinux-devel, elfutils-libelf-devel, rpm-devel
 BuildRequires: perl-devel, perl(ExtUtils::Embed), gawk, procps
+BuildRequires: python-devel, python-setuptools
 %ifnarch s390 s390x
 BuildRequires: lm_sensors-devel >= 3
 %endif
@@ -149,6 +151,17 @@
 The net-snmp-libs package contains the runtime libraries for shared binaries
 and applications.
 
+%package python
+Group: Development/Libraries
+Summary: The Python 'netsnmp' module for the NET-SNMP
+Requires: %{name} = %{epoch}:%{version}
+
+%description python
+The 'netsnmp' module provides a full featured, tri-lingual SNMP (SNMPv3, 
+SNMPv2c, SNMPv1) client API. The 'netsnmp' module internals rely on the
+Net-SNMP toolkit library.
+
+
 %prep
 %setup -q -n %{name}-%{major_ver}
 %patch1 -p1 -b .mnttab
@@ -225,6 +238,11 @@
 make %{?smp_mflags} 
 popd
 
+pushd python
+# built python module building
+%{__python} setup.py --basedir="../" build
+popd
+
 %install
 rm -rf ${RPM_BUILD_ROOT}
 %makeinstall  ucdincludedir=${RPM_BUILD_ROOT}/usr/include/ucd-snmp
@@ -294,6 +312,11 @@
 	| grep -v '/auto$' \
 	> ../perl.lst
 popd
+
+pushd python
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+popd
+
 find $RPM_BUILD_ROOT -name '*.so' | xargs chmod 0755
 
 # remove docs that do not apply to Linux
@@ -379,6 +402,11 @@
 %attr(0644,root,root)	%{_mandir}/man1/mib2c.1*
 %attr(0644,root,root)   %{_mandir}/man3/*.3pm.*
 
+%files python
+%defattr(-,root,root,-)
+%doc README
+%{python_sitelib}/*
+
 %files gui
 %defattr(-,root,root)
 %{_bindir}/tkmib
@@ -389,6 +417,9 @@
 %{_libdir}/lib*.so.*
 
 %changelog
+* Wed Sep 10 2008 John A. Khvatov <ivaxer at fedoraproject.org> 5.4.1-22
+- add net-snmp-python
+
 * Tue Jul 22 2008 Jan Safranek <jsafranek at redhat.com> 5.4.1-21
 - fix perl SNMP::Session::set (#452131)
 



From caolanm at fedoraproject.org  Tue Sep 16 08:43:44 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 16 Sep 2008 08:43:44 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch, NONE,
	1.1 openoffice.org.spec, 1.1649, 1.1650
Message-ID: <20080916084344.2455470138@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16113

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch 
Log Message:
fix accessibility ownership loops

openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch:

--- NEW FILE openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch ---
Index: source/ui/accessibility/AccessibleDocumentViewBase.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx,v
retrieving revision 1.32
diff -u -r1.32 AccessibleDocumentViewBase.cxx
--- openoffice.org.orig/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx	7 Jul 2008 14:20:57 -0000	1.32
+++ openoffice.org/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx	16 Sep 2008 08:02:46 -0000
@@ -74,8 +74,6 @@
 
 namespace accessibility {
 
-static SfxViewFrame* mpViewFrame = NULL;
-
 //=====  internal  ============================================================
 AccessibleDocumentViewBase::AccessibleDocumentViewBase (
     ::sd::Window* pSdWindow,
@@ -90,6 +88,6 @@
         static_cast<SdrPaintView*>(pViewShell->GetView()), 
         *static_cast<OutputDevice*>(pSdWindow))
 {
     if (mxController.is())
         mxModel = mxController->getModel();
 
@@ -103,8 +102,6 @@
     maShapeTreeInfo.SetViewForwarder (&maViewForwarder);
 
     mxWindow = ::VCLUnoHelper::GetInterface (pSdWindow);
-
-    mpViewFrame = pViewShell->GetViewFrame();
 }
 
 
@@ -112,6 +109,6 @@
 
 AccessibleDocumentViewBase::~AccessibleDocumentViewBase (void)
 {
     // At this place we should be disposed.  You may want to add a
     // corresponding assertion into the destructor of a derived class.
 }
@@ -149,13 +147,20 @@
             OUString (RTL_CONSTASCII_USTRINGPARAM("")),
             static_cast<beans::XPropertyChangeListener*>(this));
 
+    // Register this object as dispose event listener at the controller.
+	if (mxController.is())
+		mxController->addEventListener (
+            static_cast<awt::XWindowListener*>(this));
+
     // Register at VCL Window to be informed of activated and deactivated
     // OLE objects.
     Window* pWindow = maShapeTreeInfo.GetWindow();
-    if (pWindow != NULL)
+    if (pWindow)
     {
-        pWindow->AddChildEventListener (LINK(
-            this, AccessibleDocumentViewBase, WindowChildEventListener));
+        maWindowLink = LINK(
+            this, AccessibleDocumentViewBase, WindowChildEventListener);
+
+        pWindow->AddChildEventListener (maWindowLink);
 
         USHORT nCount = pWindow->GetChildCount();
         for (sal_uInt16 i=0; i<nCount; i++)
@@ -191,12 +196,10 @@
                 Window* pWindow = maShapeTreeInfo.GetWindow();
                 Window* pDyingWindow = static_cast<Window*>(
                     pWindowEvent->GetWindow());
-                if (pWindow==pDyingWindow && pWindow!=NULL)
+                if (pWindow==pDyingWindow && pWindow!=NULL && maWindowLink.IsSet())
                 {
-                    pWindow->RemoveChildEventListener (LINK(
-                        this, 
-                        AccessibleDocumentViewBase, 
-                        WindowChildEventListener));
+                    pWindow->RemoveChildEventListener (maWindowLink);
+                    maWindowLink = Link();
                 }
             }
             break;
@@ -542,8 +545,57 @@
 	return aTypeList;
 }
 
+void AccessibleDocumentViewBase::impl_dispose()
+{
+    // Unregister from VCL Window.
+    if (maWindowLink.IsSet())
+    {
+        Window* pWindow = maShapeTreeInfo.GetWindow();
+        if (pWindow)
+            pWindow->RemoveChildEventListener (maWindowLink);
+        maWindowLink = Link();
+    }
+    else
+    {
+        DBG_ASSERT (pWindow, "AccessibleDocumentViewBase::disposing");
+    }
 
+    // Unregister from window.
+    if (mxWindow.is())
+    {
+        mxWindow->removeWindowListener (this);
+        mxWindow->removeFocusListener (this);
+        mxWindow = NULL;
+    }
+
+    // Unregister form the model.
+    if (mxModel.is())
+        mxModel->removeEventListener (
+            static_cast<awt::XWindowListener*>(this));
+
+    // Unregister from the controller.
+    if (mxController.is())
+    {
+    	uno::Reference<beans::XPropertySet> xSet (mxController, uno::UNO_QUERY);
+	    if (xSet.is())
+	        xSet->removePropertyChangeListener (
+	            OUString (RTL_CONSTASCII_USTRINGPARAM("")),
+	            static_cast<beans::XPropertyChangeListener*>(this));
+
+        mxController->removeEventListener (
+            static_cast<awt::XWindowListener*>(this));
+    }
+
+    // Propagate change of controller down the shape tree.
+    maShapeTreeInfo.SetControllerBroadcaster (NULL);
 
+    // Reset the model reference.
+    mxModel = NULL;
+    // Reset the model reference.
+    mxController = NULL;
+
+    maShapeTreeInfo.SetDocumentWindow (NULL);
+}
 
 //=====  XEventListener  ======================================================
 
@@ -560,32 +612,10 @@
     {
         // Paranoia. Can this really happen?
     }
-    else if (rEventObject.Source == mxModel)
+    else if (rEventObject.Source == mxModel || rEventObject.Source == mxController)
     {
         ::osl::Guard< ::osl::Mutex> aGuard (::osl::Mutex::getGlobalMutex());
-
-        mxModel->removeEventListener (
-            static_cast<awt::XWindowListener*>(this));
-
-        // Reset the model reference.
-        mxModel = NULL;
-
-        // Propagate change of controller down the shape tree.
-        maShapeTreeInfo.SetControllerBroadcaster (NULL);
-    }
-    else if (rEventObject.Source == mxController)
-    {
-        ::osl::Guard< ::osl::Mutex> aGuard (::osl::Mutex::getGlobalMutex());
-
-        // Unregister as property change listener at the controller.
-        uno::Reference<beans::XPropertySet> xSet (mxController,uno::UNO_QUERY);
-        if (xSet.is())
-            xSet->removePropertyChangeListener (
-                OUString (RTL_CONSTASCII_USTRINGPARAM("")),
-                static_cast<beans::XPropertyChangeListener*>(this));
-
-        // Reset the model reference.
-        mxController = NULL;
+        impl_dispose();
     }
 }
 
@@ -688,36 +718,7 @@
 // This method is called from the component helper base class while disposing.
 void SAL_CALL AccessibleDocumentViewBase::disposing (void)
 {
-    // Unregister from VCL Window.
-	Window* pWindow = maShapeTreeInfo.GetWindow();
-    if (pWindow != NULL)
-	{
-		pWindow->RemoveChildEventListener (LINK(
-            this, AccessibleDocumentViewBase, WindowChildEventListener));
-    }
-    else
-    {
-        DBG_ASSERT (pWindow, "AccessibleDocumentViewBase::disposing");
-    }
-
-    // Unregister from window.
-    if (mxWindow.is())
-    {
-        mxWindow->removeWindowListener (this);
-        mxWindow->removeFocusListener (this);
-    }
-
-    // Unregister form the model.
-	if (mxModel.is())
-		mxModel->removeEventListener (
-            static_cast<awt::XWindowListener*>(this));
-
-    // Unregister from the controller.
-    uno::Reference<beans::XPropertySet> xSet (mxController, uno::UNO_QUERY);
-    if (xSet.is())
-        xSet->removePropertyChangeListener (
-            OUString (RTL_CONSTASCII_USTRINGPARAM("")),
-            static_cast<beans::XPropertyChangeListener*>(this));
+    impl_dispose();
 
     AccessibleContextBase::disposing ();
 }
Index: source/ui/accessibility/AccessibleDrawDocumentView.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx,v
retrieving revision 1.30
diff -u -r1.30 AccessibleDrawDocumentView.cxx
--- openoffice.org.orig/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx	7 Jul 2008 14:21:10 -0000	1.30
+++ openoffice.org/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx	16 Sep 2008 08:02:46 -0000
@@ -664,6 +666,16 @@
 }
 
 
+void AccessibleDrawDocumentView::impl_dispose()
+{
+    if (mpChildrenManager != NULL)
+    {
+        delete mpChildrenManager;
+        mpChildrenManager = NULL;
+    }
+
+    AccessibleDocumentViewBase::impl_dispose();
+}
 
 
 /** This method is called from the component helper base class while
Index: source/ui/inc/AccessibleDocumentViewBase.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/inc/AccessibleDocumentViewBase.hxx,v
retrieving revision 1.13
diff -u -r1.13 AccessibleDocumentViewBase.hxx
--- openoffice.org.orig/sd/source/ui/inc/AccessibleDocumentViewBase.hxx	10 Apr 2008 20:33:06 -0000	1.13
+++ openoffice.org/sd/source/ui/inc/AccessibleDocumentViewBase.hxx	16 Sep 2008 08:02:47 -0000
@@ -257,7 +257,6 @@
         throw (::com::sun::star::uno::RuntimeException); 
 
 private:
-
     // return the member maMutex;
     virtual ::osl::Mutex& 
         implGetMutex();
@@ -306,6 +305,8 @@
         ::com::sun::star::accessibility::XAccessible> 
         mxAccessibleOLEObject;
 
+    Link maWindowLink;
+
     // This method is called from the component helper base class while
     // disposing.
     virtual void SAL_CALL disposing (void);
@@ -362,6 +363,8 @@
     virtual void SetAccessibleOLEObject (
         const ::com::sun::star::uno::Reference <
         ::com::sun::star::accessibility::XAccessible>& xOLEObject);
+
+    virtual void impl_dispose();
 };
 
 } // end of namespace accessibility
Index: source/ui/inc/AccessibleDrawDocumentView.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/inc/AccessibleDrawDocumentView.hxx,v
retrieving revision 1.12
diff -u -r1.12 AccessibleDrawDocumentView.hxx
--- openoffice.org.orig/sd/source/ui/inc/AccessibleDrawDocumentView.hxx	10 Apr 2008 20:33:23 -0000	1.12
+++ openoffice.org/sd/source/ui/inc/AccessibleDrawDocumentView.hxx	16 Sep 2008 08:02:47 -0000
@@ -164,6 +164,8 @@
         change event indicating that it has lost the focus.
     */
     virtual void Deactivated (void);
+
+    virtual void impl_dispose();
 };
 
 } // end of namespace accessibility
Index: source/ui/unoidl/DrawController.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/unoidl/DrawController.cxx,v
retrieving revision 1.27
diff -u -r1.27 DrawController.cxx
--- openoffice.org.orig/sd/source/ui/unoidl/DrawController.cxx	7 Jul 2008 14:22:34 -0000	1.27
+++ openoffice.org/sd/source/ui/unoidl/DrawController.cxx	16 Sep 2008 08:02:48 -0000
@@ -316,8 +316,8 @@
     const Reference< view::XSelectionChangeListener >& xListener ) 
     throw(RuntimeException)
 {
-	if( mbDisposing )
-		throw lang::DisposedException();
+        if( rBHelper.bDisposed )
+                throw lang::DisposedException();
 
 	BroadcastHelperOwner::maBroadcastHelper.removeListener (saSelectionTypeIdentifier, xListener);
 }
Index: source/accessibility/ChildrenManagerImpl.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/accessibility/ChildrenManagerImpl.cxx,v
retrieving revision 1.41
diff -u -r1.41 ChildrenManagerImpl.cxx
--- openoffice.org.orig/svx/source/accessibility/ChildrenManagerImpl.cxx	24 Jun 2008 16:38:48 -0000	1.41
+++ openoffice.org/svx/source/accessibility/ChildrenManagerImpl.cxx	16 Sep 2008 08:13:52 -0000
@@ -45,6 +45,8 @@
 #include <rtl/ustring.hxx>
 #include <tools/debug.hxx>
 
+#include <stdio.h>
+
 using namespace ::com::sun::star;
 using namespace	::com::sun::star::accessibility;
 using ::com::sun::star::uno::Reference;
@@ -77,8 +79,9 @@
       mxParent (rxParent),
       maShapeTreeInfo (rShapeTreeInfo),
       mrContext (rContext),
-      mnNewNameIndex(1)
+      mnNewNameIndex(1),
+      mpFocusedShape(NULL)
 {
 }
 
 
@@ -95,12 +101,19 @@
 
 void ChildrenManagerImpl::Init (void)
 {
+
     // Register as view::XSelectionChangeListener.
+    Reference<frame::XController> xController(maShapeTreeInfo.GetController());
     Reference<view::XSelectionSupplier> xSelectionSupplier (
-        maShapeTreeInfo.GetController(), uno::UNO_QUERY);
+        xController, uno::UNO_QUERY);
     if (xSelectionSupplier.is())
+    {
+        xController->addEventListener(
+            static_cast<document::XEventListener*>(this));
+
         xSelectionSupplier->addSelectionChangeListener (
             static_cast<view::XSelectionChangeListener*>(this));
+    }
 
     // Register at model as document::XEventListener.
     if (maShapeTreeInfo.GetModelBroadcaster().is())
@@ -217,26 +230,46 @@
     Rectangle aVisibleArea = maShapeTreeInfo.GetViewForwarder()->GetVisibleArea();
 
     // 1. Create a local list of visible shapes.
-    ChildDescriptorListType aNewChildList;
-    CreateListOfVisibleShapes (aNewChildList);
-
-    // 2. Find all shapes in the current list that are not in the new list,
-    // send appropriate events and remove the accessible shape.
-    RemoveNonVisibleChildren (aNewChildList);
+    ChildDescriptorListType aChildList;
+    CreateListOfVisibleShapes (aChildList);
 
-    // 3. Merge the information that is already known about the visible
+    // 2. Merge the information that is already known about the visible
     // shapes from the current list into the new list.
-    MergeAccessibilityInformation (aNewChildList);
+    MergeAccessibilityInformation (aChildList);
 
-    // 4. Replace the current list of visible shapes with the new one.  Do
+    // 3. Replace the current list of visible shapes with the new one.  Do
     // the same with the visible area.
     {
         ::osl::MutexGuard aGuard (maMutex);
-		adjustIndexInParentOfShapes(aNewChildList);
+	adjustIndexInParentOfShapes(aChildList);
 
         // Use swap to copy the contents of the new list in constant time.
-        maVisibleChildren.swap (aNewChildList);
-        aNewChildList.clear();
+        maVisibleChildren.swap (aChildList);
+
+        // aChildList now contains all the old children, while maVisibleChildren
+        // contains all the current children
+
+        // 4. Find all shapes in the old list that are not in the current list,
+        // send appropriate events and remove the accessible shape.
+        //
+        // Do this *after* we have set our new list of children, because
+        // removing a child may cause
+        //
+        // ChildDescriptor::disposeAccessibleObject -->
+        // AccessibleContextBase::CommitChange -->
+        // AtkListener::notifyEvent ->
+        // AtkListener::handleChildRemoved ->
+        // AtkListener::updateChildList
+        // AccessibleDrawDocumentView::getAccessibleChildCount ->
+        // ChildrenManagerImpl::GetChildCount ->
+        // maVisibleChildren.size()
+        //
+        // to be fired, and so the operations will take place on
+        // the list we are trying to replace
+        //
+        RemoveNonVisibleChildren (maVisibleChildren, aChildList);
+
+        aChildList.clear();
 
         maVisibleArea = aVisibleArea;
     }
@@ -318,15 +351,15 @@
 
 
 void ChildrenManagerImpl::RemoveNonVisibleChildren (
-    ChildDescriptorListType& raNewChildList)
+    const ChildDescriptorListType& rNewChildList, ChildDescriptorListType& rOldChildList)
 {
     // Iterate over list of formerly visible children and remove those that
     // are not visible anymore, i.e. member of the new list of visible
     // children.
-    ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end();
-    for (I=maVisibleChildren.begin(); I != aEnd; ++I)
+    ChildDescriptorListType::iterator I, aEnd = rOldChildList.end();
+    for (I=rOldChildList.begin(); I != aEnd; ++I)
     {
-        if (::std::find(raNewChildList.begin(), raNewChildList.end(), *I) == raNewChildList.end())
+        if (::std::find(rNewChildList.begin(), rNewChildList.end(), *I) == rNewChildList.end())
         {
             // The child is disposed when there is a UNO shape from which
             // the accessible shape can be created when the shape becomes
@@ -573,12 +606,14 @@
 {
     // Remember the current broadcasters and exchange the shape tree info.
     Reference<document::XEventBroadcaster> xCurrentBroadcaster;
+    Reference<frame::XController> xCurrentController;
     Reference<view::XSelectionSupplier> xCurrentSelectionSupplier;
     {
         ::osl::MutexGuard aGuard (maMutex);
         xCurrentBroadcaster = maShapeTreeInfo.GetModelBroadcaster();
+        xCurrentController = maShapeTreeInfo.GetController();
         xCurrentSelectionSupplier = Reference<view::XSelectionSupplier> (
-            maShapeTreeInfo.GetController(), uno::UNO_QUERY);
+            xCurrentController, uno::UNO_QUERY);
         maShapeTreeInfo = rShapeTreeInfo;
     }
 
@@ -597,19 +632,30 @@
     }
 
     // Move registration to new selection supplier.
+    Reference<frame::XController> xNewController(maShapeTreeInfo.GetController());
     Reference<view::XSelectionSupplier> xNewSelectionSupplier (
-            maShapeTreeInfo.GetController(), uno::UNO_QUERY);
+            xNewController, uno::UNO_QUERY);
     if (xNewSelectionSupplier != xCurrentSelectionSupplier)
     {
         // Register at new broadcaster.
         if (xNewSelectionSupplier.is())
+        {
+            xNewController->addEventListener(
+                static_cast<document::XEventListener*>(this));
+
             xNewSelectionSupplier->addSelectionChangeListener (
                 static_cast<view::XSelectionChangeListener*>(this));
+        }
 
         // Unregister at old broadcaster.
         if (xCurrentSelectionSupplier.is())
+        {
             xCurrentSelectionSupplier->removeSelectionChangeListener (
                 static_cast<view::XSelectionChangeListener*>(this));
+
+            xCurrentController->removeEventListener(
+                static_cast<document::XEventListener*>(this));
+        }
     }
 }
 
@@ -622,22 +668,13 @@
     ChildrenManagerImpl::disposing (const lang::EventObject& rEventObject)
     throw (uno::RuntimeException)
 {
-    if (rEventObject.Source == maShapeTreeInfo.GetModelBroadcaster())
+    if (
+         rEventObject.Source == maShapeTreeInfo.GetModelBroadcaster() ||
+         rEventObject.Source == maShapeTreeInfo.GetController()
+       )
     {
-        maShapeTreeInfo.SetModelBroadcaster (NULL);
-        // The disposing of a model should be handled elsewhere.  But to be
-        // on the safe side we remove all of our children.
-        ClearAccessibleShapeList ();
-        SetShapeList (NULL);
+        impl_dispose();
     }
-
-    else if (rEventObject.Source
-        == Reference<view::XSelectionSupplier> (
-            maShapeTreeInfo.GetController(), uno::UNO_QUERY))
-    {
-        maShapeTreeInfo.SetController (NULL);
-    }
-
     // Handle disposing UNO shapes.
     else
     {
@@ -694,29 +731,47 @@
 }
 
 
+void ChildrenManagerImpl::impl_dispose()
+{
+    Reference<frame::XController> xController(maShapeTreeInfo.GetController());
+    // Remove from broadcasters.
+    try {
+        Reference<view::XSelectionSupplier> xSelectionSupplier (
+            xController, uno::UNO_QUERY);
+        if (xSelectionSupplier.is())
+        {
+            xSelectionSupplier->removeSelectionChangeListener (
+                static_cast<view::XSelectionChangeListener*>(this));
+        }
+    }
+    catch( uno::RuntimeException&) { }
 
+    try {
+        if (xController.is())
+            xController->removeEventListener(
+                static_cast<document::XEventListener*>(this));
+    } catch( uno::RuntimeException&) { }
 
-void SAL_CALL ChildrenManagerImpl::disposing (void)
-{
-	try
-	{
-	    // Remove from broadcasters.
-		Reference<view::XSelectionSupplier> xSelectionSupplier (
-			maShapeTreeInfo.GetController(), uno::UNO_QUERY);
-		if (xSelectionSupplier.is())
-			xSelectionSupplier->removeSelectionChangeListener (
-				static_cast<view::XSelectionChangeListener*>(this));
-
-		if (maShapeTreeInfo.GetModelBroadcaster().is())
-			maShapeTreeInfo.GetModelBroadcaster()->removeEventListener (
-				static_cast<document::XEventListener*>(this));
-	}
-	catch( uno::RuntimeException& )
-	{
-		// our XSelectionSupplier may be already disposed
-	}
+    maShapeTreeInfo.SetController (NULL);
+
+    try {
+        // Remove from broadcaster.
+        if (maShapeTreeInfo.GetModelBroadcaster().is())
+            maShapeTreeInfo.GetModelBroadcaster()->removeEventListener (
+                static_cast<document::XEventListener*>(this));
+        maShapeTreeInfo.SetModelBroadcaster (NULL);
+    }
+    catch( uno::RuntimeException& ) { }
 
     ClearAccessibleShapeList ();
+    SetShapeList (NULL);
+}
+
+
+
+void SAL_CALL ChildrenManagerImpl::disposing (void)
+{
+    impl_dispose();
 }
 
 
Index: source/accessibility/ChildrenManagerImpl.hxx
===================================================================
RCS file: /cvs/graphics/svx/source/accessibility/ChildrenManagerImpl.hxx,v
retrieving revision 1.24
diff -u -r1.24 ChildrenManagerImpl.hxx
--- openoffice.org.orig/svx/source/accessibility/ChildrenManagerImpl.hxx	24 Jun 2008 16:39:05 -0000	1.24
+++ openoffice.org/svx/source/accessibility/ChildrenManagerImpl.hxx	16 Sep 2008 08:13:52 -0000
@@ -378,6 +378,7 @@
         ::com::sun::star::accessibility::XAccessible>& xChild) const
         throw (::com::sun::star::uno::RuntimeException);
 
+    void impl_dispose();
 private:
     /** Names of new accessible objects are disambiguated with this index.
         It gets increased every time a new object is created and (at the
@@ -406,14 +407,18 @@
     */
     void CreateListOfVisibleShapes (ChildDescriptorListType& raChildList);
     
-    /** From the internal list of (former) visible shapes remove those that
-        are not member of the given list.  Send appropriate events for every
+    /** From the old list of (former) visible shapes remove those that
+        are not member of the new list.  Send appropriate events for every
         such shape.
-        @param raChildList
-            The new list of visible children against which the internal one
+        @param raNewChildList
+            The new list of visible children against which the old one
+            is compared.
+        @param raOldChildList
+            The old list of visible children against which the new one
             is compared.
     */
-    void RemoveNonVisibleChildren (ChildDescriptorListType& raChildList);
+    void RemoveNonVisibleChildren (const ChildDescriptorListType& raNewChildList, 
+        ChildDescriptorListType& raOldChildList);
 
     /** Merge the information that is already known about the visible shapes
         from the current list into the new list.
@@ -548,7 +553,7 @@
 		descriptor may be based on a UNO shape or, already, on an accessible
 		shape.
 	*/
-    inline bool operator == (const ChildDescriptor& aDescriptor)
+    inline bool operator == (const ChildDescriptor& aDescriptor) const
 	{
 		return (this == &aDescriptor || (mxShape.get() == aDescriptor.mxShape.get() ) && ( mxShape.is() || mxAccessibleShape.get() == aDescriptor.mxAccessibleShape.get()));
 	}
@@ -557,7 +562,7 @@
 		to put child descriptors in some STL containers.  The ordering itself is
 		not so important, its 'features' are not used.
 	*/
-    inline bool operator < (const ChildDescriptor& aDescriptor)
+    inline bool operator < (const ChildDescriptor& aDescriptor) const
 	{
 		return (mxShape.get() < aDescriptor.mxShape.get());
 	}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1649
retrieving revision 1.1650
diff -u -r1.1649 -r1.1650
--- openoffice.org.spec	15 Sep 2008 16:36:38 -0000	1.1649
+++ openoffice.org.spec	16 Sep 2008 08:43:13 -0000	1.1650
@@ -112,6 +112,7 @@
 Patch41: openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
 Patch42: workspace.cmcfixes50.patch
 Patch43: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
+Patch44: openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1310,6 +1311,7 @@
 %patch41 -p1 -b .ooo93419.svx.ref_deref.before.ctored.patch
 %patch42 -p1 -b .workspace.cmcfixes50.patch
 %patch43 -p1 -b .ooo93515.vcl.jrb-frames.patch
+%patch44 -p1 -b .ooo93419.svx.accessibity-loops.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`



From giallu at fedoraproject.org  Tue Sep 16 08:51:28 2008
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Tue, 16 Sep 2008 08:51:28 +0000 (UTC)
Subject: rpms/rawstudio/devel .cvsignore, 1.8, 1.9 rawstudio.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <20080916085128.873EC70138@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/rawstudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16884

Modified Files:
	.cvsignore rawstudio.spec sources 
Log Message:
* Tue Sep 16 2008 Gianluca Sforna <giallu gmail com> - 1.1-1
- new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rawstudio/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	1 May 2008 22:27:20 -0000	1.8
+++ .cvsignore	16 Sep 2008 08:50:58 -0000	1.9
@@ -1 +1 @@
-rawstudio-1.0.tar.gz
+rawstudio-1.1.tar.gz


Index: rawstudio.spec
===================================================================
RCS file: /cvs/extras/rpms/rawstudio/devel/rawstudio.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rawstudio.spec	5 May 2008 22:59:35 -0000	1.12
+++ rawstudio.spec	16 Sep 2008 08:50:58 -0000	1.13
@@ -1,16 +1,16 @@
 Name:           rawstudio 
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        Read, manipulate and convert digital camera raw images
 
 Group:          Applications/Multimedia 
 License:        GPLv2+
-URL:            http://www.rawstudio.org
-Source0:        http://www.rawstudio.org/files/release/%{name}-%{version}.tar.gz
+URL:            http://rawstudio.org
+Source0:        http://rawstudio.org/files/release/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, libxml2-devel, GConf2-devel, dbus-devel
-BuildRequires:  lcms-devel, libjpeg-devel, libtiff-devel
+BuildRequires:  lcms-devel, libjpeg-devel, libtiff-devel, exiv2-devel
 BuildRequires:  desktop-file-utils
 
 
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 Gianluca Sforna <giallu gmail com> - 1.1-1
+- new upstream release
+
 * Thu May  1 2008 Gianluca Sforna <giallu gmail com> - 1.0-1
 - new upstream release
 - drop upstreamed patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rawstudio/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 May 2008 22:27:20 -0000	1.8
+++ sources	16 Sep 2008 08:50:58 -0000	1.9
@@ -1 +1 @@
-26ddd38ccb5d74f7c7c6759dae13b7ad  rawstudio-1.0.tar.gz
+3cb765839c0f705dffa2ec1806a1eea3  rawstudio-1.1.tar.gz



From phuang at fedoraproject.org  Tue Sep 16 09:06:52 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 16 Sep 2008 09:06:52 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.10, 1.11 ibus.spec, 1.13, 1.14 sources,
	1.11, 1.12
Message-ID: <20080916090652.6519170138@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18698

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 0.1.1.20080916


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	14 Sep 2008 18:18:56 -0000	1.10
+++ .cvsignore	16 Sep 2008 09:06:22 -0000	1.11
@@ -1 +1 @@
-ibus-0.1.1.20080914.tar.gz
+ibus-0.1.1.20080916.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ibus.spec	14 Sep 2008 18:18:56 -0000	1.13
+++ ibus.spec	16 Sep 2008 09:06:22 -0000	1.14
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define mod_path ibus-0.1
 Name:       ibus
-Version:    0.1.1.20080914
+Version:    0.1.1.20080916
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -41,6 +41,7 @@
 Summary:    iBus im module for qt4
 Group:      System Environment/Libraries
 Requires:   %{name} = %{version}-%{release}
+Requires:   qt >= 4.4.1
 
 %description qt
 This package contains ibus im module for qt4
@@ -120,6 +121,9 @@
 %{_libdir}/qt4/plugins/inputmethods/libibus.so
 
 %changelog
+* Tue Sep 16 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080916-1
+- Update to 0.1.1.20080916.
+
 * Mon Sep 15 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080914-1
 - Update to 0.1.1.20080914.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Sep 2008 18:18:56 -0000	1.11
+++ sources	16 Sep 2008 09:06:22 -0000	1.12
@@ -1 +1 @@
-00cbad394930d17bce4df99e514fd7fd  ibus-0.1.1.20080914.tar.gz
+26b67d93ef1921af16b19a57993947dd  ibus-0.1.1.20080916.tar.gz



From phuang at fedoraproject.org  Tue Sep 16 09:13:46 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 16 Sep 2008 09:13:46 +0000 (UTC)
Subject: rpms/ibus/F-9 .cvsignore, 1.7, 1.8 ibus.spec, 1.9, 1.10 sources, 1.9,
	1.10
Message-ID: <20080916091346.AD0AD70138@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19322

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 0.1.1.20080916


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Sep 2008 18:29:07 -0000	1.7
+++ .cvsignore	16 Sep 2008 09:13:16 -0000	1.8
@@ -1 +1 @@
-ibus-0.1.1.20080914.tar.gz
+ibus-0.1.1.20080916.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/ibus.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ibus.spec	14 Sep 2008 18:29:07 -0000	1.9
+++ ibus.spec	16 Sep 2008 09:13:16 -0000	1.10
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define mod_path ibus-0.1
 Name:       ibus
-Version:    0.1.1.20080914
+Version:    0.1.1.20080916
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -41,6 +41,7 @@
 Summary:    iBus im module for qt4
 Group:      System Environment/Libraries
 Requires:   %{name} = %{version}-%{release}
+Requires:   qt >= 4.4.1
 
 %description qt
 This package contains ibus im module for qt4
@@ -120,6 +121,9 @@
 %{_libdir}/qt4/plugins/inputmethods/libibus.so
 
 %changelog
+* Tue Sep 16 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080916-1
+- Update to 0.1.1.20080916.
+
 * Mon Sep 15 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080914-1
 - Update to 0.1.1.20080914.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Sep 2008 18:29:07 -0000	1.9
+++ sources	16 Sep 2008 09:13:16 -0000	1.10
@@ -1 +1 @@
-00cbad394930d17bce4df99e514fd7fd  ibus-0.1.1.20080914.tar.gz
+26b67d93ef1921af16b19a57993947dd  ibus-0.1.1.20080916.tar.gz



From giallu at fedoraproject.org  Tue Sep 16 10:08:58 2008
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Tue, 16 Sep 2008 10:08:58 +0000 (UTC)
Subject: rpms/rawstudio/F-9 .cvsignore, 1.8, 1.9 rawstudio.spec, 1.11,
	1.12 sources, 1.8, 1.9
Message-ID: <20080916100858.BC5DE70138@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/rawstudio/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26592

Modified Files:
	.cvsignore rawstudio.spec sources 
Log Message:
* Tue Sep 16 2008 Gianluca Sforna <giallu gmail com> - 1.1-1
- new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rawstudio/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	5 May 2008 23:17:06 -0000	1.8
+++ .cvsignore	16 Sep 2008 10:08:28 -0000	1.9
@@ -1 +1 @@
-rawstudio-1.0.tar.gz
+rawstudio-1.1.tar.gz


Index: rawstudio.spec
===================================================================
RCS file: /cvs/extras/rpms/rawstudio/F-9/rawstudio.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rawstudio.spec	5 May 2008 23:17:06 -0000	1.11
+++ rawstudio.spec	16 Sep 2008 10:08:28 -0000	1.12
@@ -1,16 +1,16 @@
 Name:           rawstudio 
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        Read, manipulate and convert digital camera raw images
 
 Group:          Applications/Multimedia 
 License:        GPLv2+
-URL:            http://www.rawstudio.org
-Source0:        http://www.rawstudio.org/files/release/%{name}-%{version}.tar.gz
+URL:            http://rawstudio.org
+Source0:        http://rawstudio.org/files/release/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, libxml2-devel, GConf2-devel, dbus-devel
-BuildRequires:  lcms-devel, libjpeg-devel, libtiff-devel
+BuildRequires:  lcms-devel, libjpeg-devel, libtiff-devel, exiv2-devel
 BuildRequires:  desktop-file-utils
 
 
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 Gianluca Sforna <giallu gmail com> - 1.1-1
+- new upstream release
+
 * Thu May  1 2008 Gianluca Sforna <giallu gmail com> - 1.0-1
 - new upstream release
 - drop upstreamed patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rawstudio/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 May 2008 23:17:06 -0000	1.8
+++ sources	16 Sep 2008 10:08:28 -0000	1.9
@@ -1 +1 @@
-26ddd38ccb5d74f7c7c6759dae13b7ad  rawstudio-1.0.tar.gz
+3cb765839c0f705dffa2ec1806a1eea3  rawstudio-1.1.tar.gz



From pkgdb at fedoraproject.org  Tue Sep 16 10:25:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 10:25:40 +0000
Subject: [pkgdb] python-libgmail had acl change status
Message-ID: <20080916102540.70D81208D9F@bastion.fedora.phx.redhat.com>

turki has set the watchcommits acl on python-libgmail (Fedora devel) to Approved for mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-libgmail



From giallu at fedoraproject.org  Tue Sep 16 10:27:09 2008
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Tue, 16 Sep 2008 10:27:09 +0000 (UTC)
Subject: rpms/rawstudio/F-8 .cvsignore, 1.8, 1.9 rawstudio.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <20080916102709.9A7AC70138@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/rawstudio/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28572

Modified Files:
	.cvsignore rawstudio.spec sources 
Log Message:
* Tue Sep 16 2008 Gianluca Sforna <giallu gmail com> - 1.1-1
- new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rawstudio/F-8/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 May 2008 09:26:17 -0000	1.8
+++ .cvsignore	16 Sep 2008 10:26:39 -0000	1.9
@@ -1 +1 @@
-rawstudio-1.0.tar.gz
+rawstudio-1.1.tar.gz


Index: rawstudio.spec
===================================================================
RCS file: /cvs/extras/rpms/rawstudio/F-8/rawstudio.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rawstudio.spec	13 May 2008 09:26:17 -0000	1.10
+++ rawstudio.spec	16 Sep 2008 10:26:39 -0000	1.11
@@ -1,16 +1,16 @@
 Name:           rawstudio 
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        Read, manipulate and convert digital camera raw images
 
 Group:          Applications/Multimedia 
 License:        GPLv2+
-URL:            http://www.rawstudio.org
-Source0:        http://www.rawstudio.org/files/release/%{name}-%{version}.tar.gz
+URL:            http://rawstudio.org
+Source0:        http://rawstudio.org/files/release/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, libxml2-devel, GConf2-devel, dbus-devel
-BuildRequires:  lcms-devel, libjpeg-devel, libtiff-devel
+BuildRequires:  lcms-devel, libjpeg-devel, libtiff-devel, exiv2-devel
 BuildRequires:  desktop-file-utils
 
 
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 Gianluca Sforna <giallu gmail com> - 1.1-1
+- new upstream release
+
 * Thu May  1 2008 Gianluca Sforna <giallu gmail com> - 1.0-1
 - new upstream release
 - drop upstreamed patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rawstudio/F-8/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 May 2008 09:26:17 -0000	1.8
+++ sources	16 Sep 2008 10:26:39 -0000	1.9
@@ -1 +1 @@
-26ddd38ccb5d74f7c7c6759dae13b7ad  rawstudio-1.0.tar.gz
+3cb765839c0f705dffa2ec1806a1eea3  rawstudio-1.1.tar.gz



From caolanm at fedoraproject.org  Tue Sep 16 10:45:29 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 16 Sep 2008 10:45:29 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.cmcfixes50.patch,1.3,1.4
Message-ID: <20080916104529.D9E5970138@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30877

Modified Files:
	workspace.cmcfixes50.patch 
Log Message:
rats, missing bit

workspace.cmcfixes50.patch:

Index: workspace.cmcfixes50.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes50.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.cmcfixes50.patch	16 Sep 2008 07:39:00 -0000	1.3
+++ workspace.cmcfixes50.patch	16 Sep 2008 10:44:59 -0000	1.4
@@ -518,3 +518,90 @@
    else
       AC_MSG_RESULT([internal])
       AC_MSG_CHECKING([for jfreereport module])
+Index: util/makefile.mk
+===================================================================
+RCS file: /cvs/dba/reportbuilder/util/makefile.mk,v
+retrieving revision 1.1.1.1
+diff -u -r1.1.1.1 makefile.mk
+--- openoffice.org.orig/reportbuilder/util/makefile.mk	12 Aug 2008 14:14:14 -0000	1.1.1.1
++++ openoffice.org/reportbuilder/util/makefile.mk	16 Sep 2008 10:43:14 -0000
+@@ -68,18 +68,18 @@
+ 
+ # .jar files from solver
+ COMPONENT_EXTJARFILES = \
+-	$(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar							\
+-	$(EXTENSIONDIR)$/jcommon-1.0.10.jar										\
+-	$(EXTENSIONDIR)$/jcommon-serializer-0.2.0.jar							\
+-	$(EXTENSIONDIR)$/libfonts-0.3.3.jar										\
+-	$(EXTENSIONDIR)$/libformula-0.1.14.jar									\
+-	$(EXTENSIONDIR)$/liblayout-0.2.8.jar										\
+-	$(EXTENSIONDIR)$/libloader-0.3.6.jar										\
+-	$(EXTENSIONDIR)$/librepository-0.1.4.jar									\
+-	$(EXTENSIONDIR)$/libxml-0.9.9.jar										\
+-	$(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar					\
+-	$(EXTENSIONDIR)$/sac.jar                                                \
+-	$(EXTENSIONDIR)$/sun-report-builder.jar \
++	$(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar				\
++	$(EXTENSIONDIR)$/jcommon-1.0.10.jar							\
++	$(EXTENSIONDIR)$/jcommon-serializer-0.2.0.jar				\
++	$(EXTENSIONDIR)$/libfonts-0.3.3.jar							\
++	$(EXTENSIONDIR)$/libformula-0.1.14.jar						\
++	$(EXTENSIONDIR)$/liblayout-0.2.8.jar						\
++	$(EXTENSIONDIR)$/libloader-0.3.6.jar						\
++	$(EXTENSIONDIR)$/librepository-0.1.4.jar					\
++	$(EXTENSIONDIR)$/libxml-0.9.9.jar							\
++	$(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar 	\
++	$(EXTENSIONDIR)$/sac.jar                                 	\
++	$(EXTENSIONDIR)$/sun-report-builder.jar 					\
+ 	$(EXTENSIONDIR)$/reportbuilderwizard.jar
+ 
+ COMPONENT_MANIFEST_GENERIC:=TRUE
+@@ -95,7 +95,47 @@
+ .INCLUDE : extension_post.mk
+ 
+ .IF "$(SYSTEM_JFREEREPORT)" == "YES"
+-$(EXTENSIONDIR)$/%.jar : $(JFREEREPORT_JAR:d:d)$/%.jar
++$(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar : $(FLUTE_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/jcommon-1.0.10.jar : $(JCOMMON_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/jcommon-serializer-0.2.0.jar : $(JCOMMON_SERIALIZER_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/libfonts-0.3.3.jar : $(LIBFONTS_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/libformula-0.1.14.jar : $(LIBFORMULA_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/liblayout-0.2.8.jar : $(LIBLAYOUT_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/libloader-0.3.6.jar : $(LIBLOADER_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/librepository-0.1.4.jar : $(LIBREPOSITORY_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/libxml-0.9.9.jar : $(LIBXML_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar : $(JFREEREPORT_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/sac.jar : $(SAC_JAR)
+ 	@@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+ .ELSE



From caolanm at fedoraproject.org  Tue Sep 16 10:53:02 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 16 Sep 2008 10:53:02 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch,
	NONE, 1.1 openoffice.org.spec, 1.1650, 1.1651
Message-ID: <20080916105302.1F86870138@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31924

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch 
Log Message:
add openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch

openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch:

--- NEW FILE openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch ---
Index: source/filter/ww8/writerwordglue.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/writerwordglue.cxx,v
retrieving revision 1.25.126.1
diff -u -r1.25.126.1 writerwordglue.cxx
--- openoffice.org.orig/sw/source/filter/ww8/writerwordglue.cxx	17 Jan 2008 16:06:53 -0000	1.25.126.1
+++ openoffice.org/sw/source/filter/ww8/writerwordglue.cxx	16 Sep 2008 10:31:12 -0000
@@ -821,15 +823,18 @@
         {
             sal_uInt8 nRet =
                 rtl_getBestWindowsCharsetFromTextEncoding(eTextEncoding);
-            if (eTextEncoding == RTL_TEXTENCODING_UCS2)
-            {
-                ASSERT(nRet != 0x80, "This method may be redundant");
-                nRet = 0x80;
-            }
-            else if (eTextEncoding == RTL_TEXTENCODING_DONTKNOW)
+            switch (eTextEncoding)
             {
-                ASSERT(nRet != 0x80, "This method may be redundant");
-                nRet = 0x80;
+            	case RTL_TEXTENCODING_DONTKNOW:
+            	case RTL_TEXTENCODING_UCS2:
+            	case RTL_TEXTENCODING_UTF7:
+            	case RTL_TEXTENCODING_UTF8:
+            	case RTL_TEXTENCODING_JAVA_UTF8:
+                    ASSERT(nRet != 0x80, "This method may be redundant");
+                    nRet = 0x80;
+            	    break;
+            	default:
+            	    break;
             }
             return nRet;
         }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1650
retrieving revision 1.1651
diff -u -r1.1650 -r1.1651
--- openoffice.org.spec	16 Sep 2008 08:43:13 -0000	1.1650
+++ openoffice.org.spec	16 Sep 2008 10:52:31 -0000	1.1651
@@ -113,6 +113,7 @@
 Patch42: workspace.cmcfixes50.patch
 Patch43: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
 Patch44: openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch
+Patch45: openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1312,6 +1313,7 @@
 %patch42 -p1 -b .workspace.cmcfixes50.patch
 %patch43 -p1 -b .ooo93515.vcl.jrb-frames.patch
 %patch44 -p1 -b .ooo93419.svx.accessibity-loops.patch
+%patch45 -p1 -b .ooo93949.sw.better_rtf_encodings.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`



From varekova at fedoraproject.org  Tue Sep 16 10:56:47 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 16 Sep 2008 10:56:47 +0000 (UTC)
Subject: rpms/logwatch/F-9 logwatch-7.3.6-logrotate.patch, NONE,
	1.1 logwatch.spec, 1.92, 1.93
Message-ID: <20080916105647.4F62F70138@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/logwatch/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32329

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-logrotate.patch 
Log Message:
- fix logrotate x logwatch compatibility problem
  (#458580)


logwatch-7.3.6-logrotate.patch:

--- NEW FILE logwatch-7.3.6-logrotate.patch ---
diff -up logwatch-7.3.6/conf/logfiles/tac_acc.conf.pom logwatch-7.3.6/conf/logfiles/tac_acc.conf
--- logwatch-7.3.6/conf/logfiles/tac_acc.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/tac_acc.conf	2008-08-15 10:45:26.000000000 +0200
@@ -5,6 +5,7 @@ LogFile = tac_acc.log
 # (optionally containing wildcards) that tell where they are...
 #If you use a "-" in naming add that as well -mgt
 Archive = tac_acc.log.*
+Archive = tac_acc.log-*
 
 # Keep only the lines in the proper date range...
 *ApplyStdDate
diff -up logwatch-7.3.6/conf/logfiles/extreme-networks.conf.pom logwatch-7.3.6/conf/logfiles/extreme-networks.conf
--- logwatch-7.3.6/conf/logfiles/extreme-networks.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/extreme-networks.conf	2008-08-15 10:18:58.000000000 +0200
@@ -18,6 +18,7 @@ LogFile = extreme-networks.log
 # If the archives are searched, here is one or more line
 # (optionally containing wildcards) that tell where they are...
 Archive = extreme-networks.log.*
+Archive = extreme-networks.log-*
 
 # Expand the repeats (actually just removes them now)
 #*ExpandRepeats
diff -up logwatch-7.3.6/conf/logfiles/cisco.conf.pom logwatch-7.3.6/conf/logfiles/cisco.conf
--- logwatch-7.3.6/conf/logfiles/cisco.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/cisco.conf	2008-08-15 13:26:31.000000000 +0200
@@ -18,6 +18,7 @@ LogFile = cisco.log
 # If the archives are searched, here is one or more line
 # (optionally containing wildcards) that tell where they are...
 Archive = cisco.log.*
+Archive = cisco.log-*
 
 # Expand the repeats (actually just removes them now)
 #*ExpandRepeats
diff -up logwatch-7.3.6/conf/logfiles/netscreen.conf.pom logwatch-7.3.6/conf/logfiles/netscreen.conf
--- logwatch-7.3.6/conf/logfiles/netscreen.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/netscreen.conf	2008-08-15 10:29:59.000000000 +0200
@@ -19,6 +19,7 @@ LogFile = netscreen.log
 # (optionally containing wildcards) that tell where they are...
 #If you use a "-" in naming add that as well -mgt
 Archive = netscreen.log.*
+Archive = netscreen.log-*
 
 # Expand the repeats (actually just removes them now)
 #*ExpandRepeats
diff -up logwatch-7.3.6/conf/logfiles/qmail-pop3ds-current.conf.pom logwatch-7.3.6/conf/logfiles/qmail-pop3ds-current.conf
diff -up logwatch-7.3.6/conf/logfiles/secure.conf.pom logwatch-7.3.6/conf/logfiles/secure.conf
--- logwatch-7.3.6/conf/logfiles/secure.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/secure.conf	2008-08-15 10:33:10.000000000 +0200
@@ -23,6 +23,11 @@ Archive = secure.*
 Archive = archiv/secure.*
 Archive = authlog.*
 Archive = auth.log.*.gz
+Archive = secure-*
+Archive = archiv/secure-*
+Archive = authlog-*
+Archive = auth.log-*.gz
+
 
 # Expand the repeats (actually just removes them now)
 *ExpandRepeats
diff -up logwatch-7.3.6/conf/logfiles/syslog.conf.pom logwatch-7.3.6/conf/logfiles/syslog.conf
--- logwatch-7.3.6/conf/logfiles/syslog.conf.pom	2006-03-21 04:01:34.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/syslog.conf	2008-08-15 10:45:13.000000000 +0200
@@ -14,6 +14,7 @@ Archive = 
 LogFile = syslog
 LogFile = syslog.0
 Archive = syslog.*.gz
+Archive = syslog-*.gz
 *ExpandRepeats
 *RemoveService = talkd
 *RemoveService = telnetd
diff -up logwatch-7.3.6/conf/logfiles/clam-update.conf.pom logwatch-7.3.6/conf/logfiles/clam-update.conf
--- logwatch-7.3.6/conf/logfiles/clam-update.conf.pom	2005-10-31 17:21:20.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/clam-update.conf	2008-08-15 09:54:27.000000000 +0200
@@ -53,5 +53,10 @@ Archive = freshclam.log.*
 Archive = clamav/freshclam.log.*
 Archive = archiv/clam-update.*
 Archive = archiv/freshclam.log.*
+Archive = clam-update-*
+Archive = freshclam.log-*
+Archive = clamav/freshclam.log-*
+Archive = archiv/clam-update-*
+Archive = archiv/freshclam.log-*
 
 # vi: shiftwidth=3 tabstop=3 et
diff -up logwatch-7.3.6/conf/logfiles/emerge.conf.pom logwatch-7.3.6/conf/logfiles/emerge.conf
--- logwatch-7.3.6/conf/logfiles/emerge.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/emerge.conf	2008-08-15 10:02:51.000000000 +0200
@@ -18,6 +18,7 @@ LogFile = emerge.log
 # (optionally containing wildcards) that tell where they are...
 #If you use a "-" in naming add that as well -mgt
 Archive = emerge.log.*
+Archive = emerge.log-*
 
 #*ApplyUSDate
 
diff -up logwatch-7.3.6/conf/logfiles/resolver.conf.pom logwatch-7.3.6/conf/logfiles/resolver.conf
diff -up logwatch-7.3.6/conf/logfiles/daemon.conf.pom logwatch-7.3.6/conf/logfiles/daemon.conf
--- logwatch-7.3.6/conf/logfiles/daemon.conf.pom	2006-03-21 04:01:34.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/daemon.conf	2008-08-15 09:57:00.000000000 +0200
@@ -12,6 +12,8 @@
 LogFile = daemon.log
 LogFile = daemon.log.0
 Archive = daemon.log.*.gz
+Archive = daemon.log-*.gz
+
 *ExpandRepeats
 *OnlyHost
 *ApplyStdDate
diff -up logwatch-7.3.6/conf/logfiles/netopia.conf.pom logwatch-7.3.6/conf/logfiles/netopia.conf
--- logwatch-7.3.6/conf/logfiles/netopia.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/netopia.conf	2008-08-15 10:29:49.000000000 +0200
@@ -19,6 +19,7 @@ LogFile = netopia.log
 # (optionally containing wildcards) that tell where they are...
 #If you use a "-" in naming add that as well -mgt
 Archive = netopia.log.*
+Archive = netopia.log-*
 
 # Expand the repeats (actually just removes them now)
 #*ExpandRepeats
diff -up logwatch-7.3.6/conf/logfiles/qmail-smtpd-current.conf.pom logwatch-7.3.6/conf/logfiles/qmail-smtpd-current.conf
diff -up logwatch-7.3.6/conf/logfiles/xferlog.conf.pom logwatch-7.3.6/conf/logfiles/xferlog.conf
--- logwatch-7.3.6/conf/logfiles/xferlog.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/xferlog.conf	2008-08-15 12:39:03.000000000 +0200
@@ -18,5 +18,7 @@ LogFile = xferlog
 #If you use a "-" in naming add that as well -mgt
 Archive = xferlog.*
 Archive = archiv/xferlog.*
+Archive = xferlog-* 
+Archive = archiv/xferlog-*
 
 # vi: shiftwidth=3 tabstop=3 et
diff -up logwatch-7.3.6/conf/logfiles/fail2ban.conf.pom logwatch-7.3.6/conf/logfiles/fail2ban.conf
--- logwatch-7.3.6/conf/logfiles/fail2ban.conf.pom	2006-12-15 05:53:39.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/fail2ban.conf	2008-08-15 12:44:41.000000000 +0200
@@ -28,4 +28,5 @@ LogFile = fail2ban.log
 
 Archive = fail2ban.log.1
 Archive = fail2ban.log.*.gz
+Archive = fail2ban.log-*
 
diff -up logwatch-7.3.6/conf/logfiles/samba.conf.pom logwatch-7.3.6/conf/logfiles/samba.conf
diff -up logwatch-7.3.6/conf/logfiles/iptables.conf.pom logwatch-7.3.6/conf/logfiles/iptables.conf
--- logwatch-7.3.6/conf/logfiles/iptables.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/iptables.conf	2008-08-15 10:26:20.000000000 +0200
@@ -17,6 +17,7 @@ LogFile = ulogd/ulogd.syslogemu
 # (optionally containing wildcards) that tell where they are...
 #If you use a "-" in naming add that as well -mgt
 Archive = ulogd/ulogd.syslogmenu.*
+Archive = ulogd/ulogd.syslogmenu-*
 
 # Keep only the lines in the proper date range...
 *ApplyStdDate
diff -up logwatch-7.3.6/conf/logfiles/messages.conf.pom logwatch-7.3.6/conf/logfiles/messages.conf
--- logwatch-7.3.6/conf/logfiles/messages.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/messages.conf	2008-08-15 10:26:58.000000000 +0200
@@ -18,6 +18,8 @@ LogFile = messages
 #If you use a "-" in naming add that as well -mgt
 Archive = messages.*
 Archive = archiv/messages.*
+Archive = messages-*
+Archive = archiv/messages-*
 
 # Expand the repeats (actually just removes them now)
 *ExpandRepeats
diff -up logwatch-7.3.6/conf/logfiles/pureftp.conf.pom logwatch-7.3.6/conf/logfiles/pureftp.conf
--- logwatch-7.3.6/conf/logfiles/pureftp.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/pureftp.conf	2008-08-15 10:30:47.000000000 +0200
@@ -17,6 +17,7 @@ LogFile = pureftp/syslog.log
 # (optionally containing wildcards) that tell where they are...
 #If you use a "-" in naming add that as well -mgt
 Archive = pureftp/syslog.log.*
+Archive = pureftp/syslog.log-*
 
 # Keep only the lines in the proper date range...
 *OnlyHost
diff -up logwatch-7.3.6/conf/logfiles/http.conf.pom logwatch-7.3.6/conf/logfiles/http.conf
--- logwatch-7.3.6/conf/logfiles/http.conf.pom	2007-04-15 23:56:53.000000000 +0200
+++ logwatch-7.3.6/conf/logfiles/http.conf	2008-08-15 10:26:09.000000000 +0200
@@ -22,7 +22,12 @@ Archive = apache/*access.log.*.gz
 Archive = apache2/*access.log.*.gz
 Archive = apache2/*access_log.*.gz
 Archive = apache-ssl/*access.log.*.gz
-
+Archive = archiv/httpd/*access_log-*
+Archive = httpd/*access_log-*
+Archive = apache/*access.log-*.gz
+Archive = apache2/*access.log-*.gz
+Archive = apache2/*access_log-*.gz
+Archive = apache-ssl/*access.log-*.gz
 
 # Expand the repeats (actually just removes them now)
 *ExpandRepeats
diff -up logwatch-7.3.6/conf/logfiles/kernel.conf.pom logwatch-7.3.6/conf/logfiles/kernel.conf
--- logwatch-7.3.6/conf/logfiles/kernel.conf.pom	2006-03-21 04:01:34.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/kernel.conf	2008-08-15 10:26:30.000000000 +0200
@@ -12,6 +12,7 @@
 LogFile = kern.log
 LogFile = kern.log.0
 Archive = kern.log.*.gz
+Archive = kern.log-*.gz
 *ExpandRepeats
 *OnlyHost
 *ApplyStdDate
diff -up logwatch-7.3.6/conf/logfiles/exim.conf.pom logwatch-7.3.6/conf/logfiles/exim.conf
--- logwatch-7.3.6/conf/logfiles/exim.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/exim.conf	2008-08-15 10:18:30.000000000 +0200
@@ -20,6 +20,10 @@ Archive = exim/main.log.*
 Archive = archiv/exim/main.log.*
 Archive = exim/mainlog.*
 Archive = exim4/mainlog.*
+Archive = exim/main.log-*
+Archive = archiv/exim/main.log-*
+Archive = exim/mainlog-*
+Archive = exim4/mainlog-*
 
 ########################################################
 # This was written by:
diff -up logwatch-7.3.6/conf/logfiles/yum.conf.pom logwatch-7.3.6/conf/logfiles/yum.conf
diff -up logwatch-7.3.6/conf/logfiles/rt314.conf.pom logwatch-7.3.6/conf/logfiles/rt314.conf
--- logwatch-7.3.6/conf/logfiles/rt314.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/rt314.conf	2008-08-15 10:32:42.000000000 +0200
@@ -9,6 +9,7 @@ LogFile = netgear.log
 # (optionally containing wildcards) that tell where they are...
 #If you use a "-" in naming add that as well -mgt
 Archive = netgear.log.*
+Archive = netgear.log-*
 
 # Keep only the lines in the proper date range...
 *ApplyStdDate
diff -up logwatch-7.3.6/conf/logfiles/dpkg.conf.pom logwatch-7.3.6/conf/logfiles/dpkg.conf
--- logwatch-7.3.6/conf/logfiles/dpkg.conf.pom	2006-12-15 05:39:22.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/dpkg.conf	2008-08-15 10:02:32.000000000 +0200
@@ -17,6 +17,6 @@ LogFile = dpkg.log.1
 # Note: if these are gzipped, you need to end with a .gz even if
 #       you use wildcards...
 Archive = dpkg.log.*.gz
-
+Archive = dpkg.log-*.gz
 *ApplyEuroDate
 # vi: shiftwidth=3 tabstop=3 et
diff -up logwatch-7.3.6/conf/logfiles/autorpm.conf.pom logwatch-7.3.6/conf/logfiles/autorpm.conf
diff -up logwatch-7.3.6/conf/logfiles/sonicwall.conf.pom logwatch-7.3.6/conf/logfiles/sonicwall.conf
--- logwatch-7.3.6/conf/logfiles/sonicwall.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/sonicwall.conf	2008-08-15 10:33:24.000000000 +0200
@@ -20,6 +20,8 @@ LogFile = sonicwall.log
 #If you use a "-" in naming add that as well -mgt
 Archive = sonicwall.log.*
 Archive = archiv/sonicwall.log.*
+Archive = sonicwall.log-*
+Archive = archiv/sonicwall.log-*
 
 # Keep only the lines in the proper date range...
 *OnlyHost
diff -up logwatch-7.3.6/conf/logfiles/up2date.conf.pom logwatch-7.3.6/conf/logfiles/up2date.conf
--- logwatch-7.3.6/conf/logfiles/up2date.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/up2date.conf	2008-08-15 10:45:35.000000000 +0200
@@ -17,5 +17,6 @@ LogFile = up2date
 # (optionally containing wildcards) that tell where they are...
 #If you use a "-" in naming add that as well -mgt
 Archive = up2date.*
+Archive = up2date-*
 
 # vi: shiftwidth=3 tabstop=3 et
diff -up logwatch-7.3.6/conf/logfiles/pix.conf.pom logwatch-7.3.6/conf/logfiles/pix.conf
--- logwatch-7.3.6/conf/logfiles/pix.conf.pom	2006-12-20 05:37:13.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/pix.conf	2008-08-15 10:30:26.000000000 +0200
@@ -9,5 +9,6 @@
 
 LogFile = pix.log
 Archive = pix.log.*
+Archive = pix.log-*
 
 # vi: shiftwidth=3 tabstop=3 et
diff -up logwatch-7.3.6/conf/logfiles/denyhosts.conf.pom logwatch-7.3.6/conf/logfiles/denyhosts.conf
--- logwatch-7.3.6/conf/logfiles/denyhosts.conf.pom	2006-11-12 19:32:54.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/denyhosts.conf	2008-08-15 09:57:19.000000000 +0200
@@ -7,7 +7,7 @@
 #
 ###############################################################################
 LogFile = denyhosts
-Archive = 
 Archive = denyhosts.*
+Archive = denyhosts-*
 *ApplyEuroDate
 # vi: shiftwidth=3 tabstop=3 et
diff -up logwatch-7.3.6/conf/logfiles/bfd.conf.pom logwatch-7.3.6/conf/logfiles/bfd.conf
--- logwatch-7.3.6/conf/logfiles/bfd.conf.pom	2007-04-15 21:48:23.000000000 +0200
+++ logwatch-7.3.6/conf/logfiles/bfd.conf	2008-08-15 09:41:30.000000000 +0200
@@ -10,5 +10,6 @@
 # Which logfile group...
 LogFile = /var/log/bfd_log
 Archive = /var/log/bfd_log.*
+Archive = /var/log/bfd_log-*
 
 
diff -up logwatch-7.3.6/conf/logfiles/maillog.conf.pom logwatch-7.3.6/conf/logfiles/maillog.conf
--- logwatch-7.3.6/conf/logfiles/maillog.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/maillog.conf	2008-08-15 10:26:46.000000000 +0200
@@ -24,6 +24,10 @@ Archive = maillog.*
 Archive = syslog.*
 Archive = archiv/maillog.*
 Archive = mail.log.*.gz
+Archive = maillog-*
+Archive = syslog-*
+Archive = archiv/maillog-*
+Archive = mail.log-*.gz
 
 
 # Expand the repeats (actually just removes them now)
diff -up logwatch-7.3.6/conf/logfiles/windows.conf.pom logwatch-7.3.6/conf/logfiles/windows.conf
--- logwatch-7.3.6/conf/logfiles/windows.conf.pom	2006-03-22 18:46:22.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/windows.conf	2008-08-15 10:55:33.000000000 +0200
@@ -19,6 +19,8 @@ LogFile = windows.log
 #       you use wildcards...
 Archive = windows.log.*
 Archive = windows.log.*.gz
+Archive = windows.log-*
+Archive = windows.log-*.gz
 
 # Expand the repeats (actually just removes them now)
 *ExpandRepeats
diff -up logwatch-7.3.6/conf/logfiles/cron.conf.pom logwatch-7.3.6/conf/logfiles/cron.conf
--- logwatch-7.3.6/conf/logfiles/cron.conf.pom	2005-02-24 18:05:18.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/cron.conf	2008-08-15 09:56:42.000000000 +0200
@@ -19,6 +19,8 @@ LogFile = cron
 # (optionally containing wildcards) that tell where they are...
 Archive = cron.*
 Archive = archiv/cron.*
+Archive = cron-*
+Archive = archiv/cron-*
 
 *OnlyHost
 *RemoveService = anacron
diff -up logwatch-7.3.6/conf/logfiles/eventlog.conf.pom logwatch-7.3.6/conf/logfiles/eventlog.conf
--- logwatch-7.3.6/conf/logfiles/eventlog.conf.pom	2007-04-29 00:50:24.000000000 +0200
+++ logwatch-7.3.6/conf/logfiles/eventlog.conf	2008-08-15 13:50:52.000000000 +0200
@@ -20,6 +20,10 @@ Archive = eventlog.*
 Archive = eventlog.*.gz
 Archive = archiv/eventlog.*
 Archive = archiv/eventlog.*.gz
+Archive = eventlog-*
+Archive = eventlog-*.gz
+Archive = archiv/eventlog-*
+Archive = archiv/eventlog-*.gz
 
 # Expand the repeats (actually just removes them now)
 *ExpandRepeats
diff -up logwatch-7.3.6/conf/logfiles/vsftpd.conf.pom logwatch-7.3.6/conf/logfiles/vsftpd.conf
--- logwatch-7.3.6/conf/logfiles/vsftpd.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/vsftpd.conf	2008-08-15 10:55:20.000000000 +0200
@@ -19,6 +19,8 @@ LogFile = vsftpd.log
 #If you use a "-" in naming add that as well -mgt
 Archive = vsftpd.log.*
 Archive = archiv/vsftpd.log.*
+Archive = vsftpd.log-*
+Archive = archiv/vsftpd.log-*
 
 *ApplyStdDate = 
 # vi: shiftwidth=3 tabstop=3 et
diff -up logwatch-7.3.6/conf/logfiles/php.conf.pom logwatch-7.3.6/conf/logfiles/php.conf
--- logwatch-7.3.6/conf/logfiles/php.conf.pom	2006-11-12 19:28:31.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/php.conf	2008-08-15 10:30:11.000000000 +0200
@@ -25,5 +25,6 @@ LogFile = httpd/php_log
 # (optionally containing wildcards) that tell where they are...
 #If you use a "-" in naming add that as well -mgt
 Archive = httpd/php_log.*
+Archive = httpd/php_log-*
 
 # vi: shiftwidth=3 tabstop=3 et
diff -up logwatch-7.3.6/conf/logfiles/qmail-pop3d-current.conf.pom logwatch-7.3.6/conf/logfiles/qmail-pop3d-current.conf
diff -up logwatch-7.3.6/conf/logfiles/dnssec.conf.pom logwatch-7.3.6/conf/logfiles/dnssec.conf
diff -up logwatch-7.3.6/conf/logfiles/qmail-send-current.conf.pom logwatch-7.3.6/conf/logfiles/qmail-send-current.conf


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/F-9/logwatch.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- logwatch.spec	15 Sep 2008 12:02:22 -0000	1.92
+++ logwatch.spec	16 Sep 2008 10:56:16 -0000	1.93
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -40,6 +40,7 @@
 Patch35: logwatch-7.3.6-audit2.patch
 Patch36: logwatch-7.3.6-openvpn2.patch
 Patch37: logwatch-7.3.6-postfix2.patch
+Patch38: logwatch-7.3.6-logrotate.patch
 
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
@@ -88,6 +89,7 @@
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -201,6 +203,11 @@
 %doc License project/CHANGES 
 
 %changelog
+
+* Tue Sep 16 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-24
+- fix logrotate x logwatch compatibility problem
+  (#458580)
+
 * Mon Sep 15 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-23
 - fix postfix script problem 
   (#462174)



From pmachata at fedoraproject.org  Tue Sep 16 11:00:45 2008
From: pmachata at fedoraproject.org (Petr Machata)
Date: Tue, 16 Sep 2008 11:00:45 +0000 (UTC)
Subject: rpms/tzdata/devel .cvsignore, 1.46, 1.47 sources, 1.50,
	1.51 tzdata.spec, 1.68, 1.69 tzdata-2008e-pakistan+morocco.patch,
	1.1, NONE tzdata-casablanca.patch, 1.1,
	NONE tzdata-karachi.patch, 1.2, NONE
Message-ID: <20080916110045.B452070138@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32424

Modified Files:
	.cvsignore sources tzdata.spec 
Removed Files:
	tzdata-2008e-pakistan+morocco.patch tzdata-casablanca.patch 
	tzdata-karachi.patch 
Log Message:
- Upstream 2008f
  - Changes for Mauritius (extends DST to years to come)
  - Palestine changes clocks for the duration of Ramadan
  - Argentina will start DST on Sunday October 19, 2008
  - Brazil will start DST on 2008-10-19
- Drop Pakistan and Morocco patches
- Drop obsolete patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	12 Aug 2008 08:48:54 -0000	1.46
+++ .cvsignore	16 Sep 2008 11:00:15 -0000	1.47
@@ -10,3 +10,4 @@
 tzdata2008d.tar.gz
 tzdata2008e.tar.gz
 tzcode2008e.tar.gz
+tzdata2008f.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	12 Aug 2008 08:48:54 -0000	1.50
+++ sources	16 Sep 2008 11:00:15 -0000	1.51
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-3b4578110a3d193ed9a00d61f27aba28  tzdata2008e.tar.gz
 12ec2d85324ddcba39db1471a03f486b  tzcode2008e.tar.gz
+aa3b077a7b786d46c131303b1d75deee  tzdata2008f.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- tzdata.spec	28 Aug 2008 17:14:02 -0000	1.68
+++ tzdata.spec	16 Sep 2008 11:00:15 -0000	1.69
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2008e
+Version: 2008f
 %define tzdata_version %{version}
-%define tzcode_version %{version}
-Release: 2%{?dist}
+%define tzcode_version 2008e
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -16,7 +16,6 @@
 # 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-2008e-pakistan+morocco.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -48,7 +47,6 @@
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
-%patch1 -p1
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -109,6 +107,14 @@
 %{_datadir}/javazi
 
 %changelog
+* Tue Sep 16 2008 Petr Machata <pmachata at redhat.com> - 2008f-1
+- Upstream 2008f
+  - Changes for Mauritius (extends DST to years to come)
+  - Palestine changes clocks for the duration of Ramadan
+  - Argentina will start DST on Sunday October 19, 2008
+  - Brazil will start DST on 2008-10-19
+- Drop Pakistan and Morocco patches
+
 * Thu Aug 28 2008 Petr Machata <pmachata at redhat.com> - 2008e-2
 - Pakistan DST is scheduled until Oct/31
 - Morocco DST is scheduled until Aug/31


--- tzdata-2008e-pakistan+morocco.patch DELETED ---


--- tzdata-casablanca.patch DELETED ---


--- tzdata-karachi.patch DELETED ---



From pmachata at fedoraproject.org  Tue Sep 16 11:01:51 2008
From: pmachata at fedoraproject.org (Petr Machata)
Date: Tue, 16 Sep 2008 11:01:51 +0000 (UTC)
Subject: rpms/tzdata/F-9 .cvsignore, 1.45, 1.46 sources, 1.50,
	1.51 tzdata.spec, 
	1.68, 1.69 tzdata-2008e-pakistan+morocco.patch, 1.1, NONE
Message-ID: <20080916110151.220E870138@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv544

Modified Files:
	.cvsignore sources tzdata.spec 
Removed Files:
	tzdata-2008e-pakistan+morocco.patch 
Log Message:
- Upstream 2008f
  - Changes for Mauritius (extends DST to years to come)
  - Palestine changes clocks for the duration of Ramadan
  - Argentina will start DST on Sunday October 19, 2008
  - Brazil will start DST on 2008-10-19
- Drop Pakistan and Morocco patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-9/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	12 Aug 2008 08:48:54 -0000	1.45
+++ .cvsignore	16 Sep 2008 11:01:20 -0000	1.46
@@ -10,3 +10,4 @@
 tzdata2008d.tar.gz
 tzdata2008e.tar.gz
 tzcode2008e.tar.gz
+tzdata2008f.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-9/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	12 Aug 2008 08:48:54 -0000	1.50
+++ sources	16 Sep 2008 11:01:20 -0000	1.51
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-3b4578110a3d193ed9a00d61f27aba28  tzdata2008e.tar.gz
 12ec2d85324ddcba39db1471a03f486b  tzcode2008e.tar.gz
+aa3b077a7b786d46c131303b1d75deee  tzdata2008f.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-9/tzdata.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- tzdata.spec	28 Aug 2008 17:55:39 -0000	1.68
+++ tzdata.spec	16 Sep 2008 11:01:20 -0000	1.69
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2008e
+Version: 2008f
 %define tzdata_version %{version}
-%define tzcode_version %{version}
-Release: 2%{?dist}
+%define tzcode_version 2008e
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -13,7 +13,6 @@
 # such is under LGPLv2+, but none of this ever gets to be part of
 # final zoneinfo files.
 Source0: tzdata-base-0.tar.bz2
-Patch1: tzdata-2008e-pakistan+morocco.patch
 # 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
@@ -48,7 +47,6 @@
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
-%patch1 -p1
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -109,6 +107,14 @@
 %{_datadir}/javazi
 
 %changelog
+* Tue Sep 16 2008 Petr Machata <pmachata at redhat.com> - 2008f-1
+- Upstream 2008f
+  - Changes for Mauritius (extends DST to years to come)
+  - Palestine changes clocks for the duration of Ramadan
+  - Argentina will start DST on Sunday October 19, 2008
+  - Brazil will start DST on 2008-10-19
+- Drop Pakistan and Morocco patches
+
 * Thu Aug 28 2008 Petr Machata <pmachata at redhat.com> - 2008e-2
 - Pakistan DST is scheduled until Oct/31
 - Morocco DST is scheduled until Aug/31


--- tzdata-2008e-pakistan+morocco.patch DELETED ---



From caolanm at fedoraproject.org  Tue Sep 16 11:07:00 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 16 Sep 2008 11:07:00 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch, 1.1,
	1.2 openoffice.org.spec, 1.1651, 1.1652
Message-ID: <20080916110700.25CCA70138@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1616

Modified Files:
	openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch 
	openoffice.org.spec 
Log Message:
add openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch

openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch:



Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1651
retrieving revision 1.1652
diff -u -r1.1651 -r1.1652
--- openoffice.org.spec	16 Sep 2008 10:52:31 -0000	1.1651
+++ openoffice.org.spec	16 Sep 2008 11:06:58 -0000	1.1652
@@ -3678,11 +3678,13 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Sep 15 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-6.1
+* Tue Sep 16 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-6.1
 - next candidate
 - use system jfreereport
 - Basque, Ndebele, Swati, Southern Sotho, Northern Sotho, Tsonga,
   Venda, Xhosa spellcheckers
+- add openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch
+- add openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch
 
 * Sun Sep 07 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-5.1
 - next candidate



From pmachata at fedoraproject.org  Tue Sep 16 11:09:13 2008
From: pmachata at fedoraproject.org (Petr Machata)
Date: Tue, 16 Sep 2008 11:09:13 +0000 (UTC)
Subject: rpms/tzdata/F-8 .cvsignore, 1.45, 1.46 sources, 1.49,
	1.50 tzdata.spec, 
	1.65, 1.66 tzdata-2008e-pakistan+morocco.patch, 1.1, NONE
Message-ID: <20080916110913.7C9BE70138@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2083

Modified Files:
	.cvsignore sources tzdata.spec 
Removed Files:
	tzdata-2008e-pakistan+morocco.patch 
Log Message:
- Upstream 2008f
  - Changes for Mauritius (extends DST to years to come)
  - Palestine changes clocks for the duration of Ramadan
  - Argentina will start DST on Sunday October 19, 2008
  - Brazil will start DST on 2008-10-19
- Drop Pakistan and Morocco patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-8/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	12 Aug 2008 08:48:53 -0000	1.45
+++ .cvsignore	16 Sep 2008 11:08:43 -0000	1.46
@@ -10,3 +10,4 @@
 tzdata2008d.tar.gz
 tzdata2008e.tar.gz
 tzcode2008e.tar.gz
+tzdata2008f.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-8/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	12 Aug 2008 08:48:53 -0000	1.49
+++ sources	16 Sep 2008 11:08:43 -0000	1.50
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-3b4578110a3d193ed9a00d61f27aba28  tzdata2008e.tar.gz
 12ec2d85324ddcba39db1471a03f486b  tzcode2008e.tar.gz
+aa3b077a7b786d46c131303b1d75deee  tzdata2008f.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-8/tzdata.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- tzdata.spec	28 Aug 2008 17:59:20 -0000	1.65
+++ tzdata.spec	16 Sep 2008 11:08:43 -0000	1.66
@@ -1,16 +1,15 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2008e
+Version: 2008f
 %define tzdata_version %{version}
-%define tzcode_version %{version}
-Release: 2%{?dist}
+%define tzcode_version 2008e
+Release: 1%{?dist}
 License: Public Domain, LGPLv2+
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
 Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
-Patch1: tzdata-2008e-pakistan+morocco.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
 BuildRequires: glibc-common >= 2.5.90-7
@@ -42,7 +41,6 @@
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
-%patch1 -p1
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -104,6 +102,14 @@
 %{_datadir}/javazi
 
 %changelog
+* Tue Sep 16 2008 Petr Machata <pmachata at redhat.com> - 2008f-1
+- Upstream 2008f
+  - Changes for Mauritius (extends DST to years to come)
+  - Palestine changes clocks for the duration of Ramadan
+  - Argentina will start DST on Sunday October 19, 2008
+  - Brazil will start DST on 2008-10-19
+- Drop Pakistan and Morocco patches
+
 * Thu Aug 28 2008 Petr Machata <pmachata at redhat.com> - 2008e-2
 - Pakistan DST is scheduled until Oct/31
 - Morocco DST is scheduled until Aug/31


--- tzdata-2008e-pakistan+morocco.patch DELETED ---



From corsepiu at fedoraproject.org  Tue Sep 16 11:14:42 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 16 Sep 2008 11:14:42 +0000 (UTC)
Subject: rpms/perl-Test-Expect/devel .cvsignore, 1.2,
	1.3 perl-Test-Expect.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20080916111442.AD51470138@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Expect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2878/devel

Modified Files:
	.cvsignore perl-Test-Expect.spec sources 
Log Message:
* Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.31-1
- Upgrade to 0.31 (Required by rt3's testsuite, BZ 462440).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Expect/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 May 2006 14:32:08 -0000	1.2
+++ .cvsignore	16 Sep 2008 11:14:12 -0000	1.3
@@ -1 +1 @@
-Test-Expect-0.30.tar.gz
+Test-Expect-0.31.tar.gz


Index: perl-Test-Expect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Expect/devel/perl-Test-Expect.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Test-Expect.spec	7 Mar 2008 02:18:03 -0000	1.3
+++ perl-Test-Expect.spec	16 Sep 2008 11:14:12 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Test-Expect
-Version:        0.30
-Release:        3%{?dist}
+Version:        0.31
+Release:        1%{?dist}
 Summary:        Automated driving and testing of terminal-based programs
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.31-1
+- Upgrade to 0.31 (Required by rt3's testsuite, BZ 462440).
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.30-3
 Rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Expect/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 May 2006 14:32:08 -0000	1.2
+++ sources	16 Sep 2008 11:14:12 -0000	1.3
@@ -1 +1 @@
-b22cb4575d910bb2d36e506a958da300  Test-Expect-0.30.tar.gz
+2d30b1be2e5e390a9aa698858607e428  Test-Expect-0.31.tar.gz



From corsepiu at fedoraproject.org  Tue Sep 16 11:14:42 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 16 Sep 2008 11:14:42 +0000 (UTC)
Subject: rpms/perl-Test-Expect/F-9 .cvsignore, 1.2, 1.3 perl-Test-Expect.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20080916111442.C9E4970138@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Expect/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2878/F-9

Modified Files:
	.cvsignore perl-Test-Expect.spec sources 
Log Message:
* Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.31-1
- Upgrade to 0.31 (Required by rt3's testsuite, BZ 462440).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Expect/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 May 2006 14:32:08 -0000	1.2
+++ .cvsignore	16 Sep 2008 11:14:12 -0000	1.3
@@ -1 +1 @@
-Test-Expect-0.30.tar.gz
+Test-Expect-0.31.tar.gz


Index: perl-Test-Expect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Expect/F-9/perl-Test-Expect.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Test-Expect.spec	7 Mar 2008 02:18:03 -0000	1.3
+++ perl-Test-Expect.spec	16 Sep 2008 11:14:12 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Test-Expect
-Version:        0.30
-Release:        3%{?dist}
+Version:        0.31
+Release:        1%{?dist}
 Summary:        Automated driving and testing of terminal-based programs
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.31-1
+- Upgrade to 0.31 (Required by rt3's testsuite, BZ 462440).
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.30-3
 Rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Expect/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 May 2006 14:32:08 -0000	1.2
+++ sources	16 Sep 2008 11:14:12 -0000	1.3
@@ -1 +1 @@
-b22cb4575d910bb2d36e506a958da300  Test-Expect-0.30.tar.gz
+2d30b1be2e5e390a9aa698858607e428  Test-Expect-0.31.tar.gz



From corsepiu at fedoraproject.org  Tue Sep 16 11:14:43 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 16 Sep 2008 11:14:43 +0000 (UTC)
Subject: rpms/perl-Test-Expect/F-8 .cvsignore, 1.2, 1.3 perl-Test-Expect.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080916111443.043CB70138@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Expect/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2878/F-8

Modified Files:
	.cvsignore perl-Test-Expect.spec sources 
Log Message:
* Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.31-1
- Upgrade to 0.31 (Required by rt3's testsuite, BZ 462440).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Expect/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 May 2006 14:32:08 -0000	1.2
+++ .cvsignore	16 Sep 2008 11:14:12 -0000	1.3
@@ -1 +1 @@
-Test-Expect-0.30.tar.gz
+Test-Expect-0.31.tar.gz


Index: perl-Test-Expect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Expect/F-8/perl-Test-Expect.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-Expect.spec	17 May 2006 14:32:08 -0000	1.1
+++ perl-Test-Expect.spec	16 Sep 2008 11:14:12 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           perl-Test-Expect
-Version:        0.30
+Version:        0.31
 Release:        1%{?dist}
 Summary:        Automated driving and testing of terminal-based programs
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Test-Expect/
 Source0:        http://www.cpan.org/authors/id/L/LB/LBROCARD/Test-Expect-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -13,6 +13,9 @@
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Class::Accessor::Chained::Fast)
 BuildRequires:  perl(Expect::Simple)
+BuildRequires:	perl(Test::More)
+BuildRequires:	perl(Test::Builder)
+
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -56,5 +59,14 @@
 
 
 %changelog
+* Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.31-1
+- Upgrade to 0.31 (Required by rt3's testsuite, BZ 462440).
+
+* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.30-3
+Rebuild for new perl
+
+* Tue Dec 11 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.30-2
+- BR: perl(Test::More), perl(Test::Builder) (BZ 419631).
+
 * Wed May 10 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.30-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Expect/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 May 2006 14:32:08 -0000	1.2
+++ sources	16 Sep 2008 11:14:12 -0000	1.3
@@ -1 +1 @@
-b22cb4575d910bb2d36e506a958da300  Test-Expect-0.30.tar.gz
+2d30b1be2e5e390a9aa698858607e428  Test-Expect-0.31.tar.gz



From apevec at fedoraproject.org  Tue Sep 16 11:18:32 2008
From: apevec at fedoraproject.org (Alan Pevec)
Date: Tue, 16 Sep 2008 11:18:32 +0000 (UTC)
Subject: rpms/collectd/F-8 .cvsignore, 1.3, 1.4 collectd.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20080916111832.EA6A770138@cvs1.fedora.phx.redhat.com>

Author: apevec

Update of /cvs/pkgs/rpms/collectd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3521

Modified Files:
	.cvsignore collectd.spec sources 
Log Message:
* Tue Sep 16 2008 Alan Pevec <apevec at redhat.com> 4.3.4-1
- New upstream bugfix release 4.3.4
  http://collectd.org/news.shtml#news56




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Jul 2008 09:34:31 -0000	1.3
+++ .cvsignore	16 Sep 2008 11:18:02 -0000	1.4
@@ -1 +1 @@
-collectd-4.3.3.tar.bz2
+collectd-4.3.4.tar.bz2


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-8/collectd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- collectd.spec	1 Jul 2008 09:34:31 -0000	1.3
+++ collectd.spec	16 Sep 2008 11:18:02 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
-Version: 4.3.3
+Version: 4.3.4
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
@@ -301,6 +301,10 @@
 
 
 %changelog
+* Tue Sep 16 2008 Alan Pevec <apevec at redhat.com> 4.3.4-1
+- New upstream bugfix release 4.3.4
+  http://collectd.org/news.shtml#news56
+
 * Tue Jul 01 2008 Alan Pevec <apevec at redhat.com> 4.3.3-1
 - rebuild for rrdtool update
 - New upstream version 4.3.3.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Jul 2008 09:34:31 -0000	1.3
+++ sources	16 Sep 2008 11:18:02 -0000	1.4
@@ -1 +1 @@
-4ae6686908503a72292fbd2a46bba448  collectd-4.3.3.tar.bz2
+fe6112b2716bd09287cec4ba288fb7e4  collectd-4.3.4.tar.bz2



From caolanm at fedoraproject.org  Tue Sep 16 11:26:58 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 16 Sep 2008 11:26:58 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch, 1.2, 1.3
Message-ID: <20080916112658.554F170138@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4480

Modified Files:
	openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch 
Log Message:
foo

openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch:

Index: openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch	16 Sep 2008 11:06:58 -0000	1.2
+++ openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch	16 Sep 2008 11:26:27 -0000	1.3
@@ -23,13 +23,6 @@
  }
  
  
-@@ -112,6 +109,6 @@
- 
- AccessibleDocumentViewBase::~AccessibleDocumentViewBase (void)
- {
-     // At this place we should be disposed.  You may want to add a
-     // corresponding assertion into the destructor of a derived class.
- }
 @@ -149,13 +147,20 @@
              OUString (RTL_CONSTASCII_USTRINGPARAM("")),
              static_cast<beans::XPropertyChangeListener*>(this));



From zprikryl at fedoraproject.org  Tue Sep 16 11:35:20 2008
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Tue, 16 Sep 2008 11:35:20 +0000 (UTC)
Subject: rpms/dstat/devel dstat-0.6.8-dbus.patch, NONE, 1.1 dstat.spec, 1.9, 
	1.10 dstat-0.6.7-dbus.patch, 1.1, NONE dstat-0.6.7-int.patch,
	1.1, NONE
Message-ID: <20080916113520.A124070138@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/dstat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5602

Modified Files:
	dstat.spec 
Added Files:
	dstat-0.6.8-dbus.patch 
Removed Files:
	dstat-0.6.7-dbus.patch dstat-0.6.7-int.patch 
Log Message:
Updated to 0.6.8
Fixed dbus module patch


dstat-0.6.8-dbus.patch:

--- NEW FILE dstat-0.6.8-dbus.patch ---
diff -up dstat-0.6.8/plugins/dstat_dbus.py.dbus dstat-0.6.8/plugins/dstat_dbus.py
--- dstat-0.6.8/plugins/dstat_dbus.py.dbus	2007-05-12 06:09:45.000000000 +0200
+++ dstat-0.6.8/plugins/dstat_dbus.py	2008-09-16 13:26:32.000000000 +0200
@@ -16,22 +16,23 @@ class dstat_dbus(dstat):
         try:
             global dbus
             import dbus
-            try:
-                self.sysbus = dbus.Bus(dbus.Bus.TYPE_SYSTEM).get_service('org.freedesktop.DBus').get_object('/org/freedesktop/DBus', 'org.freedesktop.DBus')
-                try:
-                    self.sesbus = dbus.Bus(dbus.Bus.TYPE_SESSION).get_service('org.freedesktop.DBus').get_object('/org/freedesktop/DBus', 'org.freedesktop.DBus')
-                except:
-                    self.sesbus = None
-            except:
-                raise Exception, 'Unable to connect to dbus message bus'
-            return True
         except:
             raise Exception, 'Needs python-dbus module'
+        try:
+            self.sysbus = dbus.Interface(dbus.SystemBus().get_object('org.freedesktop.DBus', '/org/freedesktop/DBus'), 'org.freedesktop.DBus')
+        except:
+            raise Exception, 'Unable to connect to dbus message bus'
+        try:
+            self.sesbus = dbus.Interface(dbus.SessionBus().get_object('org.freedesktop.DBus', '/org/freedesktop/DBus'), 'org.freedesktop.DBus')
+        except:
+            raise True
+
+        return True
 
     def extract(self):
-        self.val['system'] = len(self.sysbus.ListServices()) - 1
+        self.val['system'] = len(self.sysbus.ListNames()) - 1
         try:
-            self.val['session'] = len(self.sesbus.ListServices()) - 1
+            self.val['session'] = len(self.sesbus.ListNames()) - 1
         except:
             self.val['session'] = -1
 #       print dir(b); print dir(s); print dir(d); print d.ListServices()


Index: dstat.spec
===================================================================
RCS file: /cvs/extras/rpms/dstat/devel/dstat.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dstat.spec	25 Apr 2008 11:26:25 -0000	1.9
+++ dstat.spec	16 Sep 2008 11:34:50 -0000	1.10
@@ -3,15 +3,14 @@
 
 Summary: Versatile resource statistics tool
 Name: dstat
-Version: 0.6.7
-Release: 3%{?dist}
+Version: 0.6.8
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://dag.wieers.com/home-made/dstat/
 
 Source: http://dag.wieers.com/home-made/dstat/dstat-%{version}.tar.bz2
-Patch0: dstat-0.6.7-int.patch
-Patch1: dstat-0.6.7-dbus.patch
+Patch0: dstat-0.6.8-dbus.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -35,8 +34,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .int
-%patch1 -p1 -b .dbus
+%patch0 -p1 -b .dbus
 
 %build
 # Make sure the docs are in unix format
@@ -61,12 +59,16 @@
 %files
 %defattr(-, root, root, 0755)
 %dir %{_datadir}/dstat
-%doc AUTHORS ChangeLog COPYING README TODO *.conf docs/*.html docs/*.txt examples/
+%doc AUTHORS ChangeLog COPYING README TODO docs/*.html docs/*.txt examples/
 %{_mandir}/man1/dstat.1*
 %{_bindir}/dstat
 %{_datadir}/dstat/*.py*
 
 %changelog
+* Tue Sep 16 2008 Zdenek Prikryl <zprikryl at redhat.com> - 0.6.8-1
+- Updated to 0.6.8
+- Fixed dbus module patch
+
 * Fri Apr 25 2008 Radek Brich <rbrich at redhat.com> - 0.6.7-3
 - fix dbus module (new dbus-python interface since FC4)
 


--- dstat-0.6.7-dbus.patch DELETED ---


--- dstat-0.6.7-int.patch DELETED ---



From zprikryl at fedoraproject.org  Tue Sep 16 11:40:39 2008
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Tue, 16 Sep 2008 11:40:39 +0000 (UTC)
Subject: rpms/dstat/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <20080916114039.0AD3770138@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/dstat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6617

Modified Files:
	.cvsignore sources 
Log Message:
Updated to 0.6.8
Fixed dbus module patch



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dstat/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 Mar 2008 17:09:29 -0000	1.6
+++ .cvsignore	16 Sep 2008 11:40:08 -0000	1.7
@@ -1 +1 @@
-dstat-0.6.7.tar.bz2
+dstat-0.6.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dstat/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Mar 2008 17:09:29 -0000	1.6
+++ sources	16 Sep 2008 11:40:08 -0000	1.7
@@ -1 +1 @@
-287903ea851a01167dbedab1bb444656  dstat-0.6.7.tar.bz2
+1db4098e5b0aec3d7acc340f7899cf73  dstat-0.6.8.tar.bz2



From varekova at fedoraproject.org  Tue Sep 16 12:01:11 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 16 Sep 2008 12:01:11 +0000 (UTC)
Subject: rpms/man/devel man.spec,1.70,1.71 man-1.6b-rpm.patch,1.2,NONE
Message-ID: <20080916120111.CA66B70138@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9600

Modified Files:
	man.spec 
Removed Files:
	man-1.6b-rpm.patch 
Log Message:
- Resolves: #460765
  remove makewhatis patch which adds data from rpm database 



Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- man.spec	12 Sep 2008 12:42:21 -0000	1.70
+++ man.spec	16 Sep 2008 12:00:41 -0000	1.71
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -25,7 +25,6 @@
 Patch20: man-1.5p-xorg.patch
 Patch21: man-1.6b-i18n_nroff.patch
 Patch22: man-1.6b-man-pages.patch
-Patch23: man-1.6b-rpm.patch
 Patch24: man-1.6c-disp.patch
 Patch25: man-1.6f-dashes.patch
 Patch26: man-1.6d-updates.patch
@@ -64,7 +63,6 @@
 %patch20 -p1 -b .xorg
 %patch21 -p1 -b .i18n_nroff
 %patch22 -p1 -b .up
-%patch23 -p1 -b .rpm
 %patch24 -p1 -b .disp
 %patch25 -p1 -b .dash
 %patch26 -p1 -b .upd
@@ -263,6 +261,11 @@
 
 
 %changelog
+* Tue Sep 16 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-11
+- Resolves: #460765
+  remove makewhatis patch which adds data from rpm database 
+  
+
 * Fri Sep 12 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-10
 - Resolves: #461775
   man needs lzma


--- man-1.6b-rpm.patch DELETED ---



From caolanm at fedoraproject.org  Tue Sep 16 12:14:06 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 16 Sep 2008 12:14:06 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch, NONE,
	1.1 openoffice.org.spec, 1.1652,
	1.1653 openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch,
	1.3, NONE
Message-ID: <20080916121406.5C52570138@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10654

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch 
Removed Files:
	openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch 
Log Message:
wrong id

openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch:

--- NEW FILE openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch ---
Index: source/ui/accessibility/AccessibleDocumentViewBase.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx,v
retrieving revision 1.32
diff -u -r1.32 AccessibleDocumentViewBase.cxx
--- openoffice.org.orig/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx	7 Jul 2008 14:20:57 -0000	1.32
+++ openoffice.org/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx	16 Sep 2008 08:02:46 -0000
@@ -74,8 +74,6 @@
 
 namespace accessibility {
 
-static SfxViewFrame* mpViewFrame = NULL;
-
 //=====  internal  ============================================================
 AccessibleDocumentViewBase::AccessibleDocumentViewBase (
     ::sd::Window* pSdWindow,
@@ -103,8 +102,6 @@
     maShapeTreeInfo.SetViewForwarder (&maViewForwarder);
 
     mxWindow = ::VCLUnoHelper::GetInterface (pSdWindow);
-
-    mpViewFrame = pViewShell->GetViewFrame();
 }
 
 
@@ -149,13 +147,20 @@
             OUString (RTL_CONSTASCII_USTRINGPARAM("")),
             static_cast<beans::XPropertyChangeListener*>(this));
 
+    // Register this object as dispose event listener at the controller.
+	if (mxController.is())
+		mxController->addEventListener (
+            static_cast<awt::XWindowListener*>(this));
+
     // Register at VCL Window to be informed of activated and deactivated
     // OLE objects.
     Window* pWindow = maShapeTreeInfo.GetWindow();
-    if (pWindow != NULL)
+    if (pWindow)
     {
-        pWindow->AddChildEventListener (LINK(
-            this, AccessibleDocumentViewBase, WindowChildEventListener));
+        maWindowLink = LINK(
+            this, AccessibleDocumentViewBase, WindowChildEventListener);
+
+        pWindow->AddChildEventListener (maWindowLink);
 
         USHORT nCount = pWindow->GetChildCount();
         for (sal_uInt16 i=0; i<nCount; i++)
@@ -191,12 +196,10 @@
                 Window* pWindow = maShapeTreeInfo.GetWindow();
                 Window* pDyingWindow = static_cast<Window*>(
                     pWindowEvent->GetWindow());
-                if (pWindow==pDyingWindow && pWindow!=NULL)
+                if (pWindow==pDyingWindow && pWindow!=NULL && maWindowLink.IsSet())
                 {
-                    pWindow->RemoveChildEventListener (LINK(
-                        this, 
-                        AccessibleDocumentViewBase, 
-                        WindowChildEventListener));
+                    pWindow->RemoveChildEventListener (maWindowLink);
+                    maWindowLink = Link();
                 }
             }
             break;
@@ -542,8 +545,57 @@
 	return aTypeList;
 }
 
+void AccessibleDocumentViewBase::impl_dispose()
+{
+    // Unregister from VCL Window.
+    if (maWindowLink.IsSet())
+    {
+        Window* pWindow = maShapeTreeInfo.GetWindow();
+        if (pWindow)
+            pWindow->RemoveChildEventListener (maWindowLink);
+        maWindowLink = Link();
+    }
+    else
+    {
+        DBG_ASSERT (pWindow, "AccessibleDocumentViewBase::disposing");
+    }
 
+    // Unregister from window.
+    if (mxWindow.is())
+    {
+        mxWindow->removeWindowListener (this);
+        mxWindow->removeFocusListener (this);
+        mxWindow = NULL;
+    }
+
+    // Unregister form the model.
+    if (mxModel.is())
+        mxModel->removeEventListener (
+            static_cast<awt::XWindowListener*>(this));
+
+    // Unregister from the controller.
+    if (mxController.is())
+    {
+    	uno::Reference<beans::XPropertySet> xSet (mxController, uno::UNO_QUERY);
+	    if (xSet.is())
+	        xSet->removePropertyChangeListener (
+	            OUString (RTL_CONSTASCII_USTRINGPARAM("")),
+	            static_cast<beans::XPropertyChangeListener*>(this));
+
+        mxController->removeEventListener (
+            static_cast<awt::XWindowListener*>(this));
+    }
+
+    // Propagate change of controller down the shape tree.
+    maShapeTreeInfo.SetControllerBroadcaster (NULL);
 
+    // Reset the model reference.
+    mxModel = NULL;
+    // Reset the model reference.
+    mxController = NULL;
+
+    maShapeTreeInfo.SetDocumentWindow (NULL);
+}
 
 //=====  XEventListener  ======================================================
 
@@ -560,32 +612,10 @@
     {
         // Paranoia. Can this really happen?
     }
-    else if (rEventObject.Source == mxModel)
+    else if (rEventObject.Source == mxModel || rEventObject.Source == mxController)
     {
         ::osl::Guard< ::osl::Mutex> aGuard (::osl::Mutex::getGlobalMutex());
-
-        mxModel->removeEventListener (
-            static_cast<awt::XWindowListener*>(this));
-
-        // Reset the model reference.
-        mxModel = NULL;
-
-        // Propagate change of controller down the shape tree.
-        maShapeTreeInfo.SetControllerBroadcaster (NULL);
-    }
-    else if (rEventObject.Source == mxController)
-    {
-        ::osl::Guard< ::osl::Mutex> aGuard (::osl::Mutex::getGlobalMutex());
-
-        // Unregister as property change listener at the controller.
-        uno::Reference<beans::XPropertySet> xSet (mxController,uno::UNO_QUERY);
-        if (xSet.is())
-            xSet->removePropertyChangeListener (
-                OUString (RTL_CONSTASCII_USTRINGPARAM("")),
-                static_cast<beans::XPropertyChangeListener*>(this));
-
-        // Reset the model reference.
-        mxController = NULL;
+        impl_dispose();
     }
 }
 
@@ -688,36 +718,7 @@
 // This method is called from the component helper base class while disposing.
 void SAL_CALL AccessibleDocumentViewBase::disposing (void)
 {
-    // Unregister from VCL Window.
-	Window* pWindow = maShapeTreeInfo.GetWindow();
-    if (pWindow != NULL)
-	{
-		pWindow->RemoveChildEventListener (LINK(
-            this, AccessibleDocumentViewBase, WindowChildEventListener));
-    }
-    else
-    {
-        DBG_ASSERT (pWindow, "AccessibleDocumentViewBase::disposing");
-    }
-
-    // Unregister from window.
-    if (mxWindow.is())
-    {
-        mxWindow->removeWindowListener (this);
-        mxWindow->removeFocusListener (this);
-    }
-
-    // Unregister form the model.
-	if (mxModel.is())
-		mxModel->removeEventListener (
-            static_cast<awt::XWindowListener*>(this));
-
-    // Unregister from the controller.
-    uno::Reference<beans::XPropertySet> xSet (mxController, uno::UNO_QUERY);
-    if (xSet.is())
-        xSet->removePropertyChangeListener (
-            OUString (RTL_CONSTASCII_USTRINGPARAM("")),
-            static_cast<beans::XPropertyChangeListener*>(this));
+    impl_dispose();
 
     AccessibleContextBase::disposing ();
 }
Index: source/ui/accessibility/AccessibleDrawDocumentView.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx,v
retrieving revision 1.30
diff -u -r1.30 AccessibleDrawDocumentView.cxx
--- openoffice.org.orig/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx	7 Jul 2008 14:21:10 -0000	1.30
+++ openoffice.org/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx	16 Sep 2008 08:02:46 -0000
@@ -664,6 +666,16 @@
 }
 
 
+void AccessibleDrawDocumentView::impl_dispose()
+{
+    if (mpChildrenManager != NULL)
+    {
+        delete mpChildrenManager;
+        mpChildrenManager = NULL;
+    }
+
+    AccessibleDocumentViewBase::impl_dispose();
+}
 
 
 /** This method is called from the component helper base class while
Index: source/ui/inc/AccessibleDocumentViewBase.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/inc/AccessibleDocumentViewBase.hxx,v
retrieving revision 1.13
diff -u -r1.13 AccessibleDocumentViewBase.hxx
--- openoffice.org.orig/sd/source/ui/inc/AccessibleDocumentViewBase.hxx	10 Apr 2008 20:33:06 -0000	1.13
+++ openoffice.org/sd/source/ui/inc/AccessibleDocumentViewBase.hxx	16 Sep 2008 08:02:47 -0000
@@ -257,7 +257,6 @@
         throw (::com::sun::star::uno::RuntimeException); 
 
 private:
-
     // return the member maMutex;
     virtual ::osl::Mutex& 
         implGetMutex();
@@ -306,6 +305,8 @@
         ::com::sun::star::accessibility::XAccessible> 
         mxAccessibleOLEObject;
 
+    Link maWindowLink;
+
     // This method is called from the component helper base class while
     // disposing.
     virtual void SAL_CALL disposing (void);
@@ -362,6 +363,8 @@
     virtual void SetAccessibleOLEObject (
         const ::com::sun::star::uno::Reference <
         ::com::sun::star::accessibility::XAccessible>& xOLEObject);
+
+    virtual void impl_dispose();
 };
 
 } // end of namespace accessibility
Index: source/ui/inc/AccessibleDrawDocumentView.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/inc/AccessibleDrawDocumentView.hxx,v
retrieving revision 1.12
diff -u -r1.12 AccessibleDrawDocumentView.hxx
--- openoffice.org.orig/sd/source/ui/inc/AccessibleDrawDocumentView.hxx	10 Apr 2008 20:33:23 -0000	1.12
+++ openoffice.org/sd/source/ui/inc/AccessibleDrawDocumentView.hxx	16 Sep 2008 08:02:47 -0000
@@ -164,6 +164,8 @@
         change event indicating that it has lost the focus.
     */
     virtual void Deactivated (void);
+
+    virtual void impl_dispose();
 };
 
 } // end of namespace accessibility
Index: source/ui/unoidl/DrawController.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/unoidl/DrawController.cxx,v
retrieving revision 1.27
diff -u -r1.27 DrawController.cxx
--- openoffice.org.orig/sd/source/ui/unoidl/DrawController.cxx	7 Jul 2008 14:22:34 -0000	1.27
+++ openoffice.org/sd/source/ui/unoidl/DrawController.cxx	16 Sep 2008 08:02:48 -0000
@@ -316,8 +316,8 @@
     const Reference< view::XSelectionChangeListener >& xListener ) 
     throw(RuntimeException)
 {
-	if( mbDisposing )
-		throw lang::DisposedException();
+        if( rBHelper.bDisposed )
+                throw lang::DisposedException();
 
 	BroadcastHelperOwner::maBroadcastHelper.removeListener (saSelectionTypeIdentifier, xListener);
 }
Index: source/accessibility/ChildrenManagerImpl.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/accessibility/ChildrenManagerImpl.cxx,v
retrieving revision 1.41
diff -u -r1.41 ChildrenManagerImpl.cxx
--- openoffice.org.orig/svx/source/accessibility/ChildrenManagerImpl.cxx	24 Jun 2008 16:38:48 -0000	1.41
+++ openoffice.org/svx/source/accessibility/ChildrenManagerImpl.cxx	16 Sep 2008 08:13:52 -0000
@@ -45,6 +45,8 @@
 #include <rtl/ustring.hxx>
 #include <tools/debug.hxx>
 
+#include <stdio.h>
+
 using namespace ::com::sun::star;
 using namespace	::com::sun::star::accessibility;
 using ::com::sun::star::uno::Reference;
@@ -77,7 +79,8 @@
       mxParent (rxParent),
       maShapeTreeInfo (rShapeTreeInfo),
       mrContext (rContext),
-      mnNewNameIndex(1)
+      mnNewNameIndex(1),
+      mpFocusedShape(NULL)
 {
 }
 
@@ -95,12 +98,19 @@
 
 void ChildrenManagerImpl::Init (void)
 {
+
     // Register as view::XSelectionChangeListener.
+    Reference<frame::XController> xController(maShapeTreeInfo.GetController());
     Reference<view::XSelectionSupplier> xSelectionSupplier (
-        maShapeTreeInfo.GetController(), uno::UNO_QUERY);
+        xController, uno::UNO_QUERY);
     if (xSelectionSupplier.is())
+    {
+        xController->addEventListener(
+            static_cast<document::XEventListener*>(this));
+
         xSelectionSupplier->addSelectionChangeListener (
             static_cast<view::XSelectionChangeListener*>(this));
+    }
 
     // Register at model as document::XEventListener.
     if (maShapeTreeInfo.GetModelBroadcaster().is())
@@ -217,26 +227,46 @@
     Rectangle aVisibleArea = maShapeTreeInfo.GetViewForwarder()->GetVisibleArea();
 
     // 1. Create a local list of visible shapes.
-    ChildDescriptorListType aNewChildList;
-    CreateListOfVisibleShapes (aNewChildList);
-
-    // 2. Find all shapes in the current list that are not in the new list,
-    // send appropriate events and remove the accessible shape.
-    RemoveNonVisibleChildren (aNewChildList);
+    ChildDescriptorListType aChildList;
+    CreateListOfVisibleShapes (aChildList);
 
-    // 3. Merge the information that is already known about the visible
+    // 2. Merge the information that is already known about the visible
     // shapes from the current list into the new list.
-    MergeAccessibilityInformation (aNewChildList);
+    MergeAccessibilityInformation (aChildList);
 
-    // 4. Replace the current list of visible shapes with the new one.  Do
+    // 3. Replace the current list of visible shapes with the new one.  Do
     // the same with the visible area.
     {
         ::osl::MutexGuard aGuard (maMutex);
-		adjustIndexInParentOfShapes(aNewChildList);
+	adjustIndexInParentOfShapes(aChildList);
 
         // Use swap to copy the contents of the new list in constant time.
-        maVisibleChildren.swap (aNewChildList);
-        aNewChildList.clear();
+        maVisibleChildren.swap (aChildList);
+
+        // aChildList now contains all the old children, while maVisibleChildren
+        // contains all the current children
+
+        // 4. Find all shapes in the old list that are not in the current list,
+        // send appropriate events and remove the accessible shape.
+        //
+        // Do this *after* we have set our new list of children, because
+        // removing a child may cause
+        //
+        // ChildDescriptor::disposeAccessibleObject -->
+        // AccessibleContextBase::CommitChange -->
+        // AtkListener::notifyEvent ->
+        // AtkListener::handleChildRemoved ->
+        // AtkListener::updateChildList
+        // AccessibleDrawDocumentView::getAccessibleChildCount ->
+        // ChildrenManagerImpl::GetChildCount ->
+        // maVisibleChildren.size()
+        //
+        // to be fired, and so the operations will take place on
+        // the list we are trying to replace
+        //
+        RemoveNonVisibleChildren (maVisibleChildren, aChildList);
+
+        aChildList.clear();
 
         maVisibleArea = aVisibleArea;
     }
@@ -318,15 +348,15 @@
 
 
 void ChildrenManagerImpl::RemoveNonVisibleChildren (
-    ChildDescriptorListType& raNewChildList)
+    const ChildDescriptorListType& rNewChildList, ChildDescriptorListType& rOldChildList)
 {
     // Iterate over list of formerly visible children and remove those that
     // are not visible anymore, i.e. member of the new list of visible
     // children.
-    ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end();
-    for (I=maVisibleChildren.begin(); I != aEnd; ++I)
+    ChildDescriptorListType::iterator I, aEnd = rOldChildList.end();
+    for (I=rOldChildList.begin(); I != aEnd; ++I)
     {
-        if (::std::find(raNewChildList.begin(), raNewChildList.end(), *I) == raNewChildList.end())
+        if (::std::find(rNewChildList.begin(), rNewChildList.end(), *I) == rNewChildList.end())
         {
             // The child is disposed when there is a UNO shape from which
             // the accessible shape can be created when the shape becomes
@@ -573,12 +603,14 @@
 {
     // Remember the current broadcasters and exchange the shape tree info.
     Reference<document::XEventBroadcaster> xCurrentBroadcaster;
+    Reference<frame::XController> xCurrentController;
     Reference<view::XSelectionSupplier> xCurrentSelectionSupplier;
     {
         ::osl::MutexGuard aGuard (maMutex);
         xCurrentBroadcaster = maShapeTreeInfo.GetModelBroadcaster();
+        xCurrentController = maShapeTreeInfo.GetController();
         xCurrentSelectionSupplier = Reference<view::XSelectionSupplier> (
-            maShapeTreeInfo.GetController(), uno::UNO_QUERY);
+            xCurrentController, uno::UNO_QUERY);
         maShapeTreeInfo = rShapeTreeInfo;
     }
 
@@ -597,19 +629,30 @@
     }
 
     // Move registration to new selection supplier.
+    Reference<frame::XController> xNewController(maShapeTreeInfo.GetController());
     Reference<view::XSelectionSupplier> xNewSelectionSupplier (
-            maShapeTreeInfo.GetController(), uno::UNO_QUERY);
+            xNewController, uno::UNO_QUERY);
     if (xNewSelectionSupplier != xCurrentSelectionSupplier)
     {
         // Register at new broadcaster.
         if (xNewSelectionSupplier.is())
+        {
+            xNewController->addEventListener(
+                static_cast<document::XEventListener*>(this));
+
             xNewSelectionSupplier->addSelectionChangeListener (
                 static_cast<view::XSelectionChangeListener*>(this));
+        }
 
         // Unregister at old broadcaster.
         if (xCurrentSelectionSupplier.is())
+        {
             xCurrentSelectionSupplier->removeSelectionChangeListener (
                 static_cast<view::XSelectionChangeListener*>(this));
+
+            xCurrentController->removeEventListener(
+                static_cast<document::XEventListener*>(this));
+        }
     }
 }
 
@@ -622,22 +665,13 @@
     ChildrenManagerImpl::disposing (const lang::EventObject& rEventObject)
     throw (uno::RuntimeException)
 {
-    if (rEventObject.Source == maShapeTreeInfo.GetModelBroadcaster())
-    {
-        maShapeTreeInfo.SetModelBroadcaster (NULL);
-        // The disposing of a model should be handled elsewhere.  But to be
-        // on the safe side we remove all of our children.
-        ClearAccessibleShapeList ();
-        SetShapeList (NULL);
-    }
-
-    else if (rEventObject.Source
-        == Reference<view::XSelectionSupplier> (
-            maShapeTreeInfo.GetController(), uno::UNO_QUERY))
+    if (
+         rEventObject.Source == maShapeTreeInfo.GetModelBroadcaster() ||
+         rEventObject.Source == maShapeTreeInfo.GetController()
+       )
     {
-        maShapeTreeInfo.SetController (NULL);
+        impl_dispose();
     }
-
     // Handle disposing UNO shapes.
     else
     {
@@ -694,29 +728,47 @@
 }
 
 
+void ChildrenManagerImpl::impl_dispose()
+{
+    Reference<frame::XController> xController(maShapeTreeInfo.GetController());
+    // Remove from broadcasters.
+    try {
+        Reference<view::XSelectionSupplier> xSelectionSupplier (
+            xController, uno::UNO_QUERY);
+        if (xSelectionSupplier.is())
+        {
+            xSelectionSupplier->removeSelectionChangeListener (
+                static_cast<view::XSelectionChangeListener*>(this));
+        }
+    }
+    catch( uno::RuntimeException&) { }
 
+    try {
+        if (xController.is())
+            xController->removeEventListener(
+                static_cast<document::XEventListener*>(this));
+    } catch( uno::RuntimeException&) { }
 
-void SAL_CALL ChildrenManagerImpl::disposing (void)
-{
-	try
-	{
-	    // Remove from broadcasters.
-		Reference<view::XSelectionSupplier> xSelectionSupplier (
-			maShapeTreeInfo.GetController(), uno::UNO_QUERY);
-		if (xSelectionSupplier.is())
-			xSelectionSupplier->removeSelectionChangeListener (
-				static_cast<view::XSelectionChangeListener*>(this));
-
-		if (maShapeTreeInfo.GetModelBroadcaster().is())
-			maShapeTreeInfo.GetModelBroadcaster()->removeEventListener (
-				static_cast<document::XEventListener*>(this));
-	}
-	catch( uno::RuntimeException& )
-	{
-		// our XSelectionSupplier may be already disposed
-	}
+    maShapeTreeInfo.SetController (NULL);
+
+    try {
+        // Remove from broadcaster.
+        if (maShapeTreeInfo.GetModelBroadcaster().is())
+            maShapeTreeInfo.GetModelBroadcaster()->removeEventListener (
+                static_cast<document::XEventListener*>(this));
+        maShapeTreeInfo.SetModelBroadcaster (NULL);
+    }
+    catch( uno::RuntimeException& ) { }
 
     ClearAccessibleShapeList ();
+    SetShapeList (NULL);
+}
+
+
+
+void SAL_CALL ChildrenManagerImpl::disposing (void)
+{
+    impl_dispose();
 }
 
 
Index: source/accessibility/ChildrenManagerImpl.hxx
===================================================================
RCS file: /cvs/graphics/svx/source/accessibility/ChildrenManagerImpl.hxx,v
retrieving revision 1.24
diff -u -r1.24 ChildrenManagerImpl.hxx
--- openoffice.org.orig/svx/source/accessibility/ChildrenManagerImpl.hxx	24 Jun 2008 16:39:05 -0000	1.24
+++ openoffice.org/svx/source/accessibility/ChildrenManagerImpl.hxx	16 Sep 2008 08:13:52 -0000
@@ -378,6 +378,7 @@
         ::com::sun::star::accessibility::XAccessible>& xChild) const
         throw (::com::sun::star::uno::RuntimeException);
 
+    void impl_dispose();
 private:
     /** Names of new accessible objects are disambiguated with this index.
         It gets increased every time a new object is created and (at the
@@ -406,14 +407,18 @@
     */
     void CreateListOfVisibleShapes (ChildDescriptorListType& raChildList);
     
-    /** From the internal list of (former) visible shapes remove those that
-        are not member of the given list.  Send appropriate events for every
+    /** From the old list of (former) visible shapes remove those that
+        are not member of the new list.  Send appropriate events for every
         such shape.
-        @param raChildList
-            The new list of visible children against which the internal one
+        @param raNewChildList
+            The new list of visible children against which the old one
+            is compared.
+        @param raOldChildList
+            The old list of visible children against which the new one
             is compared.
     */
-    void RemoveNonVisibleChildren (ChildDescriptorListType& raChildList);
+    void RemoveNonVisibleChildren (const ChildDescriptorListType& raNewChildList, 
+        ChildDescriptorListType& raOldChildList);
 
     /** Merge the information that is already known about the visible shapes
         from the current list into the new list.
@@ -548,7 +553,7 @@
 		descriptor may be based on a UNO shape or, already, on an accessible
 		shape.
 	*/
-    inline bool operator == (const ChildDescriptor& aDescriptor)
+    inline bool operator == (const ChildDescriptor& aDescriptor) const
 	{
 		return (this == &aDescriptor || (mxShape.get() == aDescriptor.mxShape.get() ) && ( mxShape.is() || mxAccessibleShape.get() == aDescriptor.mxAccessibleShape.get()));
 	}
@@ -557,7 +562,7 @@
 		to put child descriptors in some STL containers.  The ordering itself is
 		not so important, its 'features' are not used.
 	*/
-    inline bool operator < (const ChildDescriptor& aDescriptor)
+    inline bool operator < (const ChildDescriptor& aDescriptor) const
 	{
 		return (mxShape.get() < aDescriptor.mxShape.get());
 	}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1652
retrieving revision 1.1653
diff -u -r1.1652 -r1.1653
--- openoffice.org.spec	16 Sep 2008 11:06:58 -0000	1.1652
+++ openoffice.org.spec	16 Sep 2008 12:13:35 -0000	1.1653
@@ -112,7 +112,7 @@
 Patch41: openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
 Patch42: workspace.cmcfixes50.patch
 Patch43: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
-Patch44: openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch
+Patch44: openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch
 Patch45: openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch
 
 %define instdir %{_libdir}
@@ -1312,7 +1312,7 @@
 %patch41 -p1 -b .ooo93419.svx.ref_deref.before.ctored.patch
 %patch42 -p1 -b .workspace.cmcfixes50.patch
 %patch43 -p1 -b .ooo93515.vcl.jrb-frames.patch
-%patch44 -p1 -b .ooo93419.svx.accessibity-loops.patch
+%patch44 -p1 -b .ooo93942.svx.accessibity-loops.patch
 %patch45 -p1 -b .ooo93949.sw.better_rtf_encodings.patch
 
 %build


--- openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch DELETED ---



From phuang at fedoraproject.org  Tue Sep 16 12:22:19 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 16 Sep 2008 12:22:19 +0000 (UTC)
Subject: rpms/ibus-chewing/devel .cvsignore, 1.3, 1.4 ibus-chewing.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20080916122219.BAFD470138@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-chewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12229

Modified Files:
	.cvsignore ibus-chewing.spec sources 
Log Message:
Update to 0.1.1.20080916


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Sep 2008 00:33:08 -0000	1.3
+++ .cvsignore	16 Sep 2008 12:21:49 -0000	1.4
@@ -1 +1 @@
-ibus-chewing-0.1.1.20080901.tar.gz
+ibus-chewing-0.1.1.20080916.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/ibus-chewing.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ibus-chewing.spec	1 Sep 2008 00:33:08 -0000	1.2
+++ ibus-chewing.spec	16 Sep 2008 12:21:49 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define mod_path ibus-0.1
 Name:       ibus-chewing
-Version:    0.1.1.20080901
+Version:    0.1.1.20080916
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -54,6 +54,9 @@
 %{_datadir}/ibus/engine/chewing.engine
 
 %changelog
+* Tue Sep 16 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080916-1
+- Update to 0.1.1.20080916.
+
 * Mon Sep 09 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
 - Update to 0.1.1.20080901.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Sep 2008 00:33:08 -0000	1.3
+++ sources	16 Sep 2008 12:21:49 -0000	1.4
@@ -1 +1 @@
-db4a63fc84b82386a44a4210df05c20e  ibus-chewing-0.1.1.20080901.tar.gz
+64170b97e0a87eee83ca1ed73de1633b  ibus-chewing-0.1.1.20080916.tar.gz



From jreznik at fedoraproject.org  Tue Sep 16 12:47:44 2008
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue, 16 Sep 2008 12:47:44 +0000 (UTC)
Subject: rpms/system-config-netboot/devel .cvsignore, 1.35, 1.36 sources,
	1.38, 1.39 system-config-netboot.spec, 1.57, 1.58
Message-ID: <20080916124744.2CE3970138@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/system-config-netboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14200

Modified Files:
	.cvsignore sources system-config-netboot.spec 
Log Message:
* Tue Sep 16 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.1.45.3-1
- Fixes icon reference (#bz457715)                                 
- Fixes replacing custom msgs (#bz459383)                          
- Config noreplace for config files                                
- Upstream URL updated  



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-netboot/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	7 May 2008 11:17:56 -0000	1.35
+++ .cvsignore	16 Sep 2008 12:47:13 -0000	1.36
@@ -1 +1 @@
-system-config-netboot-0.1.45.2.tar.gz
+system-config-netboot-0.1.45.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-netboot/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	7 May 2008 11:17:56 -0000	1.38
+++ sources	16 Sep 2008 12:47:13 -0000	1.39
@@ -1 +1 @@
-b0ec3cab4810e661eb8ff7298b9d4956  system-config-netboot-0.1.45.2.tar.gz
+cb0b32e0db36fcd50ea84161fcb50cf1  system-config-netboot-0.1.45.3.tar.gz


Index: system-config-netboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-netboot/devel/system-config-netboot.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- system-config-netboot.spec	26 Aug 2008 09:59:07 -0000	1.57
+++ system-config-netboot.spec	16 Sep 2008 12:47:13 -0000	1.58
@@ -1,10 +1,10 @@
 # -*- RPM-SPEC -*-
 Summary: network booting/install configuration utility (GUI)
 Name: system-config-netboot
-Version: 0.1.45.2
-Release: 3%{?dist}
-URL: http://www.redhat.com/ 
-Source0: %{name}-%{version}.tar.gz
+Version: 0.1.45.3
+Release: 1%{?dist}
+URL: http://fedorahosted.org/system-config-netboot/
+Source0: http://fedorahosted.org/releases/s/y/system-config-netboot/%{name}-%{version}.tar.gz
 Source1: pxelinux.0
 License: GPLv2+
 Group: Applications/System
@@ -46,7 +46,7 @@
 cp -arfp %{buildroot}/%{_datadir}/system-config-netboot/msgs %{buildroot}/tftpboot/linux-install/
 cp -fp %{SOURCE1} %{buildroot}/tftpboot/linux-install
 mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps
-cp -afp pixmaps/system-config-netboot.png  %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/system-config-netboot.png
+cp -afp pixmaps/preferences-network-boot.png  %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/preferences-network-boot.png
 rm -f %{buildroot}/docs/Makefile*
 %find_lang %name
 
@@ -74,8 +74,8 @@
 %{_datadir}/system-config-netboot/netboot_gtk.py*
 %{_datadir}/system-config-netboot/pxeosdialog.py*
 %{_datadir}/system-config-netboot/system-config-netboot.*
-%{_datadir}/pixmaps/system-config-netboot.xpm
-%{_datadir}/icons/hicolor/48x48/apps/system-config-netboot.png
+%{_datadir}/pixmaps/preferences-network-boot.xpm
+%{_datadir}/icons/hicolor/48x48/apps/preferences-network-boot.png
 %{_mandir}/*/system-config-netboot.8*
 
 %files -f %{name}.lang cmd
@@ -90,15 +90,21 @@
 %{_datadir}/system-config-netboot/pxeboot.py*
 %{_datadir}/system-config-netboot/pxeos.py*
 %{_mandir}/*/pxe*.8*
-/tftpboot/linux-install/
-/tftpboot/linux-install/pxelinux.cfg/
-/tftpboot/linux-install/msgs/
-/tftpboot/linux-install/pxelinux.0
-%config %{_sysconfdir}/sysconfig/system-config-netboot
-%config %{_sysconfdir}/pam.d/system-config-netboot
-%config %{_sysconfdir}/security/console.apps/system-config-netboot
+%config(noreplace) /tftpboot/linux-install/
+%config(noreplace) /tftpboot/linux-install/pxelinux.cfg/
+%config(noreplace) /tftpboot/linux-install/msgs/
+%config(noreplace) /tftpboot/linux-install/pxelinux.0
+%config(noreplace) %{_sysconfdir}/sysconfig/system-config-netboot
+%config(noreplace) %{_sysconfdir}/pam.d/system-config-netboot
+%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-netboot
 
 %changelog
+* Tue Sep 16 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.1.45.3-1
+- Fixes icon reference (#bz457715)
+- Fixes replacing custom msgs (#bz459383)
+- Config noreplace for config files
+- Upstream URL updated
+
 * Tue Aug 26 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.1.45.2-3
 - gnome-python2-gnome requirement (#bz460019)
 



From pkgdb at fedoraproject.org  Tue Sep 16 12:52:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 12:52:20 +0000
Subject: [pkgdb] gnome-desktop-sharp: pfj has requested commit
Message-ID: <20080916125220.1BBA1208D9B@bastion.fedora.phx.redhat.com>

pfj has requested the commit acl on gnome-desktop-sharp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop-sharp



From pkgdb at fedoraproject.org  Tue Sep 16 12:52:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 12:52:27 +0000
Subject: [pkgdb] gnome-desktop-sharp: pfj has requested approveacls
Message-ID: <20080916125227.08DA4208DA2@bastion.fedora.phx.redhat.com>

pfj has requested the approveacls acl on gnome-desktop-sharp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop-sharp



From pkgdb at fedoraproject.org  Tue Sep 16 12:52:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 12:52:32 +0000
Subject: [pkgdb] gnome-desktop-sharp: pfj has requested commit
Message-ID: <20080916125232.95460208DA4@bastion.fedora.phx.redhat.com>

pfj has requested the commit acl on gnome-desktop-sharp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop-sharp



From pkgdb at fedoraproject.org  Tue Sep 16 12:52:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 12:52:35 +0000
Subject: [pkgdb] gnome-desktop-sharp: pfj has requested approveacls
Message-ID: <20080916125235.AE3DE208DA6@bastion.fedora.phx.redhat.com>

pfj has requested the approveacls acl on gnome-desktop-sharp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop-sharp



From pkgdb at fedoraproject.org  Tue Sep 16 12:52:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 12:52:39 +0000
Subject: [pkgdb] gnome-desktop-sharp: pfj has requested commit
Message-ID: <20080916125239.8C398208DA9@bastion.fedora.phx.redhat.com>

pfj has requested the commit acl on gnome-desktop-sharp (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop-sharp



From pkgdb at fedoraproject.org  Tue Sep 16 12:52:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 12:52:42 +0000
Subject: [pkgdb] gnome-desktop-sharp: pfj has requested approveacls
Message-ID: <20080916125242.48361208DAC@bastion.fedora.phx.redhat.com>

pfj has requested the approveacls acl on gnome-desktop-sharp (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop-sharp



From apevec at fedoraproject.org  Tue Sep 16 13:14:50 2008
From: apevec at fedoraproject.org (Alan Pevec)
Date: Tue, 16 Sep 2008 13:14:50 +0000 (UTC)
Subject: rpms/collectd/F-9 collectd-4.4.3-include-collectd.d.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 collectd.spec, 1.7, 1.8 sources, 1.3,
	1.4 collectd-4.3.3-include-collectd.d.patch, 1.1, NONE
Message-ID: <20080916131450.9E95670138@cvs1.fedora.phx.redhat.com>

Author: apevec

Update of /cvs/pkgs/rpms/collectd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15689

Modified Files:
	.cvsignore collectd.spec sources 
Added Files:
	collectd-4.4.3-include-collectd.d.patch 
Removed Files:
	collectd-4.3.3-include-collectd.d.patch 
Log Message:
* Tue Sep 16 2008 Alan Pevec <apevec at redhat.com> 4.4.3-1
- Switch F-9 to 4.4.x stable branch, new upstream bugfix release 4.4.3
  http://collectd.org/news.shtml#news57



collectd-4.4.3-include-collectd.d.patch:

--- NEW FILE collectd-4.4.3-include-collectd.d.patch ---
--- collectd-4.4.3/src/collectd.conf.in.orig	2008-09-04 09:59:01.000000000 +0200
+++ collectd-4.4.3/src/collectd.conf.in	2008-09-16 14:46:43.000000000 +0200
@@ -26,7 +26,6 @@
 #	LogLevel info
 #</Plugin>
 
- at BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache
 @BUILD_PLUGIN_APCUPS_TRUE at LoadPlugin apcups
 @BUILD_PLUGIN_APPLE_SENSORS_TRUE at LoadPlugin apple_sensors
 @BUILD_PLUGIN_ASCENT_TRUE at LoadPlugin ascent
@@ -36,37 +35,28 @@
 @BUILD_PLUGIN_CSV_TRUE at LoadPlugin csv
 @BUILD_PLUGIN_DF_TRUE at LoadPlugin df
 @BUILD_PLUGIN_DISK_TRUE at LoadPlugin disk
- at BUILD_PLUGIN_DNS_TRUE@LoadPlugin dns
 @BUILD_PLUGIN_EMAIL_TRUE at LoadPlugin email
 @BUILD_PLUGIN_ENTROPY_TRUE at LoadPlugin entropy
 @BUILD_PLUGIN_EXEC_TRUE at LoadPlugin exec
 @BUILD_PLUGIN_HDDTEMP_TRUE at LoadPlugin hddtemp
 @BUILD_PLUGIN_INTERFACE_TRUE at LoadPlugin interface
 @BUILD_PLUGIN_IPTABLES_TRUE at LoadPlugin iptables
- at BUILD_PLUGIN_IPMI_TRUE@LoadPlugin ipmi
 @BUILD_PLUGIN_IPVS_TRUE at LoadPlugin ipvs
 @BUILD_PLUGIN_IRQ_TRUE at LoadPlugin irq
- at BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt
 @BUILD_PLUGIN_LOAD_TRUE at LoadPlugin load
 @BUILD_PLUGIN_MBMON_TRUE at LoadPlugin mbmon
 @BUILD_PLUGIN_MEMCACHED_TRUE at LoadPlugin memcached
 @BUILD_PLUGIN_MEMORY_TRUE at LoadPlugin memory
 @BUILD_PLUGIN_MULTIMETER_TRUE at LoadPlugin multimeter
- at BUILD_PLUGIN_MYSQL_TRUE@LoadPlugin mysql
 @BUILD_PLUGIN_NETLINK_TRUE at LoadPlugin netlink
 @BUILD_PLUGIN_NETWORK_TRUE at LoadPlugin network
 @BUILD_PLUGIN_NFS_TRUE at LoadPlugin nfs
- at BUILD_PLUGIN_NGINX_TRUE@LoadPlugin nginx
 @BUILD_PLUGIN_NTPD_TRUE at LoadPlugin ntpd
 @BUILD_PLUGIN_NUT_TRUE at LoadPlugin nut
- at BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl
 @BUILD_PLUGIN_PING_TRUE at LoadPlugin ping
 @BUILD_PLUGIN_POWERDNS_TRUE at LoadPlugin powerdns
 @BUILD_PLUGIN_PROCESSES_TRUE at LoadPlugin processes
- at BUILD_PLUGIN_RRDTOOL_TRUE@LoadPlugin rrdtool
- at BUILD_PLUGIN_SENSORS_TRUE@LoadPlugin sensors
 @BUILD_PLUGIN_SERIAL_TRUE at LoadPlugin serial
- at BUILD_PLUGIN_SNMP_TRUE@LoadPlugin snmp
 @BUILD_PLUGIN_SWAP_TRUE at LoadPlugin swap
 @BUILD_PLUGIN_TAIL_TRUE at LoadPlugin tail
 @BUILD_PLUGIN_TAPE_TRUE at LoadPlugin tape
@@ -348,3 +338,4 @@
 #	Verbose false
 #</Plugin>
 
+Include "/etc/collectd.d"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Jun 2008 09:36:49 -0000	1.3
+++ .cvsignore	16 Sep 2008 13:14:20 -0000	1.4
@@ -1 +1 @@
-collectd-4.3.3.tar.bz2
+collectd-4.4.3.tar.bz2


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-9/collectd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- collectd.spec	1 Jul 2008 09:36:48 -0000	1.7
+++ collectd.spec	16 Sep 2008 13:14:20 -0000	1.8
@@ -1,25 +1,30 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
-Version: 4.3.3
-Release: 3%{?dist}
+Version: 4.4.3
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://collectd.org/
 
 Source: http://collectd.org/files/%{name}-%{version}.tar.bz2
-Patch0: %{name}-4.3.3-include-collectd.d.patch
+Patch0: %{name}-%{version}-include-collectd.d.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: libvirt-devel, libxml2-devel
 BuildRequires: rrdtool-devel
 BuildRequires: lm_sensors-devel
 BuildRequires: curl-devel
+%if 0%{?fedora} >= 8
 BuildRequires: perl-libs, perl-devel
-BuildRequires: perl-ExtUtils-MakeMaker
-BuildRequires: perl-ExtUtils-Embed
+%else
+BuildRequires: perl
+%endif
+BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: perl(ExtUtils::Embed)
 BuildRequires: net-snmp-devel
 BuildRequires: libpcap-devel
 BuildRequires: mysql-devel
+BuildRequires: OpenIPMI-devel
 
 %description
 collectd is a small daemon written in C for performance.  It reads various
@@ -53,6 +58,14 @@
 This plugin collects data provided by spamassassin.
 
 
+%package ipmi
+Summary:       IPMI module for collectd
+Group:         System Environment/Daemons
+Requires:      collectd = %{version}-%{release}, OpenIPMI
+%description ipmi
+This plugin for collectd provides IPMI support.
+
+
 %package mysql
 Summary:       MySQL module for collectd
 Group:         System Environment/Daemons
@@ -121,6 +134,8 @@
 
 %build
 %configure \
+    --without-libiptc \
+    --disable-ascent \
     --disable-static \
     --enable-mysql \
     --enable-sensors \
@@ -128,6 +143,7 @@
     --enable-apache \
     --enable-perl \
     --enable-unixsock \
+    --enable-ipmi \
     --with-perl-bindings=INSTALLDIRS=vendor
 %{__make} %{?_smp_mflags}
 
@@ -167,7 +183,7 @@
 cp contrib/redhat/snmp.conf %{buildroot}/etc/collectd.d/snmp.conf
 
 # configs for subpackaged plugins
-for p in dns libvirt perl rrdtool
+for p in dns ipmi libvirt perl rrdtool
 do
 %{__cat} > %{buildroot}/etc/collectd.d/$p.conf <<EOF
 LoadPlugin $p
@@ -206,6 +222,7 @@
 %exclude %{_sysconfdir}/collectd.d/apache.conf
 %exclude %{_sysconfdir}/collectd.d/dns.conf
 %exclude %{_sysconfdir}/collectd.d/email.conf
+%exclude %{_sysconfdir}/collectd.d/ipmi.conf
 %exclude %{_sysconfdir}/collectd.d/libvirt.conf
 %exclude %{_sysconfdir}/collectd.d/mysql.conf
 %exclude %{_sysconfdir}/collectd.d/nginx.conf
@@ -225,6 +242,7 @@
 %exclude %{_libdir}/collectd/apache.so*
 %exclude %{_libdir}/collectd/dns.so*
 %exclude %{_libdir}/collectd/email.so*
+%exclude %{_libdir}/collectd/ipmi.so*
 %exclude %{_libdir}/collectd/libvirt.so*
 %exclude %{_libdir}/collectd/mysql.so*
 %exclude %{_libdir}/collectd/nginx.so*
@@ -244,32 +262,44 @@
 
 
 %files apache
+%defattr(-, root, root, -)
 %{_libdir}/collectd/apache.so*
 %config(noreplace) %{_sysconfdir}/collectd.d/apache.conf
 
 
 %files dns
+%defattr(-, root, root, -)
 %{_libdir}/collectd/dns.so*
 %config(noreplace) %{_sysconfdir}/collectd.d/dns.conf
 
 
 %files email
+%defattr(-, root, root, -)
 %{_libdir}/collectd/email.so*
 %config(noreplace) %{_sysconfdir}/collectd.d/email.conf
 %doc %{_mandir}/man5/collectd-email.5*
 
 
+%files ipmi
+%defattr(-, root, root, -)
+%{_libdir}/collectd/ipmi.so*
+%config(noreplace) %{_sysconfdir}/collectd.d/ipmi.conf
+
+
 %files mysql
+%defattr(-, root, root, -)
 %{_libdir}/collectd/mysql.so*
 %config(noreplace) %{_sysconfdir}/collectd.d/mysql.conf
 
 
 %files nginx
+%defattr(-, root, root, -)
 %{_libdir}/collectd/nginx.so*
 %config(noreplace) %{_sysconfdir}/collectd.d/nginx.conf
 
 
 %files -n perl-Collectd
+%defattr(-, root, root, -)
 %doc perl-examples/*
 %{_libdir}/collectd/perl.so*
 %{perl_vendorlib}/Collectd.pm
@@ -280,27 +310,35 @@
 
 
 %files rrdtool
+%defattr(-, root, root, -)
 %{_libdir}/collectd/rrdtool.so*
 %config(noreplace) %{_sysconfdir}/collectd.d/rrdtool.conf
 
 
 %files sensors
+%defattr(-, root, root, -)
 %{_libdir}/collectd/sensors.so*
 %config(noreplace) %{_sysconfdir}/collectd.d/sensors.conf
 
 
 %files snmp
+%defattr(-, root, root, -)
 %{_libdir}/collectd/snmp.so*
 %config(noreplace) %{_sysconfdir}/collectd.d/snmp.conf
 %doc %{_mandir}/man5/collectd-snmp.5*
 
 
 %files virt
+%defattr(-, root, root, -)
 %{_libdir}/collectd/libvirt.so*
 %config(noreplace) %{_sysconfdir}/collectd.d/libvirt.conf
 
 
 %changelog
+* Tue Sep 16 2008 Alan Pevec <apevec at redhat.com> 4.4.3-1
+- Switch F-9 to 4.4.x stable branch, new upstream bugfix release 4.4.3
+  http://collectd.org/news.shtml#news57
+
 * Tue Jul 01 2008 Alan Pevec <apevec at redhat.com> 4.3.3-3
 - rebuild for rrdtool update
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Jun 2008 09:36:49 -0000	1.3
+++ sources	16 Sep 2008 13:14:20 -0000	1.4
@@ -1 +1 @@
-4ae6686908503a72292fbd2a46bba448  collectd-4.3.3.tar.bz2
+309b7a0b9b128a1575308773e1c43d9f  collectd-4.4.3.tar.bz2


--- collectd-4.3.3-include-collectd.d.patch DELETED ---



From tgl at fedoraproject.org  Tue Sep 16 13:22:17 2008
From: tgl at fedoraproject.org (Tom Lane)
Date: Tue, 16 Sep 2008 13:22:17 +0000 (UTC)
Subject: rpms/postgresql-odbc/F-9 .cvsignore, 1.11, 1.12 postgresql-odbc.spec,
	1.23, 1.24 sources, 1.11, 1.12
Message-ID: <20080916132217.30FCD70138@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql-odbc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16215

Modified Files:
	.cvsignore postgresql-odbc.spec sources 
Log Message:
Update to version 08.03.0200


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-odbc/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Feb 2008 17:53:11 -0000	1.11
+++ .cvsignore	16 Sep 2008 13:21:46 -0000	1.12
@@ -1 +1 @@
-psqlodbc-08.03.0100.tar.gz
+psqlodbc-08.03.0200.tar.gz


Index: postgresql-odbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-odbc/F-9/postgresql-odbc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- postgresql-odbc.spec	12 Feb 2008 17:53:11 -0000	1.23
+++ postgresql-odbc.spec	16 Sep 2008 13:21:46 -0000	1.24
@@ -1,6 +1,6 @@
 Name: postgresql-odbc
 Summary: PostgreSQL ODBC driver
-Version: 08.03.0100
+Version: 08.03.0200
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Applications/Databases
@@ -77,6 +77,10 @@
 %doc license.txt readme.txt docs/*
 
 %changelog
+* Tue Sep 16 2008 Tom Lane <tgl at redhat.com> 08.03.0200-1
+- Update to version 08.03.0200
+Resolves: #462312
+
 * Tue Feb 12 2008 Tom Lane <tgl at redhat.com> 08.03.0100-1
 - Update to version 08.03.0100
 - Since it looks like upstream has decided to stick with psqlodbcw.so


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-odbc/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Feb 2008 17:53:11 -0000	1.11
+++ sources	16 Sep 2008 13:21:46 -0000	1.12
@@ -1 +1 @@
-c6e9ba122cfdefbd5adeb4cbf9411329  psqlodbc-08.03.0100.tar.gz
+4950e71c215764ff3beeb7a505c1321a  psqlodbc-08.03.0200.tar.gz



From nosnilmot at fedoraproject.org  Tue Sep 16 13:25:45 2008
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Tue, 16 Sep 2008 13:25:45 +0000 (UTC)
Subject: rpms/pidgin/F-8 pidgin-2.5.1-gnomeproxy.patch, NONE, 1.1 pidgin.spec,
	1.50, 1.51
Message-ID: <20080916132545.E621570138@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/pidgin/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16548/F-8

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.5.1-gnomeproxy.patch 
Log Message:
Fix a crash with GNOME proxy enabled (#461951)


pidgin-2.5.1-gnomeproxy.patch:

--- NEW FILE pidgin-2.5.1-gnomeproxy.patch ---
-----------------------------------------------------------------
Revision: f32f9fb19ff7b4685994c4120991d00386efee39
Ancestor: d8efe65e6fb17e66001bd2d37b7e05bf864e44cc
Author: nosnilmot at pidgin.im
Date: 2008-09-16T13:04:39
Branch: im.pidgin.pidgin

Modified files:
        libpurple/proxy.c

ChangeLog: 

Fix a double free. Fixes #7047

============================================================
--- libpurple/proxy.c	b7dbb41f68625d6ea47613e3198d6ddfe6d382a9
+++ libpurple/proxy.c	67a1948a059b1f6d1f69ac9a5c3aa6fba3a083c5
@@ -263,13 +263,17 @@ purple_gnome_proxy_get_info(void)
 		use_same_proxy = TRUE;
 	g_free(tmp);
 
-	if (!use_same_proxy && !g_spawn_command_line_sync("gconftool-2 -g /system/proxy/socks_host",
+	if (!use_same_proxy) {
+		if (!g_spawn_command_line_sync("gconftool-2 -g /system/proxy/socks_host",
 			&info.host, &err, NULL, NULL))
-		return purple_global_proxy_get_info();
-	g_free(err);
-	g_strchomp(info.host);
+			return purple_global_proxy_get_info();
+		g_free(err);
+	}
 
-	if (!use_same_proxy && *info.host != '\0') {
+	if(info.host != NULL)
+		g_strchomp(info.host);
+
+	if (!use_same_proxy && (info.host != NULL) && (*info.host != '\0')) {
 		info.type = PURPLE_PROXY_SOCKS5;
 		if (!g_spawn_command_line_sync("gconftool-2 -g /system/proxy/socks_port",
 				&tmp, &err, NULL, NULL))


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-8/pidgin.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- pidgin.spec	31 Aug 2008 16:06:19 -0000	1.50
+++ pidgin.spec	16 Sep 2008 13:25:15 -0000	1.51
@@ -29,7 +29,7 @@
 
 Name:		pidgin
 Version:	2.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -62,6 +62,7 @@
 Patch0: pidgin-2.4.2-reread-resolvconf.patch
 
 ## Patches 100+: To be Included in Future Upstream
+Patch100:       pidgin-2.5.1-gnomeproxy.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -291,6 +292,7 @@
 %patch0 -p1 -b .resolv
 
 ## Patches 100+: To be Included in Future Upstream
+%patch100 -p1 -b .gnomeproxy
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -500,6 +502,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 Stu Tomlinson <stu at nosnilmot.com> 2.5.1-2
+- Fix a crash with GNOME proxy enabled (#461951)
+
 * Sun Aug 31 2008 Stu Tomlinson <stu at nosnilmot.com> 2.5.1-1
 - 2.5.1
 



From nosnilmot at fedoraproject.org  Tue Sep 16 13:25:46 2008
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Tue, 16 Sep 2008 13:25:46 +0000 (UTC)
Subject: rpms/pidgin/F-9 pidgin-2.5.1-gnomeproxy.patch, NONE, 1.1 pidgin.spec,
	1.55, 1.56
Message-ID: <20080916132546.1B32770138@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/pidgin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16548/F-9

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.5.1-gnomeproxy.patch 
Log Message:
Fix a crash with GNOME proxy enabled (#461951)


pidgin-2.5.1-gnomeproxy.patch:

--- NEW FILE pidgin-2.5.1-gnomeproxy.patch ---
-----------------------------------------------------------------
Revision: f32f9fb19ff7b4685994c4120991d00386efee39
Ancestor: d8efe65e6fb17e66001bd2d37b7e05bf864e44cc
Author: nosnilmot at pidgin.im
Date: 2008-09-16T13:04:39
Branch: im.pidgin.pidgin

Modified files:
        libpurple/proxy.c

ChangeLog: 

Fix a double free. Fixes #7047

============================================================
--- libpurple/proxy.c	b7dbb41f68625d6ea47613e3198d6ddfe6d382a9
+++ libpurple/proxy.c	67a1948a059b1f6d1f69ac9a5c3aa6fba3a083c5
@@ -263,13 +263,17 @@ purple_gnome_proxy_get_info(void)
 		use_same_proxy = TRUE;
 	g_free(tmp);
 
-	if (!use_same_proxy && !g_spawn_command_line_sync("gconftool-2 -g /system/proxy/socks_host",
+	if (!use_same_proxy) {
+		if (!g_spawn_command_line_sync("gconftool-2 -g /system/proxy/socks_host",
 			&info.host, &err, NULL, NULL))
-		return purple_global_proxy_get_info();
-	g_free(err);
-	g_strchomp(info.host);
+			return purple_global_proxy_get_info();
+		g_free(err);
+	}
 
-	if (!use_same_proxy && *info.host != '\0') {
+	if(info.host != NULL)
+		g_strchomp(info.host);
+
+	if (!use_same_proxy && (info.host != NULL) && (*info.host != '\0')) {
 		info.type = PURPLE_PROXY_SOCKS5;
 		if (!g_spawn_command_line_sync("gconftool-2 -g /system/proxy/socks_port",
 				&tmp, &err, NULL, NULL))


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-9/pidgin.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- pidgin.spec	31 Aug 2008 16:06:19 -0000	1.55
+++ pidgin.spec	16 Sep 2008 13:25:15 -0000	1.56
@@ -29,7 +29,7 @@
 
 Name:		pidgin
 Version:	2.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -62,6 +62,7 @@
 Patch0: pidgin-2.4.2-reread-resolvconf.patch
 
 ## Patches 100+: To be Included in Future Upstream
+Patch100:       pidgin-2.5.1-gnomeproxy.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -291,6 +292,7 @@
 %patch0 -p1 -b .resolv
 
 ## Patches 100+: To be Included in Future Upstream
+%patch100 -p1 -b .gnomeproxy
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -500,6 +502,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 Stu Tomlinson <stu at nosnilmot.com> 2.5.1-2
+- Fix a crash with GNOME proxy enabled (#461951)
+
 * Sun Aug 31 2008 Stu Tomlinson <stu at nosnilmot.com> 2.5.1-1
 - 2.5.1
 



From nosnilmot at fedoraproject.org  Tue Sep 16 13:25:46 2008
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Tue, 16 Sep 2008 13:25:46 +0000 (UTC)
Subject: rpms/pidgin/devel pidgin-2.5.1-gnomeproxy.patch, NONE,
	1.1 pidgin.spec, 1.57, 1.58
Message-ID: <20080916132546.4D24B70138@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16548/devel

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.5.1-gnomeproxy.patch 
Log Message:
Fix a crash with GNOME proxy enabled (#461951)


pidgin-2.5.1-gnomeproxy.patch:

--- NEW FILE pidgin-2.5.1-gnomeproxy.patch ---
-----------------------------------------------------------------
Revision: f32f9fb19ff7b4685994c4120991d00386efee39
Ancestor: d8efe65e6fb17e66001bd2d37b7e05bf864e44cc
Author: nosnilmot at pidgin.im
Date: 2008-09-16T13:04:39
Branch: im.pidgin.pidgin

Modified files:
        libpurple/proxy.c

ChangeLog: 

Fix a double free. Fixes #7047

============================================================
--- libpurple/proxy.c	b7dbb41f68625d6ea47613e3198d6ddfe6d382a9
+++ libpurple/proxy.c	67a1948a059b1f6d1f69ac9a5c3aa6fba3a083c5
@@ -263,13 +263,17 @@ purple_gnome_proxy_get_info(void)
 		use_same_proxy = TRUE;
 	g_free(tmp);
 
-	if (!use_same_proxy && !g_spawn_command_line_sync("gconftool-2 -g /system/proxy/socks_host",
+	if (!use_same_proxy) {
+		if (!g_spawn_command_line_sync("gconftool-2 -g /system/proxy/socks_host",
 			&info.host, &err, NULL, NULL))
-		return purple_global_proxy_get_info();
-	g_free(err);
-	g_strchomp(info.host);
+			return purple_global_proxy_get_info();
+		g_free(err);
+	}
 
-	if (!use_same_proxy && *info.host != '\0') {
+	if(info.host != NULL)
+		g_strchomp(info.host);
+
+	if (!use_same_proxy && (info.host != NULL) && (*info.host != '\0')) {
 		info.type = PURPLE_PROXY_SOCKS5;
 		if (!g_spawn_command_line_sync("gconftool-2 -g /system/proxy/socks_port",
 				&tmp, &err, NULL, NULL))


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- pidgin.spec	31 Aug 2008 16:06:20 -0000	1.57
+++ pidgin.spec	16 Sep 2008 13:25:16 -0000	1.58
@@ -29,7 +29,7 @@
 
 Name:		pidgin
 Version:	2.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -62,6 +62,7 @@
 Patch0: pidgin-2.4.2-reread-resolvconf.patch
 
 ## Patches 100+: To be Included in Future Upstream
+Patch100:       pidgin-2.5.1-gnomeproxy.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -291,6 +292,7 @@
 %patch0 -p1 -b .resolv
 
 ## Patches 100+: To be Included in Future Upstream
+%patch100 -p1 -b .gnomeproxy
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -500,6 +502,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 Stu Tomlinson <stu at nosnilmot.com> 2.5.1-2
+- Fix a crash with GNOME proxy enabled (#461951)
+
 * Sun Aug 31 2008 Stu Tomlinson <stu at nosnilmot.com> 2.5.1-1
 - 2.5.1
 



From nosnilmot at fedoraproject.org  Tue Sep 16 13:29:01 2008
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Tue, 16 Sep 2008 13:29:01 +0000 (UTC)
Subject: rpms/pidgin/devel pidgin.spec,1.58,1.59
Message-ID: <20080916132901.ED9C370138@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17098/devel

Modified Files:
	pidgin.spec 
Log Message:
Fix applying the patch



Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- pidgin.spec	16 Sep 2008 13:25:16 -0000	1.58
+++ pidgin.spec	16 Sep 2008 13:28:31 -0000	1.59
@@ -292,7 +292,7 @@
 %patch0 -p1 -b .resolv
 
 ## Patches 100+: To be Included in Future Upstream
-%patch100 -p1 -b .gnomeproxy
+%patch100 -p0 -b .gnomeproxy
 
 # Our preferences
 cp %{SOURCE1} prefs.xml



From nosnilmot at fedoraproject.org  Tue Sep 16 13:29:02 2008
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Tue, 16 Sep 2008 13:29:02 +0000 (UTC)
Subject: rpms/pidgin/F-9 pidgin.spec,1.56,1.57
Message-ID: <20080916132902.70F6F70138@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/pidgin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17098/F-9

Modified Files:
	pidgin.spec 
Log Message:
Fix applying the patch



Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-9/pidgin.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- pidgin.spec	16 Sep 2008 13:25:15 -0000	1.56
+++ pidgin.spec	16 Sep 2008 13:28:32 -0000	1.57
@@ -292,7 +292,7 @@
 %patch0 -p1 -b .resolv
 
 ## Patches 100+: To be Included in Future Upstream
-%patch100 -p1 -b .gnomeproxy
+%patch100 -p0 -b .gnomeproxy
 
 # Our preferences
 cp %{SOURCE1} prefs.xml



From nosnilmot at fedoraproject.org  Tue Sep 16 13:29:02 2008
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Tue, 16 Sep 2008 13:29:02 +0000 (UTC)
Subject: rpms/pidgin/F-8 pidgin.spec,1.51,1.52
Message-ID: <20080916132902.2145670138@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/pidgin/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17098/F-8

Modified Files:
	pidgin.spec 
Log Message:
Fix applying the patch



Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-8/pidgin.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- pidgin.spec	16 Sep 2008 13:25:15 -0000	1.51
+++ pidgin.spec	16 Sep 2008 13:28:31 -0000	1.52
@@ -292,7 +292,7 @@
 %patch0 -p1 -b .resolv
 
 ## Patches 100+: To be Included in Future Upstream
-%patch100 -p1 -b .gnomeproxy
+%patch100 -p0 -b .gnomeproxy
 
 # Our preferences
 cp %{SOURCE1} prefs.xml



From jwilson at fedoraproject.org  Tue Sep 16 13:36:53 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 16 Sep 2008 13:36:53 +0000 (UTC)
Subject: rpms/lirc/devel lirc.spec,1.37,1.38
Message-ID: <20080916133653.C0EB570138@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/lirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17688

Modified Files:
	lirc.spec 
Log Message:
* Tue Sep 16 2008 - Jarod Wilson <jarod at redhat.com> - 0.8.3-7
- Fix multilib upgrade path from F8 (Nicolas Chauvet, #462435)



Index: lirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- lirc.spec	14 Aug 2008 15:41:38 -0000	1.37
+++ lirc.spec	16 Sep 2008 13:36:23 -0000	1.38
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.3
-Release:        6%{?pre:.%{pre}}%{?dist}
+Release:        7%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -69,6 +69,8 @@
 %package        libs
 Summary:        LIRC libraries
 Group:          System Environment/Libraries
+# Fix old F8 multilib upgrade path issue
+Obsoletes:      %{name} < 0.8.3
 
 %description    libs
 LIRC is a package that allows you to decode and send infra-red and
@@ -266,6 +268,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 - Jarod Wilson <jarod at redhat.com> - 0.8.3-7
+- Fix multilib upgrade path from F8 (Nicolas Chauvet, #462435)
+
 * Thu Aug 14 2008 - Bastien Nocera <bnocera at redhat.com> - 0.8.3-6
 - Make lircd not exit when there's no device available, so that the
   daemon is running as expected when the hardware is plugged back in



From than at fedoraproject.org  Tue Sep 16 13:40:25 2008
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 16 Sep 2008 13:40:25 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel
	kdebase-runtime-4.1.1-iconthemes-inherit.patch, NONE,
	1.1 kdebase-runtime.spec, 1.67, 1.68
Message-ID: <20080916134025.0C19D70138@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17974

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.1.1-iconthemes-inherit.patch 
Log Message:
- fix inherit issue in iconthemes, preview icons do not show



kdebase-runtime-4.1.1-iconthemes-inherit.patch:

--- NEW FILE kdebase-runtime-4.1.1-iconthemes-inherit.patch ---
diff -up kdebase-runtime-4.1.1/kcontrol/icons/iconthemes.cpp.orig kdebase-runtime-4.1.1/kcontrol/icons/iconthemes.cpp
--- kdebase-runtime-4.1.1/kcontrol/icons/iconthemes.cpp.orig	2008-09-16 13:24:43.000000000 +0200
+++ kdebase-runtime-4.1.1/kcontrol/icons/iconthemes.cpp	2008-09-16 15:30:14.000000000 +0200
@@ -415,15 +415,16 @@ void loadPreview(QLabel *label, KIconThe
 {
     const int size = qMin(48, icontheme.defaultSize(KIconLoader::Desktop));
     KSvgRenderer renderer;
-    foreach(const QString &name, iconnames) {
-        K3Icon icon = icontheme.iconPath(QString("%1.png").arg(name), size, KIconLoader::MatchBest);
+    foreach(const QString &iconthemename, QStringList() << icontheme.internalName() << icontheme.inherits()) {
+      foreach(const QString &name, iconnames) {
+        K3Icon icon = KIconTheme(iconthemename).iconPath(QString("%1.png").arg(name), size, KIconLoader::MatchBest);
         if (icon.isValid()) {
             label->setPixmap(QPixmap(icon.path).scaled(size, size));
             return;
         }
-        icon = icontheme.iconPath(QString("%1.svg").arg(name), size, KIconLoader::MatchBest);
+        icon = KIconTheme(iconthemename).iconPath(QString("%1.svg").arg(name), size, KIconLoader::MatchBest);
         if( ! icon.isValid() ) {
-            icon = icontheme.iconPath(QString("%1.svgz").arg(name), size, KIconLoader::MatchBest);
+            icon = KIconTheme(iconthemename).iconPath(QString("%1.svgz").arg(name), size, KIconLoader::MatchBest);
             if( ! icon.isValid() ) {
                 continue;
             }
@@ -437,6 +438,7 @@ void loadPreview(QLabel *label, KIconThe
             label->setPixmap(pix.scaled(size, size));
             return;
         }
+      }
     }
     label->setPixmap(QPixmap());
 }


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- kdebase-runtime.spec	1 Sep 2008 16:56:03 -0000	1.67
+++ kdebase-runtime.spec	16 Sep 2008 13:39:54 -0000	1.68
@@ -10,7 +10,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
 Version:       4.1.1
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -20,6 +20,7 @@
 Patch0:        kdebase-runtime-4.1.0-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.1.1-knetattach.patch
+Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %ifarch noarch
@@ -102,6 +103,7 @@
 %patch0 -p1 -b .pulseaudio
 %patch1 -p1 -b .searchproviders-shortcuts
 %patch2 -p1 -b .knetattach
+%patch3 -p1 -b .iconthemes-inherit
 
 # upstream patches
 
@@ -338,6 +340,10 @@
 
 
 %changelog
+* Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.1.1-3
+- fix inherit issue in iconthemes, preview icons
+  do not show
+
 * Mon Sep 01 2008 Than Ngo <than at redhat.com> 4.1.1-2
 - fix #460710, knetattach is kio_remote's wizard program, don't show
   it in the menu.



From pkgdb at fedoraproject.org  Tue Sep 16 13:44:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 13:44:15 +0000
Subject: [pkgdb] poppler: rdieter has requested watchbugzilla
Message-ID: <20080916134415.C7B58208D9E@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on poppler (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Tue Sep 16 13:44:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 13:44:17 +0000
Subject: [pkgdb] poppler: rdieter has requested watchcommits
Message-ID: <20080916134417.C7EA6208DA2@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on poppler (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Tue Sep 16 13:44:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 13:44:24 +0000
Subject: [pkgdb] poppler: rdieter has requested watchbugzilla
Message-ID: <20080916134424.71049208DA5@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on poppler (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Tue Sep 16 13:44:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 13:44:28 +0000
Subject: [pkgdb] poppler: rdieter has requested watchcommits
Message-ID: <20080916134428.6C6A5208DA7@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on poppler (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poppler



From dwalsh at fedoraproject.org  Tue Sep 16 13:47:33 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 16 Sep 2008 13:47:33 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.97,
	1.98 policy-20080710.patch, 1.30, 1.31
Message-ID: <20080916134733.B76D670138@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19461

Modified Files:
	modules-targeted.conf policy-20080710.patch 
Log Message:
* Thu Sep 11 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-1
- Merge upstream changes
- Add Xavier Toth patches



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- modules-targeted.conf	12 Sep 2008 20:36:20 -0000	1.97
+++ modules-targeted.conf	16 Sep 2008 13:47:03 -0000	1.98
@@ -1598,6 +1598,11 @@
 prelude = module
 
 # Layer: services
+# Module: pads
+#
+pads = module
+
+# Layer: services
 # Module: kerneloops
 #
 # program  to  collect  and  submit  kernel oopses to kerneloops.org

policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- policy-20080710.patch	12 Sep 2008 20:36:20 -0000	1.30
+++ policy-20080710.patch	16 Sep 2008 13:47:03 -0000	1.31
@@ -284,8 +284,12 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.5.8/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/alsa.te	2008-09-12 10:59:28.000000000 -0400
-@@ -51,6 +51,8 @@
++++ serefpolicy-3.5.8/policy/modules/admin/alsa.te	2008-09-15 14:54:22.000000000 -0400
+@@ -48,9 +48,12 @@
+ 
+ files_search_home(alsa_t)
+ files_read_etc_files(alsa_t)
++files_read_usr_files(alsa_t)
  
  auth_use_nsswitch(alsa_t)
  
@@ -1162,7 +1166,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.5.8/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/rpm.te	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/rpm.te	2008-09-16 09:14:33.000000000 -0400
 @@ -31,6 +31,9 @@
  files_type(rpm_var_lib_t)
  typealias rpm_var_lib_t alias var_lib_rpm_t;
@@ -1173,7 +1177,17 @@
  type rpm_script_t;
  type rpm_script_exec_t;
  domain_obj_id_change_exemption(rpm_script_t)
-@@ -89,6 +92,9 @@
+@@ -52,7 +55,8 @@
+ # rpm Local policy
+ #
+ 
+-allow rpm_t self:capability { chown dac_override fowner fsetid setgid setuid sys_chroot sys_tty_config mknod };
++allow rpm_t self:capability { chown dac_override fowner fsetid ipc_lock setgid setuid sys_chroot sys_nice sys_tty_config mknod };
++
+ allow rpm_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
+ allow rpm_t self:process { getattr setexec setfscreate setrlimit };
+ allow rpm_t self:fd use;
+@@ -89,8 +93,12 @@
  manage_files_pattern(rpm_t, rpm_var_lib_t, rpm_var_lib_t)
  files_var_lib_filetrans(rpm_t, rpm_var_lib_t, dir)
  
@@ -1182,8 +1196,19 @@
 +
  kernel_read_system_state(rpm_t)
  kernel_read_kernel_sysctls(rpm_t)
++kernel_read_network_state_symlinks(rpm_t)
  
-@@ -179,10 +185,20 @@
+ corecmd_exec_all_executables(rpm_t)
+ 
+@@ -117,6 +125,7 @@
+ fs_manage_nfs_symlinks(rpm_t)
+ fs_getattr_all_fs(rpm_t)
+ fs_search_auto_mountpoints(rpm_t)
++fs_list_inotifyfs(rpm_t)
+ 
+ mls_file_read_all_levels(rpm_t)
+ mls_file_write_all_levels(rpm_t)
+@@ -179,10 +188,20 @@
  ')
  
  optional_policy(`
@@ -1204,7 +1229,7 @@
  	prelink_domtrans(rpm_t)
  ')
  
-@@ -190,6 +206,7 @@
+@@ -190,6 +209,7 @@
  	unconfined_domain(rpm_t)
  	# yum-updatesd requires this
  	unconfined_dbus_chat(rpm_t)
@@ -1212,16 +1237,42 @@
  ')
  
  ifdef(`TODO',`
-@@ -216,7 +233,7 @@
+@@ -215,8 +235,8 @@
+ # rpm-script Local policy
  #
  
- allow rpm_script_t self:capability { chown dac_override dac_read_search fowner fsetid setgid setuid ipc_lock sys_chroot sys_nice mknod kill };
+-allow rpm_script_t self:capability { chown dac_override dac_read_search fowner fsetid setgid setuid ipc_lock sys_chroot sys_nice mknod kill };
 -allow rpm_script_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
++allow rpm_script_t self:capability { chown dac_override dac_read_search fowner fsetid setgid setuid ipc_lock sys_admin sys_chroot sys_ptrace sys_nice mknod kill };
 +allow rpm_script_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execheap };
  allow rpm_script_t self:fd use;
  allow rpm_script_t self:fifo_file rw_fifo_file_perms;
  allow rpm_script_t self:unix_dgram_socket create_socket_perms;
-@@ -317,6 +334,7 @@
+@@ -227,12 +247,15 @@
+ allow rpm_script_t self:sem create_sem_perms;
+ allow rpm_script_t self:msgq create_msgq_perms;
+ allow rpm_script_t self:msg { send receive };
++allow rpm_script_t self:netlink_kobject_uevent_socket create_socket_perms;
+ 
+ allow rpm_script_t rpm_tmp_t:file read_file_perms;
+ 
+ allow rpm_script_t rpm_script_tmp_t:dir mounton;
+ manage_dirs_pattern(rpm_script_t, rpm_script_tmp_t, rpm_script_tmp_t)
+ manage_files_pattern(rpm_script_t, rpm_script_tmp_t, rpm_script_tmp_t)
++manage_blk_files_pattern(rpm_script_t, rpm_script_tmp_t, rpm_script_tmp_t)
++manage_chr_files_pattern(rpm_script_t, rpm_script_tmp_t, rpm_script_tmp_t)
+ files_tmp_filetrans(rpm_script_t, rpm_script_tmp_t, { file dir })
+ 
+ manage_dirs_pattern(rpm_script_t, rpm_script_tmpfs_t, rpm_script_tmpfs_t)
+@@ -298,6 +321,7 @@
+ files_exec_etc_files(rpm_script_t)
+ files_read_etc_runtime_files(rpm_script_t)
+ files_exec_usr_files(rpm_script_t)
++files_relabel_all_files(rpm_script_t)
+ 
+ init_domtrans_script(rpm_script_t)
+ 
+@@ -317,6 +341,7 @@
  seutil_domtrans_loadpolicy(rpm_script_t)
  seutil_domtrans_setfiles(rpm_script_t)
  seutil_domtrans_semanage(rpm_script_t)
@@ -1229,7 +1280,18 @@
  
  userdom_use_all_users_fds(rpm_script_t)
  
-@@ -342,6 +360,7 @@
+@@ -335,6 +360,10 @@
+ ')
+ 
+ optional_policy(`
++	lvm_domtrans(rpm_script_t)
++')
++
++optional_policy(`
+ 	tzdata_domtrans(rpm_t)
+ 	tzdata_domtrans(rpm_script_t)
+ ')
+@@ -342,6 +371,7 @@
  optional_policy(`
  	unconfined_domain(rpm_script_t)
  	unconfined_domtrans(rpm_script_t)
@@ -1237,7 +1299,7 @@
  
  	optional_policy(`
  		java_domtrans(rpm_script_t)
-@@ -352,6 +371,11 @@
+@@ -352,6 +382,11 @@
  	')
  ')
  
@@ -1933,7 +1995,7 @@
 +HOME_DIR/.pulse(/.*)?		gen_context(system_u:object_r:gnome_home_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.5.8/policy/modules/apps/gnome.if
 --- nsaserefpolicy/policy/modules/apps/gnome.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/gnome.if	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/gnome.if	2008-09-15 14:57:34.000000000 -0400
 @@ -36,6 +36,7 @@
  	gen_require(`
  		type gconfd_exec_t, gconf_etc_t;
@@ -2081,7 +2143,7 @@
  ## </summary>
  ## <param name="userdomain_prefix">
  ##	<summary>
-@@ -183,11 +200,95 @@
+@@ -183,11 +200,96 @@
  ##	</summary>
  ## </param>
  #
@@ -2117,6 +2179,7 @@
 +
 +	manage_dirs_pattern($2, gnome_home_t, gnome_home_t)
 +	manage_files_pattern($2, gnome_home_t, gnome_home_t)
++	manage_lnk_files_pattern($2, gnome_home_t, gnome_home_t)
 +')
 +
 +########################################
@@ -4464,8 +4527,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.5.8/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/apps/nsplugin.te	2008-09-12 10:59:28.000000000 -0400
-@@ -0,0 +1,226 @@
++++ serefpolicy-3.5.8/policy/modules/apps/nsplugin.te	2008-09-15 13:09:59.000000000 -0400
+@@ -0,0 +1,228 @@
 +
 +policy_module(nsplugin, 1.0.0)
 +
@@ -4547,6 +4610,7 @@
 +dev_read_video_dev(nsplugin_t)
 +dev_write_video_dev(nsplugin_t)
 +dev_getattr_dri_dev(nsplugin_t)
++dev_rwx_zero(nsplugin_t)
 +
 +kernel_read_kernel_sysctls(nsplugin_t)
 +kernel_read_system_state(nsplugin_t)
@@ -4605,6 +4669,7 @@
 +
 +optional_policy(`
 +	mplayer_exec(nsplugin_t)
++	mplayer_read_user_home_files(user, nsplugin_t)
 +')
 +
 +optional_policy(`
@@ -4629,7 +4694,7 @@
 +# nsplugin_config local policy
 +#
 +
-+allow nsplugin_config_t self:capability { sys_nice setuid setgid };
++allow nsplugin_config_t self:capability { dac_override dac_read_search sys_nice setuid setgid };
 +allow nsplugin_config_t self:process { setsched sigkill getsched execmem };
 +#execing pulseaudio
 +dontaudit nsplugin_t self:process { getcap setcap };
@@ -7091,7 +7156,7 @@
  # /emul
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.5.8/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/files.if	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/files.if	2008-09-16 09:05:30.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -8453,8 +8518,8 @@
 +logging_admin(logadm_t, logadm_r, { logadm_devpts_t logadm_tty_device_t })
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/staff.te serefpolicy-3.5.8/policy/modules/roles/staff.te
 --- nsaserefpolicy/policy/modules/roles/staff.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/roles/staff.te	2008-09-12 10:59:28.000000000 -0400
-@@ -8,23 +8,52 @@
++++ serefpolicy-3.5.8/policy/modules/roles/staff.te	2008-09-15 14:58:31.000000000 -0400
+@@ -8,23 +8,55 @@
  
  role staff_r;
  
@@ -8467,6 +8532,9 @@
  #
  
 +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)
 +
 +auth_domtrans_pam_console(staff_t)
 +
@@ -20147,7 +20215,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pads.te serefpolicy-3.5.8/policy/modules/services/pads.te
 --- nsaserefpolicy/policy/modules/services/pads.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/pads.te	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/pads.te	2008-09-15 13:00:58.000000000 -0400
 @@ -0,0 +1,66 @@
 +
 +policy_module(pads, 0.0.1) 
@@ -20163,7 +20231,7 @@
 +role system_r types pads_t;
 +
 +type pads_script_exec_t;
-+init_script_type(pads_script_exec_t)
++init_script_file(pads_script_exec_t)
 +
 +type pads_config_t;
 +files_config_file(pads_config_t)
@@ -20213,7 +20281,7 @@
 +sysnet_dns_name_resolve(pads_t)
 +
 +optional_policy(`
-+        prelude_rw_spool(pads_t)
++        prelude_manage_spool(pads_t)
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.te serefpolicy-3.5.8/policy/modules/services/pcscd.te
 --- nsaserefpolicy/policy/modules/services/pcscd.te	2008-08-07 11:15:11.000000000 -0400
@@ -20880,7 +20948,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.5.8/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/postfix.te	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/postfix.te	2008-09-15 10:53:20.000000000 -0400
 @@ -6,6 +6,14 @@
  # Declarations
  #
@@ -21098,17 +21166,21 @@
  	uucp_domtrans_uux(postfix_pipe_t)
  ')
  
-@@ -443,8 +491,7 @@
+@@ -443,8 +491,11 @@
  ')
  
  optional_policy(`
 -	ppp_use_fds(postfix_postqueue_t)
 -	ppp_sigchld(postfix_postqueue_t)
++	sendmail_rw_unix_stream_sockets(postfix_postdrop_t)
++')
++
++optional_policy(`
 +	uucp_manage_spool(postfix_postdrop_t)
  ')
  
  #######################################
-@@ -470,6 +517,15 @@
+@@ -470,6 +521,15 @@
  init_sigchld_script(postfix_postqueue_t)
  init_use_script_fds(postfix_postqueue_t)
  
@@ -21124,18 +21196,18 @@
  ########################################
  #
  # Postfix qmgr local policy
-@@ -564,6 +620,10 @@
- 	sasl_connect(postfix_smtpd_t)
- ')
+@@ -553,6 +613,10 @@
+ mta_read_aliases(postfix_smtpd_t)
  
-+optional_policy(`
+ optional_policy(`
 +	dovecot_auth_stream_connect(postfix_smtpd_t)
 +')
 +
- ########################################
- #
- # Postfix virtual local policy
-@@ -579,7 +639,7 @@
++optional_policy(`
+ 	mailman_read_data_files(postfix_smtpd_t)
+ ')
+ 
+@@ -579,7 +643,7 @@
  files_tmp_filetrans(postfix_virtual_t, postfix_virtual_tmp_t, { file dir })
  
  # connect to master process
@@ -24891,8 +24963,16 @@
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.fc serefpolicy-3.5.8/policy/modules/services/snmp.fc
 --- nsaserefpolicy/policy/modules/services/snmp.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/snmp.fc	2008-09-12 10:59:29.000000000 -0400
-@@ -17,3 +17,6 @@
++++ serefpolicy-3.5.8/policy/modules/services/snmp.fc	2008-09-15 12:30:27.000000000 -0400
+@@ -8,6 +8,7 @@
+ #
+ # /var
+ #
++/var/agentx(/.*)?		gen_context(system_u:object_r:snmpd_var_lib_t,s0)
+ /var/lib/net-snmp(/.*)?		gen_context(system_u:object_r:snmpd_var_lib_t,s0)
+ /var/lib/snmp(/.*)?		gen_context(system_u:object_r:snmpd_var_lib_t,s0)
+ 
+@@ -17,3 +18,6 @@
  
  /var/run/snmpd		-d	gen_context(system_u:object_r:snmpd_var_run_t,s0)
  /var/run/snmpd\.pid	--	gen_context(system_u:object_r:snmpd_var_run_t,s0)
@@ -30587,7 +30667,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.5.8/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2008-09-03 10:17:00.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/logging.te	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/logging.te	2008-09-15 13:03:25.000000000 -0400
 @@ -72,6 +72,12 @@
  logging_log_file(var_log_t)
  files_mountpoint(var_log_t)
@@ -30601,7 +30681,15 @@
  ifdef(`enable_mls',`
  	init_ranged_daemon_domain(auditd_t, auditd_exec_t, mls_systemhigh)
  	init_ranged_daemon_domain(syslogd_t, syslogd_exec_t, mls_systemhigh)
-@@ -145,6 +151,7 @@
+@@ -124,6 +130,7 @@
+ allow auditd_t self:file { getattr read write };
+ allow auditd_t self:unix_dgram_socket create_socket_perms;
+ allow auditd_t self:fifo_file rw_file_perms;
++allow auditd_t self:tcp_socket create_stream_socket_perms;
+ 
+ allow auditd_t auditd_etc_t:dir list_dir_perms;
+ allow auditd_t auditd_etc_t:file read_file_perms;
+@@ -145,9 +152,18 @@
  
  fs_getattr_all_fs(auditd_t)
  fs_search_auto_mountpoints(auditd_t)
@@ -30609,7 +30697,18 @@
  
  selinux_search_fs(auditctl_t)
  
-@@ -241,6 +248,7 @@
++corenet_all_recvfrom_unlabeled(auditd_t)
++corenet_all_recvfrom_netlabel(auditd_t)
++corenet_tcp_sendrecv_all_if(auditd_t)
++corenet_tcp_sendrecv_all_nodes(auditd_t)
++corenet_tcp_sendrecv_all_ports(auditd_t)
++corenet_tcp_bind_all_nodes(auditd_t)
++corenet_tcp_bind_audit_port(auditd_t)
++
+ # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
+ # Probably want a transition, and a new auditd_helper app
+ corecmd_exec_bin(auditd_t)
+@@ -241,6 +257,7 @@
  corenet_all_recvfrom_netlabel(audisp_remote_t)
  corenet_tcp_sendrecv_all_if(audisp_remote_t)
  corenet_tcp_sendrecv_all_nodes(audisp_remote_t)
@@ -31625,7 +31724,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.8/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/selinuxutil.te	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/selinuxutil.te	2008-09-15 11:59:39.000000000 -0400
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -31708,17 +31807,16 @@
  logging_send_syslog_msg(newrole_t)
  
  miscfiles_read_localization(newrole_t)
-@@ -347,6 +351,9 @@
+@@ -347,6 +351,8 @@
  
  seutil_libselinux_linked(restorecond_t)
  
-+userdom_read_all_users_home_dirs_symlinks(restorecond_t)
 +userdom_read_all_users_home_content_symlinks(restorecond_t)
 +
  ifdef(`distro_ubuntu',`
  	optional_policy(`
  		unconfined_domain(restorecond_t)
-@@ -365,7 +372,7 @@
+@@ -365,7 +371,7 @@
  allow run_init_t self:process setexec;
  allow run_init_t self:capability setuid;
  allow run_init_t self:fifo_file rw_file_perms;
@@ -31727,7 +31825,7 @@
  
  # often the administrator runs such programs from a directory that is owned
  # by a different user or has restrictive SE permissions, do not want to audit
-@@ -396,7 +403,6 @@
+@@ -396,7 +402,6 @@
  
  auth_use_nsswitch(run_init_t)
  auth_domtrans_chk_passwd(run_init_t)
@@ -31735,7 +31833,7 @@
  auth_dontaudit_read_shadow(run_init_t)
  
  init_spec_domtrans_script(run_init_t)
-@@ -435,64 +441,22 @@
+@@ -435,64 +440,22 @@
  # semodule local policy
  #
  
@@ -31808,7 +31906,7 @@
  # netfilter_contexts:
  seutil_manage_default_contexts(semanage_t)
  
-@@ -501,12 +465,27 @@
+@@ -501,12 +464,27 @@
  	files_read_var_lib_symlinks(semanage_t)
  ')
  
@@ -31836,7 +31934,7 @@
  # cjp: need a more general way to handle this:
  ifdef(`enable_mls',`
  	# read secadm tmp files
-@@ -514,121 +493,42 @@
+@@ -514,121 +492,42 @@
  	# Handle pp files created in homedir and /tmp
  	sysadm_read_home_content_files(semanage_t)
  	sysadm_read_tmp_files(semanage_t)
@@ -33142,7 +33240,7 @@
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.5.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/userdomain.if	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/userdomain.if	2008-09-15 11:58:54.000000000 -0400
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -36115,7 +36213,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.8/policy/support/file_patterns.spt
 --- nsaserefpolicy/policy/support/file_patterns.spt	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/support/file_patterns.spt	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/support/file_patterns.spt	2008-09-16 09:08:28.000000000 -0400
 @@ -537,3 +537,18 @@
  	allow $1 $2:dir rw_dir_perms;
  	type_transition $1 $2:$4 $3;



From than at fedoraproject.org  Tue Sep 16 13:48:42 2008
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 16 Sep 2008 13:48:42 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.39, 1.40 kde-settings.spec,
	1.55, 1.56 sources, 1.38, 1.39
Message-ID: <20080916134842.1FB6770138@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19807

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
remove unneeded symlinks in Fedora-KDE icon theme



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	15 Sep 2008 22:37:31 -0000	1.39
+++ .cvsignore	16 Sep 2008 13:48:11 -0000	1.40
@@ -1,2 +1,3 @@
 kde-settings-4.0-25.tar.bz2
 kde-settings-4.0-26.tar.bz2
+kde-settings-4.0-27.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kde-settings.spec	15 Sep 2008 22:37:31 -0000	1.55
+++ kde-settings.spec	16 Sep 2008 13:48:11 -0000	1.56
@@ -1,7 +1,7 @@
 # THIS SPECFILE IS FOR F9+ ONLY!
 # Sorry, it is just too different for conditionals to be worth it.
 
-%define rel 26
+%define rel 27
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.0-27
+- remove unneeded symlinks in Fedora-KDE icon theme
+
 * Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.0-26
 - fix, systemsettings->icons doesn't show icons by Fedora-KDE
   icon theme


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	15 Sep 2008 22:37:31 -0000	1.38
+++ sources	16 Sep 2008 13:48:11 -0000	1.39
@@ -1 +1 @@
-c67cc9ba9e899830103b3d0cc765896a  kde-settings-4.0-26.tar.bz2
+3f4d5a966401bc107039d2d553a4156c  kde-settings-4.0-27.tar.bz2



From jwilson at fedoraproject.org  Tue Sep 16 13:50:22 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 16 Sep 2008 13:50:22 +0000 (UTC)
Subject: rpms/lirc/F-9 lirc-0.8.3-validate-transmit-buffer.patch, NONE,
	1.1 lirc-dont-exit.patch, NONE, 1.1 lirc.spec, 1.31, 1.32
Message-ID: <20080916135022.BBF2170138@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/lirc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20168

Modified Files:
	lirc.spec 
Added Files:
	lirc-0.8.3-validate-transmit-buffer.patch lirc-dont-exit.patch 
Log Message:
* Tue Sep 16 2008 Jarod Wilson <jarod at redhat.com> - 0.8.3-2
- Fix multilib upgrade path from F8 (Nicolas Chauvet, #462435)
- Include upstream patch to validate transmit buffers
- Make lircd not exit when there's no device available, so that the
  daemon is running as expected when the hardware is plugged back in
  (Bastien Nocera, #440231)


lirc-0.8.3-validate-transmit-buffer.patch:

--- NEW FILE lirc-0.8.3-validate-transmit-buffer.patch ---
--- lirc/daemons/transmit.c	2007/07/29 18:20:13	5.27
+++ lirc/daemons/transmit.c	2008/05/11 13:29:47	5.28
@@ -1,4 +1,4 @@
-/*      $Id: transmit.c,v 5.27 2007/07/29 18:20:13 lirc Exp $      */
+/*      $Id: transmit.c,v 5.28 2008/05/11 13:29:47 lirc Exp $      */
 
 /****************************************************************************
  ** transmit.c **************************************************************
@@ -116,6 +116,34 @@
 	return(0);
 }
 
+static int check_send_buffer(void)
+{
+	int i;
+
+	if (send_buffer.wptr == 0) 
+	{
+		LOGPRINTF(1, "nothing to send");
+		return(0);
+	}
+	for (i = 0; i < send_buffer.wptr; i++)
+	{
+		if(send_buffer.data[i] == 0)
+		{
+			if(i%2)
+			{
+				LOGPRINTF(1, "invalid space: %d", i);
+			}
+			else
+			{
+				LOGPRINTF(1, "invalid pulse: %d", i);
+			}
+			return 0;
+		}
+	}
+	
+	return 1;
+}
+
 static inline void flush_send_buffer(void)
 {
 	if(send_buffer.pendingp>0)
@@ -500,5 +528,13 @@
 		goto init_send_loop;
 	}
 	LOGPRINTF(3, "transmit buffer ready");
-	return(1);
+	if(!check_send_buffer())
+	{
+		logprintf(LOG_ERR, "invalid send buffer");
+		logprintf(LOG_ERR,
+			  "this remote configuration cannot be used "
+			  "to transmit");
+		return 0;
+	}
+	return 1;
 }

lirc-dont-exit.patch:

--- NEW FILE lirc-dont-exit.patch ---
--- daemons/lircd.c	2008/05/09 18:40:59	5.77
+++ daemons/lircd.c	2008/08/21 18:39:25	5.78
@@ -515,10 +515,13 @@
 		{
 			if(!hw.init_func())
 			{
-				shutdown(clis[0],2);
-				close(clis[0]);
-				clin=0;
-				dosigterm(SIGTERM);
+				logprintf(LOG_WARNING,
+					  "Failed to initialize hardware");
+				/* Don't exit here, otherwise lirc
+				 * bails out, and lircd exits, making
+				 * it impossible to connect to when we
+				 * have a device actually plugged
+				 * in. */
 			}
 		}
 	}


Index: lirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-9/lirc.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- lirc.spec	4 May 2008 18:21:52 -0000	1.31
+++ lirc.spec	16 Sep 2008 13:49:52 -0000	1.32
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.3
-Release:        1%{?pre:.%{pre}}%{?dist}
+Release:        2%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -28,6 +28,8 @@
 #Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
+Patch0:         lirc-0.8.3-validate-transmit-buffer.patch
+Patch1:         lirc-dont-exit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -60,6 +62,8 @@
 %package        libs
 Summary:        LIRC libraries
 Group:          System Environment/Libraries
+# Fix old F8 multilib upgrade path issue
+Obsoletes:      %{name} < 0.8.3
 
 %description    libs
 LIRC is a package that allows you to decode and send infra-red and
@@ -97,6 +101,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?pre}
+%patch0 -p1 -b .xbuf
+%patch1 -p1 -b .exit
 
 chmod 644 contrib/*
 
@@ -233,6 +239,13 @@
 
 
 %changelog
+* Tue Sep 16 2008 Jarod Wilson <jarod at redhat.com> - 0.8.3-2
+- Fix multilib upgrade path from F8 (Nicolas Chauvet, #462435)
+- Include upstream patch to validate transmit buffers
+- Make lircd not exit when there's no device available, so that the
+  daemon is running as expected when the hardware is plugged back in
+  (Bastien Nocera, #440231)
+
 * Sun May 04 2008 Jarod Wilson <jwilson at redhat.com> - 0.8.3-1
 - Update to 0.8.3 release
 



From dwalsh at fedoraproject.org  Tue Sep 16 13:57:16 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 16 Sep 2008 13:57:16 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20080710.patch, 1.31, 1.32 sources,
	1.163, 1.164
Message-ID: <20080916135716.1EBCB70138@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21026

Modified Files:
	policy-20080710.patch sources 
Log Message:
* Thu Sep 11 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-1
- Merge upstream changes
- Add Xavier Toth patches


policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- policy-20080710.patch	16 Sep 2008 13:47:03 -0000	1.31
+++ policy-20080710.patch	16 Sep 2008 13:57:15 -0000	1.32
@@ -33240,7 +33240,7 @@
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.5.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/userdomain.if	2008-09-15 11:58:54.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/userdomain.if	2008-09-16 09:56:01.000000000 -0400
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -34377,7 +34377,7 @@
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -1189,36 +1183,45 @@
+@@ -1189,36 +1183,49 @@
  		')
  	')
  
@@ -34416,6 +34416,10 @@
  
  	optional_policy(`
 -		setroubleshoot_stream_connect($1_t)
++		cron_per_role_template($1, $1_usertype, $1_r)
++	')
++
++	optional_policy(`
 +		nsplugin_per_role_template($1, $1_usertype, $1_r)
 +	')
 +
@@ -34436,7 +34440,7 @@
  	')
  ')
  
-@@ -1295,8 +1298,6 @@
+@@ -1295,8 +1302,6 @@
  	# Manipulate other users crontab.
  	allow $1_t self:passwd crontab;
  
@@ -34445,7 +34449,7 @@
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
  	kernel_getattr_message_if($1_t)
-@@ -1318,8 +1319,6 @@
+@@ -1318,8 +1323,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -34454,7 +34458,7 @@
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1374,13 +1373,6 @@
+@@ -1374,13 +1377,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -34468,7 +34472,7 @@
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1432,6 +1424,7 @@
+@@ -1432,6 +1428,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -34476,7 +34480,7 @@
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1461,10 +1454,6 @@
+@@ -1461,10 +1458,6 @@
  	seutil_run_semanage($1,$2,$3)
  	seutil_run_setfiles($1, $2, $3)
  
@@ -34487,7 +34491,7 @@
  	optional_policy(`
  		aide_run($1,$2, $3)
  	')
-@@ -1484,6 +1473,14 @@
+@@ -1484,6 +1477,14 @@
  	optional_policy(`
  		netlabel_run_mgmt($1,$2, $3)
  	')
@@ -34502,7 +34506,7 @@
  ')
  
  ########################################
-@@ -1741,11 +1738,15 @@
+@@ -1741,11 +1742,15 @@
  #
  template(`userdom_user_home_content',`
  	gen_require(`
@@ -34521,7 +34525,7 @@
  ')
  
  ########################################
-@@ -1841,11 +1842,11 @@
+@@ -1841,11 +1846,11 @@
  #
  template(`userdom_search_user_home_dirs',`
  	gen_require(`
@@ -34535,7 +34539,7 @@
  ')
  
  ########################################
-@@ -1875,11 +1876,11 @@
+@@ -1875,11 +1880,11 @@
  #
  template(`userdom_list_user_home_dirs',`
  	gen_require(`
@@ -34549,7 +34553,7 @@
  ')
  
  ########################################
-@@ -1923,12 +1924,12 @@
+@@ -1923,12 +1928,12 @@
  #
  template(`userdom_user_home_domtrans',`
  	gen_require(`
@@ -34565,7 +34569,7 @@
  ')
  
  ########################################
-@@ -1958,10 +1959,11 @@
+@@ -1958,10 +1963,11 @@
  #
  template(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
@@ -34579,7 +34583,7 @@
  ')
  
  ########################################
-@@ -1993,11 +1995,47 @@
+@@ -1993,11 +1999,47 @@
  #
  template(`userdom_manage_user_home_content_dirs',`
  	gen_require(`
@@ -34629,7 +34633,7 @@
  ')
  
  ########################################
-@@ -2029,10 +2067,10 @@
+@@ -2029,10 +2071,10 @@
  #
  template(`userdom_dontaudit_setattr_user_home_content_files',`
  	gen_require(`
@@ -34642,7 +34646,7 @@
  ')
  
  ########################################
-@@ -2062,11 +2100,11 @@
+@@ -2062,11 +2104,11 @@
  #
  template(`userdom_read_user_home_content_files',`
  	gen_require(`
@@ -34656,7 +34660,7 @@
  ')
  
  ########################################
-@@ -2096,11 +2134,11 @@
+@@ -2096,11 +2138,11 @@
  #
  template(`userdom_dontaudit_read_user_home_content_files',`
  	gen_require(`
@@ -34671,7 +34675,7 @@
  ')
  
  ########################################
-@@ -2130,10 +2168,14 @@
+@@ -2130,10 +2172,14 @@
  #
  template(`userdom_dontaudit_write_user_home_content_files',`
  	gen_require(`
@@ -34688,7 +34692,7 @@
  ')
  
  ########################################
-@@ -2163,11 +2205,11 @@
+@@ -2163,11 +2209,11 @@
  #
  template(`userdom_read_user_home_content_symlinks',`
  	gen_require(`
@@ -34702,7 +34706,7 @@
  ')
  
  ########################################
-@@ -2197,11 +2239,11 @@
+@@ -2197,11 +2243,11 @@
  #
  template(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -34716,7 +34720,7 @@
  ')
  
  ########################################
-@@ -2231,10 +2273,10 @@
+@@ -2231,10 +2277,10 @@
  #
  template(`userdom_dontaudit_exec_user_home_content_files',`
  	gen_require(`
@@ -34729,7 +34733,7 @@
  ')
  
  ########################################
-@@ -2266,12 +2308,12 @@
+@@ -2266,12 +2312,12 @@
  #
  template(`userdom_manage_user_home_content_files',`
  	gen_require(`
@@ -34745,7 +34749,7 @@
  ')
  
  ########################################
-@@ -2303,10 +2345,10 @@
+@@ -2303,10 +2349,10 @@
  #
  template(`userdom_dontaudit_manage_user_home_content_dirs',`
  	gen_require(`
@@ -34758,7 +34762,7 @@
  ')
  
  ########################################
-@@ -2338,12 +2380,12 @@
+@@ -2338,12 +2384,12 @@
  #
  template(`userdom_manage_user_home_content_symlinks',`
  	gen_require(`
@@ -34774,7 +34778,7 @@
  ')
  
  ########################################
-@@ -2375,12 +2417,12 @@
+@@ -2375,12 +2421,12 @@
  #
  template(`userdom_manage_user_home_content_pipes',`
  	gen_require(`
@@ -34790,7 +34794,7 @@
  ')
  
  ########################################
-@@ -2412,12 +2454,12 @@
+@@ -2412,12 +2458,12 @@
  #
  template(`userdom_manage_user_home_content_sockets',`
  	gen_require(`
@@ -34806,7 +34810,7 @@
  ')
  
  ########################################
-@@ -2462,11 +2504,11 @@
+@@ -2462,11 +2508,11 @@
  #
  template(`userdom_user_home_dir_filetrans',`
  	gen_require(`
@@ -34820,7 +34824,7 @@
  ')
  
  ########################################
-@@ -2511,11 +2553,11 @@
+@@ -2511,11 +2557,11 @@
  #
  template(`userdom_user_home_content_filetrans',`
  	gen_require(`
@@ -34834,7 +34838,7 @@
  ')
  
  ########################################
-@@ -2555,11 +2597,11 @@
+@@ -2555,11 +2601,11 @@
  #
  template(`userdom_user_home_dir_filetrans_user_home_content',`
  	gen_require(`
@@ -34848,7 +34852,7 @@
  ')
  
  ########################################
-@@ -2589,11 +2631,11 @@
+@@ -2589,11 +2635,11 @@
  #
  template(`userdom_write_user_tmp_sockets',`
  	gen_require(`
@@ -34862,7 +34866,7 @@
  ')
  
  ########################################
-@@ -2623,11 +2665,11 @@
+@@ -2623,11 +2669,11 @@
  #
  template(`userdom_list_user_tmp',`
  	gen_require(`
@@ -34876,7 +34880,7 @@
  ')
  
  ########################################
-@@ -2659,10 +2701,10 @@
+@@ -2659,10 +2705,10 @@
  #
  template(`userdom_dontaudit_list_user_tmp',`
  	gen_require(`
@@ -34889,7 +34893,7 @@
  ')
  
  ########################################
-@@ -2694,10 +2736,10 @@
+@@ -2694,10 +2740,10 @@
  #
  template(`userdom_dontaudit_manage_user_tmp_dirs',`
  	gen_require(`
@@ -34902,7 +34906,7 @@
  ')
  
  ########################################
-@@ -2727,12 +2769,12 @@
+@@ -2727,12 +2773,12 @@
  #
  template(`userdom_read_user_tmp_files',`
  	gen_require(`
@@ -34918,7 +34922,7 @@
  ')
  
  ########################################
-@@ -2764,10 +2806,10 @@
+@@ -2764,10 +2810,10 @@
  #
  template(`userdom_dontaudit_read_user_tmp_files',`
  	gen_require(`
@@ -34931,7 +34935,7 @@
  ')
  
  ########################################
-@@ -2799,10 +2841,10 @@
+@@ -2799,10 +2845,10 @@
  #
  template(`userdom_dontaudit_append_user_tmp_files',`
  	gen_require(`
@@ -34944,7 +34948,7 @@
  ')
  
  ########################################
-@@ -2832,12 +2874,12 @@
+@@ -2832,12 +2878,12 @@
  #
  template(`userdom_rw_user_tmp_files',`
  	gen_require(`
@@ -34960,7 +34964,7 @@
  ')
  
  ########################################
-@@ -2869,10 +2911,10 @@
+@@ -2869,10 +2915,10 @@
  #
  template(`userdom_dontaudit_manage_user_tmp_files',`
  	gen_require(`
@@ -34973,7 +34977,7 @@
  ')
  
  ########################################
-@@ -2904,12 +2946,12 @@
+@@ -2904,12 +2950,12 @@
  #
  template(`userdom_read_user_tmp_symlinks',`
  	gen_require(`
@@ -34989,7 +34993,7 @@
  ')
  
  ########################################
-@@ -2941,11 +2983,11 @@
+@@ -2941,11 +2987,11 @@
  #
  template(`userdom_manage_user_tmp_dirs',`
  	gen_require(`
@@ -35003,7 +35007,7 @@
  ')
  
  ########################################
-@@ -2977,11 +3019,11 @@
+@@ -2977,11 +3023,11 @@
  #
  template(`userdom_manage_user_tmp_files',`
  	gen_require(`
@@ -35017,7 +35021,7 @@
  ')
  
  ########################################
-@@ -3013,11 +3055,11 @@
+@@ -3013,11 +3059,11 @@
  #
  template(`userdom_manage_user_tmp_symlinks',`
  	gen_require(`
@@ -35031,7 +35035,7 @@
  ')
  
  ########################################
-@@ -3049,11 +3091,11 @@
+@@ -3049,11 +3095,11 @@
  #
  template(`userdom_manage_user_tmp_pipes',`
  	gen_require(`
@@ -35045,7 +35049,7 @@
  ')
  
  ########################################
-@@ -3085,11 +3127,11 @@
+@@ -3085,11 +3131,11 @@
  #
  template(`userdom_manage_user_tmp_sockets',`
  	gen_require(`
@@ -35059,7 +35063,7 @@
  ')
  
  ########################################
-@@ -3134,10 +3176,10 @@
+@@ -3134,10 +3180,10 @@
  #
  template(`userdom_user_tmp_filetrans',`
  	gen_require(`
@@ -35072,7 +35076,7 @@
  	files_search_tmp($2)
  ')
  
-@@ -3178,19 +3220,19 @@
+@@ -3178,19 +3224,19 @@
  #
  template(`userdom_tmp_filetrans_user_tmp',`
  	gen_require(`
@@ -35096,7 +35100,7 @@
  ##	</p>
  ##	<p>
  ##	This is a templated interface, and should only
-@@ -4616,11 +4658,11 @@
+@@ -4616,11 +4662,11 @@
  #
  interface(`userdom_search_all_users_home_dirs',`
  	gen_require(`
@@ -35110,7 +35114,7 @@
  ')
  
  ########################################
-@@ -4640,6 +4682,14 @@
+@@ -4640,6 +4686,14 @@
  
  	files_list_home($1)
  	allow $1 home_dir_type:dir list_dir_perms;
@@ -35125,7 +35129,7 @@
  ')
  
  ########################################
-@@ -4677,6 +4727,8 @@
+@@ -4677,6 +4731,8 @@
  	')
  
  	dontaudit $1 { home_dir_type home_type }:dir search_dir_perms;
@@ -35134,7 +35138,7 @@
  ')
  
  ########################################
-@@ -4721,6 +4773,25 @@
+@@ -4721,6 +4777,25 @@
  
  ########################################
  ## <summary>
@@ -35160,7 +35164,7 @@
  ##	Create, read, write, and delete all files
  ##	in all users home directories.
  ## </summary>
-@@ -4946,7 +5017,7 @@
+@@ -4946,7 +5021,7 @@
  
  ########################################
  ## <summary>
@@ -35169,11 +35173,103 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -5318,6 +5389,42 @@
+@@ -5318,7 +5393,7 @@
  
  ########################################
  ## <summary>
+-##	Read and write unprivileged user ttys.
 +##	Write all unprivileged users files in /tmp
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -5326,18 +5401,17 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_use_unpriv_users_ttys',`
++interface(`userdom_manage_unpriv_users_tmp_files',`
+ 	gen_require(`
+-		attribute user_ttynode;
++		type user_tmp_t;
+ 	')
+ 
+-	allow $1 user_ttynode:chr_file rw_term_perms;
++	manage_files_pattern($1, user_tmp_t,  user_tmp_t)
+ ')
+ 
+ ########################################
+ ## <summary>
+-##	Do not audit attempts to use unprivileged
+-##	user ttys.
++##	Write all unprivileged users lnk_files in /tmp
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -5345,17 +5419,17 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_dontaudit_use_unpriv_users_ttys',`
++interface(`userdom_manage_unpriv_users_tmp_symlinks',`
+ 	gen_require(`
+-		attribute user_ttynode;
++		type user_tmp_t;
+ 	')
+ 
+-	dontaudit $1 user_ttynode:chr_file rw_file_perms;
++	manage_lnk_files_pattern($1, user_tmp_t,  user_tmp_t)
+ ')
+ 
+ ########################################
+ ## <summary>
+-##	Read the process state of all user domains.
++##	Read and write unprivileged user ttys.
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -5363,18 +5437,18 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_read_all_users_state',`
++interface(`userdom_use_unpriv_users_ttys',`
+ 	gen_require(`
+-		attribute userdomain;
++		attribute user_ttynode;
+ 	')
+ 
+-	read_files_pattern($1,userdomain,userdomain)
+-	kernel_search_proc($1)
++	allow $1 user_ttynode:chr_file rw_term_perms;
+ ')
+ 
+ ########################################
+ ## <summary>
+-##	Get the attributes of all user domains.
++##	Do not audit attempts to use unprivileged
++##	user ttys.
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -5382,17 +5456,54 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_getattr_all_users',`
++interface(`userdom_dontaudit_use_unpriv_users_ttys',`
+ 	gen_require(`
+-		attribute userdomain;
++		attribute user_ttynode;
+ 	')
+ 
+-	allow $1 userdomain:process getattr;
++	dontaudit $1 user_ttynode:chr_file rw_file_perms;
+ ')
+ 
+ ########################################
+ ## <summary>
+-##	Inherit the file descriptors from all user domains
++##	Read the process state of all user domains.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -35181,17 +35277,18 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_manage_unpriv_users_tmp_files',`
++interface(`userdom_read_all_users_state',`
 +	gen_require(`
-+		type user_tmp_t;
++		attribute userdomain;
 +	')
 +
-+	manage_files_pattern($1, user_tmp_t,  user_tmp_t)
++	ps_process_pattern($1, userdomain)
++	kernel_search_proc($1)
 +')
 +
 +########################################
 +## <summary>
-+##	Write all unprivileged users lnk_files in /tmp
++##	Get the attributes of all user domains.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -35199,42 +35296,32 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_manage_unpriv_users_tmp_symlinks',`
++interface(`userdom_getattr_all_users',`
 +	gen_require(`
-+		type user_tmp_t;
++		attribute userdomain;
 +	')
 +
-+	manage_lnk_files_pattern($1, user_tmp_t,  user_tmp_t)
++	allow $1 userdomain:process getattr;
 +')
 +
 +########################################
 +## <summary>
- ##	Read and write unprivileged user ttys.
++##	Inherit the file descriptors from all user domains
  ## </summary>
  ## <param name="domain">
-@@ -5368,7 +5475,7 @@
- 		attribute userdomain;
- 	')
- 
--	read_files_pattern($1,userdomain,userdomain)
-+	ps_process_pattern($1, userdomain)
- 	kernel_search_proc($1)
- ')
- 
-@@ -5483,7 +5590,7 @@
+ ##	<summary>
+@@ -5483,6 +5594,42 @@
  
  ########################################
  ## <summary>
--##	Send a dbus message to all user domains.
 +##	Manage keys for all user domains.
- ## </summary>
- ## <param name="domain">
- ##	<summary>
-@@ -5491,7 +5598,43 @@
- ##	</summary>
- ## </param>
- #
--interface(`userdom_dbus_send_all_users',`
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
 +interface(`userdom_manage_all_users_keys',`
 +	gen_require(`
 +		attribute userdomain;
@@ -35263,19 +35350,10 @@
 +
 +########################################
 +## <summary>
-+##	Send a dbus message to all user domains.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`userdom_dbus_send_all_users',`
- 	gen_require(`
- 		attribute userdomain;
- 		class dbus send_msg;
-@@ -5513,3 +5656,524 @@
+ ##	Send a dbus message to all user domains.
+ ## </summary>
+ ## <param name="domain">
+@@ -5513,3 +5660,524 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- sources	12 Sep 2008 20:36:21 -0000	1.163
+++ sources	16 Sep 2008 13:57:15 -0000	1.164
@@ -1 +1 @@
-1b4c8999f49501d5bcfc81fb2498b2e6  serefpolicy-3.5.8.tgz
+dcacf4cddcb4232564044e8d33c4d28e  serefpolicy-3.5.8.tgz



From pkgdb at fedoraproject.org  Tue Sep 16 13:58:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 13:58:16 +0000
Subject: [pkgdb] poppler had acl change status
Message-ID: <20080916135816.C7165208DA4@bastion.fedora.phx.redhat.com>

krh has set the watchbugzilla acl on poppler (Fedora devel) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Tue Sep 16 13:58:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 13:58:18 +0000
Subject: [pkgdb] poppler had acl change status
Message-ID: <20080916135818.B2022208DA7@bastion.fedora.phx.redhat.com>

krh has set the watchcommits acl on poppler (Fedora devel) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poppler



From jwilson at fedoraproject.org  Tue Sep 16 14:01:52 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 16 Sep 2008 14:01:52 +0000 (UTC)
Subject: rpms/lirc/F-9 lirc-dont-exit.patch,1.1,1.2
Message-ID: <20080916140152.7DE1670138@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/lirc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21523

Modified Files:
	lirc-dont-exit.patch 
Log Message:
oops, patchlevel borked

lirc-dont-exit.patch:

Index: lirc-dont-exit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-9/lirc-dont-exit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lirc-dont-exit.patch	16 Sep 2008 13:49:52 -0000	1.1
+++ lirc-dont-exit.patch	16 Sep 2008 14:01:22 -0000	1.2
@@ -1,5 +1,5 @@
---- daemons/lircd.c	2008/05/09 18:40:59	5.77
-+++ daemons/lircd.c	2008/08/21 18:39:25	5.78
+--- lirc/daemons/lircd.c	2008/05/09 18:40:59	5.77
++++ lirc/daemons/lircd.c	2008/08/21 18:39:25	5.78
 @@ -515,10 +515,13 @@
  		{
  			if(!hw.init_func())



From jwilson at fedoraproject.org  Tue Sep 16 14:27:51 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 16 Sep 2008 14:27:51 +0000 (UTC)
Subject: rpms/lirc/F-8 lirc-0.8.3-validate-transmit-buffer.patch, NONE,
	1.1 lirc-dont-exit.patch, NONE, 1.1 lirc.spec, 1.29, 1.30
Message-ID: <20080916142751.BC6F870138@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/lirc/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23936

Modified Files:
	lirc.spec 
Added Files:
	lirc-0.8.3-validate-transmit-buffer.patch lirc-dont-exit.patch 
Log Message:
* Tue Sep 16 2008 Jarod Wilson <jarod at redhat.com> - 0.8.3-2
- Fix multilib upgrade path from F8 (Nicolas Chauvet, #462435)
- Include upstream patch to validate transmit buffers
- Make lircd not exit when there's no device available, so that the
  daemon is running as expected when the hardware is plugged back in
  (Bastien Nocera, #440231)


lirc-0.8.3-validate-transmit-buffer.patch:

--- NEW FILE lirc-0.8.3-validate-transmit-buffer.patch ---
--- lirc/daemons/transmit.c	2007/07/29 18:20:13	5.27
+++ lirc/daemons/transmit.c	2008/05/11 13:29:47	5.28
@@ -1,4 +1,4 @@
-/*      $Id: transmit.c,v 5.27 2007/07/29 18:20:13 lirc Exp $      */
+/*      $Id: transmit.c,v 5.28 2008/05/11 13:29:47 lirc Exp $      */
 
 /****************************************************************************
  ** transmit.c **************************************************************
@@ -116,6 +116,34 @@
 	return(0);
 }
 
+static int check_send_buffer(void)
+{
+	int i;
+
+	if (send_buffer.wptr == 0) 
+	{
+		LOGPRINTF(1, "nothing to send");
+		return(0);
+	}
+	for (i = 0; i < send_buffer.wptr; i++)
+	{
+		if(send_buffer.data[i] == 0)
+		{
+			if(i%2)
+			{
+				LOGPRINTF(1, "invalid space: %d", i);
+			}
+			else
+			{
+				LOGPRINTF(1, "invalid pulse: %d", i);
+			}
+			return 0;
+		}
+	}
+	
+	return 1;
+}
+
 static inline void flush_send_buffer(void)
 {
 	if(send_buffer.pendingp>0)
@@ -500,5 +528,13 @@
 		goto init_send_loop;
 	}
 	LOGPRINTF(3, "transmit buffer ready");
-	return(1);
+	if(!check_send_buffer())
+	{
+		logprintf(LOG_ERR, "invalid send buffer");
+		logprintf(LOG_ERR,
+			  "this remote configuration cannot be used "
+			  "to transmit");
+		return 0;
+	}
+	return 1;
 }

lirc-dont-exit.patch:

--- NEW FILE lirc-dont-exit.patch ---
--- lirc/daemons/lircd.c	2008/05/09 18:40:59	5.77
+++ lirc/daemons/lircd.c	2008/08/21 18:39:25	5.78
@@ -515,10 +515,13 @@
 		{
 			if(!hw.init_func())
 			{
-				shutdown(clis[0],2);
-				close(clis[0]);
-				clin=0;
-				dosigterm(SIGTERM);
+				logprintf(LOG_WARNING,
+					  "Failed to initialize hardware");
+				/* Don't exit here, otherwise lirc
+				 * bails out, and lircd exits, making
+				 * it impossible to connect to when we
+				 * have a device actually plugged
+				 * in. */
 			}
 		}
 	}


Index: lirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-8/lirc.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- lirc.spec	4 May 2008 18:36:00 -0000	1.29
+++ lirc.spec	16 Sep 2008 14:27:20 -0000	1.30
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.3
-Release:        1%{?pre:.%{pre}}%{?dist}
+Release:        2%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -28,6 +28,8 @@
 #Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
+Patch0:         lirc-0.8.3-validate-transmit-buffer.patch
+Patch1:         lirc-dont-exit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -60,6 +62,8 @@
 %package        libs
 Summary:        LIRC libraries
 Group:          System Environment/Libraries
+# Fix old F8 multilib upgrade path issue
+Obsoletes:      %{name} < 0.8.3
 
 %description    libs
 LIRC is a package that allows you to decode and send infra-red and
@@ -97,6 +101,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?pre}
+%patch0 -p1 -b .xbuf
+%patch1 -p1 -b .exit
 
 chmod 644 contrib/*
 
@@ -233,6 +239,13 @@
 
 
 %changelog
+* Tue Sep 16 2008 Jarod Wilson <jarod at redhat.com> - 0.8.3-2
+- Fix multilib upgrade path from F8 (Nicolas Chauvet, #462435)
+- Include upstream patch to validate transmit buffers
+- Make lircd not exit when there's no device available, so that the
+  daemon is running as expected when the hardware is plugged back in
+  (Bastien Nocera, #440231)
+
 * Sun May 04 2008 Jarod Wilson <jwilson at redhat.com> - 0.8.3-1
 - Update to 0.8.3 release
 



From pkgdb at fedoraproject.org  Tue Sep 16 14:37:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 14:37:37 +0000
Subject: [pkgdb] dstat: adrianalves has requested watchbugzilla
Message-ID: <20080916143737.65F50208D9A@bastion.fedora.phx.redhat.com>

adrianalves has requested the watchbugzilla acl on dstat (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dstat



From pkgdb at fedoraproject.org  Tue Sep 16 14:37:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 14:37:39 +0000
Subject: [pkgdb] dstat: adrianalves has requested watchcommits
Message-ID: <20080916143739.2581D208DA2@bastion.fedora.phx.redhat.com>

adrianalves has requested the watchcommits acl on dstat (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dstat



From nosnilmot at fedoraproject.org  Tue Sep 16 14:39:50 2008
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Tue, 16 Sep 2008 14:39:50 +0000 (UTC)
Subject: rpms/pidgin/F-9 pidgin-2.5.1-buddyicon.patch, NONE,
	1.1 pidgin-2.5.1-msn-hasyou.patch, NONE,
	1.1 pidgin-2.5.1-nss-ssl.patch, NONE, 1.1 pidgin.spec, 1.57, 1.58
Message-ID: <20080916143950.1F3FB7013C@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/pidgin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24985/F-9

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.5.1-buddyicon.patch pidgin-2.5.1-msn-hasyou.patch 
	pidgin-2.5.1-nss-ssl.patch 
Log Message:
- Backport fixes from upstream:
  Add "Has You:" back to MSN tooltips
  Fix crash during removal of your own buddy icon
  Fix crash when handling self signed certificate with NSS SSL



pidgin-2.5.1-buddyicon.patch:

--- NEW FILE pidgin-2.5.1-buddyicon.patch ---
-----------------------------------------------------------------
Revision: 21e781181213d3cb9f08fd3e74b9f452ef615f03
Ancestor: 48c5c9c72107408d63250fe0d7feb41f812a5d66
Author: qulogic at pidgin.im
Date: 2008-09-07T19:58:04
Branch: im.pidgin.pidgin

Modified files:
        libpurple/buddyicon.c libpurple/buddyicon.h

ChangeLog: 

Don't try to read data from a NULL filename in 
purple_buddy_icons_node_set_custom_icon_from_file. Also document that 
you can use NULL to unset the icon.

Fixes #6998.

============================================================
--- libpurple/buddyicon.c	18d12d638239af5082ec913211ade4a888b74af2
+++ libpurple/buddyicon.c	dbb00fa1c7275c14d773a9073830c5d0b41deca2
@@ -934,8 +934,8 @@ purple_buddy_icons_node_set_custom_icon_
 purple_buddy_icons_node_set_custom_icon_from_file(PurpleBlistNode *node,
                                                   const gchar *filename)
 {
-	size_t len;
-	guchar *data;
+	size_t len = 0;
+	guchar *data = NULL;
 
 	g_return_val_if_fail(node != NULL, NULL);
 
@@ -945,8 +945,10 @@ purple_buddy_icons_node_set_custom_icon_
 		return NULL;
 	}
 
-	if (!read_icon_file(filename, &data, &len)) {
-		return NULL;
+	if (filename != NULL) {
+		if (!read_icon_file(filename, &data, &len)) {
+			return NULL;
+		}
 	}
 
 	return purple_buddy_icons_node_set_custom_icon(node, data, len);
============================================================
--- libpurple/buddyicon.h	9833d0334d2e344c5b0924db76d2c268d3fb2042
+++ libpurple/buddyicon.h	15012fdc49959c5117aa9eb99b7649574d77db35
@@ -308,7 +308,7 @@ purple_buddy_icons_node_find_custom_icon
  *
  * @param node      The blist node for which to set a custom icon.
  * @param icon_data The image data of the icon, which the buddy icon code will
- *                  free.
+ *                  free. Use NULL to unset the icon.
  * @param icon_len  The length of the data in @a icon_data.
  *
  * @return The icon that was set. The caller does NOT own a reference to this,
@@ -326,7 +326,8 @@ purple_buddy_icons_node_set_custom_icon(
  * @see purple_buddy_icons_node_set_custom_icon()
  *
  * @param node      The blist node for which to set a custom icon.
- * @param filename  The path to the icon to set for the blist node.
+ * @param filename  The path to the icon to set for the blist node. Use NULL
+ *                  to unset the custom icon.
  *
  * @return The icon that was set. The caller does NOT own a reference to this,
  *         and must call purple_imgstore_ref() if it wants one.

pidgin-2.5.1-msn-hasyou.patch:

--- NEW FILE pidgin-2.5.1-msn-hasyou.patch ---
-----------------------------------------------------------------
Revision: 6a2fea9024166e4d473b00a87489c720617e3094
Ancestor: 99a1dadde07d817852916ae3c150683b6b8c4f81
Author: qulogic at pidgin.im
Date: 2008-09-06T02:57:57
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/msn/msn.c

ChangeLog: 

We can't have ./configure lying to you, can we?

Fixes #6637.

============================================================
--- libpurple/protocols/msn/msn.c	5ced63fdc012e5df5bcd46ade1efd81be14e6344
+++ libpurple/protocols/msn/msn.c	04fad6deed88391af6dba93608670cf94724bf97
@@ -769,6 +769,9 @@ msn_tooltip_text(PurpleBuddy *buddy, Pur
 	{
 		const char *phone;
 
+		purple_notify_user_info_add_pair(user_info, _("Has you"),
+									   ((user->list_op & (1 << MSN_LIST_RL)) ? _("Yes") : _("No")));
+
 		purple_notify_user_info_add_pair(user_info, _("Blocked"),
 									   ((user->list_op & (1 << MSN_LIST_BL)) ? _("Yes") : _("No")));
 

pidgin-2.5.1-nss-ssl.patch:

--- NEW FILE pidgin-2.5.1-nss-ssl.patch ---
-----------------------------------------------------------------
Revision: 3cbc74478c8df61d53804d0363dc936a3e0adeb7
Ancestor: 254e5a24031a74103097db812ae3e723d696c11d
Author: datallah at pidgin.im
Date: 2008-09-08T23:04:15
Branch: im.pidgin.pidgin

Modified files:
        libpurple/plugins/ssl/ssl-nss.c

ChangeLog: 

Fix a NULL pointer deref in the NSS SSL implementation with certain self-signed
certs.
Fixes #7013

============================================================
--- libpurple/plugins/ssl/ssl-nss.c	c6c576ba92370703e89850d8e6dc88b7fec3e523
+++ libpurple/plugins/ssl/ssl-nss.c	d6de7a59c8b1c42086fd8e7153865718fc3289e6
@@ -285,7 +285,8 @@ ssl_nss_get_peer_certificates(PRFileDesc
 	}
 	
 	for (count = 0 ; count < CERT_MAX_CERT_CHAIN ; count++) {
-		purple_debug_info("nss", "subject=%s issuer=%s\n", curcert->subjectName, curcert->issuerName);
+		purple_debug_info("nss", "subject=%s issuer=%s\n", curcert->subjectName,
+						  curcert->issuerName  ? curcert->issuerName : "(null)");
 		newcrt = x509_import_from_nss(curcert);
 		peer_certs = g_list_append(peer_certs, newcrt);
 
@@ -676,7 +677,8 @@ x509_signed_by(PurpleCertificate * crt,
 	subjectCert = X509_NSS_DATA(crt);
 	g_return_val_if_fail(subjectCert, FALSE);
 
-	if ( PORT_Strcmp(subjectCert->issuerName, issuerCert->subjectName) != 0 )
+	if (subjectCert->issuerName == NULL
+			|| PORT_Strcmp(subjectCert->issuerName, issuerCert->subjectName) != 0)
 		return FALSE;
 	st = CERT_VerifySignedData(&subjectCert->signatureWrap, issuerCert, PR_Now(), NULL);
 	return st == SECSuccess;


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-9/pidgin.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- pidgin.spec	16 Sep 2008 13:28:32 -0000	1.57
+++ pidgin.spec	16 Sep 2008 14:39:19 -0000	1.58
@@ -29,7 +29,7 @@
 
 Name:		pidgin
 Version:	2.5.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -63,6 +63,10 @@
 
 ## Patches 100+: To be Included in Future Upstream
 Patch100:       pidgin-2.5.1-gnomeproxy.patch
+Patch101:       pidgin-2.5.1-buddyicon.patch
+Patch102:       pidgin-2.5.1-msn-hasyou.patch
+Patch103:       pidgin-2.5.1-nss-ssl.patch
+
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -293,6 +297,9 @@
 
 ## Patches 100+: To be Included in Future Upstream
 %patch100 -p0 -b .gnomeproxy
+%patch101 -p0 -b .buddyicon
+%patch102 -p0 -b .hasyou
+%patch103 -p0 -b .nss
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -502,6 +509,12 @@
 
 
 %changelog
+* Tue Sep 16 2008 Stu Tomlinson <stu at nosnilmot.com> 2.5.1-3
+- Backport fixes from upstream:
+  Add "Has You:" back to MSN tooltips
+  Fix crash during removal of your own buddy icon
+  Fix crash when handling self signed certificate with NSS SSL
+
 * Tue Sep 16 2008 Stu Tomlinson <stu at nosnilmot.com> 2.5.1-2
 - Fix a crash with GNOME proxy enabled (#461951)
 



From nosnilmot at fedoraproject.org  Tue Sep 16 14:39:50 2008
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Tue, 16 Sep 2008 14:39:50 +0000 (UTC)
Subject: rpms/pidgin/F-8 pidgin-2.5.1-buddyicon.patch, NONE,
	1.1 pidgin-2.5.1-msn-hasyou.patch, NONE,
	1.1 pidgin-2.5.1-nss-ssl.patch, NONE, 1.1 pidgin.spec, 1.52, 1.53
Message-ID: <20080916143950.18AE670138@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/pidgin/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24985/F-8

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.5.1-buddyicon.patch pidgin-2.5.1-msn-hasyou.patch 
	pidgin-2.5.1-nss-ssl.patch 
Log Message:
- Backport fixes from upstream:
  Add "Has You:" back to MSN tooltips
  Fix crash during removal of your own buddy icon
  Fix crash when handling self signed certificate with NSS SSL



pidgin-2.5.1-buddyicon.patch:

--- NEW FILE pidgin-2.5.1-buddyicon.patch ---
-----------------------------------------------------------------
Revision: 21e781181213d3cb9f08fd3e74b9f452ef615f03
Ancestor: 48c5c9c72107408d63250fe0d7feb41f812a5d66
Author: qulogic at pidgin.im
Date: 2008-09-07T19:58:04
Branch: im.pidgin.pidgin

Modified files:
        libpurple/buddyicon.c libpurple/buddyicon.h

ChangeLog: 

Don't try to read data from a NULL filename in 
purple_buddy_icons_node_set_custom_icon_from_file. Also document that 
you can use NULL to unset the icon.

Fixes #6998.

============================================================
--- libpurple/buddyicon.c	18d12d638239af5082ec913211ade4a888b74af2
+++ libpurple/buddyicon.c	dbb00fa1c7275c14d773a9073830c5d0b41deca2
@@ -934,8 +934,8 @@ purple_buddy_icons_node_set_custom_icon_
 purple_buddy_icons_node_set_custom_icon_from_file(PurpleBlistNode *node,
                                                   const gchar *filename)
 {
-	size_t len;
-	guchar *data;
+	size_t len = 0;
+	guchar *data = NULL;
 
 	g_return_val_if_fail(node != NULL, NULL);
 
@@ -945,8 +945,10 @@ purple_buddy_icons_node_set_custom_icon_
 		return NULL;
 	}
 
-	if (!read_icon_file(filename, &data, &len)) {
-		return NULL;
+	if (filename != NULL) {
+		if (!read_icon_file(filename, &data, &len)) {
+			return NULL;
+		}
 	}
 
 	return purple_buddy_icons_node_set_custom_icon(node, data, len);
============================================================
--- libpurple/buddyicon.h	9833d0334d2e344c5b0924db76d2c268d3fb2042
+++ libpurple/buddyicon.h	15012fdc49959c5117aa9eb99b7649574d77db35
@@ -308,7 +308,7 @@ purple_buddy_icons_node_find_custom_icon
  *
  * @param node      The blist node for which to set a custom icon.
  * @param icon_data The image data of the icon, which the buddy icon code will
- *                  free.
+ *                  free. Use NULL to unset the icon.
  * @param icon_len  The length of the data in @a icon_data.
  *
  * @return The icon that was set. The caller does NOT own a reference to this,
@@ -326,7 +326,8 @@ purple_buddy_icons_node_set_custom_icon(
  * @see purple_buddy_icons_node_set_custom_icon()
  *
  * @param node      The blist node for which to set a custom icon.
- * @param filename  The path to the icon to set for the blist node.
+ * @param filename  The path to the icon to set for the blist node. Use NULL
+ *                  to unset the custom icon.
  *
  * @return The icon that was set. The caller does NOT own a reference to this,
  *         and must call purple_imgstore_ref() if it wants one.

pidgin-2.5.1-msn-hasyou.patch:

--- NEW FILE pidgin-2.5.1-msn-hasyou.patch ---
-----------------------------------------------------------------
Revision: 6a2fea9024166e4d473b00a87489c720617e3094
Ancestor: 99a1dadde07d817852916ae3c150683b6b8c4f81
Author: qulogic at pidgin.im
Date: 2008-09-06T02:57:57
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/msn/msn.c

ChangeLog: 

We can't have ./configure lying to you, can we?

Fixes #6637.

============================================================
--- libpurple/protocols/msn/msn.c	5ced63fdc012e5df5bcd46ade1efd81be14e6344
+++ libpurple/protocols/msn/msn.c	04fad6deed88391af6dba93608670cf94724bf97
@@ -769,6 +769,9 @@ msn_tooltip_text(PurpleBuddy *buddy, Pur
 	{
 		const char *phone;
 
+		purple_notify_user_info_add_pair(user_info, _("Has you"),
+									   ((user->list_op & (1 << MSN_LIST_RL)) ? _("Yes") : _("No")));
+
 		purple_notify_user_info_add_pair(user_info, _("Blocked"),
 									   ((user->list_op & (1 << MSN_LIST_BL)) ? _("Yes") : _("No")));
 

pidgin-2.5.1-nss-ssl.patch:

--- NEW FILE pidgin-2.5.1-nss-ssl.patch ---
-----------------------------------------------------------------
Revision: 3cbc74478c8df61d53804d0363dc936a3e0adeb7
Ancestor: 254e5a24031a74103097db812ae3e723d696c11d
Author: datallah at pidgin.im
Date: 2008-09-08T23:04:15
Branch: im.pidgin.pidgin

Modified files:
        libpurple/plugins/ssl/ssl-nss.c

ChangeLog: 

Fix a NULL pointer deref in the NSS SSL implementation with certain self-signed
certs.
Fixes #7013

============================================================
--- libpurple/plugins/ssl/ssl-nss.c	c6c576ba92370703e89850d8e6dc88b7fec3e523
+++ libpurple/plugins/ssl/ssl-nss.c	d6de7a59c8b1c42086fd8e7153865718fc3289e6
@@ -285,7 +285,8 @@ ssl_nss_get_peer_certificates(PRFileDesc
 	}
 	
 	for (count = 0 ; count < CERT_MAX_CERT_CHAIN ; count++) {
-		purple_debug_info("nss", "subject=%s issuer=%s\n", curcert->subjectName, curcert->issuerName);
+		purple_debug_info("nss", "subject=%s issuer=%s\n", curcert->subjectName,
+						  curcert->issuerName  ? curcert->issuerName : "(null)");
 		newcrt = x509_import_from_nss(curcert);
 		peer_certs = g_list_append(peer_certs, newcrt);
 
@@ -676,7 +677,8 @@ x509_signed_by(PurpleCertificate * crt,
 	subjectCert = X509_NSS_DATA(crt);
 	g_return_val_if_fail(subjectCert, FALSE);
 
-	if ( PORT_Strcmp(subjectCert->issuerName, issuerCert->subjectName) != 0 )
+	if (subjectCert->issuerName == NULL
+			|| PORT_Strcmp(subjectCert->issuerName, issuerCert->subjectName) != 0)
 		return FALSE;
 	st = CERT_VerifySignedData(&subjectCert->signatureWrap, issuerCert, PR_Now(), NULL);
 	return st == SECSuccess;


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-8/pidgin.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- pidgin.spec	16 Sep 2008 13:28:31 -0000	1.52
+++ pidgin.spec	16 Sep 2008 14:39:18 -0000	1.53
@@ -29,7 +29,7 @@
 
 Name:		pidgin
 Version:	2.5.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -63,6 +63,10 @@
 
 ## Patches 100+: To be Included in Future Upstream
 Patch100:       pidgin-2.5.1-gnomeproxy.patch
+Patch101:       pidgin-2.5.1-buddyicon.patch
+Patch102:       pidgin-2.5.1-msn-hasyou.patch
+Patch103:       pidgin-2.5.1-nss-ssl.patch
+
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -293,6 +297,9 @@
 
 ## Patches 100+: To be Included in Future Upstream
 %patch100 -p0 -b .gnomeproxy
+%patch101 -p0 -b .buddyicon
+%patch102 -p0 -b .hasyou
+%patch103 -p0 -b .nss
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -502,6 +509,12 @@
 
 
 %changelog
+* Tue Sep 16 2008 Stu Tomlinson <stu at nosnilmot.com> 2.5.1-3
+- Backport fixes from upstream:
+  Add "Has You:" back to MSN tooltips
+  Fix crash during removal of your own buddy icon
+  Fix crash when handling self signed certificate with NSS SSL
+
 * Tue Sep 16 2008 Stu Tomlinson <stu at nosnilmot.com> 2.5.1-2
 - Fix a crash with GNOME proxy enabled (#461951)
 



From nosnilmot at fedoraproject.org  Tue Sep 16 14:39:50 2008
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Tue, 16 Sep 2008 14:39:50 +0000 (UTC)
Subject: rpms/pidgin/devel pidgin-2.5.1-buddyicon.patch, NONE,
	1.1 pidgin-2.5.1-msn-hasyou.patch, NONE,
	1.1 pidgin-2.5.1-nss-ssl.patch, NONE, 1.1 pidgin.spec, 1.59, 1.60
Message-ID: <20080916143950.6923E7013C@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24985/devel

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.5.1-buddyicon.patch pidgin-2.5.1-msn-hasyou.patch 
	pidgin-2.5.1-nss-ssl.patch 
Log Message:
- Backport fixes from upstream:
  Add "Has You:" back to MSN tooltips
  Fix crash during removal of your own buddy icon
  Fix crash when handling self signed certificate with NSS SSL



pidgin-2.5.1-buddyicon.patch:

--- NEW FILE pidgin-2.5.1-buddyicon.patch ---
-----------------------------------------------------------------
Revision: 21e781181213d3cb9f08fd3e74b9f452ef615f03
Ancestor: 48c5c9c72107408d63250fe0d7feb41f812a5d66
Author: qulogic at pidgin.im
Date: 2008-09-07T19:58:04
Branch: im.pidgin.pidgin

Modified files:
        libpurple/buddyicon.c libpurple/buddyicon.h

ChangeLog: 

Don't try to read data from a NULL filename in 
purple_buddy_icons_node_set_custom_icon_from_file. Also document that 
you can use NULL to unset the icon.

Fixes #6998.

============================================================
--- libpurple/buddyicon.c	18d12d638239af5082ec913211ade4a888b74af2
+++ libpurple/buddyicon.c	dbb00fa1c7275c14d773a9073830c5d0b41deca2
@@ -934,8 +934,8 @@ purple_buddy_icons_node_set_custom_icon_
 purple_buddy_icons_node_set_custom_icon_from_file(PurpleBlistNode *node,
                                                   const gchar *filename)
 {
-	size_t len;
-	guchar *data;
+	size_t len = 0;
+	guchar *data = NULL;
 
 	g_return_val_if_fail(node != NULL, NULL);
 
@@ -945,8 +945,10 @@ purple_buddy_icons_node_set_custom_icon_
 		return NULL;
 	}
 
-	if (!read_icon_file(filename, &data, &len)) {
-		return NULL;
+	if (filename != NULL) {
+		if (!read_icon_file(filename, &data, &len)) {
+			return NULL;
+		}
 	}
 
 	return purple_buddy_icons_node_set_custom_icon(node, data, len);
============================================================
--- libpurple/buddyicon.h	9833d0334d2e344c5b0924db76d2c268d3fb2042
+++ libpurple/buddyicon.h	15012fdc49959c5117aa9eb99b7649574d77db35
@@ -308,7 +308,7 @@ purple_buddy_icons_node_find_custom_icon
  *
  * @param node      The blist node for which to set a custom icon.
  * @param icon_data The image data of the icon, which the buddy icon code will
- *                  free.
+ *                  free. Use NULL to unset the icon.
  * @param icon_len  The length of the data in @a icon_data.
  *
  * @return The icon that was set. The caller does NOT own a reference to this,
@@ -326,7 +326,8 @@ purple_buddy_icons_node_set_custom_icon(
  * @see purple_buddy_icons_node_set_custom_icon()
  *
  * @param node      The blist node for which to set a custom icon.
- * @param filename  The path to the icon to set for the blist node.
+ * @param filename  The path to the icon to set for the blist node. Use NULL
+ *                  to unset the custom icon.
  *
  * @return The icon that was set. The caller does NOT own a reference to this,
  *         and must call purple_imgstore_ref() if it wants one.

pidgin-2.5.1-msn-hasyou.patch:

--- NEW FILE pidgin-2.5.1-msn-hasyou.patch ---
-----------------------------------------------------------------
Revision: 6a2fea9024166e4d473b00a87489c720617e3094
Ancestor: 99a1dadde07d817852916ae3c150683b6b8c4f81
Author: qulogic at pidgin.im
Date: 2008-09-06T02:57:57
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/msn/msn.c

ChangeLog: 

We can't have ./configure lying to you, can we?

Fixes #6637.

============================================================
--- libpurple/protocols/msn/msn.c	5ced63fdc012e5df5bcd46ade1efd81be14e6344
+++ libpurple/protocols/msn/msn.c	04fad6deed88391af6dba93608670cf94724bf97
@@ -769,6 +769,9 @@ msn_tooltip_text(PurpleBuddy *buddy, Pur
 	{
 		const char *phone;
 
+		purple_notify_user_info_add_pair(user_info, _("Has you"),
+									   ((user->list_op & (1 << MSN_LIST_RL)) ? _("Yes") : _("No")));
+
 		purple_notify_user_info_add_pair(user_info, _("Blocked"),
 									   ((user->list_op & (1 << MSN_LIST_BL)) ? _("Yes") : _("No")));
 

pidgin-2.5.1-nss-ssl.patch:

--- NEW FILE pidgin-2.5.1-nss-ssl.patch ---
-----------------------------------------------------------------
Revision: 3cbc74478c8df61d53804d0363dc936a3e0adeb7
Ancestor: 254e5a24031a74103097db812ae3e723d696c11d
Author: datallah at pidgin.im
Date: 2008-09-08T23:04:15
Branch: im.pidgin.pidgin

Modified files:
        libpurple/plugins/ssl/ssl-nss.c

ChangeLog: 

Fix a NULL pointer deref in the NSS SSL implementation with certain self-signed
certs.
Fixes #7013

============================================================
--- libpurple/plugins/ssl/ssl-nss.c	c6c576ba92370703e89850d8e6dc88b7fec3e523
+++ libpurple/plugins/ssl/ssl-nss.c	d6de7a59c8b1c42086fd8e7153865718fc3289e6
@@ -285,7 +285,8 @@ ssl_nss_get_peer_certificates(PRFileDesc
 	}
 	
 	for (count = 0 ; count < CERT_MAX_CERT_CHAIN ; count++) {
-		purple_debug_info("nss", "subject=%s issuer=%s\n", curcert->subjectName, curcert->issuerName);
+		purple_debug_info("nss", "subject=%s issuer=%s\n", curcert->subjectName,
+						  curcert->issuerName  ? curcert->issuerName : "(null)");
 		newcrt = x509_import_from_nss(curcert);
 		peer_certs = g_list_append(peer_certs, newcrt);
 
@@ -676,7 +677,8 @@ x509_signed_by(PurpleCertificate * crt,
 	subjectCert = X509_NSS_DATA(crt);
 	g_return_val_if_fail(subjectCert, FALSE);
 
-	if ( PORT_Strcmp(subjectCert->issuerName, issuerCert->subjectName) != 0 )
+	if (subjectCert->issuerName == NULL
+			|| PORT_Strcmp(subjectCert->issuerName, issuerCert->subjectName) != 0)
 		return FALSE;
 	st = CERT_VerifySignedData(&subjectCert->signatureWrap, issuerCert, PR_Now(), NULL);
 	return st == SECSuccess;


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- pidgin.spec	16 Sep 2008 13:28:31 -0000	1.59
+++ pidgin.spec	16 Sep 2008 14:39:20 -0000	1.60
@@ -29,7 +29,7 @@
 
 Name:		pidgin
 Version:	2.5.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -63,6 +63,10 @@
 
 ## Patches 100+: To be Included in Future Upstream
 Patch100:       pidgin-2.5.1-gnomeproxy.patch
+Patch101:       pidgin-2.5.1-buddyicon.patch
+Patch102:       pidgin-2.5.1-msn-hasyou.patch
+Patch103:       pidgin-2.5.1-nss-ssl.patch
+
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -293,6 +297,9 @@
 
 ## Patches 100+: To be Included in Future Upstream
 %patch100 -p0 -b .gnomeproxy
+%patch101 -p0 -b .buddyicon
+%patch102 -p0 -b .hasyou
+%patch103 -p0 -b .nss
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -502,6 +509,12 @@
 
 
 %changelog
+* Tue Sep 16 2008 Stu Tomlinson <stu at nosnilmot.com> 2.5.1-3
+- Backport fixes from upstream:
+  Add "Has You:" back to MSN tooltips
+  Fix crash during removal of your own buddy icon
+  Fix crash when handling self signed certificate with NSS SSL
+
 * Tue Sep 16 2008 Stu Tomlinson <stu at nosnilmot.com> 2.5.1-2
 - Fix a crash with GNOME proxy enabled (#461951)
 



From rdieter at fedoraproject.org  Tue Sep 16 14:40:54 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 16 Sep 2008 14:40:54 +0000 (UTC)
Subject: rpms/libmusicbrainz3/devel .cvsignore, 1.2, 1.3 libmusicbrainz3.spec,
	1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20080916144054.7583A70138@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libmusicbrainz3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25118

Modified Files:
	.cvsignore libmusicbrainz3.spec sources 
Log Message:
* Tue Sep 16 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.2-1
- libmusicbrainz3-3.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmusicbrainz3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Jul 2008 23:35:51 -0000	1.2
+++ .cvsignore	16 Sep 2008 14:40:24 -0000	1.3
@@ -1 +1 @@
-libmusicbrainz-3.0.1.tar.gz
+libmusicbrainz-3.0.2.tar.gz


Index: libmusicbrainz3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmusicbrainz3/devel/libmusicbrainz3.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libmusicbrainz3.spec	5 Sep 2008 11:48:43 -0000	1.4
+++ libmusicbrainz3.spec	16 Sep 2008 14:40:24 -0000	1.5
@@ -3,8 +3,8 @@
 
 Summary: Library for accessing MusicBrainz servers
 Name: libmusicbrainz3
-Version: 3.0.1 
-Release: 4%{?dist}
+Version: 3.0.2
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.musicbrainz.org/
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.2-1
+- libmusicbrainz3-3.0.2
+
 * Fri Sep 05 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.1-4
 - Build docs (#461238)
 - -devel: drop extraneous Requires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmusicbrainz3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Jul 2008 23:35:51 -0000	1.2
+++ sources	16 Sep 2008 14:40:24 -0000	1.3
@@ -1 +1 @@
-d42110ae548dae1eea73e83b03a1a936  libmusicbrainz-3.0.1.tar.gz
+648ecd43f7b80852419aaf73702bc23f  libmusicbrainz-3.0.2.tar.gz



From apevec at fedoraproject.org  Tue Sep 16 14:46:29 2008
From: apevec at fedoraproject.org (Alan Pevec)
Date: Tue, 16 Sep 2008 14:46:29 +0000 (UTC)
Subject: rpms/collectd/EL-5 collectd-4.4.3-include-collectd.d.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 collectd.spec, 1.15, 1.16 sources, 1.5,
	1.6 collectd-4.4.1-include-collectd.d.patch, 1.1, NONE
Message-ID: <20080916144629.AFA5770138@cvs1.fedora.phx.redhat.com>

Author: apevec

Update of /cvs/pkgs/rpms/collectd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25732

Modified Files:
	.cvsignore collectd.spec sources 
Added Files:
	collectd-4.4.3-include-collectd.d.patch 
Removed Files:
	collectd-4.4.1-include-collectd.d.patch 
Log Message:


collectd-4.4.3-include-collectd.d.patch:

--- NEW FILE collectd-4.4.3-include-collectd.d.patch ---
--- collectd-4.4.3/src/collectd.conf.in.orig	2008-09-04 09:59:01.000000000 +0200
+++ collectd-4.4.3/src/collectd.conf.in	2008-09-16 14:46:43.000000000 +0200
@@ -26,7 +26,6 @@
 #	LogLevel info
 #</Plugin>
 
- at BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache
 @BUILD_PLUGIN_APCUPS_TRUE at LoadPlugin apcups
 @BUILD_PLUGIN_APPLE_SENSORS_TRUE at LoadPlugin apple_sensors
 @BUILD_PLUGIN_ASCENT_TRUE at LoadPlugin ascent
@@ -36,37 +35,28 @@
 @BUILD_PLUGIN_CSV_TRUE at LoadPlugin csv
 @BUILD_PLUGIN_DF_TRUE at LoadPlugin df
 @BUILD_PLUGIN_DISK_TRUE at LoadPlugin disk
- at BUILD_PLUGIN_DNS_TRUE@LoadPlugin dns
 @BUILD_PLUGIN_EMAIL_TRUE at LoadPlugin email
 @BUILD_PLUGIN_ENTROPY_TRUE at LoadPlugin entropy
 @BUILD_PLUGIN_EXEC_TRUE at LoadPlugin exec
 @BUILD_PLUGIN_HDDTEMP_TRUE at LoadPlugin hddtemp
 @BUILD_PLUGIN_INTERFACE_TRUE at LoadPlugin interface
 @BUILD_PLUGIN_IPTABLES_TRUE at LoadPlugin iptables
- at BUILD_PLUGIN_IPMI_TRUE@LoadPlugin ipmi
 @BUILD_PLUGIN_IPVS_TRUE at LoadPlugin ipvs
 @BUILD_PLUGIN_IRQ_TRUE at LoadPlugin irq
- at BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt
 @BUILD_PLUGIN_LOAD_TRUE at LoadPlugin load
 @BUILD_PLUGIN_MBMON_TRUE at LoadPlugin mbmon
 @BUILD_PLUGIN_MEMCACHED_TRUE at LoadPlugin memcached
 @BUILD_PLUGIN_MEMORY_TRUE at LoadPlugin memory
 @BUILD_PLUGIN_MULTIMETER_TRUE at LoadPlugin multimeter
- at BUILD_PLUGIN_MYSQL_TRUE@LoadPlugin mysql
 @BUILD_PLUGIN_NETLINK_TRUE at LoadPlugin netlink
 @BUILD_PLUGIN_NETWORK_TRUE at LoadPlugin network
 @BUILD_PLUGIN_NFS_TRUE at LoadPlugin nfs
- at BUILD_PLUGIN_NGINX_TRUE@LoadPlugin nginx
 @BUILD_PLUGIN_NTPD_TRUE at LoadPlugin ntpd
 @BUILD_PLUGIN_NUT_TRUE at LoadPlugin nut
- at BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl
 @BUILD_PLUGIN_PING_TRUE at LoadPlugin ping
 @BUILD_PLUGIN_POWERDNS_TRUE at LoadPlugin powerdns
 @BUILD_PLUGIN_PROCESSES_TRUE at LoadPlugin processes
- at BUILD_PLUGIN_RRDTOOL_TRUE@LoadPlugin rrdtool
- at BUILD_PLUGIN_SENSORS_TRUE@LoadPlugin sensors
 @BUILD_PLUGIN_SERIAL_TRUE at LoadPlugin serial
- at BUILD_PLUGIN_SNMP_TRUE@LoadPlugin snmp
 @BUILD_PLUGIN_SWAP_TRUE at LoadPlugin swap
 @BUILD_PLUGIN_TAIL_TRUE at LoadPlugin tail
 @BUILD_PLUGIN_TAPE_TRUE at LoadPlugin tape
@@ -348,3 +338,4 @@
 #	Verbose false
 #</Plugin>
 
+Include "/etc/collectd.d"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Sep 2008 12:54:43 -0000	1.5
+++ .cvsignore	16 Sep 2008 14:45:59 -0000	1.6
@@ -1 +1 @@
-collectd-4.4.2.tar.bz2
+collectd-4.4.3.tar.bz2


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/EL-5/collectd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- collectd.spec	1 Sep 2008 12:53:16 -0000	1.15
+++ collectd.spec	16 Sep 2008 14:45:59 -0000	1.16
@@ -1,13 +1,13 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
-Version: 4.4.2
+Version: 4.4.3
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://collectd.org/
 
 Source: http://collectd.org/files/%{name}-%{version}.tar.bz2
-Patch0: %{name}-4.4.1-include-collectd.d.patch
+Patch0: %{name}-%{version}-include-collectd.d.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %ifnarch ppc
@@ -367,6 +367,10 @@
 
 
 %changelog
+* Tue Sep 16 2008 Alan Pevec <apevec at redhat.com> 4.4.3-1
+- New upstream bugfix release 4.4.3.
+  http://collectd.org/news.shtml#news57
+
 * Mon Sep 01 2008 Alan Pevec <apevec at redhat.com> 4.4.2-1
 - New upstream release 4.4.2.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Sep 2008 12:54:43 -0000	1.5
+++ sources	16 Sep 2008 14:45:59 -0000	1.6
@@ -1 +1 @@
-faee2bb6e38da1051fdd31762bdf3ab7  collectd-4.4.2.tar.bz2
+309b7a0b9b128a1575308773e1c43d9f  collectd-4.4.3.tar.bz2


--- collectd-4.4.1-include-collectd.d.patch DELETED ---



From rdieter at fedoraproject.org  Tue Sep 16 14:47:22 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 16 Sep 2008 14:47:22 +0000 (UTC)
Subject: rpms/libmusicbrainz3/devel libmusicbrainz3.spec, 1.5,
	1.6 libmusicbrainz-3.0.1-gcc43.patch, 1.1, NONE
Message-ID: <20080916144722.2778E70138@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libmusicbrainz3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25862

Modified Files:
	libmusicbrainz3.spec 
Removed Files:
	libmusicbrainz-3.0.1-gcc43.patch 
Log Message:
upstreamed pkgconfig patch
drop no-longer-needed gcc43 patch



Index: libmusicbrainz3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmusicbrainz3/devel/libmusicbrainz3.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libmusicbrainz3.spec	16 Sep 2008 14:40:24 -0000	1.5
+++ libmusicbrainz3.spec	16 Sep 2008 14:46:51 -0000	1.6
@@ -11,8 +11,7 @@
 Source0: ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# upstream these -- Rex
-Patch1: libmusicbrainz-3.0.1-gcc43.patch
+# upstreamed: http://lists.musicbrainz.org/pipermail/musicbrainz-devel/2008-September/002575.html
 Patch2: libmusicbrainz-3.0.1-private.patch
 
 BuildRequires: cmake
@@ -40,7 +39,6 @@
 %prep
 %setup -q -n libmusicbrainz-%{version}
 
-%patch1 -p1 -b .gcc43
 %patch2 -p1 -b .private
 
 


--- libmusicbrainz-3.0.1-gcc43.patch DELETED ---



From cassmodiah at fedoraproject.org  Tue Sep 16 14:51:59 2008
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Tue, 16 Sep 2008 14:51:59 +0000 (UTC)
Subject: rpms/florence/devel .cvsignore, 1.2, 1.3 florence.spec, 1.1,
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080916145159.8586C70138@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/florence/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26362/devel

Modified Files:
	.cvsignore florence.spec import.log sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/florence/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Aug 2008 17:31:18 -0000	1.2
+++ .cvsignore	16 Sep 2008 14:51:29 -0000	1.3
@@ -1 +1 @@
-florence-0.2.3.tar.bz2
+florence-0.3.0.tar.bz2


Index: florence.spec
===================================================================
RCS file: /cvs/pkgs/rpms/florence/devel/florence.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- florence.spec	2 Aug 2008 17:31:18 -0000	1.1
+++ florence.spec	16 Sep 2008 14:51:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           florence
-Version:        0.2.3
-Release:        2%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Extensible scalable on-screen virtual keyboard for GNOME 
 
 Group:          User Interface/X Hardware Support
@@ -13,7 +13,8 @@
 BuildRequires:    libxml2-devel
 BuildRequires:    libglade2-devel
 BuildRequires:    at-spi-devel
-BuildRequires:    libgnomecanvas-devel
+BuildRequires:    librsvg2-devel
+BuildRequires:    cairo-devel
 BuildRequires:    libgnome-devel
 BuildRequires:    gtk2-devel
 BuildRequires:    GConf2-devel
@@ -129,6 +130,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.3.0-1
+- New upstream release 
+
 * Wed Jul 30 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.2.3-2
 - Create and add patch0 
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/florence/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Aug 2008 17:31:18 -0000	1.1
+++ import.log	16 Sep 2008 14:51:29 -0000	1.2
@@ -1 +1,2 @@
 florence-0_2_3-2_fc9:HEAD:florence-0.2.3-2.src.rpm:1217698211
+florence-0_3_0-1_fc9:HEAD:florence-0.3.0-1.fc9.src.rpm:1221576651


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/florence/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Aug 2008 17:31:18 -0000	1.2
+++ sources	16 Sep 2008 14:51:29 -0000	1.3
@@ -1 +1 @@
-30fa9d5d3699fec8a6bd993d103dca26  florence-0.2.3.tar.bz2
+650aac6c6f206a33efa9e353d146964c  florence-0.3.0.tar.bz2



From cassmodiah at fedoraproject.org  Tue Sep 16 14:54:49 2008
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Tue, 16 Sep 2008 14:54:49 +0000 (UTC)
Subject: rpms/florence/F-9 .cvsignore, 1.2, 1.3 florence.spec, 1.1,
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080916145449.E17A170138@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/florence/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26946/F-9

Modified Files:
	.cvsignore florence.spec import.log sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/florence/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Aug 2008 13:58:58 -0000	1.2
+++ .cvsignore	16 Sep 2008 14:54:19 -0000	1.3
@@ -1 +1 @@
-florence-0.2.3.tar.bz2
+florence-0.3.0.tar.bz2


Index: florence.spec
===================================================================
RCS file: /cvs/pkgs/rpms/florence/F-9/florence.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- florence.spec	2 Aug 2008 13:58:58 -0000	1.1
+++ florence.spec	16 Sep 2008 14:54:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           florence
-Version:        0.2.3
-Release:        2%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Extensible scalable on-screen virtual keyboard for GNOME 
 
 Group:          User Interface/X Hardware Support
@@ -13,7 +13,8 @@
 BuildRequires:    libxml2-devel
 BuildRequires:    libglade2-devel
 BuildRequires:    at-spi-devel
-BuildRequires:    libgnomecanvas-devel
+BuildRequires:    librsvg2-devel
+BuildRequires:    cairo-devel
 BuildRequires:    libgnome-devel
 BuildRequires:    gtk2-devel
 BuildRequires:    GConf2-devel
@@ -129,6 +130,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.3.0-1
+- New upstream release 
+
 * Wed Jul 30 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.2.3-2
 - Create and add patch0 
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/florence/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Aug 2008 13:58:58 -0000	1.1
+++ import.log	16 Sep 2008 14:54:19 -0000	1.2
@@ -1 +1,2 @@
 florence-0_2_3-2_fc9:F-9:florence-0.2.3-2.src.rpm:1217685399
+florence-0_3_0-1_fc9:F-9:florence-0.3.0-1.fc9.src.rpm:1221576823


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/florence/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Aug 2008 13:58:58 -0000	1.2
+++ sources	16 Sep 2008 14:54:19 -0000	1.3
@@ -1 +1 @@
-30fa9d5d3699fec8a6bd993d103dca26  florence-0.2.3.tar.bz2
+650aac6c6f206a33efa9e353d146964c  florence-0.3.0.tar.bz2



From tuxbrewr at fedoraproject.org  Tue Sep 16 14:55:53 2008
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue, 16 Sep 2008 14:55:53 +0000 (UTC)
Subject: rpms/quassel/devel .cvsignore, 1.3, 1.4 quassel.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20080916145553.F059F70138@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/quassel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27178

Modified Files:
	.cvsignore quassel.spec sources 
Log Message:
New Upstream Release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Jul 2008 21:40:32 -0000	1.3
+++ .cvsignore	16 Sep 2008 14:55:23 -0000	1.4
@@ -1 +1 @@
-quassel-0.2.0-rc1.tar.bz2
+quassel-0.3.0.1.tar.bz2


Index: quassel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/devel/quassel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- quassel.spec	5 Jul 2008 21:40:32 -0000	1.2
+++ quassel.spec	16 Sep 2008 14:55:23 -0000	1.3
@@ -1,12 +1,12 @@
 Name:    quassel
 Summary: QT4 Based distrubuted IRC system
-Version: 0.2.0
-Release: 0.1.rc1%{?dist}
+Version: 0.3.0.1
+Release: 1%{?dist}
 
 License: GPLv2 or GPLv3
 Group:	 Applications/Internet
 URL:     http://quassel-irc.org/
-Source0: http://quassel-irc.org/system/files/quassel-%{version}-rc1.tar.bz2
+Source0: http://quassel-irc.org/system/files/quassel-%{version}.tar.bz2
 Source1: %{name}.desktop
 Source2: %{name}core.desktop
 Source3: %{name}client.desktop
@@ -38,7 +38,7 @@
 Quassel client 
 
 %prep
-%setup -q -n quassel-0.2.0-rc1
+%setup -q -n quassel-0.3.0.1
 
 %build
 
@@ -81,6 +81,9 @@
 %{_datadir}/applications/fedora-quasselclient.desktop
 
 %changelog
+*Tue Sep 16 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.3.0.1-1
+- New upstream release
+
 * Fri Jul 04 2008 Steven Parrish <smparrish at shallowcreek.net> 0.1.rc1
 - New upstream release.  Now uses cmake instead of qmake
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jul 2008 21:40:32 -0000	1.3
+++ sources	16 Sep 2008 14:55:23 -0000	1.4
@@ -1 +1 @@
-65930b7b0f59ae115ae5a20389189d83  quassel-0.2.0-rc1.tar.bz2
+20490f97c9fc9a147f5aa5a30afcc413  quassel-0.3.0.1.tar.bz2



From mmaslano at fedoraproject.org  Tue Sep 16 15:05:53 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 16 Sep 2008 15:05:53 +0000 (UTC)
Subject: rpms/perl/devel perl-5.10.0-TestSimple0.80.patch, NONE,
	1.1 perl.spec, 1.187, 1.188
Message-ID: <20080916150553.C398970138@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27962

Modified Files:
	perl.spec 
Added Files:
	perl-5.10.0-TestSimple0.80.patch 
Log Message:
* Tue Sep 16 2008 Marcela Maslanova <mmaslano at redhat.com> 4:5.10.0-43.fc10
- 462444 update Test::Simple to 0.80


perl-5.10.0-TestSimple0.80.patch:

--- NEW FILE perl-5.10.0-TestSimple0.80.patch ---
--- perl-5.10.0/lib/Test/Builder.bla/Module.pm	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Builder/Module.pm	2008-04-06 17:26:10.000000000 +0200
@@ -1,13 +1,13 @@
 package Test::Builder::Module;
 
+use strict;
+
 use Test::Builder;
 
 require Exporter;
- at ISA = qw(Exporter);
+our @ISA = qw(Exporter);
 
-$VERSION = '0.72';
-
-use strict;
+our $VERSION = '0.80';
 
 # 5.004's Exporter doesn't have export_to_level.
 my $_export_to_level = sub {
@@ -83,6 +83,9 @@ import_extra().
 
 sub import {
     my($class) = shift;
+    
+    # Don't run all this when loading ourself.
+    return 1 if $class eq 'Test::Builder::Module';
 
     my $test = $class->builder;
 
Common subdirectories: perl-5.10.0/lib/Test/Builder.bla/Tester and perl-5.10.0/lib/Test/Builder/Tester
diff -up perl-5.10.0/lib/Test/Builder.bla/Tester.pm perl-5.10.0/lib/Test/Builder/Tester.pm
--- perl-5.10.0/lib/Test/Builder.bla/Tester.pm	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Builder/Tester.pm	2008-04-06 17:26:21.000000000 +0200
@@ -1,8 +1,7 @@
 package Test::Builder::Tester;
 
 use strict;
-use vars qw(@EXPORT $VERSION @ISA);
-$VERSION = "1.09";
+our $VERSION = "1.13";
 
 use Test::Builder;
 use Symbol;
@@ -56,9 +55,9 @@ my $t = Test::Builder->new;
 ###
 
 use Exporter;
- at ISA = qw(Exporter);
+our @ISA = qw(Exporter);
 
- at EXPORT = qw(test_out test_err test_fail test_diag test_test line_num);
+our @EXPORT = qw(test_out test_err test_fail test_diag test_test line_num);
 
 # _export_to_level and import stolen directly from Test::More.  I am
 # the king of cargo cult programming ;-)
@@ -188,7 +187,7 @@ output filehandles)
 
 =cut
 
-sub test_out(@)
+sub test_out
 {
     # do we need to do any setup?
     _start_testing() unless $testing;
@@ -196,7 +195,7 @@ sub test_out(@)
     $out->expect(@_)
 }
 
-sub test_err(@)
+sub test_err
 {
     # do we need to do any setup?
     _start_testing() unless $testing;
@@ -549,36 +548,36 @@ sub complaint
     if (Test::Builder::Tester::color)
     {
       # get color
-      eval "require Term::ANSIColor";
+      eval { require Term::ANSIColor };
       unless ($@)
       {
-	# colours
+        # colours
 
-	my $green = Term::ANSIColor::color("black").
-	            Term::ANSIColor::color("on_green");
+        my $green = Term::ANSIColor::color("black").
+                    Term::ANSIColor::color("on_green");
         my $red   = Term::ANSIColor::color("black").
                     Term::ANSIColor::color("on_red");
-	my $reset = Term::ANSIColor::color("reset");
+        my $reset = Term::ANSIColor::color("reset");
 
-	# work out where the two strings start to differ
-	my $char = 0;
-	$char++ while substr($got, $char, 1) eq substr($wanted, $char, 1);
-
-	# get the start string and the two end strings
-	my $start     = $green . substr($wanted, 0,   $char);
-	my $gotend    = $red   . substr($got   , $char) . $reset;
-	my $wantedend = $red   . substr($wanted, $char) . $reset;
-
-	# make the start turn green on and off
-	$start =~ s/\n/$reset\n$green/g;
-
-	# make the ends turn red on and off
-	$gotend    =~ s/\n/$reset\n$red/g;
-	$wantedend =~ s/\n/$reset\n$red/g;
-
-	# rebuild the strings
-	$got    = $start . $gotend;
-	$wanted = $start . $wantedend;
+        # work out where the two strings start to differ
+        my $char = 0;
+        $char++ while substr($got, $char, 1) eq substr($wanted, $char, 1);
+
+        # get the start string and the two end strings
+        my $start     = $green . substr($wanted, 0,   $char);
+        my $gotend    = $red   . substr($got   , $char) . $reset;
+        my $wantedend = $red   . substr($wanted, $char) . $reset;
+
+        # make the start turn green on and off
+        $start =~ s/\n/$reset\n$green/g;
+
+        # make the ends turn red on and off
+        $gotend    =~ s/\n/$reset\n$red/g;
+        $wantedend =~ s/\n/$reset\n$red/g;
+
+        # rebuild the strings
+        $got    = $start . $gotend;
+        $wanted = $start . $wantedend;
       }
     }
 
diff -up perl-5.10.0/lib/Test/Builder.pm.bla perl-5.10.0/lib/Test/Builder.pm
--- perl-5.10.0/lib/Test/Builder.pm.bla	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Builder.pm	2008-04-06 17:26:10.000000000 +0200
@@ -1,15 +1,10 @@
 package Test::Builder;
 
-use 5.004;
-
-# $^C was only introduced in 5.005-ish.  We do this to prevent
-# use of uninitialized value warnings in older perls.
-$^C ||= 0;
-
+use 5.006;
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.72';
-$VERSION = eval $VERSION;    # make the alpha version come out as a number
+
+our $VERSION = '0.80';
+$VERSION = eval { $VERSION }; # make the alpha version come out as a number
 
 # Make Test::Builder thread-safe for ithreads.
 BEGIN {
@@ -73,28 +68,15 @@ Test::Builder - Backend for building tes
 =head1 SYNOPSIS
 
   package My::Test::Module;
-  use Test::Builder;
-  require Exporter;
-  @ISA = qw(Exporter);
-  @EXPORT = qw(ok);
-
-  my $Test = Test::Builder->new;
-  $Test->output('my_logfile');
-
-  sub import {
-      my($self) = shift;
-      my $pack = caller;
+  use base 'Test::Builder::Module';
 
-      $Test->exported_to($pack);
-      $Test->plan(@_);
-
-      $self->export_to_level(1, $self, 'ok');
-  }
+  my $CLASS = __PACKAGE__;
 
   sub ok {
       my($test, $name) = @_;
+      my $tb = $CLASS->builder;
 
-      $Test->ok($test, $name);
+      $tb->ok($test, $name);
   }
 
 
@@ -177,7 +159,6 @@ sub reset {
     # hash keys is just asking for pain.  Also, it was documented.
     $Level = 1;
 
-    $self->{Test_Died}    = 0;
     $self->{Have_Plan}    = 0;
     $self->{No_Plan}      = 0;
     $self->{Original_Pid} = $$;
@@ -196,9 +177,11 @@ sub reset {
     $self->{No_Header}  = 0;
     $self->{No_Ending}  = 0;
 
+    $self->{TODO}       = undef;
+
     $self->_dup_stdhandles unless $^C;
 
-    return undef;
+    return;
 }
 
 =back
@@ -210,25 +193,6 @@ are.  You usually only want to call one 
 
 =over 4
 
-=item B<exported_to>
-
-  my $pack = $Test->exported_to;
-  $Test->exported_to($pack);
-
-Tells Test::Builder what package you exported your functions to.
-This is important for getting TODO tests right.
-
-=cut
-
-sub exported_to {
-    my($self, $pack) = @_;
-
-    if( defined $pack ) {
-        $self->{Exported_To} = $pack;
-    }
-    return $self->{Exported_To};
-}
-
 =item B<plan>
 
   $Test->plan('no_plan');
@@ -360,6 +324,29 @@ sub skip_all {
     exit(0);
 }
 
+
+=item B<exported_to>
+
+  my $pack = $Test->exported_to;
+  $Test->exported_to($pack);
+
+Tells Test::Builder what package you exported your functions to.
+
+This method isn't terribly useful since modules which share the same
+Test::Builder object might get exported to different packages and only
+the last one will be honored.
+
+=cut
+
+sub exported_to {
+    my($self, $pack) = @_;
+
+    if( defined $pack ) {
+        $self->{Exported_To} = $pack;
+    }
+    return $self->{Exported_To};
+}
+
 =back
 
 =head2 Running tests
@@ -401,9 +388,12 @@ sub ok {
     Very confusing.
 ERR
 
-    my($pack, $file, $line) = $self->caller;
+    my $todo = $self->todo();
+    
+    # Capture the value of $TODO for the rest of this ok() call
+    # so it can more easily be found by other routines.
+    local $self->{TODO} = $todo;
 
-    my $todo = $self->todo($pack);
     $self->_unoverload_str(\$todo);
 
     my $out;
@@ -448,13 +438,14 @@ ERR
         my $msg = $todo ? "Failed (TODO)" : "Failed";
         $self->_print_diag("\n") if $ENV{HARNESS_ACTIVE};
 
-	if( defined $name ) {
-	    $self->diag(qq[  $msg test '$name'\n]);
-	    $self->diag(qq[  at $file line $line.\n]);
-	}
-	else {
-	    $self->diag(qq[  $msg test at $file line $line.\n]);
-	}
+    my(undef, $file, $line) = $self->caller;
+        if( defined $name ) {
+            $self->diag(qq[  $msg test '$name'\n]);
+            $self->diag(qq[  at $file line $line.\n]);
+        }
+        else {
+            $self->diag(qq[  $msg test at $file line $line.\n]);
+        }
     } 
 
     return $test ? 1 : 0;
@@ -584,6 +575,7 @@ sub _is_diag {
         }
     }
 
+    local $Level = $Level + 1;
     return $self->diag(sprintf <<DIAGNOSTIC, $got, $expect);
          got: %s
     expected: %s
@@ -705,7 +697,8 @@ sub cmp_ok {
 
         my $code = $self->_caller_context;
 
-        # Yes, it has to look like this or 5.4.5 won't see the #line directive.
+        # Yes, it has to look like this or 5.4.5 won't see the #line 
+        # directive.
         # Don't ask me, man, I just work here.
         $test = eval "
 $code" . "\$got $type \$expect;";
@@ -730,6 +723,8 @@ sub _cmp_diag {
     
     $got    = defined $got    ? "'$got'"    : 'undef';
     $expect = defined $expect ? "'$expect'" : 'undef';
+    
+    local $Level = $Level + 1;
     return $self->diag(sprintf <<DIAGNOSTIC, $got, $type, $expect);
     %s
         %s
@@ -925,7 +920,7 @@ sub maybe_regex {
     my($re, $opts);
 
     # Check for qr/foo/
-    if( ref $regex eq 'Regexp' ) {
+    if( _is_qr($regex) ) {
         $usable_regex = $regex;
     }
     # Check for '/foo/' or 'm,foo,'
@@ -937,7 +932,18 @@ sub maybe_regex {
     }
 
     return $usable_regex;
-};
+}
+
+
+sub _is_qr {
+    my $regex = shift;
+    
+    # is_regexp() checks for regexes in a robust manner, say if they're
+    # blessed.
+    return re::is_regexp($regex) if defined &re::is_regexp;
+    return ref $regex eq 'Regexp';
+}
+
 
 sub _regex_ok {
     my($self, $this, $regex, $cmp, $name) = @_;
@@ -956,7 +962,8 @@ sub _regex_ok {
 
         local($@, $!, $SIG{__DIE__}); # isolate eval
 
-        # Yes, it has to look like this or 5.4.5 won't see the #line directive.
+        # Yes, it has to look like this or 5.4.5 won't see the #line 
+        # directive.
         # Don't ask me, man, I just work here.
         $test = eval "
 $code" . q{$test = $this =~ /$usable_regex/ ? 1 : 0};
@@ -970,6 +977,8 @@ $code" . q{$test = $this =~ /$usable_reg
     unless( $ok ) {
         $this = defined $this ? "'$this'" : 'undef';
         my $match = $cmp eq '=~' ? "doesn't match" : "matches";
+
+        local $Level = $Level + 1;
         $self->diag(sprintf <<DIAGNOSTIC, $this, $match, $regex);
                   %s
     %13s '%s'
@@ -1145,7 +1154,7 @@ foreach my $attribute (qw(No_Header No_E
         return $self->{$attribute};
     };
 
-    no strict 'refs';
+    no strict 'refs';   ## no critic
     *{__PACKAGE__.'::'.$method} = $code;
 }
 
@@ -1332,10 +1341,9 @@ sub _new_fh {
         $fh = $file_or_fh;
     }
     else {
-        $fh = do { local *FH };
-        open $fh, ">$file_or_fh" or
+        open $fh, ">", $file_or_fh or
             $self->croak("Can't open test output log $file_or_fh: $!");
-	_autoflush($fh);
+        _autoflush($fh);
     }
 
     return $fh;
@@ -1350,6 +1358,7 @@ sub _autoflush {
 }
 
 
+my($Testout, $Testerr);
 sub _dup_stdhandles {
     my $self = shift;
 
@@ -1357,28 +1366,46 @@ sub _dup_stdhandles {
 
     # Set everything to unbuffered else plain prints to STDOUT will
     # come out in the wrong order from our own prints.
-    _autoflush(\*TESTOUT);
+    _autoflush($Testout);
     _autoflush(\*STDOUT);
-    _autoflush(\*TESTERR);
+    _autoflush($Testerr);
     _autoflush(\*STDERR);
 
-    $self->output(\*TESTOUT);
-    $self->failure_output(\*TESTERR);
-    $self->todo_output(\*TESTOUT);
+    $self->output        ($Testout);
+    $self->failure_output($Testerr);
+    $self->todo_output   ($Testout);
 }
 
 
 my $Opened_Testhandles = 0;
 sub _open_testhandles {
+    my $self = shift;
+    
     return if $Opened_Testhandles;
+    
     # We dup STDOUT and STDERR so people can change them in their
     # test suites while still getting normal test output.
-    open(TESTOUT, ">&STDOUT") or die "Can't dup STDOUT:  $!";
-    open(TESTERR, ">&STDERR") or die "Can't dup STDERR:  $!";
+    open( $Testout, ">&STDOUT") or die "Can't dup STDOUT:  $!";
+    open( $Testerr, ">&STDERR") or die "Can't dup STDERR:  $!";
+
+#    $self->_copy_io_layers( \*STDOUT, $Testout );
+#    $self->_copy_io_layers( \*STDERR, $Testerr );
+    
     $Opened_Testhandles = 1;
 }
 
 
+sub _copy_io_layers {
+    my($self, $src, $dst) = @_;
+    
+    $self->_try(sub {
+        require PerlIO;
+        my @src_layers = PerlIO::get_layers($src);
+
+        binmode $dst, join " ", map ":$_", @src_layers if @src_layers;
+    });
+}
+
 =item carp
 
   $tb->carp(@message);
@@ -1558,9 +1585,10 @@ will be considered 'todo' (see Test::Mor
 details).  Returns the reason (ie. the value of $TODO) if running as
 todo tests, false otherwise.
 
-todo() is about finding the right package to look for $TODO in.  It
-uses the exported_to() package to find it.  If that's not set, it's
-pretty good at guessing the right package to look at based on $Level.
+todo() is about finding the right package to look for $TODO in.  It's
+pretty good at guessing the right package to look at.  It first looks for
+the caller based on C<$Level + 1>, since C<todo()> is usually called inside
+a test function.  As a last resort it will use C<exported_to()>.
 
 Sometimes there is some confusion about where todo() should be looking
 for the $TODO variable.  If you want to be sure, tell it explicitly
@@ -1571,10 +1599,12 @@ what $pack to use.
 sub todo {
     my($self, $pack) = @_;
 
-    $pack = $pack || $self->exported_to || $self->caller($Level);
+    return $self->{TODO} if defined $self->{TODO};
+
+    $pack = $pack || $self->caller(1) || $self->exported_to;
     return 0 unless $pack;
 
-    no strict 'refs';
+    no strict 'refs';   ## no critic
     return defined ${$pack.'::TODO'} ? ${$pack.'::TODO'}
                                      : 0;
 }
@@ -1587,6 +1617,8 @@ sub todo {
 
 Like the normal caller(), except it reports according to your level().
 
+C<$height> will be added to the level().
+
 =cut
 
 sub caller {
@@ -1671,35 +1703,27 @@ sub _my_exit {
 
 =cut
 
-$SIG{__DIE__} = sub {
-    # We don't want to muck with death in an eval, but $^S isn't
-    # totally reliable.  5.005_03 and 5.6.1 both do the wrong thing
-    # with it.  Instead, we use caller.  This also means it runs under
-    # 5.004!
-    my $in_eval = 0;
-    for( my $stack = 1;  my $sub = (CORE::caller($stack))[3];  $stack++ ) {
-        $in_eval = 1 if $sub =~ /^\(eval\)/;
-    }
-    $Test->{Test_Died} = 1 unless $in_eval;
-};
-
 sub _ending {
     my $self = shift;
 
+    my $real_exit_code = $?;
     $self->_sanity_check();
 
     # Don't bother with an ending if this is a forked copy.  Only the parent
     # should do the ending.
+    if( $self->{Original_Pid} != $$ ) {
+        return;
+    }
+    
     # Exit if plan() was never called.  This is so "require Test::Simple" 
     # doesn't puke.
+    if( !$self->{Have_Plan} ) {
+        return;
+    }
+
     # Don't do an ending if we bailed out.
-    if( ($self->{Original_Pid} != $$) 			or
-	(!$self->{Have_Plan} && !$self->{Test_Died}) 	or
-	$self->{Bailed_Out}
-      )
-    {
-	_my_exit($?);
-	return;
+    if( $self->{Bailed_Out} ) {
+        return;
     }
 
     # Figure out if we passed or failed and print helpful messages.
@@ -1749,7 +1773,7 @@ Looks like you failed $num_failed test$s
 FAIL
         }
 
-        if( $self->{Test_Died} ) {
+        if( $real_exit_code ) {
             $self->diag(<<"FAIL");
 Looks like your test died just after $self->{Curr_Test}.
 FAIL
@@ -1773,7 +1797,7 @@ FAIL
     elsif ( $self->{Skip_All} ) {
         _my_exit( 0 ) && return;
     }
-    elsif ( $self->{Test_Died} ) {
+    elsif ( $real_exit_code ) {
         $self->diag(<<'FAIL');
 Looks like your test died before it could output anything.
 FAIL
diff -up perl-5.10.0/lib/Test/More.pm.bla perl-5.10.0/lib/Test/More.pm
--- perl-5.10.0/lib/Test/More.pm.bla	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/More.pm	2008-04-06 17:26:10.000000000 +0200
@@ -1,7 +1,6 @@
 package Test::More;
 
-use 5.004;
-
+use 5.006;
 use strict;
 
 
@@ -16,7 +15,7 @@ sub _carp {
 
 
 use vars qw($VERSION @ISA @EXPORT %EXPORT_TAGS $TODO);
-$VERSION = '0.72';
+$VERSION = '0.80';
 $VERSION = eval $VERSION;    # make the alpha version come out as a number
 
 use Test::Builder::Module;
@@ -31,7 +30,7 @@ use Test::Builder::Module;
              plan
              can_ok  isa_ok
              diag
-	     BAIL_OUT
+             BAIL_OUT
             );
 
 
@@ -659,32 +658,35 @@ sub use_ok ($;@) {
 
     my($pack,$filename,$line) = caller;
 
-    local($@,$!,$SIG{__DIE__});   # isolate eval
-
+    my $code;
     if( @imports == 1 and $imports[0] =~ /^\d+(?:\.\d+)?$/ ) {
         # probably a version check.  Perl needs to see the bare number
         # for it to work with non-Exporter based modules.
-        eval <<USE;
+        $code = <<USE;
 package $pack;
 use $module $imports[0];
+1;
 USE
     }
     else {
-        eval <<USE;
+        $code = <<USE;
 package $pack;
-use $module \@imports;
+use $module \@{\$args[0]};
+1;
 USE
     }
 
-    my $ok = $tb->ok( !$@, "use $module;" );
 
+    my($eval_result, $eval_error) = _eval($code, \@imports);
+    my $ok = $tb->ok( $eval_result, "use $module;" );
+    
     unless( $ok ) {
-        chomp $@;
+        chomp $eval_error;
         $@ =~ s{^BEGIN failed--compilation aborted at .*$}
                 {BEGIN failed--compilation aborted at $filename line $line.}m;
         $tb->diag(<<DIAGNOSTIC);
     Tried to use '$module'.
-    Error:  $@
+    Error:  $eval_error
 DIAGNOSTIC
 
     }
@@ -692,6 +694,20 @@ DIAGNOSTIC
     return $ok;
 }
 
+
+sub _eval {
+    my($code) = shift;
+    my @args = @_;
+
+    # Work around oddities surrounding resetting of $@ by immediately
+    # storing it.
+    local($@,$!,$SIG{__DIE__});   # isolate eval
+    my $eval_result = eval $code;
+    my $eval_error  = $@;
+
+    return($eval_result, $eval_error);
+}
+
 =item B<require_ok>
 
    require_ok($module);
@@ -711,20 +727,20 @@ sub require_ok ($) {
     # Module names must be barewords, files not.
     $module = qq['$module'] unless _is_module_name($module);
 
-    local($!, $@, $SIG{__DIE__}); # isolate eval
-    local $SIG{__DIE__};
-    eval <<REQUIRE;
+    my $code = <<REQUIRE;
 package $pack;
 require $module;
+1;
 REQUIRE
 
-    my $ok = $tb->ok( !$@, "require $module;" );
+    my($eval_result, $eval_error) = _eval($code);
+    my $ok = $tb->ok( $eval_result, "require $module;" );
 
     unless( $ok ) {
-        chomp $@;
+        chomp $eval_error;
         $tb->diag(<<DIAGNOSTIC);
     Tried to require '$module'.
-    Error:  $@
+    Error:  $eval_error
 DIAGNOSTIC
 
     }
@@ -1438,7 +1454,7 @@ B<NOTE>  This behavior may go away in fu
 
 =item Backwards compatibility
 
-Test::More works with Perls as old as 5.004_05.
+Test::More works with Perls as old as 5.6.0.
 
 
 =item Overloaded objects
diff -up perl-5.10.0/lib/Test/Simple.pm.bla perl-5.10.0/lib/Test/Simple.pm
--- perl-5.10.0/lib/Test/Simple.pm.bla	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple.pm	2008-04-06 17:26:10.000000000 +0200
@@ -4,7 +4,7 @@ use 5.004;
 
 use strict 'vars';
 use vars qw($VERSION @ISA @EXPORT);
-$VERSION = '0.72';
+$VERSION = '0.80';
 $VERSION = eval $VERSION;    # make the alpha version come out as a number
 
 use Test::Builder::Module;
diff -up perl-5.10.0/lib/Test/Tutorial.pod.bla perl-5.10.0/lib/Test/Tutorial.pod
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/BEGIN_require_ok.t perl-5.10.0/lib/Test/Simple/t/BEGIN_require_ok.t
--- perl-5.10.0/lib/Test/Simple/t.bla/BEGIN_require_ok.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/BEGIN_require_ok.t	2007-12-04 04:32:40.000000000 +0100
@@ -0,0 +1,24 @@
+#!/usr/bin/perl -w
+
+BEGIN {
+    if( $ENV{PERL_CORE} ) {
+        chdir 't';
+        @INC = ('../lib', 'lib');
+    }
+    else {
+        unshift @INC, 't/lib';
+    }
+}
+
+use Test::More;
+
+my $result;
+BEGIN {
+    eval {
+        require_ok("Wibble");
+    };
+    $result = $@;
+}
+
+plan tests => 1;
+like $result, '/^You tried to run a test without a plan/';
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/BEGIN_use_ok.t perl-5.10.0/lib/Test/Simple/t/BEGIN_use_ok.t
--- perl-5.10.0/lib/Test/Simple/t.bla/BEGIN_use_ok.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/BEGIN_use_ok.t	2007-09-20 05:16:02.000000000 +0200
@@ -0,0 +1,28 @@
+#!/usr/bin/perl -w
+
+# [rt.cpan.org 28345]
+#
+# A use_ok() inside a BEGIN block lacking a plan would be silently ignored.
+
+BEGIN {
+    if( $ENV{PERL_CORE} ) {
+        chdir 't';
+        @INC = ('../lib', 'lib');
+    }
+    else {
+        unshift @INC, 't/lib';
+    }
+}
+
+use Test::More;
+
+my $result;
+BEGIN {
+    eval {
+        use_ok("Wibble");
+    };
+    $result = $@;
+}
+
+plan tests => 1;
+like $result, '/^You tried to run a test without a plan/';
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/dont_overwrite_die_handler.t perl-5.10.0/lib/Test/Simple/t/dont_overwrite_die_handler.t
--- perl-5.10.0/lib/Test/Simple/t.bla/dont_overwrite_die_handler.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/dont_overwrite_die_handler.t	2008-02-24 04:33:47.000000000 +0100
@@ -0,0 +1,19 @@
+#!/usr/bin/perl -w
+
+BEGIN {
+    if( $ENV{PERL_CORE} ) {
+        chdir 't';
+        @INC = '../lib';
+    }
+}
+
+# Make sure this is in place before Test::More is loaded.
+my $handler_called;
+BEGIN {
+    $SIG{__DIE__} = sub { $handler_called++ };
+}
+
+use Test::More tests => 2;
+
+ok !eval { die };
+is $handler_called, 1, 'existing DIE handler not overridden';
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/exit.t perl-5.10.0/lib/Test/Simple/t/exit.t
--- perl-5.10.0/lib/Test/Simple/t.bla/exit.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/exit.t	2008-02-24 04:29:39.000000000 +0100
@@ -25,18 +25,9 @@
     exit 0;
 }
 
-my $test_num = 1;
-# Utility testing functions.
-sub ok ($;$) {
-    my($test, $name) = @_;
-    my $ok = '';
-    $ok .= "not " unless $test;
-    $ok .= "ok $test_num";
-    $ok .= " - $name" if defined $name;
-    $ok .= "\n";
-    print $ok;
-    $test_num++;
-}
+require Test::Builder;
+my $TB = Test::Builder->create();
+$TB->level(0);
 
 
 package main;
@@ -59,10 +50,11 @@
              'pre_plan_death.plx'       => ['not zero',    'not zero'],
              'death_in_eval.plx'        => [0,      0],
              'require.plx'              => [0,      0],
-	     'exit.plx'                 => [1,      4],
+             'death_with_handler.plx'   => [255,    4],
+             'exit.plx'                 => [1,      4],
             );
 
-print "1..".keys(%Tests)."\n";
+$TB->plan( tests => scalar keys(%Tests) );
 
 eval { require POSIX; &POSIX::WEXITSTATUS(0) };
 if( $@ ) {
@@ -93,12 +85,12 @@
     my $actual_exit = exitstatus($wait_stat);
 
     if( $exit_code eq 'not zero' ) {
-        My::Test::ok( $actual_exit != 0,
+        $TB->isnt_num( $actual_exit, 0,
                       "$test_name exited with $actual_exit ".
                       "(expected $exit_code)");
     }
     else {
-        My::Test::ok( $actual_exit == $exit_code, 
+        $TB->is_num( $actual_exit, $exit_code, 
                       "$test_name exited with $actual_exit ".
                       "(expected $exit_code)");
     }
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/filehandles.t perl-5.10.0/lib/Test/Simple/t/filehandles.t
--- perl-5.10.0/lib/Test/Simple/t.bla/filehandles.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/filehandles.t	2008-02-29 11:07:33.000000000 +0100
@@ -3,19 +3,16 @@
 BEGIN {
     if( $ENV{PERL_CORE} ) {
         chdir 't';
-        @INC = '../lib';
+        @INC = ('../lib', 'lib');
     }
 }
 
+use lib 't/lib';
 use Test::More tests => 1;
+use Dev::Null;
 
 tie *STDOUT, "Dev::Null" or die $!;
 
 print "not ok 1\n";     # this should not print.
 pass 'STDOUT can be mucked with';
 
-
-package Dev::Null;
-
-sub TIEHANDLE { bless {} }
-sub PRINT { 1 }
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/is_deeply_with_threads.t perl-5.10.0/lib/Test/Simple/t/is_deeply_with_threads.t
--- perl-5.10.0/lib/Test/Simple/t.bla/is_deeply_with_threads.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/is_deeply_with_threads.t	2008-02-24 04:12:32.000000000 +0100
@@ -22,12 +22,17 @@
         print "1..0 # Skip: no working threads\n";
         exit 0;
     }
+    
+    unless ( $ENV{AUTHOR_TESTING} ) {
+        print "1..0 # Skip: many perls have broken threads.  Enable with AUTHOR_TESTING.\n";
+        exit 0;
+    }
 }
 use Test::More;
 
 my $Num_Threads = 5;
 
-plan tests => $Num_Threads * 100 + 5;
+plan tests => $Num_Threads * 100 + 6;
 
 
 sub do_one_thread {
@@ -56,3 +61,5 @@
     my $rc = $t->join();
     cmp_ok( $rc, '==', 42, "threads exit status is $rc" );
 }
+
+pass("End of test");
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Dev/Null.pm perl-5.10.0/lib/Test/Simple/t/lib/Dev/Null.pm
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Dev/Null.pm	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Dev/Null.pm	2008-02-24 04:44:15.000000000 +0100
@@ -0,0 +1,6 @@
+package Dev::Null;
+
+sub TIEHANDLE { bless {} }
+sub PRINT { 1 }
+
+1;
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/NoExporter.pm perl-5.10.0/lib/Test/Simple/t/lib/NoExporter.pm
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/NoExporter.pm	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/NoExporter.pm	2008-02-24 04:03:27.000000000 +0100
@@ -0,0 +1,10 @@
+package NoExporter;
+
+$VERSION = 1.02;
+sub import { 
+    shift;
+    die "NoExporter exports nothing.  You asked for: @_" if @_;
+}
+
+1;
+
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/Catch.pm perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/Catch.pm
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/Catch.pm	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/Catch.pm	2008-02-24 04:03:15.000000000 +0100
@@ -0,0 +1,18 @@
+# For testing Test::Simple;
+package Test::Simple::Catch;
+
+use Symbol;
+use TieOut;
+my($out_fh, $err_fh) = (gensym, gensym);
+my $out = tie *$out_fh, 'TieOut';
+my $err = tie *$err_fh, 'TieOut';
+
+use Test::Builder;
+my $t = Test::Builder->new;
+$t->output($out_fh);
+$t->failure_output($err_fh);
+$t->todo_output($err_fh);
+
+sub caught { return($out, $err) }
+
+1;
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/death_in_eval.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/death_in_eval.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/death_in_eval.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/death_in_eval.plx	2006-08-31 07:24:16.000000000 +0200
@@ -0,0 +1,22 @@
+require Test::Simple;
+use Carp;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 5);
+
+ok(1);
+ok(1);
+ok(1);
+eval {
+        die "Foo";
+};
+ok(1);
+eval "die 'Bar'";
+ok(1);
+
+eval {
+        croak "Moo";
+};
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/death.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/death.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/death.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/death.plx	2008-02-24 05:39:20.000000000 +0100
@@ -0,0 +1,15 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+require Dev::Null;
+
+Test::Simple->import(tests => 5);
+tie *STDERR, 'Dev::Null';
+
+ok(1);
+ok(1);
+ok(1);
+die "This is a test";
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/death_with_handler.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/death_with_handler.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/death_with_handler.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/death_with_handler.plx	2008-02-24 05:38:55.000000000 +0100
@@ -0,0 +1,18 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 2);
+
+# Test we still get the right exit code despite having a die
+# handler.
+$SIG{__DIE__} = sub {};
+
+require Dev::Null;
+tie *STDERR, 'Dev::Null';
+
+ok(1);
+ok(1);
+die "This is a test";
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/exit.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/exit.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/exit.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/exit.plx	2006-08-31 07:24:17.000000000 +0200
@@ -0,0 +1,3 @@
+require Test::Builder;
+
+exit 1;
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/extras.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/extras.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/extras.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/extras.plx	2006-08-31 07:24:16.000000000 +0200
@@ -0,0 +1,16 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 5);
+
+
+ok(1);
+ok(1);
+ok(1);
+ok(1);
+ok(0);
+ok(1);
+ok(0);
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/five_fail.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/five_fail.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/five_fail.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/five_fail.plx	2006-08-31 07:24:16.000000000 +0200
@@ -0,0 +1,13 @@
+require Test::Simple;
+
+use lib 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 5);
+
+ok(0);
+ok(0);
+ok('');
+ok(0);
+ok(0);
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/last_minute_death.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/last_minute_death.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/last_minute_death.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/last_minute_death.plx	2008-02-24 05:39:07.000000000 +0100
@@ -0,0 +1,18 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 5);
+
+require Dev::Null;
+tie *STDERR, 'Dev::Null';
+
+ok(1);
+ok(1);
+ok(1);
+ok(1);
+ok(1);
+
+die "This is a test";
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/one_fail.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/one_fail.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/one_fail.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/one_fail.plx	2006-08-31 07:24:17.000000000 +0200
@@ -0,0 +1,14 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 5);
+
+
+ok(1);
+ok(2);
+ok(0);
+ok(1);
+ok(2);
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/pre_plan_death.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/pre_plan_death.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/pre_plan_death.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/pre_plan_death.plx	2006-08-31 07:24:16.000000000 +0200
@@ -0,0 +1,17 @@
+# ID 20020716.013, the exit code would become 0 if the test died
+# before a plan.
+
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+close STDERR;
+die "Knife?";
+
+Test::Simple->import(tests => 3);
+
+ok(1);
+ok(1);
+ok(1);
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/require.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/require.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/require.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/require.plx	2006-08-31 07:24:17.000000000 +0200
@@ -0,0 +1 @@
+require Test::Simple;
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/success.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/success.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/success.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/success.plx	2006-08-31 07:24:16.000000000 +0200
@@ -0,0 +1,13 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 5);
+
+ok(1);
+ok(5, 'yep');
+ok(3, 'beer');
+ok("wibble", "wibble");
+ok(1);
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/too_few_fail.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/too_few_fail.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/too_few_fail.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/too_few_fail.plx	2006-08-31 07:24:16.000000000 +0200
@@ -0,0 +1,12 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 5);
+
+
+ok(0);
+ok(1);
+ok(0);
\ No newline at end of file
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/too_few.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/too_few.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/too_few.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/too_few.plx	2006-08-31 07:24:16.000000000 +0200
@@ -0,0 +1,11 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 5);
+
+
+ok(1);
+ok(1);
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/two_fail.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/two_fail.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/two_fail.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/two_fail.plx	2006-08-31 07:24:16.000000000 +0200
@@ -0,0 +1,14 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 5);
+
+
+ok(0);
+ok(1);
+ok(1);
+ok(0);
+ok(1);
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/TieOut.pm perl-5.10.0/lib/Test/Simple/t/lib/TieOut.pm
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/TieOut.pm	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/TieOut.pm	2008-02-24 04:03:15.000000000 +0100
@@ -0,0 +1,28 @@
+package TieOut;
+
+sub TIEHANDLE {
+    my $scalar = '';
+    bless( \$scalar, $_[0]);
+}
+
+sub PRINT {
+    my $self = shift;
+    $$self .= join('', @_);
+}
+
+sub PRINTF {
+    my $self = shift;
+    my $fmt  = shift;
+    $$self .= sprintf $fmt, @_;
+}
+
+sub FILENO {}
+
+sub read {
+    my $self = shift;
+    my $data = $$self;
+    $$self = '';
+    return $data;
+}
+
+1;
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/maybe_regex.t perl-5.10.0/lib/Test/Simple/t/maybe_regex.t
--- perl-5.10.0/lib/Test/Simple/t.bla/maybe_regex.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/maybe_regex.t	2008-02-24 05:08:29.000000000 +0100
@@ -11,22 +11,24 @@
 }
 
 use strict;
-use Test::More tests => 13;
+use Test::More tests => 16;
 
 use Test::Builder;
 my $Test = Test::Builder->new;
 
-SKIP: {
-    skip "qr// added in 5.005", 3 if $] < 5.005;
+my $r = $Test->maybe_regex(qr/^FOO$/i);
+ok(defined $r, 'qr// detected');
+ok(('foo' =~ /$r/), 'qr// good match');
+ok(('bar' !~ /$r/), 'qr// bad match');
 
-    # 5.004 can't even see qr// or it pukes in compile.
-    eval q{
-           my $r = $Test->maybe_regex(qr/^FOO$/i);
-           ok(defined $r, 'qr// detected');
-           ok(('foo' =~ /$r/), 'qr// good match');
-           ok(('bar' !~ /$r/), 'qr// bad match');
-          };
-    die $@ if $@;
+SKIP: {
+    skip "blessed regex checker added in 5.10", 3 if $] < 5.010;
+    
+    my $obj = bless qr/foo/, 'Wibble';
+    my $re = $Test->maybe_regex($obj);
+    ok( defined $re, "blessed regex detected" );
+    ok( ('foo' =~ /$re/), 'blessed qr/foo/ good match' );
+    ok( ('bar' !~ /$re/), 'blessed qr/foo/ bad math' );
 }
 
 {
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/pod-coverage.t perl-5.10.0/lib/Test/Simple/t/pod-coverage.t
--- perl-5.10.0/lib/Test/Simple/t.bla/pod-coverage.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/pod-coverage.t	2007-03-14 01:21:10.000000000 +0100
@@ -0,0 +1,27 @@
+#!/usr/bin/perl -w
+
+use Test::More;
+
+# 1.08 added the coverage_class option.
+eval "use Test::Pod::Coverage 1.08";
+plan skip_all => "Test::Pod::Coverage 1.08 required for testing POD coverage" if $@;
+eval "use Pod::Coverage::CountParents";
+plan skip_all => "Pod::Coverage::CountParents required for testing POD coverage" if $@;
+
+my @modules = Test::Pod::Coverage::all_modules();
+plan tests => scalar @modules;
+
+my %coverage_params = (
+    "Test::Builder" => {
+        also_private => [ '^(share|lock|BAILOUT)$' ]
+    },
+    "Test::More" => {
+        trustme => [ '^(skip|todo)$' ]
+    },
+);
+
+for my $module (@modules) {
+    pod_coverage_ok( $module, { coverage_class => 'Pod::Coverage::CountParents',
+                                %{$coverage_params{$module} || {}} }
+                   );
+}
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/pod.t perl-5.10.0/lib/Test/Simple/t/pod.t
--- perl-5.10.0/lib/Test/Simple/t.bla/pod.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/pod.t	2006-10-24 23:08:10.000000000 +0200
@@ -0,0 +1,6 @@
+#!/usr/bin/perl -w
+
+use Test::More;
+eval "use Test::Pod 1.00";
+plan skip_all => "Test::Pod 1.00 required for testing POD" if $@;
+all_pod_files_ok();
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/reset.t perl-5.10.0/lib/Test/Simple/t/reset.t
--- perl-5.10.0/lib/Test/Simple/t.bla/reset.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/reset.t	2008-02-24 05:31:07.000000000 +0100
@@ -16,6 +16,11 @@
 
 use Test::Builder;
 my $tb = Test::Builder->new;
+
+my %Original_Output;
+$Original_Output{$_} = $tb->$_ for qw(output failure_output todo_output);
+
+
 $tb->plan(tests => 14);
 $tb->level(0);
 
@@ -66,11 +71,11 @@
 ok( $tb->use_numbers    == 1,           'use_numbers' );
 ok( $tb->no_header      == 0,           'no_header' );
 ok( $tb->no_ending      == 0,           'no_ending' );
-ok( fileno $tb->output         == fileno *Test::Builder::TESTOUT,    
+ok( fileno $tb->output         == fileno $Original_Output{output},    
                                         'output' );
-ok( fileno $tb->failure_output == fileno *Test::Builder::TESTERR,    
+ok( fileno $tb->failure_output == fileno $Original_Output{failure_output},    
                                         'failure_output' );
-ok( fileno $tb->todo_output    == fileno *Test::Builder::TESTOUT,
+ok( fileno $tb->todo_output    == fileno $Original_Output{todo_output},
                                         'todo_output' );
 ok( $tb->current_test   == 0,           'current_test' );
 ok( $tb->summary        == 0,           'summary' );
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/tbm_doesnt_set_exported_to.t perl-5.10.0/lib/Test/Simple/t/tbm_doesnt_set_exported_to.t
--- perl-5.10.0/lib/Test/Simple/t.bla/tbm_doesnt_set_exported_to.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/tbm_doesnt_set_exported_to.t	2008-02-26 21:45:20.000000000 +0100
@@ -0,0 +1,24 @@
+#!/usr/bin/perl -w
+
+BEGIN {
+    if( $ENV{PERL_CORE} ) {
+        chdir 't';
+        @INC = '../lib';
+    }
+}
+
+use strict;
+use warnings;
+
+# Can't use Test::More, that would set exported_to()
+use Test::Builder;
+use Test::Builder::Module;
+
+my $TB = Test::Builder->create;
+$TB->plan( tests => 1 );
+$TB->level(0);
+
+$TB->is_eq( Test::Builder::Module->builder->exported_to,
+            undef,
+            'using Test::Builder::Module does not set exported_to()'
+);
\ No newline at end of file
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/todo.t perl-5.10.0/lib/Test/Simple/t/todo.t
--- perl-5.10.0/lib/Test/Simple/t.bla/todo.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/todo.t	2008-02-27 10:37:18.000000000 +0100
@@ -9,7 +9,7 @@
 
 use Test::More;
 
-plan tests => 18;
+plan tests => 19;
 
 
 $Why = 'Just testing the todo interface.';
@@ -69,11 +69,20 @@
         # perl gets the line number a little wrong on the first
         # statement inside a block.
         1 == 1;
-#line 82
+#line 73
         todo_skip "Just testing todo_skip";
         fail("So very failed");
     }
     is( $warning, "todo_skip() needs to know \$how_many tests are in the ".
-                  "block at $0 line 82\n",
+                  "block at $0 line 73\n",
         'todo_skip without $how_many warning' );
 }
+
+
+TODO: {
+    Test::More->builder->exported_to("Wibble");
+    
+    local $TODO = "testing \$TODO with an incorrect exported_to()";
+    
+    fail("Just testing todo");
+}
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/utf8.t perl-5.10.0/lib/Test/Simple/t/utf8.t
--- perl-5.10.0/lib/Test/Simple/t.bla/utf8.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/utf8.t	2008-04-06 17:24:44.000000000 +0200
@@ -0,0 +1,69 @@
+#!/usr/bin/perl -w
+
+BEGIN {
+    if( $ENV{PERL_CORE} ) {
+        chdir 't';
+        @INC = '../lib';
+    }
+}
+
+use strict;
+use warnings;
+
+use Test::More skip_all => 'Not yet implemented';
+
+my $have_perlio;
+BEGIN {
+    # All together so Test::More sees the open discipline
+    $have_perlio = eval q[
+        use PerlIO;
+        use open ':std', ':locale';
+        use Test::More;
+        1;
+    ];
+}
+
+use Test::More;
+
+if( !$have_perlio ) {
+    plan skip_all => "Don't have PerlIO";
+}
+else {
+    plan tests => 5;
+}
+
+SKIP: {
+    skip( "Need PerlIO for this feature", 3 )
+        unless $have_perlio;
+
+    my %handles = (
+        output          => \*STDOUT,
+        failure_output  => \*STDERR,
+        todo_output     => \*STDOUT
+    );
+
+    for my $method (keys %handles) {
+        my $src = $handles{$method};
+        
+        my $dest = Test::More->builder->$method;
+        
+        is_deeply { map { $_ => 1 } PerlIO::get_layers($dest) },
+                  { map { $_ => 1 } PerlIO::get_layers($src)  },
+                  "layers copied to $method";
+    }
+}
+
+SKIP: {
+    skip( "Can't test in general because their locale is unknown", 2 )
+        unless $ENV{AUTHOR_TESTING};
+
+    my $uni = "\x{11e}";
+    
+    my @warnings;
+    local $SIG{__WARN__} = sub {
+        push @warnings, @_;
+    };
+
+    is( $uni, $uni, "Testing $uni" );
+    is_deeply( \@warnings, [] );
+}
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/death_in_eval.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/death_in_eval.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx
--- perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx.bla	2007-12-18 11:47:08.000000000 +0100
+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx	2008-02-24 05:39:20.000000000 +0100
@@ -4,10 +4,12 @@ push @INC, 't/lib';
 require Test::Simple::Catch;
 my($out, $err) = Test::Simple::Catch::caught();
 
+require Dev::Null;
+
 Test::Simple->import(tests => 5);
-close STDERR;
+tie *STDERR, 'Dev::Null';
 
 ok(1);
 ok(1);
 ok(1);
-die "Knife?";
+die "This is a test";
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx
--- perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx.bla	2008-09-16 14:55:33.000000000 +0200
+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx	2008-02-24 05:38:55.000000000 +0100
@@ -0,0 +1,18 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 2);
+
+# Test we still get the right exit code despite having a die
+# handler.
+$SIG{__DIE__} = sub {};
+
+require Dev::Null;
+tie *STDERR, 'Dev::Null';
+
+ok(1);
+ok(1);
+die "This is a test";
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/exit.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/exit.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/extras.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/extras.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/five_fail.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/five_fail.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx
--- perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx.bla	2007-12-18 11:47:08.000000000 +0100
+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx	2008-02-24 05:39:07.000000000 +0100
@@ -5,7 +5,9 @@ require Test::Simple::Catch;
 my($out, $err) = Test::Simple::Catch::caught();
 
 Test::Simple->import(tests => 5);
-close STDERR;
+
+require Dev::Null;
+tie *STDERR, 'Dev::Null';
 
 ok(1);
 ok(1);
@@ -13,4 +15,4 @@ ok(1);
 ok(1);
 ok(1);
 
-die "Almost there...";
+die "This is a test";
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/one_fail.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/one_fail.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/pre_plan_death.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/pre_plan_death.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/require.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/require.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/success.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/success.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/two_fail.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/two_fail.plx


Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- perl.spec	14 Aug 2008 14:29:58 -0000	1.187
+++ perl.spec	16 Sep 2008 15:05:23 -0000	1.188
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        42%{?dist}
+Release:        43%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        The Perl programming language
 Group:          Development/Languages
@@ -85,6 +85,9 @@
 # 457085  CGI.pm bug in exists() on tied param hash
 Patch21:        perl-5.10.0-CGI.patch
 
+# 462444	update Test::Simple to 0.80
+Patch22:		perl-5.10.0-TestSimple0.80.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{perl_version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  tcsh, dos2unix, man, groff
 BuildRequires:  gdbm-devel, db4-devel, zlib-devel
@@ -814,6 +817,8 @@
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
+
 #
 # Candidates for doc recoding (need case by case review):
 # find . -name "*.pod" -o -name "README*" -o -name "*.pm" | xargs file -i | grep charset= | grep -v '\(us-ascii\|utf-8\)'
@@ -1034,6 +1039,8 @@
 perl -x patchlevel.h 'Fedora Patch18: Remove old Test::Harness'
 perl -x patchlevel.h 'Fedora Patch19: Update Test::Harness to 3.12'
 perl -x patchlevel.h 'Fedora Patch20: pos function handle unicode correct'
+perl -x patchlevel.h 'Fedora Patch21: CGI.pm bug in exists() on tied param hash'
+perl -x patchlevel.h 'Fedora Patch22: Update Test::Simple to 0.80'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1641,6 +1648,9 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Tue Sep 16 2008 Marcela Maslanova <mmaslano at redhat.com> 4:5.10.0-43.fc10
+- 462444 update Test::Simple to 0.80
+
 * Thu Aug 14 2008 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-42.fc10
 - move libnet to the right directory, along Net/Config.pm
 



From rstrode at fedoraproject.org  Tue Sep 16 15:16:53 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 16 Sep 2008 15:16:53 +0000 (UTC)
Subject: rpms/ConsoleKit/devel
	ConsoleKit-0.3.0-get-vt-from-display-instead-of-controlling-tty.patch,
	NONE, 1.1 ConsoleKit.spec, 1.32, 1.33
Message-ID: <20080916151654.105BE70138@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/ConsoleKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28909

Modified Files:
	ConsoleKit.spec 
Added Files:
	ConsoleKit-0.3.0-get-vt-from-display-instead-of-controlling-tty.patch 
Log Message:
- Grab X server display device from XFree86_VT root window property,
  if X server doesn't have a controlling terminal.


ConsoleKit-0.3.0-get-vt-from-display-instead-of-controlling-tty.patch:

--- NEW FILE ConsoleKit-0.3.0-get-vt-from-display-instead-of-controlling-tty.patch ---
diff --git a/tools/ck-get-x11-display-device.c b/tools/ck-get-x11-display-device.c
index b349cc7..eb2fec9 100644
--- a/tools/ck-get-x11-display-device.c
+++ b/tools/ck-get-x11-display-device.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 
 #include <X11/Xlib.h>
+#include <X11/Xatom.h>
 #include <glib.h>
 
 #include "ck-sysdeps.h"
@@ -78,6 +79,72 @@ display_init (const char *display_name)
         return xdisplay;
 }
 
+static char *
+get_tty_for_display (Display *xdisplay)
+{
+        Window root_window;
+        Atom xfree86_vt_atom;
+        Atom return_type_atom;
+        int return_format;
+        gulong return_count;
+        gulong bytes_left;
+        guchar *return_value;
+        glong vt;
+        char *display;
+
+        display = NULL;
+
+        xfree86_vt_atom = XInternAtom (xdisplay, "XFree86_VT", True);
+
+        if (xfree86_vt_atom == None) {
+                return NULL;
+        }
+
+        root_window = DefaultRootWindow (xdisplay);
+
+        g_assert (root_window != None);
+
+        return_value = NULL;
+        if (XGetWindowProperty(xdisplay, root_window, xfree86_vt_atom,
+                               0L, 1L, False, XA_INTEGER,
+                               &return_type_atom, &return_format,
+                               &return_count, &bytes_left,
+                               &return_value) != Success) {
+                goto out;
+        }
+
+        if (return_type_atom != XA_INTEGER) {
+                goto out;
+        }
+
+        if (return_format != 32) {
+                goto out;
+        }
+
+        if (return_count != 1) {
+                goto out;
+        }
+
+        if (bytes_left != 0) {
+                goto out;
+        }
+
+        vt = *((glong *) return_value);
+
+        if (vt <= 0) {
+                goto out;
+        }
+
+        display = g_strdup_printf ("/dev/tty%ld", vt);
+
+out:
+        if (return_value != NULL) {
+                XFree (return_value);
+        }
+
+        return display;
+}
+
 int
 main (int    argc,
       char **argv)
@@ -115,6 +182,11 @@ main (int    argc,
                 if (res) {
                         if (pid > 0) {
                                 device = get_tty_for_pid (pid);
+
+                                if (device == NULL) {
+                                        device = get_tty_for_display (xdisplay);
+                                }
+
                                 if (device != NULL) {
                                         printf ("%s\n", device);
                                         g_free (device);


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ConsoleKit.spec	31 Jul 2008 01:13:18 -0000	1.32
+++ ConsoleKit.spec	16 Sep 2008 15:16:23 -0000	1.33
@@ -6,7 +6,7 @@
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
 Version: 0.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
@@ -24,6 +24,8 @@
 BuildRequires: zlib-devel
 BuildRequires: xmlto
 
+Patch0: ConsoleKit-0.3.0-get-vt-from-display-instead-of-controlling-tty.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.
@@ -75,6 +77,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .get-vt-from-display-instead-of-controlling-tty
 
 %build
 %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version}
@@ -155,6 +158,10 @@
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Tue Sep 16 2008 Ray Strode  <rstrode at redhat.com> - 0.3.0-2
+- Grab X server display device from XFree86_VT root window property,
+  if X server doesn't have a controlling terminal.
+
 * Wed Jul 30 2008 Jon McCann  <jmccann at redhat.com> - 0.3.0-1
 - Update to 0.3.0
 



From tuxbrewr at fedoraproject.org  Tue Sep 16 15:18:05 2008
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue, 16 Sep 2008 15:18:05 +0000 (UTC)
Subject: rpms/quassel/F-9 .cvsignore, 1.2, 1.3 quassel.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20080916151805.D078F70138@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/quassel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29290

Modified Files:
	.cvsignore quassel.spec sources 
Log Message:
New Upstream Release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Jul 2008 21:52:46 -0000	1.2
+++ .cvsignore	16 Sep 2008 15:17:35 -0000	1.3
@@ -1 +1 @@
-quassel-0.2.0-rc1.tar.bz2
+quassel-0.3.0.1.tar.bz2


Index: quassel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/F-9/quassel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- quassel.spec	5 Jul 2008 21:44:01 -0000	1.2
+++ quassel.spec	16 Sep 2008 15:17:35 -0000	1.3
@@ -1,12 +1,12 @@
 Name:    quassel
 Summary: QT4 Based distrubuted IRC system
-Version: 0.2.0
-Release: 0.1.rc1%{?dist}
+Version: 0.3.0.1
+Release: 1%{?dist}
 
 License: GPLv2 or GPLv3
 Group:	 Applications/Internet
 URL:     http://quassel-irc.org/
-Source0: http://quassel-irc.org/system/files/quassel-%{version}-rc1.tar.bz2
+Source0: http://quassel-irc.org/system/files/quassel-%{version}.tar.bz2
 Source1: %{name}.desktop
 Source2: %{name}core.desktop
 Source3: %{name}client.desktop
@@ -38,7 +38,7 @@
 Quassel client 
 
 %prep
-%setup -q -n quassel-0.2.0-rc1
+%setup -q -n quassel-0.3.0.1
 
 %build
 
@@ -81,6 +81,9 @@
 %{_datadir}/applications/fedora-quasselclient.desktop
 
 %changelog
+*Tue Sep 16 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.3.0.1-1
+- New upstream release
+
 * Fri Jul 04 2008 Steven Parrish <smparrish at shallowcreek.net> 0.1.rc1
 - New upstream release.  Now uses cmake instead of qmake
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jul 2008 21:52:47 -0000	1.3
+++ sources	16 Sep 2008 15:17:35 -0000	1.4
@@ -1 +1 @@
-65930b7b0f59ae115ae5a20389189d83  quassel-0.2.0-rc1.tar.bz2
+20490f97c9fc9a147f5aa5a30afcc413  quassel-0.3.0.1.tar.bz2



From caolanm at fedoraproject.org  Tue Sep 16 15:27:24 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 16 Sep 2008 15:27:24 +0000 (UTC)
Subject: rpms/planner/devel planner.spec,1.53,1.54
Message-ID: <20080916152724.A711D70138@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30367

Modified Files:
	planner.spec 
Log Message:
remove some .la files


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/devel/planner.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- planner.spec	6 Aug 2008 07:32:11 -0000	1.53
+++ planner.spec	16 Sep 2008 15:26:54 -0000	1.54
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.3
-Release:   3%{?dist}
+Release:   4%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -79,6 +79,7 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/views/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/gtk-2.0/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/storage-modules/libstorage-sql*
 rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/libsql-plugin*
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/extensions/*.la
@@ -122,7 +123,7 @@
 %{_libdir}/%{name}/plugins/libmsp-plugin.so
 %{_libdir}/%{name}/plugins/libxmlplanner-plugin.so
 %{_libdir}/lib%{name}-1.so.*
-%{_libdir}/python*/site-packages/*
+%{_libdir}/python*/site-packages/*.so
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_datadir}/%{name}
 %{_datadir}/icons/hicolor/48x48/mimetypes/*.png
@@ -151,6 +152,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Sep 16 2008 Caol??n McNamara <caolanm at redhat.com> - 0.14.3-4
+- remove some .la files
+
 * Tue Aug 05 2008 Caol??n McNamara <caolanm at redhat.com> - 0.14.3-3
 - rebuild for e-d-s
 



From jkeating at fedoraproject.org  Tue Sep 16 15:27:25 2008
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 16 Sep 2008 15:27:25 +0000 (UTC)
Subject: rpms/mash/devel rawhide-to-development.patch, NONE, 1.1 mash.spec, 
	1.32, 1.33
Message-ID: <20080916152725.2911170138@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/mash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30387

Modified Files:
	mash.spec 
Added Files:
	rawhide-to-development.patch 
Log Message:
* Tue Sep 16 2008 Jesse Keating <jkeating at redhat.com> - 0.4.1-2
- Rename 'rawhide' back to 'development' as we're not ready to make that name
change on the mirror.


rawhide-to-development.patch:

--- NEW FILE rawhide-to-development.patch ---
diff -up mash-0.4.1/configs/rawhide.mash.jk mash-0.4.1/configs/rawhide.mash
--- mash-0.4.1/configs/rawhide.mash.jk	2008-09-15 11:31:47.000000000 -0700
+++ mash-0.4.1/configs/rawhide.mash	2008-09-16 08:22:13.000000000 -0700
@@ -1,6 +1,6 @@
 # mash config file
 
-[rawhide]
+[development]
 rpm_path = %(arch)s/os/Packages
 repodata_path = %(arch)s/os/
 source_path = source/SRPMS


Index: mash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mash/devel/mash.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mash.spec	15 Sep 2008 18:34:39 -0000	1.32
+++ mash.spec	16 Sep 2008 15:26:54 -0000	1.33
@@ -2,7 +2,7 @@
 
 Name:           mash
 Version:        0.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPLv2
@@ -13,6 +13,7 @@
 Conflicts:	pungi < 1.0.0
 BuildRequires:  python-devel
 BuildArch:      noarch
+Patch0:         rawhide-to-development.patch
 
 %description
 mash is a tool that queries a koji buildsystem for the latest RPMs for
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -44,6 +46,10 @@
 /var/cache/mash
 
 %changelog
+* Tue Sep 16 2008 Jesse Keating <jkeating at redhat.com> - 0.4.1-2
+- Rename 'rawhide' back to 'development' as we're not ready to make that name
+change on the mirror.
+
 * Mon Sep 15 2008 Bill Nottingham <notting at redhat.com> 0.4.1-1
 - Adjust for new keys
 



From mtasaka at fedoraproject.org  Tue Sep 16 15:28:20 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 16 Sep 2008 15:28:20 +0000 (UTC)
Subject: rpms/jd/F-8 .cvsignore, 1.285, 1.286 jd.spec, 1.320, 1.321 sources, 
	1.286, 1.287
Message-ID: <20080916152820.5338E70138@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30796/F-8

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Sep 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2347



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- .cvsignore	14 Sep 2008 14:00:47 -0000	1.285
+++ .cvsignore	16 Sep 2008 15:27:49 -0000	1.286
@@ -1 +1 @@
-jd-2.0.1-080914.tgz
+jd-2.0.2-svn2347_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- jd.spec	15 Sep 2008 17:22:03 -0000	1.320
+++ jd.spec	16 Sep 2008 15:27:50 -0000	1.321
@@ -9,11 +9,11 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      2.0.1
+%define         main_ver      2.0.2
 %define         strtag        080914
-%define         repoid        32887
+%define         repoid        svn2347_trunk
 # Define this if this is pre-version
-%define         pre_release   0
+%define         pre_release   1
 ##########################################
 
 ##########################################
@@ -51,7 +51,7 @@
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-Patch0:		jd-2.0.1-cookie-change.patch
+#Patch0:		jd-2.0.1-cookie-change.patch
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -75,7 +75,6 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-%patch0 -p0 -b .cookie
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %if 0%{?fedora} >= 10
@@ -137,6 +136,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Wed Sep 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2347
+
 * Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
 - Patch to cope with occasional cookie change
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/sources,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- sources	14 Sep 2008 14:00:47 -0000	1.286
+++ sources	16 Sep 2008 15:27:50 -0000	1.287
@@ -1 +1 @@
-acddaac88539f460023def208b08d120  jd-2.0.1-080914.tgz
+69896b8a2256e49d7b1a1a387137a738  jd-2.0.2-svn2347_trunk.tgz



From mtasaka at fedoraproject.org  Tue Sep 16 15:28:21 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 16 Sep 2008 15:28:21 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.292, 1.293 jd.spec, 1.341, 1.342 sources,
	1.293, 1.294
Message-ID: <20080916152821.070E370138@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30796/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Sep 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2347



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- .cvsignore	14 Sep 2008 14:00:48 -0000	1.292
+++ .cvsignore	16 Sep 2008 15:27:50 -0000	1.293
@@ -1 +1 @@
-jd-2.0.1-080914.tgz
+jd-2.0.2-svn2347_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- jd.spec	15 Sep 2008 17:22:04 -0000	1.341
+++ jd.spec	16 Sep 2008 15:27:50 -0000	1.342
@@ -9,11 +9,11 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      2.0.1
+%define         main_ver      2.0.2
 %define         strtag        080914
-%define         repoid        32887
+%define         repoid        svn2347_trunk
 # Define this if this is pre-version
-%define         pre_release   0
+%define         pre_release   1
 ##########################################
 
 ##########################################
@@ -51,7 +51,7 @@
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-Patch0:		jd-2.0.1-cookie-change.patch
+#Patch0:		jd-2.0.1-cookie-change.patch
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -75,7 +75,6 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-%patch0 -p0 -b .cookie
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %if 0%{?fedora} >= 10
@@ -137,6 +136,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Wed Sep 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2347
+
 * Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
 - Patch to cope with occasional cookie change
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- sources	14 Sep 2008 14:00:48 -0000	1.293
+++ sources	16 Sep 2008 15:27:50 -0000	1.294
@@ -1 +1 @@
-acddaac88539f460023def208b08d120  jd-2.0.1-080914.tgz
+69896b8a2256e49d7b1a1a387137a738  jd-2.0.2-svn2347_trunk.tgz



From mtasaka at fedoraproject.org  Tue Sep 16 15:28:20 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 16 Sep 2008 15:28:20 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.292, 1.293 jd.spec, 1.331, 1.332 sources, 
	1.293, 1.294
Message-ID: <20080916152820.A72DC70138@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30796/F-9

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Sep 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2347



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- .cvsignore	14 Sep 2008 14:00:47 -0000	1.292
+++ .cvsignore	16 Sep 2008 15:27:50 -0000	1.293
@@ -1 +1 @@
-jd-2.0.1-080914.tgz
+jd-2.0.2-svn2347_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -r1.331 -r1.332
--- jd.spec	15 Sep 2008 17:22:04 -0000	1.331
+++ jd.spec	16 Sep 2008 15:27:50 -0000	1.332
@@ -9,11 +9,11 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      2.0.1
+%define         main_ver      2.0.2
 %define         strtag        080914
-%define         repoid        32887
+%define         repoid        svn2347_trunk
 # Define this if this is pre-version
-%define         pre_release   0
+%define         pre_release   1
 ##########################################
 
 ##########################################
@@ -51,7 +51,7 @@
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-Patch0:		jd-2.0.1-cookie-change.patch
+#Patch0:		jd-2.0.1-cookie-change.patch
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -75,7 +75,6 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-%patch0 -p0 -b .cookie
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %if 0%{?fedora} >= 10
@@ -137,6 +136,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Wed Sep 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2347
+
 * Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
 - Patch to cope with occasional cookie change
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- sources	14 Sep 2008 14:00:47 -0000	1.293
+++ sources	16 Sep 2008 15:27:50 -0000	1.294
@@ -1 +1 @@
-acddaac88539f460023def208b08d120  jd-2.0.1-080914.tgz
+69896b8a2256e49d7b1a1a387137a738  jd-2.0.2-svn2347_trunk.tgz



From mpg at fedoraproject.org  Tue Sep 16 15:31:32 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Tue, 16 Sep 2008 15:31:32 +0000 (UTC)
Subject: rpms/dbus-python/devel dbus-python-0.83.0-memleak.patch, NONE,
	1.1 dbus-python.spec, 1.27, 1.28
Message-ID: <20080916153132.615EC70138@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/dbus-python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31354

Modified Files:
	dbus-python.spec 
Added Files:
	dbus-python-0.83.0-memleak.patch 
Log Message:
* Tue Sep 16 2008 Marco Pesenti Gritti - 0.83.0-3
- Add patch for https://bugs.freedesktop.org/show_bug.cgi?id=17551 



dbus-python-0.83.0-memleak.patch:

--- NEW FILE dbus-python-0.83.0-memleak.patch ---
--- dbus/connection.py.orig	2008-09-13 14:54:49.000000000 +0200
+++ dbus/connection.py	2008-09-13 14:55:01.000000000 +0200
@@ -484,7 +484,15 @@
                     deletions.append(match)
                 else:
                     new.append(match)
-            by_member[signal_name] = new
+
+            if new:
+                by_member[signal_name] = new
+            else:
+                del by_member[signal_name]
+                if not by_member:
+                    del by_interface[dbus_interface]
+                    if not by_interface:
+                        del self._signal_recipients_by_object_path[path]
         finally:
             self._signals_lock.release()
 


Index: dbus-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-python/devel/dbus-python.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- dbus-python.spec	5 Aug 2008 06:10:28 -0000	1.27
+++ dbus-python.spec	16 Sep 2008 15:31:02 -0000	1.28
@@ -7,7 +7,7 @@
 Summary: D-Bus Python Bindings 
 Name: dbus-python
 Version: 0.83.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus-python/%{name}-%{version}.tar.gz
 
@@ -18,6 +18,8 @@
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: python-devel
 
+Patch0: dbus-python-0.83.0-memleak.patch
+
 %description
 
 D-Bus python bindings for use with python programs.   
@@ -35,6 +37,8 @@
 %prep
 %setup -q
 
+%patch0 -p0 -b .memleak
+
 %build
 %configure
 
@@ -75,6 +79,9 @@
 %{_libdir}/pkgconfig/dbus-python.pc
 
 %changelog
+* Tue Sep 16 2008 Marco Pesenti Gritti - 0.83.0-3
+- Add patch for https://bugs.freedesktop.org/show_bug.cgi?id=17551 
+
 * Tue Aug 05 2008  Huang Peng <phuang at redhat.com> - 0.83.0-2
 - Update to 0.83.0.
 



From sdz at fedoraproject.org  Tue Sep 16 15:52:04 2008
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue, 16 Sep 2008 15:52:04 +0000 (UTC)
Subject: rpms/avogadro/F-9 avogadro.desktop, NONE, 1.1 avogadro.spec, NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080916155204.4700270138@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/avogadro/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2046/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	avogadro.desktop avogadro.spec import.log 
Log Message:
initial import (bug #458030)



--- NEW FILE avogadro.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Avogadro
GenericName=Avogadro
Exec=avogadro
Icon=avogadro
Terminal=false
Categories=KDE;Education;Chemistry;
Type=Application


--- NEW FILE avogadro.spec ---
Name:           avogadro
Version:        0.8.1
Release:        6%{?dist}
Summary:        Avogadro is an advanced Molecular editor

Group:          Applications/Editors
License:        GPLv2
URL:            http://avogadro.openmolecules.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Source1:        %{name}.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cmake >= 2.4.5
BuildRequires:  qt4-devel >= 4.3.0
BuildRequires:  eigen-devel >= 1.0.5
BuildRequires:  openbabel-devel >= 2.2.0
BuildRequires:  python-devel >= 2.5.1
BuildRequires:  desktop-file-utils
BuildRequires:  docbook-utils
BuildRequires:  docbook-utils-pdf

%description
Avogadro is an advanced molecular editor designed
for cross-platform use in computational chemistry,
molecular modeling, bioinformatics, materials science,
and related areas. It offers flexible rendering and
a powerful plugin architecture.


%package libs
Summary:        Shared libraries for Avogadro
Group:          System Environment/Libraries

%description libs
This package contains the shared libraries for the
molecular editor Avogadro.


%package devel
Summary:        Development files for Avogadro
Group:          Development/Libraries
Requires:       %{name}-libs = %{version}-%{release} 

%description devel
This package contains files to develop applications using 
Avogadros libraries.


%prep
%setup -q
# permissions set by upstream would lead to rpmlint warning
# spurious-executable-perm in debuginfo package
chmod 0644 libavogadro/src/engines/iso.h
chmod 0644 libavogadro/src/tools/autoopttool.cpp
chmod 0644 libavogadro/src/tools/autoopttool.h


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake} %{?BUILD_TESTS} -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_lib} ..
popd
make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}

# app icon
install -p -D -m644 ./avogadro/src/icons/avogadro.svg $RPM_BUILD_ROOT/%{_datadir}/pixmaps/avogadro.svg

# system menu entry
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor=""                 \
  --dir=$RPM_BUILD_ROOT%{_datadir}/applications  \
  %{SOURCE1}


%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING ./doc/pdf/index.pdf
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/pixmaps/%{name}.svg
%{_datadir}/applications/%{name}.desktop


%files devel
%defattr(-,root,root,-)
%{_datadir}/libavogadro
%{_includedir}/%{name}
%{_libdir}/*.so


%files libs
%defattr(-,root,root,-)
%{_libdir}/%{name}
%{_libdir}/*.so.*


%changelog
* Sun Sep 14 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-6
- add handbook to docs

* Sun Sep 14 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-5
- add build requirements and fix group names

* Wed Aug 13 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-4
- fix typos

* Sat Aug  9 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-3
- reorganize spec file

* Sat Aug  9 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-2
- rename shared library package and structure spec file

* Sun Aug  3 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-1
- initial pacakging release based on PackMan release


--- NEW FILE import.log ---
avogadro-0_8_1-6_fc9:F-9:avogadro-0.8.1-6.fc9.src.rpm:1221580260


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2008 09:28:13 -0000	1.1
+++ .cvsignore	16 Sep 2008 15:51:33 -0000	1.2
@@ -0,0 +1 @@
+avogadro-0.8.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2008 09:28:13 -0000	1.1
+++ sources	16 Sep 2008 15:51:33 -0000	1.2
@@ -0,0 +1 @@
+a74d11a9a8240d018db8638e82dd915c  avogadro-0.8.1.tar.bz2



From sdz at fedoraproject.org  Tue Sep 16 15:54:04 2008
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue, 16 Sep 2008 15:54:04 +0000 (UTC)
Subject: rpms/avogadro/F-8 avogadro.desktop, NONE, 1.1 avogadro.spec, NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080916155404.812B470138@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/avogadro/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2707/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	avogadro.desktop avogadro.spec import.log 
Log Message:
initial import (bug #458030)



--- NEW FILE avogadro.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Avogadro
GenericName=Avogadro
Exec=avogadro
Icon=avogadro
Terminal=false
Categories=KDE;Education;Chemistry;
Type=Application


--- NEW FILE avogadro.spec ---
Name:           avogadro
Version:        0.8.1
Release:        6%{?dist}
Summary:        Avogadro is an advanced Molecular editor

Group:          Applications/Editors
License:        GPLv2
URL:            http://avogadro.openmolecules.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Source1:        %{name}.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cmake >= 2.4.5
BuildRequires:  qt4-devel >= 4.3.0
BuildRequires:  eigen-devel >= 1.0.5
BuildRequires:  openbabel-devel >= 2.2.0
BuildRequires:  python-devel >= 2.5.1
BuildRequires:  desktop-file-utils
BuildRequires:  docbook-utils
BuildRequires:  docbook-utils-pdf

%description
Avogadro is an advanced molecular editor designed
for cross-platform use in computational chemistry,
molecular modeling, bioinformatics, materials science,
and related areas. It offers flexible rendering and
a powerful plugin architecture.


%package libs
Summary:        Shared libraries for Avogadro
Group:          System Environment/Libraries

%description libs
This package contains the shared libraries for the
molecular editor Avogadro.


%package devel
Summary:        Development files for Avogadro
Group:          Development/Libraries
Requires:       %{name}-libs = %{version}-%{release} 

%description devel
This package contains files to develop applications using 
Avogadros libraries.


%prep
%setup -q
# permissions set by upstream would lead to rpmlint warning
# spurious-executable-perm in debuginfo package
chmod 0644 libavogadro/src/engines/iso.h
chmod 0644 libavogadro/src/tools/autoopttool.cpp
chmod 0644 libavogadro/src/tools/autoopttool.h


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake} %{?BUILD_TESTS} -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_lib} ..
popd
make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}

# app icon
install -p -D -m644 ./avogadro/src/icons/avogadro.svg $RPM_BUILD_ROOT/%{_datadir}/pixmaps/avogadro.svg

# system menu entry
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor=""                 \
  --dir=$RPM_BUILD_ROOT%{_datadir}/applications  \
  %{SOURCE1}


%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING ./doc/pdf/index.pdf
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/pixmaps/%{name}.svg
%{_datadir}/applications/%{name}.desktop


%files devel
%defattr(-,root,root,-)
%{_datadir}/libavogadro
%{_includedir}/%{name}
%{_libdir}/*.so


%files libs
%defattr(-,root,root,-)
%{_libdir}/%{name}
%{_libdir}/*.so.*


%changelog
* Sun Sep 14 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-6
- add handbook to docs

* Sun Sep 14 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-5
- add build requirements and fix group names

* Wed Aug 13 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-4
- fix typos

* Sat Aug  9 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-3
- reorganize spec file

* Sat Aug  9 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-2
- rename shared library package and structure spec file

* Sun Aug  3 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-1
- initial pacakging release based on PackMan release


--- NEW FILE import.log ---
avogadro-0_8_1-6_fc9:F-8:avogadro-0.8.1-6.fc9.src.rpm:1221580380


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2008 09:28:13 -0000	1.1
+++ .cvsignore	16 Sep 2008 15:53:34 -0000	1.2
@@ -0,0 +1 @@
+avogadro-0.8.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2008 09:28:13 -0000	1.1
+++ sources	16 Sep 2008 15:53:34 -0000	1.2
@@ -0,0 +1 @@
+a74d11a9a8240d018db8638e82dd915c  avogadro-0.8.1.tar.bz2



From jnovy at fedoraproject.org  Tue Sep 16 15:54:22 2008
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Tue, 16 Sep 2008 15:54:22 +0000 (UTC)
Subject: rpms/compat-db/devel db-4.6.21-1.85-compat.patch, NONE,
	1.1 compat-db.spec, 1.32, 1.33
Message-ID: <20080916155422.CDD7D70138@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/compat-db/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2835

Modified Files:
	compat-db.spec 
Added Files:
	db-4.6.21-1.85-compat.patch 
Log Message:
* Tue Sep 16 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-4
- build also if db4 is not installed (thanks to Michael A. Peters)


db-4.6.21-1.85-compat.patch:

--- NEW FILE db-4.6.21-1.85-compat.patch ---
diff -ur db-4.6.21/dist/Makefile.in db-4.6.21-db.h_include-patched/dist/Makefile.in
--- db-4.6.21/dist/Makefile.in	2007-07-05 18:35:02.000000000 +0000
+++ db-4.6.21-db.h_include-patched/dist/Makefile.in	2008-09-05 08:59:36.000000000 +0000
@@ -139,8 +139,8 @@
 # local libraries, for example.  Do that by adding -I options to the DB185INC
 # line, and -l options to the DB185LIB line.
 ##################################################
-DB185INC=	-c @CFLAGS@ -I$(srcdir) @CPPFLAGS@
-DB185LIB=
+DB185INC=	-c @CFLAGS@ -I$(srcdir) -I$(srcdir)/db.1.85/PORT/linux/include @CPPFLAGS@
+DB185LIB=	${srcdir}/db.1.85/PORT/linux/libdb.a
 
 ##################################################
 # NOTHING BELOW THIS LINE SHOULD EVER NEED TO BE MODIFIED.


Index: compat-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compat-db/devel/compat-db.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- compat-db.spec	2 Aug 2008 16:23:36 -0000	1.32
+++ compat-db.spec	16 Sep 2008 15:53:52 -0000	1.33
@@ -6,7 +6,7 @@
 Summary: The Berkeley DB database library for Red Hat Linux 7.x compatibility
 Name: compat-db
 Version: 4.6.21
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-4.3.29.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz
 Source2: http://download.oracle.com/berkeley-db/db-4.6.21.tar.gz
@@ -14,6 +14,7 @@
 Patch2: db-4.3.29-64bit.patch
 Patch3: db-4.3.29-sparc64.patch
 Patch4: db-4.5.20-glibc.patch
+Patch5: db-4.6.21-1.85-compat.patch
 
 # Upstream db-4.3.29 patches
 Patch20: http://www.oracle.com/technology/products/berkeley-db/db/update/4.3.29/patch.4.3.29.1
@@ -49,6 +50,7 @@
 pushd db-4.3.29
 %patch2 -p1 -b .64bit
 %patch3 -p1 -b .sparc64
+%patch5 -p1 -b .185compat
 %patch20 -p0
 popd
 
@@ -204,6 +206,9 @@
 %{_includedir}/*
 
 %changelog
+* Tue Sep 16 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-4
+- build also if db4 is not installed (thanks to Michael A. Peters)
+
 * Sat Aug 02 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-3
 - fix URL to 4.3.29 patch
 - official upstream tarball for db-4.3.29 has changed, the only change



From jnovy at fedoraproject.org  Tue Sep 16 15:56:57 2008
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Tue, 16 Sep 2008 15:56:57 +0000 (UTC)
Subject: rpms/db4/devel db-4.6.21-1.85-compat.patch, NONE, 1.1 db4.spec, 1.63,
	1.64
Message-ID: <20080916155657.CE85570138@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/db4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3360

Modified Files:
	db4.spec 
Added Files:
	db-4.6.21-1.85-compat.patch 
Log Message:
* Tue Sep 16 2008 Jindrich Novy <jnovy at redhat.com> 4.7.25-5
- build also if db4 is not installed (thanks to Michael A. Peters)


db-4.6.21-1.85-compat.patch:

--- NEW FILE db-4.6.21-1.85-compat.patch ---
diff -ur db-4.6.21/dist/Makefile.in db-4.6.21-db.h_include-patched/dist/Makefile.in
--- db-4.6.21/dist/Makefile.in	2007-07-05 18:35:02.000000000 +0000
+++ db-4.6.21-db.h_include-patched/dist/Makefile.in	2008-09-05 08:59:36.000000000 +0000
@@ -139,8 +139,8 @@
 # local libraries, for example.  Do that by adding -I options to the DB185INC
 # line, and -l options to the DB185LIB line.
 ##################################################
-DB185INC=	-c @CFLAGS@ -I$(srcdir) @CPPFLAGS@
-DB185LIB=
+DB185INC=	-c @CFLAGS@ -I$(srcdir) -I$(srcdir)/db.1.85/PORT/linux/include @CPPFLAGS@
+DB185LIB=	${srcdir}/db.1.85/PORT/linux/libdb.a
 
 ##################################################
 # NOTHING BELOW THIS LINE SHOULD EVER NEED TO BE MODIFIED.


Index: db4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/db4/devel/db4.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- db4.spec	10 Sep 2008 18:50:59 -0000	1.63
+++ db4.spec	16 Sep 2008 15:56:27 -0000	1.64
@@ -5,11 +5,12 @@
 Summary: The Berkeley DB database library (version 4) for C
 Name: db4
 Version: 4.7.25
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
 Patch1: http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.1
 Patch2: db-4.3.29-sparc64.patch
+Patch3: db-4.6.21-1.85-compat.patch
 Patch10: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.1
 Patch11: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.2
 Patch12: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.3
@@ -115,6 +116,7 @@
 %setup -q -n db-%{version} -a 1
 %patch1 -p0 -b .sequence
 %patch2 -p1 -b .sparc64
+%patch3 -p1 -b .185compat
 
 pushd dist
 libtoolize --copy --force
@@ -366,6 +368,9 @@
 %endif
 
 %changelog
+* Tue Sep 16 2008 Jindrich Novy <jnovy at redhat.com> 4.7.25-5
+- build also if db4 is not installed (thanks to Michael A. Peters)
+
 * Wed Sep 10 2008 Jindrich Novy <jnovy at redhat.com> 4.7.25-4
 - actually apply the .jni patch
 - fix permissions in db4-utils package (#225675)



From mlichvar at fedoraproject.org  Tue Sep 16 15:57:02 2008
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 16 Sep 2008 15:57:02 +0000 (UTC)
Subject: rpms/arpwatch/devel .cvsignore, 1.4, 1.5 arpwatch.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <20080916155702.CBA8170138@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/arpwatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3378

Modified Files:
	.cvsignore arpwatch.spec sources 
Log Message:
- update ethercodes.dat (#462364)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arpwatch/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Aug 2007 12:54:29 -0000	1.4
+++ .cvsignore	16 Sep 2008 15:56:32 -0000	1.5
@@ -1,2 +1,2 @@
 arpwatch-2.1a15.tar.gz
-ethercodes-20070809.dat
+ethercodes-20080916.dat.bz2


Index: arpwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arpwatch/devel/arpwatch.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- arpwatch.spec	19 Feb 2008 13:59:34 -0000	1.7
+++ arpwatch.spec	16 Sep 2008 15:56:32 -0000	1.8
@@ -3,7 +3,7 @@
 Name: arpwatch
 Epoch: 14
 Version: 2.1a15
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Network monitoring tools for tracking IP addresses on a network
 Group: Applications/System
 License: BSD with advertising
@@ -19,7 +19,7 @@
 Source0: ftp://ftp.ee.lbl.gov/arpwatch-%{version}.tar.gz
 Source1: arpwatch.init
 Source2: arpwatch.sysconfig
-Source3: ethercodes-20070809.dat
+Source3: ethercodes-20080916.dat.bz2
 Patch1: arpwatch-2.1a4-fhs.patch
 Patch2: arpwatch-2.1a10-man.patch
 Patch3: arpwatch-drop.patch
@@ -87,7 +87,8 @@
 install -p -m644 *.dat $RPM_BUILD_ROOT%{_vararpwatch}
 install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/arpwatch
 install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/arpwatch
-install -p -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_vararpwatch}/ethercodes.dat
+install -p -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_vararpwatch}/ethercodes.dat.bz2
+bzip2 -df $RPM_BUILD_ROOT%{_vararpwatch}/ethercodes.dat.bz2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -141,6 +142,9 @@
 %verify(not md5 size mtime) %config %{_vararpwatch}/ethercodes.dat
 
 %changelog
+* Tue Sep 16 2008 Miroslav Lichvar <mlichvar at redhat.com> 14:2.1a15-9
+- update ethercodes.dat (#462364)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 14:2.1a15-8
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arpwatch/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Aug 2007 12:54:29 -0000	1.4
+++ sources	16 Sep 2008 15:56:32 -0000	1.5
@@ -1,2 +1,2 @@
 cebfeb99c4a7c2a6cee2564770415fe7  arpwatch-2.1a15.tar.gz
-83fab2029fce5c50539f1c3eb548f799  ethercodes-20070809.dat
+7eb6579856d3b6aa998248766ee13eaf  ethercodes-20080916.dat.bz2



From pkgdb at fedoraproject.org  Tue Sep 16 16:05:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:05:13 +0000
Subject: [pkgdb] fcron ownership updated
Message-ID: <20080916160513.6F18D208EE9@bastion.fedora.phx.redhat.com>

Package fcron in Fedora devel was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fcron



From pkgdb at fedoraproject.org  Tue Sep 16 16:05:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:05:18 +0000
Subject: [pkgdb] fcron ownership updated
Message-ID: <20080916160518.9FFE4208EF0@bastion.fedora.phx.redhat.com>

Package fcron in Fedora 7 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fcron



From pkgdb at fedoraproject.org  Tue Sep 16 16:05:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:05:22 +0000
Subject: [pkgdb] fcron ownership updated
Message-ID: <20080916160523.12EBE208EF3@bastion.fedora.phx.redhat.com>

Package fcron in Fedora 4 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fcron



From pkgdb at fedoraproject.org  Tue Sep 16 16:05:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:05:33 +0000
Subject: [pkgdb] fcron ownership updated
Message-ID: <20080916160533.C280D208EF4@bastion.fedora.phx.redhat.com>

Package fcron in Fedora 5 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fcron



From pkgdb at fedoraproject.org  Tue Sep 16 16:05:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:05:40 +0000
Subject: [pkgdb] fcron ownership updated
Message-ID: <20080916160540.82F36208EEE@bastion.fedora.phx.redhat.com>

Package fcron in Fedora 6 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fcron



From pkgdb at fedoraproject.org  Tue Sep 16 16:05:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:05:51 +0000
Subject: [pkgdb] fcron ownership updated
Message-ID: <20080916160551.89257208EF0@bastion.fedora.phx.redhat.com>

Package fcron in Fedora 8 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fcron



From steved at fedoraproject.org  Tue Sep 16 16:06:03 2008
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue, 16 Sep 2008 16:06:03 +0000 (UTC)
Subject: rpms/libtirpc/devel libtirpc-0.1.9-taddr2addr-typo.patch, NONE,
	1.1 libtirpc-0.1.9-warnings.patch, NONE, 1.1 libtirpc.spec, 1.33, 1.34
Message-ID: <20080916160603.9FEC270138@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/libtirpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4369

Modified Files:
	libtirpc.spec 
Added Files:
	libtirpc-0.1.9-taddr2addr-typo.patch 
	libtirpc-0.1.9-warnings.patch 
Log Message:
- Fix for taddr2addr conversion bug of local addresses
- Fixed some of warnings in: src/auth_time.c, src/clnt_dg.c and
      src/clnt_raw.c
- Added some #ifdef NOTUSED around some code in src/rpbc_clnt.c
      that was not being used...


libtirpc-0.1.9-taddr2addr-typo.patch:

--- NEW FILE libtirpc-0.1.9-taddr2addr-typo.patch ---
commit 9e7ba0c7a02031294fefadfbca42b3dd5f2d841f
Author: Olaf Kirch <okir at suse.de>
Date:   Tue Sep 16 08:46:29 2008 -0400

    Fix for taddr2addr conversion bug of local addresses
    
    When converting af_local socket addresses in taddr2uaddr, an incorrect
    sizeof() would result in a truncated path string. As a result,
    rpcbind will report the local /var/lib/rpcbind address to clients
    as "/v" on a 32bit machine.
    
    Signed-off-by: okir at suse.de
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/src/rpc_generic.c b/src/rpc_generic.c
index ff4ba16..b436e3a 100644
--- a/src/rpc_generic.c
+++ b/src/rpc_generic.c
@@ -629,7 +629,7 @@ __rpc_taddr2uaddr_af(int af, const struct netbuf *nbuf)
 		/*	if (asprintf(&ret, "%.*s", (int)(sun->sun_len -
 		    offsetof(struct sockaddr_un, sun_path)),
 		    sun->sun_path) < 0)*/
-		if (asprintf(&ret, "%.*s", (int)(sizeof(sun) -
+		if (asprintf(&ret, "%.*s", (int)(sizeof(*sun) -
 						 offsetof(struct sockaddr_un, sun_path)),
 			     sun->sun_path) < 0)
 

libtirpc-0.1.9-warnings.patch:

--- NEW FILE libtirpc-0.1.9-warnings.patch ---
commit 628788c1cc84c86ee4cb36ee5d4fe8954e90fca5
Author: Steve Dickson <steved at redhat.com>
Date:   Tue Sep 16 11:32:31 2008 -0400

    - Fixed some of warnings in: src/auth_time.c, src/clnt_dg.c and
        src/clnt_raw.c
    - Added some #ifdef NOTUSED around some code in src/rpbc_clnt.c
      that was not being used...
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/src/auth_time.c b/src/auth_time.c
index d77bcf5..7cfbb7e 100644
--- a/src/auth_time.c
+++ b/src/auth_time.c
@@ -248,7 +248,8 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid)
 	nis_server		tsrv;
 	void			(*oldsig)() = NULL; /* old alarm handler */
 	struct sockaddr_in	sin;
-	int			s = RPC_ANYSOCK, len;
+	int			s = RPC_ANYSOCK;
+	socklen_t len;
 	int			type = 0;
 
 	td->tv_sec = 0;
diff --git a/src/clnt_dg.c b/src/clnt_dg.c
index 0e35742..da01c5b 100644
--- a/src/clnt_dg.c
+++ b/src/clnt_dg.c
@@ -306,7 +306,7 @@ clnt_dg_call(cl, proc, xargs, argsp, xresults, resultsp, utimeout)
 	int nrefreshes = 2;		/* number of times to refresh cred */
 	struct timeval timeout;
         struct pollfd fd;
-	int total_time, nextsend_time, tv;
+	int total_time, nextsend_time, tv=0;
 	struct sockaddr *sa;
 	sigset_t mask;
 	sigset_t newmask;
diff --git a/src/clnt_raw.c b/src/clnt_raw.c
index 36035c8..f184066 100644
--- a/src/clnt_raw.c
+++ b/src/clnt_raw.c
@@ -84,8 +84,8 @@ clnt_raw_create(prog, vers)
 {
 	struct clntraw_private *clp;
 	struct rpc_msg call_msg;
-	XDR *xdrs = &clp->xdr_stream;
-	CLIENT	*client = &clp->client_object;
+	XDR *xdrs;
+	CLIENT	*client;
 
 	mutex_lock(&clntraw_lock);
 	clp = clntraw_private;
@@ -101,6 +101,8 @@ clnt_raw_create(prog, vers)
 		clp->_raw_buf = __rpc_rawcombuf;
 		clntraw_private = clp;
 	}
+	xdrs = &clp->xdr_stream;
+	client = &clp->client_object;
 	/*
 	 * pre-serialize the static part of the call msg and stash it away
 	 */
diff --git a/src/rpbc_clnt.c b/src/rpbc_clnt.c
index 75811f0..0e25747 100644
--- a/src/rpbc_clnt.c
+++ b/src/rpbc_clnt.c
@@ -109,7 +109,9 @@ static void delete_cache(struct netbuf *);
 static void add_cache(const char *, const char *, struct netbuf *, char *);
 static CLIENT *getclnthandle(const char *, const struct netconfig *, char **);
 static CLIENT *local_rpcb(void);
+#if NOTUSED
 static struct netbuf *got_entry(rpcb_entry_list_ptr, const struct netconfig *);
+#endif
 
 /*
  * This routine adjusts the timeout used for calls to the remote rpcbind.
@@ -625,7 +627,7 @@ rpcb_unset(program, version, nconf)
 	CLNT_DESTROY(client);
 	return (rslt);
 }
-
+#ifdef NOTUSED
 /*
  * From the merged list, find the appropriate entry
  */
@@ -657,7 +659,7 @@ got_entry(relp, nconf)
 	}
 	return (na);
 }
-
+#endif
 /*
  * Quick check to see if rpcbind is up.  Tries to connect over
  * local transport.
@@ -725,7 +727,9 @@ __rpcb_findaddr_timed(program, version, nconf, host, clpp, tp)
 	CLIENT **clpp;
 	struct timeval *tp;
 {
+#ifdef NOTUSED
 	static bool_t check_rpcbind = TRUE;
+#endif
 	CLIENT *client = NULL;
 	RPCB parms;
 	enum clnt_stat clnt_st;
diff --git a/src/rpcb_clnt.c b/src/rpcb_clnt.c
index 040f4ce..ed16f00 100644
--- a/src/rpcb_clnt.c
+++ b/src/rpcb_clnt.c
@@ -109,7 +109,9 @@ static void delete_cache(struct netbuf *);
 static void add_cache(const char *, const char *, struct netbuf *, char *);
 static CLIENT *getclnthandle(const char *, const struct netconfig *, char **);
 static CLIENT *local_rpcb(void);
+#ifdef NOTUSED
 static struct netbuf *got_entry(rpcb_entry_list_ptr, const struct netconfig *);
+#endif
 
 /*
  * This routine adjusts the timeout used for calls to the remote rpcbind.
@@ -625,7 +627,7 @@ rpcb_unset(program, version, nconf)
 	CLNT_DESTROY(client);
 	return (rslt);
 }
-
+#ifdef NOTUSED
 /*
  * From the merged list, find the appropriate entry
  */
@@ -657,6 +659,7 @@ got_entry(relp, nconf)
 	}
 	return (na);
 }
+#endif
 
 /*
  * Quick check to see if rpcbind is up.  Tries to connect over
@@ -725,7 +728,9 @@ __rpcb_findaddr_timed(program, version, nconf, host, clpp, tp)
 	CLIENT **clpp;
 	struct timeval *tp;
 {
+#ifdef NOTUSED
 	static bool_t check_rpcbind = TRUE;
+#endif
 	CLIENT *client = NULL;
 	RPCB parms;
 	enum clnt_stat clnt_st;


Index: libtirpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtirpc/devel/libtirpc.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libtirpc.spec	4 Sep 2008 18:18:22 -0000	1.33
+++ libtirpc.spec	16 Sep 2008 16:05:33 -0000	1.34
@@ -1,6 +1,6 @@
 Name:		   libtirpc
 Version:		0.1.9
-Release:		4%{?dist}
+Release:		5%{?dist}
 Summary:		Transport Independent RPC Library
 Group:		  	System Environment/Libraries
 License:		SISSL
@@ -32,6 +32,8 @@
 
 Patch01:  libtirpc-0.1.9-rpc_getbroadifs-sizeof.patch
 Patch02:  libtirpc-0.1.9-ipv6-socket.patch
+Patch03:  libtirpc-0.1.9-taddr2addr-typo.patch
+Patch04:  libtirpc-0.1.9-warnings.patch
 
 Patch100: libtirpc-0.1.7-compile.patch
 
@@ -42,9 +44,10 @@
 
 %prep
 %setup -q
-
-%patch01	-p1
+%patch01	-p1 
 %patch02	-p1
+%patch03	-p1
+%patch04	-p1
 
 %patch100	-p1
 
@@ -143,6 +146,13 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep 16 2008 Steve Dickson <steved at redhat.com> 0.1.9-5
+- Fix for taddr2addr conversion bug of local addresses
+- Fixed some of warnings in: src/auth_time.c, src/clnt_dg.c and
+	src/clnt_raw.c
+- Added some #ifdef NOTUSED around some code in src/rpbc_clnt.c
+	that was not being used...
+
 * Thu Sep  4 2008 Steve Dickson <steved at redhat.com> 0.1.9-4
 - Always make IPv6 sockets V6ONLY
 - Fix incorrect sizeof() in __rpc_getbroadifs



From pkgdb at fedoraproject.org  Tue Sep 16 16:05:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:05:55 +0000
Subject: [pkgdb] fcron ownership updated
Message-ID: <20080916160555.653A2208EF5@bastion.fedora.phx.redhat.com>

Package fcron in Fedora 9 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fcron



From pkgdb at fedoraproject.org  Tue Sep 16 16:06:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:06:27 +0000
Subject: [pkgdb] man-pages-fr ownership updated
Message-ID: <20080916160627.02B8F208D9E@bastion.fedora.phx.redhat.com>

Package man-pages-fr in Fedora devel was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Tue Sep 16 16:06:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:06:31 +0000
Subject: [pkgdb] man-pages-fr ownership updated
Message-ID: <20080916160632.00034208EF3@bastion.fedora.phx.redhat.com>

Package man-pages-fr in Fedora 7 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Tue Sep 16 16:06:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:06:36 +0000
Subject: [pkgdb] man-pages-fr ownership updated
Message-ID: <20080916160636.7DC8D208EEB@bastion.fedora.phx.redhat.com>

Package man-pages-fr in Fedora 8 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Tue Sep 16 16:06:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:06:40 +0000
Subject: [pkgdb] man-pages-fr ownership updated
Message-ID: <20080916160640.19BAA208EF4@bastion.fedora.phx.redhat.com>

Package man-pages-fr in Fedora 9 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From cweyl at fedoraproject.org  Tue Sep 16 15:40:41 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 16 Sep 2008 15:40:41 +0000 (UTC)
Subject: rpms/perl-Module-ScanDeps/F-9 perl-Module-ScanDeps.spec, 1.20,
	1.21 sources, 1.18, 1.19
Message-ID: <20080916154041.27EC370138@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Module-ScanDeps/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32681

Modified Files:
	perl-Module-ScanDeps.spec sources 
Log Message:
* Fri May 16 2008 Steven Pritchard <steve at kspei.com> 0.84-1
- Update to 0.84.



Index: perl-Module-ScanDeps.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/F-9/perl-Module-ScanDeps.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- perl-Module-ScanDeps.spec	5 Mar 2008 16:23:09 -0000	1.20
+++ perl-Module-ScanDeps.spec	16 Sep 2008 15:40:10 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           perl-Module-ScanDeps
-Version:        0.82
-Release:        2%{?dist}
+Version:        0.84
+Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri May 16 2008 Steven Pritchard <steve at kspei.com> 0.84-1
+- Update to 0.84.
+
 * Wed Mar  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.82-2
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	29 Jan 2008 01:31:29 -0000	1.18
+++ sources	16 Sep 2008 15:40:10 -0000	1.19
@@ -1 +1 @@
-986886e68b235e52cde956724da0fdbc  Module-ScanDeps-0.82.tar.gz
+e8b5515611e6a2480bb96dc1f244c3a2  Module-ScanDeps-0.84.tar.gz



From mtasaka at fedoraproject.org  Tue Sep 16 15:51:15 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 16 Sep 2008 15:51:15 +0000 (UTC)
Subject: rpms/jd/F-9 jd.spec,1.332,1.333
Message-ID: <20080916155115.99EC070138@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1807/F-9

Modified Files:
	jd.spec 
Log Message:
orz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -r1.332 -r1.333
--- jd.spec	16 Sep 2008 15:27:50 -0000	1.332
+++ jd.spec	16 Sep 2008 15:50:45 -0000	1.333
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.2
-%define         strtag        080914
-%define         repoid        svn2347_trunk
+%define         strtag        svn2347_trunk
+%define         repoid        32887
 # 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    1
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora



From mtasaka at fedoraproject.org  Tue Sep 16 15:51:16 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 16 Sep 2008 15:51:16 +0000 (UTC)
Subject: rpms/jd/devel jd.spec,1.342,1.343
Message-ID: <20080916155116.0742770138@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1807/devel

Modified Files:
	jd.spec 
Log Message:
orz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- jd.spec	16 Sep 2008 15:27:50 -0000	1.342
+++ jd.spec	16 Sep 2008 15:50:45 -0000	1.343
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.2
-%define         strtag        080914
-%define         repoid        svn2347_trunk
+%define         strtag        svn2347_trunk
+%define         repoid        32887
 # 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    1
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora



From pkgdb at fedoraproject.org  Tue Sep 16 15:34:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 15:34:38 +0000
Subject: [pkgdb] dstat: adrianalves has requested watchcommits
Message-ID: <20080916153438.62079208D9B@bastion.fedora.phx.redhat.com>

adrianalves has requested the watchcommits acl on dstat (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dstat



From pkgdb at fedoraproject.org  Tue Sep 16 15:34:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 15:34:33 +0000
Subject: [pkgdb] dstat: adrianalves has requested watchbugzilla
Message-ID: <20080916153433.E0A7D208DAF@bastion.fedora.phx.redhat.com>

adrianalves has requested the watchbugzilla acl on dstat (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dstat



From mpg at fedoraproject.org  Tue Sep 16 15:40:30 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Tue, 16 Sep 2008 15:40:30 +0000 (UTC)
Subject: rpms/dbus-python/F-9 dbus-python-0.83.0-memleak.patch, NONE,
	1.1 dbus-python.spec, 1.26, 1.27
Message-ID: <20080916154030.CA8E970138@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/dbus-python/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32583

Modified Files:
	dbus-python.spec 
Added Files:
	dbus-python-0.83.0-memleak.patch 
Log Message:
* Tue Sep 16 2008 Marco Pesenti Gritti - 0.83.0-3
- Add patch for https://bugs.freedesktop.org/show_bug.cgi?id=17551 


dbus-python-0.83.0-memleak.patch:

--- NEW FILE dbus-python-0.83.0-memleak.patch ---
--- dbus/connection.py.orig	2008-09-13 14:54:49.000000000 +0200
+++ dbus/connection.py	2008-09-13 14:55:01.000000000 +0200
@@ -484,7 +484,15 @@
                     deletions.append(match)
                 else:
                     new.append(match)
-            by_member[signal_name] = new
+
+            if new:
+                by_member[signal_name] = new
+            else:
+                del by_member[signal_name]
+                if not by_member:
+                    del by_interface[dbus_interface]
+                    if not by_interface:
+                        del self._signal_recipients_by_object_path[path]
         finally:
             self._signals_lock.release()
 


Index: dbus-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-python/F-9/dbus-python.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- dbus-python.spec	5 Aug 2008 06:02:10 -0000	1.26
+++ dbus-python.spec	16 Sep 2008 15:40:00 -0000	1.27
@@ -7,7 +7,7 @@
 Summary: D-Bus Python Bindings 
 Name: dbus-python
 Version: 0.83.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus-python/%{name}-%{version}.tar.gz
 
@@ -18,6 +18,8 @@
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: python-devel
 
+Patch0: dbus-python-0.83.0-memleak.patch
+
 %description
 
 D-Bus python bindings for use with python programs.   
@@ -35,6 +37,8 @@
 %prep
 %setup -q
 
+%patch0 -p0 -b .memleak
+
 %build
 %configure
 
@@ -75,6 +79,9 @@
 %{_libdir}/pkgconfig/dbus-python.pc
 
 %changelog
+* Tue Sep 16 2008 Marco Pesenti Gritti - 0.83.0-3
+- Add patch for https://bugs.freedesktop.org/show_bug.cgi?id=17551 
+
 * Tue Aug 05 2008  Huang Peng <phuang at redhat.com> - 0.83.0-2
 - Update to 0.83.0.
 



From steved at fedoraproject.org  Tue Sep 16 15:48:40 2008
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue, 16 Sep 2008 15:48:40 +0000 (UTC)
Subject: rpms/rpcbind/devel rpcbind-0.1.6-ipprot2netid.patch, NONE,
	1.1 rpcbind-0.1.6-pmap-ipv4-only.patch, NONE,
	1.1 rpcbind-0.1.6-pmap-no-uaddrs.patch, NONE, 1.1 rpcbind.spec,
	1.32, 1.33
Message-ID: <20080916154840.5CE3B70138@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1226

Modified Files:
	rpcbind.spec 
Added Files:
	rpcbind-0.1.6-ipprot2netid.patch 
	rpcbind-0.1.6-pmap-ipv4-only.patch 
	rpcbind-0.1.6-pmap-no-uaddrs.patch 
Log Message:
- Added usptream patches 01 thru 03 that do:
    * Introduce helpers for ipprot/netid mapping
    * Change how we decide on the netids to use for portmap
    * Simplify port live check in pmap_svc.c


rpcbind-0.1.6-ipprot2netid.patch:

--- NEW FILE rpcbind-0.1.6-ipprot2netid.patch ---
commit 3e4c74ab527375f37b6633f528e7eab0c363967b
Author: Olaf Kirch <okir at suse.de>
Date:   Tue Sep 16 10:08:35 2008 -0400

    Introduce helpers for ipprot/netid mapping
    
    There's a couple of places in the portmap emulation code
    where we translate between ip protocol numbers and netids.
    Encapsulate these in two helper functions:
    
    extern char *pmap_ipprot2netid(int);
    extern int pmap_netid2ipprot(const char *);
    
    Signed-off-by: okir at suse.de
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/src/pmap_svc.c b/src/pmap_svc.c
index 99ce508..02a57d2 100644
--- a/src/pmap_svc.c
+++ b/src/pmap_svc.c
@@ -211,11 +211,8 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long
 	if (op == PMAPPROC_SET) {
 		char buf[32];
 
-		if (reg.pm_prot == IPPROTO_UDP) {
-			rpcbreg.r_netid = udptrans;
-		} else if (reg.pm_prot == IPPROTO_TCP) {
-			rpcbreg.r_netid = tcptrans;
-		} else {
+		rpcbreg.r_netid = pmap_ipprot2netid(reg.pm_prot);
+		if (rpcbreg.r_netid == NULL) {
 			ans = FALSE;
 			goto done_change;
 		}
@@ -289,7 +286,8 @@ pmapproc_getport(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
 			    svc_getrpccaller(xprt));
 		fprintf(stderr, "PMAP_GETPORT req for (%lu, %lu, %s) from %s :",
 			reg.pm_prog, reg.pm_vers,
-			reg.pm_prot == IPPROTO_UDP ? "udp" : "tcp", uaddr);
+			pmap_ipprot2netid(reg.pm_prot)?: "<invalid>",
+			uaddr);
 		free(uaddr);
 	}
 #endif
@@ -299,12 +297,13 @@ pmapproc_getport(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
 		char *pt1, *pt2;
 		char *netid;
 
+		netid = pmap_ipprot2netid(reg.pm_prot);
+		if (netid == NULL)
+			goto sendreply;
 		if (reg.pm_prot == IPPROTO_UDP) {
 			ua = udp_uaddr;
-			netid = udptrans;
 		} else {
 			ua = tcp_uaddr; /* To get the len */
-			netid = tcptrans;
 		}
 		if (ua == NULL) {
 			goto sendreply;
@@ -341,7 +340,7 @@ sendreply:
 		fprintf(stderr, "port = %d\n", port);
 #endif
 	rpcbs_getaddr(RPCBVERS_2_STAT, reg.pm_prog, reg.pm_vers,
-		reg.pm_prot == IPPROTO_UDP ? udptrans : tcptrans,
+		pmap_ipprot2netid(reg.pm_prot) ?: "<unknown>",
 		port ? udptrans : "");
 
 	return (TRUE);
@@ -372,4 +371,24 @@ pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
 	return (TRUE);
 }
 
+int pmap_netid2ipprot(const char *netid)
+{
+	if (!netid)
+		return 0;
+	if (strcmp(netid, tcptrans) == 0)
+		return IPPROTO_TCP;
+	if (strcmp(netid, udptrans) == 0)
+		return IPPROTO_UDP;
+	return 0;
+}
+
+char *pmap_ipprot2netid(unsigned long proto)
+{
+	if (proto == IPPROTO_UDP)
+		return udptrans;
+	if (proto == IPPROTO_TCP)
+		return tcptrans;
+	return NULL;
+}
+
 #endif /* PORTMAP */
diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
index 8f6b4c7..08aa194 100644
--- a/src/rpcb_svc_com.c
+++ b/src/rpcb_svc_com.c
@@ -1416,13 +1416,8 @@ add_pmaplist(RPCB *arg)
 	struct pmap pmap;
 	struct pmaplist *pml;
 
-	if (strcmp(arg->r_netid, udptrans) == 0) {
-		/* It is UDP! */
-		pmap.pm_prot = IPPROTO_UDP;
-	} else if (strcmp(arg->r_netid, tcptrans) == 0) {
-		/* It is TCP */
-		pmap.pm_prot = IPPROTO_TCP;
-	} else
+	pmap.pm_prot = pmap_netid2ipprot(arg->r_netid);
+	if (!pmap.pm_prot)
 		/* Not an IP protocol */
 		return (0);
 
@@ -1464,15 +1459,10 @@ del_pmaplist(RPCB *arg)
 	struct pmaplist *prevpml, *fnd;
 	unsigned long prot;
 
-	if (strcmp(arg->r_netid, udptrans) == 0) {
-		/* It is UDP! */
-		prot = IPPROTO_UDP;
-	} else if (strcmp(arg->r_netid, tcptrans) == 0) {
-		/* It is TCP */
-		prot = IPPROTO_TCP;
-	} else if (arg->r_netid[0] == 0) {
+	if (arg->r_netid[0] == 0) {
 		prot = 0;	/* Remove all occurrences */
-	} else {
+	} else
+	if ((prot = pmap_netid2ipprot(arg->r_netid)) == 0) {
 		/* Not an IP protocol */
 		return (0);
 	}
diff --git a/src/rpcbind.h b/src/rpcbind.h
index 84deba0..58ab3ef 100644
--- a/src/rpcbind.h
+++ b/src/rpcbind.h
@@ -78,6 +78,8 @@ extern char *udptrans;		/* Name of UDP transport */
 extern char *tcptrans;		/* Name of TCP transport */
 extern char *udp_uaddr;		/* Universal UDP address */
 extern char *tcp_uaddr;		/* Universal TCP address */
+extern char *pmap_ipprot2netid(unsigned long);
+extern int pmap_netid2ipprot(const char *);
 #endif
 
 int add_bndlist(struct netconfig *, struct netbuf *);

rpcbind-0.1.6-pmap-ipv4-only.patch:

--- NEW FILE rpcbind-0.1.6-pmap-ipv4-only.patch ---
commit 1a94b830a6b5a248faa6fa0e4b7818d9394f6369
Author: Olaf Kirch <okir at suse.de>
Date:   Tue Sep 16 10:15:39 2008 -0400

    Change how we decide on the netids to use for portmap
    
    The current code will try to use either udp or udp6, and either tcp or
    tcp6 for its portmap emulation code. Enabling eg both tcp6 and tcp in
    the netconfig file will cause error messages, and cause rpcbind to not
    register itself on the second transport (tcp).
    
    This is not what we want.
    
    I believe portmap emulation should only be enabled over IPv4.
    There's no point in enabling it over IPv6.
    
    Signed-off-by: okir at suse.de
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/src/rpcbind.c b/src/rpcbind.c
index 5e7e744..dc6f66b 100644
--- a/src/rpcbind.c
+++ b/src/rpcbind.c
@@ -167,10 +167,6 @@ main(int argc, char *argv[])
 		syslog(LOG_ERR, "could not read /etc/netconfig");
 		exit(1);
 	}
-#ifdef PORTMAP
-	udptrans = "";
-	tcptrans = "";
-#endif
 
 	nconf = getnetconfigent("local");
 	if (nconf == NULL)
@@ -190,6 +186,13 @@ main(int argc, char *argv[])
 	}
 	endnetconfig(nc_handle);
 
+#ifdef PORTMAP
+	if (!udptrans)
+		udptrans = "";
+	if (!tcptrans)
+		tcptrans = "";
+#endif
+
 	/* catch the usual termination signals for graceful exit */
 	(void) signal(SIGCHLD, reap);
 	(void) signal(SIGINT, terminate);
@@ -545,15 +548,12 @@ init_transport(struct netconfig *nconf)
 
 #ifdef PORTMAP
 	/*
-	 * Register both the versions for tcp/ip, udp/ip and local.
+	 * Register both the versions for tcp/ip, udp/ip.
 	 */
-	if (((strcmp(nconf->nc_protofmly, NC_INET) == 0 ||
-	      strcmp(nconf->nc_protofmly, NC_INET6) == 0) &&
-		(strcmp(nconf->nc_proto, NC_TCP) == 0 ||
-		strcmp(nconf->nc_proto, NC_UDP) == 0)) ||
-		(strcmp(nconf->nc_netid, "unix") == 0) ||
-		(strcmp(nconf->nc_netid, "local") == 0)) {
+	if (si.si_af == AF_INET &&
+	    (si.si_proto == IPPROTO_TCP || si.si_proto == IPPROTO_UDP)) {
 		struct pmaplist *pml;
+
 		if (!svc_register(my_xprt, PMAPPROG, PMAPVERS,
 			pmap_service, 0)) {
 			syslog(LOG_ERR, "could not register on %s",
@@ -568,30 +568,18 @@ init_transport(struct netconfig *nconf)
 		pml->pml_map.pm_prog = PMAPPROG;
 		pml->pml_map.pm_vers = PMAPVERS;
 		pml->pml_map.pm_port = PMAPPORT;
-		if (strcmp(nconf->nc_proto, NC_TCP) == 0) {
-			if (tcptrans[0]) {
-				syslog(LOG_ERR,
-				"cannot have more than one TCP transport");
-				goto error;
-			}
-			tcptrans = strdup(nconf->nc_netid);
-			pml->pml_map.pm_prot = IPPROTO_TCP;
+		pml->pml_map.pm_prot = si.si_proto;
 
-			/* Let's snarf the universal address */
-			/* "h1.h2.h3.h4.p1.p2" */
+		/* Stash away the universal address */
+		switch (si.si_proto) {
+		case IPPROTO_TCP:
+			tcptrans = strdup(nconf->nc_netid);
 			tcp_uaddr = taddr2uaddr(nconf, &taddr.addr);
-		} else if (strcmp(nconf->nc_proto, NC_UDP) == 0) {
-			if (udptrans[0]) {
-				syslog(LOG_ERR,
-				"cannot have more than one UDP transport");
-				goto error;
-			}
+			break;
+		case IPPROTO_UDP:
 			udptrans = strdup(nconf->nc_netid);
-			pml->pml_map.pm_prot = IPPROTO_UDP;
-
-			/* Let's snarf the universal address */
-			/* "h1.h2.h3.h4.p1.p2" */
 			udp_uaddr = taddr2uaddr(nconf, &taddr.addr);
+			break;
 		} 
                 pml->pml_next = list_pml;
 		list_pml = pml;

rpcbind-0.1.6-pmap-no-uaddrs.patch:

--- NEW FILE rpcbind-0.1.6-pmap-no-uaddrs.patch ---
commit 566f261ff6bae2842e2e64aaf70d2e31acc1efe7
Author: Olaf Kirch <okir at suse.de>
Date:   Tue Sep 16 10:23:48 2008 -0400

    Simplify port live check in pmap_svc.c
    
    There's some hack in pmap_getport that will cause a service
    to be unregistered from the portmap list if we find the port
    is no longer in use. Apart from being a gross hack, it is
    also a rather inefficient hack. Since we now restrict pmap
    emulation to IPv4, we know the address is always 0.0.0.0,
    so no need to mess with uaddr strings.
    
    (The bind_check code is a huge messy no-op anyway, since
    all ports are added with bind_check = FALSE).
    
    Signed-off-by: okir at suse.de
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/src/pmap_svc.c b/src/pmap_svc.c
index 02a57d2..7a4f059 100644
--- a/src/pmap_svc.c
+++ b/src/pmap_svc.c
@@ -293,40 +293,24 @@ pmapproc_getport(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
 #endif
 	fnd = find_service_pmap(reg.pm_prog, reg.pm_vers, reg.pm_prot);
 	if (fnd) {
-		char serveuaddr[32], *ua;
-		char *pt1, *pt2;
+		char serveuaddr[32];
 		char *netid;
 
 		netid = pmap_ipprot2netid(reg.pm_prot);
-		if (netid == NULL)
-			goto sendreply;
-		if (reg.pm_prot == IPPROTO_UDP) {
-			ua = udp_uaddr;
-		} else {
-			ua = tcp_uaddr; /* To get the len */
-		}
-		if (ua == NULL) {
-			goto sendreply;
-		}
-		if ((pt1 = strrchr(ua, '.')) != NULL) {
-			*pt1 = 0;
-			if ((pt2 = strrchr(ua, '.')) != NULL) {
-				*pt2 = 0;
-				snprintf(serveuaddr, sizeof serveuaddr,
-			 		"%s.%ld.%ld", ua,
-					(fnd->pml_map.pm_port >> 8) & 0xff,
-			 		(fnd->pml_map.pm_port) & 0xff);
-				*pt2 = '.';
-				if (is_bound(netid, serveuaddr)) {
-					port = fnd->pml_map.pm_port;
-				} else { /* this service is dead; delete it */
-					delete_prog(reg.pm_prog);
-				}
+		if (netid != NULL) {
+			snprintf(serveuaddr, sizeof serveuaddr,
+				"0.0.0.0.%ld.%ld",
+				(fnd->pml_map.pm_port >> 8) & 0xff,
+				(fnd->pml_map.pm_port) & 0xff);
+
+			if (is_bound(netid, serveuaddr)) {
+				port = fnd->pml_map.pm_port;
+			} else { /* this service is dead; delete it */
+				delete_prog(reg.pm_prog);
 			}
-			*pt1 = '.';
 		}
 	}
-sendreply:
+
 	lport = port;
 	if ((!svc_sendreply(xprt, (xdrproc_t) xdr_long, (caddr_t)&lport)) &&
 			debugging) {
diff --git a/src/rpcbind.c b/src/rpcbind.c
index dc6f66b..e0e7ddf 100644
--- a/src/rpcbind.c
+++ b/src/rpcbind.c
@@ -570,18 +570,15 @@ init_transport(struct netconfig *nconf)
 		pml->pml_map.pm_port = PMAPPORT;
 		pml->pml_map.pm_prot = si.si_proto;
 
-		/* Stash away the universal address */
 		switch (si.si_proto) {
 		case IPPROTO_TCP:
 			tcptrans = strdup(nconf->nc_netid);
-			tcp_uaddr = taddr2uaddr(nconf, &taddr.addr);
 			break;
 		case IPPROTO_UDP:
 			udptrans = strdup(nconf->nc_netid);
-			udp_uaddr = taddr2uaddr(nconf, &taddr.addr);
 			break;
 		} 
-                pml->pml_next = list_pml;
+		pml->pml_next = list_pml;
 		list_pml = pml;
 
 		/* Add version 3 information */
diff --git a/src/rpcbind.h b/src/rpcbind.h
index 58ab3ef..295711a 100644
--- a/src/rpcbind.h
+++ b/src/rpcbind.h
@@ -76,8 +76,6 @@ extern rpcblist_ptr list_rbl;	/* A list of version 3 & 4 rpcbind services */
 extern struct pmaplist *list_pml; /* A list of version 2 rpcbind services */
 extern char *udptrans;		/* Name of UDP transport */
 extern char *tcptrans;		/* Name of TCP transport */
-extern char *udp_uaddr;		/* Universal UDP address */
-extern char *tcp_uaddr;		/* Universal TCP address */
 extern char *pmap_ipprot2netid(unsigned long);
 extern int pmap_netid2ipprot(const char *);
 #endif


Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- rpcbind.spec	9 Jul 2008 20:42:14 -0000	1.32
+++ rpcbind.spec	16 Sep 2008 15:48:09 -0000	1.33
@@ -2,7 +2,7 @@
 
 Name:           rpcbind
 Version:        0.1.6
-Release: 		1%{?dist}
+Release: 		2%{?dist}
 Summary:        Universal Addresses to RPC Program Number Mapper
 Group:          System Environment/Daemons
 License:        GPL
@@ -25,6 +25,10 @@
 Provides: portmap = %{version}-%{release}
 Obsoletes: portmap <= 4.0-65.3
 
+Patch01: rpcbind-0.1.6-ipprot2netid.patch
+Patch02: rpcbind-0.1.6-pmap-ipv4-only.patch
+Patch03: rpcbind-0.1.6-pmap-no-uaddrs.patch
+
 %description
 The rpcbind utility is a server that converts RPC program numbers into
 universal addresses.  It must be running on the host to be able to make
@@ -32,6 +36,9 @@
 
 %prep
 %setup -q
+%patch01    -p1
+%patch02    -p1
+%patch03    -p1
 
 %build
 %ifarch s390 s390x
@@ -111,6 +118,12 @@
 %dir %attr(700,rpc,rpc) /var/lib/rpcbind
 
 %changelog
+* Tue Sep 16 2008 Steve Dickson <steved at redhat.com> 0.1.6-2
+- Added usptream patches 01 thru 03 that do:
+    * Introduce helpers for ipprot/netid mapping
+    * Change how we decide on the netids to use for portmap
+    * Simplify port live check in pmap_svc.c
+
 * Wed Jul  9 2008 Steve Dickson <steved at redhat.com> 0.1.6-1
 - Updated to latest upstream release 0.1.6
 



From mtasaka at fedoraproject.org  Tue Sep 16 15:51:15 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 16 Sep 2008 15:51:15 +0000 (UTC)
Subject: rpms/jd/F-8 jd.spec,1.321,1.322
Message-ID: <20080916155115.5D07070138@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1807/F-8

Modified Files:
	jd.spec 
Log Message:
orz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -r1.321 -r1.322
--- jd.spec	16 Sep 2008 15:27:50 -0000	1.321
+++ jd.spec	16 Sep 2008 15:50:45 -0000	1.322
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.2
-%define         strtag        080914
-%define         repoid        svn2347_trunk
+%define         strtag        svn2347_trunk
+%define         repoid        32887
 # 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    1
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora



From tbzatek at fedoraproject.org  Tue Sep 16 15:49:31 2008
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue, 16 Sep 2008 15:49:31 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs-0.99.8-smb-kerberos-auth.patch, NONE,
	1.1 gvfs.spec, 1.76, 1.77
Message-ID: <20080916154931.C50EE70138@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1376

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-0.99.8-smb-kerberos-auth.patch 
Log Message:
* Tue Sep 16 2008 Tomas Bzatek <tbzatek at redhat.com>  - 0.99.8-3
- SMB: Fix kerberos authentication


gvfs-0.99.8-smb-kerberos-auth.patch:

--- NEW FILE gvfs-0.99.8-smb-kerberos-auth.patch ---
Index: daemon/gvfsbackendsmb.c
===================================================================
--- daemon/gvfsbackendsmb.c	(revision 1992)
+++ daemon/gvfsbackendsmb.c	(revision 1993)
@@ -175,10 +175,7 @@
       backend->user == NULL &&
       backend->domain == NULL)
     {
-      /* Try anon login */
-      strncpy (username_out, "", unmaxlen);
-      strncpy (password_out, "", pwmaxlen);
-      /* Try again if anon login fails */
+      /* Try again if kerberos login + anonymous fallback fails */
       backend->mount_try_again = TRUE;
     }
   else
@@ -495,9 +492,15 @@
   smb_context->flags = 0;
 #endif
   
+  /* Initial settings:
+   *   - use Kerberos (always)
+   *   - in case of no username specified, try anonymous login
+   */
   smbc_setOptionUseKerberos (smb_context, 1);
-  smbc_setOptionFallbackAfterKerberos (smb_context, 1);  
-  smbc_setOptionNoAutoAnonymousLogin (smb_context, 1);
+  smbc_setOptionFallbackAfterKerberos (smb_context,
+                                       op_backend->user != NULL);
+  smbc_setOptionNoAutoAnonymousLogin (smb_context,
+                                      op_backend->user != NULL);
 
   
 #if 0
@@ -540,6 +543,8 @@
 
   uri = create_smb_uri (op_backend->server, op_backend->share, NULL);
 
+
+  /*  Samba mount loop  */
   op_backend->mount_source = mount_source;
   op_backend->mount_try = 0;
   op_backend->password_save = G_PASSWORD_SAVE_NEVER;
@@ -554,8 +559,17 @@
       if (res == 0 ||
 	  (errno != EACCES && errno != EPERM))
 	break;
-      
-      op_backend->mount_try ++;      
+
+      /* The first round is Kerberos-only.  Only if this fails do we enable
+       * NTLMSSP fallback (turning off anonymous fallback, which we've
+       * already tried and failed with).
+       */
+      if (op_backend->mount_try == 0)
+        {
+          smbc_setOptionFallbackAfterKerberos (op_backend->smb_context, 1);
+          smbc_setOptionNoAutoAnonymousLogin (op_backend->smb_context, 1);
+        }
+      op_backend->mount_try ++;
     }
   while (op_backend->mount_try_again);
   


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- gvfs.spec	16 Sep 2008 01:13:58 -0000	1.76
+++ gvfs.spec	16 Sep 2008 15:49:01 -0000	1.77
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 0.99.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -32,6 +32,9 @@
 
 Patch2: gvfs-obexftp-updated-apis.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=524498
+Patch3: gvfs-0.99.8-smb-kerberos-auth.patch
+
 %description
 The gvfs package provides backend implementations for the gio 
 framework in GLib. It includes ftp, sftp, cifs. 
@@ -251,6 +254,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 Tomas Bzatek <tbzatek at redhat.com>  - 0.99.8-3
+- SMB: Fix kerberos authentication
+
 * Mon Sep 15 2008 Matthias Clasen <mclasen at redhat.com>  - 0.99.8-2
 - Update to 0.99.8
 



From rhughes at fedoraproject.org  Tue Sep 16 16:18:46 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 16 Sep 2008 16:18:46 +0000 (UTC)
Subject: rpms/gnome-packagekit/devel .cvsignore, 1.26,
	1.27 gnome-packagekit.spec, 1.44, 1.45 sources, 1.26, 1.27
Message-ID: <20080916161846.DF5FB7013D@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5924

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Log Message:
* Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.3-1
- Update to newest upstream version.
- Supports collection install and remove in the UI
- Add InstallGStreamerCodecs to the session interface



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	8 Sep 2008 15:34:18 -0000	1.26
+++ .cvsignore	16 Sep 2008 16:18:16 -0000	1.27
@@ -1 +1 @@
-gnome-packagekit-0.3.2.tar.gz
+gnome-packagekit-0.3.3.tar.gz


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gnome-packagekit.spec	8 Sep 2008 15:34:18 -0000	1.44
+++ gnome-packagekit.spec	16 Sep 2008 16:18:16 -0000	1.45
@@ -1,9 +1,9 @@
 %define dbus_version            0.61
-%define packagekit_version      0.3.2
+%define packagekit_version      0.3.3
 
 Summary:   GNOME PackageKit Client
 Name:      gnome-packagekit
-Version:   0.3.2
+Version:   0.3.3
 Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
@@ -143,6 +143,11 @@
 %{_datadir}/applications/gpk-*.desktop
 
 %changelog
+* Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.3-1
+- Update to newest upstream version.
+- Supports collection install and remove in the UI
+- Add InstallGStreamerCodecs to the session interface
+
 * Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.2-1
 - Update to newest upstream version.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	8 Sep 2008 15:34:18 -0000	1.26
+++ sources	16 Sep 2008 16:18:16 -0000	1.27
@@ -1 +1 @@
-3444847773c43318b84cc6358f1741f5  gnome-packagekit-0.3.2.tar.gz
+df5fdad0beb6d7f681aeead8edc73295  gnome-packagekit-0.3.3.tar.gz



From rhughes at fedoraproject.org  Tue Sep 16 16:18:43 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 16 Sep 2008 16:18:43 +0000 (UTC)
Subject: rpms/PackageKit/devel .cvsignore, 1.27, 1.28 PackageKit.spec, 1.53, 
	1.54 sources, 1.28, 1.29 pk-catalog-parameter-fix.patch, 1.1,
	NONE pk-dont-show-brackets-null.patch, 1.1,
	NONE pk-fix-multiarch-resolve.patch, 1.1,
	NONE pk-fix-pkcon-filters.patch, 1.1, NONE
Message-ID: <20080916161843.4F66E7013D@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5881

Modified Files:
	.cvsignore PackageKit.spec sources 
Removed Files:
	pk-catalog-parameter-fix.patch 
	pk-dont-show-brackets-null.patch 
	pk-fix-multiarch-resolve.patch pk-fix-pkcon-filters.patch 
Log Message:
* Tue Sep 16 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.3-1
- New upstream version
- Fixes a nasty bug where the daemon could get locked under heavy load
- Adds collection support for group install and remove



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	8 Sep 2008 15:34:34 -0000	1.27
+++ .cvsignore	16 Sep 2008 16:18:12 -0000	1.28
@@ -1 +1 @@
-PackageKit-0.3.2.tar.gz
+PackageKit-0.3.3.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- PackageKit.spec	10 Sep 2008 16:31:58 -0000	1.53
+++ PackageKit.spec	16 Sep 2008 16:18:12 -0000	1.54
@@ -7,24 +7,19 @@
 
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
-Version:   0.3.2
-Release:   3%{?dist}
+Version:   0.3.3
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Upstream: 0bc4ba936db39ccf0466987d964a016363bceeee
-Patch0:    pk-dont-show-brackets-null.patch
-
-# Upstream: 918dd9d10ef18725776c6a55fe9cf03ec18db047
-Patch1:    pk-catalog-parameter-fix.patch
-
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-libs = %{version}-%{release}
 Requires: yum-packagekit = %{version}-%{release}
+Requires: udev-packagekit = %{version}-%{release}
 Requires: PackageKit-yum = %{version}-%{release}
 Requires: shared-mime-info
 Requires: python-sqlite2
@@ -57,7 +52,7 @@
 %package yum
 Summary: PackageKit YUM backend
 Group: System Environment/Libraries
-Requires: yum >= 3.2.6
+Requires: yum >= 3.2.19
 Requires: %{name} = %{version}-%{release}
 
 %description yum
@@ -144,8 +139,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -188,6 +181,7 @@
 %dir %{_localstatedir}/lib/PackageKit
 %dir %{python_sitelib}/packagekit
 %dir %{_localstatedir}/run/PackageKit
+%dir %{_localstatedir}/run/PackageKit/udev
 %dir %{_localstatedir}/cache/PackageKit
 %dir %{_localstatedir}/cache/PackageKit/downloads
 %{python_sitelib}/packagekit/*py*
@@ -200,6 +194,7 @@
 %{_datadir}/man/man1/*.1.gz
 %{_datadir}/PolicyKit/policy/*.policy
 %{_datadir}/mime/packages/packagekit-*.xml
+%{_datadir}/PackageKit/pk-upgrade-distro.sh
 %{_sbindir}/packagekitd
 %{_bindir}/pkmon
 %{_bindir}/pkcon
@@ -274,6 +269,11 @@
 %{_includedir}/*
 
 %changelog
+* Tue Sep 16 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.3-1
+- New upstream version
+- Fixes a nasty bug where the daemon could get locked under heavy load
+- Adds collection support for group install and remove
+
 * Wed Sep 10 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.2-3
 - Fix an error where we don't check for existing packages in the catalog
   code properly. Also fixes the self tests.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	8 Sep 2008 15:34:34 -0000	1.28
+++ sources	16 Sep 2008 16:18:12 -0000	1.29
@@ -1 +1 @@
-ecf46fb214287c5ffbcdbe3b13901ffe  PackageKit-0.3.2.tar.gz
+2c91101359e0331325d2acde7b9130f4  PackageKit-0.3.3.tar.gz


--- pk-catalog-parameter-fix.patch DELETED ---


--- pk-dont-show-brackets-null.patch DELETED ---


--- pk-fix-multiarch-resolve.patch DELETED ---


--- pk-fix-pkcon-filters.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Sep 16 16:19:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:19:58 +0000
Subject: [pkgdb] kicad ownership updated
Message-ID: <20080916161958.1D541208D9B@bastion.fedora.phx.redhat.com>

Package kicad in Fedora devel was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kicad



From pkgdb at fedoraproject.org  Tue Sep 16 16:20:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:20:13 +0000
Subject: [pkgdb] kicad ownership updated
Message-ID: <20080916162013.B6AE9208DA0@bastion.fedora.phx.redhat.com>

Package kicad in Fedora 7 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kicad



From pkgdb at fedoraproject.org  Tue Sep 16 16:20:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:20:18 +0000
Subject: [pkgdb] kicad ownership updated
Message-ID: <20080916162018.60DA6208DA3@bastion.fedora.phx.redhat.com>

Package kicad in Fedora 4 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kicad



From pkgdb at fedoraproject.org  Tue Sep 16 16:20:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:20:22 +0000
Subject: [pkgdb] kicad ownership updated
Message-ID: <20080916162022.9D271208DA5@bastion.fedora.phx.redhat.com>

Package kicad in Fedora 5 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kicad



From pkgdb at fedoraproject.org  Tue Sep 16 16:20:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:20:26 +0000
Subject: [pkgdb] kicad ownership updated
Message-ID: <20080916162026.507CC208DA6@bastion.fedora.phx.redhat.com>

Package kicad in Fedora 6 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kicad



From pkgdb at fedoraproject.org  Tue Sep 16 16:20:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:20:29 +0000
Subject: [pkgdb] kicad ownership updated
Message-ID: <20080916162029.B5BF2208DAA@bastion.fedora.phx.redhat.com>

Package kicad in Fedora 8 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kicad



From pkgdb at fedoraproject.org  Tue Sep 16 16:20:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:20:33 +0000
Subject: [pkgdb] kicad ownership updated
Message-ID: <20080916162033.471D3208DAB@bastion.fedora.phx.redhat.com>

Package kicad in Fedora 9 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kicad



From pkgdb at fedoraproject.org  Tue Sep 16 16:21:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:21:12 +0000
Subject: [pkgdb] utrac ownership updated
Message-ID: <20080916162112.DCE42208D9B@bastion.fedora.phx.redhat.com>

Package utrac in Fedora devel was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/utrac



From pkgdb at fedoraproject.org  Tue Sep 16 16:21:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:21:16 +0000
Subject: [pkgdb] utrac ownership updated
Message-ID: <20080916162116.9706D208D9E@bastion.fedora.phx.redhat.com>

Package utrac in Fedora 7 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/utrac



From pkgdb at fedoraproject.org  Tue Sep 16 16:21:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:21:23 +0000
Subject: [pkgdb] utrac ownership updated
Message-ID: <20080916162123.A1A99208DA7@bastion.fedora.phx.redhat.com>

Package utrac in Fedora 4 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/utrac



From pkgdb at fedoraproject.org  Tue Sep 16 16:21:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:21:20 +0000
Subject: [pkgdb] utrac ownership updated
Message-ID: <20080916162120.300A1208DA5@bastion.fedora.phx.redhat.com>

Package utrac in Fedora 3 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/utrac



From pkgdb at fedoraproject.org  Tue Sep 16 16:21:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:21:26 +0000
Subject: [pkgdb] utrac ownership updated
Message-ID: <20080916162126.BE1B7208D9B@bastion.fedora.phx.redhat.com>

Package utrac in Fedora 5 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/utrac



From pkgdb at fedoraproject.org  Tue Sep 16 16:21:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:21:30 +0000
Subject: [pkgdb] utrac ownership updated
Message-ID: <20080916162130.68FD7208DAA@bastion.fedora.phx.redhat.com>

Package utrac in Fedora 6 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/utrac



From pkgdb at fedoraproject.org  Tue Sep 16 16:21:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:21:33 +0000
Subject: [pkgdb] utrac ownership updated
Message-ID: <20080916162134.5ACA6208DB0@bastion.fedora.phx.redhat.com>

Package utrac in Fedora 8 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/utrac



From pkgdb at fedoraproject.org  Tue Sep 16 16:21:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:21:37 +0000
Subject: [pkgdb] utrac ownership updated
Message-ID: <20080916162137.41427208DA0@bastion.fedora.phx.redhat.com>

Package utrac in Fedora 9 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/utrac



From pkgdb at fedoraproject.org  Tue Sep 16 16:23:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:23:35 +0000
Subject: [pkgdb] utrac ownership updated
Message-ID: <20080916162335.EA7FB208D62@bastion.fedora.phx.redhat.com>

Package utrac in Fedora devel is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/utrac



From pkgdb at fedoraproject.org  Tue Sep 16 16:23:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:23:40 +0000
Subject: [pkgdb] utrac ownership updated
Message-ID: <20080916162340.99F9E208D9F@bastion.fedora.phx.redhat.com>

Package utrac in Fedora 8 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/utrac



From pkgdb at fedoraproject.org  Tue Sep 16 16:23:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:23:40 +0000
Subject: [pkgdb] utrac ownership updated
Message-ID: <20080916162340.491B2208D9B@bastion.fedora.phx.redhat.com>

Package utrac in Fedora 9 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/utrac



From pkgdb at fedoraproject.org  Tue Sep 16 16:23:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:23:43 +0000
Subject: [pkgdb] kicad ownership updated
Message-ID: <20080916162343.CBEB4208DA3@bastion.fedora.phx.redhat.com>

Package kicad in Fedora devel is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kicad



From pkgdb at fedoraproject.org  Tue Sep 16 16:23:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:23:47 +0000
Subject: [pkgdb] kicad ownership updated
Message-ID: <20080916162347.2C5DD208DA9@bastion.fedora.phx.redhat.com>

Package kicad in Fedora 9 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kicad



From pkgdb at fedoraproject.org  Tue Sep 16 16:23:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 16:23:48 +0000
Subject: [pkgdb] kicad ownership updated
Message-ID: <20080916162348.24527208D9A@bastion.fedora.phx.redhat.com>

Package kicad in Fedora 8 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kicad



From mdomsch at fedoraproject.org  Tue Sep 16 16:24:37 2008
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue, 16 Sep 2008 16:24:37 +0000 (UTC)
Subject: rpms/oggconvert/devel oggconvert-0.3.2-desktop.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 oggconvert.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20080916162437.8638570138@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/oggconvert/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6727

Modified Files:
	.cvsignore oggconvert.spec sources 
Added Files:
	oggconvert-0.3.2-desktop.patch 
Log Message:
upgrade to 0.3.2, fix FTBFS BZ#440943

oggconvert-0.3.2-desktop.patch:

--- NEW FILE oggconvert-0.3.2-desktop.patch ---
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggconvert-0.3.2.orig/data/oggconvert.desktop oggconvert-0.3.2/data/oggconvert.desktop
--- oggconvert-0.3.2.orig/data/oggconvert.desktop	2008-09-12 17:40:56.000000000 -0500
+++ oggconvert-0.3.2/data/oggconvert.desktop	2008-09-16 11:11:30.000000000 -0500
@@ -9,4 +9,3 @@ Icon=oggconvert
 Categories=AudioVideo;
 Terminal=false
 StartupNotify=false
-GenericName[en_GB]=


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oggconvert/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2007 16:01:38 -0000	1.3
+++ .cvsignore	16 Sep 2008 16:24:06 -0000	1.4
@@ -1 +1 @@
-oggconvert-0.3.0.tar.gz
+oggconvert-0.3.2.tar.gz


Index: oggconvert.spec
===================================================================
RCS file: /cvs/extras/rpms/oggconvert/devel/oggconvert.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- oggconvert.spec	1 Dec 2007 16:27:56 -0000	1.3
+++ oggconvert.spec	16 Sep 2008 16:24:07 -0000	1.4
@@ -2,14 +2,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           oggconvert
-Version:        0.3.0
-Release:        14%{?dist}
+Version:        0.3.2
+Release:        1%{?dist}
 Summary:        A simple GNOME application that converts media to Free formats
 
 Group:          Applications/Multimedia
 License:        LGPLv2+
 URL:            http://launchpad.net/oggconvert
-Source0:	http://oggconvert.tristanb.net/releases/oggconvert-%{version}.tar.gz
+Source0:	http://oggconvert.tristanb.net/releases/%{version}/oggconvert-%{version}.tar.gz
+Patch0: 	oggconvert-0.3.2-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	pygtk2 >= 2.10, pygtk2-libglade >= 2.10 
 Requires:	gstreamer >= 0.10.12, gstreamer-python, gstreamer-plugins-base
@@ -37,7 +38,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 # Remove CFLAGS=... for noarch packages (unneeded)
@@ -66,9 +67,14 @@
 %{_bindir}/oggconvert
 %{_datadir}/applications/fedora-oggconvert.desktop
 %{_datadir}/pixmaps/oggconvert.svg
-
+%{python_sitelib}/oggconvert-%{version}-py2.5.egg-info
 
 %changelog
+* Tue Sep 16 2008 Matt Domsch <mdomsch at fedoraproject.org> - 0.3.2-1
+- upgrade to 0.3.2, fix FTBFS BZ#440943
+* Sat Dec 1 2007 Neal Gompa <ngompa13{%}gmail{*}com> - 0.3.0-14
+- Oops, apparently files removal was intentional, reinstated
+- removed dependency on gettext, probably not necessary
 * Sat Dec 1 2007 Neal Gompa <ngompa13{%}gmail{*}com> - 0.3.0-14
 - Oops, apparently files removal was intentional, reinstated
 - removed dependency on gettext, probably not necessary


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oggconvert/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2007 16:01:38 -0000	1.3
+++ sources	16 Sep 2008 16:24:07 -0000	1.4
@@ -1 +1 @@
-9a197d51b3767447c48c8229500d5492  oggconvert-0.3.0.tar.gz
+1df4ab0141cd2755ace57837d588747e  oggconvert-0.3.2.tar.gz



From mlichvar at fedoraproject.org  Tue Sep 16 16:53:43 2008
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 16 Sep 2008 16:53:43 +0000 (UTC)
Subject: rpms/xterm/devel .cvsignore, 1.30, 1.31 sources, 1.30,
	1.31 xterm.spec, 1.68, 1.69
Message-ID: <20080916165344.03D9670138@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/xterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10273

Modified Files:
	.cvsignore sources xterm.spec 
Log Message:
- update to 237



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	30 Jul 2008 16:23:09 -0000	1.30
+++ .cvsignore	16 Sep 2008 16:53:13 -0000	1.31
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-236.tgz
+xterm-237.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	30 Jul 2008 16:23:09 -0000	1.30
+++ sources	16 Sep 2008 16:53:13 -0000	1.31
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-204288c9de867679fc8201f4fb153772  xterm-236.tgz
+6d5f9e124fd3e09487f47c66da8c7345  xterm-237.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- xterm.spec	30 Jul 2008 16:23:09 -0000	1.68
+++ xterm.spec	16 Sep 2008 16:53:13 -0000	1.69
@@ -1,6 +1,6 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 236
+Version: 237
 Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
@@ -82,6 +82,9 @@
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Tue Sep 16 2008 Miroslav Lichvar <mlichvar at redhat.com> 237-1
+- update to 237
+
 * Wed Jul 30 2008 Miroslav Lichvar <mlichvar at redhat.com> 236-1
 - update to 236
 - enable support for spawn-new-terminal action (#457130)



From dwalsh at fedoraproject.org  Tue Sep 16 16:54:43 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 16 Sep 2008 16:54:43 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.207,
	1.208 selinux-policy.spec, 1.707, 1.708
Message-ID: <20080916165443.C6C1D70138@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10424

Modified Files:
	policy-20071130.patch selinux-policy.spec 
Log Message:
* Mon Sep 15 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-91
- Allow nsplugin_cong dac capabilities.


policy-20071130.patch:

Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- policy-20071130.patch	12 Sep 2008 14:46:46 -0000	1.207
+++ policy-20071130.patch	16 Sep 2008 16:54:42 -0000	1.208
@@ -1600,6 +1600,17 @@
  
  
  #
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.3.1/policy/modules/admin/alsa.te
+--- nsaserefpolicy/policy/modules/admin/alsa.te	2008-06-12 23:38:01.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/admin/alsa.te	2008-09-15 14:54:38.000000000 -0400
+@@ -48,6 +48,7 @@
+ 
+ files_search_home(alsa_t)
+ files_read_etc_files(alsa_t)
++files_read_usr_files(alsa_t)
+ 
+ auth_use_nsswitch(alsa_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.fc serefpolicy-3.3.1/policy/modules/admin/amanda.fc
 --- nsaserefpolicy/policy/modules/admin/amanda.fc	2008-06-12 23:38:01.000000000 -0400
 +++ serefpolicy-3.3.1/policy/modules/admin/amanda.fc	2008-09-08 11:45:12.000000000 -0400
@@ -1613,7 +1624,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-3.3.1/policy/modules/admin/amanda.te
 --- nsaserefpolicy/policy/modules/admin/amanda.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/admin/amanda.te	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/admin/amanda.te	2008-09-16 11:22:18.000000000 -0400
 @@ -82,8 +82,9 @@
  allow amanda_t amanda_config_t:file { getattr read };
  
@@ -1635,7 +1646,16 @@
  
  manage_dirs_pattern(amanda_t,amanda_var_lib_t,amanda_var_lib_t)
  manage_files_pattern(amanda_t,amanda_var_lib_t,amanda_var_lib_t)
-@@ -146,6 +147,8 @@
+@@ -128,6 +129,8 @@
+ corenet_tcp_bind_all_nodes(amanda_t)
+ corenet_udp_bind_all_nodes(amanda_t)
+ corenet_tcp_bind_all_rpc_ports(amanda_t)
++corenet_tcp_bind_generic_port(amanda_t)
++corenet_dontaudit_tcp_bind_all_ports(amanda_t)
+ 
+ dev_getattr_all_blk_files(amanda_t)
+ dev_getattr_all_chr_files(amanda_t)
+@@ -146,6 +149,8 @@
  fs_list_all(amanda_t)
  
  storage_raw_read_fixed_disk(amanda_t)
@@ -1644,7 +1664,7 @@
  
  # Added for targeted policy
  term_use_unallocated_ttys(amanda_t)
-@@ -220,6 +223,7 @@
+@@ -220,6 +225,7 @@
  auth_use_nsswitch(amanda_recover_t)
  
  fstools_domtrans(amanda_t)
@@ -2845,7 +2865,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.3.1/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/admin/rpm.te	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/admin/rpm.te	2008-09-16 09:14:37.000000000 -0400
 @@ -31,6 +31,9 @@
  files_type(rpm_var_lib_t)
  typealias rpm_var_lib_t alias var_lib_rpm_t;
@@ -2856,7 +2876,16 @@
  type rpm_script_t;
  type rpm_script_exec_t;
  domain_obj_id_change_exemption(rpm_script_t)
-@@ -89,6 +92,9 @@
+@@ -52,7 +55,7 @@
+ # rpm Local policy
+ #
+ 
+-allow rpm_t self:capability { chown dac_override fowner fsetid setgid setuid sys_chroot sys_tty_config mknod };
++allow rpm_t self:capability { chown dac_override fowner fsetid ipc_lock setgid setuid sys_chroot sys_nice sys_tty_config mknod };
+ allow rpm_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
+ allow rpm_t self:process { getattr setexec setfscreate setrlimit };
+ allow rpm_t self:fd use;
+@@ -89,8 +92,12 @@
  manage_files_pattern(rpm_t,rpm_var_lib_t,rpm_var_lib_t)
  files_var_lib_filetrans(rpm_t,rpm_var_lib_t,dir)
  
@@ -2865,8 +2894,19 @@
 +
  kernel_read_system_state(rpm_t)
  kernel_read_kernel_sysctls(rpm_t)
++kernel_read_network_state_symlinks(rpm_t)
  
-@@ -179,7 +185,17 @@
+ corecmd_exec_all_executables(rpm_t)
+ 
+@@ -117,6 +124,7 @@
+ fs_manage_nfs_symlinks(rpm_t)
+ fs_getattr_all_fs(rpm_t)
+ fs_search_auto_mountpoints(rpm_t)
++fs_list_inotifyfs(rpm_t)
+ 
+ mls_file_read_all_levels(rpm_t)
+ mls_file_write_all_levels(rpm_t)
+@@ -179,7 +187,17 @@
  ')
  
  optional_policy(`
@@ -2885,7 +2925,7 @@
  ')
  
  optional_policy(`
-@@ -190,6 +206,7 @@
+@@ -190,6 +208,7 @@
  	unconfined_domain(rpm_t)
  	# yum-updatesd requires this
  	unconfined_dbus_chat(rpm_t)
@@ -2893,16 +2933,42 @@
  ')
  
  ifdef(`TODO',`
-@@ -216,7 +233,7 @@
+@@ -215,8 +234,8 @@
+ # rpm-script Local policy
  #
  
- allow rpm_script_t self:capability { chown dac_override dac_read_search fowner fsetid setgid setuid ipc_lock sys_chroot sys_nice mknod kill };
+-allow rpm_script_t self:capability { chown dac_override dac_read_search fowner fsetid setgid setuid ipc_lock sys_chroot sys_nice mknod kill };
 -allow rpm_script_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
++allow rpm_script_t self:capability { chown dac_override dac_read_search fowner fsetid setgid setuid ipc_lock sys_admin sys_chroot sys_ptrace sys_nice mknod kill };
 +allow rpm_script_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execheap };
  allow rpm_script_t self:fd use;
  allow rpm_script_t self:fifo_file rw_fifo_file_perms;
  allow rpm_script_t self:unix_dgram_socket create_socket_perms;
-@@ -317,6 +334,7 @@
+@@ -227,12 +246,15 @@
+ allow rpm_script_t self:sem create_sem_perms;
+ allow rpm_script_t self:msgq create_msgq_perms;
+ allow rpm_script_t self:msg { send receive };
++allow rpm_script_t self:netlink_kobject_uevent_socket create_socket_perms;
+ 
+ allow rpm_script_t rpm_tmp_t:file read_file_perms;
+ 
+ allow rpm_script_t rpm_script_tmp_t:dir mounton;
+ manage_dirs_pattern(rpm_script_t,rpm_script_tmp_t,rpm_script_tmp_t)
+ manage_files_pattern(rpm_script_t,rpm_script_tmp_t,rpm_script_tmp_t)
++manage_blk_files_pattern(rpm_script_t, rpm_script_tmp_t, rpm_script_tmp_t)
++manage_chr_files_pattern(rpm_script_t, rpm_script_tmp_t, rpm_script_tmp_t)
+ files_tmp_filetrans(rpm_script_t, rpm_script_tmp_t, { file dir })
+ 
+ manage_dirs_pattern(rpm_script_t,rpm_script_tmpfs_t,rpm_script_tmpfs_t)
+@@ -298,6 +320,7 @@
+ files_exec_etc_files(rpm_script_t)
+ files_read_etc_runtime_files(rpm_script_t)
+ files_exec_usr_files(rpm_script_t)
++files_relabel_all_files(rpm_script_t)
+ 
+ init_domtrans_script(rpm_script_t)
+ 
+@@ -317,6 +340,7 @@
  seutil_domtrans_loadpolicy(rpm_script_t)
  seutil_domtrans_setfiles(rpm_script_t)
  seutil_domtrans_semanage(rpm_script_t)
@@ -2910,7 +2976,18 @@
  
  userdom_use_all_users_fds(rpm_script_t)
  
-@@ -342,6 +360,7 @@
+@@ -335,6 +359,10 @@
+ ')
+ 
+ optional_policy(`
++	lvm_domtrans(rpm_script_t)
++')
++
++optional_policy(`
+ 	tzdata_domtrans(rpm_t)
+ 	tzdata_domtrans(rpm_script_t)
+ ')
+@@ -342,6 +370,7 @@
  optional_policy(`
  	unconfined_domain(rpm_script_t)
  	unconfined_domtrans(rpm_script_t)
@@ -2918,7 +2995,7 @@
  
  	optional_policy(`
  		java_domtrans(rpm_script_t)
-@@ -353,6 +372,11 @@
+@@ -353,6 +382,11 @@
  ')
  
  optional_policy(`
@@ -3675,7 +3752,7 @@
  /usr/libexec/gconfd-2 	--	gen_context(system_u:object_r:gconfd_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.3.1/policy/modules/apps/gnome.if
 --- nsaserefpolicy/policy/modules/apps/gnome.if	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/gnome.if	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/apps/gnome.if	2008-09-15 14:56:50.000000000 -0400
 @@ -33,9 +33,60 @@
  ## </param>
  #
@@ -3875,7 +3952,7 @@
  ##	manage gnome homedir content (.config)
  ## </summary>
  ## <param name="userdomain_prefix">
-@@ -186,9 +278,29 @@
+@@ -186,9 +278,30 @@
  #
  template(`gnome_manage_user_gnome_config',`
  	gen_require(`
@@ -3885,6 +3962,7 @@
 +
 +	manage_dirs_pattern($2, user_gnome_home_t, user_gnome_home_t)
 +	manage_files_pattern($2, user_gnome_home_t, user_gnome_home_t)
++	manage_lnk_files_pattern($2, user_gnome_home_t, user_gnome_home_t)
 +')
 +
 +########################################
@@ -5781,7 +5859,7 @@
 +HOME_DIR/\.mplayer(/.*)?        gen_context(system_u:object_r:user_mplayer_home_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.if serefpolicy-3.3.1/policy/modules/apps/mplayer.if
 --- nsaserefpolicy/policy/modules/apps/mplayer.if	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/mplayer.if	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/apps/mplayer.if	2008-09-15 13:04:22.000000000 -0400
 @@ -35,6 +35,7 @@
  template(`mplayer_per_role_template',`
  	gen_require(`
@@ -6315,8 +6393,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.3.1/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.te	2008-09-08 11:45:12.000000000 -0400
-@@ -0,0 +1,230 @@
++++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.te	2008-09-15 13:10:07.000000000 -0400
+@@ -0,0 +1,232 @@
 +
 +policy_module(nsplugin,1.0.0)
 +
@@ -6395,6 +6473,7 @@
 +dev_read_video_dev(nsplugin_t)
 +dev_write_video_dev(nsplugin_t)
 +dev_getattr_dri_dev(nsplugin_t)
++dev_rwx_zero(nsplugin_t)
 +
 +kernel_read_kernel_sysctls(nsplugin_t)
 +kernel_read_system_state(nsplugin_t)
@@ -6458,6 +6537,7 @@
 +
 +optional_policy(`
 +	mplayer_exec(nsplugin_t)
++	mplayer_read_user_home_files(user, nsplugin_t)
 +')
 +
 +optional_policy(`
@@ -6481,7 +6561,7 @@
 +# nsplugin_config local policy
 +#
 +
-+allow nsplugin_config_t self:capability { sys_nice setuid setgid };
++allow nsplugin_config_t self:capability { dac_override dac_read_search sys_nice setuid setgid };
 +allow nsplugin_config_t self:process { setsched sigkill getsched execmem };
 +
 +allow nsplugin_config_t self:fifo_file rw_file_perms;
@@ -13526,7 +13606,7 @@
 +/var/lib/misc(/.*)?			gen_context(system_u:object_r:system_crond_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.3.1/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/cron.if	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/cron.if	2008-09-12 13:45:31.000000000 -0400
 @@ -35,38 +35,24 @@
  #
  template(`cron_per_role_template',`
@@ -14390,7 +14470,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.3.1/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/cups.te	2008-09-08 11:55:51.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/cups.te	2008-09-12 13:42:32.000000000 -0400
 @@ -43,14 +43,13 @@
  
  type cupsd_var_run_t;
@@ -26933,8 +27013,16 @@
  userdom_dontaudit_search_sysadm_home_dirs(fsdaemon_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.fc serefpolicy-3.3.1/policy/modules/services/snmp.fc
 --- nsaserefpolicy/policy/modules/services/snmp.fc	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/snmp.fc	2008-09-08 11:45:13.000000000 -0400
-@@ -17,3 +17,6 @@
++++ serefpolicy-3.3.1/policy/modules/services/snmp.fc	2008-09-15 12:30:57.000000000 -0400
+@@ -8,6 +8,7 @@
+ #
+ # /var
+ #
++/var/agentx(/.*)?		gen_context(system_u:object_r:snmpd_var_lib_t,s0)
+ /var/lib/net-snmp(/.*)?		gen_context(system_u:object_r:snmpd_var_lib_t,s0)
+ /var/lib/snmp(/.*)?		gen_context(system_u:object_r:snmpd_var_lib_t,s0)
+ 
+@@ -17,3 +18,6 @@
  
  /var/run/snmpd		-d	gen_context(system_u:object_r:snmpd_var_run_t,s0)
  /var/run/snmpd\.pid	--	gen_context(system_u:object_r:snmpd_var_run_t,s0)
@@ -32929,8 +33017,22 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.3.1/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/ipsec.te	2008-09-08 11:45:13.000000000 -0400
-@@ -69,8 +69,8 @@
++++ serefpolicy-3.3.1/policy/modules/system/ipsec.te	2008-09-12 11:17:23.000000000 -0400
+@@ -55,11 +55,12 @@
+ 
+ allow ipsec_t self:capability { net_admin dac_override dac_read_search };
+ dontaudit ipsec_t self:capability sys_tty_config;
+-allow ipsec_t self:process signal;
++allow ipsec_t self:process { signal setsched };
+ allow ipsec_t self:netlink_route_socket r_netlink_socket_perms;
+ allow ipsec_t self:tcp_socket create_stream_socket_perms;
+ allow ipsec_t self:key_socket { create write read setopt };
+ allow ipsec_t self:fifo_file { read getattr };
++allow ipsec_t self:netlink_xfrm_socket create_socket_perms;
+ 
+ allow ipsec_t ipsec_conf_file_t:dir list_dir_perms;
+ read_files_pattern(ipsec_t,ipsec_conf_file_t,ipsec_conf_file_t)
+@@ -69,8 +70,8 @@
  read_files_pattern(ipsec_t,ipsec_key_file_t,ipsec_key_file_t)
  read_lnk_files_pattern(ipsec_t,ipsec_key_file_t,ipsec_key_file_t)
  
@@ -33526,7 +33628,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.3.1/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/logging.te	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/system/logging.te	2008-09-15 13:03:33.000000000 -0400
 @@ -61,10 +61,29 @@
  logging_log_file(var_log_t)
  files_mountpoint(var_log_t)
@@ -33565,7 +33667,34 @@
  domain_read_all_domains_state(auditctl_t)
  domain_use_interactive_fds(auditctl_t)
  
-@@ -158,9 +178,12 @@
+@@ -112,6 +132,7 @@
+ allow auditd_t self:file { getattr read write };
+ allow auditd_t self:unix_dgram_socket create_socket_perms;
+ allow auditd_t self:fifo_file rw_file_perms;
++allow auditd_t self:tcp_socket create_stream_socket_perms;
+ 
+ allow auditd_t auditd_etc_t:dir list_dir_perms;
+ allow auditd_t auditd_etc_t:file read_file_perms;
+@@ -133,9 +154,18 @@
+ 
+ fs_getattr_all_fs(auditd_t)
+ fs_search_auto_mountpoints(auditd_t)
++fs_rw_anon_inodefs_files(auditd_t)
+ 
+ selinux_search_fs(auditctl_t)
+ 
++corenet_all_recvfrom_unlabeled(auditd_t)
++corenet_all_recvfrom_netlabel(auditd_t)
++corenet_tcp_sendrecv_all_if(auditd_t)
++corenet_tcp_sendrecv_all_nodes(auditd_t)
++corenet_tcp_sendrecv_all_ports(auditd_t)
++corenet_tcp_bind_all_nodes(auditd_t)
++corenet_tcp_bind_audit_port(auditd_t)
++
+ # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
+ # Probably want a transition, and a new auditd_helper app
+ corecmd_exec_bin(auditd_t)
+@@ -158,9 +188,12 @@
  
  mls_file_read_all_levels(auditd_t)
  mls_file_write_all_levels(auditd_t) # Need to be able to write to /var/run/ directory
@@ -33578,7 +33707,7 @@
  userdom_dontaudit_use_unpriv_user_fds(auditd_t)
  userdom_dontaudit_search_sysadm_home_dirs(auditd_t)
  
-@@ -171,6 +194,10 @@
+@@ -171,6 +204,10 @@
  ')
  
  optional_policy(`
@@ -33589,7 +33718,7 @@
  	seutil_sigchld_newrole(auditd_t)
  ')
  
-@@ -208,6 +235,7 @@
+@@ -208,6 +245,7 @@
  
  fs_getattr_all_fs(klogd_t)
  fs_search_auto_mountpoints(klogd_t)
@@ -33597,7 +33726,7 @@
  
  domain_use_interactive_fds(klogd_t)
  
-@@ -252,7 +280,6 @@
+@@ -252,7 +290,6 @@
  dontaudit syslogd_t self:capability sys_tty_config;
  # setpgid for metalog
  allow syslogd_t self:process { signal_perms setpgid };
@@ -33605,7 +33734,7 @@
  # receive messages to be logged
  allow syslogd_t self:unix_dgram_socket create_socket_perms;
  allow syslogd_t self:unix_stream_socket create_stream_socket_perms;
-@@ -262,7 +289,7 @@
+@@ -262,7 +299,7 @@
  allow syslogd_t self:tcp_socket create_stream_socket_perms;
  
  allow syslogd_t syslog_conf_t:file read_file_perms;
@@ -33614,7 +33743,7 @@
  # Create and bind to /dev/log or /var/run/log.
  allow syslogd_t devlog_t:sock_file manage_sock_file_perms;
  files_pid_filetrans(syslogd_t,devlog_t,sock_file)
-@@ -274,6 +301,9 @@
+@@ -274,6 +311,9 @@
  # Allow access for syslog-ng
  allow syslogd_t var_log_t:dir { create setattr };
  
@@ -33624,7 +33753,7 @@
  # manage temporary files
  manage_dirs_pattern(syslogd_t,syslogd_tmp_t,syslogd_tmp_t)
  manage_files_pattern(syslogd_t,syslogd_tmp_t,syslogd_tmp_t)
-@@ -289,12 +319,14 @@
+@@ -289,12 +329,14 @@
  manage_files_pattern(syslogd_t,syslogd_var_run_t,syslogd_var_run_t)
  files_pid_filetrans(syslogd_t,syslogd_var_run_t,file)
  
@@ -33639,7 +33768,7 @@
  
  dev_filetrans(syslogd_t,devlog_t,sock_file)
  dev_read_sysfs(syslogd_t)
-@@ -327,6 +359,8 @@
+@@ -327,6 +369,8 @@
  # Allow users to define additional syslog ports to connect to
  corenet_tcp_bind_syslogd_port(syslogd_t)
  corenet_tcp_connect_syslogd_port(syslogd_t)
@@ -33648,7 +33777,7 @@
  
  # syslog-ng can send or receive logs
  corenet_sendrecv_syslogd_client_packets(syslogd_t)
-@@ -339,19 +373,20 @@
+@@ -339,19 +383,20 @@
  domain_use_interactive_fds(syslogd_t)
  
  files_read_etc_files(syslogd_t)
@@ -33671,7 +33800,7 @@
  miscfiles_read_localization(syslogd_t)
  
  userdom_dontaudit_use_unpriv_user_fds(syslogd_t)
-@@ -380,15 +415,11 @@
+@@ -380,15 +425,11 @@
  ')
  
  optional_policy(`
@@ -33689,7 +33818,7 @@
  ')
  
  optional_policy(`
-@@ -399,3 +430,67 @@
+@@ -399,3 +440,67 @@
  	# log to the xconsole
  	xserver_rw_console(syslogd_t)
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v
retrieving revision 1.707
retrieving revision 1.708
diff -u -r1.707 -r1.708
--- selinux-policy.spec	12 Sep 2008 14:46:47 -0000	1.707
+++ selinux-policy.spec	16 Sep 2008 16:54:43 -0000	1.708
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.3.1
-Release: 90%{?dist}
+Release: 91%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -386,6 +386,9 @@
 %endif
 
 %changelog
+* Mon Sep 15 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-91
+- Allow nsplugin_cong dac capabilities.
+
 * Tue Sep 2 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-90
 - Add rpcbind to mls policy
 - Fix up policy so permissive domains will work



From dwalsh at fedoraproject.org  Tue Sep 16 16:55:27 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 16 Sep 2008 16:55:27 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20080710.patch,1.32,1.33
Message-ID: <20080916165527.6C8DB70138@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10577

Modified Files:
	policy-20080710.patch 
Log Message:
* Thu Sep 11 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-1
- Merge upstream changes
- Add Xavier Toth patches


policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- policy-20080710.patch	16 Sep 2008 13:57:15 -0000	1.32
+++ policy-20080710.patch	16 Sep 2008 16:54:56 -0000	1.33
@@ -298,6 +298,18 @@
  libs_use_ld_so(alsa_t)
  libs_use_shared_libs(alsa_t)
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-3.5.8/policy/modules/admin/amanda.te
+--- nsaserefpolicy/policy/modules/admin/amanda.te	2008-08-14 10:07:05.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/amanda.te	2008-09-16 11:21:41.000000000 -0400
+@@ -129,6 +129,8 @@
+ corenet_tcp_bind_all_nodes(amanda_t)
+ corenet_udp_bind_all_nodes(amanda_t)
+ corenet_tcp_bind_all_rpc_ports(amanda_t)
++corenet_tcp_bind_generic_port(amanda_t)
++corenet_dontaudit_tcp_bind_all_ports(amanda_t)
+ 
+ dev_getattr_all_blk_files(amanda_t)
+ dev_getattr_all_chr_files(amanda_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.5.8/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2008-08-07 11:15:13.000000000 -0400
 +++ serefpolicy-3.5.8/policy/modules/admin/anaconda.te	2008-09-12 10:59:28.000000000 -0400



From mdomsch at fedoraproject.org  Tue Sep 16 17:01:19 2008
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue, 16 Sep 2008 17:01:19 +0000 (UTC)
Subject: rpms/oggconvert/devel oggconvert.spec,1.4,1.5
Message-ID: <20080916170119.C9D9E70138@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/oggconvert/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11269

Modified Files:
	oggconvert.spec 
Log Message:
remove dupe changelog entry


Index: oggconvert.spec
===================================================================
RCS file: /cvs/extras/rpms/oggconvert/devel/oggconvert.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- oggconvert.spec	16 Sep 2008 16:24:07 -0000	1.4
+++ oggconvert.spec	16 Sep 2008 17:00:49 -0000	1.5
@@ -75,9 +75,6 @@
 * Sat Dec 1 2007 Neal Gompa <ngompa13{%}gmail{*}com> - 0.3.0-14
 - Oops, apparently files removal was intentional, reinstated
 - removed dependency on gettext, probably not necessary
-* Sat Dec 1 2007 Neal Gompa <ngompa13{%}gmail{*}com> - 0.3.0-14
-- Oops, apparently files removal was intentional, reinstated
-- removed dependency on gettext, probably not necessary
 * Sat Nov 24 2007 Neal Gompa <ngompa13{%}gmail{*}com> - 0.3.0-13
 - Updated to OggConvert 0.3.0
 - Added translations



From mdomsch at fedoraproject.org  Tue Sep 16 17:11:00 2008
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue, 16 Sep 2008 17:11:00 +0000 (UTC)
Subject: rpms/fonttools/devel .cvsignore, 1.4, 1.5 fonttools.spec, 1.12,
	1.13 sources, 1.5, 1.6
Message-ID: <20080916171100.4DD0B70138@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/fonttools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11887

Modified Files:
	.cvsignore fonttools.spec sources 
Log Message:
update to 2.2, drop upstreamed patch, fix FTBFS BZ#434409


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fonttools/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Nov 2006 14:38:24 -0000	1.4
+++ .cvsignore	16 Sep 2008 17:10:29 -0000	1.5
@@ -1 +1 @@
-fonttools-2006-02-23.085153.tar.bz2
+fonttools-2.2.tar.gz


Index: fonttools.spec
===================================================================
RCS file: /cvs/extras/rpms/fonttools/devel/fonttools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fonttools.spec	19 Feb 2008 22:26:31 -0000	1.12
+++ fonttools.spec	16 Sep 2008 17:10:29 -0000	1.13
@@ -1,22 +1,21 @@
+%{!?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 alphatag 20060223cvs
 
 Name:           fonttools
-Version:        2.0
-Release:        0.12.%{alphatag}%{?dist}
+Version:        2.2
+Release:        1%{?dist}
 Summary:        A tool to convert True/OpenType fonts to XML and back
 
 Group:          Development/Tools
 License:        BSD
-URL:            http://sourceforge.net/projects/fonttools/
-Source0:        http://fonttools.sourceforge.net/cvs-snapshots/bzip2/fonttools-2006-02-23.085153.tar.bz2
+URL:            http://sourceforge.net/projects/%{name}/
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1:         fonttools-uni5.patch
 
 BuildRequires:  python-devel python-numeric
 Requires:       python-numeric
 
-Provides:       ttx
+Provides:       ttx = %{version}-%{release}
 
 %description
 TTX/FontTools is a tool for manipulating TrueType and OpenType fonts. It is
@@ -25,8 +24,7 @@
 
 
 %prep
-%setup -q -n %{name}
-%patch1 -p1 -b .uni5
+%setup -q
 
 %{__sed} -i.nobang '1 d' Lib/fontTools/ttx.py
 %{__chmod} a-x LICENSE.txt
@@ -40,7 +38,9 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{python_sitearch}/FontTools/fontTools/ttLib/test
-
+chmod 0755 $RPM_BUILD_ROOT%{python_sitearch}/FontTools/fontTools/misc/eexecOp.so
+mkdir -p -m 0755 ${RPM_BUILD_ROOT}%{_mandir}/man1
+mv $RPM_BUILD_ROOT/usr/man/man1/ttx.1 $RPM_BUILD_ROOT/%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,7 +49,7 @@
 %files
 %defattr(-,root,root,-)
 %doc LICENSE.txt
-%doc Doc/bugs.txt Doc/ChangeLog.txt Doc/changes.txt Doc/documentation.html
+%doc Doc/ChangeLog.txt Doc/changes.txt Doc/documentation.html
 %{python_sitearch}/FontTools.pth
 %dir %{python_sitearch}/FontTools
 %dir %{python_sitearch}/FontTools/fontTools
@@ -63,10 +63,16 @@
 %{python_sitearch}/FontTools/fontTools/*/*.py*
 %{python_sitearch}/FontTools/fontTools/*/*/*.py*
 %{python_sitearch}/FontTools/fontTools/misc/eexecOp.so
+%{python_sitearch}/FontTools/fonttools-%{version}-py2.5.egg-info
 %{_bindir}/ttx
+%{_mandir}/man1/ttx.1.gz
+
 
 
 %changelog
+* Tue Sep 16 2008 Matt Domsch <mdomsch at fedoraproject.org> - 2.2-1
+- update to 2.2, drop upstreamed patch, fix FTBFS BZ#434409
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0-0.12.20060223cvs
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fonttools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Nov 2006 14:38:24 -0000	1.5
+++ sources	16 Sep 2008 17:10:29 -0000	1.6
@@ -1 +1 @@
-ffddf5c5c6b327e1855b934e98782717  fonttools-2006-02-23.085153.tar.bz2
+639c68113cc04e8f30ae8997d6cc480a  fonttools-2.2.tar.gz



From stalwart at fedoraproject.org  Tue Sep 16 17:11:32 2008
From: stalwart at fedoraproject.org (Pavel Shevchuk)
Date: Tue, 16 Sep 2008 17:11:32 +0000 (UTC)
Subject: rpms/enlightenment/devel enlightenment.spec,1.1,1.2
Message-ID: <20080916171132.EC25A70138@cvs1.fedora.phx.redhat.com>

Author: stalwart

Update of /cvs/pkgs/rpms/enlightenment/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11915

Modified Files:
	enlightenment.spec 
Log Message:
Changed description



Index: enlightenment.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enlightenment/devel/enlightenment.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- enlightenment.spec	1 Sep 2008 22:12:31 -0000	1.1
+++ enlightenment.spec	16 Sep 2008 17:11:02 -0000	1.2
@@ -14,51 +14,11 @@
 BuildRequires:  efreet-devel e_dbus-devel pam-devel
 
 %description
-Enlightenment 0.17 is the next generation of UNIX graphical environments. It is
-not just a window manager, but it is also a desktop shell. A desktop shell
-means, a window manager plus a file manager, plus configuration utilitys all in
-one. They are not separated as usual.
-
-Enlightenment is fast. No, really. It's fast. It is known to run on very slow
-machines (like 100 Mhz CPU, 64 MB of RAM) well. So you really don't need a
-modern desktop to see some eye-candy and to use a modern graphical environment.
-Even more ??? you can control how fast you want it by using it's Performance
-configuration panel to change the cache settings and more.
-
-The high performance does not mean that there is no eye candy. There is eye
-candy that you have never seen before. Starting from the animated boot screen,
-to continue with the all animations and effects that themes could provide, to
-end up with fancy animated backgrounds. But not some huge .GIF files, but
-really nice animations. Every virtual desktop (at the moment you can have 24)
-can have it's own background (animated or not), so you can put different
-wallpapers on the different virtual desktops. There are a number of effects
-that can be shown when you switch from the different virtual desktops. The
-menus, the borders and all other usual parts of a normal window manager are
-animated as well as some of the widgets (the sliders, for example). Remember
-that those effects are provided by the theme, so every theme makes E to look
-different, with different effects, look and feel and animations.
-
-As we already mentioned, E17 provides a file manager as well. Of the time of
-writing, it is not completed and is in active development (as E17 as a whole
-itself), but after it is finished it will be a very nice, configurable and eye
-candy. Even right now, you can do the basic things with it ??? browse, copy,
-move, delete files. It will provide thumbnails for your pictures and will be
-able to open your files with the coresponding application of your choice.
-
-E17 is highly configurable. Currently it has a nice configuration panel with
-dialogs for all kinds of things. You can change your wallpaper or your theme,
-your fonts, your screen resolution, your screen's power settings, your keyboard
-and mouse settings, the language that Enlightenment talks to you, and so on.
-You can contol almost every apsect of what E is doing and how. It will do what
-you want it to do.
-
-As you already know, Enlightenment 0.17 has lots of features, but one of the
-most important is, that you can add and remove functionality by using modules.
-Modules are small applications that extend E17. There can be modules tho show
-you the weather outside, or calendar modules, or modules to control your volume
-or whatever you may think. Developing a module is not that hard, so, if you
-have programming skills, you are more than welcome to develop and maintain some
-modules for the community.
+Enlightenment 0.17 is desktop shell based on Enlightenment Foundation
+Libraries. It's highly optimized and provides extensive theming capabilities.
+A Desktop shell means it's a window manager plus a file manager, plus 
+configuration utilitys all in one. It works reasonably fast even on old and low
+range computers, providing eye-candy environment.
 
 
 %package        devel



From stalwart at fedoraproject.org  Tue Sep 16 17:12:49 2008
From: stalwart at fedoraproject.org (Pavel Shevchuk)
Date: Tue, 16 Sep 2008 17:12:49 +0000 (UTC)
Subject: rpms/enlightenment/F-9 enlightenment.spec,1.1,1.2
Message-ID: <20080916171249.CFA5A70138@cvs1.fedora.phx.redhat.com>

Author: stalwart

Update of /cvs/pkgs/rpms/enlightenment/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12110

Modified Files:
	enlightenment.spec 
Log Message:
Changed description 



Index: enlightenment.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enlightenment/F-9/enlightenment.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- enlightenment.spec	1 Sep 2008 22:14:30 -0000	1.1
+++ enlightenment.spec	16 Sep 2008 17:12:19 -0000	1.2
@@ -14,51 +14,11 @@
 BuildRequires:  efreet-devel e_dbus-devel pam-devel
 
 %description
-Enlightenment 0.17 is the next generation of UNIX graphical environments. It is
-not just a window manager, but it is also a desktop shell. A desktop shell
-means, a window manager plus a file manager, plus configuration utilitys all in
-one. They are not separated as usual.
-
-Enlightenment is fast. No, really. It's fast. It is known to run on very slow
-machines (like 100 Mhz CPU, 64 MB of RAM) well. So you really don't need a
-modern desktop to see some eye-candy and to use a modern graphical environment.
-Even more ??? you can control how fast you want it by using it's Performance
-configuration panel to change the cache settings and more.
-
-The high performance does not mean that there is no eye candy. There is eye
-candy that you have never seen before. Starting from the animated boot screen,
-to continue with the all animations and effects that themes could provide, to
-end up with fancy animated backgrounds. But not some huge .GIF files, but
-really nice animations. Every virtual desktop (at the moment you can have 24)
-can have it's own background (animated or not), so you can put different
-wallpapers on the different virtual desktops. There are a number of effects
-that can be shown when you switch from the different virtual desktops. The
-menus, the borders and all other usual parts of a normal window manager are
-animated as well as some of the widgets (the sliders, for example). Remember
-that those effects are provided by the theme, so every theme makes E to look
-different, with different effects, look and feel and animations.
-
-As we already mentioned, E17 provides a file manager as well. Of the time of
-writing, it is not completed and is in active development (as E17 as a whole
-itself), but after it is finished it will be a very nice, configurable and eye
-candy. Even right now, you can do the basic things with it ??? browse, copy,
-move, delete files. It will provide thumbnails for your pictures and will be
-able to open your files with the coresponding application of your choice.
-
-E17 is highly configurable. Currently it has a nice configuration panel with
-dialogs for all kinds of things. You can change your wallpaper or your theme,
-your fonts, your screen resolution, your screen's power settings, your keyboard
-and mouse settings, the language that Enlightenment talks to you, and so on.
-You can contol almost every apsect of what E is doing and how. It will do what
-you want it to do.
-
-As you already know, Enlightenment 0.17 has lots of features, but one of the
-most important is, that you can add and remove functionality by using modules.
-Modules are small applications that extend E17. There can be modules tho show
-you the weather outside, or calendar modules, or modules to control your volume
-or whatever you may think. Developing a module is not that hard, so, if you
-have programming skills, you are more than welcome to develop and maintain some
-modules for the community.
+Enlightenment 0.17 is desktop shell based on Enlightenment Foundation
+Libraries. It's highly optimized and provides extensive theming capabilities.
+A Desktop shell means it's a window manager plus a file manager, plus 
+configuration utilitys all in one. It works reasonably fast even on old and low
+range computers, providing eye-candy environment.
 
 
 %package        devel



From stalwart at fedoraproject.org  Tue Sep 16 17:13:38 2008
From: stalwart at fedoraproject.org (Pavel Shevchuk)
Date: Tue, 16 Sep 2008 17:13:38 +0000 (UTC)
Subject: rpms/enlightenment/F-8 enlightenment.spec,1.1,1.2
Message-ID: <20080916171338.2540D70138@cvs1.fedora.phx.redhat.com>

Author: stalwart

Update of /cvs/pkgs/rpms/enlightenment/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12177

Modified Files:
	enlightenment.spec 
Log Message:
Changed description 



Index: enlightenment.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enlightenment/F-8/enlightenment.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- enlightenment.spec	1 Sep 2008 22:18:18 -0000	1.1
+++ enlightenment.spec	16 Sep 2008 17:13:07 -0000	1.2
@@ -14,51 +14,11 @@
 BuildRequires:  efreet-devel e_dbus-devel pam-devel
 
 %description
-Enlightenment 0.17 is the next generation of UNIX graphical environments. It is
-not just a window manager, but it is also a desktop shell. A desktop shell
-means, a window manager plus a file manager, plus configuration utilitys all in
-one. They are not separated as usual.
-
-Enlightenment is fast. No, really. It's fast. It is known to run on very slow
-machines (like 100 Mhz CPU, 64 MB of RAM) well. So you really don't need a
-modern desktop to see some eye-candy and to use a modern graphical environment.
-Even more ??? you can control how fast you want it by using it's Performance
-configuration panel to change the cache settings and more.
-
-The high performance does not mean that there is no eye candy. There is eye
-candy that you have never seen before. Starting from the animated boot screen,
-to continue with the all animations and effects that themes could provide, to
-end up with fancy animated backgrounds. But not some huge .GIF files, but
-really nice animations. Every virtual desktop (at the moment you can have 24)
-can have it's own background (animated or not), so you can put different
-wallpapers on the different virtual desktops. There are a number of effects
-that can be shown when you switch from the different virtual desktops. The
-menus, the borders and all other usual parts of a normal window manager are
-animated as well as some of the widgets (the sliders, for example). Remember
-that those effects are provided by the theme, so every theme makes E to look
-different, with different effects, look and feel and animations.
-
-As we already mentioned, E17 provides a file manager as well. Of the time of
-writing, it is not completed and is in active development (as E17 as a whole
-itself), but after it is finished it will be a very nice, configurable and eye
-candy. Even right now, you can do the basic things with it ??? browse, copy,
-move, delete files. It will provide thumbnails for your pictures and will be
-able to open your files with the coresponding application of your choice.
-
-E17 is highly configurable. Currently it has a nice configuration panel with
-dialogs for all kinds of things. You can change your wallpaper or your theme,
-your fonts, your screen resolution, your screen's power settings, your keyboard
-and mouse settings, the language that Enlightenment talks to you, and so on.
-You can contol almost every apsect of what E is doing and how. It will do what
-you want it to do.
-
-As you already know, Enlightenment 0.17 has lots of features, but one of the
-most important is, that you can add and remove functionality by using modules.
-Modules are small applications that extend E17. There can be modules tho show
-you the weather outside, or calendar modules, or modules to control your volume
-or whatever you may think. Developing a module is not that hard, so, if you
-have programming skills, you are more than welcome to develop and maintain some
-modules for the community.
+Enlightenment 0.17 is desktop shell based on Enlightenment Foundation
+Libraries. It's highly optimized and provides extensive theming capabilities.
+A Desktop shell means it's a window manager plus a file manager, plus 
+configuration utilitys all in one. It works reasonably fast even on old and low
+range computers, providing eye-candy environment.
 
 
 %package        devel



From steved at fedoraproject.org  Tue Sep 16 17:21:01 2008
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue, 16 Sep 2008 17:21:01 +0000 (UTC)
Subject: rpms/rpcbind/devel rpcbind.spec,1.33,1.34
Message-ID: <20080916172101.138B47013A@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12784

Modified Files:
	rpcbind.spec 
Log Message:
Replaced qouta with quota-devel in BuildRequires:




Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- rpcbind.spec	16 Sep 2008 15:48:09 -0000	1.33
+++ rpcbind.spec	16 Sep 2008 17:20:30 -0000	1.34
@@ -16,7 +16,7 @@
 Requires: setup >= 2.6.4-1
 Conflicts: man-pages < 2.43-12
 BuildRequires: automake, autoconf, libtool
-BuildRequires: libtirpc-devel, quota, tcp_wrappers-devel
+BuildRequires: libtirpc-devel, quota-devel, tcp_wrappers-devel
 Requires(pre): /usr/sbin/groupadd  /usr/sbin/groupdel
 Requires(pre): /usr/sbin/useradd  /usr/sbin/userdel
 Requires(post): /sbin/chkconfig



From dwalsh at fedoraproject.org  Tue Sep 16 17:38:26 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 16 Sep 2008 17:38:26 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch,1.208,1.209
Message-ID: <20080916173826.865BF70138@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14194

Modified Files:
	policy-20071130.patch 
Log Message:
* Mon Sep 15 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-91
- Allow nsplugin_cong dac capabilities.


policy-20071130.patch:

Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- policy-20071130.patch	16 Sep 2008 16:54:42 -0000	1.208
+++ policy-20071130.patch	16 Sep 2008 17:37:55 -0000	1.209
@@ -2865,7 +2865,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.3.1/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/admin/rpm.te	2008-09-16 09:14:37.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/admin/rpm.te	2008-09-16 13:34:33.000000000 -0400
 @@ -31,6 +31,9 @@
  files_type(rpm_var_lib_t)
  typealias rpm_var_lib_t alias var_lib_rpm_t;
@@ -2960,7 +2960,15 @@
  files_tmp_filetrans(rpm_script_t, rpm_script_tmp_t, { file dir })
  
  manage_dirs_pattern(rpm_script_t,rpm_script_tmpfs_t,rpm_script_tmpfs_t)
-@@ -298,6 +320,7 @@
+@@ -285,6 +307,7 @@
+ auth_use_nsswitch(rpm_script_t)
+ # ideally we would not need this
+ auth_manage_all_files_except_shadow(rpm_script_t)
++auth_relabel_shadow(rpm_script_t)
+ 
+ corecmd_exec_all_executables(rpm_script_t)
+ 
+@@ -298,6 +321,7 @@
  files_exec_etc_files(rpm_script_t)
  files_read_etc_runtime_files(rpm_script_t)
  files_exec_usr_files(rpm_script_t)
@@ -2968,7 +2976,7 @@
  
  init_domtrans_script(rpm_script_t)
  
-@@ -317,6 +340,7 @@
+@@ -317,6 +341,7 @@
  seutil_domtrans_loadpolicy(rpm_script_t)
  seutil_domtrans_setfiles(rpm_script_t)
  seutil_domtrans_semanage(rpm_script_t)
@@ -2976,7 +2984,7 @@
  
  userdom_use_all_users_fds(rpm_script_t)
  
-@@ -335,6 +359,10 @@
+@@ -335,6 +360,10 @@
  ')
  
  optional_policy(`
@@ -2987,7 +2995,7 @@
  	tzdata_domtrans(rpm_t)
  	tzdata_domtrans(rpm_script_t)
  ')
-@@ -342,6 +370,7 @@
+@@ -342,6 +371,7 @@
  optional_policy(`
  	unconfined_domain(rpm_script_t)
  	unconfined_domtrans(rpm_script_t)
@@ -2995,7 +3003,7 @@
  
  	optional_policy(`
  		java_domtrans(rpm_script_t)
-@@ -353,6 +382,11 @@
+@@ -353,6 +383,11 @@
  ')
  
  optional_policy(`
@@ -31794,7 +31802,7 @@
 +/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.3.1/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/authlogin.if	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/system/authlogin.if	2008-09-16 13:33:53.000000000 -0400
 @@ -56,10 +56,6 @@
  	miscfiles_read_localization($1_chkpwd_t)
  



From dwalsh at fedoraproject.org  Tue Sep 16 17:38:56 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 16 Sep 2008 17:38:56 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20080710.patch,1.33,1.34
Message-ID: <20080916173856.2A0C570138@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14260

Modified Files:
	policy-20080710.patch 
Log Message:
* Thu Sep 11 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-1
- Merge upstream changes
- Add Xavier Toth patches


policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- policy-20080710.patch	16 Sep 2008 16:54:56 -0000	1.33
+++ policy-20080710.patch	16 Sep 2008 17:38:25 -0000	1.34
@@ -1178,7 +1178,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.5.8/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/rpm.te	2008-09-16 09:14:33.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/rpm.te	2008-09-16 13:35:13.000000000 -0400
 @@ -31,6 +31,9 @@
  files_type(rpm_var_lib_t)
  typealias rpm_var_lib_t alias var_lib_rpm_t;
@@ -1276,7 +1276,15 @@
  files_tmp_filetrans(rpm_script_t, rpm_script_tmp_t, { file dir })
  
  manage_dirs_pattern(rpm_script_t, rpm_script_tmpfs_t, rpm_script_tmpfs_t)
-@@ -298,6 +321,7 @@
+@@ -285,6 +308,7 @@
+ auth_use_nsswitch(rpm_script_t)
+ # ideally we would not need this
+ auth_manage_all_files_except_shadow(rpm_script_t)
++auth_relabel_shadow(rpm_script_t)
+ 
+ corecmd_exec_all_executables(rpm_script_t)
+ 
+@@ -298,6 +322,7 @@
  files_exec_etc_files(rpm_script_t)
  files_read_etc_runtime_files(rpm_script_t)
  files_exec_usr_files(rpm_script_t)
@@ -1284,7 +1292,7 @@
  
  init_domtrans_script(rpm_script_t)
  
-@@ -317,6 +341,7 @@
+@@ -317,6 +342,7 @@
  seutil_domtrans_loadpolicy(rpm_script_t)
  seutil_domtrans_setfiles(rpm_script_t)
  seutil_domtrans_semanage(rpm_script_t)
@@ -1292,7 +1300,7 @@
  
  userdom_use_all_users_fds(rpm_script_t)
  
-@@ -335,6 +360,10 @@
+@@ -335,6 +361,10 @@
  ')
  
  optional_policy(`
@@ -1303,7 +1311,7 @@
  	tzdata_domtrans(rpm_t)
  	tzdata_domtrans(rpm_script_t)
  ')
-@@ -342,6 +371,7 @@
+@@ -342,6 +372,7 @@
  optional_policy(`
  	unconfined_domain(rpm_script_t)
  	unconfined_domtrans(rpm_script_t)
@@ -1311,7 +1319,7 @@
  
  	optional_policy(`
  		java_domtrans(rpm_script_t)
-@@ -352,6 +382,11 @@
+@@ -352,6 +383,11 @@
  	')
  ')
  



From steved at fedoraproject.org  Tue Sep 16 18:12:19 2008
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue, 16 Sep 2008 18:12:19 +0000 (UTC)
Subject: rpms/libtirpc/F-9 libtirpc-0.1.7-copying-update.patch, NONE,
	1.1 libtirpc-0.1.7-rpc_getbroadifs-typo.patch, NONE,
	1.1 libtirpc-0.1.7-sh-arch.patch, NONE,
	1.1 libtirpc-0.1.7-taddr2addr-typo.patch, NONE,
	1.1 libtirpc-0.1.7-warnings.patch, NONE, 1.1 libtirpc.spec, 1.26, 1.27
Message-ID: <20080916181219.24D4170138@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/libtirpc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16302

Modified Files:
	libtirpc.spec 
Added Files:
	libtirpc-0.1.7-copying-update.patch 
	libtirpc-0.1.7-rpc_getbroadifs-typo.patch 
	libtirpc-0.1.7-sh-arch.patch 
	libtirpc-0.1.7-taddr2addr-typo.patch 
	libtirpc-0.1.7-warnings.patch 
Log Message:
- Added super-H(sh3,sh4) architecture support
- Updated COPYING with new license agreement
- Fix incorrect sizeof() in __rpc_getbroadifs
- Fix for taddr2addr conversion bug of local addresses
- Fixed some of warnings in: src/auth_time.c, src/clnt_dg.c and
        src/clnt_raw.c


libtirpc-0.1.7-copying-update.patch:

--- NEW FILE libtirpc-0.1.7-copying-update.patch ---
commit 27434e4368826b5bf1f5c12f4736fe78914b0147
Author: Aurelien Charbon <aurelien.charbon at ext.bull.net>
Date:   Wed Jul 9 14:07:11 2008 -0400

    Updated COPYING with new license agreement.
    
    Signed-off-by: Steve Dickson <steved at dickson.boston.devel.redhat.com>

diff --git a/COPYING b/COPYING
index 050c0fc..8b548d6 100644
--- a/COPYING
+++ b/COPYING
@@ -331,3 +331,29 @@ Standard RFC1833:  Binding Protocols for ONC RPC Version 2
 RFC2078:  Generic Security Service Application Program
 Interface, Version 2 RFC2203:  RPCSEC_GSS Protocol
 Specification RFC2695:  Authentication Mechanisms for ONC RPC
+
+*
+ * Copyright (c) Copyright (c) Bull S.A.  2005  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 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.
+ */
+

libtirpc-0.1.7-rpc_getbroadifs-typo.patch:

--- NEW FILE libtirpc-0.1.7-rpc_getbroadifs-typo.patch ---
commit 95c8f7227e6b15f2e430d7b87dadc95b2acd4a61
Author: Olaf Kirch <okir at suse.de>
Date:   Tue Sep 2 12:09:39 2008 -0400

    Fix incorrect sizeof() in __rpc_getbroadifs
    
    __rpc_getbroadifs returns bad broadcast addresses on 32bit
    machines because when copying the broadcast addresses, ite
    applies the sizeof() operator to a pointer to a sockaddr,
    rather than the sockaddr itself.
    
    Signed-off-by: Olaf Kirch <okir at suse.de>
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/src/clnt_bcast.c b/src/clnt_bcast.c
index a96db45..aa2b8f2 100644
--- a/src/clnt_bcast.c
+++ b/src/clnt_bcast.c
@@ -163,7 +163,7 @@ __rpc_getbroadifs(int af, int proto, int socktype, broadlist_t *list)
 		  /*	memcpy(&bip->broadaddr, ifap->ifa_broadaddr,
 			(size_t)ifap->ifa_broadaddr->sa_len);*/
 			memcpy(&bip->broadaddr, ifap->ifa_broadaddr,
-			(size_t)sizeof(ifap->ifa_broadaddr));
+					sizeof(bip->broadaddr));
 			sin = (struct sockaddr_in *)(void *)&bip->broadaddr;
 			sin->sin_port =
 			    ((struct sockaddr_in *)

libtirpc-0.1.7-sh-arch.patch:

--- NEW FILE libtirpc-0.1.7-sh-arch.patch ---
commit 276e782ef9bb9b7c647edb91707c382e5a38c7c8
Author: CHIKAMA Masaki <masaki.chikama at gmail.com>
Date:   Fri Jun 27 14:08:55 2008 -0400

    Added super-H(sh3,sh4) architecture support
    
    Signed-off-by: CHIKAMA Masaki <masaki.chikama at gmail.com>
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/src/xdr_float.c b/src/xdr_float.c
index d8b22e6..4693ef0 100644
--- a/src/xdr_float.c
+++ b/src/xdr_float.c
@@ -59,7 +59,8 @@
     defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \
     defined(__arm32__) || defined(__ppc__) || defined(__ia64__) || \
     defined(__arm26__) || defined(__sparc64__) || defined(__amd64__) || \
-    defined(__powerpc__) || defined(__s390__) || defined(__arm__)
+    defined(__powerpc__) || defined(__s390__) || defined(__arm__) || \
+    defined(__sh__)
 #include <bits/endian.h>
 #define IEEEFP
 #endif

libtirpc-0.1.7-taddr2addr-typo.patch:

--- NEW FILE libtirpc-0.1.7-taddr2addr-typo.patch ---
commit 9e7ba0c7a02031294fefadfbca42b3dd5f2d841f
Author: Olaf Kirch <okir at suse.de>
Date:   Tue Sep 16 08:46:29 2008 -0400

    Fix for taddr2addr conversion bug of local addresses
    
    When converting af_local socket addresses in taddr2uaddr, an incorrect
    sizeof() would result in a truncated path string. As a result,
    rpcbind will report the local /var/lib/rpcbind address to clients
    as "/v" on a 32bit machine.
    
    Signed-off-by: okir at suse.de
    Signed-off-by: Steve Dickson <steved at redhat.com>

--- libtirpc-0.1.7/src/rpc_generic.c.orig	2005-05-18 01:10:50.000000000 -0400
+++ libtirpc-0.1.7/src/rpc_generic.c	2008-09-16 13:23:25.686884000 -0400
@@ -622,7 +622,7 @@
 		/*	if (asprintf(&ret, "%.*s", (int)(sun->sun_len -
 		    offsetof(struct sockaddr_un, sun_path)),
 		    sun->sun_path) < 0)*/
-		if (asprintf(&ret, "%.*s", (int)(sizeof(sun) -
+		if (asprintf(&ret, "%.*s", (int)(sizeof(*sun) -
 						 offsetof(struct sockaddr_un, sun_path)),
 			     sun->sun_path) < 0)
 

libtirpc-0.1.7-warnings.patch:

--- NEW FILE libtirpc-0.1.7-warnings.patch ---
--- libtirpc-0.1.7/src/clnt_dg.c.orig	2008-09-16 13:35:03.798750000 -0400
+++ libtirpc-0.1.7/src/clnt_dg.c	2008-09-16 13:36:23.703227000 -0400
@@ -306,7 +306,7 @@
 	int nrefreshes = 2;		/* number of times to refresh cred */
 	struct timeval timeout;
         struct pollfd fd;
-	int total_time, nextsend_time, tv;
+	int total_time, nextsend_time, tv=0;
 	struct sockaddr *sa;
 	sigset_t mask;
 	sigset_t newmask;
--- libtirpc-0.1.7/src/clnt_raw.c.orig	2008-09-16 13:35:03.770749000 -0400
+++ libtirpc-0.1.7/src/clnt_raw.c	2008-09-16 13:37:04.258398000 -0400
@@ -84,8 +84,8 @@
 {
 	struct clntraw_private *clp;
 	struct rpc_msg call_msg;
-	XDR *xdrs = &clp->xdr_stream;
-	CLIENT	*client = &clp->client_object;
+	XDR *xdrs;
+	CLIENT	*client;
 
 	mutex_lock(&clntraw_lock);
 	clp = clntraw_private;
@@ -101,6 +101,8 @@
 		clp->_raw_buf = __rpc_rawcombuf;
 		clntraw_private = clp;
 	}
+	xdrs = &clp->xdr_stream;
+	client = &clp->client_object;
 	/*
 	 * pre-serialize the static part of the call msg and stash it away
 	 */
--- libtirpc-0.1.7/src/auth_time.c.orig	2005-05-18 01:10:50.000000000 -0400
+++ libtirpc-0.1.7/src/auth_time.c	2008-09-16 13:38:16.467075000 -0400
@@ -248,7 +248,8 @@
 	nis_server		tsrv;
 	void			(*oldsig)() = NULL; /* old alarm handler */
 	struct sockaddr_in	sin;
-	int			s = RPC_ANYSOCK, len;
+	int			s = RPC_ANYSOCK;
+	socklen_t	len;
 	int			type = 0;
 
 	td->tv_sec = 0;


Index: libtirpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtirpc/F-9/libtirpc.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libtirpc.spec	13 Mar 2008 10:00:41 -0000	1.26
+++ libtirpc.spec	16 Sep 2008 18:11:48 -0000	1.27
@@ -1,6 +1,6 @@
 Name:		   libtirpc
 Version:		0.1.7
-Release:		18%{?dist}
+Release:		19%{?dist}
 Summary:		Transport Independent RPC Library
 Group:		  	System Environment/Libraries
 License:		GPL
@@ -47,6 +47,11 @@
 Patch15: libtirpc-0.1.7-bufoverflow.patch
 Patch16: libtirpc-0.1.7-libtirpc-pc.patch
 Patch17: libtirpc-0.1.7-man-install.patch
+Patch18: libtirpc-0.1.7-sh-arch.patch
+Patch19: libtirpc-0.1.7-copying-update.patch
+Patch20: libtirpc-0.1.7-rpc_getbroadifs-typo.patch
+Patch21: libtirpc-0.1.7-taddr2addr-typo.patch
+Patch22: libtirpc-0.1.7-warnings.patch
 
 Patch100: libtirpc-0.1.7-compile.patch
 
@@ -74,6 +79,11 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
 
 %patch100	-p1
 
@@ -176,6 +186,13 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep 16 2008 Steve Dickson  <steved at redhat.com> 0.1.7-19
+- Added super-H(sh3,sh4) architecture support
+- Updated COPYING with new license agreement
+- Fix incorrect sizeof() in __rpc_getbroadifs
+- Fix for taddr2addr conversion bug of local addresses
+- Fixed some of warnings in: src/auth_time.c, src/clnt_dg.c and
+        src/clnt_raw.c
 * Wed Mar 12 2008 Steve Dickson  <steved at redhat.com> 0.1.7-18
 - Install man pages in the 3t section
 



From rhughes at fedoraproject.org  Tue Sep 16 18:33:04 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 16 Sep 2008 18:33:04 +0000 (UTC)
Subject: rpms/PackageKit/devel pk-upgrades-mistake.patch, NONE,
	1.1 PackageKit.spec, 1.54, 1.55
Message-ID: <20080916183304.94E4170138@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17467

Modified Files:
	PackageKit.spec 
Added Files:
	pk-upgrades-mistake.patch 
Log Message:
* Tue Sep 16 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.3-2
- Fix an error where we didn't connect up the GetDistroUpgrades in
  the new dispatcher code.


pk-upgrades-mistake.patch:

--- NEW FILE pk-upgrades-mistake.patch ---
commit 51b020dca500141a6e78ab549765f09a34ac75fc
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Sep 16 19:07:39 2008 +0100

    yum: hook up get-distro-upgrades in the dispatcher, and make sure we send a proper error in this case

diff --git a/python/packagekit/backend.py b/python/packagekit/backend.py
index 09fd1da..87abaa7 100644
--- a/python/packagekit/backend.py
+++ b/python/packagekit/backend.py
@@ -468,6 +468,9 @@ class PackageKitBaseBackend:
             pkgs = args[0].split('|')
             self.get_update_detail(pkgs)
             self.finished();
+        elif cmd == 'get-distro-upgrades':
+            self.get_distro_upgrades()
+            self.finished();
         elif cmd == 'get-updates':
             filters = args[0]
             self.get_updates(filters)
@@ -549,9 +552,9 @@ class PackageKitBaseBackend:
             self.what_provides(filters,provides_type,search)
             self.finished();
         else:
-            print "command [%s] is not known" % cmd
-
-
+            errmsg = "command '%s' is not known" % cmd
+            self.error(ERROR_INTERNAL_ERROR,errmsg,exit=False)
+            self.finished();
 
 def exceptionHandler(typ,value,tb,base):
     # Restore original exception handler



Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- PackageKit.spec	16 Sep 2008 16:18:12 -0000	1.54
+++ PackageKit.spec	16 Sep 2008 18:32:34 -0000	1.55
@@ -8,13 +8,16 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.3
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# upstream: 51b020dca500141a6e78ab549765f09a34ac75fc
+Patch0:    pk-upgrades-mistake.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-libs = %{version}-%{release}
@@ -139,6 +142,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -269,6 +273,10 @@
 %{_includedir}/*
 
 %changelog
+* Tue Sep 16 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.3-2
+- Fix an error where we didn't connect up the GetDistroUpgrades in
+  the new dispatcher code.
+
 * Tue Sep 16 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.3-1
 - New upstream version
 - Fixes a nasty bug where the daemon could get locked under heavy load



From mtasaka at fedoraproject.org  Tue Sep 16 18:43:13 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 16 Sep 2008 18:43:13 +0000 (UTC)
Subject: rpms/kita/F-8 kita-0.177.4-cookie-change.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 kita.spec, 1.11, 1.12 sources, 1.2,
	1.3 kita-0.177.3-cookie-change.patch, 1.1, NONE
Message-ID: <20080916184313.2BF2670138@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kita/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18400/F-8

Modified Files:
	.cvsignore kita.spec sources 
Added Files:
	kita-0.177.4-cookie-change.patch 
Removed Files:
	kita-0.177.3-cookie-change.patch 
Log Message:
* Wed Sep 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.4-1
- 0.177.4


kita-0.177.4-cookie-change.patch:

--- NEW FILE kita-0.177.4-cookie-change.patch ---
--- kita-0.177.4/kita/src/write/writeview.cpp.cookie	2008-09-16 21:56:03.000000000 +0900
+++ kita-0.177.4/kita/src/write/writeview.cpp	2008-09-16 22:41:39.000000000 +0900
@@ -43,6 +43,9 @@
 #include <qcheckbox.h>
 #include <qlayout.h>
 
+#include <cstring>
+#include <cstdlib>
+
 /* result code */
 enum{
     K2ch_Unknown,
@@ -191,6 +194,10 @@
     for ( it = list.begin(); it != list.end(); ++it ) {
         faceCombo->insertItem( *it );
     }
+
+    cookie_type = NULL;
+    cookie_value = NULL;
+
 }
 
 
@@ -344,12 +351,48 @@
     m_array.append( data.data() );
 }
 
+void KitaWriteView::find_cookie_typevalue( const char *response ){
+	char *str_cmp, *str;
+	static char *cookie_type_static = NULL;
+	static char *cookie_value_static = NULL;
+	cookie_type = cookie_value = NULL;
+
+	str_cmp = "<input type=hidden name=\"";
+	str = strstr(response, str_cmp);
+	if (str){
+		char *str2 = strstr(str, "\"");
+		char *str3 = NULL;
+		str2++;
+		if ((!cookie_type_static) || (!(strstr(str2, cookie_type_static)))){
+			free(cookie_type_static);
+			free(cookie_value_static);
+
+			cookie_type_static = strdup(str2);
+			str3 = strstr(cookie_type_static, "\"");
+			*str3 = 0;
+
+			str = str2;
+			str2 = strstr(str, "value=\"");
+			str = str2;
+			str2 = strstr(str, "\"");
+			str2++;
+			cookie_value_static = strdup(str2);
+			str3 = strstr(cookie_value_static, "\"");
+			*str3 = 0;
+		}
+	}
+	cookie_type = cookie_type_static;
+	cookie_value = cookie_value_static;
+}
+
+
 
 /* This slot is called when posting is done. */
 /* see also slotPostMessage()                */ /* private slot */
 void KitaWriteView::slotPostFinished( KIO::Job* )
 {
     QString response;
+    const char *response_ascii;
 
     // x-euc-jp & euc-jp
     if ( m_array.contains( "euc-jp" ) ) {
@@ -401,6 +444,9 @@
         /* eat cookie, then re-post message */
     case K2ch_Cookie:
 
+	response_ascii = (const char *) QString::fromLocal8Bit(response).utf8();
+	find_cookie_typevalue(response_ascii);
+
         if ( KMessageBox::questionYesNo( 0,
                                          QTextCodec::codecForName( "utf8" ) ->toUnicode( KITAUTF8_WRITECOOKIEMSG ),
                                          resultTitle( response ) )
@@ -510,6 +556,12 @@
     ( ret += "&MESSAGE=" ) += KURL::encode_string( bodyText->text(), mib );
     ( ret += "&bbs=" ) += Kita::BoardManager::boardID( m_datURL );
     ( ret += "&suka=pontan" );
+    if (cookie_type){
+	ret += "&";
+	ret += cookie_type;
+	ret += "=";
+	ret += cookie_value;
+    }
 
     /* key */
     if ( m_mode == WRITEMODE_NORMAL ) ( ret += "&key=" ) += Kita::DatManager::threadID( m_datURL );
--- kita-0.177.4/kita/src/write/writeview.h.cookie	2005-05-03 13:10:26.000000000 +0900
+++ kita-0.177.4/kita/src/write/writeview.h	2008-09-16 22:41:30.000000000 +0900
@@ -45,6 +45,9 @@
 
     static QCp932Codec* m_cp932Codec;
 
+    char *cookie_type;
+    char *cookie_value;
+
 public:
 
     KitaWriteView( QWidget* parent, const char* name, const KURL& url, int mode, const QString& newThreadName = QString::null );
@@ -70,6 +73,7 @@
     void slotRecieveData( KIO::Job*, const QByteArray& );
     void slotPostFinished( KIO::Job* );
     void slotCurrentChanged ( QWidget * w );
+    void find_cookie_typevalue( const char *response );
     bool slotBodyTextChanged();
 
 private:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kita/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Aug 2006 11:28:39 -0000	1.2
+++ .cvsignore	16 Sep 2008 18:42:42 -0000	1.3
@@ -1 +1 @@
-kita-0.177.3.tar.gz
+kita-0.177.4.tar.gz


Index: kita.spec
===================================================================
RCS file: /cvs/extras/rpms/kita/F-8/kita.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kita.spec	16 Sep 2008 06:03:29 -0000	1.11
+++ kita.spec	16 Sep 2008 18:42:42 -0000	1.12
@@ -1,12 +1,13 @@
-%define     version     0.177.3
+%define     version     0.177.4
+%define	    repood      32918
 
 Summary:    2ch client for KDE
 Name:       kita
 Version:    %{version}
-Release:    14%{?dist}
-Source:     http://downloads.sourceforge.jp/kita/20336/kita-%{version}.tar.gz
-Patch0:     kita-0.177.3-nonweak-symbol.patch
-Patch1:	    kita-0.177.3-cookie-change.patch
+Release:    1%{?dist}
+Source:     http://downloads.sourceforge.jp/kita/%{repoid}/kita-%{version}.tar.gz
+#Patch0:     kita-0.177.3-nonweak-symbol.patch
+Patch1:	    kita-0.177.4-cookie-change.patch
 License:    GPLv2+
 URL:        http://sourceforge.jp/projects/kita/
 Group:      Applications/Internet
@@ -14,17 +15,17 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:       libart_lgpl-devel
-%if 0%{?fedora} >= 8
 BuildRequires:       kdelibs3-devel
-%else
-BuildRequires:       kdelibs-devel
-%endif
+
+BuildRequires:       automake
+BuildRequires:       libtool
 BuildRequires:       desktop-file-utils
+BuildRequires:       gettext
 
 Requires(post):      /sbin/ldconfig 
 Requires(postun):    /sbin/ldconfig
 %if 0%{?fedora} >= 10
-Requires:            VLGothic-fonts
+Requires:            mona-fonts-VLGothic
 %else
 Requires:            fonts-japanese
 %endif
@@ -35,16 +36,23 @@
 %prep
 %setup -q
 
-%patch0 -p2 -b .link
+#%%patch0 -p2 -b .link
 %patch1 -p1 -b .cookie
 
 %{__sed} -i.soname \
-   -e 's|^kita\([\._][lL]\)|libkitamain\1|' \
-   -e 's|\([^a-zA-Z]\)kita\([\._][lL]\)|\1libkitamain\2|g' \
+   -e 's|kita_la_|libkitamain_la_|' \
+   -e 's| kita\.la| libkitamain.la|' \
    -e 's|-avoid-version||' \
-   kita/src/Makefile.in
+   kita/src/Makefile.{in,am}
+	
+
+%{__sed} -i.dsktop -e 's|Terminal=0|Terminal=false|' \
+   kita/src/kita.desktop
+
+make dist -f Makefile.cvs
 
 %build
+export LDFLAGS="-Wl,--rpath,%{_libdir}/%{name}"
 if [ %{_arch} == x86_64 -o %{_arch} == ppc64 ] ; then
    SUF=64
 else
@@ -57,16 +65,20 @@
 %configure \
     --disable-rpath \
     --enable-libsuffix=$SUF \
+    --libdir=%{_libdir}/%{name} \
     --enable-xdg-menu
 
-%{__make} %{?_smp_mflags}
+# -j2 failed
+%{__make} -j1
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
 
-%{__sed} -i -e 's|Terminal=0|Terminal=false|' \
-      %{buildroot}/%{name}.desktop
+export LDFLAGS="-Wl,--rpath,%{_libdir}/%{name}"
+%{__make} \
+   kdelnkdir=%{_datadir}/applications \
+   DESTDIR=%{buildroot} \
+   install
 
 desktop-file-install \
       --delete-original \
@@ -74,22 +86,20 @@
       --dir %{buildroot}%{_datadir}/applications \
       --add-category KDE \
       --add-category Qt \
-      %{buildroot}/%{name}.desktop
+      --remove-category Application \
+      %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 # remove unneeded files
-%{__rm} -f %{buildroot}%{_prefix}/lib*/*.{la,so}
-
-# move document files
-%{__mkdir} DOC
+find %{buildroot}%{_libdir} -name \*.so -or \*.la | xargs %{__rm} -f
 
 unlink %{buildroot}%{_datadir}/doc/HTML/en/kita/common
 ln -sf ../common %{buildroot}%{_datadir}/doc/HTML/en/kita/common
 
 # convert encoding
 for f in README README.2ch TODO ; do
-   %{__mv} ${f} ${f}.tmp
-   iconv -f EUCJP -t UTF8 ${f}.tmp > ${f} && \
-      %{__rm} -f ${f}.tmp || %{__mv} ${f}.tmp ${f}
+   iconv -f EUCJP -t UTF8 ${f} > ${f}.tmp && \
+      ( touch -r ${f} ${f}.tmp ; %{__mv} -f ${f}.tmp ${f} )
+   %{__rm} -f ${f}.tmp
 done
 
 # install mo file
@@ -113,16 +123,21 @@
 exit 0
 
 %files -f %{name}.lang
-%defattr(-, root, root)
+%defattr(-, root, root,-)
 %doc AUTHORS COPYING ChangeLog README README.2ch TODO
 %{_bindir}/*
-%{_prefix}/lib*/*.so.*
-%{_datadir}/apps/kita/
+%{_libdir}/%{name}/
+%{_datadir}/apps/%{name}/
+
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/*.png
+
 %{_datadir}/doc/HTML/en/kita/
 
 %changelog
+* Wed Sep 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.4-1
+- 0.177.4
+
 * Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-14
 - Workaround to 2ch cookie style change
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kita/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Aug 2006 11:28:39 -0000	1.2
+++ sources	16 Sep 2008 18:42:42 -0000	1.3
@@ -1 +1 @@
-7380db08c5ec321154ebba744d5609b9  kita-0.177.3.tar.gz
+0c183e1925883b165a50d88bff8380cb  kita-0.177.4.tar.gz


--- kita-0.177.3-cookie-change.patch DELETED ---



From mtasaka at fedoraproject.org  Tue Sep 16 18:43:13 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 16 Sep 2008 18:43:13 +0000 (UTC)
Subject: rpms/kita/F-9 kita-0.177.4-cookie-change.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 kita.spec, 1.13, 1.14 sources, 1.2,
	1.3 kita-0.177.3-cookie-change.patch, 1.1, NONE
Message-ID: <20080916184313.5322170138@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kita/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18400/F-9

Modified Files:
	.cvsignore kita.spec sources 
Added Files:
	kita-0.177.4-cookie-change.patch 
Removed Files:
	kita-0.177.3-cookie-change.patch 
Log Message:
* Wed Sep 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.4-1
- 0.177.4


kita-0.177.4-cookie-change.patch:

--- NEW FILE kita-0.177.4-cookie-change.patch ---
--- kita-0.177.4/kita/src/write/writeview.cpp.cookie	2008-09-16 21:56:03.000000000 +0900
+++ kita-0.177.4/kita/src/write/writeview.cpp	2008-09-16 22:41:39.000000000 +0900
@@ -43,6 +43,9 @@
 #include <qcheckbox.h>
 #include <qlayout.h>
 
+#include <cstring>
+#include <cstdlib>
+
 /* result code */
 enum{
     K2ch_Unknown,
@@ -191,6 +194,10 @@
     for ( it = list.begin(); it != list.end(); ++it ) {
         faceCombo->insertItem( *it );
     }
+
+    cookie_type = NULL;
+    cookie_value = NULL;
+
 }
 
 
@@ -344,12 +351,48 @@
     m_array.append( data.data() );
 }
 
+void KitaWriteView::find_cookie_typevalue( const char *response ){
+	char *str_cmp, *str;
+	static char *cookie_type_static = NULL;
+	static char *cookie_value_static = NULL;
+	cookie_type = cookie_value = NULL;
+
+	str_cmp = "<input type=hidden name=\"";
+	str = strstr(response, str_cmp);
+	if (str){
+		char *str2 = strstr(str, "\"");
+		char *str3 = NULL;
+		str2++;
+		if ((!cookie_type_static) || (!(strstr(str2, cookie_type_static)))){
+			free(cookie_type_static);
+			free(cookie_value_static);
+
+			cookie_type_static = strdup(str2);
+			str3 = strstr(cookie_type_static, "\"");
+			*str3 = 0;
+
+			str = str2;
+			str2 = strstr(str, "value=\"");
+			str = str2;
+			str2 = strstr(str, "\"");
+			str2++;
+			cookie_value_static = strdup(str2);
+			str3 = strstr(cookie_value_static, "\"");
+			*str3 = 0;
+		}
+	}
+	cookie_type = cookie_type_static;
+	cookie_value = cookie_value_static;
+}
+
+
 
 /* This slot is called when posting is done. */
 /* see also slotPostMessage()                */ /* private slot */
 void KitaWriteView::slotPostFinished( KIO::Job* )
 {
     QString response;
+    const char *response_ascii;
 
     // x-euc-jp & euc-jp
     if ( m_array.contains( "euc-jp" ) ) {
@@ -401,6 +444,9 @@
         /* eat cookie, then re-post message */
     case K2ch_Cookie:
 
+	response_ascii = (const char *) QString::fromLocal8Bit(response).utf8();
+	find_cookie_typevalue(response_ascii);
+
         if ( KMessageBox::questionYesNo( 0,
                                          QTextCodec::codecForName( "utf8" ) ->toUnicode( KITAUTF8_WRITECOOKIEMSG ),
                                          resultTitle( response ) )
@@ -510,6 +556,12 @@
     ( ret += "&MESSAGE=" ) += KURL::encode_string( bodyText->text(), mib );
     ( ret += "&bbs=" ) += Kita::BoardManager::boardID( m_datURL );
     ( ret += "&suka=pontan" );
+    if (cookie_type){
+	ret += "&";
+	ret += cookie_type;
+	ret += "=";
+	ret += cookie_value;
+    }
 
     /* key */
     if ( m_mode == WRITEMODE_NORMAL ) ( ret += "&key=" ) += Kita::DatManager::threadID( m_datURL );
--- kita-0.177.4/kita/src/write/writeview.h.cookie	2005-05-03 13:10:26.000000000 +0900
+++ kita-0.177.4/kita/src/write/writeview.h	2008-09-16 22:41:30.000000000 +0900
@@ -45,6 +45,9 @@
 
     static QCp932Codec* m_cp932Codec;
 
+    char *cookie_type;
+    char *cookie_value;
+
 public:
 
     KitaWriteView( QWidget* parent, const char* name, const KURL& url, int mode, const QString& newThreadName = QString::null );
@@ -70,6 +73,7 @@
     void slotRecieveData( KIO::Job*, const QByteArray& );
     void slotPostFinished( KIO::Job* );
     void slotCurrentChanged ( QWidget * w );
+    void find_cookie_typevalue( const char *response );
     bool slotBodyTextChanged();
 
 private:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kita/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Aug 2006 11:28:39 -0000	1.2
+++ .cvsignore	16 Sep 2008 18:42:43 -0000	1.3
@@ -1 +1 @@
-kita-0.177.3.tar.gz
+kita-0.177.4.tar.gz


Index: kita.spec
===================================================================
RCS file: /cvs/extras/rpms/kita/F-9/kita.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kita.spec	16 Sep 2008 06:03:30 -0000	1.13
+++ kita.spec	16 Sep 2008 18:42:43 -0000	1.14
@@ -1,12 +1,13 @@
-%define     version     0.177.3
+%define     version     0.177.4
+%define	    repood      32918
 
 Summary:    2ch client for KDE
 Name:       kita
 Version:    %{version}
-Release:    14%{?dist}
-Source:     http://downloads.sourceforge.jp/kita/20336/kita-%{version}.tar.gz
-Patch0:     kita-0.177.3-nonweak-symbol.patch
-Patch1:	    kita-0.177.3-cookie-change.patch
+Release:    1%{?dist}
+Source:     http://downloads.sourceforge.jp/kita/%{repoid}/kita-%{version}.tar.gz
+#Patch0:     kita-0.177.3-nonweak-symbol.patch
+Patch1:	    kita-0.177.4-cookie-change.patch
 License:    GPLv2+
 URL:        http://sourceforge.jp/projects/kita/
 Group:      Applications/Internet
@@ -14,17 +15,17 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:       libart_lgpl-devel
-%if 0%{?fedora} >= 8
 BuildRequires:       kdelibs3-devel
-%else
-BuildRequires:       kdelibs-devel
-%endif
+
+BuildRequires:       automake
+BuildRequires:       libtool
 BuildRequires:       desktop-file-utils
+BuildRequires:       gettext
 
 Requires(post):      /sbin/ldconfig 
 Requires(postun):    /sbin/ldconfig
 %if 0%{?fedora} >= 10
-Requires:            VLGothic-fonts
+Requires:            mona-fonts-VLGothic
 %else
 Requires:            fonts-japanese
 %endif
@@ -35,16 +36,23 @@
 %prep
 %setup -q
 
-%patch0 -p2 -b .link
+#%%patch0 -p2 -b .link
 %patch1 -p1 -b .cookie
 
 %{__sed} -i.soname \
-   -e 's|^kita\([\._][lL]\)|libkitamain\1|' \
-   -e 's|\([^a-zA-Z]\)kita\([\._][lL]\)|\1libkitamain\2|g' \
+   -e 's|kita_la_|libkitamain_la_|' \
+   -e 's| kita\.la| libkitamain.la|' \
    -e 's|-avoid-version||' \
-   kita/src/Makefile.in
+   kita/src/Makefile.{in,am}
+	
+
+%{__sed} -i.dsktop -e 's|Terminal=0|Terminal=false|' \
+   kita/src/kita.desktop
+
+make dist -f Makefile.cvs
 
 %build
+export LDFLAGS="-Wl,--rpath,%{_libdir}/%{name}"
 if [ %{_arch} == x86_64 -o %{_arch} == ppc64 ] ; then
    SUF=64
 else
@@ -57,16 +65,20 @@
 %configure \
     --disable-rpath \
     --enable-libsuffix=$SUF \
+    --libdir=%{_libdir}/%{name} \
     --enable-xdg-menu
 
-%{__make} %{?_smp_mflags}
+# -j2 failed
+%{__make} -j1
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
 
-%{__sed} -i -e 's|Terminal=0|Terminal=false|' \
-      %{buildroot}/%{name}.desktop
+export LDFLAGS="-Wl,--rpath,%{_libdir}/%{name}"
+%{__make} \
+   kdelnkdir=%{_datadir}/applications \
+   DESTDIR=%{buildroot} \
+   install
 
 desktop-file-install \
       --delete-original \
@@ -74,22 +86,20 @@
       --dir %{buildroot}%{_datadir}/applications \
       --add-category KDE \
       --add-category Qt \
-      %{buildroot}/%{name}.desktop
+      --remove-category Application \
+      %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 # remove unneeded files
-%{__rm} -f %{buildroot}%{_prefix}/lib*/*.{la,so}
-
-# move document files
-%{__mkdir} DOC
+find %{buildroot}%{_libdir} -name \*.so -or \*.la | xargs %{__rm} -f
 
 unlink %{buildroot}%{_datadir}/doc/HTML/en/kita/common
 ln -sf ../common %{buildroot}%{_datadir}/doc/HTML/en/kita/common
 
 # convert encoding
 for f in README README.2ch TODO ; do
-   %{__mv} ${f} ${f}.tmp
-   iconv -f EUCJP -t UTF8 ${f}.tmp > ${f} && \
-      %{__rm} -f ${f}.tmp || %{__mv} ${f}.tmp ${f}
+   iconv -f EUCJP -t UTF8 ${f} > ${f}.tmp && \
+      ( touch -r ${f} ${f}.tmp ; %{__mv} -f ${f}.tmp ${f} )
+   %{__rm} -f ${f}.tmp
 done
 
 # install mo file
@@ -113,16 +123,21 @@
 exit 0
 
 %files -f %{name}.lang
-%defattr(-, root, root)
+%defattr(-, root, root,-)
 %doc AUTHORS COPYING ChangeLog README README.2ch TODO
 %{_bindir}/*
-%{_prefix}/lib*/*.so.*
-%{_datadir}/apps/kita/
+%{_libdir}/%{name}/
+%{_datadir}/apps/%{name}/
+
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/*.png
+
 %{_datadir}/doc/HTML/en/kita/
 
 %changelog
+* Wed Sep 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.4-1
+- 0.177.4
+
 * Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-14
 - Workaround to 2ch cookie style change
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kita/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Aug 2006 11:28:39 -0000	1.2
+++ sources	16 Sep 2008 18:42:43 -0000	1.3
@@ -1 +1 @@
-7380db08c5ec321154ebba744d5609b9  kita-0.177.3.tar.gz
+0c183e1925883b165a50d88bff8380cb  kita-0.177.4.tar.gz


--- kita-0.177.3-cookie-change.patch DELETED ---



From mtasaka at fedoraproject.org  Tue Sep 16 18:43:13 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 16 Sep 2008 18:43:13 +0000 (UTC)
Subject: rpms/kita/devel kita-0.177.4-cookie-change.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 kita.spec, 1.15, 1.16 sources, 1.2,
	1.3 kita-0.177.3-cookie-change.patch, 1.1, NONE
Message-ID: <20080916184313.9B37A70138@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kita/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18400/devel

Modified Files:
	.cvsignore kita.spec sources 
Added Files:
	kita-0.177.4-cookie-change.patch 
Removed Files:
	kita-0.177.3-cookie-change.patch 
Log Message:
* Wed Sep 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.4-1
- 0.177.4


kita-0.177.4-cookie-change.patch:

--- NEW FILE kita-0.177.4-cookie-change.patch ---
--- kita-0.177.4/kita/src/write/writeview.cpp.cookie	2008-09-16 21:56:03.000000000 +0900
+++ kita-0.177.4/kita/src/write/writeview.cpp	2008-09-16 22:41:39.000000000 +0900
@@ -43,6 +43,9 @@
 #include <qcheckbox.h>
 #include <qlayout.h>
 
+#include <cstring>
+#include <cstdlib>
+
 /* result code */
 enum{
     K2ch_Unknown,
@@ -191,6 +194,10 @@
     for ( it = list.begin(); it != list.end(); ++it ) {
         faceCombo->insertItem( *it );
     }
+
+    cookie_type = NULL;
+    cookie_value = NULL;
+
 }
 
 
@@ -344,12 +351,48 @@
     m_array.append( data.data() );
 }
 
+void KitaWriteView::find_cookie_typevalue( const char *response ){
+	char *str_cmp, *str;
+	static char *cookie_type_static = NULL;
+	static char *cookie_value_static = NULL;
+	cookie_type = cookie_value = NULL;
+
+	str_cmp = "<input type=hidden name=\"";
+	str = strstr(response, str_cmp);
+	if (str){
+		char *str2 = strstr(str, "\"");
+		char *str3 = NULL;
+		str2++;
+		if ((!cookie_type_static) || (!(strstr(str2, cookie_type_static)))){
+			free(cookie_type_static);
+			free(cookie_value_static);
+
+			cookie_type_static = strdup(str2);
+			str3 = strstr(cookie_type_static, "\"");
+			*str3 = 0;
+
+			str = str2;
+			str2 = strstr(str, "value=\"");
+			str = str2;
+			str2 = strstr(str, "\"");
+			str2++;
+			cookie_value_static = strdup(str2);
+			str3 = strstr(cookie_value_static, "\"");
+			*str3 = 0;
+		}
+	}
+	cookie_type = cookie_type_static;
+	cookie_value = cookie_value_static;
+}
+
+
 
 /* This slot is called when posting is done. */
 /* see also slotPostMessage()                */ /* private slot */
 void KitaWriteView::slotPostFinished( KIO::Job* )
 {
     QString response;
+    const char *response_ascii;
 
     // x-euc-jp & euc-jp
     if ( m_array.contains( "euc-jp" ) ) {
@@ -401,6 +444,9 @@
         /* eat cookie, then re-post message */
     case K2ch_Cookie:
 
+	response_ascii = (const char *) QString::fromLocal8Bit(response).utf8();
+	find_cookie_typevalue(response_ascii);
+
         if ( KMessageBox::questionYesNo( 0,
                                          QTextCodec::codecForName( "utf8" ) ->toUnicode( KITAUTF8_WRITECOOKIEMSG ),
                                          resultTitle( response ) )
@@ -510,6 +556,12 @@
     ( ret += "&MESSAGE=" ) += KURL::encode_string( bodyText->text(), mib );
     ( ret += "&bbs=" ) += Kita::BoardManager::boardID( m_datURL );
     ( ret += "&suka=pontan" );
+    if (cookie_type){
+	ret += "&";
+	ret += cookie_type;
+	ret += "=";
+	ret += cookie_value;
+    }
 
     /* key */
     if ( m_mode == WRITEMODE_NORMAL ) ( ret += "&key=" ) += Kita::DatManager::threadID( m_datURL );
--- kita-0.177.4/kita/src/write/writeview.h.cookie	2005-05-03 13:10:26.000000000 +0900
+++ kita-0.177.4/kita/src/write/writeview.h	2008-09-16 22:41:30.000000000 +0900
@@ -45,6 +45,9 @@
 
     static QCp932Codec* m_cp932Codec;
 
+    char *cookie_type;
+    char *cookie_value;
+
 public:
 
     KitaWriteView( QWidget* parent, const char* name, const KURL& url, int mode, const QString& newThreadName = QString::null );
@@ -70,6 +73,7 @@
     void slotRecieveData( KIO::Job*, const QByteArray& );
     void slotPostFinished( KIO::Job* );
     void slotCurrentChanged ( QWidget * w );
+    void find_cookie_typevalue( const char *response );
     bool slotBodyTextChanged();
 
 private:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kita/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Aug 2006 11:28:39 -0000	1.2
+++ .cvsignore	16 Sep 2008 18:42:43 -0000	1.3
@@ -1 +1 @@
-kita-0.177.3.tar.gz
+kita-0.177.4.tar.gz


Index: kita.spec
===================================================================
RCS file: /cvs/extras/rpms/kita/devel/kita.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kita.spec	16 Sep 2008 06:03:30 -0000	1.15
+++ kita.spec	16 Sep 2008 18:42:43 -0000	1.16
@@ -1,12 +1,13 @@
-%define     version     0.177.3
+%define     version     0.177.4
+%define	    repood      32918
 
 Summary:    2ch client for KDE
 Name:       kita
 Version:    %{version}
-Release:    14%{?dist}
-Source:     http://downloads.sourceforge.jp/kita/20336/kita-%{version}.tar.gz
-Patch0:     kita-0.177.3-nonweak-symbol.patch
-Patch1:	    kita-0.177.3-cookie-change.patch
+Release:    1%{?dist}
+Source:     http://downloads.sourceforge.jp/kita/%{repoid}/kita-%{version}.tar.gz
+#Patch0:     kita-0.177.3-nonweak-symbol.patch
+Patch1:	    kita-0.177.4-cookie-change.patch
 License:    GPLv2+
 URL:        http://sourceforge.jp/projects/kita/
 Group:      Applications/Internet
@@ -14,17 +15,17 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:       libart_lgpl-devel
-%if 0%{?fedora} >= 8
 BuildRequires:       kdelibs3-devel
-%else
-BuildRequires:       kdelibs-devel
-%endif
+
+BuildRequires:       automake
+BuildRequires:       libtool
 BuildRequires:       desktop-file-utils
+BuildRequires:       gettext
 
 Requires(post):      /sbin/ldconfig 
 Requires(postun):    /sbin/ldconfig
 %if 0%{?fedora} >= 10
-Requires:            VLGothic-fonts
+Requires:            mona-fonts-VLGothic
 %else
 Requires:            fonts-japanese
 %endif
@@ -35,16 +36,23 @@
 %prep
 %setup -q
 
-%patch0 -p2 -b .link
+#%%patch0 -p2 -b .link
 %patch1 -p1 -b .cookie
 
 %{__sed} -i.soname \
-   -e 's|^kita\([\._][lL]\)|libkitamain\1|' \
-   -e 's|\([^a-zA-Z]\)kita\([\._][lL]\)|\1libkitamain\2|g' \
+   -e 's|kita_la_|libkitamain_la_|' \
+   -e 's| kita\.la| libkitamain.la|' \
    -e 's|-avoid-version||' \
-   kita/src/Makefile.in
+   kita/src/Makefile.{in,am}
+	
+
+%{__sed} -i.dsktop -e 's|Terminal=0|Terminal=false|' \
+   kita/src/kita.desktop
+
+make dist -f Makefile.cvs
 
 %build
+export LDFLAGS="-Wl,--rpath,%{_libdir}/%{name}"
 if [ %{_arch} == x86_64 -o %{_arch} == ppc64 ] ; then
    SUF=64
 else
@@ -57,16 +65,20 @@
 %configure \
     --disable-rpath \
     --enable-libsuffix=$SUF \
+    --libdir=%{_libdir}/%{name} \
     --enable-xdg-menu
 
-%{__make} %{?_smp_mflags}
+# -j2 failed
+%{__make} -j1
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
 
-%{__sed} -i -e 's|Terminal=0|Terminal=false|' \
-      %{buildroot}/%{name}.desktop
+export LDFLAGS="-Wl,--rpath,%{_libdir}/%{name}"
+%{__make} \
+   kdelnkdir=%{_datadir}/applications \
+   DESTDIR=%{buildroot} \
+   install
 
 desktop-file-install \
       --delete-original \
@@ -74,22 +86,20 @@
       --dir %{buildroot}%{_datadir}/applications \
       --add-category KDE \
       --add-category Qt \
-      %{buildroot}/%{name}.desktop
+      --remove-category Application \
+      %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 # remove unneeded files
-%{__rm} -f %{buildroot}%{_prefix}/lib*/*.{la,so}
-
-# move document files
-%{__mkdir} DOC
+find %{buildroot}%{_libdir} -name \*.so -or \*.la | xargs %{__rm} -f
 
 unlink %{buildroot}%{_datadir}/doc/HTML/en/kita/common
 ln -sf ../common %{buildroot}%{_datadir}/doc/HTML/en/kita/common
 
 # convert encoding
 for f in README README.2ch TODO ; do
-   %{__mv} ${f} ${f}.tmp
-   iconv -f EUCJP -t UTF8 ${f}.tmp > ${f} && \
-      %{__rm} -f ${f}.tmp || %{__mv} ${f}.tmp ${f}
+   iconv -f EUCJP -t UTF8 ${f} > ${f}.tmp && \
+      ( touch -r ${f} ${f}.tmp ; %{__mv} -f ${f}.tmp ${f} )
+   %{__rm} -f ${f}.tmp
 done
 
 # install mo file
@@ -113,16 +123,21 @@
 exit 0
 
 %files -f %{name}.lang
-%defattr(-, root, root)
+%defattr(-, root, root,-)
 %doc AUTHORS COPYING ChangeLog README README.2ch TODO
 %{_bindir}/*
-%{_prefix}/lib*/*.so.*
-%{_datadir}/apps/kita/
+%{_libdir}/%{name}/
+%{_datadir}/apps/%{name}/
+
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/*.png
+
 %{_datadir}/doc/HTML/en/kita/
 
 %changelog
+* Wed Sep 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.4-1
+- 0.177.4
+
 * Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-14
 - Workaround to 2ch cookie style change
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kita/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Aug 2006 11:28:39 -0000	1.2
+++ sources	16 Sep 2008 18:42:43 -0000	1.3
@@ -1 +1 @@
-7380db08c5ec321154ebba744d5609b9  kita-0.177.3.tar.gz
+0c183e1925883b165a50d88bff8380cb  kita-0.177.4.tar.gz


--- kita-0.177.3-cookie-change.patch DELETED ---



From rishi at fedoraproject.org  Tue Sep 16 18:43:52 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue, 16 Sep 2008 18:43:52 +0000 (UTC)
Subject: rpms/gnome-valgrind-session/F-8
	gnome-valgrind-session-1.1-use-gnome-session-suffix-pid.patch,
	NONE, 1.1 gnome-valgrind-session.spec, 1.1, 1.2
Message-ID: <20080916184352.E071F70138@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/gnome-valgrind-session/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18483

Modified Files:
	gnome-valgrind-session.spec 
Added Files:
	gnome-valgrind-session-1.1-use-gnome-session-suffix-pid.patch 
Log Message:
* Tue Sep 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.1-3
- Explicitly mention the PID as the suffix of the log files for all
  distributions, except Fedora 8.


gnome-valgrind-session-1.1-use-gnome-session-suffix-pid.patch:

--- NEW FILE gnome-valgrind-session-1.1-use-gnome-session-suffix-pid.patch ---
diff -urNp gnome-valgrind-session-1.1.orig/gnome-valgrind-errors gnome-valgrind-session-1.1/gnome-valgrind-errors
--- gnome-valgrind-session-1.1.orig/gnome-valgrind-errors	2008-09-16 18:11:16.904972141 +0530
+++ gnome-valgrind-session-1.1/gnome-valgrind-errors	2008-09-16 18:12:40.399972272 +0530
@@ -18,4 +18,4 @@ rm -f $SESSIONDIR/*
 export G_SLICE=always-malloc
 export G_DEBUG=gc-friendly
 
-valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=no /usr/bin/gnome
+valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX.%p --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=no /usr/bin/gnome-session
diff -urNp gnome-valgrind-session-1.1.orig/gnome-valgrind-leaks gnome-valgrind-session-1.1/gnome-valgrind-leaks
--- gnome-valgrind-session-1.1.orig/gnome-valgrind-leaks	2008-09-16 18:11:16.904972141 +0530
+++ gnome-valgrind-session-1.1/gnome-valgrind-leaks	2008-09-16 18:12:29.694972405 +0530
@@ -18,4 +18,4 @@ rm -f $SESSIONDIR/*
 export G_SLICE=always-malloc
 export G_DEBUG=gc-friendly
 
-valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=yes --show-reachable=no --leak-resolution=high /usr/bin/gnome
+valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX.%p --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=yes --show-reachable=no --leak-resolution=high /usr/bin/gnome-session


Index: gnome-valgrind-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-valgrind-session/F-8/gnome-valgrind-session.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-valgrind-session.spec	12 Sep 2008 04:24:54 -0000	1.1
+++ gnome-valgrind-session.spec	16 Sep 2008 18:43:22 -0000	1.2
@@ -1,13 +1,14 @@
 Summary:	Run an entire GNOME session under valgrind
 Name:		gnome-valgrind-session
 Version:	1.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	Public Domain
 Group:		Development/Tools
 URL:		http://hp.cl.no/proj/gnome-valgrind-session/
 Source0:	http://hp.cl.no/proj/gnome-valgrind-session/src/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-%{version}-desktop.patch
-Patch1:		%{name}-%{version}-use-gnome-session.patch
+Patch1:		%{name}-%{version}-use-gnome-session-suffix-pid.patch
+Patch2:		%{name}-%{version}-use-gnome-session.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -26,7 +27,12 @@
 %prep
 %setup -q
 %patch0 -p1
+
+%if 0%{?fc8}
+%patch2 -p1
+%else
 %patch1 -p1
+%endif
 
 %build
 
@@ -63,6 +69,10 @@
 %{_datadir}/xsessions/gnome-valgrind-leaks.desktop
 
 %changelog
+* Tue Sep 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.1-3
+- Explicitly mention the PID as the suffix of the log files for all
+  distributions, except Fedora 8.
+
 * Fri Sep 12 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.1-2
 - Removed Encoding and fixed Type value in Desktop Entry.
 



From lmacken at fedoraproject.org  Tue Sep 16 18:46:07 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue, 16 Sep 2008 18:46:07 +0000 (UTC)
Subject: rpms/python-turbojson/devel .cvsignore, 1.5,
	1.6 python-turbojson.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20080916184607.DD47F70138@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-turbojson/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18676

Modified Files:
	.cvsignore python-turbojson.spec sources 
Log Message:
* Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> 1.2.1-1
- Latest release of the 1.2.x series
- Require python-peak-rules (#459157, #459117)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbojson/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Jun 2008 17:46:22 -0000	1.5
+++ .cvsignore	16 Sep 2008 18:45:37 -0000	1.6
@@ -1 +1 @@
-TurboJson-1.2.tar.gz
+TurboJson-1.2.1.tar.gz


Index: python-turbojson.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbojson/devel/python-turbojson.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-turbojson.spec	22 Jun 2008 17:46:22 -0000	1.8
+++ python-turbojson.spec	16 Sep 2008 18:45:37 -0000	1.9
@@ -4,7 +4,7 @@
 %define module turbojson
 
 Name:           python-turbojson
-Version:        1.2
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        Python template plugin that supports json
 
@@ -18,6 +18,9 @@
 BuildRequires: python-devel
 BuildRequires: python-setuptools-devel
 
+Requires:      python-peak-rules >= 0.5a1.dev-0.2555
+Requires:      python-simplejson >= 1.9.1
+
 %description
 This package provides a template engine plugin, allowing you
 to easily use Json with TurboGears, Buffet or other systems
@@ -47,6 +50,10 @@
 
 
 %changelog
+* Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> 1.2.1-1
+- Latest release of the 1.2.x series
+- Require python-peak-rules (#459157, #459117)
+
 * Sun Jun 22 2008 Luke Macken <lmacken at redhat.com> 1.2-1
 - Latest upstream release, intended to be used with the upcoming TurboGears 1.1 version.
 - Remove python-turbojson-SAfix-r3749.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbojson/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Jun 2008 17:46:22 -0000	1.5
+++ sources	16 Sep 2008 18:45:37 -0000	1.6
@@ -1 +1 @@
-19ed791bf9871d16123292ab331ef5f2  TurboJson-1.2.tar.gz
+57fbcd25c831c53ae9d4c595233925eb  TurboJson-1.2.1.tar.gz



From rishi at fedoraproject.org  Tue Sep 16 18:49:04 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue, 16 Sep 2008 18:49:04 +0000 (UTC)
Subject: rpms/gnome-valgrind-session/F-9
	gnome-valgrind-session-1.1-use-gnome-session-suffix-pid.patch,
	NONE, 1.1 gnome-valgrind-session.spec, 1.1, 1.2
Message-ID: <20080916184904.8CB9770138@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/gnome-valgrind-session/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18983

Modified Files:
	gnome-valgrind-session.spec 
Added Files:
	gnome-valgrind-session-1.1-use-gnome-session-suffix-pid.patch 
Log Message:
* Tue Sep 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.1-3
- Explicitly mention the PID as the suffix of the log files for all
  distributions, except Fedora 8.


gnome-valgrind-session-1.1-use-gnome-session-suffix-pid.patch:

--- NEW FILE gnome-valgrind-session-1.1-use-gnome-session-suffix-pid.patch ---
diff -urNp gnome-valgrind-session-1.1.orig/gnome-valgrind-errors gnome-valgrind-session-1.1/gnome-valgrind-errors
--- gnome-valgrind-session-1.1.orig/gnome-valgrind-errors	2008-09-16 18:11:16.904972141 +0530
+++ gnome-valgrind-session-1.1/gnome-valgrind-errors	2008-09-16 18:12:40.399972272 +0530
@@ -18,4 +18,4 @@ rm -f $SESSIONDIR/*
 export G_SLICE=always-malloc
 export G_DEBUG=gc-friendly
 
-valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=no /usr/bin/gnome
+valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX.%p --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=no /usr/bin/gnome-session
diff -urNp gnome-valgrind-session-1.1.orig/gnome-valgrind-leaks gnome-valgrind-session-1.1/gnome-valgrind-leaks
--- gnome-valgrind-session-1.1.orig/gnome-valgrind-leaks	2008-09-16 18:11:16.904972141 +0530
+++ gnome-valgrind-session-1.1/gnome-valgrind-leaks	2008-09-16 18:12:29.694972405 +0530
@@ -18,4 +18,4 @@ rm -f $SESSIONDIR/*
 export G_SLICE=always-malloc
 export G_DEBUG=gc-friendly
 
-valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=yes --show-reachable=no --leak-resolution=high /usr/bin/gnome
+valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX.%p --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=yes --show-reachable=no --leak-resolution=high /usr/bin/gnome-session


Index: gnome-valgrind-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-valgrind-session/F-9/gnome-valgrind-session.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-valgrind-session.spec	12 Sep 2008 04:28:21 -0000	1.1
+++ gnome-valgrind-session.spec	16 Sep 2008 18:48:34 -0000	1.2
@@ -1,13 +1,14 @@
 Summary:	Run an entire GNOME session under valgrind
 Name:		gnome-valgrind-session
 Version:	1.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	Public Domain
 Group:		Development/Tools
 URL:		http://hp.cl.no/proj/gnome-valgrind-session/
 Source0:	http://hp.cl.no/proj/gnome-valgrind-session/src/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-%{version}-desktop.patch
-Patch1:		%{name}-%{version}-use-gnome-session.patch
+Patch1:		%{name}-%{version}-use-gnome-session-suffix-pid.patch
+Patch2:		%{name}-%{version}-use-gnome-session.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -26,7 +27,12 @@
 %prep
 %setup -q
 %patch0 -p1
+
+%if 0%{?fc8}
+%patch2 -p1
+%else
 %patch1 -p1
+%endif
 
 %build
 
@@ -63,6 +69,10 @@
 %{_datadir}/xsessions/gnome-valgrind-leaks.desktop
 
 %changelog
+* Tue Sep 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.1-3
+- Explicitly mention the PID as the suffix of the log files for all
+  distributions, except Fedora 8.
+
 * Fri Sep 12 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.1-2
 - Removed Encoding and fixed Type value in Desktop Entry.
 



From mpg at fedoraproject.org  Tue Sep 16 18:51:34 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Tue, 16 Sep 2008 18:51:34 +0000 (UTC)
Subject: rpms/sugar-toolkit/OLPC-3 .cvsignore, 1.14, 1.15 sources, 1.15,
	1.16 sugar-toolkit.spec, 1.19, 1.20
Message-ID: <20080916185134.B905B70138@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-toolkit/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19235

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Tue Sep 16 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-1
- Fix a crash when we cannot access the alsa device




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	13 Sep 2008 18:16:26 -0000	1.14
+++ .cvsignore	16 Sep 2008 18:51:04 -0000	1.15
@@ -1 +1 @@
-sugar-toolkit-0.82.7.tar.bz2
+sugar-toolkit-0.82.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	13 Sep 2008 18:16:27 -0000	1.15
+++ sources	16 Sep 2008 18:51:04 -0000	1.16
@@ -1 +1 @@
-2e83dd9497f29f83c731e78e6016d084  sugar-toolkit-0.82.7.tar.bz2
+ce1a33591f0242bf815e3cfa06ee62c9  sugar-toolkit-0.82.6.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sugar-toolkit.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sugar-toolkit.spec	13 Sep 2008 18:16:27 -0000	1.19
+++ sugar-toolkit.spec	16 Sep 2008 18:51:04 -0000	1.20
@@ -5,7 +5,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.82.7
+Version: 0.82.8
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
@@ -66,6 +66,9 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Tue Sep 16 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-1
+- Fix a crash when we cannot access the alsa device
+
 * Sat Sep 13 2008 Simon Schampijer <simon at laptop.org> - 0.82.7-1
 - #8375 gst usage in the shell wastes 2.6mb
 - #8394 sugar shell leaks presence service info



From rishi at fedoraproject.org  Tue Sep 16 18:54:29 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue, 16 Sep 2008 18:54:29 +0000 (UTC)
Subject: rpms/gnome-valgrind-session/devel
	gnome-valgrind-session-1.1-use-gnome-session-suffix-pid.patch,
	NONE, 1.1 gnome-valgrind-session.spec, 1.1, 1.2
Message-ID: <20080916185429.9096870138@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/gnome-valgrind-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19918

Modified Files:
	gnome-valgrind-session.spec 
Added Files:
	gnome-valgrind-session-1.1-use-gnome-session-suffix-pid.patch 
Log Message:
* Tue Sep 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.1-3
- Explicitly mention the PID as the suffix of the log files for all
  distributions, except Fedora 8.


gnome-valgrind-session-1.1-use-gnome-session-suffix-pid.patch:

--- NEW FILE gnome-valgrind-session-1.1-use-gnome-session-suffix-pid.patch ---
diff -urNp gnome-valgrind-session-1.1.orig/gnome-valgrind-errors gnome-valgrind-session-1.1/gnome-valgrind-errors
--- gnome-valgrind-session-1.1.orig/gnome-valgrind-errors	2008-09-16 18:11:16.904972141 +0530
+++ gnome-valgrind-session-1.1/gnome-valgrind-errors	2008-09-16 18:12:40.399972272 +0530
@@ -18,4 +18,4 @@ rm -f $SESSIONDIR/*
 export G_SLICE=always-malloc
 export G_DEBUG=gc-friendly
 
-valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=no /usr/bin/gnome
+valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX.%p --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=no /usr/bin/gnome-session
diff -urNp gnome-valgrind-session-1.1.orig/gnome-valgrind-leaks gnome-valgrind-session-1.1/gnome-valgrind-leaks
--- gnome-valgrind-session-1.1.orig/gnome-valgrind-leaks	2008-09-16 18:11:16.904972141 +0530
+++ gnome-valgrind-session-1.1/gnome-valgrind-leaks	2008-09-16 18:12:29.694972405 +0530
@@ -18,4 +18,4 @@ rm -f $SESSIONDIR/*
 export G_SLICE=always-malloc
 export G_DEBUG=gc-friendly
 
-valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=yes --show-reachable=no --leak-resolution=high /usr/bin/gnome
+valgrind -q --log-file=$SESSIONDIR/$OUTPREFIX.%p --error-limit=no --trace-children=yes --alignment=8 --num-callers=32 --undef-value-errors=no --leak-check=yes --show-reachable=no --leak-resolution=high /usr/bin/gnome-session


Index: gnome-valgrind-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-valgrind-session/devel/gnome-valgrind-session.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-valgrind-session.spec	12 Sep 2008 04:32:25 -0000	1.1
+++ gnome-valgrind-session.spec	16 Sep 2008 18:53:59 -0000	1.2
@@ -1,13 +1,14 @@
 Summary:	Run an entire GNOME session under valgrind
 Name:		gnome-valgrind-session
 Version:	1.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	Public Domain
 Group:		Development/Tools
 URL:		http://hp.cl.no/proj/gnome-valgrind-session/
 Source0:	http://hp.cl.no/proj/gnome-valgrind-session/src/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-%{version}-desktop.patch
-Patch1:		%{name}-%{version}-use-gnome-session.patch
+Patch1:		%{name}-%{version}-use-gnome-session-suffix-pid.patch
+Patch2:		%{name}-%{version}-use-gnome-session.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -26,7 +27,12 @@
 %prep
 %setup -q
 %patch0 -p1
+
+%if 0%{?fc8}
+%patch2 -p1
+%else
 %patch1 -p1
+%endif
 
 %build
 
@@ -63,6 +69,10 @@
 %{_datadir}/xsessions/gnome-valgrind-leaks.desktop
 
 %changelog
+* Tue Sep 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.1-3
+- Explicitly mention the PID as the suffix of the log files for all
+  distributions, except Fedora 8.
+
 * Fri Sep 12 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.1-2
 - Removed Encoding and fixed Type value in Desktop Entry.
 



From mpg at fedoraproject.org  Tue Sep 16 18:55:15 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Tue, 16 Sep 2008 18:55:15 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel sources, 1.17, 1.18 sugar-toolkit.spec,
	1.22, 1.23
Message-ID: <20080916185515.6F8177013A@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20057

Modified Files:
	sources sugar-toolkit.spec 
Log Message:
* Tue Sep 16 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-1
- Fix a crash when we cannot access the alsa device




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	13 Sep 2008 19:12:34 -0000	1.17
+++ sources	16 Sep 2008 18:54:45 -0000	1.18
@@ -1 +1 @@
-2e83dd9497f29f83c731e78e6016d084  sugar-toolkit-0.82.7.tar.bz2
+ce1a33591f0242bf815e3cfa06ee62c9  sugar-toolkit-0.82.6.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sugar-toolkit.spec	13 Sep 2008 19:12:34 -0000	1.22
+++ sugar-toolkit.spec	16 Sep 2008 18:54:45 -0000	1.23
@@ -5,7 +5,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.82.7
+Version: 0.82.8
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
@@ -68,6 +68,9 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Tue Sep 16 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-1
+- Fix a crash when we cannot access the alsa device
+
 * Sat Sep 13 2008 Simon Schampijer <simon at laptop.org> - 0.82.7-1
 - #8375 gst usage in the shell wastes 2.6mb                                                                               
 - #8394 sugar shell leaks presence service info                                                          



From lutter at fedoraproject.org  Tue Sep 16 19:00:10 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:00:10 +0000 (UTC)
Subject: rpms/rubygem-activesupport/EL-5 .cvsignore, 1.4,
	1.5 rubygem-activesupport.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20080916190010.33FA970138@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activesupport/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21244/EL-5

Modified Files:
	.cvsignore rubygem-activesupport.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activesupport/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Apr 2008 18:59:47 -0000	1.4
+++ .cvsignore	16 Sep 2008 18:59:39 -0000	1.5
@@ -1 +1 @@
-activesupport-2.0.2.gem
+activesupport-2.1.1.gem







From lutter at fedoraproject.org  Tue Sep 16 19:00:10 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:00:10 +0000 (UTC)
Subject: rpms/rubygem-activesupport/F-8 .cvsignore, 1.4,
	1.5 rubygem-activesupport.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20080916190010.5967F70138@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activesupport/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21244/F-8

Modified Files:
	.cvsignore rubygem-activesupport.spec sources 
Log Message:
New version (fixes CVE-2008-4094)









From lutter at fedoraproject.org  Tue Sep 16 19:00:10 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:00:10 +0000 (UTC)
Subject: rpms/rubygem-activesupport/devel .cvsignore, 1.5,
	1.6 rubygem-activesupport.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20080916190010.C6F7970138@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activesupport/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21244/devel

Modified Files:
	.cvsignore rubygem-activesupport.spec sources 
Log Message:
New version (fixes CVE-2008-4094)









From lutter at fedoraproject.org  Tue Sep 16 19:00:10 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:00:10 +0000 (UTC)
Subject: rpms/rubygem-activesupport/F-9 .cvsignore, 1.4,
	1.5 rubygem-activesupport.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20080916190010.8E59170138@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activesupport/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21244/F-9

Modified Files:
	.cvsignore rubygem-activesupport.spec sources 
Log Message:
New version (fixes CVE-2008-4094)









From rdieter at fedoraproject.org  Tue Sep 16 19:03:11 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 16 Sep 2008 19:03:11 +0000 (UTC)
Subject: rpms/poppler/devel poppler.spec,1.75,1.76
Message-ID: <20080916190311.94D1670138@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21719

Modified Files:
	poppler.spec 
Log Message:
* Tue Sep 16 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.8.7-2
- cleanup qt3 hack
- %description cosmetics



Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- poppler.spec	7 Sep 2008 20:51:57 -0000	1.75
+++ poppler.spec	16 Sep 2008 19:02:41 -0000	1.76
@@ -3,7 +3,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.8.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and Redistributable, no modification permitted
 # the code is GPLv2
 # the charmap data in /usr/share/poppler is redistributable
@@ -30,9 +30,6 @@
 Requires: pkgconfig
 
 %description devel
-Poppler, a PDF rendering library, is a fork of the xpdf PDF
-viewer developed by Derek Noonburg of Glyph and Cog, LLC.
-
 You should install the poppler-devel package if you would like to
 compile applications based on poppler.
 
@@ -49,7 +46,6 @@
 Group: Development/Libraries
 Requires: %{name}-glib = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
-Requires: pkgconfig
 Requires: gtk-doc
 
 %description glib-devel
@@ -57,14 +53,14 @@
 
 
 %package qt
-Summary: Qt wrapper for poppler
+Summary: Qt3 wrapper for poppler
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 %description qt
 %{summary}.
 
 %package qt-devel
-Summary: Development files for Qt wrapper
+Summary: Development files for Qt3 wrapper
 Group:   Development/Libraries
 Requires: %{name}-qt = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
@@ -116,8 +112,8 @@
 
 %build
 pushd %{name}-%{version}
-# despair
-sed -i s/qt3/qt-3.3/g configure
+# can use in a pinch, but isn't necessary (in general) -- Rex 
+unset QTDIR && . /etc/profile.d/qt.sh
 %configure \
   --disable-static \
   --enable-cairo-output \
@@ -199,6 +195,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Sep 16 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.8.7-2
+- cleanup qt3 hack
+- %%description cosmetics
+
 * Sun Sep  7 2008 Matthias Clasen <mclasen at redhat.com> - 0.8.7-1
 - Update to 0.8.7
 



From mdomsch at fedoraproject.org  Tue Sep 16 19:08:09 2008
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue, 16 Sep 2008 19:08:09 +0000 (UTC)
Subject: rpms/ht2html/devel ht2html.spec,1.4,1.5
Message-ID: <20080916190809.68DCB7013C@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/ht2html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22825

Modified Files:
	ht2html.spec 
Log Message:
BR python, fixes FTBFS BZ#440916


Index: ht2html.spec
===================================================================
RCS file: /cvs/extras/rpms/ht2html/devel/ht2html.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ht2html.spec	31 Jul 2008 17:23:45 -0000	1.4
+++ ht2html.spec	16 Sep 2008 19:07:39 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		ht2html
 Version:	2.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 URL:		http://ht2html.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Source1:	%{name}
@@ -10,7 +10,8 @@
 Summary:	The www.python.org Web site generator
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
-Requires:	python
+BuildRequires:  python
+Requires:  python
 
 %description
 The www.python.org Web site generator.
@@ -56,6 +57,9 @@
 %{_bindir}/*
 
 %changelog
+* Tue Sep 16 2008 Matt Domsch <mdomsch at fedoraproject.org> - 2.0-7
+- BR python, fixes FTBFS BZ#440916
+
 * Thu Jul 31 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0-6
 - fix license tag
 



From mpg at fedoraproject.org  Tue Sep 16 19:08:32 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Tue, 16 Sep 2008 19:08:32 +0000 (UTC)
Subject: rpms/sugar-toolkit/OLPC-3 .cvsignore, 1.15, 1.16 sources, 1.16,
	1.17 sugar-toolkit.spec, 1.20, 1.21
Message-ID: <20080916190832.A78BE7013C@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-toolkit/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22867

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
Forgot to add the source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	16 Sep 2008 18:51:04 -0000	1.15
+++ .cvsignore	16 Sep 2008 19:08:02 -0000	1.16
@@ -1 +1 @@
-sugar-toolkit-0.82.6.tar.bz2
+sugar-toolkit-0.82.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	16 Sep 2008 18:51:04 -0000	1.16
+++ sources	16 Sep 2008 19:08:02 -0000	1.17
@@ -1 +1 @@
-ce1a33591f0242bf815e3cfa06ee62c9  sugar-toolkit-0.82.6.tar.bz2
+ba9eff3f2f45c871b65ca3f37ffff3a0  sugar-toolkit-0.82.8.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sugar-toolkit.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sugar-toolkit.spec	16 Sep 2008 18:51:04 -0000	1.20
+++ sugar-toolkit.spec	16 Sep 2008 19:08:02 -0000	1.21
@@ -6,7 +6,7 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.82.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -66,7 +66,7 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
-* Tue Sep 16 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-1
+* Tue Sep 16 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-2
 - Fix a crash when we cannot access the alsa device
 
 * Sat Sep 13 2008 Simon Schampijer <simon at laptop.org> - 0.82.7-1



From lutter at fedoraproject.org  Tue Sep 16 19:09:56 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:09:56 +0000 (UTC)
Subject: rpms/rubygem-activesupport/EL-5 rubygem-activesupport.spec,1.4,1.5
Message-ID: <20080916190956.9B8BC7013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activesupport/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23025/EL-5

Modified Files:
	rubygem-activesupport.spec 
Log Message:
New version (fixes CVE-2008-4094)


Index: rubygem-activesupport.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activesupport/EL-5/rubygem-activesupport.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rubygem-activesupport.spec	16 Sep 2008 18:59:39 -0000	1.4
+++ rubygem-activesupport.spec	16 Sep 2008 19:09:26 -0000	1.5
@@ -59,6 +59,9 @@
 * Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
 - New version (fixes CVE-2008-4094)
 
+* Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
+- New Upstream
+
 * Mon Apr 07 2008 David Lutterkort <dlutter at redhat.com> - 2.0.2-1
 - New version
 



From lutter at fedoraproject.org  Tue Sep 16 19:09:56 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:09:56 +0000 (UTC)
Subject: rpms/rubygem-activesupport/F-8 rubygem-activesupport.spec,1.5,1.6
Message-ID: <20080916190956.C8FA07013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activesupport/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23025/F-8

Modified Files:
	rubygem-activesupport.spec 
Log Message:
New version (fixes CVE-2008-4094)


Index: rubygem-activesupport.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activesupport/F-8/rubygem-activesupport.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-activesupport.spec	16 Sep 2008 18:59:40 -0000	1.5
+++ rubygem-activesupport.spec	16 Sep 2008 19:09:26 -0000	1.6
@@ -59,6 +59,9 @@
 * Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
 - New version (fixes CVE-2008-4094)
 
+* Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
+- New Upstream
+
 * Mon Apr 07 2008 David Lutterkort <dlutter at redhat.com> - 2.0.2-1
 - New version
 



From lutter at fedoraproject.org  Tue Sep 16 19:09:57 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:09:57 +0000 (UTC)
Subject: rpms/rubygem-activesupport/devel rubygem-activesupport.spec, 1.5,
	1.6
Message-ID: <20080916190957.328E67013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activesupport/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23025/devel

Modified Files:
	rubygem-activesupport.spec 
Log Message:
New version (fixes CVE-2008-4094)


Index: rubygem-activesupport.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activesupport/devel/rubygem-activesupport.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-activesupport.spec	16 Sep 2008 18:59:40 -0000	1.5
+++ rubygem-activesupport.spec	16 Sep 2008 19:09:27 -0000	1.6
@@ -59,6 +59,9 @@
 * Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
 - New version (fixes CVE-2008-4094)
 
+* Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
+- New Upstream
+
 * Mon Apr 07 2008 David Lutterkort <dlutter at redhat.com> - 2.0.2-1
 - New version
 



From lutter at fedoraproject.org  Tue Sep 16 19:09:57 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:09:57 +0000 (UTC)
Subject: rpms/rubygem-activesupport/F-9 rubygem-activesupport.spec,1.5,1.6
Message-ID: <20080916190957.028147013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activesupport/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23025/F-9

Modified Files:
	rubygem-activesupport.spec 
Log Message:
New version (fixes CVE-2008-4094)


Index: rubygem-activesupport.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activesupport/F-9/rubygem-activesupport.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-activesupport.spec	16 Sep 2008 18:59:40 -0000	1.5
+++ rubygem-activesupport.spec	16 Sep 2008 19:09:26 -0000	1.6
@@ -59,6 +59,9 @@
 * Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
 - New version (fixes CVE-2008-4094)
 
+* Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
+- New Upstream
+
 * Mon Apr 07 2008 David Lutterkort <dlutter at redhat.com> - 2.0.2-1
 - New version
 



From lutter at fedoraproject.org  Tue Sep 16 19:10:33 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:10:33 +0000 (UTC)
Subject: rpms/rubygem-activerecord/F-8 .cvsignore, 1.4,
	1.5 rubygem-activerecord.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20080916191033.10D8B7013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activerecord/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23215/F-8

Modified Files:
	.cvsignore rubygem-activerecord.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Apr 2008 18:53:45 -0000	1.4
+++ .cvsignore	16 Sep 2008 19:10:02 -0000	1.5
@@ -1 +1 @@
-activerecord-2.0.2.gem
+activerecord-2.1.1.gem


Index: rubygem-activerecord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/F-8/rubygem-activerecord.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-activerecord.spec	1 Aug 2008 03:20:02 -0000	1.5
+++ rubygem-activerecord.spec	16 Sep 2008 19:10:02 -0000	1.6
@@ -6,7 +6,7 @@
 
 Summary: Implements the ActiveRecord pattern for ORM
 Name: rubygem-%{gemname}
-Version: 2.1.0
+Version: 2.1.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-2
+- New version (fixes CVE-2008-4094)
+
 * Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
 - New Upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2008 03:20:02 -0000	1.5
+++ sources	16 Sep 2008 19:10:02 -0000	1.6
@@ -1 +1 @@
-66395b3f6692dc8135df1c39fc523713  activerecord-2.1.0.gem
+cd6587eed1b0dc7b559b469eef5b8647  activerecord-2.1.1.gem



From lutter at fedoraproject.org  Tue Sep 16 19:10:33 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:10:33 +0000 (UTC)
Subject: rpms/rubygem-activerecord/F-9 .cvsignore, 1.4,
	1.5 rubygem-activerecord.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20080916191033.52C277013E@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activerecord/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23215/F-9

Modified Files:
	.cvsignore rubygem-activerecord.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Apr 2008 18:53:55 -0000	1.4
+++ .cvsignore	16 Sep 2008 19:10:03 -0000	1.5
@@ -1 +1 @@
-activerecord-2.0.2.gem
+activerecord-2.1.1.gem


Index: rubygem-activerecord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/F-9/rubygem-activerecord.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-activerecord.spec	1 Aug 2008 03:20:03 -0000	1.5
+++ rubygem-activerecord.spec	16 Sep 2008 19:10:03 -0000	1.6
@@ -6,7 +6,7 @@
 
 Summary: Implements the ActiveRecord pattern for ORM
 Name: rubygem-%{gemname}
-Version: 2.1.0
+Version: 2.1.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-2
+- New version (fixes CVE-2008-4094)
+
 * Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
 - New Upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2008 03:20:03 -0000	1.5
+++ sources	16 Sep 2008 19:10:03 -0000	1.6
@@ -1 +1 @@
-66395b3f6692dc8135df1c39fc523713  activerecord-2.1.0.gem
+cd6587eed1b0dc7b559b469eef5b8647  activerecord-2.1.1.gem



From lutter at fedoraproject.org  Tue Sep 16 19:10:33 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:10:33 +0000 (UTC)
Subject: rpms/rubygem-activerecord/devel .cvsignore, 1.5,
	1.6 rubygem-activerecord.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20080916191033.8F4FD7013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activerecord/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23215/devel

Modified Files:
	.cvsignore rubygem-activerecord.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Aug 2008 03:20:03 -0000	1.5
+++ .cvsignore	16 Sep 2008 19:10:03 -0000	1.6
@@ -1 +1 @@
-activerecord-2.1.0.gem
+activerecord-2.1.1.gem


Index: rubygem-activerecord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/devel/rubygem-activerecord.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-activerecord.spec	1 Aug 2008 03:20:03 -0000	1.5
+++ rubygem-activerecord.spec	16 Sep 2008 19:10:03 -0000	1.6
@@ -6,7 +6,7 @@
 
 Summary: Implements the ActiveRecord pattern for ORM
 Name: rubygem-%{gemname}
-Version: 2.1.0
+Version: 2.1.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-2
+- New version (fixes CVE-2008-4094)
+
 * Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
 - New Upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2008 03:20:03 -0000	1.5
+++ sources	16 Sep 2008 19:10:03 -0000	1.6
@@ -1 +1 @@
-66395b3f6692dc8135df1c39fc523713  activerecord-2.1.0.gem
+cd6587eed1b0dc7b559b469eef5b8647  activerecord-2.1.1.gem



From lutter at fedoraproject.org  Tue Sep 16 19:10:32 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:10:32 +0000 (UTC)
Subject: rpms/rubygem-activerecord/EL-5 .cvsignore, 1.4,
	1.5 rubygem-activerecord.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20080916191032.C5AD87013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activerecord/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23215/EL-5

Modified Files:
	.cvsignore rubygem-activerecord.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Apr 2008 18:53:55 -0000	1.4
+++ .cvsignore	16 Sep 2008 19:10:02 -0000	1.5
@@ -1 +1 @@
-activerecord-2.0.2.gem
+activerecord-2.1.1.gem


Index: rubygem-activerecord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/EL-5/rubygem-activerecord.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rubygem-activerecord.spec	8 Apr 2008 16:24:39 -0000	1.4
+++ rubygem-activerecord.spec	16 Sep 2008 19:10:02 -0000	1.5
@@ -6,8 +6,8 @@
 
 Summary: Implements the ActiveRecord pattern for ORM
 Name: rubygem-%{gemname}
-Version: 2.0.2
-Release: 2%{?dist}
+Version: 2.1.1
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -57,6 +57,12 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-2
+- New version (fixes CVE-2008-4094)
+
+* Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
+- New Upstream
+
 * Tue Apr  8 2008 David Lutterkort <dlutter at redhat.com> - 2.0.2-2
 - Fix dependency
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Apr 2008 18:53:55 -0000	1.4
+++ sources	16 Sep 2008 19:10:02 -0000	1.5
@@ -1 +1 @@
-94fda9905ee1ff4f070d5b93b0606fbf  activerecord-2.0.2.gem
+cd6587eed1b0dc7b559b469eef5b8647  activerecord-2.1.1.gem



From lutter at fedoraproject.org  Tue Sep 16 19:11:09 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:11:09 +0000 (UTC)
Subject: rpms/rubygem-actionpack/devel .cvsignore, 1.5,
	1.6 rubygem-actionpack.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20080916191109.CFFAE7013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-actionpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23297/devel

Modified Files:
	.cvsignore rubygem-actionpack.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Aug 2008 02:57:05 -0000	1.5
+++ .cvsignore	16 Sep 2008 19:10:39 -0000	1.6
@@ -1 +1 @@
-actionpack-2.1.0.gem
+actionpack-2.1.1.gem


Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/devel/rubygem-actionpack.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-actionpack.spec	1 Aug 2008 02:58:43 -0000	1.5
+++ rubygem-actionpack.spec	16 Sep 2008 19:10:39 -0000	1.6
@@ -6,7 +6,7 @@
 
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gemname}
-Version: 2.1.0
+Version: 2.1.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -57,9 +57,12 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
+- New version (fixes CVE-2008-4094)
+
 * Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
 - New Upstream
- 
+
 * Tue Apr  8 2008 David Lutterkort <dlutter at redhat.com> - 2.0.2-2
 - Fix dependency
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2008 02:57:05 -0000	1.5
+++ sources	16 Sep 2008 19:10:39 -0000	1.6
@@ -1 +1 @@
-0326687a617b4871bc21783bc983ad45  actionpack-2.1.0.gem
+b26ef2136ec19dcd5dbc22d27bdbb884  actionpack-2.1.1.gem



From lutter at fedoraproject.org  Tue Sep 16 19:11:09 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:11:09 +0000 (UTC)
Subject: rpms/rubygem-actionpack/F-9 .cvsignore, 1.4,
	1.5 rubygem-actionpack.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20080916191109.7C0267013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-actionpack/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23297/F-9

Modified Files:
	.cvsignore rubygem-actionpack.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Apr 2008 18:58:21 -0000	1.4
+++ .cvsignore	16 Sep 2008 19:10:39 -0000	1.5
@@ -1 +1 @@
-actionpack-2.0.2.gem
+actionpack-2.1.1.gem


Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/F-9/rubygem-actionpack.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-actionpack.spec	1 Aug 2008 02:58:43 -0000	1.5
+++ rubygem-actionpack.spec	16 Sep 2008 19:10:39 -0000	1.6
@@ -6,7 +6,7 @@
 
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gemname}
-Version: 2.1.0
+Version: 2.1.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -57,9 +57,12 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
+- New version (fixes CVE-2008-4094)
+
 * Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
 - New Upstream
- 
+
 * Tue Apr  8 2008 David Lutterkort <dlutter at redhat.com> - 2.0.2-2
 - Fix dependency
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2008 02:57:05 -0000	1.5
+++ sources	16 Sep 2008 19:10:39 -0000	1.6
@@ -1 +1 @@
-0326687a617b4871bc21783bc983ad45  actionpack-2.1.0.gem
+b26ef2136ec19dcd5dbc22d27bdbb884  actionpack-2.1.1.gem



From lutter at fedoraproject.org  Tue Sep 16 19:11:09 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:11:09 +0000 (UTC)
Subject: rpms/rubygem-actionpack/F-8 .cvsignore, 1.4,
	1.5 rubygem-actionpack.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20080916191109.41D247013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-actionpack/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23297/F-8

Modified Files:
	.cvsignore rubygem-actionpack.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Apr 2008 18:58:12 -0000	1.4
+++ .cvsignore	16 Sep 2008 19:10:38 -0000	1.5
@@ -1 +1 @@
-actionpack-2.0.2.gem
+actionpack-2.1.1.gem


Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/F-8/rubygem-actionpack.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-actionpack.spec	1 Aug 2008 02:58:42 -0000	1.5
+++ rubygem-actionpack.spec	16 Sep 2008 19:10:39 -0000	1.6
@@ -6,7 +6,7 @@
 
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gemname}
-Version: 2.1.0
+Version: 2.1.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -57,9 +57,12 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
+- New version (fixes CVE-2008-4094)
+
 * Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
 - New Upstream
- 
+
 * Tue Apr  8 2008 David Lutterkort <dlutter at redhat.com> - 2.0.2-2
 - Fix dependency
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2008 02:57:04 -0000	1.5
+++ sources	16 Sep 2008 19:10:39 -0000	1.6
@@ -1 +1 @@
-0326687a617b4871bc21783bc983ad45  actionpack-2.1.0.gem
+b26ef2136ec19dcd5dbc22d27bdbb884  actionpack-2.1.1.gem



From lutter at fedoraproject.org  Tue Sep 16 19:11:09 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:11:09 +0000 (UTC)
Subject: rpms/rubygem-actionpack/EL-5 .cvsignore, 1.4,
	1.5 rubygem-actionpack.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20080916191109.017777013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-actionpack/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23297/EL-5

Modified Files:
	.cvsignore rubygem-actionpack.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Apr 2008 18:58:21 -0000	1.4
+++ .cvsignore	16 Sep 2008 19:10:38 -0000	1.5
@@ -1 +1 @@
-actionpack-2.0.2.gem
+actionpack-2.1.1.gem


Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/EL-5/rubygem-actionpack.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rubygem-actionpack.spec	8 Apr 2008 16:25:34 -0000	1.4
+++ rubygem-actionpack.spec	16 Sep 2008 19:10:38 -0000	1.5
@@ -6,8 +6,8 @@
 
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gemname}
-Version: 2.0.2
-Release: 2%{?dist}
+Version: 2.1.1
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -57,6 +57,12 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
+- New version (fixes CVE-2008-4094)
+
+* Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
+- New Upstream
+
 * Tue Apr  8 2008 David Lutterkort <dlutter at redhat.com> - 2.0.2-2
 - Fix dependency
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Apr 2008 18:58:21 -0000	1.4
+++ sources	16 Sep 2008 19:10:38 -0000	1.5
@@ -1 +1 @@
-e5ea499e95c2d5e23abef26a8666f2c9  actionpack-2.0.2.gem
+b26ef2136ec19dcd5dbc22d27bdbb884  actionpack-2.1.1.gem



From lutter at fedoraproject.org  Tue Sep 16 19:11:45 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:11:45 +0000 (UTC)
Subject: rpms/rubygem-actionmailer/F-8 .cvsignore, 1.4,
	1.5 rubygem-actionmailer.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20080916191145.C379D7013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-actionmailer/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23369/F-8

Modified Files:
	.cvsignore rubygem-actionmailer.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Apr 2008 18:56:43 -0000	1.4
+++ .cvsignore	16 Sep 2008 19:11:15 -0000	1.5
@@ -1 +1 @@
-actionmailer-2.0.2.gem
+actionmailer-2.1.1.gem


Index: rubygem-actionmailer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/F-8/rubygem-actionmailer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-actionmailer.spec	1 Aug 2008 03:09:01 -0000	1.5
+++ rubygem-actionmailer.spec	16 Sep 2008 19:11:15 -0000	1.6
@@ -6,7 +6,7 @@
 
 Summary: Service layer for easy email delivery and testing
 Name: rubygem-%{gemname}
-Version: 2.1.0
+Version: 2.1.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
+- New version (fixes CVE-2008-4094)
+
 * Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
 - New Upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2008 03:09:01 -0000	1.5
+++ sources	16 Sep 2008 19:11:15 -0000	1.6
@@ -1 +1 @@
-fe6c2b87a58aae93c8a182980141c5ea  actionmailer-2.1.0.gem
+91bc4faacc5522d61662c5fd7ccc1e21  actionmailer-2.1.1.gem



From lutter at fedoraproject.org  Tue Sep 16 19:11:46 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:11:46 +0000 (UTC)
Subject: rpms/rubygem-actionmailer/F-9 .cvsignore, 1.4,
	1.5 rubygem-actionmailer.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20080916191146.111E97013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-actionmailer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23369/F-9

Modified Files:
	.cvsignore rubygem-actionmailer.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Apr 2008 18:56:50 -0000	1.4
+++ .cvsignore	16 Sep 2008 19:11:15 -0000	1.5
@@ -1 +1 @@
-actionmailer-2.0.2.gem
+actionmailer-2.1.1.gem


Index: rubygem-actionmailer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/F-9/rubygem-actionmailer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-actionmailer.spec	1 Aug 2008 03:09:01 -0000	1.5
+++ rubygem-actionmailer.spec	16 Sep 2008 19:11:15 -0000	1.6
@@ -6,7 +6,7 @@
 
 Summary: Service layer for easy email delivery and testing
 Name: rubygem-%{gemname}
-Version: 2.1.0
+Version: 2.1.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
+- New version (fixes CVE-2008-4094)
+
 * Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
 - New Upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2008 03:09:01 -0000	1.5
+++ sources	16 Sep 2008 19:11:15 -0000	1.6
@@ -1 +1 @@
-fe6c2b87a58aae93c8a182980141c5ea  actionmailer-2.1.0.gem
+91bc4faacc5522d61662c5fd7ccc1e21  actionmailer-2.1.1.gem



From lutter at fedoraproject.org  Tue Sep 16 19:11:46 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:11:46 +0000 (UTC)
Subject: rpms/rubygem-actionmailer/devel .cvsignore, 1.5,
	1.6 rubygem-actionmailer.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20080916191146.4F2E57013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-actionmailer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23369/devel

Modified Files:
	.cvsignore rubygem-actionmailer.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Aug 2008 03:09:02 -0000	1.5
+++ .cvsignore	16 Sep 2008 19:11:16 -0000	1.6
@@ -1 +1 @@
-actionmailer-2.1.0.gem
+actionmailer-2.1.1.gem


Index: rubygem-actionmailer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/devel/rubygem-actionmailer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-actionmailer.spec	1 Aug 2008 03:09:02 -0000	1.5
+++ rubygem-actionmailer.spec	16 Sep 2008 19:11:16 -0000	1.6
@@ -6,7 +6,7 @@
 
 Summary: Service layer for easy email delivery and testing
 Name: rubygem-%{gemname}
-Version: 2.1.0
+Version: 2.1.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
+- New version (fixes CVE-2008-4094)
+
 * Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
 - New Upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2008 03:09:02 -0000	1.5
+++ sources	16 Sep 2008 19:11:16 -0000	1.6
@@ -1 +1 @@
-fe6c2b87a58aae93c8a182980141c5ea  actionmailer-2.1.0.gem
+91bc4faacc5522d61662c5fd7ccc1e21  actionmailer-2.1.1.gem



From lutter at fedoraproject.org  Tue Sep 16 19:11:45 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:11:45 +0000 (UTC)
Subject: rpms/rubygem-actionmailer/EL-5 .cvsignore, 1.4,
	1.5 rubygem-actionmailer.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20080916191145.8173F7013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-actionmailer/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23369/EL-5

Modified Files:
	.cvsignore rubygem-actionmailer.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Apr 2008 18:56:50 -0000	1.4
+++ .cvsignore	16 Sep 2008 19:11:15 -0000	1.5
@@ -1 +1 @@
-actionmailer-2.0.2.gem
+actionmailer-2.1.1.gem


Index: rubygem-actionmailer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/EL-5/rubygem-actionmailer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rubygem-actionmailer.spec	8 Apr 2008 16:26:37 -0000	1.4
+++ rubygem-actionmailer.spec	16 Sep 2008 19:11:15 -0000	1.5
@@ -6,8 +6,8 @@
 
 Summary: Service layer for easy email delivery and testing
 Name: rubygem-%{gemname}
-Version: 2.0.2
-Release: 2%{?dist}
+Version: 2.1.1
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -52,6 +52,12 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
+- New version (fixes CVE-2008-4094)
+
+* Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
+- New Upstream
+
 * Tue Apr  8 2008 David Lutterkort <dlutter at redhat.com> - 2.0.2-2
 - Fix dependency
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Apr 2008 18:56:50 -0000	1.4
+++ sources	16 Sep 2008 19:11:15 -0000	1.5
@@ -1 +1 @@
-04ccdf0f70f2c9a76b15bc64690ce9a4  actionmailer-2.0.2.gem
+91bc4faacc5522d61662c5fd7ccc1e21  actionmailer-2.1.1.gem



From mpg at fedoraproject.org  Tue Sep 16 19:11:51 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Tue, 16 Sep 2008 19:11:51 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.15, 1.16 sources, 1.18,
	1.19 sugar-toolkit.spec, 1.23, 1.24
Message-ID: <20080916191151.8068C7013C@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23424

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
Forgot to add the source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	13 Sep 2008 19:12:34 -0000	1.15
+++ .cvsignore	16 Sep 2008 19:11:21 -0000	1.16
@@ -1 +1 @@
-sugar-toolkit-0.82.7.tar.bz2
+sugar-toolkit-0.82.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	16 Sep 2008 18:54:45 -0000	1.18
+++ sources	16 Sep 2008 19:11:21 -0000	1.19
@@ -1 +1 @@
-ce1a33591f0242bf815e3cfa06ee62c9  sugar-toolkit-0.82.6.tar.bz2
+ba9eff3f2f45c871b65ca3f37ffff3a0  sugar-toolkit-0.82.8.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sugar-toolkit.spec	16 Sep 2008 18:54:45 -0000	1.23
+++ sugar-toolkit.spec	16 Sep 2008 19:11:21 -0000	1.24
@@ -6,7 +6,7 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.82.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -68,7 +68,7 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
-* Tue Sep 16 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-1
+* Tue Sep 16 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-2
 - Fix a crash when we cannot access the alsa device
 
 * Sat Sep 13 2008 Simon Schampijer <simon at laptop.org> - 0.82.7-1



From lutter at fedoraproject.org  Tue Sep 16 19:12:21 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:12:21 +0000 (UTC)
Subject: rpms/rubygem-activeresource/F-8 .cvsignore, 1.3,
	1.4 rubygem-activeresource.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20080916191221.BC99B7013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activeresource/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23471/F-8

Modified Files:
	.cvsignore rubygem-activeresource.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeresource/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Apr 2008 18:55:14 -0000	1.3
+++ .cvsignore	16 Sep 2008 19:11:51 -0000	1.4
@@ -1 +1 @@
-activeresource-2.0.2.gem
+activeresource-2.1.1.gem


Index: rubygem-activeresource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeresource/F-8/rubygem-activeresource.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rubygem-activeresource.spec	1 Aug 2008 03:15:20 -0000	1.4
+++ rubygem-activeresource.spec	16 Sep 2008 19:11:51 -0000	1.5
@@ -6,7 +6,7 @@
 
 Summary: Active Record for web resources
 Name: rubygem-%{gemname}
-Version: 2.1.0
+Version: 2.1.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: GPLv2+ or Ruby
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
+- New version (fixes CVE-2008-4094)
+
 * Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
 - New Upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeresource/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Aug 2008 03:15:20 -0000	1.4
+++ sources	16 Sep 2008 19:11:51 -0000	1.5
@@ -1 +1 @@
-b8d394e7a717f412cdd8c8397c0db957  activeresource-2.1.0.gem
+d96954d60afd48f19fd00883d877506d  activeresource-2.1.1.gem



From lutter at fedoraproject.org  Tue Sep 16 19:12:22 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:12:22 +0000 (UTC)
Subject: rpms/rubygem-activeresource/F-9 .cvsignore, 1.3,
	1.4 rubygem-activeresource.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20080916191222.02F0D7013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activeresource/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23471/F-9

Modified Files:
	.cvsignore rubygem-activeresource.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeresource/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Apr 2008 18:55:23 -0000	1.3
+++ .cvsignore	16 Sep 2008 19:11:51 -0000	1.4
@@ -1 +1 @@
-activeresource-2.0.2.gem
+activeresource-2.1.1.gem


Index: rubygem-activeresource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeresource/F-9/rubygem-activeresource.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rubygem-activeresource.spec	1 Aug 2008 03:15:20 -0000	1.4
+++ rubygem-activeresource.spec	16 Sep 2008 19:11:51 -0000	1.5
@@ -6,7 +6,7 @@
 
 Summary: Active Record for web resources
 Name: rubygem-%{gemname}
-Version: 2.1.0
+Version: 2.1.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: GPLv2+ or Ruby
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
+- New version (fixes CVE-2008-4094)
+
 * Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
 - New Upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeresource/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Aug 2008 03:15:20 -0000	1.4
+++ sources	16 Sep 2008 19:11:51 -0000	1.5
@@ -1 +1 @@
-b8d394e7a717f412cdd8c8397c0db957  activeresource-2.1.0.gem
+d96954d60afd48f19fd00883d877506d  activeresource-2.1.1.gem



From lutter at fedoraproject.org  Tue Sep 16 19:12:22 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:12:22 +0000 (UTC)
Subject: rpms/rubygem-activeresource/devel .cvsignore, 1.4,
	1.5 rubygem-activeresource.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20080916191222.416AF7013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activeresource/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23471/devel

Modified Files:
	.cvsignore rubygem-activeresource.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeresource/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Aug 2008 03:15:21 -0000	1.4
+++ .cvsignore	16 Sep 2008 19:11:52 -0000	1.5
@@ -1 +1 @@
-activeresource-2.1.0.gem
+activeresource-2.1.1.gem


Index: rubygem-activeresource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeresource/devel/rubygem-activeresource.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rubygem-activeresource.spec	1 Aug 2008 03:15:21 -0000	1.4
+++ rubygem-activeresource.spec	16 Sep 2008 19:11:52 -0000	1.5
@@ -6,7 +6,7 @@
 
 Summary: Active Record for web resources
 Name: rubygem-%{gemname}
-Version: 2.1.0
+Version: 2.1.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: GPLv2+ or Ruby
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
+- New version (fixes CVE-2008-4094)
+
 * Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
 - New Upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeresource/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Aug 2008 03:15:21 -0000	1.4
+++ sources	16 Sep 2008 19:11:52 -0000	1.5
@@ -1 +1 @@
-b8d394e7a717f412cdd8c8397c0db957  activeresource-2.1.0.gem
+d96954d60afd48f19fd00883d877506d  activeresource-2.1.1.gem



From lutter at fedoraproject.org  Tue Sep 16 19:12:21 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:12:21 +0000 (UTC)
Subject: rpms/rubygem-activeresource/EL-5 .cvsignore, 1.3,
	1.4 rubygem-activeresource.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20080916191221.7B3187013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activeresource/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23471/EL-5

Modified Files:
	.cvsignore rubygem-activeresource.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeresource/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Apr 2008 18:55:23 -0000	1.3
+++ .cvsignore	16 Sep 2008 19:11:51 -0000	1.4
@@ -1 +1 @@
-activeresource-2.0.2.gem
+activeresource-2.1.1.gem


Index: rubygem-activeresource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeresource/EL-5/rubygem-activeresource.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rubygem-activeresource.spec	8 Apr 2008 16:27:36 -0000	1.3
+++ rubygem-activeresource.spec	16 Sep 2008 19:11:51 -0000	1.4
@@ -6,8 +6,8 @@
 
 Summary: Active Record for web resources
 Name: rubygem-%{gemname}
-Version: 2.0.2
-Release: 2%{?dist}
+Version: 2.1.1
+Release: 1%{?dist}
 Group: Development/Languages
 License: GPLv2+ or Ruby
 URL: http://www.rubyonrails.org
@@ -51,6 +51,12 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
+- New version (fixes CVE-2008-4094)
+
+* Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
+- New Upstream
+
 * Tue Apr  8 2008 David Lutterkort <dlutter at redhat.com> - 2.0.2-2
 - Fix dependency
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeresource/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Apr 2008 18:55:23 -0000	1.3
+++ sources	16 Sep 2008 19:11:51 -0000	1.4
@@ -1 +1 @@
-ae810c8ff64993e56e3c59544ba9c1b6  activeresource-2.0.2.gem
+d96954d60afd48f19fd00883d877506d  activeresource-2.1.1.gem



From lutter at fedoraproject.org  Tue Sep 16 19:12:58 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:12:58 +0000 (UTC)
Subject: rpms/rubygem-rails/F-8 .cvsignore, 1.4, 1.5 rubygem-rails.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <20080916191258.026087013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-rails/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23572/F-8

Modified Files:
	.cvsignore rubygem-rails.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Apr 2008 18:52:16 -0000	1.4
+++ .cvsignore	16 Sep 2008 19:12:27 -0000	1.5
@@ -1 +1 @@
-rails-2.0.2.gem
+rails-2.1.1.gem


Index: rubygem-rails.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/F-8/rubygem-rails.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-rails.spec	1 Aug 2008 03:24:16 -0000	1.5
+++ rubygem-rails.spec	16 Sep 2008 19:12:27 -0000	1.6
@@ -6,7 +6,7 @@
 
 Summary: Web-application framework
 Name: rubygem-%{gemname}
-Version: 2.1.0
+Version: 2.1.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
+- New version (fixes CVE-2008-4094)
+
 * Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
 - New Upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2008 03:24:16 -0000	1.5
+++ sources	16 Sep 2008 19:12:27 -0000	1.6
@@ -1 +1 @@
-e4dba2c0cbf17c6683d6345326179ff2  rails-2.1.0.gem
+a4946f8a4261e389f2a9d31e81ea8590  rails-2.1.1.gem



From lutter at fedoraproject.org  Tue Sep 16 19:12:58 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:12:58 +0000 (UTC)
Subject: rpms/rubygem-rails/F-9 .cvsignore, 1.4, 1.5 rubygem-rails.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <20080916191258.4089B7013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-rails/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23572/F-9

Modified Files:
	.cvsignore rubygem-rails.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Apr 2008 18:52:22 -0000	1.4
+++ .cvsignore	16 Sep 2008 19:12:28 -0000	1.5
@@ -1 +1 @@
-rails-2.0.2.gem
+rails-2.1.1.gem


Index: rubygem-rails.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/F-9/rubygem-rails.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-rails.spec	1 Aug 2008 03:24:16 -0000	1.5
+++ rubygem-rails.spec	16 Sep 2008 19:12:28 -0000	1.6
@@ -6,7 +6,7 @@
 
 Summary: Web-application framework
 Name: rubygem-%{gemname}
-Version: 2.1.0
+Version: 2.1.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
+- New version (fixes CVE-2008-4094)
+
 * Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
 - New Upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2008 03:24:16 -0000	1.5
+++ sources	16 Sep 2008 19:12:28 -0000	1.6
@@ -1 +1 @@
-e4dba2c0cbf17c6683d6345326179ff2  rails-2.1.0.gem
+a4946f8a4261e389f2a9d31e81ea8590  rails-2.1.1.gem



From lutter at fedoraproject.org  Tue Sep 16 19:12:58 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:12:58 +0000 (UTC)
Subject: rpms/rubygem-rails/devel .cvsignore, 1.5, 1.6 rubygem-rails.spec,
	1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20080916191258.78FA17013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-rails/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23572/devel

Modified Files:
	.cvsignore rubygem-rails.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Aug 2008 03:24:17 -0000	1.5
+++ .cvsignore	16 Sep 2008 19:12:28 -0000	1.6
@@ -1 +1 @@
-rails-2.1.0.gem
+rails-2.1.1.gem


Index: rubygem-rails.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/devel/rubygem-rails.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-rails.spec	1 Aug 2008 03:24:17 -0000	1.5
+++ rubygem-rails.spec	16 Sep 2008 19:12:28 -0000	1.6
@@ -6,7 +6,7 @@
 
 Summary: Web-application framework
 Name: rubygem-%{gemname}
-Version: 2.1.0
+Version: 2.1.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
+- New version (fixes CVE-2008-4094)
+
 * Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
 - New Upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2008 03:24:17 -0000	1.5
+++ sources	16 Sep 2008 19:12:28 -0000	1.6
@@ -1 +1 @@
-e4dba2c0cbf17c6683d6345326179ff2  rails-2.1.0.gem
+a4946f8a4261e389f2a9d31e81ea8590  rails-2.1.1.gem



From lutter at fedoraproject.org  Tue Sep 16 19:12:57 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 19:12:57 +0000 (UTC)
Subject: rpms/rubygem-rails/EL-5 .cvsignore, 1.4, 1.5 rubygem-rails.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20080916191257.BD0B57013C@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-rails/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23572/EL-5

Modified Files:
	.cvsignore rubygem-rails.spec sources 
Log Message:
New version (fixes CVE-2008-4094)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Apr 2008 18:52:22 -0000	1.4
+++ .cvsignore	16 Sep 2008 19:12:27 -0000	1.5
@@ -1 +1 @@
-rails-2.0.2.gem
+rails-2.1.1.gem


Index: rubygem-rails.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/EL-5/rubygem-rails.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rubygem-rails.spec	8 Apr 2008 16:28:33 -0000	1.4
+++ rubygem-rails.spec	16 Sep 2008 19:12:27 -0000	1.5
@@ -6,8 +6,8 @@
 
 Summary: Web-application framework
 Name: rubygem-%{gemname}
-Version: 2.0.2
-Release: 2%{?dist}
+Version: 2.1.1
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -82,6 +82,12 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
+- New version (fixes CVE-2008-4094)
+
+* Thu Jul 31 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.1.0-1
+- New Upstream
+
 * Tue Apr  8 2008 David Lutterkort <dlutter at redhat.com> - 2.0.2-2
 - Fix dependency
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Apr 2008 18:52:22 -0000	1.4
+++ sources	16 Sep 2008 19:12:27 -0000	1.5
@@ -1 +1 @@
-8a3617501716fe909f08686407ff04ce  rails-2.0.2.gem
+a4946f8a4261e389f2a9d31e81ea8590  rails-2.1.1.gem



From erikos at fedoraproject.org  Tue Sep 16 19:27:24 2008
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Tue, 16 Sep 2008 19:27:24 +0000 (UTC)
Subject: rpms/sugar/OLPC-3 .cvsignore, 1.18, 1.19 sources, 1.19,
	1.20 sugar.spec, 1.22, 1.23
Message-ID: <20080916192724.4F6BF7013A@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26225

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Tue Sep 16 2008 Simon Schampijer <simon at laptop.org> - 0.82.7-1
- remove numpy finally




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	13 Sep 2008 18:11:58 -0000	1.18
+++ .cvsignore	16 Sep 2008 19:26:53 -0000	1.19
@@ -1 +1 @@
-sugar-0.82.6.tar.bz2
+sugar-0.82.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	13 Sep 2008 18:11:58 -0000	1.19
+++ sources	16 Sep 2008 19:26:53 -0000	1.20
@@ -1 +1 @@
-dacc98607ddd4a083a1ed9a04b5985cf  sugar-0.82.6.tar.bz2
+3188ae9e0d67a7a105d480837cf101d9  sugar-0.82.7.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sugar.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sugar.spec	13 Sep 2008 18:11:58 -0000	1.22
+++ sugar.spec	16 Sep 2008 19:26:53 -0000	1.23
@@ -3,7 +3,7 @@
 
 Summary: OLPC desktop environment
 Name: sugar
-Version: 0.82.6
+Version: 0.82.7
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
@@ -27,7 +27,6 @@
 Requires: sugar-toolkit
 Requires: gnome-python2-libwnck
 Requires: matchbox-window-manager
-Requires: numpy
 Requires: python-telepathy
 Requires: gstreamer-python
 
@@ -94,6 +93,9 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Tue Sep 16 2008 Simon Schampijer <simon at laptop.org> - 0.82.7-1
+- remove numpy finally
+
 * Sat Sep 13 2008 Simon Schampijer <simon at laptop.org> - 0.82.6-1
 - #8438 control panel fails when run with python -OO
 - #8470 SpreadLayout leaks self._collisions



From mdomsch at fedoraproject.org  Tue Sep 16 19:29:37 2008
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue, 16 Sep 2008 19:29:37 +0000 (UTC)
Subject: rpms/fluxstyle/devel fluxstyle.desktop, 1.2, 1.3 fluxstyle.spec, 1.4,
	1.5
Message-ID: <20080916192937.5B16C7013A@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/fluxstyle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26427

Modified Files:
	fluxstyle.desktop fluxstyle.spec 
Log Message:
fix desktop, add egg-info.  Fixes FTBFS BZ#440757


Index: fluxstyle.desktop
===================================================================
RCS file: /cvs/extras/rpms/fluxstyle/devel/fluxstyle.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fluxstyle.desktop	26 Oct 2006 03:40:20 -0000	1.2
+++ fluxstyle.desktop	16 Sep 2008 19:29:07 -0000	1.3
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
-Version=1.0.1
+Version=1.0
 Type=Application
 Name=Fluxstyle
 Comment=Graphical style manager for fluxbox
 TryExec=fluxStyle
 Exec=fluxStyle
-Icon=fluxmetal.png
+Icon=fluxmetal
 Categories=Application;Settings;GTK;System;Utility;


Index: fluxstyle.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxstyle/devel/fluxstyle.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fluxstyle.spec	18 Jul 2008 16:54:54 -0000	1.4
+++ fluxstyle.spec	16 Sep 2008 19:29:07 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           fluxstyle
 Version:        1.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A graphical style manager for Fluxbox
 
 Group:          User Interface/X
@@ -67,6 +67,7 @@
 %{python_sitelib}/%{name}/__init__.py
 %{python_sitelib}/%{name}/*.pyc
 %{python_sitelib}/%{name}/*.pyo
+%{python_sitelib}/%{name}-%{version}-py2.5.egg-info
 
 %{_datadir}/%{name}/glade/main.glade
 %{_datadir}/%{name}/images/*.png
@@ -75,6 +76,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/fluxmetal.png
 
 %changelog
+* Tue Sep 16 2008 Matt Domsch <mdomsch at fedoraproject.org> - 1.0.1-4
+- fix desktop, add egg-info.  Fixes FTBFS BZ#440757
+
 * Fri Jul 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-3
 - fix license tag
 



From erikos at fedoraproject.org  Tue Sep 16 19:35:00 2008
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Tue, 16 Sep 2008 19:35:00 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.18, 1.19 sources, 1.19,
	1.20 sugar.spec, 1.26, 1.27
Message-ID: <20080916193500.5E3407013A@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26986

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Tue Sep 16 2008 Simon Schampijer <simon at laptop.org> - 0.82.7-1
- remove numpy finally




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	13 Sep 2008 19:18:00 -0000	1.18
+++ .cvsignore	16 Sep 2008 19:34:30 -0000	1.19
@@ -1 +1 @@
-sugar-0.82.6.tar.bz2
+sugar-0.82.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	13 Sep 2008 19:18:00 -0000	1.19
+++ sources	16 Sep 2008 19:34:30 -0000	1.20
@@ -1 +1 @@
-dacc98607ddd4a083a1ed9a04b5985cf  sugar-0.82.6.tar.bz2
+3188ae9e0d67a7a105d480837cf101d9  sugar-0.82.7.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sugar.spec	13 Sep 2008 19:18:00 -0000	1.26
+++ sugar.spec	16 Sep 2008 19:34:30 -0000	1.27
@@ -3,7 +3,7 @@
 
 Summary: OLPC desktop environment
 Name: sugar
-Version: 0.82.6
+Version: 0.82.7
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
@@ -27,7 +27,6 @@
 Requires: sugar-toolkit
 Requires: gnome-python2-libwnck
 Requires: matchbox-window-manager
-Requires: numpy
 Requires: python-telepathy
 Requires: gstreamer-python
 
@@ -94,6 +93,9 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Tue Sep 16 2008 Simon Schampijer <simon at laptop.org> - 0.82.7-1
+- remove numpy finally
+
 * Sat Sep 13 2008 Simon Schampijer <simon at laptop.org> - 0.82.6-1
 - #8438 control panel fails when run with python -OO                                                                         
 - #8470 SpreadLayout leaks self._collisions                                                                               



From mstone at fedoraproject.org  Tue Sep 16 19:42:44 2008
From: mstone at fedoraproject.org (Michael Stone)
Date: Tue, 16 Sep 2008 19:42:44 +0000 (UTC)
Subject: rpms/rainbow/F-9 .cvsignore, 1.11, 1.12 rainbow.spec, 1.11,
	1.12 sources, 1.11, 1.12
Message-ID: <20080916194245.011CB7013A@cvs1.fedora.phx.redhat.com>

Author: mstone

Update of /cvs/pkgs/rpms/rainbow/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27465

Modified Files:
	.cvsignore rainbow.spec sources 
Log Message:
- Sayamindu Dasgupta (1):
    dlo#8127: Strip double-quotes in _get_lang().



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Sep 2008 18:51:48 -0000	1.11
+++ .cvsignore	16 Sep 2008 19:42:14 -0000	1.12
@@ -1 +1 @@
-rainbow-0.7.22.tar.bz2
+rainbow-0.7.23.tar.bz2


Index: rainbow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/F-9/rainbow.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rainbow.spec	12 Sep 2008 18:51:48 -0000	1.11
+++ rainbow.spec	16 Sep 2008 19:42:14 -0000	1.12
@@ -3,7 +3,7 @@
 %{!?python_version: %define python_version %(%{__python} -c "import sys; print sys.version[0:3]")}
 
 Name:           rainbow
-Version:        0.7.22
+Version:        0.7.23
 Release:        1%{?dist}
 Summary:        The OLPC security service
 
@@ -81,6 +81,10 @@
 %{python_sitelib}/%{name}-%{version}-py%{python_version}.egg-info/*
 
 %changelog
+* Tue Sep 16 2008 Michael Stone <michael at laptop.org> - 0.7.23-1.olpc3
+- Sayamindu Dasgupta (1):
+    dlo#8127: Strip double-quotes in _get_lang().
+
 * Fri Sep 12 2008 Michael Stone <michael at laptop.org> - 0.7.22-1.olpc3
 - Michael Stone (1):
     dlo#8434: Add a use-serial permission.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Sep 2008 18:51:48 -0000	1.11
+++ sources	16 Sep 2008 19:42:14 -0000	1.12
@@ -1 +1 @@
-85ad9797af2bd3ec7b419369a1a0f253  rainbow-0.7.22.tar.bz2
+a9b2209573d465e474b67340c38cfc14  rainbow-0.7.23.tar.bz2



From mdomsch at fedoraproject.org  Tue Sep 16 19:49:29 2008
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue, 16 Sep 2008 19:49:29 +0000 (UTC)
Subject: rpms/python-durus/devel python-durus.spec,1.17,1.18
Message-ID: <20080916194929.D22477013A@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/python-durus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28045

Modified Files:
	python-durus.spec 
Log Message:
fix FTBFS BZ#434427


Index: python-durus.spec
===================================================================
RCS file: /cvs/extras/rpms/python-durus/devel/python-durus.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- python-durus.spec	7 Mar 2008 16:38:35 -0000	1.17
+++ python-durus.spec	16 Sep 2008 19:48:59 -0000	1.18
@@ -4,7 +4,7 @@
 
 Name:           python-durus
 Version:        3.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A Python Object Database
 
 Group:          Development/Libraries
@@ -46,7 +46,7 @@
 %defattr(-,root,root,-)
 %doc doc/ *.txt
 %dir %{python_sitearch}/durus
-%{python_sitearch}/Durus-%{version}-py%{pyver}.egg-info
+%{python_sitearch}/Durus-%{version}-py2.5.egg-info/
 %{python_sitearch}/durus/*.so
 %{python_sitearch}/durus/*.py
 %{python_sitearch}/durus/*.pyc
@@ -54,6 +54,9 @@
 %{_bindir}/durus
 
 %changelog
+* Tue Sep 16 2008 Matt Domsch <mdomsch at fedoraproject.org> - 3.5-6
+- fix FTBFS BZ#434427
+
 * Fri Mar 07 2008 Jesse Keating <jkeating at redhat.com> - 3.5-5
 - Drop the pyver stuff, no longer needed.
 



From rstrode at fedoraproject.org  Tue Sep 16 19:50:56 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 16 Sep 2008 19:50:56 +0000 (UTC)
Subject: rpms/gdm/devel gdm-2.23.92-save-root-window.patch, NONE,
	1.1 gdm.spec, 1.413, 1.414
Message-ID: <20080916195056.E75907013A@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28285

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.23.92-save-root-window.patch 
Log Message:
- Save root window in XSETROOTID property for transition


gdm-2.23.92-save-root-window.patch:

--- NEW FILE gdm-2.23.92-save-root-window.patch ---
diff -up gdm-2.23.92/daemon/gdm-simple-slave.c.save-root-window gdm-2.23.92/daemon/gdm-simple-slave.c
--- gdm-2.23.92/daemon/gdm-simple-slave.c.save-root-window	2008-09-03 16:52:53.000000000 -0400
+++ gdm-2.23.92/daemon/gdm-simple-slave.c	2008-09-16 15:29:15.000000000 -0400
@@ -825,6 +825,15 @@ setup_server (GdmSimpleSlave *slave)
 {
         /* Set the busy cursor */
         gdm_slave_set_busy_cursor (GDM_SLAVE (slave));
+
+        /* The root window has a background that may be useful
+         * to cross fade or transition from when setting the
+         * login screen background.  We read it here, and stuff
+         * it into the standard _XSETROOT_ID root window property,
+         * so gnome-settings-daemon can get at it.
+         */
+        gdm_slave_save_root_windows (GDM_SLAVE (slave));
+
 }
 
 static void
diff -up gdm-2.23.92/daemon/gdm-slave.c.save-root-window gdm-2.23.92/daemon/gdm-slave.c
--- gdm-2.23.92/daemon/gdm-slave.c.save-root-window	2008-08-26 15:04:00.000000000 -0400
+++ gdm-2.23.92/daemon/gdm-slave.c	2008-09-16 15:39:18.000000000 -0400
@@ -42,6 +42,7 @@
 #include <dbus/dbus-glib-lowlevel.h>
 
 #include <X11/Xlib.h> /* for Display */
+#include <X11/Xatom.h> /* for XA_PIXMAP */
 #include <X11/cursorfont.h> /* for watch cursor */
 
 #include "gdm-common.h"
@@ -341,6 +342,75 @@ gdm_slave_run_script (GdmSlave   *slave,
         return ret;
 }
 
+static void
+gdm_slave_save_root_window_of_screen (GdmSlave *slave,
+                                      Atom      id_atom,
+                                      int       screen_number)
+{
+        Window root_window;
+        GC gc;
+        XGCValues values;
+        Pixmap pixmap;
+        int width, height, depth;
+
+        root_window = RootWindow (slave->priv->server_display,
+                                  screen_number);
+
+        width = DisplayWidth (slave->priv->server_display, screen_number);
+        height = DisplayHeight (slave->priv->server_display, screen_number);
+        depth = DefaultDepth (slave->priv->server_display, screen_number);
+        pixmap = XCreatePixmap (slave->priv->server_display,
+                                root_window,
+                                width, height, depth);
+
+        values.function = GXcopy;
+        values.plane_mask = AllPlanes;
+        values.fill_style = FillSolid;
+        values.subwindow_mode = IncludeInferiors;
+
+        gc = XCreateGC (slave->priv->server_display,
+                        root_window,
+                        GCFunction | GCPlaneMask | GCFillStyle | GCSubwindowMode,
+                        &values);
+
+        if (XCopyArea (slave->priv->server_display,
+                       root_window, pixmap, gc, 0, 0,
+                       width, height, 0, 0)) {
+
+                long pixmap_as_long;
+
+                pixmap_as_long = (long) pixmap;
+
+                XChangeProperty (slave->priv->server_display,
+                                 root_window, id_atom, XA_PIXMAP,
+                                 32, PropModeReplace, (guchar *) &pixmap_as_long,
+                                 1);
+
+        }
+
+        XFreeGC (slave->priv->server_display, gc);
+}
+
+void
+gdm_slave_save_root_windows (GdmSlave *slave)
+{
+        int i, number_of_screens;
+        Atom atom;
+
+        number_of_screens = ScreenCount (slave->priv->server_display);
+
+        atom = XInternAtom (slave->priv->server_display,
+                            "_XSETROOT_ID", False);
+
+        if (atom == 0) {
+                return;
+        }
+
+        for (i = 0; i < number_of_screens; i++) {
+                gdm_slave_save_root_window_of_screen (slave, atom, i);
+        }
+}
+
 void
 gdm_slave_set_busy_cursor (GdmSlave *slave)
 {
diff -up gdm-2.23.92/daemon/gdm-slave.h.save-root-window gdm-2.23.92/daemon/gdm-slave.h
--- gdm-2.23.92/daemon/gdm-slave.h.save-root-window	2008-08-26 15:04:00.000000000 -0400
+++ gdm-2.23.92/daemon/gdm-slave.h	2008-09-16 15:29:15.000000000 -0400
@@ -69,6 +69,7 @@ gboolean            gdm_slave_switch_to_
 
 gboolean            gdm_slave_connect_to_x11_display (GdmSlave   *slave);
 void                gdm_slave_set_busy_cursor        (GdmSlave   *slave);
+void                gdm_slave_save_root_windows      (GdmSlave   *slave);
 gboolean            gdm_slave_run_script             (GdmSlave   *slave,
                                                       const char *dir,
                                                       const char *username);


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- gdm.spec	12 Sep 2008 16:21:36 -0000	1.413
+++ gdm.spec	16 Sep 2008 19:50:26 -0000	1.414
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.23.92
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -80,6 +80,7 @@
 Requires: audit-libs >= %{libauditver}
 Patch1: xkb-groups.patch
 Patch2: gdm-2.23.92-force-active-vt.patch
+Patch3: gdm-2.23.92-save-root-window.patch
 
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
@@ -103,6 +104,7 @@
 %setup -q
 %patch1 -p1 -b .xkb-groups
 %patch2 -p1 -b .force-active-vt
+%patch3 -p1 -b .save-root-window
 %patch99 -p1 -b .fedora-logo
 
 autoreconf
@@ -304,6 +306,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Tue Sep 16 2008 Ray Strode <rstrode at redhat.com> - 1:2.23.92-5
+- Save root window in XSETROOTID property for transition
+
 * Fri Sep 12 2008 Ray Strode <rstrode at redhat.com> - 1:2.23.92-4
 - Fix bug in last patch
 



From rishi at fedoraproject.org  Tue Sep 16 20:04:59 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue, 16 Sep 2008 20:04:59 +0000 (UTC)
Subject: rpms/glade3/F-8 glade3-3.4.5-desktop.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 glade3.spec, 1.12, 1.13 sources, 1.5,
	1.6 glade3-3.4.4-desktop.patch, 1.1, NONE
Message-ID: <20080916200459.33AE27013A@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/glade3/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29540

Modified Files:
	.cvsignore glade3.spec sources 
Added Files:
	glade3-3.4.5-desktop.patch 
Removed Files:
	glade3-3.4.4-desktop.patch 
Log Message:
* Tue Sep 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-1
- Version bump to 3.4.5.


glade3-3.4.5-desktop.patch:

--- NEW FILE glade3-3.4.5-desktop.patch ---
diff -urNp glade3-3.4.4.orig/data/glade-3.desktop.in.in glade3-3.4.4/data/glade-3.desktop.in.in
--- glade3-3.4.4.orig/data/glade-3.desktop.in.in	2008-04-18 11:07:01.000000000 +0530
+++ glade3-3.4.4/data/glade-3.desktop.in.in	2008-04-19 08:30:23.000000000 +0530
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-_Name=Glade Interface Designer
+_Name=Glade-3 Interface Designer
 _GenericName=User Interface Designer
 _Comment=Create or open user interface designs for GTK+ applications
 Exec=glade-3 %F


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Apr 2008 04:06:00 -0000	1.5
+++ .cvsignore	16 Sep 2008 20:04:28 -0000	1.6
@@ -1 +1 @@
-glade3-3.4.4.tar.gz
+glade3-3.4.5.tar.gz


Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-8/glade3.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- glade3.spec	19 Apr 2008 04:06:00 -0000	1.12
+++ glade3.spec	16 Sep 2008 20:04:28 -0000	1.13
@@ -5,7 +5,7 @@
 
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
-Version:	3.4.4
+Version:	3.4.5
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
@@ -190,6 +190,9 @@
 %{_includedir}/libgladeui-1.0/gladeui/*
 
 %changelog
+* Tue Sep 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-1
+- Version bump to 3.4.5.
+
 * Wed Apr 19 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.4-1
 - Version bump to 3.4.4.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Apr 2008 04:06:00 -0000	1.5
+++ sources	16 Sep 2008 20:04:28 -0000	1.6
@@ -1 +1 @@
-c51fe016c9f5e3239a394605f81fe98d  glade3-3.4.4.tar.gz
+bab4c1656c5b550781a6f27250933c11  glade3-3.4.5.tar.gz


--- glade3-3.4.4-desktop.patch DELETED ---



From rishi at fedoraproject.org  Tue Sep 16 20:09:13 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue, 16 Sep 2008 20:09:13 +0000 (UTC)
Subject: rpms/glade3/F-9 glade3-3.4.5-desktop.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 glade3.spec, 1.13, 1.14 sources, 1.5,
	1.6 glade3-3.4.4-desktop.patch, 1.1, NONE
Message-ID: <20080916200913.967567013A@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/glade3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30094

Modified Files:
	.cvsignore glade3.spec sources 
Added Files:
	glade3-3.4.5-desktop.patch 
Removed Files:
	glade3-3.4.4-desktop.patch 
Log Message:
* Tue Sep 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-1
- Version bump to 3.4.5.


glade3-3.4.5-desktop.patch:

--- NEW FILE glade3-3.4.5-desktop.patch ---
diff -urNp glade3-3.4.4.orig/data/glade-3.desktop.in.in glade3-3.4.4/data/glade-3.desktop.in.in
--- glade3-3.4.4.orig/data/glade-3.desktop.in.in	2008-04-18 11:07:01.000000000 +0530
+++ glade3-3.4.4/data/glade-3.desktop.in.in	2008-04-19 08:30:23.000000000 +0530
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-_Name=Glade Interface Designer
+_Name=Glade-3 Interface Designer
 _GenericName=User Interface Designer
 _Comment=Create or open user interface designs for GTK+ applications
 Exec=glade-3 %F


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Apr 2008 04:09:47 -0000	1.5
+++ .cvsignore	16 Sep 2008 20:08:43 -0000	1.6
@@ -1 +1 @@
-glade3-3.4.4.tar.gz
+glade3-3.4.5.tar.gz


Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-9/glade3.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- glade3.spec	19 Apr 2008 04:09:47 -0000	1.13
+++ glade3.spec	16 Sep 2008 20:08:43 -0000	1.14
@@ -5,7 +5,7 @@
 
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
-Version:	3.4.4
+Version:	3.4.5
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
@@ -190,6 +190,9 @@
 %{_includedir}/libgladeui-1.0/gladeui/*
 
 %changelog
+* Tue Sep 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-1
+- Version bump to 3.4.5.
+
 * Wed Apr 19 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.4-1
 - Version bump to 3.4.4.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Apr 2008 04:09:47 -0000	1.5
+++ sources	16 Sep 2008 20:08:43 -0000	1.6
@@ -1 +1 @@
-c51fe016c9f5e3239a394605f81fe98d  glade3-3.4.4.tar.gz
+bab4c1656c5b550781a6f27250933c11  glade3-3.4.5.tar.gz


--- glade3-3.4.4-desktop.patch DELETED ---



From mdomsch at fedoraproject.org  Tue Sep 16 20:09:37 2008
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue, 16 Sep 2008 20:09:37 +0000 (UTC)
Subject: rpms/mimetic/devel mimetic-0.9.3-gcc43.patch, NONE, 1.1 mimetic.spec,
	1.13, 1.14
Message-ID: <20080916200937.B51FF7013A@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/mimetic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30183

Modified Files:
	mimetic.spec 
Added Files:
	mimetic-0.9.3-gcc43.patch 
Log Message:
fix FTBFS BR#434086 with several #include <cstring>s

mimetic-0.9.3-gcc43.patch:

--- NEW FILE mimetic-0.9.3-gcc43.patch ---
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal mimetic-0.9.3.orig/mimetic/strutils.h mimetic-0.9.3/mimetic/strutils.h
--- mimetic-0.9.3.orig/mimetic/strutils.h	2005-02-23 04:26:14.000000000 -0600
+++ mimetic-0.9.3/mimetic/strutils.h	2008-09-16 15:00:28.000000000 -0500
@@ -18,6 +18,7 @@
 #include <string>
 #include <iostream>
 #include <algorithm>
+#include <cstring>
 
 namespace mimetic
 {
--- mimetic-0.9.3.orig/mimetic/os/mmfile.cxx	2006-07-13 08:36:25.000000000 -0500
+++ mimetic-0.9.3/mimetic/os/mmfile.cxx	2008-09-16 15:03:46.000000000 -0500
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <mimetic/libconfig.h>
 #include <mimetic/os/mmfile.h>
+#include <cstring>
 
 using namespace std;
 
--- mimetic-0.9.3.orig/mimetic/os/stdfile.cxx	2005-02-23 04:26:15.000000000 -0600
+++ mimetic-0.9.3/mimetic/os/stdfile.cxx	2008-09-16 15:05:02.000000000 -0500
@@ -15,6 +15,7 @@
  ***************************************************************************/
 #include <iostream>
 #include <fstream>
+#include <cstring>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <time.h>
--- mimetic-0.9.3.orig/mimetic/tokenizer.h	2005-02-23 05:07:52.000000000 -0600
+++ mimetic-0.9.3/mimetic/tokenizer.h	2008-09-16 15:06:21.000000000 -0500
@@ -19,6 +19,7 @@
 #include <algorithm>
 #include <set>
 #include <string>
+#include <cstring>
 
 namespace mimetic
 {


Index: mimetic.spec
===================================================================
RCS file: /cvs/extras/rpms/mimetic/devel/mimetic.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mimetic.spec	8 Aug 2008 17:51:22 -0000	1.13
+++ mimetic.spec	16 Sep 2008 20:09:07 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:		mimetic
 Version:	0.9.3
-Release:	%release_func 4
+Release:	%release_func 5
 Summary:	A full featured MIME library written in C++
 
 Group:		System Environment/Libraries
@@ -10,6 +10,7 @@
 URL:		http://codesink.org/mimetic_mime_library.html
 Source0:	http://codesink.org/download/%name-%version.tar.gz
 Patch0:		mimetic-0.9.2-noconfigh.patch
+Patch1:         mimetic-0.9.3-gcc43.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 
 BuildRequires:	doxygen
@@ -41,6 +42,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .noconfigh
+%patch1 -p1
 
 
 %build
@@ -84,6 +86,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 Matt Domsch <mdomsch at fedoraproject.org> - 0.9.3-5
+- fix FTBFS BR#434086 with several #include <cstring>s
+
 * Fri Aug  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.3-4
 - fix license tag
 



From gemi at fedoraproject.org  Tue Sep 16 20:09:57 2008
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Tue, 16 Sep 2008 20:09:57 +0000 (UTC)
Subject: rpms/plt-scheme/devel .cvsignore, 1.13, 1.14 plt-scheme.spec, 1.38, 
	1.39 sources, 1.14, 1.15
Message-ID: <20080916200957.2EFB07013A@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/plt-scheme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30239

Modified Files:
	.cvsignore plt-scheme.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plt-scheme/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	16 Jun 2008 19:56:55 -0000	1.13
+++ .cvsignore	16 Sep 2008 20:09:26 -0000	1.14
@@ -1 +1 @@
-plt-4.0-src-unix.tgz
+plt-4.1-src-unix.tgz


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plt-scheme/devel/plt-scheme.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- plt-scheme.spec	16 Jun 2008 19:59:38 -0000	1.38
+++ plt-scheme.spec	16 Sep 2008 20:09:26 -0000	1.39
@@ -1,6 +1,6 @@
 Name:           plt-scheme
-Version:        4.0
-Release:        3%{?dist}
+Version:        4.1
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Graphical environment for developing programs using Scheme
 
@@ -59,6 +59,8 @@
 and an editor toolbox for creating multimedia editors.
 
 
+%define __arch_install_post %{nil}
+
 %prep
 %setup -q -n plt-%{version}
 %ifarch x86_64
@@ -86,7 +88,6 @@
 %configure --enable-gl --enable-xrender --enable-xft
 %endif
 
-
 make # %{?_smp_mflags}
 
 
@@ -98,9 +99,8 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
-find $RPM_BUILD_ROOT -size 0 | xargs rm -f
-fgrep -lr "$RPM_BUILD_ROOT" $RPM_BUILD_ROOT | xargs rm -f
-
+#find $RPM_BUILD_ROOT -size 0 | xargs rm -f
+#fgrep -lr "$RPM_BUILD_ROOT" $RPM_BUILD_ROOT | xargs rm -f
 
 mv $RPM_BUILD_ROOT%{_bindir}/planet $RPM_BUILD_ROOT%{_bindir}/plt-planet 
 
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Gerard Milmeister <gemi at bluewin.ch> - 1:4.1-1
+- new release 4.1
+
 * Mon Jun 16 2008 Gerard Milmeister <gemi at bluewin.ch> - 1:4.0-2
 - fix builds for different architectures
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plt-scheme/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	16 Jun 2008 19:56:55 -0000	1.14
+++ sources	16 Sep 2008 20:09:26 -0000	1.15
@@ -1 +1 @@
-c4d1c05c306897a57b900ff3a609c655  plt-4.0-src-unix.tgz
+d94e1b4be6650d3576725add851c751a  plt-4.1-src-unix.tgz



From spot at fedoraproject.org  Tue Sep 16 20:10:41 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 16 Sep 2008 20:10:41 +0000 (UTC)
Subject: rpms/linpsk/devel linpsk.desktop,1.1,1.2 linpsk.spec,1.1,1.2
Message-ID: <20080916201041.CA7747013A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/linpsk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30285

Modified Files:
	linpsk.desktop linpsk.spec 
Log Message:
BR: qt3-devel, fix FTBFS


Index: linpsk.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/linpsk/devel/linpsk.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linpsk.desktop	29 Feb 2008 04:18:25 -0000	1.1
+++ linpsk.desktop	16 Sep 2008 20:10:11 -0000	1.2
@@ -4,7 +4,7 @@
 GenericName=linpsk
 Comment=Psk31 and RTTY program for Linux
 Exec=linpsk
-Icon=linpsk.png
+Icon=linpsk
 Terminal=false
 Type=Application
 Categories=HamRadio;


Index: linpsk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linpsk/devel/linpsk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linpsk.spec	29 Feb 2008 04:18:25 -0000	1.1
+++ linpsk.spec	16 Sep 2008 20:10:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           linpsk
 Version:        0.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Psk31 and RTTY program for Linux
 
 Group:          Applications/Communications
@@ -11,7 +11,7 @@
 Source2:        %{name}.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  fftw-devel qt-devel alsa-lib-devel automake autoconf libtool
+BuildRequires:  fftw-devel qt3-devel alsa-lib-devel automake autoconf libtool
 BuildRequires:  desktop-file-utils
 #Requires:
 
@@ -67,6 +67,9 @@
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Tue Sep 16 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.9-4
+- BR: qt3-devel
+
 * Thu Feb 28 2008 Robert 'Bob' Jensen <bob at bobjensen.com> 0.9-3
 - Add .desktop and icon for GUI application
 - Submit for review



From pkgdb at fedoraproject.org  Tue Sep 16 20:12:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:12:54 +0000
Subject: [pkgdb] man-pages-fr ownership updated
Message-ID: <20080916201254.C5C4C208D9E@bastion.fedora.phx.redhat.com>

Package man-pages-fr in Fedora devel is now owned by bouska

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Tue Sep 16 20:13:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:13:05 +0000
Subject: [pkgdb] man-pages-fr ownership updated
Message-ID: <20080916201305.39136208DA2@bastion.fedora.phx.redhat.com>

Package man-pages-fr in Fedora 8 is now owned by bouska

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Tue Sep 16 20:13:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:13:08 +0000
Subject: [pkgdb] man-pages-fr ownership updated
Message-ID: <20080916201308.3985F208DA3@bastion.fedora.phx.redhat.com>

Package man-pages-fr in Fedora 9 is now owned by bouska

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From rishi at fedoraproject.org  Tue Sep 16 20:20:41 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue, 16 Sep 2008 20:20:41 +0000 (UTC)
Subject: rpms/glade3/devel glade3-3.4.5-desktop.patch, NONE, 1.1 .cvsignore, 
	1.5, 1.6 glade3.spec, 1.13, 1.14 sources, 1.5,
	1.6 glade3-3.4.4-desktop.patch, 1.1, NONE
Message-ID: <20080916202041.0ED5D7013A@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/glade3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31476

Modified Files:
	.cvsignore glade3.spec sources 
Added Files:
	glade3-3.4.5-desktop.patch 
Removed Files:
	glade3-3.4.4-desktop.patch 
Log Message:
* Tue Sep 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-1
- Version bump to 3.4.5.


glade3-3.4.5-desktop.patch:

--- NEW FILE glade3-3.4.5-desktop.patch ---
diff -urNp glade3-3.4.4.orig/data/glade-3.desktop.in.in glade3-3.4.4/data/glade-3.desktop.in.in
--- glade3-3.4.4.orig/data/glade-3.desktop.in.in	2008-04-18 11:07:01.000000000 +0530
+++ glade3-3.4.4/data/glade-3.desktop.in.in	2008-04-19 08:30:23.000000000 +0530
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-_Name=Glade Interface Designer
+_Name=Glade-3 Interface Designer
 _GenericName=User Interface Designer
 _Comment=Create or open user interface designs for GTK+ applications
 Exec=glade-3 %F


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Apr 2008 04:09:47 -0000	1.5
+++ .cvsignore	16 Sep 2008 20:20:10 -0000	1.6
@@ -1 +1 @@
-glade3-3.4.4.tar.gz
+glade3-3.4.5.tar.gz


Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/devel/glade3.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- glade3.spec	19 Apr 2008 04:09:47 -0000	1.13
+++ glade3.spec	16 Sep 2008 20:20:10 -0000	1.14
@@ -5,7 +5,7 @@
 
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
-Version:	3.4.4
+Version:	3.4.5
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
@@ -190,6 +190,9 @@
 %{_includedir}/libgladeui-1.0/gladeui/*
 
 %changelog
+* Tue Sep 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-1
+- Version bump to 3.4.5.
+
 * Wed Apr 19 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.4-1
 - Version bump to 3.4.4.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Apr 2008 04:09:47 -0000	1.5
+++ sources	16 Sep 2008 20:20:10 -0000	1.6
@@ -1 +1 @@
-c51fe016c9f5e3239a394605f81fe98d  glade3-3.4.4.tar.gz
+bab4c1656c5b550781a6f27250933c11  glade3-3.4.5.tar.gz


--- glade3-3.4.4-desktop.patch DELETED ---



From mdomsch at fedoraproject.org  Tue Sep 16 20:27:36 2008
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue, 16 Sep 2008 20:27:36 +0000 (UTC)
Subject: rpms/lineak-xosdplugin/devel lineak-xosdplugin-0.9-gcc43.patch, NONE,
	1.1 lineak-xosdplugin.spec, 1.4, 1.5
Message-ID: <20080916202736.42EC37013A@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/lineak-xosdplugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31982

Modified Files:
	lineak-xosdplugin.spec 
Added Files:
	lineak-xosdplugin-0.9-gcc43.patch 
Log Message:
fix FTBFS BZ#434522 by #including cstdlib and cstring

lineak-xosdplugin-0.9-gcc43.patch:

--- NEW FILE lineak-xosdplugin-0.9-gcc43.patch ---
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal lineak-xosdplugin-0.9.orig/xosd_plugin/xosdctrl.cpp lineak-xosdplugin-0.9/xosd_plugin/xosdctrl.cpp
--- lineak-xosdplugin-0.9.orig/xosd_plugin/xosdctrl.cpp	2008-09-16 15:24:19.000000000 -0500
+++ lineak-xosdplugin-0.9/xosd_plugin/xosdctrl.cpp	2008-09-16 15:24:40.000000000 -0500
@@ -17,6 +17,8 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include <cstdlib>
+#include <cstring>
 
 #include <lineak/lconfig.h>
 #include <lineak/lineak_core_functions.h>


Index: lineak-xosdplugin.spec
===================================================================
RCS file: /cvs/extras/rpms/lineak-xosdplugin/devel/lineak-xosdplugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lineak-xosdplugin.spec	7 Aug 2008 17:31:36 -0000	1.4
+++ lineak-xosdplugin.spec	16 Sep 2008 20:27:05 -0000	1.5
@@ -4,7 +4,7 @@
 
 Name:           lineak-xosdplugin
 Version:        0.9
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Plugin for the lineakd keyboard daemon to enable XOSD support
 
 Group:          User Interface/Desktops
@@ -14,6 +14,7 @@
 ################################################################################
 
 Source:         http://dl.sourceforge.net/lineak/%{name}-%{version}.tar.gz
+Patch0:		%{name}-0.9-gcc43.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,6 +43,7 @@
 %prep
 
 %setup -q
+%patch0 -p1
 
 ################################################################################
 
@@ -78,6 +80,9 @@
 ################################################################################
 
 %changelog
+* Tue Sep 16 2008 Matt Domsch <mdomsch at fedoraproject.org> - 0.9-5
+- fix FTBFS BZ#434522 by #including cstdlib and cstring
+
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9-4
 - fix license tag
 



From steved at fedoraproject.org  Tue Sep 16 20:29:41 2008
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue, 16 Sep 2008 20:29:41 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils.spec, 1.186, 1.187 nfs.init, 1.28,
	1.29 nfslock.init, 1.22, 1.23 rpcgssd.init, 1.11,
	1.12 rpcidmapd.init, 1.10, 1.11 rpcsvcgssd.init, 1.9, 1.10
Message-ID: <20080916202941.9B35A7013C@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32241

Modified Files:
	nfs-utils.spec nfs.init nfslock.init rpcgssd.init 
	rpcidmapd.init rpcsvcgssd.init 
Log Message:
 - Reworked init scripts so service will be able to
   stop when some of the checks fail. (bz 462508)



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- nfs-utils.spec	28 Aug 2008 17:31:27 -0000	1.186
+++ nfs-utils.spec	16 Sep 2008 20:29:11 -0000	1.187
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -265,6 +265,10 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Tue Sep 16 2008 Steve Dickson <steved at redhat.com> 1.1.3-5
+- Reworked init scripts so service will be able to
+  stop when some of the checks fail. (bz 462508)
+
 * Thu Aug 28 2008 Steve Dickson <steved at redhat.com> 1.1.3-4
 - Added in a number of up upstream patches (101 thru 110).
 


Index: nfs.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs.init,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- nfs.init	2 Jul 2008 23:35:53 -0000	1.28
+++ nfs.init	16 Sep 2008 20:29:11 -0000	1.29
@@ -14,41 +14,44 @@
 . /etc/rc.d/init.d/functions
 
 # Source networking configuration.
-if [ ! -f /etc/sysconfig/network ]; then
-    exit 6
-fi
+[ -f /etc/sysconfig/network ] &&  . /etc/sysconfig/network
 
-. /etc/sysconfig/network
+RETVAL=0
+
+# See how we were called.
+case "$1" in
+  start)
 
-# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 6
+	# Check that networking is up.
+	[ "${NETWORKING}" != "yes" ] && exit 6
 
-[ -x /usr/sbin/rpc.nfsd ] || exit 5
-[ -x /usr/sbin/rpc.mountd ] || exit 5
-[ -x /usr/sbin/exportfs ] || exit 5
+	[ -x /usr/sbin/rpc.nfsd ] || exit 5
+	[ -x /usr/sbin/rpc.mountd ] || exit 5
+	[ -x /usr/sbin/exportfs ] || exit 5
 
-# Don't fail if /etc/exports doesn't exist; create a bare-bones version and continue.
-[ -r /etc/exports ] || \
-    { touch /etc/exports && chmod u+rw,g+r,o+r /etc/exports ; } || \
-    { echo "/etc/exports does not exist" ; exit 0 ; }
+	# Make sure the rpc.mountd is not already running.
+	if status rpc.mountd > /dev/null ; then
+		exit 0
+	fi
 
-# Check for and source configuration file otherwise set defaults
-[ -f /etc/sysconfig/nfs ] && . /etc/sysconfig/nfs
+	# Don't fail if /etc/exports doesn't exist; create a bare-bones 
+	# version and continue.
+	[ -r /etc/exports ] || \
+    	{ touch /etc/exports && chmod u+rw,g+r,o+r /etc/exports ; } || \
+    	{ echo "/etc/exports does not exist" ; exit 0 ; }
 
-[ -z "$MOUNTD_NFS_V2" ] && MOUNTD_NFS_V2=default
-[ -z "$MOUNTD_NFS_V3" ] && MOUNTD_NFS_V3=default
+	# Check for and source configuration file otherwise set defaults
+	[ -f /etc/sysconfig/nfs ] && . /etc/sysconfig/nfs
 
-# Number of servers to be started by default
-[ -z "$RPCNFSDCOUNT" ] && RPCNFSDCOUNT=8
+	[ -z "$MOUNTD_NFS_V2" ] && MOUNTD_NFS_V2=default
+	[ -z "$MOUNTD_NFS_V3" ] && MOUNTD_NFS_V3=default
 
-# Remote quota server
-[ -z "$RQUOTAD" ] && RQUOTAD=`type -path rpc.rquotad`
+	# Number of servers to be started by default
+	[ -z "$RPCNFSDCOUNT" ] && RPCNFSDCOUNT=8
 
-RETVAL=0
+	# Remote quota server
+	[ -z "$RQUOTAD" ] && RQUOTAD=`type -path rpc.rquotad`
 
-# See how we were called.
-case "$1" in
-  start)
 	# Start daemons.
 	[ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd start
 


Index: nfslock.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfslock.init,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nfslock.init	2 Jul 2008 23:35:53 -0000	1.22
+++ nfslock.init	16 Sep 2008 20:29:11 -0000	1.23
@@ -22,17 +22,20 @@
 STATDARG=""
 [ -f /etc/sysconfig/nfs ] && . /etc/sysconfig/nfs
 
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 6
-
-[ -x /sbin/rpc.statd ] || exit 5 
+[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
 
 RETVAL=0
-
 start() {
-    if [ ! -f /var/lock/subsys/nfslock ]; then
+	# Check that networking is up.
+	[ "${NETWORKING}" = "no" ] && exit 6
+
+	[ -x /sbin/rpc.statd ] || exit 5 
+
+	# Make sure the rpc.statd is not already running.
+	if status rpc.statd > /dev/null ; then
+		exit 0
+	fi
+	rm -f /var/lock/subsys/nfslock
 
 	# Make sure locks are recovered
 	rm -f /var/run/sm-notify.pid
@@ -63,7 +66,6 @@
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nfslock
-    fi
     return $RETVAL
 }
 


Index: rpcgssd.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/rpcgssd.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rpcgssd.init	2 Jul 2008 23:35:53 -0000	1.11
+++ rpcgssd.init	16 Sep 2008 20:29:11 -0000	1.12
@@ -12,23 +12,13 @@
 . /etc/init.d/functions
 
 # Source networking configuration.
-if [ ! -f /etc/sysconfig/network ]; then
-    exit 6
-fi
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 6
-
-[ ! -x /usr/sbin/rpc.gssd ] && exit 5
+[ -f /etc/sysconfig/network ]&&  . /etc/sysconfig/network
 
 # Check for and source configuration file otherwise set defaults
 [ -f /etc/sysconfig/nfs ] && . /etc/sysconfig/nfs
-[ "${SECURE_NFS}" != "yes" ] && exit 6
-
-# List of kernel modules to load
-[ -z "${SECURE_NFS_MODS}" ] && SECURE_NFS_MODS="des rpcsec_gss_krb5"
 
+# See if we are configured to start
+[ "${SECURE_NFS}" != "yes" ] && exit 6
 
 # Try to use machine credentials by default
 RETVAL=0
@@ -37,14 +27,25 @@
 
 case "$1" in
   start|condstart)
+	# Check that networking is up.
+	[ "${NETWORKING}" != "yes" ] && exit 6
+	[ ! -x /usr/sbin/rpc.gssd ] && exit 5
+
 	# Make sure the daemon is not already running.
 	if status $prog > /dev/null ; then
 		exit 0
 	fi
-	rm -f $LOCKFILE
 
+	# During condstart need to check again to see 
+	# if we are configured to start
+	[ "${SECURE_NFS}" != "yes" ] && exit 6
+
+	rm -f $LOCKFILE
 	echo -n $"Starting RPC gssd: "
 
+	# List of kernel modules to load
+	[ -z "${SECURE_NFS_MODS}" ] && SECURE_NFS_MODS="des rpcsec_gss_krb5"
+
 	# Make sure the rpc_pipefs filesystem is available
 	[ "${RPCMTAB}" != "noload" ] && {
 		RPCMTAB=`grep -v '^#' /proc/mounts | \


Index: rpcidmapd.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/rpcidmapd.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rpcidmapd.init	2 Jul 2008 23:35:53 -0000	1.10
+++ rpcidmapd.init	16 Sep 2008 20:29:11 -0000	1.11
@@ -12,15 +12,7 @@
 . /etc/init.d/functions
 
 # Source networking configuration.
-if [ ! -f /etc/sysconfig/network ]; then
-    exit 6
-fi
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 6
-
-[ ! -x /usr/sbin/rpc.idmapd ] && exit 5
+[ -f /etc/sysconfig/network ] &&  . /etc/sysconfig/network
 
 # Check for and source configuration file otherwise set defaults
 [ -f /etc/sysconfig/nfs ] && . /etc/sysconfig/nfs
@@ -31,11 +23,21 @@
 
 case "$1" in
   start|condstart)
+	# Check that networking is up.
+	[ "${NETWORKING}" != "yes" ] && exit 6
+	
+	[ ! -x /usr/sbin/rpc.idmapd ] && exit 5
+
 	# Make sure the daemon is not already running.
 	[ "$1" = "condstart" -a -n "`pidofproc $prog`" ] && {
 		killproc $prog "-SIGHUP" > /dev/null
 		exit 0
 	}
+	[ "$1" = "start" ] && {
+		if status $prog > /dev/null ; then
+			exit 0
+		fi
+	}
 	rm -f $LOCKFILE
 
 	echo -n $"Starting RPC idmapd: "
@@ -59,8 +61,6 @@
 		}
 	}
 
-	# Make sure the mount worked.
-
 	# Start daemon.
 	daemon $prog ${RPCIDMAPDARGS}
 	RETVAL=$?


Index: rpcsvcgssd.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/rpcsvcgssd.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpcsvcgssd.init	2 Jul 2008 23:35:53 -0000	1.9
+++ rpcsvcgssd.init	16 Sep 2008 20:29:11 -0000	1.10
@@ -12,22 +12,13 @@
 . /etc/init.d/functions
 
 # Source networking configuration.
-if [ ! -f /etc/sysconfig/network ]; then
-    exit 6
-fi
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 6
-
-[ ! -x /usr/sbin/rpc.svcgssd ] && exit 5
+[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
 
 # Check for and source configuration file otherwise set defaults
 [ -f /etc/sysconfig/nfs ] && . /etc/sysconfig/nfs
-[ "${SECURE_NFS}" != "yes" ] && exit 6
 
-# List of kernel modules to load
-[ -z "${SECURE_NFS_MODS}" ] && SECURE_NFS_MODS="des rpcsec_gss_krb5"
+# See if we are configured to start 
+[ "${SECURE_NFS}" != "yes" ] && exit 6
 
 RETVAL=0
 LOCKFILE=/var/lock/subsys/rpcsvcgssd
@@ -35,6 +26,11 @@
 
 case "$1" in
   start|condstart)
+	# Check that networking is up.
+	[ "${NETWORKING}" != "yes" ] && exit 6
+	[ "${SECURE_NFS}" != "yes" ] && exit 6
+	[ ! -x /usr/sbin/rpc.svcgssd ] && exit 5
+
 	# Make sure the daemon is not already running.
 	if status $prog > /dev/null ; then
 		exit 0
@@ -42,6 +38,9 @@
 	rm -f $LOCKFILE
 
 	echo -n $"Starting RPC svcgssd: "
+	# List of kernel modules to load
+	[ -z "${SECURE_NFS_MODS}" ] && SECURE_NFS_MODS="des rpcsec_gss_krb5"
+
 
 	# Make sure the rpc_pipefs filesystem is available
 	[ "${RPCMTAB}" != "noload" ] && {



From pkgdb at fedoraproject.org  Tue Sep 16 20:33:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:33:47 +0000
Subject: [pkgdb] python-durus ownership updated
Message-ID: <20080916203347.4FC30208DA2@bastion.fedora.phx.redhat.com>

Package python-durus in Fedora devel was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-durus



From pkgdb at fedoraproject.org  Tue Sep 16 20:33:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:33:52 +0000
Subject: [pkgdb] python-durus ownership updated
Message-ID: <20080916203352.E879B208DA4@bastion.fedora.phx.redhat.com>

Package python-durus in Fedora 8 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-durus



From pkgdb at fedoraproject.org  Tue Sep 16 20:33:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:33:55 +0000
Subject: [pkgdb] python-durus ownership updated
Message-ID: <20080916203355.EDB0E208DA7@bastion.fedora.phx.redhat.com>

Package python-durus in Fedora 9 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-durus



From spot at fedoraproject.org  Tue Sep 16 20:34:15 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 16 Sep 2008 20:34:15 +0000 (UTC)
Subject: rpms/yoltia/devel yoltia.spec,1.1,1.2
Message-ID: <20080916203415.DFC847013A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/yoltia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv351

Modified Files:
	yoltia.spec 
Log Message:
move BR to qt3-devel, fix FTBFS


Index: yoltia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yoltia/devel/yoltia.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yoltia.spec	8 Feb 2008 20:05:06 -0000	1.1
+++ yoltia.spec	16 Sep 2008 20:33:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           yoltia
 Version:        0.22.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Qt based picture editing program
 Summary(pl):    Graficzny edytor oparty na Qt
 Group:          Applications/Multimedia
@@ -10,7 +10,7 @@
 Source1:        %{name}.desktop
 Patch0:         yoltia-0.22.1-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  qt-devel desktop-file-utils
+BuildRequires:  qt3-devel desktop-file-utils
 
 %description
 Yoltia is a computer program for editing image files. It provides the 
@@ -58,6 +58,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Sep 16 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.22.1-3
+- adjust BR to qt3-devel
+
 * Fri Feb 08 2008 Krzysztof Kurzawski <kurzawax at gmail.com> - 0.22.1-2
 - Add yoltia-0.22.1-gcc43 patch
 



From pkgdb at fedoraproject.org  Tue Sep 16 20:45:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:45:54 +0000
Subject: [pkgdb] python-paramiko ownership updated
Message-ID: <20080916204554.50BD0208DA0@bastion.fedora.phx.redhat.com>

Package python-paramiko in Fedora devel was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-paramiko



From pkgdb at fedoraproject.org  Tue Sep 16 20:45:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:45:58 +0000
Subject: [pkgdb] python-paramiko ownership updated
Message-ID: <20080916204558.DED71208DA4@bastion.fedora.phx.redhat.com>

Package python-paramiko in Fedora EPEL 5 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-paramiko



From pkgdb at fedoraproject.org  Tue Sep 16 20:46:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:46:06 +0000
Subject: [pkgdb] python-paramiko ownership updated
Message-ID: <20080916204606.A14B3208DA6@bastion.fedora.phx.redhat.com>

Package python-paramiko in Fedora 8 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-paramiko



From pkgdb at fedoraproject.org  Tue Sep 16 20:46:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:46:09 +0000
Subject: [pkgdb] python-paramiko ownership updated
Message-ID: <20080916204609.EF8C4208DAB@bastion.fedora.phx.redhat.com>

Package python-paramiko in Fedora 9 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-paramiko



From pkgdb at fedoraproject.org  Tue Sep 16 20:47:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:47:44 +0000
Subject: [pkgdb] python-lxml ownership updated
Message-ID: <20080916204744.7C6D9208DA4@bastion.fedora.phx.redhat.com>

Package python-lxml in Fedora devel was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-lxml



From pkgdb at fedoraproject.org  Tue Sep 16 20:47:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:47:52 +0000
Subject: [pkgdb] python-lxml ownership updated
Message-ID: <20080916204752.78832208DA5@bastion.fedora.phx.redhat.com>

Package python-lxml in Fedora 8 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-lxml



From pkgdb at fedoraproject.org  Tue Sep 16 20:47:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:47:55 +0000
Subject: [pkgdb] python-lxml ownership updated
Message-ID: <20080916204755.ECDAD208DA6@bastion.fedora.phx.redhat.com>

Package python-lxml in Fedora 9 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-lxml



From pkgdb at fedoraproject.org  Tue Sep 16 20:48:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:48:18 +0000
Subject: [pkgdb] python-protocols ownership updated
Message-ID: <20080916204818.C550A208D9E@bastion.fedora.phx.redhat.com>

Package python-protocols in Fedora devel was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-protocols



From pkgdb at fedoraproject.org  Tue Sep 16 20:48:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:48:21 +0000
Subject: [pkgdb] python-protocols ownership updated
Message-ID: <20080916204821.74512208DA3@bastion.fedora.phx.redhat.com>

Package python-protocols in Fedora devel is now owned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-protocols



From pkgdb at fedoraproject.org  Tue Sep 16 20:48:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:48:37 +0000
Subject: [pkgdb] python-protocols ownership updated
Message-ID: <20080916204837.E33FE208DA0@bastion.fedora.phx.redhat.com>

Package python-protocols in Fedora EPEL 5 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-protocols



From pkgdb at fedoraproject.org  Tue Sep 16 20:48:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:48:40 +0000
Subject: [pkgdb] python-protocols ownership updated
Message-ID: <20080916204840.0A5D8208DA5@bastion.fedora.phx.redhat.com>

Package python-protocols in Fedora EPEL 5 is now owned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-protocols



From pkgdb at fedoraproject.org  Tue Sep 16 20:49:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:49:08 +0000
Subject: [pkgdb] python-protocols ownership updated
Message-ID: <20080916204908.CB28C208DA2@bastion.fedora.phx.redhat.com>

Package python-protocols in Fedora 8 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-protocols



From pkgdb at fedoraproject.org  Tue Sep 16 20:49:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:49:11 +0000
Subject: [pkgdb] python-protocols ownership updated
Message-ID: <20080916204911.0126F208DA5@bastion.fedora.phx.redhat.com>

Package python-protocols in Fedora 8 is now owned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-protocols



From pkgdb at fedoraproject.org  Tue Sep 16 20:49:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:49:15 +0000
Subject: [pkgdb] python-protocols ownership updated
Message-ID: <20080916204915.5A81D208DA7@bastion.fedora.phx.redhat.com>

Package python-protocols in Fedora EPEL 4 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-protocols



From pkgdb at fedoraproject.org  Tue Sep 16 20:49:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:49:21 +0000
Subject: [pkgdb] python-protocols ownership updated
Message-ID: <20080916204921.D4220208DA0@bastion.fedora.phx.redhat.com>

Package python-protocols in Fedora 9 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-protocols



From pkgdb at fedoraproject.org  Tue Sep 16 20:49:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 20:49:24 +0000
Subject: [pkgdb] python-protocols ownership updated
Message-ID: <20080916204924.9461E208DA4@bastion.fedora.phx.redhat.com>

Package python-protocols in Fedora 9 is now owned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-protocols



From rstrode at fedoraproject.org  Tue Sep 16 20:54:53 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 16 Sep 2008 20:54:53 +0000 (UTC)
Subject: rpms/gdm/devel gdm-2.23.92-save-root-window.patch, 1.1, 1.2 gdm.spec,
	1.414, 1.415
Message-ID: <20080916205453.1812F7013A@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2385

Modified Files:
	gdm-2.23.92-save-root-window.patch gdm.spec 
Log Message:
- Use _XROOTPMAP_ID instead of _XSETROOT_ID


gdm-2.23.92-save-root-window.patch:

Index: gdm-2.23.92-save-root-window.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.23.92-save-root-window.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.23.92-save-root-window.patch	16 Sep 2008 19:50:26 -0000	1.1
+++ gdm-2.23.92-save-root-window.patch	16 Sep 2008 20:54:52 -0000	1.2
@@ -9,7 +9,7 @@
 +        /* The root window has a background that may be useful
 +         * to cross fade or transition from when setting the
 +         * login screen background.  We read it here, and stuff
-+         * it into the standard _XSETROOT_ID root window property,
++         * it into the standard _XROOTPMAP_ID root window property,
 +         * so gnome-settings-daemon can get at it.
 +         */
 +        gdm_slave_save_root_windows (GDM_SLAVE (slave));
@@ -90,7 +90,7 @@
 +        number_of_screens = ScreenCount (slave->priv->server_display);
 +
 +        atom = XInternAtom (slave->priv->server_display,
-+                            "_XSETROOT_ID", False);
++                            "_XROOTPMAP_ID", False);
 +
 +        if (atom == 0) {
 +                return;


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- gdm.spec	16 Sep 2008 19:50:26 -0000	1.414
+++ gdm.spec	16 Sep 2008 20:54:52 -0000	1.415
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.23.92
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -306,6 +306,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Tue Sep 16 2008 Ray Strode <rstrode at redhat.com> - 1:2.23.92-6
+- Use _XROOTPMAP_ID instead of _XSETROOT_ID
+
 * Tue Sep 16 2008 Ray Strode <rstrode at redhat.com> - 1:2.23.92-5
 - Save root window in XSETROOTID property for transition
 



From pkgdb at fedoraproject.org  Tue Sep 16 21:00:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:00:12 +0000
Subject: [pkgdb] python-psyco ownership updated
Message-ID: <20080916210012.63148208D9B@bastion.fedora.phx.redhat.com>

Package python-psyco in Fedora devel was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psyco



From pkgdb at fedoraproject.org  Tue Sep 16 21:00:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:00:16 +0000
Subject: [pkgdb] python-psyco ownership updated
Message-ID: <20080916210016.CE64B208DA0@bastion.fedora.phx.redhat.com>

Package python-psyco in Fedora 8 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psyco



From pkgdb at fedoraproject.org  Tue Sep 16 21:00:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:00:19 +0000
Subject: [pkgdb] python-psyco ownership updated
Message-ID: <20080916210019.77089208DA3@bastion.fedora.phx.redhat.com>

Package python-psyco in Fedora 9 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psyco



From pkgdb at fedoraproject.org  Tue Sep 16 21:00:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:00:33 +0000
Subject: [pkgdb] python-psycopg had acl change status
Message-ID: <20080916210033.D1961208DA4@bastion.fedora.phx.redhat.com>

toshio has set the approveacls acl on python-psycopg (Fedora devel) to Approved for devrim

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psycopg



From pkgdb at fedoraproject.org  Tue Sep 16 21:00:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:00:35 +0000
Subject: [pkgdb] python-psycopg had acl change status
Message-ID: <20080916210035.D6554208DA6@bastion.fedora.phx.redhat.com>

toshio has set the commit acl on python-psycopg (Fedora devel) to Approved for devrim

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psycopg



From pkgdb at fedoraproject.org  Tue Sep 16 21:00:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:00:38 +0000
Subject: [pkgdb] python-psycopg had acl change status
Message-ID: <20080916210038.EE27E208DA9@bastion.fedora.phx.redhat.com>

toshio has set the watchcommits acl on python-psycopg (Fedora devel) to Approved for devrim

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psycopg



From pkgdb at fedoraproject.org  Tue Sep 16 21:00:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:00:42 +0000
Subject: [pkgdb] python-psycopg ownership updated
Message-ID: <20080916210042.66651208DAF@bastion.fedora.phx.redhat.com>

Package python-psycopg in Fedora devel was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psycopg



From pkgdb at fedoraproject.org  Tue Sep 16 21:00:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:00:39 +0000
Subject: [pkgdb] python-psycopg had acl change status
Message-ID: <20080916210039.BAFEB208DAD@bastion.fedora.phx.redhat.com>

toshio has set the watchbugzilla acl on python-psycopg (Fedora devel) to Approved for devrim

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psycopg



From pkgdb at fedoraproject.org  Tue Sep 16 21:00:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:00:49 +0000
Subject: [pkgdb] python-psycopg had acl change status
Message-ID: <20080916210049.15E72208DB2@bastion.fedora.phx.redhat.com>

toshio has set the approveacls acl on python-psycopg (Fedora 8) to Approved for devrim

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psycopg



From pkgdb at fedoraproject.org  Tue Sep 16 21:00:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:00:50 +0000
Subject: [pkgdb] python-psycopg had acl change status
Message-ID: <20080916210050.8AC32208DB6@bastion.fedora.phx.redhat.com>

toshio has set the commit acl on python-psycopg (Fedora 8) to Approved for devrim

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psycopg



From pkgdb at fedoraproject.org  Tue Sep 16 21:00:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:00:51 +0000
Subject: [pkgdb] python-psycopg had acl change status
Message-ID: <20080916210051.F3266208DBA@bastion.fedora.phx.redhat.com>

toshio has set the watchcommits acl on python-psycopg (Fedora 8) to Approved for devrim

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psycopg



From pkgdb at fedoraproject.org  Tue Sep 16 21:00:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:00:53 +0000
Subject: [pkgdb] python-psycopg had acl change status
Message-ID: <20080916210053.14575208DBE@bastion.fedora.phx.redhat.com>

toshio has set the watchbugzilla acl on python-psycopg (Fedora 8) to Approved for devrim

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psycopg



From pkgdb at fedoraproject.org  Tue Sep 16 21:00:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:00:53 +0000
Subject: [pkgdb] python-psycopg ownership updated
Message-ID: <20080916210053.C42D9208DC1@bastion.fedora.phx.redhat.com>

Package python-psycopg in Fedora 8 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psycopg



From pkgdb at fedoraproject.org  Tue Sep 16 21:00:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:00:59 +0000
Subject: [pkgdb] python-psycopg had acl change status
Message-ID: <20080916210059.48347208DC3@bastion.fedora.phx.redhat.com>

toshio has set the approveacls acl on python-psycopg (Fedora 9) to Approved for devrim

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psycopg



From pkgdb at fedoraproject.org  Tue Sep 16 21:01:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:01:00 +0000
Subject: [pkgdb] python-psycopg had acl change status
Message-ID: <20080916210100.8D9AC208DC6@bastion.fedora.phx.redhat.com>

toshio has set the commit acl on python-psycopg (Fedora 9) to Approved for devrim

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psycopg



From pkgdb at fedoraproject.org  Tue Sep 16 21:01:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:01:01 +0000
Subject: [pkgdb] python-psycopg had acl change status
Message-ID: <20080916210101.81015208DC9@bastion.fedora.phx.redhat.com>

toshio has set the watchcommits acl on python-psycopg (Fedora 9) to Approved for devrim

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psycopg



From pkgdb at fedoraproject.org  Tue Sep 16 21:01:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:01:03 +0000
Subject: [pkgdb] python-psycopg ownership updated
Message-ID: <20080916210103.A2F1D208DCC@bastion.fedora.phx.redhat.com>

Package python-psycopg in Fedora 9 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psycopg



From pkgdb at fedoraproject.org  Tue Sep 16 21:01:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:01:03 +0000
Subject: [pkgdb] python-psycopg had acl change status
Message-ID: <20080916210103.DE6B8208DD0@bastion.fedora.phx.redhat.com>

toshio has set the watchbugzilla acl on python-psycopg (Fedora 9) to Approved for devrim

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psycopg



From pkgdb at fedoraproject.org  Tue Sep 16 21:01:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:01:11 +0000
Subject: [pkgdb] python-quixote ownership updated
Message-ID: <20080916210111.95DE2208DA9@bastion.fedora.phx.redhat.com>

Package python-quixote in Fedora devel was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-quixote



From pkgdb at fedoraproject.org  Tue Sep 16 21:01:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:01:17 +0000
Subject: [pkgdb] python-quixote ownership updated
Message-ID: <20080916210117.28407208DAB@bastion.fedora.phx.redhat.com>

Package python-quixote in Fedora 8 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-quixote



From pkgdb at fedoraproject.org  Tue Sep 16 21:01:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:01:18 +0000
Subject: [pkgdb] python-quixote ownership updated
Message-ID: <20080916210118.D4703208DB0@bastion.fedora.phx.redhat.com>

Package python-quixote in Fedora 9 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-quixote



From pkgdb at fedoraproject.org  Tue Sep 16 21:01:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:01:24 +0000
Subject: [pkgdb] python-simpletal ownership updated
Message-ID: <20080916210124.2B3BE208DAE@bastion.fedora.phx.redhat.com>

Package python-simpletal in Fedora devel was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-simpletal



From pkgdb at fedoraproject.org  Tue Sep 16 21:01:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:01:29 +0000
Subject: [pkgdb] python-simpletal ownership updated
Message-ID: <20080916210129.7AE91208DD2@bastion.fedora.phx.redhat.com>

Package python-simpletal in Fedora 8 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-simpletal



From pkgdb at fedoraproject.org  Tue Sep 16 21:01:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:01:31 +0000
Subject: [pkgdb] python-simpletal ownership updated
Message-ID: <20080916210131.79E25208D9E@bastion.fedora.phx.redhat.com>

Package python-simpletal in Fedora 9 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-simpletal



From pkgdb at fedoraproject.org  Tue Sep 16 21:01:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:01:35 +0000
Subject: [pkgdb] python-tpg ownership updated
Message-ID: <20080916210135.6A552208DB2@bastion.fedora.phx.redhat.com>

Package python-tpg in Fedora devel was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-tpg



From pkgdb at fedoraproject.org  Tue Sep 16 21:01:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:01:41 +0000
Subject: [pkgdb] python-tpg ownership updated
Message-ID: <20080916210140.E5E3E208DD3@bastion.fedora.phx.redhat.com>

Package python-tpg in Fedora 8 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-tpg



From pkgdb at fedoraproject.org  Tue Sep 16 21:01:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:01:42 +0000
Subject: [pkgdb] python-tpg ownership updated
Message-ID: <20080916210142.E724E208DD5@bastion.fedora.phx.redhat.com>

Package python-tpg in Fedora 9 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-tpg



From lmacken at fedoraproject.org  Tue Sep 16 21:39:02 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue, 16 Sep 2008 21:39:02 +0000 (UTC)
Subject: rpms/python-turbojson/F-8 .cvsignore, 1.4, 1.5 python-turbojson.spec,
	1.6, 1.7 sources, 1.4, 1.5 python-turbojson-SAfix-r3749.patch,
	1.1, NONE
Message-ID: <20080916213902.8FDEE7013A@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-turbojson/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7863

Modified Files:
	.cvsignore python-turbojson.spec sources 
Removed Files:
	python-turbojson-SAfix-r3749.patch 
Log Message:
Latest upstream release of the 1.1.x series


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbojson/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Nov 2007 20:26:31 -0000	1.4
+++ .cvsignore	16 Sep 2008 21:38:32 -0000	1.5
@@ -1 +1 @@
-TurboJson-1.1.2.tar.gz
+TurboJson-1.1.4.tar.gz


Index: python-turbojson.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbojson/F-8/python-turbojson.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-turbojson.spec	2 Feb 2008 18:00:31 -0000	1.6
+++ python-turbojson.spec	16 Sep 2008 21:38:32 -0000	1.7
@@ -4,17 +4,14 @@
 %define module turbojson
 
 Name:           python-turbojson
-Version:        1.1.2
-Release:        3%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        Python template plugin that supports json
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://cheeseshop.python.org/pypi/TurboJson
 Source0:        http://pypi.python.org/packages/source/T/TurboJson/TurboJson-%{version}.tar.gz
-# Backport of upstream patch to fix SQLAlchemy support::
-# http://trac.turbogears.org/changeset/3749?format=diff&new=3749
-Patch0:         python-turbojson-SAfix-r3749.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -29,7 +26,6 @@
 
 %prep
 %setup -q -n TurboJson-%{version}
-%patch0 -p0
 
 %build
 %{__python} setup.py build
@@ -45,12 +41,20 @@
 
 
 %files
+%doc README.txt
 %defattr(-,root,root,-)
 %{python_sitelib}/%{module}/
 %{python_sitelib}/TurboJson-%{version}-py%{pyver}.egg-info/
 
 
 %changelog
+* Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> 1.1.4-1
+- Latest upstream release of the 1.1.x series
+
+* Sun Jun 22 2008 Luke Macken <lmacken at redhat.com> 1.1.3-1
+- Latest upstream compatibility release, intended to work with TurboGears 1.0.x
+- Remove python-turbojson-SAfix-r3749.patch
+
 * Sat Feb 2 2008 Toshio Kuratomi <tkuratom at redhat.com> 1.1.2-3
 - ...and remember to include the patch in cvs.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbojson/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Nov 2007 20:26:31 -0000	1.4
+++ sources	16 Sep 2008 21:38:32 -0000	1.5
@@ -1 +1 @@
-21969123122e02d87e2727a73e950796  TurboJson-1.1.2.tar.gz
+f05f01b84b7d8eaa5f161b0af123bfb7  TurboJson-1.1.4.tar.gz


--- python-turbojson-SAfix-r3749.patch DELETED ---



From carllibpst at fedoraproject.org  Tue Sep 16 21:26:06 2008
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Tue, 16 Sep 2008 21:26:06 +0000 (UTC)
Subject: rpms/libpst/devel .cvsignore, 1.4, 1.5 libpst.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <20080916212606.4F6197013A@cvs1.fedora.phx.redhat.com>

Author: carllibpst

Update of /cvs/pkgs/rpms/libpst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5808

Modified Files:
	.cvsignore libpst.spec sources 
Log Message:
update to 0.6.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Aug 2008 19:14:10 -0000	1.4
+++ .cvsignore	16 Sep 2008 21:25:36 -0000	1.5
@@ -1 +0,0 @@
-libpst-0.6.17.tar.gz


Index: libpst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/libpst.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libpst.spec	5 Aug 2008 19:14:10 -0000	1.4
+++ libpst.spec	16 Sep 2008 21:25:36 -0000	1.5
@@ -1,6 +1,6 @@
 Summary:            Utilities to convert Outlook .pst files to other formats
 Name:               libpst
-Version:            0.6.17
+Version:            0.6.19
 Release:            1%{?dist}
 License:            GPLv2+
 Group:              Applications/Productivity
@@ -47,6 +47,13 @@
 
 
 %changelog
+* Sun Sep 14 2008 Carl Byington <carl at five-ten-sg.com> - 0.6.19-1
+- Fix base64 encoding that could create long lines.
+- Initial work on a .so shared library from Bharath Acharya.
+
+* Thu Aug 28 2008 Carl Byington <carl at five-ten-sg.com> - 0.6.18-1
+- Fixes for iconv on Mac from Justin Greer.
+
 * Tue Aug 05 2008 Carl Byington <carl at five-ten-sg.com> - 0.6.17-1
 - More fixes for 32/64 bit portability on big endian ppc.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Aug 2008 19:14:10 -0000	1.4
+++ sources	16 Sep 2008 21:25:36 -0000	1.5
@@ -1 +0,0 @@
-b2599f5d9b946ae4468188f413653e03  libpst-0.6.17.tar.gz



From lmacken at fedoraproject.org  Tue Sep 16 21:25:50 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue, 16 Sep 2008 21:25:50 +0000 (UTC)
Subject: rpms/python-turbojson/F-9 .cvsignore, 1.5, 1.6 python-turbojson.spec,
	1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20080916212550.1912A7013A@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-turbojson/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5700

Modified Files:
	.cvsignore python-turbojson.spec sources 
Log Message:
Latest upstream release of the 1.1.x series


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbojson/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Jun 2008 17:46:10 -0000	1.5
+++ .cvsignore	16 Sep 2008 21:25:19 -0000	1.6
@@ -1 +1 @@
-TurboJson-1.1.3.tar.gz
+TurboJson-1.1.4.tar.gz


Index: python-turbojson.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbojson/F-9/python-turbojson.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-turbojson.spec	22 Jun 2008 17:46:10 -0000	1.8
+++ python-turbojson.spec	16 Sep 2008 21:25:19 -0000	1.9
@@ -4,7 +4,7 @@
 %define module turbojson
 
 Name:           python-turbojson
-Version:        1.1.3
+Version:        1.1.4
 Release:        1%{?dist}
 Summary:        Python template plugin that supports json
 
@@ -41,12 +41,16 @@
 
 
 %files
+%doc README.txt
 %defattr(-,root,root,-)
 %{python_sitelib}/%{module}/
 %{python_sitelib}/TurboJson-%{version}-py%{pyver}.egg-info/
 
 
 %changelog
+* Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> 1.1.4-1
+- Latest upstream release of the 1.1.x series
+
 * Sun Jun 22 2008 Luke Macken <lmacken at redhat.com> 1.1.3-1
 - Latest upstream compatibility release, intended to work with TurboGears 1.0.x
 - Remove python-turbojson-SAfix-r3749.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbojson/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Jun 2008 17:46:10 -0000	1.5
+++ sources	16 Sep 2008 21:25:19 -0000	1.6
@@ -1 +1 @@
-9abbd9e50352941d6c658af3c43f0eb5  TurboJson-1.1.3.tar.gz
+f05f01b84b7d8eaa5f161b0af123bfb7  TurboJson-1.1.4.tar.gz



From than at fedoraproject.org  Tue Sep 16 21:44:35 2008
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 16 Sep 2008 21:44:35 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.1.1-bz#461725-regression.patch, NONE,
	1.1 kdelibs-4.1.1-cmake.patch, NONE,
	1.1 kdelibs-4.1.1-kdeui-widgets-fixes.patch, 1.1,
	1.2 kdelibs.spec, 1.350, 1.351
Message-ID: <20080916214435.F2DA47013A@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8594

Modified Files:
	kdelibs-4.1.1-kdeui-widgets-fixes.patch kdelibs.spec 
Added Files:
	kdelibs-4.1.1-bz#461725-regression.patch 
	kdelibs-4.1.1-cmake.patch 
Log Message:
- #461725, revert the patch to fix the regression
- fix kdelibs-4.1.1-kdeui-widgets-fixes.patch
- fix install problem with cmake > 2.5



kdelibs-4.1.1-bz#461725-regression.patch:

--- NEW FILE kdelibs-4.1.1-bz#461725-regression.patch ---
Index: khtml/khtml_part.cpp
===================================================================
--- khtml/khtml_part.cpp	(Revision 852920)
+++ khtml/khtml_part.cpp	(Revision 852919)
@@ -1080,7 +1080,8 @@
   if ( !d->m_frame->m_jscript )
     if (!createJScript(d->m_frame))
       return 0;
-   d->m_frame->m_jscript->setDebugEnabled(d->m_bJScriptDebugEnabled);
+  if (d->m_bJScriptDebugEnabled)
+    d->m_frame->m_jscript->setDebugEnabled(true);
 
   return d->m_frame->m_jscript;
 }
Index: khtml/ecma/debugger/debugwindow.cpp
===================================================================
--- khtml/ecma/debugger/debugwindow.cpp	(Revision 852920)
+++ khtml/ecma/debugger/debugwindow.cpp	(Revision 852919)
@@ -91,12 +91,23 @@
 using namespace KJSDebugger;
 
 DebugWindow* DebugWindow::s_debugger = 0;
+DebugWindow *DebugWindow::createInstance()
+{
+    Q_ASSERT(!s_debugger);
+    s_debugger = new DebugWindow();
+    return s_debugger;
+}
 
+void DebugWindow::destroyInstance()
+{
+    Q_ASSERT(s_debugger);
+    Q_ASSERT(s_debugger->m_activeSessionCtxs.isEmpty());
+    s_debugger->hide();
+    delete s_debugger;
+}
+
 DebugWindow * DebugWindow::window()
 {
-    if (!s_debugger)
-        s_debugger = new DebugWindow();
-
     return s_debugger;
 }
 
@@ -365,8 +376,6 @@
     assert(m_docsForIntrp.isEmpty());
     assert(m_docForSid.isEmpty());
     assert(m_docForIUKey.isEmpty());
-    assert(m_activeSessionCtxs.isEmpty());
-    s_debugger = 0;
 }
 
 void DebugWindow::closeEvent(QCloseEvent* event)
Index: khtml/ecma/debugger/debugwindow.h
===================================================================
--- khtml/ecma/debugger/debugwindow.h	(Revision 852920)
+++ khtml/ecma/debugger/debugwindow.h	(Revision 852919)
@@ -39,7 +39,6 @@
 #include "khtml_pagecache.h"
 #include "khtml_part.h"
 #include "dom/dom_misc.h"
-#include "misc/shared.h"
 
 #include <QStack>
 #include <QVector>
@@ -72,8 +71,7 @@
 *
 * There is only one debug window per program. This can be obtained by calling #instance
 */
-class DebugWindow : public KXmlGuiWindow, public KJS::Debugger, public KComponentData,
-                    public khtml::Shared<DebugWindow>
+class DebugWindow : public KXmlGuiWindow, public KJS::Debugger, public KComponentData
 {
     Q_OBJECT
 
@@ -81,6 +79,8 @@
     DebugWindow(QWidget *parent = 0);
     virtual ~DebugWindow();
 
+    static DebugWindow *createInstance();
+    static void destroyInstance();
     static DebugWindow *window();
 
     // Returns true if the debugger is active, and has blocked the execution
Index: khtml/ecma/kjs_proxy.cpp
===================================================================
--- khtml/ecma/kjs_proxy.cpp	(Revision 852920)
+++ khtml/ecma/kjs_proxy.cpp	(Revision 852919)
@@ -66,9 +66,9 @@
 
   void initScript();
   void applyUserAgent();
+
 private:
   KJS::ScriptInterpreter* m_script;
-  WTF::RefPtr<DebugWindow> m_debugWindow;
   bool m_debugEnabled;
 #ifndef NDEBUG
   static int s_count;
@@ -141,8 +141,8 @@
 #ifdef KJS_DEBUGGER
     if (inlineCode)
         filename = "(unknown file)";
-    if (m_debugWindow)
-        m_debugWindow->attach(m_script);
+    if (DebugWindow::window())
+        DebugWindow::window()->attach(m_script);
 #else
     Q_UNUSED(baseLine);
 #endif
@@ -202,8 +202,9 @@
   // (we used to delete and re-create it, previously)
     if (m_script) {
 #ifdef KJS_DEBUGGER
-        if (m_debugWindow)
-            m_debugWindow->clearInterpreter(m_script);
+        DebugWindow *debugWin = DebugWindow::window();
+        if (debugWin)
+            debugWin->clearInterpreter(m_script);
 #endif
         m_script->clear();
 
@@ -224,14 +225,6 @@
 	    ;
     JSLock::unlock();
   }
-
-#ifdef KJS_DEBUGGER
-  // Detach from debugging entirely if it's been turned off.
-  if (m_debugWindow && !m_debugEnabled) {
-    m_debugWindow->detach(m_script);
-    m_debugWindow = 0;
-  }
-#endif
 }
 
 DOM::EventListener *KJSProxyImpl::createHTMLEventHandler(QString sourceUrl, QString name, QString code, DOM::NodeImpl *node)
@@ -239,8 +232,8 @@
   initScript();
 
 #ifdef KJS_DEBUGGER
-    if (m_debugWindow)
-        m_debugWindow->attach(m_script);
+    if (DebugWindow::window())
+        DebugWindow::window()->attach(m_script);
 #else
     Q_UNUSED(sourceUrl);
 #endif
@@ -269,21 +262,30 @@
 {
 #ifdef KJS_DEBUGGER
   m_debugEnabled = enabled;
-
-  // Note that we attach to the debugger only before
-  // running a script. Detaches/disabling are done between
-  // documents, at clear. Both are done so the debugger
-  // see the entire session
-  if (enabled)
-    m_debugWindow = DebugWindow::window();
+  //if (m_script)
+  //    m_script->setDebuggingEnabled(enabled);
+  // NOTE: this is consistent across all KJSProxyImpl instances, as we only
+  // ever have 1 debug window
+    if (!enabled && DebugWindow::window())
+    {
+        DebugWindow::destroyInstance();
+    }
+    else if (enabled && !DebugWindow::window())
+    {
+        DebugWindow::createInstance();
+        initScript();
+        DebugWindow::window()->attach(m_script);
+    }
+#else
+    Q_UNUSED(enabled);
 #endif
 }
 
 void KJSProxyImpl::showDebugWindow(bool /*show*/)
 {
 #ifdef KJS_DEBUGGER
-    if (m_debugWindow)
-        m_debugWindow->show();
+    if (DebugWindow::window())
+        DebugWindow::window()->show();
 #else
     //Q_UNUSED(show);
 #endif

kdelibs-4.1.1-cmake.patch:

--- NEW FILE kdelibs-4.1.1-cmake.patch ---
diff -up kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake.orig kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake.orig	2008-09-12 23:54:36.000000000 +0200
+++ kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake	2008-09-13 00:02:50.000000000 +0200
@@ -745,6 +745,7 @@ endif(WIN32)
 # CMake generators if no build type is set.
 if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE RelWithDebInfo)
+   set(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE})
 endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
 
 
@@ -953,10 +954,6 @@ endif(MSVC)
 
 
 if (CMAKE_COMPILER_IS_GNUCXX)
-   if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-      set (CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} "Debugfull")
-   endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-
    set (KDE4_ENABLE_EXCEPTIONS -fexceptions)
    # Select flags.
    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
@@ -1063,11 +1060,6 @@ endif (CMAKE_COMPILER_IS_GNUCXX)
 
 
 if (CMAKE_C_COMPILER MATCHES "icc")
-
-   if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-      set (CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} "Debugfull")
-   endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-
    set (KDE4_ENABLE_EXCEPTIONS -fexceptions)
    # Select flags.
    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")

kdelibs-4.1.1-kdeui-widgets-fixes.patch:

Index: kdelibs-4.1.1-kdeui-widgets-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs-4.1.1-kdeui-widgets-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.1.1-kdeui-widgets-fixes.patch	8 Sep 2008 13:03:32 -0000	1.1
+++ kdelibs-4.1.1-kdeui-widgets-fixes.patch	16 Sep 2008 21:44:35 -0000	1.2
@@ -71,10 +71,11 @@
 +      d->mMenu->addAction(d->mWhatsThisAction);
        need_separator = true;
      }
+
 Index: kdeui/widgets/ktabwidget.cpp
 ===================================================================
---- kdeui/widgets/ktabwidget.cpp	(revision 858490)
-+++ kdeui/widgets/ktabwidget.cpp	(revision 858491)
+--- kdeui/widgets/ktabwidget.cpp	(Revision 858490)
++++ kdeui/widgets/ktabwidget.cpp	(Revision 858491)
 @@ -281,14 +281,22 @@
  
  QString KTabWidget::tabText( int index ) const
@@ -107,8 +108,8 @@
  void KTabWidget::setTabText( int index, const QString &text )
 Index: kdeui/widgets/ktabwidget.h
 ===================================================================
---- kdeui/widgets/ktabwidget.h	(revision 858490)
-+++ kdeui/widgets/ktabwidget.h	(revision 858491)
+--- kdeui/widgets/ktabwidget.h	(Revision 858490)
++++ kdeui/widgets/ktabwidget.h	(Revision 858491)
 @@ -187,7 +187,7 @@
       * Removes the widget, reimplemented for
       * internal reasons (keeping labels in sync).


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -r1.350 -r1.351
--- kdelibs.spec	8 Sep 2008 16:09:42 -0000	1.350
+++ kdelibs.spec	16 Sep 2008 21:44:35 -0000	1.351
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 6%{?dist}
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -79,6 +79,8 @@
 Patch18: kdelibs-4.1.0-kstandarddirs.patch
 # fix running commands in kglobalconfig before KComponentData init (#455130)
 Patch19: kdelibs-4.1.0-#455130.patch
+Patch20: kdelibs-4.1.1-cmake.patch
+Patch21: kdelibs-4.1.1-bz#461725-regression.patch
 
 ## upstream patches
 Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
@@ -210,6 +212,8 @@
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch19 -p1 -b .#455130
+%patch20 -p1 -b .cmake
+%patch21 -p0 -b .bz#461725-regression
 
 ## upstream patches
 %patch100 -p0 -b .kde#169447-khtml-regression
@@ -377,6 +381,15 @@
 
 
 %changelog
+* Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.1.1-9
+- #461725, revert the patch to fix the regression
+
+* Sat Sep 13 2008 Than Ngo <than at redhat.com> 4.1.1-8
+- fix kdelibs-4.1.1-kdeui-widgets-fixes.patch
+
+* Sat Sep 13 2008 Than Ngo <than at redhat.com> 4.1.1-7
+- fix install problem with cmake > 2.5
+
 * Mon Sep 08 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-6
 - fix crashes in plugin selector
 - fix problems in various kdeui widgets



From pkgdb at fedoraproject.org  Tue Sep 16 21:44:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:44:43 +0000
Subject: [pkgdb] python-lxml ownership updated
Message-ID: <20080916214443.6B7E4208DA0@bastion.fedora.phx.redhat.com>

Package python-lxml in Fedora devel is now owned by jcollie

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-lxml



From pkgdb at fedoraproject.org  Tue Sep 16 21:45:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:45:01 +0000
Subject: [pkgdb] python-lxml ownership updated
Message-ID: <20080916214501.C8E0A208D9A@bastion.fedora.phx.redhat.com>

Package python-lxml in Fedora 8 is now owned by jcollie

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-lxml



From pkgdb at fedoraproject.org  Tue Sep 16 21:45:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:45:06 +0000
Subject: [pkgdb] python-lxml ownership updated
Message-ID: <20080916214506.68537208DA2@bastion.fedora.phx.redhat.com>

Package python-lxml in Fedora 9 is now owned by jcollie

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-lxml



From pkgdb at fedoraproject.org  Tue Sep 16 21:48:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:48:33 +0000
Subject: [pkgdb] python-paramiko ownership updated
Message-ID: <20080916214833.A3A69208DA3@bastion.fedora.phx.redhat.com>

Package python-paramiko in Fedora devel is now owned by jcollie

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-paramiko



From pkgdb at fedoraproject.org  Tue Sep 16 21:48:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:48:47 +0000
Subject: [pkgdb] python-paramiko ownership updated
Message-ID: <20080916214847.CF7D4208DA3@bastion.fedora.phx.redhat.com>

Package python-paramiko in Fedora 8 is now owned by jcollie

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-paramiko



From pkgdb at fedoraproject.org  Tue Sep 16 21:48:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 16 Sep 2008 21:48:50 +0000
Subject: [pkgdb] python-paramiko ownership updated
Message-ID: <20080916214850.F283A208DA7@bastion.fedora.phx.redhat.com>

Package python-paramiko in Fedora 9 is now owned by jcollie

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-paramiko



From kkofler at fedoraproject.org  Tue Sep 16 21:51:16 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 16 Sep 2008 21:51:16 +0000 (UTC)
Subject: rpms/kdelibs4/F-8 kdelibs-4.1.1-bz#461725-regression.patch, NONE,
	1.1 kdelibs-4.1.1-cmake.patch, NONE,
	1.1 kdelibs-4.1.1-kdeui-widgets-fixes.patch, 1.1,
	1.2 kdelibs4.spec, 1.34, 1.35
Message-ID: <20080916215116.297367013A@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9559/F-8

Modified Files:
	kdelibs-4.1.1-kdeui-widgets-fixes.patch kdelibs4.spec 
Added Files:
	kdelibs-4.1.1-bz#461725-regression.patch 
	kdelibs-4.1.1-cmake.patch 
Log Message:
Sync from kdelibs/F-9:

* Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.1.1-9
- #461725, revert the patch to fix the regression

* Sat Sep 13 2008 Than Ngo <than at redhat.com> 4.1.1-8
- fix kdelibs-4.1.1-kdeui-widgets-fixes.patch

* Sat Sep 13 2008 Than Ngo <than at redhat.com> 4.1.1-7
- fix install problem with cmake > 2.5

kdelibs-4.1.1-bz#461725-regression.patch:

--- NEW FILE kdelibs-4.1.1-bz#461725-regression.patch ---
Index: khtml/khtml_part.cpp
===================================================================
--- khtml/khtml_part.cpp	(Revision 852920)
+++ khtml/khtml_part.cpp	(Revision 852919)
@@ -1080,7 +1080,8 @@
   if ( !d->m_frame->m_jscript )
     if (!createJScript(d->m_frame))
       return 0;
-   d->m_frame->m_jscript->setDebugEnabled(d->m_bJScriptDebugEnabled);
+  if (d->m_bJScriptDebugEnabled)
+    d->m_frame->m_jscript->setDebugEnabled(true);
 
   return d->m_frame->m_jscript;
 }
Index: khtml/ecma/debugger/debugwindow.cpp
===================================================================
--- khtml/ecma/debugger/debugwindow.cpp	(Revision 852920)
+++ khtml/ecma/debugger/debugwindow.cpp	(Revision 852919)
@@ -91,12 +91,23 @@
 using namespace KJSDebugger;
 
 DebugWindow* DebugWindow::s_debugger = 0;
+DebugWindow *DebugWindow::createInstance()
+{
+    Q_ASSERT(!s_debugger);
+    s_debugger = new DebugWindow();
+    return s_debugger;
+}
 
+void DebugWindow::destroyInstance()
+{
+    Q_ASSERT(s_debugger);
+    Q_ASSERT(s_debugger->m_activeSessionCtxs.isEmpty());
+    s_debugger->hide();
+    delete s_debugger;
+}
+
 DebugWindow * DebugWindow::window()
 {
-    if (!s_debugger)
-        s_debugger = new DebugWindow();
-
     return s_debugger;
 }
 
@@ -365,8 +376,6 @@
     assert(m_docsForIntrp.isEmpty());
     assert(m_docForSid.isEmpty());
     assert(m_docForIUKey.isEmpty());
-    assert(m_activeSessionCtxs.isEmpty());
-    s_debugger = 0;
 }
 
 void DebugWindow::closeEvent(QCloseEvent* event)
Index: khtml/ecma/debugger/debugwindow.h
===================================================================
--- khtml/ecma/debugger/debugwindow.h	(Revision 852920)
+++ khtml/ecma/debugger/debugwindow.h	(Revision 852919)
@@ -39,7 +39,6 @@
 #include "khtml_pagecache.h"
 #include "khtml_part.h"
 #include "dom/dom_misc.h"
-#include "misc/shared.h"
 
 #include <QStack>
 #include <QVector>
@@ -72,8 +71,7 @@
 *
 * There is only one debug window per program. This can be obtained by calling #instance
 */
-class DebugWindow : public KXmlGuiWindow, public KJS::Debugger, public KComponentData,
-                    public khtml::Shared<DebugWindow>
+class DebugWindow : public KXmlGuiWindow, public KJS::Debugger, public KComponentData
 {
     Q_OBJECT
 
@@ -81,6 +79,8 @@
     DebugWindow(QWidget *parent = 0);
     virtual ~DebugWindow();
 
+    static DebugWindow *createInstance();
+    static void destroyInstance();
     static DebugWindow *window();
 
     // Returns true if the debugger is active, and has blocked the execution
Index: khtml/ecma/kjs_proxy.cpp
===================================================================
--- khtml/ecma/kjs_proxy.cpp	(Revision 852920)
+++ khtml/ecma/kjs_proxy.cpp	(Revision 852919)
@@ -66,9 +66,9 @@
 
   void initScript();
   void applyUserAgent();
+
 private:
   KJS::ScriptInterpreter* m_script;
-  WTF::RefPtr<DebugWindow> m_debugWindow;
   bool m_debugEnabled;
 #ifndef NDEBUG
   static int s_count;
@@ -141,8 +141,8 @@
 #ifdef KJS_DEBUGGER
     if (inlineCode)
         filename = "(unknown file)";
-    if (m_debugWindow)
-        m_debugWindow->attach(m_script);
+    if (DebugWindow::window())
+        DebugWindow::window()->attach(m_script);
 #else
     Q_UNUSED(baseLine);
 #endif
@@ -202,8 +202,9 @@
   // (we used to delete and re-create it, previously)
     if (m_script) {
 #ifdef KJS_DEBUGGER
-        if (m_debugWindow)
-            m_debugWindow->clearInterpreter(m_script);
+        DebugWindow *debugWin = DebugWindow::window();
+        if (debugWin)
+            debugWin->clearInterpreter(m_script);
 #endif
         m_script->clear();
 
@@ -224,14 +225,6 @@
 	    ;
     JSLock::unlock();
   }
-
-#ifdef KJS_DEBUGGER
-  // Detach from debugging entirely if it's been turned off.
-  if (m_debugWindow && !m_debugEnabled) {
-    m_debugWindow->detach(m_script);
-    m_debugWindow = 0;
-  }
-#endif
 }
 
 DOM::EventListener *KJSProxyImpl::createHTMLEventHandler(QString sourceUrl, QString name, QString code, DOM::NodeImpl *node)
@@ -239,8 +232,8 @@
   initScript();
 
 #ifdef KJS_DEBUGGER
-    if (m_debugWindow)
-        m_debugWindow->attach(m_script);
+    if (DebugWindow::window())
+        DebugWindow::window()->attach(m_script);
 #else
     Q_UNUSED(sourceUrl);
 #endif
@@ -269,21 +262,30 @@
 {
 #ifdef KJS_DEBUGGER
   m_debugEnabled = enabled;
-
-  // Note that we attach to the debugger only before
-  // running a script. Detaches/disabling are done between
-  // documents, at clear. Both are done so the debugger
-  // see the entire session
-  if (enabled)
-    m_debugWindow = DebugWindow::window();
+  //if (m_script)
+  //    m_script->setDebuggingEnabled(enabled);
+  // NOTE: this is consistent across all KJSProxyImpl instances, as we only
+  // ever have 1 debug window
+    if (!enabled && DebugWindow::window())
+    {
+        DebugWindow::destroyInstance();
+    }
+    else if (enabled && !DebugWindow::window())
+    {
+        DebugWindow::createInstance();
+        initScript();
+        DebugWindow::window()->attach(m_script);
+    }
+#else
+    Q_UNUSED(enabled);
 #endif
 }
 
 void KJSProxyImpl::showDebugWindow(bool /*show*/)
 {
 #ifdef KJS_DEBUGGER
-    if (m_debugWindow)
-        m_debugWindow->show();
+    if (DebugWindow::window())
+        DebugWindow::window()->show();
 #else
     //Q_UNUSED(show);
 #endif

kdelibs-4.1.1-cmake.patch:

--- NEW FILE kdelibs-4.1.1-cmake.patch ---
diff -up kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake.orig kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake.orig	2008-09-12 23:54:36.000000000 +0200
+++ kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake	2008-09-13 00:02:50.000000000 +0200
@@ -745,6 +745,7 @@ endif(WIN32)
 # CMake generators if no build type is set.
 if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE RelWithDebInfo)
+   set(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE})
 endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
 
 
@@ -953,10 +954,6 @@ endif(MSVC)
 
 
 if (CMAKE_COMPILER_IS_GNUCXX)
-   if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-      set (CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} "Debugfull")
-   endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-
    set (KDE4_ENABLE_EXCEPTIONS -fexceptions)
    # Select flags.
    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
@@ -1063,11 +1060,6 @@ endif (CMAKE_COMPILER_IS_GNUCXX)
 
 
 if (CMAKE_C_COMPILER MATCHES "icc")
-
-   if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-      set (CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} "Debugfull")
-   endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-
    set (KDE4_ENABLE_EXCEPTIONS -fexceptions)
    # Select flags.
    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")

kdelibs-4.1.1-kdeui-widgets-fixes.patch:

Index: kdelibs-4.1.1-kdeui-widgets-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs-4.1.1-kdeui-widgets-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.1.1-kdeui-widgets-fixes.patch	12 Sep 2008 20:35:41 -0000	1.1
+++ kdelibs-4.1.1-kdeui-widgets-fixes.patch	16 Sep 2008 21:51:15 -0000	1.2
@@ -71,10 +71,11 @@
 +      d->mMenu->addAction(d->mWhatsThisAction);
        need_separator = true;
      }
+
 Index: kdeui/widgets/ktabwidget.cpp
 ===================================================================
---- kdeui/widgets/ktabwidget.cpp	(revision 858490)
-+++ kdeui/widgets/ktabwidget.cpp	(revision 858491)
+--- kdeui/widgets/ktabwidget.cpp	(Revision 858490)
++++ kdeui/widgets/ktabwidget.cpp	(Revision 858491)
 @@ -281,14 +281,22 @@
  
  QString KTabWidget::tabText( int index ) const
@@ -107,8 +108,8 @@
  void KTabWidget::setTabText( int index, const QString &text )
 Index: kdeui/widgets/ktabwidget.h
 ===================================================================
---- kdeui/widgets/ktabwidget.h	(revision 858490)
-+++ kdeui/widgets/ktabwidget.h	(revision 858491)
+--- kdeui/widgets/ktabwidget.h	(Revision 858490)
++++ kdeui/widgets/ktabwidget.h	(Revision 858491)
 @@ -187,7 +187,7 @@
       * Removes the widget, reimplemented for
       * internal reasons (keeping labels in sync).


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- kdelibs4.spec	12 Sep 2008 20:35:41 -0000	1.34
+++ kdelibs4.spec	16 Sep 2008 21:51:15 -0000	1.35
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 6%{?dist}
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -79,6 +79,8 @@
 Patch18: kdelibs-4.1.0-kstandarddirs.patch
 # fix running commands in kglobalconfig before KComponentData init (#455130)
 Patch19: kdelibs-4.1.0-#455130.patch
+Patch20: kdelibs-4.1.1-cmake.patch
+Patch21: kdelibs-4.1.1-bz#461725-regression.patch
 
 ## upstream patches
 Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
@@ -210,6 +212,8 @@
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch19 -p1 -b .#455130
+%patch20 -p1 -b .cmake
+%patch21 -p0 -b .bz#461725-regression
 
 ## upstream patches
 %patch100 -p0 -b .kde#169447-khtml-regression
@@ -377,6 +381,15 @@
 
 
 %changelog
+* Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.1.1-9
+- #461725, revert the patch to fix the regression
+
+* Sat Sep 13 2008 Than Ngo <than at redhat.com> 4.1.1-8
+- fix kdelibs-4.1.1-kdeui-widgets-fixes.patch
+
+* Sat Sep 13 2008 Than Ngo <than at redhat.com> 4.1.1-7
+- fix install problem with cmake > 2.5
+
 * Mon Sep 08 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-6
 - fix crashes in plugin selector
 - fix problems in various kdeui widgets



From carllibpst at fedoraproject.org  Tue Sep 16 22:03:26 2008
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Tue, 16 Sep 2008 22:03:26 +0000 (UTC)
Subject: rpms/libpst/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20080916220326.E6B627013C@cvs1.fedora.phx.redhat.com>

Author: carllibpst

Update of /cvs/pkgs/rpms/libpst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11073

Modified Files:
	.cvsignore sources 
Log Message:
update to 0.6.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Sep 2008 21:25:36 -0000	1.5
+++ .cvsignore	16 Sep 2008 22:02:56 -0000	1.6
@@ -0,0 +1 @@
+libpst-0.6.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Sep 2008 21:25:36 -0000	1.5
+++ sources	16 Sep 2008 22:02:56 -0000	1.6
@@ -0,0 +1 @@
+4c0761c73036e28d323a0f4e506f6a30  libpst-0.6.19.tar.gz



From than at fedoraproject.org  Tue Sep 16 22:22:02 2008
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 16 Sep 2008 22:22:02 +0000 (UTC)
Subject: rpms/kdemultimedia/devel
	kdemultimedia-4.1.1-kde#170941-dragon.patch, 
	NONE, 1.1 kdemultimedia.spec, 1.119, 1.120
Message-ID: <20080916222202.CB9227013A@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13688

Modified Files:
	kdemultimedia.spec 
Added Files:
	kdemultimedia-4.1.1-kde#170941-dragon.patch 
Log Message:
backport from trunk to fix dragon kpart crash in the embedding application


kdemultimedia-4.1.1-kde#170941-dragon.patch:

--- NEW FILE kdemultimedia-4.1.1-kde#170941-dragon.patch ---
diff -up kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp.orig kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp
--- kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp.orig	2008-09-17 00:14:07.000000000 +0200
+++ kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp	2008-09-17 00:16:49.000000000 +0200
@@ -529,15 +529,13 @@ debug() << "chapters: " << m_controller-
         refreshXineStream();
         updateChannels();
 
-		if(m_adjustedSize==false)
-		{
-		  ( (QWidget*) mainWindow() )->adjustSize();
-		  m_adjustedSize=true;
-		  debug() << "adjusting size to video resolution";
-		}
-        //m_vWidget->updateGeometry();
-        //updateGeometry();
-        
+        if(m_adjustedSize==false)
+        {
+           if( mainWindow() )
+             ( (QWidget*) mainWindow() )->adjustSize();
+           m_adjustedSize=true;
+           debug() << "adjusting size to video resolution";
+	}
     }
     emit stateChanged( state( currentState ) ); 
 }


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- kdemultimedia.spec	29 Aug 2008 15:57:45 -0000	1.119
+++ kdemultimedia.spec	16 Sep 2008 22:21:32 -0000	1.120
@@ -1,7 +1,7 @@
 Name: kdemultimedia
 Epoch: 6
 Version: 4.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:     Applications/Multimedia
@@ -9,6 +9,8 @@
 License:   GPLv2+
 URL:       http://www.kde.org/
 Source0:   ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}.tar.bz2
+# upstream patches
+Patch100:  kdemultimedia-4.1.1-kde#170941-dragon.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # This one is normal, FLAC_OGG_LIBRARY is not actually used anyway:
@@ -75,6 +77,9 @@
 %prep
 %setup -q -n kdemultimedia-%{version}
 
+# upstream patches
+%patch100 -p1 -b .kde#170941-dragon
+
 %build
 
 mkdir -p %{_target_platform} 
@@ -147,6 +152,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Than Ngo <than at redhat.com> 4.1.1-2
+- backport from trunk to fix dragon kpart crash in the embedding application 
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 



From mnagy at fedoraproject.org  Tue Sep 16 22:48:15 2008
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Tue, 16 Sep 2008 22:48:15 +0000 (UTC)
Subject: rpms/messiggy/F-8 import.log, NONE, 1.1 messiggy.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080916224815.10AAF7013A@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/messiggy/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16694/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log messiggy.spec 
Log Message:
initial commit



--- NEW FILE import.log ---
messiggy-0_5_0-1_fc9:F-8:messiggy-0.5.0-1.fc9.src.rpm:1221605172


--- NEW FILE messiggy.spec ---
Name:		messiggy
Version:	0.5.0
Release:	1%{?dist}
Summary:	Messiggy is a database of celestial objects

Group:		Applications/Engineering
License:	GPLv2+
URL:		http://www.coyotegulch.com/products/messiggy/index.html
Source0:	http://www.coyotegulch.com/distfiles/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	itzam-core-devel, gtk2-devel


%description
Messiggy is a database of celestial objects, as cataloged by the French
astronomer Charles Messier in the mid-18th century.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README
%{_bindir}/messiggy
%{_datadir}/messiggy


%changelog
* Sat Sep 06 2008 Martin Nagy <mnagy at redhat.com> 0.5.0-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/messiggy/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 04:16:55 -0000	1.1
+++ .cvsignore	16 Sep 2008 22:47:44 -0000	1.2
@@ -0,0 +1 @@
+messiggy-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/messiggy/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 04:16:55 -0000	1.1
+++ sources	16 Sep 2008 22:47:44 -0000	1.2
@@ -0,0 +1 @@
+d30864143f7449d34b028b9566225ba1  messiggy-0.5.0.tar.gz



From mnagy at fedoraproject.org  Tue Sep 16 22:52:48 2008
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Tue, 16 Sep 2008 22:52:48 +0000 (UTC)
Subject: rpms/messiggy/F-9 import.log, NONE, 1.1 messiggy.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080916225248.28DF67013A@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/messiggy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17405/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log messiggy.spec 
Log Message:
initial import



--- NEW FILE import.log ---
messiggy-0_5_0-1_fc9:F-9:messiggy-0.5.0-1.fc9.src.rpm:1221605499


--- NEW FILE messiggy.spec ---
Name:		messiggy
Version:	0.5.0
Release:	1%{?dist}
Summary:	Messiggy is a database of celestial objects

Group:		Applications/Engineering
License:	GPLv2+
URL:		http://www.coyotegulch.com/products/messiggy/index.html
Source0:	http://www.coyotegulch.com/distfiles/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	itzam-core-devel, gtk2-devel


%description
Messiggy is a database of celestial objects, as cataloged by the French
astronomer Charles Messier in the mid-18th century.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README
%{_bindir}/messiggy
%{_datadir}/messiggy


%changelog
* Sat Sep 06 2008 Martin Nagy <mnagy at redhat.com> 0.5.0-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/messiggy/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 04:16:55 -0000	1.1
+++ .cvsignore	16 Sep 2008 22:52:17 -0000	1.2
@@ -0,0 +1 @@
+messiggy-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/messiggy/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 04:16:55 -0000	1.1
+++ sources	16 Sep 2008 22:52:17 -0000	1.2
@@ -0,0 +1 @@
+d30864143f7449d34b028b9566225ba1  messiggy-0.5.0.tar.gz



From mnagy at fedoraproject.org  Tue Sep 16 22:54:40 2008
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Tue, 16 Sep 2008 22:54:40 +0000 (UTC)
Subject: rpms/messiggy/EL-5 import.log, NONE, 1.1 messiggy.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080916225440.127287013A@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/messiggy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17893/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log messiggy.spec 
Log Message:
initial import



--- NEW FILE import.log ---
messiggy-0_5_0-1_fc9:EL-5:messiggy-0.5.0-1.fc9.src.rpm:1221605612


--- NEW FILE messiggy.spec ---
Name:		messiggy
Version:	0.5.0
Release:	1%{?dist}
Summary:	Messiggy is a database of celestial objects

Group:		Applications/Engineering
License:	GPLv2+
URL:		http://www.coyotegulch.com/products/messiggy/index.html
Source0:	http://www.coyotegulch.com/distfiles/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	itzam-core-devel, gtk2-devel


%description
Messiggy is a database of celestial objects, as cataloged by the French
astronomer Charles Messier in the mid-18th century.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README
%{_bindir}/messiggy
%{_datadir}/messiggy


%changelog
* Sat Sep 06 2008 Martin Nagy <mnagy at redhat.com> 0.5.0-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/messiggy/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 04:16:55 -0000	1.1
+++ .cvsignore	16 Sep 2008 22:54:09 -0000	1.2
@@ -0,0 +1 @@
+messiggy-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/messiggy/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 04:16:55 -0000	1.1
+++ sources	16 Sep 2008 22:54:09 -0000	1.2
@@ -0,0 +1 @@
+d30864143f7449d34b028b9566225ba1  messiggy-0.5.0.tar.gz



From mnagy at fedoraproject.org  Tue Sep 16 22:59:15 2008
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Tue, 16 Sep 2008 22:59:15 +0000 (UTC)
Subject: rpms/messiggy/devel import.log, NONE, 1.1 messiggy.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080916225915.999F67013A@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/messiggy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18595/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log messiggy.spec 
Log Message:
initial import



--- NEW FILE import.log ---
messiggy-0_5_0-1_fc9:HEAD:messiggy-0.5.0-1.fc9.src.rpm:1221605863


--- NEW FILE messiggy.spec ---
Name:		messiggy
Version:	0.5.0
Release:	1%{?dist}
Summary:	Messiggy is a database of celestial objects

Group:		Applications/Engineering
License:	GPLv2+
URL:		http://www.coyotegulch.com/products/messiggy/index.html
Source0:	http://www.coyotegulch.com/distfiles/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	itzam-core-devel, gtk2-devel


%description
Messiggy is a database of celestial objects, as cataloged by the French
astronomer Charles Messier in the mid-18th century.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README
%{_bindir}/messiggy
%{_datadir}/messiggy


%changelog
* Sat Sep 06 2008 Martin Nagy <mnagy at redhat.com> 0.5.0-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/messiggy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Sep 2008 04:16:55 -0000	1.1
+++ .cvsignore	16 Sep 2008 22:58:45 -0000	1.2
@@ -0,0 +1 @@
+messiggy-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/messiggy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Sep 2008 04:16:55 -0000	1.1
+++ sources	16 Sep 2008 22:58:45 -0000	1.2
@@ -0,0 +1 @@
+d30864143f7449d34b028b9566225ba1  messiggy-0.5.0.tar.gz



From agk at fedoraproject.org  Tue Sep 16 23:03:56 2008
From: agk at fedoraproject.org (Alasdair Kergon)
Date: Tue, 16 Sep 2008 23:03:56 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2.spec,1.137,1.138
Message-ID: <20080916230356.4B7577013A@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18940

Modified Files:
	lvm2.spec 
Log Message:
fix percent in comments; add comment for patch



Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- lvm2.spec	7 Aug 2008 17:57:18 -0000	1.137
+++ lvm2.spec	16 Sep 2008 23:03:25 -0000	1.138
@@ -12,7 +12,10 @@
 URL: http://sources.redhat.com/lvm2
 Source0: LVM2.%{version}.tgz
 Source1: device-mapper.%{device_mapper_version}.tgz
+
+# Customise lvmconf.sh for built-in clustered locking in Fedora
 Patch0: cluster-locking-built-in.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
 BuildRequires: ncurses-devel
@@ -455,7 +458,7 @@
 - Fix underquotations in lvm_dump.sh.
 - Print --help output to stdout, not stderr.
 - After a cmdline processing error, don't print help text but suggest --help.
-- Add %PVS extents option to lvresize, lvextend, and lvcreate.
+- Add %%PVS extents option to lvresize, lvextend, and lvcreate.
 - Remove no-longer-correct restrictions on PV arg count with stripes/mirrors.
 - Fix strdup memory leak in str_list_dup().
 - Link with -lpthread when static SELinux libraries require that.
@@ -852,7 +855,7 @@
 - rebuilt
 
 * Wed May 26 2004 Alasdair Kergon <agk at redhat.com> - 2.00.15-4
-- clone %description from LVM rpm
+- clone %%description from LVM rpm
 
 * Wed May 26 2004 Alasdair Kergon <agk at redhat.com> - 2.00.15-3
 - vgscan shouldn't return error status when no VGs present



From lutter at fedoraproject.org  Tue Sep 16 23:09:38 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 23:09:38 +0000 (UTC)
Subject: rpms/rubygems/EL-5 .cvsignore, 1.5, 1.6 rubygems.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20080916230938.810C97013A@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygems/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20346/EL-5

Modified Files:
	.cvsignore rubygems.spec sources 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Sep 2007 19:41:57 -0000	1.5
+++ .cvsignore	16 Sep 2008 23:09:08 -0000	1.6
@@ -1 +1 @@
-rubygems-0.9.4.tgz
+rubygems-1.2.0.tgz


Index: rubygems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/EL-5/rubygems.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rubygems.spec	14 Sep 2007 19:41:57 -0000	1.4
+++ rubygems.spec	16 Sep 2008 23:09:08 -0000	1.5
@@ -3,47 +3,29 @@
 %define gem_home %{gem_dir}/%{rb_ver}
 %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
-%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
-%define has_ruby_noarch %has_ruby_abi
-# Whether rdoc is in ruby-rdoc or in the main ruby package
-%define has_ruby_rdoc %has_ruby_abi
-# rdoc on RHEL4 has a bug that makes rdoc generation for rubygems fail
-%define suppress_rdoc 0%{?rhel:%rhel} == 4
-
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
-Version: 0.9.4
+Version: 1.2.0
 Release: 1%{?dist}
 Group: Development/Libraries
-License: Ruby License/GPL
+# No GPL version is specified.
+License: Ruby or GPL+
 URL: http://rubyforge.org/projects/rubygems/
-Source0: http://rubyforge.org/frs/download.php/20989/rubygems-0.9.4.tgz
+Source0: http://rubyforge.org/frs/download.php/38646/rubygems-1.2.0.tgz
 Patch0: noarch-gemdir.patch
-Patch1: no-rdoc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-%if %has_ruby_abi
-Requires: ruby(abi) = 1.8
-%endif
-BuildRequires: ruby
-%if %has_ruby_rdoc
-Requires: ruby-rdoc
-BuildRequires:  ruby-rdoc
-%endif
-%if %has_ruby_noarch
+Requires: ruby(abi) = 1.8 ruby-rdoc
+BuildRequires:  ruby ruby-rdoc
 BuildArch: noarch
-%endif
 Provides: ruby(rubygems) = %{version}
 
 %description
-RubyGems is the Ruby standard for publishing and managing third party 
+RubyGems is the Ruby standard for publishing and managing third party
 libraries.
 
 %prep
 %setup -q
 %patch0 -p1
-%if %suppress_rdoc
-%patch1 -p1
-%endif
 
 # Some of the library files start with #! which rpmlint doesn't like
 # and doesn't make much sense
@@ -52,41 +34,38 @@
 done
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" \
-ruby setup.rb config
-ruby setup.rb setup
-ruby doc/makedoc.rb
+# Nothing
 
 %install
 rm -rf $RPM_BUILD_ROOT
 GEM_HOME=$RPM_BUILD_ROOT%{gem_home} \
-    ruby setup.rb install --prefix=$RPM_BUILD_ROOT
+    ruby setup.rb --destdir=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, -)
-%doc README TODO ChangeLog Releases gemspecs
+%doc README TODO ChangeLog
 %doc GPL.txt LICENSE.txt
 %{_bindir}/gem
-%{_bindir}/gemlock
-%{_bindir}/gem_mirror
-%{_bindir}/gemri
-%{_bindir}/gem_server
-%{_bindir}/gemwhich
-%{_bindir}/index_gem_repository.rb
-%{_bindir}/update_rubygems
 
 %{gem_dir}
 
-%{ruby_sitelib}/gemconfigure.rb
 %{ruby_sitelib}/ubygems.rb
 %{ruby_sitelib}/rubygems.rb
 %{ruby_sitelib}/rubygems
-%{ruby_sitelib}/rbconfig/datadir.rb
+%{ruby_sitelib}/rbconfig
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 1.2.0-1
+- Updated for new setup.rb
+- Simplified by removing conditionals that were needed for EL-4;
+  there's just no way we can support that with newer rubygems
+
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.4-2
+- fix license tag
+
 * Fri Jul 27 2007 David Lutterkort <dlutter at redhat.com> - 0.9.4-1
 - Conditionalize so it builds on RHEL4
 
@@ -111,4 +90,4 @@
 - Updated for 0.8.11
 
 * Sun Oct 10 2004 Omar Kilani <omar at tinysofa.org> 0.8.1-1ts
-- First version of the package 
+- First version of the package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Sep 2007 19:41:57 -0000	1.5
+++ sources	16 Sep 2008 23:09:08 -0000	1.6
@@ -1 +1 @@
-b5680acaa019c80ea44fe87cc2e227da  rubygems-0.9.4.tgz
+b77a4234360735174d1692e6fc598402  rubygems-1.2.0.tgz



From lutter at fedoraproject.org  Tue Sep 16 23:09:38 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 23:09:38 +0000 (UTC)
Subject: rpms/rubygems/F-8 .cvsignore, 1.5, 1.6 rubygems.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20080916230938.B608F7013A@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygems/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20346/F-8

Modified Files:
	.cvsignore rubygems.spec sources 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Sep 2007 21:57:59 -0000	1.5
+++ .cvsignore	16 Sep 2008 23:09:08 -0000	1.6
@@ -1 +1 @@
-rubygems-0.9.4.tgz
+rubygems-1.2.0.tgz


Index: rubygems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/F-8/rubygems.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rubygems.spec	11 Sep 2007 21:57:59 -0000	1.4
+++ rubygems.spec	16 Sep 2008 23:09:08 -0000	1.5
@@ -3,47 +3,29 @@
 %define gem_home %{gem_dir}/%{rb_ver}
 %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
-%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
-%define has_ruby_noarch %has_ruby_abi
-# Whether rdoc is in ruby-rdoc or in the main ruby package
-%define has_ruby_rdoc %has_ruby_abi
-# rdoc on RHEL4 has a bug that makes rdoc generation for rubygems fail
-%define suppress_rdoc 0%{?rhel:%rhel} == 4
-
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
-Version: 0.9.4
+Version: 1.2.0
 Release: 1%{?dist}
 Group: Development/Libraries
-License: Ruby License/GPL
+# No GPL version is specified.
+License: Ruby or GPL+
 URL: http://rubyforge.org/projects/rubygems/
-Source0: http://rubyforge.org/frs/download.php/20989/rubygems-0.9.4.tgz
+Source0: http://rubyforge.org/frs/download.php/38646/rubygems-1.2.0.tgz
 Patch0: noarch-gemdir.patch
-Patch1: no-rdoc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-%if %has_ruby_abi
-Requires: ruby(abi) = 1.8
-%endif
-BuildRequires: ruby
-%if %has_ruby_rdoc
-Requires: ruby-rdoc
-BuildRequires:  ruby-rdoc
-%endif
-%if %has_ruby_noarch
+Requires: ruby(abi) = 1.8 ruby-rdoc
+BuildRequires:  ruby ruby-rdoc
 BuildArch: noarch
-%endif
 Provides: ruby(rubygems) = %{version}
 
 %description
-RubyGems is the Ruby standard for publishing and managing third party 
+RubyGems is the Ruby standard for publishing and managing third party
 libraries.
 
 %prep
 %setup -q
 %patch0 -p1
-%if %suppress_rdoc
-%patch1 -p1
-%endif
 
 # Some of the library files start with #! which rpmlint doesn't like
 # and doesn't make much sense
@@ -52,41 +34,38 @@
 done
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" \
-ruby setup.rb config
-ruby setup.rb setup
-ruby doc/makedoc.rb
+# Nothing
 
 %install
 rm -rf $RPM_BUILD_ROOT
 GEM_HOME=$RPM_BUILD_ROOT%{gem_home} \
-    ruby setup.rb install --prefix=$RPM_BUILD_ROOT
+    ruby setup.rb --destdir=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, -)
-%doc README TODO ChangeLog Releases gemspecs
+%doc README TODO ChangeLog
 %doc GPL.txt LICENSE.txt
 %{_bindir}/gem
-%{_bindir}/gemlock
-%{_bindir}/gem_mirror
-%{_bindir}/gemri
-%{_bindir}/gem_server
-%{_bindir}/gemwhich
-%{_bindir}/index_gem_repository.rb
-%{_bindir}/update_rubygems
 
 %{gem_dir}
 
-%{ruby_sitelib}/gemconfigure.rb
 %{ruby_sitelib}/ubygems.rb
 %{ruby_sitelib}/rubygems.rb
 %{ruby_sitelib}/rubygems
-%{ruby_sitelib}/rbconfig/datadir.rb
+%{ruby_sitelib}/rbconfig
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 1.2.0-1
+- Updated for new setup.rb
+- Simplified by removing conditionals that were needed for EL-4;
+  there's just no way we can support that with newer rubygems
+
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.4-2
+- fix license tag
+
 * Fri Jul 27 2007 David Lutterkort <dlutter at redhat.com> - 0.9.4-1
 - Conditionalize so it builds on RHEL4
 
@@ -111,4 +90,4 @@
 - Updated for 0.8.11
 
 * Sun Oct 10 2004 Omar Kilani <omar at tinysofa.org> 0.8.1-1ts
-- First version of the package 
+- First version of the package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Sep 2007 21:57:59 -0000	1.5
+++ sources	16 Sep 2008 23:09:08 -0000	1.6
@@ -1 +1 @@
-b5680acaa019c80ea44fe87cc2e227da  rubygems-0.9.4.tgz
+b77a4234360735174d1692e6fc598402  rubygems-1.2.0.tgz



From lutter at fedoraproject.org  Tue Sep 16 23:09:39 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 23:09:39 +0000 (UTC)
Subject: rpms/rubygems/devel .cvsignore, 1.5, 1.6 rubygems.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <20080916230939.409C97013A@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygems/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20346/devel

Modified Files:
	.cvsignore rubygems.spec sources 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Sep 2007 21:57:59 -0000	1.5
+++ .cvsignore	16 Sep 2008 23:09:08 -0000	1.6
@@ -1 +1 @@
-rubygems-0.9.4.tgz
+rubygems-1.2.0.tgz


Index: rubygems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/devel/rubygems.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygems.spec	3 Sep 2008 21:28:44 -0000	1.5
+++ rubygems.spec	16 Sep 2008 23:09:09 -0000	1.6
@@ -3,48 +3,29 @@
 %define gem_home %{gem_dir}/%{rb_ver}
 %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
-%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
-%define has_ruby_noarch %has_ruby_abi
-# Whether rdoc is in ruby-rdoc or in the main ruby package
-%define has_ruby_rdoc %has_ruby_abi
-# rdoc on RHEL4 has a bug that makes rdoc generation for rubygems fail
-%define suppress_rdoc 0%{?rhel:%rhel} == 4
-
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
-Version: 0.9.4
-Release: 2%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 Group: Development/Libraries
 # No GPL version is specified.
 License: Ruby or GPL+
 URL: http://rubyforge.org/projects/rubygems/
-Source0: http://rubyforge.org/frs/download.php/20989/rubygems-0.9.4.tgz
+Source0: http://rubyforge.org/frs/download.php/38646/rubygems-1.2.0.tgz
 Patch0: noarch-gemdir.patch
-Patch1: no-rdoc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-%if %has_ruby_abi
-Requires: ruby(abi) = 1.8
-%endif
-BuildRequires: ruby
-%if %has_ruby_rdoc
-Requires: ruby-rdoc
-BuildRequires:  ruby-rdoc
-%endif
-%if %has_ruby_noarch
+Requires: ruby(abi) = 1.8 ruby-rdoc
+BuildRequires:  ruby ruby-rdoc
 BuildArch: noarch
-%endif
 Provides: ruby(rubygems) = %{version}
 
 %description
-RubyGems is the Ruby standard for publishing and managing third party 
+RubyGems is the Ruby standard for publishing and managing third party
 libraries.
 
 %prep
 %setup -q
 %patch0 -p1
-%if %suppress_rdoc
-%patch1 -p1
-%endif
 
 # Some of the library files start with #! which rpmlint doesn't like
 # and doesn't make much sense
@@ -53,41 +34,35 @@
 done
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" \
-ruby setup.rb config
-ruby setup.rb setup
-ruby doc/makedoc.rb
+# Nothing
 
 %install
 rm -rf $RPM_BUILD_ROOT
 GEM_HOME=$RPM_BUILD_ROOT%{gem_home} \
-    ruby setup.rb install --prefix=$RPM_BUILD_ROOT
+    ruby setup.rb --destdir=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, -)
-%doc README TODO ChangeLog Releases gemspecs
+%doc README TODO ChangeLog
 %doc GPL.txt LICENSE.txt
 %{_bindir}/gem
-%{_bindir}/gemlock
-%{_bindir}/gem_mirror
-%{_bindir}/gemri
-%{_bindir}/gem_server
-%{_bindir}/gemwhich
-%{_bindir}/index_gem_repository.rb
-%{_bindir}/update_rubygems
 
 %{gem_dir}
 
-%{ruby_sitelib}/gemconfigure.rb
 %{ruby_sitelib}/ubygems.rb
 %{ruby_sitelib}/rubygems.rb
 %{ruby_sitelib}/rubygems
-%{ruby_sitelib}/rbconfig/datadir.rb
+%{ruby_sitelib}/rbconfig
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 1.2.0-1
+- Updated for new setup.rb
+- Simplified by removing conditionals that were needed for EL-4;
+  there's just no way we can support that with newer rubygems
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.4-2
 - fix license tag
 
@@ -115,4 +90,4 @@
 - Updated for 0.8.11
 
 * Sun Oct 10 2004 Omar Kilani <omar at tinysofa.org> 0.8.1-1ts
-- First version of the package 
+- First version of the package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Sep 2007 21:57:59 -0000	1.5
+++ sources	16 Sep 2008 23:09:09 -0000	1.6
@@ -1 +1 @@
-b5680acaa019c80ea44fe87cc2e227da  rubygems-0.9.4.tgz
+b77a4234360735174d1692e6fc598402  rubygems-1.2.0.tgz



From lutter at fedoraproject.org  Tue Sep 16 23:09:38 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 23:09:38 +0000 (UTC)
Subject: rpms/rubygems/F-9 .cvsignore, 1.5, 1.6 rubygems.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20080916230938.F102B7013A@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygems/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20346/F-9

Modified Files:
	.cvsignore rubygems.spec sources 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Sep 2007 21:57:59 -0000	1.5
+++ .cvsignore	16 Sep 2008 23:09:08 -0000	1.6
@@ -1 +1 @@
-rubygems-0.9.4.tgz
+rubygems-1.2.0.tgz


Index: rubygems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/F-9/rubygems.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rubygems.spec	11 Sep 2007 21:57:59 -0000	1.4
+++ rubygems.spec	16 Sep 2008 23:09:08 -0000	1.5
@@ -3,47 +3,29 @@
 %define gem_home %{gem_dir}/%{rb_ver}
 %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
-%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
-%define has_ruby_noarch %has_ruby_abi
-# Whether rdoc is in ruby-rdoc or in the main ruby package
-%define has_ruby_rdoc %has_ruby_abi
-# rdoc on RHEL4 has a bug that makes rdoc generation for rubygems fail
-%define suppress_rdoc 0%{?rhel:%rhel} == 4
-
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
-Version: 0.9.4
+Version: 1.2.0
 Release: 1%{?dist}
 Group: Development/Libraries
-License: Ruby License/GPL
+# No GPL version is specified.
+License: Ruby or GPL+
 URL: http://rubyforge.org/projects/rubygems/
-Source0: http://rubyforge.org/frs/download.php/20989/rubygems-0.9.4.tgz
+Source0: http://rubyforge.org/frs/download.php/38646/rubygems-1.2.0.tgz
 Patch0: noarch-gemdir.patch
-Patch1: no-rdoc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-%if %has_ruby_abi
-Requires: ruby(abi) = 1.8
-%endif
-BuildRequires: ruby
-%if %has_ruby_rdoc
-Requires: ruby-rdoc
-BuildRequires:  ruby-rdoc
-%endif
-%if %has_ruby_noarch
+Requires: ruby(abi) = 1.8 ruby-rdoc
+BuildRequires:  ruby ruby-rdoc
 BuildArch: noarch
-%endif
 Provides: ruby(rubygems) = %{version}
 
 %description
-RubyGems is the Ruby standard for publishing and managing third party 
+RubyGems is the Ruby standard for publishing and managing third party
 libraries.
 
 %prep
 %setup -q
 %patch0 -p1
-%if %suppress_rdoc
-%patch1 -p1
-%endif
 
 # Some of the library files start with #! which rpmlint doesn't like
 # and doesn't make much sense
@@ -52,41 +34,38 @@
 done
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" \
-ruby setup.rb config
-ruby setup.rb setup
-ruby doc/makedoc.rb
+# Nothing
 
 %install
 rm -rf $RPM_BUILD_ROOT
 GEM_HOME=$RPM_BUILD_ROOT%{gem_home} \
-    ruby setup.rb install --prefix=$RPM_BUILD_ROOT
+    ruby setup.rb --destdir=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, -)
-%doc README TODO ChangeLog Releases gemspecs
+%doc README TODO ChangeLog
 %doc GPL.txt LICENSE.txt
 %{_bindir}/gem
-%{_bindir}/gemlock
-%{_bindir}/gem_mirror
-%{_bindir}/gemri
-%{_bindir}/gem_server
-%{_bindir}/gemwhich
-%{_bindir}/index_gem_repository.rb
-%{_bindir}/update_rubygems
 
 %{gem_dir}
 
-%{ruby_sitelib}/gemconfigure.rb
 %{ruby_sitelib}/ubygems.rb
 %{ruby_sitelib}/rubygems.rb
 %{ruby_sitelib}/rubygems
-%{ruby_sitelib}/rbconfig/datadir.rb
+%{ruby_sitelib}/rbconfig
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 1.2.0-1
+- Updated for new setup.rb
+- Simplified by removing conditionals that were needed for EL-4;
+  there's just no way we can support that with newer rubygems
+
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.4-2
+- fix license tag
+
 * Fri Jul 27 2007 David Lutterkort <dlutter at redhat.com> - 0.9.4-1
 - Conditionalize so it builds on RHEL4
 
@@ -111,4 +90,4 @@
 - Updated for 0.8.11
 
 * Sun Oct 10 2004 Omar Kilani <omar at tinysofa.org> 0.8.1-1ts
-- First version of the package 
+- First version of the package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Sep 2007 21:57:59 -0000	1.5
+++ sources	16 Sep 2008 23:09:08 -0000	1.6
@@ -1 +1 @@
-b5680acaa019c80ea44fe87cc2e227da  rubygems-0.9.4.tgz
+b77a4234360735174d1692e6fc598402  rubygems-1.2.0.tgz



From lutter at fedoraproject.org  Tue Sep 16 23:13:02 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 23:13:02 +0000 (UTC)
Subject: rpms/rubygem-rails/EL-5 rubygem-rails.spec,1.5,1.6
Message-ID: <20080916231302.280677013A@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-rails/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21040/EL-5

Modified Files:
	rubygem-rails.spec 
Log Message:
require rubygems >= 1.1.1; the rails code checks that at runtime


Index: rubygem-rails.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/EL-5/rubygem-rails.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-rails.spec	16 Sep 2008 19:12:27 -0000	1.5
+++ rubygem-rails.spec	16 Sep 2008 23:12:31 -0000	1.6
@@ -7,13 +7,13 @@
 Summary: Web-application framework
 Name: rubygem-%{gemname}
 Version: 2.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: rubygems
+Requires: ruby(rubygems) >= 1.1.1
 Requires: rubygem(rake) >= 0.7.2
 Requires: rubygem(activesupport) = %{version}
 Requires: rubygem(activerecord) = %{version}
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-2
+- require rubygems >= 1.1.1; the rails code checks that at runtime
+
 * Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
 - New version (fixes CVE-2008-4094)
 



From lutter at fedoraproject.org  Tue Sep 16 23:13:02 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 23:13:02 +0000 (UTC)
Subject: rpms/rubygem-rails/F-8 rubygem-rails.spec,1.6,1.7
Message-ID: <20080916231302.687C77013A@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-rails/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21040/F-8

Modified Files:
	rubygem-rails.spec 
Log Message:
require rubygems >= 1.1.1; the rails code checks that at runtime


Index: rubygem-rails.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/F-8/rubygem-rails.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rubygem-rails.spec	16 Sep 2008 19:12:27 -0000	1.6
+++ rubygem-rails.spec	16 Sep 2008 23:12:32 -0000	1.7
@@ -7,13 +7,13 @@
 Summary: Web-application framework
 Name: rubygem-%{gemname}
 Version: 2.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: rubygems
+Requires: ruby(rubygems) >= 1.1.1
 Requires: rubygem(rake) >= 0.7.2
 Requires: rubygem(activesupport) = %{version}
 Requires: rubygem(activerecord) = %{version}
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-2
+- require rubygems >= 1.1.1; the rails code checks that at runtime
+
 * Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
 - New version (fixes CVE-2008-4094)
 



From lutter at fedoraproject.org  Tue Sep 16 23:13:03 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 23:13:03 +0000 (UTC)
Subject: rpms/rubygem-rails/devel rubygem-rails.spec,1.6,1.7
Message-ID: <20080916231303.14FD77013A@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-rails/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21040/devel

Modified Files:
	rubygem-rails.spec 
Log Message:
require rubygems >= 1.1.1; the rails code checks that at runtime


Index: rubygem-rails.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/devel/rubygem-rails.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rubygem-rails.spec	16 Sep 2008 19:12:28 -0000	1.6
+++ rubygem-rails.spec	16 Sep 2008 23:12:32 -0000	1.7
@@ -7,13 +7,13 @@
 Summary: Web-application framework
 Name: rubygem-%{gemname}
 Version: 2.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: rubygems
+Requires: ruby(rubygems) >= 1.1.1
 Requires: rubygem(rake) >= 0.7.2
 Requires: rubygem(activesupport) = %{version}
 Requires: rubygem(activerecord) = %{version}
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-2
+- require rubygems >= 1.1.1; the rails code checks that at runtime
+
 * Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
 - New version (fixes CVE-2008-4094)
 



From lutter at fedoraproject.org  Tue Sep 16 23:13:02 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 23:13:02 +0000 (UTC)
Subject: rpms/rubygem-rails/F-9 rubygem-rails.spec,1.6,1.7
Message-ID: <20080916231302.AB1387013A@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-rails/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21040/F-9

Modified Files:
	rubygem-rails.spec 
Log Message:
require rubygems >= 1.1.1; the rails code checks that at runtime


Index: rubygem-rails.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/F-9/rubygem-rails.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rubygem-rails.spec	16 Sep 2008 19:12:28 -0000	1.6
+++ rubygem-rails.spec	16 Sep 2008 23:12:32 -0000	1.7
@@ -7,13 +7,13 @@
 Summary: Web-application framework
 Name: rubygem-%{gemname}
 Version: 2.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: rubygems
+Requires: ruby(rubygems) >= 1.1.1
 Requires: rubygem(rake) >= 0.7.2
 Requires: rubygem(activesupport) = %{version}
 Requires: rubygem(activerecord) = %{version}
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-2
+- require rubygems >= 1.1.1; the rails code checks that at runtime
+
 * Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 2.1.1-1
 - New version (fixes CVE-2008-4094)
 



From lutter at fedoraproject.org  Tue Sep 16 23:17:32 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 23:17:32 +0000 (UTC)
Subject: rpms/rubygems/EL-5 noarch-gemdir.patch,1.1,1.2
Message-ID: <20080916231732.45D897013A@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygems/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21832/EL-5

Modified Files:
	noarch-gemdir.patch 
Log Message:
Updated patches for noarch gemdir

noarch-gemdir.patch:

Index: noarch-gemdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/EL-5/noarch-gemdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- noarch-gemdir.patch	28 Feb 2007 00:58:24 -0000	1.1
+++ noarch-gemdir.patch	16 Sep 2008 23:17:01 -0000	1.2
@@ -1,13 +1,13 @@
---- rubygems-0.9.1/lib/rubygems.rb.orig 2007-02-12 15:36:46.000000000 -0800
-+++ rubygems-0.9.1/lib/rubygems.rb      2007-02-12 15:43:35.000000000 -0800
-@@ -457,7 +457,9 @@
-       if defined? RUBY_FRAMEWORK_VERSION
-         return File.join(File.dirname(Config::CONFIG["sitedir"]), "Gems")
-       else
--        File.join(Config::CONFIG['libdir'], 'ruby', 'gems', Config::CONFIG['ruby_version'])
-+        gemdir = File::expand_path(File::join(Config::CONFIG["sitedir"],"..","gems"))
-+
-+        File.join(gemdir, Config::CONFIG['ruby_version'])
-       end
+diff -up rubygems-1.2.0/lib/rubygems/defaults.rb.orig rubygems-1.2.0/lib/rubygems/defaults.rb
+--- rubygems-1.2.0/lib/rubygems/defaults.rb.orig	2008-06-04 19:34:47.000000000 -0700
++++ rubygems-1.2.0/lib/rubygems/defaults.rb	2008-09-16 15:31:12.000000000 -0700
+@@ -15,7 +15,8 @@ module Gem
+       File.join ConfigMap[:libdir], RUBY_ENGINE, 'gems',
+                 ConfigMap[:ruby_version]
+     else
+-      File.join ConfigMap[:libdir], 'ruby', 'gems', ConfigMap[:ruby_version]
++      gemdir = File::expand_path(File::join(ConfigMap[:sitedir],"..","gems"))
++      File.join(gemdir, ConfigMap[:ruby_version])
      end
+   end
  



From lutter at fedoraproject.org  Tue Sep 16 23:17:32 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 23:17:32 +0000 (UTC)
Subject: rpms/rubygems/F-8 noarch-gemdir.patch,1.1,1.2
Message-ID: <20080916231732.6280E7013D@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygems/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21832/F-8

Modified Files:
	noarch-gemdir.patch 
Log Message:
Updated patches for noarch gemdir

noarch-gemdir.patch:

Index: noarch-gemdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/F-8/noarch-gemdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- noarch-gemdir.patch	28 Feb 2007 00:45:49 -0000	1.1
+++ noarch-gemdir.patch	16 Sep 2008 23:17:02 -0000	1.2
@@ -1,13 +1,13 @@
---- rubygems-0.9.1/lib/rubygems.rb.orig 2007-02-12 15:36:46.000000000 -0800
-+++ rubygems-0.9.1/lib/rubygems.rb      2007-02-12 15:43:35.000000000 -0800
-@@ -457,7 +457,9 @@
-       if defined? RUBY_FRAMEWORK_VERSION
-         return File.join(File.dirname(Config::CONFIG["sitedir"]), "Gems")
-       else
--        File.join(Config::CONFIG['libdir'], 'ruby', 'gems', Config::CONFIG['ruby_version'])
-+        gemdir = File::expand_path(File::join(Config::CONFIG["sitedir"],"..","gems"))
-+
-+        File.join(gemdir, Config::CONFIG['ruby_version'])
-       end
+diff -up rubygems-1.2.0/lib/rubygems/defaults.rb.orig rubygems-1.2.0/lib/rubygems/defaults.rb
+--- rubygems-1.2.0/lib/rubygems/defaults.rb.orig	2008-06-04 19:34:47.000000000 -0700
++++ rubygems-1.2.0/lib/rubygems/defaults.rb	2008-09-16 15:31:12.000000000 -0700
+@@ -15,7 +15,8 @@ module Gem
+       File.join ConfigMap[:libdir], RUBY_ENGINE, 'gems',
+                 ConfigMap[:ruby_version]
+     else
+-      File.join ConfigMap[:libdir], 'ruby', 'gems', ConfigMap[:ruby_version]
++      gemdir = File::expand_path(File::join(ConfigMap[:sitedir],"..","gems"))
++      File.join(gemdir, ConfigMap[:ruby_version])
      end
+   end
  



From lutter at fedoraproject.org  Tue Sep 16 23:17:32 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 23:17:32 +0000 (UTC)
Subject: rpms/rubygems/devel noarch-gemdir.patch,1.1,1.2
Message-ID: <20080916231732.D6A2A7013A@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygems/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21832/devel

Modified Files:
	noarch-gemdir.patch 
Log Message:
Updated patches for noarch gemdir

noarch-gemdir.patch:

Index: noarch-gemdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/devel/noarch-gemdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- noarch-gemdir.patch	28 Feb 2007 00:45:49 -0000	1.1
+++ noarch-gemdir.patch	16 Sep 2008 23:17:02 -0000	1.2
@@ -1,13 +1,13 @@
---- rubygems-0.9.1/lib/rubygems.rb.orig 2007-02-12 15:36:46.000000000 -0800
-+++ rubygems-0.9.1/lib/rubygems.rb      2007-02-12 15:43:35.000000000 -0800
-@@ -457,7 +457,9 @@
-       if defined? RUBY_FRAMEWORK_VERSION
-         return File.join(File.dirname(Config::CONFIG["sitedir"]), "Gems")
-       else
--        File.join(Config::CONFIG['libdir'], 'ruby', 'gems', Config::CONFIG['ruby_version'])
-+        gemdir = File::expand_path(File::join(Config::CONFIG["sitedir"],"..","gems"))
-+
-+        File.join(gemdir, Config::CONFIG['ruby_version'])
-       end
+diff -up rubygems-1.2.0/lib/rubygems/defaults.rb.orig rubygems-1.2.0/lib/rubygems/defaults.rb
+--- rubygems-1.2.0/lib/rubygems/defaults.rb.orig	2008-06-04 19:34:47.000000000 -0700
++++ rubygems-1.2.0/lib/rubygems/defaults.rb	2008-09-16 15:31:12.000000000 -0700
+@@ -15,7 +15,8 @@ module Gem
+       File.join ConfigMap[:libdir], RUBY_ENGINE, 'gems',
+                 ConfigMap[:ruby_version]
+     else
+-      File.join ConfigMap[:libdir], 'ruby', 'gems', ConfigMap[:ruby_version]
++      gemdir = File::expand_path(File::join(ConfigMap[:sitedir],"..","gems"))
++      File.join(gemdir, ConfigMap[:ruby_version])
      end
+   end
  



From lutter at fedoraproject.org  Tue Sep 16 23:17:32 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 23:17:32 +0000 (UTC)
Subject: rpms/rubygems/F-9 noarch-gemdir.patch,1.1,1.2
Message-ID: <20080916231732.9E9777013A@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygems/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21832/F-9

Modified Files:
	noarch-gemdir.patch 
Log Message:
Updated patches for noarch gemdir

noarch-gemdir.patch:

Index: noarch-gemdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/F-9/noarch-gemdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- noarch-gemdir.patch	28 Feb 2007 00:45:49 -0000	1.1
+++ noarch-gemdir.patch	16 Sep 2008 23:17:02 -0000	1.2
@@ -1,13 +1,13 @@
---- rubygems-0.9.1/lib/rubygems.rb.orig 2007-02-12 15:36:46.000000000 -0800
-+++ rubygems-0.9.1/lib/rubygems.rb      2007-02-12 15:43:35.000000000 -0800
-@@ -457,7 +457,9 @@
-       if defined? RUBY_FRAMEWORK_VERSION
-         return File.join(File.dirname(Config::CONFIG["sitedir"]), "Gems")
-       else
--        File.join(Config::CONFIG['libdir'], 'ruby', 'gems', Config::CONFIG['ruby_version'])
-+        gemdir = File::expand_path(File::join(Config::CONFIG["sitedir"],"..","gems"))
-+
-+        File.join(gemdir, Config::CONFIG['ruby_version'])
-       end
+diff -up rubygems-1.2.0/lib/rubygems/defaults.rb.orig rubygems-1.2.0/lib/rubygems/defaults.rb
+--- rubygems-1.2.0/lib/rubygems/defaults.rb.orig	2008-06-04 19:34:47.000000000 -0700
++++ rubygems-1.2.0/lib/rubygems/defaults.rb	2008-09-16 15:31:12.000000000 -0700
+@@ -15,7 +15,8 @@ module Gem
+       File.join ConfigMap[:libdir], RUBY_ENGINE, 'gems',
+                 ConfigMap[:ruby_version]
+     else
+-      File.join ConfigMap[:libdir], 'ruby', 'gems', ConfigMap[:ruby_version]
++      gemdir = File::expand_path(File::join(ConfigMap[:sitedir],"..","gems"))
++      File.join(gemdir, ConfigMap[:ruby_version])
      end
+   end
  



From lutter at fedoraproject.org  Tue Sep 16 23:25:07 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 23:25:07 +0000 (UTC)
Subject: rpms/rubygems/EL-5 rubygems.spec,1.5,1.6
Message-ID: <20080916232507.74BB07013A@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygems/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22788/EL-5

Modified Files:
	rubygems.spec 
Log Message:
Bump release because I forgot to check in newer patch


Index: rubygems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/EL-5/rubygems.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygems.spec	16 Sep 2008 23:09:08 -0000	1.5
+++ rubygems.spec	16 Sep 2008 23:24:37 -0000	1.6
@@ -6,7 +6,7 @@
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Libraries
 # No GPL version is specified.
 License: Ruby or GPL+
@@ -58,6 +58,9 @@
 %{ruby_sitelib}/rbconfig
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 1.2.0-2
+- Bump release because I forgot to check in newer patch
+
 * Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 1.2.0-1
 - Updated for new setup.rb
 - Simplified by removing conditionals that were needed for EL-4;



From lutter at fedoraproject.org  Tue Sep 16 23:25:07 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 23:25:07 +0000 (UTC)
Subject: rpms/rubygems/F-8 rubygems.spec,1.5,1.6
Message-ID: <20080916232507.A93DE7013A@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygems/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22788/F-8

Modified Files:
	rubygems.spec 
Log Message:
Bump release because I forgot to check in newer patch


Index: rubygems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/F-8/rubygems.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygems.spec	16 Sep 2008 23:09:08 -0000	1.5
+++ rubygems.spec	16 Sep 2008 23:24:37 -0000	1.6
@@ -6,7 +6,7 @@
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Libraries
 # No GPL version is specified.
 License: Ruby or GPL+
@@ -58,6 +58,9 @@
 %{ruby_sitelib}/rbconfig
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 1.2.0-2
+- Bump release because I forgot to check in newer patch
+
 * Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 1.2.0-1
 - Updated for new setup.rb
 - Simplified by removing conditionals that were needed for EL-4;



From lutter at fedoraproject.org  Tue Sep 16 23:25:08 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 23:25:08 +0000 (UTC)
Subject: rpms/rubygems/devel rubygems.spec,1.6,1.7
Message-ID: <20080916232508.223507013A@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygems/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22788/devel

Modified Files:
	rubygems.spec 
Log Message:
Bump release because I forgot to check in newer patch


Index: rubygems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/devel/rubygems.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rubygems.spec	16 Sep 2008 23:09:09 -0000	1.6
+++ rubygems.spec	16 Sep 2008 23:24:37 -0000	1.7
@@ -6,7 +6,7 @@
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Libraries
 # No GPL version is specified.
 License: Ruby or GPL+
@@ -58,6 +58,9 @@
 %{ruby_sitelib}/rbconfig
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 1.2.0-2
+- Bump release because I forgot to check in newer patch
+
 * Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 1.2.0-1
 - Updated for new setup.rb
 - Simplified by removing conditionals that were needed for EL-4;



From lutter at fedoraproject.org  Tue Sep 16 23:25:07 2008
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 16 Sep 2008 23:25:07 +0000 (UTC)
Subject: rpms/rubygems/F-9 rubygems.spec,1.5,1.6
Message-ID: <20080916232507.E1CE97013A@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygems/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22788/F-9

Modified Files:
	rubygems.spec 
Log Message:
Bump release because I forgot to check in newer patch


Index: rubygems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/F-9/rubygems.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygems.spec	16 Sep 2008 23:09:08 -0000	1.5
+++ rubygems.spec	16 Sep 2008 23:24:37 -0000	1.6
@@ -6,7 +6,7 @@
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Libraries
 # No GPL version is specified.
 License: Ruby or GPL+
@@ -58,6 +58,9 @@
 %{ruby_sitelib}/rbconfig
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 1.2.0-2
+- Bump release because I forgot to check in newer patch
+
 * Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 1.2.0-1
 - Updated for new setup.rb
 - Simplified by removing conditionals that were needed for EL-4;



From pkgdb at fedoraproject.org  Wed Sep 17 00:05:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 00:05:13 +0000
Subject: [pkgdb] bzr ownership updated
Message-ID: <20080917000513.F3588208D9F@bastion.fedora.phx.redhat.com>

Package bzr in Fedora 4 was orphaned by shahms

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzr



From pkgdb at fedoraproject.org  Wed Sep 17 00:05:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 00:05:20 +0000
Subject: [pkgdb] bzr ownership updated
Message-ID: <20080917000520.91906208DA4@bastion.fedora.phx.redhat.com>

Package bzr in Fedora 5 was orphaned by shahms

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzr



From pkgdb at fedoraproject.org  Wed Sep 17 00:05:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 00:05:24 +0000
Subject: [pkgdb] bzr ownership updated
Message-ID: <20080917000525.1E301208DA7@bastion.fedora.phx.redhat.com>

Package bzr in Fedora 6 was orphaned by shahms

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzr



From pkgdb at fedoraproject.org  Wed Sep 17 00:08:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 00:08:14 +0000
Subject: [pkgdb] bzr-gtk ownership updated
Message-ID: <20080917000814.E5E7B208DA3@bastion.fedora.phx.redhat.com>

Package bzr-gtk in Fedora 6 was orphaned by shahms

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzr-gtk



From pkgdb at fedoraproject.org  Wed Sep 17 00:08:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 00:08:12 +0000
Subject: [pkgdb] bzr-gtk ownership updated
Message-ID: <20080917000812.78878208D9F@bastion.fedora.phx.redhat.com>

Package bzr-gtk in Fedora 5 was orphaned by shahms

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzr-gtk



From pkgdb at fedoraproject.org  Wed Sep 17 00:09:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 00:09:40 +0000
Subject: [pkgdb] bzrtools ownership updated
Message-ID: <20080917000941.42D7B208D9F@bastion.fedora.phx.redhat.com>

Package bzrtools in Fedora 4 was orphaned by shahms

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzrtools



From pkgdb at fedoraproject.org  Wed Sep 17 00:09:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 00:09:42 +0000
Subject: [pkgdb] bzrtools ownership updated
Message-ID: <20080917000942.9E7C0208DA3@bastion.fedora.phx.redhat.com>

Package bzrtools in Fedora 5 was orphaned by shahms

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzrtools



From pkgdb at fedoraproject.org  Wed Sep 17 00:09:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 00:09:44 +0000
Subject: [pkgdb] bzrtools ownership updated
Message-ID: <20080917000944.5D02B208DA6@bastion.fedora.phx.redhat.com>

Package bzrtools in Fedora 6 was orphaned by shahms

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzrtools



From pkgdb at fedoraproject.org  Wed Sep 17 00:11:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 00:11:22 +0000
Subject: [pkgdb] python-sqlalchemy ownership updated
Message-ID: <20080917001122.93C44208DA0@bastion.fedora.phx.redhat.com>

Package python-sqlalchemy in Fedora 4 was orphaned by shahms

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-sqlalchemy



From pkgdb at fedoraproject.org  Wed Sep 17 00:11:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 00:11:24 +0000
Subject: [pkgdb] python-sqlalchemy ownership updated
Message-ID: <20080917001124.CCA61208DA6@bastion.fedora.phx.redhat.com>

Package python-sqlalchemy in Fedora 5 was orphaned by shahms

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-sqlalchemy



From pkgdb at fedoraproject.org  Wed Sep 17 00:11:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 00:11:27 +0000
Subject: [pkgdb] python-sqlalchemy ownership updated
Message-ID: <20080917001127.918CD208DAB@bastion.fedora.phx.redhat.com>

Package python-sqlalchemy in Fedora 6 was orphaned by shahms

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-sqlalchemy



From dcantrel at fedoraproject.org  Wed Sep 17 00:42:30 2008
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed, 17 Sep 2008 00:42:30 +0000 (UTC)
Subject: rpms/dhcp/devel dhclient-script,1.1,1.2 dhcp.spec,1.219,1.220
Message-ID: <20080917004230.E770D7013C@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32049

Modified Files:
	dhclient-script dhcp.spec 
Log Message:
* Tue Sep 16 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-24
- 'server' -> 'service' in dhclient-script (#462343)



Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhclient-script,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhclient-script	29 Aug 2008 21:52:04 -0000	1.1
+++ dhclient-script	17 Sep 2008 00:42:00 -0000	1.2
@@ -362,7 +362,7 @@
             if [ $contents -gt 0 ]; then
                 if [ -x /etc/rc.d/init.d/ypbind ] &&
                    [ -r /var/run/ypbind.pid ]; then
-                    server ypbind restart >/dev/null 2>&1
+                    service ypbind restart >/dev/null 2>&1
                 fi
             fi
         fi


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- dhcp.spec	29 Aug 2008 21:52:04 -0000	1.219
+++ dhcp.spec	17 Sep 2008 00:42:00 -0000	1.220
@@ -4,7 +4,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  4.0.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.
@@ -440,6 +440,9 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Tue Sep 16 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-24
+- 'server' -> 'service' in dhclient-script (#462343)
+
 * Fri Aug 29 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-23
 - Prevent $metric from being set to '' (#460640)
 - Remove unnecessary warning messages



From dchen at fedoraproject.org  Wed Sep 17 00:47:32 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 17 Sep 2008 00:47:32 +0000 (UTC)
Subject: rpms/libchewing/devel import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 libchewing.spec, 1.20, 1.21 sources, 1.3,
	1.4 libchewing-0.3.0-11.bz195416.patch, 1.1,
	NONE libchewing-0.3.0-3.bz199353.patch, 1.1,
	NONE libchewing-0.3.0-4.bz206232.patch, 1.1,
	NONE libchewing-0.3.0-5.bz216581a.patch, 1.1,
	NONE libchewing-0.3.0-5.bz216581b.patch, 1.1,
	NONE libchewing-0.3.0-6.bz231568.patch, 1.1,
	NONE libchewing-0.3.0-7.bz237233.patch, 1.1,
	NONE libchewing-0.3.0-8.bz237916.patch, 1.1,
	NONE libchewing-0.3.0-9.bz200694.patch, 1.1, NONE
Message-ID: <20080917004732.8E0837013C@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libchewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv483/devel

Modified Files:
	.cvsignore libchewing.spec sources 
Added Files:
	import.log 
Removed Files:
	libchewing-0.3.0-11.bz195416.patch 
	libchewing-0.3.0-3.bz199353.patch 
	libchewing-0.3.0-4.bz206232.patch 
	libchewing-0.3.0-5.bz216581a.patch 
	libchewing-0.3.0-5.bz216581b.patch 
	libchewing-0.3.0-6.bz231568.patch 
	libchewing-0.3.0-7.bz237233.patch 
	libchewing-0.3.0-8.bz237916.patch 
	libchewing-0.3.0-9.bz200694.patch 
Log Message:
Upstream update


--- NEW FILE import.log ---
libchewing-0_3_0_901-0_fc9:HEAD:libchewing-0.3.0.901-0.fc9.src.rpm:1221612386


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 May 2006 06:05:23 -0000	1.3
+++ .cvsignore	17 Sep 2008 00:47:02 -0000	1.4
@@ -1 +1 @@
-libchewing-0.3.0.tar.gz
+libchewing-0.3.0.901.tar.gz


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/devel/libchewing.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libchewing.spec	29 May 2008 15:57:12 -0000	1.20
+++ libchewing.spec	17 Sep 2008 00:47:02 -0000	1.21
@@ -1,23 +1,23 @@
-Name:		libchewing
-Version:	0.3.0
-Release: 	12%{?dist}
-Summary:      	Intelligent phonetic input method library for Traditional Chinese
-
-Group: 		System Environment/Libraries
-License:	LGPLv2+
-URL:		http://chewing.csie.net/
-Source:		http://chewing.csie.net/download/libchewing/%{name}-%{version}.tar.gz
-Patch0:		libchewing-0.3.0-3.bz199353.patch
-Patch1:		libchewing-0.3.0-4.bz206232.patch
-Patch2:		libchewing-0.3.0-5.bz216581a.patch
-Patch3:		libchewing-0.3.0-5.bz216581b.patch
-Patch4:		libchewing-0.3.0-6.bz231568.patch
-Patch5:		libchewing-0.3.0-7.bz237233.patch
-Patch6:		libchewing-0.3.0-8.bz237916.patch
-Patch7:		libchewing-0.3.0-9.bz200694.patch
-Patch8:	        libchewing-0.3.0-11.bz195416.patch
+Name:           libchewing
+Version:        0.3.0.901
+Release:        0%{?dist}
+Summary:        Intelligent phonetic input method library for Traditional Chinese
+
+Group:          System Environment/Libraries
+License:        LGPLv2+
+URL:            http://chewing.csie.net/
+Source:         http://chewing.csie.net/download/rc/libchewing/%{name}-%{version}.tar.gz
+#Patch0: libchewing-0.3.0-3.bz199353.patch
+#Patch1: libchewing-0.3.0-4.bz206232.patch
+#Patch2: libchewing-0.3.0-5.bz216581a.patch
+#Patch3: libchewing-0.3.0-5.bz216581b.patch
+#Patch4: libchewing-0.3.0-6.bz231568.patch
+#Patch5: libchewing-0.3.0-7.bz237233.patch
+#Patch6: libchewing-0.3.0-8.bz237916.patch
+#Patch7: libchewing-0.3.0-9.bz200694.patch
+#Patch8: libchewing-0.3.0-11.bz195416.patch
 
-BuildRoot:  	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 libchewing is an intelligent phonetic input method library for Chinese.
@@ -28,24 +28,25 @@
 
 
 %package -n %{name}-devel
-Summary:	Development files for libchewing
-Group: 		Development/Libraries
-Requires: 	%{name} = %{version}-%{release}, pkgconfig
+Summary:        Development files for libchewing
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}, pkgconfig
 
 %description -n %{name}-devel
-Headers and other files needed to develop applications using the %name library.
+Headers and other files needed to develop applications using the %name 
+library.
 
 %prep
 %setup -q
-%patch0 -p1 -b .1-bz199353
-%patch1 -p1 -b .2-bz206232
-%patch2 -p1 -b .3-bz216581a
-%patch3 -p1 -b .4-bz216581b
-%patch4 -p1 -b .5-bz231568
-%patch5 -p1 -b .6-bz237233
-%patch6 -p1 -b .7-bz237916
-%patch7 -p1 -b .8-bz200694
-%patch8 -p1 -b .9-bz195416
+#%patch0 -p1 -b .1-bz199353
+#%patch1 -p1 -b .2-bz206232
+#%patch2 -p1 -b .3-bz216581a
+#%patch3 -p1 -b .4-bz216581b
+#%patch4 -p1 -b .5-bz231568
+#%patch5 -p1 -b .6-bz237233
+#%patch6 -p1 -b .7-bz237916
+#%patch7 -p1 -b .8-bz200694
+#%patch8 -p1 -b .9-bz195416
 
 %build
 %configure --disable-static
@@ -79,6 +80,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Sep 17 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.0.901-0
+- Upstream update.
+
 * Thu May 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.0-12
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 May 2006 06:05:26 -0000	1.3
+++ sources	17 Sep 2008 00:47:02 -0000	1.4
@@ -1 +1 @@
-d60bdc2b3f81b70963cd01a93049a8e3  libchewing-0.3.0.tar.gz
+29612220ef1fd00a325a89f6162934ce  libchewing-0.3.0.901.tar.gz


--- libchewing-0.3.0-11.bz195416.patch DELETED ---


--- libchewing-0.3.0-3.bz199353.patch DELETED ---


--- libchewing-0.3.0-4.bz206232.patch DELETED ---


--- libchewing-0.3.0-5.bz216581a.patch DELETED ---


--- libchewing-0.3.0-5.bz216581b.patch DELETED ---


--- libchewing-0.3.0-6.bz231568.patch DELETED ---


--- libchewing-0.3.0-7.bz237233.patch DELETED ---


--- libchewing-0.3.0-8.bz237916.patch DELETED ---


--- libchewing-0.3.0-9.bz200694.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Sep 17 01:09:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 01:09:32 +0000
Subject: [pkgdb] libchewing (Fedora, 9) updated by petersen
Message-ID: <20080917010932.4C861208D9B@bastion.fedora.phx.redhat.com>

petersen changed owner of libchewing in Fedora 9 to dchen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libchewing



From pkgdb at fedoraproject.org  Wed Sep 17 01:09:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 01:09:32 +0000
Subject: [pkgdb] libchewing (Fedora, 8) updated by petersen
Message-ID: <20080917010932.586C0208DA2@bastion.fedora.phx.redhat.com>

petersen changed owner of libchewing in Fedora 8 to dchen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libchewing



From pkgdb at fedoraproject.org  Wed Sep 17 01:09:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 01:09:45 +0000
Subject: [pkgdb] scim-chewing (Fedora, 8) updated by petersen
Message-ID: <20080917010945.ABAD1208DA7@bastion.fedora.phx.redhat.com>

petersen changed owner of scim-chewing in Fedora 8 to dchen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scim-chewing



From pkgdb at fedoraproject.org  Wed Sep 17 01:09:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 01:09:45 +0000
Subject: [pkgdb] scim-chewing (Fedora, 9) updated by petersen
Message-ID: <20080917010945.9A4F3208D9B@bastion.fedora.phx.redhat.com>

petersen changed owner of scim-chewing in Fedora 9 to dchen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scim-chewing



From pkgdb at fedoraproject.org  Wed Sep 17 01:31:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 01:31:57 +0000
Subject: [pkgdb] python-psycopg ownership updated
Message-ID: <20080917013157.8AD3D208D9A@bastion.fedora.phx.redhat.com>

Package python-psycopg in Fedora devel is now owned by devrim

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psycopg



From pkgdb at fedoraproject.org  Wed Sep 17 01:32:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 01:32:08 +0000
Subject: [pkgdb] python-psycopg ownership updated
Message-ID: <20080917013208.C5320208D9F@bastion.fedora.phx.redhat.com>

Package python-psycopg in Fedora 8 is now owned by devrim

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psycopg



From pkgdb at fedoraproject.org  Wed Sep 17 01:32:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 01:32:11 +0000
Subject: [pkgdb] python-psycopg ownership updated
Message-ID: <20080917013211.B66D7208D9A@bastion.fedora.phx.redhat.com>

Package python-psycopg in Fedora 9 is now owned by devrim

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psycopg



From dchen at fedoraproject.org  Wed Sep 17 01:33:07 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 17 Sep 2008 01:33:07 +0000 (UTC)
Subject: rpms/scim-chewing/devel import.log, NONE,
	1.1 scim-chewing-0.3.1.901.buildFix.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 scim-chewing.spec, 1.40, 1.41 sources, 1.4,
	1.5 scim-chewing-0.3.1-10.bz237924.patch, 1.1,
	NONE scim-chewing-0.3.1-11.bz200694.patch, 1.1,
	NONE scim-chewing-0.3.1-13.gcc.patch, 1.1,
	NONE scim-chewing-0.3.1-14.bz228428.patch, 1.1,
	NONE scim-chewing-0.3.1-15.bz195416.patch, 1.1,
	NONE scim-chewing-0.3.1-4.bz197556.patch, 1.1,
	NONE scim-chewing-0.3.1-5.bz206125.patch, 1.1,
	NONE scim-chewing-0.3.1-6.bz206112.patch, 1.1,
	NONE scim-chewing-0.3.1-8.bz206120.patch, 1.1,
	NONE scim-chewing-0.3.1-9.bz216581.patch, 1.1, NONE
Message-ID: <20080917013307.0E8657013C@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/scim-chewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10327/devel

Modified Files:
	.cvsignore scim-chewing.spec sources 
Added Files:
	import.log scim-chewing-0.3.1.901.buildFix.patch 
Removed Files:
	scim-chewing-0.3.1-10.bz237924.patch 
	scim-chewing-0.3.1-11.bz200694.patch 
	scim-chewing-0.3.1-13.gcc.patch 
	scim-chewing-0.3.1-14.bz228428.patch 
	scim-chewing-0.3.1-15.bz195416.patch 
	scim-chewing-0.3.1-4.bz197556.patch 
	scim-chewing-0.3.1-5.bz206125.patch 
	scim-chewing-0.3.1-6.bz206112.patch 
	scim-chewing-0.3.1-8.bz206120.patch 
	scim-chewing-0.3.1-9.bz216581.patch 
Log Message:
Upstream update


--- NEW FILE import.log ---
scim-chewing-0_3_1_901-0_fc9:HEAD:scim-chewing-0.3.1.901-0.fc9.src.rpm:1221615104

scim-chewing-0.3.1.901.buildFix.patch:

--- NEW FILE scim-chewing-0.3.1.901.buildFix.patch ---
diff -up ./configure.ac.buildFix ./configure.ac
--- ./configure.ac.buildFix	2008-09-17 11:18:02.000000000 +1000
+++ ./configure.ac	2008-09-17 11:18:52.000000000 +1000
@@ -47,7 +47,7 @@ AC_TYPE_SIZE_T
 # Checks for libraries.
 
 SCIM_VERSION=1.0.0
-CHEWING_VERSION=0.3.091
+CHEWING_VERSION=0.3.0.901
 
 PKG_CHECK_MODULES(SCIM, [scim >= $SCIM_VERSION])
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scim-chewing/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Jun 2006 12:52:45 -0000	1.4
+++ .cvsignore	17 Sep 2008 01:32:36 -0000	1.5
@@ -1 +1 @@
-scim-chewing-0.3.1.tar.gz
+scim-chewing-0.3.1.901.tar.gz


Index: scim-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-chewing/devel/scim-chewing.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- scim-chewing.spec	29 May 2008 15:58:28 -0000	1.40
+++ scim-chewing.spec	17 Sep 2008 01:32:36 -0000	1.41
@@ -1,26 +1,27 @@
 Name:           scim-chewing
-Version:        0.3.1
-Release:        16%{?dist}
+Version:        0.3.1.901
+Release:        0%{?dist}
 Summary:        Chewing Chinese input method for SCIM
 
 License:        GPLv2+
 Url:            http://chewing.csie.net/
 Group:          System Environment/Libraries
-Source:         http://chewing.csie.net/download/scim/%{name}-%{version}.tar.gz
+Source:         http://chewing.csie.net/download/rc/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}
-BuildRequires:  scim-devel, libchewing-devel >= 0.3.0-9, gettext, intltool
+BuildRequires:  scim-devel, libchewing-devel >= 0.3.0.901, gettext, intltool
 Requires:       scim
 Obsoletes:      iiimf-le-xcin <= 0.1.10
-Patch0:         scim-chewing-0.3.1-4.bz197556.patch
-Patch1:         scim-chewing-0.3.1-5.bz206125.patch
-Patch2:         scim-chewing-0.3.1-6.bz206112.patch
-Patch3:         scim-chewing-0.3.1-8.bz206120.patch
-Patch4:         scim-chewing-0.3.1-9.bz216581.patch
-Patch5:         scim-chewing-0.3.1-10.bz237924.patch
-Patch6:         scim-chewing-0.3.1-11.bz200694.patch
-Patch7:         scim-chewing-0.3.1-13.gcc.patch
-Patch8:         scim-chewing-0.3.1-14.bz228428.patch
-Patch9:         scim-chewing-0.3.1-15.bz195416.patch
+#Patch0:         scim-chewing-0.3.1-4.bz197556.patch
+#Patch1:         scim-chewing-0.3.1-5.bz206125.patch
+#Patch2:         scim-chewing-0.3.1-6.bz206112.patch
+#Patch3:         scim-chewing-0.3.1-8.bz206120.patch
+#Patch4:         scim-chewing-0.3.1-9.bz216581.patch
+#Patch5:         scim-chewing-0.3.1-10.bz237924.patch
+#Patch6:         scim-chewing-0.3.1-11.bz200694.patch
+#Patch7:         scim-chewing-0.3.1-13.gcc.patch
+#Patch8:         scim-chewing-0.3.1-14.bz228428.patch
+#Patch9:         scim-chewing-0.3.1-15.bz195416.patch
+Patch10:         scim-chewing-0.3.1.901.buildFix.patch
 
 %description
 This package provides Chewing Chinese input method for SCIM. 
@@ -28,18 +29,20 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .0-bz197556
-%patch1 -p1 -b .1-bz206125
-%patch2 -p1 -b .2-bz206112
-%patch3 -p1 -b .3-bz206120
-%patch4 -p1 -b .4-bz216581
-%patch5 -p1 -b .5-bz237924
-%patch6 -p1 -b .6-bz200694
-%patch7 -p1 -b .7-gcc
-%patch8 -p1 -b .8-bz228428
-%patch9 -p1 -b .9-bz195416
+#%patch0 -p1 -b .0-bz197556
+#%patch1 -p1 -b .1-bz206125
+#%patch2 -p1 -b .2-bz206112
+#%patch3 -p1 -b .3-bz206120
+#%patch4 -p1 -b .4-bz216581
+#%patch5 -p1 -b .5-bz237924
+#%patch6 -p1 -b .6-bz200694
+#%patch7 -p1 -b .7-gcc
+#%patch8 -p1 -b .8-bz228428
+#%patch9 -p1 -b .9-bz195416
+%patch10 -p1 -b .buildFix
 
 %build
+./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -67,6 +70,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.1.901-0
+- Upstream update.
+
 * Thu May 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.1-16
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scim-chewing/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Jun 2006 12:52:45 -0000	1.4
+++ sources	17 Sep 2008 01:32:36 -0000	1.5
@@ -1 +1 @@
-7231e143e408b96f8374be9026ce6184  scim-chewing-0.3.1.tar.gz
+0910d0d0575d2f2f84403fdb8d622ac7  scim-chewing-0.3.1.901.tar.gz


--- scim-chewing-0.3.1-10.bz237924.patch DELETED ---


--- scim-chewing-0.3.1-11.bz200694.patch DELETED ---


--- scim-chewing-0.3.1-13.gcc.patch DELETED ---


--- scim-chewing-0.3.1-14.bz228428.patch DELETED ---


--- scim-chewing-0.3.1-15.bz195416.patch DELETED ---


--- scim-chewing-0.3.1-4.bz197556.patch DELETED ---


--- scim-chewing-0.3.1-5.bz206125.patch DELETED ---


--- scim-chewing-0.3.1-6.bz206112.patch DELETED ---


--- scim-chewing-0.3.1-8.bz206120.patch DELETED ---


--- scim-chewing-0.3.1-9.bz216581.patch DELETED ---



From kaitlin at fedoraproject.org  Wed Sep 17 01:34:09 2008
From: kaitlin at fedoraproject.org (Kaitlin Rupert)
Date: Wed, 17 Sep 2008 01:34:09 +0000 (UTC)
Subject: rpms/libcmpiutil/devel handle_inv_class.patch, NONE,
	1.1 libcmpiutil.spec, 1.5, 1.6
Message-ID: <20080917013409.8F89A7013C@cvs1.fedora.phx.redhat.com>

Author: kaitlin

Update of /cvs/pkgs/rpms/libcmpiutil/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10440

Modified Files:
	libcmpiutil.spec 
Added Files:
	handle_inv_class.patch 
Log Message:
Added handle_inv_class.patch and updated spec file to include new patch.  This is for revision 0.4-3.



handle_inv_class.patch:

--- NEW FILE handle_inv_class.patch ---
# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1220466913 25200
# Node ID 36c97d5c8c9f0eea12a87eae4e01bb80c9840ece
# Parent  b27fbfbc713cae6807aa9ecc97ae6de34cc5d5d2
[CU] Fix handling of invalid class in mof parser

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r b27fbfbc713c -r 36c97d5c8c9f eo_util_parser.y
--- a/eo_util_parser.y	Mon Jul 14 15:32:45 2008 -0700
+++ b/eo_util_parser.y	Wed Sep 03 11:35:13 2008 -0700
@@ -23,6 +23,7 @@
 
 #define RC_OK 0
 #define RC_EOF EOF
+#define RC_INVALID_CLASS -1000
 
 /* DEFINE ANY GLOBAL VARS HERE */
 static const CMPIBroker * _BROKER;
@@ -76,6 +77,8 @@
 			*_INSTANCE = CMNewInstance(_BROKER,
 						   op,
 						   NULL);
+			if (*_INSTANCE == NULL)
+				return RC_INVALID_CLASS;
 			free($3);
 			}
 		properties '}' ';'


Index: libcmpiutil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcmpiutil/devel/libcmpiutil.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libcmpiutil.spec	9 Sep 2008 20:17:49 -0000	1.5
+++ libcmpiutil.spec	17 Sep 2008 01:33:39 -0000	1.6
@@ -3,7 +3,7 @@
 Summary: CMPI Utility Library
 Name: libcmpiutil
 Version: 0.4
-Release: 2%{?dist}%{?extra_release}
+Release: 3%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: ftp://libvirt.org/libvirt-cim/libcmpiutil-%{version}.tar.gz
@@ -14,7 +14,6 @@
 BuildRequires: bison
 BuildRequires: libxml2-devel
 BuildConflicts: sblim-cmpi-devel
-Patch0: rep_disabled_ind.patch 
 
 %description
 Libcmpiutil is a library of utility functions for CMPI providers.
@@ -40,7 +39,6 @@
 %prep
 %setup -q
 chmod -x *.c *.y *.h *.l
-%patch0 -p1
 
 %build
 %configure --enable-static=no
@@ -77,8 +75,11 @@
 %doc doc/SubmittingPatches
 
 %changelog
+* Wed Sep 03 2008 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.4-3
+- Added add handle_inv_class.patch to handle invalid classes in mof parser 
+
 * Fri Aug 29 2008 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.4-2
-- Added add rep_disabled_ind.patch patch to enable disabled indication reporting
+- Added add rep_disabled_ind.patch to enable disabled indication reporting
 
 * Tue May 20 2008 Dan Smith <danms at us.ibm.com> - 0.4-1
 - Updated to official 0.4 source release



From dchen at fedoraproject.org  Wed Sep 17 01:35:57 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 17 Sep 2008 01:35:57 +0000 (UTC)
Subject: rpms/scim-chewing/F-9 import.log, NONE,
	1.1 scim-chewing-0.3.1.901.buildFix.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 scim-chewing.spec, 1.37, 1.38 sources, 1.4,
	1.5 scim-chewing-0.3.1-10.bz237924.patch, 1.1,
	NONE scim-chewing-0.3.1-11.bz200694.patch, 1.1,
	NONE scim-chewing-0.3.1-13.gcc.patch, 1.1,
	NONE scim-chewing-0.3.1-14.bz228428.patch, 1.1,
	NONE scim-chewing-0.3.1-4.bz197556.patch, 1.1,
	NONE scim-chewing-0.3.1-5.bz206125.patch, 1.1,
	NONE scim-chewing-0.3.1-6.bz206112.patch, 1.1,
	NONE scim-chewing-0.3.1-8.bz206120.patch, 1.1,
	NONE scim-chewing-0.3.1-9.bz216581.patch, 1.1, NONE
Message-ID: <20080917013557.8E2F87013C@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/scim-chewing/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11462/F-9

Modified Files:
	.cvsignore scim-chewing.spec sources 
Added Files:
	import.log scim-chewing-0.3.1.901.buildFix.patch 
Removed Files:
	scim-chewing-0.3.1-10.bz237924.patch 
	scim-chewing-0.3.1-11.bz200694.patch 
	scim-chewing-0.3.1-13.gcc.patch 
	scim-chewing-0.3.1-14.bz228428.patch 
	scim-chewing-0.3.1-4.bz197556.patch 
	scim-chewing-0.3.1-5.bz206125.patch 
	scim-chewing-0.3.1-6.bz206112.patch 
	scim-chewing-0.3.1-8.bz206120.patch 
	scim-chewing-0.3.1-9.bz216581.patch 
Log Message:
Upstream update


--- NEW FILE import.log ---
scim-chewing-0_3_1_901-0_fc9:F-9:scim-chewing-0.3.1.901-0.fc9.src.rpm:1221615321

scim-chewing-0.3.1.901.buildFix.patch:

--- NEW FILE scim-chewing-0.3.1.901.buildFix.patch ---
diff -up ./configure.ac.buildFix ./configure.ac
--- ./configure.ac.buildFix	2008-09-17 11:18:02.000000000 +1000
+++ ./configure.ac	2008-09-17 11:18:52.000000000 +1000
@@ -47,7 +47,7 @@ AC_TYPE_SIZE_T
 # Checks for libraries.
 
 SCIM_VERSION=1.0.0
-CHEWING_VERSION=0.3.091
+CHEWING_VERSION=0.3.0.901
 
 PKG_CHECK_MODULES(SCIM, [scim >= $SCIM_VERSION])
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scim-chewing/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Jun 2006 12:52:45 -0000	1.4
+++ .cvsignore	17 Sep 2008 01:35:26 -0000	1.5
@@ -1 +1 @@
-scim-chewing-0.3.1.tar.gz
+scim-chewing-0.3.1.901.tar.gz


Index: scim-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-chewing/F-9/scim-chewing.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- scim-chewing.spec	8 Apr 2008 07:08:02 -0000	1.37
+++ scim-chewing.spec	17 Sep 2008 01:35:27 -0000	1.38
@@ -1,25 +1,27 @@
 Name:           scim-chewing
-Version:        0.3.1
-Release:        14%{?dist}
+Version:        0.3.1.901
+Release:        0%{?dist}
 Summary:        Chewing Chinese input method for SCIM
 
-License:        GPL
+License:        GPLv2+
 Url:            http://chewing.csie.net/
 Group:          System Environment/Libraries
-Source:         http://chewing.csie.net/download/scim/%{name}-%{version}.tar.gz
+Source:         http://chewing.csie.net/download/rc/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}
-BuildRequires:  scim-devel, libchewing-devel >= 0.3.0-9, gettext, intltool
+BuildRequires:  scim-devel, libchewing-devel >= 0.3.0.901, gettext, intltool
 Requires:       scim
 Obsoletes:      iiimf-le-xcin <= 0.1.10
-Patch0:         scim-chewing-0.3.1-4.bz197556.patch
-Patch1:         scim-chewing-0.3.1-5.bz206125.patch
-Patch2:         scim-chewing-0.3.1-6.bz206112.patch
-Patch3:         scim-chewing-0.3.1-8.bz206120.patch
-Patch4:         scim-chewing-0.3.1-9.bz216581.patch
-Patch5:         scim-chewing-0.3.1-10.bz237924.patch
-Patch6:         scim-chewing-0.3.1-11.bz200694.patch
-Patch7:         scim-chewing-0.3.1-13.gcc.patch
-Patch8:         scim-chewing-0.3.1-14.bz228428.patch
+#Patch0:         scim-chewing-0.3.1-4.bz197556.patch
+#Patch1:         scim-chewing-0.3.1-5.bz206125.patch
+#Patch2:         scim-chewing-0.3.1-6.bz206112.patch
+#Patch3:         scim-chewing-0.3.1-8.bz206120.patch
+#Patch4:         scim-chewing-0.3.1-9.bz216581.patch
+#Patch5:         scim-chewing-0.3.1-10.bz237924.patch
+#Patch6:         scim-chewing-0.3.1-11.bz200694.patch
+#Patch7:         scim-chewing-0.3.1-13.gcc.patch
+#Patch8:         scim-chewing-0.3.1-14.bz228428.patch
+#Patch9:         scim-chewing-0.3.1-15.bz195416.patch
+Patch10:         scim-chewing-0.3.1.901.buildFix.patch
 
 %description
 This package provides Chewing Chinese input method for SCIM. 
@@ -27,17 +29,20 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .1-bz197556
-%patch1 -p1 -b .2-bz206125
-%patch2 -p1 -b .3-bz206112
-%patch3 -p1 -b .4-bz206120
-%patch4 -p1 -b .5-bz216581
-%patch5 -p1 -b .6-bz237924
-%patch6 -p1 -b .7-bz200694
-%patch7 -p1 -b .8-gcc
-%patch8 -p1 -b .9-bz228428
+#%patch0 -p1 -b .0-bz197556
+#%patch1 -p1 -b .1-bz206125
+#%patch2 -p1 -b .2-bz206112
+#%patch3 -p1 -b .3-bz206120
+#%patch4 -p1 -b .4-bz216581
+#%patch5 -p1 -b .5-bz237924
+#%patch6 -p1 -b .6-bz200694
+#%patch7 -p1 -b .7-gcc
+#%patch8 -p1 -b .8-bz228428
+#%patch9 -p1 -b .9-bz195416
+%patch10 -p1 -b .buildFix
 
 %build
+./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -65,7 +70,17 @@
 
 
 %changelog
-* Wed Apr 08 2008 Caius Chance <cchance at redhat.com> 0.3.1-14.fc9
+* Wed Sep 17 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.1.901-0
+- Upstream update.
+
+* Thu May 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.1-16
+- fix license tag
+
+* Wed Apr 09 2008 Caius Chance <cchance at redhat.com> 0.3.1-15.fc10
+- Resolves: rhbz#195416 (Initial input mode configuration.)
+- Modified patch naming in .spec file.
+
+* Tue Apr 08 2008 Caius Chance <cchance at redhat.com> 0.3.1-14.fc9
 - Resolves: rhbz#228428 (Ctrl-v during preedit appears in buffer on Qt XIM.)
 
 * Wed Jan 13 2008 Caius Chance <cchance at redhat.com> 0.3.1-13.fc9


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scim-chewing/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Jun 2006 12:52:45 -0000	1.4
+++ sources	17 Sep 2008 01:35:27 -0000	1.5
@@ -1 +1 @@
-7231e143e408b96f8374be9026ce6184  scim-chewing-0.3.1.tar.gz
+0910d0d0575d2f2f84403fdb8d622ac7  scim-chewing-0.3.1.901.tar.gz


--- scim-chewing-0.3.1-10.bz237924.patch DELETED ---


--- scim-chewing-0.3.1-11.bz200694.patch DELETED ---


--- scim-chewing-0.3.1-13.gcc.patch DELETED ---


--- scim-chewing-0.3.1-14.bz228428.patch DELETED ---


--- scim-chewing-0.3.1-4.bz197556.patch DELETED ---


--- scim-chewing-0.3.1-5.bz206125.patch DELETED ---


--- scim-chewing-0.3.1-6.bz206112.patch DELETED ---


--- scim-chewing-0.3.1-8.bz206120.patch DELETED ---


--- scim-chewing-0.3.1-9.bz216581.patch DELETED ---



From dchen at fedoraproject.org  Wed Sep 17 01:39:11 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 17 Sep 2008 01:39:11 +0000 (UTC)
Subject: rpms/scim-chewing/F-8 import.log, NONE,
	1.1 scim-chewing-0.3.1.901.buildFix.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 scim-chewing.spec, 1.35, 1.36 sources, 1.4,
	1.5 scim-chewing-0.3.1-10.bz237924.patch, 1.1,
	NONE scim-chewing-0.3.1-4.bz197556.patch, 1.1,
	NONE scim-chewing-0.3.1-5.bz206125.patch, 1.1,
	NONE scim-chewing-0.3.1-6.bz206112.patch, 1.1,
	NONE scim-chewing-0.3.1-8.bz206120.patch, 1.1,
	NONE scim-chewing-0.3.1-9.bz216581.patch, 1.1, NONE
Message-ID: <20080917013911.4002E7013C@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/scim-chewing/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12694/F-8

Modified Files:
	.cvsignore scim-chewing.spec sources 
Added Files:
	import.log scim-chewing-0.3.1.901.buildFix.patch 
Removed Files:
	scim-chewing-0.3.1-10.bz237924.patch 
	scim-chewing-0.3.1-4.bz197556.patch 
	scim-chewing-0.3.1-5.bz206125.patch 
	scim-chewing-0.3.1-6.bz206112.patch 
	scim-chewing-0.3.1-8.bz206120.patch 
	scim-chewing-0.3.1-9.bz216581.patch 
Log Message:
Upstream update


--- NEW FILE import.log ---
scim-chewing-0_3_1_901-0_fc9:F-8:scim-chewing-0.3.1.901-0.fc9.src.rpm:1221615470

scim-chewing-0.3.1.901.buildFix.patch:

--- NEW FILE scim-chewing-0.3.1.901.buildFix.patch ---
diff -up ./configure.ac.buildFix ./configure.ac
--- ./configure.ac.buildFix	2008-09-17 11:18:02.000000000 +1000
+++ ./configure.ac	2008-09-17 11:18:52.000000000 +1000
@@ -47,7 +47,7 @@ AC_TYPE_SIZE_T
 # Checks for libraries.
 
 SCIM_VERSION=1.0.0
-CHEWING_VERSION=0.3.091
+CHEWING_VERSION=0.3.0.901
 
 PKG_CHECK_MODULES(SCIM, [scim >= $SCIM_VERSION])
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scim-chewing/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Jun 2006 12:52:45 -0000	1.4
+++ .cvsignore	17 Sep 2008 01:38:40 -0000	1.5
@@ -1 +1 @@
-scim-chewing-0.3.1.tar.gz
+scim-chewing-0.3.1.901.tar.gz


Index: scim-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-chewing/F-8/scim-chewing.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- scim-chewing.spec	2 Jan 2008 04:05:08 -0000	1.35
+++ scim-chewing.spec	17 Sep 2008 01:38:40 -0000	1.36
@@ -1,22 +1,27 @@
 Name:           scim-chewing
-Version:        0.3.1
-Release:        10%{?dist}
+Version:        0.3.1.901
+Release:        0%{?dist}
 Summary:        Chewing Chinese input method for SCIM
 
-License:        GPL
+License:        GPLv2+
 Url:            http://chewing.csie.net/
 Group:          System Environment/Libraries
-Source:         http://chewing.csie.net/download/scim/%{name}-%{version}.tar.gz
+Source:         http://chewing.csie.net/download/rc/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}
-BuildRequires:  scim-devel, libchewing-devel >= 0.3.0-5, gettext, intltool
+BuildRequires:  scim-devel, libchewing-devel >= 0.3.0.901, gettext, intltool
 Requires:       scim
 Obsoletes:      iiimf-le-xcin <= 0.1.10
-Patch0:         scim-chewing-0.3.1-4.bz197556.patch
-Patch1:         scim-chewing-0.3.1-5.bz206125.patch
-Patch2:         scim-chewing-0.3.1-6.bz206112.patch
-Patch3:         scim-chewing-0.3.1-8.bz206120.patch
-Patch4:         scim-chewing-0.3.1-9.bz216581.patch
-Patch5:         scim-chewing-0.3.1-10.bz237924.patch
+#Patch0:         scim-chewing-0.3.1-4.bz197556.patch
+#Patch1:         scim-chewing-0.3.1-5.bz206125.patch
+#Patch2:         scim-chewing-0.3.1-6.bz206112.patch
+#Patch3:         scim-chewing-0.3.1-8.bz206120.patch
+#Patch4:         scim-chewing-0.3.1-9.bz216581.patch
+#Patch5:         scim-chewing-0.3.1-10.bz237924.patch
+#Patch6:         scim-chewing-0.3.1-11.bz200694.patch
+#Patch7:         scim-chewing-0.3.1-13.gcc.patch
+#Patch8:         scim-chewing-0.3.1-14.bz228428.patch
+#Patch9:         scim-chewing-0.3.1-15.bz195416.patch
+Patch10:         scim-chewing-0.3.1.901.buildFix.patch
 
 %description
 This package provides Chewing Chinese input method for SCIM. 
@@ -24,14 +29,20 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .1-bz197556
-%patch1 -p1 -b .2-bz206125
-%patch2 -p1 -b .3-bz206112
-%patch3 -p1 -b .4-bz206120
-%patch4 -p1 -b .5-bz216581
-%patch5 -p1 -b .6-bz237924
+#%patch0 -p1 -b .0-bz197556
+#%patch1 -p1 -b .1-bz206125
+#%patch2 -p1 -b .2-bz206112
+#%patch3 -p1 -b .3-bz206120
+#%patch4 -p1 -b .4-bz216581
+#%patch5 -p1 -b .5-bz237924
+#%patch6 -p1 -b .6-bz200694
+#%patch7 -p1 -b .7-gcc
+#%patch8 -p1 -b .8-bz228428
+#%patch9 -p1 -b .9-bz195416
+%patch10 -p1 -b .buildFix
 
 %build
+./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -59,7 +70,29 @@
 
 
 %changelog
-* Wed Jan 02 2008 Caius Chance <cchance at redhat.com> 0.3.1-10.fc8
+* Wed Sep 17 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.1.901-0
+- Upstream update.
+
+* Thu May 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.1-16
+- fix license tag
+
+* Wed Apr 09 2008 Caius Chance <cchance at redhat.com> 0.3.1-15.fc10
+- Resolves: rhbz#195416 (Initial input mode configuration.)
+- Modified patch naming in .spec file.
+
+* Tue Apr 08 2008 Caius Chance <cchance at redhat.com> 0.3.1-14.fc9
+- Resolves: rhbz#228428 (Ctrl-v during preedit appears in buffer on Qt XIM.)
+
+* Wed Jan 13 2008 Caius Chance <cchance at redhat.com> 0.3.1-13.fc9
+- Rebuild for F9.
+
+* Tue Jan 08 2008 Caius Chance <cchance at redhat.com> 0.3.1-12.fc9
+- Updated buildrequires version of libchewing-devel to 0.3.0-9.
+
+* Tue Jan 08 2008 Caius Chance <cchance at redhat.com> 0.3.1-11.fc9
+- Resolves: rhbz#200694 (Moving "Han-Yin" <-> Zhu-Yin" option to AUX UI.)
+
+* Wed Dec 20 2007 Caius Chance <cchance at redhat.com> 0.3.1-10.fc9
 - Resolves: rhbz#237924 (Last candidate on lookup table is not a valid 
                          candidate.)
   <<< Refit lookup table page size for last lookup page.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scim-chewing/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Jun 2006 12:52:45 -0000	1.4
+++ sources	17 Sep 2008 01:38:40 -0000	1.5
@@ -1 +1 @@
-7231e143e408b96f8374be9026ce6184  scim-chewing-0.3.1.tar.gz
+0910d0d0575d2f2f84403fdb8d622ac7  scim-chewing-0.3.1.901.tar.gz


--- scim-chewing-0.3.1-10.bz237924.patch DELETED ---


--- scim-chewing-0.3.1-4.bz197556.patch DELETED ---


--- scim-chewing-0.3.1-5.bz206125.patch DELETED ---


--- scim-chewing-0.3.1-6.bz206112.patch DELETED ---


--- scim-chewing-0.3.1-8.bz206120.patch DELETED ---


--- scim-chewing-0.3.1-9.bz216581.patch DELETED ---



From dchen at fedoraproject.org  Wed Sep 17 01:47:01 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 17 Sep 2008 01:47:01 +0000 (UTC)
Subject: rpms/libchewing/F-9 import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 libchewing.spec, 1.17, 1.18 sources, 1.3,
	1.4 libchewing-0.3.0-3.bz199353.patch, 1.1,
	NONE libchewing-0.3.0-4.bz206232.patch, 1.1,
	NONE libchewing-0.3.0-5.bz216581a.patch, 1.1,
	NONE libchewing-0.3.0-5.bz216581b.patch, 1.1,
	NONE libchewing-0.3.0-6.bz231568.patch, 1.1,
	NONE libchewing-0.3.0-7.bz237233.patch, 1.1,
	NONE libchewing-0.3.0-8.bz237916.patch, 1.1,
	NONE libchewing-0.3.0-9.bz200694.patch, 1.1, NONE
Message-ID: <20080917014701.661A77013C@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libchewing/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15417/F-9

Modified Files:
	.cvsignore libchewing.spec sources 
Added Files:
	import.log 
Removed Files:
	libchewing-0.3.0-3.bz199353.patch 
	libchewing-0.3.0-4.bz206232.patch 
	libchewing-0.3.0-5.bz216581a.patch 
	libchewing-0.3.0-5.bz216581b.patch 
	libchewing-0.3.0-6.bz231568.patch 
	libchewing-0.3.0-7.bz237233.patch 
	libchewing-0.3.0-8.bz237916.patch 
	libchewing-0.3.0-9.bz200694.patch 
Log Message:
Upstream update


--- NEW FILE import.log ---
libchewing-0_3_0_901-0_fc9:F-9:libchewing-0.3.0.901-0.fc9.src.rpm:1221615942


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 May 2006 06:05:23 -0000	1.3
+++ .cvsignore	17 Sep 2008 01:46:31 -0000	1.4
@@ -1 +1 @@
-libchewing-0.3.0.tar.gz
+libchewing-0.3.0.901.tar.gz


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-9/libchewing.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libchewing.spec	13 Feb 2008 01:20:52 -0000	1.17
+++ libchewing.spec	17 Sep 2008 01:46:31 -0000	1.18
@@ -1,22 +1,23 @@
-Name:		libchewing
-Version:	0.3.0
-Release: 	10%{?dist}
-Summary:      	Intelligent phonetic input method library for Traditional Chinese
-
-Group: 		System Environment/Libraries
-License:	GPL
-URL:		http://chewing.csie.net/
-Source:		http://chewing.csie.net/download/libchewing/%{name}-%{version}.tar.gz
-Patch0:		libchewing-0.3.0-3.bz199353.patch
-Patch1:		libchewing-0.3.0-4.bz206232.patch
-Patch2:		libchewing-0.3.0-5.bz216581a.patch
-Patch3:		libchewing-0.3.0-5.bz216581b.patch
-Patch4:		libchewing-0.3.0-6.bz231568.patch
-Patch5:		libchewing-0.3.0-7.bz237233.patch
-Patch6:		libchewing-0.3.0-8.bz237916.patch
-Patch7:		libchewing-0.3.0-9.bz200694.patch
+Name:           libchewing
+Version:        0.3.0.901
+Release:        0%{?dist}
+Summary:        Intelligent phonetic input method library for Traditional Chinese
+
+Group:          System Environment/Libraries
+License:        LGPLv2+
+URL:            http://chewing.csie.net/
+Source:         http://chewing.csie.net/download/rc/libchewing/%{name}-%{version}.tar.gz
+#Patch0: libchewing-0.3.0-3.bz199353.patch
+#Patch1: libchewing-0.3.0-4.bz206232.patch
+#Patch2: libchewing-0.3.0-5.bz216581a.patch
+#Patch3: libchewing-0.3.0-5.bz216581b.patch
+#Patch4: libchewing-0.3.0-6.bz231568.patch
+#Patch5: libchewing-0.3.0-7.bz237233.patch
+#Patch6: libchewing-0.3.0-8.bz237916.patch
+#Patch7: libchewing-0.3.0-9.bz200694.patch
+#Patch8: libchewing-0.3.0-11.bz195416.patch
 
-BuildRoot:  	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 libchewing is an intelligent phonetic input method library for Chinese.
@@ -27,23 +28,25 @@
 
 
 %package -n %{name}-devel
-Summary:	Development files for libchewing
-Group: 		Development/Libraries
-Requires: 	%{name} = %{version}-%{release}, pkgconfig
+Summary:        Development files for libchewing
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}, pkgconfig
 
 %description -n %{name}-devel
-Headers and other files needed to develop applications using the %name library.
+Headers and other files needed to develop applications using the %name 
+library.
 
 %prep
 %setup -q
-%patch0 -p1 -b .1-bz199353
-%patch1 -p1 -b .2-bz206232
-%patch2 -p1 -b .3-bz216581a
-%patch3 -p1 -b .4-bz216581b
-%patch4 -p1 -b .5-bz231568
-%patch5 -p1 -b .6-bz237233
-%patch6 -p1 -b .7-bz237916
-%patch7 -p1 -b .8-bz200694
+#%patch0 -p1 -b .1-bz199353
+#%patch1 -p1 -b .2-bz206232
+#%patch2 -p1 -b .3-bz216581a
+#%patch3 -p1 -b .4-bz216581b
+#%patch4 -p1 -b .5-bz231568
+#%patch5 -p1 -b .6-bz237233
+#%patch6 -p1 -b .7-bz237916
+#%patch7 -p1 -b .8-bz200694
+#%patch8 -p1 -b .9-bz195416
 
 %build
 %configure --disable-static
@@ -77,6 +80,15 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Sep 17 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.0.901-0
+- Upstream update.
+
+* Thu May 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.0-12
+- fix license tag
+
+* Tue Apr 22 2008 Caius Chance <cchance at redhat.com> - 0.3.0-11.fc10
+- Resolves: rhbz195416 (Initial input mode between Chinese and English.)
+
 * Wed Feb 13 2008 Caius Chance <cchance at redhat.com> - 0.3.0-10.fc9
 - Rebuild for F9.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 May 2006 06:05:26 -0000	1.3
+++ sources	17 Sep 2008 01:46:31 -0000	1.4
@@ -1 +1 @@
-d60bdc2b3f81b70963cd01a93049a8e3  libchewing-0.3.0.tar.gz
+29612220ef1fd00a325a89f6162934ce  libchewing-0.3.0.901.tar.gz


--- libchewing-0.3.0-3.bz199353.patch DELETED ---


--- libchewing-0.3.0-4.bz206232.patch DELETED ---


--- libchewing-0.3.0-5.bz216581a.patch DELETED ---


--- libchewing-0.3.0-5.bz216581b.patch DELETED ---


--- libchewing-0.3.0-6.bz231568.patch DELETED ---


--- libchewing-0.3.0-7.bz237233.patch DELETED ---


--- libchewing-0.3.0-8.bz237916.patch DELETED ---


--- libchewing-0.3.0-9.bz200694.patch DELETED ---



From dchen at fedoraproject.org  Wed Sep 17 01:50:38 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 17 Sep 2008 01:50:38 +0000 (UTC)
Subject: rpms/libchewing/F-8 import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 libchewing.spec, 1.15, 1.16 sources, 1.3,
	1.4 libchewing-0.3.0-3.bz199353.patch, 1.1,
	NONE libchewing-0.3.0-4.bz206232.patch, 1.1,
	NONE libchewing-0.3.0-5.bz216581a.patch, 1.1,
	NONE libchewing-0.3.0-5.bz216581b.patch, 1.1,
	NONE libchewing-0.3.0-6.bz231568.patch, 1.1,
	NONE libchewing-0.3.0-7.bz237233.patch, 1.1,
	NONE libchewing-0.3.0-8.bz237916.patch, 1.1, NONE
Message-ID: <20080917015039.04C557013C@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libchewing/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16673/F-8

Modified Files:
	.cvsignore libchewing.spec sources 
Added Files:
	import.log 
Removed Files:
	libchewing-0.3.0-3.bz199353.patch 
	libchewing-0.3.0-4.bz206232.patch 
	libchewing-0.3.0-5.bz216581a.patch 
	libchewing-0.3.0-5.bz216581b.patch 
	libchewing-0.3.0-6.bz231568.patch 
	libchewing-0.3.0-7.bz237233.patch 
	libchewing-0.3.0-8.bz237916.patch 
Log Message:
Upstream update


--- NEW FILE import.log ---
libchewing-0_3_0_901-0_fc9:F-8:libchewing-0.3.0.901-0.fc9.src.rpm:1221616126


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 May 2006 06:05:23 -0000	1.3
+++ .cvsignore	17 Sep 2008 01:50:08 -0000	1.4
@@ -1 +1 @@
-libchewing-0.3.0.tar.gz
+libchewing-0.3.0.901.tar.gz


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-8/libchewing.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libchewing.spec	1 Jun 2007 07:08:26 -0000	1.15
+++ libchewing.spec	17 Sep 2008 01:50:08 -0000	1.16
@@ -1,21 +1,23 @@
-Name:		libchewing
-Version:	0.3.0
-Release: 	8%{?dist}
-Summary:      	Intelligent phonetic input method library for Traditional Chinese
-
-Group: 		System Environment/Libraries
-License:	GPL
-URL:		http://chewing.csie.net/
-Source:		http://chewing.csie.net/download/libchewing/%{name}-%{version}.tar.gz
-Patch0:		libchewing-0.3.0-3.bz199353.patch
-Patch1:		libchewing-0.3.0-4.bz206232.patch
-Patch2:		libchewing-0.3.0-5.bz216581a.patch
-Patch3:		libchewing-0.3.0-5.bz216581b.patch
-Patch4:		libchewing-0.3.0-6.bz231568.patch
-Patch5:		libchewing-0.3.0-7.bz237233.patch
-Patch6:		libchewing-0.3.0-8.bz237916.patch
+Name:           libchewing
+Version:        0.3.0.901
+Release:        0%{?dist}
+Summary:        Intelligent phonetic input method library for Traditional Chinese
+
+Group:          System Environment/Libraries
+License:        LGPLv2+
+URL:            http://chewing.csie.net/
+Source:         http://chewing.csie.net/download/rc/libchewing/%{name}-%{version}.tar.gz
+#Patch0: libchewing-0.3.0-3.bz199353.patch
+#Patch1: libchewing-0.3.0-4.bz206232.patch
+#Patch2: libchewing-0.3.0-5.bz216581a.patch
+#Patch3: libchewing-0.3.0-5.bz216581b.patch
+#Patch4: libchewing-0.3.0-6.bz231568.patch
+#Patch5: libchewing-0.3.0-7.bz237233.patch
+#Patch6: libchewing-0.3.0-8.bz237916.patch
+#Patch7: libchewing-0.3.0-9.bz200694.patch
+#Patch8: libchewing-0.3.0-11.bz195416.patch
 
-BuildRoot:  	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 libchewing is an intelligent phonetic input method library for Chinese.
@@ -26,22 +28,25 @@
 
 
 %package -n %{name}-devel
-Summary:	Development files for libchewing
-Group: 		Development/Libraries
-Requires: 	%{name} = %{version}-%{release}, pkgconfig
+Summary:        Development files for libchewing
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}, pkgconfig
 
 %description -n %{name}-devel
-Headers and other files needed to develop applications using the %name library.
+Headers and other files needed to develop applications using the %name 
+library.
 
 %prep
 %setup -q
-%patch0 -p1 -b .1-bz199353
-%patch1 -p1 -b .2-bz206232
-%patch2 -p1 -b .3-bz216581a
-%patch3 -p1 -b .4-bz216581b
-%patch4 -p1 -b .5-bz231568
-%patch5 -p1 -b .6-bz237233
-%patch6 -p1 -b .7-bz237916
+#%patch0 -p1 -b .1-bz199353
+#%patch1 -p1 -b .2-bz206232
+#%patch2 -p1 -b .3-bz216581a
+#%patch3 -p1 -b .4-bz216581b
+#%patch4 -p1 -b .5-bz231568
+#%patch5 -p1 -b .6-bz237233
+#%patch6 -p1 -b .7-bz237916
+#%patch7 -p1 -b .8-bz200694
+#%patch8 -p1 -b .9-bz195416
 
 %build
 %configure --disable-static
@@ -75,6 +80,21 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Sep 17 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.0.901-0
+- Upstream update.
+
+* Thu May 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.0-12
+- fix license tag
+
+* Tue Apr 22 2008 Caius Chance <cchance at redhat.com> - 0.3.0-11.fc10
+- Resolves: rhbz195416 (Initial input mode between Chinese and English.)
+
+* Wed Feb 13 2008 Caius Chance <cchance at redhat.com> - 0.3.0-10.fc9
+- Rebuild for F9.
+
+* Tue Jan 08 2008 Caius Chance <cchance at redhat.com> - 0.3.0-9.devel
+- Resolves: rhbz#200694 (Moving "Han-Yin" <-> Zhu-Yin" option to AUX UI.)
+
 * Fri Jun 01 2007 Caius Chance <cchance at redhat.com> - 0.3.0-8.devel
 - Fixed bz#237916: [chewing] Candidate list (symbol) page change inaccracy.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 May 2006 06:05:26 -0000	1.3
+++ sources	17 Sep 2008 01:50:08 -0000	1.4
@@ -1 +1 @@
-d60bdc2b3f81b70963cd01a93049a8e3  libchewing-0.3.0.tar.gz
+29612220ef1fd00a325a89f6162934ce  libchewing-0.3.0.901.tar.gz


--- libchewing-0.3.0-3.bz199353.patch DELETED ---


--- libchewing-0.3.0-4.bz206232.patch DELETED ---


--- libchewing-0.3.0-5.bz216581a.patch DELETED ---


--- libchewing-0.3.0-5.bz216581b.patch DELETED ---


--- libchewing-0.3.0-6.bz231568.patch DELETED ---


--- libchewing-0.3.0-7.bz237233.patch DELETED ---


--- libchewing-0.3.0-8.bz237916.patch DELETED ---



From phuang at fedoraproject.org  Wed Sep 17 02:01:23 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 17 Sep 2008 02:01:23 +0000 (UTC)
Subject: rpms/ibus-chewing/devel .cvsignore, 1.4, 1.5 ibus-chewing.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20080917020123.7923C7013C@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-chewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19388

Modified Files:
	.cvsignore ibus-chewing.spec sources 
Log Message:
Update to 0.1.1.20080917


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Sep 2008 12:21:49 -0000	1.4
+++ .cvsignore	17 Sep 2008 02:00:53 -0000	1.5
@@ -1 +1 @@
-ibus-chewing-0.1.1.20080916.tar.gz
+ibus-chewing-0.1.1.20080917.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/ibus-chewing.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ibus-chewing.spec	16 Sep 2008 12:21:49 -0000	1.3
+++ ibus-chewing.spec	17 Sep 2008 02:00: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)")}
 %define mod_path ibus-0.1
 Name:       ibus-chewing
-Version:    0.1.1.20080916
+Version:    0.1.1.20080917
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -14,7 +14,7 @@
 BuildRequires:  gettext-devel
 BuildRequires:  libtool
 BuildRequires:  python-devel
-BuildRequires:  libchewing-devel
+BuildRequires:  libchewing-devel >= 0.3.0.901
 BuildRequires:  swig
 BuildRequires:  pkgconfig
 
@@ -54,6 +54,9 @@
 %{_datadir}/ibus/engine/chewing.engine
 
 %changelog
+* Wed Sep 17 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080917-1
+- Update to 0.1.1.20080917.
+
 * Tue Sep 16 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080916-1
 - Update to 0.1.1.20080916.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Sep 2008 12:21:49 -0000	1.4
+++ sources	17 Sep 2008 02:00:53 -0000	1.5
@@ -1 +1 @@
-64170b97e0a87eee83ca1ed73de1633b  ibus-chewing-0.1.1.20080916.tar.gz
+ad6508b0d35062358a69b8b51a5ebc3f  ibus-chewing-0.1.1.20080917.tar.gz



From mclasen at fedoraproject.org  Wed Sep 17 02:43:42 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 17 Sep 2008 02:43:42 +0000 (UTC)
Subject: rpms/gnome-applets/devel info-leak.patch, NONE,
	1.1 gnome-applets.spec, 1.295, 1.296
Message-ID: <20080917024342.49BA17013C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30589

Modified Files:
	gnome-applets.spec 
Added Files:
	info-leak.patch 
Log Message:
plug a leak in the trash applet


info-leak.patch:

--- NEW FILE info-leak.patch ---
diff -up gnome-applets-2.23.92/trashapplet/src/trashapplet.c.info-leak gnome-applets-2.23.92/trashapplet/src/trashapplet.c
--- gnome-applets-2.23.92/trashapplet/src/trashapplet.c.info-leak	2008-09-16 22:38:24.000000000 -0400
+++ gnome-applets-2.23.92/trashapplet/src/trashapplet.c	2008-09-16 22:39:29.000000000 -0400
@@ -148,6 +148,7 @@ trash_applet_monitor_changed (TrashApple
     }
 
   g_object_unref (icon);
+  g_object_unref (info);
 }
 
 static void


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- gnome-applets.spec	10 Sep 2008 01:16:21 -0000	1.295
+++ gnome-applets.spec	17 Sep 2008 02:43:11 -0000	1.296
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.23.92
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -64,6 +64,9 @@
 # do the nullapplet dance for battstat
 Patch40:	gnome-applets-null-battstat.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=552577
+Patch42:	info-leak.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -149,6 +152,7 @@
 %patch33 -p1 -b .node-leak
 %patch39 -p1 -b .gweather-network
 %patch40 -p1 -b .battstat-null
+%patch42 -p1 -b .info-leak
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -308,6 +312,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Tue Sep 16 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.92-2
+- Plug a leak in the trash applet
+
 * Tue Sep  9 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.92-1
 - Update to 2.23.92
 



From pkgdb at fedoraproject.org  Wed Sep 17 03:05:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 03:05:27 +0000
Subject: [pkgdb] arora was added for jreznik
Message-ID: <20080917030527.7C7D4208D9F@bastion.fedora.phx.redhat.com>

huzaifas has added Package arora with summary a cross platform web browser
huzaifas has approved Package arora
huzaifas has added a Fedora devel branch for arora with an owner of jreznik
huzaifas has approved arora in Fedora devel
huzaifas has approved Package arora
huzaifas has set commit to Approved for packager on arora (Fedora devel)
huzaifas has set build to Approved for packager on arora (Fedora devel)
huzaifas has set checkout to Approved for packager on arora (Fedora devel)
huzaifas has set commit to Approved for uberpackager on arora (Fedora devel)
huzaifas has set build to Approved for uberpackager on arora (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on arora (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arora



From pkgdb at fedoraproject.org  Wed Sep 17 03:05:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 03:05:27 +0000
Subject: [pkgdb] arora (Fedora, 9) updated by huzaifas
Message-ID: <20080917030528.139BE208DA3@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for arora
huzaifas has set commit to Approved for uberpackager on arora (Fedora 9)
huzaifas has set build to Approved for uberpackager on arora (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on arora (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arora



From pkgdb at fedoraproject.org  Wed Sep 17 03:05:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 03:05:27 +0000
Subject: [pkgdb] arora (Fedora, 8) updated by huzaifas
Message-ID: <20080917030528.1E76D208DA6@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for arora
huzaifas has set commit to Approved for uberpackager on arora (Fedora 8)
huzaifas has set build to Approved for uberpackager on arora (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on arora (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arora



From huzaifas at fedoraproject.org  Wed Sep 17 03:06:10 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:06:10 +0000 (UTC)
Subject: rpms/arora - New directory
Message-ID: <20080917030610.281D07013C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/arora
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsSf4627/rpms/arora

Log Message:
Directory /cvs/extras/rpms/arora added to the repository




From huzaifas at fedoraproject.org  Wed Sep 17 03:06:10 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:06:10 +0000 (UTC)
Subject: rpms/arora/devel - New directory
Message-ID: <20080917030610.58BFF7013C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/arora/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsSf4627/rpms/arora/devel

Log Message:
Directory /cvs/extras/rpms/arora/devel added to the repository




From huzaifas at fedoraproject.org  Wed Sep 17 03:06:11 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:06:11 +0000 (UTC)
Subject: rpms/arora Makefile,NONE,1.1
Message-ID: <20080917030611.2F5877013C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/arora
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsSf4627/rpms/arora

Added Files:
	Makefile 
Log Message:
Setup of module arora


--- NEW FILE Makefile ---
# Top level Makefile for module arora
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Wed Sep 17 03:06:11 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:06:11 +0000 (UTC)
Subject: rpms/arora/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20080917030611.62E0E7013C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/arora/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsSf4627/rpms/arora/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module arora


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: arora
# $Id: Makefile,v 1.1 2008/09/17 03:06:11 huzaifas Exp $
NAME := arora
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From dledford at fedoraproject.org  Wed Sep 17 03:07:10 2008
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed, 17 Sep 2008 03:07:10 +0000 (UTC)
Subject: rpms/opensm/devel opensm.initd,1.1,1.2
Message-ID: <20080917030710.06A537013C@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/opensm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4900

Modified Files:
	opensm.initd 
Log Message:
Update init script to fix bug 453977


Index: opensm.initd
===================================================================
RCS file: /cvs/extras/rpms/opensm/devel/opensm.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opensm.initd	30 Jun 2008 23:33:50 -0000	1.1
+++ opensm.initd	17 Sep 2008 03:06:39 -0000	1.2
@@ -19,6 +19,7 @@
 prog=/usr/sbin/opensm
 CONFIG=/etc/rdma/opensm.conf
 PID_FILE=/var/run/opensm.pid
+ACTION=$1
 
 start()
 {
@@ -32,9 +33,9 @@
     [ -f /var/lock/subsys/opensm ] && return 0
     # Start opensm
     echo -n "Starting IB Subnet Manager:"
-    $prog $OPTIONS > /dev/null 2>&1 &
-    OSM_PID=$!
+    $prog $OPTIONS > /dev/null 2>&1
     sleep 1        
+    OSM_PID=`pidof $prog`
     checkpid $OSM_PID
     RC=$?
     [ $RC -eq 0 ] && echo_success || echo_failure
@@ -63,18 +64,23 @@
     # Kill opensm
     kill -15 $OSM_PID > /dev/null 2>&1
     cnt=0
-    while [ $cnt -lt 6 -a checkpid $OSM_PID -eq 0 ]; do
+    while [ $cnt -lt 6 ]; do
+        checkpid $OSM_PID
+	if [ $? -ne 0 ]; then
+	    break
+	fi
         echo -n "."
 	sleep 1
-	let cnt++
+	cnt=$(( $cnt + 1 ))
     done
 
-    if [ checkpid $OSM_PID -eq 0 ]; then
+    checkpid $OSM_PID
+    if [ $? -eq 0 ]; then
 	kill -KILL $OSM_PID > /dev/null 2>&1
 	echo -n "+"
         sleep 1
     fi
-    checkpid $pid
+    checkpid $OSM_PID
     DEAD=$?
     if [ $DEAD -eq 0 ]; then
 	echo_failure



From mdomsch at fedoraproject.org  Wed Sep 17 03:13:21 2008
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Wed, 17 Sep 2008 03:13:21 +0000 (UTC)
Subject: rpms/gstm/devel gstm-1.2-autoconf.patch,NONE,1.1 gstm.spec,1.4,1.5
Message-ID: <20080917031321.CE4BB7013C@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/gstm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6603

Modified Files:
	gstm.spec 
Added Files:
	gstm-1.2-autoconf.patch 
Log Message:
add BR libxml2-devel & pkgconfig, redo auto* to pick them up.
Fixes FTBFS BZ#434531
 Steven Bakker: remove extraneous desktop file category


gstm-1.2-autoconf.patch:

--- NEW FILE gstm-1.2-autoconf.patch ---
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal gstm-1.2.orig/aclocal.m4 gstm-1.2/aclocal.m4
--- gstm-1.2.orig/aclocal.m4	2008-09-16 21:59:13.000000000 -0500
+++ gstm-1.2/aclocal.m4	2008-09-16 22:00:04.000000000 -0500
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,6 +11,14 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
 # Copyright (C) 2001-2003,2004 Red Hat, Inc.
 #
@@ -218,6 +226,20 @@ glib_DEFUN([GLIB_WITH_NLS],
           glib_save_LIBS="$LIBS"
           LIBS="$LIBS $INTLLIBS"
 	  AC_CHECK_FUNCS(dcgettext)
+	  MSGFMT_OPTS=
+	  AC_MSG_CHECKING([if msgfmt accepts -c])
+	  GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <foo at bar.xx>\n"
+"Language-Team: C <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+	  AC_SUBST(MSGFMT_OPTS)
 	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
 	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
 	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
@@ -389,8 +411,10 @@ glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
 [glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
 glib_save_prefix="$prefix"
 glib_save_exec_prefix="$exec_prefix"
+glib_save_datarootdir="$datarootdir"
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+datarootdir=`eval echo "${datarootdir}"`
 if test "x$CATOBJEXT" = "x.mo" ; then
   localedir=`eval echo "${libdir}/locale"`
 else
@@ -398,6 +422,7 @@ else
 fi
 prefix="$glib_save_prefix"
 exec_prefix="$glib_save_exec_prefix"
+datarootdir="$glib_save_datarootdir"
 AC_DEFINE_UNQUOTED($1, "$localedir",
   [Define the location where the catalogs will be installed])
 ])
@@ -410,6 +435,23 @@ AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU
 AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
 ])dnl
 
+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+# 
+# Create a temporary file with TEST-FILE as its contents and pass the
+# file name to PROGRAM.  Perform ACTION-IF-PASS if PROGRAM exits with
+# 0 and perform ACTION-IF-FAIL for any other exit status.
+AC_DEFUN([GLIB_RUN_PROG],
+[cat >conftest.foo <<_ACEOF
+$2
+_ACEOF
+if AC_RUN_LOG([$1 conftest.foo]); then
+  m4_ifval([$3], [$3], [:])
+m4_ifvaln([$4], [else $4])dnl
+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+fi])
+
+
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # 
 # Copyright ?? 2004 Scott James Remnant <scott at netsplit.com>.
@@ -443,7 +485,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != 
 	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
 fi
 if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
+	_pkg_min_version=m4_default([$1], [0.9.0])
 	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
 		AC_MSG_RESULT([yes])
@@ -478,15 +520,29 @@ fi])
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
 # ---------------------------------------------
 m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-else
-	pkg_failed=untried
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
 fi[]dnl
 ])# _PKG_CONFIG
 
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
 # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
 # [ACTION-IF-NOT-FOUND])
 #
@@ -508,31 +564,41 @@ AC_MSG_CHECKING([for $1])
 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])
 
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
 if test $pkg_failed = yes; then
-	$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+        fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
 	ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met.
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-to avoid the need to call pkg-config.  See the pkg-config man page for
-more details.])],
-		[$4])
+_PKG_TEXT
+])],
+		[AC_MSG_RESULT([no])
+                $4])
 elif test $pkg_failed = untried; then
 	ifelse([$4], , [AC_MSG_FAILURE(dnl
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-to avoid the need to call pkg-config.  See the pkg-config man page for
-more details.
+_PKG_TEXT
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
 		[$4])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -542,7 +608,7 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
[...11329 lines suppressed...]
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 INCLUDES = \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@@ -215,7 +220,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -238,7 +243,7 @@ clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 gstm$(EXEEXT): $(gstm_OBJECTS) $(gstm_DEPENDENCIES) 
 	@rm -f gstm$(EXEEXT)
-	$(LINK) $(gstm_LDFLAGS) $(gstm_OBJECTS) $(gstm_LDADD) $(LIBS)
+	$(LINK) $(gstm_OBJECTS) $(gstm_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -257,27 +262,26 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/support.Po at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-uninstall-info-am:
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -289,8 +293,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -300,13 +304,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -320,22 +323,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -351,7 +353,7 @@ check: check-am
 all-am: Makefile $(PROGRAMS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -399,12 +401,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -424,18 +434,22 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic ctags distclean distclean-compile \
 	distclean-generic distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-info-am
+	uninstall-am uninstall-binPROGRAMS
 
 # 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.


Index: gstm.spec
===================================================================
RCS file: /cvs/extras/rpms/gstm/devel/gstm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gstm.spec	25 Jul 2008 19:35:00 -0000	1.4
+++ gstm.spec	17 Sep 2008 03:12:51 -0000	1.5
@@ -1,15 +1,16 @@
 Name:           gstm
 Version:        1.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A front-end to ssh tunneling
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://gstm.sourceforge.net
 Source0:        http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Patch0:         gstm-1.2-autoconf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgnomeui-devel, desktop-file-utils, gettext
+BuildRequires:  libgnomeui-devel, desktop-file-utils, gettext, libxml2-devel, pkgconfig
 Requires:       openssh-clients, gaskpass
 
 %description
@@ -25,7 +26,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %configure
@@ -38,7 +39,6 @@
 
 desktop-file-install --vendor fedora --delete-original \
         --add-category X-Fedora                              \
-        --add-category Internet                                \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
         $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
@@ -58,6 +58,11 @@
 %{_bindir}/gaskpass
 
 %changelog
+* Tue Sep 16 2008 Matt Domsch <mdomsch at fedoraproject.org> - 1.2-9
+- add BR libxml2-devel & pkgconfig, redo auto* to pick them up.
+  Fixes FTBFS BZ#434531
+- Steven Bakker: remove extraneous desktop file category
+
 * Fri Jul 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2-8
 - fix license tag
 



From pkgdb at fedoraproject.org  Wed Sep 17 03:15:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 03:15:13 +0000
Subject: [pkgdb] stk was added for thm
Message-ID: <20080917031513.C9BF3208D9F@bastion.fedora.phx.redhat.com>

huzaifas has added Package stk with summary Synthesis ToolKit in C++
huzaifas has approved Package stk
huzaifas has added a Fedora devel branch for stk with an owner of thm
huzaifas has approved stk in Fedora devel
huzaifas has approved Package stk
huzaifas has set commit to Approved for packager on stk (Fedora devel)
huzaifas has set build to Approved for packager on stk (Fedora devel)
huzaifas has set checkout to Approved for packager on stk (Fedora devel)
huzaifas has set commit to Approved for uberpackager on stk (Fedora devel)
huzaifas has set build to Approved for uberpackager on stk (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on stk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stk



From pkgdb at fedoraproject.org  Wed Sep 17 03:15:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 03:15:15 +0000
Subject: [pkgdb] stk (Fedora, 9) updated by huzaifas
Message-ID: <20080917031515.570C7208DA3@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for stk
huzaifas has set commit to Approved for uberpackager on stk (Fedora 9)
huzaifas has set build to Approved for uberpackager on stk (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on stk (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stk



From huzaifas at fedoraproject.org  Wed Sep 17 03:15:38 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:15:38 +0000 (UTC)
Subject: rpms/stk - New directory
Message-ID: <20080917031538.33DE57013D@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/stk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsvJ7649/rpms/stk

Log Message:
Directory /cvs/extras/rpms/stk added to the repository




From huzaifas at fedoraproject.org  Wed Sep 17 03:15:38 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:15:38 +0000 (UTC)
Subject: rpms/stk/devel - New directory
Message-ID: <20080917031538.7F7E77013D@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/stk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsvJ7649/rpms/stk/devel

Log Message:
Directory /cvs/extras/rpms/stk/devel added to the repository




From huzaifas at fedoraproject.org  Wed Sep 17 03:15:39 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:15:39 +0000 (UTC)
Subject: rpms/stk Makefile,NONE,1.1
Message-ID: <20080917031539.A35837013D@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/stk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsvJ7649/rpms/stk

Added Files:
	Makefile 
Log Message:
Setup of module stk


--- NEW FILE Makefile ---
# Top level Makefile for module stk
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep 17 03:15:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 03:15:15 +0000
Subject: [pkgdb] stk (Fedora, 8) updated by huzaifas
Message-ID: <20080917031515.64B03208DA6@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for stk
huzaifas has set commit to Approved for uberpackager on stk (Fedora 8)
huzaifas has set build to Approved for uberpackager on stk (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on stk (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stk



From huzaifas at fedoraproject.org  Wed Sep 17 03:15:39 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:15:39 +0000 (UTC)
Subject: rpms/stk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080917031539.E63537013D@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/stk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsvJ7649/rpms/stk/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module stk


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: stk
# $Id: Makefile,v 1.1 2008/09/17 03:15:39 huzaifas Exp $
NAME := stk
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Wed Sep 17 03:16:12 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 17 Sep 2008 03:16:12 +0000 (UTC)
Subject: rpms/gdm/devel data-leak.patch, NONE, 1.1 ssid-leak.patch, NONE,
	1.1 username-leak.patch, NONE, 1.1 gdm.spec, 1.415, 1.416
Message-ID: <20080917031612.E67E77013D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7550

Modified Files:
	gdm.spec 
Added Files:
	data-leak.patch ssid-leak.patch username-leak.patch 
Log Message:
plug a few memory leaks


data-leak.patch:

--- NEW FILE data-leak.patch ---
diff -up gdm-2.23.92/gui/simple-greeter/gdm-user.c.data-leak gdm-2.23.92/gui/simple-greeter/gdm-user.c
--- gdm-2.23.92/gui/simple-greeter/gdm-user.c.data-leak	2008-09-16 22:07:39.000000000 -0400
+++ gdm-2.23.92/gui/simple-greeter/gdm-user.c	2008-09-16 22:07:07.000000000 -0400
@@ -1093,6 +1093,7 @@ frame_pixbuf (GdkPixbuf *source)
         cairo_to_pixbuf (data, dest);
 
         cairo_destroy (cr);
+        g_free (data);
 
         return dest;
 }

ssid-leak.patch:

--- NEW FILE ssid-leak.patch ---
diff -up gdm-2.23.92/gui/simple-greeter/gdm-user-manager.c.ssid-leak gdm-2.23.92/gui/simple-greeter/gdm-user-manager.c
--- gdm-2.23.92/gui/simple-greeter/gdm-user-manager.c.ssid-leak	2008-09-16 22:15:20.000000000 -0400
+++ gdm-2.23.92/gui/simple-greeter/gdm-user-manager.c	2008-09-16 22:16:02.000000000 -0400
@@ -667,6 +667,7 @@ add_sessions_for_user (GdmUserManager *m
                 maybe_add_session_for_user (manager, user, ssid);
         }
 
+        g_ptr_array_foreach (sessions, (GFunc)g_free, NULL);
         g_ptr_array_free (sessions, TRUE);
 
  out:

username-leak.patch:

--- NEW FILE username-leak.patch ---
diff -up gdm-2.23.92/gui/simple-greeter/gdm-user-manager.c.username-leak gdm-2.23.92/gui/simple-greeter/gdm-user-manager.c
--- gdm-2.23.92/gui/simple-greeter/gdm-user-manager.c.username-leak	2008-09-16 22:00:14.000000000 -0400
+++ gdm-2.23.92/gui/simple-greeter/gdm-user-manager.c	2008-09-16 22:00:36.000000000 -0400
@@ -1147,11 +1147,13 @@ process_ck_history_line (GdmUserManager 
         user = gdm_user_manager_get_user (manager, username);
         if (user == NULL) {
                 g_debug ("GdmUserManager: unable to lookup user '%s'", username);
+                g_free (username);
                 return;
         }
 
         g_object_set (user, "login-frequency", frequency, NULL);
         g_signal_emit (manager, signals [USER_LOGIN_FREQUENCY_CHANGED], 0, user);
+        g_free (username);
 }
 
 static gboolean


Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -r1.415 -r1.416
--- gdm.spec	16 Sep 2008 20:54:52 -0000	1.415
+++ gdm.spec	17 Sep 2008 03:15:42 -0000	1.416
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.23.92
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -81,6 +81,12 @@
 Patch1: xkb-groups.patch
 Patch2: gdm-2.23.92-force-active-vt.patch
 Patch3: gdm-2.23.92-save-root-window.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=552578
+Patch4: username-leak.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=552578
+Patch5: data-leak.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=552578
+Patch6: ssid-leak.patch
 
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
@@ -105,6 +111,10 @@
 %patch1 -p1 -b .xkb-groups
 %patch2 -p1 -b .force-active-vt
 %patch3 -p1 -b .save-root-window
+%patch4 -p1 -b .username-leak
+%patch5 -p1 -b .data-leak
+%patch6 -p1 -b .ssid-leak
+
 %patch99 -p1 -b .fedora-logo
 
 autoreconf
@@ -306,6 +316,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Tue Sep 16 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.92-7
+- Plug a few memory leaks
+
 * Tue Sep 16 2008 Ray Strode <rstrode at redhat.com> - 1:2.23.92-6
 - Use _XROOTPMAP_ID instead of _XSETROOT_ID
 



From pkgdb at fedoraproject.org  Wed Sep 17 03:18:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 03:18:22 +0000
Subject: [pkgdb] rcssserver was added for hedayat
Message-ID: <20080917031822.69F9C208D9E@bastion.fedora.phx.redhat.com>

huzaifas has added Package rcssserver with summary Robocup 2D Soccer Simulation Server
huzaifas has approved Package rcssserver
huzaifas has added a Fedora devel branch for rcssserver with an owner of hedayat
huzaifas has approved rcssserver in Fedora devel
huzaifas has approved Package rcssserver
huzaifas has set commit to Approved for packager on rcssserver (Fedora devel)
huzaifas has set build to Approved for packager on rcssserver (Fedora devel)
huzaifas has set checkout to Approved for packager on rcssserver (Fedora devel)
huzaifas has set commit to Approved for uberpackager on rcssserver (Fedora devel)
huzaifas has set build to Approved for uberpackager on rcssserver (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on rcssserver (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rcssserver



From pkgdb at fedoraproject.org  Wed Sep 17 03:18:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 03:18:23 +0000
Subject: [pkgdb] rcssserver (Fedora, 9) updated by huzaifas
Message-ID: <20080917031823.AB63E208DA2@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for rcssserver
huzaifas has set commit to Approved for uberpackager on rcssserver (Fedora 9)
huzaifas has set build to Approved for uberpackager on rcssserver (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on rcssserver (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rcssserver



From pkgdb at fedoraproject.org  Wed Sep 17 03:18:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 03:18:23 +0000
Subject: [pkgdb] rcssserver (Fedora, 8) updated by huzaifas
Message-ID: <20080917031823.B5F8B208DA5@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for rcssserver
huzaifas has set commit to Approved for uberpackager on rcssserver (Fedora 8)
huzaifas has set build to Approved for uberpackager on rcssserver (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on rcssserver (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rcssserver



From huzaifas at fedoraproject.org  Wed Sep 17 03:19:21 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:19:21 +0000 (UTC)
Subject: rpms/rcssserver - New directory
Message-ID: <20080917031921.1FE507013C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/rcssserver
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsBs8973/rpms/rcssserver

Log Message:
Directory /cvs/extras/rpms/rcssserver added to the repository




From huzaifas at fedoraproject.org  Wed Sep 17 03:19:21 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:19:21 +0000 (UTC)
Subject: rpms/rcssserver/devel - New directory
Message-ID: <20080917031921.5DE697013C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/rcssserver/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsBs8973/rpms/rcssserver/devel

Log Message:
Directory /cvs/extras/rpms/rcssserver/devel added to the repository




From huzaifas at fedoraproject.org  Wed Sep 17 03:19:22 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:19:22 +0000 (UTC)
Subject: rpms/rcssserver Makefile,NONE,1.1
Message-ID: <20080917031922.5A2127013C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/rcssserver
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsBs8973/rpms/rcssserver

Added Files:
	Makefile 
Log Message:
Setup of module rcssserver


--- NEW FILE Makefile ---
# Top level Makefile for module rcssserver
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Wed Sep 17 03:19:22 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:19:22 +0000 (UTC)
Subject: rpms/rcssserver/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080917031922.982927013C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/rcssserver/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsBs8973/rpms/rcssserver/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rcssserver


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rcssserver
# $Id: Makefile,v 1.1 2008/09/17 03:19:22 huzaifas Exp $
NAME := rcssserver
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 17 03:27:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 03:27:33 +0000
Subject: [pkgdb] hunspell-tn was added for caolanm
Message-ID: <20080917032734.1997D208D9F@bastion.fedora.phx.redhat.com>

huzaifas has added Package hunspell-tn with summary Tswana hunspell dictionary
huzaifas has approved Package hunspell-tn
huzaifas has added a Fedora devel branch for hunspell-tn with an owner of caolanm
huzaifas has approved hunspell-tn in Fedora devel
huzaifas has approved Package hunspell-tn
huzaifas has set commit to Approved for packager on hunspell-tn (Fedora devel)
huzaifas has set build to Approved for packager on hunspell-tn (Fedora devel)
huzaifas has set checkout to Approved for packager on hunspell-tn (Fedora devel)
huzaifas has set commit to Approved for uberpackager on hunspell-tn (Fedora devel)
huzaifas has set build to Approved for uberpackager on hunspell-tn (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on hunspell-tn (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-tn



From huzaifas at fedoraproject.org  Wed Sep 17 03:28:50 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:28:50 +0000 (UTC)
Subject: rpms/hunspell-tn - New directory
Message-ID: <20080917032850.24D5D7013C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-tn
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsn11928/rpms/hunspell-tn

Log Message:
Directory /cvs/extras/rpms/hunspell-tn added to the repository




From huzaifas at fedoraproject.org  Wed Sep 17 03:28:50 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:28:50 +0000 (UTC)
Subject: rpms/hunspell-tn/devel - New directory
Message-ID: <20080917032850.610BE7013C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-tn/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsn11928/rpms/hunspell-tn/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-tn/devel added to the repository




From huzaifas at fedoraproject.org  Wed Sep 17 03:28:51 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:28:51 +0000 (UTC)
Subject: rpms/hunspell-tn Makefile,NONE,1.1
Message-ID: <20080917032851.55A4D7013C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-tn
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsn11928/rpms/hunspell-tn

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-tn


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-tn
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Wed Sep 17 03:28:51 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:28:51 +0000 (UTC)
Subject: rpms/hunspell-tn/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080917032851.974A47013C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-tn/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsn11928/rpms/hunspell-tn/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-tn


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-tn
# $Id: Makefile,v 1.1 2008/09/17 03:28:51 huzaifas Exp $
NAME := hunspell-tn
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From mdomsch at fedoraproject.org  Wed Sep 17 03:36:49 2008
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Wed, 17 Sep 2008 03:36:49 +0000 (UTC)
Subject: rpms/gdmap/devel gdmap-0.8.1-desktop.patch, NONE, 1.1 gdmap.spec,
	1.7, 1.8
Message-ID: <20080917033649.9239F7013C@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/gdmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14118

Modified Files:
	gdmap.spec 
Added Files:
	gdmap-0.8.1-desktop.patch 
Log Message:
update to 0.8.1, fix FTBFS BZ#434529

gdmap-0.8.1-desktop.patch:

--- NEW FILE gdmap-0.8.1-desktop.patch ---
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal gdmap-0.8.1.orig/data/gdmap.desktop.in gdmap-0.8.1/data/gdmap.desktop.in
--- gdmap-0.8.1.orig/data/gdmap.desktop.in	2008-09-16 22:25:32.000000000 -0500
+++ gdmap-0.8.1/data/gdmap.desktop.in	2008-09-16 22:26:21.000000000 -0500
@@ -1,10 +1,10 @@
 [Desktop Entry]
-Version=0.8.0
+Version=1.0
 Encoding=UTF-8
 _Name=Graphical Disk Map
 _Comment=Display disk space using tree maps
 Exec=gdmap
-Icon=gdmap_icon.png
+Icon=gdmap_icon
 Terminal=false
 Type=Application
-Categories=Filesystem;Utility;GTK
+Categories=Filesystem;Utility;GTK;


Index: gdmap.spec
===================================================================
RCS file: /cvs/extras/rpms/gdmap/devel/gdmap.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gdmap.spec	21 Jul 2008 15:57:35 -0000	1.7
+++ gdmap.spec	17 Sep 2008 03:36:19 -0000	1.8
@@ -1,16 +1,17 @@
 Name:	gdmap
-Version:	0.7.5
-Release:	8%{?dist}
+Version:	0.8.1
+Release:	1%{?dist}
 Summary:	A tool which allows to visualize disk space
 
 Group:	Applications/System
 # No version specified.
 License:	GPL+
 URL:	http://gdmap.sourceforge.net
-Source0:	http://belnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         %{name}-0.8.1-desktop.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel, libxml2-devel, desktop-file-utils, gettext, intltool
+BuildRequires:  gtk2-devel, libxml2-devel, desktop-file-utils, gettext, intltool, pkgconfig
 
 %description
 GdMap is a tool which allows you to visualize disk space with one single
@@ -19,7 +20,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %configure
@@ -49,11 +50,15 @@
 %{_bindir}/%{name}
 %{_datadir}/applications/*.desktop
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/pixmaps/
+%{_datadir}/%{name}/pixmaps/%{name}*
+%{_datadir}/pixmaps/%{name}*
 %{_mandir}/man1/*
 
 
 %changelog
+* Tue Sep 16 2008 Matt Domsch <mdomsch at fedoraproject.org> - 0.8.1-1
+- update to 0.8.1, fix FTBFS BZ#434529
+
 * Mon Jul 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.7.5-8
 - fix license tag
 



From pkgdb at fedoraproject.org  Wed Sep 17 03:38:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 03:38:20 +0000
Subject: [pkgdb] R2spec was added for pingou
Message-ID: <20080917033820.7B181208DA0@bastion.fedora.phx.redhat.com>

huzaifas has added Package R2spec with summary Python script to generate R spec file
huzaifas has approved Package R2spec
huzaifas has added a Fedora devel branch for R2spec with an owner of pingou
huzaifas has approved R2spec in Fedora devel
huzaifas has approved Package R2spec
huzaifas has set commit to Approved for packager on R2spec (Fedora devel)
huzaifas has set build to Approved for packager on R2spec (Fedora devel)
huzaifas has set checkout to Approved for packager on R2spec (Fedora devel)
huzaifas has set commit to Approved for uberpackager on R2spec (Fedora devel)
huzaifas has set build to Approved for uberpackager on R2spec (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on R2spec (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/R2spec



From pkgdb at fedoraproject.org  Wed Sep 17 03:38:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 03:38:23 +0000
Subject: [pkgdb] R2spec (Fedora, 9) updated by huzaifas
Message-ID: <20080917033823.E7A8B208DA3@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for R2spec
huzaifas has set commit to Approved for uberpackager on R2spec (Fedora 9)
huzaifas has set build to Approved for uberpackager on R2spec (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on R2spec (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/R2spec



From pkgdb at fedoraproject.org  Wed Sep 17 03:38:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 03:38:23 +0000
Subject: [pkgdb] R2spec (Fedora EPEL, 4) updated by huzaifas
Message-ID: <20080917033824.12079208DA9@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 4 branch for R2spec
huzaifas has set commit to Approved for uberpackager on R2spec (Fedora EPEL 4)
huzaifas has set build to Approved for uberpackager on R2spec (Fedora EPEL 4)
huzaifas has set checkout to Approved for uberpackager on R2spec (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/R2spec



From pkgdb at fedoraproject.org  Wed Sep 17 03:38:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 03:38:23 +0000
Subject: [pkgdb] R2spec (Fedora, 8) updated by huzaifas
Message-ID: <20080917033824.02AC0208DA7@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for R2spec
huzaifas has set commit to Approved for uberpackager on R2spec (Fedora 8)
huzaifas has set build to Approved for uberpackager on R2spec (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on R2spec (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/R2spec



From pkgdb at fedoraproject.org  Wed Sep 17 03:38:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 03:38:23 +0000
Subject: [pkgdb] R2spec (Fedora EPEL, 5) updated by huzaifas
Message-ID: <20080917033824.2DD89208DAC@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 5 branch for R2spec
huzaifas has set commit to Approved for uberpackager on R2spec (Fedora EPEL 5)
huzaifas has set build to Approved for uberpackager on R2spec (Fedora EPEL 5)
huzaifas has set checkout to Approved for uberpackager on R2spec (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/R2spec



From huzaifas at fedoraproject.org  Wed Sep 17 03:39:46 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:39:46 +0000 (UTC)
Subject: rpms/R2spec - New directory
Message-ID: <20080917033946.216E77013C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/R2spec
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsX15314/rpms/R2spec

Log Message:
Directory /cvs/extras/rpms/R2spec added to the repository




From huzaifas at fedoraproject.org  Wed Sep 17 03:39:47 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:39:47 +0000 (UTC)
Subject: rpms/R2spec Makefile,NONE,1.1
Message-ID: <20080917033947.517B17013C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/R2spec
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsX15314/rpms/R2spec

Added Files:
	Makefile 
Log Message:
Setup of module R2spec


--- NEW FILE Makefile ---
# Top level Makefile for module R2spec
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Wed Sep 17 03:39:46 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:39:46 +0000 (UTC)
Subject: rpms/R2spec/devel - New directory
Message-ID: <20080917033946.5D0837013C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/R2spec/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsX15314/rpms/R2spec/devel

Log Message:
Directory /cvs/extras/rpms/R2spec/devel added to the repository




From huzaifas at fedoraproject.org  Wed Sep 17 03:39:47 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 17 Sep 2008 03:39:47 +0000 (UTC)
Subject: rpms/R2spec/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080917033947.913507013C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/R2spec/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsX15314/rpms/R2spec/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module R2spec


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: R2spec
# $Id: Makefile,v 1.1 2008/09/17 03:39:47 huzaifas Exp $
NAME := R2spec
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From toshio at fedoraproject.org  Wed Sep 17 03:52:26 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 17 Sep 2008 03:52:26 +0000 (UTC)
Subject: rpms/python-simplejson/F-8 .cvsignore, 1.7,
	1.8 python-simplejson.spec, 1.13, 1.14 sources, 1.7, 1.8
Message-ID: <20080917035226.0FE1F7013C@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-simplejson/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18882/F-8

Modified Files:
	.cvsignore python-simplejson.spec sources 
Log Message:
* Tue May 06 2008 Luke Macken <lmacken at redhat.com> - 1.9.1-1
- Update to 1.9.1
- Needed for gwibber



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Oct 2007 15:07:07 -0000	1.7
+++ .cvsignore	17 Sep 2008 03:51:55 -0000	1.8
@@ -1 +1 @@
-simplejson-1.7.3.tar.gz
+simplejson-1.9.1.tar.gz


Index: python-simplejson.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/F-8/python-simplejson.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- python-simplejson.spec	3 Oct 2007 15:07:07 -0000	1.13
+++ python-simplejson.spec	17 Sep 2008 03:51:55 -0000	1.14
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-simplejson
-Version:        1.7.3
+Version:        1.9.1
 Release:        1%{?dist}
 Summary:        Simple, fast, extensible JSON encoder/decoder for Python
 
@@ -13,7 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
-BuildRequires: python-setuptools-devel
+BuildRequires:  python-setuptools-devel
 
 
 %description
@@ -53,7 +53,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc docs
+%doc docs LICENSE.txt
 %dir %{python_sitearch}/simplejson
 %{python_sitearch}/simplejson-%{version}-py%{pyver}.egg-info
 %{python_sitearch}/simplejson/*.py*
@@ -62,6 +62,21 @@
 
 
 %changelog
+* Tue May 06 2008 Luke Macken <lmacken at redhat.com> - 1.9.1-1
+- Update to 1.9.1
+
+* Wed Apr 02 2008 Luke Macken <lmacken at redhat.com> - 1.8.1-1
+- Update to 1.8.1
+
+* Thu Feb 28 2008 Luke Macken <lmacken at redhat.com> - 1.7.4-1
+- Update to 1.7.4
+
+* Fri Feb  8 2008 Luke Macken <lmacken at redhat.com> - 1.7.3-3
+- Rebuild for gcc 4.3
+
+* Wed Oct 24 2007 Luke Macken <lmacken at redhat.com> - 1.7.3-2
+- Include the LICENSE.txt
+
 * Wed Oct  3 2007 Luke Macken <lmacken at redhat.com> - 1.7.3-1
 - 1.7.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Oct 2007 15:07:07 -0000	1.7
+++ sources	17 Sep 2008 03:51:55 -0000	1.8
@@ -1 +1 @@
-03935eda1211f29d6856481baf6cba59  simplejson-1.7.3.tar.gz
+d2ee608bdf6397b82a7cd53c8602b29e  simplejson-1.9.1.tar.gz



From toshio at fedoraproject.org  Wed Sep 17 03:52:25 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 17 Sep 2008 03:52:25 +0000 (UTC)
Subject: rpms/python-simplejson/EL-5 .cvsignore, 1.5,
	1.6 python-simplejson.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20080917035225.DCF037013C@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-simplejson/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18882/EL-5

Modified Files:
	.cvsignore python-simplejson.spec sources 
Log Message:
* Tue May 06 2008 Luke Macken <lmacken at redhat.com> - 1.9.1-1
- Update to 1.9.1
- Needed for gwibber



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Nov 2007 20:36:24 -0000	1.5
+++ .cvsignore	17 Sep 2008 03:51:55 -0000	1.6
@@ -1 +1 @@
-simplejson-1.7.3.tar.gz
+simplejson-1.9.1.tar.gz


Index: python-simplejson.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/EL-5/python-simplejson.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-simplejson.spec	27 Nov 2007 20:36:24 -0000	1.8
+++ python-simplejson.spec	17 Sep 2008 03:51:55 -0000	1.9
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-simplejson
-Version:        1.7.3
+Version:        1.9.1
 Release:        1%{?dist}
 Summary:        Simple, fast, extensible JSON encoder/decoder for Python
 
@@ -12,7 +12,8 @@
 Source0:        http://cheeseshop.python.org/packages/source/s/simplejson/simplejson-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel python-setuptools-devel
+BuildRequires:  python-devel
+BuildRequires:  python-setuptools-devel
 
 
 %description
@@ -61,9 +62,39 @@
 
 
 %changelog
-* Tue Nov 27 2007 Luke Macken <lmacken at redhat.com> - 1.7.3-1
+* Tue May 06 2008 Luke Macken <lmacken at redhat.com> - 1.9.1-1
+- Update to 1.9.1
+
+* Wed Apr 02 2008 Luke Macken <lmacken at redhat.com> - 1.8.1-1
+- Update to 1.8.1
+
+* Thu Feb 28 2008 Luke Macken <lmacken at redhat.com> - 1.7.4-1
+- Update to 1.7.4
+
+* Fri Feb  8 2008 Luke Macken <lmacken at redhat.com> - 1.7.3-3
+- Rebuild for gcc 4.3
+
+* Wed Oct 24 2007 Luke Macken <lmacken at redhat.com> - 1.7.3-2
+- Include the LICENSE.txt
+
+* Wed Oct  3 2007 Luke Macken <lmacken at redhat.com> - 1.7.3-1
 - 1.7.3
 
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 1.7.1-3
+- Update for python-setuptools changes in rawhide
+
+* Tue Aug 21 2007 Luke Macken <lmacken at redhat.com> - 1.7.1-2
+- Rebuild
+
+* Sun Jul  8 2007 Luke Macken <lmacken at redhat.com> - 1.7.1-1
+- 1.7.1
+
+* Wed Mar 21 2007 Luke Macken <lmacken at redhat.com> - 1.7-2
+- Use python_sitearch instead of sitelib
+
+* Tue Mar 20 2007 Luke Macken <lmacken at redhat.com> - 1.7-1
+- 1.7 (Bug #233212)
+
 * Sat Mar  3 2007 Luke Macken <lmacken at redhat.com> - 1.5
 - 1.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Nov 2007 20:36:24 -0000	1.5
+++ sources	17 Sep 2008 03:51:55 -0000	1.6
@@ -1 +1 @@
-03935eda1211f29d6856481baf6cba59  simplejson-1.7.3.tar.gz
+d2ee608bdf6397b82a7cd53c8602b29e  simplejson-1.9.1.tar.gz



From mtasaka at fedoraproject.org  Wed Sep 17 04:04:50 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 17 Sep 2008 04:04:50 +0000 (UTC)
Subject: rpms/kita/F-8 kita.spec,1.12,1.13
Message-ID: <20080917040450.099A07013C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kita/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22271/F-8

Modified Files:
	kita.spec 
Log Message:
typo fix


Index: kita.spec
===================================================================
RCS file: /cvs/extras/rpms/kita/F-8/kita.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kita.spec	16 Sep 2008 18:42:42 -0000	1.12
+++ kita.spec	17 Sep 2008 04:04:19 -0000	1.13
@@ -90,7 +90,7 @@
       %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 # remove unneeded files
-find %{buildroot}%{_libdir} -name \*.so -or \*.la | xargs %{__rm} -f
+find %{buildroot}%{_libdir} -name \*.so -or -name \*.la | xargs %{__rm} -f
 
 unlink %{buildroot}%{_datadir}/doc/HTML/en/kita/common
 ln -sf ../common %{buildroot}%{_datadir}/doc/HTML/en/kita/common



From mtasaka at fedoraproject.org  Wed Sep 17 04:04:50 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 17 Sep 2008 04:04:50 +0000 (UTC)
Subject: rpms/kita/F-9 kita.spec,1.14,1.15
Message-ID: <20080917040450.2A6337013D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kita/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22271/F-9

Modified Files:
	kita.spec 
Log Message:
typo fix


Index: kita.spec
===================================================================
RCS file: /cvs/extras/rpms/kita/F-9/kita.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kita.spec	16 Sep 2008 18:42:43 -0000	1.14
+++ kita.spec	17 Sep 2008 04:04:19 -0000	1.15
@@ -90,7 +90,7 @@
       %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 # remove unneeded files
-find %{buildroot}%{_libdir} -name \*.so -or \*.la | xargs %{__rm} -f
+find %{buildroot}%{_libdir} -name \*.so -or -name \*.la | xargs %{__rm} -f
 
 unlink %{buildroot}%{_datadir}/doc/HTML/en/kita/common
 ln -sf ../common %{buildroot}%{_datadir}/doc/HTML/en/kita/common



From mtasaka at fedoraproject.org  Wed Sep 17 04:04:50 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 17 Sep 2008 04:04:50 +0000 (UTC)
Subject: rpms/kita/devel kita.spec,1.16,1.17
Message-ID: <20080917040450.64F687013C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kita/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22271/devel

Modified Files:
	kita.spec 
Log Message:
typo fix


Index: kita.spec
===================================================================
RCS file: /cvs/extras/rpms/kita/devel/kita.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kita.spec	16 Sep 2008 18:42:43 -0000	1.16
+++ kita.spec	17 Sep 2008 04:04:20 -0000	1.17
@@ -90,7 +90,7 @@
       %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 # remove unneeded files
-find %{buildroot}%{_libdir} -name \*.so -or \*.la | xargs %{__rm} -f
+find %{buildroot}%{_libdir} -name \*.so -or -name \*.la | xargs %{__rm} -f
 
 unlink %{buildroot}%{_datadir}/doc/HTML/en/kita/common
 ln -sf ../common %{buildroot}%{_datadir}/doc/HTML/en/kita/common



From mdomsch at fedoraproject.org  Wed Sep 17 04:06:54 2008
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Wed, 17 Sep 2008 04:06:54 +0000 (UTC)
Subject: rpms/scim-skk/devel scim-skk-0.5.2-gcc43.patch, NONE,
	1.1 scim-skk.spec, 1.18, 1.19
Message-ID: <20080917040654.C13207013C@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22870

Modified Files:
	scim-skk.spec 
Added Files:
	scim-skk-0.5.2-gcc43.patch 
Log Message:
fix FTBFS BZ#434419

scim-skk-0.5.2-gcc43.patch:

--- NEW FILE scim-skk-0.5.2-gcc43.patch ---
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal scim-skk-0.5.2.orig/src/scim_skk_imengine_setup.cpp scim-skk-0.5.2/src/scim_skk_imengine_setup.cpp
--- scim-skk-0.5.2.orig/src/scim_skk_imengine_setup.cpp	2008-09-16 22:39:27.000000000 -0500
+++ scim-skk-0.5.2/src/scim_skk_imengine_setup.cpp	2008-09-16 22:54:26.000000000 -0500
@@ -32,6 +32,7 @@
 #endif
 
 #include <vector>
+#include <cstring>
 
 #include <scim.h>
 #include <gtk/scimkeyselection.h>


Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/scim-skk.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- scim-skk.spec	4 Sep 2008 16:40:49 -0000	1.18
+++ scim-skk.spec	17 Sep 2008 04:06:24 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		scim-skk
 Version:	0.5.2
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	SCIM IMEngine module for skk
 
 Group:		System Environment/Libraries
@@ -10,6 +10,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: scim-skk-broken-iter.diff
+Patch1:		%{name}-0.5.2-gcc43.patch
 
 BuildRequires:	scim-devel
 Requires:	scim, skkdic
@@ -20,7 +21,9 @@
 
 %prep
 %setup -q
-
+# unclear if this is needed.  mdomsch 2008-09-16
+#%patch0 -p0
+%patch1 -p1
 
 %build
 %configure --disable-static
@@ -49,6 +52,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 Matt Domsch <mdomsch at fedoraproject.org> - 0.5.2-11
+- fix FTBFS BZ#434419
+
 * Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.2-10
 - fix license tag
 



From pkgdb at fedoraproject.org  Wed Sep 17 04:18:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 04:18:12 +0000
Subject: [pkgdb] gcc: dlpking has requested watchbugzilla
Message-ID: <20080917041812.B9AD3208D9B@bastion.fedora.phx.redhat.com>

dlpking has requested the watchbugzilla acl on gcc (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gcc



From pkgdb at fedoraproject.org  Wed Sep 17 04:18:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 04:18:27 +0000
Subject: [pkgdb] gcc: dlpking has given up watchbugzilla
Message-ID: <20080917041827.81AEE208DA0@bastion.fedora.phx.redhat.com>

dlpking has given up the watchbugzilla acl on gcc (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gcc



From mstone at fedoraproject.org  Wed Sep 17 04:23:24 2008
From: mstone at fedoraproject.org (Michael Stone)
Date: Wed, 17 Sep 2008 04:23:24 +0000 (UTC)
Subject: rpms/rainbow/F-9 .cvsignore, 1.12, 1.13 rainbow.spec, 1.12,
	1.13 sources, 1.12, 1.13
Message-ID: <20080917042324.6B36B7013C@cvs1.fedora.phx.redhat.com>

Author: mstone

Update of /cvs/pkgs/rpms/rainbow/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27464

Modified Files:
	.cvsignore rainbow.spec sources 
Log Message:
- Michael Stone (1):
    Apply the _get_lang() checks to the correct variable.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	16 Sep 2008 19:42:14 -0000	1.12
+++ .cvsignore	17 Sep 2008 04:22:54 -0000	1.13
@@ -1 +1 @@
-rainbow-0.7.23.tar.bz2
+rainbow-0.7.24.tar.bz2


Index: rainbow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/F-9/rainbow.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rainbow.spec	16 Sep 2008 19:42:14 -0000	1.12
+++ rainbow.spec	17 Sep 2008 04:22:54 -0000	1.13
@@ -3,7 +3,7 @@
 %{!?python_version: %define python_version %(%{__python} -c "import sys; print sys.version[0:3]")}
 
 Name:           rainbow
-Version:        0.7.23
+Version:        0.7.24
 Release:        1%{?dist}
 Summary:        The OLPC security service
 
@@ -81,6 +81,10 @@
 %{python_sitelib}/%{name}-%{version}-py%{python_version}.egg-info/*
 
 %changelog
+* Tue Sep 16 2008 Michael Stone <michael at laptop.org> - 0.7.24-1.olpc3
+- Michael Stone (1):
+    Apply the _get_lang() checks to the correct variable.
+
 * Tue Sep 16 2008 Michael Stone <michael at laptop.org> - 0.7.23-1.olpc3
 - Sayamindu Dasgupta (1):
     dlo#8127: Strip double-quotes in _get_lang().


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	16 Sep 2008 19:42:14 -0000	1.12
+++ sources	17 Sep 2008 04:22:54 -0000	1.13
@@ -1 +1 @@
-a9b2209573d465e474b67340c38cfc14  rainbow-0.7.23.tar.bz2
+a8d415f5e4918740634f37eac1b588a5  rainbow-0.7.24.tar.bz2



From pgordon at fedoraproject.org  Wed Sep 17 04:24:57 2008
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Wed, 17 Sep 2008 04:24:57 +0000 (UTC)
Subject: rpms/deluge/devel .cvsignore, 1.40, 1.41 deluge.spec, 1.63,
	1.64 sources, 1.40, 1.41 deluge-use-mt-boost.patch, 1.4, NONE
Message-ID: <20080917042457.F18A47013C@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28123

Modified Files:
	.cvsignore deluge.spec sources 
Removed Files:
	deluge-use-mt-boost.patch 
Log Message:
Bump to 1.0.0 RC9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	7 Sep 2008 19:51:03 -0000	1.40
+++ .cvsignore	17 Sep 2008 04:24:27 -0000	1.41
@@ -1 +1 @@
-deluge-0.9.08.tar.bz2
+deluge-0.9.09.tar.bz2


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- deluge.spec	7 Sep 2008 19:51:03 -0000	1.63
+++ deluge.spec	17 Sep 2008 04:24:27 -0000	1.64
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		deluge
-Version:	0.9.08
+Version:	0.9.09
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
@@ -14,8 +14,6 @@
 ## rb_libtorrent. See below for more details. 
 # Source1:	%{name}-fixed-setup.py
 
-Patch0: 	%{name}-use-mt-boost.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	boost-devel
@@ -61,7 +59,6 @@
 %setup -q
 ## Not building against system rb_libtorrent - see above.
 # install -m 0755 %{SOURCE1} ./setup.py
-%patch0 -b .use-mt-boost
 
 
 %build
@@ -117,6 +114,11 @@
 
 
 %changelog
+* Tue Sep 16 2008 Peter Gordon <peter at thecodergeek.com> - 0.9.09-1
+- Update to new upstream release candidate (1.0.0 RC9)
+- Drop mt-boost patch (fixed upstream):
+  - use-mt-boost.patch
+
 * Sun Sep 07 2008 Peter Gordon <peter at thecodergeek.com> - 0.9.08-1
 - Update to new upstream release candidate (1.0.0 RC8)
 - Drop state_upgrade script from the documentation. (This is now handled


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	7 Sep 2008 19:51:03 -0000	1.40
+++ sources	17 Sep 2008 04:24:27 -0000	1.41
@@ -1 +1 @@
-747ef3ef80fa1138f0521ed5edc95184  deluge-0.9.08.tar.bz2
+b8e6c53f4cf07fd715c7c596d06274f1  deluge-0.9.09.tar.bz2


--- deluge-use-mt-boost.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Sep 17 06:01:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:01:04 +0000
Subject: [pkgdb] mysql-gui-tools: hubbitus has requested watchbugzilla
Message-ID: <20080917060105.01572208D9A@bastion.fedora.phx.redhat.com>

hubbitus has requested the watchbugzilla acl on mysql-gui-tools (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 06:01:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:01:10 +0000
Subject: [pkgdb] mysql-gui-tools: hubbitus has requested watchcommits
Message-ID: <20080917060110.1C484208DA2@bastion.fedora.phx.redhat.com>

hubbitus has requested the watchcommits acl on mysql-gui-tools (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 06:01:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:01:12 +0000
Subject: [pkgdb] mysql-gui-tools: hubbitus has requested commit
Message-ID: <20080917060112.C849A208DA5@bastion.fedora.phx.redhat.com>

hubbitus has requested the commit acl on mysql-gui-tools (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 06:01:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:01:15 +0000
Subject: [pkgdb] mysql-gui-tools: hubbitus has requested approveacls
Message-ID: <20080917060115.C3865208DA9@bastion.fedora.phx.redhat.com>

hubbitus has requested the approveacls acl on mysql-gui-tools (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 06:01:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:01:21 +0000
Subject: [pkgdb] mysql-gui-tools: hubbitus has requested watchbugzilla
Message-ID: <20080917060121.47F80208D9A@bastion.fedora.phx.redhat.com>

hubbitus has requested the watchbugzilla acl on mysql-gui-tools (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From petersen at fedoraproject.org  Wed Sep 17 06:01:21 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 17 Sep 2008 06:01:21 +0000 (UTC)
Subject: rpms/ghc/devel ghc-rpm-macros.ghc,NONE,1.1 ghc.spec,1.40,1.41
Message-ID: <20080917060121.E351A7013C@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21127

Modified Files:
	ghc.spec 
Added Files:
	ghc-rpm-macros.ghc 
Log Message:
- add macros.ghc for new Haskell Packaging Guidelines (#460304)



--- NEW FILE ghc-rpm-macros.ghc ---
%cabal %{_bindir}/runhaskell Setup

%cabal_configure \
%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --libsubdir='$compiler/$pkgid'

%cabal_build \
%cabal build \
%{nil}

%cabal_makefile \
%cabal makefile -f cabal-rpm.mk \
make -f cabal-rpm.mk %{_smp_mflags} \
%{nil}

%cabal_haddock \
%cabal haddock \
%{nil}

%cabal_install \
%cabal copy --destdir=${RPM_BUILD_ROOT} \
%{nil}

%ghc_gen_filelists() \
rm -f %1.files %1-prof.files \
echo '%defattr(-,root,root,-)' > %1-prof.files \
find ${RPM_BUILD_ROOT}%{pkg_libdir} \\( -name '*_p.a' -o -name '*.p_hi' \\) >> %1-prof.files \
echo '%defattr(-,root,root,-)' > %1.files \
find ${RPM_BUILD_ROOT}%{pkg_libdir} -type d | sed 's/^/%dir /' >> %1.files \
find ${RPM_BUILD_ROOT}%{pkg_libdir} ! \\( -type d -o -name '*_p.a' -o -name '*.p_hi' \\) >> %1.files \
sed -i -e "s!${RPM_BUILD_ROOT}!!g" %1.files %1-prof.files \
%{nil}

%ghc_gen_scripts \
%cabal register --gen-script \
%cabal unregister --gen-script \
%{nil}

%ghc_install_scripts \
install -m 755 register.sh unregister.sh ${RPM_BUILD_ROOT}%{pkg_libdir} \
%{nil}

%ghc_preinst_script \
[ "$1" = 2 ] && %{pkg_libdir}/unregister.sh >&/dev/null || : \
%{nil}

%ghc_postinst_script \
%{pkg_libdir}/register.sh >&/dev/null \
%{nil}

%ghc_preun_script \
%{pkg_libdir}/unregister.sh >&/dev/null \
%{nil}

%ghc_postun_script \
[ "$1" = 1 ] && %{pkg_libdir}/register.sh >& /dev/null || : \
%{nil}



Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ghc.spec	19 Jun 2008 03:43:53 -0000	1.40
+++ ghc.spec	17 Sep 2008 06:00:51 -0000	1.41
@@ -16,7 +16,7 @@
 
 Name:		ghc
 Version:	6.8.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Glasgow Haskell Compilation system
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
 ExcludeArch:	alpha ppc64
@@ -24,6 +24,7 @@
 Group:		Development/Languages
 Source0:	http://www.haskell.org/ghc/dist/stable/dist/ghc-%{version}-src.tar.bz2
 Source1:	http://www.haskell.org/ghc/dist/stable/dist/ghc-%{version}-src-extralibs.tar.bz2
+Source2:	ghc-rpm-macros.ghc
 Patch0:		ghc-6.8.3-libraries-config.patch
 URL:		http://haskell.org/ghc/
 Requires:	chkconfig, gcc, gmp-devel, readline-devel
@@ -145,6 +146,10 @@
 cp libraries/*.html ${RPM_BUILD_ROOT}/%{_docdir}/%{name}-%{version}/libraries
 %endif
 
+# install rpm macros
+mkdir -p ${RPM_BUILD_ROOT}/%{_systemconfdir}/rpm/macros.ghc
+cp -p %{SOURCE2} ${RPM_BUILD_ROOT}/%{_systemconfdir}/rpm/macros.ghc
+
 SRC_TOP=$PWD
 rm -f rpm-*-filelist rpm-*.files
 ( cd $RPM_BUILD_ROOT
@@ -197,6 +202,7 @@
 %doc ANNOUNCE HACKING LICENSE README
 %doc %{_mandir}/man1/ghc.*
 %{_bindir}/*
+%{_systemconfdir}/rpm/macros.ghc
 %config(noreplace) %{_libdir}/ghc-%{version}/package.conf
 %ghost %{_libdir}/ghc-%{version}/package.conf.old
 
@@ -215,6 +221,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Jens Petersen <petersen at redhat.com> - 6.8.3-4
+- add macros.ghc for new Haskell Packaging Guidelines (#460304)
+
 * Wed Jun 18 2008 Bryan O'Sullivan <bos at serpentine.com> - 6.8.3-3
 - Add symlinks from _libdir, where ghc looks, to _libexecdir
 - Patch libraries/gen_contents_index to use haddock-0.9



From pkgdb at fedoraproject.org  Wed Sep 17 06:01:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:01:22 +0000
Subject: [pkgdb] mysql-gui-tools: hubbitus has requested watchcommits
Message-ID: <20080917060123.038DC208DAC@bastion.fedora.phx.redhat.com>

hubbitus has requested the watchcommits acl on mysql-gui-tools (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 06:01:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:01:25 +0000
Subject: [pkgdb] mysql-gui-tools: hubbitus has requested commit
Message-ID: <20080917060125.433F6208DB0@bastion.fedora.phx.redhat.com>

hubbitus has requested the commit acl on mysql-gui-tools (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 06:01:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:01:29 +0000
Subject: [pkgdb] mysql-gui-tools: hubbitus has requested approveacls
Message-ID: <20080917060129.895F8208DA0@bastion.fedora.phx.redhat.com>

hubbitus has requested the approveacls acl on mysql-gui-tools (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 06:03:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:03:21 +0000
Subject: [pkgdb] mysql-gui-tools: hubbitus has requested watchbugzilla
Message-ID: <20080917060321.74121208D9A@bastion.fedora.phx.redhat.com>

hubbitus has requested the watchbugzilla acl on mysql-gui-tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 06:03:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:03:22 +0000
Subject: [pkgdb] mysql-gui-tools: hubbitus has requested commit
Message-ID: <20080917060322.8CF67208DA2@bastion.fedora.phx.redhat.com>

hubbitus has requested the commit acl on mysql-gui-tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 06:03:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:03:35 +0000
Subject: [pkgdb] mysql-gui-tools: hubbitus has requested watchcommits
Message-ID: <20080917060335.B208C208D9A@bastion.fedora.phx.redhat.com>

hubbitus has requested the watchcommits acl on mysql-gui-tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 06:03:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:03:23 +0000
Subject: [pkgdb] mysql-gui-tools: hubbitus has requested approveacls
Message-ID: <20080917060323.4CA22208DA5@bastion.fedora.phx.redhat.com>

hubbitus has requested the approveacls acl on mysql-gui-tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From whot at fedoraproject.org  Wed Sep 17 06:07:33 2008
From: whot at fedoraproject.org (Peter Hutterer)
Date: Wed, 17 Sep 2008 06:07:33 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/devel
	xf86-input-synaptics-0.15.2-maxtapmove.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xorg-x11-drv-synaptics.spec, 1.7,
	1.8 xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch, 1.2,
	NONE xf86-input-synaptics-0.15.0-edges.patch, 1.3,
	NONE xf86-input-synaptics-0.15.0-preprobe.patch, 1.2,
	NONE xf86-input-synaptics-0.15.0-tap.patch, 1.1,
	NONE xf86-input-synaptics-0.15.1-dont-crash-without-Device.patch,
	1.1, NONE
Message-ID: <20080917060733.1D60E7013C@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22977

Modified Files:
	.cvsignore sources xorg-x11-drv-synaptics.spec 
Added Files:
	xf86-input-synaptics-0.15.2-maxtapmove.patch 
Removed Files:
	xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch 
	xf86-input-synaptics-0.15.0-edges.patch 
	xf86-input-synaptics-0.15.0-preprobe.patch 
	xf86-input-synaptics-0.15.0-tap.patch 
	xf86-input-synaptics-0.15.1-dont-crash-without-Device.patch 
Log Message:
* Wed Sep 17 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.2-1
- update to 0.15.2
- remove patches merged upstream.
- xf86-input-synaptics-0.15.2-maxtapmove.patch: scale MaxTapMove parameter
  depending on touchpad height #462211



xf86-input-synaptics-0.15.2-maxtapmove.patch:

--- NEW FILE xf86-input-synaptics-0.15.2-maxtapmove.patch ---
diff --git a/src/synaptics.c b/src/synaptics.c
index 1f96cc3..7b459a4 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -315,6 +315,7 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
     int horizScrollDelta, vertScrollDelta,
         edgeMotionMinSpeed, edgeMotionMaxSpeed;
     int l, r, t, b; /* left, right, top, bottom */
+    int maxTapMove;
 
     /* allocate memory for SynapticsPrivateRec */
     priv = xcalloc(1, sizeof(SynapticsPrivate));
@@ -418,6 +419,7 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
         vertScrollDelta = height * .04;
         edgeMotionMinSpeed = 1;
         edgeMotionMaxSpeed = width * .1;
+        maxTapMove = height * 0.072;
     } else {
         l = 1900;
         r = 5400;
@@ -430,6 +432,7 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
         vertScrollDelta = 100;
         edgeMotionMinSpeed = 1;
         edgeMotionMaxSpeed = 400;
+        maxTapMove = 220;
     }
 
     pars->left_edge = xf86SetIntOption(opts, "LeftEdge", l);
@@ -441,7 +444,7 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
     pars->finger_high = xf86SetIntOption(opts, "FingerHigh", 30);
     pars->finger_press = xf86SetIntOption(opts, "FingerPress", 256);
     pars->tap_time = xf86SetIntOption(opts, "MaxTapTime", 180);
-    pars->tap_move = xf86SetIntOption(opts, "MaxTapMove", 25);
+    pars->tap_move = xf86SetIntOption(opts, "MaxTapMove", maxTapMove);
     pars->tap_time_2 = xf86SetIntOption(opts, "MaxDoubleTapTime", 180);
     pars->click_time = xf86SetIntOption(opts, "ClickTime", 100);
     pars->fast_taps = xf86SetIntOption(opts, "FastTaps", FALSE);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2008 14:13:36 -0000	1.3
+++ .cvsignore	17 Sep 2008 06:07:02 -0000	1.4
@@ -1 +1 @@
-xf86-input-synaptics-0.15.1.tar.bz2
+xf86-input-synaptics-0.15.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2008 14:13:36 -0000	1.3
+++ sources	17 Sep 2008 06:07:02 -0000	1.4
@@ -1 +1 @@
-0a588c729295b9a91a05d9d157270917  xf86-input-synaptics-0.15.1.tar.bz2
+54565b65d115e8659ea061ef32809ed2  xf86-input-synaptics-0.15.2.tar.bz2


Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-synaptics.spec	9 Sep 2008 14:13:36 -0000	1.7
+++ xorg-x11-drv-synaptics.spec	17 Sep 2008 06:07:02 -0000	1.8
@@ -4,7 +4,7 @@
 
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 synaptics input driver
-Version:        0.15.1
+Version:        0.15.2
 Release:        1%{?dist}
 URL:            http://www.x.org
 License:        MIT
@@ -13,10 +13,7 @@
 
 Source0:        ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:        10-synaptics.fdi
-Patch2:		 xf86-input-synaptics-0.15.0-edges.patch
-Patch3:		 xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch
-Patch4:		 xf86-input-synaptics-0.15.0-preprobe.patch
-Patch5:		 xf86-input-synaptics-0.15.1-dont-crash-without-Device.patch
+Patch6:         xf86-input-synaptics-0.15.2-maxtapmove.patch
 ExcludeArch:    s390 s390x
 
 BuildRequires:  libtool pkgconfig
@@ -61,10 +58,7 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch2 -p1 -b .edges
-%patch3 -p1 -b .dont-lose-buttonup
-%patch4 -p1 -b .preprobe
-%patch5 -p1 -b .dont-crash-without-device
+%patch6 -p1 -b .maxtapmove
 
 %build
 autoreconf -v --install --force || exit 1
@@ -98,6 +92,12 @@
 %doc COPYING README
 
 %changelog
+* Wed Sep 17 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.2-1
+- update to 0.15.2
+- remove patches merged upstream.
+- xf86-input-synaptics-0.15.2-maxtapmove.patch: scale MaxTapMove parameter
+  depending on touchpad height #462211
+
 * Tue Sep 9 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.1-1
 - update to 0.15.1
 - remove xf86-input-synaptics-0.15.0-tap.patch: merged in upstream.


--- xf86-input-synaptics-0.15.0-dont-lose-buttonup.patch DELETED ---


--- xf86-input-synaptics-0.15.0-edges.patch DELETED ---


--- xf86-input-synaptics-0.15.0-preprobe.patch DELETED ---


--- xf86-input-synaptics-0.15.0-tap.patch DELETED ---


--- xf86-input-synaptics-0.15.1-dont-crash-without-Device.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Sep 17 06:18:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:18:50 +0000
Subject: [pkgdb] python-durus ownership updated
Message-ID: <20080917061850.95EA1208D9B@bastion.fedora.phx.redhat.com>

Package python-durus in Fedora devel is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-durus



From pkgdb at fedoraproject.org  Wed Sep 17 06:19:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:19:01 +0000
Subject: [pkgdb] python-durus ownership updated
Message-ID: <20080917061901.A50D2208DA3@bastion.fedora.phx.redhat.com>

Package python-durus in Fedora 9 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-durus



From pkgdb at fedoraproject.org  Wed Sep 17 06:18:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:18:58 +0000
Subject: [pkgdb] python-durus ownership updated
Message-ID: <20080917061858.55B2E208DA0@bastion.fedora.phx.redhat.com>

Package python-durus in Fedora 8 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-durus



From pkgdb at fedoraproject.org  Wed Sep 17 06:27:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:27:48 +0000
Subject: [pkgdb] openssh had acl change status
Message-ID: <20080917062748.BB610208DA2@bastion.fedora.phx.redhat.com>

tmraz has set the watchbugzilla acl on openssh (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Wed Sep 17 06:27:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:27:53 +0000
Subject: [pkgdb] openssh had acl change status
Message-ID: <20080917062753.327C8208DA6@bastion.fedora.phx.redhat.com>

tmraz has set the approveacls acl on openssh (Fedora devel) to Denied for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Wed Sep 17 06:27:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:27:56 +0000
Subject: [pkgdb] openssh had acl change status
Message-ID: <20080917062756.3A5F8208DA9@bastion.fedora.phx.redhat.com>

tmraz has set the watchcommits acl on openssh (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Wed Sep 17 06:27:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:27:59 +0000
Subject: [pkgdb] openssh had acl change status
Message-ID: <20080917062759.E777D208DAB@bastion.fedora.phx.redhat.com>

tmraz has set the commit acl on openssh (Fedora devel) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Wed Sep 17 06:28:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:28:11 +0000
Subject: [pkgdb] openssh had acl change status
Message-ID: <20080917062811.61649208DA2@bastion.fedora.phx.redhat.com>

tmraz has set the watchbugzilla acl on openssh (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Wed Sep 17 06:28:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:28:14 +0000
Subject: [pkgdb] openssh had acl change status
Message-ID: <20080917062814.ACC1E208DAD@bastion.fedora.phx.redhat.com>

tmraz has set the watchcommits acl on openssh (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Wed Sep 17 06:28:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:28:17 +0000
Subject: [pkgdb] openssh had acl change status
Message-ID: <20080917062817.D1FAE208DAF@bastion.fedora.phx.redhat.com>

tmraz has set the commit acl on openssh (Fedora 8) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Wed Sep 17 06:28:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:28:21 +0000
Subject: [pkgdb] openssh had acl change status
Message-ID: <20080917062821.576E5208DA7@bastion.fedora.phx.redhat.com>

tmraz has set the approveacls acl on openssh (Fedora 8) to Denied for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Wed Sep 17 06:28:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:28:24 +0000
Subject: [pkgdb] openssh had acl change status
Message-ID: <20080917062824.B6141208DB0@bastion.fedora.phx.redhat.com>

tmraz has set the watchbugzilla acl on openssh (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Wed Sep 17 06:28:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:28:28 +0000
Subject: [pkgdb] openssh had acl change status
Message-ID: <20080917062828.EAA69208DB2@bastion.fedora.phx.redhat.com>

tmraz has set the watchcommits acl on openssh (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Wed Sep 17 06:28:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:28:32 +0000
Subject: [pkgdb] openssh had acl change status
Message-ID: <20080917062832.BB4FF208DAB@bastion.fedora.phx.redhat.com>

tmraz has set the commit acl on openssh (Fedora 9) to Approved for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pkgdb at fedoraproject.org  Wed Sep 17 06:28:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 06:28:35 +0000
Subject: [pkgdb] openssh had acl change status
Message-ID: <20080917062835.DD661208DB4@bastion.fedora.phx.redhat.com>

tmraz has set the approveacls acl on openssh (Fedora 9) to Denied for mgrepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openssh



From pravins at fedoraproject.org  Wed Sep 17 06:40:47 2008
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Wed, 17 Sep 2008 06:40:47 +0000 (UTC)
Subject: rpms/system-config-language/devel .cvsignore, 1.11, 1.12 sources,
	1.32, 1.33 system-config-language.spec, 1.44, 1.45
Message-ID: <20080917064047.9C1487013C@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/system-config-language/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32426

Modified Files:
	.cvsignore sources system-config-language.spec 
Log Message:
* Wed Sep 17 2008 Pravin Satpute <psatpute at redhat.com>- 1.3.2-1
- upstream realease 1.3.2
- fix bug 444568, 462439



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	24 Jun 2008 10:40:52 -0000	1.11
+++ .cvsignore	17 Sep 2008 06:40:17 -0000	1.12
@@ -7,3 +7,4 @@
 system-config-language-1.1.15.tar.bz2
 system-config-language-1.1.16.tar.bz2
 system-config-language-1.3.1.tar.bz2
+system-config-language-1.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	24 Jun 2008 10:40:52 -0000	1.32
+++ sources	17 Sep 2008 06:40:17 -0000	1.33
@@ -1 +1 @@
-2b07c7c628fa3e26c0c5a2b499e1cc54  system-config-language-1.3.1.tar.bz2
+0c7d4097879c18f1f702d5166d4cdcb8  system-config-language-1.3.2.tar.bz2


Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/system-config-language.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- system-config-language.spec	16 Jul 2008 06:38:13 -0000	1.44
+++ system-config-language.spec	17 Sep 2008 06:40:17 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
-Version: 1.3.1
-Release: 2%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/language
 License: GPLv2+
 Group: System Environment/Base
@@ -32,7 +32,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make INSTROOT=$RPM_BUILD_ROOT install
-install $RPM_BUILD_DIR/system-config-language-1.3.1/yumhelpers.glade $RPM_BUILD_ROOT%{_datadir}/system-config-language
+install $RPM_BUILD_DIR/system-config-language-1.3.2/yumhelpers.glade $RPM_BUILD_ROOT%{_datadir}/system-config-language
 
 chmod 0644 $RPM_BUILD_ROOT%{_datadir}/system-config-language/*.py* 
 chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/system-config-language
@@ -82,6 +82,10 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language
 
 %changelog
+* Wed Sep 17 2008 Pravin Satpute <psatpute at redhat.com>- 1.3.2-1
+- upstream realease 1.3.2
+- fix bug 444568, 462439
+
 * Wed Jul 16 2008 Pravin Satpute <psatpute at redhat.com> - 1.3.1-2
 - fix bug 442901
 



From pkgdb at fedoraproject.org  Wed Sep 17 07:00:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 07:00:12 +0000
Subject: [pkgdb] moto4lin had group_acl changed
Message-ID: <20080917070012.CB118208D9B@bastion.fedora.phx.redhat.com>

jafo has set the commit acl on moto4lin (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moto4lin



From pkgdb at fedoraproject.org  Wed Sep 17 07:00:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 07:00:50 +0000
Subject: [pkgdb] moto4lin had group_acl changed
Message-ID: <20080917070050.6C8D4208DA0@bastion.fedora.phx.redhat.com>

jafo has set the commit acl on moto4lin (Fedora 7) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moto4lin



From pkgdb at fedoraproject.org  Wed Sep 17 07:00:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 07:00:53 +0000
Subject: [pkgdb] moto4lin had group_acl changed
Message-ID: <20080917070053.57FAC208DA2@bastion.fedora.phx.redhat.com>

jafo has set the commit acl on moto4lin (Fedora 6) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moto4lin



From pkgdb at fedoraproject.org  Wed Sep 17 07:00:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 07:00:56 +0000
Subject: [pkgdb] moto4lin had group_acl changed
Message-ID: <20080917070056.EEF29208DA4@bastion.fedora.phx.redhat.com>

jafo has set the commit acl on moto4lin (Fedora 8) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moto4lin



From pkgdb at fedoraproject.org  Wed Sep 17 07:01:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 07:01:01 +0000
Subject: [pkgdb] moto4lin had group_acl changed
Message-ID: <20080917070101.D3F62208DA5@bastion.fedora.phx.redhat.com>

jafo has set the commit acl on moto4lin (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moto4lin



From jreznik at fedoraproject.org  Wed Sep 17 07:05:00 2008
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 17 Sep 2008 07:05:00 +0000 (UTC)
Subject: rpms/arora/devel arora.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080917070500.A5F747013C@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/arora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7209/devel

Modified Files:
	.cvsignore sources 
Added Files:
	arora.spec import.log 
Log Message:
* Wed Aug 13 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-1
- Initial spec file 




--- NEW FILE arora.spec ---
Name:           arora
Version:        0.3
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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
%if 0%{?fedora} > 8
BuildRequires:  qt-devel >= 4.4.0
%else
BuildRequires:  qt4-devel >= 4.4.0
%endif


%description
Arora is a simple, cross platform web browser based on the QtWebKit engine.
Currently, Arora is still under development, but it already has support for
browsing and other common features such as web history and bookmarks.


%prep
%setup -q

%build
qmake-qt4 PREFIX=%{_prefix}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make INSTALL_ROOT=$RPM_BUILD_ROOT install 

desktop-file-install --vendor fedora \
      --dir $RPM_BUILD_ROOT%{_datadir}/applications\
      --delete-original\
      $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS README ChangeLog
%doc LICENSE.GPL2 LICENSE.GPL3
%{_bindir}/arora    
%{_datadir}/applications/fedora-%{name}.desktop    
%{_datadir}/icons/hicolor/128x128/apps/arora.png
%{_datadir}/icons/hicolor/16x16/apps/arora.png
%{_datadir}/icons/hicolor/32x32/apps/arora.png
%{_datadir}/icons/hicolor/scalable/apps/arora.svg
%{_datadir}/arora/locale/*
%{_datadir}/pixmaps/arora.xpm
%{_datadir}/man/man1/arora.1.gz

%changelog
* Wed Aug 13 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-1  
- Initial spec file 

--- NEW FILE import.log ---
arora-0_3-1_fc9:HEAD:arora-0.3-1.fc9.src.rpm:1221634943


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2008 03:06:11 -0000	1.1
+++ .cvsignore	17 Sep 2008 07:04:30 -0000	1.2
@@ -0,0 +1 @@
+arora-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 03:06:11 -0000	1.1
+++ sources	17 Sep 2008 07:04:30 -0000	1.2
@@ -0,0 +1 @@
+6da3c659f99775cee38b38b1ca85e173  arora-0.3.tar.gz



From petersen at fedoraproject.org  Wed Sep 17 07:12:26 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 17 Sep 2008 07:12:26 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.41,1.42
Message-ID: <20080917071226.789657013C@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9618

Modified Files:
	ghc.spec 
Log Message:
fix writing of _sysconfdir



Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ghc.spec	17 Sep 2008 06:00:51 -0000	1.41
+++ ghc.spec	17 Sep 2008 07:11:56 -0000	1.42
@@ -147,9 +147,9 @@
 %endif
 
 # install rpm macros
-mkdir -p ${RPM_BUILD_ROOT}/%{_systemconfdir}/rpm/macros.ghc
-cp -p %{SOURCE2} ${RPM_BUILD_ROOT}/%{_systemconfdir}/rpm/macros.ghc
-
+mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm/macros.ghc
+cp -p %{SOURCE2} ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm/macros.ghc
+			
 SRC_TOP=$PWD
 rm -f rpm-*-filelist rpm-*.files
 ( cd $RPM_BUILD_ROOT
@@ -202,7 +202,7 @@
 %doc ANNOUNCE HACKING LICENSE README
 %doc %{_mandir}/man1/ghc.*
 %{_bindir}/*
-%{_systemconfdir}/rpm/macros.ghc
+%{_sysconfdir}/rpm/macros.ghc
 %config(noreplace) %{_libdir}/ghc-%{version}/package.conf
 %ghost %{_libdir}/ghc-%{version}/package.conf.old
 



From jreznik at fedoraproject.org  Wed Sep 17 07:22:26 2008
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 17 Sep 2008 07:22:26 +0000 (UTC)
Subject: rpms/arora/F-9 arora.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080917072226.D44037013C@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/arora/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11954/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	arora.spec import.log 
Log Message:
* Wed Aug 13 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-1
- Initial spec file



--- NEW FILE arora.spec ---
Name:           arora
Version:        0.3
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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
%if 0%{?fedora} > 8
BuildRequires:  qt-devel >= 4.4.0
%else
BuildRequires:  qt4-devel >= 4.4.0
%endif


%description
Arora is a simple, cross platform web browser based on the QtWebKit engine.
Currently, Arora is still under development, but it already has support for
browsing and other common features such as web history and bookmarks.


%prep
%setup -q

%build
qmake-qt4 PREFIX=%{_prefix}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make INSTALL_ROOT=$RPM_BUILD_ROOT install 

desktop-file-install --vendor fedora \
      --dir $RPM_BUILD_ROOT%{_datadir}/applications\
      --delete-original\
      $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS README ChangeLog
%doc LICENSE.GPL2 LICENSE.GPL3
%{_bindir}/arora    
%{_datadir}/applications/fedora-%{name}.desktop    
%{_datadir}/icons/hicolor/128x128/apps/arora.png
%{_datadir}/icons/hicolor/16x16/apps/arora.png
%{_datadir}/icons/hicolor/32x32/apps/arora.png
%{_datadir}/icons/hicolor/scalable/apps/arora.svg
%{_datadir}/arora/locale/*
%{_datadir}/pixmaps/arora.xpm
%{_datadir}/man/man1/arora.1.gz

%changelog
* Wed Aug 13 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-1  
- Initial spec file 

--- NEW FILE import.log ---
arora-0_3-1_fc9:F-9:arora-0.3-1.fc9.src.rpm:1221636077


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2008 03:06:11 -0000	1.1
+++ .cvsignore	17 Sep 2008 07:21:56 -0000	1.2
@@ -0,0 +1 @@
+arora-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 03:06:11 -0000	1.1
+++ sources	17 Sep 2008 07:21:56 -0000	1.2
@@ -0,0 +1 @@
+6da3c659f99775cee38b38b1ca85e173  arora-0.3.tar.gz



From jreznik at fedoraproject.org  Wed Sep 17 07:24:35 2008
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 17 Sep 2008 07:24:35 +0000 (UTC)
Subject: rpms/arora/F-8 arora.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080917072435.6096D7013C@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/arora/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12595/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	arora.spec import.log 
Log Message:
* Wed Aug 13 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-1
- Initial spec file



--- NEW FILE arora.spec ---
Name:           arora
Version:        0.3
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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
%if 0%{?fedora} > 8
BuildRequires:  qt-devel >= 4.4.0
%else
BuildRequires:  qt4-devel >= 4.4.0
%endif


%description
Arora is a simple, cross platform web browser based on the QtWebKit engine.
Currently, Arora is still under development, but it already has support for
browsing and other common features such as web history and bookmarks.


%prep
%setup -q

%build
qmake-qt4 PREFIX=%{_prefix}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make INSTALL_ROOT=$RPM_BUILD_ROOT install 

desktop-file-install --vendor fedora \
      --dir $RPM_BUILD_ROOT%{_datadir}/applications\
      --delete-original\
      $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS README ChangeLog
%doc LICENSE.GPL2 LICENSE.GPL3
%{_bindir}/arora    
%{_datadir}/applications/fedora-%{name}.desktop    
%{_datadir}/icons/hicolor/128x128/apps/arora.png
%{_datadir}/icons/hicolor/16x16/apps/arora.png
%{_datadir}/icons/hicolor/32x32/apps/arora.png
%{_datadir}/icons/hicolor/scalable/apps/arora.svg
%{_datadir}/arora/locale/*
%{_datadir}/pixmaps/arora.xpm
%{_datadir}/man/man1/arora.1.gz

%changelog
* Wed Aug 13 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-1  
- Initial spec file 

--- NEW FILE import.log ---
arora-0_3-1_fc9:F-8:arora-0.3-1.fc9.src.rpm:1221636196


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2008 03:06:11 -0000	1.1
+++ .cvsignore	17 Sep 2008 07:24:05 -0000	1.2
@@ -0,0 +1 @@
+arora-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 03:06:11 -0000	1.1
+++ sources	17 Sep 2008 07:24:05 -0000	1.2
@@ -0,0 +1 @@
+6da3c659f99775cee38b38b1ca85e173  arora-0.3.tar.gz



From caolanm at fedoraproject.org  Wed Sep 17 07:30:57 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 17 Sep 2008 07:30:57 +0000 (UTC)
Subject: rpms/hunspell-tn/devel hunspell-tn.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080917073057.CEEB87013C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-tn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14334/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-tn.spec import.log 
Log Message:



--- NEW FILE hunspell-tn.spec ---
Name: hunspell-tn
Summary: Tswana hunspell dictionaries
%define upstreamid 20060123
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://downloads.translate.org.za/spellchecker/tswana/myspell-tn_ZA-%{upstreamid}.zip
Group: Applications/Text
URL: http://translate.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+
BuildArch: noarch

Requires: hunspell

%description
Tswana hunspell dictionaries.

%prep
%setup -q -c -n hunspell-tn

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_tn_ZA.txt
%{_datadir}/myspell/*

%changelog
* Tue Sep 09 2008 Caolan McNamara <caolanm at redhat.com> - 0.20060123-1
- initial version


--- NEW FILE import.log ---
hunspell-tn-0_20060123-1_fc9:HEAD:hunspell-tn-0.20060123-1.fc9.src.rpm:1221636722


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-tn/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2008 03:28:51 -0000	1.1
+++ .cvsignore	17 Sep 2008 07:30:27 -0000	1.2
@@ -0,0 +1 @@
+myspell-tn_ZA-20060123.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-tn/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 03:28:51 -0000	1.1
+++ sources	17 Sep 2008 07:30:27 -0000	1.2
@@ -0,0 +1 @@
+d38384cfeb1ce45f5647af13e51446f9  myspell-tn_ZA-20060123.zip



From mnowak at fedoraproject.org  Wed Sep 17 07:32:25 2008
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Wed, 17 Sep 2008 07:32:25 +0000 (UTC)
Subject: rpms/eclipse-pydev/F-8 import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <20080917073225.2898A7013C@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/eclipse-pydev/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14846/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log 
Log Message:
bump to 1.3.20



--- NEW FILE import.log ---
eclipse-pydev-1_3_20-1_fc9:F-8:eclipse-pydev-1.3.20-1.fc9.src.rpm:1221636673


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	20 May 2008 20:26:34 -0000	1.7
+++ .cvsignore	17 Sep 2008 07:31:54 -0000	1.8
@@ -1,5 +1,2 @@
 org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
-org.python.pydev.feature-src-1_3_9.zip
-org.python.pydev.feature-src-1_3_12.zip
-org.python.pydev.feature-src-1_3_14.zip
-org.python.pydev.feature-src-1_3_17.zip
+org.python.pydev.feature-src-1_3_20.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 May 2008 20:26:34 -0000	1.7
+++ sources	17 Sep 2008 07:31:54 -0000	1.8
@@ -1,2 +1,2 @@
 3a42402df10a42af0a8d648711c36239  org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
-3ab707ac06c8f28de90efdb3a7109094  org.python.pydev.feature-src-1_3_17.zip
+9f9432cc41a797b27aa93755233336a3  org.python.pydev.feature-src-1_3_20.zip



From transif at fedoraproject.org  Wed Sep 17 07:34:37 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Wed, 17 Sep 2008 07:34:37 +0000 (UTC)
Subject: comps/po de.po,1.25,1.26
Message-ID: <20080917073437.42B937013C@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15545/po

Modified Files:
	de.po 
Log Message:
    2008-09-17  Dominik Sandjaja <dominik at dadadom.de> (via
dominiksandjaja at fedoraproject.org)
    
      * po/de.po: Updated German translation
    



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.25 -r 1.26 de.po
Index: de.po
===================================================================
RCS file: /cvs/pkgs/comps/po/de.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- de.po	11 Sep 2008 22:37:07 -0000	1.25
+++ de.po	17 Sep 2008 07:34:06 -0000	1.26
@@ -10,13 +10,14 @@
 # Severin Heiniger <severinheiniger at gmail.com>, 2007.
 # Fabian Affolter <fab at fedoraproject.org>, 2007,2008.
 # Daniela Kugelmann <dkugelma at redhat.com >, 2008.
+# Dominik Sandjaja <dominiksandjaja at fedoraproject.org>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-11 19:28+0000\n"
-"PO-Revision-Date: 2008-09-12 08:23+1000\n"
-"Last-Translator: Daniela Kugelmann <dkugelma at redhat.com >\n"
+"POT-Creation-Date: 2008-09-17 01:23+0000\n"
+"PO-Revision-Date: 2008-09-17 09:31+0100\n"
+"Last-Translator: Dominik Sandjaja <dominiksandjaja at fedoraproject.org>\n"
 "Language-Team: German <i18 at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,187 +27,282 @@
 "X-Poedit-Language: German\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
+#: ../comps-f7.xml.in.h:1
+#: ../comps-f8.xml.in.h:1
+#: ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "Eine schlanke Desktop-Umgebung, die gut auf ??lteren Systemen funktioniert."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../comps-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:2
+#: ../comps-el4.xml.in.h:1
+#: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Verwaltungswerkzeuge"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
+#: ../comps-f7.xml.in.h:3
+#: ../comps-f8.xml.in.h:3
+#: ../comps-f9.xml.in.h:3
 #: ../comps-f10.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "Unterst??tzung f??r Afrikaans"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
+#: ../comps-f7.xml.in.h:4
+#: ../comps-f8.xml.in.h:4
+#: ../comps-f9.xml.in.h:4
 #: ../comps-f10.xml.in.h:4
 msgid "Albanian Support"
 msgstr "Unterst??tzung f??r Albanisch"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../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:5
+#: ../comps-el4.xml.in.h:2
+#: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
+#: ../comps-f7.xml.in.h:6
+#: ../comps-f8.xml.in.h:6
+#: ../comps-f9.xml.in.h:6
 #: ../comps-f10.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
 msgstr "Anwendungen zur Durchf??hrung einer Vielzahl von Aufgaben"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../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:7
+#: ../comps-el4.xml.in.h:4
+#: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Unterst??tzung f??r Arabisch"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../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:8
+#: ../comps-el4.xml.in.h:5
+#: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Unterst??tzung f??r Armenisch"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
+#: ../comps-f7.xml.in.h:9
+#: ../comps-f8.xml.in.h:9
+#: ../comps-f9.xml.in.h:9
 #: ../comps-f10.xml.in.h:9
 msgid "Assamese Support"
 msgstr "Unterst??tzung f??r Assamesisch"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../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:10
+#: ../comps-el4.xml.in.h:6
+#: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Schreiben und Publizieren"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
+#: ../comps-f7.xml.in.h:11
+#: ../comps-f8.xml.in.h:11
+#: ../comps-f9.xml.in.h:11
 #: ../comps-f10.xml.in.h:11
 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:12 ../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:12
+#: ../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-f7.xml.in.h:13
+#: ../comps-f8.xml.in.h:13
+#: ../comps-f9.xml.in.h:13
 #: ../comps-f10.xml.in.h:13
 msgid "Basic support for the Ruby programming language."
 msgstr "Basis-Unterst??tzung f??r die Programmiersprache Ruby."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
+#: ../comps-f7.xml.in.h:14
+#: ../comps-f8.xml.in.h:14
+#: ../comps-f9.xml.in.h:14
 #: ../comps-f10.xml.in.h:14
 msgid "Basque Support"
 msgstr "Unterst??tzung f??r Baskisch (Spanien)"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
+#: ../comps-f7.xml.in.h:15
+#: ../comps-f8.xml.in.h:15
+#: ../comps-f9.xml.in.h:15
 #: ../comps-f10.xml.in.h:15
 msgid "Belarusian Support"
 msgstr "Unterst??tzung f??r Belarussisch"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
+#: ../comps-f7.xml.in.h:16
+#: ../comps-f8.xml.in.h:16
+#: ../comps-f9.xml.in.h:16
 #: ../comps-f10.xml.in.h:16
 msgid "Bengali Support"
 msgstr "Unterst??tzung f??r Bengali"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
+#: ../comps-f7.xml.in.h:17
+#: ../comps-f8.xml.in.h:17
+#: ../comps-f9.xml.in.h:17
 #: ../comps-f10.xml.in.h:17
 msgid "Bhutanese Support"
 msgstr "Unterst??tzung f??r Bhutanisch"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
+#: ../comps-f7.xml.in.h:18
+#: ../comps-f8.xml.in.h:18
+#: ../comps-f9.xml.in.h:18
 #: ../comps-f10.xml.in.h:18
 msgid "Bosnian Support"
 msgstr "Unterst??tzung f??r Bosnisch"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
+#: ../comps-f7.xml.in.h:19
+#: ../comps-f8.xml.in.h:19
+#: ../comps-f9.xml.in.h:19
 #: ../comps-f10.xml.in.h:19
 msgid "Brazilian Portuguese Support"
 msgstr "Unterst??tzung f??r Portugiesisch (Brasilien)"
 
[...1886 lines suppressed...]
 msgid "Esperanto Support"
 msgstr "Unterst??tzung f??r Esperanto"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:94
+#: ../comps-f9.xml.in.h:91
+#: ../comps-f10.xml.in.h:95
 msgid "Kashubian Support"
 msgstr "Unterst??tzung f??r Kashubisch"
 
-#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:106
+#: ../comps-f9.xml.in.h:103
+#: ../comps-f10.xml.in.h:108
 msgid "Macedonian Support"
 msgstr "Unterst??tzung f??r Mazedonisch"
 
-#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:119
+#: ../comps-f9.xml.in.h:114
+#: ../comps-f10.xml.in.h:121
 msgid "Northern Sami Support"
 msgstr "Unterst??tzung f??r Nord-Sami"
 
-#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:135
+#: ../comps-f9.xml.in.h:130
+#: ../comps-f10.xml.in.h:137
 msgid "SUGAR Desktop Environment"
 msgstr "SUGAR Desktopumgebung"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:136
+#: ../comps-f9.xml.in.h:131
+#: ../comps-f10.xml.in.h:138
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR ist die Desktopumgebung, welche f??r den OLPC XO entwickelt wurde."
 
-#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:208
+#: ../comps-f9.xml.in.h:200
+#: ../comps-f10.xml.in.h:211
 msgid "Walloon Support"
 msgstr "Unterst??tzung f??r Wallonisch"
 
@@ -1180,103 +1632,99 @@
 msgid "Input method packages for the input of international text."
 msgstr "Eingabemethoden-Paket f??r die Eingabe von internationalem Text."
 
-#: ../comps-f10.xml.in.h:108
+#: ../comps-f10.xml.in.h:94
+msgid "Kashmiri Support"
+msgstr "Unterst??tzung f??r Kashmiri"
+
+#: ../comps-f10.xml.in.h:97
+msgid "Konkani Support"
+msgstr "Unterst??tzung f??r Konkani"
+
+#: ../comps-f10.xml.in.h:110
 msgid "Maithili Support"
 msgstr "Unterst??tzung f??r Maithili"
 
-#: ../comps-f10.xml.in.h:115
+#: ../comps-f10.xml.in.h:117
 msgid "Myanmar (Burmese) Support"
 msgstr "Unterst??tzung f??r Burmesisch (Myanmar)"
 
-#: ../comps-f10.xml.in.h:153
+#: ../comps-f10.xml.in.h:144
+msgid "Sindhi Support"
+msgstr "Unterst??tzung f??r Sindhi"
+
+#: ../comps-f10.xml.in.h:156
 msgid "Support for developing programs in the Haskell programming language."
-msgstr ""
-"Unterst??tzung f??r die Entwicklung von Programmen in der Programmiersprache "
-"Haskell."
+msgstr "Unterst??tzung f??r die Entwicklung von Programmen in der Programmiersprache Haskell."
 
-#: ../comps-f10.xml.in.h:160
+#: ../comps-f10.xml.in.h:163
 msgid "Tajik Support"
 msgstr "Unterst??tzung f??r Tajik"
 
-#: ../comps-f10.xml.in.h:202
+#: ../comps-f10.xml.in.h:205
 msgid "Uzbek Support"
 msgstr "Unterst??tzung f??r Usbekisch"
 
-#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
+#: ../comps-el4.xml.in.h:3
+#: ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Anwendungen f??r eine Vielzahl von Aufgaben"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12
+#: ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "Unterst??tzung f??r DF??-Netzwerk"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
-msgid ""
-"GNOME is a powerful, graphical user interface which includes a panel, "
-"desktop, system icons, and a graphical file manager."
-msgstr ""
-"GNOME ist eine leistungsstarke grafische Benutzeroberfl??che mit Men??leiste, "
-"Desktop, Systemsymbolen und grafischem Dateimanager."
-
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
-msgid ""
-"KDE is a powerful, graphical user interface which includes a panel, desktop, "
-"system icons, and a graphical file manager."
-msgstr ""
-"KDE ist eine leistungsstarke, grafische Benutzeroberfl??che mit Men??leiste, "
-"Desktop, Systemsymbolen und grafischem Dateimanager."
-
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
-msgid ""
-"Sometimes called text editors, these are programs that allow you to create "
-"and edit files. These include Emacs and Vi."
-msgstr ""
-"Diese auch als Text-Editoren bezeichneten Programme erm??glichen das Anlegen "
-"und Bearbeiten von Dateien. Dazu geh??ren Emacs und Vi."
+#: ../comps-el4.xml.in.h:22
+#: ../comps-el5.xml.in.h:23
+msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "GNOME ist eine leistungsstarke grafische Benutzeroberfl??che mit Men??leiste, Desktop, Systemsymbolen und grafischem Dateimanager."
+
+#: ../comps-el4.xml.in.h:35
+#: ../comps-el5.xml.in.h:35
+msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "KDE ist eine leistungsstarke, grafische Benutzeroberfl??che mit Men??leiste, Desktop, Systemsymbolen und grafischem Dateimanager."
+
+#: ../comps-el4.xml.in.h:44
+#: ../comps-el5.xml.in.h:44
+msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi."
+msgstr "Diese auch als Text-Editoren bezeichneten Programme erm??glichen das Anlegen und Bearbeiten von Dateien. Dazu geh??ren Emacs und Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50
+#: ../comps-el5.xml.in.h:48
 msgid "The XEmacs text editor."
 msgstr "Der Text-Editor XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
-msgid ""
-"These tools allow you to create documentation in the DocBook format and "
-"convert them to HTML, PDF, Postscript, and text."
-msgstr ""
-"Mit diesen Programmen k??nnen Sie Dokumentationen im DocBook-Format anlegen "
-"und diese in die Formate HTML, PDF, Postscript und Text konvertieren."
+#: ../comps-el4.xml.in.h:54
+#: ../comps-el5.xml.in.h:52
+msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text."
+msgstr "Mit diesen Programmen k??nnen Sie Dokumentationen im DocBook-Format anlegen und diese in die Formate HTML, PDF, Postscript und Text konvertieren."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64
+#: ../comps-el5.xml.in.h:62
 msgid "This group is a collection of network servers for specific purposes"
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Netzwerkservern f??r verschiedene "
-"Zwecke."
+msgstr "Diese Gruppe umfasst eine Sammlung von Netzwerkservern f??r verschiedene Zwecke."
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65
+#: ../comps-el5.xml.in.h:63
 msgid "This group is a collection of tools and resources of Arabic environments."
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
-"arabische Umgebungen."
+msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von arabische Umgebungen."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
+#: ../comps-el4.xml.in.h:67
+#: ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Hebrew environments."
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
-"hebr??ische Umgebungen."
+msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von hebr??ische Umgebungen."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:68
+#: ../comps-el5.xml.in.h:67
 msgid "This group is a collection of tools and resources of Japanese environments."
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
-"japanische Umgebungen."
+msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von japanische Umgebungen."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77
+#: ../comps-el5.xml.in.h:77
 msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
 msgid "This group is a collection of tools and resources of Czech environments."
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
-"tschechischen Umgebungen."
+msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von tschechischen Umgebungen."
 



From sharkcz at fedoraproject.org  Wed Sep 17 07:46:01 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 17 Sep 2008 07:46:01 +0000 (UTC)
Subject: rpms/tinyerp/devel .cvsignore, 1.16, 1.17 sources, 1.16,
	1.17 tinyerp.spec, 1.36, 1.37
Message-ID: <20080917074601.57D717013C@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18034

Modified Files:
	.cvsignore sources tinyerp.spec 
Log Message:
* Wed Sep 16 2008 Dan Horak <dan[at]danny.cz> 4.2.3.3-1
- update to upstream version 4.2.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	12 Feb 2008 18:02:11 -0000	1.16
+++ .cvsignore	17 Sep 2008 07:45:30 -0000	1.17
@@ -1,2 +1,2 @@
-tinyerp-client-4.2.2.tar.gz
-tinyerp-server-4.2.2.tar.gz
+tinyerp-client-4.2.3.3.tar.gz
+tinyerp-server-4.2.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	12 Feb 2008 18:02:11 -0000	1.16
+++ sources	17 Sep 2008 07:45:31 -0000	1.17
@@ -1,2 +1,2 @@
-6304a349cb0595ab21db9dde18472025  tinyerp-client-4.2.2.tar.gz
-0314eb07bae41040dfcf832eadf190d0  tinyerp-server-4.2.2.tar.gz
+bc6db0ad92965c80753195265fceef29  tinyerp-client-4.2.3.3.tar.gz
+d7a87e27a895732de87f6e7091abcf8f  tinyerp-server-4.2.3.3.tar.gz


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- tinyerp.spec	1 Sep 2008 07:26:10 -0000	1.36
+++ tinyerp.spec	17 Sep 2008 07:45:31 -0000	1.37
@@ -3,8 +3,8 @@
 
 
 Name:		tinyerp
-Version:	4.2.2
-Release:	4%{?dist}
+Version:	4.2.3.3
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -16,7 +16,6 @@
 Source4:	tinyerp-server
 Source5:	tinyerp-server.logrotate
 Source6:	README.Fedora
-Patch0:		tinyerp-pgsql.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
@@ -55,9 +54,10 @@
 
 
 %prep
-%setup -q -a 1 -c %{name}-%{version}
-%patch0 -p0
+%setup -q -T -a 0 -c -n %{name}-server-%{version}
+%setup -q -T -a 1 -c -n %{name}-client-%{version}
 
+cd ..
 # update docs
 rm tinyerp-client-%{version}/doc/License.rtf
 cp %{SOURCE6} tinyerp-server-%{version}/doc/README.Fedora
@@ -68,7 +68,7 @@
 
 
 %build
-cd tinyerp-client-%{version}
+cd ../tinyerp-client-%{version}
 %{_xvfb} :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py build
 cd ../tinyerp-server-%{version}
@@ -77,7 +77,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd tinyerp-client-%{version}
+cd ../tinyerp-client-%{version}
 %{_xvfb} :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
 cd ../tinyerp-server-%{version}
@@ -113,8 +113,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -f %{name}-client.lang
-%doc tinyerp-client-%{version}/doc/*
+%files -f ../%{name}-client.lang
+%doc ../tinyerp-client-%{version}/doc/*
 %defattr(-,root,root,0755)
 %{_bindir}/tinyerp-client
 %{python_sitelib}/tinyerp-client/
@@ -125,7 +125,7 @@
 %{_datadir}/applications/*.desktop
 
 %files server
-%doc tinyerp-server-%{version}/doc/*
+%doc ../tinyerp-server-%{version}/doc/*
 %attr(750,tinyerp,tinyerp) %dir /var/log/tinyerp
 %attr(750,tinyerp,tinyerp) %dir /var/spool/tinyerp
 %{_sysconfdir}/rc.d/init.d/tinyerp-server
@@ -164,8 +164,11 @@
 
 
 %changelog
+* Wed Sep 16 2008 Dan Horak <dan[at]danny.cz> 4.2.3.3-1
+- update to upstream version 4.2.3.3
+
 * Mon Sep  1 2008 Dan Horak <dan[at]danny.cz> 4.2.2-4
-- add patch for PostgreSQL 8.3 compatibility (from Pieter. J. Kersten)
+- add patch for PostgreSQL 8.3 compatibility (from Pieter J. Kersten)
 
 * Fri May 30 2008 Dan Horak <dan[at]danny.cz> 4.2.2-3
 - add missing R: python-matplotlib (Resolves: #449118)



From stransky at fedoraproject.org  Wed Sep 17 07:54:25 2008
From: stransky at fedoraproject.org (Martin Stransky)
Date: Wed, 17 Sep 2008 07:54:25 +0000 (UTC)
Subject: rpms/nspluginwrapper/F-9 nspluginwrapper.spec,1.53,1.54
Message-ID: <20080917075425.0DB7E7013C@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21040

Modified Files:
	nspluginwrapper.spec 
Log Message:
Added libcurl to requires (#460988)


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/nspluginwrapper.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- nspluginwrapper.spec	4 Aug 2008 07:46:25 -0000	1.53
+++ nspluginwrapper.spec	17 Sep 2008 07:53:54 -0000	1.54
@@ -70,7 +70,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	1.1.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -87,7 +87,7 @@
 Url:		http://gwenole.beauchesne.info/projects/nspluginwrapper/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Provides:	%{name} = %{version}-%{release}
-Requires:	mozilla-filesystem
+Requires:	mozilla-filesystem libcurl
 BuildRequires:	pkgconfig gtk2-devel glib2-devel nspr-devel
 BuildRequires:	libX11-devel libXt-devel cairo-devel pango-devel libcurl-devel
 BuildRequires:	gecko-devel >= %{gecko_ver}
@@ -100,6 +100,7 @@
 This package consists in:
   * npviewer: the plugin viewer
   * npwrapper.so: the browser-side plugin
+  * nspluginplayer: stand-alone NPAPI plugin player
   * mozilla-plugin-config: a tool to manage plugins installation and update
 
 %prep
@@ -240,6 +241,9 @@
 %config %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Wed Sep 17 2008 Martin Stransky <stransky at redhat.com> 1.1.0-6
+- Added libcurl to requires (#460988)
+
 * Mon Aug 04 2008 Martin Stransky <stransky at redhat.com> 1.1.0-5
 - Added fix for #456432 -(Windowless Crash) Flash 10 w/ Firefox 3
 



From stransky at fedoraproject.org  Wed Sep 17 07:57:06 2008
From: stransky at fedoraproject.org (Martin Stransky)
Date: Wed, 17 Sep 2008 07:57:06 +0000 (UTC)
Subject: rpms/nspluginwrapper/devel nspluginwrapper.spec,1.53,1.54
Message-ID: <20080917075706.9B32C7013F@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22329

Modified Files:
	nspluginwrapper.spec 
Log Message:
Added libcurl to requires (#460988)


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- nspluginwrapper.spec	11 Aug 2008 20:22:32 -0000	1.53
+++ nspluginwrapper.spec	17 Sep 2008 07:56:36 -0000	1.54
@@ -70,7 +70,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	1.1.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -87,7 +87,7 @@
 Url:		http://gwenole.beauchesne.info/projects/nspluginwrapper/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Provides:	%{name} = %{version}-%{release}
-Requires:	mozilla-filesystem
+Requires:	mozilla-filesystem libcurl
 BuildRequires:	pkgconfig gtk2-devel glib2-devel nspr-devel
 BuildRequires:	libX11-devel libXt-devel cairo-devel pango-devel libcurl-devel
 BuildRequires:	gecko-devel >= %{gecko_ver}
@@ -100,6 +100,7 @@
 This package consists in:
   * npviewer: the plugin viewer
   * npwrapper.so: the browser-side plugin
+  * nspluginplayer: stand-alone NPAPI plugin player
   * mozilla-plugin-config: a tool to manage plugins installation and update
 
 %prep
@@ -240,6 +241,9 @@
 %config %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Wed Sep 17 2008 Martin Stransky <stransky at redhat.com> 1.1.0-7
+- Added libcurl to requires (#460988)
+
 * Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.1.0-6
 - fix license tag
 



From atkac at fedoraproject.org  Wed Sep 17 08:03:33 2008
From: atkac at fedoraproject.org (Adam Tkac)
Date: Wed, 17 Sep 2008 08:03:33 +0000 (UTC)
Subject: rpms/bind/devel bind95-rh461409.patch, NONE, 1.1 bind.spec, 1.278,
	1.279
Message-ID: <20080917080333.944587013C@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25552

Modified Files:
	bind.spec 
Added Files:
	bind95-rh461409.patch 
Log Message:
- IDN output strings didn't honour locale settings (#461409)


bind95-rh461409.patch:

--- NEW FILE bind95-rh461409.patch ---
diff -up bind-9.5.1b1/bin/dig/dighost.c.rh461409 bind-9.5.1b1/bin/dig/dighost.c
--- bind-9.5.1b1/bin/dig/dighost.c.rh461409	2008-09-16 14:04:03.000000000 +0200
+++ bind-9.5.1b1/bin/dig/dighost.c	2008-09-16 14:06:06.000000000 +0200
@@ -3665,6 +3665,15 @@ output_filter (isc_buffer_t *buffer, uns
 	(void) strcpy (tmp1, tmp2);
 	free (tmp2);
 
+	tmp2 = stringprep_utf8_to_locale (tmp1);
+	if (tmp2 == NULL) {
+		debug ("output_filter: stringprep_utf8_to_locale failed");
+		return ISC_R_SUCCESS;
+	}
+
+	(void) strcpy (tmp1, tmp2);
+	free (tmp2);
+
         tolen = strlen (tmp1);
         if (absolute && !end_with_dot && tmp1[tolen - 1] == '.')
                 tolen--;


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- bind.spec	5 Aug 2008 12:01:14 -0000	1.278
+++ bind.spec	17 Sep 2008 08:03:03 -0000	1.279
@@ -19,7 +19,7 @@
 Name:     bind
 License:  ISC
 Version:  9.5.1
-Release:  0.5.%{PREVER}%{?dist}
+Release:  0.6.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -81,6 +81,7 @@
 Patch73: bind-9.5-libidn.patch
 Patch83: bind-9.5-libidn2.patch
 Patch85: bind-9.5-libidn3.patch
+Patch94: bind95-rh461409.patch
 
 #
 Requires:       mktemp
@@ -245,6 +246,7 @@
 %patch90 -p1 -b .edns
 %patch91 -p1 -b .rh450995
 %patch92 -p1 -b .rh457175
+%patch94 -p1 -b .rh461409
 
 # Sparc and s390 arches need to use -fPIE
 %ifarch sparcv9 sparc64 s390 s390x
@@ -642,6 +644,9 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Wed Sep 17 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.6.b1
+- IDN output strings didn't honour locale settings (#461409)
+
 * Tue Aug 05 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.5.b1
 - disable transfer stats on DLZ zones (#454783)
 



From nphilipp at fedoraproject.org  Wed Sep 17 08:37:04 2008
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 17 Sep 2008 08:37:04 +0000 (UTC)
Subject: rpms/gimp/devel gimp.spec,1.159,1.160
Message-ID: <20080917083704.7C7657013C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1977

Modified Files:
	gimp.spec 
Log Message:
Merge review:
- convert spec file to UTF-8
- remove unneeded gimp2, gimp-beta obsoletes
- quote macros in changelog
- use only spaces, not tabs
- make pyconsole.py plug-in executable (upstream bug #552601)



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- gimp.spec	22 Aug 2008 15:46:30 -0000	1.159
+++ gimp.spec	17 Sep 2008 08:36:34 -0000	1.160
@@ -51,13 +51,12 @@
 %define age 0
 %define minorver 400
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.gimp.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
-Obsoletes:      gimp2 gimp-beta <= %{?epoch:%{epoch}:}2.4
 Obsoletes:      gimp-perl < 2:2.0
 BuildRequires:  alsa-lib-devel >= 1.0.0
 BuildRequires:  curl-devel >= 7.15.1
@@ -153,7 +152,6 @@
 Requires:       gtk2-devel
 Requires:       glib2-devel
 Requires:       pkgconfig
-Obsoletes:      gimp2-devel gimp-beta-devel <= %{?epoch:%{epoch}:}2.4
 
 %description devel
 The gimp-devel package contains the static libraries and header files
@@ -195,31 +193,31 @@
 fi
 CFLAGS="%optflags -fomit-frame-pointer" \
 %configure \
-	--disable-perl \
+    --disable-perl \
 %if %{with python}
-	--enable-python \
+    --enable-python \
 %else
-	--disable-python \
+    --disable-python \
 %endif
 %if %{with mp}
-	--enable-mp \
+    --enable-mp \
 %else
-	--disable-mp \
+    --disable-mp \
 %endif
 %if %{with static}
-	--enable-static \
+    --enable-static \
 %else
-	--disable-static \
+    --disable-static \
 %endif
 %if %{with print}
-	--with-print \
+    --with-print \
 %else
-	--without-print \
+    --without-print \
 %endif
 %if %{with lcms}
-	--with-lcms \
+    --with-lcms \
 %else
-	--without-lcms \
+    --without-lcms \
 %endif
     --enable-gimp-console \
     --without-aa \
@@ -300,6 +298,9 @@
 mkdir -p %{buildroot}%{_sbindir}
 install -m 0755 gimp-plugin-mgr %{buildroot}%{_sbindir}/gimp-plugin-mgr
 
+# make pyconsole.py executable, gimp/gnome bug #552601
+chmod 755 %{buildroot}%{_libdir}/gimp/%{interfacever}/plug-ins/pyconsole.py
+
 %clean
 rm -rf %{buildroot}
 
@@ -456,6 +457,14 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Sep 17 2008 Nils Philippsen <nils at redhat.com> - 2:2.4.7-2
+- Merge review:
+  - convert spec file to UTF-8
+  - remove unneeded gimp2, gimp-beta obsoletes
+  - quote macros in changelog
+  - use only spaces, not tabs
+  - make pyconsole.py plug-in executable (upstream bug #552601)
+
 * Fri Aug 22 2008 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.7-1
 - version 2.4.7
 
@@ -1189,7 +1198,7 @@
 * Mon Apr  2 2001 Preston Brown <pbrown at redhat.com>
 - some gimp-perl files weren't defattr'd (#34325)
 
-* Fri Mar 30 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Mar 30 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - Don't include embedxpm, as it depends on a non-included perl module (#=33249)
 - move gimpdoc and xcftopnm to gimp-perl, as they are dependant on the perl Gimp
   module
@@ -1279,6 +1288,4 @@
 
 * Wed Dec 22 1999 Gregory McLean <gregm at comstar.net>
 - Version 1.1.14
-- Added some auto %files section generation scriptlets
-
-
+- Added some auto %%files section generation scriptlets



From nphilipp at fedoraproject.org  Wed Sep 17 08:39:54 2008
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 17 Sep 2008 08:39:54 +0000 (UTC)
Subject: rpms/gimp/F-9 gimp.spec,1.159,1.160
Message-ID: <20080917083954.F0FE37013C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2430

Modified Files:
	gimp.spec 
Log Message:
Merge review:
- convert spec file to UTF-8
- remove unneeded gimp2, gimp-beta obsoletes
- quote macros in changelog
- use only spaces, not tabs
- make pyconsole.py plug-in executable (upstream bug #552601)



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-9/gimp.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- gimp.spec	22 Aug 2008 17:16:05 -0000	1.159
+++ gimp.spec	17 Sep 2008 08:39:24 -0000	1.160
@@ -51,13 +51,12 @@
 %define age 0
 %define minorver 400
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.gimp.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
-Obsoletes:      gimp2 gimp-beta <= %{?epoch:%{epoch}:}2.4
 Obsoletes:      gimp-perl < 2:2.0
 BuildRequires:  alsa-lib-devel >= 1.0.0
 BuildRequires:  curl-devel >= 7.15.1
@@ -153,7 +152,6 @@
 Requires:       gtk2-devel
 Requires:       glib2-devel
 Requires:       pkgconfig
-Obsoletes:      gimp2-devel gimp-beta-devel <= %{?epoch:%{epoch}:}2.4
 
 %description devel
 The gimp-devel package contains the static libraries and header files
@@ -195,31 +193,31 @@
 fi
 CFLAGS="%optflags -fomit-frame-pointer" \
 %configure \
-	--disable-perl \
+    --disable-perl \
 %if %{with python}
-	--enable-python \
+    --enable-python \
 %else
-	--disable-python \
+    --disable-python \
 %endif
 %if %{with mp}
-	--enable-mp \
+    --enable-mp \
 %else
-	--disable-mp \
+    --disable-mp \
 %endif
 %if %{with static}
-	--enable-static \
+    --enable-static \
 %else
-	--disable-static \
+    --disable-static \
 %endif
 %if %{with print}
-	--with-print \
+    --with-print \
 %else
-	--without-print \
+    --without-print \
 %endif
 %if %{with lcms}
-	--with-lcms \
+    --with-lcms \
 %else
-	--without-lcms \
+    --without-lcms \
 %endif
     --enable-gimp-console \
     --without-aa \
@@ -300,6 +298,9 @@
 mkdir -p %{buildroot}%{_sbindir}
 install -m 0755 gimp-plugin-mgr %{buildroot}%{_sbindir}/gimp-plugin-mgr
 
+# make pyconsole.py executable, gimp/gnome bug #552601
+chmod 755 %{buildroot}%{_libdir}/gimp/%{interfacever}/plug-ins/pyconsole.py
+
 %clean
 rm -rf %{buildroot}
 
@@ -456,6 +457,14 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Sep 17 2008 Nils Philippsen <nils at redhat.com> - 2:2.4.7-2
+- Merge review:
+  - convert spec file to UTF-8
+  - remove unneeded gimp2, gimp-beta obsoletes
+  - quote macros in changelog
+  - use only spaces, not tabs
+  - make pyconsole.py plug-in executable (upstream bug #552601)
+
 * Fri Aug 22 2008 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.7-1
 - version 2.4.7
 
@@ -1189,7 +1198,7 @@
 * Mon Apr  2 2001 Preston Brown <pbrown at redhat.com>
 - some gimp-perl files weren't defattr'd (#34325)
 
-* Fri Mar 30 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Mar 30 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - Don't include embedxpm, as it depends on a non-included perl module (#=33249)
 - move gimpdoc and xcftopnm to gimp-perl, as they are dependant on the perl Gimp
   module
@@ -1279,6 +1288,4 @@
 
 * Wed Dec 22 1999 Gregory McLean <gregm at comstar.net>
 - Version 1.1.14
-- Added some auto %files section generation scriptlets
-
-
+- Added some auto %%files section generation scriptlets



From nphilipp at fedoraproject.org  Wed Sep 17 08:40:24 2008
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 17 Sep 2008 08:40:24 +0000 (UTC)
Subject: rpms/gimp/F-8 gimp.spec,1.154,1.155
Message-ID: <20080917084024.8AF537013C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2523

Modified Files:
	gimp.spec 
Log Message:
Merge review:
- convert spec file to UTF-8
- remove unneeded gimp2, gimp-beta obsoletes
- quote macros in changelog
- use only spaces, not tabs
- make pyconsole.py plug-in executable (upstream bug #552601)



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-8/gimp.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- gimp.spec	22 Aug 2008 17:16:14 -0000	1.154
+++ gimp.spec	17 Sep 2008 08:39:54 -0000	1.155
@@ -51,13 +51,12 @@
 %define age 0
 %define minorver 400
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.gimp.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
-Obsoletes:      gimp2 gimp-beta <= %{?epoch:%{epoch}:}2.4
 Obsoletes:      gimp-perl < 2:2.0
 BuildRequires:  alsa-lib-devel >= 1.0.0
 BuildRequires:  curl-devel >= 7.15.1
@@ -153,7 +152,6 @@
 Requires:       gtk2-devel
 Requires:       glib2-devel
 Requires:       pkgconfig
-Obsoletes:      gimp2-devel gimp-beta-devel <= %{?epoch:%{epoch}:}2.4
 
 %description devel
 The gimp-devel package contains the static libraries and header files
@@ -195,31 +193,31 @@
 fi
 CFLAGS="%optflags -fomit-frame-pointer" \
 %configure \
-	--disable-perl \
+    --disable-perl \
 %if %{with python}
-	--enable-python \
+    --enable-python \
 %else
-	--disable-python \
+    --disable-python \
 %endif
 %if %{with mp}
-	--enable-mp \
+    --enable-mp \
 %else
-	--disable-mp \
+    --disable-mp \
 %endif
 %if %{with static}
-	--enable-static \
+    --enable-static \
 %else
-	--disable-static \
+    --disable-static \
 %endif
 %if %{with print}
-	--with-print \
+    --with-print \
 %else
-	--without-print \
+    --without-print \
 %endif
 %if %{with lcms}
-	--with-lcms \
+    --with-lcms \
 %else
-	--without-lcms \
+    --without-lcms \
 %endif
     --enable-gimp-console \
     --without-aa \
@@ -300,6 +298,9 @@
 mkdir -p %{buildroot}%{_sbindir}
 install -m 0755 gimp-plugin-mgr %{buildroot}%{_sbindir}/gimp-plugin-mgr
 
+# make pyconsole.py executable, gimp/gnome bug #552601
+chmod 755 %{buildroot}%{_libdir}/gimp/%{interfacever}/plug-ins/pyconsole.py
+
 %clean
 rm -rf %{buildroot}
 
@@ -456,6 +457,14 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Sep 17 2008 Nils Philippsen <nils at redhat.com> - 2:2.4.7-2
+- Merge review:
+  - convert spec file to UTF-8
+  - remove unneeded gimp2, gimp-beta obsoletes
+  - quote macros in changelog
+  - use only spaces, not tabs
+  - make pyconsole.py plug-in executable (upstream bug #552601)
+
 * Fri Aug 22 2008 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.7-1
 - version 2.4.7
 
@@ -1189,7 +1198,7 @@
 * Mon Apr  2 2001 Preston Brown <pbrown at redhat.com>
 - some gimp-perl files weren't defattr'd (#34325)
 
-* Fri Mar 30 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Mar 30 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - Don't include embedxpm, as it depends on a non-included perl module (#=33249)
 - move gimpdoc and xcftopnm to gimp-perl, as they are dependant on the perl Gimp
   module
@@ -1279,6 +1288,4 @@
 
 * Wed Dec 22 1999 Gregory McLean <gregm at comstar.net>
 - Version 1.1.14
-- Added some auto %files section generation scriptlets
-
-
+- Added some auto %%files section generation scriptlets



From mmaslano at fedoraproject.org  Wed Sep 17 08:53:08 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 17 Sep 2008 08:53:08 +0000 (UTC)
Subject: rpms/at/devel selinux_mail.patch,NONE,1.1 at.spec,1.67,1.68
Message-ID: <20080917085308.ECBEE7013C@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/at/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4195

Modified Files:
	at.spec 
Added Files:
	selinux_mail.patch 
Log Message:
* Tue Sep 16 2008 Marcela Maslanova <mmaslano at redhat.com> - 3.1.10-25
- thanks dwalsh for selinux patch, which fix #460873


selinux_mail.patch:

--- NEW FILE selinux_mail.patch ---
diff -up at-3.1.10/atd.c.mailselinux at-3.1.10/atd.c
--- at-3.1.10/atd.c.mailselinux	2008-09-17 10:45:38.000000000 +0200
+++ at-3.1.10/atd.c	2008-09-17 10:49:48.000000000 +0200
@@ -224,6 +224,69 @@ myfork()
 #define ATD_MAIL_NAME    "mailx"
 #endif
 
+#ifdef WITH_SELINUX
+static int set_selinux_context(const char *name, const char *filename) {
+	security_context_t user_context=NULL;
+	security_context_t  file_context=NULL;
+	struct av_decision avd;
+	int retval=-1;
+	char *seuser=NULL;
+	char *level=NULL;
+
+	if (getseuserbyname(name, &seuser, &level) == 0) {
+		retval=get_default_context_with_level(seuser, level, NULL, &user_context);
+		free(seuser);
+		free(level);
+		if (retval) {
+			if (security_getenforce()==1) {
+				perr("execle: couldn't get security context for user %s\n", name);
+			} else {
+				syslog(LOG_ERR, "execle: couldn't get security context for user %s\n", name);
+				return -1;
+			}
+		}
+	}
+
+	/*
+	 * Since crontab files are not directly executed,
+	 * crond must ensure that the crontab file has
+	 * a context that is appropriate for the context of
+	 * the user cron job.  It performs an entrypoint
+	 * permission check for this purpose.
+	 */
+	if (fgetfilecon(STDIN_FILENO, &file_context) < 0)
+		perr("fgetfilecon FAILED %s", filename);
+	
+	retval = security_compute_av(user_context,
+				     file_context,
+				     SECCLASS_FILE,
+				     FILE__ENTRYPOINT,
+				     &avd);
+	freecon(file_context);
+	if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT)) {
+	     	if (security_getenforce()==1) {
+			perr("Not allowed to set exec context to %s for user  %s\n", user_context,name);
+                } else {
+			syslog(LOG_ERR, "Not allowed to set exec context to %s for user  %s\n", user_context,name);
+			retval = -1;
+			goto err;
+                }
+	}
+	if (setexeccon(user_context) < 0) {
+		if (security_getenforce()==1) {
+			perr("Could not set exec context to %s for user  %s\n", user_context,name);
+			retval = -1;
+		} else {
+			syslog(LOG_ERR, "Could not set exec context to %s for user  %s\n", user_context,name);
+		}
+	}
+ err:
+	freecon(user_context);
+	return 0;
+}
+#endif
+
+
 static void
 run_file(const char *filename, uid_t uid, gid_t gid)
 {
@@ -486,61 +549,8 @@ run_file(const char *filename, uid_t uid
 
 #ifdef WITH_SELINUX
            if (selinux_enabled>0) {
-          security_context_t user_context=NULL;
-               security_context_t  file_context=NULL;
-               int retval=0;
-               struct av_decision avd;
-               char *seuser=NULL;
-               char *level=NULL;
-
-               if (getseuserbyname(pentry->pw_name, &seuser, &level) == 0) {
-                  retval=get_default_context_with_level(seuser, level, NULL, &user_context);
-                  free(seuser);
-                  free(level);
-                  if (retval) {
-                      if (security_getenforce()==1) {
-                          perr("execle: couldn't get security context for user %s\n", pentry->pw_name);
-                      } else {
-                          syslog(LOG_ERR, "execle: couldn't get security context for user %s\n", pentry->pw_name);
-                          goto out;
-                      }
-                  }
-               }
-
-             /*
-              * Since crontab files are not directly executed,
-              * crond must ensure that the crontab file has
-              * a context that is appropriate for the context of
-              * the user cron job.  It performs an entrypoint
-              * permission check for this purpose.
-              */
-        if (fgetfilecon(STDIN_FILENO, &file_context) < 0) {
-                     if (security_getenforce() > 0) {
-                         perr("fgetfilecon FAILED %s", filename);
-                     } else {
-                         syslog(LOG_ERR, "fgetfilecon FAILED %s", filename);
-                         goto out;
-                     }
-             }
-             retval = security_compute_av(user_context,
-                                          file_context,
-                                          SECCLASS_FILE,
-                                          FILE__ENTRYPOINT,
-                                          &avd);
-             freecon(file_context);
-             if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT)) {
-               if (security_getenforce()==1)
-                 perr("Not allowed to set exec context to %s for user  %s\n", user_context,pentry->pw_name);
-             }
-
-             if (setexeccon(user_context) < 0) {
-               if (security_getenforce()==1) {
-                 perr("Could not set exec context to %s for user  %s\n", user_context,pentry->pw_name);
-               } else {
-                 syslog(LOG_ERR, "Could not set exec context to %s for user  %s\n", user_context,pentry->pw_name);
-               }
-             }
-             freecon(user_context);
+               if (set_selinux_context(pentry->pw_name, filename) < 0)
+                   perr("SELinux Failed to set context\n");
            }
 #endif
 
@@ -654,47 +664,8 @@ run_file(const char *filename, uid_t uid
 
 #ifdef WITH_SELINUX
            if (selinux_enabled>0) {
-             security_context_t user_context=NULL;
-             security_context_t  file_context=NULL;
-             int retval=0;
-             struct av_decision avd;
-
-             if (get_default_context(pentry->pw_name, NULL, &user_context))
-               perr("execle: couldn't get security context for user %s\n", pentry->pw_name);
-             /*
-              * Since crontab files are not directly executed,
-              * crond must ensure that the crontab file has
-              * a context that is appropriate for the context of
-              * the user cron job.  It performs an entrypoint
-              * permission check for this purpose.
-              */
-             if (fgetfilecon(STDIN_FILENO, &file_context) < 0)
-               perr("fgetfilecon FAILED %s", filename);
-
-             retval = security_compute_av(user_context,
-                                          file_context,
-                                          SECCLASS_FILE,
-                                          FILE__ENTRYPOINT,
-                                          &avd);
-             freecon(file_context);
-             if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT)) {
-           if (security_getenforce()==1) {
-                    perr("Not allowed to set exec context to %s for user  %s\n", user_context,pentry->pw_name);
-                } else {
-                    syslog(LOG_ERR, "Not allowed to set exec context to %s for user  %s\n", user_context,pentry->pw_name);
-                    goto out;
-                }
-        }
-
-             if (setexeccon(user_context) < 0) {
-               if (security_getenforce()==1) {
-                 perr("Could not set exec context to %s for user  %s\n", user_context,pentry->pw_name);
-               } else {
-                 syslog(LOG_ERR, "Could not set exec context to %s for user  %s\n", user_context,pentry->pw_name);
-               }
-             }
-        out:
-                freecon(user_context);
+               if (set_selinux_context(pentry->pw_name, filename) < 0)
+                   perr("SELinux Failed to set context\n");
            }
 #endif
             execl(ATD_MAIL_PROGRAM, ATD_MAIL_NAME, mailname, (char *) NULL);


Index: at.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at/devel/at.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- at.spec	18 Jul 2008 14:34:48 -0000	1.67
+++ at.spec	17 Sep 2008 08:52:38 -0000	1.68
@@ -6,7 +6,7 @@
 Summary: Job spooling tools
 Name: at
 Version: 3.1.10
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://ftp.debian.org/debian/pool/main/a/at
@@ -32,6 +32,7 @@
 Patch15: at-3.1.10-PIE.patch
 Patch16: at-3.1.10-pamfix.patch
 Patch17: nonposix.patch
+Patch18: selinux_mail.patch
 
 BuildRequires: fileutils chkconfig /etc/init.d
 BuildRequires: flex bison autoconf
@@ -83,6 +84,7 @@
 %patch15 -p1 -b .PIE
 %patch16 -p1 -b .pamfix
 %patch17 -p1 -b .nonposix
+%patch18 -p1 -b .mailselinux
 
 %build
 # patch10 touches configure.in
@@ -185,6 +187,9 @@
 %attr(4755,root,root)	%{_bindir}/at
 
 %changelog
+* Tue Sep 16 2008 Marcela Maslanova <mmaslano at redhat.com> - 3.1.10-25
+- thanks dwalsh for selinux patch, which fix #460873
+
 * Fri Jul 18 2008 Marcela Maslanova <mmaslano at redhat.com> - 3.1.10-24
 - 446004 hope adding || into scriptlets fix removing old package after upgrade
 - fixes for fuzz=0



From mmaslano at fedoraproject.org  Wed Sep 17 08:59:08 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 17 Sep 2008 08:59:08 +0000 (UTC)
Subject: rpms/at/F-9 selinux_mail.patch,NONE,1.1 at.spec,1.65,1.66
Message-ID: <20080917085908.ADEA47013C@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/at/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5152

Modified Files:
	at.spec 
Added Files:
	selinux_mail.patch 
Log Message:
* Tue Sep 16 2008 Marcela Maslanova <mmaslano at redhat.com> - 3.1.10-24
- thanks dwalsh for selinux patch, which fix #460873
- adding || into scriptlets fix removing old package after upgrade


selinux_mail.patch:

--- NEW FILE selinux_mail.patch ---
diff -up at-3.1.10/atd.c.dan at-3.1.10/atd.c
--- at-3.1.10/atd.c.dan	2008-09-16 10:21:14.623354000 -0400
+++ at-3.1.10/atd.c	2008-09-16 11:02:26.744827000 -0400
@@ -224,6 +224,69 @@ myfork()
 #define ATD_MAIL_NAME    "mailx"
 #endif
 
+#ifdef WITH_SELINUX
+static int set_selinux_context(const char *name, const char *filename) {
+	security_context_t user_context=NULL;
+	security_context_t  file_context=NULL;
+	struct av_decision avd;
+	int retval=-1;
+	char *seuser=NULL;
+	char *level=NULL;
+
+	if (getseuserbyname(name, &seuser, &level) == 0) {
+		retval=get_default_context_with_level(seuser, level, NULL, &user_context);
+		free(seuser);
+		free(level);
+		if (retval) {
+			if (security_getenforce()==1) {
+				perr("execle: couldn't get security context for user %s\n", name);
+			} else {
+				syslog(LOG_ERR, "execle: couldn't get security context for user %s\n", name);
+				return -1;
+			}
+		}
+	}
+
+	/*
+	 * Since crontab files are not directly executed,
+	 * crond must ensure that the crontab file has
+	 * a context that is appropriate for the context of
+	 * the user cron job.  It performs an entrypoint
+	 * permission check for this purpose.
+	 */
+	if (fgetfilecon(STDIN_FILENO, &file_context) < 0)
+		perr("fgetfilecon FAILED %s", filename);
+	
+	retval = security_compute_av(user_context,
+				     file_context,
+				     SECCLASS_FILE,
+				     FILE__ENTRYPOINT,
+				     &avd);
+	freecon(file_context);
+	if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT)) {
+	     	if (security_getenforce()==1) {
+			perr("Not allowed to set exec context to %s for user  %s\n", user_context,name);
+                } else {
+			syslog(LOG_ERR, "Not allowed to set exec context to %s for user  %s\n", user_context,name);
+			retval = -1;
+			goto err;
+                }
+	}
+	if (setexeccon(user_context) < 0) {
+		if (security_getenforce()==1) {
+			perr("Could not set exec context to %s for user  %s\n", user_context,name);
+			retval = -1;
+		} else {
+			syslog(LOG_ERR, "Could not set exec context to %s for user  %s\n", user_context,name);
+		}
+	}
+ err:
+	freecon(user_context);
+	return 0;
+}
+#endif
+
+
 static void
 run_file(const char *filename, uid_t uid, gid_t gid)
 {
@@ -486,62 +549,9 @@ run_file(const char *filename, uid_t uid
 
 #ifdef WITH_SELINUX
            if (selinux_enabled>0) {
-	       security_context_t user_context=NULL;
-               security_context_t  file_context=NULL;
-               int retval=0;
-               struct av_decision avd;
-               char *seuser=NULL;
-               char *level=NULL;
-
-               if (getseuserbyname(pentry->pw_name, &seuser, &level) == 0) {
-                  retval=get_default_context_with_level(seuser, level, NULL, &user_context);
-                  free(seuser);
-                  free(level);
-                  if (retval) {
-                      if (security_getenforce()==1) {
-                          perr("execle: couldn't get security context for user %s\n", pentry->pw_name);
-                      } else {
-                          syslog(LOG_ERR, "execle: couldn't get security context for user %s\n", pentry->pw_name);
-                          goto out;
-                      }
-                  }
-               }
-
-             /*
-              * Since crontab files are not directly executed,
-              * crond must ensure that the crontab file has
-              * a context that is appropriate for the context of
-              * the user cron job.  It performs an entrypoint
-              * permission check for this purpose.
-              */
-	     if (fgetfilecon(STDIN_FILENO, &file_context) < 0) {
-                     if (security_getenforce() > 0) {
-                         perr("fgetfilecon FAILED %s", filename);
-                     } else {
-                         syslog(LOG_ERR, "fgetfilecon FAILED %s", filename);
-                         goto out;
-                     }
-             }
-             retval = security_compute_av(user_context,
-                                          file_context,
-                                          SECCLASS_FILE,
-                                          FILE__ENTRYPOINT,
-                                          &avd);
-             freecon(file_context);
-             if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT)) {
-               if (security_getenforce()==1)
-                 perr("Not allowed to set exec context to %s for user  %s\n", user_context,pentry->pw_name);
-             }
-
-             if (setexeccon(user_context) < 0) {
-               if (security_getenforce()==1) {
-                 perr("Could not set exec context to %s for user  %s\n", user_context,pentry->pw_name);
-               } else {
-                 syslog(LOG_ERR, "Could not set exec context to %s for user  %s\n", user_context,pentry->pw_name);
-               }
-             }
-             freecon(user_context);
-           }
+		   if (set_selinux_context(pentry->pw_name, filename) < 0)
+			   perr("SELinux Failed to set context\n");
+	   }
 #endif
 
 	    if (execle("/bin/sh", "sh", (char *) NULL, nenvp) != 0)
@@ -652,48 +662,9 @@ run_file(const char *filename, uid_t uid
 
 #ifdef WITH_SELINUX
            if (selinux_enabled>0) {
-             security_context_t user_context=NULL;
-             security_context_t  file_context=NULL;
-             int retval=0;
-             struct av_decision avd;
-
-             if (get_default_context(pentry->pw_name, NULL, &user_context))
-               perr("execle: couldn't get security context for user %s\n", pentry->pw_name);
-             /*
-              * Since crontab files are not directly executed,
-              * crond must ensure that the crontab file has
-              * a context that is appropriate for the context of
-              * the user cron job.  It performs an entrypoint
-              * permission check for this purpose.
-              */
-             if (fgetfilecon(STDIN_FILENO, &file_context) < 0)
-               perr("fgetfilecon FAILED %s", filename);
-
-             retval = security_compute_av(user_context,
-                                          file_context,
-                                          SECCLASS_FILE,
-                                          FILE__ENTRYPOINT,
-                                          &avd);
-             freecon(file_context);
-             if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT)) {
-	     	if (security_getenforce()==1) {
-                    perr("Not allowed to set exec context to %s for user  %s\n", user_context,pentry->pw_name);
-                } else {
-                    syslog(LOG_ERR, "Not allowed to set exec context to %s for user  %s\n", user_context,pentry->pw_name);
-                    goto out;
-                }
-	     }
-
-             if (setexeccon(user_context) < 0) {
-               if (security_getenforce()==1) {
-                 perr("Could not set exec context to %s for user  %s\n", user_context,pentry->pw_name);
-               } else {
-                 syslog(LOG_ERR, "Could not set exec context to %s for user  %s\n", user_context,pentry->pw_name);
-               }
-             }
-	     out:
-	             freecon(user_context);
-           }
+		   if (set_selinux_context(pentry->pw_name, filename) < 0)
+			   perr("SELinux Failed to set context\n");
+	   }
 #endif
             execl(ATD_MAIL_PROGRAM, ATD_MAIL_NAME, mailname, (char *) NULL);
 	    perr("Exec faile for mail command");


Index: at.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at/F-9/at.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- at.spec	25 Mar 2008 14:00:46 -0000	1.65
+++ at.spec	17 Sep 2008 08:58:38 -0000	1.66
@@ -6,7 +6,7 @@
 Summary: Job spooling tools
 Name: at
 Version: 3.1.10
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://ftp.debian.org/debian/pool/main/a/at
@@ -33,6 +33,7 @@
 Patch16: at-3.1.10-pamfix.patch
 Patch17: at-3.1.10-setuids.patch 
 Patch18: nonposix.patch
+Patch19: selinux_mail.patch
 
 BuildRequires: fileutils chkconfig /etc/init.d
 BuildRequires: flex bison autoconf
@@ -85,6 +86,7 @@
 %patch16 -p1 -b .pamfix
 %patch17 -p1 -b .setuids
 %patch18 -p1 -b .nonposix
+%patch19 -p1 -b .mailselinux
 
 %build
 # patch10 touches configure.in
@@ -159,13 +161,13 @@
 
 %preun
 if [ "$1" = 0 ] ; then
-	/sbin/service atd stop >/dev/null 2>&1
+	/sbin/service atd stop >/dev/null 2>&1 ||:
 	/sbin/chkconfig --del atd
 fi
 
 %postun
 if [ "$1" -ge "1" ]; then
-	/sbin/service atd condrestart >/dev/null 2>&1
+	/sbin/service atd condrestart >/dev/null 2>&1 ||:
 fi
 
 %files
@@ -187,6 +189,10 @@
 %attr(4755,root,root)	%{_bindir}/at
 
 %changelog
+* Tue Sep 16 2008 Marcela Maslanova <mmaslano at redhat.com> - 3.1.10-24
+- thanks dwalsh for selinux patch, which fix #460873
+- adding || into scriptlets fix removing old package after upgrade
+
 * Tue Mar 25 2008 Marcela Maslanova <mmaslano at redhat.com> - 3.1.10-23
 - 436952 use local instead of posix output date/time format.
 



From rhughes at fedoraproject.org  Wed Sep 17 09:03:05 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Wed, 17 Sep 2008 09:03:05 +0000 (UTC)
Subject: rpms/gnome-packagekit/devel pk-use-different-gpk-clients.patch, NONE,
	1.1 gnome-packagekit.spec, 1.45, 1.46
Message-ID: <20080917090305.6EA6C7013C@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5989

Modified Files:
	gnome-packagekit.spec 
Added Files:
	pk-use-different-gpk-clients.patch 
Log Message:
* Wed Sep 17 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.3-2
- Fix the interaction when the update check and the upgrade check are
  scheduled at the same time.


pk-use-different-gpk-clients.patch:

--- NEW FILE pk-use-different-gpk-clients.patch ---
commit 0f01d00cb0e03262766a2f60327adad91466a0b6
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Sep 16 19:59:26 2008 +0100

    bugfix: use seporate GpkClient GObjects in GpkCheckUpdate so we can schedule these at the same time in a callback and not worry about one cancelling the other

diff --git a/src/gpk-check-update.c b/src/gpk-check-update.c
index 0545468..1b1ea94 100644
--- a/src/gpk-check-update.c
+++ b/src/gpk-check-update.c
@@ -71,7 +71,10 @@ struct GpkCheckUpdatePrivate
 	PkTaskList		*tlist;
 	PkControl		*control;
 	GpkAutoRefresh		*arefresh;
-	GpkClient		*gclient;
+	GpkClient		*gclient_refresh_cache;
+	GpkClient		*gclient_update_system;
+	GpkClient		*gclient_get_updates;
+	GpkClient		*gclient_get_distro_upgrades;
 	GConfClient		*gconf_client;
 	gboolean		 cache_okay;
 	gboolean		 cache_update_in_progress;
@@ -303,7 +306,7 @@ static gboolean
 gpk_check_update_update_system (GpkCheckUpdate *cupdate)
 {
 	gboolean ret;
-	ret = gpk_client_update_system (cupdate->priv->gclient, NULL);
+	ret = gpk_client_update_system (cupdate->priv->gclient_update_system, NULL);
 
 	/* we failed, show the icon */
 	if (!ret) {
@@ -322,7 +325,7 @@ gpk_check_update_menuitem_update_system_cb (GtkMenuItem *item, gpointer data)
 {
 	GpkCheckUpdate *cupdate = GPK_CHECK_UPDATE (data);
 	g_return_if_fail (GPK_IS_CHECK_UPDATE (cupdate));
-	gpk_client_set_interaction (cupdate->priv->gclient, GPK_CLIENT_INTERACT_ALWAYS);
+	gpk_client_set_interaction (cupdate->priv->gclient_update_system, GPK_CLIENT_INTERACT_ALWAYS);
 	gpk_check_update_update_system (cupdate);
 }
 
@@ -403,8 +406,8 @@ gpk_check_update_libnotify_cb (NotifyNotification *notification, gchar *action,
 
 		/* just update the important updates */
 		package_ids = pk_package_ids_from_array (cupdate->priv->important_updates_array);
-		gpk_client_set_interaction (cupdate->priv->gclient, GPK_CLIENT_INTERACT_NEVER);
-		ret = gpk_client_update_packages (cupdate->priv->gclient, package_ids, &error);
+		gpk_client_set_interaction (cupdate->priv->gclient_update_system, GPK_CLIENT_INTERACT_NEVER);
+		ret = gpk_client_update_packages (cupdate->priv->gclient_update_system, package_ids, &error);
 		if (!ret) {
 			egg_warning ("Individual updates failed: %s", error->message);
 			g_error_free (error);
@@ -672,9 +675,9 @@ gpk_check_update_query_updates (GpkCheckUpdate *cupdate)
 	}
 
 	/* get updates */
-	gpk_client_set_interaction (cupdate->priv->gclient, GPK_CLIENT_INTERACT_NEVER);
+	gpk_client_set_interaction (cupdate->priv->gclient_get_updates, GPK_CLIENT_INTERACT_NEVER);
 	cupdate->priv->get_updates_in_progress = TRUE;
-	list = gpk_client_get_updates (cupdate->priv->gclient, &error);
+	list = gpk_client_get_updates (cupdate->priv->gclient_get_updates, &error);
 	cupdate->priv->get_updates_in_progress = FALSE;
 	if (list == NULL) {
 		egg_warning ("failed to get updates: %s", error->message);
@@ -770,8 +773,8 @@ gpk_check_update_query_updates (GpkCheckUpdate *cupdate)
 
 		/* convert */
 		package_ids = pk_package_ids_from_array (security_array);
-		gpk_client_set_interaction (cupdate->priv->gclient, GPK_CLIENT_INTERACT_NEVER);
-		ret = gpk_client_update_packages (cupdate->priv->gclient, package_ids, &error);
+		gpk_client_set_interaction (cupdate->priv->gclient_update_system, GPK_CLIENT_INTERACT_NEVER);
+		ret = gpk_client_update_packages (cupdate->priv->gclient_update_system, package_ids, &error);
 		if (!ret) {
 			egg_warning ("Individual updates failed: %s", error->message);
 			g_error_free (error);
@@ -783,7 +786,7 @@ gpk_check_update_query_updates (GpkCheckUpdate *cupdate)
 	/* just do everything */
 	if (update == PK_UPDATE_ENUM_ALL) {
 		egg_debug ("we should do the update automatically!");
-		gpk_client_set_interaction (cupdate->priv->gclient, GPK_CLIENT_INTERACT_NEVER);
+		gpk_client_set_interaction (cupdate->priv->gclient_update_system, GPK_CLIENT_INTERACT_NEVER);
 		g_idle_add ((GSourceFunc) gpk_check_update_update_system, cupdate);
 		goto out;
 	}
@@ -887,8 +890,8 @@ gpk_check_update_auto_refresh_cache_cb (GpkAutoRefresh *arefresh, GpkCheckUpdate
 	cupdate->priv->cache_okay = TRUE;
 
 	/* use the gnome helper to refresh the cache */
-	gpk_client_set_interaction (cupdate->priv->gclient, GPK_CLIENT_INTERACT_NEVER);
-	ret = gpk_client_refresh_cache (cupdate->priv->gclient, NULL);
+	gpk_client_set_interaction (cupdate->priv->gclient_refresh_cache, GPK_CLIENT_INTERACT_NEVER);
+	ret = gpk_client_refresh_cache (cupdate->priv->gclient_refresh_cache, NULL);
 	if (!ret) {
 		/* we failed to get the cache */
 		egg_warning ("failed to refresh cache");
@@ -935,8 +938,8 @@ gpk_check_update_auto_get_upgrades_cb (GpkAutoRefresh *arefresh, GpkCheckUpdate
 	g_return_if_fail (GPK_IS_CHECK_UPDATE (cupdate));
 
 	/* get updates */
-	gpk_client_set_interaction (cupdate->priv->gclient, GPK_CLIENT_INTERACT_ALWAYS);
-	array = gpk_client_get_distro_upgrades (cupdate->priv->gclient, &error);
+	gpk_client_set_interaction (cupdate->priv->gclient_get_distro_upgrades, GPK_CLIENT_INTERACT_NEVER);
+	array = gpk_client_get_distro_upgrades (cupdate->priv->gclient_get_distro_upgrades, &error);
 	if (array == NULL) {
 		egg_warning ("failed to get upgrades: %s", error->message);
 		g_error_free (error);
@@ -1025,7 +1028,10 @@ gpk_check_update_init (GpkCheckUpdate *cupdate)
 				 cupdate, 0);
 
 	/* install stuff using the gnome helpers */
-	cupdate->priv->gclient = gpk_client_new ();
+	cupdate->priv->gclient_refresh_cache = gpk_client_new ();
+	cupdate->priv->gclient_update_system = gpk_client_new ();
+	cupdate->priv->gclient_get_updates = gpk_client_new ();
+	cupdate->priv->gclient_get_distro_upgrades = gpk_client_new ();
 
 	cupdate->priv->pconnection = pk_connection_new ();
 	g_signal_connect (cupdate->priv->pconnection, "connection-changed",
@@ -1072,7 +1078,10 @@ gpk_check_update_finalize (GObject *object)
 	g_object_unref (cupdate->priv->arefresh);
 	g_object_unref (cupdate->priv->gconf_client);
 	g_object_unref (cupdate->priv->control);
-	g_object_unref (cupdate->priv->gclient);
+	g_object_unref (cupdate->priv->gclient_refresh_cache);
+	g_object_unref (cupdate->priv->gclient_update_system);
+	g_object_unref (cupdate->priv->gclient_get_updates);
+	g_object_unref (cupdate->priv->gclient_get_distro_upgrades);
 	if (cupdate->priv->important_updates_array != NULL) {
 		g_ptr_array_foreach (cupdate->priv->important_updates_array, (GFunc) g_free, NULL);
 		g_ptr_array_free (cupdate->priv->important_updates_array, TRUE);


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gnome-packagekit.spec	16 Sep 2008 16:18:16 -0000	1.45
+++ gnome-packagekit.spec	17 Sep 2008 09:02:35 -0000	1.46
@@ -4,7 +4,7 @@
 Summary:   GNOME PackageKit Client
 Name:      gnome-packagekit
 Version:   0.3.3
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
@@ -14,6 +14,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:    gnome-packagekit-enable-kde.patch
 
+# Upstream: 0f01d00cb0e03262766a2f60327adad91466a0b6
+Patch1:    pk-use-different-gpk-clients.patch
+
 Requires:  gtk2 >= 2.12.0
 Requires:  gnome-icon-theme
 Requires:  libnotify >= 0.4.3
@@ -60,6 +63,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-scrollkeeper --disable-schemas-install
@@ -143,7 +147,11 @@
 %{_datadir}/applications/gpk-*.desktop
 
 %changelog
-* Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.3-1
+* Wed Sep 17 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.3-2
+- Fix the interaction when the update check and the upgrade check are
+  scheduled at the same time.
+
+* Tue Sep 16 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.3-1
 - Update to newest upstream version.
 - Supports collection install and remove in the UI
 - Add InstallGStreamerCodecs to the session interface



From rhughes at fedoraproject.org  Wed Sep 17 09:38:46 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Wed, 17 Sep 2008 09:38:46 +0000 (UTC)
Subject: rpms/PackageKit/devel pk-preupgrade-typo.patch, NONE,
	1.1 PackageKit.spec, 1.55, 1.56
Message-ID: <20080917093846.EF1FA7013C@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11967

Modified Files:
	PackageKit.spec 
Added Files:
	pk-preupgrade-typo.patch 
Log Message:
* Tue Sep 17 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.3-3
- Fix a silly typo where we might upgrade the kernel when we check for
  distro upgrades.


pk-preupgrade-typo.patch:

--- NEW FILE pk-preupgrade-typo.patch ---
commit 0f2fa1f265aa0e7922d5acf03e1266081345df58
Author: Richard Hughes <hughsie at localhost.localdomain>
Date:   Wed Sep 17 10:28:13 2008 +0100

    yum: bugfix: don't try and upgrade kernel when we want to upgrade the preupgrade package

diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index e3f07c1..cfbc17d 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -1397,7 +1397,7 @@ class PackageKitYumBackend(PackageKitBaseBackend,PackagekitPackage):
         elif len(pkgs) == 1:
             # check if there are any updates to the preupgrade package
             po = pkgs[0]
-            pkgs = self.yumbase.pkgSack.returnNewestByName(name='kernel')
+            pkgs = self.yumbase.pkgSack.returnNewestByName(name='preupgrade')
             if pkgs:
                 newest = pkgs[0]
                 if newest.EVR > po.EVR:


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- PackageKit.spec	16 Sep 2008 18:32:34 -0000	1.55
+++ PackageKit.spec	17 Sep 2008 09:38:16 -0000	1.56
@@ -8,7 +8,7 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.3
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -18,6 +18,9 @@
 # upstream: 51b020dca500141a6e78ab549765f09a34ac75fc
 Patch0:    pk-upgrades-mistake.patch
 
+# upstream: 0f2fa1f265aa0e7922d5acf03e1266081345df58
+Patch1:    pk-preupgrade-typo.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-libs = %{version}-%{release}
@@ -143,6 +146,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -273,6 +277,10 @@
 %{_includedir}/*
 
 %changelog
+* Tue Sep 17 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.3-3
+- Fix a silly typo where we might upgrade the kernel when we check for
+  distro upgrades.
+
 * Tue Sep 16 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.3-2
 - Fix an error where we didn't connect up the GetDistroUpgrades in
   the new dispatcher code.



From than at fedoraproject.org  Wed Sep 17 09:46:00 2008
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 17 Sep 2008 09:46:00 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.1.1-bz#461725-regression.patch, NONE, 
	1.1 kdelibs.spec, 1.376, 1.377
Message-ID: <20080917094600.4FB387013C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13656

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.1-bz#461725-regression.patch 
Log Message:
#461725, revert the patch to fix the regression


kdelibs-4.1.1-bz#461725-regression.patch:

--- NEW FILE kdelibs-4.1.1-bz#461725-regression.patch ---
Index: khtml/khtml_part.cpp
===================================================================
--- khtml/khtml_part.cpp	(Revision 852920)
+++ khtml/khtml_part.cpp	(Revision 852919)
@@ -1080,7 +1080,8 @@
   if ( !d->m_frame->m_jscript )
     if (!createJScript(d->m_frame))
       return 0;
-   d->m_frame->m_jscript->setDebugEnabled(d->m_bJScriptDebugEnabled);
+  if (d->m_bJScriptDebugEnabled)
+    d->m_frame->m_jscript->setDebugEnabled(true);
 
   return d->m_frame->m_jscript;
 }
Index: khtml/ecma/debugger/debugwindow.cpp
===================================================================
--- khtml/ecma/debugger/debugwindow.cpp	(Revision 852920)
+++ khtml/ecma/debugger/debugwindow.cpp	(Revision 852919)
@@ -91,12 +91,23 @@
 using namespace KJSDebugger;
 
 DebugWindow* DebugWindow::s_debugger = 0;
+DebugWindow *DebugWindow::createInstance()
+{
+    Q_ASSERT(!s_debugger);
+    s_debugger = new DebugWindow();
+    return s_debugger;
+}
 
+void DebugWindow::destroyInstance()
+{
+    Q_ASSERT(s_debugger);
+    Q_ASSERT(s_debugger->m_activeSessionCtxs.isEmpty());
+    s_debugger->hide();
+    delete s_debugger;
+}
+
 DebugWindow * DebugWindow::window()
 {
-    if (!s_debugger)
-        s_debugger = new DebugWindow();
-
     return s_debugger;
 }
 
@@ -365,8 +376,6 @@
     assert(m_docsForIntrp.isEmpty());
     assert(m_docForSid.isEmpty());
     assert(m_docForIUKey.isEmpty());
-    assert(m_activeSessionCtxs.isEmpty());
-    s_debugger = 0;
 }
 
 void DebugWindow::closeEvent(QCloseEvent* event)
Index: khtml/ecma/debugger/debugwindow.h
===================================================================
--- khtml/ecma/debugger/debugwindow.h	(Revision 852920)
+++ khtml/ecma/debugger/debugwindow.h	(Revision 852919)
@@ -39,7 +39,6 @@
 #include "khtml_pagecache.h"
 #include "khtml_part.h"
 #include "dom/dom_misc.h"
-#include "misc/shared.h"
 
 #include <QStack>
 #include <QVector>
@@ -72,8 +71,7 @@
 *
 * There is only one debug window per program. This can be obtained by calling #instance
 */
-class DebugWindow : public KXmlGuiWindow, public KJS::Debugger, public KComponentData,
-                    public khtml::Shared<DebugWindow>
+class DebugWindow : public KXmlGuiWindow, public KJS::Debugger, public KComponentData
 {
     Q_OBJECT
 
@@ -81,6 +79,8 @@
     DebugWindow(QWidget *parent = 0);
     virtual ~DebugWindow();
 
+    static DebugWindow *createInstance();
+    static void destroyInstance();
     static DebugWindow *window();
 
     // Returns true if the debugger is active, and has blocked the execution
Index: khtml/ecma/kjs_proxy.cpp
===================================================================
--- khtml/ecma/kjs_proxy.cpp	(Revision 852920)
+++ khtml/ecma/kjs_proxy.cpp	(Revision 852919)
@@ -66,9 +66,9 @@
 
   void initScript();
   void applyUserAgent();
+
 private:
   KJS::ScriptInterpreter* m_script;
-  WTF::RefPtr<DebugWindow> m_debugWindow;
   bool m_debugEnabled;
 #ifndef NDEBUG
   static int s_count;
@@ -141,8 +141,8 @@
 #ifdef KJS_DEBUGGER
     if (inlineCode)
         filename = "(unknown file)";
-    if (m_debugWindow)
-        m_debugWindow->attach(m_script);
+    if (DebugWindow::window())
+        DebugWindow::window()->attach(m_script);
 #else
     Q_UNUSED(baseLine);
 #endif
@@ -202,8 +202,9 @@
   // (we used to delete and re-create it, previously)
     if (m_script) {
 #ifdef KJS_DEBUGGER
-        if (m_debugWindow)
-            m_debugWindow->clearInterpreter(m_script);
+        DebugWindow *debugWin = DebugWindow::window();
+        if (debugWin)
+            debugWin->clearInterpreter(m_script);
 #endif
         m_script->clear();
 
@@ -224,14 +225,6 @@
 	    ;
     JSLock::unlock();
   }
-
-#ifdef KJS_DEBUGGER
-  // Detach from debugging entirely if it's been turned off.
-  if (m_debugWindow && !m_debugEnabled) {
-    m_debugWindow->detach(m_script);
-    m_debugWindow = 0;
-  }
-#endif
 }
 
 DOM::EventListener *KJSProxyImpl::createHTMLEventHandler(QString sourceUrl, QString name, QString code, DOM::NodeImpl *node)
@@ -239,8 +232,8 @@
   initScript();
 
 #ifdef KJS_DEBUGGER
-    if (m_debugWindow)
-        m_debugWindow->attach(m_script);
+    if (DebugWindow::window())
+        DebugWindow::window()->attach(m_script);
 #else
     Q_UNUSED(sourceUrl);
 #endif
@@ -269,21 +262,30 @@
 {
 #ifdef KJS_DEBUGGER
   m_debugEnabled = enabled;
-
-  // Note that we attach to the debugger only before
-  // running a script. Detaches/disabling are done between
-  // documents, at clear. Both are done so the debugger
-  // see the entire session
-  if (enabled)
-    m_debugWindow = DebugWindow::window();
+  //if (m_script)
+  //    m_script->setDebuggingEnabled(enabled);
+  // NOTE: this is consistent across all KJSProxyImpl instances, as we only
+  // ever have 1 debug window
+    if (!enabled && DebugWindow::window())
+    {
+        DebugWindow::destroyInstance();
+    }
+    else if (enabled && !DebugWindow::window())
+    {
+        DebugWindow::createInstance();
+        initScript();
+        DebugWindow::window()->attach(m_script);
+    }
+#else
+    Q_UNUSED(enabled);
 #endif
 }
 
 void KJSProxyImpl::showDebugWindow(bool /*show*/)
 {
 #ifdef KJS_DEBUGGER
-    if (m_debugWindow)
-        m_debugWindow->show();
+    if (DebugWindow::window())
+        DebugWindow::window()->show();
 #else
     //Q_UNUSED(show);
 #endif


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -r1.376 -r1.377
--- kdelibs.spec	13 Sep 2008 15:48:35 -0000	1.376
+++ kdelibs.spec	17 Sep 2008 09:45:29 -0000	1.377
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -78,6 +78,7 @@
 # fix running commands in kglobalconfig before KComponentData init (#455130)
 Patch19: kdelibs-4.1.0-#455130.patch
 Patch20: kdelibs-4.1.1-cmake.patch
+Patch21: kdelibs-4.1.1-bz#461725-regression.patch
 
 ## upstream patches
 Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
@@ -209,6 +210,7 @@
 %patch18 -p1 -b .kstandarddirs
 %patch19 -p1 -b .#455130
 %patch20 -p1 -b .cmake
+%patch21 -p0 -b .bz#461725-regression
 
 ## upstream patches
 %patch100 -p0 -b .kde#169447-khtml-regression
@@ -376,6 +378,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Than Ngo <than at redhat.com> 4.1.1-9
+- #461725, revert the patch to fix the regression
+
 * Sat Sep 13 2008 Than Ngo <than at redhat.com> 4.1.1-8
 - fix kdelibs-4.1.1-kdeui-widgets-fixes.patch
 



From varekova at fedoraproject.org  Wed Sep 17 10:25:54 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Wed, 17 Sep 2008 10:25:54 +0000 (UTC)
Subject: rpms/logwatch/F-8 logwatch-7.3.6-logrotate.patch, NONE,
	1.1 logwatch.spec, 1.87, 1.88
Message-ID: <20080917102554.97C0C7013C@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/logwatch/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20626

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-logrotate.patch 
Log Message:
- fix problem with changed logrotate suffixes (#458580)


logwatch-7.3.6-logrotate.patch:

--- NEW FILE logwatch-7.3.6-logrotate.patch ---
diff -up logwatch-7.3.6/conf/logfiles/tac_acc.conf.pom logwatch-7.3.6/conf/logfiles/tac_acc.conf
--- logwatch-7.3.6/conf/logfiles/tac_acc.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/tac_acc.conf	2008-08-15 10:45:26.000000000 +0200
@@ -5,6 +5,7 @@ LogFile = tac_acc.log
 # (optionally containing wildcards) that tell where they are...
 #If you use a "-" in naming add that as well -mgt
 Archive = tac_acc.log.*
+Archive = tac_acc.log-*
 
 # Keep only the lines in the proper date range...
 *ApplyStdDate
diff -up logwatch-7.3.6/conf/logfiles/extreme-networks.conf.pom logwatch-7.3.6/conf/logfiles/extreme-networks.conf
--- logwatch-7.3.6/conf/logfiles/extreme-networks.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/extreme-networks.conf	2008-08-15 10:18:58.000000000 +0200
@@ -18,6 +18,7 @@ LogFile = extreme-networks.log
 # If the archives are searched, here is one or more line
 # (optionally containing wildcards) that tell where they are...
 Archive = extreme-networks.log.*
+Archive = extreme-networks.log-*
 
 # Expand the repeats (actually just removes them now)
 #*ExpandRepeats
diff -up logwatch-7.3.6/conf/logfiles/cisco.conf.pom logwatch-7.3.6/conf/logfiles/cisco.conf
--- logwatch-7.3.6/conf/logfiles/cisco.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/cisco.conf	2008-08-15 13:26:31.000000000 +0200
@@ -18,6 +18,7 @@ LogFile = cisco.log
 # If the archives are searched, here is one or more line
 # (optionally containing wildcards) that tell where they are...
 Archive = cisco.log.*
+Archive = cisco.log-*
 
 # Expand the repeats (actually just removes them now)
 #*ExpandRepeats
diff -up logwatch-7.3.6/conf/logfiles/netscreen.conf.pom logwatch-7.3.6/conf/logfiles/netscreen.conf
--- logwatch-7.3.6/conf/logfiles/netscreen.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/netscreen.conf	2008-08-15 10:29:59.000000000 +0200
@@ -19,6 +19,7 @@ LogFile = netscreen.log
 # (optionally containing wildcards) that tell where they are...
 #If you use a "-" in naming add that as well -mgt
 Archive = netscreen.log.*
+Archive = netscreen.log-*
 
 # Expand the repeats (actually just removes them now)
 #*ExpandRepeats
diff -up logwatch-7.3.6/conf/logfiles/qmail-pop3ds-current.conf.pom logwatch-7.3.6/conf/logfiles/qmail-pop3ds-current.conf
diff -up logwatch-7.3.6/conf/logfiles/secure.conf.pom logwatch-7.3.6/conf/logfiles/secure.conf
--- logwatch-7.3.6/conf/logfiles/secure.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/secure.conf	2008-08-15 10:33:10.000000000 +0200
@@ -23,6 +23,11 @@ Archive = secure.*
 Archive = archiv/secure.*
 Archive = authlog.*
 Archive = auth.log.*.gz
+Archive = secure-*
+Archive = archiv/secure-*
+Archive = authlog-*
+Archive = auth.log-*.gz
+
 
 # Expand the repeats (actually just removes them now)
 *ExpandRepeats
diff -up logwatch-7.3.6/conf/logfiles/syslog.conf.pom logwatch-7.3.6/conf/logfiles/syslog.conf
--- logwatch-7.3.6/conf/logfiles/syslog.conf.pom	2006-03-21 04:01:34.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/syslog.conf	2008-08-15 10:45:13.000000000 +0200
@@ -14,6 +14,7 @@ Archive = 
 LogFile = syslog
 LogFile = syslog.0
 Archive = syslog.*.gz
+Archive = syslog-*.gz
 *ExpandRepeats
 *RemoveService = talkd
 *RemoveService = telnetd
diff -up logwatch-7.3.6/conf/logfiles/clam-update.conf.pom logwatch-7.3.6/conf/logfiles/clam-update.conf
--- logwatch-7.3.6/conf/logfiles/clam-update.conf.pom	2005-10-31 17:21:20.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/clam-update.conf	2008-08-15 09:54:27.000000000 +0200
@@ -53,5 +53,10 @@ Archive = freshclam.log.*
 Archive = clamav/freshclam.log.*
 Archive = archiv/clam-update.*
 Archive = archiv/freshclam.log.*
+Archive = clam-update-*
+Archive = freshclam.log-*
+Archive = clamav/freshclam.log-*
+Archive = archiv/clam-update-*
+Archive = archiv/freshclam.log-*
 
 # vi: shiftwidth=3 tabstop=3 et
diff -up logwatch-7.3.6/conf/logfiles/emerge.conf.pom logwatch-7.3.6/conf/logfiles/emerge.conf
--- logwatch-7.3.6/conf/logfiles/emerge.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/emerge.conf	2008-08-15 10:02:51.000000000 +0200
@@ -18,6 +18,7 @@ LogFile = emerge.log
 # (optionally containing wildcards) that tell where they are...
 #If you use a "-" in naming add that as well -mgt
 Archive = emerge.log.*
+Archive = emerge.log-*
 
 #*ApplyUSDate
 
diff -up logwatch-7.3.6/conf/logfiles/resolver.conf.pom logwatch-7.3.6/conf/logfiles/resolver.conf
diff -up logwatch-7.3.6/conf/logfiles/daemon.conf.pom logwatch-7.3.6/conf/logfiles/daemon.conf
--- logwatch-7.3.6/conf/logfiles/daemon.conf.pom	2006-03-21 04:01:34.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/daemon.conf	2008-08-15 09:57:00.000000000 +0200
@@ -12,6 +12,8 @@
 LogFile = daemon.log
 LogFile = daemon.log.0
 Archive = daemon.log.*.gz
+Archive = daemon.log-*.gz
+
 *ExpandRepeats
 *OnlyHost
 *ApplyStdDate
diff -up logwatch-7.3.6/conf/logfiles/netopia.conf.pom logwatch-7.3.6/conf/logfiles/netopia.conf
--- logwatch-7.3.6/conf/logfiles/netopia.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/netopia.conf	2008-08-15 10:29:49.000000000 +0200
@@ -19,6 +19,7 @@ LogFile = netopia.log
 # (optionally containing wildcards) that tell where they are...
 #If you use a "-" in naming add that as well -mgt
 Archive = netopia.log.*
+Archive = netopia.log-*
 
 # Expand the repeats (actually just removes them now)
 #*ExpandRepeats
diff -up logwatch-7.3.6/conf/logfiles/qmail-smtpd-current.conf.pom logwatch-7.3.6/conf/logfiles/qmail-smtpd-current.conf
diff -up logwatch-7.3.6/conf/logfiles/xferlog.conf.pom logwatch-7.3.6/conf/logfiles/xferlog.conf
--- logwatch-7.3.6/conf/logfiles/xferlog.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/xferlog.conf	2008-08-15 12:39:03.000000000 +0200
@@ -18,5 +18,7 @@ LogFile = xferlog
 #If you use a "-" in naming add that as well -mgt
 Archive = xferlog.*
 Archive = archiv/xferlog.*
+Archive = xferlog-* 
+Archive = archiv/xferlog-*
 
 # vi: shiftwidth=3 tabstop=3 et
diff -up logwatch-7.3.6/conf/logfiles/fail2ban.conf.pom logwatch-7.3.6/conf/logfiles/fail2ban.conf
--- logwatch-7.3.6/conf/logfiles/fail2ban.conf.pom	2006-12-15 05:53:39.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/fail2ban.conf	2008-08-15 12:44:41.000000000 +0200
@@ -28,4 +28,5 @@ LogFile = fail2ban.log
 
 Archive = fail2ban.log.1
 Archive = fail2ban.log.*.gz
+Archive = fail2ban.log-*
 
diff -up logwatch-7.3.6/conf/logfiles/samba.conf.pom logwatch-7.3.6/conf/logfiles/samba.conf
diff -up logwatch-7.3.6/conf/logfiles/iptables.conf.pom logwatch-7.3.6/conf/logfiles/iptables.conf
--- logwatch-7.3.6/conf/logfiles/iptables.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/iptables.conf	2008-08-15 10:26:20.000000000 +0200
@@ -17,6 +17,7 @@ LogFile = ulogd/ulogd.syslogemu
 # (optionally containing wildcards) that tell where they are...
 #If you use a "-" in naming add that as well -mgt
 Archive = ulogd/ulogd.syslogmenu.*
+Archive = ulogd/ulogd.syslogmenu-*
 
 # Keep only the lines in the proper date range...
 *ApplyStdDate
diff -up logwatch-7.3.6/conf/logfiles/messages.conf.pom logwatch-7.3.6/conf/logfiles/messages.conf
--- logwatch-7.3.6/conf/logfiles/messages.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/messages.conf	2008-08-15 10:26:58.000000000 +0200
@@ -18,6 +18,8 @@ LogFile = messages
 #If you use a "-" in naming add that as well -mgt
 Archive = messages.*
 Archive = archiv/messages.*
+Archive = messages-*
+Archive = archiv/messages-*
 
 # Expand the repeats (actually just removes them now)
 *ExpandRepeats
diff -up logwatch-7.3.6/conf/logfiles/pureftp.conf.pom logwatch-7.3.6/conf/logfiles/pureftp.conf
--- logwatch-7.3.6/conf/logfiles/pureftp.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/pureftp.conf	2008-08-15 10:30:47.000000000 +0200
@@ -17,6 +17,7 @@ LogFile = pureftp/syslog.log
 # (optionally containing wildcards) that tell where they are...
 #If you use a "-" in naming add that as well -mgt
 Archive = pureftp/syslog.log.*
+Archive = pureftp/syslog.log-*
 
 # Keep only the lines in the proper date range...
 *OnlyHost
diff -up logwatch-7.3.6/conf/logfiles/http.conf.pom logwatch-7.3.6/conf/logfiles/http.conf
--- logwatch-7.3.6/conf/logfiles/http.conf.pom	2007-04-15 23:56:53.000000000 +0200
+++ logwatch-7.3.6/conf/logfiles/http.conf	2008-08-15 10:26:09.000000000 +0200
@@ -22,7 +22,12 @@ Archive = apache/*access.log.*.gz
 Archive = apache2/*access.log.*.gz
 Archive = apache2/*access_log.*.gz
 Archive = apache-ssl/*access.log.*.gz
-
+Archive = archiv/httpd/*access_log-*
+Archive = httpd/*access_log-*
+Archive = apache/*access.log-*.gz
+Archive = apache2/*access.log-*.gz
+Archive = apache2/*access_log-*.gz
+Archive = apache-ssl/*access.log-*.gz
 
 # Expand the repeats (actually just removes them now)
 *ExpandRepeats
diff -up logwatch-7.3.6/conf/logfiles/kernel.conf.pom logwatch-7.3.6/conf/logfiles/kernel.conf
--- logwatch-7.3.6/conf/logfiles/kernel.conf.pom	2006-03-21 04:01:34.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/kernel.conf	2008-08-15 10:26:30.000000000 +0200
@@ -12,6 +12,7 @@
 LogFile = kern.log
 LogFile = kern.log.0
 Archive = kern.log.*.gz
+Archive = kern.log-*.gz
 *ExpandRepeats
 *OnlyHost
 *ApplyStdDate
diff -up logwatch-7.3.6/conf/logfiles/exim.conf.pom logwatch-7.3.6/conf/logfiles/exim.conf
--- logwatch-7.3.6/conf/logfiles/exim.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/exim.conf	2008-08-15 10:18:30.000000000 +0200
@@ -20,6 +20,10 @@ Archive = exim/main.log.*
 Archive = archiv/exim/main.log.*
 Archive = exim/mainlog.*
 Archive = exim4/mainlog.*
+Archive = exim/main.log-*
+Archive = archiv/exim/main.log-*
+Archive = exim/mainlog-*
+Archive = exim4/mainlog-*
 
 ########################################################
 # This was written by:
diff -up logwatch-7.3.6/conf/logfiles/yum.conf.pom logwatch-7.3.6/conf/logfiles/yum.conf
diff -up logwatch-7.3.6/conf/logfiles/rt314.conf.pom logwatch-7.3.6/conf/logfiles/rt314.conf
--- logwatch-7.3.6/conf/logfiles/rt314.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/rt314.conf	2008-08-15 10:32:42.000000000 +0200
@@ -9,6 +9,7 @@ LogFile = netgear.log
 # (optionally containing wildcards) that tell where they are...
 #If you use a "-" in naming add that as well -mgt
 Archive = netgear.log.*
+Archive = netgear.log-*
 
 # Keep only the lines in the proper date range...
 *ApplyStdDate
diff -up logwatch-7.3.6/conf/logfiles/dpkg.conf.pom logwatch-7.3.6/conf/logfiles/dpkg.conf
--- logwatch-7.3.6/conf/logfiles/dpkg.conf.pom	2006-12-15 05:39:22.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/dpkg.conf	2008-08-15 10:02:32.000000000 +0200
@@ -17,6 +17,6 @@ LogFile = dpkg.log.1
 # Note: if these are gzipped, you need to end with a .gz even if
 #       you use wildcards...
 Archive = dpkg.log.*.gz
-
+Archive = dpkg.log-*.gz
 *ApplyEuroDate
 # vi: shiftwidth=3 tabstop=3 et
diff -up logwatch-7.3.6/conf/logfiles/autorpm.conf.pom logwatch-7.3.6/conf/logfiles/autorpm.conf
diff -up logwatch-7.3.6/conf/logfiles/sonicwall.conf.pom logwatch-7.3.6/conf/logfiles/sonicwall.conf
--- logwatch-7.3.6/conf/logfiles/sonicwall.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/sonicwall.conf	2008-08-15 10:33:24.000000000 +0200
@@ -20,6 +20,8 @@ LogFile = sonicwall.log
 #If you use a "-" in naming add that as well -mgt
 Archive = sonicwall.log.*
 Archive = archiv/sonicwall.log.*
+Archive = sonicwall.log-*
+Archive = archiv/sonicwall.log-*
 
 # Keep only the lines in the proper date range...
 *OnlyHost
diff -up logwatch-7.3.6/conf/logfiles/up2date.conf.pom logwatch-7.3.6/conf/logfiles/up2date.conf
--- logwatch-7.3.6/conf/logfiles/up2date.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/up2date.conf	2008-08-15 10:45:35.000000000 +0200
@@ -17,5 +17,6 @@ LogFile = up2date
 # (optionally containing wildcards) that tell where they are...
 #If you use a "-" in naming add that as well -mgt
 Archive = up2date.*
+Archive = up2date-*
 
 # vi: shiftwidth=3 tabstop=3 et
diff -up logwatch-7.3.6/conf/logfiles/pix.conf.pom logwatch-7.3.6/conf/logfiles/pix.conf
--- logwatch-7.3.6/conf/logfiles/pix.conf.pom	2006-12-20 05:37:13.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/pix.conf	2008-08-15 10:30:26.000000000 +0200
@@ -9,5 +9,6 @@
 
 LogFile = pix.log
 Archive = pix.log.*
+Archive = pix.log-*
 
 # vi: shiftwidth=3 tabstop=3 et
diff -up logwatch-7.3.6/conf/logfiles/denyhosts.conf.pom logwatch-7.3.6/conf/logfiles/denyhosts.conf
--- logwatch-7.3.6/conf/logfiles/denyhosts.conf.pom	2006-11-12 19:32:54.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/denyhosts.conf	2008-08-15 09:57:19.000000000 +0200
@@ -7,7 +7,7 @@
 #
 ###############################################################################
 LogFile = denyhosts
-Archive = 
 Archive = denyhosts.*
+Archive = denyhosts-*
 *ApplyEuroDate
 # vi: shiftwidth=3 tabstop=3 et
diff -up logwatch-7.3.6/conf/logfiles/bfd.conf.pom logwatch-7.3.6/conf/logfiles/bfd.conf
--- logwatch-7.3.6/conf/logfiles/bfd.conf.pom	2007-04-15 21:48:23.000000000 +0200
+++ logwatch-7.3.6/conf/logfiles/bfd.conf	2008-08-15 09:41:30.000000000 +0200
@@ -10,5 +10,6 @@
 # Which logfile group...
 LogFile = /var/log/bfd_log
 Archive = /var/log/bfd_log.*
+Archive = /var/log/bfd_log-*
 
 
diff -up logwatch-7.3.6/conf/logfiles/maillog.conf.pom logwatch-7.3.6/conf/logfiles/maillog.conf
--- logwatch-7.3.6/conf/logfiles/maillog.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/maillog.conf	2008-08-15 10:26:46.000000000 +0200
@@ -24,6 +24,10 @@ Archive = maillog.*
 Archive = syslog.*
 Archive = archiv/maillog.*
 Archive = mail.log.*.gz
+Archive = maillog-*
+Archive = syslog-*
+Archive = archiv/maillog-*
+Archive = mail.log-*.gz
 
 
 # Expand the repeats (actually just removes them now)
diff -up logwatch-7.3.6/conf/logfiles/windows.conf.pom logwatch-7.3.6/conf/logfiles/windows.conf
--- logwatch-7.3.6/conf/logfiles/windows.conf.pom	2006-03-22 18:46:22.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/windows.conf	2008-08-15 10:55:33.000000000 +0200
@@ -19,6 +19,8 @@ LogFile = windows.log
 #       you use wildcards...
 Archive = windows.log.*
 Archive = windows.log.*.gz
+Archive = windows.log-*
+Archive = windows.log-*.gz
 
 # Expand the repeats (actually just removes them now)
 *ExpandRepeats
diff -up logwatch-7.3.6/conf/logfiles/cron.conf.pom logwatch-7.3.6/conf/logfiles/cron.conf
--- logwatch-7.3.6/conf/logfiles/cron.conf.pom	2005-02-24 18:05:18.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/cron.conf	2008-08-15 09:56:42.000000000 +0200
@@ -19,6 +19,8 @@ LogFile = cron
 # (optionally containing wildcards) that tell where they are...
 Archive = cron.*
 Archive = archiv/cron.*
+Archive = cron-*
+Archive = archiv/cron-*
 
 *OnlyHost
 *RemoveService = anacron
diff -up logwatch-7.3.6/conf/logfiles/eventlog.conf.pom logwatch-7.3.6/conf/logfiles/eventlog.conf
--- logwatch-7.3.6/conf/logfiles/eventlog.conf.pom	2007-04-29 00:50:24.000000000 +0200
+++ logwatch-7.3.6/conf/logfiles/eventlog.conf	2008-08-15 13:50:52.000000000 +0200
@@ -20,6 +20,10 @@ Archive = eventlog.*
 Archive = eventlog.*.gz
 Archive = archiv/eventlog.*
 Archive = archiv/eventlog.*.gz
+Archive = eventlog-*
+Archive = eventlog-*.gz
+Archive = archiv/eventlog-*
+Archive = archiv/eventlog-*.gz
 
 # Expand the repeats (actually just removes them now)
 *ExpandRepeats
diff -up logwatch-7.3.6/conf/logfiles/vsftpd.conf.pom logwatch-7.3.6/conf/logfiles/vsftpd.conf
--- logwatch-7.3.6/conf/logfiles/vsftpd.conf.pom	2006-03-21 02:47:28.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/vsftpd.conf	2008-08-15 10:55:20.000000000 +0200
@@ -19,6 +19,8 @@ LogFile = vsftpd.log
 #If you use a "-" in naming add that as well -mgt
 Archive = vsftpd.log.*
 Archive = archiv/vsftpd.log.*
+Archive = vsftpd.log-*
+Archive = archiv/vsftpd.log-*
 
 *ApplyStdDate = 
 # vi: shiftwidth=3 tabstop=3 et
diff -up logwatch-7.3.6/conf/logfiles/php.conf.pom logwatch-7.3.6/conf/logfiles/php.conf
--- logwatch-7.3.6/conf/logfiles/php.conf.pom	2006-11-12 19:28:31.000000000 +0100
+++ logwatch-7.3.6/conf/logfiles/php.conf	2008-08-15 10:30:11.000000000 +0200
@@ -25,5 +25,6 @@ LogFile = httpd/php_log
 # (optionally containing wildcards) that tell where they are...
 #If you use a "-" in naming add that as well -mgt
 Archive = httpd/php_log.*
+Archive = httpd/php_log-*
 
 # vi: shiftwidth=3 tabstop=3 et
diff -up logwatch-7.3.6/conf/logfiles/qmail-pop3d-current.conf.pom logwatch-7.3.6/conf/logfiles/qmail-pop3d-current.conf
diff -up logwatch-7.3.6/conf/logfiles/dnssec.conf.pom logwatch-7.3.6/conf/logfiles/dnssec.conf
diff -up logwatch-7.3.6/conf/logfiles/qmail-send-current.conf.pom logwatch-7.3.6/conf/logfiles/qmail-send-current.conf


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/F-8/logwatch.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- logwatch.spec	5 Mar 2008 10:39:09 -0000	1.87
+++ logwatch.spec	17 Sep 2008 10:25:24 -0000	1.88
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -35,6 +35,7 @@
 Patch29: logwatch-7.3.6-maillog.patch
 Patch30: logwatch-7.3.6-cron4.patch
 Patch31: logwatch-7.3.6-dovecot_back.patch
+Patch32: logwatch-7.3.6-logrotate.patch
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -77,6 +78,7 @@
 %patch29 -p1
 %patch30 -p1
 %patch31 -p1
+%patch32 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -190,6 +192,9 @@
 %doc License project/CHANGES 
 
 %changelog
+* Wed Sep 17 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-17
+- fix problem with changed logrotate suffixes (#458580)  
+
 * Wed Mar  5 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-16
 - Resolves: #436058
   dovecot script for logwatch needs fix for IPv6



From endur at fedoraproject.org  Wed Sep 17 10:47:31 2008
From: endur at fedoraproject.org (Matthias Haase)
Date: Wed, 17 Sep 2008 10:47:31 +0000 (UTC)
Subject: rpms/streamtuner/F-9 streamtuner-0.99.99-shoutcast.patch,NONE,1.1
Message-ID: <20080917104731.0D29E7013C@cvs1.fedora.phx.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24408

Added Files:
	streamtuner-0.99.99-shoutcast.patch 
Log Message:
The patch changes hardcoded shoutcast base url to classic.shoutcast. 


streamtuner-0.99.99-shoutcast.patch:

--- NEW FILE streamtuner-0.99.99-shoutcast.patch ---
diff -Naur streamtuner-0.99.99_orig/src/plugins/shoutcast/shoutcast.c streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c
--- streamtuner-0.99.99_orig/src/plugins/shoutcast/shoutcast.c	2004-12-19 16:21:00.000000000 +0100
+++ streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c	2008-09-16 17:24:51.680247169 +0200
@@ -37,7 +37,7 @@
 
 /*** cpp *********************************************************************/
 
-#define SHOUTCAST_ROOT		"http://www.shoutcast.com/"
+#define SHOUTCAST_ROOT		"http://classic.shoutcast.com/"
 
 #define MAX_STREAMS_PER_PAGE	100 /* enforced by SHOUTcast */
 
@@ -94,6 +94,8 @@
 
   GNode			*parent_node;
   SHOUTcastStream	*stream;
+  
+  int parse_genres;
 } ReloadInfo;
 
 /*** variable declarations ***************************************************/
@@ -518,6 +520,7 @@
       info.npages = 0;
       info.parent_node = NULL;
       info.stream = NULL;
+      info.parse_genres = 0;
 
       status = st_transfer_session_get_by_line(session,
 					       url,
@@ -565,10 +568,16 @@
       info->stream = stream_new_cb(NULL);
       info->stream->url_postfix = st_sgml_ref_expand_len(s1, s2 - s1);
     }
-  else if (info->page < 2
-	   && (((s1 = st_str_has_prefix_span(line, "\t<OPTION VALUE=\""))
-		|| (s1 = st_str_has_prefix_span(line, "\t\t<OPTION VALUE=\"")))
-	       && (s2 = strstr(s1, "\">"))))
+  else if (info->page < 2 && (s1 = st_strstr_span(line, "<OPTION VALUE=\"TopTen\">")))
+  {
+  	info->parse_genres = 1;
+  }
+  else if (info->page < 2 && info->parse_genres == 1 && (s1 = st_strstr_span(line, "</SELECT>")))
+  {
+  	info->parse_genres = 0;
+  }
+  else if (info->page < 2 && info->parse_genres == 1
+	   && ((s1 = st_strstr_span(line, "<OPTION VALUE=\""))  && (s2 = strstr(s1, "\">"))))
     {
       STCategory *category;
       GNode *node;



From endur at fedoraproject.org  Wed Sep 17 10:56:56 2008
From: endur at fedoraproject.org (Matthias Haase)
Date: Wed, 17 Sep 2008 10:56:56 +0000 (UTC)
Subject: rpms/streamtuner/F-9 streamtuner.spec,1.12,1.13
Message-ID: <20080917105656.27FB57013C@cvs1.fedora.phx.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26064

Modified Files:
	streamtuner.spec 
Log Message:
shoutcast-base-url patch added to shoutcast patch


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/F-9/streamtuner.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- streamtuner.spec	19 Feb 2008 02:30:36 -0000	1.12
+++ streamtuner.spec	17 Sep 2008 10:56:25 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 17%{?dist}
+Release: 18%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -9,6 +9,7 @@
 Patch1: %{name}-%{version}-pygtk-2.6.patch
 Patch2: %{name}-%{version}-defaultconfig.patch
 Patch3: %{name}-%{version}-pkgconfig.patch
+Patch4: %{name}-%{version}-shoutcast.patch
 License: BSD
 Group: Applications/Internet
 Requires: python, pygtk2, htmlview, audacious, xterm
@@ -46,6 +47,7 @@
 %patch1 -p0 -b .%{name}-%{version}-pygtk-2.6
 %patch2 -p0 -b .%{name}-%{version}-defaultconfig.patch
 %patch3 -p1 -b .%{name}-%{version}-pkgconfig.patch
+%patch4 -p1 -b .%{name}-%{version}-shoutcast.patch
 
 %build
 %configure
@@ -108,14 +110,15 @@
 %dir %{_datadir}/help
 %{_datadir}/help/*
 
-
 %files devel
 %defattr(-, root, root)
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
 
-
 %changelog
+* Wed Sep 17 2008 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-18
+- shoutcast-base-url patch added to shoutcast patch
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.99.99-17
 - Autorebuild for GCC 4.3
 



From mmaslano at fedoraproject.org  Wed Sep 17 11:17:12 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 17 Sep 2008 11:17:12 +0000 (UTC)
Subject: rpms/perl-RPM2/devel dead.package, NONE,
	1.1 perl-RPM2-0.66-remove-rpmdb-redhat-dependency.patch, 1.1,
	NONE perl-RPM2-0.66-skip-root-tests.patch, 1.1,
	NONE perl-RPM2-0.67-inttypes.patch, 1.2,
	NONE perl-RPM2-elf.patch, 1.1, NONE perl-RPM2.spec, 1.6, NONE
Message-ID: <20080917111712.879BE7013C@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-RPM2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30031

Added Files:
	dead.package 
Removed Files:
	perl-RPM2-0.66-remove-rpmdb-redhat-dependency.patch 
	perl-RPM2-0.66-skip-root-tests.patch 
	perl-RPM2-0.67-inttypes.patch perl-RPM2-elf.patch 
	perl-RPM2.spec 
Log Message:
Dead package!



--- NEW FILE dead.package ---
This package can't be compiled with new rpm-4.
Possible replacement could be RPM4 from cpan, but it can't be build right now.


--- perl-RPM2-0.66-remove-rpmdb-redhat-dependency.patch DELETED ---


--- perl-RPM2-0.66-skip-root-tests.patch DELETED ---


--- perl-RPM2-0.67-inttypes.patch DELETED ---


--- perl-RPM2-elf.patch DELETED ---


--- perl-RPM2.spec DELETED ---



From endur at fedoraproject.org  Wed Sep 17 11:19:56 2008
From: endur at fedoraproject.org (Matthias Haase)
Date: Wed, 17 Sep 2008 11:19:56 +0000 (UTC)
Subject: rpms/streamtuner/F-9 streamtuner.spec,1.13,1.14
Message-ID: <20080917111956.407977013C@cvs1.fedora.phx.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30445

Modified Files:
	streamtuner.spec 
Log Message:
missed required release bump up


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/F-9/streamtuner.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- streamtuner.spec	17 Sep 2008 10:56:25 -0000	1.13
+++ streamtuner.spec	17 Sep 2008 11:19:25 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 18%{?dist}
+Release: 22%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -116,6 +116,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+
+* Wed Sep 17 2008 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-22
+- missed required release bump up
+
 * Wed Sep 17 2008 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-18
 - shoutcast-base-url patch added to shoutcast patch
 



From endur at fedoraproject.org  Wed Sep 17 11:27:37 2008
From: endur at fedoraproject.org (Matthias Haase)
Date: Wed, 17 Sep 2008 11:27:37 +0000 (UTC)
Subject: rpms/streamtuner/F-8 streamtuner-0.99.99-shoutcast.patch,1.1,1.2
Message-ID: <20080917112737.1D7927013C@cvs1.fedora.phx.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31782

Modified Files:
	streamtuner-0.99.99-shoutcast.patch 
Log Message:
The patch changes shoutcast-base-url for shoutcast to classic.shoutcast

streamtuner-0.99.99-shoutcast.patch:

Index: streamtuner-0.99.99-shoutcast.patch
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/F-8/streamtuner-0.99.99-shoutcast.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- streamtuner-0.99.99-shoutcast.patch	20 Mar 2008 12:42:16 -0000	1.1
+++ streamtuner-0.99.99-shoutcast.patch	17 Sep 2008 11:27:06 -0000	1.2
@@ -1,5 +1,15 @@
---- src/plugins/shoutcast/shoutcast.c.orig	2004-12-19 15:21:00.000000000 +0000
-+++ src/plugins/shoutcast/shoutcast.c	2008-03-16 10:39:24.000000000 +0000
+diff -Naur streamtuner-0.99.99_orig/src/plugins/shoutcast/shoutcast.c streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c
+--- streamtuner-0.99.99_orig/src/plugins/shoutcast/shoutcast.c	2004-12-19 16:21:00.000000000 +0100
++++ streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c	2008-09-16 17:24:51.680247169 +0200
+@@ -37,7 +37,7 @@
+ 
+ /*** cpp *********************************************************************/
+ 
+-#define SHOUTCAST_ROOT		"http://www.shoutcast.com/"
++#define SHOUTCAST_ROOT		"http://classic.shoutcast.com/"
+ 
+ #define MAX_STREAMS_PER_PAGE	100 /* enforced by SHOUTcast */
+ 
 @@ -94,6 +94,8 @@
  
    GNode			*parent_node;



From endur at fedoraproject.org  Wed Sep 17 11:28:32 2008
From: endur at fedoraproject.org (Matthias Haase)
Date: Wed, 17 Sep 2008 11:28:32 +0000 (UTC)
Subject: rpms/streamtuner/F-8 streamtuner.spec,1.14,1.15
Message-ID: <20080917112832.8EABA7013C@cvs1.fedora.phx.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31976

Modified Files:
	streamtuner.spec 
Log Message:
shoutcast-base-url patch added to shoutcast patch


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/F-8/streamtuner.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- streamtuner.spec	20 Mar 2008 12:40:48 -0000	1.14
+++ streamtuner.spec	17 Sep 2008 11:28:02 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 19%{?dist}
+Release: 20%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-20
+- shoutcast-base-url patch added to shoutcast patch
+
 * Thu Mar 20 2008 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-19
 - Patch added to fix shoutcast categories listing error
 



From endur at fedoraproject.org  Wed Sep 17 11:34:25 2008
From: endur at fedoraproject.org (Matthias Haase)
Date: Wed, 17 Sep 2008 11:34:25 +0000 (UTC)
Subject: rpms/streamtuner/F-7 streamtuner-0.99.99-shoutcast.patch,1.1,1.2
Message-ID: <20080917113425.EE69D7013C@cvs1.fedora.phx.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv647

Modified Files:
	streamtuner-0.99.99-shoutcast.patch 
Log Message:
The patch changes shoutcast-base-url for shoutcast to classic.shoutcast

streamtuner-0.99.99-shoutcast.patch:

Index: streamtuner-0.99.99-shoutcast.patch
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/F-7/streamtuner-0.99.99-shoutcast.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- streamtuner-0.99.99-shoutcast.patch	20 Mar 2008 12:29:41 -0000	1.1
+++ streamtuner-0.99.99-shoutcast.patch	17 Sep 2008 11:34:25 -0000	1.2
@@ -1,5 +1,15 @@
---- src/plugins/shoutcast/shoutcast.c.orig	2004-12-19 15:21:00.000000000 +0000
-+++ src/plugins/shoutcast/shoutcast.c	2008-03-16 10:39:24.000000000 +0000
+diff -Naur streamtuner-0.99.99_orig/src/plugins/shoutcast/shoutcast.c streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c
+--- streamtuner-0.99.99_orig/src/plugins/shoutcast/shoutcast.c	2004-12-19 16:21:00.000000000 +0100
++++ streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c	2008-09-16 17:24:51.680247169 +0200
+@@ -37,7 +37,7 @@
+ 
+ /*** cpp *********************************************************************/
+ 
+-#define SHOUTCAST_ROOT		"http://www.shoutcast.com/"
++#define SHOUTCAST_ROOT		"http://classic.shoutcast.com/"
+ 
+ #define MAX_STREAMS_PER_PAGE	100 /* enforced by SHOUTcast */
+ 
 @@ -94,6 +94,8 @@
  
    GNode			*parent_node;



From endur at fedoraproject.org  Wed Sep 17 11:35:20 2008
From: endur at fedoraproject.org (Matthias Haase)
Date: Wed, 17 Sep 2008 11:35:20 +0000 (UTC)
Subject: rpms/streamtuner/F-7 streamtuner.spec,1.13,1.14
Message-ID: <20080917113520.7F8287013C@cvs1.fedora.phx.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv722

Modified Files:
	streamtuner.spec 
Log Message:
shoutcast-base-url patch added to shoutcast patch


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/F-7/streamtuner.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- streamtuner.spec	20 Mar 2008 12:25:29 -0000	1.13
+++ streamtuner.spec	17 Sep 2008 11:34:50 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 17%{?dist}
+Release: 18%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-18
+- shoutcast-base-url patch added to shoutcast patch
+
 * Thu Mar 20 2008 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-17
 - Patch added to fix shoutcast categories listing error
 



From ndim at fedoraproject.org  Wed Sep 17 11:46:20 2008
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Wed, 17 Sep 2008 11:46:20 +0000 (UTC)
Subject: rpms/xorg-x11-drv-radeonhd/devel .cvsignore, 1.36, 1.37 sources,
	1.36, 1.37 xorg-x11-drv-radeonhd-README.fedora, 1.34,
	1.35 xorg-x11-drv-radeonhd.spec, 1.47, 1.48
Message-ID: <20080917114620.A148C7013C@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2470

Modified Files:
	.cvsignore sources xorg-x11-drv-radeonhd-README.fedora 
	xorg-x11-drv-radeonhd.spec 
Log Message:
* Wed Sep 17 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.1-3.9.20080917git
- Fix build on rawhide/F10 by defining cpp macros __user and DEPRECATED
- New snapshot (upstream commit 07408e8518e4e19663c109ea8ad765686ea4e01e):
  - 07408e85: AtomBIOS: Fail driver instance if AtomBIOS mode setting is requested but no BIOS image found.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	6 Sep 2008 21:38:11 -0000	1.36
+++ .cvsignore	17 Sep 2008 11:45:50 -0000	1.37
@@ -1 +1 @@
-xf86-video-radeonhd-1.2.1-20080906git.tar.bz2
+xf86-video-radeonhd-1.2.1-20080917git.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	6 Sep 2008 21:38:11 -0000	1.36
+++ sources	17 Sep 2008 11:45:50 -0000	1.37
@@ -1 +1 @@
-6b3c10064385e3eea1af16c1b723b640  xf86-video-radeonhd-1.2.1-20080906git.tar.bz2
+6bfda8103e78f2c2b864db54d986f37a  xf86-video-radeonhd-1.2.1-20080917git.tar.bz2


Index: xorg-x11-drv-radeonhd-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-README.fedora,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xorg-x11-drv-radeonhd-README.fedora	6 Sep 2008 21:38:11 -0000	1.34
+++ xorg-x11-drv-radeonhd-README.fedora	17 Sep 2008 11:45:50 -0000	1.35
@@ -11,7 +11,7 @@
 we are packaging development snapshots of upstream's git repository
 here.
 
-Latest upstream commit: f1c6cc865d8d0703478c3eedea2e706e911f9965
+Latest upstream commit: 07408e8518e4e19663c109ea8ad765686ea4e01e
 
 
 Contents


Index: xorg-x11-drv-radeonhd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- xorg-x11-drv-radeonhd.spec	6 Sep 2008 21:38:11 -0000	1.47
+++ xorg-x11-drv-radeonhd.spec	17 Sep 2008 11:45:50 -0000	1.48
@@ -20,8 +20,8 @@
 %endif
 
 %if %{snapshot}
-%define date 20080906
-%define git_commit f1c6cc865d8d0703478c3eedea2e706e911f9965
+%define date 20080917
+%define git_commit 07408e8518e4e19663c109ea8ad765686ea4e01e
 %define alphatag .%{date}git
 %define tarball %{tarname}-%{version}-%{date}git
 %define ship_utils 1
@@ -33,7 +33,7 @@
 Summary:       Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets
 Name:          xorg-x11-drv-radeonhd
 Version:       1.2.1
-Release:       3.8%{?alphatag}%{?dist}
+Release:       3.9%{?alphatag}%{?dist}
 
 License:       MIT
 Group:         User Interface/X Hardware Support
@@ -118,7 +118,7 @@
 
 %build
 %{configure} --with-xorg-module-dir=%{moduledir} --disable-static
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} CPPFLAGS='-D__user="" -DDEPRECATED="__attribute__ ((deprecated))"'
 %{__cp} -p %{SOURCE2} README.fedora
 %if %{ship_utils}
 %{__cp} -p utils/conntest/README README.rhd_conntest
@@ -164,6 +164,11 @@
 %endif
 
 %changelog
+* Wed Sep 17 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.1-3.9.20080917git
+- Fix build on rawhide/F10 by defining cpp macros __user and DEPRECATED
+- New snapshot (upstream commit 07408e8518e4e19663c109ea8ad765686ea4e01e):
+  - 07408e85: AtomBIOS: Fail driver instance if AtomBIOS mode setting is requested but no BIOS image found.
+
 * Sat Sep 06 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.1-3.8.20080906git
 - New snapshot (upstream commit f1c6cc865d8d0703478c3eedea2e706e911f9965):
   Upstream has merged their QnD and AtomBIOS branches to master a



From endur at fedoraproject.org  Wed Sep 17 11:46:41 2008
From: endur at fedoraproject.org (Matthias Haase)
Date: Wed, 17 Sep 2008 11:46:41 +0000 (UTC)
Subject: rpms/streamtuner/devel streamtuner-0.99.99-shoutcast.patch, NONE,
	1.1
Message-ID: <20080917114641.521817013C@cvs1.fedora.phx.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2716

Added Files:
	streamtuner-0.99.99-shoutcast.patch 
Log Message:
The patch changes shoutcast-base-url for shoutcast to classic.shoutcast

streamtuner-0.99.99-shoutcast.patch:

--- NEW FILE streamtuner-0.99.99-shoutcast.patch ---
diff -Naur streamtuner-0.99.99_orig/src/plugins/shoutcast/shoutcast.c streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c
--- streamtuner-0.99.99_orig/src/plugins/shoutcast/shoutcast.c	2004-12-19 16:21:00.000000000 +0100
+++ streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c	2008-09-16 17:24:51.680247169 +0200
@@ -37,7 +37,7 @@
 
 /*** cpp *********************************************************************/
 
-#define SHOUTCAST_ROOT		"http://www.shoutcast.com/"
+#define SHOUTCAST_ROOT		"http://classic.shoutcast.com/"
 
 #define MAX_STREAMS_PER_PAGE	100 /* enforced by SHOUTcast */
 
@@ -94,6 +94,8 @@
 
   GNode			*parent_node;
   SHOUTcastStream	*stream;
+  
+  int parse_genres;
 } ReloadInfo;
 
 /*** variable declarations ***************************************************/
@@ -518,6 +520,7 @@
       info.npages = 0;
       info.parent_node = NULL;
       info.stream = NULL;
+      info.parse_genres = 0;
 
       status = st_transfer_session_get_by_line(session,
 					       url,
@@ -565,10 +568,16 @@
       info->stream = stream_new_cb(NULL);
       info->stream->url_postfix = st_sgml_ref_expand_len(s1, s2 - s1);
     }
-  else if (info->page < 2
-	   && (((s1 = st_str_has_prefix_span(line, "\t<OPTION VALUE=\""))
-		|| (s1 = st_str_has_prefix_span(line, "\t\t<OPTION VALUE=\"")))
-	       && (s2 = strstr(s1, "\">"))))
+  else if (info->page < 2 && (s1 = st_strstr_span(line, "<OPTION VALUE=\"TopTen\">")))
+  {
+  	info->parse_genres = 1;
+  }
+  else if (info->page < 2 && info->parse_genres == 1 && (s1 = st_strstr_span(line, "</SELECT>")))
+  {
+  	info->parse_genres = 0;
+  }
+  else if (info->page < 2 && info->parse_genres == 1
+	   && ((s1 = st_strstr_span(line, "<OPTION VALUE=\""))  && (s2 = strstr(s1, "\">"))))
     {
       STCategory *category;
       GNode *node;



From endur at fedoraproject.org  Wed Sep 17 11:47:29 2008
From: endur at fedoraproject.org (Matthias Haase)
Date: Wed, 17 Sep 2008 11:47:29 +0000 (UTC)
Subject: rpms/streamtuner/devel streamtuner.spec,1.12,1.13
Message-ID: <20080917114729.4DC627013C@cvs1.fedora.phx.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2795

Modified Files:
	streamtuner.spec 
Log Message:
shoutcast-base-url patch added to shoutcast patch


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/streamtuner.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- streamtuner.spec	19 Feb 2008 02:30:36 -0000	1.12
+++ streamtuner.spec	17 Sep 2008 11:46:59 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 17%{?dist}
+Release: 23%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -9,6 +9,7 @@
 Patch1: %{name}-%{version}-pygtk-2.6.patch
 Patch2: %{name}-%{version}-defaultconfig.patch
 Patch3: %{name}-%{version}-pkgconfig.patch
+Patch4: %{name}-%{version}-shoutcast.patch
 License: BSD
 Group: Applications/Internet
 Requires: python, pygtk2, htmlview, audacious, xterm
@@ -46,6 +47,7 @@
 %patch1 -p0 -b .%{name}-%{version}-pygtk-2.6
 %patch2 -p0 -b .%{name}-%{version}-defaultconfig.patch
 %patch3 -p1 -b .%{name}-%{version}-pkgconfig.patch
+%patch4 -p1 -b .%{name}-%{version}-shoutcast.patch
 
 %build
 %configure
@@ -116,6 +118,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-23
+- shoutcast-base-url patch added to shoutcast patch
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.99.99-17
 - Autorebuild for GCC 4.3
 



From ndim at fedoraproject.org  Wed Sep 17 11:49:04 2008
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Wed, 17 Sep 2008 11:49:04 +0000 (UTC)
Subject: rpms/xorg-x11-drv-radeonhd/F-9 .cvsignore, 1.35, 1.36 sources, 1.35,
	1.36 xorg-x11-drv-radeonhd-README.fedora, 1.33,
	1.34 xorg-x11-drv-radeonhd.spec, 1.43, 1.44
Message-ID: <20080917114904.502F37013C@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3144

Modified Files:
	.cvsignore sources xorg-x11-drv-radeonhd-README.fedora 
	xorg-x11-drv-radeonhd.spec 
Log Message:
* Wed Sep 17 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.1-3.9.20080917git
- Fix build on rawhide/F10 by defining cpp macros __user and DEPRECATED
- New snapshot (upstream commit 07408e8518e4e19663c109ea8ad765686ea4e01e):
  - 07408e85: AtomBIOS: Fail driver instance if AtomBIOS mode setting is requested but no BIOS image found.

* Sat Sep 06 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.1-3.8.20080906git
- New snapshot (upstream commit f1c6cc865d8d0703478c3eedea2e706e911f9965):
  Upstream has merged their QnD and AtomBIOS branches to master a
  few weeks time ago, so there are way too many changes to list here.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	24 Jul 2008 13:59:08 -0000	1.35
+++ .cvsignore	17 Sep 2008 11:48:34 -0000	1.36
@@ -1 +1 @@
-xf86-video-radeonhd-1.2.1-20080724git.tar.bz2
+xf86-video-radeonhd-1.2.1-20080917git.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	24 Jul 2008 13:59:08 -0000	1.35
+++ sources	17 Sep 2008 11:48:34 -0000	1.36
@@ -1 +1 @@
-47660263832de3cb0e8227b8ff36be69  xf86-video-radeonhd-1.2.1-20080724git.tar.bz2
+6bfda8103e78f2c2b864db54d986f37a  xf86-video-radeonhd-1.2.1-20080917git.tar.bz2


Index: xorg-x11-drv-radeonhd-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/xorg-x11-drv-radeonhd-README.fedora,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xorg-x11-drv-radeonhd-README.fedora	24 Jul 2008 13:59:08 -0000	1.33
+++ xorg-x11-drv-radeonhd-README.fedora	17 Sep 2008 11:48:34 -0000	1.34
@@ -11,7 +11,7 @@
 we are packaging development snapshots of upstream's git repository
 here.
 
-Latest upstream commit: 31e46386293fd0c54c99328eee3cfe7b49584f9d
+Latest upstream commit: 07408e8518e4e19663c109ea8ad765686ea4e01e
 
 
 Contents


Index: xorg-x11-drv-radeonhd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/xorg-x11-drv-radeonhd.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xorg-x11-drv-radeonhd.spec	24 Jul 2008 13:59:08 -0000	1.43
+++ xorg-x11-drv-radeonhd.spec	17 Sep 2008 11:48:34 -0000	1.44
@@ -20,8 +20,8 @@
 %endif
 
 %if %{snapshot}
-%define date 20080724
-%define git_commit 31e46386293fd0c54c99328eee3cfe7b49584f9d
+%define date 20080917
+%define git_commit 07408e8518e4e19663c109ea8ad765686ea4e01e
 %define alphatag .%{date}git
 %define tarball %{tarname}-%{version}-%{date}git
 %define ship_utils 1
@@ -33,7 +33,7 @@
 Summary:       Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets
 Name:          xorg-x11-drv-radeonhd
 Version:       1.2.1
-Release:       3.7%{?alphatag}%{?dist}
+Release:       3.9%{?alphatag}%{?dist}
 
 License:       MIT
 Group:         User Interface/X Hardware Support
@@ -118,7 +118,7 @@
 
 %build
 %{configure} --with-xorg-module-dir=%{moduledir} --disable-static
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} CPPFLAGS='-D__user="" -DDEPRECATED="__attribute__ ((deprecated))"'
 %{__cp} -p %{SOURCE2} README.fedora
 %if %{ship_utils}
 %{__cp} -p utils/conntest/README README.rhd_conntest
@@ -164,6 +164,16 @@
 %endif
 
 %changelog
+* Wed Sep 17 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.1-3.9.20080917git
+- Fix build on rawhide/F10 by defining cpp macros __user and DEPRECATED
+- New snapshot (upstream commit 07408e8518e4e19663c109ea8ad765686ea4e01e):
+  - 07408e85: AtomBIOS: Fail driver instance if AtomBIOS mode setting is requested but no BIOS image found.
+
+* Sat Sep 06 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.1-3.8.20080906git
+- New snapshot (upstream commit f1c6cc865d8d0703478c3eedea2e706e911f9965):
+  Upstream has merged their QnD and AtomBIOS branches to master a
+  few weeks time ago, so there are way too many changes to list here.
+
 * Thu Jul 24 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.1-3.7.20080724git
 - New snapshot (upstream commit 31e46386293fd0c54c99328eee3cfe7b49584f9d):
   - 31e46386: Connectors: Increase the number of available connectors to 6.



From mmaslano at fedoraproject.org  Wed Sep 17 11:51:37 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 17 Sep 2008 11:51:37 +0000 (UTC)
Subject: rpms/perl/devel perl.spec,1.188,1.189
Message-ID: <20080917115137.DED2A7013C@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3612

Modified Files:
	perl.spec 
Log Message:
* Wed Sep 17 2008 Marcela Maslanova <mmaslano at redhat.com> 4:5.10.0-44.fc10
- forgot to update versions in subpackages - Test::Simple and Test::Harness



Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- perl.spec	16 Sep 2008 15:05:23 -0000	1.188
+++ perl.spec	17 Sep 2008 11:51:07 -0000	1.189
@@ -86,7 +86,7 @@
 Patch21:        perl-5.10.0-CGI.patch
 
 # 462444	update Test::Simple to 0.80
-Patch22:		perl-5.10.0-TestSimple0.80.patch
+Patch22:        perl-5.10.0-TestSimple0.80.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{perl_version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  tcsh, dos2unix, man, groff
@@ -708,7 +708,7 @@
 Group:          Development/Languages
 License:        GPL+ or Artistic
 Epoch:          0
-Version:        2.64
+Version:        3.12
 Requires:       perl-devel
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
@@ -721,7 +721,7 @@
 Group:          Development/Languages
 License:        GPL+ or Artistic
 Epoch:          0
-Version:        0.72
+Version:        0.80
 Requires:       perl-devel
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
@@ -1648,6 +1648,9 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Wed Sep 17 2008 Marcela Maslanova <mmaslano at redhat.com> 4:5.10.0-44.fc10
+- forgot to update versions in subpackages - Test::Simple and Test::Harness
+
 * Tue Sep 16 2008 Marcela Maslanova <mmaslano at redhat.com> 4:5.10.0-43.fc10
 - 462444 update Test::Simple to 0.80
 



From endur at fedoraproject.org  Wed Sep 17 11:56:20 2008
From: endur at fedoraproject.org (Matthias Haase)
Date: Wed, 17 Sep 2008 11:56:20 +0000 (UTC)
Subject: rpms/streamtuner/F-8 streamtuner.spec,1.15,1.16
Message-ID: <20080917115620.ED4A77013C@cvs1.fedora.phx.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4318

Modified Files:
	streamtuner.spec 
Log Message:
wrong path for patch fixed


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/F-8/streamtuner.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- streamtuner.spec	17 Sep 2008 11:28:02 -0000	1.15
+++ streamtuner.spec	17 Sep 2008 11:55:50 -0000	1.16
@@ -47,7 +47,7 @@
 %patch1 -p0 -b .%{name}-%{version}-pygtk-2.6
 %patch2 -p0 -b .%{name}-%{version}-defaultconfig.patch
 %patch3 -p1 -b .%{name}-%{version}-pkgconfig.patch
-%patch4 -p0 -b .%{name}-%{version}-shoutcast.patch
+%patch4 -p1 -b .%{name}-%{version}-shoutcast.patch
 
 %build
 %configure --disable-live365



From endur at fedoraproject.org  Wed Sep 17 11:59:28 2008
From: endur at fedoraproject.org (Matthias Haase)
Date: Wed, 17 Sep 2008 11:59:28 +0000 (UTC)
Subject: rpms/streamtuner/F-8 streamtuner.spec,1.16,1.17
Message-ID: <20080917115928.1CEC17013C@cvs1.fedora.phx.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4864

Modified Files:
	streamtuner.spec 
Log Message:
bump up release


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/F-8/streamtuner.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- streamtuner.spec	17 Sep 2008 11:55:50 -0000	1.16
+++ streamtuner.spec	17 Sep 2008 11:58:57 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 20%{?dist}
+Release: 21%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-21
+- bump up release
+
 * Wed Sep 17 2008 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-20
 - shoutcast-base-url patch added to shoutcast patch
 



From endur at fedoraproject.org  Wed Sep 17 12:07:04 2008
From: endur at fedoraproject.org (Matthias Haase)
Date: Wed, 17 Sep 2008 12:07:04 +0000 (UTC)
Subject: rpms/streamtuner/F-7 streamtuner.spec,1.14,1.15
Message-ID: <20080917120704.D9AA37013E@cvs1.fedora.phx.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6192

Modified Files:
	streamtuner.spec 
Log Message:
bump up release - wrong path for patch fixed


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/F-7/streamtuner.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- streamtuner.spec	17 Sep 2008 11:34:50 -0000	1.14
+++ streamtuner.spec	17 Sep 2008 12:06:34 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 18%{?dist}
+Release: 19%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -47,7 +47,7 @@
 %patch1 -p0 -b .%{name}-%{version}-pygtk-2.6
 %patch2 -p0 -b .%{name}-%{version}-defaultconfig.patch
 %patch3 -p1 -b .%{name}-%{version}-pkgconfig.patch
-%patch4 -p0 -b .%{name}-%{version}-shoutcast.patch
+%patch4 -p1 -b .%{name}-%{version}-shoutcast.patch
 
 %build
 %configure --disable-live365
@@ -118,6 +118,10 @@
 
 
 %changelog
+* Wed Sep 17 2008 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-19
+- bump up release
+- wrong path for patch fixed
+
 * Wed Sep 17 2008 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-18
 - shoutcast-base-url patch added to shoutcast patch
 



From dwalsh at fedoraproject.org  Wed Sep 17 12:17:31 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 17 Sep 2008 12:17:31 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20080710.patch,1.34,1.35
Message-ID: <20080917121731.0EAA37013C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7790

Modified Files:
	policy-20080710.patch 
Log Message:
* Thu Sep 11 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-1
- Merge upstream changes
- Add Xavier Toth patches


policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- policy-20080710.patch	16 Sep 2008 17:38:25 -0000	1.34
+++ policy-20080710.patch	17 Sep 2008 12:17:30 -0000	1.35
@@ -3571,7 +3571,7 @@
 +/usr/lib64/[^/]*firefox[^/]*/firefox -- gen_context(system_u:object_r:mozilla_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.5.8/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/mozilla.if	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/mozilla.if	2008-09-17 07:36:14.000000000 -0400
 @@ -35,7 +35,10 @@
  template(`mozilla_per_role_template',`
  	gen_require(`
@@ -3583,7 +3583,7 @@
  
  	########################################
  	#
-@@ -45,20 +48,24 @@
+@@ -45,36 +48,44 @@
  	application_domain($1_mozilla_t, mozilla_exec_t)
  	role $3 types $1_mozilla_t;
  
@@ -3609,15 +3609,16 @@
  
  	allow $1_mozilla_t self:capability { sys_nice setgid setuid };
 -	allow $1_mozilla_t self:process { sigkill signal setsched getsched setrlimit };
-+	allow $1_mozilla_t self:process { ptrace sigkill signal setsched getsched setrlimit };
++	allow $1_mozilla_t self:process { ptrace sigkill signal signull setsched getsched setrlimit };
  	allow $1_mozilla_t self:fifo_file rw_fifo_file_perms;
  	allow $1_mozilla_t self:shm { unix_read unix_write read write destroy create };
  	allow $1_mozilla_t self:sem create_sem_perms;
-@@ -66,15 +73,19 @@
+ 	allow $1_mozilla_t self:socket create_socket_perms;
  	allow $1_mozilla_t self:unix_stream_socket { listen accept };
  	# Browse the web, connect to printer
- 	allow $1_mozilla_t self:tcp_socket create_socket_perms;
+-	allow $1_mozilla_t self:tcp_socket create_socket_perms;
 -	allow $1_mozilla_t self:netlink_route_socket r_netlink_socket_perms;
++	allow $1_mozilla_t self:tcp_socket create_stream_socket_perms;
  
  	# for bash - old mozilla binary
  	can_exec($1_mozilla_t, mozilla_exec_t)
@@ -3720,15 +3721,18 @@
  
  	# Browse the web, connect to printer
  	corenet_all_recvfrom_unlabeled($1_mozilla_t)
-@@ -139,7 +178,6 @@
+@@ -137,9 +176,9 @@
+ 	corenet_tcp_sendrecv_ipp_port($1_mozilla_t)
+ 	corenet_tcp_connect_http_port($1_mozilla_t)
  	corenet_tcp_connect_http_cache_port($1_mozilla_t)
++	corenet_tcp_connect_flash_port($1_mozilla_t)
  	corenet_tcp_connect_ftp_port($1_mozilla_t)
  	corenet_tcp_connect_ipp_port($1_mozilla_t)
 -	corenet_tcp_connect_generic_port($1_mozilla_t)
  	corenet_sendrecv_http_client_packets($1_mozilla_t)
  	corenet_sendrecv_http_cache_client_packets($1_mozilla_t)
  	corenet_sendrecv_ftp_client_packets($1_mozilla_t)
-@@ -165,13 +203,28 @@
+@@ -165,13 +204,28 @@
  	files_read_var_files($1_mozilla_t)
  	files_read_var_symlinks($1_mozilla_t)
   	files_dontaudit_getattr_boot_dirs($1_mozilla_t)
@@ -3757,7 +3761,7 @@
  	libs_use_ld_so($1_mozilla_t)
  	libs_use_shared_libs($1_mozilla_t)
  
-@@ -180,16 +233,8 @@
+@@ -180,17 +234,10 @@
  	miscfiles_read_fonts($1_mozilla_t)
  	miscfiles_read_localization($1_mozilla_t)
  
@@ -3774,9 +3778,11 @@
 +	userdom_dontaudit_read_user_tmp_files($1, $1_mozilla_t)
 +	userdom_dontaudit_use_user_terminals($1, $1_mozilla_t)
  	
++	xserver_read_xdm_pid($1_mozilla_t)
  	xserver_user_x_domain_template($1, $1_mozilla, $1_mozilla_t, $1_mozilla_tmpfs_t)
  	xserver_dontaudit_read_xdm_tmp_files($1_mozilla_t)
-@@ -211,131 +256,8 @@
+ 	xserver_dontaudit_getattr_xdm_tmp_sockets($1_mozilla_t)
+@@ -211,131 +258,8 @@
  		fs_manage_cifs_symlinks($1_mozilla_t)
  	')
  
@@ -3910,7 +3916,7 @@
  	')
  
  	optional_policy(`
-@@ -350,57 +272,48 @@
+@@ -350,57 +274,48 @@
  	optional_policy(`
  		cups_read_rw_config($1_mozilla_t)
  		cups_dbus_chat($1_mozilla_t)
@@ -3984,7 +3990,7 @@
  ')
  
  ########################################
-@@ -430,11 +343,11 @@
+@@ -430,11 +345,11 @@
  #
  template(`mozilla_read_user_home_files',`
  	gen_require(`
@@ -3999,7 +4005,7 @@
  ')
  
  ########################################
-@@ -464,11 +377,10 @@
+@@ -464,11 +379,10 @@
  #
  template(`mozilla_write_user_home_files',`
  	gen_require(`
@@ -4013,7 +4019,7 @@
  ')
  
  ########################################
-@@ -573,3 +485,27 @@
+@@ -573,3 +487,27 @@
  
  	allow $2 $1_mozilla_t:tcp_socket rw_socket_perms;
  ')
@@ -4074,8 +4080,17 @@
 +typealias mozilla_tmp_t alias user_mozilla_tmp_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.fc serefpolicy-3.5.8/policy/modules/apps/mplayer.fc
 --- nsaserefpolicy/policy/modules/apps/mplayer.fc	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/mplayer.fc	2008-09-12 10:59:28.000000000 -0400
-@@ -10,4 +10,4 @@
++++ serefpolicy-3.5.8/policy/modules/apps/mplayer.fc	2008-09-17 07:30:05.000000000 -0400
+@@ -1,13 +1,8 @@
+ #
+-# /etc
+-#
+-/etc/mplayer(/.*)?		gen_context(system_u:object_r:mplayer_etc_t,s0)
+-
+-#
+ # /usr
+ #
+ /usr/bin/mplayer	--	gen_context(system_u:object_r:mplayer_exec_t,s0)
  /usr/bin/mencoder	--	gen_context(system_u:object_r:mencoder_exec_t,s0)
  /usr/bin/xine		--	gen_context(system_u:object_r:mplayer_exec_t,s0)
  
@@ -4786,8 +4801,8 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.if serefpolicy-3.5.8/policy/modules/apps/openoffice.if
 --- nsaserefpolicy/policy/modules/apps/openoffice.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/apps/openoffice.if	2008-09-12 10:59:28.000000000 -0400
-@@ -0,0 +1,102 @@
++++ serefpolicy-3.5.8/policy/modules/apps/openoffice.if	2008-09-17 07:25:52.000000000 -0400
+@@ -0,0 +1,103 @@
 +## <summary>Openoffice</summary>
 +
 +#######################################
@@ -4834,6 +4849,7 @@
 +	#
 +
 +	domtrans_pattern($2, openoffice_exec_t, $1_openoffice_t)
++	allow $2  $1_openoffice_t:process { signal sigkill };
 +')
 +
 +#######################################
@@ -8413,8 +8429,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.te serefpolicy-3.5.8/policy/modules/roles/guest.te
 --- nsaserefpolicy/policy/modules/roles/guest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/roles/guest.te	2008-09-12 10:59:28.000000000 -0400
-@@ -0,0 +1,44 @@
++++ serefpolicy-3.5.8/policy/modules/roles/guest.te	2008-09-17 07:32:27.000000000 -0400
+@@ -0,0 +1,46 @@
 +
 +policy_module(guest, 1.0.0)
 +
@@ -8458,6 +8474,8 @@
 +	')
 +	
 +	domtrans_pattern(xguest_mozilla_t, openoffice_exec_t, xguest_openoffice_t)
++	allow xguest_mozilla_t xguest_openoffice_t:process { signal sigkill };
++	allow xguest_openoffice_t xguest_mozilla_t:unix_sream_socket connectto;
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.fc serefpolicy-3.5.8/policy/modules/roles/logadm.fc
 --- nsaserefpolicy/policy/modules/roles/logadm.fc	1969-12-31 19:00:00.000000000 -0500
@@ -9966,7 +9984,7 @@
  read_files_pattern(amavis_t, amavis_etc_t, amavis_etc_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.5.8/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/apache.fc	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/apache.fc	2008-09-16 15:29:22.000000000 -0400
 @@ -1,10 +1,10 @@
 -HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_ROLE_content_t,s0)
 +HOME_DIR/((www)|(web)|(public_html)|(public_git))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0)
@@ -13058,7 +13076,7 @@
 +/var/lib/misc(/.*)?			gen_context(system_u:object_r:system_crond_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.5.8/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/cron.if	2008-09-12 16:29:28.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/cron.if	2008-09-16 14:09:27.000000000 -0400
 @@ -35,39 +35,24 @@
  #
  template(`cron_per_role_template',`
@@ -13362,7 +13380,7 @@
  ')
  
  ########################################
-@@ -584,3 +500,44 @@
+@@ -584,3 +500,45 @@
  
  	dontaudit $1 system_crond_tmp_t:file append;
  ')
@@ -13382,6 +13400,7 @@
 +interface(`cron_dontaudit_write_system_job_tmp_files',`
 +	gen_require(`
 +		type system_crond_tmp_t;
++		type cron_var_run_t;
 +		type system_crond_var_run_t;
 +	')
 +
@@ -20379,8 +20398,8 @@
 +/var/lib/PolicyKit-public(/.*)?			gen_context(system_u:object_r:polkit_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.if serefpolicy-3.5.8/policy/modules/services/polkit.if
 --- nsaserefpolicy/policy/modules/services/polkit.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/polkit.if	2008-09-12 10:59:28.000000000 -0400
-@@ -0,0 +1,212 @@
++++ serefpolicy-3.5.8/policy/modules/services/polkit.if	2008-09-16 15:04:25.000000000 -0400
+@@ -0,0 +1,213 @@
 +
 +## <summary>policy for polkit_auth</summary>
 +
@@ -20484,6 +20503,7 @@
 +	allow polkit_resolve_t $1:dir list_dir_perms;
 +	read_files_pattern(polkit_resolve_t, $1, $1)
 +	read_lnk_files_pattern(polkit_resolve_t, $1, $1)
++	allow polkit_resolve_t $1:process getattr;
 +')
 +
 +########################################
@@ -27459,7 +27479,7 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.5.8/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/xserver.if	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/xserver.if	2008-09-17 07:35:23.000000000 -0400
 @@ -16,6 +16,7 @@
  	gen_require(`
  		type xkb_var_lib_t, xserver_exec_t, xserver_log_t;
@@ -33260,7 +33280,7 @@
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.5.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/userdomain.if	2008-09-16 09:56:01.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/userdomain.if	2008-09-17 07:27:44.000000000 -0400
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -34287,7 +34307,7 @@
  	typeattribute $1_tty_device_t user_ttynode;
  
  	##############################
-@@ -1042,12 +1029,24 @@
+@@ -1042,12 +1029,25 @@
  	#
  
  	# privileged home directory writers
@@ -34313,12 +34333,13 @@
 +		')
 +		optional_policy(`
 +			cups_dbus_chat($1_usertype)
++			cups_dbus_chat_config($1_usertype)
 +		')
 +	')
  
  	optional_policy(`
  		loadkeys_run($1_t,$1_r,$1_tty_device_t)
-@@ -1087,14 +1086,16 @@
+@@ -1087,14 +1087,16 @@
  	#
  
  	authlogin_per_role_template($1, $1_t, $1_r)
@@ -34340,7 +34361,7 @@
  	logging_dontaudit_send_audit_msgs($1_t)
  
  	# Need to to this just so screensaver will work. Should be moved to screensaver domain
-@@ -1102,28 +1103,23 @@
+@@ -1102,28 +1104,23 @@
  	selinux_get_enforce_mode($1_t)
  
  	optional_policy(`
@@ -34374,7 +34395,7 @@
  	')
  ')
  
-@@ -1134,8 +1130,7 @@
+@@ -1134,8 +1131,7 @@
  ## </summary>
  ## <desc>
  ##	<p>
@@ -34384,7 +34405,7 @@
  ##	</p>
  ##	<p>
  ##	This template creates a user domain, types, and
-@@ -1167,11 +1162,10 @@
+@@ -1167,11 +1163,10 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -34397,7 +34418,7 @@
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -1189,36 +1183,49 @@
+@@ -1189,36 +1184,49 @@
  		')
  	')
  
@@ -34460,7 +34481,7 @@
  	')
  ')
  
-@@ -1295,8 +1302,6 @@
+@@ -1295,8 +1303,6 @@
  	# Manipulate other users crontab.
  	allow $1_t self:passwd crontab;
  
@@ -34469,7 +34490,7 @@
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
  	kernel_getattr_message_if($1_t)
-@@ -1318,8 +1323,6 @@
+@@ -1318,8 +1324,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -34478,7 +34499,7 @@
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1374,13 +1377,6 @@
+@@ -1374,13 +1378,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -34492,7 +34513,7 @@
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1432,6 +1428,7 @@
+@@ -1432,6 +1429,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -34500,7 +34521,7 @@
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1461,10 +1458,6 @@
+@@ -1461,10 +1459,6 @@
  	seutil_run_semanage($1,$2,$3)
  	seutil_run_setfiles($1, $2, $3)
  
@@ -34511,7 +34532,7 @@
  	optional_policy(`
  		aide_run($1,$2, $3)
  	')
-@@ -1484,6 +1477,14 @@
+@@ -1484,6 +1478,14 @@
  	optional_policy(`
  		netlabel_run_mgmt($1,$2, $3)
  	')
@@ -34526,7 +34547,7 @@
  ')
  
  ########################################
-@@ -1741,11 +1742,15 @@
+@@ -1741,11 +1743,15 @@
  #
  template(`userdom_user_home_content',`
  	gen_require(`
@@ -34545,7 +34566,7 @@
  ')
  
  ########################################
-@@ -1841,11 +1846,11 @@
+@@ -1841,11 +1847,11 @@
  #
  template(`userdom_search_user_home_dirs',`
  	gen_require(`
@@ -34559,7 +34580,7 @@
  ')
  
  ########################################
-@@ -1875,11 +1880,11 @@
+@@ -1875,11 +1881,11 @@
  #
  template(`userdom_list_user_home_dirs',`
  	gen_require(`
@@ -34573,7 +34594,7 @@
  ')
  
  ########################################
-@@ -1923,12 +1928,12 @@
+@@ -1923,12 +1929,12 @@
  #
  template(`userdom_user_home_domtrans',`
  	gen_require(`
@@ -34589,7 +34610,7 @@
  ')
  
  ########################################
-@@ -1958,10 +1963,11 @@
+@@ -1958,10 +1964,11 @@
  #
  template(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
@@ -34603,7 +34624,7 @@
  ')
  
  ########################################
-@@ -1993,11 +1999,47 @@
+@@ -1993,11 +2000,47 @@
  #
  template(`userdom_manage_user_home_content_dirs',`
  	gen_require(`
@@ -34653,7 +34674,7 @@
  ')
  
  ########################################
-@@ -2029,10 +2071,10 @@
+@@ -2029,10 +2072,10 @@
  #
  template(`userdom_dontaudit_setattr_user_home_content_files',`
  	gen_require(`
@@ -34666,7 +34687,7 @@
  ')
  
  ########################################
-@@ -2062,11 +2104,11 @@
+@@ -2062,11 +2105,11 @@
  #
  template(`userdom_read_user_home_content_files',`
  	gen_require(`
@@ -34680,7 +34701,7 @@
  ')
  
  ########################################
-@@ -2096,11 +2138,11 @@
+@@ -2096,11 +2139,11 @@
  #
  template(`userdom_dontaudit_read_user_home_content_files',`
  	gen_require(`
@@ -34695,7 +34716,7 @@
  ')
  
  ########################################
-@@ -2130,10 +2172,14 @@
+@@ -2130,10 +2173,14 @@
  #
  template(`userdom_dontaudit_write_user_home_content_files',`
  	gen_require(`
@@ -34712,7 +34733,7 @@
  ')
  
  ########################################
-@@ -2163,11 +2209,11 @@
+@@ -2163,11 +2210,11 @@
  #
  template(`userdom_read_user_home_content_symlinks',`
  	gen_require(`
@@ -34726,7 +34747,7 @@
  ')
  
  ########################################
-@@ -2197,11 +2243,11 @@
+@@ -2197,11 +2244,11 @@
  #
  template(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -34740,7 +34761,7 @@
  ')
  
  ########################################
-@@ -2231,10 +2277,10 @@
+@@ -2231,10 +2278,10 @@
  #
  template(`userdom_dontaudit_exec_user_home_content_files',`
  	gen_require(`
@@ -34753,7 +34774,7 @@
  ')
  
  ########################################
-@@ -2266,12 +2312,12 @@
+@@ -2266,12 +2313,12 @@
  #
  template(`userdom_manage_user_home_content_files',`
  	gen_require(`
@@ -34769,7 +34790,7 @@
  ')
  
  ########################################
-@@ -2303,10 +2349,10 @@
+@@ -2303,10 +2350,10 @@
  #
  template(`userdom_dontaudit_manage_user_home_content_dirs',`
  	gen_require(`
@@ -34782,7 +34803,7 @@
  ')
  
  ########################################
-@@ -2338,12 +2384,12 @@
+@@ -2338,12 +2385,12 @@
  #
  template(`userdom_manage_user_home_content_symlinks',`
  	gen_require(`
@@ -34798,7 +34819,7 @@
  ')
  
  ########################################
-@@ -2375,12 +2421,12 @@
+@@ -2375,12 +2422,12 @@
  #
  template(`userdom_manage_user_home_content_pipes',`
  	gen_require(`
@@ -34814,7 +34835,7 @@
  ')
  
  ########################################
-@@ -2412,12 +2458,12 @@
+@@ -2412,12 +2459,12 @@
  #
  template(`userdom_manage_user_home_content_sockets',`
  	gen_require(`
@@ -34830,7 +34851,7 @@
  ')
  
  ########################################
-@@ -2462,11 +2508,11 @@
+@@ -2462,11 +2509,11 @@
  #
  template(`userdom_user_home_dir_filetrans',`
  	gen_require(`
@@ -34844,7 +34865,7 @@
  ')
  
  ########################################
-@@ -2511,11 +2557,11 @@
+@@ -2511,11 +2558,11 @@
  #
  template(`userdom_user_home_content_filetrans',`
  	gen_require(`
@@ -34858,7 +34879,7 @@
  ')
  
  ########################################
-@@ -2555,11 +2601,11 @@
+@@ -2555,11 +2602,11 @@
  #
  template(`userdom_user_home_dir_filetrans_user_home_content',`
  	gen_require(`
@@ -34872,7 +34893,7 @@
  ')
  
  ########################################
-@@ -2589,11 +2635,11 @@
+@@ -2589,11 +2636,11 @@
  #
  template(`userdom_write_user_tmp_sockets',`
  	gen_require(`
@@ -34886,7 +34907,7 @@
  ')
  
  ########################################
-@@ -2623,11 +2669,11 @@
+@@ -2623,11 +2670,11 @@
  #
  template(`userdom_list_user_tmp',`
  	gen_require(`
@@ -34900,7 +34921,7 @@
  ')
  
  ########################################
-@@ -2659,10 +2705,10 @@
+@@ -2659,10 +2706,10 @@
  #
  template(`userdom_dontaudit_list_user_tmp',`
  	gen_require(`
@@ -34913,7 +34934,7 @@
  ')
  
  ########################################
-@@ -2694,10 +2740,10 @@
+@@ -2694,10 +2741,10 @@
  #
  template(`userdom_dontaudit_manage_user_tmp_dirs',`
  	gen_require(`
@@ -34926,7 +34947,7 @@
  ')
  
  ########################################
-@@ -2727,12 +2773,12 @@
+@@ -2727,12 +2774,12 @@
  #
  template(`userdom_read_user_tmp_files',`
  	gen_require(`
@@ -34942,7 +34963,7 @@
  ')
  
  ########################################
-@@ -2764,10 +2810,10 @@
+@@ -2764,10 +2811,10 @@
  #
  template(`userdom_dontaudit_read_user_tmp_files',`
  	gen_require(`
@@ -34955,7 +34976,7 @@
  ')
  
  ########################################
-@@ -2799,10 +2845,10 @@
+@@ -2799,10 +2846,10 @@
  #
  template(`userdom_dontaudit_append_user_tmp_files',`
  	gen_require(`
@@ -34968,7 +34989,7 @@
  ')
  
  ########################################
-@@ -2832,12 +2878,12 @@
+@@ -2832,12 +2879,12 @@
  #
  template(`userdom_rw_user_tmp_files',`
  	gen_require(`
@@ -34984,7 +35005,7 @@
  ')
  
  ########################################
-@@ -2869,10 +2915,10 @@
+@@ -2869,10 +2916,10 @@
  #
  template(`userdom_dontaudit_manage_user_tmp_files',`
  	gen_require(`
@@ -34997,7 +35018,7 @@
  ')
  
  ########################################
-@@ -2904,12 +2950,12 @@
+@@ -2904,12 +2951,12 @@
  #
  template(`userdom_read_user_tmp_symlinks',`
  	gen_require(`
@@ -35013,7 +35034,7 @@
  ')
  
  ########################################
-@@ -2941,11 +2987,11 @@
+@@ -2941,11 +2988,11 @@
  #
  template(`userdom_manage_user_tmp_dirs',`
  	gen_require(`
@@ -35027,7 +35048,7 @@
  ')
  
  ########################################
-@@ -2977,11 +3023,11 @@
+@@ -2977,11 +3024,11 @@
  #
  template(`userdom_manage_user_tmp_files',`
  	gen_require(`
@@ -35041,7 +35062,7 @@
  ')
  
  ########################################
-@@ -3013,11 +3059,11 @@
+@@ -3013,11 +3060,11 @@
  #
  template(`userdom_manage_user_tmp_symlinks',`
  	gen_require(`
@@ -35055,7 +35076,7 @@
  ')
  
  ########################################
-@@ -3049,11 +3095,11 @@
+@@ -3049,11 +3096,11 @@
  #
  template(`userdom_manage_user_tmp_pipes',`
  	gen_require(`
@@ -35069,7 +35090,7 @@
  ')
  
  ########################################
-@@ -3085,11 +3131,11 @@
+@@ -3085,11 +3132,11 @@
  #
  template(`userdom_manage_user_tmp_sockets',`
  	gen_require(`
@@ -35083,7 +35104,7 @@
  ')
  
  ########################################
-@@ -3134,10 +3180,10 @@
+@@ -3134,10 +3181,10 @@
  #
  template(`userdom_user_tmp_filetrans',`
  	gen_require(`
@@ -35096,7 +35117,7 @@
  	files_search_tmp($2)
  ')
  
-@@ -3178,19 +3224,19 @@
+@@ -3178,19 +3225,19 @@
  #
  template(`userdom_tmp_filetrans_user_tmp',`
  	gen_require(`
@@ -35120,7 +35141,7 @@
  ##	</p>
  ##	<p>
  ##	This is a templated interface, and should only
-@@ -4616,11 +4662,11 @@
+@@ -4616,11 +4663,11 @@
  #
  interface(`userdom_search_all_users_home_dirs',`
  	gen_require(`
@@ -35134,7 +35155,7 @@
  ')
  
  ########################################
-@@ -4640,6 +4686,14 @@
+@@ -4640,6 +4687,14 @@
  
  	files_list_home($1)
  	allow $1 home_dir_type:dir list_dir_perms;
@@ -35149,7 +35170,7 @@
  ')
  
  ########################################
-@@ -4677,6 +4731,8 @@
+@@ -4677,6 +4732,8 @@
  	')
  
  	dontaudit $1 { home_dir_type home_type }:dir search_dir_perms;
@@ -35158,7 +35179,7 @@
  ')
  
  ########################################
-@@ -4721,6 +4777,25 @@
+@@ -4721,6 +4778,25 @@
  
  ########################################
  ## <summary>
@@ -35184,7 +35205,7 @@
  ##	Create, read, write, and delete all files
  ##	in all users home directories.
  ## </summary>
-@@ -4946,7 +5021,7 @@
+@@ -4946,7 +5022,7 @@
  
  ########################################
  ## <summary>
@@ -35193,7 +35214,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -5318,7 +5393,7 @@
+@@ -5318,7 +5394,7 @@
  
  ########################################
  ## <summary>
@@ -35202,7 +35223,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -5326,18 +5401,17 @@
+@@ -5326,18 +5402,17 @@
  ##	</summary>
  ## </param>
  #
@@ -35225,7 +35246,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -5345,17 +5419,17 @@
+@@ -5345,17 +5420,17 @@
  ##	</summary>
  ## </param>
  #
@@ -35247,7 +35268,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -5363,18 +5437,18 @@
+@@ -5363,18 +5438,18 @@
  ##	</summary>
  ## </param>
  #
@@ -35271,7 +35292,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -5382,17 +5456,54 @@
+@@ -5382,17 +5457,54 @@
  ##	</summary>
  ## </param>
  #
@@ -35330,7 +35351,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -5483,6 +5594,42 @@
+@@ -5483,6 +5595,42 @@
  
  ########################################
  ## <summary>
@@ -35373,7 +35394,7 @@
  ##	Send a dbus message to all user domains.
  ## </summary>
  ## <param name="domain">
-@@ -5513,3 +5660,524 @@
+@@ -5513,3 +5661,524 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')



From twoerner at fedoraproject.org  Wed Sep 17 12:19:07 2008
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Wed, 17 Sep 2008 12:19:07 +0000 (UTC)
Subject: rpms/postfix/devel .cvsignore, 1.28, 1.29 postfix.spec, 1.67,
	1.68 sources, 1.28, 1.29
Message-ID: <20080917121907.75BED7013C@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/postfix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8132

Modified Files:
	.cvsignore postfix.spec sources 
Log Message:
- new version 2.5.5
  fixes CVE-2008-2936, CVE-2008-2937 and CVE-2008-3889 (rhbz#459101)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	21 Feb 2008 18:46:06 -0000	1.28
+++ .cvsignore	17 Sep 2008 12:18:37 -0000	1.29
@@ -10,3 +10,4 @@
 postfix-2.4.5.tar.gz
 postfix-2.4.6.tar.gz
 postfix-2.5.1.tar.gz
+postfix-2.5.5.tar.gz


Index: postfix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/devel/postfix.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- postfix.spec	28 Aug 2008 21:32:32 -0000	1.67
+++ postfix.spec	17 Sep 2008 12:18:37 -0000	1.68
@@ -39,8 +39,8 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 2.5.1
-Release: 4%{?dist}
+Version: 2.5.5
+Release: 1%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -81,7 +81,6 @@
 Patch8: postfix-large-fs.patch
 Patch9: postfix-2.4.0-cyrus.patch
 Patch10: postfix-2.4.5-open_define.patch
-Patch11: postfix-CVE-2008-2936.patch
 
 # Optional patches - set the appropriate environment variables to include
 #                    them when building the package/spec file
@@ -140,7 +139,6 @@
 %patch8 -p1 -b .large-fs
 %patch9 -p1 -b .cyrus
 %patch10 -p1 -b .open_define
-%patch11 -p1 -b .CVE-2008-2936
 
 # resolve multilib conflict for makedefs.out: rename to makedefs.out-%{_arch}
 perl -pi -e "s/makedefs.out/makedefs.out-%{_arch}/g" conf/postfix-files Makefile.in */Makefile.in */*/Makefile.in HISTORY
@@ -482,6 +480,10 @@
 
 
 %changelog
+* Wed Sep 17 2008 Thomas Woerner <twoerner at redhat.com> 2:2.5.5-1
+- new version 2.5.5
+  fixes CVE-2008-2936, CVE-2008-2937 and CVE-2008-3889 (rhbz#459101)
+
 * Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2:2.5.1-4
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	21 Feb 2008 18:46:06 -0000	1.28
+++ sources	17 Sep 2008 12:18:37 -0000	1.29
@@ -1,2 +1,2 @@
 1f78fcaf2a36ec3520ecff286a45251a  pflogsumm-1.1.0.tar.gz
-95a559c509081fdd07d78eafd4f4c3b4  postfix-2.5.1.tar.gz
+6b4b848bdd2239dddfc9d385e57e19ef  postfix-2.5.5.tar.gz



From rafalzaq at fedoraproject.org  Wed Sep 17 12:44:35 2008
From: rafalzaq at fedoraproject.org (=?utf-8?q?Rafa=C5=82_Psota?=)
Date: Wed, 17 Sep 2008 12:44:35 +0000 (UTC)
Subject: rpms/blobAndConquer/devel .cvsignore, 1.10, 1.11 blobAndConquer.spec,
	1.17, 1.18 sources, 1.10, 1.11
Message-ID: <20080917124435.AFF4D7013C@cvs1.fedora.phx.redhat.com>

Author: rafalzaq

Update of /cvs/pkgs/rpms/blobAndConquer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11341

Modified Files:
	.cvsignore blobAndConquer.spec sources 
Log Message:
remove nonfree sound files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/blobAndConquer/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	9 Jul 2008 07:37:49 -0000	1.10
+++ .cvsignore	17 Sep 2008 12:44:05 -0000	1.11
@@ -1 +1,2 @@
-blobAndConquer-0.98-1.tar.gz
+blobAndConquer-0.98.tar.gz
+blobAndConquer-0.98-music.tar.bz2


Index: blobAndConquer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blobAndConquer/devel/blobAndConquer.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- blobAndConquer.spec	9 Jul 2008 07:37:49 -0000	1.17
+++ blobAndConquer.spec	17 Sep 2008 12:44:05 -0000	1.18
@@ -7,13 +7,15 @@
 
 Name:           blobAndConquer
 Version:        0.98
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Blob Wars 2: Blob And Conquer
 Group:          Amusements/Games
-License:        GPLv2+
+License:        GPLv2+ and Redistributable, no modification permitted
 URL:            http://www.parallelrealities.co.uk/blobAndConquer.php
 # Non rpm compatible URL: http://www.parallelrealities.co.uk/download.php?file=blobAndConquer-%{version}-%{upstream_release}.tar.gz&type=zip
-Source0:        %{name}-%{version}-%{upstream_release}.tar.gz
+#Tarball without nonfree sound file
+Source0:        %{name}-%{version}.tar.gz
+Source1:        %{name}-%{version}-music.tar.bz2
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  SDL_image-devel SDL_mixer-devel SDL_ttf-devel zlib-devel
 BuildRequires:  desktop-file-utils
@@ -31,7 +33,7 @@
 
 
 %prep
-%setup -q
+%setup -q -a 1
 # some cleanup
 chmod -x gfx/rw2/*.raw data/gameDefs/defines.h `find src -type f`
 sed -i 's/\r//g' data/gameDefs/defines.h `find src -type f`
@@ -39,6 +41,7 @@
   icons/blobAndConquer.desktop
 sed -i 's/-o root -g games//g' makefile
 
+cp -p *.{xm,s3m,mod} music/
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" DOCDIR=%{_docdir}/%{name}-%{version}/ \
@@ -53,6 +56,8 @@
   ICONDIR=$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 
+cp -p README.fedora-music $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category ActionGame \
@@ -88,6 +93,8 @@
 
 
 %changelog
+* Wed Sep 17 2008 Rafa?? Psota <rafalzaq at gmail.com> 0.98-2
+- Remove nonfree sound files
 * Wed Jul  9 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.98-1
 - New upstream release 0.98
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blobAndConquer/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	9 Jul 2008 07:37:49 -0000	1.10
+++ sources	17 Sep 2008 12:44:05 -0000	1.11
@@ -1 +1,2 @@
-3eb2b8088effea3aa07153695ad8f8f7  blobAndConquer-0.98-1.tar.gz
+71a3726c15f0c5f9ed2c6910ef5a721e  blobAndConquer-0.98.tar.gz
+121f85f5a039d2a3fd1d6d3262c5137a  blobAndConquer-0.98-music.tar.bz2



From rafalzaq at fedoraproject.org  Wed Sep 17 12:51:57 2008
From: rafalzaq at fedoraproject.org (=?utf-8?q?Rafa=C5=82_Psota?=)
Date: Wed, 17 Sep 2008 12:51:57 +0000 (UTC)
Subject: rpms/blobAndConquer/F-8 .cvsignore, 1.6, 1.7 blobAndConquer.spec,
	1.11, 1.12 sources, 1.6, 1.7
Message-ID: <20080917125158.10A4E7013C@cvs1.fedora.phx.redhat.com>

Author: rafalzaq

Update of /cvs/pkgs/rpms/blobAndConquer/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12327

Modified Files:
	.cvsignore blobAndConquer.spec sources 
Log Message:
update to 0.98 and remove nonfree sound files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/blobAndConquer/F-8/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Jun 2008 21:29:11 -0000	1.6
+++ .cvsignore	17 Sep 2008 12:51:27 -0000	1.7
@@ -1 +1,2 @@
-blobAndConquer-0.94-1.tar.gz
+blobAndConquer-0.98.tar.gz
+blobAndConquer-0.98-music.tar.bz2


Index: blobAndConquer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blobAndConquer/F-8/blobAndConquer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- blobAndConquer.spec	12 Jun 2008 21:29:11 -0000	1.11
+++ blobAndConquer.spec	17 Sep 2008 12:51:27 -0000	1.12
@@ -6,14 +6,16 @@
 %define upstream_release 1
 
 Name:           blobAndConquer
-Version:        0.94
+Version:        0.98
 Release:        1%{?dist}
 Summary:        Blob Wars 2: Blob And Conquer
 Group:          Amusements/Games
-License:        GPLv2+
+License:        GPLv2+ and Redistributable, no modification permitted
 URL:            http://www.parallelrealities.co.uk/blobAndConquer.php
 # Non rpm compatible URL: http://www.parallelrealities.co.uk/download.php?file=blobAndConquer-%{version}-%{upstream_release}.tar.gz&type=zip
-Source0:        %{name}-%{version}-%{upstream_release}.tar.gz
+#Tarball without nonfree sound file
+Source0:        %{name}-%{version}.tar.gz
+Source1:        %{name}-%{version}-music.tar.bz2
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  SDL_image-devel SDL_mixer-devel SDL_ttf-devel zlib-devel
 BuildRequires:  desktop-file-utils
@@ -31,32 +33,30 @@
 
 
 %prep
-%setup -q
+%setup -q -a 1
 # some cleanup
 chmod -x gfx/rw2/*.raw data/gameDefs/defines.h `find src -type f`
 sed -i 's/\r//g' data/gameDefs/defines.h `find src -type f`
 sed -i 's/Exec=blobAndConquer/Exec=blobAndConquer-wrapper/' \
   icons/blobAndConquer.desktop
+sed -i 's/-o root -g games//g' makefile
 
+cp -p *.{xm,s3m,mod} music/
 
 %build
-# the long CXXFLAGS isn't pretty, but it really is the easiest way
-make CXXFLAGS='%{optflags} `sdl-config --cflags` -DVERSION=%{version} \
-  -DRELEASE=%{upstream_release} -DUSEPAK=0 -DDEV=0 -DPAKNAME=\"%{name}.pak\" \
-  -DPAKLOCATION=\"%{_datadir}/%{name}\" -DLOCALEDIR=\"%{_datadir}/locale\" \
-  -DGAMEPLAYMANUAL=\"%{_docdir}/%{name}-%{version}/index.html\"'
+make CFLAGS="$RPM_OPT_FLAGS" DOCDIR=%{_docdir}/%{name}-%{version}/ \
+  DATADIR=%{_datadir}/%{name}/ all buildpak
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 make install DESTDIR=$RPM_BUILD_ROOT BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+  DOCDIR=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \
   DATADIR=$RPM_BUILD_ROOT%{_datadir}/%{name} \
-  ICONDIR=$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+  ICONDIR=$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
-mkdir installed-docs
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}/* installed-docs
+
+cp -p README.fedora-music $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -84,15 +84,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc installed-docs/*
+%doc %{_docdir}/%{name}-%{version}
 %{_bindir}/%{name}*
 # the data/gameDefs/defines.h file is needed runtime and thus not a devel file!
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 
 %changelog
+* Wed Sep 17 2008 Rafa?? Psota <rafalzaq at gmail.com> 0.98-1
+- Remove nonfree sound files
+- Update to 0.98
+
 * Thu Jun 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.94-1
 - New upstream release 0.94
 - Drop all patches (all upstream now)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blobAndConquer/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Jun 2008 21:29:11 -0000	1.6
+++ sources	17 Sep 2008 12:51:27 -0000	1.7
@@ -1 +1,2 @@
-e8533f7aca9d6c786ef82a184a414535  blobAndConquer-0.94-1.tar.gz
+71a3726c15f0c5f9ed2c6910ef5a721e  blobAndConquer-0.98.tar.gz
+121f85f5a039d2a3fd1d6d3262c5137a  blobAndConquer-0.98-music.tar.bz2



From rafalzaq at fedoraproject.org  Wed Sep 17 12:59:41 2008
From: rafalzaq at fedoraproject.org (=?utf-8?q?Rafa=C5=82_Psota?=)
Date: Wed, 17 Sep 2008 12:59:41 +0000 (UTC)
Subject: rpms/blobAndConquer/F-9 .cvsignore, 1.6, 1.7 blobAndConquer.spec,
	1.12, 1.13 sources, 1.6, 1.7
Message-ID: <20080917125941.64D1C7013C@cvs1.fedora.phx.redhat.com>

Author: rafalzaq

Update of /cvs/pkgs/rpms/blobAndConquer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13187

Modified Files:
	.cvsignore blobAndConquer.spec sources 
Log Message:
update to 0.98 and remove nonfree sound files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/blobAndConquer/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Jun 2008 21:26:27 -0000	1.6
+++ .cvsignore	17 Sep 2008 12:59:10 -0000	1.7
@@ -1 +1,2 @@
-blobAndConquer-0.94-1.tar.gz
+blobAndConquer-0.98.tar.gz
+blobAndConquer-0.98-music.tar.bz2


Index: blobAndConquer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blobAndConquer/F-9/blobAndConquer.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- blobAndConquer.spec	12 Jun 2008 21:26:27 -0000	1.12
+++ blobAndConquer.spec	17 Sep 2008 12:59:10 -0000	1.13
@@ -6,14 +6,16 @@
 %define upstream_release 1
 
 Name:           blobAndConquer
-Version:        0.94
+Version:        0.98
 Release:        1%{?dist}
 Summary:        Blob Wars 2: Blob And Conquer
 Group:          Amusements/Games
-License:        GPLv2+
+License:        GPLv2+ and Redistributable, no modification permitted
 URL:            http://www.parallelrealities.co.uk/blobAndConquer.php
 # Non rpm compatible URL: http://www.parallelrealities.co.uk/download.php?file=blobAndConquer-%{version}-%{upstream_release}.tar.gz&type=zip
-Source0:        %{name}-%{version}-%{upstream_release}.tar.gz
+#Tarball without nonfree sound file
+Source0:        %{name}-%{version}.tar.gz
+Source1:        %{name}-%{version}-music.tar.bz2
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  SDL_image-devel SDL_mixer-devel SDL_ttf-devel zlib-devel
 BuildRequires:  desktop-file-utils
@@ -31,32 +33,30 @@
 
 
 %prep
-%setup -q
+%setup -q -a 1
 # some cleanup
 chmod -x gfx/rw2/*.raw data/gameDefs/defines.h `find src -type f`
 sed -i 's/\r//g' data/gameDefs/defines.h `find src -type f`
 sed -i 's/Exec=blobAndConquer/Exec=blobAndConquer-wrapper/' \
   icons/blobAndConquer.desktop
+sed -i 's/-o root -g games//g' makefile
 
+cp -p *.{xm,s3m,mod} music/
 
 %build
-# the long CXXFLAGS isn't pretty, but it really is the easiest way
-make CXXFLAGS='%{optflags} `sdl-config --cflags` -DVERSION=%{version} \
-  -DRELEASE=%{upstream_release} -DUSEPAK=0 -DDEV=0 -DPAKNAME=\"%{name}.pak\" \
-  -DPAKLOCATION=\"%{_datadir}/%{name}\" -DLOCALEDIR=\"%{_datadir}/locale\" \
-  -DGAMEPLAYMANUAL=\"%{_docdir}/%{name}-%{version}/index.html\"'
+make CFLAGS="$RPM_OPT_FLAGS" DOCDIR=%{_docdir}/%{name}-%{version}/ \
+  DATADIR=%{_datadir}/%{name}/ all buildpak
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 make install DESTDIR=$RPM_BUILD_ROOT BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+  DOCDIR=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \
   DATADIR=$RPM_BUILD_ROOT%{_datadir}/%{name} \
-  ICONDIR=$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+  ICONDIR=$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
-mkdir installed-docs
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}/* installed-docs
+
+cp -p README.fedora-music $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -84,15 +84,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc installed-docs/*
+%doc %{_docdir}/%{name}-%{version}
 %{_bindir}/%{name}*
 # the data/gameDefs/defines.h file is needed runtime and thus not a devel file!
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 
 %changelog
+* Wed Sep 17 2008 Rafa?? Psota <rafalzaq at gmail.com> 0.98-1
+- Remove nonfree sound files
+- Update to 0.98
+
 * Thu Jun 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.94-1
 - New upstream release 0.94
 - Drop all patches (all upstream now)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blobAndConquer/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Jun 2008 21:26:27 -0000	1.6
+++ sources	17 Sep 2008 12:59:10 -0000	1.7
@@ -1 +1,2 @@
-e8533f7aca9d6c786ef82a184a414535  blobAndConquer-0.94-1.tar.gz
+71a3726c15f0c5f9ed2c6910ef5a721e  blobAndConquer-0.98.tar.gz
+121f85f5a039d2a3fd1d6d3262c5137a  blobAndConquer-0.98-music.tar.bz2



From phuang at fedoraproject.org  Wed Sep 17 13:31:44 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 17 Sep 2008 13:31:44 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.11, 1.12 ibus.spec, 1.14, 1.15 sources,
	1.12, 1.13
Message-ID: <20080917133144.3821C7013C@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17555

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 0.1.1.20080917


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	16 Sep 2008 09:06:22 -0000	1.11
+++ .cvsignore	17 Sep 2008 13:31:12 -0000	1.12
@@ -1 +1 @@
-ibus-0.1.1.20080916.tar.gz
+ibus-0.1.1.20080917.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ibus.spec	16 Sep 2008 09:06:22 -0000	1.14
+++ ibus.spec	17 Sep 2008 13:31:12 -0000	1.15
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define mod_path ibus-0.1
 Name:       ibus
-Version:    0.1.1.20080916
+Version:    0.1.1.20080917
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -121,6 +121,9 @@
 %{_libdir}/qt4/plugins/inputmethods/libibus.so
 
 %changelog
+* Wed Sep 17 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080917-1
+- Update to 0.1.1.20080917.
+
 * Tue Sep 16 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080916-1
 - Update to 0.1.1.20080916.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	16 Sep 2008 09:06:22 -0000	1.12
+++ sources	17 Sep 2008 13:31:12 -0000	1.13
@@ -1 +1 @@
-26b67d93ef1921af16b19a57993947dd  ibus-0.1.1.20080916.tar.gz
+319ee5d3e55240d383becf5ab015b02f  ibus-0.1.1.20080917.tar.gz



From nphilipp at fedoraproject.org  Wed Sep 17 13:41:14 2008
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 17 Sep 2008 13:41:14 +0000 (UTC)
Subject: rpms/gimp/devel gimp.spec,1.160,1.161
Message-ID: <20080917134114.888147013E@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18777

Modified Files:
	gimp.spec 
Log Message:
don't make pyconsole.py plug-in executable as upstream indicates it shouldn't be



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- gimp.spec	17 Sep 2008 08:36:34 -0000	1.160
+++ gimp.spec	17 Sep 2008 13:40:43 -0000	1.161
@@ -51,7 +51,7 @@
 %define age 0
 %define minorver 400
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -298,9 +298,6 @@
 mkdir -p %{buildroot}%{_sbindir}
 install -m 0755 gimp-plugin-mgr %{buildroot}%{_sbindir}/gimp-plugin-mgr
 
-# make pyconsole.py executable, gimp/gnome bug #552601
-chmod 755 %{buildroot}%{_libdir}/gimp/%{interfacever}/plug-ins/pyconsole.py
-
 %clean
 rm -rf %{buildroot}
 
@@ -457,6 +454,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Sep 17 2008 Nils Philippsen <nils at redhat.com> - 2:2.4.7-3
+- don't make pyconsole.py plug-in executable as upstream indicates it shouldn't
+  be
+
 * Wed Sep 17 2008 Nils Philippsen <nils at redhat.com> - 2:2.4.7-2
 - Merge review:
   - convert spec file to UTF-8



From nphilipp at fedoraproject.org  Wed Sep 17 13:41:55 2008
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 17 Sep 2008 13:41:55 +0000 (UTC)
Subject: rpms/gimp/F-9 gimp.spec,1.160,1.161
Message-ID: <20080917134155.07DF17013E@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19152

Modified Files:
	gimp.spec 
Log Message:
don't make pyconsole.py plug-in executable as upstream indicates it shouldn't be



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-9/gimp.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- gimp.spec	17 Sep 2008 08:39:24 -0000	1.160
+++ gimp.spec	17 Sep 2008 13:41:24 -0000	1.161
@@ -51,7 +51,7 @@
 %define age 0
 %define minorver 400
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -298,9 +298,6 @@
 mkdir -p %{buildroot}%{_sbindir}
 install -m 0755 gimp-plugin-mgr %{buildroot}%{_sbindir}/gimp-plugin-mgr
 
-# make pyconsole.py executable, gimp/gnome bug #552601
-chmod 755 %{buildroot}%{_libdir}/gimp/%{interfacever}/plug-ins/pyconsole.py
-
 %clean
 rm -rf %{buildroot}
 
@@ -457,6 +454,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Sep 17 2008 Nils Philippsen <nils at redhat.com> - 2:2.4.7-3
+- don't make pyconsole.py plug-in executable as upstream indicates it shouldn't
+  be
+
 * Wed Sep 17 2008 Nils Philippsen <nils at redhat.com> - 2:2.4.7-2
 - Merge review:
   - convert spec file to UTF-8



From nphilipp at fedoraproject.org  Wed Sep 17 13:42:07 2008
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 17 Sep 2008 13:42:07 +0000 (UTC)
Subject: rpms/gimp/F-8 gimp.spec,1.155,1.156
Message-ID: <20080917134207.95B8B7013C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19292

Modified Files:
	gimp.spec 
Log Message:
don't make pyconsole.py plug-in executable as upstream indicates it shouldn't be



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-8/gimp.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- gimp.spec	17 Sep 2008 08:39:54 -0000	1.155
+++ gimp.spec	17 Sep 2008 13:41:37 -0000	1.156
@@ -51,7 +51,7 @@
 %define age 0
 %define minorver 400
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -298,9 +298,6 @@
 mkdir -p %{buildroot}%{_sbindir}
 install -m 0755 gimp-plugin-mgr %{buildroot}%{_sbindir}/gimp-plugin-mgr
 
-# make pyconsole.py executable, gimp/gnome bug #552601
-chmod 755 %{buildroot}%{_libdir}/gimp/%{interfacever}/plug-ins/pyconsole.py
-
 %clean
 rm -rf %{buildroot}
 
@@ -457,6 +454,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Sep 17 2008 Nils Philippsen <nils at redhat.com> - 2:2.4.7-3
+- don't make pyconsole.py plug-in executable as upstream indicates it shouldn't
+  be
+
 * Wed Sep 17 2008 Nils Philippsen <nils at redhat.com> - 2:2.4.7-2
 - Merge review:
   - convert spec file to UTF-8



From phuang at fedoraproject.org  Wed Sep 17 13:46:47 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 17 Sep 2008 13:46:47 +0000 (UTC)
Subject: rpms/ibus/devel sources,1.13,1.14
Message-ID: <20080917134647.3484B7013C@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20232

Modified Files:
	sources 
Log Message:
Re upload ibus-0.1.1.20080917.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	17 Sep 2008 13:31:12 -0000	1.13
+++ sources	17 Sep 2008 13:46:16 -0000	1.14
@@ -1 +1 @@
-319ee5d3e55240d383becf5ab015b02f  ibus-0.1.1.20080917.tar.gz
+f8f20420c0aa45e30a783a51ab5a08c3  ibus-0.1.1.20080917.tar.gz



From phuang at fedoraproject.org  Wed Sep 17 13:53:07 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 17 Sep 2008 13:53:07 +0000 (UTC)
Subject: rpms/ibus/F-9 .cvsignore, 1.8, 1.9 ibus.spec, 1.10, 1.11 sources,
	1.10, 1.11
Message-ID: <20080917135307.3CB787013C@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21318

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 0.1.1.20080917


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	16 Sep 2008 09:13:16 -0000	1.8
+++ .cvsignore	17 Sep 2008 13:52:36 -0000	1.9
@@ -1 +1 @@
-ibus-0.1.1.20080916.tar.gz
+ibus-0.1.1.20080917.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/ibus.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ibus.spec	16 Sep 2008 09:13:16 -0000	1.10
+++ ibus.spec	17 Sep 2008 13:52:36 -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()")}
 %define mod_path ibus-0.1
 Name:       ibus
-Version:    0.1.1.20080916
+Version:    0.1.1.20080917
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -121,6 +121,9 @@
 %{_libdir}/qt4/plugins/inputmethods/libibus.so
 
 %changelog
+* Wed Sep 17 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080917-1
+- Update to 0.1.1.20080917.
+
 * Tue Sep 16 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080916-1
 - Update to 0.1.1.20080916.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Sep 2008 09:13:16 -0000	1.10
+++ sources	17 Sep 2008 13:52:36 -0000	1.11
@@ -1 +1 @@
-26b67d93ef1921af16b19a57993947dd  ibus-0.1.1.20080916.tar.gz
+f8f20420c0aa45e30a783a51ab5a08c3  ibus-0.1.1.20080917.tar.gz



From phuang at fedoraproject.org  Wed Sep 17 14:07:19 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 17 Sep 2008 14:07:19 +0000 (UTC)
Subject: rpms/ibus/devel sources,1.14,1.15
Message-ID: <20080917140719.B8D1F7013C@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22976

Modified Files:
	sources 
Log Message:
Re upload ibus-0.1.1.20080917.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	17 Sep 2008 13:46:16 -0000	1.14
+++ sources	17 Sep 2008 14:06:49 -0000	1.15
@@ -1 +1 @@
-f8f20420c0aa45e30a783a51ab5a08c3  ibus-0.1.1.20080917.tar.gz
+5dc60488fe2f30895e2bbf9a9a6010c4  ibus-0.1.1.20080917.tar.gz



From phuang at fedoraproject.org  Wed Sep 17 14:11:54 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 17 Sep 2008 14:11:54 +0000 (UTC)
Subject: rpms/ibus/F-9 sources,1.11,1.12
Message-ID: <20080917141154.937747013C@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23646

Modified Files:
	sources 
Log Message:
Re upload ibus-0.1.1.20080917.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Sep 2008 13:52:36 -0000	1.11
+++ sources	17 Sep 2008 14:11:24 -0000	1.12
@@ -1 +1 @@
-f8f20420c0aa45e30a783a51ab5a08c3  ibus-0.1.1.20080917.tar.gz
+5dc60488fe2f30895e2bbf9a9a6010c4  ibus-0.1.1.20080917.tar.gz



From rdieter at fedoraproject.org  Wed Sep 17 14:14:40 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 17 Sep 2008 14:14:40 +0000 (UTC)
Subject: rpms/moto4lin/devel .cvsignore, 1.2, 1.3 moto4lin.spec, 1.4,
	1.5 sources, 1.2, 1.3 moto4lin.png, 1.1, NONE
Message-ID: <20080917141440.15E967013C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/moto4lin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24352

Modified Files:
	.cvsignore moto4lin.spec sources 
Removed Files:
	moto4lin.png 
Log Message:
* Wed Sep 17 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.3-10
- minor qt3 build tweak
- move icon out of cvs, into sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moto4lin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Feb 2007 05:46:56 -0000	1.2
+++ .cvsignore	17 Sep 2008 14:14:09 -0000	1.3
@@ -1 +1,2 @@
 moto4lin-0.3.tar.bz2
+moto4lin.png


Index: moto4lin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moto4lin/devel/moto4lin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- moto4lin.spec	8 Apr 2008 20:15:59 -0000	1.4
+++ moto4lin.spec	17 Sep 2008 14:14:09 -0000	1.5
@@ -1,6 +1,7 @@
+
 Name:           moto4lin
 Version:        0.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        GPLv2+
 Summary:        Filemanager and seem editor for Motorola P2k phones
 Group:          Applications/Communications
@@ -24,6 +25,9 @@
 %patch2 -p1 -b .qmake
 
 %build
+unset QTDIR && . /etc/profile.d/qt.sh
+PATH=$QTDIR/bin:$PATH; export PATH
+
 qmake
 make %{_smp_mflags} all
 
@@ -31,6 +35,7 @@
 rm -rf %{buildroot}
 make install INSTALL_ROOT=%{buildroot}
 %{__install} -p -D %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+
 desktop-file-install --vendor="fedora"                        \
       --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 
@@ -45,6 +50,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Sep 17 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.3-10
+- minor qt3 build tweak
+- move icon out of cvs, into sources
+
 * Tue Apr 08 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.3-9
 - BR: qt3-devel (#434135)
 - License: GPLv2+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moto4lin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Feb 2007 05:46:56 -0000	1.2
+++ sources	17 Sep 2008 14:14:09 -0000	1.3
@@ -1 +1,2 @@
 f9e5edbc08a45ac98679e4d34d5e3574  moto4lin-0.3.tar.bz2
+37bf9dfb4617cca50c92cd02696aa85a  moto4lin.png



From mmaslano at fedoraproject.org  Wed Sep 17 14:29:17 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 17 Sep 2008 14:29:17 +0000 (UTC)
Subject: rpms/perl/F-9 perl-5.10.0-ArchiveTar1.38.patch, NONE,
	1.1 perl-5.10.0-TestSimple0.80.patch, NONE, 1.1 perl.spec, 1.180,
	1.181
Message-ID: <20080917142917.955C87013C@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26359

Modified Files:
	perl.spec 
Added Files:
	perl-5.10.0-ArchiveTar1.38.patch 
	perl-5.10.0-TestSimple0.80.patch 
Log Message:
* Wed Sep 17 2008 Marcela Maslanova <mmaslano at redhat.com> 4:5.10.0-35.fc9
- remove Tar.pm from Archive-Extract
- fix version of Test::Simple in spec
- update Test::Simple
- update Archive::Tar to 1.38


perl-5.10.0-ArchiveTar1.38.patch:

--- NEW FILE perl-5.10.0-ArchiveTar1.38.patch ---
diff -urN perl-5.10.0/lib/Archive/Tar.old/t/04_resolved_issues.t perl-5.10.0/lib/Archive/Tar/t/04_resolved_issues.t
--- perl-5.10.0/lib/Archive/Tar.old/t/04_resolved_issues.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Archive/Tar/t/04_resolved_issues.t	2007-11-15 12:47:43.000000000 +0100
@@ -121,7 +121,6 @@
                                 "       Renamed to '$out_file'" );
     
     ### first, test with strict extract permissions on
-TODO:
     {   local $Archive::Tar::INSECURE_EXTRACT_MODE = 0;
 
         ### we quell the error on STDERR
@@ -135,20 +134,14 @@
         ok( ! -e $out_file,     "       File '$out_file' does not exist" );
     
         ok( $tar->error,        "       Error message stored" );
-
-        local $TODO = 'Exposed unrelated filespec handling bugs on VMS' if $^O eq 'VMS';
-
         like( $tar->error, qr/attempting to leave/,
                                 "           Proper violation detected" );
     }
     
     ### now disable those
-TODO:
     {   local $Archive::Tar::INSECURE_EXTRACT_MODE = 1;
         ok( 1,                  "   Extracting in insecure mode" );
     
-        local $TODO = 'Exposed unrelated filespec handling bugs on VMS' if $^O eq 'VMS';
-
         ok( $tar->extract_file( $out_file ),
                                 "       File extracted" );
         ok( -e $out_file,       "       File '$out_file' exists" );
diff -urN perl-5.10.0/lib/Archive/Tar.old/t/99_pod.t perl-5.10.0/lib/Archive/Tar/t/99_pod.t
--- perl-5.10.0/lib/Archive/Tar.old/t/99_pod.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Archive/Tar/t/99_pod.t	2007-03-06 15:30:04.000000000 +0100
@@ -0,0 +1,22 @@
+use Test::More;
+use File::Spec;
+use File::Find;
+use strict;
+
+BEGIN { chdir 't' if -d 't' };
+
+eval 'use Test::Pod';
+plan skip_all => "Test::Pod v0.95 required for testing POD"
+    if $@ || $Test::Pod::VERSION < 0.95;
+
+my @files;
+find( sub { push @files, File::Spec->catfile(
+                    File::Spec->splitdir( $File::Find::dir ), $_
+                ) if /\.p(?:l|m|od)$/ }, File::Spec->catdir(qw(.. blib lib) ));
+
+plan tests => scalar @files;
+for my $file ( @files ) {
+    pod_file_ok( $file );
+}
+
+

perl-5.10.0-TestSimple0.80.patch:

--- NEW FILE perl-5.10.0-TestSimple0.80.patch ---
--- perl-5.10.0/lib/Test/Builder.bla/Module.pm	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Builder/Module.pm	2008-04-06 17:26:10.000000000 +0200
@@ -1,13 +1,13 @@
 package Test::Builder::Module;
 
+use strict;
+
 use Test::Builder;
 
 require Exporter;
- at ISA = qw(Exporter);
+our @ISA = qw(Exporter);
 
-$VERSION = '0.72';
-
-use strict;
+our $VERSION = '0.80';
 
 # 5.004's Exporter doesn't have export_to_level.
 my $_export_to_level = sub {
@@ -83,6 +83,9 @@ import_extra().
 
 sub import {
     my($class) = shift;
+    
+    # Don't run all this when loading ourself.
+    return 1 if $class eq 'Test::Builder::Module';
 
     my $test = $class->builder;
 
Common subdirectories: perl-5.10.0/lib/Test/Builder.bla/Tester and perl-5.10.0/lib/Test/Builder/Tester
diff -up perl-5.10.0/lib/Test/Builder.bla/Tester.pm perl-5.10.0/lib/Test/Builder/Tester.pm
--- perl-5.10.0/lib/Test/Builder.bla/Tester.pm	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Builder/Tester.pm	2008-04-06 17:26:21.000000000 +0200
@@ -1,8 +1,7 @@
 package Test::Builder::Tester;
 
 use strict;
-use vars qw(@EXPORT $VERSION @ISA);
-$VERSION = "1.09";
+our $VERSION = "1.13";
 
 use Test::Builder;
 use Symbol;
@@ -56,9 +55,9 @@ my $t = Test::Builder->new;
 ###
 
 use Exporter;
- at ISA = qw(Exporter);
+our @ISA = qw(Exporter);
 
- at EXPORT = qw(test_out test_err test_fail test_diag test_test line_num);
+our @EXPORT = qw(test_out test_err test_fail test_diag test_test line_num);
 
 # _export_to_level and import stolen directly from Test::More.  I am
 # the king of cargo cult programming ;-)
@@ -188,7 +187,7 @@ output filehandles)
 
 =cut
 
-sub test_out(@)
+sub test_out
 {
     # do we need to do any setup?
     _start_testing() unless $testing;
@@ -196,7 +195,7 @@ sub test_out(@)
     $out->expect(@_)
 }
 
-sub test_err(@)
+sub test_err
 {
     # do we need to do any setup?
     _start_testing() unless $testing;
@@ -549,36 +548,36 @@ sub complaint
     if (Test::Builder::Tester::color)
     {
       # get color
-      eval "require Term::ANSIColor";
+      eval { require Term::ANSIColor };
       unless ($@)
       {
-	# colours
+        # colours
 
-	my $green = Term::ANSIColor::color("black").
-	            Term::ANSIColor::color("on_green");
+        my $green = Term::ANSIColor::color("black").
+                    Term::ANSIColor::color("on_green");
         my $red   = Term::ANSIColor::color("black").
                     Term::ANSIColor::color("on_red");
-	my $reset = Term::ANSIColor::color("reset");
+        my $reset = Term::ANSIColor::color("reset");
 
-	# work out where the two strings start to differ
-	my $char = 0;
-	$char++ while substr($got, $char, 1) eq substr($wanted, $char, 1);
-
-	# get the start string and the two end strings
-	my $start     = $green . substr($wanted, 0,   $char);
-	my $gotend    = $red   . substr($got   , $char) . $reset;
-	my $wantedend = $red   . substr($wanted, $char) . $reset;
-
-	# make the start turn green on and off
-	$start =~ s/\n/$reset\n$green/g;
-
-	# make the ends turn red on and off
-	$gotend    =~ s/\n/$reset\n$red/g;
-	$wantedend =~ s/\n/$reset\n$red/g;
-
-	# rebuild the strings
-	$got    = $start . $gotend;
-	$wanted = $start . $wantedend;
+        # work out where the two strings start to differ
+        my $char = 0;
+        $char++ while substr($got, $char, 1) eq substr($wanted, $char, 1);
+
+        # get the start string and the two end strings
+        my $start     = $green . substr($wanted, 0,   $char);
+        my $gotend    = $red   . substr($got   , $char) . $reset;
+        my $wantedend = $red   . substr($wanted, $char) . $reset;
+
+        # make the start turn green on and off
+        $start =~ s/\n/$reset\n$green/g;
+
+        # make the ends turn red on and off
+        $gotend    =~ s/\n/$reset\n$red/g;
+        $wantedend =~ s/\n/$reset\n$red/g;
+
+        # rebuild the strings
+        $got    = $start . $gotend;
+        $wanted = $start . $wantedend;
       }
     }
 
diff -up perl-5.10.0/lib/Test/Builder.pm.bla perl-5.10.0/lib/Test/Builder.pm
--- perl-5.10.0/lib/Test/Builder.pm.bla	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Builder.pm	2008-04-06 17:26:10.000000000 +0200
@@ -1,15 +1,10 @@
 package Test::Builder;
 
-use 5.004;
-
-# $^C was only introduced in 5.005-ish.  We do this to prevent
-# use of uninitialized value warnings in older perls.
-$^C ||= 0;
-
+use 5.006;
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.72';
-$VERSION = eval $VERSION;    # make the alpha version come out as a number
+
+our $VERSION = '0.80';
+$VERSION = eval { $VERSION }; # make the alpha version come out as a number
 
 # Make Test::Builder thread-safe for ithreads.
 BEGIN {
@@ -73,28 +68,15 @@ Test::Builder - Backend for building tes
 =head1 SYNOPSIS
 
   package My::Test::Module;
-  use Test::Builder;
-  require Exporter;
-  @ISA = qw(Exporter);
-  @EXPORT = qw(ok);
-
-  my $Test = Test::Builder->new;
-  $Test->output('my_logfile');
-
-  sub import {
-      my($self) = shift;
-      my $pack = caller;
+  use base 'Test::Builder::Module';
 
-      $Test->exported_to($pack);
-      $Test->plan(@_);
-
-      $self->export_to_level(1, $self, 'ok');
-  }
+  my $CLASS = __PACKAGE__;
 
   sub ok {
       my($test, $name) = @_;
+      my $tb = $CLASS->builder;
 
-      $Test->ok($test, $name);
+      $tb->ok($test, $name);
   }
 
 
@@ -177,7 +159,6 @@ sub reset {
     # hash keys is just asking for pain.  Also, it was documented.
     $Level = 1;
 
-    $self->{Test_Died}    = 0;
     $self->{Have_Plan}    = 0;
     $self->{No_Plan}      = 0;
     $self->{Original_Pid} = $$;
@@ -196,9 +177,11 @@ sub reset {
     $self->{No_Header}  = 0;
     $self->{No_Ending}  = 0;
 
+    $self->{TODO}       = undef;
+
     $self->_dup_stdhandles unless $^C;
 
-    return undef;
+    return;
 }
 
 =back
@@ -210,25 +193,6 @@ are.  You usually only want to call one 
 
 =over 4
 
-=item B<exported_to>
-
-  my $pack = $Test->exported_to;
-  $Test->exported_to($pack);
-
-Tells Test::Builder what package you exported your functions to.
-This is important for getting TODO tests right.
-
-=cut
-
-sub exported_to {
-    my($self, $pack) = @_;
-
-    if( defined $pack ) {
-        $self->{Exported_To} = $pack;
-    }
-    return $self->{Exported_To};
-}
-
 =item B<plan>
 
   $Test->plan('no_plan');
@@ -360,6 +324,29 @@ sub skip_all {
     exit(0);
 }
 
+
+=item B<exported_to>
+
+  my $pack = $Test->exported_to;
+  $Test->exported_to($pack);
+
+Tells Test::Builder what package you exported your functions to.
+
+This method isn't terribly useful since modules which share the same
+Test::Builder object might get exported to different packages and only
+the last one will be honored.
+
+=cut
+
+sub exported_to {
+    my($self, $pack) = @_;
+
+    if( defined $pack ) {
+        $self->{Exported_To} = $pack;
+    }
+    return $self->{Exported_To};
+}
+
 =back
 
 =head2 Running tests
@@ -401,9 +388,12 @@ sub ok {
     Very confusing.
 ERR
 
-    my($pack, $file, $line) = $self->caller;
+    my $todo = $self->todo();
+    
+    # Capture the value of $TODO for the rest of this ok() call
+    # so it can more easily be found by other routines.
+    local $self->{TODO} = $todo;
 
-    my $todo = $self->todo($pack);
     $self->_unoverload_str(\$todo);
 
     my $out;
@@ -448,13 +438,14 @@ ERR
         my $msg = $todo ? "Failed (TODO)" : "Failed";
         $self->_print_diag("\n") if $ENV{HARNESS_ACTIVE};
 
-	if( defined $name ) {
-	    $self->diag(qq[  $msg test '$name'\n]);
-	    $self->diag(qq[  at $file line $line.\n]);
-	}
-	else {
-	    $self->diag(qq[  $msg test at $file line $line.\n]);
-	}
+    my(undef, $file, $line) = $self->caller;
+        if( defined $name ) {
+            $self->diag(qq[  $msg test '$name'\n]);
+            $self->diag(qq[  at $file line $line.\n]);
+        }
+        else {
+            $self->diag(qq[  $msg test at $file line $line.\n]);
+        }
     } 
 
     return $test ? 1 : 0;
@@ -584,6 +575,7 @@ sub _is_diag {
         }
     }
 
+    local $Level = $Level + 1;
     return $self->diag(sprintf <<DIAGNOSTIC, $got, $expect);
          got: %s
     expected: %s
@@ -705,7 +697,8 @@ sub cmp_ok {
 
         my $code = $self->_caller_context;
 
-        # Yes, it has to look like this or 5.4.5 won't see the #line directive.
+        # Yes, it has to look like this or 5.4.5 won't see the #line 
+        # directive.
         # Don't ask me, man, I just work here.
         $test = eval "
 $code" . "\$got $type \$expect;";
@@ -730,6 +723,8 @@ sub _cmp_diag {
     
     $got    = defined $got    ? "'$got'"    : 'undef';
     $expect = defined $expect ? "'$expect'" : 'undef';
+    
+    local $Level = $Level + 1;
     return $self->diag(sprintf <<DIAGNOSTIC, $got, $type, $expect);
     %s
         %s
@@ -925,7 +920,7 @@ sub maybe_regex {
     my($re, $opts);
 
     # Check for qr/foo/
-    if( ref $regex eq 'Regexp' ) {
+    if( _is_qr($regex) ) {
         $usable_regex = $regex;
     }
     # Check for '/foo/' or 'm,foo,'
@@ -937,7 +932,18 @@ sub maybe_regex {
     }
 
     return $usable_regex;
-};
+}
+
+
+sub _is_qr {
+    my $regex = shift;
+    
+    # is_regexp() checks for regexes in a robust manner, say if they're
+    # blessed.
+    return re::is_regexp($regex) if defined &re::is_regexp;
+    return ref $regex eq 'Regexp';
+}
+
 
 sub _regex_ok {
     my($self, $this, $regex, $cmp, $name) = @_;
@@ -956,7 +962,8 @@ sub _regex_ok {
 
         local($@, $!, $SIG{__DIE__}); # isolate eval
 
-        # Yes, it has to look like this or 5.4.5 won't see the #line directive.
+        # Yes, it has to look like this or 5.4.5 won't see the #line 
+        # directive.
         # Don't ask me, man, I just work here.
         $test = eval "
 $code" . q{$test = $this =~ /$usable_regex/ ? 1 : 0};
@@ -970,6 +977,8 @@ $code" . q{$test = $this =~ /$usable_reg
     unless( $ok ) {
         $this = defined $this ? "'$this'" : 'undef';
         my $match = $cmp eq '=~' ? "doesn't match" : "matches";
+
+        local $Level = $Level + 1;
         $self->diag(sprintf <<DIAGNOSTIC, $this, $match, $regex);
                   %s
     %13s '%s'
@@ -1145,7 +1154,7 @@ foreach my $attribute (qw(No_Header No_E
         return $self->{$attribute};
     };
 
-    no strict 'refs';
+    no strict 'refs';   ## no critic
     *{__PACKAGE__.'::'.$method} = $code;
 }
 
@@ -1332,10 +1341,9 @@ sub _new_fh {
         $fh = $file_or_fh;
     }
     else {
-        $fh = do { local *FH };
-        open $fh, ">$file_or_fh" or
+        open $fh, ">", $file_or_fh or
             $self->croak("Can't open test output log $file_or_fh: $!");
-	_autoflush($fh);
+        _autoflush($fh);
     }
 
     return $fh;
@@ -1350,6 +1358,7 @@ sub _autoflush {
 }
 
 
+my($Testout, $Testerr);
 sub _dup_stdhandles {
     my $self = shift;
 
@@ -1357,28 +1366,46 @@ sub _dup_stdhandles {
 
     # Set everything to unbuffered else plain prints to STDOUT will
     # come out in the wrong order from our own prints.
-    _autoflush(\*TESTOUT);
+    _autoflush($Testout);
     _autoflush(\*STDOUT);
-    _autoflush(\*TESTERR);
+    _autoflush($Testerr);
     _autoflush(\*STDERR);
 
-    $self->output(\*TESTOUT);
-    $self->failure_output(\*TESTERR);
-    $self->todo_output(\*TESTOUT);
+    $self->output        ($Testout);
+    $self->failure_output($Testerr);
+    $self->todo_output   ($Testout);
 }
 
 
 my $Opened_Testhandles = 0;
 sub _open_testhandles {
+    my $self = shift;
+    
     return if $Opened_Testhandles;
+    
     # We dup STDOUT and STDERR so people can change them in their
     # test suites while still getting normal test output.
-    open(TESTOUT, ">&STDOUT") or die "Can't dup STDOUT:  $!";
-    open(TESTERR, ">&STDERR") or die "Can't dup STDERR:  $!";
+    open( $Testout, ">&STDOUT") or die "Can't dup STDOUT:  $!";
+    open( $Testerr, ">&STDERR") or die "Can't dup STDERR:  $!";
+
+#    $self->_copy_io_layers( \*STDOUT, $Testout );
+#    $self->_copy_io_layers( \*STDERR, $Testerr );
+    
     $Opened_Testhandles = 1;
 }
 
 
+sub _copy_io_layers {
+    my($self, $src, $dst) = @_;
+    
+    $self->_try(sub {
+        require PerlIO;
+        my @src_layers = PerlIO::get_layers($src);
+
+        binmode $dst, join " ", map ":$_", @src_layers if @src_layers;
+    });
+}
+
 =item carp
 
   $tb->carp(@message);
@@ -1558,9 +1585,10 @@ will be considered 'todo' (see Test::Mor
 details).  Returns the reason (ie. the value of $TODO) if running as
 todo tests, false otherwise.
 
-todo() is about finding the right package to look for $TODO in.  It
-uses the exported_to() package to find it.  If that's not set, it's
-pretty good at guessing the right package to look at based on $Level.
+todo() is about finding the right package to look for $TODO in.  It's
+pretty good at guessing the right package to look at.  It first looks for
+the caller based on C<$Level + 1>, since C<todo()> is usually called inside
+a test function.  As a last resort it will use C<exported_to()>.
 
 Sometimes there is some confusion about where todo() should be looking
 for the $TODO variable.  If you want to be sure, tell it explicitly
@@ -1571,10 +1599,12 @@ what $pack to use.
 sub todo {
     my($self, $pack) = @_;
 
-    $pack = $pack || $self->exported_to || $self->caller($Level);
+    return $self->{TODO} if defined $self->{TODO};
+
+    $pack = $pack || $self->caller(1) || $self->exported_to;
     return 0 unless $pack;
 
-    no strict 'refs';
+    no strict 'refs';   ## no critic
     return defined ${$pack.'::TODO'} ? ${$pack.'::TODO'}
                                      : 0;
 }
@@ -1587,6 +1617,8 @@ sub todo {
 
 Like the normal caller(), except it reports according to your level().
 
+C<$height> will be added to the level().
+
 =cut
 
 sub caller {
@@ -1671,35 +1703,27 @@ sub _my_exit {
 
 =cut
 
-$SIG{__DIE__} = sub {
-    # We don't want to muck with death in an eval, but $^S isn't
-    # totally reliable.  5.005_03 and 5.6.1 both do the wrong thing
-    # with it.  Instead, we use caller.  This also means it runs under
-    # 5.004!
-    my $in_eval = 0;
-    for( my $stack = 1;  my $sub = (CORE::caller($stack))[3];  $stack++ ) {
-        $in_eval = 1 if $sub =~ /^\(eval\)/;
-    }
-    $Test->{Test_Died} = 1 unless $in_eval;
-};
-
 sub _ending {
     my $self = shift;
 
+    my $real_exit_code = $?;
     $self->_sanity_check();
 
     # Don't bother with an ending if this is a forked copy.  Only the parent
     # should do the ending.
+    if( $self->{Original_Pid} != $$ ) {
+        return;
+    }
+    
     # Exit if plan() was never called.  This is so "require Test::Simple" 
     # doesn't puke.
+    if( !$self->{Have_Plan} ) {
+        return;
+    }
+
     # Don't do an ending if we bailed out.
-    if( ($self->{Original_Pid} != $$) 			or
-	(!$self->{Have_Plan} && !$self->{Test_Died}) 	or
-	$self->{Bailed_Out}
-      )
-    {
-	_my_exit($?);
-	return;
+    if( $self->{Bailed_Out} ) {
+        return;
     }
 
     # Figure out if we passed or failed and print helpful messages.
@@ -1749,7 +1773,7 @@ Looks like you failed $num_failed test$s
 FAIL
         }
 
-        if( $self->{Test_Died} ) {
+        if( $real_exit_code ) {
             $self->diag(<<"FAIL");
 Looks like your test died just after $self->{Curr_Test}.
 FAIL
@@ -1773,7 +1797,7 @@ FAIL
     elsif ( $self->{Skip_All} ) {
         _my_exit( 0 ) && return;
     }
-    elsif ( $self->{Test_Died} ) {
+    elsif ( $real_exit_code ) {
         $self->diag(<<'FAIL');
 Looks like your test died before it could output anything.
 FAIL
diff -up perl-5.10.0/lib/Test/More.pm.bla perl-5.10.0/lib/Test/More.pm
--- perl-5.10.0/lib/Test/More.pm.bla	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/More.pm	2008-04-06 17:26:10.000000000 +0200
@@ -1,7 +1,6 @@
 package Test::More;
 
-use 5.004;
-
+use 5.006;
 use strict;
 
 
@@ -16,7 +15,7 @@ sub _carp {
 
 
 use vars qw($VERSION @ISA @EXPORT %EXPORT_TAGS $TODO);
-$VERSION = '0.72';
+$VERSION = '0.80';
 $VERSION = eval $VERSION;    # make the alpha version come out as a number
 
 use Test::Builder::Module;
@@ -31,7 +30,7 @@ use Test::Builder::Module;
              plan
              can_ok  isa_ok
              diag
-	     BAIL_OUT
+             BAIL_OUT
             );
 
 
@@ -659,32 +658,35 @@ sub use_ok ($;@) {
 
     my($pack,$filename,$line) = caller;
 
-    local($@,$!,$SIG{__DIE__});   # isolate eval
-
+    my $code;
     if( @imports == 1 and $imports[0] =~ /^\d+(?:\.\d+)?$/ ) {
         # probably a version check.  Perl needs to see the bare number
         # for it to work with non-Exporter based modules.
-        eval <<USE;
+        $code = <<USE;
 package $pack;
 use $module $imports[0];
+1;
 USE
     }
     else {
-        eval <<USE;
+        $code = <<USE;
 package $pack;
-use $module \@imports;
+use $module \@{\$args[0]};
+1;
 USE
     }
 
-    my $ok = $tb->ok( !$@, "use $module;" );
 
+    my($eval_result, $eval_error) = _eval($code, \@imports);
+    my $ok = $tb->ok( $eval_result, "use $module;" );
+    
     unless( $ok ) {
-        chomp $@;
+        chomp $eval_error;
         $@ =~ s{^BEGIN failed--compilation aborted at .*$}
                 {BEGIN failed--compilation aborted at $filename line $line.}m;
         $tb->diag(<<DIAGNOSTIC);
     Tried to use '$module'.
-    Error:  $@
+    Error:  $eval_error
 DIAGNOSTIC
 
     }
@@ -692,6 +694,20 @@ DIAGNOSTIC
     return $ok;
 }
 
+
+sub _eval {
+    my($code) = shift;
+    my @args = @_;
+
+    # Work around oddities surrounding resetting of $@ by immediately
+    # storing it.
+    local($@,$!,$SIG{__DIE__});   # isolate eval
+    my $eval_result = eval $code;
+    my $eval_error  = $@;
+
+    return($eval_result, $eval_error);
+}
+
 =item B<require_ok>
 
    require_ok($module);
@@ -711,20 +727,20 @@ sub require_ok ($) {
     # Module names must be barewords, files not.
     $module = qq['$module'] unless _is_module_name($module);
 
-    local($!, $@, $SIG{__DIE__}); # isolate eval
-    local $SIG{__DIE__};
-    eval <<REQUIRE;
+    my $code = <<REQUIRE;
 package $pack;
 require $module;
+1;
 REQUIRE
 
-    my $ok = $tb->ok( !$@, "require $module;" );
+    my($eval_result, $eval_error) = _eval($code);
+    my $ok = $tb->ok( $eval_result, "require $module;" );
 
     unless( $ok ) {
-        chomp $@;
+        chomp $eval_error;
         $tb->diag(<<DIAGNOSTIC);
     Tried to require '$module'.
-    Error:  $@
+    Error:  $eval_error
 DIAGNOSTIC
 
     }
@@ -1438,7 +1454,7 @@ B<NOTE>  This behavior may go away in fu
 
 =item Backwards compatibility
 
-Test::More works with Perls as old as 5.004_05.
+Test::More works with Perls as old as 5.6.0.
 
 
 =item Overloaded objects
diff -up perl-5.10.0/lib/Test/Simple.pm.bla perl-5.10.0/lib/Test/Simple.pm
--- perl-5.10.0/lib/Test/Simple.pm.bla	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple.pm	2008-04-06 17:26:10.000000000 +0200
@@ -4,7 +4,7 @@ use 5.004;
 
 use strict 'vars';
 use vars qw($VERSION @ISA @EXPORT);
-$VERSION = '0.72';
+$VERSION = '0.80';
 $VERSION = eval $VERSION;    # make the alpha version come out as a number
 
 use Test::Builder::Module;
diff -up perl-5.10.0/lib/Test/Tutorial.pod.bla perl-5.10.0/lib/Test/Tutorial.pod
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/BEGIN_require_ok.t perl-5.10.0/lib/Test/Simple/t/BEGIN_require_ok.t
--- perl-5.10.0/lib/Test/Simple/t.bla/BEGIN_require_ok.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/BEGIN_require_ok.t	2007-12-04 04:32:40.000000000 +0100
@@ -0,0 +1,24 @@
+#!/usr/bin/perl -w
+
+BEGIN {
+    if( $ENV{PERL_CORE} ) {
+        chdir 't';
+        @INC = ('../lib', 'lib');
+    }
+    else {
+        unshift @INC, 't/lib';
+    }
+}
+
+use Test::More;
+
+my $result;
+BEGIN {
+    eval {
+        require_ok("Wibble");
+    };
+    $result = $@;
+}
+
+plan tests => 1;
+like $result, '/^You tried to run a test without a plan/';
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/BEGIN_use_ok.t perl-5.10.0/lib/Test/Simple/t/BEGIN_use_ok.t
--- perl-5.10.0/lib/Test/Simple/t.bla/BEGIN_use_ok.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/BEGIN_use_ok.t	2007-09-20 05:16:02.000000000 +0200
@@ -0,0 +1,28 @@
+#!/usr/bin/perl -w
+
+# [rt.cpan.org 28345]
+#
+# A use_ok() inside a BEGIN block lacking a plan would be silently ignored.
+
+BEGIN {
+    if( $ENV{PERL_CORE} ) {
+        chdir 't';
+        @INC = ('../lib', 'lib');
+    }
+    else {
+        unshift @INC, 't/lib';
+    }
+}
+
+use Test::More;
+
+my $result;
+BEGIN {
+    eval {
+        use_ok("Wibble");
+    };
+    $result = $@;
+}
+
+plan tests => 1;
+like $result, '/^You tried to run a test without a plan/';
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/dont_overwrite_die_handler.t perl-5.10.0/lib/Test/Simple/t/dont_overwrite_die_handler.t
--- perl-5.10.0/lib/Test/Simple/t.bla/dont_overwrite_die_handler.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/dont_overwrite_die_handler.t	2008-02-24 04:33:47.000000000 +0100
@@ -0,0 +1,19 @@
+#!/usr/bin/perl -w
+
+BEGIN {
+    if( $ENV{PERL_CORE} ) {
+        chdir 't';
+        @INC = '../lib';
+    }
+}
+
+# Make sure this is in place before Test::More is loaded.
+my $handler_called;
+BEGIN {
+    $SIG{__DIE__} = sub { $handler_called++ };
+}
+
+use Test::More tests => 2;
+
+ok !eval { die };
+is $handler_called, 1, 'existing DIE handler not overridden';
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/exit.t perl-5.10.0/lib/Test/Simple/t/exit.t
--- perl-5.10.0/lib/Test/Simple/t.bla/exit.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/exit.t	2008-02-24 04:29:39.000000000 +0100
@@ -25,18 +25,9 @@
     exit 0;
 }
 
-my $test_num = 1;
-# Utility testing functions.
-sub ok ($;$) {
-    my($test, $name) = @_;
-    my $ok = '';
-    $ok .= "not " unless $test;
-    $ok .= "ok $test_num";
-    $ok .= " - $name" if defined $name;
-    $ok .= "\n";
-    print $ok;
-    $test_num++;
-}
+require Test::Builder;
+my $TB = Test::Builder->create();
+$TB->level(0);
 
 
 package main;
@@ -59,10 +50,11 @@
              'pre_plan_death.plx'       => ['not zero',    'not zero'],
              'death_in_eval.plx'        => [0,      0],
              'require.plx'              => [0,      0],
-	     'exit.plx'                 => [1,      4],
+             'death_with_handler.plx'   => [255,    4],
+             'exit.plx'                 => [1,      4],
             );
 
-print "1..".keys(%Tests)."\n";
+$TB->plan( tests => scalar keys(%Tests) );
 
 eval { require POSIX; &POSIX::WEXITSTATUS(0) };
 if( $@ ) {
@@ -93,12 +85,12 @@
     my $actual_exit = exitstatus($wait_stat);
 
     if( $exit_code eq 'not zero' ) {
-        My::Test::ok( $actual_exit != 0,
+        $TB->isnt_num( $actual_exit, 0,
                       "$test_name exited with $actual_exit ".
                       "(expected $exit_code)");
     }
     else {
-        My::Test::ok( $actual_exit == $exit_code, 
+        $TB->is_num( $actual_exit, $exit_code, 
                       "$test_name exited with $actual_exit ".
                       "(expected $exit_code)");
     }
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/filehandles.t perl-5.10.0/lib/Test/Simple/t/filehandles.t
--- perl-5.10.0/lib/Test/Simple/t.bla/filehandles.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/filehandles.t	2008-02-29 11:07:33.000000000 +0100
@@ -3,19 +3,16 @@
 BEGIN {
     if( $ENV{PERL_CORE} ) {
         chdir 't';
-        @INC = '../lib';
+        @INC = ('../lib', 'lib');
     }
 }
 
+use lib 't/lib';
 use Test::More tests => 1;
+use Dev::Null;
 
 tie *STDOUT, "Dev::Null" or die $!;
 
 print "not ok 1\n";     # this should not print.
 pass 'STDOUT can be mucked with';
 
-
-package Dev::Null;
-
-sub TIEHANDLE { bless {} }
-sub PRINT { 1 }
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/is_deeply_with_threads.t perl-5.10.0/lib/Test/Simple/t/is_deeply_with_threads.t
--- perl-5.10.0/lib/Test/Simple/t.bla/is_deeply_with_threads.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/is_deeply_with_threads.t	2008-02-24 04:12:32.000000000 +0100
@@ -22,12 +22,17 @@
         print "1..0 # Skip: no working threads\n";
         exit 0;
     }
+    
+    unless ( $ENV{AUTHOR_TESTING} ) {
+        print "1..0 # Skip: many perls have broken threads.  Enable with AUTHOR_TESTING.\n";
+        exit 0;
+    }
 }
 use Test::More;
 
 my $Num_Threads = 5;
 
-plan tests => $Num_Threads * 100 + 5;
+plan tests => $Num_Threads * 100 + 6;
 
 
 sub do_one_thread {
@@ -56,3 +61,5 @@
     my $rc = $t->join();
     cmp_ok( $rc, '==', 42, "threads exit status is $rc" );
 }
+
+pass("End of test");
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Dev/Null.pm perl-5.10.0/lib/Test/Simple/t/lib/Dev/Null.pm
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Dev/Null.pm	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Dev/Null.pm	2008-02-24 04:44:15.000000000 +0100
@@ -0,0 +1,6 @@
+package Dev::Null;
+
+sub TIEHANDLE { bless {} }
+sub PRINT { 1 }
+
+1;
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/NoExporter.pm perl-5.10.0/lib/Test/Simple/t/lib/NoExporter.pm
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/NoExporter.pm	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/NoExporter.pm	2008-02-24 04:03:27.000000000 +0100
@@ -0,0 +1,10 @@
+package NoExporter;
+
+$VERSION = 1.02;
+sub import { 
+    shift;
+    die "NoExporter exports nothing.  You asked for: @_" if @_;
+}
+
+1;
+
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/Catch.pm perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/Catch.pm
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/Catch.pm	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/Catch.pm	2008-02-24 04:03:15.000000000 +0100
@@ -0,0 +1,18 @@
+# For testing Test::Simple;
+package Test::Simple::Catch;
+
+use Symbol;
+use TieOut;
+my($out_fh, $err_fh) = (gensym, gensym);
+my $out = tie *$out_fh, 'TieOut';
+my $err = tie *$err_fh, 'TieOut';
+
+use Test::Builder;
+my $t = Test::Builder->new;
+$t->output($out_fh);
+$t->failure_output($err_fh);
+$t->todo_output($err_fh);
+
+sub caught { return($out, $err) }
+
+1;
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/death_in_eval.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/death_in_eval.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/death_in_eval.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/death_in_eval.plx	2006-08-31 07:24:16.000000000 +0200
@@ -0,0 +1,22 @@
+require Test::Simple;
+use Carp;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 5);
+
+ok(1);
+ok(1);
+ok(1);
+eval {
+        die "Foo";
+};
+ok(1);
+eval "die 'Bar'";
+ok(1);
+
+eval {
+        croak "Moo";
+};
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/death.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/death.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/death.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/death.plx	2008-02-24 05:39:20.000000000 +0100
@@ -0,0 +1,15 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+require Dev::Null;
+
+Test::Simple->import(tests => 5);
+tie *STDERR, 'Dev::Null';
+
+ok(1);
+ok(1);
+ok(1);
+die "This is a test";
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/death_with_handler.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/death_with_handler.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/death_with_handler.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/death_with_handler.plx	2008-02-24 05:38:55.000000000 +0100
@@ -0,0 +1,18 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 2);
+
+# Test we still get the right exit code despite having a die
+# handler.
+$SIG{__DIE__} = sub {};
+
+require Dev::Null;
+tie *STDERR, 'Dev::Null';
+
+ok(1);
+ok(1);
+die "This is a test";
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/exit.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/exit.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/exit.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/exit.plx	2006-08-31 07:24:17.000000000 +0200
@@ -0,0 +1,3 @@
+require Test::Builder;
+
+exit 1;
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/extras.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/extras.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/extras.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/extras.plx	2006-08-31 07:24:16.000000000 +0200
@@ -0,0 +1,16 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 5);
+
+
+ok(1);
+ok(1);
+ok(1);
+ok(1);
+ok(0);
+ok(1);
+ok(0);
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/five_fail.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/five_fail.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/five_fail.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/five_fail.plx	2006-08-31 07:24:16.000000000 +0200
@@ -0,0 +1,13 @@
+require Test::Simple;
+
+use lib 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 5);
+
+ok(0);
+ok(0);
+ok('');
+ok(0);
+ok(0);
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/last_minute_death.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/last_minute_death.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/last_minute_death.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/last_minute_death.plx	2008-02-24 05:39:07.000000000 +0100
@@ -0,0 +1,18 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 5);
+
+require Dev::Null;
+tie *STDERR, 'Dev::Null';
+
+ok(1);
+ok(1);
+ok(1);
+ok(1);
+ok(1);
+
+die "This is a test";
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/one_fail.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/one_fail.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/one_fail.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/one_fail.plx	2006-08-31 07:24:17.000000000 +0200
@@ -0,0 +1,14 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 5);
+
+
+ok(1);
+ok(2);
+ok(0);
+ok(1);
+ok(2);
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/pre_plan_death.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/pre_plan_death.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/pre_plan_death.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/pre_plan_death.plx	2006-08-31 07:24:16.000000000 +0200
@@ -0,0 +1,17 @@
+# ID 20020716.013, the exit code would become 0 if the test died
+# before a plan.
+
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+close STDERR;
+die "Knife?";
+
+Test::Simple->import(tests => 3);
+
+ok(1);
+ok(1);
+ok(1);
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/require.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/require.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/require.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/require.plx	2006-08-31 07:24:17.000000000 +0200
@@ -0,0 +1 @@
+require Test::Simple;
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/success.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/success.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/success.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/success.plx	2006-08-31 07:24:16.000000000 +0200
@@ -0,0 +1,13 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 5);
+
+ok(1);
+ok(5, 'yep');
+ok(3, 'beer');
+ok("wibble", "wibble");
+ok(1);
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/too_few_fail.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/too_few_fail.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/too_few_fail.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/too_few_fail.plx	2006-08-31 07:24:16.000000000 +0200
@@ -0,0 +1,12 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 5);
+
+
+ok(0);
+ok(1);
+ok(0);
\ No newline at end of file
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/too_few.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/too_few.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/too_few.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/too_few.plx	2006-08-31 07:24:16.000000000 +0200
@@ -0,0 +1,11 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 5);
+
+
+ok(1);
+ok(1);
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/two_fail.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/two_fail.plx
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/two_fail.plx	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/two_fail.plx	2006-08-31 07:24:16.000000000 +0200
@@ -0,0 +1,14 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 5);
+
+
+ok(0);
+ok(1);
+ok(1);
+ok(0);
+ok(1);
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/TieOut.pm perl-5.10.0/lib/Test/Simple/t/lib/TieOut.pm
--- perl-5.10.0/lib/Test/Simple/t.bla/lib/TieOut.pm	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/lib/TieOut.pm	2008-02-24 04:03:15.000000000 +0100
@@ -0,0 +1,28 @@
+package TieOut;
+
+sub TIEHANDLE {
+    my $scalar = '';
+    bless( \$scalar, $_[0]);
+}
+
+sub PRINT {
+    my $self = shift;
+    $$self .= join('', @_);
+}
+
+sub PRINTF {
+    my $self = shift;
+    my $fmt  = shift;
+    $$self .= sprintf $fmt, @_;
+}
+
+sub FILENO {}
+
+sub read {
+    my $self = shift;
+    my $data = $$self;
+    $$self = '';
+    return $data;
+}
+
+1;
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/maybe_regex.t perl-5.10.0/lib/Test/Simple/t/maybe_regex.t
--- perl-5.10.0/lib/Test/Simple/t.bla/maybe_regex.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/maybe_regex.t	2008-02-24 05:08:29.000000000 +0100
@@ -11,22 +11,24 @@
 }
 
 use strict;
-use Test::More tests => 13;
+use Test::More tests => 16;
 
 use Test::Builder;
 my $Test = Test::Builder->new;
 
-SKIP: {
-    skip "qr// added in 5.005", 3 if $] < 5.005;
+my $r = $Test->maybe_regex(qr/^FOO$/i);
+ok(defined $r, 'qr// detected');
+ok(('foo' =~ /$r/), 'qr// good match');
+ok(('bar' !~ /$r/), 'qr// bad match');
 
-    # 5.004 can't even see qr// or it pukes in compile.
-    eval q{
-           my $r = $Test->maybe_regex(qr/^FOO$/i);
-           ok(defined $r, 'qr// detected');
-           ok(('foo' =~ /$r/), 'qr// good match');
-           ok(('bar' !~ /$r/), 'qr// bad match');
-          };
-    die $@ if $@;
+SKIP: {
+    skip "blessed regex checker added in 5.10", 3 if $] < 5.010;
+    
+    my $obj = bless qr/foo/, 'Wibble';
+    my $re = $Test->maybe_regex($obj);
+    ok( defined $re, "blessed regex detected" );
+    ok( ('foo' =~ /$re/), 'blessed qr/foo/ good match' );
+    ok( ('bar' !~ /$re/), 'blessed qr/foo/ bad math' );
 }
 
 {
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/pod-coverage.t perl-5.10.0/lib/Test/Simple/t/pod-coverage.t
--- perl-5.10.0/lib/Test/Simple/t.bla/pod-coverage.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/pod-coverage.t	2007-03-14 01:21:10.000000000 +0100
@@ -0,0 +1,27 @@
+#!/usr/bin/perl -w
+
+use Test::More;
+
+# 1.08 added the coverage_class option.
+eval "use Test::Pod::Coverage 1.08";
+plan skip_all => "Test::Pod::Coverage 1.08 required for testing POD coverage" if $@;
+eval "use Pod::Coverage::CountParents";
+plan skip_all => "Pod::Coverage::CountParents required for testing POD coverage" if $@;
+
+my @modules = Test::Pod::Coverage::all_modules();
+plan tests => scalar @modules;
+
+my %coverage_params = (
+    "Test::Builder" => {
+        also_private => [ '^(share|lock|BAILOUT)$' ]
+    },
+    "Test::More" => {
+        trustme => [ '^(skip|todo)$' ]
+    },
+);
+
+for my $module (@modules) {
+    pod_coverage_ok( $module, { coverage_class => 'Pod::Coverage::CountParents',
+                                %{$coverage_params{$module} || {}} }
+                   );
+}
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/pod.t perl-5.10.0/lib/Test/Simple/t/pod.t
--- perl-5.10.0/lib/Test/Simple/t.bla/pod.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/pod.t	2006-10-24 23:08:10.000000000 +0200
@@ -0,0 +1,6 @@
+#!/usr/bin/perl -w
+
+use Test::More;
+eval "use Test::Pod 1.00";
+plan skip_all => "Test::Pod 1.00 required for testing POD" if $@;
+all_pod_files_ok();
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/reset.t perl-5.10.0/lib/Test/Simple/t/reset.t
--- perl-5.10.0/lib/Test/Simple/t.bla/reset.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/reset.t	2008-02-24 05:31:07.000000000 +0100
@@ -16,6 +16,11 @@
 
 use Test::Builder;
 my $tb = Test::Builder->new;
+
+my %Original_Output;
+$Original_Output{$_} = $tb->$_ for qw(output failure_output todo_output);
+
+
 $tb->plan(tests => 14);
 $tb->level(0);
 
@@ -66,11 +71,11 @@
 ok( $tb->use_numbers    == 1,           'use_numbers' );
 ok( $tb->no_header      == 0,           'no_header' );
 ok( $tb->no_ending      == 0,           'no_ending' );
-ok( fileno $tb->output         == fileno *Test::Builder::TESTOUT,    
+ok( fileno $tb->output         == fileno $Original_Output{output},    
                                         'output' );
-ok( fileno $tb->failure_output == fileno *Test::Builder::TESTERR,    
+ok( fileno $tb->failure_output == fileno $Original_Output{failure_output},    
                                         'failure_output' );
-ok( fileno $tb->todo_output    == fileno *Test::Builder::TESTOUT,
+ok( fileno $tb->todo_output    == fileno $Original_Output{todo_output},
                                         'todo_output' );
 ok( $tb->current_test   == 0,           'current_test' );
 ok( $tb->summary        == 0,           'summary' );
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/tbm_doesnt_set_exported_to.t perl-5.10.0/lib/Test/Simple/t/tbm_doesnt_set_exported_to.t
--- perl-5.10.0/lib/Test/Simple/t.bla/tbm_doesnt_set_exported_to.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/tbm_doesnt_set_exported_to.t	2008-02-26 21:45:20.000000000 +0100
@@ -0,0 +1,24 @@
+#!/usr/bin/perl -w
+
+BEGIN {
+    if( $ENV{PERL_CORE} ) {
+        chdir 't';
+        @INC = '../lib';
+    }
+}
+
+use strict;
+use warnings;
+
+# Can't use Test::More, that would set exported_to()
+use Test::Builder;
+use Test::Builder::Module;
+
+my $TB = Test::Builder->create;
+$TB->plan( tests => 1 );
+$TB->level(0);
+
+$TB->is_eq( Test::Builder::Module->builder->exported_to,
+            undef,
+            'using Test::Builder::Module does not set exported_to()'
+);
\ No newline at end of file
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/todo.t perl-5.10.0/lib/Test/Simple/t/todo.t
--- perl-5.10.0/lib/Test/Simple/t.bla/todo.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/todo.t	2008-02-27 10:37:18.000000000 +0100
@@ -9,7 +9,7 @@
 
 use Test::More;
 
-plan tests => 18;
+plan tests => 19;
 
 
 $Why = 'Just testing the todo interface.';
@@ -69,11 +69,20 @@
         # perl gets the line number a little wrong on the first
         # statement inside a block.
         1 == 1;
-#line 82
+#line 73
         todo_skip "Just testing todo_skip";
         fail("So very failed");
     }
     is( $warning, "todo_skip() needs to know \$how_many tests are in the ".
-                  "block at $0 line 82\n",
+                  "block at $0 line 73\n",
         'todo_skip without $how_many warning' );
 }
+
+
+TODO: {
+    Test::More->builder->exported_to("Wibble");
+    
+    local $TODO = "testing \$TODO with an incorrect exported_to()";
+    
+    fail("Just testing todo");
+}
diff -urN perl-5.10.0/lib/Test/Simple/t.bla/utf8.t perl-5.10.0/lib/Test/Simple/t/utf8.t
--- perl-5.10.0/lib/Test/Simple/t.bla/utf8.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Test/Simple/t/utf8.t	2008-04-06 17:24:44.000000000 +0200
@@ -0,0 +1,69 @@
+#!/usr/bin/perl -w
+
+BEGIN {
+    if( $ENV{PERL_CORE} ) {
+        chdir 't';
+        @INC = '../lib';
+    }
+}
+
+use strict;
+use warnings;
+
+use Test::More skip_all => 'Not yet implemented';
+
+my $have_perlio;
+BEGIN {
+    # All together so Test::More sees the open discipline
+    $have_perlio = eval q[
+        use PerlIO;
+        use open ':std', ':locale';
+        use Test::More;
+        1;
+    ];
+}
+
+use Test::More;
+
+if( !$have_perlio ) {
+    plan skip_all => "Don't have PerlIO";
+}
+else {
+    plan tests => 5;
+}
+
+SKIP: {
+    skip( "Need PerlIO for this feature", 3 )
+        unless $have_perlio;
+
+    my %handles = (
+        output          => \*STDOUT,
+        failure_output  => \*STDERR,
+        todo_output     => \*STDOUT
+    );
+
+    for my $method (keys %handles) {
+        my $src = $handles{$method};
+        
+        my $dest = Test::More->builder->$method;
+        
+        is_deeply { map { $_ => 1 } PerlIO::get_layers($dest) },
+                  { map { $_ => 1 } PerlIO::get_layers($src)  },
+                  "layers copied to $method";
+    }
+}
+
+SKIP: {
+    skip( "Can't test in general because their locale is unknown", 2 )
+        unless $ENV{AUTHOR_TESTING};
+
+    my $uni = "\x{11e}";
+    
+    my @warnings;
+    local $SIG{__WARN__} = sub {
+        push @warnings, @_;
+    };
+
+    is( $uni, $uni, "Testing $uni" );
+    is_deeply( \@warnings, [] );
+}
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/death_in_eval.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/death_in_eval.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx
--- perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx.bla	2007-12-18 11:47:08.000000000 +0100
+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx	2008-02-24 05:39:20.000000000 +0100
@@ -4,10 +4,12 @@ push @INC, 't/lib';
 require Test::Simple::Catch;
 my($out, $err) = Test::Simple::Catch::caught();
 
+require Dev::Null;
+
 Test::Simple->import(tests => 5);
-close STDERR;
+tie *STDERR, 'Dev::Null';
 
 ok(1);
 ok(1);
 ok(1);
-die "Knife?";
+die "This is a test";
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx
--- perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx.bla	2008-09-16 14:55:33.000000000 +0200
+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx	2008-02-24 05:38:55.000000000 +0100
@@ -0,0 +1,18 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 2);
+
+# Test we still get the right exit code despite having a die
+# handler.
+$SIG{__DIE__} = sub {};
+
+require Dev::Null;
+tie *STDERR, 'Dev::Null';
+
+ok(1);
+ok(1);
+die "This is a test";
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/exit.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/exit.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/extras.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/extras.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/five_fail.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/five_fail.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx
--- perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx.bla	2007-12-18 11:47:08.000000000 +0100
+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx	2008-02-24 05:39:07.000000000 +0100
@@ -5,7 +5,9 @@ require Test::Simple::Catch;
 my($out, $err) = Test::Simple::Catch::caught();
 
 Test::Simple->import(tests => 5);
-close STDERR;
+
+require Dev::Null;
+tie *STDERR, 'Dev::Null';
 
 ok(1);
 ok(1);
@@ -13,4 +15,4 @@ ok(1);
 ok(1);
 ok(1);
 
-die "Almost there...";
+die "This is a test";
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/one_fail.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/one_fail.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/pre_plan_death.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/pre_plan_death.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/require.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/require.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/success.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/success.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few.plx
diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/two_fail.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/two_fail.plx


Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/F-9/perl.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- perl.spec	14 Aug 2008 14:30:06 -0000	1.180
+++ perl.spec	17 Sep 2008 14:28:47 -0000	1.181
@@ -89,6 +89,12 @@
 #  CGI.pm bug in exists() on tied param hash
 Patch19:	perl-5.10.0-CGI.patch
 
+# 462444	update Test::Simple to 0.80
+Patch20:    perl-5.10.0-TestSimple0.80.patch
+
+# Archive::Tar update to 1.38 version
+Patch21:    perl-5.10.0-ArchiveTar1.38.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{perl_version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  tcsh, dos2unix, man, groff
 BuildRequires:  gdbm-devel, db4-devel, zlib-devel
@@ -240,8 +246,7 @@
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 Epoch:          0
-# It's really 1.37_01, but we drop the _01.
-Version:        1.37
+Version:        1.38
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 Requires:       perl(Compress::Zlib), perl(IO::Zlib)
 
@@ -721,7 +726,7 @@
 Group:          Development/Languages
 License:        GPL+ or Artistic
 Epoch:          0
-Version:        0.72
+Version:        0.80
 Requires:       perl-devel
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
@@ -815,6 +820,8 @@
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
+%patch21 -p1
 
 #
 # Candidates for doc recoding (need case by case review):
@@ -1033,13 +1040,15 @@
 perl -x patchlevel.h 'Fedora Patch17: CVE-2008-2827 perl: insecure use of chmod in rmtree'
 perl -x patchlevel.h 'Fedora Patch18: pos function handle unicode correct'
 perl -x patchlevel.h 'Fedora Patch19: CGI bug in exists()'
+perl -x patchlevel.h 'Fedora Patch20: Update Test::Simple to 0.80'
+perl -x patchlevel.h 'Fedora Patch21: Archive::Tar 1.38'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %check
 %ifnarch sparc64
-##make test
+make test
 %endif
 
 %post libs -p /sbin/ldconfig
@@ -1350,7 +1359,7 @@
 
 %files Archive-Extract
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/Archive/
+%{_prefix}/lib/perl5/%{perl_version}/Archive/Extract.pm
 %{_mandir}/man3/Archive::Extract.3*
 
 %files Archive-Tar
@@ -1638,6 +1647,12 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Wed Sep 17 2008 Marcela Maslanova <mmaslano at redhat.com> 4:5.10.0-35.fc9
+- remove Tar.pm from Archive-Extract
+- fix version of Test::Simple in spec
+- update Test::Simple
+- update Archive::Tar to 1.38
+
 * Thu Aug 14 2008 Stepan Kasal <skasal at redhat.com> 4:5.10.0-34.fc9
 - move libnet to the right directory, along Net/Config.pm
 



From jsafrane at fedoraproject.org  Wed Sep 17 14:32:37 2008
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Wed, 17 Sep 2008 14:32:37 +0000 (UTC)
Subject: rpms/net-snmp/devel .cvsignore, 1.23, 1.24 net-snmp.spec, 1.156,
	1.157 sources, 1.23, 1.24 net-snmp-5.4-64bit.patch, 1.3,
	NONE net-snmp-5.4-exec-crash.patch, 1.2,
	NONE net-snmp-5.4.1-hmac-check.patch, 1.2,
	NONE net-snmp-5.4.1-hostname.patch, 1.2,
	NONE net-snmp-5.4.1-perl-set.patch, 1.2,
	NONE net-snmp-5.4.1-perl-snprintf.patch, 1.2, NONE
Message-ID: <20080917143237.75E957013C@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26921

Modified Files:
	.cvsignore net-snmp.spec sources 
Removed Files:
	net-snmp-5.4-64bit.patch net-snmp-5.4-exec-crash.patch 
	net-snmp-5.4.1-hmac-check.patch net-snmp-5.4.1-hostname.patch 
	net-snmp-5.4.1-perl-set.patch 
	net-snmp-5.4.1-perl-snprintf.patch 
Log Message:
update to net-snmp-5.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	7 Aug 2007 12:33:35 -0000	1.23
+++ .cvsignore	17 Sep 2008 14:32:06 -0000	1.24
@@ -1 +1 @@
-net-snmp-5.4.1.tar.gz
+net-snmp-5.4.2.tar.gz


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- net-snmp.spec	16 Sep 2008 08:28:47 -0000	1.156
+++ net-snmp.spec	17 Sep 2008 14:32:07 -0000	1.157
@@ -3,12 +3,12 @@
 
 # Arches on which we need to prevent arch conflicts on net-snmp-config.h
 %define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64 sparc sparcv9 sparc64
-%define major_ver 5.4.1
+%define major_ver 5.4.2
 
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: %{major_ver}
-Release: 22%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 
 License: BSD and MIT
@@ -28,20 +28,14 @@
 Patch2: net-snmp-5.0.8-ipv6-sock-close.patch
 Patch3: net-snmp-5.0.8-readonly.patch
 Patch4: net-snmp-5.4.1-pie.patch
-Patch5: net-snmp-5.4-64bit.patch
-Patch6: net-snmp-5.1.2-dir-fix.patch
-Patch7: net-snmp-5.2.1-file_offset.patch
-Patch8: net-snmp-5.3.1-multilib.patch
-Patch9: net-snmp-5.4.1-config_libdir.patch
-Patch10: net-snmp-5.4.1-strange_libpath.patch
-Patch11: net-snmp-5.4.1-hostname.patch
-Patch12: net-snmp-5.4.1-shared-ip.patch
-Patch13: net-snmp-5.4-exec-crash.patch
-Patch14: net-snmp-5.4.1-sensors3.patch
-Patch15: net-snmp-5.4.1-xen-crash.patch
-Patch16: net-snmp-5.4.1-hmac-check.patch
-Patch17: net-snmp-5.4.1-perl-snprintf.patch
-Patch18: net-snmp-5.4.1-perl-set.patch
+Patch5: net-snmp-5.1.2-dir-fix.patch
+Patch6: net-snmp-5.2.1-file_offset.patch
+Patch7: net-snmp-5.3.1-multilib.patch
+Patch8: net-snmp-5.4.1-config_libdir.patch
+Patch9: net-snmp-5.4.1-strange_libpath.patch
+Patch10: net-snmp-5.4.1-shared-ip.patch
+Patch11: net-snmp-5.4.1-sensors3.patch
+Patch12: net-snmp-5.4.1-xen-crash.patch
 
 Requires(pre): chkconfig
 Requires(post): chkconfig
@@ -172,20 +166,14 @@
 %patch4 -p1 -b .pie
 %endif
 
-%patch5  -p1 -b .64bit
-%patch6 -p1 -b .dir-fix
-%patch7 -p1 -b .file_offset
-%patch8 -p1 -b .multilib
-%patch9 -p1 -b .libdir
-%patch10 -p1 -b .libpath
-%patch11 -p1 -b .hostname
-%patch12 -p1 -b .shared-ip
-%patch13 -p1 -b .exec
-%patch14 -p1 -b .sensors
-%patch15 -p1 -b .xen-crash
-%patch16 -p1 -b .hmac-check
-%patch17 -p1 -b .perl-snprintf
-%patch18 -p1 -b .perl-set
+%patch5 -p1 -b .dir-fix
+%patch6 -p1 -b .file_offset
+%patch7 -p1 -b .multilib
+%patch8 -p1 -b .libdir
+%patch9 -p1 -b .libpath
+%patch10 -p1 -b .shared-ip
+%patch11 -p1 -b .sensors
+%patch12 -p1 -b .xen-crash
 
 # Do this patch with a perl hack...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -417,6 +405,9 @@
 %{_libdir}/lib*.so.*
 
 %changelog
+* Wed Sep 17 2008 Jan Safranek <jsafranek at redhat.com> 5.4.2-1
+- update to net-snmp-5.4.2
+
 * Wed Sep 10 2008 John A. Khvatov <ivaxer at fedoraproject.org> 5.4.1-22
 - add net-snmp-python
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	7 Aug 2007 12:33:35 -0000	1.23
+++ sources	17 Sep 2008 14:32:07 -0000	1.24
@@ -1 +1 @@
-6c974df7a5a5b1579f72115e6b045bda  net-snmp-5.4.1.tar.gz
+2c97d0d99e1ec89d64f6713c069079ad  net-snmp-5.4.2.tar.gz


--- net-snmp-5.4-64bit.patch DELETED ---


--- net-snmp-5.4-exec-crash.patch DELETED ---


--- net-snmp-5.4.1-hmac-check.patch DELETED ---


--- net-snmp-5.4.1-hostname.patch DELETED ---


--- net-snmp-5.4.1-perl-set.patch DELETED ---


--- net-snmp-5.4.1-perl-snprintf.patch DELETED ---



From mmaslano at fedoraproject.org  Wed Sep 17 14:36:09 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 17 Sep 2008 14:36:09 +0000 (UTC)
Subject: rpms/perl/devel perl-5.10.0-ArchiveTar1.38.patch, NONE,
	1.1 perl.spec, 1.189, 1.190
Message-ID: <20080917143609.B4A427013C@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27542

Modified Files:
	perl.spec 
Added Files:
	perl-5.10.0-ArchiveTar1.38.patch 
Log Message:
* Wed Sep 17 2008 Marcela Maslanova <mmaslano at redhat.com> 4:5.10.0-44.fc10
- remove Tar.pm from Archive-Extract
- fix version of Test::Simple in spec
- update Test::Simple
- update Archive::Tar to 1.38


perl-5.10.0-ArchiveTar1.38.patch:

--- NEW FILE perl-5.10.0-ArchiveTar1.38.patch ---
diff -urN perl-5.10.0/lib/Archive/Tar.old/t/04_resolved_issues.t perl-5.10.0/lib/Archive/Tar/t/04_resolved_issues.t
--- perl-5.10.0/lib/Archive/Tar.old/t/04_resolved_issues.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/Archive/Tar/t/04_resolved_issues.t	2007-11-15 12:47:43.000000000 +0100
@@ -121,7 +121,6 @@
                                 "       Renamed to '$out_file'" );
     
     ### first, test with strict extract permissions on
-TODO:
     {   local $Archive::Tar::INSECURE_EXTRACT_MODE = 0;
 
         ### we quell the error on STDERR
@@ -135,20 +134,14 @@
         ok( ! -e $out_file,     "       File '$out_file' does not exist" );
     
         ok( $tar->error,        "       Error message stored" );
-
-        local $TODO = 'Exposed unrelated filespec handling bugs on VMS' if $^O eq 'VMS';
-
         like( $tar->error, qr/attempting to leave/,
                                 "           Proper violation detected" );
     }
     
     ### now disable those
-TODO:
     {   local $Archive::Tar::INSECURE_EXTRACT_MODE = 1;
         ok( 1,                  "   Extracting in insecure mode" );
     
-        local $TODO = 'Exposed unrelated filespec handling bugs on VMS' if $^O eq 'VMS';
-
         ok( $tar->extract_file( $out_file ),
                                 "       File extracted" );
         ok( -e $out_file,       "       File '$out_file' exists" );
diff -urN perl-5.10.0/lib/Archive/Tar.old/t/99_pod.t perl-5.10.0/lib/Archive/Tar/t/99_pod.t
--- perl-5.10.0/lib/Archive/Tar.old/t/99_pod.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/lib/Archive/Tar/t/99_pod.t	2007-03-06 15:30:04.000000000 +0100
@@ -0,0 +1,22 @@
+use Test::More;
+use File::Spec;
+use File::Find;
+use strict;
+
+BEGIN { chdir 't' if -d 't' };
+
+eval 'use Test::Pod';
+plan skip_all => "Test::Pod v0.95 required for testing POD"
+    if $@ || $Test::Pod::VERSION < 0.95;
+
+my @files;
+find( sub { push @files, File::Spec->catfile(
+                    File::Spec->splitdir( $File::Find::dir ), $_
+                ) if /\.p(?:l|m|od)$/ }, File::Spec->catdir(qw(.. blib lib) ));
+
+plan tests => scalar @files;
+for my $file ( @files ) {
+    pod_file_ok( $file );
+}
+
+


Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- perl.spec	17 Sep 2008 11:51:07 -0000	1.189
+++ perl.spec	17 Sep 2008 14:35:39 -0000	1.190
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        43%{?dist}
+Release:        44%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        The Perl programming language
 Group:          Development/Languages
@@ -88,6 +88,9 @@
 # 462444	update Test::Simple to 0.80
 Patch22:        perl-5.10.0-TestSimple0.80.patch
 
+# Archive::Tar update to 1.38 version
+Patch23:    perl-5.10.0-ArchiveTar1.38.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{perl_version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  tcsh, dos2unix, man, groff
 BuildRequires:  gdbm-devel, db4-devel, zlib-devel
@@ -241,8 +244,7 @@
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 Epoch:          0
-# It's really 1.37_01, but we drop the _01.
-Version:        1.37
+Version:        1.38
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 Requires:       perl(Compress::Zlib), perl(IO::Zlib)
 
@@ -818,6 +820,7 @@
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 #
 # Candidates for doc recoding (need case by case review):
@@ -1041,6 +1044,7 @@
 perl -x patchlevel.h 'Fedora Patch20: pos function handle unicode correct'
 perl -x patchlevel.h 'Fedora Patch21: CGI.pm bug in exists() on tied param hash'
 perl -x patchlevel.h 'Fedora Patch22: Update Test::Simple to 0.80'
+perl -x patchlevel.h 'Fedora Patch23: Update Archive::Tar 1.38'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1360,7 +1364,7 @@
 
 %files Archive-Extract
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/Archive/
+%{_prefix}/lib/perl5/%{perl_version}/Archive/Extract.pm
 %{_mandir}/man3/Archive::Extract.3*
 
 %files Archive-Tar
@@ -1649,7 +1653,10 @@
 # Old changelog entries are preserved in CVS.
 %changelog
 * Wed Sep 17 2008 Marcela Maslanova <mmaslano at redhat.com> 4:5.10.0-44.fc10
-- forgot to update versions in subpackages - Test::Simple and Test::Harness
+- remove Tar.pm from Archive-Extract
+- fix version of Test::Simple in spec
+- update Test::Simple
+- update Archive::Tar to 1.38
 
 * Tue Sep 16 2008 Marcela Maslanova <mmaslano at redhat.com> 4:5.10.0-43.fc10
 - 462444 update Test::Simple to 0.80



From mbarnes at fedoraproject.org  Wed Sep 17 14:42:29 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed, 17 Sep 2008 14:42:29 +0000 (UTC)
Subject: rpms/rarian/F-8 rarian.spec,1.11,1.12
Message-ID: <20080917144229.09FDB7013C@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/rarian/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28315

Modified Files:
	rarian.spec 
Log Message:

* Wed Sep 17 2008 Matthew Barnes <mbarnes at redhat.com> - 0.6.0-4
- Require libxml2 in %post and %posun (RH bug #433268).
- Silence xmlcatalog commands (RH bug #433315).



Index: rarian.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rarian/F-8/rarian.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rarian.spec	11 Feb 2008 19:48:41 -0000	1.11
+++ rarian.spec	17 Sep 2008 14:41:58 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name: rarian
 Version: 0.6.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Summary: Rarian is a documentation meta-data library
@@ -13,8 +13,10 @@
 
 ### Dependencies ###
 
-Requires: libxml2
+Requires(post): libxml2
+Requires(postun): libxml2
 # for /usr/bin/xmlcatalog
+
 Requires: libxslt
 # for /usr/bin/xsltproc
 Requires: coreutils, util-linux, gawk
@@ -83,10 +85,10 @@
 CATALOG=/etc/xml/catalog
 /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
   "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd" \
-  "/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $CATALOG
+  "/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $CATALOG >& /dev/null || :
 /usr/bin/xmlcatalog --noout --add "rewriteURI" \
   "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd" \
-  "/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $CATALOG
+  "/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $CATALOG >& /dev/null || :
 
 %postun -p /sbin/ldconfig
 
@@ -120,6 +122,10 @@
 %{_libdir}/pkgconfig/rarian.pc
 
 %changelog
+* Wed Sep 17 2008 Matthew Barnes <mbarnes at redhat.com> - 0.6.0-4
+- Require libxml2 in %%post and %%posun (RH bug #433268).
+- Silence xmlcatalog commands (RH bug #433315).
+
 * Mon Feb 11 2008 Matthew Barnes <mbarnes at redhat.com> - 0.6.0-3
 - Install XML DTD for scrollkeeper OMF files (RH bug #431088).
 



From tagoh at fedoraproject.org  Wed Sep 17 14:45:16 2008
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Wed, 17 Sep 2008 14:45:16 +0000 (UTC)
Subject: rpms/libgxim/devel .cvsignore, 1.3, 1.4 libgxim.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20080917144516.D8E8F7013C@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/libgxim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28997

Modified Files:
	.cvsignore libgxim.spec sources 
Log Message:
* Wed Sep 17 2008 Akira TAGOH <tagoh at redhat.com> - 0.2.0-1
- New upstream release.
  - Fix discarding some packets when reconnecting.
  - Fix invalid memory access.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgxim/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Aug 2008 13:51:01 -0000	1.3
+++ .cvsignore	17 Sep 2008 14:44:46 -0000	1.4
@@ -1,2 +1,3 @@
 libgxim-0.1.0.tar.bz2
 libgxim-0.1.1.tar.bz2
+libgxim-0.2.0.tar.bz2


Index: libgxim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgxim/devel/libgxim.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgxim.spec	29 Aug 2008 13:51:01 -0000	1.2
+++ libgxim.spec	17 Sep 2008 14:44:46 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		libgxim
-Version:	0.1.1
+Version:	0.2.0
 Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/libgxim/
@@ -76,6 +76,11 @@
 %{_includedir}/libgxim
 
 %changelog
+* Wed Sep 17 2008 Akira TAGOH <tagoh at redhat.com> - 0.2.0-1
+- New upstream release.
+  - Fix discarding some packets when reconnecting.
+  - Fix invalid memory access.
+
 * Fri Aug 29 2008 Akira TAGOH <tagoh at redhat.com> - 0.1.1-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgxim/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Aug 2008 13:51:01 -0000	1.3
+++ sources	17 Sep 2008 14:44:46 -0000	1.4
@@ -1 +1 @@
-25b60a94e485d731e3c742538cbbc6f3  libgxim-0.1.1.tar.bz2
+9f6557367c2cc7550622a0cdd5baef7d  libgxim-0.2.0.tar.bz2



From jsafrane at fedoraproject.org  Wed Sep 17 14:45:20 2008
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Wed, 17 Sep 2008 14:45:20 +0000 (UTC)
Subject: rpms/net-snmp/devel net-snmp-5.4.1-shared-ip.patch, 1.2,
	1.3 net-snmp.spec, 1.157, 1.158
Message-ID: <20080917144520.6787F7013C@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29083

Modified Files:
	net-snmp-5.4.1-shared-ip.patch net-snmp.spec 
Log Message:
rediff to new net-snmp version

net-snmp-5.4.1-shared-ip.patch:

Index: net-snmp-5.4.1-shared-ip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp-5.4.1-shared-ip.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- net-snmp-5.4.1-shared-ip.patch	25 Jul 2008 11:03:32 -0000	1.2
+++ net-snmp-5.4.1-shared-ip.patch	17 Sep 2008 14:45:20 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c.backup_patch_13 net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c
---- net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c.backup_patch_13	2007-05-17 23:53:28.000000000 +0200
-+++ net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c	2008-07-25 12:53:42.000000000 +0200
-@@ -272,11 +272,15 @@ _netsnmp_ioctl_ipaddress_container_load_
+diff -up net-snmp-5.4.2/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c.shared-ip net-snmp-5.4.2/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c
+--- net-snmp-5.4.2/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c.shared-ip	2008-01-17 01:09:33.000000000 +0100
++++ net-snmp-5.4.2/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c	2008-09-17 16:43:18.000000000 +0200
+@@ -279,11 +279,15 @@ _netsnmp_ioctl_ipaddress_container_load_
          /*
           * add entry to container
           */
@@ -21,10 +21,10 @@
          }
      }
  
-diff -up net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c.backup_patch_13 net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c
---- net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c.backup_patch_13	2006-09-15 02:48:50.000000000 +0200
-+++ net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c	2008-07-25 12:53:42.000000000 +0200
-@@ -324,7 +324,16 @@ _load_v6(netsnmp_container *container, i
+diff -up net-snmp-5.4.2/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c.shared-ip net-snmp-5.4.2/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c
+--- net-snmp-5.4.2/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c.shared-ip	2008-08-13 15:02:12.000000000 +0200
++++ net-snmp-5.4.2/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c	2008-09-17 16:43:18.000000000 +0200
+@@ -325,7 +325,16 @@ _load_v6(netsnmp_container *container, i
          /*
           * add entry to container
           */
@@ -42,11 +42,11 @@
      }
  
      fclose(in);
-diff -up net-snmp-5.4.1/include/net-snmp/library/container.h.backup_patch_13 net-snmp-5.4.1/include/net-snmp/library/container.h
---- net-snmp-5.4.1/include/net-snmp/library/container.h.backup_patch_13	2005-12-04 19:43:04.000000000 +0100
-+++ net-snmp-5.4.1/include/net-snmp/library/container.h	2008-07-25 12:53:42.000000000 +0200
-@@ -370,8 +370,32 @@ extern "C" {
-             }
+diff -up net-snmp-5.4.2/include/net-snmp/library/container.h.shared-ip net-snmp-5.4.2/include/net-snmp/library/container.h
+--- net-snmp-5.4.2/include/net-snmp/library/container.h.shared-ip	2008-02-14 00:37:48.000000000 +0100
++++ net-snmp-5.4.2/include/net-snmp/library/container.h	2008-09-17 16:43:18.000000000 +0200
+@@ -406,8 +406,32 @@ extern "C" {
+             
          }
          return rc;
 +    }    
@@ -79,10 +79,10 @@
      /*------------------------------------------------------------------
       * These functions should EXACTLY match the function version in
       * container.c. If you change one, change them both.
-diff -up net-snmp-5.4.1/snmplib/container.c.backup_patch_13 net-snmp-5.4.1/snmplib/container.c
---- net-snmp-5.4.1/snmplib/container.c.backup_patch_13	2006-08-25 11:41:06.000000000 +0200
-+++ net-snmp-5.4.1/snmplib/container.c	2008-07-25 12:53:42.000000000 +0200
-@@ -286,6 +286,29 @@ int CONTAINER_INSERT(netsnmp_container *
+diff -up net-snmp-5.4.2/snmplib/container.c.shared-ip net-snmp-5.4.2/snmplib/container.c
+--- net-snmp-5.4.2/snmplib/container.c.shared-ip	2008-02-14 00:37:48.000000000 +0100
++++ net-snmp-5.4.2/snmplib/container.c	2008-09-17 16:43:18.000000000 +0200
+@@ -323,6 +323,29 @@ int CONTAINER_REMOVE(netsnmp_container *
      return rc;
  }
  


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- net-snmp.spec	17 Sep 2008 14:32:07 -0000	1.157
+++ net-snmp.spec	17 Sep 2008 14:45:20 -0000	1.158
@@ -172,6 +172,7 @@
 %patch8 -p1 -b .libdir
 %patch9 -p1 -b .libpath
 %patch10 -p1 -b .shared-ip
+exit 1
 %patch11 -p1 -b .sensors
 %patch12 -p1 -b .xen-crash
 



From mdomsch at fedoraproject.org  Wed Sep 17 14:53:01 2008
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Wed, 17 Sep 2008 14:53:01 +0000 (UTC)
Subject: rpms/ruby-bdb/devel .cvsignore, 1.3, 1.4 ruby-bdb.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20080917145301.F2C7A7013C@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/ruby-bdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30462

Modified Files:
	.cvsignore ruby-bdb.spec sources 
Log Message:
update to 0.6.5, fix FTBFS BZ#434090


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Nov 2006 06:15:28 -0000	1.3
+++ .cvsignore	17 Sep 2008 14:52:31 -0000	1.4
@@ -1 +1 @@
-bdb-0.6.0.tar.gz
+bdb-0.6.5.tar.gz


Index: ruby-bdb.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/devel/ruby-bdb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ruby-bdb.spec	20 Jun 2008 22:33:45 -0000	1.4
+++ ruby-bdb.spec	17 Sep 2008 14:52:31 -0000	1.5
@@ -3,7 +3,7 @@
 %define        tarname bdb
 Summary:       Sleepycat Berkeley DB and DB XML
 Name:          ruby-bdb
-Version:       0.6.4
+Version:       0.6.5
 Release:       1%{?dist}
 License:       Ruby
 Group:         Development/Libraries
@@ -44,6 +44,9 @@
 %{ruby_sitearch}/bdb.so
 
 %changelog
+* Wed Sep 17 2008 Matt Domsch <mdomsch at fedoraproject.org> - 0.6.5-1
+- update to 0.6.5, fix FTBFS BZ#434090
+
 * Fri Jun 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.4-1
 - update to 0.6.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Jun 2008 22:33:45 -0000	1.4
+++ sources	17 Sep 2008 14:52:31 -0000	1.5
@@ -1 +1 @@
-7fafd2490fc5fdf6b5ae09b758fddfbb  bdb-0.6.4.tar.gz
+a6b1b04eede935f1de5327e365e350fa  bdb-0.6.5.tar.gz



From ajax at fedoraproject.org  Wed Sep 17 14:57:57 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 17 Sep 2008 14:57:57 +0000 (UTC)
Subject: rpms/libX11/devel libX11-1.1.4-xcb-xreply-leak.patch, NONE,
	1.1 libX11.spec, 1.46, 1.47
Message-ID: <20080917145757.ED33C7013C@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libX11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31483

Modified Files:
	libX11.spec 
Added Files:
	libX11-1.1.4-xcb-xreply-leak.patch 
Log Message:
* Wed Sep 17 2008 Adam Jackson <ajax at redhat.com> 1.1.4-3
- libX11-1.1.4-xcb-xreply-leak.patch: Fix a leak when the client has a
  non-fatal error handler. (mclasen, fdo #17616)


libX11-1.1.4-xcb-xreply-leak.patch:

--- NEW FILE libX11-1.1.4-xcb-xreply-leak.patch ---
--- libX11-1.1.4/src/xcb_io.c	2008-03-06 15:45:06.000000000 -0500
+++ hacked/src/xcb_io.c	2008-09-17 00:40:57.000000000 -0400
@@ -396,15 +396,18 @@
 				{
 					case X_LookupColor:
 					case X_AllocNamedColor:
+						free(error);
 						return 0;
 				}
 				break;
 			case BadFont:
 				if(err->majorCode == X_QueryFont)
+					free(error);
 					return 0;
 				break;
 			case BadAlloc:
 			case BadAccess:
+				free(error);
 				return 0;
 		}
 
@@ -413,10 +416,13 @@
 		 * want to suppress the error.
 		 */
 		for(ext = dpy->ext_procs; ext; ext = ext->next)
-			if(ext->error && ext->error(dpy, err, &ext->codes, &ret_code))
+			if(ext->error && ext->error(dpy, err, &ext->codes, &ret_code)) {
+				free(error);
 				return ret_code;
+			}
 
-		_XError(dpy, (xError *) error);
+		_XError(dpy, err);
+		free(error);
 		return 0;
 	}
 


Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- libX11.spec	15 Jul 2008 17:24:31 -0000	1.46
+++ libX11.spec	17 Sep 2008 14:57:27 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.1.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -15,6 +15,8 @@
 # manually confirm each patch hunk before removal.
 Patch2: dont-forward-keycode-0.patch
 
+Patch3: libX11-1.1.4-xcb-xreply-leak.patch
+
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
 BuildRequires: xorg-x11-proto-devel >= 7.1-2
@@ -54,6 +56,7 @@
 # find it later.
 #%patch0 -p0 -b .datadir-locale-dir-fix
 %patch2 -p1 -b .dont-forward-keycode-0
+%patch3 -p1 -b .xcb-xreply-leak
 
 %build
 %configure \
@@ -114,6 +117,10 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Sep 17 2008 Adam Jackson <ajax at redhat.com> 1.1.4-3
+- libX11-1.1.4-xcb-xreply-leak.patch: Fix a leak when the client has a
+  non-fatal error handler. (mclasen, fdo #17616)
+
 * Tue Jul 15 2008 Adam Jackson <ajax at redhat.com> 1.1.4-2
 - Fix license tag.
 



From alikins at fedoraproject.org  Wed Sep 17 14:58:38 2008
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 17 Sep 2008 14:58:38 +0000 (UTC)
Subject: rpms/certmaster/EL-4 .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 version,
	1.3, 1.4
Message-ID: <20080917145838.B55F27013C@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/certmaster/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31757/EL-4

Modified Files:
	.cvsignore sources version 
Log Message:
certmater 0.23 build 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Jun 2008 18:59:14 -0000	1.4
+++ .cvsignore	17 Sep 2008 14:58:08 -0000	1.5
@@ -1,3 +1,4 @@
 certmaster-0.18.tar.gz
 certmaster-0.19.tar.gz
 certmaster-0.20.tar.gz
+certmaster-0.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Jun 2008 18:59:14 -0000	1.5
+++ sources	17 Sep 2008 14:58:08 -0000	1.6
@@ -1,3 +1,4 @@
 d661004b7eb0c7b43f57f0a510232bd2  certmaster-0.18.tar.gz
 4eaa9876b0c158dcf2f099b330f0eeb6  certmaster-0.19.tar.gz
 470c450b3c5adbbeae3d154cb9de495c  certmaster-0.20.tar.gz
+884faef5a2da2f5b4e8bd6782d28a284  certmaster-0.23.tar.gz


Index: version
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/EL-4/version,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- version	30 Jun 2008 18:59:14 -0000	1.3
+++ version	17 Sep 2008 14:58:08 -0000	1.4
@@ -1 +1 @@
-0.20 2 
+0.23 1 



From alikins at fedoraproject.org  Wed Sep 17 14:58:38 2008
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 17 Sep 2008 14:58:38 +0000 (UTC)
Subject: rpms/certmaster/EL-5 .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 version,
	1.3, 1.4
Message-ID: <20080917145838.E0D5B7013C@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/certmaster/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31757/EL-5

Modified Files:
	.cvsignore sources version 
Log Message:
certmater 0.23 build 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Jun 2008 18:59:48 -0000	1.4
+++ .cvsignore	17 Sep 2008 14:58:08 -0000	1.5
@@ -1,3 +1,4 @@
 certmaster-0.18.tar.gz
 certmaster-0.19.tar.gz
 certmaster-0.20.tar.gz
+certmaster-0.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Jun 2008 18:59:48 -0000	1.5
+++ sources	17 Sep 2008 14:58:08 -0000	1.6
@@ -1,3 +1,4 @@
 d661004b7eb0c7b43f57f0a510232bd2  certmaster-0.18.tar.gz
 4eaa9876b0c158dcf2f099b330f0eeb6  certmaster-0.19.tar.gz
 470c450b3c5adbbeae3d154cb9de495c  certmaster-0.20.tar.gz
+884faef5a2da2f5b4e8bd6782d28a284  certmaster-0.23.tar.gz


Index: version
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/EL-5/version,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- version	30 Jun 2008 18:59:48 -0000	1.3
+++ version	17 Sep 2008 14:58:08 -0000	1.4
@@ -1 +1 @@
-0.20 2 
+0.23 1 



From alikins at fedoraproject.org  Wed Sep 17 14:58:39 2008
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 17 Sep 2008 14:58:39 +0000 (UTC)
Subject: rpms/certmaster/F-8 .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 version, 
	1.3, 1.4
Message-ID: <20080917145839.4FFF47013C@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/certmaster/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31757/F-8

Modified Files:
	.cvsignore sources version 
Log Message:
certmater 0.23 build 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Jun 2008 19:00:04 -0000	1.4
+++ .cvsignore	17 Sep 2008 14:58:09 -0000	1.5
@@ -1,3 +1,4 @@
 certmaster-0.18.tar.gz
 certmaster-0.19.tar.gz
 certmaster-0.20.tar.gz
+certmaster-0.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Jun 2008 19:00:04 -0000	1.5
+++ sources	17 Sep 2008 14:58:09 -0000	1.6
@@ -1,3 +1,4 @@
 d661004b7eb0c7b43f57f0a510232bd2  certmaster-0.18.tar.gz
 4eaa9876b0c158dcf2f099b330f0eeb6  certmaster-0.19.tar.gz
 470c450b3c5adbbeae3d154cb9de495c  certmaster-0.20.tar.gz
+884faef5a2da2f5b4e8bd6782d28a284  certmaster-0.23.tar.gz


Index: version
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/F-8/version,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- version	30 Jun 2008 19:00:04 -0000	1.3
+++ version	17 Sep 2008 14:58:09 -0000	1.4
@@ -1 +1 @@
-0.20 2 
+0.23 1 



From alikins at fedoraproject.org  Wed Sep 17 14:58:39 2008
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 17 Sep 2008 14:58:39 +0000 (UTC)
Subject: rpms/certmaster/F-7 .cvsignore, 1.3, 1.4 certmaster.spec, 1.3,
	1.4 sources, 1.4, 1.5 version, 1.2, 1.3
Message-ID: <20080917145839.255677013C@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/certmaster/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31757/F-7

Modified Files:
	.cvsignore certmaster.spec sources version 
Log Message:
certmater 0.23 build 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Mar 2008 20:17:01 -0000	1.3
+++ .cvsignore	17 Sep 2008 14:58:08 -0000	1.4
@@ -1,2 +1,3 @@
 certmaster-0.18.tar.gz
 certmaster-0.19.tar.gz
+certmaster-0.23.tar.gz


Index: certmaster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/F-7/certmaster.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- certmaster.spec	7 Mar 2008 20:17:01 -0000	1.3
+++ certmaster.spec	17 Sep 2008 14:58:08 -0000	1.4
@@ -60,13 +60,15 @@
 %config(noreplace) /etc/certmaster/certmaster.conf
 %config(noreplace) /etc/logrotate.d/certmaster_rotate
 %dir %{python_sitelib}/certmaster
-%dir %{python_sitelib}/certmaster/minion
-%dir %{python_sitelib}/certmaster/overlord
-%{python_sitelib}/certmaster/minion/*.py*
-%{python_sitelib}/certmaster/overlord/*.py*
 %{python_sitelib}/certmaster/*.py*
 %dir /var/log/certmaster
 %dir /var/lib/certmaster
+%dir /var/lib/certmaster/triggers/sign/pre
+%dir /var/lib/certmaster/triggers/sign/post
+%dir /var/lib/certmaster/triggers/request/pre
+%dir /var/lib/certmaster/triggers/request/post
+%dir /var/lib/certmaster/triggers/remove/pre
+%dir /var/lib/certmaster/triggers/remove/post
 %doc AUTHORS README LICENSE
 %{_mandir}/man1/*.1.gz
 
@@ -84,7 +86,7 @@
         ln -sf /etc/init.d/certmaster /etc/rc.d/rc${i}.d/S99certmaster
    done
    for i in 1 6; do
-        ln -sf /etc/init.d/certmaster /etc/rc.d/rc${i}.d/S99certmaster
+        ln -sf /etc/init.d/certmaster /etc/rc.d/rc${i}.d/k01certmaster
    done
 fi
 exit 0
@@ -103,12 +105,23 @@
 
 
 %changelog
-* Fri Mar 07 2008 Michael DeHaan <mdehaan at redhat.com> - 0.19-1
-- release bump 
+* Mon Jun 6 2008 Adrian Likins <alikins at redhat.com> - 0.20-2
+- fix fedora bug #441283 - typo in postinstall scriptlet
+  (the init.d symlinks for runlevels 1 and 6 were created wrong)
+
+* Tue Apr 15 2008 Michael DeHaan <mdehaan at redhat.com> - 0.20-1
+- new release
+- fix changelog versions
+
+* Tue Apr 15 2008 Steve Salevan <ssalevan at redhat.com> - 0.19-3
+- added in trigger directories
+
+* Mon Mar 17 2008 Adrian Likins <alikins at redhat.com> - 0.19-2
+- removed unused minion/ and overlord/ dirs
 
-* Mon Feb 25 2008 Adrian Likins <alikins at redhat.com> - 0.1-1
+* Mon Feb 25 2008 Adrian Likins <alikins at redhat.com> - 0.19-1
 - remove certmasterd references
 
-* Thu Feb 7 2008 Michael DeHaan <mdehaan at redhat.com> - 0.1-1
+* Thu Feb 7 2008 Michael DeHaan <mdehaan at redhat.com> - 0.18-1
 - initial version, split off from func project, WIP
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Mar 2008 20:17:01 -0000	1.4
+++ sources	17 Sep 2008 14:58:08 -0000	1.5
@@ -1,2 +1,3 @@
 d661004b7eb0c7b43f57f0a510232bd2  certmaster-0.18.tar.gz
 4eaa9876b0c158dcf2f099b330f0eeb6  certmaster-0.19.tar.gz
+884faef5a2da2f5b4e8bd6782d28a284  certmaster-0.23.tar.gz


Index: version
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/F-7/version,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- version	7 Mar 2008 20:17:01 -0000	1.2
+++ version	17 Sep 2008 14:58:08 -0000	1.3
@@ -1 +1 @@
-0.19 1
+0.23 1 



From alikins at fedoraproject.org  Wed Sep 17 14:58:39 2008
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 17 Sep 2008 14:58:39 +0000 (UTC)
Subject: rpms/certmaster/devel .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 version,
	1.3, 1.4
Message-ID: <20080917145839.B66857013C@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/certmaster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31757/devel

Modified Files:
	.cvsignore sources version 
Log Message:
certmater 0.23 build 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Jun 2008 19:00:49 -0000	1.4
+++ .cvsignore	17 Sep 2008 14:58:09 -0000	1.5
@@ -1,3 +1,4 @@
 certmaster-0.18.tar.gz
 certmaster-0.19.tar.gz
 certmaster-0.20.tar.gz
+certmaster-0.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Jun 2008 19:00:49 -0000	1.5
+++ sources	17 Sep 2008 14:58:09 -0000	1.6
@@ -1,3 +1,4 @@
 d661004b7eb0c7b43f57f0a510232bd2  certmaster-0.18.tar.gz
 4eaa9876b0c158dcf2f099b330f0eeb6  certmaster-0.19.tar.gz
 470c450b3c5adbbeae3d154cb9de495c  certmaster-0.20.tar.gz
+884faef5a2da2f5b4e8bd6782d28a284  certmaster-0.23.tar.gz


Index: version
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/devel/version,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- version	30 Jun 2008 19:00:49 -0000	1.3
+++ version	17 Sep 2008 14:58:09 -0000	1.4
@@ -1 +1 @@
-0.20 2 
+0.23 1 



From alikins at fedoraproject.org  Wed Sep 17 14:58:39 2008
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 17 Sep 2008 14:58:39 +0000 (UTC)
Subject: rpms/certmaster/F-9 .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 version, 
	1.3, 1.4
Message-ID: <20080917145839.86E757013C@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/certmaster/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31757/F-9

Modified Files:
	.cvsignore sources version 
Log Message:
certmater 0.23 build 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Jun 2008 19:00:23 -0000	1.4
+++ .cvsignore	17 Sep 2008 14:58:09 -0000	1.5
@@ -1,3 +1,4 @@
 certmaster-0.18.tar.gz
 certmaster-0.19.tar.gz
 certmaster-0.20.tar.gz
+certmaster-0.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Jun 2008 19:00:23 -0000	1.5
+++ sources	17 Sep 2008 14:58:09 -0000	1.6
@@ -1,3 +1,4 @@
 d661004b7eb0c7b43f57f0a510232bd2  certmaster-0.18.tar.gz
 4eaa9876b0c158dcf2f099b330f0eeb6  certmaster-0.19.tar.gz
 470c450b3c5adbbeae3d154cb9de495c  certmaster-0.20.tar.gz
+884faef5a2da2f5b4e8bd6782d28a284  certmaster-0.23.tar.gz


Index: version
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/F-9/version,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- version	30 Jun 2008 19:00:23 -0000	1.3
+++ version	17 Sep 2008 14:58:09 -0000	1.4
@@ -1 +1 @@
-0.20 2 
+0.23 1 



From tbzatek at fedoraproject.org  Wed Sep 17 15:00:01 2008
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Wed, 17 Sep 2008 15:00:01 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs.spec,1.77,1.78
Message-ID: <20080917150001.CE6457013C@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32654

Modified Files:
	gvfs.spec 
Log Message:
* Wed Sep 17 2008 Tomas Bzatek <tbzatek at redhat.com>  - 0.99.8-4
- Actually apply the kerberos patch



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- gvfs.spec	16 Sep 2008 15:49:01 -0000	1.77
+++ gvfs.spec	17 Sep 2008 14:59:31 -0000	1.78
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 0.99.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -117,6 +117,7 @@
 %setup -q
 %patch1 -p0 -b .archive-integration
 %patch2 -p0 -b .bluez-ods
+%patch3 -p0 -b .kerberos
 
 %build
 
@@ -254,6 +255,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Tomas Bzatek <tbzatek at redhat.com>  - 0.99.8-4
+- Actually apply the kerberos patch
+
 * Tue Sep 16 2008 Tomas Bzatek <tbzatek at redhat.com>  - 0.99.8-3
 - SMB: Fix kerberos authentication
 



From gdesmott at fedoraproject.org  Wed Sep 17 15:01:06 2008
From: gdesmott at fedoraproject.org (Guillaume Desmottes)
Date: Wed, 17 Sep 2008 15:01:06 +0000 (UTC)
Subject: rpms/telepathy-salut/OLPC-3 fix-activity-announce.patch, NONE,
	1.1 telepathy-salut.spec, 1.25, 1.26
Message-ID: <20080917150106.2713B7013C@cvs1.fedora.phx.redhat.com>

Author: gdesmott

Update of /cvs/pkgs/rpms/telepathy-salut/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv528

Modified Files:
	telepathy-salut.spec 
Added Files:
	fix-activity-announce.patch 
Log Message:
Backport patch from upstream fixing OLPC activity announcements (#8441)

fix-activity-announce.patch:

--- NEW FILE fix-activity-announce.patch ---
diff --git a/src/salut-avahi-olpc-activity.c b/src/salut-avahi-olpc-activity.c
index 702d55b..adaaeb6 100644
--- a/src/salut-avahi-olpc-activity.c
+++ b/src/salut-avahi-olpc-activity.c
@@ -125,7 +125,12 @@ update_activity_service (SalutAvahiOlpcActivity *self,
       self);
   GError *err = NULL;
 
-  g_return_val_if_fail (activity_is_announced (self), FALSE);
+  if (!activity_is_announced (self))
+    {
+      g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+        "Trying to update an activity that's not announced");
+      return FALSE;
+    }
 
   ga_entry_group_service_freeze (priv->service);
 
@@ -217,7 +222,10 @@ salut_avahi_olpc_activity_stop_announce (SalutOlpcActivity *activity)
   SalutAvahiOlpcActivityPrivate *priv = SALUT_AVAHI_OLPC_ACTIVITY_GET_PRIVATE (
       self);
 
-  g_return_if_fail (activity_is_announced (self));
+  /* Announcing the activity could have failed, so check if we're actually
+   * announcing it */
+  if (!activity_is_announced (self))
+    return;
 
   g_object_unref (priv->group);
   priv->group = NULL;
diff --git a/src/salut-olpc-activity.c b/src/salut-olpc-activity.c
index 71e4aeb..d9d9cf7 100644
--- a/src/salut-olpc-activity.c
+++ b/src/salut-olpc-activity.c
@@ -374,6 +374,7 @@ resend_invite (SalutOlpcActivity *self)
 static void
 activity_changed (SalutOlpcActivity *self)
 {
+  SalutOlpcActivityPrivate *priv = SALUT_OLPC_ACTIVITY_GET_PRIVATE (self);
   GError *error = NULL;
 
   if (!send_properties_change_msg (self, &error))
@@ -383,7 +384,7 @@ activity_changed (SalutOlpcActivity *self)
       error = NULL;
     }
 
-  if (!self->is_private)
+  if (!self->is_private && priv->muc != NULL)
     {
       /* update announcement */
       if (!SALUT_OLPC_ACTIVITY_GET_CLASS (self)->update (self, &error))
@@ -430,6 +431,7 @@ salut_olpc_activity_update (SalutOlpcActivity *self,
                             const gchar *tags,
                             gboolean is_private)
 {
+  SalutOlpcActivityPrivate *priv = SALUT_OLPC_ACTIVITY_GET_PRIVATE (self);
   TpBaseConnection *base_conn = (TpBaseConnection *) (self->connection);
   TpHandleRepoIface *room_repo = tp_base_connection_get_handles (base_conn,
        TP_HANDLE_TYPE_ROOM);
@@ -491,19 +493,22 @@ salut_olpc_activity_update (SalutOlpcActivity *self,
       self->is_private = is_private;
       changed = TRUE;
 
-      if (is_private)
+      if (priv->muc != NULL)
         {
-          DEBUG ("activity is not public anymore. Stop to announce it");
-          salut_olpc_activity_stop_announce (self);
-        }
-      else
-        {
-          DEBUG ("activity becomes public. Announce it");
-          if (!salut_olpc_activity_announce (self, &error))
+          if (is_private)
+            {
+              DEBUG ("activity is not public anymore. Stop to announce it");
+              salut_olpc_activity_stop_announce (self);
+            }
+          else
             {
-              DEBUG ("activity announce failed: %s", error->message);
-              g_error_free (error);
-              error = NULL;
+              DEBUG ("activity becomes public. Announce it");
+             if (!salut_olpc_activity_announce (self, &error))
+               {
+                 DEBUG ("activity announce failed: %s", error->message);
+                 g_error_free (error);
+                  error = NULL;
+               }
             }
         }
     }
@@ -562,6 +567,13 @@ salut_olpc_activity_joined (SalutOlpcActivity *self,
       return FALSE;
     }
 
+  if (!self->is_private)
+    {
+      /* This might fail but that doesn't prevent us from joining the
+       * activity.. */
+      salut_olpc_activity_announce (self, NULL);
+    }
+
   g_signal_connect (priv->muc, "closed", G_CALLBACK (muc_channel_closed_cb),
       self);
 
@@ -576,6 +588,9 @@ salut_olpc_activity_left (SalutOlpcActivity *self)
   if (priv->muc == NULL)
     return;
 
+  if (!self->is_private)
+    salut_olpc_activity_stop_announce (self);
+
   g_object_unref (priv->muc);
   g_signal_handlers_disconnect_matched (priv->muc, G_SIGNAL_MATCH_DATA,
       0, 0, NULL, NULL, self);


Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-3/telepathy-salut.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- telepathy-salut.spec	25 Aug 2008 09:01:02 -0000	1.25
+++ telepathy-salut.spec	17 Sep 2008 15:00:35 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           telepathy-salut
 Version:        0.3.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
 Group:          Applications/Communications
@@ -10,6 +10,7 @@
 Patch0:         salut-olpc-no-dbus-uid-check.patch
 Patch1:         salut-chmod-unix-socket.patch
 Patch2:         use-tp_debug_divert_messages.patch
+Patch3:         fix-activity-announce.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel >= 1.1.0
@@ -38,6 +39,7 @@
 %patch0 -p1 -b .dbus-uid
 %patch1 -p1 -b .chmod-socket
 %patch2 -p1 -b .divert-messages
+%patch3 -p0 -b .fix-announce
 
 
 %build
@@ -65,6 +67,9 @@
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Wed Sep 17 2008 Guillaume Desmottes <guillaume.desmottes at collabora.co.uk> - 0.3.3-7
+- Backport patch from upstream fixing OLPC activity announcements (#8441)
+
 * Mon Aug 25 2008 Guillaume Desmottes <guillaume.desmottes at collabora.co.uk> - 0.3.3-6
 - Fix use-tp_debug_divert_messages.patch
 - Bump telepathy-glib version to 0.7.1 as use-tp_debug_divert_messages.patch needs it



From gdesmott at fedoraproject.org  Wed Sep 17 15:07:54 2008
From: gdesmott at fedoraproject.org (Guillaume Desmottes)
Date: Wed, 17 Sep 2008 15:07:54 +0000 (UTC)
Subject: rpms/telepathy-salut/OLPC-3 telepathy-salut.spec,1.26,1.27
Message-ID: <20080917150754.BC7A97013C@cvs1.fedora.phx.redhat.com>

Author: gdesmott

Update of /cvs/pkgs/rpms/telepathy-salut/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1498

Modified Files:
	telepathy-salut.spec 
Log Message:
Properly apply the fix-announce-activity patch


Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-3/telepathy-salut.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- telepathy-salut.spec	17 Sep 2008 15:00:35 -0000	1.26
+++ telepathy-salut.spec	17 Sep 2008 15:07:24 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           telepathy-salut
 Version:        0.3.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
 Group:          Applications/Communications
@@ -39,7 +39,7 @@
 %patch0 -p1 -b .dbus-uid
 %patch1 -p1 -b .chmod-socket
 %patch2 -p1 -b .divert-messages
-%patch3 -p0 -b .fix-announce
+%patch3 -p1 -b .fix-announce
 
 
 %build
@@ -67,6 +67,9 @@
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* * Wed Sep 17 2008 Guillaume Desmottes <guillaume.desmottes at collabora.co.uk> - 0.3.3-8
+- Properly apply the fix-announce-activity patch
+
 * Wed Sep 17 2008 Guillaume Desmottes <guillaume.desmottes at collabora.co.uk> - 0.3.3-7
 - Backport patch from upstream fixing OLPC activity announcements (#8441)
 



From gdesmott at fedoraproject.org  Wed Sep 17 15:10:14 2008
From: gdesmott at fedoraproject.org (Guillaume Desmottes)
Date: Wed, 17 Sep 2008 15:10:14 +0000 (UTC)
Subject: rpms/telepathy-salut/OLPC-3 telepathy-salut.spec,1.27,1.28
Message-ID: <20080917151014.6A0E57013C@cvs1.fedora.phx.redhat.com>

Author: gdesmott

Update of /cvs/pkgs/rpms/telepathy-salut/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1961

Modified Files:
	telepathy-salut.spec 
Log Message:
fix typo in changelog date


Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-3/telepathy-salut.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- telepathy-salut.spec	17 Sep 2008 15:07:24 -0000	1.27
+++ telepathy-salut.spec	17 Sep 2008 15:09:44 -0000	1.28
@@ -67,7 +67,7 @@
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
-* * Wed Sep 17 2008 Guillaume Desmottes <guillaume.desmottes at collabora.co.uk> - 0.3.3-8
+* Wed Sep 17 2008 Guillaume Desmottes <guillaume.desmottes at collabora.co.uk> - 0.3.3-8
 - Properly apply the fix-announce-activity patch
 
 * Wed Sep 17 2008 Guillaume Desmottes <guillaume.desmottes at collabora.co.uk> - 0.3.3-7



From tagoh at fedoraproject.org  Wed Sep 17 14:53:06 2008
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Wed, 17 Sep 2008 14:53:06 +0000 (UTC)
Subject: rpms/imsettings/devel .cvsignore, 1.7, 1.8 imsettings.spec, 1.10,
	1.11 sources, 1.6, 1.7 imsettings-r147.patch, 1.1, NONE
Message-ID: <20080917145306.B37A37013C@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30513

Modified Files:
	.cvsignore imsettings.spec sources 
Removed Files:
	imsettings-r147.patch 
Log Message:
* Wed Sep 17 2008 Akira TAGOH <tagoh at redhat.com> - 0.104.0-1
- New upstream release.
  - Fix deadkey issue under XIM. (#457901)
  - Correct .desktop file for imsettings-applet (#460695)
  - Hide a status icon by default. (#460703)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Aug 2008 14:02:04 -0000	1.7
+++ .cvsignore	17 Sep 2008 14:52:36 -0000	1.8
@@ -6,3 +6,4 @@
 imsettings-0.101.3.tar.bz2
 imsettings-0.102.0.tar.bz2
 imsettings-0.103.0.tar.bz2
+imsettings-0.104.0.tar.bz2


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- imsettings.spec	29 Aug 2008 14:02:04 -0000	1.10
+++ imsettings.spec	17 Sep 2008 14:52:36 -0000	1.11
@@ -1,19 +1,18 @@
 Name:		imsettings
-Version:	0.103.0
+Version:	0.104.0
 Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	intltool gettext
 BuildRequires:	dbus-devel >= 0.23, dbus-glib-devel >= 0.74, glib2 >= 2.16
-BuildRequires:	libgxim-devel libnotify-devel
+BuildRequires:	libgxim-devel >= 0.2.0, libnotify-devel
 BuildRequires:	xfce-mcs-manager-devel libxfce4mcs-devel
 BuildRequires:	GConf2-devel
 BuildRequires:	libX11-devel
 Source0:	http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-disable-xim.patch
-Patch2:		imsettings-r147.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -77,7 +76,6 @@
 %setup -q
 %patch0 -p1 -b .0-lang
 #%%patch1 -p1 -b .1-xim
-%patch2 -p0 -b .1-applet
 
 %build
 %configure	\
@@ -144,6 +142,7 @@
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/libimsettings.so.*
 %{_libdir}/libimsettings-xim.so.*
+%{_libdir}/libimsettings-xsettings.so.*
 
 %files	devel
 %defattr(-, root, root, -)
@@ -151,6 +150,7 @@
 %{_includedir}/imsettings
 %{_libdir}/libimsettings.so
 %{_libdir}/libimsettings-xim.so
+%{_libdir}/libimsettings-xsettings.so
 %{_libdir}/pkgconfig/imsettings.pc
 
 %files	xfce
@@ -160,6 +160,12 @@
 
 
 %changelog
+* Wed Sep 17 2008 Akira TAGOH <tagoh at redhat.com> - 0.104.0-1
+- New upstream release.
+  - Fix deadkey issue under XIM. (#457901)
+  - Correct .desktop file for imsettings-applet (#460695)
+  - Hide a status icon by default. (#460703)
+
 * Fri Aug 29 2008 Akira TAGOH <tagoh at redhat.com> - 0.103.0-1
 - New upstream release.
   - im-xsettings-daemon doesn't run automatically. (#459443)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Aug 2008 14:02:04 -0000	1.6
+++ sources	17 Sep 2008 14:52:36 -0000	1.7
@@ -1 +1 @@
-dfd0e6a2e07a4a862a4f1a0e9ba4541b  imsettings-0.103.0.tar.bz2
+9f4d176e3b87675b54863f7e042ff06c  imsettings-0.104.0.tar.bz2


--- imsettings-r147.patch DELETED ---



From rstrode at fedoraproject.org  Wed Sep 17 15:15:39 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed, 17 Sep 2008 15:15:39 +0000 (UTC)
Subject: rpms/gdm/devel gdm-2.23.92-another-locale-fixup.patch, NONE,
	1.1 gdm-2.23.92-filter-dupes-from-lang-list.patch, NONE,
	1.1 gdm.spec, 1.416, 1.417
Message-ID: <20080917151539.D75677013E@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3220

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.23.92-another-locale-fixup.patch 
	gdm-2.23.92-filter-dupes-from-lang-list.patch 
Log Message:
- canonicalize codeset to match output of locale -m
- filter duplicates from language list


gdm-2.23.92-another-locale-fixup.patch:

--- NEW FILE gdm-2.23.92-another-locale-fixup.patch ---
--- gdm/gui/simple-greeter/gdm-languages.c	(revision 6468)
+++ gdm/gui/simple-greeter/gdm-languages.c	(working copy)
@@ -216,6 +216,25 @@ construct_language_name (const char *lan
         return name;
 }
 
+static void
+make_codeset_canonical_for_locale (const       *name,
+                                   const char **codeset)
+{
+        char *old_locale;
+        char *canonical_codeset;
+
+        old_locale = setlocale (LC_CTYPE, name);
+
+        if (old_locale == NULL) {
+                return;
+        }
+
+        g_free (*codeset);
+        *codeset = g_strdup (nl_langinfo (CODESET));
+
+        setlocale (LC_CTYPE, old_locale);
+}
+
 char *
 gdm_normalize_language_name (const char *name)
 {
@@ -234,6 +253,10 @@ gdm_normalize_language_name (const char 
                                  &territory_code,
                                  &codeset, &modifier);
 
+        if (codeset != NULL) {
+                make_codeset_canonical_for_locale (name, &codeset);
+        }
+
         normalized_name = construct_language_name (language_code,
                                                    territory_code,
                                                    codeset, modifier);

gdm-2.23.92-filter-dupes-from-lang-list.patch:

--- NEW FILE gdm-2.23.92-filter-dupes-from-lang-list.patch ---
diff -up gdm-2.23.92/gui/simple-greeter/gdm-language-option-widget.c.filter-dupes-from-lang-list gdm-2.23.92/gui/simple-greeter/gdm-language-option-widget.c
--- gdm-2.23.92/gui/simple-greeter/gdm-language-option-widget.c.filter-dupes-from-lang-list	2008-08-26 15:04:00.000000000 -0400
+++ gdm-2.23.92/gui/simple-greeter/gdm-language-option-widget.c	2008-09-17 11:07:51.000000000 -0400
@@ -173,7 +173,7 @@ gdm_language_option_widget_class_init (G
         g_type_class_add_private (klass, sizeof (GdmLanguageOptionWidgetPrivate));
 }
 
-static gboolean
+static char *
 gdm_language_option_widget_lookup_item (GdmRecentOptionWidget *widget,
                                         const char            *locale,
                                         char                 **name,
@@ -182,11 +182,15 @@ gdm_language_option_widget_lookup_item (
         char *language;
         char *readable_language;
         char *lang_tag;
+        char *normalized_locale;
 
-        language = gdm_get_language_from_name (locale, locale);
+        normalized_locale = gdm_normalize_language_name (locale);
+
+        language = gdm_get_language_from_name (locale, normalized_locale);
 
         if (language == NULL) {
-                return FALSE;
+                g_free (normalized_locale);
+                return NULL;
         }
 
         readable_language = gdm_get_language_from_name (locale, NULL);
@@ -197,7 +201,7 @@ gdm_language_option_widget_lookup_item (
         g_free (language);
         g_free (lang_tag);
 
-        return TRUE;
+        return normalized_locale;
 }
 
 static void
@@ -294,7 +298,7 @@ gdm_language_option_widget_set_current_l
 
         if (normalized_language_name != NULL &&
             !gdm_option_widget_lookup_item (GDM_OPTION_WIDGET (widget),
-                                            normalized_language_name, NULL, NULL, NULL)) {
+                                            &normalized_language_name, NULL, NULL, NULL)) {
                 gdm_recent_option_widget_add_item (GDM_RECENT_OPTION_WIDGET (widget),
                                                    normalized_language_name);
         }
diff -up gdm-2.23.92/gui/simple-greeter/gdm-layout-option-widget.c.filter-dupes-from-lang-list gdm-2.23.92/gui/simple-greeter/gdm-layout-option-widget.c
--- gdm-2.23.92/gui/simple-greeter/gdm-layout-option-widget.c.filter-dupes-from-lang-list	2008-09-17 10:55:20.000000000 -0400
+++ gdm-2.23.92/gui/simple-greeter/gdm-layout-option-widget.c	2008-09-17 11:08:07.000000000 -0400
@@ -176,24 +176,24 @@ gdm_layout_option_widget_class_init (Gdm
         g_type_class_add_private (klass, sizeof (GdmLayoutOptionWidgetPrivate));
 }
 
-static gboolean
+static char *
 gdm_layout_option_widget_lookup_item (GdmRecentOptionWidget *widget,
-                                      const char            *id,
+                                      const char            *key,
                                       char                 **name,
                                       char                 **comment)
 {
         char *layout;
 
-        layout = gdm_get_layout_from_name (id);
+        layout = gdm_get_layout_from_name (key);
 
         if (layout == NULL) {
-                return FALSE;
+                return NULL;
         }
 
         *name = layout;
         *comment = NULL;
 
-        return TRUE;
+        return g_strdup (key);
 }
 
 static void
diff -up gdm-2.23.92/gui/simple-greeter/gdm-recent-option-widget.c.filter-dupes-from-lang-list gdm-2.23.92/gui/simple-greeter/gdm-recent-option-widget.c
--- gdm-2.23.92/gui/simple-greeter/gdm-recent-option-widget.c.filter-dupes-from-lang-list	2008-08-26 15:04:00.000000000 -0400
+++ gdm-2.23.92/gui/simple-greeter/gdm-recent-option-widget.c	2008-09-17 11:06:34.000000000 -0400
@@ -159,13 +159,24 @@ gdm_recent_option_widget_sync_items_from
         default_is_set = FALSE;
 
         for (tmp = list; tmp != NULL; tmp = tmp->next) {
-                const char *id;
+                const char *key;
+                char       *id;
                 char       *name;
                 char       *comment;
 
-                id = (char *) tmp->data;
+                key = (char *) tmp->data;
+
+                id = widget->priv->lookup_item_func (widget, key, &name, &comment);
+
+                if (id != NULL) {
+                        gboolean item_exists;
+
+                        item_exists = gdm_option_widget_lookup_item (GDM_OPTION_WIDGET (widget), id, NULL, NULL, NULL);
+
+                        if (item_exists) {
+                                continue;
+                        }
 
-                if (widget->priv->lookup_item_func (widget, id, &name, &comment)) {
                         gdm_option_widget_add_item (GDM_OPTION_WIDGET (widget),
                                                     id, name, comment,
                                                     GDM_OPTION_WIDGET_POSITION_MIDDLE);
@@ -177,6 +188,7 @@ gdm_recent_option_widget_sync_items_from
 
                         g_free (name);
                         g_free (comment);
+                        g_free (id);
                 }
         }
 
diff -up gdm-2.23.92/gui/simple-greeter/gdm-recent-option-widget.h.filter-dupes-from-lang-list gdm-2.23.92/gui/simple-greeter/gdm-recent-option-widget.h
--- gdm-2.23.92/gui/simple-greeter/gdm-recent-option-widget.h.filter-dupes-from-lang-list	2008-08-26 15:04:00.000000000 -0400
+++ gdm-2.23.92/gui/simple-greeter/gdm-recent-option-widget.h	2008-09-17 11:07:40.000000000 -0400
@@ -48,10 +48,10 @@ typedef struct
         GdmOptionWidgetClass       parent_class;
 } GdmRecentOptionWidgetClass;
 
-typedef gboolean (* GdmRecentOptionLookupItemFunc) (GdmRecentOptionWidget  *widget,
-                                                    const char             *id,
-                                                    char                  **name,
-                                                    char                  **comment);
+typedef char * (* GdmRecentOptionLookupItemFunc) (GdmRecentOptionWidget  *widget,
+                                                  const char             *key,
+                                                  char                  **name,
+                                                  char                  **comment);
 
 
 GType                  gdm_recent_option_widget_get_type               (void);


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- gdm.spec	17 Sep 2008 03:15:42 -0000	1.416
+++ gdm.spec	17 Sep 2008 15:15:09 -0000	1.417
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.23.92
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -87,6 +87,8 @@
 Patch5: data-leak.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=552578
 Patch6: ssid-leak.patch
+Patch7: gdm-2.23.92-filter-dupes-from-lang-list.patch
+Patch8: gdm-2.23.92-another-locale-fixup.patch
 
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
@@ -114,6 +116,8 @@
 %patch4 -p1 -b .username-leak
 %patch5 -p1 -b .data-leak
 %patch6 -p1 -b .ssid-leak
+%patch7 -p1 -b .filter-dupes-from-lang-list
+%patch8 -p1 -b .another-locale-fixup
 
 %patch99 -p1 -b .fedora-logo
 
@@ -316,6 +320,10 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Wed Sep 17 2008 Ray Strode <rstrode at redhat.com> - 1:2.23.92-8
+- canonicalize codeset to match output of locale -m
+- filter duplicates from language list
+
 * Tue Sep 16 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.92-7
 - Plug a few memory leaks
 



From buc at fedoraproject.org  Wed Sep 17 15:17:36 2008
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Wed, 17 Sep 2008 15:17:36 +0000 (UTC)
Subject: rpms/traceroute/devel .cvsignore, 1.14, 1.15 sources, 1.15,
	1.16 traceroute.spec, 1.38, 1.39
Message-ID: <20080917151736.79E167013C@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/traceroute/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3784

Modified Files:
	.cvsignore sources traceroute.spec 
Log Message:
- update to 2.0.12 (fixes #461278 and #461626)
- this release adds support for icmp extensions (including MPLS),
  which was expected for a long time (#176588)
- drop "tracert" symlink (#461109)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/traceroute/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	19 May 2008 13:53:52 -0000	1.14
+++ .cvsignore	17 Sep 2008 15:17:06 -0000	1.15
@@ -1 +1 @@
-traceroute-2.0.11.tar.gz
+traceroute-2.0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/traceroute/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	19 May 2008 13:53:52 -0000	1.15
+++ sources	17 Sep 2008 15:17:06 -0000	1.16
@@ -1 +1 @@
-d400573042d41559fc3e5260275300d8  traceroute-2.0.11.tar.gz
+2262a9d30ae85f12b759a38ef827f8f7  traceroute-2.0.12.tar.gz


Index: traceroute.spec
===================================================================
RCS file: /cvs/extras/rpms/traceroute/devel/traceroute.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- traceroute.spec	19 May 2008 13:53:52 -0000	1.38
+++ traceroute.spec	17 Sep 2008 15:17:06 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: Traces the route taken by packets over an IPv4/IPv6 network
 Name: traceroute
 Epoch: 3
-Version: 2.0.11
+Version: 2.0.12
 Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv2+
@@ -37,7 +37,6 @@
 install -m755 traceroute/traceroute $RPM_BUILD_ROOT/bin
 pushd $RPM_BUILD_ROOT/bin
 ln -s traceroute traceroute6
-ln -s traceroute tracert
 popd
 
 install -d $RPM_BUILD_ROOT%{_mandir}/man8
@@ -59,6 +58,12 @@
 
 
 %changelog
+* Wed Sep 17 2008 Dmitry Butskoy <Dmitry at Butskoy.name>  - 3:2.0.12-1
+- update to 2.0.12 (fixes #461278 and #461626)
+- this release adds support for icmp extensions (including MPLS),
+  which was expected for a long time (#176588)
+- drop "tracert" symlink (#461109)
+
 * Mon May 19 2008 Dmitry Butskoy <Dmitry at Butskoy.name>  - 3:2.0.11-1
 - update to 2.0.11
 



From tagoh at fedoraproject.org  Wed Sep 17 15:18:13 2008
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Wed, 17 Sep 2008 15:18:13 +0000 (UTC)
Subject: rpms/im-chooser/devel .cvsignore, 1.27, 1.28 im-chooser.spec, 1.51, 
	1.52 sources, 1.26, 1.27
Message-ID: <20080917151813.6B6BE7013C@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/im-chooser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3979

Modified Files:
	.cvsignore im-chooser.spec sources 
Log Message:
* Wed Sep 17 2008 Akira TAGOH <tagoh at redhat.com> - 1.2.3-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	29 Aug 2008 04:10:14 -0000	1.27
+++ .cvsignore	17 Sep 2008 15:17:43 -0000	1.28
@@ -27,3 +27,4 @@
 im-chooser-1.2.0.tar.bz2
 im-chooser-1.2.1.tar.bz2
 im-chooser-1.2.2.tar.bz2
+im-chooser-1.2.3.tar.bz2


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- im-chooser.spec	29 Aug 2008 04:10:14 -0000	1.51
+++ im-chooser.spec	17 Sep 2008 15:17:43 -0000	1.52
@@ -1,18 +1,18 @@
 Name:		im-chooser
-Version:	1.2.2
+Version:	1.2.3
 Release:	1%{?dist}
 License:	GPLv2+
 URL:		http://fedorahosted.org/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel libgnomeui-devel desktop-file-utils intltool gettext
-BuildRequires:	imsettings-devel >= 0.101.1-2
+BuildRequires:	imsettings-devel >= 0.104.0
 
 Source0:	http://fedorahosted.org/releases/i/m/%{name}/%{name}-%{version}.tar.bz2
 
 Summary:	Desktop Input Method configuration tool
 Group:		Applications/System
 Obsoletes:	system-switch-im
-Requires:	imsettings >= 0.101.0
+Requires:	imsettings >= 0.104.0
 
 %description
 im-chooser is a GUI configuration tool to choose the Input Method
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Akira TAGOH <tagoh at redhat.com> - 1.2.3-1
+- New upstream release.
+
 * Fri Aug 29 2008 Akira TAGOH <tagoh at redhat.com> - 1.2.2-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	29 Aug 2008 04:10:14 -0000	1.26
+++ sources	17 Sep 2008 15:17:43 -0000	1.27
@@ -1 +1 @@
-987e2197ff64ca6ebb5799ba185efaea  im-chooser-1.2.2.tar.bz2
+7e80607ff8446549cfacff3328b3f968  im-chooser-1.2.3.tar.bz2



From pkgdb at fedoraproject.org  Wed Sep 17 15:18:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:18:37 +0000
Subject: [pkgdb] kbackup ownership updated
Message-ID: <20080917151837.AE0CE208D9E@bastion.fedora.phx.redhat.com>

Package kbackup in Fedora devel was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kbackup



From pkgdb at fedoraproject.org  Wed Sep 17 15:18:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:18:45 +0000
Subject: [pkgdb] kbackup ownership updated
Message-ID: <20080917151845.9C618208DA3@bastion.fedora.phx.redhat.com>

Package kbackup in Fedora 5 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kbackup



From pkgdb at fedoraproject.org  Wed Sep 17 15:18:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:18:43 +0000
Subject: [pkgdb] kbackup ownership updated
Message-ID: <20080917151843.EFFE6208DA0@bastion.fedora.phx.redhat.com>

Package kbackup in Fedora 7 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kbackup



From pkgdb at fedoraproject.org  Wed Sep 17 15:18:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:18:47 +0000
Subject: [pkgdb] kbackup ownership updated
Message-ID: <20080917151847.C102F208DA8@bastion.fedora.phx.redhat.com>

Package kbackup in Fedora 8 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kbackup



From pkgdb at fedoraproject.org  Wed Sep 17 15:18:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:18:45 +0000
Subject: [pkgdb] kbackup ownership updated
Message-ID: <20080917151845.B37EB208DA5@bastion.fedora.phx.redhat.com>

Package kbackup in Fedora 6 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kbackup



From pkgdb at fedoraproject.org  Wed Sep 17 15:18:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:18:48 +0000
Subject: [pkgdb] kbackup ownership updated
Message-ID: <20080917151848.54AD2208DAA@bastion.fedora.phx.redhat.com>

Package kbackup in Fedora 9 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kbackup



From pkgdb at fedoraproject.org  Wed Sep 17 15:18:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:18:59 +0000
Subject: [pkgdb] mysql-gui-tools had acl change status
Message-ID: <20080917151859.E26C4208DAC@bastion.fedora.phx.redhat.com>

ausil has set the watchbugzilla acl on mysql-gui-tools (Fedora devel) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 15:19:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:19:02 +0000
Subject: [pkgdb] mysql-gui-tools had acl change status
Message-ID: <20080917151902.6287D208DA2@bastion.fedora.phx.redhat.com>

ausil has set the watchcommits acl on mysql-gui-tools (Fedora devel) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 15:19:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:19:03 +0000
Subject: [pkgdb] mysql-gui-tools had acl change status
Message-ID: <20080917151903.6812C208DAE@bastion.fedora.phx.redhat.com>

ausil has set the commit acl on mysql-gui-tools (Fedora devel) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 15:19:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:19:05 +0000
Subject: [pkgdb] mysql-gui-tools had acl change status
Message-ID: <20080917151905.829FC208DB2@bastion.fedora.phx.redhat.com>

ausil has set the approveacls acl on mysql-gui-tools (Fedora devel) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 15:19:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:19:14 +0000
Subject: [pkgdb] mysql-gui-tools had acl change status
Message-ID: <20080917151915.2CAC5208DB5@bastion.fedora.phx.redhat.com>

ausil has set the watchbugzilla acl on mysql-gui-tools (Fedora 8) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 15:19:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:19:16 +0000
Subject: [pkgdb] mysql-gui-tools had acl change status
Message-ID: <20080917151916.C2ECF208DA9@bastion.fedora.phx.redhat.com>

ausil has set the watchcommits acl on mysql-gui-tools (Fedora 8) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 15:19:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:19:18 +0000
Subject: [pkgdb] mysql-gui-tools had acl change status
Message-ID: <20080917151918.74A51208DB6@bastion.fedora.phx.redhat.com>

ausil has set the commit acl on mysql-gui-tools (Fedora 8) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 15:19:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:19:22 +0000
Subject: [pkgdb] mysql-gui-tools had acl change status
Message-ID: <20080917151922.4C61A208DBB@bastion.fedora.phx.redhat.com>

ausil has set the watchbugzilla acl on mysql-gui-tools (Fedora 9) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 15:19:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:19:20 +0000
Subject: [pkgdb] mysql-gui-tools had acl change status
Message-ID: <20080917151920.61CC7208DB8@bastion.fedora.phx.redhat.com>

ausil has set the approveacls acl on mysql-gui-tools (Fedora 8) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 15:19:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:19:23 +0000
Subject: [pkgdb] mysql-gui-tools had acl change status
Message-ID: <20080917151923.843C5208DAA@bastion.fedora.phx.redhat.com>

ausil has set the watchcommits acl on mysql-gui-tools (Fedora 9) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 15:19:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:19:24 +0000
Subject: [pkgdb] mysql-gui-tools had acl change status
Message-ID: <20080917151924.F2D96208DBF@bastion.fedora.phx.redhat.com>

ausil has set the commit acl on mysql-gui-tools (Fedora 9) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 15:19:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:19:29 +0000
Subject: [pkgdb] mysql-gui-tools had acl change status
Message-ID: <20080917151929.DD58E208DC0@bastion.fedora.phx.redhat.com>

ausil has set the approveacls acl on mysql-gui-tools (Fedora 9) to Obsolete for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 15:19:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:19:30 +0000
Subject: [pkgdb] mysql-gui-tools had acl change status
Message-ID: <20080917151931.09BB1208DC4@bastion.fedora.phx.redhat.com>

ausil has set the approveacls acl on mysql-gui-tools (Fedora 8) to Obsolete for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 15:19:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:19:35 +0000
Subject: [pkgdb] mysql-gui-tools had acl change status
Message-ID: <20080917151935.6C7DC208DC5@bastion.fedora.phx.redhat.com>

ausil has set the approveacls acl on mysql-gui-tools (Fedora devel) to Obsolete for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 15:19:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:19:46 +0000
Subject: [pkgdb] mysql-gui-tools had acl change status
Message-ID: <20080917151946.E19ED208DAF@bastion.fedora.phx.redhat.com>

ausil has set the approveacls acl on mysql-gui-tools (Fedora 8) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 15:19:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:19:48 +0000
Subject: [pkgdb] mysql-gui-tools had acl change status
Message-ID: <20080917151948.A14F8208DC9@bastion.fedora.phx.redhat.com>

ausil has set the approveacls acl on mysql-gui-tools (Fedora 9) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From pkgdb at fedoraproject.org  Wed Sep 17 15:19:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:19:51 +0000
Subject: [pkgdb] mysql-gui-tools had acl change status
Message-ID: <20080917151952.3CF1B208DCA@bastion.fedora.phx.redhat.com>

ausil has set the approveacls acl on mysql-gui-tools (Fedora devel) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-gui-tools



From mdomsch at fedoraproject.org  Wed Sep 17 15:22:12 2008
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Wed, 17 Sep 2008 15:22:12 +0000 (UTC)
Subject: rpms/pekwm/devel pekwm-0.1.5-gcc43.patch, NONE, 1.1 pekwm.spec, 1.3,
	1.4
Message-ID: <20080917152212.364367013C@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pekwm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5034

Modified Files:
	pekwm.spec 
Added Files:
	pekwm-0.1.5-gcc43.patch 
Log Message:
fix FTBFS BZ#434089

pekwm-0.1.5-gcc43.patch:

--- NEW FILE pekwm-0.1.5-gcc43.patch ---
--- pekwm-0.1.5.orig/src/CfgParser.hh	2008-09-17 10:02:32.000000000 -0500
+++ pekwm-0.1.5/src/CfgParser.hh	2008-09-17 10:04:40.000000000 -0500
@@ -32,6 +32,7 @@
 #include <string>
 #include <iostream>
 #include <cstdlib>
+#include <string.h>
 
 //! @brief Configuration file parser.
 class CfgParser {
--- pekwm-0.1.5.orig/src/Util.hh	2008-09-17 10:02:32.000000000 -0500
+++ pekwm-0.1.5/src/Util.hh	2008-09-17 10:08:59.000000000 -0500
@@ -17,6 +17,7 @@
 #include <vector>
 #include <functional>
 #include <sstream>
+#include <string.h>
 
 //! @brief Namespace Util used for various small file/string tasks.
 namespace Util {
--- pekwm-0.1.5.orig/src/CfgParserKey.cc	2008-09-17 10:02:32.000000000 -0500
+++ pekwm-0.1.5/src/CfgParserKey.cc	2008-09-17 10:08:50.000000000 -0500
@@ -15,6 +15,7 @@
 
 #include <iostream>
 #include <cstdlib>
+#include <string.h>
 
 using std::string;
 using std::cerr;
--- pekwm-0.1.5.orig/src/CfgParserSource.cc	2008-09-17 10:02:32.000000000 -0500
+++ pekwm-0.1.5/src/CfgParserSource.cc	2008-09-17 10:10:34.000000000 -0500
@@ -14,6 +14,7 @@
 #include "Util.hh"
 
 #include <iostream>
+#include <cstdlib>
 
 extern "C" {
 #include <unistd.h>
--- pekwm-0.1.5.orig/src/ColorHandler.hh	2008-09-17 10:02:32.000000000 -0500
+++ pekwm-0.1.5/src/ColorHandler.hh	2008-09-17 10:11:40.000000000 -0500
@@ -15,6 +15,7 @@
 
 #include <list>
 #include <string>
+#include <string.h>
 
 class ColorHandler {
 public:
--- pekwm-0.1.5.orig/src/PImageNativeLoaderXpm.cc	2008-09-17 10:02:32.000000000 -0500
+++ pekwm-0.1.5/src/PImageNativeLoaderXpm.cc	2008-09-17 10:12:54.000000000 -0500
@@ -13,6 +13,7 @@
 #include "PImageNativeLoaderXpm.hh"
 
 #include <iostream>
+#include <cstring>
 
 using std::cerr;
 using std::endl;
--- pekwm-0.1.5.orig/src/Util.cc	2008-09-17 10:02:32.000000000 -0500
+++ pekwm-0.1.5/src/Util.cc	2008-09-17 10:14:09.000000000 -0500
@@ -14,6 +14,7 @@
 #include "Util.hh"
 #include <iostream>
 #include <sstream>
+#include <cstdlib>
 
 #include <unistd.h>
 #include <sys/stat.h>


Index: pekwm.spec
===================================================================
RCS file: /cvs/extras/rpms/pekwm/devel/pekwm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pekwm.spec	28 Aug 2008 15:43:09 -0000	1.3
+++ pekwm.spec	17 Sep 2008 15:21:41 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           pekwm
 Version:        0.1.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        The Pek Window Manager
 
 Group:          User Interface/Desktops
@@ -12,6 +12,7 @@
 Source2:        pekwm-xdg-menu.py
 Patch0:         pekwm_configure.patch
 Patch2:         pekwm_menu.patch
+Patch3:		pekwm-0.1.5-gcc43.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,6 +28,7 @@
 %setup -q
 %patch0
 %patch2
+%patch3 -p1
 
 sed -i s,"<BINDIR>",%{_bindir},g data/menu.in
 sed -i s,"XftDrawString8","XftDrawStringUtf8", src/PFont.cc
@@ -83,6 +85,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Matt Domsch <mdomsch at fedoraproject.org> - 0.1.5-8
+- fix FTBFS BZ#434089
+
 * Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.1.5-7
 - fix license tag
 



From pkgdb at fedoraproject.org  Wed Sep 17 15:24:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:24:00 +0000
Subject: [pkgdb] pikdev ownership updated
Message-ID: <20080917152400.195CF208D9E@bastion.fedora.phx.redhat.com>

Package pikdev in Fedora devel was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pikdev



From pkgdb at fedoraproject.org  Wed Sep 17 15:24:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:24:11 +0000
Subject: [pkgdb] pikdev ownership updated
Message-ID: <20080917152411.6CD48208DA0@bastion.fedora.phx.redhat.com>

Package pikdev in Fedora 4 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pikdev



From pkgdb at fedoraproject.org  Wed Sep 17 15:24:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:24:06 +0000
Subject: [pkgdb] pikdev ownership updated
Message-ID: <20080917152406.5C15A208DA2@bastion.fedora.phx.redhat.com>

Package pikdev in Fedora 7 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pikdev



From pkgdb at fedoraproject.org  Wed Sep 17 15:24:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:24:19 +0000
Subject: [pkgdb] pikdev ownership updated
Message-ID: <20080917152419.7721D208DA7@bastion.fedora.phx.redhat.com>

Package pikdev in Fedora 6 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pikdev



From pkgdb at fedoraproject.org  Wed Sep 17 15:24:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:24:15 +0000
Subject: [pkgdb] pikdev ownership updated
Message-ID: <20080917152415.C8AF1208DA5@bastion.fedora.phx.redhat.com>

Package pikdev in Fedora 5 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pikdev



From pkgdb at fedoraproject.org  Wed Sep 17 15:24:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:24:23 +0000
Subject: [pkgdb] pikdev ownership updated
Message-ID: <20080917152423.4AA31208DAA@bastion.fedora.phx.redhat.com>

Package pikdev in Fedora 8 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pikdev



From pkgdb at fedoraproject.org  Wed Sep 17 15:24:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:24:27 +0000
Subject: [pkgdb] pikdev ownership updated
Message-ID: <20080917152427.3FEB1208DA0@bastion.fedora.phx.redhat.com>

Package pikdev in Fedora 9 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pikdev



From pkgdb at fedoraproject.org  Wed Sep 17 15:25:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:25:51 +0000
Subject: [pkgdb] pikloops ownership updated
Message-ID: <20080917152551.B6706208DA0@bastion.fedora.phx.redhat.com>

Package pikloops in Fedora devel was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pikloops



From pkgdb at fedoraproject.org  Wed Sep 17 15:25:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:25:54 +0000
Subject: [pkgdb] pikloops ownership updated
Message-ID: <20080917152554.AAE4B208DA8@bastion.fedora.phx.redhat.com>

Package pikloops in Fedora 7 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pikloops



From pkgdb at fedoraproject.org  Wed Sep 17 15:26:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:26:18 +0000
Subject: [pkgdb] pikloops ownership updated
Message-ID: <20080917152618.67E7E208D9E@bastion.fedora.phx.redhat.com>

Package pikloops in Fedora 4 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pikloops



From pkgdb at fedoraproject.org  Wed Sep 17 15:26:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:26:36 +0000
Subject: [pkgdb] pam_passwdqc: tmraz has requested watchbugzilla
Message-ID: <20080917152636.80981208DA4@bastion.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on pam_passwdqc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_passwdqc



From pkgdb at fedoraproject.org  Wed Sep 17 15:26:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:26:41 +0000
Subject: [pkgdb] pam_passwdqc: tmraz has requested watchcommits
Message-ID: <20080917152641.4BCB2208DA0@bastion.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on pam_passwdqc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_passwdqc



From pkgdb at fedoraproject.org  Wed Sep 17 15:26:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:26:48 +0000
Subject: [pkgdb] pam_passwdqc: tmraz has requested watchbugzilla
Message-ID: <20080917152648.3C657208DA5@bastion.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on pam_passwdqc (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_passwdqc



From pkgdb at fedoraproject.org  Wed Sep 17 15:27:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:27:00 +0000
Subject: [pkgdb] pikloops ownership updated
Message-ID: <20080917152700.EB0F2208D9F@bastion.fedora.phx.redhat.com>

Package pikloops in Fedora 5 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pikloops



From pkgdb at fedoraproject.org  Wed Sep 17 15:26:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:26:51 +0000
Subject: [pkgdb] pam_passwdqc: tmraz has requested watchcommits
Message-ID: <20080917152651.CC94C208DA8@bastion.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on pam_passwdqc (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_passwdqc



From pkgdb at fedoraproject.org  Wed Sep 17 15:27:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:27:05 +0000
Subject: [pkgdb] pikloops ownership updated
Message-ID: <20080917152705.AAF8B208DA9@bastion.fedora.phx.redhat.com>

Package pikloops in Fedora 9 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pikloops



From pkgdb at fedoraproject.org  Wed Sep 17 15:27:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:27:03 +0000
Subject: [pkgdb] pikloops ownership updated
Message-ID: <20080917152703.52D49208DA3@bastion.fedora.phx.redhat.com>

Package pikloops in Fedora 6 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pikloops



From pkgdb at fedoraproject.org  Wed Sep 17 15:27:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:27:05 +0000
Subject: [pkgdb] pikloops ownership updated
Message-ID: <20080917152705.13F82208DA4@bastion.fedora.phx.redhat.com>

Package pikloops in Fedora 8 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pikloops



From pkgdb at fedoraproject.org  Wed Sep 17 15:56:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:56:50 +0000
Subject: [pkgdb] man-pages-fr had acl change status
Message-ID: <20080917155650.A0ADD2E0180@bastion.fedora.phx.redhat.com>

bouska has set the approveacls acl on man-pages-fr (Fedora devel) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:56:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:56:47 +0000
Subject: [pkgdb] man-pages-fr had acl change status
Message-ID: <20080917155647.43AF22E017E@bastion.fedora.phx.redhat.com>

bouska has set the commit acl on man-pages-fr (Fedora devel) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:57:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:57:03 +0000
Subject: [pkgdb] man-pages-fr had acl change status
Message-ID: <20080917155703.53BF72E017B@bastion.fedora.phx.redhat.com>

bouska has set the watchbugzilla acl on man-pages-fr (Fedora 8) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:57:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:57:05 +0000
Subject: [pkgdb] man-pages-fr had acl change status
Message-ID: <20080917155705.797012E017C@bastion.fedora.phx.redhat.com>

bouska has set the watchcommits acl on man-pages-fr (Fedora 8) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:57:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:57:08 +0000
Subject: [pkgdb] man-pages-fr had acl change status
Message-ID: <20080917155708.2BB582E0183@bastion.fedora.phx.redhat.com>

bouska has set the commit acl on man-pages-fr (Fedora 8) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:57:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:57:11 +0000
Subject: [pkgdb] man-pages-fr had acl change status
Message-ID: <20080917155711.ABC932E0186@bastion.fedora.phx.redhat.com>

bouska has set the approveacls acl on man-pages-fr (Fedora 8) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:57:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:57:16 +0000
Subject: [pkgdb] man-pages-fr had acl change status
Message-ID: <20080917155716.6A8982E017E@bastion.fedora.phx.redhat.com>

bouska has set the watchbugzilla acl on man-pages-fr (Fedora 9) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:57:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:57:19 +0000
Subject: [pkgdb] man-pages-fr had acl change status
Message-ID: <20080917155719.3DA2E2E0187@bastion.fedora.phx.redhat.com>

bouska has set the watchcommits acl on man-pages-fr (Fedora 9) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:57:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:57:22 +0000
Subject: [pkgdb] man-pages-fr had acl change status
Message-ID: <20080917155723.14F432E018A@bastion.fedora.phx.redhat.com>

bouska has set the commit acl on man-pages-fr (Fedora 9) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:57:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:57:25 +0000
Subject: [pkgdb] man-pages-fr had acl change status
Message-ID: <20080917155725.2DE922E017A@bastion.fedora.phx.redhat.com>

bouska has set the approveacls acl on man-pages-fr (Fedora 9) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From kasal at fedoraproject.org  Wed Sep 17 16:00:20 2008
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 17 Sep 2008 16:00:20 +0000 (UTC)
Subject: rpms/brltty/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <20080917160020.2DF4C7013C@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/brltty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10636

Modified Files:
	.cvsignore sources 
Log Message:
- new upstream release
- drop brltty-3.9-java-svn.patch, brltty-3.9-tcl85path.patch,
  and brltty-3.9-pyxfix.patch, they are upstream
- fix BuildRoot
- fix many sub-packages' Requires on brlapi


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/brltty/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Jan 2008 11:40:14 -0000	1.6
+++ .cvsignore	17 Sep 2008 15:59:49 -0000	1.7
@@ -1 +1 @@
-brltty-3.9.tar.gz
+brltty-3.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/brltty/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Jan 2008 11:40:14 -0000	1.6
+++ sources	17 Sep 2008 15:59:49 -0000	1.7
@@ -1 +1 @@
-7ce54ba2d38b7c220870e8c781f36743  brltty-3.9.tar.gz
+d52f332a29e00495d166e7f45403fa9d  brltty-3.10.tar.gz



From pkgdb at fedoraproject.org  Wed Sep 17 15:32:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:32:26 +0000
Subject: [pkgdb] fcron ownership updated
Message-ID: <20080917153226.A5911208E19@bastion.fedora.phx.redhat.com>

Package fcron in Fedora 8 is now owned by pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fcron



From pkgdb at fedoraproject.org  Wed Sep 17 15:28:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:28:07 +0000
Subject: [pkgdb] tetex-eurofont ownership updated
Message-ID: <20080917152807.C1E45208DB1@bastion.fedora.phx.redhat.com>

Package tetex-eurofont in Fedora 8 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tetex-eurofont



From pkgdb at fedoraproject.org  Wed Sep 17 15:28:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:28:09 +0000
Subject: [pkgdb] tetex-eurofont ownership updated
Message-ID: <20080917152809.795B4208DDB@bastion.fedora.phx.redhat.com>

Package tetex-eurofont in Fedora 9 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tetex-eurofont



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:04 +0000
Subject: [pkgdb] piklab: dionysos has given up approveacls
Message-ID: <20080917153304.60A46208E23@bastion.fedora.phx.redhat.com>

dionysos has given up the approveacls acl on piklab (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From hardaker at fedoraproject.org  Wed Sep 17 15:39:25 2008
From: hardaker at fedoraproject.org (Wes Hardaker)
Date: Wed, 17 Sep 2008 15:39:25 +0000 (UTC)
Subject: rpms/perl-QWizard/F-8 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <20080917153925.A30A07013C@cvs1.fedora.phx.redhat.com>

Author: hardaker

Update of /cvs/extras/rpms/perl-QWizard/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7697

Modified Files:
	.cvsignore sources 
Log Message:
update to 3.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-QWizard/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Apr 2008 21:35:33 -0000	1.4
+++ .cvsignore	17 Sep 2008 15:38:55 -0000	1.5
@@ -1 +1 @@
-QWizard-3.14.tar.gz
+QWizard-3.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-QWizard/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Apr 2008 21:35:33 -0000	1.4
+++ sources	17 Sep 2008 15:38:55 -0000	1.5
@@ -1 +1 @@
-f45cf8e3faa251478cffc511193bd2e8  QWizard-3.14.tar.gz
+e5cf695466d39ad6c7f242ad58b7ad97  QWizard-3.15.tar.gz



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:41 +0000
Subject: [pkgdb] man-pages-fr: pertusus has requested watchcommits
Message-ID: <20080917153341.745022E004D@bastion.fedora.phx.redhat.com>

pertusus has requested the watchcommits acl on man-pages-fr (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:20 +0000
Subject: [pkgdb] man-pages-fr: pertusus has requested approveacls
Message-ID: <20080917153320.75DA72E003A@bastion.fedora.phx.redhat.com>

pertusus has requested the approveacls acl on man-pages-fr (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:07 +0000
Subject: [pkgdb] piklab: dionysos has given up commit
Message-ID: <20080917153307.8666F2E0039@bastion.fedora.phx.redhat.com>

dionysos has given up the commit acl on piklab (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From pkgdb at fedoraproject.org  Wed Sep 17 15:27:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:27:57 +0000
Subject: [pkgdb] tetex-eurofont ownership updated
Message-ID: <20080917152757.0726E208DC1@bastion.fedora.phx.redhat.com>

Package tetex-eurofont in Fedora 3 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tetex-eurofont



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:02 +0000
Subject: [pkgdb] piklab: dionysos has given up watchcommits
Message-ID: <20080917153302.040522E002C@bastion.fedora.phx.redhat.com>

dionysos has given up the watchcommits acl on piklab (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:29 +0000
Subject: [pkgdb] man-pages-fr: pertusus has requested watchcommits
Message-ID: <20080917153329.D33622E0040@bastion.fedora.phx.redhat.com>

pertusus has requested the watchcommits acl on man-pages-fr (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:32:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:32:53 +0000
Subject: [pkgdb] piklab: dionysos has given up watchcommits
Message-ID: <20080917153253.2BA522E0013@bastion.fedora.phx.redhat.com>

dionysos has given up the watchcommits acl on piklab (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From pkgdb at fedoraproject.org  Wed Sep 17 15:32:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:32:48 +0000
Subject: [pkgdb] piklab: dionysos has given up approveacls
Message-ID: <20080917153249.0EFA42E000E@bastion.fedora.phx.redhat.com>

dionysos has given up the approveacls acl on piklab (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From pkgdb at fedoraproject.org  Wed Sep 17 15:32:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:32:47 +0000
Subject: [pkgdb] piklab: dionysos has given up watchcommits
Message-ID: <20080917153247.08C5F2E0008@bastion.fedora.phx.redhat.com>

dionysos has given up the watchcommits acl on piklab (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From pkgdb at fedoraproject.org  Wed Sep 17 15:37:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:37:58 +0000
Subject: [pkgdb] pam_passwdqc had acl change status
Message-ID: <20080917153758.420592E00AA@bastion.fedora.phx.redhat.com>

avesh has set the watchcommits acl on pam_passwdqc (Fedora 9) to Approved for tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_passwdqc



From pkgdb at fedoraproject.org  Wed Sep 17 15:32:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:32:53 +0000
Subject: [pkgdb] piklab: dionysos has given up commit
Message-ID: <20080917153253.D4C442E0016@bastion.fedora.phx.redhat.com>

dionysos has given up the commit acl on piklab (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:08 +0000
Subject: [pkgdb] piklab: dionysos has given up approveacls
Message-ID: <20080917153308.2D47B208E2A@bastion.fedora.phx.redhat.com>

dionysos has given up the approveacls acl on piklab (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From kasal at fedoraproject.org  Wed Sep 17 15:40:57 2008
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 17 Sep 2008 15:40:57 +0000 (UTC)
Subject: rpms/brltty/devel brltty-gnusource.patch, NONE,
	1.1 brltty-parallel.patch, NONE, 1.1 brltty.spec, 1.29,
	1.30 brltty-3.9-gnusource.patch, 1.1,
	NONE brltty-3.9-java-svn.patch, 1.1,
	NONE brltty-3.9-parallel.patch, 1.1,
	NONE brltty-3.9-pyxfix.patch, 1.1,
	NONE brltty-3.9-tcl85path.patch, 1.1, NONE
Message-ID: <20080917154057.E08737013C@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/brltty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7958

Modified Files:
	brltty.spec 
Added Files:
	brltty-gnusource.patch brltty-parallel.patch 
Removed Files:
	brltty-3.9-gnusource.patch brltty-3.9-java-svn.patch 
	brltty-3.9-parallel.patch brltty-3.9-pyxfix.patch 
	brltty-3.9-tcl85path.patch 
Log Message:
- new upstream release
- drop brltty-3.9-java-svn.patch, brltty-3.9-tcl85path.patch,
  and brltty-3.9-pyxfix.patch, they are upstream
- fix BuildRoot
- fix many sub-packages' Requires on brlapi

brltty-gnusource.patch:

--- NEW FILE brltty-gnusource.patch ---
2008-09-17  Stepan Kasal  <skasal at redhat.com>

	* configure.ac: Add -D_GNU_SOURCE to get struct ucred from
	socket.h.

diff -up brltty-3.10/configure.ac.gnusource brltty-3.10/configure.ac
--- brltty-3.10/configure.ac.gnusource	2008-07-17 00:19:54.000000000 +0200
+++ brltty-3.10/configure.ac	2008-09-17 12:44:28.000000000 +0200
@@ -779,7 +779,7 @@ AC_CACHE_CHECK([for system-dependent com
 case "${host_os}"
 in
    linux*|gnu*|kfreebsd*)
-      brltty_cv_prog_cc_sysflags="-D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED"
+      brltty_cv_prog_cc_sysflags="-D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_GNU_SOURCE"
       ;;
    solaris*)
       brltty_cv_prog_cc_sysflags="-D_XOPEN_SOURCE=500 -D__EXTENSIONS__"

brltty-parallel.patch:

--- NEW FILE brltty-parallel.patch ---
2008-09-17  Stepan Kasal  <skasal at redhat.com>

	* Programs/Makefile.in (braille-drivers): Add
	prerequisity `all' to prevent race of this make with nested
	"make brlapi" when parallel make is used.  Recursive make is
	harmful.

diff -up brltty-3.10/Makefile.in.parallel brltty-3.10/Makefile.in
diff -up brltty-3.10/Programs/Makefile.in.parallel brltty-3.10/Programs/Makefile.in
--- brltty-3.10/Programs/Makefile.in.parallel	2008-07-17 00:19:08.000000000 +0200
+++ brltty-3.10/Programs/Makefile.in	2008-09-17 11:24:35.000000000 +0200
@@ -399,7 +399,7 @@ apitest.$O:
 
 ###############################################################################
 
-braille-drivers: txt2hlp
+braille-drivers: txt2hlp api
 	for driver in $(BRAILLE_EXTERNAL_DRIVER_NAMES); \
 	do (cd $(BLD_TOP)$(BRL_DIR)/$$driver && $(MAKE) braille-driver braille-all) || exit 1; \
 	done


Index: brltty.spec
===================================================================
RCS file: /cvs/extras/rpms/brltty/devel/brltty.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- brltty.spec	13 Sep 2008 14:10:14 -0000	1.29
+++ brltty.spec	17 Sep 2008 15:40:27 -0000	1.30
@@ -1,5 +1,5 @@
-%define pkg_version 3.9
-%define api_version 0.5.1
+%define pkg_version 3.10
+%define api_version 0.5.2
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?pyver: %define pyver %(%{__python} -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v")}
@@ -9,20 +9,16 @@
 
 Name: brltty
 Version: %{pkg_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
 Source: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.gz
-Patch0: brltty-3.9-tcl85path.patch
-Patch1: brltty-3.9-java-svn.patch
-Patch2: brltty-3.9-gnusource.patch
+Patch2: brltty-gnusource.patch
 Patch3: brltty-3.9-autoconf.patch
-Patch4: brltty-3.9-pyxfix.patch
-Patch5: brltty-3.9-parallel.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-InstallRoot
+Patch5: brltty-parallel.patch
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Summary: Braille display driver for Linux/Unix
-Requires(post): coreutils
 BuildRequires: byacc, glibc-kernheaders
 # BuildRequires: ocaml
 
@@ -68,7 +64,7 @@
 Version: %{api_version}
 Group: Development/System
 License: LGPLv2+
-Requires: brlapi = %{api_version}
+Requires: brlapi = %{api_version}-%{release}
 Summary: Headers, static archive, and documentation for BrlAPI
 
 %description -n brlapi-devel
@@ -87,7 +83,7 @@
 Version: %{api_version}
 Group: Development/System
 License: LGPLv2+
-Requires: brlapi = %{api_version}
+Requires: brlapi = %{api_version}-%{release}
 BuildRequires: tcl-devel tcl
 Summary: Tcl binding for BrlAPI
 %description -n tcl-brlapi
@@ -97,7 +93,7 @@
 Version: %{api_version}
 Group: Development/System
 License: LGPLv2+
-Requires: brlapi = %{api_version}
+Requires: brlapi = %{api_version}-%{release}
 BuildRequires: Pyrex
 Summary: Python binding for BrlAPI
 %description -n python-brlapi
@@ -107,7 +103,7 @@
 Version: %{api_version}
 Group: Development/System
 License: LGPLv2+
-Requires: brlapi = %{api_version}
+Requires: brlapi = %{api_version}-%{release}
 BuildRequires: java-devel
 #BuildRequires: java-1.7.0-icedtea-devel
 Summary: Java binding for BrlAPI
@@ -118,15 +114,12 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .tcl85path
-%patch1 -p1 -b .java-svn
 %patch2 -p1 -b .gnusource
 %patch3 -p1 -b .autoconf
-%patch4 -p1 -b .pyxfix
 %patch5 -p1 -b .parallel
-./autogen
 
 %build
+./autogen
 %configure --with-install-root="${RPM_BUILD_ROOT}" --with-braille-driver=-tt
 make %{?_smp_mflags}
 
@@ -223,6 +216,13 @@
 
 
 %changelog
+* Sat Sep 13 2008 Stepan Kasal <skasal at redhat.com> - 3.10-1
+- new upstream release
+- drop brltty-3.9-java-svn.patch, brltty-3.9-tcl85path.patch,
+  and brltty-3.9-pyxfix.patch, they are upstream
+- fix BuildRoot
+- fix many sub-packages' Requires on brlapi
+
 * Wed Sep 10 2008 Stepan Kasal <skasal at redhat.com> - 3.9-3
 - add brltty-3.9-autoconf.patch to fix to build with Autoconf 2.62
 - add brltty-3.9-parallel.patch to fix race condition with parallel make


--- brltty-3.9-gnusource.patch DELETED ---


--- brltty-3.9-java-svn.patch DELETED ---


--- brltty-3.9-parallel.patch DELETED ---


--- brltty-3.9-pyxfix.patch DELETED ---


--- brltty-3.9-tcl85path.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:06 +0000
Subject: [pkgdb] piklab: dionysos has given up watchcommits
Message-ID: <20080917153306.F00992E0036@bastion.fedora.phx.redhat.com>

dionysos has given up the watchcommits acl on piklab (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From pkgdb at fedoraproject.org  Wed Sep 17 15:39:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:39:49 +0000
Subject: [pkgdb] pam_ccreds had acl change status
Message-ID: <20080917153949.25A8A2E00C6@bastion.fedora.phx.redhat.com>

avesh has set the watchcommits acl on pam_ccreds (Fedora devel) to Approved for tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_ccreds



From pkgdb at fedoraproject.org  Wed Sep 17 15:32:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:32:58 +0000
Subject: [pkgdb] piklab: dionysos has given up commit
Message-ID: <20080917153258.B86BF2E0023@bastion.fedora.phx.redhat.com>

dionysos has given up the commit acl on piklab (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From hardaker at fedoraproject.org  Wed Sep 17 15:32:13 2008
From: hardaker at fedoraproject.org (Wes Hardaker)
Date: Wed, 17 Sep 2008 15:32:13 +0000 (UTC)
Subject: rpms/perl-QWizard/F-9 .cvsignore, 1.4, 1.5 perl-QWizard.spec, 1.6, 
	1.7 sources, 1.4, 1.5
Message-ID: <20080917153213.B651E7013C@cvs1.fedora.phx.redhat.com>

Author: hardaker

Update of /cvs/extras/rpms/perl-QWizard/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6413

Modified Files:
	.cvsignore perl-QWizard.spec sources 
Log Message:
update to 3.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-QWizard/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Jul 2008 22:01:37 -0000	1.4
+++ .cvsignore	17 Sep 2008 15:31:43 -0000	1.5
@@ -1 +1 @@
-QWizard-3.14.tar.gz
+QWizard-3.15.tar.gz


Index: perl-QWizard.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-QWizard/F-9/perl-QWizard.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-QWizard.spec	18 Jul 2008 22:05:04 -0000	1.6
+++ perl-QWizard.spec	17 Sep 2008 15:31:43 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-QWizard
-Version:        3.14
-Release:        2%{?dist}
+Version:        3.15
+Release:        1%{?dist}
 Summary:        A very portable graphical question and answer wizard system
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -73,6 +73,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 17 2008 Wes Hardaker <wjhns174 at hardakers.net> - 3.15-1
+- Update to latest upstream bug fixes
+
 * Fri Jul 18 2008 Wes Hardaker <wjhns174 at hardakers.net> - 3.14-2
 - Version bump for build issues
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-QWizard/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Jul 2008 22:01:37 -0000	1.4
+++ sources	17 Sep 2008 15:31:43 -0000	1.5
@@ -1 +1 @@
-f45cf8e3faa251478cffc511193bd2e8  QWizard-3.14.tar.gz
+e5cf695466d39ad6c7f242ad58b7ad97  QWizard-3.15.tar.gz



From pkgdb at fedoraproject.org  Wed Sep 17 15:39:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:39:46 +0000
Subject: [pkgdb] pam_ccreds had acl change status
Message-ID: <20080917153946.9CC472E00C3@bastion.fedora.phx.redhat.com>

avesh has set the watchbugzilla acl on pam_ccreds (Fedora devel) to Approved for tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_ccreds



From pkgdb at fedoraproject.org  Wed Sep 17 15:28:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:28:05 +0000
Subject: [pkgdb] tetex-eurofont had acl change status
Message-ID: <20080917152805.056E1208DD1@bastion.fedora.phx.redhat.com>

dionysos has set the watchbugzilla acl on tetex-eurofont (Fedora 6) to Awaiting Review for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tetex-eurofont



From pkgdb at fedoraproject.org  Wed Sep 17 15:32:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:32:58 +0000
Subject: [pkgdb] piklab: dionysos has given up watchcommits
Message-ID: <20080917153258.A72D42E0020@bastion.fedora.phx.redhat.com>

dionysos has given up the watchcommits acl on piklab (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From pkgdb at fedoraproject.org  Wed Sep 17 15:32:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:32:31 +0000
Subject: [pkgdb] fcron ownership updated
Message-ID: <20080917153231.1D161208E1C@bastion.fedora.phx.redhat.com>

Package fcron in Fedora devel is now owned by pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fcron



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:32 +0000
Subject: [pkgdb] man-pages-fr: pertusus has requested commit
Message-ID: <20080917153332.AE45E2E0043@bastion.fedora.phx.redhat.com>

pertusus has requested the commit acl on man-pages-fr (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:28:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:28:04 +0000
Subject: [pkgdb] tetex-eurofont ownership updated
Message-ID: <20080917152804.DACB5208DCE@bastion.fedora.phx.redhat.com>

Package tetex-eurofont in Fedora 6 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tetex-eurofont



From pkgdb at fedoraproject.org  Wed Sep 17 15:32:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:32:56 +0000
Subject: [pkgdb] piklab: dionysos has given up watchbugzilla
Message-ID: <20080917153256.B99A72E001D@bastion.fedora.phx.redhat.com>

dionysos has given up the watchbugzilla acl on piklab (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From pkgdb at fedoraproject.org  Wed Sep 17 15:32:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:32:52 +0000
Subject: [pkgdb] piklab: dionysos has given up watchbugzilla
Message-ID: <20080917153252.528C9208E1F@bastion.fedora.phx.redhat.com>

dionysos has given up the watchbugzilla acl on piklab (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:39 +0000
Subject: [pkgdb] man-pages-fr: pertusus has requested watchbugzilla
Message-ID: <20080917153339.42DBD2E0049@bastion.fedora.phx.redhat.com>

pertusus has requested the watchbugzilla acl on man-pages-fr (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:32:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:32:40 +0000
Subject: [pkgdb] piklab: dionysos has given up approveacls
Message-ID: <20080917153240.AA3642E0002@bastion.fedora.phx.redhat.com>

dionysos has given up the approveacls acl on piklab (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:12 +0000
Subject: [pkgdb] man-pages-fr: pertusus has requested watchbugzilla
Message-ID: <20080917153312.BB7E5208E2D@bastion.fedora.phx.redhat.com>

pertusus has requested the watchbugzilla acl on man-pages-fr (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:27:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:27:51 +0000
Subject: [pkgdb] tetex-eurofont ownership updated
Message-ID: <20080917152751.9B592208DBB@bastion.fedora.phx.redhat.com>

Package tetex-eurofont in Fedora 1 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tetex-eurofont



From pkgdb at fedoraproject.org  Wed Sep 17 15:39:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:39:11 +0000
Subject: [pkgdb] pam_passwdqc had acl change status
Message-ID: <20080917153911.3D11A2E00BB@bastion.fedora.phx.redhat.com>

avesh has set the watchcommits acl on pam_passwdqc (Fedora devel) to Approved for tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_passwdqc



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:45 +0000
Subject: [pkgdb] man-pages-fr: pertusus has requested approveacls
Message-ID: <20080917153345.929C92E0053@bastion.fedora.phx.redhat.com>

pertusus has requested the approveacls acl on man-pages-fr (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:32:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:32:59 +0000
Subject: [pkgdb] piklab: dionysos has given up approveacls
Message-ID: <20080917153259.237222E0026@bastion.fedora.phx.redhat.com>

dionysos has given up the approveacls acl on piklab (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From buc at fedoraproject.org  Wed Sep 17 15:35:05 2008
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Wed, 17 Sep 2008 15:35:05 +0000 (UTC)
Subject: rpms/traceroute/F-9 sources,1.14,1.15 traceroute.spec,1.37,1.38
Message-ID: <20080917153505.AD1E57013C@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/traceroute/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6982

Modified Files:
	sources traceroute.spec 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/traceroute/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	17 Apr 2008 11:59:40 -0000	1.14
+++ sources	17 Sep 2008 15:34:35 -0000	1.15
@@ -1 +1 @@
-4a1a1b5e07ee24c1c2612a63652223b2  traceroute-2.0.10.tar.gz
+2262a9d30ae85f12b759a38ef827f8f7  traceroute-2.0.12.tar.gz


Index: traceroute.spec
===================================================================
RCS file: /cvs/extras/rpms/traceroute/F-9/traceroute.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- traceroute.spec	17 Apr 2008 11:59:40 -0000	1.37
+++ traceroute.spec	17 Sep 2008 15:34:35 -0000	1.38
@@ -1,10 +1,10 @@
 Summary: Traces the route taken by packets over an IPv4/IPv6 network
 Name: traceroute
 Epoch: 3
-Version: 2.0.10
+Version: 2.0.12
 Release: 1%{?dist}
 Group: Applications/Internet
-License: GPL
+License: GPLv2+
 URL:  http://traceroute.sourceforge.net
 Source0: http://dl.sourceforge.net/traceroute/traceroute-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,7 +37,6 @@
 install -m755 traceroute/traceroute $RPM_BUILD_ROOT/bin
 pushd $RPM_BUILD_ROOT/bin
 ln -s traceroute traceroute6
-ln -s traceroute tracert
 popd
 
 install -d $RPM_BUILD_ROOT%{_mandir}/man8
@@ -59,6 +58,15 @@
 
 
 %changelog
+* Wed Sep 17 2008 Dmitry Butskoy <Dmitry at Butskoy.name>  - 3:2.0.12-1
+- update to 2.0.12 (fixes #461278 and #461626)
+- this release adds support for icmp extensions (including MPLS),
+  which was expected for a long time (#176588)
+- drop "tracert" symlink (#461109)
+
+* Mon May 19 2008 Dmitry Butskoy <Dmitry at Butskoy.name>  - 3:2.0.11-1
+- update to 2.0.11
+
 * Thu Apr 17 2008 Dmitry Butskoy <Dmitry at Butskoy.name>  - 3:2.0.10-1
 - upgrade to 2.0.10 (fixes #245438 and ipv6 tracerouting for new kernels)
 



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:16 +0000
Subject: [pkgdb] man-pages-fr: pertusus has requested commit
Message-ID: <20080917153316.7BBDD208E35@bastion.fedora.phx.redhat.com>

pertusus has requested the commit acl on man-pages-fr (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:32:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:32:45 +0000
Subject: [pkgdb] piklab: dionysos has given up watchbugzilla
Message-ID: <20080917153245.7A1762E0005@bastion.fedora.phx.redhat.com>

dionysos has given up the watchbugzilla acl on piklab (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From pkgdb at fedoraproject.org  Wed Sep 17 15:32:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:32:55 +0000
Subject: [pkgdb] piklab: dionysos has given up approveacls
Message-ID: <20080917153255.9EE492E001A@bastion.fedora.phx.redhat.com>

dionysos has given up the approveacls acl on piklab (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From pkgdb at fedoraproject.org  Wed Sep 17 15:32:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:32:37 +0000
Subject: [pkgdb] piklab: dionysos has given up commit
Message-ID: <20080917153237.C97A4208E25@bastion.fedora.phx.redhat.com>

dionysos has given up the commit acl on piklab (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:02 +0000
Subject: [pkgdb] piklab: dionysos has given up commit
Message-ID: <20080917153302.60B8C2E002F@bastion.fedora.phx.redhat.com>

dionysos has given up the commit acl on piklab (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:35 +0000
Subject: [pkgdb] man-pages-fr: pertusus has requested approveacls
Message-ID: <20080917153335.5A5D02E0046@bastion.fedora.phx.redhat.com>

pertusus has requested the approveacls acl on man-pages-fr (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:43 +0000
Subject: [pkgdb] man-pages-fr: pertusus has requested commit
Message-ID: <20080917153343.3DBA02E0050@bastion.fedora.phx.redhat.com>

pertusus has requested the commit acl on man-pages-fr (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:39:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:39:09 +0000
Subject: [pkgdb] pam_passwdqc had acl change status
Message-ID: <20080917153909.41EFF2E00B7@bastion.fedora.phx.redhat.com>

avesh has set the watchbugzilla acl on pam_passwdqc (Fedora devel) to Approved for tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_passwdqc



From pkgdb at fedoraproject.org  Wed Sep 17 15:27:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:27:58 +0000
Subject: [pkgdb] tetex-eurofont ownership updated
Message-ID: <20080917152758.7785D208DC7@bastion.fedora.phx.redhat.com>

Package tetex-eurofont in Fedora 4 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tetex-eurofont



From pkgdb at fedoraproject.org  Wed Sep 17 15:37:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:37:56 +0000
Subject: [pkgdb] pam_passwdqc had acl change status
Message-ID: <20080917153756.C13AD2E00A7@bastion.fedora.phx.redhat.com>

avesh has set the watchbugzilla acl on pam_passwdqc (Fedora 9) to Approved for tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_passwdqc



From pkgdb at fedoraproject.org  Wed Sep 17 15:39:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:39:57 +0000
Subject: [pkgdb] pam_ccreds had acl change status
Message-ID: <20080917153957.2963A2E00CC@bastion.fedora.phx.redhat.com>

avesh has set the watchcommits acl on pam_ccreds (Fedora 9) to Approved for tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_ccreds



From pkgdb at fedoraproject.org  Wed Sep 17 15:32:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:32:21 +0000
Subject: [pkgdb] fcron ownership updated
Message-ID: <20080917153221.7C9D9208E16@bastion.fedora.phx.redhat.com>

Package fcron in Fedora 9 is now owned by pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fcron



From pkgdb at fedoraproject.org  Wed Sep 17 15:27:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:27:53 +0000
Subject: [pkgdb] tetex-eurofont ownership updated
Message-ID: <20080917152753.84C22208DBE@bastion.fedora.phx.redhat.com>

Package tetex-eurofont in Fedora 2 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tetex-eurofont



From pkgdb at fedoraproject.org  Wed Sep 17 15:28:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:28:00 +0000
Subject: [pkgdb] tetex-eurofont ownership updated
Message-ID: <20080917152800.E62FF208DCA@bastion.fedora.phx.redhat.com>

Package tetex-eurofont in Fedora 5 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tetex-eurofont



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:14 +0000
Subject: [pkgdb] man-pages-fr: pertusus has requested watchcommits
Message-ID: <20080917153314.29AA7208E2E@bastion.fedora.phx.redhat.com>

pertusus has requested the watchcommits acl on man-pages-fr (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:32:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:32:36 +0000
Subject: [pkgdb] piklab: dionysos has given up watchcommits
Message-ID: <20080917153236.B61EE208E22@bastion.fedora.phx.redhat.com>

dionysos has given up the watchcommits acl on piklab (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From pkgdb at fedoraproject.org  Wed Sep 17 15:27:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:27:49 +0000
Subject: [pkgdb] tetex-eurofont ownership updated
Message-ID: <20080917152749.1BA4A208DAE@bastion.fedora.phx.redhat.com>

Package tetex-eurofont in Fedora 7 was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tetex-eurofont



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:05 +0000
Subject: [pkgdb] piklab: dionysos has given up watchbugzilla
Message-ID: <20080917153305.A56962E0033@bastion.fedora.phx.redhat.com>

dionysos has given up the watchbugzilla acl on piklab (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:27 +0000
Subject: [pkgdb] man-pages-fr: pertusus has requested watchbugzilla
Message-ID: <20080917153327.925EA2E003D@bastion.fedora.phx.redhat.com>

pertusus has requested the watchbugzilla acl on man-pages-fr (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:32:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:32:47 +0000
Subject: [pkgdb] piklab: dionysos has given up commit
Message-ID: <20080917153248.0B6362E000B@bastion.fedora.phx.redhat.com>

dionysos has given up the commit acl on piklab (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From hardaker at fedoraproject.org  Wed Sep 17 15:40:27 2008
From: hardaker at fedoraproject.org (Wes Hardaker)
Date: Wed, 17 Sep 2008 15:40:27 +0000 (UTC)
Subject: rpms/perl-QWizard/F-8 perl-QWizard.spec,1.4,1.5
Message-ID: <20080917154027.B4C017013C@cvs1.fedora.phx.redhat.com>

Author: hardaker

Update of /cvs/extras/rpms/perl-QWizard/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7889

Modified Files:
	perl-QWizard.spec 
Log Message:
update to 3.15


Index: perl-QWizard.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-QWizard/F-8/perl-QWizard.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-QWizard.spec	29 Apr 2008 21:35:33 -0000	1.4
+++ perl-QWizard.spec	17 Sep 2008 15:39:57 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-QWizard
-Version:        3.14
+Version:        3.15
 Release:        1%{?dist}
 Summary:        A very portable graphical question and answer wizard system
 License:        GPL+ or Artistic 
@@ -73,6 +73,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 17 2008 Wes Hardaker <wjhns174 at hardakers.net> - 3.15-1
+- Update to latest upstream bug fixes
+
+* Fri Jul 18 2008 Wes Hardaker <wjhns174 at hardakers.net> - 3.14-2
+- Version bump for build issues
+
 * Tue Apr 29 2008 Wes Hardaker <wjhns174 at hardakers.net> - 3.14-1
 - Update to latest upstream for bug fixes and minor new features
 



From pkgdb at fedoraproject.org  Wed Sep 17 15:32:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:32:35 +0000
Subject: [pkgdb] piklab: dionysos has given up watchbugzilla
Message-ID: <20080917153235.C58E3208E1F@bastion.fedora.phx.redhat.com>

dionysos has given up the watchbugzilla acl on piklab (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From pkgdb at fedoraproject.org  Wed Sep 17 15:39:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:39:54 +0000
Subject: [pkgdb] pam_ccreds had acl change status
Message-ID: <20080917153954.A31572E00C9@bastion.fedora.phx.redhat.com>

avesh has set the watchbugzilla acl on pam_ccreds (Fedora 9) to Approved for tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_ccreds



From pkgdb at fedoraproject.org  Wed Sep 17 15:33:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:33:00 +0000
Subject: [pkgdb] piklab: dionysos has given up watchbugzilla
Message-ID: <20080917153300.D117E2E0029@bastion.fedora.phx.redhat.com>

dionysos has given up the watchbugzilla acl on piklab (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piklab



From hardaker at fedoraproject.org  Wed Sep 17 16:06:13 2008
From: hardaker at fedoraproject.org (Wes Hardaker)
Date: Wed, 17 Sep 2008 16:06:13 +0000 (UTC)
Subject: rpms/perl-QWizard/devel .cvsignore, 1.4, 1.5 perl-QWizard.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20080917160613.F33AB7013C@cvs1.fedora.phx.redhat.com>

Author: hardaker

Update of /cvs/extras/rpms/perl-QWizard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11715

Modified Files:
	.cvsignore perl-QWizard.spec sources 
Log Message:
update to 3.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-QWizard/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Apr 2008 21:18:52 -0000	1.4
+++ .cvsignore	17 Sep 2008 16:05:43 -0000	1.5
@@ -1 +1 @@
-QWizard-3.14.tar.gz
+QWizard-3.15.tar.gz


Index: perl-QWizard.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-QWizard/devel/perl-QWizard.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-QWizard.spec	29 Apr 2008 21:17:47 -0000	1.5
+++ perl-QWizard.spec	17 Sep 2008 16:05:43 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-QWizard
-Version:        3.14
+Version:        3.15
 Release:        1%{?dist}
 Summary:        A very portable graphical question and answer wizard system
 License:        GPL+ or Artistic 
@@ -73,12 +73,15 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 17 2008 Wes Hardaker <wjhns174 at hardakers.net> - 3.15-1
+- Update to latest upstream bug fixes
+
+* Fri Jul 18 2008 Wes Hardaker <wjhns174 at hardakers.net> - 3.14-2
+- Version bump for build issues
+
 * Tue Apr 29 2008 Wes Hardaker <wjhns174 at hardakers.net> - 3.14-1
 - Update to latest upstream for bug fixes and minor new features
 
-* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.13-3
-Rebuild for new perl
-
 * Sat Dec 22 2007 Wes Hardaker <wjhns174 at hardakers.net> - 3.13-2
 - remove patch now in base
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-QWizard/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Apr 2008 21:18:52 -0000	1.4
+++ sources	17 Sep 2008 16:05:43 -0000	1.5
@@ -1 +1 @@
-f45cf8e3faa251478cffc511193bd2e8  QWizard-3.14.tar.gz
+e5cf695466d39ad6c7f242ad58b7ad97  QWizard-3.15.tar.gz



From spot at fedoraproject.org  Wed Sep 17 16:08:17 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 17 Sep 2008 16:08:17 +0000 (UTC)
Subject: rpms/HelixPlayer/devel dead.package, NONE,
	1.1 HelixPlayer-1.0.3-disable-asm.patch, 1.1,
	NONE HelixPlayer-1.0.5-missing-header.patch, 1.1,
	NONE HelixPlayer-1.0.7-CVE-2007-3410.patch, 1.1,
	NONE HelixPlayer-1.0.7-ogg.patch, 1.1,
	NONE HelixPlayer-1.0.beta20040615-cvs-no-update.patch, 1.1,
	NONE HelixPlayer-buildrc, 1.1, NONE HelixPlayer.spec, 1.8,
	NONE hxplay-1.0.4-nptl.patch, 1.1, NONE sources, 1.3, NONE
Message-ID: <20080917160817.EACCE7013C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/HelixPlayer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12126

Added Files:
	dead.package 
Removed Files:
	HelixPlayer-1.0.3-disable-asm.patch 
	HelixPlayer-1.0.5-missing-header.patch 
	HelixPlayer-1.0.7-CVE-2007-3410.patch 
	HelixPlayer-1.0.7-ogg.patch 
	HelixPlayer-1.0.beta20040615-cvs-no-update.patch 
	HelixPlayer-buildrc HelixPlayer.spec hxplay-1.0.4-nptl.patch 
	sources 
Log Message:
die you zombie, die!


--- NEW FILE dead.package ---
This package was clearly infringing upon multiple patents. It also had multiple local copies of system libraries, and was begging for security vulnerabilities.
I have nuked it with the Fedora Orbital Lazer.

Please think long and hard before even considering reviving this package.

Tom "spot" Callaway <tcallawa at redhat.com> Wed Sept 17, 2008


--- HelixPlayer-1.0.3-disable-asm.patch DELETED ---


--- HelixPlayer-1.0.5-missing-header.patch DELETED ---


--- HelixPlayer-1.0.7-CVE-2007-3410.patch DELETED ---


--- HelixPlayer-1.0.7-ogg.patch DELETED ---


--- HelixPlayer-1.0.beta20040615-cvs-no-update.patch DELETED ---


--- HelixPlayer-buildrc DELETED ---


--- HelixPlayer.spec DELETED ---


--- hxplay-1.0.4-nptl.patch DELETED ---


--- sources DELETED ---



From spot at fedoraproject.org  Wed Sep 17 16:12:04 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 17 Sep 2008 16:12:04 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.107,1.108
Message-ID: <20080917161204.AE5F67013C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12530

Modified Files:
	comps-f10.xml.in 
Log Message:
get rid of HelixPlayer


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- comps-f10.xml.in	16 Sep 2008 02:21:39 -0000	1.107
+++ comps-f10.xml.in	17 Sep 2008 16:11:34 -0000	1.108
@@ -3874,7 +3874,6 @@
       <packagereq type="optional">gnomeradio</packagereq>
       <packagereq type="optional">grip</packagereq>
       <packagereq type="optional">gtkpod</packagereq>
-      <packagereq type="optional">HelixPlayer</packagereq>
       <packagereq type="optional">id3v2</packagereq>
       <packagereq type="optional">isomaster</packagereq>
       <packagereq type="optional">jack-audio-connection-kit</packagereq>



From pkgdb at fedoraproject.org  Wed Sep 17 16:13:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 16:13:08 +0000
Subject: [pkgdb] pciutils ownership updated
Message-ID: <20080917161308.797E8208D9B@bastion.fedora.phx.redhat.com>

Package pciutils in Fedora devel was orphaned by harald

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pciutils



From pkgdb at fedoraproject.org  Wed Sep 17 16:13:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 16:13:10 +0000
Subject: [pkgdb] pciutils ownership updated
Message-ID: <20080917161310.447A6208DA0@bastion.fedora.phx.redhat.com>

Package pciutils in Fedora 7 was orphaned by harald

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pciutils



From pkgdb at fedoraproject.org  Wed Sep 17 16:13:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 16:13:11 +0000
Subject: [pkgdb] pciutils ownership updated
Message-ID: <20080917161312.078BC208DAC@bastion.fedora.phx.redhat.com>

Package pciutils in Fedora 8 was orphaned by harald

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pciutils



From pkgdb at fedoraproject.org  Wed Sep 17 16:13:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 16:13:12 +0000
Subject: [pkgdb] pciutils ownership updated
Message-ID: <20080917161312.A48B8208DAF@bastion.fedora.phx.redhat.com>

Package pciutils in Fedora 9 was orphaned by harald

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pciutils



From pkgdb at fedoraproject.org  Wed Sep 17 16:13:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 16:13:38 +0000
Subject: [pkgdb] pciutils ownership updated
Message-ID: <20080917161339.17617208DA0@bastion.fedora.phx.redhat.com>

Package pciutils in Fedora devel is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pciutils



From pkgdb at fedoraproject.org  Wed Sep 17 16:13:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 16:13:41 +0000
Subject: [pkgdb] pciutils ownership updated
Message-ID: <20080917161341.BECAB208DB5@bastion.fedora.phx.redhat.com>

Package pciutils in Fedora 8 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pciutils



From pkgdb at fedoraproject.org  Wed Sep 17 16:13:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 16:13:43 +0000
Subject: [pkgdb] pciutils ownership updated
Message-ID: <20080917161343.96460208DBE@bastion.fedora.phx.redhat.com>

Package pciutils in Fedora 9 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pciutils



From alikins at fedoraproject.org  Wed Sep 17 16:13:59 2008
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 17 Sep 2008 16:13:59 +0000 (UTC)
Subject: rpms/func/EL-4 .cvsignore, 1.8, 1.9 func.spec, 1.7, 1.8 sources, 1.8,
	1.9 version, 1.7, 1.8
Message-ID: <20080917161359.5476B7013C@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/func/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12829/EL-4

Modified Files:
	.cvsignore func.spec sources version 
Log Message:
func 0.23 build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	2 Jul 2008 19:44:58 -0000	1.8
+++ .cvsignore	17 Sep 2008 16:13:28 -0000	1.9
@@ -5,3 +5,4 @@
 func-0.18.tar.gz
 func-0.20.tar.gz
 func-0.21.tar.gz
+func-0.23.tar.gz


Index: func.spec
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-4/func.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- func.spec	2 Jul 2008 19:44:58 -0000	1.7
+++ func.spec	17 Sep 2008 16:13:28 -0000	1.8
@@ -13,6 +13,7 @@
 Group: Applications/System
 Requires: python >= 2.3
 Requires: pyOpenSSL
+Requires: python-simplejson
 Requires: certmaster >= 0.1
 BuildRequires: python-devel
 %if %is_suse
@@ -54,6 +55,8 @@
 %{_bindir}/func
 %{_bindir}/func-inventory
 %{_bindir}/func-create-module
+%{_bindir}/func-transmit
+%{_bindir}/func-build-map
 #%{_bindir}/update-func
 /etc/init.d/funcd
 %dir %{_sysconfdir}/%{name}
@@ -66,10 +69,12 @@
 %dir %{python_sitelib}/func/minion
 %dir %{python_sitelib}/func/overlord
 %dir %{python_sitelib}/func/overlord/cmd_modules
+%dir %{python_sitelib}/func/yaml
 %{python_sitelib}/func/minion/*.py*
 %{python_sitelib}/func/overlord/*.py*
 %{python_sitelib}/func/overlord/cmd_modules/*.py*
 %{python_sitelib}/func/overlord/modules/*.py*
+%{python_sitelib}/func/yaml/*.py*
 %{python_sitelib}/func/*.py*
 %dir %{python_sitelib}/func/minion/modules
 %{python_sitelib}/func/minion/modules/*.py*
@@ -85,6 +90,7 @@
 %{_mandir}/man1/func.1.gz
 %{_mandir}/man1/func-inventory.1.gz
 %{_mandir}/man1/funcd.1.gz
+%{_mandir}/man1/func-transmit.1.gz
 
 
 %post
@@ -124,6 +130,15 @@
 
 
 %changelog
+* Fri Jul 18 2008 Adrian Likins <alikins at redhat.com> - 0.23-1
+- remove requirement for pyyaml, add python-simplejson
+
+* Fri Jul 11 2008 Michael DeHaan <mdehaan at redhat.com> - 0.23-1
+- (for ssalevan) adding in mapping/delegation tools
+
+* Mon Jul 07 2008 Michael DeHaan <mdehaan at redhat.com> - 0.22-1
+- packaged func-transmit script
+
 * Wed Jul 02 2008 Michael DeHaan <mdehaan at redhat.com> - 0.21-1
 - new release, upstream changes
 
@@ -134,6 +149,7 @@
 - fix fedora bug #441283 - typo in postinstall scriptlet
   (the init.d symlinks for runlevels 1 and 6 were created wrong)
 
+
 * Mon Mar 03 2008 Adrian Likins <alikins at redhat.com> - 0.18-1
 - split off certmaster
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Jul 2008 19:44:58 -0000	1.8
+++ sources	17 Sep 2008 16:13:28 -0000	1.9
@@ -3,3 +3,4 @@
 def199858286218daef908e871f2e7ca  func-0.18.tar.gz
 2ea0cc2735e4764ad8cb11bd6edae47e  func-0.20.tar.gz
 715638833720c85076fe04cd2e31fc32  func-0.21.tar.gz
+821f5ba123d7fe2e98aa51b8f00a17c2  func-0.23.tar.gz


Index: version
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-4/version,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- version	2 Jul 2008 19:44:58 -0000	1.7
+++ version	17 Sep 2008 16:13:28 -0000	1.8
@@ -1 +1 @@
-0.21 1
+0.23 1



From alikins at fedoraproject.org  Wed Sep 17 16:13:59 2008
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 17 Sep 2008 16:13:59 +0000 (UTC)
Subject: rpms/func/EL-5 .cvsignore, 1.8, 1.9 func.spec, 1.7, 1.8 sources, 1.8,
	1.9 version, 1.7, 1.8
Message-ID: <20080917161359.78E687013C@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/func/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12829/EL-5

Modified Files:
	.cvsignore func.spec sources version 
Log Message:
func 0.23 build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	2 Jul 2008 19:45:22 -0000	1.8
+++ .cvsignore	17 Sep 2008 16:13:29 -0000	1.9
@@ -5,3 +5,4 @@
 func-0.18.tar.gz
 func-0.20.tar.gz
 func-0.21.tar.gz
+func-0.23.tar.gz


Index: func.spec
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-5/func.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- func.spec	2 Jul 2008 19:45:22 -0000	1.7
+++ func.spec	17 Sep 2008 16:13:29 -0000	1.8
@@ -13,6 +13,7 @@
 Group: Applications/System
 Requires: python >= 2.3
 Requires: pyOpenSSL
+Requires: python-simplejson
 Requires: certmaster >= 0.1
 BuildRequires: python-devel
 %if %is_suse
@@ -54,6 +55,8 @@
 %{_bindir}/func
 %{_bindir}/func-inventory
 %{_bindir}/func-create-module
+%{_bindir}/func-transmit
+%{_bindir}/func-build-map
 #%{_bindir}/update-func
 /etc/init.d/funcd
 %dir %{_sysconfdir}/%{name}
@@ -66,10 +69,12 @@
 %dir %{python_sitelib}/func/minion
 %dir %{python_sitelib}/func/overlord
 %dir %{python_sitelib}/func/overlord/cmd_modules
+%dir %{python_sitelib}/func/yaml
 %{python_sitelib}/func/minion/*.py*
 %{python_sitelib}/func/overlord/*.py*
 %{python_sitelib}/func/overlord/cmd_modules/*.py*
 %{python_sitelib}/func/overlord/modules/*.py*
+%{python_sitelib}/func/yaml/*.py*
 %{python_sitelib}/func/*.py*
 %dir %{python_sitelib}/func/minion/modules
 %{python_sitelib}/func/minion/modules/*.py*
@@ -85,6 +90,7 @@
 %{_mandir}/man1/func.1.gz
 %{_mandir}/man1/func-inventory.1.gz
 %{_mandir}/man1/funcd.1.gz
+%{_mandir}/man1/func-transmit.1.gz
 
 
 %post
@@ -124,6 +130,15 @@
 
 
 %changelog
+* Fri Jul 18 2008 Adrian Likins <alikins at redhat.com> - 0.23-1
+- remove requirement for pyyaml, add python-simplejson
+
+* Fri Jul 11 2008 Michael DeHaan <mdehaan at redhat.com> - 0.23-1
+- (for ssalevan) adding in mapping/delegation tools
+
+* Mon Jul 07 2008 Michael DeHaan <mdehaan at redhat.com> - 0.22-1
+- packaged func-transmit script
+
 * Wed Jul 02 2008 Michael DeHaan <mdehaan at redhat.com> - 0.21-1
 - new release, upstream changes
 
@@ -134,6 +149,7 @@
 - fix fedora bug #441283 - typo in postinstall scriptlet
   (the init.d symlinks for runlevels 1 and 6 were created wrong)
 
+
 * Mon Mar 03 2008 Adrian Likins <alikins at redhat.com> - 0.18-1
 - split off certmaster
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Jul 2008 19:45:22 -0000	1.8
+++ sources	17 Sep 2008 16:13:29 -0000	1.9
@@ -3,3 +3,4 @@
 def199858286218daef908e871f2e7ca  func-0.18.tar.gz
 2ea0cc2735e4764ad8cb11bd6edae47e  func-0.20.tar.gz
 715638833720c85076fe04cd2e31fc32  func-0.21.tar.gz
+821f5ba123d7fe2e98aa51b8f00a17c2  func-0.23.tar.gz


Index: version
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-5/version,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- version	2 Jul 2008 19:45:22 -0000	1.7
+++ version	17 Sep 2008 16:13:29 -0000	1.8
@@ -1 +1 @@
-0.21 1
+0.23 1



From alikins at fedoraproject.org  Wed Sep 17 16:14:00 2008
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 17 Sep 2008 16:14:00 +0000 (UTC)
Subject: rpms/func/F-8 .cvsignore, 1.8, 1.9 func.spec, 1.7, 1.8 sources, 1.8,
	1.9 version, 1.7, 1.8
Message-ID: <20080917161400.0E5FA7013C@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/func/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12829/F-8

Modified Files:
	.cvsignore func.spec sources version 
Log Message:
func 0.23 build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-8/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	2 Jul 2008 19:46:07 -0000	1.8
+++ .cvsignore	17 Sep 2008 16:13:29 -0000	1.9
@@ -5,3 +5,4 @@
 func-0.18.tar.gz
 func-0.20.tar.gz
 func-0.21.tar.gz
+func-0.23.tar.gz


Index: func.spec
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-8/func.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- func.spec	2 Jul 2008 19:46:07 -0000	1.7
+++ func.spec	17 Sep 2008 16:13:29 -0000	1.8
@@ -13,6 +13,7 @@
 Group: Applications/System
 Requires: python >= 2.3
 Requires: pyOpenSSL
+Requires: python-simplejson
 Requires: certmaster >= 0.1
 BuildRequires: python-devel
 %if %is_suse
@@ -54,6 +55,8 @@
 %{_bindir}/func
 %{_bindir}/func-inventory
 %{_bindir}/func-create-module
+%{_bindir}/func-transmit
+%{_bindir}/func-build-map
 #%{_bindir}/update-func
 /etc/init.d/funcd
 %dir %{_sysconfdir}/%{name}
@@ -66,10 +69,12 @@
 %dir %{python_sitelib}/func/minion
 %dir %{python_sitelib}/func/overlord
 %dir %{python_sitelib}/func/overlord/cmd_modules
+%dir %{python_sitelib}/func/yaml
 %{python_sitelib}/func/minion/*.py*
 %{python_sitelib}/func/overlord/*.py*
 %{python_sitelib}/func/overlord/cmd_modules/*.py*
 %{python_sitelib}/func/overlord/modules/*.py*
+%{python_sitelib}/func/yaml/*.py*
 %{python_sitelib}/func/*.py*
 %dir %{python_sitelib}/func/minion/modules
 %{python_sitelib}/func/minion/modules/*.py*
@@ -85,6 +90,7 @@
 %{_mandir}/man1/func.1.gz
 %{_mandir}/man1/func-inventory.1.gz
 %{_mandir}/man1/funcd.1.gz
+%{_mandir}/man1/func-transmit.1.gz
 
 
 %post
@@ -124,6 +130,15 @@
 
 
 %changelog
+* Fri Jul 18 2008 Adrian Likins <alikins at redhat.com> - 0.23-1
+- remove requirement for pyyaml, add python-simplejson
+
+* Fri Jul 11 2008 Michael DeHaan <mdehaan at redhat.com> - 0.23-1
+- (for ssalevan) adding in mapping/delegation tools
+
+* Mon Jul 07 2008 Michael DeHaan <mdehaan at redhat.com> - 0.22-1
+- packaged func-transmit script
+
 * Wed Jul 02 2008 Michael DeHaan <mdehaan at redhat.com> - 0.21-1
 - new release, upstream changes
 
@@ -134,6 +149,7 @@
 - fix fedora bug #441283 - typo in postinstall scriptlet
   (the init.d symlinks for runlevels 1 and 6 were created wrong)
 
+
 * Mon Mar 03 2008 Adrian Likins <alikins at redhat.com> - 0.18-1
 - split off certmaster
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-8/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Jul 2008 19:46:07 -0000	1.8
+++ sources	17 Sep 2008 16:13:29 -0000	1.9
@@ -3,3 +3,4 @@
 def199858286218daef908e871f2e7ca  func-0.18.tar.gz
 2ea0cc2735e4764ad8cb11bd6edae47e  func-0.20.tar.gz
 715638833720c85076fe04cd2e31fc32  func-0.21.tar.gz
+821f5ba123d7fe2e98aa51b8f00a17c2  func-0.23.tar.gz


Index: version
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-8/version,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- version	2 Jul 2008 19:46:07 -0000	1.7
+++ version	17 Sep 2008 16:13:29 -0000	1.8
@@ -1 +1 @@
-0.21 1
+0.23 1



From alikins at fedoraproject.org  Wed Sep 17 16:14:00 2008
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 17 Sep 2008 16:14:00 +0000 (UTC)
Subject: rpms/func/F-9 .cvsignore, 1.8, 1.9 func.spec, 1.9, 1.10 sources, 1.9,
	1.10 version, 1.8, 1.9
Message-ID: <20080917161400.520AD7013C@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/func/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12829/F-9

Modified Files:
	.cvsignore func.spec sources version 
Log Message:
func 0.23 build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	2 Jul 2008 19:46:25 -0000	1.8
+++ .cvsignore	17 Sep 2008 16:13:30 -0000	1.9
@@ -5,3 +5,4 @@
 func-0.18.tar.gz
 func-0.20.tar.gz
 func-0.21.tar.gz
+func-0.23.tar.gz


Index: func.spec
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-9/func.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- func.spec	2 Jul 2008 19:46:25 -0000	1.9
+++ func.spec	17 Sep 2008 16:13:30 -0000	1.10
@@ -13,6 +13,7 @@
 Group: Applications/System
 Requires: python >= 2.3
 Requires: pyOpenSSL
+Requires: python-simplejson
 Requires: certmaster >= 0.1
 BuildRequires: python-devel
 %if %is_suse
@@ -54,6 +55,8 @@
 %{_bindir}/func
 %{_bindir}/func-inventory
 %{_bindir}/func-create-module
+%{_bindir}/func-transmit
+%{_bindir}/func-build-map
 #%{_bindir}/update-func
 /etc/init.d/funcd
 %dir %{_sysconfdir}/%{name}
@@ -66,10 +69,12 @@
 %dir %{python_sitelib}/func/minion
 %dir %{python_sitelib}/func/overlord
 %dir %{python_sitelib}/func/overlord/cmd_modules
+%dir %{python_sitelib}/func/yaml
 %{python_sitelib}/func/minion/*.py*
 %{python_sitelib}/func/overlord/*.py*
 %{python_sitelib}/func/overlord/cmd_modules/*.py*
 %{python_sitelib}/func/overlord/modules/*.py*
+%{python_sitelib}/func/yaml/*.py*
 %{python_sitelib}/func/*.py*
 %dir %{python_sitelib}/func/minion/modules
 %{python_sitelib}/func/minion/modules/*.py*
@@ -85,6 +90,7 @@
 %{_mandir}/man1/func.1.gz
 %{_mandir}/man1/func-inventory.1.gz
 %{_mandir}/man1/funcd.1.gz
+%{_mandir}/man1/func-transmit.1.gz
 
 
 %post
@@ -124,6 +130,15 @@
 
 
 %changelog
+* Fri Jul 18 2008 Adrian Likins <alikins at redhat.com> - 0.23-1
+- remove requirement for pyyaml, add python-simplejson
+
+* Fri Jul 11 2008 Michael DeHaan <mdehaan at redhat.com> - 0.23-1
+- (for ssalevan) adding in mapping/delegation tools
+
+* Mon Jul 07 2008 Michael DeHaan <mdehaan at redhat.com> - 0.22-1
+- packaged func-transmit script
+
 * Wed Jul 02 2008 Michael DeHaan <mdehaan at redhat.com> - 0.21-1
 - new release, upstream changes
 
@@ -134,6 +149,7 @@
 - fix fedora bug #441283 - typo in postinstall scriptlet
   (the init.d symlinks for runlevels 1 and 6 were created wrong)
 
+
 * Mon Mar 03 2008 Adrian Likins <alikins at redhat.com> - 0.18-1
 - split off certmaster
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	2 Jul 2008 19:46:25 -0000	1.9
+++ sources	17 Sep 2008 16:13:30 -0000	1.10
@@ -2,3 +2,4 @@
 def199858286218daef908e871f2e7ca  func-0.18.tar.gz
 2ea0cc2735e4764ad8cb11bd6edae47e  func-0.20.tar.gz
 715638833720c85076fe04cd2e31fc32  func-0.21.tar.gz
+821f5ba123d7fe2e98aa51b8f00a17c2  func-0.23.tar.gz


Index: version
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-9/version,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- version	2 Jul 2008 19:46:25 -0000	1.8
+++ version	17 Sep 2008 16:13:30 -0000	1.9
@@ -1 +1 @@
-0.21 1
+0.23 1



From alikins at fedoraproject.org  Wed Sep 17 16:14:00 2008
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 17 Sep 2008 16:14:00 +0000 (UTC)
Subject: rpms/func/devel .cvsignore,1.8,1.9 sources,1.9,1.10
Message-ID: <20080917161400.936087013C@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/func/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12829/devel

Modified Files:
	.cvsignore sources 
Log Message:
func 0.23 build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/func/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	2 Jul 2008 19:47:00 -0000	1.8
+++ .cvsignore	17 Sep 2008 16:13:30 -0000	1.9
@@ -5,3 +5,4 @@
 func-0.18.tar.gz
 func-0.20.tar.gz
 func-0.21.tar.gz
+func-0.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/func/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	2 Jul 2008 19:47:00 -0000	1.9
+++ sources	17 Sep 2008 16:13:30 -0000	1.10
@@ -2,3 +2,4 @@
 def199858286218daef908e871f2e7ca  func-0.18.tar.gz
 04b5f281a8f68fdeca61059c2896d1a3  func-0.20.tar.gz
 715638833720c85076fe04cd2e31fc32  func-0.21.tar.gz
+821f5ba123d7fe2e98aa51b8f00a17c2  func-0.23.tar.gz



From alikins at fedoraproject.org  Wed Sep 17 16:13:59 2008
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 17 Sep 2008 16:13:59 +0000 (UTC)
Subject: rpms/func/F-7 .cvsignore, 1.8, 1.9 func.spec, 1.7, 1.8 sources, 1.8,
	1.9 version, 1.7, 1.8
Message-ID: <20080917161359.BFA137013C@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/func/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12829/F-7

Modified Files:
	.cvsignore func.spec sources version 
Log Message:
func 0.23 build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	2 Jul 2008 19:45:42 -0000	1.8
+++ .cvsignore	17 Sep 2008 16:13:29 -0000	1.9
@@ -5,3 +5,4 @@
 func-0.18.tar.gz
 func-0.20.tar.gz
 func-0.21.tar.gz
+func-0.23.tar.gz


Index: func.spec
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-7/func.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- func.spec	2 Jul 2008 19:45:42 -0000	1.7
+++ func.spec	17 Sep 2008 16:13:29 -0000	1.8
@@ -13,6 +13,7 @@
 Group: Applications/System
 Requires: python >= 2.3
 Requires: pyOpenSSL
+Requires: python-simplejson
 Requires: certmaster >= 0.1
 BuildRequires: python-devel
 %if %is_suse
@@ -54,6 +55,8 @@
 %{_bindir}/func
 %{_bindir}/func-inventory
 %{_bindir}/func-create-module
+%{_bindir}/func-transmit
+%{_bindir}/func-build-map
 #%{_bindir}/update-func
 /etc/init.d/funcd
 %dir %{_sysconfdir}/%{name}
@@ -66,10 +69,12 @@
 %dir %{python_sitelib}/func/minion
 %dir %{python_sitelib}/func/overlord
 %dir %{python_sitelib}/func/overlord/cmd_modules
+%dir %{python_sitelib}/func/yaml
 %{python_sitelib}/func/minion/*.py*
 %{python_sitelib}/func/overlord/*.py*
 %{python_sitelib}/func/overlord/cmd_modules/*.py*
 %{python_sitelib}/func/overlord/modules/*.py*
+%{python_sitelib}/func/yaml/*.py*
 %{python_sitelib}/func/*.py*
 %dir %{python_sitelib}/func/minion/modules
 %{python_sitelib}/func/minion/modules/*.py*
@@ -85,6 +90,7 @@
 %{_mandir}/man1/func.1.gz
 %{_mandir}/man1/func-inventory.1.gz
 %{_mandir}/man1/funcd.1.gz
+%{_mandir}/man1/func-transmit.1.gz
 
 
 %post
@@ -124,6 +130,15 @@
 
 
 %changelog
+* Fri Jul 18 2008 Adrian Likins <alikins at redhat.com> - 0.23-1
+- remove requirement for pyyaml, add python-simplejson
+
+* Fri Jul 11 2008 Michael DeHaan <mdehaan at redhat.com> - 0.23-1
+- (for ssalevan) adding in mapping/delegation tools
+
+* Mon Jul 07 2008 Michael DeHaan <mdehaan at redhat.com> - 0.22-1
+- packaged func-transmit script
+
 * Wed Jul 02 2008 Michael DeHaan <mdehaan at redhat.com> - 0.21-1
 - new release, upstream changes
 
@@ -134,6 +149,7 @@
 - fix fedora bug #441283 - typo in postinstall scriptlet
   (the init.d symlinks for runlevels 1 and 6 were created wrong)
 
+
 * Mon Mar 03 2008 Adrian Likins <alikins at redhat.com> - 0.18-1
 - split off certmaster
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Jul 2008 19:45:42 -0000	1.8
+++ sources	17 Sep 2008 16:13:29 -0000	1.9
@@ -3,3 +3,4 @@
 def199858286218daef908e871f2e7ca  func-0.18.tar.gz
 2ea0cc2735e4764ad8cb11bd6edae47e  func-0.20.tar.gz
 715638833720c85076fe04cd2e31fc32  func-0.21.tar.gz
+821f5ba123d7fe2e98aa51b8f00a17c2  func-0.23.tar.gz


Index: version
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-7/version,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- version	2 Jul 2008 19:45:42 -0000	1.7
+++ version	17 Sep 2008 16:13:29 -0000	1.8
@@ -1 +1 @@
-0.21 1
+0.23 1



From pkgdb at fedoraproject.org  Wed Sep 17 15:27:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:27:06 +0000
Subject: [pkgdb] pam_ccreds: tmraz has requested watchbugzilla
Message-ID: <20080917152707.2E418208DAB@bastion.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on pam_ccreds (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_ccreds



From buc at fedoraproject.org  Wed Sep 17 15:45:26 2008
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Wed, 17 Sep 2008 15:45:26 +0000 (UTC)
Subject: rpms/traceroute/F-8 sources,1.14,1.15 traceroute.spec,1.36,1.37
Message-ID: <20080917154526.9F68E7013C@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/traceroute/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8584

Modified Files:
	sources traceroute.spec 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/traceroute/F-8/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	17 Apr 2008 12:03:15 -0000	1.14
+++ sources	17 Sep 2008 15:44:56 -0000	1.15
@@ -1 +1 @@
-4a1a1b5e07ee24c1c2612a63652223b2  traceroute-2.0.10.tar.gz
+2262a9d30ae85f12b759a38ef827f8f7  traceroute-2.0.12.tar.gz


Index: traceroute.spec
===================================================================
RCS file: /cvs/extras/rpms/traceroute/F-8/traceroute.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- traceroute.spec	17 Apr 2008 12:03:15 -0000	1.36
+++ traceroute.spec	17 Sep 2008 15:44:56 -0000	1.37
@@ -1,10 +1,10 @@
 Summary: Traces the route taken by packets over an IPv4/IPv6 network
 Name: traceroute
 Epoch: 3
-Version: 2.0.10
+Version: 2.0.12
 Release: 1%{?dist}
 Group: Applications/Internet
-License: GPL
+License: GPLv2+
 URL:  http://traceroute.sourceforge.net
 Source0: http://dl.sourceforge.net/traceroute/traceroute-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,7 +37,6 @@
 install -m755 traceroute/traceroute $RPM_BUILD_ROOT/bin
 pushd $RPM_BUILD_ROOT/bin
 ln -s traceroute traceroute6
-ln -s traceroute tracert
 popd
 
 install -d $RPM_BUILD_ROOT%{_mandir}/man8
@@ -59,6 +58,15 @@
 
 
 %changelog
+* Wed Sep 17 2008 Dmitry Butskoy <Dmitry at Butskoy.name>  - 3:2.0.12-1
+- update to 2.0.12 (fixes #461278 and #461626)
+- this release adds support for icmp extensions (including MPLS),
+  which was expected for a long time (#176588)
+- drop "tracert" symlink (#461109)
+
+* Mon May 19 2008 Dmitry Butskoy <Dmitry at Butskoy.name>  - 3:2.0.11-1
+- update to 2.0.11
+
 * Thu Apr 17 2008 Dmitry Butskoy <Dmitry at Butskoy.name>  - 3:2.0.10-1
 - upgrade to 2.0.10 (fixes #245438 and ipv6 tracerouting for new kernels)
 



From pkgdb at fedoraproject.org  Wed Sep 17 15:27:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:27:45 +0000
Subject: [pkgdb] tetex-eurofont ownership updated
Message-ID: <20080917152746.06B5D208DB5@bastion.fedora.phx.redhat.com>

Package tetex-eurofont in Fedora devel was orphaned by dionysos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tetex-eurofont



From pkgdb at fedoraproject.org  Wed Sep 17 15:27:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:27:20 +0000
Subject: [pkgdb] pam_ccreds: tmraz has requested watchcommits
Message-ID: <20080917152720.7EAF5208DB1@bastion.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on pam_ccreds (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_ccreds



From pkgdb at fedoraproject.org  Wed Sep 17 15:27:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:27:10 +0000
Subject: [pkgdb] pam_ccreds: tmraz has requested watchcommits
Message-ID: <20080917152710.6FFDC208DAE@bastion.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on pam_ccreds (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_ccreds



From pkgdb at fedoraproject.org  Wed Sep 17 15:27:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:27:15 +0000
Subject: [pkgdb] pam_ccreds: tmraz has requested watchbugzilla
Message-ID: <20080917152715.386F8208DA0@bastion.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on pam_ccreds (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pam_ccreds



From kasal at fedoraproject.org  Wed Sep 17 16:18:59 2008
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 17 Sep 2008 16:18:59 +0000 (UTC)
Subject: rpms/autoconf/devel .cvsignore, 1.11, 1.12 autoconf.spec, 1.53,
	1.54 sources, 1.11, 1.12 autoconf-2.62-449245.patch, 1.1,
	NONE autoconf-2.62-449944.patch, 1.1,
	NONE autoconf-2.62-449973.patch, 1.1,
	NONE autoconf-2.62-multilinevars.patch, 1.1, NONE
Message-ID: <20080917161859.1EDC07013F@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/autoconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14309

Modified Files:
	.cvsignore autoconf.spec sources 
Removed Files:
	autoconf-2.62-449245.patch autoconf-2.62-449944.patch 
	autoconf-2.62-449973.patch autoconf-2.62-multilinevars.patch 
Log Message:
- upstream bugfix release
- all patches dropped, the issues are fixed upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/autoconf/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 May 2008 12:13:38 -0000	1.11
+++ .cvsignore	17 Sep 2008 16:18:28 -0000	1.12
@@ -1 +1 @@
-autoconf-2.62.tar.bz2
+autoconf-2.63.tar.bz2


Index: autoconf.spec
===================================================================
RCS file: /cvs/extras/rpms/autoconf/devel/autoconf.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- autoconf.spec	7 Jul 2008 11:36:28 -0000	1.53
+++ autoconf.spec	17 Sep 2008 16:18:28 -0000	1.54
@@ -1,18 +1,12 @@
 Summary:    A GNU tool for automatically configuring source code
 Name:       autoconf
-Version:    2.62
-Release:    5%{?dist}
+Version:    2.63
+Release:    1%{?dist}
 License:    GPLv2+ and GFDL
 Group:      Development/Tools
 Source:     http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.bz2
 Source1:    filter-provides-automake.sh
 Source2:    filter-requires-automake.sh
-# This one will be included in 2.63:
-Patch0:     autoconf-2.62-449973.patch
-Patch1:     autoconf-2.62-449245.patch
-Patch2:     autoconf-2.62-449944.patch
-# Patch for p.e. #449467:
-Patch3:     autoconf-2.62-multilinevars.patch
 URL:        http://www.gnu.org/software/autoconf/
 BuildRequires:      m4 >= 1.4.7, emacs
 Requires:           m4 >= 1.4.7
@@ -44,10 +38,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 # use ./configure here to avoid copying config.{sub,guess} with those from the
@@ -89,6 +79,10 @@
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Wed Sep 17 2008 Stepan Kasal <skasal at redhat.com> 2.63-1
+- upstream bugfix release
+- all patches dropped, the issues are fixed upstream
+
 * Mon Jul 07 2008 Karsten Hopp <karsten at redhat.com> 2.62-5
 - fix multiline variables (p.e. #449467)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/autoconf/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	13 May 2008 12:13:38 -0000	1.11
+++ sources	17 Sep 2008 16:18:28 -0000	1.12
@@ -1 +1 @@
-e1fb8fe0b22e651240afdfa2be537a3c  autoconf-2.62.tar.bz2
+7565809ed801bb5726da0631ceab3699  autoconf-2.63.tar.bz2


--- autoconf-2.62-449245.patch DELETED ---


--- autoconf-2.62-449944.patch DELETED ---


--- autoconf-2.62-449973.patch DELETED ---


--- autoconf-2.62-multilinevars.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Sep 17 15:56:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:56:44 +0000
Subject: [pkgdb] man-pages-fr had acl change status
Message-ID: <20080917155644.19ABD2E017B@bastion.fedora.phx.redhat.com>

bouska has set the watchcommits acl on man-pages-fr (Fedora devel) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 15:56:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 15:56:38 +0000
Subject: [pkgdb] man-pages-fr had acl change status
Message-ID: <20080917155638.B388C2E0178@bastion.fedora.phx.redhat.com>

bouska has set the watchbugzilla acl on man-pages-fr (Fedora devel) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-fr



From pkgdb at fedoraproject.org  Wed Sep 17 16:43:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 16:43:31 +0000
Subject: [pkgdb] setuptool ownership updated
Message-ID: <20080917164332.13A6F208DA3@bastion.fedora.phx.redhat.com>

Package setuptool in Fedora devel was orphaned by nalin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setuptool



From pkgdb at fedoraproject.org  Wed Sep 17 16:43:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 16:43:36 +0000
Subject: [pkgdb] setuptool ownership updated
Message-ID: <20080917164336.A84C8208D9F@bastion.fedora.phx.redhat.com>

Package setuptool in Fedora 8 was orphaned by nalin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setuptool



From pkgdb at fedoraproject.org  Wed Sep 17 16:43:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 16:43:42 +0000
Subject: [pkgdb] setuptool ownership updated
Message-ID: <20080917164342.70C90208DA5@bastion.fedora.phx.redhat.com>

Package setuptool in Fedora 9 was orphaned by nalin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setuptool



From pkgdb at fedoraproject.org  Wed Sep 17 16:44:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 16:44:08 +0000
Subject: [pkgdb] setuptool ownership updated
Message-ID: <20080917164408.898C4208D64@bastion.fedora.phx.redhat.com>

Package setuptool in Fedora devel is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setuptool



From pkgdb at fedoraproject.org  Wed Sep 17 16:44:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 16:44:10 +0000
Subject: [pkgdb] setuptool ownership updated
Message-ID: <20080917164410.64678208D9F@bastion.fedora.phx.redhat.com>

Package setuptool in Fedora 8 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setuptool



From pkgdb at fedoraproject.org  Wed Sep 17 16:44:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 16:44:12 +0000
Subject: [pkgdb] setuptool ownership updated
Message-ID: <20080917164412.24309208DA2@bastion.fedora.phx.redhat.com>

Package setuptool in Fedora 9 is now owned by mhlavink

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setuptool



From pkgdb at fedoraproject.org  Wed Sep 17 16:44:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 16:44:46 +0000
Subject: [pkgdb] setuptool: nalin has requested watchbugzilla
Message-ID: <20080917164446.A9FE1208DA0@bastion.fedora.phx.redhat.com>

nalin has requested the watchbugzilla acl on setuptool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setuptool



From pkgdb at fedoraproject.org  Wed Sep 17 16:44:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 16:44:54 +0000
Subject: [pkgdb] setuptool: nalin has requested watchbugzilla
Message-ID: <20080917164454.CD601208DA4@bastion.fedora.phx.redhat.com>

nalin has requested the watchbugzilla acl on setuptool (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setuptool



From pkgdb at fedoraproject.org  Wed Sep 17 16:44:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 16:44:57 +0000
Subject: [pkgdb] setuptool: nalin has requested watchbugzilla
Message-ID: <20080917164457.A612F208DA6@bastion.fedora.phx.redhat.com>

nalin has requested the watchbugzilla acl on setuptool (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setuptool



From ajax at fedoraproject.org  Wed Sep 17 16:59:25 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 17 Sep 2008 16:59:25 +0000 (UTC)
Subject: rpms/libX11/devel libX11-1.1.4-xcb-xreply-leak.patch, 1.1,
	1.2 libX11.spec, 1.47, 1.48
Message-ID: <20080917165926.03DB37013C@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libX11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19952

Modified Files:
	libX11-1.1.4-xcb-xreply-leak.patch libX11.spec 
Log Message:
* Wed Sep 17 2008 Adam Jackson <ajax at redhat.com> 1.1.4-4
- libX11-1.1.4-xcb-xreply-leak.patch: Fix the BadFont case.


libX11-1.1.4-xcb-xreply-leak.patch:

Index: libX11-1.1.4-xcb-xreply-leak.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11-1.1.4-xcb-xreply-leak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libX11-1.1.4-xcb-xreply-leak.patch	17 Sep 2008 14:57:27 -0000	1.1
+++ libX11-1.1.4-xcb-xreply-leak.patch	17 Sep 2008 16:58:55 -0000	1.2
@@ -1,6 +1,7 @@
---- libX11-1.1.4/src/xcb_io.c	2008-03-06 15:45:06.000000000 -0500
-+++ hacked/src/xcb_io.c	2008-09-17 00:40:57.000000000 -0400
-@@ -396,15 +396,18 @@
+diff -up libX11-1.1.4/src/xcb_io.c.xcb-xreply-leak libX11-1.1.4/src/xcb_io.c
+--- libX11-1.1.4/src/xcb_io.c.xcb-xreply-leak	2008-03-06 15:45:06.000000000 -0500
++++ libX11-1.1.4/src/xcb_io.c	2008-09-17 12:58:05.000000000 -0400
+@@ -396,15 +396,19 @@ Status _XReply(Display *dpy, xReply *rep
  				{
  					case X_LookupColor:
  					case X_AllocNamedColor:
@@ -9,9 +10,11 @@
  				}
  				break;
  			case BadFont:
- 				if(err->majorCode == X_QueryFont)
+-				if(err->majorCode == X_QueryFont)
++				if(err->majorCode == X_QueryFont) {
 +					free(error);
  					return 0;
++				}
  				break;
  			case BadAlloc:
  			case BadAccess:
@@ -19,7 +22,7 @@
  				return 0;
  		}
  
-@@ -413,10 +416,13 @@
+@@ -413,10 +417,13 @@ Status _XReply(Display *dpy, xReply *rep
  		 * want to suppress the error.
  		 */
  		for(ext = dpy->ext_procs; ext; ext = ext->next)


Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- libX11.spec	17 Sep 2008 14:57:27 -0000	1.47
+++ libX11.spec	17 Sep 2008 16:58:55 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.1.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -117,6 +117,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Sep 17 2008 Adam Jackson <ajax at redhat.com> 1.1.4-4
+- libX11-1.1.4-xcb-xreply-leak.patch: Fix the BadFont case.
+
 * Wed Sep 17 2008 Adam Jackson <ajax at redhat.com> 1.1.4-3
 - libX11-1.1.4-xcb-xreply-leak.patch: Fix a leak when the client has a
   non-fatal error handler. (mclasen, fdo #17616)



From rdieter at fedoraproject.org  Wed Sep 17 17:45:28 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 17 Sep 2008 17:45:28 +0000 (UTC)
Subject: rpms/phonon/devel phonon.spec,1.9,1.10
Message-ID: <20080917174528.886287013C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25782

Modified Files:
	phonon.spec 
Log Message:
* Wed Sep 17 2008 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-5
- Requires: phonon-backend-xine



Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- phonon.spec	10 Aug 2008 18:15:39 -0000	1.9
+++ phonon.spec	17 Sep 2008 17:44:58 -0000	1.10
@@ -2,7 +2,7 @@
 Summary: Multimedia framework api
 Name:    phonon 
 Version: 4.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -26,7 +26,9 @@
 BuildRequires: libxml2-devel
 BuildRequires: qt4-devel >= 4.4.0
 
-Requires: phonon-backend
+## hard-code phonon-backend-xine, for now, so yum doesn't choose -gstreamer by default
+Requires: phonon-backend-xine
+#Requires: phonon-backend
 
 %description
 %{summary}.
@@ -105,6 +107,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-5
+- Requires: phonon-backend-xine
+
 * Sun Aug 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.0-4
 - rename -backend-gst back to -backend-gstreamer (longer name as -backend-xine)
   The GStreamer backend isn't ready to be the default, and KDE 4.1 also defaults



From rdieter at fedoraproject.org  Wed Sep 17 17:47:45 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 17 Sep 2008 17:47:45 +0000 (UTC)
Subject: rpms/phonon/F-9 phonon.spec,1.4,1.5
Message-ID: <20080917174745.680A67013C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26163

Modified Files:
	phonon.spec 
Log Message:
* Wed Sep 17 2008 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-5
- Requires: phonon-backend-xine



Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-9/phonon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- phonon.spec	10 Aug 2008 18:30:00 -0000	1.4
+++ phonon.spec	17 Sep 2008 17:47:15 -0000	1.5
@@ -2,7 +2,7 @@
 Summary: Multimedia framework api
 Name:    phonon 
 Version: 4.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -26,7 +26,9 @@
 BuildRequires: libxml2-devel
 BuildRequires: qt4-devel >= 4.4.0
 
-Requires: phonon-backend
+## hard-code phonon-backend-xine, for now, so yum doesn't choose -gstreamer by default
+Requires: phonon-backend-xine
+#Requires: phonon-backend
 
 %description
 %{summary}.
@@ -105,6 +107,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-5
+- Requires: phonon-backend-xine
+
 * Sun Aug 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.0-4
 - rename -backend-gst back to -backend-gstreamer (longer name as -backend-xine)
   The GStreamer backend isn't ready to be the default, and KDE 4.1 also defaults



From rdieter at fedoraproject.org  Wed Sep 17 17:48:46 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 17 Sep 2008 17:48:46 +0000 (UTC)
Subject: rpms/phonon/F-8 phonon.spec,1.8,1.9
Message-ID: <20080917174846.2453A7013C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26385

Modified Files:
	phonon.spec 
Log Message:
* Wed Sep 17 2008 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-5
- Requires: phonon-backend-xine



Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-8/phonon.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- phonon.spec	10 Aug 2008 18:33:46 -0000	1.8
+++ phonon.spec	17 Sep 2008 17:48:15 -0000	1.9
@@ -2,7 +2,7 @@
 Summary: Multimedia framework api
 Name:    phonon 
 Version: 4.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -26,7 +26,9 @@
 BuildRequires: libxml2-devel
 BuildRequires: qt4-devel >= 4.4.0
 
-Requires: phonon-backend
+## hard-code phonon-backend-xine, for now, so yum doesn't choose -gstreamer by default
+Requires: phonon-backend-xine
+#Requires: phonon-backend
 
 %description
 %{summary}.
@@ -105,6 +107,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-5
+- Requires: phonon-backend-xine
+
 * Sun Aug 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.0-4
 - rename -backend-gst back to -backend-gstreamer (longer name as -backend-xine)
   The GStreamer backend isn't ready to be the default, and KDE 4.1 also defaults



From mtasaka at fedoraproject.org  Wed Sep 17 17:54:50 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 17 Sep 2008 17:54:50 +0000 (UTC)
Subject: rpms/jd/F-8 .cvsignore, 1.286, 1.287 jd.spec, 1.322, 1.323 sources, 
	1.287, 1.288
Message-ID: <20080917175450.4E96E7013C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27691/F-8

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2349



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- .cvsignore	16 Sep 2008 15:27:49 -0000	1.286
+++ .cvsignore	17 Sep 2008 17:54:19 -0000	1.287
@@ -1 +1 @@
-jd-2.0.2-svn2347_trunk.tgz
+jd-2.0.2-svn2349_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -r1.322 -r1.323
--- jd.spec	16 Sep 2008 15:50:45 -0000	1.322
+++ jd.spec	17 Sep 2008 17:54:19 -0000	1.323
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.2
-%define         strtag        svn2347_trunk
+%define         strtag        svn2349_trunk
 %define         repoid        32887
 # Define this if this is pre-version
 %define         pre_release   1
@@ -136,8 +136,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Sep 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2347
+* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2349
 
 * Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
 - Patch to cope with occasional cookie change


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/sources,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- sources	16 Sep 2008 15:27:50 -0000	1.287
+++ sources	17 Sep 2008 17:54:19 -0000	1.288
@@ -1 +1 @@
-69896b8a2256e49d7b1a1a387137a738  jd-2.0.2-svn2347_trunk.tgz
+f71ea0b442129d296a2681f096c45d2d  jd-2.0.2-svn2349_trunk.tgz



From mtasaka at fedoraproject.org  Wed Sep 17 17:54:50 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 17 Sep 2008 17:54:50 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.293, 1.294 jd.spec, 1.333, 1.334 sources, 
	1.294, 1.295
Message-ID: <20080917175450.A5E737013C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27691/F-9

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2349



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- .cvsignore	16 Sep 2008 15:27:50 -0000	1.293
+++ .cvsignore	17 Sep 2008 17:54:20 -0000	1.294
@@ -1 +1 @@
-jd-2.0.2-svn2347_trunk.tgz
+jd-2.0.2-svn2349_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -r1.333 -r1.334
--- jd.spec	16 Sep 2008 15:50:45 -0000	1.333
+++ jd.spec	17 Sep 2008 17:54:20 -0000	1.334
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.2
-%define         strtag        svn2347_trunk
+%define         strtag        svn2349_trunk
 %define         repoid        32887
 # Define this if this is pre-version
 %define         pre_release   1
@@ -136,8 +136,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Sep 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2347
+* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2349
 
 * Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
 - Patch to cope with occasional cookie change


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- sources	16 Sep 2008 15:27:50 -0000	1.294
+++ sources	17 Sep 2008 17:54:20 -0000	1.295
@@ -1 +1 @@
-69896b8a2256e49d7b1a1a387137a738  jd-2.0.2-svn2347_trunk.tgz
+f71ea0b442129d296a2681f096c45d2d  jd-2.0.2-svn2349_trunk.tgz



From mtasaka at fedoraproject.org  Wed Sep 17 17:54:51 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 17 Sep 2008 17:54:51 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.293, 1.294 jd.spec, 1.343, 1.344 sources,
	1.294, 1.295
Message-ID: <20080917175451.103267013C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27691/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2349



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- .cvsignore	16 Sep 2008 15:27:50 -0000	1.293
+++ .cvsignore	17 Sep 2008 17:54:20 -0000	1.294
@@ -1 +1 @@
-jd-2.0.2-svn2347_trunk.tgz
+jd-2.0.2-svn2349_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- jd.spec	16 Sep 2008 15:50:45 -0000	1.343
+++ jd.spec	17 Sep 2008 17:54:20 -0000	1.344
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.2
-%define         strtag        svn2347_trunk
+%define         strtag        svn2349_trunk
 %define         repoid        32887
 # Define this if this is pre-version
 %define         pre_release   1
@@ -136,8 +136,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Sep 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2347
+* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2349
 
 * Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
 - Patch to cope with occasional cookie change


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- sources	16 Sep 2008 15:27:50 -0000	1.294
+++ sources	17 Sep 2008 17:54:20 -0000	1.295
@@ -1 +1 @@
-69896b8a2256e49d7b1a1a387137a738  jd-2.0.2-svn2347_trunk.tgz
+f71ea0b442129d296a2681f096c45d2d  jd-2.0.2-svn2349_trunk.tgz



From jbowes at fedoraproject.org  Wed Sep 17 18:06:02 2008
From: jbowes at fedoraproject.org (James Bowes)
Date: Wed, 17 Sep 2008 18:06:02 +0000 (UTC)
Subject: rpms/python-elixir/devel .cvsignore, 1.7, 1.8 python-elixir.spec,
	1.6, 1.7 sources, 1.7, 1.8
Message-ID: <20080917180602.4C1307013C@cvs1.fedora.phx.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/python-elixir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29120

Modified Files:
	.cvsignore python-elixir.spec sources 
Log Message:
update to 0.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-elixir/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Jul 2008 15:26:29 -0000	1.7
+++ .cvsignore	17 Sep 2008 18:05:31 -0000	1.8
@@ -1 +1 @@
-Elixir-0.6.0.tar.gz
+Elixir-0.6.1.tar.gz


Index: python-elixir.spec
===================================================================
RCS file: /cvs/extras/rpms/python-elixir/devel/python-elixir.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-elixir.spec	24 Jul 2008 15:26:29 -0000	1.6
+++ python-elixir.spec	17 Sep 2008 18:05:31 -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:           python-elixir
-Version:        0.6.0
+Version:        0.6.1
 Release:        1%{?dist}
 Summary:        A declarative mapper for SQLAlchemy
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 James Bowes <jbowes at redhat.com> 0.6.1-1
+- Update to 0.6.1
+
 * Thu Jul 24 2008 James Bowes <jbowes at redhat.com> 0.6.0-1
 - Update to 0.6.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-elixir/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Jul 2008 15:26:29 -0000	1.7
+++ sources	17 Sep 2008 18:05:31 -0000	1.8
@@ -1 +1 @@
-b5f5cf5b8c0b98e45e903f9910b3d49e  Elixir-0.6.0.tar.gz
+af257fda955b45a7ff06144c6356bf07  Elixir-0.6.1.tar.gz



From mtasaka at fedoraproject.org  Wed Sep 17 18:19:14 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 17 Sep 2008 18:19:14 +0000 (UTC)
Subject: rpms/ruby-RMagick/F-8 .cvsignore, 1.12, 1.13 ruby-RMagick.spec, 1.14,
	1.15 sources, 1.12, 1.13
Message-ID: <20080917181914.8DCC57013C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30393/ruby-RMagick/F-8

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
3 ruby module packages, update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-8/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	16 Jul 2008 16:39:29 -0000	1.12
+++ .cvsignore	17 Sep 2008 18:18:44 -0000	1.13
@@ -1 +1 @@
-RMagick-2.5.2.tar.bz2
+RMagick-2.6.0.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-8/ruby-RMagick.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ruby-RMagick.spec	16 Jul 2008 16:39:29 -0000	1.14
+++ ruby-RMagick.spec	17 Sep 2008 18:18:44 -0000	1.15
@@ -8,11 +8,11 @@
 %define		rubyabi		1.8
 
 %define		modname		RMagick
-%define		repoid		39889
+%define		repoid		43174
 
 %define		IMver		6.3.5
 
-%define		mainver		2.5.2
+%define		mainver		2.6.0
 %undefine		betaver		
 %define		fedorarel	1
 
@@ -99,6 +99,9 @@
 %doc DOCDIR/HTML/*
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-8/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	16 Jul 2008 16:39:29 -0000	1.12
+++ sources	17 Sep 2008 18:18:44 -0000	1.13
@@ -1 +1 @@
-30986483a2d77f17febd597c32c420b3  RMagick-2.5.2.tar.bz2
+e77a782239f57627446894cfc11949d7  RMagick-2.6.0.tar.bz2



From mtasaka at fedoraproject.org  Wed Sep 17 18:19:14 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 17 Sep 2008 18:19:14 +0000 (UTC)
Subject: rpms/ruby-RMagick/F-9 .cvsignore, 1.12, 1.13 ruby-RMagick.spec, 1.14,
	1.15 sources, 1.12, 1.13
Message-ID: <20080917181914.B79307013C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30393/ruby-RMagick/F-9

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
3 ruby module packages, update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	16 Jul 2008 16:39:49 -0000	1.12
+++ .cvsignore	17 Sep 2008 18:18:44 -0000	1.13
@@ -1 +1 @@
-RMagick-2.5.2.tar.bz2
+RMagick-2.6.0.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-9/ruby-RMagick.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ruby-RMagick.spec	16 Jul 2008 16:39:49 -0000	1.14
+++ ruby-RMagick.spec	17 Sep 2008 18:18:44 -0000	1.15
@@ -8,11 +8,11 @@
 %define		rubyabi		1.8
 
 %define		modname		RMagick
-%define		repoid		39889
+%define		repoid		43174
 
 %define		IMver		6.3.5
 
-%define		mainver		2.5.2
+%define		mainver		2.6.0
 %undefine		betaver		
 %define		fedorarel	1
 
@@ -99,6 +99,9 @@
 %doc DOCDIR/HTML/*
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	16 Jul 2008 16:39:49 -0000	1.12
+++ sources	17 Sep 2008 18:18:44 -0000	1.13
@@ -1 +1 @@
-30986483a2d77f17febd597c32c420b3  RMagick-2.5.2.tar.bz2
+e77a782239f57627446894cfc11949d7  RMagick-2.6.0.tar.bz2



From mtasaka at fedoraproject.org  Wed Sep 17 18:19:15 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 17 Sep 2008 18:19:15 +0000 (UTC)
Subject: rpms/ruby-RMagick/devel .cvsignore, 1.12, 1.13 ruby-RMagick.spec,
	1.16, 1.17 sources, 1.12, 1.13
Message-ID: <20080917181915.0CD9E7013C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30393/ruby-RMagick/devel

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
3 ruby module packages, update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	16 Jul 2008 16:40:04 -0000	1.12
+++ .cvsignore	17 Sep 2008 18:18:44 -0000	1.13
@@ -1 +1 @@
-RMagick-2.5.2.tar.bz2
+RMagick-2.6.0.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/ruby-RMagick.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ruby-RMagick.spec	16 Jul 2008 16:40:04 -0000	1.16
+++ ruby-RMagick.spec	17 Sep 2008 18:18:44 -0000	1.17
@@ -8,11 +8,11 @@
 %define		rubyabi		1.8
 
 %define		modname		RMagick
-%define		repoid		39889
+%define		repoid		43174
 
 %define		IMver		6.3.5
 
-%define		mainver		2.5.2
+%define		mainver		2.6.0
 %undefine		betaver		
 %define		fedorarel	1
 
@@ -99,6 +99,9 @@
 %doc DOCDIR/HTML/*
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	16 Jul 2008 16:40:04 -0000	1.12
+++ sources	17 Sep 2008 18:18:44 -0000	1.13
@@ -1 +1 @@
-30986483a2d77f17febd597c32c420b3  RMagick-2.5.2.tar.bz2
+e77a782239f57627446894cfc11949d7  RMagick-2.6.0.tar.bz2



From mtasaka at fedoraproject.org  Wed Sep 17 18:19:15 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 17 Sep 2008 18:19:15 +0000 (UTC)
Subject: rpms/ruby-aws/F-8 .cvsignore, 1.9, 1.10 ruby-aws.spec, 1.8,
	1.9 sources, 1.9, 1.10
Message-ID: <20080917181915.592567013C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-aws/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30393/ruby-aws/F-8

Modified Files:
	.cvsignore ruby-aws.spec sources 
Log Message:
3 ruby module packages, update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Aug 2008 15:50:03 -0000	1.9
+++ .cvsignore	17 Sep 2008 18:18:45 -0000	1.10
@@ -1 +1 @@
-ruby-aws-0.4.1.tar.gz
+ruby-aws-0.4.2.tar.gz


Index: ruby-aws.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/F-8/ruby-aws.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ruby-aws.spec	22 Aug 2008 15:50:03 -0000	1.8
+++ ruby-aws.spec	17 Sep 2008 18:18:45 -0000	1.9
@@ -2,7 +2,7 @@
 %define		rubyabi		1.8
 
 Name:		ruby-aws
-Version:	0.4.1
+Version:	0.4.2
 Release:	1%{?dist}
 Summary:	Ruby interface to Amazon Web Services
 Group:		Development/Languages
@@ -78,6 +78,9 @@
 %doc test/
 
 %changelog
+* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.2-1
+- 0.4.2
+
 * Thu Aug 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-1
 - 0.4.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Aug 2008 15:50:03 -0000	1.9
+++ sources	17 Sep 2008 18:18:45 -0000	1.10
@@ -1 +1 @@
-49f9dc7c6a934abf65b61e415fd6f50e  ruby-aws-0.4.1.tar.gz
+ed97d574477a775b3620473330475d41  ruby-aws-0.4.2.tar.gz



From mtasaka at fedoraproject.org  Wed Sep 17 18:19:16 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 17 Sep 2008 18:19:16 +0000 (UTC)
Subject: rpms/ruby-gettext-package/F-8 .cvsignore, 1.6,
	1.7 ruby-gettext-package.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20080917181916.2E78F7013C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gettext-package/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30393/ruby-gettext-package/F-8

Modified Files:
	.cvsignore ruby-gettext-package.spec sources 
Log Message:
3 ruby module packages, update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-gettext-package/F-8/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Aug 2008 13:41:16 -0000	1.6
+++ .cvsignore	17 Sep 2008 18:18:45 -0000	1.7
@@ -1 +1 @@
-ruby-gettext-package-1.92.0.tar.gz
+ruby-gettext-package-1.93.0.tar.gz


Index: ruby-gettext-package.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gettext-package/F-8/ruby-gettext-package.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ruby-gettext-package.spec	9 Aug 2008 13:41:16 -0000	1.7
+++ ruby-gettext-package.spec	17 Sep 2008 18:18:45 -0000	1.8
@@ -1,10 +1,10 @@
 %{!?ruby_sitelib:	%define ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 #%%{!?ruby_sitearch:	%define ruby_sitearch	%(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 %define		rubyabi		1.8
-%define		repoid		40668
+%define		repoid		43496
 
 Name:		ruby-gettext-package
-Version:	1.92.0
+Version:	1.93.0
 Release:	1%{?dist}
 Summary:	Localization Library and Tools for Ruby
 Group:		Development/Languages
@@ -95,6 +95,9 @@
 %doc test/
 
 %changelog
+* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.93.0-1
+- 1.93.0
+
 * Sat Aug  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.92.0-1
 - 1.92.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-gettext-package/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Aug 2008 13:41:16 -0000	1.6
+++ sources	17 Sep 2008 18:18:45 -0000	1.7
@@ -1 +1 @@
-9eb9e34bb4f3020147b62d871dda2ca3  ruby-gettext-package-1.92.0.tar.gz
+a23cf402e0bc7fed2857e3d6b6fd1f37  ruby-gettext-package-1.93.0.tar.gz



From mtasaka at fedoraproject.org  Wed Sep 17 18:19:15 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 17 Sep 2008 18:19:15 +0000 (UTC)
Subject: rpms/ruby-aws/devel .cvsignore, 1.9, 1.10 ruby-aws.spec, 1.8,
	1.9 sources, 1.9, 1.10
Message-ID: <20080917181915.DF4BC7013C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-aws/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30393/ruby-aws/devel

Modified Files:
	.cvsignore ruby-aws.spec sources 
Log Message:
3 ruby module packages, update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Aug 2008 16:00:04 -0000	1.9
+++ .cvsignore	17 Sep 2008 18:18:45 -0000	1.10
@@ -1 +1 @@
-ruby-aws-0.4.1.tar.gz
+ruby-aws-0.4.2.tar.gz


Index: ruby-aws.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/devel/ruby-aws.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ruby-aws.spec	22 Aug 2008 16:00:04 -0000	1.8
+++ ruby-aws.spec	17 Sep 2008 18:18:45 -0000	1.9
@@ -2,7 +2,7 @@
 %define		rubyabi		1.8
 
 Name:		ruby-aws
-Version:	0.4.1
+Version:	0.4.2
 Release:	1%{?dist}
 Summary:	Ruby interface to Amazon Web Services
 Group:		Development/Languages
@@ -78,6 +78,9 @@
 %doc test/
 
 %changelog
+* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.2-1
+- 0.4.2
+
 * Thu Aug 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-1
 - 0.4.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Aug 2008 16:00:04 -0000	1.9
+++ sources	17 Sep 2008 18:18:45 -0000	1.10
@@ -1 +1 @@
-49f9dc7c6a934abf65b61e415fd6f50e  ruby-aws-0.4.1.tar.gz
+ed97d574477a775b3620473330475d41  ruby-aws-0.4.2.tar.gz



From mtasaka at fedoraproject.org  Wed Sep 17 18:19:15 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 17 Sep 2008 18:19:15 +0000 (UTC)
Subject: rpms/ruby-aws/F-9 .cvsignore, 1.9, 1.10 ruby-aws.spec, 1.8,
	1.9 sources, 1.9, 1.10
Message-ID: <20080917181915.9BE5B7013C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-aws/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30393/ruby-aws/F-9

Modified Files:
	.cvsignore ruby-aws.spec sources 
Log Message:
3 ruby module packages, update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Aug 2008 15:54:03 -0000	1.9
+++ .cvsignore	17 Sep 2008 18:18:45 -0000	1.10
@@ -1 +1 @@
-ruby-aws-0.4.1.tar.gz
+ruby-aws-0.4.2.tar.gz


Index: ruby-aws.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/F-9/ruby-aws.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ruby-aws.spec	22 Aug 2008 15:54:03 -0000	1.8
+++ ruby-aws.spec	17 Sep 2008 18:18:45 -0000	1.9
@@ -2,7 +2,7 @@
 %define		rubyabi		1.8
 
 Name:		ruby-aws
-Version:	0.4.1
+Version:	0.4.2
 Release:	1%{?dist}
 Summary:	Ruby interface to Amazon Web Services
 Group:		Development/Languages
@@ -78,6 +78,9 @@
 %doc test/
 
 %changelog
+* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.2-1
+- 0.4.2
+
 * Thu Aug 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-1
 - 0.4.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Aug 2008 15:54:03 -0000	1.9
+++ sources	17 Sep 2008 18:18:45 -0000	1.10
@@ -1 +1 @@
-49f9dc7c6a934abf65b61e415fd6f50e  ruby-aws-0.4.1.tar.gz
+ed97d574477a775b3620473330475d41  ruby-aws-0.4.2.tar.gz



From mtasaka at fedoraproject.org  Wed Sep 17 18:19:16 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 17 Sep 2008 18:19:16 +0000 (UTC)
Subject: rpms/ruby-gettext-package/F-9 .cvsignore, 1.6,
	1.7 ruby-gettext-package.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20080917181916.708EE7013C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gettext-package/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30393/ruby-gettext-package/F-9

Modified Files:
	.cvsignore ruby-gettext-package.spec sources 
Log Message:
3 ruby module packages, update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-gettext-package/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Aug 2008 13:41:17 -0000	1.6
+++ .cvsignore	17 Sep 2008 18:18:46 -0000	1.7
@@ -1 +1 @@
-ruby-gettext-package-1.92.0.tar.gz
+ruby-gettext-package-1.93.0.tar.gz


Index: ruby-gettext-package.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gettext-package/F-9/ruby-gettext-package.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ruby-gettext-package.spec	9 Aug 2008 13:41:17 -0000	1.7
+++ ruby-gettext-package.spec	17 Sep 2008 18:18:46 -0000	1.8
@@ -1,10 +1,10 @@
 %{!?ruby_sitelib:	%define ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 #%%{!?ruby_sitearch:	%define ruby_sitearch	%(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 %define		rubyabi		1.8
-%define		repoid		40668
+%define		repoid		43496
 
 Name:		ruby-gettext-package
-Version:	1.92.0
+Version:	1.93.0
 Release:	1%{?dist}
 Summary:	Localization Library and Tools for Ruby
 Group:		Development/Languages
@@ -95,6 +95,9 @@
 %doc test/
 
 %changelog
+* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.93.0-1
+- 1.93.0
+
 * Sat Aug  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.92.0-1
 - 1.92.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-gettext-package/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Aug 2008 13:41:17 -0000	1.6
+++ sources	17 Sep 2008 18:18:46 -0000	1.7
@@ -1 +1 @@
-9eb9e34bb4f3020147b62d871dda2ca3  ruby-gettext-package-1.92.0.tar.gz
+a23cf402e0bc7fed2857e3d6b6fd1f37  ruby-gettext-package-1.93.0.tar.gz



From mtasaka at fedoraproject.org  Wed Sep 17 18:19:16 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 17 Sep 2008 18:19:16 +0000 (UTC)
Subject: rpms/ruby-gettext-package/devel .cvsignore, 1.6,
	1.7 ruby-gettext-package.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20080917181916.B42EB7013C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gettext-package/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30393/ruby-gettext-package/devel

Modified Files:
	.cvsignore ruby-gettext-package.spec sources 
Log Message:
3 ruby module packages, update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-gettext-package/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Aug 2008 13:41:17 -0000	1.6
+++ .cvsignore	17 Sep 2008 18:18:46 -0000	1.7
@@ -1 +1 @@
-ruby-gettext-package-1.92.0.tar.gz
+ruby-gettext-package-1.93.0.tar.gz


Index: ruby-gettext-package.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gettext-package/devel/ruby-gettext-package.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ruby-gettext-package.spec	9 Aug 2008 13:41:17 -0000	1.7
+++ ruby-gettext-package.spec	17 Sep 2008 18:18:46 -0000	1.8
@@ -1,10 +1,10 @@
 %{!?ruby_sitelib:	%define ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 #%%{!?ruby_sitearch:	%define ruby_sitearch	%(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 %define		rubyabi		1.8
-%define		repoid		40668
+%define		repoid		43496
 
 Name:		ruby-gettext-package
-Version:	1.92.0
+Version:	1.93.0
 Release:	1%{?dist}
 Summary:	Localization Library and Tools for Ruby
 Group:		Development/Languages
@@ -95,6 +95,9 @@
 %doc test/
 
 %changelog
+* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.93.0-1
+- 1.93.0
+
 * Sat Aug  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.92.0-1
 - 1.92.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-gettext-package/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Aug 2008 13:41:17 -0000	1.6
+++ sources	17 Sep 2008 18:18:46 -0000	1.7
@@ -1 +1 @@
-9eb9e34bb4f3020147b62d871dda2ca3  ruby-gettext-package-1.92.0.tar.gz
+a23cf402e0bc7fed2857e3d6b6fd1f37  ruby-gettext-package-1.93.0.tar.gz



From spot at fedoraproject.org  Wed Sep 17 18:21:31 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 17 Sep 2008 18:21:31 +0000 (UTC)
Subject: rpms/muine-scrobbler/devel muinescrobbler-fixcompile.patch, NONE,
	1.1 muine-scrobbler.spec, 1.6, 1.7
Message-ID: <20080917182131.57C5A7013C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/muine-scrobbler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30749

Modified Files:
	muine-scrobbler.spec 
Added Files:
	muinescrobbler-fixcompile.patch 
Log Message:
get this building again

muinescrobbler-fixcompile.patch:

--- NEW FILE muinescrobbler-fixcompile.patch ---
diff -up muinescrobbler/Makefile.BAD muinescrobbler/Makefile
--- muinescrobbler/Makefile.BAD	2008-09-17 14:08:20.000000000 -0400
+++ muinescrobbler/Makefile	2008-09-17 14:07:47.000000000 -0400
@@ -1,7 +1,7 @@
 CS_FILES = Global.cs Song.cs GAudioscrobbler.cs AudioscrobblerPlugin.cs
 
 AudioscrobblerPlugin.dll: $(CS_FILES) Audioscrobbler.glade
-	mcs -target:library -out:AudioscrobblerPlugin.dll -r:Mono.Security.dll -r:System.Web.dll -pkg:gconf-sharp-2.0 -pkg:glade-sharp-2.0 -pkg:muine-plugin -resource:Audioscrobbler.glade $(CS_FILES)
+	mcs -target:library -out:AudioscrobblerPlugin.dll -r:Mono.Security.dll -r:System.Web.dll -pkg:gnome-sharp-2.0 -pkg:gconf-sharp-2.0 -pkg:glade-sharp-2.0 -pkg:muine-plugin -resource:Audioscrobbler.glade $(CS_FILES)
 
 install: AudioscrobblerPlugin.dll
 	mkdir -p ~/.gnome2/muine/plugins


Index: muine-scrobbler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/muine-scrobbler/devel/muine-scrobbler.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- muine-scrobbler.spec	4 Jun 2008 15:26:06 -0000	1.6
+++ muine-scrobbler.spec	17 Sep 2008 18:21:00 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           muine-scrobbler
 Version:        0.1.8
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Audioscrobbler plugin for Muine
 
 Group:          Applications/Multimedia
@@ -10,10 +10,10 @@
 URL:            http://home.gna.org/muinescrobbler/
 Source0:        http://download.gna.org/muinescrobbler/%{real_name}-%{version}.tar.gz
 Patch0:         %{real_name}-0.1.8-no-generics.diff
+Patch1:         %{real_name}-fixcompile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#only builds on i386, upstream issue
-ExclusiveArch:  i386
+ExclusiveArch:  i386 x86_64
 
 BuildRequires:  mono-devel, muine-devel >= 0.8.8-8
 BuildRequires:  gtk-sharp2-devel, gnome-sharp-devel
@@ -28,6 +28,7 @@
 %prep
 %setup -qn %{real_name}
 %patch0 -p1 
+%patch1 -p1 -b .fixcompile
 
 %build
 make
@@ -51,6 +52,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.1.8-7
+- fix compile (not sure how well this works, but it builds now)
+
 * Wed Jun 04 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.1.8-6
 - rebuild for dependancies
 



From pkgdb at fedoraproject.org  Wed Sep 17 18:34:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:34:59 +0000
Subject: [pkgdb] perl-File-RsyncP: trasher has requested watchbugzilla
Message-ID: <20080917183459.9B5EE208D64@bastion.fedora.phx.redhat.com>

trasher has requested the watchbugzilla acl on perl-File-RsyncP (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Wed Sep 17 18:35:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:35:05 +0000
Subject: [pkgdb] perl-File-RsyncP: trasher has requested commit
Message-ID: <20080917183505.A5B1A208DA4@bastion.fedora.phx.redhat.com>

trasher has requested the commit acl on perl-File-RsyncP (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Wed Sep 17 18:35:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:35:01 +0000
Subject: [pkgdb] perl-File-RsyncP: trasher has requested watchcommits
Message-ID: <20080917183501.5F896208DA0@bastion.fedora.phx.redhat.com>

trasher has requested the watchcommits acl on perl-File-RsyncP (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Wed Sep 17 18:35:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:35:18 +0000
Subject: [pkgdb] perl-File-RsyncP: trasher has requested watchbugzilla
Message-ID: <20080917183518.047E9208D9A@bastion.fedora.phx.redhat.com>

trasher has requested the watchbugzilla acl on perl-File-RsyncP (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Wed Sep 17 18:35:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:35:20 +0000
Subject: [pkgdb] perl-File-RsyncP: trasher has requested watchcommits
Message-ID: <20080917183520.D88E2208DAC@bastion.fedora.phx.redhat.com>

trasher has requested the watchcommits acl on perl-File-RsyncP (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Wed Sep 17 18:35:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:35:23 +0000
Subject: [pkgdb] perl-File-RsyncP: trasher has requested commit
Message-ID: <20080917183523.A7DD8208D9F@bastion.fedora.phx.redhat.com>

trasher has requested the commit acl on perl-File-RsyncP (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Wed Sep 17 18:35:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:35:26 +0000
Subject: [pkgdb] perl-File-RsyncP: trasher has requested watchbugzilla
Message-ID: <20080917183527.06F4E208DA3@bastion.fedora.phx.redhat.com>

trasher has requested the watchbugzilla acl on perl-File-RsyncP (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Wed Sep 17 18:35:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:35:30 +0000
Subject: [pkgdb] perl-File-RsyncP: trasher has requested watchcommits
Message-ID: <20080917183530.9865C208DAF@bastion.fedora.phx.redhat.com>

trasher has requested the watchcommits acl on perl-File-RsyncP (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Wed Sep 17 18:35:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:35:33 +0000
Subject: [pkgdb] perl-File-RsyncP: trasher has requested commit
Message-ID: <20080917183533.EF8A5208DA7@bastion.fedora.phx.redhat.com>

trasher has requested the commit acl on perl-File-RsyncP (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Wed Sep 17 18:36:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:36:44 +0000
Subject: [pkgdb] perl-File-RsyncP had acl change status
Message-ID: <20080917183644.CEE8F208DA2@bastion.fedora.phx.redhat.com>

mmcgrath has set the watchbugzilla acl on perl-File-RsyncP (Fedora devel) to Approved for trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Wed Sep 17 18:36:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:36:46 +0000
Subject: [pkgdb] perl-File-RsyncP had acl change status
Message-ID: <20080917183646.AE2BE208DA4@bastion.fedora.phx.redhat.com>

mmcgrath has set the watchcommits acl on perl-File-RsyncP (Fedora devel) to Approved for trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Wed Sep 17 18:36:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:36:51 +0000
Subject: [pkgdb] perl-File-RsyncP had acl change status
Message-ID: <20080917183651.2B1BB208DA0@bastion.fedora.phx.redhat.com>

mmcgrath has set the commit acl on perl-File-RsyncP (Fedora devel) to Approved for trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Wed Sep 17 18:36:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:36:56 +0000
Subject: [pkgdb] perl-File-RsyncP had acl change status
Message-ID: <20080917183656.D2149208DA2@bastion.fedora.phx.redhat.com>

mmcgrath has set the watchbugzilla acl on perl-File-RsyncP (Fedora 8) to Approved for trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Wed Sep 17 18:36:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:36:57 +0000
Subject: [pkgdb] perl-File-RsyncP had acl change status
Message-ID: <20080917183657.C789F208DA9@bastion.fedora.phx.redhat.com>

mmcgrath has set the watchcommits acl on perl-File-RsyncP (Fedora 8) to Approved for trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Wed Sep 17 18:37:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:37:01 +0000
Subject: [pkgdb] perl-File-RsyncP had acl change status
Message-ID: <20080917183701.44F4E208DA3@bastion.fedora.phx.redhat.com>

mmcgrath has set the commit acl on perl-File-RsyncP (Fedora 8) to Approved for trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Wed Sep 17 18:37:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:37:04 +0000
Subject: [pkgdb] perl-File-RsyncP had acl change status
Message-ID: <20080917183704.9E0CE208DAC@bastion.fedora.phx.redhat.com>

mmcgrath has set the watchbugzilla acl on perl-File-RsyncP (Fedora 9) to Approved for trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Wed Sep 17 18:37:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:37:09 +0000
Subject: [pkgdb] perl-File-RsyncP had acl change status
Message-ID: <20080917183709.22485208DA6@bastion.fedora.phx.redhat.com>

mmcgrath has set the commit acl on perl-File-RsyncP (Fedora 9) to Approved for trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Wed Sep 17 18:37:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:37:06 +0000
Subject: [pkgdb] perl-File-RsyncP had acl change status
Message-ID: <20080917183706.DE8DB208DAF@bastion.fedora.phx.redhat.com>

mmcgrath has set the watchcommits acl on perl-File-RsyncP (Fedora 9) to Approved for trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From davej at fedoraproject.org  Wed Sep 17 18:45:53 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Wed, 17 Sep 2008 18:45:53 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc6-git5.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.925, 1.926 kernel.spec, 1.953, 1.954 sources, 1.887,
	1.888 upstream, 1.799, 1.800 patch-2.6.27-rc6-git4.bz2.sign, 1.1, NONE
Message-ID: <20080917184553.731BC7013C@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1196

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.27-rc6-git5.bz2.sign 
Removed Files:
	patch-2.6.27-rc6-git4.bz2.sign 
Log Message:
2.6.27-rc6-git5


--- NEW FILE patch-2.6.27-rc6-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBI0PH4yGugalF9Dw4RAvw+AJwOZvGL4dubU7FZF/NmbBLWC366RwCfQDE1
Lxo77SIle31ZSVWzyWhZEfE=
=Lgvh
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.925
retrieving revision 1.926
diff -u -r1.925 -r1.926
--- .cvsignore	15 Sep 2008 23:31:16 -0000	1.925
+++ .cvsignore	17 Sep 2008 18:45:22 -0000	1.926
@@ -5,4 +5,4 @@
 kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc6.bz2
-patch-2.6.27-rc6-git4.bz2
+patch-2.6.27-rc6-git5.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.953
retrieving revision 1.954
diff -u -r1.953 -r1.954
--- kernel.spec	15 Sep 2008 23:31:16 -0000	1.953
+++ kernel.spec	17 Sep 2008 18:45:22 -0000	1.954
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 4
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1758,6 +1758,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Sep 17 2008 Dave Jones <davej at redhat.com>
+- 2.6.27-rc6-git5
+
 * Mon Sep 15 2008 Dave Jones <davej at redhat.com>
 - 2.6.27-rc6-git4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.887
retrieving revision 1.888
diff -u -r1.887 -r1.888
--- sources	15 Sep 2008 23:31:17 -0000	1.887
+++ sources	17 Sep 2008 18:45:22 -0000	1.888
@@ -1,3 +1,3 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 d3a173a00e15a6bf3c76068537a5c069  patch-2.6.27-rc6.bz2
-71df31086a80b21d51a52a00958ed3fa  patch-2.6.27-rc6-git4.bz2
+5ffbee4c67a8d343e910230342de89dc  patch-2.6.27-rc6-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.799
retrieving revision 1.800
diff -u -r1.799 -r1.800
--- upstream	15 Sep 2008 23:31:17 -0000	1.799
+++ upstream	17 Sep 2008 18:45:22 -0000	1.800
@@ -1,3 +1,3 @@
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc6.bz2
-patch-2.6.27-rc6-git4.bz2
+patch-2.6.27-rc6-git5.bz2


--- patch-2.6.27-rc6-git4.bz2.sign DELETED ---



From ausil at fedoraproject.org  Wed Sep 17 18:47:41 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 17 Sep 2008 18:47:41 +0000 (UTC)
Subject: common Makefile.common,1.112,1.113
Message-ID: <20080917184741.893A67013C@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1429

Modified Files:
	Makefile.common 
Log Message:
revert the commit disabling TAG_OPTS



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- Makefile.common	11 Sep 2008 20:44:35 -0000	1.112
+++ Makefile.common	17 Sep 2008 18:47:11 -0000	1.113
@@ -403,7 +403,7 @@
 # If you build a new version into the tree, first do "make tag",
 # then "make srpm", then build the package.  
 tag::    $(SPECFILE) $(COMMON_DIR)/branches
-	cvs tag -c $(TAG)
+	cvs tag $(TAG_OPTS) -c $(TAG)
 	@echo "Tagged with: $(TAG)"
 	@echo
 



From ssp at fedoraproject.org  Wed Sep 17 18:48:33 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Wed, 17 Sep 2008 18:48:33 +0000 (UTC)
Subject: rpms/pixman/devel .cvsignore, 1.13, 1.14 pixman.spec, 1.21,
	1.22 sources, 1.13, 1.14
Message-ID: <20080917184833.80BD97013C@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/pixman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1570

Modified Files:
	.cvsignore pixman.spec sources 
Log Message:
Update to 0.12.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	7 Sep 2008 03:02:19 -0000	1.13
+++ .cvsignore	17 Sep 2008 18:48:03 -0000	1.14
@@ -5,3 +5,4 @@
 pixman-0.11.6.tar.gz
 pixman-0.11.8.tar.gz
 pixman-0.11.10.tar.gz
+pixman-0.12.0.tar.gz


Index: pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/pixman.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- pixman.spec	10 Sep 2008 08:27:19 -0000	1.21
+++ pixman.spec	17 Sep 2008 18:48:03 -0000	1.22
@@ -2,8 +2,8 @@
 %define gitrev 8ff7213f39edc1b2b8b60d6b0cc5d5f14ca1928d
 
 Name:           pixman
-Version:        0.11.10
-Release:        2%{?dist}
+Version:        0.12.0
+Release:        1%{?dist}
 Summary:        Pixel manipulation library
 
 Group:          System Environment/Libraries
@@ -15,7 +15,6 @@
 Source0:        pixman-%{version}.tar.gz
 Source1:	make-pixman-snapshot.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:		stripes.patch
 
 # BuildRequires:  automake autoconf libtool pkgconfig
 
@@ -33,7 +32,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .stripes
 
 %build
 %configure --disable-static
@@ -63,6 +61,9 @@
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
+* Wed Sep 17 2008 Soren Sandmann <sandmann at redhat.com> 0.12.0-1
+- Upgrade to 0.12.0. Drop stripes patch.
+
 * Wed Sep 10 2008 Soren Sandmann <sandmann at redhat.com> 0.11.10-2
 - Add patch to fix stripes in the Nautilus selection retangle.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	7 Sep 2008 03:02:19 -0000	1.13
+++ sources	17 Sep 2008 18:48:03 -0000	1.14
@@ -1,3 +1,4 @@
 1b404bb31bf419a86531927492b5b95d  pixman-0.11.6.tar.gz
 7b5db768c51337b5e5e954fc9c961cd3  pixman-0.11.8.tar.gz
 a0406c1fa7abd3b2c61d07e7d33d27c7  pixman-0.11.10.tar.gz
+09357cc74975b01714e00c5899ea1881  pixman-0.12.0.tar.gz



From pkgdb at fedoraproject.org  Wed Sep 17 18:51:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:51:19 +0000
Subject: [pkgdb] python-prioritized-methods was added for lmacken
Message-ID: <20080917185119.AF0DB208D9F@bastion.fedora.phx.redhat.com>

kevin has added Package python-prioritized-methods with summary An extension to PEAK-Rules to prioritize methods in order
kevin has approved Package python-prioritized-methods
kevin has added a Fedora devel branch for python-prioritized-methods with an owner of lmacken
kevin has approved python-prioritized-methods in Fedora devel
kevin has approved Package python-prioritized-methods
kevin has set commit to Approved for packager on python-prioritized-methods (Fedora devel)
kevin has set build to Approved for packager on python-prioritized-methods (Fedora devel)
kevin has set checkout to Approved for packager on python-prioritized-methods (Fedora devel)
kevin has set commit to Approved for uberpackager on python-prioritized-methods (Fedora devel)
kevin has set build to Approved for uberpackager on python-prioritized-methods (Fedora devel)
kevin has set checkout to Approved for uberpackager on python-prioritized-methods (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-prioritized-methods



From pkgdb at fedoraproject.org  Wed Sep 17 18:51:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:51:21 +0000
Subject: [pkgdb] python-prioritized-methods (Fedora EPEL, 4) updated by kevin
Message-ID: <20080917185121.7BD8D208DA2@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for python-prioritized-methods
kevin has set commit to Approved for uberpackager on python-prioritized-methods (Fedora EPEL 4)
kevin has set build to Approved for uberpackager on python-prioritized-methods (Fedora EPEL 4)
kevin has set checkout to Approved for uberpackager on python-prioritized-methods (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-prioritized-methods



From pkgdb at fedoraproject.org  Wed Sep 17 18:51:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:51:21 +0000
Subject: [pkgdb] python-prioritized-methods (Fedora, 8) updated by kevin
Message-ID: <20080917185121.8622F208DA6@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for python-prioritized-methods
kevin has set commit to Approved for uberpackager on python-prioritized-methods (Fedora 8)
kevin has set build to Approved for uberpackager on python-prioritized-methods (Fedora 8)
kevin has set checkout to Approved for uberpackager on python-prioritized-methods (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-prioritized-methods



From pkgdb at fedoraproject.org  Wed Sep 17 18:51:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:51:21 +0000
Subject: [pkgdb] python-prioritized-methods (Fedora, 9) updated by kevin
Message-ID: <20080917185121.8A2A2208DA9@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for python-prioritized-methods
kevin has set commit to Approved for uberpackager on python-prioritized-methods (Fedora 9)
kevin has set build to Approved for uberpackager on python-prioritized-methods (Fedora 9)
kevin has set checkout to Approved for uberpackager on python-prioritized-methods (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-prioritized-methods



From pkgdb at fedoraproject.org  Wed Sep 17 18:51:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:51:21 +0000
Subject: [pkgdb] python-prioritized-methods (Fedora EPEL, 5) updated by kevin
Message-ID: <20080917185121.983A5208DAC@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-prioritized-methods
kevin has set commit to Approved for uberpackager on python-prioritized-methods (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on python-prioritized-methods (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on python-prioritized-methods (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-prioritized-methods



From kevin at fedoraproject.org  Wed Sep 17 18:52:58 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 18:52:58 +0000 (UTC)
Subject: rpms/python-prioritized-methods - New directory
Message-ID: <20080917185258.2AC827013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-prioritized-methods
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSs2134/rpms/python-prioritized-methods

Log Message:
Directory /cvs/extras/rpms/python-prioritized-methods added to the repository




From kevin at fedoraproject.org  Wed Sep 17 18:52:58 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 18:52:58 +0000 (UTC)
Subject: rpms/python-prioritized-methods/devel - New directory
Message-ID: <20080917185258.625AA70140@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-prioritized-methods/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSs2134/rpms/python-prioritized-methods/devel

Log Message:
Directory /cvs/extras/rpms/python-prioritized-methods/devel added to the repository




From kevin at fedoraproject.org  Wed Sep 17 18:52:59 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 18:52:59 +0000 (UTC)
Subject: rpms/python-prioritized-methods Makefile,NONE,1.1
Message-ID: <20080917185259.3CF287013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-prioritized-methods
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSs2134/rpms/python-prioritized-methods

Added Files:
	Makefile 
Log Message:
Setup of module python-prioritized-methods


--- NEW FILE Makefile ---
# Top level Makefile for module python-prioritized-methods
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep 17 18:52:59 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 18:52:59 +0000 (UTC)
Subject: rpms/python-prioritized-methods/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080917185259.7C69D7013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-prioritized-methods/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSs2134/rpms/python-prioritized-methods/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-prioritized-methods


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-prioritized-methods
# $Id: Makefile,v 1.1 2008/09/17 18:52:59 kevin Exp $
NAME := python-prioritized-methods
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 17 18:53:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:53:57 +0000
Subject: [pkgdb] sugar-chat was added for katzj
Message-ID: <20080917185357.394A6208D9A@bastion.fedora.phx.redhat.com>

kevin has added Package sugar-chat with summary Chat client for Sugar
kevin has approved Package sugar-chat
kevin has added a Fedora devel branch for sugar-chat with an owner of katzj
kevin has approved sugar-chat in Fedora devel
kevin has approved Package sugar-chat
kevin has set commit to Approved for packager on sugar-chat (Fedora devel)
kevin has set build to Approved for packager on sugar-chat (Fedora devel)
kevin has set checkout to Approved for packager on sugar-chat (Fedora devel)
kevin has set commit to Approved for uberpackager on sugar-chat (Fedora devel)
kevin has set build to Approved for uberpackager on sugar-chat (Fedora devel)
kevin has set checkout to Approved for uberpackager on sugar-chat (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Wed Sep 17 18:53:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:53:58 +0000
Subject: [pkgdb] sugar-chat (Fedora, devel) updated by kevin
Message-ID: <20080917185358.E1463208DA3@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on sugar-chat (Fedora devel) for mpg
kevin approved watchcommits on sugar-chat (Fedora devel) for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From kevin at fedoraproject.org  Wed Sep 17 18:54:12 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 18:54:12 +0000 (UTC)
Subject: rpms/sugar-chat - New directory
Message-ID: <20080917185412.213F57013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-chat
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCc2470/rpms/sugar-chat

Log Message:
Directory /cvs/extras/rpms/sugar-chat added to the repository




From kevin at fedoraproject.org  Wed Sep 17 18:54:12 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 18:54:12 +0000 (UTC)
Subject: rpms/sugar-chat/devel - New directory
Message-ID: <20080917185412.5AD987013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-chat/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCc2470/rpms/sugar-chat/devel

Log Message:
Directory /cvs/extras/rpms/sugar-chat/devel added to the repository




From kevin at fedoraproject.org  Wed Sep 17 18:54:13 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 18:54:13 +0000 (UTC)
Subject: rpms/sugar-chat Makefile,NONE,1.1
Message-ID: <20080917185413.3C37B7013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-chat
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCc2470/rpms/sugar-chat

Added Files:
	Makefile 
Log Message:
Setup of module sugar-chat


--- NEW FILE Makefile ---
# Top level Makefile for module sugar-chat
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep 17 18:54:13 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 18:54:13 +0000 (UTC)
Subject: rpms/sugar-chat/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080917185413.73D737013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-chat/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCc2470/rpms/sugar-chat/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sugar-chat


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sugar-chat
# $Id: Makefile,v 1.1 2008/09/17 18:54:13 kevin Exp $
NAME := sugar-chat
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 17 18:53:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 18:53:58 +0000
Subject: [pkgdb] sugar-chat (Fedora, 9) updated by kevin
Message-ID: <20080917185358.EA00E208DA0@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for sugar-chat
kevin has set commit to Approved for uberpackager on sugar-chat (Fedora 9)
kevin has set build to Approved for uberpackager on sugar-chat (Fedora 9)
kevin has set checkout to Approved for uberpackager on sugar-chat (Fedora 9)
kevin approved watchbugzilla on sugar-chat (Fedora 9) for mpg
kevin approved watchcommits on sugar-chat (Fedora 9) for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From spot at fedoraproject.org  Wed Sep 17 18:55:45 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 17 Sep 2008 18:55:45 +0000 (UTC)
Subject: rpms/lrmi/devel lrmi-0.10-newheaders.patch, NONE, 1.1 lrmi.spec,
	1.11, 1.12
Message-ID: <20080917185545.810DD7013C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/lrmi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2642

Modified Files:
	lrmi.spec 
Added Files:
	lrmi-0.10-newheaders.patch 
Log Message:
fix FTBFS

lrmi-0.10-newheaders.patch:

--- NEW FILE lrmi-0.10-newheaders.patch ---
diff -up lrmi-0.10/lrmi.c.BAD lrmi-0.10/lrmi.c
--- lrmi-0.10/lrmi.c.BAD	2008-09-17 14:41:28.000000000 -0400
+++ lrmi-0.10/lrmi.c	2008-09-17 14:45:17.000000000 -0400
@@ -239,7 +239,7 @@ LRMI_free_real(void *m)
 
 
 #if defined(__linux__)
-#define DEFAULT_VM86_FLAGS 	(IF_MASK | IOPL_MASK)
+#define DEFAULT_VM86_FLAGS 	(X86_EFLAGS_IF | X86_EFLAGS_IOPL)
 #elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
 #define DEFAULT_VM86_FLAGS  (PSL_I | PSL_IOPL)
 #define TF_MASK         PSL_T
@@ -822,7 +822,7 @@ run_vm86(void)
 
 			CONTEXT_REGS.REG(cs) = get_int_seg(v);
 			CONTEXT_REGS.REG(eip) = get_int_off(v);
-			CONTEXT_REGS.REG(eflags) &= ~(VIF_MASK | TF_MASK);
+			CONTEXT_REGS.REG(eflags) &= ~(X86_EFLAGS_VIF | X86_EFLAGS_TF);
 
 			continue;
 		}
@@ -862,7 +862,7 @@ vm86_callback(int sig, int code, struct 
 
 			CONTEXT_REGS.REG(cs) = get_int_seg(v);
 			CONTEXT_REGS.REG(eip) = get_int_off(v);
-			CONTEXT_REGS.REG(eflags) &= ~(VIF_MASK | TF_MASK);
+			CONTEXT_REGS.REG(eflags) &= ~(X86_EFLAGS_VIF | X86_EFLAGS_TF);
 
 			break;
 		}
@@ -916,7 +916,7 @@ vm86_callback(int sig, int code, struct 
 
 		CONTEXT_REGS.REG(cs) = get_int_seg(addr[1]);
 		CONTEXT_REGS.REG(eip) = get_int_off(addr[1]);
-		CONTEXT_REGS.REG(eflags) &= ~(VIF_MASK | TF_MASK);
+		CONTEXT_REGS.REG(eflags) &= ~(X86_EFLAGS_VIF | X86_EFLAGS_TF);
 	} else {
 		if (emulate() == 0) {
 			context.success = 0;


Index: lrmi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lrmi/devel/lrmi.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lrmi.spec	10 Feb 2008 18:37:28 -0000	1.11
+++ lrmi.spec	17 Sep 2008 18:55:15 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           lrmi
 Version:        0.10
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Library for calling real mode BIOS routines
 
 Group:          System Environment/Libraries
@@ -8,7 +8,9 @@
 URL:            http://sourceforge.net/projects/lrmi/
 Source0:        http://download.sourceforge.net/lrmi/%{name}-%{version}.tar.gz
 Patch0:         %{name}-0.9-build.patch
+Patch1:         lrmi-0.10-newheaders.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  kernel-headers
 
 ExclusiveArch:  %{ix86}
 Provides:       lib%{name} = %{version}-%{release}
@@ -36,6 +38,7 @@
 %prep
 %setup -q
 %patch0
+%patch1 -p1 -b .new-headers
 
 
 %build
@@ -75,6 +78,10 @@
 
 
 %changelog
+* Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10-5
+- fix compile against modern kernel headers
+- add BR: kernel-headers
+
 * Sun Feb 10 2008 Kevin Fenzi <kevin at tummy.com> - 0.10-4
 - Rebuild for gcc43
 



From pkgdb at fedoraproject.org  Wed Sep 17 19:00:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 19:00:41 +0000
Subject: [pkgdb] sugar-log was added for erikos
Message-ID: <20080917190041.DDD7C208DA3@bastion.fedora.phx.redhat.com>

kevin has added Package sugar-log with summary Tool to examine sugar log files
kevin has approved Package sugar-log
kevin has added a Fedora devel branch for sugar-log with an owner of erikos
kevin has approved sugar-log in Fedora devel
kevin has approved Package sugar-log
kevin has set commit to Approved for packager on sugar-log (Fedora devel)
kevin has set build to Approved for packager on sugar-log (Fedora devel)
kevin has set checkout to Approved for packager on sugar-log (Fedora devel)
kevin has set commit to Approved for uberpackager on sugar-log (Fedora devel)
kevin has set build to Approved for uberpackager on sugar-log (Fedora devel)
kevin has set checkout to Approved for uberpackager on sugar-log (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-log



From pkgdb at fedoraproject.org  Wed Sep 17 19:00:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 19:00:44 +0000
Subject: [pkgdb] sugar-log (Fedora, devel) updated by kevin
Message-ID: <20080917190044.3F088208DA6@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on sugar-log (Fedora devel) for mpg
kevin approved watchcommits on sugar-log (Fedora devel) for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-log



From kevin at fedoraproject.org  Wed Sep 17 19:00:53 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 19:00:53 +0000 (UTC)
Subject: rpms/sugar-log - New directory
Message-ID: <20080917190053.267327013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-log
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOe3362/rpms/sugar-log

Log Message:
Directory /cvs/extras/rpms/sugar-log added to the repository




From pkgdb at fedoraproject.org  Wed Sep 17 19:00:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 19:00:44 +0000
Subject: [pkgdb] sugar-log (Fedora, 9) updated by kevin
Message-ID: <20080917190044.4F6AD208DA9@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for sugar-log
kevin has set commit to Approved for uberpackager on sugar-log (Fedora 9)
kevin has set build to Approved for uberpackager on sugar-log (Fedora 9)
kevin has set checkout to Approved for uberpackager on sugar-log (Fedora 9)
kevin approved watchbugzilla on sugar-log (Fedora 9) for mpg
kevin approved watchcommits on sugar-log (Fedora 9) for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-log



From kevin at fedoraproject.org  Wed Sep 17 19:00:53 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 19:00:53 +0000 (UTC)
Subject: rpms/sugar-log/devel - New directory
Message-ID: <20080917190053.67AD170141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-log/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOe3362/rpms/sugar-log/devel

Log Message:
Directory /cvs/extras/rpms/sugar-log/devel added to the repository




From kevin at fedoraproject.org  Wed Sep 17 19:00:54 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 19:00:54 +0000 (UTC)
Subject: rpms/sugar-log Makefile,NONE,1.1
Message-ID: <20080917190054.627AB7013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-log
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOe3362/rpms/sugar-log

Added Files:
	Makefile 
Log Message:
Setup of module sugar-log


--- NEW FILE Makefile ---
# Top level Makefile for module sugar-log
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Sep 17 19:00:54 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 19:00:54 +0000 (UTC)
Subject: rpms/sugar-log/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080917190054.A183F7013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-log/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOe3362/rpms/sugar-log/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sugar-log


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sugar-log
# $Id: Makefile,v 1.1 2008/09/17 19:00:54 kevin Exp $
NAME := sugar-log
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Sep 17 19:02:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 19:02:53 +0000
Subject: [pkgdb] libgda (Fedora EPEL, 5) updated by kevin
Message-ID: <20080917190253.3B762208D9F@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for libgda
kevin has set commit to Approved for uberpackager on libgda (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on libgda (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on libgda (Fedora EPEL 5)
kevin changed owner of libgda in Fedora EPEL 5 to lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgda



From pkgdb at fedoraproject.org  Wed Sep 17 19:03:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 19:03:16 +0000
Subject: [pkgdb] libgnomedb (Fedora EPEL, 5) updated by kevin
Message-ID: <20080917190316.6FE46208DA0@bastion.fedora.phx.redhat.com>

kevin changed owner of libgnomedb in Fedora EPEL 5 to lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Wed Sep 17 19:03:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 19:03:28 +0000
Subject: [pkgdb] mdbtools (Fedora EPEL, 5) updated by kevin
Message-ID: <20080917190328.46CD4208D9B@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mdbtools
kevin has set commit to Approved for uberpackager on mdbtools (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on mdbtools (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on mdbtools (Fedora EPEL 5)
kevin changed owner of mdbtools in Fedora EPEL 5 to lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mdbtools



From kevin at fedoraproject.org  Wed Sep 17 19:05:47 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 19:05:47 +0000 (UTC)
Subject: rpms/hunspell-uk - New directory
Message-ID: <20080917190547.27D167013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-uk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFl4005/rpms/hunspell-uk

Log Message:
Directory /cvs/extras/rpms/hunspell-uk added to the repository




From kevin at fedoraproject.org  Wed Sep 17 19:05:47 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 19:05:47 +0000 (UTC)
Subject: rpms/hunspell-uk/devel - New directory
Message-ID: <20080917190547.6047F7013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-uk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFl4005/rpms/hunspell-uk/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-uk/devel added to the repository




From kevin at fedoraproject.org  Wed Sep 17 19:05:48 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 19:05:48 +0000 (UTC)
Subject: rpms/hunspell-uk Makefile,NONE,1.1
Message-ID: <20080917190548.313A57013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-uk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFl4005/rpms/hunspell-uk

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-uk


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-uk
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep 17 19:05:48 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 19:05:48 +0000 (UTC)
Subject: rpms/hunspell-uk/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080917190548.606267013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-uk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFl4005/rpms/hunspell-uk/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-uk


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-uk
# $Id: Makefile,v 1.1 2008/09/17 19:05:48 kevin Exp $
NAME := hunspell-uk
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 17 19:05:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 19:05:34 +0000
Subject: [pkgdb] hunspell-uk was added for caolanm
Message-ID: <20080917190534.C34BB208D9F@bastion.fedora.phx.redhat.com>

kevin has added Package hunspell-uk with summary Ukrainian hunspell dictionaries
kevin has approved Package hunspell-uk
kevin has added a Fedora devel branch for hunspell-uk with an owner of caolanm
kevin has approved hunspell-uk in Fedora devel
kevin has approved Package hunspell-uk
kevin has set commit to Approved for packager on hunspell-uk (Fedora devel)
kevin has set build to Approved for packager on hunspell-uk (Fedora devel)
kevin has set checkout to Approved for packager on hunspell-uk (Fedora devel)
kevin has set commit to Approved for uberpackager on hunspell-uk (Fedora devel)
kevin has set build to Approved for uberpackager on hunspell-uk (Fedora devel)
kevin has set checkout to Approved for uberpackager on hunspell-uk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-uk



From spot at fedoraproject.org  Wed Sep 17 19:06:04 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 17 Sep 2008 19:06:04 +0000 (UTC)
Subject: rpms/tcl-snack/F-8 tcl-snack.spec,1.1,1.2
Message-ID: <20080917190604.239F27013C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-snack/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3960/F-8

Modified Files:
	tcl-snack.spec 
Log Message:
dont hardcode tcl abi version


Index: tcl-snack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-snack/F-8/tcl-snack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcl-snack.spec	13 Sep 2008 01:18:50 -0000	1.1
+++ tcl-snack.spec	17 Sep 2008 19:05:33 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:		tcl-%{realname}
 Version:	2.2.10
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Sound toolkit
 Group:		System Environment/Libraries
 License:	GPLv2+
@@ -23,7 +23,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	tcl-devel, tk-devel, alsa-lib-devel, libogg-devel, libvorbis-devel
 BuildRequires:	python-devel
-Requires:	tcl(abi) = 8.5
+Requires:	tcl(abi) = %{tcl_version}
 Provides:	%{realname} = %{version}-%{release}
 
 %description
@@ -97,6 +97,9 @@
 %{python_sitelib}/tkSnack*
 
 %changelog
+* Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-3
+- don't hardcode tcl abi version
+
 * Mon Aug  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-2
 - add BR: python
 



From spot at fedoraproject.org  Wed Sep 17 19:06:04 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 17 Sep 2008 19:06:04 +0000 (UTC)
Subject: rpms/tcl-snack/F-9 tcl-snack.spec,1.1,1.2
Message-ID: <20080917190604.592717013C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-snack/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3960/F-9

Modified Files:
	tcl-snack.spec 
Log Message:
dont hardcode tcl abi version


Index: tcl-snack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-snack/F-9/tcl-snack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcl-snack.spec	13 Sep 2008 01:18:51 -0000	1.1
+++ tcl-snack.spec	17 Sep 2008 19:05:34 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:		tcl-%{realname}
 Version:	2.2.10
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Sound toolkit
 Group:		System Environment/Libraries
 License:	GPLv2+
@@ -23,7 +23,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	tcl-devel, tk-devel, alsa-lib-devel, libogg-devel, libvorbis-devel
 BuildRequires:	python-devel
-Requires:	tcl(abi) = 8.5
+Requires:	tcl(abi) = %{tcl_version}
 Provides:	%{realname} = %{version}-%{release}
 
 %description
@@ -97,6 +97,9 @@
 %{python_sitelib}/tkSnack*
 
 %changelog
+* Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-3
+- don't hardcode tcl abi version
+
 * Mon Aug  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-2
 - add BR: python
 



From spot at fedoraproject.org  Wed Sep 17 19:06:04 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 17 Sep 2008 19:06:04 +0000 (UTC)
Subject: rpms/tcl-snack/devel tcl-snack.spec,1.1,1.2
Message-ID: <20080917190604.88F7F7013C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-snack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3960/devel

Modified Files:
	tcl-snack.spec 
Log Message:
dont hardcode tcl abi version


Index: tcl-snack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-snack/devel/tcl-snack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcl-snack.spec	12 Sep 2008 21:14:51 -0000	1.1
+++ tcl-snack.spec	17 Sep 2008 19:05:34 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:		tcl-%{realname}
 Version:	2.2.10
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Sound toolkit
 Group:		System Environment/Libraries
 License:	GPLv2+
@@ -23,7 +23,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	tcl-devel, tk-devel, alsa-lib-devel, libogg-devel, libvorbis-devel
 BuildRequires:	python-devel
-Requires:	tcl(abi) = 8.5
+Requires:	tcl(abi) = %{tcl_version}
 Provides:	%{realname} = %{version}-%{release}
 
 %description
@@ -97,6 +97,9 @@
 %{python_sitelib}/tkSnack*
 
 %changelog
+* Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-3
+- don't hardcode tcl abi version
+
 * Mon Aug  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-2
 - add BR: python
 



From spot at fedoraproject.org  Wed Sep 17 19:10:04 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 17 Sep 2008 19:10:04 +0000 (UTC)
Subject: rpms/tcl-tile/F-8 tcl-tile.spec,1.1,1.2
Message-ID: <20080917191004.BC52D7013C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-tile/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4852/F-8

Modified Files:
	tcl-tile.spec 
Log Message:
dont hardcode tcl abi version


Index: tcl-tile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-tile/F-8/tcl-tile.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcl-tile.spec	14 Sep 2008 03:05:37 -0000	1.1
+++ tcl-tile.spec	17 Sep 2008 19:09:34 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:		tcl-%{realname}
 Version:	0.8.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Modified Tk styling engine
 Group:		System Environment/Libraries
 License:	TCL
@@ -14,7 +14,7 @@
 Provides:	%{realname} = %{version}-%{release}
 Provides:	tk-%{realname} = %{version}-%{release}
 BuildRequires:	tcl-devel, tk-devel, libX11-devel
-Requires:	tcl(abi) = 8.5
+Requires:	tcl(abi) = %{tcl_version}
 
 %description
 The Tile Widget Set is an experimental reimplementation of
@@ -66,6 +66,9 @@
 %{_libdir}/libttkstub.a
 
 %changelog
+* Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-3
+- don't hardcode tcl abi requires
+
 * Mon Aug 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-2
 - fix license tag
 



From spot at fedoraproject.org  Wed Sep 17 19:10:04 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 17 Sep 2008 19:10:04 +0000 (UTC)
Subject: rpms/tcl-tile/F-9 tcl-tile.spec,1.1,1.2
Message-ID: <20080917191004.E4EF97013C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-tile/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4852/F-9

Modified Files:
	tcl-tile.spec 
Log Message:
dont hardcode tcl abi version


Index: tcl-tile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-tile/F-9/tcl-tile.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcl-tile.spec	14 Sep 2008 03:05:38 -0000	1.1
+++ tcl-tile.spec	17 Sep 2008 19:09:34 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:		tcl-%{realname}
 Version:	0.8.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Modified Tk styling engine
 Group:		System Environment/Libraries
 License:	TCL
@@ -14,7 +14,7 @@
 Provides:	%{realname} = %{version}-%{release}
 Provides:	tk-%{realname} = %{version}-%{release}
 BuildRequires:	tcl-devel, tk-devel, libX11-devel
-Requires:	tcl(abi) = 8.5
+Requires:	tcl(abi) = %{tcl_version}
 
 %description
 The Tile Widget Set is an experimental reimplementation of
@@ -66,6 +66,9 @@
 %{_libdir}/libttkstub.a
 
 %changelog
+* Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-3
+- don't hardcode tcl abi requires
+
 * Mon Aug 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-2
 - fix license tag
 



From spot at fedoraproject.org  Wed Sep 17 19:10:05 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 17 Sep 2008 19:10:05 +0000 (UTC)
Subject: rpms/tcl-tile/devel tcl-tile.spec,1.1,1.2
Message-ID: <20080917191005.430BC7013C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-tile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4852/devel

Modified Files:
	tcl-tile.spec 
Log Message:
dont hardcode tcl abi version


Index: tcl-tile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-tile/devel/tcl-tile.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcl-tile.spec	14 Sep 2008 03:04:10 -0000	1.1
+++ tcl-tile.spec	17 Sep 2008 19:09:34 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:		tcl-%{realname}
 Version:	0.8.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Modified Tk styling engine
 Group:		System Environment/Libraries
 License:	TCL
@@ -14,7 +14,7 @@
 Provides:	%{realname} = %{version}-%{release}
 Provides:	tk-%{realname} = %{version}-%{release}
 BuildRequires:	tcl-devel, tk-devel, libX11-devel
-Requires:	tcl(abi) = 8.5
+Requires:	tcl(abi) = %{tcl_version}
 
 %description
 The Tile Widget Set is an experimental reimplementation of
@@ -66,6 +66,9 @@
 %{_libdir}/libttkstub.a
 
 %changelog
+* Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-3
+- don't hardcode tcl abi requires
+
 * Mon Aug 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-2
 - fix license tag
 



From kevin at fedoraproject.org  Wed Sep 17 19:11:21 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 19:11:21 +0000 (UTC)
Subject: rpms/hunspell-ur - New directory
Message-ID: <20080917191121.270BB7013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-ur
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBy5097/rpms/hunspell-ur

Log Message:
Directory /cvs/extras/rpms/hunspell-ur added to the repository




From kevin at fedoraproject.org  Wed Sep 17 19:11:21 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 19:11:21 +0000 (UTC)
Subject: rpms/hunspell-ur/devel - New directory
Message-ID: <20080917191121.71C227013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-ur/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBy5097/rpms/hunspell-ur/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-ur/devel added to the repository




From kevin at fedoraproject.org  Wed Sep 17 19:11:22 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 19:11:22 +0000 (UTC)
Subject: rpms/hunspell-ur Makefile,NONE,1.1
Message-ID: <20080917191122.801227013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-ur
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBy5097/rpms/hunspell-ur

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-ur


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-ur
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep 17 19:11:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 19:11:09 +0000
Subject: [pkgdb] hunspell-ur was added for caolanm
Message-ID: <20080917191109.7FD58208D9F@bastion.fedora.phx.redhat.com>

kevin has added Package hunspell-ur with summary Urdu hunspell dictionary
kevin has approved Package hunspell-ur
kevin has added a Fedora devel branch for hunspell-ur with an owner of caolanm
kevin has approved hunspell-ur in Fedora devel
kevin has approved Package hunspell-ur
kevin has set commit to Approved for packager on hunspell-ur (Fedora devel)
kevin has set build to Approved for packager on hunspell-ur (Fedora devel)
kevin has set checkout to Approved for packager on hunspell-ur (Fedora devel)
kevin has set commit to Approved for uberpackager on hunspell-ur (Fedora devel)
kevin has set build to Approved for uberpackager on hunspell-ur (Fedora devel)
kevin has set checkout to Approved for uberpackager on hunspell-ur (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-ur



From kevin at fedoraproject.org  Wed Sep 17 19:11:22 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 17 Sep 2008 19:11:22 +0000 (UTC)
Subject: rpms/hunspell-ur/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080917191122.C59B47013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-ur/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBy5097/rpms/hunspell-ur/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-ur


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-ur
# $Id: Makefile,v 1.1 2008/09/17 19:11:22 kevin Exp $
NAME := hunspell-ur
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 17 19:12:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 19:12:29 +0000
Subject: [pkgdb] libgnomedb (Fedora EPEL, 5) updated by kevin
Message-ID: <20080917191229.92FED208DA0@bastion.fedora.phx.redhat.com>

kevin changed owner of libgnomedb in Fedora EPEL 5 to denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Wed Sep 17 19:13:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 19:13:00 +0000
Subject: [pkgdb] perl-File-RsyncP (Fedora EPEL, 4) updated by kevin
Message-ID: <20080917191300.C75FF208D9B@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for perl-File-RsyncP
kevin has set commit to Approved for uberpackager on perl-File-RsyncP (Fedora EPEL 4)
kevin has set build to Approved for uberpackager on perl-File-RsyncP (Fedora EPEL 4)
kevin has set checkout to Approved for uberpackager on perl-File-RsyncP (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Wed Sep 17 19:13:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 19:13:00 +0000
Subject: [pkgdb] perl-File-RsyncP (Fedora EPEL, 5) updated by kevin
Message-ID: <20080917191300.D8C2F208DA2@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-File-RsyncP
kevin has set commit to Approved for uberpackager on perl-File-RsyncP (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on perl-File-RsyncP (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on perl-File-RsyncP (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Wed Sep 17 19:18:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 19:18:16 +0000
Subject: [pkgdb] mx ownership updated
Message-ID: <20080917191816.2FAD3208D9B@bastion.fedora.phx.redhat.com>

Package mx in Fedora devel was orphaned by kevin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mx



From pkgdb at fedoraproject.org  Wed Sep 17 19:19:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 19:19:08 +0000
Subject: [pkgdb] mx (Fedora, 9) updated by kevin
Message-ID: <20080917191908.73F83208D9F@bastion.fedora.phx.redhat.com>

kevin changed owner of mx in Fedora 9 to pfj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mx



From pkgdb at fedoraproject.org  Wed Sep 17 19:19:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 19:19:08 +0000
Subject: [pkgdb] mx (Fedora, devel) updated by kevin
Message-ID: <20080917191908.8AF40208DA3@bastion.fedora.phx.redhat.com>

kevin changed owner of mx in Fedora devel to pfj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mx



From pkgdb at fedoraproject.org  Wed Sep 17 19:19:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 19:19:08 +0000
Subject: [pkgdb] mx (Fedora, 8) updated by kevin
Message-ID: <20080917191908.9517D208DA6@bastion.fedora.phx.redhat.com>

kevin changed owner of mx in Fedora 8 to pfj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mx



From pkgdb at fedoraproject.org  Wed Sep 17 19:19:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 19:19:27 +0000
Subject: [pkgdb] pyOpenSSL (Fedora, devel) updated by kevin
Message-ID: <20080917191927.BB0A5208DAA@bastion.fedora.phx.redhat.com>

kevin changed owner of pyOpenSSL in Fedora devel to pfj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyOpenSSL



From pkgdb at fedoraproject.org  Wed Sep 17 19:19:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 19:19:27 +0000
Subject: [pkgdb] pyOpenSSL (Fedora, 9) updated by kevin
Message-ID: <20080917191927.B1B8E208DA7@bastion.fedora.phx.redhat.com>

kevin changed owner of pyOpenSSL in Fedora 9 to pfj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyOpenSSL



From pkgdb at fedoraproject.org  Wed Sep 17 19:19:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 17 Sep 2008 19:19:27 +0000
Subject: [pkgdb] pyOpenSSL (Fedora, 8) updated by kevin
Message-ID: <20080917191927.CE880208DAD@bastion.fedora.phx.redhat.com>

kevin changed owner of pyOpenSSL in Fedora 8 to pfj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyOpenSSL



From trasher at fedoraproject.org  Wed Sep 17 19:43:08 2008
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Wed, 17 Sep 2008 19:43:08 +0000 (UTC)
Subject: rpms/perl-File-RsyncP/EL-4 perl-File-RsyncP.spec,1.7,1.8
Message-ID: <20080917194308.0CC437013C@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/perl-File-RsyncP/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7693

Modified Files:
	perl-File-RsyncP.spec 
Log Message:
Rebuild for EL-4



Index: perl-File-RsyncP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-RsyncP/EL-4/perl-File-RsyncP.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-File-RsyncP.spec	7 Mar 2008 02:00:39 -0000	1.7
+++ perl-File-RsyncP.spec	17 Sep 2008 19:42:37 -0000	1.8
@@ -1,6 +1,6 @@
 Name: perl-File-RsyncP
 Version: 0.68
-Release: 4%{?dist}
+Release: 1%{?dist}
 Summary: A perl implementation of an Rsync client
 License: GPLv2
 Group: Development/Libraries
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Johan Cwiklinski <johan AT x-tnd DOT be> - 0.68-1
+- Rebuild for EL-4
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.68-4
 Rebuild for new perl
 



From trasher at fedoraproject.org  Wed Sep 17 19:45:29 2008
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Wed, 17 Sep 2008 19:45:29 +0000 (UTC)
Subject: rpms/perl-File-RsyncP/EL-5 perl-File-RsyncP.spec,1.3,1.4
Message-ID: <20080917194529.3D9C57013C@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/perl-File-RsyncP/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7936

Modified Files:
	perl-File-RsyncP.spec 
Log Message:
Rebuild for EL-5



Index: perl-File-RsyncP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-RsyncP/EL-5/perl-File-RsyncP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-File-RsyncP.spec	5 Jun 2007 02:24:10 -0000	1.3
+++ perl-File-RsyncP.spec	17 Sep 2008 19:44:58 -0000	1.4
@@ -2,7 +2,7 @@
 Version: 0.68
 Release: 1%{?dist}
 Summary: A perl implementation of an Rsync client
-License: GPL
+License: GPLv2
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/File-RsyncP/
 Source0: http://search.cpan.org/CPAN/authors/id/C/CB/CBARRATT/File-RsyncP-%{version}.tar.gz
@@ -10,6 +10,7 @@
 
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: %{_bindir}/iconv
+BuildRequires: perl(ExtUtils::MakeMaker)
 
 %description
 File::RsyncP is a perl implementation of an Rsync client. It is compatible with
@@ -50,6 +51,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Johan Cwiklinski <johan AT x-tnd DOT be> - 0.68-1
+- Rebuild for EL-5
+
 * Mon Jun 04 2007 Mike McGrath <mmcgrath at redhat.com> - 0.68-1
 - Upstream released new version
 



From ausil at fedoraproject.org  Wed Sep 17 19:52:24 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 17 Sep 2008 19:52:24 +0000 (UTC)
Subject: common Makefile.common,1.113,1.114
Message-ID: <20080917195225.035FC7013C@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8367

Modified Files:
	Makefile.common 
Log Message:
enable scratchbuilding srpms made from your cvs tree



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- Makefile.common	17 Sep 2008 18:47:11 -0000	1.113
+++ Makefile.common	17 Sep 2008 19:51:54 -0000	1.114
@@ -183,7 +183,7 @@
 PREP_ARCHES	= $(addprefix prep-,$(ARCHES))
 
 ## list all our bogus targets
-.PHONY :: $(ARCHES) sources uploadsource upload export check build-check plague koji build cvsurl chain-build test-srpm srpm tag verrel new clean patch prep compile install install-short compile-short FORCE local scratch-build scratch-build-% 
+.PHONY :: $(ARCHES) sources uploadsource upload export check build-check plague koji build cvsurl chain-build test-srpm srpm tag verrel new clean patch prep compile install install-short compile-short FORCE local scratch-build scratch-build-% srpm-scratch-build srpm-scratch-build-%
 
 # The TARGETS define is meant for local module targets that should be
 # made in addition to the SOURCEFILES whenever needed
@@ -448,11 +448,18 @@
 	@if [ ! -x "$(BUILD_CLIENT)" ]; then echo "Must have koji installed - see http://fedoraproject.org/wiki/BuildSystemClientSetup"; exit 1; fi
 	$(BUILD_CLIENT) $(SECONDARY_CONFIG) build --scratch $(BUILD_FLAGS) $(TARGET) '$(CVS_URL)'
 
+srpm-scratch-build: srpm
+	@if [ ! -x "$(BUILD_CLIENT)" ]; then echo "Must have koji installed - see http://fedoraproject.org/wiki/BuildSystemClientSetup"; exit 1; fi
+	$(BUILD_CLIENT) $(SECONDARY_CONFIG) build --scratch $(BUILD_FLAGS) $(TARGET) $(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE).src.rpm
 
 scratch-build-%: build-check
 	@if [ ! -x "$(BUILD_CLIENT)" ]; then echo "Must have koji installed - see http://fedoraproject.org/wiki/BuildSystemClientSetup"; exit 1; fi
 	$(BUILD_CLIENT) $(SECONDARY_CONFIG) build --scratch --arch-override=$* $(BUILD_FLAGS) $(TARGET) '$(CVS_URL)'
 
+srpm-scratch-build-%: srpm
+	@if [ ! -x "$(BUILD_CLIENT)" ]; then echo "Must have koji installed - see http://fedoraproject.org/wiki/BuildSystemClientSetup"; exit 1; fi
+	$(BUILD_CLIENT) $(SECONDARY_CONFIG) build --scratch --arch-override=$* $(BUILD_FLAGS) $(TARGET) $(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE).src.rpm
+
 
 bodhi: build-check $(COMMON_DIR)/branches clog 
 	@if [ ! -x "$(BODHI_CLIENT)" ]; then echo "Must have bodhi-client installed"; exit 1; fi
@@ -621,7 +628,9 @@
 	@echo "		  the next group will begin building."
 	@echo "		If no groups are defined, packages will be built sequentially."
 	@echo "	scratch-build		Request scratch build of \"$(TAG)\" for $(TARGET)"
+	@echo "	srpm-scratch-build	Request scratch build of srpm"
 	@echo "	scratch-build-<archs>   Request scratch build of \"$(TAG)\" for $(TARGET) and archs <archs>"
+	@echo "	srpm-scratch-build-<archs> Request scratch build of srpm and archs <archs>"
 	@echo "		examples:  make scratch-build-i386,ppc64"
 	@echo "		           make scratch-build-x86_64"
 	@echo "	mockbuild		Local test build using mock"



From sgrubb at fedoraproject.org  Wed Sep 17 20:13:03 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed, 17 Sep 2008 20:13:03 +0000 (UTC)
Subject: rpms/audit/devel .cvsignore, 1.95, 1.96 audit.spec, 1.184,
	1.185 sources, 1.119, 1.120
Message-ID: <20080917201303.36B677013C@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9623

Modified Files:
	.cvsignore audit.spec sources 
Log Message:
* Wed Sep 17 2008 Steve Grubb <sgrubb at redhat.com> 1.7.7-1
- Bug fixes for GSSAPI code in remote logging (DJ Delorie)
- Add watched syscall support to audisp-prelude
- Enable tcp_wrappers support in auditd



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/.cvsignore,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- .cvsignore	11 Sep 2008 22:51:16 -0000	1.95
+++ .cvsignore	17 Sep 2008 20:12:32 -0000	1.96
@@ -92,3 +92,4 @@
 audit-1.7.4.tar.gz
 audit-1.7.5.tar.gz
 audit-1.7.6.tar.gz
+audit-1.7.7.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- audit.spec	11 Sep 2008 23:11:08 -0000	1.184
+++ audit.spec	17 Sep 2008 20:12:32 -0000	1.185
@@ -1,12 +1,12 @@
 %define sca_version 0.4.8
-%define sca_release 2
+%define sca_release 3
 %define selinux_variants mls strict targeted
 %define selinux_policyver 3.2.5 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 1.7.6
+Version: 1.7.7
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -168,8 +168,8 @@
 	--delete-original				\
 	system-config-audit/system-config-audit.desktop
 
-#% check
-#make check
+%check
+make check
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -324,6 +324,11 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Wed Sep 17 2008 Steve Grubb <sgrubb at redhat.com> 1.7.7-1
+- Bug fixes for GSSAPI code in remote logging (DJ Delorie)
+- Add watched syscall support to audisp-prelude
+- Enable tcp_wrappers support in auditd
+
 * Wed Sep 11 2008 Steve Grubb <sgrubb at redhat.com> 1.7.6-1
 - Add subject to audit daemon events (Chu Li)
 - Add tcp_wrappers support for auditd


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/sources,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- sources	11 Sep 2008 22:51:16 -0000	1.119
+++ sources	17 Sep 2008 20:12:32 -0000	1.120
@@ -1 +1 @@
-4dcd4f2f9535feb38a2ad0c594dfdeb1  audit-1.7.6.tar.gz
+be66a1e78091f0e7280e286784c5b4b3  audit-1.7.7.tar.gz



From spot at fedoraproject.org  Wed Sep 17 20:18:01 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 17 Sep 2008 20:18:01 +0000 (UTC)
Subject: rpms/tcl-tile/F-8 tcl-tile.spec,1.2,1.3
Message-ID: <20080917201801.597247013C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-tile/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10005/F-8

Modified Files:
	tcl-tile.spec 
Log Message:
no, we really do need to hardcode. :(


Index: tcl-tile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-tile/F-8/tcl-tile.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tcl-tile.spec	17 Sep 2008 19:09:34 -0000	1.2
+++ tcl-tile.spec	17 Sep 2008 20:17:31 -0000	1.3
@@ -1,10 +1,15 @@
-%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+# We used to define this dynamically, but the Fedora buildsystem chokes on
+# using this for the versioned Requires on tcl(abi), so we hardcode it.
+# This sucks, but there is no other clean way around it, because tcl
+# (and tclsh) aren't in the default buildroot.
+# %%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_version: %define tcl_version 8.4}
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 %define realname tile
 
 Name:		tcl-%{realname}
 Version:	0.8.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Modified Tk styling engine
 Group:		System Environment/Libraries
 License:	TCL
@@ -13,7 +18,7 @@
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Provides:	%{realname} = %{version}-%{release}
 Provides:	tk-%{realname} = %{version}-%{release}
-BuildRequires:	tcl-devel, tk-devel, libX11-devel
+BuildRequires:	tcl-devel = %{tcl_version}, tk-devel, libX11-devel
 Requires:	tcl(abi) = %{tcl_version}
 
 %description
@@ -66,6 +71,9 @@
 %{_libdir}/libttkstub.a
 
 %changelog
+* Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-4
+- no, we really do need to hardcode. *sigh* (Fedora 8 uses tcl 8.4)
+
 * Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-3
 - don't hardcode tcl abi requires
 



From spot at fedoraproject.org  Wed Sep 17 20:18:01 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 17 Sep 2008 20:18:01 +0000 (UTC)
Subject: rpms/tcl-tile/devel tcl-tile.spec,1.2,1.3
Message-ID: <20080917201801.BBE527013C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-tile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10005/devel

Modified Files:
	tcl-tile.spec 
Log Message:
no, we really do need to hardcode. :(


Index: tcl-tile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-tile/devel/tcl-tile.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tcl-tile.spec	17 Sep 2008 19:09:34 -0000	1.2
+++ tcl-tile.spec	17 Sep 2008 20:17:31 -0000	1.3
@@ -1,10 +1,15 @@
-%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+# We used to define this dynamically, but the Fedora buildsystem chokes on
+# using this for the versioned Requires on tcl(abi), so we hardcode it.
+# This sucks, but there is no other clean way around it, because tcl
+# (and tclsh) aren't in the default buildroot.
+# %%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_version: %define tcl_version 8.5}
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 %define realname tile
 
 Name:		tcl-%{realname}
 Version:	0.8.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Modified Tk styling engine
 Group:		System Environment/Libraries
 License:	TCL
@@ -13,7 +18,7 @@
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Provides:	%{realname} = %{version}-%{release}
 Provides:	tk-%{realname} = %{version}-%{release}
-BuildRequires:	tcl-devel, tk-devel, libX11-devel
+BuildRequires:	tcl-devel = %{tcl_version}, tk-devel, libX11-devel
 Requires:	tcl(abi) = %{tcl_version}
 
 %description
@@ -66,6 +71,9 @@
 %{_libdir}/libttkstub.a
 
 %changelog
+* Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-4
+- no, we really do need to hardcode. *sigh*
+
 * Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-3
 - don't hardcode tcl abi requires
 



From spot at fedoraproject.org  Wed Sep 17 20:18:01 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 17 Sep 2008 20:18:01 +0000 (UTC)
Subject: rpms/tcl-tile/F-9 tcl-tile.spec,1.2,1.3
Message-ID: <20080917201801.84FF07013C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-tile/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10005/F-9

Modified Files:
	tcl-tile.spec 
Log Message:
no, we really do need to hardcode. :(


Index: tcl-tile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-tile/F-9/tcl-tile.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tcl-tile.spec	17 Sep 2008 19:09:34 -0000	1.2
+++ tcl-tile.spec	17 Sep 2008 20:17:31 -0000	1.3
@@ -1,10 +1,15 @@
-%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+# We used to define this dynamically, but the Fedora buildsystem chokes on
+# using this for the versioned Requires on tcl(abi), so we hardcode it.
+# This sucks, but there is no other clean way around it, because tcl
+# (and tclsh) aren't in the default buildroot.
+# %%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_version: %define tcl_version 8.5}
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 %define realname tile
 
 Name:		tcl-%{realname}
 Version:	0.8.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Modified Tk styling engine
 Group:		System Environment/Libraries
 License:	TCL
@@ -13,7 +18,7 @@
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Provides:	%{realname} = %{version}-%{release}
 Provides:	tk-%{realname} = %{version}-%{release}
-BuildRequires:	tcl-devel, tk-devel, libX11-devel
+BuildRequires:	tcl-devel = %{tcl_version}, tk-devel, libX11-devel
 Requires:	tcl(abi) = %{tcl_version}
 
 %description
@@ -66,6 +71,9 @@
 %{_libdir}/libttkstub.a
 
 %changelog
+* Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-4
+- no, we really do need to hardcode. *sigh*
+
 * Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-3
 - don't hardcode tcl abi requires
 



From spot at fedoraproject.org  Wed Sep 17 20:38:45 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 17 Sep 2008 20:38:45 +0000 (UTC)
Subject: rpms/tcl-tile/F-9 tcl-tile.spec,1.3,1.4
Message-ID: <20080917203845.7E4027013C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-tile/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11165/F-9

Modified Files:
	tcl-tile.spec 
Log Message:
fix it up properly this time


Index: tcl-tile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-tile/F-9/tcl-tile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tcl-tile.spec	17 Sep 2008 20:17:31 -0000	1.3
+++ tcl-tile.spec	17 Sep 2008 20:38:15 -0000	1.4
@@ -2,14 +2,13 @@
 # using this for the versioned Requires on tcl(abi), so we hardcode it.
 # This sucks, but there is no other clean way around it, because tcl
 # (and tclsh) aren't in the default buildroot.
-# %%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
 %{!?tcl_version: %define tcl_version 8.5}
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 %define realname tile
 
 Name:		tcl-%{realname}
 Version:	0.8.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Modified Tk styling engine
 Group:		System Environment/Libraries
 License:	TCL
@@ -18,7 +17,7 @@
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Provides:	%{realname} = %{version}-%{release}
 Provides:	tk-%{realname} = %{version}-%{release}
-BuildRequires:	tcl-devel = %{tcl_version}, tk-devel, libX11-devel
+BuildRequires:	tcl-devel, tk-devel, libX11-devel
 Requires:	tcl(abi) = %{tcl_version}
 
 %description
@@ -71,6 +70,9 @@
 %{_libdir}/libttkstub.a
 
 %changelog
+* Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-5
+- lets try this again
+
 * Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-4
 - no, we really do need to hardcode. *sigh*
 



From spot at fedoraproject.org  Wed Sep 17 20:38:45 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 17 Sep 2008 20:38:45 +0000 (UTC)
Subject: rpms/tcl-tile/F-8 tcl-tile.spec,1.3,1.4
Message-ID: <20080917203845.586B57013C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-tile/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11165/F-8

Modified Files:
	tcl-tile.spec 
Log Message:
fix it up properly this time


Index: tcl-tile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-tile/F-8/tcl-tile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tcl-tile.spec	17 Sep 2008 20:17:31 -0000	1.3
+++ tcl-tile.spec	17 Sep 2008 20:38:15 -0000	1.4
@@ -2,14 +2,13 @@
 # using this for the versioned Requires on tcl(abi), so we hardcode it.
 # This sucks, but there is no other clean way around it, because tcl
 # (and tclsh) aren't in the default buildroot.
-# %%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
 %{!?tcl_version: %define tcl_version 8.4}
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 %define realname tile
 
 Name:		tcl-%{realname}
 Version:	0.8.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Modified Tk styling engine
 Group:		System Environment/Libraries
 License:	TCL
@@ -18,7 +17,7 @@
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Provides:	%{realname} = %{version}-%{release}
 Provides:	tk-%{realname} = %{version}-%{release}
-BuildRequires:	tcl-devel = %{tcl_version}, tk-devel, libX11-devel
+BuildRequires:	tcl-devel, tk-devel, libX11-devel
 Requires:	tcl(abi) = %{tcl_version}
 
 %description
@@ -71,8 +70,11 @@
 %{_libdir}/libttkstub.a
 
 %changelog
+* Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-5
+- lets try this again
+
 * Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-4
-- no, we really do need to hardcode. *sigh* (Fedora 8 uses tcl 8.4)
+- no, we really do need to hardcode. *sigh*
 
 * Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-3
 - don't hardcode tcl abi requires



From spot at fedoraproject.org  Wed Sep 17 20:38:45 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 17 Sep 2008 20:38:45 +0000 (UTC)
Subject: rpms/tcl-tile/devel tcl-tile.spec,1.3,1.4
Message-ID: <20080917203845.BB8F17013C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-tile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11165/devel

Modified Files:
	tcl-tile.spec 
Log Message:
fix it up properly this time


Index: tcl-tile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-tile/devel/tcl-tile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tcl-tile.spec	17 Sep 2008 20:17:31 -0000	1.3
+++ tcl-tile.spec	17 Sep 2008 20:38:15 -0000	1.4
@@ -2,14 +2,13 @@
 # using this for the versioned Requires on tcl(abi), so we hardcode it.
 # This sucks, but there is no other clean way around it, because tcl
 # (and tclsh) aren't in the default buildroot.
-# %%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
 %{!?tcl_version: %define tcl_version 8.5}
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 %define realname tile
 
 Name:		tcl-%{realname}
 Version:	0.8.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Modified Tk styling engine
 Group:		System Environment/Libraries
 License:	TCL
@@ -18,7 +17,7 @@
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Provides:	%{realname} = %{version}-%{release}
 Provides:	tk-%{realname} = %{version}-%{release}
-BuildRequires:	tcl-devel = %{tcl_version}, tk-devel, libX11-devel
+BuildRequires:	tcl-devel, tk-devel, libX11-devel
 Requires:	tcl(abi) = %{tcl_version}
 
 %description
@@ -71,6 +70,9 @@
 %{_libdir}/libttkstub.a
 
 %changelog
+* Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-5
+- lets try this again
+
 * Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.2-4
 - no, we really do need to hardcode. *sigh*
 



From sgrubb at fedoraproject.org  Wed Sep 17 20:49:30 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed, 17 Sep 2008 20:49:30 +0000 (UTC)
Subject: rpms/audit/devel audit.spec,1.185,1.186
Message-ID: <20080917204930.78B547013C@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11659

Modified Files:
	audit.spec 
Log Message:
Disable testing of ppc



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- audit.spec	17 Sep 2008 20:12:32 -0000	1.185
+++ audit.spec	17 Sep 2008 20:49:00 -0000	1.186
@@ -168,8 +168,10 @@
 	--delete-original				\
 	system-config-audit/system-config-audit.desktop
 
+%ifnarch ppc ppc64
 %check
 make check
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From huff at fedoraproject.org  Wed Sep 17 20:58:39 2008
From: huff at fedoraproject.org (David Huff)
Date: Wed, 17 Sep 2008 20:58:39 +0000 (UTC)
Subject: rpms/appliance-tools/devel appliance-tools.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <20080917205839.92D837013C@cvs1.fedora.phx.redhat.com>

Author: huff

Update of /cvs/pkgs/rpms/appliance-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12202

Modified Files:
	appliance-tools.spec sources 
Log Message:
*Wed Sep 17 2008 David Huff <dhuff at redhat.com> - 003-4
- Removed all the kickstart files in the config dir to mirror livecd-tools
- Added the image minimization to the refactored code (BKearney)
- multiple interface issue (#460922)
- added --format option to specity disk image format
- added --package option to specify output, currently only .zip supported
- added --vmem and --vcpu options
- Merged ec2-converter code (jboggs)



Index: appliance-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/appliance-tools/devel/appliance-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- appliance-tools.spec	26 Aug 2008 20:52:23 -0000	1.4
+++ appliance-tools.spec	17 Sep 2008 20:58:09 -0000	1.5
@@ -5,13 +5,14 @@
 Summary: Tools for building Appliances
 Name: appliance-tools
 Version: 003
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://git.et.redhat.com/?p=act.git
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: livecd-tools >= 018
+Requires: livecd-tools >= 018 curl rsync kpartx
+Requires: zlib
 BuildRequires: python
 BuildArch: noarch
 
@@ -36,17 +37,31 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README
-%doc COPYING
+%doc README COPYING
+%doc config/fedora-aos.ks
+%{_mandir}/man*/*
 %{_bindir}/appliance-creator
-%dir %{_datadir}/appliance-tools
-%{_datadir}/appliance-tools/*
+%{_bindir}/image-minimizer
+%{_bindir}/ec2-converter
 %dir %{python_sitelib}/appcreate
+%dir %{python_sitelib}/ec2convert
 %{python_sitelib}/appcreate/*.py
 %{python_sitelib}/appcreate/*.pyo
 %{python_sitelib}/appcreate/*.pyc
+%{python_sitelib}/ec2convert/*.py
+%{python_sitelib}/ec2convert/*.pyo
+%{python_sitelib}/ec2convert/*.pyc
 
 %changelog
+*Wed Sep 17 2008 David Huff <dhuff at redhat.com> - 003-4
+- Removed all the kickstart files in the config dir to mirror livecd-tools
+- Added the image minimization to the refactored code (BKearney)
+- multiple interface issue (#460922)
+- added --format option to specity disk image format
+- added --package option to specify output, currently only .zip supported
+- added --vmem and --vcpu options
+- Merged ec2-converter code (jboggs)
+
 *Tue Aug 26 2008 David Huff <dhuff at redhat.com> - 003-3
 - release 3 fixes minor build errors 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/appliance-tools/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Aug 2008 20:31:43 -0000	1.4
+++ sources	17 Sep 2008 20:58:09 -0000	1.5
@@ -1 +1 @@
-3c01fa3b247b1055d2b7aff54505468f  appliance-tools-003.tar.bz2
+30c00628c4fc6268780d09692e41cf79  appliance-tools-003.tar.bz2



From pfj at fedoraproject.org  Wed Sep 17 21:00:36 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 17 Sep 2008 21:00:36 +0000 (UTC)
Subject: rpms/mono/devel mono-2.0-tablelayout.patch, NONE, 1.1 import.log,
	1.4, 1.5 mono.spec, 1.78, 1.79
Message-ID: <20080917210036.331517013C@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12349/devel

Modified Files:
	import.log mono.spec 
Added Files:
	mono-2.0-tablelayout.patch 
Log Message:

Patch for tablelayoutsettings (BZ 462005) 


mono-2.0-tablelayout.patch:

--- NEW FILE mono-2.0-tablelayout.patch ---
--- mono-2.0/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Layout/TableLayoutSettingsTypeConverter.cs	2008-09-02 16:46:51.000000000 +0100
+++ mono-2.0/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Layout/TableLayoutSettingsTypeConverter-new.cs	2008-09-17 16:09:48.000000000 +0100
@@ -119,7 +119,7 @@
 
 			XmlDocument xmldoc = new XmlDocument();
 			xmldoc.LoadXml (value as string);
-			TableLayoutSettings settings = new TableLayoutSettings(new TableLayoutPanel ());
+			TableLayoutSettings settings = new TableLayoutSettings(null);
 			int count = ParseControl (xmldoc, settings);
 			ParseColumnStyle (xmldoc, settings);
 			ParseRowStyle (xmldoc, settings);


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	10 Sep 2008 19:26:55 -0000	1.4
+++ import.log	17 Sep 2008 21:00:05 -0000	1.5
@@ -2,3 +2,4 @@
 mono-2_0-4_fc10:HEAD:mono-2.0-4.fc10.src.rpm:1219746940
 mono-2_0-5_fc10:HEAD:mono-2.0-5.fc10.src.rpm:1220047677
 mono-2_0-6_fc10:HEAD:mono-2.0-6.fc10.src.rpm:1221073246
+mono-2_0-7_fc10:HEAD:mono-2.0-7.fc10.src.rpm:1221685120


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- mono.spec	10 Sep 2008 19:26:55 -0000	1.78
+++ mono.spec	17 Sep 2008 21:00:05 -0000	1.79
@@ -1,6 +1,6 @@
 Name:		mono
 Version:        2.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -44,6 +44,7 @@
 Patch6:mono-2.0-uselibdir.patch
 Patch9:mono-2.0-monoservice.patch
 Patch10: mono-2.0-metadata-makefile.patch
+Patch11: mono-2.0-tablelayout.patch
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -259,6 +260,7 @@
 %patch7 -p1 -b .pc-patches
 %patch9 -p1 -b .monoservice
 %patch10 -p1 -b .metadata
+%patch11 -p1 -b .tablelayout
 autoreconf -f -i -s
 
 # Add undeclared Arg
@@ -613,6 +615,9 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
+* Wed Sep 17 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-7
+- TableLayoutSettings fix (bz 462005)
+
 * Tue Sep 09 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-6
 - Bump to RC1
 - Removed XIM patch



From pfj at fedoraproject.org  Wed Sep 17 21:06:14 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 17 Sep 2008 21:06:14 +0000 (UTC)
Subject: rpms/pyOpenSSL/devel import.log, NONE,
	1.1 pyOpenSSL-0.7-openssl.patch, 
	NONE, 1.1 pyOpenSSL-0.7-threadsafe.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 pyOpenSSL-threadsafe.patch, 1.2, 1.3 pyOpenSSL.spec,
	1.27, 1.28 sources, 1.5, 1.6 pyOpenSSL-0.5.1-openssl097.patch,
	1.1, NONE
Message-ID: <20080917210614.D3E0D7013C@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/pyOpenSSL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13474/devel

Modified Files:
	.cvsignore pyOpenSSL-threadsafe.patch pyOpenSSL.spec sources 
Added Files:
	import.log pyOpenSSL-0.7-openssl.patch 
	pyOpenSSL-0.7-threadsafe.patch 
Removed Files:
	pyOpenSSL-0.5.1-openssl097.patch 
Log Message:

Bump to 0.7
Patch file fixes and removal of unused ones 



--- NEW FILE import.log ---
pyOpenSSL-0_7-1_fc10:HEAD:pyOpenSSL-0.7-1.fc10.src.rpm:1221685490

pyOpenSSL-0.7-openssl.patch:

--- NEW FILE pyOpenSSL-0.7-openssl.patch ---
--- pyOpenSSL-0.7/setup.py	2008-04-11 16:53:24.000000000 +0100
+++ pyOpenSSL-0.7/setup-new.py	2008-09-15 23:46:19.000000000 +0100
@@ -64,6 +64,9 @@
 if sys.platform == 'darwin':
     IncludeDirs = ['/sw/include']
     LibraryDirs = ['/sw/lib']
+elif os.name == 'posix':
+    IncludeDirs = ['/usr/kerberos/include']
+    LibraryDirs = ['/usr/kerberos/lib']
 
 def mkExtension(name):
     modname = 'OpenSSL.' + name

pyOpenSSL-0.7-threadsafe.patch:

--- NEW FILE pyOpenSSL-0.7-threadsafe.patch ---
--- pyOpenSSL-0.7/src/ssl/context.c	2008-03-21 22:34:42.000000000 +0000
+++ pyOpenSSL-0.7/src/ssl/context-new.c	2008-09-15 23:58:23.000000000 +0100
@@ -64,39 +64,34 @@
 static int
 global_passphrase_callback(char *buf, int maxlen, int verify, void *arg)
 {
-    int len;
+    int len = 0;
     char *str;
     PyObject *argv, *ret = NULL;
     ssl_ContextObj *ctx = (ssl_ContextObj *)arg;
 
+    if (!ctx->tstate)
+        fprintf (stderr, "ERROR: ctx->tstate == NULL!\n");
+    MY_END_ALLOW_THREADS(ctx->tstate);
+
     /* The Python callback is called with a (maxlen,verify,userdata) tuple */
     argv = Py_BuildValue("(iiO)", maxlen, verify, ctx->passphrase_userdata);
-    if (ctx->tstate != NULL)
-    {
-        /* We need to get back our thread state before calling the callback */
-        MY_END_ALLOW_THREADS(ctx->tstate);
-        ret = PyEval_CallObject(ctx->passphrase_callback, argv);
-        MY_BEGIN_ALLOW_THREADS(ctx->tstate);
-    }
-    else
-    {
-        ret = PyEval_CallObject(ctx->passphrase_callback, argv);
-    }
+
+    ret = PyEval_CallObject(ctx->passphrase_callback, argv);
     Py_DECREF(argv);
 
     if (ret == NULL)
-        return 0;
+        goto out;
 
     if (!PyObject_IsTrue(ret))
     {
         Py_DECREF(ret);
-	return 0;
+	goto out;
     }
 
     if (!PyString_Check(ret))
     {
         Py_DECREF(ret);
-        return 0;
+        goto out;
     }
 
     len = PyString_Size(ret);
@@ -107,6 +102,8 @@
     strncpy(buf, str, len);
     Py_XDECREF(ret);
 
+out:
+    MY_BEGIN_ALLOW_THREADS(ctx->tstate);
     return len;
 }
 
@@ -126,7 +123,7 @@
     SSL *ssl;
     ssl_ConnectionObj *conn;
     crypto_X509Obj *cert;
-    int errnum, errdepth, c_ret, use_thread_state;
+    int errnum, errdepth, c_ret = 0, use_thread_state;
         
     // Get Connection object to check thread state
     ssl = (SSL *)X509_STORE_CTX_get_app_data(x509_ctx);
@@ -136,10 +133,15 @@
     if (use_thread_state)
         MY_END_ALLOW_THREADS(conn->tstate);
     
-    cert = crypto_X509_New(X509_STORE_CTX_get_current_cert(x509_ctx), 0);
     errnum = X509_STORE_CTX_get_error(x509_ctx);
     errdepth = X509_STORE_CTX_get_error_depth(x509_ctx);
     
+    if (!conn->tstate)
+        fprintf (stderr, "ERROR: ctx->tstate == NULL!\n");
+    MY_END_ALLOW_THREADS(conn->tstate);
+
+    cert = crypto_X509_New(X509_STORE_CTX_get_current_cert(x509_ctx), 0);
+
     argv = Py_BuildValue("(OOiii)", (PyObject *)conn, (PyObject *)cert,
                                     errnum, errdepth, ok);
     Py_DECREF(cert);
@@ -173,28 +175,19 @@
     ssl_ConnectionObj *conn = (ssl_ConnectionObj *)SSL_get_app_data(ssl);
     PyObject *argv, *ret;
 
+    if (!conn->tstate)
+        fprintf (stderr, "ERROR: ctx->tstate == NULL!\n");
+    MY_END_ALLOW_THREADS(conn->tstate);
+
     argv = Py_BuildValue("(Oii)", (PyObject *)conn, where, _ret);
-    if (conn->tstate != NULL)
-    {
-        /* We need to get back our thread state before calling the callback */
-        MY_END_ALLOW_THREADS(conn->tstate);
-        ret = PyEval_CallObject(conn->context->info_callback, argv);
-        if (ret == NULL)
-            PyErr_Clear();
-        else
-            Py_DECREF(ret);
-        MY_BEGIN_ALLOW_THREADS(conn->tstate);
-    }
+    ret = PyEval_CallObject(conn->context->info_callback, argv);
+    if (ret == NULL)
+        PyErr_Clear();
     else
-    {
-        ret = PyEval_CallObject(conn->context->info_callback, argv);
-        if (ret == NULL)
-            PyErr_Clear();
-        else
-            Py_DECREF(ret);
-    }
+	Py_DECREF(ret);
     Py_DECREF(argv);
 
+    MY_BEGIN_ALLOW_THREADS(conn->tstate);
     return;
 }
 
@@ -447,6 +440,9 @@
     if (!PyArg_ParseTuple(args, "s|i:use_privatekey_file", &keyfile, &filetype))
         return NULL;
 
+    if (self->tstate)
+        fprintf (stderr, "ERROR: ctx->tstate != NULL!\n");
+
     MY_BEGIN_ALLOW_THREADS(self->tstate);
     ret = SSL_CTX_use_PrivateKey_file(self->ctx, keyfile, filetype);
     MY_END_ALLOW_THREADS(self->tstate);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyOpenSSL/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Sep 2004 10:55:59 -0000	1.5
+++ .cvsignore	17 Sep 2008 21:05:44 -0000	1.6
@@ -1 +1 @@
-pyOpenSSL-0.6.tar.gz
+pyOpenSSL-0.7.tar.gz

pyOpenSSL-threadsafe.patch:

Index: pyOpenSSL-threadsafe.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pyOpenSSL/devel/pyOpenSSL-threadsafe.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pyOpenSSL-threadsafe.patch	18 Jan 2006 03:14:47 -0000	1.2
+++ pyOpenSSL-threadsafe.patch	17 Sep 2008 21:05:44 -0000	1.3
@@ -1,173 +1,3 @@
---- pyOpenSSL-0.6/src/ssl/context.c.threadsafe	2004-08-06 06:24:38.000000000 -0400
-+++ pyOpenSSL-0.6/src/ssl/context.c	2005-07-12 22:30:02.000000000 -0400
-@@ -53,39 +53,33 @@
- static int
- global_passphrase_callback(char *buf, int maxlen, int verify, void *arg)
- {
--    int len;
-+    int len = 0;
-     char *str;
-     PyObject *argv, *ret = NULL;
-     ssl_ContextObj *ctx = (ssl_ContextObj *)arg;
- 
-+    if (!ctx->tstate)
-+        fprintf (stderr, "ERROR: ctx->tstate == NULL!\n");
-+    MY_END_ALLOW_THREADS(ctx->tstate);
-+
-     /* The Python callback is called with a (maxlen,verify,userdata) tuple */
-     argv = Py_BuildValue("(iiO)", maxlen, verify, ctx->passphrase_userdata);
--    if (ctx->tstate != NULL)
--    {
--        /* We need to get back our thread state before calling the callback */
--        MY_END_ALLOW_THREADS(ctx->tstate);
--        ret = PyEval_CallObject(ctx->passphrase_callback, argv);
--        MY_BEGIN_ALLOW_THREADS(ctx->tstate);
--    }
--    else
--    {
--        ret = PyEval_CallObject(ctx->passphrase_callback, argv);
--    }
-+    ret = PyEval_CallObject(ctx->passphrase_callback, argv);
-     Py_DECREF(argv);
- 
-     if (ret == NULL)
--        return 0;
-+        goto out;
- 
-     if (!PyObject_IsTrue(ret))
-     {
-         Py_DECREF(ret);
--	return 0;
-+        goto out;
-     }
- 
-     if (!PyString_Check(ret))
-     {
-         Py_DECREF(ret);
--        return 0;
-+        goto out;
-     }
- 
-     len = PyString_Size(ret);
-@@ -96,6 +90,8 @@
-     strncpy(buf, str, len);
-     Py_XDECREF(ret);
- 
-+out:
-+    MY_BEGIN_ALLOW_THREADS(ctx->tstate);
-     return len;
- }
- 
-@@ -115,43 +111,39 @@
-     SSL *ssl;
-     ssl_ConnectionObj *conn;
-     crypto_X509Obj *cert;
--    int errnum, errdepth, c_ret;
-+    int errnum, errdepth, c_ret = 0;
- 
--    cert = crypto_X509_New(X509_STORE_CTX_get_current_cert(x509_ctx), 0);
-     errnum = X509_STORE_CTX_get_error(x509_ctx);
-     errdepth = X509_STORE_CTX_get_error_depth(x509_ctx);
-     ssl = (SSL *)X509_STORE_CTX_get_app_data(x509_ctx);
-     conn = (ssl_ConnectionObj *)SSL_get_app_data(ssl);
- 
-+    if (!conn->tstate)
-+        fprintf (stderr, "ERROR: ctx->tstate == NULL!\n");
-+    MY_END_ALLOW_THREADS(conn->tstate);
-+
-+    cert = crypto_X509_New(X509_STORE_CTX_get_current_cert(x509_ctx), 0);
-+
-     argv = Py_BuildValue("(OOiii)", (PyObject *)conn, (PyObject *)cert,
-                                     errnum, errdepth, ok);
-     Py_DECREF(cert);
--    if (conn->tstate != NULL)
--    {
--        /* We need to get back our thread state before calling the callback */
--        MY_END_ALLOW_THREADS(conn->tstate);
--        ret = PyEval_CallObject(conn->context->verify_callback, argv);
--        MY_BEGIN_ALLOW_THREADS(conn->tstate);
--    }
--    else
--    {
--        ret = PyEval_CallObject(conn->context->verify_callback, argv);
--    }
-+    ret = PyEval_CallObject(conn->context->verify_callback, argv);
-     Py_DECREF(argv);
- 
--    if (ret == NULL)
--        return 0;
--
--    if (PyObject_IsTrue(ret))
-+    if (ret != NULL)
-     {
--        X509_STORE_CTX_set_error(x509_ctx, X509_V_OK);
--        c_ret = 1;
--    }
--    else
--        c_ret = 0;
-+        if (PyObject_IsTrue(ret))
-+        {
-+            X509_STORE_CTX_set_error(x509_ctx, X509_V_OK);
-+            c_ret = 1;
-+        }
-+        else
-+            c_ret = 0;
- 
--    Py_DECREF(ret);
-+        Py_DECREF(ret);
-+    }
- 
-+    MY_BEGIN_ALLOW_THREADS(conn->tstate);
-     return c_ret;
- }
- 
-@@ -169,28 +161,19 @@
-     ssl_ConnectionObj *conn = (ssl_ConnectionObj *)SSL_get_app_data(ssl);
-     PyObject *argv, *ret;
- 
-+    if (!conn->tstate)
-+        fprintf (stderr, "ERROR: ctx->tstate == NULL!\n");
-+    MY_END_ALLOW_THREADS(conn->tstate);
-+
-     argv = Py_BuildValue("(Oii)", (PyObject *)conn, where, _ret);
--    if (conn->tstate != NULL)
--    {
--        /* We need to get back our thread state before calling the callback */
--        MY_END_ALLOW_THREADS(conn->tstate);
--        ret = PyEval_CallObject(conn->context->info_callback, argv);
--        if (ret == NULL)
--            PyErr_Clear();
--        else
--            Py_DECREF(ret);
--        MY_BEGIN_ALLOW_THREADS(conn->tstate);
--    }
-+    ret = PyEval_CallObject(conn->context->info_callback, argv);
-+    if (ret == NULL)
-+        PyErr_Clear();
-     else
--    {
--        ret = PyEval_CallObject(conn->context->info_callback, argv);
--        if (ret == NULL)
--            PyErr_Clear();
--        else
--            Py_DECREF(ret);
--    }
-+        Py_DECREF(ret);
-     Py_DECREF(argv);
- 
-+    MY_BEGIN_ALLOW_THREADS(conn->tstate);
-     return;
- }
- 
-@@ -393,6 +376,8 @@
-     if (!PyArg_ParseTuple(args, "s|i:use_privatekey_file", &keyfile, &filetype))
-         return NULL;
- 
-+    if (self->tstate)
-+        fprintf (stderr, "ERROR: ctx->tstate != NULL!\n");
-     MY_BEGIN_ALLOW_THREADS(self->tstate);
-     ret = SSL_CTX_use_PrivateKey_file(self->ctx, keyfile, filetype);
-     MY_END_ALLOW_THREADS(self->tstate);
 --- pyOpenSSL-0.6/src/crypto/crypto.c.threadsafe	2004-08-09 10:56:05.000000000 -0400
 +++ pyOpenSSL-0.6/src/crypto/crypto.c	2005-07-12 22:29:32.000000000 -0400
 @@ -668,6 +668,74 @@


Index: pyOpenSSL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyOpenSSL/devel/pyOpenSSL.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- pyOpenSSL.spec	26 Mar 2008 19:45:44 -0000	1.27
+++ pyOpenSSL.spec	17 Sep 2008 21:05:44 -0000	1.28
@@ -2,13 +2,14 @@
 
 Summary: Python wrapper module around the OpenSSL library
 Name: pyOpenSSL
-Version: 0.6
-Release: 4%{?dist}
+Version: 0.7
+Release: 1%{?dist}
 Source0: http://pyopenssl.sf.net/%{name}-%{version}.tar.gz
-Patch0: pyOpenSSL-0.5.1-openssl097.patch
+Patch0: pyOpenSSL-0.7-openssl.patch
 Patch2: pyOpenSSL-elinks.patch
 Patch3: pyOpenSSL-nopdfout.patch
 Patch4: pyOpenSSL-threadsafe.patch
+Patch5: pyOpenSSL-0.7-threadsafe.patch
 License: LGPLv2+
 Group: Development/Libraries
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -30,6 +31,7 @@
 %patch2 -p1 -b .elinks
 %patch3 -p1 -b .nopdfout
 %patch4 -p1 -b .threadsafe
+%patch5 -p1 -b .threadsafe
 # Fix permissions for debuginfo package
 %{__chmod} -x src/ssl/connection.c
 
@@ -53,6 +55,11 @@
 %{python_sitearch}/%{name}*.egg-info
 
 %changelog
+* Mon Sep 15 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.7-1
+- bump to new release
+- the inevitable patch fixes
+
+
 * Wed Mar 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6-4
 - fix horrific release tag
 - fix license tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyOpenSSL/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Sep 2004 10:55:59 -0000	1.5
+++ sources	17 Sep 2008 21:05:44 -0000	1.6
@@ -1 +1 @@
-6200b71d3eb294a312d52c4825fc71c5  pyOpenSSL-0.6.tar.gz
+1924edc58c1e99f27763971d9959ea15  pyOpenSSL-0.7.tar.gz


--- pyOpenSSL-0.5.1-openssl097.patch DELETED ---



From sgrubb at fedoraproject.org  Wed Sep 17 21:07:02 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed, 17 Sep 2008 21:07:02 +0000 (UTC)
Subject: rpms/audit/F-9 audit.spec,1.180,1.181 sources,1.118,1.119
Message-ID: <20080917210702.747F97013C@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13748

Modified Files:
	audit.spec sources 
Log Message:
* Wed Sep 17 2008 Steve Grubb <sgrubb at redhat.com> 1.7.7-1
- Add watched syscall support to audisp-prelude
- Add tcp_wrappers support for auditd
- Updated syscall tables for 2.6.27 kernel
- Audit connect/disconnect of remote clients
- Add GSS/Kerberos encryption to the remote protocol (DJ Delorie)



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-9/audit.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- audit.spec	25 Aug 2008 20:53:28 -0000	1.180
+++ audit.spec	17 Sep 2008 21:06:32 -0000	1.181
@@ -1,12 +1,12 @@
 %define sca_version 0.4.8
-%define sca_release 1
+%define sca_release 2
 %define selinux_variants mls strict targeted
 %define selinux_policyver 3.2.5 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 1.7.5
+Version: 1.7.7
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -14,6 +14,7 @@
 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 krb5-devel
 BuildRequires: kernel-headers >= 2.6.18
 BuildRequires: automake >= 1.9
 BuildRequires: autoconf >= 2.59
@@ -100,7 +101,7 @@
 
 %build
 (cd system-config-audit; ./autogen.sh)
-%configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude
+%configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5
 make %{?_smp_mflags}
 cd zos-remote-policy
 for selinuxvariant in %{selinux_variants}
@@ -165,10 +166,10 @@
 	--delete-original				\
 	system-config-audit/system-config-audit.desktop
 
-# This is a reminder to enable it when tests
-# aren't based on postfix uids
-#% check
-#make check
+%ifnarch ppc ppc64
+%check
+make check
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -323,6 +324,13 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Wed Sep 17 2008 Steve Grubb <sgrubb at redhat.com> 1.7.7-1
+- Add watched syscall support to audisp-prelude
+- Add tcp_wrappers support for auditd
+- Updated syscall tables for 2.6.27 kernel
+- Audit connect/disconnect of remote clients
+- Add GSS/Kerberos encryption to the remote protocol (DJ Delorie)
+
 * Mon Aug 25 2008 Steve Grubb <sgrubb at redhat.com> 1.7.5-1
 - Update system-config-audit to 0.4.8
 - Whole lot of bug fixes - see ChangeLog for details


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-9/sources,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- sources	25 Aug 2008 20:53:28 -0000	1.118
+++ sources	17 Sep 2008 21:06:32 -0000	1.119
@@ -1 +1 @@
-584b681fb473c74e2325b92a4c3d3423  audit-1.7.5.tar.gz
+be66a1e78091f0e7280e286784c5b4b3  audit-1.7.7.tar.gz



From pfj at fedoraproject.org  Wed Sep 17 21:10:22 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 17 Sep 2008 21:10:22 +0000 (UTC)
Subject: rpms/mx/devel import.log, NONE, 1.1 mx-3.1.1-lib64.patch, NONE,
	1.1 mx-3.1.1-longyear.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 mx.spec, 1.19, 1.20 sources, 1.6,
	1.7 egenix-mx-base-2.0.1-longyear.patch, 1.1,
	NONE egenix-mx-base-2.0.2-pyconfig.patch, 1.1,
	NONE egenix-mx-base-2.0.5-lib64.patch, 1.1, NONE
Message-ID: <20080917211022.20DCB7013C@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14484/devel

Modified Files:
	.cvsignore mx.spec sources 
Added Files:
	import.log mx-3.1.1-lib64.patch mx-3.1.1-longyear.patch 
Removed Files:
	egenix-mx-base-2.0.1-longyear.patch 
	egenix-mx-base-2.0.2-pyconfig.patch 
	egenix-mx-base-2.0.5-lib64.patch 
Log Message:

Spec file fixes
Bump to new version
Patch file fixes for new version
Dropped unused patch file
New -devel subpackage created 



--- NEW FILE import.log ---
mx-3_1_1-2_fc10:HEAD:mx-3.1.1-2.fc10.src.rpm:1221685725

mx-3.1.1-lib64.patch:

--- NEW FILE mx-3.1.1-lib64.patch ---
--- egenix-mx-base-3.1.1/mxSetup.py	2008-08-04 13:24:56.000000000 +0100
+++ egenix-mx-base-3.1.1/mxSetup-new.py	2008-09-15 09:27:04.000000000 +0100
@@ -2376,7 +2376,7 @@
 
         if self.install_dir is None:
             installobj = self.distribution.get_command_obj('install')
-            self.install_dir = installobj.install_data
+            self.install_dir = installobj.install_platlib
         if _debug:
             print 'Installing data files to %s' % self.install_dir
         self.set_undefined_options('install',

mx-3.1.1-longyear.patch:

--- NEW FILE mx-3.1.1-longyear.patch ---
--- egenix-mx-base-3.1.1/mx/DateTime/mxDateTime/mxDateTime.c	2008-08-05 09:36:44.000000000 +0100
+++ egenix-mx-base-3.1.1/mx/DateTime/mxDateTime/mxDateTime-new.c	2008-09-15 09:21:23.000000000 +0100
@@ -996,7 +996,7 @@
 
 static
 int mxDateTime_SetFromDateAndTime(mxDateTimeObject *datetime,
-				  int year,
+				  long year,
 				  int month,
 				  int day,
 				  int hour,
@@ -1196,7 +1196,7 @@
 /* --- API functions --- */
 
 static
-PyObject *mxDateTime_FromDateAndTime(int year,
+PyObject *mxDateTime_FromDateAndTime(long year,
 				     int month,
 				     int day,
 				     int hour,
@@ -1224,7 +1224,7 @@
 #define mxDateTime_FromGregorianDateAndTime mxDateTime_FromDateAndTime
 
 static
-PyObject *mxDateTime_FromJulianDateAndTime(int year,
+PyObject *mxDateTime_FromJulianDateAndTime(long year,
 					   int month,
 					   int day,
 					   int hour,
@@ -1406,7 +1406,8 @@
 PyObject *mxDateTime_FromTuple(PyObject *v)
 {
     mxDateTimeObject *datetime = 0;
-    int year,month,day,hour,minute;
+    long year;
+    int month,day,hour,minute;
     double second;
 
     if (!PyTuple_Check(v)) {
@@ -1414,7 +1415,7 @@
 	return NULL;
     }
     if (!PyArg_ParseTuple(v,
-	"iiiiid;need a date/time 6-tuple (year,month,day,hour,minute,second)",
+	"liiiid;need a date/time 6-tuple (year,month,day,hour,minute,second)",
 			  &year,&month,&day,&hour,&minute,&second))
 	return NULL;
     
@@ -4506,14 +4507,14 @@
 	       "fractions. Note that the function does not accept keyword args."
 	       )
 {
-    int year,
-	month = 1,
+    long year;
+    int month = 1,
 	day = 1;
     int hour = 0,
 	minute = 0;
     double second = 0.0;
     
-    Py_Get6Args("i|iiiid",year,month,day,hour,minute,second);
+    Py_Get6Args("l|iiiid",year,month,day,hour,minute,second);
     return mxDateTime_FromDateAndTime(year,month,day,hour,minute,second);
  onError:
     return NULL;
@@ -4526,14 +4527,14 @@
 	       "fractions.  Note that the function does not accept keyword args."
 	       )
 {
-    int year,
-	month = 1,
+    long year;
+    int month = 1,
 	day = 1;
     int hour = 0,
 	minute = 0;
     double second = 0.0;
     
-    Py_Get6Args("i|iiiid",year,month,day,hour,minute,second);
+    Py_Get6Args("l|iiiid",year,month,day,hour,minute,second);
     return mxDateTime_FromJulianDateAndTime(year,month,day,hour,minute,second);
  onError:
     return NULL;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mx/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2005 20:05:43 -0000	1.6
+++ .cvsignore	17 Sep 2008 21:09:51 -0000	1.7
@@ -1 +1 @@
-egenix-mx-base-2.0.6.tar.gz
+egenix-mx-base-3.1.1.tar.gz


Index: mx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mx/devel/mx.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mx.spec	11 Aug 2008 16:03:02 -0000	1.19
+++ mx.spec	17 Sep 2008 21:09:51 -0000	1.20
@@ -1,22 +1,22 @@
 %define pybasever %{nil}
 %define without_pybasever 1
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Summary:  A collection of Python software tools.
+Summary:  A collection of Python software tools
 Name: mx%{pybasever}
-Version: 2.0.6
-Release: 5%{?dist}
+Version: 3.1.1
+Release: 2%{?dist}
 URL: http://www.lemburg.com/files/python/eGenix-mx-Extensions.html
 Source0: http://www.lemburg.com/python/egenix-mx-base-%{version}.tar.gz
-Patch0: egenix-mx-base-2.0.2-pyconfig.patch
-Patch1: egenix-mx-base-2.0.1-longyear.patch
-Patch2: egenix-mx-base-2.0.5-lib64.patch
+Patch1: mx-3.1.1-longyear.patch
+Patch2: mx-3.1.1-lib64.patch
 License: Python
 Group: Development/Libraries
-BuildRequires: gcc glibc-devel python Distutils
+BuildRequires: Distutils
 BuildRequires: python-devel >= 2.3
 %if %{?without_pybasever}
 Provides: mx2 = %{version}-%{release}
-Obsoletes: mx2
+Obsoletes: mx2 <= %{version}-%{release}
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -24,52 +24,102 @@
 The mx extensions for Python are a collection of Python software tools
 which enhance Python's usability in many areas.
 
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Development files for %{name}
+
 %prep
 %setup -q -n egenix-mx-base-%{version}
-%patch1 -p1
-%patch2 -p1
+%patch1 -p1 -b .longyear
+%patch2 -p1 -b .lib64
 
 %build
+# alter /usr/local/bin/python
+for file in mx/DateTime/Examples/Y2000.py mx/Misc/OrderedMapping.py \
+    mx/TextTools/Examples/pytag.py mx/TextTools/Examples/Loop.py \
+    mx/TextTools/Examples/Python.py mx/DateTime/Examples/AtomicClock.py \
+    mx/TextTools/Examples/mysplit.py mx/TextTools/Examples/HTML.py \
+    mx/DateTime/Examples/alarm.py mx/TextTools/Examples/RegExp.py \
+    mx/TextTools/Examples/altRTF.py mx/TextTools/Examples/Words.py \
+    mx/TextTools/Examples/RTF.py mx/Misc/FileLock.py ; do
+    sed -i -e 's!/usr/local/bin/python!%{_bindir}/python!' ${file}
+done
+
+# These just have test cases and aren't meant to be run
+for file in mx/Log.py mx/BeeBase/FileLock.py mx/Misc/OrderedMapping.py \
+    mx/Misc/FileLock.py ; do
+    sed -i -e '/^#!.*python\b/d' ${file}
+done
+
+
 CFLAGS="$RPM_OPT_FLAGS" python setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES 
+rm -rf %{buildroot}
+python setup.py install --skip-build --root=%{buildroot} 
 
-mkdir -p $RPM_BUILD_ROOT%{_includedir}
-for I in `find $RPM_BUILD_ROOT/usr/%{_lib}/python*/site-packages/mx -name '*.h'`; do
-	mv $I $RPM_BUILD_ROOT%{_includedir}
+pushd %{buildroot}%{python_sitearch}
+for I in `find . -name '*.h'`; do
+    mkdir -p %{buildroot}%{_includedir}/`dirname $I`
+    mv $I %{buildroot}%{_includedir}/`dirname $I`
 done
-install -m444 mx/BeeBase/mxBeeBase/mxh.h $RPM_BUILD_ROOT%{_includedir}
+popd
+
+# Examples, tests, benchmarks
+BASEDIR=%{buildroot}%{python_sitearch}
+mkdir examples
+mv ${BASEDIR}/mx/TextTools/mxTextTools/testkj.py examples/
+mv ${BASEDIR}/mx/Stack/stackbench.py examples/
+mv ${BASEDIR}/mx/Queue/queuebench.py examples/
+mv ${BASEDIR}/mx/DateTime/mxDateTime/test.py examples/
+# This is a utility.  If it's deemed useful to the general public it should
+# be installed in %{_bindir} instead of examples
+mv ${BASEDIR}/mx/BeeBase/showBeeDict.py examples/
 
 # These files are documentation, and are in a bad location
 mkdir docs
-mv -f $RPM_BUILD_ROOT/usr/%{_lib}/python*/site-packages/mx/{LICENSE,COPYRIGHT} docs/
-rm -fr $RPM_BUILD_ROOT/usr/%{_lib}/python*/site-packages/mx/Doc
+mv -f ${BASEDIR}/mx/{LICENSE,COPYRIGHT} docs/
+rm -rf ${BASEDIR}/mx/Doc
 DESTDIR=`pwd`/docs
-pushd $RPM_BUILD_ROOT/usr/%{_lib}/python*/site-packages/mx/
-cp -r --parents */Doc/* $DESTDIR/
+pushd ${BASEDIR}/mx
+cp -r --parents */Doc/* ${DESTDIR}/
+cp -r --parents */Examples/* ${DESTDIR}/
 popd
-rm -rf $RPM_BUILD_ROOT/usr/%{_lib}/python*/site-packages/mx/*/Doc/
-
-# Don't include the examples
-rm -fr $RPM_BUILD_ROOT/usr/%{_lib}/python*/site-packages/mx/*/Examples
+rm -rf ${BASEDIR}/mx/*/Doc/
+rm -rf ${BASEDIR}/mx/*/Examples
+rm -rf docs/*/Examples/*.pyc
+rm -rf docs/*/Examples/*.pyo
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files 
-%defattr(-,root,root) 
+%defattr(-,root,root,-)
 %doc README docs/*
-%{_includedir}/*.h
-%{_libdir}/python*/site-packages/mx
+%{python_sitearch}/mx
+%{python_sitearch}/egenix_mx_base*.egg-info
 
-%changelog
-* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.6-5
-- fix license tag
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/mx/
 
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0.6-4
-- Autorebuild for GCC 4.3
+%changelog
+* Mon Sep 15 2008 Toshio Kuratomi <toshio at fedoraproject.org> 3.1.1-2
+- Restore debug package
+- Clean up the python site-packages handling
+- Clean up handling of documentation, examples, scripts
+
+* Mon Sep 15 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 3.1.1-1
+- bump to newest release
+- patch fixes
+- spec file fixes
+- branch new devel sub package
+- fixes to permissions
+- removed debug-package (empty)
 
 * Thu Dec  7 2006 Jeremy Katz <katzj at redhat.com> - 2.0.6-3
 - rebuild against python 2.5
@@ -120,19 +170,19 @@
 * Fri Jun 21 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Wed May 29 2002 Trond Eivind Glomsr?d <teg at redhat.com> 2.0.3-4
+* Wed May 29 2002 Trond Eivind Glomsr??d <teg at redhat.com> 2.0.3-4
 - Make it require python >= 2.2, < 2.3
 
 * Sun May 26 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Thu May 23 2002 Trond Eivind Glomsr?d <teg at redhat.com> 2.0.3-2
+* Thu May 23 2002 Trond Eivind Glomsr??d <teg at redhat.com> 2.0.3-2
 - Move to python 2.2
 
-* Wed Mar 13 2002 Trond Eivind Glomsr?d <teg at redhat.com> 2.0.3-1
+* Wed Mar 13 2002 Trond Eivind Glomsr??d <teg at redhat.com> 2.0.3-1
 - 2.0.3
 
-* Wed Feb 27 2002 Trond Eivind Glomsr?d <teg at redhat.com> 2.0.2-5
+* Wed Feb 27 2002 Trond Eivind Glomsr??d <teg at redhat.com> 2.0.2-5
 - Rebuild (and no, it wasn't broken. It just used /usr/bin/python
   as the version to build for)
 
@@ -142,15 +192,13 @@
 * Wed Jan 09 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Mon Oct  1 2001 Trond Eivind Glomsr?d <teg at redhat.com> 2.0.2-2
+* Mon Oct  1 2001 Trond Eivind Glomsr??d <teg at redhat.com> 2.0.2-2
 - detect python version when building
 - 64bit fix mxDateTime
 
-* Fri Sep 14 2001 Trond Eivind Glomsr?d <teg at redhat.com> 2.0.2-1
+* Fri Sep 14 2001 Trond Eivind Glomsr??d <teg at redhat.com> 2.0.2-1
 - 2.0.2
 - Build for Python 2.2
 
-* Tue Jun 19 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Jun 19 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - Initial build. Needed for python DB API
-
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mx/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2005 20:05:43 -0000	1.6
+++ sources	17 Sep 2008 21:09:51 -0000	1.7
@@ -1 +1 @@
-66841151728a06f92d0b8dd2ed317a29  egenix-mx-base-2.0.6.tar.gz
+d0f3b1adca33a68867bf50f000060cd6  egenix-mx-base-3.1.1.tar.gz


--- egenix-mx-base-2.0.1-longyear.patch DELETED ---


--- egenix-mx-base-2.0.2-pyconfig.patch DELETED ---


--- egenix-mx-base-2.0.5-lib64.patch DELETED ---



From pfj at fedoraproject.org  Wed Sep 17 21:40:48 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 17 Sep 2008 21:40:48 +0000 (UTC)
Subject: rpms/kbackup/devel import.log, NONE, 1.1 kbackup-0.5.4-desktop.patch,
	NONE, 1.1 .cvsignore, 1.5, 1.6 kbackup.spec, 1.17, 1.18 sources,
	1.5, 1.6 kbackup-0.5.3.desktop.patch, 1.1, NONE
Message-ID: <20080917214048.A8CC07013C@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/kbackup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17536/devel

Modified Files:
	.cvsignore kbackup.spec sources 
Added Files:
	import.log kbackup-0.5.4-desktop.patch 
Removed Files:
	kbackup-0.5.3.desktop.patch 
Log Message:

Bump to new version
Desktop file patch fix 



--- NEW FILE import.log ---
kbackup-0_5_4-1_fc10:HEAD:kbackup-0.5.4-1.fc10.src.rpm:1221687558

kbackup-0.5.4-desktop.patch:

--- NEW FILE kbackup-0.5.4-desktop.patch ---
--- kbackup-0.5.4/src/kbackup.desktop	2008-01-19 10:49:44.000000000 +0000
+++ kbackup-0.5.4/src/kbackup-new.desktop	2008-09-17 22:30:09.000000000 +0100
@@ -2,18 +2,18 @@
 Type=Application
 Encoding=UTF-8
 Exec=kbackup %f
-Name=KBackup (Backup Program)
+Name=KBackup
 Comment=Backup your data with an easy to use user interface
 Icon=kbackup
 MimeType=text/x-kbp;
 Terminal=false
 Categories=System;KDE;X-SuSE-Backup;X-MandrivaLinux-System-Archiving-Backup;
 
-Name[de]=KBackup (Datensicherungs Programm)
+Name[de]=KBackup
 Comment[de]=Datensicherung mit einem einfach zu bedienended User Interface
 
-Name[fr]=KBackup (Programme de sauvegarde)
+Name[fr]=KBackup
 Comment[fr]=Sauvegarder vos donn??es avec une interface utilisateur facile ?? utiliser
 
-Name[es]=KBackup (Programa de Copias de Seguridad)
+Name[es]=KBackup
 Comment[es]=Realiza copias de seguridad de tus datos con un programa f??cil de usar


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kbackup/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Oct 2007 08:16:57 -0000	1.5
+++ .cvsignore	17 Sep 2008 21:40:17 -0000	1.6
@@ -1 +1 @@
-kbackup-0.5.3.tar.bz2
+kbackup-0.5.4.tar.bz2


Index: kbackup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kbackup/devel/kbackup.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kbackup.spec	31 Mar 2008 17:16:01 -0000	1.17
+++ kbackup.spec	17 Sep 2008 21:40:17 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		kbackup
-Version:	0.5.3
-Release:	4%{?dist}
+Version:	0.5.4
+Release:	1%{?dist}
 Summary:	Back up your data in a simple, user friendly way
 Summary(fr):	Sauvegarder vos donn??es de mani??re simple et conviviale
 
@@ -8,7 +8,7 @@
 License:	GPLv2
 Url:		http://www.kde-apps.org/content/show.php?content=44998
 Source:		http://members.aon.at/m.koller/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-0.5.3.desktop.patch
+Patch0:		%{name}-0.5.4-desktop.patch
 Patch1:         kbackup-0.5.3-gcc43.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,7 +32,7 @@
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1 -b .desktop
 %patch1 -p1 -b .gcc43
 
 %build
@@ -100,6 +100,10 @@
 %{_datadir}/mimelnk/text/x-kbp.desktop
 
 %changelog
+* Wed Sep 14 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.5.4-1
+- bump to new version
+- desktop patch fix
+
 * Mon Mar 31 2008 Rex Dieter <rdieter at fedoraproject.org> 0.5.3-4
 - gcc43 patch (#434062)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kbackup/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Oct 2007 08:16:57 -0000	1.5
+++ sources	17 Sep 2008 21:40:17 -0000	1.6
@@ -1 +1 @@
-97b194dca8a3b3771f1e2207a67b2cd0  kbackup-0.5.3.tar.bz2
+381ff063d695b7287f138d12f6fd1129  kbackup-0.5.4.tar.bz2


--- kbackup-0.5.3.desktop.patch DELETED ---



From caolanm at fedoraproject.org  Wed Sep 17 21:43:15 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 17 Sep 2008 21:43:15 +0000 (UTC)
Subject: rpms/hunspell-uk/devel hunspell-uk.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080917214315.725247013C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-uk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17926/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-uk.spec import.log 
Log Message:



--- NEW FILE hunspell-uk.spec ---
Name: hunspell-uk
Summary: Ukrainian hunspell dictionaries
Version: 1.5.0
Release: 2%{?dist}
Source: http://downloads.sourceforge.net/ispell-uk/myspell-uk_UA-%{version}.zip
Group: Applications/Text
URL: http://sourceforge.net/projects/ispell-uk
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv2+ or LGPLv2+ or MPLv1.1
BuildArch: noarch

Requires: hunspell

%description
Ukrainian hunspell dictionaries.

%prep
%setup -q -c -n hunspell-uk-%{version}

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p uk_UA.dic uk_UA.aff $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_uk_UA.txt
%{_datadir}/myspell/*

%changelog
* Tue Sep 16 2008 Caolan McNamara <caolanm at redhat.com> - 1.5.0-2
- fixup extra Source lines

* Mon Sep 15 2008 Caolan McNamara <caolanm at redhat.com> - 1.5.0-1
- initial version


--- NEW FILE import.log ---
hunspell-uk-1_5_0-2_fc9:HEAD:hunspell-uk-1.5.0-2.fc9.src.rpm:1221687803


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-uk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2008 19:05:48 -0000	1.1
+++ .cvsignore	17 Sep 2008 21:42:44 -0000	1.2
@@ -0,0 +1 @@
+myspell-uk_UA-1.5.0.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-uk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 19:05:48 -0000	1.1
+++ sources	17 Sep 2008 21:42:45 -0000	1.2
@@ -0,0 +1 @@
+948964c6544fb408ce8cd1c55ba3f92b  myspell-uk_UA-1.5.0.zip



From jakub at fedoraproject.org  Wed Sep 17 21:48:47 2008
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed, 17 Sep 2008 21:48:47 +0000 (UTC)
Subject: rpms/gcc/devel gcc43-pr34037.patch, NONE,
	1.1 gcc43-pr36741-revert.patch, NONE, 1.1 .cvsignore, 1.243,
	1.244 gcc43.spec, 1.43, 1.44 sources, 1.246, 1.247
Message-ID: <20080917214847.7B4BB7013C@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18456

Modified Files:
	.cvsignore gcc43.spec sources 
Added Files:
	gcc43-pr34037.patch gcc43-pr36741-revert.patch 
Log Message:
4.3.2-4


gcc43-pr34037.patch:

--- NEW FILE gcc43-pr34037.patch ---
2008-09-11  Jakub Jelinek  <jakub at redhat.com>

	PR debug/34037
	* gimplify.c (gimplify_type_sizes): When not optimizing, ensure
	TYPE_MIN_VALUE and TYPE_MAX_VALUE is not is not DECL_IGNORED_P
	VAR_DECL.
	* cfgexpand.c (expand_used_vars): Keep DECL_ARTIFICIAL
	!DECL_IGNORED_P vars in unexpanded_var_list list for instantiate_decls,
	ggc_free other TREE_LIST nodes from that chain.
	* function.c (instantiate_decls): Instantiate also DECL_RTL
	of vars in cfun->unexpanded_var_list, free that list afterwards.

--- gcc/gimplify.c.jj	2008-09-10 20:50:11.000000000 +0200
+++ gcc/gimplify.c	2008-09-11 13:54:22.000000000 +0200
@@ -7105,6 +7105,18 @@ gimplify_type_sizes (tree type, gimple_s
       /* These types may not have declarations, so handle them here.  */
       gimplify_type_sizes (TREE_TYPE (type), list_p);
       gimplify_type_sizes (TYPE_DOMAIN (type), list_p);
+      /* When not optimizing, ensure VLA bounds aren't removed.  */
+      if (!optimize
+	  && TYPE_DOMAIN (type)
+	  && INTEGRAL_TYPE_P (TYPE_DOMAIN (type)))
+	{
+	  t = TYPE_MIN_VALUE (TYPE_DOMAIN (type));
+	  if (t && TREE_CODE (t) == VAR_DECL && DECL_ARTIFICIAL (t))
+	    DECL_IGNORED_P (t) = 0;
+	  t = TYPE_MAX_VALUE (TYPE_DOMAIN (type));
+	  if (t && TREE_CODE (t) == VAR_DECL && DECL_ARTIFICIAL (t))
+	    DECL_IGNORED_P (t) = 0;
+	}
       break;
 
     case RECORD_TYPE:
--- gcc/cfgexpand.c.jj	2008-09-09 16:08:04.000000000 +0200
+++ gcc/cfgexpand.c	2008-09-11 15:01:00.000000000 +0200
@@ -1440,7 +1440,7 @@ estimated_stack_frame_size (void)
 static void
 expand_used_vars (void)
 {
-  tree t, outer_block = DECL_INITIAL (current_function_decl);
+  tree t, next, outer_block = DECL_INITIAL (current_function_decl);
 
   /* Compute the phase of the stack frame for this function.  */
   {
@@ -1453,11 +1453,15 @@ expand_used_vars (void)
 
   /* At this point all variables on the unexpanded_var_list with TREE_USED
      set are not associated with any block scope.  Lay them out.  */
-  for (t = cfun->unexpanded_var_list; t; t = TREE_CHAIN (t))
+  t = cfun->unexpanded_var_list;
+  cfun->unexpanded_var_list = NULL_TREE;
+  for (; t; t = next)
     {
       tree var = TREE_VALUE (t);
       bool expand_now = false;
 
+      next = TREE_CHAIN (t);
+
       /* We didn't set a block for static or extern because it's hard
 	 to tell the difference between a global variable (re)declared
 	 in a local scope, and one that's really declared there to
@@ -1484,9 +1488,25 @@ expand_used_vars (void)
       TREE_USED (var) = 1;
 
       if (expand_now)
-	expand_one_var (var, true, true);
+	{
+	  expand_one_var (var, true, true);
+	  if (DECL_ARTIFICIAL (var) && !DECL_IGNORED_P (var))
+	    {
+	      rtx rtl = DECL_RTL_IF_SET (var);
+
+	      /* Keep artificial non-ignored vars in cfun->unexpanded_var_list
+		 chain until instantiate_decls.  */
+	      if (rtl && (MEM_P (rtl) || GET_CODE (rtl) == CONCAT))
+		{
+		  TREE_CHAIN (t) = cfun->unexpanded_var_list;
+		  cfun->unexpanded_var_list = t;
+		  continue;
+		}
+	    }
+	}
+
+      ggc_free (t);
     }
-  cfun->unexpanded_var_list = NULL_TREE;
 
   /* At this point, all variables within the block tree with TREE_USED
      set are actually used by the optimized function.  Lay them out.  */
--- gcc/function.c.jj	2008-09-09 21:13:24.000000000 +0200
+++ gcc/function.c	2008-09-11 14:56:47.000000000 +0200
@@ -1645,7 +1645,7 @@ instantiate_decls_1 (tree let)
 static void
 instantiate_decls (tree fndecl)
 {
-  tree decl;
+  tree decl, t, next;
 
   /* Process all parameters of the function.  */
   for (decl = DECL_ARGUMENTS (fndecl); decl; decl = TREE_CHAIN (decl))
@@ -1661,6 +1661,17 @@ instantiate_decls (tree fndecl)
 
   /* Now process all variables defined in the function or its subblocks.  */
   instantiate_decls_1 (DECL_INITIAL (fndecl));
+
+  t = cfun->unexpanded_var_list;
+  cfun->unexpanded_var_list = NULL_TREE;
+  for (; t; t = next)
+    {
+      next = TREE_CHAIN (t);
+      decl = TREE_VALUE (t);
+      if (DECL_RTL_SET_P (decl))
+	instantiate_decl_rtl (DECL_RTL (decl));
+      ggc_free (t);
+    }
 }
 
 /* Pass through the INSNS of function FNDECL and convert virtual register

gcc43-pr36741-revert.patch:

--- NEW FILE gcc43-pr36741-revert.patch ---
Revert:
2008-08-28  Dodji Seketeli  <dodji at redhat.com>

	PR c++/36741
	* tree.c (int_fits_type_p): Don't forget unsigned integers
	  of type sizetype which higher end word equals -1.

	* g++.dg/other/new-size-type.C: New test.

--- gcc/tree.c	(revision 139711)
+++ gcc/tree.c	(revision 139710)
@@ -6296,21 +6296,6 @@ int_fits_type_p (const_tree c, const_tre
      for "unknown if constant fits", 0 for "constant known *not* to fit" and 1
      for "constant known to fit".  */
 
-  if (TREE_TYPE (c) == sizetype
-      && TYPE_UNSIGNED (TREE_TYPE (c))
-      && TREE_INT_CST_HIGH (c) == -1
-      && !TREE_OVERFLOW (c))
-      /* So c is an unsigned integer which type is sizetype.
-         sizetype'd integers are sign extended even though they are
-	 unsigned. If the integer value fits in the lower end word of c,
-	 and if the higher end word has all its bits set to 1, that
-	 means the higher end bits are set to 1 only for sign extension.
-	 So let's convert c into an equivalent zero extended unsigned
-	 integer.  */
-      c = force_fit_type_double (size_type_node,
-				 TREE_INT_CST_LOW (c),
-				 TREE_INT_CST_HIGH (c),
-				 false, false);
   /* Check if C >= type_low_bound.  */
   if (type_low_bound && TREE_CODE (type_low_bound) == INTEGER_CST)
     {
--- gcc/testsuite/g++.dg/other/new-size-type.C	(revision 139711)
+++ gcc/testsuite/g++.dg/other/new-size-type.C	(revision 139710)
@@ -1,10 +1,10 @@
 // Contributed by Dodji Seketeli <dodji at redhat.com>
 // Origin: PR c++/36741
 
 #include <stddef.h>
 const char*
 foo()
 {
-    return new char[~static_cast<size_t>(0)];// { dg-bogus "large" }
+    return new char[~static_cast<size_t>(0)];// { dg-bogus "large" "" { xfail *-*-* } }
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- .cvsignore	5 Sep 2008 08:43:54 -0000	1.243
+++ .cvsignore	17 Sep 2008 21:48:16 -0000	1.244
@@ -1,2 +1,2 @@
-gcc-4.3.2-20080905.tar.bz2
+gcc-4.3.2-20080917.tar.bz2
 fastjar-0.95.tar.gz


Index: gcc43.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc43.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gcc43.spec	5 Sep 2008 22:20:50 -0000	1.43
+++ gcc43.spec	17 Sep 2008 21:48:16 -0000	1.44
@@ -1,9 +1,9 @@
-%define DATE 20080905
-%define SVNREV 140029
+%define DATE 20080917
+%define SVNREV 140410
 %define gcc_version 4.3.2
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%define gcc_release 3
+%define gcc_release 4
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -154,6 +154,8 @@
 Patch18: gcc43-pr37189.patch
 Patch19: gcc43-altivec-tests.patch
 Patch20: gcc43-libtool-no-rpath.patch
+Patch21: gcc43-pr36741-revert.patch
+Patch22: gcc43-pr34037.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -384,7 +386,7 @@
 The Java(tm) runtime library sources for use in Eclipse.
 
 %package -n cpp
-Summary: The C Preprocessor.
+Summary: The C Preprocessor
 Group: Development/Languages
 Prereq: /sbin/install-info
 %ifarch ia64
@@ -458,6 +460,8 @@
 %patch18 -p0 -b .pr37189~
 %patch19 -p0 -b .altivec-tests~
 %patch20 -p0 -b .libtool-no-rpath~
+%patch21 -p0 -b .pr36741-revert~
+%patch22 -p0 -b .pr34037~
 
 tar xzf %{SOURCE4}
 
@@ -484,7 +488,7 @@
 LC_ALL=C sed -i \
   -e 's/D\(o\|\xf6\)nmez/D\xc3\xb6nmez/' \
   -e 's/\(Av\|\x81\xc1v\|\xc1v\|\xef\xbf\xbdv\?\|\x81\xc3\x81v\|\xc3v\)ila/\xc3\x81vila/' \
-  -e 's/Esp\(in\|\x81\xedn\|\xedn\|\xef\xbf\xbdn\?\|\xef\xbf\xbd\xadn\|\x81\xc3\xadn\)dola/Esp\xc3\xadndola/' \
+  -e 's/Esp\(in\|\x81\xedn\|\xedn\|\xef\xbf\xbdn\?\|\xef\xbf\xbd\xadn\|\x81\xc3\xadn\|\xc3\xef\xbf\xbd\xadn\)dola/Esp\xc3\xadndola/' \
   -e 's/Schl\(u\|\xef\xbf\xbd\|\xfcu\?\|\x81\xfc\|\x81\xc3\xbc\|\xc3\xaf\xc2\xbf\xc2\xbd\|\xef\xbf\xbd\xef\xbf\xbd\xef\xbf\xbd\xc2\xbc\)ter/Schl\xc3\xbcter/' \
   -e 's/Humi\(e\|\xe8\)res/Humi\xc3\xa8res/' \
   -e 's/L\(ow\|\xc3\xaf\xc2\xbf\xc2\xbd\|oew\|\xf6w\)is/L\xc3\xb6wis/' \
@@ -1706,6 +1710,13 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Sep 17 2008 Jakub Jelinek <jakub at redhat.com> 4.3.2-4
+- update from 4.3 branch
+  - PRs c++/37389, fortran/35837, fortran/36214, fortran/37099, fortran/37199,
+	rtl-optimization/37408, target/37466, tree-optimization/36630
+- revert PR c++/36741 fix
+- fix VLA debuginfo at -O0 (PR debug/34037)
+
 * Sat Sep  6 2008 Jakub Jelinek <jakub at redhat.com> 4.3.2-3
 - don't run tests that require Altivec hw on non-Altivec powerpcs
 - make sure none of libgcj binaries/libraries contains /usr/%{lib} in


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- sources	5 Sep 2008 08:43:54 -0000	1.246
+++ sources	17 Sep 2008 21:48:16 -0000	1.247
@@ -1,2 +1,2 @@
-373bfd18d804b93123d89b793967fb3b  gcc-4.3.2-20080905.tar.bz2
+78b4e6400e20ea3011ae7c887f8338d2  gcc-4.3.2-20080917.tar.bz2
 92a70f9e56223b653bce0f58f90cf950  fastjar-0.95.tar.gz



From caolanm at fedoraproject.org  Wed Sep 17 21:48:50 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 17 Sep 2008 21:48:50 +0000 (UTC)
Subject: rpms/hunspell-ur/devel UrduDictionary.xpi, NONE,
	1.1 hunspell-ur.spec, NONE, 1.1 import.log, NONE, 1.1
Message-ID: <20080917214850.D73027013C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ur/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18421/devel

Added Files:
	UrduDictionary.xpi hunspell-ur.spec import.log 
Log Message:



--- NEW FILE UrduDictionary.xpi ---
PK


4f?m:/e?????{Fe?}~1?K??&N?xr? ??$=??????????=L%??T[???+A??uL?????s?}X!??&
?p???? U!?1v???i????ik'(l?ou?/?????4????N<x????E???.?}?b?=(b??C?:<??*?9???OX+z?.?????}?UI???!???'??N?=T'M??nhe>FS3??u???h???j??b5???A?z?R?9?f5?????A??:????[%.*??$n
j???-?zIZ?#Z?:-????;Q??.???????N?????Ug?????]"PK
?}w???????h???v????????????Dx??O?O??O
?b?,`????$?????Vcu?wE?37???aY?^????@?
-?ZaX^?(?
??L??	p?8?s?8???0,??????[b?dX?R????n??y?%?$VAB5??T?+wP?????u?_?N?5n?nSN5pa??
?b ?ha9??*-9???.%?
&}????/.
?
-? V????j??a??dJx`???%??y?f)?*e???Y)?D??k??*-?6E???+???j?m?o*???a??/Y??x??????
4M@??W?KVI?)Hu4,????W????RsBR?B%W???H?N*.??R?v
E?}p
!?l???2?&?Pgu??:9???
P?;???p???
cc]PIH??b@
X?!,???
?????D??CJO2????B[?dM?08?u?")1HR??VO??u ????mb]b???7??.m$
g?>?#??^je+??/!y?aO)??i=?iL?T?u#??)?&?C??Y'!???$)
?$?"%V? ]????z??N?2qr????c|????????bD?*&???p?????5u??pH?o*?????g?1lWr|?]-yU?-?N???uQ?FX|(a/7?Z??^?}??j???;@???+???]?k??????,am??IS;?_1?,+???,?uNB???	1Q?Y^"?<|??????????e??? ????
PB?F??4!???:[)?L#???:;?i?f???
Go?F;!
???SJ?
?T???@???4az??$??????+q^8?S?j>?\??
??lp)y??
?LDb?>??'I?Q?????w?s?T?a????v??3rO??m??6e?(?.I
???=g???>?????v???u?@?
[ F?? n?_X?g?-YM??????KR@qi??1?????????? 
?????? Ma?i$k-????P
?j?O'????M????:?
?$?^?45??]?J?0?@?????
u?5bMy?D?????v??$???!?](?n????f?5I2?%?????l????J?$I????C=.t?B??oZ??0??J?R{?)H?f[?>K??????<I?J?gM????5
?Zy?,]p	GqX?b>?H?}#????mn9
!???]h?[??DVg???;@fx??xk?	??
?_LH?	???
??,B,8???e+?kG??t/??}?P??<U,?[?!8??<c??????????rm->?<????.-?Ar?9J?????KU?????p??\?W??????$@3????^?U?	Q.???G????p/NCX???Z?{	??{=|K?v:??8????a?6t??[6IKi)`??N?:i??+?F
KI???1??C6?ve??"k75mj??Ys??Iu6g;Q`x ?0H+?|????S??g{__?m?H??aNT?A?8HB7
?%??zu???+Ac?Dk
S?y?XxfHuX???
0??
??C?u
?k??"???X?H?-:?bF?&'H[?#
O
???2~Z}??j??jB?p?b????D?c?VvB???.?????`S???D?I
N?X??K????[
r?1B???r??t?????@ehE?
?5?P[c?HIH?????dR?%M?TRZ^|???G?0j(i9M??a???????A????????c"?6?a?h???D???????|?HJ)??T"?f?`v??d????8?Q?6jK????>??
????)Y???ti?O??T??,?=?<?v/????.??.4?q(
????Hn??H?dS?H?.)?/;?,?&
?(}?|O????D#?Z????A??^:1?t?????5HrQ??$?-??}=?H?Q?h
"7m?d??9?+??8?.?	??R\;(?2??
Q?UX?????={?Ce:b8,w?
?!e???S
_n?DW:17R??v87?6
M(-??.Q&?x&a?%?wR????b??W??!???8?^??}?Y9q/!
ql{")?1?h<,2]&??u?%Kal51?5X??.?*?`RW?????C??}	-%_?&???P+"iz[G????
???0R'??P??/??AVg?
?C3?<,sPv????	]?t?9D?9???1*????&?'?'U???0+q#?J??????W
?Z}??P?Rl?[#?&w???;???S??C??u???????DhQ??2?#=??Gx
?????M[?rV???Ys6^?.??????(/>???@n%:?2
???k? u? .??\???k?n?)@d??(
??`'ac1?<????$X??7?J???????k\??@v?????+???*?
?
@?9?????V??@ ?????r??z?!???y5?D?F?ZS?^S?:x?-D}??^??68?:??&3K??2MA?????r????wy?z-v??C??
Dw??G??N????.???K???F??????Y??
0W?N?I}??????3?p?mX?u???1D????Ag?hz?
???=
?_?OV
RO?
7
?DI??m?lU???|??0???p????p?QHI4QR??Mp?-Q+A#???Ah?:??|FH???y??????e@??????s?A?~!??7???\??DPuu?s??????!"j??T?????
Nv`9??dR$m??C???Z??%*?VB	+??@(@?Mx??N?p?
pS?x!?DI?F$??vG?
??3??Oi.???I??h?Q_;\ ??rA??????u??f0??
??3??s;????
b?4X????;?h?]?FZ?$???l
`_[????)??C??4????:&?lX?4 I
??"?????E?D?b??%F?$?????'u??6??$MI??e#8?%??H??U_?$v????U??&?Np?@Z1??m9#?}?e?q?R?P7!u??*?????S5???u|bz%e?2??p?NH#6H?N???$t????=?v?"?$??!?6???.?H?????6??l??	?'`??F??z{Z	| ??2?W;??M-
???????????6!??n?P??"?*?4?l	?
	??'$?e??h??d?????J?????n???=>Gr}I?????????F	????N4?m?+??C?$fJ??`??`????????????4??	
?	
?	?c$?9???ae$Qh??)A?	X??r????w?7;?Z????????M?C??
HG?#hl?9???A??O?????????????Q?
H???%I?????7B?$E??BC?C???C&B?$??.\ICj???N??@?NF^??!a??e??9d?8v???????}?????y??'
]??Az ??n?N?i??????K???V??~?
??T???t?Q$??s ??p!?I????????u???f
+#>3;?9?|@|L??g?q?N\?w?H???"@?)??????7??P??S????????1?k-Pky?FC_
?j?????b??mF????9?3o1!????????5?m?
k:
I????Qh?!g>??????Osp??>????a??AN??2Q??|0? 0e^?4?6??{v???,.????(4??y"9??oR???
?A????5}-?(??[?????,1???|?$?X#??>>?%1W?@?1???~?"%?^6?r?????N?\?<
p&?0?"$S?(p?
Vu????x?B??L???O??A??4'3?Tze????w}????VP??K8]H???N??DX?~??nR*?[]??/??Hra?YQ??Q??t???c????????gHo?,??z}??L????{8f????
i??B????XIG??g
??
r?M'U
?_?
?R?m
K?
?/?sp6????+??U
??mf????.?C;?H?	8L?Z(?????Nu???(I??#)m4Z??u?????A?Nr?
1????T`?A???????????w??4??
L??,}Y?
H?7??[?0??2????B????(x0.?z)?b???<
?~(???s????c??[?oi??'T?^j???4a?hp
0?
???!?nHbpJxL<?>$????c?z=??>:
=}$?????e??']?OYA
??Ct?w?,??8?qF?]??
~9(?6?
??j???7????%??I/????6?<?2	??5?6?%?????f???%?b?2?>??kl?w???m?a?(?????????q?I??L?s??H?S%?????dG?w????????????e????.?e?U?$??6	?[???D?0sC?????a??9#m??ig?T?j??7?Sm?&4yeSX??~}
??e?DIl????zLam?c?nh-
x??????O?F#??7???F?o?????2	???9?l?/KU?J?s??Z?*!????H???}??$?????t??m???\?????3??, ??0@??,??$?????-??tq????`???T?????????6
?5?0J?n?{,R???P???!???o
??o?&?????????g??K?`?L
?h6??)?
ZR7???Rov*??U???
<pj?>?????%??9=??
??I?I 7?
?????}??F?Tm?/????-?FB?
w??g??<?b???s????B7k:?
c??V?b?0???s`-?t??ZL
???????_9+?v|_Ug????????
?#?SP???V?
:\????	??
iU?)????v?z?%?????>Tx
?\??`?\?K&?3?g??3Q'??????`\o?n
??s?]Yo?0 iO@]?;?r?3$`??
uG?%?p??
?????#?A3?@?_	???G??
0??HA?v??!?mmP2GH?4?:??b???j??????Y????7?????????(????*v?+?5'?3$VSJ?????B0?%?7&a?????LA?????|?S(??N:
??!@??VFmL~:?^{?C??e???1EY?6??v?F?X??QH?
??BC??. ??{??w???y?N??uoIV<?|??0
0D?<n?????N???M??
d?@?`>%a???C@???C??????%q?#??D?$:P2?2?[?0lth??I$w?4'"=????W(?!Y??|?!??#7??2L?>	??5??za]?1x?H??%O?o????[

?????If
5?Z?o9RKR??????[x???I/??[
????DI|?i#????5??{k?????
?BzFYC???????n?5?S?b8??O!x?=n/}??????Mn?Hc????~???^!Rk?????W????&?N56??J}#D
?X??,1?=wm?????????f??#?6I??R?B
^(????z?xB)y)?,^?-??5?F????
?q????y?F?4?]??w#Tj?-j????@PO$?s??Dgz9??????`>?V??KC-
?E&?D83??mhp?3???W#?r?II??z?H
??Jb?>*?{
????/???)O??M?x????"6??vD7??PG?g@?Mr??5?\RH.?4??????,??A??????}???1
?D#??Rv??????_?:?M???MN?(k??F??G???m????h???????8]4?]????yj($??TC-
?Ej???B?RW?$?`g??&?z???86?????m??8J?4Gi????8??^?@?????V?
?(r?yA_
?(r?e?.FH??m?O8?R`?0khr??oC-I
)Q??BC-
?????????????om???(?. -Z??????(?l|[?X??d???8?(??B?????n???j?6i???DICG??@n,R??J&L!??????(46???M}Ac)??{????-??????54????????6?r?Q??Oj($2Q??D?M??qI?k#??@???
?Ml6Nl?
??[??(???Q?????n?I?D?O????????p?N?	?qh$E!??v??r|En)0?=??\R?.yJZ???B!????&?q?S?H??M(b???+?"?[
??H?RW?dR??I?+?????~????hI??wi?@?m?:?$?!?Ph??oh?&?c??Hs?,??}?4??$?9
?????k?z?'/??MC??Y????|5????DI?]??WSh?m
?-?????~f#?6???#?6xZ???x+??\?"9JQ???!?????9???F???z?B/#j^(d/?LHc??8?3???5L???&e??jg
M?}?;????e?
	HW2?W?%A??\?P/????#??m?H?4{9?99??R???Hx?QE-j??OU_?xI????????l#j(?Q?M??r??<l?\lG??????(?{?+?$?l
]C?????#)??u?dC-
????z???
?~E?e?0r?j????	n)?zV??|?6???
?0rX?e?????cTyu?I??<B?t?H;$bY?`?????f??(?????ld?!?e ?N?Z??m8???(???t???W?m?T????!?Q??C>#?"?????#)?T??iC??(JN?=??}?????H?6?9/???|?y?????]C???^(??????k
/??=?$??|??`?????L????#H???7??Ea??DD?$?KH?	gi)Q?VhRz?*??(p??
??(;??IP????EC??B?Xr6?M}-f??g?]??8?ES?63??4???v
???6
i?8bV:?6??D?E???^?V????e?
k?a??Qi??
H??k???z$4A??/?T5T?%	IQhl?ICk-???`??I}???????"(c?M???v??%@???5?!?uF?????]??	?!?k??aS??????{?????i???-}\b???;???yf?>?X????????
DTR"???6G+?}uM
???S?$???P?-w
2K?SJ?????B???I?D?]v}??.A?q?~@???$?)R'?#z!I6?J?
@??	??????'2X??????,?B??F?W?LA?Z?$?Xga???Bf?H??h?)??`Pv?zk|S??????Ly?P?Q?
	?\?3??>?f??+v
6!55?fe?sk?l???nDzd;z???
E8R??.?%2??H#?????.????6!=?b???
"???l?F;??0D??$?Y5"??????$??sBO+s??Q??*%?X?%?Cn?"??'X.??:?Jw?0t?0K$?
?s?$C,)H??
l1B?????9?Z
??|0?
?W????00??^G?H???
?%:?'v??p??d????\
?{=?	C2?<??S???h]x]&??#?+?+??A??8?s?z??????N\?*,>?$q???b??(I?????k6????????
? x??T??j/??%?^?[X??6v^	?%2?>B?? ??????.0??B????@u?u?$?_kU
??'?e???b??
??F?S??Fd*;m?=???????&?????2?
??bhC2?.?:?~?????K?#??#
?]L=y??zL??q?CJ:P?-#?0?????C???f???@?U??(?2?Z???
??'T	f)????P,<?r	??????yo???ldaaMjy??xBP??????
+8?
G?0??Z	FAJk??TV!??+??F????*?9P?gh	S??%????????V?B?1+$W??*?'?{[!R96h?S??>&?v ?Q?yn?????>,???IX8?!Ic`???????)???!z7??"a??V?????q6d???ATMh?0h?
g]?#??t??"?F??	1?&9?(p?}?(X?Y?i#(`????^??
??Sr??V^M???x?U5|
?NK?h???(??r2D(???Q
*?q?a`G?.?NA??XQ??k??@^9G0!?zJ????5?<? 
j0?d ??Xb???b??
:?r???"??????????gAf?[??m??M????????t)????U$y?L??HR.z?BxJ?7I??=HH?PPQ5???J??P[Dk_?5	????'????
??????~???m??
??CR?k	????????C?^??'Him??????j??N??p????????&?[|H??"G.->?????9?!N??(????[???????k???
Ax?V>??k?.m?c?d???????ce??-?ai????????????m?2?\?	?J??T??!?y??&!??}?{??
??!?h????????A6??????ctPaXT`?lC??l?"?R]
?6!d?B?e???"`\	r?e?6N?}???5o?QoYt?JxZ?#M????????	????7?m
????UA???;o?q\????C???q?.???????????)?L]B????3?"?@d???????h???OK"#????3A?A??H??????v
a?' ?=F?8???a?p??Y B?#?????X?bOU????g$?-`p??R???c??U?+(???? ??H2U??\e?e?k????2*F5uC[??B*????a?p?7]l/?Fm"?k?????JA????N?????l7!??f#????;p??b?&?Ap?Y?2????Lr?Q??????;??7??[???6?!c??1-p??,T??r5dT??Q\?gA
?T'???2?
?????x?@}?
v?U??"?????YH??x?L??%(N??g?????G??9?S?D??'??/??"]?.?G??$????Q
-??s?m?.?B?eE~???C?<???
b??[|?
????
?????x[???^9?n?.>.?&?w???/?I?????m??>?RU??t}??/
INI??;???,??Sr?
??.h1x?e?
?????? ????.?v?.w2??ns???%!yp\Q????+lwJ??X?!l?????hk,D??RK;V?=MeR?j??#D????d?~I^&?;6?1R?iL????????}??}?*??h?L??-?Z"?<????Z??S[!??:l-pZH?J?w9??.?H??M?=\?l???
?1#?_~@Fq??6????S:V?n??Ol?j
l???A?fbx?B?Z_
???????@???I??C&?>?PP@??A?*]?d?*	U?+|-P??uw??/?3L??c[P?{g??J????~P@???:K?$2??y5d$?L????????&j+?XP?
<%Y?V?p'??$94Z4	??????	????????t????#?????	^?????!?=xy?yG??2D?hw&{?7Y????+?c??J(?ov?n?&?v??J
?2?T?&n??]?R???j?[?z???&?I??Z??(t???f2a?%?IF$?Xw|B??I7?+!#?M?????$??????????+ ;?:Pi3??j?x??0U????.?N[!?Q%??+??pg?3?1C?s~
dow??z???5E???aSw????~?????b?
J???^??H
?:u???i????X/??I?f????xr??+??I?????:??S??x?????&?I?n?	!??X/O???????

p??g???????Z?\9??3?slb??hRF%#k\??,v?Q???=??pO&?\?o?}?va??[l??H??V???q
I?\T\J??<+9?t.?JS?????tq6?W@???#?I????y?&in at u{K??????$n??5]?????K???gr?hwHE|EA?*??o?IZ?~@?????C?g???6??Ez??U,i???m?ql+x<r??.???R?????????vIp?U?OOy?!
????&???RVz???0?????u?e????<??I??M?????????
?4??o['S2T??"A)??d??{?Fl}?
L2L?}????z????????(???r??<
?x?63??;??M???@WC??FS?T??m?W??B@	h?W?f?Y
h7V`1?J??9?????U~f?5=UE??k`s?@EeH?'E???3?"?????]B?
?%?0??wQ??????IVM??e??#??	LH?<ZW
-d?!??b`}+??d??cB?;d??z??????????B?

?}4?????????=
%i??????mFI?l?*????.%#??H??+???"?yc?&???`???W?u>?Wo??????23??#?[ ??
?sZ?Pg}??d?????
??H
?{-?????????F????Y?N?s7?TY]?????}\5<OXpg??????=^??lw	?-??oHw?????O?

?s1sC9=)?Rz[?J??7??<??x?(???=?JS???? ???y]@??h??*?@q?j+?CJW??X1M?a?"??	?D!?? ??$???f??,???????
?[mh?U????tw??????j?????
?I??!Hd?n??????K?H??	h??g at vUX?00&
Q?`?o???r??-?-???.???0)??.<?????????;??'?? ?W!t|}?9v??_C?#??t%9I?$;@?s???!*????@n???n??GKd?f??`,C?@??Z?(?b?P?$??e	??????J3K?W4??!
????I?;?}?
G?=??C??VR??>A[?4? ?K?????\`??$????7????^M}V(???^s?????2?"?yB5I?dH??~???)?[??lK??
b]teFl??d ???>?R`??]L??J]e?XKuw
#-?@???0f??6'B'AX???$??f?d8~??ZI??L
)m?a(?0??
?i?kS[bd?,+?r??!??
?@P????8?g?H"TZ\?/(P:???E??Jv????	
?`"?UD?????]?R#S?j??????4~
??ep?<JZ"???1R?Ssi???CR?}??'I??R;??=???$?`??+2Q??}??KI4"D_????.F??v9?h???k???[B5{?Q??	?'?m??-??A?'~?_2??k???
??&???
v?r@?G	g]??????T?X?8??7M${??_???;??u?2???uk7^?Xn???9H??Zr? ????$?oX
?t??????j???EhT???
??'??eL`???X?e???????!<???
??r??????9!?)j???	?"??u.bg????g????Z?y?p?UPi"??sh?,My??M@R?}??b+????.GYGr??%?i???(iY:?A?\x@?z??6??D??2%76qr}C=\??G?=???#?;GyvI?m)?N??7o???PB`??Q?K???Z?U????????TPP*rZdP!???p????)m???b??$Ya????
?S?NX?i??#?-??`'?-(H)???Ly|%?????APR,i?)?U??9@)?X?}6.???&??C???x??
??
?M?R???'???a:1L7?7/?T
????y}7??~#J???<""????????t?v????@?5B?P$pi.??? ???jp?d?T?!?6???uXE?H?
meu1"b{???
??e???$?Mm??16??})U??#?^????N!??g-??????I*?P"????-?BP?^?C???o?l?????'?????o???\?Oy??$-??g]S??J
F?m??
?+T?}??D???%?UJZ?VW??u??)?l:?I?d??l?????AB:b??G??dP?Is??$O?V"2i-"???u??
??F??????q?Z ??N<,"??i"????j%3??x??<??T???s??-???>???0??lw??fA????]??X{???
??x??{@?c??c???5?.??R?Z!???	 ?? 9!/?????????uqa?r4?e????x?qBZ<m?'??????!????A??*?@~?
|f?iH?y?j?s<G?K??!??	???[???}??lk????g)??g?DkB??^_???d0??a??????\b??M?O??????9????9U????
??????}?
?7
??M?6p?A??Ci???HvY_?
H?W??? ???)g;?
????u?N?8"?id?????????H[????_6u>????}???<-?@?C\???}?+?????]!???4odR???? O?g?+?G&?v+Tn?W
m????u?\???{?<?d>?V?/?M??Bx??T~??3?[?D??6???dZ&?a??7?:??
?)$|?????t???jn??O?????xV?[n?>S}m?v6???^Q?A?)?B+??XW$`x?Gq?s5???h??	???m??????;?f?D???}ab?]??}?L????#7^???W	'-?*?g??w?r?n)????/;?E???/?n?????^??&?????01??K?,?-??d????nc??su?eJ8!?r?w?V??~?G??~R???m%9???
}0?PF?OL?
s?p?.??????"??
?l4??G???V?????l??????L?????A???PR?????W???SZ.??????b????w.??T???`??w???OB
5?.y(}s????#O
{?>?}Zy?	4?"}???.?%9??m-8???v????x??????E????Mr????=yy??6l??m????%?K?.???????@?????J?L%??(9??B?????O?[??$??@??R?F?voK?$?\$?N???qf?Lr??O~??
6%9LH?-?????rZ*NLc??6
)??E?-?'???`
?????????s??;????n%??????l??????Bq??1???8???\?P??zY???t??`a?????1?,;>q?r?Q??)T-?5}J?LmY~=?
?????p?[?w???lK??0uOL???
?B?~q"?9?W8?2L?5???l!?i\p?I????
K??(??`q???=??????;??/??2|pg?8?.?=v???????_
??[?r???\??|=??k$????i?7??????U?F?

???C????j????g?^?|D)??t??m??????
l>p?a?!?6?nAW?F?N?sZDL?U?'??YX??
???:?U?pV?u
w???s?j/lW?q7o
?2?&8-r?VRV?M?
I??f?W@??) ??4db??<?u??z???8*U????
J:?????*K?????y???
??'????-?-
rp????2	???Wst?x?;??{????a;w?6
??????#?$P???h????'?Hv????????Q?M??;???	h??r?N~??2?w????r??i????`??
?$S???%P??y??C??Z?	???????/`??
????
$??}???-$?????A~?%x?????B?6~?? ?i+?*?9?
??O?Y????[HZ@?z.??7????)?V?m????X??w=
???('?????L?x?
Yol?.??O?\??VB?0???
WM??Oh???3???(???n??Ziz{????	?f@??$	h?.6???????6!??ia?L??Rc??%?6??h?cU??vj???`WEe??c???h???A?4??W?s???
I?mj??8~
l??ak
??~?[?\~?$?}????	1?F?LDh?2???L?k??r???@??}i?n=["mX???:%ql??oj -?5?bhK]??????`??m???-?C 8(?,m?????R???vK??A?Xk???ub?
???.??z?E?A??-???+???@??x|GPR<85??kpH????Z?}?U???
??5????????l?v?.??G??j#P???G?????7?x?cwr??.G(au??Vw?	]h{^???`???I?:"?RR?}gC^F??????????????X%A?Vp?n?~???e?H?F?T+<??m?+9??b????M??T??mzn?`[??s4P?????Rp???
?1k??o#?}???	lVq???n??Vy
%?m??m?
VT?uQwl?m??+??^???d??%???1
?U
?
R??g;@}N??y??@[
&???v.&zm)u?????
i??P?_e,@?d??~@T???W???p?^?;@?F?2?FL?_??
?8????W(P????c?
??%??f?H?U
N?^???0???\V
????Hv*??i$}??S3m?jO???`R??????kC(???aT?]?????/&???S????`q??^h???c???@??(?^p#??\%I	??rX????d???M2?C**???)????????Hi???????:???P??????#5rH???n??*?M!?FR.????(??&???3?"???6?, ?????LH+,??aH???
k??M?????Q?fs(?x?m??5x'????A??b??^?????=?FQ&L?r???????|^??_\<?}P?l?M?nF3NI???5???*??a?M??
?????rW_?E???!?#?`?`?.??zBs????WC????\}???6I??e@?Y???K??w?:m????_`?#?&iGU?v???

I?H????r-?l;?NC?~%?r???$??
??As|?/?h~Oh?5A???????][?x)?Qp?dr:??r?`w??I?N&??U?l?$?l?r??p?Q!?'zD0??M?????9?s??y?Y???R???*`
?????s?@I9ot@[?rb0!???S?A?#?-??"?Ir??m?????Ay^Z??K??????01?+???v@?N??u?y?<???viG?
?&?? ????
??$?G???Y??????Le?Y?
<!??;rX?)?j%7?????5
aU????mH:B'S???_?N?\?????;y?	T????*?7??!????\???????(;?R?Ef?icHc????r?{??7??_+??'??
????2???????? C???2?#?
<?o???????w&E?_m?.P?&?g9v?????`?J?c?v:[????X4?\??s??0g?k?Lk}N?s;?)?+U???W`?????z?=??9 n??i???(h??`y??]0e??)?|?p*???r???}??.x?Cj0?z?6??F2?2G?}C?q?n,x?????v?\?W??\???p??
r??aU???n??^q??	??h??>?m???GOK??R??S0???r???`[????`?b??c????9???2??/
???Vm)9x??u??ZW8??
?~?????}?_??n_??hw1E??%????
_]a?f@[?6??v??z
?6]P1??+??IR}d!??u6.$??>?}EP?n???;R????c'??
a?
R?8+6????wSH?(a??]N?d??]?j???_???G???V??3???*????m??o??;??/??7??^S?????T???6I&'???
??:???u&??<??U?g"?jn?Jm;?mJN2????^f????????\_??8??]???
?????'U?w?!? y?t?jGE??8?f=????!Ig??/=?+X$OIR(_K??>Y$?q?>?f`? R?????>X???o??
??????V??@Z?	?H????r-CAH???	?YLZ?Y?/?????-?d??C
??$?=g?dXr)G?S;~'??>s
??>?(>t???[2?yt?o[a??i5P???\W@???m?i??HR????#Y??Hz?????_GK??`?~?O????(d?,?????f??d??? i'o>?r??8!??$?{????&?z??+?.rM?7R??? ??@V#'?]?JE?~?y???????U??z??0?????M S?H?
R?-B?lS?M!???H]H??W
?qY at ZY??s?c?=??'?	&V????|&?b
B?m?????D?&?-?l?????@?",????D{??Xt ???m
f?]p
???D|T)o?`????????:???\F:???d0??
??R?t?T????? 4?&?oIZN at +?`A
???????U?m????M????i? ??j3?????y?'[<???GJ?K<?????.??nbn??v?????2q??
???-kF
o7h???5?
?5???+I??????@?g|/_??????f ???H?	>g"p???
??}C?]0???A?????/P?L?Z? ?7)???W"??m?D?????????z?
????????FL?4?2?^??!ZM
y???B?e???N?j????B?????m???????x?G?~?>??????="????
?t4?4?????0J?",?%??$?<`???u5?]b[d$?/h?-nY???}???d{a???!?,\$%?w	?d)??qG???'??f????vy??P?l[
??s?UfxQ????
a=?? ???F+??i??r??????dM???4?????
Y?l???l?.?rr?s??$s?????????????A?pa?CpM`?E??t??H???Y???^|?1q?'$-?4????N?q???)-?T{?Z???v
????4O?C?i?	^???????>??S32fZ?u?a??0?-??&?q?
???H?????.??A????y???Av??D+1Q?~???]E?Q0?(?????k????<7???M???5
s&?y?mI??????s8p?GL??q???X??
?'?a?????&)0@?g|y?0??/???^??????/c??
????@??~t$???8fRK?@>?B5S???b"[5???M?j$k???\c?;?5???(#????zUc???? ?*?R???H%q	?TfA?????k???xL?P???-	>?@?u??
??z]I?Kj?7d???uf?0l%#h[y?? y?ZI4?
?????$?S
?(??8?LVjA???O?;??????E\au?????? ???Lq?dk"??A[T|;???B????pm_???-?f????
aW!,|?^???I?=
??!?!T??
9 9??p????-IZ?AEY??????$*??`??0??~}????7?N??Gd ??????@?1
??fC?)?Dn07?O????nl???|?ox??v???`? ,<?B?Pm??P???&?I???r>??\??)/d?6?J???w?s??.d;d?????$??72:??C.l???????PE????9?c;?f{$?????1??D??n?4?G$Z?$??_
X? ?)???????Nr?d-??g??7{5????h/I??
?]E`?p?!????D??`m?|??5U9?J_?	??y?\?%?j?Y?bG???&:????
D?07???j*=???
K?~W ????5}S??V?	I?7??lz?????0??
?^?G'a???????
?C???%A_?P2D(aM?_e?@????*tQ5????dU
???????
?C?;??\?/???e?1??
??d??????O????[???T???@?&c?I?????G7?fu?J?G??y??&?bx}?A&+???#??'?s??V~??.?H???'d?$?w?r?? ?&IN+?}
??8^_P??????
??F?'$Yy??p??i]?<??d?t???? ?<????Q.??NH????i?X??)R??>!??$????
a5Bzf??\)???4?0[l ?f?U1?#?r	??O0!???	@I??EH???,?T????????`d{lF?.?U?xM??$?'?T^??P(??`?V?v?e???x?Z?????[??n?????|?<!?`?}
??M2?X=???????x??}B?
???@os??!(?i???jU8?????e??>)?o??U??=*??/8??G2?@&????R ??r>E7	p?r???
?S?Y??I&?=?	Xfd?E+?X???$??(il??^A???V?5?3?G??h?`J?*??m?
??V??J+??z??R"?d?`????!?#??(,
?*`t????@bs???2????}m!c????
-Mp???
?????????:dm?H?%AJ???MN???~?@?V0<?????bX?L?????1q???1h
(mAXL?
?
???????????	??0J???s
????i?}? ???(x7AI?w??%?N??lg???% ?G???7?oBb???
??#Cr??kI??V???????(T?g?(mW?  A0P???8???	Lp?f?0??????m???R?$T???m????d???=?!?????$?@yCAM??B???@n?11
p?=f??3?d%?)? /?A
i}?}??
%N5b?5~??
%nq?%???=!???rB??0,;H%??}F?eE?
r?d5H???????.[fJ_??e?? ??- ?ZJ??La??*Lt&????<X???`??????M??-L`!Y??=Pr??F??$???Th!
F?x?iY?!|7P????	C?\WH?!X?0?[?#?1$7)??Y???4?#??YrI??G?S???
???"]$S5pwC?????9X??%wa??Hr,?j????????n?sE?
Jg?b?0l0?????B4?y
C#?RhV?o!x??$??O????d???1?+I?F_a?wl???j|?A?rN?72??#_?r???C_$_
??88c??%&W_????C}?$??7D??a?-???i?
HL?3b4j??Go/Bx]??R??^
{??4
??B/?I?(?
R?]8?
???$'?Eg?C??+?
??`??@?????n?/???RbEr?L?????2xN??`_'??),}??4???@????!????o4dL?????n!NH??????	D?hO???
????}????T???fsP??????&???>? ;??\,???^??s?y?>?????$????k\D??x???o?P?7????!qIsD????!?bd{?/A?	??H+????<??????0?????Y????)pg?8R/???:
?[?I!?o?P?_?*??`??
?>0??1?G}?:??
????S?X?X?Y????}????hOH&g?P????Q??Bt??	????7??s8??????Us?+???rR#??=R'y?;?N=?1????????O?
???l?$?.?DT6#AN;%???3?E?\WIZ??
z4?b1???zn?8???+,?@?W??$??UL?m????+???*?N ?)?D?^Dz,?U-?8?L?,???`t??s????E\au&D{??yaDf???:d>??}oM???:?2?b8?g????"?????b?? ??}-??1X??=0H?b?'?u%??`q.iWX]
]???zQ?N?T+f?@2?@&L?b?+d 
???&?2d??
8?? !=>?b?A/?i?
B?I?B???!?B(??"e?jK?]0Wd???=? mzn?8???+??{?I.?????????1???F?
?1?)
??~??\??	A?uz??w.?H?G"??[;RF????"?q?7?V?8~U????????@????Q?l?pI?*?7????b??C??a at _b??????!??>??Oh???
9??q?*N!}x!i[_#,?F??Y??? 9Spx?
???}??#k{E
6g?t")???C?O.????'???E?w
??"? F??j?SF????8???T?C????L??JKmc+)B??


!Ps?} iS??q???\G8?R???h?j??
?f??yI?,?3??,???j??
?2
?I1??S
L"2????(???
??????????T
??
??*?=??*!???
4P???H???e?$?(??4?x???e?Hz??e??????????A`?C#??hO?s
2?1
???$	?????a????y?:?H???^?
???0?)A??Q???c?1,1?:?e???????/~??N?~?
??!?Q?5???Kt????RH??6????D~???NVb??D5R?vL`?
??]?0!???H??^*?&Se?d???5Qc;?
q?
??!?? ???3X?1?h?7#?2?C?U#??]6JF????????????q??D???!?d??K?TWF???/ ?F?P??z?"p?Lg0?U3?:?a?3qRoY?^p?V?*Z?i	???C@$???"??o???|E?'d?e??????!c???B)l???UD?l?O{k???|????^?7?r?J?^W??@[????K;?q???
???"m???m3??g?.?,??s?????? ?S)?L ?*?A?<6????yy????_??2=? >A+??????c?"?M?%?=#?*d??`?s????y??>$A?9???}#???X?h6???C?}???????XD?}ml???8?q???[??9???#S?(P?f?
G^W?[??o??
px1??&P????????x@??-H??
??Mf???dS8???m??U??TW??Qw^/?9?????<??j??E	9?9?/;?
+?L`?????f?4?????{#???_??o???_?v?1E]9?`??sH???C>#bV0?o???uF???> ????h/Iz?#B?NC??]???k!|?C?????
?;??I{H??"??????K???Mx[<?-y?kD;??oX+??b{??|`!#?=??V;??+u???`?B?J?????@???O????????)&.?e???$? ?pJ`??h
?jC??"?a,Cu??|I?????B.S??)?u?`b????L??l??b?#*r???-!?+l???%hd??l8??!???q??oB?pF???????y????Ol?>zw}??{????t?I?q]:??G@???\??7?C??b8	?,<)???i?35???v???
??f/?
??>?]H???	Z???!?b????d?????9??\??Pd?<>????Y?rS?????N??[??0?????GX[?????V?|?'?.q??9??P???
??1p?C??#??%?~5???xL?f?R??ye?t??1?L5F??O??b???????S?a?D????[-?wa
????v at 2?
CZl??<9?x?c-????cM??????%D?? )?}?ta??%???n?#b??Q<??9???
z?
>??p????v
`??Y?$?7 at _!?z?
??U???rX??'?l??L#??v?.9?O	?4a$?O:???X?? 5?	9?	*
"g??]=??*??#??e????$??GC_(9BQ)???Y??$=7?f??|?;d|?8F????-
!??6??M??5?f??????1?
lR????I
?? ?????W??y???????r?*?S????X??]?`7??KZ?}*`%]&c?YN?|???K??pF????6???Tr?5??\????%="@g?????ok??#?0?c?'??52??9KZ"??????? 
?\t????H??;&??L?{?D
??	???(P?d??	?<H2???????/?c??+?7???~?2X??#??G?]
i?
<,?c?????nz?E{
??'&>?????`?o?4D? q6???????A?C???@;????<???????m???|?????~D?l??O??????X?????-<l<???\?m??'??1???v\??~_?Z"??X????L??????-
y9P-???CB??r?`????/E???A?y~`?m<??$=+?f?@w??cSYCI???Ta????=NWj?X9????????s???\?CJDM?-??n??e??T????????~~W?????n?L/?5D??????L[?`????mm?/???5????<????3???????K??d?}?}??8???XD????;?}m>?1|\#^%?6??T?????a?q?J????????k2?C?#%??X??????'" ??N?t]
~?H)??E?
???q]I????
i?a;?]??D?5 ?	?W?2???ct???f+?s$??2X|0???/?-*2????????>?x%L? ???E?????8?a??~?A^????#??l???+2?01y????5;b!=%?m????}|??E?????VH???7$?v'@??@??H????b???aK??!7?? ?W?+?yv]Y?PI6?!????K? ????$;_??X,???j+ at Z???p Ij????~7?????CN?w?E?V?b^??$??
<X??a1?m??A????osu?	hf1< ?/`N???OH?@.GD; ??=U?Cp??
5?a?
s@?~??wa???I??W??c6????????}?
d-?e?q?DZI?'?g
?7??9??@???"e?Vw?,y??

F?0u???????
0J???w??8?
Ri
?E{Bxg???Ln?
5?????&?e???C??&@?U??$?U?Y????!??^??I?S???}??[??F???\W????a=?{?hO?T??!??]???????T?.1hx?N??i?gU???
????@2xi??M?sR?>)?2??z?? ???PvR??P?????+?O??R+??.????_f?a?xFj???#??!_C??;??]??
?????;??	Xt????H??)!
????&?????n?q?I????-Xcb{???~???h??????A???nf?M?*f?O?X?E???j??rn???z?t[= U&?n?V5?Ks8|???`?{?]??_?h????)???Fp??T]?)9j?6y?R?H?pm??=hi?	?#?u??2!?E??"??
B????R?*??|?
R8?q?_???R???0?}?1??#?f?@?]#'??????rJe?!??e????????T??Ta:??$i???Ms?:f8???!NgH?`u??#R)??I???a???&????gu?u?AOd??z?,????@?R???R?bX7??}???A????????M?7?!I?'GMA?]?\7??0 x????lz5? ?????
P?_?????
?u at al??Wc ?!?0%???g?r??+?O??g???@ur??jS5>T/d??
??J?4u?xA??>?{N???i?VU????dR{?p`L??(???:P??!R?!?u'??8u??????}????[?c????????;?????S??9??????&r?7u???S???!???sz??c?a????y?-??'????;u8j?p?

l?]??????0-?$??>?i????_???>V&???????A;????@??B????N??7w.H??s???t?]gK??O????;_??N?5-k 7??p<?C<A??
???5`n?b??n?: ?I6f
???pF?!9?u??nQ?C?{?,?Y?????us?WD?w?
?????cX^?????rZ?iG??lg(]eF????????peCRD?#??a????A????1?e}
(???$S?ur?d???????rE? ??l??!O ?S???Y?Y???^/_eIxc??P???t??3?&-?*?A??N?s????J??I???Y<h?????????Hm>?3Rm
?????????C????uhbDt/Y??.x????K?&p?O???
????????n? ??????. ??v?'?^??????c??A?K???
t?L?-?
?r
Q??T??c$E?????W?$6V+`?n
?I?
?nD??????
(0I|?L???2??@?DZ???cU??????Tp
?AJ???H<-9?pK??[????????????r?$-$?(??j??? ???K???f??9??uP???#?}`(?[?#????
???b???}?b??qH???=>????>6????q??W?	u1v???
v?????????'??g??N?#?qr?3?L?
P Eh???#? A???R?#???u@*#2e??v?????N	c?G#M?'?.????l@?4C;$?	?`a
t?hiQ?@??
8?	B$i?=???+Z?/?L??-??D?
??G?\??I???PDg?gJA??Z??;??r	??)?)??????????m??????Q?T*??N???2???"????/X>2r/
???uL@?u.?T/#	??????????M?	?Q???@D&+???u??????Y&_(????*D??i4LUE?'d??[?I??????O?4?KJ?[_x6NK
?????I??M??zlb,3B??T?r??
<
V5@??-?-?????6?#ry????????????H?:?+`l???>T?Y/?z?\uH?
T?????2???M
??:?H???~????l?B i?1 ?,G???g?????u0??`T%??u? ??=:????l
I
?OP???_C>?<I~????????4??
L??'AM??P
?=???ivr?[?.?I?<?e?d??ua??v`N?M[???z?h?6?T
?i???W_h?yi???04?1?o6W???????V?>v?\bu??W?:?Q????n%?id
X]0??6????????b??_?n?>`????
?K?,?B?+?!#?w?ex??-s???b?????????{U
V?

?a
????cBrn??`o4???0D?7????X7!?Ib?[???!????b? 4F
?~Q
?????LM?Pn??u?e?`?F????[_xb?5q?????]??1???hE?????????M<???M?U&?????\?,s????.????
????D??	??? *?g?\???0t???}yG????&??#c?uFk??dL??]?????w'??5?3X?0? ?C?	??2??Q????)6?(?????{<~?>???&1:S?G,;??????vcZ>?~?`?j!k|?????>??[.l??o?e??????2?h?
z?}??D
D9#?d?0XS?r?K??9?:???A??d
???qDx	\???2G?u????????pc????K@?^??;?0
????*?`j?[?f?JB????viD???
???
C?&oeF?vv`C??D$[*?TyJ???x? t?#p?)H???????&?????L?(gDy
yC???L
c????w'_e????om????_?0?C????1I
 ?H??
 ?xCR??A%???????{???7?&?P???ZjZ
?<????cPwHk@?[ e???Y@?g?;:????[ni4?kEn?? X?cS??	???K??0pZWN"????????_uD??
Pw!G?????X?xkF???-??(o.u????`3f/%??S?
.	???}???5Fz<~????Cg????i\L???????[?????R?-I????%[?_q?"??$)?o?K???E9?g??]@u0??.8?_;?Wvbj?Rlt
v	X?A8?.G??(gD2?M^????oM?*X7!O.U?????"??Au???;????A??%H#U;?/3??????0h?B?V
5$b???????d??&?(?l?
o.4X?]????Ua ?Pw???-o.?w??"+:p?t)?N?M\|Q.???????1?a?g0???[??XL{a ???`? ?D??????W?????.#'k?&Y??2&????????(?????*

?`2?\?0$I4?^??LS??u??
@?/?@t;??????=?Pi?1]AGPH????%Z??9
 ???
?q\u@???J??????69a|?
?b,h?x?zOh;T ??o??zq??)`?{/o.??x?E???6P??tp??0^J= MX??X
 ??ym???@?? ?m3??e#???nZ?
\?l??????R1??????I@???:a??
??1??d????
Y??
??L??8b?9>?????,4?,???<?P?,ap??.H?d

?????m(???? ???/~?%n?H|A??$Z3????c??i=
!'D<y at N{
?}C??*?K??V?e?B??z@????eBZ?A?F????d_^\?-?L?.v?51 h??i?????{$?V7?|.?oj?L?y?b?M
?????f??l?	(???.l?p`?	La??hG3
&???yW?????e!O??1??G?L?-qv??p??????pf3 ??/?
/ ??`??;??]?x?@p@4F?`J??*Q?_???0"?s??c]?)Z?????4A?????lW[?????C^???qy
i??
U?;?a?B*:0 at -??????-
L??	???X?H??hY?k?/?IF?$????M|u?????/??B??'??u???^+??+?????K??W?(?f????????????
$????]?Bj??O??)??\???????P?????'????????????|?a?????Yx???????;??^??6??????x0qA??&?&~a????*?(3]?pi]?T??5\?`??/?$?S?
?l?a??9Q9/
??Q?0DnN|-7??5????i??
?W??V5??/??P?H?\?exVr??j?<?\?????/I8??I?
N?	G?dr!??e?y??a?1jw?dx?5?
IRI`???$"?S?O?h3???4???~=i??p? 
&ab??
??T??vA??P;??`I?wM:l??
????*?o????

I(??? lE4?.f?H?Yt??h?M???
?>u??
Fx??:l? @?5&?B?
??@?#??$;?u?????cQ??(gTE?f?U??`p?b????#Q??$??o????!Xq??XiH	?g??Y??
??]???????]>od?'?.*@R?#?z{????6d

?(?G??Q??>p	pI?
??????n??@?gE????(3????X J?E??W???'?0?r????<?/???~??dR???40

???1?F?&???p?M?3!???Wr??]?????6?H?[d???H?S??????u?^?+?[R|??x???zp???? ??{?
S????}P&?02z|???To?????H?0??(?Oyy?G_'?b ?6d?5??c at hR@??&?rCz??????yv???? S?Z???RO????W?Da??????m????}?E9?`???b"@??s
)?(9??????/?Au??C?a??n?#q???]?]?E??M??$???????/_?3?>?g??Mj?R??r???K??????/?"???p4??:D?	i=??HqRF?2F?)x?#?S9H???%?T5?????u?????Cz)?
D??
??20??HQ???\???r????u??n\P?E615qA?g????5?????.D9??:?X?2?
x"3?.0?[?
?)#???j???@NU@?lE$PP??!??)d??g~?8???
????OR???
_?1?H R~6???i?&`Zw:???????	??3
]<??H?????;Vli????/???????????
??]?RI?k??\??????V-????.
?o????7?!??"??7???4}\??B???????"%????????RA??.@?Q??6T?????????????/???o??(3??????K??D?:"?????-??uk?U?k???Y?Zo???=?kR??W?XmN:?|np/??r?-5??;?h?Xw&
????;??r4????-?K(?1?V<?dp21?t??X??^U????-???H??*???-??xj?+?O& ???s?@??`?4????d9#)?wT
?G ???@???????R[A??vqhb?g?I?? :?6M???~?#?	?????pj0#?__(??	i?D????????mJ?d?B???\|????Vfd?"????3??~??W??"???2??d.?
!`?6??j?
}????t+cJ?)?x
?#?<?(?I??@????j?xG???1?
v?]??
?]?Q???4?
??????w/?Z?u??*?a?d?w`mSIuK??g???!O.q??????3=\G_?'??bH?0????<#????E???9??!!u
I??H^?$?ZR[I????*ph????$?7w??qlr?N????
??????(W???yS???W_?s2r?Z^???,?y??a\7.?w?8?d4b??{???}L???M	j?Z?X???(W??w??l
F\?Qf??>? ?{?21???/?????xCW_?r???m???8`???Q??M?M??d5?!t?
?4?:t<??(>c??????????L?????0?
??83Lg?? ?q??
Y???????Q????1?8i
P*?R?????V?dD????g=?R?@?r??n???D??!O.???b??XGw_??;?e??{??NDeuI.??u?/k-?2????}5R?? ???GlY???X?y????}KEz???&'????AT$Z??C.<q?XhsE?"$?5G ?^w:DvY~I1#?^k?AR???#?j?E???RNM?eN??[???@$???0?$?h^?B	?$????(O!?$??? ???P?Ie??`???!F.????
?mD??//.?????0#??2???\?E???
C??????????&

C??
?l)?????:???Oa????????d+S*???'??
?\
???HN??5a?,?7L?l???????-????=?'?????I?G?:?;?8@??D?A?T 2?<#???.i???,?Q???y{?Z_?????`&???l?a?M?qyA?{dTDx!~??0?	?;???]@cA???O????T???M?????????i?????h%T???#???N??F_????R_//??)???u9?J???????????c??X???&?rA`S'#?5 ur
??=@??-?-???D9??:??*F$? ?\@v?6?'L?Sv???)F?-??CN?A
??1?0P??x??N?
Q??????v?eJ??G?<x
xMR
?-"HL}T?e??{???.n???<?????????ncq?T
H??O?@s02
??%??{.???????4*?O??
?cW??W|T at 2?^O?]???&?????i?#???~??Tf?@_`8
?
U
Q??ly_
9"???$Y??\,?/?Q?\rd???"0-/?27?
Q?	n?]'X.9?hFH2??,_?J?<???zD?EmA8?tE
?J?????`???e=H?0??u?S??Y????Cz\?3??????He|
`?[??q???FP?8?1a?1???7P????+?R????

-???uLA?[
&G/????Rj????`F??n??3?qn?j?"}?c???(gd?x???'??pF?R	???!??
??$??
C,????#???rF?'??1?
S?u??????!??RE?V0J???IJ#M?I
,???uvK??8~vW?
]8?+}???QQ????G????\?s?????
?.Y
?;}?PV???K?/?Y0????????	g??8
?>)<? ??????"'y5d?:??????????`?!?&Rc????????Z?????[????!
P??-?????&?3%???g??'&??Qu?CI?RL9?N?	|D,@/0?X?DL?.??EZ?$i?????
?@?a??6

aU?m,`v$5?U???b!???
b'?????P?:?h+H?1??@???>??
???\?"?Rp{S|Y?}???????c@??
?????x?N???36 
?H?-?'?
@?;?8??o??
??I|??@???J
.???????v????rA?DK????"??y?aI,??j-[????,??!DZ???[IS????????&???S
R??
??ALvr?"? ?a@???Y ew???a??? e?20??R6?$????y`?:?,??
J
?T
L?4?
?1I??VQ0?*?5,OX??5??@???6Z^?%??R?????\????K??????D??Hi+ G+&?
Pj????p
??????%H?,????`n@?Y??
X?0??+?R??L,9u???q?
R????????d?>
?^n??????~??H|m?"K5???????\?}B??IF#?L???\?u?
??| ?????j??	Te%?_M?uOt????????,? ?,????Y?	f????
?6??X??5(N	)?%?d%??b
???^?6$?d??????R???)?DR=??X???N*;??????0??????_b?K??
?????
?
F_???xi?no"=
\S.?3?Af
`y???????!h	???	9??
.{d?????d?+~?:?+X??f/?<?S????<???0hvL?~?c????ri?H|??b??a???h?)???1
D?oQ"?
?#???D?g$??>??!>????j#??-6???jP\pf?.??07@?f@gX/
2=g????@J1?CD:{??h?DZ]&?)???@ ???	H?w?j
?6?@I.??H"???[2[^d:??~D?*6`H)&????	1?L?a_X?Q?N"??3??????45{<????A^?b3??K?Mi????8???H??b????t??????'?
???
?
R????????O=@??~???X-@????
?&?n@?????????
X??`M,+ 5"H?sT?o????
XcO????#g??'?????U$??1$?<,l%?=???vE?$??7I]{?"??)6??hk
_?A?
?$?S;D???@F????H6?????~??
H??B??'?-4=3??i?S^?]????H?
?I??C????^??@?q???Q?q???QP????????4O@?L3?i?	? ??N)?Dn?L?
?[bkg&???q?#6?`x?Ji?B?{ll???
?H5?8?uL?C|?W??-D????Sd\\?\Bc??i?>cc7?!?C?Q???iW?]
}??#?ZDg??????!??Q???
`v???
???#???"????c? d|).
??????Q_?2l?H???6??5?5?2?w?(??
r?!?3??}FP?B???"??t??????bl?????6???t?
?$??????'???j?"??!?96~?????!?7$??v?8#,; ??'x?????.?D
L?9??=????? 9\?w???DiF??B??6??????
?s>???s?????m?(?????????q???B?S~<f?6??bt?
A?p?????@??????????O	??y??o???a?L?}
?~?t?{
???/H?2E	??h)
^?????G??2?{	z.?6yB?n?)???x
??Z ???F?qiS\R+?????
?????k?????i???:>?
?c}K??!?ao?-?3?????????|?G??)???c
???]???}?8???X
L}N??hw? ??8:?D*??OZ?K??Ap{?b?X?????\??I*1* ?&???Z?z?an???}T~CP??!,?]?>?/kK?G
?+n6??0a?'?)r??: ?????`1???f?~?8?????>??:H?"Gk?`	????"=?5???xi?I?3??????
is`^a?E???hX?Y??T0?s\?
#6??????????8!??
??*?a????*??
r??d
??,BX???G
??rl?E?????!?1Xh?/9bf
qI???)I'(?j?{h?K???v
?!??n`?????
???#?(?O?m) ??????????t{
??6B??_v?I?b??B1?????t?h?;???|HV|?](??"#?i???????(J GN?
????KY???????9.?
?2?????K?7??@???D??W???g?'????j?k??y??s?hc??rS??\L???6&Y{G?
?7?P<?????t\?~??@????f?	@q?3~?(P?7D?!?8/ ?"%F?;?]??h?'@?@v?N??d?????,?!??? ????
?-?G`??W\??S
???-j???@?g#c?&m?	7????????'???L?c1!?i?
????
w?$?????z8?!???-	#?7)?id??????,V?f?S'?~N???	?????D?Qe?????X??D?eL???????V$?=?c???C?V?`??D???Ra.?V?O??????????Q?F?B????lE?_??P???? /7	??#?k2???Q?_i????l?????yB?J??d??M?"??5???I?%
????~??MB???
?G&?6R?mF??{FHj<cT?W??r?s?b??
}
?K?"??S??hw?Y.?I???????~DX5?T??D?&V?W???@X??K?u?^?l??lH?q0Lj?*r?Y??=
?q?
Z????!K<?E0+e(?AN?(???Hkm????~
)"???
??G
k'(??N"??;?_d>Bz:???0Y??4>?GR?!??a??8????;?|?????Z?1?@?????l??<?,0?N??????????Y???`??v? 	?>????LG?1??c?9??h?,?#??j??0#??????2?'?????v,9?nmg?t}U`6??lo?? 	?7??vC?k?U?S?H?VW`_?9=r_??? S????? ???????vM?V???e? ??<?`???>?sA?{?R&u?X??&????,NY*Z??????D?~
?v:B?m??H????"?K??'1??,??c?7???????!??o{?>*
??
)??lk "??lV????
6??? ?i*??G2???@J?8?e?#6p???q???w<?KH?=!??#??!?'T????&?;7??b?4P???#pBX4?8?[??Hq?1?6?HZe
?PH???*???Tg?+{??6??????\???!?/~????9a?_?~D?7]5?s?vE?HD????iM,5??&qB?X ?LH[??A\??a???,?????RO?9<?3??
j ??ID{
I?????RN2??!?<?<1????Rb?G?-;?~F???
a???
|?LIt???EJ???a]C?'Ul?"m?
i?1v?BZ{
s?Svt?????_BX???{$K)_pr?"???wD?oo?vE??:?I?G
?,5?A?UD?+Fi?Gw~E?m?"|\
a	h??????l??????@????????1$m?I?????uZ????~???????0C??+?w?>q?@?`?
???"?
T????????\?$?M??W??P?p?*>9+?EJ?~Yj??;q???e6VC???? ]
O?????`
??7?
K???
HJ????{???>?5?4??????c??#b????6?K?p?
???????P$?2??'?v?X??k_$??PQ??	Aj??i?@?
AkA?!??@XK????
?b

10????cC??_?iWD???
????J
?4?? ????2f??Q9??$??k?<??2 N??c?\?bc?F???%??	{m
a#(@;?V?"?]6p<9?????B
??V*?s??4Q
a??????Q?H$???f]A??Jpl??JZ??{?%6c?|??]C0B
??,?@8?S@?%?$??????w ??F?R??
?|.?>\ ???\???z???O?%?
?3??J?
????K???Z??
?M0n|@???51H??0????E????I?'?'`?,???0?x
??5?8s
??j?4q??O??z ?y?e???!?x%???
???
l_???C?#(??b?9?????S??l?????::?????XMb?P?~b?2?9?_6?DZd?E
?6??@51?1\}\@?	?s)q????'d??/1???2???
????'?Hq-???]0??0??$d[
TG?k??\??	?4?!z6?&}-$n?b?`?????????%???cJ????H?<???/
~
????g?p???Q??K
????X????K?Q??f)?u]?
ek^??>a?(_?1?3??D
???????W???#??H;xC??
?????@i?J3??:???3??J???^?G????~F?yu?}E??g??q?GP#??}J9???R??#W?@??(???#+????_??%??@j????@?	??e?
;$Aj????Y?h??:k??[?`<?
?????
 ??EB?5aA??
???.?z
@???5b?T?\
???	?v????f?8??a%?SD[???uS

???u?l+]
4j?D???g?O"-;?_
XE?j,???????
m$^?
?QL?~* ???7{???>??u?????V????E0@q?N!??
@????[\??`?4j?|?@?Q??
!?
6?fM~??/?3Q?? 8?/
??????0?'????#????(u????)n?Sa(????+?';?L?pIXE?|?y?l??+?T?B)+??s?????bEPA???a{CH+8?$?v!?O"? Z?!????8P?z??f?4?&?HK?8!G{
?*.`?25e?[l????PE*???????????)?~IXS~???*???V?h??MZ?9?,?b ????)?C??~D?????O?I#?t??agk
???HKW
?OC???xMib????]mIyC??=??????<?(a`?0??*?-j????k!?B???)?:??z??D??%0?1??'s?g?w?#-$G`?@??Dk&????0??c7`-??W??????^6?:?"sb???c??g-]E???"??@iOb at M??!yyA
?i%?<????4??H??IR????6j,M?6[dF??v$q5????+V?O#_?]G?1
???????~d&??I(G?5?DJ?-??(????r?S????????0??
?{???
\
`Xlp???????????u???jL?1V0?(????p!ht1b????ADZ??vK?????9
wdE?D??T?2kpCh??~i?
ZO??C?????+g??x	j|??QO[Q,?????????AJ7??7?????A??gH??~,{Y`?V@?
tg<??@=u???A??A?nL???
K?Hp?'?
?f %??0?7rD??????[d?[H???u???????~
?????`?@??????????7o?????KHD5
WA??<^???????????
k?d{c?I?V???#?tf{#<
@?8?
?=:??>??I??y??&
????s??z?6???7
??E??? |?
????`i?@?h??????Q?n?
w?n????Zah????`Qx??0??Bb?>??%???`?-k'???Q??>??,???2$?????un?:?1?
9?V??
%??ewXuE?????
#???????$2??????+r??
AO?X:??}A?	???	9????8?K???a????j?_<*8?=?i??Z????n0]tU???Tx?'PJhq{!(??D????
??
?r?Ab??e?x?4?wQbS!??????
n??{&?YU?`@D?+a???2?.???????6?Kd?!??zs
?<E?
?h?&??Ij1
??x????@0|\?
??b`?S???<?_@8??i???I2?7??h?H?&N?????
?I,lb??
?F??T@?XZF
??A{D????
?uX--?0<l??Q?\??.?&-^??"??c?'?M??9?%?%RK.??K?x?????)x]???!?\?!2?<E?8?8?Jh??.L?xt7?:1?0??h+<@?c?????b??{?e???#I??3??Q????2???H6"F,?K$wS??!?F
?u??????i`????)?????CN"??Z???a]uF??????@??71M"%-?C??"??@?T?????E?
?D{??a?urY?
?t?u??va????FGV?H???0?)?s}5???????)?DF??T57??ho??????( ?c??D??
???s0???x??CM?$?
a1
[??h?o*?/b`?????O&???Xj?1:? ?N
G??d9??;B"??e?;???} ??&???,~h??
v+-??	?? O@?BL????
?????P?w??g?????\?
K?%???????Hg??!+CQ????D???H{\
?????HB????!?? _???"??+???6%???T?	Aj<Z	?&?}?!? 9?o?I0k????ha|?3D?%?k
?I???$}??,?I)u[???????0o?=??????4????,?;Z?R?o
?RK?G?BvrKP???Cl?1???#,!M?
0?T??H]?6 ???w+?U??5?w?%?E?q?`1?CT?kH[??x>g???$6|{???a)]???
??@I+????n?Y"??~?P??sb?K?X??W??
X-@??H?%?????DB???$N???a??E??2q???gA??M$??S?????HDT?M????om!?	a?
q"??v?
?>B??I+ZA?T???	??74IW?]r??"M?kYd+@?D???~??b?|??(b? ?3F??\????)?we??Q??bl?9J>b??BX?.??????#??????>?
?7?J&?w:?_??a???j?????w????3w??lYnD?)??y?C?w?_q??XR??>`?H?&?A*.b?K?1????u?G?????*d?????DXJ^+C???????
 m%B??L ??~:?E?M	0?j??%
??1EraZ????&?@???g?
?.W?8??..=??`?
?????"??f!??2j??.?+??;(
?`?c?>W?
X???E?l??<8?y. at j?"n??"RB???VR
	??=:??I??C?t??V=v?_?????
???"?`k?|71??3??Y?^U&?yg??lE
`!???y.?
F3???,
?"e???????&"?;?H??lS
?o?D???=6uF???5?X?;}??@F???u
i;"$y?>-\?b??
?3#
!U????O??"I?~]	?"??U??_?M???	
???,??'D???G? ????H?;???Es?-D?wl???z?7G?"??e?~?h?
??q 
???? ?????xA?h?'~vX"???!??+?MH?@[<vn????"?cx????Q?lS??
??
??~?4??
XuFj???6?iY&??I???q??????.?#}E????(#s?BW?????/?????$#????'D??.?uqA?2?"6?n?@]c?mSl??????????c 0?*??%?`PdWaJ?????V
)?v'????Hw???????g???`?????X&1h?Q"? ????????0?8??6uQ???Q??,?Q?2hgdt@?!??????`*??HR????1?p?M??!????d?}u?)?!?
?y????????9??F???3u?q&	p???!x`>?????Y????kB?D????#6uF?Ud](a?
9m?7??viY????#u???/?`"D?YF??I\?h????f?vF??|u???dk?d

??
???Pj?"	??e at .??@.8
u?Nxp?	Z @??}??
???F?a??z^pLnL??
??]]?#?5$??ze0?cbR?mJ(??O??3?
?O???H?o7?g?~8kxk???A?F???R#?*N9(?R  
l??3~??????W}?h????vd]^??~?H???????`"qcf?;z?}??~W??/AF???? ?
??0?>?,?y?? u;???.~?7?
?;6??'??
??b?`mg??A?w??H?- at 2O? ?y, ??p?r?_!???(???w?!???<?3!q???????$?????C.6b?~B??? Y??????^???*29?"?4'??s
?JW??????o??"?#?~
UF?V?A
i??
????Ol????EZ?
$q]|?lSl???k????%?Mb?[?	?K?r0gb?d?/??
)???	K???	?:?????k
@d?????x??????
?Zv?? ?<???????H??'?T???B????W???A;??????0?E?-????VL??
?^4g?? ?1??Cb??`?a??? ?-@??H??B?/D} ?a{#?*r?)\??F?{l?!??t0dw?8?pP?[i?????
b????0$?????j???b?Y~???AE????
A??H??9??????.?#
? ??b2r"E?5?
???!{?Z?v??Z??q
bb??D?????
C?????=???c??20E???e?5)?8????????&??c^
W?3??]a?J??M??u?4?????d?S2?^?/????7??#??????j?a??q?9
e?????l ???"??????qU\??]????*N	e??^v ???r??]<L?]?IM???d????X????sG?y??????w?
"e?z?>x????}??d.?54?4???8?DA?y?U?vK`0?3r?!?.c??~
?EA?I?Y???X^V?????a??}|????????"?????r??g
??g%R????d?8?W?????:#??q?@??WX-)???c?73-???9???s?2?L?A$?v?b??7}???!?7[_qA?????e??@+?)?G???,?C??}??S??",l???????$??????/X??h@??qE?Bx?^??6???????
?(????5?G??@?iC?'?T?D ?????K?0?[Q$?Ae=nY?:<C?o!????m?
???ei?HTv
?=????????????	pc?f$?0ewPy?
? ?0Hm^(
?????{P?SY?&W
M??$Zj??O*J???
X??W?
g.?"-???U??b?? ?&????J
????=+????$+?(5-P?A;??(mB?g?e>s?d`u???)1|??vV???*??	<8??)]?pl?
	??>??7??! -?^????????f+?n?F?AW?L?@?????a??1Zz?pFmN??6(??d+??q?4???QE&?%"$x???_?]b??T 8??Mv?r???!z?{?V???$?v?Md??#???v;????
o??????S?;???t
??[Jl???O??)? ZA?Q?F????f??5haA??K??c+?D0??;6~?"???~?D`a?+h???
???)J)-
???:????????c?
=4?_ at qS???	Qgd{?xg?a???J?Id?si?
^
?e?<
?V??9???h"??g$,??CZ*`? ?f???-?+r?????}????V@I?6!????????5ig?E?2v| ????X?@:??5Ao4k1	?????????9,???3R???}"???K	?? N6???H???Yg??
?!?	????P???9
?&0'?h?p[???{?????????|?W?{l???H ?a???v)?:?)W?n?????'t?i????$?d
?[)????a 9P??s?G]??
0&???G????r0?l!xB?J?$??
???_s??UZD[t??;?N
?^???9?#?
a
?`???
.?	?ihn?H)	??/?
??@}?????@-)???
X9]???XJ18J"???~%??A??@?&?e?????1 ?&?ud}???w?V??6????????J???b??[Lxh??70??90}???.W??????[E??5Uh???@B???W at B??
?$??9??@?????Q?e:??G?x?ho^?J?&??/$%???S?E???D:?r/????<rF?5?>y?
?[?)??_e?6}O??b?fn?????:??L_u???K?'?e?l???L????p??@?aZ??K??
??0?????)??p?O?vG????@
f??_V?d?A"??h?*?
???v:Fno
????9?o???!v?V8
???,N&Z???????1f??D??D
5-?V6ML??\?gY1s?,q??? -7?!??y??????#p?n?9??Q??d`??z?%4???`T~ ?Y& >??(?y5eS	?"S??7?6?
FmP???`???????q?4?'Zd???87
?Pjr???gc6???I
?5?
?1?(?5C?????
????ry??a??w????x??H.Lk????r.?2?_/??<??L??q?d?0??T??P?1??s????r6?\6?(i
?!"=??l?CJ
??i
RO????;`???C?
?'t???{?<?
.??Y]??Gx??STv?? ?p???sI??z=@]??`?
?i??ur??W`??'{F0`)ae?O?ad?`?`?(??Qgd{?i?-???????]?o?@?"lK?${P??0J	,?7?j
?F?
g?Wl?qq??
?????&R???
rf1W@??6?Bo?<#HN5a`??G??:??PF?1?s????`?\?}??c?vrB???0?Kh6??$??'[I(@.?#?t???????Y??`???Nh?rH?B?El<???<6D??iG&?. at r?1b|?-G?z11???M?T5????Fv3??!??n??5?*w???5?r0d?+1d?&2T?9???3?k???$H5???6?M??-????w}H?P??+?;??c?3z??9?????? {
??"??8r?4???;%?,?A?????3???E???@r?\m)
|:
Z????,(@,?????I:??Fn?$?
??'????/o
?W
2??`6?h?s?"????7???CN???h	o"?]??@??Q
?9?y?Aqlg?j???\?g?????=??{??=?)??????
s]@S? ?N??k_s3x!?
?Z??%??fl?!?I'???????b??i?:#[Az????!?VD&;Q??!/H???L
????H???6
???;5?	??;?T?y'??`O	??*?vF?Uuh???Q?]???8?\?w?5e??3?.O~??1???n
??i??;????9?X?P?????L
????G
?
f?i
???????oK?????M'd??5? n@?"l
?Tcnb??8??t?DH????&."lFzN?M?Ee/hg?*"???vq?? ????'?=P?aE`???2)s?)??dt&????9?!??&w?&iVgI|5TiIoh??????CJZ?2-W?`?z?V5???L???N?????f?Aw?#?
I?5;?+???tKNKi=?ri?9?'o??&o?`9#8$zC_???%????e??c?#?Y???^dW7g??T???u??6?TX@??????"'?&??F?yE?}?`s??t?CB<???x{?qj??.?zl?;??	?V"?
lQ???i?@??a\?!?p?|???G?$b???????rm%`?1J!y?????????)?uh?
??|j??b ??
?s
????&???????? ??(?/?W?uH???%7??7??$*=`??1Zr?; ???Jz?7?????W7??y?F*???@?????????????}R%??u??m????D?=???3?|=L`?u??V?3?*,?.l?????B?H??????`g?(???????p?uAU?M*OJF?n?J<?d??8!??????#?m'_sS?@??|v??\?&o?E?'?H??Mz]R??????????<"R?(??q?Z?W??m????;F$??"}??o3c???X??????lD>?}(EFs}Y???5b???n??L?	??|N"??k?f??&b??o?&?ww,f.b???`9??x ???
???<'7???SL??o|yy?` ??
??|"$?}?d?!?`[D?"O$??????
?h?l????<d8}???????U?@9??
?H?"	?????	?E|?])?@????6
z5??????6?w?;?? ?i;A; x??????s??(g2v??????L]@?&RS?{????????>?g>?
??Z?'??MJ???8??9d??????s??TL?-?m?WA2JS??)'??@Y???;?<?
/U?9b???)?C??
V?57L-6?i??????}m???M9?B?,
?{'??bH?	?&???_????>?#)mH?x#?dS#???s?EPb???#???8??6H:EC?tu?B???h=??#0l???s:??0???!?hC\D?(h??Q1?8!???>c??n_?y???9?Q???$??
z??F???????Qe??:???e???^-??
?
s'>???t??&????	Q
??`?X ?U?.A?i at o?ncj???"m,g????<<2V?^j??#P??5??#5?(g?v`?@D0HY?#?f????#1???????	v???*??1???6?6
b?e??gy?dy^???H2??B'???b??M"???=?r????&5,????&??$??Nxjd??lR??`)D?G???{~	?+????????3
?z?&&?3 ???zZCa??O:?
????????TJ????v`???w"zA;?`v4q?G???A?!??:?%??S;?O?b?
??O"42??2~V???,?*4???????[Az???:??z??Gb???"????
?z??B,D??c?????8?A?F0{?b??f;?Q??,????????F???@9????
?L`$@?3?pB??X????^???s?XO????????	?^?5??2?d/?W?????C??????M?$??e}H??????+?b?Gy|t??p?????T?f<Dl?*p?@?.8?}LA?,?S???D????????`9#l?p?Z?E??' ???????V??`???w?!?????8?JIv_????????!??
?h"V
??kb\???!??(R"I+??	?<
?????ym????s?????S??
?X?`@}??]d?n?!????????
y??\;???n8?h??gv*p?C?N?F??r?b??9b??????:H-]gJ?^j??O????1?uF???Gn???J?e?;????x)[??????w??4\?dP???['<lJ???Tt?9????????qX~?%?+????r?cz?@l ??????_?*?U?,?D?
9????l?6X?%??]@?b#X???6?????KF?!
??`D?t?q?B?C?}yD\?#%???\???4?
h??j?
???X>c"?Y???????w???????0??M?}?b?|N ??=?	?
>??????v?+??R>?H)????m?M?{????r?'?3?y-??%??;?????%~?&???:?;5?#r???H??&?)???"?>?=7?????H?????QP?9+????r????5?n%??3H????=??37?\?
?A>???|?U????%??O????@?d??gD?pf{?????sS?	q6
?d??{?6v?&?+2f&??h?
???s?? 3~?	T;???l!I?	??'b??M?1???`?
??*???w?????rs3~
FDW??6T?$<?
R?>
??3??]n?T????'????W>??Ha6	q??i??D?1???	n?/c+!??%8;qBh5?$??*?r??????B???q?r?]]???????$?4?
\???
?)X?]I?T????????I	????0??B???6?"w?,??D???R
??&?L
G???Q)?;?Z??v?Mk?%G?W???Z???{Yl??(?=~?@p???"@q????o???`?
??GA??2? X??????$c???CRov1?^??, at 9??wB?h
?????IH?????mDD+B????P????	???????8???8?((?:??????)??	?oxt;?Q???R??\?????ZN]d?u???r?8?:7qT?_?m??????z???????yu/?lW??p?=E?J??A{D????????8?popnxJl??????O?K????xJ?d
3P.`? ???,B?{F?
?????9??q?????h?o_?*,@??C????AX??vQk??AG[A???Sn?Dx??T+b?? .Rl???q`????xQ?)?+-???H'?Y?,@??^(!???????hP???SzbH????????W??)T?V??????7v>	@?t:??;P?D???????	?Q?\:
CR?????Kn???-k?9???m#XS???'????fY?*f?[?????? ??Z??	P?U;??-@??????7vH???8????
????ZR/?1??6???)?(?	??1?l?
s?E?\ ??#T 
G?V[?M???H?lc??????`T
?$f?O????"?S?7?#?8c^l?%^?W??7?b[??'???????5?P.~??O.??????cE)&?&7?A??5?Y????C?	? d6u????H>v"$	k?Z9???7!Y1]?|<?
?`??a? n"]?Vq)??V? 9??A<h?????~?
???????!?I?<fr?+q|?%?116??3?m="?|'?s?%?T??h?tI?? .<t??%???:? WG??Dd@?{????j2??????`?_?;&??
?b?%?L
?n?YE}??!&2?t'??Vr?}?(?p*7??"??2?[?|N???:g?|?Ul[????uI?q!x-??R?5?m?v@??DTF? X????2p?
-l???6?d??Hp?p??HZ?????	?oxt;??????????|??,?O?#o? =?pG\?3??l??O???? ??I\?F\??v
'?bT??Ml???{n?5
??r???(!!???
?:?`\>k??V???R?6?3??????'E??oO????,`4????r??K)
y?????A??<
R??????????K?????1l'l?y?
??9??
?2?_f
?Qc\????~??q?????C?:#lH?;fI?R?D??S?{!b?Tz????pT?#??
?t?=UTP\_?]9}?W!e????u!!*???`c?:w
?-?=7eI??d??G?*?????U???Y?~&????!???uN??`t?n?????C?V?{??ZH>??
?S?	IjCn?%???+?'???????????\??s???!h??V?????}b?6??6???4??6 at f?W???g|??e??ERe_????	fF?1?
??b?7???z??W??\?
z?C$M???????6 at +?D?7?A??X!?`??T??=?Gf at x?*?l[a??((vN?r???)(%?9PJ????W????c?g?O`=%?

q?????{*P&??Z?&????N^-D?a?3?!???*@?T?;
?!?7	?9?}?????O?c/?H:??cP???'??^??Wym/???(A??
6??Y?K	#a?;??"?z?b1?j??:T?$P+R"lj?S
ac?????t?????
??^
Ao"? ?A?b??*?L?}??????~M ??xA\^%X4???|)??6vn??^'!pk?+???URlq?\?S?..?B{??:<?<@??EP?wA?R??`\c#c?B?????Y?	Qk?>*???????po??NDU8??%`??OZ
???9?????KNo8c??7?1|h??????G
?U?
?dO2????[Y????CJ?? 1???????GBHu????	?l
Gd??????E?????2?????
?%!w2N?Xg_?K??{?t???.6%?!????
?7<?`?]???X?????j???)1??3"????%???B?[F m???
?w???
6????:\gU????'
?ss??,b?U?H??XH??
"???????H0v??- at 9??77?&??MD?$2)?3?b???6????X?`?5Hv???????"?
#?B?&A???T?eH~?CW??Ntu;!Mj??m?m??A|???M0?????k8???1?r????HwI+c?'>??? ey????
??<V1????+?AG??NH?:4?A?}?~
????O_D?W?
o??{EF????>?	?S\??????_'???/?Q?	x???x????!2?#?,?XOM>?[H????&f?????mb$?M?(???_!?w?H?r~)?d?F??????"??|?Ju???"q$!??`v?=?
???]4?
?@|?	4??>'A?? ?M????5o?
??qW??I?z?O?)q?}?]???'\T?@?\gD??R$e@\???gD?+$s??k??`g????"?WFT????"?g??6?<e-?#??r?@???U??H?9Q?V?Q??/??b??
??b???pB??^??w????	`3o??N?]?a??4?3?sB??%H
?K+*????????3;??
??TqQq+g??????LR??U?P?
?W3/
KLi0???K??^ b?#?/H	o;?z??? Hjb8??K?K,b????s??c?	$SW?j>??g?8??@g??O?o6I?un?{?????????4????`???U?	?(?8??R?Y???@9F3j??BxX$#?$??zk?^^4;	I8Z;??d?????Er???!
??q????g??QS?.A?z??A?J0P?2?g$gt??CC???"5?/???!?R"
l#(v??f???bVqBP??G?BNZ????V???????h??:T?V????????SJ??E??@?h??Zh;???W#b
?e????b?xN??XYr?m?H?(g?q??o""6?? A?!5?r'8??M?b]?B<?RY."??Hr?D6?eW7A?#s?v???rj????????/p"?t?????lz?6???wA??P
?)`???&B???t?4??V?R? ??r?]??m?????w at lt?g?`9?p5bH?w??)??T:???	0(%?}?	?!???X?e??`???
??2??8???A??J?:??h!b=?|^
?cZ"??!.?m?Y???QJ:??4????&v??A???I??'?c 6???p??~?r???'?"???	??L?Umq??\@B2?S~T?h1??Z?
?\:?????:?8!l?I?6??5D_&?s?u????.??
??b5' H??U?U?????8!h'?>???b????b??????@???l+??p(?????'x/A#a?Q?"??/?j??t????x`??yq?^ S??
????g????l???
?5?%G?wL"
;?_??q?6???n??" h???!?????e?M96??u???l
%???;???KX?
3~`?????n$ub??pC?M????????=??????]???P????=`?? *5s?(?t?UP]?????
?????vd??c?2??|??????n)/??<x?Xg???+???
?AP\l?p?H?!??:????!XQ<
???KH?8?~?sn??.1_Y?c??
?,???m???B?s
????K?&d+iM??C?""2r??z$??#?C
??ki?????K-?>!?GY?Y????k??????
???d??r?CT?k??o#?GA?????D?Ky??
?=???
cB	R+??g????0W1?????^????W?H??????\m???-~?????B?!e??o??
???b?F????*?"?c?V?bC?}?c??dC??9q???
"???M??*X?{??%??!_tC???Ynb?M??k???"\??I??~f???vA
???.6?G??????A?!??I??U?!?3??%????E???=NH~FG?<??4
?w?Z????7<
?]?m?
SB?<OO?p
????kL?k9w??
???2??9G??
T??u?1=??z???&?
?&?\????????W	???`?>C??~???P?7V[!???c?_`???NzK?d??d*?Za)K??j/??C?9m???YlK#mW~$??????C?R?!:'??!?ls^?92j????W?@?m??Z???7????G
?:Wzp?i?=???^??X??1x?%?????????0??3[?0???KX???C?`/??????H??#??????M?????s??+^m??/0z?64???S2???????????m?H?x??CW?????:?8???o?A???g??`?`?h&???????z???hec?
?3?6??0ac???Q?N???;???rS?	v?n/\?YB}?U?a
???K???!????????H??????dW?t???
-?TdLo?x`?G
mL???f ??S!q????R?q"#<??_L?.??FV????.?:?u??x?6
?=?????????7?1P_
?C?r?9\????DF???l????ox????(
q?/e"???rO#GAj??
 ??9??E??Ed?G&?!7
?	x???QP??f?:'r6?%?
.. ??C1?]Rv?_4
????!?	6T?V?7<
?=?k@?1
A?_??zX?
?}?N??????=?
`?H??H??????????QP?~????c/?,nX???????ChN?5?C?u???c/???n?m???e??api?j?B??/?e?u??!>@???)???V?["4?N?1f???r?0???r?,?*
?????????W??Z??)#@???.@=R9?d????\
??'@???S?
?7??ddd@?s'????/A??
?????x?????7<
b???"?a[??a?p$_??"v????<????9Am?5?????????
AI?Q????u??B???@????Tq
(?P???2_7?*r?!c*"??O;@?????R?p?-?[l??V??4????Gu?37h??A??V.?y???????W?j}?x??H??m+???mR?N@??|Hu#??p?hc?)???H???
??k*??1`.?)?
	f?|?N?@>?2`??S?40*!??=?v?? ?8????	-c7SK??ER?u????^}8'#;$?N/6~????/?b[???,?E???8?2?s?????Xg?? ?[.??????y?Rd+yJ
??u?O????~????@?c????????n
(????8?OA;? [?]y4???
?????
	???UJ?O
F;???-
??zG9S??Cv??/d4?R?#?'??V?7<
?=?#l"Jt
\g??K????:4I???.?S??<?uFP??A?e6$?CC?`,[????%??
??bg?? P?????	?&?P?x?
?WAP?????OAj?Ue???^??w?3?????QP??DoY????U??*?m
?%<p
%p,|??m/O"????k.b@?F?\??*??\3?lG???#
??QY?)?{?????????{???????QP????
?}?AD?U??;?t??@??z$?vM????????GA???Ax?8vB?8?R|:?:W\???((?Y??5*??:?7F??DSq?DWV???
??T??
"1??????h?4Dw??ZG%k33??:u???v?????@?I??h{???????7???o??~?N??k;]"b????????????iC?a?'6?)?c?????HB???	?/?m??\)?? WL	?Q:p??
j/8?"4j?vv??bA??!#?h;??2?S????
>
7?E ????????? ?C\}~-?`]6??!???p
??????(???$??9?Ci?&?,|??E?????A??????$?/??ui?&?????v???!??????G0H??s?GF??EnZ?[:.???????;???}R??? ??aQ???3u???J`?O?
?0?Lp????U??*f??????b?,??g?x?????`?es?(?? zw?Yd?28`??)??)E^???-B?h?a"p????j[?
	u
YrH??-?
?r?F?9$??N??!n1??`??T?Ip???63y?<w<????I??A>?\%????
r?w????AP???AL????4L?<VDsF???J?`?u??)?W??eq"????l??:i??Q?1`g#???`971????v?6?`.x?????y??WyB]
P??9????@??.y?S?Wu	o???~
i?#Am#` E_"?,???('?',??
_?
?u
l??J?IB?%?c#?Y???????u???{?x{??????/<w<???!q<3a|???[yM`??K?1?T??_?n5????2#l????`??v@?Y~2?[lVMp???{7ds{?%)?l????`$DJ?M??1?XW?M???eQN	??#??o??9j??1?y2:??@9???,X]??????Y?q????Kdh??p???????AP???????$?i?I??lD6??A m~0<p<??????I:m?FlR???=??????)?x$?? )?rI?]?=??C??^???vu??!??????????
@??(?????S?A$?
??9?XN?'?+
?r????<v?
??"[V??^c??u@?????s???I?,_?????
- mz0lb?B;?/? ??q??U?????
?cn 6?U0?EdD ???s?w?v????>Bs?$?Q??D?s?!?P?@?>?X?68?????h??W?6
z??uH???!.?O<6??? ????p8H?;3???oA????p+?F?E??`dC??]??]0???7??u?	?VJq??K???(????0?sW??r?L?z????W_(?dRo?
k#? rA!???\?)v???"??q??'????V?
Qn??Gd]?5??@?zHX?'`4????
?[B2??zl?{	DyQ???
???m???8b?l6?l?????:?f?-??;?.?#?I?;??.!?W?6?$??5???????@4?PdD#??[???B???k?r`L2?;2vu??.2""
?8Z??????kn*7??R?]????4oS???=?=?%?L???F????w??\
?$?7?!Y??x????=??/h??@FB????O/?R?????T?c =???;8?m?@????,?d@??z??x?????`????????p1??w??:4xJ?Cw???`??`'?G?1{??T
?.??F<r????^{??
<&???\s?
|??F?w?~$?/T??4!8?/d???D?qmf??mpWo?Ds?*??uH??:?o?:SmK??#?)??Y????V8?v!u6v?5?a??|
$(???b?``??q?J???1?(R????? ????,?)?v@]?*(v?	?A[?e???$?e??E?PUV at l?N
?
u
?a?F?:lD;c?H?a????C???}??
??!Cp?r???7B?l????????7??@??s<?G?r{??????
???+gv
?6??}??.??8?!??
?;??l)?Y?a#?usB
?&?s????}?%fN?;U?G?U?a??<???;!??*????K???l?	?:?,??o??*R?.???w???#5R??7???2X?2R?\0?%????c??`@Y???&\??????;?`?#??'5uH 0=?c?H?Y??????WA????~?dQN at Y?3?O?????Kq?9#?uh?
???nq?????'?F??@????I??E???
??p?H???&?3
C?L????M
???r??^w?`??_6????v???6?x?????6??`lJ$???5F*?uRl??A0ZC?N??? C?]??;?r?)>@I?G,?C?J?t???????
t??r???,|hxK?v????????S??bm??`??g???,X0CR?.?WP???L??
f??
dW;??9??p?C.^
?6E?Sb??????????`0??bI]}J?KYP???>??? 7??R??????L?????????|D???>%???K??5???8Q?u??GC???k? ?	????;0?
?6
?pE???B/??B?;~??\???#?rjp?V????6??X?????:?+?}?0????Y??NM?
~%?s??????		q???J1
??^W?hYs+$??3?hk?g????-??:$vxJ?CX????;?@o?`??N??DD???<p??WT?????6?B???n|??l????	1i??l]2?oy?($Q??_??lJ?R/?????l??????^????I?{?@9?T??!v?}+?^Dt))ls?m??{??4X??@?[???5????>3 
?r??
?^?L???.???d??~5?`mlp
?!?;???+ at 8?~?z5(??????x??_kL???\`4????sY7vM|
??.`?(??N"????X%?? ???`?8$??qm??sv??????H?M????SR??	?"?L?1?F???/@??o??]???=???	??6?b%?
??b??h???j?E2?U$?+????%#??m/"?!??H?????h??	Y1????S<u{????~
????:??????U??9??x???>?5??!u.?S?k	?#v?;	?\?????? 6?A??o8?,??
?$?f
??
?0$?9?????`??TgV=6?z0D5???????
????Vj??h	?da???`?^?[??MB??9??rt???n;q?tw??"??q????_?fP??np?"?=eQN
?A?"????`????H?_T?????:1s?
z?8???u???$3???,??a????*?>?r??
b?????"??? m?H????P?l?v%?5+PN`]@???
x??	jG
zKI?5@?4??cM(?? ??!??V?L???i?(??
d??
y???nx@?Hc??g(????@&I????lM4?&iP?????????????<mMj??75??vY_9iL?j0!`?^????? lF?T?}?t?Cu]??6q???t?q??????&???+?S!r?
?5??M??? &  R?5??:???I????? ?=y4=?c?"?i?????g???
??I??GO??d??z???M???&A?G
d?q*???o?F=?Y??I2?6?u?F??v at 9	????[L?q?QP???X?????	???w??}0??S??0I???6???l??V??????3??
??"V
?d???&????????`b?oM?,&?P?6?ak"??????M?*???????5???`x????
?1?/	??&?6?!rJk,?.????R?m
?eQN at y
I?35???????????u?\XZd1?$*?.*pc?x?f?`]????gb|Y)]?Y??&?7?@??????A?
-k??9XNM?5?t???U?iU?<(r}??;%nz/?,|?????????%?}?R$mPK;xlMl<??"??q?7v$???&I?0it?????>2?!???Z??
?nG/??/(Yp????"?????"??!z?????O<"P?}??VG2cg2??+????H?_??/%????3z?
K:^??Y?^??@??Q?i??7??I?6g]T?
W?m?????V??_??]?????>o????x5X>DH??
?>2J?[?????w???/6a????r?O? ?6v?
?H?L?~?H?I?a_?;PNb??????eM???????z$??Z??D??
d[??I??""2&?RW\s??D???"HH]?rl??`?#??5?Z??L??M?q?-\?@,N?l3???c?`????H?@?*?g???pK??
????O:?&?c???.??Gd???}D^=
A???
?, [??S??{???????(W??~?q?????
?U?ll?c?Wel???hI#??vK?~???????
?x
l,'m?m????s\L7^?`??????'?J???	?Qpc?xDk
?ywk??0?\?r?3~H??bE`?w?]H?/h6W???W@?lJ?K??o???~??A??\???	???{0??@y
}'??U?
,?x?Q0?
Y?
:?A?m,~? ??f
?????{?+????	}??/?X7???????4l3?a3x?l5H???@D #I?u
??z??G????#??.2?"r??s?????v
? ???'yor??:P??rI?#/?S??a???x?????
5X
??%?&??tS??x??~sS???'PNWAr???E?<&6?d??d??????m???k??| ??S???
ui?????'??
?????u??*7l??7??Mp]?a+8`? ???,X^6B?=??zL??V+?`c??c??????O????????+h?????B?"???t?F 6t?	??x?nz	T?W!k??M?z?d?:G?
@Y?X
?ks??@uT????[???F???uh???Z?????}Aox#Z?????,?
??2.r?1????rm?8?u
r??T^
?A??/?6`?????h?
????EK?+???:??v????g???????7????&d?_
??????????,?h???v?K?{E?(?r??5?rN??
]??????]??h?}?H? ??p?/.2a?@??????'???*}?#????O?8?1
??`R?????_?GQ^??h?e?YD???Ej????P????	???????88?gG??????BHIm?toD?"%T?X???96??T}???2
??E+?}??
 mkC?ac????F0\?!F
Fo?-?\^????????7???@]?l???????zV??=?t?"?c?
?v???5?r??D?6F>????wSSx7??~????M??????CJ????1 N
???<???	?#?#?)?2?WDf?(??h?#"???s?
^???B"?
???M??+???{xO????g?nG???KnBn?/b?Y?8??F??
????|??{]?I?
v8??I^??W??zW???o??8x??:?qJF????~????u??|?S,????r?????G/65??@w??(??u??'h#?????`?I

]??1?#?rK??????. at s??3???+?_|?2??L at T^?(W?2?F0}????????	??	? ????t??|??uId?ri?????%w&?8}b?
b?????n?K???`?#6?cA??
??Xe<!?/??@]^
_??1? ???q?	$?M???V??`?
vY?>?\??m
!!2??&?E?
?Q
????
??Hb?`??@y?r}??????? =????S"?C????????z3ea???CA?'@?9#?.??"???W????_?;???FZ??-??c ??`hq???O???71?	 ?=?#??6?G?i??V???????Aq??	,?
!m?
???n??M`????M?????6??I

???*?."b
1???I?*?F?&?g??z)B?1?????: $?????????
6?	?D^*"WA/7Ru+??P?"5^tG\AF??d?	C8?R?C???e?6!?~?????,???[??	u
?l?????6S?}??F?.??^H0wL?)??.`???Y?s????x?{2D4??.????Q??)E??5?????-?*??^??+?????5???v?gY??v?G?
??????&@l??~
:?????
q?!??K?J?,l??
m>X??RgR?w??5?,?xf??'??-?mK?Kfq$7V9?9L?c???}y&??.
???+??=??k9??[???g!?????
????G?$fk?P^@???????&R?Y?k?,6$Q9??B???????j?8??T??Ew?vrp?9	??4?????F????1?x?$???%?>#????g>?`??????g?????}??c??,%?9?s???? 5????&`Ig???,??,??"??????V~F?????rI?*??`; ?????Q?H?{?Cj??
??1????S|?!?
R??@??H#??????$k?5??????U?4?.???d??V?Yo????C??+
????{??(??8?y'??7
A??u)???H??k?{l?? ?N?c???"Y`?????F???6??????o??????GD??h?????1??@3?
??0p
???t6?,???q-^A?6vK?P?.????'7???5?+?? '??.G
??&`?W??c??v`? l????G?i?'
!V???>(??V?m_??wH?=??%???YdC-?G??-???OK?A<
Yn\8??L`???????@J?&?
?H.???b3X???w?<?E?B??t???.?H??:????)?o	6
??x?lO ???~?Ax?6??O<?c+?vk??~d?l$?.?u#????H???{#??????j,???`??-?F?.???s?"?^K???
65|r????0????:???y?@|?
~&??^!????<??
?D????9?>?eQN
~a??ug?!??q{? ???"1?xi??????~??w??h??????
(g?v??I???????2?i_??E?????\R?????_??\=?????K>?;;???????-is>?`??l??-??????*]??A8?t??E?;
????h#???c??k?;????_
?L????
??\
6?YdJ??I?9!?f?,23??T?sJZ??^??[??l'?"???7BkQN??] ?????e?G?.?	u
??7~0?g1?e??r??s?}K?;?`c??~?L;??fa??????_??)?~?????l>??E{??fCY???????V????,?'?.??"???K?x????
?>?L??x&???????SY?kkx???o??????????b(?,<s?k??b???N??W>2???`???r??OA??[??
?6??Y??????6
???K;??X?	|??`%????)$?	('?&???#\z?
_~??;$?"<"??? =?9???q#@??????????U?.
\
?s????r?
?=??TA?	 e.?D<g?%??
x#?q?????
IMn???d3??
????M	?Y??????????K?
?pU?H?z???P7]?B?6V??sc??9?yB??=a?`????,qu???\?/??f?????	?,b??W?"??????D??X????gL$?O??@E????)"?&???S"???mx??2??g?????#z???~lD???V
??N?rK???F???C?Da8???#???n???Yen6o$m??
????DyL?\??$B#n???
??u
f?????i/"???%? ?:4X
??e??
??Hz"????5?EHF??L?Q<'????.???N?
?@nC???????Q?????|?`<?
x7dh_vC?H8??@
Q?<k??+;???`X?L?SP^	?I??('?.`?F???]?{??C?E?????-?F??\h???x??^?j?_??n?q]???ykM?????? ?1?6?lG?N??)?LRS????6??[??b??$[?v_??????5?|m?+?V
[M`?? ?>V
???(??x??
????@D~??????S??O????]??Y'i?(n??^_9
???!@???????$H?.?~?m????g?????]???V{???????9:?o??b?LA^???????
e
?>S?H??_?JDM!?Jq??????v3????t?G
?>'?~???3~
?a?I??????GY???Q(&_{
)7x???QF7?/L^?&$??y#??2b`?*??6?%??,??
m??
8???t(?aE8f???^&?,"?:?<?;@^??4(y?7?Y??Q??
?	`18??
K????/Q??i?`c?XD?
??gJ??c?}B?W?'???s????O
4L?	zD?????(?????-`	??????te??X??&????w??)?w!???? ??nm???????Z"A?	b????p??9?r?|?)??Ax>$%?=>?i???4 ?|?A?"*????Vf?
???!9-?????????m?Vd?{41g????!???wY:???b??????0 ??!???	?00????K??S?$8:]?5?????K???.??5`~??IP???^?A&z?.????M^
?IH.X?v6?	h?9??d5???%???
r?yG?????zQ??Wb??%)Q?F=?sZ ??????5????????????7??q
??,H?6?A^? q???????h?o? {??w???]???)'?_?6??|_??C??D??_?????KQ<	?b?q??S?`M Vp`l%???1Dl?e?????z
???o`??
??v`???c??]<?@y?*(.?????C?????9"k????
????	`+o
f ? ??P????"u:?D??g?e?:?Y:P????B??Z??w4y?? 4?o;`???`
)???X????(??`?=??h?F2M??aQq??B??&A??M?
??
w{n?I?:??????@?q\?X???Mj?O???7dM=???c_x??O??|$mY???Jqz?9????h0<C??8?
f?N`??D??WUP]?????.??
??f???8??$???p???????@? Di?T{?%?%Sy??~CHO??n?8???+?7AB?o??55??????|9??D??A???*??}?yQ?&???,???)????`M]|?e?????A?N?yQf??e?5?`x?&?z??/???P)]!^? ????o??q???a??????+@?8B?@?@{?????X^mk H??`?X?`?~?}??f?A%v??m?.?@^Aq??5	j???<C??Q?Q???J?????8????N???]????????.?h???}u
`???"j??;??????@????p??????rR1??&???5??????B?Ek???8?S?Y_[x???
4oZ????@?az?A???|O/$?I???'m&?	 ??<\??j??j"	)??P@=??f at M
-?M?jn?$?4\OT0?6????
u???HhtG'#?%
?M/?x~}i??i?f???E??^0??
"(`,e?????=2??u?H6??Q/hPS
ZbL????k???????????????J?#??T??x)?3 ???!????h??]??lR?e[db??? q(|?W?z?F????#??7????? ?7??^?
?b?!F?????`?@???tk????22??AP5gm?`??n??`JT.
???VB?
Y?r??qT;????J at z???~?I?D?	???A^?
q???????4oD9???>?	???P"????m?>????k??r;Z,????orjx??>???<?z??xY?(?(?AquB?@yA???yUq;H??:1\Tn?88????2Bj????%?(y{???????????Uq???????D???x?????)hY"^G"I ?k?RyT??A??? ????|?}k????A
l?
??E^~=F?Y??!?8^?!.],?!??nd9?XT?)!?6??&?
6???g?$UY??????b?g}??8?)
?N?^?__@??	??;???P??
?W]?
G???d??|?xS?a???;??In?B?H>
??/??G],?_f?1h?/????H?K???#B?"?1R???M"??H_
lN5?/>??I
\??@b$?4da?j 
??Q#aL$???M^?|???w>?^????)?G|?Q?$_??`7o??????>)LMd-?1??ZL?C?????,?h?$??? ??<?
??B?Z?????`Y$]"?????>A/
h?
?H??\n
? ??g?T?y??}?A!??K?b#}s!j?? %?o?E!?m?\?????L G
?o??_?r#?A'?V?Hb??J??h8?;??.?H?B????@?? ?o?3"?B?$#??,y?x	#/l?^?R?J>???%????P)?????
$???
8*Yed??%@r?
???"$7??4*M??I2???a?? 4B???yY$K?I?
?^?m??J /I??!n??o????V;?,*??A???]?A??
h???x7???????Acy=???1p10s5??ic:nZ???|?:5WM??&
S??Q????I???5{?\j"L??F?E?d4?????aLC?!)???"?/y?Tp?v???H??
g???hGS???Ib?A-bp?,j??0??P!???????|?????+&????????EM???c >OL?a?A?#5?G??8????a?C/}]J2q
G????S??	?-?????>??T?????z?a?x?"}????i?????????nptHICA~?:??M'R??@^??`?E???? j?`?C??`C?_???
*}E:?Mp????2RsjE?N??#?????O????0I>??X????????????7???t1???]???'h?W?,???H^;b?
??,?b??c$X??W?y?? ???'wC?	{+??D?O?`E??:?
?|???`?N?/_A??}?AI?q????@?????eQIH?????i???`?
??C???Qq??
??
??A?(??"??	?$?9
b????=??I?QfA?@?????(??N.??1
c?
y?L???DM*.]l???IER?e??PR?y?}C???$???8?e?_?@H?\w?t?LGDLd????`? ?i?16??1i???G"??MG}v]{^???
?&?? ?
?n???[?"?[??
??c`:?c 1?!+??`?2b?)?	??d??{"??"Y at dY0???YM??WC????C??????T??
1??????I:1????@????80??L?w?\_xk????+?
b????tH6?3k?2?2#?vG~,?,?A?W^?????nE?pj?S
*?zH????f}??Tg+9?????}<?D
c?E?8?%???*?P?????c??1q,??O?1a??DM?)&?T?1=+?&?u???C?0??20???,~??j?I??>?&?LNd?#?I?$?^???@Yyp?O????
?`. "/?"???&v??'0???y?Vf5????a?2}?e???u:'@l?J<TB\e?_!?c???HT?A? ????,/A???12?"??sp?8?
?6??`??G?g??G*V????*??!?x??(?h?
???4?o? ?????????,?Zp,o
~v<???,??q?G??|,?S?X????w?N
?_?
?oH??????????8???{?
???
?i?,'??A??!?"????!??d$RF????m?j0n
??5?\??s
@X???W???v??&?????H?[???7?n/?

e?
??*???&?Rf???XnNe???	O????&?-R??????k??j?!??,???G??@??gI??.??!HUR?~?&?@?@??????[P??{?????O??RC??Bz???D6;????
??C??a}|???6.??\?-??????~u???ar??O?o?????u???}t??;?{???$?b??6M?g2??????G??
????M?&?? ??~?E??{~H.?Q??
?e	????(?A2?W4~?!XN?? ??8???????)??????E????IP?-??I?' ??3?WP^v&? /v?	???????:?9??v?!????.??27X??@r/??-??7???@??
??+X????
???[:2l??1?vA??G?j????r0???
??n?",?=??!??1?@`??? ??(???HL???????5?]&A?A????@^?
a??.!>=6 Rr??@^??
??7-?????? m??a?????#??
??ea???=??4??????oSQN?)Hb?????????u?JA?:`??0?JI??~??
?N??^W??q?i=??5HK(Xz???2?/??ThV??U?o at J?`.o|.??#?m\
-??????h??????h!??M^??? j?? ~]??_??5????8???
=??U?o?1Z?6A??c8??
??ak?'w4?s??	???????jq???X????????b8?_?X$o?@?x?7f{
??t?	Z<??.??o+Z<???
?C?j??5
??L???%,?&?&=>
??yJ??1?????/?N*??H???Qa'n?2?P?.n? k
;?0?N?2$??
V????q????v?'?'?`lh?


?????
???T{?,? U0?_
? ???:F?
??m`@???(???{1???	?????,??@?
B??+H7p??+@?W???????)2?? ?.`?
g??3????#xvD?7{?h/Xc5h??a3?%?|,??
????Y?????p?	?z?1????6???`y?>K?????g]HF?\$)b? ?a?w!Id{??n*t?????w? 

U??Mp??+?E%2??????Kd?+???S????JD????.{??
?6??nV???8F???=?@?
???????P?
?a~3AXW??V>??f?	?,??{yk?
y?Wg
?A???EB
H>G?????H?c?d?4Rzy'?L?|?)?J??l0??mn?p??h??a?IYr`?$Vd???k?
???E?D?^????U???rLG???x????)2??
?'?ib8?L?W??PN
???u
?v;tE?W ?????*???9?M?,??;????Bw???hB<B? Y????o?
?v?g4y8???r$??c ?qn!?~
???M3??`MMl???,???JM??K?M8??:.????? ?a;?#??P??U#?NM?
l?g
??@?k????c??&?p???6A?????M?l???K??X???d?:?????.?+?A?	('oZ)?v?"?HU\U???????&????z?|??h??????X>DM?????	????]??lEe?^?b??j*?2u?F?h?
????W???????YLs]??v?e????Lx"M?% j$?\?	 ?:?%*??N?7?X?X?'?7??uM?M^j?$??m????????z?????????????9?:9?
?>_dM]>?n]??W???
????G??????OD?wcl???]???}?Q?jBD?!7?,???n-9??D??c?x	?K_9????	?????Qfd?@F+3??!??A`????~dA-{???_?Sp?g0{?b??2?5<y[7!?KW^??m?y???M?l;w
	
??????	$?d|???|=Hu????6AI????vJ????K??(?/N:???*x`?^Ql9X?@?
???EYyp??"|??????????A?I??1edT??5?!h]??_dM*t??+?
:?;W?K
X9?'?`?#???>22??)?y?8P??s??A?o_???B*????w?&
??5!??D?#???v??5#?$?L|n?T??F\?=d?
Z
Dwz8???.?.?????5??@$?p?A?R(AE&??Cp? ????IP\(?N>+???<I????,???????
C??:????????n???M??K?$??>???S*?xs???q?^???0C??/?e!=6,?U}8??#%???`M???G9
R??4??? 
???	???p??h!Z5????G??bh?[4-??Osc2e?&*
j??;?1??D?????P????F??_????M?B at BX)???X??b%???p/f????I@??&]{sb[????S?
?R?
????ya?{H?#??G?I?? ??)1eAr?D?;x/K,Wz?@?F?=*yKl=b?A?2??I?J?`#??????5?=<I]???Aq?mo?0?????B?????X???jy?i?(a#h?c>???|??????+???d#?r0 {R
H??
??3?
??'?9??????
6+4???p	aI}Vb??`??Jz?y`??7??J??U?Tr=Fz:$?0?9$Rzy?????f?$?/???,?Y?kE?
. ?_?
?	'B??'??o?v*?(' c??rrpj 6A??x??E????????,7?+Yt?M??`? ?,?f;????yjZ?U?^?;
oR??k?.???B???df????#xl?P??K(iqh`3??m?a????ap?c?!j
???yE??8?Z?]??~??? H?$?&??????
?E/s4?% ?
???*???1G??@??
?/????@??	yW$?b?Z?%?C?!??^
R?_]@??p?a???v??!??L?w?"Xe???2???>;h"???H???G?$B?j?M??Q|e"e?*? Y?5?A???+Y???????????? j??n??????D?)?!}8?l???7?2?z"wd??
?M?GC?DS7A?????r?
????K?%?N`??:5`?#??<?I5pmp
???H???v?q
?? ?x?3t????c???kEP??a???K	"?I?^??z??5?@?????O?
?3w???
dg?ag I?4x??? ???+`_KBX>????KH?1?z??U0?B?9*)???Q?J?RG???A??w?
98?e??Z???8??7?:????????????Ak??t?e?n????e?(??;???9?
7d?*???&????dO???>/??
?
??c?.?_???L???
?t??zAJ?8?Kv.?`M?S8????}
???(?`?IY1\??}?<DJ????b???`?W7??h?I
\8??XH?i??
??,??CJ.?j``???q??cb?d??o???H?E?d?0?b?? c?J?h?#	??W?FB?????{??i@???=?D?+??A?K?rbF???.(?-?M^xE??gk?R??	?&7?S???
?Iz?C/}???P?;?`?_R?2?4?;<
y?G???.???vY0B???`?C
"b????N*?
2bP?!?q?0\G??4TUN?5? 7?`,?C`??i??
??%{?0??
?4[MD???A7?&???;9x?U9??????
?M?N*??-???da0-*?v?$??!????@?z??+??m?a?	??.?	2X???\S:??i??|???j????m???zA?U!=?$(v_4D??u??@9.???7?D?0??(?????	???A\8A.?
?p~R?K?d??gy>??p&???|B?IPz????C????;XS #/
7?&?!????r?
?j????????a_?????J?
????g???;???-??v?E?B`?p?:?? $??.q?Z????,_
?KmpZ?1??s??|$eY?{??Q*!~?A<???A
??w?H?.??=??|F?g??
?&E???.]l?uR?$????c?5?``*gA?????,8????H???7?5	??7
??5TAn???
?DR??j?~??2??Jq??/?g??????Rm?!???W??U0???!Y6$'&1?.E
*9???L?F??9?????:!?<?Rf at l?Mp???P??z??]'???C?d`"?? ?
>????:5H???=??y?;?vhA??XF#?M$L?hG??$?c??4\
??(Ca`H??,???H??
h??DDhfA?Y?
V
?%??E??=r?BHz??X????z;=@s?T;???nRS?)?h??? ?B??T??0H??
????SB?2|?????;
t?J#??|3?
?@?|???W??5?????	?0?????????????yA???????o0v?G9?8*2????|?1?????:??e
??p?????h?
?meA?;lax?????;
d?????N???&1{??zAI5??4?>6I????z???????*I?6??
??I????N*??K8?K????K?&?????$??????3q???U
?W_?M????????VC??!?8f??i4?X;??? ?y?`??%?H?}?????????;?7???"5?]???????2?&=????
?? ??Y?u5!?-??S j?n? ??^??b#?'A??U!d??7 ?`[DM????D???t?,X?&Xd<	??D???.???_?EJ??*`??!}???
 ~?y+??????Yf????zi????&???j????3@?wsq?
b????4?
?9+??b??`???M?jp???^?+???-?jQ?
F,?,*/
??	b??WP2??
e?
??/2??i??:???(??O?j?????J?a ????^???C??$>F?????+??w??e$?,?HD,??,?H?????:J2"5?v??????y???N*? ??Vr? ?m??P?P?V??6q??WA????\??,?J??n?X(?D???????"?$?21 ??"?)???B;AO;P???T??
e?vw????=H?x?@?????$?G?	??j?`??I|
??Z???$??,?$?B??????F@|??m89?M??|?\l????9???H?????<tW~
??"k?r?/?hP?X????Jb?U??I?H,?1???U?$???8???JD\	??I??%@??7???
?/??-????p??LH?$? M?nv?+N??????A0J???? ??{M=?B?~ff5?pD???}??3?W?&0&$n?????>@?8%@BXOVs???Q?:=&H?` ????pL?|FUiec??	?m???=?????????
?i??	????z??+?n?W`/???1p?W ?v?]?&,"?6.?Q^??5??-7Bz|??S?`w?f???fw,L5?R?Te5?5??a
??????H????I\????%F?#0;??#??)i??

?,D??
t ??7.H?V)??
??^??D???y?z???????#?DJlM]??r\?????e?wE?Y?????k
9?:?? :?@^??)?v?????."? ??WSq?"WCEC=???Z?"??0?|????7?Z???A?*?A??A?71?0cqw??g\??????f?b??????!Xf10?&??``z?????!??????c?3d??(???E???	?O"??? ?c?0?:???_H2?? ?Gx8B??3????A???&d??5!?G??EBb@,?`??E?W ot???%?^x?X?????<??%?
???8HwdF?A???????a?('????B?5??qA(?????[???????	?? /?"?nV? ?bE8ZBz?|??>$}???!??a??9????]?#??Q3R?|D$C?4?m???yQ?
?CY?Qff??}?)}?=HNg????5a?H"?|X)]?-??A;?A??V? N?; 6_d9Q?(_??Jr$OMd???E
Z?w?ci???8?J?|????I$?????v?X
?W????R?j???7C,?P??l-Y??`3?? ?*?????Cu?|?
??N
?????? Q?{i?????k at 9?????;???0 ??"?????D??!??&z??l?_??)?x?e????$;H?k&~?D????G?3??J	???? ????C?&GW?Q??!n???3???????????j3qL??c?????,????Q?????EP??=P^0??|?????h`05i?l0$?E$?
?*j??l5?????tAz4bnp???Q?)R?1C
??mS
?5??<w?{???&???w???@?}?_A=1M???+??<?%??Af??N%??>?j:2Zl?7F?T9?????d????3X?
?%H?6q]eJq??Y?"H??$???oA???5???q??????S??+X8?-?mg? ?>:?zn$S?	 K??Ec???d9

??A????j????&???[v??{?O
Q??W?????pF>q?????s????J&>|????`?H?}4???BG~b?L?&???lj<f?4P?z?zM!?t?w	??????U0?"X@$QH???T??HI???A?y
|?_%q???=?"(N?_??p?BYc??>G?W???`???d??F?i????q??Q??`???w?&A
?r???&L??/???T?y?h?
?W???6A???]P??Ip????+?W??????4????0Y???@??ZM?????x41%51??B??lLJMxazn?Gc?9?
?+?W??n?0}C?a??4I?n7??X?L?????(??O????a??y?n?!#??r??V?@F???
rB???D?	?gN*?Qf??E????Lq?
r{??r4'D?,/????
??[?%?6??.p?	?
?d?"????_A???EHi????"$	G???-???	j?x???????9???????
!8???d??D??	??%???????? /?Bz$??#?	?W??RD?? ?;G
??Q
BS??:0	???=\9v???SP?gk?QH+?V
5??`??wAJ_q?aL??dA??E?6??s[1?;?"??+B?o??q4????h?x)??A??C???
C??a*?I?g????? 	R?d<???!f???}u????RST?0?FIH?A????&>,?8?
?>b?sA??O??I`??@?B??}/K???"j??#%?,DM"?m?\5	F??U?#n`?
?+?Y????*M???Y;U???P? )@M?a?A**??Z?U???3?w?????Ap0H<Iu"`0 ? ??X|?u?,??D???#?8???????IP?0?D????q???Bh?Lb?\#??
*??H???T?,?y"?Yw???~Z?Q???*jP?hR??M??M??EQ?z???>@??J???????X%B?"???E?T???_5
?q???9s?A?)5??t
?D?J????????i)?|??
?L?rt???????*D??
?Yp???vGy????"_??
?W??QHN??"??.6????b?I?N???/Br?$A?
!??y?xa??"{&??/???8???q???8B{>c{?X??????9???*tP??j???
??FHyA??"j?n????C?????GYD=2t??|?QRpp?*XN???WQ?E^??	jN??0??	?d\??]??lA???3
b?*'??T??1A????!uK?!?;=
??e?a"q?b???HI,??S??$q???h|?!??????5??
D?U
??j?="????!?Az?s?o*?%???G?~?%?|?j???g??zA?$h?!y|v???:*??;??,???
? P?J??"=??t4?7?H???w;?)b?M??k????X?O
R@?=??y?m?HO?d?."???c???Q(??7D" ?r?Ah:??N
o@??3Synp??C???/???????????s?p??u???d`l&??h?jp?	???K?-?J
,'????gL???
??J?e???@[???F???r?????S?W???=?
??X>??q?B????]N@???p&SY??`???????t
@?
?[?
[M??;???r??)??@^?????h???*?WT???R?u?????
z^????&A?3?^/?,?X???G4?% ??{????k[?=??6?f???]l
~???
?P`?;?H&#??M???"7?
?\!p/3????~{M`r
???8?????rQ'???
P?~d~O{???V?????k?-`j??O?D??	?M???XH??S,@~p?VBk????$?N
???!?????7????.????4?5?'AF$n?o
?F??????`?????X? ????#j}??8??t0???a?^07??%????8??
??#????f'??0?E0???}?Ruj?
?S?
?q??4?	??_5u?X?2????????@?2p95x?8?Tky?*\??; ?zi??	???????}-?
^@?w?G[????C?7?NS?K !6h? j??
??>??@?)????
(h??????-????iGP|???s?
????^?!Q;E~???+P???^Mb?????????yj?h?? =`?F?????@[<?3?~>???l@?:&??
QN at y
????^??h??????????UL^?,&?/K??&??0??c???HI??d?~YZ?k@??,?`@??????c}	]l
?|?:??Q?&?@?PN
^@?A?O,3????o?5???&?`yA?gAV????>????:^?
?}7 ?`M????L?`?t???C|?5?????i??hbv?5_V?#???_????&?O?W455?|???ov-tmS+??~+?(If??U@???7
?B??#??h?P^@????~?"=??L?<G???_??A??????u????e??^y
??B?m?.q???#??D??????=??&??k??
?$(????
?U???5??O???1?mU?~N?xX?'?yG??"x?v?S?D???c
?o??e??)/
q??/?!?U&?w??#?+??_???|?v?7?u?j??'l?nK at T?dh???#q9E????8?QtYb^?u???t?@?q??7??????xs?&t?z???K
???
?FP9?#N~kr???+?W~?N;?l
v???ZfF????& l????bH?7??D8?s??v7?	h???)/
?????n+?_Z]???kj~?k???:5?8?????r?e|x?%?2?&???3?|??a???w?????1???+?Ah;T?dC???????7??	???o@?Y1^??[@???'
??v$G?u?)??G at yn0???:2V??????n????_???????S?X7?? ?c+?}q???m????D?th?A?:uL/???Y?
??$Hqe?U??,?????f??-????|?&?X??W??QH???9??o?V??[t?
4?+??-???f??c?$??`?^??7??!?????F'???????=H??	??:5?s???7H?{@??<D?
???A?d??????#?s[Si"??<??}?G^?????)??C?????:uL??
1?????
???8???r??x???]O??h?`?????0??Z??1?a??S?O;@@???q?ur?#??"l?*NG??????#h??g4??
????
??q????yD???;?j?*N
?	}??>???????1?Ka????P?
??????-??+Kt???	?
???:???????????g?
????1?;??&??
?c????????9?????S?4?????
?l>"?>??2
<????????s4??M?=?iz???*_MS#??R??t???Z?[46``$]?"??a????K??"??P?X)?o?
?t,?????o
?
6???L
?'h?#?g?HG?????9?A???
?"?
`#?????<%?_?????? ?R{???@?4???q?##?g- ?Ot#???|??E<
?6VF?i??tQ? n"M?C<u!????`?c??	>??A??????_??????B??b?t!}m??w?"?"?/?g????z????f????
??qb?N_??k4y?????@??w
??S?@?,???Hw?	!"?p%\y???????????h???!?N:?fCG?'l?+??????qn???h`??$X?
;T?g'??P:???&?2wqix?U?&D?:>5?	?$?s?"?<a?3%2B??`?
AZY?X?r
?
?"????U?"??U*?c2|>??pg???!d+?My	????s????WS?R??????!
t?e???+??????
`??ld??w~??{4????a?
?o?_??Qhy???S4?z`M!X??_?.??????PS???m[?`?@??	??K
?
?,???-????
?S???n?????	?????r??L
?
?Y??;g?h?j^
w?c??"???????????}>??d??????A?)?|_??,%??W???T????:???I?~????
5
?
??AD????=?????:?$(??c?5	T??p??|?????s????Z?y?o^??CAskr#??5????????m??[??????H`??*=?????J.[???
????fNTl.?
?1?F/?d^JR?????y?57jl??????2u??s?u	CK????C</??d??	?8B?q?(????u????:??
????UE?>???ZX?Z~W??>?o?z?
?
?}?k??0??dDa?? ??????????_???~???
??????????? ????D?I?+??`?
?Dp?	$?_?~,?NQ$	s?????>????????W??E??????k???e5?%??3P?`M NQ????????????????T]?H?x?hm#????V?D?u	-?s?>?p?C????X?A?????
???W?	J??D@??H?PLC?P??c?%8?{???????[s?GE????Eh?N
vU?????|j???S?????:5?5H
N??3?PE{??c,?.????9???2?F??#?u4<??!]o????<???d*l??????j????5	?*??@u??n?W?3?M~j???U!?&?R????+?_,!??1u<5?
??$3?4i_?Z#L?EE??
(G??f??(u}?#b???A???9oyl??
???C????9+???#?~???????|1#??O??98j????_??/??,??5fI_????dP??I?
7??
??hx?$,??6~?(GA^?2?w??]??? ?3o???m/ ~?D ????j?>???c
X?&6 ????Np;Ha?M?'?????D????T????0\???????C*??ME9
??]Q|4??A???w?_???*?S
??A?????l??r$?????????) ???
???A3?8>{?mtQ??\??kj???FI??zJ at 4yBe???h???w\????????Y??q!?*??F?R???`?<#c??#@?o??0??
r7???a\???????b?HY????EE??:uL
o
??F?????]??k?^P???K??`?????z?????
??	Y'????????z?Y???a??????5
????????\???"?kBX?UG?Uf??????@^??r#??????7??&J??]?@M`l?????k???ga9
?"Ti?/(???X?uj??|{????T?H?.@^?:uL???L5???=??xX??k>[V?'{/{/???e?h?5
?5C????????^?*/;??|???j?O+????@:o????<?u?|??Z??jr;??#????n?oyC??~$	???d I0DYS7\mC?????)?
?H?????1???????|?1w
???$???qo0<u???h ?&????MEY?zrSas(??? 	Z??
U(?m??*</X?M`??? ?L??P[S??^'???????,*?????[?&. at w??o?l5?w?N
7??n
??0_.3@@Y???5?D????=?.??*?b??fF?*?g at 6/t???"??}@^?3b??u?U?3?,Q???????rc???P?7l??@?^?6????60??? ??
??????@?:???]??
Hx?C}Y??u?
(G0L?0??????????!z?????f//?b??S??e=Q$?w?s??o?r=^?Sg????e?Zv
??????X?
??S?p`?(GA^p??U????h V-~?IXzs~?
kBt??u?7??}????zB5
qd?DH??	X?A????u???ZbKX?????QS?t??
7???9
g?j??{p????????N?6W?|W?2??@jpr???S,	???V?????p?U/?W?`????U^?x?????g??$???t(GOk,???????????S??s????K~
X?c???
????`??KDM-??S?0???4?u???
??mDH
2q??{?;@u?
????0Eq???u<		?????o?]l*,???Uo??W???"_
Dx??????pyZ?;?AK??S?S?+??[yi?g??I?[??rBB?N@?w?Q
n*?~?	???A??FpY?"t(GP?Yb}m#[~?n>?4?????<??"?_??L*?xS!]yH?~??*??mV?_??@-K???
??
o?:5H@???/>?? b?iN???l?:I*?????
X?(R????:H?2????`l5
?/??E?1c
)Bl?????h??YE^??}XSt ???q?wA????,????!???????5,??P'!??v??E??~????P?Z??
k=G;? ]?0???*?
x ??C???i???`????
?.?
?[s????
??l?EFqj?
??p?q?v
16F?8-ndMAuu?????H???]S?X???Kls?,??2=f???E???+Kp?jm?enxrxU???J??H
??? ????m;l?nK
NT????ME^
???`?Y?R3O?uj???vD'y??(hGr?v_l@?????z??'P? ??)Q??"??<
????
?7?(;*?#|???&^
{?~|??????e???Z??_P^@?D?:?:&????@???????!?
?=???doa0}l?Q???7?_???9?U?UP'
??\???D
k??]?K??
????@/?
??e?^L?-
??
M}[??*?*hC??U?3P??-????>??r??Kq??UC?M??O^e?k??????A>>?\?:	H?
????j
?R-*?+P???8AN,??uQS?`???&
0????????&?/?hA>??9?????;P???PS??N???q?+?C???5???"?:????p?d{?Da?BKT{>?????
{>T?7?
t????oZ(S7?O?c??|?"???M???????)??G^A???D?T???Wv&T??FV???.?E^?hP??J,,?.B]?i?Wqn??Q~-???????4H-??o*?"?	??&??U??3?\????@?u?5?
y?m2?=?-tH??I?^?!>?f??rp??^?"????)?m0?mr?c?^
?5~??????[?
u??3??IXv

?Vf?}r0?R]T?????|?~5I?`}C???oHv??w
g? C??_?????A??]U?hYn??kf???)?
t?N?Z??h?? ?????~??????u???'?5Q????f?M??J???.g???
{I??u48aS?=?
???
??? 	_??rQ???????-?/5
??;??;P?
W?????1??:??f?????!?W?peBx?]?S?.?;???????BO??o?A????????D?3??|?f?^?S?[?-`t??0???A???p!?="r????g3Y?a?????8
????NQ?.???o
?5??z?gB?::??F??NI\
2???hM???q?`x?aP&|?{?v??????
???A(9??|
`C??nx??0??`@?/!c at 4?	?`@??1?O?@-?F??w??6??0L?]v?3`?,K??????????P?? ?tH:
?,??a3?D$WF5????S<??4?
??N
?? ??????;1[(?????Z??f??y?????&??#/
????R?;?&T#?0?1?^?W??/?]?I,?`???G1???x????????E?r???BY?]u0??9?y????'??} ?!???????U???E?=???+???{?Qr?1??0???O??p}\83|J??B??#/????|5?????6??????#??u????"??l?&`????`?????\?x?-eR??g@??7hN)M?M? T???AE^?????@Qa1?EE???vU????/????r?'#?????*?+`?.a????V????\6??V?y5>TD??S@???]?_:?^??]?}??W??|?

??AD?S? ??EE9
4F???:	??VQaw??n???????????z?v@?;??t??"=?bl??|
	/??D???	?q ?v?6:m??1`??*T?????`??^???o??????a4?i4??U?`?O?j?????????F?/?t?>?MZ???N??y????
g?-???h|7??1n??q??(;f4???K0???T'??h??k9?1???k^G?4x4?T??#??u????7?z6??G3?2O???h??D+k4?,???[?????t?????P??h_u?G????G??-ULeos;????O?ay????z????w??h?X?A??
???J?Q?????????W?r?
?_M1 ???(H?=]??#n?%?c???G??ngo??$?>?E???p?|?????
S????8$??
??S?z??????
????^??	(G??Y??3??c????>"?i???k!c???b?????i??
?22=?!>????i0D???zH??g
?f??x|ap???
?X?K???.?j'?????s<?P_0X[???r????t?? ?
??>??{?9??AT??e0<RY"0????M T???A??O2D???gy????????<>+?n?yi?7? ??g'?N??m??????"??FiXKz??v??Q?|Xj?l`?X???'i4??>cxJ7????????=?jZJ$B'3???X?H_?u?c
j[?Z?;
a??? >,0?}
???s?????x1h?
y???o???+??yWQf?&!??/?
o4??QzG?e??^???"l?x?kY? ??zB?????L??S?? ?>???
?@>???[??|??????^??kGY?=?y#??Iv?????avlB&?[?
??TX?R
?V>T????(?1J6XC,uXo??@?(???"?@???.????,???%$BkA#?? ???@?Dp?	?????2T??e?'5
ezVN??]?
U*Z??h`????mi?$????	??x?
?z7m?lU?M<?T??+?`o??5??
?S?e??????bh????|r?"H??|?YE?`??Z?s^Pf?L???c3??b???V@^????,?nK??????????h`???)`>??^E?$??'???d?>???g?T???????????"?N???????WA???_????"o at 9?-?o`?z?????[~8xQ?*?? 9?e?OM*\?E???b?M??EXr???q?????5I<^???T<J"???mj@??????o_?M?+?S?????o?w??nK????m?!QO???
?c?x8??`?3C<??j
??H???|?]??	???'???E??z????r?f%??/?????K?????cf?????s$?????)`M???6J???0?7 ?`??(G$
 I??????A?O=D!???aV?
?	???7H?>????5?>?&????g\????u?+?_??????;??-H??????k?G???~-?????,!?p????V
A??)??????w?=|???j?uSa???+
6^?e?DM?`?	?V|?*? X??h??.???q???x#c????k?>?\5?Ag&Fr c=??I???c	???_%? nj?$????+?+Y8??,?H?????	????????
4??#:?)?F??G ?o?:Et??+H?M??&?FpW????\*???n?n?
?H?~?
?????0?;n
CL??5?l6@??? NB??
?]???? ,)??,?	)w?-??DMHs?=b?0???'????E?b??=????F???I:?????5?0?Q?G?H?p
?D?P;?j???+???v???,B?X????? ???$0?~5?:?/??AP[?????"?@??#"?Fi1?)H??????l?>?
2?q?1?%??F?y??g?@s???lQ????_???Y?(N?2	/=?]??t?????&???-??5??
Y'?!??qM?0uq?
?
]?`!??S???<R?8??HL???+?oq???.??????"?{5C?s9?5!????1[.D??]???]
?YL?U??C8?k??Qbh{?	o????`c ??Y?-`^?I?????
7????
9Q?[qfg??
rX?Ad??????r?v???$2Da??	`??Hu?T7D1.?'D??	????3?? ?y?+ ?????.?kM?????[*?
?}??^???hBl???*?VhC???T26???????U?f???D??>????u?xrL*???ZN!?"???????rX?????f|1?}???H?B?\S??????W??D?!???I??n??????D`?|H??Ck(?????:?G??N@?/?,??????f/?g??XG,?16?~4E&>??????(A?G??????H?_???;?-?=?z??u??D?8!q?_??k?{??A`g\??????)8?O??!?WP???f?? ??/????e??????y?6\?|??s?~?\??????zA?{?y?%??
n??T???A2?n"Y7?b=
!???>{?0?SXb=???x?9?L????????=5h????A?
??A4???(c=?V4D?????=1????P?=
2???U??A?	3^??-???
??????? s???<?????/+???9o
??	?w?J[????O"??,K?g ??K??M"????|??u?!???I???B?1l*U??/4?L??.???????
=d2??&??%?2,;?@^???NwS?S?{??5?=?%jtg????&?????"??iH#e?bQ!s??H*?P?>I??!?e*;?NO
?@^A?U?7??{?P?.?N?S?p?k????`??4?Y$G{??hg2?????h?????T????P???D]?&?]6?$e???
Dc?R?,?@@0 G?'??zf~?l?!??."i???>?p??
>Q???c?L???D??x??m?P?!?\|
??eY??!L5????'P]6??k????????T]????@^?E?U???_?????A)???>?a?B?Q9z?/G)??i?o9n

~?p?&	.?Ar?????I?E?-?q?
??X???D?t?1I{?fA??,?A???8????pgDt?}???5K?	?Z??'?A?|?????
?k??p?p??z??"?@??????Q?C??
??\;??0?O???^?1.????T??H??.??^?oM\{????
????&???
?l?
???D?:-B??Dib?% ?(??(G0?`?l?Gv??ZB?>?X??1bk??1????(?a?EC???D?x???>?????r|??&r0????T?????x???fA?eRa??U?Q"???l@???`??o??pr>????.8??????ME^p,L?T?)`p?'????7 ? ?!????1??]?A???U?4???k/??Q"O?"???N ??7x
????W?A?????h?F?/<2&??`???m????R??&n?,? M?????@?I?,?,A?un~9h???t???v?#p??p??Q"hnx:z6 ?)? |?"j
"$?O=H?lD?????x??u?#???{T$I?<????_???t0?8<^T??5 ~?a??3??N*?
??:n?^??5I??.#Bk???m????Q?%
?????)?C????i????????&???4?X???i?k?V?????o^?????N???U?_?
??????
. at 9?=z??????1?P? ???t???H?????m?`
?]f???&D????W??Q'????7??????????|???V????????`?}?6??!p????&?9??[0????&?*?"?xk??????N
 ??8p/}?{I???????~???5??w
??)???????T??4+?=??&?n???3?m<?"B]???ORb??:??%o@^???j??B?*?(?cX?
;??^??s?3?g?g}???Pf?tyk??m???_???v????xQP???
d?L?
?`t???eW?
?h?3?H??????o?}???Z??
KPcd?????????????
??NS??[??a#D?ry?wZA2yf??7A?,???uj???????I??u0?A??j?1??y,sWj??@?u???(s?r??!C>n2?(R?%?o?? j
????
?	?.?W?x?iB?3??q@???9=?P??`4D?? ??!I?!F??"??0l?j0?pYt?<?8???|??D5???o???x??g?h?}????2#Czv??EE^
K???j????X
?,?????U
??k????VK????rm????[???5????{}LuCpO?;C?
???d;??X????uq?=I?1??e??Q??C?^>Eax
Q??) ???6
/
/?????f???K?Z3??c??????,????**b0m?O??U-?MQ?????
?]{MQ??Aj?!z??YY??e?C?"??jj?5[@2yG?????dh?????
?R??? "X??
?????_B???????W?@^?P???`???????B???y??5?j????`3'P?????F?Y??d??rH?P??hv?(??????@?I~1????1!?D3l8z_??B#??+aR-?{9 ? ?C?C7????g????"BMH?????????@??w?????b[[??B?F(?S
?zD???Am??o???|
?&??<"|??f?????s!B?7??~?@?0????p'??/
?Q?(??????.>?n=y?yD???)D???B?????[?;.`M
i
_??p?@?#B?J???-
IzL????y????h4??mb????G?l??k? ??-+r??? XS???????)?%`?:K??	???K"N??WP?[??18?ez#??6?~?1?pj182??8?5!??#?????]?A??
???C? C]G?5?iI"??$?c? ?u???Q?%d_
?C??Yb{G.C? BF?,??Y?:
B)d??}??*???d?? Z?0(?
?u?vc???~	8?kB????;d$[????
??
?
??;??{4^?C??i?,-$??HX?CmL??A??~?
???(%??&<??p4????b????????!?????0?XC??9??j?:???$??/?+??EQ??M?F?????sC?n??_
?(??K7?eBx?
????
2?j?????Z??m?	H ????????p???????????1?_k_"?]?@??'Pf??25??1jC?Z?????'_??? ? ???!?6l?a?????:?7?=8??V!X'?;<
y?x
-7?,??`????5??$??l???9?$???<???neD?? I?'?? h??,cd?Xn?
3
????j???}????????@9?yH?/4Pv?#??????+4r?!??0?A??????1d4%??????#?1?@???g??\????R????/?7?A?i??B???_???EYI??????<?????4???? jQ?&???<4???&?D??K???H??T]yh+?
???yCD????	?N o???I;?*L>??I??T???-?M?e????'oz??*???"?
X???s???
q?@uY??????D???[Z?C???Hh???a?j??)?Y?d???3????=?&C????dh??5?1???LY
???(?n?M?}?PV????
?h?)??8?!????b???? ?XN*?
h%^??(?NA????/???$PH?P?W?RY??????/
4yT??(`?6
H4??????????|?Hs?y??bm?x??aVQ?????????|t?M?v?`3mYGpC????clxj?JP?b?u??
?$????????W???5uq?Q#?0?.b?[???Y?^?
??F?)?'????M?cs@??{????`??A>???e?PW? t?C??HQ<6??3??i+}u?gLK??a_bD??
?*D(???U????????3hPV?c???r??6
???8?7}???	?_????y???)?davC)s?pZb???/?1?S1?v?
d??????M??n?
??2?]????Ey5:??????7F?{??i???(????F????jQx
?/O
???
?@%???qQ???,?????	F?	l?~?Y,?&.@???/*?W????A?i?@??Q;?O??{Z[???Y???3??	V?/m??F??????o?/FYJ)"8?c?V0n
?T?j*?ykp4?????yjR_4?2???@?Lvv????%o??8?"?W?Z?3hW.?F????V??N?s??u?/??c???????z?vuCb??(,S???Gu??f????I/??.????X??O???DM?;;?e????(??|l???uj?
??????9???M?
?h?)?f????6}?d??6z|WK???%??A(???-L5?#???aH??On`x+s???[~o&?g)?6AA??d????+~Y:d??b?`?L?m?F#?a???f????<6s)???M?????M?i0?Lq?O?5????sL???{4???R?{4qP0!?>?P?-`M??[?????o?E????F?????????,<0??*8?5?????????:Y?2?`?]?$?`??????xj?????N?	?? ?2????Fa?3?a???ZI??N?C?a??/??u?
?????u2??T????:?????.??&??fCYYSLbO*j0???B?eVQ?????@?Et?? id?j???=`?@?j??rzW|????;_$n?UP?@?>9?????{^?T?
]?U?t	m??j??=4???,?{???
???K???k????O(??
$ o???????E???A?gQ??6Dp		??x/??UE???+h?u?xl?
??=??????
??w????g?_?y"??
0~???-dM]?
?Hu???`?
??!??0?.?5:S????\?`???,???G??YP???"?
N@?^???e?`!????_???"?o??w??????wB??	[u?(??z?a????d????c ?}????;?P??K??W@
?`???0?t?
6U?:uL
I[&???P#?g>??? ???)`?PS?@???2"4K?jNx?DM????[@?????oM"???Ui
??
$KVs??l??(?

??3?
*?N??[?%??"?TXz!-I2??????(S??6?	??`/{?Y?U?O at 9?ym??:uL?N?1?YB??-??Pa??
+L?>??,??& dbn?/*?	0???J?4I??P?&?
.
????6????TS??k?
L?>???C?7 _????3P??M??+Xf??
c????
??
??,??k?X	?????=X?v?'(???h	{cd@??I??{?h??"???,A???&D?????H???????u??????k@???zt?U?U?wC?????tH????C#?dt?Z^???(???G??2?2b?[B???=?G?=???ro? v0???
i??q'???2??????
????!???
???L????3?v?@pa???|a????`?"@?='2k?
gp?u???-+???@?a??{?_@??eX*-'??V??,???g?????????/},??$??_@?YS?e??????"???S?_
~6?}?7????A??S?$'DC????hS?AR?7RS w??)??$tec?
?
?@????	????;z??F???O^U?`?rq???e?|
???p<:,??`??&.?????"??????'??kM????
?E^?mi5q?&`M ?~??????
.<?.???B??*??:????6t????^??[????????NE^?Z?{????Pa?f~?Z??_b??M?@?x????<mD???????I??.4?}S??C?FJC*?3??vy???1?Qx?q???????v~???B??????????, ?@Zt9A??p???*({e:?Z??G	???&?????CZ?QR?3`?5EA?o*?A`a????
??????-???/A?4f?^?ch?0 ?????????}??{? k?!??[M?Ei???E?\?^E???I????W??|?z??{????/??`?Q?12??'@???@?uhl??????g*?,?|p??(?"???!{T?????? BTMD?$?=5?1???IP'????`]6?	u8??h??'???
?)????n?IX?@?-?+?z??
?????v6?2????Wod?"o at 9?vn"j[V$?N
?=??+Pfa???]?
7d?
mP??F?s??/??[?
h?<*??????-PwY???\^<???u?@?q??%o
?b?????rJQ?&)?
[H???y??i??A????;??o{?l??W?]???????o????'??aQa'??2hH?????x????0%??h,???L at 9?6	%??????+??vq?:uL?5?P?jF
??
H?7)$????????-?k
?PW?Q"t??I0?(?? ,
?B??(?/?7?x??,3X???>?<?Zjd????u?$??+H5?(2a?N`?cf%??p?h?v????GK??A?F??b6p?WAM
|7J? ??``U??$?&J??.??D??W??G?K???	???????F?` ?i?M?? ? b???+??F?????}???7?7????e??\?$?cDM?~01Q?9????w????X(?????????
=SL?=??9???4on????WAMg[_`y???i[
R?P?)??PM??q???'???	?P
:Pm??oe??_"A:????nxH?h??hPX???}??/ch????q???"_6l?????IZ?*k??Z??}kp?
??D??????\Z'?]?e0??o3#????<6|???o???)??w?????"<?]O,?3?7????@??e?????q??
?:????????$????*e,?;?h????k?)??,8x0?]
??r68u<u??b/;??f
?i
???"????19??;Ip??1???2??
OP&?J??????_|?b?e?	l?????
?H?2a???EQQ????,dY?ayjW|??#?YM??F?s??.?R9 ?]g? i?(?
i5???l5QMR?k"??????????%#|j0?UHe?????;?T??A?&?[&?^?	|?
??(?,??	Ac>?[^???p???P??I at h?=?@????L@???????]?
1`9 4#H?A??	}\??????gM?[r!6uQ#c0??C????l/?a%]?DW??n?|?	??liA2?N8
???IE??$?n]?:5??????e????+P??Q????Y??d????[P?T?SU??	?mg ?l?M\
???yUa/??z?]X????Pv??K?n??w????7????t?ID,D;2????b/?P`???@?.??(?
?K@???"=??:??0Wdp???m?[E????????O???5
?{~?L|?i4?1??Q?*???"?????y???G0????U??S?W ??Y A?R|??????b?/?????JDy??E?\?l5?`?M?????
???????R?;????u???kJ?v??+??]???P???T??7P+
?D"?
14???@j?;9I`O??!b?
?0????70f9??+?7!#?k`p?58:???????P>?'`E?0?`?
??????w?&??iN76\!????a'??????"?????7I??%??n{?`U2?V?]??r
??$ql>??@u;????V???O????-?y
?^?,?t?*>??h3??S?????? H????B?n&???"j
HM?C==???#j??`)7MB?E??)??q=?IE?B_?
????
<??-???jkY?b0t??z??????w?+h?v??/?w??z???$?6???	lc at J?'?+ at U^??ou_??4??

?g????7Y?'C?-??H?1???? ????tAo}Ou8?/??I
:?g?1?[&??G[?9 #/7???i%????P??I!??_A;?????!H?Av??&"de?=??ql?1??1=?f?&?a???j??`????????9?v????????????p
?????????d2??5?a???c?????d?0?e?O?l=C?XBHF?)6?2C*??bi????(?cn???y?-|?D??m???u?R???@:??:?T?_?:?mD????+H?2???4A#??\G?,?8?????9l*l??*?	?[?2????K??>#??&?w?|V?????????
?*?"??&????6??M??G??
??7_??:S??+ l!?Y? ??zDhYK`??
???[?w;?%?$?????!?Cz???O??J??W?k?or?U???.?7855???????
??`?B??=?m3?W?N?<?????j{???$+@M@^5l[BU?????????/?????????????h*l:
?P??7:z?6???v?Q????v?L??B
??????K?%??A?M{??|?w*????ly&?B?V??|?v????vH?MB??,???
(??ym??J7.`M ???????o>?gl?fM*?_?????????3`???o@????~
T?=l$/O
?
<???&??EPf?&?.???
??c???

H?????_?X?W/???[[?gw?????k?\???Z/1?	?#?\??P??*?7 }??@???m??
???
????@9?????W5??????1??
?k\)?????=8??%??????.?
e???+X?:?`??M?lq?
??-K?`:??+??????@??o?????&??)???
?wWe??%d?H?ID?????h?????,???^?0???
?)>??T
D??????????$??C?A?
?'H?O^"?/@;#m~0?4J?????
?_??&W???????_??????"??s&?N??"?~??(??V^<"?o??????K???j?G?????pi????*T??
??=???`???BR??$d?}WQ?*?D{?Q??d?'????$?&? ;N
?/????
?u??????}XA??K@?K$D?K>?
[????U	]?%?X?4?
?R?$j??A???Gh??1q?9?=?,`??+????@?se?
????
?? ?? 9J?
???Q"???G?A2_` ???;6t
,?_?
??o??u?U?]??$??????WE??r
A?t?B^???+?IS?V??@^??@u[??+???????i(???n????
??AJ??L ?8????
??zG?-
?=???J???F?9?}?!2o??;?g
????????_??S??6???iC??=
?s
&????F{
???&r?	???fy?? /
kB?h???|??m?!
????G?????(3??@'??5??#?C?C?u?[o?J???
??G???(72?+????o??2????A\y??%?'>?=J?????: -1?T????p??^;\???$$Nk??1??OA?o ?S?'$u?j?LBx?a??????
}?r/*???M`????o??U?U`^B??o??5?t?d?
?(?g??^ ????EE^
?w%l V
q?P??@?Y<H???X????;?^?rq
???!h??I??6??
?zD???
8?P??????
?5DM`l??"??8"z[?A??%?Qh?
?@????$??@9???8t???&???u?M	??&??????G? ??cJ????
~
y????A?dM ?(????]P?i??'/k*?|*??W

|???N
??U:??C?.?U???A??p?E?`?> ???%????.$?swZp?	 ,???
{???}	{???k?7????
???l?t?>??{.????W???Siy%8`H???CE?
??
????7y,?? ?/??`??(???@?>??_X:.?=/????Mt?N
v??????????a
??[s???k0?
?!????????
8?x0??M,8
uj?k?
?/?d.??!`zL??SS&??/???[`??? ???????@??I???e??:??%?`=Dr?@>???uBh???Ax??{k??Q?W@/?PG?o??????S??H?+H_??0????? ???'d8?????4?w?j??E?B?????M?{?(?:???U??5??U?????%?]???C??,9?#Wx???F???Vk????hV?U-?T??zQ?
/????	yqo?;?D"
? E??]8???f??T??K?=z?P[&pp[RO*4$??E?!??:V???Gh9"I?NqAM@?V????@?{?+?7??<?w;????9?
(qy?5
?)?p???Tkdt?Z\????_

5
^??????,???vt?}
5u???w???? j
?Wj?{tP???<??"_????????????r???V
I?5?2#?z?R??zk?A? ???88?$???u:$?R?T`c?=?C?6???p?t`?-?C6?"?E?+hCC????|pD0?uR?7{Y?F?$?=??
>?????F??n??QD?:???
|???????9??y?	?e?5E??????N@?v??a?????	{9t<?	????&??2
?:????G9zhnv0??
?6???V??"o?U#??<J??v?}?????rUQN???f}*s?9"????&a9???4?:$??>???^???P??????u??f*\?!????_`? ???{?G????:	K??P???
????W??+aQ??????????
G???X???6~k????Aj?e?18=8???X?
?D?@??1%?u??3??p\??}??EyAz???8?
??QD???a???D?	9(K????P'?j??.I??h=,O
??:5?
?XH????%`p??D??? ??E?E?eU?~???[?d?S??5 ???????????`MM|=?D?2-{??pm?
?C?:5H
??_vs
?I??	?????E??<?('A^?2#,5a?$?|?o?N?@???n+?G?UE??????[???D$n;?M'b?#TL6b?"???/P????c?T??5_????ylm[^U????w???k??p?6%?????????7H;?:?8??H????A??E?gD???L???h0WIb?v<7<
XB???+ ??/
??/D???\?Ih[=@H????A?=O??.*|E?T??
??!?
?>??<?????=;s|???x/???
"_$?"Y ?w??/|???&D??I??????????1#??@???t_`?=??:????(sp????m&??Wb?hc?o?85??
?Z???``V?u?_B?yI???^???????i?D??????G????
?^??&?}&
????????~??*?P??m]J,G??X'	???}I??I2??WA?VBh?	???%<0???\?w?QS?uB???????????ox?@vuRQ?lI????Y????T1I?CP0S?????Ms???Y?U
~~?wO??u????FX?????????x?{a5_??
??"_?????+i?!U?g?]]\
??^ ?H??:5?[M c?_?~? @?fi?????4?4?&j???(0?|?>f??/"!H??
???pL8?????L??E+???5?gy??????,?d?sd'F5CKF?
?<K?I?S???
?z?&]??]?A?2????
????k???R?7?NQ?A??3??"?QuQ?+Q?N?6?Wv?Z&?#???b??+???y?S?4?????_?,?zG?xg4??? ?	?	wD???68>a??>????Gq??Jt(?????}9?y?`?"h????B??U?`??;??9?b??w1???!@>e???????C
?`?6"???<)?4???e?<E94xjYH?D??????>?(,G??8?uj?
[M
???7\z??~l[?
??????,??l?`[???4X? <$??AuS???
???@/?#+???r<4H
6?&???
?A?~?v??????;?????????j???3?????%?????????"?C?Y6?Y?f m>
???z?????y??-{??&?@	a???Q?h???fI?E??F?vT?.?~hK at R%?]?N?>??????!??);:?@?V?>O??D??C?P?j??3W?J?[??/??\?KB????\?O???0?F9H???`(???o?u???r??j??>??p?9??i??Pn?8
ej0??{=??+??Qpj`?)H??2??B?:?b!?YX
kl?DuA?/CM?>4&6C??,?{W??|?S?V??b???j???B??(?	???h?)?PW'????(?[?k?
(O???A?|?R?4_???l@??
?`?)`????`*????7?A>?3?hb?????/?"??<&??kL6R??1&L4-G??:??sD?m????????'?,?Z'0z6??-???Fs??!?{p?i?.t2Ro????r????L?K?5?KC???D
=Z_
??x???H(OW?????G???8Db??S?=9??Qb0?????02?.S?}??f?F?)?????01)4??>?!?}??0d?F?aA<??????????\?y??<??=????igu0?P????a	gc	8?x?Y????\??}V???;`??H?27?
H?r
'????_U?+`??:?>G.?
???p)XS???$q??????YE^? ??$?I???7??v?
2??????l?]?6~?`'S???rD?
??????????{O?hWB(Q????>fi
?m?h/EC?????~
X? 7R?r??@?.?eD?H?1?????J1p
GM????T0p0??8?YD_??,???0a
?U??@*?????????)?C
???J^M"??(3???d?`*?e??87?
??J????:C$
h?
????g?`????w??(h?????T???"??I???d?
X?e?,P?B*k?	?u\??N?ym????;?&P?&?
?IXf ????QSw\H???'?W?,??=?k?,?,l.Wy???
(h?#??????r????AF???c?????A??h	?x???6?????T???2Dp??Q\? ?????????<?a??????q ?C??(????a +Z?h???6????? ?o?'Dw?
A???!??hO?5uy?}???w??9~?x?	`???"?%????6?-?F?]??	????~?(??b????N?/?A65^?wAw?Q?????l??^6?????5??????x[???u-w
??P?????!N?"?AD?????X??	T????P?Ao
f?vD???v??uY?v?OZ???8@<?? ????5!8{d`?"p.?@^?2??'D?

"zM????????Y?? ???
b?????-3XS?%?r?????B??????Q\
W ?/??????h?C??<y??P??????S?Q?HP???L?h]
Q?D j
?c???w ?[' o
?K?
2??	?.?/??V????A]?
?,Og?N ????g!
}??4?:?^? J\R,O???!?????	$5?JM?u*(3`y!jB?.?????i?e[Sdc$eh??@?C??h?G5???5u<?
?97??IE^\??v?
?+?????[S?27q?#@x??????"???Jv???H??M??????!a ml>??H!,??"5;?pAh?2l
ixk????`??@?r
.
?{????/&$???X?@9?6 D?% k???|~????knA{IKC?
y???? ?????r?b???2?'?\?h!'???rpnx??c{G??@?V????y?O}?	?)???z???l??6?
5?a?v? ?3Q8??{????$???Gk??+??x?+?oXc??#?_S??z????o?????!? ????G????	????x?(O[`??K{+?????Qa?KL???H?%???????"_
?
?$?'? ?:?9?6 ? -??s%?????x?	j???0_??3`9!?FwZ?6+L_?S???2E?n
~?#????X?^?#?'??y|G???$6???F?+???????ZS??:uq??t?ewB`????2??
-?.???? ;B???I?_)??<?8?v?i??Or?
?(DM V?n?r?????
|
?55???~?????XT???Z\h??????? W?.i????
G??X??????Y??aj
???~??a??v??
t('Y?y?x	8?k?"&?^!^??x??
?????G%?2?m?????d'?
yU????'5?.8w????;?y???
k
???@^??????;N,9M??`??
?'????:??ID??G???a???S???7r/3?mV?U3?????i?????`?)`?[,x
??I??????;h?~RI??u1e	?N?'??
?\9=?D??@? ??Hm?H?|?????v,
?A???)???(?,??^???
?ZP?*?^?Z????eQa?
?8
???X~M?>?+BGB??vm?F??C???pBvA_???QPW???J?
!??p???p@????%?5???j*???UE~?)_@?R?O
\xp?T????_???d?8x5?w???c???EP?	??U??*?QZ/c?u?
?z???H?y?p{????.~??.P?n?k'???IE?
n*???K?D??>?V<"???+
C?EyR?O
?_?(?}??IX?
-R??!? ? L$?9t???0e?+??8h?????% ){cMu|@"?,&?a????@!G??QA??#?#??XnH?B??
????%??=?BS??vA
<??C=ib?s9?c:1??,$?<!En
?????{@\j?i= ????????N^?|m?5?5?
?W????w?|???&?b?8e at M?H???(?2?K?z?3PN Q?BLB{?T@??i??	?zA??.
??|5?.-?? ??B???a?}
?Yn?S???:?
=odM?r?8?q??}I	W' ?/??	?y?<#|???jB?vD??
@k??]\?6?g??@;
????$????W??X8:?B???	_+??M??(?A21????V'???5??n@????#???w??d????_J???w~?:????j?=`?_??!??????
[
/
6@#??!D???Pr???Hw??0?*w??5#?)J?U??R3?h?1?|????;??>?kon?
t??x~?
?????????FZv"?]?y????fK????Yh?N??:?????M??????!??DA???`C2???'a?Ml
>t???]???pX?&.
?@9?6q??>?4???F\???
???q?5!,k	?~?N???[ ???? ?o7?????0'????????w????|h?9`G?(????????*?
?
[??"??1<H??3?["??6?
???ELI?`??0?A??k??ci??T?~?
?D?e??????vT?)Dpc?1l????0?
??g???]????????????ME^????X{???d????B???ehU?@_	??-??{!????k??
8???yB7?*?????%S??1Mbk?j??(Y\?4????$?r?????\B?!??8??%????r
"?D?S?^w
??N 
K??/
?6????p?M?Wt?P??hy`?	????6Ck??Q2???e??EP'
/V?
???z?S(?A`??PKHG?vl ???|($????4??)?x??;<k!	42t?	91mX??O?
??:?%.
???4}m??@7 &?
?h???k
??#????`y?i?????2????T?SwY???&D?a?"???h?>;?{???#??DX`???xA???(???axz??H?????*??????A?????C\?_G???";?A?????GG<????+B????? A.e??,~???? ?C?T?I???EAZ????6??S^?&?&,???B/?@^?!d_????e#???????~?Wb!?B3 ??B?)???@???????&?@M
?e5??7??)???????
?@?l?M9"lKF?K?Y
???&?"
bp??B?????
????????c
H????Y?	E8?????#?B???J!gl???q?b_?g?y?_O????02??!?b\??UE?
XC?
??;?]???"?1??%??~??P?f?/?E???
???(3565B?-????P???m?y???(G5B4?I??'IN?Tx\p?k?H%???d?
$?

?	t?w???5??^?[?~???]W?:?^}??U???U??
???O?#?????(?I??x???UE^?????j???e
k????
y?)??&g????9.?
??c
?Fv????&-B??IE9	??W???L??Bm????4????????
?????????????E?#u??)u=??	?
?s0q
??;JDt??#??u$?G$=F????A????|
?+???]?]9??G?0?2??D??"??}Y??:$ ??3??('A[??&??Oen??rZ]??c???.?u????6??0??d
?s?|)?Y??
u???|z^???~t?z?"a=!??~?.??	??s?
('?N'?j.??C???S?#x
R?;?z?????	,??e??eR??????=???r?????	??B?+???D?:?Y????????rj??7?%???7 ?/? 
W? ??2?~v ?S????"??X?@??w?V??,?????y???w?????3?DM????dS?W?????p
?v??????7?-{l&??????!?B??	??F??w???? ?1??B???h?
???WuYS?$?|?b?th?L5?????	D??z?!470?{?
@?&?PI:E>??<?A*1??1???/????P?3B??x?UA?0*??	??>??G??8??+?5??,?:f5H?fAf3HZi&?h%??}Cd?&??:???Q?FM?N;`^??D???3?P??".
_?I?G?i????r?b?jD????p_?r???3????P????~????F??a?4$v{=C
???
?W???,?e
??mT
????(@?7??2?s?????G????#??*??????W????$?LM?SY?K?
??
?AC(?v?k??
:??H?N????"??????7yl?HX??w ?@"D?	(w??"???T(?F????#?`?L??$W??hMM\
d?P???&
?M??u*????o?????y/??;A?4?%?&{???&m???O?e??x??9????vj 41?????j????????C??7p_~M67"B"r*Y?A*???!??sM?0?zF8~??$?????po???)?n!7A?A??|^?????z??_
F?o? j
???E????W z?,?????m?D??E9I?	?
??????[0??1??<???'???|	????	1???r)????@??"??A?rZ?R??.???D???8>?(?
jt???
2???[???xh
?0????9S^U?O?!??F????8?I?p?A?(![??LF4??.???d?z0 ??D?^{???3$m??1??i I]??!??c&!??3;t??}????M??????]??I?L6?Num??s? ???
?9?6?]??~n*lg?S??7O0?@????f?X???%9?cE`??Y??P???(??)???D?::&???[?????P0?4??}V??i{??_	?????cs4/C??????
?[??J+???{;D~??????euy?;??K????{?|C??g??
??'i??$8?yp?B?B????K?!?
d????C???u????H];?????????(???h?M????
??N??A?3?^??D"?
??W?@??2&?o?v?"k??Y??[?7???)?!?
/I
?Y??G????7???Eim?H6/???@?K?
??q??[rxo???]P&??`?!?C?uLO??3?=E???=?#.Q??m>:?g??? OB&??SJ?
?eA??"????59????Y?.b?W?
????????e????????#?/`?? ?????f9
Tx
C?????rh?"({?U7\>?0???&?:???
?5?jf??1??=w
X?? V??M???m??b7???%?
R= ?3?9??CMt?aE?=?~?Nd??;??vHQ? N],
[&?:?2?2?	y7(?,A-B?????/?l;?5?8m?
n????mu?r?????fyWQ`??<?*j,-G??e?
???_?*-
????^?r??>a???????????"?
?O????4{??{?Qm??:????@2???6? 
u?p???
?6`	?_l? n5?$??@?4?F ??:q?)?ul?jR?7??W??6 ?`????.({??

?s?^??? #??????o???Er	???? ?a??P??{tb4????'?C??pB???AM
????:L??5	?c??PnHV????e??c?
D????$y"9???2kC?0??dl2??v9?.Aa??]%t?
?mwq?????C?4J???U+`k
lG
h?!mVe
?n??????6,?MPv=?^???,{DM@??????????C?G???8HN?.?z?f?????q1??\"???w?T8L)?=???s?????*?Q?W????mq????????P>?5????5	I\??b=7<?K??1???? ??x<?e
?3??
??W?????~uCp?????G??.???oe Cuj???P?z???(????/?[?(OHw????%3?M5?	t-G
?3?y?4
?
??BR/5u?d{
??|??{?u???????) v???Dn?e8D?BN?l+????A2????e?7!}??b
? ?P"i???Pb??%r??a???K?CmM??=?>??????8?e?b0pQ2p???c[oA!??.?3?????S?\C'??	??G??(?2k4u?^m?3?y

Z???H+
,??Y?K7????e?Rgh?g
???
L?W ???????#?k??'????N*??`?C82??????o?S????????G?Z?;!<?,????!8?kh??0???I?W?????n?
???W%?.?]K? ?(h at 8M9?%@????%?20?C?r???l?3`?I???L???
(G???#??!B8A?? b????.?W`9t?&,{?A?
_?GAD??6`??wCG?	?e??	???[?h?hn?p?_Z?b?9?DsB?	[?>??L?2????$?!????.*?*?&Pg??????"4|<x????@]?l!??
?@????Yh$x?*|w\\?ZD{?,?M
???
Q?
???qSa??^?EIpLj?????sqlM?@w??cM@~	??^??}~aq5	k??M?L?~]?o}????X?A? ?C??@??l???????hP???9Ec?????B?>???0|??M???\????&N;5
v? ?????????
?@??????2D??
A???W?&P'??@^;^A?x-??B???!???X??BBk?Z?? M?o?lpUQfn]\??H(??m??2??U
???,&?????+?cE"7?.?^E^??????~?B????z?-:??,?X??
??-
?)?3>???Y??GO?9`t[z''??O?x4?vD??>

FNBdk???Nv?X?C??B??>VAp?????i+??V3?T?C?y?a?( 7f8??+????8!???u??
????? 5'8?8????0??/?z?@`L_?0M?0x????@`?i?3&Gj?????9??P,f????
,G?????KV?8?????C???????M+?????
?y??p?
???$,;?????@?????x?0??c?FGf?4??"ra?(??=????O?-??k?G??vC??$?????\????C?D=!@??'"?(??@???!?
???I????1?9+@???706??
,3R*k???j??|????
9????8uI?x?0 9Qn<h??????@2R????=?C???+??1BXk????K? ?	??c???c??r??:???>"?@k??????????'???
?6e??8c???|?yQQ>
????hF??;?E??X)Q???$?>K?D?!kj???'g?U???P!^?D???e??&???4????!???c=!?(??c8??5!r???8??B?y
??SE??????????j?/ k9????d?S?@{8? o
?|??.
?6H? 6??nz?????,>o?_l??7X???~`??v?fKS??Y?|???????@:?
O??
"?[????'18?Ho??<?@^??\??
=dMAr\?x\AB?K
?
???%?c@?c???? *;G?????&j?
U?u?W??{?2????3@???=?E??90???(s?k????
?=?/
??C?$?1???!?~m}jx<????6[ ?4qv-X????K?
?}o????9)L`?Y?.???A?@M4???	??V??i??????A?m@?:5H?#?*?G@*????'?'? T??F????,K5?X?&????6 ?`KAX?? s???z2?j>????<r	8?C?:i??wO? ?t?
j??1??iv?`?i??NS@?I?e?/?{
4?+????$N7?&a?u?
?r?"I???v?p	?????@^;^Af_???*6?$?P !@?t(G0???????g??P^?CE^??#?5??Jl??????e??K????B??< ?71?EE^
??Q?d???E?e+,3?~II?1??k?K??@e*qZ V???P???( ?????R?????
	??:Y?iX?????????hz/s?'???>|
a????!??'E??+?Lo?TS??N??@Rz?(?
?_b
X?(/?m7?7????C"????B$?&??\???i?k??~????????-4?_@?u?"!|7C?9 n6? V???S??????@6<$n??&?2	|E???ik
\?????O???#||
??c??Ap47c??? ,
B^^?{6 at M`??$N?T???f ?Z?t???????????,j???6?w;2?X??:u?u<5????@??m??b?
w at 9???v?At???&????a?ix?R?bXS?
H???N
PfY???|?rw\???k5?n?::?
?5"h3%??
%q?+????
CY???|?GF?y
????o?f
?H	[M

m*?????&^???O?r???W ?`?:??o_???????/?????`H?c??@?_]?	?
?#+???1????3?o`Y???
D????A??Q?5?1????
y???eMlN???wv?P?`?A???pG$??_D??$,S????:D(z??
?K?;P?`?:????Si1???	??A?0;????d??#N4?z?N<?U??[@??h???,??q????P'<B??
?bc
D????#????? =??a??G?s?I?^!?%2
28??e?????*??'???????\??!?A???????~8Q? 0/???^~????e?SY????????HR???=???^??zG
???C?!???|,0X???{??L????j?DM?????7??????9?*?,?S???????[?	=??o??????Yi??b
???X?N??? ??????!cK??[???<mW??2?aM@~(??I????b?$b6???C?X?2M???F2???I?????????
?N??N
`?H????r
?vY?^E????,?
?????M
??c?'?EE?
???o?&?h??)`sb?*TQ'?8??7??-??F?X??MC??3??@????
J??:5??ND???O'X?
???{m???'?*????I.e???qS?x????Y<?>??Y^??"op??V~+??S?$,{ ?`???6??N@??(GA?
?h????f?(???$f?)?????A?:5H???A???@???????_????????????????????????o????? ?y?dR/?$???]w?]??z&??N
v
?? 589?(??B??????;?]?f{?????`M.??s????
????c????f?{,dMA???'h????U???P[
@M
?|n?~m??????48???>?ky0R???f??i??t??C??.3??'K9(??G?!?uR?zl??????>??6??z?}6??6????M???5uq????#H0?????????T?????NS???-??????
?l?????p?{???G??h???!???+h?`9"?Rq??j??9????/?n"X?+???{=aGhU????????(G?2A???c}EA?:5H?lv??F"?Ll)
?T?FS???3Pv
?B?m??!???5?+N????p?l???p?u?
??????R&?s
\??
5?
??>?vW??7
??????+?C+???P????[?w?W??-??`9F?nC+?V
??vV?}?????????????????"?6?
????d
????? ?&Ax??S
{???D??E*{:???N
?r?T?]?[???:	TQv*?
???E???7???
m
?A??[ ? ??C
???????.??#`Me?}??!o????$?????k?H????????;?+3z	}hq?YGD?7?W?
?h????????>dM?z???r?}?^??8?o?ipW&?8kB?PS&???r?^?J????f?{|dMQ???S?-A???W?7?r?Eh?W??G?9 ??L??8I??K^M???d}?F9???????[TQ??
?	$5z	????`?&??????Ho
n????*??^! ?
$??
X????T8k??2?(GA>?G????VJZN?????6?????????@??r?????(??L?>?U?G?:???&w%^??||?C?IX?@??n[n?S?C9??9??????	P0??
?:Q???	CL??????o??}?@?O?7???e?HJ!??>????8?B;.?W??M?&???U?k2??B??#?8R?"? ?????]??????????&@6;?:589??w?-~F8?:p???T??&?rhlh@????=?m??P]S????????({???H?7?vkp,:?"x???)??-????tB??c??%??	??)HsM??a?]d??u??Z?[??nW??-z??y?hX??????r.;?????????`??
??$]??9???	${?ur???9
k?(`?A?7;A?@1?jx?oQk??`?
???	???7
C?S??&}Xt(???????:5?v)C????>???d???*jr?]?w??W ?{???t,X?(???
V
ZG?RA?K`O??e?]???????`^?Z' _6??
?F?br???m??$i]H?>?_*?Q??VS?U`??w?@wA?VP?`?.?/??????y?v?ME9
t? ?8uI=r?Fr????|!??? %e?i
??????h?(?CH?VS?x??,?~???N]b
?
??(??}??B?]????|	???=D?C??.?lbte?uLZ??+?gX'As?[{h
?7??"jr??(G
?8???,:e?xV?? Ld??A???\?o
?????^E??*?O????\Fa?j???C??0?
?s7???$???XG?2??
??Uh???
9????2??aqa?5??P???h&[???b??e?l???^?<y?e(/}????v*ZQ????k??Z???Y?
???:uL
=??$NM\????:Cx4dM??uPHw?
X5???<	m?????lf??D#5??/u!H??VZ??sPn??0???~U?W ?O?q^l*?Q???K????!??gQ??oG?L?}?A??*??#K??)M
?
?JZu? 
m???nCD??T0?????$ ?L^)?`?? ????5?H????GA$
?=???????? <??}?"?@?P????Q????YE^?%?5?I????R?+?@|K?E????eV8y??B?X????#?Q?I;??}P?
?	??$???CY?^??Q?H; ???t??
&F??I?
lu`Q??
?????ViE9?l?? ??-?A??sB??IC?MbE??xB???Tp[??A???x?'?T???????c`??`????s5?({!s?*??0???&????L|Hs$?/?i?*K???!?Mc??d]?:?wD?	??-?-?7?????
{m?d9

?>??G?A??#m
?
?E?<?????????
????	?C?h?????????Q'?q?Cs???f?:uL?N?:??C|??yU????+?/`?:?.??????o??(?? ?]?$?????.?S???MEY?Q^???
???
N?P??
??p???N?I??%??/o@??A???<??
???X????) 
=Q??]??.?[^?e??n5!?b????
^
*??|?G???w?=?_ySa??uj?@???s?~??W??Q?|"????????????B4???%?
A???J\???V
?????Pr???ma?!?????????,?uj?
?h ]??
|G
???$??uk!h1?LG??Misg`H??;???-(;?n??:);u?u???}
,D??"?=aG8jL???????J?'???YS?u??@???"1?o?,???????????????B
???V}?IXZ!/?>?P>t???z???"?W???/a???ejp
S?????;o??Qx??~+????*/ys???n?U?x^w?&????;??-??.?@?:??D???B
h~?
%????!c? ?"g	??5?? n??? ???* o`?^???i?f?O???i? ?m}
??*L?|???ZtDM
?k?????????Oc^U???<??%`	;j??Y????????~???
??8?'	????!H??e???
i?A"?U?????w?)H??????]c??
"2??g???.??A?$?
?u??=???7?e??I?I?)q???b? ?LFYS3l???GZ?[?
??/M??????F ??k?(iSw
??x?G?yN?|5???C/D?k?n*???P??"?????l$3?????s,H?L*?* ?/6??????????h???!?u?3?n??>_*l?'97??ZU??@?+c??YE^??3`MQ?$??q?D??a?$?D????
?}*O??m????A94?
??????
?A???2?
?Cm?:5?58y?^As?]?CU??BU?j????~?eA?	????WBA?9??o??EX;D?:?:??n????F??
m
C????@?	??#?%'?=j?\/vv
??Rfy?Yo`/e?+?W?&??v?	?$???Z?@?:uL?????]a??v?????
???8?X?A??!k??z1?-??O??<????n?m?9???k??X?
*??(?N?Vy?2Gc{???p3IO?x?tR?k<o??h? HQ?159??_z?????Y????fAr???????/@+	????@???lS?? ???\T?Q??(??Bl??A
?I?F?U?n?)?_Q?G?;??MY0W???&yK??1??K????z2??}<L?]C??6F
2O??+G???u??
?s???;?????????~??S?I?g?+?
{????wO?>????M?C??l?1?Q?'??G??gk? ?U???r?}?_h???	??tC???K+N?s
h4v??G???7
?
o?s?3????u??al??k}?) 
 u?lV?_?J?????vQu?z???2`?q8A\?
?t?????y????NG??	m?o??????7d?g/??P??22\?Ez????????mr(???~|?s?M?o????
?????AN?7???{???K]??wv??? v<?????
2? ???I^?P.ov
?B??t? N?;?
????O/!ZI??1??M ??%??%?7?D??&	??Q?*??#??y#ZA?zf?6??????$F/????9!?Cn????#H?~_?h?????R?`?>0????K???G?_?!m?????U?mX????DD0M???$A6?{?}o?}???>6#?n}?,	?W~?8?0/~7???`+
G??k??~?#'\???l?q?R????w?(?'6d?E?:jl? z,%D+C?O????wA+@=+!???W?G??H??.$???
?M??M@??q??t8?U?Q?A,?k??h??? 5?Id??P?zi???U???!??#???I0?????3 ????q??v?b??mZ?+j+???6e?S+H???3)???p?O.?x?(??W?,?_?m	??0?"???a?gu?-?*???E?S?p?u8 ????u?J
???Dx
l_?!bc?v?
h??Dq?[{????4???N^
;?|v?:???K
???E???~0?"[??-P?V??w?7r4??/?I(?0????~)~S??SY?")??Lh?PGPm5??z?Sf????W??K?_?&???
xk	e-q???`=???-?`????P???pc??w*????;????N!?z
?????s)?gA\?BD6?.6E?????o?)?=??kg??T?l???? i??A]?;P??????v?k?-4??????pz?e?,"V?9??Q?????????
?^?&
mr?t??J??-o??R?Q
???M>*??Y?;???[
?y?+.??g???????????~k??M ?m?\???>???FY?
??]$????-??k7??6????;P??-?!y[|?Kb?+??`cd+???cr??o?e1?@?????	???X???G?????z????m?o?"?WO???S??@Bw?????p??M??`!U?
????????H?9B2<!?	d;
x ????(dd?lS'	Z?^_U?? ?EW??7?????L5??&?,?????/???o??0?#??@R????K~???
?le?;??? ????? ?
Ar?	?#???CLP??|?CY?;?N????/Xc7
?eU?
"??	??hS???"???z<??V????	?
@??A??*|Q?3?C???t??Dd??)}?N???Z???????*?(P?Bu??WI?qA0??%I????o?I????S????O???
?1??Hd+???fS?U?Y???C[????C??(??'<
?????a|B????}\??6??x??vA?b&!?Kov??t?
????Oh"??g??Au???.|?????F?m???????n3?&G}?^?l?[???zN?1??????$?W??P?<h??	??!??me+?E?(X???F????Az??	???({?{aO
??$bL?V????C??
??s??.>????s????K at T?6
?>?
?]=
??]N?Y?????l?l~?E??>?/????'????g????????cO*??
? G???%???T???>9H?+???H?????@?tj?.z?E??IE=6u???A+Q???m?"????h??????2P?`??2?B??3
?PH??8I`mE@???v?d
bR-A???.:?u??{?w? ??7?M??"?!rG??C???~??Pi?/DrH}?poD?????4?t<t?{??~??0???
?mXF??T?????????
????{??
h?H6b?6???7?ZW?{?????^?8m????$?Z?6B-$6u??
L?#%?xs
7>S	??D?D???~n?????????a_?6u?l?t =2"????+??d3?8<??????{#l?o+?m???{r???????# ???????7Cd????????y?????^?6???& F??!?=e?x??-???l??+e??+2?9
?!
?j?	?????>|?Yh?"}???
???????u(?zD^?n????v?O=?3???)?Q+ at j????`???z?m"?fD?n???R?
 ?>,
???&"a??$?Ry???^adS+???~8??O??`?z????1????1y??A?O??~c?0y?[S?`?G???9^??5???	?}!\U??#?K???8?sNg6?&??)q??Up????xu\?d#9?>W"?
?@=??L?_??V@:`?????0p????????v?.????????M at L?:??z????M???}?1????X?#(???Q(??+Sb?
?U??5?`?AL&??v@??|???|?????Y??k????@?vD0?Yn???:"Z??z???	s?02|	??v at o???f????j??W??A+
???n_e?R+?pWA????u(N??$??P?|=??t?AE+@??YE?}
D???u?EET????]`{?M ad???e??o?
l??? ????nWv??@A?/m"???q{0$Ac@??3%?
?7
???,??z??D(??A??S?M?h??O?!?b?P O?@Ln??????Wl?GA$??v at +???qQQ?@?	z0f?&D|'??????J4??#??
?$?P3?c?Q?????}????f??????mo*?~?
??
?C_??P??H?A?C?	?????G????????I?k.??^%???
h?h%!????N)????R?d?%??Xo[????w??!?K?[???hS?7`?~?l???H, .;n
??f?J???8?_???B?N?>??Q??Y?d3D?????Vz???????_L???N?/dq?-u?UpA???t?g?????$???0??*Qi??yt??
;
???U?3?3~/T;E??tA];?v?G?i????c?db?l?.?O:"Ek;0????L-?$?lwc:@???D??M?g??????7???zXU??5???????^?3?C?W!m?
?a??Z?#db??m???Z
?1BM???*|1
G????@=+*?|??`??x??[=?F??~?E??l?H?????8?6p???JB?9????
??.~???	k???_?6?f???n????[L???
h????m?????U????);?
????dq
?#09????,???l[
9 ?S??@?Dr?Bn???c???Dr???O?EE?p?k6o? ??d?Mm?h?<??#Rt?B??D??M??\U?QP???8?\?SA?$?k!?
Iu?????&?}????+?s?xS?J?????-?t>P
??[??hS?]??S?????????6
,????@?K+@???u?(R??????YE???K???x
???$ ?^???$???#[????B????w2??j???(?fDt?M@????4X@?
???L???7}??`9A?g???{???Q???<	???G??d?R?FD?V??m?I?????+????)?J?O`?/????????.V?????B?t???
XU??}~D?n???*?[?(?P?+[?$o?H??6	?d?1?`???A??????KD??,??_?[?U`; ??){??
/
t?)?
T?Qn??C??F???-?mZ??????qH\'7X?Mv
t??Ss?ne
?ip,'???WC^w??g??%?^??M?Tu?N]?
x<=??
?]?????
?LX?72\????vD???]?#???Humq?Y??k??????.????2]?
?!???3?JBM?}?6?D?&dj????B{*??9aO??S^L	e?W??z?????|?Wy?|z
??G??????zh?0%l??oDr??????
?????????r5ug??B?t+
?N$???]?@???<sDrHl$o?/0{?z}?V@????@?
!?Q
2???d?=H?>/?6u?
?1?b?(a?l'?W??6v?????["$???R???7???;=d??????{???????????Bi#???W??w
????tUQW????%$??k?~??/q?F8???8Zo?2?????)????`???"<o?x?5x#??
K?d?T!Y1??1??$??"c+A?Igx
\U?????	8??$[
#3$?X/x?6DDB??+?D????

??EYx($S???q????? ?????!???$1?T|?B???????P?!I?oM??j@?{g??s??????
 ??Na???-???
tl??7?MB??0l{A?????xV??|	o??:b[??3?6u|Q?/?v8??#L`{?????`y?0X??}?T???T??gX????w?&???? ?u??'D+????W=????S?\(???c???6u?
????O?U?1?_:?v?r?$??????g???Y?"????V

???n?}m??????:?i?Z??)?>t?*??,??W???
?xQ????o^iJ??$?pSQW?*ED?f???t?w??
???????z?p
?4?$???_?
h??JiL?F???9a????G?;@?6
?
>t?K???g5X??0??x?????K?4+????????0?Z??W!?4??gd?.?~
??h???q?h??a&?&???o?g??d?d?_@??nG|?
a?????9??#?4??A??(?Y
??V??wh??
?	??XjL?$m????5? ??S#&?_uZ???d?Y???F U?
??*??'Q?
??]??3??	[b?x??0|
wf??q?????????m??*?7????-??*??\?<?e?k ?`????b"?w?U??#|P?
?S??;v???2?UH?^9??H???
??/?B???X
M9Xz?b???y.??!???>:?A??#??/u
?U???q??O?8???O?.F)?
5?.???c??X???V>?f?gA?Ui???IG?|?@='?W/??}?!Z?#"PCC???9(-Y?????a?c?zM?J6d?????g
??#q??J??+?g?
?*??5??cB;R???#[??b??
A??A????@=y???pE??E!?&?Xd???
???g???'!???C!???]=9????J?l?FJ?_*b??V$<???,?-^???N?x`????????T?Y?90??P?	???@s]?^?'6?o at +?6	?e?BZ??Og;?l?k?=Z#??c`
#???v?%????_T?"S?2?b}G?4???d??D?'
??i+???}?k5???0?i??@??nz?	???+HC]??
!?????"?????	7?????
???0l??6?)?
?o?~??m??N
????E???*???=?
;
??O??P ?W???X??J. ???'???]~j'???m?????(V???????????j|???l?
??^?V:^;|F?O?M?
l?
L?$bS{?	??M??1b?|5
?^???P?`?z?M
p\Ut/~?
?|??????b???7???a'+?????<??;??k?S?'R?v?QaG?bi?AT?y?*E???V
?? ?V??##?????|???????O???m??
??? ????:??G~,H/??????d???H?jfQ_%?t~?]#?C?n;?;|?}?????n?'??3P_A??GzlF>???	??b??I?
?S???A???????`G??E?jCf??1?????R?t???KM~&???w?Q?l?,???)??3??q~ ???|I at ozyP
????;?qm??????
????W??pE?!C&L?h??$???'$?H??
d?1?4?<u\
"???@nu??0A??
?????Xj?????9!???????k?;`?	??E?o???B;?p???W?w`x??V?x???z??????G?Hz&??????M??g?M 9?
?+???Hh???9"????????d?????'??U_???/?,?O????????????????+???H?Ti?{??/??%d?m?Q/? v?0??Q^U??*
?lFr??\??6u?
r??U?o?q??D??????$7????D+[z?N??&????J	??p???`???y`I???l???n????$?????`???x???8?vH???ER]	?k????
Ss???????p?o? ?_D????@?Gd
??p???1?i`I?]?
h?Po|I??????????S?#????i`
???
??=?K?T?Q?#??D?:?:
w]?B`??I(??m???B??????c?m????lB?*??	OG?-*?g[?J???J|?9ax#??L5)?v????'0 U?XyMB??O&g
??ja?8jjZQ??s??@?$?I?
??h??B??$c?
?t??}??	?zX	e???
?gq?#?q?_?????L?N?????bGI?n1??kp
???c?o??M???\So!?a?}????,?LhG?g?x,	????N?Vz+Dv?u????C?.???Q???C?~???f?
?T????k?9?+`??P_9E.6#Z
#$b???A???3"Nd+??R?I?A?????E?n?7H???{N?7P? !m??W0?????`D?p$?+???Eh=b`???<b
0d1?{???F?)??????c?1??%!a????!??1tw???????^???{B???"!??m?W?	=cD???X?????z??????)#"?'?l?m??{?+?K??Fl?6A???
???lS?q^TTm?B?D?2?????@?6	????M?Gm??0pN??.??:D+|??e?%?>ux?&?'\A??6??;I
}v??
;
?????~?,??L?g$vD??Av?
u?!X[??	???l?dj???'? ?SH??-H?????????PA;???b?f?Cn?)????K0M???I?o????/(?)"4?n??Aw 6O?p??ry<oD+H?tr?&?????E?????x'???DO?.?BS???E?????@t?>?
?? z&lAh?????0?2?!???8j?>??QVD`+		?s??????????V?' g?/
?^?
?Ft|W???`??%?=2E??%???a???!???m?P
b?G`????HWDw?????Wh??>?#g???W???:??
o@
??G?SD???_=^???O???o????q?=??????*??????[?e????g?~?WB?.???GG????eSK??%???N?D|??{?4Z????f3k????????J6?????1?pc$=1r#?A?????????9??$?????&.^???
C2??I?&?j? -??u???U???$|
Z>f
&?=M$?JDG.N??G??a?^.E?H6_u?lx?XG?EE=????K?
?o??6????????C?40d??=????s#5???p?#?????
"?ZSM??3|?	1???X????1?v?????@?w??
?????#??SG?c???F?d???u???0L?????????dJj???
'63?????*?\?????A??4V6?{oD??	?o?j?x=0?Z0$q?_G??a?m???p?.????
??1ZR^+	S?}@?29????6?y\???
??7?b????7???@?r3?9$??V?????w???BD??S??m7???J??&???u1??`t?mC??0?? ??6#l??O0??1?
?w?n??9?nmo)gIXoI?????O?!
?b?i)????'???<=R?>??$~???"??_??????B??x????????f????????w?~FP?????????9mX????#?c R^*?K???D+	s?*?n??????a??
?
,	??I???????z
?!???6??!~?n??pH???5l!?:??2?~E!??0???"[I?pp4??????
~
$[?XYlr?r????V
X?W?m????}ZR'N?
)o??`???
??:R?#?O??A?mxU??
?????????z
?H?UI=?S_????,`?eE??P? ???&$y??B`Nw
Mk??*k?????
Oci]3`?b?6???&'nZ???hE??!??z?A?J?V$?????_???????h?W??????w_?MK???l??zy
??nW>6K"?+?!#oU??g??>?"L???????b???v???
???'a@???Gb?Hu:H?AW?}??
???&t??????Q?x$?wD+	?-	??Pd??V0?O`????+`G?^??qu?UF?WG???s??dA~h ?dtC??(??[?zO"??c
???
??1CrD?]'`??!??l??(?cXXW???????%?\(?=?1?v???w?
{[?"?;?8?<q`???e???L??!??&?c
?#??;~?p???2???T??
hEh??@*?W??????N?M^+	#&b?G_h?w??	?%???MI=??????Y?|?"h?0?#??????b=?=?? ????3?G	?/)????1?V?P_????????p2??"?mT??l?+?mT?{/[??&??_BB<??	)?>y^U?AI?;+???u>>
?rR???<?YId8?zw???f%?????E?)]?k^C?????w?;
?s	?K?.?M#??:?
2C??M??????(?????*?w@??m?X/??E^?{??`/??7?
.??h	?R????MN
?g@???/U?M#?_?????
4??m??	???d??U??????`mR???
w??
?.\an?q?[A???	="
"???y?.?n?1? m??b??Op?L???b?F?<d??`;=?g;
????t????A1??e????!F??l~c?h????D??????????Oq;???~?%?Z?

??????
<[2???????????w????YRe2P?go"H	?Z?
?a|WRW????a[(9Z?MI}?4?t?v???&0E?mG???
?c
???6
?$??????S?w%??:?
?n!?Zd??Q_}m!?}????`?n??D?H$??F?b?+??b?	Ex at P/Ac?
,	s???&@!?'?4l7`??85#?4?$l??h??k?9&E?)?g???H5AX&;??
x?d?X????
??
?xn?d??????h??v
?KB6??!??G<2?)?M`zDvT????
??Z
;??J?!?%?W??O\"G????p???%??%???v@??G???o??;
<????q???DoA??e/R?/
??j?????????*????
?;?#E?#??3LL?9??)????w?:#?
?!\??d?V??$?? vv0???C
?= ?????)???z0??x?+q?
?MJ?8??????????HP?	m??b6qm?`r`?8???%??&?7?!?)?
?wp??X???'`F??????.&d?bO^?????9w?
h???7
1?~d?U?B
0????$?>?s?)I?M?OHlB!6oIBF??^?V:~?m??C`{?^????\?N? ????0J???dR
??M???}^?8????>????????????%!?x(
????
x?`????2?m)G"?????S?????1J???#????w u??^?v??????@,?7?Mx???t??/d?7d???!??`X?]\?@?Q??9??,AQ[(?G??M???"T????????????.?zx
?PE>_????aU???z-???:?	UAA?!?	S9???j??a?6????V??.??
?{G?'??t??H??l?w?;?
v?!??H?ZQ?#N	/L?	?P[
?C???3?, ?e????w?
?2?????E????6??3???UIx??d???,q?x?d~^?V???b?}????????zMhG?
[A???G??t%%??
?:??/.H=8
K?z?b?9???
?
????.??w?.?pUbG??????V?^PB\?Q?????D\??7%r?II+*??Z??P?_*?ee??
bm?x?%???x??s??7#1m????????k[??h?????U_;\:???=
lE?M
??(????I????YI?^C?X;??7??w`x???S)i=?
xX??n???z
mS!?????h?:Hk\X???pc?V7
???&??????F?3?UI?V%v?"P]?K?YB
Z	?????????q??U`???;
?j???????B????{?:?;???%??jSD?u??F?????c{^|?x????Q?6
,O?v??8
???????^@??,??? ?G??1?f???????E?6?*???c?9?t"????????t??v@(????6I????'?r@???#sT????q??_nvp?P??
?`[A?.a?lrl?J????t???#h??O?o?
??????a?E????m?P??9??D???????????kj2?!??R_
;?m?C??V@?%v??	?J$7&???ZU(???Y?r?H??2?Qw?W 9<g ?????????X??S!???H????????&???l8a????0 W?P??0Q~$(?g???a????6?7??;5?T??oD?TD?ft?&aG???
)??Uc?|B;`??q?(?w?????dq???#?T??~wQ"??F??
BnD?W????5??Fl??>??K?
?e?D??J\??QG>?J?"?!e???d?DI?w9??5???s? cL????	i
R#?c?*>9?
	?i?-J???????0????????Cd-?6??*?'r<q??-???D;??xv?V???k??>@??$?>?c?
??,??
?mbc?H??H)???%???F?#?B????@~?*??h?3??F???1??h98?ZY??????*!_?k??A????	??l??????3?}e??Z
???z?m??MI?:?^???????.lS??X?f????~k?N??????????f<??
??#5P?61]L?#??
?HqI?????j??\??(?w?;???@?@?i?G?~???^??N?"??7oEV%v?3`{??M??????o!?????????h??S??:?W???????I1???^-?n??ID4d?@??6
?[?;@P?\05"?
?????9?????+1c?e????f??+;n$ql??}?:>?EE??O
?J???
?I?|?(?}?O??T?Y???k,a??P???/?a????6???\J??? p?%?,`u?+`??KB|?G$??-?Ih?:>?v
?^???1	???????P?????Z???t??aYH\?!z??? 
?=0l ?Z?.3???0P??????m?hb?D.??'?????G?#m+????"?[?p9????????JG??~?'??
%???$A?z
<?]@~?Z??&pX???^?a??
????&??@Dj?fVX2F???R#;??@???=?=??g??#??"?y??u?????????^Fr??A?R)?$L?V??
?~??\??/??k@?@???	???????+I"A.L?G??????)?@??A??q??Oz?
?c?
???EF1]??N?9J??D+Id??1F???$?%??S
?@{R?????O??
Pu?`3???l'Djc???Q???n{P[??s?J?#?"[?r?a?M?(?^?`o???$m????G
?D[?!?x.???ZC?????3??[??q~?
????;?a[?4?;9q67v?6r?\???}????e#??_$?p?3D???%??M?<_p???gjL4?M!r???Lk?zN"????Ye60??d{L?
?????C+ ?c?????|!B+
??e+??w%?>@oJ???
?? ??.??p??`/?
?I?(?g??}$hd,?,.`;	?V????A??9`??g???
??/
	?|?_?????G%1`+]?
l?
?u)?==???^z?O??h???X???O?z?Y@??
#???{?
8????P[?	?B
?W'hPT?????'?'???	{???`
`?H??H??
??~??e???????t???G?????:L(?	???1?}.A?c? ?9LR??C??KR??7?r?3????|
?????@=?Pg?????;?f??
lT$??P? n6A?m?& l??D?xz] ?:u:h@?8?G;?P?W?M?(????c???2%???'??=N?
???zIhGD?ed+?????V%??$;?c???\W??
?"Te?>
@?O*?|????????pn??y??wfF?>??7???>?f=??????c????i?1????7????????lIU??P?%???
?????J???
??7\
<}?_???}???C?n???}:?j{?)????&??i??Pa?	?a???
-?&A???H?P?9?i?????=?A,????Fx??????J?%??Dqx?6	T?q?8}??-??!?EH?\?)??_6$?	p??$?\??Pd??61K??T(o{?&?Jm?0.???O?
??
??'??	l??
!??M???
1???Cb?????7????v??`8!?G?+|?+?HcU?$??A
???
??.$BG"a?????H9??~Ii?????
j?$?8o???#???
? ?G?????{???g0y*??~?????
$??
^??????zVR??BG?(?=f
?L?*?,"?^?V??
?????l?GB????^.??	???_d?	!N??Z.?6???
2;f?~?"S?"??????E?$|^??H???g#q?1??|x???-@????x?_
$bI?$???D????TW?V(?]?(D??{?W%v?Rj?$.
z?#H?x?xZ??aq?0z?$?&?M
?#r?"+O?????*?C??	|??8H??????
[
i?K?a%22D
;???z
????{*?????
???????t\?d??	q????:m=???3`???$Ax?	p?5?q??Gq?V??T??gG0??????[hj???k?F??w??H?"x????=?&?%?k"G???C?? ?#??&?p?D????
??? ???F?!f?!?^
??9a+?n?I???
?P??
"?ll??\??&z??l?~"??[D?@???_Z
{k?9?of`v???|Rq??????m{ U??`e??GY
?G?%??C???r#/@?^
?,??????`?g?{?
?\$?+?{$?e????
??/?
&?q??M?t?????
?,?8$???4!.????O?%(A?^0
?7
P/	??G??4 ????b??0	??????w??????]?|??e
	???z
m?_?D??xb?@?#?`d^?@a@=??F#S??H?? ?	Wd???)???m9?n?RD/???)Ex<$"??????M?@'W?G??nD???@=??V?8u<
?hE?&?s?
?
kl????M???%???l?H#X).Y??b?6???DV%
o?
???r??sQD+	????-$??:?:???H?u?r?I?B<???s?K?V at E?8	}?????a
(???<??)??ZW??Am??A?8???\A^?{????}???????K
??
?n?d?G?9???	r8??)KE?T??A???#?H???EI=?3?pr??`+O$9d??T?h""?
??3?nD??????
?+?????????<???V at U????W@????A?y???
?d@?????/???.J?@+???$??????"X@
?6S_*??????|L"aZ??[??4?+????6)i@
d{?)????V$??t?r?D?`tI?6G?uD?]????!D+z????
?????????gy?F0?H&??Y???0e??[?R?@]A????B?@?o???8?1?????C3?&????-
A	???3???;aL????????
~=?	L??1??p$?7??O???P??y
???h?7%r?E?0/??x???dS/?p??J?M`+	?"?!??@_08??.??gP?$2??h??????&?B??`?,???1&m??&w\?T???$b??T"??^???Q?[/?%n????T??v?E?@Y~4K?m4?	[q??C?w%????l?7%?t8?V??T?A
?t\??^C???<???D?b??0??Q*??H9????0??(?+??!m??I???!7$m]???q??YV&????
[??"?>,1???K??9?W%??@+B??*??xAA??`?
A	[???N???????P?????b??%????
l?MG"???%*?|QR?^pA??Q??sB8j? ??&I??D
?CRJG
??????]Y?V?4TW??z[R??|?????k?YI????????????Yo?????h#?>?Bn?????R!??&W??E??@<:G???????|??
c? h?S_SC0)?T?
?E%?	??Cst??????????? ?v?L?~?-??0?b?`8?^3?i#U?kOC?1??J?0??l?EP?M???
??y????=??[A??	?!??0x??ofb?M:
U??:?jD?????? tH?b??????x???Sg%???v\@???????eH?>????4 ?M? ?
?#?&???\?r?$^?v)j?@??v??ST(?C?o?S??`????xcU??*P??d???????????e?????P~??8v!?S?)?S
	?C&?}Np?A???%???<?a+?K??d1???B????u
?ez]????G?m?????~z7??t???U?-?D?
?U)[?@[@????&?k??
9#V????a?:?v\?^:???m????z???=?u*?A???^j%!T???B5?J??%`?
?????B??`???[?h?7????y??L??ay ??G?;h???'???{1>??V?ly;??IG???
$Na.?JV???qE?W3???I?????
?~????:G8?Z??#?<??Q?
e-?a?I n??y?6???yz?	??>#??S???h?!????!????	R??:?/??)LW??x ?h\:QQ?@?k??:??GC??0'	?4?F?7
M????xN??xA?????\???J?
?3OI?:??<?AZ?)
??X"['??~{???
?+?
X??3?h?],b?k?O?rG???P????(?**L?'E??rQI?~w%?v\??)J??@F\??V??6?zh?????,`V?x?S?B??{??????J9??B??UA|???Vu?? 0?[???P?%?^????)o?A/z???????ga?-????zR$w?9???G???x??[7?\%T?M???V?@?????;??aXg??J??3W?N?tz?zd~?hJ?I3M??/??hh9?$ Y?!+)Z{??*???hM????/????? ?i[?z?Jp???
%t.?"?6
a??G?:[<?!L]h??0??? d?T?FE?8??)??w???oC??$d???=n?,Tg*??U_??A?c8yR???6yR??e?OC???N?N?qC?????n`?a!??7*?y?s???\???x??S?*??B?t??_?G?=??????C??R?X??=%?{???2n3e	???? ?ao???P??|l?i?!??=?{??3?G?~????>,s?????q?"?
#?]"????Q???1?l[
3????q?<??!*???f?9/!G???<????!??????l???=???????b3?}?R<?!?G-B??????????B?yV????????fm??G0????B?3????zH???"?0iV[}??? ??u&%????9????$?Ai??$Wf???U??U?U???OmXc\u?A?H?k?E???????
??????D@?N?(????+???^?
l3??}?	???:Z1??P'a=??$????t???K???f??Qvq?o??1??z??? ???b?Y?'?<??O? ??dHGU??U_??q??????5
e????`[?M?6?l?/I??6??????]?%=?B}???a?-O`xw%????CoR??:N??k?M??]n@[?qC???
r????
P:?2
^^
l
?B????T?~jS.V?????hpO?
)????`7?v?????????6???W??Hb??D?w??i???????:
4?=
z?8??O????????????)!????]???lSV?????N???%p?S??
?+?}O?I?????i?????? `????;d??Z?%\??????~??????P?????"??>?)?
?W???
????X? 9? ??t?(]?:?1??'??y?D;z?????`T????? ?;`?:	(?
F1P????	o@???
?;.??#??????????t?S
?g$?GH?
T?L?P.`[@?c?
?~?
6-??K?FB?U#G5~??Xi??Cj[HU???MV??]`?wy
?????4???M????>}){?8?D??+??lG??????
?>?^
?Q??$Pg1]?oga=??6?$`'??6Q9?K?\??#?;?=@"o?????qvA??J?^}$?"?g????2+??	??r?????
?Y?r
bq!?a?d?//??F?J??~jS.@?)d?!??@?	hz%W?b??;
?7??~7??<[???P3???H?A?R?@??l???V(????>??:84?
!L/H3L? C?I?????5H?~u??i?+??^?r??
??"???b?Y??PVz??A??7 ??4??I??bB???fR^
???Z??
?l8?1$?M<?;
F ?$?V<r?? &$??Q$Y?????f??`????Hvi??e?&???P??B?????afBz?f????z??X at j?a?HV?\?:???_O??8
D?>2?6???(????l?@??@t??? ?(?u?g??N??	$???z????????N??
D5`?@5 ???????+?:V??#??9V?!u(?????????a!u???????dd????????M?r??
c\?D&:?36???c??4?D-??r???q???K?
??I7??'???)??2.?q?????C??z/yS??UI???&c$?
????
????Ib?L??rU;
]=???xF?????b?fC???'?D+??#Vm ??G?@?y???$K?t?D????????? QA????q????\???6m??z????I?$I,??
)????
	??13`fC?%C)??d??*y???TC??9??.?]N&?m?D
%?V?#r&?.'?c\?A??G? }?zCc0?N?????????????? ???T?B?tL?3@??FQ??(Y?&??G??t:?!o?CL??c??4I?	X
??t*?
-?n|?5??9??jh?3???#??BX?8?j.Q?~??m3tH??':dE??Gg`o??
d???e?ch??	????l
?:^?????Q~ye?2tH??h???z%>??Z??aV????T??K??6??????G??n??f;?????~QY}jv?![?MH??B??d?}???A(^??????h??mA?&??E??"?Y/g+L??,?d|
??o???a6?? ?v??
?;>????r??i??
24???zH?_????	?S????V.??Bv>???A?)`??d???????Ei?C?K???(?q(VG????z?????????????n?/?5]?Z????V???5
???{?S??~?d&9qH??"?fm??s?7???j??M?b??@`}??[?P?8@???)?~?C??h)E?N?W?#9#Y????	q?3?l??%??8?"?@j?I'???Y&??????-??#???:??"??X?sQD'?*???RJS?X?w?
?????D	e??L??3?]B,?*???e?'P.??u?h[?a@?k3?`1?????--b?????? ?????5!?\???x?qC?a?T??{
.??h??N@????G???Da0??YB? wf?
?E?"??@c??\&?E?@N??u?=?C?5?c[?\?????_Y?????
?
????X??
/?????	?MJ?B?b??:!C?v
m?M?????=)??l??O?;@TgUu??ciecg[?r?p????m"7D?[??$[Y????b4?H??? ??0q?2?~??
??@????_N??hX?cl??11`V?P?/?Yv(????????? :???7??	X?q>
?5?K??????afD?b?Pc??=?g??2??S?R?w??e???#????N?I?????wQ?^D?p?_>MB???6+fP?`???\#??]`??Oe??|?g?????QH????BU???B
???a/??
????w???>Wm"w?J?)??g????fh[
U9w\??"?C????R]?

??E???Z?w0??'@?9J%>Fi??M?tX
???U??+?+?7?H[L(E??????
Dn??L`?*T?(?????=z?lH??.`p?????
???O??????????mF?bH#????!
?8b??r?K`Y]???E{E??lJ??
????A,7D?H????Bt/??ouu?@T????$?k?"???>
???:(???M???c?7?w
2??u1d?? 8??G?!????
='?jS.??m
?	??u"w.{???3 at e?'@U?????@??,?
????
?C??v??????b???$%?3Pg??H?:	,g}
???N+?C??K???V.?t?i????6???m?
??7?I?B???#1????pPQ$????7??p?&??
\?B?"`???_????2??P??&P??????????57??????7??L??3Pn?Z?F?
:a?{?8B9?1W1=??????S
?E?roK?????M?
? ??vU?(?9XU?????3?A???@?T?????R???-?r%`iC???d???Lc???
	???2QI???C?^??6??????^v?f???d?DF??r?OCK?GADA?)Oz	,???+O
?????
???g???C???~?Egh???}?
??C?u?BT?uU??:????$?QrN?i?rw???i??X?
0? q?Rz?B?;L??Y?C?	???????"$a[
0?+'?-??Y???.?P???R?l???????m1E?y#H?Se*51oH?)??r#??$?????????$R????(3????To
????~?!,?X?>=p????XH??k
???o?A?F???5?[m??ts!??2(SO?U???????I??/?8? ?|
2(A?N?O???"??8!???????>?RG???*???T??`
???0@;?kkz??\?????g}?
&?v	?("?.m?o?]Iki(??C?dE%???t?'R?.?:?
/?aB?#??bi|K?J?6E???Y)??O?(i? ?W?T???+????:?@<?-9??	???2?????J????????e?*???nrU]Ei????W???HU?YM???g???G:Za?#???y???p??
?sX ??P?#?]b?`?	T?`B?A?I?l????r?#L(????Ie~?(_???????6?"to?6???I?Be?|
???_n?A?7??v
??M?2?nR??????Sn??eA,?t???Q????W??@4?K?`?/???r	yz;#;??eaBT?h
???GIkP+?EX??do	PE><?????Tal??p?>?(???BM-?O????{??o???yg@?M?u6??
??Jrj=??3(o??z_?1=k???;J????tlD??
E86,????.B.????ZD?[??????C
U_??o?G?????$?
??\??jJ?j?I?:?u?t2?YoW
?
ZgS??i???-W???:|?t	Tf??????0? t|?????#_???um???+~?9i???d?G ????? ????	?vzTg??
???xn^?kW??v?'???}?n
L(0??h% ??i??S??iSn??{A??E??|hS.?c?=?????'.?z"????tB??t5Ho?sA??"???po?W??/??)2ff,??[?#/??#???
%??M??)??td?]%????E4<z?Su$?(??m
??-?z?!????????r??u?p?0?W
'?@?Y?`
[hl??%?y??b%?A? ?
cY\????L????/
/?m??C2????u?sC
?ER????*???9i??;??C?YPb???F??:Z??z?jq??6??I?????????
*x	y\!?
*x	y,P??5:??2?>
??%<dM??? @/1???<?5??h?"?bX'??j?u???L?d???~???V?????y?Y??Q]?<z3??]. wP?X??=???MS?B=W^{?3???I?-??^@??\
???pA?
???m1??.??3!?m???Bh?????t?M2l??
???M?+??$?
n?
[??z?pb>?u?[??-r??????!?n?d??|SR?v?*G?
??!u?????3@?l????qU?s0B??r??"?@??[??@6PX???zt?????_?z?N????01??D)????6@????????A,/6i?????R??R~??=????t??????	L???:?*V????v???@???????@9?	?e??ai?Gd}5l???gn&?D[?:?n?R?????\?????N?q?Go4?K?
?j[$????1S %???@??MI9
qB??0?T???b?1s =?	?w?a=
z(I??	?COG&???
?? ?w????Pc??l?/i?
????Q???5???h?!?A?(?a}g?<???N?)M??p4???y???`??????&>?y?!7?]?%??
??
b???)??????C<G?E?BW%?????/UC??y???N????	??/&????w?\???`??N?M?E?h??U??DK7-?{?H????m\?vB?%x?c
v/?4??5?F*??4?r?4??V?E?????B??? ??92?-???2??@b%
p?i???Y??r?p?? ??#>??:?
???!n[#m#??M@??>???rP????????Bb???????FJ?r?4?^A?}B^?QA??	Z?A?`l7?B?????s??zD?>??zC?P??Z?s????rz??$?"4?R?i???x???n????k	\???v2jK?
??1?[???D??4H[L???y?-?$?9???\????P
??	?j=R??<???u?xQ?1:??p????????s???5??????IT?k?????J??Fe?85#m#|???????????
???A?????N?]&L?????D}?I,]%?"??/m?:R?$????m??J?????-??H?/a????)_g????+??????? ???:eV???4?-oPG????z
h???????UN?m???? O???,?M%n??]??kM?^?n?v??A???l?mqb6cG??d3?N?8??E??J?3????a?M?B???q?iG?B?K9?c?[9?????;P'b?K? 4?[?- ???t|t
cZP6%?mD&Jn???a:????B???`??D?by
???????????e6??ukT??J?<???
??E?QHUE?|WRN@??d]????????;?Q6???A?Q????HVE?*P??/0?\?8??C????e???u??)?&J?c9?k????
?,R???k?3????M???
???
?	B??6.G?????,V'???XBJrM+???7be??@?????x?

??I?u?
???&z?H??j????YH0?<?????	3O
?CQN?H??<K??E. ?;?x=x??:??"jX??QN??????zu??@i??????Z??????[?P?A6??B^
,???????U???Z?J?n?#G?V?o???d?v?m??r?RM??????{n??<d
??\???@?k?WP????}?Y?3h%i?9|????/???(?2?g@?J40?SM??
?M??b??0????E???X2???)???O??f???p???u??%??R?4????m?-?x???-?????
@;?U?:???G$??k??? V?	??$?D???4i????
?e??.6	???P~
?G??
(?G/????7X]b????#?????<???9??&??\.&u??;???
|???Rf??SL??2?=8t????=0V??4??m9?`??!?????Bt?????Q?T?s'!?(J>
?I?aZ?az?ab???R4O??-D5B??-?%?.c???
??WX?eZ??-??
\_??lD????K??0n??C????
rh?q?&j?????????zMA<g???,?
?l?jMK&C?*?l????O????????,??D???????x??x!p?????a???
"m1?b????C+?"?=???p?k?PmJO???t???
?CQ?r3??Y?(?M???G??p???[??M?%r{s?M??&?g4?N?Z?? /???tB>%??z0??????5t,??fGg at y6T?>@?3uxG??v?d????N????????`???????D?.Ls??ACh?^/Lb#???E at k?7?`???A???6?Z?}I
kEOf g?bm
???s?????h??T??:?Vd?"?<p?bL?lhqC!PG\jG?@?x??_{??????w???iiBe????#?c
du?
???`?i??E?k4??x?Ze
?JD?e???qm
?+@????????O???/????????
G?M????F?m1aq?????1??4?X7??j?sS? ?Q]?	?0s?k?-??G?H~CF???Dm????]?? ?,k0))'?<???????,?"?e?F?eSji?rl?x
	??d/P??*????	aU ??????%J?~??%??!o(\'????f!m1,??zgp???
?H??????rh?Jn??????????_?A?&:'T???f??}??????7~?;d=
????S???F????zW ?;`???E(?8R??????????W

Fsd[I??s?c?NI?

?\)W4?%!?;???S?7?b??(??b??T\?
????+??Y+a?????'?m??s?P?B5?????????S?/??%????o&??|S??r?
f?_??!?S??X????C????{?=p???.?
???D?H????<?}???:=???+??k?Q??[[,?n:<
uZE???+????n5??w}d(???A???v?c8Soi*????a?Z_
s?h[L|L????V?????@?<?Z?yR@??uV???~?PoO?r[
?Q(???x????M????9j?u???^"???|????\?q(k[?{9??????R?X?
?/?u?!W?vm
??????U??TW?
???????S????M?{?B?7?n?? mq??9p???"?O?MK?L?N??'
?0
?gj?????'\i????]I9u???p}?
d???A?s?8$?DuP6?Pnub?Q!?DP????$6?C???\?p@??k ??S???????6???>
1|?
?G??U:???????{?7%???l??r?x??????N
??%?uy"??4??(\??aY?\y"/??e0y? `?????
H???_?t?
?l?M?v?????$?Z????!?[???????f?@?2??#*?{A????????h(??3??M????????
???q???O?,??
iA???H[??^??????
?2?b?@?6?Y??Z?*)????xr?!?l?	h?!???3????W???
P?N?#6??? ??RN??@!?9W?@b????L?'Af?@??A?8???r??/??+?n
s???Nh?s?????2?;???G?}?A???????\?GO7?bm
??@
o????????;g5$??JyNF!z?y~??`~?1???da?????????r?'????A???2Kb??@??P.??*y??\-G?D?37?$o??oOW???;??"?O??Ai????O":?M????(??\~
?<???c?????]Il+?f?W?:?g???????N??j?wJ1?Ls3#???}.??h
i??g`}RN#???AI9	t???m
i!47??&?D?0P??wq^:\;??Rxj??a.g??<?b8????:??P??????X5?z?Bw??IA~$?:I=???d???x
D??E????p?GB???`?k?????e????F!??u?.?:@\a"uS???c??:?c??m????????????w???+??6????|??!??8"<*.Q???0??Ec
?q??{0 ???+?x?C?Y?O?lc?
?	l?.??B????{?II9
)??,w???=+)/??M?????s?<F?>KB??S?vt%K at W???+ym!E?O?HQ4?Nta??-&V??B????#??QN?(??`??Y^?rB??
?@:=???~?h???NZ??????9??0 ??U?r??????l??z,???Y?^T-?@??Z?????-
?
?k??k?@?]??}????$?M^??qJ??5?9eh[?
?? ?@??QV?WW$???4??,?	?????????,?=V??X?- ?????5 ??*??*)' ??R&?D
??Z??.
{,>???0?1,?G?^M-?s?\yYG???^??BT??Q?z?????@?jp]	???m??? ?|???#(?S??15 -?? ??!?	??[D???7z?/??~?YA?`{/9?	????m:??H?q???!??ab?????????@Pz??P\?;&????|+?x?x??z
 1E@?-NE???I?+??E??W??|??????;Ds?@?
d[tWH?(?6????A???F?Kh?????)??3???Q???9Z?B)???"PV??????",'????.TC?????*t????V=2?iCQ??=h
g? 9q7?c/????t3(0g:?	???4
?@??TMO?;?ER7 at T??$G??E?Q?~
???"??r?d?z%}?	&?c??????
??????_????????r?/C"m1??I)??????`[?{@u??????r?{Nh???})??Jb???N?O???hi?!???u?????&?1?/
?r?????>?1
?Q???a??L?<P?g~iK=?a?9u??$5?n??l?,]~??>????E?pC??2???1,???????<????x???????)GH?1D?????,??B?x?('0??h?????????|?3????K?]I?	?
?N0?#m?0??
uiu?M! ??:
??r?????8?
??!?Jb1?%F???K?s??;????"a&@??VW	s?
???[o?MI??x~???g?-??????.a???E?IL??m?4??10?H,0b??{9??sy?O???@$K)?-J4??3?X>P??#??'>
????bBiG?W?m@???P?P@????uB?X??Ul?*2 ?`#???
('?????rS N
??>????u?A?j???q???TU?\?_???uWs[?S'??>???9?#??p?M???dv?? ?X???`s?C??<[%??????(?/U?
??X@E???zN<	?
??#?fQ?8B?O???S>??f???C?W?j?.u2i??8?:?'D????b?????l????Z??lU????3j??lh5?L??????|C?P?
?R&[wK?Y?h?M??vD????\???D?Zw at L??G|?	????N?:?Zp??0[B)?Q?h???
la,A[?Z?'WX?Y??(7LS?+?[YZ?(?????i?u1S69Bg
?S?? ?k???D???
2*??&c???G<????M?H[(Fe???????)?JC}o????,WI?????p?????M7B??%?N%???u???3??Ps+??G?<(E9?M?<bm??QjiW m1??>3A??G{??8????????????M???,q?p<_??????p?????Z??yv?c<?YP?{y???f,'v?XL5?h?????>?T????<??n?C?(?????D??P1??Xw?k9??????>M+?Z?????+???b??M?!aFV^i?????Y??2????r?&?EI9	4z?707?x[??F@9pM??u??????????Sr
?r}?u???Sg?b???,I????h?q?\\????
e?h}W??Q?=?????n???	???????s??	TCRh=????f??M?=??LE?Y??v|????
???	??7%?TG?????X?R.???Ae?_!????oby??q????.?'?)??]I?`????j/????5???~?^??uF????6Mm??TT????????^??g?2?}=!?(i?:?j??r??H[$??@*?6????!??=?[??@???E??a?"???:??t??8"Z?b?K?;???zq>???K?w%?$hu??
????IIn?g;A????v	????CY???r?e?vD??)??h>?>P?X*??)x9?????@?P?k??E`T?*!U@?H?8??P?"??zD??S??7??????h?+T??g???P??l??|??v?	?N?F3??}???0??w???[?S????@?X??f{H/?~*\?Q?7?6??0L?R??$?6?\[`y$F?rB2?O%
S.?P???9^??1T?Q/l????j???F?|Z|hV??]??????
???n?!?II9
??h???p%??#
?YI?
?:a?Pji????PL?Ar???z?@???C?f7??? ?-
?:???E????0S?b????d?
??5??+?zw?|??\Y??7???????A?6?^??
???????5?^??P?@6"??uc??GS?1??P?gE?F?:W%A?{ *??,'?????Nd??R?.????\???A???
?"
???A?
cI?4?K	?t?`t?P$??1???P!??0z?#
??2|??l?8Q??S=??9????-
s?<?!??Z?
?*,?1??? #"?Xo??Pp?
??yf@?c???b??"???Jz	?o#??5&B???????lH9V??@Y??F??*???Z???????YkT_???g??N?g
?viy(r$M:P??oVh@??,?E?3?E???????+???????L,:??u2???V?#?(nS0L
%p
5o?yTM??M???C?7???CQo?lHk6+K?2??]2a?
??:Q?lej?h">?
?lX~iK6D(i?B-?Q?<3??k&??(/?+???:
?b?A??N?
????E???MI??F?P????&h@??]W%???"?;A/zSRN?????q?	?????~bui????????$o???4h?)O<~?2???M?:	??>?????t}(??*?????n?)??d@?s??c??H?Y?(K?Bu&T<*???G?????T??????@???(??K???I??r?l?C?N?P,Z?Q??T?43???????B ??t??3?H?F?^?m?BE?
2w???KD??>y#d0PMl<?%)?>??a}G?[$???[?cq?????@?????????Hv?W?}?K
?????y??x??%??r????
?OiY?"^???O?	?{?????1????_TD?y	??N??3?G?:@????["Q?????w '??{+o	?r??[?}@?(Q????"$S??+.@??cD??_|wha}@??X???D????G??k?7mF\?
d???:?J\S(?QG??)?6?GcS$o???PL;Vx??7"????????;S???
??~,"m???{Y_?r?L6Hy????)?-?@??`LB\?}
??s0s?,???????????-P? %?hz%p?A?F?!????R?-@?!O?????|Z??J?V'd}5,'???2?C????C?x-#??h[\?y?/
(:???mv-?r??R^d%??u?z/o??<kc?-|?_??1R!?_?~???!??F?'?*^???S??!??P???N?V?B
?
???FJ??_??M???w?@+?>?V??@?r??o??(??M?m????????']? ?????[?ae?_?0??/?
?@?m?Q?n
b??
??W?S.??_???F???g/D?????o????5PK?\?92?????????#|!???sV??????{?^. at T??I?+????H?o?????????T???c?(m??????
U???A?@?ErM??&y??b??????L??????Q?????X?\?>?`=?pbmQ??_????w@????+?????h at R?Q?-?-&j???N?^???5W? B?bX?.
m?x?A?LR~?-^?????UR'0H?u???_???0o?O?6?uoHU?WF?z???b?FB%m?Zgd(?eT???QA???t????
^h??W??:?Xc{?1?B??aa?????g?Wr?Ec
\7?
?w?g??>(??#k?
?D???? ??????f??K??????!????????D?K?@?xY?????m=???>?1=%?{??(??<?K?_?????6?[?=hez??u?X?`????????
?6Y?n???r????F v???|{hma?	?W$?
b?*uD1?y?-(???f?z
????a???\???we??h??B~;b?"A?????V?$??,??;??W?[??h?Bu# ?'?????????w??P??mqa??^??Z??IYr?p???_?w?????|h????;X? sf??l?;??H?~?S??`?`??$?R????,7U???H{D???k????*?????M/??
-?a[@JCm
???}?	h;|/??z?x%?-
R????????%??A?E,??*??????iD???a
?????$jD?U??????????}v??? ?E???k?<+Su?6??(?
?{?R"?????M?.??B?d?=??z
???
?X????DCu<??K??q?F],??j=???$??+????|5?Y??(9?y?I ????^??X?h?????6?3?:?T?A?e<?\l`?F}?A??}???L???b???#3???u??j:??h<?O
??`???rC??5??	ze?6????\>!??+?N??????R??R?8??-??6	?	???^?(7??'PN`????<??m
?A?!Y??|??????L????
??K???~??P
???~???rD?B???-Cl???C?&????|?????.'??T???:H???E??R?W?@?@??h[?>h????[??H^???:?@????nF}A??{???E??J?	ie?z?+H)?mP`????????}??=?l??!??
??.??hVU'?S??s<?R?R???`??G???M2q8?=?+?? X&}V??M0Z?9?h????0g?5????S ??Vh[?Vg?u?L??D???bQ)??Y???Y?q?m??,c???)}?!^???*@?W?r6i?- at t???~?G?)?[??????C+???f???!C??@?BTz3?lH?\????#?/??^d??`7??c???1?&x6?{?x??6?,.4?
O???-ol???lz??3??[
??x\??u???u/??y???r#? ??!K?y!
M?IJ???????r??I???n??????C????k??&????W?>B-o?
?????,???X'????????W?>????Y????9i?a??zt?Q?,t,???-??????s?O.'A??0???qi?A???
?_+\?R?
-???_???X??d???HtY???#?? Y\h*6??0?C?d????Gw
??CE??
0;??????n?:fq?y??Kw???q??+W?l?H?????J??I?x5??
?J??
???|???]y^???
??Jq??D??c@?
???p6C???J?^?_??;?$?W@?#?WA?R
h??C p?~???)?Z]uV???A??}?CM9pH?????<?0????????,2?iC?????
??N?????g??O(?????l?K??&=???(???P?s????%??z$?VV?????-??x??G[???ji???t?*??1??x?|wz?oe"??W??6???9??
?????
?????u?<?L???7? ?????`?!??G????K??v????t???0??`VJ??r?A?GRLSh?n?)>{??8h??LC??%?G?H=????Di^??B??D?@?T????=}?+?s??$r1?J?6!??o1??&????7!,-??&M?;??Z
??Ga\?u?????b???A?=??U@??=???????k?+???^???-HTM????5WM"?x?
R?J???@????	??`8?I?s?s?u???I/??4????o??????v?T?
??????M?&IdM)3Nc?$+~??7k(?E?\[!??RP?6?2 [?u[7*????/We?2?^?sx????ly=c?1huq?d?pQ?
o??<;??
	???X?q/???)A?&?bt!??w????~?^R??E????
???g?M`?/???sD??~?
?D?????%&??[M)??u?0?:?#i$????3&H?J?L?F?\?m??????}??a??????H???wAPv?1?????z?\c??b@????#?.??u%????q?g??B}?H)?|c}!??<W???????J??T2??.??@?ZM???%?????D?#?M?$N?}?,??ugXN&6-9pH?ZK??
n?
?	?????y?I?S?M?q?????#3???)???{?<?????"?vH?.&?5????$?l])???????C????? ?yl????r?:1?????I1?p?&?=?
?/x??1D?P?[???PO???
?Y??QvH0#?!ZL?\N&?E?t??w!?F???5?O?fR??|??g????2???<TI?G???]?j???$????<u'??o???!????m????0?E?D?5(i{?I1
?o???z?A,X&????
????fu??a9???m?	??K?w?'???EI??u?Mob?;a<?????z$?4?o*?uk?
-??m??b?Y^_u?LhS?????O???z?qk?j?#G?l???:?	U
?R????????* ??.?M`T&?0K?dd??v????(B9M!?.???R&????@???b8??+\i?T??;@?4I???k??w	@ti?/??
???????Z??X
?P??4??I/??/?????-`?<{&??Gx?kPdC??r?~??D??]???0'If?7?-?k%7 ?%H9#??qm?
##R???Z?y??zt?fsT?@?Fa???m??k???Q
|??2R??0v??????
??GU
Oj??%?4?c????E]???
?C??-?>T?K?\??'2??su?Rb+??G?)?"??LmJ??mrY??"?u?>6)p?????t?
?.?.?rd?
/?CG)k?lHCf??=o/??????j4<U???6??0?@UJ???????>?C?v\?LZ??b?Q??"??:??
@(G
J]?!?!??fNBRP??
????}	hdj??[?7j?????!??
??l5qo?bH??!!mj#I?uc?Iw?Y?&???Uo?ed??"??x??UQ??>j??G-?HF???
D$>?ArH)???M	4????????P?????????m??}?Q?+?}F???q?7?e????Zf???@t?|?K?/@?E??3?????@D??????F????k??
???KR5?R?S????d??O????V
k&???('?-????d?H?vp$?I1??????0?Crf?=ZirP??tz-<??
?z???I{??N??8t????'???{???4???#????}Tqn'q3)?
?????5?&?
sU?V)+????d???P??1Po??N?H?U?!!???=O?
????????r?K???'?-????E?????&???\g??<?!m1?`???m??D??D?x?c?????k?-?u???=z??&?????n?RN
????W??_?z
$?~b??-h?*#?eN ??i?C??
E8ex@?w,HG?b???V????8?
??
??-?????*?[
I????5??h??r?K=4B%?"?Q?P?V'R?(?????.kA?J?(?{:??_v??w??????*??
??T?5??
??$G??eK{?u?
????7???P??]?
?~?
sf?6!u??3???iOS????????,p6e?Q?
-m??}???R.?@r?@??q?????/??`"u?H??0??$
B?@????M=????????oG,?6?n/?<????d?(
P?(iHM???^?	(g?FO?)SA?????????o
![%??u??CP???
]@?t??K-????F??FB?%?n??ma?-?x-?\_?
i?-????D!m?}??????2a?_???????????o at 4??	d??]?>r?YU6???E?
?
??M???U0????l?f????j???fP ????8?[q6l??-?:?{??Ki?F?Q:O?7?M/u,? D?\,??zz1??H?@?????,?F?
?????a?c	???k?"a??7?@???	?>I??
??I/?VW??F?!???y??t??k
5???T G?	?6%????UP??Y???bG?H???2??
/[N({o M??'m??d?L?:??1?z?6?P/J????-
1?"BV%?M?q?~
R?@lK?2?u???u	XN?Z?E/??N}??Y?-RA,u??i??_?q?w|??????0u??:??{?jA?O
J?S_?7+.?uF???
`c?
.g??Z=???e1?F???e?@?Ky
yu?,ymiu?a/????D%?-<l?R?S=?eYF???C??
???O\?
??9F???????{??v??M&???
?:?7z1?|){?D?oz?[ :??	\]?R?@tOR?@?G=?^@,?
?H[?uX?5t?JusN??QQ???~?i???Yq?Xr/g?J?W????XB=:q ??@?%Q?&???9??37=??Ai???D?H???x??Z~=-???x/?Z?????<u?d?????f
???s??G(????Ou??&T?H	???O???
???
??#?????Dn0????]???{??@????
?9?3?-??R?K'??;?6?,??????`N/??L??3+zG??v???
?

??f?M???????
m1,?A?,?????*??g??Y?n??2????~/B??B5?? w?\?/?}??_?
U'??=?eC+?
??U???
?
?g???C??}R}t?}E?*+y??????????Wf$?c???&???iB?z~N??h\??E????[??^?????K?z?D?H[@r??
cF?1?????0+A{%?(??0K????,???'Z????]
?z???MT0?;g&?1?	??#????B?	E6v???K9????r?#?B?e?, ?Xt????\^
&;?:
3wlZ??p=??Ds)?????Y??
???????2T?%? uN??(R^Am
?|???bH???A????uF)S./?n?+???/@9?ukX??@???????T>???%?D?C??pL??I?@?]??>?+P??C??????0o?'?????WM???O??PJZ?E????4y!
???[?a?!?C???m]`??<?????|h,~?nz%T????O???&d?2D?????S ???&J?,H???D?"?&???W?r6?5???e?????rY????:H??????,7?zX??a[??????nM????:??bYP??z??<????;&?PSc?!m??]????p?;
(?? ?u?:w}???P??????I?71??z$?B?XL5??Bl$TI
J?:??N??Xs(?M??(??!?=???N?~?I??7?1Eu?T???????Bu6m6?D?|q?(?`????B}_?G?H ??????2??
?Q*p^??a[??n@?,?J?H??P??[???cQ???(??E?dU????
L?u$???Ty/?ug?&/G_????7?_i???e6?L@s"y5R???????o?:q?B?F;h[@nS?>?????k ?
	$??????S????[*&??d?R??@9???{?6??
{??z)?n??n??pH???Z?????CP?`?k@??~?????G:?O???p??r=???CSm???^
????I?????Uf??o4???2?(??f????JU(Uz1})??{?z)'?-?\
?K????????a???E?_????ng ????
??a??
?M???U6`oB_??A???@??;_??/??|
-?f??riK?/@[?????kl?x&?~?	=Q&???Fq??;?:o?A???&4?G?*n????????<?~
?q?M???w`???fb9
 i(?
0?????R????W?`[J\?J>?h?,???}aH?<???[?a?&???V???w?????d??*E????j at +??G?t(?????Ky????5?3H???K_??2??J?B]??:f_??i?
)U???.???g?Y$??<?	G:?+?v?????!^??_K!????6?u?B^?6?y?JB|?;a?c= }@h???5?$n???sJ?>hj??@?,?X????P???`@??h
?%??????
??{????`z?????n
?4?ZT?5M?+??.@=?V,N?qz??<
?k??z??*0??&???E?O
J>u???R?(?9<d???"\"*E
??????FDF??d(7???Z?
?P}??m??W??~

???Vx???? 9???u~??l?=	?P????^???~??;PN???????wUW?0??c?
y?7(IASb4H[??'??4?????C????2_?5v?@???>?#PN`?M??????)?K?????C/???????
????l?????E???A
?Y???zZmeJ)EF")??;?????l_?]?????=<
y?x??m?^w
??u?M+n?u?a'???
?41??????_??O???l{??I??G0???s????6?}?B=?P'?\Xh?4u[?3?2}??Q%??t4q????2?.m2?M??????&?????5"T?/?_M,?G??f????q????&????~?($z?????@l|T3??L?0??{??G??R?(?	??p3?i??9K?[????\`?M?X??????9sz@??,?%'?h?K?t?	T2??M?
?K??
m?-`1????d/?9?z????*7??'A?a?:l:?A^{?#?????????M??7?6??Y?,??6???????3>?%?1??.??Fis?/@???t|
?A7?%_????-Nk??-B??_??*??.JC:R?i?._I?4??1??Q??hs[?+???;?G????????h??B_??]??	??????Q?4?`?VyuTD?w?N?=???l2?!?I??????pW????~????=?~F?=?????>?X?^????6???J?l\f?3?l2v?Rn??
Y???[Y\?????{dG??zf??u????gS-?
?M*g???Q
??C?)??%?b???+?y?<?W3HGS?	Y???-#?\?h???l"???&$?f"?6#???[@?????LC??
??!
i????<?4?i?'?jE?5p?-??aQZ&0??[?? ?
/????????{yBq??|?K?
?Z??GP?
???G?0?j?#?T
?????2?:?9?A|74??@??	?Q$???D?O
J?6?????6??????+?	?nH?5?????o?!t?Q?	?*????&P7?9
T????^^4???zRQ?h???0;F?(%t??r+??????3	`U?My?O??F?i?*???=?
&?O??.)?1???H;j???2??D`?V?vX
z@?-D:?UU?Ju?jK?N?U??<??8?c??L??@j?!?z??w??k??????'?vF>?
?)??
Ki?,?a??L?;???6#?????Ky? 
phE???? ????]Y??(???#?A?,??j0??+?????? <??C?l
WV???<??C???]=dyh?4??Mi)!lRP??????!???6???x?????8??????c?T?h?R??zL?4#??D?)e??&?y?Xk\?k?>~y????s????w ????I???zSx[??#??Q3Zw???f`]?{??P?????[4??!H?
?j???g?,??y???zrU??
?&K1i????????(O`??P?N6?v??zxU?F??o???????P?V??m?x?U*??9#mv?? @?m?x9?[??f?W??Z?@l^d?2??\:\??F
??.??/@??A??f??7?8t??<z_?E???adB??C???????/L ?5????(?y$?????C???:h{
???\M,w?Z???0
#kG??M?d?~?)O????
S?L?B????`?
5;??????_Q
???????????1??
{"?^?r1?&??y1???QU,}7???????e???mr?]?L??:??Uo?;?R??@?	??????#?&a???????$?l3?x???@?f??P??[?6?0=u??``?I???
 ??X?????*??_#?x??+_??y???i?
R?B?/??0??%???[a}????/<T6h???!??I/)?bO?e????q?4%N6??Q2?
?T@}e??????0??0-0??????????1P?F???y??T<?ux"'H?????Z at v?{???G?qK?/????.?A?p? mZq??Y??pt???6??`?x??.?%?&a?%s?P?Fa???b?x)WA=????f
m??????s$?+uSO??H??????9???{W?4e?79?0?`?!??&P??k?!Y2??_??Oyr?????E?Y\??	?	?{CH?K??`=???IV??	????3?i???03"?q??????[ ?@??)???)?F9=??????@5V???M????????#?`??????,*B?/???R^????:
m?@?b???u?K????{$?f?????????7F??2
?0)?!qH?V}??,@?7???_??.!mj.%?I??????N@=?4??L ??R?z?<Z7??????
??????????U??CL??m???=?
?fT?5???{A@??q2?.E?B~RP?X????(O&mZq?}?b'E%???C?{B?NDS???	W???
/?SP?s?!????????t9B9RP???P??2|?%??H???e(mZ*
???	j?Q?Fn? s?A??X??Xx ?t?
??(?u5B~RP??
P?s?<y?G,?.?$?s??}0/?G??P4A????	?f?l?x??
?B?U ??.?>,?vl3?+??O??B?MH?????!??AAE?C`]?bYg?V?d?
???K?\6??A??+???.??|1??U~??E`??h????g?u|o?Z?PC:A?:H????mr9#??
??~e?q????}?Q>?C?g-Og#??h?.^?P?nA???)2??"?????ug??????*??0K?m2?Ru????????Lc???{?m???7
>??????@?
W??!?P??s??u2?0Q??????T,?s????
??0Ec?k??Z????qO??????I5?z??MH??{?/z)????Y??&?>]I????U?z;0y?t???)?C???DN?H`?
?b$;?????@
?:	??F?w-?v??x?IHr???)B-e??:??6?B?!????f9?????U~iL7???!?!?L?xC?t????V??9?&??.?B?J#?z(Up???Z??#?Ei?A???Gn?|1?G???????B%?E????F~?h??W?z4i3???Zq2??.?
2?xG~R???"EJ??7?E?????	???JqR=@Y??{????????
X>
2dk? ???G???k???_c???7?r????`="|???M???cj.rTi????????%n2v???	_O??m????&\??DnP???9HtH?CA?^????&=
???z??????D1??R?h
y?$?M
BQRP?0????\,?sn???o=?*T?D	?????0)(e??x4aS.@?:?
*.???.g?n
??7?Q?j??%d??P ??P?E	?-???????0??Xa???V??YPV??AL:???
?M?m?=P? 4Ny|!?????o?M.*Ss[q1?G????I?:?[????(Y???
?z???
??#??eA?A??K#?n??6Ln????????????#??j"???`?L"#??????@???%?!?
<??r??H????E????l3??,?c??w?6?????]?u??g6?
???Jd??e??,u'?k*?:Y??<?Wr{??~?Ky?cL!u?????X?^
???@?Kn?????~??@S??l??,
h??&
???Tu?<?^??Y???cQ?? ? dX't'?M
R?owmF???????n@?	?^![?1???S(_$?????N?H????;?>v??j?^E?
T????x??*T?Q?#??4D??N)F?P)R??7]Au?m?[
?bmr?PC???????D>??k??:/LX?-@???g?????e?~???0?????f??s? ??Q?6???bJ?.?? m6]?w???#???k???<i???]:??<?zOx/_]????5?????#??#zw5??M. ?(L??M???fShS?!?W?,??l?is?
?v?7)?D[%@^????
BB?>+]??(??#0d?;!e????@?/?
9s?L?q?E[???n"m???P?n^???|POD?@?v?z3?0d?iMY???[?;?????7`?????+>:??X7??g?V?p1l???h??o??m? ??k=Z?M.???
??^??1?????n????]?$FuHN:?8?}?Ew??Q{?O??O?"???+M????,??
G?Z?H?7bm???,?n??j???????5]????B?1?y???????o0???"?<1????vE?8??W"??? ??+?????,??
$?`?B?`?D???h?WY@?????a?4m???e6??=??i??#J?-??????!M?V??.`?v+????@??2*B%C@?z9?-??G?1H6???q???????
?n???
?lm??B????	Y?%Vg?? ??y5C?sG????@oj?HN??K?[?h???5?G?6?l\?A?%?B(z????a?r??x???A?6z6?MO at WI.?>;(?!?C?)2[??[D???2D?OGR?X'?z?hh-?Ad??,@&??3
???I??	i??N?@??wu?c?=U?Rm?X????Y!N,o?$4??CM?M???f7?l
??????????V0?+}?
+???V??AKoH??'?X??&N?!?EQ??n m?,?/(?fa?
6?~B??S	?>??<??=?????1@
r?!??5?r??Ju?z???I?r??????eHA)3?C?9* &?4$?P?b?m ????s?_?+?@???m?@?E/?S{???M.?	?,_A??h
y?????R&N9H?@?E?R????(?9<D?n?@?VTB^U????2??tFY?H"?c?Vf??A)C??,??
J??~???\???9??????P?sx?>?;<?????H????tX?????X??	T3?!m,?+????"?????Wy
???E????a?U?"Z.??h?2??U???????n-?h?`@N(Zw?E?LQ$Vd????C???
?UG
???S??6?l$q?$%kD(??G??G`(?t?<?}D???q9w?1A???}*D=G????g`?tP?
???pK'1c??{?? ???	h m?L
?vnz???v ??m?@:??Su???
RO?J???, -?+
rm??
@f???
??=????.?8?B)?
?W?
L?I`????+B?:]'R!???+hC??B=???a]"d"?L??P?u&&????
??avUG?C@??x?K????0v???q?p|<ZS,QzISb/?D??i?s?C/?	(??????q?6???O_?	DF;E@2Y:????b????e?6#??6?Ps????{??d??z??0???.?f??>
? %$??G0>yF>?
???nM??z0dP?p?qf?2P?"?????I/yVK???,@??hX??(O??g??mU???U?=Rw??9E??>???&???UT?z??_?????? G??s{?>?YQ???'?]?}N? ??ly???+????S?Q?x)v???'????<?.?7???Qi?+ayr??
???AH??@?eb?F?&?=2???0?i??8?	??:A?XH?%?????K???_~A=?
?????8??*7?6?r???;??P?JB?i?(??'c?????3?hJ????z4?z???
?_-??i? ??!?$??
????J?E]?d
6?+B?c
i3Z7+?
?b????C?+?( ?h??%@??'??u?P??(O?m???G?8M??>?f???u?C?
?X????Q??????????(O ?s?=????,?Da????p???+?b?s?r?p??4:?]?}r7?G-E?!?+k??)????To=	?bE????'?|?-????fRP????R?@*@:?A?g?r3YS?vx???FF???_?????k!z2?????>?:
?{??6?x???kM???D??	??Pv???A???@?T.g??
?3S??b?q???C??h??P?e??^??"???`?=}?
??G??6???n??u??Kh??$?
??3??n3?Q6?W???@|???P$~\}-??
????^?A????d ?FFE(7Pk?@V?]B!???????#??Q?#??!T2;{????	??I????
?1??'&A???UL?!?"??:U at +K?~?????2#u2l?M?5??L??T^???n??V<&?/??#P??r5?R?db? 3????r#S~?f~??4/u??G??HC???;n????`?0??????2??2??[?????????1????K?
????q??!?8_????????????<	?
(/??h?u?mr?Do?=????C?fMX\~k
b?G??\??w??3?i?0N.+?
??x??n:l??)???>???|?=g#???=?'?G)oA??g?[?h@??E?~i?p$]?lZ??\^? ?l?????=????c.:,????6??D????Q?d?z4?'(m6??@@?e??Z
?=???????Tn??O??6d
c?&j'?T?r0?y???{pm?
?? m?V1y?9?d???E??w?=?
??=`1??'{?????
T??"O??k??@Y??7?,`?9A???D??K?4??
P?h??K?qGGi???*??????v??%(?`??V???k???<.Y\????d??(?#?7????N???%~wJ???a?">c???M?\?l
??>?iV?KJ?????Z?(W??@j???K^W\@??r?1??	??????U)B??i?7?Qo?????"dC?J?<???ZhY??z?????W?
?02M'?	???C?????
??*?]???Q]????fq?	'??CJ????3P?@K./??>jR?r?X{?????Zr?]??<Y???Pa???nAm???6?"?????p
?x?*?????:<
iG~?m??k??z?[
E?x?+??I?
??f???S?j???~?K??-I???L0?N]?l
?+o???k?[|?A??,F?~?
NDS??'7\?V????l}?G-Q=?/9
x?Ly??{C?iAP???P?@ZF??~?FF:?FF?A?????????0;??-.3@?G?rGuPS???g;??wP(F??$G????e?Z?:??,??Bjb<???-h??????qlG?
????[????????7?4???
?????gz3l?JhG???Q?????????nM??????6??~?{?,????q???3?~ V?
???????:??YX7:S?????RI????(??a"??m ?^O?K?6?*?9_Js???P/2??[k???$???pgHG"??0?K$1???`t?~I?hhq???"?^#7???V1S?l\&?@??????a6???erQ?Q????j$??
?]cC???
]^?r???$_;??|?
??q?9??8?
H?s7%n?z
+??%6?.???S?t\?? ??ODS?K???
n?8?m}??
dNs??^??o~?jQJ
??4?mX?fH?&??$?????P?H\xw?DTH?2?7?Qx?YX?
(~?
?/?#?'??^?o??n??6???&I?&5B&??+p??r?
?????qlC?K8?S4??0j???6??_??h'??$?<?m(???_`???J??YQB\g	;??x??X?HYiH??F???>:??p???bq?j?&D?X-?cb
?2????Z`y??m?}?Q at s?	_,{ n??Bg.?Z
`?VX?N8????)?'
N?*A???J???*n%?DJ?X?????????(????mG?
 ?Z~?;<!???z?a??????_p????\?:?=' ??I'?R~???PR?@9???? T???)?r?="?{?SFKa??z??w??z?C?=?
??|??'?!??}?
???C?ZX???.H??,"???????x??iA?:??^??@W????1?Z?uU??i%???`K?T??D}Z?.??K?o?69??'@Q??a=?????i?
???+?y????OK?s?t??8?H#|?)?[?K??%?w???AHw?(3?GqH`??
?????3HA:???\????-&>oP???#??????
???{?,??6HT?^??P?jc'.???n??
?
??m~W`?????>z??i}( /'????qB?^?5?T^f ??B?|?K?VG?q]?t^?&?&????
???#???o??6? ('???h0?P$_ ?6,?Y?_`?)W??X??lbEcJ?6?^?E???)T?????:????2????N???eZ???????6
?????A9
?
?SF',?(?s?????&0???>???D?5???-??r?O?<??r??
 ?-o???X=
!?{?q?????)VFs??rh2??????
?e?????.;??L4Nu?J??9?&P?Y:?/?6?L+)??z?+H??bY?G?-????P??wm?	??? ?K?|??:???ZG]???G?'l:L??W?M?r??
B???x?z0? ???<r???????
j???~??n@:???BI?4?????P`?+$
"g??z:wo	??? c??
?????J?LH?f?214?M????qY?E????Y?}?X?X??V7?F?Y???	X???"k???/16??zu#he??}?>?)???@9}<?rFR .???$?vKA???4J?@yu???????}?_?n;<?y????e??as?a&??T????????+???@???'??gX&j????????&!oq%?=??u
??????6u?[k???l??m?h???V?????,???9?????%U???n@R?6?k?YP??r?
?(?? M?@??:??$???i???????(?C?c?#?R1?
2?02?g8???g jF?d?k/?
?
????>
?z?3Uf??Ez9]/"mBbyJ???i??yy<??n?[??:?jX&mZ???? 
????$W?????.???X?z?w?c???
?7s)O
"7??w??:?
Wq+?/[H??BP+e??? ?	?'???/??r5y_,'D;Ef???	?[ %???6?dTM???u?????r????????[???%T????U6j?#@??x<1?6
?T????`????N at .?j?+?	?zY?~	????X.??QFS?,?xYI?6??K?Y??
??;???(C?
?+iG??H4#H?:?#?????	?B???,?EK??????|c"}\????2>??)'?^???$????
rA???@G???Y?m2?,???R,kF?+?+"??$c?????Ov?&D~9??`????
?????=??H???o??B??S_c???G?????????K??X?S?M"?f$???E/???\L?????e?{?j????f}h???+?	?G?#??cB]4?F+?G???M??U????I????w?2??j??J??????X?+?'tq??^P^u???? j]`?b}???[?????? ;>^??
??~s?u<?;???4%F?Z?Kx1??@?M???=???).3X??A?)j?>??p???)?D~???J??N???r6l??d????l?u???
?YYd?er?Q??
?z0?IE??PA>????^??????uG?
?:??}?\$Dc??m
????n???q#?"Y???KS/???E?C?:<?_%???e/??????|??(??j??,L;q?
B^y
Z?n????????(&L?$O
 ???x,?0
J&j`?L?^??PN?&Q?'R\)C?(?<??m?(YI?
????JP*??xL?)?????z???*?????????D	?%???)??
\??
 ??X@?G2???'??s????m&]??????Pc?w?@?f8??&???<??D?????X5???-?UHw\	?
???w??Fb???Y3&O:L@?
????.????R??z??#q??L??"@??I??Z5.???^?E?7+????z?W?R?????M???????R?
.?????"HUu?1??E?????}?1?r?????7??.
mB??:??_	??eBfm?NLP?^??P?${zK?M?@?VbM??????1*t??0???{?K???2??????Q^NQFA???n?{<x?<???U\?@?P??C?
??)'??;?t???70?>Eu?#?`?Z6?{??0?;?A??Y???WI}??+B?1I`?
????IV?6??????zG?6??A#+?w??6????)?`??ef???4??x5??6-2#?N??
???m?_?
?$a?hb??,?G+?&?X_??
????/??ug??@?m?????R??<?*@?u`?g]?yB?K??n<v??:?6????6?-?????Uj?Q???r5?1C`?UE???x?:??	??4?&?M??
????PA?????\?=???jSN?~?N ??q7?@??????	?b?u/??:?I?M??7|?$??x?~?g?,?????Rv?Kv?@?V?:??7??J???r'?u?:r[ ?9c?'@'c? m??3E??@["?jX&?1VI?^??br]fD'?;
??WUp???cN#?6?LH??.K?W?.??B?d??6???
??M??|???%?a????G-C?
??De????y?Z'?}U?
.$_??????.y
,??Q?????Xfn???EfC??[?????*h????M"V???~???N$[FH?[x??n?y??8?????~	?@?+?E?&????u?TNq?o???T??C???=?<T?	Z-t???
?[????r?g?#ZQ??n??h?????t%?Y?%)???h?aB?uh??
3????a?A??h?L?/?#b#????????????u@'P1
*&d?pV_<s??c??d?1f?
@9?D??jr
?/?6???x???et???????ky?????,?|?{[^??>
?#???e?r??~??y]?OA:l}V???_sa?7?@?i? ??3P???1??*??#X??9`?e?s????A+3?X<?_d??gC?A?!
??I???)??^G?od?#
Q-:xY???5 at L}?a??%??oA?w>?; Ns?>???9?????[????W?????c?Q>?)???6??-#???6,8??	?ui??????R?????BlI~????zR?|?g????R??y?t?;bU.-n??4?q4?????O'?(??^=??n&???`.???*????:aY??Q
v???Lr`%????C7?!?>?u?zf?X???c?q??kJ<?3?sdO?T???^?U~??????Qf?????-?.~w???]?!?i?!?J*
?9N??????E?????
+?#?o???Bm?[?6????S???MLS>?I?n?2I??N+?F?i])[*x???_???????HL
??k?g?	??"mXp?`t???J?(WC?@?u$K]?Z?????m
??`>??>?
3?k??u?Bq??52r????.
_?$]???k]G4?Bc"u??mt??N??w%jF???XOW~???
QZ???????m??:?|6?L2?i$`?]@?ZtA?]+Fo\?hJ}??????E????.6W?`???Rr???n?????????4?J??r??H??L?????#%??yi??????	?{C??`??:vl?_??
;???X????[dz?/????w??S?W??+@?Bu??79?6u??(?iGh??:????^?r?l?;5?C?qD?DuF??q3E?H
;??lHMuh?|?
y?Z1j???kU]^?6?R???e#?H??r
{?7m~];}?r??01,_V??c?`B???a???X?u={??r?juFc? VM???JV??8?Z?<<???Az?c?????
?f?uv?8?i?*u??a,
?[??????~?{?;?_????B??\??$???<??H&????E?b9X@h??zz,???'?x??V=??Nz?
?
??-??Z/t??????.??fJ|????E'??+x?a
???19+ady?A"Z?\?z`)?=??3???=???3@]????E?????bh???0??L??u?	d~PN????5v?:T?`|T?????B?????[C???.?xy????&p???s???*^?*^
e?????3?Bj?[??
DH?=???^Mrf?QG???mB?Kum????\|R???WC??Z????.???{~???
y?#p?g?UM????d??wV\?<??e+},??2??	E??=???^?B??J6
?
@9??????? 
_?j?9??[%??hJ?_??t?????4?H~NMhi?=z??i-dD??n?9Zd?FF?????6R+?R??dv?
?6H?W??????]??L?},i??v????|
???v]c?z??/(?:n??.E.EOB?m???/i?q?d??tN????_?F???|dT?{-?J(??>D?T?-??L]?Y9?????4??o?K9/r5?;d]g|
?|o??g??????n?C?????{?.m0}<y??r5?qz????{?????"???<?R^?????C?X??D?S V?]??S6o?
??oK/2???4.K??zg??.????zG?V{L?1???B)??.???????u??sW???B(:??e
?"|,??|[7h<6???j?wR?Ch.3??"mB????.???S&?W??Jb?X?"~??%k<???\?P?P?;?Zz????????gU?h!=B?@?]v?$H?z????b???Lrg?Vk?Z???6
???+?6??E??a	???J?
?g'?????:?$K???OTK?N?y^?\?????j??7??[??@???8???
Q?M9	?1??B?u??v????P,?[#m2$?8R?_p?? 9???&CzC?z??????M9	?(h@"?j?mrH?W??%?;ghI??%;?????m????? -???;!??W??V?5??+H???~{
???C?.??????_??/??C?I??{???Bh??R]??R??e??
,??K?? ~	???? ?1X?H
v?
??????????	??az?mz??????!?&???????"?O?????[?-?kH2???W????e7????2?lt?????M??????F??F?iG$??X)7J)??D(?gY?Xm"???????????????b??/
|<
???e???}???????wHk??
?q?(??H? b??(?BW??????J
J)?1B
?b??
[???n?Q?
S&?/qTL?J?x?G.?m?bO?k??? ?_3Y??Qgyp?N?KP?E?0??S?2??*uUU?]e5??u???]??XW?:?Y!kZ?\?,??????&~d??L?d?U?????3@;|?e??n!???A?H??9W?e???&?3?K?0???k&?mnv???ZR?(????A???M???P:??M??l?Z??e?q?'bY???p8????
??]??f?6,?Y?_?_?//??
W?vD???	f/Q???Hc??P?+????3P.`?? ?Fn?:$q???m??R?Xw	Z?BFSG????s?
???MWm?E??P????e??>	??????4??N?|?N?X?B?T?:?YP?*)^?{l???
???????X
??u
?????vD?(
?%4????3E??*a?Z???#??A?Q<?A{<
Y$?bR?.#??@?Ji^?G?
j????D???i?PG?@??u??????Mn??????tCE???^??z?F?y??HiC"?!?f)V?1q"?d
o????)??a????at?? C??	HeuX?M?=~??~-?????Qo?^??}??O2=??TW??k??6
?|?8So,)a
1$??y??~S)A??
N/zE?{??A?X??????M?~D?5/??|???h??T?^m?@??u???Q.hC??n?
Q<n1v??%v?H??T'??H??D??`??iCs??i??G!???=hu??a ?a9?^????8w??S?????,????T?>????????????
gG??:?u?aOM?lz<??d??M@?}??:(??
???
??????r:?cS?k??MP??H?]?X???M?Wm?.Z?
?7Ih??EB?h	???<F??{?)#?H??@9??*Y????@??m????????K?@?m)mr???ZV^PuQ?&U?Z)}?	m?s??ot?#B?????Dq}EFr????????6??????m
?
zS?69?'??`??[C??8?=?*?a???3??C?M?xh??????????$?????ycP??3XG????t?w?$?????=?V?d??:?????swj?v?
??$@?????PrA???
3?&?6t????6?y?#???I???VE?
b?A??k?????U<f?P?=)????????Q?s???????:????nX??#????1a?????6??j?t?@??????"1y???#Tb
?:
b)VAG<x?0?+"T?GR????"O?`?
?,$???A?I?9>0?@??g0?M?K?UP?|?J?\???M9
e6\??%SDA???D?????o?7.\?q0
????M?tx?9??????????p?c??)?$0Q,"????W(?C??!*???+g???n????e?q???N?D????Z???????TQ??l?"?N????_:?g?8??p<?Q?uTA????YPg??K?8??}?)/???'%c???
 ?Rk
???g4?????F?2r?
?O???W??`:^
o"???_xJH??Cl???w?lC8??z6HAF??`?"???E?c~??$??'G?
L?}?!?82?qh???@??J??e_????!?	v???4?????T???~???6	????G?<r?4`c?zCx?L?T??%Mp???)????h'?A????^.b??E?#?|#???E?0J?v?0
6?IC?y*Q?o	UOw~?C?i?:S??G?W90??#?????6?????{??
????<Bc?L?<,"a??@??C???o??W?f???$??n4????@l??N?cO?:?
H\_?@OO???WA?|?????
?B?b??/??P?%r?J?,??????Zp?MZ??C?K??/'$???;4`?/????@?
qU???D?	?(??
???p?Dfl?/?????
??yx?P??K??e?????oO??kC??~
?????N???hn?+???h%!???=??	?????:H?Y???????!????d at pk?e$?kBl?9,??G?~*Aw??uK[??&S??%lC?C?|B<?	?Q??????
?p?D+	??????3??	?%ZQR?p??
??k??
?h
@?X.??
???;)?Et??8)???wX:?v?-!?@?F????????????sj]W??v?????'"?}?????O ?W?'@?h?/v?|k?b'?^?'??'?-<????0??Ao>b+??3XgP??????%?-????dI?k??=Eb?E^>??H9m
??3?/?
?KB?GY???i?I?K)?I)?"??B?|??j??f
-????Nj??J?#	r4?yQ<?????`?cQ???????F?bt?We[
?yL?B??V
?$?C?????!S?M	mD?
i??'??^@?o???r?ll'%???
???????xa?r??.??E??t?%u?m?%!.\?d?J?,T??N?*??d9??.n?C??5R???Ix???\
????????+??+C????1H??6%L?ZI?i??L??H?A??$???A??B<??????}D)|?b??
h?,NID;??dA?1????N?w!i??}???m?P?(????G%u???j??I?zH.,?D??????#)???H9???B??)Qt?
?0???E:?:??p?-??hAW?D?E??6?)VDB$p}???\?:?>
?W?R?6?O%?h?)?_,
?A???$
?E????
?{tD??N)?>i}g?lhR???x7:?i?j???Yq?{?J??g?????????
?vuME?z??$?$B_|?x??{hG

???E	-???
?6??t????i????E?B?????h??x?D
q?DA\?^??b^$[?q??
g?G?>??I
"??????K???&??
H?
$hG?????
??????e??x+@?EG??
??1??`?7?7%v???!h??? ???'??p?
?=?Zs??3w^??k?I?^??^@??P?
??7?.Y?(b??P<????"?g?jsl.S?N4?_#???	4:k??V???.?????????8? ?W????????J??!Dh2!?`???7???~??$L?????U?????$
gO-??J?.\?-?w???GA??0?????I?
A??%?s???)??>@&?6lX??D?2?y??N???@ S???vNB??2??YrW?7?>?T?'???$?'q???0EL?}?G??D?????3?.I?)???=I??v????yS
??
??uIb_???S???n?g?c`??{;
?)7?T??va?7?<u????????????S??FLy???l?.F???????.???RG_?:?d?
????
?_?(??b?L?;^?Vz}!?
{?KL??Ev??
?)?[?_??;z??i??/??&a?
????~
A?G?]^
?X????~??ko(Re??.U?
???m??-a]v???????2????b????C?+`?
?????? ????8lXnE???c?
??&?@x?N?^IM?P(m?K?H?'MH?J???????t5?L????????$z??z~n74O%v?Y??h	[
?UHX?3
??$???C?Q?_??,????????
?t
?#?,?dP]?-;f8?+??M??$z????`??? V???????3??f?:%???[?Vv?uRR?;?????????&l????? ???$???????z0(.?,{s??p4C.M????VRnr??<?R??6(???y??????<???&???`???l??7l???Ho"bJ????|dr?#Pg?
 q??S??X<?@?T~?????P0}V?I0???t???	Z
?T?W>?5??@??^?@?4e?W?&??h??E???zA
?????(?Ma??@C??@???O ???????Q??/?b??:??`?&?sjC?=	?C?????b?&Y?*|?f1??Xn?H???-???l	?oH1?<?%?+S6???
?E.??ij
????0?W{
???'?

??v????g??????.?%v??
r???+?
	|?!lD0b?????4?w?%X[?XEI"??a5%?R??s???&?&??w;	?!??????F?W$?E?|z?
Y?kd
G??!?????????'%u???*??p?p????%??pBl?m??6)??Pg0z???v??'?JB?N??`:\w"w?G{?F?(?
?:?????&??
???????C
?;????#@ _eB??)???U?M??	_??"??V4D???????M????[mN??????DH?
????????o?????
a???i
?A"??A?F??=??$??$??	?PHK??^???]?7?????^?YY?hO??3?/???sF??-?5???f?vx?>????? ?[B;'Q???>?????!?
?3???r?q???6
?}?)?Rb}m??#????!f?1????????r
?	?	o??$?:??N????d?{???~ ???8??7???$??
N?
??????)???R?A??>_?q?x?S?~??UM?5l?z=OxlJ???I?cP????H?mj??xI????&lH??
???o???@???o??l?j?~??
?????LdB??7 ?@T6????jgP8L??
?"@;u?8"???l??>?H;"?=W?	?E??
w2$?????(?{???j?wp?i??A?{*?s??)?N?w???????\s??ky?f
??N?v	?kn??P!??	l??ok1p ?????$z9???&.'????"?????cy????J?%?0?????
??
Y6?S9?Q@+`??D??a+)?^#??@?????
??e)?
??7?lXG%}?|?7 ??&???!?k
????????????d??
5??hS???-J?????F???2?t??".????!??aIhc7??#9?"L???<R5?$-?l?yy?$??ax??H;c >?'?P!?\?
?l??RB?@?7|?+?L?
"?????u??

??w\?K????>??e%?"????Q?? ??D????6,^:>
???? A???n?$??"??lj%?Q?J???]?
??AD+4C?7%?_?????d?3)??(?dg2?A?h?????	O?7???u?7?l?A??v???u?gW?????T??????_?"[?Z?#T3&<&
???T?>$G??
????)	
?IqRR???D{?0??l??6H?d???????"?	???Wd+@/=???:?B?>??&.V?%?6"?z?/u?
J?,??
???W?Drj????=???
n}lB?FrSs?s???G??L|!LJ?kj??
v[?
??mP??%?otK??
@&??????S???
B?
Iq;F2?>??;8??1??5ble??}7xv[
???d??P?q?a?p?'??C
???hE?W#	?????l%I??
???N???|?a,uVR??????V?????z?L	5?)/^Pq?A?SC(??]?o??C?Z|7?)n?u3-8?O????I??-?YB???????*hC?"??B<??????,?$??( vY????w?????N
?JTr????{???????N??J??W?????
??iY??1?0??\!s.????9
vPbgA?????+???@U?oJ??{?G?w????N??p?8?'???:C?????m?7`?H?
??wO???????Id+????(??1?3?7???80??^??@;'?EFHD?#???EI????P3???ctJ?/;;H??w??/??
????
^:??6????X3??>????p? ????
W???O??6	To,0???N??
???#p????7>PV??
??Y?h%?f?	l
e?;w??jC?C?K????	xID6, ?m
?_Y
/B??z?,{	??????m???$?W?f??7`?X???(*?
o??C???Y?u	U"?/?v??????O[?%
????Q??y????`X???zURg`?	????"?)?3k*?V$?7?????0'?^?DL?s????s??*N;?Ce'vA?$L???pA`g4?;&!??s??e?Gr? P}??H??J???*?'?"??z'????	[Q<???hP?G??4?2??9[?? ??G08vTR?K?????K???v?X??	????z?Ux??~j????????7l???=?_?M????l??&????t???5??>????
l?mKX?st?$???W????????{?b?F??>??HhO?W??I Q ????&o??G????!:??e?;??????:b?w07g?U<
;???VZA?%a-"??q??+WO???u?C?'S?{??/G?>I????????Pg?M@?2@?????	[
??!??t\
9???f??!SN*j???r?J?]@?R???xY?j???wx?e??N?
?*?:r?C??D+@??iG%u?pM??<l@\:.q]??=?x?z?$??&?S?????K?	?Yq??h??.?M`?RE??5??w?KG?^???h	]??1????b?K6&L???Ho?z????
?1a?#4?*??y?k?$"VG%?f???h%??&?????l????#mJb???????1???
z;?u#|?"?=???C??4B?2{xj>B ?*>?`???j???-?"9?[??6ZPg?
???????QH??N???w???;?q?????J?(?D?o
?D????/*"?&F??t??.V?}?>??v.?	?[?6t(E!????5s5z?e??Z!?
????????1y.A;???? ?I?V??"?>????o&???
H???,t6???b?)o??`heg?????a?5?b??Q?	???/+w?????fd??? ??a?
z???
??d'????a?&?{?Y6???O??c?\??d?q??F????9?dc_??[?i??yW??;?????fZ?2????/??P???????w?7?Z?L?JF?>?4??+?2??5?'>Pm%?%W?M?p)?y7??)?ND?
??
??b??????^????E?"??F^
&{
}???)D??D??D+I?`? R? K?hJ?D? Y??a??v_???KB?
?YaS??
?.Y"t?@??D?????h%	?4!$????@+`r?S?PBy#8?????
Hs?7%q?@?9jZ?
?qK??? *?-IJ??!ZI77????.?? ?K?l?z????oa?gc?k????????	?}
???>???II??Ug????D?1?V$????O'?EX?_?`?x?/E???0?s;???>:
'????d:?????w?p?RD>???.`??@???{?,???gBj?~1???8
?)|??A??hL??$?^??
6*A+?g_?S?A\.rdW???I???.?]??????"?^?)a+I??????k6???F?????J??\^
??>?#~????D%??Ti??F?+#?$B??H1i-?R.D+I???????ZG???O?#?????a??Q
2??y??T?s??	?T:??!X?????
??&????KG?????yB???^
???D+
???:b*.
=????????"?b????NH???Z?^?:?I??
?@"?Z??l?'2???????cT????&??$n
 ??.????t<u
*?@	3
???T???B	?E?!Y?Q?y?$`?p?"?e^?????
BPZ?,??O??`?j ;_?H&!?U????eG?87FR@?Beh??x?%??????????%?G?"
??,U????????
p
qX?
?
`??3}?????A3?7??xW[a|x?'&/??|$h?~|???d????8z?&nu&?X,Q?Pg0]???$??`?C?l?+{>??;u??v??,.O?T/???h%	D^6?H??!wB???lbJ???g??t'Sn6,	?K?????	?y?L????4
?$????R????1	?
Lv?J} ^?q?%??M???CzW????I?Z???p?h??^@v?????????JtPX????2(???a????&??g???h???lD?o@??r'rEz??9<????
??*?ZE???rB?r%R??/`T?Hn,MD????u??z?&??f???
?Q at ub??7????@i???"???.?>???I?????e ?wV+97???.I?x;?`??/J ?????7%u??I????!B??z??{?X? 4?4
I??)????%?????b????H?Ffgo,????l09?&+???a???????C
??z=?I??#?$l???6!?7??y??!E^w?GyADD+Id?)a???c?;???	??1("u7?
A??3?????
P
H?????@?O]???8?\????jK
'?.=??F?Y?kFC?|???????????????\;yeR?.E??p??
????I??H??p??1?\?? ?3g???5!	??E???????`{D??9a??U??????.???
A????????b??&LI6?D?Og9?Nb?$?J??DNqKH6?$?{?^"R [?dA?12?rNH?|?b ?V??F%Ag???LV#?T??tX
????$V4#???[rM????G2??|5??>8?vs????F????1??	?C??]???C*???1v????PE???$i?A0H?M????Y?!a;?)???EAr<JW?`J
?~?8x?Y???2?"?'?`?
X???.?7A?Z?'??
???g!6.?q?ls??????lP?l??,??b6???l<??}
??.??$????oi?????.??F?u??[???w?A?u?$_???V$??8mJR?%????d`???!?+
/??4th
?G8??=S?V
??~%???n?~?Ob?	?u#?U?3??$G?9???O?IU??P?6I???<K??r?FBb????A_???Ss0={c6m?C?	`?`g??9Fql?,0????@?AO?`HvTQb?K?k?V@
?a+P????????8?????d? Y;?AB??0??????b?q???IE??? ?b ?d:???h??
???k?????t????J?mvpwyu
?&??b? ?3?yF?@??n???????D
?????$LNZ3J?T!????-??HF?????H6??z??#%?A?r???0?$?????>?
???C????@;:??@ Z??Y??Q?*????X?U?V??is??vF??@A???D?mG\??`???9?P??YJ????!f???@$c?d?i40F??@F
H?a ???dL?????C??f?!C?????$f?$d??*??????=?C?:{?r!tj?&;&?)???-?;?c?$"?I?????R6?*????e0?TLg	=U?Y??I!/zF??P?o?@?
??KJ??5?$B?AV?r?Di#ZI7?`?kB??:R
)??r??????		r?????m??6??_?O?zm????'?8LB?3H?F^K???,????=%?????Z???????NCKy??
??Ar??t?/??;>??8@??D??`????#?R???k ????'?`gY?????????6?CgDdmT?2?c?A?b?(?{ ?3?q
F?????~$??qI
(Ej??\?O???I? 3?R??8?Z4?vTQ?
?(?6I{?B????P???Y?j ????;???K?>?.y?I??~?? T;-????????d??G-:r??P2I??AY?d?&???????D+[4?']]z?-d]?G??
=?zJ??`]9?"?{6@??tT??*8???TACB???;?;??Q?V?w?Y??H5???$3O;=
??????????+.????6K?}~l
??0?gaS?P????&??@???ApaE???
@??`6??,?lH!??????<?D.???]?????
?`m???dEy1???????%c?d\0?W??D??A?T;?)?w	?^???
-B??8????.*????o{??I^??#>b# _?? #??A??"J??? '?)I?4???:???Xqb??2?$??{??????1?4??2^?N???R!??!P$?t'?(.Z???L???????!?_]}????.
\????1?<?T?m?9?????{I???,hP?v?7?B<U?U?i??????*?l????c7????WF?#?x?>R????.???
??	A?4?rC???vF??3?K6M
?TK????\??????K?B?!??z???u
???.?	[??,?%b?3,z??[??|?k?o?X?????N)f$?:???-`	S?vv???P?????
J??>???????o?6??F=?})?'=I???\z???p`8#?C?sH???A???
 ?~?<q??
??Y?b?/|??e+*?N?????<????}??0Fg~b???????????A?X?8??H??BG??
?1G??????0e?.@]?v?1[?:?V?yF??@??Dv??\???%?"?vDJ+?cqp?????vV
N?d?!#??1???MA*98???F"\???Y????uI"jC?C9?%a$@0?L?L$???;?\wL?????<?!o?!?????5?9a]??%??ss?8??????C?09?g??
.??A+????????/9???s~h3?&
?Y?}~ao??????,$Mt??!DrfQ ?K???$?[?G.Dr#H3??Y???,?????? ?B??????V;H??G?????h+F?I??r?pF2?Hv|?0??F?Wdv??V!?$p#<F
`c?9g!?.@]@?yD+?#??????
?"??1??$?a????>??Th';??j??T>??d????	???????@mH?)ea???`H!??J?).G??<yB???!5$c?L?????%c??50N???mDJ?????C?C?????MY????+h3???F?\
O:???n???$h'???5?
?k???q??Lv?T?iDr?YE?#?(???V#ZI"??v?d?L?l1?}???D??F]?@w1?8?r?n6?CaIbX?0????T??W?v???F????H?CSc0)A?YE?
?=4????

.?r?^???$????AV?C?D?u?@$?Vp??D?4W?+???2?
??V!F??C??]?,??"???A??^BY?j?!s???5???9:?!H???????O???F??x???????"?O6g?J??????doFR?O?)???
??T????$????j"??ZA?????@]v|$1xS??er?.
?+(mZ??;?????p?/
d??"I???n?,P??H?
??k?hd%"?IPc\'?7??rb ??>u6??@K?>?B?y??@???B????7????N<?????????N?O??j???????W?
@???Q??7?t?>?z}??k?G?a;
?Z
?
??#????(??M??D??T?9???)?#?B??B?!Z??}??????s\UX?v?0	?/?????EL??n?#??a????fG
4c??S?w??`;?? ????Wj????.?>?B?O???E`???;c7L@]?v?8?#?????=????h7$??????/n???9??:`???`???v?JD;?????S??5???va??u?w?!??????????uI??v?>?
`??q???v?? $QZ8}t?V$???I?}
?+I??????an????l*?.@]@??A?.??;????????S??@]??=?,<?H???V"????79????0?fIP????????.?	[?g???{b%??@??/-??.l?>(?,????
?(?T???K??w??E?b|
?#? ??@a????Gjn?,?l?
,?l?R-E?Z??nl5]FF429?{n?TvL?t6
?????w??T5H?.?js	I???w???4Yi???GF???t? [D:?/?^h'???????,*??7L~?@???
GGl?[@?????????j{t?	hrZ_?n
?a?2???m????~
?6'?S?6?OPy8Mx?
???x_??v???.J|???a?}!?=J	??iB??`l?????!@???1??j"B?\??=+rp???
:??ZF?4?S?Q?#??(H?-	??L??f????????9k7?:??.?y?_[?G?
?0? ????*?R?????`?t??Zh',h???; ??
lEH??T??x?C?
????
????w+????O?_`'??@Qzpmf?z?"?B?)?e)??K@?W??
H({?i@???jG???F????e?
???QTL?Q#?S?C????6'?S??3??1P)2? 9l?^??j?C?? ????`:??Gl??T?????????
d?1&*I?&
??0.H?4Q?h?$?@?D?,???|6?x??r????T~{?e??*zT??
???????'???O$?7?z??7le?s?{????@;?g?`?K????????G??U???hHL??????r
?@??????lG???@B?~????#?xH?H??$?????;?
d?i ??A?C??&?=?g??x????????.
?5 	???A|??W]R?K|(S?76P3??1?1???08?5?2?iSBZ3??????????N&
(?	olz3?-??e?HX????!W
????xU???8K???s>T(;@??tG\???Gp???8?j?j
"mF?R~?
?D$?????V?L??B?]T???????0???r#%?7D?$?O??&?Z??=?jER/rt??#????37??5	;?Cz?s,??y??AD?N	?{?0?????,J?.V??a?@K??z?p??]?????<???S%?K??@?1??!"
????????????y?dB???dEf9????%?rL?j???6d:???Y???kEE?	l???1F??????b?N6??p;Q?lo?2W??Bj??O??A"?:???????~?s???????????g?=I?????Z?
?????????tX?"??B?i????;!p?~?hA?^U???{????F3??
x??1Y???????h?????????S????t<?????
?Qo?k????P?q????mvT??pd?J?3?g??????????^?6?mFx??}R???X2>??O???IE]:<?dK?M?M??(?'`G??	?s?rl??W?^
[??G
	???.???Z?K	$?gl???4?&???U??
?p
???
?B?Tn?
yh?|e??P?/lE??;??8(;]`*^??G?l????2??*?e?P_t????gj$???B?R?qHo????J?|????sKl ??&???v?H??[???
?D+r??pZ?)??^
6R?????q?R?J?Yhs?G]
?waG
c?Z	????.???Hh'{v?????d+??@f?N
$?1P+?V?????0|
?`"??@??O??uU?6z?
?&_?Y?d????xY|??.q??o&?
?&?.?
??f?D4?:b??+D?SB-*???X
:<T???G???N?M;?I$?V???{??L??o?u????
?$?uEbn?]?g_
;??Y?;?|?O!@?????K??vQ&????M^jp;$T??m??D?g??/
????s????.|???8?
_?}}??_?D????Z???????k??gi]?
?,w?????`???5?x???
?{??;??c?8?!~rG.???&????N??`+?Y??Xw?-?YW????P??I?vD??m?^??????@0?<y??}?# N>5
?kA??lJ???s?/?#??????!???~V
??7??L(??.??
D(?
?&a????(l???;????N??^???m?O?v??]??v?_??T?OY??????n???k? ???v???d6????bO????????N?
??
??$??V$->O$|????Y*??h????;
??q"?I?~???\?J???J?M6??m?6????g??Z???W?~?c?]?U?q|?/??jS?o	u?Wo????Ch_?{?6!tV(?S`?A??V?s????????JD!}?@???????k???}???D+H?WC??;<?P?
o#?/?B6O?BN?????

?0D??W??R(??')??7??B???4+?T?_o?/??????7E?????p?SP?	???Y:

?d?F?riN??????^???N???.?|Xj?J?????2?????S?;O??(?v6w??&?N???????9????1U?y???=n???<?"?????3??????z6?\?T??X??D?CK???
z=K,???fJT?6?@Z?f;????P,?6???
???p??$X????d
??????=[??????=?????M??Z?W???4[?S ?2?H?R$?
S????0[??




--- NEW FILE hunspell-ur.spec ---
Name: hunspell-ur
Summary: Urdu hunspell dictionaries
Version: 0.6
Release: 1%{?dist}
#http://www.codeplex.com/Project/Download/FileDownload.aspx?ProjectName=UrduDictionary&DownloadId=39372
#and click yes to agree to LGPLv2+, which stinks as a download-url :-(
Source: UrduDictionary.xpi
Group: Applications/Text
URL: http://www.codeplex.com/UrduDictionary
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+
BuildArch: noarch
BuildRequires: redland

Requires: hunspell

%description
Urdu hunspell dictionaries.

%prep
%setup -q -c -n hunspell-ur

%build
rdfproc hunspell-ur parse install.rdf
rdfproc hunspell-ur 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/ur.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/ur_PK.aff
cp -p dictionaries/ur.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/ur_PK.dic
pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/
ur_PK_aliases="ur_IN"
for lang in $ur_PK_aliases; do
        ln -s ur_PK.aff $lang.aff
        ln -s ur_PK.dic $lang.dic
done
popd

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CREDITS
%{_datadir}/myspell/*

%changelog
* Wed Sep 17 2006 Caolan McNamara <caolanm at redhat.com> - 0.6-1
- initial version


--- NEW FILE import.log ---
hunspell-ur-0_6-1_fc9:HEAD:hunspell-ur-0.6-1.fc9.src.rpm:1221688128



From kyle at fedoraproject.org  Wed Sep 17 21:59:39 2008
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 17 Sep 2008 21:59:39 +0000 (UTC)
Subject: rpms/kernel/F-9 linux-2.6-intel-msr-backport.patch, NONE,
	1.1 kernel.spec, 1.768, 1.769
Message-ID: <20080917215939.BED497013C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19331

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-intel-msr-backport.patch 
Log Message:
* Wed Sep 17 2008 Kyle McMartin <kyle at redhat.com> - 2.6.26.5-42
- From Chris Lalancette <clalance at redhat.com>:
   Backport KVM Intel MSR fix (efa67e0d1f51842393606034051d805ab9948abd)


linux-2.6-intel-msr-backport.patch:

--- NEW FILE linux-2.6-intel-msr-backport.patch ---
--- linux-2.6.26.noarch/arch/x86/kvm/vmx.c.orig	2008-09-17 15:49:13.000000000 +0200
+++ linux-2.6.26.noarch/arch/x86/kvm/vmx.c	2008-09-17 15:51:33.000000000 +0200
@@ -914,6 +914,18 @@ static int vmx_set_msr(struct kvm_vcpu *
 	case MSR_IA32_TIME_STAMP_COUNTER:
 		guest_write_tsc(data);
 		break;
+	case MSR_P6_PERFCTR0:
+	case MSR_P6_PERFCTR1:
+	case MSR_P6_EVNTSEL0:
+	case MSR_P6_EVNTSEL1:
+		/*
+		 * Just discard all writes to the performance counters; this
+		 * should keep both older linux and windows 64-bit guests
+		 * happy
+		 */
+		pr_unimpl(vcpu, "unimplemented perfctr wrmsr: 0x%x data 0x%llx\n", msr_index, data);
+
+		break;
 	default:
 		vmx_load_host_state(vmx);
 		msr = find_msr_entry(vmx, msr_index);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.768
retrieving revision 1.769
diff -u -r1.768 -r1.769
--- kernel.spec	15 Sep 2008 23:50:36 -0000	1.768
+++ kernel.spec	17 Sep 2008 21:59:05 -0000	1.769
@@ -692,6 +692,7 @@
 # get rid of imacfb and make efifb work everywhere it was used
 Patch2600: linux-2.6-merge-efifb-imacfb.patch
 
+Patch2700: linux-2.6-intel-msr-backport.patch
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1275,6 +1276,7 @@
 # get rid of imacfb and make efifb work everywhere it was used
 ApplyPatch linux-2.6-merge-efifb-imacfb.patch
 
+ApplyPatch linux-2.6-intel-msr-backport.patch
 # ---------- below all scheduled for 2.6.24 -----------------
 
 # END OF PATCH APPLICATIONS
@@ -1866,6 +1868,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Wed Sep 17 2008 Kyle McMartin <kyle at redhat.com> - 2.6.26.5-42
+- From Chris Lalancette <clalance at redhat.com>:
+   Backport KVM Intel MSR fix (efa67e0d1f51842393606034051d805ab9948abd)
+
 * Mon Sep 15 2008 Roland McGrath <roland at redhat.com> - 2.6.26.5-41
 - utrace: Fix common oops in ptrace EPERM case.
 



From caolanm at fedoraproject.org  Wed Sep 17 22:04:44 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 17 Sep 2008 22:04:44 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org-simple-crash_report.sh,
	1.10, 1.11 openoffice.org.spec, 1.1653, 1.1654
Message-ID: <20080917220444.A65E57013D@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19678

Modified Files:
	openoffice.org-simple-crash_report.sh openoffice.org.spec 
Log Message:
Tswana, Ukrainian, Urdu spellcheckers


Index: openoffice.org-simple-crash_report.sh
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-simple-crash_report.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openoffice.org-simple-crash_report.sh	28 Mar 2008 09:50:12 -0000	1.10
+++ openoffice.org-simple-crash_report.sh	17 Sep 2008 22:04:13 -0000	1.11
@@ -11,18 +11,21 @@
 echo "(III)  Desktop is: `if [ "$GNOME_DESKTOP_SESSION_ID" != "" ] ; then echo GNOME ; else echo not GNOME; fi`" >> $filename
 echo "(IV)   openoffice.org-kde version is:" `rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}-%{ARCH} ' openoffice.org-kde` >> $filename
 echo "(V)    libgcj version is:" `rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}-%{ARCH} ' libgcj` >> $filename
-echo "(IV)   kernel is:" `uname -s -r -v -m -p -i` >> $filename
+echo "(VI)   kernel is:" `uname -s -r -v -m -p -i` >> $filename
 echo "(VII)  OpenOffice.org core rpm version is:" `rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}-%{ARCH}' openoffice.org-core` >> $filename
 echo "(VIII) accessibility is:" `gconftool-2 -g "/desktop/gnome/interface/accessibility"` >> $filename
 if [ -e /etc/fedora-release ]; then
-echo "(VIV)  fedora release is:" `cat /etc/fedora-release` >> $filename
+echo "(IX)   fedora release is:" `cat /etc/fedora-release` >> $filename
 elif [ -e /etc/redhat-release ]; then
-echo "(VIV)  redhat release is:" `cat /etc/redhat-release` >> $filename
+echo "(IX)   redhat release is:" `cat /etc/redhat-release` >> $filename
 fi
-echo "(VV)   LANG is: $LANG" >> $filename
+echo "(X)    LANG is: $LANG" >> $filename
 echo "...start free space details ..." >> $filename
 df -k /home /tmp >> $filename
 echo "...end free space details ..." >> $filename
+echo "...start (default) java details ..." >> $filename
+java -version >> $filename 2>&1
+echo "...end (default) java details ..." >> $filename
 if [ -e /usr/sbin/sestatus ]; then
 echo "...start sestatus details ..." >> $filename
 /usr/sbin/sestatus >> $filename


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1653
retrieving revision 1.1654
diff -u -r1.1653 -r1.1654
--- openoffice.org.spec	16 Sep 2008 12:13:35 -0000	1.1653
+++ openoffice.org.spec	17 Sep 2008 22:04:13 -0000	1.1654
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 6
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -1081,6 +1081,7 @@
 Summary: Tswana language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-tn
 Obsoletes: openoffice.org2-langpack-tn_ZA
 Obsoletes: openoffice.org-langpack-tn
 
@@ -1223,6 +1224,7 @@
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: paktype-fonts
+Requires: hunspell-ur
 Obsoletes: openoffice.org2-langpack-ur
 
 %description langpack-ur
@@ -1251,6 +1253,7 @@
 Summary: Ukrainian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-uk
 
 %description langpack-uk
 Provides additional Ukrainian translations and resources for %{name}.
@@ -3678,6 +3681,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Sep 17 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-6.2
+- Tswana, Ukrainian, Urdu spellcheckers
+
 * Tue Sep 16 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-6.1
 - next candidate
 - use system jfreereport



From rnorwood at fedoraproject.org  Wed Sep 17 22:11:34 2008
From: rnorwood at fedoraproject.org (Robin Norwood)
Date: Wed, 17 Sep 2008 22:11:34 +0000 (UTC)
Subject: rpms/pygame/F-9 pygame.spec,1.23,1.24
Message-ID: <20080917221134.A30EA7013C@cvs1.fedora.phx.redhat.com>

Author: rnorwood

Update of /cvs/pkgs/rpms/pygame/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19988

Modified Files:
	pygame.spec 
Log Message:
Restore Obsoletes and Provides for python-pygame and python-pygame-devel.


Index: pygame.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygame/F-9/pygame.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pygame.spec	26 Aug 2008 13:37:26 -0000	1.23
+++ pygame.spec	17 Sep 2008 22:11:04 -0000	1.24
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python modules for writing games
 
 Group:          Development/Languages
@@ -17,6 +17,11 @@
 BuildRequires:  libpng-devel libjpeg-devel libX11-devel
 Requires:       numpy
 
+Obsoletes:      python-pygame < 1.7.1
+Obsoletes:      python-pygame-doc < 1.7.1
+Provides:       python-pygame = %{version}-%{release}
+Provides:       python-pygame-doc = %{version}-%{release}
+
 %description
 Pygame is a set of Python modules designed for writing games. It is
 written on top of the excellent SDL library. This allows you to create
@@ -30,6 +35,8 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       SDL_ttf-devel SDL_mixer-devel
 Requires:       python-devel
+Obsoletes:      python-pygame-devel < 1.7.1
+Provides:       python-pygame-devel = %{version}-%{release}
 
 %description devel
 This package contains headers required to build applications that use
@@ -92,6 +99,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Robin Norwood <robin.norwood at gmail.com> 1.8.1-2
+- Bring back Provides and Obsoletes for python-pygame
+
 * Tue Aug 26 2008 Robin Norwood <robin.norwood at gmail.com> 1.8.1-1
 - Update to new upstream version.
 - rpmlint fixes



From bpepple at fedoraproject.org  Wed Sep 17 22:31:57 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed, 17 Sep 2008 22:31:57 +0000 (UTC)
Subject: rpms/telepathy-salut/devel .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 telepathy-salut.spec, 1.19, 1.20
Message-ID: <20080917223157.2218B7013C@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-salut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20680

Modified Files:
	.cvsignore sources telepathy-salut.spec 
Log Message:
* Wed Sep 17 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.3.5-1
- Update to 0.3.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	23 Aug 2008 19:48:49 -0000	1.14
+++ .cvsignore	17 Sep 2008 22:31:26 -0000	1.15
@@ -1 +1 @@
-telepathy-salut-0.3.4.tar.gz
+telepathy-salut-0.3.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 Aug 2008 19:48:49 -0000	1.14
+++ sources	17 Sep 2008 22:31:26 -0000	1.15
@@ -1 +1 @@
-1cf9e0a1c6becbbeb5872e7a77e9fc77  telepathy-salut-0.3.4.tar.gz
+6d0ea6298e23b0c1f4453f0f143f3c57  telepathy-salut-0.3.5.tar.gz


Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/devel/telepathy-salut.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- telepathy-salut.spec	24 Aug 2008 22:16:10 -0000	1.19
+++ telepathy-salut.spec	17 Sep 2008 22:31:26 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           telepathy-salut
-Version:        0.3.4
-Release:        2%{?dist}
+Version:        0.3.5
+Release:        1%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
 Group:          Applications/Communications
@@ -58,6 +58,9 @@
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Wed Sep 17 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.3.5-1
+- Update to 0.3.5.
+
 * Sun Aug 24 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.3.4-2
 - Build with libasyncns support.
 



From lmacken at fedoraproject.org  Wed Sep 17 22:34:03 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 17 Sep 2008 22:34:03 +0000 (UTC)
Subject: rpms/python-prioritized-methods/devel import.log, NONE,
	1.1 python-prioritized-methods.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080917223403.B4C767013C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-prioritized-methods/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21054/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-prioritized-methods.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
python-prioritized-methods-0_2_1-1:HEAD:python-prioritized-methods-0.2.1-1.src.rpm:1221690750


--- NEW FILE python-prioritized-methods.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename prioritized_methods

Name:           python-prioritized-methods
Version:        0.2.1
Release:        1
Summary:        An extension to PEAK-Rules to prioritize methods in order

Group:          Development/Languages
License:        MIT
URL:            http://pypi.python.org/pypi/prioritized_methods
Source0:        http://pypi.python.org/packages/source/p/%{packagename}/%{packagename}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

Requires:       python-peak-rules >= 0.5a1.dev-0.2562


%description
This module provides four decorators: `prioritized_when`, `prioritized_around`,
`prioritized_before`, and `prioritized_after`.  These behave like their
`peak.rules` counterparts except that they accept an optional `prio`
argument which can be used to provide a comparable object (usually an integer)
that will be used to disambiguate situations in which more than rule applies to
the given arguments and no rule is more specific than another. That is,
situations in which an `peak.rules.AmbiguousMethods` would have been raised.

This is useful for libraries which want to be extensible via generic functions
but want their users to easily override a method without figuring out how to
write a more specific rule or when it is not feasible.


%prep
%setup -q -n %{packagename}-%{version}

%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,-)
%{python_sitelib}/*

%changelog
* Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> - 0.2.1-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-prioritized-methods/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2008 18:52:59 -0000	1.1
+++ .cvsignore	17 Sep 2008 22:33:33 -0000	1.2
@@ -0,0 +1 @@
+prioritized_methods-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-prioritized-methods/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 18:52:59 -0000	1.1
+++ sources	17 Sep 2008 22:33:33 -0000	1.2
@@ -0,0 +1 @@
+1e9d9de02291b0fc27942b48c170ddc3  prioritized_methods-0.2.1.tar.gz



From kkofler at fedoraproject.org  Wed Sep 17 22:35:19 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 17 Sep 2008 22:35:19 +0000 (UTC)
Subject: rpms/kdegames3/devel kdegames3.spec,1.8,1.9
Message-ID: <20080917223519.33CDA7013C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21281/devel

Modified Files:
	kdegames3.spec 
Log Message:
* Wed Sep 17 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-2
- remove no longer used libkdegames development files


Index: kdegames3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames3/devel/kdegames3.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kdegames3.spec	29 Aug 2008 15:02:04 -0000	1.8
+++ kdegames3.spec	17 Sep 2008 22:34:48 -0000	1.9
@@ -9,7 +9,7 @@
 Name:    kdegames3
 Summary: K Desktop Environment 3 - Games not ported to KDE 4
 Version: 3.5.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Amusements/Games
@@ -45,9 +45,7 @@
 Requires: kdelibs3-devel >= %{version}
 
 %description devel
-Development files for the KDE 3 gaming libraries.
-Install kdegames-devel if you wish to develop or compile games for the
-KDE 3 desktop.
+Development files for Atlantik, required to build the Atlantik Designer.
 
 %package libs
 Summary: %{name} runtime libraries
@@ -139,6 +137,9 @@
   esac
 done
 
+# remove libkdegames devel stuff, not used by anything and conflicts with KDE 4
+rm -rf %{buildroot}%{_includedir}/kde/k* %{buildroot}%{_libdir}/libkdegames.so
+
 
 %clean
 rm -rf %{buildroot}
@@ -183,12 +184,14 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc libkdegames/README libkdegames/TODO
 %{_includedir}/kde/*
 %{_libdir}/lib*.so
 
 
 %changelog
+* Wed Sep 17 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-2
+- remove no longer used libkdegames development files
+
 * Fri Aug 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-1
 - update to 3.5.10
 - update trademarks patch



From kkofler at fedoraproject.org  Wed Sep 17 22:39:27 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 17 Sep 2008 22:39:27 +0000 (UTC)
Subject: rpms/kdeaddons/devel kdeaddons.spec,1.74,1.75
Message-ID: <20080917223927.818237013C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeaddons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21793/devel

Modified Files:
	kdeaddons.spec 
Log Message:
* Wed Sep 17 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.10-2
- build without libkdegames.so symlink


Index: kdeaddons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/devel/kdeaddons.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- kdeaddons.spec	30 Aug 2008 00:27:04 -0000	1.74
+++ kdeaddons.spec	17 Sep 2008 22:39:26 -0000	1.75
@@ -7,7 +7,7 @@
 Name:    kdeaddons
 Summary: K Desktop Environment - Plugins
 Version: 3.5.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: User Interface/Desktops
 Url: http://www.kde.org/
@@ -35,6 +35,7 @@
 
 %prep
 %setup -q -n kdeaddons-%{version}
+sed -i -e 's/-lkdegames//g' atlantikdesigner/designer/Makefile.in
 
 
 %build
@@ -81,6 +82,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.10-2
+- build without libkdegames.so symlink
+
 * Sat Aug 30 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.10-1
 - update to 3.5.10
 



From lmacken at fedoraproject.org  Wed Sep 17 22:42:04 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 17 Sep 2008 22:42:04 +0000 (UTC)
Subject: rpms/python-prioritized-methods/F-9 python-prioritized-methods.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080917224204.562027013C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-prioritized-methods/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22006

Modified Files:
	sources 
Added Files:
	python-prioritized-methods.spec 
Log Message:
Initial import to the F-9 branch.


--- NEW FILE python-prioritized-methods.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename prioritized_methods

Name:           python-prioritized-methods
Version:        0.2.1
Release:        1
Summary:        An extension to PEAK-Rules to prioritize methods in order

Group:          Development/Languages
License:        MIT
URL:            http://pypi.python.org/pypi/prioritized_methods
Source0:        http://pypi.python.org/packages/source/p/%{packagename}/%{packagename}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

Requires:       python-peak-rules >= 0.5a1.dev-0.2562


%description
This module provides four decorators: `prioritized_when`, `prioritized_around`,
`prioritized_before`, and `prioritized_after`.  These behave like their
`peak.rules` counterparts except that they accept an optional `prio`
argument which can be used to provide a comparable object (usually an integer)
that will be used to disambiguate situations in which more than rule applies to
the given arguments and no rule is more specific than another. That is,
situations in which an `peak.rules.AmbiguousMethods` would have been raised.

This is useful for libraries which want to be extensible via generic functions
but want their users to easily override a method without figuring out how to
write a more specific rule or when it is not feasible.


%prep
%setup -q -n %{packagename}-%{version}

%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,-)
%{python_sitelib}/*

%changelog
* Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> - 0.2.1-1
- Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-prioritized-methods/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 18:52:59 -0000	1.1
+++ sources	17 Sep 2008 22:41:34 -0000	1.2
@@ -0,0 +1 @@
+1e9d9de02291b0fc27942b48c170ddc3  prioritized_methods-0.2.1.tar.gz



From notting at fedoraproject.org  Wed Sep 17 22:42:23 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 17 Sep 2008 22:42:23 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.108,1.109
Message-ID: <20080917224223.86F9C7013C@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22070

Modified Files:
	comps-f10.xml.in 
Log Message:
Update language-support group.

Turn off qemu in virt (not needed.)



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- comps-f10.xml.in	17 Sep 2008 16:11:34 -0000	1.108
+++ comps-f10.xml.in	17 Sep 2008 22:41:53 -0000	1.109
@@ -4493,7 +4493,6 @@
     <packagelist>
       <packagereq type="mandatory">python-virtinst</packagereq>
       <packagereq type="default">kvm</packagereq>
-      <packagereq type="default">qemu</packagereq>
       <packagereq type="default">virt-manager</packagereq>
       <packagereq type="default">virt-viewer</packagereq>
       <packagereq type="optional">gnome-applet-vm</packagereq>
@@ -4820,6 +4819,7 @@
       <groupid>breton-support</groupid>
       <groupid>british-support</groupid>
       <groupid>bulgarian-support</groupid>
+      <groupid>burmese-support</groupid>
       <groupid>catalan-support</groupid>
       <groupid>chinese-support</groupid>
       <groupid>croatian-support</groupid>
@@ -4849,8 +4849,10 @@
       <groupid>italian-support</groupid>
       <groupid>japanese-support</groupid>
       <groupid>kannada-support</groupid>
+      <groupid>kashmiri-support</groupid>
       <groupid>kashubian-support</groupid>
       <groupid>khmer-support</groupid>
+      <groupid>konkani-support</groupid>
       <groupid>korean-support</groupid>
       <groupid>lao-support</groupid>
       <groupid>latvian-support</groupid>
@@ -4876,6 +4878,7 @@
       <groupid>russian-support</groupid>
       <groupid>samoan-support</groupid>
       <groupid>serbian-support</groupid>
+      <groupid>sindhi-support</groupid>
       <groupid>sinhala-support</groupid>
       <groupid>slovak-support</groupid>
       <groupid>slovenian-support</groupid>



From lmacken at fedoraproject.org  Wed Sep 17 22:42:47 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 17 Sep 2008 22:42:47 +0000 (UTC)
Subject: rpms/python-prioritized-methods/F-8 python-prioritized-methods.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080917224247.E2DA07013C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-prioritized-methods/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22203

Modified Files:
	sources 
Added Files:
	python-prioritized-methods.spec 
Log Message:
Initial import to the F-8 branch.


--- NEW FILE python-prioritized-methods.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename prioritized_methods

Name:           python-prioritized-methods
Version:        0.2.1
Release:        1
Summary:        An extension to PEAK-Rules to prioritize methods in order

Group:          Development/Languages
License:        MIT
URL:            http://pypi.python.org/pypi/prioritized_methods
Source0:        http://pypi.python.org/packages/source/p/%{packagename}/%{packagename}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

Requires:       python-peak-rules >= 0.5a1.dev-0.2562


%description
This module provides four decorators: `prioritized_when`, `prioritized_around`,
`prioritized_before`, and `prioritized_after`.  These behave like their
`peak.rules` counterparts except that they accept an optional `prio`
argument which can be used to provide a comparable object (usually an integer)
that will be used to disambiguate situations in which more than rule applies to
the given arguments and no rule is more specific than another. That is,
situations in which an `peak.rules.AmbiguousMethods` would have been raised.

This is useful for libraries which want to be extensible via generic functions
but want their users to easily override a method without figuring out how to
write a more specific rule or when it is not feasible.


%prep
%setup -q -n %{packagename}-%{version}

%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,-)
%{python_sitelib}/*

%changelog
* Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> - 0.2.1-1
- Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-prioritized-methods/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 18:52:59 -0000	1.1
+++ sources	17 Sep 2008 22:42:17 -0000	1.2
@@ -0,0 +1 @@
+1e9d9de02291b0fc27942b48c170ddc3  prioritized_methods-0.2.1.tar.gz



From lmacken at fedoraproject.org  Wed Sep 17 22:43:49 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 17 Sep 2008 22:43:49 +0000 (UTC)
Subject: rpms/python-prioritized-methods/devel
	python-prioritized-methods.spec, 1.1, 1.2
Message-ID: <20080917224349.AB0BD7013C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-prioritized-methods/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22256

Modified Files:
	python-prioritized-methods.spec 
Log Message:
Add a dist tag


Index: python-prioritized-methods.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-prioritized-methods/devel/python-prioritized-methods.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-prioritized-methods.spec	17 Sep 2008 22:33:33 -0000	1.1
+++ python-prioritized-methods.spec	17 Sep 2008 22:43:19 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           python-prioritized-methods
 Version:        0.2.1
-Release:        1
+Release:        1%{?dist}
 Summary:        An extension to PEAK-Rules to prioritize methods in order
 
 Group:          Development/Languages



From lmacken at fedoraproject.org  Wed Sep 17 22:44:53 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 17 Sep 2008 22:44:53 +0000 (UTC)
Subject: rpms/python-prioritized-methods/F-9 python-prioritized-methods.spec,
	1.1, 1.2
Message-ID: <20080917224453.C37557013C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-prioritized-methods/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22349

Modified Files:
	python-prioritized-methods.spec 
Log Message:
Initial import to the F-9 branch.


Index: python-prioritized-methods.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-prioritized-methods/F-9/python-prioritized-methods.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-prioritized-methods.spec	17 Sep 2008 22:41:34 -0000	1.1
+++ python-prioritized-methods.spec	17 Sep 2008 22:44:23 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           python-prioritized-methods
 Version:        0.2.1
-Release:        1
+Release:        1%{?dist}
 Summary:        An extension to PEAK-Rules to prioritize methods in order
 
 Group:          Development/Languages



From lmacken at fedoraproject.org  Wed Sep 17 22:45:54 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 17 Sep 2008 22:45:54 +0000 (UTC)
Subject: rpms/python-prioritized-methods/F-8 python-prioritized-methods.spec,
	1.1, 1.2
Message-ID: <20080917224554.3EC127013C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-prioritized-methods/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22602

Modified Files:
	python-prioritized-methods.spec 
Log Message:
Initial import to the F-8 branch.


Index: python-prioritized-methods.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-prioritized-methods/F-8/python-prioritized-methods.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-prioritized-methods.spec	17 Sep 2008 22:42:17 -0000	1.1
+++ python-prioritized-methods.spec	17 Sep 2008 22:45:24 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           python-prioritized-methods
 Version:        0.2.1
-Release:        1
+Release:        1%{?dist}
 Summary:        An extension to PEAK-Rules to prioritize methods in order
 
 Group:          Development/Languages



From lmacken at fedoraproject.org  Wed Sep 17 22:46:53 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 17 Sep 2008 22:46:53 +0000 (UTC)
Subject: rpms/python-prioritized-methods/EL-5
	python-prioritized-methods.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080917224653.72B047013C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-prioritized-methods/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22841

Modified Files:
	sources 
Added Files:
	python-prioritized-methods.spec 
Log Message:
Initial import to the EL-5 branch.


--- NEW FILE python-prioritized-methods.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename prioritized_methods

Name:           python-prioritized-methods
Version:        0.2.1
Release:        1%{?dist}
Summary:        An extension to PEAK-Rules to prioritize methods in order

Group:          Development/Languages
License:        MIT
URL:            http://pypi.python.org/pypi/prioritized_methods
Source0:        http://pypi.python.org/packages/source/p/%{packagename}/%{packagename}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

Requires:       python-peak-rules >= 0.5a1.dev-0.2562


%description
This module provides four decorators: `prioritized_when`, `prioritized_around`,
`prioritized_before`, and `prioritized_after`.  These behave like their
`peak.rules` counterparts except that they accept an optional `prio`
argument which can be used to provide a comparable object (usually an integer)
that will be used to disambiguate situations in which more than rule applies to
the given arguments and no rule is more specific than another. That is,
situations in which an `peak.rules.AmbiguousMethods` would have been raised.

This is useful for libraries which want to be extensible via generic functions
but want their users to easily override a method without figuring out how to
write a more specific rule or when it is not feasible.


%prep
%setup -q -n %{packagename}-%{version}

%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,-)
%{python_sitelib}/*

%changelog
* Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> - 0.2.1-1
- Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-prioritized-methods/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 18:52:59 -0000	1.1
+++ sources	17 Sep 2008 22:46:23 -0000	1.2
@@ -0,0 +1 @@
+1e9d9de02291b0fc27942b48c170ddc3  prioritized_methods-0.2.1.tar.gz



From lmacken at fedoraproject.org  Wed Sep 17 22:47:48 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 17 Sep 2008 22:47:48 +0000 (UTC)
Subject: rpms/python-prioritized-methods/EL-4
	python-prioritized-methods.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080917224748.9C8147013C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-prioritized-methods/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23076

Modified Files:
	sources 
Added Files:
	python-prioritized-methods.spec 
Log Message:
Initial import to the EL-4 branch.


--- NEW FILE python-prioritized-methods.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define packagename prioritized_methods

Name:           python-prioritized-methods
Version:        0.2.1
Release:        1%{?dist}
Summary:        An extension to PEAK-Rules to prioritize methods in order

Group:          Development/Languages
License:        MIT
URL:            http://pypi.python.org/pypi/prioritized_methods
Source0:        http://pypi.python.org/packages/source/p/%{packagename}/%{packagename}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

Requires:       python-peak-rules >= 0.5a1.dev-0.2562


%description
This module provides four decorators: `prioritized_when`, `prioritized_around`,
`prioritized_before`, and `prioritized_after`.  These behave like their
`peak.rules` counterparts except that they accept an optional `prio`
argument which can be used to provide a comparable object (usually an integer)
that will be used to disambiguate situations in which more than rule applies to
the given arguments and no rule is more specific than another. That is,
situations in which an `peak.rules.AmbiguousMethods` would have been raised.

This is useful for libraries which want to be extensible via generic functions
but want their users to easily override a method without figuring out how to
write a more specific rule or when it is not feasible.


%prep
%setup -q -n %{packagename}-%{version}

%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,-)
%{python_sitelib}/*

%changelog
* Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> - 0.2.1-1
- Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-prioritized-methods/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 18:52:59 -0000	1.1
+++ sources	17 Sep 2008 22:47:18 -0000	1.2
@@ -0,0 +1 @@
+1e9d9de02291b0fc27942b48c170ddc3  prioritized_methods-0.2.1.tar.gz



From rnorwood at fedoraproject.org  Wed Sep 17 22:51:27 2008
From: rnorwood at fedoraproject.org (Robin Norwood)
Date: Wed, 17 Sep 2008 22:51:27 +0000 (UTC)
Subject: rpms/pygame/devel pygame.spec,1.24,1.25
Message-ID: <20080917225127.788B27013C@cvs1.fedora.phx.redhat.com>

Author: rnorwood

Update of /cvs/pkgs/rpms/pygame/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23270

Modified Files:
	pygame.spec 
Log Message:
Bump release to trump F9 version.


Index: pygame.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygame/devel/pygame.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- pygame.spec	26 Aug 2008 13:27:46 -0000	1.24
+++ pygame.spec	17 Sep 2008 22:50:56 -0000	1.25
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python modules for writing games
 
 Group:          Development/Languages
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Robin Norwood <robin.norwood at gmail.com> 1.8.1-2
+- Bump release to trump F9 version.
+
 * Tue Aug 26 2008 Robin Norwood <robin.norwood at gmail.com> 1.8.1-1
 - Update to new upstream version.
 - rpmlint fixes



From dchen at fedoraproject.org  Wed Sep 17 23:32:20 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 17 Sep 2008 23:32:20 +0000 (UTC)
Subject: rpms/libUnihan/F-8 - New directory
Message-ID: <20080917233220.6AF5C7013C@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libUnihan/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25385/F-8

Log Message:
Directory /cvs/pkgs/rpms/libUnihan/F-8 added to the repository




From dchen at fedoraproject.org  Wed Sep 17 23:34:55 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 17 Sep 2008 23:34:55 +0000 (UTC)
Subject: rpms/libUnihan/F-8 Makefile, NONE, 1.1 import.log, NONE,
	1.1 libUnihan.spec, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080917233455.CDD267013C@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libUnihan/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25736/F-8

Added Files:
	Makefile import.log libUnihan.spec sources 
Log Message:
Initial import


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE import.log ---
libUnihan-0_4_1-1_fc9:F-8:libUnihan-0.4.1-1.fc9.src.rpm:1221694440


--- NEW FILE libUnihan.spec ---
Name:           libUnihan
%define         libUnihan_ver_major 0
%define         libUnihan_ver_minor 4
Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.1
Release:        1%{?dist}
Group:          System Environment/Libraries
License:        LGPLv2+
Summary:        C library for Unihan character database in fifth normal form 
Summary(zh_CN): ???????????????????????????????????????(Unihan)???????????? C ?????????
Summary(zh_TW): ???????????????????????????????????????(Unihan)???????????? C ?????????

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  glib2-devel  sqlite-devel  cmake >= 2.4
#Requires:       glib2  sqlite

URL:            http://sourceforge.net/projects/libunihan
Source0:        http://downloads.sourceforge.net/libunihan/%{name}-%{version}-Source.tar.gz


%description
libUnihan provides a C library for Unihan character database in fifth
normal form (5NF).



%package devel
Summary:    Development files of libUnihan
Group:      Development/Libraries
License:        LGPLv2+
Requires:       %{name} = %{version}-%{release}
Requires:       glib2-devel  sqlite-devel

%description devel
Development files of libUnihan such as header files.

%package doc
Summary:    The libUnihan C API documents in Doxygen style
Group:      Documentation
License:        LGPLv2+
BuildRequires:  doxygen
Requires:       %{name} = %{version}-%{release}

%description doc
The libUnihan C API documents in Doxygen style.


%prep
%setup -q -n %{name}-%{version}-Source

%build
%cmake .
cmake .
make VERBOSE=1 C_DEFINES="$RPM_OPT_FLAGS" %{?_smp_mflags}
make doxygen


%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 AUTHORS NEWS README COPYING COPYING.LESSER
%{_bindir}/unihan_query
%{_libdir}/%{name}.so.%{libUnihan_ver_major}
%{_libdir}/%{name}.so.%{libUnihan_ver_major}.%{libUnihan_ver_minor}

%files devel
%defattr(-,root,root,-)
%doc ChangeLog
%{_includedir}/%{name}/
%{_libdir}/%{name}.so
%{_bindir}/unihan_converter
%{_bindir}/unihan_field_validation

%files doc
%defattr(-,root,root,-)
%doc doc/html


%changelog
* Mon Aug 11 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.4.1-1
- [Bug 453520] C#10 addressed.

* Fri Aug 08 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.4.1-0
- Shows support fields and tables for unihan_query.
- Header files have moved to {include}/libUnihan.
- Completed the description of UnihanTable enumeration.
- Completed the description of str_functions.h
- In str_functions.h: unsignedStr_to_signedStr and signedStr_to_unsignedStr
clones the inputs now, while _buffer postfix for the circumstances that the buffer is given.
Addressing C#6 [Bug 453520] Review Request: libUnihan 
- rpmlint undefined-non-weak-symbol problems solved.
- Moved the include statement of private header files to Unihan_SQL_gen.c files.
- Move the doc/{name} files  to doc/{name}-{version}.
- Uhihan_enum.h and str_functions.h are now in API.

* Mon Aug 04 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.4.0-0
- unihan_test now became unihan_field_vaildation
- Split the enumeration definition of Unihan.h to Unihan_enum.h
- Add unihanDb_get_tableNames() and  unihanTable_get_db_fields()
- Parameter arraySize in unihanField_array_index() is discarded.

* Fri Jul 04 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.1-0
- Add kMandarin frequency rank support.

* Tue Jul 01 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.0-0
- Initial public release.



--- NEW FILE sources ---
315d731a5fed989853d6aaf324729149  libUnihan-0.4.1-Source.tar.gz



From dwalsh at fedoraproject.org  Wed Sep 17 23:56:54 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 17 Sep 2008 23:56:54 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.98,
	1.99 policy-20080710.patch, 1.35, 1.36
Message-ID: <20080917235654.B60F4700D7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26924

Modified Files:
	modules-targeted.conf policy-20080710.patch 
Log Message:
* Thu Sep 11 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-1
- Merge upstream changes
- Add Xavier Toth patches



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- modules-targeted.conf	16 Sep 2008 13:47:03 -0000	1.98
+++ modules-targeted.conf	17 Sep 2008 23:56:23 -0000	1.99
@@ -253,7 +253,7 @@
 #
 # Periodic execution of scheduled commands.
 # 
-cron = module 
+cron = base
 
 # Layer: services
 # Module: cups
@@ -793,7 +793,6 @@
 # 
 mta = base
 
-
 # Layer: services
 # Module: mysql
 #

policy-20080710.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.35 -r 1.36 policy-20080710.patch
Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- policy-20080710.patch	17 Sep 2008 12:17:30 -0000	1.35
+++ policy-20080710.patch	17 Sep 2008 23:56:23 -0000	1.36
@@ -1,6 +1,6 @@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.8/Makefile
 --- nsaserefpolicy/Makefile	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.5.8/Makefile	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/Makefile	2008-09-17 08:49:08.000000000 -0400
 @@ -311,20 +311,22 @@
  
  # parse-rolemap modulename,outputfile
@@ -47,7 +47,7 @@
  	$(verbose) $(INSTALL) -m 644 $< $@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.8/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.5.8/Rules.modular	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/Rules.modular	2008-09-17 08:49:08.000000000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -79,7 +79,7 @@
  $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.8/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/default_contexts	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/default_contexts	2008-09-17 08:49:08.000000000 -0400
 @@ -1,15 +0,0 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -98,13 +98,13 @@
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_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.5.8/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/failsafe_context	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/failsafe_context	2008-09-17 08:49:08.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-mcs/guest_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/guest_u_default_contexts	2008-09-17 08:49:08.000000000 -0400
 @@ -0,0 +1,6 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -114,7 +114,7 @@
 +guest_r:guest_t:s0		guest_r:guest_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/root_default_contexts	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/root_default_contexts	2008-09-17 08:49:08.000000000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
  system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -130,7 +130,7 @@
 +system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/staff_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/staff_u_default_contexts	2008-09-17 08:49:08.000000000 -0400
 @@ -5,6 +5,8 @@
  system_r:xdm_t:s0		staff_r:staff_t:s0
  staff_r:staff_su_t:s0		staff_r:staff_t:s0
@@ -142,7 +142,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-17 08:49:08.000000000 -0400
 @@ -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
@@ -152,7 +152,7 @@
  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/user_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/user_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/user_u_default_contexts	2008-09-17 08:49:08.000000000 -0400
 @@ -5,4 +5,5 @@
  system_r:xdm_t:s0		user_r:user_t:s0
  user_r:user_su_t:s0		user_r:user_t:s0
@@ -162,13 +162,13 @@
 +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/userhelper_context serefpolicy-3.5.8/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/userhelper_context	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/userhelper_context	2008-09-17 08:49:08.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/xguest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-mcs/xguest_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/xguest_u_default_contexts	2008-09-17 08:49:08.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -179,7 +179,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-mls/guest_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mls/guest_u_default_contexts	2008-09-17 08:49:08.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -187,7 +187,7 @@
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.8/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-standard/guest_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-standard/guest_u_default_contexts	2008-09-17 08:49:08.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -195,7 +195,7 @@
 +system_r:crond_t	guest_r:guest_crond_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.5.8/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-standard/root_default_contexts	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-standard/root_default_contexts	2008-09-17 08:49:08.000000000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t	unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t
  system_r:local_login_t  unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
@@ -211,7 +211,7 @@
 +system_r:sshd_t	unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.8/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-standard/xguest_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-standard/xguest_u_default_contexts	2008-09-17 08:49:08.000000000 -0400
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -220,7 +220,7 @@
 +system_r:xdm_t		xguest_r:xguest_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.5.8/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/global_tunables	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/policy/global_tunables	2008-09-17 08:49:08.000000000 -0400
 @@ -34,7 +34,7 @@
  
  ## <desc>
@@ -261,7 +261,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-3.5.8/policy/mls
 --- nsaserefpolicy/policy/mls	2008-09-05 10:28:20.000000000 -0400
-+++ serefpolicy-3.5.8/policy/mls	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/policy/mls	2008-09-17 08:49:08.000000000 -0400
 @@ -381,11 +381,18 @@
  	 ( t1 == mlsxwinread ));
  
@@ -284,7 +284,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.5.8/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/alsa.te	2008-09-15 14:54:22.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/alsa.te	2008-09-17 08:49:08.000000000 -0400
 @@ -48,9 +48,12 @@
  
  files_search_home(alsa_t)
@@ -300,7 +300,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-3.5.8/policy/modules/admin/amanda.te
 --- nsaserefpolicy/policy/modules/admin/amanda.te	2008-08-14 10:07:05.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/amanda.te	2008-09-16 11:21:41.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/amanda.te	2008-09-17 08:49:08.000000000 -0400
 @@ -129,6 +129,8 @@
  corenet_tcp_bind_all_nodes(amanda_t)
  corenet_udp_bind_all_nodes(amanda_t)
@@ -312,7 +312,7 @@
  dev_getattr_all_chr_files(amanda_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.5.8/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/anaconda.te	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/anaconda.te	2008-09-17 08:49:08.000000000 -0400
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -323,7 +323,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.5.8/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/certwatch.te	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/certwatch.te	2008-09-17 08:49:08.000000000 -0400
 @@ -15,8 +15,19 @@
  #
  # Local policy
@@ -362,7 +362,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.5.8/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/consoletype.te	2008-09-12 10:59:28.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/consoletype.te	2008-09-17 08:49:08.000000000 -0400
 @@ -8,9 +8,11 @@
  
[...4480 lines suppressed...]
  
  ########################################
@@ -31764,7 +31771,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.8/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/selinuxutil.te	2008-09-15 11:59:39.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/selinuxutil.te	2008-09-17 08:49:09.000000000 -0400
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -32121,7 +32128,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.fc serefpolicy-3.5.8/policy/modules/system/setrans.fc
 --- nsaserefpolicy/policy/modules/system/setrans.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/setrans.fc	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/setrans.fc	2008-09-17 08:49:09.000000000 -0400
 @@ -1,3 +1,5 @@
 +/etc/rc\.d/init\.d/mcstrans	--	gen_context(system_u:object_r:setrans_script_exec_t,s0)
 +
@@ -32130,7 +32137,7 @@
  /var/run/setrans(/.*)?	gen_context(system_u:object_r:setrans_var_run_t,mls_systemhigh)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.5.8/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/setrans.if	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/setrans.if	2008-09-17 08:49:09.000000000 -0400
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1,setrans_var_run_t,setrans_var_run_t,setrans_t)
  	files_list_pids($1)
@@ -32157,7 +32164,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-3.5.8/policy/modules/system/setrans.te
 --- nsaserefpolicy/policy/modules/system/setrans.te	2008-09-11 11:28:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/setrans.te	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/setrans.te	2008-09-17 08:49:09.000000000 -0400
 @@ -14,6 +14,9 @@
  files_pid_file(setrans_var_run_t)
  mls_trusted_object(setrans_var_run_t)
@@ -32170,7 +32177,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.8/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.fc	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.fc	2008-09-17 08:49:09.000000000 -0400
 @@ -57,3 +57,5 @@
  ifdef(`distro_gentoo',`
  /var/lib/dhcpc(/.*)?		gen_context(system_u:object_r:dhcpc_state_t,s0)
@@ -32179,7 +32186,7 @@
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.5.8/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.if	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.if	2008-09-17 08:49:09.000000000 -0400
 @@ -553,6 +553,7 @@
  		type net_conf_t;
  	')
@@ -32260,7 +32267,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.8/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2008-08-11 11:23:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.te	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.te	2008-09-17 08:49:09.000000000 -0400
 @@ -20,6 +20,10 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -32444,7 +32451,7 @@
  	xen_append_log(ifconfig_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.8/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/udev.if	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/udev.if	2008-09-17 08:49:09.000000000 -0400
 @@ -96,6 +96,24 @@
  
  ########################################
@@ -32500,7 +32507,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.8/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/udev.te	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/udev.te	2008-09-17 08:49:09.000000000 -0400
 @@ -83,6 +83,7 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
@@ -32558,7 +32565,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.8/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/unconfined.fc	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/unconfined.fc	2008-09-17 08:49:09.000000000 -0400
 @@ -2,15 +2,11 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -32599,7 +32606,7 @@
 +/opt/real/(.*/)?realplay\.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.5.8/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/unconfined.if	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/unconfined.if	2008-09-17 08:49:09.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -32930,7 +32937,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.8/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/unconfined.te	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/unconfined.te	2008-09-17 08:49:09.000000000 -0400
 @@ -1,40 +1,80 @@
  
 -policy_module(unconfined, 2.3.1)
@@ -33267,7 +33274,7 @@
 +domain_ptrace_all_domains(unconfined_notrans_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.8/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/userdomain.fc	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/userdomain.fc	2008-09-17 08:49:09.000000000 -0400
 @@ -1,4 +1,5 @@
 -HOME_DIR	-d	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
 -HOME_DIR/.+		gen_context(system_u:object_r:ROLE_home_t,s0)
@@ -33280,7 +33287,7 @@
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.5.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/userdomain.if	2008-09-17 07:27:44.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/userdomain.if	2008-09-17 09:11:15.000000000 -0400
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -34457,7 +34464,7 @@
  
  	optional_policy(`
 -		setroubleshoot_stream_connect($1_t)
-+		cron_per_role_template($1, $1_usertype, $1_r)
++		cron_per_role_template($1, $1_t, $1_r)
 +	')
 +
 +	optional_policy(`
@@ -35921,7 +35928,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.8/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/userdomain.te	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/userdomain.te	2008-09-17 08:49:09.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -36038,7 +36045,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.8/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/xen.fc	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/xen.fc	2008-09-17 08:49:09.000000000 -0400
 @@ -20,6 +20,7 @@
  /var/run/xenconsoled\.pid --	gen_context(system_u:object_r:xenconsoled_var_run_t,s0)
  /var/run/xend(/.*)?		gen_context(system_u:object_r:xend_var_run_t,s0)
@@ -36049,7 +36056,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.8/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/xen.if	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/xen.if	2008-09-17 08:49:09.000000000 -0400
 @@ -167,11 +167,14 @@
  #
  interface(`xen_stream_connect',`
@@ -36093,7 +36100,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.8/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/xen.te	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/xen.te	2008-09-17 08:49:09.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -36332,7 +36339,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.8/policy/support/file_patterns.spt
 --- nsaserefpolicy/policy/support/file_patterns.spt	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/support/file_patterns.spt	2008-09-16 09:08:28.000000000 -0400
++++ serefpolicy-3.5.8/policy/support/file_patterns.spt	2008-09-17 08:49:09.000000000 -0400
 @@ -537,3 +537,18 @@
  	allow $1 $2:dir rw_dir_perms;
  	type_transition $1 $2:$4 $3;
@@ -36354,7 +36361,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.8/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/support/obj_perm_sets.spt	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/support/obj_perm_sets.spt	2008-09-17 08:49:09.000000000 -0400
 @@ -316,3 +316,13 @@
  #
  define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }')
@@ -36371,7 +36378,7 @@
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.8/policy/users
 --- nsaserefpolicy/policy/users	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/users	2008-09-12 10:59:29.000000000 -0400
++++ serefpolicy-3.5.8/policy/users	2008-09-17 08:49:09.000000000 -0400
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #



From petersen at fedoraproject.org  Thu Sep 18 00:07:25 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 18 Sep 2008 00:07:25 +0000 (UTC)
Subject: rpms/perl-Test-AutoBuild/devel perl-Test-AutoBuild.spec,1.9,1.10
Message-ID: <20080918000725.2EEE3700D9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/perl-Test-AutoBuild/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27471

Modified Files:
	perl-Test-AutoBuild.spec 
Log Message:
exclude darcs subpackage on ppc64 and alpha where there is no ghc currently


Index: perl-Test-AutoBuild.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-AutoBuild/devel/perl-Test-AutoBuild.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Test-AutoBuild.spec	7 Mar 2008 23:19:39 -0000	1.9
+++ perl-Test-AutoBuild.spec	18 Sep 2008 00:06:54 -0000	1.10
@@ -12,7 +12,7 @@
 Summary: Framework for performing continuous, unattended, automated software builds
 Name: perl-%{appname}
 Version: 1.2.2
-Release: 3%{_extra_release}
+Release: 4%{_extra_release}
 License: GPLv2+
 Group: Development/Tools
 Url: http://autobuild.org/
@@ -42,7 +42,9 @@
 BuildRequires: mercurial >= 0.7
 BuildRequires: perl-SVK >= 1.0
 BuildRequires: git >= 1.5.0.0
+%ifnarch alpha ppc64
 BuildRequires: darcs >= 1.0.0
+%endif
 BuildRequires: bzr >= 0.91
 BuildRequires: monotone >= 0.37
 BuildRequires:  fedora-usermgmt-devel
@@ -98,12 +100,14 @@
 Requires: perl-%{appname} = %{version}-%{release}
 Requires: git >= 1.5.0.0
 
+%ifnarch alpha ppc64
 %package darcs
 Summary: Darcs source repository integration for autobuild engine
 Group: Development/Tools
 Url: http://autobuild.org/
 Requires: perl-%{appname} = %{version}-%{release}
 Requires: darcs >= 1.0.0
+%endif
 
 %package bzr
 Summary: Bazaar source repository integration for autobuild engine
@@ -183,9 +187,11 @@
 This sub-package provides the module for integrating with the Git
 version control system
 
+%ifnarch alpha ppc64
 %description darcs
 Test-AutoBuild is a Perl framework for performing continuous, unattended,
 automated software builds.
+%endif
 
 This sub-package provides the module for integrating with the Darcs
 version control system
@@ -381,10 +387,12 @@
 %doc README
 %{perl_vendorlib}/Test/AutoBuild/Repository/Git.pm
 
+%ifnarch alpha ppc64
 %files darcs
 %defattr(-,root,root)
 %doc README
 %{perl_vendorlib}/Test/AutoBuild/Repository/Darcs.pm
+%endif
 
 %files bzr
 %defattr(-,root,root)
@@ -427,6 +435,9 @@
 %config(noreplace) %attr(-,builder,builder) %{_localstatedir}/lib/builder/.cvspass
 
 %changelog
+* Thu Sep 18 2008 Jens Petersen <petersen at redhat.com> - 1.2.2-4.fc10
+- exclude darcs subpackage on ppc64 and alpha where there is no ghc currently
+
 * Fri Mar 07 2008 Daniel P. Berrange <berrange at redhat.com> - 1.2.2-3.fc9
 - Fix parsing of GIT output
 - Added missing build requires for META.yml test case



From lmacken at fedoraproject.org  Thu Sep 18 00:33:03 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 18 Sep 2008 00:33:03 +0000 (UTC)
Subject: rpms/TurboGears/devel TurboGears-1.0.7-cherrypyreq.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 TurboGears.spec, 1.38, 1.39 sources,
	1.11, 1.12 TurboGears-1.0.4.4-cherrypyreq.patch, 1.1,
	NONE TurboGears-1.0.4.4-setup.patch, 1.1, NONE
Message-ID: <20080918003303.A1FBD700D9@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28827

Modified Files:
	.cvsignore TurboGears.spec sources 
Added Files:
	TurboGears-1.0.7-cherrypyreq.patch 
Removed Files:
	TurboGears-1.0.4.4-cherrypyreq.patch 
	TurboGears-1.0.4.4-setup.patch 
Log Message:
* Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> 1.0.7-1
- Update to the latest upstream release
- Utilize the test suite
- Remove the setup.py patch


TurboGears-1.0.7-cherrypyreq.patch:

--- NEW FILE TurboGears-1.0.7-cherrypyreq.patch ---
--- turbogears/config.py.orig	2008-09-16 09:41:30.000000000 -0400
+++ turbogears/config.py	2008-09-16 09:41:51.000000000 -0400
@@ -1,8 +1,8 @@
 import os, glob, re
-
+import pkg_resources
+pkg_resources.require("CherryPy<3.0")
 from cherrypy import config
 from configobj import ConfigObj
-import pkg_resources
 import logging
 import logging.handlers
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	8 Mar 2008 00:19:40 -0000	1.11
+++ .cvsignore	18 Sep 2008 00:32:33 -0000	1.12
@@ -1 +1 @@
-TurboGears-1.0.4.4.tar.gz
+TurboGears-1.0.7.tar.gz


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- TurboGears.spec	27 May 2008 18:40:19 -0000	1.38
+++ TurboGears.spec	18 Sep 2008 00:32:33 -0000	1.39
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           TurboGears
-Version:        1.0.4.4
-Release:        3%{?dist}
+Version:        1.0.7
+Release:        1%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -11,23 +11,23 @@
 URL:            http://www.turbogears.org
 Source0:        http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz
 Patch0:         %{name}-%{version}-cherrypyreq.patch
-Patch1:         %{name}-%{version}-setup.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires: python-devel python-setuptools-devel
 
-# ElementTree is part of python 2.5 on FC7+
-%if 0%{?fedora} <= 6
-BuildRequires:  python-elementtree >= 1.2.6
-Requires: python-elementtree >= 1.2.6
-%endif
+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
 Requires:       python-cherrypy2
+BuildRequires:	python-cherrypy2
 %else
 Requires:       python-cherrypy
+BuildRequires:	python-cherrypy
 %endif
 
 Requires:       python-sqlalchemy
@@ -67,16 +67,17 @@
 %prep
 %setup -q
 %patch0 -b .cherrypyreq
-%patch1 -b .setup
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+%{__python} setup.py build
 
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install --skip-build --root %{buildroot}
 
+%check
+PYTHONPATH=$(pwd) nosetests -q
 
 %clean
 rm -rf %{buildroot}
@@ -89,6 +90,11 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> 1.0.7-1
+- Update to the latest upstream release
+- Utilize the test suite
+- Remove the setup.py patch
+
 * Tue May 27 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-3
 - Patch our setup.py to remove the hard version requirements for SQLObject.
   This has changed upstream as well.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Mar 2008 00:19:40 -0000	1.11
+++ sources	18 Sep 2008 00:32:33 -0000	1.12
@@ -1 +1 @@
-a03a66fcf7d687fd7bd4205a01fd21dd  TurboGears-1.0.4.4.tar.gz
+a933efb063de7efb337d4819976c81ea  TurboGears-1.0.7.tar.gz


--- TurboGears-1.0.4.4-cherrypyreq.patch DELETED ---


--- TurboGears-1.0.4.4-setup.patch DELETED ---



From airlied at fedoraproject.org  Thu Sep 18 00:36:25 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 18 Sep 2008 00:36:25 +0000 (UTC)
Subject: rpms/kernel/devel drm-modesetting-radeon.patch, 1.26,
	1.27 kernel.spec, 1.954, 1.955
Message-ID: <20080918003625.9B5C8700D9@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29276

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Thu Sep 18 2008 Dave Airlie <airlied at redhat.com>
- update radeon LVDS bits from AMD


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- drm-modesetting-radeon.patch	11 Sep 2008 09:58:23 -0000	1.26
+++ drm-modesetting-radeon.patch	18 Sep 2008 00:36:24 -0000	1.27
@@ -1,3 +1,15 @@
+commit 41b33ad8bfd879c37f72e560e0b1e1b57f537093
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Thu Sep 18 09:55:14 2008 +1000
+
+    radeon: further LVDS fixes
+
+commit 882f9bc454b85149fdf96db79932a8f1d57b5136
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Thu Sep 18 09:54:12 2008 +1000
+
+    radeon: legacy lvds updates
+
 commit 7d7949742ae5d6d0aca8857bfcab77b2fffaf0d7
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Sep 11 18:26:27 2008 +1000
@@ -28924,7 +28936,7 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
 new file mode 100644
-index 0000000..e791055
+index 0000000..3219b99
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_combios.c
 @@ -0,0 +1,1359 @@
@@ -29590,14 +29602,14 @@
 +			encoder->use_bios_dividers = true;
 +
 +		panel_setup = radeon_bios32(dev_priv, lcd_info + 0x39);
-+		encoder->lvds_gen_cntl = 0;
++		encoder->lvds_gen_cntl = 0xff00;
 +		if (panel_setup & 0x1)
 +			encoder->lvds_gen_cntl |= RADEON_LVDS_PANEL_FORMAT;
 +
 +		if ((panel_setup >> 4) & 0x1)
 +			encoder->lvds_gen_cntl |= RADEON_LVDS_PANEL_TYPE;
 +
-+		switch ((panel_setup >> 8) & 0x8) {
++		switch ((panel_setup >> 8) & 0x7) {
 +		case 0:
 +			encoder->lvds_gen_cntl |= RADEON_LVDS_NO_FM;
 +			break;
@@ -39367,10 +39379,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
 new file mode 100644
-index 0000000..c80e0b5
+index 0000000..1a1db53
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
-@@ -0,0 +1,1356 @@
+@@ -0,0 +1,1361 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -39597,23 +39609,15 @@
 +		lvds_pll_cntl |= RADEON_LVDS_PLL_EN;
 +		RADEON_WRITE(RADEON_LVDS_PLL_CNTL, lvds_pll_cntl);
 +		udelay(1000);
++
 +		lvds_pll_cntl = RADEON_READ(RADEON_LVDS_PLL_CNTL);
 +		lvds_pll_cntl &= ~RADEON_LVDS_PLL_RESET;
 +		RADEON_WRITE(RADEON_LVDS_PLL_CNTL, lvds_pll_cntl);
 +
-+		/* enable lvds, turn on voltage */
 +		lvds_gen_cntl = RADEON_READ(RADEON_LVDS_GEN_CNTL);
-+		lvds_gen_cntl |= (RADEON_LVDS_ON | RADEON_LVDS_EN | RADEON_LVDS_DIGON);
-+		RADEON_WRITE(RADEON_LVDS_GEN_CNTL, lvds_gen_cntl);
-+		udelay(radeon_encoder->panel_digon_delay * 1000);
-+
-+		/* enable data */
++		lvds_gen_cntl |= (RADEON_LVDS_ON | RADEON_LVDS_EN | RADEON_LVDS_DIGON | RADEON_LVDS_BLON);
 +		lvds_gen_cntl &= ~(RADEON_LVDS_DISPLAY_DIS);
-+		RADEON_WRITE(RADEON_LVDS_GEN_CNTL, lvds_gen_cntl);
-+		udelay(radeon_encoder->panel_blon_delay * 1000);
-+
-+		/* enable backlight */
-+		lvds_gen_cntl |= RADEON_LVDS_BLON;
++		udelay(radeon_encoder->panel_pwr_delay * 1000);
 +		RADEON_WRITE(RADEON_LVDS_GEN_CNTL, lvds_gen_cntl);
 +
 +		/* update bios scratch regs */
@@ -39624,12 +39628,13 @@
 +	case DRM_MODE_DPMS_STANDBY:
 +	case DRM_MODE_DPMS_SUSPEND:
 +	case DRM_MODE_DPMS_OFF:
-+                pixclks_cntl = RADEON_READ_PLL(dev_priv, RADEON_PIXCLKS_CNTL);
++		pixclks_cntl = RADEON_READ_PLL(dev_priv, RADEON_PIXCLKS_CNTL);
 +		RADEON_WRITE_PLL_P(dev_priv, RADEON_PIXCLKS_CNTL, 0, ~RADEON_PIXCLK_LVDS_ALWAYS_ONb);
-+                lvds_gen_cntl = RADEON_READ(RADEON_LVDS_GEN_CNTL);
-+                lvds_gen_cntl |= RADEON_LVDS_DISPLAY_DIS;
-+                lvds_gen_cntl &= ~(RADEON_LVDS_ON | RADEON_LVDS_BLON | RADEON_LVDS_EN | RADEON_LVDS_DIGON);
-+                RADEON_WRITE(RADEON_LVDS_GEN_CNTL, lvds_gen_cntl);
++		lvds_gen_cntl = RADEON_READ(RADEON_LVDS_GEN_CNTL);
++		lvds_gen_cntl |= RADEON_LVDS_DISPLAY_DIS;
++		lvds_gen_cntl &= ~(RADEON_LVDS_ON | RADEON_LVDS_BLON | RADEON_LVDS_EN | RADEON_LVDS_DIGON);
++		udelay(radeon_encoder->panel_pwr_delay * 1000);
++		RADEON_WRITE(RADEON_LVDS_GEN_CNTL, lvds_gen_cntl);
 +		RADEON_WRITE_PLL(dev_priv, RADEON_PIXCLKS_CNTL, pixclks_cntl);
 +
 +		bios_5_scratch &= ~RADEON_LCD1_ON;
@@ -39666,7 +39671,7 @@
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
 +	struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);
 +	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
-+	uint32_t lvds_pll_cntl, lvds_gen_cntl;
++	uint32_t lvds_pll_cntl, lvds_gen_cntl, lvds_ss_gen_cntl;
 +
 +	DRM_DEBUG("\n");
 +
@@ -39685,6 +39690,8 @@
 +			   RADEON_LVDS_EN |
 +			   RADEON_LVDS_RST_FM);
 +
++	DRM_INFO("bios LVDS_GEN_CNTL: 0x%x\n", radeon_encoder->lvds_gen_cntl);
++
 +	if (radeon_is_r300(dev_priv))
 +		lvds_pll_cntl &= ~(R300_LVDS_SRC_SEL_MASK);
 +
@@ -39695,15 +39702,25 @@
 +		} else
 +			lvds_gen_cntl &= ~RADEON_LVDS_SEL_CRTC2;
 +	} else {
-+		if (radeon_is_r300(dev_priv)) {
++		if (radeon_is_r300(dev_priv))
 +			lvds_pll_cntl |= R300_LVDS_SRC_SEL_CRTC2;
-+		} else
++		else
 +			lvds_gen_cntl |= RADEON_LVDS_SEL_CRTC2;
 +	}
 +
 +	RADEON_WRITE(RADEON_LVDS_GEN_CNTL, lvds_gen_cntl);
 +	RADEON_WRITE(RADEON_LVDS_PLL_CNTL, lvds_pll_cntl);
 +
++	lvds_ss_gen_cntl = RADEON_READ(RADEON_LVDS_SS_GEN_CNTL);
++	if (radeon_encoder->panel_digon_delay &&
++	    radeon_encoder->panel_blon_delay) {
++		lvds_ss_gen_cntl &= ~((0xf << RADEON_LVDS_PWRSEQ_DELAY1_SHIFT) |
++				      (0xf << RADEON_LVDS_PWRSEQ_DELAY2_SHIFT));
++		lvds_ss_gen_cntl |= ((radeon_encoder->panel_digon_delay << RADEON_LVDS_PWRSEQ_DELAY1_SHIFT) |
++				     (radeon_encoder->panel_blon_delay << RADEON_LVDS_PWRSEQ_DELAY2_SHIFT));
++		RADEON_WRITE(RADEON_LVDS_SS_GEN_CNTL, lvds_ss_gen_cntl);
++	}
++
 +	if (dev_priv->chip_family == CHIP_RV410)
 +		RADEON_WRITE(RADEON_CLOCK_CNTL_INDEX, 0);
 +}
@@ -41258,10 +41275,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h
 new file mode 100644
-index 0000000..5910897
+index 0000000..52fb0b9
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_reg.h
-@@ -0,0 +1,5314 @@
+@@ -0,0 +1,5317 @@
 +/*
 + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
 + *                VA Linux Systems Inc., Fremont, California.
@@ -42317,6 +42334,9 @@
 +#       define R300_LVDS_SRC_SEL_CRTC1      (0   << 18)
 +#       define R300_LVDS_SRC_SEL_CRTC2      (1   << 18)
 +#       define R300_LVDS_SRC_SEL_RMX        (2   << 18)
++#define RADEON_LVDS_SS_GEN_CNTL             0x02ec
++#       define RADEON_LVDS_PWRSEQ_DELAY1_SHIFT     16
++#       define RADEON_LVDS_PWRSEQ_DELAY2_SHIFT     20
 +
 +#define RADEON_MAX_LATENCY                  0x0f3f /* PCI */
 +#define RADEON_MC_AGP_LOCATION              0x014c


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.954
retrieving revision 1.955
diff -u -r1.954 -r1.955
--- kernel.spec	17 Sep 2008 18:45:22 -0000	1.954
+++ kernel.spec	18 Sep 2008 00:36:25 -0000	1.955
@@ -1758,6 +1758,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Sep 18 2008 Dave Airlie <airlied at redhat.com>
+- update radeon LVDS bits from AMD
+
 * Wed Sep 17 2008 Dave Jones <davej at redhat.com>
 - 2.6.27-rc6-git5
 



From phuang at fedoraproject.org  Thu Sep 18 00:53:19 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Thu, 18 Sep 2008 00:53:19 +0000 (UTC)
Subject: rpms/ibus-pinyin/devel .cvsignore, 1.6, 1.7 ibus-pinyin.spec, 1.5, 
	1.6 sources, 1.6, 1.7
Message-ID: <20080918005319.6B47D700D9@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-pinyin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30510

Modified Files:
	.cvsignore ibus-pinyin.spec sources 
Log Message:
Update version to 0.1.1.20080918


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Sep 2008 00:49:08 -0000	1.6
+++ .cvsignore	18 Sep 2008 00:52:49 -0000	1.7
@@ -1,2 +1,2 @@
-ibus-pinyin-0.1.1.20080901.tar.gz
-pinyin-database-0.1.10.5.tar.bz2
+ibus-pinyin-0.1.1.20080918.tar.gz
+pinyin-database-0.1.10.6.tar.bz2


Index: ibus-pinyin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/devel/ibus-pinyin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ibus-pinyin.spec	1 Sep 2008 00:49:08 -0000	1.5
+++ ibus-pinyin.spec	18 Sep 2008 00:52:49 -0000	1.6
@@ -1,12 +1,12 @@
 Name:       ibus-pinyin
-Version:    0.1.1.20080901
+Version:    0.1.1.20080918
 Release:    1%{?dist}
 Summary:    The PinYin engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-Source1:    http://scim-python.googlecode.com/files/pinyin-database-0.1.10.5.tar.bz2
+Source1:    http://scim-python.googlecode.com/files/pinyin-database-0.1.10.6.tar.bz2
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
@@ -50,6 +50,9 @@
 %{_bindir}/ibus-setup-pinyin
 
 %changelog
+* Thu Sep 18 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080918-1
+- Update version to 0.1.1.20080918.
+
 * Mon Sep 01 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
 - Update version to 0.1.1.20080901.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Sep 2008 00:49:08 -0000	1.6
+++ sources	18 Sep 2008 00:52:49 -0000	1.7
@@ -1,2 +1,2 @@
-d21838d22023b41aeab75bb84e5f870f  ibus-pinyin-0.1.1.20080901.tar.gz
-140a7dd821e8e74299bfb2089993838b  pinyin-database-0.1.10.5.tar.bz2
+55968d5d7dfbe373f950d7bc649f333a  ibus-pinyin-0.1.1.20080918.tar.gz
+ebd8d2381993372bb97a877b549e14a0  pinyin-database-0.1.10.6.tar.bz2



From lmacken at fedoraproject.org  Thu Sep 18 00:58:58 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 18 Sep 2008 00:58:58 +0000 (UTC)
Subject: rpms/python-turbojson/devel python-turbojson.spec,1.9,1.10
Message-ID: <20080918005858.EDBD7700D9@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-turbojson/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30923

Modified Files:
	python-turbojson.spec 
Log Message:
Require python-prioritized-methods > 0.2


Index: python-turbojson.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbojson/devel/python-turbojson.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-turbojson.spec	16 Sep 2008 18:45:37 -0000	1.9
+++ python-turbojson.spec	18 Sep 2008 00:58:28 -0000	1.10
@@ -5,7 +5,7 @@
 
 Name:           python-turbojson
 Version:        1.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python template plugin that supports json
 
 Group:          Development/Languages
@@ -17,9 +17,12 @@
 
 BuildRequires: python-devel
 BuildRequires: python-setuptools-devel
+BuildRequires: python-prioritized-methods > 0.2
+BuildRequires: python-peak-rules >= 0.5a1.dev-0.2555
 
 Requires:      python-peak-rules >= 0.5a1.dev-0.2555
 Requires:      python-simplejson >= 1.9.1
+Requires:      python-prioritized-methods > 0.2
 
 %description
 This package provides a template engine plugin, allowing you
@@ -50,6 +53,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Luke Macken <lmacken at redhat.com> 1.2.1-2
+- Require python-prioritized-methods > 0.2
+
 * Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> 1.2.1-1
 - Latest release of the 1.2.x series
 - Require python-peak-rules (#459157, #459117)



From phuang at fedoraproject.org  Thu Sep 18 00:59:56 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Thu, 18 Sep 2008 00:59:56 +0000 (UTC)
Subject: rpms/ibus-pinyin/F-9 .cvsignore, 1.4, 1.5 ibus-pinyin.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20080918005956.C33CD700D9@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-pinyin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31091

Modified Files:
	.cvsignore ibus-pinyin.spec sources 
Log Message:
Update version to 0.1.1.20080918


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Sep 2008 00:58:04 -0000	1.4
+++ .cvsignore	18 Sep 2008 00:59:26 -0000	1.5
@@ -1,2 +1,2 @@
-ibus-pinyin-0.1.1.20080901.tar.gz
-pinyin-database-0.1.10.5.tar.bz2
+ibus-pinyin-0.1.1.20080918.tar.gz
+pinyin-database-0.1.10.6.tar.bz2


Index: ibus-pinyin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/F-9/ibus-pinyin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ibus-pinyin.spec	1 Sep 2008 00:58:04 -0000	1.4
+++ ibus-pinyin.spec	18 Sep 2008 00:59:26 -0000	1.5
@@ -1,12 +1,12 @@
 Name:       ibus-pinyin
-Version:    0.1.1.20080901
+Version:    0.1.1.20080918
 Release:    1%{?dist}
 Summary:    The PinYin engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-Source1:    http://scim-python.googlecode.com/files/pinyin-database-0.1.10.5.tar.bz2
+Source1:    http://scim-python.googlecode.com/files/pinyin-database-0.1.10.6.tar.bz2
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
@@ -50,6 +50,9 @@
 %{_bindir}/ibus-setup-pinyin
 
 %changelog
+* Thu Sep 18 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080918-1
+- Update version to 0.1.1.20080918.
+
 * Mon Sep 01 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
 - Update version to 0.1.1.20080901.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Sep 2008 00:58:04 -0000	1.5
+++ sources	18 Sep 2008 00:59:26 -0000	1.6
@@ -1,2 +1,2 @@
-d21838d22023b41aeab75bb84e5f870f  ibus-pinyin-0.1.1.20080901.tar.gz
-140a7dd821e8e74299bfb2089993838b  pinyin-database-0.1.10.5.tar.bz2
+55968d5d7dfbe373f950d7bc649f333a  ibus-pinyin-0.1.1.20080918.tar.gz
+ebd8d2381993372bb97a877b549e14a0  pinyin-database-0.1.10.6.tar.bz2



From mclasen at fedoraproject.org  Thu Sep 18 01:10:23 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 18 Sep 2008 01:10:23 +0000 (UTC)
Subject: rpms/glib2/devel .cvsignore, 1.95, 1.96 glib2.spec, 1.182,
	1.183 sources, 1.97, 1.98
Message-ID: <20080918011023.DA764700D9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32085

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.18.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- .cvsignore	2 Sep 2008 21:57:45 -0000	1.95
+++ .cvsignore	18 Sep 2008 01:09:53 -0000	1.96
@@ -1 +1 @@
-glib-2.18.0.tar.bz2
+glib-2.18.1.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/extras/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- glib2.spec	2 Sep 2008 21:57:45 -0000	1.182
+++ glib2.spec	18 Sep 2008 01:09:53 -0000	1.183
@@ -2,7 +2,7 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.18.0
+Version: 2.18.1
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -22,7 +22,6 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=442835
 Patch2: gio-2.16-only-pass-uri-to-gio-apps.patch
 
-
 # this patch requires autoreconf
 BuildRequires: autoconf automake libtool gettext-devel gtk-doc
 
@@ -59,8 +58,9 @@
 %setup -q -n glib-%{version}
 %patch2 -p1 -b .only-pass-uri-to-gio-apps
 
-%build
 autoreconf
+
+%build
 %configure --disable-gtk-doc --enable-static 
 make %{?_smp_mflags}
 
@@ -133,6 +133,9 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Wed Sep 17 2008 Matthias Clasen <mclasen at redhat.com> - 2.18.1-1
+- Update to 2.18.1
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.18.0-1
 - Update to 2.18.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glib2/devel/sources,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- sources	2 Sep 2008 21:57:45 -0000	1.97
+++ sources	18 Sep 2008 01:09:53 -0000	1.98
@@ -1 +1 @@
-06e5afe4ce055085dc5fd9fdab527bf7  glib-2.18.0.tar.bz2
+51a9a33f49a4896d4d95d8e980666b9e  glib-2.18.1.tar.bz2



From lmacken at fedoraproject.org  Thu Sep 18 01:25:32 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 18 Sep 2008 01:25:32 +0000 (UTC)
Subject: rpms/TurboGears/F-9 TurboGears.spec,1.37,1.38 sources,1.11,1.12
Message-ID: <20080918012532.7A024700D9@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv571

Modified Files:
	TurboGears.spec sources 
Log Message:
* Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> 1.0.7-1
- Update to the latest upstream release
- Utilize the test suite
- Remove the setup.py patch

* Tue May 27 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-3
- Patch our setup.py to remove the hard version requirements for SQLObject.
  This has changed upstream as well.




Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-9/TurboGears.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- TurboGears.spec	11 Mar 2008 17:18:08 -0000	1.37
+++ TurboGears.spec	18 Sep 2008 01:25:02 -0000	1.38
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           TurboGears
-Version:        1.0.4.4
-Release:        2%{?dist}
+Version:        1.0.7
+Release:        1%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -17,16 +17,17 @@
 
 BuildRequires: python-devel python-setuptools-devel
 
-# ElementTree is part of python 2.5 on FC7+
-%if 0%{?fedora} <= 6
-BuildRequires:  python-elementtree >= 1.2.6
-Requires: python-elementtree >= 1.2.6
-%endif
+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
 Requires:       python-cherrypy2
+BuildRequires:	python-cherrypy2
 %else
 Requires:       python-cherrypy
+BuildRequires:	python-cherrypy
 %endif
 
 Requires:       python-sqlalchemy
@@ -69,12 +70,14 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+%{__python} setup.py build
 
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install --skip-build --root %{buildroot}
 
+%check
+PYTHONPATH=$(pwd) nosetests -q
 
 %clean
 rm -rf %{buildroot}
@@ -87,6 +90,15 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> 1.0.7-1
+- Update to the latest upstream release
+- Utilize the test suite
+- Remove the setup.py patch
+
+* Tue May 27 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-3
+- Patch our setup.py to remove the hard version requirements for SQLObject.
+  This has changed upstream as well.
+
 * Tue Mar 11 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-2
 - Add TurboGears-1.0.4.4-cherrypyreq.patch to explicitly require the
   appropriate version of CherryPy when necessary.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Mar 2008 00:19:40 -0000	1.11
+++ sources	18 Sep 2008 01:25:02 -0000	1.12
@@ -1 +1 @@
-a03a66fcf7d687fd7bd4205a01fd21dd  TurboGears-1.0.4.4.tar.gz
+a933efb063de7efb337d4819976c81ea  TurboGears-1.0.7.tar.gz



From lmacken at fedoraproject.org  Thu Sep 18 01:41:33 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 18 Sep 2008 01:41:33 +0000 (UTC)
Subject: rpms/TurboGears/F-9 TurboGears-1.0.7-cherrypyreq.patch, NONE,
	1.1 TurboGears-1.0.4.4-cherrypyreq.patch, 1.1, NONE
Message-ID: <20080918014133.40688700D9@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1247

Added Files:
	TurboGears-1.0.7-cherrypyreq.patch 
Removed Files:
	TurboGears-1.0.4.4-cherrypyreq.patch 
Log Message:
Add the patch this time

TurboGears-1.0.7-cherrypyreq.patch:

--- NEW FILE TurboGears-1.0.7-cherrypyreq.patch ---
--- turbogears/config.py.orig	2008-09-16 09:41:30.000000000 -0400
+++ turbogears/config.py	2008-09-16 09:41:51.000000000 -0400
@@ -1,8 +1,8 @@
 import os, glob, re
-
+import pkg_resources
+pkg_resources.require("CherryPy<3.0")
 from cherrypy import config
 from configobj import ConfigObj
-import pkg_resources
 import logging
 import logging.handlers
 


--- TurboGears-1.0.4.4-cherrypyreq.patch DELETED ---



From lmacken at fedoraproject.org  Thu Sep 18 01:43:54 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 18 Sep 2008 01:43:54 +0000 (UTC)
Subject: rpms/TurboGears/F-9 TurboGears.spec,1.38,1.39
Message-ID: <20080918014354.9A0B97013F@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1455

Modified Files:
	TurboGears.spec 
Log Message:
Rebase cherrypyreq patch


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-9/TurboGears.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- TurboGears.spec	18 Sep 2008 01:25:02 -0000	1.38
+++ TurboGears.spec	18 Sep 2008 01:43:24 -0000	1.39
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -90,6 +90,9 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Wed Sep 17 2008 Luke Macken <lmacken at redhat.com> 1.0.7-2
+- Rebase cherrypyreq patch.
+
 * Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> 1.0.7-1
 - Update to the latest upstream release
 - Utilize the test suite



From whot at fedoraproject.org  Thu Sep 18 02:10:13 2008
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu, 18 Sep 2008 02:10:13 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-9 xorg-x11-server.spec, 1.342,
	1.343 xserver-1.5.0-no-evdev-keyboards-kthnx.patch, 1.4, 1.5
Message-ID: <20080918021013.737A8700D9@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2409

Modified Files:
	xorg-x11-server.spec 
	xserver-1.5.0-no-evdev-keyboards-kthnx.patch 
Log Message:
* Thu Sep 18 2008 Peter Hutterer <peter.hutterer at redhat.com> 1.5.0-2
- xserver-1.5.0-no-evdev-keyboards-kthnx.patch: update to force
  AllowEmptyInput off by default. #462606 




Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xorg-x11-server.spec,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- xorg-x11-server.spec	12 Sep 2008 14:24:46 -0000	1.342
+++ xorg-x11-server.spec	18 Sep 2008 02:09:43 -0000	1.343
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -458,6 +458,10 @@
 
 
 %changelog
+* Thu Sep 18 2008 Peter Hutterer <peter.hutterer at redhat.com> 1.5.0-2
+- xserver-1.5.0-no-evdev-keyboards-kthnx.patch: update to force
+  AllowEmptyInput off by default. #462606 
+
 * Fri Sep 12 2008 Adam Jackson <ajax at redhat.com> 1.5.0-1
 - xserver 1.5.0
 

xserver-1.5.0-no-evdev-keyboards-kthnx.patch:

Index: xserver-1.5.0-no-evdev-keyboards-kthnx.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xserver-1.5.0-no-evdev-keyboards-kthnx.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xserver-1.5.0-no-evdev-keyboards-kthnx.patch	12 Sep 2008 14:14:43 -0000	1.4
+++ xserver-1.5.0-no-evdev-keyboards-kthnx.patch	18 Sep 2008 02:09:43 -0000	1.5
@@ -1,11 +1,14 @@
-From d70615e602361be7204552327f1fd5fa6d170cd0 Mon Sep 17 00:00:00 2001
+From c5714d2d77e872344d0ef8b4665f50cd43e467d8 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
 Date: Fri, 12 Sep 2008 10:12:55 -0400
 Subject: [PATCH] config: disable evdev for keyboards
 
+If we ignore evdev keyboards, then we must have AEI off by default to allow
+for kbd to start if no xorg.conf is present.
 ---
- config/hal.c |   28 ++++++++++++++++++++++++++++
- 1 files changed, 28 insertions(+), 0 deletions(-)
+ config/hal.c                   |   28 ++++++++++++++++++++++++++++
+ hw/xfree86/common/xf86Config.c |    5 +++--
+ 2 files changed, 31 insertions(+), 2 deletions(-)
 
 diff --git a/config/hal.c b/config/hal.c
 index 0e0505b..76e8c45 100644
@@ -53,6 +56,22 @@
      driver = get_prop_string(hal_ctx, udi, "input.x11_driver");
      if (!driver){
          /* verbose, don't tell the user unless they _want_ to see it */
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index a1c2e34..67cc783 100644
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
+@@ -1088,8 +1088,9 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
+     }
+ #endif
+ 
+-    /* AllowEmptyInput is automatically true if we're hotplugging */
+-    xf86Info.allowEmptyInput = (xf86Info.autoAddDevices && xf86Info.autoEnableDevices);
++    /* Disable AEI by default, so setups with no config file force the kbd
++     * driver */
++    xf86Info.allowEmptyInput = FALSE;
+     xf86GetOptValBool(FlagOptions, FLAG_ALLOW_EMPTY_INPUT, &xf86Info.allowEmptyInput);
+ 
+     xf86Info.useDefaultFontPath = TRUE;
 -- 
-1.6.0.1
+1.5.5.2
 



From mtasaka at fedoraproject.org  Thu Sep 18 02:24:04 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 18 Sep 2008 02:24:04 +0000 (UTC)
Subject: rpms/ruby-gnome2/devel ruby-gnome2.spec,1.30,1.31
Message-ID: <20080918022404.6F4ED700D9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3554

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.17.0-3
- Patch from svn to fix Ruby/Glib bug (bug 456816)



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ruby-gnome2.spec	12 Sep 2008 16:53:31 -0000	1.30
+++ ruby-gnome2.spec	18 Sep 2008 02:23:34 -0000	1.31
@@ -11,7 +11,7 @@
 
 Name:           ruby-gnome2
 Version:        0.17.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -21,8 +21,10 @@
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
 Patch14:        ruby-gnome2-all-0.16.0-xulrunner.patch
-# must be sent to upstream
-#Patch15:        ruby-gnome2-0.17.0-rc1-newgtk-021303.patch
+# Already in upstream svn
+# Fix bug 456816
+# http://lists.sourceforge.jp/mailman/archives/kazehakase-devel/2008-September/002846.html
+Patch15:        ruby-gnome2-0.17.0-bz456816.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -489,7 +491,7 @@
 %if 0%{?fedora} >= 9
 %patch14 -p1 -b .xulrunner
 %endif
-# %patch15 -p1 -b .newgtk
+%patch15 -p0 -b .bz456816
 
 # Fix the attributes of some files
 # suppress lots of messages..
@@ -699,6 +701,8 @@
 
 
 %changelog
+* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.17.0-3
+- Patch from svn to fix Ruby/Glib bug (bug 456816)
 
 * Fri Sep 12 2008 Allisson Azevedo <allisson at gmail.com> 0.17.0-2
 - Rebuild against new gstreamer-devel



From mtasaka at fedoraproject.org  Thu Sep 18 02:26:01 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 18 Sep 2008 02:26:01 +0000 (UTC)
Subject: rpms/ruby-gnome2/devel ruby-gnome2-0.17.0-bz456816.patch,NONE,1.1
Message-ID: <20080918022601.E0DA6700D9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3882

Added Files:
	ruby-gnome2-0.17.0-bz456816.patch 
Log Message:
Add the patch actually

ruby-gnome2-0.17.0-bz456816.patch:

--- NEW FILE ruby-gnome2-0.17.0-bz456816.patch ---
Index: glib/src/rbglib_maincontext.c
===================================================================
--- glib/src/rbglib_maincontext.c	(revision 3283)
+++ glib/src/rbglib_maincontext.c	(working copy)
@@ -753,6 +753,14 @@
 }
 #endif
 
+#ifndef HAVE_RB_THREAD_BLOCKING_REGION
+static void
+ruby_source_remove(VALUE tag)
+{
+    g_source_remove(NUM2UINT(tag));
+}
+#endif
+
 void
 Init_glib_main_context()
 {
@@ -831,7 +839,7 @@
         source = ruby_source_new();
         tag = g_source_attach(source, NULL);
         g_source_unref(source);
-        rb_set_end_proc((void (*)(VALUE))g_source_remove, (VALUE)tag);
+        rb_set_end_proc(ruby_source_remove, UINT2NUM(tag));
     }
 #endif
 }



From ausil at fedoraproject.org  Thu Sep 18 03:05:01 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 18 Sep 2008 03:05:01 +0000 (UTC)
Subject: rpms/setools/F-9 setools.spec,1.80,1.81
Message-ID: <20080918030501.17465700D9@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/setools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6837

Modified Files:
	setools.spec 
Log Message:
fix building for sparc need -fPIC



Index: setools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setools/F-9/setools.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- setools.spec	2 Apr 2008 13:34:41 -0000	1.80
+++ setools.spec	18 Sep 2008 03:04:30 -0000	1.81
@@ -5,7 +5,7 @@
 
 Name: setools
 Version: %{setools_maj_ver}.%{setools_min_ver}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 URL: http://oss.tresys.com/projects/setools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -190,6 +190,11 @@
 %configure --libdir=%{_libdir} --disable-bwidget-check --disable-selinux-check --enable-swig-python --enable-swig-java --enable-swig-tcl
 # work around issue with gcc 4.3 + gnu99 + swig-generated code:
 sed -i -e 's:$(CC):gcc -std=gnu89:' libseaudit/swig/python/Makefile
+%ifarch sparc sparcv9 sparc64 s390 s390x
+    for file in `find . -name Makefile`; do
+        sed -i -e 's:-fpic:-fPIC:' $file;
+    done
+%endif
 make %{?_smp_mflags}
 
 %install
@@ -241,7 +246,7 @@
 %files libs-python
 %defattr(-,root,root,-)
 %{pkg_py_lib}/
-%ifarch x86_64 ppc64
+%ifarch x86_64 ppc64 sparc64
 %{pkg_py_arch}/
 %endif
 
@@ -337,6 +342,9 @@
 %postun libs-tcl -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 17 2008 Dennis Gilmore <dennis at ausil.us> 3.3.4-2
+- use -fPIC on sparc and s390
+
 * Wed Feb 27 2008 Chris PeBenito <cpebenito at tresys.com> 3.3.4-1
 - Fixes gcc 4.3, glibc 2.7, tcl 8.5, and libsepol 2.0.20 issues.
 - Fix policy loading when policy on disk is higher version than the kernel.



From ausil at fedoraproject.org  Thu Sep 18 03:11:30 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 18 Sep 2008 03:11:30 +0000 (UTC)
Subject: rpms/setools/devel setools.spec,1.81,1.82
Message-ID: <20080918031130.95587700D9@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/setools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7486

Modified Files:
	setools.spec 
Log Message:
allow building on sparc and s390



Index: setools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setools/devel/setools.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- setools.spec	26 Aug 2008 14:23:07 -0000	1.81
+++ setools.spec	18 Sep 2008 03:11:00 -0000	1.82
@@ -5,7 +5,7 @@
 
 Name: setools
 Version: %{setools_maj_ver}.%{setools_min_ver}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 URL: http://oss.tresys.com/projects/setools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -190,6 +190,11 @@
 %configure --libdir=%{_libdir} --disable-bwidget-check --disable-selinux-check --enable-swig-python --enable-swig-java --enable-swig-tcl
 # work around issue with gcc 4.3 + gnu99 + swig-generated code:
 sed -i -e 's:$(CC):gcc -std=gnu89:' libseaudit/swig/python/Makefile
+%ifarch sparc sparcv9 sparc64 s390 s390x                                                                                                
+    for file in `find . -name Makefile`; do                                                                                             
+        sed -i -e 's:-fpic:-fPIC:' $file;                                                                                               
+    done                                                                                                                                
+%endif           
 make %{?_smp_mflags}
 
 %install
@@ -241,7 +246,7 @@
 %files libs-python
 %defattr(-,root,root,-)
 %{pkg_py_lib}/
-%ifarch x86_64 ppc64
+%ifarch x86_64 ppc64 sparc64
 %{pkg_py_arch}/
 %endif
 
@@ -337,6 +342,9 @@
 %postun libs-tcl -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 17 2008 Dennis Gilmore <dennis at ausil.us> 3.3.5-2
+- fix building in sparc and s390 arches
+
 * Tue Aug 26 2008 Chris PeBenito <cpebenito at tresys.com> 3.3.5-1
 - Update to upstream version 3.3.5.
 



From transif at fedoraproject.org  Thu Sep 18 03:15:37 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 18 Sep 2008 03:15:37 +0000 (UTC)
Subject: comps/po pt_BR.po,1.21,1.22
Message-ID: <20080918031537.3FEDF700D9@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8008/po

Modified Files:
	pt_BR.po 
Log Message:
    2008-09-18  Igor Pires Soares <igorsoares at gmail.com> (via
igor at fedoraproject.org)
    
      * po/pt_BR.po: Updated Brazilian Portuguese translation
    



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.21 -r 1.22 pt_BR.po
Index: pt_BR.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pt_BR.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- pt_BR.po	17 Sep 2008 22:44:36 -0000	1.21
+++ pt_BR.po	18 Sep 2008 03:15:06 -0000	1.22
@@ -19,7 +19,7 @@
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-09-14 17:26-0300\n"
+"PO-Revision-Date: 2008-09-18 00:14-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"
@@ -29,188 +29,282 @@
 "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-f7.xml.in.h:1
+#: ../comps-f8.xml.in.h:1
+#: ../comps-f9.xml.in.h:1
 #: ../comps-f10.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:2 ../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:2
+#: ../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-f7.xml.in.h:3
+#: ../comps-f8.xml.in.h:3
+#: ../comps-f9.xml.in.h:3
 #: ../comps-f10.xml.in.h:3
 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-f7.xml.in.h:4
+#: ../comps-f8.xml.in.h:4
+#: ../comps-f9.xml.in.h:4
 #: ../comps-f10.xml.in.h:4
 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:5 ../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:5
+#: ../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-f7.xml.in.h:6
+#: ../comps-f8.xml.in.h:6
+#: ../comps-f9.xml.in.h:6
 #: ../comps-f10.xml.in.h:6
 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:7 ../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:7
+#: ../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:8 ../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:8
+#: ../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-f7.xml.in.h:9
+#: ../comps-f8.xml.in.h:9
+#: ../comps-f9.xml.in.h:9
 #: ../comps-f10.xml.in.h:9
 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:10 ../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:10
+#: ../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-f7.xml.in.h:11
+#: ../comps-f8.xml.in.h:11
+#: ../comps-f9.xml.in.h:11
 #: ../comps-f10.xml.in.h:11
 msgid "Base"
 msgstr "Base"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-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:12
+#: ../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-f7.xml.in.h:13
+#: ../comps-f8.xml.in.h:13
+#: ../comps-f9.xml.in.h:13
 #: ../comps-f10.xml.in.h:13
 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-f7.xml.in.h:14
+#: ../comps-f8.xml.in.h:14
+#: ../comps-f9.xml.in.h:14
 #: ../comps-f10.xml.in.h:14
 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-f7.xml.in.h:15
+#: ../comps-f8.xml.in.h:15
+#: ../comps-f9.xml.in.h:15
 #: ../comps-f10.xml.in.h:15
 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-f7.xml.in.h:16
+#: ../comps-f8.xml.in.h:16
+#: ../comps-f9.xml.in.h:16
 #: ../comps-f10.xml.in.h:16
 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-f7.xml.in.h:17
+#: ../comps-f8.xml.in.h:17
+#: ../comps-f9.xml.in.h:17
 #: ../comps-f10.xml.in.h:17
 msgid "Bhutanese Support"
 msgstr "Suporte ?? Butan??s"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
+#: ../comps-f7.xml.in.h:18
+#: ../comps-f8.xml.in.h:18
+#: ../comps-f9.xml.in.h:18
 #: ../comps-f10.xml.in.h:18
 msgid "Bosnian Support"
 msgstr "Suporte ?? B??snio"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
+#: ../comps-f7.xml.in.h:19
+#: ../comps-f8.xml.in.h:19
+#: ../comps-f9.xml.in.h:19
 #: ../comps-f10.xml.in.h:19
 msgid "Brazilian Portuguese Support"
 msgstr "Suporte ?? Portugu??s Brasileiro"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
+#: ../comps-f7.xml.in.h:20
+#: ../comps-f8.xml.in.h:20
+#: ../comps-f9.xml.in.h:20
 #: ../comps-f10.xml.in.h:20
 msgid "Breton Support"
 msgstr "Suporte ?? Bret??o"
[...1900 lines suppressed...]
+msgstr "Suporte ?? Sindhi"
 
 #: ../comps-f10.xml.in.h:156
-#, fuzzy
 msgid "Support for developing programs in the Haskell programming language."
-msgstr ""
-"Suporte ao desenvolvimento de programas na linguagem de programa????o Java."
+msgstr "Suporte ao desenvolvimento de programas na linguagem de programa????o Haskell."
 
 #: ../comps-f10.xml.in.h:163
 msgid "Tajik Support"
@@ -1229,145 +1663,116 @@
 msgid "Uzbek Support"
 msgstr "Suporte ?? Uzbeque"
 
-#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
+#: ../comps-el4.xml.in.h:3
+#: ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Aplica????es para uma variedade de tarefas"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12
+#: ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "Suporte ?? Rede Dialup"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
-msgid ""
-"GNOME is a powerful, graphical user interface which includes a panel, "
-"desktop, system icons, and a graphical file manager."
-msgstr ""
-"O GNOME ?? uma poderosa interface gr??fica que inclui um painel, uma ??rea de "
-"trabalho, ??cones de sistema e um gerenciador de arquivos gr??fico."
-
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
-msgid ""
-"KDE is a powerful, graphical user interface which includes a panel, desktop, "
-"system icons, and a graphical file manager."
-msgstr ""
-"O KDE ?? uma poderosa interface gr??fica que inclui um painel, uma ??rea de "
-"trabalho, ??cones de sistema e um gerenciador de arquivos gr??fico."
-
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
-msgid ""
-"Sometimes called text editors, these are programs that allow you to create "
-"and edit files. These include Emacs and Vi."
-msgstr ""
-"Algumas vezes chamados de editores de texto, estes programas permitem criar "
-"e editar arquivos. Isto inclui o Emacs e o Vi."
+#: ../comps-el4.xml.in.h:22
+#: ../comps-el5.xml.in.h:23
+msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "O GNOME ?? uma poderosa interface gr??fica que inclui um painel, uma ??rea de trabalho, ??cones de sistema e um gerenciador de arquivos gr??fico."
+
+#: ../comps-el4.xml.in.h:35
+#: ../comps-el5.xml.in.h:35
+msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "O KDE ?? uma poderosa interface gr??fica que inclui um painel, uma ??rea de trabalho, ??cones de sistema e um gerenciador de arquivos gr??fico."
+
+#: ../comps-el4.xml.in.h:44
+#: ../comps-el5.xml.in.h:44
+msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi."
+msgstr "Algumas vezes chamados de editores de texto, estes programas permitem criar e editar arquivos. Isto inclui o Emacs e o Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50
+#: ../comps-el5.xml.in.h:48
 msgid "The XEmacs text editor."
 msgstr "O editor de texto XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
-msgid ""
-"These tools allow you to create documentation in the DocBook format and "
-"convert them to HTML, PDF, Postscript, and text."
-msgstr ""
-"Estas ferramentas permitem criar documenta????o no formato DocBook e convert??-"
-"la para HTML, PDF, PostScript e texto."
+#: ../comps-el4.xml.in.h:54
+#: ../comps-el5.xml.in.h:52
+msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text."
+msgstr "Estas ferramentas permitem criar documenta????o no formato DocBook e convert??-la para HTML, PDF, PostScript e texto."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64
+#: ../comps-el5.xml.in.h:62
 msgid "This group is a collection of network servers for specific purposes"
-msgstr ""
-"Este grupo ?? uma cole????o de servidores de redes para prop??sitos espec??ficos."
+msgstr "Este grupo ?? uma cole????o de servidores de redes para prop??sitos espec??ficos."
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+#: ../comps-el4.xml.in.h:65
+#: ../comps-el5.xml.in.h:63
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "Este grupo ?? um cole????o de ferramentas e recursos de ambientes ??rabes."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
-msgstr ""
-"Este grupo ?? um cole????o de ferramentas e recursos de ambientes hebraicos."
-
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
-msgstr ""
-"Este grupo ?? um cole????o de ferramentas e recursos de ambientes japoneses."
+#: ../comps-el4.xml.in.h:67
+#: ../comps-el5.xml.in.h:66
+msgid "This group is a collection of tools and resources of Hebrew environments."
+msgstr "Este grupo ?? um cole????o de ferramentas e recursos de ambientes hebraicos."
+
+#: ../comps-el4.xml.in.h:68
+#: ../comps-el5.xml.in.h:67
+msgid "This group is a collection of tools and resources of Japanese environments."
+msgstr "Este grupo ?? um cole????o de ferramentas e recursos de ambientes japoneses."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77
+#: ../comps-el5.xml.in.h:77
 msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "Este grupo ?? um cole????o de ferramentas e recursos de ambientes checos."
 
 #~ msgid "Haskell"
 #~ msgstr "Haskell"
-
 #~ msgid "British Support"
 #~ msgstr "Suporte ?? Bret??o"
-
 #~ msgid "Cluster Storage"
 #~ msgstr "Armazenamento em Clusters"
-
 #~ msgid "Clustering Support."
 #~ msgstr "Suporte a Clusters."
-
 #~ msgid "Libraries for applications built on older releases."
 #~ msgstr "Bibliotecas para aplica????es compiladas em vers??es anteriores."
-
 #~ msgid "Miscellaneous Included Packages"
 #~ msgstr "Pacotes Variados Inclu??dos"
-
 #~ msgid "Packages which provide support for cluster storage."
 #~ msgstr "Pacotes que fornecem suporte para o armazenamento em clusters."
-
 #~ msgid "Packages which provide support for single-node GFS."
 #~ msgstr "Pacotes que fornecem suporte para GFS de n?? ??nico."
-
 #~ msgid "Single Node GFS Support"
 #~ msgstr "Suporte ao GFS de N?? ??nico"
-
 #~ msgid "These packages provide compatibility support with previous releases."
 #~ msgstr "Estes pacotes fornecem compatibilidade com as vers??es anteriores."
-
 #~ msgid "Java Runtime Environments and Development Kits"
 #~ msgstr "Ambientes de Tempo de Execu????o e Kits de Desenvolvimento Java"
-
 #~ msgid "Misc"
 #~ msgstr "Variados"
-
 #~ msgid "Misc packages"
 #~ msgstr "Pacotes variados"
-
 #~ msgid "Multimedia"
 #~ msgstr "Multim??dia"
-
 #~ msgid "Multimedia applications"
 #~ msgstr "Aplica????es multim??dia"
-
 #~ msgid ""
 #~ "Packages which provide additional functionality for Red Hat Enterprise "
 #~ "Linux"
 #~ msgstr ""
 #~ "Pacotes que fornecem funcionalidades adicionais para o Red Hat Enterprise "
 #~ "Linux"
-
 #~ msgid "Red Hat Enterprise Linux Supplementary"
 #~ msgstr "Suplementos do Red Hat Enterprise Linux"
-
 #~ msgid ""
 #~ "Components used for high performance networking and clustering, such as "
 #~ "Infiniband and RDMA."
 #~ msgstr ""
 #~ "Componentes usados para redes e clusters de alta performance, como a "
 #~ "Infiniband e a RDMA."
-
 #~ msgid "OpenFabrics Enterprise Distribution"
 #~ msgstr "Distribui????o do OpenFabrics Enterprise"
-
 #~ msgid "Virtualization Support."
 #~ msgstr "Suporte ?? Virtualiza????o."
+



From lmacken at fedoraproject.org  Thu Sep 18 03:42:02 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 18 Sep 2008 03:42:02 +0000 (UTC)
Subject: rpms/TurboGears/F-8 TurboGears-1.0.7-cherrypyreq.patch, NONE,
	1.1 TurboGears.spec, 1.31, 1.32 sources, 1.11,
	1.12 TurboGears-1.0.4.3-setuptools.patch, 1.1,
	NONE TurboGears-1.0.4.4-cherrypyreq.patch, 1.1,
	NONE TurboGears-1.0.4.4-setup.patch, 1.1, NONE
Message-ID: <20080918034202.64E6B700D9@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10344

Modified Files:
	TurboGears.spec sources 
Added Files:
	TurboGears-1.0.7-cherrypyreq.patch 
Removed Files:
	TurboGears-1.0.4.3-setuptools.patch 
	TurboGears-1.0.4.4-cherrypyreq.patch 
	TurboGears-1.0.4.4-setup.patch 
Log Message:
* Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> 1.0.7-1
- Update to the latest upstream release
- Utilize the test suite
- Remove the setup.py patch


TurboGears-1.0.7-cherrypyreq.patch:

--- NEW FILE TurboGears-1.0.7-cherrypyreq.patch ---
--- turbogears/config.py.orig	2008-09-16 09:41:30.000000000 -0400
+++ turbogears/config.py	2008-09-16 09:41:51.000000000 -0400
@@ -1,8 +1,8 @@
 import os, glob, re
-
+import pkg_resources
+pkg_resources.require("CherryPy<3.0")
 from cherrypy import config
 from configobj import ConfigObj
-import pkg_resources
 import logging
 import logging.handlers
 


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-8/TurboGears.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- TurboGears.spec	15 May 2008 03:37:20 -0000	1.31
+++ TurboGears.spec	18 Sep 2008 03:41:32 -0000	1.32
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           TurboGears
-Version:        1.0.4.4
-Release:        3%{?dist}
+Version:        1.0.7
+Release:        1%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -11,17 +11,23 @@
 URL:            http://www.turbogears.org
 Source0:        http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz
 Patch0:         %{name}-%{version}-cherrypyreq.patch
-Patch1:         %{name}-%{version}-setup.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-devel python-setuptools-devel
+BuildRequires: python-devel python-setuptools-devel
+
+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
 Requires:       python-cherrypy2
+BuildRequires:	python-cherrypy2
 %else
 Requires:       python-cherrypy
+BuildRequires:	python-cherrypy
 %endif
 
 Requires:       python-sqlalchemy
@@ -61,16 +67,17 @@
 %prep
 %setup -q
 %patch0 -b .cherrypyreq
-%patch1 -b .setup
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+%{__python} setup.py build
 
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install --skip-build --root %{buildroot}
 
+%check
+PYTHONPATH=$(pwd) nosetests -q
 
 %clean
 rm -rf %{buildroot}
@@ -83,9 +90,14 @@
 %{python_sitelib}/turbogears/
 
 %changelog
-* Wed May 14 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-3
-- Add TurboGears-1.0.4.4-setup.patch to remove some unnecessary egg 
-  dependencies
+* Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> 1.0.7-1
+- Update to the latest upstream release
+- Utilize the test suite
+- Remove the setup.py patch
+
+* Tue May 27 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-3
+- Patch our setup.py to remove the hard version requirements for SQLObject.
+  This has changed upstream as well.
 
 * Tue Mar 11 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-2
 - Add TurboGears-1.0.4.4-cherrypyreq.patch to explicitly require the


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-8/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	15 May 2008 03:37:20 -0000	1.11
+++ sources	18 Sep 2008 03:41:32 -0000	1.12
@@ -1 +1 @@
-a03a66fcf7d687fd7bd4205a01fd21dd  TurboGears-1.0.4.4.tar.gz
+a933efb063de7efb337d4819976c81ea  TurboGears-1.0.7.tar.gz


--- TurboGears-1.0.4.3-setuptools.patch DELETED ---


--- TurboGears-1.0.4.4-cherrypyreq.patch DELETED ---


--- TurboGears-1.0.4.4-setup.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Sep 18 03:53:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 03:53:42 +0000
Subject: [pkgdb] vldocking (Fedora, 9) updated by huzaifas
Message-ID: <20080918035342.42EC9208DA3@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for vldocking
huzaifas has set commit to Approved for uberpackager on vldocking (Fedora 9)
huzaifas has set build to Approved for uberpackager on vldocking (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on vldocking (Fedora 9)
huzaifas approved watchbugzilla on vldocking (Fedora 9) for mtasaka
huzaifas approved watchcommits on vldocking (Fedora 9) for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vldocking



From pkgdb at fedoraproject.org  Thu Sep 18 03:53:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 03:53:40 +0000
Subject: [pkgdb] vldocking was added for olea
Message-ID: <20080918035341.023AE208D9F@bastion.fedora.phx.redhat.com>

huzaifas has added Package vldocking with summary A Java ? docking system for JFC Swing applications
huzaifas has approved Package vldocking
huzaifas has added a Fedora devel branch for vldocking with an owner of olea
huzaifas has approved vldocking in Fedora devel
huzaifas has approved Package vldocking
huzaifas has set commit to Approved for packager on vldocking (Fedora devel)
huzaifas has set build to Approved for packager on vldocking (Fedora devel)
huzaifas has set checkout to Approved for packager on vldocking (Fedora devel)
huzaifas has set commit to Approved for uberpackager on vldocking (Fedora devel)
huzaifas has set build to Approved for uberpackager on vldocking (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on vldocking (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vldocking



From pkgdb at fedoraproject.org  Thu Sep 18 03:53:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 03:53:42 +0000
Subject: [pkgdb] vldocking (Fedora, 8) updated by huzaifas
Message-ID: <20080918035342.4C846208DA6@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for vldocking
huzaifas has set commit to Approved for uberpackager on vldocking (Fedora 8)
huzaifas has set build to Approved for uberpackager on vldocking (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on vldocking (Fedora 8)
huzaifas approved watchbugzilla on vldocking (Fedora 8) for mtasaka
huzaifas approved watchcommits on vldocking (Fedora 8) for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vldocking



From pkgdb at fedoraproject.org  Thu Sep 18 03:53:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 03:53:42 +0000
Subject: [pkgdb] vldocking (Fedora, devel) updated by huzaifas
Message-ID: <20080918035342.5CEF8208DA9@bastion.fedora.phx.redhat.com>

huzaifas approved watchbugzilla on vldocking (Fedora devel) for mtasaka
huzaifas approved watchcommits on vldocking (Fedora devel) for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vldocking



From huzaifas at fedoraproject.org  Thu Sep 18 03:54:23 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 18 Sep 2008 03:54:23 +0000 (UTC)
Subject: rpms/vldocking - New directory
Message-ID: <20080918035423.2A2F5700D9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/vldocking
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsx11596/rpms/vldocking

Log Message:
Directory /cvs/extras/rpms/vldocking added to the repository




From huzaifas at fedoraproject.org  Thu Sep 18 03:54:23 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 18 Sep 2008 03:54:23 +0000 (UTC)
Subject: rpms/vldocking/devel - New directory
Message-ID: <20080918035423.64D3C700D9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/vldocking/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsx11596/rpms/vldocking/devel

Log Message:
Directory /cvs/extras/rpms/vldocking/devel added to the repository




From huzaifas at fedoraproject.org  Thu Sep 18 03:54:24 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 18 Sep 2008 03:54:24 +0000 (UTC)
Subject: rpms/vldocking Makefile,NONE,1.1
Message-ID: <20080918035424.523FA700D9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/vldocking
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsx11596/rpms/vldocking

Added Files:
	Makefile 
Log Message:
Setup of module vldocking


--- NEW FILE Makefile ---
# Top level Makefile for module vldocking
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Thu Sep 18 03:54:24 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 18 Sep 2008 03:54:24 +0000 (UTC)
Subject: rpms/vldocking/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080918035424.89202700D9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/vldocking/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsx11596/rpms/vldocking/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vldocking


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: vldocking
# $Id: Makefile,v 1.1 2008/09/18 03:54:24 huzaifas Exp $
NAME := vldocking
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 18 04:01:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 04:01:31 +0000
Subject: [pkgdb] xhtml2fo-style-xsl was added for olea
Message-ID: <20080918040131.576B5208DA0@bastion.fedora.phx.redhat.com>

huzaifas has added Package xhtml2fo-style-xsl with summary Antenna House, Inc. XHTML to XSL:FO stylesheets
huzaifas has approved Package xhtml2fo-style-xsl
huzaifas has added a Fedora devel branch for xhtml2fo-style-xsl with an owner of olea
huzaifas has approved xhtml2fo-style-xsl in Fedora devel
huzaifas has approved Package xhtml2fo-style-xsl
huzaifas has set commit to Approved for packager on xhtml2fo-style-xsl (Fedora devel)
huzaifas has set build to Approved for packager on xhtml2fo-style-xsl (Fedora devel)
huzaifas has set checkout to Approved for packager on xhtml2fo-style-xsl (Fedora devel)
huzaifas has set commit to Approved for uberpackager on xhtml2fo-style-xsl (Fedora devel)
huzaifas has set build to Approved for uberpackager on xhtml2fo-style-xsl (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on xhtml2fo-style-xsl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xhtml2fo-style-xsl



From pkgdb at fedoraproject.org  Thu Sep 18 04:01:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 04:01:32 +0000
Subject: [pkgdb] xhtml2fo-style-xsl (Fedora, 9) updated by huzaifas
Message-ID: <20080918040133.23469208DA3@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for xhtml2fo-style-xsl
huzaifas has set commit to Approved for uberpackager on xhtml2fo-style-xsl (Fedora 9)
huzaifas has set build to Approved for uberpackager on xhtml2fo-style-xsl (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on xhtml2fo-style-xsl (Fedora 9)
huzaifas approved watchbugzilla on xhtml2fo-style-xsl (Fedora 9) for mtasaka
huzaifas approved watchcommits on xhtml2fo-style-xsl (Fedora 9) for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xhtml2fo-style-xsl



From pkgdb at fedoraproject.org  Thu Sep 18 04:01:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 04:01:32 +0000
Subject: [pkgdb] xhtml2fo-style-xsl (Fedora, 8) updated by huzaifas
Message-ID: <20080918040133.38EF5208DA6@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for xhtml2fo-style-xsl
huzaifas has set commit to Approved for uberpackager on xhtml2fo-style-xsl (Fedora 8)
huzaifas has set build to Approved for uberpackager on xhtml2fo-style-xsl (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on xhtml2fo-style-xsl (Fedora 8)
huzaifas approved watchbugzilla on xhtml2fo-style-xsl (Fedora 8) for mtasaka
huzaifas approved watchcommits on xhtml2fo-style-xsl (Fedora 8) for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xhtml2fo-style-xsl



From pkgdb at fedoraproject.org  Thu Sep 18 04:01:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 04:01:33 +0000
Subject: [pkgdb] xhtml2fo-style-xsl (Fedora, devel) updated by huzaifas
Message-ID: <20080918040133.9D2D3208DA9@bastion.fedora.phx.redhat.com>

huzaifas approved watchbugzilla on xhtml2fo-style-xsl (Fedora devel) for mtasaka
huzaifas approved watchcommits on xhtml2fo-style-xsl (Fedora devel) for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xhtml2fo-style-xsl



From huzaifas at fedoraproject.org  Thu Sep 18 04:03:02 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 18 Sep 2008 04:03:02 +0000 (UTC)
Subject: rpms/xhtml2fo-style-xsl - New directory
Message-ID: <20080918040302.23957700D9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/xhtml2fo-style-xsl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsC12544/rpms/xhtml2fo-style-xsl

Log Message:
Directory /cvs/extras/rpms/xhtml2fo-style-xsl added to the repository




From huzaifas at fedoraproject.org  Thu Sep 18 04:03:02 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 18 Sep 2008 04:03:02 +0000 (UTC)
Subject: rpms/xhtml2fo-style-xsl/devel - New directory
Message-ID: <20080918040302.5BE52700D9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/xhtml2fo-style-xsl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsC12544/rpms/xhtml2fo-style-xsl/devel

Log Message:
Directory /cvs/extras/rpms/xhtml2fo-style-xsl/devel added to the repository




From huzaifas at fedoraproject.org  Thu Sep 18 04:03:03 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 18 Sep 2008 04:03:03 +0000 (UTC)
Subject: rpms/xhtml2fo-style-xsl Makefile,NONE,1.1
Message-ID: <20080918040303.41729700D9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/xhtml2fo-style-xsl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsC12544/rpms/xhtml2fo-style-xsl

Added Files:
	Makefile 
Log Message:
Setup of module xhtml2fo-style-xsl


--- NEW FILE Makefile ---
# Top level Makefile for module xhtml2fo-style-xsl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Thu Sep 18 04:03:03 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 18 Sep 2008 04:03:03 +0000 (UTC)
Subject: rpms/xhtml2fo-style-xsl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20080918040303.78944700D9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/xhtml2fo-style-xsl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsC12544/rpms/xhtml2fo-style-xsl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xhtml2fo-style-xsl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xhtml2fo-style-xsl
# $Id: Makefile,v 1.1 2008/09/18 04:03:03 huzaifas Exp $
NAME := xhtml2fo-style-xsl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 18 04:04:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 04:04:43 +0000
Subject: [pkgdb] mediawiki-imagemap (Fedora, 9) updated by huzaifas
Message-ID: <20080918040443.69EA7208DA3@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for mediawiki-imagemap
huzaifas has set commit to Approved for uberpackager on mediawiki-imagemap (Fedora 9)
huzaifas has set build to Approved for uberpackager on mediawiki-imagemap (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on mediawiki-imagemap (Fedora 9)
huzaifas approved watchbugzilla on mediawiki-imagemap (Fedora 9) for mtasaka
huzaifas approved watchcommits on mediawiki-imagemap (Fedora 9) for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-imagemap



From pkgdb at fedoraproject.org  Thu Sep 18 04:04:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 04:04:42 +0000
Subject: [pkgdb] mediawiki-imagemap was added for olea
Message-ID: <20080918040442.2BDE2208D9F@bastion.fedora.phx.redhat.com>

huzaifas has added Package mediawiki-imagemap with summary The ImageMap extension for MediaWiki
huzaifas has approved Package mediawiki-imagemap
huzaifas has added a Fedora devel branch for mediawiki-imagemap with an owner of olea
huzaifas has approved mediawiki-imagemap in Fedora devel
huzaifas has approved Package mediawiki-imagemap
huzaifas has set commit to Approved for packager on mediawiki-imagemap (Fedora devel)
huzaifas has set build to Approved for packager on mediawiki-imagemap (Fedora devel)
huzaifas has set checkout to Approved for packager on mediawiki-imagemap (Fedora devel)
huzaifas has set commit to Approved for uberpackager on mediawiki-imagemap (Fedora devel)
huzaifas has set build to Approved for uberpackager on mediawiki-imagemap (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on mediawiki-imagemap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-imagemap



From pkgdb at fedoraproject.org  Thu Sep 18 04:04:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 04:04:43 +0000
Subject: [pkgdb] mediawiki-imagemap (Fedora, devel) updated by huzaifas
Message-ID: <20080918040443.72AB3208DA6@bastion.fedora.phx.redhat.com>

huzaifas approved watchbugzilla on mediawiki-imagemap (Fedora devel) for mtasaka
huzaifas approved watchcommits on mediawiki-imagemap (Fedora devel) for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-imagemap



From huzaifas at fedoraproject.org  Thu Sep 18 04:05:12 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 18 Sep 2008 04:05:12 +0000 (UTC)
Subject: rpms/mediawiki-imagemap - New directory
Message-ID: <20080918040512.20D78700D9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/mediawiki-imagemap
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsV12870/rpms/mediawiki-imagemap

Log Message:
Directory /cvs/extras/rpms/mediawiki-imagemap added to the repository




From huzaifas at fedoraproject.org  Thu Sep 18 04:05:12 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 18 Sep 2008 04:05:12 +0000 (UTC)
Subject: rpms/mediawiki-imagemap/devel - New directory
Message-ID: <20080918040512.58CAC700D9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/mediawiki-imagemap/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsV12870/rpms/mediawiki-imagemap/devel

Log Message:
Directory /cvs/extras/rpms/mediawiki-imagemap/devel added to the repository




From huzaifas at fedoraproject.org  Thu Sep 18 04:05:13 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 18 Sep 2008 04:05:13 +0000 (UTC)
Subject: rpms/mediawiki-imagemap Makefile,NONE,1.1
Message-ID: <20080918040513.3937B700D9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/mediawiki-imagemap
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsV12870/rpms/mediawiki-imagemap

Added Files:
	Makefile 
Log Message:
Setup of module mediawiki-imagemap


--- NEW FILE Makefile ---
# Top level Makefile for module mediawiki-imagemap
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep 18 04:04:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 04:04:43 +0000
Subject: [pkgdb] mediawiki-imagemap (Fedora, 8) updated by huzaifas
Message-ID: <20080918040443.7F7ED208DA9@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for mediawiki-imagemap
huzaifas has set commit to Approved for uberpackager on mediawiki-imagemap (Fedora 8)
huzaifas has set build to Approved for uberpackager on mediawiki-imagemap (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on mediawiki-imagemap (Fedora 8)
huzaifas approved watchbugzilla on mediawiki-imagemap (Fedora 8) for mtasaka
huzaifas approved watchcommits on mediawiki-imagemap (Fedora 8) for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-imagemap



From huzaifas at fedoraproject.org  Thu Sep 18 04:05:13 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 18 Sep 2008 04:05:13 +0000 (UTC)
Subject: rpms/mediawiki-imagemap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20080918040513.6D1BA700D9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/mediawiki-imagemap/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsV12870/rpms/mediawiki-imagemap/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mediawiki-imagemap


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mediawiki-imagemap
# $Id: Makefile,v 1.1 2008/09/18 04:05:13 huzaifas Exp $
NAME := mediawiki-imagemap
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 18 04:07:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 04:07:35 +0000
Subject: [pkgdb] scala was added for geoff
Message-ID: <20080918040735.3A3F8208D9F@bastion.fedora.phx.redhat.com>

huzaifas has added Package scala with summary Hybrid functional/object-oriented language
huzaifas has approved Package scala
huzaifas has added a Fedora devel branch for scala with an owner of geoff
huzaifas has approved scala in Fedora devel
huzaifas has approved Package scala
huzaifas has set commit to Approved for packager on scala (Fedora devel)
huzaifas has set build to Approved for packager on scala (Fedora devel)
huzaifas has set checkout to Approved for packager on scala (Fedora devel)
huzaifas has set commit to Approved for uberpackager on scala (Fedora devel)
huzaifas has set build to Approved for uberpackager on scala (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on scala (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scala



From pkgdb at fedoraproject.org  Thu Sep 18 04:07:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 04:07:35 +0000
Subject: [pkgdb] scala (Fedora, 9) updated by huzaifas
Message-ID: <20080918040735.E9569208DA3@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for scala
huzaifas has set commit to Approved for uberpackager on scala (Fedora 9)
huzaifas has set build to Approved for uberpackager on scala (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on scala (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scala



From huzaifas at fedoraproject.org  Thu Sep 18 04:07:50 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 18 Sep 2008 04:07:50 +0000 (UTC)
Subject: rpms/scala/devel - New directory
Message-ID: <20080918040750.55B98700D9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/scala/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsT13259/rpms/scala/devel

Log Message:
Directory /cvs/extras/rpms/scala/devel added to the repository




From huzaifas at fedoraproject.org  Thu Sep 18 04:07:50 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 18 Sep 2008 04:07:50 +0000 (UTC)
Subject: rpms/scala - New directory
Message-ID: <20080918040750.20828700D9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/scala
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsT13259/rpms/scala

Log Message:
Directory /cvs/extras/rpms/scala added to the repository




From huzaifas at fedoraproject.org  Thu Sep 18 04:07:51 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 18 Sep 2008 04:07:51 +0000 (UTC)
Subject: rpms/scala Makefile,NONE,1.1
Message-ID: <20080918040751.2B9F2700D9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/scala
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsT13259/rpms/scala

Added Files:
	Makefile 
Log Message:
Setup of module scala


--- NEW FILE Makefile ---
# Top level Makefile for module scala
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Thu Sep 18 04:07:51 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 18 Sep 2008 04:07:51 +0000 (UTC)
Subject: rpms/scala/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20080918040751.A0E5A700D9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/scala/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsT13259/rpms/scala/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module scala


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: scala
# $Id: Makefile,v 1.1 2008/09/18 04:07:51 huzaifas Exp $
NAME := scala
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Sep 18 05:03:30 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 18 Sep 2008 05:03:30 +0000 (UTC)
Subject: rpms/gtk2/devel .cvsignore, 1.92, 1.93 gtk2.spec, 1.321,
	1.322 sources, 1.100, 1.101
Message-ID: <20080918050330.47F24700D9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18413

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.14.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- .cvsignore	4 Sep 2008 19:19:39 -0000	1.92
+++ .cvsignore	18 Sep 2008 05:02:59 -0000	1.93
@@ -1 +1 @@
-gtk+-2.14.0.tar.bz2
+gtk+-2.14.2.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -r1.321 -r1.322
--- gtk2.spec	10 Sep 2008 10:29:42 -0000	1.321
+++ gtk2.spec	18 Sep 2008 05:02:59 -0000	1.322
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.14.0
+%define base_version 2.14.2
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 5%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
@@ -30,9 +30,6 @@
 # a workaround for some brokenness in the flash plugin
 # see http://bugzilla.gnome.org/show_bug.cgi?id=463773
 Patch2: workaround.patch
-# fixed upstream
-Patch3: init-deadlock.patch
-Patch4: gtk+-2.14.1-no-randr.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -118,8 +115,6 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
-%patch3 -p0 -b .init-deadlock
-%patch4 -p0 -b .no-randr
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -303,6 +298,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Thu Sep 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
+- Update to 2.14.2
+
 * Fri Sep  5 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.0-4
 - Remove the last patch, crash is fixed in at-spi now
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/sources,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- sources	4 Sep 2008 19:19:39 -0000	1.100
+++ sources	18 Sep 2008 05:02:59 -0000	1.101
@@ -1 +1 @@
-8cd2732b4e07a490691ae3635b71d932  gtk+-2.14.0.tar.bz2
+b693a2c1c2dd95457b87d0d042aa5bba  gtk+-2.14.2.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep 18 05:07:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 05:07:56 +0000
Subject: [pkgdb] perl-File-RsyncP: trasher has requested watchbugzilla
Message-ID: <20080918050756.24AFF208D9A@bastion.fedora.phx.redhat.com>

trasher has requested the watchbugzilla acl on perl-File-RsyncP (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Thu Sep 18 05:07:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 05:07:59 +0000
Subject: [pkgdb] perl-File-RsyncP: trasher has requested watchcommits
Message-ID: <20080918050759.A9AD4208DA2@bastion.fedora.phx.redhat.com>

trasher has requested the watchcommits acl on perl-File-RsyncP (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Thu Sep 18 05:08:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 05:08:00 +0000
Subject: [pkgdb] perl-File-RsyncP: trasher has requested commit
Message-ID: <20080918050800.221C3208DA5@bastion.fedora.phx.redhat.com>

trasher has requested the commit acl on perl-File-RsyncP (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Thu Sep 18 05:08:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 05:08:04 +0000
Subject: [pkgdb] perl-File-RsyncP: trasher has requested watchbugzilla
Message-ID: <20080918050804.5FAF9208D65@bastion.fedora.phx.redhat.com>

trasher has requested the watchbugzilla acl on perl-File-RsyncP (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Thu Sep 18 05:08:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 05:08:05 +0000
Subject: [pkgdb] perl-File-RsyncP: trasher has requested watchcommits
Message-ID: <20080918050805.474A7208DAA@bastion.fedora.phx.redhat.com>

trasher has requested the watchcommits acl on perl-File-RsyncP (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Thu Sep 18 05:08:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 05:08:07 +0000
Subject: [pkgdb] perl-File-RsyncP: trasher has requested commit
Message-ID: <20080918050806.F14AB208DAD@bastion.fedora.phx.redhat.com>

trasher has requested the commit acl on perl-File-RsyncP (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Thu Sep 18 05:08:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 05:08:07 +0000
Subject: [pkgdb] perl-File-RsyncP: trasher has requested approveacls
Message-ID: <20080918050807.BC416208D9A@bastion.fedora.phx.redhat.com>

trasher has requested the approveacls acl on perl-File-RsyncP (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From pkgdb at fedoraproject.org  Thu Sep 18 05:08:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 05:08:19 +0000
Subject: [pkgdb] perl-File-RsyncP: trasher has requested approveacls
Message-ID: <20080918050819.28151208D9F@bastion.fedora.phx.redhat.com>

trasher has requested the approveacls acl on perl-File-RsyncP (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-RsyncP



From transif at fedoraproject.org  Thu Sep 18 06:16:46 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 18 Sep 2008 06:16:46 +0000 (UTC)
Subject: comps/po zh_TW.po,1.14,1.15
Message-ID: <20080918061646.83FE6700D9@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25331/po

Modified Files:
	zh_TW.po 
Log Message:
    2008-09-18  Terry Chuang <tchuang at redhat.com> (via
tchuang at fedoraproject.org)
    
      * po/zh_TW.po: 
    



Index: zh_TW.po
===================================================================
RCS file: /cvs/pkgs/comps/po/zh_TW.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- zh_TW.po	17 Sep 2008 22:44:38 -0000	1.14
+++ zh_TW.po	18 Sep 2008 06:16:15 -0000	1.15
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
+"POT-Creation-Date: 2008-08-27 19:54+0000\n"
 "PO-Revision-Date: 2008-09-01 16:48+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -399,14 +399,12 @@
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:81
-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:82 ../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
@@ -464,220 +462,219 @@
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:96
+#: ../comps-f10.xml.in.h:95
 msgid "Khmer Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:98
+#: ../comps-f10.xml.in.h:96
 msgid "Korean Support"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:94
-#: ../comps-f10.xml.in.h:99
+#: ../comps-f10.xml.in.h:97
 msgid "Languages"
 msgstr "??????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:100
+#: ../comps-f10.xml.in.h:98
 msgid "Lao Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:101
+#: ../comps-f10.xml.in.h:99
 msgid "Latvian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:98
-#: ../comps-f10.xml.in.h:103
+#: ../comps-f10.xml.in.h:101
 msgid "Legacy Network Server"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:104
+#: ../comps-f10.xml.in.h:102
 msgid "Legacy Software Development"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:105
+#: ../comps-f10.xml.in.h:103
 msgid "Legacy Software Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:106
+#: ../comps-f10.xml.in.h:104
 msgid "Lithuanian Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:104
-#: ../comps-f10.xml.in.h:109 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
+#: ../comps-f10.xml.in.h:107 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:111
+#: ../comps-f10.xml.in.h:108
 msgid "Malay Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:112
+#: ../comps-f10.xml.in.h:109
 msgid "Malayalam Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:113
+#: ../comps-f10.xml.in.h:110
 msgid "Maori Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:114
+#: ../comps-f10.xml.in.h:111
 msgid "Marathi Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:110
-#: ../comps-f10.xml.in.h:116
+#: ../comps-f10.xml.in.h:113
 msgid "MySQL Database"
 msgstr "MySQL ?????????"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:112
-#: ../comps-f10.xml.in.h:119 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
+#: ../comps-f10.xml.in.h:115 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:120 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
+#: ../comps-f10.xml.in.h:116 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:115
-#: ../comps-f10.xml.in.h:122
+#: ../comps-f10.xml.in.h:118
 msgid "Northern Sotho Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:123
+#: ../comps-f10.xml.in.h:119
 msgid "Norwegian Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:124 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
+#: ../comps-f10.xml.in.h:120 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "????????????/???????????????"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:119
-#: ../comps-f10.xml.in.h:126
+#: ../comps-f10.xml.in.h:122
 msgid "Oriya Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:127 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
+#: ../comps-f10.xml.in.h:123 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
 msgstr "????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:128
+#: ../comps-f10.xml.in.h:124
 msgid "Persian Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:129
+#: ../comps-f10.xml.in.h:125
 msgid "Polish Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:130
+#: ../comps-f10.xml.in.h:126
 msgid "Portuguese Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:131
+#: ../comps-f10.xml.in.h:127
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ?????????"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:132
+#: ../comps-f10.xml.in.h:128
 msgid "Printing Support"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:133
+#: ../comps-f10.xml.in.h:129
 msgid "Punjabi Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:134
+#: ../comps-f10.xml.in.h:130
 msgid "Romanian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:135
+#: ../comps-f10.xml.in.h:131
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:136
+#: ../comps-f10.xml.in.h:132
 msgid "Russian Support"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:132
-#: ../comps-f10.xml.in.h:139
+#: ../comps-f10.xml.in.h:135
 msgid "Samoan Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:140
+#: ../comps-f10.xml.in.h:136
 msgid "Serbian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:141
+#: ../comps-f10.xml.in.h:137
 msgid "Server Configuration Tools"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:142 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
+#: ../comps-f10.xml.in.h:138 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:143 ../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."
+#: ../comps-f10.xml.in.h:139 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
+msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:145
+#: ../comps-f10.xml.in.h:140
 msgid "Sinhala Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:146
+#: ../comps-f10.xml.in.h:141
 msgid "Slovak Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:147
+#: ../comps-f10.xml.in.h:142
 msgid "Slovenian Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:148
+#: ../comps-f10.xml.in.h:143
 msgid "Smallest possible installation"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:149 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
+#: ../comps-f10.xml.in.h:144 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:150
+#: ../comps-f10.xml.in.h:145
 msgid "Somali Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:151
+#: ../comps-f10.xml.in.h:146
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -686,72 +683,72 @@
 "??? Vi???"
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
+#: ../comps-f10.xml.in.h:147 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:153
+#: ../comps-f10.xml.in.h:148
 msgid "Southern Ndebele Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:154
+#: ../comps-f10.xml.in.h:149
 msgid "Southern Sotho Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:155
+#: ../comps-f10.xml.in.h:150
 msgid "Spanish Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:157 ../comps-el4.xml.in.h:46
+#: ../comps-f10.xml.in.h:151 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "Java ????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:158 ../comps-el4.xml.in.h:47
+#: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "Java ????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:159
+#: ../comps-f10.xml.in.h:153
 msgid "Swati Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:160
+#: ../comps-f10.xml.in.h:154
 msgid "Swedish Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:161 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
+#: ../comps-f10.xml.in.h:155 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:162
+#: ../comps-f10.xml.in.h:156
 msgid "Tagalog Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:164
+#: ../comps-f10.xml.in.h:158
 msgid "Tamil Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:165
+#: ../comps-f10.xml.in.h:159
 msgid "Telugu Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:166 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
+#: ../comps-f10.xml.in.h:160 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:167
+#: ../comps-f10.xml.in.h:161
 msgid "Thai Support"
 msgstr "????????????"
 
@@ -760,65 +757,61 @@
 msgstr "Eclipse ?????????????????????"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:168 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
+#: ../comps-f10.xml.in.h:162 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "?????????????????????????????????????????????PDF ??????????????????"
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:169
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+#: ../comps-f10.xml.in.h:163
+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:160
-#: ../comps-f10.xml.in.h:170 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
+#: ../comps-f10.xml.in.h:164 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "?????????????????????????????? IMAP ??? SMTP ??????????????????"
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:171
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+#: ../comps-f10.xml.in.h:165
+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:162
-#: ../comps-f10.xml.in.h:172 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+#: ../comps-f10.xml.in.h:166 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:173
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+#: ../comps-f10.xml.in.h:167
+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:164
-#: ../comps-f10.xml.in.h:174
+#: ../comps-f10.xml.in.h:168
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
 msgstr "????????????????????????????????????????????????????????? rsh ??? telnet???"
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:175
+#: ../comps-f10.xml.in.h:169
 msgid "These packages provide a virtualization environment."
 msgstr "???????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:176
+#: ../comps-f10.xml.in.h:170
 msgid "These packages provide compatibility with previous releases."
 msgstr "??????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:177
+#: ../comps-f10.xml.in.h:171
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
 msgstr "??????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:178
+#: ../comps-f10.xml.in.h:172
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -827,59 +820,58 @@
 "Postscript ?????????????????????"
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
+#: ../comps-f10.xml.in.h:173 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
+#: ../comps-f10.xml.in.h:174 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "?????????????????????????????????????????? FTP ????????????"
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
+#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
-msgstr ""
-"???????????????????????????????????????????????? automake, gcc, perl, python ?????? debuggers???"
+msgstr "???????????????????????????????????????????????? automake, gcc, perl, python ?????? debuggers???"
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
+#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:183
+#: ../comps-f10.xml.in.h:177
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "???????????????????????? Red Hat ?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:184
+#: ../comps-f10.xml.in.h:178
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
 msgstr "??????????????????????????????????????????????????????????????? / ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
+#: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
+#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:187 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
+#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:188 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
+#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -888,27 +880,24 @@
 "????????????"
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:189 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
+#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
-msgstr ""
-"???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:190 ../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."
+#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:191 ../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."
+#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
+msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:192 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
+#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
 "client for connecting to SMB shares and tools to monitor network traffic."
@@ -917,145 +906,144 @@
 "????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:193
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+#: ../comps-f10.xml.in.h:187
+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:184
-#: ../comps-f10.xml.in.h:194
+#: ../comps-f10.xml.in.h:188
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
 msgstr "????????????????????????????????? Linux ??? MS Windows (tm) ????????????????????????"
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:195
+#: ../comps-f10.xml.in.h:189
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "?????????????????????????????????????????? MySQL ????????????"
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:196
+#: ../comps-f10.xml.in.h:190
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "?????????????????????????????????????????? Postgresql ????????????"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:197
+#: ../comps-f10.xml.in.h:191
 msgid "Tibetan Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:198
+#: ../comps-f10.xml.in.h:192
 msgid "Tonga Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:199 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
+#: ../comps-f10.xml.in.h:193 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Fedora ????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:200
+#: ../comps-f10.xml.in.h:194
 msgid "Tsonga Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:201
+#: ../comps-f10.xml.in.h:195
 msgid "Tswana Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:202
+#: ../comps-f10.xml.in.h:196
 msgid "Turkish Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:203
+#: ../comps-f10.xml.in.h:197
 msgid "Ukrainian Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:204
+#: ../comps-f10.xml.in.h:198
 msgid "Urdu Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
+#: ../comps-f10.xml.in.h:199 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:207 ../comps-el5.xml.in.h:72
+#: ../comps-f10.xml.in.h:200 ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:208
+#: ../comps-f10.xml.in.h:201
 msgid "Venda Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:209
+#: ../comps-f10.xml.in.h:202
 msgid "Vietnamese Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:210
+#: ../comps-f10.xml.in.h:203
 msgid "Virtualization"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:201
-#: ../comps-f10.xml.in.h:212 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
+#: ../comps-f10.xml.in.h:205 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:213 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
+#: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:214
+#: ../comps-f10.xml.in.h:207
 msgid "Welsh Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:215 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
+#: ../comps-f10.xml.in.h:208 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:216
+#: ../comps-f10.xml.in.h:209
 msgid "Windows File Server"
 msgstr "Windows ???????????????"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:217
+#: ../comps-f10.xml.in.h:210
 msgid "X Software Development"
 msgstr "X ????????????"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:218 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
+#: ../comps-f10.xml.in.h:211 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X ????????????"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:219
+#: ../comps-f10.xml.in.h:212
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:220
+#: ../comps-f10.xml.in.h:213
 msgid "XFCE Software Development"
 msgstr "XFCE ????????????"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:221
+#: ../comps-f10.xml.in.h:214
 msgid "Xhosa Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:222
+#: ../comps-f10.xml.in.h:215
 msgid "Zulu Support"
 msgstr "???????????????"
 
@@ -1079,23 +1067,23 @@
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "????????? Eclipse ????????????????????????"
 
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:102
+#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:100
 msgid "Legacy Fonts"
 msgstr "???????????????"
 
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:107
+#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:105
 msgid "Low Saxon Support"
 msgstr "??????????????????"
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:115
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:112
 msgid "Mongolian Support"
 msgstr "???????????????"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:118
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:114
 msgid "Nepali Support"
 msgstr "??????????????????"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:125
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:121
 msgid "Older bitmap and vector fonts packages"
 msgstr "????????? bitmap ?????????????????????"
 
@@ -1103,34 +1091,33 @@
 msgid "Esperanto Support"
 msgstr "???????????????"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:94
 msgid "Kashubian Support"
 msgstr "??????????????????"
 
-#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:108
+#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:106
 msgid "Macedonian Support"
 msgstr "??????????????????"
 
-#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:121
+#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:117
 msgid "Northern Sami Support"
 msgstr "??????????????????"
 
-#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:137
+#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:133
 msgid "SUGAR Desktop Environment"
 msgstr "SUGAR ????????????"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:138
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:134
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR ????????? OLPC XO ???????????????????????????"
 
-#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:211
+#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:204
 msgid "Walloon Support"
 msgstr "???????????????"
 
 #: ../comps-f10.xml.in.h:70
-#, fuzzy
-msgid "Haskell Development"
-msgstr "????????????"
+msgid "Haskell"
+msgstr "Haskell"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
@@ -1140,45 +1127,10 @@
 msgid "Input method packages for the input of international text."
 msgstr "??????????????????????????????????????????"
 
-#: ../comps-f10.xml.in.h:94
-#, fuzzy
-msgid "Kashmiri Support"
-msgstr "???????????????"
-
-#: ../comps-f10.xml.in.h:97
-#, fuzzy
-msgid "Konkani Support"
-msgstr "????????????"
-
-#: ../comps-f10.xml.in.h:110
-#, fuzzy
-msgid "Maithili Support"
-msgstr "??????????????????"
-
-#: ../comps-f10.xml.in.h:117
-#, fuzzy
-msgid "Myanmar (Burmese) Support"
-msgstr "???????????????"
-
-#: ../comps-f10.xml.in.h:144
-#, fuzzy
-msgid "Sindhi Support"
-msgstr "???????????????"
-
-#: ../comps-f10.xml.in.h:156
-#, fuzzy
-msgid "Support for developing programs in the Haskell programming language."
-msgstr "Java ????????????????????????????????????"
-
-#: ../comps-f10.xml.in.h:163
+#: ../comps-f10.xml.in.h:157
 msgid "Tajik Support"
 msgstr "??????????????????"
 
-#: ../comps-f10.xml.in.h:205
-#, fuzzy
-msgid "Uzbek Support"
-msgstr "???????????????"
-
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "???????????????????????????????????????"
@@ -1228,18 +1180,15 @@
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "???????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1247,9 +1196,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??????????????????????????????????????????????????????"
 
-#~ msgid "Haskell"
-#~ msgstr "Haskell"



From hedayat at fedoraproject.org  Thu Sep 18 06:29:15 2008
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Thu, 18 Sep 2008 06:29:15 +0000 (UTC)
Subject: rpms/rcssserver/devel import.log, NONE,
	1.1 rcssserver-12.1.1-libfix.patch, NONE,
	1.1 rcssserver-12.1.1-utf8fix.patch, NONE,
	1.1 rcssserver-12.1.3-libdirfix.patch, NONE,
	1.1 rcssserver.desktop, NONE, 1.1 rcssserver.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080918062915.22B9E700D9@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26882/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rcssserver-12.1.1-libfix.patch 
	rcssserver-12.1.1-utf8fix.patch 
	rcssserver-12.1.3-libdirfix.patch rcssserver.desktop 
	rcssserver.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
rcssserver-12_1_3-2_fc9:HEAD:rcssserver-12.1.3-2.fc9.src.rpm:1221719195

rcssserver-12.1.1-libfix.patch:

--- NEW FILE rcssserver-12.1.1-libfix.patch ---
diff -up rcssserver-12.1.1/src/Makefile.am.libfix rcssserver-12.1.1/src/Makefile.am
--- rcssserver-12.1.1/src/Makefile.am.libfix	2008-04-11 16:12:53.000000000 +0430
+++ rcssserver-12.1.1/src/Makefile.am	2008-07-12 00:27:45.000000000 +0430
@@ -104,7 +104,7 @@ rcssexceptions.h \
 rcssserverconfig.hpp \
 resultsaver.hpp
 
-librcssclangparser_la_LDFLAGS = -version-info 3:0:1
+librcssclangparser_la_LDFLAGS = -version-info 3:0:1 -lrcssconfparser
 #    Changed from 2.0.0 to 3.0.1 at 9.3.5 for addition of buildCondList
 #
 #    1. Start with version information of `0:0:0' for each libtool library.
@@ -149,6 +149,9 @@ clangutil.cpp \
 cond.cpp \
 compop.cpp \
 arithop.cpp \
+serverparam.cpp \
+utility.cpp \
+playerparam.cpp \
 rule.cpp
 
 
@@ -180,7 +183,6 @@ main.cpp \
 types.h \
 field.cpp \
 playerparam.h \
-playerparam.cpp \
 field.h \
 netif.cpp \
 netif.h \
@@ -244,7 +246,6 @@ serializercommonstdv8.cpp \
 serializermonitor.h \
 serializermonitor.cpp \
 serverparam.h \
-serverparam.cpp \
 referee.h \
 referee.cpp \
 xpmholder.cpp \
@@ -263,7 +264,6 @@ synctimer.h \
 synctimer.cpp \
 timeable.h \
 utility.h \
-utility.cpp \
 dispsender.h \
 dispsender.cpp \
 bodysender.h \

rcssserver-12.1.1-utf8fix.patch:

--- NEW FILE rcssserver-12.1.1-utf8fix.patch ---
diff -up rcssserver-12.1.1/NEWS.utf8fix rcssserver-12.1.1/NEWS
--- rcssserver-12.1.1/NEWS.utf8fix	2008-05-22 13:20:29.000000000 +0430
+++ rcssserver-12.1.1/NEWS	2008-07-11 01:58:33.000000000 +0430
@@ -1905,7 +1905,7 @@
   otherwise. Player_2_ball is a vector from the player to the ball, relative
   to the player's body direction.
 
-  If the tackle is successfull, the?ball is pushed in the direction of the
+  If the tackle is successfull, the ball is pushed in the direction of the
   players body.
 
   When players can see another players team, they can also see if that player

rcssserver-12.1.3-libdirfix.patch:

--- NEW FILE rcssserver-12.1.3-libdirfix.patch ---
diff -up rcssserver-12.1.3/src/rcsoccersim.in.libdirfix rcssserver-12.1.3/src/rcsoccersim.in
--- rcssserver-12.1.3/src/rcsoccersim.in.libdirfix	2008-07-07 18:05:34.000000000 +0430
+++ rcssserver-12.1.3/src/rcsoccersim.in	2008-09-14 00:13:40.000000000 +0430
@@ -26,7 +26,7 @@ which rcssmodtest 2> /dev/null
 if test $? -eq 1; then
     LIBLOAD=""
 else
-    rcssmodtest @prefix@/lib/@PACKAGE@/modules/libstdoutsaver 2> /dev/null
+    rcssmodtest @libdir@/@PACKAGE@/modules/libstdoutsaver 2> /dev/null
     if test $? -eq 1; then
         LIBLOAD=""
     fi


--- NEW FILE rcssserver.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=RoboCup 2D Soccer Simulation
Comment=Runs a 2D Soccer Simulation on local machine
Exec=rcsoccersim
Icon=rcssmonitor
Terminal=true
Type=Application
Categories=Education;Science;Robotics;



--- NEW FILE rcssserver.spec ---
Name:           rcssserver
Version:        12.1.3
Release:        2%{?dist}
Summary:        Robocup 2D Soccer Simulation Server

Group:          Applications/System
License:        GPLv2+
URL:            http://sourceforge.net/projects/sserver/
Source0:        http://downloads.sourceforge.net/sserver/%{name}-%{version}.tar.gz
# Source 1 is created by me.
Source1:        %{name}.desktop
Patch0:         %{name}-12.1.1-utf8fix.patch
Patch1:         %{name}-12.1.1-libfix.patch
Patch2:         %{name}-12.1.3-libdirfix.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  automake libtool boost-devel rcssbase-devel desktop-file-utils

%description
The RoboCup Soccer Simulator Server (rcssserver) is a research and educational
tool for mutli-agent systems and artificial intelligence. It allows 11
simulated autonomous robotic players to play soccer (football).

This package includes the simulation server. If you want to view the games 
you should install and run a monitor (rcssmonitor or rcssmonitor_classic).

%package        devel
Summary:        Header files and libraries for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       boost-devel rcssbase-devel

%description    devel
This package contains the header files and libraries
for %{name}. If you like to develop programs using %{name},
you will need to install %{name}-devel.

%package        gui
Summary:        A simple way to run 2D Soccer Simulation on a single machine
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       rcssmonitor

%description    gui
This package contains rcsoccersim script as simple way for
running 2D Soccer Simulation on a single machine. It'll also
provide a menu entry for this script.


%prep
%setup -q
%patch0 -p1 -b .utf8fix
%patch1 -p1 -b .libfix
%patch2 -p1 -b .libdirfix
sed -i.lib \
    -e 's|\$ac_boost_path/lib|\$libdir|' \
    -e 's|$ac_boost_path_tmp/lib|\$libdir|' \
    m4/ax_boost_base.m4
autoreconf -if
# Fix rpath
sed -i.rpath -e '/sys_lib_search_path_spec/s| /usr/lib| /lib64 /usr/lib64 /usr/lib|' \
    configure

%build
%configure
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
#%{?_smp_mflags} doesn't work
make 

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
rm -rf %{buildroot}/%{_libdir}/*.la
rm -rf %{buildroot}/%{_libdir}/%{name}/modules/*.la  

desktop-file-install --vendor="fedora"                 \
  --dir=%{buildroot}/%{_datadir}/applications %{SOURCE1}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING.LESSER NEWS README 
%{_bindir}/rcss*
%{_libdir}/*.so.*
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/modules
%{_libdir}/%{name}/modules/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so

%files gui
%defattr(-,root,root,-)
%{_bindir}/rcsoccersim
%{_datadir}/applications/*

%changelog
* Sat Sep 13 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.3-2
(Thanks to Mamoru Tasaka)
- Fixed License tag
- Fixed gui sub-package requires to include release number of the main package
- Added defattr to -gui files section
- Modules moved completely to the main package (from -devel)
- Fixed libdir problem in 64bit platforms in rcsoccersim.in 

* Thu Sep 11 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.3-1
- Updated to the latest version (12.1.3)

* Thu Sep 04 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.1-1
- Some fixes from rcssbase.spec
- Added gui subpackage

* Fri Jul 11 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.1-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2008 03:19:22 -0000	1.1
+++ .cvsignore	18 Sep 2008 06:28:44 -0000	1.2
@@ -0,0 +1 @@
+rcssserver-12.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 03:19:22 -0000	1.1
+++ sources	18 Sep 2008 06:28:44 -0000	1.2
@@ -0,0 +1 @@
+97a4da25e48a469b9958a22a1cd93437  rcssserver-12.1.3.tar.gz



From jsafrane at fedoraproject.org  Thu Sep 18 06:45:21 2008
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Thu, 18 Sep 2008 06:45:21 +0000 (UTC)
Subject: rpms/net-snmp/devel net-snmp.spec,1.158,1.159
Message-ID: <20080918064521.CD75D700D9@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28842

Modified Files:
	net-snmp.spec 
Log Message:
remove accidentally committed debug statements


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- net-snmp.spec	17 Sep 2008 14:45:20 -0000	1.158
+++ net-snmp.spec	18 Sep 2008 06:44:51 -0000	1.159
@@ -172,7 +172,6 @@
 %patch8 -p1 -b .libdir
 %patch9 -p1 -b .libpath
 %patch10 -p1 -b .shared-ip
-exit 1
 %patch11 -p1 -b .sensors
 %patch12 -p1 -b .xen-crash
 



From hedayat at fedoraproject.org  Thu Sep 18 06:48:43 2008
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Thu, 18 Sep 2008 06:48:43 +0000 (UTC)
Subject: rpms/rcssserver/F-8 rcssserver-12.1.1-libfix.patch, NONE,
	1.1 rcssserver-12.1.1-utf8fix.patch, NONE,
	1.1 rcssserver-12.1.3-libdirfix.patch, NONE,
	1.1 rcssserver.desktop, NONE, 1.1 rcssserver.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20080918064843.CE2EA700D9@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29336

Modified Files:
	sources 
Added Files:
	rcssserver-12.1.1-libfix.patch rcssserver-12.1.1-utf8fix.patch 
	rcssserver-12.1.3-libdirfix.patch rcssserver.desktop 
	rcssserver.spec 
Log Message:
added f-8 branch

rcssserver-12.1.1-libfix.patch:

--- NEW FILE rcssserver-12.1.1-libfix.patch ---
diff -up rcssserver-12.1.1/src/Makefile.am.libfix rcssserver-12.1.1/src/Makefile.am
--- rcssserver-12.1.1/src/Makefile.am.libfix	2008-04-11 16:12:53.000000000 +0430
+++ rcssserver-12.1.1/src/Makefile.am	2008-07-12 00:27:45.000000000 +0430
@@ -104,7 +104,7 @@ rcssexceptions.h \
 rcssserverconfig.hpp \
 resultsaver.hpp
 
-librcssclangparser_la_LDFLAGS = -version-info 3:0:1
+librcssclangparser_la_LDFLAGS = -version-info 3:0:1 -lrcssconfparser
 #    Changed from 2.0.0 to 3.0.1 at 9.3.5 for addition of buildCondList
 #
 #    1. Start with version information of `0:0:0' for each libtool library.
@@ -149,6 +149,9 @@ clangutil.cpp \
 cond.cpp \
 compop.cpp \
 arithop.cpp \
+serverparam.cpp \
+utility.cpp \
+playerparam.cpp \
 rule.cpp
 
 
@@ -180,7 +183,6 @@ main.cpp \
 types.h \
 field.cpp \
 playerparam.h \
-playerparam.cpp \
 field.h \
 netif.cpp \
 netif.h \
@@ -244,7 +246,6 @@ serializercommonstdv8.cpp \
 serializermonitor.h \
 serializermonitor.cpp \
 serverparam.h \
-serverparam.cpp \
 referee.h \
 referee.cpp \
 xpmholder.cpp \
@@ -263,7 +264,6 @@ synctimer.h \
 synctimer.cpp \
 timeable.h \
 utility.h \
-utility.cpp \
 dispsender.h \
 dispsender.cpp \
 bodysender.h \

rcssserver-12.1.1-utf8fix.patch:

--- NEW FILE rcssserver-12.1.1-utf8fix.patch ---
diff -up rcssserver-12.1.1/NEWS.utf8fix rcssserver-12.1.1/NEWS
--- rcssserver-12.1.1/NEWS.utf8fix	2008-05-22 13:20:29.000000000 +0430
+++ rcssserver-12.1.1/NEWS	2008-07-11 01:58:33.000000000 +0430
@@ -1905,7 +1905,7 @@
   otherwise. Player_2_ball is a vector from the player to the ball, relative
   to the player's body direction.
 
-  If the tackle is successfull, the?ball is pushed in the direction of the
+  If the tackle is successfull, the ball is pushed in the direction of the
   players body.
 
   When players can see another players team, they can also see if that player

rcssserver-12.1.3-libdirfix.patch:

--- NEW FILE rcssserver-12.1.3-libdirfix.patch ---
diff -up rcssserver-12.1.3/src/rcsoccersim.in.libdirfix rcssserver-12.1.3/src/rcsoccersim.in
--- rcssserver-12.1.3/src/rcsoccersim.in.libdirfix	2008-07-07 18:05:34.000000000 +0430
+++ rcssserver-12.1.3/src/rcsoccersim.in	2008-09-14 00:13:40.000000000 +0430
@@ -26,7 +26,7 @@ which rcssmodtest 2> /dev/null
 if test $? -eq 1; then
     LIBLOAD=""
 else
-    rcssmodtest @prefix@/lib/@PACKAGE@/modules/libstdoutsaver 2> /dev/null
+    rcssmodtest @libdir@/@PACKAGE@/modules/libstdoutsaver 2> /dev/null
     if test $? -eq 1; then
         LIBLOAD=""
     fi


--- NEW FILE rcssserver.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=RoboCup 2D Soccer Simulation
Comment=Runs a 2D Soccer Simulation on local machine
Exec=rcsoccersim
Icon=rcssmonitor
Terminal=true
Type=Application
Categories=Education;Science;Robotics;



--- NEW FILE rcssserver.spec ---
Name:           rcssserver
Version:        12.1.3
Release:        2%{?dist}
Summary:        Robocup 2D Soccer Simulation Server

Group:          Applications/System
License:        GPLv2+
URL:            http://sourceforge.net/projects/sserver/
Source0:        http://downloads.sourceforge.net/sserver/%{name}-%{version}.tar.gz
# Source 1 is created by me.
Source1:        %{name}.desktop
Patch0:         %{name}-12.1.1-utf8fix.patch
Patch1:         %{name}-12.1.1-libfix.patch
Patch2:         %{name}-12.1.3-libdirfix.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  automake libtool boost-devel rcssbase-devel desktop-file-utils

%description
The RoboCup Soccer Simulator Server (rcssserver) is a research and educational
tool for mutli-agent systems and artificial intelligence. It allows 11
simulated autonomous robotic players to play soccer (football).

This package includes the simulation server. If you want to view the games 
you should install and run a monitor (rcssmonitor or rcssmonitor_classic).

%package        devel
Summary:        Header files and libraries for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       boost-devel rcssbase-devel

%description    devel
This package contains the header files and libraries
for %{name}. If you like to develop programs using %{name},
you will need to install %{name}-devel.

%package        gui
Summary:        A simple way to run 2D Soccer Simulation on a single machine
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       rcssmonitor

%description    gui
This package contains rcsoccersim script as simple way for
running 2D Soccer Simulation on a single machine. It'll also
provide a menu entry for this script.


%prep
%setup -q
%patch0 -p1 -b .utf8fix
%patch1 -p1 -b .libfix
%patch2 -p1 -b .libdirfix
sed -i.lib \
    -e 's|\$ac_boost_path/lib|\$libdir|' \
    -e 's|$ac_boost_path_tmp/lib|\$libdir|' \
    m4/ax_boost_base.m4
autoreconf -if
# Fix rpath
sed -i.rpath -e '/sys_lib_search_path_spec/s| /usr/lib| /lib64 /usr/lib64 /usr/lib|' \
    configure

%build
%configure
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
#%{?_smp_mflags} doesn't work
make 

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
rm -rf %{buildroot}/%{_libdir}/*.la
rm -rf %{buildroot}/%{_libdir}/%{name}/modules/*.la  

desktop-file-install --vendor="fedora"                 \
  --dir=%{buildroot}/%{_datadir}/applications %{SOURCE1}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING.LESSER NEWS README 
%{_bindir}/rcss*
%{_libdir}/*.so.*
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/modules
%{_libdir}/%{name}/modules/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so

%files gui
%defattr(-,root,root,-)
%{_bindir}/rcsoccersim
%{_datadir}/applications/*

%changelog
* Sat Sep 13 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.3-2
(Thanks to Mamoru Tasaka)
- Fixed License tag
- Fixed gui sub-package requires to include release number of the main package
- Added defattr to -gui files section
- Modules moved completely to the main package (from -devel)
- Fixed libdir problem in 64bit platforms in rcsoccersim.in 

* Thu Sep 11 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.3-1
- Updated to the latest version (12.1.3)

* Thu Sep 04 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.1-1
- Some fixes from rcssbase.spec
- Added gui subpackage

* Fri Jul 11 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.1-1
- Initial version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 03:19:22 -0000	1.1
+++ sources	18 Sep 2008 06:48:13 -0000	1.2
@@ -0,0 +1 @@
+97a4da25e48a469b9958a22a1cd93437  rcssserver-12.1.3.tar.gz



From hedayat at fedoraproject.org  Thu Sep 18 06:50:21 2008
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Thu, 18 Sep 2008 06:50:21 +0000 (UTC)
Subject: rpms/rcssserver/F-9 rcssserver-12.1.1-libfix.patch, NONE,
	1.1 rcssserver-12.1.1-utf8fix.patch, NONE,
	1.1 rcssserver-12.1.3-libdirfix.patch, NONE,
	1.1 rcssserver.desktop, NONE, 1.1 rcssserver.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20080918065021.C0AD1700D9@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29518

Modified Files:
	sources 
Added Files:
	rcssserver-12.1.1-libfix.patch rcssserver-12.1.1-utf8fix.patch 
	rcssserver-12.1.3-libdirfix.patch rcssserver.desktop 
	rcssserver.spec 
Log Message:
initial import for f9

rcssserver-12.1.1-libfix.patch:

--- NEW FILE rcssserver-12.1.1-libfix.patch ---
diff -up rcssserver-12.1.1/src/Makefile.am.libfix rcssserver-12.1.1/src/Makefile.am
--- rcssserver-12.1.1/src/Makefile.am.libfix	2008-04-11 16:12:53.000000000 +0430
+++ rcssserver-12.1.1/src/Makefile.am	2008-07-12 00:27:45.000000000 +0430
@@ -104,7 +104,7 @@ rcssexceptions.h \
 rcssserverconfig.hpp \
 resultsaver.hpp
 
-librcssclangparser_la_LDFLAGS = -version-info 3:0:1
+librcssclangparser_la_LDFLAGS = -version-info 3:0:1 -lrcssconfparser
 #    Changed from 2.0.0 to 3.0.1 at 9.3.5 for addition of buildCondList
 #
 #    1. Start with version information of `0:0:0' for each libtool library.
@@ -149,6 +149,9 @@ clangutil.cpp \
 cond.cpp \
 compop.cpp \
 arithop.cpp \
+serverparam.cpp \
+utility.cpp \
+playerparam.cpp \
 rule.cpp
 
 
@@ -180,7 +183,6 @@ main.cpp \
 types.h \
 field.cpp \
 playerparam.h \
-playerparam.cpp \
 field.h \
 netif.cpp \
 netif.h \
@@ -244,7 +246,6 @@ serializercommonstdv8.cpp \
 serializermonitor.h \
 serializermonitor.cpp \
 serverparam.h \
-serverparam.cpp \
 referee.h \
 referee.cpp \
 xpmholder.cpp \
@@ -263,7 +264,6 @@ synctimer.h \
 synctimer.cpp \
 timeable.h \
 utility.h \
-utility.cpp \
 dispsender.h \
 dispsender.cpp \
 bodysender.h \

rcssserver-12.1.1-utf8fix.patch:

--- NEW FILE rcssserver-12.1.1-utf8fix.patch ---
diff -up rcssserver-12.1.1/NEWS.utf8fix rcssserver-12.1.1/NEWS
--- rcssserver-12.1.1/NEWS.utf8fix	2008-05-22 13:20:29.000000000 +0430
+++ rcssserver-12.1.1/NEWS	2008-07-11 01:58:33.000000000 +0430
@@ -1905,7 +1905,7 @@
   otherwise. Player_2_ball is a vector from the player to the ball, relative
   to the player's body direction.
 
-  If the tackle is successfull, the?ball is pushed in the direction of the
+  If the tackle is successfull, the ball is pushed in the direction of the
   players body.
 
   When players can see another players team, they can also see if that player

rcssserver-12.1.3-libdirfix.patch:

--- NEW FILE rcssserver-12.1.3-libdirfix.patch ---
diff -up rcssserver-12.1.3/src/rcsoccersim.in.libdirfix rcssserver-12.1.3/src/rcsoccersim.in
--- rcssserver-12.1.3/src/rcsoccersim.in.libdirfix	2008-07-07 18:05:34.000000000 +0430
+++ rcssserver-12.1.3/src/rcsoccersim.in	2008-09-14 00:13:40.000000000 +0430
@@ -26,7 +26,7 @@ which rcssmodtest 2> /dev/null
 if test $? -eq 1; then
     LIBLOAD=""
 else
-    rcssmodtest @prefix@/lib/@PACKAGE@/modules/libstdoutsaver 2> /dev/null
+    rcssmodtest @libdir@/@PACKAGE@/modules/libstdoutsaver 2> /dev/null
     if test $? -eq 1; then
         LIBLOAD=""
     fi


--- NEW FILE rcssserver.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=RoboCup 2D Soccer Simulation
Comment=Runs a 2D Soccer Simulation on local machine
Exec=rcsoccersim
Icon=rcssmonitor
Terminal=true
Type=Application
Categories=Education;Science;Robotics;



--- NEW FILE rcssserver.spec ---
Name:           rcssserver
Version:        12.1.3
Release:        2%{?dist}
Summary:        Robocup 2D Soccer Simulation Server

Group:          Applications/System
License:        GPLv2+
URL:            http://sourceforge.net/projects/sserver/
Source0:        http://downloads.sourceforge.net/sserver/%{name}-%{version}.tar.gz
# Source 1 is created by me.
Source1:        %{name}.desktop
Patch0:         %{name}-12.1.1-utf8fix.patch
Patch1:         %{name}-12.1.1-libfix.patch
Patch2:         %{name}-12.1.3-libdirfix.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  automake libtool boost-devel rcssbase-devel desktop-file-utils

%description
The RoboCup Soccer Simulator Server (rcssserver) is a research and educational
tool for mutli-agent systems and artificial intelligence. It allows 11
simulated autonomous robotic players to play soccer (football).

This package includes the simulation server. If you want to view the games 
you should install and run a monitor (rcssmonitor or rcssmonitor_classic).

%package        devel
Summary:        Header files and libraries for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       boost-devel rcssbase-devel

%description    devel
This package contains the header files and libraries
for %{name}. If you like to develop programs using %{name},
you will need to install %{name}-devel.

%package        gui
Summary:        A simple way to run 2D Soccer Simulation on a single machine
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       rcssmonitor

%description    gui
This package contains rcsoccersim script as simple way for
running 2D Soccer Simulation on a single machine. It'll also
provide a menu entry for this script.


%prep
%setup -q
%patch0 -p1 -b .utf8fix
%patch1 -p1 -b .libfix
%patch2 -p1 -b .libdirfix
sed -i.lib \
    -e 's|\$ac_boost_path/lib|\$libdir|' \
    -e 's|$ac_boost_path_tmp/lib|\$libdir|' \
    m4/ax_boost_base.m4
autoreconf -if
# Fix rpath
sed -i.rpath -e '/sys_lib_search_path_spec/s| /usr/lib| /lib64 /usr/lib64 /usr/lib|' \
    configure

%build
%configure
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
#%{?_smp_mflags} doesn't work
make 

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
rm -rf %{buildroot}/%{_libdir}/*.la
rm -rf %{buildroot}/%{_libdir}/%{name}/modules/*.la  

desktop-file-install --vendor="fedora"                 \
  --dir=%{buildroot}/%{_datadir}/applications %{SOURCE1}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING.LESSER NEWS README 
%{_bindir}/rcss*
%{_libdir}/*.so.*
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/modules
%{_libdir}/%{name}/modules/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so

%files gui
%defattr(-,root,root,-)
%{_bindir}/rcsoccersim
%{_datadir}/applications/*

%changelog
* Sat Sep 13 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.3-2
(Thanks to Mamoru Tasaka)
- Fixed License tag
- Fixed gui sub-package requires to include release number of the main package
- Added defattr to -gui files section
- Modules moved completely to the main package (from -devel)
- Fixed libdir problem in 64bit platforms in rcsoccersim.in 

* Thu Sep 11 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.3-1
- Updated to the latest version (12.1.3)

* Thu Sep 04 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.1-1
- Some fixes from rcssbase.spec
- Added gui subpackage

* Fri Jul 11 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.1-1
- Initial version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 03:19:22 -0000	1.1
+++ sources	18 Sep 2008 06:49:51 -0000	1.2
@@ -0,0 +1 @@
+97a4da25e48a469b9958a22a1cd93437  rcssserver-12.1.3.tar.gz



From lmacken at fedoraproject.org  Thu Sep 18 07:11:30 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 18 Sep 2008 07:11:30 +0000 (UTC)
Subject: rpms/TurboGears/devel TurboGears.spec,1.39,1.40
Message-ID: <20080918071130.46F50700D9@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31796

Modified Files:
	TurboGears.spec 
Log Message:
Add a patch to allow newer versions of TurboJson



Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- TurboGears.spec	18 Sep 2008 00:32:33 -0000	1.39
+++ TurboGears.spec	18 Sep 2008 07:10:59 -0000	1.40
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -11,6 +11,7 @@
 URL:            http://www.turbogears.org
 Source0:        http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz
 Patch0:         %{name}-%{version}-cherrypyreq.patch
+Patch1:         %{name}-%{version}-setup.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -67,6 +68,7 @@
 %prep
 %setup -q
 %patch0 -b .cherrypyreq
+%patch1 -b .setup
 
 
 %build
@@ -90,6 +92,9 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Wed Sep 17 2008 Luke Macken <lmacken at redhat.com> 1.0.7-2
+- Add a patch to allow newer versions of TurboJson
+
 * Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> 1.0.7-1
 - Update to the latest upstream release
 - Utilize the test suite



From lmacken at fedoraproject.org  Thu Sep 18 07:12:01 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 18 Sep 2008 07:12:01 +0000 (UTC)
Subject: rpms/TurboGears/devel TurboGears-1.0.7-setup.patch,NONE,1.1
Message-ID: <20080918071201.0AD75700D9@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32002

Added Files:
	TurboGears-1.0.7-setup.patch 
Log Message:
Add the TurboGears-1.0.7-setup.patch

TurboGears-1.0.7-setup.patch:

--- NEW FILE TurboGears-1.0.7-setup.patch ---
--- setup.py.setup	2008-09-15 16:30:30.000000000 -0400
+++ setup.py	2008-09-18 03:01:12.000000000 -0400
@@ -14,7 +14,6 @@
 # setup params
 install_requires = [
     "CherryPy >= 2.3.0, < 3.0.0alpha",
-    "ConfigObj >= 4.3.2",
     "DecoratorTools >= 1.4",
     "FormEncode >= 0.7.1",
     "PasteScript >= 1.6.2",
@@ -23,7 +22,7 @@
     "simplejson >= 1.3",
     "TurboCheetah >= 1.0",
     # TurboJson >= 1.2 uses PEAK-Rules
-    "TurboJson >= 1.1.4, < 1.2",
+    "TurboJson >= 1.1.4",
     "TurboKid >= 1.0.4",
 ]
 



From timlau at fedoraproject.org  Thu Sep 18 07:17:08 2008
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Thu, 18 Sep 2008 07:17:08 +0000 (UTC)
Subject: rpms/yum-utils/devel .cvsignore, 1.23, 1.24 sources, 1.25,
	1.26 yum-utils.spec, 1.46, 1.47
Message-ID: <20080918071708.4E340700D9@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yum-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32681

Modified Files:
	.cvsignore sources yum-utils.spec 
Log Message:
Release 1.1.17-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	27 Aug 2008 18:53:45 -0000	1.23
+++ .cvsignore	18 Sep 2008 07:16:37 -0000	1.24
@@ -1 +1 @@
-yum-utils-1.1.16.tar.gz
+yum-utils-1.1.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	27 Aug 2008 18:53:45 -0000	1.25
+++ sources	18 Sep 2008 07:16:37 -0000	1.26
@@ -1 +1 @@
-1c1d9df0914f7f945ab2a561d16e62de  yum-utils-1.1.16.tar.gz
+c9bb92a87a01e39d2d928ac3ae12e10a  yum-utils-1.1.17.tar.gz


Index: yum-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- yum-utils.spec	10 Sep 2008 12:52:05 -0000	1.46
+++ yum-utils.spec	18 Sep 2008 07:16:37 -0000	1.47
@@ -1,11 +1,10 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
-Version: 1.1.16
-Release: 2%{?dist}
+Version: 1.1.17
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz
-Patch0: repoquery-unbreak.patch 
 URL: http://linux.duke.edu/yum/download/yum-utils/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -262,6 +261,16 @@
 This plugin adds the commands keys, keys-info, keys-data and keys-remove. They
 allow you to query and remove signing keys.
 
+%package -n yum-remove-with-leaves
+Summary: Yum plugin to remove dependencies which are no longer used because of a removal
+Group: System Environment/Base
+Requires: yum >= 3.2.19
+
+%description -n yum-remove-with-leaves
+This plugin removes any unused dependencies that were brought in by an install
+but would not normally be removed. It helps to keep a system clean of unused
+libraries and packages.
+
 %package -n yum-NetworkManager-dispatcher
 Summary: Yum plugin to deal with changing networks with NetworkManager
 Group: System Environment/Base
@@ -275,7 +284,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -307,6 +315,7 @@
  tmprepo \
  verify \
  keys \
+ remove-with-leaves \
 "
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
@@ -500,9 +509,18 @@
 %defattr(-, root, root)
 /etc/NetworkManager/dispatcher.d/*
 
+%files -n yum-remove-with-leaves
+%defattr(-, root, root)
+/usr/lib/yum-plugins/remove-with-leaves.*
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/remove-with-leaves.conf
+
 %changelog
-* Wed Sep 10 2008 Tim Lauridsen <timlau at fedoraproject.org>
-- Added patch to unbreak repoquery
+* Wed Sep 17 2008 Tim Lauridsen <timlau at fedoraproject.org>
+- mark as 1.1.17
+
+* Mon Sep  8 2008 Seth Vidal <skvidal at fedoraproject.org>
+- add yum-remove-with-leaves plugin
+
 * Wed Aug 27 2008 Tim Lauridsen <timlau at fedoraproject.org>
 - mark as 1.1.16
 * Wed Aug 20 2008 James Antill <james at fedoraproject.org>



From lmacken at fedoraproject.org  Thu Sep 18 07:21:26 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 18 Sep 2008 07:21:26 +0000 (UTC)
Subject: rpms/TurboGears/F-8 TurboGears-1.0.7-setup.patch, NONE,
	1.1 TurboGears.spec, 1.32, 1.33
Message-ID: <20080918072126.6EFCB700D9@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv822

Modified Files:
	TurboGears.spec 
Added Files:
	TurboGears-1.0.7-setup.patch 
Log Message:
Remove the ConfigObj egg requirement since it doesn't exist in F-8

TurboGears-1.0.7-setup.patch:

--- NEW FILE TurboGears-1.0.7-setup.patch ---
--- setup.py.orig	2008-09-18 03:14:26.000000000 -0400
+++ setup.py	2008-09-18 03:14:30.000000000 -0400
@@ -14,7 +14,6 @@
 # setup params
 install_requires = [
     "CherryPy >= 2.3.0, < 3.0.0alpha",
-    "ConfigObj >= 4.3.2",
     "DecoratorTools >= 1.4",
     "FormEncode >= 0.7.1",
     "PasteScript >= 1.6.2",


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-8/TurboGears.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- TurboGears.spec	18 Sep 2008 03:41:32 -0000	1.32
+++ TurboGears.spec	18 Sep 2008 07:20:56 -0000	1.33
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -11,6 +11,7 @@
 URL:            http://www.turbogears.org
 Source0:        http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz
 Patch0:         %{name}-%{version}-cherrypyreq.patch
+Patch1:         %{name}-%{version}-setup.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -67,6 +68,7 @@
 %prep
 %setup -q
 %patch0 -b .cherrypyreq
+%patch1 -b .setup
 
 
 %build
@@ -90,6 +92,9 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Wed Sep 17 2008 Luke Macken <lmacken at redhat.com> 1.0.7-2
+- Remove the ConfigObj egg requirement since it doesn't exist in F-8
+
 * Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> 1.0.7-1
 - Update to the latest upstream release
 - Utilize the test suite



From timlau at fedoraproject.org  Thu Sep 18 07:23:01 2008
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Thu, 18 Sep 2008 07:23:01 +0000 (UTC)
Subject: rpms/yum-utils/devel fastestmirror.patch, 1.3,
	NONE repoquery-unbreak.patch, 1.1, NONE
Message-ID: <20080918072301.49743700D9@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yum-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1142

Removed Files:
	fastestmirror.patch repoquery-unbreak.patch 
Log Message:
removed unused patches


--- fastestmirror.patch DELETED ---


--- repoquery-unbreak.patch DELETED ---



From timlau at fedoraproject.org  Thu Sep 18 07:24:51 2008
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Thu, 18 Sep 2008 07:24:51 +0000 (UTC)
Subject: rpms/yum-utils/F-9 sources, 1.25, 1.26 yum-utils.spec, 1.44,
	1.45 fastestmirror.patch, 1.1, NONE repoquery-unbreak.patch, 1.1,
	NONE yum-downloader-archlist.patch, 1.4, NONE
Message-ID: <20080918072451.10FD5700D9@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yum-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1323

Modified Files:
	sources yum-utils.spec 
Removed Files:
	fastestmirror.patch repoquery-unbreak.patch 
	yum-downloader-archlist.patch 
Log Message:
Release 1.1.17-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/F-9/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	28 Aug 2008 04:44:42 -0000	1.25
+++ sources	18 Sep 2008 07:24:20 -0000	1.26
@@ -1 +1 @@
-1c1d9df0914f7f945ab2a561d16e62de  yum-utils-1.1.16.tar.gz
+c9bb92a87a01e39d2d928ac3ae12e10a  yum-utils-1.1.17.tar.gz


Index: yum-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/F-9/yum-utils.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- yum-utils.spec	10 Sep 2008 13:00:07 -0000	1.44
+++ yum-utils.spec	18 Sep 2008 07:24:20 -0000	1.45
@@ -1,11 +1,10 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
-Version: 1.1.16
-Release: 2%{?dist}
+Version: 1.1.17
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz
-Patch0: repoquery-unbreak.patch 
 URL: http://linux.duke.edu/yum/download/yum-utils/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -262,6 +261,16 @@
 This plugin adds the commands keys, keys-info, keys-data and keys-remove. They
 allow you to query and remove signing keys.
 
+%package -n yum-remove-with-leaves
+Summary: Yum plugin to remove dependencies which are no longer used because of a removal
+Group: System Environment/Base
+Requires: yum >= 3.2.19
+
+%description -n yum-remove-with-leaves
+This plugin removes any unused dependencies that were brought in by an install
+but would not normally be removed. It helps to keep a system clean of unused
+libraries and packages.
+
 %package -n yum-NetworkManager-dispatcher
 Summary: Yum plugin to deal with changing networks with NetworkManager
 Group: System Environment/Base
@@ -275,7 +284,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -307,6 +315,7 @@
  tmprepo \
  verify \
  keys \
+ remove-with-leaves \
 "
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
@@ -500,9 +509,18 @@
 %defattr(-, root, root)
 /etc/NetworkManager/dispatcher.d/*
 
+%files -n yum-remove-with-leaves
+%defattr(-, root, root)
+/usr/lib/yum-plugins/remove-with-leaves.*
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/remove-with-leaves.conf
+
 %changelog
-* Wed Sep 10 2008 Tim Lauridsen <timlau at fedoraproject.org>
-- Added patch to unbreak repoquery
+* Wed Sep 17 2008 Tim Lauridsen <timlau at fedoraproject.org>
+- mark as 1.1.17
+
+* Mon Sep  8 2008 Seth Vidal <skvidal at fedoraproject.org>
+- add yum-remove-with-leaves plugin
+
 * Wed Aug 27 2008 Tim Lauridsen <timlau at fedoraproject.org>
 - mark as 1.1.16
 * Wed Aug 20 2008 James Antill <james at fedoraproject.org>


--- fastestmirror.patch DELETED ---


--- repoquery-unbreak.patch DELETED ---


--- yum-downloader-archlist.patch DELETED ---



From timlau at fedoraproject.org  Thu Sep 18 07:32:43 2008
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Thu, 18 Sep 2008 07:32:43 +0000 (UTC)
Subject: rpms/yum-utils/F-8 sources, 1.24, 1.25 yum-utils.spec, 1.37,
	1.38 fastestmirror.patch, 1.1, NONE repoquery-unbreak.patch, 1.1, NONE
Message-ID: <20080918073243.9570D700D9@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yum-utils/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2381

Modified Files:
	sources yum-utils.spec 
Removed Files:
	fastestmirror.patch repoquery-unbreak.patch 
Log Message:
Release 1.1.17-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/F-8/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	28 Aug 2008 04:55:12 -0000	1.24
+++ sources	18 Sep 2008 07:32:13 -0000	1.25
@@ -1 +1 @@
-1c1d9df0914f7f945ab2a561d16e62de  yum-utils-1.1.16.tar.gz
+c9bb92a87a01e39d2d928ac3ae12e10a  yum-utils-1.1.17.tar.gz


Index: yum-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/F-8/yum-utils.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- yum-utils.spec	10 Sep 2008 13:31:59 -0000	1.37
+++ yum-utils.spec	18 Sep 2008 07:32:13 -0000	1.38
@@ -1,11 +1,10 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
-Version: 1.1.16
-Release: 2%{?dist}
+Version: 1.1.17
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz
-Patch0: repoquery-unbreak.patch 
 URL: http://linux.duke.edu/yum/download/yum-utils/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -262,6 +261,16 @@
 This plugin adds the commands keys, keys-info, keys-data and keys-remove. They
 allow you to query and remove signing keys.
 
+%package -n yum-remove-with-leaves
+Summary: Yum plugin to remove dependencies which are no longer used because of a removal
+Group: System Environment/Base
+Requires: yum >= 3.2.19
+
+%description -n yum-remove-with-leaves
+This plugin removes any unused dependencies that were brought in by an install
+but would not normally be removed. It helps to keep a system clean of unused
+libraries and packages.
+
 %package -n yum-NetworkManager-dispatcher
 Summary: Yum plugin to deal with changing networks with NetworkManager
 Group: System Environment/Base
@@ -275,7 +284,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -307,6 +315,7 @@
  tmprepo \
  verify \
  keys \
+ remove-with-leaves \
 "
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
@@ -500,9 +509,18 @@
 %defattr(-, root, root)
 /etc/NetworkManager/dispatcher.d/*
 
+%files -n yum-remove-with-leaves
+%defattr(-, root, root)
+/usr/lib/yum-plugins/remove-with-leaves.*
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/remove-with-leaves.conf
+
 %changelog
-* Wed Sep 10 2008 Tim Lauridsen <timlau at fedoraproject.org>
-- Added patch to unbreak repoquery
+* Wed Sep 17 2008 Tim Lauridsen <timlau at fedoraproject.org>
+- mark as 1.1.17
+
+* Mon Sep  8 2008 Seth Vidal <skvidal at fedoraproject.org>
+- add yum-remove-with-leaves plugin
+
 * Wed Aug 27 2008 Tim Lauridsen <timlau at fedoraproject.org>
 - mark as 1.1.16
 * Wed Aug 20 2008 James Antill <james at fedoraproject.org>


--- fastestmirror.patch DELETED ---


--- repoquery-unbreak.patch DELETED ---



From perex at fedoraproject.org  Thu Sep 18 07:54:51 2008
From: perex at fedoraproject.org (Jaroslav Kysela)
Date: Thu, 18 Sep 2008 07:54:51 +0000 (UTC)
Subject: rpms/alsa-utils/devel alsactl-add-ignore-option.patch, NONE,
	1.1 alsa-utils.spec, 1.72, 1.73 alsa.rules, 1.5, 1.6
Message-ID: <20080918075451.9127B700D9@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4912

Modified Files:
	alsa-utils.spec alsa.rules 
Added Files:
	alsactl-add-ignore-option.patch 
Log Message:
alsa-utils: bugfixes for 1.0.18rc3 (see changelog)

alsactl-add-ignore-option.patch:

--- NEW FILE alsactl-add-ignore-option.patch ---
>From f63ff476f3538f519ac8ff0acd4acdab29889ad5 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Thu, 18 Sep 2008 09:40:02 +0200
Subject: [PATCH] alsactl: Add -g,--ignore option to ignore 'No soundcards found' error

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 alsactl/alsactl.1 |    5 +++++
 alsactl/alsactl.c |   10 ++++++++--
 alsactl/alsactl.h |    1 +
 alsactl/state.c   |   16 ++++++++++++----
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/alsactl/alsactl.1 b/alsactl/alsactl.1
index d7f30f6..b038a82 100644
--- a/alsactl/alsactl.1
+++ b/alsactl/alsactl.1
@@ -51,6 +51,11 @@ Used with restore command.  Try to restore the matching control elements
 as much as possible.  This option is set as default now.
 
 .TP
+\fI\-g, \-\-ignore\fP
+Used with store and restore commands. Do not show 'No soundcards found'
+and do not set an error exit code when soundcards are not installed.
+
+.TP
 \fI\-P, \-\-pedantic\fP
 Used with restore command.  Don't restore mismatching control elements.
 This option was the old default behavior.
diff --git a/alsactl/alsactl.c b/alsactl/alsactl.c
index 57957bf..f846316 100644
--- a/alsactl/alsactl.c
+++ b/alsactl/alsactl.c
@@ -34,6 +34,7 @@
 
 int debugflag = 0;
 int force_restore = 1;
+int ignore_nocards = 0;
 char *command;
 char *statefile = NULL;
 
@@ -48,7 +49,8 @@ static void help(void)
 	printf("  -f,--file #      configuration file (default " SYS_ASOUNDRC ")\n");
 	printf("  -F,--force       try to restore the matching controls as much as possible\n");
 	printf("                   (default mode)\n");
-	printf("  -P,--pedantic    don't restore mismatching controls (old default)\n");
+	printf("  -g,--ignore      ignore 'No soundcards found' error\n");
+	printf("  -P,--pedantic    do not restore mismatching controls (old default)\n");
 	printf("  -r,--runstate #  save restore and init state to this file (only errors)\n");
 	printf("                   default settings is 'no file set'\n");
 	printf("  -R,--remove      remove runstate file at first, otherwise append errors\n");
@@ -75,6 +77,7 @@ int main(int argc, char *argv[])
 		{"env", 1, NULL, 'E'},
 		{"initfile", 1, NULL, 'i'},
 		{"force", 0, NULL, 'F'},
+		{"ignore", 0, NULL, 'g'},
 		{"pedantic", 0, NULL, 'P'},
 		{"runstate", 0, NULL, 'r'},
 		{"remove", 0, NULL, 'R'},
@@ -99,7 +102,7 @@ int main(int argc, char *argv[])
 	while (1) {
 		int c;
 
-		if ((c = getopt_long(argc, argv, "hdvf:FE:i:Pr:R", long_option, NULL)) < 0)
+		if ((c = getopt_long(argc, argv, "hdvf:FgE:i:Pr:R", long_option, NULL)) < 0)
 			break;
 		switch (c) {
 		case 'h':
@@ -111,6 +114,9 @@ int main(int argc, char *argv[])
 		case 'F':
 			force_restore = 1;
 			break;
+		case 'g':
+			ignore_nocards = 1;
+			break;
 		case 'E':
 			if (putenv(optarg)) {
 				fprintf(stderr, "environment string '%s' is wrong\n", optarg);
diff --git a/alsactl/alsactl.h b/alsactl/alsactl.h
index 408b145..44d27f1 100644
--- a/alsactl/alsactl.h
+++ b/alsactl/alsactl.h
@@ -1,5 +1,6 @@
 extern int debugflag;
 extern int force_restore;
+extern int ignore_nocards;
 extern char *command;
 extern char *statefile;
 
diff --git a/alsactl/state.c b/alsactl/state.c
index 554020b..576721a 100644
--- a/alsactl/state.c
+++ b/alsactl/state.c
@@ -1507,8 +1507,12 @@ int save_state(const char *file, const char *cardname)
 				break;
 			if (card < 0) {
 				if (first) {
-					error("No soundcards found...");
-					return -ENODEV;
+					if (ignore_nocards) {
+						return 0;
+					} else {
+						error("No soundcards found...");
+						return -ENODEV;
+					}
 				}
 				break;
 			}
@@ -1606,8 +1610,12 @@ int load_state(const char *file, const char *initfile, const char *cardname)
 				break;
 			if (card < 0) {
 				if (first) {
-					error("No soundcards found...");
-					return -ENODEV;
+					if (ignore_nocards) {
+						return 0;
+					} else {
+						error("No soundcards found...");
+						return -ENODEV;
+					}
 				}
 				break;
 			}
-- 
1.6.0.GIT



Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- alsa-utils.spec	11 Sep 2008 11:54:09 -0000	1.72
+++ alsa-utils.spec	18 Sep 2008 07:54:21 -0000	1.73
@@ -4,7 +4,7 @@
 Summary: Advanced Linux Sound Architecture (ALSA) utilities
 Name:    alsa-utils
 Version: 1.0.18
-Release: 1%{?prever_dot}%{?dist}
+Release: 2%{?prever_dot}%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.alsa-project.org/
@@ -15,6 +15,7 @@
 Source11: alsactl.conf
 Patch0:  alsa-utils-1.0.18-alsaconf.patch
 Patch1:  alsactl-fix-card-parsing.patch
+Patch1:  alsactl-add-ignore-option.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel >= %{version}
 BuildRequires: ncurses-devel
@@ -54,8 +55,8 @@
 ln -s ../../sbin/alsactl $RPM_BUILD_ROOT/%{_sbindir}/alsactl
 
 # Move /usr/share/alsa/init to /lib/alsa/init
-mkdir -p -m 755 %{buildroot}/%{_lib}/alsa
-mv %{buildroot}%{_datadir}/alsa/init %{buildroot}/%{_lib}/alsa
+mkdir -p -m 755 %{buildroot}/lib/alsa
+mv %{buildroot}%{_datadir}/alsa/init %{buildroot}/lib/alsa
 
 # Link /lib/alsa/init to /usr/share/alsa/init back
 ln -s ../../../lib/alsa/init %{buildroot}%{_datadir}/alsa/init
@@ -67,6 +68,7 @@
 
 # Install alsa-info.sh script
 install -p -m 755 %{SOURCE6} %{buildroot}/usr/bin/alsa-info
+ln -s alsa-info.sh %{buildroot}/usr/bin/alsa-info
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -78,7 +80,7 @@
 %config /etc/alsa/*
 /bin/*
 /sbin/*
-/%{_lib}/alsa/init/*
+/lib/alsa/init/*
 %{_bindir}/*
 %{_sbindir}/*
 %{_datadir}/alsa/
@@ -87,8 +89,18 @@
 %dir /etc/alsa/
 %ghost /etc/asound.state
 
+%post
+if [ -s /etc/alsa/asound.state -a ! -s /etc/asound.state ] ; then
+  mv /etc/alsa/asound.state /etc/asound.state
+fi
 
 %changelog
+* Thu Sep 18 2008 Jaroslav Kysela <jkysela at redhat.com> 1.0.18-2.rc3
+- fixed /lib/alsa/init path for x86_64 (was /lib64/alsa/init)
+- added /etc/alsa/asound.state -> /etc/asound.state shift to %post section
+- fix udev rules (ommited /dev/ prefix for the alsactl utility)
+- added --ignore option for alsactl (added also to upstream)
+
 * Thu Sep 11 2008 Jaroslav Kysela <jkysela at redhat.com> 1.0.18-1.rc3
 - updated to 1.0.18rc3
 - updated alsa-info.sh script to 0.4.51


Index: alsa.rules
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa.rules,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- alsa.rules	11 Sep 2008 11:54:09 -0000	1.5
+++ alsa.rules	18 Sep 2008 07:54:21 -0000	1.6
@@ -1,4 +1,4 @@
 ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", \
-  RUN+="/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf --initfile=/lib/alsa/init/00main restore $name"
+  RUN+="/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf --initfile=/lib/alsa/init/00main restore /dev/$name"
 ACTION=="remove", SUBSYSTEM=="sound", KERNEL=="controlC*", \
-  RUN+="/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf store $name"
+  RUN+="/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf store /dev/$name"



From jsafrane at fedoraproject.org  Thu Sep 18 08:33:16 2008
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Thu, 18 Sep 2008 08:33:16 +0000 (UTC)
Subject: rpms/xinetd/devel xinetd-2.3.14-readable-debuginfo.patch, NONE,
	1.1 xinetd.spec, 1.58, 1.59
Message-ID: <20080918083316.8DA4E700D9@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/xinetd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9706

Modified Files:
	xinetd.spec 
Added Files:
	xinetd-2.3.14-readable-debuginfo.patch 
Log Message:
fix glitches found during package review
Related: #226560

xinetd-2.3.14-readable-debuginfo.patch:

--- NEW FILE xinetd-2.3.14-readable-debuginfo.patch ---
Generate debuginfo package with all include files readable. 

The support libraries would install their header files with 640 permissions,
which is not what we want.

diff -up xinetd-2.3.14/libs/src/misc/Makefile.in.orig xinetd-2.3.14/libs/src/misc/Makefile.in
--- xinetd-2.3.14/libs/src/misc/Makefile.in.orig	2003-02-19 18:29:27.000000000 +0100
+++ xinetd-2.3.14/libs/src/misc/Makefile.in	2008-09-18 10:18:59.000000000 +0200
@@ -49,7 +49,7 @@ CC_FLAGS		= $(DEBUG)
 CFLAGS			= @CFLAGS@ $(CPP_FLAGS) $(CC_FLAGS) -I$(INCLUDEDIR)
 
 INSTALL			= @INSTALL@
-FMODE			= -m 640		# used by install
+FMODE			= -m 644		# used by install
 RANLIB			= @RANLIB@
 
 LIBNAME			= lib$(NAME).a
diff -up xinetd-2.3.14/libs/src/portable/Makefile.in.orig xinetd-2.3.14/libs/src/portable/Makefile.in
--- xinetd-2.3.14/libs/src/portable/Makefile.in.orig	2003-02-19 18:29:27.000000000 +0100
+++ xinetd-2.3.14/libs/src/portable/Makefile.in	2008-09-18 10:19:09.000000000 +0200
@@ -44,7 +44,7 @@ CC_FLAGS		= $(DEBUG)
 CFLAGS			= @CFLAGS@ $(CPP_FLAGS) $(CC_FLAGS) -I$(INCLUDEDIR)
 
 INSTALL			= @INSTALL@
-FMODE			= -m 640		# used by install
+FMODE			= -m 644		# used by install
 RANLIB			= @RANLIB@
 
 LIBNAME			= lib$(NAME).a
diff -up xinetd-2.3.14/libs/src/pset/Makefile.in.orig xinetd-2.3.14/libs/src/pset/Makefile.in
--- xinetd-2.3.14/libs/src/pset/Makefile.in.orig	2003-02-19 18:29:27.000000000 +0100
+++ xinetd-2.3.14/libs/src/pset/Makefile.in	2008-09-18 10:19:17.000000000 +0200
@@ -41,7 +41,7 @@ CC_FLAGS		= $(DEBUG)
 CFLAGS			= @CFLAGS@ $(CPP_FLAGS) $(CC_FLAGS)
 
 INSTALL			= @INSTALL@
-FMODE			= -m 640			# used by install
+FMODE			= -m 644			# used by install
 RANLIB			= @RANLIB@
 
 LIBNAME			= lib$(NAME).a
diff -up xinetd-2.3.14/libs/src/sio/Makefile.in.orig xinetd-2.3.14/libs/src/sio/Makefile.in
--- xinetd-2.3.14/libs/src/sio/Makefile.in.orig	2003-02-19 18:29:27.000000000 +0100
+++ xinetd-2.3.14/libs/src/sio/Makefile.in	2008-09-18 10:19:25.000000000 +0200
@@ -40,7 +40,7 @@ CC_FLAGS		= $(DEBUG)
 CFLAGS			= @CFLAGS@ $(CPP_FLAGS) $(CC_FLAGS) -I$(INCLUDEDIR)
 
 INSTALL			= @INSTALL@
-FMODE			= -m 640			# used by install
+FMODE			= -m 644			# used by install
 RANLIB			= @RANLIB@
 
 LIBNAME			= lib$(NAME).a
diff -up xinetd-2.3.14/libs/src/str/Makefile.in.orig xinetd-2.3.14/libs/src/str/Makefile.in
--- xinetd-2.3.14/libs/src/str/Makefile.in.orig	2003-02-19 18:29:27.000000000 +0100
+++ xinetd-2.3.14/libs/src/str/Makefile.in	2008-09-18 10:19:33.000000000 +0200
@@ -51,7 +51,7 @@ CC_FLAGS		= $(DEBUG)
 CFLAGS			= @CFLAGS@ $(CPP_FLAGS) $(CC_FLAGS)
 
 INSTALL			= @INSTALL@
-FMODE			= -m 640			# used by install
+FMODE			= -m 644			# used by install
 RANLIB			= @RANLIB@
 
 LIBNAME			= lib$(NAME).a
diff -up xinetd-2.3.14/libs/src/xlog/Makefile.in.orig xinetd-2.3.14/libs/src/xlog/Makefile.in
--- xinetd-2.3.14/libs/src/xlog/Makefile.in.orig	2003-02-19 18:29:27.000000000 +0100
+++ xinetd-2.3.14/libs/src/xlog/Makefile.in	2008-09-18 10:19:41.000000000 +0200
@@ -46,7 +46,7 @@ CC_FLAGS		= $(DEBUG)
 CFLAGS			= @CFLAGS@ $(CPP_FLAGS) $(CC_FLAGS)
 
 INSTALL			= @INSTALL@
-FMODE			= -m 640			# used by install
+FMODE			= -m 644			# used by install
 RANLIB			= @RANLIB@
 
 LIBNAME			= lib$(NAME).a


Index: xinetd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- xinetd.spec	16 Jul 2008 07:44:32 -0000	1.58
+++ xinetd.spec	18 Sep 2008 08:32:46 -0000	1.59
@@ -1,7 +1,7 @@
-Summary: A secure replacement for inetd.
+Summary: A secure replacement for inetd
 Name: xinetd
 Version: 2.3.14
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: xinetd 
 Group: System Environment/Daemons
 Epoch: 2
@@ -18,15 +18,15 @@
 Patch6: xinetd-2.3.14-man-section.patch
 Patch7: xinetd-2.3.11-PIE.patch
 Patch8: xinetd-2.3.14-ident-bind.patch
+Patch9: xinetd-2.3.14-readable-debuginfo.patch
 
 BuildRequires: autoconf, automake
 BuildRequires: libselinux-devel >= 1.30
-Prereq: /sbin/chkconfig /etc/init.d /sbin/service
+Requires: /sbin/chkconfig /etc/init.d /sbin/service
 %{!?tcp_wrappers:BuildRequires: tcp_wrappers-devel}
 Requires: filesystem >= 2.0.1, initscripts, setup, fileutils
 Provides: inetd
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Obsoletes: inetd, netkit-base
 
 %description
 Xinetd is a secure replacement for inetd, the Internet services
@@ -40,6 +40,7 @@
 
 %prep
 %setup -q  
+
 # SPARC/SPARC64 needs -fPIE/-PIE
 # This really should be detected by configure.
 %ifarch sparcv9 sparc64
@@ -54,6 +55,7 @@
 %patch5 -p1 -b .ssize_t
 %patch6 -p1 -b .man-section
 %patch8 -p1 -b .ident-bind
+%patch9 -p1 -b .readable-debuginfo
 
 aclocal
 autoconf
@@ -107,12 +109,16 @@
 
 %config(noreplace) /etc/xinetd.conf
 %config(noreplace) /etc/sysconfig/xinetd
-%config /etc/rc.d/init.d/xinetd
+/etc/rc.d/init.d/xinetd
 %config(noreplace) /etc/xinetd.d/*
 /usr/sbin/xinetd
 %{_mandir}/*/*
 
 %changelog
+* Thu Sep 18 2008 Jan Safranek <jsafranek at redhat.com> - 2:2.3.14-21
+- fix glitches found during package review (#226560)
+- make all files in .debuginfo package readable by everyone
+
 * Wed Jul 16 2008 Jan Safranek <jsafranek at redhat.com> - 2:2.3.14-20
 - fix wrong bind() call (#448069)
 



From perex at fedoraproject.org  Thu Sep 18 08:39:29 2008
From: perex at fedoraproject.org (Jaroslav Kysela)
Date: Thu, 18 Sep 2008 08:39:29 +0000 (UTC)
Subject: rpms/alsa-utils/devel alsa-utils.spec,1.73,1.74
Message-ID: <20080918083929.CF080700D9@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10378

Modified Files:
	alsa-utils.spec 
Log Message:
alsa-utils: fix alsa-info.sh and alsactl-add-ignore-option.patch


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- alsa-utils.spec	18 Sep 2008 07:54:21 -0000	1.73
+++ alsa-utils.spec	18 Sep 2008 08:38:59 -0000	1.74
@@ -4,7 +4,7 @@
 Summary: Advanced Linux Sound Architecture (ALSA) utilities
 Name:    alsa-utils
 Version: 1.0.18
-Release: 2%{?prever_dot}%{?dist}
+Release: 3%{?prever_dot}%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.alsa-project.org/
@@ -15,7 +15,7 @@
 Source11: alsactl.conf
 Patch0:  alsa-utils-1.0.18-alsaconf.patch
 Patch1:  alsactl-fix-card-parsing.patch
-Patch1:  alsactl-add-ignore-option.patch
+Patch2:  alsactl-add-ignore-option.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel >= %{version}
 BuildRequires: ncurses-devel
@@ -31,6 +31,7 @@
 %setup -q -n %{name}-%{version}%{?prever}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --sbindir=/sbin
@@ -68,7 +69,7 @@
 
 # Install alsa-info.sh script
 install -p -m 755 %{SOURCE6} %{buildroot}/usr/bin/alsa-info
-ln -s alsa-info.sh %{buildroot}/usr/bin/alsa-info
+ln -s alsa-info %{buildroot}/usr/bin/alsa-info.sh
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -95,6 +96,9 @@
 fi
 
 %changelog
+* Thu Sep 18 2008 Jaroslav Kysela <jkysela at redhat.com> 1.0.18-3.rc3
+- fixed alsa-info.sh link
+
 * Thu Sep 18 2008 Jaroslav Kysela <jkysela at redhat.com> 1.0.18-2.rc3
 - fixed /lib/alsa/init path for x86_64 (was /lib64/alsa/init)
 - added /etc/alsa/asound.state -> /etc/asound.state shift to %post section



From erikos at fedoraproject.org  Thu Sep 18 09:10:02 2008
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Thu, 18 Sep 2008 09:10:02 +0000 (UTC)
Subject: rpms/sugar-log/devel sugar-log.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080918091002.088EA700D9@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-log/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13905

Modified Files:
	.cvsignore sources 
Added Files:
	sugar-log.spec 
Log Message:
* Sat Sep 13 2008 Simon Schampijer <simon at laptop.org> - 16-1
- cleanup upstream in respect to review comments

* Fri Sep 12 2008 Simon Schampijer <simon at laptop.org> - 15-1
- containing licensing information in the activity.info
- remove pseudo.po in bundlebuilder

* Tue Sep 9 2008 Simon Schampijer <simon at laptop.org> - 14-1
- Initial packaging




--- NEW FILE sugar-log.spec ---
Name: sugar-log
Version: 16
Release: 1%{?dist}
Summary: Log activity for Sugar
Group: Sugar/Activities
License: GPLv2+
URL: http://wiki.laptop.org/go/Log
Source0: http://dev.laptop.org/pub/sugar/sources/log-activity/Log-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python sugar-toolkit
BuildArch: noarch

%description
Log is an activity for developers to examine the log files that are 
generated by system software and other activities. 

%prep
%setup -q -n Log-%{version}

%build
python ./setup.py build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{sugaractivitydir}
./setup.py install --prefix=$RPM_BUILD_ROOT/%{_prefix}

%find_lang org.laptop.Log

%clean
rm -rf $RPM_BUILD_ROOT


%files -f org.laptop.Log.lang
%defattr(-,root,root,-)
%doc NEWS COPYING
%{sugaractivitydir}/Log.activity/


%changelog
* Sat Sep 13 2008 Simon Schampijer <simon at laptop.org> - 16-1
- cleanup upstream in respect to review comments 

* Fri Sep 12 2008 Simon Schampijer <simon at laptop.org> - 15-1
- containing licensing information in the activity.info
- remove pseudo.po in bundlebuilder

* Tue Sep 9 2008 Simon Schampijer <simon at laptop.org> - 14-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-log/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2008 19:00:54 -0000	1.1
+++ .cvsignore	18 Sep 2008 09:09:31 -0000	1.2
@@ -0,0 +1 @@
+Log-16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-log/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 19:00:54 -0000	1.1
+++ sources	18 Sep 2008 09:09:31 -0000	1.2
@@ -0,0 +1 @@
+a9f011a0df4c317065c52af4ffa12831  Log-16.tar.bz2



From than at fedoraproject.org  Thu Sep 18 09:28:50 2008
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 18 Sep 2008 09:28:50 +0000 (UTC)
Subject: rpms/kdemultimedia/F-9 kdemultimedia-4.1.1-kde#170941-dragon.patch, 
	NONE, 1.1 kdemultimedia.spec, 1.113, 1.114
Message-ID: <20080918092850.7A6CF700D9@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdemultimedia/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15305

Modified Files:
	kdemultimedia.spec 
Added Files:
	kdemultimedia-4.1.1-kde#170941-dragon.patch 
Log Message:
backport from trunk to fix dragon kpart crash in the embedding application


kdemultimedia-4.1.1-kde#170941-dragon.patch:

--- NEW FILE kdemultimedia-4.1.1-kde#170941-dragon.patch ---
diff -up kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp.orig kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp
--- kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp.orig	2008-09-17 00:14:07.000000000 +0200
+++ kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp	2008-09-17 00:16:49.000000000 +0200
@@ -529,15 +529,13 @@ debug() << "chapters: " << m_controller-
         refreshXineStream();
         updateChannels();
 
-		if(m_adjustedSize==false)
-		{
-		  ( (QWidget*) mainWindow() )->adjustSize();
-		  m_adjustedSize=true;
-		  debug() << "adjusting size to video resolution";
-		}
-        //m_vWidget->updateGeometry();
-        //updateGeometry();
-        
+        if(m_adjustedSize==false)
+        {
+           if( mainWindow() )
+             ( (QWidget*) mainWindow() )->adjustSize();
+           m_adjustedSize=true;
+           debug() << "adjusting size to video resolution";
+	}
     }
     emit stateChanged( state( currentState ) ); 
 }


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-9/kdemultimedia.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- kdemultimedia.spec	29 Aug 2008 19:20:33 -0000	1.113
+++ kdemultimedia.spec	18 Sep 2008 09:28:20 -0000	1.114
@@ -1,7 +1,7 @@
 Name: kdemultimedia
 Epoch: 6
 Version: 4.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:     Applications/Multimedia
@@ -9,6 +9,8 @@
 License:   GPLv2+
 URL:       http://www.kde.org/
 Source0:   ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}.tar.bz2
+# upstream patches
+Patch100:  kdemultimedia-4.1.1-kde#170941-dragon.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # This one is normal, FLAC_OGG_LIBRARY is not actually used anyway:
@@ -75,6 +77,9 @@
 %prep
 %setup -q -n kdemultimedia-%{version}
 
+# upstream patches
+%patch100 -p1 -b .kde#170941-dragon
+
 %build
 
 mkdir -p %{_target_platform} 
@@ -147,6 +152,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Than Ngo <than at redhat.com> 4.1.1-2
+- backport from trunk to fix dragon kpart crash in the embedding application 
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 



From pravins at fedoraproject.org  Thu Sep 18 09:35:40 2008
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 18 Sep 2008 09:35:40 +0000 (UTC)
Subject: rpms/samyak-fonts/devel .cvsignore, 1.3, 1.4 samyak-fonts.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20080918093540.6901B700D9@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/samyak-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16041

Modified Files:
	.cvsignore samyak-fonts.spec sources 
Log Message:
* Thu Sep 18 2008 Pravin Satpute <psatpute at redhat.com> 1.2.1-1
- Upstream release 1.2.1
- Added Unicode 5.1 support in Samyak-Devanagari



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samyak-fonts/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Feb 2008 06:26:41 -0000	1.3
+++ .cvsignore	18 Sep 2008 09:35:10 -0000	1.4
@@ -1,2 +1,3 @@
 samyak-fonts-1.1.0.tar.gz
 samyak-fonts-1.2.0.tar.gz
+samyak-fonts-1.2.1.tar.gz


Index: samyak-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samyak-fonts/devel/samyak-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- samyak-fonts.spec	4 Apr 2008 07:16:24 -0000	1.4
+++ samyak-fonts.spec	18 Sep 2008 09:35:10 -0000	1.5
@@ -2,8 +2,8 @@
 %define langlist        "devanagari gujarati tamil malayalam oriya"
 
 Name:        samyak-fonts
-Version:     1.2.0
-Release:     2%{?dist}
+Version:     1.2.1
+Release:     1%{?dist}
 Summary:     Free Indian truetype/opentype fonts
 Group:       User Interface/X
 License:     GPLv3+ with exceptions
@@ -71,6 +71,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Sep 18 2008 Pravin Satpute <psatpute at redhat.com> 1.2.1-1
+- upstream release 1.2.1
+- Added Unicode 5.1 support in Samyak-Devanagari 
+
 * Fri Apr 04 2008 Pravin Satpute <psatpute at redhat.com> 1.2.0-2
 - given proper license name
 - fc-cache now run on samyak-langname folder


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samyak-fonts/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Feb 2008 06:26:41 -0000	1.3
+++ sources	18 Sep 2008 09:35:10 -0000	1.4
@@ -1 +1 @@
-a57339ba2b4279938a2d792ebdf70377  samyak-fonts-1.2.0.tar.gz
+b487da8289cf633ea131c715a60a6348  samyak-fonts-1.2.1.tar.gz



From vcrhonek at fedoraproject.org  Thu Sep 18 09:41:25 2008
From: vcrhonek at fedoraproject.org (Vitezslav Crhonek)
Date: Thu, 18 Sep 2008 09:41:25 +0000 (UTC)
Subject: rpms/fetchmail/devel fetchmail-6.2.5-addrconf.patch, 1.1,
	1.2 fetchmail-6.3.8-CVE-2007-4565.patch, 1.1,
	1.2 fetchmail-6.3.8-CVE-2008-2711.patch, 1.1, 1.2 fetchmail.spec,
	1.59, 1.60
Message-ID: <20080918094125.D87F7700D9@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/fetchmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16545

Modified Files:
	fetchmail-6.2.5-addrconf.patch 
	fetchmail-6.3.8-CVE-2007-4565.patch 
	fetchmail-6.3.8-CVE-2008-2711.patch fetchmail.spec 
Log Message:
Rediff all patches to work with patch --fuzz=0

fetchmail-6.2.5-addrconf.patch:

Index: fetchmail-6.2.5-addrconf.patch
===================================================================
RCS file: /cvs/extras/rpms/fetchmail/devel/fetchmail-6.2.5-addrconf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fetchmail-6.2.5-addrconf.patch	9 Sep 2004 04:47:22 -0000	1.1
+++ fetchmail-6.2.5-addrconf.patch	18 Sep 2008 09:40:55 -0000	1.2
@@ -1,17 +1,13 @@
-
-Use AI_ADDRCONFIG for name lookups by default.  Don't send this upstream
-as-is since it needs an autoconf test to check whether AI_ADDRCONFIG is safe
-to use in getaddrinfo calls (it isn't in the RHL6.2 resolver, for instance).
-
---- fetchmail-6.2.5/socket.c.addrconf	2003-10-10 11:32:15.000000000 +0100
-+++ fetchmail-6.2.5/socket.c	2004-05-19 13:23:22.000000000 +0100
-@@ -276,6 +276,9 @@
- #endif /* HAVE_SOCKETPAIR */
+diff -up fetchmail-6.3.8/socket.c.addrconf fetchmail-6.3.8/socket.c
+--- fetchmail-6.3.8/socket.c.addrconf	2006-12-17 01:05:31.000000000 +0100
++++ fetchmail-6.3.8/socket.c	2008-09-18 11:37:15.000000000 +0200
+@@ -276,6 +276,9 @@ int SockOpen(const char *host, const cha
+ 
      memset(&req, 0, sizeof(struct addrinfo));
      req.ai_socktype = SOCK_STREAM;
 +#ifdef AI_ADDRCONFIG
 +    req.ai_flags = AI_ADDRCONFIG;
 +#endif
  
-     if (getaddrinfo(host, service, &req, &ai0)) {
- 	report(stderr, GT_("fetchmail: getaddrinfo(%s.%s)\n"), host,service);
+     i = fm_getaddrinfo(host, service, &req, ai0);
+     if (i) {

fetchmail-6.3.8-CVE-2007-4565.patch:

Index: fetchmail-6.3.8-CVE-2007-4565.patch
===================================================================
RCS file: /cvs/extras/rpms/fetchmail/devel/fetchmail-6.3.8-CVE-2007-4565.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fetchmail-6.3.8-CVE-2007-4565.patch	4 Sep 2007 12:43:38 -0000	1.1
+++ fetchmail-6.3.8-CVE-2007-4565.patch	18 Sep 2008 09:40:55 -0000	1.2
@@ -1,6 +1,7 @@
---- fetchmail-6.3.8/sink.c_old	2007-03-30 00:45:17.000000000 +0200
-+++ fetchmail-6.3.8/sink.c	2007-09-04 13:30:35.000000000 +0200
-@@ -262,7 +262,7 @@
+diff -up fetchmail-6.3.8/sink.c.cve_2007_4565 fetchmail-6.3.8/sink.c
+--- fetchmail-6.3.8/sink.c.cve_2007_4565	2007-03-30 00:45:17.000000000 +0200
++++ fetchmail-6.3.8/sink.c	2008-09-18 11:38:09.000000000 +0200
+@@ -262,7 +262,7 @@ static int send_bouncemail(struct query 
      const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@";
  
      /* don't bounce in reply to undeliverable bounces */

fetchmail-6.3.8-CVE-2008-2711.patch:

Index: fetchmail-6.3.8-CVE-2008-2711.patch
===================================================================
RCS file: /cvs/extras/rpms/fetchmail/devel/fetchmail-6.3.8-CVE-2008-2711.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fetchmail-6.3.8-CVE-2008-2711.patch	27 Jun 2008 09:50:26 -0000	1.1
+++ fetchmail-6.3.8-CVE-2008-2711.patch	18 Sep 2008 09:40:55 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up fetchmail-6.3.8/report.c_old fetchmail-6.3.8/report.c
---- fetchmail-6.3.8/report.c_old	2008-06-27 11:38:59.000000000 +0200
-+++ fetchmail-6.3.8/report.c	2008-06-27 11:39:22.000000000 +0200
+diff -up fetchmail-6.3.8/report.c.cve_2008_2711 fetchmail-6.3.8/report.c
+--- fetchmail-6.3.8/report.c.cve_2008_2711	2006-03-14 09:53:31.000000000 +0100
++++ fetchmail-6.3.8/report.c	2008-09-18 11:38:50.000000000 +0200
 @@ -238,11 +238,17 @@ report_build (FILE *errfp, message, va_a
      rep_ensuresize();
  


Index: fetchmail.spec
===================================================================
RCS file: /cvs/extras/rpms/fetchmail/devel/fetchmail.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- fetchmail.spec	3 Sep 2008 14:10:16 -0000	1.59
+++ fetchmail.spec	18 Sep 2008 09:40:55 -0000	1.60
@@ -89,7 +89,8 @@
 %endif
 
 %changelog
-* Wed Sep  3 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.3.8-8
+* 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
   Resolves: #66396
 



From vcrhonek at fedoraproject.org  Thu Sep 18 09:57:12 2008
From: vcrhonek at fedoraproject.org (Vitezslav Crhonek)
Date: Thu, 18 Sep 2008 09:57:12 +0000 (UTC)
Subject: rpms/fetchmail/devel fetchmail.spec,1.60,1.61
Message-ID: <20080918095712.083D3700D9@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/fetchmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17503

Modified Files:
	fetchmail.spec 
Log Message:
add procmail do build requires


Index: fetchmail.spec
===================================================================
RCS file: /cvs/extras/rpms/fetchmail/devel/fetchmail.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- fetchmail.spec	18 Sep 2008 09:40:55 -0000	1.60
+++ fetchmail.spec	18 Sep 2008 09:56:41 -0000	1.61
@@ -16,7 +16,7 @@
 License: GPL+ and Public Domain
 Group: Applications/Internet
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gettext-devel hesiod-devel krb5-devel openssl-devel
+BuildRequires: gettext-devel hesiod-devel krb5-devel openssl-devel procmail
 %if ! %{fetchmailconf}
 Obsoletes: fetchmailconf
 %endif



From atorkhov at fedoraproject.org  Thu Sep 18 09:59:44 2008
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Thu, 18 Sep 2008 09:59:44 +0000 (UTC)
Subject: rpms/libwfut/F-8 libwfut.spec,1.4,1.5
Message-ID: <20080918095944.B201C700D9@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/libwfut/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17846

Modified Files:
	libwfut.spec 
Log Message:
* Fri Sep 18 2008 Alexey Torkhov <atorkhov at gmail.com> 0.2.0-3.2
- Fixing deps for F-8.



Index: libwfut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwfut/F-8/libwfut.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libwfut.spec	12 Sep 2008 05:35:00 -0000	1.4
+++ libwfut.spec	18 Sep 2008 09:59:14 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           libwfut
 Version:        0.2.0
-Release:        3%{?dist}.1
+Release:        3%{?dist}.2
 Summary:        Software updater tool for WorldForge applications
 
 Group:          Development/Libraries
@@ -24,7 +24,7 @@
 %package devel
 Summary: Development files for libwfut library
 Group:   Development/Libraries
-Requires: pkgconfig %{name} = %{version}-%{release} libsigc++20-devel libcurl-devel zlib-devel
+Requires: pkgconfig %{name} = %{version}-%{release} libsigc++20-devel curl-devel zlib-devel
 
 
 %description devel
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Fri Sep 18 2008 Alexey Torkhov <atorkhov at gmail.com> 0.2.0-3.2
+- Fixing deps for F-8.
+
 * Fri Jun 20 2008 Alexey Torkhov <atorkhov at gmail.com> 0.2.0-3
 - Fixing deps.
 



From vcrhonek at fedoraproject.org  Thu Sep 18 10:25:03 2008
From: vcrhonek at fedoraproject.org (Vitezslav Crhonek)
Date: Thu, 18 Sep 2008 10:25:03 +0000 (UTC)
Subject: rpms/kbd/devel kbd-1.08-compose.patch, 1.3, 1.4 kbd-1.08-rukbd.patch,
	1.3, 1.4 kbd-1.08-terminal.patch, 1.3,
	1.4 kbd-1.12-Meta_utf8.patch, 1.3, 1.4 kbd-1.12-alias.patch, 1.4,
	1.5 kbd-1.12-dir.patch, 1.3, 1.4 kbd-1.12-gr-el.patch, 1.1,
	1.2 kbd-1.12-keycodes-man.patch, 1.1,
	1.2 kbd-1.12-no-user-map.patch, 1.1, 1.2 kbd-1.12-nostrip.patch,
	1.1, 1.2 kbd-1.12-resizecon-x86.patch, 1.1,
	1.2 kbd-1.12-setfont-man.patch, 1.1, 1.2 kbd-1.12-sparc.patch,
	1.1, 1.2 kbd-1.12-trq-map.patch, 1.1, 1.2 kbd.spec, 1.54, 1.55
Message-ID: <20080918102503.672E2700D9@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/kbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20655

Modified Files:
	kbd-1.08-compose.patch kbd-1.08-rukbd.patch 
	kbd-1.08-terminal.patch kbd-1.12-Meta_utf8.patch 
	kbd-1.12-alias.patch kbd-1.12-dir.patch kbd-1.12-gr-el.patch 
	kbd-1.12-keycodes-man.patch kbd-1.12-no-user-map.patch 
	kbd-1.12-nostrip.patch kbd-1.12-resizecon-x86.patch 
	kbd-1.12-setfont-man.patch kbd-1.12-sparc.patch 
	kbd-1.12-trq-map.patch kbd.spec 
Log Message:
Rediff all patches to work with patch --fuzz=0, Add static loadkeys

kbd-1.08-compose.patch:

Index: kbd-1.08-compose.patch
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd-1.08-compose.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kbd-1.08-compose.patch	22 Feb 2008 09:58:17 -0000	1.3
+++ kbd-1.08-compose.patch	18 Sep 2008 10:25:02 -0000	1.4
@@ -1,7 +1,6 @@
-Map the PrintScreen key and Alt+AltGr to Compose.
-
---- kbd-1.08/data/keymaps/i386/include/compose.inc	2002-10-04 14:48:04.000000000 -0400
-+++ kbd-1.08/data/keymaps/i386/include/compose.inc	2002-11-22 17:36:32.000000000 -0500
+diff -up /dev/null kbd-1.12/data/keymaps/i386/include/compose.inc
+--- /dev/null	2008-08-23 19:55:25.045687917 +0200
++++ kbd-1.12/data/keymaps/i386/include/compose.inc	2008-09-08 17:23:50.000000000 +0200
 @@ -0,0 +1,8 @@
 +# We map the PrintScreen key (useless) and Alt+AltGr to the Compose key...
 +# A really useful thing not found on normal keyboards. :/
@@ -11,33 +10,26 @@
 +keycode  99 = Compose		# SysRq/PrintScrn
 +keycode 100 = AltGr		
 +alt keycode 100 = Compose
---- kbd-1.08/data/keymaps/i386/include/qwerty-layout.inc	2002-10-11 07:08:50.000000000 -0400
-+++ kbd-1.08/data/keymaps/i386/include/qwerty-layout.inc	2002-11-22 17:36:32.000000000 -0500
-@@ -28,3 +28,4 @@
+diff -up kbd-1.12/data/keymaps/i386/include/qwertz-layout.inc.compose kbd-1.12/data/keymaps/i386/include/qwertz-layout.inc
+--- kbd-1.12/data/keymaps/i386/include/qwertz-layout.inc.compose	2002-10-11 13:08:50.000000000 +0200
++++ kbd-1.12/data/keymaps/i386/include/qwertz-layout.inc	2008-09-08 17:23:50.000000000 +0200
+@@ -28,3 +28,4 @@ keycode 48 = b
  keycode 49 = n
  keycode 50 = m
  #
 +include "compose"
---- kbd-1.08/data/keymaps/i386/include/qwertz-layout.inc	2002-10-11 07:08:50.000000000 -0400
-+++ kbd-1.08/data/keymaps/i386/include/qwertz-layout.inc	2002-11-22 17:36:32.000000000 -0500
-@@ -28,3 +28,4 @@
+diff -up kbd-1.12/data/keymaps/i386/include/qwerty-layout.inc.compose kbd-1.12/data/keymaps/i386/include/qwerty-layout.inc
+--- kbd-1.12/data/keymaps/i386/include/qwerty-layout.inc.compose	2002-10-11 13:08:50.000000000 +0200
++++ kbd-1.12/data/keymaps/i386/include/qwerty-layout.inc	2008-09-08 17:23:50.000000000 +0200
+@@ -28,3 +28,4 @@ keycode 48 = b
  keycode 49 = n
  keycode 50 = m
  #
 +include "compose"
---- kbd-1.08/data/keymaps/i386/include/linux-with-alt-and-altgr.inc	2002-10-11 07:08:50.000000000 -0400
-+++ kbd-1.08/data/keymaps/i386/include/linux-with-alt-and-altgr.inc	2002-11-22 17:36:32.000000000 -0500
-@@ -1,6 +1,7 @@
- include "linux-keys-bare"
- 
- keycode 100 = AltGr
-+alt keycode 100 = Compose
- 
- altgr keycode 70 = Show_Registers
- alt keycode 70 = Scroll_Lock
---- kbd-1.08/data/keymaps/i386/include/linux-keys-bare.inc	2002-10-12 20:14:06.000000000 -0400
-+++ kbd-1.08/data/keymaps/i386/include/linux-keys-bare.inc	2002-11-22 17:42:04.000000000 -0500
-@@ -148,7 +148,8 @@
+diff -up kbd-1.12/data/keymaps/i386/include/linux-keys-bare.inc.compose kbd-1.12/data/keymaps/i386/include/linux-keys-bare.inc
+--- kbd-1.12/data/keymaps/i386/include/linux-keys-bare.inc.compose	2002-10-13 02:14:06.000000000 +0200
++++ kbd-1.12/data/keymaps/i386/include/linux-keys-bare.inc	2008-09-08 17:23:50.000000000 +0200
+@@ -148,7 +148,8 @@ control	alt keycode 111 = Boot
  # The three system keys
  #
  keycode  84 = Last_Console		# Alt+SysRq/PrintScrn
@@ -47,3 +39,14 @@
  alt	keycode 99 = Control_backslash
  control	keycode 99 = Control_backslash
  
+diff -up kbd-1.12/data/keymaps/i386/include/linux-with-alt-and-altgr.inc.compose kbd-1.12/data/keymaps/i386/include/linux-with-alt-and-altgr.inc
+--- kbd-1.12/data/keymaps/i386/include/linux-with-alt-and-altgr.inc.compose	2002-10-11 13:08:50.000000000 +0200
++++ kbd-1.12/data/keymaps/i386/include/linux-with-alt-and-altgr.inc	2008-09-08 17:23:50.000000000 +0200
+@@ -1,6 +1,7 @@
+ include "linux-keys-bare"
+ 
+ keycode 100 = AltGr
++alt keycode 100 = Compose
+ 
+ altgr keycode 70 = Show_Registers
+ alt keycode 70 = Scroll_Lock

kbd-1.08-rukbd.patch:

Index: kbd-1.08-rukbd.patch
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd-1.08-rukbd.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kbd-1.08-rukbd.patch	22 Feb 2008 09:58:17 -0000	1.3
+++ kbd-1.08-rukbd.patch	18 Sep 2008 10:25:02 -0000	1.4
@@ -1,5 +1,6 @@
---- kbd-1.08/data/keymaps/i386/qwerty/ru.map.orig	2003-07-30 12:00:51.000000000 -0400
-+++ kbd-1.08/data/keymaps/i386/qwerty/ru.map	2003-07-30 12:01:08.000000000 -0400
+diff -up kbd-1.12/data/keymaps/i386/qwerty/ru.map.rukbd kbd-1.12/data/keymaps/i386/qwerty/ru.map
+--- kbd-1.12/data/keymaps/i386/qwerty/ru.map.rukbd	2002-10-13 02:02:19.000000000 +0200
++++ kbd-1.12/data/keymaps/i386/qwerty/ru.map	2008-09-18 12:18:06.000000000 +0200
 @@ -1,287 +1,609 @@
 -! Russian Cyrillic keyboard.map. "Cyrillic" mode is toggled by
 -! Right_Ctrl key and shifted by AltGr key.

kbd-1.08-terminal.patch:

Index: kbd-1.08-terminal.patch
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd-1.08-terminal.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kbd-1.08-terminal.patch	22 Feb 2008 09:58:17 -0000	1.3
+++ kbd-1.08-terminal.patch	18 Sep 2008 10:25:02 -0000	1.4
@@ -1,14 +1,13 @@
-Output terminal control sequences only when output is a terminal.
-
---- kbd-1.08/src/unicode_start	2002-11-22 19:23:00.000000000 -0500
-+++ kbd-1.08/src/unicode_start	2002-11-22 19:24:34.000000000 -0500
+diff -up kbd-1.12/src/unicode_start.terminal kbd-1.12/src/unicode_start
+--- kbd-1.12/src/unicode_start.terminal	2001-02-12 17:30:17.000000000 +0100
++++ kbd-1.12/src/unicode_start	2008-09-08 17:24:51.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  # Enables Unicode processing in the current console.
  #
  # 1. The input side: the keyboard driver.
-@@ -25,7 +25,9 @@
+@@ -25,14 +25,16 @@ dumpkeys | loadkeys --unicode
  # Tell the console output driver that the bytes arriving are UTF-8
  # encoded multibyte sequences.
  
@@ -19,8 +18,17 @@
  
  # Tell the graphics card how to display Unicode characters not
  # contained in the IBM 437 character set (on PCs). The font should
---- kbd-1.08/src/unicode_stop	2002-11-22 19:23:30.000000000 -0500
-+++ kbd-1.08/src/unicode_stop	2002-11-22 19:24:15.000000000 -0500
+ # have a Unicode map attached, or explicitly specified, e.g.,
+ # by giving `def.uni' as a second argument.
+ 
+-DEFAULT_UNICODE_FONT=LatArCyrHeb-16
++DEFAULT_UNICODE_FONT=latarcyrheb-sun16
+ # Also drdos8x16 is a good candidate.
+ 
+ case $# in
+diff -up kbd-1.12/src/unicode_stop.terminal kbd-1.12/src/unicode_stop
+--- kbd-1.12/src/unicode_stop.terminal	1997-11-13 14:22:52.000000000 +0100
++++ kbd-1.12/src/unicode_stop	2008-09-08 17:24:51.000000000 +0200
 @@ -1,4 +1,6 @@
  #!/bin/sh
  # stop unicode

kbd-1.12-Meta_utf8.patch:

Index: kbd-1.12-Meta_utf8.patch
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd-1.12-Meta_utf8.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kbd-1.12-Meta_utf8.patch	22 Feb 2008 09:58:17 -0000	1.3
+++ kbd-1.12-Meta_utf8.patch	18 Sep 2008 10:25:02 -0000	1.4
@@ -1,6 +1,7 @@
---- kbd-1.12/src/ksyms.c.org	2005-01-11 16:38:32.000000000 +0100
-+++ kbd-1.12/src/ksyms.c	2005-01-11 16:46:19.000000000 +0100
-@@ -1710,6 +1710,8 @@
+diff -up kbd-1.12/src/ksyms.c.Meta_utf8 kbd-1.12/src/ksyms.c
+--- kbd-1.12/src/ksyms.c.Meta_utf8	2004-01-16 20:45:31.000000000 +0100
++++ kbd-1.12/src/ksyms.c	2008-09-18 12:20:02.000000000 +0200
+@@ -1710,6 +1710,8 @@ ksymtocode(const char *s) {
  		keycode = ksymtocode(s+5);
  		if (KTYP(keycode) == KT_LATIN)
  			return K(KT_META, KVAL(keycode));

kbd-1.12-alias.patch:

Index: kbd-1.12-alias.patch
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd-1.12-alias.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kbd-1.12-alias.patch	22 Feb 2008 09:58:17 -0000	1.4
+++ kbd-1.12-alias.patch	18 Sep 2008 10:25:02 -0000	1.5
@@ -1,7 +1,7 @@
-diff -u kbd-1.12/src/psffontop.c kbd-1.12/src/psffontop.c
---- kbd-1.12/src/psffontop.c	2005-03-12 00:48:30.075310872 +0100
-+++ kbd-1.12/src/psffontop.c	2005-05-14 10:49:59.000000000 +0900
-@@ -59,7 +59,6 @@
+diff -up kbd-1.12/src/psffontop.c.alias kbd-1.12/src/psffontop.c
+--- kbd-1.12/src/psffontop.c.alias	2004-01-16 20:45:31.000000000 +0100
++++ kbd-1.12/src/psffontop.c	2008-09-18 12:20:55.000000000 +0200
+@@ -59,7 +59,6 @@ store_int_le(unsigned char *ip, int num)
  
  static unsigned int
  assemble_ucs2(char **inptr, int cnt) {
@@ -9,7 +9,7 @@
  	unsigned int u1, u2;
  
  	if (cnt < 2) {
-@@ -68,8 +67,8 @@
+@@ -68,8 +67,8 @@ assemble_ucs2(char **inptr, int cnt) {
  		exit(EX_DATAERR);
  	}
  
@@ -20,7 +20,7 @@
  	return (u1 | (u2 << 8));
  }
  
-@@ -110,7 +109,6 @@
+@@ -110,7 +109,6 @@ clear_uni_entry(struct unicode_list *up)
   */
  static void
  get_uni_entry(char **inptr, char **endptr, struct unicode_list *up, int utf8) {
@@ -28,7 +28,7 @@
  	unsigned char uc;
  	unicode unichar;
  	int inseq = 0;
-@@ -126,14 +124,14 @@
+@@ -126,14 +124,14 @@ get_uni_entry(char **inptr, char **endpt
  			exit(EX_DATAERR);
  		}
  		if (utf8) {

kbd-1.12-dir.patch:

Index: kbd-1.12-dir.patch
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd-1.12-dir.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kbd-1.12-dir.patch	22 Feb 2008 09:58:17 -0000	1.3
+++ kbd-1.12-dir.patch	18 Sep 2008 10:25:02 -0000	1.4
@@ -1,6 +1,7 @@
+diff -up kbd-1.12/src/findfile.c.dir kbd-1.12/src/findfile.c
 --- kbd-1.12/src/findfile.c.dir	2004-01-16 20:45:31.000000000 +0100
-+++ kbd-1.12/src/findfile.c	2005-05-20 15:36:45.000000000 +0200
-@@ -92,6 +92,7 @@
++++ kbd-1.12/src/findfile.c	2008-09-18 12:21:17.000000000 +0200
+@@ -92,6 +92,7 @@ findfile_in_dir(char *fnam, char *dir, i
  	if (d == NULL)
  	    return NULL;
  	while ((de = readdir(d)) != NULL) {
@@ -8,7 +9,7 @@
  	    int okdir;
  
  	    if (strcmp(de->d_name, ".") == 0 ||
-@@ -104,7 +105,6 @@
+@@ -104,7 +105,6 @@ findfile_in_dir(char *fnam, char *dir, i
  	    okdir = (ff && strcmp(de->d_name, fdir) == 0);
  
  	    if ((secondpass && recdepth) || okdir) {
@@ -16,7 +17,7 @@
  		char *a;
  
  		a = xmalloc(strlen(dir) + strlen(de->d_name) + 2);
-@@ -136,6 +136,8 @@
+@@ -136,6 +136,8 @@ findfile_in_dir(char *fnam, char *dir, i
  		    continue;
  
  	    sprintf(pathname, "%s/%s", dir, de->d_name);
@@ -25,7 +26,7 @@
  
  	    /* Does tail consist of a known suffix and possibly
  	       a compression suffix? */
-@@ -180,13 +182,16 @@
+@@ -180,13 +182,16 @@ FILE *findfile(char *fnam, char **dirpat
  	/* Test for full pathname - opening it failed, so need suffix */
  	/* (This is just nonsense, for backwards compatibility.) */
  	if (*fnam == '/') {
@@ -43,7 +44,7 @@
  		    return fp;
  	    }
  
-@@ -196,7 +201,9 @@
+@@ -196,7 +201,9 @@ FILE *findfile(char *fnam, char **dirpat
  			+ strlen(dc->ext) + 1 > sizeof(pathname))
  			    continue;
  		    sprintf(pathname, "%s%s%s", fnam, *sp, dc->ext);

kbd-1.12-gr-el.patch:

Index: kbd-1.12-gr-el.patch
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd-1.12-gr-el.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kbd-1.12-gr-el.patch	31 Oct 2006 02:48:59 -0000	1.1
+++ kbd-1.12-gr-el.patch	18 Sep 2008 10:25:02 -0000	1.2
@@ -1,6 +1,7 @@
---- kbd-1.12/po/Makefile.in.gr-el	2006-10-31 03:42:15.000000000 +0100
-+++ kbd-1.12/po/Makefile.in	2006-10-31 03:42:33.000000000 +0100
-@@ -34,9 +34,9 @@
+diff -up kbd-1.12/po/Makefile.in.gr-el kbd-1.12/po/Makefile.in
+--- kbd-1.12/po/Makefile.in.gr-el	2004-01-03 16:46:07.000000000 +0100
++++ kbd-1.12/po/Makefile.in	2008-09-18 12:22:12.000000000 +0200
+@@ -34,9 +34,9 @@ INCLUDES = -I.. -I$(INTL)
  COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
  
  # Enter here all .po files

kbd-1.12-keycodes-man.patch:

Index: kbd-1.12-keycodes-man.patch
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd-1.12-keycodes-man.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kbd-1.12-keycodes-man.patch	7 Dec 2006 17:12:31 -0000	1.1
+++ kbd-1.12-keycodes-man.patch	18 Sep 2008 10:25:02 -0000	1.2
@@ -1,6 +1,7 @@
---- kbd-1.12/man/man1/showkey.1.keycodes-man	2006-12-07 17:37:00.000000000 +0100
-+++ kbd-1.12/man/man1/showkey.1	2006-12-07 18:03:08.000000000 +0100
-@@ -66,6 +66,19 @@
+diff -up kbd-1.12/man/man1/showkey.1.keycodes-man kbd-1.12/man/man1/showkey.1
+--- kbd-1.12/man/man1/showkey.1.keycodes-man	2002-10-11 13:08:58.000000000 +0200
++++ kbd-1.12/man/man1/showkey.1	2008-09-18 12:22:38.000000000 +0200
+@@ -66,6 +66,19 @@ are present.
  Starts
  .B showkey
  in `ascii' dump mode.
@@ -20,9 +21,10 @@
  .SH "SEE ALSO"
  .BR loadkeys (1),
  .BR dumpkeys (1),
---- kbd-1.12/man/man8/setkeycodes.8.keycodes-man	2006-12-07 18:00:40.000000000 +0100
-+++ kbd-1.12/man/man8/setkeycodes.8	2006-12-07 18:05:24.000000000 +0100
-@@ -40,11 +40,24 @@
+diff -up kbd-1.12/man/man8/setkeycodes.8.keycodes-man kbd-1.12/man/man8/setkeycodes.8
+--- kbd-1.12/man/man8/setkeycodes.8.keycodes-man	2002-10-11 13:08:58.000000000 +0200
++++ kbd-1.12/man/man8/setkeycodes.8	2008-09-18 12:22:38.000000000 +0200
+@@ -40,11 +40,24 @@ to showkey(1), the command
  .RE
  will assign the keycode 112 to it, and then loadkeys(1) can be used
  to define the function of this key.

kbd-1.12-no-user-map.patch:

Index: kbd-1.12-no-user-map.patch
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd-1.12-no-user-map.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kbd-1.12-no-user-map.patch	1 Dec 2005 18:54:08 -0000	1.1
+++ kbd-1.12-no-user-map.patch	18 Sep 2008 10:25:02 -0000	1.2
@@ -1,9 +1,6 @@
-Non-root users are allowed to change the unicode mode of their console, but
-not the global keymap.  root will have to load the keymap in unicode mode
-explicitly.
-
---- kbd-1.12/src/unicode_start.no-user-map	2005-12-01 19:33:19.000000000 +0100
-+++ kbd-1.12/src/unicode_start	2005-12-01 19:33:28.000000000 +0100
+diff -up kbd-1.12/src/unicode_start.no-user-map kbd-1.12/src/unicode_start
+--- kbd-1.12/src/unicode_start.no-user-map	2008-09-18 12:21:37.000000000 +0200
++++ kbd-1.12/src/unicode_start	2008-09-18 12:21:37.000000000 +0200
 @@ -14,12 +14,6 @@
  
  kbd_mode -u

kbd-1.12-nostrip.patch:

Index: kbd-1.12-nostrip.patch
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd-1.12-nostrip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kbd-1.12-nostrip.patch	6 Mar 2005 20:58:33 -0000	1.1
+++ kbd-1.12-nostrip.patch	18 Sep 2008 10:25:02 -0000	1.2
@@ -1,6 +1,7 @@
---- kbd-1.12/src/Makefile.in.nostrip	2005-03-06 21:51:58.185047112 +0100
-+++ kbd-1.12/src/Makefile.in	2005-03-06 21:52:19.791762392 +0100
-@@ -72,14 +72,14 @@
+diff -up kbd-1.12/src/Makefile.in.nostrip kbd-1.12/src/Makefile.in
+--- kbd-1.12/src/Makefile.in.nostrip	2004-01-03 18:53:54.000000000 +0100
++++ kbd-1.12/src/Makefile.in	2008-09-18 12:20:30.000000000 +0200
+@@ -72,14 +72,14 @@ old:	$(OLDPROGS)
  
  install:	all
  	install -d -m 0755 $(BINDIR) $(LOADKEYS_BINDIR)

kbd-1.12-resizecon-x86.patch:

Index: kbd-1.12-resizecon-x86.patch
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd-1.12-resizecon-x86.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kbd-1.12-resizecon-x86.patch	17 Oct 2007 10:15:59 -0000	1.1
+++ kbd-1.12-resizecon-x86.patch	18 Sep 2008 10:25:02 -0000	1.2
@@ -1,6 +1,7 @@
---- kbd-1.12/src/Makefile.in_old	2007-10-16 14:14:51.000000000 +0200
-+++ kbd-1.12/src/Makefile.in	2007-10-16 15:27:38.000000000 +0200
-@@ -43,6 +43,10 @@
+diff -up kbd-1.12/src/Makefile.in.resizecon-x86 kbd-1.12/src/Makefile.in
+--- kbd-1.12/src/Makefile.in.resizecon-x86	2008-09-18 12:23:11.000000000 +0200
++++ kbd-1.12/src/Makefile.in	2008-09-18 12:23:11.000000000 +0200
+@@ -43,6 +43,10 @@ ifeq ($(ARCH), i386)
  PROGS += resizecons
  endif
  

kbd-1.12-setfont-man.patch:

Index: kbd-1.12-setfont-man.patch
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd-1.12-setfont-man.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kbd-1.12-setfont-man.patch	19 Feb 2005 22:24:33 -0000	1.1
+++ kbd-1.12-setfont-man.patch	18 Sep 2008 10:25:02 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Nrbu kbd-1.12/man/man8/setfont.8.in kbd-1.12-OK/man/man8/setfont.8.in
---- kbd-1.12/man/man8/setfont.8.in	2004-01-03 07:15:59.000000000 +0300
-+++ kbd-1.12-OK/man/man8/setfont.8.in	2004-11-26 19:20:15.000000000 +0300
-@@ -50,6 +50,10 @@
+diff -up kbd-1.12/man/man8/setfont.8.in.man kbd-1.12/man/man8/setfont.8.in
+--- kbd-1.12/man/man8/setfont.8.in.man	2004-01-03 05:15:59.000000000 +0100
++++ kbd-1.12/man/man8/setfont.8.in	2008-09-18 12:19:14.000000000 +0200
+@@ -50,6 +50,10 @@ and provide one explicitly.
  Load a given font (here a 512-glyph font combining several
  character sets) and indicate that one's local character set
  is ISO 8859-2.

kbd-1.12-sparc.patch:

Index: kbd-1.12-sparc.patch
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd-1.12-sparc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kbd-1.12-sparc.patch	9 Jul 2006 00:29:56 -0000	1.1
+++ kbd-1.12-sparc.patch	18 Sep 2008 10:25:02 -0000	1.2
@@ -1,24 +1,21 @@
---- kbd-1.08/man/man8/kbdrate.8	2002-10-11 07:08:58.000000000 -0400
-+++ kbd-1.08/man/man8/kbdrate.8	2002-11-22 17:28:15.000000000 -0500
-@@ -22,7 +22,7 @@
- without any options will reset the repeat rate to 10.9 characters per second (cps)
- and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems.
- These are the IBM defaults. On SPARC-based systems it will reset the repeat rate
--to 5 cps and the delay to 200 ms.
-+to 20 cps and the delay to 200 ms.
+diff -up kbd-1.12/src/setleds.c.sparc kbd-1.12/src/setleds.c
+--- kbd-1.12/src/setleds.c.sparc	2004-01-16 20:45:31.000000000 +0100
++++ kbd-1.12/src/setleds.c	2008-09-08 17:20:46.000000000 +0200
+@@ -14,10 +14,6 @@
+ #include "nls.h"
+ #include "version.h"
  
- .SH OPTIONS
- .TP
-@@ -69,3 +69,5 @@
- .I /etc/rc.local
- .br
- .I /dev/port
-+.br
-+.I /dev/kbd
-diff -u kbd-1.08/src/kbdrate.c kbd-1.12/src/kbdrate.c
---- kbd-1.08/src/kbdrate.c	2002-11-22 17:34:48.000000000 -0500
-+++ kbd-1.12/src/kbdrate.c	2006-07-08 05:16:33.000000000 -0500
-@@ -77,7 +77,6 @@
+-#ifdef __sparc__
+-#include <asm/kbio.h>
+-#endif
+-
+ static void
+ usage(void)
+ {
+diff -up kbd-1.12/src/kbdrate.c.sparc kbd-1.12/src/kbdrate.c
+--- kbd-1.12/src/kbdrate.c.sparc	2004-01-16 20:45:31.000000000 +0100
++++ kbd-1.12/src/kbdrate.c	2008-09-08 17:20:46.000000000 +0200
+@@ -77,7 +77,6 @@ beats rebuilding the kernel!
  
  #ifdef __sparc__
  #include <asm/param.h>
@@ -26,7 +23,7 @@
  #endif
  
  #ifndef KDKBDREP
-@@ -104,8 +103,11 @@
+@@ -104,8 +103,11 @@ static int valid_delays[] = { 250, 500, 
  
  static int
  KDKBDREP_ioctl_ok(double rate, int delay, int silent) {
@@ -39,7 +36,7 @@
  	struct kbd_repeat kbdrep_s;
  
  	/* don't change, just test */
-@@ -150,6 +152,9 @@
+@@ -150,6 +152,9 @@ KDKBDREP_ioctl_ok(double rate, int delay
  			rate, kbdrep_s.delay );
  
  	return 1;			/* success! */
@@ -49,7 +46,7 @@
  }
  
  static int
-@@ -188,7 +193,7 @@
+@@ -188,7 +193,7 @@ KIOCSRATE_ioctl_ok(double rate, int dela
  int
  main( int argc, char **argv ) {
  #ifdef __sparc__
@@ -58,7 +55,7 @@
  	int         delay = 200;     /* Default delay */
  #else
  	double      rate = 10.9;     /* Default rate */
-@@ -238,8 +243,9 @@
+@@ -238,8 +243,9 @@ main( int argc, char **argv ) {
  		return 0;
  
  
@@ -69,23 +66,29 @@
  	for (i = 0; i < RATE_COUNT; i++)
  		if (rate * 10 >= valid_rates[i]) {
  			value &= 0x60;
-@@ -286,4 +292,6 @@
+@@ -285,5 +291,7 @@ main( int argc, char **argv ) {
+ 			valid_rates[value & 0x1f] / 10.0,
  			valid_delays[ (value & 0x60) >> 5 ] );
  
 +#endif
 +
  	return 0;
  }
---- kbd-1.12-orig/src/setleds.c	2006-07-08 05:10:08.000000000 -0500
-+++ kbd-1.12/src/setleds.c	2006-07-08 05:10:36.000000000 -0500
-@@ -14,10 +14,6 @@
- #include "nls.h"
- #include "version.h"
+diff -up kbd-1.12/man/man8/kbdrate.8.sparc kbd-1.12/man/man8/kbdrate.8
+--- kbd-1.12/man/man8/kbdrate.8.sparc	2002-10-11 13:08:58.000000000 +0200
++++ kbd-1.12/man/man8/kbdrate.8	2008-09-08 17:20:46.000000000 +0200
+@@ -22,7 +22,7 @@ Using
+ without any options will reset the repeat rate to 10.9 characters per second (cps)
+ and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems.
+ These are the IBM defaults. On SPARC-based systems it will reset the repeat rate
+-to 5 cps and the delay to 200 ms.
++to 20 cps and the delay to 200 ms.
  
--#ifdef __sparc__
--#include <asm/kbio.h>
--#endif
--
- static void
- usage(void)
- {
+ .SH OPTIONS
+ .TP
+@@ -69,3 +69,5 @@ When these ioctls fail an ioport interfa
+ .I /etc/rc.local
+ .br
+ .I /dev/port
++.br
++.I /dev/kbd

kbd-1.12-trq-map.patch:

Index: kbd-1.12-trq-map.patch
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd-1.12-trq-map.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kbd-1.12-trq-map.patch	26 Feb 2008 11:11:43 -0000	1.1
+++ kbd-1.12-trq-map.patch	18 Sep 2008 10:25:02 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up kbd-1.12/data/keymaps/i386/qwerty/trq.map_old kbd-1.12/data/keymaps/i386/qwerty/trq.map
---- kbd-1.12/data/keymaps/i386/qwerty/trq.map_old	2002-10-11 13:08:49.000000000 +0200
-+++ kbd-1.12/data/keymaps/i386/qwerty/trq.map	2008-02-26 12:04:16.000000000 +0100
+diff -up kbd-1.12/data/keymaps/i386/qwerty/trq.map.trq-map kbd-1.12/data/keymaps/i386/qwerty/trq.map
+--- kbd-1.12/data/keymaps/i386/qwerty/trq.map.trq-map	2002-10-11 13:08:49.000000000 +0200
++++ kbd-1.12/data/keymaps/i386/qwerty/trq.map	2008-09-18 12:23:33.000000000 +0200
 @@ -1,5 +1,5 @@
  charset "iso-8859-9"
 -keymaps 0-6,8-9,12


Index: kbd.spec
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kbd.spec	26 Feb 2008 11:11:43 -0000	1.54
+++ kbd.spec	18 Sep 2008 10:25:02 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
 Name: kbd
 Version: 1.12
-Release: 31%{?dist}
+Release: 32%{?dist}
 # Except possibly for the restrictions mentioned in the directory consolefonts
 License: GPL+
 Group: System Environment/Base
@@ -42,9 +42,9 @@
 %prep
 %setup -q -a 2 -a 3 -a 4 -a 5 -a 6
 %patch0 -p1 -b .sparc
-%patch1 -p1
+%patch1 -p1 -b .compose
 %patch2 -p1 -b .terminal
-%patch3 -p1
+%patch3 -p1 -b .rukbd
 %patch4 -p1 -b .man
 %patch5 -p1 -b .Meta_utf8
 %patch6 -p1 -b .nostrip
@@ -80,6 +80,11 @@
 CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
 ./configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir}
 
+make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-static"
+mv src/loadkeys src/loadkeys.static
+make clean
+./configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir}
+
 # Override CFLAGS because this configure ignores them anyway, and LDFLAGS
 # because it defaults to -s, but that's a build policy decision.
 make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
@@ -112,6 +117,9 @@
 # Link open to openvt
 ln -s openvt $RPM_BUILD_ROOT%{_bindir}/open
 
+# install static binary for mkinitrd to use
+install -c -m755 src/loadkeys.static $RPM_BUILD_ROOT/bin
+
 %find_lang %{name}
 
 %clean
@@ -129,6 +137,11 @@
 /lib/kbd
 
 %changelog
+* Mon Sep  8 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.12-32
+- Rediff all patches to work with patch --fuzz=0
+- Add static loadkeys
+  Related: #451672
+
 * Tue Feb 26 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.12-31
 - Fix trq.map
   Resolves: #216710



From pingou at fedoraproject.org  Thu Sep 18 10:25:55 2008
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu, 18 Sep 2008 10:25:55 +0000 (UTC)
Subject: rpms/R2spec/devel R2spec.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080918102555.1C2A8700D9@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R2spec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20764/devel

Modified Files:
	.cvsignore sources 
Added Files:
	R2spec.spec import.log 
Log Message:
First import of R2spec




--- NEW FILE R2spec.spec ---
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           R2spec
Version:        2.5.0
Release:        2%{?dist}
Summary:        Python script to generate R spec file

Group:          Development/Languages
License:        GPLv3+
URL:            https://fedorahosted.org/r2spec/
Source0:        https://fedorahosted.org/releases/r/2/r2spec/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       R

%description
This is a small python script that generates spec file for R libraries.
It can work from a URL or a tarball.

%prep
%setup -q

sed -i -e 's|topdir+"/SOURCE/"|topdir+"/SOURCES/"|' r2spec/Package.py

%build
python setup.py build

%install
rm -rf %{buildroot}
python setup.py install --root=%{buildroot} 
chmod +x %{buildroot}/%{python_sitelib}/r2spec/%{name}.py

rm -f  %{buildroot}/%{python_sitelib}/r2spec/__init__.py

%clean
rm -rf %{buildroot}

%files 
#-f installed_files2
%defattr(-,root,root,-)
%doc README LICENSE CHANGELOG
%{python_sitelib}/*
%config(noreplace) %{_sysconfdir}/%{name}.conf
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz

%changelog
* Sun Aug 31 2008 Pingou <pingou-at-pingoured.fr> 2.5.0-2
- Change Source0 to the correct one
- Correct a bug SOURCES != SOURCe
- Remove file __init__.py
- Change defattr(-,root,root) to defattr(-,root,root,-)

* Sun Aug 31 2008 Pingou <pingou-at-pingoured.fr> 2.5.0-1
- New upstream release

* Thu Aug 28 2008 Pingou <pingou-at-pingoured.fr> 2.4.2-1
- Update to version 2.4.2

* Wed Aug 20 2008 Pingou <pingou-at-pingoured.fr> 2.4.1-1
- Update to version 2.4.1

* Sun Aug 18 2008 Pingou <pingou-at-pingoured.fr> 2.4.0-1
- Update to version 2.4.0
- Addition of the spec into the sources

* Mon Aug 11 2008 Pingou <pingou-at-pingoured.fr> 2.3-2
- Change the source0 and url thanks to fedorahosted.org

* Sun Aug 10 2008 Pingou <pingou-at-pingoured.fr> 2.3-1
- Update to version 2.3

* Wed Jul 30 2008 Pingou <pingou-at-pingoured.fr> 2.2-1
- Update to version 2.2

* Wed Jul 30 2008 Pingou <pingou-at-pingoured.fr> 2.1-1
- Update to version 2.1

* Wed Jul 30 2008 Pingou <pingou-at-pingoured.fr> 2.0-1
- Update to version 2.0

* Tue Jul 29 2008 Pingou <pingou-at-pingoured.fr> 1.3-1
- First RPM for Fedora


--- NEW FILE import.log ---
R2spec-2_5_0-2_fc9:HEAD:R2spec-2.5.0-2.fc9.src.rpm:1221733448


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2008 03:39:47 -0000	1.1
+++ .cvsignore	18 Sep 2008 10:25:24 -0000	1.2
@@ -0,0 +1 @@
+R2spec-2.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 03:39:47 -0000	1.1
+++ sources	18 Sep 2008 10:25:24 -0000	1.2
@@ -0,0 +1 @@
+f2f23f668feb9ad81a5d9083d956c7de  R2spec-2.5.0.tar.gz



From pingou at fedoraproject.org  Thu Sep 18 10:42:42 2008
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu, 18 Sep 2008 10:42:42 +0000 (UTC)
Subject: rpms/R2spec/devel R2spec.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20080918104242.334F3700D9@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R2spec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22492/devel

Modified Files:
	R2spec.spec import.log 
Log Message:



Index: R2spec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/devel/R2spec.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- R2spec.spec	18 Sep 2008 10:25:24 -0000	1.1
+++ R2spec.spec	18 Sep 2008 10:42:11 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           R2spec
 Version:        2.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python script to generate R spec file
 
 Group:          Development/Languages
@@ -33,8 +33,6 @@
 python setup.py install --root=%{buildroot} 
 chmod +x %{buildroot}/%{python_sitelib}/r2spec/%{name}.py
 
-rm -f  %{buildroot}/%{python_sitelib}/r2spec/__init__.py
-
 %clean
 rm -rf %{buildroot}
 
@@ -48,6 +46,9 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sun Aug 31 2008 Pingou <pingou-at-pingoured.fr> 2.5.0-3
+- Bring __init__.py back :)
+
 * Sun Aug 31 2008 Pingou <pingou-at-pingoured.fr> 2.5.0-2
 - Change Source0 to the correct one
 - Correct a bug SOURCES != SOURCe


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Sep 2008 10:25:24 -0000	1.1
+++ import.log	18 Sep 2008 10:42:11 -0000	1.2
@@ -1 +1,2 @@
 R2spec-2_5_0-2_fc9:HEAD:R2spec-2.5.0-2.fc9.src.rpm:1221733448
+R2spec-2_5_0-3_fc9:HEAD:R2spec-2.5.0-3.fc9.src.rpm:1221734116



From pingou at fedoraproject.org  Thu Sep 18 10:46:04 2008
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu, 18 Sep 2008 10:46:04 +0000 (UTC)
Subject: rpms/R2spec/F-9 R2spec.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080918104604.69B96700D9@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R2spec/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23716/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	R2spec.spec import.log 
Log Message:



--- NEW FILE R2spec.spec ---
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           R2spec
Version:        2.5.0
Release:        3%{?dist}
Summary:        Python script to generate R spec file

Group:          Development/Languages
License:        GPLv3+
URL:            https://fedorahosted.org/r2spec/
Source0:        https://fedorahosted.org/releases/r/2/r2spec/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       R

%description
This is a small python script that generates spec file for R libraries.
It can work from a URL or a tarball.

%prep
%setup -q

sed -i -e 's|topdir+"/SOURCE/"|topdir+"/SOURCES/"|' r2spec/Package.py

%build
python setup.py build

%install
rm -rf %{buildroot}
python setup.py install --root=%{buildroot} 
chmod +x %{buildroot}/%{python_sitelib}/r2spec/%{name}.py

%clean
rm -rf %{buildroot}

%files 
#-f installed_files2
%defattr(-,root,root,-)
%doc README LICENSE CHANGELOG
%{python_sitelib}/*
%config(noreplace) %{_sysconfdir}/%{name}.conf
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz

%changelog
* Sun Aug 31 2008 Pingou <pingou-at-pingoured.fr> 2.5.0-3
- Bring __init__.py back :)

* Sun Aug 31 2008 Pingou <pingou-at-pingoured.fr> 2.5.0-2
- Change Source0 to the correct one
- Correct a bug SOURCES != SOURCe
- Remove file __init__.py
- Change defattr(-,root,root) to defattr(-,root,root,-)

* Sun Aug 31 2008 Pingou <pingou-at-pingoured.fr> 2.5.0-1
- New upstream release

* Thu Aug 28 2008 Pingou <pingou-at-pingoured.fr> 2.4.2-1
- Update to version 2.4.2

* Wed Aug 20 2008 Pingou <pingou-at-pingoured.fr> 2.4.1-1
- Update to version 2.4.1

* Sun Aug 18 2008 Pingou <pingou-at-pingoured.fr> 2.4.0-1
- Update to version 2.4.0
- Addition of the spec into the sources

* Mon Aug 11 2008 Pingou <pingou-at-pingoured.fr> 2.3-2
- Change the source0 and url thanks to fedorahosted.org

* Sun Aug 10 2008 Pingou <pingou-at-pingoured.fr> 2.3-1
- Update to version 2.3

* Wed Jul 30 2008 Pingou <pingou-at-pingoured.fr> 2.2-1
- Update to version 2.2

* Wed Jul 30 2008 Pingou <pingou-at-pingoured.fr> 2.1-1
- Update to version 2.1

* Wed Jul 30 2008 Pingou <pingou-at-pingoured.fr> 2.0-1
- Update to version 2.0

* Tue Jul 29 2008 Pingou <pingou-at-pingoured.fr> 1.3-1
- First RPM for Fedora


--- NEW FILE import.log ---
R2spec-2_5_0-3_fc9:F-9:R2spec-2.5.0-3.fc9.src.rpm:1221734679


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2008 03:39:47 -0000	1.1
+++ .cvsignore	18 Sep 2008 10:45:34 -0000	1.2
@@ -0,0 +1 @@
+R2spec-2.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 03:39:47 -0000	1.1
+++ sources	18 Sep 2008 10:45:34 -0000	1.2
@@ -0,0 +1 @@
+f2f23f668feb9ad81a5d9083d956c7de  R2spec-2.5.0.tar.gz



From pingou at fedoraproject.org  Thu Sep 18 10:57:18 2008
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu, 18 Sep 2008 10:57:18 +0000 (UTC)
Subject: rpms/R2spec/F-8 R2spec.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080918105718.C6F9A700D9@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R2spec/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24895/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	R2spec.spec import.log 
Log Message:



--- NEW FILE R2spec.spec ---
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           R2spec
Version:        2.5.0
Release:        3%{?dist}
Summary:        Python script to generate R spec file

Group:          Development/Languages
License:        GPLv3+
URL:            https://fedorahosted.org/r2spec/
Source0:        https://fedorahosted.org/releases/r/2/r2spec/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       R

%description
This is a small python script that generates spec file for R libraries.
It can work from a URL or a tarball.

%prep
%setup -q

sed -i -e 's|topdir+"/SOURCE/"|topdir+"/SOURCES/"|' r2spec/Package.py

%build
python setup.py build

%install
rm -rf %{buildroot}
python setup.py install --root=%{buildroot} 
chmod +x %{buildroot}/%{python_sitelib}/r2spec/%{name}.py

%clean
rm -rf %{buildroot}

%files 
#-f installed_files2
%defattr(-,root,root,-)
%doc README LICENSE CHANGELOG
%{python_sitelib}/*
%config(noreplace) %{_sysconfdir}/%{name}.conf
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz

%changelog
* Sun Aug 31 2008 Pingou <pingou-at-pingoured.fr> 2.5.0-3
- Bring __init__.py back :)

* Sun Aug 31 2008 Pingou <pingou-at-pingoured.fr> 2.5.0-2
- Change Source0 to the correct one
- Correct a bug SOURCES != SOURCe
- Remove file __init__.py
- Change defattr(-,root,root) to defattr(-,root,root,-)

* Sun Aug 31 2008 Pingou <pingou-at-pingoured.fr> 2.5.0-1
- New upstream release

* Thu Aug 28 2008 Pingou <pingou-at-pingoured.fr> 2.4.2-1
- Update to version 2.4.2

* Wed Aug 20 2008 Pingou <pingou-at-pingoured.fr> 2.4.1-1
- Update to version 2.4.1

* Sun Aug 18 2008 Pingou <pingou-at-pingoured.fr> 2.4.0-1
- Update to version 2.4.0
- Addition of the spec into the sources

* Mon Aug 11 2008 Pingou <pingou-at-pingoured.fr> 2.3-2
- Change the source0 and url thanks to fedorahosted.org

* Sun Aug 10 2008 Pingou <pingou-at-pingoured.fr> 2.3-1
- Update to version 2.3

* Wed Jul 30 2008 Pingou <pingou-at-pingoured.fr> 2.2-1
- Update to version 2.2

* Wed Jul 30 2008 Pingou <pingou-at-pingoured.fr> 2.1-1
- Update to version 2.1

* Wed Jul 30 2008 Pingou <pingou-at-pingoured.fr> 2.0-1
- Update to version 2.0

* Tue Jul 29 2008 Pingou <pingou-at-pingoured.fr> 1.3-1
- First RPM for Fedora


--- NEW FILE import.log ---
R2spec-2_5_0-3_fc9:F-8:R2spec-2.5.0-3.fc9.src.rpm:1221734958


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2008 03:39:47 -0000	1.1
+++ .cvsignore	18 Sep 2008 10:56:48 -0000	1.2
@@ -0,0 +1 @@
+R2spec-2.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 03:39:47 -0000	1.1
+++ sources	18 Sep 2008 10:56:48 -0000	1.2
@@ -0,0 +1 @@
+f2f23f668feb9ad81a5d9083d956c7de  R2spec-2.5.0.tar.gz



From pingou at fedoraproject.org  Thu Sep 18 11:00:52 2008
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu, 18 Sep 2008 11:00:52 +0000 (UTC)
Subject: rpms/R2spec/EL-4 R2spec.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080918110052.90C95700D9@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R2spec/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25827/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	R2spec.spec import.log 
Log Message:



--- NEW FILE R2spec.spec ---
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           R2spec
Version:        2.5.0
Release:        3%{?dist}
Summary:        Python script to generate R spec file

Group:          Development/Languages
License:        GPLv3+
URL:            https://fedorahosted.org/r2spec/
Source0:        https://fedorahosted.org/releases/r/2/r2spec/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       R

%description
This is a small python script that generates spec file for R libraries.
It can work from a URL or a tarball.

%prep
%setup -q

sed -i -e 's|topdir+"/SOURCE/"|topdir+"/SOURCES/"|' r2spec/Package.py

%build
python setup.py build

%install
rm -rf %{buildroot}
python setup.py install --root=%{buildroot} 
chmod +x %{buildroot}/%{python_sitelib}/r2spec/%{name}.py

%clean
rm -rf %{buildroot}

%files 
#-f installed_files2
%defattr(-,root,root,-)
%doc README LICENSE CHANGELOG
%{python_sitelib}/*
%config(noreplace) %{_sysconfdir}/%{name}.conf
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz

%changelog
* Sun Aug 31 2008 Pingou <pingou-at-pingoured.fr> 2.5.0-3
- Bring __init__.py back :)

* Sun Aug 31 2008 Pingou <pingou-at-pingoured.fr> 2.5.0-2
- Change Source0 to the correct one
- Correct a bug SOURCES != SOURCe
- Remove file __init__.py
- Change defattr(-,root,root) to defattr(-,root,root,-)

* Sun Aug 31 2008 Pingou <pingou-at-pingoured.fr> 2.5.0-1
- New upstream release

* Thu Aug 28 2008 Pingou <pingou-at-pingoured.fr> 2.4.2-1
- Update to version 2.4.2

* Wed Aug 20 2008 Pingou <pingou-at-pingoured.fr> 2.4.1-1
- Update to version 2.4.1

* Sun Aug 18 2008 Pingou <pingou-at-pingoured.fr> 2.4.0-1
- Update to version 2.4.0
- Addition of the spec into the sources

* Mon Aug 11 2008 Pingou <pingou-at-pingoured.fr> 2.3-2
- Change the source0 and url thanks to fedorahosted.org

* Sun Aug 10 2008 Pingou <pingou-at-pingoured.fr> 2.3-1
- Update to version 2.3

* Wed Jul 30 2008 Pingou <pingou-at-pingoured.fr> 2.2-1
- Update to version 2.2

* Wed Jul 30 2008 Pingou <pingou-at-pingoured.fr> 2.1-1
- Update to version 2.1

* Wed Jul 30 2008 Pingou <pingou-at-pingoured.fr> 2.0-1
- Update to version 2.0

* Tue Jul 29 2008 Pingou <pingou-at-pingoured.fr> 1.3-1
- First RPM for Fedora


--- NEW FILE import.log ---
R2spec-2_5_0-3_fc9:EL-4:R2spec-2.5.0-3.fc9.src.rpm:1221735542


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2008 03:39:47 -0000	1.1
+++ .cvsignore	18 Sep 2008 11:00:22 -0000	1.2
@@ -0,0 +1 @@
+R2spec-2.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 03:39:47 -0000	1.1
+++ sources	18 Sep 2008 11:00:22 -0000	1.2
@@ -0,0 +1 @@
+f2f23f668feb9ad81a5d9083d956c7de  R2spec-2.5.0.tar.gz



From pingou at fedoraproject.org  Thu Sep 18 11:04:49 2008
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu, 18 Sep 2008 11:04:49 +0000 (UTC)
Subject: rpms/R2spec/EL-5 R2spec.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080918110449.58CF1700D9@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R2spec/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26598/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	R2spec.spec import.log 
Log Message:



--- NEW FILE R2spec.spec ---
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           R2spec
Version:        2.5.0
Release:        3%{?dist}
Summary:        Python script to generate R spec file

Group:          Development/Languages
License:        GPLv3+
URL:            https://fedorahosted.org/r2spec/
Source0:        https://fedorahosted.org/releases/r/2/r2spec/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       R

%description
This is a small python script that generates spec file for R libraries.
It can work from a URL or a tarball.

%prep
%setup -q

sed -i -e 's|topdir+"/SOURCE/"|topdir+"/SOURCES/"|' r2spec/Package.py

%build
python setup.py build

%install
rm -rf %{buildroot}
python setup.py install --root=%{buildroot} 
chmod +x %{buildroot}/%{python_sitelib}/r2spec/%{name}.py

%clean
rm -rf %{buildroot}

%files 
#-f installed_files2
%defattr(-,root,root,-)
%doc README LICENSE CHANGELOG
%{python_sitelib}/*
%config(noreplace) %{_sysconfdir}/%{name}.conf
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz

%changelog
* Sun Aug 31 2008 Pingou <pingou-at-pingoured.fr> 2.5.0-3
- Bring __init__.py back :)

* Sun Aug 31 2008 Pingou <pingou-at-pingoured.fr> 2.5.0-2
- Change Source0 to the correct one
- Correct a bug SOURCES != SOURCe
- Remove file __init__.py
- Change defattr(-,root,root) to defattr(-,root,root,-)

* Sun Aug 31 2008 Pingou <pingou-at-pingoured.fr> 2.5.0-1
- New upstream release

* Thu Aug 28 2008 Pingou <pingou-at-pingoured.fr> 2.4.2-1
- Update to version 2.4.2

* Wed Aug 20 2008 Pingou <pingou-at-pingoured.fr> 2.4.1-1
- Update to version 2.4.1

* Sun Aug 18 2008 Pingou <pingou-at-pingoured.fr> 2.4.0-1
- Update to version 2.4.0
- Addition of the spec into the sources

* Mon Aug 11 2008 Pingou <pingou-at-pingoured.fr> 2.3-2
- Change the source0 and url thanks to fedorahosted.org

* Sun Aug 10 2008 Pingou <pingou-at-pingoured.fr> 2.3-1
- Update to version 2.3

* Wed Jul 30 2008 Pingou <pingou-at-pingoured.fr> 2.2-1
- Update to version 2.2

* Wed Jul 30 2008 Pingou <pingou-at-pingoured.fr> 2.1-1
- Update to version 2.1

* Wed Jul 30 2008 Pingou <pingou-at-pingoured.fr> 2.0-1
- Update to version 2.0

* Tue Jul 29 2008 Pingou <pingou-at-pingoured.fr> 1.3-1
- First RPM for Fedora


--- NEW FILE import.log ---
R2spec-2_5_0-3_fc9:EL-5:R2spec-2.5.0-3.fc9.src.rpm:1221735748


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2008 03:39:47 -0000	1.1
+++ .cvsignore	18 Sep 2008 11:04:18 -0000	1.2
@@ -0,0 +1 @@
+R2spec-2.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 03:39:47 -0000	1.1
+++ sources	18 Sep 2008 11:04:18 -0000	1.2
@@ -0,0 +1 @@
+f2f23f668feb9ad81a5d9083d956c7de  R2spec-2.5.0.tar.gz



From mmaslano at fedoraproject.org  Thu Sep 18 11:08:56 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 18 Sep 2008 11:08:56 +0000 (UTC)
Subject: rpms/cronie/devel cronie.spec,1.10,1.11
Message-ID: <20080918110856.B377E700D9@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/cronie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27414

Modified Files:
	cronie.spec 
Log Message:
* Thu Sep 18 2008 Marcela Maslanova <mmaslano at redhat.com> - 1.2-2
- 462252  /etc/sysconfig/crond does not need to be executable 



Index: cronie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/cronie.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cronie.spec	26 Jun 2008 14:07:20 -0000	1.10
+++ cronie.spec	18 Sep 2008 11:08:25 -0000	1.11
@@ -6,7 +6,7 @@
 Summary: Cron daemon for executing programs at set times
 Name: cronie
 Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT and BSD
 Group: System Environment/Base
 URL: https://fedorahosted.org/cronie
@@ -76,7 +76,7 @@
     rm -f $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/crond
 %endif
 install -m 755 cronie.init $RPM_BUILD_ROOT%{_initrddir}/crond
-install -m 755 crond.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/crond
+install -m 644 crond.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/crond
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cron.deny
 
 %clean
@@ -125,6 +125,9 @@
 %config(noreplace) %{_sysconfdir}/cron.deny
 
 %changelog
+* Thu Sep 18 2008 Marcela Maslanova <mmaslano at redhat.com> - 1.2-2
+- 462252  /etc/sysconfig/crond does not need to be executable 
+
 * Thu Jun 26 2008 Marcela Maslanova <mmaslano at redhat.com> - 1.2-1
 - update to 1.2
 



From mmaslano at fedoraproject.org  Thu Sep 18 11:32:41 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 18 Sep 2008 11:32:41 +0000 (UTC)
Subject: rpms/perl-PDL/devel perl-PDL-2.4.3-missingfnc.patch, NONE,
	1.1 perl-PDL.spec, 1.45, 1.46
Message-ID: <20080918113241.A61E9700D9@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-PDL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29930

Modified Files:
	perl-PDL.spec 
Added Files:
	perl-PDL-2.4.3-missingfnc.patch 
Log Message:
* Thu Sep 18 2008 Marcela Maslanova <mmaslano at redhat.com> - 2.4.3-14
- 461803 Missing Functions from PDL::Graphics::PLplot


perl-PDL-2.4.3-missingfnc.patch:

--- NEW FILE perl-PDL-2.4.3-missingfnc.patch ---
--- PDL-2.4.3-orig/Graphics/PLplot/plplot.pd	2005-05-03 07:19:47.000000000 -0700
+++ PDL-2.4.3/Graphics/PLplot/plplot.pd	2008-09-10 09:54:41.000000000 -0700
@@ -1932,6 +1932,8 @@
 void c_plgpage(PLFLT *p_xp, PLFLT *p_yp,PLINT *p_xleng, PLINT *p_yleng, PLINT *p_xoff, PLINT *p_yoff);
 void c_plgra(void);
 void c_plgspa(PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax);
+void c_plgvpd(PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax);
+void c_plgvpw(PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax);
 #void c_plgstrm(PLINT *p_strm);
 #void c_plgver(char *p_ver);
 void c_plgxax(PLINT *p_digmax, PLINT *p_digits);



Index: perl-PDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- perl-PDL.spec	4 Sep 2008 21:26:46 -0000	1.45
+++ perl-PDL.spec	18 Sep 2008 11:32:11 -0000	1.46
@@ -1,6 +1,6 @@
 Name:           perl-PDL
 Version:        2.4.3
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        The Perl Data Language
 
 Group:          Development/Libraries
@@ -21,6 +21,7 @@
 Patch11:        perl-PDL-2.4.3-noDISPLAY.patch
 #See http://sourceforge.net/tracker/index.php?func=detail&aid=2093833&group_id=612&atid=300612
 Patch12:        perl-PDL-2.4.3-plparseopts.patch
+Patch13:        perl-PDL-2.4.3-missingfnc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1
@@ -68,6 +69,7 @@
 %patch10 -p1 -b .perl510
 %patch11 -p1 -b .noDISPLAY
 %patch12 -p1 -b .plparseopts
+%patch13 -p1 -b .missingfnc
 
 # Provides: explicitly filter perl(Inline)
 cat <<__EOF__ > %{name}-findperlprovides
@@ -153,6 +155,9 @@
 
 
 %changelog
+* Thu Sep 18 2008 Marcela Maslanova <mmaslano at redhat.com> - 2.4.3-14
+- 461803 Missing Functions from PDL::Graphics::PLplot
+
 * Thu Sep 04 2008 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-13
 - Add patch to add plparseopts function
 - Update URL



From nigelj at fedoraproject.org  Thu Sep 18 11:34:06 2008
From: nigelj at fedoraproject.org (Nigel Jones)
Date: Thu, 18 Sep 2008 11:34:06 +0000 (UTC)
Subject: rpms/gtk-sharp2/devel .cvsignore, 1.11, 1.12 gtk-sharp2.spec, 1.33, 
	1.34 sources, 1.11, 1.12
Message-ID: <20080918113406.750C8700D9@cvs1.fedora.phx.redhat.com>

Author: nigelj

Update of /cvs/pkgs/rpms/gtk-sharp2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29840

Modified Files:
	.cvsignore gtk-sharp2.spec sources 
Log Message:
Update to 2.12.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-sharp2/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Jul 2008 17:17:30 -0000	1.11
+++ .cvsignore	18 Sep 2008 11:33:36 -0000	1.12
@@ -1 +1 @@
-gtk-sharp-2.12.1.tar.bz2
+gtk-sharp-2.12.3.tar.bz2


Index: gtk-sharp2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-sharp2/devel/gtk-sharp2.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gtk-sharp2.spec	14 Jul 2008 11:56:44 -0000	1.33
+++ gtk-sharp2.spec	18 Sep 2008 11:33:36 -0000	1.34
@@ -1,6 +1,6 @@
 Name:           gtk-sharp2
-Version:        2.12.1
-Release:        3%{?dist}
+Version:        2.12.3
+Release:        1%{?dist}
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -36,7 +36,7 @@
 
 %description gapi
 This package provides developer tools for the creation and
-maintainance of managed bindings to native libraries which utilize
+maintenance of managed bindings to native libraries which utilize
 glib and GObject. Some examples of libraries currently bound using
 the GAPI tools and found in Gtk# include Gtk, Atk, Pango, Gdk.
 
@@ -128,6 +128,9 @@
 %{_libdir}/monodoc
 
 %changelog
+* Thu Sep 18 2008 Nigel Jones <dev at nigelj.com> - 2.12.3-1
+- New minor release (.3)
+
 * Mon Jul 14 2008 Xavier Lamien <lxtnow[at]gmail.com> - 2.12.1-3
 - Fix/Update libdir on GACUTIL & monodoc.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-sharp2/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	13 Jul 2008 17:17:30 -0000	1.11
+++ sources	18 Sep 2008 11:33:36 -0000	1.12
@@ -1 +1 @@
-b769fabc114fa9201c4e085ae36a8540  gtk-sharp-2.12.1.tar.bz2
+97b802421fbf916de018dabda2785745  gtk-sharp-2.12.3.tar.bz2



From steved at fedoraproject.org  Thu Sep 18 11:49:49 2008
From: steved at fedoraproject.org (Steve Dickson)
Date: Thu, 18 Sep 2008 11:49:49 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils.spec, 1.187, 1.188 nfs.init, 1.29,
	1.30 nfs.sysconfig, 1.4, 1.5
Message-ID: <20080918114949.CEF40700D9@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32199

Modified Files:
	nfs-utils.spec nfs.init nfs.sysconfig 
Log Message:
Pre-load nfsd when args to rpc.nfsd are given (bz 441983)



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- nfs-utils.spec	16 Sep 2008 20:29:11 -0000	1.187
+++ nfs-utils.spec	18 Sep 2008 11:49:19 -0000	1.188
@@ -265,9 +265,10 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
-* Tue Sep 16 2008 Steve Dickson <steved at redhat.com> 1.1.3-5
+* Thu Sep 18 2008 Steve Dickson <steved at redhat.com> 1.1.3-5
 - Reworked init scripts so service will be able to
   stop when some of the checks fail. (bz 462508)
+- Pre-load nfsd when args to rpc.nfsd are given (bz 441983)
 
 * Thu Aug 28 2008 Steve Dickson <steved at redhat.com> 1.1.3-4
 - Added in a number of up upstream patches (101 thru 110).


Index: nfs.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs.init,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- nfs.init	16 Sep 2008 20:29:11 -0000	1.29
+++ nfs.init	18 Sep 2008 11:49:19 -0000	1.30
@@ -73,6 +73,12 @@
 		RETVAL=$?
 	    echo
 	fi
+
+	# Load preload module so arguments to rpc.nfsd will take effect
+	[ -n "$RPCNFSDARGS" -a "$NFSD_MODULE" != "noload" ] && {
+		[ -x /sbin/modprobe ] && /sbin/modprobe nfsd
+	}
+
 	echo -n $"Starting NFS daemon: "
 	daemon rpc.nfsd $RPCNFSDARGS $RPCNFSDCOUNT
 	RETVAL=$?


Index: nfs.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs.sysconfig,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nfs.sysconfig	25 Apr 2008 15:39:48 -0000	1.4
+++ nfs.sysconfig	18 Sep 2008 11:49:19 -0000	1.5
@@ -31,6 +31,8 @@
 # Number of nfs server processes to be started.
 # The default is 8. 
 #RPCNFSDCOUNT=8
+# Stop the nfsd module from being pre-loaded
+#NFSD_MODULE="noload"
 #
 #
 # Optional arguments passed to rpc.mountd. See rpc.mountd(8)



From rjones at fedoraproject.org  Thu Sep 18 11:50:29 2008
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 18 Sep 2008 11:50:29 +0000 (UTC)
Subject: rpms/ocaml-lablgtk/devel ocaml-lablgtk.spec,1.9,1.10
Message-ID: <20080918115029.1A66D700D9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-lablgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32339

Modified Files:
	ocaml-lablgtk.spec 
Log Message:
* Thu Sep 18 2008 Richard W.M. Jones <rjones at redhat.com> - 2.10.1-4
- Add missing BR for gtksourceview-devel (rhbz#462651).



Index: ocaml-lablgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lablgtk/devel/ocaml-lablgtk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ocaml-lablgtk.spec	11 Aug 2008 20:51:30 -0000	1.9
+++ ocaml-lablgtk.spec	18 Sep 2008 11:49:58 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           ocaml-lablgtk
 Version:        2.10.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
@@ -30,6 +30,7 @@
 BuildRequires:  ocaml-lablgl-devel >= 1.03
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  zlib-devel
+BuildRequires:  gtksourceview-devel
 
 
 %define _use_internal_dependency_generator 0
@@ -147,6 +148,9 @@
 
 
 %changelog
+* Thu Sep 18 2008 Richard W.M. Jones <rjones at redhat.com> - 2.10.1-4
+- Add missing BR for gtksourceview-devel (rhbz#462651).
+
 * Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.10.1-3
 - fix license tag
 



From pertusus at fedoraproject.org  Thu Sep 18 11:54:04 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Thu, 18 Sep 2008 11:54:04 +0000 (UTC)
Subject: rpms/fcron/devel fcron-3.0.4-dist_install.patch, NONE,
	1.1 .cvsignore, 
	1.4, 1.5 fcron.LISEZMOI, 1.2, 1.3 fcron.README, 1.2,
	1.3 fcron.spec, 1.13, 1.14 sources, 1.4, 1.5
Message-ID: <20080918115404.297BD700D9@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/fcron/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv435

Modified Files:
	.cvsignore fcron.LISEZMOI fcron.README fcron.spec sources 
Added Files:
	fcron-3.0.4-dist_install.patch 
Log Message:
* Thu Sep 18 2008 Patrice Dumas <pertusus[AT]free[DOT]fr> 3.0.4-1
  - update to 3.0.4


fcron-3.0.4-dist_install.patch:

--- NEW FILE fcron-3.0.4-dist_install.patch ---
diff -up fcron-3.0.4/Makefile.in.dist_install fcron-3.0.4/Makefile.in
--- fcron-3.0.4/Makefile.in.dist_install	2007-11-08 10:02:41.000000000 +0100
+++ fcron-3.0.4/Makefile.in	2008-09-18 12:44:47.000000000 +0200
@@ -131,11 +131,6 @@ endif
 
 install-staged: all
 
-# needed by boot-install script :
-	echo `fcron -V 2>&1 | grep "^fcron "` > PREVIOUS_VERSION && chmod a+rw PREVIOUS_VERSION
-
-	$(SRCDIR)/script/user-group $(USERNAME) $(GROUPNAME) $(ANSWERALL) $(SRCDIR)
-
 # check if the directories we use exist, and if not, create them
 	if test ! -d $(DESTDIR)$(DESTSBIN); then $(INSTALL) -m 755 -d $(DESTDIR)$(DESTSBIN) ; fi
 	if test ! -d $(DESTDIR)$(DESTBIN); then $(INSTALL) -m 755 -d $(DESTDIR)$(DESTBIN) ; fi
@@ -153,6 +148,10 @@ ifeq ($(FCRONDYN), 1)
 endif
 	if test ! -f $(DESTDIR)$(ETC)/fcron.allow -a ! -f $(DESTDIR)$(ETC)/fcron.deny ; then $(INSTALL) -m 644 $(SRCDIR)/files/fcron.allow $(DESTDIR)$(ETC) ; $(INSTALL) -m 644 $(SRCDIR)/files/fcron.deny $(DESTDIR)$(ETC) ; fi
 	test -f $(DESTDIR)$(ETC)/fcron.conf || $(INSTALL) -m 644 $(SRCDIR)/files/fcron.conf $(DESTDIR)$(ETC)
+# We are using PAM, so, install relevent files
+	$(INSTALL) -m 755 -d $(DESTDIR)$(ETC)/pam.d
+	$(INSTALL) -m 644 files/fcron.pam $(DESTDIR)$(ETC)/pam.d/fcron
+	$(INSTALL) -m 644 files/fcrontab.pam $(DESTDIR)$(ETC)/pam.d/fcrontab
 
 	make -C doc install-staged
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fcron/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Jul 2007 13:10:52 -0000	1.4
+++ .cvsignore	18 Sep 2008 11:53:33 -0000	1.5
@@ -1 +1 @@
-fcron-3.0.3.src.tar.gz
+fcron-3.0.4.src.tar.gz


Index: fcron.LISEZMOI
===================================================================
RCS file: /cvs/extras/rpms/fcron/devel/fcron.LISEZMOI,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fcron.LISEZMOI	12 Oct 2006 07:46:24 -0000	1.2
+++ fcron.LISEZMOI	18 Sep 2008 11:53:33 -0000	1.3
@@ -3,7 +3,7 @@
 
   chkconfig --level 2345 fcron on
 
-Vous pouvez souhaiter utiliser les crontabs fournies par le paquet Fedora
+Vous pouvez souhaiter utiliser les crontabs fournies par le paquet
 ?? crontabs ??. C'est possible, fcron reconnait le format de ces crontabs.
 Dans ce cas, en mode super utilisateur, il vous suffit de taper la commande :
 


Index: fcron.README
===================================================================
RCS file: /cvs/extras/rpms/fcron/devel/fcron.README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fcron.README	12 Oct 2006 07:46:24 -0000	1.2
+++ fcron.README	18 Sep 2008 11:53:33 -0000	1.3
@@ -2,7 +2,7 @@
 
   chkconfig --level 2345 fcron on
 
-You can use crontabs provided by the Fedora package "crontabs", fcron knows
+You can use crontabs provided by the package "crontabs", fcron knows
 how to deal with this format. As superuser, enter the following command:
 
   fcrontab /etc/crontab


Index: fcron.spec
===================================================================
RCS file: /cvs/extras/rpms/fcron/devel/fcron.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fcron.spec	19 Feb 2008 01:35:20 -0000	1.13
+++ fcron.spec	18 Sep 2008 11:53:33 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		fcron
-Version:	3.0.3
-Release:	4%{?dist}
+Version:	3.0.4
+Release:	1%{?dist}
 Summary:	A task scheduler
 Summary(fr):	Un ordonnanceur de t??ches
 Summary(it):	Uno schedulatore di processi
@@ -11,7 +11,7 @@
 Source0:	http://fcron.free.fr/archives/%{name}-%{version}.src.tar.gz
 Source1:	fcron.README
 Source2:	fcron.LISEZMOI
-Patch0:		fcron-3.0.3-Makefile.in.fedora_install.patch
+Patch0:		fcron-3.0.4-dist_install.patch
 #Patch1:		fcron-3.0.1-doc_Makefile.in.fedora_install.patch
 #Patch2:		fcron-3.0.1-configure.fedora.patch
 Patch3:		fcron-3.0.2-accept_readable_fcron.conf.patch
@@ -27,9 +27,9 @@
 BuildRequires:	/usr/sbin/sendmail
 BuildRequires:	vim-minimal
 
-Requires(pre):    /usr/sbin/useradd
-Requires(post):   /sbin/chkconfig, /sbin/service
-Requires(preun):  /sbin/chkconfig, /sbin/service
+Requires(pre):		/usr/sbin/useradd
+Requires(post):		/sbin/chkconfig, /sbin/service
+Requires(preun):	/sbin/chkconfig, /sbin/service
 
 %description
 Fcron is a scheduler. It aims at replacing Vixie Cron, so it implements most
@@ -79,15 +79,21 @@
 
 %setup -q
 
-%{__install} -pm 644 %{SOURCE1} README.Fedora
-%{__install} -pm 644 %{SOURCE2} LISEZMOI.Fedora
+%{__install} -pm 644 %{SOURCE1} README.Dist
+%{__install} -pm 644 %{SOURCE2} LISEZMOI.Dist
 
-%patch0 -p0
+%patch0 -p1 -b .dist_install
 #%patch1 -p0
 #%patch2 -p0
-%patch3 -p0
+%patch3 -p0 -b .accept_readable_fcron
 #%patch4 -p0
 
+for file in doc/en/txt/*.txt; do
+ iconv -f latin1 -t utf8 < $file > $file.new
+ touch -c -r $file $file.new
+ mv $file.new $file
+done
+
 %build
 
 %configure --with-boot-install=no
@@ -164,7 +170,7 @@
 %files
 %defattr(-,root,root,-)
 %doc doc/en/HTML/ doc/fr/HTML-fr/ doc/en/txt/*
-%doc README.Fedora LISEZMOI.Fedora
+%doc README.Dist LISEZMOI.Dist
 %{_initrddir}/fcron
 %config(noreplace) %{_sysconfdir}/fcron.conf
 %config(noreplace) %{_sysconfdir}/fcron.allow
@@ -186,6 +192,9 @@
 %ghost %{_localstatedir}/run/fcron.pid
 
 %changelog
+* Thu Sep 18 2008 Patrice Dumas <pertusus[AT]free[DOT]fr> 3.0.4-1
+  - update to 3.0.4
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.0.3-4
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fcron/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Jul 2007 13:10:52 -0000	1.4
+++ sources	18 Sep 2008 11:53:33 -0000	1.5
@@ -1 +1 @@
-c85e6eecd0564f37658ae250a491fd31  fcron-3.0.3.src.tar.gz
+5a26a1dfd91fdc7e87401e98aef870e6  fcron-3.0.4.src.tar.gz



From mmaslano at fedoraproject.org  Thu Sep 18 12:09:19 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 18 Sep 2008 12:09:19 +0000 (UTC)
Subject: rpms/perl-libwww-perl/devel .cvsignore, 1.10,
	1.11 perl-libwww-perl.spec, 1.25, 1.26 sources, 1.10, 1.11
Message-ID: <20080918120919.C6B32700D9@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-libwww-perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2154

Modified Files:
	.cvsignore perl-libwww-perl.spec sources 
Log Message:
* Thu Sep 18 2008 Marcela Maslanova <mmaslano at redhat.com> 5.814-1
- update to 5.814
- remove patch, now we have all upstream tests on



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	14 Aug 2007 01:34:46 -0000	1.10
+++ .cvsignore	18 Sep 2008 12:08:49 -0000	1.11
@@ -1 +1 @@
-libwww-perl-5.808.tar.gz
+libwww-perl-5.814.tar.gz


Index: perl-libwww-perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/devel/perl-libwww-perl.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- perl-libwww-perl.spec	7 Mar 2008 11:09:44 -0000	1.25
+++ perl-libwww-perl.spec	18 Sep 2008 12:08:49 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           perl-libwww-perl
-Version:        5.808
-Release:        7%{?dist}
+Version:        5.814
+Release:        1%{?dist}
 Summary:        A Perl interface to the World-Wide Web
 
 Group:          Development/Libraries
@@ -13,7 +13,7 @@
 # previous versions just skipped all the tests, I don't feel so bad
 # about being lazy and skipping these instead of figuring out why they
 # fail in mock and not on my box.
-Patch0:         perl-libwww-perl-5.808-skip-message-tests.patch
+Patch1:         perl-libwww-perl-5.808-skip-message-tests.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -35,7 +35,7 @@
 
 %prep
 %setup -q -n libwww-perl-%{version} 
-%patch0 -p1
+##%patch1 -p1
 
 # Install the aliases by default
 %{__perl} -pi -e 's|my \$default = "n";|my \$default = "y";|' Makefile.PL
@@ -114,6 +114,10 @@
 
 
 %changelog
+* Thu Sep 18 2008 Marcela Maslanova <mmaslano at redhat.com> 5.814-1
+- update to 5.814
+- remove patch, now we have all upstream tests on
+
 * Fri Mar  7 2008 Ville Skytt?? <ville.skytta at iki.fi> - 5.808-7
 - Use system /etc/mime.types instead of an outdated private copy.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	14 Aug 2007 01:34:46 -0000	1.10
+++ sources	18 Sep 2008 12:08:49 -0000	1.11
@@ -1 +1 @@
-72120d9195ab1649c2d787eb1102a90c  libwww-perl-5.808.tar.gz
+0b21861950566570a061b0d57ac03009  libwww-perl-5.814.tar.gz



From mtasaka at fedoraproject.org  Thu Sep 18 12:12:20 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 18 Sep 2008 12:12:20 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-8 ruby-gnome2-0.17.0-bz456816.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 ruby-gnome2.spec, 1.22, 1.23 sources,
	1.3, 1.4
Message-ID: <20080918121220.0C165700D9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2791/F-8

Modified Files:
	.cvsignore ruby-gnome2.spec sources 
Added Files:
	ruby-gnome2-0.17.0-bz456816.patch 
Log Message:
F-8/9: sync to devel to fix bz456816

ruby-gnome2-0.17.0-bz456816.patch:

--- NEW FILE ruby-gnome2-0.17.0-bz456816.patch ---
Index: glib/src/rbglib_maincontext.c
===================================================================
--- glib/src/rbglib_maincontext.c	(revision 3283)
+++ glib/src/rbglib_maincontext.c	(working copy)
@@ -753,6 +753,14 @@
 }
 #endif
 
+#ifndef HAVE_RB_THREAD_BLOCKING_REGION
+static void
+ruby_source_remove(VALUE tag)
+{
+    g_source_remove(NUM2UINT(tag));
+}
+#endif
+
 void
 Init_glib_main_context()
 {
@@ -831,7 +839,7 @@
         source = ruby_source_new();
         tag = g_source_attach(source, NULL);
         g_source_unref(source);
-        rb_set_end_proc((void (*)(VALUE))g_source_remove, (VALUE)tag);
+        rb_set_end_proc(ruby_source_remove, UINT2NUM(tag));
     }
 #endif
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Jun 2008 13:14:16 -0000	1.3
+++ .cvsignore	18 Sep 2008 12:11:49 -0000	1.4
@@ -1 +1 @@
-ruby-gnome2-0.17.0-rc1.tar.gz
+ruby-gnome2-all-0.17.0.tar.gz


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-8/ruby-gnome2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ruby-gnome2.spec	16 Jul 2008 01:32:37 -0000	1.22
+++ ruby-gnome2.spec	18 Sep 2008 12:11:49 -0000	1.23
@@ -2,7 +2,6 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 %define         xulrunner_still_beta   1
-%define         betaver                rc1
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -11,16 +10,20 @@
 
 Name:           ruby-gnome2
 Version:        0.17.0
-Release:        0.3.%{betaver}%{?dist}
+Release:        1.%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
 
 License:        LGPLv2
 URL:            http://ruby-gnome2.sourceforge.jp/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?betaver:-%betaver}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
 Patch14:        ruby-gnome2-all-0.16.0-xulrunner.patch
+# Already in upstream svn
+# Fix bug 456816
+# http://lists.sourceforge.jp/mailman/archives/kazehakase-devel/2008-September/002846.html
+Patch15:        ruby-gnome2-0.17.0-bz456816.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -289,9 +292,9 @@
 BuildRequires:  ruby ruby-devel gtk2-devel pango-devel 
 
 %if 0%{?fedora} > 8
-BuildRequires:  gecko-devel = 1.9
-BuildRequires:  gecko-devel-unstable = 1.9
-Requires:       gecko-libs = 1.9
+BuildRequires:  gecko-devel >= 1.9
+BuildRequires:  gecko-devel-unstable >= 1.9
+Requires:       gecko-libs >= 1.9
 %endif
 
 %if 0%{?fedora} == 8
@@ -482,11 +485,12 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?betaver:-%betaver}
+%setup -q -n %{name}-all-%{version}
 %patch0 -p1
 %if 0%{?fedora} >= 9
 %patch14 -p1 -b .xulrunner
 %endif
+%patch15 -p0 -b .bz456816
 
 # Fix the attributes of some files
 # suppress lots of messages..
@@ -696,6 +700,10 @@
 
 
 %changelog
+* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.17.0-1
+- Update to 0.17.0
+- Patch from svn to fix Ruby/GLib bug (bug 456816)
+
 * Tue Jul 15 2008 Christopher Aillon <caillon at redhat.com> - 0.17.0-0.3.rc1
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Jun 2008 13:14:16 -0000	1.3
+++ sources	18 Sep 2008 12:11:49 -0000	1.4
@@ -1 +1 @@
-6d04af04c8674b0a88ce47e09dd26a76  ruby-gnome2-0.17.0-rc1.tar.gz
+cc54338888c487055670ee2898391caf  ruby-gnome2-all-0.17.0.tar.gz



From mtasaka at fedoraproject.org  Thu Sep 18 12:12:20 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 18 Sep 2008 12:12:20 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-9 ruby-gnome2-0.17.0-bz456816.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 ruby-gnome2.spec, 1.28, 1.29 sources,
	1.3, 1.4
Message-ID: <20080918121220.479D1700D9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2791/F-9

Modified Files:
	.cvsignore ruby-gnome2.spec sources 
Added Files:
	ruby-gnome2-0.17.0-bz456816.patch 
Log Message:
F-8/9: sync to devel to fix bz456816

ruby-gnome2-0.17.0-bz456816.patch:

--- NEW FILE ruby-gnome2-0.17.0-bz456816.patch ---
Index: glib/src/rbglib_maincontext.c
===================================================================
--- glib/src/rbglib_maincontext.c	(revision 3283)
+++ glib/src/rbglib_maincontext.c	(working copy)
@@ -753,6 +753,14 @@
 }
 #endif
 
+#ifndef HAVE_RB_THREAD_BLOCKING_REGION
+static void
+ruby_source_remove(VALUE tag)
+{
+    g_source_remove(NUM2UINT(tag));
+}
+#endif
+
 void
 Init_glib_main_context()
 {
@@ -831,7 +839,7 @@
         source = ruby_source_new();
         tag = g_source_attach(source, NULL);
         g_source_unref(source);
-        rb_set_end_proc((void (*)(VALUE))g_source_remove, (VALUE)tag);
+        rb_set_end_proc(ruby_source_remove, UINT2NUM(tag));
     }
 #endif
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Jun 2008 13:07:41 -0000	1.3
+++ .cvsignore	18 Sep 2008 12:11:49 -0000	1.4
@@ -1 +1 @@
-ruby-gnome2-0.17.0-rc1.tar.gz
+ruby-gnome2-all-0.17.0.tar.gz


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-9/ruby-gnome2.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ruby-gnome2.spec	19 Jul 2008 02:54:42 -0000	1.28
+++ ruby-gnome2.spec	18 Sep 2008 12:11:50 -0000	1.29
@@ -2,7 +2,6 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 %define         xulrunner_still_beta   1
-%define         betaver                rc1
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -11,16 +10,20 @@
 
 Name:           ruby-gnome2
 Version:        0.17.0
-Release:        0.4.%{betaver}%{?dist}
+Release:        1%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
 
 License:        LGPLv2
 URL:            http://ruby-gnome2.sourceforge.jp/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?betaver:-%betaver}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
 Patch14:        ruby-gnome2-all-0.16.0-xulrunner.patch
+# Already in upstream svn
+# Fix bug 456816
+# http://lists.sourceforge.jp/mailman/archives/kazehakase-devel/2008-September/002846.html
+Patch15:        ruby-gnome2-0.17.0-bz456816.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -482,11 +485,12 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?betaver:-%betaver}
+%setup -q -n %{name}-all-%{version}
 %patch0 -p1
 %if 0%{?fedora} >= 9
 %patch14 -p1 -b .xulrunner
 %endif
+%patch15 -p0 -b .bz456816
 
 # Fix the attributes of some files
 # suppress lots of messages..
@@ -696,6 +700,10 @@
 
 
 %changelog
+* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.17.0-1
+- Update to 0.17.0
+- Patch from svn to fix Ruby/GLib bug (bug 456816)
+
 * Sat Jul 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.17.0-0.4.rc1
 - F-9+: relax gecko libs dependency
 - F-9+: bump version to fix EVR problem between F-8 branch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Jun 2008 13:07:41 -0000	1.3
+++ sources	18 Sep 2008 12:11:50 -0000	1.4
@@ -1 +1 @@
-6d04af04c8674b0a88ce47e09dd26a76  ruby-gnome2-0.17.0-rc1.tar.gz
+cc54338888c487055670ee2898391caf  ruby-gnome2-all-0.17.0.tar.gz



From mmaslano at fedoraproject.org  Thu Sep 18 12:16:34 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 18 Sep 2008 12:16:34 +0000 (UTC)
Subject: rpms/perl-libwww-perl/F-9 .cvsignore, 1.10,
	1.11 perl-libwww-perl.spec, 1.25, 1.26 sources, 1.10, 1.11
Message-ID: <20080918121634.95289700D9@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-libwww-perl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3374

Modified Files:
	.cvsignore perl-libwww-perl.spec sources 
Log Message:
* Thu Sep 18 2008 Marcela Maslanova <mmaslano at redhat.com> 5.814-1
- update to 5.814
- remove patch, now we have all upstream tests on



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	14 Aug 2007 01:34:46 -0000	1.10
+++ .cvsignore	18 Sep 2008 12:16:04 -0000	1.11
@@ -1 +1 @@
-libwww-perl-5.808.tar.gz
+libwww-perl-5.814.tar.gz


Index: perl-libwww-perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/F-9/perl-libwww-perl.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- perl-libwww-perl.spec	7 Mar 2008 11:09:44 -0000	1.25
+++ perl-libwww-perl.spec	18 Sep 2008 12:16:04 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           perl-libwww-perl
-Version:        5.808
-Release:        7%{?dist}
+Version:        5.814
+Release:        1%{?dist}
 Summary:        A Perl interface to the World-Wide Web
 
 Group:          Development/Libraries
@@ -13,7 +13,7 @@
 # previous versions just skipped all the tests, I don't feel so bad
 # about being lazy and skipping these instead of figuring out why they
 # fail in mock and not on my box.
-Patch0:         perl-libwww-perl-5.808-skip-message-tests.patch
+Patch1:         perl-libwww-perl-5.808-skip-message-tests.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -35,7 +35,7 @@
 
 %prep
 %setup -q -n libwww-perl-%{version} 
-%patch0 -p1
+#%patch1 -p1
 
 # Install the aliases by default
 %{__perl} -pi -e 's|my \$default = "n";|my \$default = "y";|' Makefile.PL
@@ -114,6 +114,10 @@
 
 
 %changelog
+* Thu Sep 18 2008 Marcela Maslanova <mmaslano at redhat.com> 5.814-1
+- update to 5.814
+- remove patch, now we have all upstream tests on
+
 * Fri Mar  7 2008 Ville Skytt?? <ville.skytta at iki.fi> - 5.808-7
 - Use system /etc/mime.types instead of an outdated private copy.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	14 Aug 2007 01:34:46 -0000	1.10
+++ sources	18 Sep 2008 12:16:04 -0000	1.11
@@ -1 +1 @@
-72120d9195ab1649c2d787eb1102a90c  libwww-perl-5.808.tar.gz
+0b21861950566570a061b0d57ac03009  libwww-perl-5.814.tar.gz



From ltinkl at fedoraproject.org  Thu Sep 18 12:28:51 2008
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu, 18 Sep 2008 12:28:51 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.1.1-kde#858795-mimeassoc.patch, NONE,
	1.1 kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch, NONE,
	1.1 kdelibs.spec, 1.351, 1.352
Message-ID: <20080918122851.97D5A700D9@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4747

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.1-kde#858795-mimeassoc.patch 
	kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch 
Log Message:
more fixes from the 4.1 branch


kdelibs-4.1.1-kde#858795-mimeassoc.patch:

--- NEW FILE kdelibs-4.1.1-kde#858795-mimeassoc.patch ---
Index: kded/kmimeassociations.cpp
===================================================================
--- kded/kmimeassociations.cpp	(revision 858794)
+++ kded/kmimeassociations.cpp	(revision 858795)
@@ -62,7 +62,7 @@
         const QString mimeappsFile = mimeappsIter.previous();
         kDebug(7021) << "Parsing" << mimeappsFile;
         parseMimeAppsList(mimeappsFile, basePreference);
-        basePreference -= 50;
+        basePreference += 50;
     }
     return true;
 }

kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch:

--- NEW FILE kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch ---
Index: khtml/rendering/render_layer.cpp
===================================================================
--- khtml/rendering/render_layer.cpp	(revision 860094)
+++ khtml/rendering/render_layer.cpp	(revision 860095)
@@ -715,9 +715,6 @@
     for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
         child->updateLayerPositions(rootLayer);
     
-    // Fire the scroll DOM event.
-    m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false);
-
     // Just schedule a full repaint of our object.
     if (repaint)
         m_object->repaint(RealtimePriority);
@@ -728,6 +725,9 @@
         if (m_vBar)
             m_vBar->setValue(m_scrollY);
     }
+
+    // Fire the scroll DOM event. Do this the very last thing, since the handler may kill us.
+    m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false);    
 }
 
 void RenderLayer::updateScrollPositionFromScrollbars()


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- kdelibs.spec	16 Sep 2008 21:44:35 -0000	1.351
+++ kdelibs.spec	18 Sep 2008 12:28:21 -0000	1.352
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -88,6 +88,8 @@
 Patch102: kdelibs-4.1.1-kde#856403-urlnav.patch
 Patch103: kdelibs-4.1.1-kutils-fixes.patch
 Patch104: kdelibs-4.1.1-kdeui-widgets-fixes.patch
+Patch105: kdelibs-4.1.1-kde#858795-mimeassoc.patch
+Patch106: kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -221,6 +223,8 @@
 %patch102 -p0 -b .kde#856403-urlnav
 %patch103 -p0 -b .kutils-fixes
 %patch104 -p0 -b .kdeui-widgets-fixes
+%patch105 -p0 -b .kde#858795-mimeassoc
+%patch106 -p0 -b .kde#860095-khtml-scroll-crash
 
 %build
 
@@ -381,6 +385,11 @@
 
 
 %changelog
+* Thu Sep 18 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-10
+- Fix file association bug, the global mimeapps.list file had priority
+  over the local one.
+- khtml scroll crash fix (kdebug:170880)
+
 * Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.1.1-9
 - #461725, revert the patch to fix the regression
 



From kkofler at fedoraproject.org  Thu Sep 18 12:32:28 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 18 Sep 2008 12:32:28 +0000 (UTC)
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.166,1.167
Message-ID: <20080918123228.9F682700D9@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5209/devel

Modified Files:
	kdegraphics.spec 
Log Message:
Remove comments about apps still using the KDE 3 libkipi infrastructure, all affected packages have been fixed (kipi-plugins and kphotoalbum updated to KDE 4 versions, showimg rebuilt without libkipi support).


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- kdegraphics.spec	29 Aug 2008 15:55:13 -0000	1.166
+++ kdegraphics.spec	18 Sep 2008 12:31:58 -0000	1.167
@@ -81,10 +81,6 @@
 Requires: kdelibs4-devel
 Requires: pkgconfig
 %if ! 0%{?omit_kde3_conflicts}
-## FIXME: handle upgrade path for F-10 -- Rex 
-# remaining apps depending on these: kipi-plugins (me), kphotoalbum (me), 
-# showimg (mailed)
-#Conflicts: libkdcraw-devel < 0.2.0, libkexiv2-devel < 0.2.0, libkipi-devel < 0.2.0 
 Obsoletes: libkdcraw-devel < 0.2.0, libkexiv2-devel < 0.2.0, libkipi-devel < 0.2.0 
 Provides:  libkdcraw-devel = 0.2.0, libkexiv2-devel = 0.2.0, libkipi-devel = 0.2.0
 %endif



From ltinkl at fedoraproject.org  Thu Sep 18 12:33:28 2008
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu, 18 Sep 2008 12:33:28 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.1.1-kde#860005-emoticons.patch, NONE,
	1.1 kdelibs.spec, 1.352, 1.353
Message-ID: <20080918123328.45F2B700D9@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5327

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.1-kde#860005-emoticons.patch 
Log Message:
mean smileyz may eat your email text :)


kdelibs-4.1.1-kde#860005-emoticons.patch:

--- NEW FILE kdelibs-4.1.1-kde#860005-emoticons.patch ---
Index: kutils/kemoticons/kemoticonstheme.cpp
===================================================================
--- kutils/kemoticons/kemoticonstheme.cpp	(revision 860004)
+++ kutils/kemoticons/kemoticonstheme.cpp	(revision 860005)
@@ -161,6 +161,9 @@
 QString KEmoticonsTheme::parseEmoticons(const QString &text, ParseMode mode, const QStringList &exclude) const
 {
     QList<Token> tokens = tokenize(text, mode | SkipHTML);
+    if (tokens.isEmpty() && !text.isEmpty())
+        return text;
+
     QString result;
 
     foreach(const Token &token , tokens) {


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- kdelibs.spec	18 Sep 2008 12:28:21 -0000	1.352
+++ kdelibs.spec	18 Sep 2008 12:32:58 -0000	1.353
@@ -90,6 +90,7 @@
 Patch104: kdelibs-4.1.1-kdeui-widgets-fixes.patch
 Patch105: kdelibs-4.1.1-kde#858795-mimeassoc.patch
 Patch106: kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch
+Patch107: kdelibs-4.1.1-kde#860005-emoticons.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -225,6 +226,7 @@
 %patch104 -p0 -b .kdeui-widgets-fixes
 %patch105 -p0 -b .kde#858795-mimeassoc
 %patch106 -p0 -b .kde#860095-khtml-scroll-crash
+%patch107 -p0 -b .kde#860005-emoticons
 
 %build
 
@@ -389,6 +391,9 @@
 - Fix file association bug, the global mimeapps.list file had priority
   over the local one.
 - khtml scroll crash fix (kdebug:170880)
+- Don't eat text when the emoticons were not installed. This fixes
+  mail text not being displayed in KMail when kdebase-runtime wasn't
+  installed.
 
 * Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.1.1-9
 - #461725, revert the patch to fix the regression



From mmaslano at fedoraproject.org  Thu Sep 18 12:33:16 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 18 Sep 2008 12:33:16 +0000 (UTC)
Subject: rpms/perl-libwww-perl/F-9 perl-libwww-perl.spec,1.26,1.27
Message-ID: <20080918123316.B8B85700D9@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-libwww-perl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5383

Modified Files:
	perl-libwww-perl.spec 
Log Message:
* Thu Sep 18 2008 Marcela Maslanova <mmaslano at redhat.com> 5.814-1
- update to 5.814
- tests for testing sending messages failed->net problem?
  tests switched off for a while



Index: perl-libwww-perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/F-9/perl-libwww-perl.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- perl-libwww-perl.spec	18 Sep 2008 12:16:04 -0000	1.26
+++ perl-libwww-perl.spec	18 Sep 2008 12:32:46 -0000	1.27
@@ -89,7 +89,7 @@
 done
 
 %check
-make test
+##make test
 
 
 %clean 
@@ -116,7 +116,8 @@
 %changelog
 * Thu Sep 18 2008 Marcela Maslanova <mmaslano at redhat.com> 5.814-1
 - update to 5.814
-- remove patch, now we have all upstream tests on
+- tests for testing sending messages failed->net problem?
+  tests switched off for a while
 
 * Fri Mar  7 2008 Ville Skytt?? <ville.skytta at iki.fi> - 5.808-7
 - Use system /etc/mime.types instead of an outdated private copy.



From jnovy at fedoraproject.org  Thu Sep 18 12:35:32 2008
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Thu, 18 Sep 2008 12:35:32 +0000 (UTC)
Subject: rpms/netpbm/devel netpbm-10.35-pamcomp.patch, NONE, 1.1 .cvsignore, 
	1.42, 1.43 netpbm.spec, 1.118, 1.119 sources, 1.46, 1.47
Message-ID: <20080918123532.EBAD6700D9@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5704

Modified Files:
	.cvsignore netpbm.spec sources 
Added Files:
	netpbm-10.35-pamcomp.patch 
Log Message:
* Thu Sep 18 2008 Jindrich Novy <jnovy at redhat.com> 10.35.51-1
- update to netpbm-10.35.51
- make it actually compilable by removing duplicated function
  in pamcomp.c


netpbm-10.35-pamcomp.patch:

--- NEW FILE netpbm-10.35-pamcomp.patch ---
diff -up netpbm-10.35.51/editor/pamcomp.c.pamcomp netpbm-10.35.51/editor/pamcomp.c
--- netpbm-10.35.51/editor/pamcomp.c.pamcomp	2008-09-18 13:45:15.000000000 +0200
+++ netpbm-10.35.51/editor/pamcomp.c	2008-09-18 14:03:19.000000000 +0200
@@ -325,25 +325,6 @@ validateComputableHeight(int const origi
 
 
 static void
-validateComputableHeight(int const originTop, 
-                         int const overRows) {
-
-    if (originTop < 0) {
-        if (originTop < -INT_MAX)
-            pm_error("Overlay starts too far above the underlay image to be "
-                     "computable.  Overlay can be at most %d rows above "
-                     "the underlay.", INT_MAX);
-    } else {
-        if (INT_MAX - originTop <= overRows)
-            pm_error("Too many total rows involved to be computable.  "
-                     "You must have a shorter overlay image or compose it "
-                     "higher on the underlay image.");
-    }
-}
-
-
-
-static void
 computeOverlayPosition(int                const underCols, 
                        int                const underRows,
                        int                const overCols, 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	14 Aug 2008 11:53:18 -0000	1.42
+++ .cvsignore	18 Sep 2008 12:35:02 -0000	1.43
@@ -1 +1 @@
-netpbm-10.35.49.tar.bz2
+netpbm-10.35.51.tar.bz2


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- netpbm.spec	27 Aug 2008 13:57:51 -0000	1.118
+++ netpbm.spec	18 Sep 2008 12:35:02 -0000	1.119
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.49
-Release: 2%{?dist}
+Version: 10.35.51
+Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
 Group: System Environment/Libraries
@@ -30,6 +30,7 @@
 Patch18: netpbm-10.35-glibc.patch
 Patch19: netpbm-10.35-gcc43.patch
 Patch20: netpbm-10.35-rgbtxt.patch
+Patch21: netpbm-10.35-pamcomp.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -90,6 +91,7 @@
 %patch18 -p1 -b .glibc
 %patch19 -p1 -b .gcc43
 %patch20 -p1 -b .rgbtxt
+%patch21 -p1 -b .pamcomp
 
 ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
 ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -217,6 +219,11 @@
 %{_datadir}/netpbm/
 
 %changelog
+* Thu Sep 18 2008 Jindrich Novy <jnovy at redhat.com> 10.35.51-1
+- update to netpbm-10.35.51
+- make it actually compilable by removing duplicated function
+  in pamcomp.c
+
 * Wed Aug 27 2008 Jindrich Novy <jnovy at redhat.com> 10.35.49-2
 - link against system jasper instead of embedded one (#460300)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	14 Aug 2008 11:53:18 -0000	1.46
+++ sources	18 Sep 2008 12:35:02 -0000	1.47
@@ -1 +1 @@
-00a2d821ef0d207ee85fd19032a88162  netpbm-10.35.49.tar.bz2
+f07e2e4a669fff8ea8192e7b4834d9de  netpbm-10.35.51.tar.bz2



From mmaslano at fedoraproject.org  Thu Sep 18 12:45:19 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 18 Sep 2008 12:45:19 +0000 (UTC)
Subject: rpms/perl-libwww-perl/F-9 perl-libwww-perl.spec,1.27,1.28
Message-ID: <20080918124519.E986A700D9@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-libwww-perl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7123

Modified Files:
	perl-libwww-perl.spec 
Log Message:
* Thu Sep 18 2008 Marcela Maslanova <mmaslano at redhat.com> 5.814-1
- update to 5.814
- tests for testing sending messages failed->net problem?
  tests switched off for a while



Index: perl-libwww-perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/F-9/perl-libwww-perl.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- perl-libwww-perl.spec	18 Sep 2008 12:32:46 -0000	1.27
+++ perl-libwww-perl.spec	18 Sep 2008 12:44:49 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           perl-libwww-perl
 Version:        5.814
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Perl interface to the World-Wide Web
 
 Group:          Development/Libraries
@@ -114,7 +114,7 @@
 
 
 %changelog
-* Thu Sep 18 2008 Marcela Maslanova <mmaslano at redhat.com> 5.814-1
+* Thu Sep 18 2008 Marcela Maslanova <mmaslano at redhat.com> 5.814-2
 - update to 5.814
 - tests for testing sending messages failed->net problem?
   tests switched off for a while



From jamatos at fedoraproject.org  Thu Sep 18 14:00:42 2008
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Thu, 18 Sep 2008 14:00:42 +0000 (UTC)
Subject: rpms/tellico/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 tellico.spec, 1.30, 1.31
Message-ID: <20080918140042.3E72B700D9@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/tellico/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17221

Modified Files:
	.cvsignore sources tellico.spec 
Log Message:
* Thu Sep 18 2008 Jos?? Matos <jamatos at fc.up.pt> - 1.3.4-1
- update to 1.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	17 Jul 2008 11:10:06 -0000	1.15
+++ .cvsignore	18 Sep 2008 14:00:11 -0000	1.16
@@ -1 +1 @@
-tellico-1.3.3.tar.gz
+tellico-1.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	17 Jul 2008 11:10:06 -0000	1.15
+++ sources	18 Sep 2008 14:00:11 -0000	1.16
@@ -1 +1 @@
-6e08c3f96c5b2ca871b83dbaca41b2ae  tellico-1.3.3.tar.gz
+d6531a9731cc50c59cd2588e7af22ff8  tellico-1.3.4.tar.gz


Index: tellico.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/tellico.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- tellico.spec	17 Jul 2008 11:10:06 -0000	1.30
+++ tellico.spec	18 Sep 2008 14:00:11 -0000	1.31
@@ -1,5 +1,5 @@
 Name:           tellico
-Version:        1.3.3
+Version:        1.3.4
 Release:        1%{?dist}
 Summary:        A collection manager
 
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Thu Sep 18 2008 Jos?? Matos <jamatos at fc.up.pt> - 1.3.4-1
+- update to 1.3.4
+
 * Thu Jul 17 2008 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.3.3-1
 - update to 1.3.3
 



From pertusus at fedoraproject.org  Thu Sep 18 14:12:20 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Thu, 18 Sep 2008 14:12:20 +0000 (UTC)
Subject: rpms/ivman/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.1, NONE ivman-0.6.12-daemon.patch, 1.1,
	NONE ivman-0.6.12-mountpointcommand.diff, 1.1,
	NONE ivman-0.6.12-usersync.patch, 1.1,
	NONE ivman-autostart.desktop, 1.1, NONE ivman-initscript, 1.1,
	NONE ivman-mount-wrapper, 1.1, NONE ivman-umount-wrapper, 1.1,
	NONE ivman.spec, 1.4, NONE sources, 1.3, NONE
Message-ID: <20080918141220.D1046700D9@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/ivman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18642

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile ivman-0.6.12-daemon.patch 
	ivman-0.6.12-mountpointcommand.diff 
	ivman-0.6.12-usersync.patch ivman-autostart.desktop 
	ivman-initscript ivman-mount-wrapper ivman-umount-wrapper 
	ivman.spec sources 
Log Message:
Retire package.



--- NEW FILE dead.package ---
Some file were relicensed under the QPL (see comment in src/hal_interface.c:
Code borrowed from Gnome-Volume-Manager by RML), though it is unsure that
the former copyright holder agreed.

Also the curernt maintainer doesn't want to maintain ivman anymore and
there is a lack for system config files.

See also 
https://bugzilla.redhat.com/show_bug.cgi?id=208737


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- ivman-0.6.12-daemon.patch DELETED ---


--- ivman-0.6.12-mountpointcommand.diff DELETED ---


--- ivman-0.6.12-usersync.patch DELETED ---


--- ivman-autostart.desktop DELETED ---


--- ivman-initscript DELETED ---


--- ivman-mount-wrapper DELETED ---


--- ivman-umount-wrapper DELETED ---


--- ivman.spec DELETED ---


--- sources DELETED ---



From jamatos at fedoraproject.org  Thu Sep 18 14:13:04 2008
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Thu, 18 Sep 2008 14:13:04 +0000 (UTC)
Subject: rpms/tellico/F-9 .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 tellico.spec, 1.28, 1.29
Message-ID: <20080918141304.30558700D9@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/tellico/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18718

Modified Files:
	.cvsignore sources tellico.spec 
Log Message:
* Thu Sep 18 2008 Jos?? Matos <jamatos at fc.up.pt> - 1.3.4-1
- update to 1.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-9/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	17 Jul 2008 11:31:09 -0000	1.15
+++ .cvsignore	18 Sep 2008 14:12:33 -0000	1.16
@@ -1 +1 @@
-tellico-1.3.3.tar.gz
+tellico-1.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	17 Jul 2008 11:31:09 -0000	1.15
+++ sources	18 Sep 2008 14:12:33 -0000	1.16
@@ -1 +1 @@
-6e08c3f96c5b2ca871b83dbaca41b2ae  tellico-1.3.3.tar.gz
+d6531a9731cc50c59cd2588e7af22ff8  tellico-1.3.4.tar.gz


Index: tellico.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-9/tellico.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- tellico.spec	17 Jul 2008 11:31:09 -0000	1.28
+++ tellico.spec	18 Sep 2008 14:12:33 -0000	1.29
@@ -1,5 +1,5 @@
 Name:           tellico
-Version:        1.3.3
+Version:        1.3.4
 Release:        1%{?dist}
 Summary:        A collection manager
 
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Thu Sep 18 2008 Jos?? Matos <jamatos at fc.up.pt> - 1.3.4-1
+- update to 1.3.4
+
 * Thu Jul 17 2008 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.3.3-1
 - update to 1.3.3
 



From mtasaka at fedoraproject.org  Thu Sep 18 14:18:48 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 18 Sep 2008 14:18:48 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-8 ruby-gnome2.spec,1.23,1.24
Message-ID: <20080918141849.00F1A700D9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19599

Modified Files:
	ruby-gnome2.spec 
Log Message:
silly me...


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-8/ruby-gnome2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ruby-gnome2.spec	18 Sep 2008 12:11:49 -0000	1.23
+++ ruby-gnome2.spec	18 Sep 2008 14:18:18 -0000	1.24
@@ -10,7 +10,7 @@
 
 Name:           ruby-gnome2
 Version:        0.17.0
-Release:        1.%{?dist}
+Release:        1%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries



From dwalsh at fedoraproject.org  Thu Sep 18 14:19:37 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 18 Sep 2008 14:19:37 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-mls.conf, 1.35,
	1.36 modules-targeted.conf, 1.99, 1.100 policy-20080710.patch,
	1.36, 1.37
Message-ID: <20080918141937.137D6700D9@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19722

Modified Files:
	modules-mls.conf modules-targeted.conf policy-20080710.patch 
Log Message:
* Thu Sep 11 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-1
- Merge upstream changes
- Add Xavier Toth patches



Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- modules-mls.conf	12 Sep 2008 14:21:04 -0000	1.35
+++ modules-mls.conf	18 Sep 2008 14:19:06 -0000	1.36
@@ -161,7 +161,7 @@
 #
 # Virtual Private Networking client
 # 
-vpn = base
+vpn = module
 
 # Layer: admin
 # Module: su
@@ -189,7 +189,7 @@
 #
 # Automated backup program.
 # 
-amanda = base
+amanda = module
 
 # Layer: admin
 # Module: logrotate
@@ -232,14 +232,14 @@
 #
 # Digital Certificate Tracking
 # 
-certwatch = base
+certwatch = module
 
 # Layer: admin
 # Module: tmpreaper
 #
 # Manage temporary directory sizes and file ages
 # 
-tmpreaper = base
+tmpreaper = module
 
 # Layer: admin
 # Module: dmidecode
@@ -253,7 +253,7 @@
 #
 # Policy for GNU Privacy Guard and related programs.
 # 
-gpg = base
+gpg = module
 
 # Layer: apps
 # Module: loadkeys
@@ -267,7 +267,7 @@
 #
 # Web server log analysis
 # 
-webalizer = base
+webalizer = module
 
 # Layer: kernel
 # Module: bootloader
@@ -288,7 +288,7 @@
 #
 # Policy for NIS (YP) servers and clients
 # 
-nis = base
+nis = module
 
 # Layer: services
 # Module: distcc
@@ -302,7 +302,7 @@
 #
 # Remote shell service.
 # 
-rshd = base
+rshd = module
 
 # Layer: services
 # Module: cpucontrol
@@ -323,35 +323,35 @@
 #
 # Berkeley internet name domain DNS server.
 # 
-bind = base
+bind = module
 
 # Layer: services
 # Module: canna
 #
 # Canna - kana-kanji conversion server
 # 
-canna = base
+canna = module
 
 # Layer: services
 # Module: uucp
 #
 # Unix to Unix Copy
 # 
-uucp = base
+uucp = module
 
 # Layer: services
 # Module: sasl
 #
 # SASL authentication server
 # 
-sasl = base
+sasl = module
 
 # Layer: services
 # Module: pegasus
 #
 # The Open Group Pegasus CIM/WBEM Server.
 # 
-pegasus = base
+pegasus = module
 
 # Layer: services
 # Module: cron
@@ -374,7 +374,7 @@
 # name  Service  Switch  daemon for resolving names
 # from Windows NT servers.
 # 
-samba = base
+samba = module
 
 # Layer: services
 # Module: dbus
@@ -388,21 +388,21 @@
 #
 # Port of Apple Rendezvous multicast DNS
 # 
-howl = base
+howl = module
 
 # Layer: services
 # Module: postgresql
 #
 # PostgreSQL relational database
 # 
-postgresql = base
+postgresql = module
 
 # Layer: services
 # Module: snmp
 #
 # Simple network management protocol services
 # 
-snmp = base
+snmp = module
 
 # Layer: services
 # Module: remotelogin
@@ -430,56 +430,56 @@
 #
 # Mailman is for managing electronic mail discussion and e-newsletter lists
 # 
-mailman = base
+mailman = module
 
 # Layer: services
 # Module: dbskk
 #
 # Dictionary server for the SKK Japanese input method system.
 # 
-dbskk = base
+dbskk = module
 
 # Layer: services
 # Module: ldap
 #
 # OpenLDAP directory server
 # 
-ldap = base
+ldap = module
 
 # Layer: services
 # Module: tftp
 #
 # Trivial file transfer protocol daemon
 # 
-tftp = base
+tftp = module
 
 # Layer: services
 # Module: portmap
 #
 # RPC port mapping service.
 # 
-portmap = base
+portmap = module
 
 # Layer: services
 # Module: arpwatch
 #
 # Ethernet activity monitor.
 # 
-arpwatch = base
+arpwatch = module
 
 # Layer: services
 # Module: dovecot
 #
 # Dovecot POP and IMAP mail server
 # 
-dovecot = base
+dovecot = module
 
 # Layer: services
 # Module: cups
 #
 # Common UNIX printing system
 # 
-cups = base
+cups = module
 
 # Layer: services
 # Module: networkmanager
@@ -493,35 +493,35 @@
 #
 # Internet News NNTP server
 # 
-inn = base
+inn = module
 
 # Layer: services
 # Module: sysstat
 #
 # Policy for sysstat. Reports on various system states
 # 
-sysstat = base
+sysstat = module
 
 # Layer: services
 # Module: comsat
 #
 # Comsat, a biff server.
 # 
-comsat = base
+comsat = module
 
 # Layer: services
 # Module: squid
 #
 # Squid caching http proxy server
 # 
-squid = base
+squid = module
 
 # Layer: services
 # Module: zebra
 #
 # Zebra border gateway protocol network routing service
 # 
-zebra = base
+zebra = module
 
 # Layer: services
 # Module: xfs
@@ -535,35 +535,35 @@
 #
 # KDE Talk daemon
 # 
-ktalk = base
+ktalk = module
 
 # Layer: services
 # Module: procmail
 #
 # Procmail mail delivery agent
 # 
-procmail = base
+procmail = module
 
 # Layer: services
 # Module: lpd
 #
 # Line printer daemon
 # 
-lpd = base
+lpd = module
 
 # Layer: services
 # Module: cyrus
 #
 # Cyrus is an IMAP service intended to be run on sealed servers
 # 
-cyrus = base
+cyrus = module
 
 # Layer: services
 # Module: rdisc
 #
 # Network router discovery daemon
 # 
-rdisc = base
+rdisc = module
 
 # Layer: services
 # Module: xserver
@@ -584,21 +584,21 @@
 #
 # Point to Point Protocol daemon creates links in ppp networks
 # 
-ppp = base
+ppp = module
 
 # Layer: services
 # Module: ftp
 #
 # File transfer protocol service
 # 
-ftp = base
+ftp = module
 
 # Layer: services
 # Module: gpm
 #
 # General Purpose Mouse driver
 # 
-gpm = base
+gpm = module
 
 # Layer: services
 # Module: mta
@@ -612,28 +612,28 @@
 #
 # Postfix email server
 # 
-postfix = base
+postfix = module
 
 # Layer: services
 # Module: fetchmail
 #
 # Remote-mail retrieval and forwarding utility
 # 
-fetchmail = base
+fetchmail = module
 
 # Layer: services
 # Module: ntp
 #
 # Network time protocol daemon
 # 
-ntp = base
+ntp = module
 
 # Layer: services
 # Module: bluetooth
 #
 # Bluetooth tools and system services.
 # 
-bluetooth = base
+bluetooth = module
 
 # Layer: services
 # Module: hal
@@ -647,7 +647,7 @@
 #
 # mDNS/DNS-SD daemon implementing Apple ZeroConf architecture
 # 
-avahi = base
+avahi = module
 
 # Layer: services
 # Module: rpc
@@ -661,35 +661,35 @@
 #
 # Apache web server
 # 
-apache = base
+apache = module
 
 # Layer: services
 # Module: rsync
 #
 # Fast incremental file transfer for synchronization
 # 
-rsync = base
+rsync = module
 
 # Layer: services
 # Module: automount
 #
 # Filesystem automounter service.
 # 
-automount = base
+automount = module
 
 # Layer: services
 # Module: kerberos
 #
 # MIT Kerberos admin and KDC
 # 
-kerberos = base
+kerberos = module
 
 # Layer: services
 # Module: dhcp
 #
 # Dynamic host configuration protocol (DHCP) server
 # 
-dhcp = base
+dhcp = module
 
 # Layer: services
 # Module: ssh
@@ -710,42 +710,42 @@
 #
 # Policy for MySQL
 # 
-mysql = base
+mysql = module
 
 # Layer: services
 # Module: dictd
 #
 # Dictionary daemon
 # 
-dictd = base
+dictd = module
 
 # Layer: services
 # Module: finger
 #
 # Finger user information service.
 # 
-finger = base
+finger = module
 
 # Layer: services
 # Module: radius
 #
 # RADIUS authentication and accounting server.
 # 
-radius = base
+radius = module
 
 # Layer: services
 # Module: spamassassin
 #
 # Filter used for removing unsolicited email.
 # 
-spamassassin = base
+spamassassin = module
 
 # Layer: services
 # Module: radvd
 #
 # IPv6 router advertisement daemon
 # 
-radvd = base
+radvd = module
 
 # Layer: services
 # Module: apm
@@ -767,35 +767,35 @@
 #
 # Policy for TCP daemon.
 # 
-tcpd = base
+tcpd = module
 
 # Layer: services
 # Module: stunnel
 #
 # SSL Tunneling Proxy
 # 
-stunnel = base
+stunnel = module
 
 # Layer: services
 # Module: privoxy
 #
 # Privacy enhancing web proxy.
 # 
-privoxy = base
+privoxy = module
 
 # Layer: services
 # Module: cvs
 #
 # Concurrent versions system
 # 
-cvs = base
+cvs = module
 
 # Layer: services
 # Module: rlogin
 #
 # Remote login daemon
 # 
-rlogin = base
+rlogin = module
 
 # Layer: system
 # Module: application
@@ -965,7 +965,7 @@
 #
 # TCP/IP encryption
 # 
-ipsec = base
+ipsec = module
 
 # Layer: apps
 # Module: java
@@ -986,7 +986,7 @@
 #
 # locate executable
 # 
-slocate = base
+slocate = module
 
 # Layer: services
 # Module: logwatch
@@ -1008,14 +1008,14 @@
 #
 # Policy for OPENVPN full-featured SSL VPN solution
 # 
-openvpn = base
+openvpn = module
 
 # Layer: services
 # Module: smartmon
 #
 # Smart disk monitoring daemon policy
 # 
-smartmon = base
+smartmon = module
 
 # Layer: system
 # Module: netlabel
@@ -1023,14 +1023,14 @@
 #
 # Basic netlabel types and interfaces.
 # 
-netlabel = base
+netlabel = module
 
 # Layer: services
 # Module: aide
 #
 # Policy for aide
 # 
-aide = base
+aide = module
 
 # Layer: service
 # Module: pcscd
@@ -1131,16 +1131,31 @@
 rpcbind = module
 
 
+# Layer: apps
+# Module: wm
+#
+# X windows window manager
+# 
+wm = module
+
 # Layer: services
-# Module: xserver
+# Module: virt
 #
-# X windows login display manager
+# Virtualization libraries
 # 
-xserver = module
+virt = module
 
 # Layer: apps
-# Module: wm
+# Module: qemu
 #
-# X windows window manager
+# Virtualization emulator 
 # 
-wm = module
+qemu = module
+
+# Layer: system
+# Module: brctl
+#
+# Utilities for configuring the linux ethernet bridge
+# 
+brctl = base
+


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- modules-targeted.conf	17 Sep 2008 23:56:23 -0000	1.99
+++ modules-targeted.conf	18 Sep 2008 14:19:06 -0000	1.100
@@ -108,7 +108,7 @@
 #
 # Filesystem automounter service.
 # 
-automount = base
+automount = module
 
 # Layer: services
 # Module: avahi
@@ -331,7 +331,7 @@
 #
 # Dynamic host configuration protocol (DHCP) server
 # 
-dhcp = base
+dhcp = module
 
 # Layer: services
 # Module: dictd
@@ -374,7 +374,7 @@
 #
 # Dovecot POP and IMAP mail server
 # 
-dovecot = base
+dovecot = module
 
 # Layer: apps
 # Module: gpg
@@ -489,7 +489,7 @@
 #
 # Hardware abstraction layer
 # 
-hal = module
+hal = base
 
 # Layer: services
 # Module: polkit
@@ -741,7 +741,7 @@
 #
 # mono executable
 # 
-mono = base
+mono = module
 
 # Layer: system
 # Module: mount
@@ -785,7 +785,6 @@
 # 
 mrtg = module
 
-
 # Layer: services
 # Module: mta
 #
@@ -985,7 +984,7 @@
 #
 # File system quota management
 # 
-quota = off
+quota = base
 
 # Layer: system
 # Module: raid
@@ -1027,7 +1026,7 @@
 #
 # X windows login display manager
 # 
-rhgb = base
+rhgb = module
 
 # Layer: services
 # Module: rdisc
@@ -1041,7 +1040,7 @@
 #
 # Policy for rshd, rlogind, and telnetd.
 # 
-remotelogin = module
+remotelogin = base
 
 # Layer: services
 # Module: ricci
@@ -1446,7 +1445,7 @@
 #
 # Virtual Private Networking client
 # 
-vpn = base
+vpn = module
 
 # Layer: admin
 # Module: vbetool
@@ -1663,3 +1662,12 @@
 #  high-performance memory object caching system
 # 
 memcached = module
+
+# Layer: system
+# Module: netlabel
+# Required in base
+#
+# Basic netlabel types and interfaces.
+# 
+netlabel = module
+

policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- policy-20080710.patch	17 Sep 2008 23:56:23 -0000	1.36
+++ policy-20080710.patch	18 Sep 2008 14:19:06 -0000	1.37
@@ -26600,7 +26600,7 @@
  /etc/ssh/ssh_host_key 		--	gen_context(system_u:object_r:sshd_key_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.5.8/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ssh.if	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ssh.if	2008-09-18 08:51:19.000000000 -0400
 @@ -36,6 +36,7 @@
  	gen_require(`
  		attribute ssh_server;
@@ -26660,15 +26660,16 @@
  
  	corenet_all_recvfrom_unlabeled($1_ssh_t)
  	corenet_all_recvfrom_netlabel($1_ssh_t)
-@@ -115,6 +118,7 @@
+@@ -115,6 +118,8 @@
  	corenet_tcp_sendrecv_all_ports($1_ssh_t)
  	corenet_tcp_connect_ssh_port($1_ssh_t)
  	corenet_sendrecv_ssh_client_packets($1_ssh_t)
++	corenet_tcp_bind_all_nodes($1_ssh_t)
 +	corenet_tcp_bind_all_unreserved_ports($1_ssh_t)
  
  	dev_read_urand($1_ssh_t)
  
-@@ -212,7 +216,7 @@
+@@ -212,7 +217,7 @@
  
  	ssh_basic_client_template($1, $2, $3)
  
@@ -26677,7 +26678,7 @@
  
  	type $1_ssh_agent_t;
  	application_domain($1_ssh_agent_t, ssh_agent_exec_t)
-@@ -240,9 +244,9 @@
+@@ -240,9 +245,9 @@
  	manage_sock_files_pattern($1_ssh_t, $1_ssh_tmpfs_t, $1_ssh_tmpfs_t)
  	fs_tmpfs_filetrans($1_ssh_t, $1_ssh_tmpfs_t, { dir file lnk_file sock_file fifo_file })
  
@@ -26690,7 +26691,7 @@
  
  	# Allow the ssh program to communicate with ssh-agent.
  	stream_connect_pattern($1_ssh_t, $1_ssh_agent_tmp_t, $1_ssh_agent_tmp_t, $1_ssh_agent_t)
-@@ -254,6 +258,8 @@
+@@ -254,6 +259,8 @@
  	userdom_use_unpriv_users_fds($1_ssh_t)
  	userdom_dontaudit_list_user_home_dirs($1,$1_ssh_t)
  	userdom_search_user_home_dirs($1,$1_ssh_t)
@@ -26699,7 +26700,7 @@
  	# Write to the user domain tty.
  	userdom_use_user_terminals($1,$1_ssh_t)
  	# needs to read krb tgt
-@@ -282,21 +288,10 @@
+@@ -282,21 +289,10 @@
  	')
  
  	optional_policy(`
@@ -26722,7 +26723,7 @@
  	##############################
  	#
  	# $1_ssh_agent_t local policy
-@@ -383,10 +378,6 @@
+@@ -383,10 +379,6 @@
  		xserver_rw_xdm_pipes($1_ssh_agent_t)
  	')
  
@@ -26733,7 +26734,7 @@
  	##############################
  	#
  	# $1_ssh_keysign_t local policy
-@@ -413,6 +404,25 @@
+@@ -413,6 +405,25 @@
  	')
  ')
  
@@ -26759,7 +26760,7 @@
  #######################################
  ## <summary>
  ##	The template to define a ssh server.
-@@ -443,13 +453,14 @@
+@@ -443,13 +454,14 @@
  	type $1_var_run_t;
  	files_pid_file($1_var_run_t)
  
@@ -26775,7 +26776,7 @@
  
  	allow $1_t $1_devpts_t:chr_file { rw_chr_file_perms setattr getattr relabelfrom };
  	term_create_pty($1_t,$1_devpts_t)
-@@ -479,6 +490,10 @@
+@@ -479,6 +491,10 @@
  	corenet_tcp_bind_ssh_port($1_t)
  	corenet_tcp_connect_all_ports($1_t)
  	corenet_sendrecv_ssh_server_packets($1_t)
@@ -26786,7 +26787,7 @@
  
  	fs_dontaudit_getattr_all_fs($1_t)
  
-@@ -506,9 +521,14 @@
+@@ -506,9 +522,14 @@
  
  	userdom_dontaudit_relabelfrom_unpriv_users_ptys($1_t)
  	userdom_search_all_users_home_dirs($1_t)
@@ -26801,7 +26802,7 @@
  	')
  
  	tunable_policy(`use_samba_home_dirs',`
-@@ -517,11 +537,7 @@
+@@ -517,11 +538,7 @@
  
  	optional_policy(`
  		kerberos_use($1_t)
@@ -26814,7 +26815,7 @@
  	')
  
  	optional_policy(`
-@@ -710,3 +726,22 @@
+@@ -710,3 +727,22 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
  ')



From pkgdb at fedoraproject.org  Thu Sep 18 14:26:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 14:26:09 +0000
Subject: [pkgdb] ivman ownership updated
Message-ID: <20080918142609.CDB1D208D9E@bastion.fedora.phx.redhat.com>

Package ivman in Fedora devel was orphaned by pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ivman



From than at fedoraproject.org  Thu Sep 18 14:34:13 2008
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 18 Sep 2008 14:34:13 +0000 (UTC)
Subject: rpms/kdelibs/F-9
	kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch,
	NONE, 1.1 kdelibs.spec, 1.353,
	1.354 kdelibs-4.1.1-bz#461725-regression.patch, 1.1, NONE
Message-ID: <20080918143413.CC35C700D9@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21383

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch 
Removed Files:
	kdelibs-4.1.1-bz#461725-regression.patch 
Log Message:
- apply upstream patch to fix khtm regression
- drop the kdelibs-4.1.1-bz#461725-regression.patch


kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch:

--- NEW FILE kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch ---
Index: khtml/ecma/kjs_proxy.h
===================================================================
--- khtml/ecma/kjs_proxy.h	(Revision 854182)
+++ khtml/ecma/kjs_proxy.h	(Revision 854183)
@@ -62,6 +62,7 @@
   virtual KJS::Interpreter *interpreter() = 0;
 
   virtual void setDebugEnabled(bool enabled) = 0;
+  virtual bool debugEnabled() const = 0;
   virtual void showDebugWindow(bool show=true) = 0;
   virtual bool paused() const = 0;
   virtual void dataReceived() = 0;
Index: khtml/ecma/kjs_events.cpp
===================================================================
--- khtml/ecma/kjs_events.cpp	(Revision 854182)
+++ khtml/ecma/kjs_events.cpp	(Revision 854183)
@@ -62,18 +62,18 @@
 
 void JSEventListener::handleEvent(DOM::Event &evt)
 {
-#ifdef KJS_DEBUGGER
-  //### This is the wrong place to do this --- we need 
-  // a more global/general stategy to prevent unwanted event loop recursion issues.
-  if (DebugWindow::window() && DebugWindow::window()->inSession())
-    return;
-#endif
   KHTMLPart *part = qobject_cast<KHTMLPart*>(static_cast<Window*>(win.get())->part());
   KJSProxy *proxy = 0L;
   if (part)
     proxy = part->jScript();
 
   if (proxy && listener && listener->implementsCall()) {
+#ifdef KJS_DEBUGGER
+  //### This is the wrong place to do this --- we need 
+  // a more global/general stategy to prevent unwanted event loop recursion issues.
+    if (proxy->debugEnabled() && DebugWindow::window()->inSession())
+      return;
+#endif
     ref();
 
     KJS::ScriptInterpreter *interpreter = static_cast<KJS::ScriptInterpreter *>(proxy->interpreter());
Index: khtml/ecma/kjs_proxy.cpp
===================================================================
--- khtml/ecma/kjs_proxy.cpp	(Revision 854182)
+++ khtml/ecma/kjs_proxy.cpp	(Revision 854183)
@@ -60,6 +60,7 @@
   virtual KJS::Interpreter *interpreter();
 
   virtual void setDebugEnabled(bool enabled);
+  virtual bool debugEnabled() const;
   virtual void showDebugWindow(bool show=true);
   virtual bool paused() const;
   virtual void dataReceived();
@@ -279,6 +280,15 @@
 #endif
 }
 
+bool KJSProxyImpl::debugEnabled() const
+{
+#ifdef KJS_DEBUGGER
+  return m_debugEnabled;
+#else
+  return false;
+#endif
+}
+
 void KJSProxyImpl::showDebugWindow(bool /*show*/)
 {
 #ifdef KJS_DEBUGGER


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- kdelibs.spec	18 Sep 2008 12:32:58 -0000	1.353
+++ kdelibs.spec	18 Sep 2008 14:33:43 -0000	1.354
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -80,7 +80,6 @@
 # fix running commands in kglobalconfig before KComponentData init (#455130)
 Patch19: kdelibs-4.1.0-#455130.patch
 Patch20: kdelibs-4.1.1-cmake.patch
-Patch21: kdelibs-4.1.1-bz#461725-regression.patch
 
 ## upstream patches
 Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
@@ -91,6 +90,7 @@
 Patch105: kdelibs-4.1.1-kde#858795-mimeassoc.patch
 Patch106: kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch
 Patch107: kdelibs-4.1.1-kde#860005-emoticons.patch
+Patch108: kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -216,7 +216,6 @@
 %patch18 -p1 -b .kstandarddirs
 %patch19 -p1 -b .#455130
 %patch20 -p1 -b .cmake
-%patch21 -p0 -b .bz#461725-regression
 
 ## upstream patches
 %patch100 -p0 -b .kde#169447-khtml-regression
@@ -227,6 +226,7 @@
 %patch105 -p0 -b .kde#858795-mimeassoc
 %patch106 -p0 -b .kde#860095-khtml-scroll-crash
 %patch107 -p0 -b .kde#860005-emoticons
+%patch108 -p0 -b .kde#170461-khtml-regression
 
 %build
 
@@ -387,6 +387,10 @@
 
 
 %changelog
+* Thu Sep 18 2008 Than Ngo <than at redhat.com> 4.1.1-11
+- apply upstream patch to fix the regression
+- drop the kdelibs-4.1.1-bz#461725-regression.patch
+
 * Thu Sep 18 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-10
 - Fix file association bug, the global mimeapps.list file had priority
   over the local one.


--- kdelibs-4.1.1-bz#461725-regression.patch DELETED ---



From mclasen at fedoraproject.org  Thu Sep 18 14:37:09 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 18 Sep 2008 14:37:09 +0000 (UTC)
Subject: rpms/gnome-session/devel xml-leak.patch, NONE,
	1.1 gnome-session.spec, 1.192, 1.193
Message-ID: <20080918143709.BA181700D9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21929

Modified Files:
	gnome-session.spec 
Added Files:
	xml-leak.patch 
Log Message:
plug another leak


xml-leak.patch:

--- NEW FILE xml-leak.patch ---
diff -up gnome-session-2.23.92/gnome-session/gsm-inhibit-dialog.c.xml-leak gnome-session-2.23.92/gnome-session/gsm-inhibit-dialog.c
--- gnome-session-2.23.92/gnome-session/gsm-inhibit-dialog.c.xml-leak	2008-09-18 01:39:26.000000000 -0400
+++ gnome-session-2.23.92/gnome-session/gsm-inhibit-dialog.c	2008-09-18 01:38:56.000000000 -0400
@@ -1001,6 +1001,11 @@ gsm_inhibit_dialog_dispose (GObject *obj
                 dialog->priv->inhibitors = NULL;
         }
 
+        if (dialog->priv->xml != NULL) {
+                g_object_unref (dialog->priv->xml);
+                dialog->priv->xml = NULL;
+        }
+
         G_OBJECT_CLASS (gsm_inhibit_dialog_parent_class)->dispose (object);
 }
 


Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- gnome-session.spec	15 Sep 2008 20:40:25 -0000	1.192
+++ gnome-session.spec	18 Sep 2008 14:36:39 -0000	1.193
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.23.92
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -73,6 +73,8 @@
 Patch3: empty-string-leak.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=552255
 Patch4: ice-leak.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=552780
+Patch5: xml-leak.patch
 
 %description
 
@@ -86,6 +88,7 @@
 %patch2 -p1 -b .inhibitor-leak
 %patch3 -p1 -b .empty-string-leak
 %patch4 -p0 -b .ice-leak
+%patch5 -p1 -b .xml-leak
 
 %build
 
@@ -184,6 +187,9 @@
 
 
 %changelog
+* Thu Sep 18 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.92-5
+- Plug memory leaks
+
 * Mon Sep 15 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.92-4
 - Plug memory leaks
 



From jamatos at fedoraproject.org  Thu Sep 18 14:37:28 2008
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Thu, 18 Sep 2008 14:37:28 +0000 (UTC)
Subject: rpms/tellico/F-8 .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 tellico.spec, 1.19, 1.20
Message-ID: <20080918143728.67BB7700D9@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/tellico/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22032

Modified Files:
	.cvsignore sources tellico.spec 
Log Message:
* Thu Sep 18 2008 Jos?? Matos <jamatos at fc.up.pt> - 1.3.4-1
- update to 1.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-8/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	17 Jul 2008 11:34:04 -0000	1.15
+++ .cvsignore	18 Sep 2008 14:36:58 -0000	1.16
@@ -1 +1 @@
-tellico-1.3.3.tar.gz
+tellico-1.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-8/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	17 Jul 2008 11:34:04 -0000	1.15
+++ sources	18 Sep 2008 14:36:58 -0000	1.16
@@ -1 +1 @@
-6e08c3f96c5b2ca871b83dbaca41b2ae  tellico-1.3.3.tar.gz
+d6531a9731cc50c59cd2588e7af22ff8  tellico-1.3.4.tar.gz


Index: tellico.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-8/tellico.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tellico.spec	17 Jul 2008 11:34:04 -0000	1.19
+++ tellico.spec	18 Sep 2008 14:36:58 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           tellico
-Version:        1.3.3
+Version:        1.3.4
 Release:        1%{?dist}
 Summary:        A collection manager
 
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Thu Sep 18 2008 Jos?? Matos <jamatos at fc.up.pt> - 1.3.4-1
+- update to 1.3.4
+
 * Thu Jul 17 2008 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.3.3-1
 - update to 1.3.3
 



From ausil at fedoraproject.org  Thu Sep 18 14:38:08 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 18 Sep 2008 14:38:08 +0000 (UTC)
Subject: rpms/m2crypto/F-9 m2crypto.spec,1.40,1.41
Message-ID: <20080918143808.CF457700D9@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/m2crypto/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22109

Modified Files:
	m2crypto.spec 
Log Message:
enable sparc arch building



Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/F-9/m2crypto.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- m2crypto.spec	19 Feb 2008 13:52:58 -0000	1.40
+++ m2crypto.spec	18 Sep 2008 14:37:38 -0000	1.41
@@ -1,12 +1,12 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 # Keep this value in sync with the definition in openssl.spec.
-%define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64
+%define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64 sparc sparcv9 sparc64
 
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
 Version: 0.18.2
-Release: 4
+Release: 5
 Source0: http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/m2crypto-%{version}.tar.gz
 Patch0: m2crypto-0.18-timeouts.patch
 Patch1: m2crypto-0.18-proxy.patch
@@ -34,6 +34,9 @@
 %ifarch %{ix86}
 basearch=i386
 %endif
+%ifarch sparcv9
+basearch=sparc
+%endif
 %ifarch %{multilib_arches}
 sed -i -e "s/opensslconf/opensslconf-${basearch}/" SWIG/_ec.i
 %endif
@@ -77,6 +80,9 @@
 %{python_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* Thu Sep 18 2008 Dennis Gilmore <dennis at ausil.us> - 0.18.2-5
+- enable sparc arches
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.18.2-4
 - Autorebuild for GCC 4.3
 



From ausil at fedoraproject.org  Thu Sep 18 14:39:56 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 18 Sep 2008 14:39:56 +0000 (UTC)
Subject: rpms/m2crypto/F-9 m2crypto.spec,1.41,1.42
Message-ID: <20080918143956.0F026700D9@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/m2crypto/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22444

Modified Files:
	m2crypto.spec 
Log Message:
add disttag 



Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/F-9/m2crypto.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- m2crypto.spec	18 Sep 2008 14:37:38 -0000	1.41
+++ m2crypto.spec	18 Sep 2008 14:39:25 -0000	1.42
@@ -6,7 +6,7 @@
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
 Version: 0.18.2
-Release: 5
+Release: 5%{?dist}
 Source0: http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/m2crypto-%{version}.tar.gz
 Patch0: m2crypto-0.18-timeouts.patch
 Patch1: m2crypto-0.18-proxy.patch



From than at fedoraproject.org  Thu Sep 18 14:40:10 2008
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 18 Sep 2008 14:40:10 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.1.1-kde#858795-mimeassoc.patch, NONE, 
	1.1 kdelibs-4.1.1-kde#860005-emoticons.patch, NONE,
	1.1 kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch, NONE,
	1.1 kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch,
	NONE, 1.1 kdelibs.spec, 1.377,
	1.378 kdelibs-4.1.1-bz#461725-regression.patch, 1.1, NONE
Message-ID: <20080918144010.934A2700D9@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22405

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.1-kde#858795-mimeassoc.patch 
	kdelibs-4.1.1-kde#860005-emoticons.patch 
	kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch 
	kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch 
Removed Files:
	kdelibs-4.1.1-bz#461725-regression.patch 
Log Message:
- apply upstream patch to fix the regression
- drop the kdelibs-4.1.1-bz#461725-regression.patch


kdelibs-4.1.1-kde#858795-mimeassoc.patch:

--- NEW FILE kdelibs-4.1.1-kde#858795-mimeassoc.patch ---
Index: kded/kmimeassociations.cpp
===================================================================
--- kded/kmimeassociations.cpp	(revision 858794)
+++ kded/kmimeassociations.cpp	(revision 858795)
@@ -62,7 +62,7 @@
         const QString mimeappsFile = mimeappsIter.previous();
         kDebug(7021) << "Parsing" << mimeappsFile;
         parseMimeAppsList(mimeappsFile, basePreference);
-        basePreference -= 50;
+        basePreference += 50;
     }
     return true;
 }

kdelibs-4.1.1-kde#860005-emoticons.patch:

--- NEW FILE kdelibs-4.1.1-kde#860005-emoticons.patch ---
Index: kutils/kemoticons/kemoticonstheme.cpp
===================================================================
--- kutils/kemoticons/kemoticonstheme.cpp	(revision 860004)
+++ kutils/kemoticons/kemoticonstheme.cpp	(revision 860005)
@@ -161,6 +161,9 @@
 QString KEmoticonsTheme::parseEmoticons(const QString &text, ParseMode mode, const QStringList &exclude) const
 {
     QList<Token> tokens = tokenize(text, mode | SkipHTML);
+    if (tokens.isEmpty() && !text.isEmpty())
+        return text;
+
     QString result;
 
     foreach(const Token &token , tokens) {

kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch:

--- NEW FILE kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch ---
Index: khtml/rendering/render_layer.cpp
===================================================================
--- khtml/rendering/render_layer.cpp	(revision 860094)
+++ khtml/rendering/render_layer.cpp	(revision 860095)
@@ -715,9 +715,6 @@
     for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
         child->updateLayerPositions(rootLayer);
     
-    // Fire the scroll DOM event.
-    m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false);
-
     // Just schedule a full repaint of our object.
     if (repaint)
         m_object->repaint(RealtimePriority);
@@ -728,6 +725,9 @@
         if (m_vBar)
             m_vBar->setValue(m_scrollY);
     }
+
+    // Fire the scroll DOM event. Do this the very last thing, since the handler may kill us.
+    m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false);    
 }
 
 void RenderLayer::updateScrollPositionFromScrollbars()

kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch:

--- NEW FILE kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch ---
Index: khtml/ecma/kjs_proxy.h
===================================================================
--- khtml/ecma/kjs_proxy.h	(Revision 854182)
+++ khtml/ecma/kjs_proxy.h	(Revision 854183)
@@ -62,6 +62,7 @@
   virtual KJS::Interpreter *interpreter() = 0;
 
   virtual void setDebugEnabled(bool enabled) = 0;
+  virtual bool debugEnabled() const = 0;
   virtual void showDebugWindow(bool show=true) = 0;
   virtual bool paused() const = 0;
   virtual void dataReceived() = 0;
Index: khtml/ecma/kjs_events.cpp
===================================================================
--- khtml/ecma/kjs_events.cpp	(Revision 854182)
+++ khtml/ecma/kjs_events.cpp	(Revision 854183)
@@ -62,18 +62,18 @@
 
 void JSEventListener::handleEvent(DOM::Event &evt)
 {
-#ifdef KJS_DEBUGGER
-  //### This is the wrong place to do this --- we need 
-  // a more global/general stategy to prevent unwanted event loop recursion issues.
-  if (DebugWindow::window() && DebugWindow::window()->inSession())
-    return;
-#endif
   KHTMLPart *part = qobject_cast<KHTMLPart*>(static_cast<Window*>(win.get())->part());
   KJSProxy *proxy = 0L;
   if (part)
     proxy = part->jScript();
 
   if (proxy && listener && listener->implementsCall()) {
+#ifdef KJS_DEBUGGER
+  //### This is the wrong place to do this --- we need 
+  // a more global/general stategy to prevent unwanted event loop recursion issues.
+    if (proxy->debugEnabled() && DebugWindow::window()->inSession())
+      return;
+#endif
     ref();
 
     KJS::ScriptInterpreter *interpreter = static_cast<KJS::ScriptInterpreter *>(proxy->interpreter());
Index: khtml/ecma/kjs_proxy.cpp
===================================================================
--- khtml/ecma/kjs_proxy.cpp	(Revision 854182)
+++ khtml/ecma/kjs_proxy.cpp	(Revision 854183)
@@ -60,6 +60,7 @@
   virtual KJS::Interpreter *interpreter();
 
   virtual void setDebugEnabled(bool enabled);
+  virtual bool debugEnabled() const;
   virtual void showDebugWindow(bool show=true);
   virtual bool paused() const;
   virtual void dataReceived();
@@ -279,6 +280,15 @@
 #endif
 }
 
+bool KJSProxyImpl::debugEnabled() const
+{
+#ifdef KJS_DEBUGGER
+  return m_debugEnabled;
+#else
+  return false;
+#endif
+}
+
 void KJSProxyImpl::showDebugWindow(bool /*show*/)
 {
 #ifdef KJS_DEBUGGER


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -r1.377 -r1.378
--- kdelibs.spec	17 Sep 2008 09:45:29 -0000	1.377
+++ kdelibs.spec	18 Sep 2008 14:39:40 -0000	1.378
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 9%{?dist}
+Release: 11%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -78,7 +78,6 @@
 # fix running commands in kglobalconfig before KComponentData init (#455130)
 Patch19: kdelibs-4.1.0-#455130.patch
 Patch20: kdelibs-4.1.1-cmake.patch
-Patch21: kdelibs-4.1.1-bz#461725-regression.patch
 
 ## upstream patches
 Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
@@ -86,6 +85,10 @@
 Patch102: kdelibs-4.1.1-kde#856403-urlnav.patch
 Patch103: kdelibs-4.1.1-kutils-fixes.patch
 Patch104: kdelibs-4.1.1-kdeui-widgets-fixes.patch
+Patch105: kdelibs-4.1.1-kde#858795-mimeassoc.patch
+Patch106: kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch
+Patch107: kdelibs-4.1.1-kde#860005-emoticons.patch
+Patch108: kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -210,7 +213,6 @@
 %patch18 -p1 -b .kstandarddirs
 %patch19 -p1 -b .#455130
 %patch20 -p1 -b .cmake
-%patch21 -p0 -b .bz#461725-regression
 
 ## upstream patches
 %patch100 -p0 -b .kde#169447-khtml-regression
@@ -218,6 +220,10 @@
 %patch102 -p0 -b .kde#856403-urlnav
 %patch103 -p0 -b .kutils-fixes
 %patch104 -p0 -b .kdeui-widgets-fixes
+%patch105 -p0 -b .kde#858795-mimeassoc
+%patch106 -p0 -b .kde#860095-khtml-scroll-crash
+%patch107 -p0 -b .kde#860005-emoticons
+%patch108 -p0 -b .kde#170461-khtml-regression
 
 %build
 
@@ -378,6 +384,18 @@
 
 
 %changelog
+* Thu Sep 18 2008 Than Ngo <than at redhat.com> 4.1.1-11
+- apply upstream patch to fix the regression
+- drop the kdelibs-4.1.1-bz#461725-regression.patch
+
+* Thu Sep 18 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-10
+- Fix file association bug, the global mimeapps.list file had priority
+  over the local one.
+- khtml scroll crash fix (kdebug:170880)
+- Don't eat text when the emoticons were not installed. This fixes
+  mail text not being displayed in KMail when kdebase-runtime wasn't
+  installed.
+
 * Wed Sep 17 2008 Than Ngo <than at redhat.com> 4.1.1-9
 - #461725, revert the patch to fix the regression
 


--- kdelibs-4.1.1-bz#461725-regression.patch DELETED ---



From ausil at fedoraproject.org  Thu Sep 18 14:42:55 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 18 Sep 2008 14:42:55 +0000 (UTC)
Subject: rpms/m2crypto/devel m2crypto.spec,1.43,1.44
Message-ID: <20080918144256.04BAC700D9@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/m2crypto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23007

Modified Files:
	m2crypto.spec 
Log Message:
enable sparc arches



Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- m2crypto.spec	11 Jun 2008 13:37:30 -0000	1.43
+++ m2crypto.spec	18 Sep 2008 14:42:25 -0000	1.44
@@ -1,12 +1,12 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 # Keep this value in sync with the definition in openssl.spec.
-%define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64
+%define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64 sparc sparcv9 sparc64
 
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
 Version: 0.18.2
-Release: 7
+Release: 8%{?dist}
 Source0: http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/m2crypto-%{version}.tar.gz
 Patch0: m2crypto-0.18-timeouts.patch
 Patch1: m2crypto-0.18-proxy.patch
@@ -38,6 +38,9 @@
 %ifarch %{ix86}
 basearch=i386
 %endif
+%ifarch sparcv9                                                                                                                          
+basearch=sparc                                                                                                                           
+%endif 
 %ifarch %{multilib_arches}
 sed -i -e "s/opensslconf/opensslconf-${basearch}/" SWIG/_ec.i
 %endif
@@ -81,6 +84,9 @@
 %{python_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* Thu Sep 18 2008 Dennis Gilmore <dennis at ausil.us> - 0.18.2-8
+- enable sparc arches
+
 * Wed Jun 11 2008 Miloslav Trma?? <mitr at redhat.com> - 0.18.2-7
 - Update m2urllib2 to match the Python 2.5 code instead
 



From kaitlin at fedoraproject.org  Thu Sep 18 14:45:36 2008
From: kaitlin at fedoraproject.org (Kaitlin Rupert)
Date: Thu, 18 Sep 2008 14:45:36 +0000 (UTC)
Subject: rpms/libcmpiutil/F-9 handle_inv_class.patch, NONE,
	1.1 libcmpiutil.spec, 1.5, 1.6
Message-ID: <20080918144536.86CDB700D9@cvs1.fedora.phx.redhat.com>

Author: kaitlin

Update of /cvs/pkgs/rpms/libcmpiutil/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23351

Modified Files:
	libcmpiutil.spec 
Added Files:
	handle_inv_class.patch 
Log Message:
Updating F9 rpm with handle_inv_class.patch.  This bumps the rpm version to 0.4-3.



handle_inv_class.patch:

--- NEW FILE handle_inv_class.patch ---
# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1220466913 25200
# Node ID 36c97d5c8c9f0eea12a87eae4e01bb80c9840ece
# Parent  b27fbfbc713cae6807aa9ecc97ae6de34cc5d5d2
[CU] Fix handling of invalid class in mof parser

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r b27fbfbc713c -r 36c97d5c8c9f eo_util_parser.y
--- a/eo_util_parser.y	Mon Jul 14 15:32:45 2008 -0700
+++ b/eo_util_parser.y	Wed Sep 03 11:35:13 2008 -0700
@@ -23,6 +23,7 @@
 
 #define RC_OK 0
 #define RC_EOF EOF
+#define RC_INVALID_CLASS -1000
 
 /* DEFINE ANY GLOBAL VARS HERE */
 static const CMPIBroker * _BROKER;
@@ -76,6 +77,8 @@
 			*_INSTANCE = CMNewInstance(_BROKER,
 						   op,
 						   NULL);
+			if (*_INSTANCE == NULL)
+				return RC_INVALID_CLASS;
 			free($3);
 			}
 		properties '}' ';'


Index: libcmpiutil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcmpiutil/F-9/libcmpiutil.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libcmpiutil.spec	29 Aug 2008 22:12:29 -0000	1.5
+++ libcmpiutil.spec	18 Sep 2008 14:45:06 -0000	1.6
@@ -3,7 +3,7 @@
 Summary: CMPI Utility Library
 Name: libcmpiutil
 Version: 0.4
-Release: 2%{?dist}%{?extra_release}
+Release: 3%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: ftp://libvirt.org/libvirt-cim/libcmpiutil-%{version}.tar.gz
@@ -14,7 +14,6 @@
 BuildRequires: bison
 BuildRequires: libxml2-devel
 BuildConflicts: sblim-cmpi-devel
-Patch0: rep_disabled_ind.patch 
 
 %description
 Libcmpiutil is a library of utility functions for CMPI providers.
@@ -40,7 +39,6 @@
 %prep
 %setup -q
 chmod -x *.c *.y *.h *.l
-%patch0 -p1
 
 %build
 %configure --enable-static=no
@@ -77,8 +75,11 @@
 %doc doc/SubmittingPatches
 
 %changelog
+* Wed Sep 03 2008 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.4-3
+- Added add handle_inv_class.patch to handle invalid classes in mof parser 
+
 * Fri Aug 29 2008 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.4-2
-- Added add rep_disabled_ind.patch patch to enable disabled indication reporting
+- Added add rep_disabled_ind.patch to enable disabled indication reporting
 
 * Tue May 20 2008 Dan Smith <danms at us.ibm.com> - 0.4-1
 - Updated to official 0.4 source release



From pertusus at fedoraproject.org  Thu Sep 18 15:01:53 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Thu, 18 Sep 2008 15:01:53 +0000 (UTC)
Subject: rpms/acpitool/devel acpitool-0.5-gcc43.patch, NONE, 1.1 .cvsignore, 
	1.7, 1.8 acpitool.spec, 1.14, 1.15 sources, 1.7,
	1.8 acpitool-0.4.7-gcc43.patch, 1.1, NONE
Message-ID: <20080918150153.6F693700D9@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/acpitool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25461

Modified Files:
	.cvsignore acpitool.spec sources 
Added Files:
	acpitool-0.5-gcc43.patch 
Removed Files:
	acpitool-0.4.7-gcc43.patch 
Log Message:
* Thu Sep 18 2008 Patrice Dumas <pertusus at free.fr> 0.5-1
- update to 0.5


acpitool-0.5-gcc43.patch:

--- NEW FILE acpitool-0.5-gcc43.patch ---
diff -up acpitool-0.5/src/cpu.cpp.gcc43 acpitool-0.5/src/cpu.cpp
--- acpitool-0.5/src/cpu.cpp.gcc43	2008-09-18 16:48:49.000000000 +0200
+++ acpitool-0.5/src/cpu.cpp	2008-09-18 16:49:22.000000000 +0200
@@ -69,7 +69,7 @@ int Show_CPU_Info()
 		    Show_Freq_Info();          // show freq scaling info if we have it //
 		else
 		{
-		    bzero(temp, 130);           
+		    memset(temp, '\0', 130);           
 		    sscanf(str, "%*[^:] %*s %s",temp);                    // ignore all up till :,  then ignore the :, then use what's left //
 		    printf("  CPU speed              : %s MHz \n", temp);
 		}
diff -up acpitool-0.5/src/freq.cpp.gcc43 acpitool-0.5/src/freq.cpp
--- acpitool-0.5/src/freq.cpp.gcc43	2008-07-21 00:47:55.000000000 +0200
+++ acpitool-0.5/src/freq.cpp	2008-09-18 16:46:54.000000000 +0200
@@ -28,6 +28,7 @@
 #endif
 
 #include <cstdlib>
+#include <cstring>
 #include <iostream>
 #include <iomanip>
 #include <fstream>
diff -up acpitool-0.5/src/toshiba.cpp.gcc43 acpitool-0.5/src/toshiba.cpp
--- acpitool-0.5/src/toshiba.cpp.gcc43	2007-11-06 22:19:59.000000000 +0100
+++ acpitool-0.5/src/toshiba.cpp	2008-09-18 16:46:54.000000000 +0200
@@ -29,6 +29,7 @@
 #endif
 
 #include <cstdlib>
+#include <cstring>
 #include <iostream>
 #include <iomanip>
 #include <fstream>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/acpitool/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Dec 2007 18:19:53 -0000	1.7
+++ .cvsignore	18 Sep 2008 15:01:23 -0000	1.8
@@ -1 +1 @@
-acpitool-0.4.7.tar.bz2
+acpitool-0.5.tar.bz2


Index: acpitool.spec
===================================================================
RCS file: /cvs/extras/rpms/acpitool/devel/acpitool.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- acpitool.spec	14 Jul 2008 17:12:23 -0000	1.14
+++ acpitool.spec	18 Sep 2008 15:01:23 -0000	1.15
@@ -1,22 +1,23 @@
 Summary: Command line ACPI client
 Name: acpitool
-Version: 0.4.7
-Release: 5%{?dist}
+Version: 0.5
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml
 
-Source: http://freeunix.dyndns.org:8000/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.bz2
-Patch0: acpitool-0.4.7-gcc43.patch
+Source0: http://freeunix.dyndns.org:8088/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.bz2
+Patch0: acpitool-0.5-gcc43.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 AcpiTool is a Linux ACPI client. It's a small command line application, 
-intended to be a replacement for the apm tool. The primary target audience 
-are laptop users, since these people are most interested in things like 
-battery status, thermal status and the ability to suspend (sleep mode). 
-The program simply accesses the /proc/acpi or /sysfs entries to get or set 
-ACPI values.
+intended to be a replacement for the apm tool. Besides "basic" ACPI 
+information like battery status, AC presence, putting the laptop to
+sleep, Acpitool also supports various extensions for Toshiba, Asus and 
+IBM Thinkpad laptops, allowing you to change the LCD brightness level, 
+toggle fan on/off, and more. 
+
 
 %prep
 %setup -q
@@ -40,6 +41,9 @@
 %{_mandir}/man1/acpitool*
 
 %changelog
+* Thu Sep 18 2008 Patrice Dumas <pertusus at free.fr> 0.5-1
+- update to 0.5
+
 * Mon Jul 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.7-5
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/acpitool/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Dec 2007 18:19:53 -0000	1.7
+++ sources	18 Sep 2008 15:01:23 -0000	1.8
@@ -1 +1 @@
-cba416a11229e896ec2639c59b6f59c5  acpitool-0.4.7.tar.bz2
+c4acc19eb002d6871d12abb490593202  acpitool-0.5.tar.bz2


--- acpitool-0.4.7-gcc43.patch DELETED ---



From mbarnes at fedoraproject.org  Thu Sep 18 15:06:47 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 18 Sep 2008 15:06:47 +0000 (UTC)
Subject: rpms/evolution-exchange/devel evolution-exchange.spec,1.40,1.41
Message-ID: <20080918150647.55FFB700D9@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26111

Modified Files:
	evolution-exchange.spec 
Log Message:

* Thu Sep 18 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.92-2.fc10
- Fix unowned directories (RH bug #462346).



Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- evolution-exchange.spec	8 Sep 2008 12:41:55 -0000	1.40
+++ evolution-exchange.spec	18 Sep 2008 15:06:17 -0000	1.41
@@ -23,7 +23,7 @@
 
 Name: evolution-exchange
 Version: 2.23.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -145,12 +145,20 @@
 %{_libdir}/evolution-data-server-%{eds_major}/camel-providers/libcamelexchange.urls
 %{_libexecdir}/evolution/%{evo_major}/evolution-exchange-storage 
 %{_datadir}/gtk-doc/html/evolution-exchange
-%{_datadir}/evolution-exchange/%{evo_major}/glade/*.glade
-%{_datadir}/evolution-exchange/%{evo_major}/images/*.png
-%{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
+%dir %{_datadir}/evolution-exchange
+%dir %{_datadir}/evolution-exchange/%{evo_major}
+%dir %{_datadir}/evolution-exchange/%{evo_major}/glade
+%dir %{_datadir}/evolution-exchange/%{evo_major}/images
+%dir %{_datadir}/evolution-exchange/%{evo_major}/ui
+%{_datadir}/evolution-exchange/%{evo_major}/glade/*
+%{_datadir}/evolution-exchange/%{evo_major}/images/*
+%{_datadir}/evolution-exchange/%{evo_major}/ui/*
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Thu Sep 18 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.92-2.fc10
+- Fix unowned directories (RH bug #462346).
+
 * Mon Sep 08 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.92-1.fc10
 - Update to 2.23.92
 



From gd at fedoraproject.org  Thu Sep 18 15:11:45 2008
From: gd at fedoraproject.org (Guenther Deschner)
Date: Thu, 18 Sep 2008 15:11:45 +0000 (UTC)
Subject: rpms/samba/F-9 samba-3.2.4-build.patch, NONE, 1.1 .cvsignore, 1.53, 
	1.54 samba.spec, 1.162, 1.163 sources, 1.57, 1.58
Message-ID: <20080918151145.A511F700D9@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26965

Modified Files:
	.cvsignore samba.spec sources 
Added Files:
	samba-3.2.4-build.patch 
Log Message:
- Update to 3.2.4
- resolves: #456889
- move cifs.upcall to /usr/sbin

Guenther


samba-3.2.4-build.patch:

--- NEW FILE samba-3.2.4-build.patch ---
commit 1f44b4aaa5f700827ee2ab272ae4b59e559b094b
Author: G??nther Deschner <gd at samba.org>
Date:   Fri Sep 5 14:01:45 2008 +0200

    build: don't install the cifs.upcall binary twice.
    
    Guenther

diff --git a/source/Makefile.in b/source/Makefile.in
index 8b46ab6..b67cfe8 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -178,7 +178,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
 
 # Note that all executable programs now provide for an optional executable suffix.
 
-SBIN_PROGS = bin/smbd at EXEEXT@ bin/nmbd at EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@ @CIFSUPCALL_PROGS@
+SBIN_PROGS = bin/smbd at EXEEXT@ bin/nmbd at EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@
 
 ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	27 Aug 2008 15:50:30 -0000	1.53
+++ .cvsignore	18 Sep 2008 15:11:15 -0000	1.54
@@ -1 +1 @@
-samba-3.2.3.tar.gz
+samba-3.2.4.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/samba.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- samba.spec	27 Aug 2008 15:50:30 -0000	1.162
+++ samba.spec	18 Sep 2008 15:11:15 -0000	1.163
@@ -1,5 +1,5 @@
-%define main_release 20
-%define samba_version 3.2.3
+%define main_release 21
+%define samba_version 3.2.4
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
 
@@ -8,7 +8,7 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.2.3
+Version: 3.2.4
 Release: %{samba_release}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
@@ -29,7 +29,7 @@
 Source10: nmb.init
 Source11: pam_winbind.conf
 
-# Don't depend on Net::LDAP
+	# Don't depend on Net::LDAP
 Source999: filter-requires-samba.sh
 
 # upstream patches.  Applied first so that they'll break our patches rather
@@ -46,6 +46,7 @@
 Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
+Patch201: samba-3.2.4-build.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64
@@ -252,6 +253,7 @@
 #%patch110 -p1 -b .smbspool # FIXME: does not apply
 #%patch111 -p1 -b .smbclient # FIXME: does not apply
 #%patch200 -p0 -b .inotify # FIXME: does not compile
+%patch201 -p1 -b .build
 
 mv source/VERSION source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < source/VERSION.orig > source/VERSION
@@ -430,7 +432,6 @@
 install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
 install -m755 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
 install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
-install -m755 source/bin/cifs.upcall $RPM_BUILD_ROOT/sbin/cifs.upcall
 
 install -m 755 source/lib/netapi/examples/bin/netdomjoin-gui $RPM_BUILD_ROOT/%{_sbindir}/netdomjoin-gui
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}
@@ -451,7 +452,6 @@
 
 # why are these getting installed in the wrong place?
 rm -f $RPM_BUILD_ROOT%{_sbindir}/{u,}mount.cifs
-rm -f $RPM_BUILD_ROOT%{_sbindir}/cifs.upcall
 
 
 %clean
@@ -676,7 +676,7 @@
 %defattr(-,root,root)
 /sbin/mount.cifs
 /sbin/umount.cifs
-/sbin/cifs.upcall
+%{_sbindir}/cifs.upcall
 %{_bindir}/rpcclient
 %{_bindir}/smbcacls
 %{_bindir}/findsmb
@@ -830,6 +830,11 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Thu Sep 18 2008 Guenther Deschner <gdeschner at redhat.com> - 3.2.4-0.21
+- Update to 3.2.4
+- resolves: #456889
+- move cifs.upcall to /usr/sbin
+
 * Wed Aug 27 2008 Guenther Deschner <gdeschner at redhat.com> - 3.2.3-0.20
 - Security fix for CVE-2008-3789
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	27 Aug 2008 15:50:30 -0000	1.57
+++ sources	18 Sep 2008 15:11:15 -0000	1.58
@@ -1 +1 @@
-c1630a57ac0ec24bc364c6d11c93ec35  samba-3.2.3.tar.gz
+7870a6bb3a025c6081cd56688acd494a  samba-3.2.4.tar.gz



From than at fedoraproject.org  Thu Sep 18 15:18:56 2008
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 18 Sep 2008 15:18:56 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase-4.1.1-bookmark-silent.patch, NONE,
	1.1 kdebase.spec, 1.340, 1.341
Message-ID: <20080918151856.4B67A700D9@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27859

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.1.1-bookmark-silent.patch 
Log Message:
make bookmark silent



kdebase-4.1.1-bookmark-silent.patch:

--- NEW FILE kdebase-4.1.1-bookmark-silent.patch ---
diff -up kdebase-4.1.1/apps/konqueror/src/konqbookmarkbar.cpp.orig kdebase-4.1.1/apps/konqueror/src/konqbookmarkbar.cpp
--- kdebase-4.1.1/apps/konqueror/src/konqbookmarkbar.cpp.orig	2008-09-18 17:04:43.000000000 +0200
+++ kdebase-4.1.1/apps/konqueror/src/konqbookmarkbar.cpp	2008-09-18 17:05:42.000000000 +0200
@@ -169,8 +169,6 @@ void KBookmarkBar::fillBookmarkBar(const
     if (parent.isNull())
         return;
 
-    qDebug()<<"fillBookmarkBar"<<parent.text();
-
     for (KBookmark bm = parent.first(); !bm.isNull(); bm = parent.next(bm))
     {
         qDebug()<<"bm is "<<bm.text();


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- kdebase.spec	29 Aug 2008 13:11:37 -0000	1.340
+++ kdebase.spec	18 Sep 2008 15:18:25 -0000	1.341
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -26,6 +26,7 @@
 
 # fedora specific nsplugins paths
 Patch1:   kdebase-nsplugins-paths.patch
+Patch2:   kdebase-4.1.1-bookmark-silent.patch
 
 ## upstream patches
 
@@ -123,7 +124,9 @@
 
 %prep
 %setup -q -n kdebase-%{version}
-%patch1   -p0 -b .nsplugins-paths
+%patch1 -p0 -b .nsplugins-paths
+%patch2 -p1 -b .silent
+
 # 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
 
@@ -303,6 +306,9 @@
 
 
 %changelog
+* Thu Sep 18 2008 Than Ngo <than at redhat.com> 4.1.1-2
+- make bookmark silent
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 



From awjb at fedoraproject.org  Thu Sep 18 15:26:08 2008
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Thu, 18 Sep 2008 15:26:08 +0000 (UTC)
Subject: rpms/fluxbox/devel .cvsignore, 1.11, 1.12 fluxbox.spec, 1.30,
	1.31 sources, 1.11, 1.12
Message-ID: <20080918152608.6117C700D9@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/fluxbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29147

Modified Files:
	.cvsignore fluxbox.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fluxbox/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	6 Sep 2008 08:11:48 -0000	1.11
+++ .cvsignore	18 Sep 2008 15:25:37 -0000	1.12
@@ -1 +1 @@
-fluxbox-1.1.0.1.tar.bz2
+fluxbox-1.1.1.tar.bz2


Index: fluxbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fluxbox/devel/fluxbox.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- fluxbox.spec	6 Sep 2008 08:11:48 -0000	1.30
+++ fluxbox.spec	18 Sep 2008 15:25:38 -0000	1.31
@@ -1,5 +1,5 @@
 Name:           fluxbox
-Version:        1.1.0.1
+Version:        1.1.1
 Release:        1%{?dist}
 
 Summary:	Window Manager based on Blackbox
@@ -8,7 +8,7 @@
 License:        MIT
 URL:            http://fluxbox.sourceforge.net
 
-Source0:        http://download.sourceforge.net/fluxbox/fluxbox-1.1.0.1.tar.bz2
+Source0:        http://download.sourceforge.net/fluxbox/fluxbox-1.1.1.tar.bz2
 Source3:        fluxbox.desktop
 Source4:        fluxbox-xdg-menu.py
 Patch0:         fluxbox-startfluxbox-pulseaudio.patch
@@ -99,6 +99,10 @@
 %{_sysconfdir}/fluxbox-pulseaudio
 
 %changelog
+* Thu Sep 18 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.1-1
+- version upgrade
+
 * Sat Sep 06 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.0.1-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fluxbox/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	6 Sep 2008 08:11:48 -0000	1.11
+++ sources	18 Sep 2008 15:25:38 -0000	1.12
@@ -1 +1 @@
-421366dbb21592196b5dde6c8ea11229  fluxbox-1.1.0.1.tar.bz2
+fa9fa8fe9a44f86522de5754f8b285ca  fluxbox-1.1.1.tar.bz2



From spot at fedoraproject.org  Thu Sep 18 15:31:39 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 18 Sep 2008 15:31:39 +0000 (UTC)
Subject: rpms/tcl-snack/F-9 tcl-snack.spec,1.2,1.3
Message-ID: <20080918153139.485E4700D9@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-snack/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29798/F-9

Modified Files:
	tcl-snack.spec 
Log Message:
go back to hardcoding, get it right for f8


Index: tcl-snack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-snack/F-9/tcl-snack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tcl-snack.spec	17 Sep 2008 19:05:34 -0000	1.2
+++ tcl-snack.spec	18 Sep 2008 15:31:09 -0000	1.3
@@ -1,11 +1,15 @@
-%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+# We used to define this dynamically, but the Fedora buildsystem chokes on
+# using this for the versioned Requires on tcl(abi), so we hardcode it.
+# This sucks, but there is no other clean way around it, because tcl
+# (and tclsh) aren't in the default buildroot.
+%{!?tcl_version: %define tcl_version 8.5}
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define realname snack
 
 Name:		tcl-%{realname}
 Version:	2.2.10
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Sound toolkit
 Group:		System Environment/Libraries
 License:	GPLv2+
@@ -97,6 +101,9 @@
 %{python_sitelib}/tkSnack*
 
 %changelog
+* Thu Sep 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-4
+- *sigh* hardcoding the tcl version is the only way to get it through the buildsystem
+
 * Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-3
 - don't hardcode tcl abi version
 



From spot at fedoraproject.org  Thu Sep 18 15:31:39 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 18 Sep 2008 15:31:39 +0000 (UTC)
Subject: rpms/tcl-snack/F-8 tcl-snack.spec,1.2,1.3
Message-ID: <20080918153139.154F5700D9@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-snack/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29798/F-8

Modified Files:
	tcl-snack.spec 
Log Message:
go back to hardcoding, get it right for f8


Index: tcl-snack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-snack/F-8/tcl-snack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tcl-snack.spec	17 Sep 2008 19:05:33 -0000	1.2
+++ tcl-snack.spec	18 Sep 2008 15:31:08 -0000	1.3
@@ -1,11 +1,15 @@
-%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+# We used to define this dynamically, but the Fedora buildsystem chokes on
+# using this for the versioned Requires on tcl(abi), so we hardcode it.
+# This sucks, but there is no other clean way around it, because tcl
+# (and tclsh) aren't in the default buildroot.
+%{!?tcl_version: %define tcl_version 8.4}
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define realname snack
 
 Name:		tcl-%{realname}
 Version:	2.2.10
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Sound toolkit
 Group:		System Environment/Libraries
 License:	GPLv2+
@@ -97,6 +101,9 @@
 %{python_sitelib}/tkSnack*
 
 %changelog
+* Thu Sep 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-4
+- *sigh* hardcoding the tcl version is the only way to get it through the buildsystem
+
 * Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-3
 - don't hardcode tcl abi version
 



From spot at fedoraproject.org  Thu Sep 18 15:31:39 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 18 Sep 2008 15:31:39 +0000 (UTC)
Subject: rpms/tcl-snack/devel tcl-snack.spec,1.2,1.3
Message-ID: <20080918153139.9399B700D9@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-snack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29798/devel

Modified Files:
	tcl-snack.spec 
Log Message:
go back to hardcoding, get it right for f8


Index: tcl-snack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-snack/devel/tcl-snack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tcl-snack.spec	17 Sep 2008 19:05:34 -0000	1.2
+++ tcl-snack.spec	18 Sep 2008 15:31:09 -0000	1.3
@@ -1,11 +1,15 @@
-%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+# We used to define this dynamically, but the Fedora buildsystem chokes on
+# using this for the versioned Requires on tcl(abi), so we hardcode it.
+# This sucks, but there is no other clean way around it, because tcl
+# (and tclsh) aren't in the default buildroot.
+%{!?tcl_version: %define tcl_version 8.5}
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define realname snack
 
 Name:		tcl-%{realname}
 Version:	2.2.10
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Sound toolkit
 Group:		System Environment/Libraries
 License:	GPLv2+
@@ -97,6 +101,9 @@
 %{python_sitelib}/tkSnack*
 
 %changelog
+* Thu Sep 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-4
+- *sigh* hardcoding the tcl version is the only way to get it through the buildsystem
+
 * Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-3
 - don't hardcode tcl abi version
 



From s4504kr at fedoraproject.org  Thu Sep 18 15:45:41 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 18 Sep 2008 15:45:41 +0000 (UTC)
Subject: rpms/gnu-smalltalk/EL-5 gst-3.0.4-am.patch, NONE,
	1.1 gst-3.0.4-tst.patch, NONE, 1.1 gnu-smalltalk.spec, 1.11,
	1.12 sources, 1.5, 1.6 gst-2.3.3-path.patch, 1.1,
	NONE gst-2.3.3-pub.patch, 1.1, NONE gst-2.3.5-am.patch, 1.1, NONE
Message-ID: <20080918154541.4C8C2700D9@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/gnu-smalltalk/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31623

Modified Files:
	gnu-smalltalk.spec sources 
Added Files:
	gst-3.0.4-am.patch gst-3.0.4-tst.patch 
Removed Files:
	gst-2.3.3-path.patch gst-2.3.3-pub.patch gst-2.3.5-am.patch 
Log Message:
Initional EL-5 package

gst-3.0.4-am.patch:

--- NEW FILE gst-3.0.4-am.patch ---
diff -up smalltalk-3.0.4/configure.ac.auto smalltalk-3.0.4/configure.ac
--- smalltalk-3.0.4/configure.ac.auto	2008-08-09 15:09:56.000000000 +0200
+++ smalltalk-3.0.4/configure.ac	2008-09-08 17:06:25.000000000 +0200
@@ -7,7 +7,7 @@ dnl with this software.
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.60)
-AC_INIT([GNU Smalltalk], 3.0.4, help-smalltalk at gnu.org, smalltalk)
+AC_INIT([GNU Smalltalk], 3.0.4, help-smalltalk at gnu.org, gnu-smalltalk)
 MAINTAINER="bonzini at gnu.org"
 
 dnl CURRENT:REVISION:AGE means this is the REVISION-th version of
diff -up smalltalk-3.0.4/configure.auto smalltalk-3.0.4/configure
--- smalltalk-3.0.4/configure.auto	2008-09-08 17:06:46.000000000 +0200
+++ smalltalk-3.0.4/configure	2008-09-08 17:07:31.000000000 +0200
@@ -723,7 +723,7 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME='GNU Smalltalk'
-PACKAGE_TARNAME='smalltalk'
+PACKAGE_TARNAME='gnu-smalltalk'
 PACKAGE_VERSION='3.0.4'
 PACKAGE_STRING='GNU Smalltalk 3.0.4'
 PACKAGE_BUGREPORT='help-smalltalk at gnu.org'
@@ -811,6 +811,7 @@ MAINTAINER
 INSTALL_PROGRAM
 INSTALL_SCRIPT
 INSTALL_DATA
+am__isrc
 CYGPATH_W
 ACLOCAL
 AUTOCONF
@@ -1505,7 +1506,7 @@ Fine tuning of the installation director
   --infodir=DIR          info documentation [DATAROOTDIR/info]
   --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/smalltalk]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/gnu-smalltalk]
   --htmldir=DIR          html documentation [DOCDIR]
   --dvidir=DIR           dvi documentation [DOCDIR]
   --pdfdir=DIR           pdf documentation [DOCDIR]
@@ -2169,7 +2170,8 @@ ac_config_commands="$ac_config_commands 
 
 ac_config_headers="$ac_config_headers config.h"
 
-am__api_version="1.9"
+am__api_version='1.10'
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -2321,38 +2323,53 @@ else
 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
   else
-    mkdir_p='$(install_sh) -d'
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P 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.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
   fi
 fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
 
 for ac_prog in gawk mawk nawk awk
 do
@@ -2435,12 +2452,16 @@ else
 fi
 rmdir .tst 2>/dev/null
 
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
+  fi
 fi
 
 # test whether we have cygpath
@@ -2454,7 +2475,7 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE='smalltalk'
+ PACKAGE='gnu-smalltalk'
  VERSION='3.0.4'
 
 
@@ -2483,7 +2504,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
 # run `make install-strip'.  However `strip' might not be the right
@@ -2587,7 +2608,7 @@ else
 fi
 
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -2788,9 +2809,7 @@ if test "x$enable_dependency_tracking" !
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
 else
@@ -2799,7 +2818,6 @@ else
 fi
 
 
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3786,6 +3804,7 @@ else
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3815,9 +3834,7 @@ fi
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -4699,14 +4716,12 @@ _ACEOF
 
 fi
 
-
-        { echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
-echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6; }
-if test "${ac_cv_lib_cposix_strerror+set}" = set; then
+{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
+if test "${ac_cv_search_strerror+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcposix  $LIBS"
+  ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4729,7 +4744,14 @@ return strerror ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
+for ac_lib in '' cposix; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -4747,25 +4769,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_cposix_strerror=yes
+  ac_cv_search_strerror=$ac_res
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_cposix_strerror=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
+      conftest$ac_exeext
+  if test "${ac_cv_search_strerror+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search_strerror+set}" = set; then
+  :
+else
+  ac_cv_search_strerror=no
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
-echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6; }
-if test $ac_cv_lib_cposix_strerror = yes; then
-  LIBS="$LIBS -lcposix"
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
 fi
+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
+ac_res=$ac_cv_search_strerror
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
-
+fi
 
 
 
@@ -5203,7 +5235,7 @@ else
 	am_cv_lispdir=`sed -n \
        -e 's,/$,,' \
        -e '/.*\/lib\/x*emacs\/site-lisp$/{s,.*/lib/\(x*emacs/site-lisp\)$,${libdir}/\1,;p;q;}' \
-       -e '/.*\/share\/x*emacs\/site-lisp$/{s,.*/share/\(x*emacs/site-lisp\),${datadir}/\1,;p;q;}' \
+       -e '/.*\/share\/x*emacs\/site-lisp$/{s,.*/share/\(x*emacs/site-lisp\),${datarootdir}/\1,;p;q;}' \
        conftest.out`
        rm conftest.out
      fi
@@ -5241,9 +5273,7 @@ echo "${ECHO_T}$ac_cv_emacs_comint" >&6;
 
 
 
-
-
-if test "$EMACS" != no; then
+ if test "$EMACS" != no; then
   WITH_EMACS_TRUE=
   WITH_EMACS_FALSE='#'
 else
@@ -5251,9 +5281,7 @@ else
   WITH_EMACS_FALSE=
 fi
 
-
-
-if test "$ac_cv_emacs_comint" != no; then
+ if test "$ac_cv_emacs_comint" != no; then
   WITH_EMACS_COMINT_TRUE=
   WITH_EMACS_COMINT_FALSE='#'
 else
@@ -9600,7 +9628,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 9603 "configure"' > conftest.$ac_ext
+  echo '#line 9631 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -11158,11 +11186,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11161: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11189: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11165: \$? = $ac_status" >&5
+   echo "$as_me:11193: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -11401,11 +11429,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11404: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11432: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11408: \$? = $ac_status" >&5
+   echo "$as_me:11436: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -11461,11 +11489,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11464: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11492: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11468: \$? = $ac_status" >&5
+   echo "$as_me:11496: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13609,7 +13637,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13612 "configure"
+#line 13640 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13707,7 +13735,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13710 "configure"
+#line 13738 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19020,9 +19048,7 @@ if test "${enable_ltdl_install+set}" = s
 fi
 
 
-
-
-if test x"${enable_ltdl_install-no}" != xno; then
+ if test x"${enable_ltdl_install-no}" != xno; then
   INSTALL_LTDL_TRUE=
   INSTALL_LTDL_FALSE='#'
 else
@@ -19030,9 +19056,7 @@ else
   INSTALL_LTDL_FALSE=
 fi
 
-
-
-if test x"${enable_ltdl_convenience-no}" != xno; then
+ if test x"${enable_ltdl_convenience-no}" != xno; then
   CONVENIENCE_LTDL_TRUE=
   CONVENIENCE_LTDL_FALSE='#'
 else
@@ -19862,7 +19886,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 19865 "configure"
+#line 19889 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -27989,9 +28013,7 @@ echo "${ECHO_T}$ac_cv_header_lightning_h
 fi
 
 
-
-
-if (exit 1); then
+ if (exit 1); then
   LIGHTNING_MAIN_TRUE=
   LIGHTNING_MAIN_FALSE='#'
 else
@@ -27999,9 +28021,7 @@ else
   LIGHTNING_MAIN_FALSE=
 fi
 
-
-
-if test "$ac_cv_header_lightning_h" = yes; then
+ if test "$ac_cv_header_lightning_h" = yes; then
   HAVE_INSTALLED_LIGHTNING_TRUE=
   HAVE_INSTALLED_LIGHTNING_FALSE='#'
 else
@@ -28088,9 +28108,7 @@ else
   enable_disassembler=no
 fi
 
-
-
-if test "$enable_disassembler" != no; then
+ if test "$enable_disassembler" != no; then
   ENABLE_DISASSEMBLER_TRUE=
   ENABLE_DISASSEMBLER_FALSE='#'
 else
@@ -28734,6 +28752,7 @@ gives unlimited permission to copy, dist
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -28983,6 +29002,7 @@ MAINTAINER!$MAINTAINER$ac_delim
 INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
 INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
 INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
 CYGPATH_W!$CYGPATH_W$ac_delim
 ACLOCAL!$ACLOCAL$ac_delim
 AUTOCONF!$AUTOCONF$ac_delim
@@ -29029,7 +29049,6 @@ EGREP!$EGREP$ac_delim
 SED!$SED$ac_delim
 LN_S!$LN_S$ac_delim
 LN!$LN$ac_delim
-INSTALL_INFO!$INSTALL_INFO$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
@@ -29079,6 +29098,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+INSTALL_INFO!$INSTALL_INFO$ac_delim
 ZIP!$ZIP$ac_delim
 EMACS!$EMACS$ac_delim
 EMACSLOADPATH!$EMACSLOADPATH$ac_delim
@@ -29156,7 +29176,7 @@ LTALLOCA!$LTALLOCA$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -29383,6 +29403,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -29436,6 +29461,7 @@ s&@builddir@&$ac_builddir&;t t
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
 
@@ -29551,21 +29577,22 @@ echo "$as_me: $ac_file is unchanged" >&6
   fi
   rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $ac_file | $ac_file:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -29649,8 +29676,9 @@ ATEOF
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \

gst-3.0.4-tst.patch:

--- NEW FILE gst-3.0.4-tst.patch ---
diff -up smalltalk-3.0.4/tests/testsuite.at.tst smalltalk-3.0.4/tests/testsuite.at
--- smalltalk-3.0.4/tests/testsuite.at.tst	2008-08-10 20:40:32.000000000 +0200
+++ smalltalk-3.0.4/tests/testsuite.at	2008-08-10 20:40:44.000000000 +0200
@@ -152,5 +152,5 @@ AT_PACKAGE_TEST([DhbNumericalMethods])
 AT_PACKAGE_TEST([Digest])
 AT_OPTIONAL_PACKAGE_TEST([GDBM])
 AT_OPTIONAL_PACKAGE_TEST([Iconv])
-AT_PACKAGE_TEST([Sport])
+# AT_PACKAGE_TEST([Sport])
 AT_OPTIONAL_PACKAGE_TEST([ZLib])


Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/EL-5/gnu-smalltalk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnu-smalltalk.spec	25 Jun 2007 18:24:49 -0000	1.11
+++ gnu-smalltalk.spec	18 Sep 2008 15:45:10 -0000	1.12
@@ -1,17 +1,21 @@
 Summary: GNU Smalltalk
 Name: gnu-smalltalk
-Version: 2.3.5
-Release: 1%{?dist}.1
+Version: 3.0.4
+Release: 2%{?dist}
 Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
-Patch1: gst-2.3.5-am.patch
-License: GPL
+Patch1: gst-3.0.4-am.patch
+Patch2: gst-3.0.4-tst.patch
+License: GPLv2
 Group: Development/Languages
 URL: http://www.gnu.org/software/smalltalk/smalltalk.html
 Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
+ExcludeArch: ppc64 ppc
+
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
+BuildRequires: prelink
 BuildRequires: tk-devel
 BuildRequires: gtk2-devel
 BuildRequires: gdbm-devel
@@ -22,6 +26,11 @@
 BuildRequires: texinfo
 BuildRequires: zlib-devel
 BuildRequires: libsigsegv-devel
+BuildRequires: mysql-devel
+BuildRequires: sqlite-devel
+BuildRequires: libffi-devel
+BuildRequires: pkgconfig
+BuildRequires: zip
 
 %description
 GNU Smalltalk is an implementation that closely follows the
@@ -49,8 +58,7 @@
 %package devel
 Summary: Development Stuff for the GNU Smalltalk package
 Group: Development/Libraries
-Requires: %{name} = %{version}
-Requires: automake
+#Requires: automake
 Requires: pkgconfig
 %description devel
 This Package contains header files and other stuff provided by
@@ -61,20 +69,33 @@
 
 %prep
 %setup -q -n smalltalk-%{version}
-%patch1 -p1 -b .automake
+%patch1 -p1 -b .auto
+%patch2 -p1 -b .tst
 
 %build
-# automake
-# autoreconf
-
+CFLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack"
 %configure --with-tcl=%{_libdir} --with-tk=%{_libdir} \
   --enable-static=no --enable-shared=yes --disable-rpath \
+  --with-system-libsigsegv \
+  --with-system-libffi=yes \
   --with-imagedir=%{_libdir}/%{name}
 
-make %{?_smp_mflags} LIBTOOL="%{_bindir}/libtool" 
+# _smp_mflags seems not to work
+make #  LIBTOOL="%{_bindir}/libtool" 
+
+cd doc
+
+for i in gst*; do
+  sed -e 's!%{_libdir}!/usr/lib(64)!g' \
+      -e 's!/usr/lib!/usr/lib(64)!g' \
+      -e 's!/usr/share/gnu-smalltalk/kernel!/usr/lib(64)/gnu-smalltalk/kernel!g' \
+      $i >$i.new
+  mv -f $i.new $i
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -c -p" install
 
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/libgst*a*
@@ -84,6 +105,11 @@
 
 rm -rf $RPM_BUILD_ROOT/%{_infodir}/dir
 
+cd $RPM_BUILD_ROOT/%{_mandir}/man1
+
+rm gst-reload.1
+ln -sf ./gst-load.1 gst-reload.1
+
 %check
 make check
 
@@ -108,6 +134,9 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/gst
+%{_bindir}/gst-blox
+%{_bindir}/gst-convert
+%{_bindir}/gst-doc
 %{_bindir}/gst-load
 %{_bindir}/gst-package
 %{_bindir}/gst-reload
@@ -115,16 +144,20 @@
 
 %{_libdir}/libgst.so.*
 
-%{_libdir}/gnu-smalltalk/
-
 %{_infodir}/gst.info*
 %{_infodir}/gst-*.info*
 
+%{_datadir}/gnu-smalltalk/
+%{_libexecdir}/gnu-smalltalk/
+
 %{_mandir}/man1/gst.1*
+%{_mandir}/man1/gst-*
 
 %doc AUTHORS COPYING COPYING.DOC COPYING.LIB ChangeLog 
 %doc NEWS README THANKS TODO
 
+%{_libdir}/gnu-smalltalk/
+
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/gst-config
@@ -141,8 +174,59 @@
 %{_datadir}/emacs/site-lisp/*
 
 %changelog
-* Mon Jun 25 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.5-1.1
-- Try to fix tagging issue
+* Sun Aug 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 3.0.4-2
+- Add zip as BR
+- New upstream release
+
+* Sun Jun  8 2008 Jochen Schmitt <Jochen herr-schmitt de> 3.0.3-2
+- Disable 'make check'
+
+* Wed May 14 2008 Jochen Schmitt <Jochen herr-schmitt de> 3.0.3-1
+- New upstream release
+
+* Thu Apr 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 3.0.2-4
+- Patch configure.ac to make version independency from libffi
+
+* Sat Mar 08 2008 Xavier Lamien <lxtnow[at]gmail.com> 3.0.2-2
+- Updated release.
+- Disable x86_64 arch, because 'make test' fails on this arch
+
+* Sun Feb 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 3.0.1-3
+- Use system libffi
+
+* Sun Feb 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 3.0.1-1
+- New upstream release
+
+* Mon Jan 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 3.0-1
+- New upstream release
+
+* Thu Jan 03 2008 Alex Lancaster <alexlan fedoraproject.org> 2.3.6-8
+- Rebuild for Tcl 8.5
+
+* Sun Nov 18 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.6-7
+- Fix broken Changelog
+
+* Thu Oct 25 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.6-6
+- Add upstream multilib patch
+
+* Wed Oct 24 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.6-4
+- Another try to fix the multilib issue
+
+* Mon Oct 22 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.6-3
+- Create new subpackage to solve mulitlib issue (#341341)
+
+* Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.6-2
+- Remove build path from gst.im
+- Temporarly disable ppc64
+
+* Thu Sep  6 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.6-1
+- New upstream release
+
+* Thu Aug  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.5-3
+- Try to fix smp_mflags issue
+
+* Wed Aug  8 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.5-2
+- Changing license tag
 
 * Sun Jun  3 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.5-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Jun 2007 18:47:21 -0000	1.5
+++ sources	18 Sep 2008 15:45:10 -0000	1.6
@@ -1 +1 @@
-552df4030532f4c1dcc24cfb0c5ad097  smalltalk-2.3.5.tar.gz
+43fd866caff3a12b0f03fa0a8fac2a78  smalltalk-3.0.4.tar.gz


--- gst-2.3.3-path.patch DELETED ---


--- gst-2.3.3-pub.patch DELETED ---


--- gst-2.3.5-am.patch DELETED ---



From nalin at fedoraproject.org  Thu Sep 18 15:50:38 2008
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Thu, 18 Sep 2008 15:50:38 +0000 (UTC)
Subject: rpms/libgcrypt/devel .cvsignore, 1.11, 1.12 libgcrypt.spec, 1.30,
	1.31 sources, 1.11, 1.12
Message-ID: <20080918155038.93633700D9@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/libgcrypt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32496

Modified Files:
	.cvsignore libgcrypt.spec sources 
Log Message:
- update to 1.4.3
- own /etc/gcrypt
- fix rpmlint warning about the summary by dropping the final '.'



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	8 Sep 2008 23:05:08 -0000	1.11
+++ .cvsignore	18 Sep 2008 15:50:08 -0000	1.12
@@ -13,3 +13,5 @@
 libgcrypt-1.4.1.tar.bz2.sig
 libgcrypt-1.4.2.tar.bz2
 libgcrypt-1.4.2.tar.bz2.sig
+libgcrypt-1.4.3.tar.bz2
+libgcrypt-1.4.3.tar.bz2.sig


Index: libgcrypt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/devel/libgcrypt.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libgcrypt.spec	15 Sep 2008 19:49:03 -0000	1.30
+++ libgcrypt.spec	18 Sep 2008 15:50:08 -0000	1.31
@@ -1,12 +1,12 @@
 Name: libgcrypt
-Version: 1.4.2
-Release: 1
+Version: 1.4.3
+Release: 1%{?dist}
 Source0: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2.sig
 Source2: wk at g10code.com
 # Technically LGPLv2.1+, but Fedora's table doesn't draw a distinction.
 License: LGPLv2+
-Summary: A general-purpose cryptography library.
+Summary: A general-purpose cryptography library
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gawk, libgpg-error-devel >= 1.4, pkgconfig
 Group: System Environment/Libraries
@@ -79,6 +79,10 @@
 /sbin/ldconfig -n $RPM_BUILD_ROOT/%{_lib}/
 rm -f $RPM_BUILD_ROOT/root_marker
 
+# Create /etc/gcrypt (hardwired, not dependent on the configure invocation) so
+# that _someone_ owns it.
+mkdir -p -m 755 $RPM_BUILD_ROOT/etc/gcrypt
+
 %clean
 rm -fr $RPM_BUILD_ROOT
 
@@ -98,6 +102,7 @@
 
 %files
 %defattr(-,root,root)
+%dir /etc/gcrypt
 /%{_lib}/*.so.*
 #%{_libdir}/%{name}
 
@@ -114,6 +119,10 @@
 %{_infodir}/gcrypt.info*
 
 %changelog
+* Thu Sep 18 2008 Nalin Dahyabhai <nalin at redhat.com> 1.4.3-1
+- update to 1.4.3
+- own /etc/gcrypt
+
 * Mon Sep 15 2008 Nalin Dahyabhai <nalin at redhat.com>
 - invoke make with %%{?_smp_mflags} to build faster on multi-processor
   systems (Steve Grubb)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Sep 2008 23:05:08 -0000	1.11
+++ sources	18 Sep 2008 15:50:08 -0000	1.12
@@ -1,2 +1,2 @@
-0d27005ff43ecf3d96ae02d99bf793ba  libgcrypt-1.4.2.tar.bz2
-3645b7f13ffaa953a4cbfa294fb1a2f0  libgcrypt-1.4.2.tar.bz2.sig
+46e50e811ed51f1e0e8dd677dded967d  libgcrypt-1.4.3.tar.bz2
+b6c8495eaeb912aa612196a849039e74  libgcrypt-1.4.3.tar.bz2.sig



From mdomsch at fedoraproject.org  Thu Sep 18 15:51:17 2008
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Thu, 18 Sep 2008 15:51:17 +0000 (UTC)
Subject: rpms/elektra/devel elektra.spec,1.6,1.7
Message-ID: <20080918155117.D3600700D9@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/elektra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32724

Modified Files:
	elektra.spec 
Log Message:
add -D_GNU_SOURCE to CFLAGS, fixes FTBFS BZ#434364


Index: elektra.spec
===================================================================
RCS file: /cvs/extras/rpms/elektra/devel/elektra.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- elektra.spec	19 Feb 2008 18:10:46 -0000	1.6
+++ elektra.spec	18 Sep 2008 15:50:47 -0000	1.7
@@ -1,7 +1,7 @@
 Summary:       A key/value pair database to store software configurations
 Name:          elektra
 Version:       0.6.10
-Release:       7%{?dist}
+Release:       8%{?dist}
 Group:         System Environment/Libraries
 License:       BSD
 URL:           http://www.libelektra.org
@@ -67,6 +67,10 @@
 %patch1 -p1 -b .open
 
 %build
+CFLAGS="%{optflags} -D_GNU_SOURCE"
+export CFLAGS
+CXXFLAGS="%{optflags} -D_GNU_SOURCE"
+export CXXFLAGS
 %configure \
      --includedir=%{_includedir}/elektra \
      --program-prefix=%{name}- \
@@ -178,6 +182,9 @@
 
 
 %changelog
+* Thu Sep 18 2008 Matt Domsch <mdomsch at fedoraproject.org> - 0.6.10-8
+- add -D_GNU_SOURCE to CFLAGS, fixes FTBFS BZ#434364
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.6.10-7
 - Autorebuild for GCC 4.3
 



From gd at fedoraproject.org  Thu Sep 18 16:07:53 2008
From: gd at fedoraproject.org (Guenther Deschner)
Date: Thu, 18 Sep 2008 16:07:53 +0000 (UTC)
Subject: rpms/samba/devel samba-3.2.4-build.patch, NONE, 1.1 .cvsignore, 1.53,
	1.54 samba.spec, 1.161, 1.162 sources, 1.57, 1.58
Message-ID: <20080918160754.0264A700D9@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2105

Modified Files:
	.cvsignore samba.spec sources 
Added Files:
	samba-3.2.4-build.patch 
Log Message:
- Update to 3.2.4
- resolves: #456889
- move cifs.upcall to /usr/sbin

Guenther


samba-3.2.4-build.patch:

--- NEW FILE samba-3.2.4-build.patch ---
commit 1f44b4aaa5f700827ee2ab272ae4b59e559b094b
Author: G??nther Deschner <gd at samba.org>
Date:   Fri Sep 5 14:01:45 2008 +0200

    build: don't install the cifs.upcall binary twice.
    
    Guenther

diff --git a/source/Makefile.in b/source/Makefile.in
index 8b46ab6..b67cfe8 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -178,7 +178,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
 
 # Note that all executable programs now provide for an optional executable suffix.
 
-SBIN_PROGS = bin/smbd at EXEEXT@ bin/nmbd at EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@ @CIFSUPCALL_PROGS@
+SBIN_PROGS = bin/smbd at EXEEXT@ bin/nmbd at EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@
 
 ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	27 Aug 2008 17:36:42 -0000	1.53
+++ .cvsignore	18 Sep 2008 16:07:23 -0000	1.54
@@ -1 +1 @@
-samba-3.2.3.tar.gz
+samba-3.2.4.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- samba.spec	27 Aug 2008 17:36:42 -0000	1.161
+++ samba.spec	18 Sep 2008 16:07:23 -0000	1.162
@@ -1,5 +1,5 @@
-%define main_release 21
-%define samba_version 3.2.3
+%define main_release 22
+%define samba_version 3.2.4
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
 
@@ -8,7 +8,7 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.2.3
+Version: 3.2.4
 Release: %{samba_release}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
@@ -46,6 +46,7 @@
 Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
+Patch201: samba-3.2.4-build.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64
@@ -252,6 +253,7 @@
 #%patch110 -p1 -b .smbspool # FIXME: does not apply
 #%patch111 -p1 -b .smbclient # FIXME: does not apply
 #%patch200 -p0 -b .inotify # FIXME: does not compile
+%patch201 -p1 -b .build
 
 mv source/VERSION source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < source/VERSION.orig > source/VERSION
@@ -430,7 +432,6 @@
 install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
 install -m755 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
 install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
-install -m755 source/bin/cifs.upcall $RPM_BUILD_ROOT/sbin/cifs.upcall
 
 install -m 755 source/lib/netapi/examples/bin/netdomjoin-gui $RPM_BUILD_ROOT/%{_sbindir}/netdomjoin-gui
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}
@@ -451,7 +452,6 @@
 
 # why are these getting installed in the wrong place?
 rm -f $RPM_BUILD_ROOT%{_sbindir}/{u,}mount.cifs
-rm -f $RPM_BUILD_ROOT%{_sbindir}/cifs.upcall
 
 
 %clean
@@ -676,7 +676,7 @@
 %defattr(-,root,root)
 /sbin/mount.cifs
 /sbin/umount.cifs
-/sbin/cifs.upcall
+%{_sbindir}/cifs.upcall
 %{_bindir}/rpcclient
 %{_bindir}/smbcacls
 %{_bindir}/findsmb
@@ -830,6 +830,11 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Thu Sep 18 2008 Guenther Deschner <gdeschner at redhat.com> - 3.2.4-0.22
+- Update to 3.2.4
+- resolves: #456889
+- move cifs.upcall to /usr/sbin
+
 * Wed Aug 27 2008 Guenther Deschner <gdeschner at redhat.com> - 3.2.3-0.21
 - Security fix for CVE-2008-3789
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	27 Aug 2008 17:36:42 -0000	1.57
+++ sources	18 Sep 2008 16:07:23 -0000	1.58
@@ -1 +1 @@
-c1630a57ac0ec24bc364c6d11c93ec35  samba-3.2.3.tar.gz
+7870a6bb3a025c6081cd56688acd494a  samba-3.2.4.tar.gz



From kkofler at fedoraproject.org  Thu Sep 18 16:17:25 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 18 Sep 2008 16:17:25 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames.spec, 1.102,
	1.103 kdegames-3.97.0-parallel_devel.patch, 1.1, NONE
Message-ID: <20080918161725.70CE2700D9@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2922/devel

Modified Files:
	kdegames.spec 
Removed Files:
	kdegames-3.97.0-parallel_devel.patch 
Log Message:
* Thu Sep 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
- drop no longer needed devel symlink hacks


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- kdegames.spec	3 Sep 2008 09:48:17 -0000	1.102
+++ kdegames.spec	18 Sep 2008 16:16:55 -0000	1.103
@@ -5,7 +5,7 @@
 Summary: K Desktop Environment 4 - Games 
 Epoch:   6
 Version: 4.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -13,9 +13,6 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegames-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Invert the search order for libkdegames to make sure the KDE 4 version is always found first
-Patch0:  kdegames-3.97.0-parallel_devel.patch
-
 Obsoletes: kdegames4 < %{version}-%{release}
 Provides:  kdegames4 = %{version}-%{release}
 
@@ -91,7 +88,6 @@
 
 %prep
 %setup -q -n kdegames-%{version}
-%patch0 -p1 -b .parallel_devel
 
 
 %build
@@ -109,14 +105,6 @@
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-# move conflicting devel symlink
-mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
-pushd %{buildroot}%{_kde4_libdir}
-linktarget=`readlink "libkdegames.so"`
-rm -f "libkdegames.so"
-ln -sf "../../$linktarget" "kde4/devel/libkdegames.so"
-popd
-
 # HACK, FIXME
 install -m644 -p -D ./kbattleship/src/module.dsc %{buildroot}%{_ggz_datadir}/kbattleship.dsc
 install -m644 -p -D ./kreversi/module.dsc %{buildroot}%{_ggz_datadir}/kreversi.dsc
@@ -184,10 +172,12 @@
 %{_kde4_appsdir}/cmake/modules/*
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
-%{_kde4_libdir}/kde4/devel/libkdegames.so
 
 
 %changelog
+* Thu Sep 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
+- drop no longer needed devel symlink hacks
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


--- kdegames-3.97.0-parallel_devel.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Sep 18 16:36:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 16:36:12 +0000
Subject: [pkgdb] cryptsetup-luks (Fedora, 8) updated by toshio
Message-ID: <20080918163612.E880F208D9F@bastion.fedora.phx.redhat.com>

toshio changed owner of cryptsetup-luks in Fedora 8 to lvm-team

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks



From pkgdb at fedoraproject.org  Thu Sep 18 16:36:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 16:36:12 +0000
Subject: [pkgdb] cryptsetup-luks (Fedora, 9) updated by toshio
Message-ID: <20080918163613.03D7A208DA6@bastion.fedora.phx.redhat.com>

toshio changed owner of cryptsetup-luks in Fedora 9 to lvm-team

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks



From pkgdb at fedoraproject.org  Thu Sep 18 16:36:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 16:36:12 +0000
Subject: [pkgdb] cryptsetup-luks (Fedora, devel) updated by toshio
Message-ID: <20080918163613.1D569208DAD@bastion.fedora.phx.redhat.com>

toshio changed owner of cryptsetup-luks in Fedora devel to lvm-team

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks



From pkgdb at fedoraproject.org  Thu Sep 18 17:06:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:06:13 +0000
Subject: [pkgdb] anaconda-yum-plugins was added for clumens
Message-ID: <20080918170613.53218208DA0@bastion.fedora.phx.redhat.com>

kevin has added Package anaconda-yum-plugins with summary Installation-related yum plugins
kevin has approved Package anaconda-yum-plugins
kevin has added a Fedora devel branch for anaconda-yum-plugins with an owner of clumens
kevin has approved anaconda-yum-plugins in Fedora devel
kevin has approved Package anaconda-yum-plugins
kevin has set commit to Approved for packager on anaconda-yum-plugins (Fedora devel)
kevin has set build to Approved for packager on anaconda-yum-plugins (Fedora devel)
kevin has set checkout to Approved for packager on anaconda-yum-plugins (Fedora devel)
kevin has set commit to Approved for uberpackager on anaconda-yum-plugins (Fedora devel)
kevin has set build to Approved for uberpackager on anaconda-yum-plugins (Fedora devel)
kevin has set checkout to Approved for uberpackager on anaconda-yum-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda-yum-plugins



From kevin at fedoraproject.org  Thu Sep 18 17:06:30 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 18 Sep 2008 17:06:30 +0000 (UTC)
Subject: rpms/anaconda-yum-plugins - New directory
Message-ID: <20080918170630.2CD14700D9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/anaconda-yum-plugins
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnO8194/rpms/anaconda-yum-plugins

Log Message:
Directory /cvs/extras/rpms/anaconda-yum-plugins added to the repository




From pkgdb at fedoraproject.org  Thu Sep 18 17:06:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:06:16 +0000
Subject: [pkgdb] anaconda-yum-plugins (Fedora, 8) updated by kevin
Message-ID: <20080918170616.4BD51208DA4@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for anaconda-yum-plugins
kevin has set commit to Approved for uberpackager on anaconda-yum-plugins (Fedora 8)
kevin has set build to Approved for uberpackager on anaconda-yum-plugins (Fedora 8)
kevin has set checkout to Approved for uberpackager on anaconda-yum-plugins (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda-yum-plugins



From kevin at fedoraproject.org  Thu Sep 18 17:06:30 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 18 Sep 2008 17:06:30 +0000 (UTC)
Subject: rpms/anaconda-yum-plugins/devel - New directory
Message-ID: <20080918170630.69DCC7013E@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/anaconda-yum-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnO8194/rpms/anaconda-yum-plugins/devel

Log Message:
Directory /cvs/extras/rpms/anaconda-yum-plugins/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 18 17:06:31 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 18 Sep 2008 17:06:31 +0000 (UTC)
Subject: rpms/anaconda-yum-plugins Makefile,NONE,1.1
Message-ID: <20080918170631.6F8DE700D9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/anaconda-yum-plugins
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnO8194/rpms/anaconda-yum-plugins

Added Files:
	Makefile 
Log Message:
Setup of module anaconda-yum-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module anaconda-yum-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  Thu Sep 18 17:06:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:06:16 +0000
Subject: [pkgdb] anaconda-yum-plugins (Fedora, 9) updated by kevin
Message-ID: <20080918170616.55A86208DA7@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for anaconda-yum-plugins
kevin has set commit to Approved for uberpackager on anaconda-yum-plugins (Fedora 9)
kevin has set build to Approved for uberpackager on anaconda-yum-plugins (Fedora 9)
kevin has set checkout to Approved for uberpackager on anaconda-yum-plugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda-yum-plugins



From kevin at fedoraproject.org  Thu Sep 18 17:06:31 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 18 Sep 2008 17:06:31 +0000 (UTC)
Subject: rpms/anaconda-yum-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080918170631.B9300700D9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/anaconda-yum-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnO8194/rpms/anaconda-yum-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module anaconda-yum-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: anaconda-yum-plugins
# $Id: Makefile,v 1.1 2008/09/18 17:06:31 kevin Exp $
NAME := anaconda-yum-plugins
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Sep 18 17:08:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:08:47 +0000
Subject: [pkgdb] sugar-calculator was added for katzj
Message-ID: <20080918170847.C5D53208D9A@bastion.fedora.phx.redhat.com>

kevin has added Package sugar-calculator with summary Calculator for Sugar
kevin has approved Package sugar-calculator
kevin has added a Fedora devel branch for sugar-calculator with an owner of katzj
kevin has approved sugar-calculator in Fedora devel
kevin has approved Package sugar-calculator
kevin has set commit to Approved for packager on sugar-calculator (Fedora devel)
kevin has set build to Approved for packager on sugar-calculator (Fedora devel)
kevin has set checkout to Approved for packager on sugar-calculator (Fedora devel)
kevin has set commit to Approved for uberpackager on sugar-calculator (Fedora devel)
kevin has set build to Approved for uberpackager on sugar-calculator (Fedora devel)
kevin has set checkout to Approved for uberpackager on sugar-calculator (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From pkgdb at fedoraproject.org  Thu Sep 18 17:08:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:08:50 +0000
Subject: [pkgdb] sugar-calculator (Fedora, devel) updated by kevin
Message-ID: <20080918170850.C8BE6208DA2@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on sugar-calculator (Fedora devel) for mpg
kevin approved watchcommits on sugar-calculator (Fedora devel) for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From kevin at fedoraproject.org  Thu Sep 18 17:08:59 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 18 Sep 2008 17:08:59 +0000 (UTC)
Subject: rpms/sugar-calculator - New directory
Message-ID: <20080918170859.21D12700D9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-calculator
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyb8601/rpms/sugar-calculator

Log Message:
Directory /cvs/extras/rpms/sugar-calculator added to the repository




From kevin at fedoraproject.org  Thu Sep 18 17:08:59 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 18 Sep 2008 17:08:59 +0000 (UTC)
Subject: rpms/sugar-calculator/devel - New directory
Message-ID: <20080918170859.586F1700D9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-calculator/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyb8601/rpms/sugar-calculator/devel

Log Message:
Directory /cvs/extras/rpms/sugar-calculator/devel added to the repository




From pkgdb at fedoraproject.org  Thu Sep 18 17:08:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:08:50 +0000
Subject: [pkgdb] sugar-calculator (Fedora, 9) updated by kevin
Message-ID: <20080918170851.6DC44208DA5@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for sugar-calculator
kevin has set commit to Approved for uberpackager on sugar-calculator (Fedora 9)
kevin has set build to Approved for uberpackager on sugar-calculator (Fedora 9)
kevin has set checkout to Approved for uberpackager on sugar-calculator (Fedora 9)
kevin approved watchbugzilla on sugar-calculator (Fedora 9) for mpg
kevin approved watchcommits on sugar-calculator (Fedora 9) for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From kevin at fedoraproject.org  Thu Sep 18 17:09:00 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 18 Sep 2008 17:09:00 +0000 (UTC)
Subject: rpms/sugar-calculator/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080918170900.68A4E700D9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-calculator/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyb8601/rpms/sugar-calculator/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sugar-calculator


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sugar-calculator
# $Id: Makefile,v 1.1 2008/09/18 17:09:00 kevin Exp $
NAME := sugar-calculator
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Sep 18 17:09:00 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 18 Sep 2008 17:09:00 +0000 (UTC)
Subject: rpms/sugar-calculator Makefile,NONE,1.1
Message-ID: <20080918170900.24035700D9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-calculator
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyb8601/rpms/sugar-calculator

Added Files:
	Makefile 
Log Message:
Setup of module sugar-calculator


--- NEW FILE Makefile ---
# Top level Makefile for module sugar-calculator
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep 18 17:09:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:09:33 +0000
Subject: [pkgdb] sugar-write was added for katzj
Message-ID: <20080918170933.787FB208DA2@bastion.fedora.phx.redhat.com>

kevin has added Package sugar-write with summary Word Processor for Sugar
kevin has approved Package sugar-write
kevin has added a Fedora devel branch for sugar-write with an owner of katzj
kevin has approved sugar-write in Fedora devel
kevin has approved Package sugar-write
kevin has set commit to Approved for packager on sugar-write (Fedora devel)
kevin has set build to Approved for packager on sugar-write (Fedora devel)
kevin has set checkout to Approved for packager on sugar-write (Fedora devel)
kevin has set commit to Approved for uberpackager on sugar-write (Fedora devel)
kevin has set build to Approved for uberpackager on sugar-write (Fedora devel)
kevin has set checkout to Approved for uberpackager on sugar-write (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Thu Sep 18 17:09:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:09:34 +0000
Subject: [pkgdb] sugar-write (Fedora, devel) updated by kevin
Message-ID: <20080918170934.C39E1208DA5@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on sugar-write (Fedora devel) for mpg
kevin approved watchcommits on sugar-write (Fedora devel) for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Thu Sep 18 17:09:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:09:34 +0000
Subject: [pkgdb] sugar-write (Fedora, 9) updated by kevin
Message-ID: <20080918170934.D2CCB208DA8@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for sugar-write
kevin has set commit to Approved for uberpackager on sugar-write (Fedora 9)
kevin has set build to Approved for uberpackager on sugar-write (Fedora 9)
kevin has set checkout to Approved for uberpackager on sugar-write (Fedora 9)
kevin approved watchbugzilla on sugar-write (Fedora 9) for mpg
kevin approved watchcommits on sugar-write (Fedora 9) for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From kevin at fedoraproject.org  Thu Sep 18 17:09:44 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 18 Sep 2008 17:09:44 +0000 (UTC)
Subject: rpms/sugar-write - New directory
Message-ID: <20080918170944.22D12700D9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-write
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVQ8803/rpms/sugar-write

Log Message:
Directory /cvs/extras/rpms/sugar-write added to the repository




From kevin at fedoraproject.org  Thu Sep 18 17:09:45 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 18 Sep 2008 17:09:45 +0000 (UTC)
Subject: rpms/sugar-write Makefile,NONE,1.1
Message-ID: <20080918170945.1F6CE700D9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-write
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVQ8803/rpms/sugar-write

Added Files:
	Makefile 
Log Message:
Setup of module sugar-write


--- NEW FILE Makefile ---
# Top level Makefile for module sugar-write
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep 18 17:09:44 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 18 Sep 2008 17:09:44 +0000 (UTC)
Subject: rpms/sugar-write/devel - New directory
Message-ID: <20080918170944.56BFE700D9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-write/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVQ8803/rpms/sugar-write/devel

Log Message:
Directory /cvs/extras/rpms/sugar-write/devel added to the repository




From kevin at fedoraproject.org  Thu Sep 18 17:09:45 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 18 Sep 2008 17:09:45 +0000 (UTC)
Subject: rpms/sugar-write/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080918170945.50473700D9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sugar-write/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVQ8803/rpms/sugar-write/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sugar-write


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sugar-write
# $Id: Makefile,v 1.1 2008/09/18 17:09:45 kevin Exp $
NAME := sugar-write
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 18 17:15:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:15:31 +0000
Subject: [pkgdb] libgcrypt ownership updated
Message-ID: <20080918171532.241BF208DA0@bastion.fedora.phx.redhat.com>

Package libgcrypt in Fedora devel was orphaned by nalin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 18 17:15:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:15:39 +0000
Subject: [pkgdb] libgcrypt ownership updated
Message-ID: <20080918171539.3E9CE208DA7@bastion.fedora.phx.redhat.com>

Package libgcrypt in Fedora 9 was orphaned by nalin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 18 17:15:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:15:39 +0000
Subject: [pkgdb] libgcrypt ownership updated
Message-ID: <20080918171539.CADA8208DAB@bastion.fedora.phx.redhat.com>

Package libgcrypt in Fedora 8 was orphaned by nalin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 18 17:20:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:20:40 +0000
Subject: [pkgdb] libgcrypt ownership updated
Message-ID: <20080918172040.C7538208DA0@bastion.fedora.phx.redhat.com>

Package libgcrypt in Fedora devel is now owned by tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 18 17:20:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:20:59 +0000
Subject: [pkgdb] libgcrypt ownership updated
Message-ID: <20080918172059.6FA10208DA7@bastion.fedora.phx.redhat.com>

Package libgcrypt in Fedora 8 is now owned by tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 18 17:20:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:20:49 +0000
Subject: [pkgdb] libgcrypt ownership updated
Message-ID: <20080918172049.2DD5B208DA5@bastion.fedora.phx.redhat.com>

Package libgcrypt in Fedora 9 is now owned by tmraz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 18 17:25:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:25:57 +0000
Subject: [pkgdb] libgcrypt: nalin has requested watchbugzilla
Message-ID: <20080918172557.EE168208D9A@bastion.fedora.phx.redhat.com>

nalin has requested the watchbugzilla acl on libgcrypt (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 18 17:25:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:25:42 +0000
Subject: [pkgdb] libgcrypt: nalin has requested watchbugzilla
Message-ID: <20080918172542.93871208DA0@bastion.fedora.phx.redhat.com>

nalin has requested the watchbugzilla acl on libgcrypt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 18 17:25:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:25:59 +0000
Subject: [pkgdb] libgcrypt: nalin has requested watchbugzilla
Message-ID: <20080918172559.8CE79208DA7@bastion.fedora.phx.redhat.com>

nalin has requested the watchbugzilla acl on libgcrypt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From clumens at fedoraproject.org  Thu Sep 18 17:31:48 2008
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu, 18 Sep 2008 17:31:48 +0000 (UTC)
Subject: rpms/anaconda-yum-plugins/devel anaconda-yum-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080918173148.F1052700D9@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda-yum-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11537

Modified Files:
	.cvsignore sources 
Added Files:
	anaconda-yum-plugins.spec 
Log Message:
Initial build.



--- NEW FILE anaconda-yum-plugins.spec ---
Summary: Installation-related yum plugins
Name:    anaconda-yum-plugins
Version: 1.0
Release: 1
License: GPLv2+
Group:   Applications/System
URL:     http://fedoraproject.org/wiki/Anaconda

Source0: %{name}-%{version}.tar.bz2

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires:  python, yum

%description
The anaconda yum-plugins package contains yum plugins that are useful for
anaconda and other system installation-related programs.

%prep
%setup -q

%build
# noop

%install
%{__rm} -rf %{buildroot}
# RPM will take care of the python-compiling stuff
%{__make} install DESTDIR=%{buildroot} NO_PY_COMPILE=1

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING
%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/*
%{_prefix}/lib/yum-plugins/*

%changelog
* Mon Sep 15 2008 Will Woods <wwoods at redhat.com> - 1.0-1
- Initial packaging (moved out of anaconda package) 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda-yum-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2008 17:06:31 -0000	1.1
+++ .cvsignore	18 Sep 2008 17:31:18 -0000	1.2
@@ -0,0 +1 @@
+anaconda-yum-plugins-1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda-yum-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2008 17:06:31 -0000	1.1
+++ sources	18 Sep 2008 17:31:18 -0000	1.2
@@ -0,0 +1 @@
+2bbc35e796f55c0542cbb4b8e8ad9958  anaconda-yum-plugins-1.0.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep 18 17:38:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:38:36 +0000
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <20080918173836.918AA208D9E@bastion.fedora.phx.redhat.com>

tmraz has set the watchbugzilla acl on libgcrypt (Fedora 9) to Approved for nalin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 18 17:38:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:38:39 +0000
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <20080918173840.269B8208DA3@bastion.fedora.phx.redhat.com>

tmraz has set the watchbugzilla acl on libgcrypt (Fedora 8) to Obsolete for nalin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 18 17:38:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:38:43 +0000
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <20080918173843.65BB7208DA7@bastion.fedora.phx.redhat.com>

tmraz has set the watchbugzilla acl on libgcrypt (Fedora 8) to Approved for nalin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From pkgdb at fedoraproject.org  Thu Sep 18 17:38:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 18 Sep 2008 17:38:52 +0000
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <20080918173852.62CCA208DAA@bastion.fedora.phx.redhat.com>

tmraz has set the watchbugzilla acl on libgcrypt (Fedora devel) to Approved for nalin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From clumens at fedoraproject.org  Thu Sep 18 17:51:02 2008
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu, 18 Sep 2008 17:51:02 +0000 (UTC)
Subject: rpms/anaconda-yum-plugins/F-9 anaconda-yum-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080918175102.7F5D2700D9@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda-yum-plugins/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13332

Modified Files:
	.cvsignore sources 
Added Files:
	anaconda-yum-plugins.spec 
Log Message:
Initial build for F-9.



--- NEW FILE anaconda-yum-plugins.spec ---
Summary: Installation-related yum plugins
Name:    anaconda-yum-plugins
Version: 1.0
Release: 1%{?dist}
License: GPLv2+
Group:   Applications/System
URL:     http://fedoraproject.org/wiki/Anaconda

Source0: %{name}-%{version}.tar.bz2

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires:  python, yum

%description
The anaconda yum-plugins package contains yum plugins that are useful for
anaconda and other system installation-related programs.

%prep
%setup -q

%build
# noop

%install
%{__rm} -rf %{buildroot}
# RPM will take care of the python-compiling stuff
%{__make} install DESTDIR=%{buildroot} NO_PY_COMPILE=1

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING
%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/*
%{_prefix}/lib/yum-plugins/*

%changelog
* Mon Sep 15 2008 Will Woods <wwoods at redhat.com> - 1.0-1
- Initial packaging (moved out of anaconda package) 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda-yum-plugins/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2008 17:06:31 -0000	1.1
+++ .cvsignore	18 Sep 2008 17:50:32 -0000	1.2
@@ -0,0 +1 @@
+anaconda-yum-plugins-1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda-yum-plugins/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2008 17:06:31 -0000	1.1
+++ sources	18 Sep 2008 17:50:32 -0000	1.2
@@ -0,0 +1 @@
+2bbc35e796f55c0542cbb4b8e8ad9958  anaconda-yum-plugins-1.0.tar.bz2



From katzj at fedoraproject.org  Thu Sep 18 17:51:15 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Thu, 18 Sep 2008 17:51:15 +0000 (UTC)
Subject: rpms/sugar-chat/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20080918175115.82536700D9@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/sugar-chat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13449

Modified Files:
	.cvsignore sources 
Log Message:
* Wed Sep 17 2008 Jeremy Katz <katzj at redhat.com> - 47-1
- update to Chat-47



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-chat/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2008 18:54:13 -0000	1.1
+++ .cvsignore	18 Sep 2008 17:50:45 -0000	1.2
@@ -0,0 +1 @@
+Chat-47.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-chat/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 18:54:13 -0000	1.1
+++ sources	18 Sep 2008 17:50:45 -0000	1.2
@@ -0,0 +1 @@
+5809289fd87fd27287467728866d3781  Chat-47.tar.bz2



From katzj at fedoraproject.org  Thu Sep 18 17:51:24 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Thu, 18 Sep 2008 17:51:24 +0000 (UTC)
Subject: rpms/sugar-calculator/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20080918175124.F1048700D9@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/sugar-calculator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13502

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Sep  2 2008 Jeremy Katz <katzj at redhat.com> - 23-1
- update to Calculate-23
- use %find_lang 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-calculator/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2008 17:09:00 -0000	1.1
+++ .cvsignore	18 Sep 2008 17:50:54 -0000	1.2
@@ -0,0 +1 @@
+Calculate-23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-calculator/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2008 17:09:00 -0000	1.1
+++ sources	18 Sep 2008 17:50:54 -0000	1.2
@@ -0,0 +1 @@
+e708a969301ed8d800e2f7945930f522  Calculate-23.tar.bz2



From katzj at fedoraproject.org  Thu Sep 18 17:52:07 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Thu, 18 Sep 2008 17:52:07 +0000 (UTC)
Subject: rpms/sugar-calculator/devel sugar-calculator.spec,NONE,1.1
Message-ID: <20080918175207.7187C700D9@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/sugar-calculator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13920

Added Files:
	sugar-calculator.spec 
Log Message:
and add the spec file


--- NEW FILE sugar-calculator.spec ---
Name: sugar-calculator
Version: 23
Release: 1%{?dist}
Summary: Calculator for Sugar
Group: Sugar/Activities
License: GPLv2+
URL: http://wiki.laptop.org/go/Calculate
Source0: http://dev.laptop.org/pub/sugar/sources/calculate-activity/Calculate-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python sugar-toolkit
Requires: sugar
BuildArch: noarch

%description
The calculate activity provides a calculator for the Sugar interface.

%prep
%setup -q -n Calculate-%{version}

# remove bogus pseudo locale
rm -f po/pseudo.po

%build
python ./setup.py build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{sugaractivitydir}
python ./setup.py install --prefix=$RPM_BUILD_ROOT/%{_prefix}

%find_lang org.laptop.Calculate

%clean
rm -rf $RPM_BUILD_ROOT


%files -f org.laptop.Calculate.lang
%defattr(-,root,root,-)
%doc NEWS
%{sugaractivitydir}/Calculate.activity/


%changelog
* Tue Sep  2 2008 Jeremy Katz <katzj at redhat.com> - 23-1
- update to Calculate-23
- use %%find_lang 

* Thu Jul 31 2008 Jeremy Katz <katzj at redhat.com> - 19-1
- Initial packaging



From katzj at fedoraproject.org  Thu Sep 18 17:52:22 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Thu, 18 Sep 2008 17:52:22 +0000 (UTC)
Subject: rpms/sugar-write/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20080918175222.80C59700D9@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/sugar-write/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13798

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Sep 18 2008 Jeremy Katz <katzj at redhat.com> - 59-1
- Update to Write-59



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2008 17:09:45 -0000	1.1
+++ .cvsignore	18 Sep 2008 17:51:52 -0000	1.2
@@ -0,0 +1 @@
+Write-59.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2008 17:09:45 -0000	1.1
+++ sources	18 Sep 2008 17:51:52 -0000	1.2
@@ -0,0 +1 @@
+d38e93c126f6f5ac0694fc5d727b1bdc  Write-59.tar.bz2



From katzj at fedoraproject.org  Thu Sep 18 17:52:14 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Thu, 18 Sep 2008 17:52:14 +0000 (UTC)
Subject: rpms/sugar-chat/devel sugar-chat.spec,NONE,1.1
Message-ID: <20080918175214.E4091700D9@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/sugar-chat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13971

Added Files:
	sugar-chat.spec 
Log Message:
add the spec file


--- NEW FILE sugar-chat.spec ---
Name: sugar-chat
Version: 47
Release: 1%{?dist}
Summary: Chat client for Sugar
Group: Sugar/Activities
License: GPLv2+
URL: http://wiki.laptop.org/go/Chat
Source0: http://dev.laptop.org/pub/sugar/sources/chat-activity/Chat-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python sugar-toolkit
Requires: sugar python-telepathy
BuildArch: noarch

%description
The chat activity provides a chat client for the Sugar interface.

%prep
%setup -q -n Chat-%{version}

%build
python ./setup.py build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{sugaractivitydir}
python ./setup.py install --prefix=$RPM_BUILD_ROOT/%{_prefix}

%find_lang org.laptop.Chat

%clean
rm -rf $RPM_BUILD_ROOT


%files -f org.laptop.Chat.lang
%defattr(-,root,root,-)
%doc NEWS
%{sugaractivitydir}/Chat.activity/


%changelog
* Wed Sep 17 2008 Jeremy Katz <katzj at redhat.com> - 47-1
- update to Chat-47

* Tue Sep  2 2008 Jeremy Katz <katzj at redhat.com> - 46-1
- update to Chat-46
- Use %%find_lang
- Remove bogus pseudo locale

* Thu Jul 31 2008 Jeremy Katz <katzj at redhat.com> - 44-1
- Initial packaging



From katzj at fedoraproject.org  Thu Sep 18 17:53:07 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Thu, 18 Sep 2008 17:53:07 +0000 (UTC)
Subject: rpms/sugar-write/devel sugar-write.spec,NONE,1.1
Message-ID: <20080918175307.1B347700D9@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/sugar-write/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14455

Added Files:
	sugar-write.spec 
Log Message:
add the spec file


--- NEW FILE sugar-write.spec ---
Name: sugar-write
Version: 59
Release: 1%{?dist}
Summary: Word processor for Sugar
Group: Sugar/Activities
License: GPLv2+
URL: http://wiki.laptop.org/go/Write
Source0: http://dev.laptop.org/pub/sugar/sources/write-activity/Write-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python sugar-toolkit
Requires: sugar python-telepathy
Requires: pyabiword
BuildArch: noarch

%description
The Write activity provides a word processor for the Sugar interface.

%prep
%setup -q -n Write-%{version}

%build
python ./setup.py build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{sugaractivitydir}
python ./setup.py install --prefix=$RPM_BUILD_ROOT/%{_prefix}

%find_lang org.laptop.AbiWordActivity

%clean
rm -rf $RPM_BUILD_ROOT


%files -f  org.laptop.AbiWordActivity.lang
%defattr(-,root,root,-)
%doc NEWS
%{sugaractivitydir}/Write.activity/


%changelog
* Thu Sep 18 2008 Jeremy Katz <katzj at redhat.com> - 59-1
- Update to Write-59

* Tue Sep  2 2008 Jeremy Katz <katzj at redhat.com> - 57-1
- Initial packaging



From clumens at fedoraproject.org  Thu Sep 18 17:55:12 2008
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu, 18 Sep 2008 17:55:12 +0000 (UTC)
Subject: rpms/anaconda-yum-plugins/F-8 anaconda-yum-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080918175512.CF625700D9@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda-yum-plugins/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15120

Modified Files:
	.cvsignore sources 
Added Files:
	anaconda-yum-plugins.spec 
Log Message:
Initial build for F-8.



--- NEW FILE anaconda-yum-plugins.spec ---
Summary: Installation-related yum plugins
Name:    anaconda-yum-plugins
Version: 1.0
Release: 1%{?dist}
License: GPLv2+
Group:   Applications/System
URL:     http://fedoraproject.org/wiki/Anaconda

Source0: %{name}-%{version}.tar.bz2

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires:  python, yum

%description
The anaconda yum-plugins package contains yum plugins that are useful for
anaconda and other system installation-related programs.

%prep
%setup -q

%build
# noop

%install
%{__rm} -rf %{buildroot}
# RPM will take care of the python-compiling stuff
%{__make} install DESTDIR=%{buildroot} NO_PY_COMPILE=1

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING
%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/*
%{_prefix}/lib/yum-plugins/*

%changelog
* Mon Sep 15 2008 Will Woods <wwoods at redhat.com> - 1.0-1
- Initial packaging (moved out of anaconda package) 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda-yum-plugins/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2008 17:06:31 -0000	1.1
+++ .cvsignore	18 Sep 2008 17:54:42 -0000	1.2
@@ -0,0 +1 @@
+anaconda-yum-plugins-1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda-yum-plugins/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2008 17:06:31 -0000	1.1
+++ sources	18 Sep 2008 17:54:42 -0000	1.2
@@ -0,0 +1 @@
+2bbc35e796f55c0542cbb4b8e8ad9958  anaconda-yum-plugins-1.0.tar.bz2



From clumens at fedoraproject.org  Thu Sep 18 18:02:00 2008
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu, 18 Sep 2008 18:02:00 +0000 (UTC)
Subject: rpms/anaconda-yum-plugins/devel anaconda-yum-plugins.spec,1.1,1.2
Message-ID: <20080918180200.D3412700D9@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda-yum-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15863

Modified Files:
	anaconda-yum-plugins.spec 
Log Message:
New release.



Index: anaconda-yum-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda-yum-plugins/devel/anaconda-yum-plugins.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anaconda-yum-plugins.spec	18 Sep 2008 17:31:18 -0000	1.1
+++ anaconda-yum-plugins.spec	18 Sep 2008 18:01:30 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Installation-related yum plugins
 Name:    anaconda-yum-plugins
 Version: 1.0
-Release: 1
+Release: 2%{?dist}
 License: GPLv2+
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -37,5 +37,8 @@
 %{_prefix}/lib/yum-plugins/*
 
 %changelog
+* Thu Sep 18 2008 Chris Lumens <clumens at redhat.com> 1.0-1
+- Include the distro tag in the release number.
+
 * Mon Sep 15 2008 Will Woods <wwoods at redhat.com> - 1.0-1
 - Initial packaging (moved out of anaconda package) 



From mdomsch at fedoraproject.org  Thu Sep 18 18:14:53 2008
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Thu, 18 Sep 2008 18:14:53 +0000 (UTC)
Subject: rpms/petitboot/devel petitboot-0.0.1-build-limits_h.patch, 1.1,
	1.2 petitboot.spec, 1.10, 1.11
Message-ID: <20080918181453.5AD22700D9@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/petitboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17192

Modified Files:
	petitboot-0.0.1-build-limits_h.patch petitboot.spec 
Log Message:
Build fix: include <linux/limits.h> in devices/udev-helper.c.  FTBFS BZ#434110

petitboot-0.0.1-build-limits_h.patch:

Index: petitboot-0.0.1-build-limits_h.patch
===================================================================
RCS file: /cvs/extras/rpms/petitboot/devel/petitboot-0.0.1-build-limits_h.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- petitboot-0.0.1-build-limits_h.patch	23 Apr 2008 01:59:23 -0000	1.1
+++ petitboot-0.0.1-build-limits_h.patch	18 Sep 2008 18:14:23 -0000	1.2
@@ -1,10 +1,11 @@
 --- petitboot-0.0.1/devices/udev-helper.c~	2008-04-23 02:54:05.000000000 +0100
 +++ petitboot-0.0.1/devices/udev-helper.c	2008-04-23 02:55:28.000000000 +0100
-@@ -12,6 +12,7 @@
+@@ -12,6 +12,8 @@
  #include <fcntl.h>
  #include <errno.h>
  #include <string.h>
 +#include <limits.h>
++#include <linux/limits.h>
  #include <asm/byteorder.h>
  #include <linux/cdrom.h>
  #include <sys/ioctl.h>


Index: petitboot.spec
===================================================================
RCS file: /cvs/extras/rpms/petitboot/devel/petitboot.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- petitboot.spec	23 Apr 2008 01:59:23 -0000	1.10
+++ petitboot.spec	18 Sep 2008 18:14:23 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:		petitboot
 Version:	0.0.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Graphical kexec-based bootloader, originally for PlayStation 3
 
 Group:		System Environment/Base
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Thu Sep 18 2008 Matt Domsch <mdomsch at fedoraproject.org> - 0.0.1-10
+- Build fix: include <linux/limits.h> in devices/udev-helper.c.  FTBFS BZ#434110
+
 * Wed Apr 23 2008 David Woodhouse <dwmw2 at infradead.org> 0.0.1-9
 - Build fix: include <limits.h> in devices/udev-helper.c
 



From mdomsch at fedoraproject.org  Thu Sep 18 18:17:37 2008
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Thu, 18 Sep 2008 18:17:37 +0000 (UTC)
Subject: rpms/petitboot/devel petitboot.spec,1.11,1.12
Message-ID: <20080918181737.18264700D9@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/petitboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17582

Modified Files:
	petitboot.spec 
Log Message:
fix wrong BZ# in last commit


Index: petitboot.spec
===================================================================
RCS file: /cvs/extras/rpms/petitboot/devel/petitboot.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- petitboot.spec	18 Sep 2008 18:14:23 -0000	1.11
+++ petitboot.spec	18 Sep 2008 18:17:06 -0000	1.12
@@ -67,7 +67,7 @@
 
 %changelog
 * Thu Sep 18 2008 Matt Domsch <mdomsch at fedoraproject.org> - 0.0.1-10
-- Build fix: include <linux/limits.h> in devices/udev-helper.c.  FTBFS BZ#434110
+- Build fix: include <linux/limits.h> in devices/udev-helper.c.  FTBFS BZ#434071
 
 * Wed Apr 23 2008 David Woodhouse <dwmw2 at infradead.org> 0.0.1-9
 - Build fix: include <limits.h> in devices/udev-helper.c



From mclasen at fedoraproject.org  Thu Sep 18 18:45:32 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 18 Sep 2008 18:45:32 +0000 (UTC)
Subject: rpms/librsvg2/devel rsvg-better-free.patch, NONE, 1.1 librsvg2.spec,
	1.70, 1.71
Message-ID: <20080918184532.61A06700D9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/librsvg2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20810

Modified Files:
	librsvg2.spec 
Added Files:
	rsvg-better-free.patch 
Log Message:
pug a memory leak


rsvg-better-free.patch:

--- NEW FILE rsvg-better-free.patch ---
Index: rsvg-image.c
===================================================================
--- rsvg-image.c	(revision 1176)
+++ rsvg-image.c	(working copy)
@@ -472,9 +472,10 @@
     RsvgNodeImage *z = (RsvgNodeImage *) self;
     rsvg_state_finalize (z->super.state);
     g_free (z->super.state);
+    z->super.state = NULL;
     if (z->img)
         g_object_unref (G_OBJECT (z->img));
-    g_free (z);
+    _rsvg_node_free(self);
 }
 
 static void


Index: librsvg2.spec
===================================================================
RCS file: /cvs/extras/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- librsvg2.spec	5 Mar 2008 01:17:28 -0000	1.70
+++ librsvg2.spec	18 Sep 2008 18:45:02 -0000	1.71
@@ -13,12 +13,15 @@
 Name: 	 librsvg2
 Summary: An SVG library based on cairo
 Version: 2.22.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: 	LGPLv2+
 Group: 		System Environment/Libraries
 Source: 	http://download.gnome.org/sources/librsvg/2.22/librsvg-%{version}.tar.bz2
+# http://bugzilla.gnome.org/show_bug.cgi?id=475851
 Patch1:		filter-leak.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=444444
+Patch2:         rsvg-better-free.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
 Requires:	gtk2 >= %{gtk2_version}
 Requires:	libxml2 >= %{libxml2_version}
@@ -63,6 +66,7 @@
 %prep
 %setup -q -n librsvg-%{version}
 %patch1 -p1 -b .filter-leak
+%patch2 -p0 -b .rsvg-better-free
 
 %build
 %configure --with-svgz \
@@ -118,6 +122,9 @@
 %doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
+* Thu Sep 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.2-2
+- Plug a memory leak
+
 * Tue Mar  4 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.2-1
 - Update to 2.22.2
 



From toshio at fedoraproject.org  Thu Sep 18 18:57:44 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 18 Sep 2008 18:57:44 +0000 (UTC)
Subject: rpms/bzr/devel .cvsignore, 1.27, 1.28 bzr.spec, 1.40, 1.41 sources, 
	1.27, 1.28
Message-ID: <20080918185745.02846700D9@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22472

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:

* Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.7-0.1.rc2
- 1.7rc2
- Remove executable permission from a %doc file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	4 Sep 2008 02:08:44 -0000	1.27
+++ .cvsignore	18 Sep 2008 18:57:14 -0000	1.28
@@ -1 +1 @@
-bzr-1.6.1rc2.tar.gz
+bzr-1.7rc2.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- bzr.spec	4 Sep 2008 02:08:44 -0000	1.40
+++ bzr.spec	18 Sep 2008 18:57:14 -0000	1.41
@@ -1,14 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bzr
-Version:        1.6.1
+Version:        1.7
 Release:        0.1.rc2%{?dist}
 Summary:        Friendly distributed version control system
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://www.bazaar-vcs.org/
-Source0:        https://launchpad.net/%{name}/1.6/%{version}rc2/+download/%{name}-%{version}rc2.tar.gz
+Source0:        https://launchpad.net/%{name}/1.7/%{version}rc2/+download/%{name}-%{version}rc2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -41,6 +41,7 @@
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
+chmod a-x contrib/bash/bzrbashprompt.sh
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -75,6 +76,10 @@
 %endif
 
 %changelog
+* Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.7-0.1.rc2
+- 1.7rc2
+- Remove executable permission from a %%doc file
+
 * Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.6.1-0.1.rc2
 - New upstream bugfix release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	4 Sep 2008 02:08:44 -0000	1.27
+++ sources	18 Sep 2008 18:57:14 -0000	1.28
@@ -1 +1 @@
-112ba4410323383b8b20e1522483bbeb  bzr-1.6.1rc2.tar.gz
+f4280510121d143d170b04a80f70272b  bzr-1.7rc2.tar.gz



From toshio at fedoraproject.org  Thu Sep 18 18:58:07 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 18 Sep 2008 18:58:07 +0000 (UTC)
Subject: rpms/bzrtools/devel .cvsignore, 1.21, 1.22 bzrtools.spec, 1.31,
	1.32 sources, 1.21, 1.22
Message-ID: <20080918185807.6F8F1700D9@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzrtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22570

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:

* Thu Sep 18 2008 Toshio Kuratomi <toshio at fedoraproject.org> 1.7.0-1
- Update to 1.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	4 Sep 2008 02:49:40 -0000	1.21
+++ .cvsignore	18 Sep 2008 18:57:37 -0000	1.22
@@ -1 +1 @@
-bzrtools-1.6.0.tar.gz
+bzrtools-1.7.0.tar.gz


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/bzrtools.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- bzrtools.spec	4 Sep 2008 02:49:41 -0000	1.31
+++ bzrtools.spec	18 Sep 2008 18:57:37 -0000	1.32
@@ -5,8 +5,8 @@
 # (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
 %define debug_package %{nil}
 
-%define bzrver 1.6
-%define bzrnextver 1.7
+%define bzrver 1.7
+%define bzrnextver 1.8
 
 Name:           bzrtools
 Version:        %{bzrver}.0
@@ -71,6 +71,9 @@
 %endif
 
 %changelog
+* Thu Sep 18 2008 Toshio Kuratomi <toshio at fedoraproject.org> 1.7.0-1
+- Update to 1.7.0
+
 * Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> 1.6.0-1
 - Update to 1.6.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	4 Sep 2008 02:49:41 -0000	1.21
+++ sources	18 Sep 2008 18:57:37 -0000	1.22
@@ -1 +1 @@
-82c5b96fd996bede6ed92759ef28a108  bzrtools-1.6.0.tar.gz
+4af1f288433f1ebc916ddc5dda5eead8  bzrtools-1.7.0.tar.gz



From rdieter at fedoraproject.org  Thu Sep 18 19:00:48 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 18 Sep 2008 19:00:48 +0000 (UTC)
Subject: rpms/koffice/devel koffice-1.6.3-gcc43.patch, 1.2,
	1.3 koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff, 1.2,
	1.3 koffice-xpdf-CVE-2007-3387.diff, 1.2, 1.3 .cvsignore, 1.19,
	1.20 koffice.spec, 1.76, 1.77 sources, 1.19, 1.20
Message-ID: <20080918190048.EED3F700D9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23204

Modified Files:
	.cvsignore koffice.spec sources 
Added Files:
	koffice-1.6.3-gcc43.patch 
	koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff 
	koffice-xpdf-CVE-2007-3387.diff 
Log Message:
revert koffice2 -> koffice1, requested by upstream
koffice2 won't be ready for F10

* Thu Sep 18 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.6.3-16
- revert koffice2->koffice1, introduce Epoch
- fix pkg interdependencies (#394101), multilib issues
- -krita: drop Requires: %name-filters (#394101)
- cleanup scriptlets


koffice-1.6.3-gcc43.patch:

Index: koffice-1.6.3-gcc43.patch
===================================================================
RCS file: koffice-1.6.3-gcc43.patch
diff -N koffice-1.6.3-gcc43.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koffice-1.6.3-gcc43.patch	18 Sep 2008 19:00:48 -0000	1.3
@@ -0,0 +1,126 @@
+# svn diff -c 729276 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
+# svn diff -c 738929 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
+
+Index: koffice/krita/core/kis_perspective_math.cpp
+===================================================================
+--- koffice/krita/core/kis_perspective_math.cpp	(revision 738928)
++++ koffice/krita/core/kis_perspective_math.cpp	(revision 738929)
+@@ -24,7 +24,7 @@
+ 
+ #if 1
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include <stdlib.h>
+ #include <math.h>
+ //#define NDEBUG // uncomment to remove checking of assert()
+@@ -57,9 +57,9 @@
+         void  rprint()const;  //print entries on a single line
+         void resize(int n);
+         int operator==(const vector<ElType>& v)const;
+-        friend   vector<ElType> operator*(ElType c,vector<ElType>& v );
+-        friend   vector<ElType> operator*(vector<ElType>& v,ElType c );
+-        friend ostream& operator<<(ostream& s,vector<ElType>& v);
++        friend vector<ElType> operator* (ElType c,vector<ElType>& v );
++        friend vector<ElType> operator*(vector<ElType>& v,ElType c );
++        friend std::ostream& operator<<(std::ostream& s,vector<ElType>& v);
+ };
+ template <class ElType>
+         void vector<ElType>::zero()
+@@ -129,10 +129,10 @@
+         void  vector<ElType>::rprint()const  //print entries on a single line
+ {
+     int i;
+-    cout << "VECTOR: ";
+-    cout << "(";
+-    for(i=0;i<len-1;i++) cout << data[i] << ",";
+-    cout << data[len-1] << ")" << endl;
++    std::cout << "VECTOR: ";
++    std::cout << "(";
++    for(i=0;i<len-1;i++) std::cout << data[i] << ",";
++    std::cout << data[len-1] << ")" << std::endl;
+     return;
+ }
+ template <class ElType>
+@@ -164,7 +164,7 @@
+     return ans;
+ }
+ template <class ElType>
+-        ostream& operator<<(ostream& s,vector<ElType>& v)
++        std::ostream& operator<<(std::ostream& s,vector<ElType>& v)
+ {
+     s << "(";
+     for(int i=0;i<v.len-1;i++) s << v.data[i] << ", ";
+@@ -192,7 +192,7 @@
+         matrix<ElType> operator-(const matrix<ElType>& a);
+         matrix<ElType> transpose();
+     //matrix<ElType> inverse();
+-        friend ostream& operator<<(ostream& s,matrix<ElType>& m);
++        friend std::ostream& operator<<(std::ostream& s,matrix<ElType>& m);
+         friend void ludcmp(matrix<ElType>& a,vector<int>& indx,double &d);
+         friend void lubksb(matrix<ElType>&a,vector<int>& indx,vector<ElType>&b);
+ };
+@@ -357,7 +357,7 @@
+     return ans;
+ }
+ template <class ElType>
+-        ostream& operator<<(ostream& s,matrix<ElType>& m)
++        std::ostream& operator<<(std::ostream& s,matrix<ElType>& m)
+ {
+     for(int i=0; i<m.rows;i++) s << m[i];
+     return s;
+@@ -381,7 +381,7 @@
+ //         kdDebug() << "new search" << endl;
+         for (j=0;j<n;j++) { if ((temp=fabs(a[i][j])) > big) big=temp;
+ /*            kdDebug() << temp << " " << fabs(a[i][j]) << " "<< big <<endl; */}
+-            if (big == 0.0) { cerr << "Singular matrix in routine LUDCMP" << endl; big = TINY;}
++            if (big == 0.0) { std::cerr << "Singular matrix in routine LUDCMP" << std::endl; big = TINY;}
+             vv[i]=1.0/big;
+     }
+     for (j=0;j<n;j++)
+Index: koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp
+===================================================================
+--- koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	(revision 729275)
++++ koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	(revision 729276)
+@@ -174,12 +174,7 @@
+ 	return m_cell->text();
+ }
+ 
+-bool Cell::setText(const QString& text, bool asString) {
+-
+-	//FIXME: there is some problem with asString parameter, when it's set
+-	//to true KSpread says: ASSERT: "f" in Dependencies.cpp (621)
+-	//kspread: Cell at row 6, col 1 marked as formula, but formula is NULL
+-
++bool Cell::setText(const QString& text) {
+ 	KSpread::ProtectedCheck prot;
+ 	prot.setSheet (m_sheet);
+ 	prot.add (QPoint (m_col, m_row));
+@@ -189,7 +184,7 @@
+ 	KSpread::DataManipulator *dm = new KSpread::DataManipulator ();
+ 	dm->setSheet (m_sheet);
+ 	dm->setValue (text);
+-	dm->setParsing (!asString);
++	dm->setParsing (true);
+ 	dm->add (QPoint (m_col, m_row));
+ 	dm->execute ();
+ 
+Index: koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h
+===================================================================
+--- koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h	(revision 729275)
++++ koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h	(revision 729276)
+@@ -131,11 +131,10 @@
+ 		*/
+ 		const QString text() const;
+ 		/**
+-		* Set the text of the cell. If asString is true, the text
+-		* will be handled as string else we try to parse the
+-		* string to the expected value.
++		* Set the text of the cell. the text
++		* will be handled as string
+ 		*/
+-		bool setText(const QString& text, bool asString = false);
++		bool setText(const QString& text);
+ 
+ 		/**
+ 		* Return the textcolor as RGB-value in the format "#RRGGBB".

koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff:

Index: koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
===================================================================
RCS file: koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
diff -N koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff	18 Sep 2008 19:00:48 -0000	1.3
@@ -0,0 +1,669 @@
+--- filters/kword/pdf/xpdf/xpdf/Stream.cc
++++ filters/kword/pdf/xpdf/xpdf/Stream.cc
+@@ -1239,6 +1239,7 @@
+ // CCITTFaxStream
+ //------------------------------------------------------------------------
+ 
++#if 0
+ CCITTFaxStream::CCITTFaxStream(Stream *strA, int encodingA, GBool endOfLineA,
+ 			       GBool byteAlignA, int columnsA, int rowsA,
+ 			       GBool endOfBlockA, GBool blackA):
+@@ -1748,6 +1749,609 @@
+   }
+   return (inputBuf >> (inputBits - n)) & (0xffff >> (16 - n));
+ }
++#else // secfix
++CCITTFaxStream::CCITTFaxStream(Stream *strA, int encodingA, GBool endOfLineA,
++			       GBool byteAlignA, int columnsA, int rowsA,
++			       GBool endOfBlockA, GBool blackA):
++    FilterStream(strA) {
++  encoding = encodingA;
++  endOfLine = endOfLineA;
++  byteAlign = byteAlignA;
++  columns = columnsA;
++  if (columns < 1) {
++    columns = 1;
++  } else if (columns > (INT_MAX - 2)/sizeof(int)) {
++    columns = (INT_MAX - 2)/sizeof(int);
++  }
++  rows = rowsA;
++  endOfBlock = endOfBlockA;
++  black = blackA;
++  // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = columns
++  // ---> max codingLine size = columns + 1
++  // refLine has one extra guard entry at the end
++  // ---> max refLine size = columns + 2
++  codingLine = (int *)gmalloc((columns + 1) * sizeof(int));
++  refLine = (int *)gmalloc((columns + 2) * sizeof(int));
++
++  eof = gFalse;
++  row = 0;
++  nextLine2D = encoding < 0;
++  inputBits = 0;
++  codingLine[0] = columns;
++  a0i = 0;
++  outputBits = 0;
++
++  buf = EOF;
++}
++
++CCITTFaxStream::~CCITTFaxStream() {
++  delete str;
++  gfree(refLine);
++  gfree(codingLine);
++}
++
++void CCITTFaxStream::reset() {
++  short code1;
++
++  str->reset();
++  eof = gFalse;
++  row = 0;
++  nextLine2D = encoding < 0;
++  inputBits = 0;
++  codingLine[0] = columns;
++  a0i = 0;
++  outputBits = 0;
++  buf = EOF;
++
++  // skip any initial zero bits and end-of-line marker, and get the 2D
++  // encoding tag
++  while ((code1 = lookBits(12)) == 0) {
++    eatBits(1);
++  }
++  if (code1 == 0x001) {
++    eatBits(12);
++  }
++  if (encoding > 0) {
++    nextLine2D = !lookBits(1);
++    eatBits(1);
++  }
++}
++
++inline void CCITTFaxStream::addPixels(int a1, int blackPixels) {
++  if (a1 > codingLine[a0i]) {
++    if (a1 > columns) {
++      error(getPos(), "CCITTFax row is wrong length (%d)", a1);
++      err = gTrue;
++      a1 = columns;
++    }
++    if ((a0i & 1) ^ blackPixels) {
++      ++a0i;
++    }
++    codingLine[a0i] = a1;
++  }
++}
++
++inline void CCITTFaxStream::addPixelsNeg(int a1, int blackPixels) {
++  if (a1 > codingLine[a0i]) {
++    if (a1 > columns) {
++      error(getPos(), "CCITTFax row is wrong length (%d)", a1);
++      err = gTrue;
++      a1 = columns;
++    }
++    if ((a0i & 1) ^ blackPixels) {
++      ++a0i;
++    }
++    codingLine[a0i] = a1;
++  } else if (a1 < codingLine[a0i]) {
++    if (a1 < 0) {
++      error(getPos(), "Invalid CCITTFax code");
++      err = gTrue;
++      a1 = 0;
++    }
++    while (a0i > 0 && a1 <= codingLine[a0i - 1]) {
++      --a0i;
++    }
++    codingLine[a0i] = a1;
++  }
++}
++
++int CCITTFaxStream::lookChar() {
++  short code1, code2, code3;
++  int b1i, blackPixels, i, bits;
++  GBool gotEOL;
++
++  if (buf != EOF) {
++    return buf;
++  }
++
++  // read the next row
++  if (outputBits == 0) {
++
++    // if at eof just return EOF
++    if (eof) {
++      return EOF;
++    }
++
++    err = gFalse;
++
++    // 2-D encoding
++    if (nextLine2D) {
++      for (i = 0; codingLine[i] < columns; ++i) {
++	refLine[i] = codingLine[i];
++      }
++      refLine[i++] = columns;
++      refLine[i] = columns;
++      codingLine[0] = 0;
++      a0i = 0;
++      b1i = 0;
++      blackPixels = 0;
++      // invariant:
++      // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1]
++      //                                                             <= columns
++      // exception at left edge:
++      //   codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible
++      // exception at right edge:
++      //   refLine[b1i] = refLine[b1i+1] = columns is possible
++      while (codingLine[a0i] < columns) {
++	code1 = getTwoDimCode();
++	switch (code1) {
++	case twoDimPass:
++	  addPixels(refLine[b1i + 1], blackPixels);
++	  if (refLine[b1i + 1] < columns) {
++	    b1i += 2;
++	  }
++	  break;
++	case twoDimHoriz:
++	  code1 = code2 = 0;
++	  if (blackPixels) {
++	    do {
++	      code1 += code3 = getBlackCode();
++	    } while (code3 >= 64);
++	    do {
++	      code2 += code3 = getWhiteCode();
++	    } while (code3 >= 64);
++	  } else {
++	    do {
++	      code1 += code3 = getWhiteCode();
++	    } while (code3 >= 64);
++	    do {
++	      code2 += code3 = getBlackCode();
++	    } while (code3 >= 64);
++	  }
++	  addPixels(codingLine[a0i] + code1, blackPixels);
++	  if (codingLine[a0i] < columns) {
++	    addPixels(codingLine[a0i] + code2, blackPixels ^ 1);
++	  }
++	  while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	    b1i += 2;
++	  }
++	  break;
++	case twoDimVertR3:
++	  addPixels(refLine[b1i] + 3, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    ++b1i;
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case twoDimVertR2:
++	  addPixels(refLine[b1i] + 2, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    ++b1i;
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case twoDimVertR1:
++	  addPixels(refLine[b1i] + 1, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    ++b1i;
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case twoDimVert0:
++	  addPixels(refLine[b1i], blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    ++b1i;
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case twoDimVertL3:
++	  addPixelsNeg(refLine[b1i] - 3, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    if (b1i > 0) {
++	      --b1i;
++	    } else {
++	      ++b1i;
++	    }
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case twoDimVertL2:
++	  addPixelsNeg(refLine[b1i] - 2, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    if (b1i > 0) {
++	      --b1i;
++	    } else {
++	      ++b1i;
++	    }
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case twoDimVertL1:
++	  addPixelsNeg(refLine[b1i] - 1, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    if (b1i > 0) {
++	      --b1i;
++	    } else {
++	      ++b1i;
++	    }
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case EOF:
++	  addPixels(columns, 0);
++	  eof = gTrue;
++	  break;
++	default:
++	  error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1);
++	  addPixels(columns, 0);
++	  err = gTrue;
++	  break;
++	}
++      }
++
++    // 1-D encoding
++    } else {
++      codingLine[0] = 0;
++      a0i = 0;
++      blackPixels = 0;
++      while (codingLine[a0i] < columns) {
++	code1 = 0;
++	if (blackPixels) {
++	  do {
++	    code1 += code3 = getBlackCode();
++	  } while (code3 >= 64);
++	} else {
++	  do {
++	    code1 += code3 = getWhiteCode();
++	  } while (code3 >= 64);
++	}
++	addPixels(codingLine[a0i] + code1, blackPixels);
++	blackPixels ^= 1;
++      }
++    }
++
++    // byte-align the row
++    if (byteAlign) {
++      inputBits &= ~7;
++    }
++
++    // check for end-of-line marker, skipping over any extra zero bits
++    gotEOL = gFalse;
++    if (!endOfBlock && row == rows - 1) {
++      eof = gTrue;
++    } else {
++      code1 = lookBits(12);
++      while (code1 == 0) {
++	eatBits(1);
++	code1 = lookBits(12);
++      }
++      if (code1 == 0x001) {
++	eatBits(12);
++	gotEOL = gTrue;
++      } else if (code1 == EOF) {
++	eof = gTrue;
++      }
++    }
++
++    // get 2D encoding tag
++    if (!eof && encoding > 0) {
++      nextLine2D = !lookBits(1);
++      eatBits(1);
++    }
++
++    // check for end-of-block marker
++    if (endOfBlock && gotEOL) {
++      code1 = lookBits(12);
++      if (code1 == 0x001) {
++	eatBits(12);
++	if (encoding > 0) {
++	  lookBits(1);
++	  eatBits(1);
++	}
++	if (encoding >= 0) {
++	  for (i = 0; i < 4; ++i) {
++	    code1 = lookBits(12);
++	    if (code1 != 0x001) {
++	      error(getPos(), "Bad RTC code in CCITTFax stream");
++	    }
++	    eatBits(12);
++	    if (encoding > 0) {
++	      lookBits(1);
++	      eatBits(1);
++	    }
++	  }
++	}
++	eof = gTrue;
++      }
++
++    // look for an end-of-line marker after an error -- we only do
++    // this if we know the stream contains end-of-line markers because
++    // the "just plow on" technique tends to work better otherwise
++    } else if (err && endOfLine) {
++      while (1) {
++	code1 = lookBits(13);
++	if (code1 == EOF) {
++	  eof = gTrue;
++	  return EOF;
++	}
++	if ((code1 >> 1) == 0x001) {
++	  break;
++	}
++	eatBits(1);
++      }
++      eatBits(12); 
++      if (encoding > 0) {
++	eatBits(1);
++	nextLine2D = !(code1 & 1);
++      }
++    }
++
++    // set up for output
++    if (codingLine[0] > 0) {
++      outputBits = codingLine[a0i = 0];
++    } else {
++      outputBits = codingLine[a0i = 1];
++    }
++
++    ++row;
++  }
++
++  // get a byte
++  if (outputBits >= 8) {
++    buf = (a0i & 1) ? 0x00 : 0xff;
++    outputBits -= 8;
++    if (outputBits == 0 && codingLine[a0i] < columns) {
++      ++a0i;
++      outputBits = codingLine[a0i] - codingLine[a0i - 1];
++    }
++  } else {
++    bits = 8;
++    buf = 0;
++    do {
++      if (outputBits > bits) {
++	buf <<= bits;
++	if (!(a0i & 1)) {
++	  buf |= 0xff >> (8 - bits);
++	}
++	outputBits -= bits;
++	bits = 0;
++      } else {
++	buf <<= outputBits;
++	if (!(a0i & 1)) {
++	  buf |= 0xff >> (8 - outputBits);
++	}
++	bits -= outputBits;
++	outputBits = 0;
++	if (codingLine[a0i] < columns) {
++	  ++a0i;
++	  outputBits = codingLine[a0i] - codingLine[a0i - 1];
++	} else if (bits > 0) {
++	  buf <<= bits;
++	  bits = 0;
++	}
++      }
++    } while (bits);
++  }
++  if (black) {
++    buf ^= 0xff;
++  }
++  return buf;
++}
++
++short CCITTFaxStream::getTwoDimCode() {
++  short code;
++  CCITTCode *p;
++  int n;
++
++  code = 0; // make gcc happy
++  if (endOfBlock) {
++    code = lookBits(7);
++    p = &twoDimTab1[code];
++    if (p->bits > 0) {
++      eatBits(p->bits);
++      return p->n;
++    }
++  } else {
++    for (n = 1; n <= 7; ++n) {
++      code = lookBits(n);
++      if (n < 7) {
++	code <<= 7 - n;
++      }
++      p = &twoDimTab1[code];
++      if (p->bits == n) {
++	eatBits(n);
++	return p->n;
++      }
++    }
++  }
++  error(getPos(), "Bad two dim code (%04x) in CCITTFax stream", code);
++  return EOF;
++}
++
++short CCITTFaxStream::getWhiteCode() {
++  short code;
++  CCITTCode *p;
++  int n;
++
++  code = 0; // make gcc happy
++  if (endOfBlock) {
++    code = lookBits(12);
++    if (code == EOF) {
++      return 1;
++    }
++    if ((code >> 5) == 0) {
++      p = &whiteTab1[code];
++    } else {
++      p = &whiteTab2[code >> 3];
++    }
++    if (p->bits > 0) {
++      eatBits(p->bits);
++      return p->n;
++    }
++  } else {
++    for (n = 1; n <= 9; ++n) {
++      code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
++      if (n < 9) {
++	code <<= 9 - n;
++      }
++      p = &whiteTab2[code];
++      if (p->bits == n) {
++	eatBits(n);
++	return p->n;
++      }
++    }
++    for (n = 11; n <= 12; ++n) {
++      code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
++      if (n < 12) {
++	code <<= 12 - n;
++      }
++      p = &whiteTab1[code];
++      if (p->bits == n) {
++	eatBits(n);
++	return p->n;
++      }
++    }
++  }
++  error(getPos(), "Bad white code (%04x) in CCITTFax stream", code);
++  // eat a bit and return a positive number so that the caller doesn't
++  // go into an infinite loop
++  eatBits(1);
++  return 1;
++}
++
++short CCITTFaxStream::getBlackCode() {
++  short code;
++  CCITTCode *p;
++  int n;
++
++  code = 0; // make gcc happy
++  if (endOfBlock) {
++    code = lookBits(13);
++    if (code == EOF) {
++      return 1;
++    }
++    if ((code >> 7) == 0) {
++      p = &blackTab1[code];
++    } else if ((code >> 9) == 0 && (code >> 7) != 0) {
++      p = &blackTab2[(code >> 1) - 64];
++    } else {
++      p = &blackTab3[code >> 7];
++    }
++    if (p->bits > 0) {
++      eatBits(p->bits);
++      return p->n;
++    }
++  } else {
++    for (n = 2; n <= 6; ++n) {
++      code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
++      if (n < 6) {
++	code <<= 6 - n;
++      }
++      p = &blackTab3[code];
++      if (p->bits == n) {
++	eatBits(n);
++	return p->n;
++      }
++    }
++    for (n = 7; n <= 12; ++n) {
++      code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
++      if (n < 12) {
++	code <<= 12 - n;
++      }
++      if (code >= 64) {
++	p = &blackTab2[code - 64];
++	if (p->bits == n) {
++	  eatBits(n);
++	  return p->n;
++	}
++      }
++    }
++    for (n = 10; n <= 13; ++n) {
++      code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
++      if (n < 13) {
++	code <<= 13 - n;
++      }
++      p = &blackTab1[code];
++      if (p->bits == n) {
++	eatBits(n);
++	return p->n;
++      }
++    }
++  }
++  error(getPos(), "Bad black code (%04x) in CCITTFax stream", code);
++  // eat a bit and return a positive number so that the caller doesn't
++  // go into an infinite loop
++  eatBits(1);
++  return 1;
++}
++
++short CCITTFaxStream::lookBits(int n) {
++  int c;
++
++  while (inputBits < n) {
++    if ((c = str->getChar()) == EOF) {
++      if (inputBits == 0) {
++	return EOF;
++      }
++      // near the end of the stream, the caller may ask for more bits
++      // than are available, but there may still be a valid code in
++      // however many bits are available -- we need to return correct
++      // data in this case
++      return (inputBuf << (n - inputBits)) & (0xffff >> (16 - n));
++    }
++    inputBuf = (inputBuf << 8) + c;
++    inputBits += 8;
++  }
++  return (inputBuf >> (inputBits - n)) & (0xffff >> (16 - n));
++}
++
++#endif
+ 
+ GString *CCITTFaxStream::getPSFilter(const char *indent) {
+   GString *s;
+@@ -1929,6 +2533,12 @@
+     // allocate a buffer for the whole image
+     bufWidth = ((width + mcuWidth - 1) / mcuWidth) * mcuWidth;
+     bufHeight = ((height + mcuHeight - 1) / mcuHeight) * mcuHeight;
++    if (bufWidth <= 0 || bufHeight <= 0 ||
++	bufWidth > INT_MAX / bufWidth / (int)sizeof(int)) {
++      error(getPos(), "Invalid image size in DCT stream");
++      y = height;
++      return;
++    }
+     for (i = 0; i < numComps; ++i) {
+       frameBuf[i] = (int *)gmalloc(bufWidth * bufHeight * sizeof(int));
+       memset(frameBuf[i], 0, bufWidth * bufHeight * sizeof(int));
+@@ -2975,6 +3585,11 @@
+   }
+   scanInfo.firstCoeff = str->getChar();
+   scanInfo.lastCoeff = str->getChar();
++  if (scanInfo.firstCoeff < 0 || scanInfo.lastCoeff > 63 ||
++      scanInfo.firstCoeff > scanInfo.lastCoeff) {
++    error(getPos(), "Bad DCT coefficient numbers in scan info block");
++    return gFalse;
++  }
+   c = str->getChar();
+   scanInfo.ah = (c >> 4) & 0x0f;
+   scanInfo.al = c & 0x0f;
+--- filters/kword/pdf/xpdf/xpdf/Stream.h
++++ filters/kword/pdf/xpdf/xpdf/Stream.h
+@@ -513,13 +513,17 @@
+   int row;			// current row
+   int inputBuf;			// input buffer
+   int inputBits;		// number of bits in input buffer
+-  short *refLine;		// reference line changing elements
+-  int b1;			// index into refLine
+-  short *codingLine;		// coding line changing elements
+-  int a0;			// index into codingLine
++  int *codingLine;             // coding line changing elements
++  int *refLine;                        // reference line changing elements
++  int a0i;                     // index into codingLine
++  GBool err;                   // error on current line
++
+   int outputBits;		// remaining output bits
+   int buf;			// character buffer
+ 
++  void addPixels(int a1, int black);
++  void addPixelsNeg(int a1, int black);
++
+   short getTwoDimCode();
+   short getWhiteCode();
+   short getBlackCode();

koffice-xpdf-CVE-2007-3387.diff:

Index: koffice-xpdf-CVE-2007-3387.diff
===================================================================
RCS file: koffice-xpdf-CVE-2007-3387.diff
diff -N koffice-xpdf-CVE-2007-3387.diff
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koffice-xpdf-CVE-2007-3387.diff	18 Sep 2008 19:00:48 -0000	1.3
@@ -0,0 +1,20 @@
+--- filters/kword/pdf/xpdf/xpdf/Stream.cc
++++ filters/kword/pdf/xpdf/xpdf/Stream.cc
+@@ -413,13 +413,11 @@ StreamPredictor::StreamPredictor(Stream 
+   predLine = NULL;
+   ok = gFalse;
+ 
+-  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
+-     nComps >= INT_MAX / nBits ||
+-      width >= INT_MAX / nComps / nBits)
+-    return;
+-
+   nVals = width * nComps;
+-  if (nVals * nBits + 7 <= 0)
++  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
++     nComps >= 4 || nBits > 16 ||
++      width >= INT_MAX / nComps ||
++      nVals >= (INT_MAX - 7) / nBits)
+     return;
+ 
+   pixBytes = (nComps * nBits + 7) >> 3;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	12 Sep 2008 16:55:03 -0000	1.19
+++ .cvsignore	18 Sep 2008 19:00:48 -0000	1.20
@@ -1 +1,5 @@
-koffice-1.9.95.10.tar.bz2
+koffice-1.6.0.tar.bz2
+koffice-1.6.1.tar.bz2
+koshell.png
+koffice-1.6.2.tar.bz2
+koffice-1.6.3.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- koffice.spec	12 Sep 2008 16:55:03 -0000	1.76
+++ koffice.spec	18 Sep 2008 19:00:48 -0000	1.77
@@ -1,63 +1,72 @@
 
 Name:           koffice
-Version:        1.9.95.10
-Release:        1%{?dist}
+Epoch:          1
+Version:        1.6.3
+Release:        16%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
-# apps GPLv2+, libs LGPLv2+
 License:        GPLv2+
 URL:            http://www.koffice.org/
-Source0:        http://download.kde.org/unstable/koffice-%{version}/src/koffice-%{version}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#-- The following OPTIONAL packages could NOT be located on your system.
-#-- Consider installing them to enable more features from this software.
-#+ OpenCTL, 0.9.2: OpenCTL is needed for some color spaces (High Dynamic Range Color Spaces, YCbCr and LMS) <http://www.openctl.org>
-#+ FreeTDS library: Kexi Sybase Migration driver requires FreeTDS library. The driver will not be built <http://www.freetds.org>
-#+ XBase library: Kexi XBase Migration driver requires XBase library. The driver will not be built <http://linux.techass.com/projects/xdb/>
-#+ GMM: The Krita Panorama plugin will not be built. <http://home.gna.org/getfem/download.html>
-#+ Spnav: Spnav is the library which is required by the space navigator device plugin <http://spacenav.sourceforge.net/>
-
-BuildRequires: boost-devel
-BuildRequires: bzip2-devel
-BuildRequires: cmake
-BuildRequires: desktop-file-utils
-BuildRequires: doxygen
-BuildRequires: eigen2-devel
-BuildRequires: exiv2-devel
-BuildRequires: fontconfig-devel
-BuildRequires: freeglut-devel
-BuildRequires: freetype-devel
-BuildRequires: gettext-devel
-BuildRequires: giflib-devel
-BuildRequires: glew-devel
-BuildRequires: GraphicsMagick-devel
-BuildRequires: gsl-devel
-# BR: libkdcraw-devel >= 0.2.0 
-BuildRequires: kdegraphics4-devel
-BuildRequires: kdelibs4-devel
-BuildRequires: kdepimlibs-devel
-BuildRequires: lcms-devel
-BuildRequires: libGL-devel libGLU-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
-BuildRequires: libpqxx-devel
-BuildRequires: libtiff-devel
-BuildRequires: libwpd-devel
-BuildRequires: libxslt-devel
-BuildRequires: mysql-devel
-BuildRequires: OpenEXR-devel
-BuildRequires: openldap-devel
-BuildRequires: pcre-devel
-BuildRequires: perl
-BuildRequires: poppler-qt4-devel
-BuildRequires: python-devel
-BuildRequires: qca2-devel
-BuildRequires: qimageblitz-devel
-BuildRequires: readline-devel
-BuildRequires: ruby-devel ruby
-BuildRequires: wv2-devel
+Source100:      koshell.png
+
+# http://www.kde.org/info/security/advisory-20070730-1.txt
+Patch1: ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff
+
+# http://www.kde.org/info/security/advisory-20071107-1.txt
+Patch2: ftp://ftp.kde.org/pub/kde/security_patches/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
+
+# upstream patch pulled via: svn diff -c 738929 
+# svn diff -c 729276 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
+# svn diff -c 738929 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
+Patch3: koffice-1.6.3-gcc43.patch
+
+# BuildRequires: world-devel ;)
+BuildRequires:  kdelibs3-devel
+# See http://bugzilla.redhat.com/244091
+%global kdelibs_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
+BuildRequires:  freetype-devel
+BuildRequires:  fontconfig-devel
+BuildRequires:  libart_lgpl-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  GraphicsMagick-devel
+BuildRequires:  ImageMagick-devel
+BuildRequires:  bzip2-devel
+BuildRequires:  zlib-devel
+BuildRequires:  openssl-devel
+BuildRequires:  python-devel
+BuildRequires:  pcre-devel
+BuildRequires:  libwpd-devel
+BuildRequires:  lcms-devel
+BuildRequires:  gettext-devel
+BuildRequires:  mysql-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  perl
+BuildRequires:  wv2-devel
+BuildRequires:  libpqxx-devel
+BuildRequires:  doxygen
+BuildRequires:  aspell-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  OpenEXR-devel
+BuildRequires:  libexif-devel
+BuildRequires:  libGL-devel libGLU-devel
+BuildRequires:  readline-devel
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%define ruby 1
+BuildRequires:  ruby ruby-devel >= 1.8.2
+%endif
+BuildRequires:  poppler-qt-devel
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+BuildRequires:  libpaper-devel
+BuildRequires:  libXi-devel
+%endif
 
 %description
 KOffice is an integrated office suite.
@@ -67,233 +76,288 @@
 Group:          Applications/Productivity
 Obsoletes:      koffice <= 4:%{version}-%{release}
 Obsoletes:      koffice-i18n < 4:%{version}
-Requires:       koffice-core = %{version}-%{release} 
-Requires:       koffice-kword = %{version}-%{release} 
-Requires:       koffice-kspread = %{version}-%{release} 
-Requires:       koffice-kpresenter = %{version}-%{release}
-Requires:       koffice-kivio = %{version}-%{release}
-Requires:       koffice-karbon = %{version}-%{release}
-Requires:       koffice-krita = %{version}-%{release}
-Requires:       koffice-kugar = %{version}-%{release}
-Requires:       koffice-kexi = %{version}-%{release}
-Requires:       koffice-kexi-driver-mysql = %{version}-%{release}
-Requires:       koffice-kexi-driver-pgsql = %{version}-%{release}
-Requires:       koffice-kchart = %{version}-%{release}
-Requires:       koffice-kformula = %{version}-%{release}
-Requires:       koffice-filters = %{version}-%{release}
-Requires:       koffice-kplato = %{version}-%{release}
+Requires:       koffice-core = %{epoch}:%{version}-%{release} 
+Requires:       koffice-kword = %{epoch}:%{version}-%{release} 
+Requires:       koffice-kspread = %{epoch}:%{version}-%{release} 
+Requires:       koffice-kpresenter = %{epoch}:%{version}-%{release}
+Requires:       koffice-kivio = %{epoch}:%{version}-%{release}
+Requires:       koffice-karbon = %{epoch}:%{version}-%{release}
+Requires:       koffice-krita = %{epoch}:%{version}-%{release}
+Requires:       koffice-kugar = %{epoch}:%{version}-%{release}
+Requires:       koffice-kexi = %{epoch}:%{version}-%{release}
+Requires:       koffice-kexi-driver-mysql = %{epoch}:%{version}-%{release}
+Requires:       koffice-kexi-driver-pgsql = %{epoch}:%{version}-%{release}
+Requires:       koffice-kchart = %{epoch}:%{version}-%{release}
+Requires:       koffice-kformula = %{epoch}:%{version}-%{release}
+Requires:       koffice-filters = %{epoch}:%{version}-%{release}
+Requires:       koffice-kplato = %{epoch}:%{version}-%{release}
 
 %description suite
 KOffice is an integrated office suite.
 
 %package core
-Summary:        Core support files for koffice
+Summary:        Core support files for %{name} 
 Group:          Applications/Productivity
-Requires:	%{name}-libs = %{version}-%{release}
-#Conflicts:      koffice-i18n < 4:%{version}
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
-
+Requires:       perl
+Conflicts:      koffice-i18n < 4:%{version}
 %description core
 %{summary}.
 
 %package libs
-Summary:        Runtime libraries for koffice
+Summary:        Runtime libraries for %{name} 
 Group:          System Environment/Libraries
-#Conflicts:      koffice <= 4:%{version}-%{release}
+Conflicts:      koffice <= 4:%{version}-%{release}
+Requires:       kdelibs3 >= %{kdelibs_ver}
+License:        LGPLv2+
 %description libs
 %{summary}.
 
 %package devel
-Summary:        Libraries needed for koffice development
+Summary:        Development files for %{name} 
 Group:          Development/Libraries
-Requires:       %{name}-libs = %{version}-%{release}
-Requires:       kdelibs4-devel
-
+Requires:       %{name}-libs = %{epoch}:%{version}-%{release}
+License:        LGPLv2+
 %description devel
-%{summary}
+%{summary}.
 
 %package kword
-Summary:A frame-based word processor capable of professional standard documents
+Summary:	A frame-based word processor capable of professional standard documents
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 %description kword
-%{summary}
+%{summary}.
 
 %package kspread
 Summary:        A powerful spreadsheet application
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 %description kspread
-%{summary}
+%{summary}.
 
 %package kpresenter
 Summary:        A full-featured presentation program
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 %description kpresenter
-%{summary}
+%{summary}.
 
 %package kivio
 Summary:        A flowcharting application
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:      kivio < %{version}-%{release}
-
 %description kivio
-%{summary}
+%{summary}.
 
 %package karbon
 Summary:        A vector drawing application
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 %description karbon
-%{summary}
+%{summary}.
 
 %package krita
 Summary:        A pixel-based image manipulation program 
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-Requires:	%{name}-filters
-
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 %description krita
-%{summary}
+%{summary}.
 
 %package kugar
 Summary:        A tool for generating business quality reports
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 %description kugar
-%{summary}
+%{summary}.
 
 %package kexi
 Summary:        An integrated environment for managing data
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 %description kexi
-%{summary}
+%{summary}.
 For additional database drivers take a look at %{name}-kexi-driver-*
 
 %package kexi-driver-mysql
-Summary:        mysql-driver for kexi
+Summary:        Mysql-driver for kexi
 Group:          Applications/Productivity
-Requires:       %{name}-kexi = %{version}-%{release}
-
+Requires:       %{name}-kexi = %{epoch}:%{version}-%{release}
 %description kexi-driver-mysql
-%{summary}
+%{summary}.
 
 %package kexi-driver-pgsql
-Summary:        pgsql-driver for kexi
+Summary:        Postresql driver for kexi
 Group:          Applications/Productivity
-Requires:       %{name}-kexi = %{version}-%{release}
-
+Requires:       %{name}-kexi = %{epoch}:%{version}-%{release}
 %description kexi-driver-pgsql
-%{summary}
+%{summary}.
 
 %package kchart
 Summary:        An integrated graph and chart drawing tool
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 %description kchart
-%{summary}
+%{summary}.
 
 %package kformula
 Summary:        A powerful formula editor
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 Requires:       mathml-fonts
-
 %description kformula
-%{summary}
+%{summary}.
 
 %package filters
 Summary:        Import and Export Filters for KOffice
 Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 %description filters
-%{summary}
+%{summary}.
 
 %package kplato
 Summary:         An integrated project management and planning tool
 Group:           Applications/Productivity
-Requires:        %{name}-core = %{version}-%{release}
-
+Requires:        %{name}-core = %{epoch}:%{version}-%{release}
 %description kplato
-%{summary}
+%{summary}.
 
 
 %prep
 %setup -q
 
+%patch1 -p0 -b .CVE-2007-3387
+%patch2 -p0 -b .CVE-2007-4352-5392-5393
+%patch3 -p1 -b .gcc43
+
 
 %build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-# SET EIGEN2_INCLUDE_DIR since our kde4_incdir != eigen2_incdir
-%{cmake_kde4} \
-  -DEIGEN2_INCLUDE_DIR=%{_includedir}/eigen2 \
-  ..
-popd
+%configure \
+  --disable-rpath --disable-dependency-tracking \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --with-pic --enable-shared --disable-static \
+  --with-extra-libs=%{_libdir} \
+  --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
+  --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
+  --enable-final
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+[ ! -f %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/koshell.png ] && \
+install -p -D -m644 %{SOURCE100} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/koshell.png
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+# Replace absolute symlinks with relative ones
+pushd %{buildroot}%{_docdir}/HTML
+for lang in *; do
+  if [ -d $lang ]; then
+    pushd $lang
+    for i in */*; do
+      [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
+    done
+    popd
+  fi
+done
+popd
 
-# unpackaged files
-rm -f %{buildroot}%{_kde4_libdir}/lib*common.so
-rm -f %{buildroot}%{_kde4_libdir}/lib*filters.so
-rm -f %{buildroot}%{_kde4_libdir}/lib*private.so
-rm -f %{buildroot}%{_kde4_libdir}/libkarbon*.so
-rm -f %{buildroot}%{_kde4_libdir}/libkexi*.so
-rm -f %{buildroot}%{_kde4_libdir}/libkisexiv2.so
-rm -f %{buildroot}%{_kde4_libdir}/libkformdesigner.so
-rm -f %{buildroot}%{_kde4_libdir}/libkplato*.so
-rm -f %{buildroot}%{_kde4_libdir}/libkword*.so
-rm -f %{buildroot}%{_kde4_libdir}/libkrita*.so
-rm -f %{buildroot}%{_kde4_libdir}/libkross*.so
+desktop-file-install \
+  --dir=%{buildroot}%{_datadir}/applications/kde \
+  --vendor="" \
+  --delete-original \
+  %{buildroot}%{_datadir}/applnk/Office/*.desktop
+
+## Hack-in NoDisplay=True (http://bugzilla.redhat.com/245061)
+## until http://bugzilla.redhat.com/245190 is fixed
+for desktop_file in %{buildroot}%{_datadir}/applnk/.hidden/*.desktop ; do
+  grep "^NoDisplay=" ${desktop_file} || \
+    echo "NoDisplay=True" >> ${desktop_file}
+done
+
+## unpackaged files
+rm -f %{buildroot}%{_libdir}/lib*.la
+# shouldn't these be in koffice-l10n? 
+rm -f %{buildroot}%{_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh
+# -devel symlinks to nuke
+rm -f %{buildroot}%{_libdir}/lib*common.so
+rm -f %{buildroot}%{_libdir}/lib*filters.so
+rm -f %{buildroot}%{_libdir}/lib*private.so
+rm -f %{buildroot}%{_libdir}/libkarbon*.so
+rm -f %{buildroot}%{_libdir}/libkchart*.so
+rm -f %{buildroot}%{_libdir}/libkexi*.so
+rm -f %{buildroot}%{_libdir}/libkisexiv2.so
+rm -f %{buildroot}%{_libdir}/libkformdesigner.so
+rm -f %{buildroot}%{_libdir}/libkplato*.so
+rm -f %{buildroot}%{_libdir}/libkpresenter*.so
+rm -f %{buildroot}%{_libdir}/libkword*.so
+rm -f %{buildroot}%{_libdir}/libkrita*.so
+rm -f %{buildroot}%{_libdir}/libkross*.so
+rm -f %{buildroot}%{_libdir}/libkugar*.so
 
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 
 %post core
+xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun core
+xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
-%post kword -p /sbin/ldconfig
-%postun kword -p /sbin/ldconfig
+%post kword
+/sbin/ldconfig
+xdg-desktop-menu forceupdate 2> /dev/null || :
+
+%postun kword
+/sbin/ldconfig
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
-%post kpresenter -p /sbin/ldconfig
-%postun kpresenter -p /sbin/ldconfig
+%post kpresenter
+/sbin/ldconfig
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
-%post kugar -p /sbin/ldconfig
-%postun kugar -p /sbin/ldconfig
+%postun kpresenter 
+/sbin/ldconfig
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
-%post kexi -p /sbin/ldconfig
-%postun kexi -p /sbin/ldconfig
+%post kugar
+/sbin/ldconfig
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
-%post kchart -p /sbin/ldconfig
-%postun kchart -p /sbin/ldconfig
+%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 || :
 
 %post filters -p /sbin/ldconfig
 %postun filters -p /sbin/ldconfig 
@@ -306,350 +370,343 @@
 
 %files core
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING.LIB README
-%{_kde4_bindir}/kthesaurus
-%{_kde4_bindir}/koconverter
-%{_kde4_libdir}/libkdeinit4_kthesaurus.so
-%{_kde4_libdir}/kde4/autocorrect.so
-%{_kde4_libdir}/kde4/changecase.so
-%{_kde4_libdir}/kde4/defaulttools.so
-%{_kde4_libdir}/kde4/kodocinfopropspage.*
-%{_kde4_libdir}/kde4/kofficescan.*
-%{_kde4_libdir}/kde4/kofficethumbnail.*
-%{_kde4_libdir}/kde4/libkounavailpart.*
-%{_kde4_libdir}/kde4/clipartthumbnail.*
-%{_kde4_libdir}/kde4/thesaurustool.so
-%{_kde4_libdir}/kde4/koffice_graya_u16_plugin.so
-%{_kde4_libdir}/kde4/kofficegrayau8plugin.so
-%{_kde4_libdir}/kde4/kofficedockers.so
-%{_kde4_libdir}/kde4/kofficesimpletextedit.so
-%{_kde4_libdir}/kde4/spellcheck.so
-%{_kde4_libdir}/kde4/textvariables.so
-%{_kde4_appsdir}/koffice/
-%{_kde4_docdir}/HTML/en/koffice/
-%{_kde4_docdir}/HTML/en/koshell/
-%{_kde4_docdir}/HTML/en/thesaurus/
-%{_kde4_datadir}/applications/kde4/KThesaurus.desktop
-%{_kde4_datadir}/icons/hicolor/*/*/*
-%{_kde4_datadir}/icons/oxygen/*/*/*
-%{_kde4_datadir}/kde4/services/autocorrect.desktop
-%{_kde4_datadir}/kde4/services/changecase.desktop
-%{_kde4_datadir}/kde4/services/clipartthumbnail.desktop
-%{_kde4_datadir}/kde4/services/defaulttools.desktop
-%{_kde4_datadir}/kde4/services/kodocinfopropspage.desktop
-%{_kde4_datadir}/kde4/services/kofficethumbnail.desktop
-%{_kde4_datadir}/kde4/services/koffice_graya_u16_plugin.desktop
-%{_kde4_datadir}/kde4/services/kofficegrayaplugin.desktop
-%{_kde4_datadir}/kde4/services/kofficedockers.desktop
-%{_kde4_datadir}/kde4/services/kounavail.desktop
-%{_kde4_datadir}/kde4/services/thesaurustool.desktop
-%{_kde4_datadir}/kde4/services/kofficesimpletextedit.desktop
-%{_kde4_datadir}/kde4/services/spellcheck.desktop
-%{_kde4_datadir}/kde4/services/textvariables.desktop
-%{_kde4_datadir}/kde4/servicetypes/kochart.desktop
-%{_kde4_datadir}/kde4/servicetypes/kofficedocker.desktop
-%{_kde4_datadir}/kde4/servicetypes/kofficepart.desktop
-%{_kde4_datadir}/kde4/servicetypes/koplugin.desktop
-%{_kde4_datadir}/kde4/servicetypes/inlinetextobject.desktop
-%{_kde4_datadir}/kde4/servicetypes/kwmailmerge.desktop
-%{_kde4_datadir}/kde4/servicetypes/texteditingplugin.desktop
-%{_kde4_datadir}/kde4/servicetypes/textvariableplugin.desktop
-%{_kde4_datadir}/kde4/servicetypes/widgetfactory.desktop
-%{_kde4_datadir}/applications/kde4/*koffice.desktop
-%{_kde4_datadir}/kde4/services/*shape.desktop
-%{_kde4_appsdir}/formulashape/
-%{_kde4_appsdir}/musicshape/
-%dir %{_datadir}/color/
-%dir %{_datadir}/color/icc/
-%{_datadir}/color/icc/pigment/
-%{_kde4_datadir}/kde4/servicetypes/pigment*.desktop
-%{_kde4_libdir}/kde4/pathshapes.so
-%{_kde4_datadir}/kde4/services/pathshapes.desktop
+%doc AUTHORS COPYING README
+%{_bindir}/koshell
+%{_bindir}/kthesaurus
+%{_bindir}/koconverter
+%{_libdir}/libkdeinit_koshell.so
+%{_libdir}/libkdeinit_kthesaurus.so
+%{_libdir}/kde3/kfile_koffice.*
+%{_libdir}/kde3/kfile_ooo.*
+%{_libdir}/kde3/kfile_abiword.*
+%{_libdir}/kde3/kfile_gnumeric.*
+%{_libdir}/kde3/kodocinfopropspage.*
+%{_libdir}/kde3/kofficescan.*
+%{_libdir}/kde3/kofficethumbnail.*
+%{_libdir}/kde3/koshell.*
+%{_libdir}/kde3/kthesaurus.*
+%{_libdir}/kde3/kwmailmerge_classic.*
+%{_libdir}/kde3/kwmailmerge_kabc.*
+%{_libdir}/kde3/kwmailmerge_qtsqldb_power.*
+%{_libdir}/kde3/kwmailmerge_qtsqldb.*
+%{_libdir}/kde3/libkounavailpart.*
+%{_libdir}/kde3/libkprkword.*
+%{_libdir}/kde3/libthesaurustool.*
+%{_libdir}/kde3/clipartthumbnail.*
+%{_datadir}/apps/koffice/
+%{_datadir}/apps/konqueror/servicemenus/*
+%{_datadir}/apps/koshell/
+%{_datadir}/apps/thesaurus/
+%{_datadir}/config.kcfg/koshell.kcfg
+%{_datadir}/doc/HTML/en/koffice/
+%{_datadir}/doc/HTML/en/koshell/
+%{_datadir}/doc/HTML/en/thesaurus/
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
+%{_datadir}/services/clipartthumbnail.desktop
+%{_datadir}/services/kfile*.desktop
+%{_datadir}/services/kwmailmerge*.desktop
+%{_datadir}/services/kodocinfopropspage.desktop
+%{_datadir}/services/kofficethumbnail.desktop
+%{_datadir}/services/kounavail.desktop
+%{_datadir}/services/kprkword.desktop
+%{_datadir}/services/thesaurustool.desktop
+%{_datadir}/servicetypes/kochart.desktop
+%{_datadir}/servicetypes/kofficepart.desktop
+%{_datadir}/servicetypes/koplugin.desktop
+%{_datadir}/servicetypes/kwmailmerge.desktop
+%{_datadir}/servicetypes/widgetfactory.desktop
+%{_datadir}/applications/kde/*koffice.desktop
+%{_datadir}/applications/kde/*KThesaurus.desktop
+%{_datadir}/applications/kde/*koshell.desktop
+%{_datadir}/apps/kofficewidgets/
+%{_datadir}/apps/kross/
+%{_libdir}/kde3/krosspython.*
+%{?ruby:%{_libdir}/kde3/krossruby.*}
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_datadir}/kde4/servicetypes/flake*.desktop
-%{_kde4_libdir}/libflake.so.*
-%{_kde4_libdir}/kde4/*shape.so
-%exclude %{_kde4_libdir}/kde4/formulashape.*
-%exclude %{_kde4_libdir}/kde4/kritashape.*
-%{_kde4_libdir}/libchartshapelib.so.*
-%{_kde4_libdir}/libkdchart.so.*
-%{_kde4_libdir}/libkochart.so.*
-%{_kde4_libdir}/libkotext.so.*
-%{_kde4_libdir}/libkowmf.so.*
-%{_kde4_libdir}/libkokross.so.*
-%{_kde4_libdir}/libkoguiutils.so.*
-%{_kde4_libdir}/libkomain.so.*
-%{_kde4_libdir}/libkoodf.so.*
-%{_kde4_libdir}/libkopageapp.so.*
-%{_kde4_libdir}/libkoproperty2.so.*
-%{_kde4_libdir}/libkoresources.so.*
-%{_kde4_libdir}/libkoffice_graya_u16.so.*
-%{_kde4_libdir}/libkofficegrayau8colorspace.so.*
-%{_kde4_libdir}/libkspreadcommon.so.*
-%{_kde4_libdir}/libkstore.so.*
-%{_kde4_libdir}/libkwmf.so.*
-%{_kde4_libdir}/libkformulalib.so.*
-%{_kde4_libdir}/libkoproperty.so.*
-%{_kde4_libdir}/libpigmentcms.so.*
+%doc COPYING.LIB
+#_libdir/libk*common.so.*
+%{_libdir}/libkarboncommon.so.*
+%{_libdir}/libkiviocommon.so.*
+%{_libdir}/libkspreadcommon.so.*
+%{_libdir}/libkdchart.so.*
+%{_libdir}/libkochart.so.*
+%{_libdir}/libkofficecore.so.*
+%{_libdir}/libkofficeui.so.*
+%{_libdir}/libkotext.so.*
+%{_libdir}/libkowmf.so.*
+%{_libdir}/libkopainter.so.*
+%{_libdir}/libkstore.so.*
+%{_libdir}/libkwmailmerge_interface.so.*
+%{_libdir}/libkwmf.so.*
+%{_libdir}/libkformulalib.so.*
+%{_libdir}/libkopalette.so.*
+%{_libdir}/libkoproperty.so.*
+%{_libdir}/libkrossapi.so.*
+%{_libdir}/libkrossmain.so.*
 
 %files devel
 %defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/koffice-apidocs/
 %{_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
+%{_libdir}/lib*.so
+%exclude %{_libdir}/libkdeinit_*.so
+%exclude %{_libdir}/libkudesignercore.so
+
+%files kword
+%defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kword/
+%{_bindir}/kword
+%{_libdir}/libkdeinit_kword.so
+%{_libdir}/libkwordprivate.so.*
+%{_libdir}/kde3/libkwordpart.*
+%{_libdir}/kde3/kword.*
+%{_datadir}/apps/kword/
+%{_datadir}/services/kword*.desktop
+%{_datadir}/services/kwserial*.desktop
+%{_datadir}/templates/TextDocument.desktop
+%{_datadir}/templates/.source/TextDocument.kwt
+%{_datadir}/applications/kde/*kword.desktop
 
 %files kspread
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kspread
-%{_kde4_libdir}/libkdeinit4_kspread.so
-%{_kde4_libdir}/kde4/krossmodulekspread.so
-%{_kde4_libdir}/kde4/kspread*.so
-%{_kde4_libdir}/kde4/libkspreadpart.*
-%{_kde4_libdir}/kde4/libcsvexport.*
-%{_kde4_libdir}/kde4/libcsvimport.*
-%{_kde4_libdir}/kde4/libgnumericexport.*
-%{_kde4_libdir}/kde4/libgnumericimport.*
-%{_kde4_libdir}/kde4/libkspreadhtmlexport.*
-%{_kde4_libdir}/kde4/libkspreadsolver.so
-%{_kde4_libdir}/kde4/libopencalcexport.*
-%{_kde4_libdir}/kde4/libopencalcimport.*
-%{_kde4_libdir}/kde4/libpowerpointimport.*
-%{_kde4_libdir}/kde4/libqproimport.*
-%{_kde4_appsdir}/kspread/
-%{_kde4_docdir}/HTML/en/kspread/
-%{_kde4_datadir}/config.kcfg/kspread.kcfg
-%{_kde4_datadir}/kde4/services/kspread*.desktop
-%{_kde4_datadir}/templates/SpreadSheet.desktop
-%{_kde4_datadir}/templates/.source/SpreadSheet.kst
-%{_kde4_datadir}/applications/kde4/*kspread.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kspread_konqi.desktop
-%{_kde4_datadir}/kde4/services/krossmodulekspread.desktop
-%{_kde4_datadir}/kde4/servicetypes/kspread_plugin.desktop
+%lang(en) %{_docdir}/HTML/en/kspread/
+%{_bindir}/kspread
+%{_libdir}/libkdeinit_kspread.so
+%{_libdir}/kde3/kspread.*
+%{_libdir}/kde3/libkspreadpart.*
+%{_libdir}/kde3/kwmailmerge_kspread.*
+%{_libdir}/kde3/libcsvexport.*
+%{_libdir}/kde3/libcsvimport.*
+%{_libdir}/kde3/libgnumericexport.*
+%{_libdir}/kde3/libgnumericimport.*
+%{_libdir}/kde3/libkspreadhtmlexport.*
+%{_libdir}/kde3/libkspreadinsertcalendar.*
+%{_libdir}/kde3/libopencalcexport.*
+%{_libdir}/kde3/libopencalcimport.*
+%{_libdir}/kde3/libqproimport.*
+%{_libdir}/kde3/kspreadscripting.*
+%{_libdir}/kde3/krosskspreadcore.*
+%{_datadir}/apps/kspread/
+%{_datadir}/services/kspread*.desktop
+%{_datadir}/templates/SpreadSheet.desktop
+%{_datadir}/templates/.source/SpreadSheet.kst
+%{_datadir}/applications/kde/*kspread.desktop
 
 %files kpresenter
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kpresenter
-%{_kde4_libdir}/libkdeinit4_kpresenter.so
-%{_kde4_libdir}/libkpresenterprivate.so.*
-%{_kde4_libdir}/kde4/*kpresenter*.*
-%{_kde4_libdir}/kde4/kpr_*.*
-%{_kde4_libdir}/kde4/libFilterkpr2odf.so
-%{_kde4_appsdir}/kpresenter/
-%{_kde4_docdir}/HTML/en/kpresenter/
-%{_kde4_datadir}/kde4/services/kpr*.desktop
-%{_kde4_datadir}/kde4/servicetypes/kpr*.desktop
-%{_kde4_datadir}/kde4/servicetypes/presentationeventaction.desktop
-%{_kde4_datadir}/kde4/servicetypes/scripteventaction.desktop
-%{_kde4_datadir}/templates/Presentation.desktop
-%{_kde4_datadir}/templates/.source/Presentation.kpt
-%{_kde4_datadir}/applications/kde4/*kpresenter.desktop
-%{_kde4_datadir}/kde4/services/Filterkpr2odf.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kpresenter_konqi.desktop
+%lang(en) %{_docdir}/HTML/en/kpresenter/
+%{_bindir}/kpresenter
+%{_bindir}/kprconverter.pl
+%{_libdir}/libkdeinit_kpresenter.so
+%{_libdir}/libkpresenterimageexport.so.*
+%{_libdir}/libkpresenterprivate.so.*
+%{_libdir}/kde3/*kpresenter*.*
+%{_datadir}/apps/kpresenter/
+%{_datadir}/services/kpresenter*.desktop
+%{_datadir}/templates/Presentation.desktop
+%{_datadir}/templates/.source/Presentation.kpt
+%{_datadir}/applications/kde/*kpresenter.desktop
 
 %files karbon
 %defattr(-,root,root,-)
-%{_kde4_bindir}/karbon
-%{_kde4_libdir}/libkdeinit4_karbon.so
-%{_kde4_libdir}/libkarboncommon.so.*
-%{_kde4_libdir}/libkarbonui.so.*
-%{_kde4_libdir}/kde4/*karbon*.*
-%{_kde4_libdir}/kde4/libwmfexport.*
-%{_kde4_libdir}/kde4/libwmfimport.*
-%{_kde4_appsdir}/karbon/
-%{_kde4_datadir}/kde4/services/karbon*
-%{_kde4_datadir}/kde4/servicetypes/karbon_module.desktop
-%{_kde4_datadir}/templates/Illustration.desktop
-%{_kde4_datadir}/templates/.source/Illustration.karbon
-%{_kde4_datadir}/applications/kde4/*karbon.desktop
-%{_kde4_docdir}/HTML/en/karbon/
-%{_kde4_datadir}/kde4/services/ServiceMenus/karbon_konqi.desktop
+%lang(en) %{_docdir}/HTML/en/karbon/
+%{_bindir}/karbon
+%{_libdir}/libkdeinit_karbon.so
+%{_libdir}/kde3/*karbon*.*
+%{_libdir}/kde3/libwmfexport.*
+%{_libdir}/kde3/libwmfimport.*
+%{_datadir}/apps/karbon/
+%{_datadir}/services/karbon*
+%{_datadir}/servicetypes/karbon_module.desktop
+%{_datadir}/templates/Illustration.desktop
+%{_datadir}/templates/.source/Illustration.karbon
+%{_datadir}/applications/kde/*karbon.desktop
 
 %files krita
 %defattr(-,root,root,-)
-%{_kde4_bindir}/krita
-%{_kde4_libdir}/libkdeinit4_krita.so
-%{_kde4_libdir}/libkrita*.so.*
-%{_kde4_libdir}/libkisexiv2.so.*
-%{_kde4_libdir}/kde4/*krita*.*
-%{_kde4_libdir}/libkrossmodulekrita.so.*
-%{_kde4_appsdir}/krita/
-%{_kde4_datadir}/kde4/services/krita*.desktop
-%{_kde4_datadir}/kde4/servicetypes/krita*.desktop
-%{_kde4_datadir}/applications/kde4/*krita*.desktop
-# FIXME: add scriptlet
-%{_datadir}/mime/packages/krita_ora.xml
-%{_kde4_appsdir}/kritaplugins/
-%{_kde4_docdir}/HTML/en/krita/
-%{_datadir}/color/icc/krita/
-%{_kde4_datadir}/kde4/services/ServiceMenus/krita_konqi.desktop
+%lang(en) %{_docdir}/HTML/en/krita/
+%{_bindir}/krita
+%{_libdir}/libkdeinit_krita.so
+%{_libdir}/libkrita*.so.*
+%{_libdir}/kde3/*krita*.*
+%{_datadir}/apps/krita/
+%{_datadir}/services/krita*.desktop
+%{_datadir}/servicetypes/krita*.desktop
+%{_datadir}/applications/kde/*krita*.desktop
+%{_datadir}/applnk/.hidden/*krita*.desktop
+%{_datadir}/apps/kritaplugins/
 
 %files kugar
 %defattr(-,root,root,-)
-%{_kde4_docdir}/HTML/en/kugar/
+%lang(en) %{_docdir}/HTML/en/kugar/
+%{_bindir}/kugar
+%{_bindir}/kudesigner
+%{_libdir}/libkdeinit_kugar.so
+%{_libdir}/libkdeinit_kudesigner.so
+%{_libdir}/libkugarlib.so.*
+%{_libdir}/libkudesignercore.so
+%{_libdir}/kde3/kudesigner.*
+%{_libdir}/kde3/kugar.*
+%{_libdir}/kde3/libkudesignerpart.*
+%{_libdir}/kde3/libkugarpart.*
+%{_datadir}/apps/kudesigner/
+%{_datadir}/apps/kugar/
+%{_datadir}/services/kugar*.desktop
+%{_datadir}/applications/kde/*kugar.desktop
+%{_datadir}/applications/kde/*kudesigner.desktop
 
 %files kexi
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kexi*
-%{_kde4_bindir}/ksqlite*
-%{_kde4_libdir}/libkexi*.so.*
-%{_kde4_libdir}/libkformdesigner.so.*
-%{_kde4_libdir}/kde4/kformdesigner_*.*
-%{_kde4_libdir}/kde4/kexidb_sqlite3driver.*
-%{_kde4_libdir}/kde4/kexihandler_*.*
-%{_kde4_libdir}/kde4/krossmodulekexidb.so
-%{_kde4_libdir}/kde4/pgzkexireportpart2.so
-%{_kde4_datadir}/config/kexirc
-%{_kde4_datadir}/kde4/servicetypes/kexi*.desktop
-%{_kde4_datadir}/kde4/services/kexi
-%{_kde4_appsdir}/kexi/
-%{_kde4_datadir}/kde4/services/kformdesigner/*
-%{_kde4_docdir}/HTML/en/kexi/
-%{_kde4_datadir}/applications/kde4/*kexi.desktop
-%{_kde4_datadir}/kde4/services/kexidb_sqlite*driver.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kexi_konqi.desktop
+%lang(en) %{_docdir}/HTML/en/kexi/
+%{_bindir}/kexi*
+%{_bindir}/ksqlite*
+%{_bindir}/krossrunner
+%{_libdir}/libkdeinit_kexi.so
+%{_libdir}/libkexi*.so.*
+%{_libdir}/libkformdesigner.so.*
+%{_libdir}/kde3/kformdesigner_*.*
+%{_libdir}/kde3/kexidb_sqlite2driver.*
+%{_libdir}/kde3/kexidb_sqlite3driver.*
+%{_libdir}/kde3/kexihandler_*.*
+%{_libdir}/kde3/kexi.*
+%{_libdir}/kde3/krosskexiapp.*
+%{_libdir}/kde3/krosskexidb.*
+# moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs)
+%{_libdir}/kde3/libkspreadkexiimport.*
+%{_datadir}/config/kexirc
+%{_datadir}/config/magic/kexi.magic
+%{_datadir}/mimelnk/application/*
+%{_datadir}/servicetypes/kexi*.desktop
+%{_datadir}/services/kexi/
+%{_datadir}/apps/kexi/
+%{_datadir}/services/kformdesigner/*
+%{_datadir}/applications/kde/*kexi.desktop
+%{_datadir}/services/kexidb_sqlite*driver.desktop
 
 %files kexi-driver-mysql
 %defattr(-,root,root,-)
-%{_kde4_libdir}/kde4/kexidb_mysqldriver.*
-%{_kde4_libdir}/kde4/keximigrate_mysql.*
-%{_kde4_datadir}/kde4/services/keximigrate_mysql.desktop
-%{_kde4_datadir}/kde4/services/kexidb_mysqldriver.desktop
+%{_libdir}/kde3/kexidb_mysqldriver.*
+%{_libdir}/kde3/keximigrate_mysql.*
+%{_datadir}/services/keximigrate_mysql.desktop
+%{_datadir}/services/kexidb_mysqldriver.desktop
 
 %files kexi-driver-pgsql
 %defattr(-,root,root,-)
-%{_kde4_libdir}/kde4/kexidb_pqxxsqldriver.*
-%{_kde4_libdir}/kde4/keximigrate_pqxx.*
-%{_kde4_datadir}/kde4/services/kexidb_pqxxsqldriver.desktop
-%{_kde4_datadir}/kde4/services/keximigrate_pqxx.desktop
+%{_libdir}/kde3/kexidb_pqxxsqldriver.*
+%{_libdir}/kde3/keximigrate_pqxx.*
+%{_datadir}/services/kexidb_pqxxsqldriver.desktop
+%{_datadir}/services/keximigrate_pqxx.desktop
 
 %files kchart
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kchart
-%{_kde4_libdir}/libkchartcommon.so.*
-%{_kde4_libdir}/libkdeinit4_kchart.so
-%{_kde4_libdir}/kde4/*kchart*.*
-%{_kde4_appsdir}/kchart/
-%{_kde4_datadir}/config.kcfg/kchart.kcfg
-%{_kde4_datadir}/kde4/services/kchart*.desktop
-%{_kde4_docdir}/HTML/en/kchart/
-%{_kde4_datadir}/applications/kde4/*kchart.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kchart_konqi.desktop
+%lang(en) %{_docdir}/HTML/en/kchart/
+%{_bindir}/kchart
+%{_libdir}/libkchart*.so.*
+%{_libdir}/libkdeinit_kchart.so
+%{_libdir}/kde3/*kchart*.*
+%{_datadir}/apps/kchart/
+%{_datadir}/services/kchart*.desktop
+%{_datadir}/applications/kde/*kchart.desktop
 
 %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_docdir}/HTML/en/kformula/
-%{_kde4_datadir}/kde4/services/kformula*.desktop
-%{_kde4_datadir}/applications/kde4/*kformula.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
+%lang(en) %{_docdir}/HTML/en/kformula/
+%{_bindir}/kformula
+%{_libdir}/libkdeinit_kformula.so
+%{_libdir}/kde3/*kformula*.*
+%{_datadir}/apps/kformula/
+%{_datadir}/services/kformula*.desktop
+%{_datadir}/applications/kde/*kformula.desktop
 
 %files kivio
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kivio
-%{_kde4_libdir}/libkdeinit4_kivio.so
-%{_kde4_libdir}/libkivioprivate.so.*
-%{_kde4_libdir}/kde4/*kivio*.*
-%{_kde4_appsdir}/kivio/
-%{_kde4_docdir}/HTML/en/kivio/
-%{_kde4_datadir}/kde4/services/kivio*.desktop
-%{_kde4_datadir}/applications/kde4/kivio.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kivio_konqi.desktop
+%lang(en) %{_docdir}/HTML/en/kivio/
+%{_bindir}/kivio
+%{_libdir}/libkdeinit_kivio.so
+%{_libdir}/kde3/*kivio*.*
+%{_libdir}/kde3/straight_connector.*
+%{_datadir}/apps/kivio/
+%{_datadir}/config.kcfg/kivio.kcfg
+%{_datadir}/services/kivio*.desktop
+%{_datadir}/applications/kde/*kivio.desktop
 
 %files filters
 %defattr(-,root,root,-)
-%{_kde4_libdir}/libkwordexportfilters.so.*
-%{_kde4_libdir}/kde4/libabiwordexport.*
-%{_kde4_libdir}/kde4/libabiwordimport.*
-%{_kde4_libdir}/kde4/libamiproexport.*
-%{_kde4_libdir}/kde4/libamiproimport.*
-%{_kde4_libdir}/kde4/libapplixspreadimport.*
-%{_kde4_libdir}/kde4/libapplixwordimport.*
-%{_kde4_libdir}/kde4/libdbaseimport.*
-%{_kde4_libdir}/kde4/libdocbookexport.*
-%{_kde4_libdir}/kde4/libexcelimport.*
-%{_kde4_libdir}/kde4/libgenerickofilter.*
-%{_kde4_libdir}/kde4/libhtmlexport.*
-%{_kde4_libdir}/kde4/libhtmlimport.*
-%{_kde4_libdir}/kde4/libkspreadlatexexport.*
-%{_kde4_libdir}/kde4/libkwordkword1dot3import.*
-%{_kde4_libdir}/kde4/libmswriteexport.*
-%{_kde4_libdir}/kde4/libmswriteimport.*
-%{_kde4_libdir}/kde4/liboowriterexport.*
-%{_kde4_libdir}/kde4/liboowriterimport.*
-%{_kde4_libdir}/kde4/libpalmdocexport.*
-%{_kde4_libdir}/kde4/libpalmdocimport.*
-%{_kde4_libdir}/kde4/librtfexport.*
-%{_kde4_libdir}/kde4/librtfimport.*
-%{_kde4_libdir}/kde4/libwmlexport.*
-%{_kde4_libdir}/kde4/libwmlimport.*
-%{_kde4_libdir}/kde4/libwpexport.*
-%{_kde4_libdir}/kde4/libwpimport.*
-%{_kde4_libdir}/kde4/libmswordimport.*
-%{_kde4_libdir}/kde4/libmswordodf_import.*
-%{_kde4_libdir}/kde4/libxsltimport.*
-%{_kde4_libdir}/kde4/libxsltexport.*
-%{_kde4_libdir}/kde4/libhancomwordimport.*
-%{_kde4_appsdir}/xsltfilter/
-%{_kde4_datadir}/kde4/services/generic_filter.desktop
-%{_kde4_datadir}/kde4/services/xslt*.desktop
-%{_kde4_datadir}/kde4/servicetypes/kofilter*.desktop
+%{_libdir}/libkwordexportfilters.so.*
+%{_libdir}/kde3/libabiwordexport.*
+%{_libdir}/kde3/libabiwordimport.*
+%{_libdir}/kde3/libamiproexport.*
+%{_libdir}/kde3/libamiproimport.*
+%{_libdir}/kde3/libapplixspreadimport.*
+%{_libdir}/kde3/libapplixwordimport.*
+%{_libdir}/kde3/libasciiexport.*
+%{_libdir}/kde3/libasciiimport.*
+%{_libdir}/kde3/libdbaseimport.*
+%{_libdir}/kde3/libdocbookexport.*
+%{_libdir}/kde3/libexcelimport.*
+%{_libdir}/kde3/libgenerickofilter.*
+%{_libdir}/kde3/libhtmlexport.*
+%{_libdir}/kde3/libhtmlimport.*
+%{_libdir}/kde3/libkarbonepsimport.*
+%{_libdir}/kde3/libkfolatexexport.*
+%{_libdir}/kde3/libkfomathmlexport.*
+%{_libdir}/kde3/libkfomathmlimport.*
+%{_libdir}/kde3/libkfopngexport.*
+%{_libdir}/kde3/libkspreadlatexexport.*
+%{_libdir}/kde3/libkugarnopimport.*
+%{_libdir}/kde3/libkwordkword1dot3import.*
+%{_libdir}/kde3/libkwordlatexexport.*
+%{_libdir}/kde3/libmswriteexport.*
+%{_libdir}/kde3/libmswriteimport.*
+%{_libdir}/kde3/libooimpressexport.*
+%{_libdir}/kde3/libooimpressimport.*
+%{_libdir}/kde3/liboowriterexport.*
+%{_libdir}/kde3/liboowriterimport.*
+%{_libdir}/kde3/libpalmdocexport.*
+%{_libdir}/kde3/libpalmdocimport.*
+%{_libdir}/kde3/libpdfimport.*
+%{_libdir}/kde3/librtfexport.*
+%{_libdir}/kde3/librtfimport.*
+%{_libdir}/kde3/libwmlexport.*
+%{_libdir}/kde3/libwmlimport.*
+%{_libdir}/kde3/libwpexport.*
+%{_libdir}/kde3/libwpimport.*
+%{_libdir}/kde3/libmswordimport.*
+%{_libdir}/kde3/libxsltimport.*
+%{_libdir}/kde3/libxsltexport.*
+%{_libdir}/kde3/libhancomwordimport.*
+%{_libdir}/kde3/libkfosvgexport.*
+%{_libdir}/kde3/liboodrawimport.*
+%{_libdir}/kde3/libolefilter.*
+%{_datadir}/apps/xsltfilter/
+%{_datadir}/services/generic_filter.desktop
+%{_datadir}/services/ole_powerpoint97_import.desktop
+%{_datadir}/services/xslt*.desktop
+%{_datadir}/servicetypes/kofilter*.desktop
 
 %files kplato
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kplato
-%{_kde4_bindir}/kplatowork
-%{_kde4_configdir}/kplatorc
-%{_kde4_libdir}/libkdeinit4_kplato.so
-%{_kde4_libdir}/libkdeinit4_kplatowork.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}/applications/kde4/kplato.desktop
-%{_kde4_datadir}/applications/kde4/kplatowork.desktop
-
-%files kword
-%defattr(-,root,root,-)
-%{_kde4_bindir}/kword
-%{_kde4_libdir}/libkdeinit4_kword.so
-%{_kde4_libdir}/libkwordprivate.so.*
-%{_kde4_libdir}/kde4/krossmodulekword.so
-%{_kde4_libdir}/kde4/libkwordpart.*
-%{_kde4_appsdir}/kword/
-%{_kde4_docdir}/HTML/en/kword/
-%{_kde4_datadir}/kde4/services/*kword*.desktop
-%{_kde4_datadir}/templates/TextDocument.desktop
-%{_kde4_datadir}/templates/.source/TextDocument.kwt
-%{_kde4_datadir}/applications/kde4/*kword.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kword_konqi.desktop
-
-%changelog
-* Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.10-1
-- koffice-1.9.95.10
-
-* Thu Jul 17 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.9-1
-- koffice-1.9.95.9
-- fix pkg interdependencies, multilib issues
-
-* Fri Jun 27 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.8.2
-- respin (eviv2)
-
-* Tue May 27 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.8-1
-- koffice-1.9.95.8
+%lang(en) %{_docdir}/HTML/en/kplato/
+%{_bindir}/kplato
+%{_libdir}/libkdeinit_kplato.so
+%{_libdir}/kde3/kplato.*
+%{_libdir}/kde3/libkplatopart.*
+%{_datadir}/apps/kplato/
+%{_datadir}/services/kplatopart.desktop
+%{_datadir}/applications/kde/*kplato.desktop
+
+
+%changelog 
+* Thu Sep 18 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.6.3-16
+- revert koffice2->koffice1, introduce Epoch
+- fix pkg interdependencies (#394101), multilib issues
+- -krita: drop Requires: %%name-filters (#394101)
+- cleanup scriptlets
 
 * Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 1.6.3-15
 - upstream gcc43 patch (#433994)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	12 Sep 2008 16:55:03 -0000	1.19
+++ sources	18 Sep 2008 19:00:48 -0000	1.20
@@ -1 +1,2 @@
-06d7b0feedb0801dce098f26fe7f3e7e  koffice-1.9.95.10.tar.bz2
+03382edf62db9913b57ad8760c7d5f52  koshell.png
+386d388094734f9759977c3267098e30  koffice-1.6.3.tar.bz2



From krh at fedoraproject.org  Thu Sep 18 19:01:51 2008
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Thu, 18 Sep 2008 19:01:51 +0000 (UTC)
Subject: rpms/kernel/devel drm-fix-pll-computation-precedence.patch, NONE,
	1.1 kernel.spec, 1.955, 1.956
Message-ID: <20080918190151.58195700D9@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23416

Modified Files:
	kernel.spec 
Added Files:
	drm-fix-pll-computation-precedence.patch 
Log Message:
* Thu Sep 18 2008 Kristian H??gsberg <krh at redhat.com>
- Fix precedence in PLL value computation.


drm-fix-pll-computation-precedence.patch:

--- NEW FILE drm-fix-pll-computation-precedence.patch ---
commit ced5841f9f1858d83551714717d905a6a1ea28c1
Author: Kristian H??gsberg <krh at redhat.com>
Date:   Thu Sep 18 14:53:46 2008 -0400

    radeon kms: Get precedence right when computing PLL values.

diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
index 4d98cba..a1631fe 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -326,11 +326,11 @@ void radeon_atombios_get_tmds_info(struct radeon_encoder *encoder)
 	for (i = 0; i < 4; i++) {
 		encoder->tmds_pll[i].freq = le16_to_cpu(tmds_info->asMiscInfo[i].usFrequency);
 		encoder->tmds_pll[i].value = tmds_info->asMiscInfo[i].ucPLL_ChargePump & 0x3f;
-		encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_VCO_Gain & 0x3f << 6);
-		encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_DutyCycle & 0xf << 12);
-		encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_VoltageSwing & 0xf << 16);
+		encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_VCO_Gain & 0x3f) << 6;
+		encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_DutyCycle & 0xf) << 12;
+		encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_VoltageSwing & 0xf) << 16;
 
-		DRM_DEBUG("TMDS PLL From BIOS %u %x\n",
+		DRM_DEBUG("TMDS PLL From ATOMBIOS %u %x\n",
 			  encoder->tmds_pll[i].freq,
 			   encoder->tmds_pll[i].value);
 
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index 3219b99..c5332fd 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -744,6 +744,9 @@ bool radeon_combios_get_tmds_info(struct radeon_encoder *encoder)
 			for (i = 0; i < n; i++) {
 				encoder->tmds_pll[i].value = radeon_bios32(dev_priv, tmds_info + i * 10 + 0x08);
 				encoder->tmds_pll[i].freq = radeon_bios16(dev_priv, tmds_info + i * 10 + 0x10);
+				DRM_DEBUG("TMDS PLL From COMBIOS %u %x\n",
+					  encoder->tmds_pll[i].freq,
+					  encoder->tmds_pll[i].value);
 			}
 			return true;
 		} else if (ver == 4) {
@@ -758,6 +761,9 @@ bool radeon_combios_get_tmds_info(struct radeon_encoder *encoder)
 					stride += 10;
 				else
 					stride += 6;
+				DRM_DEBUG("TMDS PLL From COMBIOS %u %x\n",
+					  encoder->tmds_pll[i].freq,
+					  encoder->tmds_pll[i].value);
 			}
 			return true;
 		}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.955
retrieving revision 1.956
diff -u -r1.955 -r1.956
--- kernel.spec	18 Sep 2008 00:36:25 -0000	1.955
+++ kernel.spec	18 Sep 2008 19:01:21 -0000	1.956
@@ -609,6 +609,7 @@
 Patch1811: drm-modesetting-radeon.patch
 Patch1812: drm-modesetting-i915.patch
 Patch1813: drm-nouveau.patch
+Patch1814: drm-fix-pll-computation-precedence.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1167,6 +1168,7 @@
 ApplyPatch drm-modesetting-radeon.patch
 ApplyPatch drm-modesetting-i915.patch
 ApplyPatch drm-nouveau.patch
+ApplyPatch drm-fix-pll-computation-precedence.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1758,6 +1760,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Sep 18 2008 Kristian H??gsberg <krh at redhat.com>
+- Fix precedence in PLL value computation.
+
 * Thu Sep 18 2008 Dave Airlie <airlied at redhat.com>
 - update radeon LVDS bits from AMD
 



From slankes at fedoraproject.org  Thu Sep 18 19:11:41 2008
From: slankes at fedoraproject.org (Sven Lankes)
Date: Thu, 18 Sep 2008 19:11:41 +0000 (UTC)
Subject: rpms/libacpi/F-9 libacpi-0.2-sysfs.patch, NONE,
	1.1 libacpi-0.2.patch, 
	NONE, 1.1 libacpi.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080918191141.C65C5700D9@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/libacpi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24637

Modified Files:
	sources 
Added Files:
	libacpi-0.2-sysfs.patch libacpi-0.2.patch libacpi.spec 
Log Message:
first import for f9-branch


libacpi-0.2-sysfs.patch:

--- NEW FILE libacpi-0.2-sysfs.patch ---
diff -Naur libacpi-0.2-orig/libacpi.c libacpi-0.2/libacpi.c
--- libacpi-0.2-orig/libacpi.c	2007-07-29 14:09:34.000000000 +0200
+++ libacpi-0.2/libacpi.c	2008-08-02 10:41:11.000000000 +0200
@@ -14,8 +14,9 @@
 #include "libacpi.h"
 #include "list.h"
 
-static int read_acpi_battinfo(const int num);
-static int read_acpi_battalarm(const int num);
+
+static int read_acpi_battinfo(const int num, const int sysstyle);
+static int read_acpi_battalarm(const int num, const int sysstyle);
 static int read_acpi_battstate(const int num);
 static void read_acpi_thermalzones(global_t *globals);
 
@@ -144,8 +145,15 @@
 	int i = 0;
 
 	globals->batt_count = 0;
+	globals->sysstyle = 0;
 	if((lst = dir_list(PROC_ACPI "battery")) == NULL || !lst->top)
-		return NOT_SUPPORTED;
+	{
+		/* check for new Linux 2.6.24+ layout */
+		if((lst = dir_list(SYS_POWER)) == NULL || !lst->top)
+			return NOT_SUPPORTED;
+		else
+			globals->sysstyle = 1;
+	}
 	for(node = lst->top; node; node=node->next){
 		if((names[globals->batt_count] = strdup(node->name)) == NULL){
 			delete_list(lst);
@@ -174,11 +182,20 @@
 	for (i=0; i < globals->batt_count && i < MAX_ITEMS; i++){
 		binfo = &batteries[i];
 		snprintf(binfo->name, MAX_NAME, "%s", names[i]);
-		snprintf(binfo->state_file, MAX_NAME, PROC_ACPI "battery/%s/state", names[i]);
-		snprintf(binfo->info_file, MAX_NAME, PROC_ACPI "battery/%s/info", names[i]);
-		snprintf(binfo->alarm_file, MAX_NAME, PROC_ACPI "battery/%s/alarm", names[i]);
-		read_acpi_battinfo(i);
-		read_acpi_battalarm(i);
+		if(globals->sysstyle)
+		{
+			snprintf(binfo->state_file, MAX_NAME, "/%s/present", names[i]);
+			snprintf(binfo->info_file, MAX_NAME, SYS_POWER "/%s", names[i]);
+			snprintf(binfo->alarm_file, MAX_NAME, SYS_POWER "/%s/alarm", names[i]);
+		}
+		else
+		{
+			snprintf(binfo->state_file, MAX_NAME, PROC_ACPI "battery/%s/state", names[i]);
+			snprintf(binfo->info_file, MAX_NAME, PROC_ACPI "battery/%s/info", names[i]);
+			snprintf(binfo->alarm_file, MAX_NAME, PROC_ACPI "battery/%s/alarm", names[i]);
+		}
+		read_acpi_battinfo(i, globals->sysstyle);
+		read_acpi_battalarm(i, globals->sysstyle);
 		free(names[i]);
 	}
 	delete_list(lst);
@@ -196,11 +213,22 @@
 		ac->ac_state = P_ERR;
 		return;
 	}
-	if((tmp = scan_acpi_value(buf, "state:")) && !strncmp(tmp, "on-line", 7))
-		ac->ac_state = P_AC;
-	else if(tmp && !strncmp(tmp, "off-line", 8))
-		ac->ac_state = P_BATT;
-	else ac->ac_state = P_ERR;
+	if(globals->sysstyle)
+	{
+		if(!strcmp(buf, "1"))
+			ac->ac_state = P_AC;
+		else if(!strcmp(buf, "0"))
+			ac->ac_state = P_BATT;
+		else ac->ac_state = P_ERR;
+	}
+	else
+	{
+		if((tmp = scan_acpi_value(buf, "state:")) && !strncmp(tmp, "on-line", 7))
+			ac->ac_state = P_AC;
+		else if(tmp && !strncmp(tmp, "off-line", 8))
+			ac->ac_state = P_BATT;
+		else ac->ac_state = P_ERR;
+	}
 	free(buf);
 	free(tmp);
 }
@@ -212,14 +240,22 @@
 	list_t *lst = NULL;
 	adapter_t *ac = &globals->adapt;
 
+	globals->sysstyle = 0;
 	if((lst = dir_list(PROC_ACPI "ac_adapter")) == NULL || !lst->top)
-		return NOT_SUPPORTED;
-
+	{
+		if((lst = dir_list(SYS_POWER "/AC")) == NULL || !lst->top)
+			return NOT_SUPPORTED;
+		else
+			globals->sysstyle = 1;
+	}
 	if((!lst->top->name || ((ac->name = strdup(lst->top->name)) == NULL))){
 		delete_list(lst);
 		return ALLOC_ERR;
 	}
-	snprintf(ac->state_file, MAX_NAME, PROC_ACPI "ac_adapter/%s/state", ac->name);
+	if(globals->sysstyle)
+		snprintf(ac->state_file, MAX_NAME, SYS_POWER "/AC/online");
+	else
+		snprintf(ac->state_file, MAX_NAME, PROC_ACPI "ac_adapter/%s/state", ac->name);
 	delete_list(lst);
 	read_acpi_acstate(globals);
 	return SUCCESS;
@@ -450,7 +486,7 @@
 
 /* read alarm capacity, return 0 on success, negative values on error */
 static int
-read_acpi_battalarm(const int num){
+read_acpi_battalarm(const int num, const int sysstyle){
 	char *buf = NULL;
 	char *tmp = NULL;
 	battery_t *info = &batteries[num];
@@ -458,10 +494,22 @@
 	if((buf = get_acpi_content(info->alarm_file)) == NULL)
 		return NOT_SUPPORTED;
 
-	if((tmp = scan_acpi_value(buf, "alarm:")) && tmp[0] != 'u')
-		info->alarm = strtol(tmp, NULL, 10);
+	if(sysstyle)
+	{
+		if(!strcmp(buf, "0"))
+			info->alarm = 0;
+		else if(!strcmp(buf, "1"))
+			info->alarm = 1;
+		else
+			info->alarm = NOT_SUPPORTED;
+	}
 	else
-		info->alarm = NOT_SUPPORTED;
+	{
+		if((tmp = scan_acpi_value(buf, "alarm:")) && tmp[0] != 'u')
+			info->alarm = strtol(tmp, NULL, 10);
+		else
+			info->alarm = NOT_SUPPORTED;
+	}
 	free(buf);
 	free(tmp);
 	return SUCCESS;
@@ -469,11 +517,58 @@
 
 /* reads static values for a battery (info file), returns SUCCESS */
 static int
-read_acpi_battinfo(const int num){
+read_acpi_battinfo(const int num, const int sysstyle){
 	char *buf = NULL;
 	char *tmp = NULL;
 	battery_t *info = &batteries[num];
 	int i = 0;
+	char sysfile[MAX_NAME];
+
+	if(sysstyle)
+	{
+		snprintf(sysfile, MAX_NAME, "%s/present", info->info_file);
+		if((buf = get_acpi_content(sysfile)) == NULL)
+			return NOT_SUPPORTED;
+		if(!strcmp(buf, "1")) {
+			info->present = 1;
+		} else {
+			info->present = 0;
+			return NOT_PRESENT;
+		}
+
+		snprintf(sysfile, MAX_NAME, "%s/charge_full_design", info->info_file);
+		if((buf = get_acpi_content(sysfile)) == NULL)
+			return NOT_SUPPORTED;
+		info->design_cap = strtol(buf, NULL, 10);
+
+		snprintf(sysfile, MAX_NAME, "%s/charge_full", info->info_file);
+		if((buf = get_acpi_content(sysfile)) == NULL)
+			return NOT_SUPPORTED;
+		info->last_full_cap = strtol(buf, NULL, 10);
+
+		snprintf(sysfile, MAX_NAME, "%s/charge_now", info->info_file);
+		if((buf = get_acpi_content(sysfile)) == NULL)
+			return NOT_SUPPORTED;
+		info->remaining_cap = strtol(buf, NULL, 10);
+
+		snprintf(sysfile, MAX_NAME, "%s/voltage_min_design", info->info_file);
+		if((buf = get_acpi_content(sysfile)) == NULL)
+			return NOT_SUPPORTED;
+		info->design_voltage = strtol(buf, NULL, 10);
+
+		snprintf(sysfile, MAX_NAME, "%s/voltage_now", info->info_file);
+		if((buf = get_acpi_content(sysfile)) == NULL)
+			return NOT_SUPPORTED;
+		info->present_voltage = strtol(buf, NULL, 10);
+
+		/* FIXME: is rate == current here? */
+		snprintf(sysfile, MAX_NAME, "%s/current_now", info->info_file);
+		if((buf = get_acpi_content(sysfile)) == NULL)
+			return NOT_SUPPORTED;
+		info->present_rate = strtol(buf, NULL, 10);
+
+		return SUCCESS;
+	}
 
 	if((buf = get_acpi_content(info->info_file)) == NULL)
 		return NOT_SUPPORTED;
@@ -608,7 +703,7 @@
 read_acpi_batt(const int num){
 	if(num > MAX_ITEMS) return ITEM_EXCEED;
 	read_acpi_battstate(num);
-	read_acpi_battalarm(num);
+	read_acpi_battalarm(num, 0);
 	calc_remain_perc(num);
 	calc_remain_chargetime(num);
 	calc_remain_time(num);
diff -Naur libacpi-0.2-orig/libacpi.h libacpi-0.2/libacpi.h
--- libacpi-0.2-orig/libacpi.h	2007-07-29 14:09:34.000000000 +0200
+++ libacpi-0.2/libacpi.h	2008-08-02 10:41:11.000000000 +0200
@@ -12,6 +12,8 @@
 #define __LIBACPI_H__
 
 #define PROC_ACPI "/proc/acpi/"
+#define SYS_POWER "/sys/class/power_supply"
+
 #define LINE_MAX 256
 #define MAX_NAME 512
 #define MAX_BUF 1024
@@ -177,6 +179,7 @@
 	int fan_count;                /**< number of found fans */
 	int temperature;              /**< system temperature if we only have on thermal zone */
 	adapter_t adapt;              /**< ac adapter */
+	int sysstyle;
 } global_t;
 
 /**
@@ -239,6 +242,7 @@
  * Looks up if the ac adapter is plugged in or not
  * and sets the values in a struct
  * @param globals pointer to the global acpi structure
+ * @param sysstyle whether or not to use the /sys interface
  */
 void read_acpi_acstate(global_t *globals);
 /**
diff -Naur libacpi-0.2-orig/test-libacpi.c libacpi-0.2/test-libacpi.c
--- libacpi-0.2-orig/test-libacpi.c	2007-07-29 14:09:34.000000000 +0200
+++ libacpi-0.2/test-libacpi.c	2008-08-02 10:41:11.000000000 +0200
@@ -46,6 +46,7 @@
 			read_acpi_batt(i);
 
 			if(binfo->present)
+			{
 				printf("\n%s:\tpresent: %d\n"
 						"\tdesign capacity: %d\n"
 						"\tlast full capacity: %d\n"
@@ -65,6 +66,9 @@
 						binfo->batt_state, binfo->percentage, 
 						binfo->charge_time / 60, binfo->charge_time % 60,
 						binfo->remaining_time / 60, binfo->remaining_time % 60);
+				if(binfo->alarm)
+					printf("%s: Alarm!\n", binfo->name);
+			}
 		}
 	} else printf("Battery information:\tnot supported\n");
 	

libacpi-0.2.patch:

--- NEW FILE libacpi-0.2.patch ---
diff -Naur libacpi-0.2.orig/Makefile libacpi-0.2/Makefile
--- libacpi-0.2.orig/Makefile	2007-07-29 14:09:34.000000000 +0200
+++ libacpi-0.2/Makefile	2008-05-06 23:09:14.000000000 +0200
@@ -40,25 +40,23 @@
 install: all
 	@echo installing header to ${DESTDIR}${PREFIX}/include
 	@mkdir -p ${DESTDIR}${PREFIX}/include
-	@cp -f libacpi.h ${DESTDIR}${PREFIX}/include
+	@cp -f -p libacpi.h ${DESTDIR}${PREFIX}/include
 	@chmod 644 ${DESTDIR}${PREFIX}/include/libacpi.h
-	@echo installing library to ${DESTDIR}${PREFIX}/lib
-	@mkdir -p ${DESTDIR}${PREFIX}/lib
-	@cp -f libacpi.a ${DESTDIR}${PREFIX}/lib
-	@chmod 644 ${DESTDIR}${PREFIX}/lib/libacpi.a
-	@cp -f ${SONAME} ${DESTDIR}${PREFIX}/lib/
-	@chmod 644 ${DESTDIR}${PREFIX}/lib/${SONAME}
-	@ln -s ${SONAME} ${DESTDIR}${PREFIX}/lib/libacpi.so
+	@echo installing library to ${DESTDIR}${LIBDIR}
+	@mkdir -p ${DESTDIR}${LIBDIR}
+	@cp -f -p ${SONAME} ${DESTDIR}${LIBDIR}/
+	@chmod 644 ${DESTDIR}${LIBDIR}/${SONAME}
+	@ln -s ${SONAME} ${DESTDIR}${LIBDIR}/libacpi.so
 	@echo installing test-libacpi to ${DESTDIR}${PREFIX}/bin
 	@mkdir -p ${DESTDIR}${PREFIX}/bin
-	@cp -f test-libacpi ${DESTDIR}${PREFIX}/bin
+	@cp -f -p test-libacpi ${DESTDIR}${PREFIX}/bin
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/test-libacpi
 	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man3
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man3
-	@cp libacpi.3 ${DESTDIR}${MANPREFIX}/man3
+	@cp -p libacpi.3 ${DESTDIR}${MANPREFIX}/man3
 	@echo installing documentation and misc files to ${DESTDIR}${PREFIX}/share/doc/libacpi
 	@mkdir -p ${DESTDIR}${PREFIX}/share/doc/libacpi
-	@cp -r AUTHORS CHANGES README LICENSE doc ${DESTDIR}${PREFIX}/share/doc/libacpi
+	@cp -r -p AUTHORS CHANGES README LICENSE doc ${DESTDIR}${PREFIX}/share/doc/libacpi
 	@echo finished installation
 
 uninstall:


--- NEW FILE libacpi.spec ---
Name:           libacpi
Version:        0.2
Release:        12%{?dist}
Summary:        General purpose library for ACPI 

Group:          System Environment/Libraries
License:        MIT
URL:            http://www.ngolde.de/libacpi.html 
Source0:        http://www.ngolde.de/download/%{name}-%{version}.tar.gz
Patch0:         %{name}-%{version}.patch
Patch1:         %{name}-%{version}-sysfs.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
ExcludeArch:    ppc ppc64

%description    
libacpi is a general purpose shared library for programs gathering 
ACPI data on Linux. Features: Thermal zones support, Battery support, 
Fan support, AC support

Note: This is no portable code, it will only run on i386/x86_64 Linux systems.

%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
%patch1 -p1
sed -i "s/CFLAGS += .*/CFLAGS += -fPIC $RPM_OPT_FLAGS/;s&usr/local&usr&" config.mk
sed -i "s&share/doc/%{name}&share/doc/%{name}-%{version}&g" Makefile


%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%_libdir
chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.*
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,-)
%{_mandir}/man3/*
%dir %{_defaultdocdir}/%{name}-%{version}
%doc %{_defaultdocdir}/%{name}-%{version}/AUTHORS
%doc %{_defaultdocdir}/%{name}-%{version}/CHANGES
%doc %{_defaultdocdir}/%{name}-%{version}/README
%doc %{_defaultdocdir}/%{name}-%{version}/LICENSE
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%dir %{_defaultdocdir}/%{name}-%{version}/doc
%doc %{_defaultdocdir}/%{name}-%{version}/doc/*
%{_bindir}/test-libacpi
%{_includedir}/*
%{_libdir}/*.so


%changelog
* Tue Aug 19 2008 Sven Lankes <sven at lank.es> - 0.2-12
- Add ExcludeArch for ppc/ppc64

* Sat Aug  2 2008 Sven Lankes <sven at lank.es> - 0.2-11
- redo sysfs patch to apply without fuzz
- fix patch invocation

* Mon Jul  7 2008 slankes <sven at lank.es> - 0.2-10
- minor specfile-tweaks

* Thu May  8 2008 slankes <sven at lank.es> - 0.2-9
- save docs in name-version instead of name 

* Thu May  8 2008 slankes <sven at lank.es> - 0.2-8
- add missing docdir

* Tue May  6 2008 slankes <sven at lank.es> - 0.2-7
- patch Makefile to preserve timestamps
- only use sed to mangle config.mk
- add patch from debian-package to use sysfs for battery readout
    needs at least kernel 2.6.24 

* Mon May  5 2008 slankes <sven at lank.es> - 0.2-6
- Mark library as executable so that rpmbuild will strip it
- replace upstream CFLAGS 

* Mon May  5 2008 slankes <sven at lank.es> - 0.2-5
- Various SPECFILE cleanups
- Remove .a 
- do not strip library

* Sat May  3 2008 slankes <sven at lank.es> - 0.2-4
- First version of the package



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libacpi/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Aug 2008 19:12:21 -0000	1.1
+++ sources	18 Sep 2008 19:11:11 -0000	1.2
@@ -0,0 +1 @@
+05b53dd7bead66dda35fec502b91066c  libacpi-0.2.tar.gz



From gemi at fedoraproject.org  Thu Sep 18 19:17:55 2008
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Thu, 18 Sep 2008 19:17:55 +0000 (UTC)
Subject: rpms/bigloo/F-9 .cvsignore, 1.16, 1.17 bigloo-javaht.patch, 1.2,
	1.3 bigloo.spec, 1.26, 1.27 sources, 1.16, 1.17
Message-ID: <20080918191755.44322700D9@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/bigloo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25275/F-9

Modified Files:
	.cvsignore bigloo-javaht.patch bigloo.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/F-9/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	1 Jun 2008 12:52:54 -0000	1.16
+++ .cvsignore	18 Sep 2008 19:17:24 -0000	1.17
@@ -1 +1 @@
-bigloo3.1a.tar.gz
+bigloo3.1b.tar.gz

bigloo-javaht.patch:

Index: bigloo-javaht.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/F-9/bigloo-javaht.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bigloo-javaht.patch	14 Apr 2008 19:20:40 -0000	1.2
+++ bigloo-javaht.patch	18 Sep 2008 19:17:24 -0000	1.3
@@ -1,14 +1,15 @@
---- bigloo3.0a/runtime/Jlib/dlopen.java.javaht	2007-06-01 22:53:49.000000000 +0200
-+++ bigloo3.0a/runtime/Jlib/dlopen.java	2007-06-01 22:54:34.000000000 +0200
-@@ -137,9 +137,9 @@
- 
-    public static int dload( final byte[] filename, final byte[] init_sym ) {
+diff -up bigloo3.1b/runtime/Jlib/dlopen.java.javaht bigloo3.1b/runtime/Jlib/dlopen.java
+--- bigloo3.1b/runtime/Jlib/dlopen.java.javaht	2008-09-18 20:24:59.000000000 +0200
++++ bigloo3.1b/runtime/Jlib/dlopen.java	2008-09-18 20:25:59.000000000 +0200
+@@ -181,9 +181,9 @@ public abstract class dlopen {
+ 			    final byte[] init_sym,
+ 			    final byte[] mod_sym ) {
        synchronized( dlopen_table ) {
 -	 if( !(dlopen_table.contains( filename )) ) {
 +	 if( !(dlopen_table.containsKey( filename )) ) {
- 	    int res = dload_inner( filename, init_sym );
+ 	    int res = dload_inner( filename, init_sym, mod_sym );
 -	    dlopen_table.put( filename, new Boolean( true ) );
-+	    dlopen_table.put( filename, Boolean.valueOf(true) );
++	    dlopen_table.put( filename, Boolean.valueOf( true ) );
  	    return res;
  	 } else {
  	    return 0;


Index: bigloo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/F-9/bigloo.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- bigloo.spec	1 Jun 2008 12:52:54 -0000	1.26
+++ bigloo.spec	18 Sep 2008 19:17:24 -0000	1.27
@@ -1,7 +1,7 @@
 %define _with_java 1
 
 Name:		bigloo
-Version: 	3.1a
+Version: 	3.1b
 Release:	1%{?dist}
 Summary: 	Bigloo is compiler for the Scheme programming language
 
@@ -35,7 +35,7 @@
 Bigloo is a Scheme implementation devoted to one goal: enabling Scheme
 based programming style where C(++) is usually required. Bigloo
 attempts to make Scheme practical by offering features usually
-presented by traditional programming languages but ot offered by
+presented by traditional programming languages but not offered by
 Scheme and functional programming. Bigloo compiles Scheme modules. It
 delivers small and fast stand alone binary executables. Bigloo enables
 full connections between Scheme and C programs.
@@ -78,15 +78,16 @@
 
 %prep
 %setup -q -n %{name}%{version}
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
-perl -pi -e 's|bmask=755|bmask=644|' configure
+sed -i 's|bmask=755|bmask=644|' configure
 
 
 %build
 %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'`"
 
 ./configure \
 	--prefix=%{_prefix} \
@@ -104,9 +105,9 @@
 	%{!?_with_java: --jvm=no} \
 	--sharedbde=yes \
 	--sharedcompiler=yes \
-	--coflags="$RPM_OPT_FLAGS"
+	--coflags=%{bigloo_opt_flags}
 
-perl -pi -e 's|EMACSBRAND=.*|EMACSBRAND=emacs21|' Makefile.config
+sed -i 's|EMACSBRAND=.*|EMACSBRAND=emacs21|' Makefile.config
 
 # _smp_mflags breaks the build
 env LD_LIBRARY_PATH=`pwd`/lib/%{version} \
@@ -144,8 +145,7 @@
 rm -fr $RPM_BUILD_ROOT%{_infodir}/dir
 rm -fr $RPM_BUILD_ROOT%{_datadir}/doc
 
-perl -pi -e 's|^BOOTBINDIR=.*|BOOTBINDIR=%{_bindir}|' Makefile.config
-
+# emacs
 mkdir -p $RPM_BUILD_ROOT%{emacslisppath}/site-start.d
 cat > $RPM_BUILD_ROOT%{emacslisppath}/site-start.d/bigloo.el <<EOF
 (require 'bmacs)
@@ -217,6 +217,9 @@
 
 
 %changelog
+* Thu Sep 18 2008 Gerard Milmeister <gemi at bluewin.ch> - 3.1b-1
+- new release 3.1b
+
 * Sat May 31 2008 Gerard Milmeister <gemi at bluewin.ch> - 3.1a-1
 - new release 3.1a
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/F-9/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	1 Jun 2008 12:52:54 -0000	1.16
+++ sources	18 Sep 2008 19:17:24 -0000	1.17
@@ -1 +1 @@
-de016abbf69a08fdc4ec58afefd16fde  bigloo3.1a.tar.gz
+1c44c3dc0f3b8953178a7918e4c442ab  bigloo3.1b.tar.gz



From gemi at fedoraproject.org  Thu Sep 18 19:17:55 2008
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Thu, 18 Sep 2008 19:17:55 +0000 (UTC)
Subject: rpms/bigloo/devel .cvsignore, 1.16, 1.17 bigloo-javaht.patch, 1.2, 
	1.3 bigloo.spec, 1.26, 1.27 sources, 1.16, 1.17
Message-ID: <20080918191755.733C6700D9@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/bigloo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25275/devel

Modified Files:
	.cvsignore bigloo-javaht.patch bigloo.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	1 Jun 2008 12:53:18 -0000	1.16
+++ .cvsignore	18 Sep 2008 19:17:25 -0000	1.17
@@ -1 +1 @@
-bigloo3.1a.tar.gz
+bigloo3.1b.tar.gz

bigloo-javaht.patch:

Index: bigloo-javaht.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/bigloo-javaht.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bigloo-javaht.patch	14 Apr 2008 19:20:40 -0000	1.2
+++ bigloo-javaht.patch	18 Sep 2008 19:17:25 -0000	1.3
@@ -1,14 +1,15 @@
---- bigloo3.0a/runtime/Jlib/dlopen.java.javaht	2007-06-01 22:53:49.000000000 +0200
-+++ bigloo3.0a/runtime/Jlib/dlopen.java	2007-06-01 22:54:34.000000000 +0200
-@@ -137,9 +137,9 @@
- 
-    public static int dload( final byte[] filename, final byte[] init_sym ) {
+diff -up bigloo3.1b/runtime/Jlib/dlopen.java.javaht bigloo3.1b/runtime/Jlib/dlopen.java
+--- bigloo3.1b/runtime/Jlib/dlopen.java.javaht	2008-09-18 20:24:59.000000000 +0200
++++ bigloo3.1b/runtime/Jlib/dlopen.java	2008-09-18 20:25:59.000000000 +0200
+@@ -181,9 +181,9 @@ public abstract class dlopen {
+ 			    final byte[] init_sym,
+ 			    final byte[] mod_sym ) {
        synchronized( dlopen_table ) {
 -	 if( !(dlopen_table.contains( filename )) ) {
 +	 if( !(dlopen_table.containsKey( filename )) ) {
- 	    int res = dload_inner( filename, init_sym );
+ 	    int res = dload_inner( filename, init_sym, mod_sym );
 -	    dlopen_table.put( filename, new Boolean( true ) );
-+	    dlopen_table.put( filename, Boolean.valueOf(true) );
++	    dlopen_table.put( filename, Boolean.valueOf( true ) );
  	    return res;
  	 } else {
  	    return 0;


Index: bigloo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/bigloo.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- bigloo.spec	1 Jun 2008 12:53:18 -0000	1.26
+++ bigloo.spec	18 Sep 2008 19:17:25 -0000	1.27
@@ -1,7 +1,7 @@
 %define _with_java 1
 
 Name:		bigloo
-Version: 	3.1a
+Version: 	3.1b
 Release:	1%{?dist}
 Summary: 	Bigloo is compiler for the Scheme programming language
 
@@ -35,7 +35,7 @@
 Bigloo is a Scheme implementation devoted to one goal: enabling Scheme
 based programming style where C(++) is usually required. Bigloo
 attempts to make Scheme practical by offering features usually
-presented by traditional programming languages but ot offered by
+presented by traditional programming languages but not offered by
 Scheme and functional programming. Bigloo compiles Scheme modules. It
 delivers small and fast stand alone binary executables. Bigloo enables
 full connections between Scheme and C programs.
@@ -78,15 +78,16 @@
 
 %prep
 %setup -q -n %{name}%{version}
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
-perl -pi -e 's|bmask=755|bmask=644|' configure
+sed -i 's|bmask=755|bmask=644|' configure
 
 
 %build
 %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'`"
 
 ./configure \
 	--prefix=%{_prefix} \
@@ -104,9 +105,9 @@
 	%{!?_with_java: --jvm=no} \
 	--sharedbde=yes \
 	--sharedcompiler=yes \
-	--coflags="$RPM_OPT_FLAGS"
+	--coflags=%{bigloo_opt_flags}
 
-perl -pi -e 's|EMACSBRAND=.*|EMACSBRAND=emacs21|' Makefile.config
+sed -i 's|EMACSBRAND=.*|EMACSBRAND=emacs21|' Makefile.config
 
 # _smp_mflags breaks the build
 env LD_LIBRARY_PATH=`pwd`/lib/%{version} \
@@ -144,8 +145,7 @@
 rm -fr $RPM_BUILD_ROOT%{_infodir}/dir
 rm -fr $RPM_BUILD_ROOT%{_datadir}/doc
 
-perl -pi -e 's|^BOOTBINDIR=.*|BOOTBINDIR=%{_bindir}|' Makefile.config
-
+# emacs
 mkdir -p $RPM_BUILD_ROOT%{emacslisppath}/site-start.d
 cat > $RPM_BUILD_ROOT%{emacslisppath}/site-start.d/bigloo.el <<EOF
 (require 'bmacs)
@@ -217,6 +217,9 @@
 
 
 %changelog
+* Thu Sep 18 2008 Gerard Milmeister <gemi at bluewin.ch> - 3.1b-1
+- new release 3.1b
+
 * Sat May 31 2008 Gerard Milmeister <gemi at bluewin.ch> - 3.1a-1
 - new release 3.1a
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	1 Jun 2008 12:53:18 -0000	1.16
+++ sources	18 Sep 2008 19:17:25 -0000	1.17
@@ -1 +1 @@
-de016abbf69a08fdc4ec58afefd16fde  bigloo3.1a.tar.gz
+1c44c3dc0f3b8953178a7918e4c442ab  bigloo3.1b.tar.gz



From slankes at fedoraproject.org  Thu Sep 18 19:18:56 2008
From: slankes at fedoraproject.org (Sven Lankes)
Date: Thu, 18 Sep 2008 19:18:56 +0000 (UTC)
Subject: rpms/yacpi/F-9 yacpi-3.0.1.patch, NONE, 1.1 yacpi.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20080918191856.3553A700D9@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/yacpi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25402

Modified Files:
	sources 
Added Files:
	yacpi-3.0.1.patch yacpi.spec 
Log Message:
First import of F-9 branch


yacpi-3.0.1.patch:

--- NEW FILE yacpi-3.0.1.patch ---
diff -Naur yacpi-3.0.1-orig/Makefile yacpi-3.0.1/Makefile
--- yacpi-3.0.1-orig/Makefile	2007-10-30 17:39:43.000000000 +0100
+++ yacpi-3.0.1/Makefile	2008-08-02 11:21:21.000000000 +0200
@@ -4,7 +4,7 @@
 #  ---------------------------------------------
 
 BIN     = yacpi
-prefix  = /usr/local
+prefix  = /usr
 INSPATH = ${prefix}/bin/
 CFLAGS  = -O2 -Wall -g -DVERSION=\"${VERSION}\"
 CC      = cc
@@ -21,8 +21,7 @@
 	@${CC} -c ${CFLAGS} $<
 
 all : options ${OBJ_yacpi} ${OBJ_get_cpu}
-	@${CC} -Wall get_cpu.o yacpi.o -o ${BIN} -lncurses -lacpi
-	@strip ${BIN}
+	@${CC} ${CFLAGS} get_cpu.o yacpi.o -o ${BIN} -lncurses -lacpi
 	@echo built yacpi
 
 dist : clean
@@ -40,12 +39,12 @@
 	@echo "BIN    = ${BIN}"
 
 install :
-	@mkdir -p ${DOCPATH}
-	@mkdir -p ${INSPATH}
-	@mkdir -p ${MANPATH}
-	install -m644 CHANGELOG README THANKS COPYING ${DOCPATH}
-	install -m644 yacpi.1 ${MANPATH}
-	install ${BIN} ${INSPATH}
+	@mkdir -p ${DESTDIR}/${DOCPATH}
+	@mkdir -p ${DESTDIR}/${INSPATH}
+	@mkdir -p ${DESTDIR}/${MANPATH}
+	install -p -m644 CHANGELOG README THANKS COPYING ${DESTDIR}/${DOCPATH}
+	install -p -m644 yacpi.1 ${DESTDIR}/${MANPATH}
+	install -p ${BIN} ${DESTDIR}/${INSPATH}
 
 uninstall :
 	rm -f ${INSPATH}${BIN}


--- NEW FILE yacpi.spec ---
Name:           yacpi
Version:        3.0.1
Release:        11%{?dist}
Summary:        Yet Another Configuration and Power Interface 

Group:          Applications/System
License:        GPLv2+
URL:            http://www.ngolde.de/yacpi.html 
Source0:        http://www.ngolde.de/download/%{name}-%{version}.tar.gz  
Patch0:         %{name}-%{version}.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  ncurses-devel 
BuildRequires:  libacpi-devel 
ExcludeArch:    ppc ppc64

%description
Yacpi is an acpi monitoring program for Linux. It displays acpi information 
like battery status, ac status, cpu frequency, remaining battery/charge 
time, temperature... It also supports the use of more than one battery and 
can display them. 

%prep
%setup -q
%patch0 -p1
sed -i "s/CFLAGS  = -O2 -Wall -g/CFLAGS = $RPM_OPT_FLAGS/" Makefile
sed -i "s&share/doc/%{name}&share/doc/%{name}-%{version}&" Makefile


%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

#fix convert changelog to UTF8
iconv -f ISO_8859-1 -t UTF-8 -o $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}-%{version}/CHANGELOG{.utf8,}
mv $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}-%{version}/CHANGELOG{.utf8,}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%dir %{_defaultdocdir}/%{name}-%{version}
%doc %{_defaultdocdir}/%{name}-%{version}/CHANGELOG
%doc %{_defaultdocdir}/%{name}-%{version}/COPYING
%doc %{_defaultdocdir}/%{name}-%{version}/README
%doc %{_defaultdocdir}/%{name}-%{version}/THANKS
%{_mandir}/man1/%{name}.1.gz



%changelog
* Tue Aug 19 2008 Sven Lankes <sven at lank.es> - 3.0.1-11
- add ExcludeArch ppc ppc64

* Sat Aug  2 2008 Sven Lankes <sven at lank.es> - 3.0.1-10
- updated Makefile patch to:
- actually use the set cflags 
- not strip the binary so that we get a -debuginfo package 

* Mon Jul  7 2008 slankes <sven at lank.es> - 3.0.1-9
- minor specfile tweaks

* Thu May  8 2008 slankes <sven at lank.es> - 3.0.1-8
- save doc in name-version instead of version

* Thu May  8 2008 slankes <sven at lank.es> - 3.0.1-7
- drop explicit depencency on ncurses
- rework Makefile-patch
- Replace CFLAGS with RPM_OPT_FLAGS

* Mon May  5 2008 slankes <sven at lank.es> - 3.0.1-6
- Use correct license
- Various specfile cleanups

* Sat May  3 2008 slankes <sven at lank.es> - 3.0.1-5
- Convert CHANGELOG to UTF-8 

* Sat May  3 2008 slankes <sven at lank.es> - 3.0.1-4
- First package version



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yacpi/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Aug 2008 20:59:25 -0000	1.1
+++ sources	18 Sep 2008 19:18:26 -0000	1.2
@@ -0,0 +1 @@
+1b03394ee3b916f686cdc3e2c05ddb7a  yacpi-3.0.1.tar.gz



From dwalsh at fedoraproject.org  Thu Sep 18 19:34:43 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 18 Sep 2008 19:34:43 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.100,
	1.101 policy-20080710.patch, 1.37, 1.38 selinux-policy.spec,
	1.705, 1.706
Message-ID: <20080918193443.461C8700D9@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27576

Modified Files:
	modules-targeted.conf policy-20080710.patch 
	selinux-policy.spec 
Log Message:
* Thu Sep 18 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-2
- Fix labeling on new pm*log
- Allow ssh to bind to all nodes



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- modules-targeted.conf	18 Sep 2008 14:19:06 -0000	1.100
+++ modules-targeted.conf	18 Sep 2008 19:34:12 -0000	1.101
@@ -489,7 +489,7 @@
 #
 # Hardware abstraction layer
 # 
-hal = base
+hal = module
 
 # Layer: services
 # Module: polkit

policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- policy-20080710.patch	18 Sep 2008 14:19:06 -0000	1.37
+++ policy-20080710.patch	18 Sep 2008 19:34:12 -0000	1.38
@@ -16881,7 +16881,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.5.8/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/hal.fc	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/hal.fc	2008-09-18 14:35:46.000000000 -0400
 @@ -9,6 +9,7 @@
  /usr/libexec/hal-system-sonypic	 	--	gen_context(system_u:object_r:hald_sonypic_exec_t,s0)
  /usr/libexec/hald-addon-macbookpro-backlight --	gen_context(system_u:object_r:hald_mac_exec_t,s0)
@@ -16890,6 +16890,15 @@
  
  /usr/sbin/hald		--			gen_context(system_u:object_r:hald_exec_t,s0)
  
+@@ -17,7 +18,7 @@
+ /var/lib/hal(/.*)?				gen_context(system_u:object_r:hald_var_lib_t,s0)
+ 
+ /var/log/pm(/.*)?				gen_context(system_u:object_r:hald_log_t,s0)
+-/var/log/pm-suspend\.log			gen_context(system_u:object_r:hald_log_t,s0)
++/var/log/pm-.*\.log				gen_context(system_u:object_r:hald_log_t,s0)
+ 
+ /var/run/hald(/.*)?				gen_context(system_u:object_r:hald_var_run_t,s0)
+ /var/run/haldaemon\.pid	--	 		gen_context(system_u:object_r:hald_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.5.8/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2008-08-07 11:15:11.000000000 -0400
 +++ serefpolicy-3.5.8/policy/modules/services/hal.if	2008-09-17 08:49:08.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.705
retrieving revision 1.706
diff -u -r1.705 -r1.706
--- selinux-policy.spec	12 Sep 2008 14:21:05 -0000	1.705
+++ selinux-policy.spec	18 Sep 2008 19:34:12 -0000	1.706
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -381,6 +381,10 @@
 %endif
 
 %changelog
+* Thu Sep 18 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-2
+- Fix labeling on new pm*log
+- Allow ssh to bind to all nodes
+
 * Thu Sep 11 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-1
 - Merge upstream changes
 - Add Xavier Toth patches



From transif at fedoraproject.org  Thu Sep 18 20:12:58 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 18 Sep 2008 20:12:58 +0000 (UTC)
Subject: comps/po nl.po,1.17,1.18
Message-ID: <20080918201258.C1AF9700D9@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32000/po

Modified Files:
	nl.po 
Log Message:
    2008-09-18  Peter van Egdom <p.van.egdom at gmail.com> (via
peterve at fedoraproject.org)
    
      * po/nl.po: Updated Dutch translation.
    



Index: nl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/nl.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nl.po	17 Sep 2008 22:44:36 -0000	1.17
+++ nl.po	18 Sep 2008 20:12:28 -0000	1.18
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-09-08 22:40+0200\n"
+"POT-Creation-Date: 2008-09-18 17:24+0000\n"
+"PO-Revision-Date: 2008-09-18 21:55+0200\n"
 "Last-Translator: Peter van Egdom <p.van.egdom at gmail.com>\n"
 "Language-Team: Dutch <fedora-trans-list at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -111,7 +111,7 @@
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
 #: ../comps-f10.xml.in.h:19
 msgid "Brazilian Portuguese Support"
-msgstr "Ondersteuning voor Braziliaans Portugees"
+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:20
@@ -1173,9 +1173,8 @@
 msgstr "Ondersteuning voor Waals"
 
 #: ../comps-f10.xml.in.h:70
-#, fuzzy
 msgid "Haskell Development"
-msgstr "Webontwikkeling"
+msgstr "Haskell ontwikkeling"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
@@ -1186,44 +1185,38 @@
 msgstr "Invoermethode pakketten voor het invoeren van internationale tekst."
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "Ondersteuning voor Khmer"
+msgstr "Ondersteuning voor Kasjmiri"
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "Ondersteuning voor Koreaans"
+msgstr "Ondersteuning voor Konkani"
 
 #: ../comps-f10.xml.in.h:110
-#, fuzzy
 msgid "Maithili Support"
-msgstr "Ondersteuning voor Marathi"
+msgstr "Ondersteuning voor Maithili"
 
 #: ../comps-f10.xml.in.h:117
 msgid "Myanmar (Burmese) Support"
 msgstr "Ondersteuning voor Myanmarees (Birmees)"
 
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "Ondersteuning voor Hindi"
+msgstr "Ondersteuning voor Sindhi"
 
 #: ../comps-f10.xml.in.h:156
-#, fuzzy
 msgid "Support for developing programs in the Haskell programming language."
 msgstr ""
 "Ondersteuning voor het ontwikkelen van programma's in de programmeertaal "
-"Java."
+"Haskell."
 
 #: ../comps-f10.xml.in.h:163
 msgid "Tajik Support"
 msgstr "Ondersteuning voor Tajiki"
 
 #: ../comps-f10.xml.in.h:205
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "Ondersteuning voor Tsjechisch"
+msgstr "Ondersteuning voor Oezbeeks"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"



From krh at fedoraproject.org  Thu Sep 18 20:16:01 2008
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Thu, 18 Sep 2008 20:16:01 +0000 (UTC)
Subject: rpms/kernel/devel drm-add-more-drm-error-msg.patch, NONE,
	1.1 drm-allow-r300-dst-pipe-config.patch, NONE,
	1.1 drm-fix-pll-computation-precedence.patch, 1.1,
	1.2 kernel.spec, 1.956, 1.957
Message-ID: <20080918201601.D98C2700D9@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32454

Modified Files:
	drm-fix-pll-computation-precedence.patch kernel.spec 
Added Files:
	drm-add-more-drm-error-msg.patch 
	drm-allow-r300-dst-pipe-config.patch 
Log Message:
* Thu Sep 18 2008 Kristian H??gsberg <krh at redhat.com>
- Fix precedence in PLL value computation.
- Allow R300_DST_PIPE_CONFIG register write use by X.
- Add DRM_ERROR() for EINVAL returns from DRM_RADEON_CS that will crash X.


drm-add-more-drm-error-msg.patch:

--- NEW FILE drm-add-more-drm-error-msg.patch ---
>From 7ffccfd3bc0ab85635a0b4444f87541cec55a529 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
Date: Thu, 18 Sep 2008 16:10:29 -0400
Subject: [PATCH] radeon: Add DRM_ERROR() messages to all EINVAL exits from DRM_RADEON_CS.

Shouldn't trigger under normal use and when something breaks, it will
be easier to debug.
---
 drivers/gpu/drm/radeon/radeon_cs.c  |    9 +++++++--
 drivers/gpu/drm/radeon/radeon_mem.c |    2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index c8b0c97..b5a2be8 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -54,6 +54,7 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *fpriv)
 	}
 	/* limit cs to 64K ib */
 	if (cs->dwords > (16 * 1024)) {
+		DRM_ERROR("cs->dwords too big: %d\n", cs->dwords);
 		return -EINVAL;
 	}
 	/* copy cs from userspace maybe we should copy into ib to save
@@ -72,6 +73,7 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *fpriv)
 	/* get ib */
 	r = dev_priv->cs.ib_get(dev, &ib, cs->dwords, &card_offset);
 	if (r) {
+		DRM_ERROR("ib_get failed\n");
 		goto out;
 	}
 
@@ -185,6 +187,7 @@ static int radeon_cs_relocate_packet3(struct drm_device *dev, struct drm_file *f
 		packets[offset_dw + 2] = val;
 	}
 	default:
+		DRM_ERROR("reg is %x, not RADEON_CNTL_HOSTDATA_BLT\n", reg);
 		return -EINVAL;
 	}
 	return 0;
@@ -246,14 +249,16 @@ int radeon_cs_packet0(struct drm_device *dev, struct drm_file *file_priv,
 				}
 
 				ret = radeon_cs_relocate_packet0(dev, file_priv, packets, offset_dw);
-				if (ret)
+				if (ret) {
+					DRM_ERROR("failed to relocate packet\n");
 					return ret;
+				}
 				DRM_DEBUG("need to relocate %x %d\n", reg, flags);
 				/* okay it should be followed by a NOP */
 			} else if (flags == MARK_CHECK_SCISSOR) {
 				DRM_DEBUG("need to validate scissor %x %d\n", reg, flags);
 			} else {
-				DRM_DEBUG("illegal register %x %d\n", reg, flags);
+				DRM_ERROR("illegal register %x %d\n", reg, flags);
 				return -EINVAL;
 			}
 			break;
diff --git a/drivers/gpu/drm/radeon/radeon_mem.c b/drivers/gpu/drm/radeon/radeon_mem.c
index 4af5286..05bbb90 100644
--- a/drivers/gpu/drm/radeon/radeon_mem.c
+++ b/drivers/gpu/drm/radeon/radeon_mem.c
@@ -294,7 +294,7 @@ int radeon_mem_init_heap(struct drm_device *dev, void *data, struct drm_file *fi
 		return -EFAULT;
 
 	if (*heap) {
-		DRM_ERROR("heap already initialized?");
+		DRM_ERROR("heap already initialized?\n");
 		return -EFAULT;
 	}
 
-- 
1.5.6.GIT


drm-allow-r300-dst-pipe-config.patch:

--- NEW FILE drm-allow-r300-dst-pipe-config.patch ---
>From c3aaac2c89ce104fa1de8e79ef0f7c7f50012aaa Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
Date: Thu, 18 Sep 2008 16:07:50 -0400
Subject: [PATCH] Allow R300_DST_PIPE_CONFIG for R420 and up.

The X server emits writes to R300_DST_PIPE_CONFIG for R420 chipsets during
accel init.
---
 drivers/gpu/drm/radeon/r300_cmdbuf.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c
index cd6db70..422554e 100644
--- a/drivers/gpu/drm/radeon/r300_cmdbuf.c
+++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c
@@ -248,7 +248,7 @@ void r300_init_reg_flags(struct drm_device *dev)
 	ADD_RANGE(R300_VAP_INPUT_ROUTE_1_0, 8);
 
 	ADD_RANGE(R500_SU_REG_DEST, 1);
-	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV410) {
+	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R420) {
 		ADD_RANGE(R300_DST_PIPE_CONFIG, 1);
 	}
 
-- 
1.5.6.GIT


drm-fix-pll-computation-precedence.patch:

Index: drm-fix-pll-computation-precedence.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-fix-pll-computation-precedence.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drm-fix-pll-computation-precedence.patch	18 Sep 2008 19:01:21 -0000	1.1
+++ drm-fix-pll-computation-precedence.patch	18 Sep 2008 20:16:01 -0000	1.2
@@ -1,8 +1,12 @@
-commit ced5841f9f1858d83551714717d905a6a1ea28c1
-Author: Kristian H??gsberg <krh at redhat.com>
-Date:   Thu Sep 18 14:53:46 2008 -0400
+From ced5841f9f1858d83551714717d905a6a1ea28c1 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
+Date: Thu, 18 Sep 2008 14:53:46 -0400
+Subject: [PATCH] radeon kms: Get precedence right when computing PLL values.
 
-    radeon kms: Get precedence right when computing PLL values.
+---
+ drivers/gpu/drm/radeon/radeon_atombios.c |    8 ++++----
+ drivers/gpu/drm/radeon/radeon_combios.c  |    6 ++++++
+ 2 files changed, 10 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
 index 4d98cba..a1631fe 100644
@@ -48,3 +52,6 @@
  			}
  			return true;
  		}
+-- 
+1.5.6.GIT
+


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.956
retrieving revision 1.957
diff -u -r1.956 -r1.957
--- kernel.spec	18 Sep 2008 19:01:21 -0000	1.956
+++ kernel.spec	18 Sep 2008 20:16:01 -0000	1.957
@@ -610,6 +610,8 @@
 Patch1812: drm-modesetting-i915.patch
 Patch1813: drm-nouveau.patch
 Patch1814: drm-fix-pll-computation-precedence.patch
+Patch1815: drm-allow-r300-dst-pipe-config.patch
+Patch1816: drm-add-more-drm-error-msg.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1169,6 +1171,8 @@
 ApplyPatch drm-modesetting-i915.patch
 ApplyPatch drm-nouveau.patch
 ApplyPatch drm-fix-pll-computation-precedence.patch
+ApplyPatch drm-allow-r300-dst-pipe-config.patch
+ApplyPatch drm-add-more-drm-error-msg.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1762,6 +1766,8 @@
 %changelog
 * Thu Sep 18 2008 Kristian H??gsberg <krh at redhat.com>
 - Fix precedence in PLL value computation.
+- Allow R300_DST_PIPE_CONFIG register write use by X.
+- Add DRM_ERROR() for EINVAL returns from DRM_RADEON_CS that will crash X.
 
 * Thu Sep 18 2008 Dave Airlie <airlied at redhat.com>
 - update radeon LVDS bits from AMD



From eponyme at fedoraproject.org  Thu Sep 18 20:21:18 2008
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu, 18 Sep 2008 20:21:18 +0000 (UTC)
Subject: rpms/fotoxx/devel .cvsignore, 1.6, 1.7 fotoxx.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <20080918202118.61FA5700D9@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/fotoxx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv722

Modified Files:
	.cvsignore fotoxx.spec sources 
Log Message:
Update to 5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Aug 2008 21:02:35 -0000	1.6
+++ .cvsignore	18 Sep 2008 20:20:48 -0000	1.7
@@ -1 +1 @@
-fotoxx-5.2.tar.gz
+fotoxx-5.3.tar.gz


Index: fotoxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/devel/fotoxx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fotoxx.spec	31 Aug 2008 21:02:35 -0000	1.5
+++ fotoxx.spec	18 Sep 2008 20:20:48 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           fotoxx
-Version:        5.2
+Version:        5.3
 Release:        1%{?dist}
 Summary:        Photo editor 
 
@@ -55,10 +55,12 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Thu Sep 18 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.3-1
+- Rebuild for 5.3
 * Sun Aug 31 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.2-1
-* Rebuild for 5.2
+- Rebuild for 5.2
 * Sun Aug 24 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.1-1
-* Rebuild for 5.1
+- Rebuild for 5.1
 * Fri Aug  8 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.0.1-1
 - Rebuild for 5.0.1
 * Sat Aug  2 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.0-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Aug 2008 21:02:35 -0000	1.6
+++ sources	18 Sep 2008 20:20:48 -0000	1.7
@@ -1 +1 @@
-cdaba224e93764d11de4c3e6ffe2ecc1  fotoxx-5.2.tar.gz
+5780d741ceef9237d181c32f05865750  fotoxx-5.3.tar.gz



From eponyme at fedoraproject.org  Thu Sep 18 20:24:28 2008
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu, 18 Sep 2008 20:24:28 +0000 (UTC)
Subject: rpms/fotoxx/F-8 .cvsignore, 1.5, 1.6 fotoxx.spec, 1.5, 1.6 sources, 
	1.6, 1.7
Message-ID: <20080918202428.3B800700D9@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/fotoxx/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1210

Modified Files:
	.cvsignore fotoxx.spec sources 
Log Message:
Update to 5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Aug 2008 21:08:08 -0000	1.5
+++ .cvsignore	18 Sep 2008 20:23:57 -0000	1.6
@@ -1 +1 @@
-fotoxx-5.2.tar.gz
+fotoxx-5.3.tar.gz


Index: fotoxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/F-8/fotoxx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fotoxx.spec	31 Aug 2008 21:08:08 -0000	1.5
+++ fotoxx.spec	18 Sep 2008 20:23:57 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           fotoxx
-Version:        5.2
+Version:        5.3
 Release:        1%{?dist}
 Summary:        Photo editor 
 
@@ -55,10 +55,12 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Thu Sep 18 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.3-1
+- Rebuild for 5.3
 * Sun Aug 31 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.2-1
-* Rebuild for 5.2
+- Rebuild for 5.2
 * Sun Aug 24 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.1-1
-* Rebuild for 5.1
+- Rebuild for 5.1
 * Fri Aug  8 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.0.1-1
 - Rebuild for 5.0.1
 * Sat Aug  2 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.0-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Aug 2008 21:08:08 -0000	1.6
+++ sources	18 Sep 2008 20:23:57 -0000	1.7
@@ -1 +1 @@
-cdaba224e93764d11de4c3e6ffe2ecc1  fotoxx-5.2.tar.gz
+5780d741ceef9237d181c32f05865750  fotoxx-5.3.tar.gz



From eponyme at fedoraproject.org  Thu Sep 18 20:29:17 2008
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu, 18 Sep 2008 20:29:17 +0000 (UTC)
Subject: rpms/fotoxx/F-9 .cvsignore, 1.5, 1.6 fotoxx.spec, 1.5, 1.6 sources, 
	1.6, 1.7
Message-ID: <20080918202917.C31F77013F@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/fotoxx/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1896

Modified Files:
	.cvsignore fotoxx.spec sources 
Log Message:
Update to 5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Aug 2008 21:12:47 -0000	1.5
+++ .cvsignore	18 Sep 2008 20:28:47 -0000	1.6
@@ -1 +1 @@
-fotoxx-5.2.tar.gz
+fotoxx-5.3.tar.gz


Index: fotoxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/F-9/fotoxx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fotoxx.spec	31 Aug 2008 21:12:47 -0000	1.5
+++ fotoxx.spec	18 Sep 2008 20:28:47 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           fotoxx
-Version:        5.2
+Version:        5.3
 Release:        1%{?dist}
 Summary:        Photo editor 
 
@@ -55,10 +55,12 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Thu Sep 18 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.3-1
+- Rebuild for 5.3
 * Sun Aug 31 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.2-1
-* Rebuild for 5.2
+- Rebuild for 5.2
 * Sun Aug 24 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.1-1
-* Rebuild for 5.1
+- Rebuild for 5.1
 * Fri Aug  8 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.0.1-1
 - Rebuild for 5.0.1
 * Sat Aug  2 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.0-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Aug 2008 21:12:47 -0000	1.6
+++ sources	18 Sep 2008 20:28:47 -0000	1.7
@@ -1 +1 @@
-cdaba224e93764d11de4c3e6ffe2ecc1  fotoxx-5.2.tar.gz
+5780d741ceef9237d181c32f05865750  fotoxx-5.3.tar.gz



From gemi at fedoraproject.org  Thu Sep 18 20:39:01 2008
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Thu, 18 Sep 2008 20:39:01 +0000 (UTC)
Subject: rpms/bigloo/devel bigloo-java-1.5.patch, 1.1, 1.2 bigloo.spec, 1.27,
	1.28
Message-ID: <20080918203901.7A90C700D9@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/bigloo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3247

Modified Files:
	bigloo-java-1.5.patch bigloo.spec 
Log Message:


bigloo-java-1.5.patch:

Index: bigloo-java-1.5.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/bigloo-java-1.5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bigloo-java-1.5.patch	28 Mar 2007 20:13:53 -0000	1.1
+++ bigloo-java-1.5.patch	18 Sep 2008 20:39:01 -0000	1.2
@@ -1,6 +1,7 @@
---- bigloo2.9a/runtime/Jlib/JDK15.java.orig	2007-03-28 15:55:35.000000000 -0400
-+++ bigloo2.9a/runtime/Jlib/JDK15.java	2007-03-28 15:56:01.000000000 -0400
-@@ -10,11 +10,11 @@
+diff -up bigloo3.1b/runtime/Jlib/JDK15.java.java-1.5 bigloo3.1b/runtime/Jlib/JDK15.java
+--- bigloo3.1b/runtime/Jlib/JDK15.java.java-1.5	2008-09-15 12:12:36.000000000 +0200
++++ bigloo3.1b/runtime/Jlib/JDK15.java	2008-09-18 22:38:19.000000000 +0200
+@@ -21,11 +21,11 @@ public class JDK15 extends JDK {
     // JDK1.5 methods
     
     public Method getDeclaredMethodImpl( Class c, byte[] m ) throws Exception {
@@ -13,4 +14,4 @@
 +      return m.invoke( null, null );
     }
     
-    public ServerSocket makeServerSocketImpl(String name, int port)
+    public Object invoke3Impl(Method m, int n, byte[] a) throws Exception {


Index: bigloo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/bigloo.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- bigloo.spec	18 Sep 2008 19:17:25 -0000	1.27
+++ bigloo.spec	18 Sep 2008 20:39:01 -0000	1.28
@@ -2,7 +2,7 @@
 
 Name:		bigloo
 Version: 	3.1b
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary: 	Bigloo is compiler for the Scheme programming language
 
 Group:		Development/Languages



From dwalsh at fedoraproject.org  Thu Sep 18 20:47:12 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 18 Sep 2008 20:47:12 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-mls.conf, 1.36,
	1.37 modules-targeted.conf, 1.101, 1.102 policy-20080710.patch,
	1.38, 1.39 selinux-policy.spec, 1.706, 1.707
Message-ID: <20080918204712.7F781700D9@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4154

Modified Files:
	modules-mls.conf modules-targeted.conf policy-20080710.patch 
	selinux-policy.spec 
Log Message:
* Thu Sep 18 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-3
- Fix labeling on new pm*log
- Allow ssh to bind to all nodes



Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- modules-mls.conf	18 Sep 2008 14:19:06 -0000	1.36
+++ modules-mls.conf	18 Sep 2008 20:46:41 -0000	1.37
@@ -409,14 +409,14 @@
 #
 # Policy for rshd, rlogind, and telnetd.
 # 
-remotelogin = base
+remotelogin = module
 
 # Layer: services
 # Module: telnet
 #
 # Telnet daemon
 # 
-telnet = base
+telnet = module
 
 # Layer: services
 # Module: irqbalance


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- modules-targeted.conf	18 Sep 2008 19:34:12 -0000	1.101
+++ modules-targeted.conf	18 Sep 2008 20:46:41 -0000	1.102
@@ -1040,7 +1040,7 @@
 #
 # Policy for rshd, rlogind, and telnetd.
 # 
-remotelogin = base
+remotelogin = module
 
 # Layer: services
 # Module: ricci

policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- policy-20080710.patch	18 Sep 2008 19:34:12 -0000	1.38
+++ policy-20080710.patch	18 Sep 2008 20:46:41 -0000	1.39
@@ -23287,7 +23287,7 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.5.8/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2008-08-14 13:08:27.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/rpc.te	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/rpc.te	2008-09-18 16:45:56.000000000 -0400
 @@ -23,7 +23,7 @@
  gen_tunable(allow_nfsd_anon_write, false)
  
@@ -23321,7 +23321,7 @@
  ')
  
  tunable_policy(`nfs_export_all_ro',`
-@@ -170,9 +173,13 @@
+@@ -170,9 +173,14 @@
  files_read_usr_symlinks(gssd_t) 
  
  auth_use_nsswitch(gssd_t)
@@ -23329,13 +23329,14 @@
  
  miscfiles_read_certs(gssd_t)
  
-+userdom_dontaudit_search_users_home_dirs(rpcd_t)
-+sysadm_dontaudit_search_home_dirs(rpcd_t)
++userdom_dontaudit_search_users_home_dirs(gssd_t)
++sysadm_dontaudit_search_home_dirs(gssd_t)
++userdom_dontaudit_write_user_tmp_files(user, gssd_t)
 +
  tunable_policy(`allow_gssd_read_tmp',`
  	userdom_list_unpriv_users_tmp(gssd_t) 
  	userdom_read_unpriv_users_tmp_files(gssd_t) 
-@@ -180,8 +187,7 @@
+@@ -180,8 +188,7 @@
  ')
  
  optional_policy(`
@@ -26609,7 +26610,7 @@
  /etc/ssh/ssh_host_key 		--	gen_context(system_u:object_r:sshd_key_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.5.8/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ssh.if	2008-09-18 08:51:19.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ssh.if	2008-09-18 15:56:17.000000000 -0400
 @@ -36,6 +36,7 @@
  	gen_require(`
  		attribute ssh_server;
@@ -26709,7 +26710,11 @@
  	# Write to the user domain tty.
  	userdom_use_user_terminals($1,$1_ssh_t)
  	# needs to read krb tgt
-@@ -282,21 +289,10 @@
+@@ -279,24 +286,14 @@
+ 	# for port forwarding
+ 	tunable_policy(`user_tcp_server',`
+ 		corenet_tcp_bind_ssh_port($1_ssh_t)
++		corenet_tcp_bind_all_nodes($1_ssh_t)
  	')
  
  	optional_policy(`
@@ -26732,7 +26737,7 @@
  	##############################
  	#
  	# $1_ssh_agent_t local policy
-@@ -383,10 +379,6 @@
+@@ -383,10 +380,6 @@
  		xserver_rw_xdm_pipes($1_ssh_agent_t)
  	')
  
@@ -26743,7 +26748,7 @@
  	##############################
  	#
  	# $1_ssh_keysign_t local policy
-@@ -413,6 +405,25 @@
+@@ -413,6 +406,25 @@
  	')
  ')
  
@@ -26769,7 +26774,7 @@
  #######################################
  ## <summary>
  ##	The template to define a ssh server.
-@@ -443,13 +454,14 @@
+@@ -443,13 +455,14 @@
  	type $1_var_run_t;
  	files_pid_file($1_var_run_t)
  
@@ -26785,7 +26790,7 @@
  
  	allow $1_t $1_devpts_t:chr_file { rw_chr_file_perms setattr getattr relabelfrom };
  	term_create_pty($1_t,$1_devpts_t)
-@@ -479,6 +491,10 @@
+@@ -479,6 +492,10 @@
  	corenet_tcp_bind_ssh_port($1_t)
  	corenet_tcp_connect_all_ports($1_t)
  	corenet_sendrecv_ssh_server_packets($1_t)
@@ -26796,7 +26801,7 @@
  
  	fs_dontaudit_getattr_all_fs($1_t)
  
-@@ -506,9 +522,14 @@
+@@ -506,9 +523,14 @@
  
  	userdom_dontaudit_relabelfrom_unpriv_users_ptys($1_t)
  	userdom_search_all_users_home_dirs($1_t)
@@ -26811,7 +26816,7 @@
  	')
  
  	tunable_policy(`use_samba_home_dirs',`
-@@ -517,11 +538,7 @@
+@@ -517,11 +539,7 @@
  
  	optional_policy(`
  		kerberos_use($1_t)
@@ -26824,7 +26829,7 @@
  	')
  
  	optional_policy(`
-@@ -710,3 +727,22 @@
+@@ -710,3 +728,22 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
  ')
@@ -26934,7 +26939,7 @@
  corenet_tcp_sendrecv_all_if(stunnel_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-3.5.8/policy/modules/services/telnet.te
 --- nsaserefpolicy/policy/modules/services/telnet.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/telnet.te	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/telnet.te	2008-09-18 16:12:20.000000000 -0400
 @@ -89,15 +89,19 @@
  
  userdom_search_unpriv_users_home_dirs(telnetd_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.706
retrieving revision 1.707
diff -u -r1.706 -r1.707
--- selinux-policy.spec	18 Sep 2008 19:34:12 -0000	1.706
+++ selinux-policy.spec	18 Sep 2008 20:46:41 -0000	1.707
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -381,7 +381,7 @@
 %endif
 
 %changelog
-* Thu Sep 18 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-2
+* Thu Sep 18 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-3
 - Fix labeling on new pm*log
 - Allow ssh to bind to all nodes
 



From dwalsh at fedoraproject.org  Thu Sep 18 21:02:12 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 18 Sep 2008 21:02:12 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20080710.patch,1.39,1.40
Message-ID: <20080918210212.E9621700D9@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5825

Modified Files:
	policy-20080710.patch 
Log Message:
* Thu Sep 18 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-3
- Fix labeling on new pm*log
- Allow ssh to bind to all nodes


policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- policy-20080710.patch	18 Sep 2008 20:46:41 -0000	1.39
+++ policy-20080710.patch	18 Sep 2008 21:02:12 -0000	1.40
@@ -23287,7 +23287,7 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.5.8/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2008-08-14 13:08:27.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/rpc.te	2008-09-18 16:45:56.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/rpc.te	2008-09-18 16:55:00.000000000 -0400
 @@ -23,7 +23,7 @@
  gen_tunable(allow_nfsd_anon_write, false)
  
@@ -23331,7 +23331,7 @@
  
 +userdom_dontaudit_search_users_home_dirs(gssd_t)
 +sysadm_dontaudit_search_home_dirs(gssd_t)
-+userdom_dontaudit_write_user_tmp_files(user, gssd_t)
++userdom_dontaudit_manage_user_tmp_files(user, gssd_t)
 +
  tunable_policy(`allow_gssd_read_tmp',`
  	userdom_list_unpriv_users_tmp(gssd_t) 



From wwoods at fedoraproject.org  Thu Sep 18 21:25:35 2008
From: wwoods at fedoraproject.org (Will Woods)
Date: Thu, 18 Sep 2008 21:25:35 +0000 (UTC)
Subject: rpms/preupgrade/devel .cvsignore, 1.1, 1.2 preupgrade.spec, 1.4,
	1.5 sources, 1.4, 1.5 enable-f9.patch, 1.1,
	NONE retrieve-treeinfo-from-instrepo.patch, 1.1, NONE
Message-ID: <20080918212535.C59EB700D9@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7946

Modified Files:
	.cvsignore preupgrade.spec sources 
Removed Files:
	enable-f9.patch retrieve-treeinfo-from-instrepo.patch 
Log Message:
0.9.8-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2008 20:49:54 -0000	1.1
+++ .cvsignore	18 Sep 2008 21:25:05 -0000	1.2
@@ -0,0 +1 @@
+preupgrade-0.9.8.tar.gz


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/devel/preupgrade.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- preupgrade.spec	13 May 2008 19:23:55 -0000	1.4
+++ preupgrade.spec	18 Sep 2008 21:25:05 -0000	1.5
@@ -1,19 +1,27 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Preresolves dependencies and prepares a system for an upgrade
 Name: preupgrade
-Version: 0.9.3
-Release: 3%{?dist}
+Version: 0.9.8
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz
-Patch0: enable-f9.patch
-Patch1: retrieve-treeinfo-from-instrepo.patch
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: python >= 2.1, rpm-python, rpm >= 0:4.1.1
-Requires: yum-metadata-parser, yum >= 3.2.8
+Requires: pyxf86config
+# preupgrade-gui requires pygtk2 and libglade
+# FIXME: split out preupgrade-gtk subpackage that requires this
+Requires: pygtk2-libglade
+# F10 anaconda provides its special depsolving magic as yum plugins
+Requires: anaconda-yum-plugins
+# F10 anaconda expects to be handed a valid yum repo
+Requires: createrepo
+# yum 3.2.18 is needed to enable the above plugins at runtime
+Requires: yum-metadata-parser, yum >= 3.2.18
 Requires: usermode
+Requires: e2fsprogs
 Requires(post): mkinitrd
 BuildRequires: desktop-file-utils, python
 
@@ -23,8 +31,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0 
 
 %build
 # no op
@@ -57,11 +63,18 @@
 %{python_sitelib}/%{name}
 
 %changelog
-* Tue May 13 2008 Will Woods <wwoods at redhat.com> - 0.9.3-3
-- Fix hang on "Downloading installer metadata" (bug #446244)
+* Thu Sep 18 2008 Will Woods <wwoods at redhat.com> - 0.9.8-1
+- GUI version prompts to resume interrupted runs
+- Checks for available disk space before downloading / rebooting
+- Does not change boot target until you hit the Reboot button
+- Handle invalid treeinfo gracefully (bug #459935)
+- Use UUID=xxx for devices - makes finding devices much more robust
+- No more network dialog for missing packages
+- Use anaconda's own depsolving tweaks (whiteout/blacklist)
+- Use kickstart to automate installs
 
-* Tue May 13 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.9.3-2
-- enable F9 in releases.list
+* Tue May  6 2008 Will Woods <wwoods at redhat.com> - 0.9.3-2
+- Add missing Requires on pyxf86config
 
 * Fri May  2 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.9.3-1
 - 0.9.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 May 2008 15:42:10 -0000	1.4
+++ sources	18 Sep 2008 21:25:05 -0000	1.5
@@ -1 +1 @@
-f56fac6036bbe7827863e87b6c4a9007  preupgrade-0.9.3.tar.gz
+b6eb699b3a55b46fa98836086ad96880  preupgrade-0.9.8.tar.gz


--- enable-f9.patch DELETED ---


--- retrieve-treeinfo-from-instrepo.patch DELETED ---



From wwoods at fedoraproject.org  Thu Sep 18 21:27:21 2008
From: wwoods at fedoraproject.org (Will Woods)
Date: Thu, 18 Sep 2008 21:27:21 +0000 (UTC)
Subject: rpms/preupgrade/F-9 preupgrade.spec, 1.5, 1.6 sources, 1.4,
	1.5 enable-f9.patch, 1.1,
	NONE retrieve-treeinfo-from-instrepo.patch, 1.1, NONE
Message-ID: <20080918212721.70B9F700D9@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8170

Modified Files:
	preupgrade.spec sources 
Removed Files:
	enable-f9.patch retrieve-treeinfo-from-instrepo.patch 
Log Message:
0.9.8-1


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-9/preupgrade.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- preupgrade.spec	13 May 2008 18:39:24 -0000	1.5
+++ preupgrade.spec	18 Sep 2008 21:26:51 -0000	1.6
@@ -1,19 +1,27 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Preresolves dependencies and prepares a system for an upgrade
 Name: preupgrade
-Version: 0.9.3
-Release: 3%{?dist}
+Version: 0.9.8
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz
-Patch0: enable-f9.patch
-Patch1: retrieve-treeinfo-from-instrepo.patch
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: python >= 2.1, rpm-python, rpm >= 0:4.1.1
-Requires: yum-metadata-parser, yum >= 3.2.8
+Requires: pyxf86config
+# preupgrade-gui requires pygtk2 and libglade
+# FIXME: split out preupgrade-gtk subpackage that requires this
+Requires: pygtk2-libglade
+# F10 anaconda provides its special depsolving magic as yum plugins
+Requires: anaconda-yum-plugins
+# F10 anaconda expects to be handed a valid yum repo
+Requires: createrepo
+# yum 3.2.18 is needed to enable the above plugins at runtime
+Requires: yum-metadata-parser, yum >= 3.2.18
 Requires: usermode
+Requires: e2fsprogs
 Requires(post): mkinitrd
 BuildRequires: desktop-file-utils, python
 
@@ -23,8 +31,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0 
 
 %build
 # no op
@@ -57,11 +63,18 @@
 %{python_sitelib}/%{name}
 
 %changelog
-* Tue May 13 2008 Will Woods <wwoods at redhat.com> - 0.9.3-3
-- Fix hang on "Downloading installer metadata" (bug #446244)
+* Thu Sep 18 2008 Will Woods <wwoods at redhat.com> - 0.9.8-1
+- GUI version prompts to resume interrupted runs
+- Checks for available disk space before downloading / rebooting
+- Does not change boot target until you hit the Reboot button
+- Handle invalid treeinfo gracefully (bug #459935)
+- Use UUID=xxx for devices - makes finding devices much more robust
+- No more network dialog for missing packages
+- Use anaconda's own depsolving tweaks (whiteout/blacklist)
+- Use kickstart to automate installs
 
-* Tue May 13 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.9.3-2
-- enable F9 in releases.list
+* Tue May  6 2008 Will Woods <wwoods at redhat.com> - 0.9.3-2
+- Add missing Requires on pyxf86config
 
 * Fri May  2 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.9.3-1
 - 0.9.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 May 2008 15:37:12 -0000	1.4
+++ sources	18 Sep 2008 21:26:51 -0000	1.5
@@ -1 +1 @@
-f56fac6036bbe7827863e87b6c4a9007  preupgrade-0.9.3.tar.gz
+b6eb699b3a55b46fa98836086ad96880  preupgrade-0.9.8.tar.gz


--- enable-f9.patch DELETED ---


--- retrieve-treeinfo-from-instrepo.patch DELETED ---



From wwoods at fedoraproject.org  Thu Sep 18 21:28:19 2008
From: wwoods at fedoraproject.org (Will Woods)
Date: Thu, 18 Sep 2008 21:28:19 +0000 (UTC)
Subject: rpms/preupgrade/F-8 preupgrade.spec, 1.5, 1.6 sources, 1.4,
	1.5 enable-f9.patch, 1.1,
	NONE retrieve-treeinfo-from-instrepo.patch, 1.1, NONE
Message-ID: <20080918212819.BDF01700D9@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8296

Modified Files:
	preupgrade.spec sources 
Removed Files:
	enable-f9.patch retrieve-treeinfo-from-instrepo.patch 
Log Message:
0.9.8-1


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-8/preupgrade.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- preupgrade.spec	13 May 2008 18:43:13 -0000	1.5
+++ preupgrade.spec	18 Sep 2008 21:27:49 -0000	1.6
@@ -1,19 +1,27 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Preresolves dependencies and prepares a system for an upgrade
 Name: preupgrade
-Version: 0.9.3
-Release: 3%{?dist}
+Version: 0.9.8
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz
-Patch0: enable-f9.patch
-Patch1: retrieve-treeinfo-from-instrepo.patch
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: python >= 2.1, rpm-python, rpm >= 0:4.1.1
-Requires: yum-metadata-parser, yum >= 3.2.8
+Requires: pyxf86config
+# preupgrade-gui requires pygtk2 and libglade
+# FIXME: split out preupgrade-gtk subpackage that requires this
+Requires: pygtk2-libglade
+# F10 anaconda provides its special depsolving magic as yum plugins
+Requires: anaconda-yum-plugins
+# F10 anaconda expects to be handed a valid yum repo
+Requires: createrepo
+# yum 3.2.18 is needed to enable the above plugins at runtime
+Requires: yum-metadata-parser, yum >= 3.2.18
 Requires: usermode
+Requires: e2fsprogs
 Requires(post): mkinitrd
 BuildRequires: desktop-file-utils, python
 
@@ -23,8 +31,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0 
 
 %build
 # no op
@@ -57,11 +63,18 @@
 %{python_sitelib}/%{name}
 
 %changelog
-* Tue May 13 2008 Will Woods <wwoods at redhat.com> - 0.9.3-3
-- Fix hang on "Downloading installer metadata" (bug #446244)
+* Thu Sep 18 2008 Will Woods <wwoods at redhat.com> - 0.9.8-1
+- GUI version prompts to resume interrupted runs
+- Checks for available disk space before downloading / rebooting
+- Does not change boot target until you hit the Reboot button
+- Handle invalid treeinfo gracefully (bug #459935)
+- Use UUID=xxx for devices - makes finding devices much more robust
+- No more network dialog for missing packages
+- Use anaconda's own depsolving tweaks (whiteout/blacklist)
+- Use kickstart to automate installs
 
-* Tue May 13 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.9.3-2
-- enable F9 in releases.list
+* Tue May  6 2008 Will Woods <wwoods at redhat.com> - 0.9.3-2
+- Add missing Requires on pyxf86config
 
 * Fri May  2 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.9.3-1
 - 0.9.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 May 2008 15:19:12 -0000	1.4
+++ sources	18 Sep 2008 21:27:49 -0000	1.5
@@ -1 +1 @@
-f56fac6036bbe7827863e87b6c4a9007  preupgrade-0.9.3.tar.gz
+b6eb699b3a55b46fa98836086ad96880  preupgrade-0.9.8.tar.gz


--- enable-f9.patch DELETED ---


--- retrieve-treeinfo-from-instrepo.patch DELETED ---



From transif at fedoraproject.org  Thu Sep 18 22:32:11 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 18 Sep 2008 22:32:11 +0000 (UTC)
Subject: comps/po he.po,1.14,1.15
Message-ID: <20080918223211.225EB700D9@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15517/po

Modified Files:
	he.po 
Log Message:
    2008-09-18  Oron Peled <oron at actcom.co.il> (via oron at fedoraproject.org)
    
      * po/he.po: Update Hebrew translation (100% translated, killed all
fuzzies)
    



Index: he.po
===================================================================
RCS file: /cvs/pkgs/comps/po/he.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- he.po	17 Sep 2008 22:44:34 -0000	1.14
+++ he.po	18 Sep 2008 22:31:40 -0000	1.15
@@ -1,3 +1,4 @@
+# translation of comps.HEAD.po to Hebrew
 # Hebrew translations for comps package.
 # Copyright (C) 2008 THE comps's COPYRIGHT HOLDER
 # This file is distributed under the same license as the comps package.
@@ -6,21 +7,22 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: comps\n"
+"Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-03-28 22:03+0300\n"
+"POT-Creation-Date: 2008-09-18 19:28+0000\n"
+"PO-Revision-Date: 2008-09-19 01:28GMT\n"
 "Last-Translator: Oron Peled <oron at actcom.co.il>\n"
 "Language-Team: Hebrew\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr "?????????? ?????????????? ?????? ???????????? ???????? ???? ???? ???????????? ?????????? ?????? ??????????."
+msgstr "?????????? ?????????????? ?????? ???????????? ???????? ???? ???? ???????????? ?????????? ?????? ????????."
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
 #: ../comps-f10.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
@@ -80,7 +82,7 @@
 #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
 #: ../comps-f10.xml.in.h:13
 msgid "Basic support for the Ruby programming language."
-msgstr "?????????? ???????????? ???????? ???????????? \"????????\""
+msgstr "?????????? ???????????? ???????? ???????????? Ruby."
 
 #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
 #: ../comps-f10.xml.in.h:14
@@ -160,7 +162,7 @@
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30
 #: ../comps-f10.xml.in.h:30
 msgid "DNS Name Server"
-msgstr "?????? ???????? (DNS)."
+msgstr "?????? ???????? (DNS)"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31
 #: ../comps-f10.xml.in.h:31
@@ -185,7 +187,7 @@
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35
 #: ../comps-f10.xml.in.h:35
 msgid "Development Libraries"
-msgstr "?????????????? ??????????"
+msgstr "???????????? ??????????"
 
 #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36
 #: ../comps-f10.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12
@@ -327,7 +329,7 @@
 #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65
 #: ../comps-f10.xml.in.h:65 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25
 msgid "Graphical Internet"
-msgstr "???????????? ?????????????? ???? ???????? ????????"
+msgstr "???????????? ?????????????? ???? ???????? ????????"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66
 #: ../comps-f10.xml.in.h:66 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26
@@ -379,30 +381,28 @@
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
-msgstr "???????? ???????????? ?????? ???????? ???????? ???????????? ???????????? ???????? Gnome ??-GTK."
+msgstr "???????? ???????????? ?????? ???????? ???????? ?????????????? ???????????? ???????? Gnome ??-GTK."
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
 #: ../comps-f10.xml.in.h:79
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
-msgstr "???????? ???????????? ?????? ???????? ???????? ???????????? ???????????? ???????? XFCE ??-GTK."
+msgstr "???????? ???????????? ?????? ???????? ???????? ?????????????? ???????????? ???????? XFCE ??-GTK."
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
 #: ../comps-f10.xml.in.h:80 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
-msgstr "???????? ???????????? ?????? ???????? ???????? ???????????? ???????????? ???????? KDE ??-QT."
+msgstr "???????? ???????????? ?????? ???????? ???????? ?????????????? ???????????? ???????? KDE ??-QT."
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:81
-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:82 ../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
@@ -433,7 +433,7 @@
 #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86
 #: ../comps-f10.xml.in.h:89 ../comps-el4.xml.in.h:32
 msgid "Java Development"
-msgstr "?????????? ????Java"
+msgstr "?????????? ??-Java"
 
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
 #: ../comps-f10.xml.in.h:90 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33
@@ -492,7 +492,7 @@
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:99
 #: ../comps-f10.xml.in.h:104
 msgid "Legacy Software Development"
-msgstr "?????????? ???????????? ??????????"
+msgstr "?????????? ???????????? ??????????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:100
 #: ../comps-f10.xml.in.h:105
@@ -557,7 +557,7 @@
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:117
 #: ../comps-f10.xml.in.h:124 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
-msgstr "???????????? ??????????????"
+msgstr "?????????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:119
 #: ../comps-f10.xml.in.h:126
@@ -638,8 +638,7 @@
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
 #: ../comps-f10.xml.in.h:143 ../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:137
@@ -704,12 +703,12 @@
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:148
 #: ../comps-f10.xml.in.h:157 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
-msgstr "?????????? ???????????? ???????????? ???????? Java."
+msgstr "?????????? ???????????? ?????????? ???????? Java."
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:149
 #: ../comps-f10.xml.in.h:158 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
-msgstr "?????????? ?????????? ???????????? ?????????????? ???????? Java."
+msgstr "?????????? ?????????? ?????????? ???????????? ???????? Java."
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:150
 #: ../comps-f10.xml.in.h:159
@@ -744,7 +743,7 @@
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:156
 #: ../comps-f10.xml.in.h:166 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
-msgstr "???????????? ?????????????? ???? ???????? ????????"
+msgstr "???????????? ?????????????? ???? ???????? ????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:157
 #: ../comps-f10.xml.in.h:167
@@ -762,8 +761,7 @@
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
 #: ../comps-f10.xml.in.h:169
-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:160
@@ -773,20 +771,17 @@
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
 #: ../comps-f10.xml.in.h:171
-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:162
 #: ../comps-f10.xml.in.h:172 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
-msgstr "???????????? ?????? ???????????? ???????????? ?????????? ???? ?????? ?????? (Web)."
+msgid "These packages are helpful when developing web applications or web pages."
+msgstr "???????????? ?????? ???????????? ???????????? ???????????? ???? ?????? ?????? (Web)."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:163
 #: ../comps-f10.xml.in.h:173
-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:164
@@ -794,8 +789,7 @@
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
-msgstr ""
-"???????????? ?????? ???????????? ???????????? ?????? ???????? ???????????????????? ?????????????? ???????? telnet ????rsh."
+msgstr "???????????? ?????? ???????????? ???????????? ?????? ???????? ???????????????????? ?????????????? ???????? telnet ????rsh."
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165
 #: ../comps-f10.xml.in.h:175
@@ -850,7 +844,7 @@
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:173
 #: ../comps-f10.xml.in.h:183
 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:174
 #: ../comps-f10.xml.in.h:184
@@ -864,15 +858,14 @@
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:175
 #: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
-msgstr "?????????? ???????????? ???????? ???????????? ??????????, ?????????? ???????? ???????????? ??????????????."
+msgstr "?????????? ???????????? ???????? ???????? ???????? ???????? ??????????, ?????????? ???????? ???????????? ????????????."
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:176
 #: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
-msgstr ""
-"?????????? ???????????? ?????????? ???????????? ????????????, ?????????????? ????????????, ?????????? ?????????? ?????????? ????????????."
+msgstr "?????????? ???????????? ?????????? ???????????? ????????????, ?????????????? ????????????, ?????????? ?????????? ?????????? ????????????."
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:177
 #: ../comps-f10.xml.in.h:187 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
@@ -885,7 +878,7 @@
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
 msgstr ""
-"?????????? ???? ?????????? ???????????? ?????????????? ???????? ??????????, ?????????? ???????????????? ???????????? ??????????????. "
+"?????????? ???? ?????????? ?????????????? ???????????? ???????? ??????????, ?????????? ???????????????? ???????????? ????????????. "
 "???????????? ?????? ???????? ???????????? ???? ?????????? ???????????????? X."
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:179
@@ -897,14 +890,12 @@
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
 #: ../comps-f10.xml.in.h:190 ../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:181
 #: ../comps-f10.xml.in.h:191 ../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:182
@@ -918,8 +909,7 @@
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
 #: ../comps-f10.xml.in.h:193
-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 "?????????? ???????????? ???? ???????????? ???? ?????????? ???? BIND, ?????? ???????? (DNS) ???? ?????? ????????????."
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:184
@@ -954,7 +944,7 @@
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:189
 #: ../comps-f10.xml.in.h:199 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
-msgstr "???????? ?????????????? ?????? ???????? ?????????? ???????????? ???? Fedora."
+msgstr "???????? ?????????????? ?????? ???????? ?????????? ???????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:190
 #: ../comps-f10.xml.in.h:200
@@ -1004,17 +994,17 @@
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:199
 #: ../comps-f10.xml.in.h:210
 msgid "Virtualization"
-msgstr "???????????? (????????????????????????)"
+msgstr "?????????? (????????????????????????)"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:201
 #: ../comps-f10.xml.in.h:212 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
-msgstr "?????????? Web."
+msgstr "?????????? Web"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:202
 #: ../comps-f10.xml.in.h:213 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
-msgstr "?????? Web."
+msgstr "?????? Web"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:203
 #: ../comps-f10.xml.in.h:214
@@ -1063,7 +1053,7 @@
 
 #: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21
 msgid "Buildsystem building group"
-msgstr "?????????? ???????????? ?????????? ?????????? ?????????? ??????????."
+msgstr "?????????? ???????????? ?????????? ?????????? ?????????? ??????????"
 
 #: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49
 msgid "Fedora Eclipse"
@@ -1102,91 +1092,76 @@
 msgstr "???????????? ???????????? ?????????? ???????????? ???????????????? ???????? ????????????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44
-#, fuzzy
 msgid "Esperanto Support"
-msgstr "?????????? ??????????????"
+msgstr "?????????? ????????????????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95
-#, fuzzy
 msgid "Kashubian Support"
-msgstr "?????????? ??????????????"
+msgstr "?????????? ????????????????????"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:108
-#, fuzzy
 msgid "Macedonian Support"
-msgstr "?????????? ??????????????????"
+msgstr "?????????? ????????????????"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:121
-#, fuzzy
 msgid "Northern Sami Support"
-msgstr "?????????? ????Northern Sotho (???????? ????????????)"
+msgstr "?????????? ??-Northern Sami (??????????)"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:137
-#, fuzzy
 msgid "SUGAR Desktop Environment"
-msgstr "???????????? ?????????? ????????????"
+msgstr "?????????? ?????????? ???????????? SUGAR"
 
 #: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:138
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
-msgstr ""
+msgstr "?????????? ?????????? ???????????? SUGAR ?????????? ???????? ???????????? OLPC."
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:211
-#, fuzzy
 msgid "Walloon Support"
-msgstr "?????????? ????????"
+msgstr "?????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:70
-#, fuzzy
 msgid "Haskell Development"
-msgstr "?????????? Web."
+msgstr "?????????? ???????? Haskell"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
-msgstr ""
+msgstr "?????????? ??????"
 
 #: ../comps-f10.xml.in.h:77
 msgid "Input method packages for the input of international text."
-msgstr ""
+msgstr "???????????? ???? ?????????? ?????? ???????????????? ?????????? ?????? ???? ???????? ?????????? ????????."
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "?????????? ????'????"
+msgstr "?????????? ????????????????"
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "?????????? ??????????????????"
+msgstr "?????????? ??-Konkani (????????)"
 
 #: ../comps-f10.xml.in.h:110
-#, fuzzy
 msgid "Maithili Support"
-msgstr "?????????? ????Marathi (????????)"
+msgstr "?????????? ??-Maithili (????????)"
 
 #: ../comps-f10.xml.in.h:117
-#, fuzzy
 msgid "Myanmar (Burmese) Support"
-msgstr "?????????? ????????????????????"
+msgstr "?????????? ??-Myanmar (??????????????)"
 
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "?????????? ??????????????"
+msgstr "?????????? ??-Sindhi (????????????)"
 
 #: ../comps-f10.xml.in.h:156
-#, fuzzy
 msgid "Support for developing programs in the Haskell programming language."
-msgstr "?????????? ???????????? ???????????? ???????? Java."
+msgstr "?????????? ???????????? ?????????? ???????? Haskell."
 
 #: ../comps-f10.xml.in.h:163
-#, fuzzy
 msgid "Tajik Support"
-msgstr "?????????? ??????????????????"
+msgstr "?????????? ????????'????????"
 
 #: ../comps-f10.xml.in.h:205
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "?????????? ????'??????"
+msgstr "?????????? ????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1201,7 +1176,7 @@
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
 msgstr ""
-"?????????? GNOME ?????????? ???????? ?????????? ???????? ????-?????????? ?????????? ??????, ?????????? ??????????, ???????????? "
+"?????????? GNOME ?????????? ???????? ?????????? ???????? ????-???????? ?????????? ??????, ?????????? ??????????, ???????????? "
 "?????????? ?????????? ?????????? ????????."
 
 #: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
@@ -1209,7 +1184,7 @@
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
 msgstr ""
-"?????????? KDE ?????????? ???????? ?????????? ???????? ????-?????????? ?????????? ??????, ?????????? ??????????, ???????????? "
+"?????????? KDE ?????????? ???????? ?????????? ???????? ????-???????? ?????????? ??????, ?????????? ??????????, ???????????? "
 "?????????? ?????????? ?????????? ????????."
 
 #: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
@@ -1222,7 +1197,7 @@
 
 #: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
 msgid "The XEmacs text editor."
-msgstr "???????? ?????????? XEmacs"
+msgstr "???????? ?????????? XEmacs."
 
 #: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
 msgid ""
@@ -1234,21 +1209,18 @@
 
 #: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
 msgid "This group is a collection of network servers for specific purposes"
-msgstr "???????? ???????? ?????? ?????????????? ??????????????."
+msgstr "???????? ???????? ?????? ?????????????? ????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+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
@@ -1256,8 +1228,7 @@
 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 "???? ???????? ???????? ?????????????? ???????????? ?????????? ??'??????."
 
 #, fuzzy
@@ -1293,3 +1264,4 @@
 #, fuzzy
 #~ msgid "Virtualization Support."
 #~ msgstr "???????????? (????????????????????????)"
+



From wwoods at fedoraproject.org  Thu Sep 18 22:53:24 2008
From: wwoods at fedoraproject.org (Will Woods)
Date: Thu, 18 Sep 2008 22:53:24 +0000 (UTC)
Subject: rpms/python-bugzilla/devel .cvsignore, 1.3, 1.4 python-bugzilla.spec,
	1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20080918225324.CD754700D9@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/python-bugzilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17907

Modified Files:
	.cvsignore python-bugzilla.spec sources 
Log Message:
python-bugzilla-0.4-rc2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Sep 2008 21:51:10 -0000	1.3
+++ .cvsignore	18 Sep 2008 22:52:54 -0000	1.4
@@ -1 +1 @@
-python-bugzilla-0.4-rc1.tar.bz2
+python-bugzilla-0.4-rc2.tar.bz2


Index: python-bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/devel/python-bugzilla.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-bugzilla.spec	4 Sep 2008 21:51:10 -0000	1.4
+++ python-bugzilla.spec	18 Sep 2008 22:52:54 -0000	1.5
@@ -2,13 +2,13 @@
 
 Name:           python-bugzilla
 Version:        0.4
-Release:        0.rc1%{?dist}
+Release:        0.rc2%{?dist}
 Summary:        A python library for interacting with Bugzilla
 
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://fedorahosted.org/python-bugzilla
-Source0:        python-bugzilla-0.4-rc1.tar.bz2
+Source0:        python-bugzilla-0.4-rc2.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -25,7 +25,7 @@
 interacting with bugzilla from shell scripts.
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q -n %{name}-%{version}-rc2
 
 
 %build
@@ -50,6 +50,10 @@
 
 
 %changelog
+* Thu Sep 18 2008 Will Woods <wwoods at redhat.com> 0.4-0.rc2
+- Auto-generated man page with much more info
+- Fix _attachfile()
+
 * Thu Sep  4 2008 Will Woods <wwoods at redhat.com> 0.4-0.rc1
 - Update to python-bugzilla 0.4-rc1
 - We now support upstream Bugzilla 3.x and Red Hat's Bugzilla 3.x instance


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Sep 2008 21:51:10 -0000	1.4
+++ sources	18 Sep 2008 22:52:54 -0000	1.5
@@ -1 +1 @@
-45d993640c1a73c1e52b9fd40d53f86e  python-bugzilla-0.4-rc1.tar.bz2
+c563f6d9b528a83348ed543239cf1a55  python-bugzilla-0.4-rc2.tar.bz2



From airlied at fedoraproject.org  Thu Sep 18 23:32:42 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 18 Sep 2008 23:32:42 +0000 (UTC)
Subject: rpms/kernel/devel drm-modesetting-radeon.patch, 1.27,
	1.28 kernel.spec, 
	1.957, 1.958 drm-add-more-drm-error-msg.patch, 1.1,
	NONE drm-allow-r300-dst-pipe-config.patch, 1.1,
	NONE drm-fix-pll-computation-precedence.patch, 1.2, NONE
Message-ID: <20080918233242.69946700D9@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20091

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Removed Files:
	drm-add-more-drm-error-msg.patch 
	drm-allow-r300-dst-pipe-config.patch 
	drm-fix-pll-computation-precedence.patch 
Log Message:
* Thu Sep 18 2008 Dave Airlie <airlied at redhat.com>
- Merge krh's patches + new patches from AMD


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- drm-modesetting-radeon.patch	18 Sep 2008 00:36:24 -0000	1.27
+++ drm-modesetting-radeon.patch	18 Sep 2008 23:32:41 -0000	1.28
@@ -1,3 +1,33 @@
+commit 6a804321a2b1220143a64a3a78d72b03770fd285
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Fri Sep 19 09:17:36 2008 +1000
+
+    radeon: port Alexs patches from modesetting-gem
+
+commit 757bdeefa398c5b856d6321e3622436c676d04a5
+Author: Kristian H??gsberg <krh at redhat.com>
+Date:   Thu Sep 18 16:10:29 2008 -0400
+
+    radeon: Add DRM_ERROR() messages to all EINVAL exits from DRM_RADEON_CS.
+    
+    Shouldn't trigger under normal use and when something breaks, it will
+    be easier to debug.
+
+commit 90f000493d3f8ea7338756e06fd644e0dcf0aff6
+Author: Kristian H??gsberg <krh at redhat.com>
+Date:   Thu Sep 18 16:07:50 2008 -0400
+
+    Allow R300_DST_PIPE_CONFIG for R420 and up.
+    
+    The X server emits writes to R300_DST_PIPE_CONFIG for R420 chipsets during
+    accel init.
+
+commit af13076bbaad40f3553346a366b25942483f54fb
+Author: Kristian H??gsberg <krh at redhat.com>
+Date:   Thu Sep 18 14:53:46 2008 -0400
+
+    radeon kms: Get precedence right when computing PLL values.
+
 commit 41b33ad8bfd879c37f72e560e0b1e1b57f537093
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Sep 18 09:55:14 2008 +1000
@@ -27158,10 +27188,10 @@
 +#endif /* _ATOMBIOS_H */
 diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
 new file mode 100644
-index 0000000..a618132
+index 0000000..aafd4c2
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/atombios_crtc.c
-@@ -0,0 +1,381 @@
+@@ -0,0 +1,400 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -27314,8 +27344,7 @@
 +	atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&conv_param);
 +}
 +
-+void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode,
-+			   int pll_flags)
++void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
 +{
 +	struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
 +	struct drm_device *dev = crtc->dev;
@@ -27327,13 +27356,26 @@
 +	PIXEL_CLOCK_PARAMETERS_V3 *spc3_ptr;
 +	uint32_t sclock = mode->clock;
 +	uint32_t ref_div = 0, fb_div = 0, post_div = 0;
++	struct radeon_pll *pll;
++	int pll_flags = 0;
 +
 +	memset(&spc_param, 0, sizeof(SET_PIXEL_CLOCK_PS_ALLOCATION));
 +
-+	pll_flags |= RADEON_PLL_PREFER_LOW_REF_DIV;
++	if (!radeon_is_avivo(dev_priv))
++		pll_flags |= RADEON_PLL_LEGACY;
++
++	if (mode->clock > 120000) /* range limits??? */
++		pll_flags |= RADEON_PLL_PREFER_HIGH_FB_DIV;
++	else
++		pll_flags |= RADEON_PLL_PREFER_LOW_REF_DIV;
++
++	if (radeon_crtc->crtc_id == 0)
++		pll = &dev_priv->mode_info.p1pll;
++	else
++		pll = &dev_priv->mode_info.p2pll;
 +
-+	radeon_compute_pll(&dev_priv->mode_info.pll, mode->clock,
-+			   &sclock, &fb_div, &ref_div, &post_div, pll_flags);
++	radeon_compute_pll(pll, mode->clock, &sclock,
++			   &fb_div, &ref_div, &post_div, pll_flags);
 +
 +	if (radeon_is_avivo(dev_priv)) {
 +		uint32_t ss_cntl;
@@ -27450,6 +27492,12 @@
 +	RADEON_WRITE(AVIVO_D1MODE_VIEWPORT_SIZE + radeon_crtc->crtc_offset,
 +		     (crtc->mode.hdisplay << 16) | crtc->mode.vdisplay);
 +
++	if (crtc->mode.flags & DRM_MODE_FLAG_INTERLACE)
++		RADEON_WRITE(AVIVO_D1MODE_DATA_FORMAT + radeon_crtc->crtc_offset,
++			     AVIVO_D1MODE_INTERLEAVE_EN);
++	else
++		RADEON_WRITE(AVIVO_D1MODE_DATA_FORMAT + radeon_crtc->crtc_offset,
++			     0);
 +}
 +
 +void atombios_crtc_mode_set(struct drm_crtc *crtc,
@@ -27462,7 +27510,6 @@
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
 +	struct drm_encoder *encoder;
 +	SET_CRTC_TIMING_PARAMETERS_PS_ALLOCATION crtc_timing;
-+	int pll_flags = 0;
 +	/* TODO color tiling */
 +
 +	memset(&crtc_timing, 0, sizeof(crtc_timing));
@@ -27499,12 +27546,14 @@
 +	if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
 +		crtc_timing.susModeMiscInfo.usAccess |= ATOM_DOUBLE_CLOCK_MODE;
 +
-+	atombios_crtc_set_pll(crtc, adjusted_mode, pll_flags);
-+
-+	atombios_crtc_set_timing(crtc, &crtc_timing);
-+
 +	if (radeon_is_avivo(dev_priv))
 +		atombios_crtc_set_base(crtc, x, y);
++ 	else
++ 		radeon_crtc_set_base(crtc, x, y);
++
++	atombios_crtc_set_pll(crtc, adjusted_mode);
++
++	atombios_crtc_set_timing(crtc, &crtc_timing);
 +}
 +
 +static bool atombios_crtc_mode_fixup(struct drm_crtc *crtc,
@@ -27544,7 +27593,7 @@
 +	drm_crtc_helper_add(&radeon_crtc->base, &atombios_helper_funcs);
 +}
 diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c
-index 4b27d9a..cd6db70 100644
+index 4b27d9a..422554e 100644
 --- a/drivers/gpu/drm/radeon/r300_cmdbuf.c
 +++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c
 @@ -166,8 +166,6 @@ void r300_init_reg_flags(struct drm_device *dev)
@@ -27597,7 +27646,7 @@
  	ADD_RANGE(R300_VAP_INPUT_ROUTE_1_0, 8);
  
 +	ADD_RANGE(R500_SU_REG_DEST, 1);
-+	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV410) {
++	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R420) {
 +		ADD_RANGE(R300_DST_PIPE_CONFIG, 1);
 +	}
 +
@@ -28030,10 +28079,10 @@
  
 diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
 new file mode 100644
-index 0000000..4d98cba
+index 0000000..2848487
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_atombios.c
-@@ -0,0 +1,453 @@
+@@ -0,0 +1,528 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -28073,7 +28122,7 @@
 +  struct _ATOM_SUPPORTED_DEVICES_INFO_2d1 info_2d1;
 +};
 +
-+static inline struct radeon_i2c_bus_rec radeon_lookup_gpio_for_ddc(struct drm_device *dev, uint8_t id)
++static inline struct radeon_i2c_bus_rec radeon_lookup_gpio(struct drm_device *dev, uint8_t id)
 +{
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
 +	struct atom_context *ctx = dev_priv->mode_info.atom_context;
@@ -28196,13 +28245,13 @@
 +			 (dev_priv->chip_family == CHIP_RS740)) {
 +			if ((i == ATOM_DEVICE_DFP2_INDEX) || (i == ATOM_DEVICE_DFP3_INDEX))
 +				mode_info->bios_connector[i].ddc_i2c =
-+					radeon_lookup_gpio_for_ddc(dev, ci.sucI2cId.sbfAccess.bfI2C_LineMux + 1);
++					radeon_lookup_gpio(dev, ci.sucI2cId.sbfAccess.bfI2C_LineMux + 1);
 +			else
 +				mode_info->bios_connector[i].ddc_i2c =
-+					radeon_lookup_gpio_for_ddc(dev, ci.sucI2cId.sbfAccess.bfI2C_LineMux);
++					radeon_lookup_gpio(dev, ci.sucI2cId.sbfAccess.bfI2C_LineMux);
 +		} else
 +			mode_info->bios_connector[i].ddc_i2c =
-+				radeon_lookup_gpio_for_ddc(dev, ci.sucI2cId.sbfAccess.bfI2C_LineMux);
++				radeon_lookup_gpio(dev, ci.sucI2cId.sbfAccess.bfI2C_LineMux);
 +
 +		if (i == ATOM_DEVICE_DFP1_INDEX)
 +			mode_info->bios_connector[i].tmds_type = TMDS_INT;
@@ -28313,32 +28362,79 @@
 +	int index = GetIndexIntoMasterTable(DATA, FirmwareInfo);
 +	union firmware_info *firmware_info;
 +	uint8_t frev, crev;
-+	struct radeon_pll *pll = &mode_info->pll;
++	struct radeon_pll *p1pll = &mode_info->p1pll;
++	struct radeon_pll *p2pll = &mode_info->p2pll;
++	struct radeon_pll *spll = &mode_info->spll;
++	struct radeon_pll *mpll = &mode_info->mpll;
 +	uint16_t data_offset;
 +
 +	atom_parse_data_header(mode_info->atom_context, index, NULL, &frev, &crev, &data_offset);
 +
 +	firmware_info = (union firmware_info *)(mode_info->atom_context->bios + data_offset);
 +
-+	pll->reference_freq = le16_to_cpu(firmware_info->info.usReferenceClock);
-+	pll->reference_div = 0;
++	if (firmware_info) {
++		/* pixel clocks */
++		p1pll->reference_freq = le16_to_cpu(firmware_info->info.usReferenceClock);
++		p1pll->reference_div = 0;
 +
-+	pll->pll_out_min = le16_to_cpu(firmware_info->info.usMinPixelClockPLL_Output);
-+	pll->pll_out_max = le32_to_cpu(firmware_info->info.ulMaxPixelClockPLL_Output);
++		p1pll->pll_out_min = le16_to_cpu(firmware_info->info.usMinPixelClockPLL_Output);
++		p1pll->pll_out_max = le32_to_cpu(firmware_info->info.ulMaxPixelClockPLL_Output);
 +
-+	if (pll->pll_out_min == 0) {
-+		if (radeon_is_avivo(dev_priv))
-+			pll->pll_out_min = 64800;
-+		else
-+			pll->pll_out_min = 20000;
-+	}
++		if (p1pll->pll_out_min == 0) {
++			if (radeon_is_avivo(dev_priv))
++				p1pll->pll_out_min = 64800;
++			else
++				p1pll->pll_out_min = 20000;
++		}
 +
-+	pll->pll_in_min = le16_to_cpu(firmware_info->info.usMinPixelClockPLL_Input);
-+	pll->pll_in_max = le16_to_cpu(firmware_info->info.usMaxPixelClockPLL_Input);
++		p1pll->pll_in_min = le16_to_cpu(firmware_info->info.usMinPixelClockPLL_Input);
++		p1pll->pll_in_max = le16_to_cpu(firmware_info->info.usMaxPixelClockPLL_Input);
 +
-+	pll->xclk = le16_to_cpu(firmware_info->info.usMaxPixelClock);
++		*p2pll = *p1pll;
 +
-+	return true;
++		/* system clock */
++		spll->reference_freq = le16_to_cpu(firmware_info->info.usReferenceClock);
++		spll->reference_div = 0;
++
++		spll->pll_out_min = le16_to_cpu(firmware_info->info.usMinEngineClockPLL_Output);
++		spll->pll_out_max = le32_to_cpu(firmware_info->info.ulMaxEngineClockPLL_Output);
++
++		/* ??? */
++		if (spll->pll_out_min == 0) {
++			if (radeon_is_avivo(dev_priv))
++				spll->pll_out_min = 64800;
++			else
++				spll->pll_out_min = 20000;
++		}
++
++		spll->pll_in_min = le16_to_cpu(firmware_info->info.usMinEngineClockPLL_Input);
++		spll->pll_in_max = le16_to_cpu(firmware_info->info.usMaxEngineClockPLL_Input);
++
++
++		/* memory clock */
++		mpll->reference_freq = le16_to_cpu(firmware_info->info.usReferenceClock);
++		mpll->reference_div = 0;
++
++		mpll->pll_out_min = le16_to_cpu(firmware_info->info.usMinMemoryClockPLL_Output);
++		mpll->pll_out_max = le32_to_cpu(firmware_info->info.ulMaxMemoryClockPLL_Output);
++
++		/* ??? */
++		if (mpll->pll_out_min == 0) {
++			if (radeon_is_avivo(dev_priv))
++				mpll->pll_out_min = 64800;
++			else
++				mpll->pll_out_min = 20000;
++		}
++
++		mpll->pll_in_min = le16_to_cpu(firmware_info->info.usMinMemoryClockPLL_Input);
++		mpll->pll_in_max = le16_to_cpu(firmware_info->info.usMaxMemoryClockPLL_Input);
++
++		mode_info->sclk = le32_to_cpu(firmware_info->info.ulDefaultEngineClock);
++		mode_info->mclk = le32_to_cpu(firmware_info->info.ulDefaultMemoryClock);
++
++		return true;
++	}
++	return false;
 +}
 +
 +
@@ -28362,11 +28458,11 @@
 +	for (i = 0; i < 4; i++) {
 +		encoder->tmds_pll[i].freq = le16_to_cpu(tmds_info->asMiscInfo[i].usFrequency);
 +		encoder->tmds_pll[i].value = tmds_info->asMiscInfo[i].ucPLL_ChargePump & 0x3f;
-+		encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_VCO_Gain & 0x3f << 6);
-+		encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_DutyCycle & 0xf << 12);
-+		encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_VoltageSwing & 0xf << 16);
++		encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_VCO_Gain & 0x3f) << 6;
++		encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_DutyCycle & 0xf) << 12;
++		encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_VoltageSwing & 0xf) << 16;
 +
-+		DRM_DEBUG("TMDS PLL From BIOS %u %x\n",
++		DRM_DEBUG("TMDS PLL From ATOMBIOS %u %x\n",
 +			  encoder->tmds_pll[i].freq,
 +			   encoder->tmds_pll[i].value);
 +
@@ -28396,17 +28492,19 @@
 +
 +	lvds_info = (union lvds_info *)(mode_info->atom_context->bios + data_offset);
 +
-+	encoder->dotclock = le16_to_cpu(lvds_info->info.sLCDTiming.usPixClk) * 10;
-+	encoder->panel_xres = le16_to_cpu(lvds_info->info.sLCDTiming.usHActive);
-+	encoder->panel_yres = le16_to_cpu(lvds_info->info.sLCDTiming.usVActive);
-+	encoder->hblank = le16_to_cpu(lvds_info->info.sLCDTiming.usHBlanking_Time);
-+	encoder->hoverplus = le16_to_cpu(lvds_info->info.sLCDTiming.usHSyncOffset);
-+	encoder->hsync_width = le16_to_cpu(lvds_info->info.sLCDTiming.usHSyncWidth);
-+
-+	encoder->vblank = le16_to_cpu(lvds_info->info.sLCDTiming.usVBlanking_Time);
-+	encoder->voverplus = le16_to_cpu(lvds_info->info.sLCDTiming.usVSyncOffset);
-+	encoder->vsync_width = le16_to_cpu(lvds_info->info.sLCDTiming.usVSyncWidth);
-+	encoder->panel_pwr_delay = le16_to_cpu(lvds_info->info.usOffDelayInMs);
++	if (lvds_info) {
++		encoder->dotclock = le16_to_cpu(lvds_info->info.sLCDTiming.usPixClk) * 10;
++		encoder->panel_xres = le16_to_cpu(lvds_info->info.sLCDTiming.usHActive);
++		encoder->panel_yres = le16_to_cpu(lvds_info->info.sLCDTiming.usVActive);
++		encoder->hblank = le16_to_cpu(lvds_info->info.sLCDTiming.usHBlanking_Time);
++		encoder->hoverplus = le16_to_cpu(lvds_info->info.sLCDTiming.usHSyncOffset);
++		encoder->hsync_width = le16_to_cpu(lvds_info->info.sLCDTiming.usHSyncWidth);
++
++		encoder->vblank = le16_to_cpu(lvds_info->info.sLCDTiming.usVBlanking_Time);
++		encoder->voverplus = le16_to_cpu(lvds_info->info.sLCDTiming.usVSyncOffset);
++		encoder->vsync_width = le16_to_cpu(lvds_info->info.sLCDTiming.usVSyncWidth);
++		encoder->panel_pwr_delay = le16_to_cpu(lvds_info->info.usOffDelayInMs);
++	}
 +}
 +
 +void radeon_atom_dyn_clk_setup(struct drm_device *dev, int enable)
@@ -28435,6 +28533,32 @@
 +	atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args);
 +}
 +
++void radeon_atom_set_engine_clock(struct drm_device *dev, int eng_clock)
++{
++	struct drm_radeon_private *dev_priv = dev->dev_private;
++	struct radeon_mode_info *mode_info = &dev_priv->mode_info;
++	struct atom_context *ctx = mode_info->atom_context;
++	SET_ENGINE_CLOCK_PS_ALLOCATION args;
++	int index = GetIndexIntoMasterTable(COMMAND, SetEngineClock);
++
++	args.ulTargetEngineClock = eng_clock; /* 10 khz */
++
++	atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args);
++}
++
++void radeon_atom_set_memory_clock(struct drm_device *dev, int mem_clock)
++{
++	struct drm_radeon_private *dev_priv = dev->dev_private;
++	struct radeon_mode_info *mode_info = &dev_priv->mode_info;
++	struct atom_context *ctx = mode_info->atom_context;
++	SET_MEMORY_CLOCK_PS_ALLOCATION args;
++	int index = GetIndexIntoMasterTable(COMMAND, SetMemoryClock);
++
++	args.ulTargetMemoryClock = mem_clock; /* 10 khz */
++
++	atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args);
++}
++
 +void radeon_atom_initialize_bios_scratch_regs(struct drm_device *dev)
 +{
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
@@ -28936,10 +29060,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
 new file mode 100644
-index 0000000..3219b99
+index 0000000..19f274c
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_combios.c
-@@ -0,0 +1,1359 @@
+@@ -0,0 +1,1404 @@
 +/*
 + * Copyright 2004 ATI Technologies Inc., Markham, Ontario
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
@@ -29015,7 +29139,7 @@
 +	COMBIOS_ASIC_INIT_4_TABLE,	/* offset from misc info */
 +	COMBIOS_ASIC_INIT_5_TABLE,	/* offset from misc info */
 +	COMBIOS_RAM_RESET_TABLE,	/* offset from mem config */
-+	COMBIOS_POWERPLAY_TABLE,	/* offset from mobile info */
++	COMBIOS_POWERPLAY_INFO_TABLE,	/* offset from mobile info */
 +	COMBIOS_GPIO_INFO_TABLE,	/* offset from mobile info */
 +	COMBIOS_LCD_DDC_INFO_TABLE,	/* offset from mobile info */
 +	COMBIOS_TMDS_POWER_TABLE,	/* offset from mobile info */
@@ -29267,7 +29391,7 @@
 +				offset = check_offset;
 +		}
 +		break;
-+	case COMBIOS_POWERPLAY_TABLE:	/* offset from mobile info */
++	case COMBIOS_POWERPLAY_INFO_TABLE:	/* offset from mobile info */
 +		check_offset = combios_get_table_offset(dev, COMBIOS_MOBILE_INFO_TABLE);
 +		if (check_offset) {
 +			check_offset = radeon_bios16(dev_priv, check_offset + 0x11);
@@ -29369,33 +29493,72 @@
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
 +	struct radeon_mode_info *mode_info = &dev_priv->mode_info;
 +	uint16_t pll_info;
-+	struct radeon_pll *pll = &mode_info->pll;
++	struct radeon_pll *p1pll = &mode_info->p1pll;
++	struct radeon_pll *p2pll = &mode_info->p2pll;
++	struct radeon_pll *spll = &mode_info->spll;
++	struct radeon_pll *mpll = &mode_info->mpll;
 +	int8_t rev;
++	uint16_t sclk, mclk;
 +
 +	pll_info = combios_get_table_offset(dev, COMBIOS_PLL_INFO_TABLE);
 +	if (pll_info) {
 +		rev = radeon_bios8(dev_priv, pll_info);
 +
-+		pll->reference_freq = radeon_bios16(dev_priv, pll_info + 0xe);
-+		pll->reference_div = radeon_bios16(dev_priv, pll_info + 0x10);
-+		pll->pll_out_min = radeon_bios32(dev_priv, pll_info + 0x12);
-+		pll->pll_out_max = radeon_bios32(dev_priv, pll_info + 0x16);
++		/* pixel clocks */
++		p1pll->reference_freq = radeon_bios16(dev_priv, pll_info + 0xe);
++		p1pll->reference_div = radeon_bios16(dev_priv, pll_info + 0x10);
++		p1pll->pll_out_min = radeon_bios32(dev_priv, pll_info + 0x12);
++		p1pll->pll_out_max = radeon_bios32(dev_priv, pll_info + 0x16);
 +
 +		if (rev > 9) {
-+			pll->pll_in_min = radeon_bios32(dev_priv, pll_info + 0x36);
-+			pll->pll_in_max = radeon_bios32(dev_priv, pll_info + 0x3a);
++			p1pll->pll_in_min = radeon_bios32(dev_priv, pll_info + 0x36);
++			p1pll->pll_in_max = radeon_bios32(dev_priv, pll_info + 0x3a);
 +		} else {
-+			pll->pll_in_min = 40;
-+			pll->pll_in_max = 500;
++			p1pll->pll_in_min = 40;
++			p1pll->pll_in_max = 500;
 +		}
++		*p2pll = *p1pll;
 +
-+		pll->xclk = radeon_bios16(dev_priv, pll_info + 0x08);
++		/* system clock */
++		spll->reference_freq = radeon_bios16(dev_priv, pll_info + 0x1a);
++		spll->reference_div = radeon_bios16(dev_priv, pll_info + 0x1c);
++		spll->pll_out_min = radeon_bios32(dev_priv, pll_info + 0x1e);
++		spll->pll_out_max = radeon_bios32(dev_priv, pll_info + 0x22);
++
++		if (rev > 10) {
++			spll->pll_in_min = radeon_bios32(dev_priv, pll_info + 0x48);
++			spll->pll_in_max = radeon_bios32(dev_priv, pll_info + 0x4c);
++		} else {
++			/* ??? */
++			spll->pll_in_min = 40;
++			spll->pll_in_max = 500;
++		}
++
++		/* memory clock */
++		mpll->reference_freq = radeon_bios16(dev_priv, pll_info + 0x26);
++		mpll->reference_div = radeon_bios16(dev_priv, pll_info + 0x28);
++		mpll->pll_out_min = radeon_bios32(dev_priv, pll_info + 0x2a);
++		mpll->pll_out_max = radeon_bios32(dev_priv, pll_info + 0x2e);
++
++		if (rev > 10) {
++			mpll->pll_in_min = radeon_bios32(dev_priv, pll_info + 0x5a);
++			mpll->pll_in_max = radeon_bios32(dev_priv, pll_info + 0x5e);
++		} else {
++			/* ??? */
++			mpll->pll_in_min = 40;
++			mpll->pll_in_max = 500;
++		}
 +
-+		// sclk/mclk use fixed point
-+		//sclk = radeon_bios16(pll_info + 8) / 100.0;
-+		//mclk = radeon_bios16(pll_info + 10) / 100.0;
-+		//if (sclk == 0) sclk = 200;
-+		//if (mclk == 0) mclk = 200;
++		/* default sclk/mclk */
++		sclk = radeon_bios16(dev_priv, pll_info + 0x8);
++		mclk = radeon_bios16(dev_priv, pll_info + 0xa);
++		if (sclk == 0)
++			sclk = 200;
++		if (mclk == 0)
++			mclk = 200;
++
++		mode_info->sclk = sclk;
++		mode_info->mclk = mclk;
 +
 +		return true;
 +	}
@@ -29686,6 +29849,9 @@
 +			for (i = 0; i < n; i++) {
 +				encoder->tmds_pll[i].value = radeon_bios32(dev_priv, tmds_info + i * 10 + 0x08);
 +				encoder->tmds_pll[i].freq = radeon_bios16(dev_priv, tmds_info + i * 10 + 0x10);
++				DRM_DEBUG("TMDS PLL From COMBIOS %u %x\n",
++					  encoder->tmds_pll[i].freq,
++					  encoder->tmds_pll[i].value);
 +			}
 +			return true;
 +		} else if (ver == 4) {
@@ -29700,6 +29866,9 @@
 +					stride += 10;
 +				else
 +					stride += 6;
++				DRM_DEBUG("TMDS PLL From COMBIOS %u %x\n",
++					  encoder->tmds_pll[i].freq,
++					  encoder->tmds_pll[i].value);
 +			}
 +			return true;
 +		}
@@ -30673,7 +30842,7 @@
 +	return NULL;
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
-index 248ab4a..7870d0f 100644
+index 248ab4a..202ba8b 100644
 --- a/drivers/gpu/drm/radeon/radeon_cp.c
 +++ b/drivers/gpu/drm/radeon/radeon_cp.c
 @@ -31,6 +31,7 @@
@@ -30754,7 +30923,7 @@
  {
  	if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV515)
  		R500_WRITE_MCIND(RV515_MC_AGP_LOCATION, agp_loc);
-@@ -138,12 +182,57 @@ static void radeon_write_agp_base(drm_radeon_private_t *dev_priv, u64 agp_base)
+@@ -138,20 +182,98 @@ static void radeon_write_agp_base(drm_radeon_private_t *dev_priv, u64 agp_base)
  	}
  }
  
@@ -30815,8 +30984,10 @@
 +	radeon_pll_errata_after_data(dev_priv);
  }
  
- static u32 RADEON_READ_PCIE(drm_radeon_private_t *dev_priv, int addr)
-@@ -152,6 +241,39 @@ static u32 RADEON_READ_PCIE(drm_radeon_private_t *dev_priv, int addr)
+-static u32 RADEON_READ_PCIE(drm_radeon_private_t *dev_priv, int addr)
++u32 RADEON_READ_PCIE(drm_radeon_private_t *dev_priv, int addr)
+ {
+ 	RADEON_WRITE8(RADEON_PCIE_INDEX, addr & 0xff);
  	return RADEON_READ(RADEON_PCIE_DATA);
  }
  
@@ -32081,7 +32252,7 @@
 +	if (dev_priv->chip_family == CHIP_R300 &&
 +	    (RADEON_READ(RADEON_CONFIG_CNTL) & RADEON_CFG_ATI_REV_ID_MASK) == RADEON_CFG_ATI_REV_A11)
 +		dev_priv->pll_errata |= CHIP_ERRATA_R300_CG;
-+		
++
 +	if (dev_priv->chip_family == CHIP_RV200 ||
 +	    dev_priv->chip_family == CHIP_RS200)
 +		dev_priv->pll_errata |= CHIP_ERRATA_PLL_DUMMYREADS;
@@ -32233,10 +32404,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
 new file mode 100644
-index 0000000..c8b0c97
+index 0000000..b5a2be8
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_cs.c
-@@ -0,0 +1,412 @@
+@@ -0,0 +1,417 @@
 +/*
 + * Copyright 2008 Jerome Glisse.
 + * All Rights Reserved.
@@ -32293,6 +32464,7 @@
 +	}
 +	/* limit cs to 64K ib */
 +	if (cs->dwords > (16 * 1024)) {
++		DRM_ERROR("cs->dwords too big: %d\n", cs->dwords);
 +		return -EINVAL;
 +	}
 +	/* copy cs from userspace maybe we should copy into ib to save
@@ -32311,6 +32483,7 @@
 +	/* get ib */
 +	r = dev_priv->cs.ib_get(dev, &ib, cs->dwords, &card_offset);
 +	if (r) {
++		DRM_ERROR("ib_get failed\n");
 +		goto out;
 +	}
 +
@@ -32424,6 +32597,7 @@
 +		packets[offset_dw + 2] = val;
 +	}
 +	default:
++		DRM_ERROR("reg is %x, not RADEON_CNTL_HOSTDATA_BLT\n", reg);
 +		return -EINVAL;
 +	}
 +	return 0;
@@ -32485,14 +32659,16 @@
 +				}
 +
 +				ret = radeon_cs_relocate_packet0(dev, file_priv, packets, offset_dw);
-+				if (ret)
++				if (ret) {
++					DRM_ERROR("failed to relocate packet\n");
 +					return ret;
++				}
 +				DRM_DEBUG("need to relocate %x %d\n", reg, flags);
 +				/* okay it should be followed by a NOP */
 +			} else if (flags == MARK_CHECK_SCISSOR) {
 +				DRM_DEBUG("need to validate scissor %x %d\n", reg, flags);
 +			} else {
-+				DRM_DEBUG("illegal register %x %d\n", reg, flags);
++				DRM_ERROR("illegal register %x %d\n", reg, flags);
 +				return -EINVAL;
 +			}
 +			break;
@@ -32900,10 +33076,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
 new file mode 100644
-index 0000000..a2cb66a
+index 0000000..972f4d3
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -0,0 +1,651 @@
+@@ -0,0 +1,738 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -33302,7 +33478,10 @@
 +			    (post_div == 7) ||
 +			    (post_div == 9) ||
 +			    (post_div == 10) ||
-+			    (post_div == 11))
++			    (post_div == 11) ||
++			    (post_div == 13) ||
++			    (post_div == 14) ||
++			    (post_div == 15))
 +				continue;
 +		}
 +
@@ -33354,7 +33533,12 @@
 +						best_freq = current_freq;
 +						best_error = error;
 +						best_vco_diff = vco_diff;
-+					} else if ((flags & RADEON_PLL_PREFER_LOW_REF_DIV) && (ref_div < best_ref_div)) {
++					} else if (((flags & RADEON_PLL_PREFER_LOW_REF_DIV) && (ref_div < best_ref_div)) ||
++						   ((flags & RADEON_PLL_PREFER_HIGH_REF_DIV) && (ref_div > best_ref_div)) ||
++						   ((flags & RADEON_PLL_PREFER_LOW_FB_DIV) && (feedback_div < best_feedback_div)) ||
++						   ((flags & RADEON_PLL_PREFER_HIGH_FB_DIV) && (feedback_div > best_feedback_div)) ||
++						   ((flags & RADEON_PLL_PREFER_LOW_POST_DIV) && (post_div < best_post_div)) ||
++						   ((flags & RADEON_PLL_PREFER_HIGH_POST_DIV) && (post_div > best_post_div))) {
 +						best_post_div = post_div;
 +						best_ref_div = ref_div;
 +						best_feedback_div = feedback_div;
@@ -33381,7 +33565,10 @@
 +void radeon_get_clock_info(struct drm_device *dev)
 +{
 +	drm_radeon_private_t *dev_priv = dev->dev_private;
-+	struct radeon_pll *pll = &dev_priv->mode_info.pll;
++	struct radeon_pll *p1pll = &dev_priv->mode_info.p1pll;
++	struct radeon_pll *p2pll = &dev_priv->mode_info.p2pll;
++	struct radeon_pll *spll = &dev_priv->mode_info.spll;
++	struct radeon_pll *mpll = &dev_priv->mode_info.mpll;
 +	int ret;
 +
 +	if (dev_priv->is_atom_bios)
@@ -33390,25 +33577,101 @@
 +		ret = radeon_combios_get_clock_info(dev);
 +
 +	if (ret) {
-+
-+		if (pll->reference_div < 2) pll->reference_div = 12;
++		if (p1pll->reference_div < 2)
++			p1pll->reference_div = 12;
++		if (p2pll->reference_div < 2)
++			p2pll->reference_div = 12;
 +	} else {
 +		// TODO FALLBACK
 +	}
 +
++	/* pixel clocks */
 +	if (radeon_is_avivo(dev_priv)) {
-+		pll->min_post_div = 2;
-+		pll->max_post_div = 0x7f;
++		p1pll->min_post_div = 2;
++		p1pll->max_post_div = 0x7f;
++		p2pll->min_post_div = 2;
++		p2pll->max_post_div = 0x7f;
 +	} else {
-+		pll->min_post_div = 1;
-+		pll->max_post_div = 12; // 16 on crtc 0??
-+	}
++		p1pll->min_post_div = 1;
++		p1pll->max_post_div = 16;
++		p2pll->min_post_div = 1;
++		p2pll->max_post_div = 12;
++	}
++
++	p1pll->min_ref_div = 2;
++	p1pll->max_ref_div = 0x3ff;
++	p1pll->min_feedback_div = 4;
++	p1pll->max_feedback_div = 0x7ff;
++	p1pll->best_vco = 0;
++
++	p2pll->min_ref_div = 2;
++	p2pll->max_ref_div = 0x3ff;
++	p2pll->min_feedback_div = 4;
++	p2pll->max_feedback_div = 0x7ff;
++	p2pll->best_vco = 0;
++
++	/* system clock */
++	spll->min_post_div = 1;
++	spll->max_post_div = 1;
++	spll->min_ref_div = 2;
++	spll->max_ref_div = 0xff;
++	spll->min_feedback_div = 4;
++	spll->max_feedback_div = 0xff;
++	spll->best_vco = 0;
++
++	/* memory clock */
++	mpll->min_post_div = 1;
++	mpll->max_post_div = 1;
++	mpll->min_ref_div = 2;
++	mpll->max_ref_div = 0xff;
++	mpll->min_feedback_div = 4;
++	mpll->max_feedback_div = 0xff;
++	mpll->best_vco = 0;
++
++}
++
++/* not sure of the best place for these */
++/* 10 khz */
++void radeon_legacy_set_engine_clock(struct drm_device *dev, int eng_clock)
++{
++	struct drm_radeon_private *dev_priv = dev->dev_private;
++	struct radeon_mode_info *mode_info = &dev_priv->mode_info;
++	struct radeon_pll *spll = &mode_info->spll;
++	uint32_t ref_div, fb_div;
++	uint32_t m_spll_ref_fb_div;
++
++	/* FIXME wait for idle */
 +
-+	pll->min_ref_div = 2;
-+	pll->max_ref_div = 0x3ff;
-+	pll->min_feedback_div = 4;
-+	pll->max_feedback_div = 0x7ff;
-+	pll->best_vco = 0;
++	m_spll_ref_fb_div = RADEON_READ_PLL(dev_priv, RADEON_M_SPLL_REF_FB_DIV);
++	m_spll_ref_fb_div &= ((RADEON_M_SPLL_REF_DIV_MASK << RADEON_M_SPLL_REF_DIV_SHIFT) |
++			      (RADEON_MPLL_FB_DIV_MASK << RADEON_MPLL_FB_DIV_SHIFT));
++	ref_div = m_spll_ref_fb_div & RADEON_M_SPLL_REF_DIV_MASK;
++
++	fb_div = radeon_div(eng_clock * ref_div, spll->reference_freq);
++	m_spll_ref_fb_div |= (fb_div & RADEON_SPLL_FB_DIV_MASK) << RADEON_SPLL_FB_DIV_SHIFT;
++	RADEON_WRITE_PLL(dev_priv, RADEON_M_SPLL_REF_FB_DIV, m_spll_ref_fb_div);
++
++}
++
++/* 10 khz */
++void radeon_legacy_set_memory_clock(struct drm_device *dev, int mem_clock)
++{
++	struct drm_radeon_private *dev_priv = dev->dev_private;
++	struct radeon_mode_info *mode_info = &dev_priv->mode_info;
++	struct radeon_pll *mpll = &mode_info->mpll;
++	uint32_t ref_div, fb_div;
++	uint32_t m_spll_ref_fb_div;
++
++	/* FIXME wait for idle */
++
++	m_spll_ref_fb_div = RADEON_READ_PLL(dev_priv, RADEON_M_SPLL_REF_FB_DIV);
++	m_spll_ref_fb_div &= ((RADEON_M_SPLL_REF_DIV_MASK << RADEON_M_SPLL_REF_DIV_SHIFT) |
++			      (RADEON_SPLL_FB_DIV_MASK << RADEON_SPLL_FB_DIV_SHIFT));
++	ref_div = m_spll_ref_fb_div & RADEON_M_SPLL_REF_DIV_MASK;
++
++	fb_div = radeon_div(mem_clock * ref_div, mpll->reference_freq);
++	m_spll_ref_fb_div |= (fb_div & RADEON_MPLL_FB_DIV_MASK) << RADEON_MPLL_FB_DIV_SHIFT;
++	RADEON_WRITE_PLL(dev_priv, RADEON_M_SPLL_REF_FB_DIV, m_spll_ref_fb_div);
 +
 +}
 +
@@ -33671,7 +33934,7 @@
  }
  
 diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
-index 0993816..e15a47a 100644
+index 0993816..484642d 100644
 --- a/drivers/gpu/drm/radeon/radeon_drv.h
 +++ b/drivers/gpu/drm/radeon/radeon_drv.h
 @@ -34,6 +34,8 @@
@@ -34178,7 +34441,7 @@
  #define R500_D1CRTC_STATUS 0x609c
  #define R500_D2CRTC_STATUS 0x689c
  #define R500_CRTC_V_BLANK (1<<0)
-@@ -1156,19 +1298,35 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
+@@ -1156,19 +1298,36 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
  #define RADEON_RING_HIGH_MARK		128
  
  #define RADEON_PCIGART_TABLE_SIZE      (32*1024)
@@ -34199,6 +34462,7 @@
 -	RADEON_WRITE(RADEON_CLOCK_CNTL_DATA, (val));			\
 +extern u32 RADEON_READ_PLL(struct drm_radeon_private *dev_priv, int addr);
 +extern void RADEON_WRITE_PLL(struct drm_radeon_private *dev_priv, int addr, uint32_t data);
++extern u32 RADEON_READ_PCIE(drm_radeon_private_t *dev_priv, int addr);
 +
 +#define RADEON_WRITE_P(reg, val, mask)		\
 +do {						\
@@ -34221,7 +34485,7 @@
  #define RADEON_WRITE_PCIE(addr, val)					\
  do {									\
  	RADEON_WRITE8(RADEON_PCIE_INDEX,				\
-@@ -1224,7 +1382,7 @@ do {									\
+@@ -1224,7 +1383,7 @@ do {									\
  #define RADEON_WAIT_UNTIL_2D_IDLE() do {				\
  	OUT_RING( CP_PACKET0( RADEON_WAIT_UNTIL, 0 ) );			\
  	OUT_RING( (RADEON_WAIT_2D_IDLECLEAN |				\
@@ -34230,7 +34494,7 @@
  } while (0)
  
  #define RADEON_WAIT_UNTIL_3D_IDLE() do {				\
-@@ -1301,8 +1459,9 @@ do {									\
+@@ -1301,8 +1460,9 @@ do {									\
  } while (0)
  
  #define VB_AGE_TEST_WITH_RETURN( dev_priv )				\
@@ -34242,7 +34506,7 @@
  	if ( sarea_priv->last_dispatch >= RADEON_MAX_VB_AGE ) {		\
  		int __ret = radeon_do_cp_idle( dev_priv );		\
  		if ( __ret ) return __ret;				\
-@@ -1408,4 +1567,142 @@ do {									\
+@@ -1408,4 +1568,142 @@ do {									\
  	write &= mask;						\
  } while (0)
  
@@ -34387,10 +34651,10 @@
  #endif				/* __RADEON_DRV_H__ */
 diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
 new file mode 100644
-index 0000000..e791ab7
+index 0000000..f39dcc1
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_encoders.c
-@@ -0,0 +1,1081 @@
+@@ -0,0 +1,1093 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -34910,9 +35174,15 @@
 +}
 +
 +static bool radeon_atom_dac_mode_fixup(struct drm_encoder *encoder,
-+				  struct drm_display_mode *mode,
-+				  struct drm_display_mode *adjusted_mode)
++				       struct drm_display_mode *mode,
++				       struct drm_display_mode *adjusted_mode)
 +{
++
++	/* hw bug */
++	if ((mode->flags & DRM_MODE_FLAG_INTERLACE)
++	    && (mode->crtc_vsync_start < (mode->crtc_vdisplay + 2)))
++		adjusted_mode->crtc_vsync_start = adjusted_mode->crtc_vdisplay + 2;
++
 +	return true;
 +}
 +
@@ -35380,6 +35650,12 @@
 +				  struct drm_display_mode *mode,
 +				  struct drm_display_mode *adjusted_mode)
 +{
++
++	/* hw bug */
++	if ((mode->flags & DRM_MODE_FLAG_INTERLACE)
++	    && (mode->crtc_vsync_start < (mode->crtc_vdisplay + 2)))
++		adjusted_mode->crtc_vsync_start = adjusted_mode->crtc_vdisplay + 2;
++
 +	return true;
 +}
 +
@@ -38353,10 +38629,10 @@
  	radeon_enable_interrupt(dev);
 diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
 new file mode 100644
-index 0000000..58c2f9d
+index 0000000..d51fc52
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
-@@ -0,0 +1,1020 @@
+@@ -0,0 +1,1025 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -38760,7 +39036,7 @@
 +	uint32_t post_divider = 0;
 +	uint32_t freq = 0;
 +	uint8_t pll_gain;
-+	int pll_flags = RADEON_PLL_LEGACY | RADEON_PLL_PREFER_LOW_REF_DIV;
++	int pll_flags = RADEON_PLL_LEGACY;
 +	bool use_bios_divs = false;
 +	/* PLL registers */
 +	uint32_t ppll_ref_div = 0;
@@ -38768,7 +39044,7 @@
 +        uint32_t htotal_cntl = 0;
 +        uint32_t vclk_ecp_cntl;
 +
-+	struct radeon_pll *pll = &dev_priv->mode_info.pll;
++	struct radeon_pll *pll = &dev_priv->mode_info.p1pll;
 +
 +	struct {
 +		int divider;
@@ -38790,6 +39066,11 @@
 +		{  0, 0 }
 +	};
 +
++	if (mode->clock > 120000) /* range limits??? */
++		pll_flags |= RADEON_PLL_PREFER_HIGH_FB_DIV;
++	else
++		pll_flags |= RADEON_PLL_PREFER_LOW_REF_DIV;
++
 +	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
 +		if (encoder->crtc == crtc) {
 +			if (encoder->encoder_type != DRM_MODE_ENCODER_DAC)
@@ -38844,7 +39125,7 @@
 +	vclk_ecp_cntl = (RADEON_READ_PLL(dev_priv, RADEON_VCLK_ECP_CNTL) &
 +			 ~RADEON_VCLK_SRC_SEL_MASK) | RADEON_VCLK_SRC_SEL_PPLLCLK;
 +
-+	pll_gain = radeon_compute_pll_gain(dev_priv->mode_info.pll.reference_freq,
++	pll_gain = radeon_compute_pll_gain(dev_priv->mode_info.p1pll.reference_freq,
 +					   ppll_ref_div & RADEON_PPLL_REF_DIV_MASK,
 +					   ppll_div_3 & RADEON_PPLL_FB3_DIV_MASK);
 +
@@ -39171,7 +39452,7 @@
 +	uint32_t htotal_cntl2 = 0;
 +	uint32_t pixclks_cntl;
 +
-+	struct radeon_pll *pll = &dev_priv->mode_info.pll;
++	struct radeon_pll *pll = &dev_priv->mode_info.p2pll;
 +
 +	struct {
 +		int divider;
@@ -39241,7 +39522,7 @@
 +			     ~(RADEON_PIX2CLK_SRC_SEL_MASK)) |
 +			    RADEON_PIX2CLK_SRC_SEL_P2PLLCLK);
 +
-+	pll_gain = radeon_compute_pll_gain(dev_priv->mode_info.pll.reference_freq,
++	pll_gain = radeon_compute_pll_gain(dev_priv->mode_info.p2pll.reference_freq,
 +					   p2pll_ref_div & RADEON_P2PLL_REF_DIV_MASK,
 +					   p2pll_div_0 & RADEON_P2PLL_FB0_DIV_MASK);
 +
@@ -40744,12 +41025,25 @@
 +
 +	return encoder;
 +}
+diff --git a/drivers/gpu/drm/radeon/radeon_mem.c b/drivers/gpu/drm/radeon/radeon_mem.c
+index 4af5286..05bbb90 100644
+--- a/drivers/gpu/drm/radeon/radeon_mem.c
++++ b/drivers/gpu/drm/radeon/radeon_mem.c
+@@ -294,7 +294,7 @@ int radeon_mem_init_heap(struct drm_device *dev, void *data, struct drm_file *fi
+ 		return -EFAULT;
+ 
+ 	if (*heap) {
+-		DRM_ERROR("heap already initialized?");
++		DRM_ERROR("heap already initialized?\n");
+ 		return -EFAULT;
+ 	}
+ 
 diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
 new file mode 100644
-index 0000000..a4ee78a
+index 0000000..d4b33dd
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_mode.h
-@@ -0,0 +1,337 @@
+@@ -0,0 +1,348 @@
 +/*
 + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
 + *                VA Linux Systems Inc., Fremont, California.
@@ -40889,11 +41183,16 @@
 +
 +#define RADEON_MAX_BIOS_CONNECTOR 16
 +
-+#define RADEON_PLL_USE_BIOS_DIVS   (1 << 0)
-+#define RADEON_PLL_NO_ODD_POST_DIV (1 << 1)
-+#define RADEON_PLL_USE_REF_DIV     (1 << 2)
-+#define RADEON_PLL_LEGACY          (1 << 3)
-+#define RADEON_PLL_PREFER_LOW_REF_DIV (1 << 4)
++#define RADEON_PLL_USE_BIOS_DIVS        (1 << 0)
++#define RADEON_PLL_NO_ODD_POST_DIV      (1 << 1)
++#define RADEON_PLL_USE_REF_DIV          (1 << 2)
++#define RADEON_PLL_LEGACY               (1 << 3)
++#define RADEON_PLL_PREFER_LOW_REF_DIV   (1 << 4)
++#define RADEON_PLL_PREFER_HIGH_REF_DIV  (1 << 5)
++#define RADEON_PLL_PREFER_LOW_FB_DIV    (1 << 6)
++#define RADEON_PLL_PREFER_HIGH_FB_DIV   (1 << 7)
++#define RADEON_PLL_PREFER_LOW_POST_DIV  (1 << 8)
++#define RADEON_PLL_PREFER_HIGH_POST_DIV (1 << 9)
 +
 +struct radeon_pll {
 +	uint16_t reference_freq;
@@ -40913,10 +41212,22 @@
 +	uint32_t best_vco;
 +};
 +
++struct radeon_i2c_chan {
++	struct drm_device *dev;
++	struct i2c_adapter adapter;
++	struct i2c_algo_bit_data algo;
++	struct radeon_i2c_bus_rec rec;
++};
++
 +struct radeon_mode_info {
 +	struct atom_context *atom_context;
 +	struct radeon_bios_connector bios_connector[RADEON_MAX_BIOS_CONNECTOR];
-+	struct radeon_pll pll;
++	struct radeon_pll p1pll;
++	struct radeon_pll p2pll;
++	struct radeon_pll spll;
++	struct radeon_pll mpll;
++	uint32_t mclk;
++	uint32_t sclk;
 +};
 +
 +struct radeon_crtc {
@@ -40930,14 +41241,6 @@
 +	struct drm_mode_set mode_set;
 +};
 +
-+struct radeon_i2c_chan {
-+	struct drm_device *dev;
-+	struct i2c_adapter adapter;
-+	struct i2c_algo_bit_data algo;
-+	struct radeon_i2c_bus_rec rec;
-+};
-+
-+
 +#define RADEON_USE_RMX 1
 +
 +struct radeon_encoder {
@@ -41030,6 +41333,8 @@
 +				   int x, int y);
 +extern void atombios_crtc_dpms(struct drm_crtc *crtc, int mode);
 +
++extern void radeon_crtc_set_base(struct drm_crtc *crtc, int x, int y);
++
 +extern int radeon_crtc_cursor_set(struct drm_crtc *crtc,
 +				  struct drm_file *file_priv,
 +				  uint32_t handle,
@@ -41089,10 +41394,10 @@
 +#endif
 diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
 new file mode 100644
-index 0000000..c7a57b9
+index 0000000..92d44b5
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_pm.c
-@@ -0,0 +1,180 @@
+@@ -0,0 +1,240 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -41273,12 +41578,72 @@
 +
 +	return 0;
 +}
++
++bool radeon_set_pcie_lanes(struct drm_device *dev, int lanes)
++{
++	drm_radeon_private_t *dev_priv = dev->dev_private;
++	uint32_t link_width_cntl, mask;
++
++	/* FIXME wait for idle */
++
++
++	switch (lanes) {
++	case 0:
++		mask = RADEON_PCIE_LC_LINK_WIDTH_X0;
++		break;
++	case 1:
++		mask = RADEON_PCIE_LC_LINK_WIDTH_X1;
++		break;
++	case 2:
++		mask = RADEON_PCIE_LC_LINK_WIDTH_X2;
++		break;
++	case 4:
++		mask = RADEON_PCIE_LC_LINK_WIDTH_X4;
++		break;
++	case 8:
++		mask = RADEON_PCIE_LC_LINK_WIDTH_X8;
++		break;
++	case 12:
++		mask = RADEON_PCIE_LC_LINK_WIDTH_X12;
++		break;
++	case 16:
++	default:
++		mask = RADEON_PCIE_LC_LINK_WIDTH_X16;
++		break;
++	}
++
++	link_width_cntl = RADEON_READ_PCIE(dev_priv, RADEON_PCIE_LC_LINK_WIDTH_CNTL);
++
++	if ((link_width_cntl & RADEON_PCIE_LC_LINK_WIDTH_RD_MASK) ==
++	    (mask << RADEON_PCIE_LC_LINK_WIDTH_RD_SHIFT))
++		return true;
++
++	link_width_cntl &= ~(RADEON_PCIE_LC_LINK_WIDTH_MASK |
++			     RADEON_PCIE_LC_RECONFIG_NOW |
++			     RADEON_PCIE_LC_RECONFIG_LATER |
++			     RADEON_PCIE_LC_SHORT_RECONFIG_EN);
++	link_width_cntl |= mask;
++	RADEON_WRITE_PCIE(RADEON_PCIE_LC_LINK_WIDTH_CNTL, link_width_cntl);
++	RADEON_WRITE_PCIE(RADEON_PCIE_LC_LINK_WIDTH_CNTL, link_width_cntl | RADEON_PCIE_LC_RECONFIG_NOW);
++
++	/* wait for lane set to complete */
++	link_width_cntl = RADEON_READ_PCIE(dev_priv, RADEON_PCIE_LC_LINK_WIDTH_CNTL);
++	while (link_width_cntl == 0xffffffff)
++		link_width_cntl = RADEON_READ_PCIE(dev_priv, RADEON_PCIE_LC_LINK_WIDTH_CNTL);
++
++	if ((link_width_cntl & RADEON_PCIE_LC_LINK_WIDTH_RD_MASK) ==
++	    (mask << RADEON_PCIE_LC_LINK_WIDTH_RD_SHIFT))
++		return true;
++	else
++		return false;
++}
++
 diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h
 new file mode 100644
-index 0000000..52fb0b9
+index 0000000..3341d38
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_reg.h
-@@ -0,0 +1,5317 @@
+@@ -0,0 +1,5343 @@
 +/*
 + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
 + *                VA Linux Systems Inc., Fremont, California.
@@ -41555,6 +41920,24 @@
 +#define RADEON_BUS_CNTL1                    0x0034
 +#       define RADEON_BUS_WAIT_ON_LOCK_EN    (1 << 4)
 +
++//#define RADEON_PCIE_INDEX                   0x0030
++//#define RADEON_PCIE_DATA                    0x0034
++#define RADEON_PCIE_LC_LINK_WIDTH_CNTL             0xa2 /* PCIE */
++#       define RADEON_PCIE_LC_LINK_WIDTH_SHIFT     0
++#       define RADEON_PCIE_LC_LINK_WIDTH_MASK      0x7
++#       define RADEON_PCIE_LC_LINK_WIDTH_X0        0
++#       define RADEON_PCIE_LC_LINK_WIDTH_X1        1
++#       define RADEON_PCIE_LC_LINK_WIDTH_X2        2
++#       define RADEON_PCIE_LC_LINK_WIDTH_X4        3
++#       define RADEON_PCIE_LC_LINK_WIDTH_X8        4
++#       define RADEON_PCIE_LC_LINK_WIDTH_X12       5
++#       define RADEON_PCIE_LC_LINK_WIDTH_X16       6
++#       define RADEON_PCIE_LC_LINK_WIDTH_RD_SHIFT  4
++#       define RADEON_PCIE_LC_LINK_WIDTH_RD_MASK   0x70
++#       define RADEON_PCIE_LC_RECONFIG_NOW         (1 << 8)
++#       define RADEON_PCIE_LC_RECONFIG_LATER       (1 << 9)
++#       define RADEON_PCIE_LC_SHORT_RECONFIG_EN    (1 << 10)
++
 +#define RADEON_CACHE_CNTL                   0x1724
 +#define RADEON_CACHE_LINE                   0x0f0c /* PCI */
 +#define RADEON_CAPABILITIES_ID              0x0f50 /* PCI */
@@ -42812,6 +43195,13 @@
 +#define RADEON_SC_TOP_LEFT_C                0x1c88
 +#       define RADEON_SC_SIGN_MASK_LO       0x8000
 +#       define RADEON_SC_SIGN_MASK_HI       0x80000000
++#define RADEON_M_SPLL_REF_FB_DIV            0x000a /* PLL */
++#	define RADEON_M_SPLL_REF_DIV_SHIFT  0
++#	define RADEON_M_SPLL_REF_DIV_MASK   0xff
++#	define RADEON_MPLL_FB_DIV_SHIFT    8
++#	define RADEON_MPLL_FB_DIV_MASK     0xff
++#	define RADEON_SPLL_FB_DIV_SHIFT    16
++#	define RADEON_SPLL_FB_DIV_MASK     0xff
 +#define RADEON_SCLK_CNTL                    0x000d /* PLL */
 +#       define RADEON_SCLK_SRC_SEL_MASK     0x0007
 +#       define RADEON_DYN_STOP_LAT_MASK     0x00007ff8
@@ -44839,7 +45229,7 @@
 +#define AVIVO_D1CRTC_V_SYNC_B_CNTL                              0x6034
 +
 +#define AVIVO_D1CRTC_CONTROL                                    0x6080
-+#       define AVIVO_CRTC_EN                            (1<<0)
++#       define AVIVO_CRTC_EN                                    (1 << 0)
 +#define AVIVO_D1CRTC_BLANK_CONTROL                              0x6084
 +#define AVIVO_D1CRTC_INTERLACE_CONTROL                          0x6088
 +#define AVIVO_D1CRTC_INTERLACE_STATUS                           0x608c
@@ -44851,30 +45241,30 @@
 +
 +#define AVIVO_D1GRPH_ENABLE                                     0x6100
 +#define AVIVO_D1GRPH_CONTROL                                    0x6104
-+#       define AVIVO_D1GRPH_CONTROL_DEPTH_8BPP          (0<<0)
-+#       define AVIVO_D1GRPH_CONTROL_DEPTH_16BPP         (1<<0)
-+#       define AVIVO_D1GRPH_CONTROL_DEPTH_32BPP         (2<<0)
-+#       define AVIVO_D1GRPH_CONTROL_DEPTH_64BPP         (3<<0)
-+
-+#       define AVIVO_D1GRPH_CONTROL_8BPP_INDEXED        (0<<8)
-+
-+#       define AVIVO_D1GRPH_CONTROL_16BPP_ARGB1555      (0<<8)
-+#       define AVIVO_D1GRPH_CONTROL_16BPP_RGB565        (1<<8)
-+#       define AVIVO_D1GRPH_CONTROL_16BPP_ARGB4444      (2<<8)
-+#       define AVIVO_D1GRPH_CONTROL_16BPP_AI88          (3<<8)
-+#       define AVIVO_D1GRPH_CONTROL_16BPP_MONO16        (4<<8)
-+
-+#       define AVIVO_D1GRPH_CONTROL_32BPP_ARGB8888      (0<<8)
-+#       define AVIVO_D1GRPH_CONTROL_32BPP_ARGB2101010   (1<<8)
-+#       define AVIVO_D1GRPH_CONTROL_32BPP_DIGITAL       (2<<8)
-+#       define AVIVO_D1GRPH_CONTROL_32BPP_8B_ARGB2101010 (3<<8)
-+
-+
-+#       define AVIVO_D1GRPH_CONTROL_64BPP_ARGB16161616  (0<<8)
-+
-+#       define AVIVO_D1GRPH_SWAP_RB                     (1<<16)
-+#       define AVIVO_D1GRPH_TILED                       (1<<20)
-+#       define AVIVO_D1GRPH_MACRO_ADDRESS_MODE          (1<<21)
++#       define AVIVO_D1GRPH_CONTROL_DEPTH_8BPP                  (0 << 0)
++#       define AVIVO_D1GRPH_CONTROL_DEPTH_16BPP                 (1 << 0)
++#       define AVIVO_D1GRPH_CONTROL_DEPTH_32BPP                 (2 << 0)
++#       define AVIVO_D1GRPH_CONTROL_DEPTH_64BPP                 (3 << 0)
++
++#       define AVIVO_D1GRPH_CONTROL_8BPP_INDEXED                (0 << 8)
++
++#       define AVIVO_D1GRPH_CONTROL_16BPP_ARGB1555              (0 << 8)
++#       define AVIVO_D1GRPH_CONTROL_16BPP_RGB565                (1 << 8)
++#       define AVIVO_D1GRPH_CONTROL_16BPP_ARGB4444              (2 << 8)
++#       define AVIVO_D1GRPH_CONTROL_16BPP_AI88                  (3 << 8)
++#       define AVIVO_D1GRPH_CONTROL_16BPP_MONO16                (4 << 8)
++
++#       define AVIVO_D1GRPH_CONTROL_32BPP_ARGB8888              (0 << 8)
++#       define AVIVO_D1GRPH_CONTROL_32BPP_ARGB2101010           (1 << 8)
++#       define AVIVO_D1GRPH_CONTROL_32BPP_DIGITAL               (2 << 8)
++#       define AVIVO_D1GRPH_CONTROL_32BPP_8B_ARGB2101010        (3 << 8)
++
++
++#       define AVIVO_D1GRPH_CONTROL_64BPP_ARGB16161616          (0 << 8)
++
++#       define AVIVO_D1GRPH_SWAP_RB                             (1 << 16)
++#       define AVIVO_D1GRPH_TILED                               (1 << 20)
++#       define AVIVO_D1GRPH_MACRO_ADDRESS_MODE                  (1 << 21)
 +
 +#define AVIVO_D1GRPH_LUT_SEL                                    0x6108
 +#define AVIVO_D1GRPH_PRIMARY_SURFACE_ADDRESS                    0x6110
@@ -44900,7 +45290,7 @@
 +#define AVIVO_D1CUR_POSITION                    0x6414
 +#define AVIVO_D1CUR_HOT_SPOT                    0x6418
 +#define AVIVO_D1CUR_UPDATE                      0x6424
-+#       define AVIVO_D1CURSOR_UPDATE_LOCK (1 << 16)
++#       define AVIVO_D1CURSOR_UPDATE_LOCK       (1 << 16)
 +
 +#define AVIVO_DC_LUT_RW_SELECT                  0x6480
 +#define AVIVO_DC_LUT_RW_MODE                    0x6484
@@ -44920,7 +45310,8 @@
 +#define AVIVO_DC_LUTA_WHITE_OFFSET_GREEN        0x64d4
 +#define AVIVO_DC_LUTA_WHITE_OFFSET_RED          0x64d8
 +
-+
++#define AVIVO_D1MODE_DATA_FORMAT                0x6528
++#       define AVIVO_D1MODE_INTERLEAVE_EN       (1 << 0)
 +#define AVIVO_D1MODE_DESKTOP_HEIGHT             0x652C
 +#define AVIVO_D1MODE_VIEWPORT_START             0x6580
 +#define AVIVO_D1MODE_VIEWPORT_SIZE              0x6584
@@ -44930,7 +45321,7 @@
 +#define AVIVO_D1SCL_SCALER_ENABLE               0x6590
 +#define AVIVO_D1SCL_SCALER_TAP_CONTROL	 	0x6594
 +#define AVIVO_D1SCL_UPDATE                      0x65cc
-+#       define AVIVO_D1SCL_UPDATE_LOCK         (1<<16)
++#       define AVIVO_D1SCL_UPDATE_LOCK          (1 << 16)
 +
 +/* second crtc */
 +#define AVIVO_D2CRTC_H_TOTAL					0x6800


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.957
retrieving revision 1.958
diff -u -r1.957 -r1.958
--- kernel.spec	18 Sep 2008 20:16:01 -0000	1.957
+++ kernel.spec	18 Sep 2008 23:32:41 -0000	1.958
@@ -1764,6 +1764,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Sep 18 2008 Dave Airlie <airlied at redhat.com>
+- Merge krh's patches + new patches from AMD
+
 * Thu Sep 18 2008 Kristian H??gsberg <krh at redhat.com>
 - Fix precedence in PLL value computation.
 - Allow R300_DST_PIPE_CONFIG register write use by X.


--- drm-add-more-drm-error-msg.patch DELETED ---


--- drm-allow-r300-dst-pipe-config.patch DELETED ---


--- drm-fix-pll-computation-precedence.patch DELETED ---



From airlied at fedoraproject.org  Thu Sep 18 23:35:17 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 18 Sep 2008 23:35:17 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.958,1.959
Message-ID: <20080918233517.81CC0700D9@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20327

Modified Files:
	kernel.spec 
Log Message:
* Thu Sep 18 2008 Dave Airlie <airlied at redhat.com>
- Merge krh's patches + new patches from AMD



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.958
retrieving revision 1.959
diff -u -r1.958 -r1.959
--- kernel.spec	18 Sep 2008 23:32:41 -0000	1.958
+++ kernel.spec	18 Sep 2008 23:34:47 -0000	1.959
@@ -609,9 +609,6 @@
 Patch1811: drm-modesetting-radeon.patch
 Patch1812: drm-modesetting-i915.patch
 Patch1813: drm-nouveau.patch
-Patch1814: drm-fix-pll-computation-precedence.patch
-Patch1815: drm-allow-r300-dst-pipe-config.patch
-Patch1816: drm-add-more-drm-error-msg.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1170,9 +1167,6 @@
 ApplyPatch drm-modesetting-radeon.patch
 ApplyPatch drm-modesetting-i915.patch
 ApplyPatch drm-nouveau.patch
-ApplyPatch drm-fix-pll-computation-precedence.patch
-ApplyPatch drm-allow-r300-dst-pipe-config.patch
-ApplyPatch drm-add-more-drm-error-msg.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch



From kkofler at fedoraproject.org  Fri Sep 19 00:00:51 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 19 Sep 2008 00:00:51 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.1.1-kde#157789.patch, NONE,
	1.1 kdelibs.spec, 1.354, 1.355
Message-ID: <20080919000051.60F7A700F7@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21833/F-9

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.1-kde#157789.patch 
Log Message:
* Thu Sep 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-12
- make "Stop Animations" work again in Konqueror (KDE 4 regression kde#157789)

kdelibs-4.1.1-kde#157789.patch:

--- NEW FILE kdelibs-4.1.1-kde#157789.patch ---
diff -ur kdelibs-4.1.1/khtml/imload/animprovider.cpp kdelibs-4.1.1-kde#157789/khtml/imload/animprovider.cpp
--- kdelibs-4.1.1/khtml/imload/animprovider.cpp	2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/animprovider.cpp	2008-09-19 01:00:47.000000000 +0200
@@ -38,6 +38,8 @@
 
 void AnimProvider::switchFrame()
 {
+    if (animationAdvice == KHTMLSettings::KAnimationDisabled)
+        return;
     shouldSwitchFrame = true; 
     image->notifyPerformUpdate();
 }
@@ -47,6 +49,11 @@
     ImageManager::animTimer()->destroyed(this);
 }
 
+void AnimProvider::setShowAnimations(KHTMLSettings::KAnimationAdvice newAdvice)
+{
+    animationAdvice = newAdvice;
+}
+
 }
 
 // kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
diff -ur kdelibs-4.1.1/khtml/imload/animprovider.h kdelibs-4.1.1-kde#157789/khtml/imload/animprovider.h
--- kdelibs-4.1.1/khtml/imload/animprovider.h	2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/animprovider.h	2008-09-19 01:04:49.000000000 +0200
@@ -25,6 +25,8 @@
 #ifndef ANIM_PROVIDER_H
 #define ANIM_PROVIDER_H
 
+#include <khtml_settings.h>
+
 class QPainter;
 
 namespace khtmlImLoad {
@@ -44,11 +46,13 @@
     PixmapPlane* curFrame;
     Image*       image;
     bool         shouldSwitchFrame; //Set by AnimTimer
+    KHTMLSettings::KAnimationAdvice animationAdvice;
 
     void nextFrame(); //Helper that goes to next frame or wraps around
 public:
     AnimProvider(PixmapPlane* plane, Image* img):frame0(plane), curFrame(plane),
-                                     image(img), shouldSwitchFrame(false)
+                                     image(img), shouldSwitchFrame(false),
+                                     animationAdvice(KHTMLSettings::KAnimationEnabled)
     {}
 
     void switchFrame();
@@ -62,6 +66,11 @@
     //Must be implemented to paint the given region. Note that clipping to the
     //overall canvas will be performed already
     virtual void paint(int dx, int dy, QPainter* p, int sx, int sy, int width, int height) = 0;
+
+    /**
+     Enables or disables animations
+    */
+    void setShowAnimations(KHTMLSettings::KAnimationAdvice);
 };
 
 }
diff -ur kdelibs-4.1.1/khtml/imload/decoders/gifloader.cpp kdelibs-4.1.1-kde#157789/khtml/imload/decoders/gifloader.cpp
--- kdelibs-4.1.1/khtml/imload/decoders/gifloader.cpp	2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/decoders/gifloader.cpp	2008-09-19 01:00:59.000000000 +0200
@@ -212,7 +212,11 @@
 
             ++frame;
             if (frame >= frameInfo.size())
+            {
+                if (animationAdvice == KHTMLSettings::KAnimationLoopOnce)
+                    animationAdvice = KHTMLSettings::KAnimationDisabled;
                 frame = 0;
+            }
             nextFrame();
         }
 
diff -ur kdelibs-4.1.1/khtml/imload/image.cpp kdelibs-4.1.1-kde#157789/khtml/imload/image.cpp
--- kdelibs-4.1.1/khtml/imload/image.cpp	2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/image.cpp	2008-09-19 01:12:02.000000000 +0200
@@ -48,6 +48,7 @@
     inError      = false;
 
     width = height = 0;
+    animationAdvice = KHTMLSettings::KAnimationEnabled;
 
     noUpdates();
 }
@@ -214,6 +215,12 @@
     }
     else
     {
+        for (PixmapPlane* cur = original; cur; cur = cur->nextFrame)
+        {
+            if (cur->animProvider)
+                cur->animProvider->setShowAnimations(animationAdvice);
+        }
+
         fullyDecoded = true;
         owner->imageDone(this);
     }
@@ -452,6 +459,19 @@
     return original->parent->format.hasAlpha();
 }
 
+void Image::setShowAnimations(KHTMLSettings::KAnimationAdvice newAdvice)
+{
+    if (animationAdvice != newAdvice)
+    {
+        animationAdvice = newAdvice;
+        for (PixmapPlane* cur = original; cur; cur = cur->nextFrame)
+        {
+            if (cur->animProvider)
+                cur->animProvider->setShowAnimations(newAdvice);
+        }
+    }
+}
+
 }
 
 // kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
diff -ur kdelibs-4.1.1/khtml/imload/image.h kdelibs-4.1.1-kde#157789/khtml/imload/image.h
--- kdelibs-4.1.1/khtml/imload/image.h	2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/image.h	2008-09-19 01:09:46.000000000 +0200
@@ -30,6 +30,8 @@
 #include <QTimer>
 #include <QPair>
 #include <QMap>
+
+#include <khtml_settings.h>
  
 #include "imageformat.h"
 
@@ -92,6 +94,11 @@
      (but see CanvasImage)
     */
     QImage* qimage()  const;
+
+    /**
+     Enables or disables animations
+    */
+    void setShowAnimations(KHTMLSettings::KAnimationAdvice);
 private:
     //Interface to the loader.
     friend class ImageLoader;
@@ -165,6 +172,7 @@
     int width, height;
     PixmapPlane* original;
     QMap<QPair<int, int>, PixmapPlane*> scaled;
+    KHTMLSettings::KAnimationAdvice animationAdvice;
 
 };
 
diff -ur kdelibs-4.1.1/khtml/misc/loader.cpp kdelibs-4.1.1-kde#157789/khtml/misc/loader.cpp
--- kdelibs-4.1.1/khtml/misc/loader.cpp	2008-08-28 10:08:06.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/misc/loader.cpp	2008-09-19 01:03:07.000000000 +0200
@@ -422,7 +422,7 @@
     m_status = Unknown;
     imgSource = 0;
     setAccept( acceptHeader );
-    m_showAnimations = dl->showAnimations();
+    i->setShowAnimations(dl->showAnimations());
     m_loading = true;
 
     if ( KHTMLGlobal::defaultHTMLSettings()->isAdFiltered( url.string() ) ) {
@@ -807,30 +807,8 @@
 
 void CachedImage::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimations )
 {
-    (void) showAnimations;
-#if 0
-    m_showAnimations = showAnimations;
-    if ( (m_showAnimations == KHTMLSettings::KAnimationDisabled) && imgSource ) {
-#ifdef __GNUC__
-#warning QDataSource
-#endif
-        // imgSource->cleanBuffer();
-        delete p;
-        p = new QPixmap(m->framePixmap());
-#ifdef __GNUC__
-#warning QMovie requires different API now
-#endif
-        //m->disconnectUpdate( this, SLOT( movieUpdated( const QRect &) ));
-        //m->disconnectStatus( this, SLOT( movieStatus( int ) ));
-        // m->disconnectResize( this, SLOT( movieResize( const QSize& ) ) );
-        QTimer::singleShot(0, this, SLOT( deleteMovie()));
-        imgSource = 0;
-    }
-#endif
-
-#ifdef __GNUC__
-#warning "Use largeimagelib to disable animation"
-#endif
+    if (i)
+        i->setShowAnimations(showAnimations);
 }
 
 // void CachedImage::deleteMovie()


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- kdelibs.spec	18 Sep 2008 14:33:43 -0000	1.354
+++ kdelibs.spec	19 Sep 2008 00:00:20 -0000	1.355
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -80,6 +80,10 @@
 # fix running commands in kglobalconfig before KComponentData init (#455130)
 Patch19: kdelibs-4.1.0-#455130.patch
 Patch20: kdelibs-4.1.1-cmake.patch
+# make "Stop Animations" work again in Konqueror
+# https://bugs.kde.org/show_bug.cgi?id=157789
+# submitted upstream (attached to above bug report)
+Patch21: kdelibs-4.1.1-kde#157789.patch
 
 ## upstream patches
 Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
@@ -216,6 +220,7 @@
 %patch18 -p1 -b .kstandarddirs
 %patch19 -p1 -b .#455130
 %patch20 -p1 -b .cmake
+%patch21 -p1 -b .kde#157789
 
 ## upstream patches
 %patch100 -p0 -b .kde#169447-khtml-regression
@@ -387,6 +392,9 @@
 
 
 %changelog
+* Thu Sep 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-12
+- make "Stop Animations" work again in Konqueror (KDE 4 regression kde#157789)
+
 * Thu Sep 18 2008 Than Ngo <than at redhat.com> 4.1.1-11
 - apply upstream patch to fix the regression
 - drop the kdelibs-4.1.1-bz#461725-regression.patch



From kkofler at fedoraproject.org  Fri Sep 19 00:00:51 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 19 Sep 2008 00:00:51 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.1.1-kde#157789.patch, NONE,
	1.1 kdelibs.spec, 1.378, 1.379
Message-ID: <20080919000051.652687013D@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21833/devel

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.1-kde#157789.patch 
Log Message:
* Thu Sep 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-12
- make "Stop Animations" work again in Konqueror (KDE 4 regression kde#157789)

kdelibs-4.1.1-kde#157789.patch:

--- NEW FILE kdelibs-4.1.1-kde#157789.patch ---
diff -ur kdelibs-4.1.1/khtml/imload/animprovider.cpp kdelibs-4.1.1-kde#157789/khtml/imload/animprovider.cpp
--- kdelibs-4.1.1/khtml/imload/animprovider.cpp	2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/animprovider.cpp	2008-09-19 01:00:47.000000000 +0200
@@ -38,6 +38,8 @@
 
 void AnimProvider::switchFrame()
 {
+    if (animationAdvice == KHTMLSettings::KAnimationDisabled)
+        return;
     shouldSwitchFrame = true; 
     image->notifyPerformUpdate();
 }
@@ -47,6 +49,11 @@
     ImageManager::animTimer()->destroyed(this);
 }
 
+void AnimProvider::setShowAnimations(KHTMLSettings::KAnimationAdvice newAdvice)
+{
+    animationAdvice = newAdvice;
+}
+
 }
 
 // kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
diff -ur kdelibs-4.1.1/khtml/imload/animprovider.h kdelibs-4.1.1-kde#157789/khtml/imload/animprovider.h
--- kdelibs-4.1.1/khtml/imload/animprovider.h	2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/animprovider.h	2008-09-19 01:04:49.000000000 +0200
@@ -25,6 +25,8 @@
 #ifndef ANIM_PROVIDER_H
 #define ANIM_PROVIDER_H
 
+#include <khtml_settings.h>
+
 class QPainter;
 
 namespace khtmlImLoad {
@@ -44,11 +46,13 @@
     PixmapPlane* curFrame;
     Image*       image;
     bool         shouldSwitchFrame; //Set by AnimTimer
+    KHTMLSettings::KAnimationAdvice animationAdvice;
 
     void nextFrame(); //Helper that goes to next frame or wraps around
 public:
     AnimProvider(PixmapPlane* plane, Image* img):frame0(plane), curFrame(plane),
-                                     image(img), shouldSwitchFrame(false)
+                                     image(img), shouldSwitchFrame(false),
+                                     animationAdvice(KHTMLSettings::KAnimationEnabled)
     {}
 
     void switchFrame();
@@ -62,6 +66,11 @@
     //Must be implemented to paint the given region. Note that clipping to the
     //overall canvas will be performed already
     virtual void paint(int dx, int dy, QPainter* p, int sx, int sy, int width, int height) = 0;
+
+    /**
+     Enables or disables animations
+    */
+    void setShowAnimations(KHTMLSettings::KAnimationAdvice);
 };
 
 }
diff -ur kdelibs-4.1.1/khtml/imload/decoders/gifloader.cpp kdelibs-4.1.1-kde#157789/khtml/imload/decoders/gifloader.cpp
--- kdelibs-4.1.1/khtml/imload/decoders/gifloader.cpp	2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/decoders/gifloader.cpp	2008-09-19 01:00:59.000000000 +0200
@@ -212,7 +212,11 @@
 
             ++frame;
             if (frame >= frameInfo.size())
+            {
+                if (animationAdvice == KHTMLSettings::KAnimationLoopOnce)
+                    animationAdvice = KHTMLSettings::KAnimationDisabled;
                 frame = 0;
+            }
             nextFrame();
         }
 
diff -ur kdelibs-4.1.1/khtml/imload/image.cpp kdelibs-4.1.1-kde#157789/khtml/imload/image.cpp
--- kdelibs-4.1.1/khtml/imload/image.cpp	2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/image.cpp	2008-09-19 01:12:02.000000000 +0200
@@ -48,6 +48,7 @@
     inError      = false;
 
     width = height = 0;
+    animationAdvice = KHTMLSettings::KAnimationEnabled;
 
     noUpdates();
 }
@@ -214,6 +215,12 @@
     }
     else
     {
+        for (PixmapPlane* cur = original; cur; cur = cur->nextFrame)
+        {
+            if (cur->animProvider)
+                cur->animProvider->setShowAnimations(animationAdvice);
+        }
+
         fullyDecoded = true;
         owner->imageDone(this);
     }
@@ -452,6 +459,19 @@
     return original->parent->format.hasAlpha();
 }
 
+void Image::setShowAnimations(KHTMLSettings::KAnimationAdvice newAdvice)
+{
+    if (animationAdvice != newAdvice)
+    {
+        animationAdvice = newAdvice;
+        for (PixmapPlane* cur = original; cur; cur = cur->nextFrame)
+        {
+            if (cur->animProvider)
+                cur->animProvider->setShowAnimations(newAdvice);
+        }
+    }
+}
+
 }
 
 // kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
diff -ur kdelibs-4.1.1/khtml/imload/image.h kdelibs-4.1.1-kde#157789/khtml/imload/image.h
--- kdelibs-4.1.1/khtml/imload/image.h	2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/image.h	2008-09-19 01:09:46.000000000 +0200
@@ -30,6 +30,8 @@
 #include <QTimer>
 #include <QPair>
 #include <QMap>
+
+#include <khtml_settings.h>
  
 #include "imageformat.h"
 
@@ -92,6 +94,11 @@
      (but see CanvasImage)
     */
     QImage* qimage()  const;
+
+    /**
+     Enables or disables animations
+    */
+    void setShowAnimations(KHTMLSettings::KAnimationAdvice);
 private:
     //Interface to the loader.
     friend class ImageLoader;
@@ -165,6 +172,7 @@
     int width, height;
     PixmapPlane* original;
     QMap<QPair<int, int>, PixmapPlane*> scaled;
+    KHTMLSettings::KAnimationAdvice animationAdvice;
 
 };
 
diff -ur kdelibs-4.1.1/khtml/misc/loader.cpp kdelibs-4.1.1-kde#157789/khtml/misc/loader.cpp
--- kdelibs-4.1.1/khtml/misc/loader.cpp	2008-08-28 10:08:06.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/misc/loader.cpp	2008-09-19 01:03:07.000000000 +0200
@@ -422,7 +422,7 @@
     m_status = Unknown;
     imgSource = 0;
     setAccept( acceptHeader );
-    m_showAnimations = dl->showAnimations();
+    i->setShowAnimations(dl->showAnimations());
     m_loading = true;
 
     if ( KHTMLGlobal::defaultHTMLSettings()->isAdFiltered( url.string() ) ) {
@@ -807,30 +807,8 @@
 
 void CachedImage::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimations )
 {
-    (void) showAnimations;
-#if 0
-    m_showAnimations = showAnimations;
-    if ( (m_showAnimations == KHTMLSettings::KAnimationDisabled) && imgSource ) {
-#ifdef __GNUC__
-#warning QDataSource
-#endif
-        // imgSource->cleanBuffer();
-        delete p;
-        p = new QPixmap(m->framePixmap());
-#ifdef __GNUC__
-#warning QMovie requires different API now
-#endif
-        //m->disconnectUpdate( this, SLOT( movieUpdated( const QRect &) ));
-        //m->disconnectStatus( this, SLOT( movieStatus( int ) ));
-        // m->disconnectResize( this, SLOT( movieResize( const QSize& ) ) );
-        QTimer::singleShot(0, this, SLOT( deleteMovie()));
-        imgSource = 0;
-    }
-#endif
-
-#ifdef __GNUC__
-#warning "Use largeimagelib to disable animation"
-#endif
+    if (i)
+        i->setShowAnimations(showAnimations);
 }
 
 // void CachedImage::deleteMovie()


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -r1.378 -r1.379
--- kdelibs.spec	18 Sep 2008 14:39:40 -0000	1.378
+++ kdelibs.spec	19 Sep 2008 00:00:20 -0000	1.379
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -78,6 +78,10 @@
 # fix running commands in kglobalconfig before KComponentData init (#455130)
 Patch19: kdelibs-4.1.0-#455130.patch
 Patch20: kdelibs-4.1.1-cmake.patch
+# make "Stop Animations" work again in Konqueror
+# https://bugs.kde.org/show_bug.cgi?id=157789
+# submitted upstream (attached to above bug report)
+Patch21: kdelibs-4.1.1-kde#157789.patch
 
 ## upstream patches
 Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
@@ -213,6 +217,7 @@
 %patch18 -p1 -b .kstandarddirs
 %patch19 -p1 -b .#455130
 %patch20 -p1 -b .cmake
+%patch21 -p1 -b .kde#157789
 
 ## upstream patches
 %patch100 -p0 -b .kde#169447-khtml-regression
@@ -384,6 +389,9 @@
 
 
 %changelog
+* Thu Sep 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-12
+- make "Stop Animations" work again in Konqueror (KDE 4 regression kde#157789)
+
 * Thu Sep 18 2008 Than Ngo <than at redhat.com> 4.1.1-11
 - apply upstream patch to fix the regression
 - drop the kdelibs-4.1.1-bz#461725-regression.patch



From bojan at fedoraproject.org  Fri Sep 19 00:22:05 2008
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Fri, 19 Sep 2008 00:22:05 +0000 (UTC)
Subject: rpms/viewvc/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 viewvc.spec,
	1.9, 1.10
Message-ID: <20080919002205.67085700F7@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23625

Modified Files:
	.cvsignore sources viewvc.spec 
Log Message:
Bump up to 1.0.6.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Feb 2008 22:00:25 -0000	1.4
+++ .cvsignore	19 Sep 2008 00:21:34 -0000	1.5
@@ -1 +1 @@
-viewvc-1.0.5.tar.gz
+viewvc-1.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Feb 2008 22:00:25 -0000	1.4
+++ sources	19 Sep 2008 00:21:34 -0000	1.5
@@ -1 +1 @@
-8fc8107f937b9da481b14333a7fdb29d  viewvc-1.0.5.tar.gz
+882bfbf31773dc3981a8514ca045a30a  viewvc-1.0.6.tar.gz


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/viewvc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- viewvc.spec	28 Feb 2008 22:00:25 -0000	1.9
+++ viewvc.spec	19 Sep 2008 00:21:34 -0000	1.10
@@ -16,7 +16,7 @@
 
 
 Name:           viewvc
-Version:        1.0.5
+Version:        1.0.6
 Release:        1%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
@@ -133,6 +133,9 @@
 %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc
 
 %changelog
+* Fri Sep 19 2008 Bojan Smojver <bojan at rexursive.com> - 1.0.6-1
+- Bump up to 1.0.6
+
 * Fri Feb 29 2008 Bojan Smojver <bojan at rexursive.com> - 1.0.5-1
 - Bump up to 1.0.5
 



From bojan at fedoraproject.org  Fri Sep 19 00:26:14 2008
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Fri, 19 Sep 2008 00:26:14 +0000 (UTC)
Subject: rpms/viewvc/F-9 sources,1.4,1.5 viewvc.spec,1.9,1.10
Message-ID: <20080919002614.4B61E700F7@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23919

Modified Files:
	sources viewvc.spec 
Log Message:
Bump up to 1.0.6.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Feb 2008 22:00:25 -0000	1.4
+++ sources	19 Sep 2008 00:26:13 -0000	1.5
@@ -1 +1 @@
-8fc8107f937b9da481b14333a7fdb29d  viewvc-1.0.5.tar.gz
+882bfbf31773dc3981a8514ca045a30a  viewvc-1.0.6.tar.gz


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-9/viewvc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- viewvc.spec	28 Feb 2008 22:00:25 -0000	1.9
+++ viewvc.spec	19 Sep 2008 00:26:13 -0000	1.10
@@ -16,7 +16,7 @@
 
 
 Name:           viewvc
-Version:        1.0.5
+Version:        1.0.6
 Release:        1%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
@@ -133,6 +133,9 @@
 %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc
 
 %changelog
+* Fri Sep 19 2008 Bojan Smojver <bojan at rexursive.com> - 1.0.6-1
+- Bump up to 1.0.6
+
 * Fri Feb 29 2008 Bojan Smojver <bojan at rexursive.com> - 1.0.5-1
 - Bump up to 1.0.5
 



From bojan at fedoraproject.org  Fri Sep 19 00:27:49 2008
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Fri, 19 Sep 2008 00:27:49 +0000 (UTC)
Subject: rpms/viewvc/F-8 sources,1.4,1.5 viewvc.spec,1.9,1.10
Message-ID: <20080919002749.DF661700F7@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24088

Modified Files:
	sources viewvc.spec 
Log Message:
Bump up to 1.0.6.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Feb 2008 22:04:57 -0000	1.4
+++ sources	19 Sep 2008 00:27:19 -0000	1.5
@@ -1 +1 @@
-8fc8107f937b9da481b14333a7fdb29d  viewvc-1.0.5.tar.gz
+882bfbf31773dc3981a8514ca045a30a  viewvc-1.0.6.tar.gz


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-8/viewvc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- viewvc.spec	28 Feb 2008 22:04:57 -0000	1.9
+++ viewvc.spec	19 Sep 2008 00:27:19 -0000	1.10
@@ -16,7 +16,7 @@
 
 
 Name:           viewvc
-Version:        1.0.5
+Version:        1.0.6
 Release:        1%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
@@ -133,6 +133,9 @@
 %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc
 
 %changelog
+* Fri Sep 19 2008 Bojan Smojver <bojan at rexursive.com> - 1.0.6-1
+- Bump up to 1.0.6
+
 * Fri Feb 29 2008 Bojan Smojver <bojan at rexursive.com> - 1.0.5-1
 - Bump up to 1.0.5
 



From bojan at fedoraproject.org  Fri Sep 19 00:30:34 2008
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Fri, 19 Sep 2008 00:30:34 +0000 (UTC)
Subject: rpms/viewvc/EL-5 sources,1.4,1.5 viewvc.spec,1.4,1.5
Message-ID: <20080919003035.396D9700F7@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24361

Modified Files:
	sources viewvc.spec 
Log Message:
Bump up to 1.0.6.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Feb 2008 22:08:23 -0000	1.4
+++ sources	19 Sep 2008 00:30:04 -0000	1.5
@@ -1 +1 @@
-8fc8107f937b9da481b14333a7fdb29d  viewvc-1.0.5.tar.gz
+882bfbf31773dc3981a8514ca045a30a  viewvc-1.0.6.tar.gz


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/EL-5/viewvc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- viewvc.spec	28 Feb 2008 22:08:23 -0000	1.4
+++ viewvc.spec	19 Sep 2008 00:30:04 -0000	1.5
@@ -16,7 +16,7 @@
 
 
 Name:           viewvc
-Version:        1.0.5
+Version:        1.0.6
 Release:        1%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
@@ -126,6 +126,9 @@
 %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc
 
 %changelog
+* Fri Sep 19 2008 Bojan Smojver <bojan at rexursive.com> - 1.0.6-1
+- Bump up to 1.0.6
+
 * Fri Feb 29 2008 Bojan Smojver <bojan at rexursive.com> - 1.0.5-1
 - Bump up to 1.0.5
 



From bojan at fedoraproject.org  Fri Sep 19 00:32:28 2008
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Fri, 19 Sep 2008 00:32:28 +0000 (UTC)
Subject: rpms/viewvc/EL-4 sources,1.4,1.5 viewvc.spec,1.9,1.10
Message-ID: <20080919003228.E966E700F7@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24618

Modified Files:
	sources viewvc.spec 
Log Message:
Bump up to 1.0.6.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Feb 2008 22:12:24 -0000	1.4
+++ sources	19 Sep 2008 00:31:58 -0000	1.5
@@ -1 +1 @@
-8fc8107f937b9da481b14333a7fdb29d  viewvc-1.0.5.tar.gz
+882bfbf31773dc3981a8514ca045a30a  viewvc-1.0.6.tar.gz


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/EL-4/viewvc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- viewvc.spec	28 Feb 2008 22:12:24 -0000	1.9
+++ viewvc.spec	19 Sep 2008 00:31:58 -0000	1.10
@@ -16,7 +16,7 @@
 
 
 Name:           viewvc
-Version:        1.0.5
+Version:        1.0.6
 Release:        1%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
@@ -133,6 +133,9 @@
 %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc
 
 %changelog
+* Fri Sep 19 2008 Bojan Smojver <bojan at rexursive.com> - 1.0.6-1
+- Bump up to 1.0.6
+
 * Fri Feb 29 2008 Bojan Smojver <bojan at rexursive.com> - 1.0.5-1
 - Bump up to 1.0.5
 



From kkofler at fedoraproject.org  Fri Sep 19 00:42:56 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 19 Sep 2008 00:42:56 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.1.1-kde#157789.patch, 1.1,
	1.2 kdelibs.spec, 1.379, 1.380
Message-ID: <20080919004256.B17E5700F7@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25447/devel

Modified Files:
	kdelibs-4.1.1-kde#157789.patch kdelibs.spec 
Log Message:
Improved kde#157789 patch as per upstream feedback, move to "upstream patches" as it got essentially approved.

kdelibs-4.1.1-kde#157789.patch:

Index: kdelibs-4.1.1-kde#157789.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs-4.1.1-kde#157789.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.1.1-kde#157789.patch	19 Sep 2008 00:00:20 -0000	1.1
+++ kdelibs-4.1.1-kde#157789.patch	19 Sep 2008 00:42:56 -0000	1.2
@@ -78,7 +78,7 @@
  
 diff -ur kdelibs-4.1.1/khtml/imload/image.cpp kdelibs-4.1.1-kde#157789/khtml/imload/image.cpp
 --- kdelibs-4.1.1/khtml/imload/image.cpp	2008-05-21 13:06:09.000000000 +0200
-+++ kdelibs-4.1.1-kde#157789/khtml/imload/image.cpp	2008-09-19 01:12:02.000000000 +0200
++++ kdelibs-4.1.1-kde#157789/khtml/imload/image.cpp	2008-09-19 02:20:03.000000000 +0200
 @@ -48,6 +48,7 @@
      inError      = false;
  
@@ -87,20 +87,17 @@
  
      noUpdates();
  }
-@@ -214,6 +215,12 @@
+@@ -214,6 +215,9 @@
      }
      else
      {
-+        for (PixmapPlane* cur = original; cur; cur = cur->nextFrame)
-+        {
-+            if (cur->animProvider)
-+                cur->animProvider->setShowAnimations(animationAdvice);
-+        }
++        if (original && original->animProvider)
++            original->animProvider->setShowAnimations(animationAdvice);
 +
          fullyDecoded = true;
          owner->imageDone(this);
      }
-@@ -452,6 +459,19 @@
+@@ -452,6 +456,16 @@
      return original->parent->format.hasAlpha();
  }
  
@@ -109,11 +106,8 @@
 +    if (animationAdvice != newAdvice)
 +    {
 +        animationAdvice = newAdvice;
-+        for (PixmapPlane* cur = original; cur; cur = cur->nextFrame)
-+        {
-+            if (cur->animProvider)
-+                cur->animProvider->setShowAnimations(newAdvice);
-+        }
++        if (original && original->animProvider)
++            original->animProvider->setShowAnimations(newAdvice);
 +    }
 +}
 +
@@ -197,3 +191,14 @@
  }
  
  // void CachedImage::deleteMovie()
+diff -ur kdelibs-4.1.1/khtml/misc/loader.h kdelibs-4.1.1-kde#157789/khtml/misc/loader.h
+--- kdelibs-4.1.1/khtml/misc/loader.h	2008-05-21 13:05:54.000000000 +0200
++++ kdelibs-4.1.1-kde#157789/khtml/misc/loader.h	2008-09-19 02:15:41.000000000 +0200
+@@ -363,7 +363,6 @@
+ 	bool typeChecked : 1;
+         bool isFullyTransparent : 1;
+         bool monochrome : 1;
+-        KHTMLSettings::KAnimationAdvice m_showAnimations : 2;
+ 
+         friend class Cache;
+         friend class ::KHTMLPart;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -r1.379 -r1.380
--- kdelibs.spec	19 Sep 2008 00:00:20 -0000	1.379
+++ kdelibs.spec	19 Sep 2008 00:42:56 -0000	1.380
@@ -78,10 +78,6 @@
 # fix running commands in kglobalconfig before KComponentData init (#455130)
 Patch19: kdelibs-4.1.0-#455130.patch
 Patch20: kdelibs-4.1.1-cmake.patch
-# make "Stop Animations" work again in Konqueror
-# https://bugs.kde.org/show_bug.cgi?id=157789
-# submitted upstream (attached to above bug report)
-Patch21: kdelibs-4.1.1-kde#157789.patch
 
 ## upstream patches
 Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
@@ -93,6 +89,10 @@
 Patch106: kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch
 Patch107: kdelibs-4.1.1-kde#860005-emoticons.patch
 Patch108: kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch
+# make "Stop Animations" work again in Konqueror
+# https://bugs.kde.org/show_bug.cgi?id=157789
+# submitted upstream (attached to above bug report)
+Patch109: kdelibs-4.1.1-kde#157789.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -217,7 +217,6 @@
 %patch18 -p1 -b .kstandarddirs
 %patch19 -p1 -b .#455130
 %patch20 -p1 -b .cmake
-%patch21 -p1 -b .kde#157789
 
 ## upstream patches
 %patch100 -p0 -b .kde#169447-khtml-regression
@@ -229,6 +228,7 @@
 %patch106 -p0 -b .kde#860095-khtml-scroll-crash
 %patch107 -p0 -b .kde#860005-emoticons
 %patch108 -p0 -b .kde#170461-khtml-regression
+%patch109 -p1 -b .kde#157789
 
 %build
 
@@ -389,7 +389,7 @@
 
 
 %changelog
-* Thu Sep 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-12
+* Fri Sep 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-12
 - make "Stop Animations" work again in Konqueror (KDE 4 regression kde#157789)
 
 * Thu Sep 18 2008 Than Ngo <than at redhat.com> 4.1.1-11



From kkofler at fedoraproject.org  Fri Sep 19 00:43:26 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 19 Sep 2008 00:43:26 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.1.1-kde#157789.patch, 1.1,
	1.2 kdelibs.spec, 1.355, 1.356
Message-ID: <20080919004326.4EF6E700F7@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25447/F-9

Modified Files:
	kdelibs-4.1.1-kde#157789.patch kdelibs.spec 
Log Message:
Improved kde#157789 patch as per upstream feedback, move to "upstream patches" as it got essentially approved.

kdelibs-4.1.1-kde#157789.patch:

Index: kdelibs-4.1.1-kde#157789.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs-4.1.1-kde#157789.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.1.1-kde#157789.patch	19 Sep 2008 00:00:20 -0000	1.1
+++ kdelibs-4.1.1-kde#157789.patch	19 Sep 2008 00:42:55 -0000	1.2
@@ -78,7 +78,7 @@
  
 diff -ur kdelibs-4.1.1/khtml/imload/image.cpp kdelibs-4.1.1-kde#157789/khtml/imload/image.cpp
 --- kdelibs-4.1.1/khtml/imload/image.cpp	2008-05-21 13:06:09.000000000 +0200
-+++ kdelibs-4.1.1-kde#157789/khtml/imload/image.cpp	2008-09-19 01:12:02.000000000 +0200
++++ kdelibs-4.1.1-kde#157789/khtml/imload/image.cpp	2008-09-19 02:20:03.000000000 +0200
 @@ -48,6 +48,7 @@
      inError      = false;
  
@@ -87,20 +87,17 @@
  
      noUpdates();
  }
-@@ -214,6 +215,12 @@
+@@ -214,6 +215,9 @@
      }
      else
      {
-+        for (PixmapPlane* cur = original; cur; cur = cur->nextFrame)
-+        {
-+            if (cur->animProvider)
-+                cur->animProvider->setShowAnimations(animationAdvice);
-+        }
++        if (original && original->animProvider)
++            original->animProvider->setShowAnimations(animationAdvice);
 +
          fullyDecoded = true;
          owner->imageDone(this);
      }
-@@ -452,6 +459,19 @@
+@@ -452,6 +456,16 @@
      return original->parent->format.hasAlpha();
  }
  
@@ -109,11 +106,8 @@
 +    if (animationAdvice != newAdvice)
 +    {
 +        animationAdvice = newAdvice;
-+        for (PixmapPlane* cur = original; cur; cur = cur->nextFrame)
-+        {
-+            if (cur->animProvider)
-+                cur->animProvider->setShowAnimations(newAdvice);
-+        }
++        if (original && original->animProvider)
++            original->animProvider->setShowAnimations(newAdvice);
 +    }
 +}
 +
@@ -197,3 +191,14 @@
  }
  
  // void CachedImage::deleteMovie()
+diff -ur kdelibs-4.1.1/khtml/misc/loader.h kdelibs-4.1.1-kde#157789/khtml/misc/loader.h
+--- kdelibs-4.1.1/khtml/misc/loader.h	2008-05-21 13:05:54.000000000 +0200
++++ kdelibs-4.1.1-kde#157789/khtml/misc/loader.h	2008-09-19 02:15:41.000000000 +0200
+@@ -363,7 +363,6 @@
+ 	bool typeChecked : 1;
+         bool isFullyTransparent : 1;
+         bool monochrome : 1;
+-        KHTMLSettings::KAnimationAdvice m_showAnimations : 2;
+ 
+         friend class Cache;
+         friend class ::KHTMLPart;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- kdelibs.spec	19 Sep 2008 00:00:20 -0000	1.355
+++ kdelibs.spec	19 Sep 2008 00:42:56 -0000	1.356
@@ -80,10 +80,6 @@
 # fix running commands in kglobalconfig before KComponentData init (#455130)
 Patch19: kdelibs-4.1.0-#455130.patch
 Patch20: kdelibs-4.1.1-cmake.patch
-# make "Stop Animations" work again in Konqueror
-# https://bugs.kde.org/show_bug.cgi?id=157789
-# submitted upstream (attached to above bug report)
-Patch21: kdelibs-4.1.1-kde#157789.patch
 
 ## upstream patches
 Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
@@ -95,6 +91,10 @@
 Patch106: kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch
 Patch107: kdelibs-4.1.1-kde#860005-emoticons.patch
 Patch108: kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch
+# make "Stop Animations" work again in Konqueror
+# https://bugs.kde.org/show_bug.cgi?id=157789
+# submitted upstream (attached to above bug report)
+Patch109: kdelibs-4.1.1-kde#157789.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -220,7 +220,6 @@
 %patch18 -p1 -b .kstandarddirs
 %patch19 -p1 -b .#455130
 %patch20 -p1 -b .cmake
-%patch21 -p1 -b .kde#157789
 
 ## upstream patches
 %patch100 -p0 -b .kde#169447-khtml-regression
@@ -232,6 +231,7 @@
 %patch106 -p0 -b .kde#860095-khtml-scroll-crash
 %patch107 -p0 -b .kde#860005-emoticons
 %patch108 -p0 -b .kde#170461-khtml-regression
+%patch109 -p1 -b .kde#157789
 
 %build
 
@@ -392,7 +392,7 @@
 
 
 %changelog
-* Thu Sep 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-12
+* Fri Sep 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-12
 - make "Stop Animations" work again in Konqueror (KDE 4 regression kde#157789)
 
 * Thu Sep 18 2008 Than Ngo <than at redhat.com> 4.1.1-11



From kkofler at fedoraproject.org  Fri Sep 19 00:54:54 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 19 Sep 2008 00:54:54 +0000 (UTC)
Subject: rpms/kdelibs4/F-8 kdelibs-4.1.1-kde#157789.patch, NONE,
	1.1 kdelibs-4.1.1-kde#858795-mimeassoc.patch, NONE,
	1.1 kdelibs-4.1.1-kde#860005-emoticons.patch, NONE,
	1.1 kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch, NONE,
	1.1 kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch,
	NONE, 1.1 kdelibs4.spec, 1.35,
	1.36 kdelibs-4.1.1-bz#461725-regression.patch, 1.1, NONE
Message-ID: <20080919005454.068F2700F7@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26242/F-8

Modified Files:
	kdelibs4.spec 
Added Files:
	kdelibs-4.1.1-kde#157789.patch 
	kdelibs-4.1.1-kde#858795-mimeassoc.patch 
	kdelibs-4.1.1-kde#860005-emoticons.patch 
	kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch 
	kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch 
Removed Files:
	kdelibs-4.1.1-bz#461725-regression.patch 
Log Message:
Sync from kdelibs/F-9:

* Fri Sep 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-12
- make "Stop Animations" work again in Konqueror (KDE 4 regression kde#157789)

* Thu Sep 18 2008 Than Ngo <than at redhat.com> 4.1.1-11
- apply upstream patch to fix the regression
- drop the kdelibs-4.1.1-bz#461725-regression.patch

* Thu Sep 18 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-10
- Fix file association bug, the global mimeapps.list file had priority
  over the local one.
- khtml scroll crash fix (kdebug:170880)
- Don't eat text when the emoticons were not installed. This fixes
  mail text not being displayed in KMail when kdebase-runtime wasn't
  installed.

kdelibs-4.1.1-kde#157789.patch:

--- NEW FILE kdelibs-4.1.1-kde#157789.patch ---
diff -ur kdelibs-4.1.1/khtml/imload/animprovider.cpp kdelibs-4.1.1-kde#157789/khtml/imload/animprovider.cpp
--- kdelibs-4.1.1/khtml/imload/animprovider.cpp	2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/animprovider.cpp	2008-09-19 01:00:47.000000000 +0200
@@ -38,6 +38,8 @@
 
 void AnimProvider::switchFrame()
 {
+    if (animationAdvice == KHTMLSettings::KAnimationDisabled)
+        return;
     shouldSwitchFrame = true; 
     image->notifyPerformUpdate();
 }
@@ -47,6 +49,11 @@
     ImageManager::animTimer()->destroyed(this);
 }
 
+void AnimProvider::setShowAnimations(KHTMLSettings::KAnimationAdvice newAdvice)
+{
+    animationAdvice = newAdvice;
+}
+
 }
 
 // kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
diff -ur kdelibs-4.1.1/khtml/imload/animprovider.h kdelibs-4.1.1-kde#157789/khtml/imload/animprovider.h
--- kdelibs-4.1.1/khtml/imload/animprovider.h	2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/animprovider.h	2008-09-19 01:04:49.000000000 +0200
@@ -25,6 +25,8 @@
 #ifndef ANIM_PROVIDER_H
 #define ANIM_PROVIDER_H
 
+#include <khtml_settings.h>
+
 class QPainter;
 
 namespace khtmlImLoad {
@@ -44,11 +46,13 @@
     PixmapPlane* curFrame;
     Image*       image;
     bool         shouldSwitchFrame; //Set by AnimTimer
+    KHTMLSettings::KAnimationAdvice animationAdvice;
 
     void nextFrame(); //Helper that goes to next frame or wraps around
 public:
     AnimProvider(PixmapPlane* plane, Image* img):frame0(plane), curFrame(plane),
-                                     image(img), shouldSwitchFrame(false)
+                                     image(img), shouldSwitchFrame(false),
+                                     animationAdvice(KHTMLSettings::KAnimationEnabled)
     {}
 
     void switchFrame();
@@ -62,6 +66,11 @@
     //Must be implemented to paint the given region. Note that clipping to the
     //overall canvas will be performed already
     virtual void paint(int dx, int dy, QPainter* p, int sx, int sy, int width, int height) = 0;
+
+    /**
+     Enables or disables animations
+    */
+    void setShowAnimations(KHTMLSettings::KAnimationAdvice);
 };
 
 }
diff -ur kdelibs-4.1.1/khtml/imload/decoders/gifloader.cpp kdelibs-4.1.1-kde#157789/khtml/imload/decoders/gifloader.cpp
--- kdelibs-4.1.1/khtml/imload/decoders/gifloader.cpp	2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/decoders/gifloader.cpp	2008-09-19 01:00:59.000000000 +0200
@@ -212,7 +212,11 @@
 
             ++frame;
             if (frame >= frameInfo.size())
+            {
+                if (animationAdvice == KHTMLSettings::KAnimationLoopOnce)
+                    animationAdvice = KHTMLSettings::KAnimationDisabled;
                 frame = 0;
+            }
             nextFrame();
         }
 
diff -ur kdelibs-4.1.1/khtml/imload/image.cpp kdelibs-4.1.1-kde#157789/khtml/imload/image.cpp
--- kdelibs-4.1.1/khtml/imload/image.cpp	2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/image.cpp	2008-09-19 02:20:03.000000000 +0200
@@ -48,6 +48,7 @@
     inError      = false;
 
     width = height = 0;
+    animationAdvice = KHTMLSettings::KAnimationEnabled;
 
     noUpdates();
 }
@@ -214,6 +215,9 @@
     }
     else
     {
+        if (original && original->animProvider)
+            original->animProvider->setShowAnimations(animationAdvice);
+
         fullyDecoded = true;
         owner->imageDone(this);
     }
@@ -452,6 +456,16 @@
     return original->parent->format.hasAlpha();
 }
 
+void Image::setShowAnimations(KHTMLSettings::KAnimationAdvice newAdvice)
+{
+    if (animationAdvice != newAdvice)
+    {
+        animationAdvice = newAdvice;
+        if (original && original->animProvider)
+            original->animProvider->setShowAnimations(newAdvice);
+    }
+}
+
 }
 
 // kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
diff -ur kdelibs-4.1.1/khtml/imload/image.h kdelibs-4.1.1-kde#157789/khtml/imload/image.h
--- kdelibs-4.1.1/khtml/imload/image.h	2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/image.h	2008-09-19 01:09:46.000000000 +0200
@@ -30,6 +30,8 @@
 #include <QTimer>
 #include <QPair>
 #include <QMap>
+
+#include <khtml_settings.h>
  
 #include "imageformat.h"
 
@@ -92,6 +94,11 @@
      (but see CanvasImage)
     */
     QImage* qimage()  const;
+
+    /**
+     Enables or disables animations
+    */
+    void setShowAnimations(KHTMLSettings::KAnimationAdvice);
 private:
     //Interface to the loader.
     friend class ImageLoader;
@@ -165,6 +172,7 @@
     int width, height;
     PixmapPlane* original;
     QMap<QPair<int, int>, PixmapPlane*> scaled;
+    KHTMLSettings::KAnimationAdvice animationAdvice;
 
 };
 
diff -ur kdelibs-4.1.1/khtml/misc/loader.cpp kdelibs-4.1.1-kde#157789/khtml/misc/loader.cpp
--- kdelibs-4.1.1/khtml/misc/loader.cpp	2008-08-28 10:08:06.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/misc/loader.cpp	2008-09-19 01:03:07.000000000 +0200
@@ -422,7 +422,7 @@
     m_status = Unknown;
     imgSource = 0;
     setAccept( acceptHeader );
-    m_showAnimations = dl->showAnimations();
+    i->setShowAnimations(dl->showAnimations());
     m_loading = true;
 
     if ( KHTMLGlobal::defaultHTMLSettings()->isAdFiltered( url.string() ) ) {
@@ -807,30 +807,8 @@
 
 void CachedImage::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimations )
 {
-    (void) showAnimations;
-#if 0
-    m_showAnimations = showAnimations;
-    if ( (m_showAnimations == KHTMLSettings::KAnimationDisabled) && imgSource ) {
-#ifdef __GNUC__
-#warning QDataSource
-#endif
-        // imgSource->cleanBuffer();
-        delete p;
-        p = new QPixmap(m->framePixmap());
-#ifdef __GNUC__
-#warning QMovie requires different API now
-#endif
-        //m->disconnectUpdate( this, SLOT( movieUpdated( const QRect &) ));
-        //m->disconnectStatus( this, SLOT( movieStatus( int ) ));
-        // m->disconnectResize( this, SLOT( movieResize( const QSize& ) ) );
-        QTimer::singleShot(0, this, SLOT( deleteMovie()));
-        imgSource = 0;
-    }
-#endif
-
-#ifdef __GNUC__
-#warning "Use largeimagelib to disable animation"
-#endif
+    if (i)
+        i->setShowAnimations(showAnimations);
 }
 
 // void CachedImage::deleteMovie()
diff -ur kdelibs-4.1.1/khtml/misc/loader.h kdelibs-4.1.1-kde#157789/khtml/misc/loader.h
--- kdelibs-4.1.1/khtml/misc/loader.h	2008-05-21 13:05:54.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/misc/loader.h	2008-09-19 02:15:41.000000000 +0200
@@ -363,7 +363,6 @@
 	bool typeChecked : 1;
         bool isFullyTransparent : 1;
         bool monochrome : 1;
-        KHTMLSettings::KAnimationAdvice m_showAnimations : 2;
 
         friend class Cache;
         friend class ::KHTMLPart;

kdelibs-4.1.1-kde#858795-mimeassoc.patch:

--- NEW FILE kdelibs-4.1.1-kde#858795-mimeassoc.patch ---
Index: kded/kmimeassociations.cpp
===================================================================
--- kded/kmimeassociations.cpp	(revision 858794)
+++ kded/kmimeassociations.cpp	(revision 858795)
@@ -62,7 +62,7 @@
         const QString mimeappsFile = mimeappsIter.previous();
         kDebug(7021) << "Parsing" << mimeappsFile;
         parseMimeAppsList(mimeappsFile, basePreference);
-        basePreference -= 50;
+        basePreference += 50;
     }
     return true;
 }

kdelibs-4.1.1-kde#860005-emoticons.patch:

--- NEW FILE kdelibs-4.1.1-kde#860005-emoticons.patch ---
Index: kutils/kemoticons/kemoticonstheme.cpp
===================================================================
--- kutils/kemoticons/kemoticonstheme.cpp	(revision 860004)
+++ kutils/kemoticons/kemoticonstheme.cpp	(revision 860005)
@@ -161,6 +161,9 @@
 QString KEmoticonsTheme::parseEmoticons(const QString &text, ParseMode mode, const QStringList &exclude) const
 {
     QList<Token> tokens = tokenize(text, mode | SkipHTML);
+    if (tokens.isEmpty() && !text.isEmpty())
+        return text;
+
     QString result;
 
     foreach(const Token &token , tokens) {

kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch:

--- NEW FILE kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch ---
Index: khtml/rendering/render_layer.cpp
===================================================================
--- khtml/rendering/render_layer.cpp	(revision 860094)
+++ khtml/rendering/render_layer.cpp	(revision 860095)
@@ -715,9 +715,6 @@
     for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
         child->updateLayerPositions(rootLayer);
     
-    // Fire the scroll DOM event.
-    m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false);
-
     // Just schedule a full repaint of our object.
     if (repaint)
         m_object->repaint(RealtimePriority);
@@ -728,6 +725,9 @@
         if (m_vBar)
             m_vBar->setValue(m_scrollY);
     }
+
+    // Fire the scroll DOM event. Do this the very last thing, since the handler may kill us.
+    m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false);    
 }
 
 void RenderLayer::updateScrollPositionFromScrollbars()

kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch:

--- NEW FILE kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch ---
Index: khtml/ecma/kjs_proxy.h
===================================================================
--- khtml/ecma/kjs_proxy.h	(Revision 854182)
+++ khtml/ecma/kjs_proxy.h	(Revision 854183)
@@ -62,6 +62,7 @@
   virtual KJS::Interpreter *interpreter() = 0;
 
   virtual void setDebugEnabled(bool enabled) = 0;
+  virtual bool debugEnabled() const = 0;
   virtual void showDebugWindow(bool show=true) = 0;
   virtual bool paused() const = 0;
   virtual void dataReceived() = 0;
Index: khtml/ecma/kjs_events.cpp
===================================================================
--- khtml/ecma/kjs_events.cpp	(Revision 854182)
+++ khtml/ecma/kjs_events.cpp	(Revision 854183)
@@ -62,18 +62,18 @@
 
 void JSEventListener::handleEvent(DOM::Event &evt)
 {
-#ifdef KJS_DEBUGGER
-  //### This is the wrong place to do this --- we need 
-  // a more global/general stategy to prevent unwanted event loop recursion issues.
-  if (DebugWindow::window() && DebugWindow::window()->inSession())
-    return;
-#endif
   KHTMLPart *part = qobject_cast<KHTMLPart*>(static_cast<Window*>(win.get())->part());
   KJSProxy *proxy = 0L;
   if (part)
     proxy = part->jScript();
 
   if (proxy && listener && listener->implementsCall()) {
+#ifdef KJS_DEBUGGER
+  //### This is the wrong place to do this --- we need 
+  // a more global/general stategy to prevent unwanted event loop recursion issues.
+    if (proxy->debugEnabled() && DebugWindow::window()->inSession())
+      return;
+#endif
     ref();
 
     KJS::ScriptInterpreter *interpreter = static_cast<KJS::ScriptInterpreter *>(proxy->interpreter());
Index: khtml/ecma/kjs_proxy.cpp
===================================================================
--- khtml/ecma/kjs_proxy.cpp	(Revision 854182)
+++ khtml/ecma/kjs_proxy.cpp	(Revision 854183)
@@ -60,6 +60,7 @@
   virtual KJS::Interpreter *interpreter();
 
   virtual void setDebugEnabled(bool enabled);
+  virtual bool debugEnabled() const;
   virtual void showDebugWindow(bool show=true);
   virtual bool paused() const;
   virtual void dataReceived();
@@ -279,6 +280,15 @@
 #endif
 }
 
+bool KJSProxyImpl::debugEnabled() const
+{
+#ifdef KJS_DEBUGGER
+  return m_debugEnabled;
+#else
+  return false;
+#endif
+}
+
 void KJSProxyImpl::showDebugWindow(bool /*show*/)
 {
 #ifdef KJS_DEBUGGER


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kdelibs4.spec	16 Sep 2008 21:51:15 -0000	1.35
+++ kdelibs4.spec	19 Sep 2008 00:54:53 -0000	1.36
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 9%{?dist}
+Release: 12%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -80,7 +80,6 @@
 # fix running commands in kglobalconfig before KComponentData init (#455130)
 Patch19: kdelibs-4.1.0-#455130.patch
 Patch20: kdelibs-4.1.1-cmake.patch
-Patch21: kdelibs-4.1.1-bz#461725-regression.patch
 
 ## upstream patches
 Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
@@ -88,6 +87,14 @@
 Patch102: kdelibs-4.1.1-kde#856403-urlnav.patch
 Patch103: kdelibs-4.1.1-kutils-fixes.patch
 Patch104: kdelibs-4.1.1-kdeui-widgets-fixes.patch
+Patch105: kdelibs-4.1.1-kde#858795-mimeassoc.patch
+Patch106: kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch
+Patch107: kdelibs-4.1.1-kde#860005-emoticons.patch
+Patch108: kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch
+# make "Stop Animations" work again in Konqueror
+# https://bugs.kde.org/show_bug.cgi?id=157789
+# submitted upstream (attached to above bug report)
+Patch109: kdelibs-4.1.1-kde#157789.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -213,7 +220,6 @@
 %patch18 -p1 -b .kstandarddirs
 %patch19 -p1 -b .#455130
 %patch20 -p1 -b .cmake
-%patch21 -p0 -b .bz#461725-regression
 
 ## upstream patches
 %patch100 -p0 -b .kde#169447-khtml-regression
@@ -221,6 +227,11 @@
 %patch102 -p0 -b .kde#856403-urlnav
 %patch103 -p0 -b .kutils-fixes
 %patch104 -p0 -b .kdeui-widgets-fixes
+%patch105 -p0 -b .kde#858795-mimeassoc
+%patch106 -p0 -b .kde#860095-khtml-scroll-crash
+%patch107 -p0 -b .kde#860005-emoticons
+%patch108 -p0 -b .kde#170461-khtml-regression
+%patch109 -p1 -b .kde#157789
 
 %build
 
@@ -381,6 +392,21 @@
 
 
 %changelog
+* Fri Sep 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-12
+- make "Stop Animations" work again in Konqueror (KDE 4 regression kde#157789)
+
+* Thu Sep 18 2008 Than Ngo <than at redhat.com> 4.1.1-11
+- apply upstream patch to fix the regression
+- drop the kdelibs-4.1.1-bz#461725-regression.patch
+
+* Thu Sep 18 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-10
+- Fix file association bug, the global mimeapps.list file had priority
+  over the local one.
+- khtml scroll crash fix (kdebug:170880)
+- Don't eat text when the emoticons were not installed. This fixes
+  mail text not being displayed in KMail when kdebase-runtime wasn't
+  installed.
+
 * Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.1.1-9
 - #461725, revert the patch to fix the regression
 


--- kdelibs-4.1.1-bz#461725-regression.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Sep 19 01:10:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 01:10:13 +0000
Subject: [pkgdb] MAKEDEV: airlied has requested commit
Message-ID: <20080919011013.AB65F208D9F@bastion.fedora.phx.redhat.com>

airlied has requested the commit acl on MAKEDEV (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/MAKEDEV



From nbecker at fedoraproject.org  Fri Sep 19 01:26:54 2008
From: nbecker at fedoraproject.org (Neal Becker)
Date: Fri, 19 Sep 2008 01:26:54 +0000 (UTC)
Subject: rpms/igraph/devel igraph.spec,1.17,1.18
Message-ID: <20080919012654.62E5B700F7@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/igraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27866

Modified Files:
	igraph.spec 
Log Message:
Add BR libxml2-devel to get graphml support.



Index: igraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/devel/igraph.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- igraph.spec	26 Feb 2008 19:24:36 -0000	1.17
+++ igraph.spec	19 Sep 2008 01:26:24 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		igraph
 Version:	0.5
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	Library for creating and manipulating graphs
 
 Group:		System Environment/Libraries
@@ -11,7 +11,7 @@
 Patch2:		igraph-test.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#BuildRequires:	gcc
+BuildRequires:	libxml2-devel
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 Provides: 	%{name}-%{version}
@@ -92,6 +92,9 @@
 make check
 
 %changelog
+* Thu Sep 18 2008 Neal Becker <ndbecker2 at gmail.com> - 0.5-14
+- Add BR libxml2-devel to get graphml support.
+
 * Tue Feb 26 2008 Neal Becker <ndbecker2 at gmail.com> - 0.5-13
 - More test fixes
 



From rstrode at fedoraproject.org  Fri Sep 19 03:02:19 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 19 Sep 2008 03:02:19 +0000 (UTC)
Subject: rpms/gnome-desktop/devel gnome-desktop-2.23.92-fade.patch, NONE,
	1.1 gnome-desktop.spec, 1.163, 1.164
Message-ID: <20080919030219.54D19700F7@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32495

Modified Files:
	gnome-desktop.spec 
Added Files:
	gnome-desktop-2.23.92-fade.patch 
Log Message:
- Add new api for doing desktop background change transition


gnome-desktop-2.23.92-fade.patch:

--- NEW FILE gnome-desktop-2.23.92-fade.patch ---
diff -up gnome-desktop-2.23.92/libgnome-desktop/gnome-bg.c.fade gnome-desktop-2.23.92/libgnome-desktop/gnome-bg.c
--- gnome-desktop-2.23.92/libgnome-desktop/gnome-bg.c.fade	2008-09-08 15:43:13.000000000 -0400
+++ gnome-desktop-2.23.92/libgnome-desktop/gnome-bg.c	2008-09-18 22:34:56.000000000 -0400
@@ -37,11 +37,15 @@ Author: Soren Sandmann <sandmann at redhat.
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
+#include <cairo.h>
+#include <cairo-xlib.h>
+
 #include <gconf/gconf-client.h>
 #include <libgnomeui/libgnomeui.h>
 
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnomeui/gnome-bg.h>
+#include <libgnomeui/gnome-bg-crossfade.h>
 
 #define BG_KEY_DRAW_BACKGROUND    GNOME_BG_KEY_DIR "/draw_background"
 #define BG_KEY_PRIMARY_COLOR      GNOME_BG_KEY_DIR "/primary_color"
@@ -1012,52 +1016,88 @@ gnome_bg_create_thumbnail (GnomeBG      
 }
 
 
-/* Set the root pixmap, and properties pointing to it. We
- * do this atomically with XGrabServer to make sure that
- * we won't leak the pixmap if somebody else it setting
- * it at the same time. (This assumes that they follow the
- * same conventions we do)
- */
-void 
-gnome_bg_set_pixmap_as_root (GdkScreen *screen, GdkPixmap *pixmap)
+static GdkPixmap * 
+gnome_bg_set_root_pixmap_id (GdkScreen *screen,
+			     GdkPixmap *pixmap,
+			     gboolean   copy_old_root)
 {
 	int      result;
 	gint     format;
 	gulong   nitems;
 	gulong   bytes_after;
-	guchar  *data_esetroot;
+	guchar  *data;
 	Pixmap   pixmap_id;
 	Atom     type;
 	Display *display;
 	int      screen_num;
-	
-	g_return_if_fail (screen != NULL);
-	g_return_if_fail (pixmap != NULL);
+	GdkPixmap *old_root_pixmap;
 	
 	screen_num = gdk_screen_get_number (screen);
-	
-	data_esetroot = NULL;
+	old_root_pixmap = NULL;
+	data = NULL;
 	display = GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen));
 	
 	XGrabServer (display);
+
+	if (copy_old_root) {
+		result = XGetWindowProperty (display,
+					    RootWindow (display, screen_num),
+					    gdk_x11_get_xatom_by_name ("_XROOTPMAP_ID"),
+					    0L, 1L, False, XA_PIXMAP,
+					    &type, &format, &nitems, &bytes_after,
+					    &data);
+
+		if (data != NULL) {
+			if (result == Success && type == XA_PIXMAP &&
+			    format == 32 && nitems == 1) {
+				GdkPixmap *source_pixmap;
+				int width, height;
+				cairo_t *cr;
+				cairo_pattern_t *pattern;
+
+				source_pixmap = gdk_pixmap_foreign_new (*(Pixmap *) data);
+				gdk_drawable_set_colormap (source_pixmap, gdk_screen_get_default_colormap (screen));
+
+				width = gdk_screen_get_width (screen);
+				height = gdk_screen_get_width (screen);
+
+				old_root_pixmap = gdk_pixmap_new (source_pixmap, width, height, -1);
+
+				cr = gdk_cairo_create (old_root_pixmap);
+				gdk_cairo_set_source_pixmap (cr, source_pixmap, 0, 0);
+				pattern = cairo_get_source (cr);
+				cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+				cairo_paint (cr);
+
+				if (cairo_status (cr) != CAIRO_STATUS_SUCCESS) {
+					g_object_unref (old_root_pixmap);
+					old_root_pixmap = NULL;
+				}
+				cairo_destroy (cr);
+
+				g_object_unref (source_pixmap);
+			}
+			XFree (data);
+	    }
+	}
 	
 	result = XGetWindowProperty (
 		display, RootWindow (display, screen_num),
 		gdk_x11_get_xatom_by_name ("ESETROOT_PMAP_ID"),
 		0L, 1L, False, XA_PIXMAP,
 		&type, &format, &nitems, &bytes_after,
-		&data_esetroot);
+		&data);
 	
-	if (data_esetroot != NULL) {
+	if (data!= NULL) {
 		if (result == Success && type == XA_PIXMAP &&
 		    format == 32 &&
 		    nitems == 1) {
 			gdk_error_trap_push ();
-			XKillClient (display, *(Pixmap *)data_esetroot);
+			XKillClient (display, *(Pixmap *)data);
 			gdk_flush ();
 			gdk_error_trap_pop ();
 		}
-		XFree (data_esetroot);
+		XFree (data);
 	}
 	
 	pixmap_id = GDK_WINDOW_XWINDOW (pixmap);
@@ -1071,13 +1111,68 @@ gnome_bg_set_pixmap_as_root (GdkScreen *
 			 32, PropModeReplace,
 			 (guchar *) &pixmap_id, 1);
 	
-	XSetWindowBackgroundPixmap (display, RootWindow (display, screen_num),
-				    pixmap_id);
-	XClearWindow (display, RootWindow (display, screen_num));
-	
 	XUngrabServer (display);
 	
 	XFlush (display);
+	return old_root_pixmap;
+}
+
+/* Set the root pixmap, and properties pointing to it. We
+ * do this atomically with XGrabServer to make sure that
+ * we won't leak the pixmap if somebody else it setting
+ * it at the same time. (This assumes that they follow the
+ * same conventions we do)
+ */
+void 
+gnome_bg_set_pixmap_as_root (GdkScreen *screen, GdkPixmap *pixmap)
+{
+	Display *display;
+	int      screen_num;
+	
+	g_return_if_fail (screen != NULL);
+	g_return_if_fail (pixmap != NULL);
+	
+	screen_num = gdk_screen_get_number (screen);
+	display = GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen));
+
+	gnome_bg_set_root_pixmap_id (screen, pixmap, FALSE);
+
+	XSetWindowBackgroundPixmap (display, RootWindow (display, screen_num),
+				    GDK_PIXMAP_XID (pixmap));
+	XClearWindow (display, RootWindow (display, screen_num));
+	
+}
+
+GnomeBGCrossfade * 
+gnome_bg_set_pixmap_as_root_with_crossfade (GdkScreen    *screen,
+                                       GdkPixmap    *pixmap,
+                                       GMainContext *context)
+{
+	Display *display;
+	GdkWindow *root_window;
+	GdkPixmap *old_pixmap;
+	int      screen_num;
+	int      width, height;
+	GnomeBGCrossfade *fade;
+
+	g_return_val_if_fail (screen != NULL, 0);
+	g_return_val_if_fail (pixmap != NULL, 0);
+
+	root_window = gdk_screen_get_root_window (screen);
+
+	width = gdk_screen_get_width (screen);
+	height = gdk_screen_get_height (screen);
+
+	fade = gnome_bg_crossfade_new (width, height);
+
+	old_pixmap = gnome_bg_set_root_pixmap_id (screen, pixmap, TRUE);
+
+	gnome_bg_crossfade_set_start_pixmap (fade, old_pixmap);
+	gnome_bg_crossfade_set_end_pixmap (fade, pixmap);
+
+	gnome_bg_crossfade_start (fade, root_window, context);
+
+	return fade;
 }
 
 
diff -up /dev/null gnome-desktop-2.23.92/libgnome-desktop/gnome-bg-crossfade.c
--- /dev/null	2008-09-18 15:36:53.295258620 -0400
+++ gnome-desktop-2.23.92/libgnome-desktop/gnome-bg-crossfade.c	2008-09-18 22:34:56.000000000 -0400
@@ -0,0 +1,429 @@
+/* gnome-bg-crossfade.h - fade window background between two pixmaps
+ *
+ * Copyright (C) 2008 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Author: Ray Strode <rstrode at redhat.com>
+*/
+
+#include <string.h>
+#include <math.h>
+#include <stdarg.h>
+
+#include <gio/gio.h>
+
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+
+#include <cairo.h>
+#include <cairo-xlib.h>
+
+#include <libgnomeui/libgnomeui.h>
+
+#define GNOME_DESKTOP_USE_UNSTABLE_API
+#include <libgnomeui/gnome-bg.h>
+#include "libgnomeui/gnome-bg-crossfade.h"
+
+struct _GnomeBGCrossfadePrivate
+{
+	GObject		 parent_instance;
+	GdkWindow	*window;
+	int              width;
+	int              height;
+	GdkPixmap	*fading_pixmap;
+	GdkPixmap	*end_pixmap;
+	gdouble		 start_time;
+	guint		 timeout_id;
+};
+
+enum {
+	PROP_0,
+	PROP_WIDTH,
+	PROP_HEIGHT,
+};
+
+enum {
+	FINISHED,
+	NUMBER_OF_SIGNALS
+};
+
+static guint signals[NUMBER_OF_SIGNALS] = { 0 };
+
+G_DEFINE_TYPE (GnomeBGCrossfade, gnome_bg_crossfade, G_TYPE_OBJECT)
+#define GNOME_BG_CROSSFADE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),\
+			                   GNOME_TYPE_BG_CROSSFADE,\
+			                   GnomeBGCrossfadePrivate))
+
+static void
+gnome_bg_crossfade_set_property (GObject      *object,
+				 guint         property_id,
+				 const GValue *value,
+				 GParamSpec   *pspec)
+{
+	GnomeBGCrossfade *fade;
+
+	g_assert (GNOME_IS_BG_CROSSFADE (object));
+
+	fade = GNOME_BG_CROSSFADE (object);
+
+	switch (property_id)
+	{
+	case PROP_WIDTH:
+		fade->priv->width = g_value_get_int (value);
+		break;
+	case PROP_HEIGHT:
+		fade->priv->height = g_value_get_int (value);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+		break;
+	}
+}
+
+static void
+gnome_bg_crossfade_get_property (GObject    *object,
+			     guint       property_id,
+			     GValue     *value,
+			     GParamSpec *pspec)
+{
+	GnomeBGCrossfade *fade;
+
+	g_assert (GNOME_IS_BG_CROSSFADE (object));
+
+	fade = GNOME_BG_CROSSFADE (object);
+
+	switch (property_id)
+	{
+	case PROP_WIDTH:
+		g_value_set_int (value, fade->priv->width);
+		break;
+	case PROP_HEIGHT:
+		g_value_set_int (value, fade->priv->height);
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+		break;
+	}
+}
+
+static void
+gnome_bg_crossfade_finalize (GObject *object)
+{
+	GnomeBGCrossfade *fade;
+
+	fade = GNOME_BG_CROSSFADE (object);
+
+	if (fade->priv->fading_pixmap != NULL) {
+		g_object_unref (fade->priv->fading_pixmap);
+		fade->priv->fading_pixmap = NULL;
+	}
+
+	if (fade->priv->end_pixmap != NULL) {
+		g_object_unref (fade->priv->end_pixmap);
+		fade->priv->end_pixmap = NULL;
+	}
+
+	if (fade->priv->timeout_id != 0) {
+		g_source_remove (fade->priv->timeout_id);
+		fade->priv->timeout_id = 0;
+	}
+
+}
+
+static void
+gnome_bg_crossfade_class_init (GnomeBGCrossfadeClass *fade_class)
+{
+	GObjectClass *gobject_class;
+
+	gobject_class = G_OBJECT_CLASS (fade_class);
+
+	gobject_class->get_property = gnome_bg_crossfade_get_property;
+	gobject_class->set_property = gnome_bg_crossfade_set_property;
+	gobject_class->finalize = gnome_bg_crossfade_finalize;
+
+	g_object_class_install_property (gobject_class,
+					 PROP_WIDTH,
+					 g_param_spec_int ("width",
+						           "Window Width",
+							    "Width of window to fade",
+							    0, G_MAXINT, 0,
+							    G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_object_class_install_property (gobject_class,
+					 PROP_HEIGHT,
+					 g_param_spec_int ("height", "Window Height",
+						           "Height of window to fade on",
+							   0, G_MAXINT, 0,
+							   G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+	signals[FINISHED] = g_signal_new ("finished",
+					  G_OBJECT_CLASS_TYPE (gobject_class),
+					  G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+					  g_cclosure_marshal_VOID__VOID,
+					  G_TYPE_NONE, 0);
+
+	g_type_class_add_private (gobject_class, sizeof (GnomeBGCrossfadePrivate));
+}
+
+static void
+gnome_bg_crossfade_init (GnomeBGCrossfade *fade)
+{
+	fade->priv = GNOME_BG_CROSSFADE_GET_PRIVATE (fade);
+}
+
+GnomeBGCrossfade *
+gnome_bg_crossfade_new (int width,
+			int height)
+{
+	GObject *object;
+
+	object = g_object_new (GNOME_TYPE_BG_CROSSFADE,
+			       "width", width,
+			       "height", height, NULL);
+
+	return (GnomeBGCrossfade *) object;
+}
+
+static GdkPixmap *
+copy_pixmap (GdkPixmap *pixmap,
+	     int        width,
+	     int        height)
+{
+	GdkPixmap *copy;
+	cairo_t *cr;
+
+	copy = gdk_pixmap_new (pixmap, width, height, pixmap == NULL? 24 : -1);
+
+	cr = gdk_cairo_create (copy);
+
+	if (pixmap != NULL) {
+		cairo_pattern_t *pattern;
+		gdk_cairo_set_source_pixmap (cr, pixmap, 0.0, 0.0);
+		pattern = cairo_get_source (cr);
+		cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+	} else {
+		GtkStyle *style;
+		style = gtk_widget_get_default_style ();
+		gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]);
+	}
+
+	cairo_paint (cr);
+
+	if (cairo_status (cr) != CAIRO_STATUS_SUCCESS) {
+		g_object_unref (copy);
+		copy = NULL;
+	}
+	cairo_destroy (cr);
+
+	return copy;
+}
+
+gboolean
+gnome_bg_crossfade_set_start_pixmap (GnomeBGCrossfade *fade,
+				     GdkPixmap        *pixmap)
+{
+	g_return_val_if_fail (GNOME_IS_BG_CROSSFADE (fade), FALSE);
+
+	if (fade->priv->fading_pixmap != NULL) {
+		g_object_unref (fade->priv->fading_pixmap);
+		fade->priv->fading_pixmap = NULL;
+	}
+
+	fade->priv->fading_pixmap = copy_pixmap (pixmap,
+						 fade->priv->width,
+						 fade->priv->height);
+
+	return fade->priv->fading_pixmap != NULL;
+}
+
+gboolean
+gnome_bg_crossfade_set_end_pixmap (GnomeBGCrossfade *fade,
+				   GdkPixmap        *pixmap)
+{
+	g_return_val_if_fail (GNOME_IS_BG_CROSSFADE (fade), FALSE);
+
+	if (fade->priv->end_pixmap != NULL) {
+		g_object_unref (fade->priv->end_pixmap);
+		fade->priv->end_pixmap = NULL;
+	}
+
+	fade->priv->end_pixmap = copy_pixmap (pixmap,
+					      fade->priv->width,
+					      fade->priv->height);
+
+	return fade->priv->end_pixmap != NULL;
+}
+
+static gdouble
+get_current_time (void)
+{
+	const double microseconds_per_second = 1000000.0;
+	double       timestamp;
+	GTimeVal     now;
+
+	g_get_current_time (&now);
+
+	timestamp = ((microseconds_per_second * now.tv_sec) + now.tv_usec) /
+	            microseconds_per_second;
+
+	return timestamp;
+}
+
+static gboolean
+animations_are_disabled (GnomeBGCrossfade *fade)
+{
+	GtkSettings *settings;
+	GdkScreen *screen;
+	gboolean are_enabled;
+
+	if (fade->priv->window == NULL) {
+		return FALSE;
+	}
+
+	screen = gdk_drawable_get_screen (fade->priv->window);
+
+	settings = gtk_settings_get_for_screen (screen);
+
+	g_object_get (settings, "gtk-enable-animatins", &are_enabled, NULL);
+
+	return !are_enabled;
+}
+
+static gboolean
+on_tick (GnomeBGCrossfade *fade)
+{
+	gdouble now, percent_done;
+	cairo_t *cr;
+
+	g_return_val_if_fail (GNOME_IS_BG_CROSSFADE (fade), FALSE);
+
+	now = get_current_time ();
+
+	percent_done = (now - fade->priv->start_time) / .5;
+
+	percent_done = CLAMP (percent_done, 0.0, 1.0);
+
+	if (fade->priv->fading_pixmap == NULL) {
+		return FALSE;
+	}
+
+	if (animations_are_disabled (fade)) {
+		return FALSE;
+	}
+
+	/* We accumulate the results in place for performance reasons.
+	 *
+	 * This means 1) The fade is exponential, not linear (looks good!)
+	 * 2) The rate of fade is not independent of frame rate. Slower machines
+	 * will get a slower fade (but never longer than .5 seconds), and
+	 * even the fastest machines will get *some* fade because the framerate
+	 * is capped.
+	 */
+
+	cr = gdk_cairo_create (fade->priv->fading_pixmap);
+
+	gdk_cairo_set_source_pixmap (cr, fade->priv->end_pixmap,
+				     0.0, 0.0);
+	cairo_paint_with_alpha (cr, percent_done);
+
+	if (cairo_status (cr) == CAIRO_STATUS_SUCCESS) {
+		if (GDK_WINDOW_TYPE (fade->priv->window) == GDK_WINDOW_FOREIGN ||
+		    GDK_WINDOW_TYPE (fade->priv->window) == GDK_WINDOW_ROOT) {
+			GdkDisplay *display;
+
+			display = gdk_drawable_get_display (fade->priv->window);
+			gdk_window_clear (fade->priv->window);
+		} else {
+        		gdk_window_invalidate_rect (fade->priv->window, NULL, FALSE);
+		}
+        }
+	cairo_destroy (cr);
+
+	return percent_done <= .99;
+}
+
+static void
+on_finished (GnomeBGCrossfade *fade)
+{
+	if (fade->priv->end_pixmap != NULL) {
+		gdk_window_set_back_pixmap (fade->priv->window,
+					    fade->priv->end_pixmap,
+					    FALSE);
+	}
+
+	if (fade->priv->fading_pixmap != NULL) {
+		g_object_unref (fade->priv->fading_pixmap);
+		fade->priv->fading_pixmap = NULL;
+	}
+
+	if (fade->priv->end_pixmap != NULL) {
+		g_object_unref (fade->priv->end_pixmap);
+		fade->priv->end_pixmap = NULL;
+	}
+
+	fade->priv->timeout_id = 0;
+
+	g_signal_emit (fade, signals[FINISHED], 0);
+}
+
+void
+gnome_bg_crossfade_start (GnomeBGCrossfade *fade,
+			  GdkWindow        *window,
+			  GMainContext     *context)
+{
+	GSource *source;
+
+	g_return_if_fail (GNOME_IS_BG_CROSSFADE (fade));
+	g_return_if_fail (fade->priv->fading_pixmap != NULL);
+	g_return_if_fail (fade->priv->end_pixmap != NULL);
+	g_return_if_fail (!gnome_bg_crossfade_is_started (fade));
+
+	fade->priv->start_time = get_current_time ();
+
+	source = g_timeout_source_new (1000 / 30.0);
+	g_source_set_callback (source,
+			       (GSourceFunc) on_tick,
+			       fade,
+			       (GDestroyNotify) on_finished);
+	fade->priv->timeout_id = g_source_attach (source, context);
+	g_source_unref (source);
+
+	fade->priv->window = window;
+	gdk_window_set_back_pixmap (fade->priv->window,
+				    fade->priv->fading_pixmap,
+				    FALSE);
+}
+
+gboolean
+gnome_bg_crossfade_is_started (GnomeBGCrossfade *fade)
+{
+	g_return_val_if_fail (GNOME_IS_BG_CROSSFADE (fade), FALSE);
+
+	return fade->priv->timeout_id != 0;
+}
+
+void
+gnome_bg_crossfade_stop (GnomeBGCrossfade *fade)
+{
+	g_return_if_fail (GNOME_IS_BG_CROSSFADE (fade));
+
+	if (fade->priv->timeout_id != 0) {
+		g_source_remove (fade->priv->timeout_id);
+	}
+}
diff -up /dev/null gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/gnome-bg-crossfade.h
--- /dev/null	2008-09-18 15:36:53.295258620 -0400
+++ gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/gnome-bg-crossfade.h	2008-09-18 22:34:56.000000000 -0400
@@ -0,0 +1,79 @@
+/* gnome-bg-crossfade.h - fade window background between two pixmaps
+
+   Copyright 2008, Red Hat, Inc.
+
+   This file is part of the Gnome Library.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+   
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+   
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Author: Ray Strode <rstrode at redhat.com>
+*/
+
+#ifndef __GNOME_BG_CROSSFADE_H__
+#define __GNOME_BG_CROSSFADE_H__
+
+#ifndef GNOME_DESKTOP_USE_UNSTABLE_API
+#error    GnomeBGCrossfade is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnome-bg-crossfade.h
+#endif
+
+#include <libgnomeui/libgnomeui.h>
+#include <gdk/gdk.h>
+
+G_BEGIN_DECLS
+
+#define GNOME_TYPE_BG_CROSSFADE            (gnome_bg_crossfade_get_type ())
+#define GNOME_BG_CROSSFADE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_BG_CROSSFADE, GnomeBGCrossfade))
+#define GNOME_BG_CROSSFADE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GNOME_TYPE_BG_CROSSFADE, GnomeBGCrossfadeClass))
+#define GNOME_IS_BG_CROSSFADE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_BG_CROSSFADE))
+#define GNOME_IS_BG_CROSSFADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GNOME_TYPE_BG_CROSSFADE))
+#define GNOME_BG_CROSSFADE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GNOME_TYPE_BG_CROSSFADE, GnomeBGCrossfadeClass))
+
+typedef struct _GnomeBGCrossfadePrivate GnomeBGCrossfadePrivate;
+typedef struct _GnomeBGCrossfade GnomeBGCrossfade;
+typedef struct _GnomeBGCrossfadeClass GnomeBGCrossfadeClass;
+
+struct _GnomeBGCrossfade
+{
+	GObject parent_object;
+
+	GnomeBGCrossfadePrivate *priv;
+};
+
+struct _GnomeBGCrossfadeClass
+{
+	GObjectClass parent_class;
+
+	void (* finished) (GnomeBGCrossfade *fade);
+};
+
+GType             gnome_bg_crossfade_get_type              (void);
+GnomeBGCrossfade *gnome_bg_crossfade_new (int width, int height);
+gboolean          gnome_bg_crossfade_set_start_pixmap (GnomeBGCrossfade               *fade,
+                                                      GdkPixmap *pixmap);
+
+gboolean          gnome_bg_crossfade_set_end_pixmap (GnomeBGCrossfade               *fade,
+                                                    GdkPixmap *pixmap);
+void              gnome_bg_crossfade_set_context (GnomeBGCrossfade *fade,
+                                                  GMainContext *context);
+void              gnome_bg_crossfade_start (GnomeBGCrossfade *fade,
+                                            GdkWindow        *window,
+                                            GMainContext     *context);
+gboolean          gnome_bg_crossfade_is_started (GnomeBGCrossfade *fade);
+void              gnome_bg_crossfade_stop (GnomeBGCrossfade *fade);
+
+G_END_DECLS
+
+#endif
diff -up gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/gnome-bg.h.fade gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/gnome-bg.h
--- gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/gnome-bg.h.fade	2008-09-18 22:38:29.000000000 -0400
+++ gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/gnome-bg.h	2008-09-18 22:39:31.000000000 -0400
@@ -33,6 +33,8 @@
 #include <gdk/gdk.h>
 #include <gconf/gconf-client.h>
 
+#include <libgnomeui/gnome-bg-crossfade.h>
+
 G_BEGIN_DECLS
 
 #define GNOME_TYPE_BG            (gnome_bg_get_type ())
@@ -109,6 +111,9 @@ gboolean         gnome_bg_changes_with_s
 void             gnome_bg_set_pixmap_as_root    (GdkScreen             *screen,
 						 GdkPixmap             *pixmap);
 
+GnomeBGCrossfade *gnome_bg_set_pixmap_as_root_with_crossfade (GdkScreen *screen,
+                                                              GdkPixmap *pixmap,
+                                                              GMainContext *context);
 
 G_END_DECLS
 
diff -up gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/Makefile.am.fade gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/Makefile.am
--- gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/Makefile.am.fade	2008-09-08 15:43:13.000000000 -0400
+++ gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/Makefile.am	2008-09-18 22:34:56.000000000 -0400
@@ -3,6 +3,7 @@ libgnomeui_desktop_HEADERS =	\
 	gnome-ditem-edit.h	\
 	gnome-hint.h		\
 	gnome-bg.h		\
+	gnome-bg-crossfade.h		\
 	gnome-rr.h		\
 	gnome-rr-config.h	\
 	gnome-rr-labeler.h
diff -up gnome-desktop-2.23.92/libgnome-desktop/Makefile.am.fade gnome-desktop-2.23.92/libgnome-desktop/Makefile.am
--- gnome-desktop-2.23.92/libgnome-desktop/Makefile.am.fade	2008-09-08 15:43:13.000000000 -0400
+++ gnome-desktop-2.23.92/libgnome-desktop/Makefile.am	2008-09-18 22:34:56.000000000 -0400
@@ -21,6 +21,7 @@ libgnome_desktop_2_la_SOURCES = \
 	gnome-ditem-edit.c	\
 	gnome-hint.c		\
 	gnome-bg.c		\
+	gnome-bg-crossfade.c	\
 	display-name.c		\
 	gnome-rr.c		\
 	gnome-rr-config.c	\


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- gnome-desktop.spec	8 Sep 2008 23:49:27 -0000	1.163
+++ gnome-desktop.spec	19 Sep 2008 03:01:48 -0000	1.164
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.23.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.23/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -22,6 +22,7 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=549960
 Patch2: rr-leaks.patch
 Patch3: clone-modes.patch
+Patch4: gnome-desktop-2.23.92-fade.patch
 
 Requires: redhat-menus
 Requires: pycairo
@@ -76,8 +77,10 @@
 %setup -q
 %patch2 -p1 -b .rr-leaks
 %patch3 -p0 -b .clone-modes
+%patch4 -p1 -b .fade
 
 %build
+autoreconf
 %configure --with-gnome-distributor="Red Hat, Inc" --disable-scrollkeeper
 make %{?_smp_mflags}
 
@@ -121,6 +124,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Thu Sep 18 2008 Ray Strode <rstrode at redhat.com> - 2.23.92-2
+- Add new api for doing desktop background change transition
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 



From rstrode at fedoraproject.org  Fri Sep 19 03:12:34 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 19 Sep 2008 03:12:34 +0000 (UTC)
Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.164,1.165
Message-ID: <20080919031234.7210E700F7@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv471

Modified Files:
	gnome-desktop.spec 
Log Message:
Add buildrequires for autoreconf



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- gnome-desktop.spec	19 Sep 2008 03:01:48 -0000	1.164
+++ gnome-desktop.spec	19 Sep 2008 03:12:04 -0000	1.165
@@ -45,6 +45,7 @@
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser)
 BuildRequires: gtk-doc >= %{gtk_doc_version}
+BuildRequires: automake autoconf libtool
 
 %description
 



From rstrode at fedoraproject.org  Fri Sep 19 03:25:56 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 19 Sep 2008 03:25:56 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel
	gnome-settings-daemon-2.23.92-fade.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.55, 1.56
Message-ID: <20080919032556.DF32C700F7@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1206

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	gnome-settings-daemon-2.23.92-fade.patch 
Log Message:
- When switching desktop backgrounds fade between them


gnome-settings-daemon-2.23.92-fade.patch:

--- NEW FILE gnome-settings-daemon-2.23.92-fade.patch ---
--- gnome-settings-daemon-2.23.92/plugins/background/gsd-background-manager.c	2008-08-04 10:25:52.000000000 -0400
+++ fade/plugins/background/gsd-background-manager.c	2008-09-18 21:48:20.000000000 -0400
@@ -174,6 +174,7 @@
                 GdkScreen *screen;
                 GdkWindow *root_window;
                 GdkPixmap *pixmap;
+                GnomeBGCrossfade *fade;
 
                 screen = gdk_display_get_screen (display, i);
 
@@ -185,7 +186,9 @@
                                                  gdk_screen_get_height (screen),
                                                  TRUE);
 
-                gnome_bg_set_pixmap_as_root (screen, pixmap);
+                fade = gnome_bg_set_pixmap_as_root_with_crossfade (screen, pixmap, NULL);
+                g_signal_connect (fade, "finished",
+                                  G_CALLBACK (g_object_unref), NULL);
 
                 g_object_unref (pixmap);
         }


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnome-settings-daemon.spec	11 Sep 2008 07:57:39 -0000	1.55
+++ gnome-settings-daemon.spec	19 Sep 2008 03:25:26 -0000	1.56
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.23.92
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -34,6 +34,7 @@
 Patch2:         gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
 Patch6:		gnome-settings-daemon-2.23.4-drop-sample-cache.patch
 Patch7:		gnome-settings-daemon-2.23.91-fnf7-cycle.patch
+Patch8:		gnome-settings-daemon-2.23.92-fade.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -56,6 +57,7 @@
 %patch2 -p1 -b .ignore-layout-if-using-evdev
 %patch6 -p1 -b .drop-sample-cache
 %patch7 -p1 -b .fnf7-cycle
+%patch8 -p1 -b .fade
 
 %build
 aclocal
@@ -155,7 +157,10 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
-* Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> - 2.23.91-5
+* Thu Sep 18 2008 Ray Strode <rstrode at redhat.com> - 2.23.92-3
+- When switching desktop backgrounds fade between them
+
+* Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> - 2.23.92-2
 - Fix various bugs in the fn-F7 support
 
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1



From rstrode at fedoraproject.org  Fri Sep 19 03:34:54 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 19 Sep 2008 03:34:54 +0000 (UTC)
Subject: rpms/eel2/devel eel-2.23.92-fade.patch, NONE, 1.1 eel2.spec, 1.95,
	1.96
Message-ID: <20080919033454.B1CEE700F7@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/eel2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1639

Modified Files:
	eel2.spec 
Added Files:
	eel-2.23.92-fade.patch 
Log Message:
- When switching desktop backgrounds fade between them


eel-2.23.92-fade.patch:

--- NEW FILE eel-2.23.92-fade.patch ---
--- a/eel/eel-background.c
+++ b/eel/eel-background.c
@@ -43,6 +43,7 @@
 #include <stdio.h>
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnomeui/gnome-bg.h>
+#include <gdk/gdkx.h>
 
 static void       eel_background_class_init                (gpointer       klass);
 static void       eel_background_init                      (gpointer       object,
@@ -78,6 +79,7 @@ struct EelBackgroundDetails {
 	/* Realized data: */
 	gboolean background_changes_with_size;
 	GdkPixmap *background_pixmap;
+	GnomeBGCrossfade *fade;
 	int background_entire_width;
 	int background_entire_height;
 	GdkColor default_color;
@@ -182,6 +184,11 @@ eel_background_finalize (GObject *object)
 	background = EEL_BACKGROUND (object);
 
 	g_free (background->details->color);
+	if (background->details->fade != NULL) {
+		gnome_bg_crossfade_stop (background->details->fade);
+		g_object_unref (background->details->fade);
+		background->details->fade = NULL;
+	}
 	eel_background_remove_current_image (background);
 
 	if (background->details->background_pixmap != NULL) {
@@ -610,6 +619,25 @@ eel_background_reset (EelBackground *background)
 	g_signal_emit (GTK_OBJECT (background), signals[RESET], 0);
 }
 
+static gboolean
+fade_to_pixmap (EelBackground *background,
+		 GdkWindow     *window,
+		 GdkPixmap     *pixmap)
+{
+	if (background->details->fade == NULL) {
+		return FALSE;
+	}
+
+	if (!gnome_bg_crossfade_set_end_pixmap (background->details->fade,
+				                pixmap)) {
+		return FALSE;
+	}
+
+	gnome_bg_crossfade_start (background->details->fade, window, NULL);
+
+	return gnome_bg_crossfade_is_started (background->details->fade);
+}
+
 static void
 eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
 {
@@ -644,14 +672,15 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
 	} else {
 		window = widget->window;
 	}
-
-	if (!changes_with_size || background->details->is_desktop) {
-		gdk_window_set_back_pixmap (window, pixmap, FALSE);
-	} else {
-		gdk_window_set_back_pixmap (window, NULL, FALSE);
-		gdk_window_set_background (window, &color);
+	if (background->details->fade == NULL ||
+	    !fade_to_pixmap (background, window, pixmap)) {
+		if (!changes_with_size || background->details->is_desktop) {
+			gdk_window_set_back_pixmap (window, pixmap, FALSE);
+		} else {
+			gdk_window_set_back_pixmap (window, NULL, FALSE);
+			gdk_window_set_background (window, &color);
+		}
 	}
-	
 
 	background->details->background_changes_with_size =
 		gnome_bg_changes_with_size (background->details->bg);
@@ -679,6 +708,18 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
 static void
 eel_widget_background_changed (GtkWidget *widget, EelBackground *background)
 {
+	if (GTK_WIDGET_REALIZED (widget)) {
+		int width, height;
+
+		if (background->details->fade != NULL) {
+			gnome_bg_crossfade_stop (background->details->fade);
+			g_object_unref (background->details->fade);
+		}
+		gdk_drawable_get_size (widget->window, &width, &height);
+		background->details->fade = gnome_bg_crossfade_new (width, height);
+		gnome_bg_crossfade_set_start_pixmap (background->details->fade, background->details->background_pixmap);
+	}
+
 	eel_background_unrealize (background);
 	eel_background_set_up_widget (background, widget);
 
@@ -741,11 +782,22 @@ static void
 widget_realize_cb (GtkWidget *widget, gpointer data)
 {
 	EelBackground *background;
+	int width, height;
 	
 	background = EEL_BACKGROUND (data);
 
 	widget_realized_setup (widget, data);
-		
+
+	if (background->details->fade != NULL) {
+		gnome_bg_crossfade_stop (background->details->fade);
+		g_object_unref (background->details->fade);
+	}
+
+	gdk_drawable_get_size (widget->window, &width, &height);
+	background->details->fade = gnome_bg_crossfade_new (width, height);
+
+	gnome_bg_crossfade_set_start_pixmap (background->details->fade, NULL);
+
 	eel_background_set_up_widget (background, widget);
 }
 


Index: eel2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- eel2.spec	8 Sep 2008 23:32:06 -0000	1.95
+++ eel2.spec	19 Sep 2008 03:34:24 -0000	1.96
@@ -17,7 +17,7 @@
 Name:        eel2
 Summary:     Eazel Extensions Library
 Version:     2.23.92
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     LGPLv2+
 Group:       System Environment/Libraries
 Source:      http://download.gnome.org/sources/eel/2.23/eel-%{version}.tar.bz2
@@ -45,6 +45,8 @@
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser)
 
+Patch0: eel-2.23.92-fade.patch
+
 %description
 Eazel Extensions Library is a collection of widgets and functions for
 use with GNOME.
@@ -71,6 +73,8 @@
 %prep
 %setup -q -n eel-%{version}
 
+%patch0 -p1 -b .fade
+
 # Fix spurious exec permissions
 chmod a-x COPYING
 
@@ -108,6 +112,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Thu Sep 18 2008 Ray Strode <rstrode at redhat.com> - 2.23.92-2
+- When switching desktop backgrounds fade between them
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 



From rstrode at fedoraproject.org  Fri Sep 19 04:19:46 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 19 Sep 2008 04:19:46 +0000 (UTC)
Subject: rpms/gnome-desktop/devel gnome-desktop-2.23.92-fade.patch, 1.1,
	1.2 gnome-desktop.spec, 1.165, 1.166
Message-ID: <20080919041946.2D269700F7@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3535

Modified Files:
	gnome-desktop-2.23.92-fade.patch gnome-desktop.spec 
Log Message:
- s/animatins/animations/


gnome-desktop-2.23.92-fade.patch:

Index: gnome-desktop-2.23.92-fade.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop-2.23.92-fade.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-desktop-2.23.92-fade.patch	19 Sep 2008 03:01:48 -0000	1.1
+++ gnome-desktop-2.23.92-fade.patch	19 Sep 2008 04:19:45 -0000	1.2
@@ -503,7 +503,7 @@
 +
 +	settings = gtk_settings_get_for_screen (screen);
 +
-+	g_object_get (settings, "gtk-enable-animatins", &are_enabled, NULL);
++	g_object_get (settings, "gtk-enable-animations", &are_enabled, NULL);
 +
 +	return !are_enabled;
 +}


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- gnome-desktop.spec	19 Sep 2008 03:12:04 -0000	1.165
+++ gnome-desktop.spec	19 Sep 2008 04:19:45 -0000	1.166
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.23.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.23/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -125,6 +125,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Thu Sep 18 2008 Ray Strode <rstrode at redhat.com> - 2.23.92-3
+- s/animatins/animations/
+
 * Thu Sep 18 2008 Ray Strode <rstrode at redhat.com> - 2.23.92-2
 - Add new api for doing desktop background change transition
 



From mclasen at fedoraproject.org  Fri Sep 19 04:38:59 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 19 Sep 2008 04:38:59 +0000 (UTC)
Subject: rpms/libxklavier/devel sax-leak.patch, NONE, 1.1 libxklavier.spec, 
	1.40, 1.41
Message-ID: <20080919043859.974D7700F7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libxklavier/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4334

Modified Files:
	libxklavier.spec 
Added Files:
	sax-leak.patch 
Log Message:
plug a memory leak


sax-leak.patch:

--- NEW FILE sax-leak.patch ---
diff -up libxklavier-3.7/libxklavier/xklavier_config.c.sax-leak libxklavier-3.7/libxklavier/xklavier_config.c
--- libxklavier-3.7/libxklavier/xklavier_config.c.sax-leak	2008-09-19 00:25:10.000000000 -0400
+++ libxklavier-3.7/libxklavier/xklavier_config.c	2008-09-19 00:25:41.000000000 -0400
@@ -480,15 +480,13 @@ xkl_config_registry_load_from_file(XklCo
 				   const gchar * file_name)
 {
 	xmlParserCtxtPtr ctxt = xmlNewParserCtxt();
-	xmlSAXHandler *saxh = g_new0(xmlSAXHandler, 1);
 	xkl_debug(100, "Loading XML registry from file %s\n", file_name);
 
 	/* Filter out all unneeded languages! */
-	xmlSAX2InitDefaultSAXHandler(saxh, TRUE);
-	saxh->startElementNs = xkl_xml_sax_start_element_ns;
-	saxh->endElementNs = xkl_xml_sax_end_element_ns;
-	saxh->characters = xkl_xml_sax_characters;
-	ctxt->sax = saxh;
+	xmlSAX2InitDefaultSAXHandler(ctxt->sax, TRUE);
+	ctxt->sax->startElementNs = xkl_xml_sax_start_element_ns;
+	ctxt->sax->endElementNs = xkl_xml_sax_end_element_ns;
+	ctxt->sax->characters = xkl_xml_sax_characters;
 
 	xkl_config_registry_priv(config, doc) =
 	    xmlCtxtReadFile(ctxt, file_name, NULL, XML_PARSE_NOBLANKS);


Index: libxklavier.spec
===================================================================
RCS file: /cvs/extras/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libxklavier.spec	6 Sep 2008 02:11:01 -0000	1.40
+++ libxklavier.spec	19 Sep 2008 04:38:29 -0000	1.41
@@ -1,7 +1,7 @@
 Summary:	library providing high-level API for X Keyboard Extension
 Name:		libxklavier
 Version:	3.7
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL: http://gswitchit.sourceforge.net/
@@ -15,6 +15,8 @@
 Source: http://download.gnome.org/sources/libxklavier/3.7/libxklavier-3.7.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+Patch0: sax-leak.patch
+
 %description
 libxklavier is a library providing high-level API for X Keyboard Extension
 known as XKB. This library is intended to support XFree86 and other
@@ -34,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .sax-leak
 
 %build
 
@@ -69,6 +72,9 @@
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Fri Sep 19 2008 Matthias Clasen <mclasen at redhat.com> - 3.7-2
+- Plug a memory leak
+
 * Fri Sep  5 2008 Matthias Clasen <mclasen at redhat.com> - 3.7-1
 - Update to 3.7
 



From whot at fedoraproject.org  Fri Sep 19 05:23:45 2008
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 19 Sep 2008 05:23:45 +0000 (UTC)
Subject: rpms/xorg-x11-drv-evdev/F-9 .cvsignore, 1.19, 1.20 sources, 1.20,
	1.21 xorg-x11-drv-evdev.spec, 1.32, 1.33
Message-ID: <20080919052345.D677D700F7@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7827

Modified Files:
	.cvsignore sources xorg-x11-drv-evdev.spec 
Log Message:
* Fri Sep 19 2008 Peter Hutterer <peter.hutterer at redhat.com> 2.0.5-1
- evdev 2.0.5




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-9/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	26 Aug 2008 03:00:50 -0000	1.19
+++ .cvsignore	19 Sep 2008 05:23:15 -0000	1.20
@@ -1 +1 @@
-xf86-input-evdev-2.0.4.tar.bz2
+xf86-input-evdev-2.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	26 Aug 2008 03:00:50 -0000	1.20
+++ sources	19 Sep 2008 05:23:15 -0000	1.21
@@ -1 +1 @@
-ac97e155ea4db87a8393297493f9c406  xf86-input-evdev-2.0.4.tar.bz2
+aabf047629d279b0eb4cd236b9de3121  xf86-input-evdev-2.0.5.tar.bz2


Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-9/xorg-x11-drv-evdev.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xorg-x11-drv-evdev.spec	26 Aug 2008 03:00:50 -0000	1.32
+++ xorg-x11-drv-evdev.spec	19 Sep 2008 05:23:15 -0000	1.33
@@ -6,7 +6,7 @@
 
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
-Version:    2.0.4
+Version:    2.0.5
 Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
@@ -53,6 +53,9 @@
 %{_mandir}/man4/evdev.4*
 
 %changelog
+* Fri Sep 19 2008 Peter Hutterer <peter.hutterer at redhat.com> 2.0.5-1
+- evdev 2.0.5
+
 * Mon Aug 25 2008 Peter Hutterer <peter.hutterer at redhat.com> 2.0.4-1
 - evdev 2.0.4
 



From mtasaka at fedoraproject.org  Fri Sep 19 05:24:29 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 19 Sep 2008 05:24:29 +0000 (UTC)
Subject: rpms/jd/F-8 .cvsignore, 1.287, 1.288 jd.spec, 1.323, 1.324 sources, 
	1.288, 1.289
Message-ID: <20080919052429.A9F63700F7@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8144/F-8

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Sep 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2351



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- .cvsignore	17 Sep 2008 17:54:19 -0000	1.287
+++ .cvsignore	19 Sep 2008 05:23:59 -0000	1.288
@@ -1 +1 @@
-jd-2.0.2-svn2349_trunk.tgz
+jd-2.0.2-svn2351_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- jd.spec	17 Sep 2008 17:54:19 -0000	1.323
+++ jd.spec	19 Sep 2008 05:23:59 -0000	1.324
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.2
-%define         strtag        svn2349_trunk
+%define         strtag        svn2351_trunk
 %define         repoid        32887
 # Define this if this is pre-version
 %define         pre_release   1
@@ -136,8 +136,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2349
+* Fri Sep 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2351
 
 * Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
 - Patch to cope with occasional cookie change


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/sources,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- sources	17 Sep 2008 17:54:19 -0000	1.288
+++ sources	19 Sep 2008 05:23:59 -0000	1.289
@@ -1 +1 @@
-f71ea0b442129d296a2681f096c45d2d  jd-2.0.2-svn2349_trunk.tgz
+7838d3fb1a7f1dcb6f36119870c14a9a  jd-2.0.2-svn2351_trunk.tgz



From mtasaka at fedoraproject.org  Fri Sep 19 05:24:29 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 19 Sep 2008 05:24:29 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.294, 1.295 jd.spec, 1.334, 1.335 sources, 
	1.295, 1.296
Message-ID: <20080919052429.E1992700F7@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8144/F-9

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Sep 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2351



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- .cvsignore	17 Sep 2008 17:54:20 -0000	1.294
+++ .cvsignore	19 Sep 2008 05:23:59 -0000	1.295
@@ -1 +1 @@
-jd-2.0.2-svn2349_trunk.tgz
+jd-2.0.2-svn2351_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -r1.334 -r1.335
--- jd.spec	17 Sep 2008 17:54:20 -0000	1.334
+++ jd.spec	19 Sep 2008 05:23:59 -0000	1.335
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.2
-%define         strtag        svn2349_trunk
+%define         strtag        svn2351_trunk
 %define         repoid        32887
 # Define this if this is pre-version
 %define         pre_release   1
@@ -136,8 +136,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2349
+* Fri Sep 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2351
 
 * Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
 - Patch to cope with occasional cookie change


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- sources	17 Sep 2008 17:54:20 -0000	1.295
+++ sources	19 Sep 2008 05:23:59 -0000	1.296
@@ -1 +1 @@
-f71ea0b442129d296a2681f096c45d2d  jd-2.0.2-svn2349_trunk.tgz
+7838d3fb1a7f1dcb6f36119870c14a9a  jd-2.0.2-svn2351_trunk.tgz



From mtasaka at fedoraproject.org  Fri Sep 19 05:24:30 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 19 Sep 2008 05:24:30 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.294, 1.295 jd.spec, 1.344, 1.345 sources,
	1.295, 1.296
Message-ID: <20080919052430.23499700F7@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8144/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Sep 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2351



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- .cvsignore	17 Sep 2008 17:54:20 -0000	1.294
+++ .cvsignore	19 Sep 2008 05:23:59 -0000	1.295
@@ -1 +1 @@
-jd-2.0.2-svn2349_trunk.tgz
+jd-2.0.2-svn2351_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- jd.spec	17 Sep 2008 17:54:20 -0000	1.344
+++ jd.spec	19 Sep 2008 05:23:59 -0000	1.345
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.2
-%define         strtag        svn2349_trunk
+%define         strtag        svn2351_trunk
 %define         repoid        32887
 # Define this if this is pre-version
 %define         pre_release   1
@@ -136,8 +136,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2349
+* Fri Sep 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2351
 
 * Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
 - Patch to cope with occasional cookie change


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- sources	17 Sep 2008 17:54:20 -0000	1.295
+++ sources	19 Sep 2008 05:23:59 -0000	1.296
@@ -1 +1 @@
-f71ea0b442129d296a2681f096c45d2d  jd-2.0.2-svn2349_trunk.tgz
+7838d3fb1a7f1dcb6f36119870c14a9a  jd-2.0.2-svn2351_trunk.tgz



From atorkhov at fedoraproject.org  Fri Sep 19 05:42:31 2008
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Fri, 19 Sep 2008 05:42:31 +0000 (UTC)
Subject: rpms/ogre/devel ogre.spec,1.32,1.33
Message-ID: <20080919054231.2B269700F7@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/ogre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11983

Modified Files:
	ogre.spec 
Log Message:
* Sat Sep 13 2008 Alexey Torkhov <atorkhov at gmail.com> 1.6.0-0.1.rc1
- New upstream release 1.6.0rc1
- Removing broken OpenEXR plugin



Index: ogre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ogre.spec	14 Sep 2008 09:25:14 -0000	1.32
+++ ogre.spec	19 Sep 2008 05:42:00 -0000	1.33
@@ -12,11 +12,10 @@
 Patch0:         ogre-1.2.1-rpath.patch
 Patch1:         ogre-1.6.0-system-glew.patch
 Patch2:         ogre-1.4.7-system-tinyxml.patch
-Patch3:         ogre-1.6.0rc1-openexr-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cegui-devel zziplib-devel freetype-devel gtk2-devel
 BuildRequires:  libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel
-BuildRequires:  ois-devel glew-devel freeimage-devel OpenEXR-devel
+BuildRequires:  ois-devel glew-devel freeimage-devel
 BuildRequires:  tinyxml-devel
 
 %description
@@ -67,7 +66,6 @@
 %patch0 -p1 -z .rpath
 %patch1 -p1 -z .glew
 %patch2 -p1 -z .sys-tinyxml
-%patch3 -p1
 # remove execute bits from src-files for -debuginfo package
 chmod -x `find RenderSystems/GL -type f` \
   `find Samples/DeferredShading -type f` Samples/DynTex/src/DynTex.cpp
@@ -97,7 +95,7 @@
 
 
 %build
-%configure --disable-cg --disable-devil --enable-openexr
+%configure --disable-cg --disable-devil
 # 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
@@ -176,8 +174,9 @@
 
 
 %changelog
-* Sat Sep 13 2008 Alexey Torkhov <atorkhov at gmail.com> 1.6.0-0.1rc1
+* Sat Sep 13 2008 Alexey Torkhov <atorkhov at gmail.com> 1.6.0-0.1.rc1
 - New upstream release 1.6.0rc1
+- Removing broken OpenEXR plugin
 
 * Fri Jul 11 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.9-2
 - Rebuild for new cegui



From atorkhov at fedoraproject.org  Fri Sep 19 06:57:50 2008
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Fri, 19 Sep 2008 06:57:50 +0000 (UTC)
Subject: rpms/ogre/devel ogre.spec,1.33,1.34
Message-ID: <20080919065750.48F3F700F7@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/ogre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27996

Modified Files:
	ogre.spec 
Log Message:
Workaround "/bin/cp: Argument list too long" error in koji.


Index: ogre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ogre.spec	19 Sep 2008 05:42:00 -0000	1.33
+++ ogre.spec	19 Sep 2008 06:57:19 -0000	1.34
@@ -80,8 +80,9 @@
   Samples/Media/materials/scripts/Example-DynTex.material
 # create a clean version of the api docs for %%doc
 mkdir api
-cp Docs/api/html/*.html Docs/api/html/*.gif Docs/api/html/*.png \
-  Docs/api/html/*.css api
+find . \( -wholename './Docs/api/html/*.html' -or \
+  -wholename './Docs/api/html/*.gif' -or -wholename './Docs/api/html/*.png' \
+  -or -wholename './Docs/api/html/*.css' \) -exec cp --target-directory='api' '{}' +
 for i in api/OgreParticleEmitter_8h-source.html \
          api/classOgre_1_1ParticleSystem.html \
          api/classOgre_1_1DynLib.html \



From atorkhov at fedoraproject.org  Fri Sep 19 07:37:36 2008
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Fri, 19 Sep 2008 07:37:36 +0000 (UTC)
Subject: rpms/chess/devel chess-ogre16.patch,NONE,1.1 chess.spec,1.20,1.21
Message-ID: <20080919073737.06F9D700F7@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/chess/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3617

Modified Files:
	chess.spec 
Added Files:
	chess-ogre16.patch 
Log Message:
* Fri Sep 19 2008 Alexey Torkhov <atorkhov at gmail.com> 1.0-19
- Port to OGRE 1.6


chess-ogre16.patch:

--- NEW FILE chess-ogre16.patch ---
diff -urp chess.orig/include/stdafx.h chess/include/stdafx.h
--- chess.orig/include/stdafx.h	2008-09-14 14:18:19.000000000 +0400
+++ chess/include/stdafx.h	2008-09-14 14:18:34.000000000 +0400
@@ -18,8 +18,6 @@
 #ifndef STDAFX_H
 #define STDAFX_H
 
-#include "OgreNoMemoryMacros.h"
-
 #include <CEGUI/CEGUISystem.h>
 #include <CEGUI/CEGUILogger.h>
 #include <CEGUI/CEGUISchemeManager.h>
@@ -32,8 +30,6 @@
 #include <coldet.h>
 #include <math3d.h>
 
-#include "OgreMemoryMacros.h" 
-
 #include <Ogre.h>
 
 using namespace Ogre;
diff -urp chess.orig/src/CaptureState.cpp chess/src/CaptureState.cpp
--- chess.orig/src/CaptureState.cpp	2008-09-14 14:18:15.000000000 +0400
+++ chess/src/CaptureState.cpp	2008-09-14 14:56:33.000000000 +0400
@@ -48,7 +48,7 @@ void CaptureState::CreateMovementTrack(c
 
     // make sure the scene node's rotation is taken into account
     Ogre::Matrix3 nodeRot;      
-    mHandNode->getWorldOrientation().ToRotationMatrix(nodeRot);  
+    mHandNode->_getDerivedOrientation().ToRotationMatrix(nodeRot);
     mOffset = mOffset * nodeRot;
 
     // tweak the position according to the offsets
diff -urp chess.orig/src/ChessApplication.cpp chess/src/ChessApplication.cpp
--- chess.orig/src/ChessApplication.cpp	2008-09-14 14:18:19.000000000 +0400
+++ chess/src/ChessApplication.cpp	2008-09-14 15:09:29.000000000 +0400
@@ -118,7 +118,7 @@ void ChessApplication::createScene()
   plane.d = 0;
   MeshManager::getSingleton().createPlane("board", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, plane, 160,160,1,1,true,1,1,1,Vector3::UNIT_Z);
 
-  RenderTexture* rttTex = mRoot->getRenderSystem()->createRenderTexture( "RttTex", 1024, 1024, TEX_TYPE_2D, PF_R8G8B8 );  
+  RenderTexture* rttTex = (RenderTexture*) TextureManager::getSingleton().createManual("RttTex", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, TEX_TYPE_2D, 1024, 1024, MIP_DEFAULT, PF_R8G8B8, TU_RENDERTARGET).get();
   Viewport *v = rttTex->addViewport(mReflectCamera);
   v->setClearEveryFrame(true);
   v->setBackgroundColour(ColourValue::Black);
@@ -159,7 +159,7 @@ void ChessApplication::createScene()
   mPlaneNode->attachObject(mPlane);
   mPlaneNode->translate(0, -15, 0);  
 
-  RenderTexture* rttTexa = mRoot->getRenderSystem()->createRenderTexture("RttTexa", 1024, 1024, TEX_TYPE_2D, PF_R8G8B8 );
+  RenderTexture* rttTexa = (RenderTexture*) TextureManager::getSingleton().createManual("RttTexa", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, TEX_TYPE_2D, 1024, 1024, MIP_DEFAULT, PF_R8G8B8, TU_RENDERTARGET).get();
   {
       Viewport *va = rttTexa->addViewport( mReflectCameraGround );
       va->setClearEveryFrame( true );
diff -urp chess.orig/src/HandState.cpp chess/src/HandState.cpp
--- chess.orig/src/HandState.cpp	2008-09-14 14:18:15.000000000 +0400
+++ chess/src/HandState.cpp	2008-09-14 15:17:09.000000000 +0400
@@ -69,16 +69,16 @@ void HandState::AttachPiece(const String
   Bone* bone = mHandEntity->getSkeleton()->getBone(bonename);     
 
   // work out the offset orientation
-  Quaternion offsetRotation = (bone->getWorldOrientation().Inverse() * pieceNode->getOrientation());
+  Quaternion offsetRotation = (bone->_getDerivedOrientation().Inverse() * pieceNode->getOrientation());
 
   // work out the offset position
   Ogre::Matrix3 boneRot, nodeRot;    
 
   Vector3 nodePos = pieceNode->getPosition();
   Vector3 handPos = mHandNode->getPosition(); 
-  Vector3 bonePos = bone->getWorldPosition();             
+  Vector3 bonePos = bone->_getDerivedPosition();
 
-  bone->getWorldOrientation().ToRotationMatrix(boneRot);
+  bone->_getDerivedOrientation().ToRotationMatrix(boneRot);
   mHandNode->getOrientation().ToRotationMatrix(nodeRot);
 
   Vector3 offsetPosition = (nodePos - (handPos + (nodeRot * bonePos))); 
@@ -102,7 +102,7 @@ void HandState::BaseCreateMovementTrack(
 {
   // make sure the scene node's rotation is taken into account
   Ogre::Matrix3 nodeRot;      
-  mHandNode->getWorldOrientation().ToRotationMatrix(nodeRot); 
+  mHandNode->_getDerivedOrientation().ToRotationMatrix(nodeRot); 
 
   mTargetPosition = (mStartingPosition * nodeRot);  
 
diff -urp chess.orig/src/MovePieceState.cpp chess/src/MovePieceState.cpp
--- chess.orig/src/MovePieceState.cpp	2008-09-14 14:18:15.000000000 +0400
+++ chess/src/MovePieceState.cpp	2008-09-14 15:18:31.000000000 +0400
@@ -61,7 +61,7 @@ void MovePieceState::CreateMovementTrack
 
   // make sure the scene node's rotation is taken into account
   Ogre::Matrix3 nodeRot;      
-  mHandNode->getWorldOrientation().ToRotationMatrix(nodeRot);  
+  mHandNode->_getDerivedOrientation().ToRotationMatrix(nodeRot);
   mOffset = mOffset * nodeRot;
 
   // tweak the position according to the offsets
@@ -148,4 +148,4 @@ HandState::StateType MovePieceState::Upd
   }
   else    
     return mStateType;  
-}
\ ?? ?????????? ?????????? ?????? ?????????? ????????????
+}
diff -urp chess.orig/src/PickupState.cpp chess/src/PickupState.cpp
--- chess.orig/src/PickupState.cpp	2008-09-14 14:18:15.000000000 +0400
+++ chess/src/PickupState.cpp	2008-09-14 15:19:24.000000000 +0400
@@ -70,7 +70,7 @@ void PickupState::CreateMovementTrack()
 
   // make sure the scene node's rotation is taken into account
   Ogre::Matrix3 nodeRot;      
-  mHandNode->getWorldOrientation().ToRotationMatrix(nodeRot);  
+  mHandNode->_getDerivedOrientation().ToRotationMatrix(nodeRot);  
   mOffset = mOffset * nodeRot;
 
   // tweak the position according to the offsets
@@ -140,4 +140,4 @@ HandState::StateType PickupState::Update
   }
   else    
     return mStateType;
-}
\ ?? ?????????? ?????????? ?????? ?????????? ????????????
+}
diff -urp chess.orig/src/RemoveState.cpp chess/src/RemoveState.cpp
--- chess.orig/src/RemoveState.cpp	2008-09-14 14:18:15.000000000 +0400
+++ chess/src/RemoveState.cpp	2008-09-14 15:26:24.000000000 +0400
@@ -49,7 +49,7 @@ void RemoveState::CreateMovementTrack()
 
   // make sure the scene node's rotation is taken into account
   Ogre::Matrix3 nodeRot;      
-  mHandNode->getWorldOrientation().ToRotationMatrix(nodeRot);  
+  mHandNode->_getDerivedOrientation().ToRotationMatrix(nodeRot);
   
   // tweak the position according to the offsets
   mTargetPosition += mOffset;  
@@ -115,4 +115,4 @@ HandState::StateType RemoveState::Update
   }
   else    
     return HandState::Remove;
-}
\ ?? ?????????? ?????????? ?????? ?????????? ????????????
+}
diff -urp chess.orig/src/StaticState.cpp chess/src/StaticState.cpp
--- chess.orig/src/StaticState.cpp	2008-09-14 14:18:15.000000000 +0400
+++ chess/src/StaticState.cpp	2008-09-14 15:28:13.000000000 +0400
@@ -33,7 +33,7 @@ void StaticState::Initialise(void)
   // put the hand in it's starting position
   // - make sure the scene node's rotation is taken into account
   Ogre::Matrix3 nodeRot;      
-  mHandNode->getWorldOrientation().ToRotationMatrix(nodeRot); 
+  mHandNode->_getDerivedOrientation().ToRotationMatrix(nodeRot);
   mTargetPosition = (mStartingPosition * nodeRot);  
   mHandNode->setPosition(mTargetPosition);   
 }


Index: chess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chess/devel/chess.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- chess.spec	26 Aug 2008 14:34:09 -0000	1.20
+++ chess.spec	19 Sep 2008 07:37:06 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           chess
 Version:        1.0
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        3D chess game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -13,6 +13,7 @@
 Source3:        cegui-0.5-windowslook.tar.gz
 Patch0:         chess-ogre12+gcc41+fixes.patch
 Patch1:         chess-ogre14.patch
+Patch2:         chess-ogre16.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ogre-devel ois-devel cegui-devel coldet-devel boost-devel
 BuildRequires:  desktop-file-utils
@@ -29,6 +30,7 @@
 %setup -q -c -a 3
 %patch0 -p1
 %patch1 -p1 -z .ogre14
+%patch2 -p1
 sed -i 's/\r//' Readme.txt License/gpl.txt
 # remove patch backup file to stop it from getting installed
 rm media/gui/tahoma-12.font.ogre14
@@ -85,6 +87,9 @@
 
 
 %changelog
+* Fri Sep 19 2008 Alexey Torkhov <atorkhov at gmail.com> 1.0-19
+- Port to OGRE 1.6
+
 * Sun Aug 17 2008 Hans de Goede <jwrdegoede at fedoraproject.org> 1.0-18
 - Rebuild for new boost
 



From thm at fedoraproject.org  Fri Sep 19 08:33:27 2008
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri, 19 Sep 2008 08:33:27 +0000 (UTC)
Subject: rpms/ikiwiki/devel .cvsignore, 1.9, 1.10 ikiwiki.spec, 1.8,
	1.9 import.log, 1.8, 1.9 sources, 1.9, 1.10
Message-ID: <20080919083327.90677700F7@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15907/devel

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Log Message:
Update to 2.64.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	11 Sep 2008 08:42:32 -0000	1.9
+++ .cvsignore	19 Sep 2008 08:32:57 -0000	1.10
@@ -1 +1 @@
-ikiwiki_2.63.tar.gz
+ikiwiki_2.64.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/ikiwiki.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ikiwiki.spec	11 Sep 2008 08:42:32 -0000	1.8
+++ ikiwiki.spec	19 Sep 2008 08:32:57 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        2.63
+Version:        2.64
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
@@ -147,6 +147,9 @@
 
 
 %changelog
+* Fri Sep 19 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.64-1
+- Update to 2.64.
+
 * Thu Sep 11 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.63-1
 - Update to 2.63.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	11 Sep 2008 08:42:32 -0000	1.8
+++ import.log	19 Sep 2008 08:32:57 -0000	1.9
@@ -6,3 +6,4 @@
 ikiwiki-2_56-1_fc9:HEAD:ikiwiki-2.56-1.fc9.src.rpm:1218097891
 ikiwiki-2_62_1-1_fc9:HEAD:ikiwiki-2.62.1-1.fc9.src.rpm:1220114514
 ikiwiki-2_63-1_fc9:HEAD:ikiwiki-2.63-1.fc9.src.rpm:1221122510
+ikiwiki-2_64-1_fc9:HEAD:ikiwiki-2.64-1.fc9.src.rpm:1221813107


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	11 Sep 2008 08:42:32 -0000	1.9
+++ sources	19 Sep 2008 08:32:57 -0000	1.10
@@ -1 +1 @@
-33eeeab36333deb7a088141f74df21f4  ikiwiki_2.63.tar.gz
+465a1041ac266f9fca5e95615f15b766  ikiwiki_2.64.tar.gz



From pghmcfc at fedoraproject.org  Fri Sep 19 08:48:53 2008
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Fri, 19 Sep 2008 08:48:53 +0000 (UTC)
Subject: rpms/libpng10/devel .cvsignore, 1.14, 1.15 libpng10.spec, 1.18,
	1.19 sources, 1.14, 1.15
Message-ID: <20080919084854.04AFF700F7@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/libpng10/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19437

Modified Files:
	.cvsignore libpng10.spec sources 
Log Message:
update to 1.0.40


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	22 Aug 2008 23:18:09 -0000	1.14
+++ .cvsignore	19 Sep 2008 08:48:23 -0000	1.15
@@ -1 +1 @@
-libpng-1.0.39.tar.bz2
+libpng-1.0.40.tar.bz2


Index: libpng10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/libpng10.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libpng10.spec	22 Aug 2008 23:18:09 -0000	1.18
+++ libpng10.spec	19 Sep 2008 08:48:23 -0000	1.19
@@ -1,6 +1,6 @@
 Summary:	Old version of libpng, needed to run old binaries
 Name:		libpng10
-Version:	1.0.39
+Version:	1.0.40
 Release:	1%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
@@ -111,6 +111,9 @@
 %{_libdir}/pkgconfig/libpng10.pc
 
 %changelog
+* Fri Sep 19 2008 Paul Howarth <paul at city-fan.org> 1.0.40-1
+- update to 1.0.40
+
 * Thu Aug 21 2008 Paul Howarth <paul at city-fan.org> 1.0.39-1
 - update to 1.0.39
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	22 Aug 2008 23:18:09 -0000	1.14
+++ sources	19 Sep 2008 08:48:23 -0000	1.15
@@ -1 +1 @@
-c95d758031197bc14292082793c4e08e  libpng-1.0.39.tar.bz2
+0803ce684c70a9b6aa7223be4df0c4b7  libpng-1.0.40.tar.bz2



From mschwendt at fedoraproject.org  Fri Sep 19 08:53:36 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri, 19 Sep 2008 08:53:36 +0000 (UTC)
Subject: extras-repoclosure substrepo,NONE,1.1
Message-ID: <20080919085336.2DBA5700F7@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20791

Added Files:
	substrepo 
Log Message:
add this small helper tool to avoid sed e.g.


--- NEW FILE substrepo ---
#!/usr/bin/python
# -*- mode: Python; indent-tabs-mode: nil; -*-
#
# Small convenience helper to substitute arbitrary variables in
# a Yum .repo definition file and print the result to stdout.
# Author: Michael Schwendt / Licence: GPLv2+

import sys, errno
from optparse import OptionParser
import yum.parser

usage = "Usage: %s [options] [file]" % sys.argv[0]
parser = OptionParser(usage=usage)
parser.add_option("-s", "--subst", default=[], action='append',
                  help="a 'key:value' pair to substitute")
(opts, args) = parser.parse_args()

if not len(args):
    infile = sys.stdin
elif len(args)>1:
    print "ERROR: invalid arguments"
    sys.exit(errno.EINVAL)
else:
    infile = file( args[0] )

vars = {}
for kv in opts.subst:
    key, val = kv.split(':')
    vars[key] = val

for line in infile.readlines():
    sys.stdout.write( yum.parser.varReplace(line,vars) )
infile.close()
sys.exit(0)



From pfj at fedoraproject.org  Fri Sep 19 08:59:45 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Fri, 19 Sep 2008 08:59:45 +0000 (UTC)
Subject: rpms/mono/devel mono-2.0-mimeicon.patch, NONE, 1.1 import.log, 1.5, 
	1.6 mono.spec, 1.79, 1.80
Message-ID: <20080919085945.4651B7013F@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22129/devel

Modified Files:
	import.log mono.spec 
Added Files:
	mono-2.0-mimeicon.patch 
Log Message:

Added mimeinfo backport fix 


mono-2.0-mimeicon.patch:

--- NEW FILE mono-2.0-mimeicon.patch ---
--- mono-2.0/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MimeIcon.cs	2008-09-02 16:46:50.000000000 +0100
+++ mono-2.0/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MimeIcon-new.cs	2008-09-18 23:29:05.000000000 +0100
@@ -358,11 +358,12 @@
 				if (internal_mime_type == "harddisk/harddisk" || internal_mime_type == "cdrom/cdrom" || internal_mime_type == "removable/removable")
 					image = ResourceImageLoader.Get ("text-x-generic.png");
 			}
-			
-			index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
-			MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
-			
-			MimeIconEngine.MimeIconIndex.Add (internal_mime_type, index);
+
+			if (image != null) {
+				index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
+				MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
+				MimeIconEngine.MimeIconIndex.Add (internal_mime_type, index);
+			}
 		}
 		
 		public override object AddAndGetIconIndex (string filename, string mime_type)
@@ -370,11 +371,11 @@
 			int index = -1;
 			
 			Image image = GnomeUtil.GetIcon (filename, mime_type, 48);
-			
-			index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
-			MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
-			
-			MimeIconEngine.MimeIconIndex.Add (mime_type, index);
+			if (image != null) {
+				index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
+				MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
+				MimeIconEngine.MimeIconIndex.Add (mime_type, index);
+			}
 			
 			return index;
 		}
@@ -384,11 +385,11 @@
 			int index = -1;
 			
 			Image image = GnomeUtil.GetIcon (mime_type, 48);
-			
-			index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
-			MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
-			
-			MimeIconEngine.MimeIconIndex.Add (mime_type, index);
+			if (image != null) {
+				index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
+				MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
+				MimeIconEngine.MimeIconIndex.Add (mime_type, index);
+			}
 			
 			return index;
 		}


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	17 Sep 2008 21:00:05 -0000	1.5
+++ import.log	19 Sep 2008 08:59:14 -0000	1.6
@@ -3,3 +3,4 @@
 mono-2_0-5_fc10:HEAD:mono-2.0-5.fc10.src.rpm:1220047677
 mono-2_0-6_fc10:HEAD:mono-2.0-6.fc10.src.rpm:1221073246
 mono-2_0-7_fc10:HEAD:mono-2.0-7.fc10.src.rpm:1221685120
+mono-2_0-8_fc10:HEAD:mono-2.0-8.fc10.src.rpm:1221814700


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- mono.spec	17 Sep 2008 21:00:05 -0000	1.79
+++ mono.spec	19 Sep 2008 08:59:14 -0000	1.80
@@ -1,6 +1,6 @@
 Name:		mono
 Version:        2.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -45,6 +45,7 @@
 Patch9:mono-2.0-monoservice.patch
 Patch10: mono-2.0-metadata-makefile.patch
 Patch11: mono-2.0-tablelayout.patch
+Patch12: mono-2.0-mimeicon.patch
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -261,6 +262,7 @@
 %patch9 -p1 -b .monoservice
 %patch10 -p1 -b .metadata
 %patch11 -p1 -b .tablelayout
+%patch12 -p1 -b .mimeicon
 autoreconf -f -i -s
 
 # Add undeclared Arg
@@ -615,6 +617,9 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
+* Thu Sep 18 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-8
+- MimeIcon patch added
+
 * Wed Sep 17 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-7
 - TableLayoutSettings fix (bz 462005)
 



From iankent at fedoraproject.org  Fri Sep 19 09:00:33 2008
From: iankent at fedoraproject.org (Ian Kent)
Date: Fri, 19 Sep 2008 09:00:33 +0000 (UTC)
Subject: rpms/autofs/devel autofs-5.0.3-check-for-kernel-automount-fix.patch,
	NONE, 1.1 autofs-5.0.3-fix-ifc-buff-size-fix-2.patch, NONE,
	1.1 autofs-5.0.3-handle-zero-length-nis-key-update.patch, NONE,
	1.1 autofs-5.0.3-mtab-as-proc-mounts-fix.patch, NONE,
	1.1 autofs.spec, 1.250, 1.251
Message-ID: <20080919090033.D8D457013F@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22458

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.3-check-for-kernel-automount-fix.patch 
	autofs-5.0.3-fix-ifc-buff-size-fix-2.patch 
	autofs-5.0.3-handle-zero-length-nis-key-update.patch 
	autofs-5.0.3-mtab-as-proc-mounts-fix.patch 
Log Message:
* Fri Sep 19 2008 Ian Kent <ikent at redhat.com> - 5.0.3-23
- add upstream bug fixes
  - bug fix for mtab check.
  - bug fix for zero length nis key.
  - update for ifc buffer handling.
  - bug fix for kernel automount handling.
- warning: I found a bunch of patches that were present but not being applied.


autofs-5.0.3-check-for-kernel-automount-fix.patch:

--- NEW FILE autofs-5.0.3-check-for-kernel-automount-fix.patch ---
autofs-5.0.3 - check for kernel automount fix

From: Ian Kent <raven at themaw.net>

Look in the correct mount table for kernel automounted "nohide"
mounts.
---

 daemon/direct.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/daemon/direct.c b/daemon/direct.c
index afb354e..13f572c 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -709,7 +709,7 @@ int mount_autofs_offset(struct autofs_point *ap, struct mapent *me, const char *
 			 * the kernel NFS client.
 			 */
 			if (me->multi != me &&
-			    is_mounted(_PATH_MOUNTED, mountpoint, MNTS_REAL))
+			    is_mounted(_PROC_MOUNTS, mountpoint, MNTS_REAL))
 				return MOUNT_OFFSET_IGNORE;
 
 			/* 

autofs-5.0.3-fix-ifc-buff-size-fix-2.patch:

--- NEW FILE autofs-5.0.3-fix-ifc-buff-size-fix-2.patch ---
autofs-5.0.3 - fix ifc buff size fix 2

From: Ian Kent <raven at themaw.net>

For the case of a large number of interfaces there can be
a lot of malloc(3)s for every mount which could slow things
down. So we remember the maximum allocation size and use it
in subsequent allocations.
---

 modules/replicated.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)


diff --git a/modules/replicated.c b/modules/replicated.c
index 35a6675..b435f4b 100644
--- a/modules/replicated.c
+++ b/modules/replicated.c
@@ -62,7 +62,10 @@
 #ifndef MAX_ERR_BUF
 #define MAX_ERR_BUF		512
 #endif
+
 #define MAX_IFC_BUF		2048
+static int volatile ifc_buf_len = MAX_IFC_BUF;
+static int volatile ifc_last_len = 0;
 
 #define MASK_A  0x7F000000
 #define MASK_B  0xBFFF0000
@@ -97,7 +100,7 @@ void seed_random(void)
 
 static int alloc_ifreq(struct ifconf *ifc, int sock)
 {
-	int ret, lastlen = 0, len = MAX_IFC_BUF;
+	int ret, lastlen = ifc_last_len, len = ifc_buf_len;
 	char err_buf[MAX_ERR_BUF], *buf;
 
 	while (1) {
@@ -119,7 +122,7 @@ static int alloc_ifreq(struct ifconf *ifc, int sock)
 			return 0;
 		}
 
-		if (ifc->ifc_len == lastlen)
+		if (ifc->ifc_len <= lastlen)
 			break;
 
 		lastlen = ifc->ifc_len;
@@ -127,6 +130,11 @@ static int alloc_ifreq(struct ifconf *ifc, int sock)
 		free(buf);
 	}
 
+	if (lastlen != ifc_last_len) {
+		ifc_last_len = lastlen;
+		ifc_buf_len = len;
+	}
+
 	return 1;
 }
 

autofs-5.0.3-handle-zero-length-nis-key-update.patch:

--- NEW FILE autofs-5.0.3-handle-zero-length-nis-key-update.patch ---
autofs-5.0.3 - handle zero length nis key update

From: Ian Kent <raven at themaw.net>

A zero length key is invalid but so is a single character
non-printable key and it causes the parser to get confused
as well.
---

 modules/lookup_yp.c |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)


diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index ee06551..8b6408b 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -19,6 +19,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <signal.h>
+#include <ctype.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -168,9 +169,13 @@ int yp_all_master_callback(int status, char *ypkey, int ypkeylen,
 	if (status != YP_TRUE)
 		return status;
 
-	/* Ignore zero length keys */
-	if (ypkeylen == 0)
+	/* Ignore zero length and single non-printable char keys */
+	if (ypkeylen == 0 || (ypkeylen == 1 && !isprint(*ypkey))) {
+		warn(logopt, MODPREFIX
+		     "ignoring invalid map entry, zero length or "
+		     "single character non-printable key");
 		return 0;
+	}
 
 	/*
 	 * Ignore keys beginning with '+' as plus map
@@ -267,9 +272,13 @@ int yp_all_callback(int status, char *ypkey, int ypkeylen,
 	if (status != YP_TRUE)
 		return status;
 
-	/* Ignore zero length keys */
-	if (ypkeylen == 0)
+	/* Ignore zero length and single non-printable char keys */
+	if (ypkeylen == 0 || (ypkeylen == 1 && !isprint(*ypkey))) {
+		warn(logopt, MODPREFIX
+		     "ignoring invalid map entry, zero length or "
+		     "single character non-printable key");
 		return 0;
+	}
 
 	/*
 	 * Ignore keys beginning with '+' as plus map

autofs-5.0.3-mtab-as-proc-mounts-fix.patch:

--- NEW FILE autofs-5.0.3-mtab-as-proc-mounts-fix.patch ---
autofs-5.0.3 - check for mtab pointing to /proc/mounts fix

From: Ian Kent <raven at themaw.net>

Fix incorrect initialization in spawn_bind_mount() which
caused bind mounts to not be added to mtab.
---

 daemon/spawn.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/daemon/spawn.c b/daemon/spawn.c
index 85cf9b8..17f92f4 100644
--- a/daemon/spawn.c
+++ b/daemon/spawn.c
@@ -432,7 +432,7 @@ int spawn_bind_mount(unsigned logopt, ...)
 	char arg_fake[] = "-f";
 	unsigned int options;
 	unsigned int retries = MTAB_LOCK_RETRIES;
-	int update_mtab = 0, ret, printed = 0;
+	int update_mtab = 1, ret, printed = 0;
 	char buf[PATH_MAX];
 
 	/* If we use mount locking we can't validate the location */


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- autofs.spec	25 Aug 2008 04:47:37 -0000	1.250
+++ autofs.spec	19 Sep 2008 09:00:03 -0000	1.251
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.3
-Release: 21
+Release: 23
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -53,6 +53,10 @@
 Patch41: autofs-5.0.3-mtab-as-proc-mounts.patch
 Patch42: autofs-5.0.3-fix-ifc-buff-size.patch
 Patch43: autofs-5.0.3-fix-percent-hack.patch
+Patch44: autofs-5.0.3-mtab-as-proc-mounts-fix.patch
+Patch45: autofs-5.0.3-handle-zero-length-nis-key-update.patch
+Patch46: autofs-5.0.3-fix-ifc-buff-size-fix-2.patch
+Patch47: autofs-5.0.3-check-for-kernel-automount-fix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs
 Requires: kernel >= 2.6.17
@@ -116,6 +120,31 @@
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
+%patch43 -p1
+%patch44 -p1
+%patch45 -p1
+%patch46 -p1
+%patch47 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -168,6 +197,15 @@
 %{_libdir}/autofs/
 
 %changelog
+* Fri Sep 19 2008 Ian Kent <ikent at redhat.com> - 5.0.3-23
+- add upstream bug fixes
+  - bug fix for mtab check.
+  - bug fix for zero length nis key.
+  - update for ifc buffer handling.
+  - bug fix for kernel automount handling.
+- warning: I found a bunch of patches that were present but not
+  being applied.
+  
 * Mon Aug 25 2008 Ian Kent <ikent at redhat.com> - 5.0.3-21
 - add upstream bug fix patches
   - add command line option to override is running check.



From phuang at fedoraproject.org  Fri Sep 19 09:34:01 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 19 Sep 2008 09:34:01 +0000 (UTC)
Subject: rpms/scim/devel scim-1.4.7-bz462820.patch, NONE, 1.1 scim.spec,
	1.128, 1.129
Message-ID: <20080919093401.0EA7B700F7@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/scim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29843

Modified Files:
	scim.spec 
Added Files:
	scim-1.4.7-bz462820.patch 
Log Message:
Resolve: bug 462820 by Parag.

scim-1.4.7-bz462820.patch:

--- NEW FILE scim-1.4.7-bz462820.patch ---
diff -up scim-1.4.7/src/scim_utility.cpp.bz462820 scim-1.4.7/src/scim_utility.cpp
--- scim-1.4.7/src/scim_utility.cpp.bz462820	2008-09-19 16:27:18.000000000 +0800
+++ scim-1.4.7/src/scim_utility.cpp	2008-09-19 16:33:50.000000000 +0800
@@ -765,6 +765,8 @@ static __Language __languages [] = {
     { "pt_PT",    NULL, N_("Portuguese"), "Portugu??s", "@euro" },
     { "ro_RO",    NULL, N_("Romanian"), "Rom??n??", NULL },
     { "ru_RU",    NULL, N_("Russian"), "??????????????", ".koi8r" },
+    { "sd",    "sd_IN", N_("Sindhi"), "???????????", NULL },
+    { "sd_IN",    NULL, N_("Sindhi"), "??????????????????", "@devanagari" },
     { "si_LK",    NULL, N_("Sinhala"), "???????????????", NULL },
     { "sk_SK",    NULL, N_("Slovak"), "Slovensk??", NULL },
     { "sl_SI",    NULL, N_("Slovenian"), "Sloven????ina", NULL },


Index: scim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim/devel/scim.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- scim.spec	27 Aug 2008 07:26:07 -0000	1.128
+++ scim.spec	19 Sep 2008 09:33:30 -0000	1.129
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.7
-Release:   31%{?dist}
+Release:   32%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -49,6 +49,7 @@
 Patch26:   scim-1.4.7-trayicon.patch
 Patch27:   scim-1.4.7-menu-pos.patch
 Patch28:   scim-1.4.7-xim-wrong-format.patch
+Patch29:   scim-1.4.7-bz462820.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -181,6 +182,7 @@
 %patch26 -p1 -b .26-trayicon
 %patch27 -p1 -b .27-menu-pos
 %patch28 -p1 -b .28-xim-wrong-format
+%patch29 -p1 -b .29-bz462820
 
 
 %if %{snapshot}
@@ -313,6 +315,9 @@
 
 
 %changelog
+* Fri Sep 19 2008 Huang Peng <phuang at redhat.com> - 1.4.7-32
+- Resolve: bug 462820 by Parag.
+
 * Wed Aug 27 2008 Jens Petersen <petersen at redhat.com> - 1.4.7-31.fc10
 - bring back Ctrl+Space hotkey by default for all locale by popular demand
 - drop disabling of uncommon IMEs from global system config since less used



From petersen at fedoraproject.org  Fri Sep 19 09:58:30 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 19 Sep 2008 09:58:30 +0000 (UTC)
Subject: rpms/darcs/devel darcs.spec,1.37,1.38
Message-ID: <20080919095830.B9112700F7@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/darcs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2578

Modified Files:
	darcs.spec 
Log Message:
use full paths to selinux tools in %%post (Jon Stanley, #462221)



Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- darcs.spec	1 Jul 2008 04:44:06 -0000	1.37
+++ darcs.spec	19 Sep 2008 09:58:00 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           darcs
 Version:        2.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        David's advanced revision control system
 
 Group:          Development/Tools
@@ -53,7 +53,7 @@
 %package server
 Summary: David's advanced revision control system Server
 Group: Development/Tools
-Requires: webserver, darcs, /usr/bin/xsltproc
+Requires: webserver, darcs, libxslt
 
 %description server
 Darcs is a revision control system, along the lines of CVS
@@ -108,8 +108,8 @@
 
 
 %post
-semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/darcs >/dev/null 2>&1 || :
-restorecon -v %{_bindir}/darcs
+%{_sbindir}/semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/darcs >/dev/null 2>&1 || :
+/sbin/restorecon -v %{_bindir}/darcs
 
 
 %files
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Fri Sep 19 2008 Jens Petersen <petersen at redhat.com> - 2.0.2-2
+- use full paths to selinux tools in %%post (Jon Stanley, #462221)
+
 * Sat Jun 28 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 2.0.2-1
 - split out the manual to a -doc rpm
 - update to 2.0.2



From fabbione at fedoraproject.org  Fri Sep 19 10:00:00 2008
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri, 19 Sep 2008 10:00:00 +0000 (UTC)
Subject: rpms/cluster/devel cluster.spec,1.16,1.17
Message-ID: <20080919100000.EAB3F700F7@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3174

Modified Files:
	cluster.spec 
Log Message:
Readd lost changelog entry for completness



Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cluster.spec	3 Sep 2008 20:36:50 -0000	1.16
+++ cluster.spec	19 Sep 2008 09:59:30 -0000	1.17
@@ -308,6 +308,9 @@
 - Rebuild for broken deps.
 - Pull in upstream patches for libvolume_id changes
 
+* Wed Sep 03 2008 Jesse Keating <jkeating at redhat.com> - 2.99.08-2
+- Rebuild for broken deps.
+
 * Tue Aug 12 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.08-1
 - New upstream release.
 - Drop local patch that's part of upstream.



From thm at fedoraproject.org  Fri Sep 19 10:06:39 2008
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri, 19 Sep 2008 10:06:39 +0000 (UTC)
Subject: rpms/stk/devel README.fedora, NONE, 1.1 config.guess, NONE,
	1.1 config.sub, NONE, 1.1 import.log, NONE,
	1.1 stk-4.3.1-cflags-lib.patch, NONE, 1.1 stk-4.3.1-header.patch,
	NONE, 1.1 stk-4.3.1-missing.patch, NONE,
	1.1 stk-4.3.1-sharedlib.patch, NONE, 1.1 stk.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080919100639.9F203700F7@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/stk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5192/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora config.guess config.sub import.log 
	stk-4.3.1-cflags-lib.patch stk-4.3.1-header.patch 
	stk-4.3.1-missing.patch stk-4.3.1-sharedlib.patch stk.spec 
Log Message:
Initial import.


--- NEW FILE README.fedora ---
For legal reasons, the following files have been removed from the
original tarfile:

    stk-4.3.1/src/include/dsound.h
    stk-4.3.1/src/include/soundcard.h
    stk-4.3.1/src/include/asio.cpp
    stk-4.3.1/src/include/asiodrivers.cpp
    stk-4.3.1/src/include/asiodrivers.h
    stk-4.3.1/src/include/asiodrvr.h
    stk-4.3.1/src/include/asio.h
    stk-4.3.1/src/include/asiolist.cpp
    stk-4.3.1/src/include/asiolist.h
    stk-4.3.1/src/include/asiosys.h
    stk-4.3.1/src/include/iasiodrv.h
    stk-4.3.1/src/include/iasiothiscallresolver.cpp
    stk-4.3.1/src/include/iasiothiscallresolver.h
    stk-4.3.1/projects/examples/midifiles/bwv772.mid
    stk-4.3.1/projects/examples/midifiles/jesu.mid
    stk-4.3.1/projects/examples/midifiles/tango.mid
    stk-4.3.1/doc/html/tutorial/bachfugue.ski
    stk-4.3.1/doc/html/tutorial/bookert.ski
    stk-4.3.1/projects/demo/scores/bachfugue.ski
    stk-4.3.1/projects/demo/scores/bookert.ski
    stk-4.3.1/projects/demo/scores/chords.ski
    stk-4.3.1/projects/demo/scores/doogie.ski
    stk-4.3.1/projects/demo/scores/drumfunk.ski
    stk-4.3.1/projects/demo/scores/drumtest.ski
    stk-4.3.1/projects/demo/scores/duelingb.ski
    stk-4.3.1/projects/demo/scores/fiddle.ski
    stk-4.3.1/projects/demo/scores/flutbach.ski
    stk-4.3.1/projects/demo/scores/funicula.ski
    stk-4.3.1/projects/demo/scores/funskini.ski
    stk-4.3.1/projects/demo/scores/lacrymos.ski
    stk-4.3.1/projects/demo/scores/mandtune.ski
    stk-4.3.1/projects/demo/scores/marimba2.ski
    stk-4.3.1/projects/demo/scores/marimtst.ski
    stk-4.3.1/projects/demo/scores/misacrio.ski
    stk-4.3.1/projects/demo/scores/morazbel.ski
    stk-4.3.1/projects/demo/scores/organs.ski
    stk-4.3.1/projects/demo/scores/pickdamp.ski
    stk-4.3.1/projects/demo/scores/pictures.ski
    stk-4.3.1/projects/demo/scores/riderson.ski
    stk-4.3.1/projects/demo/scores/scales.ski
    stk-4.3.1/projects/demo/scores/shaktest.ski
    stk-4.3.1/projects/demo/scores/simplgft.ski
    stk-4.3.1/projects/demo/scores/spain.ski
    stk-4.3.1/projects/demo/scores/streetsf.ski
    stk-4.3.1/projects/demo/scores/test.ski
    stk-4.3.1/projects/demo/scores/thecars.ski
    stk-4.3.1/projects/demo/scores/tubebell.ski
    stk-4.3.1/projects/demo/scores/vocaliz.ski
    stk-4.3.1/projects/examples/scores/bachfugue.ski
    stk-4.3.1/projects/examples/scores/bookert.ski


--- NEW FILE config.guess ---
#! /bin/sh
# Attempt to guess a canonical system name.
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
#   Inc.

timestamp='2007-05-17'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# 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.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.


# Originally written by Per Bothner <per at bothner.com>.
# Please send patches to <config-patches at gnu.org>.  Submit a context
# diff and a properly formatted ChangeLog entry.
#
# This script attempts to guess a canonical system name similar to
# config.sub.  If it succeeds, it prints the system name on stdout, and
# exits with 0.  Otherwise, it exits with 1.
#
# The plan is that this can be called by configure scripts if you
# don't specify an explicit build system type.

me=`echo "$0" | sed -e 's,.*/,,'`

usage="\
Usage: $0 [OPTION]

Output the configuration name of the system \`$me' is run on.

Operation modes:
  -h, --help         print this help, then exit
  -t, --time-stamp   print date of last modification, then exit
  -v, --version      print version number, then exit

Report bugs and patches to <config-patches at gnu.org>."

version="\
GNU config.guess ($timestamp)

Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.

This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

help="
Try \`$me --help' for more information."

# Parse command line
while test $# -gt 0 ; do
  case $1 in
    --time-stamp | --time* | -t )
       echo "$timestamp" ; exit ;;
    --version | -v )
       echo "$version" ; exit ;;
    --help | --h* | -h )
       echo "$usage"; exit ;;
    -- )     # Stop option processing
       shift; break ;;
    - )	# Use stdin as input.
       break ;;
    -* )
       echo "$me: invalid option $1$help" >&2
       exit 1 ;;
    * )
       break ;;
  esac
done

if test $# != 0; then
  echo "$me: too many arguments$help" >&2
  exit 1
fi

trap 'exit 1' 1 2 15

# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
# compiler to aid in system detection is discouraged as it requires
# temporary files to be created and, as you can see below, it is a
# headache to deal with in a portable fashion.

# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
# use `HOST_CC' if defined, but it is deprecated.

# Portable tmp directory creation inspired by the Autoconf team.

set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
 { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
dummy=$tmp/dummy ;
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
case $CC_FOR_BUILD,$HOST_CC,$CC in
 ,,)    echo "int x;" > $dummy.c ;
	for c in cc gcc c89 c99 ; do
	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
	     CC_FOR_BUILD="$c"; break ;
	  fi ;
	done ;
	if test x"$CC_FOR_BUILD" = x ; then
	  CC_FOR_BUILD=no_compiler_found ;
	fi
	;;
 ,,*)   CC_FOR_BUILD=$CC ;;
 ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
esac ; set_cc_for_build= ;'

# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi at noc.rutgers.edu 1994-08-24)
if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
	PATH=$PATH:/.attbin ; export PATH
fi

UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown

# Note: order is significant - the case branches are not exclusive.

case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:NetBSD:*:*)
	# NetBSD (nbsd) targets should (where applicable) match one or
	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
	# switched to ELF, *-*-netbsd* would select the old
	# object file format.  This provides both forward
	# compatibility and a consistent mechanism for selecting the
	# object file format.
	#
	# Note: NetBSD doesn't particularly care about the vendor
	# portion of the name.  We always set it to "unknown".
	sysctl="sysctl -n hw.machine_arch"
	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
	case "${UNAME_MACHINE_ARCH}" in
	    armeb) machine=armeb-unknown ;;
	    arm*) machine=arm-unknown ;;
	    sh3el) machine=shl-unknown ;;
	    sh3eb) machine=sh-unknown ;;
	    sh5el) machine=sh5le-unknown ;;
	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
	esac
	# The Operating System including object format, if it has switched
	# to ELF recently, or will in the future.
	case "${UNAME_MACHINE_ARCH}" in
	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
		eval $set_cc_for_build
		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
			| grep __ELF__ >/dev/null
		then
		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
		    # Return netbsd for either.  FIX?
		    os=netbsd
		else
		    os=netbsdelf
		fi
		;;
	    *)
	        os=netbsd
		;;
	esac
	# The OS release
	# Debian GNU/NetBSD machines have a different userland, and
	# thus, need a distinct triplet. However, they do not need
	# kernel version information, so it can be replaced with a
	# suitable tag, in the style of linux-gnu.
	case "${UNAME_VERSION}" in
	    Debian*)
		release='-gnu'
		;;
	    *)
		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
		;;
	esac
	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
	# contains redundant information, the shorter form:
	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
	echo "${machine}-${os}${release}"
	exit ;;
    *:OpenBSD:*:*)
	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
	exit ;;
    *:ekkoBSD:*:*)
	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
	exit ;;
    *:SolidBSD:*:*)
	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
	exit ;;
    macppc:MirBSD:*:*)
	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
	exit ;;
    *:MirBSD:*:*)
	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
	exit ;;
    alpha:OSF1:*:*)
	case $UNAME_RELEASE in
	*4.0)
		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
		;;
	*5.*)
	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
		;;
	esac
	# According to Compaq, /usr/sbin/psrinfo has been available on
	# OSF/1 and Tru64 systems produced since 1995.  I hope that
	# covers most systems running today.  This code pipes the CPU
	# types through head -n 1, so we only detect the type of CPU 0.
	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
	case "$ALPHA_CPU_TYPE" in
	    "EV4 (21064)")
		UNAME_MACHINE="alpha" ;;
	    "EV4.5 (21064)")
		UNAME_MACHINE="alpha" ;;
	    "LCA4 (21066/21068)")
		UNAME_MACHINE="alpha" ;;
	    "EV5 (21164)")
		UNAME_MACHINE="alphaev5" ;;
	    "EV5.6 (21164A)")
		UNAME_MACHINE="alphaev56" ;;
	    "EV5.6 (21164PC)")
		UNAME_MACHINE="alphapca56" ;;
	    "EV5.7 (21164PC)")
		UNAME_MACHINE="alphapca57" ;;
	    "EV6 (21264)")
		UNAME_MACHINE="alphaev6" ;;
	    "EV6.7 (21264A)")
		UNAME_MACHINE="alphaev67" ;;
	    "EV6.8CB (21264C)")
		UNAME_MACHINE="alphaev68" ;;
	    "EV6.8AL (21264B)")
		UNAME_MACHINE="alphaev68" ;;
	    "EV6.8CX (21264D)")
		UNAME_MACHINE="alphaev68" ;;
	    "EV6.9A (21264/EV69A)")
		UNAME_MACHINE="alphaev69" ;;
	    "EV7 (21364)")
		UNAME_MACHINE="alphaev7" ;;
	    "EV7.9 (21364A)")
		UNAME_MACHINE="alphaev79" ;;
	esac
	# A Pn.n version is a patched version.
	# A Vn.n version is a released version.
	# A Tn.n version is a released field test version.
	# A Xn.n version is an unreleased experimental baselevel.
	# 1.2 uses "1.2" for uname -r.
	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
	exit ;;
    Alpha\ *:Windows_NT*:*)
	# How do we know it's Interix rather than the generic POSIX subsystem?
	# Should we change UNAME_MACHINE based on the output of uname instead
	# of the specific Alpha model?
	echo alpha-pc-interix
	exit ;;
    21064:Windows_NT:50:3)
	echo alpha-dec-winnt3.5
	exit ;;
    Amiga*:UNIX_System_V:4.0:*)
	echo m68k-unknown-sysv4
	exit ;;
    *:[Aa]miga[Oo][Ss]:*:*)
	echo ${UNAME_MACHINE}-unknown-amigaos
	exit ;;
    *:[Mm]orph[Oo][Ss]:*:*)
	echo ${UNAME_MACHINE}-unknown-morphos
	exit ;;
    *:OS/390:*:*)
	echo i370-ibm-openedition
	exit ;;
    *:z/VM:*:*)
	echo s390-ibm-zvmoe
	exit ;;
    *:OS400:*:*)
        echo powerpc-ibm-os400
	exit ;;
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
	echo arm-acorn-riscix${UNAME_RELEASE}
	exit ;;
    arm:riscos:*:*|arm:RISCOS:*:*)
	echo arm-unknown-riscos
	exit ;;
    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
	echo hppa1.1-hitachi-hiuxmpp
	exit ;;
    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
	if test "`(/bin/universe) 2>/dev/null`" = att ; then
		echo pyramid-pyramid-sysv3
	else
		echo pyramid-pyramid-bsd
	fi
	exit ;;
    NILE*:*:*:dcosx)
	echo pyramid-pyramid-svr4
	exit ;;
    DRS?6000:unix:4.0:6*)
	echo sparc-icl-nx6
	exit ;;
    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
	case `/usr/bin/uname -p` in
	    sparc) echo sparc-icl-nx7; exit ;;
	esac ;;
    sun4H:SunOS:5.*:*)
	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
	exit ;;
    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
	exit ;;
    i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
	exit ;;
    sun4*:SunOS:6*:*)
	# According to config.sub, this is the proper way to canonicalize
	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
	# it's likely to be more like Solaris than SunOS4.
	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
	exit ;;
    sun4*:SunOS:*:*)
	case "`/usr/bin/arch -k`" in
	    Series*|S4*)
		UNAME_RELEASE=`uname -v`
		;;
	esac
	# Japanese Language versions have a version number like `4.1.3-JL'.
	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
	exit ;;
    sun3*:SunOS:*:*)
	echo m68k-sun-sunos${UNAME_RELEASE}
	exit ;;
    sun*:*:4.2BSD:*)
	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
	case "`/bin/arch`" in
	    sun3)
		echo m68k-sun-sunos${UNAME_RELEASE}
		;;
	    sun4)
		echo sparc-sun-sunos${UNAME_RELEASE}
		;;
	esac
	exit ;;
    aushp:SunOS:*:*)
	echo sparc-auspex-sunos${UNAME_RELEASE}
	exit ;;
    # The situation for MiNT is a little confusing.  The machine name
    # can be virtually everything (everything which is not
    # "atarist" or "atariste" at least should have a processor
    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
    # to the lowercase version "mint" (or "freemint").  Finally
    # the system name "TOS" denotes a system which is actually not
    # MiNT.  But MiNT is downward compatible to TOS, so this should
    # be no problem.
    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
        echo m68k-atari-mint${UNAME_RELEASE}
	exit ;;
    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
	echo m68k-atari-mint${UNAME_RELEASE}
        exit ;;
    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
        echo m68k-atari-mint${UNAME_RELEASE}
	exit ;;
    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
        echo m68k-milan-mint${UNAME_RELEASE}
        exit ;;
    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
        echo m68k-hades-mint${UNAME_RELEASE}
        exit ;;
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
        echo m68k-unknown-mint${UNAME_RELEASE}
        exit ;;
    m68k:machten:*:*)
	echo m68k-apple-machten${UNAME_RELEASE}
	exit ;;
    powerpc:machten:*:*)
	echo powerpc-apple-machten${UNAME_RELEASE}
	exit ;;
    RISC*:Mach:*:*)
	echo mips-dec-mach_bsd4.3
	exit ;;
    RISC*:ULTRIX:*:*)
	echo mips-dec-ultrix${UNAME_RELEASE}
	exit ;;
    VAX*:ULTRIX*:*:*)
	echo vax-dec-ultrix${UNAME_RELEASE}
	exit ;;
    2020:CLIX:*:* | 2430:CLIX:*:*)
	echo clipper-intergraph-clix${UNAME_RELEASE}
	exit ;;
    mips:*:*:UMIPS | mips:*:*:RISCos)
	eval $set_cc_for_build
	sed 's/^	//' << EOF >$dummy.c
#ifdef __cplusplus
#include <stdio.h>  /* for printf() prototype */
	int main (int argc, char *argv[]) {
#else
	int main (argc, argv) int argc; char *argv[]; {
#endif
	#if defined (host_mips) && defined (MIPSEB)
	#if defined (SYSTYPE_SYSV)
	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
	#endif
	#if defined (SYSTYPE_SVR4)
	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
	#endif
	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
	#endif
	#endif
	  exit (-1);
	}
EOF
	$CC_FOR_BUILD -o $dummy $dummy.c &&
	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
	  SYSTEM_NAME=`$dummy $dummyarg` &&
	    { echo "$SYSTEM_NAME"; exit; }
	echo mips-mips-riscos${UNAME_RELEASE}
	exit ;;
    Motorola:PowerMAX_OS:*:*)
	echo powerpc-motorola-powermax
	exit ;;
    Motorola:*:4.3:PL8-*)
	echo powerpc-harris-powermax
	exit ;;
    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
	echo powerpc-harris-powermax
	exit ;;
    Night_Hawk:Power_UNIX:*:*)
	echo powerpc-harris-powerunix
	exit ;;
    m88k:CX/UX:7*:*)
	echo m88k-harris-cxux7
	exit ;;
    m88k:*:4*:R4*)
	echo m88k-motorola-sysv4
	exit ;;
    m88k:*:3*:R3*)
	echo m88k-motorola-sysv3
	exit ;;
    AViiON:dgux:*:*)
        # DG/UX returns AViiON for all architectures
        UNAME_PROCESSOR=`/usr/bin/uname -p`
	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
	then
	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
	       [ ${TARGET_BINARY_INTERFACE}x = x ]
	    then
		echo m88k-dg-dgux${UNAME_RELEASE}
	    else
		echo m88k-dg-dguxbcs${UNAME_RELEASE}
	    fi
	else
	    echo i586-dg-dgux${UNAME_RELEASE}
	fi
 	exit ;;
    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
	echo m88k-dolphin-sysv3
	exit ;;
    M88*:*:R3*:*)
	# Delta 88k system running SVR3
	echo m88k-motorola-sysv3
	exit ;;
    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
	echo m88k-tektronix-sysv3
	exit ;;
    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
	echo m68k-tektronix-bsd
	exit ;;
    *:IRIX*:*:*)
	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
	exit ;;
    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
    i*86:AIX:*:*)
	echo i386-ibm-aix
	exit ;;
    ia64:AIX:*:*)
	if [ -x /usr/bin/oslevel ] ; then
		IBM_REV=`/usr/bin/oslevel`
	else
		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
	fi
	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
	exit ;;
    *:AIX:2:3)
	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
		eval $set_cc_for_build
		sed 's/^		//' << EOF >$dummy.c
		#include <sys/systemcfg.h>

		main()
			{
			if (!__power_pc())
				exit(1);
			puts("powerpc-ibm-aix3.2.5");
			exit(0);
			}
EOF
		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
		then
			echo "$SYSTEM_NAME"
		else
			echo rs6000-ibm-aix3.2.5
		fi
	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
		echo rs6000-ibm-aix3.2.4
	else
		echo rs6000-ibm-aix3.2
	fi
	exit ;;
    *:AIX:*:[45])
	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
		IBM_ARCH=rs6000
	else
		IBM_ARCH=powerpc
	fi
	if [ -x /usr/bin/oslevel ] ; then
		IBM_REV=`/usr/bin/oslevel`
	else
		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
	fi
	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
	exit ;;
    *:AIX:*:*)
	echo rs6000-ibm-aix
	exit ;;
    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
	echo romp-ibm-bsd4.4
	exit ;;
    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
	exit ;;                             # report: romp-ibm BSD 4.3
    *:BOSX:*:*)
	echo rs6000-bull-bosx
	exit ;;
    DPX/2?00:B.O.S.:*:*)
	echo m68k-bull-sysv3
	exit ;;
    9000/[34]??:4.3bsd:1.*:*)
	echo m68k-hp-bsd
	exit ;;
    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
	echo m68k-hp-bsd4.4
	exit ;;
    9000/[34678]??:HP-UX:*:*)
	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
	case "${UNAME_MACHINE}" in
	    9000/31? )            HP_ARCH=m68000 ;;
	    9000/[34]?? )         HP_ARCH=m68k ;;
	    9000/[678][0-9][0-9])
		if [ -x /usr/bin/getconf ]; then
		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                    case "${sc_cpu_version}" in
                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
                      532)                      # CPU_PA_RISC2_0
                        case "${sc_kernel_bits}" in
                          32) HP_ARCH="hppa2.0n" ;;
                          64) HP_ARCH="hppa2.0w" ;;
			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
                        esac ;;
                    esac
		fi
		if [ "${HP_ARCH}" = "" ]; then
		    eval $set_cc_for_build
		    sed 's/^              //' << EOF >$dummy.c

              #define _HPUX_SOURCE
              #include <stdlib.h>
              #include <unistd.h>

              int main ()
              {
              #if defined(_SC_KERNEL_BITS)
                  long bits = sysconf(_SC_KERNEL_BITS);
              #endif
                  long cpu  = sysconf (_SC_CPU_VERSION);

                  switch (cpu)
              	{
              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
              	case CPU_PA_RISC2_0:
              #if defined(_SC_KERNEL_BITS)
              	    switch (bits)
              		{
              		case 64: puts ("hppa2.0w"); break;
              		case 32: puts ("hppa2.0n"); break;
              		default: puts ("hppa2.0"); break;
              		} break;
              #else  /* !defined(_SC_KERNEL_BITS) */
              	    puts ("hppa2.0"); break;
              #endif
              	default: puts ("hppa1.0"); break;
              	}
                  exit (0);
              }
EOF
		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
		    test -z "$HP_ARCH" && HP_ARCH=hppa
		fi ;;
	esac
	if [ ${HP_ARCH} = "hppa2.0w" ]
	then
	    eval $set_cc_for_build

	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
	    # generating 64-bit code.  GNU and HP use different nomenclature:
	    #
	    # $ CC_FOR_BUILD=cc ./config.guess
	    # => hppa2.0w-hp-hpux11.23
	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
	    # => hppa64-hp-hpux11.23

	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
		grep __LP64__ >/dev/null
	    then
		HP_ARCH="hppa2.0w"
	    else
		HP_ARCH="hppa64"
	    fi
	fi
	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
	exit ;;
    ia64:HP-UX:*:*)
	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
	echo ia64-hp-hpux${HPUX_REV}
	exit ;;
    3050*:HI-UX:*:*)
	eval $set_cc_for_build
	sed 's/^	//' << EOF >$dummy.c
	#include <unistd.h>
	int
	main ()
	{
	  long cpu = sysconf (_SC_CPU_VERSION);
	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
	     results, however.  */
	  if (CPU_IS_PA_RISC (cpu))
	    {
	      switch (cpu)
		{
		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
		  default: puts ("hppa-hitachi-hiuxwe2"); break;
		}
	    }
	  else if (CPU_IS_HP_MC68K (cpu))
	    puts ("m68k-hitachi-hiuxwe2");
	  else puts ("unknown-hitachi-hiuxwe2");
	  exit (0);
	}
EOF
	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
		{ echo "$SYSTEM_NAME"; exit; }
	echo unknown-hitachi-hiuxwe2
	exit ;;
    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
	echo hppa1.1-hp-bsd
	exit ;;
    9000/8??:4.3bsd:*:*)
	echo hppa1.0-hp-bsd
	exit ;;
    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
	echo hppa1.0-hp-mpeix
	exit ;;
    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
	echo hppa1.1-hp-osf
	exit ;;
    hp8??:OSF1:*:*)
	echo hppa1.0-hp-osf
	exit ;;
    i*86:OSF1:*:*)
	if [ -x /usr/sbin/sysversion ] ; then
	    echo ${UNAME_MACHINE}-unknown-osf1mk
	else
	    echo ${UNAME_MACHINE}-unknown-osf1
	fi
	exit ;;
    parisc*:Lites*:*:*)
	echo hppa1.1-hp-lites
	exit ;;
    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
	echo c1-convex-bsd
        exit ;;
    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
	if getsysinfo -f scalar_acc
	then echo c32-convex-bsd
	else echo c2-convex-bsd
	fi
        exit ;;
    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
	echo c34-convex-bsd
        exit ;;
    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
	echo c38-convex-bsd
        exit ;;
    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
	echo c4-convex-bsd
        exit ;;
    CRAY*Y-MP:*:*:*)
	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
	exit ;;
    CRAY*[A-Z]90:*:*:*)
	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
	      -e 's/\.[^.]*$/.X/'
	exit ;;
    CRAY*TS:*:*:*)
	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
	exit ;;
    CRAY*T3E:*:*:*)
	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
	exit ;;
    CRAY*SV1:*:*:*)
	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
	exit ;;
    *:UNICOS/mp:*:*)
	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
	exit ;;
    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
        exit ;;
    5000:UNIX_System_V:4.*:*)
        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
	exit ;;
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
	exit ;;
    sparc*:BSD/OS:*:*)
	echo sparc-unknown-bsdi${UNAME_RELEASE}
	exit ;;
    *:BSD/OS:*:*)
	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
	exit ;;
    *:FreeBSD:*:*)
	case ${UNAME_MACHINE} in
	    pc98)
		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
	    amd64)
		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
	    *)
		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
	esac
	exit ;;
    i*:CYGWIN*:*)
	echo ${UNAME_MACHINE}-pc-cygwin
	exit ;;
    *:MINGW*:*)
	echo ${UNAME_MACHINE}-pc-mingw32
	exit ;;
    i*:windows32*:*)
    	# uname -m includes "-pc" on this system.
    	echo ${UNAME_MACHINE}-mingw32
	exit ;;
    i*:PW*:*)
	echo ${UNAME_MACHINE}-pc-pw32
	exit ;;
    *:Interix*:[3456]*)
    	case ${UNAME_MACHINE} in
	    x86) 
		echo i586-pc-interix${UNAME_RELEASE}
		exit ;;
	    EM64T | authenticamd)
		echo x86_64-unknown-interix${UNAME_RELEASE}
		exit ;;
	esac ;;
    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
	echo i${UNAME_MACHINE}-pc-mks
	exit ;;
    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
	# How do we know it's Interix rather than the generic POSIX subsystem?
	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
	# UNAME_MACHINE based on the output of uname instead of i386?
	echo i586-pc-interix
	exit ;;
    i*:UWIN*:*)
	echo ${UNAME_MACHINE}-pc-uwin
	exit ;;
    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
	echo x86_64-unknown-cygwin
	exit ;;
    p*:CYGWIN*:*)
	echo powerpcle-unknown-cygwin
	exit ;;
    prep*:SunOS:5.*:*)
	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
	exit ;;
    *:GNU:*:*)
	# the GNU system
	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
	exit ;;
    *:GNU/*:*:*)
	# other systems with GNU libc and userland
	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
	exit ;;
    i*86:Minix:*:*)
	echo ${UNAME_MACHINE}-pc-minix
	exit ;;
    arm*:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    avr32*:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    cris:Linux:*:*)
	echo cris-axis-linux-gnu
	exit ;;
    crisv32:Linux:*:*)
	echo crisv32-axis-linux-gnu
	exit ;;
    frv:Linux:*:*)
    	echo frv-unknown-linux-gnu
	exit ;;
    ia64:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    m32r*:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    m68*:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    mips:Linux:*:*)
	eval $set_cc_for_build
	sed 's/^	//' << EOF >$dummy.c
	#undef CPU
	#undef mips
	#undef mipsel
	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
	CPU=mipsel
	#else
	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
	CPU=mips
	#else
	CPU=
	#endif
	#endif
EOF
	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
	    /^CPU/{
		s: ::g
		p
	    }'`"
	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
	;;
    mips64:Linux:*:*)
	eval $set_cc_for_build
	sed 's/^	//' << EOF >$dummy.c
	#undef CPU
	#undef mips64
	#undef mips64el
	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
	CPU=mips64el
	#else
	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
	CPU=mips64
	#else
	CPU=
	#endif
	#endif
EOF
	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
	    /^CPU/{
		s: ::g
		p
	    }'`"
	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
	;;
    or32:Linux:*:*)
	echo or32-unknown-linux-gnu
	exit ;;
    ppc:Linux:*:*)
	echo powerpc-unknown-linux-gnu
	exit ;;
    ppc64:Linux:*:*)
	echo powerpc64-unknown-linux-gnu
	exit ;;
    alpha:Linux:*:*)
	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
	  EV5)   UNAME_MACHINE=alphaev5 ;;
	  EV56)  UNAME_MACHINE=alphaev56 ;;
	  PCA56) UNAME_MACHINE=alphapca56 ;;
	  PCA57) UNAME_MACHINE=alphapca56 ;;
	  EV6)   UNAME_MACHINE=alphaev6 ;;
	  EV67)  UNAME_MACHINE=alphaev67 ;;
	  EV68*) UNAME_MACHINE=alphaev68 ;;
        esac
	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
	exit ;;
    parisc:Linux:*:* | hppa:Linux:*:*)
	# Look for CPU level
	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
	  *)    echo hppa-unknown-linux-gnu ;;
	esac
	exit ;;
    parisc64:Linux:*:* | hppa64:Linux:*:*)
	echo hppa64-unknown-linux-gnu
	exit ;;
    s390:Linux:*:* | s390x:Linux:*:*)
	echo ${UNAME_MACHINE}-ibm-linux
	exit ;;
    sh64*:Linux:*:*)
    	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    sh*:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    sparc:Linux:*:* | sparc64:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    vax:Linux:*:*)
	echo ${UNAME_MACHINE}-dec-linux-gnu
	exit ;;
    x86_64:Linux:*:*)
	echo x86_64-unknown-linux-gnu
	exit ;;
    xtensa:Linux:*:*)
    	echo xtensa-unknown-linux-gnu
	exit ;;
    i*86:Linux:*:*)
	# The BFD linker knows what the default object file format is, so
	# first see if it will tell us. cd to the root directory to prevent
	# problems with other programs or directories called `ld' in the path.
	# Set LC_ALL=C to ensure ld outputs messages in English.
	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
			 | sed -ne '/supported targets:/!d
				    s/[ 	][ 	]*/ /g
				    s/.*supported targets: *//
				    s/ .*//
				    p'`
        case "$ld_supported_targets" in
	  elf32-i386)
		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
		;;
	  a.out-i386-linux)
		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
		exit ;;
	  coff-i386)
		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
		exit ;;
	  "")
		# Either a pre-BFD a.out linker (linux-gnuoldld) or
		# one that does not give us useful --help.
		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
		exit ;;
	esac
	# Determine whether the default compiler is a.out or elf
	eval $set_cc_for_build
	sed 's/^	//' << EOF >$dummy.c
	#include <features.h>
	#ifdef __ELF__
	# ifdef __GLIBC__
	#  if __GLIBC__ >= 2
	LIBC=gnu
	#  else
	LIBC=gnulibc1
	#  endif
	# else
	LIBC=gnulibc1
	# endif
	#else
	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
	LIBC=gnu
	#else
	LIBC=gnuaout
	#endif
	#endif
	#ifdef __dietlibc__
	LIBC=dietlibc
	#endif
EOF
	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
	    /^LIBC/{
		s: ::g
		p
	    }'`"
	test x"${LIBC}" != x && {
		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
		exit
	}
	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
	;;
    i*86:DYNIX/ptx:4*:*)
	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
	# earlier versions are messed up and put the nodename in both
	# sysname and nodename.
	echo i386-sequent-sysv4
	exit ;;
    i*86:UNIX_SV:4.2MP:2.*)
        # Unixware is an offshoot of SVR4, but it has its own version
        # number series starting with 2...
        # I am not positive that other SVR4 systems won't match this,
	# I just have to hope.  -- rms.
        # Use sysv4.2uw... so that sysv4* matches it.
	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
	exit ;;
    i*86:OS/2:*:*)
	# If we were able to find `uname', then EMX Unix compatibility
	# is probably installed.
	echo ${UNAME_MACHINE}-pc-os2-emx
	exit ;;
    i*86:XTS-300:*:STOP)
	echo ${UNAME_MACHINE}-unknown-stop
	exit ;;
    i*86:atheos:*:*)
	echo ${UNAME_MACHINE}-unknown-atheos
	exit ;;
    i*86:syllable:*:*)
	echo ${UNAME_MACHINE}-pc-syllable
	exit ;;
    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
	echo i386-unknown-lynxos${UNAME_RELEASE}
	exit ;;
    i*86:*DOS:*:*)
	echo ${UNAME_MACHINE}-pc-msdosdjgpp
	exit ;;
    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
	else
		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
	fi
	exit ;;
    i*86:*:5:[678]*)
    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
	case `/bin/uname -X | grep "^Machine"` in
	    *486*)	     UNAME_MACHINE=i486 ;;
	    *Pentium)	     UNAME_MACHINE=i586 ;;
	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
	esac
	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
	exit ;;
    i*86:*:3.2:*)
	if test -f /usr/options/cb.name; then
		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
	elif /bin/uname -X 2>/dev/null >/dev/null ; then
		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
			&& UNAME_MACHINE=i586
		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
			&& UNAME_MACHINE=i686
		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
			&& UNAME_MACHINE=i686
		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
	else
		echo ${UNAME_MACHINE}-pc-sysv32
	fi
	exit ;;
    pc:*:*:*)
	# Left here for compatibility:
        # uname -m prints for DJGPP always 'pc', but it prints nothing about
        # the processor, so we play safe by assuming i386.
	echo i386-pc-msdosdjgpp
        exit ;;
    Intel:Mach:3*:*)
	echo i386-pc-mach3
	exit ;;
    paragon:*:*:*)
	echo i860-intel-osf1
	exit ;;
    i860:*:4.*:*) # i860-SVR4
	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
	else # Add other i860-SVR4 vendors below as they are discovered.
	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
	fi
	exit ;;
    mini*:CTIX:SYS*5:*)
	# "miniframe"
	echo m68010-convergent-sysv
	exit ;;
    mc68k:UNIX:SYSTEM5:3.51m)
	echo m68k-convergent-sysv
	exit ;;
    M680?0:D-NIX:5.3:*)
	echo m68k-diab-dnix
	exit ;;
    M68*:*:R3V[5678]*:*)
	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
	OS_REL=''
	test -r /etc/.relid \
	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
          && { echo i486-ncr-sysv4; exit; } ;;
    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
	echo m68k-unknown-lynxos${UNAME_RELEASE}
	exit ;;
    mc68030:UNIX_System_V:4.*:*)
	echo m68k-atari-sysv4
	exit ;;
    TSUNAMI:LynxOS:2.*:*)
	echo sparc-unknown-lynxos${UNAME_RELEASE}
	exit ;;
    rs6000:LynxOS:2.*:*)
	echo rs6000-unknown-lynxos${UNAME_RELEASE}
	exit ;;
    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
	echo powerpc-unknown-lynxos${UNAME_RELEASE}
	exit ;;
    SM[BE]S:UNIX_SV:*:*)
	echo mips-dde-sysv${UNAME_RELEASE}
	exit ;;
    RM*:ReliantUNIX-*:*:*)
	echo mips-sni-sysv4
	exit ;;
    RM*:SINIX-*:*:*)
	echo mips-sni-sysv4
	exit ;;
    *:SINIX-*:*:*)
	if uname -p 2>/dev/null >/dev/null ; then
		UNAME_MACHINE=`(uname -p) 2>/dev/null`
		echo ${UNAME_MACHINE}-sni-sysv4
	else
		echo ns32k-sni-sysv
	fi
	exit ;;
    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                      # says <Richard.M.Bartel at ccMail.Census.GOV>
        echo i586-unisys-sysv4
        exit ;;
    *:UNIX_System_V:4*:FTX*)
	# From Gerald Hewes <hewes at openmarket.com>.
	# How about differentiating between stratus architectures? -djm
	echo hppa1.1-stratus-sysv4
	exit ;;
    *:*:*:FTX*)
	# From seanf at swdc.stratus.com.
	echo i860-stratus-sysv4
	exit ;;
    i*86:VOS:*:*)
	# From Paul.Green at stratus.com.
	echo ${UNAME_MACHINE}-stratus-vos
	exit ;;
    *:VOS:*:*)
	# From Paul.Green at stratus.com.
	echo hppa1.1-stratus-vos
	exit ;;
    mc68*:A/UX:*:*)
	echo m68k-apple-aux${UNAME_RELEASE}
	exit ;;
    news*:NEWS-OS:6*:*)
	echo mips-sony-newsos6
	exit ;;
    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
	if [ -d /usr/nec ]; then
	        echo mips-nec-sysv${UNAME_RELEASE}
	else
	        echo mips-unknown-sysv${UNAME_RELEASE}
	fi
        exit ;;
    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
	echo powerpc-be-beos
	exit ;;
    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
	echo powerpc-apple-beos
	exit ;;
    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
	echo i586-pc-beos
	exit ;;
    SX-4:SUPER-UX:*:*)
	echo sx4-nec-superux${UNAME_RELEASE}
	exit ;;
    SX-5:SUPER-UX:*:*)
	echo sx5-nec-superux${UNAME_RELEASE}
	exit ;;
    SX-6:SUPER-UX:*:*)
	echo sx6-nec-superux${UNAME_RELEASE}
	exit ;;
    SX-7:SUPER-UX:*:*)
	echo sx7-nec-superux${UNAME_RELEASE}
	exit ;;
    SX-8:SUPER-UX:*:*)
	echo sx8-nec-superux${UNAME_RELEASE}
	exit ;;
    SX-8R:SUPER-UX:*:*)
	echo sx8r-nec-superux${UNAME_RELEASE}
	exit ;;
    Power*:Rhapsody:*:*)
	echo powerpc-apple-rhapsody${UNAME_RELEASE}
	exit ;;
    *:Rhapsody:*:*)
	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
	exit ;;
    *:Darwin:*:*)
	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
	case $UNAME_PROCESSOR in
	    unknown) UNAME_PROCESSOR=powerpc ;;
	esac
	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
	exit ;;
    *:procnto*:*:* | *:QNX:[0123456789]*:*)
	UNAME_PROCESSOR=`uname -p`
	if test "$UNAME_PROCESSOR" = "x86"; then
		UNAME_PROCESSOR=i386
		UNAME_MACHINE=pc
	fi
	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
	exit ;;
    *:QNX:*:4*)
	echo i386-pc-qnx
	exit ;;
    NSE-?:NONSTOP_KERNEL:*:*)
	echo nse-tandem-nsk${UNAME_RELEASE}
	exit ;;
    NSR-?:NONSTOP_KERNEL:*:*)
	echo nsr-tandem-nsk${UNAME_RELEASE}
	exit ;;
    *:NonStop-UX:*:*)
	echo mips-compaq-nonstopux
	exit ;;
    BS2000:POSIX*:*:*)
	echo bs2000-siemens-sysv
	exit ;;
    DS/*:UNIX_System_V:*:*)
	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
	exit ;;
    *:Plan9:*:*)
	# "uname -m" is not consistent, so use $cputype instead. 386
	# is converted to i386 for consistency with other x86
	# operating systems.
	if test "$cputype" = "386"; then
	    UNAME_MACHINE=i386
	else
	    UNAME_MACHINE="$cputype"
	fi
	echo ${UNAME_MACHINE}-unknown-plan9
	exit ;;
    *:TOPS-10:*:*)
	echo pdp10-unknown-tops10
	exit ;;
    *:TENEX:*:*)
	echo pdp10-unknown-tenex
	exit ;;
    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
	echo pdp10-dec-tops20
	exit ;;
    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
	echo pdp10-xkl-tops20
	exit ;;
    *:TOPS-20:*:*)
	echo pdp10-unknown-tops20
	exit ;;
    *:ITS:*:*)
	echo pdp10-unknown-its
	exit ;;
    SEI:*:*:SEIUX)
        echo mips-sei-seiux${UNAME_RELEASE}
	exit ;;
    *:DragonFly:*:*)
	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
	exit ;;
    *:*VMS:*:*)
    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
	case "${UNAME_MACHINE}" in
	    A*) echo alpha-dec-vms ; exit ;;
	    I*) echo ia64-dec-vms ; exit ;;
	    V*) echo vax-dec-vms ; exit ;;
	esac ;;
    *:XENIX:*:SysV)
	echo i386-pc-xenix
	exit ;;
    i*86:skyos:*:*)
	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
	exit ;;
    i*86:rdos:*:*)
	echo ${UNAME_MACHINE}-pc-rdos
	exit ;;
esac

#echo '(No uname command or uname output not recognized.)' 1>&2
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2

eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
# include <sys/types.h>
# include <sys/utsname.h>
#endif
main ()
{
#if defined (sony)
#if defined (MIPSEB)
  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
     I don't know....  */
  printf ("mips-sony-bsd\n"); exit (0);
#else
#include <sys/param.h>
  printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
          "4"
#else
	  ""
#endif
         ); exit (0);
#endif
#endif

#if defined (__arm) && defined (__acorn) && defined (__unix)
  printf ("arm-acorn-riscix\n"); exit (0);
#endif

#if defined (hp300) && !defined (hpux)
  printf ("m68k-hp-bsd\n"); exit (0);
#endif

#if defined (NeXT)
#if !defined (__ARCHITECTURE__)
#define __ARCHITECTURE__ "m68k"
#endif
  int version;
  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
  if (version < 4)
    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
  else
    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
  exit (0);
#endif

#if defined (MULTIMAX) || defined (n16)
#if defined (UMAXV)
  printf ("ns32k-encore-sysv\n"); exit (0);
#else
#if defined (CMU)
  printf ("ns32k-encore-mach\n"); exit (0);
#else
  printf ("ns32k-encore-bsd\n"); exit (0);
#endif
#endif
#endif

#if defined (__386BSD__)
  printf ("i386-pc-bsd\n"); exit (0);
#endif

#if defined (sequent)
#if defined (i386)
  printf ("i386-sequent-dynix\n"); exit (0);
#endif
#if defined (ns32000)
  printf ("ns32k-sequent-dynix\n"); exit (0);
#endif
#endif

#if defined (_SEQUENT_)
    struct utsname un;

    uname(&un);

    if (strncmp(un.version, "V2", 2) == 0) {
	printf ("i386-sequent-ptx2\n"); exit (0);
    }
    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
	printf ("i386-sequent-ptx1\n"); exit (0);
    }
    printf ("i386-sequent-ptx\n"); exit (0);

#endif

#if defined (vax)
# if !defined (ultrix)
#  include <sys/param.h>
#  if defined (BSD)
#   if BSD == 43
      printf ("vax-dec-bsd4.3\n"); exit (0);
#   else
#    if BSD == 199006
      printf ("vax-dec-bsd4.3reno\n"); exit (0);
#    else
      printf ("vax-dec-bsd\n"); exit (0);
#    endif
#   endif
#  else
    printf ("vax-dec-bsd\n"); exit (0);
#  endif
# else
    printf ("vax-dec-ultrix\n"); exit (0);
# endif
#endif

#if defined (alliant) && defined (i860)
  printf ("i860-alliant-bsd\n"); exit (0);
#endif

  exit (1);
}
EOF

$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
	{ echo "$SYSTEM_NAME"; exit; }

# Apollos put the system type in the environment.

test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }

# Convex versions that predate uname can use getsysinfo(1)

if [ -x /usr/convex/getsysinfo ]
then
    case `getsysinfo -f cpu_type` in
    c1*)
	echo c1-convex-bsd
	exit ;;
    c2*)
	if getsysinfo -f scalar_acc
	then echo c32-convex-bsd
	else echo c2-convex-bsd
	fi
	exit ;;
    c34*)
	echo c34-convex-bsd
	exit ;;
    c38*)
	echo c38-convex-bsd
	exit ;;
    c4*)
	echo c4-convex-bsd
	exit ;;
    esac
fi

cat >&2 <<EOF
$0: unable to guess system type

This script, last modified $timestamp, has failed to recognize
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from

  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
and
  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub

If the version you run ($0) is already up to date, please
send the following data and any information you think might be
pertinent to <config-patches at gnu.org> in order to provide the needed
information to handle your system.

config.guess timestamp = $timestamp

uname -m = `(uname -m) 2>/dev/null || echo unknown`
uname -r = `(uname -r) 2>/dev/null || echo unknown`
uname -s = `(uname -s) 2>/dev/null || echo unknown`
uname -v = `(uname -v) 2>/dev/null || echo unknown`

/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`

hostinfo               = `(hostinfo) 2>/dev/null`
/bin/universe          = `(/bin/universe) 2>/dev/null`
/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
/bin/arch              = `(/bin/arch) 2>/dev/null`
/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`

UNAME_MACHINE = ${UNAME_MACHINE}
UNAME_RELEASE = ${UNAME_RELEASE}
UNAME_SYSTEM  = ${UNAME_SYSTEM}
UNAME_VERSION = ${UNAME_VERSION}
EOF

exit 1

# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
# End:


--- NEW FILE config.sub ---
#! /bin/sh
# Configuration validation subroutine script.
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
#   Inc.

timestamp='2007-04-29'

# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine.  It does not imply ALL GNU software can.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# 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.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.


# Please send patches to <config-patches at gnu.org>.  Submit a context
# diff and a properly formatted ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
# Otherwise, we print the canonical config type on stdout and succeed.

# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
# Each package is responsible for reporting which valid configurations
# it does not support.  The user should be able to distinguish
# a failure to support a valid configuration from a meaningless
# configuration.

# The goal of this file is to map all the various variations of a given
# machine specification into a single specification in the form:
#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
# or in some cases, the newer four-part form:
#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# It is wrong to echo any other type of specification.

me=`echo "$0" | sed -e 's,.*/,,'`

usage="\
Usage: $0 [OPTION] CPU-MFR-OPSYS
       $0 [OPTION] ALIAS

Canonicalize a configuration name.

Operation modes:
  -h, --help         print this help, then exit
  -t, --time-stamp   print date of last modification, then exit
  -v, --version      print version number, then exit

Report bugs and patches to <config-patches at gnu.org>."

version="\
GNU config.sub ($timestamp)

Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.

This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

help="
Try \`$me --help' for more information."

# Parse command line
while test $# -gt 0 ; do
  case $1 in
    --time-stamp | --time* | -t )
       echo "$timestamp" ; exit ;;
    --version | -v )
       echo "$version" ; exit ;;
    --help | --h* | -h )
       echo "$usage"; exit ;;
    -- )     # Stop option processing
       shift; break ;;
    - )	# Use stdin as input.
       break ;;
    -* )
       echo "$me: invalid option $1$help"
       exit 1 ;;

    *local*)
       # First pass through any local machine types.
       echo $1
       exit ;;

    * )
       break ;;
  esac
done

case $# in
 0) echo "$me: missing argument$help" >&2
    exit 1;;
 1) ;;
 *) echo "$me: too many arguments$help" >&2
    exit 1;;
esac

# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
  *)
    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
    if [ $basic_machine != $1 ]
    then os=`echo $1 | sed 's/.*-/-/'`
    else os=; fi
    ;;
esac

### Let's recognize common machines as not being operating systems so
### that things like config.sub decstation-3100 work.  We also
### recognize some manufacturers as not being operating systems, so we
### can provide default operating systems below.
case $os in
	-sun*os*)
		# Prevent following clause from handling this invalid input.
		;;
	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
	-apple | -axis | -knuth | -cray)
		os=
		basic_machine=$1
		;;
	-sim | -cisco | -oki | -wec | -winbond)
		os=
		basic_machine=$1
		;;
	-scout)
		;;
	-wrs)
		os=-vxworks
		basic_machine=$1
		;;
	-chorusos*)
		os=-chorusos
		basic_machine=$1
		;;
 	-chorusrdb)
 		os=-chorusrdb
		basic_machine=$1
 		;;
	-hiux*)
		os=-hiuxwe2
		;;
	-sco6)
		os=-sco5v6
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco5)
		os=-sco3.2v5
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco4)
		os=-sco3.2v4
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco3.2.[4-9]*)
		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco3.2v[4-9]*)
		# Don't forget version if it is 3.2v4 or newer.
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco5v6*)
		# Don't forget version if it is 3.2v4 or newer.
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco*)
		os=-sco3.2v2
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-udk*)
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-isc)
		os=-isc2.2
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-clix*)
		basic_machine=clipper-intergraph
		;;
	-isc*)
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-lynx*)
		os=-lynxos
		;;
	-ptx*)
		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
		;;
	-windowsnt*)
		os=`echo $os | sed -e 's/windowsnt/winnt/'`
		;;
	-psos*)
		os=-psos
		;;
	-mint | -mint[0-9]*)
		basic_machine=m68k-atari
		os=-mint
		;;
esac

# Decode aliases for certain CPU-COMPANY combinations.
case $basic_machine in
	# Recognize the basic CPU types without company name.
	# Some are omitted here because they have special meanings below.
	1750a | 580 \
	| a29k \
	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
	| am33_2.0 \
	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
	| bfin \
	| c4x | clipper \
	| d10v | d30v | dlx | dsp16xx \
	| fido | fr30 | frv \
	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
	| i370 | i860 | i960 | ia64 \
	| ip2k | iq2000 \
	| m32c | m32r | m32rle | m68000 | m68k | m88k \
	| maxq | mb | microblaze | mcore | mep \
	| mips | mipsbe | mipseb | mipsel | mipsle \
	| mips16 \
	| mips64 | mips64el \
	| mips64vr | mips64vrel \
	| mips64orion | mips64orionel \
	| mips64vr4100 | mips64vr4100el \
	| mips64vr4300 | mips64vr4300el \
	| mips64vr5000 | mips64vr5000el \
	| mips64vr5900 | mips64vr5900el \
	| mipsisa32 | mipsisa32el \
	| mipsisa32r2 | mipsisa32r2el \
	| mipsisa64 | mipsisa64el \
	| mipsisa64r2 | mipsisa64r2el \
	| mipsisa64sb1 | mipsisa64sb1el \
	| mipsisa64sr71k | mipsisa64sr71kel \
	| mipstx39 | mipstx39el \
	| mn10200 | mn10300 \
	| mt \
	| msp430 \
	| nios | nios2 \
	| ns16k | ns32k \
	| or32 \
	| pdp10 | pdp11 | pj | pjl \
	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
	| pyramid \
	| score \
	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
	| sh64 | sh64le \
	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
	| spu | strongarm \
	| tahoe | thumb | tic4x | tic80 | tron \
	| v850 | v850e \
	| we32k \
	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
	| z8k)
		basic_machine=$basic_machine-unknown
		;;
	m6811 | m68hc11 | m6812 | m68hc12)
		# Motorola 68HC11/12.
		basic_machine=$basic_machine-unknown
		os=-none
		;;
	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
		;;
	ms1)
		basic_machine=mt-unknown
		;;

	# We use `pc' rather than `unknown'
	# because (1) that's what they normally are, and
	# (2) the word "unknown" tends to confuse beginning users.
	i*86 | x86_64)
	  basic_machine=$basic_machine-pc
	  ;;
	# Object if more than one company name word.
	*-*-*)
		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
		exit 1
		;;
	# Recognize the basic CPU types with company name.
	580-* \
	| a29k-* \
	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
	| avr-* | avr32-* \
	| bfin-* | bs2000-* \
	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
	| clipper-* | craynv-* | cydra-* \
	| d10v-* | d30v-* | dlx-* \
	| elxsi-* \
	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
	| h8300-* | h8500-* \
	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
	| i*86-* | i860-* | i960-* | ia64-* \
	| ip2k-* | iq2000-* \
	| m32c-* | m32r-* | m32rle-* \
	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
	| m88110-* | m88k-* | maxq-* | mcore-* \
	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
	| mips16-* \
	| mips64-* | mips64el-* \
	| mips64vr-* | mips64vrel-* \
	| mips64orion-* | mips64orionel-* \
	| mips64vr4100-* | mips64vr4100el-* \
	| mips64vr4300-* | mips64vr4300el-* \
	| mips64vr5000-* | mips64vr5000el-* \
	| mips64vr5900-* | mips64vr5900el-* \
	| mipsisa32-* | mipsisa32el-* \
	| mipsisa32r2-* | mipsisa32r2el-* \
	| mipsisa64-* | mipsisa64el-* \
	| mipsisa64r2-* | mipsisa64r2el-* \
	| mipsisa64sb1-* | mipsisa64sb1el-* \
	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
	| mipstx39-* | mipstx39el-* \
	| mmix-* \
	| mt-* \
	| msp430-* \
	| nios-* | nios2-* \
	| none-* | np1-* | ns16k-* | ns32k-* \
	| orion-* \
	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
	| pyramid-* \
	| romp-* | rs6000-* \
	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
	| sparclite-* \
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
	| tahoe-* | thumb-* \
	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
	| tron-* \
	| v850-* | v850e-* | vax-* \
	| we32k-* \
	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
	| xstormy16-* | xtensa-* \
	| ymp-* \
	| z8k-*)
		;;
	# Recognize the various machine names and aliases which stand
	# for a CPU type and a company and sometimes even an OS.
	386bsd)
		basic_machine=i386-unknown
		os=-bsd
		;;
	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
		basic_machine=m68000-att
		;;
	3b*)
		basic_machine=we32k-att
		;;
	a29khif)
		basic_machine=a29k-amd
		os=-udi
		;;
    	abacus)
		basic_machine=abacus-unknown
		;;
	adobe68k)
		basic_machine=m68010-adobe
		os=-scout
		;;
	alliant | fx80)
		basic_machine=fx80-alliant
		;;
	altos | altos3068)
		basic_machine=m68k-altos
		;;
	am29k)
		basic_machine=a29k-none
		os=-bsd
		;;
	amd64)
		basic_machine=x86_64-pc
		;;
	amd64-*)
		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	amdahl)
		basic_machine=580-amdahl
		os=-sysv
		;;
	amiga | amiga-*)
		basic_machine=m68k-unknown
		;;
	amigaos | amigados)
		basic_machine=m68k-unknown
		os=-amigaos
		;;
	amigaunix | amix)
		basic_machine=m68k-unknown
		os=-sysv4
		;;
	apollo68)
		basic_machine=m68k-apollo
		os=-sysv
		;;
	apollo68bsd)
		basic_machine=m68k-apollo
		os=-bsd
		;;
	aux)
		basic_machine=m68k-apple
		os=-aux
		;;
	balance)
		basic_machine=ns32k-sequent
		os=-dynix
		;;
	c90)
		basic_machine=c90-cray
		os=-unicos
		;;
	convex-c1)
		basic_machine=c1-convex
		os=-bsd
		;;
	convex-c2)
		basic_machine=c2-convex
		os=-bsd
		;;
	convex-c32)
		basic_machine=c32-convex
		os=-bsd
		;;
	convex-c34)
		basic_machine=c34-convex
		os=-bsd
		;;
	convex-c38)
		basic_machine=c38-convex
		os=-bsd
		;;
	cray | j90)
		basic_machine=j90-cray
		os=-unicos
		;;
	craynv)
		basic_machine=craynv-cray
		os=-unicosmp
		;;
	cr16c)
		basic_machine=cr16c-unknown
		os=-elf
		;;
	crds | unos)
		basic_machine=m68k-crds
		;;
	crisv32 | crisv32-* | etraxfs*)
		basic_machine=crisv32-axis
		;;
	cris | cris-* | etrax*)
		basic_machine=cris-axis
		;;
	crx)
		basic_machine=crx-unknown
		os=-elf
		;;
	da30 | da30-*)
		basic_machine=m68k-da30
		;;
	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
		basic_machine=mips-dec
		;;
	decsystem10* | dec10*)
		basic_machine=pdp10-dec
		os=-tops10
		;;
	decsystem20* | dec20*)
		basic_machine=pdp10-dec
		os=-tops20
		;;
	delta | 3300 | motorola-3300 | motorola-delta \
	      | 3300-motorola | delta-motorola)
		basic_machine=m68k-motorola
		;;
	delta88)
		basic_machine=m88k-motorola
		os=-sysv3
		;;
	djgpp)
		basic_machine=i586-pc
		os=-msdosdjgpp
		;;
	dpx20 | dpx20-*)
		basic_machine=rs6000-bull
		os=-bosx
		;;
	dpx2* | dpx2*-bull)
		basic_machine=m68k-bull
		os=-sysv3
		;;
	ebmon29k)
		basic_machine=a29k-amd
		os=-ebmon
		;;
	elxsi)
		basic_machine=elxsi-elxsi
		os=-bsd
		;;
	encore | umax | mmax)
		basic_machine=ns32k-encore
		;;
	es1800 | OSE68k | ose68k | ose | OSE)
		basic_machine=m68k-ericsson
		os=-ose
		;;
	fx2800)
		basic_machine=i860-alliant
		;;
	genix)
		basic_machine=ns32k-ns
		;;
	gmicro)
		basic_machine=tron-gmicro
		os=-sysv
		;;
	go32)
		basic_machine=i386-pc
		os=-go32
		;;
	h3050r* | hiux*)
		basic_machine=hppa1.1-hitachi
		os=-hiuxwe2
		;;
	h8300hms)
		basic_machine=h8300-hitachi
		os=-hms
		;;
	h8300xray)
		basic_machine=h8300-hitachi
		os=-xray
		;;
	h8500hms)
		basic_machine=h8500-hitachi
		os=-hms
		;;
	harris)
		basic_machine=m88k-harris
		os=-sysv3
		;;
	hp300-*)
		basic_machine=m68k-hp
		;;
	hp300bsd)
		basic_machine=m68k-hp
		os=-bsd
		;;
	hp300hpux)
		basic_machine=m68k-hp
		os=-hpux
		;;
	hp3k9[0-9][0-9] | hp9[0-9][0-9])
		basic_machine=hppa1.0-hp
		;;
	hp9k2[0-9][0-9] | hp9k31[0-9])
		basic_machine=m68000-hp
		;;
	hp9k3[2-9][0-9])
		basic_machine=m68k-hp
		;;
	hp9k6[0-9][0-9] | hp6[0-9][0-9])
		basic_machine=hppa1.0-hp
		;;
	hp9k7[0-79][0-9] | hp7[0-79][0-9])
		basic_machine=hppa1.1-hp
		;;
	hp9k78[0-9] | hp78[0-9])
		# FIXME: really hppa2.0-hp
		basic_machine=hppa1.1-hp
		;;
	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
		# FIXME: really hppa2.0-hp
		basic_machine=hppa1.1-hp
		;;
	hp9k8[0-9][13679] | hp8[0-9][13679])
		basic_machine=hppa1.1-hp
		;;
	hp9k8[0-9][0-9] | hp8[0-9][0-9])
		basic_machine=hppa1.0-hp
		;;
	hppa-next)
		os=-nextstep3
		;;
	hppaosf)
		basic_machine=hppa1.1-hp
		os=-osf
		;;
	hppro)
		basic_machine=hppa1.1-hp
		os=-proelf
		;;
	i370-ibm* | ibm*)
		basic_machine=i370-ibm
		;;
# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
	i*86v32)
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-sysv32
		;;
	i*86v4*)
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-sysv4
		;;
	i*86v)
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-sysv
		;;
	i*86sol2)
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-solaris2
		;;
	i386mach)
		basic_machine=i386-mach
		os=-mach
		;;
	i386-vsta | vsta)
		basic_machine=i386-unknown
		os=-vsta
		;;
	iris | iris4d)
		basic_machine=mips-sgi
		case $os in
		    -irix*)
			;;
		    *)
			os=-irix4
			;;
		esac
		;;
	isi68 | isi)
		basic_machine=m68k-isi
		os=-sysv
		;;
	m88k-omron*)
		basic_machine=m88k-omron
		;;
	magnum | m3230)
		basic_machine=mips-mips
		os=-sysv
		;;
	merlin)
		basic_machine=ns32k-utek
		os=-sysv
		;;
	mingw32)
		basic_machine=i386-pc
		os=-mingw32
		;;
	mingw32ce)
		basic_machine=arm-unknown
		os=-mingw32ce
		;;
	miniframe)
		basic_machine=m68000-convergent
		;;
	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
		basic_machine=m68k-atari
		os=-mint
		;;
	mips3*-*)
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
		;;
	mips3*)
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
		;;
	monitor)
		basic_machine=m68k-rom68k
		os=-coff
		;;
	morphos)
		basic_machine=powerpc-unknown
		os=-morphos
		;;
	msdos)
		basic_machine=i386-pc
		os=-msdos
		;;
	ms1-*)
		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
		;;
	mvs)
		basic_machine=i370-ibm
		os=-mvs
		;;
	ncr3000)
		basic_machine=i486-ncr
		os=-sysv4
		;;
	netbsd386)
		basic_machine=i386-unknown
		os=-netbsd
		;;
	netwinder)
		basic_machine=armv4l-rebel
		os=-linux
		;;
	news | news700 | news800 | news900)
		basic_machine=m68k-sony
		os=-newsos
		;;
	news1000)
		basic_machine=m68030-sony
		os=-newsos
		;;
	news-3600 | risc-news)
		basic_machine=mips-sony
		os=-newsos
		;;
	necv70)
		basic_machine=v70-nec
		os=-sysv
		;;
	next | m*-next )
		basic_machine=m68k-next
		case $os in
		    -nextstep* )
			;;
		    -ns2*)
		      os=-nextstep2
			;;
		    *)
		      os=-nextstep3
			;;
		esac
		;;
	nh3000)
		basic_machine=m68k-harris
		os=-cxux
		;;
	nh[45]000)
		basic_machine=m88k-harris
		os=-cxux
		;;
	nindy960)
		basic_machine=i960-intel
		os=-nindy
		;;
	mon960)
		basic_machine=i960-intel
		os=-mon960
		;;
	nonstopux)
		basic_machine=mips-compaq
		os=-nonstopux
		;;
	np1)
		basic_machine=np1-gould
		;;
	nsr-tandem)
		basic_machine=nsr-tandem
		;;
	op50n-* | op60c-*)
		basic_machine=hppa1.1-oki
		os=-proelf
		;;
	openrisc | openrisc-*)
		basic_machine=or32-unknown
		;;
	os400)
		basic_machine=powerpc-ibm
		os=-os400
		;;
	OSE68000 | ose68000)
		basic_machine=m68000-ericsson
		os=-ose
		;;
	os68k)
		basic_machine=m68k-none
		os=-os68k
		;;
	pa-hitachi)
		basic_machine=hppa1.1-hitachi
		os=-hiuxwe2
		;;
	paragon)
		basic_machine=i860-intel
		os=-osf
		;;
	pbd)
		basic_machine=sparc-tti
		;;
	pbb)
		basic_machine=m68k-tti
		;;
	pc532 | pc532-*)
		basic_machine=ns32k-pc532
		;;
	pc98)
		basic_machine=i386-pc
		;;
	pc98-*)
		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pentium | p5 | k5 | k6 | nexgen | viac3)
		basic_machine=i586-pc
		;;
	pentiumpro | p6 | 6x86 | athlon | athlon_*)
		basic_machine=i686-pc
		;;
	pentiumii | pentium2 | pentiumiii | pentium3)
		basic_machine=i686-pc
		;;
	pentium4)
		basic_machine=i786-pc
		;;
	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pentiumpro-* | p6-* | 6x86-* | athlon-*)
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pentium4-*)
		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pn)
		basic_machine=pn-gould
		;;
	power)	basic_machine=power-ibm
		;;
	ppc)	basic_machine=powerpc-unknown
		;;
	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	ppcle | powerpclittle | ppc-le | powerpc-little)
		basic_machine=powerpcle-unknown
		;;
	ppcle-* | powerpclittle-*)
		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	ppc64)	basic_machine=powerpc64-unknown
		;;
	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
		basic_machine=powerpc64le-unknown
		;;
	ppc64le-* | powerpc64little-*)
		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	ps2)
		basic_machine=i386-ibm
		;;
	pw32)
		basic_machine=i586-unknown
		os=-pw32
		;;
	rdos)
		basic_machine=i386-pc
		os=-rdos
		;;
	rom68k)
		basic_machine=m68k-rom68k
		os=-coff
		;;
	rm[46]00)
		basic_machine=mips-siemens
		;;
	rtpc | rtpc-*)
		basic_machine=romp-ibm
		;;
	s390 | s390-*)
		basic_machine=s390-ibm
		;;
	s390x | s390x-*)
		basic_machine=s390x-ibm
		;;
	sa29200)
		basic_machine=a29k-amd
		os=-udi
		;;
	sb1)
		basic_machine=mipsisa64sb1-unknown
		;;
	sb1el)
		basic_machine=mipsisa64sb1el-unknown
		;;
	sde)
		basic_machine=mipsisa32-sde
		os=-elf
		;;
	sei)
		basic_machine=mips-sei
		os=-seiux
		;;
	sequent)
		basic_machine=i386-sequent
		;;
	sh)
		basic_machine=sh-hitachi
		os=-hms
		;;
	sh5el)
		basic_machine=sh5le-unknown
		;;
	sh64)
		basic_machine=sh64-unknown
		;;
	sparclite-wrs | simso-wrs)
		basic_machine=sparclite-wrs
		os=-vxworks
		;;
	sps7)
		basic_machine=m68k-bull
		os=-sysv2
		;;
	spur)
		basic_machine=spur-unknown
		;;
	st2000)
		basic_machine=m68k-tandem
		;;
	stratus)
		basic_machine=i860-stratus
		os=-sysv4
		;;
	sun2)
		basic_machine=m68000-sun
		;;
	sun2os3)
		basic_machine=m68000-sun
		os=-sunos3
		;;
	sun2os4)
		basic_machine=m68000-sun
		os=-sunos4
		;;
	sun3os3)
		basic_machine=m68k-sun
		os=-sunos3
		;;
	sun3os4)
		basic_machine=m68k-sun
		os=-sunos4
		;;
	sun4os3)
		basic_machine=sparc-sun
		os=-sunos3
		;;
	sun4os4)
		basic_machine=sparc-sun
		os=-sunos4
		;;
	sun4sol2)
		basic_machine=sparc-sun
		os=-solaris2
		;;
	sun3 | sun3-*)
		basic_machine=m68k-sun
		;;
	sun4)
		basic_machine=sparc-sun
		;;
	sun386 | sun386i | roadrunner)
		basic_machine=i386-sun
		;;
	sv1)
		basic_machine=sv1-cray
		os=-unicos
		;;
	symmetry)
		basic_machine=i386-sequent
		os=-dynix
		;;
	t3e)
		basic_machine=alphaev5-cray
		os=-unicos
		;;
	t90)
		basic_machine=t90-cray
		os=-unicos
		;;
	tic54x | c54x*)
		basic_machine=tic54x-unknown
		os=-coff
		;;
	tic55x | c55x*)
		basic_machine=tic55x-unknown
		os=-coff
		;;
	tic6x | c6x*)
		basic_machine=tic6x-unknown
		os=-coff
		;;
	tx39)
		basic_machine=mipstx39-unknown
		;;
	tx39el)
		basic_machine=mipstx39el-unknown
		;;
	toad1)
		basic_machine=pdp10-xkl
		os=-tops20
		;;
	tower | tower-32)
		basic_machine=m68k-ncr
		;;
	tpf)
		basic_machine=s390x-ibm
		os=-tpf
		;;
	udi29k)
		basic_machine=a29k-amd
		os=-udi
		;;
	ultra3)
		basic_machine=a29k-nyu
		os=-sym1
		;;
	v810 | necv810)
		basic_machine=v810-nec
		os=-none
		;;
	vaxv)
		basic_machine=vax-dec
		os=-sysv
		;;
	vms)
		basic_machine=vax-dec
		os=-vms
		;;
	vpp*|vx|vx-*)
		basic_machine=f301-fujitsu
		;;
	vxworks960)
		basic_machine=i960-wrs
		os=-vxworks
		;;
	vxworks68)
		basic_machine=m68k-wrs
		os=-vxworks
		;;
	vxworks29k)
		basic_machine=a29k-wrs
		os=-vxworks
		;;
	w65*)
		basic_machine=w65-wdc
		os=-none
		;;
	w89k-*)
		basic_machine=hppa1.1-winbond
		os=-proelf
		;;
	xbox)
		basic_machine=i686-pc
		os=-mingw32
		;;
	xps | xps100)
		basic_machine=xps100-honeywell
		;;
	ymp)
		basic_machine=ymp-cray
		os=-unicos
		;;
	z8k-*-coff)
		basic_machine=z8k-unknown
		os=-sim
		;;
	none)
		basic_machine=none-none
		os=-none
		;;

# Here we handle the default manufacturer of certain CPU types.  It is in
# some cases the only manufacturer, in others, it is the most popular.
	w89k)
		basic_machine=hppa1.1-winbond
		;;
	op50n)
		basic_machine=hppa1.1-oki
		;;
	op60c)
		basic_machine=hppa1.1-oki
		;;
	romp)
		basic_machine=romp-ibm
		;;
	mmix)
		basic_machine=mmix-knuth
		;;
	rs6000)
		basic_machine=rs6000-ibm
		;;
	vax)
		basic_machine=vax-dec
		;;
	pdp10)
		# there are many clones, so DEC is not a safe bet
		basic_machine=pdp10-unknown
		;;
	pdp11)
		basic_machine=pdp11-dec
		;;
	we32k)
		basic_machine=we32k-att
		;;
	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
		basic_machine=sh-unknown
		;;
	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
		basic_machine=sparc-sun
		;;
	cydra)
		basic_machine=cydra-cydrome
		;;
	orion)
		basic_machine=orion-highlevel
		;;
	orion105)
		basic_machine=clipper-highlevel
		;;
	mac | mpw | mac-mpw)
		basic_machine=m68k-apple
		;;
	pmac | pmac-mpw)
		basic_machine=powerpc-apple
		;;
	*-unknown)
		# Make sure to match an already-canonicalized machine name.
		;;
	*)
		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
		exit 1
		;;
esac

# Here we canonicalize certain aliases for manufacturers.
case $basic_machine in
	*-digital*)
		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
		;;
	*-commodore*)
		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
		;;
	*)
		;;
esac

# Decode manufacturer-specific aliases for certain operating systems.

if [ x"$os" != x"" ]
then
case $os in
        # First match some system type aliases
        # that might get confused with valid system types.
	# -solaris* is a basic system type, with this one exception.
	-solaris1 | -solaris1.*)
		os=`echo $os | sed -e 's|solaris1|sunos4|'`
		;;
	-solaris)
		os=-solaris2
		;;
	-svr4*)
		os=-sysv4
		;;
	-unixware*)
		os=-sysv4.2uw
		;;
	-gnu/linux*)
		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
		;;
	# First accept the basic system types.
	# The portable systems comes first.
	# Each alternative MUST END IN A *, to match a version number.
	# -sysv* is not here because it comes later, after sysvr4.
	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
	      | -aos* \
	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
	      | -openbsd* | -solidbsd* \
	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
	      | -chorusos* | -chorusrdb* \
	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
	      | -uxpv* | -beos* | -mpeix* | -udk* \
	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
	# Remember, each alternative MUST END IN *, to match a version number.
		;;
	-qnx*)
		case $basic_machine in
		    x86-* | i*86-*)
			;;
		    *)
			os=-nto$os
			;;
		esac
		;;
	-nto-qnx*)
		;;
	-nto*)
		os=`echo $os | sed -e 's|nto|nto-qnx|'`
		;;
	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
		;;
	-mac*)
		os=`echo $os | sed -e 's|mac|macos|'`
		;;
	-linux-dietlibc)
		os=-linux-dietlibc
		;;
	-linux*)
		os=`echo $os | sed -e 's|linux|linux-gnu|'`
		;;
	-sunos5*)
		os=`echo $os | sed -e 's|sunos5|solaris2|'`
		;;
	-sunos6*)
		os=`echo $os | sed -e 's|sunos6|solaris3|'`
		;;
	-opened*)
		os=-openedition
		;;
        -os400*)
		os=-os400
		;;
	-wince*)
		os=-wince
		;;
	-osfrose*)
		os=-osfrose
		;;
	-osf*)
		os=-osf
		;;
	-utek*)
		os=-bsd
		;;
	-dynix*)
		os=-bsd
		;;
	-acis*)
		os=-aos
		;;
	-atheos*)
		os=-atheos
		;;
	-syllable*)
		os=-syllable
		;;
	-386bsd)
		os=-bsd
		;;
	-ctix* | -uts*)
		os=-sysv
		;;
	-nova*)
		os=-rtmk-nova
		;;
	-ns2 )
		os=-nextstep2
		;;
	-nsk*)
		os=-nsk
		;;
	# Preserve the version number of sinix5.
	-sinix5.*)
		os=`echo $os | sed -e 's|sinix|sysv|'`
		;;
	-sinix*)
		os=-sysv4
		;;
        -tpf*)
		os=-tpf
		;;
	-triton*)
		os=-sysv3
		;;
	-oss*)
		os=-sysv3
		;;
	-svr4)
		os=-sysv4
		;;
	-svr3)
		os=-sysv3
		;;
	-sysvr4)
		os=-sysv4
		;;
	# This must come after -sysvr4.
	-sysv*)
		;;
	-ose*)
		os=-ose
		;;
	-es1800*)
		os=-ose
		;;
	-xenix)
		os=-xenix
		;;
	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
		os=-mint
		;;
	-aros*)
		os=-aros
		;;
	-kaos*)
		os=-kaos
		;;
	-zvmoe)
		os=-zvmoe
		;;
	-none)
		;;
	*)
		# Get rid of the `-' at the beginning of $os.
		os=`echo $os | sed 's/[^-]*-//'`
		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
		exit 1
		;;
esac
else

# Here we handle the default operating systems that come with various machines.
# The value should be what the vendor currently ships out the door with their
# machine or put another way, the most popular os provided with the machine.

# Note that if you're going to try to match "-MANUFACTURER" here (say,
# "-sun"), then you have to tell the case statement up towards the top
# that MANUFACTURER isn't an operating system.  Otherwise, code above
# will signal an error saying that MANUFACTURER isn't an operating
# system, and we'll never get to this point.

case $basic_machine in
        score-*)
		os=-elf
		;;
        spu-*)
		os=-elf
		;;
	*-acorn)
		os=-riscix1.2
		;;
	arm*-rebel)
		os=-linux
		;;
	arm*-semi)
		os=-aout
		;;
        c4x-* | tic4x-*)
        	os=-coff
		;;
	# This must come before the *-dec entry.
	pdp10-*)
		os=-tops20
		;;
	pdp11-*)
		os=-none
		;;
	*-dec | vax-*)
		os=-ultrix4.2
		;;
	m68*-apollo)
		os=-domain
		;;
	i386-sun)
		os=-sunos4.0.2
		;;
	m68000-sun)
		os=-sunos3
		# This also exists in the configure program, but was not the
		# default.
		# os=-sunos4
		;;
	m68*-cisco)
		os=-aout
		;;
        mep-*)
		os=-elf
		;;
	mips*-cisco)
		os=-elf
		;;
	mips*-*)
		os=-elf
		;;
	or32-*)
		os=-coff
		;;
	*-tti)	# must be before sparc entry or we get the wrong os.
		os=-sysv3
		;;
	sparc-* | *-sun)
		os=-sunos4.1.1
		;;
	*-be)
		os=-beos
		;;
	*-haiku)
		os=-haiku
		;;
	*-ibm)
		os=-aix
		;;
    	*-knuth)
		os=-mmixware
		;;
	*-wec)
		os=-proelf
		;;
	*-winbond)
		os=-proelf
		;;
	*-oki)
		os=-proelf
		;;
	*-hp)
		os=-hpux
		;;
	*-hitachi)
		os=-hiux
		;;
	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
		os=-sysv
		;;
	*-cbm)
		os=-amigaos
		;;
	*-dg)
		os=-dgux
		;;
	*-dolphin)
		os=-sysv3
		;;
	m68k-ccur)
		os=-rtu
		;;
	m88k-omron*)
		os=-luna
		;;
	*-next )
		os=-nextstep
		;;
	*-sequent)
		os=-ptx
		;;
	*-crds)
		os=-unos
		;;
	*-ns)
		os=-genix
		;;
	i370-*)
		os=-mvs
		;;
	*-next)
		os=-nextstep3
		;;
	*-gould)
		os=-sysv
		;;
	*-highlevel)
		os=-bsd
		;;
	*-encore)
		os=-bsd
		;;
	*-sgi)
		os=-irix
		;;
	*-siemens)
		os=-sysv4
		;;
	*-masscomp)
		os=-rtu
		;;
	f30[01]-fujitsu | f700-fujitsu)
		os=-uxpv
		;;
	*-rom68k)
		os=-coff
		;;
	*-*bug)
		os=-coff
		;;
	*-apple)
		os=-macos
		;;
	*-atari*)
		os=-mint
		;;
	*)
		os=-none
		;;
esac
fi

# Here we handle the case where we know the os, and the CPU type, but not the
# manufacturer.  We pick the logical manufacturer.
vendor=unknown
case $basic_machine in
	*-unknown)
		case $os in
			-riscix*)
				vendor=acorn
				;;
			-sunos*)
				vendor=sun
				;;
			-aix*)
				vendor=ibm
				;;
			-beos*)
				vendor=be
				;;
			-hpux*)
				vendor=hp
				;;
			-mpeix*)
				vendor=hp
				;;
			-hiux*)
				vendor=hitachi
				;;
			-unos*)
				vendor=crds
				;;
			-dgux*)
				vendor=dg
				;;
			-luna*)
				vendor=omron
				;;
			-genix*)
				vendor=ns
				;;
			-mvs* | -opened*)
				vendor=ibm
				;;
			-os400*)
				vendor=ibm
				;;
			-ptx*)
				vendor=sequent
				;;
			-tpf*)
				vendor=ibm
				;;
			-vxsim* | -vxworks* | -windiss*)
				vendor=wrs
				;;
			-aux*)
				vendor=apple
				;;
			-hms*)
				vendor=hitachi
				;;
			-mpw* | -macos*)
				vendor=apple
				;;
			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
				vendor=atari
				;;
			-vos*)
				vendor=stratus
				;;
		esac
		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
		;;
esac

echo $basic_machine$os
exit

# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
# End:


--- NEW FILE import.log ---
stk-4_3_1-6_fc9:HEAD:stk-4.3.1-6.fc9.src.rpm:1221818741

stk-4.3.1-cflags-lib.patch:

--- NEW FILE stk-4.3.1-cflags-lib.patch ---
diff -up stk-4.3.1/src/Makefile.in.orig stk-4.3.1/src/Makefile.in
--- stk-4.3.1/src/Makefile.in.orig	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/src/Makefile.in	2008-07-03 23:31:43.000000000 +0200
@@ -38,7 +38,7 @@ endif
 CC       = @CXX@
 DEFS     = @byte_order@
 DEFS    += @debug@
-CFLAGS   = @cflags@
+CFLAGS   = @CFLAGS@
 CFLAGS  += @warn@ $(INCLUDE) -Iinclude
 
 REALTIME = @realtime@
diff -up stk-4.3.1/projects/demo/Makefile.in.orig stk-4.3.1/projects/demo/Makefile.in
--- stk-4.3.1/projects/demo/Makefile.in.orig	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/demo/Makefile.in	2008-07-04 02:02:32.000000000 +0200
@@ -33,7 +33,7 @@ vpath %.h $(INCLUDE)
 CC       = @CXX@
 DEFS     = @byte_order@
 DEFS    += @debug@
-CFLAGS   = @cflags@
+CFLAGS   = @CFLAGS@
 CFLAGS  += @warn@ -I$(INCLUDE) -I../../src/include
 LIBRARY = @LIBS@
 LIBRARY += @frameworks@
--- stk-4.3.1/projects/effects/Makefile.in.orig	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/effects/Makefile.in	2008-07-04 03:08:29.000000000 +0200
@@ -22,7 +22,7 @@ vpath %.h $(INCLUDE)
 CC       = @CXX@
 DEFS     = @byte_order@
 DEFS    += @debug@
-CFLAGS   = @cflags@
+CFLAGS   = @CFLAGS@
 CFLAGS  += @warn@ -I$(INCLUDE) -I../../src/include
 LIBRARY = @LIBS@
 LIBRARY += @frameworks@
--- stk-4.3.1/projects/ragamatic/Makefile.in.orig	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/ragamatic/Makefile.in	2008-07-04 03:10:23.000000000 +0200
@@ -23,7 +23,7 @@ vpath %.h $(INCLUDE)
 CC       = @CXX@
 DEFS     = @byte_order@
 DEFS    += @debug@
-CFLAGS   = @cflags@
+CFLAGS   = @CFLAGS@
 CFLAGS  += @warn@ -I$(INCLUDE) -I../../src/include
 LIBRARY = @LIBS@
 LIBRARY += @frameworks@
diff -up stk-4.3.1/projects/examples/libMakefile.in.orig stk-4.3.1/projects/examples/libMakefile.in
--- stk-4.3.1/projects/examples/libMakefile.in.orig	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/examples/libMakefile.in	2008-08-07 21:16:46.000000000 +0200
@@ -12,7 +12,7 @@ vpath %.h $(INCLUDE)
 CC       = @CXX@
 DEFS     = @byte_order@
 DEFS    += @debug@
-CFLAGS   = @cflags@
+CFLAGS   = @CFLAGS@
 CFLAGS  += @warn@ -I$(INCLUDE) -I../../src/include
 LIBRARY = @LIBS@
 LIBRARY += @frameworks@

stk-4.3.1-header.patch:

--- NEW FILE stk-4.3.1-header.patch ---
--- stk-4.3.1.orig/projects/effects/effects.cpp	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/effects/effects.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -15,6 +15,7 @@
 #include <signal.h>
 #include <iostream>
 #include <algorithm>
+#include <cstring>
 using std::min;
 
 void usage(void) {
--- stk-4.3.1.orig/projects/examples/duplex.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/duplex.cpp	2008-06-16 23:56:00.000000000 +0200
@@ -10,6 +10,8 @@
 
 #include "RtAudio.h"
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
 
 /*
 typedef signed long  MY_TYPE;
--- stk-4.3.1.orig/projects/examples/foursine.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/foursine.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -2,6 +2,7 @@
 
 #include "SineWave.h"
 #include "FileWvOut.h"
+#include <cstdlib>
 
 int main()
 {
--- stk-4.3.1.orig/projects/examples/grains.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/grains.cpp	2008-06-16 23:57:46.000000000 +0200
@@ -4,6 +4,7 @@
 
 #include "Granulate.h"
 #include "RtAudio.h"
+#include <cstdlib>
 
 // This tick() function handles sample computation only.  It will be
 // called automatically when the system needs a new buffer of audio
--- stk-4.3.1.orig/projects/examples/inetIn.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/inetIn.cpp	2008-06-16 23:56:18.000000000 +0200
@@ -30,6 +30,7 @@
 
 #include "InetWvIn.h"
 #include "RtWvOut.h"
+#include <cstdlib>
 
 void usage(void) {
   // Error function in case of incorrect command-line
--- stk-4.3.1.orig/projects/examples/inetOut.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/inetOut.cpp	2008-06-16 23:56:33.000000000 +0200
@@ -19,6 +19,7 @@
 
 #include "FileWvIn.h"
 #include "InetWvOut.h"
+#include <cstdlib>
 
 void usage(void) {
   // Error function in case of incorrect command-line
--- stk-4.3.1.orig/projects/examples/midiprobe.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/midiprobe.cpp	2008-06-16 23:55:29.000000000 +0200
@@ -6,6 +6,7 @@
 
 #include <iostream>
 #include "RtMidi.h"
+#include <cstdlib>
 
 int main()
 {
--- stk-4.3.1.orig/projects/examples/play.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/play.cpp	2008-06-16 23:54:54.000000000 +0200
@@ -18,6 +18,7 @@
 
 #include <signal.h>
 #include <iostream>
+#include <cstdlib>
 
 // Eewww ... global variables! :-)
 bool done;
--- stk-4.3.1.orig/projects/examples/playsmf.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/playsmf.cpp	2008-06-16 23:57:25.000000000 +0200
@@ -7,7 +7,8 @@
 
 #include "MidiFileIn.h"
 #include "RtMidi.h"
-#include <signal.h>
+#include <csignal>
+#include <cstdlib>
 
 bool done = false;
 static void finish(int ignore){ done = true; }
--- stk-4.3.1.orig/projects/examples/record.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/record.cpp	2008-06-16 23:55:10.000000000 +0200
@@ -24,6 +24,7 @@
 
 #include "RtWvIn.h"
 #include "FileWvOut.h"
+#include <cstdlib>
 
 void usage( void ) {
   // Error function in case of incorrect command-line
--- stk-4.3.1.orig/projects/examples/rtsine.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/rtsine.cpp	2008-06-16 23:53:54.000000000 +0200
@@ -2,6 +2,7 @@
 
 #include "SineWave.h"
 #include "RtWvOut.h"
+#include <cstdlib>
 
 int main()
 {
--- stk-4.3.1.orig/projects/examples/sine.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/sine.cpp	2008-06-16 23:54:20.000000000 +0200
@@ -14,6 +14,7 @@
 
 #include "SineWave.h"
 #include "FileWvOut.h"
+#include <cstdlib>
 
 void usage(void) {
   // Error function in case of incorrect command-line
--- stk-4.3.1.orig/projects/examples/sineosc.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/sineosc.cpp	2008-06-16 23:54:38.000000000 +0200
@@ -2,6 +2,7 @@
 
 #include "WaveLoop.h"
 #include "FileWvOut.h"
+#include <cstdlib>
 
 int main()
 {
--- stk-4.3.1.orig/projects/ragamatic/ragamat.cpp	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/ragamatic/ragamat.cpp	2008-06-16 23:59:13.000000000 +0200
@@ -10,9 +10,11 @@
 #include "Messager.h"
 #include "RtAudio.h"
 
-#include <signal.h>
+#include <csignal>
 #include <iostream>
 #include <algorithm>
+#include <cstdlib>
+#include <cstring>
 using std::min;
 
 StkFloat float_random(StkFloat max) // Return random float between 0.0 and max
--- stk-4.3.1.orig/src/FileRead.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/FileRead.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -33,6 +33,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <cmath>
+#include <cstring>
 
 FileRead :: FileRead()
   : fd_(0)
--- stk-4.3.1.orig/src/FileWrite.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/FileWrite.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -23,6 +23,7 @@
 
 #include "FileWrite.h"
 #include <cmath>
+#include <cstring>
 
 const FileWrite::FILE_TYPE FileWrite :: FILE_RAW = 1;
 const FileWrite::FILE_TYPE FileWrite :: FILE_WAV = 2;
--- stk-4.3.1.orig/src/Messager.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/Messager.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -34,6 +34,7 @@
 
 #include "Messager.h"
 #include <iostream>
+#include <algorithm>
 #include "SKINI.msg"
 
 static const int STK_FILE   = 0x1;
--- stk-4.3.1.orig/src/MidiFileIn.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/MidiFileIn.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -17,6 +17,7 @@
 
 #include "MidiFileIn.h"
 #include <iostream>
+#include <cstring>
 
 MidiFileIn :: MidiFileIn( std::string fileName )
 {
--- stk-4.3.1.orig/src/Modal.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/Modal.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -12,6 +12,7 @@
 /***************************************************/
 
 #include "Modal.h"
+#include <cstdlib>
 
 Modal :: Modal(unsigned int modes)
   : nModes_(modes)
--- stk-4.3.1.orig/src/RtAudio.cpp	2007-12-07 09:04:43.000000000 +0100
+++ stk-4.3.1/src/RtAudio.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -42,6 +42,9 @@
 
 #include "RtAudio.h"
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
+#include <climits>
 
 // Static variable definitions.
 const unsigned int RtApi::MAX_SAMPLE_RATES = 14;
--- stk-4.3.1.orig/src/Shakers.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/Shakers.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -54,6 +54,8 @@
 
 #include "Stk.h"
 #include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 int my_random(int max) //  Return Random Int Between 0 and max
 {
--- stk-4.3.1.orig/src/Skini.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/Skini.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -25,6 +25,7 @@
 
 #include "Skini.h"
 #include "SKINI.tbl"
+#include <cstdlib>
 
 Skini :: Skini()
 {
--- stk-4.3.1.orig/src/Stk.cpp	2007-12-06 01:58:28.000000000 +0100
+++ stk-4.3.1/src/Stk.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -51,6 +51,7 @@
 /***************************************************/
 
 #include "Stk.h"
+#include <cstdlib>
 
 StkFloat Stk :: srate_ = (StkFloat) SRATE;
 std::string Stk :: rawwavepath_ = RAWWAVE_PATH;
--- stk-4.3.1.orig/src/TcpClient.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/TcpClient.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -24,6 +24,7 @@
 /***************************************************/
 
 #include "TcpClient.h"
+#include <cstring>
 
 TcpClient :: TcpClient(int port, std::string hostname )
 {
--- stk-4.3.1.orig/src/UdpSocket.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/UdpSocket.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -22,6 +22,7 @@
 /***************************************************/
 
 #include "UdpSocket.h"
+#include <cstring>
 
 UdpSocket :: UdpSocket(int port )
 {
--- stk-4.3.1.orig/src/VoicForm.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/VoicForm.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -30,6 +30,7 @@
 #include "SKINI.msg"
 
 #include <cmath>
+#include <cstring>
 
 VoicForm :: VoicForm() : Instrmnt()
 {
diff -up stk-4.3.1/projects/demo/Md2Skini.cpp.orig stk-4.3.1/projects/demo/Md2Skini.cpp
--- stk-4.3.1/projects/demo/Md2Skini.cpp.orig	2007-12-06 01:58:33.000000000 +0100
+++ stk-4.3.1/projects/demo/Md2Skini.cpp	2008-08-07 20:45:08.000000000 +0200
@@ -12,7 +12,7 @@
 
 #include "RtMidi.h"
 #include "SKINI.msg"
-#include <stdio.h>
+#include <cstdlib>
 #include <iostream>
 #include <string>
 

stk-4.3.1-missing.patch:

--- NEW FILE stk-4.3.1-missing.patch ---
--- /dev/null	2008-06-04 20:47:47.568000746 +0200
+++ stk-4.3.1/projects/demo/Banded	2008-07-04 03:35:48.000000000 +0200
@@ -0,0 +1 @@
+wish < tcl/Banded.tcl | ./demo BandedWG -or -ip

stk-4.3.1-sharedlib.patch:

--- NEW FILE stk-4.3.1-sharedlib.patch ---
diff -up stk-4.3.1/src/Makefile.in.sharedlib stk-4.3.1/src/Makefile.in
--- stk-4.3.1/src/Makefile.in.sharedlib	2008-07-15 21:43:37.000000000 +0200
+++ stk-4.3.1/src/Makefile.in	2008-07-15 21:51:45.000000000 +0200
@@ -2,8 +2,13 @@
 ### libstk Makefile - for various flavors of unix
 
 LIBRARY = libstk.a
+SHAREDLIB = libstk.so
+MAJOR = 4
+RELEASE = 4.3.1
+
 AR = ar -rsc
 RM = /bin/rm
+LN = /bin/ln
 OBJECT_PATH = @object_path@
 vpath %.o $(OBJECT_PATH)
 
@@ -40,6 +45,9 @@ DEFS     = @byte_order@
 DEFS    += @debug@
 CFLAGS   = @CFLAGS@
 CFLAGS  += @warn@ $(INCLUDE) -Iinclude
+CFLAGS  += -fPIC
+LIBS     = @LIBS@
+LIBS    += @frameworks@
 
 REALTIME = @realtime@
 ifeq ($(REALTIME),yes)
@@ -59,12 +67,18 @@ DEFS    += -DRAWWAVE_PATH=\"$(RAWWAVES)\
 %.o : ../src/include/%.cpp
 	$(CC) $(CFLAGS) $(DEFS) -c $(<) -o $(OBJECT_PATH)/$@
 
-all : $(LIBRARY)
+all : $(LIBRARY) $(SHAREDLIB).$(RELEASE)
 
 $(LIBRARY) : $(OBJECTS)
-	/bin/rm -f $(LIBRARY)
+	$(RM) -f $(LIBRARY)
 	$(AR) $(LIBRARY) $(OBJECT_PATH)/*.o
 
+$(SHAREDLIB).$(RELEASE) : $(OBJECTS)
+	$(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
+	$(CC) -fPIC -shared -Wl,-soname,$(SHAREDLIB).$(MAJOR) -o $(@) $(OBJECT_PATH)/*.o $(LIBS)
+	$(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB).$(MAJOR)
+	$(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB)
+
 $(OBJECTS) : Stk.h
 
 clean : 


--- NEW FILE stk.spec ---
Name:           stk
Version:        4.3.1
Release:        6%{?dist}
Summary:        Synthesis ToolKit in C++
Group:          System Environment/Libraries
License:        MIT
URL:            http://ccrma.stanford.edu/software/stk/
Source0:        %{name}-%{version}.stripped.tar.gz
# Original tarfile can be found at %{url}/release/%{name}-%{version}.tar.gz
# We remove legeally questionable files.
Source1:        README.fedora
Source2:        config.guess
Source3:        config.sub
Patch0:         stk-4.3.1-header.patch
Patch1:         stk-4.3.1-cflags-lib.patch
Patch2:         stk-4.3.1-sharedlib.patch
Patch3:         stk-4.3.1-missing.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  alsa-lib-devel
BuildRequires:  jack-audio-connection-kit-devel
BuildRequires:  symlinks


%description
The Synthesis ToolKit in C++ (STK) is a set of open source audio
signal processing and algorithmic synthesis classes written in the C++
programming language. STK was designed to facilitate rapid development
of music synthesis and audio processing software, with an emphasis on
cross-platform functionality, realtime control, ease of use, and
educational example code. The Synthesis ToolKit is extremely portable
(it's mostly platform-independent C and C++ code), and it's completely
user-extensible (all source included, no unusual libraries, and no
hidden drivers). We like to think that this increases the chances that
our programs will still work in another 5-10 years. In fact, the
ToolKit has been working continuously for about 10 years now. STK
currently runs with realtime support (audio and MIDI) on Linux,
Macintosh OS X, and Windows computer platforms. Generic, non-realtime
support has been tested under NeXTStep, Sun, and other platforms and
should work with any standard C++ compiler.


%package devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%package demo
Summary:        Demo applications for %{name}
Group:          System Environment/Libraries
Requires:       tk
Requires:       %{name} = %{version}-%{release}

%description demo
The %{name}-demo package contains the demo applications for the 
C++ Sound Synthesis ToolKit.


%prep
%setup0 -q 
%patch0 -p1 -b .header
%patch1 -p1 -b .cflags
%patch2 -p1 -b .sharedlib
%patch3 -p1

%{__cp} -a %{SOURCE1} README.fedora

# update old aux scripts
%{__rm} -f config.guess config.sub
%{__cp} -a %{SOURCE2} config.guess
%{__cp} -a %{SOURCE3} config.sub


%build
CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS}"
export CFLAGS
%configure --with-jack --with-alsa \
  RAWWAVE_PATH=%{_datadir}/stk/rawwaves/
%{__make} %{?_smp_mflags} -C src
%{__make} %{?_smp_mflags} -C projects/demo libdemo libMd2Skini
%{__make} %{?_smp_mflags} -C projects/examples -f libMakefile
%{__make} %{?_smp_mflags} -C projects/effects libeffects
%{__make} %{?_smp_mflags} -C projects/ragamatic libragamat


%install
%{__rm} -rf %{buildroot}
%{__mkdir_p} \
  %{buildroot}%{_includedir}/stk \
  %{buildroot}%{_libdir} \
  %{buildroot}%{_bindir} \
  %{buildroot}%{_datadir}/stk/rawwaves \
  %{buildroot}%{_datadir}/stk/demo \
  %{buildroot}%{_datadir}/stk/examples \
  %{buildroot}%{_datadir}/stk/effects \
  %{buildroot}%{_datadir}/stk/ragamatic

%{__cp} -p include/* %{buildroot}%{_includedir}/stk 
%{__cp} -pd src/libstk.* %{buildroot}%{_libdir}
%{__cp} -p rawwaves/*.raw %{buildroot}%{_datadir}/stk/rawwaves

%{__cp} -pr projects/demo/tcl %{buildroot}%{_datadir}/stk/demo
%{__cp} -pr projects/demo/scores %{buildroot}%{_datadir}/stk/demo
%{__cp} -p projects/demo/demo %{buildroot}%{_bindir}/stk-demo
%{__cp} -p projects/demo/Md2Skini %{buildroot}%{_bindir}/Md2Skini
for f in Banded Drums Modal Physical Shakers StkDemo Voice ; do
  %{__chmod} +x projects/demo/$f
  %{__sed} -e 's,\./demo,%{_bindir}/stk-demo,' -e '1i#! /bin/sh' \
    -i projects/demo/$f
  %{__cp} -p projects/demo/$f %{buildroot}%{_datadir}/stk/demo
done

%{__cp} -pr projects/examples/midifiles %{buildroot}%{_datadir}/stk/examples
%{__cp} -pr projects/examples/rawwaves %{buildroot}%{_datadir}/stk/examples
%{__cp} -pr projects/examples/scores %{buildroot}%{_datadir}/stk/examples
for f in sine sineosc foursine audioprobe midiprobe duplex play \
    record inetIn inetOut rtsine crtsine bethree controlbee \
    threebees playsmf grains ; do
  %{__cp} -p projects/examples/$f %{buildroot}%{_bindir}/stk-$f
  # absolute links, will be shortened later
  %{__ln_s} %{buildroot}%{_bindir}/stk-$f %{buildroot}%{_datadir}/stk/examples/$f
done

%{__cp} -pr projects/effects/tcl %{buildroot}%{_datadir}/stk/effects
%{__cp} -p projects/effects/effects %{buildroot}%{_bindir}/stk-effects
%{__sed} -e 's,\./effects,%{_bindir}/stk-effects,' -e '1i#! /bin/sh' \
  -i projects/effects/StkEffects
%{__cp} -p projects/effects/StkEffects %{buildroot}%{_datadir}/stk/effects

%{__cp} -pr projects/ragamatic/tcl %{buildroot}%{_datadir}/stk/ragamatic
%{__cp} -pr projects/ragamatic/rawwaves %{buildroot}%{_datadir}/stk/ragamatic
%{__cp} -p projects/ragamatic/ragamat %{buildroot}%{_bindir}/stk-ragamat
%{__sed} -e 's,\./ragamat,%{_bindir}/stk-ragamat,' -e '1i#! /bin/sh' \
  -i projects/ragamatic/Raga
%{__cp} -p projects/ragamatic/Raga %{buildroot}%{_datadir}/stk/ragamatic

# fix encoding
iconv -f iso-8859-1 -t utf-8 doc/doxygen/index.txt \
  -o doc/doxygen/index.txt.tmp
%{__mv} doc/doxygen/index.txt.tmp doc/doxygen/index.txt

# fix symlinks
symlinks -crv %{buildroot}


%clean
%{__rm} -rf %{buildroot}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README
%{_libdir}/libstk.so.*
%{_datadir}/stk/rawwaves


%files devel
%defattr(-,root,root,-)
%doc README doc/* README.fedora
%exclude %{_libdir}/libstk.a
%{_libdir}/libstk.so
%{_includedir}/*


%files demo
%defattr(-,root,root,-)
%doc README README.fedora
%{_bindir}/stk-*
%{_bindir}/Md2Skini
%{_datadir}/stk/demo
%{_datadir}/stk/examples
%{_datadir}/stk/effects
%{_datadir}/stk/ragamatic


%changelog
* Mon Sep 15 2008 Thomas Moschny <thomas.moschny at gmx.de> - 4.3.1-6
- Include updated config.guess and config.sub scripts.

* Tue Sep  9 2008 Thomas Moschny <thomas.moschny at gmx.de> - 4.3.1-5
- Don't ship the static library.

* Sun Sep  7 2008 Thomas Moschny <thomas.moschny at gmx.de> - 4.3.1-4
- Remove all .mid and .ski files from the tarball.
- Add README.fedora.

* Thu Jul 31 2008 Thomas Moschny <thomas.moschny at gmx.de> - 4.3.1-3
- Remove src/include/dsound.h, and src/include/*asio* files from the
  tarball, for legal reasons. Only used on windows anyway.
- Remove src/include/soundcard.h (explicitly forbids modification) and
  disable OSS support.
- Build and pack Md2Skini.
- Build and pack the examples.

* Tue Jul 15 2008 Thomas Moschny <thomas.moschny at gmx.de> - 4.3.1-2
- Update sharedlib patch, fixes alsa problem.
- Fix path for include files in -devel.
- Change path for docs in -devel.

* Sun Jul  6 2008 Thomas Moschny <thomas.moschny at gmx.de> - 4.3.1-1
- New package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2008 03:15:39 -0000	1.1
+++ .cvsignore	19 Sep 2008 10:06:09 -0000	1.2
@@ -0,0 +1 @@
+stk-4.3.1.stripped.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 03:15:39 -0000	1.1
+++ sources	19 Sep 2008 10:06:09 -0000	1.2
@@ -0,0 +1 @@
+994b7ff18c821376bfc4989a9f857a6f  stk-4.3.1.stripped.tar.gz



From varekova at fedoraproject.org  Fri Sep 19 10:12:53 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Fri, 19 Sep 2008 10:12:53 +0000 (UTC)
Subject: rpms/pilot-link/F-9 pilot-link-0.12.3-clio.patch, NONE,
	1.1 pilot-link.spec, 1.79, 1.80
Message-ID: <20080919101253.D3372700F7@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/pilot-link/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6637

Modified Files:
	pilot-link.spec 
Added Files:
	pilot-link-0.12.3-clio.patch 
Log Message:
- add clio patch (454178) - thanks Michael Ekstrand


pilot-link-0.12.3-clio.patch:

--- NEW FILE pilot-link-0.12.3-clio.patch ---
Index: pilot-link-0.12.3/libpisock/usb.c
===================================================================
--- pilot-link-0.12.3.orig/libpisock/usb.c
+++ pilot-link-0.12.3/libpisock/usb.c
@@ -655,6 +655,7 @@ pi_usb_dev_t known_devices[] = {
 		.vendor 	= 0x054c,
 		.product 	= 0x0066,
 		.idstr 		= "Sony T, SJ series, and other Palm OS 4.0 devices",
+		.flags      = USB_INIT_SONY_CLIE,
 	},
 
 	{


Index: pilot-link.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pilot-link/F-9/pilot-link.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- pilot-link.spec	6 Jul 2008 02:07:47 -0000	1.79
+++ pilot-link.spec	19 Sep 2008 10:12:23 -0000	1.80
@@ -3,7 +3,7 @@
 
 Name: pilot-link
 Version: 0.12.3
-Release: 14%{?dist}
+Release: 15%{?dist}
 Epoch: 2
 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL
 Group: Applications/Communications
@@ -24,6 +24,7 @@
 Patch7: pilot-link-0.12.3-md5.patch
 Patch8: bluetooth-session-register.diff
 Patch9: pilot-link-0.12.2-Zire.patch
+Patch10: pilot-link-0.12.3-clio.patch
 
 
 Requires(post): /sbin/ldconfig
@@ -81,6 +82,7 @@
 %patch7 -p1 -b .md5
 %patch8 -p0 -b .bluetooth-sdp
 %patch9 -p1 -b .Zire
+%patch10 -p1 -b .clio
 
 %build
 autoreconf -is
@@ -179,6 +181,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Fri Sep 19 2008 Ivana Varekova <varekova at redhat.com> - 2:0.12.3-15
+- add clio patch (454178) - thanks Michael Ekstrand
+
 * Fri Jun 06 2008 Kevin Page <krp[AT]fedoraproject org> - 2:0.12.3-14
 - corrected documentation for visor module use
 



From varekova at fedoraproject.org  Fri Sep 19 10:17:54 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Fri, 19 Sep 2008 10:17:54 +0000 (UTC)
Subject: rpms/pilot-link/devel pilot-link-0.12.3-clio.patch, NONE,
	1.1 pilot-link.spec, 1.80, 1.81
Message-ID: <20080919101754.16CB2700F7@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/pilot-link/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8200

Modified Files:
	pilot-link.spec 
Added Files:
	pilot-link-0.12.3-clio.patch 
Log Message:
- add clio patch (454178) - thanks Michael Ekstrand 


pilot-link-0.12.3-clio.patch:

--- NEW FILE pilot-link-0.12.3-clio.patch ---
Index: pilot-link-0.12.3/libpisock/usb.c
===================================================================
--- pilot-link-0.12.3.orig/libpisock/usb.c
+++ pilot-link-0.12.3/libpisock/usb.c
@@ -655,6 +655,7 @@ pi_usb_dev_t known_devices[] = {
 		.vendor 	= 0x054c,
 		.product 	= 0x0066,
 		.idstr 		= "Sony T, SJ series, and other Palm OS 4.0 devices",
+		.flags      = USB_INIT_SONY_CLIE,
 	},
 
 	{


Index: pilot-link.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pilot-link/devel/pilot-link.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- pilot-link.spec	11 Sep 2008 12:39:42 -0000	1.80
+++ pilot-link.spec	19 Sep 2008 10:17:23 -0000	1.81
@@ -3,7 +3,7 @@
 
 Name: pilot-link
 Version: 0.12.3
-Release: 15%{?dist}
+Release: 16%{?dist}
 Epoch: 2
 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL
 Group: Applications/Communications
@@ -24,6 +24,7 @@
 Patch7: pilot-link-0.12.3-md5.patch
 Patch8: bluetooth-session-register.diff
 Patch9: pilot-link-0.12.2-Zire.patch
+Patch10: pilot-link-0.12.3-clio.patch
 
 
 Requires(post): /sbin/ldconfig
@@ -81,6 +82,7 @@
 %patch7 -p1 -b .md5
 %patch8 -p0 -b .bluetooth-sdp
 %patch9 -p1 -b .Zire
+%patch10 -p1 -b .clio
 
 %build
 autoreconf -is
@@ -179,6 +181,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Fri Sep 19 2008 Ivana Varekova <varekova at redhat.com> - 2:0.12.3-16
+- add clio patch (454178) - thanks Michael Ekstrand
+
 * Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 2:0.12.3-15
 - Rebuild
 



From mschwendt at fedoraproject.org  Fri Sep 19 10:19:04 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri, 19 Sep 2008 10:19:04 +0000 (UTC)
Subject: extras-repoclosure README,NONE,1.1
Message-ID: <20080919101904.67A14700F7@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8896

Added Files:
	README 
Log Message:
basic documentation on how to run this


--- NEW FILE README ---
Running repoclosure:

1. Create a yum.conf file which contains repository definition sections
for every repository you want to include in the check. Choose
non-ambiguous repository identifiers (to put into the section headers in
brackets, e.g. fedora-updates, because you need pass those repo ids to
repoclosure later on).

2. If the yum.conf file uses variables, such as $releasever or $basearch,
substitute these values with the "substrepo" helper script and redirect
the output to another file to continue with. Only that way you can point
repoclosure to the repositories for a specific distribution release and
target architecture. This avoids that the Yum backend fills in defaults
for your host OS.

3. Pass all repository ids to repoclosure as -r arguments.
E.g: -r fedora -r fedora-updates

4. Append the right target architecture as -a argument. Note that
for Fedora's i386 repositories, the right arch is i686 because
some packages are for i586 or higher only.

5. Don't forget option -n as you only want to consider newest package
releases.

6. The final command-line will look similar to:

  rc-modified -n -q -d ~/mdcache -c ~/yum.temp.conf \
    -a i686 \
    -r fedora-9-i386 \
    -r fedora-updates-9-i386 \
    -r fedora-updates-testing-9-i386 \
  > brokendeps-fedora-9-i386.txt



From thm at fedoraproject.org  Fri Sep 19 10:19:48 2008
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri, 19 Sep 2008 10:19:48 +0000 (UTC)
Subject: rpms/stk/F-9 README.fedora, NONE, 1.1 config.guess, NONE,
	1.1 config.sub, NONE, 1.1 import.log, NONE,
	1.1 stk-4.3.1-cflags-lib.patch, NONE, 1.1 stk-4.3.1-header.patch,
	NONE, 1.1 stk-4.3.1-missing.patch, NONE,
	1.1 stk-4.3.1-sharedlib.patch, NONE, 1.1 stk.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080919101948.E815C700F7@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/stk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9126/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora config.guess config.sub import.log 
	stk-4.3.1-cflags-lib.patch stk-4.3.1-header.patch 
	stk-4.3.1-missing.patch stk-4.3.1-sharedlib.patch stk.spec 
Log Message:
Initial import to F-9.


--- NEW FILE README.fedora ---
For legal reasons, the following files have been removed from the
original tarfile:

    stk-4.3.1/src/include/dsound.h
    stk-4.3.1/src/include/soundcard.h
    stk-4.3.1/src/include/asio.cpp
    stk-4.3.1/src/include/asiodrivers.cpp
    stk-4.3.1/src/include/asiodrivers.h
    stk-4.3.1/src/include/asiodrvr.h
    stk-4.3.1/src/include/asio.h
    stk-4.3.1/src/include/asiolist.cpp
    stk-4.3.1/src/include/asiolist.h
    stk-4.3.1/src/include/asiosys.h
    stk-4.3.1/src/include/iasiodrv.h
    stk-4.3.1/src/include/iasiothiscallresolver.cpp
    stk-4.3.1/src/include/iasiothiscallresolver.h
    stk-4.3.1/projects/examples/midifiles/bwv772.mid
    stk-4.3.1/projects/examples/midifiles/jesu.mid
    stk-4.3.1/projects/examples/midifiles/tango.mid
    stk-4.3.1/doc/html/tutorial/bachfugue.ski
    stk-4.3.1/doc/html/tutorial/bookert.ski
    stk-4.3.1/projects/demo/scores/bachfugue.ski
    stk-4.3.1/projects/demo/scores/bookert.ski
    stk-4.3.1/projects/demo/scores/chords.ski
    stk-4.3.1/projects/demo/scores/doogie.ski
    stk-4.3.1/projects/demo/scores/drumfunk.ski
    stk-4.3.1/projects/demo/scores/drumtest.ski
    stk-4.3.1/projects/demo/scores/duelingb.ski
    stk-4.3.1/projects/demo/scores/fiddle.ski
    stk-4.3.1/projects/demo/scores/flutbach.ski
    stk-4.3.1/projects/demo/scores/funicula.ski
    stk-4.3.1/projects/demo/scores/funskini.ski
    stk-4.3.1/projects/demo/scores/lacrymos.ski
    stk-4.3.1/projects/demo/scores/mandtune.ski
    stk-4.3.1/projects/demo/scores/marimba2.ski
    stk-4.3.1/projects/demo/scores/marimtst.ski
    stk-4.3.1/projects/demo/scores/misacrio.ski
    stk-4.3.1/projects/demo/scores/morazbel.ski
    stk-4.3.1/projects/demo/scores/organs.ski
    stk-4.3.1/projects/demo/scores/pickdamp.ski
    stk-4.3.1/projects/demo/scores/pictures.ski
    stk-4.3.1/projects/demo/scores/riderson.ski
    stk-4.3.1/projects/demo/scores/scales.ski
    stk-4.3.1/projects/demo/scores/shaktest.ski
    stk-4.3.1/projects/demo/scores/simplgft.ski
    stk-4.3.1/projects/demo/scores/spain.ski
    stk-4.3.1/projects/demo/scores/streetsf.ski
    stk-4.3.1/projects/demo/scores/test.ski
    stk-4.3.1/projects/demo/scores/thecars.ski
    stk-4.3.1/projects/demo/scores/tubebell.ski
    stk-4.3.1/projects/demo/scores/vocaliz.ski
    stk-4.3.1/projects/examples/scores/bachfugue.ski
    stk-4.3.1/projects/examples/scores/bookert.ski


--- NEW FILE config.guess ---
#! /bin/sh
# Attempt to guess a canonical system name.
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
#   Inc.

timestamp='2007-05-17'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# 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.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.


# Originally written by Per Bothner <per at bothner.com>.
# Please send patches to <config-patches at gnu.org>.  Submit a context
# diff and a properly formatted ChangeLog entry.
#
# This script attempts to guess a canonical system name similar to
# config.sub.  If it succeeds, it prints the system name on stdout, and
# exits with 0.  Otherwise, it exits with 1.
#
# The plan is that this can be called by configure scripts if you
# don't specify an explicit build system type.

me=`echo "$0" | sed -e 's,.*/,,'`

usage="\
Usage: $0 [OPTION]

Output the configuration name of the system \`$me' is run on.

Operation modes:
  -h, --help         print this help, then exit
  -t, --time-stamp   print date of last modification, then exit
  -v, --version      print version number, then exit

Report bugs and patches to <config-patches at gnu.org>."

version="\
GNU config.guess ($timestamp)

Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.

This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

help="
Try \`$me --help' for more information."

# Parse command line
while test $# -gt 0 ; do
  case $1 in
    --time-stamp | --time* | -t )
       echo "$timestamp" ; exit ;;
    --version | -v )
       echo "$version" ; exit ;;
    --help | --h* | -h )
       echo "$usage"; exit ;;
    -- )     # Stop option processing
       shift; break ;;
    - )	# Use stdin as input.
       break ;;
    -* )
       echo "$me: invalid option $1$help" >&2
       exit 1 ;;
    * )
       break ;;
  esac
done

if test $# != 0; then
  echo "$me: too many arguments$help" >&2
  exit 1
fi

trap 'exit 1' 1 2 15

# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
# compiler to aid in system detection is discouraged as it requires
# temporary files to be created and, as you can see below, it is a
# headache to deal with in a portable fashion.

# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
# use `HOST_CC' if defined, but it is deprecated.

# Portable tmp directory creation inspired by the Autoconf team.

set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
 { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
dummy=$tmp/dummy ;
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
case $CC_FOR_BUILD,$HOST_CC,$CC in
 ,,)    echo "int x;" > $dummy.c ;
	for c in cc gcc c89 c99 ; do
	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
	     CC_FOR_BUILD="$c"; break ;
	  fi ;
	done ;
	if test x"$CC_FOR_BUILD" = x ; then
	  CC_FOR_BUILD=no_compiler_found ;
	fi
	;;
 ,,*)   CC_FOR_BUILD=$CC ;;
 ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
esac ; set_cc_for_build= ;'

# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi at noc.rutgers.edu 1994-08-24)
if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
	PATH=$PATH:/.attbin ; export PATH
fi

UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown

# Note: order is significant - the case branches are not exclusive.

case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:NetBSD:*:*)
	# NetBSD (nbsd) targets should (where applicable) match one or
	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
	# switched to ELF, *-*-netbsd* would select the old
	# object file format.  This provides both forward
	# compatibility and a consistent mechanism for selecting the
	# object file format.
	#
	# Note: NetBSD doesn't particularly care about the vendor
	# portion of the name.  We always set it to "unknown".
	sysctl="sysctl -n hw.machine_arch"
	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
	case "${UNAME_MACHINE_ARCH}" in
	    armeb) machine=armeb-unknown ;;
	    arm*) machine=arm-unknown ;;
	    sh3el) machine=shl-unknown ;;
	    sh3eb) machine=sh-unknown ;;
	    sh5el) machine=sh5le-unknown ;;
	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
	esac
	# The Operating System including object format, if it has switched
	# to ELF recently, or will in the future.
	case "${UNAME_MACHINE_ARCH}" in
	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
		eval $set_cc_for_build
		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
			| grep __ELF__ >/dev/null
		then
		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
		    # Return netbsd for either.  FIX?
		    os=netbsd
		else
		    os=netbsdelf
		fi
		;;
	    *)
	        os=netbsd
		;;
	esac
	# The OS release
	# Debian GNU/NetBSD machines have a different userland, and
	# thus, need a distinct triplet. However, they do not need
	# kernel version information, so it can be replaced with a
	# suitable tag, in the style of linux-gnu.
	case "${UNAME_VERSION}" in
	    Debian*)
		release='-gnu'
		;;
	    *)
		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
		;;
	esac
	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
	# contains redundant information, the shorter form:
	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
	echo "${machine}-${os}${release}"
	exit ;;
    *:OpenBSD:*:*)
	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
	exit ;;
    *:ekkoBSD:*:*)
	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
	exit ;;
    *:SolidBSD:*:*)
	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
	exit ;;
    macppc:MirBSD:*:*)
	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
	exit ;;
    *:MirBSD:*:*)
	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
	exit ;;
    alpha:OSF1:*:*)
	case $UNAME_RELEASE in
	*4.0)
		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
		;;
	*5.*)
	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
		;;
	esac
	# According to Compaq, /usr/sbin/psrinfo has been available on
	# OSF/1 and Tru64 systems produced since 1995.  I hope that
	# covers most systems running today.  This code pipes the CPU
	# types through head -n 1, so we only detect the type of CPU 0.
	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
	case "$ALPHA_CPU_TYPE" in
	    "EV4 (21064)")
		UNAME_MACHINE="alpha" ;;
	    "EV4.5 (21064)")
		UNAME_MACHINE="alpha" ;;
	    "LCA4 (21066/21068)")
		UNAME_MACHINE="alpha" ;;
	    "EV5 (21164)")
		UNAME_MACHINE="alphaev5" ;;
	    "EV5.6 (21164A)")
		UNAME_MACHINE="alphaev56" ;;
	    "EV5.6 (21164PC)")
		UNAME_MACHINE="alphapca56" ;;
	    "EV5.7 (21164PC)")
		UNAME_MACHINE="alphapca57" ;;
	    "EV6 (21264)")
		UNAME_MACHINE="alphaev6" ;;
	    "EV6.7 (21264A)")
		UNAME_MACHINE="alphaev67" ;;
	    "EV6.8CB (21264C)")
		UNAME_MACHINE="alphaev68" ;;
	    "EV6.8AL (21264B)")
		UNAME_MACHINE="alphaev68" ;;
	    "EV6.8CX (21264D)")
		UNAME_MACHINE="alphaev68" ;;
	    "EV6.9A (21264/EV69A)")
		UNAME_MACHINE="alphaev69" ;;
	    "EV7 (21364)")
		UNAME_MACHINE="alphaev7" ;;
	    "EV7.9 (21364A)")
		UNAME_MACHINE="alphaev79" ;;
	esac
	# A Pn.n version is a patched version.
	# A Vn.n version is a released version.
	# A Tn.n version is a released field test version.
	# A Xn.n version is an unreleased experimental baselevel.
	# 1.2 uses "1.2" for uname -r.
	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
	exit ;;
    Alpha\ *:Windows_NT*:*)
	# How do we know it's Interix rather than the generic POSIX subsystem?
	# Should we change UNAME_MACHINE based on the output of uname instead
	# of the specific Alpha model?
	echo alpha-pc-interix
	exit ;;
    21064:Windows_NT:50:3)
	echo alpha-dec-winnt3.5
	exit ;;
    Amiga*:UNIX_System_V:4.0:*)
	echo m68k-unknown-sysv4
	exit ;;
    *:[Aa]miga[Oo][Ss]:*:*)
	echo ${UNAME_MACHINE}-unknown-amigaos
	exit ;;
    *:[Mm]orph[Oo][Ss]:*:*)
	echo ${UNAME_MACHINE}-unknown-morphos
	exit ;;
    *:OS/390:*:*)
	echo i370-ibm-openedition
	exit ;;
    *:z/VM:*:*)
	echo s390-ibm-zvmoe
	exit ;;
    *:OS400:*:*)
        echo powerpc-ibm-os400
	exit ;;
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
	echo arm-acorn-riscix${UNAME_RELEASE}
	exit ;;
    arm:riscos:*:*|arm:RISCOS:*:*)
	echo arm-unknown-riscos
	exit ;;
    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
	echo hppa1.1-hitachi-hiuxmpp
	exit ;;
    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
	if test "`(/bin/universe) 2>/dev/null`" = att ; then
		echo pyramid-pyramid-sysv3
	else
		echo pyramid-pyramid-bsd
	fi
	exit ;;
    NILE*:*:*:dcosx)
	echo pyramid-pyramid-svr4
	exit ;;
    DRS?6000:unix:4.0:6*)
	echo sparc-icl-nx6
	exit ;;
    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
	case `/usr/bin/uname -p` in
	    sparc) echo sparc-icl-nx7; exit ;;
	esac ;;
    sun4H:SunOS:5.*:*)
	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
	exit ;;
    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
	exit ;;
    i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
	exit ;;
    sun4*:SunOS:6*:*)
	# According to config.sub, this is the proper way to canonicalize
	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
	# it's likely to be more like Solaris than SunOS4.
	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
	exit ;;
    sun4*:SunOS:*:*)
	case "`/usr/bin/arch -k`" in
	    Series*|S4*)
		UNAME_RELEASE=`uname -v`
		;;
	esac
	# Japanese Language versions have a version number like `4.1.3-JL'.
	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
	exit ;;
    sun3*:SunOS:*:*)
	echo m68k-sun-sunos${UNAME_RELEASE}
	exit ;;
    sun*:*:4.2BSD:*)
	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
	case "`/bin/arch`" in
	    sun3)
		echo m68k-sun-sunos${UNAME_RELEASE}
		;;
	    sun4)
		echo sparc-sun-sunos${UNAME_RELEASE}
		;;
	esac
	exit ;;
    aushp:SunOS:*:*)
	echo sparc-auspex-sunos${UNAME_RELEASE}
	exit ;;
    # The situation for MiNT is a little confusing.  The machine name
    # can be virtually everything (everything which is not
    # "atarist" or "atariste" at least should have a processor
    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
    # to the lowercase version "mint" (or "freemint").  Finally
    # the system name "TOS" denotes a system which is actually not
    # MiNT.  But MiNT is downward compatible to TOS, so this should
    # be no problem.
    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
        echo m68k-atari-mint${UNAME_RELEASE}
	exit ;;
    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
	echo m68k-atari-mint${UNAME_RELEASE}
        exit ;;
    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
        echo m68k-atari-mint${UNAME_RELEASE}
	exit ;;
    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
        echo m68k-milan-mint${UNAME_RELEASE}
        exit ;;
    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
        echo m68k-hades-mint${UNAME_RELEASE}
        exit ;;
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
        echo m68k-unknown-mint${UNAME_RELEASE}
        exit ;;
    m68k:machten:*:*)
	echo m68k-apple-machten${UNAME_RELEASE}
	exit ;;
    powerpc:machten:*:*)
	echo powerpc-apple-machten${UNAME_RELEASE}
	exit ;;
    RISC*:Mach:*:*)
	echo mips-dec-mach_bsd4.3
	exit ;;
    RISC*:ULTRIX:*:*)
	echo mips-dec-ultrix${UNAME_RELEASE}
	exit ;;
    VAX*:ULTRIX*:*:*)
	echo vax-dec-ultrix${UNAME_RELEASE}
	exit ;;
    2020:CLIX:*:* | 2430:CLIX:*:*)
	echo clipper-intergraph-clix${UNAME_RELEASE}
	exit ;;
    mips:*:*:UMIPS | mips:*:*:RISCos)
	eval $set_cc_for_build
	sed 's/^	//' << EOF >$dummy.c
#ifdef __cplusplus
#include <stdio.h>  /* for printf() prototype */
	int main (int argc, char *argv[]) {
#else
	int main (argc, argv) int argc; char *argv[]; {
#endif
	#if defined (host_mips) && defined (MIPSEB)
	#if defined (SYSTYPE_SYSV)
	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
	#endif
	#if defined (SYSTYPE_SVR4)
	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
	#endif
	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
	#endif
	#endif
	  exit (-1);
	}
EOF
	$CC_FOR_BUILD -o $dummy $dummy.c &&
	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
	  SYSTEM_NAME=`$dummy $dummyarg` &&
	    { echo "$SYSTEM_NAME"; exit; }
	echo mips-mips-riscos${UNAME_RELEASE}
	exit ;;
    Motorola:PowerMAX_OS:*:*)
	echo powerpc-motorola-powermax
	exit ;;
    Motorola:*:4.3:PL8-*)
	echo powerpc-harris-powermax
	exit ;;
    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
	echo powerpc-harris-powermax
	exit ;;
    Night_Hawk:Power_UNIX:*:*)
	echo powerpc-harris-powerunix
	exit ;;
    m88k:CX/UX:7*:*)
	echo m88k-harris-cxux7
	exit ;;
    m88k:*:4*:R4*)
	echo m88k-motorola-sysv4
	exit ;;
    m88k:*:3*:R3*)
	echo m88k-motorola-sysv3
	exit ;;
    AViiON:dgux:*:*)
        # DG/UX returns AViiON for all architectures
        UNAME_PROCESSOR=`/usr/bin/uname -p`
	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
	then
	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
	       [ ${TARGET_BINARY_INTERFACE}x = x ]
	    then
		echo m88k-dg-dgux${UNAME_RELEASE}
	    else
		echo m88k-dg-dguxbcs${UNAME_RELEASE}
	    fi
	else
	    echo i586-dg-dgux${UNAME_RELEASE}
	fi
 	exit ;;
    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
	echo m88k-dolphin-sysv3
	exit ;;
    M88*:*:R3*:*)
	# Delta 88k system running SVR3
	echo m88k-motorola-sysv3
	exit ;;
    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
	echo m88k-tektronix-sysv3
	exit ;;
    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
	echo m68k-tektronix-bsd
	exit ;;
    *:IRIX*:*:*)
	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
	exit ;;
    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
    i*86:AIX:*:*)
	echo i386-ibm-aix
	exit ;;
    ia64:AIX:*:*)
	if [ -x /usr/bin/oslevel ] ; then
		IBM_REV=`/usr/bin/oslevel`
	else
		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
	fi
	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
	exit ;;
    *:AIX:2:3)
	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
		eval $set_cc_for_build
		sed 's/^		//' << EOF >$dummy.c
		#include <sys/systemcfg.h>

		main()
			{
			if (!__power_pc())
				exit(1);
			puts("powerpc-ibm-aix3.2.5");
			exit(0);
			}
EOF
		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
		then
			echo "$SYSTEM_NAME"
		else
			echo rs6000-ibm-aix3.2.5
		fi
	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
		echo rs6000-ibm-aix3.2.4
	else
		echo rs6000-ibm-aix3.2
	fi
	exit ;;
    *:AIX:*:[45])
	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
		IBM_ARCH=rs6000
	else
		IBM_ARCH=powerpc
	fi
	if [ -x /usr/bin/oslevel ] ; then
		IBM_REV=`/usr/bin/oslevel`
	else
		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
	fi
	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
	exit ;;
    *:AIX:*:*)
	echo rs6000-ibm-aix
	exit ;;
    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
	echo romp-ibm-bsd4.4
	exit ;;
    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
	exit ;;                             # report: romp-ibm BSD 4.3
    *:BOSX:*:*)
	echo rs6000-bull-bosx
	exit ;;
    DPX/2?00:B.O.S.:*:*)
	echo m68k-bull-sysv3
	exit ;;
    9000/[34]??:4.3bsd:1.*:*)
	echo m68k-hp-bsd
	exit ;;
    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
	echo m68k-hp-bsd4.4
	exit ;;
    9000/[34678]??:HP-UX:*:*)
	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
	case "${UNAME_MACHINE}" in
	    9000/31? )            HP_ARCH=m68000 ;;
	    9000/[34]?? )         HP_ARCH=m68k ;;
	    9000/[678][0-9][0-9])
		if [ -x /usr/bin/getconf ]; then
		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                    case "${sc_cpu_version}" in
                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
                      532)                      # CPU_PA_RISC2_0
                        case "${sc_kernel_bits}" in
                          32) HP_ARCH="hppa2.0n" ;;
                          64) HP_ARCH="hppa2.0w" ;;
			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
                        esac ;;
                    esac
		fi
		if [ "${HP_ARCH}" = "" ]; then
		    eval $set_cc_for_build
		    sed 's/^              //' << EOF >$dummy.c

              #define _HPUX_SOURCE
              #include <stdlib.h>
              #include <unistd.h>

              int main ()
              {
              #if defined(_SC_KERNEL_BITS)
                  long bits = sysconf(_SC_KERNEL_BITS);
              #endif
                  long cpu  = sysconf (_SC_CPU_VERSION);

                  switch (cpu)
              	{
              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
              	case CPU_PA_RISC2_0:
              #if defined(_SC_KERNEL_BITS)
              	    switch (bits)
              		{
              		case 64: puts ("hppa2.0w"); break;
              		case 32: puts ("hppa2.0n"); break;
              		default: puts ("hppa2.0"); break;
              		} break;
              #else  /* !defined(_SC_KERNEL_BITS) */
              	    puts ("hppa2.0"); break;
              #endif
              	default: puts ("hppa1.0"); break;
              	}
                  exit (0);
              }
EOF
		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
		    test -z "$HP_ARCH" && HP_ARCH=hppa
		fi ;;
	esac
	if [ ${HP_ARCH} = "hppa2.0w" ]
	then
	    eval $set_cc_for_build

	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
	    # generating 64-bit code.  GNU and HP use different nomenclature:
	    #
	    # $ CC_FOR_BUILD=cc ./config.guess
	    # => hppa2.0w-hp-hpux11.23
	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
	    # => hppa64-hp-hpux11.23

	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
		grep __LP64__ >/dev/null
	    then
		HP_ARCH="hppa2.0w"
	    else
		HP_ARCH="hppa64"
	    fi
	fi
	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
	exit ;;
    ia64:HP-UX:*:*)
	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
	echo ia64-hp-hpux${HPUX_REV}
	exit ;;
    3050*:HI-UX:*:*)
	eval $set_cc_for_build
	sed 's/^	//' << EOF >$dummy.c
	#include <unistd.h>
	int
	main ()
	{
	  long cpu = sysconf (_SC_CPU_VERSION);
	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
	     results, however.  */
	  if (CPU_IS_PA_RISC (cpu))
	    {
	      switch (cpu)
		{
		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
		  default: puts ("hppa-hitachi-hiuxwe2"); break;
		}
	    }
	  else if (CPU_IS_HP_MC68K (cpu))
	    puts ("m68k-hitachi-hiuxwe2");
	  else puts ("unknown-hitachi-hiuxwe2");
	  exit (0);
	}
EOF
	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
		{ echo "$SYSTEM_NAME"; exit; }
	echo unknown-hitachi-hiuxwe2
	exit ;;
    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
	echo hppa1.1-hp-bsd
	exit ;;
    9000/8??:4.3bsd:*:*)
	echo hppa1.0-hp-bsd
	exit ;;
    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
	echo hppa1.0-hp-mpeix
	exit ;;
    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
	echo hppa1.1-hp-osf
	exit ;;
    hp8??:OSF1:*:*)
	echo hppa1.0-hp-osf
	exit ;;
    i*86:OSF1:*:*)
	if [ -x /usr/sbin/sysversion ] ; then
	    echo ${UNAME_MACHINE}-unknown-osf1mk
	else
	    echo ${UNAME_MACHINE}-unknown-osf1
	fi
	exit ;;
    parisc*:Lites*:*:*)
	echo hppa1.1-hp-lites
	exit ;;
    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
	echo c1-convex-bsd
        exit ;;
    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
	if getsysinfo -f scalar_acc
	then echo c32-convex-bsd
	else echo c2-convex-bsd
	fi
        exit ;;
    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
	echo c34-convex-bsd
        exit ;;
    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
	echo c38-convex-bsd
        exit ;;
    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
	echo c4-convex-bsd
        exit ;;
    CRAY*Y-MP:*:*:*)
	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
	exit ;;
    CRAY*[A-Z]90:*:*:*)
	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
	      -e 's/\.[^.]*$/.X/'
	exit ;;
    CRAY*TS:*:*:*)
	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
	exit ;;
    CRAY*T3E:*:*:*)
	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
	exit ;;
    CRAY*SV1:*:*:*)
	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
	exit ;;
    *:UNICOS/mp:*:*)
	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
	exit ;;
    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
        exit ;;
    5000:UNIX_System_V:4.*:*)
        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
	exit ;;
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
	exit ;;
    sparc*:BSD/OS:*:*)
	echo sparc-unknown-bsdi${UNAME_RELEASE}
	exit ;;
    *:BSD/OS:*:*)
	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
	exit ;;
    *:FreeBSD:*:*)
	case ${UNAME_MACHINE} in
	    pc98)
		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
	    amd64)
		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
	    *)
		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
	esac
	exit ;;
    i*:CYGWIN*:*)
	echo ${UNAME_MACHINE}-pc-cygwin
	exit ;;
    *:MINGW*:*)
	echo ${UNAME_MACHINE}-pc-mingw32
	exit ;;
    i*:windows32*:*)
    	# uname -m includes "-pc" on this system.
    	echo ${UNAME_MACHINE}-mingw32
	exit ;;
    i*:PW*:*)
	echo ${UNAME_MACHINE}-pc-pw32
	exit ;;
    *:Interix*:[3456]*)
    	case ${UNAME_MACHINE} in
	    x86) 
		echo i586-pc-interix${UNAME_RELEASE}
		exit ;;
	    EM64T | authenticamd)
		echo x86_64-unknown-interix${UNAME_RELEASE}
		exit ;;
	esac ;;
    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
	echo i${UNAME_MACHINE}-pc-mks
	exit ;;
    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
	# How do we know it's Interix rather than the generic POSIX subsystem?
	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
	# UNAME_MACHINE based on the output of uname instead of i386?
	echo i586-pc-interix
	exit ;;
    i*:UWIN*:*)
	echo ${UNAME_MACHINE}-pc-uwin
	exit ;;
    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
	echo x86_64-unknown-cygwin
	exit ;;
    p*:CYGWIN*:*)
	echo powerpcle-unknown-cygwin
	exit ;;
    prep*:SunOS:5.*:*)
	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
	exit ;;
    *:GNU:*:*)
	# the GNU system
	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
	exit ;;
    *:GNU/*:*:*)
	# other systems with GNU libc and userland
	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
	exit ;;
    i*86:Minix:*:*)
	echo ${UNAME_MACHINE}-pc-minix
	exit ;;
    arm*:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    avr32*:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    cris:Linux:*:*)
	echo cris-axis-linux-gnu
	exit ;;
    crisv32:Linux:*:*)
	echo crisv32-axis-linux-gnu
	exit ;;
    frv:Linux:*:*)
    	echo frv-unknown-linux-gnu
	exit ;;
    ia64:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    m32r*:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    m68*:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    mips:Linux:*:*)
	eval $set_cc_for_build
	sed 's/^	//' << EOF >$dummy.c
	#undef CPU
	#undef mips
	#undef mipsel
	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
	CPU=mipsel
	#else
	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
	CPU=mips
	#else
	CPU=
	#endif
	#endif
EOF
	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
	    /^CPU/{
		s: ::g
		p
	    }'`"
	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
	;;
    mips64:Linux:*:*)
	eval $set_cc_for_build
	sed 's/^	//' << EOF >$dummy.c
	#undef CPU
	#undef mips64
	#undef mips64el
	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
	CPU=mips64el
	#else
	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
	CPU=mips64
	#else
	CPU=
	#endif
	#endif
EOF
	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
	    /^CPU/{
		s: ::g
		p
	    }'`"
	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
	;;
    or32:Linux:*:*)
	echo or32-unknown-linux-gnu
	exit ;;
    ppc:Linux:*:*)
	echo powerpc-unknown-linux-gnu
	exit ;;
    ppc64:Linux:*:*)
	echo powerpc64-unknown-linux-gnu
	exit ;;
    alpha:Linux:*:*)
	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
	  EV5)   UNAME_MACHINE=alphaev5 ;;
	  EV56)  UNAME_MACHINE=alphaev56 ;;
	  PCA56) UNAME_MACHINE=alphapca56 ;;
	  PCA57) UNAME_MACHINE=alphapca56 ;;
	  EV6)   UNAME_MACHINE=alphaev6 ;;
	  EV67)  UNAME_MACHINE=alphaev67 ;;
	  EV68*) UNAME_MACHINE=alphaev68 ;;
        esac
	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
	exit ;;
    parisc:Linux:*:* | hppa:Linux:*:*)
	# Look for CPU level
	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
	  *)    echo hppa-unknown-linux-gnu ;;
	esac
	exit ;;
    parisc64:Linux:*:* | hppa64:Linux:*:*)
	echo hppa64-unknown-linux-gnu
	exit ;;
    s390:Linux:*:* | s390x:Linux:*:*)
	echo ${UNAME_MACHINE}-ibm-linux
	exit ;;
    sh64*:Linux:*:*)
    	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    sh*:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    sparc:Linux:*:* | sparc64:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    vax:Linux:*:*)
	echo ${UNAME_MACHINE}-dec-linux-gnu
	exit ;;
    x86_64:Linux:*:*)
	echo x86_64-unknown-linux-gnu
	exit ;;
    xtensa:Linux:*:*)
    	echo xtensa-unknown-linux-gnu
	exit ;;
    i*86:Linux:*:*)
	# The BFD linker knows what the default object file format is, so
	# first see if it will tell us. cd to the root directory to prevent
	# problems with other programs or directories called `ld' in the path.
	# Set LC_ALL=C to ensure ld outputs messages in English.
	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
			 | sed -ne '/supported targets:/!d
				    s/[ 	][ 	]*/ /g
				    s/.*supported targets: *//
				    s/ .*//
				    p'`
        case "$ld_supported_targets" in
	  elf32-i386)
		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
		;;
	  a.out-i386-linux)
		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
		exit ;;
	  coff-i386)
		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
		exit ;;
	  "")
		# Either a pre-BFD a.out linker (linux-gnuoldld) or
		# one that does not give us useful --help.
		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
		exit ;;
	esac
	# Determine whether the default compiler is a.out or elf
	eval $set_cc_for_build
	sed 's/^	//' << EOF >$dummy.c
	#include <features.h>
	#ifdef __ELF__
	# ifdef __GLIBC__
	#  if __GLIBC__ >= 2
	LIBC=gnu
	#  else
	LIBC=gnulibc1
	#  endif
	# else
	LIBC=gnulibc1
	# endif
	#else
	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
	LIBC=gnu
	#else
	LIBC=gnuaout
	#endif
	#endif
	#ifdef __dietlibc__
	LIBC=dietlibc
	#endif
EOF
	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
	    /^LIBC/{
		s: ::g
		p
	    }'`"
	test x"${LIBC}" != x && {
		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
		exit
	}
	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
	;;
    i*86:DYNIX/ptx:4*:*)
	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
	# earlier versions are messed up and put the nodename in both
	# sysname and nodename.
	echo i386-sequent-sysv4
	exit ;;
    i*86:UNIX_SV:4.2MP:2.*)
        # Unixware is an offshoot of SVR4, but it has its own version
        # number series starting with 2...
        # I am not positive that other SVR4 systems won't match this,
	# I just have to hope.  -- rms.
        # Use sysv4.2uw... so that sysv4* matches it.
	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
	exit ;;
    i*86:OS/2:*:*)
	# If we were able to find `uname', then EMX Unix compatibility
	# is probably installed.
	echo ${UNAME_MACHINE}-pc-os2-emx
	exit ;;
    i*86:XTS-300:*:STOP)
	echo ${UNAME_MACHINE}-unknown-stop
	exit ;;
    i*86:atheos:*:*)
	echo ${UNAME_MACHINE}-unknown-atheos
	exit ;;
    i*86:syllable:*:*)
	echo ${UNAME_MACHINE}-pc-syllable
	exit ;;
    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
	echo i386-unknown-lynxos${UNAME_RELEASE}
	exit ;;
    i*86:*DOS:*:*)
	echo ${UNAME_MACHINE}-pc-msdosdjgpp
	exit ;;
    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
	else
		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
	fi
	exit ;;
    i*86:*:5:[678]*)
    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
	case `/bin/uname -X | grep "^Machine"` in
	    *486*)	     UNAME_MACHINE=i486 ;;
	    *Pentium)	     UNAME_MACHINE=i586 ;;
	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
	esac
	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
	exit ;;
    i*86:*:3.2:*)
	if test -f /usr/options/cb.name; then
		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
	elif /bin/uname -X 2>/dev/null >/dev/null ; then
		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
			&& UNAME_MACHINE=i586
		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
			&& UNAME_MACHINE=i686
		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
			&& UNAME_MACHINE=i686
		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
	else
		echo ${UNAME_MACHINE}-pc-sysv32
	fi
	exit ;;
    pc:*:*:*)
	# Left here for compatibility:
        # uname -m prints for DJGPP always 'pc', but it prints nothing about
        # the processor, so we play safe by assuming i386.
	echo i386-pc-msdosdjgpp
        exit ;;
    Intel:Mach:3*:*)
	echo i386-pc-mach3
	exit ;;
    paragon:*:*:*)
	echo i860-intel-osf1
	exit ;;
    i860:*:4.*:*) # i860-SVR4
	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
	else # Add other i860-SVR4 vendors below as they are discovered.
	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
	fi
	exit ;;
    mini*:CTIX:SYS*5:*)
	# "miniframe"
	echo m68010-convergent-sysv
	exit ;;
    mc68k:UNIX:SYSTEM5:3.51m)
	echo m68k-convergent-sysv
	exit ;;
    M680?0:D-NIX:5.3:*)
	echo m68k-diab-dnix
	exit ;;
    M68*:*:R3V[5678]*:*)
	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
	OS_REL=''
	test -r /etc/.relid \
	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
          && { echo i486-ncr-sysv4; exit; } ;;
    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
	echo m68k-unknown-lynxos${UNAME_RELEASE}
	exit ;;
    mc68030:UNIX_System_V:4.*:*)
	echo m68k-atari-sysv4
	exit ;;
    TSUNAMI:LynxOS:2.*:*)
	echo sparc-unknown-lynxos${UNAME_RELEASE}
	exit ;;
    rs6000:LynxOS:2.*:*)
	echo rs6000-unknown-lynxos${UNAME_RELEASE}
	exit ;;
    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
	echo powerpc-unknown-lynxos${UNAME_RELEASE}
	exit ;;
    SM[BE]S:UNIX_SV:*:*)
	echo mips-dde-sysv${UNAME_RELEASE}
	exit ;;
    RM*:ReliantUNIX-*:*:*)
	echo mips-sni-sysv4
	exit ;;
    RM*:SINIX-*:*:*)
	echo mips-sni-sysv4
	exit ;;
    *:SINIX-*:*:*)
	if uname -p 2>/dev/null >/dev/null ; then
		UNAME_MACHINE=`(uname -p) 2>/dev/null`
		echo ${UNAME_MACHINE}-sni-sysv4
	else
		echo ns32k-sni-sysv
	fi
	exit ;;
    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                      # says <Richard.M.Bartel at ccMail.Census.GOV>
        echo i586-unisys-sysv4
        exit ;;
    *:UNIX_System_V:4*:FTX*)
	# From Gerald Hewes <hewes at openmarket.com>.
	# How about differentiating between stratus architectures? -djm
	echo hppa1.1-stratus-sysv4
	exit ;;
    *:*:*:FTX*)
	# From seanf at swdc.stratus.com.
	echo i860-stratus-sysv4
	exit ;;
    i*86:VOS:*:*)
	# From Paul.Green at stratus.com.
	echo ${UNAME_MACHINE}-stratus-vos
	exit ;;
    *:VOS:*:*)
	# From Paul.Green at stratus.com.
	echo hppa1.1-stratus-vos
	exit ;;
    mc68*:A/UX:*:*)
	echo m68k-apple-aux${UNAME_RELEASE}
	exit ;;
    news*:NEWS-OS:6*:*)
	echo mips-sony-newsos6
	exit ;;
    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
	if [ -d /usr/nec ]; then
	        echo mips-nec-sysv${UNAME_RELEASE}
	else
	        echo mips-unknown-sysv${UNAME_RELEASE}
	fi
        exit ;;
    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
	echo powerpc-be-beos
	exit ;;
    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
	echo powerpc-apple-beos
	exit ;;
    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
	echo i586-pc-beos
	exit ;;
    SX-4:SUPER-UX:*:*)
	echo sx4-nec-superux${UNAME_RELEASE}
	exit ;;
    SX-5:SUPER-UX:*:*)
	echo sx5-nec-superux${UNAME_RELEASE}
	exit ;;
    SX-6:SUPER-UX:*:*)
	echo sx6-nec-superux${UNAME_RELEASE}
	exit ;;
    SX-7:SUPER-UX:*:*)
	echo sx7-nec-superux${UNAME_RELEASE}
	exit ;;
    SX-8:SUPER-UX:*:*)
	echo sx8-nec-superux${UNAME_RELEASE}
	exit ;;
    SX-8R:SUPER-UX:*:*)
	echo sx8r-nec-superux${UNAME_RELEASE}
	exit ;;
    Power*:Rhapsody:*:*)
	echo powerpc-apple-rhapsody${UNAME_RELEASE}
	exit ;;
    *:Rhapsody:*:*)
	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
	exit ;;
    *:Darwin:*:*)
	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
	case $UNAME_PROCESSOR in
	    unknown) UNAME_PROCESSOR=powerpc ;;
	esac
	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
	exit ;;
    *:procnto*:*:* | *:QNX:[0123456789]*:*)
	UNAME_PROCESSOR=`uname -p`
	if test "$UNAME_PROCESSOR" = "x86"; then
		UNAME_PROCESSOR=i386
		UNAME_MACHINE=pc
	fi
	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
	exit ;;
    *:QNX:*:4*)
	echo i386-pc-qnx
	exit ;;
    NSE-?:NONSTOP_KERNEL:*:*)
	echo nse-tandem-nsk${UNAME_RELEASE}
	exit ;;
    NSR-?:NONSTOP_KERNEL:*:*)
	echo nsr-tandem-nsk${UNAME_RELEASE}
	exit ;;
    *:NonStop-UX:*:*)
	echo mips-compaq-nonstopux
	exit ;;
    BS2000:POSIX*:*:*)
	echo bs2000-siemens-sysv
	exit ;;
    DS/*:UNIX_System_V:*:*)
	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
	exit ;;
    *:Plan9:*:*)
	# "uname -m" is not consistent, so use $cputype instead. 386
	# is converted to i386 for consistency with other x86
	# operating systems.
	if test "$cputype" = "386"; then
	    UNAME_MACHINE=i386
	else
	    UNAME_MACHINE="$cputype"
	fi
	echo ${UNAME_MACHINE}-unknown-plan9
	exit ;;
    *:TOPS-10:*:*)
	echo pdp10-unknown-tops10
	exit ;;
    *:TENEX:*:*)
	echo pdp10-unknown-tenex
	exit ;;
    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
	echo pdp10-dec-tops20
	exit ;;
    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
	echo pdp10-xkl-tops20
	exit ;;
    *:TOPS-20:*:*)
	echo pdp10-unknown-tops20
	exit ;;
    *:ITS:*:*)
	echo pdp10-unknown-its
	exit ;;
    SEI:*:*:SEIUX)
        echo mips-sei-seiux${UNAME_RELEASE}
	exit ;;
    *:DragonFly:*:*)
	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
	exit ;;
    *:*VMS:*:*)
    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
	case "${UNAME_MACHINE}" in
	    A*) echo alpha-dec-vms ; exit ;;
	    I*) echo ia64-dec-vms ; exit ;;
	    V*) echo vax-dec-vms ; exit ;;
	esac ;;
    *:XENIX:*:SysV)
	echo i386-pc-xenix
	exit ;;
    i*86:skyos:*:*)
	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
	exit ;;
    i*86:rdos:*:*)
	echo ${UNAME_MACHINE}-pc-rdos
	exit ;;
esac

#echo '(No uname command or uname output not recognized.)' 1>&2
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2

eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
# include <sys/types.h>
# include <sys/utsname.h>
#endif
main ()
{
#if defined (sony)
#if defined (MIPSEB)
  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
     I don't know....  */
  printf ("mips-sony-bsd\n"); exit (0);
#else
#include <sys/param.h>
  printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
          "4"
#else
	  ""
#endif
         ); exit (0);
#endif
#endif

#if defined (__arm) && defined (__acorn) && defined (__unix)
  printf ("arm-acorn-riscix\n"); exit (0);
#endif

#if defined (hp300) && !defined (hpux)
  printf ("m68k-hp-bsd\n"); exit (0);
#endif

#if defined (NeXT)
#if !defined (__ARCHITECTURE__)
#define __ARCHITECTURE__ "m68k"
#endif
  int version;
  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
  if (version < 4)
    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
  else
    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
  exit (0);
#endif

#if defined (MULTIMAX) || defined (n16)
#if defined (UMAXV)
  printf ("ns32k-encore-sysv\n"); exit (0);
#else
#if defined (CMU)
  printf ("ns32k-encore-mach\n"); exit (0);
#else
  printf ("ns32k-encore-bsd\n"); exit (0);
#endif
#endif
#endif

#if defined (__386BSD__)
  printf ("i386-pc-bsd\n"); exit (0);
#endif

#if defined (sequent)
#if defined (i386)
  printf ("i386-sequent-dynix\n"); exit (0);
#endif
#if defined (ns32000)
  printf ("ns32k-sequent-dynix\n"); exit (0);
#endif
#endif

#if defined (_SEQUENT_)
    struct utsname un;

    uname(&un);

    if (strncmp(un.version, "V2", 2) == 0) {
	printf ("i386-sequent-ptx2\n"); exit (0);
    }
    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
	printf ("i386-sequent-ptx1\n"); exit (0);
    }
    printf ("i386-sequent-ptx\n"); exit (0);

#endif

#if defined (vax)
# if !defined (ultrix)
#  include <sys/param.h>
#  if defined (BSD)
#   if BSD == 43
      printf ("vax-dec-bsd4.3\n"); exit (0);
#   else
#    if BSD == 199006
      printf ("vax-dec-bsd4.3reno\n"); exit (0);
#    else
      printf ("vax-dec-bsd\n"); exit (0);
#    endif
#   endif
#  else
    printf ("vax-dec-bsd\n"); exit (0);
#  endif
# else
    printf ("vax-dec-ultrix\n"); exit (0);
# endif
#endif

#if defined (alliant) && defined (i860)
  printf ("i860-alliant-bsd\n"); exit (0);
#endif

  exit (1);
}
EOF

$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
	{ echo "$SYSTEM_NAME"; exit; }

# Apollos put the system type in the environment.

test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }

# Convex versions that predate uname can use getsysinfo(1)

if [ -x /usr/convex/getsysinfo ]
then
    case `getsysinfo -f cpu_type` in
    c1*)
	echo c1-convex-bsd
	exit ;;
    c2*)
	if getsysinfo -f scalar_acc
	then echo c32-convex-bsd
	else echo c2-convex-bsd
	fi
	exit ;;
    c34*)
	echo c34-convex-bsd
	exit ;;
    c38*)
	echo c38-convex-bsd
	exit ;;
    c4*)
	echo c4-convex-bsd
	exit ;;
    esac
fi

cat >&2 <<EOF
$0: unable to guess system type

This script, last modified $timestamp, has failed to recognize
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from

  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
and
  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub

If the version you run ($0) is already up to date, please
send the following data and any information you think might be
pertinent to <config-patches at gnu.org> in order to provide the needed
information to handle your system.

config.guess timestamp = $timestamp

uname -m = `(uname -m) 2>/dev/null || echo unknown`
uname -r = `(uname -r) 2>/dev/null || echo unknown`
uname -s = `(uname -s) 2>/dev/null || echo unknown`
uname -v = `(uname -v) 2>/dev/null || echo unknown`

/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`

hostinfo               = `(hostinfo) 2>/dev/null`
/bin/universe          = `(/bin/universe) 2>/dev/null`
/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
/bin/arch              = `(/bin/arch) 2>/dev/null`
/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`

UNAME_MACHINE = ${UNAME_MACHINE}
UNAME_RELEASE = ${UNAME_RELEASE}
UNAME_SYSTEM  = ${UNAME_SYSTEM}
UNAME_VERSION = ${UNAME_VERSION}
EOF

exit 1

# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
# End:


--- NEW FILE config.sub ---
#! /bin/sh
# Configuration validation subroutine script.
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
#   Inc.

timestamp='2007-04-29'

# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine.  It does not imply ALL GNU software can.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# 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.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.


# Please send patches to <config-patches at gnu.org>.  Submit a context
# diff and a properly formatted ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
# Otherwise, we print the canonical config type on stdout and succeed.

# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
# Each package is responsible for reporting which valid configurations
# it does not support.  The user should be able to distinguish
# a failure to support a valid configuration from a meaningless
# configuration.

# The goal of this file is to map all the various variations of a given
# machine specification into a single specification in the form:
#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
# or in some cases, the newer four-part form:
#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# It is wrong to echo any other type of specification.

me=`echo "$0" | sed -e 's,.*/,,'`

usage="\
Usage: $0 [OPTION] CPU-MFR-OPSYS
       $0 [OPTION] ALIAS

Canonicalize a configuration name.

Operation modes:
  -h, --help         print this help, then exit
  -t, --time-stamp   print date of last modification, then exit
  -v, --version      print version number, then exit

Report bugs and patches to <config-patches at gnu.org>."

version="\
GNU config.sub ($timestamp)

Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.

This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

help="
Try \`$me --help' for more information."

# Parse command line
while test $# -gt 0 ; do
  case $1 in
    --time-stamp | --time* | -t )
       echo "$timestamp" ; exit ;;
    --version | -v )
       echo "$version" ; exit ;;
    --help | --h* | -h )
       echo "$usage"; exit ;;
    -- )     # Stop option processing
       shift; break ;;
    - )	# Use stdin as input.
       break ;;
    -* )
       echo "$me: invalid option $1$help"
       exit 1 ;;

    *local*)
       # First pass through any local machine types.
       echo $1
       exit ;;

    * )
       break ;;
  esac
done

case $# in
 0) echo "$me: missing argument$help" >&2
    exit 1;;
 1) ;;
 *) echo "$me: too many arguments$help" >&2
    exit 1;;
esac

# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
  *)
    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
    if [ $basic_machine != $1 ]
    then os=`echo $1 | sed 's/.*-/-/'`
    else os=; fi
    ;;
esac

### Let's recognize common machines as not being operating systems so
### that things like config.sub decstation-3100 work.  We also
### recognize some manufacturers as not being operating systems, so we
### can provide default operating systems below.
case $os in
	-sun*os*)
		# Prevent following clause from handling this invalid input.
		;;
	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
	-apple | -axis | -knuth | -cray)
		os=
		basic_machine=$1
		;;
	-sim | -cisco | -oki | -wec | -winbond)
		os=
		basic_machine=$1
		;;
	-scout)
		;;
	-wrs)
		os=-vxworks
		basic_machine=$1
		;;
	-chorusos*)
		os=-chorusos
		basic_machine=$1
		;;
 	-chorusrdb)
 		os=-chorusrdb
		basic_machine=$1
 		;;
	-hiux*)
		os=-hiuxwe2
		;;
	-sco6)
		os=-sco5v6
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco5)
		os=-sco3.2v5
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco4)
		os=-sco3.2v4
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco3.2.[4-9]*)
		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco3.2v[4-9]*)
		# Don't forget version if it is 3.2v4 or newer.
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco5v6*)
		# Don't forget version if it is 3.2v4 or newer.
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco*)
		os=-sco3.2v2
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-udk*)
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-isc)
		os=-isc2.2
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-clix*)
		basic_machine=clipper-intergraph
		;;
	-isc*)
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-lynx*)
		os=-lynxos
		;;
	-ptx*)
		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
		;;
	-windowsnt*)
		os=`echo $os | sed -e 's/windowsnt/winnt/'`
		;;
	-psos*)
		os=-psos
		;;
	-mint | -mint[0-9]*)
		basic_machine=m68k-atari
		os=-mint
		;;
esac

# Decode aliases for certain CPU-COMPANY combinations.
case $basic_machine in
	# Recognize the basic CPU types without company name.
	# Some are omitted here because they have special meanings below.
	1750a | 580 \
	| a29k \
	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
	| am33_2.0 \
	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
	| bfin \
	| c4x | clipper \
	| d10v | d30v | dlx | dsp16xx \
	| fido | fr30 | frv \
	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
	| i370 | i860 | i960 | ia64 \
	| ip2k | iq2000 \
	| m32c | m32r | m32rle | m68000 | m68k | m88k \
	| maxq | mb | microblaze | mcore | mep \
	| mips | mipsbe | mipseb | mipsel | mipsle \
	| mips16 \
	| mips64 | mips64el \
	| mips64vr | mips64vrel \
	| mips64orion | mips64orionel \
	| mips64vr4100 | mips64vr4100el \
	| mips64vr4300 | mips64vr4300el \
	| mips64vr5000 | mips64vr5000el \
	| mips64vr5900 | mips64vr5900el \
	| mipsisa32 | mipsisa32el \
	| mipsisa32r2 | mipsisa32r2el \
	| mipsisa64 | mipsisa64el \
	| mipsisa64r2 | mipsisa64r2el \
	| mipsisa64sb1 | mipsisa64sb1el \
	| mipsisa64sr71k | mipsisa64sr71kel \
	| mipstx39 | mipstx39el \
	| mn10200 | mn10300 \
	| mt \
	| msp430 \
	| nios | nios2 \
	| ns16k | ns32k \
	| or32 \
	| pdp10 | pdp11 | pj | pjl \
	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
	| pyramid \
	| score \
	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
	| sh64 | sh64le \
	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
	| spu | strongarm \
	| tahoe | thumb | tic4x | tic80 | tron \
	| v850 | v850e \
	| we32k \
	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
	| z8k)
		basic_machine=$basic_machine-unknown
		;;
	m6811 | m68hc11 | m6812 | m68hc12)
		# Motorola 68HC11/12.
		basic_machine=$basic_machine-unknown
		os=-none
		;;
	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
		;;
	ms1)
		basic_machine=mt-unknown
		;;

	# We use `pc' rather than `unknown'
	# because (1) that's what they normally are, and
	# (2) the word "unknown" tends to confuse beginning users.
	i*86 | x86_64)
	  basic_machine=$basic_machine-pc
	  ;;
	# Object if more than one company name word.
	*-*-*)
		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
		exit 1
		;;
	# Recognize the basic CPU types with company name.
	580-* \
	| a29k-* \
	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
	| avr-* | avr32-* \
	| bfin-* | bs2000-* \
	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
	| clipper-* | craynv-* | cydra-* \
	| d10v-* | d30v-* | dlx-* \
	| elxsi-* \
	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
	| h8300-* | h8500-* \
	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
	| i*86-* | i860-* | i960-* | ia64-* \
	| ip2k-* | iq2000-* \
	| m32c-* | m32r-* | m32rle-* \
	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
	| m88110-* | m88k-* | maxq-* | mcore-* \
	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
	| mips16-* \
	| mips64-* | mips64el-* \
	| mips64vr-* | mips64vrel-* \
	| mips64orion-* | mips64orionel-* \
	| mips64vr4100-* | mips64vr4100el-* \
	| mips64vr4300-* | mips64vr4300el-* \
	| mips64vr5000-* | mips64vr5000el-* \
	| mips64vr5900-* | mips64vr5900el-* \
	| mipsisa32-* | mipsisa32el-* \
	| mipsisa32r2-* | mipsisa32r2el-* \
	| mipsisa64-* | mipsisa64el-* \
	| mipsisa64r2-* | mipsisa64r2el-* \
	| mipsisa64sb1-* | mipsisa64sb1el-* \
	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
	| mipstx39-* | mipstx39el-* \
	| mmix-* \
	| mt-* \
	| msp430-* \
	| nios-* | nios2-* \
	| none-* | np1-* | ns16k-* | ns32k-* \
	| orion-* \
	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
	| pyramid-* \
	| romp-* | rs6000-* \
	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
	| sparclite-* \
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
	| tahoe-* | thumb-* \
	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
	| tron-* \
	| v850-* | v850e-* | vax-* \
	| we32k-* \
	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
	| xstormy16-* | xtensa-* \
	| ymp-* \
	| z8k-*)
		;;
	# Recognize the various machine names and aliases which stand
	# for a CPU type and a company and sometimes even an OS.
	386bsd)
		basic_machine=i386-unknown
		os=-bsd
		;;
	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
		basic_machine=m68000-att
		;;
	3b*)
		basic_machine=we32k-att
		;;
	a29khif)
		basic_machine=a29k-amd
		os=-udi
		;;
    	abacus)
		basic_machine=abacus-unknown
		;;
	adobe68k)
		basic_machine=m68010-adobe
		os=-scout
		;;
	alliant | fx80)
		basic_machine=fx80-alliant
		;;
	altos | altos3068)
		basic_machine=m68k-altos
		;;
	am29k)
		basic_machine=a29k-none
		os=-bsd
		;;
	amd64)
		basic_machine=x86_64-pc
		;;
	amd64-*)
		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	amdahl)
		basic_machine=580-amdahl
		os=-sysv
		;;
	amiga | amiga-*)
		basic_machine=m68k-unknown
		;;
	amigaos | amigados)
		basic_machine=m68k-unknown
		os=-amigaos
		;;
	amigaunix | amix)
		basic_machine=m68k-unknown
		os=-sysv4
		;;
	apollo68)
		basic_machine=m68k-apollo
		os=-sysv
		;;
	apollo68bsd)
		basic_machine=m68k-apollo
		os=-bsd
		;;
	aux)
		basic_machine=m68k-apple
		os=-aux
		;;
	balance)
		basic_machine=ns32k-sequent
		os=-dynix
		;;
	c90)
		basic_machine=c90-cray
		os=-unicos
		;;
	convex-c1)
		basic_machine=c1-convex
		os=-bsd
		;;
	convex-c2)
		basic_machine=c2-convex
		os=-bsd
		;;
	convex-c32)
		basic_machine=c32-convex
		os=-bsd
		;;
	convex-c34)
		basic_machine=c34-convex
		os=-bsd
		;;
	convex-c38)
		basic_machine=c38-convex
		os=-bsd
		;;
	cray | j90)
		basic_machine=j90-cray
		os=-unicos
		;;
	craynv)
		basic_machine=craynv-cray
		os=-unicosmp
		;;
	cr16c)
		basic_machine=cr16c-unknown
		os=-elf
		;;
	crds | unos)
		basic_machine=m68k-crds
		;;
	crisv32 | crisv32-* | etraxfs*)
		basic_machine=crisv32-axis
		;;
	cris | cris-* | etrax*)
		basic_machine=cris-axis
		;;
	crx)
		basic_machine=crx-unknown
		os=-elf
		;;
	da30 | da30-*)
		basic_machine=m68k-da30
		;;
	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
		basic_machine=mips-dec
		;;
	decsystem10* | dec10*)
		basic_machine=pdp10-dec
		os=-tops10
		;;
	decsystem20* | dec20*)
		basic_machine=pdp10-dec
		os=-tops20
		;;
	delta | 3300 | motorola-3300 | motorola-delta \
	      | 3300-motorola | delta-motorola)
		basic_machine=m68k-motorola
		;;
	delta88)
		basic_machine=m88k-motorola
		os=-sysv3
		;;
	djgpp)
		basic_machine=i586-pc
		os=-msdosdjgpp
		;;
	dpx20 | dpx20-*)
		basic_machine=rs6000-bull
		os=-bosx
		;;
	dpx2* | dpx2*-bull)
		basic_machine=m68k-bull
		os=-sysv3
		;;
	ebmon29k)
		basic_machine=a29k-amd
		os=-ebmon
		;;
	elxsi)
		basic_machine=elxsi-elxsi
		os=-bsd
		;;
	encore | umax | mmax)
		basic_machine=ns32k-encore
		;;
	es1800 | OSE68k | ose68k | ose | OSE)
		basic_machine=m68k-ericsson
		os=-ose
		;;
	fx2800)
		basic_machine=i860-alliant
		;;
	genix)
		basic_machine=ns32k-ns
		;;
	gmicro)
		basic_machine=tron-gmicro
		os=-sysv
		;;
	go32)
		basic_machine=i386-pc
		os=-go32
		;;
	h3050r* | hiux*)
		basic_machine=hppa1.1-hitachi
		os=-hiuxwe2
		;;
	h8300hms)
		basic_machine=h8300-hitachi
		os=-hms
		;;
	h8300xray)
		basic_machine=h8300-hitachi
		os=-xray
		;;
	h8500hms)
		basic_machine=h8500-hitachi
		os=-hms
		;;
	harris)
		basic_machine=m88k-harris
		os=-sysv3
		;;
	hp300-*)
		basic_machine=m68k-hp
		;;
	hp300bsd)
		basic_machine=m68k-hp
		os=-bsd
		;;
	hp300hpux)
		basic_machine=m68k-hp
		os=-hpux
		;;
	hp3k9[0-9][0-9] | hp9[0-9][0-9])
		basic_machine=hppa1.0-hp
		;;
	hp9k2[0-9][0-9] | hp9k31[0-9])
		basic_machine=m68000-hp
		;;
	hp9k3[2-9][0-9])
		basic_machine=m68k-hp
		;;
	hp9k6[0-9][0-9] | hp6[0-9][0-9])
		basic_machine=hppa1.0-hp
		;;
	hp9k7[0-79][0-9] | hp7[0-79][0-9])
		basic_machine=hppa1.1-hp
		;;
	hp9k78[0-9] | hp78[0-9])
		# FIXME: really hppa2.0-hp
		basic_machine=hppa1.1-hp
		;;
	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
		# FIXME: really hppa2.0-hp
		basic_machine=hppa1.1-hp
		;;
	hp9k8[0-9][13679] | hp8[0-9][13679])
		basic_machine=hppa1.1-hp
		;;
	hp9k8[0-9][0-9] | hp8[0-9][0-9])
		basic_machine=hppa1.0-hp
		;;
	hppa-next)
		os=-nextstep3
		;;
	hppaosf)
		basic_machine=hppa1.1-hp
		os=-osf
		;;
	hppro)
		basic_machine=hppa1.1-hp
		os=-proelf
		;;
	i370-ibm* | ibm*)
		basic_machine=i370-ibm
		;;
# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
	i*86v32)
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-sysv32
		;;
	i*86v4*)
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-sysv4
		;;
	i*86v)
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-sysv
		;;
	i*86sol2)
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-solaris2
		;;
	i386mach)
		basic_machine=i386-mach
		os=-mach
		;;
	i386-vsta | vsta)
		basic_machine=i386-unknown
		os=-vsta
		;;
	iris | iris4d)
		basic_machine=mips-sgi
		case $os in
		    -irix*)
			;;
		    *)
			os=-irix4
			;;
		esac
		;;
	isi68 | isi)
		basic_machine=m68k-isi
		os=-sysv
		;;
	m88k-omron*)
		basic_machine=m88k-omron
		;;
	magnum | m3230)
		basic_machine=mips-mips
		os=-sysv
		;;
	merlin)
		basic_machine=ns32k-utek
		os=-sysv
		;;
	mingw32)
		basic_machine=i386-pc
		os=-mingw32
		;;
	mingw32ce)
		basic_machine=arm-unknown
		os=-mingw32ce
		;;
	miniframe)
		basic_machine=m68000-convergent
		;;
	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
		basic_machine=m68k-atari
		os=-mint
		;;
	mips3*-*)
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
		;;
	mips3*)
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
		;;
	monitor)
		basic_machine=m68k-rom68k
		os=-coff
		;;
	morphos)
		basic_machine=powerpc-unknown
		os=-morphos
		;;
	msdos)
		basic_machine=i386-pc
		os=-msdos
		;;
	ms1-*)
		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
		;;
	mvs)
		basic_machine=i370-ibm
		os=-mvs
		;;
	ncr3000)
		basic_machine=i486-ncr
		os=-sysv4
		;;
	netbsd386)
		basic_machine=i386-unknown
		os=-netbsd
		;;
	netwinder)
		basic_machine=armv4l-rebel
		os=-linux
		;;
	news | news700 | news800 | news900)
		basic_machine=m68k-sony
		os=-newsos
		;;
	news1000)
		basic_machine=m68030-sony
		os=-newsos
		;;
	news-3600 | risc-news)
		basic_machine=mips-sony
		os=-newsos
		;;
	necv70)
		basic_machine=v70-nec
		os=-sysv
		;;
	next | m*-next )
		basic_machine=m68k-next
		case $os in
		    -nextstep* )
			;;
		    -ns2*)
		      os=-nextstep2
			;;
		    *)
		      os=-nextstep3
			;;
		esac
		;;
	nh3000)
		basic_machine=m68k-harris
		os=-cxux
		;;
	nh[45]000)
		basic_machine=m88k-harris
		os=-cxux
		;;
	nindy960)
		basic_machine=i960-intel
		os=-nindy
		;;
	mon960)
		basic_machine=i960-intel
		os=-mon960
		;;
	nonstopux)
		basic_machine=mips-compaq
		os=-nonstopux
		;;
	np1)
		basic_machine=np1-gould
		;;
	nsr-tandem)
		basic_machine=nsr-tandem
		;;
	op50n-* | op60c-*)
		basic_machine=hppa1.1-oki
		os=-proelf
		;;
	openrisc | openrisc-*)
		basic_machine=or32-unknown
		;;
	os400)
		basic_machine=powerpc-ibm
		os=-os400
		;;
	OSE68000 | ose68000)
		basic_machine=m68000-ericsson
		os=-ose
		;;
	os68k)
		basic_machine=m68k-none
		os=-os68k
		;;
	pa-hitachi)
		basic_machine=hppa1.1-hitachi
		os=-hiuxwe2
		;;
	paragon)
		basic_machine=i860-intel
		os=-osf
		;;
	pbd)
		basic_machine=sparc-tti
		;;
	pbb)
		basic_machine=m68k-tti
		;;
	pc532 | pc532-*)
		basic_machine=ns32k-pc532
		;;
	pc98)
		basic_machine=i386-pc
		;;
	pc98-*)
		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pentium | p5 | k5 | k6 | nexgen | viac3)
		basic_machine=i586-pc
		;;
	pentiumpro | p6 | 6x86 | athlon | athlon_*)
		basic_machine=i686-pc
		;;
	pentiumii | pentium2 | pentiumiii | pentium3)
		basic_machine=i686-pc
		;;
	pentium4)
		basic_machine=i786-pc
		;;
	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pentiumpro-* | p6-* | 6x86-* | athlon-*)
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pentium4-*)
		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pn)
		basic_machine=pn-gould
		;;
	power)	basic_machine=power-ibm
		;;
	ppc)	basic_machine=powerpc-unknown
		;;
	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	ppcle | powerpclittle | ppc-le | powerpc-little)
		basic_machine=powerpcle-unknown
		;;
	ppcle-* | powerpclittle-*)
		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	ppc64)	basic_machine=powerpc64-unknown
		;;
	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
		basic_machine=powerpc64le-unknown
		;;
	ppc64le-* | powerpc64little-*)
		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	ps2)
		basic_machine=i386-ibm
		;;
	pw32)
		basic_machine=i586-unknown
		os=-pw32
		;;
	rdos)
		basic_machine=i386-pc
		os=-rdos
		;;
	rom68k)
		basic_machine=m68k-rom68k
		os=-coff
		;;
	rm[46]00)
		basic_machine=mips-siemens
		;;
	rtpc | rtpc-*)
		basic_machine=romp-ibm
		;;
	s390 | s390-*)
		basic_machine=s390-ibm
		;;
	s390x | s390x-*)
		basic_machine=s390x-ibm
		;;
	sa29200)
		basic_machine=a29k-amd
		os=-udi
		;;
	sb1)
		basic_machine=mipsisa64sb1-unknown
		;;
	sb1el)
		basic_machine=mipsisa64sb1el-unknown
		;;
	sde)
		basic_machine=mipsisa32-sde
		os=-elf
		;;
	sei)
		basic_machine=mips-sei
		os=-seiux
		;;
	sequent)
		basic_machine=i386-sequent
		;;
	sh)
		basic_machine=sh-hitachi
		os=-hms
		;;
	sh5el)
		basic_machine=sh5le-unknown
		;;
	sh64)
		basic_machine=sh64-unknown
		;;
	sparclite-wrs | simso-wrs)
		basic_machine=sparclite-wrs
		os=-vxworks
		;;
	sps7)
		basic_machine=m68k-bull
		os=-sysv2
		;;
	spur)
		basic_machine=spur-unknown
		;;
	st2000)
		basic_machine=m68k-tandem
		;;
	stratus)
		basic_machine=i860-stratus
		os=-sysv4
		;;
	sun2)
		basic_machine=m68000-sun
		;;
	sun2os3)
		basic_machine=m68000-sun
		os=-sunos3
		;;
	sun2os4)
		basic_machine=m68000-sun
		os=-sunos4
		;;
	sun3os3)
		basic_machine=m68k-sun
		os=-sunos3
		;;
	sun3os4)
		basic_machine=m68k-sun
		os=-sunos4
		;;
	sun4os3)
		basic_machine=sparc-sun
		os=-sunos3
		;;
	sun4os4)
		basic_machine=sparc-sun
		os=-sunos4
		;;
	sun4sol2)
		basic_machine=sparc-sun
		os=-solaris2
		;;
	sun3 | sun3-*)
		basic_machine=m68k-sun
		;;
	sun4)
		basic_machine=sparc-sun
		;;
	sun386 | sun386i | roadrunner)
		basic_machine=i386-sun
		;;
	sv1)
		basic_machine=sv1-cray
		os=-unicos
		;;
	symmetry)
		basic_machine=i386-sequent
		os=-dynix
		;;
	t3e)
		basic_machine=alphaev5-cray
		os=-unicos
		;;
	t90)
		basic_machine=t90-cray
		os=-unicos
		;;
	tic54x | c54x*)
		basic_machine=tic54x-unknown
		os=-coff
		;;
	tic55x | c55x*)
		basic_machine=tic55x-unknown
		os=-coff
		;;
	tic6x | c6x*)
		basic_machine=tic6x-unknown
		os=-coff
		;;
	tx39)
		basic_machine=mipstx39-unknown
		;;
	tx39el)
		basic_machine=mipstx39el-unknown
		;;
	toad1)
		basic_machine=pdp10-xkl
		os=-tops20
		;;
	tower | tower-32)
		basic_machine=m68k-ncr
		;;
	tpf)
		basic_machine=s390x-ibm
		os=-tpf
		;;
	udi29k)
		basic_machine=a29k-amd
		os=-udi
		;;
	ultra3)
		basic_machine=a29k-nyu
		os=-sym1
		;;
	v810 | necv810)
		basic_machine=v810-nec
		os=-none
		;;
	vaxv)
		basic_machine=vax-dec
		os=-sysv
		;;
	vms)
		basic_machine=vax-dec
		os=-vms
		;;
	vpp*|vx|vx-*)
		basic_machine=f301-fujitsu
		;;
	vxworks960)
		basic_machine=i960-wrs
		os=-vxworks
		;;
	vxworks68)
		basic_machine=m68k-wrs
		os=-vxworks
		;;
	vxworks29k)
		basic_machine=a29k-wrs
		os=-vxworks
		;;
	w65*)
		basic_machine=w65-wdc
		os=-none
		;;
	w89k-*)
		basic_machine=hppa1.1-winbond
		os=-proelf
		;;
	xbox)
		basic_machine=i686-pc
		os=-mingw32
		;;
	xps | xps100)
		basic_machine=xps100-honeywell
		;;
	ymp)
		basic_machine=ymp-cray
		os=-unicos
		;;
	z8k-*-coff)
		basic_machine=z8k-unknown
		os=-sim
		;;
	none)
		basic_machine=none-none
		os=-none
		;;

# Here we handle the default manufacturer of certain CPU types.  It is in
# some cases the only manufacturer, in others, it is the most popular.
	w89k)
		basic_machine=hppa1.1-winbond
		;;
	op50n)
		basic_machine=hppa1.1-oki
		;;
	op60c)
		basic_machine=hppa1.1-oki
		;;
	romp)
		basic_machine=romp-ibm
		;;
	mmix)
		basic_machine=mmix-knuth
		;;
	rs6000)
		basic_machine=rs6000-ibm
		;;
	vax)
		basic_machine=vax-dec
		;;
	pdp10)
		# there are many clones, so DEC is not a safe bet
		basic_machine=pdp10-unknown
		;;
	pdp11)
		basic_machine=pdp11-dec
		;;
	we32k)
		basic_machine=we32k-att
		;;
	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
		basic_machine=sh-unknown
		;;
	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
		basic_machine=sparc-sun
		;;
	cydra)
		basic_machine=cydra-cydrome
		;;
	orion)
		basic_machine=orion-highlevel
		;;
	orion105)
		basic_machine=clipper-highlevel
		;;
	mac | mpw | mac-mpw)
		basic_machine=m68k-apple
		;;
	pmac | pmac-mpw)
		basic_machine=powerpc-apple
		;;
	*-unknown)
		# Make sure to match an already-canonicalized machine name.
		;;
	*)
		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
		exit 1
		;;
esac

# Here we canonicalize certain aliases for manufacturers.
case $basic_machine in
	*-digital*)
		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
		;;
	*-commodore*)
		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
		;;
	*)
		;;
esac

# Decode manufacturer-specific aliases for certain operating systems.

if [ x"$os" != x"" ]
then
case $os in
        # First match some system type aliases
        # that might get confused with valid system types.
	# -solaris* is a basic system type, with this one exception.
	-solaris1 | -solaris1.*)
		os=`echo $os | sed -e 's|solaris1|sunos4|'`
		;;
	-solaris)
		os=-solaris2
		;;
	-svr4*)
		os=-sysv4
		;;
	-unixware*)
		os=-sysv4.2uw
		;;
	-gnu/linux*)
		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
		;;
	# First accept the basic system types.
	# The portable systems comes first.
	# Each alternative MUST END IN A *, to match a version number.
	# -sysv* is not here because it comes later, after sysvr4.
	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
	      | -aos* \
	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
	      | -openbsd* | -solidbsd* \
	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
	      | -chorusos* | -chorusrdb* \
	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
	      | -uxpv* | -beos* | -mpeix* | -udk* \
	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
	# Remember, each alternative MUST END IN *, to match a version number.
		;;
	-qnx*)
		case $basic_machine in
		    x86-* | i*86-*)
			;;
		    *)
			os=-nto$os
			;;
		esac
		;;
	-nto-qnx*)
		;;
	-nto*)
		os=`echo $os | sed -e 's|nto|nto-qnx|'`
		;;
	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
		;;
	-mac*)
		os=`echo $os | sed -e 's|mac|macos|'`
		;;
	-linux-dietlibc)
		os=-linux-dietlibc
		;;
	-linux*)
		os=`echo $os | sed -e 's|linux|linux-gnu|'`
		;;
	-sunos5*)
		os=`echo $os | sed -e 's|sunos5|solaris2|'`
		;;
	-sunos6*)
		os=`echo $os | sed -e 's|sunos6|solaris3|'`
		;;
	-opened*)
		os=-openedition
		;;
        -os400*)
		os=-os400
		;;
	-wince*)
		os=-wince
		;;
	-osfrose*)
		os=-osfrose
		;;
	-osf*)
		os=-osf
		;;
	-utek*)
		os=-bsd
		;;
	-dynix*)
		os=-bsd
		;;
	-acis*)
		os=-aos
		;;
	-atheos*)
		os=-atheos
		;;
	-syllable*)
		os=-syllable
		;;
	-386bsd)
		os=-bsd
		;;
	-ctix* | -uts*)
		os=-sysv
		;;
	-nova*)
		os=-rtmk-nova
		;;
	-ns2 )
		os=-nextstep2
		;;
	-nsk*)
		os=-nsk
		;;
	# Preserve the version number of sinix5.
	-sinix5.*)
		os=`echo $os | sed -e 's|sinix|sysv|'`
		;;
	-sinix*)
		os=-sysv4
		;;
        -tpf*)
		os=-tpf
		;;
	-triton*)
		os=-sysv3
		;;
	-oss*)
		os=-sysv3
		;;
	-svr4)
		os=-sysv4
		;;
	-svr3)
		os=-sysv3
		;;
	-sysvr4)
		os=-sysv4
		;;
	# This must come after -sysvr4.
	-sysv*)
		;;
	-ose*)
		os=-ose
		;;
	-es1800*)
		os=-ose
		;;
	-xenix)
		os=-xenix
		;;
	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
		os=-mint
		;;
	-aros*)
		os=-aros
		;;
	-kaos*)
		os=-kaos
		;;
	-zvmoe)
		os=-zvmoe
		;;
	-none)
		;;
	*)
		# Get rid of the `-' at the beginning of $os.
		os=`echo $os | sed 's/[^-]*-//'`
		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
		exit 1
		;;
esac
else

# Here we handle the default operating systems that come with various machines.
# The value should be what the vendor currently ships out the door with their
# machine or put another way, the most popular os provided with the machine.

# Note that if you're going to try to match "-MANUFACTURER" here (say,
# "-sun"), then you have to tell the case statement up towards the top
# that MANUFACTURER isn't an operating system.  Otherwise, code above
# will signal an error saying that MANUFACTURER isn't an operating
# system, and we'll never get to this point.

case $basic_machine in
        score-*)
		os=-elf
		;;
        spu-*)
		os=-elf
		;;
	*-acorn)
		os=-riscix1.2
		;;
	arm*-rebel)
		os=-linux
		;;
	arm*-semi)
		os=-aout
		;;
        c4x-* | tic4x-*)
        	os=-coff
		;;
	# This must come before the *-dec entry.
	pdp10-*)
		os=-tops20
		;;
	pdp11-*)
		os=-none
		;;
	*-dec | vax-*)
		os=-ultrix4.2
		;;
	m68*-apollo)
		os=-domain
		;;
	i386-sun)
		os=-sunos4.0.2
		;;
	m68000-sun)
		os=-sunos3
		# This also exists in the configure program, but was not the
		# default.
		# os=-sunos4
		;;
	m68*-cisco)
		os=-aout
		;;
        mep-*)
		os=-elf
		;;
	mips*-cisco)
		os=-elf
		;;
	mips*-*)
		os=-elf
		;;
	or32-*)
		os=-coff
		;;
	*-tti)	# must be before sparc entry or we get the wrong os.
		os=-sysv3
		;;
	sparc-* | *-sun)
		os=-sunos4.1.1
		;;
	*-be)
		os=-beos
		;;
	*-haiku)
		os=-haiku
		;;
	*-ibm)
		os=-aix
		;;
    	*-knuth)
		os=-mmixware
		;;
	*-wec)
		os=-proelf
		;;
	*-winbond)
		os=-proelf
		;;
	*-oki)
		os=-proelf
		;;
	*-hp)
		os=-hpux
		;;
	*-hitachi)
		os=-hiux
		;;
	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
		os=-sysv
		;;
	*-cbm)
		os=-amigaos
		;;
	*-dg)
		os=-dgux
		;;
	*-dolphin)
		os=-sysv3
		;;
	m68k-ccur)
		os=-rtu
		;;
	m88k-omron*)
		os=-luna
		;;
	*-next )
		os=-nextstep
		;;
	*-sequent)
		os=-ptx
		;;
	*-crds)
		os=-unos
		;;
	*-ns)
		os=-genix
		;;
	i370-*)
		os=-mvs
		;;
	*-next)
		os=-nextstep3
		;;
	*-gould)
		os=-sysv
		;;
	*-highlevel)
		os=-bsd
		;;
	*-encore)
		os=-bsd
		;;
	*-sgi)
		os=-irix
		;;
	*-siemens)
		os=-sysv4
		;;
	*-masscomp)
		os=-rtu
		;;
	f30[01]-fujitsu | f700-fujitsu)
		os=-uxpv
		;;
	*-rom68k)
		os=-coff
		;;
	*-*bug)
		os=-coff
		;;
	*-apple)
		os=-macos
		;;
	*-atari*)
		os=-mint
		;;
	*)
		os=-none
		;;
esac
fi

# Here we handle the case where we know the os, and the CPU type, but not the
# manufacturer.  We pick the logical manufacturer.
vendor=unknown
case $basic_machine in
	*-unknown)
		case $os in
			-riscix*)
				vendor=acorn
				;;
			-sunos*)
				vendor=sun
				;;
			-aix*)
				vendor=ibm
				;;
			-beos*)
				vendor=be
				;;
			-hpux*)
				vendor=hp
				;;
			-mpeix*)
				vendor=hp
				;;
			-hiux*)
				vendor=hitachi
				;;
			-unos*)
				vendor=crds
				;;
			-dgux*)
				vendor=dg
				;;
			-luna*)
				vendor=omron
				;;
			-genix*)
				vendor=ns
				;;
			-mvs* | -opened*)
				vendor=ibm
				;;
			-os400*)
				vendor=ibm
				;;
			-ptx*)
				vendor=sequent
				;;
			-tpf*)
				vendor=ibm
				;;
			-vxsim* | -vxworks* | -windiss*)
				vendor=wrs
				;;
			-aux*)
				vendor=apple
				;;
			-hms*)
				vendor=hitachi
				;;
			-mpw* | -macos*)
				vendor=apple
				;;
			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
				vendor=atari
				;;
			-vos*)
				vendor=stratus
				;;
		esac
		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
		;;
esac

echo $basic_machine$os
exit

# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
# End:


--- NEW FILE import.log ---
stk-4_3_1-6_fc9:F-9:stk-4.3.1-6.fc9.src.rpm:1221819388

stk-4.3.1-cflags-lib.patch:

--- NEW FILE stk-4.3.1-cflags-lib.patch ---
diff -up stk-4.3.1/src/Makefile.in.orig stk-4.3.1/src/Makefile.in
--- stk-4.3.1/src/Makefile.in.orig	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/src/Makefile.in	2008-07-03 23:31:43.000000000 +0200
@@ -38,7 +38,7 @@ endif
 CC       = @CXX@
 DEFS     = @byte_order@
 DEFS    += @debug@
-CFLAGS   = @cflags@
+CFLAGS   = @CFLAGS@
 CFLAGS  += @warn@ $(INCLUDE) -Iinclude
 
 REALTIME = @realtime@
diff -up stk-4.3.1/projects/demo/Makefile.in.orig stk-4.3.1/projects/demo/Makefile.in
--- stk-4.3.1/projects/demo/Makefile.in.orig	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/demo/Makefile.in	2008-07-04 02:02:32.000000000 +0200
@@ -33,7 +33,7 @@ vpath %.h $(INCLUDE)
 CC       = @CXX@
 DEFS     = @byte_order@
 DEFS    += @debug@
-CFLAGS   = @cflags@
+CFLAGS   = @CFLAGS@
 CFLAGS  += @warn@ -I$(INCLUDE) -I../../src/include
 LIBRARY = @LIBS@
 LIBRARY += @frameworks@
--- stk-4.3.1/projects/effects/Makefile.in.orig	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/effects/Makefile.in	2008-07-04 03:08:29.000000000 +0200
@@ -22,7 +22,7 @@ vpath %.h $(INCLUDE)
 CC       = @CXX@
 DEFS     = @byte_order@
 DEFS    += @debug@
-CFLAGS   = @cflags@
+CFLAGS   = @CFLAGS@
 CFLAGS  += @warn@ -I$(INCLUDE) -I../../src/include
 LIBRARY = @LIBS@
 LIBRARY += @frameworks@
--- stk-4.3.1/projects/ragamatic/Makefile.in.orig	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/ragamatic/Makefile.in	2008-07-04 03:10:23.000000000 +0200
@@ -23,7 +23,7 @@ vpath %.h $(INCLUDE)
 CC       = @CXX@
 DEFS     = @byte_order@
 DEFS    += @debug@
-CFLAGS   = @cflags@
+CFLAGS   = @CFLAGS@
 CFLAGS  += @warn@ -I$(INCLUDE) -I../../src/include
 LIBRARY = @LIBS@
 LIBRARY += @frameworks@
diff -up stk-4.3.1/projects/examples/libMakefile.in.orig stk-4.3.1/projects/examples/libMakefile.in
--- stk-4.3.1/projects/examples/libMakefile.in.orig	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/examples/libMakefile.in	2008-08-07 21:16:46.000000000 +0200
@@ -12,7 +12,7 @@ vpath %.h $(INCLUDE)
 CC       = @CXX@
 DEFS     = @byte_order@
 DEFS    += @debug@
-CFLAGS   = @cflags@
+CFLAGS   = @CFLAGS@
 CFLAGS  += @warn@ -I$(INCLUDE) -I../../src/include
 LIBRARY = @LIBS@
 LIBRARY += @frameworks@

stk-4.3.1-header.patch:

--- NEW FILE stk-4.3.1-header.patch ---
--- stk-4.3.1.orig/projects/effects/effects.cpp	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/effects/effects.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -15,6 +15,7 @@
 #include <signal.h>
 #include <iostream>
 #include <algorithm>
+#include <cstring>
 using std::min;
 
 void usage(void) {
--- stk-4.3.1.orig/projects/examples/duplex.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/duplex.cpp	2008-06-16 23:56:00.000000000 +0200
@@ -10,6 +10,8 @@
 
 #include "RtAudio.h"
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
 
 /*
 typedef signed long  MY_TYPE;
--- stk-4.3.1.orig/projects/examples/foursine.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/foursine.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -2,6 +2,7 @@
 
 #include "SineWave.h"
 #include "FileWvOut.h"
+#include <cstdlib>
 
 int main()
 {
--- stk-4.3.1.orig/projects/examples/grains.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/grains.cpp	2008-06-16 23:57:46.000000000 +0200
@@ -4,6 +4,7 @@
 
 #include "Granulate.h"
 #include "RtAudio.h"
+#include <cstdlib>
 
 // This tick() function handles sample computation only.  It will be
 // called automatically when the system needs a new buffer of audio
--- stk-4.3.1.orig/projects/examples/inetIn.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/inetIn.cpp	2008-06-16 23:56:18.000000000 +0200
@@ -30,6 +30,7 @@
 
 #include "InetWvIn.h"
 #include "RtWvOut.h"
+#include <cstdlib>
 
 void usage(void) {
   // Error function in case of incorrect command-line
--- stk-4.3.1.orig/projects/examples/inetOut.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/inetOut.cpp	2008-06-16 23:56:33.000000000 +0200
@@ -19,6 +19,7 @@
 
 #include "FileWvIn.h"
 #include "InetWvOut.h"
+#include <cstdlib>
 
 void usage(void) {
   // Error function in case of incorrect command-line
--- stk-4.3.1.orig/projects/examples/midiprobe.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/midiprobe.cpp	2008-06-16 23:55:29.000000000 +0200
@@ -6,6 +6,7 @@
 
 #include <iostream>
 #include "RtMidi.h"
+#include <cstdlib>
 
 int main()
 {
--- stk-4.3.1.orig/projects/examples/play.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/play.cpp	2008-06-16 23:54:54.000000000 +0200
@@ -18,6 +18,7 @@
 
 #include <signal.h>
 #include <iostream>
+#include <cstdlib>
 
 // Eewww ... global variables! :-)
 bool done;
--- stk-4.3.1.orig/projects/examples/playsmf.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/playsmf.cpp	2008-06-16 23:57:25.000000000 +0200
@@ -7,7 +7,8 @@
 
 #include "MidiFileIn.h"
 #include "RtMidi.h"
-#include <signal.h>
+#include <csignal>
+#include <cstdlib>
 
 bool done = false;
 static void finish(int ignore){ done = true; }
--- stk-4.3.1.orig/projects/examples/record.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/record.cpp	2008-06-16 23:55:10.000000000 +0200
@@ -24,6 +24,7 @@
 
 #include "RtWvIn.h"
 #include "FileWvOut.h"
+#include <cstdlib>
 
 void usage( void ) {
   // Error function in case of incorrect command-line
--- stk-4.3.1.orig/projects/examples/rtsine.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/rtsine.cpp	2008-06-16 23:53:54.000000000 +0200
@@ -2,6 +2,7 @@
 
 #include "SineWave.h"
 #include "RtWvOut.h"
+#include <cstdlib>
 
 int main()
 {
--- stk-4.3.1.orig/projects/examples/sine.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/sine.cpp	2008-06-16 23:54:20.000000000 +0200
@@ -14,6 +14,7 @@
 
 #include "SineWave.h"
 #include "FileWvOut.h"
+#include <cstdlib>
 
 void usage(void) {
   // Error function in case of incorrect command-line
--- stk-4.3.1.orig/projects/examples/sineosc.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/sineosc.cpp	2008-06-16 23:54:38.000000000 +0200
@@ -2,6 +2,7 @@
 
 #include "WaveLoop.h"
 #include "FileWvOut.h"
+#include <cstdlib>
 
 int main()
 {
--- stk-4.3.1.orig/projects/ragamatic/ragamat.cpp	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/ragamatic/ragamat.cpp	2008-06-16 23:59:13.000000000 +0200
@@ -10,9 +10,11 @@
 #include "Messager.h"
 #include "RtAudio.h"
 
-#include <signal.h>
+#include <csignal>
 #include <iostream>
 #include <algorithm>
+#include <cstdlib>
+#include <cstring>
 using std::min;
 
 StkFloat float_random(StkFloat max) // Return random float between 0.0 and max
--- stk-4.3.1.orig/src/FileRead.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/FileRead.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -33,6 +33,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <cmath>
+#include <cstring>
 
 FileRead :: FileRead()
   : fd_(0)
--- stk-4.3.1.orig/src/FileWrite.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/FileWrite.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -23,6 +23,7 @@
 
 #include "FileWrite.h"
 #include <cmath>
+#include <cstring>
 
 const FileWrite::FILE_TYPE FileWrite :: FILE_RAW = 1;
 const FileWrite::FILE_TYPE FileWrite :: FILE_WAV = 2;
--- stk-4.3.1.orig/src/Messager.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/Messager.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -34,6 +34,7 @@
 
 #include "Messager.h"
 #include <iostream>
+#include <algorithm>
 #include "SKINI.msg"
 
 static const int STK_FILE   = 0x1;
--- stk-4.3.1.orig/src/MidiFileIn.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/MidiFileIn.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -17,6 +17,7 @@
 
 #include "MidiFileIn.h"
 #include <iostream>
+#include <cstring>
 
 MidiFileIn :: MidiFileIn( std::string fileName )
 {
--- stk-4.3.1.orig/src/Modal.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/Modal.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -12,6 +12,7 @@
 /***************************************************/
 
 #include "Modal.h"
+#include <cstdlib>
 
 Modal :: Modal(unsigned int modes)
   : nModes_(modes)
--- stk-4.3.1.orig/src/RtAudio.cpp	2007-12-07 09:04:43.000000000 +0100
+++ stk-4.3.1/src/RtAudio.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -42,6 +42,9 @@
 
 #include "RtAudio.h"
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
+#include <climits>
 
 // Static variable definitions.
 const unsigned int RtApi::MAX_SAMPLE_RATES = 14;
--- stk-4.3.1.orig/src/Shakers.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/Shakers.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -54,6 +54,8 @@
 
 #include "Stk.h"
 #include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 int my_random(int max) //  Return Random Int Between 0 and max
 {
--- stk-4.3.1.orig/src/Skini.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/Skini.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -25,6 +25,7 @@
 
 #include "Skini.h"
 #include "SKINI.tbl"
+#include <cstdlib>
 
 Skini :: Skini()
 {
--- stk-4.3.1.orig/src/Stk.cpp	2007-12-06 01:58:28.000000000 +0100
+++ stk-4.3.1/src/Stk.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -51,6 +51,7 @@
 /***************************************************/
 
 #include "Stk.h"
+#include <cstdlib>
 
 StkFloat Stk :: srate_ = (StkFloat) SRATE;
 std::string Stk :: rawwavepath_ = RAWWAVE_PATH;
--- stk-4.3.1.orig/src/TcpClient.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/TcpClient.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -24,6 +24,7 @@
 /***************************************************/
 
 #include "TcpClient.h"
+#include <cstring>
 
 TcpClient :: TcpClient(int port, std::string hostname )
 {
--- stk-4.3.1.orig/src/UdpSocket.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/UdpSocket.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -22,6 +22,7 @@
 /***************************************************/
 
 #include "UdpSocket.h"
+#include <cstring>
 
 UdpSocket :: UdpSocket(int port )
 {
--- stk-4.3.1.orig/src/VoicForm.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/VoicForm.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -30,6 +30,7 @@
 #include "SKINI.msg"
 
 #include <cmath>
+#include <cstring>
 
 VoicForm :: VoicForm() : Instrmnt()
 {
diff -up stk-4.3.1/projects/demo/Md2Skini.cpp.orig stk-4.3.1/projects/demo/Md2Skini.cpp
--- stk-4.3.1/projects/demo/Md2Skini.cpp.orig	2007-12-06 01:58:33.000000000 +0100
+++ stk-4.3.1/projects/demo/Md2Skini.cpp	2008-08-07 20:45:08.000000000 +0200
@@ -12,7 +12,7 @@
 
 #include "RtMidi.h"
 #include "SKINI.msg"
-#include <stdio.h>
+#include <cstdlib>
 #include <iostream>
 #include <string>
 

stk-4.3.1-missing.patch:

--- NEW FILE stk-4.3.1-missing.patch ---
--- /dev/null	2008-06-04 20:47:47.568000746 +0200
+++ stk-4.3.1/projects/demo/Banded	2008-07-04 03:35:48.000000000 +0200
@@ -0,0 +1 @@
+wish < tcl/Banded.tcl | ./demo BandedWG -or -ip

stk-4.3.1-sharedlib.patch:

--- NEW FILE stk-4.3.1-sharedlib.patch ---
diff -up stk-4.3.1/src/Makefile.in.sharedlib stk-4.3.1/src/Makefile.in
--- stk-4.3.1/src/Makefile.in.sharedlib	2008-07-15 21:43:37.000000000 +0200
+++ stk-4.3.1/src/Makefile.in	2008-07-15 21:51:45.000000000 +0200
@@ -2,8 +2,13 @@
 ### libstk Makefile - for various flavors of unix
 
 LIBRARY = libstk.a
+SHAREDLIB = libstk.so
+MAJOR = 4
+RELEASE = 4.3.1
+
 AR = ar -rsc
 RM = /bin/rm
+LN = /bin/ln
 OBJECT_PATH = @object_path@
 vpath %.o $(OBJECT_PATH)
 
@@ -40,6 +45,9 @@ DEFS     = @byte_order@
 DEFS    += @debug@
 CFLAGS   = @CFLAGS@
 CFLAGS  += @warn@ $(INCLUDE) -Iinclude
+CFLAGS  += -fPIC
+LIBS     = @LIBS@
+LIBS    += @frameworks@
 
 REALTIME = @realtime@
 ifeq ($(REALTIME),yes)
@@ -59,12 +67,18 @@ DEFS    += -DRAWWAVE_PATH=\"$(RAWWAVES)\
 %.o : ../src/include/%.cpp
 	$(CC) $(CFLAGS) $(DEFS) -c $(<) -o $(OBJECT_PATH)/$@
 
-all : $(LIBRARY)
+all : $(LIBRARY) $(SHAREDLIB).$(RELEASE)
 
 $(LIBRARY) : $(OBJECTS)
-	/bin/rm -f $(LIBRARY)
+	$(RM) -f $(LIBRARY)
 	$(AR) $(LIBRARY) $(OBJECT_PATH)/*.o
 
+$(SHAREDLIB).$(RELEASE) : $(OBJECTS)
+	$(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
+	$(CC) -fPIC -shared -Wl,-soname,$(SHAREDLIB).$(MAJOR) -o $(@) $(OBJECT_PATH)/*.o $(LIBS)
+	$(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB).$(MAJOR)
+	$(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB)
+
 $(OBJECTS) : Stk.h
 
 clean : 


--- NEW FILE stk.spec ---
Name:           stk
Version:        4.3.1
Release:        6%{?dist}
Summary:        Synthesis ToolKit in C++
Group:          System Environment/Libraries
License:        MIT
URL:            http://ccrma.stanford.edu/software/stk/
Source0:        %{name}-%{version}.stripped.tar.gz
# Original tarfile can be found at %{url}/release/%{name}-%{version}.tar.gz
# We remove legeally questionable files.
Source1:        README.fedora
Source2:        config.guess
Source3:        config.sub
Patch0:         stk-4.3.1-header.patch
Patch1:         stk-4.3.1-cflags-lib.patch
Patch2:         stk-4.3.1-sharedlib.patch
Patch3:         stk-4.3.1-missing.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  alsa-lib-devel
BuildRequires:  jack-audio-connection-kit-devel
BuildRequires:  symlinks


%description
The Synthesis ToolKit in C++ (STK) is a set of open source audio
signal processing and algorithmic synthesis classes written in the C++
programming language. STK was designed to facilitate rapid development
of music synthesis and audio processing software, with an emphasis on
cross-platform functionality, realtime control, ease of use, and
educational example code. The Synthesis ToolKit is extremely portable
(it's mostly platform-independent C and C++ code), and it's completely
user-extensible (all source included, no unusual libraries, and no
hidden drivers). We like to think that this increases the chances that
our programs will still work in another 5-10 years. In fact, the
ToolKit has been working continuously for about 10 years now. STK
currently runs with realtime support (audio and MIDI) on Linux,
Macintosh OS X, and Windows computer platforms. Generic, non-realtime
support has been tested under NeXTStep, Sun, and other platforms and
should work with any standard C++ compiler.


%package devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%package demo
Summary:        Demo applications for %{name}
Group:          System Environment/Libraries
Requires:       tk
Requires:       %{name} = %{version}-%{release}

%description demo
The %{name}-demo package contains the demo applications for the 
C++ Sound Synthesis ToolKit.


%prep
%setup0 -q 
%patch0 -p1 -b .header
%patch1 -p1 -b .cflags
%patch2 -p1 -b .sharedlib
%patch3 -p1

%{__cp} -a %{SOURCE1} README.fedora

# update old aux scripts
%{__rm} -f config.guess config.sub
%{__cp} -a %{SOURCE2} config.guess
%{__cp} -a %{SOURCE3} config.sub


%build
CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS}"
export CFLAGS
%configure --with-jack --with-alsa \
  RAWWAVE_PATH=%{_datadir}/stk/rawwaves/
%{__make} %{?_smp_mflags} -C src
%{__make} %{?_smp_mflags} -C projects/demo libdemo libMd2Skini
%{__make} %{?_smp_mflags} -C projects/examples -f libMakefile
%{__make} %{?_smp_mflags} -C projects/effects libeffects
%{__make} %{?_smp_mflags} -C projects/ragamatic libragamat


%install
%{__rm} -rf %{buildroot}
%{__mkdir_p} \
  %{buildroot}%{_includedir}/stk \
  %{buildroot}%{_libdir} \
  %{buildroot}%{_bindir} \
  %{buildroot}%{_datadir}/stk/rawwaves \
  %{buildroot}%{_datadir}/stk/demo \
  %{buildroot}%{_datadir}/stk/examples \
  %{buildroot}%{_datadir}/stk/effects \
  %{buildroot}%{_datadir}/stk/ragamatic

%{__cp} -p include/* %{buildroot}%{_includedir}/stk 
%{__cp} -pd src/libstk.* %{buildroot}%{_libdir}
%{__cp} -p rawwaves/*.raw %{buildroot}%{_datadir}/stk/rawwaves

%{__cp} -pr projects/demo/tcl %{buildroot}%{_datadir}/stk/demo
%{__cp} -pr projects/demo/scores %{buildroot}%{_datadir}/stk/demo
%{__cp} -p projects/demo/demo %{buildroot}%{_bindir}/stk-demo
%{__cp} -p projects/demo/Md2Skini %{buildroot}%{_bindir}/Md2Skini
for f in Banded Drums Modal Physical Shakers StkDemo Voice ; do
  %{__chmod} +x projects/demo/$f
  %{__sed} -e 's,\./demo,%{_bindir}/stk-demo,' -e '1i#! /bin/sh' \
    -i projects/demo/$f
  %{__cp} -p projects/demo/$f %{buildroot}%{_datadir}/stk/demo
done

%{__cp} -pr projects/examples/midifiles %{buildroot}%{_datadir}/stk/examples
%{__cp} -pr projects/examples/rawwaves %{buildroot}%{_datadir}/stk/examples
%{__cp} -pr projects/examples/scores %{buildroot}%{_datadir}/stk/examples
for f in sine sineosc foursine audioprobe midiprobe duplex play \
    record inetIn inetOut rtsine crtsine bethree controlbee \
    threebees playsmf grains ; do
  %{__cp} -p projects/examples/$f %{buildroot}%{_bindir}/stk-$f
  # absolute links, will be shortened later
  %{__ln_s} %{buildroot}%{_bindir}/stk-$f %{buildroot}%{_datadir}/stk/examples/$f
done

%{__cp} -pr projects/effects/tcl %{buildroot}%{_datadir}/stk/effects
%{__cp} -p projects/effects/effects %{buildroot}%{_bindir}/stk-effects
%{__sed} -e 's,\./effects,%{_bindir}/stk-effects,' -e '1i#! /bin/sh' \
  -i projects/effects/StkEffects
%{__cp} -p projects/effects/StkEffects %{buildroot}%{_datadir}/stk/effects

%{__cp} -pr projects/ragamatic/tcl %{buildroot}%{_datadir}/stk/ragamatic
%{__cp} -pr projects/ragamatic/rawwaves %{buildroot}%{_datadir}/stk/ragamatic
%{__cp} -p projects/ragamatic/ragamat %{buildroot}%{_bindir}/stk-ragamat
%{__sed} -e 's,\./ragamat,%{_bindir}/stk-ragamat,' -e '1i#! /bin/sh' \
  -i projects/ragamatic/Raga
%{__cp} -p projects/ragamatic/Raga %{buildroot}%{_datadir}/stk/ragamatic

# fix encoding
iconv -f iso-8859-1 -t utf-8 doc/doxygen/index.txt \
  -o doc/doxygen/index.txt.tmp
%{__mv} doc/doxygen/index.txt.tmp doc/doxygen/index.txt

# fix symlinks
symlinks -crv %{buildroot}


%clean
%{__rm} -rf %{buildroot}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README
%{_libdir}/libstk.so.*
%{_datadir}/stk/rawwaves


%files devel
%defattr(-,root,root,-)
%doc README doc/* README.fedora
%exclude %{_libdir}/libstk.a
%{_libdir}/libstk.so
%{_includedir}/*


%files demo
%defattr(-,root,root,-)
%doc README README.fedora
%{_bindir}/stk-*
%{_bindir}/Md2Skini
%{_datadir}/stk/demo
%{_datadir}/stk/examples
%{_datadir}/stk/effects
%{_datadir}/stk/ragamatic


%changelog
* Mon Sep 15 2008 Thomas Moschny <thomas.moschny at gmx.de> - 4.3.1-6
- Include updated config.guess and config.sub scripts.

* Tue Sep  9 2008 Thomas Moschny <thomas.moschny at gmx.de> - 4.3.1-5
- Don't ship the static library.

* Sun Sep  7 2008 Thomas Moschny <thomas.moschny at gmx.de> - 4.3.1-4
- Remove all .mid and .ski files from the tarball.
- Add README.fedora.

* Thu Jul 31 2008 Thomas Moschny <thomas.moschny at gmx.de> - 4.3.1-3
- Remove src/include/dsound.h, and src/include/*asio* files from the
  tarball, for legal reasons. Only used on windows anyway.
- Remove src/include/soundcard.h (explicitly forbids modification) and
  disable OSS support.
- Build and pack Md2Skini.
- Build and pack the examples.

* Tue Jul 15 2008 Thomas Moschny <thomas.moschny at gmx.de> - 4.3.1-2
- Update sharedlib patch, fixes alsa problem.
- Fix path for include files in -devel.
- Change path for docs in -devel.

* Sun Jul  6 2008 Thomas Moschny <thomas.moschny at gmx.de> - 4.3.1-1
- New package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stk/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2008 03:15:39 -0000	1.1
+++ .cvsignore	19 Sep 2008 10:19:48 -0000	1.2
@@ -0,0 +1 @@
+stk-4.3.1.stripped.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stk/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 03:15:39 -0000	1.1
+++ sources	19 Sep 2008 10:19:48 -0000	1.2
@@ -0,0 +1 @@
+994b7ff18c821376bfc4989a9f857a6f  stk-4.3.1.stripped.tar.gz



From mhlavink at fedoraproject.org  Fri Sep 19 10:25:11 2008
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 19 Sep 2008 10:25:11 +0000 (UTC)
Subject: rpms/pciutils/devel pciutils-3.0.1-multilib.patch, NONE,
	1.1 pciutils-3.0.1-superh-support.patch, NONE, 1.1 .cvsignore,
	1.16, 1.17 pciutils.spec, 1.61, 1.62 sources, 1.16, 1.17
Message-ID: <20080919102511.D4106700F7@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9928

Modified Files:
	.cvsignore pciutils.spec sources 
Added Files:
	pciutils-3.0.1-multilib.patch 
	pciutils-3.0.1-superh-support.patch 
Log Message:
version 3.0.1, bugfixes: super-h support (#446600), broken libpci.pc (#456469)


pciutils-3.0.1-multilib.patch:

--- NEW FILE pciutils-3.0.1-multilib.patch ---
diff -up pciutils-3.0.1/lib/configure.multilib pciutils-3.0.1/lib/configure
--- pciutils-3.0.1/lib/configure.multilib	2008-08-26 17:08:52.000000000 +0200
+++ pciutils-3.0.1/lib/configure	2008-09-19 11:35:58.964527560 +0200
@@ -45,29 +45,62 @@ sys=`echo $host | sed 's/^\([^-]*\)-\([^
 echo " $host $rel"
 
 c=config.h
+cm=config.h.mk
 m=config.mk
-echo >$c '#define PCI_CONFIG_H'
-echo >$c "#define PCI_ARCH_`echo $cpu | tr '[a-z]' '[A-Z]'`"
-echo >>$c "#define PCI_OS_`echo $sys | tr '[a-z]' '[A-Z]'`"
 echo >$m 'WITH_LIBS='
+cat >$c <<EOF
+#define PCI_CONFIG_H
+#if defined(__x86_64__)
+#define PCI_ARCH_X86_64
+#elif defined(__ia64__)
+#define PCI_ARCH_IA64
+#elif defined(__i386__)
+#define PCI_ARCH_I386
+#define PCI_HAVE_PM_INTEL_CONF
+#elif defined(__ppc64__) || defined(__powerpc64__)
+#define PCI_ARCH_PPC64
+#elif defined(__ppc__)  || defined(__powerpc__)
+#define PCI_ARCH_PPC
+#elif defined(__s390x__)
+define PCI_ARCH_S390X
+#elif defined(__s390__)
+#define PCI_ARCH_S390
+#elif defined(__alpha__)
+#define PCI_ARCH_ALPHA
+#else
+#error Unknown Arch
+#endif
+#define PCI_OS_LINUX
+#define PCI_HAVE_PM_LINUX_SYSFS
+#define PCI_HAVE_PM_LINUX_PROC
+#define PCI_HAVE_LINUX_BYTEORDER_H
+#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"
+#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"
+#define PCI_HAVE_64BIT_ADDRESS
+EOF
+
+rm -f $cm
+echo >$cm "#define PCI_ARCH_`echo $cpu | tr 'a-z' 'A-Z'`"
+echo >>$cm "#define PCI_OS_`echo $sys | tr 'a-z' 'A-Z'`"
 
 echo_n "Looking for access methods..."
+echo_n " sysfs proc"
 LIBRESOLV=-lresolv
 
 case $sys in
 	linux*)
 		echo_n " sysfs proc"
-		echo >>$c '#define PCI_HAVE_PM_LINUX_SYSFS'
-		echo >>$c '#define PCI_HAVE_PM_LINUX_PROC'
-		echo >>$c '#define PCI_HAVE_LINUX_BYTEORDER_H'
-		echo >>$c '#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"'
-		echo >>$c '#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"'
+		echo >>$cm '#define PCI_HAVE_PM_LINUX_SYSFS'
+		echo >>$cm '#define PCI_HAVE_PM_LINUX_PROC'
+		echo >>$cm '#define PCI_HAVE_LINUX_BYTEORDER_H'
+		echo >>$cm '#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"'
+		echo >>$cm '#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"'
 		case $cpu in
 				i386|x86_64)	echo_n " i386-ports"
-						echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'
+						echo >>$cm '#define PCI_HAVE_PM_INTEL_CONF'
 						;;
 		esac
-		echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
+		echo >>$cm '#define PCI_HAVE_64BIT_ADDRESS'
 		;;
 	sunos)
 		case $cpu in
@@ -123,7 +156,7 @@ case $sys in
 		;;
 esac
 
-echo >>$c '#define PCI_HAVE_PM_DUMP'
+echo >>$cm '#define PCI_HAVE_PM_DUMP'
 echo " dump"
 
 echo_n "Checking for zlib support... "
@@ -146,6 +179,7 @@ else
 	echo >>$c '#define PCI_IDS "pci.ids"'
 fi
 echo >>$c "#define PCI_PATH_IDS_DIR \"$IDSDIR\""
+echo >>$cm "#define PCI_PATH_IDS_DIR \"$IDSDIR\""
 
 echo_n "Checking for DNS support... "
 if [ "$DNS" = yes -o "$DNS" = no ] ; then
@@ -160,6 +194,7 @@ else
 fi
 if [ "$DNS" = yes ] ; then
 	echo >>$c "#define PCI_USE_DNS"
+	echo >>$cm "#define PCI_USE_DNS"
 	echo >>$c "#define PCI_ID_DOMAIN \"pci.id.ucw.cz\""
 	echo >>$m "WITH_LIBS+=$LIBRESOLV"
 fi
@@ -182,4 +217,5 @@ fi
 echo >>$m 'PCILIBPC=$(LIBNAME).pc'
 
 echo >>$c "#define PCILIB_VERSION \"$VERSION\""
-sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$c >>$m
+echo >>$cm "#define PCILIB_VERSION \"$VERSION\""
+sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$cm >>$m
\ No newline at end of file

pciutils-3.0.1-superh-support.patch:

--- NEW FILE pciutils-3.0.1-superh-support.patch ---
diff -up pciutils-3.0.1/lib/configure.superh pciutils-3.0.1/lib/configure
--- pciutils-3.0.1/lib/configure.superh	2008-09-19 11:37:51.000000000 +0200
+++ pciutils-3.0.1/lib/configure	2008-09-19 11:38:46.133527866 +0200
@@ -71,6 +71,8 @@ define PCI_ARCH_S390X
 #define PCI_ARCH_SPARC64
 #elif defined(__sparc__)
 #define PCI_ARCH_SPARC
+#elif defined(__sh__)
+#define PCI_ARCH_SH
 #else
 #error Unknown Arch
 #endif


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	2 Jun 2008 05:47:56 -0000	1.16
+++ .cvsignore	19 Sep 2008 10:24:41 -0000	1.17
@@ -1 +1 @@
-pciutils-3.0.0.tar.gz
+pciutils-3.0.1.tar.gz


Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- pciutils.spec	1 Sep 2008 13:06:19 -0000	1.61
+++ pciutils.spec	19 Sep 2008 10:24:41 -0000	1.62
@@ -1,15 +1,16 @@
 Name:		pciutils
-Version:	3.0.0
-Release: 	2%{?dist}
+Version:	3.0.1
+Release: 	1%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch1: 	pciutils-2.2.4-buf.patch
 Patch2:		pciutils-2.1.10-scan.patch
 Patch3: 	pciutils-havepread.patch
 Patch6: 	pciutils-2.2.1-idpath.patch
 Patch7:		pciutils-2.1.99-gcc4.patch
-Patch8: 	pciutils-3.0.0-multilib.patch
+Patch8: 	pciutils-3.0.1-multilib.patch
 Patch9: 	pciutils-dir-d.patch
 Patch10:	pciutils-2.2.10-sparc-support.patch
+Patch11:	pciutils-3.0.1-superh-support.patch
 License:	GPLv2+
 URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,8 @@
 %patch8 -p1 -b .multilib
 %patch9 -p1 -b .dird
 %patch10 -p1 -b .sparc
+%patch11 -p1 -b .superh
+
 sed -i -e 's/^SRC=.*/SRC="http:\/\/pciids.sourceforge.net\/pci.ids"/' update-pciids.sh
 
 %build
@@ -62,6 +65,12 @@
 
 make SHARED="yes" ZLIB="no" STRIP="" OPT="$RPM_OPT_FLAGS" PREFIX="/usr" IDSDIR="/usr/share/hwdata" PCI_IDS="pci.ids" %{?_smp_mflags}
 
+#fix lib vs. lib64 in libpci.pc (static Makefile is used)
+mv lib/libpci.pc lib/libpci.pc.old
+sed <lib/libpci.pc.old >lib/libpci.pc "s|^libdir=.*$|libdir=%{_libdir}|"
+rm lib/libpci.pc.old
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -105,6 +114,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Sep 19 2008 Michal Hlavinka <mhlavink at redhat.com> 3.0.1-1
+- version 3.0.1
+- add support for Super-H (sh3,sh4) (#446600)
+- fix: broken -L in libpci.pc (#456469)
+
 * Mon Sep 01 2008 Harald Hoyer <harald at redhat.com> 3.0.0-2
 - rebuild to eliminate fuzz patches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	2 Jun 2008 05:47:56 -0000	1.16
+++ sources	19 Sep 2008 10:24:41 -0000	1.17
@@ -1 +1 @@
-ba7dd55e568e2ea27b8b8cc2e3d46597  pciutils-3.0.0.tar.gz
+22ebed1ecc928bab51e82b91c6be1d4e  pciutils-3.0.1.tar.gz



From thm at fedoraproject.org  Fri Sep 19 10:26:45 2008
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri, 19 Sep 2008 10:26:45 +0000 (UTC)
Subject: rpms/stk/F-8 README.fedora, NONE, 1.1 config.guess, NONE,
	1.1 config.sub, NONE, 1.1 import.log, NONE,
	1.1 stk-4.3.1-cflags-lib.patch, NONE, 1.1 stk-4.3.1-header.patch,
	NONE, 1.1 stk-4.3.1-missing.patch, NONE,
	1.1 stk-4.3.1-sharedlib.patch, NONE, 1.1 stk.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080919102645.75534700F7@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/stk/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10965/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora config.guess config.sub import.log 
	stk-4.3.1-cflags-lib.patch stk-4.3.1-header.patch 
	stk-4.3.1-missing.patch stk-4.3.1-sharedlib.patch stk.spec 
Log Message:
Initial import to F-8.


--- NEW FILE README.fedora ---
For legal reasons, the following files have been removed from the
original tarfile:

    stk-4.3.1/src/include/dsound.h
    stk-4.3.1/src/include/soundcard.h
    stk-4.3.1/src/include/asio.cpp
    stk-4.3.1/src/include/asiodrivers.cpp
    stk-4.3.1/src/include/asiodrivers.h
    stk-4.3.1/src/include/asiodrvr.h
    stk-4.3.1/src/include/asio.h
    stk-4.3.1/src/include/asiolist.cpp
    stk-4.3.1/src/include/asiolist.h
    stk-4.3.1/src/include/asiosys.h
    stk-4.3.1/src/include/iasiodrv.h
    stk-4.3.1/src/include/iasiothiscallresolver.cpp
    stk-4.3.1/src/include/iasiothiscallresolver.h
    stk-4.3.1/projects/examples/midifiles/bwv772.mid
    stk-4.3.1/projects/examples/midifiles/jesu.mid
    stk-4.3.1/projects/examples/midifiles/tango.mid
    stk-4.3.1/doc/html/tutorial/bachfugue.ski
    stk-4.3.1/doc/html/tutorial/bookert.ski
    stk-4.3.1/projects/demo/scores/bachfugue.ski
    stk-4.3.1/projects/demo/scores/bookert.ski
    stk-4.3.1/projects/demo/scores/chords.ski
    stk-4.3.1/projects/demo/scores/doogie.ski
    stk-4.3.1/projects/demo/scores/drumfunk.ski
    stk-4.3.1/projects/demo/scores/drumtest.ski
    stk-4.3.1/projects/demo/scores/duelingb.ski
    stk-4.3.1/projects/demo/scores/fiddle.ski
    stk-4.3.1/projects/demo/scores/flutbach.ski
    stk-4.3.1/projects/demo/scores/funicula.ski
    stk-4.3.1/projects/demo/scores/funskini.ski
    stk-4.3.1/projects/demo/scores/lacrymos.ski
    stk-4.3.1/projects/demo/scores/mandtune.ski
    stk-4.3.1/projects/demo/scores/marimba2.ski
    stk-4.3.1/projects/demo/scores/marimtst.ski
    stk-4.3.1/projects/demo/scores/misacrio.ski
    stk-4.3.1/projects/demo/scores/morazbel.ski
    stk-4.3.1/projects/demo/scores/organs.ski
    stk-4.3.1/projects/demo/scores/pickdamp.ski
    stk-4.3.1/projects/demo/scores/pictures.ski
    stk-4.3.1/projects/demo/scores/riderson.ski
    stk-4.3.1/projects/demo/scores/scales.ski
    stk-4.3.1/projects/demo/scores/shaktest.ski
    stk-4.3.1/projects/demo/scores/simplgft.ski
    stk-4.3.1/projects/demo/scores/spain.ski
    stk-4.3.1/projects/demo/scores/streetsf.ski
    stk-4.3.1/projects/demo/scores/test.ski
    stk-4.3.1/projects/demo/scores/thecars.ski
    stk-4.3.1/projects/demo/scores/tubebell.ski
    stk-4.3.1/projects/demo/scores/vocaliz.ski
    stk-4.3.1/projects/examples/scores/bachfugue.ski
    stk-4.3.1/projects/examples/scores/bookert.ski


--- NEW FILE config.guess ---
#! /bin/sh
# Attempt to guess a canonical system name.
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
#   Inc.

timestamp='2007-05-17'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# 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.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.


# Originally written by Per Bothner <per at bothner.com>.
# Please send patches to <config-patches at gnu.org>.  Submit a context
# diff and a properly formatted ChangeLog entry.
#
# This script attempts to guess a canonical system name similar to
# config.sub.  If it succeeds, it prints the system name on stdout, and
# exits with 0.  Otherwise, it exits with 1.
#
# The plan is that this can be called by configure scripts if you
# don't specify an explicit build system type.

me=`echo "$0" | sed -e 's,.*/,,'`

usage="\
Usage: $0 [OPTION]

Output the configuration name of the system \`$me' is run on.

Operation modes:
  -h, --help         print this help, then exit
  -t, --time-stamp   print date of last modification, then exit
  -v, --version      print version number, then exit

Report bugs and patches to <config-patches at gnu.org>."

version="\
GNU config.guess ($timestamp)

Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.

This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

help="
Try \`$me --help' for more information."

# Parse command line
while test $# -gt 0 ; do
  case $1 in
    --time-stamp | --time* | -t )
       echo "$timestamp" ; exit ;;
    --version | -v )
       echo "$version" ; exit ;;
    --help | --h* | -h )
       echo "$usage"; exit ;;
    -- )     # Stop option processing
       shift; break ;;
    - )	# Use stdin as input.
       break ;;
    -* )
       echo "$me: invalid option $1$help" >&2
       exit 1 ;;
    * )
       break ;;
  esac
done

if test $# != 0; then
  echo "$me: too many arguments$help" >&2
  exit 1
fi

trap 'exit 1' 1 2 15

# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
# compiler to aid in system detection is discouraged as it requires
# temporary files to be created and, as you can see below, it is a
# headache to deal with in a portable fashion.

# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
# use `HOST_CC' if defined, but it is deprecated.

# Portable tmp directory creation inspired by the Autoconf team.

set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
 { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
dummy=$tmp/dummy ;
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
case $CC_FOR_BUILD,$HOST_CC,$CC in
 ,,)    echo "int x;" > $dummy.c ;
	for c in cc gcc c89 c99 ; do
	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
	     CC_FOR_BUILD="$c"; break ;
	  fi ;
	done ;
	if test x"$CC_FOR_BUILD" = x ; then
	  CC_FOR_BUILD=no_compiler_found ;
	fi
	;;
 ,,*)   CC_FOR_BUILD=$CC ;;
 ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
esac ; set_cc_for_build= ;'

# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi at noc.rutgers.edu 1994-08-24)
if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
	PATH=$PATH:/.attbin ; export PATH
fi

UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown

# Note: order is significant - the case branches are not exclusive.

case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:NetBSD:*:*)
	# NetBSD (nbsd) targets should (where applicable) match one or
	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
	# switched to ELF, *-*-netbsd* would select the old
	# object file format.  This provides both forward
	# compatibility and a consistent mechanism for selecting the
	# object file format.
	#
	# Note: NetBSD doesn't particularly care about the vendor
	# portion of the name.  We always set it to "unknown".
	sysctl="sysctl -n hw.machine_arch"
	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
	case "${UNAME_MACHINE_ARCH}" in
	    armeb) machine=armeb-unknown ;;
	    arm*) machine=arm-unknown ;;
	    sh3el) machine=shl-unknown ;;
	    sh3eb) machine=sh-unknown ;;
	    sh5el) machine=sh5le-unknown ;;
	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
	esac
	# The Operating System including object format, if it has switched
	# to ELF recently, or will in the future.
	case "${UNAME_MACHINE_ARCH}" in
	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
		eval $set_cc_for_build
		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
			| grep __ELF__ >/dev/null
		then
		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
		    # Return netbsd for either.  FIX?
		    os=netbsd
		else
		    os=netbsdelf
		fi
		;;
	    *)
	        os=netbsd
		;;
	esac
	# The OS release
	# Debian GNU/NetBSD machines have a different userland, and
	# thus, need a distinct triplet. However, they do not need
	# kernel version information, so it can be replaced with a
	# suitable tag, in the style of linux-gnu.
	case "${UNAME_VERSION}" in
	    Debian*)
		release='-gnu'
		;;
	    *)
		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
		;;
	esac
	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
	# contains redundant information, the shorter form:
	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
	echo "${machine}-${os}${release}"
	exit ;;
    *:OpenBSD:*:*)
	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
	exit ;;
    *:ekkoBSD:*:*)
	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
	exit ;;
    *:SolidBSD:*:*)
	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
	exit ;;
    macppc:MirBSD:*:*)
	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
	exit ;;
    *:MirBSD:*:*)
	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
	exit ;;
    alpha:OSF1:*:*)
	case $UNAME_RELEASE in
	*4.0)
		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
		;;
	*5.*)
	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
		;;
	esac
	# According to Compaq, /usr/sbin/psrinfo has been available on
	# OSF/1 and Tru64 systems produced since 1995.  I hope that
	# covers most systems running today.  This code pipes the CPU
	# types through head -n 1, so we only detect the type of CPU 0.
	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
	case "$ALPHA_CPU_TYPE" in
	    "EV4 (21064)")
		UNAME_MACHINE="alpha" ;;
	    "EV4.5 (21064)")
		UNAME_MACHINE="alpha" ;;
	    "LCA4 (21066/21068)")
		UNAME_MACHINE="alpha" ;;
	    "EV5 (21164)")
		UNAME_MACHINE="alphaev5" ;;
	    "EV5.6 (21164A)")
		UNAME_MACHINE="alphaev56" ;;
	    "EV5.6 (21164PC)")
		UNAME_MACHINE="alphapca56" ;;
	    "EV5.7 (21164PC)")
		UNAME_MACHINE="alphapca57" ;;
	    "EV6 (21264)")
		UNAME_MACHINE="alphaev6" ;;
	    "EV6.7 (21264A)")
		UNAME_MACHINE="alphaev67" ;;
	    "EV6.8CB (21264C)")
		UNAME_MACHINE="alphaev68" ;;
	    "EV6.8AL (21264B)")
		UNAME_MACHINE="alphaev68" ;;
	    "EV6.8CX (21264D)")
		UNAME_MACHINE="alphaev68" ;;
	    "EV6.9A (21264/EV69A)")
		UNAME_MACHINE="alphaev69" ;;
	    "EV7 (21364)")
		UNAME_MACHINE="alphaev7" ;;
	    "EV7.9 (21364A)")
		UNAME_MACHINE="alphaev79" ;;
	esac
	# A Pn.n version is a patched version.
	# A Vn.n version is a released version.
	# A Tn.n version is a released field test version.
	# A Xn.n version is an unreleased experimental baselevel.
	# 1.2 uses "1.2" for uname -r.
	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
	exit ;;
    Alpha\ *:Windows_NT*:*)
	# How do we know it's Interix rather than the generic POSIX subsystem?
	# Should we change UNAME_MACHINE based on the output of uname instead
	# of the specific Alpha model?
	echo alpha-pc-interix
	exit ;;
    21064:Windows_NT:50:3)
	echo alpha-dec-winnt3.5
	exit ;;
    Amiga*:UNIX_System_V:4.0:*)
	echo m68k-unknown-sysv4
	exit ;;
    *:[Aa]miga[Oo][Ss]:*:*)
	echo ${UNAME_MACHINE}-unknown-amigaos
	exit ;;
    *:[Mm]orph[Oo][Ss]:*:*)
	echo ${UNAME_MACHINE}-unknown-morphos
	exit ;;
    *:OS/390:*:*)
	echo i370-ibm-openedition
	exit ;;
    *:z/VM:*:*)
	echo s390-ibm-zvmoe
	exit ;;
    *:OS400:*:*)
        echo powerpc-ibm-os400
	exit ;;
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
	echo arm-acorn-riscix${UNAME_RELEASE}
	exit ;;
    arm:riscos:*:*|arm:RISCOS:*:*)
	echo arm-unknown-riscos
	exit ;;
    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
	echo hppa1.1-hitachi-hiuxmpp
	exit ;;
    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
	if test "`(/bin/universe) 2>/dev/null`" = att ; then
		echo pyramid-pyramid-sysv3
	else
		echo pyramid-pyramid-bsd
	fi
	exit ;;
    NILE*:*:*:dcosx)
	echo pyramid-pyramid-svr4
	exit ;;
    DRS?6000:unix:4.0:6*)
	echo sparc-icl-nx6
	exit ;;
    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
	case `/usr/bin/uname -p` in
	    sparc) echo sparc-icl-nx7; exit ;;
	esac ;;
    sun4H:SunOS:5.*:*)
	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
	exit ;;
    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
	exit ;;
    i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
	exit ;;
    sun4*:SunOS:6*:*)
	# According to config.sub, this is the proper way to canonicalize
	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
	# it's likely to be more like Solaris than SunOS4.
	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
	exit ;;
    sun4*:SunOS:*:*)
	case "`/usr/bin/arch -k`" in
	    Series*|S4*)
		UNAME_RELEASE=`uname -v`
		;;
	esac
	# Japanese Language versions have a version number like `4.1.3-JL'.
	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
	exit ;;
    sun3*:SunOS:*:*)
	echo m68k-sun-sunos${UNAME_RELEASE}
	exit ;;
    sun*:*:4.2BSD:*)
	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
	case "`/bin/arch`" in
	    sun3)
		echo m68k-sun-sunos${UNAME_RELEASE}
		;;
	    sun4)
		echo sparc-sun-sunos${UNAME_RELEASE}
		;;
	esac
	exit ;;
    aushp:SunOS:*:*)
	echo sparc-auspex-sunos${UNAME_RELEASE}
	exit ;;
    # The situation for MiNT is a little confusing.  The machine name
    # can be virtually everything (everything which is not
    # "atarist" or "atariste" at least should have a processor
    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
    # to the lowercase version "mint" (or "freemint").  Finally
    # the system name "TOS" denotes a system which is actually not
    # MiNT.  But MiNT is downward compatible to TOS, so this should
    # be no problem.
    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
        echo m68k-atari-mint${UNAME_RELEASE}
	exit ;;
    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
	echo m68k-atari-mint${UNAME_RELEASE}
        exit ;;
    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
        echo m68k-atari-mint${UNAME_RELEASE}
	exit ;;
    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
        echo m68k-milan-mint${UNAME_RELEASE}
        exit ;;
    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
        echo m68k-hades-mint${UNAME_RELEASE}
        exit ;;
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
        echo m68k-unknown-mint${UNAME_RELEASE}
        exit ;;
    m68k:machten:*:*)
	echo m68k-apple-machten${UNAME_RELEASE}
	exit ;;
    powerpc:machten:*:*)
	echo powerpc-apple-machten${UNAME_RELEASE}
	exit ;;
    RISC*:Mach:*:*)
	echo mips-dec-mach_bsd4.3
	exit ;;
    RISC*:ULTRIX:*:*)
	echo mips-dec-ultrix${UNAME_RELEASE}
	exit ;;
    VAX*:ULTRIX*:*:*)
	echo vax-dec-ultrix${UNAME_RELEASE}
	exit ;;
    2020:CLIX:*:* | 2430:CLIX:*:*)
	echo clipper-intergraph-clix${UNAME_RELEASE}
	exit ;;
    mips:*:*:UMIPS | mips:*:*:RISCos)
	eval $set_cc_for_build
	sed 's/^	//' << EOF >$dummy.c
#ifdef __cplusplus
#include <stdio.h>  /* for printf() prototype */
	int main (int argc, char *argv[]) {
#else
	int main (argc, argv) int argc; char *argv[]; {
#endif
	#if defined (host_mips) && defined (MIPSEB)
	#if defined (SYSTYPE_SYSV)
	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
	#endif
	#if defined (SYSTYPE_SVR4)
	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
	#endif
	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
	#endif
	#endif
	  exit (-1);
	}
EOF
	$CC_FOR_BUILD -o $dummy $dummy.c &&
	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
	  SYSTEM_NAME=`$dummy $dummyarg` &&
	    { echo "$SYSTEM_NAME"; exit; }
	echo mips-mips-riscos${UNAME_RELEASE}
	exit ;;
    Motorola:PowerMAX_OS:*:*)
	echo powerpc-motorola-powermax
	exit ;;
    Motorola:*:4.3:PL8-*)
	echo powerpc-harris-powermax
	exit ;;
    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
	echo powerpc-harris-powermax
	exit ;;
    Night_Hawk:Power_UNIX:*:*)
	echo powerpc-harris-powerunix
	exit ;;
    m88k:CX/UX:7*:*)
	echo m88k-harris-cxux7
	exit ;;
    m88k:*:4*:R4*)
	echo m88k-motorola-sysv4
	exit ;;
    m88k:*:3*:R3*)
	echo m88k-motorola-sysv3
	exit ;;
    AViiON:dgux:*:*)
        # DG/UX returns AViiON for all architectures
        UNAME_PROCESSOR=`/usr/bin/uname -p`
	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
	then
	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
	       [ ${TARGET_BINARY_INTERFACE}x = x ]
	    then
		echo m88k-dg-dgux${UNAME_RELEASE}
	    else
		echo m88k-dg-dguxbcs${UNAME_RELEASE}
	    fi
	else
	    echo i586-dg-dgux${UNAME_RELEASE}
	fi
 	exit ;;
    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
	echo m88k-dolphin-sysv3
	exit ;;
    M88*:*:R3*:*)
	# Delta 88k system running SVR3
	echo m88k-motorola-sysv3
	exit ;;
    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
	echo m88k-tektronix-sysv3
	exit ;;
    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
	echo m68k-tektronix-bsd
	exit ;;
    *:IRIX*:*:*)
	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
	exit ;;
    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
    i*86:AIX:*:*)
	echo i386-ibm-aix
	exit ;;
    ia64:AIX:*:*)
	if [ -x /usr/bin/oslevel ] ; then
		IBM_REV=`/usr/bin/oslevel`
	else
		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
	fi
	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
	exit ;;
    *:AIX:2:3)
	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
		eval $set_cc_for_build
		sed 's/^		//' << EOF >$dummy.c
		#include <sys/systemcfg.h>

		main()
			{
			if (!__power_pc())
				exit(1);
			puts("powerpc-ibm-aix3.2.5");
			exit(0);
			}
EOF
		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
		then
			echo "$SYSTEM_NAME"
		else
			echo rs6000-ibm-aix3.2.5
		fi
	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
		echo rs6000-ibm-aix3.2.4
	else
		echo rs6000-ibm-aix3.2
	fi
	exit ;;
    *:AIX:*:[45])
	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
		IBM_ARCH=rs6000
	else
		IBM_ARCH=powerpc
	fi
	if [ -x /usr/bin/oslevel ] ; then
		IBM_REV=`/usr/bin/oslevel`
	else
		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
	fi
	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
	exit ;;
    *:AIX:*:*)
	echo rs6000-ibm-aix
	exit ;;
    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
	echo romp-ibm-bsd4.4
	exit ;;
    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
	exit ;;                             # report: romp-ibm BSD 4.3
    *:BOSX:*:*)
	echo rs6000-bull-bosx
	exit ;;
    DPX/2?00:B.O.S.:*:*)
	echo m68k-bull-sysv3
	exit ;;
    9000/[34]??:4.3bsd:1.*:*)
	echo m68k-hp-bsd
	exit ;;
    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
	echo m68k-hp-bsd4.4
	exit ;;
    9000/[34678]??:HP-UX:*:*)
	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
	case "${UNAME_MACHINE}" in
	    9000/31? )            HP_ARCH=m68000 ;;
	    9000/[34]?? )         HP_ARCH=m68k ;;
	    9000/[678][0-9][0-9])
		if [ -x /usr/bin/getconf ]; then
		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                    case "${sc_cpu_version}" in
                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
                      532)                      # CPU_PA_RISC2_0
                        case "${sc_kernel_bits}" in
                          32) HP_ARCH="hppa2.0n" ;;
                          64) HP_ARCH="hppa2.0w" ;;
			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
                        esac ;;
                    esac
		fi
		if [ "${HP_ARCH}" = "" ]; then
		    eval $set_cc_for_build
		    sed 's/^              //' << EOF >$dummy.c

              #define _HPUX_SOURCE
              #include <stdlib.h>
              #include <unistd.h>

              int main ()
              {
              #if defined(_SC_KERNEL_BITS)
                  long bits = sysconf(_SC_KERNEL_BITS);
              #endif
                  long cpu  = sysconf (_SC_CPU_VERSION);

                  switch (cpu)
              	{
              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
              	case CPU_PA_RISC2_0:
              #if defined(_SC_KERNEL_BITS)
              	    switch (bits)
              		{
              		case 64: puts ("hppa2.0w"); break;
              		case 32: puts ("hppa2.0n"); break;
              		default: puts ("hppa2.0"); break;
              		} break;
              #else  /* !defined(_SC_KERNEL_BITS) */
              	    puts ("hppa2.0"); break;
              #endif
              	default: puts ("hppa1.0"); break;
              	}
                  exit (0);
              }
EOF
		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
		    test -z "$HP_ARCH" && HP_ARCH=hppa
		fi ;;
	esac
	if [ ${HP_ARCH} = "hppa2.0w" ]
	then
	    eval $set_cc_for_build

	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
	    # generating 64-bit code.  GNU and HP use different nomenclature:
	    #
	    # $ CC_FOR_BUILD=cc ./config.guess
	    # => hppa2.0w-hp-hpux11.23
	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
	    # => hppa64-hp-hpux11.23

	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
		grep __LP64__ >/dev/null
	    then
		HP_ARCH="hppa2.0w"
	    else
		HP_ARCH="hppa64"
	    fi
	fi
	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
	exit ;;
    ia64:HP-UX:*:*)
	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
	echo ia64-hp-hpux${HPUX_REV}
	exit ;;
    3050*:HI-UX:*:*)
	eval $set_cc_for_build
	sed 's/^	//' << EOF >$dummy.c
	#include <unistd.h>
	int
	main ()
	{
	  long cpu = sysconf (_SC_CPU_VERSION);
	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
	     results, however.  */
	  if (CPU_IS_PA_RISC (cpu))
	    {
	      switch (cpu)
		{
		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
		  default: puts ("hppa-hitachi-hiuxwe2"); break;
		}
	    }
	  else if (CPU_IS_HP_MC68K (cpu))
	    puts ("m68k-hitachi-hiuxwe2");
	  else puts ("unknown-hitachi-hiuxwe2");
	  exit (0);
	}
EOF
	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
		{ echo "$SYSTEM_NAME"; exit; }
	echo unknown-hitachi-hiuxwe2
	exit ;;
    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
	echo hppa1.1-hp-bsd
	exit ;;
    9000/8??:4.3bsd:*:*)
	echo hppa1.0-hp-bsd
	exit ;;
    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
	echo hppa1.0-hp-mpeix
	exit ;;
    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
	echo hppa1.1-hp-osf
	exit ;;
    hp8??:OSF1:*:*)
	echo hppa1.0-hp-osf
	exit ;;
    i*86:OSF1:*:*)
	if [ -x /usr/sbin/sysversion ] ; then
	    echo ${UNAME_MACHINE}-unknown-osf1mk
	else
	    echo ${UNAME_MACHINE}-unknown-osf1
	fi
	exit ;;
    parisc*:Lites*:*:*)
	echo hppa1.1-hp-lites
	exit ;;
    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
	echo c1-convex-bsd
        exit ;;
    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
	if getsysinfo -f scalar_acc
	then echo c32-convex-bsd
	else echo c2-convex-bsd
	fi
        exit ;;
    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
	echo c34-convex-bsd
        exit ;;
    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
	echo c38-convex-bsd
        exit ;;
    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
	echo c4-convex-bsd
        exit ;;
    CRAY*Y-MP:*:*:*)
	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
	exit ;;
    CRAY*[A-Z]90:*:*:*)
	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
	      -e 's/\.[^.]*$/.X/'
	exit ;;
    CRAY*TS:*:*:*)
	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
	exit ;;
    CRAY*T3E:*:*:*)
	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
	exit ;;
    CRAY*SV1:*:*:*)
	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
	exit ;;
    *:UNICOS/mp:*:*)
	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
	exit ;;
    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
        exit ;;
    5000:UNIX_System_V:4.*:*)
        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
	exit ;;
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
	exit ;;
    sparc*:BSD/OS:*:*)
	echo sparc-unknown-bsdi${UNAME_RELEASE}
	exit ;;
    *:BSD/OS:*:*)
	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
	exit ;;
    *:FreeBSD:*:*)
	case ${UNAME_MACHINE} in
	    pc98)
		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
	    amd64)
		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
	    *)
		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
	esac
	exit ;;
    i*:CYGWIN*:*)
	echo ${UNAME_MACHINE}-pc-cygwin
	exit ;;
    *:MINGW*:*)
	echo ${UNAME_MACHINE}-pc-mingw32
	exit ;;
    i*:windows32*:*)
    	# uname -m includes "-pc" on this system.
    	echo ${UNAME_MACHINE}-mingw32
	exit ;;
    i*:PW*:*)
	echo ${UNAME_MACHINE}-pc-pw32
	exit ;;
    *:Interix*:[3456]*)
    	case ${UNAME_MACHINE} in
	    x86) 
		echo i586-pc-interix${UNAME_RELEASE}
		exit ;;
	    EM64T | authenticamd)
		echo x86_64-unknown-interix${UNAME_RELEASE}
		exit ;;
	esac ;;
    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
	echo i${UNAME_MACHINE}-pc-mks
	exit ;;
    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
	# How do we know it's Interix rather than the generic POSIX subsystem?
	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
	# UNAME_MACHINE based on the output of uname instead of i386?
	echo i586-pc-interix
	exit ;;
    i*:UWIN*:*)
	echo ${UNAME_MACHINE}-pc-uwin
	exit ;;
    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
	echo x86_64-unknown-cygwin
	exit ;;
    p*:CYGWIN*:*)
	echo powerpcle-unknown-cygwin
	exit ;;
    prep*:SunOS:5.*:*)
	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
	exit ;;
    *:GNU:*:*)
	# the GNU system
	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
	exit ;;
    *:GNU/*:*:*)
	# other systems with GNU libc and userland
	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
	exit ;;
    i*86:Minix:*:*)
	echo ${UNAME_MACHINE}-pc-minix
	exit ;;
    arm*:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    avr32*:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    cris:Linux:*:*)
	echo cris-axis-linux-gnu
	exit ;;
    crisv32:Linux:*:*)
	echo crisv32-axis-linux-gnu
	exit ;;
    frv:Linux:*:*)
    	echo frv-unknown-linux-gnu
	exit ;;
    ia64:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    m32r*:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    m68*:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    mips:Linux:*:*)
	eval $set_cc_for_build
	sed 's/^	//' << EOF >$dummy.c
	#undef CPU
	#undef mips
	#undef mipsel
	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
	CPU=mipsel
	#else
	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
	CPU=mips
	#else
	CPU=
	#endif
	#endif
EOF
	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
	    /^CPU/{
		s: ::g
		p
	    }'`"
	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
	;;
    mips64:Linux:*:*)
	eval $set_cc_for_build
	sed 's/^	//' << EOF >$dummy.c
	#undef CPU
	#undef mips64
	#undef mips64el
	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
	CPU=mips64el
	#else
	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
	CPU=mips64
	#else
	CPU=
	#endif
	#endif
EOF
	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
	    /^CPU/{
		s: ::g
		p
	    }'`"
	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
	;;
    or32:Linux:*:*)
	echo or32-unknown-linux-gnu
	exit ;;
    ppc:Linux:*:*)
	echo powerpc-unknown-linux-gnu
	exit ;;
    ppc64:Linux:*:*)
	echo powerpc64-unknown-linux-gnu
	exit ;;
    alpha:Linux:*:*)
	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
	  EV5)   UNAME_MACHINE=alphaev5 ;;
	  EV56)  UNAME_MACHINE=alphaev56 ;;
	  PCA56) UNAME_MACHINE=alphapca56 ;;
	  PCA57) UNAME_MACHINE=alphapca56 ;;
	  EV6)   UNAME_MACHINE=alphaev6 ;;
	  EV67)  UNAME_MACHINE=alphaev67 ;;
	  EV68*) UNAME_MACHINE=alphaev68 ;;
        esac
	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
	exit ;;
    parisc:Linux:*:* | hppa:Linux:*:*)
	# Look for CPU level
	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
	  *)    echo hppa-unknown-linux-gnu ;;
	esac
	exit ;;
    parisc64:Linux:*:* | hppa64:Linux:*:*)
	echo hppa64-unknown-linux-gnu
	exit ;;
    s390:Linux:*:* | s390x:Linux:*:*)
	echo ${UNAME_MACHINE}-ibm-linux
	exit ;;
    sh64*:Linux:*:*)
    	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    sh*:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    sparc:Linux:*:* | sparc64:Linux:*:*)
	echo ${UNAME_MACHINE}-unknown-linux-gnu
	exit ;;
    vax:Linux:*:*)
	echo ${UNAME_MACHINE}-dec-linux-gnu
	exit ;;
    x86_64:Linux:*:*)
	echo x86_64-unknown-linux-gnu
	exit ;;
    xtensa:Linux:*:*)
    	echo xtensa-unknown-linux-gnu
	exit ;;
    i*86:Linux:*:*)
	# The BFD linker knows what the default object file format is, so
	# first see if it will tell us. cd to the root directory to prevent
	# problems with other programs or directories called `ld' in the path.
	# Set LC_ALL=C to ensure ld outputs messages in English.
	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
			 | sed -ne '/supported targets:/!d
				    s/[ 	][ 	]*/ /g
				    s/.*supported targets: *//
				    s/ .*//
				    p'`
        case "$ld_supported_targets" in
	  elf32-i386)
		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
		;;
	  a.out-i386-linux)
		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
		exit ;;
	  coff-i386)
		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
		exit ;;
	  "")
		# Either a pre-BFD a.out linker (linux-gnuoldld) or
		# one that does not give us useful --help.
		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
		exit ;;
	esac
	# Determine whether the default compiler is a.out or elf
	eval $set_cc_for_build
	sed 's/^	//' << EOF >$dummy.c
	#include <features.h>
	#ifdef __ELF__
	# ifdef __GLIBC__
	#  if __GLIBC__ >= 2
	LIBC=gnu
	#  else
	LIBC=gnulibc1
	#  endif
	# else
	LIBC=gnulibc1
	# endif
	#else
	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
	LIBC=gnu
	#else
	LIBC=gnuaout
	#endif
	#endif
	#ifdef __dietlibc__
	LIBC=dietlibc
	#endif
EOF
	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
	    /^LIBC/{
		s: ::g
		p
	    }'`"
	test x"${LIBC}" != x && {
		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
		exit
	}
	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
	;;
    i*86:DYNIX/ptx:4*:*)
	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
	# earlier versions are messed up and put the nodename in both
	# sysname and nodename.
	echo i386-sequent-sysv4
	exit ;;
    i*86:UNIX_SV:4.2MP:2.*)
        # Unixware is an offshoot of SVR4, but it has its own version
        # number series starting with 2...
        # I am not positive that other SVR4 systems won't match this,
	# I just have to hope.  -- rms.
        # Use sysv4.2uw... so that sysv4* matches it.
	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
	exit ;;
    i*86:OS/2:*:*)
	# If we were able to find `uname', then EMX Unix compatibility
	# is probably installed.
	echo ${UNAME_MACHINE}-pc-os2-emx
	exit ;;
    i*86:XTS-300:*:STOP)
	echo ${UNAME_MACHINE}-unknown-stop
	exit ;;
    i*86:atheos:*:*)
	echo ${UNAME_MACHINE}-unknown-atheos
	exit ;;
    i*86:syllable:*:*)
	echo ${UNAME_MACHINE}-pc-syllable
	exit ;;
    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
	echo i386-unknown-lynxos${UNAME_RELEASE}
	exit ;;
    i*86:*DOS:*:*)
	echo ${UNAME_MACHINE}-pc-msdosdjgpp
	exit ;;
    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
	else
		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
	fi
	exit ;;
    i*86:*:5:[678]*)
    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
	case `/bin/uname -X | grep "^Machine"` in
	    *486*)	     UNAME_MACHINE=i486 ;;
	    *Pentium)	     UNAME_MACHINE=i586 ;;
	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
	esac
	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
	exit ;;
    i*86:*:3.2:*)
	if test -f /usr/options/cb.name; then
		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
	elif /bin/uname -X 2>/dev/null >/dev/null ; then
		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
			&& UNAME_MACHINE=i586
		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
			&& UNAME_MACHINE=i686
		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
			&& UNAME_MACHINE=i686
		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
	else
		echo ${UNAME_MACHINE}-pc-sysv32
	fi
	exit ;;
    pc:*:*:*)
	# Left here for compatibility:
        # uname -m prints for DJGPP always 'pc', but it prints nothing about
        # the processor, so we play safe by assuming i386.
	echo i386-pc-msdosdjgpp
        exit ;;
    Intel:Mach:3*:*)
	echo i386-pc-mach3
	exit ;;
    paragon:*:*:*)
	echo i860-intel-osf1
	exit ;;
    i860:*:4.*:*) # i860-SVR4
	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
	else # Add other i860-SVR4 vendors below as they are discovered.
	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
	fi
	exit ;;
    mini*:CTIX:SYS*5:*)
	# "miniframe"
	echo m68010-convergent-sysv
	exit ;;
    mc68k:UNIX:SYSTEM5:3.51m)
	echo m68k-convergent-sysv
	exit ;;
    M680?0:D-NIX:5.3:*)
	echo m68k-diab-dnix
	exit ;;
    M68*:*:R3V[5678]*:*)
	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
	OS_REL=''
	test -r /etc/.relid \
	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
          && { echo i486-ncr-sysv4; exit; } ;;
    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
	echo m68k-unknown-lynxos${UNAME_RELEASE}
	exit ;;
    mc68030:UNIX_System_V:4.*:*)
	echo m68k-atari-sysv4
	exit ;;
    TSUNAMI:LynxOS:2.*:*)
	echo sparc-unknown-lynxos${UNAME_RELEASE}
	exit ;;
    rs6000:LynxOS:2.*:*)
	echo rs6000-unknown-lynxos${UNAME_RELEASE}
	exit ;;
    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
	echo powerpc-unknown-lynxos${UNAME_RELEASE}
	exit ;;
    SM[BE]S:UNIX_SV:*:*)
	echo mips-dde-sysv${UNAME_RELEASE}
	exit ;;
    RM*:ReliantUNIX-*:*:*)
	echo mips-sni-sysv4
	exit ;;
    RM*:SINIX-*:*:*)
	echo mips-sni-sysv4
	exit ;;
    *:SINIX-*:*:*)
	if uname -p 2>/dev/null >/dev/null ; then
		UNAME_MACHINE=`(uname -p) 2>/dev/null`
		echo ${UNAME_MACHINE}-sni-sysv4
	else
		echo ns32k-sni-sysv
	fi
	exit ;;
    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                      # says <Richard.M.Bartel at ccMail.Census.GOV>
        echo i586-unisys-sysv4
        exit ;;
    *:UNIX_System_V:4*:FTX*)
	# From Gerald Hewes <hewes at openmarket.com>.
	# How about differentiating between stratus architectures? -djm
	echo hppa1.1-stratus-sysv4
	exit ;;
    *:*:*:FTX*)
	# From seanf at swdc.stratus.com.
	echo i860-stratus-sysv4
	exit ;;
    i*86:VOS:*:*)
	# From Paul.Green at stratus.com.
	echo ${UNAME_MACHINE}-stratus-vos
	exit ;;
    *:VOS:*:*)
	# From Paul.Green at stratus.com.
	echo hppa1.1-stratus-vos
	exit ;;
    mc68*:A/UX:*:*)
	echo m68k-apple-aux${UNAME_RELEASE}
	exit ;;
    news*:NEWS-OS:6*:*)
	echo mips-sony-newsos6
	exit ;;
    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
	if [ -d /usr/nec ]; then
	        echo mips-nec-sysv${UNAME_RELEASE}
	else
	        echo mips-unknown-sysv${UNAME_RELEASE}
	fi
        exit ;;
    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
	echo powerpc-be-beos
	exit ;;
    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
	echo powerpc-apple-beos
	exit ;;
    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
	echo i586-pc-beos
	exit ;;
    SX-4:SUPER-UX:*:*)
	echo sx4-nec-superux${UNAME_RELEASE}
	exit ;;
    SX-5:SUPER-UX:*:*)
	echo sx5-nec-superux${UNAME_RELEASE}
	exit ;;
    SX-6:SUPER-UX:*:*)
	echo sx6-nec-superux${UNAME_RELEASE}
	exit ;;
    SX-7:SUPER-UX:*:*)
	echo sx7-nec-superux${UNAME_RELEASE}
	exit ;;
    SX-8:SUPER-UX:*:*)
	echo sx8-nec-superux${UNAME_RELEASE}
	exit ;;
    SX-8R:SUPER-UX:*:*)
	echo sx8r-nec-superux${UNAME_RELEASE}
	exit ;;
    Power*:Rhapsody:*:*)
	echo powerpc-apple-rhapsody${UNAME_RELEASE}
	exit ;;
    *:Rhapsody:*:*)
	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
	exit ;;
    *:Darwin:*:*)
	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
	case $UNAME_PROCESSOR in
	    unknown) UNAME_PROCESSOR=powerpc ;;
	esac
	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
	exit ;;
    *:procnto*:*:* | *:QNX:[0123456789]*:*)
	UNAME_PROCESSOR=`uname -p`
	if test "$UNAME_PROCESSOR" = "x86"; then
		UNAME_PROCESSOR=i386
		UNAME_MACHINE=pc
	fi
	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
	exit ;;
    *:QNX:*:4*)
	echo i386-pc-qnx
	exit ;;
    NSE-?:NONSTOP_KERNEL:*:*)
	echo nse-tandem-nsk${UNAME_RELEASE}
	exit ;;
    NSR-?:NONSTOP_KERNEL:*:*)
	echo nsr-tandem-nsk${UNAME_RELEASE}
	exit ;;
    *:NonStop-UX:*:*)
	echo mips-compaq-nonstopux
	exit ;;
    BS2000:POSIX*:*:*)
	echo bs2000-siemens-sysv
	exit ;;
    DS/*:UNIX_System_V:*:*)
	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
	exit ;;
    *:Plan9:*:*)
	# "uname -m" is not consistent, so use $cputype instead. 386
	# is converted to i386 for consistency with other x86
	# operating systems.
	if test "$cputype" = "386"; then
	    UNAME_MACHINE=i386
	else
	    UNAME_MACHINE="$cputype"
	fi
	echo ${UNAME_MACHINE}-unknown-plan9
	exit ;;
    *:TOPS-10:*:*)
	echo pdp10-unknown-tops10
	exit ;;
    *:TENEX:*:*)
	echo pdp10-unknown-tenex
	exit ;;
    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
	echo pdp10-dec-tops20
	exit ;;
    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
	echo pdp10-xkl-tops20
	exit ;;
    *:TOPS-20:*:*)
	echo pdp10-unknown-tops20
	exit ;;
    *:ITS:*:*)
	echo pdp10-unknown-its
	exit ;;
    SEI:*:*:SEIUX)
        echo mips-sei-seiux${UNAME_RELEASE}
	exit ;;
    *:DragonFly:*:*)
	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
	exit ;;
    *:*VMS:*:*)
    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
	case "${UNAME_MACHINE}" in
	    A*) echo alpha-dec-vms ; exit ;;
	    I*) echo ia64-dec-vms ; exit ;;
	    V*) echo vax-dec-vms ; exit ;;
	esac ;;
    *:XENIX:*:SysV)
	echo i386-pc-xenix
	exit ;;
    i*86:skyos:*:*)
	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
	exit ;;
    i*86:rdos:*:*)
	echo ${UNAME_MACHINE}-pc-rdos
	exit ;;
esac

#echo '(No uname command or uname output not recognized.)' 1>&2
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2

eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
# include <sys/types.h>
# include <sys/utsname.h>
#endif
main ()
{
#if defined (sony)
#if defined (MIPSEB)
  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
     I don't know....  */
  printf ("mips-sony-bsd\n"); exit (0);
#else
#include <sys/param.h>
  printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
          "4"
#else
	  ""
#endif
         ); exit (0);
#endif
#endif

#if defined (__arm) && defined (__acorn) && defined (__unix)
  printf ("arm-acorn-riscix\n"); exit (0);
#endif

#if defined (hp300) && !defined (hpux)
  printf ("m68k-hp-bsd\n"); exit (0);
#endif

#if defined (NeXT)
#if !defined (__ARCHITECTURE__)
#define __ARCHITECTURE__ "m68k"
#endif
  int version;
  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
  if (version < 4)
    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
  else
    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
  exit (0);
#endif

#if defined (MULTIMAX) || defined (n16)
#if defined (UMAXV)
  printf ("ns32k-encore-sysv\n"); exit (0);
#else
#if defined (CMU)
  printf ("ns32k-encore-mach\n"); exit (0);
#else
  printf ("ns32k-encore-bsd\n"); exit (0);
#endif
#endif
#endif

#if defined (__386BSD__)
  printf ("i386-pc-bsd\n"); exit (0);
#endif

#if defined (sequent)
#if defined (i386)
  printf ("i386-sequent-dynix\n"); exit (0);
#endif
#if defined (ns32000)
  printf ("ns32k-sequent-dynix\n"); exit (0);
#endif
#endif

#if defined (_SEQUENT_)
    struct utsname un;

    uname(&un);

    if (strncmp(un.version, "V2", 2) == 0) {
	printf ("i386-sequent-ptx2\n"); exit (0);
    }
    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
	printf ("i386-sequent-ptx1\n"); exit (0);
    }
    printf ("i386-sequent-ptx\n"); exit (0);

#endif

#if defined (vax)
# if !defined (ultrix)
#  include <sys/param.h>
#  if defined (BSD)
#   if BSD == 43
      printf ("vax-dec-bsd4.3\n"); exit (0);
#   else
#    if BSD == 199006
      printf ("vax-dec-bsd4.3reno\n"); exit (0);
#    else
      printf ("vax-dec-bsd\n"); exit (0);
#    endif
#   endif
#  else
    printf ("vax-dec-bsd\n"); exit (0);
#  endif
# else
    printf ("vax-dec-ultrix\n"); exit (0);
# endif
#endif

#if defined (alliant) && defined (i860)
  printf ("i860-alliant-bsd\n"); exit (0);
#endif

  exit (1);
}
EOF

$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
	{ echo "$SYSTEM_NAME"; exit; }

# Apollos put the system type in the environment.

test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }

# Convex versions that predate uname can use getsysinfo(1)

if [ -x /usr/convex/getsysinfo ]
then
    case `getsysinfo -f cpu_type` in
    c1*)
	echo c1-convex-bsd
	exit ;;
    c2*)
	if getsysinfo -f scalar_acc
	then echo c32-convex-bsd
	else echo c2-convex-bsd
	fi
	exit ;;
    c34*)
	echo c34-convex-bsd
	exit ;;
    c38*)
	echo c38-convex-bsd
	exit ;;
    c4*)
	echo c4-convex-bsd
	exit ;;
    esac
fi

cat >&2 <<EOF
$0: unable to guess system type

This script, last modified $timestamp, has failed to recognize
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from

  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
and
  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub

If the version you run ($0) is already up to date, please
send the following data and any information you think might be
pertinent to <config-patches at gnu.org> in order to provide the needed
information to handle your system.

config.guess timestamp = $timestamp

uname -m = `(uname -m) 2>/dev/null || echo unknown`
uname -r = `(uname -r) 2>/dev/null || echo unknown`
uname -s = `(uname -s) 2>/dev/null || echo unknown`
uname -v = `(uname -v) 2>/dev/null || echo unknown`

/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`

hostinfo               = `(hostinfo) 2>/dev/null`
/bin/universe          = `(/bin/universe) 2>/dev/null`
/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
/bin/arch              = `(/bin/arch) 2>/dev/null`
/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`

UNAME_MACHINE = ${UNAME_MACHINE}
UNAME_RELEASE = ${UNAME_RELEASE}
UNAME_SYSTEM  = ${UNAME_SYSTEM}
UNAME_VERSION = ${UNAME_VERSION}
EOF

exit 1

# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
# End:


--- NEW FILE config.sub ---
#! /bin/sh
# Configuration validation subroutine script.
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
#   Inc.

timestamp='2007-04-29'

# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine.  It does not imply ALL GNU software can.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# 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.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.


# Please send patches to <config-patches at gnu.org>.  Submit a context
# diff and a properly formatted ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
# Otherwise, we print the canonical config type on stdout and succeed.

# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
# Each package is responsible for reporting which valid configurations
# it does not support.  The user should be able to distinguish
# a failure to support a valid configuration from a meaningless
# configuration.

# The goal of this file is to map all the various variations of a given
# machine specification into a single specification in the form:
#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
# or in some cases, the newer four-part form:
#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# It is wrong to echo any other type of specification.

me=`echo "$0" | sed -e 's,.*/,,'`

usage="\
Usage: $0 [OPTION] CPU-MFR-OPSYS
       $0 [OPTION] ALIAS

Canonicalize a configuration name.

Operation modes:
  -h, --help         print this help, then exit
  -t, --time-stamp   print date of last modification, then exit
  -v, --version      print version number, then exit

Report bugs and patches to <config-patches at gnu.org>."

version="\
GNU config.sub ($timestamp)

Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.

This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

help="
Try \`$me --help' for more information."

# Parse command line
while test $# -gt 0 ; do
  case $1 in
    --time-stamp | --time* | -t )
       echo "$timestamp" ; exit ;;
    --version | -v )
       echo "$version" ; exit ;;
    --help | --h* | -h )
       echo "$usage"; exit ;;
    -- )     # Stop option processing
       shift; break ;;
    - )	# Use stdin as input.
       break ;;
    -* )
       echo "$me: invalid option $1$help"
       exit 1 ;;

    *local*)
       # First pass through any local machine types.
       echo $1
       exit ;;

    * )
       break ;;
  esac
done

case $# in
 0) echo "$me: missing argument$help" >&2
    exit 1;;
 1) ;;
 *) echo "$me: too many arguments$help" >&2
    exit 1;;
esac

# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
  *)
    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
    if [ $basic_machine != $1 ]
    then os=`echo $1 | sed 's/.*-/-/'`
    else os=; fi
    ;;
esac

### Let's recognize common machines as not being operating systems so
### that things like config.sub decstation-3100 work.  We also
### recognize some manufacturers as not being operating systems, so we
### can provide default operating systems below.
case $os in
	-sun*os*)
		# Prevent following clause from handling this invalid input.
		;;
	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
	-apple | -axis | -knuth | -cray)
		os=
		basic_machine=$1
		;;
	-sim | -cisco | -oki | -wec | -winbond)
		os=
		basic_machine=$1
		;;
	-scout)
		;;
	-wrs)
		os=-vxworks
		basic_machine=$1
		;;
	-chorusos*)
		os=-chorusos
		basic_machine=$1
		;;
 	-chorusrdb)
 		os=-chorusrdb
		basic_machine=$1
 		;;
	-hiux*)
		os=-hiuxwe2
		;;
	-sco6)
		os=-sco5v6
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco5)
		os=-sco3.2v5
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco4)
		os=-sco3.2v4
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco3.2.[4-9]*)
		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco3.2v[4-9]*)
		# Don't forget version if it is 3.2v4 or newer.
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco5v6*)
		# Don't forget version if it is 3.2v4 or newer.
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco*)
		os=-sco3.2v2
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-udk*)
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-isc)
		os=-isc2.2
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-clix*)
		basic_machine=clipper-intergraph
		;;
	-isc*)
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-lynx*)
		os=-lynxos
		;;
	-ptx*)
		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
		;;
	-windowsnt*)
		os=`echo $os | sed -e 's/windowsnt/winnt/'`
		;;
	-psos*)
		os=-psos
		;;
	-mint | -mint[0-9]*)
		basic_machine=m68k-atari
		os=-mint
		;;
esac

# Decode aliases for certain CPU-COMPANY combinations.
case $basic_machine in
	# Recognize the basic CPU types without company name.
	# Some are omitted here because they have special meanings below.
	1750a | 580 \
	| a29k \
	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
	| am33_2.0 \
	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
	| bfin \
	| c4x | clipper \
	| d10v | d30v | dlx | dsp16xx \
	| fido | fr30 | frv \
	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
	| i370 | i860 | i960 | ia64 \
	| ip2k | iq2000 \
	| m32c | m32r | m32rle | m68000 | m68k | m88k \
	| maxq | mb | microblaze | mcore | mep \
	| mips | mipsbe | mipseb | mipsel | mipsle \
	| mips16 \
	| mips64 | mips64el \
	| mips64vr | mips64vrel \
	| mips64orion | mips64orionel \
	| mips64vr4100 | mips64vr4100el \
	| mips64vr4300 | mips64vr4300el \
	| mips64vr5000 | mips64vr5000el \
	| mips64vr5900 | mips64vr5900el \
	| mipsisa32 | mipsisa32el \
	| mipsisa32r2 | mipsisa32r2el \
	| mipsisa64 | mipsisa64el \
	| mipsisa64r2 | mipsisa64r2el \
	| mipsisa64sb1 | mipsisa64sb1el \
	| mipsisa64sr71k | mipsisa64sr71kel \
	| mipstx39 | mipstx39el \
	| mn10200 | mn10300 \
	| mt \
	| msp430 \
	| nios | nios2 \
	| ns16k | ns32k \
	| or32 \
	| pdp10 | pdp11 | pj | pjl \
	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
	| pyramid \
	| score \
	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
	| sh64 | sh64le \
	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
	| spu | strongarm \
	| tahoe | thumb | tic4x | tic80 | tron \
	| v850 | v850e \
	| we32k \
	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
	| z8k)
		basic_machine=$basic_machine-unknown
		;;
	m6811 | m68hc11 | m6812 | m68hc12)
		# Motorola 68HC11/12.
		basic_machine=$basic_machine-unknown
		os=-none
		;;
	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
		;;
	ms1)
		basic_machine=mt-unknown
		;;

	# We use `pc' rather than `unknown'
	# because (1) that's what they normally are, and
	# (2) the word "unknown" tends to confuse beginning users.
	i*86 | x86_64)
	  basic_machine=$basic_machine-pc
	  ;;
	# Object if more than one company name word.
	*-*-*)
		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
		exit 1
		;;
	# Recognize the basic CPU types with company name.
	580-* \
	| a29k-* \
	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
	| avr-* | avr32-* \
	| bfin-* | bs2000-* \
	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
	| clipper-* | craynv-* | cydra-* \
	| d10v-* | d30v-* | dlx-* \
	| elxsi-* \
	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
	| h8300-* | h8500-* \
	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
	| i*86-* | i860-* | i960-* | ia64-* \
	| ip2k-* | iq2000-* \
	| m32c-* | m32r-* | m32rle-* \
	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
	| m88110-* | m88k-* | maxq-* | mcore-* \
	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
	| mips16-* \
	| mips64-* | mips64el-* \
	| mips64vr-* | mips64vrel-* \
	| mips64orion-* | mips64orionel-* \
	| mips64vr4100-* | mips64vr4100el-* \
	| mips64vr4300-* | mips64vr4300el-* \
	| mips64vr5000-* | mips64vr5000el-* \
	| mips64vr5900-* | mips64vr5900el-* \
	| mipsisa32-* | mipsisa32el-* \
	| mipsisa32r2-* | mipsisa32r2el-* \
	| mipsisa64-* | mipsisa64el-* \
	| mipsisa64r2-* | mipsisa64r2el-* \
	| mipsisa64sb1-* | mipsisa64sb1el-* \
	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
	| mipstx39-* | mipstx39el-* \
	| mmix-* \
	| mt-* \
	| msp430-* \
	| nios-* | nios2-* \
	| none-* | np1-* | ns16k-* | ns32k-* \
	| orion-* \
	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
	| pyramid-* \
	| romp-* | rs6000-* \
	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
	| sparclite-* \
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
	| tahoe-* | thumb-* \
	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
	| tron-* \
	| v850-* | v850e-* | vax-* \
	| we32k-* \
	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
	| xstormy16-* | xtensa-* \
	| ymp-* \
	| z8k-*)
		;;
	# Recognize the various machine names and aliases which stand
	# for a CPU type and a company and sometimes even an OS.
	386bsd)
		basic_machine=i386-unknown
		os=-bsd
		;;
	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
		basic_machine=m68000-att
		;;
	3b*)
		basic_machine=we32k-att
		;;
	a29khif)
		basic_machine=a29k-amd
		os=-udi
		;;
    	abacus)
		basic_machine=abacus-unknown
		;;
	adobe68k)
		basic_machine=m68010-adobe
		os=-scout
		;;
	alliant | fx80)
		basic_machine=fx80-alliant
		;;
	altos | altos3068)
		basic_machine=m68k-altos
		;;
	am29k)
		basic_machine=a29k-none
		os=-bsd
		;;
	amd64)
		basic_machine=x86_64-pc
		;;
	amd64-*)
		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	amdahl)
		basic_machine=580-amdahl
		os=-sysv
		;;
	amiga | amiga-*)
		basic_machine=m68k-unknown
		;;
	amigaos | amigados)
		basic_machine=m68k-unknown
		os=-amigaos
		;;
	amigaunix | amix)
		basic_machine=m68k-unknown
		os=-sysv4
		;;
	apollo68)
		basic_machine=m68k-apollo
		os=-sysv
		;;
	apollo68bsd)
		basic_machine=m68k-apollo
		os=-bsd
		;;
	aux)
		basic_machine=m68k-apple
		os=-aux
		;;
	balance)
		basic_machine=ns32k-sequent
		os=-dynix
		;;
	c90)
		basic_machine=c90-cray
		os=-unicos
		;;
	convex-c1)
		basic_machine=c1-convex
		os=-bsd
		;;
	convex-c2)
		basic_machine=c2-convex
		os=-bsd
		;;
	convex-c32)
		basic_machine=c32-convex
		os=-bsd
		;;
	convex-c34)
		basic_machine=c34-convex
		os=-bsd
		;;
	convex-c38)
		basic_machine=c38-convex
		os=-bsd
		;;
	cray | j90)
		basic_machine=j90-cray
		os=-unicos
		;;
	craynv)
		basic_machine=craynv-cray
		os=-unicosmp
		;;
	cr16c)
		basic_machine=cr16c-unknown
		os=-elf
		;;
	crds | unos)
		basic_machine=m68k-crds
		;;
	crisv32 | crisv32-* | etraxfs*)
		basic_machine=crisv32-axis
		;;
	cris | cris-* | etrax*)
		basic_machine=cris-axis
		;;
	crx)
		basic_machine=crx-unknown
		os=-elf
		;;
	da30 | da30-*)
		basic_machine=m68k-da30
		;;
	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
		basic_machine=mips-dec
		;;
	decsystem10* | dec10*)
		basic_machine=pdp10-dec
		os=-tops10
		;;
	decsystem20* | dec20*)
		basic_machine=pdp10-dec
		os=-tops20
		;;
	delta | 3300 | motorola-3300 | motorola-delta \
	      | 3300-motorola | delta-motorola)
		basic_machine=m68k-motorola
		;;
	delta88)
		basic_machine=m88k-motorola
		os=-sysv3
		;;
	djgpp)
		basic_machine=i586-pc
		os=-msdosdjgpp
		;;
	dpx20 | dpx20-*)
		basic_machine=rs6000-bull
		os=-bosx
		;;
	dpx2* | dpx2*-bull)
		basic_machine=m68k-bull
		os=-sysv3
		;;
	ebmon29k)
		basic_machine=a29k-amd
		os=-ebmon
		;;
	elxsi)
		basic_machine=elxsi-elxsi
		os=-bsd
		;;
	encore | umax | mmax)
		basic_machine=ns32k-encore
		;;
	es1800 | OSE68k | ose68k | ose | OSE)
		basic_machine=m68k-ericsson
		os=-ose
		;;
	fx2800)
		basic_machine=i860-alliant
		;;
	genix)
		basic_machine=ns32k-ns
		;;
	gmicro)
		basic_machine=tron-gmicro
		os=-sysv
		;;
	go32)
		basic_machine=i386-pc
		os=-go32
		;;
	h3050r* | hiux*)
		basic_machine=hppa1.1-hitachi
		os=-hiuxwe2
		;;
	h8300hms)
		basic_machine=h8300-hitachi
		os=-hms
		;;
	h8300xray)
		basic_machine=h8300-hitachi
		os=-xray
		;;
	h8500hms)
		basic_machine=h8500-hitachi
		os=-hms
		;;
	harris)
		basic_machine=m88k-harris
		os=-sysv3
		;;
	hp300-*)
		basic_machine=m68k-hp
		;;
	hp300bsd)
		basic_machine=m68k-hp
		os=-bsd
		;;
	hp300hpux)
		basic_machine=m68k-hp
		os=-hpux
		;;
	hp3k9[0-9][0-9] | hp9[0-9][0-9])
		basic_machine=hppa1.0-hp
		;;
	hp9k2[0-9][0-9] | hp9k31[0-9])
		basic_machine=m68000-hp
		;;
	hp9k3[2-9][0-9])
		basic_machine=m68k-hp
		;;
	hp9k6[0-9][0-9] | hp6[0-9][0-9])
		basic_machine=hppa1.0-hp
		;;
	hp9k7[0-79][0-9] | hp7[0-79][0-9])
		basic_machine=hppa1.1-hp
		;;
	hp9k78[0-9] | hp78[0-9])
		# FIXME: really hppa2.0-hp
		basic_machine=hppa1.1-hp
		;;
	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
		# FIXME: really hppa2.0-hp
		basic_machine=hppa1.1-hp
		;;
	hp9k8[0-9][13679] | hp8[0-9][13679])
		basic_machine=hppa1.1-hp
		;;
	hp9k8[0-9][0-9] | hp8[0-9][0-9])
		basic_machine=hppa1.0-hp
		;;
	hppa-next)
		os=-nextstep3
		;;
	hppaosf)
		basic_machine=hppa1.1-hp
		os=-osf
		;;
	hppro)
		basic_machine=hppa1.1-hp
		os=-proelf
		;;
	i370-ibm* | ibm*)
		basic_machine=i370-ibm
		;;
# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
	i*86v32)
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-sysv32
		;;
	i*86v4*)
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-sysv4
		;;
	i*86v)
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-sysv
		;;
	i*86sol2)
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-solaris2
		;;
	i386mach)
		basic_machine=i386-mach
		os=-mach
		;;
	i386-vsta | vsta)
		basic_machine=i386-unknown
		os=-vsta
		;;
	iris | iris4d)
		basic_machine=mips-sgi
		case $os in
		    -irix*)
			;;
		    *)
			os=-irix4
			;;
		esac
		;;
	isi68 | isi)
		basic_machine=m68k-isi
		os=-sysv
		;;
	m88k-omron*)
		basic_machine=m88k-omron
		;;
	magnum | m3230)
		basic_machine=mips-mips
		os=-sysv
		;;
	merlin)
		basic_machine=ns32k-utek
		os=-sysv
		;;
	mingw32)
		basic_machine=i386-pc
		os=-mingw32
		;;
	mingw32ce)
		basic_machine=arm-unknown
		os=-mingw32ce
		;;
	miniframe)
		basic_machine=m68000-convergent
		;;
	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
		basic_machine=m68k-atari
		os=-mint
		;;
	mips3*-*)
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
		;;
	mips3*)
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
		;;
	monitor)
		basic_machine=m68k-rom68k
		os=-coff
		;;
	morphos)
		basic_machine=powerpc-unknown
		os=-morphos
		;;
	msdos)
		basic_machine=i386-pc
		os=-msdos
		;;
	ms1-*)
		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
		;;
	mvs)
		basic_machine=i370-ibm
		os=-mvs
		;;
	ncr3000)
		basic_machine=i486-ncr
		os=-sysv4
		;;
	netbsd386)
		basic_machine=i386-unknown
		os=-netbsd
		;;
	netwinder)
		basic_machine=armv4l-rebel
		os=-linux
		;;
	news | news700 | news800 | news900)
		basic_machine=m68k-sony
		os=-newsos
		;;
	news1000)
		basic_machine=m68030-sony
		os=-newsos
		;;
	news-3600 | risc-news)
		basic_machine=mips-sony
		os=-newsos
		;;
	necv70)
		basic_machine=v70-nec
		os=-sysv
		;;
	next | m*-next )
		basic_machine=m68k-next
		case $os in
		    -nextstep* )
			;;
		    -ns2*)
		      os=-nextstep2
			;;
		    *)
		      os=-nextstep3
			;;
		esac
		;;
	nh3000)
		basic_machine=m68k-harris
		os=-cxux
		;;
	nh[45]000)
		basic_machine=m88k-harris
		os=-cxux
		;;
	nindy960)
		basic_machine=i960-intel
		os=-nindy
		;;
	mon960)
		basic_machine=i960-intel
		os=-mon960
		;;
	nonstopux)
		basic_machine=mips-compaq
		os=-nonstopux
		;;
	np1)
		basic_machine=np1-gould
		;;
	nsr-tandem)
		basic_machine=nsr-tandem
		;;
	op50n-* | op60c-*)
		basic_machine=hppa1.1-oki
		os=-proelf
		;;
	openrisc | openrisc-*)
		basic_machine=or32-unknown
		;;
	os400)
		basic_machine=powerpc-ibm
		os=-os400
		;;
	OSE68000 | ose68000)
		basic_machine=m68000-ericsson
		os=-ose
		;;
	os68k)
		basic_machine=m68k-none
		os=-os68k
		;;
	pa-hitachi)
		basic_machine=hppa1.1-hitachi
		os=-hiuxwe2
		;;
	paragon)
		basic_machine=i860-intel
		os=-osf
		;;
	pbd)
		basic_machine=sparc-tti
		;;
	pbb)
		basic_machine=m68k-tti
		;;
	pc532 | pc532-*)
		basic_machine=ns32k-pc532
		;;
	pc98)
		basic_machine=i386-pc
		;;
	pc98-*)
		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pentium | p5 | k5 | k6 | nexgen | viac3)
		basic_machine=i586-pc
		;;
	pentiumpro | p6 | 6x86 | athlon | athlon_*)
		basic_machine=i686-pc
		;;
	pentiumii | pentium2 | pentiumiii | pentium3)
		basic_machine=i686-pc
		;;
	pentium4)
		basic_machine=i786-pc
		;;
	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pentiumpro-* | p6-* | 6x86-* | athlon-*)
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pentium4-*)
		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pn)
		basic_machine=pn-gould
		;;
	power)	basic_machine=power-ibm
		;;
	ppc)	basic_machine=powerpc-unknown
		;;
	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	ppcle | powerpclittle | ppc-le | powerpc-little)
		basic_machine=powerpcle-unknown
		;;
	ppcle-* | powerpclittle-*)
		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	ppc64)	basic_machine=powerpc64-unknown
		;;
	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
		basic_machine=powerpc64le-unknown
		;;
	ppc64le-* | powerpc64little-*)
		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	ps2)
		basic_machine=i386-ibm
		;;
	pw32)
		basic_machine=i586-unknown
		os=-pw32
		;;
	rdos)
		basic_machine=i386-pc
		os=-rdos
		;;
	rom68k)
		basic_machine=m68k-rom68k
		os=-coff
		;;
	rm[46]00)
		basic_machine=mips-siemens
		;;
	rtpc | rtpc-*)
		basic_machine=romp-ibm
		;;
	s390 | s390-*)
		basic_machine=s390-ibm
		;;
	s390x | s390x-*)
		basic_machine=s390x-ibm
		;;
	sa29200)
		basic_machine=a29k-amd
		os=-udi
		;;
	sb1)
		basic_machine=mipsisa64sb1-unknown
		;;
	sb1el)
		basic_machine=mipsisa64sb1el-unknown
		;;
	sde)
		basic_machine=mipsisa32-sde
		os=-elf
		;;
	sei)
		basic_machine=mips-sei
		os=-seiux
		;;
	sequent)
		basic_machine=i386-sequent
		;;
	sh)
		basic_machine=sh-hitachi
		os=-hms
		;;
	sh5el)
		basic_machine=sh5le-unknown
		;;
	sh64)
		basic_machine=sh64-unknown
		;;
	sparclite-wrs | simso-wrs)
		basic_machine=sparclite-wrs
		os=-vxworks
		;;
	sps7)
		basic_machine=m68k-bull
		os=-sysv2
		;;
	spur)
		basic_machine=spur-unknown
		;;
	st2000)
		basic_machine=m68k-tandem
		;;
	stratus)
		basic_machine=i860-stratus
		os=-sysv4
		;;
	sun2)
		basic_machine=m68000-sun
		;;
	sun2os3)
		basic_machine=m68000-sun
		os=-sunos3
		;;
	sun2os4)
		basic_machine=m68000-sun
		os=-sunos4
		;;
	sun3os3)
		basic_machine=m68k-sun
		os=-sunos3
		;;
	sun3os4)
		basic_machine=m68k-sun
		os=-sunos4
		;;
	sun4os3)
		basic_machine=sparc-sun
		os=-sunos3
		;;
	sun4os4)
		basic_machine=sparc-sun
		os=-sunos4
		;;
	sun4sol2)
		basic_machine=sparc-sun
		os=-solaris2
		;;
	sun3 | sun3-*)
		basic_machine=m68k-sun
		;;
	sun4)
		basic_machine=sparc-sun
		;;
	sun386 | sun386i | roadrunner)
		basic_machine=i386-sun
		;;
	sv1)
		basic_machine=sv1-cray
		os=-unicos
		;;
	symmetry)
		basic_machine=i386-sequent
		os=-dynix
		;;
	t3e)
		basic_machine=alphaev5-cray
		os=-unicos
		;;
	t90)
		basic_machine=t90-cray
		os=-unicos
		;;
	tic54x | c54x*)
		basic_machine=tic54x-unknown
		os=-coff
		;;
	tic55x | c55x*)
		basic_machine=tic55x-unknown
		os=-coff
		;;
	tic6x | c6x*)
		basic_machine=tic6x-unknown
		os=-coff
		;;
	tx39)
		basic_machine=mipstx39-unknown
		;;
	tx39el)
		basic_machine=mipstx39el-unknown
		;;
	toad1)
		basic_machine=pdp10-xkl
		os=-tops20
		;;
	tower | tower-32)
		basic_machine=m68k-ncr
		;;
	tpf)
		basic_machine=s390x-ibm
		os=-tpf
		;;
	udi29k)
		basic_machine=a29k-amd
		os=-udi
		;;
	ultra3)
		basic_machine=a29k-nyu
		os=-sym1
		;;
	v810 | necv810)
		basic_machine=v810-nec
		os=-none
		;;
	vaxv)
		basic_machine=vax-dec
		os=-sysv
		;;
	vms)
		basic_machine=vax-dec
		os=-vms
		;;
	vpp*|vx|vx-*)
		basic_machine=f301-fujitsu
		;;
	vxworks960)
		basic_machine=i960-wrs
		os=-vxworks
		;;
	vxworks68)
		basic_machine=m68k-wrs
		os=-vxworks
		;;
	vxworks29k)
		basic_machine=a29k-wrs
		os=-vxworks
		;;
	w65*)
		basic_machine=w65-wdc
		os=-none
		;;
	w89k-*)
		basic_machine=hppa1.1-winbond
		os=-proelf
		;;
	xbox)
		basic_machine=i686-pc
		os=-mingw32
		;;
	xps | xps100)
		basic_machine=xps100-honeywell
		;;
	ymp)
		basic_machine=ymp-cray
		os=-unicos
		;;
	z8k-*-coff)
		basic_machine=z8k-unknown
		os=-sim
		;;
	none)
		basic_machine=none-none
		os=-none
		;;

# Here we handle the default manufacturer of certain CPU types.  It is in
# some cases the only manufacturer, in others, it is the most popular.
	w89k)
		basic_machine=hppa1.1-winbond
		;;
	op50n)
		basic_machine=hppa1.1-oki
		;;
	op60c)
		basic_machine=hppa1.1-oki
		;;
	romp)
		basic_machine=romp-ibm
		;;
	mmix)
		basic_machine=mmix-knuth
		;;
	rs6000)
		basic_machine=rs6000-ibm
		;;
	vax)
		basic_machine=vax-dec
		;;
	pdp10)
		# there are many clones, so DEC is not a safe bet
		basic_machine=pdp10-unknown
		;;
	pdp11)
		basic_machine=pdp11-dec
		;;
	we32k)
		basic_machine=we32k-att
		;;
	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
		basic_machine=sh-unknown
		;;
	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
		basic_machine=sparc-sun
		;;
	cydra)
		basic_machine=cydra-cydrome
		;;
	orion)
		basic_machine=orion-highlevel
		;;
	orion105)
		basic_machine=clipper-highlevel
		;;
	mac | mpw | mac-mpw)
		basic_machine=m68k-apple
		;;
	pmac | pmac-mpw)
		basic_machine=powerpc-apple
		;;
	*-unknown)
		# Make sure to match an already-canonicalized machine name.
		;;
	*)
		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
		exit 1
		;;
esac

# Here we canonicalize certain aliases for manufacturers.
case $basic_machine in
	*-digital*)
		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
		;;
	*-commodore*)
		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
		;;
	*)
		;;
esac

# Decode manufacturer-specific aliases for certain operating systems.

if [ x"$os" != x"" ]
then
case $os in
        # First match some system type aliases
        # that might get confused with valid system types.
	# -solaris* is a basic system type, with this one exception.
	-solaris1 | -solaris1.*)
		os=`echo $os | sed -e 's|solaris1|sunos4|'`
		;;
	-solaris)
		os=-solaris2
		;;
	-svr4*)
		os=-sysv4
		;;
	-unixware*)
		os=-sysv4.2uw
		;;
	-gnu/linux*)
		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
		;;
	# First accept the basic system types.
	# The portable systems comes first.
	# Each alternative MUST END IN A *, to match a version number.
	# -sysv* is not here because it comes later, after sysvr4.
	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
	      | -aos* \
	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
	      | -openbsd* | -solidbsd* \
	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
	      | -chorusos* | -chorusrdb* \
	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
	      | -uxpv* | -beos* | -mpeix* | -udk* \
	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
	# Remember, each alternative MUST END IN *, to match a version number.
		;;
	-qnx*)
		case $basic_machine in
		    x86-* | i*86-*)
			;;
		    *)
			os=-nto$os
			;;
		esac
		;;
	-nto-qnx*)
		;;
	-nto*)
		os=`echo $os | sed -e 's|nto|nto-qnx|'`
		;;
	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
		;;
	-mac*)
		os=`echo $os | sed -e 's|mac|macos|'`
		;;
	-linux-dietlibc)
		os=-linux-dietlibc
		;;
	-linux*)
		os=`echo $os | sed -e 's|linux|linux-gnu|'`
		;;
	-sunos5*)
		os=`echo $os | sed -e 's|sunos5|solaris2|'`
		;;
	-sunos6*)
		os=`echo $os | sed -e 's|sunos6|solaris3|'`
		;;
	-opened*)
		os=-openedition
		;;
        -os400*)
		os=-os400
		;;
	-wince*)
		os=-wince
		;;
	-osfrose*)
		os=-osfrose
		;;
	-osf*)
		os=-osf
		;;
	-utek*)
		os=-bsd
		;;
	-dynix*)
		os=-bsd
		;;
	-acis*)
		os=-aos
		;;
	-atheos*)
		os=-atheos
		;;
	-syllable*)
		os=-syllable
		;;
	-386bsd)
		os=-bsd
		;;
	-ctix* | -uts*)
		os=-sysv
		;;
	-nova*)
		os=-rtmk-nova
		;;
	-ns2 )
		os=-nextstep2
		;;
	-nsk*)
		os=-nsk
		;;
	# Preserve the version number of sinix5.
	-sinix5.*)
		os=`echo $os | sed -e 's|sinix|sysv|'`
		;;
	-sinix*)
		os=-sysv4
		;;
        -tpf*)
		os=-tpf
		;;
	-triton*)
		os=-sysv3
		;;
	-oss*)
		os=-sysv3
		;;
	-svr4)
		os=-sysv4
		;;
	-svr3)
		os=-sysv3
		;;
	-sysvr4)
		os=-sysv4
		;;
	# This must come after -sysvr4.
	-sysv*)
		;;
	-ose*)
		os=-ose
		;;
	-es1800*)
		os=-ose
		;;
	-xenix)
		os=-xenix
		;;
	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
		os=-mint
		;;
	-aros*)
		os=-aros
		;;
	-kaos*)
		os=-kaos
		;;
	-zvmoe)
		os=-zvmoe
		;;
	-none)
		;;
	*)
		# Get rid of the `-' at the beginning of $os.
		os=`echo $os | sed 's/[^-]*-//'`
		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
		exit 1
		;;
esac
else

# Here we handle the default operating systems that come with various machines.
# The value should be what the vendor currently ships out the door with their
# machine or put another way, the most popular os provided with the machine.

# Note that if you're going to try to match "-MANUFACTURER" here (say,
# "-sun"), then you have to tell the case statement up towards the top
# that MANUFACTURER isn't an operating system.  Otherwise, code above
# will signal an error saying that MANUFACTURER isn't an operating
# system, and we'll never get to this point.

case $basic_machine in
        score-*)
		os=-elf
		;;
        spu-*)
		os=-elf
		;;
	*-acorn)
		os=-riscix1.2
		;;
	arm*-rebel)
		os=-linux
		;;
	arm*-semi)
		os=-aout
		;;
        c4x-* | tic4x-*)
        	os=-coff
		;;
	# This must come before the *-dec entry.
	pdp10-*)
		os=-tops20
		;;
	pdp11-*)
		os=-none
		;;
	*-dec | vax-*)
		os=-ultrix4.2
		;;
	m68*-apollo)
		os=-domain
		;;
	i386-sun)
		os=-sunos4.0.2
		;;
	m68000-sun)
		os=-sunos3
		# This also exists in the configure program, but was not the
		# default.
		# os=-sunos4
		;;
	m68*-cisco)
		os=-aout
		;;
        mep-*)
		os=-elf
		;;
	mips*-cisco)
		os=-elf
		;;
	mips*-*)
		os=-elf
		;;
	or32-*)
		os=-coff
		;;
	*-tti)	# must be before sparc entry or we get the wrong os.
		os=-sysv3
		;;
	sparc-* | *-sun)
		os=-sunos4.1.1
		;;
	*-be)
		os=-beos
		;;
	*-haiku)
		os=-haiku
		;;
	*-ibm)
		os=-aix
		;;
    	*-knuth)
		os=-mmixware
		;;
	*-wec)
		os=-proelf
		;;
	*-winbond)
		os=-proelf
		;;
	*-oki)
		os=-proelf
		;;
	*-hp)
		os=-hpux
		;;
	*-hitachi)
		os=-hiux
		;;
	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
		os=-sysv
		;;
	*-cbm)
		os=-amigaos
		;;
	*-dg)
		os=-dgux
		;;
	*-dolphin)
		os=-sysv3
		;;
	m68k-ccur)
		os=-rtu
		;;
	m88k-omron*)
		os=-luna
		;;
	*-next )
		os=-nextstep
		;;
	*-sequent)
		os=-ptx
		;;
	*-crds)
		os=-unos
		;;
	*-ns)
		os=-genix
		;;
	i370-*)
		os=-mvs
		;;
	*-next)
		os=-nextstep3
		;;
	*-gould)
		os=-sysv
		;;
	*-highlevel)
		os=-bsd
		;;
	*-encore)
		os=-bsd
		;;
	*-sgi)
		os=-irix
		;;
	*-siemens)
		os=-sysv4
		;;
	*-masscomp)
		os=-rtu
		;;
	f30[01]-fujitsu | f700-fujitsu)
		os=-uxpv
		;;
	*-rom68k)
		os=-coff
		;;
	*-*bug)
		os=-coff
		;;
	*-apple)
		os=-macos
		;;
	*-atari*)
		os=-mint
		;;
	*)
		os=-none
		;;
esac
fi

# Here we handle the case where we know the os, and the CPU type, but not the
# manufacturer.  We pick the logical manufacturer.
vendor=unknown
case $basic_machine in
	*-unknown)
		case $os in
			-riscix*)
				vendor=acorn
				;;
			-sunos*)
				vendor=sun
				;;
			-aix*)
				vendor=ibm
				;;
			-beos*)
				vendor=be
				;;
			-hpux*)
				vendor=hp
				;;
			-mpeix*)
				vendor=hp
				;;
			-hiux*)
				vendor=hitachi
				;;
			-unos*)
				vendor=crds
				;;
			-dgux*)
				vendor=dg
				;;
			-luna*)
				vendor=omron
				;;
			-genix*)
				vendor=ns
				;;
			-mvs* | -opened*)
				vendor=ibm
				;;
			-os400*)
				vendor=ibm
				;;
			-ptx*)
				vendor=sequent
				;;
			-tpf*)
				vendor=ibm
				;;
			-vxsim* | -vxworks* | -windiss*)
				vendor=wrs
				;;
			-aux*)
				vendor=apple
				;;
			-hms*)
				vendor=hitachi
				;;
			-mpw* | -macos*)
				vendor=apple
				;;
			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
				vendor=atari
				;;
			-vos*)
				vendor=stratus
				;;
		esac
		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
		;;
esac

echo $basic_machine$os
exit

# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
# End:


--- NEW FILE import.log ---
stk-4_3_1-6_fc9:F-8:stk-4.3.1-6.fc9.src.rpm:1221819907

stk-4.3.1-cflags-lib.patch:

--- NEW FILE stk-4.3.1-cflags-lib.patch ---
diff -up stk-4.3.1/src/Makefile.in.orig stk-4.3.1/src/Makefile.in
--- stk-4.3.1/src/Makefile.in.orig	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/src/Makefile.in	2008-07-03 23:31:43.000000000 +0200
@@ -38,7 +38,7 @@ endif
 CC       = @CXX@
 DEFS     = @byte_order@
 DEFS    += @debug@
-CFLAGS   = @cflags@
+CFLAGS   = @CFLAGS@
 CFLAGS  += @warn@ $(INCLUDE) -Iinclude
 
 REALTIME = @realtime@
diff -up stk-4.3.1/projects/demo/Makefile.in.orig stk-4.3.1/projects/demo/Makefile.in
--- stk-4.3.1/projects/demo/Makefile.in.orig	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/demo/Makefile.in	2008-07-04 02:02:32.000000000 +0200
@@ -33,7 +33,7 @@ vpath %.h $(INCLUDE)
 CC       = @CXX@
 DEFS     = @byte_order@
 DEFS    += @debug@
-CFLAGS   = @cflags@
+CFLAGS   = @CFLAGS@
 CFLAGS  += @warn@ -I$(INCLUDE) -I../../src/include
 LIBRARY = @LIBS@
 LIBRARY += @frameworks@
--- stk-4.3.1/projects/effects/Makefile.in.orig	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/effects/Makefile.in	2008-07-04 03:08:29.000000000 +0200
@@ -22,7 +22,7 @@ vpath %.h $(INCLUDE)
 CC       = @CXX@
 DEFS     = @byte_order@
 DEFS    += @debug@
-CFLAGS   = @cflags@
+CFLAGS   = @CFLAGS@
 CFLAGS  += @warn@ -I$(INCLUDE) -I../../src/include
 LIBRARY = @LIBS@
 LIBRARY += @frameworks@
--- stk-4.3.1/projects/ragamatic/Makefile.in.orig	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/ragamatic/Makefile.in	2008-07-04 03:10:23.000000000 +0200
@@ -23,7 +23,7 @@ vpath %.h $(INCLUDE)
 CC       = @CXX@
 DEFS     = @byte_order@
 DEFS    += @debug@
-CFLAGS   = @cflags@
+CFLAGS   = @CFLAGS@
 CFLAGS  += @warn@ -I$(INCLUDE) -I../../src/include
 LIBRARY = @LIBS@
 LIBRARY += @frameworks@
diff -up stk-4.3.1/projects/examples/libMakefile.in.orig stk-4.3.1/projects/examples/libMakefile.in
--- stk-4.3.1/projects/examples/libMakefile.in.orig	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/examples/libMakefile.in	2008-08-07 21:16:46.000000000 +0200
@@ -12,7 +12,7 @@ vpath %.h $(INCLUDE)
 CC       = @CXX@
 DEFS     = @byte_order@
 DEFS    += @debug@
-CFLAGS   = @cflags@
+CFLAGS   = @CFLAGS@
 CFLAGS  += @warn@ -I$(INCLUDE) -I../../src/include
 LIBRARY = @LIBS@
 LIBRARY += @frameworks@

stk-4.3.1-header.patch:

--- NEW FILE stk-4.3.1-header.patch ---
--- stk-4.3.1.orig/projects/effects/effects.cpp	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/effects/effects.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -15,6 +15,7 @@
 #include <signal.h>
 #include <iostream>
 #include <algorithm>
+#include <cstring>
 using std::min;
 
 void usage(void) {
--- stk-4.3.1.orig/projects/examples/duplex.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/duplex.cpp	2008-06-16 23:56:00.000000000 +0200
@@ -10,6 +10,8 @@
 
 #include "RtAudio.h"
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
 
 /*
 typedef signed long  MY_TYPE;
--- stk-4.3.1.orig/projects/examples/foursine.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/foursine.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -2,6 +2,7 @@
 
 #include "SineWave.h"
 #include "FileWvOut.h"
+#include <cstdlib>
 
 int main()
 {
--- stk-4.3.1.orig/projects/examples/grains.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/grains.cpp	2008-06-16 23:57:46.000000000 +0200
@@ -4,6 +4,7 @@
 
 #include "Granulate.h"
 #include "RtAudio.h"
+#include <cstdlib>
 
 // This tick() function handles sample computation only.  It will be
 // called automatically when the system needs a new buffer of audio
--- stk-4.3.1.orig/projects/examples/inetIn.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/inetIn.cpp	2008-06-16 23:56:18.000000000 +0200
@@ -30,6 +30,7 @@
 
 #include "InetWvIn.h"
 #include "RtWvOut.h"
+#include <cstdlib>
 
 void usage(void) {
   // Error function in case of incorrect command-line
--- stk-4.3.1.orig/projects/examples/inetOut.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/inetOut.cpp	2008-06-16 23:56:33.000000000 +0200
@@ -19,6 +19,7 @@
 
 #include "FileWvIn.h"
 #include "InetWvOut.h"
+#include <cstdlib>
 
 void usage(void) {
   // Error function in case of incorrect command-line
--- stk-4.3.1.orig/projects/examples/midiprobe.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/midiprobe.cpp	2008-06-16 23:55:29.000000000 +0200
@@ -6,6 +6,7 @@
 
 #include <iostream>
 #include "RtMidi.h"
+#include <cstdlib>
 
 int main()
 {
--- stk-4.3.1.orig/projects/examples/play.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/play.cpp	2008-06-16 23:54:54.000000000 +0200
@@ -18,6 +18,7 @@
 
 #include <signal.h>
 #include <iostream>
+#include <cstdlib>
 
 // Eewww ... global variables! :-)
 bool done;
--- stk-4.3.1.orig/projects/examples/playsmf.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/playsmf.cpp	2008-06-16 23:57:25.000000000 +0200
@@ -7,7 +7,8 @@
 
 #include "MidiFileIn.h"
 #include "RtMidi.h"
-#include <signal.h>
+#include <csignal>
+#include <cstdlib>
 
 bool done = false;
 static void finish(int ignore){ done = true; }
--- stk-4.3.1.orig/projects/examples/record.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/record.cpp	2008-06-16 23:55:10.000000000 +0200
@@ -24,6 +24,7 @@
 
 #include "RtWvIn.h"
 #include "FileWvOut.h"
+#include <cstdlib>
 
 void usage( void ) {
   // Error function in case of incorrect command-line
--- stk-4.3.1.orig/projects/examples/rtsine.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/rtsine.cpp	2008-06-16 23:53:54.000000000 +0200
@@ -2,6 +2,7 @@
 
 #include "SineWave.h"
 #include "RtWvOut.h"
+#include <cstdlib>
 
 int main()
 {
--- stk-4.3.1.orig/projects/examples/sine.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/sine.cpp	2008-06-16 23:54:20.000000000 +0200
@@ -14,6 +14,7 @@
 
 #include "SineWave.h"
 #include "FileWvOut.h"
+#include <cstdlib>
 
 void usage(void) {
   // Error function in case of incorrect command-line
--- stk-4.3.1.orig/projects/examples/sineosc.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/sineosc.cpp	2008-06-16 23:54:38.000000000 +0200
@@ -2,6 +2,7 @@
 
 #include "WaveLoop.h"
 #include "FileWvOut.h"
+#include <cstdlib>
 
 int main()
 {
--- stk-4.3.1.orig/projects/ragamatic/ragamat.cpp	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/ragamatic/ragamat.cpp	2008-06-16 23:59:13.000000000 +0200
@@ -10,9 +10,11 @@
 #include "Messager.h"
 #include "RtAudio.h"
 
-#include <signal.h>
+#include <csignal>
 #include <iostream>
 #include <algorithm>
+#include <cstdlib>
+#include <cstring>
 using std::min;
 
 StkFloat float_random(StkFloat max) // Return random float between 0.0 and max
--- stk-4.3.1.orig/src/FileRead.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/FileRead.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -33,6 +33,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <cmath>
+#include <cstring>
 
 FileRead :: FileRead()
   : fd_(0)
--- stk-4.3.1.orig/src/FileWrite.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/FileWrite.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -23,6 +23,7 @@
 
 #include "FileWrite.h"
 #include <cmath>
+#include <cstring>
 
 const FileWrite::FILE_TYPE FileWrite :: FILE_RAW = 1;
 const FileWrite::FILE_TYPE FileWrite :: FILE_WAV = 2;
--- stk-4.3.1.orig/src/Messager.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/Messager.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -34,6 +34,7 @@
 
 #include "Messager.h"
 #include <iostream>
+#include <algorithm>
 #include "SKINI.msg"
 
 static const int STK_FILE   = 0x1;
--- stk-4.3.1.orig/src/MidiFileIn.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/MidiFileIn.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -17,6 +17,7 @@
 
 #include "MidiFileIn.h"
 #include <iostream>
+#include <cstring>
 
 MidiFileIn :: MidiFileIn( std::string fileName )
 {
--- stk-4.3.1.orig/src/Modal.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/Modal.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -12,6 +12,7 @@
 /***************************************************/
 
 #include "Modal.h"
+#include <cstdlib>
 
 Modal :: Modal(unsigned int modes)
   : nModes_(modes)
--- stk-4.3.1.orig/src/RtAudio.cpp	2007-12-07 09:04:43.000000000 +0100
+++ stk-4.3.1/src/RtAudio.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -42,6 +42,9 @@
 
 #include "RtAudio.h"
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
+#include <climits>
 
 // Static variable definitions.
 const unsigned int RtApi::MAX_SAMPLE_RATES = 14;
--- stk-4.3.1.orig/src/Shakers.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/Shakers.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -54,6 +54,8 @@
 
 #include "Stk.h"
 #include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 int my_random(int max) //  Return Random Int Between 0 and max
 {
--- stk-4.3.1.orig/src/Skini.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/Skini.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -25,6 +25,7 @@
 
 #include "Skini.h"
 #include "SKINI.tbl"
+#include <cstdlib>
 
 Skini :: Skini()
 {
--- stk-4.3.1.orig/src/Stk.cpp	2007-12-06 01:58:28.000000000 +0100
+++ stk-4.3.1/src/Stk.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -51,6 +51,7 @@
 /***************************************************/
 
 #include "Stk.h"
+#include <cstdlib>
 
 StkFloat Stk :: srate_ = (StkFloat) SRATE;
 std::string Stk :: rawwavepath_ = RAWWAVE_PATH;
--- stk-4.3.1.orig/src/TcpClient.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/TcpClient.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -24,6 +24,7 @@
 /***************************************************/
 
 #include "TcpClient.h"
+#include <cstring>
 
 TcpClient :: TcpClient(int port, std::string hostname )
 {
--- stk-4.3.1.orig/src/UdpSocket.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/UdpSocket.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -22,6 +22,7 @@
 /***************************************************/
 
 #include "UdpSocket.h"
+#include <cstring>
 
 UdpSocket :: UdpSocket(int port )
 {
--- stk-4.3.1.orig/src/VoicForm.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/VoicForm.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -30,6 +30,7 @@
 #include "SKINI.msg"
 
 #include <cmath>
+#include <cstring>
 
 VoicForm :: VoicForm() : Instrmnt()
 {
diff -up stk-4.3.1/projects/demo/Md2Skini.cpp.orig stk-4.3.1/projects/demo/Md2Skini.cpp
--- stk-4.3.1/projects/demo/Md2Skini.cpp.orig	2007-12-06 01:58:33.000000000 +0100
+++ stk-4.3.1/projects/demo/Md2Skini.cpp	2008-08-07 20:45:08.000000000 +0200
@@ -12,7 +12,7 @@
 
 #include "RtMidi.h"
 #include "SKINI.msg"
-#include <stdio.h>
+#include <cstdlib>
 #include <iostream>
 #include <string>
 

stk-4.3.1-missing.patch:

--- NEW FILE stk-4.3.1-missing.patch ---
--- /dev/null	2008-06-04 20:47:47.568000746 +0200
+++ stk-4.3.1/projects/demo/Banded	2008-07-04 03:35:48.000000000 +0200
@@ -0,0 +1 @@
+wish < tcl/Banded.tcl | ./demo BandedWG -or -ip

stk-4.3.1-sharedlib.patch:

--- NEW FILE stk-4.3.1-sharedlib.patch ---
diff -up stk-4.3.1/src/Makefile.in.sharedlib stk-4.3.1/src/Makefile.in
--- stk-4.3.1/src/Makefile.in.sharedlib	2008-07-15 21:43:37.000000000 +0200
+++ stk-4.3.1/src/Makefile.in	2008-07-15 21:51:45.000000000 +0200
@@ -2,8 +2,13 @@
 ### libstk Makefile - for various flavors of unix
 
 LIBRARY = libstk.a
+SHAREDLIB = libstk.so
+MAJOR = 4
+RELEASE = 4.3.1
+
 AR = ar -rsc
 RM = /bin/rm
+LN = /bin/ln
 OBJECT_PATH = @object_path@
 vpath %.o $(OBJECT_PATH)
 
@@ -40,6 +45,9 @@ DEFS     = @byte_order@
 DEFS    += @debug@
 CFLAGS   = @CFLAGS@
 CFLAGS  += @warn@ $(INCLUDE) -Iinclude
+CFLAGS  += -fPIC
+LIBS     = @LIBS@
+LIBS    += @frameworks@
 
 REALTIME = @realtime@
 ifeq ($(REALTIME),yes)
@@ -59,12 +67,18 @@ DEFS    += -DRAWWAVE_PATH=\"$(RAWWAVES)\
 %.o : ../src/include/%.cpp
 	$(CC) $(CFLAGS) $(DEFS) -c $(<) -o $(OBJECT_PATH)/$@
 
-all : $(LIBRARY)
+all : $(LIBRARY) $(SHAREDLIB).$(RELEASE)
 
 $(LIBRARY) : $(OBJECTS)
-	/bin/rm -f $(LIBRARY)
+	$(RM) -f $(LIBRARY)
 	$(AR) $(LIBRARY) $(OBJECT_PATH)/*.o
 
+$(SHAREDLIB).$(RELEASE) : $(OBJECTS)
+	$(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
+	$(CC) -fPIC -shared -Wl,-soname,$(SHAREDLIB).$(MAJOR) -o $(@) $(OBJECT_PATH)/*.o $(LIBS)
+	$(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB).$(MAJOR)
+	$(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB)
+
 $(OBJECTS) : Stk.h
 
 clean : 


--- NEW FILE stk.spec ---
Name:           stk
Version:        4.3.1
Release:        6%{?dist}
Summary:        Synthesis ToolKit in C++
Group:          System Environment/Libraries
License:        MIT
URL:            http://ccrma.stanford.edu/software/stk/
Source0:        %{name}-%{version}.stripped.tar.gz
# Original tarfile can be found at %{url}/release/%{name}-%{version}.tar.gz
# We remove legeally questionable files.
Source1:        README.fedora
Source2:        config.guess
Source3:        config.sub
Patch0:         stk-4.3.1-header.patch
Patch1:         stk-4.3.1-cflags-lib.patch
Patch2:         stk-4.3.1-sharedlib.patch
Patch3:         stk-4.3.1-missing.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  alsa-lib-devel
BuildRequires:  jack-audio-connection-kit-devel
BuildRequires:  symlinks


%description
The Synthesis ToolKit in C++ (STK) is a set of open source audio
signal processing and algorithmic synthesis classes written in the C++
programming language. STK was designed to facilitate rapid development
of music synthesis and audio processing software, with an emphasis on
cross-platform functionality, realtime control, ease of use, and
educational example code. The Synthesis ToolKit is extremely portable
(it's mostly platform-independent C and C++ code), and it's completely
user-extensible (all source included, no unusual libraries, and no
hidden drivers). We like to think that this increases the chances that
our programs will still work in another 5-10 years. In fact, the
ToolKit has been working continuously for about 10 years now. STK
currently runs with realtime support (audio and MIDI) on Linux,
Macintosh OS X, and Windows computer platforms. Generic, non-realtime
support has been tested under NeXTStep, Sun, and other platforms and
should work with any standard C++ compiler.


%package devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%package demo
Summary:        Demo applications for %{name}
Group:          System Environment/Libraries
Requires:       tk
Requires:       %{name} = %{version}-%{release}

%description demo
The %{name}-demo package contains the demo applications for the 
C++ Sound Synthesis ToolKit.


%prep
%setup0 -q 
%patch0 -p1 -b .header
%patch1 -p1 -b .cflags
%patch2 -p1 -b .sharedlib
%patch3 -p1

%{__cp} -a %{SOURCE1} README.fedora

# update old aux scripts
%{__rm} -f config.guess config.sub
%{__cp} -a %{SOURCE2} config.guess
%{__cp} -a %{SOURCE3} config.sub


%build
CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS}"
export CFLAGS
%configure --with-jack --with-alsa \
  RAWWAVE_PATH=%{_datadir}/stk/rawwaves/
%{__make} %{?_smp_mflags} -C src
%{__make} %{?_smp_mflags} -C projects/demo libdemo libMd2Skini
%{__make} %{?_smp_mflags} -C projects/examples -f libMakefile
%{__make} %{?_smp_mflags} -C projects/effects libeffects
%{__make} %{?_smp_mflags} -C projects/ragamatic libragamat


%install
%{__rm} -rf %{buildroot}
%{__mkdir_p} \
  %{buildroot}%{_includedir}/stk \
  %{buildroot}%{_libdir} \
  %{buildroot}%{_bindir} \
  %{buildroot}%{_datadir}/stk/rawwaves \
  %{buildroot}%{_datadir}/stk/demo \
  %{buildroot}%{_datadir}/stk/examples \
  %{buildroot}%{_datadir}/stk/effects \
  %{buildroot}%{_datadir}/stk/ragamatic

%{__cp} -p include/* %{buildroot}%{_includedir}/stk 
%{__cp} -pd src/libstk.* %{buildroot}%{_libdir}
%{__cp} -p rawwaves/*.raw %{buildroot}%{_datadir}/stk/rawwaves

%{__cp} -pr projects/demo/tcl %{buildroot}%{_datadir}/stk/demo
%{__cp} -pr projects/demo/scores %{buildroot}%{_datadir}/stk/demo
%{__cp} -p projects/demo/demo %{buildroot}%{_bindir}/stk-demo
%{__cp} -p projects/demo/Md2Skini %{buildroot}%{_bindir}/Md2Skini
for f in Banded Drums Modal Physical Shakers StkDemo Voice ; do
  %{__chmod} +x projects/demo/$f
  %{__sed} -e 's,\./demo,%{_bindir}/stk-demo,' -e '1i#! /bin/sh' \
    -i projects/demo/$f
  %{__cp} -p projects/demo/$f %{buildroot}%{_datadir}/stk/demo
done

%{__cp} -pr projects/examples/midifiles %{buildroot}%{_datadir}/stk/examples
%{__cp} -pr projects/examples/rawwaves %{buildroot}%{_datadir}/stk/examples
%{__cp} -pr projects/examples/scores %{buildroot}%{_datadir}/stk/examples
for f in sine sineosc foursine audioprobe midiprobe duplex play \
    record inetIn inetOut rtsine crtsine bethree controlbee \
    threebees playsmf grains ; do
  %{__cp} -p projects/examples/$f %{buildroot}%{_bindir}/stk-$f
  # absolute links, will be shortened later
  %{__ln_s} %{buildroot}%{_bindir}/stk-$f %{buildroot}%{_datadir}/stk/examples/$f
done

%{__cp} -pr projects/effects/tcl %{buildroot}%{_datadir}/stk/effects
%{__cp} -p projects/effects/effects %{buildroot}%{_bindir}/stk-effects
%{__sed} -e 's,\./effects,%{_bindir}/stk-effects,' -e '1i#! /bin/sh' \
  -i projects/effects/StkEffects
%{__cp} -p projects/effects/StkEffects %{buildroot}%{_datadir}/stk/effects

%{__cp} -pr projects/ragamatic/tcl %{buildroot}%{_datadir}/stk/ragamatic
%{__cp} -pr projects/ragamatic/rawwaves %{buildroot}%{_datadir}/stk/ragamatic
%{__cp} -p projects/ragamatic/ragamat %{buildroot}%{_bindir}/stk-ragamat
%{__sed} -e 's,\./ragamat,%{_bindir}/stk-ragamat,' -e '1i#! /bin/sh' \
  -i projects/ragamatic/Raga
%{__cp} -p projects/ragamatic/Raga %{buildroot}%{_datadir}/stk/ragamatic

# fix encoding
iconv -f iso-8859-1 -t utf-8 doc/doxygen/index.txt \
  -o doc/doxygen/index.txt.tmp
%{__mv} doc/doxygen/index.txt.tmp doc/doxygen/index.txt

# fix symlinks
symlinks -crv %{buildroot}


%clean
%{__rm} -rf %{buildroot}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README
%{_libdir}/libstk.so.*
%{_datadir}/stk/rawwaves


%files devel
%defattr(-,root,root,-)
%doc README doc/* README.fedora
%exclude %{_libdir}/libstk.a
%{_libdir}/libstk.so
%{_includedir}/*


%files demo
%defattr(-,root,root,-)
%doc README README.fedora
%{_bindir}/stk-*
%{_bindir}/Md2Skini
%{_datadir}/stk/demo
%{_datadir}/stk/examples
%{_datadir}/stk/effects
%{_datadir}/stk/ragamatic


%changelog
* Mon Sep 15 2008 Thomas Moschny <thomas.moschny at gmx.de> - 4.3.1-6
- Include updated config.guess and config.sub scripts.

* Tue Sep  9 2008 Thomas Moschny <thomas.moschny at gmx.de> - 4.3.1-5
- Don't ship the static library.

* Sun Sep  7 2008 Thomas Moschny <thomas.moschny at gmx.de> - 4.3.1-4
- Remove all .mid and .ski files from the tarball.
- Add README.fedora.

* Thu Jul 31 2008 Thomas Moschny <thomas.moschny at gmx.de> - 4.3.1-3
- Remove src/include/dsound.h, and src/include/*asio* files from the
  tarball, for legal reasons. Only used on windows anyway.
- Remove src/include/soundcard.h (explicitly forbids modification) and
  disable OSS support.
- Build and pack Md2Skini.
- Build and pack the examples.

* Tue Jul 15 2008 Thomas Moschny <thomas.moschny at gmx.de> - 4.3.1-2
- Update sharedlib patch, fixes alsa problem.
- Fix path for include files in -devel.
- Change path for docs in -devel.

* Sun Jul  6 2008 Thomas Moschny <thomas.moschny at gmx.de> - 4.3.1-1
- New package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stk/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2008 03:15:39 -0000	1.1
+++ .cvsignore	19 Sep 2008 10:26:15 -0000	1.2
@@ -0,0 +1 @@
+stk-4.3.1.stripped.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stk/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 03:15:39 -0000	1.1
+++ sources	19 Sep 2008 10:26:15 -0000	1.2
@@ -0,0 +1 @@
+994b7ff18c821376bfc4989a9f857a6f  stk-4.3.1.stripped.tar.gz



From varekova at fedoraproject.org  Fri Sep 19 11:27:33 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Fri, 19 Sep 2008 11:27:33 +0000 (UTC)
Subject: rpms/pilot-link/devel pilot-link.spec,1.81,1.82
Message-ID: <20080919112734.0EBAE700F7@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/pilot-link/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25417

Modified Files:
	pilot-link.spec 
Log Message:
- split perl subpackage (461758) - thanks Peter Robinson
- spec file cleanup



Index: pilot-link.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pilot-link/devel/pilot-link.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- pilot-link.spec	19 Sep 2008 10:17:23 -0000	1.81
+++ pilot-link.spec	19 Sep 2008 11:27:03 -0000	1.82
@@ -1,9 +1,8 @@
-%define support_perl 1
 %define perl_version %(eval "`%{__perl} -V:version`"; echo $version)
 
 Name: pilot-link
 Version: 0.12.3
-Release: 16%{?dist}
+Release: 17%{?dist}
 Epoch: 2
 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL
 Group: Applications/Communications
@@ -26,15 +25,10 @@
 Patch9: pilot-link-0.12.2-Zire.patch
 Patch10: pilot-link-0.12.3-clio.patch
 
-
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-%if %{support_perl}
-Requires:      perl(:MODULE_COMPAT_%{perl_version})
 BuildRequires: perl(ExtUtils::MakeMaker)
-%endif
-
 BuildRequires: libpng-devel
 BuildRequires: readline-devel
 BuildRequires: autoconf
@@ -61,7 +55,6 @@
 Requires: libpng-devel
 Requires: readline-devel
 
-
 %description devel
 This package contains the development headers that are used to build
 the pilot-link package. It also includes the static libraries
@@ -70,19 +63,30 @@
 If you want to develop PalmPilot synchronizing applications, you'll
 need to install pilot-link-devel.
 
+%package perl
+Summary: PalmPilot utilies written in perl
+Group: Applications/Communications
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: perl(:MODULE_COMPAT_%{perl_version})
+
+%description perl
+This package contains utilities that depend on perl
+
+
 %prep 
 %setup -q
 %patch4 -p1 -b .var
-%if %{support_perl}
-#%patch1 -p1 -b .perlmd5
-#%patch2 -p1 -b .perlpollute
-#%patch3 -p1 -b .malsync
-%endif
 %patch6 -p1 -b .open
 %patch7 -p1 -b .md5
 %patch8 -p0 -b .bluetooth-sdp
 %patch9 -p1 -b .Zire
 %patch10 -p1 -b .clio
+iconv -f windows-1252 -t UTF8 doc/README.usb > doc/README.usb.aux
+mv doc/README.usb.aux doc/README.usb
+iconv -f windows-1252 -t UTF8 ChangeLog > ChangeLog.aux
+mv ChangeLog.aux ChangeLog
+iconv -f windows-1252 -t UTF8 NEWS > NEWS.aux
+mv NEWS.aux NEWS
 
 %build
 autoreconf -is
@@ -93,11 +97,7 @@
   --with-tcl=no \
   --with-java=no \
   --with-cpp=yes \
-%if %{support_perl}
   --with-perl=yes \
-%else
-  --with-perl=no \
-%endif
   --enable-conduits \
   --enable-libusb
 
@@ -109,7 +109,6 @@
 make install DESTDIR=%{buildroot} libdir=%{_libdir} 
 make install -C doc/man DESTDIR=%{buildroot} libdir=%{_libdir}
 
-%if %{support_perl}
 if test -f bindings/Perl/Makefile.PL ; then
    cd bindings/Perl
    perl -pi -e 's|^\$libdir =.*|\$libdir = "%{buildroot}%{_libdir}";|g' Makefile.PL
@@ -118,21 +117,16 @@
    make
    cd ../..
 fi
-%endif
 
-%if %{support_perl}
-  cd bindings/Perl
-  make pure_install PERL_INSTALL_ROOT=%{buildroot}
-  cd ../..
-  # remove files and fix perms
-  find %{buildroot}%{_libdir}/perl5/ -type f -name '.packlist' -exec rm -f {} \;
-  find %{buildroot}%{_libdir}/perl5/ -type f -name '*.bs' -size 0 -exec rm -f {} \;
-  find %{buildroot}%{_libdir}/perl5/ -type f -name '*.so' -exec chmod 0755 {} \;
-  rm -f %{buildroot}%{_libdir}/perl5/*/*/perllocal.pod
-  rm -f %{buildroot}%{_libdir}/perl5/*/*/*/PDA/dump.pl
-%else
-  rm -f %{buildroot}%{_mandir}/man1/ietf2datebook*
-%endif
+cd bindings/Perl
+make pure_install PERL_INSTALL_ROOT=%{buildroot} %{?_smp_mflags}
+cd ../..
+# remove files and fix perms
+find %{buildroot}%{_libdir}/perl5/ -type f -name '.packlist' -exec rm -f {} \;
+find %{buildroot}%{_libdir}/perl5/ -type f -name '*.bs' -size 0 -exec rm -f {} \;
+find %{buildroot}%{_libdir}/perl5/ -type f -name '*.so' -exec chmod 0755 {} \;
+rm -f %{buildroot}%{_libdir}/perl5/*/*/perllocal.pod
+rm -f %{buildroot}%{_libdir}/perl5/*/*/*/PDA/dump.pl
 
 # remove files we don't want to include
 rm -f %{buildroot}%{_libdir}/*.la
@@ -163,24 +157,38 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README NEWS doc/README.usb doc/README.debugging doc/README.libusb README.fedora
+%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-visor
 %{_libdir}/*.so.*
-%if %{support_perl}
-%{perl_vendorarch}/auto/*
-%{perl_vendorarch}/PDA*
-%endif
 %{_bindir}/*
+%exclude %{_bindir}/pilot-ietf2datebook
+%exclude %{_bindir}/pilot-sync-plan
+%exclude %{_bindir}/pilot-undelete
 %{_datadir}/pilot-link
 %{_mandir}/man?/*
-%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-visor
+%exclude %{_mandir}/man1/ietf2datebook*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
 %{_datadir}/aclocal/*.m4
 
+%files perl
+%defattr(-,root,root,-)
+%{_bindir}/pilot-ietf2datebook
+%{_bindir}/pilot-sync-plan
+%{_bindir}/pilot-undelete
+%{_mandir}/man1/ietf2datebook*
+%{perl_vendorarch}/auto/*
+%{perl_vendorarch}/PDA*
+
+
 %changelog
+* Fri Sep 19 2008 Ivana Varekova <varekova at redhat.com> - 2:0.12.3-17
+- split perl subpackage (461758) - thanks Peter Robinson
+- spec file cleanup
+
 * Fri Sep 19 2008 Ivana Varekova <varekova at redhat.com> - 2:0.12.3-16
 - add clio patch (454178) - thanks Michael Ekstrand
 
@@ -215,7 +223,7 @@
 
 * Fri Jan 11 2008 Ivana Varekova <varekova at redhat.com> - 2:0.12.3-6
 - Synchronize with F-8 branch:
-- remove visor modul remove from %post script
+- remove visor modul remove from %%post script
 - Change README.fedora use "ttyUSB[13579]" in 60-pilot.rules
 
 * Wed Jan 09 2008 - Bastien Nocera <bnocera at redhat.com> - 2:0.12.3-5
@@ -225,7 +233,7 @@
 * Mon Jan  7 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 2:0.12.3-4
 - Synchronize with F-8 branch: 
 - Add README.fedora and visor configs as fallbacks (#280251: thanks Kevin Page)
-- Don't tag HAL/PolicyKit files as %config (#427840)
+- Don't tag HAL/PolicyKit files as %%config (#427840)
 - Remove visor module if currently loaded (#280251)
 
 * Fri Jan  4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 2:0.12.3-3



From nbecker at fedoraproject.org  Fri Sep 19 11:30:31 2008
From: nbecker at fedoraproject.org (Neal Becker)
Date: Fri, 19 Sep 2008 11:30:31 +0000 (UTC)
Subject: rpms/igraph/F-9 igraph.spec,1.17,1.18
Message-ID: <20080919113031.98A00700F7@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/igraph/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26278

Modified Files:
	igraph.spec 
Log Message:
BR libxml2-devel for graphml



Index: igraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/F-9/igraph.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- igraph.spec	26 Feb 2008 19:24:36 -0000	1.17
+++ igraph.spec	19 Sep 2008 11:30:01 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		igraph
 Version:	0.5
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	Library for creating and manipulating graphs
 
 Group:		System Environment/Libraries
@@ -11,7 +11,7 @@
 Patch2:		igraph-test.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#BuildRequires:	gcc
+BuildRequires:	libxml2-devel
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 Provides: 	%{name}-%{version}
@@ -92,6 +92,9 @@
 make check
 
 %changelog
+* Thu Sep 18 2008 Neal Becker <ndbecker2 at gmail.com> - 0.5-14
+- Add BR libxml2-devel to get graphml support.
+
 * Tue Feb 26 2008 Neal Becker <ndbecker2 at gmail.com> - 0.5-13
 - More test fixes
 



From jnovy at fedoraproject.org  Fri Sep 19 11:43:06 2008
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 19 Sep 2008 11:43:06 +0000 (UTC)
Subject: rpms/curl/devel curl-7.18.2-nss-thread-safety.patch, 1.2,
	1.3 curl.spec, 1.81, 1.82
Message-ID: <20080919114306.27D23700F7@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30092

Modified Files:
	curl-7.18.2-nss-thread-safety.patch curl.spec 
Log Message:
* Tue Sep 09 2008 Jindrich Novy <jnovy at redhat.com> 7.18.2-7
- update the thread safety patch, thanks to Rob Crittenden (#462217)


curl-7.18.2-nss-thread-safety.patch:

Index: curl-7.18.2-nss-thread-safety.patch
===================================================================
RCS file: /cvs/pkgs/rpms/curl/devel/curl-7.18.2-nss-thread-safety.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- curl-7.18.2-nss-thread-safety.patch	4 Sep 2008 01:02:07 -0000	1.2
+++ curl-7.18.2-nss-thread-safety.patch	19 Sep 2008 11:43:05 -0000	1.3
@@ -1,6 +1,6 @@
-diff -urN curl-7.18.2.orig/lib/nss.c curl-7.18.2/lib/nss.c
---- curl-7.18.2.orig/lib/nss.c	2008-09-03 20:56:33.000000000 -0400
-+++ curl-7.18.2/lib/nss.c	2008-09-03 20:57:07.000000000 -0400
+diff -u --recursive curl-7.18.2/lib/nss.c curl-7.18.2.new/lib/nss.c
+--- curl-7.18.2/lib/nss.c	2008-09-16 11:13:00.000000000 -0400
++++ curl-7.18.2.new/lib/nss.c	2008-09-16 11:29:13.000000000 -0400
 @@ -73,6 +73,8 @@
  
  PRFileDesc *PR_ImportTCPSocket(PRInt32 osfd);
@@ -10,13 +10,11 @@
  int initialized = 0;
  
  #define HANDSHAKE_TIMEOUT 30
-@@ -718,9 +720,12 @@
-  * @retval 1 SSL initialized successfully
+@@ -719,8 +721,11 @@
   */
  int Curl_nss_init(void)
--{
+ {
 -  if(!initialized)
-+{ 
 +  /* curl_global_init() is not thread-safe so this test is ok */
 +  if (nss_initlock == NULL) {
      PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 256);
@@ -54,7 +52,7 @@
      initialized = 1;
  
      certDir = getenv("SSL_DIR"); /* Look in $SSL_DIR */
-@@ -832,8 +848,11 @@
+@@ -832,6 +848,8 @@
      if(rv != SECSuccess) {
        infof(conn->data, "Unable to initialize NSS database\n");
        curlerr = CURLE_SSL_CACERT_BADFILE;
@@ -62,7 +60,13 @@
 +      initialized = 0;
        goto error;
      }
-+    PR_Unlock(nss_initlock);
  
-     NSS_SetDomesticPolicy();
+@@ -854,6 +872,7 @@
+     }
+ #endif
+   }
++  PR_Unlock(nss_initlock);
  
+   model = PR_NewTCPSocket();
+   if(!model)
+Only in curl-7.18.2.new/lib: nss.c.orig


Index: curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/curl/devel/curl.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- curl.spec	4 Sep 2008 00:47:20 -0000	1.81
+++ curl.spec	19 Sep 2008 11:43:05 -0000	1.82
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.18.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -120,6 +120,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Tue Sep 09 2008 Jindrich Novy <jnovy at redhat.com> 7.18.2-7
+- update the thread safety patch, thanks to Rob Crittenden (#462217)
+
 * Wed Sep 03 2008 Warren Togami <wtogami at redhat.com> 7.18.2-6
 - add thread safety to libcurl NSS cleanup() functions (#459297)
 



From caolanm at fedoraproject.org  Fri Sep 19 11:44:59 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 19 Sep 2008 11:44:59 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch, NONE,
	1.1 openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch, 
	1.22, 1.23 openoffice.org.spec, 1.1654, 1.1655
Message-ID: <20080919114459.D94F2700F7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30630

Modified Files:
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch 
Log Message:
Resolves: rhbz#462833 openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch

openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch:

--- NEW FILE openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch ---
Index: source/fontmanager/fontconfig.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/fontmanager/fontconfig.cxx,v
retrieving revision 1.30.20.1
diff -u -r1.30.20.1 fontconfig.cxx
--- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx	10 Sep 2008 13:53:12 -0000	1.30.20.1
+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx	19 Sep 2008 11:32:56 -0000
@@ -91,7 +91,6 @@
 class FontCfgWrapper
 {
     oslModule		m_pLib;
-    FcConfig*		m_pDefConfig;
     FcFontSet*      m_pOutlineSet;
 
     FcBool          (*m_pFcInit)();
@@ -140,7 +139,6 @@
     bool isValid() const 
     { return m_pLib != NULL;}
 
-    FcConfig* getDefConfig() { return m_pDefConfig; }
     FcFontSet* getFontSet();
     
     FcBool FcInit()
@@ -252,7 +250,6 @@
 
 FontCfgWrapper::FontCfgWrapper()
         : m_pLib( NULL ),
-          m_pDefConfig( NULL ),
           m_pOutlineSet( NULL )
 {
      OUString aLib( RTL_CONSTASCII_USTRINGPARAM( "libfontconfig.so.1" ) );
@@ -379,8 +376,7 @@
 
 
     FcInit();
-    m_pDefConfig = FcConfigGetCurrent();
-    if( ! m_pDefConfig )
+    if( ! FcConfigGetCurrent() )
     {
         osl_unloadModule( (oslModule)m_pLib );
         m_pLib = NULL;
@@ -394,7 +390,7 @@
       add only acceptable outlined fonts to our config, 
       for future fontconfig use
     */
-    FcFontSet* pOrig = FcConfigGetFonts( getDefConfig(), eSetName );
+    FcFontSet* pOrig = FcConfigGetFonts( FcConfigGetCurrent(), eSetName );
     if( !pOrig )
         return;
 
@@ -794,7 +790,7 @@
     if( nVersion <= 20400 )
         return false;
     const char* pDirName = (const char*)rDirName.getStr();
-    bool bRet = (rWrapper.FcConfigAppFontAddDir( rWrapper.getDefConfig(), (FcChar8*)pDirName ) == FcTrue);
+    bool bRet = (rWrapper.FcConfigAppFontAddDir( rWrapper.FcConfigGetCurrent(), (FcChar8*)pDirName ) == FcTrue);
 
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "FcConfigAppFontAddDir( \"%s\") => %d\n", pDirName, bRet );
@@ -914,13 +910,13 @@
     addtopattern(rWrapper, pPattern, eItalic, eWeight, eWidth, ePitch);
 
     // query fontconfig for a substitute
-    rWrapper.FcConfigSubstitute( rWrapper.getDefConfig(), pPattern, FcMatchPattern );
+    rWrapper.FcConfigSubstitute( rWrapper.FcConfigGetCurrent(), pPattern, FcMatchPattern );
     rWrapper.FcDefaultSubstitute( pPattern );
 
     // process the result of the fontconfig query
     FcResult eResult = FcResultNoMatch;
     FcFontSet* pFontSet = rWrapper.getFontSet();
-    FcPattern* pResult = rWrapper.FcFontSetMatch( rWrapper.getDefConfig(), &pFontSet, 1, pPattern, &eResult );
+    FcPattern* pResult = rWrapper.FcFontSetMatch( rWrapper.FcConfigGetCurrent(), &pFontSet, 1, pPattern, &eResult );
     rWrapper.FcPatternDestroy( pPattern );
 
     FcFontSet*  pSet = NULL;
@@ -982,7 +978,7 @@
     if( ! rWrapper.isValid() )
         return false;
 
-    FcConfig* pConfig = rWrapper.getDefConfig();
+    FcConfig* pConfig = rWrapper.FcConfigGetCurrent();
     FcPattern* pPattern = rWrapper.FcPatternCreate();
 
     OString aLangAttrib;

openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:

Index: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	1 Sep 2008 12:09:07 -0000	1.22
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	19 Sep 2008 11:44:59 -0000	1.23
@@ -339,7 +339,7 @@
 +    if( ! rWrapper.isValid() )
 +        return aHints;
 +
-+    FcConfig* pConfig = rWrapper.getDefConfig();
++    FcConfig* pConfig = rWrapper.FcConfigGetCurrent();
 +    FcPattern* pPattern = rWrapper.FcPatternCreate();
 +
 +    OString sFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1654
retrieving revision 1.1655
diff -u -r1.1654 -r1.1655
--- openoffice.org.spec	17 Sep 2008 22:04:13 -0000	1.1654
+++ openoffice.org.spec	19 Sep 2008 11:44:59 -0000	1.1655
@@ -114,6 +114,7 @@
 Patch43: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
 Patch44: openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch
 Patch45: openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch
+Patch46: openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1317,6 +1318,7 @@
 %patch43 -p1 -b .ooo93515.vcl.jrb-frames.patch
 %patch44 -p1 -b .ooo93942.svx.accessibity-loops.patch
 %patch45 -p1 -b .ooo93949.sw.better_rtf_encodings.patch
+%patch46 -p1 -b .ooo94069.psprint.defconfig.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3681,8 +3683,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Sep 17 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-6.2
+* Fri Sep 19 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-6.2
 - Tswana, Ukrainian, Urdu spellcheckers
+- Resolves: rhbz#462833 openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch
 
 * Tue Sep 16 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-6.1
 - next candidate



From mlichvar at fedoraproject.org  Fri Sep 19 13:03:00 2008
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Fri, 19 Sep 2008 13:03:00 +0000 (UTC)
Subject: rpms/rpmreaper/devel .cvsignore, 1.3, 1.4 rpmreaper.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20080919130300.D79AF700F7@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/rpmreaper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19787

Modified Files:
	.cvsignore rpmreaper.spec sources 
Log Message:
- update to 0.1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmreaper/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Jun 2008 17:28:09 -0000	1.3
+++ .cvsignore	19 Sep 2008 13:02:30 -0000	1.4
@@ -1 +1 @@
-rpmreaper-0.1.4.tar.gz
+rpmreaper-0.1.5.tar.gz


Index: rpmreaper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmreaper/devel/rpmreaper.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmreaper.spec	14 Jul 2008 16:42:30 -0000	1.3
+++ rpmreaper.spec	19 Sep 2008 13:02:30 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rpmreaper
-Version:        0.1.4
-Release:        2%{?dist}
+Version:        0.1.5
+Release:        1%{?dist}
 Summary:        A tool for removing packages from system
 
 Group:          Applications/System
@@ -19,7 +19,7 @@
 %setup -q
 
 %build
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_RPM_4_4_COMPAT"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -35,6 +35,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Fri Sep 19 2008 Miroslav Lichvar <mlichvar at redhat.com> 0.1.5-1
+- update to 0.1.5
+
 * Mon Jul 14 2008 Miroslav Lichvar <mlichvar at redhat.com> 0.1.4-2
 - fix building with new rpm (Panu Matilainen)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmreaper/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Jun 2008 17:28:09 -0000	1.3
+++ sources	19 Sep 2008 13:02:30 -0000	1.4
@@ -1 +1 @@
-7966b7f2a52170b5ce150f630500f561  rpmreaper-0.1.4.tar.gz
+650975d54da4f9df4f716a6eabac7520  rpmreaper-0.1.5.tar.gz



From mlichvar at fedoraproject.org  Fri Sep 19 13:05:15 2008
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Fri, 19 Sep 2008 13:05:15 +0000 (UTC)
Subject: rpms/rpmreaper/F-8 .cvsignore, 1.3, 1.4 rpmreaper.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20080919130515.8E80D700F7@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/rpmreaper/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20610

Modified Files:
	.cvsignore rpmreaper.spec sources 
Log Message:
- update to 0.1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmreaper/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Jun 2008 17:31:51 -0000	1.3
+++ .cvsignore	19 Sep 2008 13:04:45 -0000	1.4
@@ -1 +1 @@
-rpmreaper-0.1.4.tar.gz
+rpmreaper-0.1.5.tar.gz


Index: rpmreaper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmreaper/F-8/rpmreaper.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rpmreaper.spec	25 Jun 2008 17:31:51 -0000	1.2
+++ rpmreaper.spec	19 Sep 2008 13:04:45 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           rpmreaper
-Version:        0.1.4
+Version:        0.1.5
 Release:        1%{?dist}
 Summary:        A tool for removing packages from system
 
@@ -35,6 +35,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Fri Sep 19 2008 Miroslav Lichvar <mlichvar at redhat.com> 0.1.5-1
+- update to 0.1.5
+
 * Wed Jun 25 2008 Miroslav Lichvar <mlichvar at redhat.com> 0.1.4-1
 - update to 0.1.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmreaper/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Jun 2008 17:31:51 -0000	1.3
+++ sources	19 Sep 2008 13:04:45 -0000	1.4
@@ -1 +1 @@
-7966b7f2a52170b5ce150f630500f561  rpmreaper-0.1.4.tar.gz
+650975d54da4f9df4f716a6eabac7520  rpmreaper-0.1.5.tar.gz



From mlichvar at fedoraproject.org  Fri Sep 19 13:06:24 2008
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Fri, 19 Sep 2008 13:06:24 +0000 (UTC)
Subject: rpms/rpmreaper/F-9 .cvsignore, 1.3, 1.4 rpmreaper.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20080919130624.DCFE9700F7@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/rpmreaper/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21046

Modified Files:
	.cvsignore rpmreaper.spec sources 
Log Message:
- update to 0.1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmreaper/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Jun 2008 17:30:02 -0000	1.3
+++ .cvsignore	19 Sep 2008 13:05:54 -0000	1.4
@@ -1 +1 @@
-rpmreaper-0.1.4.tar.gz
+rpmreaper-0.1.5.tar.gz


Index: rpmreaper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmreaper/F-9/rpmreaper.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rpmreaper.spec	25 Jun 2008 17:30:02 -0000	1.2
+++ rpmreaper.spec	19 Sep 2008 13:05:54 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           rpmreaper
-Version:        0.1.4
+Version:        0.1.5
 Release:        1%{?dist}
 Summary:        A tool for removing packages from system
 
@@ -35,6 +35,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Fri Sep 19 2008 Miroslav Lichvar <mlichvar at redhat.com> 0.1.5-1
+- update to 0.1.5
+
 * Wed Jun 25 2008 Miroslav Lichvar <mlichvar at redhat.com> 0.1.4-1
 - update to 0.1.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmreaper/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Jun 2008 17:30:02 -0000	1.3
+++ sources	19 Sep 2008 13:05:54 -0000	1.4
@@ -1 +1 @@
-7966b7f2a52170b5ce150f630500f561  rpmreaper-0.1.4.tar.gz
+650975d54da4f9df4f716a6eabac7520  rpmreaper-0.1.5.tar.gz



From cebbert at fedoraproject.org  Fri Sep 19 13:15:57 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 19 Sep 2008 13:15:57 +0000 (UTC)
Subject: rpms/kernel/F-8 linux-2.6-x86-intel-msr-backport.patch, NONE,
	1.1 kernel.spec, 1.532, 1.533
Message-ID: <20080919131557.2DC2C700F7@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24322

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-intel-msr-backport.patch 
Log Message:
Backport KVM Intel MSR fix (efa67e0d1f51842393606034051d805ab9948abd)

linux-2.6-x86-intel-msr-backport.patch:

--- NEW FILE linux-2.6-x86-intel-msr-backport.patch ---
--- linux-2.6.26.noarch/arch/x86/kvm/vmx.c.orig	2008-09-17 15:49:13.000000000 +0200
+++ linux-2.6.26.noarch/arch/x86/kvm/vmx.c	2008-09-17 15:51:33.000000000 +0200
@@ -914,6 +914,18 @@ static int vmx_set_msr(struct kvm_vcpu *
 	case MSR_IA32_TIME_STAMP_COUNTER:
 		guest_write_tsc(data);
 		break;
+	case MSR_P6_PERFCTR0:
+	case MSR_P6_PERFCTR1:
+	case MSR_P6_EVNTSEL0:
+	case MSR_P6_EVNTSEL1:
+		/*
+		 * Just discard all writes to the performance counters; this
+		 * should keep both older linux and windows 64-bit guests
+		 * happy
+		 */
+		pr_unimpl(vcpu, "unimplemented perfctr wrmsr: 0x%x data 0x%llx\n", msr_index, data);
+
+		break;
 	default:
 		vmx_load_host_state(vmx);
 		msr = find_msr_entry(vmx, msr_index);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -r1.532 -r1.533
--- kernel.spec	15 Sep 2008 02:21:55 -0000	1.532
+++ kernel.spec	19 Sep 2008 13:15:26 -0000	1.533
@@ -591,6 +591,7 @@
 Patch96: linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch
 Patch97: linux-2.6-x86-hpet-04-workaround-sb700-bios.patch
 Patch98: linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch
+Patch99: linux-2.6-x86-intel-msr-backport.patch
 
 #ALSA
 
@@ -1043,6 +1044,8 @@
 ApplyPatch linux-2.6-x86-hpet-04-workaround-sb700-bios.patch
 # fix memmap=exactmap, so kdump kernels work
 ApplyPatch linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch
+# backport MSR patch
+ApplyPatch linux-2.6-x86-intel-msr-backport.patch
 
 #
 # PowerPC
@@ -1851,6 +1854,9 @@
 
 
 %changelog
+* Fri Sep 19 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-23
+- Backport KVM Intel MSR fix (efa67e0d1f51842393606034051d805ab9948abd)
+
 * Sun Sep 14 2008 Kyle McMartin <kyle at redhat.com> 2.6.26.5-22
 - Turn off CONFIG_ACPI_SYSFS_POWER again, got enabled by mistake when
   the (unaffected, since hal is newer) Fedora 9 config files were copied



From rstrode at fedoraproject.org  Fri Sep 19 13:23:36 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 19 Sep 2008 13:23:36 +0000 (UTC)
Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.166,1.167
Message-ID: <20080919132336.7A3D6700F7@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26942

Modified Files:
	gnome-desktop.spec 
Log Message:
Add bug link to patch



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- gnome-desktop.spec	19 Sep 2008 04:19:45 -0000	1.166
+++ gnome-desktop.spec	19 Sep 2008 13:23:06 -0000	1.167
@@ -22,6 +22,7 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=549960
 Patch2: rr-leaks.patch
 Patch3: clone-modes.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=552856
 Patch4: gnome-desktop-2.23.92-fade.patch
 
 Requires: redhat-menus



From rstrode at fedoraproject.org  Fri Sep 19 13:24:40 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 19 Sep 2008 13:24:40 +0000 (UTC)
Subject: rpms/eel2/devel eel2.spec,1.96,1.97
Message-ID: <20080919132440.E9132700F7@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/eel2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27381

Modified Files:
	eel2.spec 
Log Message:
Add bug link to patch



Index: eel2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- eel2.spec	19 Sep 2008 03:34:24 -0000	1.96
+++ eel2.spec	19 Sep 2008 13:24:10 -0000	1.97
@@ -45,6 +45,7 @@
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser)
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=552857
 Patch0: eel-2.23.92-fade.patch
 
 %description



From rstrode at fedoraproject.org  Fri Sep 19 13:25:40 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 19 Sep 2008 13:25:40 +0000 (UTC)
Subject: rpms/eel2/devel eel2.spec,1.97,1.98
Message-ID: <20080919132540.6EA50700F7@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/eel2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27769

Modified Files:
	eel2.spec 
Log Message:
Add *right* bug link to patch



Index: eel2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- eel2.spec	19 Sep 2008 13:24:10 -0000	1.97
+++ eel2.spec	19 Sep 2008 13:25:10 -0000	1.98
@@ -45,7 +45,7 @@
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser)
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=552857
+# http://bugzilla.gnome.org/show_bug.cgi?id=552859
 Patch0: eel-2.23.92-fade.patch
 
 %description



From rstrode at fedoraproject.org  Fri Sep 19 13:25:51 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 19 Sep 2008 13:25:51 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel gnome-settings-daemon.spec, 1.56, 
	1.57
Message-ID: <20080919132551.2ACCD700F7@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27871

Modified Files:
	gnome-settings-daemon.spec 
Log Message:
Add bug link to patch



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gnome-settings-daemon.spec	19 Sep 2008 03:25:26 -0000	1.56
+++ gnome-settings-daemon.spec	19 Sep 2008 13:25:20 -0000	1.57
@@ -34,6 +34,8 @@
 Patch2:         gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
 Patch6:		gnome-settings-daemon-2.23.4-drop-sample-cache.patch
 Patch7:		gnome-settings-daemon-2.23.91-fnf7-cycle.patch
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=552857
 Patch8:		gnome-settings-daemon-2.23.92-fade.patch
 
 %description



From cebbert at fedoraproject.org  Fri Sep 19 13:37:55 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 19 Sep 2008 13:37:55 +0000 (UTC)
Subject: rpms/kernel/F-8 kernel.spec, 1.533, 1.534 linux-2.6-utrace.patch,
	1.69, 1.70
Message-ID: <20080919133755.5E94F700F7@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31981

Modified Files:
	kernel.spec linux-2.6-utrace.patch 
Log Message:
utrace: Fix common oops in ptrace EPERM case (from F9)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -r1.533 -r1.534
--- kernel.spec	19 Sep 2008 13:15:26 -0000	1.533
+++ kernel.spec	19 Sep 2008 13:37:24 -0000	1.534
@@ -1854,6 +1854,9 @@
 
 
 %changelog
+* Fri Sep 19 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-24
+- utrace: Fix common oops in ptrace EPERM case (from F9)
+
 * Fri Sep 19 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-23
 - Backport KVM Intel MSR fix (efa67e0d1f51842393606034051d805ab9948abd)
 

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-utrace.patch,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- linux-2.6-utrace.patch	8 Aug 2008 18:56:00 -0000	1.69
+++ linux-2.6-utrace.patch	19 Sep 2008 13:37:24 -0000	1.70
@@ -1994,7 +1994,7 @@
 +	if (IS_ERR(engine))
 +		return engine;
 +	if (likely(!ptrace_update_utrace(child, engine)))
-+		return 0;
++		return engine;
 +	ptrace_detach_utrace(child, engine);
 +	return ERR_PTR(-ESRCH);
 +}



From dwalsh at fedoraproject.org  Fri Sep 19 13:54:22 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 19 Sep 2008 13:54:22 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.209,
	1.210 selinux-policy.spec, 1.708, 1.709
Message-ID: <20080919135422.88583700F7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5547

Modified Files:
	policy-20071130.patch selinux-policy.spec 
Log Message:
* Tue Sep 18 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-92
- Dontaudit attempts to write user_tmp_t by gssd_t


policy-20071130.patch:

Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- policy-20071130.patch	16 Sep 2008 17:37:55 -0000	1.209
+++ policy-20071130.patch	19 Sep 2008 13:54:21 -0000	1.210
@@ -5332,7 +5332,7 @@
 +/usr/lib64/[^/]*firefox[^/]*/firefox -- gen_context(system_u:object_r:mozilla_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.3.1/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/mozilla.if	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/apps/mozilla.if	2008-09-17 07:36:20.000000000 -0400
 @@ -35,7 +35,10 @@
  template(`mozilla_per_role_template',`
  	gen_require(`
@@ -5344,7 +5344,7 @@
  
  	########################################
  	#
-@@ -45,20 +48,26 @@
+@@ -45,36 +48,46 @@
  	application_domain($1_mozilla_t,mozilla_exec_t)
  	role $3 types $1_mozilla_t;
  
@@ -5372,15 +5372,16 @@
  
  	allow $1_mozilla_t self:capability { sys_nice setgid setuid };
 -	allow $1_mozilla_t self:process { sigkill signal setsched getsched setrlimit };
-+	allow $1_mozilla_t self:process { ptrace sigkill signal setsched getsched setrlimit };
++	allow $1_mozilla_t self:process { ptrace sigkill signal signull setsched getsched setrlimit };
  	allow $1_mozilla_t self:fifo_file rw_fifo_file_perms;
  	allow $1_mozilla_t self:shm { unix_read unix_write read write destroy create };
  	allow $1_mozilla_t self:sem create_sem_perms;
-@@ -66,15 +75,19 @@
+ 	allow $1_mozilla_t self:socket create_socket_perms;
  	allow $1_mozilla_t self:unix_stream_socket { listen accept };
  	# Browse the web, connect to printer
- 	allow $1_mozilla_t self:tcp_socket create_socket_perms;
+-	allow $1_mozilla_t self:tcp_socket create_socket_perms;
 -	allow $1_mozilla_t self:netlink_route_socket r_netlink_socket_perms;
++	allow $1_mozilla_t self:tcp_socket create_stream_socket_perms;
  
  	# for bash - old mozilla binary
  	can_exec($1_mozilla_t, mozilla_exec_t)
@@ -5485,15 +5486,16 @@
  
  	# Browse the web, connect to printer
  	corenet_all_recvfrom_unlabeled($1_mozilla_t)
-@@ -139,7 +181,6 @@
+@@ -139,7 +181,7 @@
  	corenet_tcp_connect_http_cache_port($1_mozilla_t)
  	corenet_tcp_connect_ftp_port($1_mozilla_t)
  	corenet_tcp_connect_ipp_port($1_mozilla_t)
 -	corenet_tcp_connect_generic_port($1_mozilla_t)
++	corenet_tcp_connect_flash_port($1_mozilla_t)
  	corenet_sendrecv_http_client_packets($1_mozilla_t)
  	corenet_sendrecv_http_cache_client_packets($1_mozilla_t)
  	corenet_sendrecv_ftp_client_packets($1_mozilla_t)
-@@ -151,6 +192,7 @@
+@@ -151,6 +193,7 @@
  
  	dev_read_urand($1_mozilla_t)
  	dev_read_rand($1_mozilla_t)
@@ -5501,7 +5503,7 @@
  	dev_write_sound($1_mozilla_t)
  	dev_read_sound($1_mozilla_t)
  	dev_dontaudit_rw_dri($1_mozilla_t)
-@@ -165,13 +207,28 @@
+@@ -165,13 +208,28 @@
  	files_read_var_files($1_mozilla_t)
  	files_read_var_symlinks($1_mozilla_t)
   	files_dontaudit_getattr_boot_dirs($1_mozilla_t)
@@ -5530,7 +5532,7 @@
  	libs_use_ld_so($1_mozilla_t)
  	libs_use_shared_libs($1_mozilla_t)
  
-@@ -180,18 +237,10 @@
+@@ -180,18 +238,11 @@
  	miscfiles_read_fonts($1_mozilla_t)
  	miscfiles_read_localization($1_mozilla_t)
  
@@ -5548,11 +5550,12 @@
 +	userdom_dontaudit_use_user_terminals($1,$1_mozilla_t)
  	
 -	xserver_user_client_template($1,$1_mozilla_t,$1_mozilla_tmpfs_t)
++	xserver_read_xdm_pid($1_mozilla_t)
 +	xserver_user_x_domain_template($1,$1_mozilla,$1_mozilla_t,$1_mozilla_tmpfs_t)
  	xserver_dontaudit_read_xdm_tmp_files($1_mozilla_t)
  	xserver_dontaudit_getattr_xdm_tmp_sockets($1_mozilla_t)
  
-@@ -211,131 +260,8 @@
+@@ -211,131 +262,8 @@
  		fs_manage_cifs_symlinks($1_mozilla_t)
  	')
  
@@ -5686,7 +5689,7 @@
  	')
  
  	optional_policy(`
-@@ -350,57 +276,58 @@
+@@ -350,57 +278,58 @@
  	optional_policy(`
  		cups_read_rw_config($1_mozilla_t)
  		cups_dbus_chat($1_mozilla_t)
@@ -5769,7 +5772,7 @@
  ')
  
  ########################################
-@@ -430,11 +357,11 @@
+@@ -430,11 +359,11 @@
  #
  template(`mozilla_read_user_home_files',`
  	gen_require(`
@@ -5784,7 +5787,7 @@
  ')
  
  ########################################
-@@ -464,11 +391,10 @@
+@@ -464,11 +393,10 @@
  #
  template(`mozilla_write_user_home_files',`
  	gen_require(`
@@ -5798,7 +5801,7 @@
  ')
  
  ########################################
-@@ -573,3 +499,27 @@
+@@ -573,3 +501,27 @@
  
  	allow $2 $1_mozilla_t:tcp_socket rw_socket_perms;
  ')
@@ -5858,8 +5861,17 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.fc serefpolicy-3.3.1/policy/modules/apps/mplayer.fc
 --- nsaserefpolicy/policy/modules/apps/mplayer.fc	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/mplayer.fc	2008-09-08 11:45:12.000000000 -0400
-@@ -10,4 +10,4 @@
++++ serefpolicy-3.3.1/policy/modules/apps/mplayer.fc	2008-09-17 07:30:29.000000000 -0400
+@@ -1,13 +1,8 @@
+ #
+-# /etc
+-#
+-/etc/mplayer(/.*)?		gen_context(system_u:object_r:mplayer_etc_t,s0)
+-
+-#
+ # /usr
+ #
+ /usr/bin/mplayer	--	gen_context(system_u:object_r:mplayer_exec_t,s0)
  /usr/bin/mencoder	--	gen_context(system_u:object_r:mencoder_exec_t,s0)
  /usr/bin/xine		--	gen_context(system_u:object_r:mplayer_exec_t,s0)
  
@@ -6644,8 +6656,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.if serefpolicy-3.3.1/policy/modules/apps/openoffice.if
 --- nsaserefpolicy/policy/modules/apps/openoffice.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/openoffice.if	2008-09-08 11:45:12.000000000 -0400
-@@ -0,0 +1,97 @@
++++ serefpolicy-3.3.1/policy/modules/apps/openoffice.if	2008-09-17 07:25:54.000000000 -0400
+@@ -0,0 +1,98 @@
 +## <summary>Openoffice</summary>
 +
 +#######################################
@@ -6687,6 +6699,7 @@
 +	')
 +
 +	domtrans_pattern($2, openoffice_exec_t, $1_openoffice_t)
++	allow $2  $1_openoffice_t:process { signal sigkill };
 +')
 +
 +#######################################
@@ -10427,7 +10440,7 @@
  read_files_pattern(amavis_t,amavis_etc_t,amavis_etc_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.3.1/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/apache.fc	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/apache.fc	2008-09-16 15:29:46.000000000 -0400
 @@ -1,10 +1,9 @@
 -HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_ROLE_content_t,s0)
 -
@@ -10480,9 +10493,11 @@
  /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)
-@@ -66,10 +69,21 @@
+@@ -65,11 +68,23 @@
+ /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/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_content_rw_t,s0)
@@ -11148,7 +11163,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.3.1/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/apache.te	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/apache.te	2008-09-19 09:53:01.000000000 -0400
 @@ -20,6 +20,8 @@
  # Declarations
  #
@@ -11310,7 +11325,15 @@
  
  corenet_all_recvfrom_unlabeled(httpd_t)
  corenet_all_recvfrom_netlabel(httpd_t)
-@@ -315,9 +364,7 @@
+@@ -299,6 +348,7 @@
+ corenet_tcp_sendrecv_all_ports(httpd_t)
+ corenet_udp_sendrecv_all_ports(httpd_t)
+ corenet_tcp_bind_all_nodes(httpd_t)
++corenet_udp_bind_all_nodes(httpd_t)
+ corenet_tcp_bind_http_port(httpd_t)
+ corenet_tcp_bind_http_cache_port(httpd_t)
+ corenet_sendrecv_http_server_packets(httpd_t)
+@@ -315,9 +365,7 @@
  
  auth_use_nsswitch(httpd_t)
  
@@ -11321,7 +11344,7 @@
  
  domain_use_interactive_fds(httpd_t)
  
-@@ -335,6 +382,10 @@
+@@ -335,6 +383,10 @@
  files_read_var_lib_symlinks(httpd_t)
  
  fs_search_auto_mountpoints(httpd_sys_script_t)
@@ -11332,7 +11355,7 @@
  
  libs_use_ld_so(httpd_t)
  libs_use_shared_libs(httpd_t)
-@@ -351,25 +402,50 @@
+@@ -351,25 +403,50 @@
  
  userdom_use_unpriv_users_fds(httpd_t)
  
@@ -11387,7 +11410,7 @@
  tunable_policy(`httpd_can_network_relay',`
  	# allow httpd to work as a relay
  	corenet_tcp_connect_gopher_port(httpd_t)
-@@ -382,12 +458,26 @@
+@@ -382,12 +459,26 @@
  	corenet_sendrecv_http_cache_client_packets(httpd_t)
  ')
  
@@ -11419,7 +11442,7 @@
  ')
  
  tunable_policy(`httpd_enable_ftp_server',`
-@@ -399,11 +489,21 @@
+@@ -399,11 +490,21 @@
  	fs_read_nfs_symlinks(httpd_t)
  ')
  
@@ -11441,7 +11464,7 @@
  tunable_policy(`httpd_ssi_exec',`
  	corecmd_shell_domtrans(httpd_t,httpd_sys_script_t)
  	allow httpd_sys_script_t httpd_t:fd use;
-@@ -437,8 +537,13 @@
+@@ -437,8 +538,13 @@
  ')
  
  optional_policy(`
@@ -11457,7 +11480,7 @@
  ')
  
  optional_policy(`
-@@ -450,19 +555,13 @@
+@@ -450,19 +556,13 @@
  ')
  
  optional_policy(`
@@ -11478,7 +11501,7 @@
  ')
  
  optional_policy(`
-@@ -472,13 +571,22 @@
+@@ -472,13 +572,22 @@
  	openca_kill(httpd_t)
  ')
  
@@ -11505,7 +11528,7 @@
  ')
  
  optional_policy(`
-@@ -486,6 +594,7 @@
+@@ -486,6 +595,7 @@
  ')
  
  optional_policy(`
@@ -11513,7 +11536,7 @@
  	snmp_dontaudit_read_snmp_var_lib_files(httpd_t)
  	snmp_dontaudit_write_snmp_var_lib_files(httpd_t)
  ')
-@@ -521,6 +630,22 @@
+@@ -521,6 +631,22 @@
  	userdom_use_sysadm_terms(httpd_helper_t)
  ')
  
@@ -11536,7 +11559,7 @@
  ########################################
  #
  # Apache PHP script local policy
-@@ -550,18 +675,26 @@
+@@ -550,18 +676,26 @@
  
  fs_search_auto_mountpoints(httpd_php_t)
  
@@ -11566,7 +11589,7 @@
  ')
  
  ########################################
-@@ -585,6 +718,8 @@
+@@ -585,6 +719,8 @@
  manage_files_pattern(httpd_suexec_t,httpd_suexec_tmp_t,httpd_suexec_tmp_t)
  files_tmp_filetrans(httpd_suexec_t, httpd_suexec_tmp_t, { file dir })
  
@@ -11575,7 +11598,7 @@
  kernel_read_kernel_sysctls(httpd_suexec_t)
  kernel_list_proc(httpd_suexec_t)
  kernel_read_proc_symlinks(httpd_suexec_t)
-@@ -593,9 +728,7 @@
+@@ -593,9 +729,7 @@
  
  fs_search_auto_mountpoints(httpd_suexec_t)
  
@@ -11586,15 +11609,18 @@
  
  files_read_etc_files(httpd_suexec_t)
  files_read_usr_files(httpd_suexec_t)
-@@ -628,6 +761,7 @@
+@@ -626,8 +760,10 @@
+ 	corenet_udp_sendrecv_all_ports(httpd_suexec_t)
+ 	corenet_tcp_connect_all_ports(httpd_suexec_t)
  	corenet_sendrecv_all_client_packets(httpd_suexec_t)
++	sysnet_dns_name_resolve(httpd_suexec_t)
  ')
  
 +domain_entry_file(httpd_sys_script_t,httpd_sys_content_t)
  tunable_policy(`httpd_enable_cgi && httpd_unified',`
  	domtrans_pattern(httpd_suexec_t, httpdcontent, httpd_sys_script_t)
  ')
-@@ -638,6 +772,12 @@
+@@ -638,6 +774,12 @@
  	fs_exec_nfs_files(httpd_suexec_t)
  ')
  
@@ -11607,7 +11633,7 @@
  tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
  	fs_read_cifs_files(httpd_suexec_t)
  	fs_read_cifs_symlinks(httpd_suexec_t)
-@@ -655,10 +795,6 @@
+@@ -655,10 +797,6 @@
  	dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write };
  ')
  
@@ -11618,7 +11644,7 @@
  ########################################
  #
  # Apache system script local policy
-@@ -668,7 +804,8 @@
+@@ -668,7 +806,8 @@
  
  dontaudit httpd_sys_script_t httpd_config_t:dir search;
  
@@ -11628,7 +11654,7 @@
  
  allow httpd_sys_script_t squirrelmail_spool_t:dir list_dir_perms;
  read_files_pattern(httpd_sys_script_t,squirrelmail_spool_t,squirrelmail_spool_t)
-@@ -682,15 +819,44 @@
+@@ -682,15 +821,45 @@
  # Should we add a boolean?
  apache_domtrans_rotatelogs(httpd_sys_script_t)
  
@@ -11663,6 +11689,7 @@
 +	corenet_udp_sendrecv_all_ports(httpd_sys_script_t)
 +	corenet_tcp_connect_all_ports(httpd_sys_script_t)
 +	corenet_sendrecv_all_client_packets(httpd_sys_script_t)
++	sysnet_dns_name_resolve(httpd_sys_script_t)
 +')
 +
 +
@@ -11674,7 +11701,7 @@
  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)
-@@ -703,6 +869,10 @@
+@@ -703,6 +872,10 @@
  optional_policy(`
  	mysql_stream_connect(httpd_sys_script_t)
  	mysql_rw_db_sockets(httpd_sys_script_t)
@@ -11685,7 +11712,7 @@
  ')
  
  ########################################
-@@ -724,3 +894,71 @@
+@@ -724,3 +897,71 @@
  logging_search_logs(httpd_rotatelogs_t)
  
  miscfiles_read_localization(httpd_rotatelogs_t)
@@ -13614,7 +13641,7 @@
 +/var/lib/misc(/.*)?			gen_context(system_u:object_r:system_crond_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.3.1/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/cron.if	2008-09-12 13:45:31.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/cron.if	2008-09-16 14:09:57.000000000 -0400
 @@ -35,38 +35,24 @@
  #
  template(`cron_per_role_template',`
@@ -13905,7 +13932,7 @@
  ')
  
  ########################################
-@@ -583,3 +502,62 @@
+@@ -583,3 +502,61 @@
  
  	dontaudit $1 system_crond_tmp_t:file append;
  ')
@@ -13924,8 +13951,7 @@
 +#
 +interface(`cron_dontaudit_write_system_job_tmp_files',`
 +	gen_require(`
-+		type system_crond_tmp_t;
-+		type system_crond_var_run_t;
++		type system_crond_tmp_t, cron_var_run_t;
 +	')
 +
 +	dontaudit $1 system_crond_tmp_t:file write_file_perms;
@@ -14318,7 +14344,7 @@
 +/usr/lib/cups/backend/cups-pdf	--	gen_context(system_u:object_r:cups_pdf_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-3.3.1/policy/modules/services/cups.if
 --- nsaserefpolicy/policy/modules/services/cups.if	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/cups.if	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/cups.if	2008-09-17 07:27:09.000000000 -0400
 @@ -20,6 +20,30 @@
  
  ########################################
@@ -21605,8 +21631,8 @@
 +/var/lib/PolicyKit-public(/.*)?			gen_context(system_u:object_r:polkit_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.if serefpolicy-3.3.1/policy/modules/services/polkit.if
 --- nsaserefpolicy/policy/modules/services/polkit.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/polkit.if	2008-09-08 11:45:12.000000000 -0400
-@@ -0,0 +1,212 @@
++++ serefpolicy-3.3.1/policy/modules/services/polkit.if	2008-09-16 15:04:48.000000000 -0400
+@@ -0,0 +1,213 @@
 +
 +## <summary>policy for polkit_auth</summary>
 +
@@ -21710,6 +21736,7 @@
 +	allow polkit_resolve_t $1:dir list_dir_perms;
 +	read_files_pattern(polkit_resolve_t, $1, $1)
 +	read_lnk_files_pattern(polkit_resolve_t, $1, $1)
++	allow polkit_resolve_t $1:process getattr;
 +')
 +
 +########################################
@@ -23737,8 +23764,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.3.1/policy/modules/services/prelude.te
 --- nsaserefpolicy/policy/modules/services/prelude.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/prelude.te	2008-09-08 11:45:12.000000000 -0400
-@@ -0,0 +1,257 @@
++++ serefpolicy-3.3.1/policy/modules/services/prelude.te	2008-09-19 09:41:26.000000000 -0400
+@@ -0,0 +1,260 @@
 +
 +policy_module(prelude, 1.0.0)
 +
@@ -23905,6 +23932,8 @@
 +# prelude_lml local declarations
 +#
 +
++allow prelude_lml_t self:capability dac_override;
++
 +# Init script handling
 +# Test me
 +domain_use_interactive_fds(prelude_lml_t)
@@ -23969,6 +23998,7 @@
 +')
 +
 +optional_policy(`
++	apache_search_sys_content(httpd_lml_t)
 +	apache_read_log(prelude_lml_t)
 +')
 +
@@ -25080,7 +25110,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.3.1/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/rpc.te	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/rpc.te	2008-09-18 16:54:48.000000000 -0400
 @@ -23,7 +23,7 @@
  gen_tunable(allow_nfsd_anon_write,false)
  
@@ -25175,9 +25205,9 @@
 +
  miscfiles_read_certs(gssd_t)
  
-+userdom_dontaudit_search_users_home_dirs(rpcd_t)
-+userdom_dontaudit_search_sysadm_home_dirs(rpcd_t)
-+userdom_dontaudit_write_user_tmp_files(user, rpcd_t)
++userdom_dontaudit_search_users_home_dirs(gssd_t)
++userdom_dontaudit_search_sysadm_home_dirs(gssd_t)
++userdom_dontaudit_manage_user_tmp_files(user, gssd_t)
 +
  tunable_policy(`allow_gssd_read_tmp',`
  	userdom_list_unpriv_users_tmp(gssd_t) 
@@ -41493,8 +41523,8 @@
 +## <summary>Policy for guest user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.3.1/policy/modules/users/guest.te
 --- nsaserefpolicy/policy/modules/users/guest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/guest.te	2008-09-08 11:45:13.000000000 -0400
-@@ -0,0 +1,31 @@
++++ serefpolicy-3.3.1/policy/modules/users/guest.te	2008-09-17 09:08:26.000000000 -0400
+@@ -0,0 +1,33 @@
 +policy_module(guest,1.0.1)
 +userdom_restricted_user_template(guest)
 +
@@ -41525,6 +41555,8 @@
 +	')
 +	
 +	domtrans_pattern(xguest_mozilla_t, openoffice_exec_t, xguest_openoffice_t)
++	allow xguest_mozilla_t xguest_openoffice_t:process { signal sigkill };
++	allow xguest_openoffice_t xguest_mozilla_t:unix_stream_socket connectto;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.3.1/policy/modules/users/logadm.fc
 --- nsaserefpolicy/policy/modules/users/logadm.fc	1969-12-31 19:00:00.000000000 -0500


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v
retrieving revision 1.708
retrieving revision 1.709
diff -u -r1.708 -r1.709
--- selinux-policy.spec	16 Sep 2008 16:54:43 -0000	1.708
+++ selinux-policy.spec	19 Sep 2008 13:54:22 -0000	1.709
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.3.1
-Release: 91%{?dist}
+Release: 92%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -386,6 +386,9 @@
 %endif
 
 %changelog
+* Tue Sep 18 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-92
+- Dontaudit attempts to write user_tmp_t by gssd_t
+
 * Mon Sep 15 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-91
 - Allow nsplugin_cong dac capabilities.
 



From cebbert at fedoraproject.org  Fri Sep 19 14:02:29 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 19 Sep 2008 14:02:29 +0000 (UTC)
Subject: rpms/kernel/F-8 linux-2.6-x86-pci-detect-end_bus_number.patch, NONE,
	1.1 kernel.spec, 1.534, 1.535
Message-ID: <20080919140230.0024A700F7@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8120

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-pci-detect-end_bus_number.patch 
Log Message:
x86: pci: detect end_bus_number according to acpi/e820 reserved, v2 (F9#462210)

linux-2.6-x86-pci-detect-end_bus_number.patch:

--- NEW FILE linux-2.6-x86-pci-detect-end_bus_number.patch ---
From: Yinghai Lu <yhlu.kernel at gmail.com>
Date: Fri, 18 Jul 2008 20:22:36 +0000 (-0700)
Subject: x86, pci: detect end_bus_number according to acpi/e820 reserved, v2
X-Git-Tag: v2.6.27-rc4~36^2^2^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=a83fe32fa668c0a17b3f99a1480b006f7d649924

x86, pci: detect end_bus_number according to acpi/e820 reserved, v2

Jack Howarth reported that 2.6.26-rc9-git9 doesn't boot on MacBookPro2.

the reason is a faulty BIOS update that reportes faulty resources.

Nevertheless it's possible for Linux to be more resolent about this
situation (and similar situations) and work around this bug, by
cross-checking the mmconf range against the e820 table and ACPI resources.

Change the mconf bus range from [0,0xff] to to [0, 0x3f]
to match range [0xf0000000, 0xf4000000) in e820 tables.

[ v2, yhlu.kernel at gmail.com:
  x86, pci: detect end_bus_number according to acpi/e820 reserved - fix ]

Reported-by: Jack Howarth <howarth at bromo.msbb.uc.edu>
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Cc: jbarnes at virtuousgeek.org
Cc: Jack Howarth <howarth at bromo.msbb.uc.edu>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 23faaa8..429c701 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -293,7 +293,7 @@ static acpi_status __init find_mboard_resource(acpi_handle handle, u32 lvl,
 	return AE_OK;
 }
 
-static int __init is_acpi_reserved(unsigned long start, unsigned long end)
+static int __init is_acpi_reserved(u64 start, u64 end, unsigned not_used)
 {
 	struct resource mcfg_res;
 
@@ -310,6 +310,41 @@ static int __init is_acpi_reserved(unsigned long start, unsigned long end)
 	return mcfg_res.flags;
 }
 
+typedef int (*check_reserved_t)(u64 start, u64 end, unsigned type);
+
+static int __init is_mmconf_reserved(check_reserved_t is_reserved,
+		u64 addr, u64 size, int i,
+		typeof(pci_mmcfg_config[0]) *cfg, int with_e820)
+{
+	u64 old_size = size;
+	int valid = 0;
+
+	while (!is_reserved(addr, addr + size - 1, E820_RESERVED)) {
+		size >>= 1;
+		if (size < (16UL<<20))
+			break;
+	}
+
+	if (size >= (16UL<<20) || size == old_size) {
+		printk(KERN_NOTICE
+		       "PCI: MCFG area at %Lx reserved in %s\n",
+			addr, with_e820?"E820":"ACPI motherboard resources");
+		valid = 1;
+
+		if (old_size != size) {
+			/* update end_bus_number */
+			cfg->end_bus_number = cfg->start_bus_number + ((size>>20) - 1);
+			printk(KERN_NOTICE "PCI: updated MCFG configuration %d: base %lx "
+			       "segment %hu buses %u - %u\n",
+			       i, (unsigned long)cfg->address, cfg->pci_segment,
+			       (unsigned int)cfg->start_bus_number,
+			       (unsigned int)cfg->end_bus_number);
+		}
+	}
+
+	return valid;
+}
+
 static void __init pci_mmcfg_reject_broken(int early)
 {
 	typeof(pci_mmcfg_config[0]) *cfg;
@@ -324,21 +359,22 @@ static void __init pci_mmcfg_reject_broken(int early)
 
 	for (i = 0; i < pci_mmcfg_config_num; i++) {
 		int valid = 0;
-		u32 size = (cfg->end_bus_number + 1) << 20;
+		u64 addr, size;
+
 		cfg = &pci_mmcfg_config[i];
+		addr = cfg->start_bus_number;
+		addr <<= 20;
+		addr += cfg->address;
+		size = cfg->end_bus_number + 1 - cfg->start_bus_number;
+		size <<= 20;
 		printk(KERN_NOTICE "PCI: MCFG configuration %d: base %lx "
 		       "segment %hu buses %u - %u\n",
 		       i, (unsigned long)cfg->address, cfg->pci_segment,
 		       (unsigned int)cfg->start_bus_number,
 		       (unsigned int)cfg->end_bus_number);
 
-		if (!early &&
-		    is_acpi_reserved(cfg->address, cfg->address + size - 1)) {
-			printk(KERN_NOTICE "PCI: MCFG area at %Lx reserved "
-			       "in ACPI motherboard resources\n",
-			       cfg->address);
-			valid = 1;
-		}
+		if (!early)
+			valid = is_mmconf_reserved(is_acpi_reserved, addr, size, i, cfg, 0);
 
 		if (valid)
 			continue;
@@ -347,16 +383,11 @@ static void __init pci_mmcfg_reject_broken(int early)
 			printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %Lx is not"
 			       " reserved in ACPI motherboard resources\n",
 			       cfg->address);
+
 		/* Don't try to do this check unless configuration
 		   type 1 is available. how about type 2 ?*/
-		if (raw_pci_ops && e820_all_mapped(cfg->address,
-						  cfg->address + size - 1,
-						  E820_RESERVED)) {
-			printk(KERN_NOTICE
-			       "PCI: MCFG area at %Lx reserved in E820\n",
-			       cfg->address);
-			valid = 1;
-		}
+		if (raw_pci_ops)
+			valid = is_mmconf_reserved(e820_all_mapped, addr, size, i, cfg, 1);
 
 		if (!valid)
 			goto reject;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.534
retrieving revision 1.535
diff -u -r1.534 -r1.535
--- kernel.spec	19 Sep 2008 13:37:24 -0000	1.534
+++ kernel.spec	19 Sep 2008 14:01:59 -0000	1.535
@@ -592,6 +592,7 @@
 Patch97: linux-2.6-x86-hpet-04-workaround-sb700-bios.patch
 Patch98: linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch
 Patch99: linux-2.6-x86-intel-msr-backport.patch
+Patch100: linux-2.6-x86-pci-detect-end_bus_number.patch
 
 #ALSA
 
@@ -1046,6 +1047,8 @@
 ApplyPatch linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch
 # backport MSR patch
 ApplyPatch linux-2.6-x86-intel-msr-backport.patch
+# fix e820 reservation checking
+ApplyPatch linux-2.6-x86-pci-detect-end_bus_number.patch
 
 #
 # PowerPC
@@ -1854,6 +1857,9 @@
 
 
 %changelog
+* Fri Sep 19 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-25
+- x86: pci: detect end_bus_number according to acpi/e820 reserved, v2 (F9#462210)
+
 * Fri Sep 19 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-24
 - utrace: Fix common oops in ptrace EPERM case (from F9)
 



From transif at fedoraproject.org  Fri Sep 19 14:05:10 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Fri, 19 Sep 2008 14:05:10 +0000 (UTC)
Subject: comps/po it.po,1.20,1.21
Message-ID: <20080919140510.10DFE700F7@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9088/po

Modified Files:
	it.po 
Log Message:
    2008-09-19  Francesco Tombolini <tombo at adamantio.net> (via
tombo at fedoraproject.org)
    
      * po/it.po: Updated italian translation
    



Index: it.po
===================================================================
RCS file: /cvs/pkgs/comps/po/it.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- it.po	17 Sep 2008 22:44:35 -0000	1.20
+++ it.po	19 Sep 2008 14:04:39 -0000	1.21
@@ -1,6 +1,5 @@
 # translation of comps.HEAD.it.po to Italiano
 #
-#
 # Francesco Valente <fvalen at redhat.com>, 2002, 2003, 2004.
 # Lorenzo Stobbione <lorenzo.stobbione at clsengineering.it>, 2004, 2005.
 # Francesco Tombolini <tombo at adamantio.net>, 2006, 2007, 2008.
@@ -8,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: comps.HEAD.it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-09-14 18:28+0200\n"
+"POT-Creation-Date: 2008-09-19 09:24+0000\n"
+"PO-Revision-Date: 2008-09-19 16:02+0200\n"
 "Last-Translator: Francesco Tombolini <tombo at adamantio.net>\n"
 "Language-Team: Italiano <fedora-trans-it at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -21,8 +20,7 @@
 #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
-"Un ambiente desktop leggero che funziona bene con macchine di basso livello."
+msgstr "Un ambiente desktop leggero che funziona bene con macchine di basso livello."
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
 #: ../comps-f10.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
@@ -398,21 +396,18 @@
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
 #: ../comps-f10.xml.in.h:80 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
-msgstr ""
-"Installare questi pacchetti per sviluppare le applicazioni grafiche QT e KDE."
+msgstr "Installare questi pacchetti per sviluppare le applicazioni grafiche QT e KDE."
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:81
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "Installare questi strumenti per permettere al sistema di stampare o fungere "
 "da server di stampa."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
 #: ../comps-f10.xml.in.h:82 ../comps-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 ""
 "Installare questo gruppo di pacchetti per usare l'interfaccia utente grafica "
 "(X) di base."
@@ -652,10 +647,8 @@
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
 #: ../comps-f10.xml.in.h:143 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
-msgstr ""
-"Semplici window managers che non sono parte di grandi ambienti desktop."
+msgid "Simple window managers that aren't part of a larger desktop environment."
+msgstr "Semplici window managers che non sono parte di grandi ambienti desktop."
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:137
 #: ../comps-f10.xml.in.h:145
@@ -719,8 +712,7 @@
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:148
 #: ../comps-f10.xml.in.h:157 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
-msgstr ""
-"Supporto per sviluppare programmi nel linguaggio di programmazione Java."
+msgstr "Supporto per sviluppare programmi nel linguaggio di programmazione Java."
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:149
 #: ../comps-f10.xml.in.h:158 ../comps-el4.xml.in.h:47
@@ -782,8 +774,7 @@
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
 #: ../comps-f10.xml.in.h:169
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+msgid "The packages in this group are core libraries needed to develop applications."
 msgstr ""
 "I pacchetti di questo gruppo sono le principali librerie di sviluppo delle "
 "applicazioni."
@@ -791,29 +782,25 @@
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:160
 #: ../comps-f10.xml.in.h:170 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
-msgstr ""
-"Questi pacchetti consentono di configurare un server di posta IMAP o SMTP."
+msgstr "Questi pacchetti consentono di configurare un server di posta IMAP o SMTP."
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
 #: ../comps-f10.xml.in.h:171
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr ""
 "Questi pacchetti consentono di sviluppare applicazioni per il sistema X "
 "Window."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:162
 #: ../comps-f10.xml.in.h:172 ../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 ""
 "Questi pacchetti sono d'aiuto quando si sviluppano applicazioni web o pagine "
 "web."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:163
 #: ../comps-f10.xml.in.h:173
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
 "Questi pacchetti includono server basati sulla rete come ad esempio DHCP, "
 "Kerberos e NIS."
@@ -835,8 +822,7 @@
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:166
 #: ../comps-f10.xml.in.h:176
 msgid "These packages provide compatibility with previous releases."
-msgstr ""
-"Questi pacchetti forniscono la compatibilit?? con le versioni precedenti."
+msgstr "Questi pacchetti forniscono la compatibilit?? con le versioni precedenti."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:167
 #: ../comps-f10.xml.in.h:177
@@ -938,16 +924,14 @@
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
 #: ../comps-f10.xml.in.h:190 ../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 ""
 "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti "
 "armeni."
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:181
 #: ../comps-f10.xml.in.h:191 ../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 ""
 "Questo gruppo ?? una collezione di strumenti per varie utilit?? specifiche "
 "hardware."
@@ -964,8 +948,7 @@
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
 #: ../comps-f10.xml.in.h:193
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
 "Questo gruppo di pacchetti consente di eseguire un server dei nomi DNS "
 "(BIND) sul sistema."
@@ -1190,14 +1173,12 @@
 msgstr "Pacchetti dei metodi di input per l'input di testo internazionale."
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "Supporto per il kmero"
+msgstr "Supporto per il Kashmiri"
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "Supporto per il coreano"
+msgstr "Supporto per il Konkani"
 
 #: ../comps-f10.xml.in.h:110
 msgid "Maithili Support"
@@ -1208,14 +1189,12 @@
 msgstr "Supporto myanmar (Burmese)"
 
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "Supporto per l'Hindi"
+msgstr "Supporto per il Sindhi"
 
 #: ../comps-f10.xml.in.h:156
 msgid "Support for developing programs in the Haskell programming language."
-msgstr ""
-"Supporto per sviluppare programmi nel linguaggio di programmazione Haskell."
+msgstr "Supporto per sviluppare programmi nel linguaggio di programmazione Haskell."
 
 #: ../comps-f10.xml.in.h:163
 msgid "Tajik Support"
@@ -1274,22 +1253,19 @@
 msgstr "Questo gruppo ?? una collezione di servers di rete per scopi specifici"
 
 #: ../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 ""
 "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti "
 "arabici."
 
 #: ../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 ""
 "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti "
 "ebraici."
 
 #: ../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 ""
 "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti "
 "giapponesi."
@@ -1299,7 +1275,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
-msgstr ""
-"Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti cechi."
+msgid "This group is a collection of tools and resources of Czech environments."
+msgstr "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti cechi."
+



From rstrode at fedoraproject.org  Fri Sep 19 14:11:40 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 19 Sep 2008 14:11:40 +0000 (UTC)
Subject: rpms/gdm/devel gdm-2.23.92-fix-crash.patch, NONE, 1.1 gdm.spec,
	1.417, 1.418
Message-ID: <20080919141140.8A95E700F7@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11065

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.23.92-fix-crash.patch 
Log Message:
- Fix crash from language dialog


gdm-2.23.92-fix-crash.patch:

--- NEW FILE gdm-2.23.92-fix-crash.patch ---
--- gdm-2.23.92/gui/simple-greeter/gdm-option-widget.c	2008-08-26 15:03:59.000000000 -0400
+++ foo/gui/simple-greeter/gdm-option-widget.c	2008-09-19 09:57:30.000000000 -0400
@@ -148,7 +148,8 @@
         model = GTK_TREE_MODEL (widget->priv->list_store);
         item_id = NULL;
 
-        if (widget->priv->active_row == NULL) {
+        if (widget->priv->active_row == NULL ||
+            !gtk_tree_row_reference_valid (widget->priv->active_row)) {
                 return NULL;
         }
 


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -r1.417 -r1.418
--- gdm.spec	17 Sep 2008 15:15:09 -0000	1.417
+++ gdm.spec	19 Sep 2008 14:11:10 -0000	1.418
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.23.92
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -89,6 +89,7 @@
 Patch6: ssid-leak.patch
 Patch7: gdm-2.23.92-filter-dupes-from-lang-list.patch
 Patch8: gdm-2.23.92-another-locale-fixup.patch
+Patch9: gdm-2.23.92-fix-crash.patch
 
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
@@ -118,6 +119,7 @@
 %patch6 -p1 -b .ssid-leak
 %patch7 -p1 -b .filter-dupes-from-lang-list
 %patch8 -p1 -b .another-locale-fixup
+%patch9 -p1 -b .fix-crash
 
 %patch99 -p1 -b .fedora-logo
 
@@ -320,6 +322,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Fri Sep 19 2008 Ray Strode <rstrode at redhat.com> - 1:2.23.92-9
+- Fix crash from language dialog
+
 * Wed Sep 17 2008 Ray Strode <rstrode at redhat.com> - 1:2.23.92-8
 - canonicalize codeset to match output of locale -m
 - filter duplicates from language list



From dwalsh at fedoraproject.org  Fri Sep 19 14:26:24 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 19 Sep 2008 14:26:24 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch,1.210,1.211
Message-ID: <20080919142624.510D9700F7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16138

Modified Files:
	policy-20071130.patch 
Log Message:
* Tue Sep 18 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-92
- Dontaudit attempts to write user_tmp_t by gssd_t


policy-20071130.patch:

Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- policy-20071130.patch	19 Sep 2008 13:54:21 -0000	1.210
+++ policy-20071130.patch	19 Sep 2008 14:26:23 -0000	1.211
@@ -11163,7 +11163,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.3.1/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/apache.te	2008-09-19 09:53:01.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/apache.te	2008-09-19 10:06:13.000000000 -0400
 @@ -20,6 +20,8 @@
  # Declarations
  #
@@ -11609,18 +11609,15 @@
  
  files_read_etc_files(httpd_suexec_t)
  files_read_usr_files(httpd_suexec_t)
-@@ -626,8 +760,10 @@
- 	corenet_udp_sendrecv_all_ports(httpd_suexec_t)
- 	corenet_tcp_connect_all_ports(httpd_suexec_t)
+@@ -628,6 +762,7 @@
  	corenet_sendrecv_all_client_packets(httpd_suexec_t)
-+	sysnet_dns_name_resolve(httpd_suexec_t)
  ')
  
 +domain_entry_file(httpd_sys_script_t,httpd_sys_content_t)
  tunable_policy(`httpd_enable_cgi && httpd_unified',`
  	domtrans_pattern(httpd_suexec_t, httpdcontent, httpd_sys_script_t)
  ')
-@@ -638,6 +774,12 @@
+@@ -638,6 +773,12 @@
  	fs_exec_nfs_files(httpd_suexec_t)
  ')
  
@@ -11633,7 +11630,7 @@
  tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
  	fs_read_cifs_files(httpd_suexec_t)
  	fs_read_cifs_symlinks(httpd_suexec_t)
-@@ -655,10 +797,6 @@
+@@ -655,10 +796,6 @@
  	dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write };
  ')
  
@@ -11644,7 +11641,7 @@
  ########################################
  #
  # Apache system script local policy
-@@ -668,7 +806,8 @@
+@@ -668,7 +805,8 @@
  
  dontaudit httpd_sys_script_t httpd_config_t:dir search;
  
@@ -11654,7 +11651,7 @@
  
  allow httpd_sys_script_t squirrelmail_spool_t:dir list_dir_perms;
  read_files_pattern(httpd_sys_script_t,squirrelmail_spool_t,squirrelmail_spool_t)
-@@ -682,15 +821,45 @@
+@@ -682,15 +820,46 @@
  # Should we add a boolean?
  apache_domtrans_rotatelogs(httpd_sys_script_t)
  
@@ -11679,6 +11676,8 @@
 +	allow httpd_sys_script_t self:tcp_socket create_stream_socket_perms;
 +	allow httpd_sys_script_t self:udp_socket create_socket_perms;
 +
++	corenet_tcp_bind_all_nodes(httpd_sys_script_t)
++	corenet_udp_bind_all_nodes(httpd_sys_script_t)
 +	corenet_all_recvfrom_unlabeled(httpd_sys_script_t)
 +	corenet_all_recvfrom_netlabel(httpd_sys_script_t)
 +	corenet_tcp_sendrecv_all_if(httpd_sys_script_t)
@@ -11689,7 +11688,6 @@
 +	corenet_udp_sendrecv_all_ports(httpd_sys_script_t)
 +	corenet_tcp_connect_all_ports(httpd_sys_script_t)
 +	corenet_sendrecv_all_client_packets(httpd_sys_script_t)
-+	sysnet_dns_name_resolve(httpd_sys_script_t)
 +')
 +
 +
@@ -23239,7 +23237,7 @@
 +/var/spool/postfix/postgrey(/.*)?	gen_context(system_u:object_r:postgrey_spool_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.if serefpolicy-3.3.1/policy/modules/services/postgrey.if
 --- nsaserefpolicy/policy/modules/services/postgrey.if	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/postgrey.if	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/postgrey.if	2008-09-19 10:23:53.000000000 -0400
 @@ -12,10 +12,82 @@
  #
  interface(`postgrey_stream_connect',`
@@ -23249,8 +23247,9 @@
          ')
  
  	allow $1 postgrey_t:unix_stream_socket connectto;
-         allow $1 postgrey_var_run_t:sock_file write;
-+        allow $1 postgrey_spool_t:sock_file write;
+-        allow $1 postgrey_var_run_t:sock_file write;
++	write_sock_files_pattern($1, postgrey_var_run_t,  postgrey_var_run_t)
++	write_sock_files_pattern($1, postgrey_spool_t,  postgrey_spool_t)
  	files_search_pids($1)
  ')
 +
@@ -23764,7 +23763,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.3.1/policy/modules/services/prelude.te
 --- nsaserefpolicy/policy/modules/services/prelude.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/prelude.te	2008-09-19 09:41:26.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/prelude.te	2008-09-19 10:06:47.000000000 -0400
 @@ -0,0 +1,260 @@
 +
 +policy_module(prelude, 1.0.0)
@@ -23998,7 +23997,7 @@
 +')
 +
 +optional_policy(`
-+	apache_search_sys_content(httpd_lml_t)
++	apache_search_sys_content(prelude_lml_t)
 +	apache_read_log(prelude_lml_t)
 +')
 +
@@ -36006,7 +36005,7 @@
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.3.1/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/sysnetwork.if	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/system/sysnetwork.if	2008-09-19 10:05:27.000000000 -0400
 @@ -145,6 +145,25 @@
  
  ########################################



From pkgdb at fedoraproject.org  Fri Sep 19 14:41:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 14:41:30 +0000
Subject: [pkgdb] MAKEDEV had acl change status
Message-ID: <20080919144130.4EE81208D9F@bastion.fedora.phx.redhat.com>

clumens has set the commit acl on MAKEDEV (Fedora devel) to Approved for airlied

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/MAKEDEV



From dwalsh at fedoraproject.org  Fri Sep 19 14:42:26 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 19 Sep 2008 14:42:26 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch,1.211,1.212
Message-ID: <20080919144226.9CBCE700F7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21006

Modified Files:
	policy-20071130.patch 
Log Message:
* Tue Sep 18 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-92
- Dontaudit attempts to write user_tmp_t by gssd_t


policy-20071130.patch:

Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- policy-20071130.patch	19 Sep 2008 14:26:23 -0000	1.211
+++ policy-20071130.patch	19 Sep 2008 14:42:25 -0000	1.212
@@ -19137,8 +19137,21 @@
 +/usr/lib/mailman/mail/mailman --	gen_context(system_u:object_r:mailman_mail_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-3.3.1/policy/modules/services/mailman.if
 --- nsaserefpolicy/policy/modules/services/mailman.if	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/mailman.if	2008-09-08 11:45:12.000000000 -0400
-@@ -211,6 +211,7 @@
++++ serefpolicy-3.3.1/policy/modules/services/mailman.if	2008-09-19 10:41:32.000000000 -0400
+@@ -31,6 +31,12 @@
+ 	allow mailman_$1_t self:tcp_socket create_stream_socket_perms;
+ 	allow mailman_$1_t self:udp_socket create_socket_perms;
+ 
++	files_search_spool(mailman_$1_t)
++
++	manage_dirs_pattern(mailman_$1_t, mailman_archive_t, mailman_archive_t)
++	manage_files_pattern(mailman_$1_t, mailman_archive_t, mailman_archive_t)
++	manage_lnk_files_pattern(mailman_$1_t, mailman_archive_t, mailman_archive_t)
++
+ 	manage_dirs_pattern(mailman_$1_t,mailman_data_t,mailman_data_t)
+ 	manage_files_pattern(mailman_$1_t,mailman_data_t,mailman_data_t)
+ 	manage_lnk_files_pattern(mailman_$1_t,mailman_data_t,mailman_data_t)
+@@ -211,6 +217,7 @@
  		type mailman_data_t;
  	')
  
@@ -19146,7 +19159,7 @@
  	manage_files_pattern($1,mailman_data_t,mailman_data_t)
  ')
  
-@@ -252,6 +253,25 @@
+@@ -252,6 +259,25 @@
  
  #######################################
  ## <summary>
@@ -19174,7 +19187,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.3.1/policy/modules/services/mailman.te
 --- nsaserefpolicy/policy/modules/services/mailman.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/mailman.te	2008-09-11 13:48:31.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/mailman.te	2008-09-19 10:40:19.000000000 -0400
 @@ -53,10 +53,9 @@
  	apache_use_fds(mailman_cgi_t)
  	apache_dontaudit_append_log(mailman_cgi_t)
@@ -19208,6 +19221,18 @@
  
  ifdef(`TODO',`
  optional_policy(`
+@@ -107,5 +117,10 @@
+ su_exec(mailman_queue_t)
+ 
+ optional_policy(`
+-	cron_system_entry(mailman_queue_t,mailman_queue_exec_t)
++	apache_read_config(mailman_queue_t)
+ ')
++
++optional_policy(`
++	cron_system_entry(mailman_queue_t, mailman_queue_exec_t)
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.fc serefpolicy-3.3.1/policy/modules/services/mailscanner.fc
 --- nsaserefpolicy/policy/modules/services/mailscanner.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.3.1/policy/modules/services/mailscanner.fc	2008-09-08 11:45:12.000000000 -0400



From victorv at fedoraproject.org  Fri Sep 19 15:17:30 2008
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Fri, 19 Sep 2008 15:17:30 +0000 (UTC)
Subject: rpms/netbeans/devel netbeans-6.1-60-small-ide-config.patch, 1.1,
	1.2 netbeans.spec, 1.1, 1.2
Message-ID: <20080919151730.96324700F7@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/netbeans/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32576/devel

Modified Files:
	netbeans-6.1-60-small-ide-config.patch netbeans.spec 
Log Message:
Release 5


netbeans-6.1-60-small-ide-config.patch:

Index: netbeans-6.1-60-small-ide-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/netbeans-6.1-60-small-ide-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netbeans-6.1-60-small-ide-config.patch	10 Sep 2008 00:38:06 -0000	1.1
+++ netbeans-6.1-60-small-ide-config.patch	19 Sep 2008 15:17:30 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur -x '*.orig' -x '*~' netbeans-6.1/form.kit/nbproject/project.xml netbeans-6.1.new/form.kit/nbproject/project.xml
---- netbeans-6.1/form.kit/nbproject/project.xml	2008-06-16 17:33:03.000000000 +0400
-+++ netbeans-6.1.new/form.kit/nbproject/project.xml	2008-06-16 17:36:44.000000000 +0400
+diff -Nur netbeans-6.1/form.kit/nbproject/project.xml netbeans-6.1.new/form.kit/nbproject/project.xml
+--- netbeans-6.1/form.kit/nbproject/project.xml	2008-06-24 16:16:34.000000000 +0400
++++ netbeans-6.1.new/form.kit/nbproject/project.xml	2008-09-18 20:15:46.000000000 +0400
 @@ -12,13 +12,13 @@
                          <specification-version>1.22</specification-version>
                      </run-dependency>
@@ -17,7 +17,7 @@
                  <dependency>
                      <code-name-base>org.netbeans.modules.i18n.form</code-name-base>
                      <run-dependency>
-@@ -26,12 +26,12 @@
+@@ -26,24 +26,24 @@
                          <specification-version>1.21</specification-version>
                      </run-dependency>
                  </dependency>
@@ -32,9 +32,23 @@
                  <dependency>
                      <code-name-base>org.netbeans.modules.java.kit</code-name-base>
                      <run-dependency>
-diff -Nur -x '*.orig' -x '*~' netbeans-6.1/ide.kit/nbproject/project.xml netbeans-6.1.new/ide.kit/nbproject/project.xml
---- netbeans-6.1/ide.kit/nbproject/project.xml	2008-06-16 17:33:03.000000000 +0400
-+++ netbeans-6.1.new/ide.kit/nbproject/project.xml	2008-06-16 17:36:44.000000000 +0400
+                         <specification-version>1.0</specification-version>
+                     </run-dependency>
+                 </dependency>
+-                <dependency>
++                <!--dependency>
+                     <code-name-base>org.netbeans.modules.swingapp</code-name-base>
+                     <run-dependency>
+                         <specification-version>1.1</specification-version>
+                     </run-dependency>
+-                </dependency>
++                </dependency-->
+             </module-dependencies>
+             <public-packages/>
+         </data>
+diff -Nur netbeans-6.1/ide.kit/nbproject/project.xml netbeans-6.1.new/ide.kit/nbproject/project.xml
+--- netbeans-6.1/ide.kit/nbproject/project.xml	2008-06-24 16:16:03.000000000 +0400
++++ netbeans-6.1.new/ide.kit/nbproject/project.xml	2008-09-18 20:14:41.000000000 +0400
 @@ -130,13 +130,13 @@
                          <specification-version>1.11</specification-version>
                      </run-dependency>
@@ -51,9 +65,9 @@
                  <dependency>
                      <code-name-base>org.netbeans.modules.ide.branding</code-name-base>
                      <run-dependency>
-diff -Nur -x '*.orig' -x '*~' netbeans-6.1/java.kit/nbproject/project.xml netbeans-6.1.new/java.kit/nbproject/project.xml
---- netbeans-6.1/java.kit/nbproject/project.xml	2008-06-16 17:33:03.000000000 +0400
-+++ netbeans-6.1.new/java.kit/nbproject/project.xml	2008-06-16 17:37:41.000000000 +0400
+diff -Nur netbeans-6.1/java.kit/nbproject/project.xml netbeans-6.1.new/java.kit/nbproject/project.xml
+--- netbeans-6.1/java.kit/nbproject/project.xml	2008-06-24 16:16:47.000000000 +0400
++++ netbeans-6.1.new/java.kit/nbproject/project.xml	2008-09-18 20:14:41.000000000 +0400
 @@ -66,13 +66,13 @@
                          <specification-version>1.6</specification-version>
                      </run-dependency>
@@ -88,9 +102,9 @@
              </module-dependencies>
              <public-packages/>
          </data>
-diff -Nur -x '*.orig' -x '*~' netbeans-6.1/nbbuild/cluster.properties netbeans-6.1.new/nbbuild/cluster.properties
---- netbeans-6.1/nbbuild/cluster.properties	2008-06-16 17:33:03.000000000 +0400
-+++ netbeans-6.1.new/nbbuild/cluster.properties	2008-06-16 17:36:44.000000000 +0400
+diff -Nur netbeans-6.1/nbbuild/cluster.properties netbeans-6.1.new/nbbuild/cluster.properties
+--- netbeans-6.1/nbbuild/cluster.properties	2008-06-24 16:17:06.000000000 +0400
++++ netbeans-6.1.new/nbbuild/cluster.properties	2008-09-18 20:55:18.000000000 +0400
 @@ -231,14 +231,6 @@
          api.xml,\
          classfile,\
@@ -140,13 +154,11 @@
  
  nb.cluster.java.dir=java2
  nb.cluster.java.depends=\
-@@ -349,27 +337,19 @@
-         ant.kit,\
+@@ -350,26 +338,18 @@
          api.debugger.jpda,\
          api.java,\
--        beans,\
+         beans,\
 -        dbschema,\
-+	beans,\
          debugger.jpda,\
          debugger.jpda.ant,\
          debugger.jpda.projects,\
@@ -169,7 +181,7 @@
          java.api.common,\
          java.debug,\
          java.editor,\
-@@ -395,16 +375,10 @@
+@@ -395,16 +375,9 @@
          junit,\
          libs.javacapi,\
          libs.javacimpl,\
@@ -178,7 +190,7 @@
          o.jdesktop.beansbinding,\
          refactoring.java,\
 -        spring.beans,\
-         swingapp,\
+-        swingapp,\
 -        websvc.jaxws21,\
 -        websvc.jaxws21api,\
 -        websvc.serviceapi,\


Index: netbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/netbeans.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netbeans.spec	10 Sep 2008 00:38:06 -0000	1.1
+++ netbeans.spec	19 Sep 2008 15:17:30 -0000	1.2
@@ -36,7 +36,7 @@
 %define nb_nb_dir     %{nb_dir}/%{nb_nb}
 %define nb_bin_dir    %{nb_dir}/bin
 %define nb_etc_dir    %{nb_dir}/etc
-%define nb_config_dir %{nb_dir}/config
+%define nb_nb_config_dir %{nb_nb_dir}/config
 
 # See http://wiki.netbeans.org/NBDistroIDs
 %define nb_distro_id NBFC
@@ -81,7 +81,7 @@
 
 Name:           %{nb_}
 Version:        %{nb_ver}
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Integrated Development Environment (IDE)
 Group:          Development/Tools
 License:        GPLv2 with exceptions or CDDL
@@ -213,8 +213,8 @@
 %setup -q -c
 %setup -q -T -D -a 1
 
-find . -type d -print0 | xargs -t -0 chmod 755
-find . -type f -print0 | xargs -t -0 chmod 644
+#find . -type d -print0 | xargs -t -0 chmod 755
+#find . -type f -print0 | xargs -t -0 chmod 644
 find . -type f \( -iname "*.jar" -o -iname "*.zip" \) -print0 | xargs -t -0 %{__rm} -f
 
 # Generate stub jar file, so there is something in jsr223  module.
@@ -382,9 +382,9 @@
 %{__cp} -p nbbuild/netbeans/CREDITS.html %{buildroot}%{nb_dir}/
 %{__cp} -p nbbuild/netbeans/README.html %{buildroot}%{nb_dir}/
 %{__cp} -p nbbuild/netbeans/netbeans.css %{buildroot}%{nb_dir}/
-# inistall nb config
-%{__mkdir_p} %{buildroot}%{nb_config_dir}
-echo -n "%{nb_distro_id}" > %{buildroot}%{nb_config_dir}/productid
+
+# inistall nb/nbX.X config
+echo -n "%{nb_distro_id}" > %{buildroot}%{nb_nb_config_dir}/productid
 
 # Links to nbX.X components
 %{__ln_s} ../%{nb_harness}    %{buildroot}%{nb_dir}/%{nb_harness}
@@ -461,6 +461,10 @@
 %doc nbbuild/standard-nbm-license.txt
 
 %changelog
+* 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
 



From mtasaka at fedoraproject.org  Fri Sep 19 15:17:32 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 19 Sep 2008 15:17:32 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.295, 1.296 jd.spec, 1.335, 1.336 sources, 
	1.296, 1.297
Message-ID: <20080919151732.AFEF9700F7@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32671/F-9

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Sep 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.2-1
- 2.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- .cvsignore	19 Sep 2008 05:23:59 -0000	1.295
+++ .cvsignore	19 Sep 2008 15:17:02 -0000	1.296
@@ -1 +1 @@
-jd-2.0.2-svn2351_trunk.tgz
+jd-2.0.2-080919.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- jd.spec	19 Sep 2008 05:23:59 -0000	1.335
+++ jd.spec	19 Sep 2008 15:17:02 -0000	1.336
@@ -10,10 +10,10 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.2
-%define         strtag        svn2351_trunk
-%define         repoid        32887
+%define         strtag        080919
+%define         repoid        32951
 # Define this if this is pre-version
-%define         pre_release   1
+%define         pre_release   0
 ##########################################
 
 ##########################################
@@ -136,8 +136,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Fri Sep 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2351
+* Sat Sep 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.2-1
+- 2.0.2
 
 * Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
 - Patch to cope with occasional cookie change


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- sources	19 Sep 2008 05:23:59 -0000	1.296
+++ sources	19 Sep 2008 15:17:02 -0000	1.297
@@ -1 +1 @@
-7838d3fb1a7f1dcb6f36119870c14a9a  jd-2.0.2-svn2351_trunk.tgz
+5c2deead45fc7459ac8922958eb3a204  jd-2.0.2-080919.tgz



From mtasaka at fedoraproject.org  Fri Sep 19 15:17:32 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 19 Sep 2008 15:17:32 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.295, 1.296 jd.spec, 1.345, 1.346 sources,
	1.296, 1.297
Message-ID: <20080919151732.EB62D700F7@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32671/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Sep 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.2-1
- 2.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- .cvsignore	19 Sep 2008 05:23:59 -0000	1.295
+++ .cvsignore	19 Sep 2008 15:17:02 -0000	1.296
@@ -1 +1 @@
-jd-2.0.2-svn2351_trunk.tgz
+jd-2.0.2-080919.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- jd.spec	19 Sep 2008 05:23:59 -0000	1.345
+++ jd.spec	19 Sep 2008 15:17:02 -0000	1.346
@@ -10,10 +10,10 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.2
-%define         strtag        svn2351_trunk
-%define         repoid        32887
+%define         strtag        080919
+%define         repoid        32951
 # Define this if this is pre-version
-%define         pre_release   1
+%define         pre_release   0
 ##########################################
 
 ##########################################
@@ -136,8 +136,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Fri Sep 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2351
+* Sat Sep 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.2-1
+- 2.0.2
 
 * Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
 - Patch to cope with occasional cookie change


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- sources	19 Sep 2008 05:23:59 -0000	1.296
+++ sources	19 Sep 2008 15:17:02 -0000	1.297
@@ -1 +1 @@
-7838d3fb1a7f1dcb6f36119870c14a9a  jd-2.0.2-svn2351_trunk.tgz
+5c2deead45fc7459ac8922958eb3a204  jd-2.0.2-080919.tgz



From mtasaka at fedoraproject.org  Fri Sep 19 15:17:32 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 19 Sep 2008 15:17:32 +0000 (UTC)
Subject: rpms/jd/F-8 .cvsignore, 1.288, 1.289 jd.spec, 1.324, 1.325 sources, 
	1.289, 1.290
Message-ID: <20080919151732.7BCA4700F7@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32671/F-8

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Sep 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.2-1
- 2.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- .cvsignore	19 Sep 2008 05:23:59 -0000	1.288
+++ .cvsignore	19 Sep 2008 15:17:02 -0000	1.289
@@ -1 +1 @@
-jd-2.0.2-svn2351_trunk.tgz
+jd-2.0.2-080919.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- jd.spec	19 Sep 2008 05:23:59 -0000	1.324
+++ jd.spec	19 Sep 2008 15:17:02 -0000	1.325
@@ -10,10 +10,10 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.2
-%define         strtag        svn2351_trunk
-%define         repoid        32887
+%define         strtag        080919
+%define         repoid        32951
 # Define this if this is pre-version
-%define         pre_release   1
+%define         pre_release   0
 ##########################################
 
 ##########################################
@@ -136,8 +136,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Fri Sep 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2351
+* Sat Sep 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.2-1
+- 2.0.2
 
 * Tue Sep 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
 - Patch to cope with occasional cookie change


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/sources,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- sources	19 Sep 2008 05:23:59 -0000	1.289
+++ sources	19 Sep 2008 15:17:02 -0000	1.290
@@ -1 +1 @@
-7838d3fb1a7f1dcb6f36119870c14a9a  jd-2.0.2-svn2351_trunk.tgz
+5c2deead45fc7459ac8922958eb3a204  jd-2.0.2-080919.tgz



From pkgdb at fedoraproject.org  Fri Sep 19 15:26:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 15:26:04 +0000
Subject: [pkgdb] buildbot: smilner has requested watchbugzilla
Message-ID: <20080919152604.C7581208D9F@bastion.fedora.phx.redhat.com>

smilner has requested the watchbugzilla acl on buildbot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/buildbot



From pkgdb at fedoraproject.org  Fri Sep 19 15:26:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 15:26:05 +0000
Subject: [pkgdb] buildbot: smilner has requested watchcommits
Message-ID: <20080919152605.BF8CD208DA3@bastion.fedora.phx.redhat.com>

smilner has requested the watchcommits acl on buildbot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/buildbot



From pkgdb at fedoraproject.org  Fri Sep 19 15:26:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 15:26:06 +0000
Subject: [pkgdb] buildbot: smilner has requested commit
Message-ID: <20080919152606.448BF208DA6@bastion.fedora.phx.redhat.com>

smilner has requested the commit acl on buildbot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/buildbot



From pkgdb at fedoraproject.org  Fri Sep 19 15:26:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 15:26:10 +0000
Subject: [pkgdb] buildbot: smilner has requested watchcommits
Message-ID: <20080919152610.950A9208DAB@bastion.fedora.phx.redhat.com>

smilner has requested the watchcommits acl on buildbot (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/buildbot



From pkgdb at fedoraproject.org  Fri Sep 19 15:26:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 15:26:12 +0000
Subject: [pkgdb] buildbot: smilner has requested watchbugzilla
Message-ID: <20080919152613.8ED97208DAE@bastion.fedora.phx.redhat.com>

smilner has requested the watchbugzilla acl on buildbot (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/buildbot



From pkgdb at fedoraproject.org  Fri Sep 19 15:26:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 15:26:15 +0000
Subject: [pkgdb] buildbot: smilner has requested commit
Message-ID: <20080919152615.9C786208DB1@bastion.fedora.phx.redhat.com>

smilner has requested the commit acl on buildbot (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/buildbot



From pkgdb at fedoraproject.org  Fri Sep 19 15:28:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 15:28:01 +0000
Subject: [pkgdb] buildbot: smilner has requested approveacls
Message-ID: <20080919152802.52CAC208DA3@bastion.fedora.phx.redhat.com>

smilner has requested the approveacls acl on buildbot (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/buildbot



From pkgdb at fedoraproject.org  Fri Sep 19 15:27:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 15:27:57 +0000
Subject: [pkgdb] buildbot: smilner has requested approveacls
Message-ID: <20080919152757.24584208D9F@bastion.fedora.phx.redhat.com>

smilner has requested the approveacls acl on buildbot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/buildbot



From twoerner at fedoraproject.org  Fri Sep 19 15:35:51 2008
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Fri, 19 Sep 2008 15:35:51 +0000 (UTC)
Subject: rpms/system-config-firewall/devel .cvsignore, 1.22, 1.23 sources,
	1.25, 1.26 system-config-firewall.spec, 1.31, 1.32
Message-ID: <20080919153551.A9656700F7@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/system-config-firewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6239

Modified Files:
	.cvsignore sources system-config-firewall.spec 
Log Message:
- new version 1.2.11
- use dialogs for parser errors in tui (rhbz#457485)
- enable to add protocol specific (IPv4, IPv6) icmp types for ICMP filtering
- updated translations for he, ja, ko and zh_CN




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	8 Jul 2008 16:39:23 -0000	1.22
+++ .cvsignore	19 Sep 2008 15:35:21 -0000	1.23
@@ -1,3 +1,4 @@
 system-config-firewall-1.2.6.tar.bz2
 system-config-firewall-1.2.7.tar.bz2
 system-config-firewall-1.2.10.tar.bz2
+system-config-firewall-1.2.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	8 Jul 2008 16:39:23 -0000	1.25
+++ sources	19 Sep 2008 15:35:21 -0000	1.26
@@ -1 +1 @@
-1a4d23883b0b1c3f0f1ebb7d66dd8a06  system-config-firewall-1.2.10.tar.bz2
+8109808278a007aac98c7b9d8b67f94d  system-config-firewall-1.2.11.tar.bz2


Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/system-config-firewall.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- system-config-firewall.spec	8 Jul 2008 16:39:23 -0000	1.31
+++ system-config-firewall.spec	19 Sep 2008 15:35:21 -0000	1.32
@@ -1,6 +1,6 @@
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
-Version: 1.2.10
+Version: 1.2.11
 Release: 1%{?dist}
 URL: http://fedorahosted.org/system-config-firewall
 License: GPLv2+
@@ -118,6 +118,11 @@
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-firewall
 
 %changelog
+* Fri Sep 19 2008 Thomas Woerner <twoerner at redhat.com> 1.2.11-1
+- use dialogs for parser errors in tui (rhbz#457485)
+- enable to add protocol specific (IPv4, IPv6) icmp types for ICMP filtering
+- updated translations for he, ja, ko and zh_CN
+
 * Tue Jul  8 2008 Thomas Woerner <twoerner at redhat.com> 1.2.10-1
 - lokkit: fixed path for system-config-firewall-tui (rhbz#454108)
 - updated translations for: it, fr, nl, ru, sr, sr at latin



From spot at fedoraproject.org  Fri Sep 19 15:38:46 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 19 Sep 2008 15:38:46 +0000 (UTC)
Subject: rpms/pl/devel pl-5.6.60-jni.patch, NONE, 1.1 .cvsignore, 1.20,
	1.21 pl.spec, 1.50, 1.51 sources, 1.20, 1.21
Message-ID: <20080919153846.99868700F7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7279

Modified Files:
	.cvsignore pl.spec sources 
Added Files:
	pl-5.6.60-jni.patch 
Log Message:
update to 5.6.60

pl-5.6.60-jni.patch:

--- NEW FILE pl-5.6.60-jni.patch ---
diff -up pl-5.6.60/packages/jpl/jpl.pl.jni pl-5.6.60/packages/jpl/jpl.pl
--- pl-5.6.60/packages/jpl/jpl.pl.jni	2008-09-15 09:34:38.000000000 -0400
+++ pl-5.6.60/packages/jpl/jpl.pl	2008-09-19 10:25:37.000000000 -0400
@@ -4390,7 +4390,8 @@ prolog:error_message(java_exception(Ex))
 :- multifile user:file_search_path/2.
 :- dynamic   user:file_search_path/2.
 
-user:file_search_path(jar, swi(lib)).
+user:file_search_path(jar, 'LIBDIR/pl-jpl').
+user:file_search_path(jni, 'LIBDIR/pl-jpl').
 
 %%	add_search_path(+Var, +Value) is det.
 %
@@ -4534,7 +4535,7 @@ add_jpl_to_classpath :-
 
 libjpl(File) :-
 	(   current_prolog_flag(unix, true)
-	->  File = foreign(libjpl)
+	->  File = jni(libjpl)
 	;   File = foreign(jpl)
 	).
 
diff -up pl-5.6.60/packages/jpl/src/java/jpl/fli/Prolog.java.jni pl-5.6.60/packages/jpl/src/java/jpl/fli/Prolog.java


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pl/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	25 Jun 2008 17:35:02 -0000	1.20
+++ .cvsignore	19 Sep 2008 15:38:16 -0000	1.21
@@ -1,3 +1 @@
-pl-5.6.57.tar.gz
-HTMLmanual.tar.gz
-userguide.html.tgz
+pl-5.6.60.tar.gz


Index: pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pl/devel/pl.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- pl.spec	2 Jul 2008 13:27:07 -0000	1.50
+++ pl.spec	19 Sep 2008 15:38:16 -0000	1.51
@@ -1,6 +1,9 @@
+%define jdkvershort 1.6.0
+%define jdkverlong %{jdkvershort}.0
+
 Name:		pl
-Version:	5.6.57
-Release:	2%{?dist}
+Version:	5.6.60
+Release:	1%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
@@ -11,10 +14,8 @@
 Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
 Patch0:         %{name}-5.4.6-rpath.patch
-Patch1:         %{name}-5.6.0-multilib.patch
 Patch2:         %{name}-5.6.57-jpl-configure.patch
-Patch3:         %{name}-5.6.52-jni.patch
-Patch4:         %{name}-5.6.57-locale.patch
+Patch3:         %{name}-5.6.60-jni.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gmp-devel
 BuildRequires:  libICE-devel
@@ -35,7 +36,7 @@
 BuildRequires:  unixODBC-devel
 BuildRequires:  freetype-devel
 BuildRequires:  jpackage-utils
-BuildRequires:  java-devel
+BuildRequires:  java-%{jdkvershort}-devel = 1:%{jdkverlong}
 
 %description
 ISO/Edinburgh-style Prolog compiler including modules, autoload,
@@ -49,7 +50,7 @@
 Summary: Development files for SWI Prolog
 Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
-Requires: readline-devel
+Requires: readline-devel, pkgconfig
 
 %description devel
 Development files for SWI Prolog.
@@ -97,10 +98,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .rpath
-%patch1 -p1 -b .multilib
 %patch2 -p1 -b .libjvm
 %patch3 -p1 -b .jni
-%patch4 -p1 -b .locale
 (
    mkdir doc-install
    cd doc-install
@@ -118,12 +117,18 @@
 
 
 %build
+export JAVA_HOME=/usr/lib/jvm/java-%{jdkvershort}-openjdk-%{jdkverlong}.%{_arch}
+%ifarch x86_64
+export JAVA_LIB=$JAVA_HOME/jre/lib/amd64
+%else
+export JAVA_LIB=$JAVA_HOME/jre/lib/%{_arch}
+%endif
 %configure --enable-shared
 make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 PATH=$PWD/src:$PATH
 cd packages
 %configure
-make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" JAVALIBS="-L$JAVA_LIB/server -L$JAVA_LIB -ljava -lverify -ljvm"
 cd ..
 
 
@@ -208,6 +213,7 @@
 %{_includedir}/%{name}/*.h
 %{_includedir}/%{name}/xpce
 %{_libdir}/%{name}-%{version}/lib/*/libpl.so
+%{_libdir}/pkgconfig/pl.pc
 
 %files static
 %defattr(-,root,root,-)
@@ -221,6 +227,10 @@
 
 
 %changelog
+* Fri Sep 19 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.6.60-1
+- update to 5.6.60
+- use openjdk (FIXME: there may be a way to make this more generic)
+
 * Wed Jul  2 2008 Mary Ellen Foster <mefoster at gmail.com> - 5.6.57-2
 - Build using any Java
 - Include patch from SWI for Turkish locale (thanks to Keri Harris)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pl/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	25 Jun 2008 17:35:02 -0000	1.20
+++ sources	19 Sep 2008 15:38:16 -0000	1.21
@@ -1,3 +1,3 @@
-c41709e50dbcd784f26273a1686af9e8  pl-5.6.57.tar.gz
+3e5c3d29d7c0f86351707c8d0415ac7b  pl-5.6.60.tar.gz
 f9957ad2fcdce7e02512e0fbdc66e41d  HTMLmanual.tar.gz
 a4462019611caa4f69247c8bf94404a7  userguide.html.tgz



From nbecker at fedoraproject.org  Fri Sep 19 15:47:58 2008
From: nbecker at fedoraproject.org (Neal Becker)
Date: Fri, 19 Sep 2008 15:47:58 +0000 (UTC)
Subject: rpms/igraph/F-8 igraph.spec,1.8,1.9
Message-ID: <20080919154758.A383D700F7@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/igraph/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10319

Modified Files:
	igraph.spec 
Log Message:
BR libxml2-devel for graphml



Index: igraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/F-8/igraph.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- igraph.spec	26 Feb 2008 19:55:42 -0000	1.8
+++ igraph.spec	19 Sep 2008 15:47:28 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		igraph
 Version:	0.5
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	Library for creating and manipulating graphs
 
 Group:		System Environment/Libraries
@@ -11,7 +11,7 @@
 Patch2:		igraph-test.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#BuildRequires:	gcc
+BuildRequires:	libxml2-devel
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 Provides: 	%{name}-%{version}
@@ -92,6 +92,9 @@
 make check
 
 %changelog
+* Thu Sep 18 2008 Neal Becker <ndbecker2 at gmail.com> - 0.5-14
+- Add BR libxml2-devel to get graphml support.
+
 * Tue Feb 26 2008 Neal Becker <ndbecker2 at gmail.com> - 0.5-13
 - More test fixes
 



From mclasen at fedoraproject.org  Fri Sep 19 16:07:52 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 19 Sep 2008 16:07:52 +0000 (UTC)
Subject: rpms/gnome-session/devel startup_id-leak.patch, NONE,
	1.1 gnome-session.spec, 1.193, 1.194
Message-ID: <20080919160752.53A7D700F7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16121

Modified Files:
	gnome-session.spec 
Added Files:
	startup_id-leak.patch 
Log Message:
more leak fixes


startup_id-leak.patch:

--- NEW FILE startup_id-leak.patch ---
diff -up gnome-session-2.23.92/gnome-session/gsm-autostart-app.c.startup_id-leak gnome-session-2.23.92/gnome-session/gsm-autostart-app.c
--- gnome-session-2.23.92/gnome-session/gsm-autostart-app.c.startup_id-leak	2008-09-15 17:42:11.000000000 -0400
+++ gnome-session-2.23.92/gnome-session/gsm-autostart-app.c	2008-09-15 17:46:24.000000000 -0400
@@ -793,6 +793,7 @@ autostart_app_start_spawn (GsmAutostartA
         g_debug ("GsmAutostartApp: starting %s: command=%s startup-id=%s", app->priv->desktop_id, command, startup_id);
         g_free (command);
 
+        g_free (app->priv->startup_id);
         local_error = NULL;
         success = egg_desktop_file_launch (app->priv->desktop_file,
                                            NULL,


Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- gnome-session.spec	18 Sep 2008 14:36:39 -0000	1.193
+++ gnome-session.spec	19 Sep 2008 16:07:22 -0000	1.194
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.23.92
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -75,6 +75,8 @@
 Patch4: ice-leak.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=552780
 Patch5: xml-leak.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=552815
+Patch6: startup_id-leak.patch
 
 %description
 
@@ -89,6 +91,7 @@
 %patch3 -p1 -b .empty-string-leak
 %patch4 -p0 -b .ice-leak
 %patch5 -p1 -b .xml-leak
+%patch6 -p1 -b .startup_id-leak.patch
 
 %build
 
@@ -187,6 +190,9 @@
 
 
 %changelog
+* Thu Sep 18 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.92-6
+- Plug memory leaks
+
 * Thu Sep 18 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.92-5
 - Plug memory leaks
 



From spot at fedoraproject.org  Fri Sep 19 16:11:14 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 19 Sep 2008 16:11:14 +0000 (UTC)
Subject: rpms/pl/devel pl.spec,1.51,1.52
Message-ID: <20080919161114.6978C700F7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17432

Modified Files:
	pl.spec 
Log Message:
dont try to package non-existent ANNOUNCE


Index: pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pl/devel/pl.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- pl.spec	19 Sep 2008 15:38:16 -0000	1.51
+++ pl.spec	19 Sep 2008 16:10:44 -0000	1.52
@@ -3,7 +3,7 @@
 
 Name:		pl
 Version:	5.6.60
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
@@ -175,7 +175,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog README COPYING ANNOUNCE VERSION
+%doc ChangeLog README COPYING VERSION
 %doc dotfiles/dotplrc
 %doc doc-install/*
 %doc xpce-doc/*
@@ -227,6 +227,9 @@
 
 
 %changelog
+* Fri Sep 19 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.6.60-2
+- forgot to remove ANNOUNCE from doc list
+
 * Fri Sep 19 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.6.60-1
 - update to 5.6.60
 - use openjdk (FIXME: there may be a way to make this more generic)



From caillon at fedoraproject.org  Fri Sep 19 16:35:23 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Fri, 19 Sep 2008 16:35:23 +0000 (UTC)
Subject: rpms/thunderbird/devel firefox-1.5-theme-change.patch,1.1,1.2
Message-ID: <20080919163523.7D7F1700F7@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/thunderbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24688

Modified Files:
	firefox-1.5-theme-change.patch 
Log Message:
update for fuzz


firefox-1.5-theme-change.patch:

Index: firefox-1.5-theme-change.patch
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/firefox-1.5-theme-change.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.5-theme-change.patch	27 Sep 2006 23:02:40 -0000	1.1
+++ firefox-1.5-theme-change.patch	19 Sep 2008 16:34:53 -0000	1.2
@@ -1,10 +1,10 @@
 Index: layout/base/nsPresContext.cpp
 ===================================================================
 RCS file: /cvsroot/mozilla/layout/base/nsPresContext.cpp,v
-retrieving revision 3.288.12.2.4.1
-diff -d -u -p -r3.288.12.2.4.1 nsPresContext.cpp
---- layout/base/nsPresContext.cpp	21 Apr 2006 23:30:50 -0000	3.288.12.2.4.1
-+++ layout/base/nsPresContext.cpp	26 Sep 2006 19:26:40 -0000
+retrieving revision 3.288.12.5
+diff -d -u -p -r3.288.12.5 nsPresContext.cpp
+--- layout/base/nsPresContext.cpp	17 May 2006 07:56:35 -0000	3.288.12.5
++++ layout/base/nsPresContext.cpp	19 Sep 2008 16:33:31 -0000
 @@ -73,6 +73,9 @@
  #include "nsIDOMDocument.h"
  #include "nsAutoPtr.h"
@@ -41,7 +41,7 @@
  void
  nsPresContext::GetFontPreferences()
  {
-@@ -709,6 +724,9 @@ nsPresContext::Init(nsIDeviceContext* aD
+@@ -716,6 +731,9 @@ nsPresContext::Init(nsIDeviceContext* aD
                                         this);
  #endif
  
@@ -51,7 +51,7 @@
    // Initialize our state from the user preferences
    GetUserPreferences();
  
-@@ -1180,33 +1198,126 @@ nsPresContext::GetTheme()
+@@ -1197,33 +1215,126 @@ nsPresContext::GetTheme()
  void
  nsPresContext::ThemeChanged()
  {
@@ -187,7 +187,7 @@
  
    // Clear out all of the style data since it may contain RGB values
    // which originated from system colors.
-@@ -1222,7 +1333,17 @@ nsPresContext::SysColorChanged()
+@@ -1239,7 +1350,17 @@ nsPresContext::SysColorChanged()
    // data without reflowing/updating views will lead to incorrect change hints
    // later, because when generating change hints, any style structs which have
    // been cleared and not reread are assumed to not be used at all.
@@ -209,10 +209,10 @@
 Index: layout/base/nsPresContext.h
 ===================================================================
 RCS file: /cvsroot/mozilla/layout/base/nsPresContext.h,v
-retrieving revision 3.150.4.2
-diff -d -u -p -r3.150.4.2 nsPresContext.h
---- layout/base/nsPresContext.h	29 Aug 2005 16:15:39 -0000	3.150.4.2
-+++ layout/base/nsPresContext.h	26 Sep 2006 19:26:40 -0000
+retrieving revision 3.150.4.3
+diff -d -u -p -r3.150.4.3 nsPresContext.h
+--- layout/base/nsPresContext.h	29 Aug 2007 23:07:47 -0000	3.150.4.3
++++ layout/base/nsPresContext.h	19 Sep 2008 16:33:31 -0000
 @@ -56,6 +56,7 @@
  #include "nsCRT.h"
  #include "nsIPrintSettings.h"
@@ -229,8 +229,8 @@
  class nsICSSPseudoComparator;
  class nsIAtom;
  struct nsStyleStruct;
-@@ -627,6 +629,14 @@ public:
-   const nscoord* GetBorderWidthTable() { return mBorderWidthTable; }
+@@ -630,6 +632,14 @@ public:
+   PRBool IsChrome();
  
  protected:
 +  static NS_HIDDEN_(void*) PR_CALLBACK ThemeChangedInternal(PLEvent* aEvent);
@@ -244,7 +244,7 @@
    NS_HIDDEN_(void) SetImgAnimations(nsIContent *aParent, PRUint16 aMode);
    NS_HIDDEN_(void) GetDocumentColorPreferences();
  
-@@ -654,6 +664,7 @@ protected:
+@@ -657,6 +667,7 @@ protected:
                                          // from gfx back to layout.
    nsIEventStateManager* mEventManager;  // [STRONG]
    nsILookAndFeel*       mLookAndFeel;   // [STRONG]
@@ -252,7 +252,7 @@
    nsIAtom*              mMedium;        // initialized by subclass ctors;
                                          // weak pointer to static atom
  
-@@ -724,6 +735,8 @@ protected:
+@@ -727,6 +738,8 @@ protected:
    unsigned              mCanPaginatedScroll : 1;
    unsigned              mDoScaledTwips : 1;
    unsigned              mEnableJapaneseTransform : 1;



From transif at fedoraproject.org  Fri Sep 19 16:48:32 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Fri, 19 Sep 2008 16:48:32 +0000 (UTC)
Subject: comps/po ca.po,1.12,1.13
Message-ID: <20080919164832.1E3F07013F@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29186/po

Modified Files:
	ca.po 
Log Message:
    2008-09-19  Xavier Conde <xavi.conde at gmail.com> (via
xconde at fedoraproject.org)
    
      * po/ca.po: Updated Catalan PO
    



Index: ca.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ca.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ca.po	17 Sep 2008 22:44:33 -0000	1.12
+++ ca.po	19 Sep 2008 16:48:01 -0000	1.13
@@ -2,7 +2,7 @@
 # Copyright ?? 2004, 2005, 2006, 2007 The Free Software Foundation, Inc.
 # This file is distributed under the same license as the comps-po package.
 # Xavier Conde Rueda <xavi.conde at gmail.com>, 2004, 2006.
-# Josep Puigdemont <josep.puigdemont at gmail.com>, 2005, 2007.
+# Josep Puigdemont <josep.puigdemont at gmail.com>, 2005, 2008.
 #
 # This file is translated according to the glossary and style guide of
 #   Softcatal??. If you plan to modify this file, please read first the page
@@ -20,8 +20,8 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2007-02-18 11:11+0100\n"
+"POT-Creation-Date: 2008-09-19 09:24+0000\n"
+"PO-Revision-Date: 2008-09-19 11:11+0100\n"
 "Last-Translator: Xavier Conde Rueda <xavi.conde at gmail.com>\n"
 "Language-Team: Catalan <fedora at softcatala.net>\n"
 "MIME-Version: 1.0\n"
@@ -45,9 +45,8 @@
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
 #: ../comps-f10.xml.in.h:4
-#, fuzzy
 msgid "Albanian Support"
-msgstr "Suport per a l'armeni"
+msgstr "Suport per a l'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:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2
@@ -101,9 +100,8 @@
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
 #: ../comps-f10.xml.in.h:15
-#, fuzzy
 msgid "Belarusian Support"
-msgstr "Suport per al b??lgar"
+msgstr "Suport per al bielor??s"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
 #: ../comps-f10.xml.in.h:16
@@ -112,15 +110,13 @@
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
 #: ../comps-f10.xml.in.h:17
-#, fuzzy
 msgid "Bhutanese Support"
-msgstr "Suport per al xin??s"
+msgstr ""
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
 #: ../comps-f10.xml.in.h:18
-#, fuzzy
 msgid "Bosnian Support"
-msgstr "Suport per a l'estoni??"
+msgstr "Suport per al bosni"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
 #: ../comps-f10.xml.in.h:19
@@ -268,15 +264,13 @@
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
 #: ../comps-f10.xml.in.h:50 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19
-#, fuzzy
 msgid "Fedora Packager"
-msgstr "Eclipse"
+msgstr "Empaquetador de Fedora"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
 #: ../comps-f10.xml.in.h:51
-#, fuzzy
 msgid "Filipino Support"
-msgstr "Suport per al gallec"
+msgstr "Suport per al filip??"
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52
 #: ../comps-f10.xml.in.h:52
@@ -333,9 +327,8 @@
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
 #: ../comps-f10.xml.in.h:63
-#, fuzzy
 msgid "Georgian Support"
-msgstr "Suport per a l'alemany"
+msgstr "Suport per al georgi??"
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
 #: ../comps-f10.xml.in.h:64
@@ -434,9 +427,8 @@
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
 #: ../comps-f10.xml.in.h:84
-#, fuzzy
 msgid "Inuktitut Support"
-msgstr "Suport per al zulu"
+msgstr ""
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
 #: ../comps-f10.xml.in.h:85
@@ -489,9 +481,8 @@
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
 #: ../comps-f10.xml.in.h:96
-#, fuzzy
 msgid "Khmer Support"
-msgstr "Suport per a l'hebreu"
+msgstr "Suport per al khmer"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
 #: ../comps-f10.xml.in.h:98
@@ -505,15 +496,13 @@
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:95
 #: ../comps-f10.xml.in.h:100
-#, fuzzy
 msgid "Lao Support"
-msgstr "Suport per al tai"
+msgstr "Suport per al Lao"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:96
 #: ../comps-f10.xml.in.h:101
-#, fuzzy
 msgid "Latvian Support"
-msgstr "Suport per al croat"
+msgstr ""
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:98
 #: ../comps-f10.xml.in.h:103
@@ -552,9 +541,8 @@
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:107
 #: ../comps-f10.xml.in.h:113
-#, fuzzy
 msgid "Maori Support"
-msgstr "Suport per al marathi"
+msgstr "Suport per al maor??"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:108
 #: ../comps-f10.xml.in.h:114
@@ -607,9 +595,8 @@
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:121
 #: ../comps-f10.xml.in.h:128
-#, fuzzy
 msgid "Persian Support"
-msgstr "Suport per al serbi"
+msgstr "Suport per al persa"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:122
 #: ../comps-f10.xml.in.h:129
@@ -653,9 +640,8 @@
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:132
 #: ../comps-f10.xml.in.h:139
-#, fuzzy
 msgid "Samoan Support"
-msgstr "Suport per a l'alemany"
+msgstr "Suport per al samo??"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:133
 #: ../comps-f10.xml.in.h:140
@@ -707,9 +693,8 @@
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:142
 #: ../comps-f10.xml.in.h:150
-#, fuzzy
 msgid "Somali Support"
-msgstr "Suport per al swati"
+msgstr "Suport per al somal??"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:143
 #: ../comps-f10.xml.in.h:151
@@ -769,9 +754,8 @@
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:153
 #: ../comps-f10.xml.in.h:162
-#, fuzzy
 msgid "Tagalog Support"
-msgstr "Suport per al t??mil"
+msgstr "Suport per al tagalog"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:154
 #: ../comps-f10.xml.in.h:164
@@ -1005,20 +989,18 @@
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:187
 #: ../comps-f10.xml.in.h:197
-#, fuzzy
 msgid "Tibetan Support"
-msgstr "Suport per a l'alemany"
+msgstr "Suport per al tibet??"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:188
 #: ../comps-f10.xml.in.h:198
-#, fuzzy
 msgid "Tonga Support"
 msgstr "Suport per al tsonga"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:189
 #: ../comps-f10.xml.in.h:199 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
-msgstr ""
+msgstr "Eines i utilitats necess??ries per l'empaquetador de Fedora"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:190
 #: ../comps-f10.xml.in.h:200
@@ -1042,9 +1024,8 @@
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:194
 #: ../comps-f10.xml.in.h:204
-#, fuzzy
 msgid "Urdu Support"
-msgstr "Suport per al zulu"
+msgstr "Suport per a l'urdu"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:195
 #: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
@@ -1063,9 +1044,8 @@
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:198
 #: ../comps-f10.xml.in.h:209
-#, fuzzy
 msgid "Vietnamese Support"
-msgstr "Suport per al xin??s"
+msgstr "Suport per al vietnamita"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:199
 #: ../comps-f10.xml.in.h:210
@@ -1129,136 +1109,116 @@
 
 #: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21
 msgid "Buildsystem building group"
-msgstr ""
+msgstr "Grup de muntatge del sistema de muntatge"
 
 #: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49
-#, fuzzy
 msgid "Fedora Eclipse"
-msgstr "Eclipse"
+msgstr "Eclipse de Fedora"
 
 #: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53
 msgid "Fonts"
-msgstr ""
+msgstr "Tipus de lletra"
 
 #: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54
 msgid "Fonts packages for rendering text on the desktop."
-msgstr ""
+msgstr "Paquets de tipus de lletra per mostrar textos en l'escriptori."
 
 #: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
-#, fuzzy
 msgid "Integrated Development Environments based on Eclipse."
-msgstr "L'entorn de desenvolupament integrat Eclipse."
+msgstr "Entorns de desenvolupament integrats basats en Eclipse."
 
 #: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:102
 msgid "Legacy Fonts"
-msgstr ""
+msgstr "Tipus de lletra antics"
 
 #: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:107
-#, fuzzy
 msgid "Low Saxon Support"
-msgstr "Suport per al tai"
+msgstr ""
 
 #: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:115
-#, fuzzy
 msgid "Mongolian Support"
-msgstr "Suport per a l'estoni??"
+msgstr "Suport per al mongol"
 
 #: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:118
-#, fuzzy
 msgid "Nepali Support"
-msgstr "Suport per al bengal??"
+msgstr "Suport per al nepal??"
 
 #: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:125
 msgid "Older bitmap and vector fonts packages"
-msgstr ""
+msgstr "Paquets de tipus de lletres de mapes de bit i vector antics"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44
-#, fuzzy
 msgid "Esperanto Support"
-msgstr "Suport per a l'alemany"
+msgstr "Suport per a l'esperanto"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95
-#, fuzzy
 msgid "Kashubian Support"
-msgstr "Suport per a l'estoni??"
+msgstr ""
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:108
-#, fuzzy
 msgid "Macedonian Support"
-msgstr "Suport per a l'estoni??"
+msgstr "Suport per al macedoni"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:121
-#, fuzzy
 msgid "Northern Sami Support"
-msgstr "Suport per al sotho del nord"
+msgstr ""
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:137
-#, fuzzy
 msgid "SUGAR Desktop Environment"
-msgstr "Entorns d'escriptori"
+msgstr "Entorn d'escriptori SUGAR"
 
 #: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:138
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
-msgstr ""
+msgstr "El SUGAR ??s un entorn d'escriptori desenvolupat per al XO de l'OLPC."
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:211
-#, fuzzy
 msgid "Walloon Support"
-msgstr "Suport per al tai"
+msgstr ""
 
 #: ../comps-f10.xml.in.h:70
-#, fuzzy
 msgid "Haskell Development"
-msgstr "Desenvolupament web"
+msgstr "Desenvolupament en haskell"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
-msgstr ""
+msgstr "M??todes d'entrada"
 
 #: ../comps-f10.xml.in.h:77
 msgid "Input method packages for the input of international text."
-msgstr ""
+msgstr "Paquets de m??todes d'entrada per a introduir text internacional."
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "Suport per a l'hebreu"
+msgstr ""
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "Suport per al core??"
+msgstr ""
 
 #: ../comps-f10.xml.in.h:110
-#, fuzzy
 msgid "Maithili Support"
-msgstr "Suport per al marathi"
+msgstr ""
 
 #: ../comps-f10.xml.in.h:117
-#, fuzzy
 msgid "Myanmar (Burmese) Support"
-msgstr "Suport per al xin??s"
+msgstr ""
 
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "Suport per a l'hindi"
+msgstr "Suport per al sindhi"
 
 #: ../comps-f10.xml.in.h:156
-#, fuzzy
 msgid "Support for developing programs in the Haskell programming language."
 msgstr ""
-"Suport per a desenvolupar programes en el llenguatge de programaci?? Java."
+"Suport per a desenvolupar programes en el llenguatge de programaci?? Haskell."
 
 #: ../comps-f10.xml.in.h:163
-#, fuzzy
 msgid "Tajik Support"
-msgstr "Suport per al tai"
+msgstr "Suport per al tajik"
 
 #: ../comps-f10.xml.in.h:205
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "Suport per al txec"
+msgstr ""
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1305,42 +1265,37 @@
 "les en format HTML, PDF, Postscript i text."
 
 #: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
-#, fuzzy
 msgid "This group is a collection of network servers for specific purposes"
 msgstr ""
-"Aquest grup ??s una col??lecci?? d'eines per a diferents tipus de maquinari."
+"Aquest grup ??s una col??lecci?? de servidors de xarxa per a diferents tipus de maquinari."
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
 msgstr ""
-"Aquest grup ??s una col??lecci?? d'eines i recursos per a entorns armenis."
+"Aquest grup ??s una col??lecci?? d'eines i recursos per a entorns ar??bics."
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
 msgstr ""
-"Aquest grup ??s una col??lecci?? d'eines i recursos per a entorns armenis."
+"Aquest grup ??s una col??lecci?? d'eines i recursos per a entorns hebreus."
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
 msgstr ""
-"Aquest grup ??s una col??lecci?? d'eines i recursos per a entorns armenis."
+"Aquest grup ??s una col??lecci?? d'eines i recursos per a entorns japonesos."
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
 msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
 msgstr ""
-"Aquest grup ??s una col??lecci?? d'eines i recursos per a entorns armenis."
+"Aquest grup ??s una col??lecci?? d'eines i recursos per a entorns txecs."
 
 #~ msgid "British Support"
 #~ msgstr "Suport per al brit??nic"
@@ -1388,17 +1343,9 @@
 #~ "Aquests paquets proporcionen funcionalitats addicional per a Red Hat "
 #~ "Enterprise Linux"
 
-#, fuzzy
-#~ msgid "Red Hat Enterprise Linux Supplementary"
-#~ msgstr "Documentaci?? per a Red Hat Enterprise Linux 3"
-
 #~ msgid "Virtualization Support."
 #~ msgstr "Suport per a la virtualitzaci??."
 
-#, fuzzy
-#~ msgid "Somail Support"
-#~ msgstr "Suport per al swati"
-
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 



From kyle at fedoraproject.org  Fri Sep 19 16:49:33 2008
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri, 19 Sep 2008 16:49:33 +0000 (UTC)
Subject: rpms/kernel/F-9
	linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch,
	NONE, 1.1 kernel.spec, 1.769, 1.770
Message-ID: <20080919164933.5D2477013F@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29747

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch 
Log Message:
* Fri Sep 19 2008 Kyle McMartin <kyle at redhat.com> - 2.6.26.5-43
- libata-sff: kill spurious WARN_ON() in ata_hsm_move()
   Pointed-out-by: Arjan van de Ven (9c2676b61a5a4b6d99e65fb2f438fb3914302eda)


linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch:

--- NEW FILE linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch ---
>From 9c2676b61a5a4b6d99e65fb2f438fb3914302eda Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj at kernel.org>
Date: Fri, 29 Aug 2008 16:27:43 +0200
Subject: [PATCH] libata-sff: kill spurious WARN_ON() in ata_hsm_move()

On HSM_ST_ERR, ata_hsm_move() triggers WARN_ON() if AC_ERR_DEV or
AC_ERR_HSM is not set.  PHY events may trigger HSM_ST_ERR with other
error codes and, with or without it, there just isn't much reason to
do WARN_ON() on it.  Even if error code is not set there, core EH
logic won't have any problem dealing with the error condition.

OSDL bz#11065 reports this problem.

Signed-off-by: Tejun Heo <tj at kernel.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---
 drivers/ata/libata-sff.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 304fdc6..2a4c516 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -1315,11 +1315,6 @@ fsm_start:
 		break;
 
 	case HSM_ST_ERR:
-		/* make sure qc->err_mask is available to
-		 * know what's wrong and recover
-		 */
-		WARN_ON(!(qc->err_mask & (AC_ERR_DEV | AC_ERR_HSM)));
-
 		ap->hsm_task_state = HSM_ST_IDLE;
 
 		/* complete taskfile transaction */
-- 
1.5.5.1



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.769
retrieving revision 1.770
diff -u -r1.769 -r1.770
--- kernel.spec	17 Sep 2008 21:59:05 -0000	1.769
+++ kernel.spec	19 Sep 2008 16:49:03 -0000	1.770
@@ -693,6 +693,7 @@
 Patch2600: linux-2.6-merge-efifb-imacfb.patch
 
 Patch2700: linux-2.6-intel-msr-backport.patch
+Patch2701: linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1277,6 +1278,7 @@
 ApplyPatch linux-2.6-merge-efifb-imacfb.patch
 
 ApplyPatch linux-2.6-intel-msr-backport.patch
+ApplyPatch linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch
 # ---------- below all scheduled for 2.6.24 -----------------
 
 # END OF PATCH APPLICATIONS
@@ -1868,6 +1870,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Fri Sep 19 2008 Kyle McMartin <kyle at redhat.com> - 2.6.26.5-43
+- libata-sff: kill spurious WARN_ON() in ata_hsm_move()
+   Pointed-out-by: Arjan van de Ven (9c2676b61a5a4b6d99e65fb2f438fb3914302eda)
+
 * Wed Sep 17 2008 Kyle McMartin <kyle at redhat.com> - 2.6.26.5-42
 - From Chris Lalancette <clalance at redhat.com>:
    Backport KVM Intel MSR fix (efa67e0d1f51842393606034051d805ab9948abd)



From airlied at fedoraproject.org  Fri Sep 19 17:13:00 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 19 Sep 2008 17:13:00 +0000 (UTC)
Subject: rpms/kernel/devel drm-modesetting-radeon.patch, 1.28,
	1.29 kernel.spec, 1.959, 1.960
Message-ID: <20080919171300.6D567700F7@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6572

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
- more fixes from AMD upstream for LVDS


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- drm-modesetting-radeon.patch	18 Sep 2008 23:32:41 -0000	1.28
+++ drm-modesetting-radeon.patch	19 Sep 2008 17:12:29 -0000	1.29
@@ -1,3 +1,15 @@
+commit 68d1f0df534df3cadc55a064e38c9afb4a66b875
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Sat Sep 20 03:08:05 2008 +1000
+
+    radeon: rmx_fixup() fixes for legacy chips
+
+commit 59a50b92d61cdd939026d7b5bcb2584e936927b0
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Sat Sep 20 01:55:27 2008 +1000
+
+    radeon: fix combios
+
 commit 6a804321a2b1220143a64a3a78d72b03770fd285
 Author: Dave Airlie <airlied at linux.ie>
 Date:   Fri Sep 19 09:17:36 2008 +1000
@@ -29060,7 +29072,7 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
 new file mode 100644
-index 0000000..19f274c
+index 0000000..107a081
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_combios.c
 @@ -0,0 +1,1404 @@
@@ -29815,7 +29827,7 @@
 +
 +				encoder->vblank = (radeon_bios16(dev_priv, tmp + 24) -
 +						   radeon_bios16(dev_priv, tmp + 26));
-+				encoder->voverplus = ((radeon_bios16(dev_priv, tmp + 28) & 0x7fff) -
++				encoder->voverplus = ((radeon_bios16(dev_priv, tmp + 28) & 0x7ff) -
 +						      radeon_bios16(dev_priv, tmp + 26));
 +				encoder->vsync_width = ((radeon_bios16(dev_priv, tmp + 28) & 0xf800) >> 11);
 +				encoder->dotclock = radeon_bios16(dev_priv, tmp + 9) * 10;
@@ -34651,10 +34663,10 @@
  #endif				/* __RADEON_DRV_H__ */
 diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
 new file mode 100644
-index 0000000..f39dcc1
+index 0000000..ef417fe
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_encoders.c
-@@ -0,0 +1,1093 @@
+@@ -0,0 +1,1096 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -34692,47 +34704,50 @@
 +			   struct drm_display_mode *adjusted_mode)
 +{
 +	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
++	struct drm_device *dev = encoder->dev;
++	struct drm_radeon_private *dev_priv = dev->dev_private;
++
 +	if (mode->hdisplay < radeon_encoder->panel_xres ||
 +	    mode->vdisplay < radeon_encoder->panel_yres) {
 +		radeon_encoder->flags |= RADEON_USE_RMX;
-+		adjusted_mode->hdisplay = radeon_encoder->panel_xres;
-+		adjusted_mode->vdisplay = radeon_encoder->panel_yres;
-+		adjusted_mode->htotal = radeon_encoder->panel_xres + radeon_encoder->hblank;
-+		adjusted_mode->hsync_start = radeon_encoder->panel_xres + radeon_encoder->hoverplus;
-+		adjusted_mode->hsync_end = adjusted_mode->hsync_start + radeon_encoder->hsync_width;
-+		adjusted_mode->vtotal = radeon_encoder->panel_yres + radeon_encoder->vblank;
-+		adjusted_mode->vsync_start = radeon_encoder->panel_yres + radeon_encoder->voverplus;
-+		adjusted_mode->vsync_end = adjusted_mode->vsync_start + radeon_encoder->vsync_width;
-+		/* update crtc values */
-+		drm_mode_set_crtcinfo(adjusted_mode, CRTC_INTERLACE_HALVE_V);
-+		/* adjust crtc values */
-+		adjusted_mode->crtc_hdisplay = radeon_encoder->panel_xres;
-+		adjusted_mode->crtc_vdisplay = radeon_encoder->panel_yres;
-+		adjusted_mode->crtc_htotal = adjusted_mode->crtc_hdisplay + radeon_encoder->hblank;
-+		adjusted_mode->crtc_hsync_start = adjusted_mode->crtc_hdisplay + radeon_encoder->hoverplus;
-+		adjusted_mode->crtc_hsync_end = adjusted_mode->crtc_hsync_start + radeon_encoder->hsync_width;
-+		adjusted_mode->crtc_vtotal = adjusted_mode->crtc_vdisplay + radeon_encoder->vblank;
-+		adjusted_mode->crtc_vsync_start = adjusted_mode->crtc_vdisplay + radeon_encoder->voverplus;
-+		adjusted_mode->crtc_vsync_end = adjusted_mode->crtc_vsync_start + radeon_encoder->vsync_width;
-+	} else {
-+		adjusted_mode->htotal = radeon_encoder->panel_xres + radeon_encoder->hblank;
-+		adjusted_mode->hsync_start = radeon_encoder->panel_xres + radeon_encoder->hoverplus;
-+		adjusted_mode->hsync_end = adjusted_mode->hsync_start + radeon_encoder->hsync_width;
-+		adjusted_mode->vtotal = radeon_encoder->panel_yres + radeon_encoder->vblank;
-+		adjusted_mode->vsync_start = radeon_encoder->panel_yres + radeon_encoder->voverplus;
-+		adjusted_mode->vsync_end = adjusted_mode->vsync_start + radeon_encoder->vsync_width;
-+		/* update crtc values */
-+		drm_mode_set_crtcinfo(adjusted_mode, CRTC_INTERLACE_HALVE_V);
-+		/* adjust crtc values */
-+		adjusted_mode->crtc_htotal = adjusted_mode->crtc_hdisplay + radeon_encoder->hblank;
-+		adjusted_mode->crtc_hsync_start = adjusted_mode->crtc_hdisplay + radeon_encoder->hoverplus;
-+		adjusted_mode->crtc_hsync_end = adjusted_mode->crtc_hsync_start + radeon_encoder->hsync_width;
-+		adjusted_mode->crtc_vtotal = adjusted_mode->crtc_vdisplay + radeon_encoder->vblank;
-+		adjusted_mode->crtc_vsync_start = adjusted_mode->crtc_vdisplay + radeon_encoder->voverplus;
-+		adjusted_mode->crtc_vsync_end = adjusted_mode->crtc_vsync_start + radeon_encoder->vsync_width;
++		if (radeon_is_avivo(dev_priv)) {
++			adjusted_mode->hdisplay = radeon_encoder->panel_xres;
++			adjusted_mode->vdisplay = radeon_encoder->panel_yres;
++			adjusted_mode->htotal = radeon_encoder->panel_xres + radeon_encoder->hblank;
++			adjusted_mode->hsync_start = radeon_encoder->panel_xres + radeon_encoder->hoverplus;
++			adjusted_mode->hsync_end = adjusted_mode->hsync_start + radeon_encoder->hsync_width;
++			adjusted_mode->vtotal = radeon_encoder->panel_yres + radeon_encoder->vblank;
++			adjusted_mode->vsync_start = radeon_encoder->panel_yres + radeon_encoder->voverplus;
++			adjusted_mode->vsync_end = adjusted_mode->vsync_start + radeon_encoder->vsync_width;
++			/* update crtc values */
++			drm_mode_set_crtcinfo(adjusted_mode, CRTC_INTERLACE_HALVE_V);
++			/* adjust crtc values */
++			adjusted_mode->crtc_hdisplay = radeon_encoder->panel_xres;
++			adjusted_mode->crtc_vdisplay = radeon_encoder->panel_yres;
++			adjusted_mode->crtc_htotal = adjusted_mode->crtc_hdisplay + radeon_encoder->hblank;
++			adjusted_mode->crtc_hsync_start = adjusted_mode->crtc_hdisplay + radeon_encoder->hoverplus;
++			adjusted_mode->crtc_hsync_end = adjusted_mode->crtc_hsync_start + radeon_encoder->hsync_width;
++			adjusted_mode->crtc_vtotal = adjusted_mode->crtc_vdisplay + radeon_encoder->vblank;
++			adjusted_mode->crtc_vsync_start = adjusted_mode->crtc_vdisplay + radeon_encoder->voverplus;
++			adjusted_mode->crtc_vsync_end = adjusted_mode->crtc_vsync_start + radeon_encoder->vsync_width;
++		} else {
++			adjusted_mode->htotal = radeon_encoder->panel_xres + radeon_encoder->hblank;
++			adjusted_mode->hsync_start = radeon_encoder->panel_xres + radeon_encoder->hoverplus;
++			adjusted_mode->hsync_end = adjusted_mode->hsync_start + radeon_encoder->hsync_width;
++			adjusted_mode->vtotal = radeon_encoder->panel_yres + radeon_encoder->vblank;
++			adjusted_mode->vsync_start = radeon_encoder->panel_yres + radeon_encoder->voverplus;
++			adjusted_mode->vsync_end = adjusted_mode->vsync_start + radeon_encoder->vsync_width;
++			/* update crtc values */
++			drm_mode_set_crtcinfo(adjusted_mode, CRTC_INTERLACE_HALVE_V);
++			/* adjust crtc values */
++			adjusted_mode->crtc_htotal = adjusted_mode->crtc_hdisplay + radeon_encoder->hblank;
++			adjusted_mode->crtc_hsync_start = adjusted_mode->crtc_hdisplay + radeon_encoder->hoverplus;
++			adjusted_mode->crtc_hsync_end = adjusted_mode->crtc_hsync_start + radeon_encoder->hsync_width;
++			adjusted_mode->crtc_vtotal = adjusted_mode->crtc_vdisplay + radeon_encoder->vblank;
++			adjusted_mode->crtc_vsync_start = adjusted_mode->crtc_vdisplay + radeon_encoder->voverplus;
++			adjusted_mode->crtc_vsync_end = adjusted_mode->crtc_vsync_start + radeon_encoder->vsync_width;
++		}
 +	}
-+	adjusted_mode->clock = radeon_encoder->dotclock;
-+	adjusted_mode->flags = radeon_encoder->flags;
 +}
 +
 +


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.959
retrieving revision 1.960
diff -u -r1.959 -r1.960
--- kernel.spec	18 Sep 2008 23:34:47 -0000	1.959
+++ kernel.spec	19 Sep 2008 17:12:29 -0000	1.960
@@ -1758,6 +1758,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Sep 19 2008 Dave Airlie <airlied at redhat.com>
+- more fixes from AMD upstream for LVDS
+
 * Thu Sep 18 2008 Dave Airlie <airlied at redhat.com>
 - Merge krh's patches + new patches from AMD
 



From sgrubb at fedoraproject.org  Fri Sep 19 17:16:27 2008
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri, 19 Sep 2008 17:16:27 +0000 (UTC)
Subject: rpms/libprelude/devel .cvsignore, 1.13, 1.14 libprelude.spec, 1.30, 
	1.31 sources, 1.14, 1.15
Message-ID: <20080919171627.B483C700F7@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7870

Modified Files:
	.cvsignore libprelude.spec sources 
Log Message:
* Fri Sep 19 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.21-1
- New upstream bugfix release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	9 Sep 2008 14:11:04 -0000	1.13
+++ .cvsignore	19 Sep 2008 17:15:57 -0000	1.14
@@ -8,3 +8,4 @@
 libprelude-0.9.20.tar.gz
 libprelude-0.9.20.1.tar.gz
 libprelude-0.9.20.2.tar.gz
+libprelude-0.9.21.tar.gz


Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libprelude.spec	14 Sep 2008 14:29:15 -0000	1.30
+++ libprelude.spec	19 Sep 2008 17:15:57 -0000	1.31
@@ -4,8 +4,8 @@
 
 
 Name:		libprelude
-Version:	0.9.20.2
-Release:	3%{?dist}
+Version:	0.9.21
+Release:	1%{?dist}
 Summary:	The prelude library        
 Group:		System Environment/Libraries 
 License:	GPLv2+
@@ -157,8 +157,8 @@
 %{ruby_sitearch}/PreludeEasy.so
 
 %changelog
-* Sun Sep 14 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.9.20.2-3
-- Bump for upgrade path
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	9 Sep 2008 14:11:04 -0000	1.14
+++ sources	19 Sep 2008 17:15:57 -0000	1.15
@@ -1 +1 @@
-4980065cc9fc7f8d6f0ca25e902b745d  libprelude-0.9.20.2.tar.gz
+38feb1aaf23c12b8ac9f502eb70206f5  libprelude-0.9.21.tar.gz



From jnovy at fedoraproject.org  Fri Sep 19 17:28:49 2008
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 19 Sep 2008 17:28:49 +0000 (UTC)
Subject: rpms/curl/F-9 curl-7.18.2-nss-thread-safety.patch, 1.1,
	1.2 curl.spec, 1.79, 1.80
Message-ID: <20080919172849.67835700F7@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/curl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11788

Modified Files:
	curl-7.18.2-nss-thread-safety.patch curl.spec 
Log Message:
* Fri Sep 19 2008 Jindrich Novy <jnovy at redhat.com> 7.18.2-6
- enable support for libssh2 (#453958)
- update the thread safety patch, thanks to Rob Crittenden (#462217)


curl-7.18.2-nss-thread-safety.patch:

Index: curl-7.18.2-nss-thread-safety.patch
===================================================================
RCS file: /cvs/pkgs/rpms/curl/F-9/curl-7.18.2-nss-thread-safety.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- curl-7.18.2-nss-thread-safety.patch	4 Sep 2008 00:28:02 -0000	1.1
+++ curl-7.18.2-nss-thread-safety.patch	19 Sep 2008 17:28:18 -0000	1.2
@@ -1,6 +1,6 @@
-diff -u --recursive curl-7.18.2.orig/lib/nss.c curl-7.18.2/lib/nss.c
---- curl-7.18.2.orig/lib/nss.c	2008-05-26 11:02:49.000000000 -0400
-+++ curl-7.18.2/lib/nss.c	2008-09-03 13:33:32.000000000 -0400
+diff -u --recursive curl-7.18.2/lib/nss.c curl-7.18.2.new/lib/nss.c
+--- curl-7.18.2/lib/nss.c	2008-09-16 11:13:00.000000000 -0400
++++ curl-7.18.2.new/lib/nss.c	2008-09-16 11:29:13.000000000 -0400
 @@ -73,6 +73,8 @@
  
  PRFileDesc *PR_ImportTCPSocket(PRInt32 osfd);
@@ -10,13 +10,11 @@
  int initialized = 0;
  
  #define HANDSHAKE_TIMEOUT 30
-@@ -718,9 +720,12 @@
-  * @retval 1 SSL initialized successfully
+@@ -719,8 +721,11 @@
   */
  int Curl_nss_init(void)
--{
+ {
 -  if(!initialized)
-+{ 
 +  /* curl_global_init() is not thread-safe so this test is ok */
 +  if (nss_initlock == NULL) {
      PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 256);
@@ -44,8 +42,8 @@
    initialized = 0;
  }
  
-@@ -805,7 +820,8 @@
-   curlerr = CURLE_SSL_CONNECT_ERROR;
+@@ -808,7 +823,8 @@
+     return CURLE_OK;
  
    /* FIXME. NSS doesn't support multiple databases open at the same time. */
 -  if(!initialized) {
@@ -54,7 +52,7 @@
      initialized = 1;
  
      certDir = getenv("SSL_DIR"); /* Look in $SSL_DIR */
-@@ -829,8 +845,11 @@
+@@ -832,6 +848,8 @@
      if(rv != SECSuccess) {
        infof(conn->data, "Unable to initialize NSS database\n");
        curlerr = CURLE_SSL_CACERT_BADFILE;
@@ -62,7 +60,13 @@
 +      initialized = 0;
        goto error;
      }
-+    PR_Unlock(nss_initlock);
  
-     NSS_SetDomesticPolicy();
+@@ -854,6 +872,7 @@
+     }
+ #endif
+   }
++  PR_Unlock(nss_initlock);
  
+   model = PR_NewTCPSocket();
+   if(!model)
+Only in curl-7.18.2.new/lib: nss.c.orig


Index: curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/curl/F-9/curl.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- curl.spec	4 Sep 2008 00:28:02 -0000	1.79
+++ curl.spec	19 Sep 2008 17:28:19 -0000	1.80
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.18.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -13,7 +13,7 @@
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: pkgconfig, libidn-devel, zlib-devel
+BuildRequires: pkgconfig, libidn-devel, zlib-devel, libssh2-devel
 BuildRequires: nss-devel >= 3.11.7-7, openldap-devel, krb5-devel
 
 %description
@@ -64,7 +64,7 @@
 %configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \
 	--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
 	--with-gssapi=%{_prefix}/kerberos --with-libidn \
-	--enable-ldaps --disable-static
+	--enable-ldaps --disable-static --with-libssh2
 sed -i -e 's,-L/usr/lib ,,g;s,-L/usr/lib64 ,,g;s,-L/usr/lib$,,g;s,-L/usr/lib64$,,g' \
 	Makefile libcurl.pc
 # Remove bogus rpath
@@ -80,9 +80,11 @@
 make DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" install
 
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
+
 install -d $RPM_BUILD_ROOT/%{_datadir}/aclocal
 install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/%{_datadir}/aclocal
 
+
 # don't need curl's copy of the certs; use openssl's
 find ${RPM_BUILD_ROOT} -name ca-bundle.crt -exec rm -f '{}' \;
 
@@ -118,6 +120,10 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Fri Sep 19 2008 Jindrich Novy <jnovy at redhat.com> 7.18.2-6
+- enable support for libssh2 (#453958)
+- update the thread safety patch, thanks to Rob Crittenden (#462217)
+
 * Wed Sep 03 2008 Warren Togami <wtogami at redhat.com> 7.18.2-5
 - add thread safety to libcurl NSS cleanup() functions (#459297)
 



From jnovy at fedoraproject.org  Fri Sep 19 17:33:39 2008
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 19 Sep 2008 17:33:39 +0000 (UTC)
Subject: rpms/curl/F-8 curl-7.18.2-nss-thread-safety.patch, 1.1,
	1.2 curl.spec, 1.68, 1.69
Message-ID: <20080919173339.D6A67700F7@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/curl/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13337

Modified Files:
	curl-7.18.2-nss-thread-safety.patch curl.spec 
Log Message:
* Fri Sep 19 2008 Jindrich Novy <jnovy at redhat.com> 7.18.2-6
- enable support for libssh2 (#453958)
- update the thread safety patch, thanks to Rob Crittenden (#462217)


curl-7.18.2-nss-thread-safety.patch:

Index: curl-7.18.2-nss-thread-safety.patch
===================================================================
RCS file: /cvs/pkgs/rpms/curl/F-8/curl-7.18.2-nss-thread-safety.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- curl-7.18.2-nss-thread-safety.patch	4 Sep 2008 00:38:32 -0000	1.1
+++ curl-7.18.2-nss-thread-safety.patch	19 Sep 2008 17:33:09 -0000	1.2
@@ -1,6 +1,6 @@
-diff -u --recursive curl-7.18.2.orig/lib/nss.c curl-7.18.2/lib/nss.c
---- curl-7.18.2.orig/lib/nss.c	2008-05-26 11:02:49.000000000 -0400
-+++ curl-7.18.2/lib/nss.c	2008-09-03 13:33:32.000000000 -0400
+diff -u --recursive curl-7.18.2/lib/nss.c curl-7.18.2.new/lib/nss.c
+--- curl-7.18.2/lib/nss.c	2008-09-16 11:13:00.000000000 -0400
++++ curl-7.18.2.new/lib/nss.c	2008-09-16 11:29:13.000000000 -0400
 @@ -73,6 +73,8 @@
  
  PRFileDesc *PR_ImportTCPSocket(PRInt32 osfd);
@@ -10,13 +10,11 @@
  int initialized = 0;
  
  #define HANDSHAKE_TIMEOUT 30
-@@ -718,9 +720,12 @@
-  * @retval 1 SSL initialized successfully
+@@ -719,8 +721,11 @@
   */
  int Curl_nss_init(void)
--{
+ {
 -  if(!initialized)
-+{ 
 +  /* curl_global_init() is not thread-safe so this test is ok */
 +  if (nss_initlock == NULL) {
      PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 256);
@@ -44,8 +42,8 @@
    initialized = 0;
  }
  
-@@ -805,7 +820,8 @@
-   curlerr = CURLE_SSL_CONNECT_ERROR;
+@@ -808,7 +823,8 @@
+     return CURLE_OK;
  
    /* FIXME. NSS doesn't support multiple databases open at the same time. */
 -  if(!initialized) {
@@ -54,7 +52,7 @@
      initialized = 1;
  
      certDir = getenv("SSL_DIR"); /* Look in $SSL_DIR */
-@@ -829,8 +845,11 @@
+@@ -832,6 +848,8 @@
      if(rv != SECSuccess) {
        infof(conn->data, "Unable to initialize NSS database\n");
        curlerr = CURLE_SSL_CACERT_BADFILE;
@@ -62,7 +60,13 @@
 +      initialized = 0;
        goto error;
      }
-+    PR_Unlock(nss_initlock);
  
-     NSS_SetDomesticPolicy();
+@@ -854,6 +872,7 @@
+     }
+ #endif
+   }
++  PR_Unlock(nss_initlock);
  
+   model = PR_NewTCPSocket();
+   if(!model)
+Only in curl-7.18.2.new/lib: nss.c.orig


Index: curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/curl/F-8/curl.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- curl.spec	4 Sep 2008 00:38:32 -0000	1.68
+++ curl.spec	19 Sep 2008 17:33:09 -0000	1.69
@@ -4,7 +4,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.18.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -16,7 +16,7 @@
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: pkgconfig, libidn-devel, zlib-devel
+BuildRequires: pkgconfig, libidn-devel, zlib-devel, libssh2-devel
 BuildRequires: nss-devel >= 3.11.7-7
 BuildRequires: openldap-devel, krb5-devel
 
@@ -61,7 +61,8 @@
 	--with-ldap-lib=libldap-%{ldap_version}.so.0 \
 	--with-lber-lib=liblber-%{ldap_version}.so.0 \
 	--enable-ldaps \
-	--disable-static
+	--disable-static \
+	--with-libssh2
 sed -i -e 's,-L/usr/lib ,,g;s,-L/usr/lib64 ,,g;s,-L/usr/lib$,,g;s,-L/usr/lib64$,,g' \
 	Makefile libcurl.pc
 # Remove bogus rpath
@@ -113,6 +114,10 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Fri Sep 19 2008 Jindrich Novy <jnovy at redhat.com> 7.18.2-6
+- enable support for libssh2 (#453958)
+- update the thread safety patch, thanks to Rob Crittenden (#462217)
+
 * Wed Sep 03 2008 Warren Togami <wtogami at redhat.com> 7.18.2-5
 - add thread safety to libcurl NSS cleanup() functions (#459297)
 



From mclasen at fedoraproject.org  Fri Sep 19 17:51:19 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 19 Sep 2008 17:51:19 +0000 (UTC)
Subject: rpms/ORBit2/devel .cvsignore, 1.29, 1.30 ORBit2.spec, 1.70,
	1.71 sources, 1.29, 1.30
Message-ID: <20080919175119.D08087013D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/ORBit2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17503

Modified Files:
	.cvsignore ORBit2.spec sources 
Log Message:
2.14.15



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ORBit2/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	23 Aug 2008 00:42:32 -0000	1.29
+++ .cvsignore	19 Sep 2008 17:50:49 -0000	1.30
@@ -1 +1 @@
-ORBit2-2.14.14.tar.bz2
+ORBit2-2.14.15.tar.bz2


Index: ORBit2.spec
===================================================================
RCS file: /cvs/extras/rpms/ORBit2/devel/ORBit2.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ORBit2.spec	23 Aug 2008 00:42:32 -0000	1.70
+++ ORBit2.spec	19 Sep 2008 17:50:49 -0000	1.71
@@ -3,7 +3,7 @@
 
 Summary: A high-performance CORBA Object Request Broker
 Name: ORBit2
-Version: 2.14.14
+Version: 2.14.15
 Release: 1%{?dist}
 Source: http://download.gnome.org/sources/ORBit2/2.14/%{name}-%{version}.tar.bz2
 Group: System Environment/Daemons
@@ -138,6 +138,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Sep 19 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.15-1
+- Update to 2.14.15
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.14-1
 - Update to 2.14.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ORBit2/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	23 Aug 2008 00:42:32 -0000	1.29
+++ sources	19 Sep 2008 17:50:49 -0000	1.30
@@ -1 +1 @@
-f288e9a4354fce14cf6bb35140ac5d9b  ORBit2-2.14.14.tar.bz2
+7f1c0394691d4831297b231a17f4de60  ORBit2-2.14.15.tar.bz2



From hadess at fedoraproject.org  Fri Sep 19 18:05:39 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 19 Sep 2008 18:05:39 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs-obexftp-updated-apis-2.patch, NONE,
	1.1 gvfs.spec, 
	1.78, 1.79 gvfs-obexftp-updated-apis.patch, 1.1, NONE
Message-ID: <20080919180539.0CCDA700F7@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19762

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-obexftp-updated-apis-2.patch 
Removed Files:
	gvfs-obexftp-updated-apis.patch 
Log Message:
* Fri Sep 19 2008 - Bastien Nocera <bnocera at redhat.com> - 0.99.8-5
- Updated patch, fixed deadlock whilst mounting


gvfs-obexftp-updated-apis-2.patch:

--- NEW FILE gvfs-obexftp-updated-apis-2.patch ---
Index: daemon/gvfsbackendobexftp.c
===================================================================
--- daemon/gvfsbackendobexftp.c	(revision 2008)
+++ daemon/gvfsbackendobexftp.c	(working copy)
@@ -96,6 +96,15 @@
 
 G_DEFINE_TYPE (GVfsBackendObexftp, g_vfs_backend_obexftp, G_VFS_TYPE_BACKEND);
 
+static void session_connect_error_cb (DBusGProxy *proxy,
+                                      const char *session_object,
+                                      const gchar *error_name,
+                                      const gchar *error_message,
+                                      gpointer user_data);
+static void session_connected_cb (DBusGProxy *proxy,
+                                  const char *session_object,
+                                  gpointer user_data);
+
 /* This should all live in bluez-gnome, and we
  * should depend on it */
 enum {
@@ -207,66 +216,86 @@
   return g_str_has_prefix(bdaddr, "00:60:57");
 }
 
+static char *
+get_name_and_class (DBusGProxy *device, guint32 *type)
+{
+  GHashTable *hash;
+
+  if (dbus_g_proxy_call (device, "GetProperties", NULL,
+                         G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE),
+                         &hash, G_TYPE_INVALID) != FALSE)
+    {
+      GValue *value;
+      char *name;
+
+      value = g_hash_table_lookup (hash, "Name");
+      name = value ? g_value_dup_string(value) : NULL;
+
+      value = g_hash_table_lookup (hash, "Class");
+      if (value)
+        {
+          *type = _get_type_from_class (g_value_get_uint (value));
+        }
+      else
+        {
+          *type = BLUETOOTH_TYPE_ANY;
+        }
+      return name;
+    }
+
+  return NULL;
+}
+
 static gchar *
 _get_device_properties (const char *bdaddr, guint32 *type)
 {
   DBusGConnection *connection;
   DBusGProxy *manager;
-  gchar *name, **adapters;
+  GPtrArray *adapters;
+  gchar *name;
   guint i;
 
   name = NULL;
 
   connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
   if (connection == NULL)
-        return NULL;
+        return name;
 
   manager = dbus_g_proxy_new_for_name (connection, "org.bluez",
-                                       "/org/bluez", "org.bluez.Manager");
+                                       "/", "org.bluez.Manager");
   if (manager == NULL)
     {
       dbus_g_connection_unref (connection);
-      return NULL;
+      return name;
     }
 
-  if (dbus_g_proxy_call (manager, "ListAdapters", NULL, G_TYPE_INVALID, G_TYPE_STRV, &adapters, G_TYPE_INVALID) == FALSE)
+  if (dbus_g_proxy_call (manager, "ListAdapters", NULL, G_TYPE_INVALID, dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &adapters, G_TYPE_INVALID) == FALSE)
     {
       g_object_unref (manager);
       dbus_g_connection_unref (connection);
-      return NULL;
+      return name;
     }
 
-  for (i = 0; adapters[i] != NULL; i++)
+  for (i = 0; i < adapters->len && name == NULL; i++)
     {
       DBusGProxy *adapter;
+      char *device_path;
 
       adapter = dbus_g_proxy_new_for_name (connection, "org.bluez",
-                                           adapters[i], "org.bluez.Adapter");
-      if (dbus_g_proxy_call (adapter, "GetRemoteName", NULL,
+                                           g_ptr_array_index (adapters, i), "org.bluez.Adapter");
+      if (dbus_g_proxy_call (adapter, "FindDevice", NULL,
                              G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
-                             G_TYPE_STRING, &name, G_TYPE_INVALID) != FALSE)
+                             DBUS_TYPE_G_OBJECT_PATH, &device_path, G_TYPE_INVALID) != FALSE)
         {
-          if (name != NULL && name[0] != '\0')
-            {
-              guint32 class;
-
-              if (dbus_g_proxy_call(adapter, "GetRemoteClass", NULL,
-                                    G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
-                                    G_TYPE_UINT, &class, G_TYPE_INVALID) != FALSE)
-                {
-                  *type = _get_type_from_class (class);
-                }
-              else
-                {
-                  *type = BLUETOOTH_TYPE_ANY;
-                }
-              g_object_unref (adapter);
-              break;
-            }
+          DBusGProxy *device;
+          device = dbus_g_proxy_new_for_name (connection, "org.bluez", device_path, "org.bluez.Device");
+          name = get_name_and_class (device, type);
+          g_object_unref (device);
         }
       g_object_unref (adapter);
     }
 
+  g_ptr_array_free (adapters, TRUE);
   g_object_unref (manager);
   dbus_g_connection_unref (connection);
 
@@ -312,6 +341,15 @@
                                                       "org.openobex",
                                                       "/org/openobex",
                                                       "org.openobex.Manager");
+
+  dbus_g_proxy_add_signal(backend->manager_proxy, "SessionConnectError",
+                          DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(backend->manager_proxy, "SessionConnectError",
+                              G_CALLBACK(session_connect_error_cb), backend, NULL);
+  dbus_g_proxy_add_signal(backend->manager_proxy, "SessionConnected",
+                          DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(backend->manager_proxy, "SessionConnected",
+                              G_CALLBACK(session_connected_cb), backend, NULL);
 }
 
 static gboolean
@@ -531,6 +569,37 @@
 }
 
 static void
+session_connect_error_cb (DBusGProxy *proxy,
+                          const char *session_object,
+                          const gchar *error_name,
+                          const gchar *error_message,
+                          gpointer user_data)
+{
+  GVfsBackendObexftp *op_backend = G_VFS_BACKEND_OBEXFTP (user_data);
+
+  g_mutex_lock (op_backend->mutex);
+  op_backend->status = ASYNC_ERROR;
+  op_backend->error = g_error_new_literal (DBUS_GERROR,
+                                           DBUS_GERROR_REMOTE_EXCEPTION,
+                                           error_message);
+  g_cond_signal (op_backend->cond);
+  g_mutex_unlock (op_backend->mutex);
+}
+
+static void
+session_connected_cb (DBusGProxy *proxy,
+                      const char *session_object,
+                      gpointer user_data)
+{
+  GVfsBackendObexftp *op_backend = G_VFS_BACKEND_OBEXFTP (user_data);
+
+  g_mutex_lock (op_backend->mutex);
+  op_backend->status = ASYNC_SUCCESS;
+  g_cond_signal (op_backend->cond);
+  g_mutex_unlock (op_backend->mutex);
+}
+
+static void
 cancelled_cb (DBusGProxy *proxy, gpointer user_data)
 {
   GVfsBackendObexftp *op_backend = G_VFS_BACKEND_OBEXFTP (user_data);
@@ -559,24 +628,6 @@
   _exit (1);
 }
 
-static int
-is_connected (DBusGProxy *session_proxy, GVfsJob *job)
-{
-  GError *error = NULL;
-  gboolean connected;
-
-  if (dbus_g_proxy_call (session_proxy, "IsConnected", &error,
-                         G_TYPE_INVALID,
-                         G_TYPE_BOOLEAN, &connected, G_TYPE_INVALID) == FALSE)
-    {
-      g_vfs_job_failed_from_error (job, error);
-      g_error_free (error);
-      return -1;
-    }
-
-  return connected;
-}
-
 static void
 do_mount (GVfsBackend *backend,
           GVfsJobMount *job,
@@ -590,7 +641,7 @@
   const gchar *path = NULL;
   char *server;
   GMountSpec *obexftp_mount_spec;
-  gboolean connected;
+  guint count;
 
   g_print ("+ do_mount\n");
 
@@ -616,10 +667,11 @@
     }
 
   /* FIXME, Have a way for the mount to be cancelled, see:
-   * http://bugs.muiline.com/view.php?id=51 */
+   * Use CancelSessionConnect */
+  op_backend->status = ASYNC_PENDING;
 
   if (dbus_g_proxy_call (op_backend->manager_proxy, "CreateBluetoothSession", &error,
-                         G_TYPE_STRING, op_backend->bdaddr, G_TYPE_STRING, "ftp", G_TYPE_INVALID,
+                         G_TYPE_STRING, op_backend->bdaddr, G_TYPE_STRING, "00:00:00:00:00:00", G_TYPE_STRING, "ftp", G_TYPE_INVALID,
                          DBUS_TYPE_G_OBJECT_PATH, &path, G_TYPE_INVALID) == FALSE)
     {
       g_free (op_backend->bdaddr);
@@ -676,14 +728,20 @@
                           G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_INVALID);
 
   /* Now wait until the device is connected */
-  connected = is_connected (op_backend->session_proxy, G_VFS_JOB (job));
-  while (connected == FALSE)
-    {
-      g_usleep (G_USEC_PER_SEC / 100);
-      connected = is_connected (op_backend->session_proxy, G_VFS_JOB (job));
-    }
+  count = 0;
+  g_mutex_lock (op_backend->mutex);
 
-  if (connected < 0)
+  while (op_backend->status == ASYNC_PENDING && count < 100) {
+      GTimeVal val;
+      g_get_current_time (&val);
+      g_time_val_add (&val, 100000);
+      count++;
+      if (g_cond_timed_wait (op_backend->cond, op_backend->mutex, &val) != FALSE)
+            break;
+  }
+  g_mutex_unlock (op_backend->mutex);
+
+  if (op_backend->status == ASYNC_ERROR || op_backend->status == ASYNC_PENDING)
     {
       g_message ("mount failed, didn't connect");
 
@@ -694,12 +752,17 @@
       g_object_unref (op_backend->session_proxy);
       op_backend->session_proxy = NULL;
 
-      g_vfs_job_failed (G_VFS_JOB (job),
-                        G_IO_ERROR, G_IO_ERROR_BUSY,
-                        _("Connection to the device lost"));
+      if (op_backend->status != ASYNC_PENDING)
+            g_vfs_job_failed_from_error (G_VFS_JOB (job), op_backend->error);
+      else
+            g_vfs_job_failed (G_VFS_JOB (job),
+                              G_IO_ERROR, G_IO_ERROR_BUSY,
+                              _("Connection to the device lost"));
       return;
     }
 
+  op_backend->status = ASYNC_PENDING;
+
   g_vfs_job_succeeded (G_VFS_JOB (job));
 
   g_print ("- do_mount\n");
@@ -1482,6 +1545,12 @@
   /* TransferStarted */
   dbus_g_object_register_marshaller(obexftp_marshal_VOID__STRING_STRING_UINT64,
                                     G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_INVALID);
+  /* SessionConnected */
+  dbus_g_object_register_marshaller(obexftp_marshal_VOID__STRING,
+                                    G_TYPE_NONE, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
+  /* SessionConnectError */
+  dbus_g_object_register_marshaller (obexftp_marshal_VOID__STRING_STRING_STRING,
+                                     G_TYPE_NONE, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
 }
 
 /*


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gvfs.spec	17 Sep 2008 14:59:31 -0000	1.78
+++ gvfs.spec	19 Sep 2008 18:05:08 -0000	1.79
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 0.99.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -30,7 +30,7 @@
 BuildRequires: libtool
 Patch1: gvfs-0.99.2-archive-integration.patch
 
-Patch2: gvfs-obexftp-updated-apis.patch
+Patch2: gvfs-obexftp-updated-apis-2.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=524498
 Patch3: gvfs-0.99.8-smb-kerberos-auth.patch
@@ -255,6 +255,9 @@
 
 
 %changelog
+* Fri Sep 19 2008 - Bastien Nocera <bnocera at redhat.com> - 0.99.8-5
+- Updated patch, fixed deadlock whilst mounting
+
 * Wed Sep 17 2008 Tomas Bzatek <tbzatek at redhat.com>  - 0.99.8-4
 - Actually apply the kerberos patch
 


--- gvfs-obexftp-updated-apis.patch DELETED ---



From mclasen at fedoraproject.org  Fri Sep 19 18:08:40 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 19 Sep 2008 18:08:40 +0000 (UTC)
Subject: rpms/libxklavier/devel libxklavier.spec,1.41,1.42
Message-ID: <20080919180840.460BE700F7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libxklavier/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20369

Modified Files:
	libxklavier.spec 
Log Message:
plug a memory leak



Index: libxklavier.spec
===================================================================
RCS file: /cvs/extras/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libxklavier.spec	19 Sep 2008 04:38:29 -0000	1.41
+++ libxklavier.spec	19 Sep 2008 18:08:10 -0000	1.42
@@ -15,6 +15,7 @@
 Source: http://download.gnome.org/sources/libxklavier/3.7/libxklavier-3.7.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+# https://bugs.freedesktop.org/show_bug.cgi?id=17651
 Patch0: sax-leak.patch
 
 %description



From mclasen at fedoraproject.org  Fri Sep 19 18:10:23 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 19 Sep 2008 18:10:23 +0000 (UTC)
Subject: rpms/libxklavier/devel libxklavier.spec,1.42,1.43
Message-ID: <20080919181023.36216700F7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libxklavier/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20695

Modified Files:
	libxklavier.spec 
Log Message:
add bug ref



Index: libxklavier.spec
===================================================================
RCS file: /cvs/extras/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- libxklavier.spec	19 Sep 2008 18:08:10 -0000	1.42
+++ libxklavier.spec	19 Sep 2008 18:09:52 -0000	1.43
@@ -1,7 +1,7 @@
 Summary:	library providing high-level API for X Keyboard Extension
 Name:		libxklavier
 Version:	3.7
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL: http://gswitchit.sourceforge.net/
@@ -73,7 +73,7 @@
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
-* Fri Sep 19 2008 Matthias Clasen <mclasen at redhat.com> - 3.7-2
+* Fri Sep 19 2008 Matthias Clasen <mclasen at redhat.com> - 3.7-3
 - Plug a memory leak
 
 * Fri Sep  5 2008 Matthias Clasen <mclasen at redhat.com> - 3.7-1



From hadess at fedoraproject.org  Fri Sep 19 18:15:39 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 19 Sep 2008 18:15:39 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs-obexftp-updated-apis-2.patch, 1.1,
	1.2 gvfs.spec, 1.79, 1.80
Message-ID: <20080919181539.CF441700F7@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21763

Modified Files:
	gvfs-obexftp-updated-apis-2.patch gvfs.spec 
Log Message:
* Fri Sep 19 2008 - Bastien Nocera <bnocera at redhat.com> - 0.99.8-6
- Update patch for missing file


gvfs-obexftp-updated-apis-2.patch:

Index: gvfs-obexftp-updated-apis-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs-obexftp-updated-apis-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gvfs-obexftp-updated-apis-2.patch	19 Sep 2008 18:05:08 -0000	1.1
+++ gvfs-obexftp-updated-apis-2.patch	19 Sep 2008 18:15:39 -0000	1.2
@@ -296,3 +296,12 @@
  }
  
  /*
+Index: daemon/obexftp-marshal.list
+===================================================================
+--- daemon/obexftp-marshal.list	(revision 2008)
++++ daemon/obexftp-marshal.list	(working copy)
+@@ -1,2 +1,4 @@
++VOID:STRING
+ VOID:STRING,STRING
++VOID:STRING,STRING,STRING
+ VOID:STRING,STRING,UINT64


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- gvfs.spec	19 Sep 2008 18:05:08 -0000	1.79
+++ gvfs.spec	19 Sep 2008 18:15:39 -0000	1.80
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 0.99.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -255,6 +255,9 @@
 
 
 %changelog
+* Fri Sep 19 2008 - Bastien Nocera <bnocera at redhat.com> - 0.99.8-6
+- Update patch for missing file
+
 * Fri Sep 19 2008 - Bastien Nocera <bnocera at redhat.com> - 0.99.8-5
 - Updated patch, fixed deadlock whilst mounting
 



From mclasen at fedoraproject.org  Fri Sep 19 18:36:32 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 19 Sep 2008 18:36:32 +0000 (UTC)
Subject: rpms/libgnomeui/devel config_prefix-leak.patch, NONE,
	1.1 libgnomeui.spec, 1.106, 1.107
Message-ID: <20080919183632.4CB8C700F7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnomeui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25445

Modified Files:
	libgnomeui.spec 
Added Files:
	config_prefix-leak.patch 
Log Message:
plug a memory leak


config_prefix-leak.patch:

--- NEW FILE config_prefix-leak.patch ---
diff -up libgnomeui-2.23.90/libgnomeui/gnome-client.c.config_prefix-leak libgnomeui-2.23.90/libgnomeui/gnome-client.c
--- libgnomeui-2.23.90/libgnomeui/gnome-client.c.config_prefix-leak	2008-09-19 00:34:10.000000000 -0400
+++ libgnomeui-2.23.90/libgnomeui/gnome-client.c	2008-09-19 00:33:40.000000000 -0400
@@ -740,6 +740,7 @@ client_save_yourself_callback (SmcConn  
     {
       unlink (name);
       close (fd);
+      g_free (client->config_prefix);
       client->config_prefix = g_strconcat (name+strlen(name) - len, "/", NULL);
 
       if (client == master_client)


Index: libgnomeui.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- libgnomeui.spec	22 Aug 2008 23:12:05 -0000	1.106
+++ libgnomeui.spec	19 Sep 2008 18:36:01 -0000	1.107
@@ -18,11 +18,12 @@
 Summary: GNOME base GUI library
 Name: libgnomeui
 Version: 2.23.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnomeui/2.23/%{name}-%{version}.tar.bz2
 Patch0: libgnomeui-2.23.4-disable-event-sounds.patch
-#
+# http://bugzilla.gnome.org/show_bug.cgi?id=552930
+Patch1: config_prefix-leak.patch
 
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -105,6 +106,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .disable-sound-events
+%patch1 -p1 -b .config_prefix-leak
 aclocal
 automake
 autoconf
@@ -148,6 +150,9 @@
 %{_datadir}/gtk-doc/html/libgnomeui
 
 %changelog
+* Fri Sep 19 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-2
+- Plug a memory leak
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-1
 - Update to 2.23.90
 



From cebbert at fedoraproject.org  Fri Sep 19 19:02:29 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 19 Sep 2008 19:02:29 +0000 (UTC)
Subject: rpms/kernel/F-8
	linux-2.6-wireless-rt2500pci-restoring-missing-line.patch, NONE,
	1.1 kernel.spec, 1.535, 1.536
Message-ID: <20080919190229.1847B700F7@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29670

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-wireless-rt2500pci-restoring-missing-line.patch 
Log Message:
wireless: rt2500pci: restoring missing line (from F9)

linux-2.6-wireless-rt2500pci-restoring-missing-line.patch:

--- NEW FILE linux-2.6-wireless-rt2500pci-restoring-missing-line.patch ---
>From bf4634afd8bb72936d2d56425ec792ca1bfa92a2 Mon Sep 17 00:00:00 2001
From: Peter Chubb <peterc at gelato.unsw.edu.au>
Date: Thu, 31 Jul 2008 10:56:34 +1000
Subject: rt2500pci: restoring missing line

In kernel version 2.6.26-rc9 my wireless LAN card worked; but in the
released 2.6.26, my RaLink rt2500 card wouldn't associate.

Git-bisect led me to this patch:

	61486e0f68d1f8966c09b734566a187d42d65c54
	rt2x00: Remove ieee80211_tx_control argument from write_tx_desc()

I believe that there is a problem with that patch --- it
(inadvertantly) removes an extra line of code, that used to set the
DATABYTE_COUNT field.

This patch reinstates that line, and with it my card works again.

Signed-off-by: Peter Chubb <peterc at gelato.unsw.edu.au>
Acked-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
 drivers/net/wireless/rt2x00/rt2500pci.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index aa6dfb8..181a146 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1220,6 +1220,7 @@ static void rt2500pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
 	rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->ifs);
 	rt2x00_set_field32(&word, TXD_W0_RETRY_MODE,
 			   test_bit(ENTRY_TXD_RETRY_MODE, &txdesc->flags));
+	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, skb->len);
 	rt2x00_set_field32(&word, TXD_W0_CIPHER_ALG, CIPHER_NONE);
 	rt2x00_desc_write(txd, 0, word);
 }
-- 
1.5.5.1



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.535
retrieving revision 1.536
diff -u -r1.535 -r1.536
--- kernel.spec	19 Sep 2008 14:01:59 -0000	1.535
+++ kernel.spec	19 Sep 2008 19:01:58 -0000	1.536
@@ -657,6 +657,7 @@
 #Patch682: linux-2.6-wireless-fixups.patch
 Patch683: linux-2.6-wireless-stable-backports.patch
 Patch685: linux-2.6-rt2500usb-fix.patch
+Patch686: linux-2.6-wireless-rt2500pci-restoring-missing-line.patch
 Patch690: linux-2.6-at76.patch
 Patch691: linux-2.6-zd1211rw-module-alias.patch
 Patch692: linux-2.6-cfg80211-extras.patch
@@ -1201,6 +1202,9 @@
 
 # fix for long-standing rt2500usb issues
 ApplyPatch linux-2.6-rt2500usb-fix.patch
+# bf4634afd8bb72936d2d56425ec792ca1bfa92a2
+ApplyPatch linux-2.6-wireless-rt2500pci-restoring-missing-line.patch
+
 # module alias for zd1211rw module
 ApplyPatch linux-2.6-zd1211rw-module-alias.patch
 # Restore ability to add/remove virtual i/fs to mac80211 devices
@@ -1857,6 +1861,9 @@
 
 
 %changelog
+* Fri Sep 19 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-26
+- wireless: rt2500pci: restoring missing line (from F9)
+
 * Fri Sep 19 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-25
 - x86: pci: detect end_bus_number according to acpi/e820 reserved, v2 (F9#462210)
 



From rstrode at fedoraproject.org  Fri Sep 19 19:33:18 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 19 Sep 2008 19:33:18 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec,1.52,1.53
Message-ID: <20080919193318.7DE03700F7@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1329

Modified Files:
	plymouth.spec 
Log Message:
- Turn on gdm trigger for transition



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- plymouth.spec	15 Sep 2008 20:37:49 -0000	1.52
+++ plymouth.spec	19 Sep 2008 19:32:48 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: Plymouth Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.6.0
-Release: 0.2008.09.15.1%{?dist}
+Release: 0.2008.09.15.2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -113,7 +113,8 @@
            --with-logo=%{_datadir}/pixmaps/system-logo-white.png \
            --with-background-start-color-stop=0x0073B3           \
            --with-background-end-color-stop=0x00457E             \
-           --with-background-color=0x3391cd
+           --with-background-color=0x3391cd                      \
+           --enable-gdm-transition
 
 make
 
@@ -226,6 +227,9 @@
 %{_libdir}/plymouth/spinfinity.so
 
 %changelog
+* Fri Sep 19 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.15.2
+- Turn on gdm trigger for transition
+
 * Mon Sep 15 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.15.1
 - add quit command with --retain-splash option to client
 



From mwringe at fedoraproject.org  Fri Sep 19 19:35:06 2008
From: mwringe at fedoraproject.org (Matt Wringe)
Date: Fri, 19 Sep 2008 19:35:06 +0000 (UTC)
Subject: rpms/xml-commons-apis/devel xml-commons-apis.spec,1.4,1.5
Message-ID: <20080919193506.C9743700F7@cvs1.fedora.phx.redhat.com>

Author: mwringe

Update of /cvs/pkgs/rpms/xml-commons-apis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1742

Modified Files:
	xml-commons-apis.spec 
Log Message:
Remove natively compiled bits from the javadoc package.




Index: xml-commons-apis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xml-commons-apis/devel/xml-commons-apis.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xml-commons-apis.spec	10 Jul 2008 20:39:20 -0000	1.4
+++ xml-commons-apis.spec	19 Sep 2008 19:34:36 -0000	1.5
@@ -35,7 +35,7 @@
 Name:           xml-commons-apis
 Summary:        APIs for DOM, SAX, and JAXP
 Version:        1.3.04
-Release:        1.2%{?dist}
+Release:        1.3%{?dist}
 Epoch:          0
 License:        ASL 2.0 and W3C and Public Domain
 URL:            http://xml.apache.org/commons/
@@ -181,12 +181,10 @@
 
 # -----------------------------------------------------------------------------
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
-%endif
-
 %changelog
+* Fri Sep 19 2008 Matt Wringe <mwringe at redhat.com> - 0:1.3.04-1.3
+- Remove natively compiled bits from the javadoc package (462809)
+
 * Thu Jul 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:1.3.04-1.2
 - drop repotag
 - fix license tag



From bpepple at fedoraproject.org  Fri Sep 19 19:42:41 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Fri, 19 Sep 2008 19:42:41 +0000 (UTC)
Subject: rpms/libjingle/devel .cvsignore, 1.3, 1.4 libjingle.spec, 1.10,
	1.11 sources, 1.3, 1.4 libjingle-0.3.11-gcc43.patch, 1.1, NONE
Message-ID: <20080919194241.EFAA8700F7@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/libjingle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2921

Modified Files:
	.cvsignore libjingle.spec sources 
Removed Files:
	libjingle-0.3.11-gcc43.patch 
Log Message:
* Wed Sep 17 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.3.12-1
- Update to 0.3.12.
- Add hack to remove rpath.
- Update source url.
- Drop gcc patch. Fixed upstream.
- Drop expat-devel BR.  Not needed anymore.
- Drop *.pc files no longer available.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libjingle/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 May 2007 17:44:51 -0000	1.3
+++ .cvsignore	19 Sep 2008 19:42:11 -0000	1.4
@@ -1 +1 @@
-libjingle-0.3.11.tar.gz
+libjingle-0.3.12.tar.gz


Index: libjingle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libjingle/devel/libjingle.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libjingle.spec	17 Mar 2008 01:06:22 -0000	1.10
+++ libjingle.spec	19 Sep 2008 19:42:11 -0000	1.11
@@ -1,16 +1,14 @@
 Name:           libjingle
-Version:        0.3.11
-Release:        8%{?dist}
+Version:        0.3.12
+Release:        1%{?dist}
 Summary:        GoogleTalk implementation of Jingle
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://code.google.com/apis/talk/libjingle/
-Source0:        http://download.sourceforge.net/tapioca-voip/%{name}-%{version}.tar.gz
-Patch0:		%{name}-%{version}-gcc43.patch
+Source0:        http://farsight.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	expat-devel
 BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig 
 
@@ -27,7 +25,6 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:	pkgconfig
 Requires:	openssl-devel
-Requires:	expat-devel
 
 
 %description    devel
@@ -37,11 +34,13 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .gcc43
 
 
 %build
 %configure --disable-static
+# Remove rpath.
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 
@@ -75,12 +74,17 @@
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/jinglebase-0.3.pc
 %{_libdir}/pkgconfig/jinglep2p-0.3.pc
-%{_libdir}/pkgconfig/jinglesession-0.3.pc
-%{_libdir}/pkgconfig/jinglexmllite-0.3.pc
-%{_libdir}/pkgconfig/jinglexmpp-0.3.pc
 
 
 %changelog
+* Wed Sep 17 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.3.12-1
+- Update to 0.3.12.
+- Add hack to remove rpath.
+- Update source url.
+- Drop gcc patch. Fixed upstream.
+- Drop expat-devel BR.  Not needed anymore.
+- Drop *.pc files no longer available.
+
 * Sun Mar 16 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.3.11-8
 - Add patch to fix build w/ gcc4.3.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libjingle/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 May 2007 17:44:51 -0000	1.3
+++ sources	19 Sep 2008 19:42:11 -0000	1.4
@@ -1 +1 @@
-f9602b2dbca1e13dfe0b15e9188b4442  libjingle-0.3.11.tar.gz
+cf549c563c5db9f25a7d5cadc40d4162  libjingle-0.3.12.tar.gz


--- libjingle-0.3.11-gcc43.patch DELETED ---



From sharkcz at fedoraproject.org  Fri Sep 19 20:09:04 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 19 Sep 2008 20:09:04 +0000 (UTC)
Subject: rpms/tinyerp/devel tinyerp-pgsql.patch,1.1,NONE
Message-ID: <20080919200904.AE3EC700F7@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7139

Removed Files:
	tinyerp-pgsql.patch 
Log Message:
remove unused patch


--- tinyerp-pgsql.patch DELETED ---



From sharkcz at fedoraproject.org  Fri Sep 19 20:11:24 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 19 Sep 2008 20:11:24 +0000 (UTC)
Subject: rpms/tinyerp/F-9 .cvsignore, 1.16, 1.17 sources, 1.16,
	1.17 tinyerp.spec, 1.36, 1.37 tinyerp-pgsql.patch, 1.1, NONE
Message-ID: <20080919201124.550D7700F7@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7451

Modified Files:
	.cvsignore sources tinyerp.spec 
Removed Files:
	tinyerp-pgsql.patch 
Log Message:
* Wed Sep 16 2008 Dan Horak <dan[at]danny.cz> 4.2.3.3-1
- update to upstream version 4.2.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/F-9/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	12 Feb 2008 18:02:11 -0000	1.16
+++ .cvsignore	19 Sep 2008 20:10:54 -0000	1.17
@@ -1,2 +1,2 @@
-tinyerp-client-4.2.2.tar.gz
-tinyerp-server-4.2.2.tar.gz
+tinyerp-client-4.2.3.3.tar.gz
+tinyerp-server-4.2.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/F-9/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	12 Feb 2008 18:02:11 -0000	1.16
+++ sources	19 Sep 2008 20:10:54 -0000	1.17
@@ -1,2 +1,2 @@
-6304a349cb0595ab21db9dde18472025  tinyerp-client-4.2.2.tar.gz
-0314eb07bae41040dfcf832eadf190d0  tinyerp-server-4.2.2.tar.gz
+bc6db0ad92965c80753195265fceef29  tinyerp-client-4.2.3.3.tar.gz
+d7a87e27a895732de87f6e7091abcf8f  tinyerp-server-4.2.3.3.tar.gz


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/F-9/tinyerp.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- tinyerp.spec	1 Sep 2008 07:30:54 -0000	1.36
+++ tinyerp.spec	19 Sep 2008 20:10:54 -0000	1.37
@@ -3,8 +3,8 @@
 
 
 Name:		tinyerp
-Version:	4.2.2
-Release:	4%{?dist}
+Version:	4.2.3.3
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -16,7 +16,6 @@
 Source4:	tinyerp-server
 Source5:	tinyerp-server.logrotate
 Source6:	README.Fedora
-Patch0:		tinyerp-pgsql.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
@@ -55,9 +54,10 @@
 
 
 %prep
-%setup -q -a 1 -c %{name}-%{version}
-%patch0 -p0
+%setup -q -T -a 0 -c -n %{name}-server-%{version}
+%setup -q -T -a 1 -c -n %{name}-client-%{version}
 
+cd ..
 # update docs
 rm tinyerp-client-%{version}/doc/License.rtf
 cp %{SOURCE6} tinyerp-server-%{version}/doc/README.Fedora
@@ -68,7 +68,7 @@
 
 
 %build
-cd tinyerp-client-%{version}
+cd ../tinyerp-client-%{version}
 %{_xvfb} :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py build
 cd ../tinyerp-server-%{version}
@@ -77,7 +77,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd tinyerp-client-%{version}
+cd ../tinyerp-client-%{version}
 %{_xvfb} :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
 cd ../tinyerp-server-%{version}
@@ -113,8 +113,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -f %{name}-client.lang
-%doc tinyerp-client-%{version}/doc/*
+%files -f ../%{name}-client.lang
+%doc ../tinyerp-client-%{version}/doc/*
 %defattr(-,root,root,0755)
 %{_bindir}/tinyerp-client
 %{python_sitelib}/tinyerp-client/
@@ -125,7 +125,7 @@
 %{_datadir}/applications/*.desktop
 
 %files server
-%doc tinyerp-server-%{version}/doc/*
+%doc ../tinyerp-server-%{version}/doc/*
 %attr(750,tinyerp,tinyerp) %dir /var/log/tinyerp
 %attr(750,tinyerp,tinyerp) %dir /var/spool/tinyerp
 %{_sysconfdir}/rc.d/init.d/tinyerp-server
@@ -164,8 +164,11 @@
 
 
 %changelog
+* Wed Sep 16 2008 Dan Horak <dan[at]danny.cz> 4.2.3.3-1
+- update to upstream version 4.2.3.3
+
 * Mon Sep  1 2008 Dan Horak <dan[at]danny.cz> 4.2.2-4
-- add patch for PostgreSQL 8.3 compatibility (from Pieter. J. Kersten)
+- add patch for PostgreSQL 8.3 compatibility (from Pieter J. Kersten)
 
 * Fri May 30 2008 Dan Horak <dan[at]danny.cz> 4.2.2-3
 - add missing R: python-matplotlib (Resolves: #449118)


--- tinyerp-pgsql.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Sep 19 20:26:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 20:26:30 +0000
Subject: [pkgdb] perl-Moose had group_acl changed
Message-ID: <20080919202630.59704208D9F@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Moose (Fedora 9) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Moose



From pkgdb at fedoraproject.org  Fri Sep 19 20:26:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 20:26:45 +0000
Subject: [pkgdb] perl-Moose had group_acl changed
Message-ID: <20080919202645.ADCF6208D9E@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Moose (Fedora 8) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Moose



From pkgdb at fedoraproject.org  Fri Sep 19 20:26:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 20:26:55 +0000
Subject: [pkgdb] perl-Moose had group_acl changed
Message-ID: <20080919202655.DA437208DA3@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Moose (Fedora 6) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Moose



From pkgdb at fedoraproject.org  Fri Sep 19 20:26:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 20:26:54 +0000
Subject: [pkgdb] perl-Moose had group_acl changed
Message-ID: <20080919202655.D5794208DA2@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Moose (Fedora 5) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Moose



From pkgdb at fedoraproject.org  Fri Sep 19 20:26:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 20:26:56 +0000
Subject: [pkgdb] perl-Moose had group_acl changed
Message-ID: <20080919202656.69946208DA5@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Moose (Fedora 7) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Moose



From pkgdb at fedoraproject.org  Fri Sep 19 20:27:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 20:27:01 +0000
Subject: [pkgdb] perl-Moose had group_acl changed
Message-ID: <20080919202701.6106C208DA6@bastion.fedora.phx.redhat.com>

cweyl has set the commit acl on perl-Moose (Fedora devel) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Moose



From bpepple at fedoraproject.org  Fri Sep 19 20:38:32 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Fri, 19 Sep 2008 20:38:32 +0000 (UTC)
Subject: rpms/telepathy-glib/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 telepathy-glib-broken-pkgconfig.patch, 1.3,
	1.4 telepathy-glib.spec, 1.22, 1.23
Message-ID: <20080919203832.E7373700F7@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11537

Modified Files:
	.cvsignore sources telepathy-glib-broken-pkgconfig.patch 
	telepathy-glib.spec 
Log Message:
* Fri Sep 19 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.15-1
- Update to 0.7.15.
- Bump min version of glib needed.
- Update broken-pkgconfig patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	23 Aug 2008 16:11:22 -0000	1.15
+++ .cvsignore	19 Sep 2008 20:38:02 -0000	1.16
@@ -1 +1 @@
-telepathy-glib-0.7.14.tar.gz
+telepathy-glib-0.7.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	23 Aug 2008 16:11:23 -0000	1.15
+++ sources	19 Sep 2008 20:38:02 -0000	1.16
@@ -1 +1 @@
-33e68c9876de84a252a84bf5f828aab6  telepathy-glib-0.7.14.tar.gz
+fdf836e1c4d4c7b6e0b4cfb7be2f0e3e  telepathy-glib-0.7.15.tar.gz

telepathy-glib-broken-pkgconfig.patch:

Index: telepathy-glib-broken-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib-broken-pkgconfig.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- telepathy-glib-broken-pkgconfig.patch	28 Jul 2008 23:33:41 -0000	1.3
+++ telepathy-glib-broken-pkgconfig.patch	19 Sep 2008 20:38:02 -0000	1.4
@@ -1,14 +1,24 @@
-diff -urp telepathy-glib-0.7.12.OLD/telepathy-glib/telepathy-glib.pc.in telepathy-glib-0.7.12/telepathy-glib/telepathy-glib.pc.in
---- telepathy-glib-0.7.12.OLD/telepathy-glib/telepathy-glib.pc.in	2008-07-17 11:27:57.000000000 -0400
-+++ telepathy-glib-0.7.12/telepathy-glib/telepathy-glib.pc.in	2008-07-28 19:29:34.000000000 -0400
-@@ -5,8 +5,7 @@ includedir=@includedir@
- 
+diff -urp telepathy-glib-0.7.15.OLD/telepathy-glib/telepathy-glib.pc.in telepathy-glib-0.7.15/telepathy-glib/telepathy-glib.pc.in
+--- telepathy-glib-0.7.15.OLD/telepathy-glib/telepathy-glib.pc.in	2008-09-04 11:31:57.000000000 -0400
++++ telepathy-glib-0.7.15/telepathy-glib/telepathy-glib.pc.in	2008-09-19 16:25:48.000000000 -0400
+@@ -6,7 +6,6 @@ includedir=@includedir@
  Name: Telepathy-GLib
  Description: GLib utility library for the Telepathy framework
--Version: @VERSION@
+ Version: @VERSION@
 -Requires: pkg-config >= 0.21
--Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.10, gobject-2.0 >= 2.10
-+Version: @VERSION@ 
-+Requires: pkg-config >= 0.21, dbus-glib-1 >= 0.73, glib-2.0 >= 2.10, gobject-2.0 >= 2.10
+-Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16
++Requires: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16
  Libs: -L${libdir} -ltelepathy-glib
  Cflags: -I${includedir}/telepathy-1.0
+diff -urp telepathy-glib-0.7.15.OLD/telepathy-glib/telepathy-glib-uninstalled.pc.in telepathy-glib-0.7.15/telepathy-glib/telepathy-glib-uninstalled.pc.in
+--- telepathy-glib-0.7.15.OLD/telepathy-glib/telepathy-glib-uninstalled.pc.in	2008-09-04 11:31:57.000000000 -0400
++++ telepathy-glib-0.7.15/telepathy-glib/telepathy-glib-uninstalled.pc.in	2008-09-19 16:25:59.000000000 -0400
+@@ -6,7 +6,6 @@ abs_top_builddir=@abs_top_builddir@
+ Name: Telepathy-GLib (uninstalled copy)
+ Description: GLib utility library for the Telepathy framework
+ Version: @VERSION@
+-Requires: pkg-config >= 0.21
+-Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16
++Requires: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16
+ Libs: ${abs_top_builddir}/telepathy-glib/libtelepathy-glib.la
+ Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- telepathy-glib.spec	23 Aug 2008 16:11:23 -0000	1.22
+++ telepathy-glib.spec	19 Sep 2008 20:38:02 -0000	1.23
@@ -1,9 +1,9 @@
 %define	dbus_ver	0.95
 %define	dbus_glib_ver	0.73
-%define	glib_ver	2.10
+%define	glib_ver	2.16
 
 Name:           telepathy-glib
-Version:        0.7.14
+Version:        0.7.15
 Release:        1%{?dist}
 Summary:        GLib bindings for Telepathy
 
@@ -11,6 +11,8 @@
 License:        LGPLv2+
 URL:            http://telepathy.freedesktop.org/wiki/FrontPage
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
+# https://bugzilla.redhat.com/show_bug.cgi?id=436773
+Patch0:		telepathy-glib-broken-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk-doc
@@ -20,9 +22,6 @@
 BuildRequires:	libxslt
 BuildRequires:	python
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=436773
-Patch0:		telepathy-glib-broken-pkgconfig.patch
-
 %description
 Telepathy-glib is the glib bindings for the telepathy unified framework
 for all forms of real time conversations, including instant messaging, IRC, 
@@ -85,11 +84,16 @@
 %defattr(-,root,root,-)
 %doc %{_datadir}/gtk-doc/html/%{name}/
 %{_libdir}/libtelepathy-glib.so
-%{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/pkgconfig/*.pc
 %{_includedir}/telepathy-1.0/%{name}/
 
 
 %changelog
+* Fri Sep 19 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.15-1
+- Update to 0.7.15.
+- Bump min version of glib needed.
+- Update broken-pkgconfig patch.
+
 * Sat Aug 23 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.14-1
 - Update to 0.7.14.
 - Add README & NEWS to docs.



From pkgdb at fedoraproject.org  Fri Sep 19 20:40:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 20:40:15 +0000
Subject: [pkgdb] buildbot had acl change status
Message-ID: <20080919204015.708622082B5@bastion.fedora.phx.redhat.com>

giallu has set the watchcommits acl on buildbot (Fedora 9) to Approved for smilner

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/buildbot



From pkgdb at fedoraproject.org  Fri Sep 19 20:40:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 20:40:15 +0000
Subject: [pkgdb] buildbot had acl change status
Message-ID: <20080919204016.37CA5208DA3@bastion.fedora.phx.redhat.com>

giallu has set the watchbugzilla acl on buildbot (Fedora 9) to Approved for smilner

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/buildbot



From pkgdb at fedoraproject.org  Fri Sep 19 20:40:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 20:40:16 +0000
Subject: [pkgdb] buildbot had acl change status
Message-ID: <20080919204016.DF49B208DA6@bastion.fedora.phx.redhat.com>

giallu has set the commit acl on buildbot (Fedora 9) to Approved for smilner

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/buildbot



From pkgdb at fedoraproject.org  Fri Sep 19 20:40:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 20:40:18 +0000
Subject: [pkgdb] buildbot had acl change status
Message-ID: <20080919204018.505A3208DA9@bastion.fedora.phx.redhat.com>

giallu has set the approveacls acl on buildbot (Fedora 9) to Approved for smilner

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/buildbot



From pkgdb at fedoraproject.org  Fri Sep 19 20:40:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 20:40:48 +0000
Subject: [pkgdb] buildbot had acl change status
Message-ID: <20080919204048.D9DF6208DA0@bastion.fedora.phx.redhat.com>

giallu has set the watchbugzilla acl on buildbot (Fedora devel) to Approved for smilner

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/buildbot



From pkgdb at fedoraproject.org  Fri Sep 19 20:40:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 20:40:51 +0000
Subject: [pkgdb] buildbot had acl change status
Message-ID: <20080919204051.4EDD1208DA7@bastion.fedora.phx.redhat.com>

giallu has set the commit acl on buildbot (Fedora devel) to Approved for smilner

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/buildbot



From pkgdb at fedoraproject.org  Fri Sep 19 20:40:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 20:40:48 +0000
Subject: [pkgdb] buildbot had acl change status
Message-ID: <20080919204049.2E70E208DA4@bastion.fedora.phx.redhat.com>

giallu has set the watchcommits acl on buildbot (Fedora devel) to Approved for smilner

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/buildbot



From pkgdb at fedoraproject.org  Fri Sep 19 20:40:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 19 Sep 2008 20:40:51 +0000
Subject: [pkgdb] buildbot had acl change status
Message-ID: <20080919204051.592A7208DAA@bastion.fedora.phx.redhat.com>

giallu has set the approveacls acl on buildbot (Fedora devel) to Approved for smilner

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/buildbot



From ndim at fedoraproject.org  Fri Sep 19 21:10:37 2008
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri, 19 Sep 2008 21:10:37 +0000 (UTC)
Subject: rpms/nted/devel .cvsignore, 1.3, 1.4 nted.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <20080919211037.CC191700F7@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16076

Modified Files:
	.cvsignore nted.spec sources 
Log Message:
* Fri Sep 19 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.1-1
- Update to upstream's 1.2.1 release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2008 21:53:38 -0000	1.3
+++ .cvsignore	19 Sep 2008 21:10:07 -0000	1.4
@@ -1 +1 @@
-nted-1.0.8.tar.gz
+nted-1.2.1.tar.gz


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/nted.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nted.spec	9 Sep 2008 22:52:36 -0000	1.3
+++ nted.spec	19 Sep 2008 21:10:07 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           nted
-Version:        1.0.8
-Release:        2%{?dist}
+Version:        1.2.1
+Release:        1%{?dist}
 Summary:        Musical score editor
 Summary(de):    Partitureditor
 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Fri Sep 19 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.1-1
+- Update to upstream's 1.2.1 release.
+
 * Wed Sep 10 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.0.8-2
 - Work around upstream shipping an executable dynarray.h file.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2008 21:53:38 -0000	1.3
+++ sources	19 Sep 2008 21:10:07 -0000	1.4
@@ -1 +1 @@
-33e9ba55295f451a16033e0fcd63dfb5  nted-1.0.8.tar.gz
+0b66549a53cc63dccd865021adeb915b  nted-1.2.1.tar.gz



From clumens at fedoraproject.org  Fri Sep 19 21:12:03 2008
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Fri, 19 Sep 2008 21:12:03 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.568, 1.569 anaconda.spec, 1.710, 
	1.711 sources, 1.702, 1.703
Message-ID: <20080919211203.23A60700F7@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16521

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.568
retrieving revision 1.569
diff -u -r1.568 -r1.569
--- .cvsignore	16 Sep 2008 05:07:24 -0000	1.568
+++ .cvsignore	19 Sep 2008 21:11:32 -0000	1.569
@@ -1 +1,2 @@
 anaconda-11.4.1.36.tar.bz2
+anaconda-11.4.1.37.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.710
retrieving revision 1.711
diff -u -r1.710 -r1.711
--- anaconda.spec	16 Sep 2008 05:07:24 -0000	1.710
+++ anaconda.spec	19 Sep 2008 21:11:32 -0000	1.711
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.4.1.36
+Version: 11.4.1.37
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -135,6 +135,7 @@
 Requires: NetworkManager >= %{nmver}
 Requires: dhclient
 Requires: dhcpv6-client
+Requires: anaconda-yum-plugins
 Obsoletes: anaconda-images <= 10
 Obsoletes: anaconda-runtime < %{version}-%{release}
 Provides: anaconda-runtime = %{version}-%{release}
@@ -143,15 +144,6 @@
 The anaconda package contains the program which was used to install your 
 system.  These files are of little use on an already installed system.
 
-%package yum-plugins
-Summary:  Installation-related yum plugins
-Group:    Applications/System
-Requires: python, yum
-
-%description yum-plugins
-The anaconda yum-plugins package contains yum plugins that are useful for
-anaconda and other system installation-related programs.
-
 %prep
 %setup -q
 
@@ -209,15 +201,34 @@
 %{_datadir}/applications/*.desktop
 %endif
 
-%files yum-plugins
-%defattr(-,root,root)
-%{_sysconfdir}/yum/pluginconf.d/*
-%{_prefix}/lib/yum-plugins/*
-
 %triggerun -- anaconda < 8.0-1
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Fri Sep 19 2008 Chris Lumens <clumens at redhat.com> - 11.4.1.37-1
+- Set the filename on the traceback when we upload it (wwoods).
+- Don't worry about errors looking up protected partitions on upgrades.
+  (clumens)
+- Fix test for allowing the installation source to be on the root fs
+  (#462769). (clumens)
+- lang-names should really only depend on lang-table (katzj)
+- Don't make the .desktop file unless we actually need to (katzj)
+- Fix lang-name generation (katzj)
+- Look for xrandr in the search path. (clumens)
+- Make the textw network screen match the iw interface by only prompting for
+  hostname (#462592) (dcantrell)
+- Pick up hostname if we have it, otherwise use localhost.localdomain
+  (#461933) (dcantrell)
+- dhclient-script not needed for NetworkManager (dcantrell)
+- Add getDefaultHostname() to network.py (dcantrel)
+- Write out NETMASK and BROADCAST correctly in loader. (dcantrel)
+- Fix problems with manual network configuration in loader. (dcantrel)
+- anaconda-yum-plugins is now in its own source repo. (clumens)
+- Remove most of the network configuration from text mode as well (#462691).
+  (clumens)
+- Add an extra newline to the empty partition table message. (clumens)
+- Fixup DiskSet._askForLabelPermission() (markmc)
+
 * Mon Sep 15 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.36-1
 - Remove invalid i18n stuff to let anaconda build. (dcantrell)
 - Remove doConfigNetDevice() prototype. (dcantrell)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.702
retrieving revision 1.703
diff -u -r1.702 -r1.703
--- sources	16 Sep 2008 05:07:24 -0000	1.702
+++ sources	19 Sep 2008 21:11:32 -0000	1.703
@@ -1 +1 @@
-ce732d7cf59e09901d3d82a555e9b551  anaconda-11.4.1.36.tar.bz2
+81902bd0da1be03e1f425344908a204a  anaconda-11.4.1.37.tar.bz2



From ndim at fedoraproject.org  Fri Sep 19 21:12:31 2008
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri, 19 Sep 2008 21:12:31 +0000 (UTC)
Subject: rpms/nted/F-9 .cvsignore,1.3,1.4 nted.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20080919211231.124F1700F7@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16618

Modified Files:
	.cvsignore nted.spec sources 
Log Message:
* Fri Sep 19 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.1-1
- Update to upstream's 1.2.1 release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2008 22:53:27 -0000	1.3
+++ .cvsignore	19 Sep 2008 21:12:00 -0000	1.4
@@ -1 +1 @@
-nted-1.0.8.tar.gz
+nted-1.2.1.tar.gz


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-9/nted.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nted.spec	9 Sep 2008 22:53:27 -0000	1.2
+++ nted.spec	19 Sep 2008 21:12:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           nted
-Version:        1.0.8
-Release:        2%{?dist}
+Version:        1.2.1
+Release:        1%{?dist}
 Summary:        Musical score editor
 Summary(de):    Partitureditor
 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Fri Sep 19 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.1-1
+- Update to upstream's 1.2.1 release.
+
 * Wed Sep 10 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.0.8-2
 - Work around upstream shipping an executable dynarray.h file.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2008 22:53:27 -0000	1.3
+++ sources	19 Sep 2008 21:12:00 -0000	1.4
@@ -1 +1 @@
-33e9ba55295f451a16033e0fcd63dfb5  nted-1.0.8.tar.gz
+0b66549a53cc63dccd865021adeb915b  nted-1.2.1.tar.gz



From cebbert at fedoraproject.org  Fri Sep 19 21:58:34 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 19 Sep 2008 21:58:34 +0000 (UTC)
Subject: rpms/kernel/F-8
	linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch,
	NONE, 1.1 kernel.spec, 1.536, 1.537
Message-ID: <20080919215834.E8619700F7@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23209

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch 
Log Message:
libata-sff: kill spurious WARN_ON() in ata_hsm_move()
   Pointed-out-by: Arjan van de Ven (9c2676b61a5a4b6d99e65fb2f438fb3914302eda)

linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch:

--- NEW FILE linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch ---
>From 9c2676b61a5a4b6d99e65fb2f438fb3914302eda Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj at kernel.org>
Date: Fri, 29 Aug 2008 16:27:43 +0200
Subject: [PATCH] libata-sff: kill spurious WARN_ON() in ata_hsm_move()

On HSM_ST_ERR, ata_hsm_move() triggers WARN_ON() if AC_ERR_DEV or
AC_ERR_HSM is not set.  PHY events may trigger HSM_ST_ERR with other
error codes and, with or without it, there just isn't much reason to
do WARN_ON() on it.  Even if error code is not set there, core EH
logic won't have any problem dealing with the error condition.

OSDL bz#11065 reports this problem.

Signed-off-by: Tejun Heo <tj at kernel.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---
 drivers/ata/libata-sff.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 304fdc6..2a4c516 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -1315,11 +1315,6 @@ fsm_start:
 		break;
 
 	case HSM_ST_ERR:
-		/* make sure qc->err_mask is available to
-		 * know what's wrong and recover
-		 */
-		WARN_ON(!(qc->err_mask & (AC_ERR_DEV | AC_ERR_HSM)));
-
 		ap->hsm_task_state = HSM_ST_IDLE;
 
 		/* complete taskfile transaction */
-- 
1.5.5.1



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.536
retrieving revision 1.537
diff -u -r1.536 -r1.537
--- kernel.spec	19 Sep 2008 19:01:58 -0000	1.536
+++ kernel.spec	19 Sep 2008 21:58:04 -0000	1.537
@@ -651,6 +651,7 @@
 Patch675: linux-2.6-libata-pata_marvell-play-nice-with-ahci.patch
 Patch676: linux-2.6-libata-fix-a-large-collection-of-DMA-mode-mismatches.patch
 Patch677: linux-2.6-libata-lba-28-48-off-by-one-in-ata.h.patch
+Patch678: linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch
 
 Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
@@ -1181,6 +1182,8 @@
 ApplyPatch linux-2.6-libata-fix-a-large-collection-of-DMA-mode-mismatches.patch
 # libata breaks lba28 rules
 ApplyPatch linux-2.6-libata-lba-28-48-off-by-one-in-ata.h.patch
+# kill warn_on reported by kerneloops
+ApplyPatch linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch
 
 # wireless
 #
@@ -1861,6 +1864,10 @@
 
 
 %changelog
+* Fri Sep 19 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-27
+- libata-sff: kill spurious WARN_ON() in ata_hsm_move()
+   Pointed-out-by: Arjan van de Ven (9c2676b61a5a4b6d99e65fb2f438fb3914302eda)
+
 * Fri Sep 19 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-26
 - wireless: rt2500pci: restoring missing line (from F9)
 



From dcantrel at fedoraproject.org  Fri Sep 19 22:01:56 2008
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Fri, 19 Sep 2008 22:01:56 +0000 (UTC)
Subject: rpms/anaconda-yum-plugins/devel anaconda-yum-plugins.spec,1.2,1.3
Message-ID: <20080919220156.ED2DD7013E@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda-yum-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23972

Modified Files:
	anaconda-yum-plugins.spec 
Log Message:
* Fri Sep 19 2008 David Cantrell <dcantrell at redhat.com> 1:1.0-3
- Need epoch increased since version is back to 1.0, but it was previously
  the same as the anaconda version number.  jkeating and wwoods said to do
  this too, so blame them.



Index: anaconda-yum-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda-yum-plugins/devel/anaconda-yum-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- anaconda-yum-plugins.spec	18 Sep 2008 18:01:30 -0000	1.2
+++ anaconda-yum-plugins.spec	19 Sep 2008 22:01:26 -0000	1.3
@@ -1,7 +1,8 @@
 Summary: Installation-related yum plugins
 Name:    anaconda-yum-plugins
+Epoch:   1
 Version: 1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -37,8 +38,13 @@
 %{_prefix}/lib/yum-plugins/*
 
 %changelog
-* Thu Sep 18 2008 Chris Lumens <clumens at redhat.com> 1.0-1
+* Fri Sep 19 2008 David Cantrell <dcantrell at redhat.com> 1:1.0-3
+- Need epoch increased since version is back to 1.0, but it was previously
+  the same as the anaconda version number.  jkeating and wwoods said to do
+  this too, so blame them.
+
+* Thu Sep 18 2008 Chris Lumens <clumens at redhat.com> 1.0-2
 - Include the distro tag in the release number.
 
 * Mon Sep 15 2008 Will Woods <wwoods at redhat.com> - 1.0-1
-- Initial packaging (moved out of anaconda package) 
+- Initial packaging (moved out of anaconda package)



From cebbert at fedoraproject.org  Fri Sep 19 22:04:11 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 19 Sep 2008 22:04:11 +0000 (UTC)
Subject: rpms/kernel/F-9 linux-2.6-x86-pci-detect-end_bus_number.patch, NONE,
	1.1 kernel.spec, 1.770, 1.771
Message-ID: <20080919220411.DF851700F7@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24515

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-pci-detect-end_bus_number.patch 
Log Message:
x86: pci: detect end_bus_number according to acpi/e820 reserved, v2 (#462210)

linux-2.6-x86-pci-detect-end_bus_number.patch:

--- NEW FILE linux-2.6-x86-pci-detect-end_bus_number.patch ---
From: Yinghai Lu <yhlu.kernel at gmail.com>
Date: Fri, 18 Jul 2008 20:22:36 +0000 (-0700)
Subject: x86, pci: detect end_bus_number according to acpi/e820 reserved, v2
X-Git-Tag: v2.6.27-rc4~36^2^2^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=a83fe32fa668c0a17b3f99a1480b006f7d649924

x86, pci: detect end_bus_number according to acpi/e820 reserved, v2

Jack Howarth reported that 2.6.26-rc9-git9 doesn't boot on MacBookPro2.

the reason is a faulty BIOS update that reportes faulty resources.

Nevertheless it's possible for Linux to be more resolent about this
situation (and similar situations) and work around this bug, by
cross-checking the mmconf range against the e820 table and ACPI resources.

Change the mconf bus range from [0,0xff] to to [0, 0x3f]
to match range [0xf0000000, 0xf4000000) in e820 tables.

[ v2, yhlu.kernel at gmail.com:
  x86, pci: detect end_bus_number according to acpi/e820 reserved - fix ]

Reported-by: Jack Howarth <howarth at bromo.msbb.uc.edu>
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Cc: jbarnes at virtuousgeek.org
Cc: Jack Howarth <howarth at bromo.msbb.uc.edu>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 23faaa8..429c701 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -293,7 +293,7 @@ static acpi_status __init find_mboard_resource(acpi_handle handle, u32 lvl,
 	return AE_OK;
 }
 
-static int __init is_acpi_reserved(unsigned long start, unsigned long end)
+static int __init is_acpi_reserved(u64 start, u64 end, unsigned not_used)
 {
 	struct resource mcfg_res;
 
@@ -310,6 +310,41 @@ static int __init is_acpi_reserved(unsigned long start, unsigned long end)
 	return mcfg_res.flags;
 }
 
+typedef int (*check_reserved_t)(u64 start, u64 end, unsigned type);
+
+static int __init is_mmconf_reserved(check_reserved_t is_reserved,
+		u64 addr, u64 size, int i,
+		typeof(pci_mmcfg_config[0]) *cfg, int with_e820)
+{
+	u64 old_size = size;
+	int valid = 0;
+
+	while (!is_reserved(addr, addr + size - 1, E820_RESERVED)) {
+		size >>= 1;
+		if (size < (16UL<<20))
+			break;
+	}
+
+	if (size >= (16UL<<20) || size == old_size) {
+		printk(KERN_NOTICE
+		       "PCI: MCFG area at %Lx reserved in %s\n",
+			addr, with_e820?"E820":"ACPI motherboard resources");
+		valid = 1;
+
+		if (old_size != size) {
+			/* update end_bus_number */
+			cfg->end_bus_number = cfg->start_bus_number + ((size>>20) - 1);
+			printk(KERN_NOTICE "PCI: updated MCFG configuration %d: base %lx "
+			       "segment %hu buses %u - %u\n",
+			       i, (unsigned long)cfg->address, cfg->pci_segment,
+			       (unsigned int)cfg->start_bus_number,
+			       (unsigned int)cfg->end_bus_number);
+		}
+	}
+
+	return valid;
+}
+
 static void __init pci_mmcfg_reject_broken(int early)
 {
 	typeof(pci_mmcfg_config[0]) *cfg;
@@ -324,21 +359,22 @@ static void __init pci_mmcfg_reject_broken(int early)
 
 	for (i = 0; i < pci_mmcfg_config_num; i++) {
 		int valid = 0;
-		u32 size = (cfg->end_bus_number + 1) << 20;
+		u64 addr, size;
+
 		cfg = &pci_mmcfg_config[i];
+		addr = cfg->start_bus_number;
+		addr <<= 20;
+		addr += cfg->address;
+		size = cfg->end_bus_number + 1 - cfg->start_bus_number;
+		size <<= 20;
 		printk(KERN_NOTICE "PCI: MCFG configuration %d: base %lx "
 		       "segment %hu buses %u - %u\n",
 		       i, (unsigned long)cfg->address, cfg->pci_segment,
 		       (unsigned int)cfg->start_bus_number,
 		       (unsigned int)cfg->end_bus_number);
 
-		if (!early &&
-		    is_acpi_reserved(cfg->address, cfg->address + size - 1)) {
-			printk(KERN_NOTICE "PCI: MCFG area at %Lx reserved "
-			       "in ACPI motherboard resources\n",
-			       cfg->address);
-			valid = 1;
-		}
+		if (!early)
+			valid = is_mmconf_reserved(is_acpi_reserved, addr, size, i, cfg, 0);
 
 		if (valid)
 			continue;
@@ -347,16 +383,11 @@ static void __init pci_mmcfg_reject_broken(int early)
 			printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %Lx is not"
 			       " reserved in ACPI motherboard resources\n",
 			       cfg->address);
+
 		/* Don't try to do this check unless configuration
 		   type 1 is available. how about type 2 ?*/
-		if (raw_pci_ops && e820_all_mapped(cfg->address,
-						  cfg->address + size - 1,
-						  E820_RESERVED)) {
-			printk(KERN_NOTICE
-			       "PCI: MCFG area at %Lx reserved in E820\n",
-			       cfg->address);
-			valid = 1;
-		}
+		if (raw_pci_ops)
+			valid = is_mmconf_reserved(e820_all_mapped, addr, size, i, cfg, 1);
 
 		if (!valid)
 			goto reject;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.770
retrieving revision 1.771
diff -u -r1.770 -r1.771
--- kernel.spec	19 Sep 2008 16:49:03 -0000	1.770
+++ kernel.spec	19 Sep 2008 22:03:41 -0000	1.771
@@ -593,6 +593,7 @@
 Patch96: linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch
 Patch97: linux-2.6-x86-hpet-04-workaround-sb700-bios.patch
 Patch98: linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch
+Patch100: linux-2.6-x86-pci-detect-end_bus_number.patch
 
 # ppc
 Patch140: linux-2.6-ps3-ehci-iso.patch
@@ -1068,6 +1069,8 @@
 ApplyPatch linux-2.6-x86-hpet-04-workaround-sb700-bios.patch
 # fix memmap=exactmap, so kdump kernels work
 ApplyPatch linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch
+# fix e820 reservation checking
+ApplyPatch linux-2.6-x86-pci-detect-end_bus_number.patch
 
 #
 # PowerPC
@@ -1870,6 +1873,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Fri Sep 19 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-44
+- x86: pci: detect end_bus_number according to acpi/e820 reserved, v2 (#462210)
+
 * Fri Sep 19 2008 Kyle McMartin <kyle at redhat.com> - 2.6.26.5-43
 - libata-sff: kill spurious WARN_ON() in ata_hsm_move()
    Pointed-out-by: Arjan van de Ven (9c2676b61a5a4b6d99e65fb2f438fb3914302eda)



From snirkel at fedoraproject.org  Fri Sep 19 22:17:28 2008
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Fri, 19 Sep 2008 22:17:28 +0000 (UTC)
Subject: rpms/libmtp/devel .cvsignore, 1.17, 1.18 libmtp.spec, 1.23,
	1.24 sources, 1.17, 1.18
Message-ID: <20080919221728.6CFD4700F7@cvs1.fedora.phx.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libmtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26333

Modified Files:
	.cvsignore libmtp.spec sources 
Log Message:
New upstream version with bugfixes, API and ABI compatible.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	26 Aug 2008 16:05:13 -0000	1.17
+++ .cvsignore	19 Sep 2008 22:16:58 -0000	1.18
@@ -1 +1 @@
-libmtp-0.3.1.tar.gz
+libmtp-0.3.2.tar.gz


Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/libmtp.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libmtp.spec	26 Aug 2008 16:05:13 -0000	1.23
+++ libmtp.spec	19 Sep 2008 22:16:58 -0000	1.24
@@ -2,7 +2,7 @@
 # RPM repository.
 
 Name:           libmtp
-Version:        0.3.1
+Version:        0.3.2
 Release:        1%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
@@ -99,6 +99,10 @@
 
 
 %changelog
+* Sat Sep 20 2008 Linus Walleij <triad at df.lth.se> 0.3.2-1
+- New upstream version. (API and ABI compatible.) Fixes
+  bugs on Creative devices.
+
 * Tue Aug 26 2008 Linus Walleij <triad at df.lth.se> 0.3.1-1
 - New upstream version. (API and ABI compatible.)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	26 Aug 2008 16:05:13 -0000	1.17
+++ sources	19 Sep 2008 22:16:58 -0000	1.18
@@ -1 +1 @@
-26456419db20eea44471d3687a8611a2  libmtp-0.3.1.tar.gz
+2cb1007a384fdc3dd7e29c2d5c2ba729  libmtp-0.3.2.tar.gz



From bpepple at fedoraproject.org  Sat Sep 20 00:03:12 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 20 Sep 2008 00:03:12 +0000 (UTC)
Subject: rpms/gstreamer-plugins-farsight/devel
	gstreamer-plugins-farsight.spec, 1.17, 1.18
Message-ID: <20080920000312.6E9E2700F8@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/gstreamer-plugins-farsight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11201

Modified Files:
	gstreamer-plugins-farsight.spec 
Log Message:
* Fri Sep 19 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.12.9-3
- rebuilt for new libjingle.



Index: gstreamer-plugins-farsight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-farsight/devel/gstreamer-plugins-farsight.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gstreamer-plugins-farsight.spec	12 Sep 2008 13:38:41 -0000	1.17
+++ gstreamer-plugins-farsight.spec	20 Sep 2008 00:02:42 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name:           gstreamer-plugins-farsight
 Version:        0.12.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GStreamer plug-ins for farsight protocol
 
 Group:          Applications/Multimedia
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Fri Sep 19 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.12.9-3
+- rebuilt for new libjingle.
+
 * Fri Sep 12 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.12.9-2
 - Rebuild for new gst.
 



From bpepple at fedoraproject.org  Fri Sep 19 23:57:44 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Fri, 19 Sep 2008 23:57:44 +0000 (UTC)
Subject: rpms/farsight/devel farsight.spec,1.25,1.26
Message-ID: <20080919235744.D090C7002D@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/farsight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10208

Modified Files:
	farsight.spec 
Log Message:
* Fri Sep 19 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.1.28-2
- rebuilt for new libjingle.



Index: farsight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/farsight/devel/farsight.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- farsight.spec	9 May 2008 20:58:17 -0000	1.25
+++ farsight.spec	19 Sep 2008 23:57:14 -0000	1.26
@@ -3,7 +3,7 @@
 
 Name:		farsight
 Version:	0.1.28
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A audio/video conferencing framework
 
 Group:		System Environment/Libraries
@@ -63,7 +63,6 @@
 	   --enable-jingle-p2p		\
 	   --enable-rtp			\
 	   --enable-gtk-doc
-
 make %{?_smp_mflags}
 
 
@@ -103,6 +102,9 @@
 
 
 %changelog
+* Fri Sep 19 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.1.28-2
+- rebuilt for new libjingle.
+
 * Fri May  9 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.1.28-1
 - Update to 0.1.28.
 - Drop darth vader patch.  Fixed upstream.



From mclasen at fedoraproject.org  Fri Sep 19 23:12:05 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 19 Sep 2008 23:12:05 +0000 (UTC)
Subject: rpms/metacity/devel metacity.spec,1.163,1.164
Message-ID: <20080919231205.59DB3700F7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2197

Modified Files:
	metacity.spec 
Log Message:
fix spec



Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- metacity.spec	19 Sep 2008 23:06:30 -0000	1.163
+++ metacity.spec	19 Sep 2008 23:11:34 -0000	1.164
@@ -161,7 +161,7 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
-* FRi Sep 19 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.610-2
+* Fri Sep 19 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.610-2
 - Fix some memory leaks
 
 * Tue Sep  9 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.610-1



From mschwendt at fedoraproject.org  Fri Sep 19 23:25:55 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri, 19 Sep 2008 23:25:55 +0000 (UTC)
Subject: extras-buildsys ChangeLog,1.126.2.44.2.1.2.27,1.126.2.44.2.1.2.28
Message-ID: <20080919232555.58298700F7@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4555

Modified Files:
      Tag: Plague-0_4_5
	ChangeLog 
Log Message:
fix for sqlite's limited ALTER TABLE


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.44.2.1.2.27
retrieving revision 1.126.2.44.2.1.2.28
diff -u -r1.126.2.44.2.1.2.27 -r1.126.2.44.2.1.2.28
--- ChangeLog	8 Sep 2008 15:56:38 -0000	1.126.2.44.2.1.2.27
+++ ChangeLog	19 Sep 2008 23:25:24 -0000	1.126.2.44.2.1.2.28
@@ -1,3 +1,9 @@
+2008-09-20  Michael Schwendt <mschwendt at fedoraproject.org>
+
+	* server/DBManager.py
+	  - SQLite doesn't support column rename, so reconstruct
+	    a new table from the old one (only if engine==sqlite).
+
 2008-09-08  Michael Schwendt <mschwendt at fedoraproject.org>
 
 	* Release of 0.4.5.5



From mclasen at fedoraproject.org  Fri Sep 19 23:18:24 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 19 Sep 2008 23:18:24 +0000 (UTC)
Subject: rpms/PolicyKit/devel entry-leak.patch, NONE, 1.1 PolicyKit.spec,
	1.21, 1.22
Message-ID: <20080919231824.3B6CE700F7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/PolicyKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3228

Modified Files:
	PolicyKit.spec 
Added Files:
	entry-leak.patch 
Log Message:
plug a memory leak


entry-leak.patch:

--- NEW FILE entry-leak.patch ---
diff -up PolicyKit-0.9/src/polkit/polkit-policy-file-entry.c.entry-leak PolicyKit-0.9/src/polkit/polkit-policy-file-entry.c
--- PolicyKit-0.9/src/polkit/polkit-policy-file-entry.c.entry-leak	2008-08-29 21:47:22.000000000 -0400
+++ PolicyKit-0.9/src/polkit/polkit-policy-file-entry.c	2008-08-29 21:50:13.000000000 -0400
@@ -95,9 +95,11 @@ _polkit_policy_file_entry_new   (const c
         char *contents;
         size_t contents_size;
         PolKitPolicyFileEntry *pfe;
+        char **tokens;
 
         path = NULL;
         contents = NULL;
+        tokens = NULL;
 
         kit_return_val_if_fail (action_id != NULL && polkit_action_validate_id (action_id), NULL);
 
@@ -153,7 +155,6 @@ _polkit_policy_file_entry_new   (const c
         }
 
         if (contents != NULL) {
-                char **tokens;
                 size_t num_tokens;
                 PolKitResult any;
                 PolKitResult inactive;
@@ -183,11 +184,13 @@ _polkit_policy_file_entry_new   (const c
 
         kit_free (path);
         kit_free (contents);
+        kit_strfreev (tokens);
 
         return pfe;
 error:
         kit_free (path);
         kit_free (contents);
+        kit_strfreev (tokens);
         if (pfe != NULL)
                 polkit_policy_file_entry_unref (pfe);
         return NULL;


Index: PolicyKit.spec
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit/devel/PolicyKit.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- PolicyKit.spec	22 Jul 2008 23:10:14 -0000	1.21
+++ PolicyKit.spec	19 Sep 2008 23:17:53 -0000	1.22
@@ -14,12 +14,13 @@
 Summary: Authorization Toolkit
 Name: PolicyKit
 Version: 0.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=PolicyKit.git;a=summary
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Patch1: pk-ck-api-change.patch
+Patch2: entry-leak.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -75,6 +76,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .api-change
+%patch2 -p1 -b .entry-leak
 
 %build
 %configure
@@ -168,6 +170,9 @@
 %{_datadir}/gtk-doc/html/polkit/*
 
 %changelog
+* Fri Sep 19 2008 Matthias Clasen <mclasen at redhat.com> - 0.9-3
+- Plug a memory leak
+
 * Tue Jul 22 2008 Jon McCann  <jmccann at redhat.com> - 0.9-2%{?dist}
 - Fix for CK API change
 



From mclasen at fedoraproject.org  Fri Sep 19 23:07:01 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 19 Sep 2008 23:07:01 +0000 (UTC)
Subject: rpms/metacity/devel leaks.patch, NONE, 1.1 string-leak.patch, NONE, 
	1.1 metacity.spec, 1.162, 1.163
Message-ID: <20080919230701.A141B700F7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1048

Modified Files:
	metacity.spec 
Added Files:
	leaks.patch string-leak.patch 
Log Message:
fix memory leaks


leaks.patch:

--- NEW FILE leaks.patch ---
diff -up metacity-2.23.610/src/core/edge-resistance.c.leaks metacity-2.23.610/src/core/edge-resistance.c
--- metacity-2.23.610/src/core/edge-resistance.c.leaks	2008-09-14 22:39:38.000000000 -0400
+++ metacity-2.23.610/src/core/edge-resistance.c	2008-09-14 22:43:28.000000000 -0400
@@ -985,8 +985,8 @@ meta_display_compute_resistance_and_snap
       cur_window_iter = cur_window_iter->next;
     }
   /* Put 'em in bottom to top order */
-  rem_windows       = g_slist_reverse (obscuring_windows);
-  rem_win_stacking  = g_slist_reverse (window_stacking);
+  rem_windows = obscuring_windows = g_slist_reverse (obscuring_windows);
+  rem_win_stacking = window_stacking = g_slist_reverse (window_stacking);
 
   /*
    * 3rd: loop over the windows again, this time getting the edges from

string-leak.patch:

--- NEW FILE string-leak.patch ---
diff -up metacity-2.23.610/src/ui/ui.c.string-leak metacity-2.23.610/src/ui/ui.c
--- metacity-2.23.610/src/ui/ui.c.string-leak	2008-08-18 08:29:07.000000000 -0400
+++ metacity-2.23.610/src/ui/ui.c	2008-09-15 18:05:20.000000000 -0400
@@ -657,10 +657,12 @@ meta_text_property_to_utf8 (Display     
                                           &list);
 
   if (count == 0)
-    return NULL;
-
-  retval = list[0];
-  list[0] = g_strdup (""); /* something to free */
+    retval = NULL;
+  else
+    {
+      retval = list[0];
+      list[0] = g_strdup (""); /* something to free */
+    }
   
   g_strfreev (list);
 


Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- metacity.spec	10 Sep 2008 01:20:55 -0000	1.162
+++ metacity.spec	19 Sep 2008 23:06:30 -0000	1.163
@@ -1,12 +1,16 @@
 Summary: Metacity window manager
 Name: metacity
 Version: 2.23.610
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.23/metacity-%{version}.tar.bz2
 Patch0: default-theme.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=482354
 Patch1: metacity-2.21.13-dont-move-windows.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=552303
+Patch2: leaks.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=552307
+Patch3: string-leak.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -63,6 +67,8 @@
 %setup -q 
 %patch0 -p1 -b .default-theme
 %patch1 -p0 -b .dont-move-windows
+%patch2 -p1 -b .leaks
+%patch3 -p1 -b .string-leak
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -155,6 +161,9 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* FRi Sep 19 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.610-2
+- Fix some memory leaks
+
 * Tue Sep  9 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.610-1
 - Update to 2.23.610
 



From mschwendt at fedoraproject.org  Fri Sep 19 23:25:25 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri, 19 Sep 2008 23:25:25 +0000 (UTC)
Subject: extras-buildsys/server DBManager.py,1.1.2.2.4.4,1.1.2.2.4.5
Message-ID: <20080919232525.8B2A6700F7@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/server
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4555/server

Modified Files:
      Tag: Plague-0_4_5
	DBManager.py 
Log Message:
fix for sqlite's limited ALTER TABLE


Index: DBManager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/DBManager.py,v
retrieving revision 1.1.2.2.4.4
retrieving revision 1.1.2.2.4.5
diff -u -r1.1.2.2.4.4 -r1.1.2.2.4.5
--- DBManager.py	8 Sep 2008 15:56:38 -0000	1.1.2.2.4.4
+++ DBManager.py	19 Sep 2008 23:25:25 -0000	1.1.2.2.4.5
@@ -312,6 +312,7 @@
         if not dbcx:
             os._exit(1)
         self._ensure_tables(dbcx)
+        self._fix_tables(dbcx)
         del dbcx
 
     def dbcx(self):
@@ -358,22 +359,6 @@
                 print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
                 os._exit(1)
 
-        # Rename columns in jobs table, because `RELEASE` is a new
-        # reserved keyword in MySQL 5, and the quote character is
-        # different for Postgresql.
-        for i in range(len(curs.description or [])):
-            if curs.description[i][0].upper() == 'RELEASE':
-                if self.engine == 'mysql':
-                    curs.execute('ALTER TABLE jobs CHANGE `release` rpm_release VARCHAR(25);')
-                    curs.execute('ALTER TABLE jobs CHANGE `version` rpm_version VARCHAR(25);')
-                    curs.execute('ALTER TABLE jobs CHANGE `epoch` rpm_epoch VARCHAR(4);')
-                else:
-                    curs.execute('ALTER TABLE jobs CHANGE release rpm_release VARCHAR(25);')
-                    curs.execute('ALTER TABLE jobs CHANGE version rpm_version VARCHAR(25);')
-                    curs.execute('ALTER TABLE jobs CHANGE epoch rpm_epoch VARCHAR(4);')
-                dbcx.commit()
-                break
-
         # Create the archjobs table
         try:
             curs.execute('SELECT * FROM archjobs LIMIT 4')
@@ -396,3 +381,32 @@
                 print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
                 os._exit(1)
 
+    def _fix_tables(self, dbcx):
+        """ Fix database tables for compatibility with e.g. MySQL 5 """
+
+        # Rename columns in jobs table, because `RELEASE` is a new
+        # reserved keyword in MySQL 5, and the quote character is
+        # different for Postgresql.
+        curs = dbcx.cursor()
+        curs.execute('SELECT * FROM jobs LIMIT 1')
+        for i in range(len(curs.description or [])):
+            if curs.description[i][0].upper() == 'RELEASE':
+                if self.engine == 'mysql':
+                    curs.execute('ALTER TABLE jobs CHANGE `release` rpm_release VARCHAR(25);')
+                    curs.execute('ALTER TABLE jobs CHANGE `version` rpm_version VARCHAR(25);')
+                    curs.execute('ALTER TABLE jobs CHANGE `epoch` rpm_epoch VARCHAR(4);')
+                    dbcx.commit()
+                elif self.engine == 'sqlite':
+                    # No column rename available, so reconstruct a new table.
+                    curs.execute('ALTER TABLE jobs RENAME TO oldjobs;')
+                    self._ensure_tables(dbcx)
+                    curs.execute('INSERT INTO jobs SELECT * FROM oldjobs;')
+                    curs.execute('DROP TABLE oldjobs;')
+                    dbcx.commit()
+                else:
+                    curs.execute('ALTER TABLE jobs CHANGE release rpm_release VARCHAR(25);')
+                    curs.execute('ALTER TABLE jobs CHANGE version rpm_version VARCHAR(25);')
+                    curs.execute('ALTER TABLE jobs CHANGE epoch rpm_epoch VARCHAR(4);')
+                    dbcx.commit()
+                break
+



From mtruch at fedoraproject.org  Fri Sep 19 23:14:33 2008
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Fri, 19 Sep 2008 23:14:33 +0000 (UTC)
Subject: rpms/cfitsio/devel .cvsignore, 1.8, 1.9 cfitsio.patch, 1.3,
	1.4 cfitsio.spec, 1.26, 1.27 sources, 1.8, 1.9
Message-ID: <20080919231433.24BC8700F7@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/cfitsio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2652

Modified Files:
	.cvsignore cfitsio.patch cfitsio.spec sources 
Log Message:
Update to upstream 3.100.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	9 Nov 2007 20:23:46 -0000	1.8
+++ .cvsignore	19 Sep 2008 23:14:02 -0000	1.9
@@ -1 +1 @@
-cfitsio3060.tar.gz
+cfitsio3100.tar.gz

cfitsio.patch:

Index: cfitsio.patch
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cfitsio.patch	7 Dec 2006 20:11:26 -0000	1.3
+++ cfitsio.patch	19 Sep 2008 23:14:02 -0000	1.4
@@ -1,7 +1,7 @@
-diff -u cfitsio/configure cfitsio-new/configure
---- cfitsio/configure	2005-07-28 17:26:13.000000000 -0400
-+++ cfitsio-new/configure	2005-11-13 14:36:39.000000000 -0500
-@@ -1251,7 +1251,8 @@
+diff -u cfitsio/configure cfitsio-fixed/configure
+--- cfitsio/configure	2007-11-05 15:52:57.000000000 -0500
++++ cfitsio-fixed/configure	2008-09-19 18:50:51.000000000 -0400
+@@ -3397,7 +3397,8 @@
      SHLIB_SUFFIX=".sl"
      ;;
    lnx)
@@ -11,7 +11,7 @@
      ;;
    osf)
      SHLIB_LD="ld -shared -expect_unresolved '*'"
-@@ -1271,7 +1272,7 @@
+@@ -3418,7 +3419,7 @@
  # Darwin uses gcc (=cc), but needs different flags (see above)
  # if test "x$GCC" = xyes; then
  if test "x$GCC" = xyes && test "x$EXT" != xdarwin && test "x$EXT" != xcygwin; then
@@ -20,17 +20,17 @@
    lhea_shlib_cflags='-fPIC'
  fi
  if test "x$lhea_shlib_cflags" != x; then
-diff -u old/Makefile.in new/Makefile.in
---- old/Makefile.in	2006-10-12 17:14:41.000000000 -0400
-+++ new/Makefile.in	2006-12-05 16:36:24.000000000 -0500
-@@ -21,8 +21,8 @@
- prefix		= @prefix@
+diff -u cfitsio/Makefile.in cfitsio-fixed/Makefile.in
+--- cfitsio/Makefile.in	2008-01-14 13:30:51.000000000 -0500
++++ cfitsio-fixed/Makefile.in	2008-09-19 18:51:41.000000000 -0400
+@@ -22,8 +22,8 @@
  exec_prefix	= @exec_prefix@
+ DESTDIR		= 
  CFITSIO_PREFIX	= $(prefix)
--CFITSIO_LIB	= $(exec_prefix)/lib
--CFITSIO_INCLUDE	= $(prefix)/include
-+CFITSIO_LIB    = $(exec_prefix)/$(LIBDIR)
-+CFITSIO_INCLUDE        = $(prefix)/$(INCLUDEDIR)
- INSTALL_DIRS	= @INSTALL_ROOT@ ${CFITSIO_LIB} ${CFITSIO_LIB}/pkgconfig ${CFITSIO_INCLUDE}
+-CFITSIO_LIB	= $(DESTDIR)$(exec_prefix)/lib
+-CFITSIO_INCLUDE	= $(DESTDIR)$(prefix)/include
++CFITSIO_LIB	= $(DESTDIR)$(exec_prefix)/$(LIBDIR)
++CFITSIO_INCLUDE	= $(DESTDIR)$(prefix)/$(INCLUDEDIR)
+ INSTALL_DIRS	= $(DESTDIR)@INSTALL_ROOT@ ${CFITSIO_LIB} ${CFITSIO_LIB}/pkgconfig ${CFITSIO_INCLUDE}
  
  


Index: cfitsio.spec
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cfitsio.spec	7 Mar 2008 21:19:12 -0000	1.26
+++ cfitsio.spec	19 Sep 2008 23:14:02 -0000	1.27
@@ -1,12 +1,12 @@
 Name:           cfitsio
-Version:        3.060
-Release:        3%{?dist}
+Version:        3.100
+Release:        1%{?dist}
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
-Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3060.tar.gz
+Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3100.tar.gz
 Patch:          cfitsio.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -89,6 +89,10 @@
 %{_libdir}/libcfitsio.a
 
 %changelog
+* Fri Sep 19 2008 Matthew Truch <matt at truch.net> - 3.100-1
+- Update to 3.100 upstream.
+  Includes bugfixes and new compression scheme.
+
 * Fri Mar 7 2008 Matthew Truch <matt at truch.net> - 3.060-3
 - Properly indicated include and lib directories in .pc file
   (BZ 436539)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	9 Nov 2007 20:23:46 -0000	1.8
+++ sources	19 Sep 2008 23:14:02 -0000	1.9
@@ -1 +1 @@
-b7ab291d227c60b17a19a1c028dc649c  cfitsio3060.tar.gz
+3a4893c92f485d2d1c6cda10e49d2dcf  cfitsio3100.tar.gz



From mschwendt at fedoraproject.org  Fri Sep 19 23:29:53 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri, 19 Sep 2008 23:29:53 +0000 (UTC)
Subject: rpms/plague/devel plague-0.4.5.5-sqlite-alter.patch, NONE,
	1.1 plague.spec, 1.40, 1.41
Message-ID: <20080919232953.A54A0700F7@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5309

Modified Files:
	plague.spec 
Added Files:
	plague-0.4.5.5-sqlite-alter.patch 
Log Message:
* Sat Sep 20 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.5-2
- add fix for sqlite's limited ALTER TABLE


plague-0.4.5.5-sqlite-alter.patch:

--- NEW FILE plague-0.4.5.5-sqlite-alter.patch ---
diff -Nur plague-0.4.5.5-orig/server/DBManager.py plague-0.4.5.5/server/DBManager.py
--- plague-0.4.5.5-orig/server/DBManager.py	2008-09-08 17:56:46.000000000 +0200
+++ plague-0.4.5.5/server/DBManager.py	2008-09-20 01:26:20.000000000 +0200
@@ -312,6 +312,7 @@
         if not dbcx:
             os._exit(1)
         self._ensure_tables(dbcx)
+        self._fix_tables(dbcx)
         del dbcx
 
     def dbcx(self):
@@ -358,22 +359,6 @@
                 print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
                 os._exit(1)
 
-        # Rename columns in jobs table, because `RELEASE` is a new
-        # reserved keyword in MySQL 5, and the quote character is
-        # different for Postgresql.
-        for i in range(len(curs.description or [])):
-            if curs.description[i][0].upper() == 'RELEASE':
-                if self.engine == 'mysql':
-                    curs.execute('ALTER TABLE jobs CHANGE `release` rpm_release VARCHAR(25);')
-                    curs.execute('ALTER TABLE jobs CHANGE `version` rpm_version VARCHAR(25);')
-                    curs.execute('ALTER TABLE jobs CHANGE `epoch` rpm_epoch VARCHAR(4);')
-                else:
-                    curs.execute('ALTER TABLE jobs CHANGE release rpm_release VARCHAR(25);')
-                    curs.execute('ALTER TABLE jobs CHANGE version rpm_version VARCHAR(25);')
-                    curs.execute('ALTER TABLE jobs CHANGE epoch rpm_epoch VARCHAR(4);')
-                dbcx.commit()
-                break
-
         # Create the archjobs table
         try:
             curs.execute('SELECT * FROM archjobs LIMIT 4')
@@ -396,3 +381,32 @@
                 print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
                 os._exit(1)
 
+    def _fix_tables(self, dbcx):
+        """ Fix database tables for compatibility with e.g. MySQL 5 """
+
+        # Rename columns in jobs table, because `RELEASE` is a new
+        # reserved keyword in MySQL 5, and the quote character is
+        # different for Postgresql.
+        curs = dbcx.cursor()
+        curs.execute('SELECT * FROM jobs LIMIT 1')
+        for i in range(len(curs.description or [])):
+            if curs.description[i][0].upper() == 'RELEASE':
+                if self.engine == 'mysql':
+                    curs.execute('ALTER TABLE jobs CHANGE `release` rpm_release VARCHAR(25);')
+                    curs.execute('ALTER TABLE jobs CHANGE `version` rpm_version VARCHAR(25);')
+                    curs.execute('ALTER TABLE jobs CHANGE `epoch` rpm_epoch VARCHAR(4);')
+                    dbcx.commit()
+                elif self.engine == 'sqlite':
+                    # No column rename available, so reconstruct a new table.
+                    curs.execute('ALTER TABLE jobs RENAME TO oldjobs;')
+                    self._ensure_tables(dbcx)
+                    curs.execute('INSERT INTO jobs SELECT * FROM oldjobs;')
+                    curs.execute('DROP TABLE oldjobs;')
+                    dbcx.commit()
+                else:
+                    curs.execute('ALTER TABLE jobs CHANGE release rpm_release VARCHAR(25);')
+                    curs.execute('ALTER TABLE jobs CHANGE version rpm_version VARCHAR(25);')
+                    curs.execute('ALTER TABLE jobs CHANGE epoch rpm_epoch VARCHAR(4);')
+                    dbcx.commit()
+                break
+


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/plague.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- plague.spec	8 Sep 2008 16:00:43 -0000	1.40
+++ plague.spec	19 Sep 2008 23:29:23 -0000	1.41
@@ -3,11 +3,12 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.5.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 #Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
 Source: %{name}-%{version}.tar.bz2
+Patch1: plague-0.4.5.5-sqlite-alter.patch
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
@@ -79,6 +80,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .sqlite-alter
 
 
 %build
@@ -165,6 +167,9 @@
 
 
 %changelog
+* Sat Sep 20 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.5-2
+- add fix for sqlite's limited ALTER TABLE
+
 * Mon Sep  8 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.5-1
 - update to 0.4.5.5
 



From ausil at fedoraproject.org  Fri Sep 19 23:53:27 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 19 Sep 2008 23:53:27 +0000 (UTC)
Subject: rpms/pyOpenSSL/devel pyOpenSSL-threadsafe.patch,1.4,1.5
Message-ID: <20080919235327.6266E7002D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/pyOpenSSL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9357

Modified Files:
	pyOpenSSL-threadsafe.patch 
Log Message:
 fix whitespace


pyOpenSSL-threadsafe.patch:

Index: pyOpenSSL-threadsafe.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pyOpenSSL/devel/pyOpenSSL-threadsafe.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pyOpenSSL-threadsafe.patch	19 Sep 2008 23:48:25 -0000	1.4
+++ pyOpenSSL-threadsafe.patch	19 Sep 2008 23:52:57 -0000	1.5
@@ -1,157 +1,157 @@
 diff -Nur pyOpenSSL-0.7-bad/src/crypto/crypto.c pyOpenSSL-0.7/src/crypto/crypto.c
---- pyOpenSSL-0.7-bad/src/crypto/crypto.c       2008-03-21 17:34:42.000000000 -0500
-+++ pyOpenSSL-0.7/src/crypto/crypto.c   2008-09-19 17:22:12.000000000 -0500        
- -694,6 +694,74 @@                                                               
-     { NULL, NULL }                                                                
- };                                                                                
-                                                                                   
-+                                                                                  
-+#ifdef WITH_THREAD                                                                
-+                                                                                  
-+#include <pthread.h>                                                              
-+                                                                                  
-+#define MUTEX_TYPE pthread_mutex_t                                                
-+#define MUTEX_SETUP(x) pthread_mutex_init(&(x), NULL)                             
-+#define MUTEX_CLEANUP(x) pthread_mutex_destroy(&(x))                              
-+#define MUTEX_LOCK(x) pthread_mutex_lock(&(x))                                    
-+#define MUTEX_UNLOCK(x) pthread_mutex_unlock(&(x))                                
-+#define THREAD_ID pthread_self()                                                  
-+                                                                                  
-+void handle_error(const char *file, int lineno, const char *msg)                  
-+{                                                                                 
-+     fprintf(stderr, "** %s:%i %s\n", file, lineno, msg);                         
-+     ERR_print_errors_fp(stderr);                                                 
-+}                                                                                 
-+                                                                                  
-+                                                                                  
-+/* This array will store all of the mutexes available to OpenSSL. */              
-+static MUTEX_TYPE *mutex_buf = NULL;                                              
-+                                                                                  
-+                                                                                  
-+static void locking_function(int mode, int n, const char * file, int line)        
-+{                                                                                 
-+    if (mode & CRYPTO_LOCK)                                                       
-+        MUTEX_LOCK(mutex_buf[n]);                                                 
-+    else                                                                          
-+        MUTEX_UNLOCK(mutex_buf[n]);                                               
-+}                                                                                 
-+                                                                                  
-+static unsigned long id_function(void)                                            
-+{                                                                                 
-+    return ((unsigned long)THREAD_ID);                                            
-+}                                                                                 
-+                                                                                  
-+int init_openssl_threads(void)                                                    
-+{                                                                                 
-+    int i;                                                                        
-+                                                                                  
-+    mutex_buf = (MUTEX_TYPE *)malloc(CRYPTO_num_locks() * sizeof(MUTEX_TYPE));    
-+    if (!mutex_buf)                                                               
-+        return 0;                                                                 
-+    for (i = 0; i < CRYPTO_num_locks(); i++)                                      
-+        MUTEX_SETUP(mutex_buf[i]);                                                
-+    CRYPTO_set_id_callback(id_function);                                          
-+    CRYPTO_set_locking_callback(locking_function);                                
-+    return 1;                                                                     
-+}                                                                                 
-+                                                                                  
-+int deinit_openssl_threads(void)                                                  
-+{                                                                                 
-+    int i;                                                                        
-+                                                                                  
-+    if (!mutex_buf)                                                               
-+        return 0;                                                                 
-+    CRYPTO_set_id_callback(NULL);                                                 
-+    CRYPTO_set_locking_callback(NULL);                                            
-+    for (i = 0; i < CRYPTO_num_locks(); i++)                                      
-+        MUTEX_CLEANUP(mutex_buf[i]);                                              
-+    free(mutex_buf);                                                              
-+    mutex_buf = NULL;                                                             
-+    return 1;                                                                     
-+}                                                                                 
-+                                                                                  
-+#endif                                                                            
-+                                                                                  
-+                                                                                  
- /*                                                                                
-  * Initialize crypto sub module                                                   
-  *                                                                                
- -739,6 +807,10 @@                                                               
-     PyModule_AddIntConstant(module, "TYPE_DSA", crypto_TYPE_DSA);                 
-                                                                                   
-     dict = PyModule_GetDict(module);                                              
-+#ifdef WITH_THREAD                                                                
-+    if (!init_openssl_threads())                                                  
-+        goto error;                                                               
-+#endif                                                                            
-     if (!init_crypto_x509(dict))                                                  
-         goto error;                                                               
-     if (!init_crypto_x509name(dict))                                              
-diff -Nur pyOpenSSL-0.7-bad/src/ssl/context.c pyOpenSSL-0.7/src/ssl/context.c      
---- pyOpenSSL-0.7-bad/src/ssl/context.c 2008-03-21 17:34:42.000000000 -0500        
-+++ pyOpenSSL-0.7/src/ssl/context.c     2008-09-19 17:22:12.000000000 -0500        
- -64,39 +64,33 @@                                                                
- static int                                                                        
- global_passphrase_callback(char *buf, int maxlen, int verify, void *arg)          
- {                                                                                 
--    int len;                                                                      
-+    int len = 0;                                                                  
-     char *str;                                                                    
-     PyObject *argv, *ret = NULL;                                                  
-     ssl_ContextObj *ctx = (ssl_ContextObj *)arg;                                  
-                                                                                   
-+    if (!ctx->tstate)                                                             
-+        fprintf (stderr, "ERROR: ctx->tstate == NULL!\n");                        
-+    MY_END_ALLOW_THREADS(ctx->tstate);                                            
-+                                                                                  
-     /* The Python callback is called with a (maxlen,verify,userdata) tuple */     
-     argv = Py_BuildValue("(iiO)", maxlen, verify, ctx->passphrase_userdata);      
--    if (ctx->tstate != NULL)                                                      
--    {                                                                             
--        /* We need to get back our thread state before calling the callback */    
--        MY_END_ALLOW_THREADS(ctx->tstate);                                        
--        ret = PyEval_CallObject(ctx->passphrase_callback, argv);                  
--        MY_BEGIN_ALLOW_THREADS(ctx->tstate);                                      
--    }                                                                             
--    else                                                                          
--    {                                                                             
--        ret = PyEval_CallObject(ctx->passphrase_callback, argv);                  
--    }                                                                             
-+    ret = PyEval_CallObject(ctx->passphrase_callback, argv);                      
-     Py_DECREF(argv);                                                              
-                                                                                   
-     if (ret == NULL)                                                              
--        return 0;                                                                 
-+        goto out;                                                                 
-                                                                                   
-     if (!PyObject_IsTrue(ret))                                                    
-     {                                                                             
-         Py_DECREF(ret);                                                           
--       return 0;                                                                  
-+        goto out;                                                                 
-     }                                                                             
-                                                                                   
-     if (!PyString_Check(ret))                                                     
-     {                                                                             
-         Py_DECREF(ret);                                                           
--        return 0;                                                                 
-+        goto out;                                                                 
-     }                                                                             
-                                                                                   
-     len = PyString_Size(ret);                                                     
- -107,6 +101,8 @@                                                                
-     strncpy(buf, str, len);                                                       
-     Py_XDECREF(ret);                                                              
-                                                                                   
-+out:                                                                              
-+    MY_BEGIN_ALLOW_THREADS(ctx->tstate);                                          
-     return len;                                                                   
- }                                                                                 
-                                                                                   
- -173,28 +169,19 @@                                                              
-     ssl_ConnectionObj *conn = (ssl_ConnectionObj *)SSL_get_app_data(ssl);         
-     PyObject *argv, *ret;                                                         
-
+--- pyOpenSSL-0.7-bad/src/crypto/crypto.c	2008-03-21 17:34:42.000000000 -0500
++++ pyOpenSSL-0.7/src/crypto/crypto.c	2008-09-19 18:06:08.000000000 -0500
+@@ -694,6 +694,74 @@
+     { NULL, NULL }
+ };
+ 
++
++#ifdef WITH_THREAD
++
++#include <pthread.h>
++
++#define MUTEX_TYPE pthread_mutex_t
++#define MUTEX_SETUP(x) pthread_mutex_init(&(x), NULL)
++#define MUTEX_CLEANUP(x) pthread_mutex_destroy(&(x))
++#define MUTEX_LOCK(x) pthread_mutex_lock(&(x))
++#define MUTEX_UNLOCK(x) pthread_mutex_unlock(&(x))
++#define THREAD_ID pthread_self()
++ 
++void handle_error(const char *file, int lineno, const char *msg)
++{
++     fprintf(stderr, "** %s:%i %s\n", file, lineno, msg);
++     ERR_print_errors_fp(stderr);
++}
++ 
++ 
++/* This array will store all of the mutexes available to OpenSSL. */
++static MUTEX_TYPE *mutex_buf = NULL;
++
++
++static void locking_function(int mode, int n, const char * file, int line)
++{
++    if (mode & CRYPTO_LOCK)
++        MUTEX_LOCK(mutex_buf[n]);
++    else
++        MUTEX_UNLOCK(mutex_buf[n]);
++}
++  
++static unsigned long id_function(void)
++{
++    return ((unsigned long)THREAD_ID);
++}
++
++int init_openssl_threads(void)
++{
++    int i;
++  
++    mutex_buf = (MUTEX_TYPE *)malloc(CRYPTO_num_locks() * sizeof(MUTEX_TYPE));
++    if (!mutex_buf)
++        return 0;
++    for (i = 0; i < CRYPTO_num_locks(); i++)
++        MUTEX_SETUP(mutex_buf[i]);
++    CRYPTO_set_id_callback(id_function);
++    CRYPTO_set_locking_callback(locking_function);
++    return 1;
++}
++  
++int deinit_openssl_threads(void)
++{
++    int i;
++  
++    if (!mutex_buf)
++        return 0;
++    CRYPTO_set_id_callback(NULL);
++    CRYPTO_set_locking_callback(NULL);
++    for (i = 0; i < CRYPTO_num_locks(); i++)
++        MUTEX_CLEANUP(mutex_buf[i]);
++    free(mutex_buf);
++    mutex_buf = NULL;
++    return 1;
++} 
++
++#endif
++
++
+ /*
+  * Initialize crypto sub module
+  *
+@@ -739,6 +807,10 @@
+     PyModule_AddIntConstant(module, "TYPE_DSA", crypto_TYPE_DSA);
+ 
+     dict = PyModule_GetDict(module);
++#ifdef WITH_THREAD
++    if (!init_openssl_threads())
++        goto error;
++#endif
+     if (!init_crypto_x509(dict))
+         goto error;
+     if (!init_crypto_x509name(dict))
+diff -Nur pyOpenSSL-0.7-bad/src/ssl/context.c pyOpenSSL-0.7/src/ssl/context.c
+--- pyOpenSSL-0.7-bad/src/ssl/context.c	2008-03-21 17:34:42.000000000 -0500
++++ pyOpenSSL-0.7/src/ssl/context.c	2008-09-19 18:27:00.000000000 -0500
+@@ -64,39 +64,33 @@
+ static int
+ global_passphrase_callback(char *buf, int maxlen, int verify, void *arg)
+ {
+-    int len;
++    int len = 0;
+     char *str;
+     PyObject *argv, *ret = NULL;
+     ssl_ContextObj *ctx = (ssl_ContextObj *)arg;
+ 
++    if (!ctx->tstate)
++        fprintf (stderr, "ERROR: ctx->tstate == NULL!\n");
++    MY_END_ALLOW_THREADS(ctx->tstate);
++
+     /* The Python callback is called with a (maxlen,verify,userdata) tuple */
+     argv = Py_BuildValue("(iiO)", maxlen, verify, ctx->passphrase_userdata);
+-    if (ctx->tstate != NULL)
+-    {
+-        /* We need to get back our thread state before calling the callback */
+-        MY_END_ALLOW_THREADS(ctx->tstate);
+-        ret = PyEval_CallObject(ctx->passphrase_callback, argv);
+-        MY_BEGIN_ALLOW_THREADS(ctx->tstate);
+-    }
+-    else
+-    {
+-        ret = PyEval_CallObject(ctx->passphrase_callback, argv);
+-    }
++    ret = PyEval_CallObject(ctx->passphrase_callback, argv);
+     Py_DECREF(argv);
+ 
+     if (ret == NULL)
+-        return 0;
++        goto out;
+ 
+     if (!PyObject_IsTrue(ret))
+     {
+         Py_DECREF(ret);
+-	return 0;
++        goto out;
+     }
+ 
+     if (!PyString_Check(ret))
+     {
+         Py_DECREF(ret);
+-        return 0;
++        goto out;
+     }
+ 
+     len = PyString_Size(ret);
+@@ -107,6 +101,8 @@
+     strncpy(buf, str, len);
+     Py_XDECREF(ret);
+ 
++out:
++    MY_BEGIN_ALLOW_THREADS(ctx->tstate);
+     return len;
+ }
+ 
+@@ -173,28 +169,19 @@
+     ssl_ConnectionObj *conn = (ssl_ConnectionObj *)SSL_get_app_data(ssl);
+     PyObject *argv, *ret;
+ 
 +    if (!conn->tstate)
 +        fprintf (stderr, "ERROR: ctx->tstate == NULL!\n");
 +    MY_END_ALLOW_THREADS(conn->tstate);
@@ -181,15 +181,15 @@
 -    }
 +        Py_DECREF(ret);
      Py_DECREF(argv);
-
+ 
 +    MY_BEGIN_ALLOW_THREADS(conn->tstate);
      return;
  }
-
- -447,6 +434,8 @@
+ 
+@@ -447,6 +434,8 @@
      if (!PyArg_ParseTuple(args, "s|i:use_privatekey_file", &keyfile, &filetype))
          return NULL;
-
+ 
 +    if (self->tstate)
 +        fprintf (stderr, "ERROR: ctx->tstate != NULL!\n");
      MY_BEGIN_ALLOW_THREADS(self->tstate);



From ausil at fedoraproject.org  Fri Sep 19 23:48:25 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 19 Sep 2008 23:48:25 +0000 (UTC)
Subject: rpms/pyOpenSSL/devel pyOpenSSL-threadsafe.patch, 1.3,
	1.4 pyOpenSSL.spec, 1.28, 1.29 pyOpenSSL-0.7-threadsafe.patch,
	1.1, NONE
Message-ID: <20080919234825.93E58700F7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/pyOpenSSL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8411

Modified Files:
	pyOpenSSL-threadsafe.patch pyOpenSSL.spec 
Removed Files:
	pyOpenSSL-0.7-threadsafe.patch 
Log Message:
update threadsafe patch 


pyOpenSSL-threadsafe.patch:

Index: pyOpenSSL-threadsafe.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pyOpenSSL/devel/pyOpenSSL-threadsafe.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pyOpenSSL-threadsafe.patch	17 Sep 2008 21:05:44 -0000	1.3
+++ pyOpenSSL-threadsafe.patch	19 Sep 2008 23:48:25 -0000	1.4
@@ -1,88 +1,197 @@
---- pyOpenSSL-0.6/src/crypto/crypto.c.threadsafe	2004-08-09 10:56:05.000000000 -0400
-+++ pyOpenSSL-0.6/src/crypto/crypto.c	2005-07-12 22:29:32.000000000 -0400
-@@ -668,6 +668,74 @@
-     { NULL, NULL }
- };
- 
-+
-+#ifdef WITH_THREAD
-+
-+#include <pthread.h>
-+
-+#define MUTEX_TYPE pthread_mutex_t
-+#define MUTEX_SETUP(x) pthread_mutex_init(&(x), NULL)
-+#define MUTEX_CLEANUP(x) pthread_mutex_destroy(&(x))
-+#define MUTEX_LOCK(x) pthread_mutex_lock(&(x))
-+#define MUTEX_UNLOCK(x) pthread_mutex_unlock(&(x))
-+#define THREAD_ID pthread_self()
-+ 
-+void handle_error(const char *file, int lineno, const char *msg)
-+{
-+     fprintf(stderr, "** %s:%i %s\n", file, lineno, msg);
-+     ERR_print_errors_fp(stderr);
-+}
-+ 
-+ 
-+/* This array will store all of the mutexes available to OpenSSL. */
-+static MUTEX_TYPE *mutex_buf = NULL;
-+
-+
-+static void locking_function(int mode, int n, const char * file, int line)
-+{
-+    if (mode & CRYPTO_LOCK)
-+        MUTEX_LOCK(mutex_buf[n]);
-+    else
-+        MUTEX_UNLOCK(mutex_buf[n]);
-+}
-+  
-+static unsigned long id_function(void)
-+{
-+    return ((unsigned long)THREAD_ID);
-+}
-+
-+int init_openssl_threads(void)
-+{
-+    int i;
-+  
-+    mutex_buf = (MUTEX_TYPE *)malloc(CRYPTO_num_locks() * sizeof(MUTEX_TYPE));
-+    if (!mutex_buf)
-+        return 0;
-+    for (i = 0; i < CRYPTO_num_locks(); i++)
-+        MUTEX_SETUP(mutex_buf[i]);
-+    CRYPTO_set_id_callback(id_function);
-+    CRYPTO_set_locking_callback(locking_function);
-+    return 1;
-+}
-+  
-+int deinit_openssl_threads(void)
-+{
-+    int i;
-+  
-+    if (!mutex_buf)
-+        return 0;
-+    CRYPTO_set_id_callback(NULL);
-+    CRYPTO_set_locking_callback(NULL);
-+    for (i = 0; i < CRYPTO_num_locks(); i++)
-+        MUTEX_CLEANUP(mutex_buf[i]);
-+    free(mutex_buf);
-+    mutex_buf = NULL;
-+    return 1;
-+} 
-+
-+#endif
-+
-+
- /*
-  * Initialize crypto sub module
-  *
-@@ -713,6 +779,10 @@
-     PyModule_AddIntConstant(module, "TYPE_DSA", crypto_TYPE_DSA);
- 
-     dict = PyModule_GetDict(module);
-+#ifdef WITH_THREAD
-+    if (!init_openssl_threads())
-+        goto error;
-+#endif
-     if (!init_crypto_x509(dict))
-         goto error;
-     if (!init_crypto_x509name(dict))
+diff -Nur pyOpenSSL-0.7-bad/src/crypto/crypto.c pyOpenSSL-0.7/src/crypto/crypto.c
+--- pyOpenSSL-0.7-bad/src/crypto/crypto.c       2008-03-21 17:34:42.000000000 -0500
++++ pyOpenSSL-0.7/src/crypto/crypto.c   2008-09-19 17:22:12.000000000 -0500        
+ -694,6 +694,74 @@                                                               
+     { NULL, NULL }                                                                
+ };                                                                                
+                                                                                   
++                                                                                  
++#ifdef WITH_THREAD                                                                
++                                                                                  
++#include <pthread.h>                                                              
++                                                                                  
++#define MUTEX_TYPE pthread_mutex_t                                                
++#define MUTEX_SETUP(x) pthread_mutex_init(&(x), NULL)                             
++#define MUTEX_CLEANUP(x) pthread_mutex_destroy(&(x))                              
++#define MUTEX_LOCK(x) pthread_mutex_lock(&(x))                                    
++#define MUTEX_UNLOCK(x) pthread_mutex_unlock(&(x))                                
++#define THREAD_ID pthread_self()                                                  
++                                                                                  
++void handle_error(const char *file, int lineno, const char *msg)                  
++{                                                                                 
++     fprintf(stderr, "** %s:%i %s\n", file, lineno, msg);                         
++     ERR_print_errors_fp(stderr);                                                 
++}                                                                                 
++                                                                                  
++                                                                                  
++/* This array will store all of the mutexes available to OpenSSL. */              
++static MUTEX_TYPE *mutex_buf = NULL;                                              
++                                                                                  
++                                                                                  
++static void locking_function(int mode, int n, const char * file, int line)        
++{                                                                                 
++    if (mode & CRYPTO_LOCK)                                                       
++        MUTEX_LOCK(mutex_buf[n]);                                                 
++    else                                                                          
++        MUTEX_UNLOCK(mutex_buf[n]);                                               
++}                                                                                 
++                                                                                  
++static unsigned long id_function(void)                                            
++{                                                                                 
++    return ((unsigned long)THREAD_ID);                                            
++}                                                                                 
++                                                                                  
++int init_openssl_threads(void)                                                    
++{                                                                                 
++    int i;                                                                        
++                                                                                  
++    mutex_buf = (MUTEX_TYPE *)malloc(CRYPTO_num_locks() * sizeof(MUTEX_TYPE));    
++    if (!mutex_buf)                                                               
++        return 0;                                                                 
++    for (i = 0; i < CRYPTO_num_locks(); i++)                                      
++        MUTEX_SETUP(mutex_buf[i]);                                                
++    CRYPTO_set_id_callback(id_function);                                          
++    CRYPTO_set_locking_callback(locking_function);                                
++    return 1;                                                                     
++}                                                                                 
++                                                                                  
++int deinit_openssl_threads(void)                                                  
++{                                                                                 
++    int i;                                                                        
++                                                                                  
++    if (!mutex_buf)                                                               
++        return 0;                                                                 
++    CRYPTO_set_id_callback(NULL);                                                 
++    CRYPTO_set_locking_callback(NULL);                                            
++    for (i = 0; i < CRYPTO_num_locks(); i++)                                      
++        MUTEX_CLEANUP(mutex_buf[i]);                                              
++    free(mutex_buf);                                                              
++    mutex_buf = NULL;                                                             
++    return 1;                                                                     
++}                                                                                 
++                                                                                  
++#endif                                                                            
++                                                                                  
++                                                                                  
+ /*                                                                                
+  * Initialize crypto sub module                                                   
+  *                                                                                
+ -739,6 +807,10 @@                                                               
+     PyModule_AddIntConstant(module, "TYPE_DSA", crypto_TYPE_DSA);                 
+                                                                                   
+     dict = PyModule_GetDict(module);                                              
++#ifdef WITH_THREAD                                                                
++    if (!init_openssl_threads())                                                  
++        goto error;                                                               
++#endif                                                                            
+     if (!init_crypto_x509(dict))                                                  
+         goto error;                                                               
+     if (!init_crypto_x509name(dict))                                              
+diff -Nur pyOpenSSL-0.7-bad/src/ssl/context.c pyOpenSSL-0.7/src/ssl/context.c      
+--- pyOpenSSL-0.7-bad/src/ssl/context.c 2008-03-21 17:34:42.000000000 -0500        
++++ pyOpenSSL-0.7/src/ssl/context.c     2008-09-19 17:22:12.000000000 -0500        
+ -64,39 +64,33 @@                                                                
+ static int                                                                        
+ global_passphrase_callback(char *buf, int maxlen, int verify, void *arg)          
+ {                                                                                 
+-    int len;                                                                      
++    int len = 0;                                                                  
+     char *str;                                                                    
+     PyObject *argv, *ret = NULL;                                                  
+     ssl_ContextObj *ctx = (ssl_ContextObj *)arg;                                  
+                                                                                   
++    if (!ctx->tstate)                                                             
++        fprintf (stderr, "ERROR: ctx->tstate == NULL!\n");                        
++    MY_END_ALLOW_THREADS(ctx->tstate);                                            
++                                                                                  
+     /* The Python callback is called with a (maxlen,verify,userdata) tuple */     
+     argv = Py_BuildValue("(iiO)", maxlen, verify, ctx->passphrase_userdata);      
+-    if (ctx->tstate != NULL)                                                      
+-    {                                                                             
+-        /* We need to get back our thread state before calling the callback */    
+-        MY_END_ALLOW_THREADS(ctx->tstate);                                        
+-        ret = PyEval_CallObject(ctx->passphrase_callback, argv);                  
+-        MY_BEGIN_ALLOW_THREADS(ctx->tstate);                                      
+-    }                                                                             
+-    else                                                                          
+-    {                                                                             
+-        ret = PyEval_CallObject(ctx->passphrase_callback, argv);                  
+-    }                                                                             
++    ret = PyEval_CallObject(ctx->passphrase_callback, argv);                      
+     Py_DECREF(argv);                                                              
+                                                                                   
+     if (ret == NULL)                                                              
+-        return 0;                                                                 
++        goto out;                                                                 
+                                                                                   
+     if (!PyObject_IsTrue(ret))                                                    
+     {                                                                             
+         Py_DECREF(ret);                                                           
+-       return 0;                                                                  
++        goto out;                                                                 
+     }                                                                             
+                                                                                   
+     if (!PyString_Check(ret))                                                     
+     {                                                                             
+         Py_DECREF(ret);                                                           
+-        return 0;                                                                 
++        goto out;                                                                 
+     }                                                                             
+                                                                                   
+     len = PyString_Size(ret);                                                     
+ -107,6 +101,8 @@                                                                
+     strncpy(buf, str, len);                                                       
+     Py_XDECREF(ret);                                                              
+                                                                                   
++out:                                                                              
++    MY_BEGIN_ALLOW_THREADS(ctx->tstate);                                          
+     return len;                                                                   
+ }                                                                                 
+                                                                                   
+ -173,28 +169,19 @@                                                              
+     ssl_ConnectionObj *conn = (ssl_ConnectionObj *)SSL_get_app_data(ssl);         
+     PyObject *argv, *ret;                                                         
+
++    if (!conn->tstate)
++        fprintf (stderr, "ERROR: ctx->tstate == NULL!\n");
++    MY_END_ALLOW_THREADS(conn->tstate);
++
+     argv = Py_BuildValue("(Oii)", (PyObject *)conn, where, _ret);
+-    if (conn->tstate != NULL)
+-    {
+-        /* We need to get back our thread state before calling the callback */
+-        MY_END_ALLOW_THREADS(conn->tstate);
+-        ret = PyEval_CallObject(conn->context->info_callback, argv);
+-        if (ret == NULL)
+-            PyErr_Clear();
+-        else
+-            Py_DECREF(ret);
+-        MY_BEGIN_ALLOW_THREADS(conn->tstate);
+-    }
++    ret = PyEval_CallObject(conn->context->info_callback, argv);
++    if (ret == NULL)
++        PyErr_Clear();
+     else
+-    {
+-        ret = PyEval_CallObject(conn->context->info_callback, argv);
+-        if (ret == NULL)
+-            PyErr_Clear();
+-        else
+-            Py_DECREF(ret);
+-    }
++        Py_DECREF(ret);
+     Py_DECREF(argv);
+
++    MY_BEGIN_ALLOW_THREADS(conn->tstate);
+     return;
+ }
+
+ -447,6 +434,8 @@
+     if (!PyArg_ParseTuple(args, "s|i:use_privatekey_file", &keyfile, &filetype))
+         return NULL;
+
++    if (self->tstate)
++        fprintf (stderr, "ERROR: ctx->tstate != NULL!\n");
+     MY_BEGIN_ALLOW_THREADS(self->tstate);
+     ret = SSL_CTX_use_PrivateKey_file(self->ctx, keyfile, filetype);
+     MY_END_ALLOW_THREADS(self->tstate);


Index: pyOpenSSL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyOpenSSL/devel/pyOpenSSL.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- pyOpenSSL.spec	17 Sep 2008 21:05:44 -0000	1.28
+++ pyOpenSSL.spec	19 Sep 2008 23:48:25 -0000	1.29
@@ -3,13 +3,12 @@
 Summary: Python wrapper module around the OpenSSL library
 Name: pyOpenSSL
 Version: 0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: http://pyopenssl.sf.net/%{name}-%{version}.tar.gz
 Patch0: pyOpenSSL-0.7-openssl.patch
 Patch2: pyOpenSSL-elinks.patch
 Patch3: pyOpenSSL-nopdfout.patch
 Patch4: pyOpenSSL-threadsafe.patch
-Patch5: pyOpenSSL-0.7-threadsafe.patch
 License: LGPLv2+
 Group: Development/Libraries
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -31,7 +30,6 @@
 %patch2 -p1 -b .elinks
 %patch3 -p1 -b .nopdfout
 %patch4 -p1 -b .threadsafe
-%patch5 -p1 -b .threadsafe
 # Fix permissions for debuginfo package
 %{__chmod} -x src/ssl/connection.c
 
@@ -55,6 +53,10 @@
 %{python_sitearch}/%{name}*.egg-info
 
 %changelog
+* Fri Sep 19 2008 Dennis Gilmore <dennis at ausil.us> - 0.7-2
+- update threadsafe  patch 
+- bug#462807
+
 * Mon Sep 15 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.7-1
 - bump to new release
 - the inevitable patch fixes


--- pyOpenSSL-0.7-threadsafe.patch DELETED ---



From mtruch at fedoraproject.org  Sat Sep 20 00:51:51 2008
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Sat, 20 Sep 2008 00:51:51 +0000 (UTC)
Subject: rpms/kst/devel kst.spec,1.29,1.30
Message-ID: <20080920005151.D9DCB700F8@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/kst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18404

Modified Files:
	kst.spec 
Log Message:
Changes for netcdf version 4.



Index: kst.spec
===================================================================
RCS file: /cvs/extras/rpms/kst/devel/kst.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kst.spec	20 Sep 2008 00:31:54 -0000	1.29
+++ kst.spec	20 Sep 2008 00:51:21 -0000	1.30
@@ -1,6 +1,6 @@
 Name:       kst
 Version:    1.7.0
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    A data viewing program for KDE
 
 Group:      Applications/Engineering
@@ -86,8 +86,8 @@
   --disable-rpath \
   --with-qt-libraries=$QTDIR/lib \
   --with-qt-includes=$QTDIR/include \
-  --with-extra-includes=%{_includedir}/cfitsio:%{_includedir}/netcdf-3 \
-  --with-extra-libs=%{_libdir}:%{_libdir}/netcdf-3 --disable-debug
+  --with-extra-includes=%{_includedir}/cfitsio:%{_includedir}/netcdf \
+  --with-extra-libs=%{_libdir}:%{_libdir}/netcdf --disable-debug
 make %{?_smp_mflags}
 
 %install
@@ -235,6 +235,9 @@
 %{_datadir}/services/kst/kstdata_netcdf.desktop
 
 %changelog
+* Fri Sep 19 2008 Matthew Truch <matt at truch.net> - 1.7.0-2
+- Allow build from netcdf version 4.  
+
 * Fri Sep 19 2008 Matthew Truch <matt at truch.net> - 1.7.0-1
 - Update to upstream 1.7.0.  
 - Re-enable ppc64 build of netcdf subpackage.



From davej at fedoraproject.org  Sat Sep 20 01:01:27 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Sat, 20 Sep 2008 01:01:27 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc6-git6.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.926, 1.927 kernel.spec, 1.960, 1.961 sources, 1.888,
	1.889 upstream, 1.800, 1.801 patch-2.6.27-rc6-git5.bz2.sign, 1.1, NONE
Message-ID: <20080920010127.67120700F8@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19711

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.27-rc6-git6.bz2.sign 
Removed Files:
	patch-2.6.27-rc6-git5.bz2.sign 
Log Message:
2.6.27-rc6-git6


--- NEW FILE patch-2.6.27-rc6-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBI1D24yGugalF9Dw4RAqBvAJ9RYGTjuOrhHho60LjZUJUCPx5Q8gCdEctP
ivX69YiTyNo2586C3vNGAp4=
=fMwX
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.926
retrieving revision 1.927
diff -u -r1.926 -r1.927
--- .cvsignore	17 Sep 2008 18:45:22 -0000	1.926
+++ .cvsignore	20 Sep 2008 01:00:56 -0000	1.927
@@ -5,4 +5,4 @@
 kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc6.bz2
-patch-2.6.27-rc6-git5.bz2
+patch-2.6.27-rc6-git6.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.960
retrieving revision 1.961
diff -u -r1.960 -r1.961
--- kernel.spec	19 Sep 2008 17:12:29 -0000	1.960
+++ kernel.spec	20 Sep 2008 01:00:56 -0000	1.961
@@ -45,7 +45,7 @@
 # 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
@@ -1758,6 +1758,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Sep 19 2008 Dave Jones <davej at redhat.com>
+- 2.6.27-rc6-git6
+
 * Fri Sep 19 2008 Dave Airlie <airlied at redhat.com>
 - more fixes from AMD upstream for LVDS
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.888
retrieving revision 1.889
diff -u -r1.888 -r1.889
--- sources	17 Sep 2008 18:45:22 -0000	1.888
+++ sources	20 Sep 2008 01:00:56 -0000	1.889
@@ -1,3 +1,3 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 d3a173a00e15a6bf3c76068537a5c069  patch-2.6.27-rc6.bz2
-5ffbee4c67a8d343e910230342de89dc  patch-2.6.27-rc6-git5.bz2
+f07e706ce2c2507ef146de4130e919b5  patch-2.6.27-rc6-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.800
retrieving revision 1.801
diff -u -r1.800 -r1.801
--- upstream	17 Sep 2008 18:45:22 -0000	1.800
+++ upstream	20 Sep 2008 01:00:57 -0000	1.801
@@ -1,3 +1,3 @@
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc6.bz2
-patch-2.6.27-rc6-git5.bz2
+patch-2.6.27-rc6-git6.bz2


--- patch-2.6.27-rc6-git5.bz2.sign DELETED ---



From mtruch at fedoraproject.org  Sat Sep 20 00:32:26 2008
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Sat, 20 Sep 2008 00:32:26 +0000 (UTC)
Subject: rpms/kst/devel .cvsignore, 1.8, 1.9 kst.spec, 1.28, 1.29 sources,
	1.8, 1.9 kst-fix-F-command-line.diff, 1.1, NONE
Message-ID: <20080920003226.1C8D1700F8@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/kst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15553

Modified Files:
	.cvsignore kst.spec sources 
Removed Files:
	kst-fix-F-command-line.diff 
Log Message:
Update to upstream 1.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kst/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Apr 2008 21:10:26 -0000	1.8
+++ .cvsignore	20 Sep 2008 00:31:54 -0000	1.9
@@ -1 +1 @@
-kst-1.6.0.tar.gz
+kst-1.7.0.tar.gz


Index: kst.spec
===================================================================
RCS file: /cvs/extras/rpms/kst/devel/kst.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- kst.spec	10 May 2008 21:21:04 -0000	1.28
+++ kst.spec	20 Sep 2008 00:31:54 -0000	1.29
@@ -1,6 +1,6 @@
 Name:       kst
-Version:    1.6.0
-Release:    4%{?dist}
+Version:    1.7.0
+Release:    1%{?dist}
 Summary:    A data viewing program for KDE
 
 Group:      Applications/Engineering
@@ -9,9 +9,6 @@
 Source0:    ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/scientific/kst-%{version}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#From KDE svn revision 805176
-Patch0:     kst-fix-F-command-line.diff
-
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -62,8 +59,6 @@
 Summary:    netcdf datasource plugin for kst
 Group:      Applications/Engineering
 Requires:   %{name} = %{version}-%{release}
-#Temporary as netcdf is excluded from ppc64 at this time.  
-ExcludeArch: ppc64
 
 %description netcdf
 A plugin allowing kst to open and read data in netcdf format.
@@ -83,7 +78,6 @@
 
 %prep
 %setup -q
-%patch0 -p4
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -241,6 +235,10 @@
 %{_datadir}/services/kst/kstdata_netcdf.desktop
 
 %changelog
+* Fri Sep 19 2008 Matthew Truch <matt at truch.net> - 1.7.0-1
+- Update to upstream 1.7.0.  
+- Re-enable ppc64 build of netcdf subpackage.
+
 * Sat May 10 2008 Matthew Truch <matt at truch.net> - 1.6.0-4
 - ExcludeArch ppc64 for netcdf subpackage as netcdf is disabled on ppc64.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kst/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Apr 2008 21:10:26 -0000	1.8
+++ sources	20 Sep 2008 00:31:54 -0000	1.9
@@ -1 +1 @@
-450824ca26e19e5b71358c6740152015  kst-1.6.0.tar.gz
+69db059134c9f9df0875ce89f5b178f7  kst-1.7.0.tar.gz


--- kst-fix-F-command-line.diff DELETED ---



From bpepple at fedoraproject.org  Sat Sep 20 03:28:16 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 20 Sep 2008 03:28:16 +0000 (UTC)
Subject: rpms/telepathy-stream-engine/devel telepathy-stream-engine.spec,
	1.11, 1.12
Message-ID: <20080920032816.5C409700F8@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-serv6240

Modified Files:
	telepathy-stream-engine.spec 
Log Message:
* Fri Sep 19 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.5.3-2
- rebuilt for new libjingle.



Index: telepathy-stream-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-stream-engine/devel/telepathy-stream-engine.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- telepathy-stream-engine.spec	22 May 2008 23:21:36 -0000	1.11
+++ telepathy-stream-engine.spec	20 Sep 2008 03:27:45 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           telepathy-stream-engine
 Version:        0.5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Telepathy client to handle media streaming
 
 Group:          Applications/Communications
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Fri Sep 19 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.5.3-2
+- rebuilt for new libjingle.
+
 * Thu May 22 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.5.3-1
 - Update to 0.5.3.
 



From cebbert at fedoraproject.org  Sat Sep 20 03:36:46 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 20 Sep 2008 03:36:46 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc6-git2.bz2.sign,1.1,NONE
Message-ID: <20080920033646.28C7A700F8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7404

Removed Files:
	patch-2.6.27-rc6-git2.bz2.sign 
Log Message:
remove dead file



--- patch-2.6.27-rc6-git2.bz2.sign DELETED ---



From awjb at fedoraproject.org  Sat Sep 20 06:57:33 2008
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sat, 20 Sep 2008 06:57:33 +0000 (UTC)
Subject: rpms/wine/F-8 .cvsignore, 1.63, 1.64 sources, 1.64, 1.65 wine.spec, 
	1.87, 1.88
Message-ID: <20080920065733.0B1D9700F8@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29364/F-8

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-8/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	5 Sep 2008 22:24:26 -0000	1.63
+++ .cvsignore	20 Sep 2008 06:57:02 -0000	1.64
@@ -1 +1 @@
-wine-1.1.4-fe.tar.bz2
+wine-1.1.5-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-8/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	5 Sep 2008 22:24:26 -0000	1.64
+++ sources	20 Sep 2008 06:57:02 -0000	1.65
@@ -1 +1 @@
-9d1a87a5de2f9e10cb2b7c14ebe25f7f  wine-1.1.4-fe.tar.bz2
+659169626a027d2f1920fcb23beefe64  wine-1.1.5-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-8/wine.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- wine.spec	5 Sep 2008 22:24:26 -0000	1.87
+++ wine.spec	20 Sep 2008 06:57:02 -0000	1.88
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	1.1.4
+Version:	1.1.5
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -134,7 +134,7 @@
 
 %package desktop
 Summary:        Desktop integration features for wine
-Group:          Application/Emulators
+Group:          Applications/Emulators
 Requires(post): /sbin/chkconfig, /sbin/service,
 Requires(post): desktop-file-utils >= 0.8
 Requires(preun): /sbin/chkconfig, /sbin/service
@@ -836,6 +836,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Sep 20 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.5-1
+- version upgrade
+
 * Fri Sep 05 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.4-1
 - version upgrade



From awjb at fedoraproject.org  Sat Sep 20 06:57:33 2008
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sat, 20 Sep 2008 06:57:33 +0000 (UTC)
Subject: rpms/wine/F-9 .cvsignore, 1.63, 1.64 sources, 1.64, 1.65 wine.spec, 
	1.89, 1.90
Message-ID: <20080920065733.7B119700F8@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29364/F-9

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-9/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	5 Sep 2008 22:24:26 -0000	1.63
+++ .cvsignore	20 Sep 2008 06:57:02 -0000	1.64
@@ -1 +1 @@
-wine-1.1.4-fe.tar.bz2
+wine-1.1.5-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-9/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	5 Sep 2008 22:24:26 -0000	1.64
+++ sources	20 Sep 2008 06:57:03 -0000	1.65
@@ -1 +1 @@
-9d1a87a5de2f9e10cb2b7c14ebe25f7f  wine-1.1.4-fe.tar.bz2
+659169626a027d2f1920fcb23beefe64  wine-1.1.5-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-9/wine.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- wine.spec	5 Sep 2008 22:24:26 -0000	1.89
+++ wine.spec	20 Sep 2008 06:57:03 -0000	1.90
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	1.1.4
+Version:	1.1.5
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -134,7 +134,7 @@
 
 %package desktop
 Summary:        Desktop integration features for wine
-Group:          Application/Emulators
+Group:          Applications/Emulators
 Requires(post): /sbin/chkconfig, /sbin/service,
 Requires(post): desktop-file-utils >= 0.8
 Requires(preun): /sbin/chkconfig, /sbin/service
@@ -836,6 +836,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Sep 20 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.5-1
+- version upgrade
+
 * Fri Sep 05 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.4-1
 - version upgrade



From awjb at fedoraproject.org  Sat Sep 20 06:57:34 2008
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sat, 20 Sep 2008 06:57:34 +0000 (UTC)
Subject: rpms/wine/devel .cvsignore, 1.63, 1.64 sources, 1.64, 1.65 wine.spec,
	1.89, 1.90
Message-ID: <20080920065734.0BD77700F8@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29364/devel

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	5 Sep 2008 22:24:26 -0000	1.63
+++ .cvsignore	20 Sep 2008 06:57:03 -0000	1.64
@@ -1 +1 @@
-wine-1.1.4-fe.tar.bz2
+wine-1.1.5-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	5 Sep 2008 22:24:26 -0000	1.64
+++ sources	20 Sep 2008 06:57:03 -0000	1.65
@@ -1 +1 @@
-9d1a87a5de2f9e10cb2b7c14ebe25f7f  wine-1.1.4-fe.tar.bz2
+659169626a027d2f1920fcb23beefe64  wine-1.1.5-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- wine.spec	5 Sep 2008 22:24:26 -0000	1.89
+++ wine.spec	20 Sep 2008 06:57:03 -0000	1.90
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	1.1.4
+Version:	1.1.5
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -134,7 +134,7 @@
 
 %package desktop
 Summary:        Desktop integration features for wine
-Group:          Application/Emulators
+Group:          Applications/Emulators
 Requires(post): /sbin/chkconfig, /sbin/service,
 Requires(post): desktop-file-utils >= 0.8
 Requires(preun): /sbin/chkconfig, /sbin/service
@@ -836,6 +836,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Sep 20 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.5-1
+- version upgrade
+
 * Fri Sep 05 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.4-1
 - version upgrade



From cebbert at fedoraproject.org  Sat Sep 20 07:05:14 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 20 Sep 2008 07:05:14 +0000 (UTC)
Subject: rpms/kernel/F-9
	linux-2.6-pci-add-an-option-to-allow-aspm-enabled-forcibly.patch,
	NONE, 1.1 linux-2.6-pci-disable-aspm-on-pre-1.1-devices.patch,
	NONE, 1.1 linux-2.6-pci-disable-aspm-per-acpi-fadt-setting.patch,
	NONE, 1.1 kernel.spec, 1.771, 1.772
Message-ID: <20080920070514.485EC700F8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30993

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-pci-add-an-option-to-allow-aspm-enabled-forcibly.patch 
	linux-2.6-pci-disable-aspm-on-pre-1.1-devices.patch 
	linux-2.6-pci-disable-aspm-per-acpi-fadt-setting.patch 
Log Message:
pci: three patches to disable PCIe ASPM on old devices/systems (#462210)

linux-2.6-pci-add-an-option-to-allow-aspm-enabled-forcibly.patch:

--- NEW FILE linux-2.6-pci-add-an-option-to-allow-aspm-enabled-forcibly.patch ---
From: Shaohua Li <shaohua.li at intel.com>
Date: Wed, 23 Jul 2008 02:32:42 +0000 (+0800)
Subject: PCI: add an option to allow ASPM enabled forcibly
X-Git-Tag: v2.6.27-rc1~3^2~4
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d6d385743463f38a0da899cd4607e526ad9a049f

PCI: add an option to allow ASPM enabled forcibly

A new option, pcie_aspm=force, will force ASPM to be enabled, even on system
with PCIe 1.0 devices.

Signed-off-by: Shaohua Li <shaohua.li at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
---

diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 7046052..9a7c9e1 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -55,7 +55,7 @@ struct pcie_link_state {
 	struct endpoint_state endpoints[8];
 };
 
-static int aspm_disabled;
+static int aspm_disabled, aspm_force;
 static DEFINE_MUTEX(aspm_lock);
 static LIST_HEAD(link_list);
 
@@ -527,9 +527,10 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
 		 */
 		pci_read_config_dword(child_dev, child_pos + PCI_EXP_DEVCAP,
 			&reg32);
-		if (!(reg32 & PCI_EXP_DEVCAP_RBER)) {
+		if (!(reg32 & PCI_EXP_DEVCAP_RBER && !aspm_force)) {
 			printk("Pre-1.1 PCIe device detected, "
-				"disable ASPM for %s\n", pci_name(pdev));
+				"disable ASPM for %s. It can be enabled forcedly"
+				" with 'pcie_aspm=force'\n", pci_name(pdev));
 			return -EINVAL;
 		}
 	}
@@ -815,15 +816,22 @@ void pcie_aspm_remove_sysfs_dev_files(struct pci_dev *pdev)
 
 static int __init pcie_aspm_disable(char *str)
 {
-	aspm_disabled = 1;
+	if (!strcmp(str, "off")) {
+		aspm_disabled = 1;
+		printk(KERN_INFO "PCIe ASPM is disabled\n");
+	} else if (!strcmp(str, "force")) {
+		aspm_force = 1;
+		printk(KERN_INFO "PCIe ASPM is forcedly enabled\n");
+	}
 	return 1;
 }
 
-__setup("pcie_noaspm", pcie_aspm_disable);
+__setup("pcie_aspm=", pcie_aspm_disable);
 
 void pcie_no_aspm(void)
 {
-	aspm_disabled = 1;
+	if (!aspm_force)
+		aspm_disabled = 1;
 }
 
 #ifdef CONFIG_ACPI

linux-2.6-pci-disable-aspm-on-pre-1.1-devices.patch:

--- NEW FILE linux-2.6-pci-disable-aspm-on-pre-1.1-devices.patch ---
From: Shaohua Li <shaohua.li at intel.com>
Date: Wed, 23 Jul 2008 02:32:31 +0000 (+0800)
Subject: PCI: disable ASPM on pre-1.1 PCIe devices
X-Git-Tag: v2.6.27-rc1~3^2~5
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=149e16372a2066c5474d8a8db9b252afd57eb427

PCI: disable ASPM on pre-1.1 PCIe devices

Disable ASPM on pre-1.1 PCIe devices, as many of them don't implement it
correctly.

Tested-by: Jack Howarth <howarth at bromo.msbb.uc.edu>
Signed-off-by: Shaohua Li <shaohua.li at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
---

diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 759c51a..7046052 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -510,6 +510,7 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
 {
 	struct pci_dev *child_dev;
 	int child_pos;
+	u32 reg32;
 
 	/*
 	 * Some functions in a slot might not all be PCIE functions, very
@@ -519,6 +520,18 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
 		child_pos = pci_find_capability(child_dev, PCI_CAP_ID_EXP);
 		if (!child_pos)
 			return -EINVAL;
+
+		/*
+		 * Disable ASPM for pre-1.1 PCIe device, we follow MS to use
+		 * RBER bit to determine if a function is 1.1 version device
+		 */
+		pci_read_config_dword(child_dev, child_pos + PCI_EXP_DEVCAP,
+			&reg32);
+		if (!(reg32 & PCI_EXP_DEVCAP_RBER)) {
+			printk("Pre-1.1 PCIe device detected, "
+				"disable ASPM for %s\n", pci_name(pdev));
+			return -EINVAL;
+		}
 	}
 	return 0;
 }
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 2036300..7098dfb 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1057,7 +1057,8 @@ int pci_scan_slot(struct pci_bus *bus, int devfn)
 		}
 	}
 
-	if (bus->self)
+	/* only one slot has pcie device */
+	if (bus->self && nr)
 		pcie_aspm_init_link_state(bus->self);
 
 	return nr;
diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h
index 19958b9..450684f 100644
--- a/include/linux/pci_regs.h
+++ b/include/linux/pci_regs.h
@@ -374,6 +374,7 @@
 #define  PCI_EXP_DEVCAP_ATN_BUT	0x1000	/* Attention Button Present */
 #define  PCI_EXP_DEVCAP_ATN_IND	0x2000	/* Attention Indicator Present */
 #define  PCI_EXP_DEVCAP_PWR_IND	0x4000	/* Power Indicator Present */
+#define  PCI_EXP_DEVCAP_RBER	0x8000	/* Role-Based Error Reporting */
 #define  PCI_EXP_DEVCAP_PWR_VAL	0x3fc0000 /* Slot Power Limit Value */
 #define  PCI_EXP_DEVCAP_PWR_SCL	0xc000000 /* Slot Power Limit Scale */
 #define PCI_EXP_DEVCTL		8	/* Device Control */

linux-2.6-pci-disable-aspm-per-acpi-fadt-setting.patch:

--- NEW FILE linux-2.6-pci-disable-aspm-per-acpi-fadt-setting.patch ---
From: Shaohua Li <shaohua.li at intel.com>
Date: Wed, 23 Jul 2008 02:32:24 +0000 (+0800)
Subject: PCI: disable ASPM per ACPI FADT setting
X-Git-Tag: v2.6.27-rc1~3^2~6
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=5fde244d39b88625ac578d83e6625138714de031

PCI: disable ASPM per ACPI FADT setting

The ACPI FADT table includes an ASPM control bit. If the bit is set, do
not enable ASPM since it may indicate that the platform doesn't actually
support the feature.

Tested-by: Jack Howarth <howarth at bromo.msbb.uc.edu>
Signed-off-by: Shaohua Li <shaohua.li at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
---

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 7764768..89a2f0f 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/module.h>
+#include <linux/pci-aspm.h>
 #include <acpi/acpi.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acresrc.h>
@@ -372,6 +373,12 @@ static int __init acpi_pci_init(void)
 		printk(KERN_INFO"ACPI FADT declares the system doesn't support MSI, so disable it\n");
 		pci_no_msi();
 	}
+
+	if (acpi_gbl_FADT.boot_flags & BAF_PCIE_ASPM_CONTROL) {
+		printk(KERN_INFO"ACPI FADT declares the system doesn't support PCIe ASPM, so disable it\n");
+		pcie_no_aspm();
+	}
+
 	ret = register_acpi_bus_type(&acpi_pci_bus);
 	if (ret)
 		return 0;
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index f824955..759c51a 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -808,6 +808,11 @@ static int __init pcie_aspm_disable(char *str)
 
 __setup("pcie_noaspm", pcie_aspm_disable);
 
+void pcie_no_aspm(void)
+{
+	aspm_disabled = 1;
+}
+
 #ifdef CONFIG_ACPI
 #include <acpi/acpi_bus.h>
 #include <linux/pci-acpi.h>
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index 1ebbe88..13a3d9a 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -277,6 +277,7 @@ enum acpi_prefered_pm_profiles {
 #define BAF_LEGACY_DEVICES              0x0001
 #define BAF_8042_KEYBOARD_CONTROLLER    0x0002
 #define BAF_MSI_NOT_SUPPORTED           0x0008
+#define BAF_PCIE_ASPM_CONTROL           0x0010
 
 #define FADT2_REVISION_ID               3
 #define FADT2_MINUS_REVISION_ID         2
diff --git a/include/linux/pci-aspm.h b/include/linux/pci-aspm.h
index a1a1e61..91ba0b3 100644
--- a/include/linux/pci-aspm.h
+++ b/include/linux/pci-aspm.h
@@ -27,6 +27,7 @@ extern void pcie_aspm_init_link_state(struct pci_dev *pdev);
 extern void pcie_aspm_exit_link_state(struct pci_dev *pdev);
 extern void pcie_aspm_pm_state_change(struct pci_dev *pdev);
 extern void pci_disable_link_state(struct pci_dev *pdev, int state);
+extern void pcie_no_aspm(void);
 #else
 static inline void pcie_aspm_init_link_state(struct pci_dev *pdev)
 {
@@ -40,6 +41,10 @@ static inline void pcie_aspm_pm_state_change(struct pci_dev *pdev)
 static inline void pci_disable_link_state(struct pci_dev *pdev, int state)
 {
 }
+
+static inline void pcie_no_aspm(void)
+{
+}
 #endif
 
 #ifdef CONFIG_PCIEASPM_DEBUG /* this depends on CONFIG_PCIEASPM */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.771
retrieving revision 1.772
diff -u -r1.771 -r1.772
--- kernel.spec	19 Sep 2008 22:03:41 -0000	1.771
+++ kernel.spec	20 Sep 2008 07:04:43 -0000	1.772
@@ -595,6 +595,10 @@
 Patch98: linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch
 Patch100: linux-2.6-x86-pci-detect-end_bus_number.patch
 
+Patch120: linux-2.6-pci-disable-aspm-per-acpi-fadt-setting.patch
+Patch121: linux-2.6-pci-disable-aspm-on-pre-1.1-devices.patch
+Patch122: linux-2.6-pci-add-an-option-to-allow-aspm-enabled-forcibly.patch
+
 # ppc
 Patch140: linux-2.6-ps3-ehci-iso.patch
 Patch141: linux-2.6-ps3-storage-alias.patch
@@ -1072,6 +1076,11 @@
 # fix e820 reservation checking
 ApplyPatch linux-2.6-x86-pci-detect-end_bus_number.patch
 
+# disable ASPM on devices that don't support it
+ApplyPatch linux-2.6-pci-disable-aspm-per-acpi-fadt-setting.patch
+ApplyPatch linux-2.6-pci-disable-aspm-on-pre-1.1-devices.patch
+ApplyPatch linux-2.6-pci-add-an-option-to-allow-aspm-enabled-forcibly.patch
+
 #
 # PowerPC
 #
@@ -1873,6 +1882,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Fri Sep 19 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-45
+- pci: three patches to disable PCIe ASPM on old devices/systems (#462210)
+
 * Fri Sep 19 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-44
 - x86: pci: detect end_bus_number according to acpi/e820 reserved, v2 (#462210)
 



From pbrobinson at fedoraproject.org  Sat Sep 20 07:11:24 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 20 Sep 2008 07:11:24 +0000 (UTC)
Subject: rpms/libbonobo/devel libbonobo.spec,1.80,1.81
Message-ID: <20080920071124.10698700F8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libbonobo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31890

Modified Files:
	libbonobo.spec 
Log Message:
- Kill dependency on perl RHBZ #462901



Index: libbonobo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- libbonobo.spec	23 Aug 2008 00:25:53 -0000	1.80
+++ libbonobo.spec	20 Sep 2008 07:10:53 -0000	1.81
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.23.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://ftp.gnome.org
 Source0: http://download.gnome.org/sources/libbonobo/2.23/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -82,6 +82,7 @@
 rm $RPM_BUILD_ROOT%{_libdir}/*.a
 rm $RPM_BUILD_ROOT%{_libdir}/bonobo/monikers/*.*a
 rm $RPM_BUILD_ROOT%{_libdir}/orbit-2.0/*.*a
+rm $RPM_BUILD_ROOT%{_bindir}/bonobo-slay
 
 for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do
     sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
@@ -123,6 +124,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Sat Sep 20 2008 Peter Robinson <probinson at gmail.com> - 2.23.1-2
+- Kill dependency on perl RHBZ #462901
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.1-1
 - Update to 2.23.1
 



From atorkhov at fedoraproject.org  Sat Sep 20 08:33:12 2008
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Sat, 20 Sep 2008 08:33:12 +0000 (UTC)
Subject: rpms/ogre/devel ogre.spec,1.34,1.35
Message-ID: <20080920083312.EF162700F8@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/ogre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11569

Modified Files:
	ogre.spec 
Log Message:
Removing system-glew patch - upstream uses patched glew and, seems, cannot be used with original with simple patch.


Index: ogre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ogre.spec	19 Sep 2008 06:57:19 -0000	1.34
+++ ogre.spec	20 Sep 2008 08:32:42 -0000	1.35
@@ -10,12 +10,13 @@
 Source0:        ogre-1.6.0rc1-clean.tar.bz2
 Source1:        ogre-samples.sh
 Patch0:         ogre-1.2.1-rpath.patch
-Patch1:         ogre-1.6.0-system-glew.patch
+#Patch1:         ogre-1.6.0-system-glew.patch
 Patch2:         ogre-1.4.7-system-tinyxml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cegui-devel zziplib-devel freetype-devel gtk2-devel
 BuildRequires:  libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel
-BuildRequires:  ois-devel glew-devel freeimage-devel
+BuildRequires:  ois-devel freeimage-devel
+#BuildRequires:  glew-devel
 BuildRequires:  tinyxml-devel
 
 %description
@@ -64,7 +65,7 @@
 %prep
 %setup -q -n ogre
 %patch0 -p1 -z .rpath
-%patch1 -p1 -z .glew
+#%patch1 -p1 -z .glew
 %patch2 -p1 -z .sys-tinyxml
 # remove execute bits from src-files for -debuginfo package
 chmod -x `find RenderSystems/GL -type f` \
@@ -177,7 +178,8 @@
 %changelog
 * Sat Sep 13 2008 Alexey Torkhov <atorkhov at gmail.com> 1.6.0-0.1.rc1
 - New upstream release 1.6.0rc1
-- Removing broken OpenEXR plugin
+- Removing broken OpenEXR plugin, it is not updated for long time and doesn't
+  compile. FreeImage now have EXR support
 
 * Fri Jul 11 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.9-2
 - Rebuild for new cegui



From laxathom at fedoraproject.org  Sat Sep 20 09:19:16 2008
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Sat, 20 Sep 2008 09:19:16 +0000 (UTC)
Subject: rpms/gtk-sharp2/F-9 gtk-sharp2.spec,1.29,1.30 sources,1.9,1.10
Message-ID: <20080920091916.E8F73700F8@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gtk-sharp2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13490

Modified Files:
	gtk-sharp2.spec sources 
Log Message:
update release


Index: gtk-sharp2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-sharp2/F-9/gtk-sharp2.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gtk-sharp2.spec	22 May 2008 13:49:43 -0000	1.29
+++ gtk-sharp2.spec	20 Sep 2008 09:18:46 -0000	1.30
@@ -1,18 +1,18 @@
 Name:           gtk-sharp2
-Version:        2.10.3
-Release:        3%{?dist}
+Version:        2.12.1
+Release:        1%{?dist}
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gtk-sharp.sf.net
-Source0:        http://go-mono.com/sources/gtk-sharp2/gtk-sharp-%{version}.tar.gz
+Source0:        http://go-mono.com/sources/gtk-sharp2/gtk-sharp-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #Patch1: gtk-sharp-2.9.0-monodir.patch
 Patch2: gtk-sharp2-2.10.3-libdir.patch
 Patch3: gtk-sharp-2.8.2-docfix.patch
-Patch4: gtk-sharp2-2.10.3-assemblydir.patch
+#Patch4: gtk-sharp2-2.10.3-assemblydir.patch
 
 BuildRequires:  mono-devel gtk2-devel libglade2-devel
 BuildRequires:  automake, libtool
@@ -62,12 +62,19 @@
 #%patch1 -p1 -b .monodir
 %patch2 -p1 -b .libdir
 %patch3 -p1 -b .docfix
-%patch4 -p1 -b .assemblydir
+#%patch4 -p1 -b .assemblydir
+
+# Fix assembly libdir
+sed -i 's|$(prefix)/lib|%{_libdir}|g' parser/Makefile.in \
+                                      generator/Makefile.in \
+                                        doc/Makefile.* \
+                                        configure.in
 
 
 %build
 #autoreconf --force --install
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
+export MONO_CAIRO_LIBS="-r:%{_libdir}/mono/1.0/Mono.Cairo.dll"
 %configure
 make
 
@@ -120,6 +127,9 @@
 %{_libdir}/monodoc
 
 %changelog
+* Sat Sep 20 2008 Xavier Lamien <lxtnow[at]gmail.com> - 2.12.1-1
+- Update release.
+
 * Thu May 22 2008 Xavier Lamien <lxtnow[at]gmail.com> - 2.10.3-3
 - Bump release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-sharp2/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Feb 2008 00:01:33 -0000	1.9
+++ sources	20 Sep 2008 09:18:46 -0000	1.10
@@ -1 +1 @@
-e336ea00421958413ba10859866886f3  gtk-sharp-2.10.3.tar.gz
+b769fabc114fa9201c4e085ae36a8540  gtk-sharp-2.12.1.tar.bz2



From mpg at fedoraproject.org  Sat Sep 20 10:25:17 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Sat, 20 Sep 2008 10:25:17 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.19, 1.20 sources, 1.20,
	1.21 sugar.spec, 1.27, 1.28
Message-ID: <20080920102517.439B5700F8@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15841

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-1
- #8554 Indicate connected AP in Neighborhood view.
- #7987 Home view XO icon palette for Control Panel has wrong icon
- #7685 Alternate home layouts; fixed ring scaling; better modularization of layouts
- #8148 control panel does have layout problems with languages like mongolian
- #8485 Switching between zoom levels seem to leak




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	16 Sep 2008 19:34:30 -0000	1.19
+++ .cvsignore	20 Sep 2008 10:24:46 -0000	1.20
@@ -1 +1 @@
-sugar-0.82.7.tar.bz2
+sugar-0.82.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	16 Sep 2008 19:34:30 -0000	1.20
+++ sources	20 Sep 2008 10:24:46 -0000	1.21
@@ -1 +1 @@
-3188ae9e0d67a7a105d480837cf101d9  sugar-0.82.7.tar.bz2
+f435efa9be7ca520b86322ee19a878e4  sugar-0.82.8.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sugar.spec	16 Sep 2008 19:34:30 -0000	1.27
+++ sugar.spec	20 Sep 2008 10:24:46 -0000	1.28
@@ -3,7 +3,7 @@
 
 Summary: OLPC desktop environment
 Name: sugar
-Version: 0.82.7
+Version: 0.82.8
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
@@ -93,6 +93,13 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-1
+- #8554 Indicate connected AP in Neighborhood view.
+- #7987 Home view XO icon palette for Control Panel has wrong icon
+- #7685 Alternate home layouts; fixed ring scaling; better modularization of layouts
+- #8148 control panel does have layout problems with languages like mongolian
+- #8485 Switching between zoom levels seem to leak
+
 * Tue Sep 16 2008 Simon Schampijer <simon at laptop.org> - 0.82.7-1
 - remove numpy finally
 



From mpg at fedoraproject.org  Sat Sep 20 10:27:38 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Sat, 20 Sep 2008 10:27:38 +0000 (UTC)
Subject: rpms/sugar/OLPC-3 sources,1.20,1.21 sugar.spec,1.23,1.24
Message-ID: <20080920102738.42C42700F8@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15935

Modified Files:
	sources sugar.spec 
Log Message:
* Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-1
- #8554 Indicate connected AP in Neighborhood view.
- #7987 Home view XO icon palette for Control Panel has wrong icon
- #7685 Alternate home layouts; fixed ring scaling; better modularization of layouts
- #8148 control panel does have layout problems with languages like mongolian
- #8485 Switching between zoom levels seem to leak




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	16 Sep 2008 19:26:53 -0000	1.20
+++ sources	20 Sep 2008 10:27:07 -0000	1.21
@@ -1 +1 @@
-3188ae9e0d67a7a105d480837cf101d9  sugar-0.82.7.tar.bz2
+f435efa9be7ca520b86322ee19a878e4  sugar-0.82.8.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sugar.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sugar.spec	16 Sep 2008 19:26:53 -0000	1.23
+++ sugar.spec	20 Sep 2008 10:27:07 -0000	1.24
@@ -3,7 +3,7 @@
 
 Summary: OLPC desktop environment
 Name: sugar
-Version: 0.82.7
+Version: 0.82.8
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
@@ -93,6 +93,13 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-1
+- #8554 Indicate connected AP in Neighborhood view.
+- #7987 Home view XO icon palette for Control Panel has wrong icon
+- #7685 Alternate home layouts; fixed ring scaling; better modularization of layouts
+- #8148 control panel does have layout problems with languages like mongolian
+- #8485 Switching between zoom levels seem to leak
+
 * Tue Sep 16 2008 Simon Schampijer <simon at laptop.org> - 0.82.7-1
 - remove numpy finally
 



From mpg at fedoraproject.org  Sat Sep 20 10:31:28 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Sat, 20 Sep 2008 10:31:28 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.16, 1.17 sources, 1.19,
	1.20 sugar-toolkit.spec, 1.24, 1.25
Message-ID: <20080920103128.4EE377013D@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16401

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.10-1
- #8532 SIGCHLD fights with threads.
- #8485 Switching between zoom levels seem to leak



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	16 Sep 2008 19:11:21 -0000	1.16
+++ .cvsignore	20 Sep 2008 10:30:58 -0000	1.17
@@ -1 +1 @@
-sugar-toolkit-0.82.8.tar.bz2
+sugar-toolkit-0.82.10.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	16 Sep 2008 19:11:21 -0000	1.19
+++ sources	20 Sep 2008 10:30:58 -0000	1.20
@@ -1 +1 @@
-ba9eff3f2f45c871b65ca3f37ffff3a0  sugar-toolkit-0.82.8.tar.bz2
+9aa6da3ecc1920951114149d6ae99861  sugar-toolkit-0.82.10.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sugar-toolkit.spec	16 Sep 2008 19:11:21 -0000	1.24
+++ sugar-toolkit.spec	20 Sep 2008 10:30:58 -0000	1.25
@@ -5,7 +5,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.82.8
+Version: 0.82.10
 Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
@@ -68,6 +68,10 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.10-1
+- #8532 SIGCHLD fights with threads.
+- #8485 Switching between zoom levels seem to leak
+
 * Tue Sep 16 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-2
 - Fix a crash when we cannot access the alsa device
 



From mpg at fedoraproject.org  Sat Sep 20 10:32:32 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Sat, 20 Sep 2008 10:32:32 +0000 (UTC)
Subject: rpms/sugar-toolkit/OLPC-3 sources, 1.17, 1.18 sugar-toolkit.spec,
	1.21, 1.22
Message-ID: <20080920103232.A87EA7013E@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-toolkit/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16557

Modified Files:
	sources sugar-toolkit.spec 
Log Message:
* Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.10-1
- #8532 SIGCHLD fights with threads.
- #8485 Switching between zoom levels seem to leak



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	16 Sep 2008 19:08:02 -0000	1.17
+++ sources	20 Sep 2008 10:32:02 -0000	1.18
@@ -1 +1 @@
-ba9eff3f2f45c871b65ca3f37ffff3a0  sugar-toolkit-0.82.8.tar.bz2
+9aa6da3ecc1920951114149d6ae99861  sugar-toolkit-0.82.10.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sugar-toolkit.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sugar-toolkit.spec	16 Sep 2008 19:08:02 -0000	1.21
+++ sugar-toolkit.spec	20 Sep 2008 10:32:02 -0000	1.22
@@ -5,7 +5,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.82.8
+Version: 0.82.10
 Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
@@ -66,6 +66,10 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.10-1
+- #8532 SIGCHLD fights with threads.
+- #8485 Switching between zoom levels seem to leak
+
 * Tue Sep 16 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-2
 - Fix a crash when we cannot access the alsa device
 



From mpg at fedoraproject.org  Sat Sep 20 10:36:19 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Sat, 20 Sep 2008 10:36:19 +0000 (UTC)
Subject: rpms/sugar-artwork/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 sugar-artwork.spec, 1.10, 1.11
Message-ID: <20080920103619.568E4700F8@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-artwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17079

Modified Files:
	.cvsignore sources sugar-artwork.spec 
Log Message:
* Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.2-1
- #7685 Alternate home layouts; fixed ring scaling; better modularization of layouts
- #8554 Indicate connected AP in Neighborhood view.
- #8198 Use a plainer "wrench" for the Settings icon
- #7987 Home view XO icon palette for Control Panel has wrong icon



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Aug 2008 00:31:28 -0000	1.7
+++ .cvsignore	20 Sep 2008 10:35:49 -0000	1.8
@@ -1 +1,2 @@
 sugar-artwork-0.82.1.tar.bz2
+sugar-artwork-0.82.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Aug 2008 00:31:28 -0000	1.7
+++ sources	20 Sep 2008 10:35:49 -0000	1.8
@@ -1 +1 @@
-cf9f62f2743501c545fdda7c0079ac84  sugar-artwork-0.82.1.tar.bz2
+e23f29c97e294873d4a9d3d9f9892c1f  sugar-artwork-0.82.2.tar.bz2


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sugar-artwork.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sugar-artwork.spec	6 Sep 2008 18:43:37 -0000	1.10
+++ sugar-artwork.spec	20 Sep 2008 10:35:49 -0000	1.11
@@ -3,7 +3,7 @@
 
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
-Version: 0.82.1
+Version: 0.82.2
 Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
@@ -62,6 +62,12 @@
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.2-1
+- #7685 Alternate home layouts; fixed ring scaling; better modularization of layouts
+- #8554 Indicate connected AP in Neighborhood view.
+- #8198 Use a plainer "wrench" for the Settings icon
+- #7987 Home view XO icon palette for Control Panel has wrong icon
+
 * Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.82.1-2
 - fix license tag
 



From mpg at fedoraproject.org  Sat Sep 20 10:37:35 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Sat, 20 Sep 2008 10:37:35 +0000 (UTC)
Subject: rpms/sugar-artwork/OLPC-3 sources, 1.8, 1.9 sugar-artwork.spec, 1.10,
	1.11
Message-ID: <20080920103735.AC6B1700F8@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-artwork/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17134

Modified Files:
	sources sugar-artwork.spec 
Log Message:
* Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.2-1
- #7685 Alternate home layouts; fixed ring scaling; better modularization of layouts
- #8554 Indicate connected AP in Neighborhood view.
- #8198 Use a plainer "wrench" for the Settings icon
- #7987 Home view XO icon palette for Control Panel has wrong icon




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/OLPC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Aug 2008 16:12:11 -0000	1.8
+++ sources	20 Sep 2008 10:37:05 -0000	1.9
@@ -1 +1 @@
-a9bbaed3f8307ec8be4662fedcb7fddf  sugar-artwork-0.81.3.tar.bz2
+e23f29c97e294873d4a9d3d9f9892c1f  sugar-artwork-0.82.2.tar.bz2


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/OLPC-3/sugar-artwork.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sugar-artwork.spec	1 Aug 2008 16:12:11 -0000	1.10
+++ sugar-artwork.spec	20 Sep 2008 10:37:05 -0000	1.11
@@ -1,6 +1,6 @@
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
-Version: 0.81.3
+Version: 0.82.2
 Release: 1%{?dist}
 URL: http://dev.laptop.org
 Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 
@@ -53,6 +53,12 @@
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.2-1
+- #7685 Alternate home layouts; fixed ring scaling; better modularization of layouts
+- #8554 Indicate connected AP in Neighborhood view.
+- #8198 Use a plainer "wrench" for the Settings icon
+- #7987 Home view XO icon palette for Control Panel has wrong icon
+
 * Fri Aug 01 2008 Sayamindu Dasgupta <sayamindu at laptop.org> 0.81.3-1
 - Update to 0.81.3
 



From pbrobinson at fedoraproject.org  Sat Sep 20 11:24:13 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 20 Sep 2008 11:24:13 +0000 (UTC)
Subject: rpms/ekiga/devel ekiga.spec,1.51,1.52
Message-ID: <20080920112413.D4906700F8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19131

Modified Files:
	ekiga.spec 
Log Message:
- Remove requires that will be automatically pulled in



Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ekiga.spec	14 Sep 2008 20:38:11 -0000	1.51
+++ ekiga.spec	20 Sep 2008 11:23:42 -0000	1.52
@@ -8,8 +8,6 @@
 Group:		Applications/Communications
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	ptlib >= 2.3.1
-Requires:	opal >= 3.3.1
 Requires:	evolution-data-server
 Requires:	GConf2, scrollkeeper
 BuildRequires:	gtk2-devel >= 2.12



From raven at fedoraproject.org  Sat Sep 20 12:27:29 2008
From: raven at fedoraproject.org (=?utf-8?q?Piotr_Dr=C4=85g?=)
Date: Sat, 20 Sep 2008 12:27:29 +0000 (UTC)
Subject: comps/po pl.po,1.20,1.21
Message-ID: <20080920122729.E1D03700F8@cvs1.fedora.phx.redhat.com>

Author: raven

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22156/po

Modified Files:
	pl.po 
Log Message:
Updated Polish translation


Index: pl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pl.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pl.po	17 Sep 2008 22:44:36 -0000	1.20
+++ pl.po	20 Sep 2008 12:26:59 -0000	1.21
@@ -10,7 +10,7 @@
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-09-12 23:14+0200\n"
+"PO-Revision-Date: 2008-09-19 21:48+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"
@@ -1152,9 +1152,8 @@
 msgstr "Obs??uga walo??skiego"
 
 #: ../comps-f10.xml.in.h:70
-#, fuzzy
 msgid "Haskell Development"
-msgstr "Tworzenie WWW"
+msgstr "Programowanie w Haskellu"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
@@ -1165,14 +1164,12 @@
 msgstr "Pakiety metod wej??cia do wpisywania mi??dzynarodowego tekstu."
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "Obs??uga khmerskiego"
+msgstr "Obs??uga kaszmirskiego"
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "Obs??uga korea??skiego"
+msgstr "Obs??uga konkani"
 
 #: ../comps-f10.xml.in.h:110
 msgid "Maithili Support"
@@ -1183,14 +1180,12 @@
 msgstr "Obs??uga myanmarskiego (birma??skiego)"
 
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "Obs??uga hindi"
+msgstr "Obs??uga sindhi"
 
 #: ../comps-f10.xml.in.h:156
-#, fuzzy
 msgid "Support for developing programs in the Haskell programming language."
-msgstr "Obs??uga tworzenia program??w w j??zyku programowania Java."
+msgstr "Obs??uga tworzenia program??w w j??zyku programowania Haskell."
 
 #: ../comps-f10.xml.in.h:163
 msgid "Tajik Support"
@@ -1271,6 +1266,3 @@
 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."
-
-#~ msgid "Haskell"
-#~ msgstr "Haskell"



From pbrobinson at fedoraproject.org  Sat Sep 20 12:48:13 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 20 Sep 2008 12:48:13 +0000 (UTC)
Subject: rpms/ekiga/devel ekiga.spec,1.52,1.53
Message-ID: <20080920124813.DADAA700F8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23017

Modified Files:
	ekiga.spec 
Log Message:
- Removed obsolete SDL-devel build req



Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ekiga.spec	20 Sep 2008 11:23:42 -0000	1.52
+++ ekiga.spec	20 Sep 2008 12:47:42 -0000	1.53
@@ -23,7 +23,6 @@
 BuildRequires:	opal-devel >= 3.3.1
 BuildRequires:	libxml2-devel >= 2.5.0
 BuildRequires:	libXv-devel
-BuildRequires:	SDL-devel
 BuildRequires:	intltool >= 0.22
 BuildRequires:	pkgconfig
 BuildRequires:	scrollkeeper



From cebbert at fedoraproject.org  Sat Sep 20 12:53:56 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 20 Sep 2008 12:53:56 +0000 (UTC)
Subject: rpms/kernel/F-8
	linux-2.6-pci-add-an-option-to-allow-aspm-enabled-forcibly.patch,
	NONE, 1.1 linux-2.6-pci-disable-aspm-on-pre-1.1-devices.patch,
	NONE, 1.1 linux-2.6-pci-disable-aspm-per-acpi-fadt-setting.patch,
	NONE, 1.1 kernel.spec, 1.537, 1.538
Message-ID: <20080920125356.1A405700F8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23280

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-pci-add-an-option-to-allow-aspm-enabled-forcibly.patch 
	linux-2.6-pci-disable-aspm-on-pre-1.1-devices.patch 
	linux-2.6-pci-disable-aspm-per-acpi-fadt-setting.patch 
Log Message:
pci: three patches to disable PCIe ASPM on old devices/systems (F9#462210)

linux-2.6-pci-add-an-option-to-allow-aspm-enabled-forcibly.patch:

--- NEW FILE linux-2.6-pci-add-an-option-to-allow-aspm-enabled-forcibly.patch ---
From: Shaohua Li <shaohua.li at intel.com>
Date: Wed, 23 Jul 2008 02:32:42 +0000 (+0800)
Subject: PCI: add an option to allow ASPM enabled forcibly
X-Git-Tag: v2.6.27-rc1~3^2~4
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d6d385743463f38a0da899cd4607e526ad9a049f

PCI: add an option to allow ASPM enabled forcibly

A new option, pcie_aspm=force, will force ASPM to be enabled, even on system
with PCIe 1.0 devices.

Signed-off-by: Shaohua Li <shaohua.li at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
---

diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 7046052..9a7c9e1 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -55,7 +55,7 @@ struct pcie_link_state {
 	struct endpoint_state endpoints[8];
 };
 
-static int aspm_disabled;
+static int aspm_disabled, aspm_force;
 static DEFINE_MUTEX(aspm_lock);
 static LIST_HEAD(link_list);
 
@@ -527,9 +527,10 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
 		 */
 		pci_read_config_dword(child_dev, child_pos + PCI_EXP_DEVCAP,
 			&reg32);
-		if (!(reg32 & PCI_EXP_DEVCAP_RBER)) {
+		if (!(reg32 & PCI_EXP_DEVCAP_RBER && !aspm_force)) {
 			printk("Pre-1.1 PCIe device detected, "
-				"disable ASPM for %s\n", pci_name(pdev));
+				"disable ASPM for %s. It can be enabled forcedly"
+				" with 'pcie_aspm=force'\n", pci_name(pdev));
 			return -EINVAL;
 		}
 	}
@@ -815,15 +816,22 @@ void pcie_aspm_remove_sysfs_dev_files(struct pci_dev *pdev)
 
 static int __init pcie_aspm_disable(char *str)
 {
-	aspm_disabled = 1;
+	if (!strcmp(str, "off")) {
+		aspm_disabled = 1;
+		printk(KERN_INFO "PCIe ASPM is disabled\n");
+	} else if (!strcmp(str, "force")) {
+		aspm_force = 1;
+		printk(KERN_INFO "PCIe ASPM is forcedly enabled\n");
+	}
 	return 1;
 }
 
-__setup("pcie_noaspm", pcie_aspm_disable);
+__setup("pcie_aspm=", pcie_aspm_disable);
 
 void pcie_no_aspm(void)
 {
-	aspm_disabled = 1;
+	if (!aspm_force)
+		aspm_disabled = 1;
 }
 
 #ifdef CONFIG_ACPI

linux-2.6-pci-disable-aspm-on-pre-1.1-devices.patch:

--- NEW FILE linux-2.6-pci-disable-aspm-on-pre-1.1-devices.patch ---
From: Shaohua Li <shaohua.li at intel.com>
Date: Wed, 23 Jul 2008 02:32:31 +0000 (+0800)
Subject: PCI: disable ASPM on pre-1.1 PCIe devices
X-Git-Tag: v2.6.27-rc1~3^2~5
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=149e16372a2066c5474d8a8db9b252afd57eb427

PCI: disable ASPM on pre-1.1 PCIe devices

Disable ASPM on pre-1.1 PCIe devices, as many of them don't implement it
correctly.

Tested-by: Jack Howarth <howarth at bromo.msbb.uc.edu>
Signed-off-by: Shaohua Li <shaohua.li at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
---

diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 759c51a..7046052 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -510,6 +510,7 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
 {
 	struct pci_dev *child_dev;
 	int child_pos;
+	u32 reg32;
 
 	/*
 	 * Some functions in a slot might not all be PCIE functions, very
@@ -519,6 +520,18 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
 		child_pos = pci_find_capability(child_dev, PCI_CAP_ID_EXP);
 		if (!child_pos)
 			return -EINVAL;
+
+		/*
+		 * Disable ASPM for pre-1.1 PCIe device, we follow MS to use
+		 * RBER bit to determine if a function is 1.1 version device
+		 */
+		pci_read_config_dword(child_dev, child_pos + PCI_EXP_DEVCAP,
+			&reg32);
+		if (!(reg32 & PCI_EXP_DEVCAP_RBER)) {
+			printk("Pre-1.1 PCIe device detected, "
+				"disable ASPM for %s\n", pci_name(pdev));
+			return -EINVAL;
+		}
 	}
 	return 0;
 }
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 2036300..7098dfb 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1057,7 +1057,8 @@ int pci_scan_slot(struct pci_bus *bus, int devfn)
 		}
 	}
 
-	if (bus->self)
+	/* only one slot has pcie device */
+	if (bus->self && nr)
 		pcie_aspm_init_link_state(bus->self);
 
 	return nr;
diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h
index 19958b9..450684f 100644
--- a/include/linux/pci_regs.h
+++ b/include/linux/pci_regs.h
@@ -374,6 +374,7 @@
 #define  PCI_EXP_DEVCAP_ATN_BUT	0x1000	/* Attention Button Present */
 #define  PCI_EXP_DEVCAP_ATN_IND	0x2000	/* Attention Indicator Present */
 #define  PCI_EXP_DEVCAP_PWR_IND	0x4000	/* Power Indicator Present */
+#define  PCI_EXP_DEVCAP_RBER	0x8000	/* Role-Based Error Reporting */
 #define  PCI_EXP_DEVCAP_PWR_VAL	0x3fc0000 /* Slot Power Limit Value */
 #define  PCI_EXP_DEVCAP_PWR_SCL	0xc000000 /* Slot Power Limit Scale */
 #define PCI_EXP_DEVCTL		8	/* Device Control */

linux-2.6-pci-disable-aspm-per-acpi-fadt-setting.patch:

--- NEW FILE linux-2.6-pci-disable-aspm-per-acpi-fadt-setting.patch ---
From: Shaohua Li <shaohua.li at intel.com>
Date: Wed, 23 Jul 2008 02:32:24 +0000 (+0800)
Subject: PCI: disable ASPM per ACPI FADT setting
X-Git-Tag: v2.6.27-rc1~3^2~6
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=5fde244d39b88625ac578d83e6625138714de031

PCI: disable ASPM per ACPI FADT setting

The ACPI FADT table includes an ASPM control bit. If the bit is set, do
not enable ASPM since it may indicate that the platform doesn't actually
support the feature.

Tested-by: Jack Howarth <howarth at bromo.msbb.uc.edu>
Signed-off-by: Shaohua Li <shaohua.li at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
---

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 7764768..89a2f0f 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/module.h>
+#include <linux/pci-aspm.h>
 #include <acpi/acpi.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acresrc.h>
@@ -372,6 +373,12 @@ static int __init acpi_pci_init(void)
 		printk(KERN_INFO"ACPI FADT declares the system doesn't support MSI, so disable it\n");
 		pci_no_msi();
 	}
+
+	if (acpi_gbl_FADT.boot_flags & BAF_PCIE_ASPM_CONTROL) {
+		printk(KERN_INFO"ACPI FADT declares the system doesn't support PCIe ASPM, so disable it\n");
+		pcie_no_aspm();
+	}
+
 	ret = register_acpi_bus_type(&acpi_pci_bus);
 	if (ret)
 		return 0;
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index f824955..759c51a 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -808,6 +808,11 @@ static int __init pcie_aspm_disable(char *str)
 
 __setup("pcie_noaspm", pcie_aspm_disable);
 
+void pcie_no_aspm(void)
+{
+	aspm_disabled = 1;
+}
+
 #ifdef CONFIG_ACPI
 #include <acpi/acpi_bus.h>
 #include <linux/pci-acpi.h>
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index 1ebbe88..13a3d9a 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -277,6 +277,7 @@ enum acpi_prefered_pm_profiles {
 #define BAF_LEGACY_DEVICES              0x0001
 #define BAF_8042_KEYBOARD_CONTROLLER    0x0002
 #define BAF_MSI_NOT_SUPPORTED           0x0008
+#define BAF_PCIE_ASPM_CONTROL           0x0010
 
 #define FADT2_REVISION_ID               3
 #define FADT2_MINUS_REVISION_ID         2
diff --git a/include/linux/pci-aspm.h b/include/linux/pci-aspm.h
index a1a1e61..91ba0b3 100644
--- a/include/linux/pci-aspm.h
+++ b/include/linux/pci-aspm.h
@@ -27,6 +27,7 @@ extern void pcie_aspm_init_link_state(struct pci_dev *pdev);
 extern void pcie_aspm_exit_link_state(struct pci_dev *pdev);
 extern void pcie_aspm_pm_state_change(struct pci_dev *pdev);
 extern void pci_disable_link_state(struct pci_dev *pdev, int state);
+extern void pcie_no_aspm(void);
 #else
 static inline void pcie_aspm_init_link_state(struct pci_dev *pdev)
 {
@@ -40,6 +41,10 @@ static inline void pcie_aspm_pm_state_change(struct pci_dev *pdev)
 static inline void pci_disable_link_state(struct pci_dev *pdev, int state)
 {
 }
+
+static inline void pcie_no_aspm(void)
+{
+}
 #endif
 
 #ifdef CONFIG_PCIEASPM_DEBUG /* this depends on CONFIG_PCIEASPM */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.537
retrieving revision 1.538
diff -u -r1.537 -r1.538
--- kernel.spec	19 Sep 2008 21:58:04 -0000	1.537
+++ kernel.spec	20 Sep 2008 12:53:25 -0000	1.538
@@ -594,6 +594,10 @@
 Patch99: linux-2.6-x86-intel-msr-backport.patch
 Patch100: linux-2.6-x86-pci-detect-end_bus_number.patch
 
+Patch120: linux-2.6-pci-disable-aspm-per-acpi-fadt-setting.patch
+Patch121: linux-2.6-pci-disable-aspm-on-pre-1.1-devices.patch
+Patch122: linux-2.6-pci-add-an-option-to-allow-aspm-enabled-forcibly.patch
+
 #ALSA
 
 Patch130: linux-2.6-ppc-use-libgcc.patch
@@ -1052,6 +1056,11 @@
 # fix e820 reservation checking
 ApplyPatch linux-2.6-x86-pci-detect-end_bus_number.patch
 
+# disable ASPM on devices that don't support it
+ApplyPatch linux-2.6-pci-disable-aspm-per-acpi-fadt-setting.patch
+ApplyPatch linux-2.6-pci-disable-aspm-on-pre-1.1-devices.patch
+ApplyPatch linux-2.6-pci-add-an-option-to-allow-aspm-enabled-forcibly.patch
+
 #
 # PowerPC
 #
@@ -1864,6 +1873,9 @@
 
 
 %changelog
+* Sat Sep 20 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-28
+- pci: three patches to disable PCIe ASPM on old devices/systems (F9#462210)
+
 * Fri Sep 19 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-27
 - libata-sff: kill spurious WARN_ON() in ata_hsm_move()
    Pointed-out-by: Arjan van de Ven (9c2676b61a5a4b6d99e65fb2f438fb3914302eda)



From mpg at fedoraproject.org  Sat Sep 20 13:31:38 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Sat, 20 Sep 2008 13:31:38 +0000 (UTC)
Subject: rpms/sugar-artwork/OLPC-3 sugar-artwork.spec,1.11,1.12
Message-ID: <20080920133138.CDBEE700F8@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-artwork/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24621

Modified Files:
	sugar-artwork.spec 
Log Message:
* Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.2-2
- Resync with devel



Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/OLPC-3/sugar-artwork.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sugar-artwork.spec	20 Sep 2008 10:37:05 -0000	1.11
+++ sugar-artwork.spec	20 Sep 2008 13:31:08 -0000	1.12
@@ -1,17 +1,26 @@
+%define commitid c77b345c02
+%define alphatag 20080709git%{commitid}
+
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
 Version: 0.82.2
-Release: 1%{?dist}
+Release: 2%{?dist}
+#Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
+# git clone git://dev.laptop.org/artwork
+# cd sugar
+# git-checkout %{commitid}
+#Source0: %{name}-%{version}-git%{commitid}.tar.bz2
 Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 
 Group: User Interface/Desktops
-License: GPL
+License: LGPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel >= 2.9.0
 BuildRequires: xorg-x11-apps
 BuildRequires: perl-XML-Parser
 BuildRequires: python
+BuildRequires: icon-naming-utils
 
 Requires: gtk2 >= 2.9.0
 
@@ -53,14 +62,28 @@
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.2-2
+- Resync with devel
+
 * Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.2-1
 - #7685 Alternate home layouts; fixed ring scaling; better modularization of layouts
 - #8554 Indicate connected AP in Neighborhood view.
 - #8198 Use a plainer "wrench" for the Settings icon
 - #7987 Home view XO icon palette for Control Panel has wrong icon
 
-* Fri Aug 01 2008 Sayamindu Dasgupta <sayamindu at laptop.org> 0.81.3-1
-- Update to 0.81.3
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.82.1-2
+- fix license tag
+
+* Thu Aug 28 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.1-1
+- #4312 need volume button icons for totem player
+- #7939 Missing stock icons
+
+* Thu Aug 07 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.0-1
+- 7641 Install GTK compatibility symlinks using icon-naming-utils package
+
+* Wed Jul 09 2008 Simon Schampijer <simon at laptop.org> - 0.81.6-2.20080709gitc77b345c02
+- git snapshot
+- 7385 Add view-freeform icon (eben)
 
 * Sat Jun 21 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.81.1
 - Some improvements to the gtk theme (benzea)



From scop at fedoraproject.org  Sat Sep 20 14:14:08 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat, 20 Sep 2008 14:14:08 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.109,1.110 comps-f9.xml.in,1.388,1.389
Message-ID: <20080920141408.9B474700F8@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26472

Modified Files:
	comps-f10.xml.in comps-f9.xml.in 
Log Message:
+mysqltuner


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- comps-f10.xml.in	17 Sep 2008 22:41:53 -0000	1.109
+++ comps-f10.xml.in	20 Sep 2008 14:13:38 -0000	1.110
@@ -3293,6 +3293,7 @@
       <packagereq type="optional">mod_auth_mysql</packagereq>
       <packagereq type="optional">mysql-bench</packagereq>
       <packagereq type="optional">mysql-devel</packagereq>
+      <packagereq type="optional">mysqltuner</packagereq>
       <packagereq type="optional">php-mysql</packagereq>
       <packagereq type="optional">qt-mysql</packagereq>
       <packagereq type="optional">qt3-MySQL</packagereq>


Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f9.xml.in,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- comps-f9.xml.in	15 Sep 2008 14:05:33 -0000	1.388
+++ comps-f9.xml.in	20 Sep 2008 14:13:38 -0000	1.389
@@ -3035,6 +3035,7 @@
       <packagereq type="optional">mod_auth_mysql</packagereq>
       <packagereq type="optional">mysql-bench</packagereq>
       <packagereq type="optional">mysql-devel</packagereq>
+      <packagereq type="optional">mysqltuner</packagereq>
       <packagereq type="optional">php-mysql</packagereq>
       <packagereq type="optional">qt-mysql</packagereq>
       <packagereq type="optional">qt3-MySQL</packagereq>



From scop at fedoraproject.org  Sat Sep 20 14:16:42 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat, 20 Sep 2008 14:16:42 +0000 (UTC)
Subject: rpms/tomcat-native/EL-5 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tomcat-native.spec, 1.4, 1.5
Message-ID: <20080920141642.967AD700F8@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/tomcat-native/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26672

Modified Files:
	.cvsignore sources tomcat-native.spec 
Log Message:
* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.15-1
- 1.1.15.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Jul 2008 17:21:34 -0000	1.4
+++ .cvsignore	20 Sep 2008 14:16:12 -0000	1.5
@@ -1 +1 @@
-tomcat-native-1.1.14-src.tar.gz
+tomcat-native-1.1.15-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jul 2008 17:21:34 -0000	1.4
+++ sources	20 Sep 2008 14:16:12 -0000	1.5
@@ -1 +1 @@
-b190d214e4c7cfcc012d272fd375589a  tomcat-native-1.1.14-src.tar.gz
+31beca620246cc076cbd70d8c1629fec  tomcat-native-1.1.15-src.tar.gz


Index: tomcat-native.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/EL-5/tomcat-native.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tomcat-native.spec	15 Jul 2008 17:21:34 -0000	1.4
+++ tomcat-native.spec	20 Sep 2008 14:16:12 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           tomcat-native
-Version:        1.1.14
+Version:        1.1.15
 Release:        1%{?dist}
 Summary:        Tomcat native library
 
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.15-1
+- 1.1.15.
+
 * Sat Jul  5 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.14-1
 - 1.1.14.
 



From mtruch at fedoraproject.org  Sat Sep 20 14:36:49 2008
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Sat, 20 Sep 2008 14:36:49 +0000 (UTC)
Subject: rpms/cfitsio/devel cfitsio.spec,1.27,1.28
Message-ID: <20080920143649.06AE9700F8@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/cfitsio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27471

Modified Files:
	cfitsio.spec 
Log Message:
Run test-suite.



Index: cfitsio.spec
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- cfitsio.spec	19 Sep 2008 23:14:02 -0000	1.27
+++ cfitsio.spec	20 Sep 2008 14:36:18 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           cfitsio
 Version:        3.100
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
@@ -56,6 +56,12 @@
 sed 's|${prefix}/include|${prefix}/include/%{name}|' cfitsio.pc.new >cfitsio.pc
 rm -f cfitsio.pc.new
 
+%check
+make testprog
+LD_LIBRARY_PATH=. ./testprog > testprog.lis
+#cmp -s testprog.lis testprog.out #testprog.out is accidentally missing from 3.100 tarball.
+cmp -s testprog.fit testprog.std
+
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}
@@ -89,6 +95,9 @@
 %{_libdir}/libcfitsio.a
 
 %changelog
+* Sat Sep 20 2008 Matthew Truch <matt at truch.net> - 3.100-2
+- Test library with included test-suite.  
+
 * Fri Sep 19 2008 Matthew Truch <matt at truch.net> - 3.100-1
 - Update to 3.100 upstream.
   Includes bugfixes and new compression scheme.



From chitlesh at fedoraproject.org  Sat Sep 20 14:56:40 2008
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat, 20 Sep 2008 14:56:40 +0000 (UTC)
Subject: rpms/kmenu-gnome/devel .cvsignore, 1.16,
	1.17 fedora-administration.patch, 1.4, 1.5 import.log, 1.1,
	1.2 kmenu-gnome.spec, 1.18, 1.19 sources, 1.16, 1.17
Message-ID: <20080920145640.2D8DD700F8@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/kmenu-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28379/devel

Modified Files:
	.cvsignore fedora-administration.patch import.log 
	kmenu-gnome.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmenu-gnome/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	15 Aug 2008 12:23:11 -0000	1.16
+++ .cvsignore	20 Sep 2008 14:56:09 -0000	1.17
@@ -1 +1 @@
-31025-kmenu-gnome-0.7.3.tar.gz
+31025-kmenu-gnome-0.7.4.tar.gz

fedora-administration.patch:

Index: fedora-administration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kmenu-gnome/devel/fedora-administration.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-administration.patch	15 Aug 2008 12:23:11 -0000	1.4
+++ fedora-administration.patch	20 Sep 2008 14:56:09 -0000	1.5
@@ -1,11 +1,11 @@
---- kmenu-gnome-0.7.3/xdg/kmenu-gnome.menu.orig	2008-08-11 17:55:38.000000000 +0200
-+++ kmenu-gnome-0.7.3/xdg/kmenu-gnome.menu	2008-08-11 17:56:11.000000000 +0200
+--- kmenu-gnome-0.7.4/xdg/kmenu-gnome.menu.orig	2008-09-15 17:21:48.000000000 +0200
++++ kmenu-gnome-0.7.4/xdg/kmenu-gnome.menu	2008-09-15 17:53:58.000000000 +0200
 @@ -904,12 +904,13 @@
  			</And>
  		</Exclude>
  		<Include>
 -			<!-- Include top media players -->
-+			<!-- Include top media players & mixers-->
++			<!-- Include top media players & mixers -->
  			<Filename>fedora-realplay.desktop</Filename>
  			<Filename>helix-player.desktop</Filename>
  			<Filename>hxplay.desktop</Filename>
@@ -15,13 +15,7 @@
  			<Filename>realplay.desktop</Filename>
  			<Filename>realplayer.desktop</Filename>
  		</Include>
-@@ -933,11 +934,12 @@
- 				<Category>Qt</Category>
- 				<Category>KDE</Category>
- 				<Category>GNOME</Category>
--				<!-- Exclude top media players -->
-+				<!-- Exclude top media players & mixers -->
- 				<Filename>helix-player.desktop</Filename>
+@@ -938,6 +939,7 @@
  				<Filename>hxplay.desktop</Filename>
  				<Filename>livna-vlc.desktop</Filename>
  				<Filename>miro.desktop</Filename>


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kmenu-gnome/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Aug 2008 12:23:11 -0000	1.1
+++ import.log	20 Sep 2008 14:56:09 -0000	1.2
@@ -1 +1,2 @@
 kmenu-gnome-0_7_3-2_fc8:HEAD:kmenu-gnome-0.7.3-2.fc8.src.rpm:1218802689
+kmenu-gnome-0_7_4-1_fc10:HEAD:kmenu-gnome-0.7.4-1.fc10.src.rpm:1221922157


Index: kmenu-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmenu-gnome/devel/kmenu-gnome.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kmenu-gnome.spec	15 Aug 2008 12:23:11 -0000	1.18
+++ kmenu-gnome.spec	20 Sep 2008 14:56:09 -0000	1.19
@@ -1,8 +1,8 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:       kmenu-gnome
-Version:    0.7.3
-Release:    2%{?dist}
+Version:    0.7.4
+Release:    1%{?dist}
 Summary:    K Menu with Gnome directory
 
 License:    GPLv2
@@ -29,7 +29,7 @@
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
 cp xdg/%{name}.menu %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
-%if 0%{?fedora} == 8
+%if 0%{?fedora} < 9
     # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196275
     cp xdg/fedora-administration.menu \
     %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
@@ -60,7 +60,7 @@
 %files
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/%{name}.menu
-%if 0%{?fedora} == 8
+%if 0%{?fedora} < 9
     %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/fedora-administration.menu
 %endif
 %{_datadir}/%{name}/
@@ -70,6 +70,12 @@
 %doc ChangeLog COPYING GPL LGPL README
 
 %Changelog
+* Mon Sep 15 2008 Ariszlo <ariszlo at gmail.com> - 0.7.4-1
+- release 0.7.4
+
+* Thu Aug 28 2008 Ariszlo <ariszlo at gmail.com> - 0.7.3-3
+- Replaced '== 8' with '< 9'
+
 * Fri Aug 15 2008 Chitlesh Goorah <chitlesh at fedoraproject.org>- 0.7.3-2
 - merged F8 and F9 spec files
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmenu-gnome/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	15 Aug 2008 12:23:11 -0000	1.16
+++ sources	20 Sep 2008 14:56:09 -0000	1.17
@@ -1 +1 @@
-2ac93ba31eb32dce0f0472cb12b37bba  31025-kmenu-gnome-0.7.3.tar.gz
+61b4171210067598b4a3076ebf48ff46  31025-kmenu-gnome-0.7.4.tar.gz



From mnowak at fedoraproject.org  Sat Sep 20 15:08:27 2008
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Sat, 20 Sep 2008 15:08:27 +0000 (UTC)
Subject: rpms/python-libgmail-docs/F-8 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2
Message-ID: <20080920150827.65780700F8@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/python-libgmail-docs/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28953/F-8

Modified Files:
	.cvsignore 
Added Files:
	import.log 
Log Message:
Fedora 8 initial



--- NEW FILE import.log ---
python-libgmail-docs-0_3-6_fc9:F-8:python-libgmail-docs-0.3-6.fc9.src.rpm:1221923221


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-libgmail-docs/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Jan 2008 04:45:56 -0000	1.1
+++ .cvsignore	20 Sep 2008 15:07:57 -0000	1.2
@@ -0,0 +1 @@
+libgmail-docs_0.3.tgz



From mnowak at fedoraproject.org  Sat Sep 20 16:11:29 2008
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Sat, 20 Sep 2008 16:11:29 +0000 (UTC)
Subject: rpms/eclipse-pydev/F-8 .cvsignore, 1.8, 1.9 eclipse-pydev.spec, 1.10,
	1.11 import.log, 1.1, 1.2 sources, 1.8, 1.9
Message-ID: <20080920161129.42322700F8@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/eclipse-pydev/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31109/F-8

Modified Files:
	.cvsignore eclipse-pydev.spec import.log sources 
Log Message:
rebuild for bodhi update problem (ticket #235)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/F-8/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 Sep 2008 07:31:54 -0000	1.8
+++ .cvsignore	20 Sep 2008 16:10:58 -0000	1.9
@@ -1,2 +1,2 @@
-org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
 org.python.pydev.feature-src-1_3_20.zip
+org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/F-8/eclipse-pydev.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- eclipse-pydev.spec	13 Sep 2008 09:33:04 -0000	1.10
+++ eclipse-pydev.spec	20 Sep 2008 16:10:58 -0000	1.11
@@ -16,7 +16,7 @@
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
 Version:          %{major}.%{minor}.%{maint}
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          EPL
 URL:              http://pydev.sourceforge.net
 Group:            Development/Tools
@@ -231,6 +231,10 @@
 %endif
 
 %changelog
+* Sat Sep 20 2008 Michal Nowak <mnowak at redhat.com> 1:1.3.20-2
+- rebuild to get rid of bodhi update filling problem (ticket #235)
+  https://fedorahosted.org/bodhi/ticket/235
+
 * Tue Aug 30 2008 Michal Nowak <mnowak at redhat.com> 1:1.3.20-1
 - bump to 1.3.20
 - fixed license tag


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/F-8/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Sep 2008 07:31:54 -0000	1.1
+++ import.log	20 Sep 2008 16:10:58 -0000	1.2
@@ -1 +1,2 @@
 eclipse-pydev-1_3_20-1_fc9:F-8:eclipse-pydev-1.3.20-1.fc9.src.rpm:1221636673
+eclipse-pydev-1_3_20-2_fc9:F-8:eclipse-pydev-1.3.20-2.fc9.src.rpm:1221926959


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/F-8/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	17 Sep 2008 07:31:54 -0000	1.8
+++ sources	20 Sep 2008 16:10:58 -0000	1.9
@@ -1,2 +1,2 @@
-3a42402df10a42af0a8d648711c36239  org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
 9f9432cc41a797b27aa93755233336a3  org.python.pydev.feature-src-1_3_20.zip
+3a42402df10a42af0a8d648711c36239  org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2



From mnowak at fedoraproject.org  Sat Sep 20 16:44:21 2008
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Sat, 20 Sep 2008 16:44:21 +0000 (UTC)
Subject: rpms/python-libgmail-docs/EL-4 python-libgmail-docs.spec,1.1,1.2
Message-ID: <20080920164421.850E4700F8@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/python-libgmail-docs/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32618

Modified Files:
	python-libgmail-docs.spec 
Log Message:
- it's not necessary to exclude *.py[co] files on EL-4, because
  they do not exists




Index: python-libgmail-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-libgmail-docs/EL-4/python-libgmail-docs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-libgmail-docs.spec	28 Jan 2008 05:00:58 -0000	1.1
+++ python-libgmail-docs.spec	20 Sep 2008 16:43:51 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           python-libgmail-docs
 Version:        0.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Documents and examples for python-libgmail
 
 Group:          Documentation
@@ -49,9 +49,12 @@
 %defattr(-,root,root,-)
 %doc %{_docdir}/python-%{projectname}-%{projectversion}/API
 %doc %{_docdir}/python-%{projectname}-%{projectversion}/examples
-%exclude %{_docdir}/python-%{projectname}-%{projectversion}/examples/*.py[co]
 
 %changelog
+* Sat Sep 20 2008 Michal Nowak <mnowak at redhat.com> - 0.3-7
+- it's not necessary to exclude *.py[co] files on EL-4, because
+  they do not exists
+
 * Sun Jan 27 2008 Michael Stahnke <mastahnke at gmail.com> - 0.3-6
 - Excluded *.pyc *.pyo in %%doc
 



From kkofler at fedoraproject.org  Sat Sep 20 17:02:14 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 20 Sep 2008 17:02:14 +0000 (UTC)
Subject: rpms/qt3/devel qt3.spec,1.5,1.6
Message-ID: <20080920170214.38ACD700F8@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1106/devel

Modified Files:
	qt3.spec 
Log Message:
* Sat Sep 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.3.8b-15
- set _default_patch_fuzz (fixes FTBFS)


Index: qt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt3/devel/qt3.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qt3.spec	7 Jul 2008 19:44:46 -0000	1.5
+++ qt3.spec	20 Sep 2008 17:01:43 -0000	1.6
@@ -1,6 +1,8 @@
+%define _default_patch_fuzz 2
+
 Summary: The shared library for the Qt 3 GUI toolkit
 Version: 3.3.8b
-Release: 14%{?dist}
+Release: 15%{?dist}
 %if 0%{?fedora} > 8
 Name: qt3
 Obsoletes: qt < 1:%{version}-%{release}
@@ -643,6 +645,9 @@
 
 
 %changelog
+* Sat Sep 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.3.8b-15
+- set _default_patch_fuzz (fixes FTBFS)
+
 * Mon Jul 07 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.3.8b-14
 - QTDIR isn't set in ppc64 buildroot (#454313)
 - /etc/profile.d/qt.sh leaks variable ARCH (#454260)



From pertusus at fedoraproject.org  Sat Sep 20 17:45:15 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Sat, 20 Sep 2008 17:45:15 +0000 (UTC)
Subject: rpms/xbae/devel xbae.spec,1.9,1.10
Message-ID: <20080920174515.4163B700F8@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/xbae/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2739

Modified Files:
	xbae.spec 
Log Message:
* Sat Sep 20 2008 Patrice Dumas <pertusus at free.fr> 4.60.4-10
- use %patch0 instead of %patch (#463002)



Index: xbae.spec
===================================================================
RCS file: /cvs/extras/rpms/xbae/devel/xbae.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xbae.spec	1 Mar 2008 12:48:10 -0000	1.9
+++ xbae.spec	20 Sep 2008 17:44:45 -0000	1.10
@@ -10,7 +10,7 @@
 
 Name:           xbae
 Version:        4.60.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Motif matrix, caption and text input widgets
 Group:          System Environment/Libraries
 # all the files are covered by the MIT license, except DebugUtil.c LGPLv2+
@@ -92,9 +92,15 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 %patch1 -p1 -b .multilib
 
+for file in COPYING ChangeLog NEWS; do
+ iconv -f latin1 -t utf8 < $file > $file.utf8
+ touch -c -r $file $file.utf8
+ mv $file.utf8 $file
+done
+
 
 %build
 %configure --disable-static --disable-dependency-tracking
@@ -139,6 +145,12 @@
 rm __dist_examples/extest
 rm __dist_examples/testall
 
+for file in __dist_examples/*/*.c __dist_examples/README; do
+ iconv -f latin1 -t utf8 < $file > $file.utf8
+ touch -c -r $file $file.utf8
+ mv $file.utf8 $file
+done
+
 # the builderXcessory directory is duplicated in the main doc and in the
 # example code. The master dir is considered to be in the main doc.
 # the README is better with the main examples doc, not in code examples
@@ -177,6 +189,9 @@
 
 
 %changelog
+* Sat Sep 20 2008 Patrice Dumas <pertusus at free.fr> 4.60.4-10
+- use %%patch0 instead of %%patch (#463002)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 4.60.4-9
 - Autorebuild for GCC 4.3
 



From mtasaka at fedoraproject.org  Sat Sep 20 17:45:37 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 20 Sep 2008 17:45:37 +0000 (UTC)
Subject: rpms/ochusha/F-8 ochusha-0.5.99.66-cvs070110-suka-pontan.patch, NONE,
	1.1 ochusha.spec, 1.44, 1.45
Message-ID: <20080920174537.6E7DB700F8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2796/F-8

Modified Files:
	ochusha.spec 
Added Files:
	ochusha-0.5.99.66-cvs070110-suka-pontan.patch 
Log Message:
add suka pontan patch

ochusha-0.5.99.66-cvs070110-suka-pontan.patch:

--- NEW FILE ochusha-0.5.99.66-cvs070110-suka-pontan.patch ---
--- ochusha-0.5.99.66-cvs070110/libochusha/bbs_2ch_utils.cc.sukapontan	2007-01-04 15:30:19.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/libochusha/bbs_2ch_utils.cc	2008-09-21 02:31:03.000000000 +0900
@@ -807,7 +807,9 @@
     mailto(NULL),
     message(NULL),
     be_id(NULL),
-    viewer_id(NULL)
+    viewer_id(NULL),
+    cookie_type_hana(NULL),
+    cookie_value_mogera(NULL)
 {
   const char *date = thread->get_date();
   if (date != NULL)
@@ -964,6 +966,18 @@
 	      LIB_("Post terminated.  It isn't clear whether posting accepted or not."));
 }
 
+void
+PostResponseAgent2ch::set_cookie_typevalue(const char *type, const char *value)
+{
+	if (type && *type && value && *value){
+		free(cookie_type_hana);
+		free(cookie_value_mogera);
+		cookie_type_hana = strdup(type);
+		cookie_value_mogera = strdup(value);
+	}
+}
+
+#define COOKIE_STR_LEN 1024
 
 void
 PostResponseAgent2ch::do_post(const char *kakikomu)
@@ -1011,6 +1025,15 @@
     {
       query_len *= 2;
       char *tmp_buf = static_cast<char *>(realloc(query, query_len));
+      static char cookie_str[COOKIE_STR_LEN] = "";
+
+      if (cookie_type_hana && *cookie_type_hana &&
+		cookie_value_mogera && *cookie_value_mogera ){
+		snprintf(cookie_str, COOKIE_STR_LEN - 1, "&%s=%s",
+			cookie_type_hana, cookie_value_mogera);
+	}
+
+
       if (tmp_buf == NULL)
 	{
 	  post_failed(this, LIB_("Out of Memory"));
@@ -1022,14 +1045,18 @@
       if (viewer_id != NULL)
 	result = snprintf(query, query_len,
 			  "submit=%s&FROM=%s&mail=%s&MESSAGE=%s&bbs=%s&key=%s"
+                          "%s"
 			  "&sid=%s&time=%lu&hana=mogera",
 			  kakikomu, name, mailto, message, bbs, key,
+                          cookie_str,
 			  viewer_id, utc_time);
       else
 	result = snprintf(query, query_len,
 			  "submit=%s&FROM=%s&mail=%s&MESSAGE=%s&bbs=%s&key=%s"
+                          "%s"
 			  "&time=%lu&hana=mogera",
 			  kakikomu, name, mailto, message, bbs, key,
+                          cookie_str,
 			  utc_time);
     }
   while (result >= query_len);
--- ochusha-0.5.99.66-cvs070110/libochusha/bbs_2ch_utils.h.sukapontan	2007-01-01 12:17:25.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/libochusha/bbs_2ch_utils.h	2008-09-21 00:56:18.000000000 +0900
@@ -146,6 +146,9 @@
     char *be_id;
     char *viewer_id;
 
+    // 2ch cookie????(hana=mogera????
+    char *cookie_type_hana;
+    char *cookie_value_mogera;
  
     void do_post(const char *kakikomu);
 
@@ -167,6 +170,10 @@
 
     virtual void set_2ch_be_session_id(const char *id);
     virtual void set_2ch_viewer_session_id(const char *id);
+
+    // 2ch??cookie????(hana=mogera??)??????
+    virtual void set_cookie_typevalue(const char *type, const char *value);
+
   };
 
 
--- ochusha-0.5.99.66-cvs070110/libochusha/bbs_jbbs_utils.h.sukapontan	2007-01-01 12:17:25.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/libochusha/bbs_jbbs_utils.h	2008-09-21 01:28:47.000000000 +0900
@@ -126,6 +126,8 @@
     virtual void try_post(const char *name, const char *mailto,
 			  const char *message);
     virtual void retry_post(const char *submit, time_t utc_time);
+    // jbbs????????????
+    virtual void set_cookie_typevalue(const char *type, const char *value) {};
   };
 
 
--- ochusha-0.5.99.66-cvs070110/libochusha/bbs_thread.h.sukapontan	2007-01-01 12:17:25.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/libochusha/bbs_thread.h	2008-09-21 01:19:19.000000000 +0900
@@ -532,6 +532,9 @@
     // ??????????????????????????????????????
     virtual void retry_post(const char *submit, time_t utc_time) = 0;
 
+    // 2ch??cookie????(hana=mogera??)??????
+    virtual void set_cookie_typevalue(const char *type, const char *value) = 0;
+
     // ??????????????????????????????????????
     virtual void set_2ch_be_session_id(const char *id);
     virtual void set_2ch_viewer_session_id(const char *id);
--- ochusha-0.5.99.66-cvs070110/ochusha/post_ui.cc.sukapontan	2007-01-10 19:14:37.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/ochusha/post_ui.cc	2008-09-21 02:33:04.000000000 +0900
@@ -37,6 +37,7 @@
 
 #include "libochusha/misc_utils.h"
 #include "libochusha/repository.h"
+#include "libochusha/bbs_2ch_utils.h"
 
 #include "controller.h"
 #include "html_renderer.h"
@@ -293,7 +294,9 @@
     thread(thread),
     result_window(NULL),
     result_window_destroy_id(0),
-    ensure_sage_on_idle_id(0)
+    ensure_sage_on_idle_id(0),
+    cookie_type(NULL),
+    cookie_value(NULL)
 {
   g_signal_connect(post_action, "activate",
 		   reinterpret_cast<GCallback>(post_activate_cb), this);
@@ -756,12 +759,44 @@
     fprintf(stderr, "Post failed by: %s\n", reason);
 }
 
+void
+ResponseEditor::find_cookie_typevalue( const char *response )
+{
+	char *str_cmp, *str;
+
+	str_cmp = "<input type=hidden name=\"";
+	str = strstr(response, str_cmp);
+	if (str){
+		char *str2 = strstr(str, "\"");
+		char *str3 = NULL;
+		str2++;
+		if ((!cookie_type) || (!(strstr(str2, cookie_type)))){
+			free(cookie_type);
+			free(cookie_value);
+
+			cookie_type = strdup(str2);
+			str3 = strstr(cookie_type, "\"");
+			*str3 = 0;
+
+			str = str2;
+			str2 = strstr(str, "value=\"");
+			str = str2;
+			str2 = strstr(str, "\"");
+			str2++;
+			cookie_value = strdup(str2);
+			str3 = strstr(cookie_value, "\"");
+			*str3 = 0;
+		}
+	}
+}
 
 void
 ResponseEditor::check_cookie_cb(PostResponseAgent *agent, const char *message)
 {
   if (message != NULL && strcasestr(message, "<html>") != NULL)
     {
+      find_cookie_typevalue(message);
+      agent->set_cookie_typevalue(cookie_type, cookie_value);
       gdk_threads_enter();
 
       if (result_window != NULL)
--- ochusha-0.5.99.66-cvs070110/ochusha/post_ui.h.sukapontan	2007-01-01 12:18:25.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/ochusha/post_ui.h	2008-09-21 01:42:06.000000000 +0900
@@ -101,10 +101,14 @@
     void post_failed_cb(PostResponseAgent *agent, const char *reason);
     void check_cookie_cb(PostResponseAgent *agent, const char *message);
 
+    // cookie????(hana=mogera??????parse
+    void find_cookie_typevalue( const char *response );
 
   protected:
     virtual void notify_post_finished();
 
+    char *cookie_type;
+    char *cookie_value;
 
   public:
     ResponseEditor(Controller &controller, BBSThread *thread = NULL);


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/F-8/ochusha.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ochusha.spec	21 Aug 2007 18:37:07 -0000	1.44
+++ ochusha.spec	20 Sep 2008 17:45:07 -0000	1.45
@@ -4,11 +4,11 @@
 %define              main_ver        0.5.99.66
 %define              strtag          cvs070110
 
-%define              vendor_rel      2
+%define              vendor_rel      6
 %define              pre_release     1
 
 %if %{pre_release}
-%define              rel             0.%{vendor_rel}.%{strtag}%{?dist}.2
+%define              rel             0.%{vendor_rel}.%{strtag}%{?dist}
 %else
 %define              rel             %{vendor_rel}%{?dist}
 %endif
@@ -16,7 +16,7 @@
 Summary:             A GTK+ 2ch.net BBS Browser
 Name:                ochusha
 Version:             %{main_ver}
-Release:             %{rel}
+Release:             %{rel}.1
 URL:                 http://ochusha.sourceforge.jp/
 %if %{pre_release}
 Source:              %{name}-%{main_ver}-%{strtag}.tar.bz2
@@ -24,12 +24,19 @@
 Source:              http://keihanna.dl.sourceforge.jp/ochusha/16560/%{name}-%{version}.tar.bz2
 %endif
 Patch0:              ochusha-0.5.99.66-cvs070110-disable-lock-check.patch
+Patch1:              ochusha-0.5.99.66-cvs070110-g++43-missing-headers.patch
+Patch2:              ochusha-0.5.99.66-cvs070110-suka-pontan.patch
 License:             BSD
 Group:               Applications/Internet
 BuildRoot:           %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} >= 10
+Requires:            mona-fonts-VLGothic
+%else
 Requires:            fonts-japanese
+%endif
 Requires:            %{system_ca_cert_file}
+Requires:            xdg-utils
 
 BuildRequires:       libtool
 BuildRequires:       gettext
@@ -54,12 +61,14 @@
 %setup -q
 %endif
 %patch0 -p1 -b .lock
+%patch1 -p1 -b .gcc43
+%patch2 -p1 -b .sukapontan
 
 # change desktop entry to use png file at %%{icondir}.
 %{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' ochusha/ochusha.desktop.in
 
 # set htmlview as a default browser
-%{__sed} -i -e 's|firefox|htmlview|' ochusha/preferences.cc
+%{__sed} -i -e 's|firefox|xdg-open|' ochusha/preferences.cc
 
 %build
 sh autogen.sh
@@ -100,6 +109,8 @@
 
 # install desktop file and delete original
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
+%{__sed} -i -e 's|ochusha48\.png|ochusha48|' \
+      %{buildroot}%{_datadir}/ochusha/%{name}.desktop
 desktop-file-install \
       --delete-original \
       --vendor fedora \
@@ -157,6 +168,24 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
+* Sun Sep 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - ochusha-0.5.99.66-0.6.cvs070110
+- Patch to deal with occational cookie change
+
+* Mon Jul 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - ochusha-0.5.99.66-0.5.cvs070110
+- Change Japanese fonts Requires (F-10+)
+
+* Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Rebuild against gcc43
+
+* Sun Jan  6 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.5.99.66-0.4.cvs070110
+- Misc fixes for g++43.
+
+* Wed Dec  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.5.99.66-0.3.cvs070110
+- Fix icon path in desktop file for desktop-file-utils 0.14+
+
+* Tue Dec  4 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.5.99.66-0.2.cvs070110.dist.3
+- Rebuild for new openssl (on rawhide)
+
 * Wed Apr 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.5.99.66-0.2.cvs070110.dist.2
 - Mass rebuild (buildID or binutils issue)
 



From mtasaka at fedoraproject.org  Sat Sep 20 17:45:37 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 20 Sep 2008 17:45:37 +0000 (UTC)
Subject: rpms/ochusha/F-9 ochusha-0.5.99.66-cvs070110-suka-pontan.patch, NONE,
	1.1 ochusha.spec, 1.48, 1.49
Message-ID: <20080920174537.A3DF9700F8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2796/F-9

Modified Files:
	ochusha.spec 
Added Files:
	ochusha-0.5.99.66-cvs070110-suka-pontan.patch 
Log Message:
add suka pontan patch

ochusha-0.5.99.66-cvs070110-suka-pontan.patch:

--- NEW FILE ochusha-0.5.99.66-cvs070110-suka-pontan.patch ---
--- ochusha-0.5.99.66-cvs070110/libochusha/bbs_2ch_utils.cc.sukapontan	2007-01-04 15:30:19.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/libochusha/bbs_2ch_utils.cc	2008-09-21 02:31:03.000000000 +0900
@@ -807,7 +807,9 @@
     mailto(NULL),
     message(NULL),
     be_id(NULL),
-    viewer_id(NULL)
+    viewer_id(NULL),
+    cookie_type_hana(NULL),
+    cookie_value_mogera(NULL)
 {
   const char *date = thread->get_date();
   if (date != NULL)
@@ -964,6 +966,18 @@
 	      LIB_("Post terminated.  It isn't clear whether posting accepted or not."));
 }
 
+void
+PostResponseAgent2ch::set_cookie_typevalue(const char *type, const char *value)
+{
+	if (type && *type && value && *value){
+		free(cookie_type_hana);
+		free(cookie_value_mogera);
+		cookie_type_hana = strdup(type);
+		cookie_value_mogera = strdup(value);
+	}
+}
+
+#define COOKIE_STR_LEN 1024
 
 void
 PostResponseAgent2ch::do_post(const char *kakikomu)
@@ -1011,6 +1025,15 @@
     {
       query_len *= 2;
       char *tmp_buf = static_cast<char *>(realloc(query, query_len));
+      static char cookie_str[COOKIE_STR_LEN] = "";
+
+      if (cookie_type_hana && *cookie_type_hana &&
+		cookie_value_mogera && *cookie_value_mogera ){
+		snprintf(cookie_str, COOKIE_STR_LEN - 1, "&%s=%s",
+			cookie_type_hana, cookie_value_mogera);
+	}
+
+
       if (tmp_buf == NULL)
 	{
 	  post_failed(this, LIB_("Out of Memory"));
@@ -1022,14 +1045,18 @@
       if (viewer_id != NULL)
 	result = snprintf(query, query_len,
 			  "submit=%s&FROM=%s&mail=%s&MESSAGE=%s&bbs=%s&key=%s"
+                          "%s"
 			  "&sid=%s&time=%lu&hana=mogera",
 			  kakikomu, name, mailto, message, bbs, key,
+                          cookie_str,
 			  viewer_id, utc_time);
       else
 	result = snprintf(query, query_len,
 			  "submit=%s&FROM=%s&mail=%s&MESSAGE=%s&bbs=%s&key=%s"
+                          "%s"
 			  "&time=%lu&hana=mogera",
 			  kakikomu, name, mailto, message, bbs, key,
+                          cookie_str,
 			  utc_time);
     }
   while (result >= query_len);
--- ochusha-0.5.99.66-cvs070110/libochusha/bbs_2ch_utils.h.sukapontan	2007-01-01 12:17:25.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/libochusha/bbs_2ch_utils.h	2008-09-21 00:56:18.000000000 +0900
@@ -146,6 +146,9 @@
     char *be_id;
     char *viewer_id;
 
+    // 2ch cookie????(hana=mogera????
+    char *cookie_type_hana;
+    char *cookie_value_mogera;
  
     void do_post(const char *kakikomu);
 
@@ -167,6 +170,10 @@
 
     virtual void set_2ch_be_session_id(const char *id);
     virtual void set_2ch_viewer_session_id(const char *id);
+
+    // 2ch??cookie????(hana=mogera??)??????
+    virtual void set_cookie_typevalue(const char *type, const char *value);
+
   };
 
 
--- ochusha-0.5.99.66-cvs070110/libochusha/bbs_jbbs_utils.h.sukapontan	2007-01-01 12:17:25.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/libochusha/bbs_jbbs_utils.h	2008-09-21 01:28:47.000000000 +0900
@@ -126,6 +126,8 @@
     virtual void try_post(const char *name, const char *mailto,
 			  const char *message);
     virtual void retry_post(const char *submit, time_t utc_time);
+    // jbbs????????????
+    virtual void set_cookie_typevalue(const char *type, const char *value) {};
   };
 
 
--- ochusha-0.5.99.66-cvs070110/libochusha/bbs_thread.h.sukapontan	2007-01-01 12:17:25.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/libochusha/bbs_thread.h	2008-09-21 01:19:19.000000000 +0900
@@ -532,6 +532,9 @@
     // ??????????????????????????????????????
     virtual void retry_post(const char *submit, time_t utc_time) = 0;
 
+    // 2ch??cookie????(hana=mogera??)??????
+    virtual void set_cookie_typevalue(const char *type, const char *value) = 0;
+
     // ??????????????????????????????????????
     virtual void set_2ch_be_session_id(const char *id);
     virtual void set_2ch_viewer_session_id(const char *id);
--- ochusha-0.5.99.66-cvs070110/ochusha/post_ui.cc.sukapontan	2007-01-10 19:14:37.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/ochusha/post_ui.cc	2008-09-21 02:33:04.000000000 +0900
@@ -37,6 +37,7 @@
 
 #include "libochusha/misc_utils.h"
 #include "libochusha/repository.h"
+#include "libochusha/bbs_2ch_utils.h"
 
 #include "controller.h"
 #include "html_renderer.h"
@@ -293,7 +294,9 @@
     thread(thread),
     result_window(NULL),
     result_window_destroy_id(0),
-    ensure_sage_on_idle_id(0)
+    ensure_sage_on_idle_id(0),
+    cookie_type(NULL),
+    cookie_value(NULL)
 {
   g_signal_connect(post_action, "activate",
 		   reinterpret_cast<GCallback>(post_activate_cb), this);
@@ -756,12 +759,44 @@
     fprintf(stderr, "Post failed by: %s\n", reason);
 }
 
+void
+ResponseEditor::find_cookie_typevalue( const char *response )
+{
+	char *str_cmp, *str;
+
+	str_cmp = "<input type=hidden name=\"";
+	str = strstr(response, str_cmp);
+	if (str){
+		char *str2 = strstr(str, "\"");
+		char *str3 = NULL;
+		str2++;
+		if ((!cookie_type) || (!(strstr(str2, cookie_type)))){
+			free(cookie_type);
+			free(cookie_value);
+
+			cookie_type = strdup(str2);
+			str3 = strstr(cookie_type, "\"");
+			*str3 = 0;
+
+			str = str2;
+			str2 = strstr(str, "value=\"");
+			str = str2;
+			str2 = strstr(str, "\"");
+			str2++;
+			cookie_value = strdup(str2);
+			str3 = strstr(cookie_value, "\"");
+			*str3 = 0;
+		}
+	}
+}
 
 void
 ResponseEditor::check_cookie_cb(PostResponseAgent *agent, const char *message)
 {
   if (message != NULL && strcasestr(message, "<html>") != NULL)
     {
+      find_cookie_typevalue(message);
+      agent->set_cookie_typevalue(cookie_type, cookie_value);
       gdk_threads_enter();
 
       if (result_window != NULL)
--- ochusha-0.5.99.66-cvs070110/ochusha/post_ui.h.sukapontan	2007-01-01 12:18:25.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/ochusha/post_ui.h	2008-09-21 01:42:06.000000000 +0900
@@ -101,10 +101,14 @@
     void post_failed_cb(PostResponseAgent *agent, const char *reason);
     void check_cookie_cb(PostResponseAgent *agent, const char *message);
 
+    // cookie????(hana=mogera??????parse
+    void find_cookie_typevalue( const char *response );
 
   protected:
     virtual void notify_post_finished();
 
+    char *cookie_type;
+    char *cookie_value;
 
   public:
     ResponseEditor(Controller &controller, BBSThread *thread = NULL);


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/F-9/ochusha.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ochusha.spec	9 Feb 2008 04:21:47 -0000	1.48
+++ ochusha.spec	20 Sep 2008 17:45:07 -0000	1.49
@@ -4,7 +4,7 @@
 %define              main_ver        0.5.99.66
 %define              strtag          cvs070110
 
-%define              vendor_rel      4
+%define              vendor_rel      6
 %define              pre_release     1
 
 %if %{pre_release}
@@ -16,7 +16,7 @@
 Summary:             A GTK+ 2ch.net BBS Browser
 Name:                ochusha
 Version:             %{main_ver}
-Release:             %{rel}.2
+Release:             %{rel}.1
 URL:                 http://ochusha.sourceforge.jp/
 %if %{pre_release}
 Source:              %{name}-%{main_ver}-%{strtag}.tar.bz2
@@ -25,11 +25,16 @@
 %endif
 Patch0:              ochusha-0.5.99.66-cvs070110-disable-lock-check.patch
 Patch1:              ochusha-0.5.99.66-cvs070110-g++43-missing-headers.patch
+Patch2:              ochusha-0.5.99.66-cvs070110-suka-pontan.patch
 License:             BSD
 Group:               Applications/Internet
 BuildRoot:           %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} >= 10
+Requires:            mona-fonts-VLGothic
+%else
 Requires:            fonts-japanese
+%endif
 Requires:            %{system_ca_cert_file}
 Requires:            xdg-utils
 
@@ -57,6 +62,7 @@
 %endif
 %patch0 -p1 -b .lock
 %patch1 -p1 -b .gcc43
+%patch2 -p1 -b .sukapontan
 
 # change desktop entry to use png file at %%{icondir}.
 %{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' ochusha/ochusha.desktop.in
@@ -162,6 +168,12 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
+* Sun Sep 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - ochusha-0.5.99.66-0.6.cvs070110
+- Patch to deal with occational cookie change
+
+* Mon Jul 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - ochusha-0.5.99.66-0.5.cvs070110
+- Change Japanese fonts Requires (F-10+)
+
 * Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Rebuild against gcc43
 



From mtasaka at fedoraproject.org  Sat Sep 20 17:45:37 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 20 Sep 2008 17:45:37 +0000 (UTC)
Subject: rpms/ochusha/devel ochusha-0.5.99.66-cvs070110-suka-pontan.patch,
	NONE, 1.1 ochusha.spec, 1.51, 1.52
Message-ID: <20080920174537.DEA81700F8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2796/devel

Modified Files:
	ochusha.spec 
Added Files:
	ochusha-0.5.99.66-cvs070110-suka-pontan.patch 
Log Message:
add suka pontan patch

ochusha-0.5.99.66-cvs070110-suka-pontan.patch:

--- NEW FILE ochusha-0.5.99.66-cvs070110-suka-pontan.patch ---
--- ochusha-0.5.99.66-cvs070110/libochusha/bbs_2ch_utils.cc.sukapontan	2007-01-04 15:30:19.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/libochusha/bbs_2ch_utils.cc	2008-09-21 02:31:03.000000000 +0900
@@ -807,7 +807,9 @@
     mailto(NULL),
     message(NULL),
     be_id(NULL),
-    viewer_id(NULL)
+    viewer_id(NULL),
+    cookie_type_hana(NULL),
+    cookie_value_mogera(NULL)
 {
   const char *date = thread->get_date();
   if (date != NULL)
@@ -964,6 +966,18 @@
 	      LIB_("Post terminated.  It isn't clear whether posting accepted or not."));
 }
 
+void
+PostResponseAgent2ch::set_cookie_typevalue(const char *type, const char *value)
+{
+	if (type && *type && value && *value){
+		free(cookie_type_hana);
+		free(cookie_value_mogera);
+		cookie_type_hana = strdup(type);
+		cookie_value_mogera = strdup(value);
+	}
+}
+
+#define COOKIE_STR_LEN 1024
 
 void
 PostResponseAgent2ch::do_post(const char *kakikomu)
@@ -1011,6 +1025,15 @@
     {
       query_len *= 2;
       char *tmp_buf = static_cast<char *>(realloc(query, query_len));
+      static char cookie_str[COOKIE_STR_LEN] = "";
+
+      if (cookie_type_hana && *cookie_type_hana &&
+		cookie_value_mogera && *cookie_value_mogera ){
+		snprintf(cookie_str, COOKIE_STR_LEN - 1, "&%s=%s",
+			cookie_type_hana, cookie_value_mogera);
+	}
+
+
       if (tmp_buf == NULL)
 	{
 	  post_failed(this, LIB_("Out of Memory"));
@@ -1022,14 +1045,18 @@
       if (viewer_id != NULL)
 	result = snprintf(query, query_len,
 			  "submit=%s&FROM=%s&mail=%s&MESSAGE=%s&bbs=%s&key=%s"
+                          "%s"
 			  "&sid=%s&time=%lu&hana=mogera",
 			  kakikomu, name, mailto, message, bbs, key,
+                          cookie_str,
 			  viewer_id, utc_time);
       else
 	result = snprintf(query, query_len,
 			  "submit=%s&FROM=%s&mail=%s&MESSAGE=%s&bbs=%s&key=%s"
+                          "%s"
 			  "&time=%lu&hana=mogera",
 			  kakikomu, name, mailto, message, bbs, key,
+                          cookie_str,
 			  utc_time);
     }
   while (result >= query_len);
--- ochusha-0.5.99.66-cvs070110/libochusha/bbs_2ch_utils.h.sukapontan	2007-01-01 12:17:25.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/libochusha/bbs_2ch_utils.h	2008-09-21 00:56:18.000000000 +0900
@@ -146,6 +146,9 @@
     char *be_id;
     char *viewer_id;
 
+    // 2ch cookie????(hana=mogera????
+    char *cookie_type_hana;
+    char *cookie_value_mogera;
  
     void do_post(const char *kakikomu);
 
@@ -167,6 +170,10 @@
 
     virtual void set_2ch_be_session_id(const char *id);
     virtual void set_2ch_viewer_session_id(const char *id);
+
+    // 2ch??cookie????(hana=mogera??)??????
+    virtual void set_cookie_typevalue(const char *type, const char *value);
+
   };
 
 
--- ochusha-0.5.99.66-cvs070110/libochusha/bbs_jbbs_utils.h.sukapontan	2007-01-01 12:17:25.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/libochusha/bbs_jbbs_utils.h	2008-09-21 01:28:47.000000000 +0900
@@ -126,6 +126,8 @@
     virtual void try_post(const char *name, const char *mailto,
 			  const char *message);
     virtual void retry_post(const char *submit, time_t utc_time);
+    // jbbs????????????
+    virtual void set_cookie_typevalue(const char *type, const char *value) {};
   };
 
 
--- ochusha-0.5.99.66-cvs070110/libochusha/bbs_thread.h.sukapontan	2007-01-01 12:17:25.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/libochusha/bbs_thread.h	2008-09-21 01:19:19.000000000 +0900
@@ -532,6 +532,9 @@
     // ??????????????????????????????????????
     virtual void retry_post(const char *submit, time_t utc_time) = 0;
 
+    // 2ch??cookie????(hana=mogera??)??????
+    virtual void set_cookie_typevalue(const char *type, const char *value) = 0;
+
     // ??????????????????????????????????????
     virtual void set_2ch_be_session_id(const char *id);
     virtual void set_2ch_viewer_session_id(const char *id);
--- ochusha-0.5.99.66-cvs070110/ochusha/post_ui.cc.sukapontan	2007-01-10 19:14:37.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/ochusha/post_ui.cc	2008-09-21 02:33:04.000000000 +0900
@@ -37,6 +37,7 @@
 
 #include "libochusha/misc_utils.h"
 #include "libochusha/repository.h"
+#include "libochusha/bbs_2ch_utils.h"
 
 #include "controller.h"
 #include "html_renderer.h"
@@ -293,7 +294,9 @@
     thread(thread),
     result_window(NULL),
     result_window_destroy_id(0),
-    ensure_sage_on_idle_id(0)
+    ensure_sage_on_idle_id(0),
+    cookie_type(NULL),
+    cookie_value(NULL)
 {
   g_signal_connect(post_action, "activate",
 		   reinterpret_cast<GCallback>(post_activate_cb), this);
@@ -756,12 +759,44 @@
     fprintf(stderr, "Post failed by: %s\n", reason);
 }
 
+void
+ResponseEditor::find_cookie_typevalue( const char *response )
+{
+	char *str_cmp, *str;
+
+	str_cmp = "<input type=hidden name=\"";
+	str = strstr(response, str_cmp);
+	if (str){
+		char *str2 = strstr(str, "\"");
+		char *str3 = NULL;
+		str2++;
+		if ((!cookie_type) || (!(strstr(str2, cookie_type)))){
+			free(cookie_type);
+			free(cookie_value);
+
+			cookie_type = strdup(str2);
+			str3 = strstr(cookie_type, "\"");
+			*str3 = 0;
+
+			str = str2;
+			str2 = strstr(str, "value=\"");
+			str = str2;
+			str2 = strstr(str, "\"");
+			str2++;
+			cookie_value = strdup(str2);
+			str3 = strstr(cookie_value, "\"");
+			*str3 = 0;
+		}
+	}
+}
 
 void
 ResponseEditor::check_cookie_cb(PostResponseAgent *agent, const char *message)
 {
   if (message != NULL && strcasestr(message, "<html>") != NULL)
     {
+      find_cookie_typevalue(message);
+      agent->set_cookie_typevalue(cookie_type, cookie_value);
       gdk_threads_enter();
 
       if (result_window != NULL)
--- ochusha-0.5.99.66-cvs070110/ochusha/post_ui.h.sukapontan	2007-01-01 12:18:25.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/ochusha/post_ui.h	2008-09-21 01:42:06.000000000 +0900
@@ -101,10 +101,14 @@
     void post_failed_cb(PostResponseAgent *agent, const char *reason);
     void check_cookie_cb(PostResponseAgent *agent, const char *message);
 
+    // cookie????(hana=mogera??????parse
+    void find_cookie_typevalue( const char *response );
 
   protected:
     virtual void notify_post_finished();
 
+    char *cookie_type;
+    char *cookie_value;
 
   public:
     ResponseEditor(Controller &controller, BBSThread *thread = NULL);


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ochusha.spec	28 Jul 2008 10:21:23 -0000	1.51
+++ ochusha.spec	20 Sep 2008 17:45:07 -0000	1.52
@@ -4,7 +4,7 @@
 %define              main_ver        0.5.99.66
 %define              strtag          cvs070110
 
-%define              vendor_rel      5
+%define              vendor_rel      6
 %define              pre_release     1
 
 %if %{pre_release}
@@ -25,12 +25,13 @@
 %endif
 Patch0:              ochusha-0.5.99.66-cvs070110-disable-lock-check.patch
 Patch1:              ochusha-0.5.99.66-cvs070110-g++43-missing-headers.patch
+Patch2:              ochusha-0.5.99.66-cvs070110-suka-pontan.patch
 License:             BSD
 Group:               Applications/Internet
 BuildRoot:           %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora} >= 10
-Requires:            VLGothic-fonts
+Requires:            mona-fonts-VLGothic
 %else
 Requires:            fonts-japanese
 %endif
@@ -61,6 +62,7 @@
 %endif
 %patch0 -p1 -b .lock
 %patch1 -p1 -b .gcc43
+%patch2 -p1 -b .sukapontan
 
 # change desktop entry to use png file at %%{icondir}.
 %{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' ochusha/ochusha.desktop.in
@@ -166,6 +168,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
+* Sun Sep 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - ochusha-0.5.99.66-0.6.cvs070110
+- Patch to deal with occational cookie change
+
 * Mon Jul 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - ochusha-0.5.99.66-0.5.cvs070110
 - Change Japanese fonts Requires (F-10+)
 



From mtasaka at fedoraproject.org  Sat Sep 20 17:52:00 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 20 Sep 2008 17:52:00 +0000 (UTC)
Subject: rpms/ochusha/F-8 ochusha.spec,1.45,1.46
Message-ID: <20080920175200.46FB6700F8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3283/F-8

Modified Files:
	ochusha.spec 
Log Message:
orz


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/F-8/ochusha.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ochusha.spec	20 Sep 2008 17:45:07 -0000	1.45
+++ ochusha.spec	20 Sep 2008 17:51:30 -0000	1.46
@@ -16,7 +16,7 @@
 Summary:             A GTK+ 2ch.net BBS Browser
 Name:                ochusha
 Version:             %{main_ver}
-Release:             %{rel}.1
+Release:             %{rel}
 URL:                 http://ochusha.sourceforge.jp/
 %if %{pre_release}
 Source:              %{name}-%{main_ver}-%{strtag}.tar.bz2



From mtasaka at fedoraproject.org  Sat Sep 20 17:52:00 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 20 Sep 2008 17:52:00 +0000 (UTC)
Subject: rpms/ochusha/F-9 ochusha.spec,1.49,1.50
Message-ID: <20080920175200.6AAA6700F8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3283/F-9

Modified Files:
	ochusha.spec 
Log Message:
orz


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/F-9/ochusha.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ochusha.spec	20 Sep 2008 17:45:07 -0000	1.49
+++ ochusha.spec	20 Sep 2008 17:51:30 -0000	1.50
@@ -16,7 +16,7 @@
 Summary:             A GTK+ 2ch.net BBS Browser
 Name:                ochusha
 Version:             %{main_ver}
-Release:             %{rel}.1
+Release:             %{rel}
 URL:                 http://ochusha.sourceforge.jp/
 %if %{pre_release}
 Source:              %{name}-%{main_ver}-%{strtag}.tar.bz2



From mtasaka at fedoraproject.org  Sat Sep 20 17:52:00 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 20 Sep 2008 17:52:00 +0000 (UTC)
Subject: rpms/ochusha/devel ochusha.spec,1.52,1.53
Message-ID: <20080920175200.A21FC700F8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3283/devel

Modified Files:
	ochusha.spec 
Log Message:
orz


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ochusha.spec	20 Sep 2008 17:45:07 -0000	1.52
+++ ochusha.spec	20 Sep 2008 17:51:30 -0000	1.53
@@ -16,7 +16,7 @@
 Summary:             A GTK+ 2ch.net BBS Browser
 Name:                ochusha
 Version:             %{main_ver}
-Release:             %{rel}.1
+Release:             %{rel}
 URL:                 http://ochusha.sourceforge.jp/
 %if %{pre_release}
 Source:              %{name}-%{main_ver}-%{strtag}.tar.bz2



From mtasaka at fedoraproject.org  Sat Sep 20 17:58:56 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 20 Sep 2008 17:58:56 +0000 (UTC)
Subject: rpms/ochusha/F-8
	ochusha-0.5.99.66-cvs070110-g++43-missing-headers.patch, NONE, 1.1
Message-ID: <20080920175856.245F7700F8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3787

Added Files:
	ochusha-0.5.99.66-cvs070110-g++43-missing-headers.patch 
Log Message:
orz again

ochusha-0.5.99.66-cvs070110-g++43-missing-headers.patch:

--- NEW FILE ochusha-0.5.99.66-cvs070110-g++43-missing-headers.patch ---
--- ochusha-0.5.99.66-cvs070110/libochusha/misc_utils.h.gcc43	2007-01-01 12:17:25.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/libochusha/misc_utils.h	2008-01-04 02:15:18.000000000 +0900
@@ -43,6 +43,8 @@
 
 #include <cstring>
 
+#include <climits>
+#include <cstdlib>
 
 using namespace std;
 namespace Ochusha
--- ochusha-0.5.99.66-cvs070110/libtscore/tscore_procedure.cc.gcc43	2007-01-01 12:17:54.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/libtscore/tscore_procedure.cc	2008-01-04 02:14:44.000000000 +0900
@@ -41,6 +41,7 @@
 #include "libtscore/writer.h"
 
 #include <cstdio>
+#include <climits>
 
 #ifdef HAVE_TIME_H
 #include <time.h>
--- ochusha-0.5.99.66-cvs070110/ochusha/tab_label.cc.gcc43	2007-01-01 12:18:25.000000000 +0900
+++ ochusha-0.5.99.66-cvs070110/ochusha/tab_label.cc	2008-01-04 02:16:54.000000000 +0900
@@ -42,6 +42,7 @@
 
 #include <gtk/gtk.h>
 
+#include <cstring>
 
 namespace Ochusha
 {



From mnowak at fedoraproject.org  Sat Sep 20 20:04:38 2008
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Sat, 20 Sep 2008 20:04:38 +0000 (UTC)
Subject: rpms/python-libgmail-docs/EL-4 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2
Message-ID: <20080920200438.B1A16700F8@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/python-libgmail-docs/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10324/EL-4

Modified Files:
	.cvsignore 
Added Files:
	import.log 
Log Message:
- new package



--- NEW FILE import.log ---
python-libgmail-docs-0_3-7_fc9:EL-4:python-libgmail-docs-0.3-7.fc9.src.rpm:1221940978


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-libgmail-docs/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Jan 2008 04:45:56 -0000	1.1
+++ .cvsignore	20 Sep 2008 20:04:06 -0000	1.2
@@ -0,0 +1 @@
+libgmail-docs_0.3.tgz



From mnowak at fedoraproject.org  Sat Sep 20 21:03:52 2008
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Sat, 20 Sep 2008 21:03:52 +0000 (UTC)
Subject: rpms/python-libgmail-docs/EL-4 import.log, 1.1,
	1.2 python-libgmail-docs.spec, 1.2, 1.3
Message-ID: <20080920210352.C514A700F8@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/python-libgmail-docs/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13089/EL-4

Modified Files:
	import.log python-libgmail-docs.spec 
Log Message:
- new package on EL-4
- changed the way stuff is installed



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-libgmail-docs/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Sep 2008 20:04:06 -0000	1.1
+++ import.log	20 Sep 2008 21:03:22 -0000	1.2
@@ -1 +1,2 @@
 python-libgmail-docs-0_3-7_fc9:EL-4:python-libgmail-docs-0.3-7.fc9.src.rpm:1221940978
+python-libgmail-docs-0_3-8_fc9:EL-4:python-libgmail-docs-0.3-8.fc9.src.rpm:1221944529


Index: python-libgmail-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-libgmail-docs/EL-4/python-libgmail-docs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-libgmail-docs.spec	20 Sep 2008 16:43:51 -0000	1.2
+++ python-libgmail-docs.spec	20 Sep 2008 21:03:22 -0000	1.3
@@ -5,13 +5,13 @@
 
 Name:           python-libgmail-docs
 Version:        0.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Documents and examples for python-libgmail
 
 Group:          Documentation
 License:        GPLv2
 URL:            http://%{projectname}.sourceforge.net
-Source0:        http://dl.sf.net/sourceforge/%{projectname}/%{realname}_%{version}.tgz
+Source0:        http://downloads.sourceforge.net/%{projectname}/%{realname}_%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch 
@@ -24,7 +24,6 @@
 %prep
 %setup -q -n %{realname}_%{version}
 
-chmod -x *.py
 # Fix a dos newline
 sed -i 's/\r//g' readmail.py
 
@@ -33,12 +32,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/python-%{projectname}-%{projectversion}/API
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/python-%{projectname}-%{projectversion}/examples
-install -p -m755 *.py $RPM_BUILD_ROOT%{_docdir}/python-%{projectname}-%{projectversion}/examples
-install -p -m644  README COPYING $RPM_BUILD_ROOT%{_docdir}/python-%{projectname}-%{projectversion}/examples
-cd API
-install -p -m644 * $RPM_BUILD_ROOT%{_docdir}/python-%{projectname}-%{projectversion}/API
+
+install -d -p -m 0755 $RPM_BUILD_ROOT%{_docdir}/python-%{projectname}-%{projectversion}/API
+install -p -m 0644 API/* $RPM_BUILD_ROOT%{_docdir}/python-%{projectname}-%{projectversion}/API
+install -d -p -m 0755 $RPM_BUILD_ROOT%{_docdir}/python-%{projectname}-%{projectversion}/examples
+install -p -m 0644 *.py $RPM_BUILD_ROOT%{_docdir}/python-%{projectname}-%{projectversion}/examples
+install -p -m 0644 README COPYING $RPM_BUILD_ROOT%{_docdir}/python-%{projectname}-%{projectversion}
 
  
 %clean
@@ -49,11 +48,18 @@
 %defattr(-,root,root,-)
 %doc %{_docdir}/python-%{projectname}-%{projectversion}/API
 %doc %{_docdir}/python-%{projectname}-%{projectversion}/examples
+%doc %{_docdir}/python-%{projectname}-%{projectversion}/COPYING
+%doc %{_docdir}/python-%{projectname}-%{projectversion}/README
 
 %changelog
-* Sat Sep 20 2008 Michal Nowak <mnowak at redhat.com> - 0.3-7
+* Sat Sep 20 2008 Michal Nowak <mnowak at redhat.com> - 0.3-8
 - it's not necessary to exclude *.py[co] files on EL-4, because
   they do not exists
+- install also COPYING and README files to "root" doc dir instead of examples/
+- rationalised %%install part--don't have *.py files executable
+
+* Sat Sep 20 2008 Michal Nowak <mnowak at redhat.com> - 0.3-7
+- test build to EL-4
 
 * Sun Jan 27 2008 Michael Stahnke <mastahnke at gmail.com> - 0.3-6
 - Excluded *.pyc *.pyo in %%doc



From airlied at fedoraproject.org  Sat Sep 20 21:57:51 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Sat, 20 Sep 2008 21:57:51 +0000 (UTC)
Subject: rpms/MAKEDEV/devel .cvsignore, 1.53, 1.54 MAKEDEV.spec, 1.61,
	1.62 sources, 1.53, 1.54
Message-ID: <20080920215751.D5D1E700F8@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/MAKEDEV/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15382

Modified Files:
	.cvsignore MAKEDEV.spec sources 
Log Message:
- make it boot faster by renaming a bunch of 00 files into a better order



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/MAKEDEV/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	30 Jul 2008 14:05:01 -0000	1.53
+++ .cvsignore	20 Sep 2008 21:57:21 -0000	1.54
@@ -1,3 +1 @@
-MAKEDEV-3.23-1.tar.gz
-MAKEDEV-3.23-4.tar.gz
-MAKEDEV-3.23-5.tar.gz
+MAKEDEV-3.23-6.tar.gz


Index: MAKEDEV.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MAKEDEV/devel/MAKEDEV.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- MAKEDEV.spec	16 Jun 2008 18:39:16 -0000	1.61
+++ MAKEDEV.spec	20 Sep 2008 21:57:21 -0000	1.62
@@ -1,6 +1,6 @@
 Name: MAKEDEV
 Version: 3.23
-Release: 5
+Release: 6
 Group: System Environment/Base
 License: GPLv2
 # This is a Red Hat maintained package which is specific to
@@ -53,6 +53,9 @@
 %config(noreplace) %{_sysconfdir}/makedev.d
 
 %changelog
+* Fri Sep 19 2008 Dave Airlie <airlied at redhat.com> 3.23-6
+- make it boot faster by renaming a bunch of 00 files into a better order
+
 * Mon Jun 16 2008 Jesse Keating <jkeating at redhat.com> - 3.23-5
 - Make sure we have getent installed for our %pre section.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/MAKEDEV/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	30 Jul 2008 14:05:01 -0000	1.53
+++ sources	20 Sep 2008 21:57:21 -0000	1.54
@@ -1 +1 @@
-c28b593bcc7e14b4df775e7b696aa163  MAKEDEV-3.23-5.tar.gz
+1b59b79315543ab83a97295c316042bc  MAKEDEV-3.23-6.tar.gz



From gilboa at fedoraproject.org  Sat Sep 20 22:03:36 2008
From: gilboa at fedoraproject.org (Gilboa Davara)
Date: Sat, 20 Sep 2008 22:03:36 +0000 (UTC)
Subject: rpms/kdebluetooth/devel .cvsignore, 1.3, 1.4 kdebluetooth.spec, 1.17,
	1.18 sources, 1.3, 1.4
Message-ID: <20080920220336.12ACF700F8@cvs1.fedora.phx.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/kdebluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16060

Modified Files:
	.cvsignore kdebluetooth.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Oct 2007 21:49:54 -0000	1.3
+++ .cvsignore	20 Sep 2008 22:03:05 -0000	1.4
@@ -1 +1 @@
-kdebluetooth-1.0_beta8.tar.bz2
+kdebluetooth4-0.2.tar.bz2


Index: kdebluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/devel/kdebluetooth.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kdebluetooth.spec	11 Sep 2008 18:31:59 -0000	1.17
+++ kdebluetooth.spec	20 Sep 2008 22:03:05 -0000	1.18
@@ -1,87 +1,33 @@
-%define reltype	beta8
-
-# no kdepim3 on f10+
-%if ! 0%{?fedora} > 9
-%define kdepim3 kdepim
-%endif
-
 Summary:		The KDE Bluetooth Framework
 Name:			kdebluetooth
-Version:		1.0 
-Release:		0.43.%{reltype}%{?dist}
+Version:		0.2
+Release:		3%{?dist}
+Epoch:			1
 License:		GPLv2+
 Group:			Applications/Communications
 URL:			http://bluetooth.kmobiletools.org/
-Source0:		http://downloads.sourceforge.net/kde-bluetooth/%{name}-%{version}_%{reltype}.tar.bz2
-Patch0:			%{name}-1.0_beta8-gcc43.patch
+Source0:		http://downloads.sourceforge.net/kde-bluetooth/%{name}4-%{version}.tar.bz2
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gettext
-BuildRequires:	desktop-file-utils
-BuildRequires:	lockdev-devel
-BuildRequires:	xmms-devel
-BuildRequires:	bluez-libs-devel
-BuildRequires:	kdelibs3-devel
-%{?kdepim3:BuildRequires: %{kdepim3}-devel}
-BuildRequires:	openobex-devel >= 1.1
-BuildRequires:	libusb-devel
-BuildRequires:	pkgconfig
-Buildrequires:	libidn-devel
-Buildrequires:	dbus-qt-devel
-BuildRequires:	obexftp-devel
-BuildRequires:	automake >= 1.6.1
-BuildRequires:	autoconf >= 2.52
-Requires:		%{name}-libs = %{version}-%{release}
-Requires:		%{_bindir}/kdesu
+
+BuildRequires:	kdebase-workspace-devel
+BuildRequires:	cmake
+Obsoletes:		%{name}-libs < 1:0.2
+Obsoletes:		%{name}-devel < 1:0.2
 
 
 %description
 The KDE Bluetooth Framework is a set of tools built on top of Linux'
 Bluetooth (Bluez) stack. The goal is to provide easy access to the most
-common Bluetooth profiles and to make data exchange with Bluetooth
+common Bluetooth profiles and to make data exchange with Bluetooth     
 enabled devices as straightforward as possible.
 
 
-%package libs
-Summary: Base libraries for %{name}
-Group:	 System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%if 0%{?fedora} >= 8
-Provides:		dbus-bluez-pin-helper
-%endif
-
-
-%description libs
-KDE Bluetooth framework libraries.
-
-
-%package devel
-Summary: Development files for %{name}
-Group:	 Development/Libraries
-Requires: kdelibs3-devel
-Requires: bluez-libs-devel
-Requires: %{name}-libs = %{version}-%{release}
-
-
-%description devel
-KDE Bluetooth framework development libraries and headers.
-
-
 %prep
-%setup -q -n %{name}-%{version}_%{reltype}
-%patch0 -p1
+%setup -n kdebluetooth4-%{version} -q
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-%configure \
-	--with-bluetooth-libraries=%{_libdir} \
-	--disable-rpath	\
-	--enable-new-ldflags \
-	--disable-debug \
-	--disable-dependency-tracking \
-	--enable-final
-
+%cmake_kde4 -DCMAKE_VERBOSE_MAKEFILE=ON
 make %{?_smp_mflags} 
 
 
@@ -89,26 +35,14 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-for DESK_PATH in applications/kde applnk/Utilities ; do
-	desktop-file-install \
-		--mode=644 \
-		--vendor="" \
-		--dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
-		--remove-category="Network" \
-		--add-category="System"	\
-		--delete-original \
-		$RPM_BUILD_ROOT%{_datadir}/$DESK_PATH/*.desktop ||:
-done
-
-touch %{name}.lang
-PROG_LIST="kbluelock kbluemon kbluetooth kinputwizard
-			kcm_btpaired  kio_bluetooth kio_obex2 kio_sdp
-			libkbluetooth kdebluetooth"
-for PROG in $PROG_LIST ; do
-	%find_lang $PROG && cat $PROG.lang >> %{name}.lang	||:
-done
-
-rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Settings/Network/Bluetooth/.directory
+desktop-file-install						\
+	--mode=644						\
+	--vendor=""						\
+	--dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde4	\
+	--remove-category="Network"				\
+	--add-category="System"					\
+	--delete-original					\
+	$RPM_BUILD_ROOT%{_datadir}/applications/kde4/kdebluetooth4.desktop
 
 
 %clean
@@ -116,71 +50,35 @@
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 
 %postun
-/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL README
-%{_bindir}/kblue*
-%{_bindir}/kbtobexclient
-%{_bindir}/kioobex_start
-%{_bindir}/kinputwizard
-%{_datadir}/applications/kde/*.desktop
-# FIXME
-%{_datadir}/applnk/.hidden/*.desktop
-# FIXME: kde3-only
-%{_datadir}/apps/konqsidebartng/virtual_folders/services/*.desktop
-%{_datadir}/apps/*/*
-%{_datadir}/autostart/*
-%{_datadir}/desktop-directories/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/mimelnk/bluetooth/
-%{_datadir}/service*/*
-%lang(ca) %{_docdir}/HTML/ca/kdebluetooth/
-%lang(da) %{_docdir}/HTML/da/kdebluetooth/
-%lang(en) %{_docdir}/HTML/en/kdebluetooth/
-%lang(es) %{_docdir}/HTML/es/kdebluetooth/
-%lang(et) %{_docdir}/HTML/et/kdebluetooth/
-%lang(fr) %{_docdir}/HTML/fr/kdebluetooth/
-%lang(it) %{_docdir}/HTML/it/kdebluetooth/
-%lang(nl) %{_docdir}/HTML/nl/kdebluetooth/
-%lang(pt) %{_docdir}/HTML/pt/kdebluetooth/
-%lang(ru) %{_docdir}/HTML/ru/kdebluetooth/
-%lang(sv) %{_docdir}/HTML/sv/kdebluetooth/
-
-
-%files libs
+%files
 %defattr(-,root,root,-)
-%{_libdir}/*.la
-%{_libdir}/*.so.*
-%{_libdir}/kde3/*.so
-%{_libdir}/kde3/*.la
-%{_libdir}/kdebluetooth/
-
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/*.so
+%doc AUTHORS ChangeLog COPYING TODO
+%{_bindir}/kbluetooth4
+%{_bindir}/kbluetooth4-devicemanager
+%{_bindir}/kbluetooth4-inputwizard
+%{_datadir}/applications/kde4/kdebluetooth4.desktop
+%{_datadir}/icons/hicolor/*x*/apps/kbluetooth4.png
 
 
 %changelog
-* Thu Sep 11 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.43.beta8
-- fix build (no kdepim3 on f10+)
-- spec cosmetics
-- drop multilib upgrade Obsoletes hack
+* Mon Sep 15 2008 Gilboa Davara <gilboad [AT] gmail.com> - 0.2-3
+- Use versioned obsoletes.
+
+* Sun Sep 14 2008 Gilboa Davara <gilboad [AT] gmail.com> - 0.2-2
+- Use epoch instead of obsolete.
+- Revert to old kdebluetooth description. (Taken from kdebluetooth website)
 
-* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 1.0-0.42.beta8
-- Rebuild
+* Wed Sep 10 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.2-1
+- Update to kdebluetooth4 0.2.
 
 * Tue Apr  1 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.41.beta8
 - -devel: Requires: kdelibs3-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Oct 2007 21:49:54 -0000	1.3
+++ sources	20 Sep 2008 22:03:05 -0000	1.4
@@ -1 +1 @@
-0b6aebf7d236894fc442d74425b13386  kdebluetooth-1.0_beta8.tar.bz2
+1d66e2c968b4ce1a6201ea294a35de76  kdebluetooth4-0.2.tar.bz2



From gilboa at fedoraproject.org  Sat Sep 20 22:08:58 2008
From: gilboa at fedoraproject.org (Gilboa Davara)
Date: Sat, 20 Sep 2008 22:08:58 +0000 (UTC)
Subject: rpms/kdebluetooth/F-9 .cvsignore, 1.3, 1.4 kdebluetooth.spec, 1.15, 
	1.16 sources, 1.3, 1.4
Message-ID: <20080920220858.274D6700F8@cvs1.fedora.phx.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/kdebluetooth/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16417

Modified Files:
	.cvsignore kdebluetooth.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Oct 2007 21:49:54 -0000	1.3
+++ .cvsignore	20 Sep 2008 22:08:27 -0000	1.4
@@ -1 +1 @@
-kdebluetooth-1.0_beta8.tar.bz2
+kdebluetooth4-0.2.tar.bz2


Index: kdebluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/F-9/kdebluetooth.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kdebluetooth.spec	1 Apr 2008 20:06:30 -0000	1.15
+++ kdebluetooth.spec	20 Sep 2008 22:08:27 -0000	1.16
@@ -1,81 +1,33 @@
-%define reltype	beta8
-
 Summary:		The KDE Bluetooth Framework
 Name:			kdebluetooth
-Version:		1.0 
-Release:		0.41.%{reltype}%{?dist}
+Version:		0.2
+Release:		3%{?dist}
+Epoch:			1
 License:		GPLv2+
 Group:			Applications/Communications
 URL:			http://bluetooth.kmobiletools.org/
-Source0:		http://downloads.sourceforge.net/kde-bluetooth/%{name}-%{version}_%{reltype}.tar.bz2
-Patch0:			%{name}-1.0_beta8-gcc43.patch
+Source0:		http://downloads.sourceforge.net/kde-bluetooth/%{name}4-%{version}.tar.bz2
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gettext
-BuildRequires:	desktop-file-utils
-BuildRequires:	lockdev-devel
-BuildRequires:	xmms-devel
-BuildRequires:	bluez-libs-devel
-BuildRequires:	kdelibs3-devel
-BuildRequires:	kdepim3-devel
-BuildRequires:	openobex-devel >= 1.1
-BuildRequires:	libusb-devel
-BuildRequires:	pkgconfig
-Buildrequires:	libidn-devel
-Buildrequires:	dbus-qt-devel
-BuildRequires:	obexftp-devel
-BuildRequires:	automake >= 1.6.1
-BuildRequires:	autoconf >= 2.52
-Requires:		%{name}-libs = %{version}-%{release}
-Requires:		%{_bindir}/kdesu
+
+BuildRequires:	kdebase-workspace-devel
+BuildRequires:	cmake
+Obsoletes:		%{name}-libs < 1:0.2
+Obsoletes:		%{name}-devel < 1:0.2
 
 
 %description
 The KDE Bluetooth Framework is a set of tools built on top of Linux'
 Bluetooth (Bluez) stack. The goal is to provide easy access to the most
-common Bluetooth profiles and to make data exchange with Bluetooth
+common Bluetooth profiles and to make data exchange with Bluetooth     
 enabled devices as straightforward as possible.
 
 
-%package libs
-Summary: Base libraries for %{name}
-Group:	 System Environment/Libraries
-Obsoletes:		%{name} < %{version}-%{release}
-
-%if 0%{?fedora} >= 8
-Provides:		dbus-bluez-pin-helper
-%endif
-
-
-%description libs
-KDE Bluetooth framework libraries.
-
-
-%package devel
-Summary: Development files for %{name}
-Group:	 Development/Libraries
-Requires: kdelibs3-devel
-Requires: bluez-libs-devel
-Requires: %{name}-libs = %{version}-%{release}
-
-
-%description devel
-KDE Bluetooth framework development libraries and headers.
-
-
 %prep
-%setup -q -n %{name}-%{version}_%{reltype}
-%patch0 -p1
+%setup -n kdebluetooth4-%{version} -q
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-%configure \
-	--with-bluetooth-libraries=%{_libdir}	\
-	--disable-rpath							\
-	--enable-new-ldflags					\
-	--disable-debug							\
-	--disable-dependency-tracking			\
-	--enable-final
+%cmake_kde4 -DCMAKE_VERBOSE_MAKEFILE=ON
 make %{?_smp_mflags} 
 
 
@@ -83,26 +35,14 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-for DESK_PATH in applications/kde applnk/Utilities ; do
-	desktop-file-install												\
-		--mode=644														\
-		--vendor=""														\
-		--dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde				\
-		--remove-category="Network"										\
-		--add-category="System"											\
-		--delete-original												\
-		$RPM_BUILD_ROOT%{_datadir}/$DESK_PATH/*.desktop ||:
-done
-
-touch %{name}.lang
-PROG_LIST="kbluelock kbluemon kbluetooth kinputwizard
-			kcm_btpaired  kio_bluetooth kio_obex2 kio_sdp
-			libkbluetooth kdebluetooth"
-for PROG in $PROG_LIST ; do
-	%find_lang $PROG && cat $PROG.lang >> %{name}.lang	||:
-done
-
-rm -f $RPM_BUILD_ROOT/%{_datadir}/applnk/Settings/Network/Bluetooth/.directory
+desktop-file-install						\
+	--mode=644						\
+	--vendor=""						\
+	--dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde4	\
+	--remove-category="Network"				\
+	--add-category="System"					\
+	--delete-original					\
+	$RPM_BUILD_ROOT%{_datadir}/applications/kde4/kdebluetooth4.desktop
 
 
 %clean
@@ -110,62 +50,36 @@
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 
 %postun
-/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 
-%files -f %{name}.lang
+%files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL README
-%{_bindir}/kblue*
-%{_bindir}/kbtobexclient
-%{_bindir}/kioobex_start
-%{_bindir}/kinputwizard
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/applnk/.hidden/*.desktop
-%{_datadir}/apps/konqsidebartng/virtual_folders/services/*.desktop
-%{_datadir}/apps/*/*
-%{_datadir}/autostart/*
-%{_datadir}/desktop-directories/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/mimelnk/bluetooth/
-%{_datadir}/service*/*
-%lang(ca) %{_docdir}/HTML/ca/kdebluetooth/
-%lang(da) %{_docdir}/HTML/da/kdebluetooth/
-%lang(en) %{_docdir}/HTML/en/kdebluetooth/
-%lang(es) %{_docdir}/HTML/es/kdebluetooth/
-%lang(et) %{_docdir}/HTML/et/kdebluetooth/
-%lang(fr) %{_docdir}/HTML/fr/kdebluetooth/
-%lang(it) %{_docdir}/HTML/it/kdebluetooth/
-%lang(nl) %{_docdir}/HTML/nl/kdebluetooth/
-%lang(pt) %{_docdir}/HTML/pt/kdebluetooth/
-%lang(ru) %{_docdir}/HTML/ru/kdebluetooth/
-%lang(sv) %{_docdir}/HTML/sv/kdebluetooth/
-
+%doc AUTHORS ChangeLog COPYING TODO
+%{_bindir}/kbluetooth4
+%{_bindir}/kbluetooth4-devicemanager
+%{_bindir}/kbluetooth4-inputwizard
+%{_datadir}/applications/kde4/kdebluetooth4.desktop
+%{_datadir}/icons/hicolor/*x*/apps/kbluetooth4.png
 
-%files libs
-%defattr(-,root,root,-)
-%{_libdir}/*.la
-%{_libdir}/*.so.*
-%{_libdir}/kde3/*.so
-%{_libdir}/kde3/*.la
-%{_libdir}/kdebluetooth/
 
+%changelog
+* Mon Sep 15 2008 Gilboa Davara <gilboad [AT] gmail.com> - 0.2-3
+- Use versioned obsoletes.
 
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/*.so
+* Sun Sep 14 2008 Gilboa Davara <gilboad [AT] gmail.com> - 0.2-2
+- Use epoch instead of obsolete.
+- Revert to old kdebluetooth description. (Taken from kdebluetooth website)
 
+* Wed Sep 10 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.2-1
+- Update to kdebluetooth4 0.2.
 
-%changelog
 * Tue Apr  1 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.41.beta8
 - -devel: Requires: kdelibs3-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Oct 2007 21:49:54 -0000	1.3
+++ sources	20 Sep 2008 22:08:27 -0000	1.4
@@ -1 +1 @@
-0b6aebf7d236894fc442d74425b13386  kdebluetooth-1.0_beta8.tar.bz2
+1d66e2c968b4ce1a6201ea294a35de76  kdebluetooth4-0.2.tar.bz2



From pkgdb at fedoraproject.org  Sun Sep 21 00:24:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:24:15 +0000
Subject: [pkgdb] sms_ntsc was added for dtimms
Message-ID: <20080921002415.5554E208D9F@bastion.fedora.phx.redhat.com>

kevin has added Package sms_ntsc with summary SMS NTSC video filtering library
kevin has approved Package sms_ntsc
kevin has added a Fedora devel branch for sms_ntsc with an owner of dtimms
kevin has approved sms_ntsc in Fedora devel
kevin has approved Package sms_ntsc
kevin has set commit to Approved for packager on sms_ntsc (Fedora devel)
kevin has set build to Approved for packager on sms_ntsc (Fedora devel)
kevin has set checkout to Approved for packager on sms_ntsc (Fedora devel)
kevin has set commit to Approved for uberpackager on sms_ntsc (Fedora devel)
kevin has set build to Approved for uberpackager on sms_ntsc (Fedora devel)
kevin has set checkout to Approved for uberpackager on sms_ntsc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sms_ntsc



From pkgdb at fedoraproject.org  Sun Sep 21 00:24:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:24:17 +0000
Subject: [pkgdb] sms_ntsc (Fedora, 8) updated by kevin
Message-ID: <20080921002418.081B9208DA2@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for sms_ntsc
kevin has set commit to Approved for uberpackager on sms_ntsc (Fedora 8)
kevin has set build to Approved for uberpackager on sms_ntsc (Fedora 8)
kevin has set checkout to Approved for uberpackager on sms_ntsc (Fedora 8)
kevin approved watchbugzilla on sms_ntsc (Fedora 8) for belegdol
kevin approved watchcommits on sms_ntsc (Fedora 8) for belegdol

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sms_ntsc



From pkgdb at fedoraproject.org  Sun Sep 21 00:24:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:24:17 +0000
Subject: [pkgdb] sms_ntsc (Fedora, devel) updated by kevin
Message-ID: <20080921002418.11FE4208DA6@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on sms_ntsc (Fedora devel) for belegdol
kevin approved watchcommits on sms_ntsc (Fedora devel) for belegdol

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sms_ntsc



From kevin at fedoraproject.org  Sun Sep 21 00:24:33 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:24:33 +0000 (UTC)
Subject: rpms/sms_ntsc - New directory
Message-ID: <20080921002433.5B0337013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sms_ntsc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv21815/rpms/sms_ntsc

Log Message:
Directory /cvs/extras/rpms/sms_ntsc added to the repository




From pkgdb at fedoraproject.org  Sun Sep 21 00:24:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:24:17 +0000
Subject: [pkgdb] sms_ntsc (Fedora EPEL, 5) updated by kevin
Message-ID: <20080921002418.30522208DAC@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sms_ntsc
kevin has set commit to Approved for uberpackager on sms_ntsc (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on sms_ntsc (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on sms_ntsc (Fedora EPEL 5)
kevin approved watchbugzilla on sms_ntsc (Fedora EPEL 5) for belegdol
kevin approved watchcommits on sms_ntsc (Fedora EPEL 5) for belegdol

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sms_ntsc



From pkgdb at fedoraproject.org  Sun Sep 21 00:24:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:24:17 +0000
Subject: [pkgdb] sms_ntsc (Fedora, 9) updated by kevin
Message-ID: <20080921002418.1E625208DA9@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for sms_ntsc
kevin has set commit to Approved for uberpackager on sms_ntsc (Fedora 9)
kevin has set build to Approved for uberpackager on sms_ntsc (Fedora 9)
kevin has set checkout to Approved for uberpackager on sms_ntsc (Fedora 9)
kevin approved watchbugzilla on sms_ntsc (Fedora 9) for belegdol
kevin approved watchcommits on sms_ntsc (Fedora 9) for belegdol

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sms_ntsc



From kevin at fedoraproject.org  Sun Sep 21 00:24:33 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:24:33 +0000 (UTC)
Subject: rpms/sms_ntsc/devel - New directory
Message-ID: <20080921002433.8D6E87013E@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sms_ntsc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv21815/rpms/sms_ntsc/devel

Log Message:
Directory /cvs/extras/rpms/sms_ntsc/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 21 00:24:34 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:24:34 +0000 (UTC)
Subject: rpms/sms_ntsc Makefile,NONE,1.1
Message-ID: <20080921002434.63EB47013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sms_ntsc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv21815/rpms/sms_ntsc

Added Files:
	Makefile 
Log Message:
Setup of module sms_ntsc


--- NEW FILE Makefile ---
# Top level Makefile for module sms_ntsc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 21 00:24:34 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:24:34 +0000 (UTC)
Subject: rpms/sms_ntsc/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080921002434.9179A7013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sms_ntsc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv21815/rpms/sms_ntsc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sms_ntsc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sms_ntsc
# $Id: Makefile,v 1.1 2008/09/21 00:24:34 kevin Exp $
NAME := sms_ntsc
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 21 00:25:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:25:49 +0000
Subject: [pkgdb] snes_ntsc was added for dtimms
Message-ID: <20080921002549.A91BD208D9F@bastion.fedora.phx.redhat.com>

kevin has added Package snes_ntsc with summary SNES NTSC video filtering library
kevin has approved Package snes_ntsc
kevin has added a Fedora devel branch for snes_ntsc with an owner of dtimms
kevin has approved snes_ntsc in Fedora devel
kevin has approved Package snes_ntsc
kevin has set commit to Approved for packager on snes_ntsc (Fedora devel)
kevin has set build to Approved for packager on snes_ntsc (Fedora devel)
kevin has set checkout to Approved for packager on snes_ntsc (Fedora devel)
kevin has set commit to Approved for uberpackager on snes_ntsc (Fedora devel)
kevin has set build to Approved for uberpackager on snes_ntsc (Fedora devel)
kevin has set checkout to Approved for uberpackager on snes_ntsc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/snes_ntsc



From pkgdb at fedoraproject.org  Sun Sep 21 00:25:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:25:51 +0000
Subject: [pkgdb] snes_ntsc (Fedora, devel) updated by kevin
Message-ID: <20080921002551.5E0CF208DA3@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on snes_ntsc (Fedora devel) for belegdol
kevin approved watchcommits on snes_ntsc (Fedora devel) for belegdol

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/snes_ntsc



From pkgdb at fedoraproject.org  Sun Sep 21 00:25:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:25:51 +0000
Subject: [pkgdb] snes_ntsc (Fedora, 8) updated by kevin
Message-ID: <20080921002551.6337C208DA6@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for snes_ntsc
kevin has set commit to Approved for uberpackager on snes_ntsc (Fedora 8)
kevin has set build to Approved for uberpackager on snes_ntsc (Fedora 8)
kevin has set checkout to Approved for uberpackager on snes_ntsc (Fedora 8)
kevin approved watchbugzilla on snes_ntsc (Fedora 8) for belegdol
kevin approved watchcommits on snes_ntsc (Fedora 8) for belegdol

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/snes_ntsc



From pkgdb at fedoraproject.org  Sun Sep 21 00:25:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:25:51 +0000
Subject: [pkgdb] snes_ntsc (Fedora, 9) updated by kevin
Message-ID: <20080921002551.6CFA0208DA9@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for snes_ntsc
kevin has set commit to Approved for uberpackager on snes_ntsc (Fedora 9)
kevin has set build to Approved for uberpackager on snes_ntsc (Fedora 9)
kevin has set checkout to Approved for uberpackager on snes_ntsc (Fedora 9)
kevin approved watchbugzilla on snes_ntsc (Fedora 9) for belegdol
kevin approved watchcommits on snes_ntsc (Fedora 9) for belegdol

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/snes_ntsc



From kevin at fedoraproject.org  Sun Sep 21 00:26:15 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:26:15 +0000 (UTC)
Subject: rpms/snes_ntsc - New directory
Message-ID: <20080921002615.21A4C7013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/snes_ntsc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ22122/rpms/snes_ntsc

Log Message:
Directory /cvs/extras/rpms/snes_ntsc added to the repository




From kevin at fedoraproject.org  Sun Sep 21 00:26:15 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:26:15 +0000 (UTC)
Subject: rpms/snes_ntsc/devel - New directory
Message-ID: <20080921002615.4F6A17013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/snes_ntsc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ22122/rpms/snes_ntsc/devel

Log Message:
Directory /cvs/extras/rpms/snes_ntsc/devel added to the repository




From pkgdb at fedoraproject.org  Sun Sep 21 00:25:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:25:51 +0000
Subject: [pkgdb] snes_ntsc (Fedora EPEL, 5) updated by kevin
Message-ID: <20080921002551.787AA208DAC@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for snes_ntsc
kevin has set commit to Approved for uberpackager on snes_ntsc (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on snes_ntsc (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on snes_ntsc (Fedora EPEL 5)
kevin approved watchbugzilla on snes_ntsc (Fedora EPEL 5) for belegdol
kevin approved watchcommits on snes_ntsc (Fedora EPEL 5) for belegdol

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/snes_ntsc



From kevin at fedoraproject.org  Sun Sep 21 00:26:16 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:26:16 +0000 (UTC)
Subject: rpms/snes_ntsc Makefile,NONE,1.1
Message-ID: <20080921002616.1AC377013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/snes_ntsc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ22122/rpms/snes_ntsc

Added Files:
	Makefile 
Log Message:
Setup of module snes_ntsc


--- NEW FILE Makefile ---
# Top level Makefile for module snes_ntsc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 21 00:26:16 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:26:16 +0000 (UTC)
Subject: rpms/snes_ntsc/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080921002616.4E0BF7013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/snes_ntsc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ22122/rpms/snes_ntsc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module snes_ntsc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: snes_ntsc
# $Id: Makefile,v 1.1 2008/09/21 00:26:16 kevin Exp $
NAME := snes_ntsc
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 21 00:27:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:27:37 +0000
Subject: [pkgdb] rcsslogplayer was added for hedayat
Message-ID: <20080921002737.26478208D9E@bastion.fedora.phx.redhat.com>

kevin has added Package rcsslogplayer with summary RoboCup Soccer Simulator LogPlayer
kevin has approved Package rcsslogplayer
kevin has added a Fedora devel branch for rcsslogplayer with an owner of hedayat
kevin has approved rcsslogplayer in Fedora devel
kevin has approved Package rcsslogplayer
kevin has set commit to Approved for packager on rcsslogplayer (Fedora devel)
kevin has set build to Approved for packager on rcsslogplayer (Fedora devel)
kevin has set checkout to Approved for packager on rcsslogplayer (Fedora devel)
kevin has set commit to Approved for uberpackager on rcsslogplayer (Fedora devel)
kevin has set build to Approved for uberpackager on rcsslogplayer (Fedora devel)
kevin has set checkout to Approved for uberpackager on rcsslogplayer (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rcsslogplayer



From pkgdb at fedoraproject.org  Sun Sep 21 00:27:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:27:38 +0000
Subject: [pkgdb] rcsslogplayer (Fedora, 8) updated by kevin
Message-ID: <20080921002739.02947208DA3@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for rcsslogplayer
kevin has set commit to Approved for uberpackager on rcsslogplayer (Fedora 8)
kevin has set build to Approved for uberpackager on rcsslogplayer (Fedora 8)
kevin has set checkout to Approved for uberpackager on rcsslogplayer (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rcsslogplayer



From kevin at fedoraproject.org  Sun Sep 21 00:27:57 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:27:57 +0000 (UTC)
Subject: rpms/rcsslogplayer - New directory
Message-ID: <20080921002757.1F43D7013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rcsslogplayer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh22452/rpms/rcsslogplayer

Log Message:
Directory /cvs/extras/rpms/rcsslogplayer added to the repository




From kevin at fedoraproject.org  Sun Sep 21 00:27:57 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:27:57 +0000 (UTC)
Subject: rpms/rcsslogplayer/devel - New directory
Message-ID: <20080921002757.4DFBD7013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rcsslogplayer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh22452/rpms/rcsslogplayer/devel

Log Message:
Directory /cvs/extras/rpms/rcsslogplayer/devel added to the repository




From pkgdb at fedoraproject.org  Sun Sep 21 00:27:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:27:38 +0000
Subject: [pkgdb] rcsslogplayer (Fedora, 9) updated by kevin
Message-ID: <20080921002739.0E052208DA6@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for rcsslogplayer
kevin has set commit to Approved for uberpackager on rcsslogplayer (Fedora 9)
kevin has set build to Approved for uberpackager on rcsslogplayer (Fedora 9)
kevin has set checkout to Approved for uberpackager on rcsslogplayer (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rcsslogplayer



From kevin at fedoraproject.org  Sun Sep 21 00:27:58 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:27:58 +0000 (UTC)
Subject: rpms/rcsslogplayer Makefile,NONE,1.1
Message-ID: <20080921002758.1FECD7013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rcsslogplayer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh22452/rpms/rcsslogplayer

Added Files:
	Makefile 
Log Message:
Setup of module rcsslogplayer


--- NEW FILE Makefile ---
# Top level Makefile for module rcsslogplayer
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 21 00:27:58 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:27:58 +0000 (UTC)
Subject: rpms/rcsslogplayer/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080921002758.51C967013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rcsslogplayer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh22452/rpms/rcsslogplayer/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rcsslogplayer


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rcsslogplayer
# $Id: Makefile,v 1.1 2008/09/21 00:27:58 kevin Exp $
NAME := rcsslogplayer
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 21 00:28:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:28:52 +0000
Subject: [pkgdb] perl-AppConfig-Std was added for cweyl
Message-ID: <20080921002852.4B187208D9E@bastion.fedora.phx.redhat.com>

kevin has added Package perl-AppConfig-Std with summary Provides standard configuration options
kevin has approved Package perl-AppConfig-Std
kevin has added a Fedora devel branch for perl-AppConfig-Std with an owner of cweyl
kevin has approved perl-AppConfig-Std in Fedora devel
kevin has approved Package perl-AppConfig-Std
kevin has set commit to Approved for packager on perl-AppConfig-Std (Fedora devel)
kevin has set build to Approved for packager on perl-AppConfig-Std (Fedora devel)
kevin has set checkout to Approved for packager on perl-AppConfig-Std (Fedora devel)
kevin has set commit to Approved for uberpackager on perl-AppConfig-Std (Fedora devel)
kevin has set build to Approved for uberpackager on perl-AppConfig-Std (Fedora devel)
kevin has set checkout to Approved for uberpackager on perl-AppConfig-Std (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-AppConfig-Std



From pkgdb at fedoraproject.org  Sun Sep 21 00:28:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:28:56 +0000
Subject: [pkgdb] perl-AppConfig-Std (Fedora, 8) updated by kevin
Message-ID: <20080921002856.29538208DA3@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for perl-AppConfig-Std
kevin has set commit to Approved for uberpackager on perl-AppConfig-Std (Fedora 8)
kevin has set build to Approved for uberpackager on perl-AppConfig-Std (Fedora 8)
kevin has set checkout to Approved for uberpackager on perl-AppConfig-Std (Fedora 8)
kevin approved watchbugzilla on perl-AppConfig-Std (Fedora 8) for perl-sig
kevin approved watchcommits on perl-AppConfig-Std (Fedora 8) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-AppConfig-Std



From pkgdb at fedoraproject.org  Sun Sep 21 00:28:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:28:56 +0000
Subject: [pkgdb] perl-AppConfig-Std (Fedora, 9) updated by kevin
Message-ID: <20080921002856.44DC4208DA6@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-AppConfig-Std
kevin has set commit to Approved for uberpackager on perl-AppConfig-Std (Fedora 9)
kevin has set build to Approved for uberpackager on perl-AppConfig-Std (Fedora 9)
kevin has set checkout to Approved for uberpackager on perl-AppConfig-Std (Fedora 9)
kevin approved watchbugzilla on perl-AppConfig-Std (Fedora 9) for perl-sig
kevin approved watchcommits on perl-AppConfig-Std (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-AppConfig-Std



From pkgdb at fedoraproject.org  Sun Sep 21 00:28:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:28:56 +0000
Subject: [pkgdb] perl-AppConfig-Std (Fedora, devel) updated by kevin
Message-ID: <20080921002856.4D008208DA9@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-AppConfig-Std (Fedora devel) for perl-sig
kevin approved watchcommits on perl-AppConfig-Std (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-AppConfig-Std



From kevin at fedoraproject.org  Sun Sep 21 00:29:15 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:29:15 +0000 (UTC)
Subject: rpms/perl-AppConfig-Std - New directory
Message-ID: <20080921002915.209BA7013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-AppConfig-Std
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ22730/rpms/perl-AppConfig-Std

Log Message:
Directory /cvs/extras/rpms/perl-AppConfig-Std added to the repository




From kevin at fedoraproject.org  Sun Sep 21 00:29:15 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:29:15 +0000 (UTC)
Subject: rpms/perl-AppConfig-Std/devel - New directory
Message-ID: <20080921002915.51B487013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-AppConfig-Std/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ22730/rpms/perl-AppConfig-Std/devel

Log Message:
Directory /cvs/extras/rpms/perl-AppConfig-Std/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 21 00:29:16 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:29:16 +0000 (UTC)
Subject: rpms/perl-AppConfig-Std Makefile,NONE,1.1
Message-ID: <20080921002916.233317013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-AppConfig-Std
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ22730/rpms/perl-AppConfig-Std

Added Files:
	Makefile 
Log Message:
Setup of module perl-AppConfig-Std


--- NEW FILE Makefile ---
# Top level Makefile for module perl-AppConfig-Std
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 21 00:29:16 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:29:16 +0000 (UTC)
Subject: rpms/perl-AppConfig-Std/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20080921002916.53C0A7013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-AppConfig-Std/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ22730/rpms/perl-AppConfig-Std/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-AppConfig-Std


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-AppConfig-Std
# $Id: Makefile,v 1.1 2008/09/21 00:29:16 kevin Exp $
NAME := perl-AppConfig-Std
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 21 00:31:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:31:18 +0000
Subject: [pkgdb] krazy2 was added for mathstuf
Message-ID: <20080921003118.3889D208D9F@bastion.fedora.phx.redhat.com>

kevin has added Package krazy2 with summary KDE code checking tool
kevin has approved Package krazy2
kevin has added a Fedora devel branch for krazy2 with an owner of mathstuf
kevin has approved krazy2 in Fedora devel
kevin has approved Package krazy2
kevin has set commit to Approved for packager on krazy2 (Fedora devel)
kevin has set build to Approved for packager on krazy2 (Fedora devel)
kevin has set checkout to Approved for packager on krazy2 (Fedora devel)
kevin has set commit to Approved for uberpackager on krazy2 (Fedora devel)
kevin has set build to Approved for uberpackager on krazy2 (Fedora devel)
kevin has set checkout to Approved for uberpackager on krazy2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/krazy2



From pkgdb at fedoraproject.org  Sun Sep 21 00:31:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:31:19 +0000
Subject: [pkgdb] krazy2 (Fedora, 8) updated by kevin
Message-ID: <20080921003119.B35B2208DA4@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for krazy2
kevin has set commit to Approved for uberpackager on krazy2 (Fedora 8)
kevin has set build to Approved for uberpackager on krazy2 (Fedora 8)
kevin has set checkout to Approved for uberpackager on krazy2 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/krazy2



From pkgdb at fedoraproject.org  Sun Sep 21 00:31:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:31:19 +0000
Subject: [pkgdb] krazy2 (Fedora, 9) updated by kevin
Message-ID: <20080921003119.BB214208DA7@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for krazy2
kevin has set commit to Approved for uberpackager on krazy2 (Fedora 9)
kevin has set build to Approved for uberpackager on krazy2 (Fedora 9)
kevin has set checkout to Approved for uberpackager on krazy2 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/krazy2



From kevin at fedoraproject.org  Sun Sep 21 00:31:38 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:31:38 +0000 (UTC)
Subject: rpms/krazy2 - New directory
Message-ID: <20080921003138.258FE7013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/krazy2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN23143/rpms/krazy2

Log Message:
Directory /cvs/extras/rpms/krazy2 added to the repository




From kevin at fedoraproject.org  Sun Sep 21 00:31:38 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:31:38 +0000 (UTC)
Subject: rpms/krazy2/devel - New directory
Message-ID: <20080921003138.645A37013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/krazy2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN23143/rpms/krazy2/devel

Log Message:
Directory /cvs/extras/rpms/krazy2/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 21 00:31:39 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:31:39 +0000 (UTC)
Subject: rpms/krazy2 Makefile,NONE,1.1
Message-ID: <20080921003139.42E0D7013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/krazy2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN23143/rpms/krazy2

Added Files:
	Makefile 
Log Message:
Setup of module krazy2


--- NEW FILE Makefile ---
# Top level Makefile for module krazy2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 21 00:31:39 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:31:39 +0000 (UTC)
Subject: rpms/krazy2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080921003139.760827013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/krazy2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN23143/rpms/krazy2/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module krazy2


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: krazy2
# $Id: Makefile,v 1.1 2008/09/21 00:31:39 kevin Exp $
NAME := krazy2
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 21 00:32:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:32:58 +0000
Subject: [pkgdb] sigen was added for mathstuf
Message-ID: <20080921003258.704D7208D9F@bastion.fedora.phx.redhat.com>

kevin has added Package sigen with summary Strategy/RPG game engine
kevin has approved Package sigen
kevin has added a Fedora devel branch for sigen with an owner of mathstuf
kevin has approved sigen in Fedora devel
kevin has approved Package sigen
kevin has set commit to Approved for packager on sigen (Fedora devel)
kevin has set build to Approved for packager on sigen (Fedora devel)
kevin has set checkout to Approved for packager on sigen (Fedora devel)
kevin has set commit to Approved for uberpackager on sigen (Fedora devel)
kevin has set build to Approved for uberpackager on sigen (Fedora devel)
kevin has set checkout to Approved for uberpackager on sigen (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sigen



From pkgdb at fedoraproject.org  Sun Sep 21 00:33:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:33:01 +0000
Subject: [pkgdb] sigen (Fedora, 8) updated by kevin
Message-ID: <20080921003301.285B7208DA3@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for sigen
kevin has set commit to Approved for uberpackager on sigen (Fedora 8)
kevin has set build to Approved for uberpackager on sigen (Fedora 8)
kevin has set checkout to Approved for uberpackager on sigen (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sigen



From kevin at fedoraproject.org  Sun Sep 21 00:33:16 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:33:16 +0000 (UTC)
Subject: rpms/sigen - New directory
Message-ID: <20080921003316.226A17013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sigen
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC23462/rpms/sigen

Log Message:
Directory /cvs/extras/rpms/sigen added to the repository




From pkgdb at fedoraproject.org  Sun Sep 21 00:33:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:33:01 +0000
Subject: [pkgdb] sigen (Fedora, 9) updated by kevin
Message-ID: <20080921003301.43C3B208DA6@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for sigen
kevin has set commit to Approved for uberpackager on sigen (Fedora 9)
kevin has set build to Approved for uberpackager on sigen (Fedora 9)
kevin has set checkout to Approved for uberpackager on sigen (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sigen



From kevin at fedoraproject.org  Sun Sep 21 00:33:16 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:33:16 +0000 (UTC)
Subject: rpms/sigen/devel - New directory
Message-ID: <20080921003316.5A71B7013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sigen/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC23462/rpms/sigen/devel

Log Message:
Directory /cvs/extras/rpms/sigen/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 21 00:33:17 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:33:17 +0000 (UTC)
Subject: rpms/sigen Makefile,NONE,1.1
Message-ID: <20080921003317.5E9137013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sigen
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC23462/rpms/sigen

Added Files:
	Makefile 
Log Message:
Setup of module sigen


--- NEW FILE Makefile ---
# Top level Makefile for module sigen
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 21 00:33:17 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:33:17 +0000 (UTC)
Subject: rpms/sigen/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20080921003317.99D737013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sigen/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC23462/rpms/sigen/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sigen


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sigen
# $Id: Makefile,v 1.1 2008/09/21 00:33:17 kevin Exp $
NAME := sigen
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 21 00:34:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:34:02 +0000
Subject: [pkgdb] python-dictclient (Fedora EPEL, 4) updated by kevin
Message-ID: <20080921003403.005F5208D9F@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for python-dictclient
kevin has set commit to Approved for uberpackager on python-dictclient (Fedora EPEL 4)
kevin has set build to Approved for uberpackager on python-dictclient (Fedora EPEL 4)
kevin has set checkout to Approved for uberpackager on python-dictclient (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dictclient



From pkgdb at fedoraproject.org  Sun Sep 21 00:34:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:34:02 +0000
Subject: [pkgdb] python-dictclient (Fedora EPEL, 5) updated by kevin
Message-ID: <20080921003403.09306208DA5@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-dictclient
kevin has set commit to Approved for uberpackager on python-dictclient (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on python-dictclient (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on python-dictclient (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dictclient



From pkgdb at fedoraproject.org  Sun Sep 21 00:54:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:54:37 +0000
Subject: [pkgdb] cherokee was added for pali
Message-ID: <20080921005438.1D06E208D9E@bastion.fedora.phx.redhat.com>

kevin has added Package cherokee with summary Flexible and Fast Webserver
kevin has approved Package cherokee
kevin has added a Fedora devel branch for cherokee with an owner of pali
kevin has approved cherokee in Fedora devel
kevin has approved Package cherokee
kevin has set commit to Approved for packager on cherokee (Fedora devel)
kevin has set build to Approved for packager on cherokee (Fedora devel)
kevin has set checkout to Approved for packager on cherokee (Fedora devel)
kevin has set commit to Approved for uberpackager on cherokee (Fedora devel)
kevin has set build to Approved for uberpackager on cherokee (Fedora devel)
kevin has set checkout to Approved for uberpackager on cherokee (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cherokee



From pkgdb at fedoraproject.org  Sun Sep 21 00:54:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:54:39 +0000
Subject: [pkgdb] cherokee (Fedora EPEL, 5) updated by kevin
Message-ID: <20080921005439.EB39E208DA3@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for cherokee
kevin has set commit to Approved for uberpackager on cherokee (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on cherokee (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on cherokee (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cherokee



From pkgdb at fedoraproject.org  Sun Sep 21 00:54:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:54:39 +0000
Subject: [pkgdb] cherokee (Fedora EPEL, 4) updated by kevin
Message-ID: <20080921005440.BF945208DA9@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for cherokee
kevin has set commit to Approved for uberpackager on cherokee (Fedora EPEL 4)
kevin has set build to Approved for uberpackager on cherokee (Fedora EPEL 4)
kevin has set checkout to Approved for uberpackager on cherokee (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cherokee



From pkgdb at fedoraproject.org  Sun Sep 21 00:54:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 00:54:39 +0000
Subject: [pkgdb] cherokee (Fedora, 9) updated by kevin
Message-ID: <20080921005440.59EAE208DA6@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for cherokee
kevin has set commit to Approved for uberpackager on cherokee (Fedora 9)
kevin has set build to Approved for uberpackager on cherokee (Fedora 9)
kevin has set checkout to Approved for uberpackager on cherokee (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cherokee



From kevin at fedoraproject.org  Sun Sep 21 00:54:52 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:54:52 +0000 (UTC)
Subject: rpms/cherokee - New directory
Message-ID: <20080921005452.1F4AF700FA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cherokee
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz26280/rpms/cherokee

Log Message:
Directory /cvs/extras/rpms/cherokee added to the repository




From kevin at fedoraproject.org  Sun Sep 21 00:54:52 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:54:52 +0000 (UTC)
Subject: rpms/cherokee/devel - New directory
Message-ID: <20080921005452.53DD370140@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cherokee/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz26280/rpms/cherokee/devel

Log Message:
Directory /cvs/extras/rpms/cherokee/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 21 00:54:53 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:54:53 +0000 (UTC)
Subject: rpms/cherokee Makefile,NONE,1.1
Message-ID: <20080921005453.21390700FA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cherokee
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz26280/rpms/cherokee

Added Files:
	Makefile 
Log Message:
Setup of module cherokee


--- NEW FILE Makefile ---
# Top level Makefile for module cherokee
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 21 00:54:53 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 21 Sep 2008 00:54:53 +0000 (UTC)
Subject: rpms/cherokee/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080921005453.57DDD700FA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cherokee/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz26280/rpms/cherokee/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cherokee


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cherokee
# $Id: Makefile,v 1.1 2008/09/21 00:54:53 kevin Exp $
NAME := cherokee
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From cweyl at fedoraproject.org  Sun Sep 21 01:20:59 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 21 Sep 2008 01:20:59 +0000 (UTC)
Subject: rpms/perl-AppConfig-Std/devel import.log, NONE,
	1.1 perl-AppConfig-Std.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080921012059.DF328700FA@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-AppConfig-Std/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29270/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-AppConfig-Std.spec 
Log Message:
initial commit



--- NEW FILE import.log ---
perl-AppConfig-Std-1_07-1_fc9:HEAD:perl-AppConfig-Std-1.07-1.fc9.src.rpm:1221960021


--- NEW FILE perl-AppConfig-Std.spec ---

Name:       perl-AppConfig-Std 
Version:    1.07 
Release:    1%{?dist}
# see lib/AppConfig/Std.pm
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Provides standard configuration options 
Source:     http://search.cpan.org/CPAN/authors/id/N/NE/NEILB/AppConfig-Std-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/AppConfig-Std
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(AppConfig) >= 1.52
BuildRequires: perl(Pod::Usage) >= 1.14


%description
AppConfig::Std is a Perl module that provides a set of standard
configuration variables and command-line switches. It is implemented as a
subclass of AppConfig; AppConfig provides a general mechanism for handling
global configuration variables.


%prep
%setup -q -n AppConfig-Std-%{version}

perl -pi -e 's|^#!\./perl|#!/usr/bin/perl|' t/*

%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 ChangeLog README t/
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Tue Sep 16 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.07-1
- initial Fedora packaging
- generated with cpan2dist (CPANPLUS::Dist::Fedora version 0.0.1)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-AppConfig-Std/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2008 00:29:16 -0000	1.1
+++ .cvsignore	21 Sep 2008 01:20:29 -0000	1.2
@@ -0,0 +1 @@
+AppConfig-Std-1.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-AppConfig-Std/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2008 00:29:16 -0000	1.1
+++ sources	21 Sep 2008 01:20:29 -0000	1.2
@@ -0,0 +1 @@
+5a7d3d668494116e4120208100592d10  AppConfig-Std-1.07.tar.gz



From cweyl at fedoraproject.org  Sun Sep 21 01:28:01 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 21 Sep 2008 01:28:01 +0000 (UTC)
Subject: rpms/perl-AppConfig-Std/devel perl-AppConfig-Std.spec,1.1,1.2
Message-ID: <20080921012801.9FAD5700FA@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-AppConfig-Std/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30062

Modified Files:
	perl-AppConfig-Std.spec 
Log Message:
release bump


Index: perl-AppConfig-Std.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-AppConfig-Std/devel/perl-AppConfig-Std.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-AppConfig-Std.spec	21 Sep 2008 01:20:29 -0000	1.1
+++ perl-AppConfig-Std.spec	21 Sep 2008 01:27:31 -0000	1.2
@@ -1,7 +1,7 @@
 
 Name:       perl-AppConfig-Std 
 Version:    1.07 
-Release:    1%{?dist}
+Release:        2%{?dist}
 # see lib/AppConfig/Std.pm
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -55,6 +55,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Sep 20 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.07-2
+- bump
+
 * Tue Sep 16 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.07-1
 - initial Fedora packaging
 - generated with cpan2dist (CPANPLUS::Dist::Fedora version 0.0.1)



From cweyl at fedoraproject.org  Sun Sep 21 01:28:43 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 21 Sep 2008 01:28:43 +0000 (UTC)
Subject: rpms/perl-AppConfig-Std/F-8 import.log, NONE,
	1.1 perl-AppConfig-Std.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080921012843.002A2700FA@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-AppConfig-Std/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30286

Modified Files:
	sources 
Added Files:
	import.log perl-AppConfig-Std.spec 
Log Message:
pseudo-branch of perl-AppConfig-Std to F-8


--- NEW FILE import.log ---
perl-AppConfig-Std-1_07-1_fc9:HEAD:perl-AppConfig-Std-1.07-1.fc9.src.rpm:1221960021


--- NEW FILE perl-AppConfig-Std.spec ---

Name:       perl-AppConfig-Std 
Version:    1.07 
Release:        2%{?dist}
# see lib/AppConfig/Std.pm
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Provides standard configuration options 
Source:     http://search.cpan.org/CPAN/authors/id/N/NE/NEILB/AppConfig-Std-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/AppConfig-Std
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(AppConfig) >= 1.52
BuildRequires: perl(Pod::Usage) >= 1.14


%description
AppConfig::Std is a Perl module that provides a set of standard
configuration variables and command-line switches. It is implemented as a
subclass of AppConfig; AppConfig provides a general mechanism for handling
global configuration variables.


%prep
%setup -q -n AppConfig-Std-%{version}

perl -pi -e 's|^#!\./perl|#!/usr/bin/perl|' t/*

%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 ChangeLog README t/
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Sep 20 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.07-2
- bump

* Tue Sep 16 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.07-1
- initial Fedora packaging
- generated with cpan2dist (CPANPLUS::Dist::Fedora version 0.0.1)



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-AppConfig-Std/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2008 00:29:16 -0000	1.1
+++ sources	21 Sep 2008 01:28:12 -0000	1.2
@@ -0,0 +1 @@
+5a7d3d668494116e4120208100592d10  AppConfig-Std-1.07.tar.gz



From cweyl at fedoraproject.org  Sun Sep 21 01:32:53 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 21 Sep 2008 01:32:53 +0000 (UTC)
Subject: rpms/perl-AppConfig-Std/F-9 import.log, NONE,
	1.1 perl-AppConfig-Std.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080921013253.2C044700FA@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-AppConfig-Std/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30848

Modified Files:
	sources 
Added Files:
	import.log perl-AppConfig-Std.spec 
Log Message:
pseudo-branch of perl-AppConfig-Std to F-9


--- NEW FILE import.log ---
perl-AppConfig-Std-1_07-1_fc9:HEAD:perl-AppConfig-Std-1.07-1.fc9.src.rpm:1221960021


--- NEW FILE perl-AppConfig-Std.spec ---

Name:       perl-AppConfig-Std 
Version:    1.07 
Release:        2%{?dist}
# see lib/AppConfig/Std.pm
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Provides standard configuration options 
Source:     http://search.cpan.org/CPAN/authors/id/N/NE/NEILB/AppConfig-Std-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/AppConfig-Std
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(AppConfig) >= 1.52
BuildRequires: perl(Pod::Usage) >= 1.14


%description
AppConfig::Std is a Perl module that provides a set of standard
configuration variables and command-line switches. It is implemented as a
subclass of AppConfig; AppConfig provides a general mechanism for handling
global configuration variables.


%prep
%setup -q -n AppConfig-Std-%{version}

perl -pi -e 's|^#!\./perl|#!/usr/bin/perl|' t/*

%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 ChangeLog README t/
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Sep 20 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.07-2
- bump

* Tue Sep 16 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.07-1
- initial Fedora packaging
- generated with cpan2dist (CPANPLUS::Dist::Fedora version 0.0.1)



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-AppConfig-Std/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2008 00:29:16 -0000	1.1
+++ sources	21 Sep 2008 01:32:22 -0000	1.2
@@ -0,0 +1 @@
+5a7d3d668494116e4120208100592d10  AppConfig-Std-1.07.tar.gz



From stahnma at fedoraproject.org  Sun Sep 21 02:49:07 2008
From: stahnma at fedoraproject.org (Michael Stahnke)
Date: Sun, 21 Sep 2008 02:49:07 +0000 (UTC)
Subject: rpms/cdpr/devel sources,1.2,1.3
Message-ID: <20080921024907.841C4700FA@cvs1.fedora.phx.redhat.com>

Author: stahnma

Update of /cvs/extras/rpms/cdpr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6191

Modified Files:
	sources 
Log Message:
New version



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cdpr/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Oct 2007 20:24:12 -0000	1.2
+++ sources	21 Sep 2008 02:48:37 -0000	1.3
@@ -1 +1 @@
-1e682e7e9c03f9b004c1f97c0ed25431  cdpr-2.2.1.tar.gz
+c3eeaeb2641085647f13da6ff807aa0b  cdpr-2.3.tgz



From stahnma at fedoraproject.org  Sun Sep 21 02:51:28 2008
From: stahnma at fedoraproject.org (Michael Stahnke)
Date: Sun, 21 Sep 2008 02:51:28 +0000 (UTC)
Subject: rpms/cdpr/devel cdpr.spec,1.2,1.3
Message-ID: <20080921025128.50086700FA@cvs1.fedora.phx.redhat.com>

Author: stahnma

Update of /cvs/extras/rpms/cdpr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6510

Modified Files:
	cdpr.spec 
Log Message:
New version



Index: cdpr.spec
===================================================================
RCS file: /cvs/extras/rpms/cdpr/devel/cdpr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cdpr.spec	20 Feb 2008 02:41:18 -0000	1.2
+++ cdpr.spec	21 Sep 2008 02:50:58 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           cdpr
-Version:        2.2.1
-Release:        3%{?dist}
+Version:        2.3
+Release:        1%{?dist}
 Summary:        Cisco Discovery Protocol Analyzer
 
 Group:          Applications/System
 License:        GPLv2+ 
 URL:            http://sourceforge.net/projects/cdpr/ 
-Source0:        http://downloads.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://www.monkeymental.com/mmfiles/%{name}-%{version}.tgz
   
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Sat Sep 20 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.3-1
+- New version
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2.1-3
 - Autorebuild for GCC 4.3
 



From dcantrel at fedoraproject.org  Sun Sep 21 03:06:45 2008
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sun, 21 Sep 2008 03:06:45 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.569, 1.570 anaconda.spec, 1.711, 
	1.712 sources, 1.703, 1.704
Message-ID: <20080921030646.01206700FA@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8305

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Sat Sep 20 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.38-1
- Restore old lang-names generation method (dcantrell)
- Remount /mnt/sysimage/dev after migrating filesystems. (clumens)
- Use the instroot parameter like we should be doing. (clumens)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.569
retrieving revision 1.570
diff -u -r1.569 -r1.570
--- .cvsignore	19 Sep 2008 21:11:32 -0000	1.569
+++ .cvsignore	21 Sep 2008 03:06:15 -0000	1.570
@@ -1,2 +1 @@
-anaconda-11.4.1.36.tar.bz2
-anaconda-11.4.1.37.tar.bz2
+anaconda-11.4.1.38.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.711
retrieving revision 1.712
diff -u -r1.711 -r1.712
--- anaconda.spec	19 Sep 2008 21:11:32 -0000	1.711
+++ anaconda.spec	21 Sep 2008 03:06:15 -0000	1.712
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.4.1.37
+Version: 11.4.1.38
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -205,6 +205,11 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Sat Sep 20 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.38-1
+- Restore old lang-names generation method (dcantrell)
+- Remount /mnt/sysimage/dev after migrating filesystems. (clumens)
+- Use the instroot parameter like we should be doing. (clumens)
+
 * Fri Sep 19 2008 Chris Lumens <clumens at redhat.com> - 11.4.1.37-1
 - Set the filename on the traceback when we upload it (wwoods).
 - Don't worry about errors looking up protected partitions on upgrades.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.703
retrieving revision 1.704
diff -u -r1.703 -r1.704
--- sources	19 Sep 2008 21:11:32 -0000	1.703
+++ sources	21 Sep 2008 03:06:15 -0000	1.704
@@ -1 +1 @@
-81902bd0da1be03e1f425344908a204a  anaconda-11.4.1.37.tar.bz2
+8ee02e3e02a89bafa83316983600b394  anaconda-11.4.1.38.tar.bz2



From lmacken at fedoraproject.org  Sun Sep 21 03:21:49 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sun, 21 Sep 2008 03:21:49 +0000 (UTC)
Subject: rpms/python-decoratortools/F-8 python-decoratortools.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20080921032149.98A9C700FA@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-decoratortools/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10331

Modified Files:
	python-decoratortools.spec sources 
Log Message:
Update to 1.7


Index: python-decoratortools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-decoratortools/F-8/python-decoratortools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-decoratortools.spec	27 Nov 2007 20:49:07 -0000	1.4
+++ python-decoratortools.spec	21 Sep 2008 03:21:19 -0000	1.5
@@ -4,7 +4,7 @@
 %define module DecoratorTools
 
 Name:           python-decoratortools
-Version:        1.6
+Version:        1.7
 Release:        1%{?dist}
 Summary:        Use class and function decorators -- even in Python 2.3
 Group:          Development/Languages
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Feb 28 2008 Luke Macken <lmacken at redhat.com> - 1.7-1
+- Update to 1.7
+
 * Tue Nov 27 2007 Luke Macken <lmacken at redhat.com> - 1.6-1
 - 1.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-decoratortools/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Nov 2007 20:49:07 -0000	1.4
+++ sources	21 Sep 2008 03:21:19 -0000	1.5
@@ -1 +1 @@
-ecfbdb2448cd9ceab09cd6fb9dd90b58  DecoratorTools-1.6.zip
+84df0a86aabec6a7d802439ffaa17585  DecoratorTools-1.7.zip



From stahnma at fedoraproject.org  Sun Sep 21 03:23:39 2008
From: stahnma at fedoraproject.org (Michael Stahnke)
Date: Sun, 21 Sep 2008 03:23:39 +0000 (UTC)
Subject: rpms/cdpr/devel cdpr.spec,1.3,1.4
Message-ID: <20080921032339.A9374700FA@cvs1.fedora.phx.redhat.com>

Author: stahnma

Update of /cvs/extras/rpms/cdpr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10611

Modified Files:
	cdpr.spec 
Log Message:
New url



Index: cdpr.spec
===================================================================
RCS file: /cvs/extras/rpms/cdpr/devel/cdpr.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cdpr.spec	21 Sep 2008 02:50:58 -0000	1.3
+++ cdpr.spec	21 Sep 2008 03:23:09 -0000	1.4
@@ -6,7 +6,8 @@
 Group:          Applications/System
 License:        GPLv2+ 
 URL:            http://sourceforge.net/projects/cdpr/ 
-Source0:        http://www.monkeymental.com/mmfiles/%{name}-%{version}.tgz
+Source0:        http://downloads.sf.net/sourceforge/%{name}/%{name}-%{version}.tgz
+
   
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,8 +46,9 @@
 
 
 %changelog
-* Sat Sep 20 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.3-1
+* Sat Sep 20 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.3-2
 - New version
+- Different URL format
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2.1-3
 - Autorebuild for GCC 4.3



From lmacken at fedoraproject.org  Sun Sep 21 03:25:27 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sun, 21 Sep 2008 03:25:27 +0000 (UTC)
Subject: rpms/python-decoratortools/EL-5 python-decoratortools.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20080921032527.C2ED8700FA@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-decoratortools/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10852

Modified Files:
	python-decoratortools.spec sources 
Log Message:
Update to 1.7


Index: python-decoratortools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-decoratortools/EL-5/python-decoratortools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-decoratortools.spec	27 Nov 2007 20:47:25 -0000	1.2
+++ python-decoratortools.spec	21 Sep 2008 03:24:57 -0000	1.3
@@ -4,7 +4,7 @@
 %define module DecoratorTools
 
 Name:           python-decoratortools
-Version:        1.6
+Version:        1.7
 Release:        1%{?dist}
 Summary:        Use class and function decorators -- even in Python 2.3
 Group:          Development/Languages
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Feb 28 2008 Luke Macken <lmacken at redhat.com> - 1.7-1
+- Update to 1.7
+
 * Tue Nov 27 2007 Luke Macken <lmacken at redhat.com> - 1.6-1
 - 1.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-decoratortools/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2007 20:47:25 -0000	1.3
+++ sources	21 Sep 2008 03:24:57 -0000	1.4
@@ -1 +1 @@
-ecfbdb2448cd9ceab09cd6fb9dd90b58  DecoratorTools-1.6.zip
+84df0a86aabec6a7d802439ffaa17585  DecoratorTools-1.7.zip



From lmacken at fedoraproject.org  Sun Sep 21 03:26:13 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sun, 21 Sep 2008 03:26:13 +0000 (UTC)
Subject: rpms/python-decoratortools/EL-4 python-decoratortools.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20080921032613.6A3C6700FA@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-decoratortools/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11098

Modified Files:
	python-decoratortools.spec sources 
Log Message:
Update to 1.7


Index: python-decoratortools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-decoratortools/EL-4/python-decoratortools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-decoratortools.spec	27 Nov 2007 20:46:33 -0000	1.4
+++ python-decoratortools.spec	21 Sep 2008 03:25:43 -0000	1.5
@@ -4,7 +4,7 @@
 %define module DecoratorTools
 
 Name:           python-decoratortools
-Version:        1.6
+Version:        1.7
 Release:        1%{?dist}
 Summary:        Use class and function decorators -- even in Python 2.3
 Group:          Development/Languages
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Feb 28 2008 Luke Macken <lmacken at redhat.com> - 1.7-1
+- Update to 1.7
+
 * Tue Nov 27 2007 Luke Macken <lmacken at redhat.com> - 1.6-1
 - 1.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-decoratortools/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Nov 2007 20:46:33 -0000	1.4
+++ sources	21 Sep 2008 03:25:43 -0000	1.5
@@ -1 +1 @@
-ecfbdb2448cd9ceab09cd6fb9dd90b58  DecoratorTools-1.6.zip
+84df0a86aabec6a7d802439ffaa17585  DecoratorTools-1.7.zip



From stahnma at fedoraproject.org  Sun Sep 21 03:38:18 2008
From: stahnma at fedoraproject.org (Michael Stahnke)
Date: Sun, 21 Sep 2008 03:38:18 +0000 (UTC)
Subject: rpms/cdpr/devel cdpr.spec,1.4,1.5
Message-ID: <20080921033818.D7058700FA@cvs1.fedora.phx.redhat.com>

Author: stahnma

Update of /cvs/extras/rpms/cdpr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12511

Modified Files:
	cdpr.spec 
Log Message:
Reverting spec



Index: cdpr.spec
===================================================================
RCS file: /cvs/extras/rpms/cdpr/devel/cdpr.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cdpr.spec	21 Sep 2008 03:23:09 -0000	1.4
+++ cdpr.spec	21 Sep 2008 03:37:48 -0000	1.5
@@ -6,8 +6,7 @@
 Group:          Applications/System
 License:        GPLv2+ 
 URL:            http://sourceforge.net/projects/cdpr/ 
-Source0:        http://downloads.sf.net/sourceforge/%{name}/%{name}-%{version}.tgz
-
+Source0:        http://www.monkeymental.com/mmfiles/%{name}-%{version}.tgz
   
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,9 +45,8 @@
 
 
 %changelog
-* Sat Sep 20 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.3-2
+* Sat Sep 20 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.3-1
 - New version
-- Different URL format
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2.1-3
 - Autorebuild for GCC 4.3



From mclasen at fedoraproject.org  Sun Sep 21 04:38:54 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 21 Sep 2008 04:38:54 +0000 (UTC)
Subject: rpms/nautilus/devel description-leak.patch, NONE,
	1.1 filesystem-id-cmp.patch, NONE, 1.1 nautilus-leaks.patch,
	NONE, 1.1 nautilus.spec, 1.227, 1.228
Message-ID: <20080921043854.8B808700FA@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19337

Modified Files:
	nautilus.spec 
Added Files:
	description-leak.patch filesystem-id-cmp.patch 
	nautilus-leaks.patch 
Log Message:
plug memory leaks


description-leak.patch:

--- NEW FILE description-leak.patch ---
diff -up nautilus-2.23.92/libnautilus-private/nautilus-open-with-dialog.c.description-leak nautilus-2.23.92/libnautilus-private/nautilus-open-with-dialog.c
--- nautilus-2.23.92/libnautilus-private/nautilus-open-with-dialog.c.description-leak	2008-09-20 23:57:57.000000000 -0400
+++ nautilus-2.23.92/libnautilus-private/nautilus-open-with-dialog.c	2008-09-20 23:58:29.000000000 -0400
@@ -907,10 +907,10 @@ set_uri_and_type (NautilusOpenWithDialog
 		description = g_content_type_get_description (mime_type);
 
 		if (description == NULL) {
-			description = _("Unknown");
+			description = g_strdup (_("Unknown"));
 		}
 
-		dialog->details->type_description = g_strdup (description);
+		dialog->details->type_description = description;
 	}
 	g_free (extension);
 

filesystem-id-cmp.patch:

--- NEW FILE filesystem-id-cmp.patch ---
diff -up nautilus-2.23.92/libnautilus-private/nautilus-file.c.filesystem-id-cmp nautilus-2.23.92/libnautilus-private/nautilus-file.c
--- nautilus-2.23.92/libnautilus-private/nautilus-file.c.filesystem-id-cmp	2008-09-20 20:52:38.000000000 -0400
+++ nautilus-2.23.92/libnautilus-private/nautilus-file.c	2008-09-20 20:53:20.000000000 -0400
@@ -1836,7 +1836,7 @@ update_info_internal (NautilusFile *file
 	}
 
 	filesystem_id = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_ID_FILESYSTEM);
-	if (eel_strcmp (file->details->filesystem_id, filesystem_id) != 0) {
+	if (eel_strcmp (eel_ref_str_peek (file->details->filesystem_id), filesystem_id) != 0) {
 		changed = TRUE;
 		eel_ref_str_unref (file->details->filesystem_id);
 		file->details->filesystem_id = eel_ref_str_get_unique (filesystem_id);

nautilus-leaks.patch:

--- NEW FILE nautilus-leaks.patch ---
1eaa3d102a9df49cf41fe46fc01e88f8c1382c51
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 2c9ab69..4f9002f 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -691,6 +691,7 @@ finalize (GObject *object)
 
 	eel_g_list_free_deep (file->details->pending_extension_emblems);
 	eel_g_list_free_deep (file->details->extension_emblems);	
+	eel_g_object_list_free (file->details->pending_info_providers);
 
 	if (file->details->pending_extension_attributes) {
 		g_hash_table_destroy (file->details->pending_extension_attributes);
@@ -6530,6 +6531,9 @@ invalidate_thumbnail (NautilusFile *file)
 void
 nautilus_file_invalidate_extension_info_internal (NautilusFile *file)
 {
+	if (file->details->pending_info_providers)
+		eel_g_object_list_free (file->details->pending_info_providers);
+
 	file->details->pending_info_providers =
 		nautilus_module_get_extensions_for_type (NAUTILUS_TYPE_INFO_PROVIDER);
 }


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- nautilus.spec	9 Sep 2008 00:55:52 -0000	1.227
+++ nautilus.spec	21 Sep 2008 04:38:24 -0000	1.228
@@ -19,7 +19,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
 Version: 	2.23.92
-Release:	1%{?dist}
+Release:	3%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.23/%{name}-%{version}.tar.bz2
@@ -99,6 +99,13 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=552310
+Patch22: 	nautilus-leaks.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=553073
+Patch23:	filesystem-id-cmp.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=553084
+Patch24: 	description-leak.patch
+
 %description
 Nautilus integrates access to files, applications, media,
 Internet-based resources and the Web. Nautilus delivers a dynamic and
@@ -137,6 +144,9 @@
 %patch10 -p0 -b .gvfs-desktop-key
 %patch15 -p1 -b .xds
 %patch17 -p0 -b .symlink
+%patch22 -p1 -b .leaks
+%patch23 -p1 -b .filesystem-id-cmp
+%patch24 -p1 -b .description-leak
 
 %build
 
@@ -144,7 +154,8 @@
 aclocal
 autoconf
 
-CFLAGS="$RPM_OPT_FLAGS -g -DUGLY_HACK_TO_DETECT_KDE -DNAUTILUS_OMIT_SELF_CHECK" %configure --disable-more-warnings --disable-update-mimedb
+#CFLAGS="$RPM_OPT_FLAGS -g -DUGLY_HACK_TO_DETECT_KDE -DNAUTILUS_OMIT_SELF_CHECK" %configure --disable-more-warnings --disable-update-mimedb
+CFLAGS="-O0 -g -DUGLY_HACK_TO_DETECT_KDE -DNAUTILUS_OMIT_SELF_CHECK" %configure --disable-more-warnings --disable-update-mimedb
 
 export tagname=CC
 LANG=en_US make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
@@ -255,6 +266,12 @@
 
 
 %changelog
+* Sat Sep 20 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-3
+- Plug some memory leaks
+
+* Fri Sep 19 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-2
+- Plug some memory leaks
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 



From kkofler at fedoraproject.org  Sun Sep 21 04:53:01 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 21 Sep 2008 04:53:01 +0000 (UTC)
Subject: rpms/kdebase3/devel kdebase-3.5.10-libkrdb_dep.patch, NONE,
	1.1 kdebase3.spec, 1.70, 1.71 kdebase-3.5.9-libkrdb_dep.patch,
	1.1, NONE
Message-ID: <20080921045301.B0CA0700FA@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22382/devel

Modified Files:
	kdebase3.spec 
Added Files:
	kdebase-3.5.10-libkrdb_dep.patch 
Removed Files:
	kdebase-3.5.9-libkrdb_dep.patch 
Log Message:
* Sun Sep 21 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-2
- fix libkrdb_dep patch not to call runRdb which is not being linked in
- don't apply libkrdb_dep patch on F8-

kdebase-3.5.10-libkrdb_dep.patch:

--- NEW FILE kdebase-3.5.10-libkrdb_dep.patch ---
diff -ur kdebase-3.5.10/kcontrol/colors/colorscm.cpp kdebase-3.5.10-libkrdb_dep/kcontrol/colors/colorscm.cpp
--- kdebase-3.5.10/kcontrol/colors/colorscm.cpp	2007-01-15 12:31:49.000000000 +0100
+++ kdebase-3.5.10-libkrdb_dep/kcontrol/colors/colorscm.cpp	2008-09-21 06:45:19.000000000 +0200
@@ -390,6 +390,7 @@
     cfg2.sync();
     QApplication::syncX();
 
+#if 0
     // Notify all qt-only apps of the KDE palette changes
     uint flags = KRdbExportQtColors;
     if ( exportColors )
@@ -403,6 +404,7 @@
 #endif
     }
     runRdb( flags );	// Save the palette to qtrc for KStyles
+#endif
 
     // Notify all KDE applications
     KIPC::sendMessageAll(KIPC::PaletteChanged);
diff -ur kdebase-3.5.10/kcontrol/colors/Makefile.am kdebase-3.5.10-libkrdb_dep/kcontrol/colors/Makefile.am
--- kdebase-3.5.10/kcontrol/colors/Makefile.am	2006-03-17 11:17:17.000000000 +0100
+++ kdebase-3.5.10-libkrdb_dep/kcontrol/colors/Makefile.am	2008-09-21 06:44:39.000000000 +0200
@@ -4,7 +4,7 @@
 
 kcm_colors_la_SOURCES = colorscm.cpp widgetcanvas.cpp 
 kcm_colors_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
-kcm_colors_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/kcontrol/krdb/libkrdb.la
+kcm_colors_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
 METASOURCES = colorscm.moc widgetcanvas.moc
 
 noinst_HEADERS = colorscm.h widgetcanvas.h


Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kdebase3.spec	4 Sep 2008 07:59:54 -0000	1.70
+++ kdebase3.spec	21 Sep 2008 04:52:31 -0000	1.71
@@ -14,7 +14,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -85,8 +85,8 @@
 # modified version of kubuntu_9915_userdiskmount.diff
 # fixes NTFS (#378041) and adds PolicyKit support (#428212)
 Patch36: kdebase-3.5.9-userdiskmount.patch
-# don't link kcm_colors against libkrdb
-Patch37: kdebase-3.5.9-libkrdb_dep.patch
+# don't link kcm_colors against libkrdb (and don't call runRdb)
+Patch37: kdebase-3.5.10-libkrdb_dep.patch
 
 # security fixes
 
@@ -315,7 +315,10 @@
 %if 0%{?fedora} > 7
 %patch36 -p1 -b .userdiskmount
 %endif
+%if "%{name}" != "kdebase"
+# F9+ only - we do want to runRdb on F8
 %patch37 -p1 -b .libkrdb_dep
+%endif
 
 %if "%{name}" != "kdebase"
 # hacks to omit stuff that doesn't support DO_NOT_COMPILE
@@ -857,6 +860,10 @@
 
 
 %changelog
+* Sun Sep 21 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-2
+- fix libkrdb_dep patch not to call runRdb which is not being linked in
+- don't apply libkrdb_dep patch on F8-
+
 * Thu Aug 28 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-1
 - kde-3.5.10
 


--- kdebase-3.5.9-libkrdb_dep.patch DELETED ---



From kkofler at fedoraproject.org  Sun Sep 21 04:54:57 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 21 Sep 2008 04:54:57 +0000 (UTC)
Subject: rpms/kdebase3/F-9 kdebase-3.5.10-libkrdb_dep.patch, NONE,
	1.1 kdebase3.spec, 1.67, 1.68 kdebase-3.5.9-libkrdb_dep.patch,
	1.1, NONE
Message-ID: <20080921045457.52164700FA@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22784/F-9

Modified Files:
	kdebase3.spec 
Added Files:
	kdebase-3.5.10-libkrdb_dep.patch 
Removed Files:
	kdebase-3.5.9-libkrdb_dep.patch 
Log Message:
Sync from devel:

* Sun Sep 21 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-2
- fix libkrdb_dep patch not to call runRdb which is not being linked in
- don't apply libkrdb_dep patch on F8-

kdebase-3.5.10-libkrdb_dep.patch:

--- NEW FILE kdebase-3.5.10-libkrdb_dep.patch ---
diff -ur kdebase-3.5.10/kcontrol/colors/colorscm.cpp kdebase-3.5.10-libkrdb_dep/kcontrol/colors/colorscm.cpp
--- kdebase-3.5.10/kcontrol/colors/colorscm.cpp	2007-01-15 12:31:49.000000000 +0100
+++ kdebase-3.5.10-libkrdb_dep/kcontrol/colors/colorscm.cpp	2008-09-21 06:45:19.000000000 +0200
@@ -390,6 +390,7 @@
     cfg2.sync();
     QApplication::syncX();
 
+#if 0
     // Notify all qt-only apps of the KDE palette changes
     uint flags = KRdbExportQtColors;
     if ( exportColors )
@@ -403,6 +404,7 @@
 #endif
     }
     runRdb( flags );	// Save the palette to qtrc for KStyles
+#endif
 
     // Notify all KDE applications
     KIPC::sendMessageAll(KIPC::PaletteChanged);
diff -ur kdebase-3.5.10/kcontrol/colors/Makefile.am kdebase-3.5.10-libkrdb_dep/kcontrol/colors/Makefile.am
--- kdebase-3.5.10/kcontrol/colors/Makefile.am	2006-03-17 11:17:17.000000000 +0100
+++ kdebase-3.5.10-libkrdb_dep/kcontrol/colors/Makefile.am	2008-09-21 06:44:39.000000000 +0200
@@ -4,7 +4,7 @@
 
 kcm_colors_la_SOURCES = colorscm.cpp widgetcanvas.cpp 
 kcm_colors_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
-kcm_colors_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/kcontrol/krdb/libkrdb.la
+kcm_colors_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
 METASOURCES = colorscm.moc widgetcanvas.moc
 
 noinst_HEADERS = colorscm.h widgetcanvas.h


Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/F-9/kdebase3.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- kdebase3.spec	4 Sep 2008 07:59:54 -0000	1.67
+++ kdebase3.spec	21 Sep 2008 04:54:27 -0000	1.68
@@ -14,7 +14,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -85,8 +85,8 @@
 # modified version of kubuntu_9915_userdiskmount.diff
 # fixes NTFS (#378041) and adds PolicyKit support (#428212)
 Patch36: kdebase-3.5.9-userdiskmount.patch
-# don't link kcm_colors against libkrdb
-Patch37: kdebase-3.5.9-libkrdb_dep.patch
+# don't link kcm_colors against libkrdb (and don't call runRdb)
+Patch37: kdebase-3.5.10-libkrdb_dep.patch
 
 # security fixes
 
@@ -315,7 +315,10 @@
 %if 0%{?fedora} > 7
 %patch36 -p1 -b .userdiskmount
 %endif
+%if "%{name}" != "kdebase"
+# F9+ only - we do want to runRdb on F8
 %patch37 -p1 -b .libkrdb_dep
+%endif
 
 %if "%{name}" != "kdebase"
 # hacks to omit stuff that doesn't support DO_NOT_COMPILE
@@ -857,6 +860,10 @@
 
 
 %changelog
+* Sun Sep 21 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-2
+- fix libkrdb_dep patch not to call runRdb which is not being linked in
+- don't apply libkrdb_dep patch on F8-
+
 * Thu Aug 28 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-1
 - kde-3.5.10
 


--- kdebase-3.5.9-libkrdb_dep.patch DELETED ---



From kkofler at fedoraproject.org  Sun Sep 21 04:57:16 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 21 Sep 2008 04:57:16 +0000 (UTC)
Subject: rpms/kdebase/F-8 kdebase-3.5.10-libkrdb_dep.patch, NONE,
	1.1 kdebase.spec, 1.298, 1.299 kdebase-3.5.9-libkrdb_dep.patch,
	1.1, NONE
Message-ID: <20080921045716.B97C5700FA@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23164/F-8

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.10-libkrdb_dep.patch 
Removed Files:
	kdebase-3.5.9-libkrdb_dep.patch 
Log Message:
Sync from kdebase3/devel:

* Sun Sep 21 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-2
- fix libkrdb_dep patch not to call runRdb which is not being linked in
- don't apply libkrdb_dep patch on F8-

kdebase-3.5.10-libkrdb_dep.patch:

--- NEW FILE kdebase-3.5.10-libkrdb_dep.patch ---
diff -ur kdebase-3.5.10/kcontrol/colors/colorscm.cpp kdebase-3.5.10-libkrdb_dep/kcontrol/colors/colorscm.cpp
--- kdebase-3.5.10/kcontrol/colors/colorscm.cpp	2007-01-15 12:31:49.000000000 +0100
+++ kdebase-3.5.10-libkrdb_dep/kcontrol/colors/colorscm.cpp	2008-09-21 06:45:19.000000000 +0200
@@ -390,6 +390,7 @@
     cfg2.sync();
     QApplication::syncX();
 
+#if 0
     // Notify all qt-only apps of the KDE palette changes
     uint flags = KRdbExportQtColors;
     if ( exportColors )
@@ -403,6 +404,7 @@
 #endif
     }
     runRdb( flags );	// Save the palette to qtrc for KStyles
+#endif
 
     // Notify all KDE applications
     KIPC::sendMessageAll(KIPC::PaletteChanged);
diff -ur kdebase-3.5.10/kcontrol/colors/Makefile.am kdebase-3.5.10-libkrdb_dep/kcontrol/colors/Makefile.am
--- kdebase-3.5.10/kcontrol/colors/Makefile.am	2006-03-17 11:17:17.000000000 +0100
+++ kdebase-3.5.10-libkrdb_dep/kcontrol/colors/Makefile.am	2008-09-21 06:44:39.000000000 +0200
@@ -4,7 +4,7 @@
 
 kcm_colors_la_SOURCES = colorscm.cpp widgetcanvas.cpp 
 kcm_colors_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
-kcm_colors_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/kcontrol/krdb/libkrdb.la
+kcm_colors_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
 METASOURCES = colorscm.moc widgetcanvas.moc
 
 noinst_HEADERS = colorscm.h widgetcanvas.h


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-8/kdebase.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- kdebase.spec	4 Sep 2008 08:01:47 -0000	1.298
+++ kdebase.spec	21 Sep 2008 04:56:46 -0000	1.299
@@ -14,7 +14,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -85,8 +85,8 @@
 # modified version of kubuntu_9915_userdiskmount.diff
 # fixes NTFS (#378041) and adds PolicyKit support (#428212)
 Patch36: kdebase-3.5.9-userdiskmount.patch
-# don't link kcm_colors against libkrdb
-Patch37: kdebase-3.5.9-libkrdb_dep.patch
+# don't link kcm_colors against libkrdb (and don't call runRdb)
+Patch37: kdebase-3.5.10-libkrdb_dep.patch
 
 # security fixes
 
@@ -315,7 +315,10 @@
 %if 0%{?fedora} > 7
 %patch36 -p1 -b .userdiskmount
 %endif
+%if "%{name}" != "kdebase"
+# F9+ only - we do want to runRdb on F8
 %patch37 -p1 -b .libkrdb_dep
+%endif
 
 %if "%{name}" != "kdebase"
 # hacks to omit stuff that doesn't support DO_NOT_COMPILE
@@ -857,6 +860,10 @@
 
 
 %changelog
+* Sun Sep 21 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-2
+- fix libkrdb_dep patch not to call runRdb which is not being linked in
+- don't apply libkrdb_dep patch on F8-
+
 * Thu Aug 28 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-1
 - kde-3.5.10
 


--- kdebase-3.5.9-libkrdb_dep.patch DELETED ---



From pkgdb at fedoraproject.org  Sun Sep 21 05:55:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 05:55:37 +0000
Subject: [pkgdb] smart: scop has given up watchcommits
Message-ID: <20080921055537.A7ADB208D9F@bastion.fedora.phx.redhat.com>

scop has given up the watchcommits acl on smart (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smart



From pkgdb at fedoraproject.org  Sun Sep 21 05:55:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 05:55:40 +0000
Subject: [pkgdb] smart: scop has given up commit
Message-ID: <20080921055540.28736208DA3@bastion.fedora.phx.redhat.com>

scop has given up the commit acl on smart (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smart



From pkgdb at fedoraproject.org  Sun Sep 21 05:55:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 05:55:46 +0000
Subject: [pkgdb] smart: scop has given up watchbugzilla
Message-ID: <20080921055547.DF73C208DA6@bastion.fedora.phx.redhat.com>

scop has given up the watchbugzilla acl on smart (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smart



From pkgdb at fedoraproject.org  Sun Sep 21 05:55:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 05:55:48 +0000
Subject: [pkgdb] smart: scop has given up watchcommits
Message-ID: <20080921055548.0B566208DA9@bastion.fedora.phx.redhat.com>

scop has given up the watchcommits acl on smart (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smart



From pkgdb at fedoraproject.org  Sun Sep 21 05:55:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 05:55:48 +0000
Subject: [pkgdb] smart: scop has given up watchbugzilla
Message-ID: <20080921055548.A513A208DAC@bastion.fedora.phx.redhat.com>

scop has given up the watchbugzilla acl on smart (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smart



From pkgdb at fedoraproject.org  Sun Sep 21 05:55:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 05:55:49 +0000
Subject: [pkgdb] smart: scop has given up commit
Message-ID: <20080921055549.9B1BE208DAD@bastion.fedora.phx.redhat.com>

scop has given up the commit acl on smart (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smart



From pkgdb at fedoraproject.org  Sun Sep 21 05:55:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 05:55:52 +0000
Subject: [pkgdb] smart: scop has given up watchbugzilla
Message-ID: <20080921055552.40FBA208DB0@bastion.fedora.phx.redhat.com>

scop has given up the watchbugzilla acl on smart (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smart



From pkgdb at fedoraproject.org  Sun Sep 21 05:55:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 05:55:53 +0000
Subject: [pkgdb] smart: scop has given up watchcommits
Message-ID: <20080921055553.B94DC208DB3@bastion.fedora.phx.redhat.com>

scop has given up the watchcommits acl on smart (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smart



From pkgdb at fedoraproject.org  Sun Sep 21 05:55:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 05:55:54 +0000
Subject: [pkgdb] smart: scop has given up commit
Message-ID: <20080921055554.C76F0208DB6@bastion.fedora.phx.redhat.com>

scop has given up the commit acl on smart (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smart



From pkgdb at fedoraproject.org  Sun Sep 21 05:57:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 05:57:45 +0000
Subject: [pkgdb] fedora-package-config-smart: scop has given up watchbugzilla
Message-ID: <20080921055745.6BADA208DA2@bastion.fedora.phx.redhat.com>

scop has given up the watchbugzilla acl on fedora-package-config-smart (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-package-config-smart



From pkgdb at fedoraproject.org  Sun Sep 21 05:57:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 05:57:52 +0000
Subject: [pkgdb] fedora-package-config-smart: scop has given up watchbugzilla
Message-ID: <20080921055752.D663E208DA3@bastion.fedora.phx.redhat.com>

scop has given up the watchbugzilla acl on fedora-package-config-smart (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-package-config-smart



From pkgdb at fedoraproject.org  Sun Sep 21 05:58:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 05:58:00 +0000
Subject: [pkgdb] fedora-package-config-smart: scop has given up watchbugzilla
Message-ID: <20080921055800.D70FE208DA2@bastion.fedora.phx.redhat.com>

scop has given up the watchbugzilla acl on fedora-package-config-smart (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-package-config-smart



From dtimms at fedoraproject.org  Sun Sep 21 06:53:20 2008
From: dtimms at fedoraproject.org (David Timms)
Date: Sun, 21 Sep 2008 06:53:20 +0000 (UTC)
Subject: rpms/sms_ntsc/devel import.log, NONE, 1.1 sms_ntsc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080921065320.97157700FA@cvs1.fedora.phx.redhat.com>

Author: dtimms

Update of /cvs/pkgs/rpms/sms_ntsc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2551/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sms_ntsc.spec 
Log Message:
Initial import of sms_ntsc .src.rpm into fedora



--- NEW FILE import.log ---
sms_ntsc-0_2_3-3_fc9:HEAD:sms_ntsc-0.2.3-3.fc9.src.rpm:1221979909


--- NEW FILE sms_ntsc.spec ---
%define        libname lib%{name}.so

Name:          sms_ntsc
Version:       0.2.3
Release:       3%{?dist}
Summary:       Provides an SMS NTSC video filtering library

Group:         System Environment/Libraries
License:       LGPLv2+
URL:           http://www.slack.net/~ant/libs/ntsc.html
Source0:       http://blargg.fileave.com/libs/%{name}-%{version}.zip
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: SDL-devel

%description
Sega Master System NTSC video filter library. Reproduces the significant
artifacts on the vertical edges of some colors that occur when colours, and 
the general color mixing that occur when graphics are rendered via an NTSC
video connection to a television. Accepts pixels in 16-bit RGB or 12-bit BGR
(native Game Gear palette format). It can also output an RGB palette for use
in a regular blitter.


%package devel
Summary:        Development files for sms_ntsc
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
Development files for sms_ntsc


%package demos
Summary:        Examples using sms_ntsc
Group:          Development/Libraries

%description demos
Examples using sms_ntsc


%prep
%setup -q
# Some location cleanups
sed -i 's|"SDL.h"|<SDL/SDL.h>|' demo_impl.h
sed -i 's|test.bmp|%{_datadir}/%{name}/test.bmp|' demo.c

#Fix EOL encoding
%{__sed} -i 's/\r//' *.txt


%build
# Compile library, link and give it an soname
gcc -c %{optflags} -fPIC %{name}.c
gcc %{optflags} -shared -Wl,-soname,%{libname}.0 -Wl,-lm -o %{libname}.%{version} %{name}.o

# Make symlinks now as they are needed
ln -s %{libname}.%{version} %{libname}.0
ln -s %{libname}.%{version} %{libname}

# Compile demos
gcc %{optflags} benchmark.c -o %{name}_benchmark -L. -l%{name}
gcc %{optflags} demo.c -o %{name}_demo -L. -l%{name} -lSDL


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_libdir} \
         %{buildroot}%{_includedir} %{buildroot}%{_datadir}/%{name}

# Install include
install -pm 0644 %{name}.h %{buildroot}%{_includedir}
install -pm 0644 %{name}_config.h %{buildroot}%{_includedir}

# Install example
install -pm 0644 test.bmp %{buildroot}%{_datadir}/%{name}

# Install lib and symlinks
install -pm 0755 %{libname}.%{version} %{buildroot}%{_libdir}
mv %{libname}.0 %{buildroot}%{_libdir}
mv %{libname} %{buildroot}%{_libdir}

# Install demos
install -pm0755 %{name}_benchmark %{buildroot}%{_bindir}
install -pm0755 %{name}_demo %{buildroot}%{_bindir}


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_libdir}/%{libname}.0
%{_libdir}/%{libname}.%{version}
%doc changes.txt license.txt


%files devel
%defattr(-,root,root,-)
%{_libdir}/%{libname}
%{_includedir}/%{name}.h
%{_includedir}/%{name}_config.h
%doc %{name}.txt readme.txt


%files demos
%defattr(-,root,root,-)
%{_datadir}/%{name}
%{_bindir}/*


%changelog
* Thu Sep 11 2008 David Timms <iinet.net.au at dtimms> 0.2.3-3
- Initial import and release bump into fedora

* Tue Aug 14 2007 Ian Chapman <packages at amiga-hardware.com> 0.2.3-2
- Updated license field due to new guidelines
- Improved use of macros

* Mon Jun 11 2007 Ian Chapman <packages at amiga-hardware.com> 0.2.3-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sms_ntsc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2008 00:24:34 -0000	1.1
+++ .cvsignore	21 Sep 2008 06:52:50 -0000	1.2
@@ -0,0 +1 @@
+sms_ntsc-0.2.3.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sms_ntsc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2008 00:24:34 -0000	1.1
+++ sources	21 Sep 2008 06:52:50 -0000	1.2
@@ -0,0 +1 @@
+4aea73f7289a1a28fea2450d6d0cff66  sms_ntsc-0.2.3.zip



From dtimms at fedoraproject.org  Sun Sep 21 06:57:00 2008
From: dtimms at fedoraproject.org (David Timms)
Date: Sun, 21 Sep 2008 06:57:00 +0000 (UTC)
Subject: rpms/snes_ntsc/devel import.log, NONE, 1.1 snes_ntsc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080921065700.8248F700FA@cvs1.fedora.phx.redhat.com>

Author: dtimms

Update of /cvs/pkgs/rpms/snes_ntsc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3153/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log snes_ntsc.spec 
Log Message:
Initial import of snes_ntsc .src.rpm into fedora



--- NEW FILE import.log ---
snes_ntsc-0_2_2-3_fc9:HEAD:snes_ntsc-0.2.2-3.fc9.src.rpm:1221980153


--- NEW FILE snes_ntsc.spec ---
%define        libname lib%{name}.so

Name:          snes_ntsc
Version:       0.2.2
Release:       3%{?dist}
Summary:       Provides a SNES NTSC video filtering library

Group:         System Environment/Libraries
License:       LGPLv2+
URL:           http://www.slack.net/~ant/libs/ntsc.html
Source0:       http://blargg.fileave.com/libs/%{name}-%{version}.zip
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: SDL-devel

%description
Super NES NTSC video filter. The main benefit is color mixing, as composite
video artifacts are less noticeable than on the NES. Accepts pixels in 16-bit
RGB or 15-bit BGR (native SNES format).


%package devel
Summary:        Development files for snes_ntsc
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
Development files for snes_ntsc


%package demos
Summary:        Examples using snes_ntsc
Group:          Development/Libraries

%description demos
Examples using snes_ntsc


%prep
%setup -q
# Some location cleanups
%{__sed} -i 's/\"SDL.h\"/\<SDL\/SDL.h\>/' demo_impl.h
%{__sed} -i 's/\"test.bmp\"/\"\/usr\/share\/snes_ntsc\/test.bmp\"/' demo.c

#Fix EOL encoding
%{__sed} -i 's/\r//' *.txt


%build
# Compile library, link and give it an soname
gcc -c %{optflags} -fPIC %{name}.c
gcc %{optflags} -shared -Wl,-soname,%{libname}.0 -Wl,-lm -o %{libname}.%{version} %{name}.o

# Make symlinks now as they are needed
ln -s %{libname}.%{version} %{libname}.0
ln -s %{libname}.%{version} %{libname}

# Compile demos
gcc %{optflags} benchmark.c -o snes_ntsc_benchmark -L. -lsnes_ntsc
gcc %{optflags} demo.c -o snes_ntsc_demo -L. -lsnes_ntsc -lSDL


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_libdir} \
         %{buildroot}%{_includedir} %{buildroot}%{_datadir}/%{name}

# Install include
install -pm 0644 %{name}.h %{buildroot}%{_includedir}
install -pm 0644 %{name}_config.h %{buildroot}%{_includedir}

# Install example
install -pm 0644 test.bmp %{buildroot}%{_datadir}/%{name}

# Install lib and symlinks
install -pm 0755 %{libname}.%{version} %{buildroot}%{_libdir}
mv %{libname}.0 %{buildroot}%{_libdir}
mv %{libname} %{buildroot}%{_libdir}

# Install demos
install -m0755 snes_ntsc_benchmark %{buildroot}%{_bindir}
install -m0755 snes_ntsc_demo %{buildroot}%{_bindir}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_libdir}/%{libname}.0
%{_libdir}/%{libname}.%{version}
%doc changes.txt license.txt


%files devel
%defattr(-,root,root,-)
%{_libdir}/%{libname}
%{_includedir}/%{name}.h
%{_includedir}/%{name}_config.h
%doc snes_ntsc.txt readme.txt


%files demos
%defattr(-,root,root,-)
%{_datadir}/%{name}
%{_bindir}/snes_ntsc_benchmark
%{_bindir}/snes_ntsc_demo


%changelog
* Thu Sep 11 2008 David Timms <iinet.net.au at dtimms> 0.2.2-3
- Initial import into fedora and release bump

* Mon Jun 11 2007 Ian Chapman <packages at amiga-hardware.com> 0.2.2-2
- Fix undefined-non-weak-symbol warnings

* Sun Feb 25 2007 Ian Chapman <packages at amiga-hardware.com> 0.2.2-1
- Upgrade to 0.2.2
- Increased use of macros

* Sun Oct 29 2006 Ian Chapman <packages at amiga-hardware.com> 0.2.1-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snes_ntsc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2008 00:26:16 -0000	1.1
+++ .cvsignore	21 Sep 2008 06:56:30 -0000	1.2
@@ -0,0 +1 @@
+snes_ntsc-0.2.2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snes_ntsc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2008 00:26:16 -0000	1.1
+++ sources	21 Sep 2008 06:56:30 -0000	1.2
@@ -0,0 +1 @@
+07b10506e4d57b0ef312eedaae537cc2  snes_ntsc-0.2.2.zip



From hedayat at fedoraproject.org  Sun Sep 21 07:04:56 2008
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Sun, 21 Sep 2008 07:04:56 +0000 (UTC)
Subject: rpms/rcsslogplayer/devel import.log, NONE,
	1.1 rcsslogplayer-12.1.1-gcc43fix.patch, NONE,
	1.1 rcsslogplayer.desktop, NONE, 1.1 rcsslogplayer.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080921070456.43B75700FA@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcsslogplayer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4337/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rcsslogplayer-12.1.1-gcc43fix.patch 
	rcsslogplayer.desktop rcsslogplayer.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
rcsslogplayer-12_1_1-2_fc9:HEAD:rcsslogplayer-12.1.1-2.fc9.src.rpm:1221980415

rcsslogplayer-12.1.1-gcc43fix.patch:

--- NEW FILE rcsslogplayer-12.1.1-gcc43fix.patch ---
diff -up rcsslogplayer-12.1.1/classic/controler.cpp.gcc43fix rcsslogplayer-12.1.1/classic/controler.cpp
--- rcsslogplayer-12.1.1/classic/controler.cpp.gcc43fix	2008-07-22 08:27:06.000000000 +0430
+++ rcsslogplayer-12.1.1/classic/controler.cpp	2008-09-15 00:33:04.000000000 +0430
@@ -46,6 +46,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <iostream>
+#include <cstring>
 
 
 #include <X11/Intrinsic.h>
diff -up rcsslogplayer-12.1.1/classic/nowindow.cpp.gcc43fix rcsslogplayer-12.1.1/classic/nowindow.cpp
--- rcsslogplayer-12.1.1/classic/nowindow.cpp.gcc43fix	2008-07-22 08:27:06.000000000 +0430
+++ rcsslogplayer-12.1.1/classic/nowindow.cpp	2008-09-15 00:33:25.000000000 +0430
@@ -49,6 +49,7 @@
 #include <cmath>
 #include <csignal>
 #include <cerrno>
+#include <cstring>
 
 #include <sys/select.h> // select() : POSIX 1003.1-2001
 #include <sys/time.h> // select() : previous standards
diff -up rcsslogplayer-12.1.1/qt4/disp_holder.cpp.gcc43fix rcsslogplayer-12.1.1/qt4/disp_holder.cpp
--- rcsslogplayer-12.1.1/qt4/disp_holder.cpp.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/qt4/disp_holder.cpp	2008-09-15 00:33:48.000000000 +0430
@@ -41,6 +41,7 @@
 
 #include <sstream>
 #include <cmath>
+#include <cstring>
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
diff -up rcsslogplayer-12.1.1/qt4/monitor_server.cpp.gcc43fix rcsslogplayer-12.1.1/qt4/monitor_server.cpp
--- rcsslogplayer-12.1.1/qt4/monitor_server.cpp.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/qt4/monitor_server.cpp	2008-09-15 00:39:51.000000000 +0430
@@ -47,6 +47,7 @@
 #include <sstream>
 #include <iostream>
 #include <cassert>
+#include <cstring>
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
diff -up rcsslogplayer-12.1.1/qt4/mouse_state.h.gcc43fix rcsslogplayer-12.1.1/qt4/mouse_state.h
--- rcsslogplayer-12.1.1/qt4/mouse_state.h.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/qt4/mouse_state.h	2008-09-15 00:37:28.000000000 +0430
@@ -103,8 +103,8 @@ public:
     bool isDragged() const
       {
           return ( M_pressed
-                   && ( std::abs( M_pressed_point.x() - M_dragged_point.x() ) > 2
-                        || std::abs( M_pressed_point.y() - M_dragged_point.y() ) > 2 )
+                   && ( std::abs( float(M_pressed_point.x() - M_dragged_point.x()) ) > 2
+                        || std::abs( float(M_pressed_point.y() - M_dragged_point.y()) ) > 2 )
                    );
       }
 
diff -up rcsslogplayer-12.1.1/qt4/team_graphic_painter.cpp.gcc43fix rcsslogplayer-12.1.1/qt4/team_graphic_painter.cpp
--- rcsslogplayer-12.1.1/qt4/team_graphic_painter.cpp.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/qt4/team_graphic_painter.cpp	2008-09-15 00:40:28.000000000 +0430
@@ -42,6 +42,7 @@
 #include "options.h"
 
 #include <iostream>
+#include <cstring>
 
 
 /*-------------------------------------------------------------------*/
diff -up rcsslogplayer-12.1.1/rcsslogplayer/parser.cpp.gcc43fix rcsslogplayer-12.1.1/rcsslogplayer/parser.cpp
--- rcsslogplayer-12.1.1/rcsslogplayer/parser.cpp.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/rcsslogplayer/parser.cpp	2008-09-15 00:31:38.000000000 +0430
@@ -44,6 +44,7 @@
 #include <map>
 #include <cmath>
 #include <cstdlib>
+#include <cstring>
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
diff -up rcsslogplayer-12.1.1/rcsslogplayer/util.cpp.gcc43fix rcsslogplayer-12.1.1/rcsslogplayer/util.cpp
--- rcsslogplayer-12.1.1/rcsslogplayer/util.cpp.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/rcsslogplayer/util.cpp	2008-09-15 00:32:01.000000000 +0430
@@ -46,6 +46,7 @@
 #include <rcsslogplayer/types.h>
 
 #include <cmath>
+#include <cstring>
 
 namespace {
 const float DEG2RADF = 3.14159265358979323846f / 180.0f;
diff -up rcsslogplayer-12.1.1/tool/rcg2xml.cpp.gcc43fix rcsslogplayer-12.1.1/tool/rcg2xml.cpp
--- rcsslogplayer-12.1.1/tool/rcg2xml.cpp.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/tool/rcg2xml.cpp	2008-09-15 00:32:35.000000000 +0430
@@ -35,6 +35,7 @@
 
 #include <iostream>
 #include <limits>
+#include <cstring>
 
 static int MAX_TIME = std::numeric_limits< short >::max();
 


--- NEW FILE rcsslogplayer.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=RoboCup 2D Soccer Simulator LogPlayer
Comment=A LogPlayer for RoboCup 2D Soccer Simulator
Exec=rcsslogplayer
Icon=rcsslogplayer
Terminal=false
Type=Application
Categories=Education;Science;Robotics;



--- NEW FILE rcsslogplayer.spec ---
Name:           rcsslogplayer
Version:        12.1.1
Release:        2%{?dist}
Summary:        RoboCup Soccer Simulator LogPlayer
Group:          Applications/System

# %{_libdir}/*, %{_includedir}/*, %{_bindir}/rcsslogplayer_classic,
# %{_bindir}/rcg2xml are under LGPLv2+, others are under GPLv2+
License:        LGPLv2+ and GPLv2+
URL:            http://sourceforge.net/projects/sserver/
Source0:        http://downloads.sourceforge.net/sserver/%{name}-%{version}.tar.gz
# Source 1 is created by me.
Source1:        %{name}.desktop
Patch0:         %{name}-12.1.1-gcc43fix.patch

Requires:       rcssmonitor

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  automake libtool boost-devel rcssbase-devel qt-devel
BuildRequires:  desktop-file-utils libXaw-devel


%description
The RoboCup Soccer Simulator LogPlayer (rcsslogpleyr) is a game log
replay tool for the RoboCup Soccer Simulator Server (rcssserver).

%package        devel
Summary:        Header files and libraries for %{name}
License:        LGPLv2+
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       boost-devel

%description    devel
This package contains the header files and libraries
for %{name}. If you like to develop programs using %{name},
you will need to install %{name}-devel.

%prep
%setup -q
%patch0 -p1 -b .gcc43fix
sed -i.lib \
    -e 's|\$ac_boost_path/lib|\$libdir|' \
    -e 's|$ac_boost_path_tmp/lib|\$libdir|' \
    m4/ax_boost_base.m4
autoreconf --install -f
# Fix rpath
sed -i.rpath -e '/sys_lib_search_path_spec/s| /usr/lib| /lib64 /usr/lib64 /usr/lib|' \
    configure

%build
%configure --with-qt4-moc=%{_bindir}/moc-qt4
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
rm -rf %{buildroot}/%{_libdir}/*.la

mkdir %{buildroot}/%{_datadir}/pixmaps/
cp -p icons/rcss.xpm %{buildroot}/%{_datadir}/pixmaps/rcsslogplayer.xpm

desktop-file-install --vendor="fedora"                 \
  --dir=%{buildroot}/%{_datadir}/applications %{SOURCE1}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README 
%{_bindir}/*
%{_libdir}/*.so.*
%{_datadir}/%{name}
%{_datadir}/pixmaps/*
%{_datadir}/applications/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so

%changelog
* Sat Sep 20 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.1-2
(Thanks to Mamoru Tasaka)
- Fixed -devel sub package license tag
- Fixed build failure caused by not finding moc-qt4 binary
- Fixed .desktop file category

* Mon Sep 15 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.1-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rcsslogplayer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2008 00:27:58 -0000	1.1
+++ .cvsignore	21 Sep 2008 07:04:25 -0000	1.2
@@ -0,0 +1 @@
+rcsslogplayer-12.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rcsslogplayer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2008 00:27:58 -0000	1.1
+++ sources	21 Sep 2008 07:04:25 -0000	1.2
@@ -0,0 +1 @@
+9b80568477c8d8246691573e3234f264  rcsslogplayer-12.1.1.tar.gz



From hedayat at fedoraproject.org  Sun Sep 21 07:09:44 2008
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Sun, 21 Sep 2008 07:09:44 +0000 (UTC)
Subject: rpms/rcsslogplayer/F-8 rcsslogplayer-12.1.1-gcc43fix.patch, NONE,
	1.1 rcsslogplayer.desktop, NONE, 1.1 rcsslogplayer.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20080921070944.99700700FA@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcsslogplayer/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5059/F-8

Modified Files:
	sources 
Added Files:
	rcsslogplayer-12.1.1-gcc43fix.patch rcsslogplayer.desktop 
	rcsslogplayer.spec 
Log Message:
import to other branches

rcsslogplayer-12.1.1-gcc43fix.patch:

--- NEW FILE rcsslogplayer-12.1.1-gcc43fix.patch ---
diff -up rcsslogplayer-12.1.1/classic/controler.cpp.gcc43fix rcsslogplayer-12.1.1/classic/controler.cpp
--- rcsslogplayer-12.1.1/classic/controler.cpp.gcc43fix	2008-07-22 08:27:06.000000000 +0430
+++ rcsslogplayer-12.1.1/classic/controler.cpp	2008-09-15 00:33:04.000000000 +0430
@@ -46,6 +46,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <iostream>
+#include <cstring>
 
 
 #include <X11/Intrinsic.h>
diff -up rcsslogplayer-12.1.1/classic/nowindow.cpp.gcc43fix rcsslogplayer-12.1.1/classic/nowindow.cpp
--- rcsslogplayer-12.1.1/classic/nowindow.cpp.gcc43fix	2008-07-22 08:27:06.000000000 +0430
+++ rcsslogplayer-12.1.1/classic/nowindow.cpp	2008-09-15 00:33:25.000000000 +0430
@@ -49,6 +49,7 @@
 #include <cmath>
 #include <csignal>
 #include <cerrno>
+#include <cstring>
 
 #include <sys/select.h> // select() : POSIX 1003.1-2001
 #include <sys/time.h> // select() : previous standards
diff -up rcsslogplayer-12.1.1/qt4/disp_holder.cpp.gcc43fix rcsslogplayer-12.1.1/qt4/disp_holder.cpp
--- rcsslogplayer-12.1.1/qt4/disp_holder.cpp.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/qt4/disp_holder.cpp	2008-09-15 00:33:48.000000000 +0430
@@ -41,6 +41,7 @@
 
 #include <sstream>
 #include <cmath>
+#include <cstring>
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
diff -up rcsslogplayer-12.1.1/qt4/monitor_server.cpp.gcc43fix rcsslogplayer-12.1.1/qt4/monitor_server.cpp
--- rcsslogplayer-12.1.1/qt4/monitor_server.cpp.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/qt4/monitor_server.cpp	2008-09-15 00:39:51.000000000 +0430
@@ -47,6 +47,7 @@
 #include <sstream>
 #include <iostream>
 #include <cassert>
+#include <cstring>
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
diff -up rcsslogplayer-12.1.1/qt4/mouse_state.h.gcc43fix rcsslogplayer-12.1.1/qt4/mouse_state.h
--- rcsslogplayer-12.1.1/qt4/mouse_state.h.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/qt4/mouse_state.h	2008-09-15 00:37:28.000000000 +0430
@@ -103,8 +103,8 @@ public:
     bool isDragged() const
       {
           return ( M_pressed
-                   && ( std::abs( M_pressed_point.x() - M_dragged_point.x() ) > 2
-                        || std::abs( M_pressed_point.y() - M_dragged_point.y() ) > 2 )
+                   && ( std::abs( float(M_pressed_point.x() - M_dragged_point.x()) ) > 2
+                        || std::abs( float(M_pressed_point.y() - M_dragged_point.y()) ) > 2 )
                    );
       }
 
diff -up rcsslogplayer-12.1.1/qt4/team_graphic_painter.cpp.gcc43fix rcsslogplayer-12.1.1/qt4/team_graphic_painter.cpp
--- rcsslogplayer-12.1.1/qt4/team_graphic_painter.cpp.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/qt4/team_graphic_painter.cpp	2008-09-15 00:40:28.000000000 +0430
@@ -42,6 +42,7 @@
 #include "options.h"
 
 #include <iostream>
+#include <cstring>
 
 
 /*-------------------------------------------------------------------*/
diff -up rcsslogplayer-12.1.1/rcsslogplayer/parser.cpp.gcc43fix rcsslogplayer-12.1.1/rcsslogplayer/parser.cpp
--- rcsslogplayer-12.1.1/rcsslogplayer/parser.cpp.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/rcsslogplayer/parser.cpp	2008-09-15 00:31:38.000000000 +0430
@@ -44,6 +44,7 @@
 #include <map>
 #include <cmath>
 #include <cstdlib>
+#include <cstring>
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
diff -up rcsslogplayer-12.1.1/rcsslogplayer/util.cpp.gcc43fix rcsslogplayer-12.1.1/rcsslogplayer/util.cpp
--- rcsslogplayer-12.1.1/rcsslogplayer/util.cpp.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/rcsslogplayer/util.cpp	2008-09-15 00:32:01.000000000 +0430
@@ -46,6 +46,7 @@
 #include <rcsslogplayer/types.h>
 
 #include <cmath>
+#include <cstring>
 
 namespace {
 const float DEG2RADF = 3.14159265358979323846f / 180.0f;
diff -up rcsslogplayer-12.1.1/tool/rcg2xml.cpp.gcc43fix rcsslogplayer-12.1.1/tool/rcg2xml.cpp
--- rcsslogplayer-12.1.1/tool/rcg2xml.cpp.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/tool/rcg2xml.cpp	2008-09-15 00:32:35.000000000 +0430
@@ -35,6 +35,7 @@
 
 #include <iostream>
 #include <limits>
+#include <cstring>
 
 static int MAX_TIME = std::numeric_limits< short >::max();
 


--- NEW FILE rcsslogplayer.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=RoboCup 2D Soccer Simulator LogPlayer
Comment=A LogPlayer for RoboCup 2D Soccer Simulator
Exec=rcsslogplayer
Icon=rcsslogplayer
Terminal=false
Type=Application
Categories=Education;Science;Robotics;



--- NEW FILE rcsslogplayer.spec ---
Name:           rcsslogplayer
Version:        12.1.1
Release:        2%{?dist}
Summary:        RoboCup Soccer Simulator LogPlayer
Group:          Applications/System

# %{_libdir}/*, %{_includedir}/*, %{_bindir}/rcsslogplayer_classic,
# %{_bindir}/rcg2xml are under LGPLv2+, others are under GPLv2+
License:        LGPLv2+ and GPLv2+
URL:            http://sourceforge.net/projects/sserver/
Source0:        http://downloads.sourceforge.net/sserver/%{name}-%{version}.tar.gz
# Source 1 is created by me.
Source1:        %{name}.desktop
Patch0:         %{name}-12.1.1-gcc43fix.patch

Requires:       rcssmonitor

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  automake libtool boost-devel rcssbase-devel qt-devel
BuildRequires:  desktop-file-utils libXaw-devel


%description
The RoboCup Soccer Simulator LogPlayer (rcsslogpleyr) is a game log
replay tool for the RoboCup Soccer Simulator Server (rcssserver).

%package        devel
Summary:        Header files and libraries for %{name}
License:        LGPLv2+
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       boost-devel

%description    devel
This package contains the header files and libraries
for %{name}. If you like to develop programs using %{name},
you will need to install %{name}-devel.

%prep
%setup -q
%patch0 -p1 -b .gcc43fix
sed -i.lib \
    -e 's|\$ac_boost_path/lib|\$libdir|' \
    -e 's|$ac_boost_path_tmp/lib|\$libdir|' \
    m4/ax_boost_base.m4
autoreconf --install -f
# Fix rpath
sed -i.rpath -e '/sys_lib_search_path_spec/s| /usr/lib| /lib64 /usr/lib64 /usr/lib|' \
    configure

%build
%configure --with-qt4-moc=%{_bindir}/moc-qt4
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
rm -rf %{buildroot}/%{_libdir}/*.la

mkdir %{buildroot}/%{_datadir}/pixmaps/
cp -p icons/rcss.xpm %{buildroot}/%{_datadir}/pixmaps/rcsslogplayer.xpm

desktop-file-install --vendor="fedora"                 \
  --dir=%{buildroot}/%{_datadir}/applications %{SOURCE1}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README 
%{_bindir}/*
%{_libdir}/*.so.*
%{_datadir}/%{name}
%{_datadir}/pixmaps/*
%{_datadir}/applications/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so

%changelog
* Sat Sep 20 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.1-2
(Thanks to Mamoru Tasaka)
- Fixed -devel sub package license tag
- Fixed build failure caused by not finding moc-qt4 binary
- Fixed .desktop file category

* Mon Sep 15 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.1-1
- Initial version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rcsslogplayer/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2008 00:27:58 -0000	1.1
+++ sources	21 Sep 2008 07:09:14 -0000	1.2
@@ -0,0 +1 @@
+9b80568477c8d8246691573e3234f264  rcsslogplayer-12.1.1.tar.gz



From hedayat at fedoraproject.org  Sun Sep 21 07:09:44 2008
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Sun, 21 Sep 2008 07:09:44 +0000 (UTC)
Subject: rpms/rcsslogplayer/F-9 rcsslogplayer-12.1.1-gcc43fix.patch, NONE,
	1.1 rcsslogplayer.desktop, NONE, 1.1 rcsslogplayer.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20080921070944.C4798700FA@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcsslogplayer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5059/F-9

Modified Files:
	sources 
Added Files:
	rcsslogplayer-12.1.1-gcc43fix.patch rcsslogplayer.desktop 
	rcsslogplayer.spec 
Log Message:
import to other branches

rcsslogplayer-12.1.1-gcc43fix.patch:

--- NEW FILE rcsslogplayer-12.1.1-gcc43fix.patch ---
diff -up rcsslogplayer-12.1.1/classic/controler.cpp.gcc43fix rcsslogplayer-12.1.1/classic/controler.cpp
--- rcsslogplayer-12.1.1/classic/controler.cpp.gcc43fix	2008-07-22 08:27:06.000000000 +0430
+++ rcsslogplayer-12.1.1/classic/controler.cpp	2008-09-15 00:33:04.000000000 +0430
@@ -46,6 +46,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <iostream>
+#include <cstring>
 
 
 #include <X11/Intrinsic.h>
diff -up rcsslogplayer-12.1.1/classic/nowindow.cpp.gcc43fix rcsslogplayer-12.1.1/classic/nowindow.cpp
--- rcsslogplayer-12.1.1/classic/nowindow.cpp.gcc43fix	2008-07-22 08:27:06.000000000 +0430
+++ rcsslogplayer-12.1.1/classic/nowindow.cpp	2008-09-15 00:33:25.000000000 +0430
@@ -49,6 +49,7 @@
 #include <cmath>
 #include <csignal>
 #include <cerrno>
+#include <cstring>
 
 #include <sys/select.h> // select() : POSIX 1003.1-2001
 #include <sys/time.h> // select() : previous standards
diff -up rcsslogplayer-12.1.1/qt4/disp_holder.cpp.gcc43fix rcsslogplayer-12.1.1/qt4/disp_holder.cpp
--- rcsslogplayer-12.1.1/qt4/disp_holder.cpp.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/qt4/disp_holder.cpp	2008-09-15 00:33:48.000000000 +0430
@@ -41,6 +41,7 @@
 
 #include <sstream>
 #include <cmath>
+#include <cstring>
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
diff -up rcsslogplayer-12.1.1/qt4/monitor_server.cpp.gcc43fix rcsslogplayer-12.1.1/qt4/monitor_server.cpp
--- rcsslogplayer-12.1.1/qt4/monitor_server.cpp.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/qt4/monitor_server.cpp	2008-09-15 00:39:51.000000000 +0430
@@ -47,6 +47,7 @@
 #include <sstream>
 #include <iostream>
 #include <cassert>
+#include <cstring>
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
diff -up rcsslogplayer-12.1.1/qt4/mouse_state.h.gcc43fix rcsslogplayer-12.1.1/qt4/mouse_state.h
--- rcsslogplayer-12.1.1/qt4/mouse_state.h.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/qt4/mouse_state.h	2008-09-15 00:37:28.000000000 +0430
@@ -103,8 +103,8 @@ public:
     bool isDragged() const
       {
           return ( M_pressed
-                   && ( std::abs( M_pressed_point.x() - M_dragged_point.x() ) > 2
-                        || std::abs( M_pressed_point.y() - M_dragged_point.y() ) > 2 )
+                   && ( std::abs( float(M_pressed_point.x() - M_dragged_point.x()) ) > 2
+                        || std::abs( float(M_pressed_point.y() - M_dragged_point.y()) ) > 2 )
                    );
       }
 
diff -up rcsslogplayer-12.1.1/qt4/team_graphic_painter.cpp.gcc43fix rcsslogplayer-12.1.1/qt4/team_graphic_painter.cpp
--- rcsslogplayer-12.1.1/qt4/team_graphic_painter.cpp.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/qt4/team_graphic_painter.cpp	2008-09-15 00:40:28.000000000 +0430
@@ -42,6 +42,7 @@
 #include "options.h"
 
 #include <iostream>
+#include <cstring>
 
 
 /*-------------------------------------------------------------------*/
diff -up rcsslogplayer-12.1.1/rcsslogplayer/parser.cpp.gcc43fix rcsslogplayer-12.1.1/rcsslogplayer/parser.cpp
--- rcsslogplayer-12.1.1/rcsslogplayer/parser.cpp.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/rcsslogplayer/parser.cpp	2008-09-15 00:31:38.000000000 +0430
@@ -44,6 +44,7 @@
 #include <map>
 #include <cmath>
 #include <cstdlib>
+#include <cstring>
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
diff -up rcsslogplayer-12.1.1/rcsslogplayer/util.cpp.gcc43fix rcsslogplayer-12.1.1/rcsslogplayer/util.cpp
--- rcsslogplayer-12.1.1/rcsslogplayer/util.cpp.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/rcsslogplayer/util.cpp	2008-09-15 00:32:01.000000000 +0430
@@ -46,6 +46,7 @@
 #include <rcsslogplayer/types.h>
 
 #include <cmath>
+#include <cstring>
 
 namespace {
 const float DEG2RADF = 3.14159265358979323846f / 180.0f;
diff -up rcsslogplayer-12.1.1/tool/rcg2xml.cpp.gcc43fix rcsslogplayer-12.1.1/tool/rcg2xml.cpp
--- rcsslogplayer-12.1.1/tool/rcg2xml.cpp.gcc43fix	2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/tool/rcg2xml.cpp	2008-09-15 00:32:35.000000000 +0430
@@ -35,6 +35,7 @@
 
 #include <iostream>
 #include <limits>
+#include <cstring>
 
 static int MAX_TIME = std::numeric_limits< short >::max();
 


--- NEW FILE rcsslogplayer.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=RoboCup 2D Soccer Simulator LogPlayer
Comment=A LogPlayer for RoboCup 2D Soccer Simulator
Exec=rcsslogplayer
Icon=rcsslogplayer
Terminal=false
Type=Application
Categories=Education;Science;Robotics;



--- NEW FILE rcsslogplayer.spec ---
Name:           rcsslogplayer
Version:        12.1.1
Release:        2%{?dist}
Summary:        RoboCup Soccer Simulator LogPlayer
Group:          Applications/System

# %{_libdir}/*, %{_includedir}/*, %{_bindir}/rcsslogplayer_classic,
# %{_bindir}/rcg2xml are under LGPLv2+, others are under GPLv2+
License:        LGPLv2+ and GPLv2+
URL:            http://sourceforge.net/projects/sserver/
Source0:        http://downloads.sourceforge.net/sserver/%{name}-%{version}.tar.gz
# Source 1 is created by me.
Source1:        %{name}.desktop
Patch0:         %{name}-12.1.1-gcc43fix.patch

Requires:       rcssmonitor

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  automake libtool boost-devel rcssbase-devel qt-devel
BuildRequires:  desktop-file-utils libXaw-devel


%description
The RoboCup Soccer Simulator LogPlayer (rcsslogpleyr) is a game log
replay tool for the RoboCup Soccer Simulator Server (rcssserver).

%package        devel
Summary:        Header files and libraries for %{name}
License:        LGPLv2+
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       boost-devel

%description    devel
This package contains the header files and libraries
for %{name}. If you like to develop programs using %{name},
you will need to install %{name}-devel.

%prep
%setup -q
%patch0 -p1 -b .gcc43fix
sed -i.lib \
    -e 's|\$ac_boost_path/lib|\$libdir|' \
    -e 's|$ac_boost_path_tmp/lib|\$libdir|' \
    m4/ax_boost_base.m4
autoreconf --install -f
# Fix rpath
sed -i.rpath -e '/sys_lib_search_path_spec/s| /usr/lib| /lib64 /usr/lib64 /usr/lib|' \
    configure

%build
%configure --with-qt4-moc=%{_bindir}/moc-qt4
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
rm -rf %{buildroot}/%{_libdir}/*.la

mkdir %{buildroot}/%{_datadir}/pixmaps/
cp -p icons/rcss.xpm %{buildroot}/%{_datadir}/pixmaps/rcsslogplayer.xpm

desktop-file-install --vendor="fedora"                 \
  --dir=%{buildroot}/%{_datadir}/applications %{SOURCE1}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README 
%{_bindir}/*
%{_libdir}/*.so.*
%{_datadir}/%{name}
%{_datadir}/pixmaps/*
%{_datadir}/applications/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so

%changelog
* Sat Sep 20 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.1-2
(Thanks to Mamoru Tasaka)
- Fixed -devel sub package license tag
- Fixed build failure caused by not finding moc-qt4 binary
- Fixed .desktop file category

* Mon Sep 15 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.1-1
- Initial version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rcsslogplayer/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2008 00:27:58 -0000	1.1
+++ sources	21 Sep 2008 07:09:14 -0000	1.2
@@ -0,0 +1 @@
+9b80568477c8d8246691573e3234f264  rcsslogplayer-12.1.1.tar.gz



From dtimms at fedoraproject.org  Sun Sep 21 07:25:30 2008
From: dtimms at fedoraproject.org (David Timms)
Date: Sun, 21 Sep 2008 07:25:30 +0000 (UTC)
Subject: rpms/sms_ntsc/F-9 import.log, NONE, 1.1 sms_ntsc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080921072530.37475700FA@cvs1.fedora.phx.redhat.com>

Author: dtimms

Update of /cvs/pkgs/rpms/sms_ntsc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7343/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sms_ntsc.spec 
Log Message:
Initial import of sms_ntsc into fedora


--- NEW FILE import.log ---
sms_ntsc-0_2_3-3_fc9:F-9:sms_ntsc-0.2.3-3.fc9.src.rpm:1221981881


--- NEW FILE sms_ntsc.spec ---
%define        libname lib%{name}.so

Name:          sms_ntsc
Version:       0.2.3
Release:       3%{?dist}
Summary:       Provides an SMS NTSC video filtering library

Group:         System Environment/Libraries
License:       LGPLv2+
URL:           http://www.slack.net/~ant/libs/ntsc.html
Source0:       http://blargg.fileave.com/libs/%{name}-%{version}.zip
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: SDL-devel

%description
Sega Master System NTSC video filter library. Reproduces the significant
artifacts on the vertical edges of some colors that occur when colours, and 
the general color mixing that occur when graphics are rendered via an NTSC
video connection to a television. Accepts pixels in 16-bit RGB or 12-bit BGR
(native Game Gear palette format). It can also output an RGB palette for use
in a regular blitter.


%package devel
Summary:        Development files for sms_ntsc
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
Development files for sms_ntsc


%package demos
Summary:        Examples using sms_ntsc
Group:          Development/Libraries

%description demos
Examples using sms_ntsc


%prep
%setup -q
# Some location cleanups
sed -i 's|"SDL.h"|<SDL/SDL.h>|' demo_impl.h
sed -i 's|test.bmp|%{_datadir}/%{name}/test.bmp|' demo.c

#Fix EOL encoding
%{__sed} -i 's/\r//' *.txt


%build
# Compile library, link and give it an soname
gcc -c %{optflags} -fPIC %{name}.c
gcc %{optflags} -shared -Wl,-soname,%{libname}.0 -Wl,-lm -o %{libname}.%{version} %{name}.o

# Make symlinks now as they are needed
ln -s %{libname}.%{version} %{libname}.0
ln -s %{libname}.%{version} %{libname}

# Compile demos
gcc %{optflags} benchmark.c -o %{name}_benchmark -L. -l%{name}
gcc %{optflags} demo.c -o %{name}_demo -L. -l%{name} -lSDL


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_libdir} \
         %{buildroot}%{_includedir} %{buildroot}%{_datadir}/%{name}

# Install include
install -pm 0644 %{name}.h %{buildroot}%{_includedir}
install -pm 0644 %{name}_config.h %{buildroot}%{_includedir}

# Install example
install -pm 0644 test.bmp %{buildroot}%{_datadir}/%{name}

# Install lib and symlinks
install -pm 0755 %{libname}.%{version} %{buildroot}%{_libdir}
mv %{libname}.0 %{buildroot}%{_libdir}
mv %{libname} %{buildroot}%{_libdir}

# Install demos
install -pm0755 %{name}_benchmark %{buildroot}%{_bindir}
install -pm0755 %{name}_demo %{buildroot}%{_bindir}


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_libdir}/%{libname}.0
%{_libdir}/%{libname}.%{version}
%doc changes.txt license.txt


%files devel
%defattr(-,root,root,-)
%{_libdir}/%{libname}
%{_includedir}/%{name}.h
%{_includedir}/%{name}_config.h
%doc %{name}.txt readme.txt


%files demos
%defattr(-,root,root,-)
%{_datadir}/%{name}
%{_bindir}/*


%changelog
* Thu Sep 11 2008 David Timms <iinet.net.au at dtimms> 0.2.3-3
- Initial import and release bump into fedora

* Tue Aug 14 2007 Ian Chapman <packages at amiga-hardware.com> 0.2.3-2
- Updated license field due to new guidelines
- Improved use of macros

* Mon Jun 11 2007 Ian Chapman <packages at amiga-hardware.com> 0.2.3-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sms_ntsc/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2008 00:24:34 -0000	1.1
+++ .cvsignore	21 Sep 2008 07:24:59 -0000	1.2
@@ -0,0 +1 @@
+sms_ntsc-0.2.3.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sms_ntsc/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2008 00:24:34 -0000	1.1
+++ sources	21 Sep 2008 07:24:59 -0000	1.2
@@ -0,0 +1 @@
+4aea73f7289a1a28fea2450d6d0cff66  sms_ntsc-0.2.3.zip



From dtimms at fedoraproject.org  Sun Sep 21 07:27:06 2008
From: dtimms at fedoraproject.org (David Timms)
Date: Sun, 21 Sep 2008 07:27:06 +0000 (UTC)
Subject: rpms/sms_ntsc/F-8 import.log, NONE, 1.1 sms_ntsc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080921072706.B4F93700FA@cvs1.fedora.phx.redhat.com>

Author: dtimms

Update of /cvs/pkgs/rpms/sms_ntsc/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7691/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sms_ntsc.spec 
Log Message:
Initial import of sms_ntsc into fedora


--- NEW FILE import.log ---
sms_ntsc-0_2_3-3_fc9:F-8:sms_ntsc-0.2.3-3.fc9.src.rpm:1221981977


--- NEW FILE sms_ntsc.spec ---
%define        libname lib%{name}.so

Name:          sms_ntsc
Version:       0.2.3
Release:       3%{?dist}
Summary:       Provides an SMS NTSC video filtering library

Group:         System Environment/Libraries
License:       LGPLv2+
URL:           http://www.slack.net/~ant/libs/ntsc.html
Source0:       http://blargg.fileave.com/libs/%{name}-%{version}.zip
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: SDL-devel

%description
Sega Master System NTSC video filter library. Reproduces the significant
artifacts on the vertical edges of some colors that occur when colours, and 
the general color mixing that occur when graphics are rendered via an NTSC
video connection to a television. Accepts pixels in 16-bit RGB or 12-bit BGR
(native Game Gear palette format). It can also output an RGB palette for use
in a regular blitter.


%package devel
Summary:        Development files for sms_ntsc
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
Development files for sms_ntsc


%package demos
Summary:        Examples using sms_ntsc
Group:          Development/Libraries

%description demos
Examples using sms_ntsc


%prep
%setup -q
# Some location cleanups
sed -i 's|"SDL.h"|<SDL/SDL.h>|' demo_impl.h
sed -i 's|test.bmp|%{_datadir}/%{name}/test.bmp|' demo.c

#Fix EOL encoding
%{__sed} -i 's/\r//' *.txt


%build
# Compile library, link and give it an soname
gcc -c %{optflags} -fPIC %{name}.c
gcc %{optflags} -shared -Wl,-soname,%{libname}.0 -Wl,-lm -o %{libname}.%{version} %{name}.o

# Make symlinks now as they are needed
ln -s %{libname}.%{version} %{libname}.0
ln -s %{libname}.%{version} %{libname}

# Compile demos
gcc %{optflags} benchmark.c -o %{name}_benchmark -L. -l%{name}
gcc %{optflags} demo.c -o %{name}_demo -L. -l%{name} -lSDL


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_libdir} \
         %{buildroot}%{_includedir} %{buildroot}%{_datadir}/%{name}

# Install include
install -pm 0644 %{name}.h %{buildroot}%{_includedir}
install -pm 0644 %{name}_config.h %{buildroot}%{_includedir}

# Install example
install -pm 0644 test.bmp %{buildroot}%{_datadir}/%{name}

# Install lib and symlinks
install -pm 0755 %{libname}.%{version} %{buildroot}%{_libdir}
mv %{libname}.0 %{buildroot}%{_libdir}
mv %{libname} %{buildroot}%{_libdir}

# Install demos
install -pm0755 %{name}_benchmark %{buildroot}%{_bindir}
install -pm0755 %{name}_demo %{buildroot}%{_bindir}


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_libdir}/%{libname}.0
%{_libdir}/%{libname}.%{version}
%doc changes.txt license.txt


%files devel
%defattr(-,root,root,-)
%{_libdir}/%{libname}
%{_includedir}/%{name}.h
%{_includedir}/%{name}_config.h
%doc %{name}.txt readme.txt


%files demos
%defattr(-,root,root,-)
%{_datadir}/%{name}
%{_bindir}/*


%changelog
* Thu Sep 11 2008 David Timms <iinet.net.au at dtimms> 0.2.3-3
- Initial import and release bump into fedora

* Tue Aug 14 2007 Ian Chapman <packages at amiga-hardware.com> 0.2.3-2
- Updated license field due to new guidelines
- Improved use of macros

* Mon Jun 11 2007 Ian Chapman <packages at amiga-hardware.com> 0.2.3-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sms_ntsc/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2008 00:24:34 -0000	1.1
+++ .cvsignore	21 Sep 2008 07:26:36 -0000	1.2
@@ -0,0 +1 @@
+sms_ntsc-0.2.3.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sms_ntsc/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2008 00:24:34 -0000	1.1
+++ sources	21 Sep 2008 07:26:36 -0000	1.2
@@ -0,0 +1 @@
+4aea73f7289a1a28fea2450d6d0cff66  sms_ntsc-0.2.3.zip



From dtimms at fedoraproject.org  Sun Sep 21 07:32:44 2008
From: dtimms at fedoraproject.org (David Timms)
Date: Sun, 21 Sep 2008 07:32:44 +0000 (UTC)
Subject: rpms/snes_ntsc/F-9 import.log, NONE, 1.1 snes_ntsc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080921073244.B5E65700FA@cvs1.fedora.phx.redhat.com>

Author: dtimms

Update of /cvs/pkgs/rpms/snes_ntsc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8642/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log snes_ntsc.spec 
Log Message:
Initial import of snes_ntsc into fedora


--- NEW FILE import.log ---
snes_ntsc-0_2_2-3_fc9:F-9:snes_ntsc-0.2.2-3.fc9.src.rpm:1221982299


--- NEW FILE snes_ntsc.spec ---
%define        libname lib%{name}.so

Name:          snes_ntsc
Version:       0.2.2
Release:       3%{?dist}
Summary:       Provides a SNES NTSC video filtering library

Group:         System Environment/Libraries
License:       LGPLv2+
URL:           http://www.slack.net/~ant/libs/ntsc.html
Source0:       http://blargg.fileave.com/libs/%{name}-%{version}.zip
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: SDL-devel

%description
Super NES NTSC video filter. The main benefit is color mixing, as composite
video artifacts are less noticeable than on the NES. Accepts pixels in 16-bit
RGB or 15-bit BGR (native SNES format).


%package devel
Summary:        Development files for snes_ntsc
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
Development files for snes_ntsc


%package demos
Summary:        Examples using snes_ntsc
Group:          Development/Libraries

%description demos
Examples using snes_ntsc


%prep
%setup -q
# Some location cleanups
%{__sed} -i 's/\"SDL.h\"/\<SDL\/SDL.h\>/' demo_impl.h
%{__sed} -i 's/\"test.bmp\"/\"\/usr\/share\/snes_ntsc\/test.bmp\"/' demo.c

#Fix EOL encoding
%{__sed} -i 's/\r//' *.txt


%build
# Compile library, link and give it an soname
gcc -c %{optflags} -fPIC %{name}.c
gcc %{optflags} -shared -Wl,-soname,%{libname}.0 -Wl,-lm -o %{libname}.%{version} %{name}.o

# Make symlinks now as they are needed
ln -s %{libname}.%{version} %{libname}.0
ln -s %{libname}.%{version} %{libname}

# Compile demos
gcc %{optflags} benchmark.c -o snes_ntsc_benchmark -L. -lsnes_ntsc
gcc %{optflags} demo.c -o snes_ntsc_demo -L. -lsnes_ntsc -lSDL


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_libdir} \
         %{buildroot}%{_includedir} %{buildroot}%{_datadir}/%{name}

# Install include
install -pm 0644 %{name}.h %{buildroot}%{_includedir}
install -pm 0644 %{name}_config.h %{buildroot}%{_includedir}

# Install example
install -pm 0644 test.bmp %{buildroot}%{_datadir}/%{name}

# Install lib and symlinks
install -pm 0755 %{libname}.%{version} %{buildroot}%{_libdir}
mv %{libname}.0 %{buildroot}%{_libdir}
mv %{libname} %{buildroot}%{_libdir}

# Install demos
install -m0755 snes_ntsc_benchmark %{buildroot}%{_bindir}
install -m0755 snes_ntsc_demo %{buildroot}%{_bindir}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_libdir}/%{libname}.0
%{_libdir}/%{libname}.%{version}
%doc changes.txt license.txt


%files devel
%defattr(-,root,root,-)
%{_libdir}/%{libname}
%{_includedir}/%{name}.h
%{_includedir}/%{name}_config.h
%doc snes_ntsc.txt readme.txt


%files demos
%defattr(-,root,root,-)
%{_datadir}/%{name}
%{_bindir}/snes_ntsc_benchmark
%{_bindir}/snes_ntsc_demo


%changelog
* Thu Sep 11 2008 David Timms <iinet.net.au at dtimms> 0.2.2-3
- Initial import into fedora and release bump

* Mon Jun 11 2007 Ian Chapman <packages at amiga-hardware.com> 0.2.2-2
- Fix undefined-non-weak-symbol warnings

* Sun Feb 25 2007 Ian Chapman <packages at amiga-hardware.com> 0.2.2-1
- Upgrade to 0.2.2
- Increased use of macros

* Sun Oct 29 2006 Ian Chapman <packages at amiga-hardware.com> 0.2.1-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snes_ntsc/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2008 00:26:16 -0000	1.1
+++ .cvsignore	21 Sep 2008 07:32:14 -0000	1.2
@@ -0,0 +1 @@
+snes_ntsc-0.2.2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snes_ntsc/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2008 00:26:16 -0000	1.1
+++ sources	21 Sep 2008 07:32:14 -0000	1.2
@@ -0,0 +1 @@
+07b10506e4d57b0ef312eedaae537cc2  snes_ntsc-0.2.2.zip



From dtimms at fedoraproject.org  Sun Sep 21 07:34:16 2008
From: dtimms at fedoraproject.org (David Timms)
Date: Sun, 21 Sep 2008 07:34:16 +0000 (UTC)
Subject: rpms/snes_ntsc/F-8 import.log, NONE, 1.1 snes_ntsc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080921073416.AB74D700FA@cvs1.fedora.phx.redhat.com>

Author: dtimms

Update of /cvs/pkgs/rpms/snes_ntsc/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8998/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log snes_ntsc.spec 
Log Message:
Initial import of snes_ntsc into fedora


--- NEW FILE import.log ---
snes_ntsc-0_2_2-3_fc9:F-8:snes_ntsc-0.2.2-3.fc9.src.rpm:1221982408


--- NEW FILE snes_ntsc.spec ---
%define        libname lib%{name}.so

Name:          snes_ntsc
Version:       0.2.2
Release:       3%{?dist}
Summary:       Provides a SNES NTSC video filtering library

Group:         System Environment/Libraries
License:       LGPLv2+
URL:           http://www.slack.net/~ant/libs/ntsc.html
Source0:       http://blargg.fileave.com/libs/%{name}-%{version}.zip
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: SDL-devel

%description
Super NES NTSC video filter. The main benefit is color mixing, as composite
video artifacts are less noticeable than on the NES. Accepts pixels in 16-bit
RGB or 15-bit BGR (native SNES format).


%package devel
Summary:        Development files for snes_ntsc
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
Development files for snes_ntsc


%package demos
Summary:        Examples using snes_ntsc
Group:          Development/Libraries

%description demos
Examples using snes_ntsc


%prep
%setup -q
# Some location cleanups
%{__sed} -i 's/\"SDL.h\"/\<SDL\/SDL.h\>/' demo_impl.h
%{__sed} -i 's/\"test.bmp\"/\"\/usr\/share\/snes_ntsc\/test.bmp\"/' demo.c

#Fix EOL encoding
%{__sed} -i 's/\r//' *.txt


%build
# Compile library, link and give it an soname
gcc -c %{optflags} -fPIC %{name}.c
gcc %{optflags} -shared -Wl,-soname,%{libname}.0 -Wl,-lm -o %{libname}.%{version} %{name}.o

# Make symlinks now as they are needed
ln -s %{libname}.%{version} %{libname}.0
ln -s %{libname}.%{version} %{libname}

# Compile demos
gcc %{optflags} benchmark.c -o snes_ntsc_benchmark -L. -lsnes_ntsc
gcc %{optflags} demo.c -o snes_ntsc_demo -L. -lsnes_ntsc -lSDL


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_libdir} \
         %{buildroot}%{_includedir} %{buildroot}%{_datadir}/%{name}

# Install include
install -pm 0644 %{name}.h %{buildroot}%{_includedir}
install -pm 0644 %{name}_config.h %{buildroot}%{_includedir}

# Install example
install -pm 0644 test.bmp %{buildroot}%{_datadir}/%{name}

# Install lib and symlinks
install -pm 0755 %{libname}.%{version} %{buildroot}%{_libdir}
mv %{libname}.0 %{buildroot}%{_libdir}
mv %{libname} %{buildroot}%{_libdir}

# Install demos
install -m0755 snes_ntsc_benchmark %{buildroot}%{_bindir}
install -m0755 snes_ntsc_demo %{buildroot}%{_bindir}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_libdir}/%{libname}.0
%{_libdir}/%{libname}.%{version}
%doc changes.txt license.txt


%files devel
%defattr(-,root,root,-)
%{_libdir}/%{libname}
%{_includedir}/%{name}.h
%{_includedir}/%{name}_config.h
%doc snes_ntsc.txt readme.txt


%files demos
%defattr(-,root,root,-)
%{_datadir}/%{name}
%{_bindir}/snes_ntsc_benchmark
%{_bindir}/snes_ntsc_demo


%changelog
* Thu Sep 11 2008 David Timms <iinet.net.au at dtimms> 0.2.2-3
- Initial import into fedora and release bump

* Mon Jun 11 2007 Ian Chapman <packages at amiga-hardware.com> 0.2.2-2
- Fix undefined-non-weak-symbol warnings

* Sun Feb 25 2007 Ian Chapman <packages at amiga-hardware.com> 0.2.2-1
- Upgrade to 0.2.2
- Increased use of macros

* Sun Oct 29 2006 Ian Chapman <packages at amiga-hardware.com> 0.2.1-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snes_ntsc/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2008 00:26:16 -0000	1.1
+++ .cvsignore	21 Sep 2008 07:33:46 -0000	1.2
@@ -0,0 +1 @@
+snes_ntsc-0.2.2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snes_ntsc/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2008 00:26:16 -0000	1.1
+++ sources	21 Sep 2008 07:33:46 -0000	1.2
@@ -0,0 +1 @@
+07b10506e4d57b0ef312eedaae537cc2  snes_ntsc-0.2.2.zip



From scop at fedoraproject.org  Sun Sep 21 08:12:17 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:12:17 +0000 (UTC)
Subject: rpms/perl-JSON-Any/devel perl-JSON-Any.spec,1.3,1.4
Message-ID: <20080921081217.C8023700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/perl-JSON-Any/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13155/perl-JSON-Any/devel

Modified Files:
	perl-JSON-Any.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch:/%patch0 mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: perl-JSON-Any.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-JSON-Any/devel/perl-JSON-Any.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-JSON-Any.spec	22 Mar 2008 18:51:50 -0000	1.3
+++ perl-JSON-Any.spec	21 Sep 2008 08:11:47 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-JSON-Any
 Version:        1.16
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A meta-module to make working with JSON easier
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -10,7 +10,7 @@
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-Patch:          with_older_json.patch 
+Patch0:         with_older_json.patch 
 
 # JSON::XS is fastest, so we require it 
 Requires:       perl(JSON::XS)
@@ -72,6 +72,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.16-4
+- Fix Patch:/%%patch0 mismatch.
+
 * Sat Mar 22 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.16-3
 - patch to allow utf8 to work properly with JSON::XS earlier than version 2
 - patch to skip JSON when JSON is earlier than version 2



From scop at fedoraproject.org  Sun Sep 21 08:12:17 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:12:17 +0000 (UTC)
Subject: rpms/alsa-oss/devel alsa-oss.spec,1.7,1.8
Message-ID: <20080921081217.EA259700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/alsa-oss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13155/alsa-oss/devel

Modified Files:
	alsa-oss.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch:/%patch0 mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: alsa-oss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-oss/devel/alsa-oss.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- alsa-oss.spec	29 Jul 2008 08:48:57 -0000	1.7
+++ alsa-oss.spec	21 Sep 2008 08:11:47 -0000	1.8
@@ -1,12 +1,12 @@
 Summary:	Advanced Linux Sound Architecture (ALSA) wrapper for OSS
 Name:		alsa-oss
 Version:	1.0.17
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.alsa-project.org/
 Source:		ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-%{version}.tar.bz2
-Patch:		%{name}-1.0.12-aoss.patch
+Patch0:		%{name}-1.0.12-aoss.patch
 Patch1:		%{name}-glibc-open.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	alsa-lib-devel >= %{version}
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.17-2
+- Fix Patch:/%%patch0 mismatch.
+
 * Tue Jul 29 2008 Jaroslav Kysela <jkysela at redhat.com> 1.0.17-1
 - New upstream version
 



From scop at fedoraproject.org  Sun Sep 21 08:12:18 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:12:18 +0000 (UTC)
Subject: rpms/starfighter/devel starfighter.spec,1.13,1.14
Message-ID: <20080921081218.41BDC700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/starfighter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13155/starfighter/devel

Modified Files:
	starfighter.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch:/%patch0 mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: starfighter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/starfighter/devel/starfighter.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- starfighter.spec	20 Feb 2008 04:40:11 -0000	1.13
+++ starfighter.spec	21 Sep 2008 08:11:47 -0000	1.14
@@ -1,14 +1,14 @@
 Summary: Project: Starfighter, a space arcade game
 Name: starfighter
 Version: 1.1
-Release: 12
+Release: 13
 License: GPLv2+
 Group: Amusements/Games
 URL: http://www.parallelrealities.co.uk/starfighter.php
 # No absolute URL since the home page tunnels it through a PHP script
 Source0: starfighter-%{version}-1.tar.bz2
 Source1: starfighter.png
-Patch: starfighter-1.1-makefile.patch
+Patch0: starfighter-1.1-makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel, desktop-file-utils
 
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1-13
+- Fix Patch:/%%patch0 mismatch.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1-12
 - Autorebuild for GCC 4.3
 



From pkgdb at fedoraproject.org  Sun Sep 21 08:24:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 08:24:52 +0000
Subject: [pkgdb] python-dateutil ownership updated
Message-ID: <20080921082452.F3775208D9E@bastion.fedora.phx.redhat.com>

Package python-dateutil in Fedora EPEL 4 is now owned by mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From pkgdb at fedoraproject.org  Sun Sep 21 08:24:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 08:24:56 +0000
Subject: [pkgdb] python-dateutil ownership updated
Message-ID: <20080921082456.03435208DA0@bastion.fedora.phx.redhat.com>

Package python-dateutil in Fedora EPEL 5 is now owned by mnowak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From scop at fedoraproject.org  Sun Sep 21 08:27:49 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:27:49 +0000 (UTC)
Subject: rpms/bit/devel bit.spec,1.9,1.10
Message-ID: <20080921082749.33AF1700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15066/bit/devel

Modified Files:
	bit.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: bit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bit/devel/bit.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bit.spec	4 Mar 2008 05:22:40 -0000	1.9
+++ bit.spec	21 Sep 2008 08:27:18 -0000	1.10
@@ -2,7 +2,7 @@
 Summary:          bit is a C++ library to simplify bit stream parsing
 Name:             bit
 Version:          0.4.1
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          LGPLv2
 URL:              http://libbit.sourceforge.net
 Group:            System Environment/Libraries
@@ -27,7 +27,7 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 
 %build
 %configure --enable-static=no
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.4.1-4
+- Fix Patch0:/%%patch mismatch.
+
 * Mon Mar 03 2008 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.1-3
 - Added boost-devel to requires
 - Added bit.patch



From scop at fedoraproject.org  Sun Sep 21 08:27:49 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:27:49 +0000 (UTC)
Subject: rpms/abe/devel abe.spec,1.17,1.18
Message-ID: <20080921082749.16621700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/abe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15066/abe/devel

Modified Files:
	abe.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: abe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abe/devel/abe.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- abe.spec	8 Feb 2008 23:52:35 -0000	1.17
+++ abe.spec	21 Sep 2008 08:27:18 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           abe
 Version:        1.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        Scrolling, platform-jumping, ancient pyramid exploring game
 Group:          Amusements/Games
@@ -21,7 +21,7 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 
 %build
 %configure --with-data-dir=%{_datadir}/%{name}
@@ -65,6 +65,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1-8
+- Fix Patch0:/%%patch mismatch.
+
 * Fri Feb 8 2008 Wart <wart at kobold.org> 1.1-7
 - Rebuild for gcc 4.3
 



From scop at fedoraproject.org  Sun Sep 21 08:27:50 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:27:50 +0000 (UTC)
Subject: rpms/dosbox/devel dosbox.spec,1.30,1.31
Message-ID: <20080921082750.E2006700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/dosbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15066/dosbox/devel

Modified Files:
	dosbox.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: dosbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dosbox/devel/dosbox.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- dosbox.spec	22 Feb 2008 15:51:51 -0000	1.30
+++ dosbox.spec	21 Sep 2008 08:27:20 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           dosbox
 Version:        0.72
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        x86/DOS emulator with sound and graphics
 
@@ -37,7 +37,7 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 
 %build
 %configure --enable-core-inline
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.72-5
+- Fix Patch0:/%%patch mismatch.
+
 * Fri Feb 22 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 0.72-4
 - fix gcc43 build (#433990) with patch from Erik van Pienbroek



From scop at fedoraproject.org  Sun Sep 21 08:27:50 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:27:50 +0000 (UTC)
Subject: rpms/cpan2rpm/devel cpan2rpm.spec,1.7,1.8
Message-ID: <20080921082750.748A7700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cpan2rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15066/cpan2rpm/devel

Modified Files:
	cpan2rpm.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: cpan2rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpan2rpm/devel/cpan2rpm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cpan2rpm.spec	15 Oct 2007 14:31:07 -0000	1.7
+++ cpan2rpm.spec	21 Sep 2008 08:27:19 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           cpan2rpm
 Version:        2.028
-Release:        2%{?dist}.1
+Release:        3%{?dist}
 
 Summary:        Perl module packager
 
@@ -27,7 +27,7 @@
 
 %prep
 %setup -q
-%patch -p2 -b .orig
+%patch0 -p2 -b .orig
 
 
 %build
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 2.028-3
+- Fix Patch0:/%%patch mismatch.
+
 * Mon Oct 15 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 2.028-2.1
 - correct license tag
 - add BR: perl(ExtUtils::MakeMaker)



From scop at fedoraproject.org  Sun Sep 21 08:27:49 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:27:49 +0000 (UTC)
Subject: rpms/conexus/devel conexus.spec,1.12,1.13
Message-ID: <20080921082749.8152A700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/conexus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15066/conexus/devel

Modified Files:
	conexus.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: conexus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/devel/conexus.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- conexus.spec	4 Mar 2008 04:52:00 -0000	1.12
+++ conexus.spec	21 Sep 2008 08:27:19 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:          C++ network and serial communication library
 Name:             conexus
 Version:          0.5.3
-Release:          4%{?dist}
+Release:          5%{?dist}
 License:          LGPLv2
 URL:              http://conexus.sourceforge.net
 Group:            System Environment/Libraries
@@ -27,7 +27,7 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 
 %build
 %configure --enable-static=no
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.3-5
+- Fix Patch0:/%%patch mismatch.
+
 * Mon Mar 03 2008 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.3-4
 - Added cstring patch
 - Added popt-devel requires



From scop at fedoraproject.org  Sun Sep 21 08:27:51 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:27:51 +0000 (UTC)
Subject: rpms/eclipse-subclipse/devel eclipse-subclipse.spec,1.20,1.21
Message-ID: <20080921082751.3C3E3700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/eclipse-subclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15066/eclipse-subclipse/devel

Modified Files:
	eclipse-subclipse.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- eclipse-subclipse.spec	7 Apr 2008 13:50:59 -0000	1.20
+++ eclipse-subclipse.spec	21 Sep 2008 08:27:20 -0000	1.21
@@ -20,7 +20,7 @@
 
 Name:           eclipse-subclipse
 Version:        1.2.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -81,7 +81,7 @@
 %prep
 %setup -q -n subclipse-%{version}
 %if 0%{disable_javahl}
-%patch -p1
+%patch0 -p1
 %endif
 %patch1 -p1
 
@@ -241,6 +241,9 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.2.4-10
+- Fix Patch0:/%%patch mismatch.
+
 * Fri Apr 04 2008 Robert Marcano <robert at marcanoonline.com> 1.2.4-9
 - Fix Bug 440818: changed links to svn-javahl.jar
 



From scop at fedoraproject.org  Sun Sep 21 08:29:50 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:29:50 +0000 (UTC)
Subject: rpms/extrema/devel extrema.spec,1.8,1.9
Message-ID: <20080921082950.5E776700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/extrema/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15353/extrema/devel

Modified Files:
	extrema.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: extrema.spec
===================================================================
RCS file: /cvs/pkgs/rpms/extrema/devel/extrema.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- extrema.spec	22 Aug 2008 17:18:06 -0000	1.8
+++ extrema.spec	21 Sep 2008 08:29:20 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:   Extrema is a powerful visualization and data analysis tool
 Name:      extrema
 Version:   4.3.6
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 Group:     Applications/Engineering
 URL:       http://exsitewebware.com/extrema/
@@ -29,7 +29,7 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -61,6 +61,9 @@
 %{_datadir}/%{name}/Help
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 4.3.6-2
+- Fix Patch0:/%%patch mismatch.
+
 * Fri Aug 15 2008 Terje Rosten <terje.rosten at ntnu.no> - 4.3.6-1
 - 4.3.6
 



From scop at fedoraproject.org  Sun Sep 21 08:32:39 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:32:39 +0000 (UTC)
Subject: rpms/hdf/devel hdf.spec,1.25,1.26
Message-ID: <20080921083239.B19BD700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/hdf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15784/hdf/devel

Modified Files:
	hdf.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: hdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdf/devel/hdf.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- hdf.spec	2 Mar 2008 20:31:05 -0000	1.25
+++ hdf.spec	21 Sep 2008 08:32:09 -0000	1.26
@@ -1,6 +1,6 @@
 Name: hdf
 Version: 4.2r3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
@@ -38,7 +38,7 @@
 
 %prep
 %setup -q -n HDF%{version}
-%patch -p1 -b .maxavailfiles
+%patch0 -p1 -b .maxavailfiles
 %patch1 -p1 -b .ppc
 %patch2 -p1 -b .sparc
 %patch3 -p1 -b .s390
@@ -109,6 +109,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 4.2r3-3
+- Fix Patch0:/%%patch mismatch.
+
 * Sun Mar  2 2008 Patrice Dumas <pertusus at free.fr> 4.2r3-2
 - don't ship an empty netcdf.h file. The related definitions are now
   in hdf4_netcdf.h



From scop at fedoraproject.org  Sun Sep 21 08:33:55 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:33:55 +0000 (UTC)
Subject: rpms/hspell/devel hspell.spec,1.13,1.14
Message-ID: <20080921083355.EF92F700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/hspell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15970/hspell/devel

Modified Files:
	hspell.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: hspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hspell/devel/hspell.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- hspell.spec	31 Jul 2008 17:21:04 -0000	1.13
+++ hspell.spec	21 Sep 2008 08:33:25 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: A Hebrew spell checker
 Name: hspell
 Version: 1.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 URL: http://ivrix.org.il/projects/spell-checker/
 Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz
 # No version specified.
@@ -56,7 +56,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b .sharedlib.patch
+%patch0 -p1 -b .sharedlib.patch
 sed -i -e '/^\s\+strip\s/d' Makefile.in
 sed -i -e 's/gzip/gzip -n/g' Makefile.in
 
@@ -102,6 +102,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.0-11
+- Fix Patch0:/%%patch mismatch.
+
 * Thu Jul 31 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-10
 - fix license tag
 



From scop at fedoraproject.org  Sun Sep 21 08:35:11 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:35:11 +0000 (UTC)
Subject: rpms/ifplugd/devel ifplugd.spec,1.19,1.20
Message-ID: <20080921083511.3B138700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/ifplugd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16152/ifplugd/devel

Modified Files:
	ifplugd.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: ifplugd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ifplugd/devel/ifplugd.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ifplugd.spec	1 Apr 2008 18:24:24 -0000	1.19
+++ ifplugd.spec	21 Sep 2008 08:34:40 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:       Detect and take action when an ethernet cable is unplugged
 Name:          ifplugd
 Version:       0.28
-Release:       11%{?dist}
+Release:       12%{?dist}
 
 License:       GPLv2+
 Group:         System Environment/Daemons
@@ -21,7 +21,7 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 
 %build
 %configure --prefix=/ --disable-lynx --disable-xmltoman --disable-subversion --with-initdir=%{_initrddir}
@@ -59,6 +59,9 @@
 /sbin/chkconfig --del ifplugd
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.28-12
+- Fix Patch0:/%%patch mismatch.
+
 * Tue Apr  1 2008 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.28-11
 - Pass initdir to configure.
 



From scop at fedoraproject.org  Sun Sep 21 08:36:56 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:36:56 +0000 (UTC)
Subject: rpms/ipcalculator/devel ipcalculator.spec,1.1,1.2
Message-ID: <20080921083656.37E44700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/ipcalculator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16409/ipcalculator/devel

Modified Files:
	ipcalculator.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: ipcalculator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipcalculator/devel/ipcalculator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ipcalculator.spec	12 Feb 2008 12:04:44 -0000	1.1
+++ ipcalculator.spec	21 Sep 2008 08:36:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ipcalculator
 Version:        0.41
-Release:        6%{?dist} 
+Release:        7%{?dist} 
 Summary:        A utility for computing broadcast, network, mask, and host ranges
 
 Group:          Applications/Internet
@@ -42,7 +42,7 @@
 sed -i '1041,1085s/ipcalc/ipcalculator/g' ipcalc
 # the cgi wrapper uses hardcoded path to a different location
 sed -i 's:/usr/local/bin/ipcalc:%{_bindir}/ipcalculator:' ipcalc.cgi
-%patch -p1 -b .hrefs
+%patch0 -p1 -b .hrefs
 
 
 %build
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.41-7
+- Fix Patch0:/%%patch mismatch.
+
 * Wed Dec 26 2007 Jakub Hrozek <jhrozek at redhat.com> - 0.41-6
 - fix a typo in the sed substitution
 - add the background image from the project page



From scop at fedoraproject.org  Sun Sep 21 08:38:33 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:38:33 +0000 (UTC)
Subject: rpms/liblqr-1/devel liblqr-1.spec,1.1,1.2
Message-ID: <20080921083833.29DE4700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/liblqr-1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16614/liblqr-1/devel

Modified Files:
	liblqr-1.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: liblqr-1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liblqr-1/devel/liblqr-1.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- liblqr-1.spec	2 Mar 2008 15:54:02 -0000	1.1
+++ liblqr-1.spec	21 Sep 2008 08:38:02 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           liblqr-1
 Version:        0.1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        LiquidRescale library
 Group:          System Environment/Libraries
 License:        GPLv3
@@ -34,7 +34,7 @@
 
 # Patches
 
-%patch -p1 -b .pkgconfig
+%patch0 -p1 -b .pkgconfig
 
 %build
 export LDFLAGS="`pkg-config --libs glib-2.0` -lm"
@@ -76,6 +76,10 @@
 
 %changelog
 
+* 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.



From scop at fedoraproject.org  Sun Sep 21 08:39:37 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:39:37 +0000 (UTC)
Subject: rpms/libnetfilter_conntrack/devel libnetfilter_conntrack.spec, 1.17,
	1.18
Message-ID: <20080921083937.DF224700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libnetfilter_conntrack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16774/libnetfilter_conntrack/devel

Modified Files:
	libnetfilter_conntrack.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: libnetfilter_conntrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnetfilter_conntrack/devel/libnetfilter_conntrack.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libnetfilter_conntrack.spec	7 Aug 2008 14:26:40 -0000	1.17
+++ libnetfilter_conntrack.spec	21 Sep 2008 08:39:07 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name:           libnetfilter_conntrack
 Version:        0.0.96
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Netfilter conntrack userspace library
 Group:          System Environment/Libraries
 License:        GPLv2+
@@ -31,7 +31,7 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 
 autoreconf -i --force
 
@@ -64,6 +64,9 @@
 %{_includedir}/libnetfilter_conntrack/*.h
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.0.96-3
+- Fix Patch0:/%%patch mismatch.
+
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.0.96-2
 - fix license tag
 



From scop at fedoraproject.org  Sun Sep 21 08:41:42 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:41:42 +0000 (UTC)
Subject: rpms/libnfnetlink/devel libnfnetlink.spec,1.11,1.12
Message-ID: <20080921084142.328FB700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libnfnetlink/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17130/libnfnetlink/devel

Modified Files:
	libnfnetlink.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: libnfnetlink.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnfnetlink/devel/libnfnetlink.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libnfnetlink.spec	7 Aug 2008 15:03:20 -0000	1.11
+++ libnfnetlink.spec	21 Sep 2008 08:41:11 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           libnfnetlink
 Version:        0.0.39
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Netfilter netlink userspace library
 Group:          System Environment/Libraries
 License:        GPLv2
@@ -36,7 +36,7 @@
 %prep
 %setup -q
 cp %{SOURCE1} LICENSE
-%patch -p1
+%patch0 -p1
 
 autoreconf -i --force
 
@@ -69,6 +69,9 @@
 %{_includedir}/libnfnetlink/*.h
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.0.39-3
+- Fix Patch0:/%%patch mismatch.
+
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.0.39-2
 - fix license tag
 



From scop at fedoraproject.org  Sun Sep 21 08:43:13 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:43:13 +0000 (UTC)
Subject: rpms/speech-dispatcher/devel speech-dispatcher.spec,1.7,1.8
Message-ID: <20080921084313.E19B8700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/speech-dispatcher/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17385/speech-dispatcher/devel

Modified Files:
	speech-dispatcher.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: speech-dispatcher.spec
===================================================================
RCS file: /cvs/pkgs/rpms/speech-dispatcher/devel/speech-dispatcher.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- speech-dispatcher.spec	23 Jul 2008 13:11:11 -0000	1.7
+++ speech-dispatcher.spec	21 Sep 2008 08:42:43 -0000	1.8
@@ -12,7 +12,7 @@
 
 Name:           speech-dispatcher
 Version:        0.6.6
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        To provide a high-level device independent layer for speech synthesis
 Group:          System Environment/Libraries
 
@@ -118,7 +118,7 @@
 
 
 %setup -q
-%patch -p1
+%patch0 -p1
 
 
 %build
@@ -282,6 +282,10 @@
 
 %changelog
 
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.6-19
+
+- Fix Patch0:/%%patch mismatch.
+
 * Wed Jul 16 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-18
 
 - removed suid permission for speech-dispatcher binary.



From scop at fedoraproject.org  Sun Sep 21 08:50:05 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:50:05 +0000 (UTC)
Subject: rpms/mboxgrep/devel mboxgrep.spec,1.5,1.6
Message-ID: <20080921085005.8DB2F700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mboxgrep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18293/mboxgrep/devel

Modified Files:
	mboxgrep.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: mboxgrep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mboxgrep/devel/mboxgrep.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mboxgrep.spec	7 Aug 2008 21:45:15 -0000	1.5
+++ mboxgrep.spec	21 Sep 2008 08:49:35 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Displays e-mail messages matching a pattern
 Name: mboxgrep
 Version: 0.7.9
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Source0: http://download.sourceforge.net/mboxgrep/mboxgrep-0.7.9.tar.gz
@@ -22,7 +22,7 @@
 
 %prep
 %setup -q
-%patch -p 1 -b .debug
+%patch0 -p 1 -b .debug
 
 %build
 %configure
@@ -51,6 +51,9 @@
 %{_infodir}/mboxgrep.info*
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.9-7
+- Fix Patch0:/%%patch mismatch.
+
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.7.9-6
 - fix license tag
 



From scop at fedoraproject.org  Sun Sep 21 08:51:02 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:51:02 +0000 (UTC)
Subject: rpms/nec2c/devel nec2c.spec,1.4,1.5
Message-ID: <20080921085102.A9BE7700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/nec2c/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18447/nec2c/devel

Modified Files:
	nec2c.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: nec2c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nec2c/devel/nec2c.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nec2c.spec	1 Jul 2008 19:49:18 -0000	1.4
+++ nec2c.spec	21 Sep 2008 08:50:32 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           nec2c
 Version:        0.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Translation of NEC2 antenna modeling tool from FORTRAN to C
 
 Group:          Applications/Communications
@@ -23,7 +23,7 @@
 
 %prep
 %setup -q -n %{name}
-%patch -p0
+%patch0 -p0
 
 %build
 make CFLAGS="%{optflags}" %{?_smp_mflags}
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.7-3
+- Fix Patch0:/%%patch mismatch.
+
 * Tue Jul 1 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.7-2
 - Patch for ppc build
 



From scop at fedoraproject.org  Sun Sep 21 08:52:10 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:52:10 +0000 (UTC)
Subject: rpms/nethogs/devel nethogs.spec,1.2,1.3
Message-ID: <20080921085210.66BA3700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/nethogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18608/nethogs/devel

Modified Files:
	nethogs.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: nethogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nethogs/devel/nethogs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nethogs.spec	8 Jul 2008 15:47:14 -0000	1.2
+++ nethogs.spec	21 Sep 2008 08:51:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           nethogs
 Version:        0.7
-Release:        3.20080627cvs%{?dist}
+Release:        4.20080627cvs%{?dist}
 Summary:        A tool resembling top for network traffic
 
 Group:          Applications/Internet
@@ -31,7 +31,7 @@
 
 %prep
 %setup -q -n "nethogs"
-%patch -p1 -b .gcc34
+%patch0 -p1 -b .gcc34
 
 %build
 make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}"
@@ -55,6 +55,8 @@
 %doc %{_mandir}/man*/*
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.7-4.20080627cvs
+- Fix Patch0:/%%patch mismatch.
 * Fri Jul 08 2008 Anderson Silva <ansilva at redhat.com> 0.7-3.20080627cvs
 - Fix for debuginfo package provided by Ville Skytta.
 * Fri Jun 27 2008 Anderson Silva <ansilva at redhat.com> 0.7-2.20080627cvs



From scop at fedoraproject.org  Sun Sep 21 08:53:10 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:53:10 +0000 (UTC)
Subject: rpms/osiv/devel osiv.spec,1.10,1.11
Message-ID: <20080921085310.A2415700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/osiv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18737/osiv/devel

Modified Files:
	osiv.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: osiv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/osiv/devel/osiv.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- osiv.spec	24 May 2008 00:58:17 -0000	1.10
+++ osiv.spec	21 Sep 2008 08:52:40 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           osiv
 Version:        2.0.0
-Release:        0.5.beta%{?dist}
+Release:        0.6.beta%{?dist}
 Summary:        Open Source Image Velocimetry
 
 Group:          Applications/Engineering
@@ -40,7 +40,7 @@
 
 %prep
 %setup -q -n osiv-2.0.0-beta
-%patch -p0
+%patch0 -p0
 
 %build
 %configure
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 2.0.0-0.6.beta
+- Fix Patch0:/%%patch mismatch.
+
 * Fri May 23 2008 Jon Stanley <jonstanley at gmail.com> - 2.0.0-0.5.beta
 - Fix license tag
 



From scop at fedoraproject.org  Sun Sep 21 08:53:58 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:53:58 +0000 (UTC)
Subject: rpms/papyrus/devel papyrus.spec,1.14,1.15
Message-ID: <20080921085358.4D1B2700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/papyrus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18863/papyrus/devel

Modified Files:
	papyrus.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/devel/papyrus.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- papyrus.spec	4 Mar 2008 04:02:03 -0000	1.14
+++ papyrus.spec	21 Sep 2008 08:53:28 -0000	1.15
@@ -2,7 +2,7 @@
 Summary:          Papyrus is a C++ canvas library similar to the Gnome canvas
 Name:             papyrus
 Version:          0.7.1
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          LGPLv2
 URL:              http://libpapyrus.sourceforge.net/
 Group:            System Environment/Libraries
@@ -30,7 +30,7 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 
 %build
 %configure --enable-static=no
@@ -68,6 +68,9 @@
 %{_datadir}/papyrusmm-0.7.1/
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.1-4
+- Fix Patch0:/%%patch mismatch.
+
 * Mon Mar 03 2008 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.7.1-3
 - Added boost-devel dependency
 - Added INT_MAX patch



From scop at fedoraproject.org  Sun Sep 21 08:54:58 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:54:58 +0000 (UTC)
Subject: rpms/pards/devel pards.spec,1.2,1.3
Message-ID: <20080921085458.C838D7013D@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/pards/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18989/pards/devel

Modified Files:
	pards.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: pards.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pards/devel/pards.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pards.spec	19 Feb 2008 13:04:40 -0000	1.2
+++ pards.spec	21 Sep 2008 08:54:28 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: A library for PARallel programs with Dataflow Synchronization
 Name: pards
 Version: 0.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://pards.sourceforge.jp/
 Source0: http://downloads.sourceforge.jp/%{name}/%{repoid}/%{name}04.tar.gz
 Patch0: %{name}-%{version}.patch
@@ -29,7 +29,7 @@
 
 %prep
 %setup -q -n %{name} 
-%patch -p1
+%patch0 -p1
 iconv -f eucjp -t utf8 README.ja >README.ja.utf
 mv README.ja.utf README.ja
 
@@ -66,6 +66,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.4-7
+- Fix Patch0:/%%patch mismatch.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4-6
 - Autorebuild for GCC 4.3
 



From scop at fedoraproject.org  Sun Sep 21 08:56:48 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:56:48 +0000 (UTC)
Subject: rpms/perl-BSD-Resource/devel perl-BSD-Resource.spec,1.28,1.29
Message-ID: <20080921085648.94F28700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/perl-BSD-Resource/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19458/perl-BSD-Resource/devel

Modified Files:
	perl-BSD-Resource.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: perl-BSD-Resource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BSD-Resource/devel/perl-BSD-Resource.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- perl-BSD-Resource.spec	3 Mar 2008 19:29:55 -0000	1.28
+++ perl-BSD-Resource.spec	21 Sep 2008 08:56:18 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           perl-BSD-Resource
 Version:        1.28
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        BSD process resource limit and priority functions
 
 Group:          Development/Libraries
@@ -24,7 +24,7 @@
 
 %prep
 %setup -q -n BSD-Resource-%{version} 
-%patch -p1
+%patch0 -p1
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.28-7
+- Fix Patch0:/%%patch mismatch.
+
 * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.28-6
 - Rebuild for perl 5.10 (again)
 



From scop at fedoraproject.org  Sun Sep 21 08:57:37 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 08:57:37 +0000 (UTC)
Subject: rpms/perl-XML-Smart/devel perl-XML-Smart.spec,1.1,1.2
Message-ID: <20080921085737.94FC9700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/perl-XML-Smart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19580/perl-XML-Smart/devel

Modified Files:
	perl-XML-Smart.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: perl-XML-Smart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Smart/devel/perl-XML-Smart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-Smart.spec	11 Jun 2008 17:28:48 -0000	1.1
+++ perl-XML-Smart.spec	21 Sep 2008 08:57:07 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-XML-Smart
 Version:        1.6.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Implementation of XML parser and writer for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -23,7 +23,7 @@
 
 %prep
 %setup -q -n XML-Smart-%{version}
-%patch -p1 -b .nohttp
+%patch0 -p1 -b .nohttp
 
 
 %build
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.9-2
+- Fix Patch0:/%%patch mismatch.
+
 * Mon Jun 02 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 1.6.9-1
 - Specfile autogenerated by cpanspec 1.75.
 - Skip the test that fetches an external file



From scop at fedoraproject.org  Sun Sep 21 09:01:26 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 09:01:26 +0000 (UTC)
Subject: rpms/qemu-launcher/devel qemu-launcher.spec,1.2,1.3
Message-ID: <20080921090126.2FC43700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/qemu-launcher/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20173/qemu-launcher/devel

Modified Files:
	qemu-launcher.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: qemu-launcher.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu-launcher/devel/qemu-launcher.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qemu-launcher.spec	9 Dec 2007 06:01:02 -0000	1.2
+++ qemu-launcher.spec	21 Sep 2008 09:00:55 -0000	1.3
@@ -1,6 +1,6 @@
 Name:      qemu-launcher
 Version:   1.7.4
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   A graphical front-end to Qemu virtual machines
 
 Group:     Applications/Emulators
@@ -31,7 +31,7 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 
 
 %build
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.7.4-5
+- Fix Patch0:/%%patch mismatch.
+
 * Sat Dec 09 2007 Nicholas Boyle <nsboyle at gmail.com> - 1.7.4-4
 - Added ExcludeArch: ppc64, as there is no ppc64 build for qemu
 * Tue Dec 04 2007 Nicholas Boyle <nsboyle at gmail.com> - 1.7.4-3



From scop at fedoraproject.org  Sun Sep 21 09:04:09 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 09:04:09 +0000 (UTC)
Subject: rpms/tclparser/devel tclparser.spec,1.5,1.6
Message-ID: <20080921090409.AA7EE700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/tclparser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20591/tclparser/devel

Modified Files:
	tclparser.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: tclparser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tclparser/devel/tclparser.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tclparser.spec	9 Feb 2008 18:50:07 -0000	1.5
+++ tclparser.spec	21 Sep 2008 09:03:39 -0000	1.6
@@ -5,7 +5,7 @@
 Summary: Tcl syntax parser
 Name: tclparser
 Version: 1.4
-Release: 4.%{cvsdate}cvs%{?dist}
+Release: 5.%{cvsdate}cvs%{?dist}
 License: TCL
 Group: Development/Libraries
 # cvs -d:pserver:anonymous at tclpro.cvs.sourceforge.net:/cvsroot/tclpro export -D 2006-10-30 -d tclparser-20061030cvs tclparser
@@ -23,7 +23,7 @@
 
 %prep
 %setup -q -n %{name}-%{cvsdate}cvs
-%patch -p0
+%patch0 -p0
 
 %build
 %configure --libdir=%{tcl_sitearch}
@@ -45,6 +45,9 @@
 %{tcl_sitearch}/%{name}%{version}
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.4-5.20061030cvs
+- Fix Patch0:/%%patch mismatch.
+
 * Sat Feb 9 2008 Wart <wart at kobold.org> 1.4-4.20061030cvs
 - Rebuild for gcc 4.3
 



From scop at fedoraproject.org  Sun Sep 21 09:04:57 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 09:04:57 +0000 (UTC)
Subject: rpms/tremulous/devel tremulous.spec,1.5,1.6
Message-ID: <20080921090457.DF708700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/tremulous/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20713/tremulous/devel

Modified Files:
	tremulous.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: tremulous.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tremulous/devel/tremulous.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tremulous.spec	19 Feb 2008 09:47:43 -0000	1.5
+++ tremulous.spec	21 Sep 2008 09:04:27 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           tremulous
 Version:        1.1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        First Person Shooter game based on the Quake 3 engine
 Group:          Amusements/Games
 License:        GPLv2+
@@ -43,7 +43,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}-src
-%patch -p1 -z .syslibs
+%patch0 -p1 -z .syslibs
 
 # Rip out the jpeg sources and the SDL and freealut headers and use the
 # system versions instead
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.0-7
+- Fix Patch0:/%%patch mismatch.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1.0-6
 - Autorebuild for GCC 4.3
 



From scop at fedoraproject.org  Sun Sep 21 09:06:41 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 09:06:41 +0000 (UTC)
Subject: rpms/wgrib2/devel wgrib2.spec,1.1,1.2
Message-ID: <20080921090641.D7ADA700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/wgrib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20952/wgrib2/devel

Modified Files:
	wgrib2.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: wgrib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib2/devel/wgrib2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wgrib2.spec	20 May 2008 15:34:53 -0000	1.1
+++ wgrib2.spec	21 Sep 2008 09:06:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           wgrib2
 Version:        1.7.2b
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manipulate, inventory and decode GRIB2 files
 
 Group:          Applications/Engineering
@@ -24,7 +24,7 @@
 %setup -q -n grib2
 rm -r g2clib-* jasper-*.tar.gz libpng-*.tar.gz \
   zlib-*.tar.gz netcdf.tar.gz
-%patch -p1 -b .flags
+%patch0 -p1 -b .flags
 
 
 %build
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.7.2b-2
+- Fix Patch0:/%%patch mismatch.
+
 * Mon May 19 2008 Orion Poplawski <orion at cora.nwra.com> - 1.7.2b-1
 - Update to 1.7.2b
 - Update makefile patch



From scop at fedoraproject.org  Sun Sep 21 09:07:32 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 09:07:32 +0000 (UTC)
Subject: rpms/worminator/devel worminator.spec,1.8,1.9
Message-ID: <20080921090732.EE68A700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/worminator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21110/worminator/devel

Modified Files:
	worminator.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: worminator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/worminator/devel/worminator.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- worminator.spec	19 Feb 2008 09:50:21 -0000	1.8
+++ worminator.spec	21 Sep 2008 09:07:02 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           worminator
 Version:        3.0R2.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Sidescrolling platform and shoot'em up action-game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -21,7 +21,7 @@
 
 %prep
 %setup -q
-%patch -p1 -z .speed
+%patch0 -p1 -z .speed
 sed -i 's/\r//' ReadMe.txt
 
 
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 3.0R2.1-9
+- Fix Patch0:/%%patch mismatch.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.0R2.1-8
 - Autorebuild for GCC 4.3
 



From scop at fedoraproject.org  Sun Sep 21 09:08:19 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 09:08:19 +0000 (UTC)
Subject: rpms/xmlroff/devel xmlroff.spec,1.1,1.2
Message-ID: <20080921090819.385A1700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xmlroff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21218/xmlroff/devel

Modified Files:
	xmlroff.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: xmlroff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlroff/devel/xmlroff.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmlroff.spec	15 Nov 2007 14:05:56 -0000	1.1
+++ xmlroff.spec	21 Sep 2008 09:07:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           xmlroff
 Version:        0.5.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A XSL-FO processor
 
 Group:          Applications/Publishing
@@ -39,7 +39,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rpath
+%patch0 -p1 -b .rpath
 %patch1 -p1 -b .nolibxslt
 
 %build
@@ -85,6 +85,9 @@
 %{_libdir}/pkgconfig/libfo-0.5.pc
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.2-5
+- Fix Patch0:/%%patch mismatch.
+
 * Fri Nov  9 2007 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.5.2-4
 - Added requirement of libxml2-devel in libfo-devel
 



From scop at fedoraproject.org  Sun Sep 21 09:10:01 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 09:10:01 +0000 (UTC)
Subject: rpms/xpdf/devel xpdf.spec,1.10,1.11
Message-ID: <20080921091001.798C5700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xpdf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21468/xpdf/devel

Modified Files:
	xpdf.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: xpdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpdf/devel/xpdf.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xpdf.spec	19 Jun 2008 13:11:36 -0000	1.10
+++ xpdf.spec	21 Sep 2008 09:09:31 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: A PDF file viewer for the X Window System
 Name: xpdf
 Version: 3.02
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -80,7 +80,7 @@
 
 %prep
 %setup -q -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 12 -a 13 -a 14 -a 15 -a 16
-%patch -p1
+%patch0 -p1
 %patch3 -p1 -b .ext
 %patch6 -p1 -b .core
 %patch7 -p1 -b .fonts
@@ -246,6 +246,9 @@
 %{_datadir}/xpdf/latin2
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1:3.02-8
+- Fix Patch0:/%%patch mismatch.
+
 * Thu Jun 19 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.02-7
 - add missing Requires: xorg-x11-fonts-ISO8859-1-75dpi
 



From scop at fedoraproject.org  Sun Sep 21 09:10:49 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 21 Sep 2008 09:10:49 +0000 (UTC)
Subject: rpms/zvbi/devel zvbi.spec,1.8,1.9
Message-ID: <20080921091049.E7212700FA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/zvbi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21615/zvbi/devel

Modified Files:
	zvbi.spec 
Log Message:
* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Patch0:/%patch mismatch.

https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.html



Index: zvbi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zvbi/devel/zvbi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- zvbi.spec	5 Mar 2008 23:11:11 -0000	1.8
+++ zvbi.spec	21 Sep 2008 09:10:19 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:               zvbi
 Version:            0.2.30
-Release:            1%{?dist}
+Release:            2%{?dist}
 Summary:            Raw VBI, Teletext and Closed Caption decoding library
 Group:              System Environment/Libraries
 # See NEWS for a full breakdown of licensing.
@@ -63,7 +63,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b .orig
+%patch0 -p1 -b .orig
 %patch1 -p1
 
 #Fix character encodings
@@ -185,6 +185,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.2.30-2
+- Fix Patch0:/%%patch mismatch.
+
 * Wed Mar 05 2008 Ian Chapman <packages[AT]amiga-hardware.com> 0.2.30-1
 - Update to 0.2.30
 - Updated license field due to license change GPLv2+ -> LGPLv2+



From alexlan at fedoraproject.org  Sun Sep 21 10:07:43 2008
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Sun, 21 Sep 2008 10:07:43 +0000 (UTC)
Subject: rpms/evolution-brutus/devel .cvsignore, 1.9,
	1.10 evolution-brutus.spec, 1.15, 1.16 sources, 1.9, 1.10
Message-ID: <20080921100743.F07F1700FA@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/evolution-brutus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29275

Modified Files:
	.cvsignore evolution-brutus.spec sources 
Log Message:
Update to 1.2.20



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-brutus/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	11 Jun 2008 01:57:54 -0000	1.9
+++ .cvsignore	21 Sep 2008 10:07:13 -0000	1.10
@@ -1 +1 @@
-evolution-brutus-1.2.17.tar.gz
+evolution-brutus-1.2.20.tar.gz


Index: evolution-brutus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-brutus/devel/evolution-brutus.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- evolution-brutus.spec	11 Sep 2008 15:34:22 -0000	1.15
+++ evolution-brutus.spec	21 Sep 2008 10:07:13 -0000	1.16
@@ -4,8 +4,8 @@
 %define eds_base_version 2.24
 
 Name:		evolution-brutus
-Version:	1.2.17
-Release:	2%{?dist}
+Version:	1.2.20
+Release:	1%{?dist}
 Summary:	Brutus based Exchange connector for Novell Evolution 2.4 and later
 
 License:	GPLv2+
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.20-1
+- Update to 1.2.20
+
 * Thu Sep 11 2008 Jesse Keating <jkeating at redhat.com> - 1.2.17-2
 - Rebuild for broken deps.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-brutus/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	11 Jun 2008 01:57:54 -0000	1.9
+++ sources	21 Sep 2008 10:07:13 -0000	1.10
@@ -1 +1 @@
-917165637b9baac6e5ef54048bd2c850  evolution-brutus-1.2.17.tar.gz
+ebc9eb44b3ff724dec68258444bf7506  evolution-brutus-1.2.20.tar.gz



From trasher at fedoraproject.org  Sun Sep 21 10:17:33 2008
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Sun, 21 Sep 2008 10:17:33 +0000 (UTC)
Subject: rpms/eric/F-9 eric.spec,1.28,1.29 sources,1.13,1.14
Message-ID: <20080921101733.E813C700FA@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/eric/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30402

Modified Files:
	eric.spec sources 
Log Message:
Update to 4.2.1



Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/F-9/eric.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- eric.spec	5 Jul 2008 20:39:07 -0000	1.28
+++ eric.spec	21 Sep 2008 10:17:02 -0000	1.29
@@ -2,9 +2,12 @@
 # Fedora review
 # http://bugzilla.redhat.com/186919
 
+# avoid empty debuginfo package
+%define debug_package %{nil}
+
 Name:    eric
 Summary: Python IDE
-Version: 4.1.6
+Version: 4.2.1
 Release: 1%{?dist}
 
 License: GPL+
@@ -12,12 +15,13 @@
 URL:     http://www.die-offenbachs.de/eric/index.html
 Source:  http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
 
 Source1: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-fr-%{version}.tar.gz
 Source2: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-de-%{version}.tar.gz
 Source3: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-ru-%{version}.tar.gz
 Source4: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-cs-%{version}.tar.gz
+Source5: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-es-%{version}.tar.gz
+Source6: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-tr-%{version}.tar.gz
 Source10: eric4.desktop
 
 Patch1:    eric4-4.1.0-shebang.patch
@@ -47,30 +51,34 @@
 
 
 %prep
-%setup -q -a 1 -a 2 -a 3 -a 4 -n %{name}4-%{version}
+%setup -q -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -n %{name}4-%{version}
 
 %patch1 -p1
 
-sed -i -e 's|"QtToolsPostfix4" : ""|"QtToolsPostfix4" : "-qt4"|' eric/Preferences/__init__.py
-sed -i -e "s|@APIDIR@|%{_datadir}/eric|" eric/Preferences/__init__.py
-
 # copy language files
 mv eric4-%{version}/%{name}/i18n/*.qm %{name}/i18n/
-mv eric4-%{version}/%{name}/i18n/*.ts %{name}/i18n/
+
 rm -rf %{name}-%{version}
 
 %build
+# Empty build
 
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/
 
+#path to install api files
+sed -i -e 's|qtDataDir = pyqtconfig._pkg_config\["qt_data_dir"\]|qtDataDir = "%{buildroot}" + pyqtconfig._pkg_config\["qt_data_dir"\]|' install.py
+
 %{__python} install.py \
   -i %{buildroot}/ \
   -b %{_bindir} \
   -d %{python_sitedir}
 
+#we have to correct api path to remove %{builddir}
+sed -i -e 's|%{buildroot}||' %{buildroot}%{python_sitedir}/eric4config.py
+
 desktop-file-install \
   --dir %{buildroot}/%{_datadir}/applications/ \
   --vendor="" \
@@ -130,8 +138,16 @@
 %{_datadir}/applications/*eric4.desktop
 %{_datadir}/icons/hicolor/*/*/*
 
+%{_libdir}/qt4/qsci/api/python/*.api
+%{_libdir}/qt4/qsci/api/ruby/*.api
+
 
 %changelog
+* Sun Sep 7 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 4.2.1-1
+- 4.2.1
+- no longer noarch package (see bz #456761)
+- .ts files from translations should not be included
+
 * Sat Jul 05 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 4.1.6-1
 - 4.1.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 Jul 2008 20:39:07 -0000	1.13
+++ sources	21 Sep 2008 10:17:02 -0000	1.14
@@ -1,5 +1,7 @@
-fa8d0a230d9f369c67acd72dc35cea83  eric4-4.1.6.tar.gz
-20fd04deb6ea73915f1e13d6a35356f5  eric4-i18n-cs-4.1.6.tar.gz
-72b8b7b45ebbdacaf3aa7b14c6e24a39  eric4-i18n-de-4.1.6.tar.gz
-aa62e7d3973ca75a781e9d53c3a99717  eric4-i18n-fr-4.1.6.tar.gz
-eb9f80000a4be3f05d3e1829b3fc6f46  eric4-i18n-ru-4.1.6.tar.gz
+b2a9edb6c44319f3f96afba32be337bb  eric4-4.2.1.tar.gz
+637ce2a08d360ae82d283a0c76000b85  eric4-i18n-cs-4.2.1.tar.gz
+d336411c95534a01718abd932c3289fa  eric4-i18n-de-4.2.1.tar.gz
+df5bbbfedf7b10ed7359884845e98235  eric4-i18n-es-4.2.1.tar.gz
+d8b6d0b94816ca5b5752ef6cdc682254  eric4-i18n-fr-4.2.1.tar.gz
+5f87a9a4920086b8ef1dc7152f4ac582  eric4-i18n-ru-4.2.1.tar.gz
+a4c55068b7c44d20906aabd223680453  eric4-i18n-tr-4.2.1.tar.gz



From drago01 at fedoraproject.org  Sun Sep 21 10:27:30 2008
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Sun, 21 Sep 2008 10:27:30 +0000 (UTC)
Subject: rpms/pinot/devel .cvsignore, 1.12, 1.13 pinot.spec, 1.34,
	1.35 sources, 1.12, 1.13 pinot-0.88-buildfix.patch, 1.3, NONE
Message-ID: <20080921102730.1396A700FA@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/pinot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31638

Modified Files:
	.cvsignore pinot.spec sources 
Removed Files:
	pinot-0.88-buildfix.patch 
Log Message:
update to 0.89


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pinot/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	30 Aug 2008 13:00:41 -0000	1.12
+++ .cvsignore	21 Sep 2008 10:26:59 -0000	1.13
@@ -1 +1 @@
-pinot-0.88.tar.gz
+pinot-0.89.tar.gz


Index: pinot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinot/devel/pinot.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- pinot.spec	30 Aug 2008 15:35:19 -0000	1.34
+++ pinot.spec	21 Sep 2008 10:26:59 -0000	1.35
@@ -1,6 +1,6 @@
 Name:  pinot
-Version: 0.88
-Release: 2%{?dist}
+Version: 0.89
+Release: 1%{?dist}
 Summary: Personal search and metasearch for the Desktop      
 
 Group: User Interface/Desktops        
@@ -8,7 +8,6 @@
 URL: http://pinot.berlios.de/            
 Source0: http://download2.berlios.de/pinot/%{name}-%{version}.tar.gz  
 Patch0: fix_lang_detect.patch
-Patch1: pinot-0.88-buildfix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: sqlite-devel >= 3.3.1
@@ -54,7 +53,6 @@
 %prep
 %setup -q 
 %patch0 -p1 -b .lang_detect
-%patch1 -p1 -b .buildfix
 
 %build
 %configure
@@ -119,6 +117,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.89-1
+- Update to 0.89
+
 * Sat Aug 30 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.88-2
 - Fix build
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pinot/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 Aug 2008 13:00:41 -0000	1.12
+++ sources	21 Sep 2008 10:26:59 -0000	1.13
@@ -1 +1 @@
-758dbc950d2c44b301674f0ee714d080  pinot-0.88.tar.gz
+eaec47484a82b0a003191e8c64271d03  pinot-0.89.tar.gz


--- pinot-0.88-buildfix.patch DELETED ---



From mtasaka at fedoraproject.org  Sun Sep 21 11:06:25 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 21 Sep 2008 11:06:25 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.63, 1.64 cairo-dock.spec, 1.79, 
	1.80 sources, 1.63, 1.64 cairo-dock-plugin-rev1235.diff, 1.1,
	NONE cairo-dock-plugin-rev1241.diff, 1.1, NONE
Message-ID: <20080921110626.15D0A7013E@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4751

Modified Files:
	.cvsignore cairo-dock.spec sources 
Removed Files:
	cairo-dock-plugin-rev1235.diff cairo-dock-plugin-rev1241.diff 
Log Message:
* Sun Sep 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1315



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	9 Sep 2008 03:15:52 -0000	1.63
+++ .cvsignore	21 Sep 2008 11:05:53 -0000	1.64
@@ -1,3 +1 @@
-cairo-dock-1.6.2.3.tar.bz2
-cairo-dock-plugins-1.6.2.3.tar.bz2
-cairo-dock-themes-1.6.2.3.tar.bz2
+cairo-dock-sources-svn1315_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- cairo-dock.spec	9 Sep 2008 03:15:52 -0000	1.79
+++ cairo-dock.spec	21 Sep 2008 11:05:54 -0000	1.80
@@ -3,18 +3,18 @@
 # cd trunk
 # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
 
-%define		released	1
+%define		released	0
 # For now build only stable plugin
 %define		build_other	1
 
-%define		tarballver	svn1276_trunk
-%define		mainver		1.6.2.3
+%define		tarballver	svn1315_trunk
+%define		mainver		1.6.3
 %undefine		betaver
 %define		build_gecko	1
 
 
 %if 0%{?released} < 1
-%define		fedora_rel	0.4.%{tarballver}
+%define		fedora_rel	0.1.%{tarballver}
 %else
 %define		fedora_rel	1%{?betaver:.%betaver}
 %endif
@@ -47,16 +47,13 @@
 %if 0%{?released} < 1
 Source0:	%{name}-sources-%{tarballver}.tar.bz2
 %else
-# Source tarball changed again !!
 Source0:	http://download.berlios.de/cairo-dock/%{name}-%{mainver}%{?betaver:-%betaver}.tar.bz2
 Source1:	http://download.berlios.de/cairo-dock/%{name}-themes-%{mainver}%{?betaver:-%betaver}.tar.bz2
 Source2:	http://download.berlios.de/cairo-dock/%{name}-plugins-%{mainver}%{?betaver:-%betaver}.tar.bz2
 %endif
-#Patch0:		cairo-dock-rev1235-inf-loop.patch
 %if 0%{?released} < 1
 Patch1:		cairo-dock-plugin-rev1241.diff
 %endif
-#Patch2:		cairo-dock-svn1260-suppress-debug-message.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	automake
@@ -223,49 +220,19 @@
 find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644
 
 # source code fix
-%if 0%{?released} < 1
-%patch1 -p1 -b .misc
-#%%patch2 -p0 -b .debug
-%endif
 
 # mail: license conflict
 %{__rm} -rf mail/
 
-# musicplayer
-%if 0%{?released} < 1
-cd musicplayer/
-sed -i.po -e '\|po/Makefile|d' configure.ac
-sed -i -e '/ALL_LINGUAS/d' configure.ac
-sed -i -e '/GETTEXT/d' configure.ac
-sed -i -e '/INTLTOOL/d' configure.ac
-sed -i.lib \
-	-e '/AC_SUBST(pkgdatadir)/s|^\(.*\)$|\1\nlibdir=[`pkg-config cairo-dock --variable=pluginsdir`]\nAC_SUBST(libdir)|' \
-	configure.ac
-sed -i.po -e 's|po||' Makefile.am
-cd ..
-%endif
-
-# stack: not available on rev 1226
-# Available on 1.6.2 RC2
-%if 0%{?released} < 1
-rm -rf stack
-%endif
+# Clipper
+sed -i.typo \
+	-e 's|@GETTEXT_PACKAGE@|@GETTEXT_CLIPPER@|' \
+	Clipper/po/Makefile.in.in
 
 # stacks: directory fix
 %if 0%{?released} < 1
 sed -i.dir -e '/stacksdatadir/s|pluginsdir|pluginsdatadir|' \
 	stacks/configure.ac
-sed -i.typo \
-	-e 's|stack/|stacks/|' \
-	-e 's|stackdata|stacksdata|' \
-	-e 's|stack\.conf|stacks\.conf|' \
-	-e 's|stack"|stacks"|' \
-	configure.ac
-sed -i.typo \
-	-e 's|stack\\|stacks\\|' \
-	Makefile.am
-%else
-# STACK vs STACKS typo fixed in 1.6.2.2
 %endif
 
 # template: upstream says this is not needed
@@ -321,7 +288,6 @@
 	if [ $skip == 2 ] ; then continue ; fi
 	cd $dir
 
-# typos in stack/ directory now fixed in 1.6.2.2
 	%{__sed} -i.error \
 		-e 's|-O3|-O2|' \
 		-e 's|-Werror\\|\\|' \
@@ -645,6 +611,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Sep 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1315
+
 * Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.3-1
 - 1.6.2.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	9 Sep 2008 03:15:52 -0000	1.63
+++ sources	21 Sep 2008 11:05:54 -0000	1.64
@@ -1,3 +1 @@
-15cfd709185dd9e3e94b981c51ae75a9  cairo-dock-1.6.2.3.tar.bz2
-afdab8b9778e25ead564b955caf57bdd  cairo-dock-plugins-1.6.2.3.tar.bz2
-09ff25bc173cbb50ae66b3ab4f1a52c5  cairo-dock-themes-1.6.2.3.tar.bz2
+706508783a1e04116df01948c1b62998  cairo-dock-sources-svn1315_trunk.tar.bz2


--- cairo-dock-plugin-rev1235.diff DELETED ---


--- cairo-dock-plugin-rev1241.diff DELETED ---



From mtasaka at fedoraproject.org  Sun Sep 21 11:15:23 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 21 Sep 2008 11:15:23 +0000 (UTC)
Subject: rpms/cairo-dock/devel cairo-dock.spec,1.80,1.81
Message-ID: <20080921111524.083E3700FA@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5976

Modified Files:
	cairo-dock.spec 
Log Message:
orz


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- cairo-dock.spec	21 Sep 2008 11:05:54 -0000	1.80
+++ cairo-dock.spec	21 Sep 2008 11:14:53 -0000	1.81
@@ -51,9 +51,6 @@
 Source1:	http://download.berlios.de/cairo-dock/%{name}-themes-%{mainver}%{?betaver:-%betaver}.tar.bz2
 Source2:	http://download.berlios.de/cairo-dock/%{name}-plugins-%{mainver}%{?betaver:-%betaver}.tar.bz2
 %endif
-%if 0%{?released} < 1
-Patch1:		cairo-dock-plugin-rev1241.diff
-%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	automake



From rathann at fedoraproject.org  Sun Sep 21 11:37:15 2008
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 21 Sep 2008 11:37:15 +0000 (UTC)
Subject: rpms/libdvdread/F-9 libdvdread.spec, 1.4, 1.5 sources, 1.3,
	1.4 .cvsignore, 1.2, 1.3 dead.package, 1.1, NONE
Message-ID: <20080921113715.AB675700FA@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/libdvdread/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7158

Modified Files:
	.cvsignore 
Added Files:
	libdvdread.spec sources 
Removed Files:
	dead.package 
Log Message:
- update to 4.1.3 final
- resurrect package from new upstream



Index: libdvdread.spec
===================================================================
RCS file: libdvdread.spec
diff -N libdvdread.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libdvdread.spec	21 Sep 2008 11:36:45 -0000	1.5
@@ -0,0 +1,163 @@
+Name:           libdvdread
+Version:        4.1.3
+Release:        1%{?dist}
+Summary:        A library for reading DVD video discs based on Ogle code
+
+Group:          System Environment/Libraries
+License:        GPLv2+
+Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdread-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+libdvdread provides a simple foundation for reading DVD video disks.
+It provides the functionality that is required to access many DVDs.
+
+%package        devel
+Summary:        Development files for libdvdread
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+
+%description    devel
+libdvdread provides a simple foundation for reading DVD video disks.
+It provides the functionality that is required to access many DVDs.
+
+This package contains development files for libdvdread.
+
+%prep
+%setup -q
+
+%build
+./configure2 \
+ --disable-opts \
+ --disable-static \
+ --disable-strip \
+ --extra-cflags="%{optflags}" \
+ --libdir=%{_libdir} \
+ --prefix=%{_prefix} \
+ --shlibdir=%{_libdir} \
+
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
+
+%clean
+rm -rf %{buildroot}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%{_libdir}/libdvdread.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/dvdread-config
+%{_includedir}/dvdread
+%{_libdir}/libdvdread.so
+%{_libdir}/pkgconfig/dvdread.pc
+
+%changelog
+* Sun Sep 21 2008 Dominik Mierzejewski <rpm at greysector.net> 4.1.3-1
+- update to 4.1.3 final
+- resurrect package from new upstream
+
+* Sun Jan 27 2008 Dominik Mierzejewski <rpm at greysector.net> 0.9.7-4
+- fix missing <inttypes.h> include (bug 428910)
+
+* Wed Aug 29 2007 Dominik Mierzejewski <rpm at greysector.net> 0.9.7-3
+- rebuild for BuildID
+- update license tag
+
+* Wed Nov 26 2006 Dominik Mierzejewski <rpm at greysector.net> 0.9.7-2
+- Rebuild.
+
+* Fri Oct  6 2006 Dams <anvil[AT]livna.org> - 0.9.7-1
+- Updated to 0.9.7
+
+* Wed Sep 20 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.6-2
+- Rebuild.
+
+* Sun Jul 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.6-1
+- 0.9.6.
+- Specfile cleanup.
+
+* Thu Mar 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.4-4
+- Fix linking with libdl on x86_64.
+- Don't ship static libs.
+- Build with dependency tracking disabled.
+- Convert specfile and docs to UTF-8.
+- Improve package descriptions.
+
+* Thu Mar 16 2006 Dams <anvil[AT]livna.org> - 0.9.4-3
+- We BuildConflicting libdvdcss-devel at build time
+
+* Mon Mar 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> 0.9.4-2 
+- Drop Epoch completely
+
+* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- switch to new release field
+- drop Epoch
+
+* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- add dist
+
+* Thu Apr  3 2003 Marius Johndal <mariuslj at ifi.uio.no> 0:0.9.4-0.fdr.1
+- Initial Fedora RPM release.
+
+* Mon Mar 31 2003 Matthias Saou <matthias.saou at est.une.marmotte.net>
+- Rebuilt for Red Hat Linux 9.
+- Exclude .la file.
+
+* Sun Feb 16 2003 Matthias Saou <matthias.saou at est.une.marmotte.net>
+- Update to 0.9.4.
+
+* Thu Sep 26 2002 Matthias Saou <matthias.saou at est.une.marmotte.net>
+- Updated to the latest cvs release.
+- Rebuilt for Red Hat Linux 8.0.
+- Updated URLs.
+
+* Mon May 27 2002 Matthias Saou <matthias.saou at est.une.marmotte.net>
+- Update to 0.9.3.
+
+* Wed May 15 2002 Matthias Saou <matthias.saou at est.une.marmotte.net>
+- Fixed the libdvdcss.so.0/1/2 problem again.
+
+* Thu May  2 2002 Matthias Saou <matthias.saou at est.une.marmotte.net>
+- Back to using libdvdcss 1.1.1, now it's all merged and fine.
+- Rebuilt against Red Hat Linux 7.3.
+- Added the %{?_smp_mflags} expansion.
+
+* Sat Jan 12 2002 Matthias Saou <matthias.saou at est.une.marmotte.net>
+- Reverted back to using libdvdcss 0.0.3.ogle3 since it works MUCH better
+  than 1.0.x. Doh!
+
+* Tue Nov 13 2001 Matthias Saou <matthias.saou at est.une.marmotte.net>
+- Rebuilt against libdvdcss 1.0.0 (added a patch).
+
+* Mon Oct 29 2001 Matthias Saou <matthias.saou at est.une.marmotte.net>
+- Spec file cleanup and fixes.
+
+* Thu Oct 11 2001 Martin Norb??ck <d95mback at dtek.chalmers.se>
+- Updated to version 0.9.2
+
+* Tue Sep 25 2001 Martin Norb??ck <d95mback at dtek.chalmers.se>
+- Added small patch to fix the ldopen of libdvdcss
+
+* Tue Sep 18 2001 Martin Norb??ck <d95mback at dtek.chalmers.se>
+- Updated to version 0.9.1
+
+* Fri Sep 14 2001 Martin Norb??ck <d95mback at dtek.chalmers.se>
+- Split into normal and devel package
+
+* Thu Sep 6 2001 Martin Norb??ck <d95mback at dtek.chalmers.se>
+- Updated to version 0.9.0
+
+* Tue Jul 03 2001 Martin Norb??ck <d95mback at dtek.chalmers.se>
+- initial version
+
+


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	21 Sep 2008 11:36:45 -0000	1.4
@@ -0,0 +1 @@
+6dc068d442c85a3cdd5ad3da75f6c6e8  libdvdread-4.1.3.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Nov 2006 22:22:27 -0000	1.2
+++ .cvsignore	21 Sep 2008 11:36:45 -0000	1.3
@@ -1 +1 @@
-libdvdread-0.9.7.tar.gz
+libdvdread-4.1.3.tar.bz2


--- dead.package DELETED ---



From rathann at fedoraproject.org  Sun Sep 21 11:38:53 2008
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 21 Sep 2008 11:38:53 +0000 (UTC)
Subject: rpms/libdvdnav/F-9 .cvsignore, 1.3, 1.4 libdvdnav.spec, 1.11,
	1.12 sources, 1.3, 1.4 libdvdnav-r1001-r1043.patch, 1.1,
	NONE libdvdnav-r1108.patch, 1.1, NONE
Message-ID: <20080921113853.4F2F9700FA@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/libdvdnav/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7358

Modified Files:
	.cvsignore libdvdnav.spec sources 
Removed Files:
	libdvdnav-r1001-r1043.patch libdvdnav-r1108.patch 
Log Message:
* Sun Sep 21 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.3-1
- update to 4.1.3 final
- use new external libdvdread
- macroize



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdnav/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Apr 2008 15:32:17 -0000	1.3
+++ .cvsignore	21 Sep 2008 11:38:22 -0000	1.4
@@ -1 +1 @@
-libdvdnav-4.1.2.tar.gz
+libdvdnav-4.1.3.tar.bz2


Index: libdvdnav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdnav/F-9/libdvdnav.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libdvdnav.spec	30 Jul 2008 20:44:56 -0000	1.11
+++ libdvdnav.spec	21 Sep 2008 11:38:23 -0000	1.12
@@ -1,16 +1,17 @@
 Name:           libdvdnav
-Version:        4.1.2
-Release:        3%{?dist}
+Version:        4.1.3
+Release:        1%{?dist}
 Summary:        A library for reading DVD video discs based on Ogle code
 
 Group:          System Environment/Libraries
 License:        GPLv2+
-Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-%{version}.tar.gz
-Patch0:         %{name}-r1001-r1043.patch
-Patch1:         %{name}-r1108.patch
+Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-%{version}.tar.bz2
+# svn export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav
+#Source:         %{name}-4.1.3rc1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  doxygen
+BuildRequires:  libdvdread-devel >= 4.1.3-1
 
 %description
 libdvdnav provides a simple library for reading DVD video discs.
@@ -20,68 +21,45 @@
 Summary:        Development files for libdvdnav
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       libdvdread-devel = %{version}-%{release}
+Requires:       libdvdread-devel >= 4.1.3-1
+Requires:       pkgconfig
 
 %description    devel
 libdvdnav-devel contains the files necessary to build packages that use the
 libdvdnav library.
 
-%package -n libdvdread
-Summary:        Simple foundation for reading DVD video disks
-Group:          System Environment/Libraries
-
-%description -n libdvdread
-libdvdread provides a simple foundation for reading DVD video disks.
-It provides the functionality that is required to access many DVDs.
-
-%package -n libdvdread-devel
-Summary:        Development files for libdvdread
-Group:          Development/Libraries
-Requires:       libdvdread = %{version}-%{release}
-
-%description -n libdvdread-devel
-libdvdread provides a simple foundation for reading DVD video disks.
-It provides the functionality that is required to access many DVDs.
-
-This package contains development files for libdvdread.
-
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
 
 %build
 ./configure2 \
  --disable-opts \
  --disable-static \
  --disable-strip \
- --extra-cflags="$RPM_OPT_FLAGS" \
+ --extra-cflags="%{optflags}" \
  --libdir=%{_libdir} \
  --prefix=%{_prefix} \
  --shlibdir=%{_libdir} \
+ --with-dvdread-config="pkg-config dvdread" \
 
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 pushd doc
 doxygen doxy.conf
 popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/aclocal
-install -p -m 644 m4/dvdnav.m4 $RPM_BUILD_ROOT/%{_datadir}/aclocal
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
+%{__install} -d -m 755 %{buildroot}/%{_datadir}/aclocal
+%{__install} -p -m 644 m4/dvdnav.m4 %{buildroot}/%{_datadir}/aclocal
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%post -n libdvdread -p /sbin/ldconfig
-
-%postun -n libdvdread -p /sbin/ldconfig
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
@@ -96,18 +74,15 @@
 %{_libdir}/libdvdnavmini.so
 %{_includedir}/dvdnav
 %{_datadir}/aclocal/dvdnav.m4
-
-%files -n libdvdread
-%defattr(-,root,root,-)
-%{_libdir}/libdvdread.so.*
-
-%files -n libdvdread-devel
-%defattr(-,root,root,-)
-%{_bindir}/dvdread-config
-%{_includedir}/dvdread
-%{_libdir}/libdvdread.so
+%{_libdir}/pkgconfig/dvdnav.pc
+%{_libdir}/pkgconfig/dvdnavmini.pc
 
 %changelog
+* Sun Sep 21 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.3-1
+- update to 4.1.3 final
+- use new external libdvdread
+- macroize
+
 * Wed Jul 30 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.2-3
 - really fix #455961
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdnav/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Apr 2008 15:32:17 -0000	1.3
+++ sources	21 Sep 2008 11:38:23 -0000	1.4
@@ -1 +1 @@
-0e9a494403f9f5a2e781252c77599561  libdvdnav-4.1.2.tar.gz
+d62383c45b28816771e283515f2c27fa  libdvdnav-4.1.3.tar.bz2


--- libdvdnav-r1001-r1043.patch DELETED ---


--- libdvdnav-r1108.patch DELETED ---



From rathann at fedoraproject.org  Sun Sep 21 12:02:38 2008
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 21 Sep 2008 12:02:38 +0000 (UTC)
Subject: rpms/libdvdread/F-9 Makefile,1.2,1.3
Message-ID: <20080921120238.7DEF8700FA@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/libdvdread/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10090

Added Files:
	Makefile 
Log Message:
restore Makefile



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	21 Sep 2008 12:02:08 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: libdvdread
+# $Id$
+NAME := libdvdread
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)



From green at fedoraproject.org  Sun Sep 21 12:10:45 2008
From: green at fedoraproject.org (Anthony Green)
Date: Sun, 21 Sep 2008 12:10:45 +0000 (UTC)
Subject: rpms/common-lisp-controller/devel common-lisp-controller.spec, NONE,
	1.1
Message-ID: <20080921121045.BB827700FA@cvs1.fedora.phx.redhat.com>

Author: green

Update of /cvs/pkgs/rpms/common-lisp-controller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11434

Added Files:
	common-lisp-controller.spec 
Log Message:
Add spec file



--- NEW FILE common-lisp-controller.spec ---
Summary:      Common Lisp source and compiler manager
Name:         common-lisp-controller
Version:      6.15
Release:      3%{?dist}
URL:          https://alioth.debian.org/projects/clc
Source0:      http://ftp.de.debian.org/debian/pool/main/c/common-lisp-controller/common-lisp-controller_%{version}.tar.gz
Patch0:       common-lisp-controller-fedora.patch
License:      LLGPL
Group:        Development/Libraries
BuildArch:    noarch
BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:     cl-asdf

%description
This package helps installing Common Lisp sources and compilers.
It creates a user-specific cache of compiled objects. When a library
or an implementation is upgraded, all compiled objects in the cache
are flushed. It also provides tools to recompile all libraries.

%prep
%setup -q
%patch0 -p0 

%build
# Do nothing.

%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/common-lisp
install -dm 755 $RPM_BUILD_ROOT%{_prefix}/sbin
install -dm 755 $RPM_BUILD_ROOT%{_bindir}
install -dm 755 $RPM_BUILD_ROOT%{_sbindir}
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/man/man1
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/man/man3
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/man/man8
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/common-lisp
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/common-lisp/systems
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/common-lisp/source
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/common-lisp/source/common-lisp-controller
install -dm 755 $RPM_BUILD_ROOT%{_libdir}/common-lisp
install -dm 755 $RPM_BUILD_ROOT%{_libdir}/common-lisp/bin
install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}
install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/cache
install -dm 1777 $RPM_BUILD_ROOT%{_localstatedir}/cache/common-lisp-controller

for f in register-common-lisp-source unregister-common-lisp-source \
        register-common-lisp-implementation \
        unregister-common-lisp-implementation clc-update-customized-images; do
        install -m 755 $f $RPM_BUILD_ROOT%{_sbindir};
done;

for f in clc-register-user-package clc-unregister-user-package; do
        install -m 755 $f $RPM_BUILD_ROOT%{_bindir};
done;

for f in common-lisp-controller.lisp post-sysdef-install.lisp; do
        install -m 644 $f $RPM_BUILD_ROOT%{_datadir}/common-lisp/source/common-lisp-controller;
done;

gzip man/*
install -m 644 man/register-common-lisp-implementation.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8
install -m 644 man/clc-register-user-package.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1
install -m 644 man/common-lisp-controller.3.gz $RPM_BUILD_ROOT/%{_mandir}/man3

cd man
ln -s register-common-lisp-implementation.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/unregister-common-lisp-implementation.8.gz
ln -s register-common-lisp-implementation.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/register-common-lisp-source.8.gz
ln -s register-common-lisp-implementation.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/unregister-common-lisp-source.8.gz
ln -s register-common-lisp-implementation.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/clc-update-customized-images.8.gz
ln -s clc-register-user-package.1.gz  $RPM_BUILD_ROOT/%{_mandir}/man1/clc-unregister-user-package.1.gz
cd ..

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc DESIGN.txt debian/copyright
%dir %{_sysconfdir}/common-lisp
%dir %{_libdir}/common-lisp
%dir %{_localstatedir}/cache/common-lisp-controller
%{_datadir}/common-lisp
%{_bindir}/clc-*
%{_sbindir}/clc-*
%{_sbindir}/register-*
%{_sbindir}/unregister-*
%{_mandir}/man1/*
%{_mandir}/man3/*
%{_mandir}/man8/*

%changelog
* Sun Jul 13 2008 Anthony Green <green at redhat.com> 6.15-3
- Fix cache directory permissions.

* Mon Jul 07 2008 Anthony Green <green at redhat.com> 6.15-2
- Add debian/copyright and tweak description.

* Sun Jul 06 2008 Anthony Green <green at redhat.com> 6.15-1
- Upgrade.

* Thu Jan 03 2008 Anthony Green <green at redhat.com> 6.12-3
- Remove execute bit from lisp scripts and man pages.

* Sat Nov 11 2007 Anthony Green <green at redhat.com> 6.12-2
- Add cl-asdf dependency.

* Sat Sep 29 2007 Anthony Green <green at redhat.com> 6.12-1
- Created.



From green at fedoraproject.org  Sun Sep 21 12:12:21 2008
From: green at fedoraproject.org (Anthony Green)
Date: Sun, 21 Sep 2008 12:12:21 +0000 (UTC)
Subject: rpms/common-lisp-controller/devel common-lisp-controller.spec, 1.1, 
	1.2
Message-ID: <20080921121221.CA5C2700FA@cvs1.fedora.phx.redhat.com>

Author: green

Update of /cvs/pkgs/rpms/common-lisp-controller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11641

Modified Files:
	common-lisp-controller.spec 
Log Message:
fix tagging error


Index: common-lisp-controller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/common-lisp-controller/devel/common-lisp-controller.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- common-lisp-controller.spec	21 Sep 2008 12:10:45 -0000	1.1
+++ common-lisp-controller.spec	21 Sep 2008 12:11:51 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:      Common Lisp source and compiler manager
 Name:         common-lisp-controller
 Version:      6.15
-Release:      3%{?dist}
+Release:      4%{?dist}
 URL:          https://alioth.debian.org/projects/clc
 Source0:      http://ftp.de.debian.org/debian/pool/main/c/common-lisp-controller/common-lisp-controller_%{version}.tar.gz
 Patch0:       common-lisp-controller-fedora.patch
@@ -89,6 +89,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Sun Sep 21 2008 Anthony Green <green at redhat.com> 6.15-4
+- Fix tagging error.
+
 * Sun Jul 13 2008 Anthony Green <green at redhat.com> 6.15-3
 - Fix cache directory permissions.
 



From claudiotomasoni at fedoraproject.org  Sun Sep 21 12:38:01 2008
From: claudiotomasoni at fedoraproject.org (Claudio Tomasoni)
Date: Sun, 21 Sep 2008 12:38:01 +0000 (UTC)
Subject: rpms/tennix/devel import.log,1.2,1.3
Message-ID: <20080921123801.4D8B3700FA@cvs1.fedora.phx.redhat.com>

Author: claudiotomasoni

Update of /cvs/pkgs/rpms/tennix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14744/devel

Modified Files:
	import.log 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tennix/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	14 Sep 2008 17:01:00 -0000	1.2
+++ import.log	21 Sep 2008 12:37:31 -0000	1.3
@@ -1,2 +1,3 @@
 tennix-0_6_1-4_fc9:HEAD:tennix-0.6.1-4.fc9.src.rpm:1220985773
 tennix-0_6_1-4_fc9:HEAD:tennix-0.6.1-4.fc9.src.rpm:1221411616
+tennix-0_6_1-4_fc9:HEAD:tennix-0.6.1-4.fc9.src.rpm:1222000581



From green at fedoraproject.org  Sun Sep 21 12:42:14 2008
From: green at fedoraproject.org (Anthony Green)
Date: Sun, 21 Sep 2008 12:42:14 +0000 (UTC)
Subject: rpms/sbcl/devel sbcl-install-clc.lisp, NONE, 1.1 sbcl.rc, NONE,
	1.1 sbcl.sh, 1.5, 1.6 sbcl.spec, 1.94, 1.95
Message-ID: <20080921124214.3F7A4700FA@cvs1.fedora.phx.redhat.com>

Author: green

Update of /cvs/pkgs/rpms/sbcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15364

Modified Files:
	sbcl.spec 
Added Files:
	sbcl-install-clc.lisp sbcl.rc sbcl.sh 
Log Message:
Add common-lisp-controller support


--- NEW FILE sbcl-install-clc.lisp ---
;;; -*- Mode: LISP; Package: CL-USER -*-
;;;
;;; Copyright (C) Peter Van Eynde 2001 and Kevin Rosenberg 2002-2003
;;;
;;; License: LGPL v2
;;;
(in-package "COMMON-LISP-USER")

(handler-case
    (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp")
  (error (e)
    (format t "~%Error during load of common-lisp-controller.lisp: ~A~%" e)
    (sb-unix:unix-exit 1)))

(handler-case
    (common-lisp-controller:init-common-lisp-controller-v4 "sbcl")
  (error (e)
    (format t "~%Error running init-common-lisp-controller-v4: ~A~%" e)
    (sb-unix:unix-exit 1)))

(when (probe-file #p"/etc/lisp.config")
  (load #p"/etc/lisp.config"))

(setf (logical-pathname-translations "SYS")
      '(("SYS:**;*.*.*"
         #P"/usr/share/sbcl-source/**/*.*")))

(set-dispatch-macro-character #\# #\!
  (lambda (stream bang arg)
    (declare (ignore bang arg))
    (read-line stream)
    (values)))

(ignore-errors
 (format t "~%Saving to sbcl-new.core...")
 (sb-ext:gc :full t)
 (sb-ext:save-lisp-and-die "sbcl-new.core"))


--- NEW FILE sbcl.rc ---
;;; -*- Lisp -*-
;;; this file gets installed as /etc/sbcl.rc and run on every
;;; invocation of sbcl

(if (probe-file "/etc/lisp-config.lisp")
    (load "/etc/lisp-config.lisp")
    (format t "~%;;; Hey: there is no /etc/lisp-config.lisp file, please create one."))


Index: sbcl.sh
===================================================================
RCS file: sbcl.sh
diff -N sbcl.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sbcl.sh	21 Sep 2008 12:41:43 -0000	1.6
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+if [ ! -f /usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp ] ; then
+  cat <<EOF
+OF
+$0: cannot find the common-lisp-controller source.
+EOF
+  exit 0
+fi
+
+build_error()
+{
+    echo "Build failure $1"
+    exit 1
+}
+
+if [ -f /etc/sbcl.rc ] ; then
+  RCFILE=/etc/sbcl.rc
+else
+  RCFILE=/dev/null
+fi
+
+case $1 in
+    install-clc)
+    echo $0 loading and dumping clc.
+    ( cd /usr/lib/sbcl
+         /usr/bin/sbcl --core /usr/lib/sbcl/sbcl-dist.core \
+	   --noinform --sysinit ${RCFILE} --userinit /dev/null \
+	   --load "/usr/lib/sbcl/install-clc.lisp" # 2> /dev/null
+              mv sbcl-new.core sbcl.core || (echo FAILED ; cp sbcl-dist.core sbcl.core ) )
+    ;;
+    remove-clc)
+    echo $0 removing clc-enabled image
+    cp /usr/lib/sbcl/sbcl-dist.core /usr/lib/sbcl/sbcl.core
+    ;;
+    rebuild)
+    echo $0 rebuilding...
+    shift
+    echo rebuilding $1
+    /usr/bin/sbcl --noinform --sysinit ${RCFILE} --userinit /dev/null \
+             --disable-debugger \
+             --eval \
+"(handler-case
+     (progn
+       (asdf:operate 'asdf:compile-op (quote $1))
+       (sb-unix:unix-exit 0))
+    (error (e)
+      (ignore-errors (format t \"~&Build error: ~A~%\" e))
+      (finish-output)
+      (sb-unix:unix-exit 1)))" || build_error
+    ;;
+     remove)
+    echo $0 removing packages...
+    shift
+    while [ ! -z "$1" ] ; do
+rm -rf "/var/cache/common-lisp-controller/*/sbcl/${1}"
+shift
+     done
+    ;;
+    *)
+    echo $0 unkown command $1
+    echo known commands: rebuild, remove, install-clc, and remove-clc
+    exit 1
+    ;;
+esac
+
+exit 0


Index: sbcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- sbcl.spec	2 Sep 2008 14:25:41 -0000	1.94
+++ sbcl.spec	21 Sep 2008 12:41:43 -0000	1.95
@@ -13,7 +13,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 1.0.20
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: BSD
 Group: 	 Development/Languages
@@ -27,6 +27,9 @@
 ExclusiveArch: i386 x86_64 ppc sparc
 %endif
 
+BuildRequires: common-lisp-controller
+Requires:      common-lisp-controller
+
 # Pre-generated html docs (not used)
 #Source1: http://downloads.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
 Source2: customize-target-features.lisp 
@@ -71,6 +74,10 @@
 
 Source100: my_setarch.c
 
+Source200: sbcl.sh
+Source201: sbcl.rc
+Source202: sbcl-install-clc.lisp
+
 Patch1: sbcl-1.0.19-default-sbcl-home.patch
 Patch2: sbcl-0.9.5-personality.patch
 Patch3: sbcl-1.0.16-optflags.patch
@@ -199,16 +206,22 @@
 # 'test-passed' files from %%check
 find %{buildroot} -name 'test-passed' | xargs rm -vf
 
+install -m 744 %{SOURCE200} %{buildroot}%{_libdir}/common-lisp/bin
+install -m 644 %{SOURCE201} %{buildroot}%{_sysconfdir}/sbcl.rc
+install -m 644 %{SOURCE202} %{buildroot}%{_libdir}/sbcl/install-clc.lisp
+cp %{buildroot}%{_libdir}/sbcl/sbcl.core %{buildroot}%{_libdir}/sbcl/sbcl-dist.core
 
 %if "x%{?min_bootstrap}" == "x%{nil}"
 %post
 /sbin/install-info %{_infodir}/sbcl.info %{_infodir}/dir ||:
 /sbin/install-info %{_infodir}/asdf.info %{_infodir}/dir ||:
+/usr/sbin/register-common-lisp-implementation sbcl > /dev/null 2>&1 ||:
 
 %preun
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/sbcl.info %{_infodir}/dir ||:
   /sbin/install-info --delete %{_infodir}/asdf.info %{_infodir}/dir ||:
+  /usr/sbin/unregister-common-lisp-implementation sbcl > /dev/null 2>&1 ||:
 fi
 %else
 %pre
@@ -229,6 +242,8 @@
 %doc doc/manual/sbcl
 %doc doc/manual/asdf
 %{_infodir}/*
+%{_libdir}/common-lisp/bin/*
+%{_sysconfdir}/*
 %endif
 
 
@@ -237,6 +252,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Anthony Green <green at redhat.com> - 1.0.20-2
+- Add common-lisp-controller bits.
+
 * Tue Sep 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.20-1
 - sbcl-1.0.20
 



From claudiotomasoni at fedoraproject.org  Sun Sep 21 12:46:05 2008
From: claudiotomasoni at fedoraproject.org (Claudio Tomasoni)
Date: Sun, 21 Sep 2008 12:46:05 +0000 (UTC)
Subject: rpms/tennix/F-8 import.log, NONE, 1.1 tennix.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080921124605.8BAAC700FA@cvs1.fedora.phx.redhat.com>

Author: claudiotomasoni

Update of /cvs/pkgs/rpms/tennix/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15847/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tennix.spec 
Log Message:



--- NEW FILE import.log ---
tennix-0_6_1-4_fc9:F-8:tennix-0.6.1-4.fc9.src.rpm:1222000976


--- NEW FILE tennix.spec ---
Name:           tennix
Version:        0.6.1
Release:        4%{?dist}
Summary:        A simple tennis game

Group:          Amusements/Games
License:        GPLv2+
URL:            http://icculus.org/tennix/
Source0:        http://icculus.org/tennix/releases/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  SDL-devel, SDL_mixer-devel SDL_image-devel
BuildRequires:  desktop-file-utils


%description
Tennix! is a SDL port of a simple tennis game.
It features a two-player game mode and a single-player mode
against the computer.


%prep
%setup -q
sed -i -e 's/install -s/install/' makefile
sed -i -e 's/install -m/install -p -m/' makefile


%build
CFLAGS="%{optflags}" make
# Usage of smp_mflags causes compilation to fail
# make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
PREFIX=%{_prefix} make install DESTDIR=$RPM_BUILD_ROOT

# Remove executable flag from man page
chmod a-x $RPM_BUILD_ROOT/%{_mandir}/man6/%{name}.*

desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications           \
                     --vendor fedora                                         \
                     --delete-original                                       \
                     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc README COPYING ChangeLog TODO
%{_bindir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/pixmaps/%{name}.png
%{_mandir}/man6/%{name}.*


%changelog
* Wed Aug 27 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.6.1-4
- updated Summary
- fixed filename in SOURCE
- fixed paths in install section
- fixed icon caching after installing and uninstalling
- fixed timestamps preservation in prep section

* Sun Aug 24 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.6.1-3
- fixed .desktop file name in files section

* Mon May 12 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.6.1-2
- make install doesn't strip binaries
- make uses OPTFLAGS

* Wed May  7 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.6.1-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tennix/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:36:58 -0000	1.1
+++ .cvsignore	21 Sep 2008 12:45:35 -0000	1.2
@@ -0,0 +1 @@
+tennix-0.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tennix/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:36:58 -0000	1.1
+++ sources	21 Sep 2008 12:45:35 -0000	1.2
@@ -0,0 +1 @@
+5979d0e3f683808ad492a0691430f259  tennix-0.6.1.tar.gz



From claudiotomasoni at fedoraproject.org  Sun Sep 21 12:52:01 2008
From: claudiotomasoni at fedoraproject.org (Claudio Tomasoni)
Date: Sun, 21 Sep 2008 12:52:01 +0000 (UTC)
Subject: rpms/tennix/F-9 import.log, NONE, 1.1 tennix.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080921125201.06E5D700FA@cvs1.fedora.phx.redhat.com>

Author: claudiotomasoni

Update of /cvs/pkgs/rpms/tennix/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16888/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tennix.spec 
Log Message:



--- NEW FILE import.log ---
tennix-0_6_1-4_fc9:F-9:tennix-0.6.1-4.fc9.src.rpm:1222001413


--- NEW FILE tennix.spec ---
Name:           tennix
Version:        0.6.1
Release:        4%{?dist}
Summary:        A simple tennis game

Group:          Amusements/Games
License:        GPLv2+
URL:            http://icculus.org/tennix/
Source0:        http://icculus.org/tennix/releases/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  SDL-devel, SDL_mixer-devel SDL_image-devel
BuildRequires:  desktop-file-utils


%description
Tennix! is a SDL port of a simple tennis game.
It features a two-player game mode and a single-player mode
against the computer.


%prep
%setup -q
sed -i -e 's/install -s/install/' makefile
sed -i -e 's/install -m/install -p -m/' makefile


%build
CFLAGS="%{optflags}" make
# Usage of smp_mflags causes compilation to fail
# make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
PREFIX=%{_prefix} make install DESTDIR=$RPM_BUILD_ROOT

# Remove executable flag from man page
chmod a-x $RPM_BUILD_ROOT/%{_mandir}/man6/%{name}.*

desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications           \
                     --vendor fedora                                         \
                     --delete-original                                       \
                     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc README COPYING ChangeLog TODO
%{_bindir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/pixmaps/%{name}.png
%{_mandir}/man6/%{name}.*


%changelog
* Wed Aug 27 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.6.1-4
- updated Summary
- fixed filename in SOURCE
- fixed paths in install section
- fixed icon caching after installing and uninstalling
- fixed timestamps preservation in prep section

* Sun Aug 24 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.6.1-3
- fixed .desktop file name in files section

* Mon May 12 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.6.1-2
- make install doesn't strip binaries
- make uses OPTFLAGS

* Wed May  7 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.6.1-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tennix/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:36:58 -0000	1.1
+++ .cvsignore	21 Sep 2008 12:51:30 -0000	1.2
@@ -0,0 +1 @@
+tennix-0.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tennix/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:36:58 -0000	1.1
+++ sources	21 Sep 2008 12:51:30 -0000	1.2
@@ -0,0 +1 @@
+5979d0e3f683808ad492a0691430f259  tennix-0.6.1.tar.gz



From sergiopr at fedoraproject.org  Sun Sep 21 13:26:36 2008
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Sun, 21 Sep 2008 13:26:36 +0000 (UTC)
Subject: rpms/tkimg/EL-5 tkimg.spec,1.9,1.10
Message-ID: <20080921132636.87A13700FA@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/tkimg/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20856

Modified Files:
	tkimg.spec 
Log Message:
* Sun Sep 21 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 1.3-0.9.20080505svn
- Fixed bug BZ#463031



Index: tkimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/EL-5/tkimg.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tkimg.spec	17 Jul 2008 08:32:31 -0000	1.9
+++ tkimg.spec	21 Sep 2008 13:26:06 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name: tkimg
 Version: 1.3
-Release: 0.8.%{svnversion}svn%{?dist}
+Release: 0.9.%{svnversion}svn%{?dist}
 Summary: More Image Formats for Tk
 
 Group: Development/Libraries
@@ -22,7 +22,7 @@
 BuildRequires: tcl-devel tk-devel
 BuildRequires: libtiff-devel libpng-devel libjpeg-devel zlib-devel
 
-Requires: tcl(abi) = 8.4
+Requires: tk
 
 %description
 This package contains a collection of image format handlers for the Tk
@@ -81,6 +81,9 @@
 %{_libdir}/Img1.3/*.a
 
 %changelog
+* Sun Sep 21 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 1.3-0.9.20080505svn
+- Fixed bug BZ#463031
+
 * Tue May 06 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 1.3-0.8.2008
 0505svn
 - Fixed source extension



From mschwendt at fedoraproject.org  Sun Sep 21 13:36:37 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun, 21 Sep 2008 13:36:37 +0000 (UTC)
Subject: extras-buildsys/server DBManager.py,1.1.2.2.4.5,1.1.2.2.4.6
Message-ID: <20080921133637.352117013E@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/server
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22146/server

Modified Files:
      Tag: Plague-0_4_5
	DBManager.py 
Log Message:
release 0.4.5.6 : apply tested fix for postgresql column rename





From mschwendt at fedoraproject.org  Sun Sep 21 13:37:07 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun, 21 Sep 2008 13:37:07 +0000 (UTC)
Subject: extras-buildsys ChangeLog,1.126.2.44.2.1.2.28,1.126.2.44.2.1.2.29
Message-ID: <20080921133707.0057C7013E@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22146

Modified Files:
      Tag: Plague-0_4_5
	ChangeLog 
Log Message:
release 0.4.5.6 : apply tested fix for postgresql column rename


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.44.2.1.2.28
retrieving revision 1.126.2.44.2.1.2.29
diff -u -r1.126.2.44.2.1.2.28 -r1.126.2.44.2.1.2.29
--- ChangeLog	19 Sep 2008 23:25:24 -0000	1.126.2.44.2.1.2.28
+++ ChangeLog	21 Sep 2008 13:36:36 -0000	1.126.2.44.2.1.2.29
@@ -1,6 +1,9 @@
 2008-09-20  Michael Schwendt <mschwendt at fedoraproject.org>
 
+	* Release of 0.4.5.6
+	
 	* server/DBManager.py
+	  - PostgreSQL uses different column rename syntax, too.
 	  - SQLite doesn't support column rename, so reconstruct
 	    a new table from the old one (only if engine==sqlite).
 



From mschwendt at fedoraproject.org  Sun Sep 21 13:40:08 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun, 21 Sep 2008 13:40:08 +0000 (UTC)
Subject: extras-buildsys/server PackageJob.py,1.31.2.10.4.7,1.31.2.10.4.8
Message-ID: <20080921134008.0F546700FA@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/server
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22584

Modified Files:
      Tag: Plague-0_4_5
	PackageJob.py 
Log Message:
correct indentation of resultstring


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.31.2.10.4.7
retrieving revision 1.31.2.10.4.8
diff -u -r1.31.2.10.4.7 -r1.31.2.10.4.8
--- PackageJob.py	7 Sep 2008 17:05:46 -0000	1.31.2.10.4.7
+++ PackageJob.py	21 Sep 2008 13:40:07 -0000	1.31.2.10.4.8
@@ -712,7 +712,7 @@
         self.wake()
 
     def _stage_repodone(self):
-        resultstring = " %s (%s): Build on target %s succeeded." % (self.uid, self.name, self._target_str)
+        resultstring = "%s (%s): Build on target %s succeeded." % (self.uid, self.name, self._target_str)
         log(resultstring)
         self.result = 'success'
         self._set_cur_stage('needsign', resultstring)



From mschwendt at fedoraproject.org  Sun Sep 21 13:43:29 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun, 21 Sep 2008 13:43:29 +0000 (UTC)
Subject: extras-buildsys plague.spec,1.27.2.5.2.1.2.8,1.27.2.5.2.1.2.9
Message-ID: <20080921134329.3E21B700FA@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22990

Modified Files:
      Tag: Plague-0_4_5
	plague.spec 
Log Message:



Index: plague.spec
===================================================================
RCS file: /cvs/fedora/extras-buildsys/plague.spec,v
retrieving revision 1.27.2.5.2.1.2.8
retrieving revision 1.27.2.5.2.1.2.9
diff -u -r1.27.2.5.2.1.2.8 -r1.27.2.5.2.1.2.9
--- plague.spec	8 Sep 2008 15:56:38 -0000	1.27.2.5.2.1.2.8
+++ plague.spec	21 Sep 2008 13:43:28 -0000	1.27.2.5.2.1.2.9
@@ -2,7 +2,7 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.5
+Version: 0.4.5.6
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools



From mschwendt at fedoraproject.org  Sun Sep 21 13:51:06 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun, 21 Sep 2008 13:51:06 +0000 (UTC)
Subject: rpms/plague/F-9 .cvsignore, 1.13, 1.14 plague.spec, 1.38,
	1.39 sources, 1.30, 1.31
Message-ID: <20080921135106.C013B700FA@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23813/F-9

Modified Files:
	.cvsignore plague.spec sources 
Log Message:
* Sun Sep 21 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.6-1
- update to 0.4.5.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	8 Sep 2008 16:04:42 -0000	1.13
+++ .cvsignore	21 Sep 2008 13:50:36 -0000	1.14
@@ -1,2 +1,2 @@
-plague-0.4.5.5.tar.bz2
-plague-0.4.5.5.tar.bz2.asc
+plague-0.4.5.6.tar.bz2
+plague-0.4.5.6.tar.bz2.asc


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-9/plague.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- plague.spec	8 Sep 2008 16:04:42 -0000	1.38
+++ plague.spec	21 Sep 2008 13:50:36 -0000	1.39
@@ -2,7 +2,7 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.5
+Version: 0.4.5.6
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -165,6 +165,12 @@
 
 
 %changelog
+* Sun Sep 21 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.6-1
+- update to 0.4.5.6
+
+* Sat Sep 20 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.5-2
+- add fix for sqlite's limited ALTER TABLE
+
 * Mon Sep  8 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.5-1
 - update to 0.4.5.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-9/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	8 Sep 2008 16:04:42 -0000	1.30
+++ sources	21 Sep 2008 13:50:36 -0000	1.31
@@ -1,2 +1,2 @@
-0c8a5cffe1352c5f5dbde2c9b35a9189  plague-0.4.5.5.tar.bz2
-768e60b5fcc71fde881e86da23abfddf  plague-0.4.5.5.tar.bz2.asc
+145d1b420cfb7ccb33c514ca3497d674  plague-0.4.5.6.tar.bz2
+8ada402441129bfd5686e7570fc5a0da  plague-0.4.5.6.tar.bz2.asc



From mschwendt at fedoraproject.org  Sun Sep 21 13:51:07 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun, 21 Sep 2008 13:51:07 +0000 (UTC)
Subject: rpms/plague/EL-5 .cvsignore, 1.13, 1.14 plague.spec, 1.32,
	1.33 sources, 1.29, 1.30
Message-ID: <20080921135107.4F8F4700FA@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23813/EL-5

Modified Files:
	.cvsignore plague.spec sources 
Log Message:
* Sun Sep 21 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.6-1
- update to 0.4.5.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plague/EL-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	8 Sep 2008 16:04:43 -0000	1.13
+++ .cvsignore	21 Sep 2008 13:50:37 -0000	1.14
@@ -1,2 +1,2 @@
-plague-0.4.5.5.tar.bz2
-plague-0.4.5.5.tar.bz2.asc
+plague-0.4.5.6.tar.bz2
+plague-0.4.5.6.tar.bz2.asc


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/EL-5/plague.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- plague.spec	8 Sep 2008 16:04:43 -0000	1.32
+++ plague.spec	21 Sep 2008 13:50:37 -0000	1.33
@@ -2,7 +2,7 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.5
+Version: 0.4.5.6
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -165,6 +165,12 @@
 
 
 %changelog
+* Sun Sep 21 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.6-1
+- update to 0.4.5.6
+
+* Sat Sep 20 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.5-2
+- add fix for sqlite's limited ALTER TABLE
+
 * Mon Sep  8 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.5-1
 - update to 0.4.5.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/EL-5/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	8 Sep 2008 16:04:43 -0000	1.29
+++ sources	21 Sep 2008 13:50:37 -0000	1.30
@@ -1,2 +1,2 @@
-0c8a5cffe1352c5f5dbde2c9b35a9189  plague-0.4.5.5.tar.bz2
-768e60b5fcc71fde881e86da23abfddf  plague-0.4.5.5.tar.bz2.asc
+145d1b420cfb7ccb33c514ca3497d674  plague-0.4.5.6.tar.bz2
+8ada402441129bfd5686e7570fc5a0da  plague-0.4.5.6.tar.bz2.asc



From mschwendt at fedoraproject.org  Sun Sep 21 13:51:07 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun, 21 Sep 2008 13:51:07 +0000 (UTC)
Subject: rpms/plague/F-8 .cvsignore, 1.13, 1.14 plague.spec, 1.38,
	1.39 sources, 1.30, 1.31
Message-ID: <20080921135107.0709F700FA@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23813/F-8

Modified Files:
	.cvsignore plague.spec sources 
Log Message:
* Sun Sep 21 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.6-1
- update to 0.4.5.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-8/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	8 Sep 2008 16:04:42 -0000	1.13
+++ .cvsignore	21 Sep 2008 13:50:36 -0000	1.14
@@ -1,2 +1,2 @@
-plague-0.4.5.5.tar.bz2
-plague-0.4.5.5.tar.bz2.asc
+plague-0.4.5.6.tar.bz2
+plague-0.4.5.6.tar.bz2.asc


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-8/plague.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- plague.spec	8 Sep 2008 16:04:43 -0000	1.38
+++ plague.spec	21 Sep 2008 13:50:36 -0000	1.39
@@ -2,7 +2,7 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.5
+Version: 0.4.5.6
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -165,6 +165,12 @@
 
 
 %changelog
+* Sun Sep 21 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.6-1
+- update to 0.4.5.6
+
+* Sat Sep 20 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.5-2
+- add fix for sqlite's limited ALTER TABLE
+
 * Mon Sep  8 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.5-1
 - update to 0.4.5.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-8/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	8 Sep 2008 16:04:43 -0000	1.30
+++ sources	21 Sep 2008 13:50:36 -0000	1.31
@@ -1,2 +1,2 @@
-0c8a5cffe1352c5f5dbde2c9b35a9189  plague-0.4.5.5.tar.bz2
-768e60b5fcc71fde881e86da23abfddf  plague-0.4.5.5.tar.bz2.asc
+145d1b420cfb7ccb33c514ca3497d674  plague-0.4.5.6.tar.bz2
+8ada402441129bfd5686e7570fc5a0da  plague-0.4.5.6.tar.bz2.asc



From mschwendt at fedoraproject.org  Sun Sep 21 13:51:06 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun, 21 Sep 2008 13:51:06 +0000 (UTC)
Subject: rpms/plague/devel .cvsignore, 1.17, 1.18 plague.spec, 1.41,
	1.42 sources, 1.31, 1.32 plague-0.4.5.5-sqlite-alter.patch, 1.1, NONE
Message-ID: <20080921135106.8E81B700FA@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23813/devel

Modified Files:
	.cvsignore plague.spec sources 
Removed Files:
	plague-0.4.5.5-sqlite-alter.patch 
Log Message:
* Sun Sep 21 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.6-1
- update to 0.4.5.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	8 Sep 2008 16:00:43 -0000	1.17
+++ .cvsignore	21 Sep 2008 13:50:36 -0000	1.18
@@ -1,2 +1,2 @@
-plague-0.4.5.5.tar.bz2
-plague-0.4.5.5.tar.bz2.asc
+plague-0.4.5.6.tar.bz2
+plague-0.4.5.6.tar.bz2.asc


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/plague.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- plague.spec	19 Sep 2008 23:29:23 -0000	1.41
+++ plague.spec	21 Sep 2008 13:50:36 -0000	1.42
@@ -2,13 +2,12 @@
 
 Summary: Distributed build system for RPMs
 Name: plague
-Version: 0.4.5.5
-Release: 2%{?dist}
+Version: 0.4.5.6
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 #Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
 Source: %{name}-%{version}.tar.bz2
-Patch1: plague-0.4.5.5-sqlite-alter.patch
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
@@ -80,7 +79,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .sqlite-alter
 
 
 %build
@@ -167,6 +165,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.6-1
+- update to 0.4.5.6
+
 * Sat Sep 20 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.5-2
 - add fix for sqlite's limited ALTER TABLE
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	8 Sep 2008 16:00:43 -0000	1.31
+++ sources	21 Sep 2008 13:50:36 -0000	1.32
@@ -1,2 +1,2 @@
-0c8a5cffe1352c5f5dbde2c9b35a9189  plague-0.4.5.5.tar.bz2
-768e60b5fcc71fde881e86da23abfddf  plague-0.4.5.5.tar.bz2.asc
+145d1b420cfb7ccb33c514ca3497d674  plague-0.4.5.6.tar.bz2
+8ada402441129bfd5686e7570fc5a0da  plague-0.4.5.6.tar.bz2.asc


--- plague-0.4.5.5-sqlite-alter.patch DELETED ---



From green at fedoraproject.org  Sun Sep 21 14:30:44 2008
From: green at fedoraproject.org (Anthony Green)
Date: Sun, 21 Sep 2008 14:30:44 +0000 (UTC)
Subject: rpms/qjackctl/F-9 .cvsignore, 1.3, 1.4 qjackctl.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <20080921143044.1B89F700FA@cvs1.fedora.phx.redhat.com>

Author: green

Update of /cvs/pkgs/rpms/qjackctl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28105

Modified Files:
	.cvsignore qjackctl.spec sources 
Log Message:
Upgrade to 0.3.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Sep 2006 00:49:11 -0000	1.3
+++ .cvsignore	21 Sep 2008 14:30:13 -0000	1.4
@@ -1,2 +1 @@
-qjackctl-0.2.20.tar.gz
-qjackctl-0.2.20-freebob.patch
+qjackctl-0.3.3.tar.gz


Index: qjackctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-9/qjackctl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qjackctl.spec	19 Feb 2008 15:58:36 -0000	1.10
+++ qjackctl.spec	21 Sep 2008 14:30:13 -0000	1.11
@@ -2,8 +2,8 @@
 
 Summary: Qt based JACK control application
 Name: qjackctl
-Version: 0.3.1a
-Release: 6%{?dist}
+Version: 0.3.3
+Release: 1%{?dist}
 URL: http://qjackctl.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz
 Source1: qjackctl.desktop
@@ -76,6 +76,9 @@
 %{_datadir}/applications/%{desktop_vendor}-qjackctl.desktop
 
 %changelog
+* Tue Jul 08 2008 Anthony Green <green at redhat.com> 0.3.3-1
+- Upgrade source.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.3.1a-6
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Nov 2007 14:16:22 -0000	1.4
+++ sources	21 Sep 2008 14:30:13 -0000	1.5
@@ -1 +1 @@
-070135c2c65c27f8a5ab83710225120e  qjackctl-0.3.1a.tar.gz
+6aa20dacb954ad99db25485f2f7eeb52  qjackctl-0.3.3.tar.gz



From green at fedoraproject.org  Sun Sep 21 16:05:02 2008
From: green at fedoraproject.org (Anthony Green)
Date: Sun, 21 Sep 2008 16:05:02 +0000 (UTC)
Subject: rpms/ardour/devel ardour-2.5-HOST_NOT_FOUND.patch, NONE,
	1.1 ardour.spec, 1.16, 1.17
Message-ID: <20080921160502.3D358700FA@cvs1.fedora.phx.redhat.com>

Author: green

Update of /cvs/pkgs/rpms/ardour/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5891

Modified Files:
	ardour.spec 
Added Files:
	ardour-2.5-HOST_NOT_FOUND.patch 
Log Message:
Add HOST_NOT_FOUND patch

ardour-2.5-HOST_NOT_FOUND.patch:

--- NEW FILE ardour-2.5-HOST_NOT_FOUND.patch ---
--- gtk2_ardour/ardour_ui.h~	2008-06-17 07:58:37.000000000 -0700
+++ gtk2_ardour/ardour_ui.h	2008-09-21 08:19:26.000000000 -0700
@@ -53,6 +53,9 @@
 #include <gtkmm/textbuffer.h>
 #include <gtkmm/adjustment.h>
 #include <gtkmm2ext/gtk_ui.h>
+#ifdef HOST_NOT_FOUND
+#undef HOST_NOT_FOUND
+#endif
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/stateful_button.h>
 #include <gtkmm2ext/bindable_button.h>


Index: ardour.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/devel/ardour.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ardour.spec	14 Jul 2008 06:19:44 -0000	1.16
+++ ardour.spec	21 Sep 2008 16:04:31 -0000	1.17
@@ -1,13 +1,16 @@
 Summary:       Multichannel Digital Audio Workstation
 Name:          ardour
 Version:       2.5
-Release:       1%{?dist}
+Release:       2%{?dist}
 Source:        http://ardour.org/files/releases/ardour-%{version}.tar.bz2
 Source1:       ardour2.desktop
 Source2:       ardour.script
 Patch0:        ardour-2.1-SConstruct.patch
 Patch1:        ardour-session.cc-no_stomp.patch
 Patch2:        ardour-2.5-gcc43.patch
+#Patch2:        ardour-session.cc-_total_free_4k_blocks.patch
+#Patch3:        ardour-2.4-gcc43.patch
+Patch4:        ardour-2.5-HOST_NOT_FOUND.patch
 URL:           http://ardour.org
 License:       GPLv2+
 Group:         Applications/Multimedia
@@ -54,6 +57,7 @@
 %patch0 -p1
 %patch1 -p0
 %patch2 -p0
+%patch4 -p0
 #%patch3 -p1
 for i in README.fr README.it TRANSLATORS; do
   iconv -f ISO-8859-1 -t UTF8 DOCUMENTATION/$i > DOCUMENTATION/$i.tmp
@@ -142,9 +146,11 @@
 %{_datadir}/applications/fedora-ardour2.desktop
 
 %changelog
-* Sun Jul 13 2008 Anthony Green <green at redhat.com> 2.5-1
+* Sun Sep 21 2008 Anthony Green <green at redhat.com> 2.5-2
+- Add HOST_NOT_FOUND patch.
+
+* Thu Jul 10 2008 Anthony Green <green at redhat.com> 2.5-1
 - New upstream release 2.5.
-- Update script to backup pre-2.5 ardour.bindings files, and start fresh.
 
 * Thu Apr 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.1-1
 - New upstream release 2.4.1



From transif at fedoraproject.org  Sun Sep 21 17:21:44 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Sun, 21 Sep 2008 17:21:44 +0000 (UTC)
Subject: comps/po fi.po,1.19,1.20
Message-ID: <20080921172144.E98FC700FA@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15319/po

Modified Files:
	fi.po 
Log Message:
    2008-09-21  Ville-Pekka Vainio <vpivaini at cs.helsinki.fi> (via
vpv at fedoraproject.org)
    
      * po/fi.po: Updated Finnish translation
    



Index: fi.po
===================================================================
RCS file: /cvs/pkgs/comps/po/fi.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- fi.po	17 Sep 2008 22:44:34 -0000	1.19
+++ fi.po	21 Sep 2008 17:21:14 -0000	1.20
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: fi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-09-12 22:55+0300\n"
+"POT-Creation-Date: 2008-09-21 09:22+0000\n"
+"PO-Revision-Date: 2008-09-21 20:19+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"
@@ -1173,14 +1173,12 @@
 msgstr "Sy??tt??menetelm??paketteja kansainv??lisen tekstin sy??tt??miseen."
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "Khmerin kielituki"
+msgstr "Ka??mirin kielituki"
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "Korean kielituki"
+msgstr "Konkanin kielituki"
 
 #: ../comps-f10.xml.in.h:110
 msgid "Maithili Support"
@@ -1191,9 +1189,8 @@
 msgstr "Myanmarin (burman) kielituki"
 
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "Hindin kielituki"
+msgstr "Sindhin kielituki"
 
 #: ../comps-f10.xml.in.h:156
 msgid "Support for developing programs in the Haskell programming language."



From pkgdb at fedoraproject.org  Sun Sep 21 17:46:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 17:46:08 +0000
Subject: [pkgdb] xmms: maddy45 has requested watchbugzilla
Message-ID: <20080921174608.54885208DA6@bastion.fedora.phx.redhat.com>

maddy45 has requested the watchbugzilla acl on xmms (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmms



From pkgdb at fedoraproject.org  Sun Sep 21 17:46:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 17:46:01 +0000
Subject: [pkgdb] xmms: maddy45 has requested watchcommits
Message-ID: <20080921174601.9A14F208DA0@bastion.fedora.phx.redhat.com>

maddy45 has requested the watchcommits acl on xmms (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmms



From hedayat at fedoraproject.org  Sun Sep 21 17:47:34 2008
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Sun, 21 Sep 2008 17:47:34 +0000 (UTC)
Subject: rpms/rcsslogplayer/F-8 rcsslogplayer.spec,1.1,1.2
Message-ID: <20080921174734.51A56700FA@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcsslogplayer/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18377

Modified Files:
	rcsslogplayer.spec 
Log Message:
fixed qt4 dependency


Index: rcsslogplayer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcsslogplayer/F-8/rcsslogplayer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rcsslogplayer.spec	21 Sep 2008 07:09:14 -0000	1.1
+++ rcsslogplayer.spec	21 Sep 2008 17:47:04 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           rcsslogplayer
 Version:        12.1.1
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 Summary:        RoboCup Soccer Simulator LogPlayer
 Group:          Applications/System
 
@@ -16,7 +16,7 @@
 Requires:       rcssmonitor
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  automake libtool boost-devel rcssbase-devel qt-devel
+BuildRequires:  automake libtool boost-devel rcssbase-devel qt4-devel
 BuildRequires:  desktop-file-utils libXaw-devel
 
 
@@ -85,6 +85,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Sep 21 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.1-2.1
+- Fixed qt-devel dependency for Fedora 8 branch
+
 * Sat Sep 20 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.1-2
 (Thanks to Mamoru Tasaka)
 - Fixed -devel sub package license tag



From transif at fedoraproject.org  Sun Sep 21 17:56:39 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Sun, 21 Sep 2008 17:56:39 +0000 (UTC)
Subject: comps/po lv.po,1.14,1.15
Message-ID: <20080921175639.3831B700FA@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19613/po

Modified Files:
	lv.po 
Log Message:
    2008-09-21  Janis Ozolins <jonhij at gmail.com> (via johnij at fedoraproject.org)
    
      * po/lv.po: Updated Latvian translation
    



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.14 -r 1.15 lv.po
Index: lv.po
===================================================================
RCS file: /cvs/pkgs/comps/po/lv.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- lv.po	17 Sep 2008 22:44:35 -0000	1.14
+++ lv.po	21 Sep 2008 17:56:08 -0000	1.15
@@ -9,195 +9,290 @@
 msgstr ""
 "Project-Id-Version: lv 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-09-05 23:09+0100\n"
+"POT-Creation-Date: 2008-09-21 11:28+0000\n"
+"PO-Revision-Date: 2008-09-20 18:52+0100\n"
 "Last-Translator: Janis Ozolins <johnij at fedoraproject.org>\n"
 "Language-Team: Latvian\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-f7.xml.in.h:1
+#: ../comps-f8.xml.in.h:1
+#: ../comps-f9.xml.in.h:1
 #: ../comps-f10.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:2 ../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:2
+#: ../comps-el4.xml.in.h:1
+#: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Administr????anas r??ki"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
+#: ../comps-f7.xml.in.h:3
+#: ../comps-f8.xml.in.h:3
+#: ../comps-f9.xml.in.h:3
 #: ../comps-f10.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "??frik????u valodas atbalsts"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
+#: ../comps-f7.xml.in.h:4
+#: ../comps-f8.xml.in.h:4
+#: ../comps-f9.xml.in.h:4
 #: ../comps-f10.xml.in.h:4
 msgid "Albanian Support"
 msgstr "Alb????u valodas atbalsts"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../comps-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:5
+#: ../comps-el4.xml.in.h:2
+#: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Lietojumprogrammas"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
+#: ../comps-f7.xml.in.h:6
+#: ../comps-f8.xml.in.h:6
+#: ../comps-f9.xml.in.h:6
 #: ../comps-f10.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
 msgstr "Programmas da????diem m??r??iem"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../comps-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:7
+#: ../comps-el4.xml.in.h:4
+#: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Ar??bu valodas atbalsts"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../comps-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:8
+#: ../comps-el4.xml.in.h:5
+#: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Arm????u valodas atbalsts"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
+#: ../comps-f7.xml.in.h:9
+#: ../comps-f8.xml.in.h:9
+#: ../comps-f9.xml.in.h:9
 #: ../comps-f10.xml.in.h:9
 msgid "Assamese Support"
 msgstr "Asamie??u valodas atbalsts"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../comps-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:10
+#: ../comps-el4.xml.in.h:6
+#: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Publik??ciju sagatavo??ana"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
+#: ../comps-f7.xml.in.h:11
+#: ../comps-f8.xml.in.h:11
+#: ../comps-f9.xml.in.h:11
 #: ../comps-f10.xml.in.h:11
 msgid "Base"
 msgstr "B??ze"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-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:12
+#: ../comps-el4.xml.in.h:7
+#: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "B??zes sist??ma"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
+#: ../comps-f7.xml.in.h:13
+#: ../comps-f8.xml.in.h:13
+#: ../comps-f9.xml.in.h:13
 #: ../comps-f10.xml.in.h:13
 msgid "Basic support for the Ruby programming language."
 msgstr "Pamata atbalsts Ruby programm????anas valodai."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
+#: ../comps-f7.xml.in.h:14
+#: ../comps-f8.xml.in.h:14
+#: ../comps-f9.xml.in.h:14
 #: ../comps-f10.xml.in.h:14
 msgid "Basque Support"
 msgstr "Basku valodas atbalsts"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
+#: ../comps-f7.xml.in.h:15
+#: ../comps-f8.xml.in.h:15
+#: ../comps-f9.xml.in.h:15
 #: ../comps-f10.xml.in.h:15
 msgid "Belarusian Support"
 msgstr "Baltkrievu valodas atbalsts"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
+#: ../comps-f7.xml.in.h:16
+#: ../comps-f8.xml.in.h:16
+#: ../comps-f9.xml.in.h:16
 #: ../comps-f10.xml.in.h:16
 msgid "Bengali Support"
 msgstr "Beng????u valodas atbalsts"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
+#: ../comps-f7.xml.in.h:17
+#: ../comps-f8.xml.in.h:17
+#: ../comps-f9.xml.in.h:17
 #: ../comps-f10.xml.in.h:17
 msgid "Bhutanese Support"
 msgstr ""
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
+#: ../comps-f7.xml.in.h:18
+#: ../comps-f8.xml.in.h:18
+#: ../comps-f9.xml.in.h:18
 #: ../comps-f10.xml.in.h:18
 msgid "Bosnian Support"
 msgstr "Bosnie??u valodas atbalsts"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
+#: ../comps-f7.xml.in.h:19
+#: ../comps-f8.xml.in.h:19
+#: ../comps-f9.xml.in.h:19
 #: ../comps-f10.xml.in.h:19
 msgid "Brazilian Portuguese Support"
 msgstr "Braz????u portug????u valodas atbalsts"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
+#: ../comps-f7.xml.in.h:20
+#: ../comps-f8.xml.in.h:20
+#: ../comps-f9.xml.in.h:20
 #: ../comps-f10.xml.in.h:20
 msgid "Breton Support"
 msgstr "Breto??u valodas atbalsts"
 
[...2118 lines suppressed...]
 #~ msgstr ""
 #~ "????s pakotnes nodro??ina savietojam??bu ar Red Hat Enterprise Linux "
 #~ "iepriek????j??m versij??m."
-
 #~ msgid "Unsupported Development Libraries"
 #~ msgstr "Neatbalst??t??s izstr??des bibliotekas"
-
 #~ msgid "Workstation Common"
 #~ msgstr "Tipveida darba stacija"
-
 #~ msgid "ppc64 Compatibility Arch Support"
 #~ msgstr "Savietojam??bas atbalsts ar arhitekt??ru ppc64"
-
 #~ msgid "x86 Compatibility Arch Development Support"
 #~ msgstr "Atbalsts izstr??dei priek?? arhitekt??ras x86"
-
 #~ msgid "x86 Compatibility Arch Support"
 #~ msgstr "Savietojam??bas atbalsts ar arhitekt??ru x86"
-
 #~ msgid "Brazilian Portuguese"
 #~ msgstr "Braz????u portug????u atbalsts"
-
 #~ msgid "English"
 #~ msgstr "Ang??u"
-
 #~ msgid "French"
 #~ msgstr "Fran??u"
-
 #~ msgid "German"
 #~ msgstr "V??cu"
-
 #~ msgid "Italian"
 #~ msgstr "It????u"
-
 #~ msgid "Spanish"
 #~ msgstr "Sp????u"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Brazilian Portuguese language."
 #~ msgstr ""
 #~ "???? grupa satur Red Hat Enterprise Linux dokument??ciju braz????u portug????u "
 #~ "valod??"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "English language."
 #~ msgstr "???? grupa satur Red Hat Enterprise Linux dokument??ciju ang??u valod??"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "French language."
 #~ msgstr "???? grupa satur Red Hat Enterprise Linux dokument??ciju fran??u valod??"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "German language."
 #~ msgstr "???? grupa satur Red Hat Enterprise Linux dokument??ciju v??cu valod??"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Italian language."
 #~ msgstr "???? grupa satur Red Hat Enterprise Linux dokument??ciju it????u valod??"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Spanish language."
 #~ msgstr "???? grupa satur Red Hat Enterprise Linux dokument??ciju sp????u valod??"
-
 #~ msgid "Japanese"
 #~ msgstr "Jap????u"
-
 #~ msgid "Korean"
 #~ msgstr "Korejie??u"
-
 #~ msgid "Simplified Chinese"
 #~ msgstr "Vienk??r??ota ????nie??u"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Japanese language."
 #~ msgstr "???? grupa satur Red Hat Enterprise Linux dokument??ciju jap????u valod??"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Korean language."
 #~ msgstr ""
 #~ "???? grupa satur Red Hat Enterprise Linux dokument??ciju korejie??u valod??"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Simplified Chinese language."
 #~ msgstr ""
 #~ "???? grupa satur Red Hat Enterprise Linux dokument??ciju vienk??r??ot?? ????nie??u "
 #~ "valod??"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Traditional Chinese language."
 #~ msgstr ""
 #~ "???? grupa satur Red Hat Enterprise Linux dokument??ciju tradicion??l?? "
 #~ "????nie??u valod??"
-
 #~ msgid "Traditional Chinese"
 #~ msgstr "Tradicion??l?? ????nie??u"
-
 #~ msgid "ppc64 Compatibility Arch Development Support"
 #~ msgstr "Atbalsts izstr??dei priek?? arhitekt??ras ppc64"
-
 #~ msgid "Bengali"
 #~ msgstr "Beng??lie??u"
-
 #~ msgid "Gujarati"
 #~ msgstr "Gujarati"
-
 #~ msgid "Hindi"
 #~ msgstr "Hindu"
-
 #~ msgid "Punjabi"
 #~ msgstr "Pend??abie??u"
-
 #~ msgid "Red Hat Enterprise Linux 4 Documentation"
 #~ msgstr "Red Hat Enterprise Linux 4 dokument??cija"
-
 #~ msgid "Tamil"
 #~ msgstr "Tamilu"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Bengali language."
 #~ msgstr ""
 #~ "???? grupa satur Red Hat Enterprise Linux dokument??ciju bemg??lie??u valod??"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Gujarati language."
 #~ msgstr ""
 #~ "???? grupa satur Red Hat Enterprise Linux dokument??ciju gujarati valod??"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Hindi language."
 #~ msgstr "???? grupa satur Red Hat Enterprise Linux dokument??ciju hindu valod??"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Punjabi language."
 #~ msgstr ""
 #~ "???? grupa satur Red Hat Enterprise Linux dokument??ciju pend??abie??u valod??"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Tamil language."
 #~ msgstr "???? grupa satur Red Hat Enterprise Linux dokument??ciju tamilu valod??"
-
 #~ msgid "Red Hat Enterprise Linux Extras"
 #~ msgstr "Red Hat Enterprise Linux ekstras"
-
 #~ msgid "Workstation"
 #~ msgstr "Darba stacija"
-
 #~ msgid "Workstation applications and utilities."
 #~ msgstr "Darba stacijas programmas"
-
 #~ msgid "Compatibility Arch"
 #~ msgstr "Arhitekt??ru savietojam??bas atbalsts"
-
 #~ msgid "Compatibility Arch Libraries"
 #~ msgstr "Arhitekt??ru savietojam??bas bibliotekas"
-
 #~ msgid "Multilib library packages"
 #~ msgstr "Multilib biblioteku pakotnes"
-
 #~ msgid ""
 #~ "Packages which provide functionality for the compatibility architecture."
 #~ msgstr "Pakotnes, kas nodro??ina arhitekt??ru savietojam??bu."
-
 #~ msgid "IBM eServer iSeries/pSeries Provided Software"
 #~ msgstr "IBM eServer iSeries/pSeries programmat??ra"
-
 #~ msgid "Software provided by IBM for eServer iSeries and pSeries machines"
 #~ msgstr ""
 #~ "Programat??ra, kas izmantojama IBM for eServer iSeries and pSeries sist??m??s"
-
 #~ msgid "HPC"
 #~ msgstr "HPC"
-
 #~ msgid "High Performance Computing Support"
 #~ msgstr "??trdarb??gu proced??ru atbalsts"
-
 #~ msgid ""
 #~ "These packages provide the kernel and userspace tools needed for using "
 #~ "the Xen virtual machine monitor"
 #~ msgstr ""
 #~ "????s pakotnes nodro??ina kodola un lietot??ja darbtelpas piem??rot??bu Xen "
 #~ "virtu??l??s ma????nas lieto??anai"
-
 #~ msgid "Xen"
 #~ msgstr "Xen"
+



From caolanm at fedoraproject.org  Sun Sep 21 18:12:39 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 21 Sep 2008 18:12:39 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1655,1.1656
Message-ID: <20080921181239.3CA4F700FA@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21410

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#463050 rejig desktop-file-utils, shared-mime-info usage


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1655
retrieving revision 1.1656
diff -u -r1.1655 -r1.1656
--- openoffice.org.spec	19 Sep 2008 11:44:59 -0000	1.1655
+++ openoffice.org.spec	21 Sep 2008 18:12:08 -0000	1.1656
@@ -148,10 +148,6 @@
 Requires: hunspell-en, hyphen-en
 Requires: saxon
 PreReq: gtk2 >= 2.9.4
-Requires(post): shared-mime-info
-Requires(post): desktop-file-utils
-Requires(postun): shared-mime-info
-Requires(postun): desktop-file-utils
 Obsoletes: openoffice.org
 Obsoletes: openoffice.org-libs
 Obsoletes: openoffice.org-i18n
@@ -2660,30 +2656,30 @@
 %{oooinstdir}/program/versionrc
 
 %post core
-update-mime-database %{_datadir}/mime > /dev/null
-for theme in hicolor locolor; do
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+update-mime-database %{_datadir}/mime &> /dev/null || :
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  for theme in hicolor locolor; do
     if test -d "%{_datadir}/icons/$theme"; then
       if test -f "%{_datadir}/icons/$theme/index.theme"; then
         touch --no-create %{_datadir}/icons/$theme
         gtk-update-icon-cache -q %{_datadir}/icons/$theme
       fi
     fi
-  fi
-done
+  done
+fi
 
 %postun core
-update-mime-database %{_datadir}/mime > /dev/null
-for theme in hicolor locolor; do
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+update-mime-database %{_datadir}/mime &> /dev/null || :
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  for theme in hicolor locolor; do
     if test -d "%{_datadir}/icons/$theme"; then
       if test -f "%{_datadir}/icons/$theme/index.theme"; then
         touch --no-create %{_datadir}/icons/$theme
         gtk-update-icon-cache -q %{_datadir}/icons/$theme
       fi
     fi
-  fi
-done
+  done
+fi
 
 %preun core
 if [ $1 -eq 0 ]; then
@@ -2745,10 +2741,10 @@
 %{_bindir}/ooviewdoc
 
 %post brand
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun brand
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files -n broffice.org-brand
 %dir %{brinstdir}
@@ -2810,32 +2806,32 @@
 %{_bindir}/broffice.org
 
 %post -n broffice.org-brand
-update-desktop-database -q %{_datadir}/applications
-update-mime-database %{_datadir}/mime > /dev/null
-for theme in hicolor locolor; do
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  for theme in hicolor locolor; do
     if test -d "%{_datadir}/icons/$theme"; then
       if test -f "%{_datadir}/icons/$theme/index.theme"; then
         touch --no-create %{_datadir}/icons/$theme
         gtk-update-icon-cache -q %{_datadir}/icons/$theme
       fi
     fi
-  fi
-done
+  done
+fi
 
 %postun -n broffice.org-brand
-update-desktop-database -q %{_datadir}/applications
-update-mime-database %{_datadir}/mime > /dev/null
-for theme in hicolor locolor; do
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  for theme in hicolor locolor; do
     if test -d "%{_datadir}/icons/$theme"; then
       if test -f "%{_datadir}/icons/$theme/index.theme"; then
         touch --no-create %{_datadir}/icons/$theme
         gtk-update-icon-cache -q %{_datadir}/icons/$theme
       fi
     fi
-  fi
-done
+  done
+fi
 
 
 %files base-core
@@ -2900,10 +2896,10 @@
 %{_bindir}/oobase
 
 %post base
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun base
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files -n broffice.org-base
 %defattr(-,root,root,-)
@@ -2914,10 +2910,10 @@
 %{_datadir}/mimelnk/application/broffice.org-*database*
 
 %post -n broffice.org-base
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun -n broffice.org-base
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files report-builder
 %defattr(-,root,root,-)
@@ -3162,10 +3158,10 @@
 %{_bindir}/oocalc
 
 %post calc
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun calc
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files -n broffice.org-calc
 %defattr(-,root,root,-)
@@ -3178,10 +3174,10 @@
 %{_datadir}/mimelnk/application/broffice.org-*spreadsheet*
 
 %post -n broffice.org-calc
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun -n broffice.org-calc
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files draw-core
 %defattr(-,root,root,-)
@@ -3230,10 +3226,10 @@
 %{_bindir}/oodraw
 
 %post draw
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun draw
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files -n broffice.org-draw
 %defattr(-,root,root,-)
@@ -3245,10 +3241,10 @@
 %{_datadir}/mimelnk/application/broffice.org-*drawing*
 
 %post -n broffice.org-draw
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun -n broffice.org-draw
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files emailmerge
 %defattr(-,root,root,-)
@@ -3346,10 +3342,10 @@
 %{_bindir}/oowriter
 
 %post writer
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun writer
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files -n broffice.org-writer
 %defattr(-,root,root,-)
@@ -3363,10 +3359,10 @@
 %{_datadir}/mimelnk/application/broffice.org-*web*
 
 %post -n broffice.org-writer
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun -n broffice.org-writer
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files impress-core
 %defattr(-,root,root,-)
@@ -3423,10 +3419,10 @@
 %{_bindir}/ooimpress
 
 %post impress
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun impress
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files -n broffice.org-impress
 %defattr(-,root,root,-)
@@ -3439,10 +3435,10 @@
 %{_datadir}/mimelnk/application/broffice.org-ms-powerpoint-template*.desktop
 
 %post -n broffice.org-impress
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun -n broffice.org-impress
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files math-core
 %defattr(-,root,root,-)
@@ -3499,10 +3495,10 @@
 %{_bindir}/oomath
 
 %post math
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun math
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files -n broffice.org-math
 %defattr(-,root,root,-)
@@ -3513,10 +3509,10 @@
 %{_datadir}/mimelnk/application/broffice.org-*formula*
 
 %post -n broffice.org-math
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun -n broffice.org-math
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files graphicfilter
 %defattr(-,root,root,-)
@@ -3683,9 +3679,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Sep 19 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-6.2
+* Sun Sep 21 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-6.2
 - Tswana, Ukrainian, Urdu spellcheckers
 - Resolves: rhbz#462833 openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch
+- Resolves: rhbz#463050 rejig desktop-file-utils, shared-mime-info usage
 
 * Tue Sep 16 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-6.1
 - next candidate



From pkgdb at fedoraproject.org  Sun Sep 21 18:21:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 18:21:11 +0000
Subject: [pkgdb] octave: mmahut has requested watchbugzilla
Message-ID: <20080921182111.E3D1C208DA2@bastion.fedora.phx.redhat.com>

mmahut has requested the watchbugzilla acl on octave (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave



From pkgdb at fedoraproject.org  Sun Sep 21 18:21:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 18:21:16 +0000
Subject: [pkgdb] octave: mmahut has requested watchcommits
Message-ID: <20080921182116.2CAF6208DA8@bastion.fedora.phx.redhat.com>

mmahut has requested the watchcommits acl on octave (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave



From pkgdb at fedoraproject.org  Sun Sep 21 18:21:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 18:21:21 +0000
Subject: [pkgdb] octave: mmahut has requested commit
Message-ID: <20080921182121.BF485208DAD@bastion.fedora.phx.redhat.com>

mmahut has requested the commit acl on octave (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave



From pkgdb at fedoraproject.org  Sun Sep 21 18:21:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 18:21:27 +0000
Subject: [pkgdb] octave: mmahut has requested approveacls
Message-ID: <20080921182127.4383C208DAF@bastion.fedora.phx.redhat.com>

mmahut has requested the approveacls acl on octave (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave



From pkgdb at fedoraproject.org  Sun Sep 21 18:21:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 18:21:31 +0000
Subject: [pkgdb] octave: mmahut has requested watchbugzilla
Message-ID: <20080921182131.5458C208DB2@bastion.fedora.phx.redhat.com>

mmahut has requested the watchbugzilla acl on octave (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave



From pkgdb at fedoraproject.org  Sun Sep 21 18:21:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 18:21:36 +0000
Subject: [pkgdb] octave: mmahut has requested watchcommits
Message-ID: <20080921182136.9AFE2208DA3@bastion.fedora.phx.redhat.com>

mmahut has requested the watchcommits acl on octave (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave



From pkgdb at fedoraproject.org  Sun Sep 21 18:21:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 18:21:40 +0000
Subject: [pkgdb] octave: mmahut has requested commit
Message-ID: <20080921182140.C5FE3208DAA@bastion.fedora.phx.redhat.com>

mmahut has requested the commit acl on octave (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave



From pkgdb at fedoraproject.org  Sun Sep 21 18:21:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 18:21:47 +0000
Subject: [pkgdb] octave: mmahut has requested approveacls
Message-ID: <20080921182147.E7461208DAB@bastion.fedora.phx.redhat.com>

mmahut has requested the approveacls acl on octave (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave



From terjeros at fedoraproject.org  Sun Sep 21 18:21:42 2008
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Sun, 21 Sep 2008 18:21:42 +0000 (UTC)
Subject: rpms/bontmia/devel bontmia.spec,1.2,1.3
Message-ID: <20080921182142.21FD1700FA@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/bontmia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22674

Modified Files:
	bontmia.spec 
Log Message:
* Sun Sep 21 2008 Terje Rosten <terjeros at phys.ntnu.no> - 0.14-3
- Fix patch macro



Index: bontmia.spec
===================================================================
RCS file: /cvs/extras/rpms/bontmia/devel/bontmia.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bontmia.spec	19 Aug 2007 18:41:22 -0000	1.2
+++ bontmia.spec	21 Sep 2008 18:21:11 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:   Backup over network to multiple incremental archives
 Name:      bontmia
 Version:   0.14
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2
 Group:     Applications/Archiving
 URL:       http://folk.uio.no/johnen/bontmia/
@@ -19,7 +19,7 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 %build
 
 %install
@@ -37,6 +37,9 @@
 %{_bindir}/%{name}
 
 %changelog
+* Sun Sep 21 2008 Terje Rosten <terjeros at phys.ntnu.no> - 0.14-3
+- Fix patch macro
+
 * Sun Aug 19 2007 Terje Rosten <terjeros at phys.ntnu.no> - 0.14-2
 - Fix license tag
 



From pkgdb at fedoraproject.org  Sun Sep 21 18:36:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 18:36:45 +0000
Subject: [pkgdb] xmms ownership updated
Message-ID: <20080921183645.51DE6208D9E@bastion.fedora.phx.redhat.com>

Package xmms in Fedora 4 was orphaned by pfj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmms



From pkgdb at fedoraproject.org  Sun Sep 21 18:36:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 18:36:49 +0000
Subject: [pkgdb] xmms ownership updated
Message-ID: <20080921183649.43E64208DA2@bastion.fedora.phx.redhat.com>

Package xmms in Fedora 7 was orphaned by pfj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmms



From pkgdb at fedoraproject.org  Sun Sep 21 18:36:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 18:36:52 +0000
Subject: [pkgdb] xmms ownership updated
Message-ID: <20080921183652.C538B208DA6@bastion.fedora.phx.redhat.com>

Package xmms in Fedora 5 was orphaned by pfj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmms



From pkgdb at fedoraproject.org  Sun Sep 21 18:36:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 21 Sep 2008 18:36:56 +0000
Subject: [pkgdb] xmms ownership updated
Message-ID: <20080921183656.C3E68208DA7@bastion.fedora.phx.redhat.com>

Package xmms in Fedora 6 was orphaned by pfj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmms



From s4504kr at fedoraproject.org  Sun Sep 21 18:39:55 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Sun, 21 Sep 2008 18:39:55 +0000 (UTC)
Subject: rpms/gnu-smalltalk/EL-5 gnu-smalltalk.spec,1.12,1.13
Message-ID: <20080921183955.4360B700FA@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/gnu-smalltalk/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24997

Modified Files:
	gnu-smalltalk.spec 
Log Message:
Try to rebuild package


Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/EL-5/gnu-smalltalk.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnu-smalltalk.spec	18 Sep 2008 15:45:10 -0000	1.12
+++ gnu-smalltalk.spec	21 Sep 2008 18:39:24 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: GNU Smalltalk
 Name: gnu-smalltalk
 Version: 3.0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
 Patch1: gst-3.0.4-am.patch
 Patch2: gst-3.0.4-tst.patch
@@ -174,6 +174,9 @@
 %{_datadir}/emacs/site-lisp/*
 
 %changelog
+* Sun Sep 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 3.0.4-3
+- Rebuild
+
 * Sun Aug 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 3.0.4-2
 - Add zip as BR
 - New upstream release



From hadess at fedoraproject.org  Sun Sep 21 19:37:55 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sun, 21 Sep 2008 19:37:55 +0000 (UTC)
Subject: rpms/totem-pl-parser/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 totem-pl-parser.spec, 1.21, 1.22
Message-ID: <20080921193755.C06EE700FA@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-serv31781

Modified Files:
	.cvsignore sources totem-pl-parser.spec 
Log Message:
* Sun Sep 21 2008 - Bastien Nocera <bnocera at redhat.com> - 2.24.0-1
- Update to 2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	29 Aug 2008 16:13:57 -0000	1.12
+++ .cvsignore	21 Sep 2008 19:37:25 -0000	1.13
@@ -1 +1 @@
-totem-pl-parser-2.23.91.tar.bz2
+totem-pl-parser-2.24.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	29 Aug 2008 16:13:57 -0000	1.12
+++ sources	21 Sep 2008 19:37:25 -0000	1.13
@@ -1 +1 @@
-9afeede3075c10f8cf1092d80c4e9737  totem-pl-parser-2.23.91.tar.bz2
+018a906406bda8c3f22b0c63e5ddb926  totem-pl-parser-2.24.0.tar.bz2


Index: totem-pl-parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/totem-pl-parser.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- totem-pl-parser.spec	29 Aug 2008 16:13:57 -0000	1.21
+++ totem-pl-parser.spec	21 Sep 2008 19:37:25 -0000	1.22
@@ -1,5 +1,5 @@
 Name:		totem-pl-parser
-Version:	2.23.91
+Version:	2.24.0
 Release:	1%{?dist}
 Summary:	Totem Playlist Parser library
 
@@ -66,6 +66,9 @@
 %{_datadir}/gtk-doc/html/totem-pl-parser
 
 %changelog
+* Sun Sep 21 2008 - Bastien Nocera <bnocera at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Fri Aug 29 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 



From hadess at fedoraproject.org  Sun Sep 21 19:40:34 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sun, 21 Sep 2008 19:40:34 +0000 (UTC)
Subject: rpms/totem/devel .cvsignore, 1.64, 1.65 sources, 1.64,
	1.65 totem.spec, 1.199, 1.200
Message-ID: <20080921194034.63081700FA@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32155

Modified Files:
	.cvsignore sources totem.spec 
Log Message:
* Sun Sep 21 2008 - Bastien Nocera <bnocera at redhat.com> - 2.24.0-1
- Update to 2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	29 Aug 2008 16:22:16 -0000	1.64
+++ .cvsignore	21 Sep 2008 19:40:04 -0000	1.65
@@ -1 +1 @@
-totem-2.23.91.tar.bz2
+totem-2.24.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	29 Aug 2008 16:22:16 -0000	1.64
+++ sources	21 Sep 2008 19:40:04 -0000	1.65
@@ -1 +1 @@
-b6d74d11b732cae8784696a573cb5c44  totem-2.23.91.tar.bz2
+4a1308c9c563037dfc3bb35dfa7b4c97  totem-2.24.0.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- totem.spec	8 Sep 2008 21:27:30 -0000	1.199
+++ totem.spec	21 Sep 2008 19:40:04 -0000	1.200
@@ -9,8 +9,8 @@
 
 Summary: Movie player for GNOME
 Name: totem
-Version: 2.23.91
-Release: 3%{?dist}
+Version: 2.24.0
+Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/totem/
@@ -412,6 +412,9 @@
 %endif
 
 %changelog
+* Sun Sep 21 2008 - Bastien Nocera <bnocera at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.23.91-3
 - fix license tag
 



From rdieter at fedoraproject.org  Sun Sep 21 21:08:41 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 21 Sep 2008 21:08:41 +0000 (UTC)
Subject: rpms/digikam/EL-5 .cvsignore, 1.9, 1.10 digikam.spec, 1.32,
	1.33 sources, 1.9, 1.10
Message-ID: <20080921210841.E075C700FA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10113

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
sync w/devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Dec 2007 13:13:25 -0000	1.9
+++ .cvsignore	21 Sep 2008 21:08:11 -0000	1.10
@@ -1 +1 @@
-digikam-0.9.2-final.tar.bz2
+digikam-0.9.4.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/EL-5/digikam.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- digikam.spec	14 Dec 2007 13:13:25 -0000	1.32
+++ digikam.spec	21 Sep 2008 21:08:11 -0000	1.33
@@ -1,30 +1,41 @@
-%define	alphatag final
 
 Name:		digikam
-Version:	0.9.2
-Release:	1%{?dist}
+Version:	0.9.4
+Release: 	2%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPLv2+
 URL:		http://www.digikam.org/
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{alphatag}.tar.bz2
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:		digikam-0.9.2-beta3-desktop-utf8-fix.patch
-# http://bugs.kde.org/148930
-Patch148930: digikam-0.9.2-kde#148930.patch
-
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-BuildRequires:	kdelibs-devel
-BuildRequires:	gphoto2-devel >= 2.0.0
-BuildRequires:	libkexiv2-devel >= 0.1.5 libkdcraw-devel >= 0.1.1 libkipi-devel
-BuildRequires:	lcms-devel libtiff-devel libpng-devel >= 1.2.7 jasper-devel
-BuildRequires:	sqlite-devel >= 3.0.0
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+%if 0%{?fedora} > 6
+BuildRequires:  kdelibs3-devel
+%else
+BuildRequires:  kdelibs-devel
+%endif
+%if 0%{?fedora} > 9
+BuildRequires:  libgphoto2-devel
+%else
+BuildRequires:  gphoto2-devel
+%endif
+BuildRequires:  jasper-devel
+BuildRequires:  libkdcraw-devel >= 0.1.4
+BuildRequires:  libkexiv2-devel >= 0.1.7 
+BuildRequires:  libkipi-devel >= 0.1.6
+BuildRequires:  lcms-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  libpng-devel >= 1.2.7
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
 BuildRequires:	libtool-ltdl-devel
 %endif
+BuildRequires:  sqlite-devel
+
+Provides:	digikamimageplugins = %{version}-%{release}
+Obsoletes:	digikamimageplugins < 0.9.1-2
 
 %description
 digiKam is an easy to use and powerful digital photo management application,
@@ -47,11 +58,10 @@
 This package contains the libraries, include files and other resources
 needed to develop applications using %{name}.
 
+
 %prep
-%setup -q -n %{name}-%{version}-%{alphatag}
+%setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
-%patch0 -p1
-%patch148930 -p1 -b .kde#148930
 
 %build
 unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
@@ -62,9 +72,12 @@
 	--disable-debug \
 	--disable-warnings \
 	--disable-dependency-tracking \
-	--enable-final
+	--enable-final \
+	--without-included-sqlite3
+
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -79,14 +92,21 @@
 	--add-category Photography \
 	$RPM_BUILD_ROOT%{_datadir}/applications/kde/showfoto.desktop
 
-%find_lang %{name}
+%find_lang %{name} || touch %{name}.lang
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libdigikam.la
 
+# Create symlinks in pixmaps directory
+# FIXME: this shouldn't be necessary anymore -- Rex
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+ln -sf ../icons/hicolor/48x48/apps/digikam.png \
+	$RPM_BUILD_ROOT%{_datadir}/pixmaps/digikam.png
+ln -sf ../icons/hicolor/48x48/apps/showfoto.png \
+	$RPM_BUILD_ROOT%{_datadir}/pixmaps/showfoto.png
+
 %post
 /sbin/ldconfig
 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 || :
@@ -95,15 +115,16 @@
 %postun
 /sbin/ldconfig
 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
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO
@@ -119,6 +140,7 @@
 %{_datadir}/apps/showfoto/
 %{_datadir}/icons/hicolor/*/*/*
 %{_mandir}/man1/*.1*
+%{_datadir}/pixmaps/*.png
 %{_datadir}/services/digikam*
 %{_datadir}/servicetypes/digikamimageplugin.desktop
 
@@ -128,23 +150,71 @@
 %{_includedir}/digikam_export.h
 %{_libdir}/libdigikam.so
 
+
 %changelog
-* Fri Dec 14 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-1
-- Update to 0.9.2-final
+* Fri Jul 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.9.4-2
+- --without-included-sqlite3, BR: sqlite-devel
+
+* Thu Jul 17 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.9.4-1
+- digikam-0.9.4
+
+* Mon Jul 07 2008 Marcin Garski <mgarski[AT]post.pl> 0.9.3-5
+- Don't lose some photos during import (#448235)
+
+* Fri Mar 14 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.9.3-3
+- respin (for libkdcraw)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.3-2
+- Autorebuild for GCC 4.3
+
+* Sat Dec 22 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.3-1
+- Update to 0.9.3
+- BR: libkexiv2-devel >= 0.1.6 libkdcraw-devel >= 0.1.2
+
+* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.3-0.5.rc1
+- digikam-0.9.3-rc1
+- BR: kdelibs3-devel
+
+* Thu Nov 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.3-0.2.beta3
+- digikam-0.9.3-beta3
+
+* Tue Nov 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.3-0.1.beta2
+- digikam-0.9.3-beta2
+
+* Tue Sep 18 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-5
+- Rebuild
+
+* Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.3-4
 - License: GPLv2+
 - lcms patch (kde bug #148930)
-- Update description
-- preserve upstream .desktop vendor
-- cleanup/simplify BR's,Requires,d-f-i usage
 
-* Sat Jun 30 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.1-3
-- Delete original .desktop
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.9.2-3
+- Rebuild for selinux ppc32 issue.
+
+* Fri Jun 22 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-2
+- Create symlinks in pixmaps directory (#242978)
+
+* Tue Jun 19 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-1
+- Update to version 0.9.2-final
+- Remove digikam-0.9.2-beta3-fix-exiv2-dep.patch, merged upstream
+
+* Wed Jun 06 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-0.3.beta3
+- Fix .desktop category
 
-* Fri Jun 29 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.1-2
-- Fix .desktop category and encoding (#240644)
+* Wed Jun 06 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-0.2.beta3
+- Fix broken compilation caused by Exiv2 dependency
 
-* Sun Mar 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.1-1.1
-- respin (for jasper)
+* Tue Jun 05 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-0.1.beta3
+- Update to version 0.9.2-beta3 (merge with digikamimageplugins)
+- Update description
+
+* Mon May 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.1-3
+- respin against libkexiv2-0.1.5
+- preserve upstream .desktop vendor (f7 branch at least)
+
+* Mon Apr 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.1-2
+- exiv2-0.14 patch
+- cleanup/simplify BR's,Requires,d-f-i usage
 
 * Fri Mar 09 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.1-1
 - Update to version 0.9.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Dec 2007 13:13:25 -0000	1.9
+++ sources	21 Sep 2008 21:08:11 -0000	1.10
@@ -1 +1 @@
-0f67edf65c394c96cb60d48e4e2bfebd  digikam-0.9.2-final.tar.bz2
+b0f3fa00bd054b0497146e6ce24dab7c  digikam-0.9.4.tar.bz2



From rdieter at fedoraproject.org  Sun Sep 21 21:11:02 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 21 Sep 2008 21:11:02 +0000 (UTC)
Subject: rpms/libkexiv2/EL-5 libkexiv2.spec,1.3,1.4
Message-ID: <20080921211102.DED4B700FA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkexiv2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10373

Modified Files:
	libkexiv2.spec 
Log Message:
el5 hack/workaround



Index: libkexiv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkexiv2/EL-5/libkexiv2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libkexiv2.spec	17 Jul 2008 17:35:20 -0000	1.3
+++ libkexiv2.spec	21 Sep 2008 21:10:32 -0000	1.4
@@ -17,7 +17,7 @@
 %if 0%{?fedora} > 6
 BuildRequires: kdelibs3-devel
 %else
-BuildRequires: kdelibs-devel
+BuildRequires: kdelibs-devel libutempter-devel
 %endif
 
 %description



From rdieter at fedoraproject.org  Sun Sep 21 21:13:01 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 21 Sep 2008 21:13:01 +0000 (UTC)
Subject: rpms/digikam/EL-5 digikam.spec,1.33,1.34
Message-ID: <20080921211301.BFAD3700FA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10747

Modified Files:
	digikam.spec 
Log Message:
EL-5 workaround/hack



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/EL-5/digikam.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- digikam.spec	21 Sep 2008 21:08:11 -0000	1.33
+++ digikam.spec	21 Sep 2008 21:12:31 -0000	1.34
@@ -15,7 +15,7 @@
 %if 0%{?fedora} > 6
 BuildRequires:  kdelibs3-devel
 %else
-BuildRequires:  kdelibs-devel
+BuildRequires:  kdelibs-devel libutempter-devel
 %endif
 %if 0%{?fedora} > 9
 BuildRequires:  libgphoto2-devel



From rdieter at fedoraproject.org  Sun Sep 21 21:27:24 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 21 Sep 2008 21:27:24 +0000 (UTC)
Subject: rpms/libkdcraw/EL-5 .cvsignore, 1.4, 1.5 libkdcraw.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20080921212724.2682D700FA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkdcraw/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12410

Modified Files:
	.cvsignore libkdcraw.spec sources 
Log Message:
sync w/devel, add el5 hack/workaround



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Dec 2007 20:27:44 -0000	1.4
+++ .cvsignore	21 Sep 2008 21:26:53 -0000	1.5
@@ -1 +1 @@
-libkdcraw-0.1.2.tar.bz2
+libkdcraw-0.1.4.tar.bz2


Index: libkdcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/EL-5/libkdcraw.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libkdcraw.spec	15 Dec 2007 20:27:44 -0000	1.3
+++ libkdcraw.spec	21 Sep 2008 21:26:53 -0000	1.4
@@ -1,6 +1,12 @@
+
+%if 0%{?fedora} > 8
+# see http://bugzilla.redhat.com/452392
+%define nuke_icons 1
+%endif
+
 Name:		libkdcraw
-Version:	0.1.2
-Release:	1%{?dist}
+Version:	0.1.4
+Release:	2%{?dist}
 Summary:	A library for decoding RAW picture files
 
 Group:		Applications/Multimedia
@@ -9,7 +15,14 @@
 Source0:	http://downloads.sourceforge.net/kipi/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	kdelibs-devel lcms-devel gettext pkgconfig
+%if 0%{?fedora} > 6
+BuildRequires:	kdelibs3-devel
+%else
+BuildRequires:	kdelibs-devel libutempter-devel
+%endif
+BuildRequires:	gettext
+BuildRequires: 	lcms-devel
+BuildRequires:	pkgconfig
 
 %description
 libkdcraw is a C++ interface around dcraw binary program used to decode RAW
@@ -40,8 +53,10 @@
 	--enable-final \
 	--enable-new-ldflags \
 	--disable-warnings
+
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -49,32 +64,42 @@
 %find_lang %{name}
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libkdcraw.la
+%if 0%{?nuke_icons}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
+%endif
+
 
 %post
 /sbin/ldconfig
-
+%if ! 0%{?nuke_icons}
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
+%endif
 
 %postun
 /sbin/ldconfig
-
+%if ! 0%{?nuke_icons}
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
+%endif
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %name.lang
+
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libkdcraw.so.*
-%{_libdir}/libkdcraw2/
-%{_datadir}/icons/hicolor/*/apps/kdcraw.png
+%{_libdir}/libkdcraw3/
+%if ! 0%{?nuke_icons}
+%{_datadir}/icons/hicolor/*/*/*
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -82,11 +107,32 @@
 %{_libdir}/pkgconfig/libkdcraw.pc
 %{_libdir}/libkdcraw.so
 
+
 %changelog
-* Sat Dec 15 2007 Marcin Garski <mgarski[AT]post.pl> 0.1.2-1
+* Tue Jun 24 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.4-2
+- fix conflicts with kdegraphics (f9+, #452392)
+
+* Wed Mar 12 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.4-1
+- libkdcraw-0.1.4
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.3-2
+- Autorebuild for GCC 4.3
+
+* Fri Dec 28 2007 Marcin Garski <mgarski[AT]post.pl> 0.1.3-1
+- Update to 0.1.3
+
+* Sun Dec 09 2007 Marcin Garski <mgarski[AT]post.pl> 0.1.2-2
+- BR: kdelibs3-devel
+
+* Tue Sep 18 2007 Marcin Garski <mgarski[AT]post.pl> 0.1.2-1
 - Update to 0.1.2
+
+* Fri Aug 31 2007 Marcin Garski <mgarski[AT]post.pl> 0.1.1-3
 - Fix license tag
 
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.1.1-2
+- Rebuild for selinux ppc32 issue.
+
 * Tue Jun 19 2007 Marcin Garski <mgarski[AT]post.pl> 0.1.1-1
 - Update to libkdcraw-0.1.1 (#244872)
 - Spec fixes by Rex Dieter


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Dec 2007 20:27:44 -0000	1.4
+++ sources	21 Sep 2008 21:26:53 -0000	1.5
@@ -1 +1 @@
-38ed88e8b7387526113f150c349c8eb4  libkdcraw-0.1.2.tar.bz2
+4fa5de407e9acf2eb5650d3fb5836f7d  libkdcraw-0.1.4.tar.bz2



From rdieter at fedoraproject.org  Sun Sep 21 21:30:33 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 21 Sep 2008 21:30:33 +0000 (UTC)
Subject: rpms/libkdcraw/F-9 .cvsignore, 1.8, 1.9 libkdcraw.spec, 1.11,
	1.12 sources, 1.8, 1.9
Message-ID: <20080921213033.CE00D700FA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkdcraw/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12673

Modified Files:
	.cvsignore libkdcraw.spec sources 
Log Message:
* Sun Sep 21 2008 Rex Dieter <rdieter at fedoraproject.org> 1.1.5-1
- libkdcraw-0.1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 Jul 2008 14:14:52 -0000	1.8
+++ .cvsignore	21 Sep 2008 21:30:03 -0000	1.9
@@ -1 +1 @@
-libkdcraw-0.1.4.tar.bz2
+libkdcraw-0.1.5.tar.bz2


Index: libkdcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/F-9/libkdcraw.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libkdcraw.spec	17 Jul 2008 14:14:52 -0000	1.11
+++ libkdcraw.spec	21 Sep 2008 21:30:03 -0000	1.12
@@ -5,8 +5,8 @@
 %endif
 
 Name:		libkdcraw
-Version:	0.1.4
-Release:	2%{?dist}
+Version:	0.1.5
+Release:	1%{?dist}
 Summary:	A library for decoding RAW picture files
 
 Group:		Applications/Multimedia
@@ -15,7 +15,14 @@
 Source0:	http://downloads.sourceforge.net/kipi/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	kdelibs3-devel lcms-devel gettext pkgconfig
+%if 0%{?fedora} > 6
+BuildRequires:	kdelibs3-devel
+%else
+BuildRequires:	kdelibs-devel libutempter-devel
+%endif
+BuildRequires:	gettext
+BuildRequires: 	lcms-devel
+BuildRequires:	pkgconfig
 
 %description
 libkdcraw is a C++ interface around dcraw binary program used to decode RAW
@@ -102,6 +109,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Rex Dieter <rdieter at fedoraproject.org> 1.1.5-1
+- libkdcraw-0.1.5
+
 * Tue Jun 24 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.4-2
 - fix conflicts with kdegraphics (f9+, #452392)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	17 Jul 2008 14:14:52 -0000	1.8
+++ sources	21 Sep 2008 21:30:03 -0000	1.9
@@ -1 +1 @@
-4fa5de407e9acf2eb5650d3fb5836f7d  libkdcraw-0.1.4.tar.bz2
+cdf9af92d6caf0b052a5e368afdece3d  libkdcraw-0.1.5.tar.bz2



From rdieter at fedoraproject.org  Sun Sep 21 21:32:42 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 21 Sep 2008 21:32:42 +0000 (UTC)
Subject: rpms/libkdcraw/EL-5 .cvsignore, 1.5, 1.6 libkdcraw.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20080921213242.8C5CF700FA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkdcraw/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13007

Modified Files:
	.cvsignore libkdcraw.spec sources 
Log Message:
* Sun Sep 21 2008 Rex Dieter <rdieter at fedoraproject.org> 1.1.5-1
- libkdcraw-0.1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Sep 2008 21:26:53 -0000	1.5
+++ .cvsignore	21 Sep 2008 21:32:12 -0000	1.6
@@ -1 +1 @@
-libkdcraw-0.1.4.tar.bz2
+libkdcraw-0.1.5.tar.bz2


Index: libkdcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/EL-5/libkdcraw.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libkdcraw.spec	21 Sep 2008 21:26:53 -0000	1.4
+++ libkdcraw.spec	21 Sep 2008 21:32:12 -0000	1.5
@@ -5,8 +5,8 @@
 %endif
 
 Name:		libkdcraw
-Version:	0.1.4
-Release:	2%{?dist}
+Version:	0.1.5
+Release:	1%{?dist}
 Summary:	A library for decoding RAW picture files
 
 Group:		Applications/Multimedia
@@ -109,6 +109,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Rex Dieter <rdieter at fedoraproject.org> 1.1.5-1
+- libkdcraw-0.1.5
+
 * Tue Jun 24 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.4-2
 - fix conflicts with kdegraphics (f9+, #452392)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Sep 2008 21:26:53 -0000	1.5
+++ sources	21 Sep 2008 21:32:12 -0000	1.6
@@ -1 +1 @@
-4fa5de407e9acf2eb5650d3fb5836f7d  libkdcraw-0.1.4.tar.bz2
+cdf9af92d6caf0b052a5e368afdece3d  libkdcraw-0.1.5.tar.bz2



From rdieter at fedoraproject.org  Sun Sep 21 21:43:12 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 21 Sep 2008 21:43:12 +0000 (UTC)
Subject: rpms/libkdcraw/F-9 libkdcraw.spec,1.12,1.13
Message-ID: <20080921214312.92174700FA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkdcraw/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13483

Modified Files:
	libkdcraw.spec 
Log Message:
fix %%files



Index: libkdcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/F-9/libkdcraw.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libkdcraw.spec	21 Sep 2008 21:30:03 -0000	1.12
+++ libkdcraw.spec	21 Sep 2008 21:42:42 -0000	1.13
@@ -96,7 +96,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libkdcraw.so.*
-%{_libdir}/libkdcraw3/
+%{_libdir}/libkdcraw4/
 %if ! 0%{?nuke_icons}
 %{_datadir}/icons/hicolor/*/*/*
 %endif



From rdieter at fedoraproject.org  Sun Sep 21 21:44:22 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 21 Sep 2008 21:44:22 +0000 (UTC)
Subject: rpms/libkdcraw/F-9 libkdcraw.spec,1.13,1.14
Message-ID: <20080921214422.B3B44700FA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkdcraw/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13601

Modified Files:
	libkdcraw.spec 
Log Message:
tighten %files a bit more



Index: libkdcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/F-9/libkdcraw.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libkdcraw.spec	21 Sep 2008 21:42:42 -0000	1.13
+++ libkdcraw.spec	21 Sep 2008 21:43:52 -0000	1.14
@@ -95,7 +95,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{_libdir}/libkdcraw.so.*
+%{_libdir}/libkdcraw.so.4*
 %{_libdir}/libkdcraw4/
 %if ! 0%{?nuke_icons}
 %{_datadir}/icons/hicolor/*/*/*



From rdieter at fedoraproject.org  Sun Sep 21 21:45:30 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 21 Sep 2008 21:45:30 +0000 (UTC)
Subject: rpms/libkdcraw/EL-5 libkdcraw.spec,1.5,1.6
Message-ID: <20080921214530.57647700FA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkdcraw/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13733

Modified Files:
	libkdcraw.spec 
Log Message:
fix %files



Index: libkdcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/EL-5/libkdcraw.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libkdcraw.spec	21 Sep 2008 21:32:12 -0000	1.5
+++ libkdcraw.spec	21 Sep 2008 21:45:00 -0000	1.6
@@ -95,8 +95,8 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{_libdir}/libkdcraw.so.*
-%{_libdir}/libkdcraw3/
+%{_libdir}/libkdcraw.so.4*
+%{_libdir}/libkdcraw4/
 %if ! 0%{?nuke_icons}
 %{_datadir}/icons/hicolor/*/*/*
 %endif



From bpepple at fedoraproject.org  Sun Sep 21 22:06:46 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sun, 21 Sep 2008 22:06:46 +0000 (UTC)
Subject: rpms/libepc/devel libepc-fix-build.patch, NONE, 1.1 libepc.spec, 1.8,
	1.9
Message-ID: <20080921220646.D7E04700FA@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/libepc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15167

Modified Files:
	libepc.spec 
Added Files:
	libepc-fix-build.patch 
Log Message:
* Sat Sep 20 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.3.5-3
- Add patch to fix building from source.


libepc-fix-build.patch:

--- NEW FILE libepc-fix-build.patch ---
diff -urp libepc-0.3.5.OLD/configure.ac libepc-0.3.5/configure.ac
--- libepc-0.3.5.OLD/configure.ac	2008-04-07 14:30:52.000000000 -0400
+++ libepc-0.3.5/configure.ac	2008-09-21 17:24:38.000000000 -0400
@@ -43,6 +43,7 @@ PKG_CHECK_MODULES(AVAHI_UI,  [avahi-ui  
 PKG_CHECK_MODULES(LIBEPC,    [avahi-client >= 0.6
                               avahi-glib   >= 0.6
                               glib-2.0     >= 2.12
+                              gthread-2.0  >= 2.12		      
                               gmodule-2.0  >= 2.0
                               gobject-2.0  >= 2.4
                               gnutls       >= 1.4
diff -urp libepc-0.3.5.OLD/Makefile.am libepc-0.3.5/Makefile.am
--- libepc-0.3.5.OLD/Makefile.am	2008-03-25 11:58:42.000000000 -0400
+++ libepc-0.3.5/Makefile.am	2008-09-21 17:38:17.000000000 -0400
@@ -4,7 +4,6 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 TESTS_ENVIRONMENT = $(top_srcdir)/tests/test-runner.sh
-ACLOCAL_AMFLAGS = -I m4
 
 # ============================
 # -- DIRECTORY DECLARATIONS --


Index: libepc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libepc/devel/libepc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libepc.spec	24 Jun 2008 09:14:20 -0000	1.8
+++ libepc.spec	21 Sep 2008 22:06:16 -0000	1.9
@@ -5,13 +5,14 @@
 
 Name:           libepc
 Version:        0.3.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Easy Publish and Consume library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://live.gnome.org/libepc/
 Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/0.3/%{name}-%{version}.tar.bz2
+Patch0:		%{name}-fix-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	e2fsprogs-devel >= 1.36
@@ -24,6 +25,14 @@
 BuildRequires:	glib2-devel >= %{glib2_version}
 BuildRequires:	gettext
 BuildRequires:	perl(XML::Parser)
+# The following BR can be dropped when the fix-build patch is removed.
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	libtool
+BuildRequires:	gettext-devel
+BuildRequires:	gnome-common
+BuildRequires:	intltool
+BuildRequires:	gtk-doc
 
 %description
 A library to easily publish and consume values on networks
@@ -60,6 +69,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .build
+autoreconf
 
 
 %build
@@ -116,6 +127,9 @@
 
 
 %changelog
+* Sat Sep 20 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.3.5-3
+- Add patch to fix building from source.
+
 * Tue Jun 24 2008 Tomas Mraz <tmraz at redhat.com> - 0.3.5-2
 - rebuild with new gnutls
 



From than at fedoraproject.org  Sun Sep 21 22:17:30 2008
From: than at fedoraproject.org (Than Ngo)
Date: Sun, 21 Sep 2008 22:17:30 +0000 (UTC)
Subject: rpms/qt/devel .cvsignore, 1.38, 1.39 qt.spec, 1.208, 1.209 sources, 
	1.39, 1.40
Message-ID: <20080921221730.5DD6A700FA@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15747

Modified Files:
	.cvsignore qt.spec sources 
Log Message:
4.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	8 Sep 2008 16:12:59 -0000	1.38
+++ .cvsignore	21 Sep 2008 22:16:59 -0000	1.39
@@ -2,3 +2,5 @@
 hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.4.1.tar.bz2
 qt-copy-patches-20080908svn.tar.bz2
+qt-x11-opensource-src-4.4.2.tar.bz2
+qt-copy-patches-20080920svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- qt.spec	8 Sep 2008 16:12:59 -0000	1.208
+++ qt.spec	21 Sep 2008 22:16:59 -0000	1.209
@@ -8,8 +8,8 @@
 %else
 Name:    qt4
 %endif
-Version: 4.4.1
-Release: 3%{?dist}
+Version: 4.4.2
+Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -41,7 +41,7 @@
 Patch10: qt-x11-opensource-src-4.4.1-systray.patch
 
 ## qt-copy patches
-%define qt_copy 20080908
+%define qt_copy 20080920
 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}}
@@ -270,10 +270,9 @@
 %setup -q -n qt-x11-opensource-src-%{version}%{?pre} %{?qt_copy:-a 2}
 
 %if 0%{?qt_copy:1}
-# Mac(?)-specific, doesn't apply
 echo "0242" >> patches/DISABLED
-# already(?) applied to 4.4.1
-echo "0244" >> patches/DISABLED
+echo "0250" >> patches/DISABLED
+echo "0251" >> patches/DISABLED
 test -x apply_patches && ./apply_patches
 %endif
 
@@ -734,6 +733,9 @@
 
 
 %changelog
+* Sat Sep 20 2008 Than Ngo <than at redhat.com> 4.4.2-1
+- 4.4.2
+
 * Mon Sep 08 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.4.1-3
 - apply QMAKEPATH portion of multilib patch only if needed
 - qt-copy-patches-20080908


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	8 Sep 2008 16:12:59 -0000	1.39
+++ sources	21 Sep 2008 22:17:00 -0000	1.40
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-a94a6f5ef01598bb9980891f2515ff45  qt-x11-opensource-src-4.4.1.tar.bz2
-ab07c997ab770a4b2c5f8838b7fb4a0e  qt-copy-patches-20080908svn.tar.bz2
+200faca22f861cd09f108df9924f195c  qt-x11-opensource-src-4.4.2.tar.bz2
+d77a7d864375b44b3e9dd3afa53017fa  qt-copy-patches-20080920svn.tar.bz2



From rdieter at fedoraproject.org  Sun Sep 21 22:38:00 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 21 Sep 2008 22:38:00 +0000 (UTC)
Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.60,1.61
Message-ID: <20080921223800.E3BBB700FA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17374

Modified Files:
	kipi-plugins.spec 
Log Message:
update Source URL



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kipi-plugins.spec	4 Sep 2008 14:41:20 -0000	1.60
+++ kipi-plugins.spec	21 Sep 2008 22:37:30 -0000	1.61
@@ -11,8 +11,7 @@
 License: GPLv2+
 Group:   Applications/Multimedia
 Url:	 http://www.kipi-plugins.org/
-Source0: http://digikam3rdparty.free.fr/0.10.x-releases/kipi-plugins-0.2.0-beta1.tar.bz2
-#Source0: http://downloads.sourceforge.net/sourceforge/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext



From theinric at fedoraproject.org  Sun Sep 21 22:38:51 2008
From: theinric at fedoraproject.org (Tomas Heinrich)
Date: Sun, 21 Sep 2008 22:38:51 +0000 (UTC)
Subject: rpms/picviz/devel picviz-0.2.3-plugin-path.patch, NONE,
	1.1 picviz.spec, 1.1, 1.2
Message-ID: <20080921223851.08D2F700FA@cvs1.fedora.phx.redhat.com>

Author: theinric

Update of /cvs/extras/rpms/picviz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17416

Modified Files:
	picviz.spec 
Added Files:
	picviz-0.2.3-plugin-path.patch 
Log Message:
fix plugin path (#462700)


picviz-0.2.3-plugin-path.patch:

--- NEW FILE picviz-0.2.3-plugin-path.patch ---
diff -up picviz-0.2.3/CMakeLists.txt.pluginpath picviz-0.2.3/CMakeLists.txt
--- picviz-0.2.3/CMakeLists.txt.pluginpath	2008-09-19 21:17:09.000000000 +0200
+++ picviz-0.2.3/CMakeLists.txt	2008-09-20 14:35:31.000000000 +0200
@@ -5,14 +5,14 @@ project(picviz)
 cmake_minimum_required(VERSION 2.4)
 
 IF(NOT LIB_INSTALL_DIR)
-   SET(LIB_INSTALL_DIR lib)
+   SET(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib)
 ENDIF(NOT LIB_INSTALL_DIR)
 
 IF(NOT MOD_INSTALL_DIR)
    SET(MOD_INSTALL_DIR ${LIB_INSTALL_DIR}/${PROJECT_NAME})
 ENDIF(NOT MOD_INSTALL_DIR)
 
-add_definitions(-DPLUGIN_PATH=\\\"${CMAKE_INSTALL_PREFIX}/${MOD_INSTALL_DIR}\\\")
+add_definitions(-DPLUGIN_PATH=\\\"${MOD_INSTALL_DIR}\\\")
 
 configure_file(
 ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake


Index: picviz.spec
===================================================================
RCS file: /cvs/extras/rpms/picviz/devel/picviz.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- picviz.spec	14 Aug 2008 12:11:31 -0000	1.1
+++ picviz.spec	21 Sep 2008 22:38:20 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name: picviz
 Version: 0.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Parallel coordinates plotter
 
 License: GPLv3+
@@ -11,6 +11,7 @@
 Source0: http://www.wallinfire.net/picviz/attachment/wiki/ReleasesDownload/%{name}-%{version}.tar.gz
 Source1: %{name}.desktop
 Patch0: picviz-0.2.3-pkgconfig-path.patch
+Patch1: picviz-0.2.3-plugin-path.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake
@@ -68,6 +69,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .pkgconfig-path
+%patch1 -p1 -b .plugin-path
 
 %build
 mkdir -p build
@@ -141,5 +143,8 @@
 %{_libdir}/%{name}/libpicvizoutplplot.so
 
 %changelog
+* Mon Sep 22 2008 Tomas Heinrich <theinric at redhat.com> 0.2.3-2
+- fix plugin path (#462700)
+
 * Thu Aug  7 2008 Tomas Heinrich <theinric at redhat.com> 0.2.3-1
 - Initial build



From bpepple at fedoraproject.org  Sun Sep 21 22:50:36 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sun, 21 Sep 2008 22:50:36 +0000 (UTC)
Subject: rpms/libsexy/devel libsexy-0.1.11-url-label.patch, NONE,
	1.1 libsexy.spec, 1.20, 1.21
Message-ID: <20080921225036.D1778700FA@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/libsexy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18365

Modified Files:
	libsexy.spec 
Added Files:
	libsexy-0.1.11-url-label.patch 
Log Message:
* Sun Sep 21 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.1.11-9
- Backport fix for clipboard & color support in sexy-url-label.


libsexy-0.1.11-url-label.patch:

--- NEW FILE libsexy-0.1.11-url-label.patch ---
diff -urp libsexy-0.1.11.OLD/libsexy/sexy-url-label.c libsexy-0.1.11/libsexy/sexy-url-label.c
--- libsexy-0.1.11.OLD/libsexy/sexy-url-label.c	2007-03-17 23:30:00.000000000 -0400
+++ libsexy-0.1.11/libsexy/sexy-url-label.c	2008-09-21 18:32:01.000000000 -0400
@@ -516,7 +516,11 @@ copy_link_activate_cb(GtkMenuItem *menu_
 
 	clipboard = gtk_widget_get_clipboard(GTK_WIDGET(url_label),
 										 GDK_SELECTION_PRIMARY);
+	gtk_clipboard_set_text(clipboard, priv->active_link->url,
+						   strlen(priv->active_link->url));
 
+	clipboard = gtk_widget_get_clipboard(GTK_WIDGET(url_label),
+										 GDK_SELECTION_CLIPBOARD);
 	gtk_clipboard_set_text(clipboard, priv->active_link->url,
 						   strlen(priv->active_link->url));
 }
@@ -634,6 +638,9 @@ start_element_handler(GMarkupParseContex
 		int line_number;
 		int char_number;
 		int i;
+#if GTK_CHECK_VERSION(2, 10, 0)
+		GdkColor *link_color = NULL;
+#endif
 
 		g_markup_parse_context_get_position(context, &line_number,
 											&char_number);
@@ -677,8 +684,28 @@ start_element_handler(GMarkupParseContex
 			return;
 		}
 
+#if GTK_CHECK_VERSION(2, 10, 0)
+		gtk_widget_ensure_style(GTK_WIDGET(url_label));
+		gtk_widget_style_get(GTK_WIDGET(url_label),
+		                     "link-color", &link_color,
+		                     NULL);
+		if (link_color != NULL)
+		{
+			g_string_append_printf(priv->temp_markup_result,
+			                       "<span color=\"#%04x%04x%04x\" underline=\"single\">",
+			                       link_color->red,
+			                       link_color->green,
+			                       link_color->blue);
+		}
+		else
+		{
+			g_string_append(priv->temp_markup_result,
+			                "<span color=\"blue\" underline=\"single\">");
+		}
+#else
 		g_string_append(priv->temp_markup_result,
-						"<span color=\"blue\" underline=\"single\">");
+		                "<span color=\"blue\" underline=\"single\">");
+#endif
 
 		priv->urls = g_list_append(priv->urls, g_strdup(url));
 	}


Index: libsexy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsexy/devel/libsexy.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libsexy.spec	16 May 2008 13:25:38 -0000	1.20
+++ libsexy.spec	21 Sep 2008 22:50:06 -0000	1.21
@@ -1,12 +1,13 @@
 Name:           libsexy
 Version:        0.1.11
-Release:        8%{?dist}
+Release:        9%{?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
+Patch0:		%{name}-%{version}-url-label.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .url-label
 
 
 %build
@@ -79,6 +81,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.1.11-9
+- Backport fix for clipboard & color support in sexy-url-label.
+
 * Fri May 16 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.1.11-8
 - Add requires for libxml2-devel to devel. (#446842)
 



From bpepple at fedoraproject.org  Sun Sep 21 22:58:32 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sun, 21 Sep 2008 22:58:32 +0000 (UTC)
Subject: rpms/libsexy/F-9 libsexy-0.1.11-url-label.patch, NONE,
	1.1 libsexy.spec, 1.19, 1.20
Message-ID: <20080921225832.C94217013E@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/libsexy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19036

Modified Files:
	libsexy.spec 
Added Files:
	libsexy-0.1.11-url-label.patch 
Log Message:
* Sun Sep 21 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.1.11-8
- Backport fix for clipboard & color support in sexy-url-label.
- Add requires for libxml2-devel to devel. (#446842)


libsexy-0.1.11-url-label.patch:

--- NEW FILE libsexy-0.1.11-url-label.patch ---
diff -urp libsexy-0.1.11.OLD/libsexy/sexy-url-label.c libsexy-0.1.11/libsexy/sexy-url-label.c
--- libsexy-0.1.11.OLD/libsexy/sexy-url-label.c	2007-03-17 23:30:00.000000000 -0400
+++ libsexy-0.1.11/libsexy/sexy-url-label.c	2008-09-21 18:32:01.000000000 -0400
@@ -516,7 +516,11 @@ copy_link_activate_cb(GtkMenuItem *menu_
 
 	clipboard = gtk_widget_get_clipboard(GTK_WIDGET(url_label),
 										 GDK_SELECTION_PRIMARY);
+	gtk_clipboard_set_text(clipboard, priv->active_link->url,
+						   strlen(priv->active_link->url));
 
+	clipboard = gtk_widget_get_clipboard(GTK_WIDGET(url_label),
+										 GDK_SELECTION_CLIPBOARD);
 	gtk_clipboard_set_text(clipboard, priv->active_link->url,
 						   strlen(priv->active_link->url));
 }
@@ -634,6 +638,9 @@ start_element_handler(GMarkupParseContex
 		int line_number;
 		int char_number;
 		int i;
+#if GTK_CHECK_VERSION(2, 10, 0)
+		GdkColor *link_color = NULL;
+#endif
 
 		g_markup_parse_context_get_position(context, &line_number,
 											&char_number);
@@ -677,8 +684,28 @@ start_element_handler(GMarkupParseContex
 			return;
 		}
 
+#if GTK_CHECK_VERSION(2, 10, 0)
+		gtk_widget_ensure_style(GTK_WIDGET(url_label));
+		gtk_widget_style_get(GTK_WIDGET(url_label),
+		                     "link-color", &link_color,
+		                     NULL);
+		if (link_color != NULL)
+		{
+			g_string_append_printf(priv->temp_markup_result,
+			                       "<span color=\"#%04x%04x%04x\" underline=\"single\">",
+			                       link_color->red,
+			                       link_color->green,
+			                       link_color->blue);
+		}
+		else
+		{
+			g_string_append(priv->temp_markup_result,
+			                "<span color=\"blue\" underline=\"single\">");
+		}
+#else
 		g_string_append(priv->temp_markup_result,
-						"<span color=\"blue\" underline=\"single\">");
+		                "<span color=\"blue\" underline=\"single\">");
+#endif
 
 		priv->urls = g_list_append(priv->urls, g_strdup(url));
 	}


Index: libsexy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsexy/F-9/libsexy.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libsexy.spec	2 Apr 2008 22:50:48 -0000	1.19
+++ libsexy.spec	21 Sep 2008 22:58:02 -0000	1.20
@@ -1,12 +1,13 @@
 Name:           libsexy
 Version:        0.1.11
-Release:        7%{?dist}
+Release:        8%{?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
+Patch0:		%{name}-%{version}-url-label.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -26,6 +27,7 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:	pkgconfig
 Requires:	gtk2-devel
+Requires:	libxml2-devel
 
 
 %description    devel
@@ -35,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .url-label
 
 
 %build
@@ -78,6 +81,10 @@
 
 
 %changelog
+* Sun Sep 21 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.1.11-8
+- Backport fix for clipboard & color support in sexy-url-label.
+- Add requires for libxml2-devel to devel. (#446842)
+
 * Wed Apr  2 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.1.11-7
 - Don't generate the gtk-doc docs, and use the ones in the tarball
   to avoid having different files in different builds, fixes



From mnagy at fedoraproject.org  Sun Sep 21 22:59:22 2008
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Sun, 21 Sep 2008 22:59:22 +0000 (UTC)
Subject: rpms/vsftpd/F-8 vsftpd-2.0.7-ssl_shutdown.patch, NONE,
	1.1 vsftpd.spec, 1.67, 1.68
Message-ID: <20080921225922.0BCC37013E@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/vsftpd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19273

Modified Files:
	vsftpd.spec 
Added Files:
	vsftpd-2.0.7-ssl_shutdown.patch 
Log Message:
* Mon Sep 22 2008 Martin Nagy <mnagy at redhat.com> - 2.0.5-21
- shutdown ssl connection properly (#462317)
- fix license tag


vsftpd-2.0.7-ssl_shutdown.patch:

--- NEW FILE vsftpd-2.0.7-ssl_shutdown.patch ---
diff -up vsftpd-2.0.5/ssl.c.ssl_shutdown vsftpd-2.0.5/ssl.c
--- vsftpd-2.0.5/ssl.c.ssl_shutdown	2006-06-14 23:02:55.000000000 +0200
+++ vsftpd-2.0.5/ssl.c	2008-09-22 00:54:49.000000000 +0200
@@ -266,7 +266,17 @@ ssl_accept(struct vsf_session* p_sess, i
 void
 ssl_data_close(struct vsf_session* p_sess)
 {
-  SSL_free(p_sess->p_data_ssl);
+  SSL* p_ssl = p_sess->p_data_ssl;
+  if (p_ssl)
+  {
+    int ret;
+    ret = SSL_shutdown(p_ssl);
+    if (ret == 0)
+    {
+      SSL_shutdown(p_ssl);
+    }
+    SSL_free(p_sess->p_data_ssl);
+  }
 }
 
 void


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/F-8/vsftpd.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- vsftpd.spec	21 May 2008 13:51:08 -0000	1.67
+++ vsftpd.spec	21 Sep 2008 22:58:51 -0000	1.68
@@ -3,8 +3,8 @@
 Summary: Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.5
-Release: 20%{?dist}
-License: GPL
+Release: 21%{?dist}
+License: GPLv2 with exceptions
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/
 Source: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
@@ -42,6 +42,7 @@
 Patch27: vsftpd-2.0.5-uniq_rename.patch
 Patch28: vsftpd-2.0.5-anon_umask.patch
 Patch29: vsftpd-2.0.5-pasv_dot.patch
+Patch30: vsftpd-2.0.7-ssl_shutdown.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if %{tcp_wrappers}
@@ -98,6 +99,7 @@
 %patch27 -p1 -b .uniq_rename
 %patch28 -p1 -b .anon_umask
 %patch29 -p1 -b .pasv_dot
+%patch30 -p1 -b .ssl_shutdown
 
 %build
 %ifarch s390x
@@ -156,6 +158,10 @@
 %{_var}/ftp
 
 %changelog
+* Mon Sep 22 2008 Martin Nagy <mnagy at redhat.com> - 2.0.5-21
+- shutdown ssl connection properly (#462317)
+- fix license tag
+
 * Wed May 21 2008 Martin Nagy <mnagy at redhat.com> - 2.0.5-20
 - fix a small memory leak (#397011)
 



From mnagy at fedoraproject.org  Sun Sep 21 23:00:16 2008
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Sun, 21 Sep 2008 23:00:16 +0000 (UTC)
Subject: rpms/vsftpd/F-9 vsftpd-2.0.7-ssl_shutdown.patch, NONE,
	1.1 vsftpd.spec, 1.81, 1.82
Message-ID: <20080921230016.3491F700FA@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/vsftpd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19504

Modified Files:
	vsftpd.spec 
Added Files:
	vsftpd-2.0.7-ssl_shutdown.patch 
Log Message:
* Mon Sep 22 2008 Martin Nagy <mnagy at redhat.com> - 2.0.6-6
- shutdown ssl connection properly (#463119)
- fix license tag


vsftpd-2.0.7-ssl_shutdown.patch:

--- NEW FILE vsftpd-2.0.7-ssl_shutdown.patch ---
diff -up vsftpd-2.0.6/ssl.c.ssl_shutdown vsftpd-2.0.6/ssl.c
--- vsftpd-2.0.6/ssl.c.ssl_shutdown	2008-09-22 00:08:46.000000000 +0200
+++ vsftpd-2.0.6/ssl.c	2008-09-22 00:11:31.000000000 +0200
@@ -282,8 +282,15 @@ ssl_write_str(void* p_ssl, const struct 
 void
 ssl_data_close(struct vsf_session* p_sess)
 {
-  if (p_sess->p_data_ssl)
+  SSL* p_ssl = p_sess->p_data_ssl;
+  if (p_ssl)
   {
+    int ret;
+    ret = SSL_shutdown(p_ssl);
+    if (ret == 0)
+    {
+      SSL_shutdown(p_ssl);
+    }
     SSL_free(p_sess->p_data_ssl);
     p_sess->p_data_ssl = NULL;
   }


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/F-9/vsftpd.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- vsftpd.spec	20 Jun 2008 21:00:02 -0000	1.81
+++ vsftpd.spec	21 Sep 2008 22:59:45 -0000	1.82
@@ -3,8 +3,8 @@
 Summary: Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.6
-Release: 5%{?dist}
-License: GPL
+Release: 6%{?dist}
+License: GPLv2 with exceptions
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/
 Source: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
@@ -44,6 +44,7 @@
 Patch36: vsftpd-2.0.5-greedy.patch
 Patch37: vsftpd-2.0.6-userlist_log.patch
 Patch38: vsftpd-2.0.6-listen.patch
+Patch39: vsftpd-2.0.7-ssl_shutdown.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if %{tcp_wrappers}
@@ -102,6 +103,7 @@
 %patch36 -p1 -b .greedy
 %patch37 -p1 -b .userlist_log
 %patch38 -p1 -b .listen
+%patch39 -p1 -b .ssl_shutdown
 
 %build
 %ifarch s390x sparcv9 sparc64
@@ -160,6 +162,10 @@
 %{_var}/ftp
 
 %changelog
+* Mon Sep 22 2008 Martin Nagy <mnagy at redhat.com> - 2.0.6-6
+- shutdown ssl connection properly (#463119)
+- fix license tag
+
 * Fri Jun 20 2008 Dennis Gilmore <dennis at ausil.us> - 2.0.6-5
 - add sparc arches to -fPIE list
 



From iburrell at fedoraproject.org  Sun Sep 21 23:07:03 2008
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Sun, 21 Sep 2008 23:07:03 +0000 (UTC)
Subject: rpms/mediatomb/EL-5 mediatomb.spec,1.5,1.6
Message-ID: <20080921230703.EF5E9700FA@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/extras/rpms/mediatomb/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19951

Modified Files:
	mediatomb.spec 
Log Message:
Change BuildRequires and configure for EL-5


Index: mediatomb.spec
===================================================================
RCS file: /cvs/extras/rpms/mediatomb/EL-5/mediatomb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mediatomb.spec	28 Aug 2008 18:40:12 -0000	1.5
+++ mediatomb.spec	21 Sep 2008 23:06:33 -0000	1.6
@@ -1,7 +1,7 @@
 Version: 0.11.0
 Summary: UPnP AV MediaServer 
 Name: mediatomb
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 Summary: MediaTomb - UPnP AV Mediaserver for Linux
 License: GPLv2
 Group: Applications/Multimedia
@@ -9,13 +9,8 @@
 Patch0: mediatomb-service-disable.patch
 URL: http://mediatomb.cc
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-BuildRequires: sqlite-devel, mysql-devel, libexif-devel, id3lib-devel, file-devel, js-devel, zlib-devel, taglib-devel
+BuildRequires: sqlite-devel, mysql-devel, libexif-devel, id3lib-devel, file, js-devel, zlib-devel, taglib-devel
 BuildRequires: expat-devel
-%if 0%{?fedora} >= 9
-BuildRequires: xulrunner-devel
-%else
-BuildRequires: firefox-devel
-%endif
 Requires: mysql, expat
 Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
@@ -34,11 +29,7 @@
 %patch0 -p1
 
 %build
-%if 0%{?fedora} >= 9
-%configure --enable-inotify --enable-taglib --enable-libjs --with-js-h=%{_includedir}/xulrunner-sdk-1.9pre/js/
-%else
 %configure --enable-inotify --enable-taglib --enable-libjs
-%endif
 %{__make} %{?_smp_mflags}
 
 
@@ -97,6 +88,9 @@
 %{_initrddir}/mediatomb
 
 %changelog
+* Sun Sep 21 2008 Ian Burrell <ianburrell at gmail.com> - 0.11.0-2.1
+- Change BuildRequires and configure for EL-5
+
 * Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.11.0-2
 - Include /usr/share/mediatomb directory.
 



From salimma at fedoraproject.org  Sun Sep 21 23:09:07 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 21 Sep 2008 23:09:07 +0000 (UTC)
Subject: rpms/conduit/devel conduit-0.3.14-defaults.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 conduit.spec, 1.20, 1.21 sources, 1.9,
	1.10 conduit-0.3.13-browser_impl.patch, 1.1,
	NONE conduit-0.3.13-xulrunner.patch, 1.1, NONE
Message-ID: <20080921230907.4A67E700FA@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/conduit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20479

Modified Files:
	.cvsignore conduit.spec sources 
Added Files:
	conduit-0.3.14-defaults.patch 
Removed Files:
	conduit-0.3.13-browser_impl.patch 
	conduit-0.3.13-xulrunner.patch 
Log Message:
* Sun Sep 21 2008 Michel Salim <salimma at fedoraproject.org> - 0.3.14-1
- Update to 0.3.14


conduit-0.3.14-defaults.patch:

--- NEW FILE conduit-0.3.14-defaults.patch ---
--- conduit-0.3.14/conduit/defs.py.in.defaults	2008-08-29 21:00:04.000000000 -0400
+++ conduit-0.3.14/conduit/defs.py.in	2008-09-21 14:14:02.000000000 -0400
@@ -11,10 +11,10 @@
 #
 
 #{GnomeVfs, GIO, Python}
-FILE_IMPL = "GnomeVfs"
+FILE_IMPL = "GIO"
 
 #{gtkmozembed, webkit, system}
-BROWSER_IMPL = "gtkmozembed"
+BROWSER_IMPL = "webkit"
 
 #{GConf,Python}
 SETTINGS_IMPL = "GConf"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Aug 2008 06:26:29 -0000	1.9
+++ .cvsignore	21 Sep 2008 23:08:36 -0000	1.10
@@ -1 +1 @@
-conduit-0.3.13.tar.gz
+conduit-0.3.14.tar.gz


Index: conduit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/devel/conduit.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- conduit.spec	27 Aug 2008 00:52:06 -0000	1.20
+++ conduit.spec	21 Sep 2008 23:08:36 -0000	1.21
@@ -1,23 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           conduit
-Version:        0.3.13
-Release:        2%{?dist}
+Version:        0.3.14
+Release:        1%{?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
-
-# Search for xulrunner instead of firefox
-# (Fedora's gtkmozembed is from xulrunner starting from F9)
-Patch0:         conduit-0.3.13-xulrunner.patch
-
-# Set BROWSER_IMPL (missing from defs.py)
-# Use system rather than gtkmozembed; using the latter, conduit crashes
-# on opening a second help page
-Patch1:         conduit-0.3.13-browser_impl.patch
+Patch0:         conduit-0.3.14-defaults.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,11 +21,12 @@
 BuildRequires:  gettext, gnome-doc-utils, scrollkeeper
 
 Requires:       pygoocanvas >= 0.9, python-vobject, python-sqlite
+Requires:	pywebkitgtk >= 1.0
 Requires:       dbus >= 0.93, dbus-python >= 0.80, pygtk2
 Requires:       python-feedparser
 Requires:       python-gpod >= 0.6
 Requires:       python-gdata
-Requires:       gnome-python2-desktop, gnome-python2-extras
+Requires:       gnome-python2-desktop
 # for fspot support
 Requires:       python-sqlite2
 # Tomboy is not a hard requirement, but if it is present, it must be 0.5.10
@@ -62,10 +55,7 @@
 
 %prep
 %setup -q -n conduit-%{version}
-%if 0%{?fedora} >= 9
-%patch0 -p1 -b .xulrunner
-%endif
-%patch1 -p1 -b .browser_impl
+%patch0 -p1 -b .defaults
 
 # fix eol encoding in a couple of files
 sed -i 's/\r//' NEWS TODO
@@ -91,6 +81,9 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# conduit wrapper is unneeded because we're using WebKig and not mozembed
+(cd $RPM_BUILD_ROOT%{_bindir} && mv conduit.real conduit)
+
 # Remove broken modules
 #(cd $RPM_BUILD_ROOT/%{python_sitelib}/%{name}/modules && \
 # rm -rf iPodModule N800Module)
@@ -144,6 +137,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Michel Salim <salimma at fedoraproject.org> - 0.3.14-1
+- Update to 0.3.14
+
 * Tue Aug 26 2008 Michel Salim <salimma at fedoraproject.org> - 0.3.13-2
 - Remove obsoleted dependency on PyXML (bz#454995)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Aug 2008 06:26:29 -0000	1.9
+++ sources	21 Sep 2008 23:08:36 -0000	1.10
@@ -1 +1 @@
-82f5302bfae6ab071e1808792f0ecb08  conduit-0.3.13.tar.gz
+b81a7b346a13216d1bffbaf45ee64b9d  conduit-0.3.14.tar.gz


--- conduit-0.3.13-browser_impl.patch DELETED ---


--- conduit-0.3.13-xulrunner.patch DELETED ---



From mclasen at fedoraproject.org  Mon Sep 22 00:01:57 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 00:01:57 +0000 (UTC)
Subject: rpms/eel2/devel .cvsignore, 1.67, 1.68 eel2.spec, 1.98, 1.99 sources,
	1.67, 1.68
Message-ID: <20080922000157.DAD6A7013F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/eel2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24099

Modified Files:
	.cvsignore eel2.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eel2/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	8 Sep 2008 23:32:06 -0000	1.67
+++ .cvsignore	22 Sep 2008 00:01:26 -0000	1.68
@@ -1 +1 @@
-eel-2.23.92.tar.bz2
+eel-2.24.0.tar.bz2


Index: eel2.spec
===================================================================
RCS file: /cvs/extras/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- eel2.spec	19 Sep 2008 13:25:10 -0000	1.98
+++ eel2.spec	22 Sep 2008 00:01:27 -0000	1.99
@@ -16,8 +16,8 @@
 
 Name:        eel2
 Summary:     Eazel Extensions Library
-Version:     2.23.92
-Release:     2%{?dist}
+Version:     2.24.0
+Release:     1%{?dist}
 License:     LGPLv2+
 Group:       System Environment/Libraries
 Source:      http://download.gnome.org/sources/eel/2.23/eel-%{version}.tar.bz2
@@ -113,6 +113,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Thu Sep 18 2008 Ray Strode <rstrode at redhat.com> - 2.23.92-2
 - When switching desktop backgrounds fade between them
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eel2/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	8 Sep 2008 23:32:06 -0000	1.67
+++ sources	22 Sep 2008 00:01:27 -0000	1.68
@@ -1 +1 @@
-630d8ff2a3bc9136c1ad3c91884a839e  eel-2.23.92.tar.bz2
+bafb0155dc6caf69cbbd3534f70f3a9d  eel-2.24.0.tar.bz2



From jkratoch at fedoraproject.org  Mon Sep 22 00:04:10 2008
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 22 Sep 2008 00:04:10 +0000 (UTC)
Subject: rpms/binutils/devel binutils-2.18.50.0.9-set-long-long.patch, NONE, 
	1.1 binutils-2.18.50.0.9-upstream.patch, NONE, 1.1 binutils.spec,
	1.138, 1.139 binutils-2.18.50.0.6-build-fixes.patch, 1.1, NONE
Message-ID: <20080922000410.86B1C700FE@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24682

Modified Files:
	binutils.spec 
Added Files:
	binutils-2.18.50.0.9-set-long-long.patch 
	binutils-2.18.50.0.9-upstream.patch 
Removed Files:
	binutils-2.18.50.0.6-build-fixes.patch 
Log Message:
* Sun Sep 21 2008 Jan Kratochvil <jan.kratochvil at redhat.com> 2.18.50.0.9-3
- Provide libbfd.so and libopcodes.so for automatic dependencies (BZ 463101).
- Fix .eh_frame_hdr build on C++ files with discarded common groups (BZ 458950).
- Provide --build and --host to fix `rpmbuild --target' biarch builds.
- Include %{binutils_target}- filename prefix for binaries for cross builds.
- Fix multilib conflict on %{_prefix}/include/bfd.h's BFD_HOST_64BIT_LONG_LONG.


binutils-2.18.50.0.9-set-long-long.patch:

--- NEW FILE binutils-2.18.50.0.9-set-long-long.patch ---
--- bfd/configure.in-orig	2008-09-22 00:19:20.000000000 +0200
+++ bfd/configure.in	2008-09-22 00:43:15.000000000 +0200
@@ -149,11 +149,13 @@ if test "x${ac_cv_sizeof_long}" = "x8"; 
   BFD_HOST_64BIT_LONG=1
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
-elif test "x${ac_cv_sizeof_long_long}" = "x8"; then
+fi
+if test "x${ac_cv_sizeof_long_long}" = "x8"; then
   BFD_HOST_64BIT_LONG_LONG=1
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"
-  if test "x${ac_cv_sizeof_void_p}" = "x8"; then
+  if test "x${ac_cv_sizeof_void_p}" = "x8" \
+          -a "x${ac_cv_sizeof_long}" != "x8"; then
     BFD_HOSTPTR_T="unsigned long long"
   fi
 fi
--- bfd/configure-orig	2008-09-22 01:05:41.000000000 +0200
+++ bfd/configure	2008-09-22 01:11:48.000000000 +0200
@@ -13190,11 +13190,13 @@ if test "x${ac_cv_sizeof_long}" = "x8"; 
   BFD_HOST_64BIT_LONG=1
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
-elif test "x${ac_cv_sizeof_long_long}" = "x8"; then
+fi
+if test "x${ac_cv_sizeof_long_long}" = "x8"; then
   BFD_HOST_64BIT_LONG_LONG=1
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"
-  if test "x${ac_cv_sizeof_void_p}" = "x8"; then
+  if test "x${ac_cv_sizeof_void_p}" = "x8" \
+          -a "x${ac_cv_sizeof_long}" != "x8"; then
     BFD_HOSTPTR_T="unsigned long long"
   fi
 fi

binutils-2.18.50.0.9-upstream.patch:

--- NEW FILE binutils-2.18.50.0.9-upstream.patch ---
http://sourceware.org/ml/binutils-cvs/2008-09/msg00088.html
http://sourceware.org/ml/binutils/2008-09/msg00125.html

2008-09-17  Jan Kratochvil  <jan.kratochvil at redhat.com>

	Fix testcases compilation failures due to unused variables.
	* ld-elfcomm/common1b.c (dummy1): Mark the variable for GCC as USED.
	* ld-shared/main.c (main): Move the P variable only to the places where
	it is used.

===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfcomm/common1b.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ld/testsuite/ld-elfcomm/common1b.c	2003/04/15 09:38:10	1.1
+++ ld/testsuite/ld-elfcomm/common1b.c	2008/09/17 07:43:49	1.2
@@ -1,3 +1,7 @@
-static char dummy1 = 'X';
+static
+#if     __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
+  __attribute__((__used__))
+#endif  /* __GNUC__ */
+  char dummy1 = 'X';
 char foo1 [] = "Aligned at odd byte.";
 char foo2 [4];
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-shared/main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ld/testsuite/ld-shared/main.c	2001/06/06 21:03:59	1.3
+++ ld/testsuite/ld-shared/main.c	2008/09/17 07:43:49	1.4
@@ -38,8 +38,6 @@
 int
 main ()
 {
-  int (*p) ();
-
   printf ("mainvar == %d\n", mainvar);
   printf ("overriddenvar == %d\n", overriddenvar);
   printf ("shlibvar1 == %d\n", shlibvar1);
@@ -62,21 +60,29 @@
   printf ("shlib_checkfunptr2 (main_called) == %d\n",
 	  shlib_checkfunptr2 (main_called));
 #endif
-  p = shlib_getfunptr1 ();
-  printf ("shlib_getfunptr1 () ");
-  if (p == shlib_shlibvar1)
-    printf ("==");
-  else
-    printf ("!=");
-  printf (" shlib_shlibvar1\n");
+  {
+    int (*p) ();
+
+    p = shlib_getfunptr1 ();
+    printf ("shlib_getfunptr1 () ");
+    if (p == shlib_shlibvar1)
+      printf ("==");
+    else
+      printf ("!=");
+    printf (" shlib_shlibvar1\n");
+  }
 #ifndef XCOFF_TEST
-  p = shlib_getfunptr2 ();
-  printf ("shlib_getfunptr2 () ");
-  if (p == main_called)
-    printf ("==");
-  else
-    printf ("!=");
-  printf (" main_called\n");
+  {
+    int (*p) ();
+
+    p = shlib_getfunptr2 ();
+    printf ("shlib_getfunptr2 () ");
+    if (p == main_called)
+      printf ("==");
+    else
+      printf ("!=");
+    printf (" main_called\n");
+  }
 #endif
 #endif
   printf ("shlib_check () == %d\n", shlib_check ());



http://sourceware.org/ml/binutils-cvs/2008-09/msg00089.html
http://sourceware.org/ml/binutils/2008-09/msg00124.html

bfd/
2008-09-17  Jan Kratochvil  <jan.kratochvil at redhat.com>

	PR 6893 - Do not consider FDEs for discarded sections as invalid.
	* elf-eh-frame.c (_bfd_elf_parse_eh_frame): New REQUIRE_CLEARED_RELOCS.
	Consider FDEs with cleared relocations as valid and ignorable.

binutils/
2008-09-17  Jan Kratochvil  <jan.kratochvil at redhat.com>

	Suppress warnings on NONE relocations to discarded sections.
	* readelf.c (is_none_reloc): New function.
	(debug_apply_relocations): Ignore is_none_reloc() relocations.

testsuite/
2008-09-17  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* ld-elf/eh-group.exp, ld-elf/eh-group1.s, ld-elf/eh-group2.s: New test.

===================================================================
RCS file: /cvs/src/src/bfd/elf-eh-frame.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- bfd/elf-eh-frame.c	2008/08/24 21:43:00	1.72
+++ bfd/elf-eh-frame.c	2008/09/17 07:50:28	1.73
@@ -549,6 +549,16 @@
 	     < (bfd_size_type) ((buf) - ehbuf)))	\
     cookie->rel++
 
+#define REQUIRE_CLEARED_RELOCS(buf)			\
+  while (cookie->rel < cookie->relend			\
+	 && (cookie->rel->r_offset			\
+	     < (bfd_size_type) ((buf) - ehbuf)))	\
+    {							\
+      REQUIRE (cookie->rel->r_info == 0);		\
+      REQUIRE (cookie->rel->r_addend == 0);		\
+      cookie->rel++;					\
+    }
+
 #define GET_RELOC(buf)					\
   ((cookie->rel < cookie->relend			\
     && (cookie->rel->r_offset				\
@@ -766,9 +776,14 @@
 
 	  /* Chain together the FDEs for each section.  */
 	  rsec = _bfd_elf_gc_mark_rsec (info, sec, gc_mark_hook, cookie);
-	  REQUIRE (rsec && rsec->owner == abfd);
-	  this_inf->u.fde.next_for_section = elf_fde_list (rsec);
-	  elf_fde_list (rsec) = this_inf;
+	  /* RSEC will be NULL if FDE was cleared out as it was belonging to
+	     a discarded SHT_GROUP.  */
+	  if (rsec)
+	    {
+	      REQUIRE (rsec->owner == abfd);
+	      this_inf->u.fde.next_for_section = elf_fde_list (rsec);
+	      elf_fde_list (rsec) = this_inf;
+	    }
 
 	  /* Skip the initial location and address range.  */
 	  start = buf;
@@ -801,7 +816,17 @@
 	  insns = buf;
 
 	  buf = last_fde + 4 + hdr_length;
-	  SKIP_RELOCS (buf);
+
+	  /* Cleared FDE?  The instructions will not be cleared but verify all
+	     the relocation entries for them are cleared.  */
+	  if (rsec == NULL)
+	    {
+	      REQUIRE_CLEARED_RELOCS (buf);
+	    }
+	  else
+	    {
+	      SKIP_RELOCS (buf);
+	    }
 	}
 
       /* Try to interpret the CFA instructions and find the first
===================================================================
RCS file: /cvs/src/src/binutils/readelf.c,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -r1.425 -r1.426
--- binutils/readelf.c	2008/09/05 14:49:05	1.425
+++ binutils/readelf.c	2008/09/17 07:50:28	1.426
@@ -8284,6 +8284,53 @@
     }
 }
 
+/* Returns TRUE iff RELOC_TYPE is a NONE relocation used for discarded
+   relocation entries (possibly formerly used for SHT_GROUP sections).  */
+
+static bfd_boolean
+is_none_reloc (unsigned int reloc_type)
+{
+  switch (elf_header.e_machine)
+    {
+    case EM_68K:
+      return reloc_type == 0; /* R_68K_NONE.  */
+    case EM_386:
+      return reloc_type == 0; /* R_386_NONE.  */
+    case EM_SPARC32PLUS:
+    case EM_SPARCV9:
+    case EM_SPARC:
+      return reloc_type == 0; /* R_SPARC_NONE.  */
+    case EM_MIPS:
+      return reloc_type == 0; /* R_MIPS_NONE.  */
+    case EM_PARISC:
+      return reloc_type == 0; /* R_PARISC_NONE.  */
+    case EM_ALPHA:
+      return reloc_type == 0; /* R_ALPHA_NONE.  */
+    case EM_PPC:
+      return reloc_type == 0; /* R_PPC_NONE.  */
+    case EM_PPC64:
+      return reloc_type == 0; /* R_PPC64_NONE.  */
+    case EM_ARM:
+      return reloc_type == 0; /* R_ARM_NONE.  */
+    case EM_IA_64:
+      return reloc_type == 0; /* R_IA64_NONE.  */
+    case EM_SH:
+      return reloc_type == 0; /* R_SH_NONE.  */
+    case EM_S390_OLD:
+    case EM_S390:
+      return reloc_type == 0; /* R_390_NONE.  */
+    case EM_CRIS:
+      return reloc_type == 0; /* R_CRIS_NONE.  */
+    case EM_X86_64:
+      return reloc_type == 0; /* R_X86_64_NONE.  */
+    case EM_MN10300:
+      return reloc_type == 0; /* R_MN10300_NONE.  */
+    case EM_M32R:
+      return reloc_type == 0; /* R_M32R_NONE.  */
+    }
+  return FALSE;
+}
+
 /* Uncompresses a section that was compressed using zlib, in place.
  * This is a copy of bfd_uncompress_section_contents, in bfd/compress.c  */
 
@@ -8419,6 +8466,9 @@
 
 	  reloc_type = get_reloc_type (rp->r_info);
 
+	  if (is_none_reloc (reloc_type))
+	    continue;
+
 	  if (is_32bit_abs_reloc (reloc_type)
 	      || is_32bit_pcrel_reloc (reloc_type))
 	    reloc_size = 4;
/cvs/src/src/ld/testsuite/ld-elf/eh-group.exp,v  -->  standard output
revision 1.1
--- ld/testsuite/ld-elf/eh-group.exp
+++ ld/testsuite/ld-elf/eh-group.exp	2008-09-21 22:56:18.321559000 +0000
@@ -0,0 +1,51 @@
+# Expect script for .eh_frame entries to a removed section.
+#   Copyright 2008  Free Software Foundation, Inc.
+#
+# This file is part of the GNU Binutils.
+#
+# 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., 51 Franklin Street - Fifth Floor, Boston,
+# MA 02110-1301, USA.
+#
+
+#
+# Written by Jan Kratochvil (jan.kratochvil at redhat.com)
+#
+# .eh_frame with relocations to a removed (group) section did result to:
+# error in tmpdir/eh-group.o(.eh_frame); no .eh_frame_hdr table will be created.
+# The purpose of this test is to merge two .o files with -r and then link this
+# merged file (containing a discarded R_X86_64_NONE relocation) to the final
+# executable trying to create .eh_frame_hdr.  It needs a separate .exp file due
+# to the requirement of two `ld' runs.
+
+# Exclude non-ELF targets.
+
+if ![is_elf_format] {
+    return
+}
+
+set build_tests_ld {
+  {"Build eh-group1.o"
+   "-r" ""
+   {eh-group1.s eh-group2.s} {} "eh-group.o"}
+}
+
+run_ld_link_tests $build_tests_ld
+
+set testname "Link eh-group.o to eh-group"
+if [ld_simple_link $ld "tmpdir/eh-group" "-e _start tmpdir/eh-group.o"] {
+    pass $testname
+} else {
+    fail $testname
+}
/cvs/src/src/ld/testsuite/ld-elf/eh-group1.s,v  -->  standard output
revision 1.1
--- ld/testsuite/ld-elf/eh-group1.s
+++ ld/testsuite/ld-elf/eh-group1.s	2008-09-21 22:56:19.003793000 +0000
@@ -0,0 +1,6 @@
+	.section	sect, "axG", @progbits, sectgroup, comdat
+	.global	_start
+_start:
+	.cfi_startproc
+	.skip 16
+	.cfi_endproc
/cvs/src/src/ld/testsuite/ld-elf/eh-group2.s,v  -->  standard output
revision 1.1
--- ld/testsuite/ld-elf/eh-group2.s
+++ ld/testsuite/ld-elf/eh-group2.s	2008-09-21 22:56:19.663297000 +0000
@@ -0,0 +1,4 @@
+	.section	sect, "axG", @progbits, sectgroup, comdat
+	.cfi_startproc
+	.skip 16
+	.cfi_endproc

http://sourceware.org/ml/binutils-cvs/2008-09/msg00107.html
http://sourceware.org/ml/binutils/2008-09/msg00145.html

testsuite/
2008-09-20  Jan Kratochvil  <jan.kratochvil at redhat.com>

	Provide virtual target "cfi" for targets supporting CFI.
	* ld-elf/eh-frame-hdr.d: Replace target and xfail statements by single
	`target: cfi'.
	* ld-elf/eh-group.exp: Call check_as_cfi instead of is_elf_format.
	* ld-elf/eh-group1.s, elf/eh-group2.s: Use more compatible section
	flags prefix '%'.
	* ld-elf/eh5.d: Replace target statement by `target: cfi' with an Alpha
	exception.  Relax the `Code alignment factor' matching.
	* lib/ld-lib.exp: Rename istarget as istarget_ld.
	(istarget, check_as_cfi): New procedure.
	(run_dump_test): New comment for the virtual target `cfi'.

===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elf/eh-frame-hdr.d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ld/testsuite/ld-elf/eh-frame-hdr.d	2006/12/04 08:57:09	1.1
+++ ld/testsuite/ld-elf/eh-frame-hdr.d	2008/09/20 08:42:53	1.2
@@ -1,17 +1,7 @@
 #source: eh-frame-hdr.s
 #ld: -e _start --eh-frame-hdr
 #objdump: -hw
-#target: alpha*-*-*
-#target: arm*-*-*
-#target: i?86-*-*
-#target: m68k-*-*
-#target: mips*-*-*
-#target: powerpc*-*-*
-#target: s390*-*-*
-#target: sh*-*-*
-#xfail: sh*l*-*-*
-#target: sparc*-*-*
-#target: x86_64-*-*
+#target: cfi
 #...
   [0-9] .eh_frame_hdr 0*[12][048c] .*
 #pass
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elf/eh-group.exp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ld/testsuite/ld-elf/eh-group.exp	2008/09/17 07:50:29	1.1
+++ ld/testsuite/ld-elf/eh-group.exp	2008/09/20 08:42:53	1.2
@@ -29,9 +29,9 @@
 # executable trying to create .eh_frame_hdr.  It needs a separate .exp file due
 # to the requirement of two `ld' runs.
 
-# Exclude non-ELF targets.
+# Exclude non-CFI (such as ia64) targets.
 
-if ![is_elf_format] {
+if {![check_as_cfi]} {
     return
 }
 
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elf/eh-group1.s,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ld/testsuite/ld-elf/eh-group1.s	2008/09/17 07:50:29	1.1
+++ ld/testsuite/ld-elf/eh-group1.s	2008/09/20 08:42:53	1.2
@@ -1,4 +1,4 @@
-	.section	sect, "axG", @progbits, sectgroup, comdat
+	.section	sect, "axG", %progbits, sectgroup, comdat
 	.global	_start
 _start:
 	.cfi_startproc
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elf/eh-group2.s,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ld/testsuite/ld-elf/eh-group2.s	2008/09/17 07:50:29	1.1
+++ ld/testsuite/ld-elf/eh-group2.s	2008/09/20 08:42:53	1.2
@@ -1,4 +1,4 @@
-	.section	sect, "axG", @progbits, sectgroup, comdat
+	.section	sect, "axG", %progbits, sectgroup, comdat
 	.cfi_startproc
 	.skip 16
 	.cfi_endproc
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elf/eh5.d,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ld/testsuite/ld-elf/eh5.d	2008/01/28 15:15:32	1.2
+++ ld/testsuite/ld-elf/eh5.d	2008/09/20 08:42:53	1.3
@@ -3,14 +3,15 @@
 #source: eh5b.s
 #ld:
 #readelf: -wf
-#target: x86_64-*-* i?86-*-*
+#target: cfi
+#notarget: alpha*
 
 The section .eh_frame contains:
 
 00000000 0000001[04] 00000000 CIE
   Version:               1
   Augmentation:          "zR"
-  Code alignment factor: 1
+  Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
   Augmentation data:     1b
@@ -29,7 +30,7 @@
 000000(2c|30) 00000014 00000000 CIE
   Version:               1
   Augmentation:          "zPR"
-  Code alignment factor: 1
+  Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
   Augmentation data:     03 .. .. .. .. 1b
@@ -53,7 +54,7 @@
 0000007[48] 0000001[8c] 00000000 CIE
   Version:               1
   Augmentation:          "zPLR"
-  Code alignment factor: 1
+  Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
   Augmentation data:     03 .. .. .. .. 0c 1b
@@ -74,7 +75,7 @@
 000000b[08] 0000001[04] 00000000 CIE
   Version:               1
   Augmentation:          "zR"
-  Code alignment factor: 1
+  Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
   Augmentation data:     1b
@@ -89,7 +90,7 @@
 000000[de]8 00000014 00000000 CIE
   Version:               1
   Augmentation:          "zPR"
-  Code alignment factor: 1
+  Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
   Augmentation data:     03 .. .. .. .. 1b
@@ -111,7 +112,7 @@
 000001(1c|30) 0000001[8c] 00000000 CIE
   Version:               1
   Augmentation:          "zPLR"
-  Code alignment factor: 1
+  Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
   Augmentation data:     03 .. .. .. .. 0c 1b
===================================================================
RCS file: /cvs/src/src/ld/testsuite/lib/ld-lib.exp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ld/testsuite/lib/ld-lib.exp	2008/02/18 11:04:09	1.54
+++ ld/testsuite/lib/ld-lib.exp	2008/09/20 08:42:53	1.55
@@ -598,7 +598,8 @@
 #
 #   target: TARGET
 #       Only run the test for TARGET.  This may occur more than once; the
-#       target being tested must match at least one.
+#       target being tested must match at least one.  You may provide target
+#       name "cfi" for any target supporting the CFI statements.
 #
 #   notarget: TARGET
 #       Do not run the test for TARGET.  This may occur more than once;
@@ -1569,3 +1570,39 @@
     }
     return $gc_sections_available_saved
 }
+
+# Check if the assembler supports CFI statements.
+
+proc check_as_cfi { } {
+    global check_as_cfi_result
+    global as
+    if [info exists check_as_cfi_result] {
+	return $check_as_cfi_result
+    }
+    set as_file "tmpdir/check_as_cfi.s"
+    set as_fh [open $as_file w 0666]
+    puts $as_fh "# Generated file. DO NOT EDIT"
+    puts $as_fh "\t.cfi_startproc"
+    puts $as_fh "\t.cfi_endproc"
+    close $as_fh
+    remote_download host $as_file
+    verbose -log "Checking CFI support:"
+    rename "perror" "check_as_cfi_perror"
+    proc perror { args } { }
+    set success [ld_assemble $as $as_file "/dev/null"]
+    rename "perror" ""
+    rename "check_as_cfi_perror" "perror"
+    #remote_file host delete $as_file
+    set check_as_cfi_result $success
+    return $success
+}
+
+# Provide virtual target "cfi" for targets supporting CFI.
+
+rename "istarget" "istarget_ld"
+proc istarget { target } {
+    if {$target == "cfi"} {
+	return [check_as_cfi]
+    }
+    return [istarget_ld $target]
+}


Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- binutils.spec	15 Sep 2008 17:16:21 -0000	1.138
+++ binutils.spec	22 Sep 2008 00:03:40 -0000	1.139
@@ -17,7 +17,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.18.50.0.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -26,10 +26,11 @@
 Patch2: binutils-2.18.50.0.6-ppc64-pie.patch
 Patch3: binutils-2.18.50.0.8-place-orphan.patch
 Patch4: binutils-2.18.50.0.6-ia64-lib64.patch
-Patch5: binutils-2.18.50.0.6-build-fixes.patch
 Patch6: binutils-2.18.50.0.8-symbolic-envvar-revert.patch
 Patch7: binutils-2.18.50.0.6-version.patch
 Patch11: binutils-2.18.50.0.9-largefile.patch
+Patch12: binutils-2.18.50.0.9-set-long-long.patch
+Patch13: binutils-2.18.50.0.9-upstream.patch
 
 %if 0%{?_with_debug:1}
 # Define this if you want to skip the strip step and preserve debug info.
@@ -96,10 +97,11 @@
 %patch4 -p0 -b .ia64-lib64~
 %endif
 %endif
-%patch5 -p0 -b .build-fixes~
 %patch6 -p0 -b .symbolic-envvar-revert~
 %patch7 -p0 -b .version~
 %patch11 -p0 -b .largefile~
+%patch12 -p0 -b .set-long-long~
+%patch13 -p0 -b .upstream~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -152,9 +154,12 @@
 # We could optimize the cross builds size by --enable-shared but the produced
 # binaries may be less convenient in the embedded environment.
 %configure \
+  --build=%{_target_platform} --host=%{_target_platform} \
+  --target=%{binutils_target} \
 %if !%{isnative}
-  --target %{binutils_target} --enable-targets=%{_host} \
+  --enable-targets=%{_host} \
   --with-sysroot=%{_prefix}/%{binutils_target}/sys-root \
+  --program-prefix=%{cross} \
 %endif
 %if %{enable_shared}
   --enable-shared \
@@ -212,6 +217,7 @@
 # Remove libtool files, which reference the .so libs
 rm -f %{buildroot}%{_prefix}/%{_lib}/lib{bfd,opcodes}.la
 
+# Fix multilib conflicts of generated values by __WORDSIZE-based expressions.
 %ifarch %{ix86} x86_64 ppc ppc64 s390 s390x sparc sparc64
 sed -i -e '/^#include "ansidecl.h"/{p;s~^.*$~#include <bits/wordsize.h>~;}' \
 %ifarch %{ix86} x86_64
@@ -229,6 +235,18 @@
 %endif
 touch -r bfd/bfd-in2.h %{buildroot}%{_prefix}/include/bfd.h
 
+cat >%{buildroot}%{_prefix}/%{_lib}/libbfd.so <<EOH
+/* GNU ld script
+   The libz dependency is unexpected by legacy build scripts.  */
+
+INPUT ( %{_libdir}/libbfd.a -liberty -lz )
+EOH
+cat >%{buildroot}%{_prefix}/%{_lib}/libopcodes.so <<EOH
+/* GNU ld script */
+
+INPUT ( %{_libdir}/libopcodes.a -lbfd )
+EOH
+
 %else # !%{isnative}
 # For cross-binutils we drop the documentation.
 rm -rf %{buildroot}%{_infodir}
@@ -297,6 +315,8 @@
 %{_mandir}/man1/*
 %if %{enable_shared}
 %{_prefix}/%{_lib}/lib*.so
+%exclude %{_prefix}/%{_lib}/libbfd.so
+%exclude %{_prefix}/%{_lib}/libopcodes.so
 %endif
 %if %{isnative}
 %{_infodir}/[^b]*info*
@@ -305,11 +325,20 @@
 %files devel
 %defattr(-,root,root,-)
 %{_prefix}/include/*
+%{_prefix}/%{_lib}/libbfd.so
+%{_prefix}/%{_lib}/libopcodes.so
 %{_prefix}/%{_lib}/lib*.a
 %{_infodir}/bfd*info*
 %endif # %{isnative}
 
 %changelog
+* Sun Sep 21 2008 Jan Kratochvil <jan.kratochvil at redhat.com> 2.18.50.0.9-3
+- Provide libbfd.so and libopcodes.so for automatic dependencies (BZ 463101).
+- Fix .eh_frame_hdr build on C++ files with discarded common groups (BZ 458950).
+- Provide --build and --host to fix `rpmbuild --target' biarch builds.
+- Include %%{binutils_target}- filename prefix for binaries for cross builds.
+- Fix multilib conflict on %{_prefix}/include/bfd.h's BFD_HOST_64BIT_LONG_LONG.
+
 * Mon Sep 15 2008 Jan Kratochvil <jan.kratochvil at redhat.com> 2.18.50.0.9-2
 - Package review, analysed by Jon Ciesla and Patrice Dumas (BZ 225615).
  - build back in the sourcedir without problems as gasp is no longer included.


--- binutils-2.18.50.0.6-build-fixes.patch DELETED ---



From mclasen at fedoraproject.org  Mon Sep 22 00:07:24 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 00:07:24 +0000 (UTC)
Subject: rpms/ORBit2/devel .cvsignore, 1.30, 1.31 ORBit2.spec, 1.71,
	1.72 sources, 1.30, 1.31
Message-ID: <20080922000724.D1BB9700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/ORBit2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25303

Modified Files:
	.cvsignore ORBit2.spec sources 
Log Message:
2.14.16



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ORBit2/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	19 Sep 2008 17:50:49 -0000	1.30
+++ .cvsignore	22 Sep 2008 00:06:54 -0000	1.31
@@ -1 +1 @@
-ORBit2-2.14.15.tar.bz2
+ORBit2-2.14.16.tar.bz2


Index: ORBit2.spec
===================================================================
RCS file: /cvs/extras/rpms/ORBit2/devel/ORBit2.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ORBit2.spec	19 Sep 2008 17:50:49 -0000	1.71
+++ ORBit2.spec	22 Sep 2008 00:06:54 -0000	1.72
@@ -3,7 +3,7 @@
 
 Summary: A high-performance CORBA Object Request Broker
 Name: ORBit2
-Version: 2.14.15
+Version: 2.14.16
 Release: 1%{?dist}
 Source: http://download.gnome.org/sources/ORBit2/2.14/%{name}-%{version}.tar.bz2
 Group: System Environment/Daemons
@@ -138,7 +138,10 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Fri Sep 19 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.15-1
+* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.16-1
+- Update to 2.14.16
+
+* Thu Sep 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.15-1
 - Update to 2.14.15
 
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.14-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ORBit2/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	19 Sep 2008 17:50:49 -0000	1.30
+++ sources	22 Sep 2008 00:06:54 -0000	1.31
@@ -1 +1 @@
-7f1c0394691d4831297b231a17f4de60  ORBit2-2.14.15.tar.bz2
+f4898b999f39c79d55c13c0e0f597c71  ORBit2-2.14.16.tar.bz2



From pkgdb at fedoraproject.org  Mon Sep 22 00:08:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 00:08:05 +0000
Subject: [pkgdb] perl-CPANPLUS: iburrell has requested watchcommits
Message-ID: <20080922000805.39125208DA0@bastion.fedora.phx.redhat.com>

iburrell has requested the watchcommits acl on perl-CPANPLUS (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CPANPLUS



From pkgdb at fedoraproject.org  Mon Sep 22 00:08:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 00:08:05 +0000
Subject: [pkgdb] perl-CPANPLUS: iburrell has requested watchbugzilla
Message-ID: <20080922000805.E6173208DA5@bastion.fedora.phx.redhat.com>

iburrell has requested the watchbugzilla acl on perl-CPANPLUS (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CPANPLUS



From pkgdb at fedoraproject.org  Mon Sep 22 00:08:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 00:08:13 +0000
Subject: [pkgdb] perl-CPANPLUS: iburrell has requested commit
Message-ID: <20080922000813.545CC208DA8@bastion.fedora.phx.redhat.com>

iburrell has requested the commit acl on perl-CPANPLUS (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CPANPLUS



From jkratoch at fedoraproject.org  Mon Sep 22 00:25:11 2008
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 22 Sep 2008 00:25:11 +0000 (UTC)
Subject: rpms/libunwind/devel libunwind-snap-070224-dprintf-vs-stdio.h, NONE,
	1.1 libunwind.spec, 1.25, 1.26
Message-ID: <20080922002511.3D9FC700FE@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/libunwind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26878

Modified Files:
	libunwind.spec 
Added Files:
	libunwind-snap-070224-dprintf-vs-stdio.h 
Log Message:
* Mon Sep 22 2008 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.6.frysk20070405cvs
- Fix build error due to a `dprintf' conflict on recent glibc.
- New rpmbuild parameter: --without check



--- NEW FILE libunwind-snap-070224-dprintf-vs-stdio.h ---
--- libunwind-0.99-alpha-orig/include/libunwind_i.h	2006-07-28 05:30:50.000000000 +0200
+++ libunwind-0.99-alpha/include/libunwind_i.h	2008-09-22 01:53:04.000000000 +0200
@@ -238,11 +238,11 @@ extern int unwi_dyn_validate_cache (unw_
 extern unw_dyn_info_list_t _U_dyn_info_list;
 extern pthread_mutex_t _U_dyn_info_list_lock;
 
+#include <stdio.h>
 #if UNW_DEBUG
 #define unwi_debug_level		UNWI_ARCH_OBJ(debug_level)
 extern long unwi_debug_level;
 
-# include <stdio.h>
 # define Debug(level,format...)						\
 do {									\
   if (unwi_debug_level >= level)					\


Index: libunwind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libunwind/devel/libunwind.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libunwind.spec	24 Feb 2008 06:31:44 -0000	1.25
+++ libunwind.spec	22 Sep 2008 00:24:40 -0000	1.26
@@ -1,3 +1,6 @@
+# rpmbuild parameters:
+# --without check: Do not run the testsuite.  Default is to run it.
+
 # Define this if you want to skip the strip step and preserve debug info.
 # Useful for testing. 
 #define __debug_install_post : > %{_builddir}/%{?buildsubdir}/debugfiles.list
@@ -8,13 +11,14 @@
 Version: 0.99
 %define frysksnap 20070405cvs
 %define upstreamsnap 070224
-Release: 0.5.frysk%{frysksnap}%{?dist}
+Release: 0.6.frysk%{frysksnap}%{?dist}
 License: BSD
 Group: Development/Debuggers
 Source: http://download.savannah.nongnu.org/releases/libunwind/libunwind-snap-%{upstreamsnap}.tar.gz
 Patch1: libunwind-snap-%{upstreamsnap}-frysk%{frysksnap}.patch
 Patch2: libunwind-snap-070224-orphanripper.patch
 Patch3: libunwind-snap-070224-multilib-rh342451.patch
+Patch4: libunwind-snap-070224-dprintf-vs-stdio.h
 Source1: libunwind-orphanripper.c
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL: http://savannah.nongnu.org/projects/libunwind
@@ -48,6 +52,7 @@
 cp -p %{SOURCE1} tests/orphanripper.c
 
 %patch3 -p1 -E
+%patch4 -p1 -E
 
 %build
 mkdir -p config
@@ -64,7 +69,13 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libunwind*.la
 
 %check
+%if 0%{?_without_check:1} || 0%{?_without_testsuite:1}
+echo ====================TESTSUITE DISABLED=========================
+%else
+echo ====================TESTING=========================
 make check || true
+echo ====================TESTING END=====================
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,6 +96,10 @@
 %{_includedir}/*
 
 %changelog
+* Mon Sep 22 2008 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.6.frysk20070405cvs
+- Fix build error due to a `dprintf' conflict on recent glibc.
+- New rpmbuild parameter: --without check
+
 * Sun Feb 24 2008 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.5.frysk20070405cvs
 - Fix the multilib conflicts (BZ 342451).
 



From iburrell at fedoraproject.org  Mon Sep 22 00:25:42 2008
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Mon, 22 Sep 2008 00:25:42 +0000 (UTC)
Subject: rpms/perl-Archive-Extract/EL-5 .cvsignore, 1.6,
	1.7 perl-Archive-Extract.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20080922002542.91B43700FE@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/extras/rpms/perl-Archive-Extract/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26980

Modified Files:
	.cvsignore perl-Archive-Extract.spec sources 
Log Message:
copy from F-8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Archive-Extract/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Jan 2007 21:01:16 -0000	1.6
+++ .cvsignore	22 Sep 2008 00:25:12 -0000	1.7
@@ -1 +1 @@
-Archive-Extract-0.16.tar.gz
+Archive-Extract-0.24.tar.gz


Index: perl-Archive-Extract.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Archive-Extract/EL-5/perl-Archive-Extract.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Archive-Extract.spec	27 Jan 2007 21:01:16 -0000	1.6
+++ perl-Archive-Extract.spec	22 Sep 2008 00:25:12 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Archive-Extract
-Version:        0.16
+Version:        0.24
 Release:        1%{?dist}
 Summary:        Generic archive extracting mechanism
 License:        GPL or Artistic
@@ -8,10 +8,12 @@
 Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Archive-Extract-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(IPC::Cmd) >= 0.36
 BuildRequires:  perl(Locale::Maketext::Simple)
 BuildRequires:  perl(Module::Load::Conditional) >= 0.04
 BuildRequires:  perl(Params::Check) >= 0.07
+BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -47,6 +49,17 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 20 2007 Steven Pritchard <steve at kspei.com> 0.24-1
+- Update to 0.24.
+- BR Test::More.
+
+* Wed May 30 2007 Steven Pritchard <steve at kspei.com> 0.22-1
+- Update to 0.22.
+
+* Tue Apr 17 2007 Steven Pritchard <steve at kspei.com> 0.18-1
+- Update to 0.18.
+- BR ExtUtils::MakeMaker.
+
 * Sat Jan 27 2007 Steven Pritchard <steve at kspei.com> 0.16-1
 - Update to 0.16.
 - BR: IPC::Cmd >= 0.36.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Archive-Extract/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Jan 2007 21:01:16 -0000	1.6
+++ sources	22 Sep 2008 00:25:12 -0000	1.7
@@ -1 +1 @@
-d800e684865d38f36ccae7a40dbf13b3  Archive-Extract-0.16.tar.gz
+8dbdc264b6c52fbce859fab96928828e  Archive-Extract-0.24.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 22 00:25:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 00:25:53 +0000
Subject: [pkgdb] perl-Archive-Extract: iburrell has requested watchbugzilla
Message-ID: <20080922002553.76CF3208DA2@bastion.fedora.phx.redhat.com>

iburrell has requested the watchbugzilla acl on perl-Archive-Extract (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Archive-Extract



From pkgdb at fedoraproject.org  Mon Sep 22 00:25:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 00:25:57 +0000
Subject: [pkgdb] perl-Archive-Extract: iburrell has requested watchcommits
Message-ID: <20080922002557.53265208D9E@bastion.fedora.phx.redhat.com>

iburrell has requested the watchcommits acl on perl-Archive-Extract (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Archive-Extract



From pkgdb at fedoraproject.org  Mon Sep 22 00:26:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 00:26:00 +0000
Subject: [pkgdb] perl-Archive-Extract: iburrell has requested commit
Message-ID: <20080922002600.76F0D208DA5@bastion.fedora.phx.redhat.com>

iburrell has requested the commit acl on perl-Archive-Extract (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Archive-Extract



From mclasen at fedoraproject.org  Mon Sep 22 00:26:14 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 00:26:14 +0000 (UTC)
Subject: rpms/gnome-keyring/devel .cvsignore, 1.48, 1.49 gnome-keyring.spec, 
	1.94, 1.95 sources, 1.48, 1.49
Message-ID: <20080922002614.426F8700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27181

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	8 Sep 2008 03:51:25 -0000	1.48
+++ .cvsignore	22 Sep 2008 00:25:44 -0000	1.49
@@ -1 +1 @@
-gnome-keyring-2.23.92.tar.bz2
+gnome-keyring-2.24.0.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- gnome-keyring.spec	8 Sep 2008 03:51:25 -0000	1.94
+++ gnome-keyring.spec	22 Sep 2008 00:25:44 -0000	1.95
@@ -7,11 +7,11 @@
 
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
-Version: 2.23.92
+Version: 2.24.0
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/gnome-keyring/2.23/gnome-keyring-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-keyring/2.24/gnome-keyring-%{version}.tar.bz2
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -136,6 +136,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Sun Sep  7 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	8 Sep 2008 03:51:25 -0000	1.48
+++ sources	22 Sep 2008 00:25:44 -0000	1.49
@@ -1 +1 @@
-a7f81563bd0d0ecf68c160544c7dd0b3  gnome-keyring-2.23.92.tar.bz2
+b73fca3308b287131a841b45e63a5d16  gnome-keyring-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 00:26:58 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 00:26:58 +0000 (UTC)
Subject: rpms/eel2/devel eel2.spec,1.99,1.100
Message-ID: <20080922002658.8405E700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/eel2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27233

Modified Files:
	eel2.spec 
Log Message:
fix source url



Index: eel2.spec
===================================================================
RCS file: /cvs/extras/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- eel2.spec	22 Sep 2008 00:01:27 -0000	1.99
+++ eel2.spec	22 Sep 2008 00:26:28 -0000	1.100
@@ -20,7 +20,7 @@
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       System Environment/Libraries
-Source:      http://download.gnome.org/sources/eel/2.23/eel-%{version}.tar.bz2
+Source:      http://download.gnome.org/sources/eel/2.24/eel-%{version}.tar.bz2
 URL:         http://www.gnome.org/projects/nautilus/
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
     



From pkgdb at fedoraproject.org  Mon Sep 22 00:34:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 00:34:02 +0000
Subject: [pkgdb] perl-Params-Check: iburrell has requested watchcommits
Message-ID: <20080922003402.90CFE208D60@bastion.fedora.phx.redhat.com>

iburrell has requested the watchcommits acl on perl-Params-Check (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Params-Check



From pkgdb at fedoraproject.org  Mon Sep 22 00:34:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 00:34:03 +0000
Subject: [pkgdb] perl-Params-Check: iburrell has requested watchbugzilla
Message-ID: <20080922003403.B8D0D208DA3@bastion.fedora.phx.redhat.com>

iburrell has requested the watchbugzilla acl on perl-Params-Check (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Params-Check



From pkgdb at fedoraproject.org  Mon Sep 22 00:34:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 00:34:04 +0000
Subject: [pkgdb] perl-Params-Check: iburrell has requested commit
Message-ID: <20080922003404.6FF0F208DA8@bastion.fedora.phx.redhat.com>

iburrell has requested the commit acl on perl-Params-Check (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Params-Check



From iburrell at fedoraproject.org  Mon Sep 22 00:34:45 2008
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Mon, 22 Sep 2008 00:34:45 +0000 (UTC)
Subject: rpms/perl-Params-Check/EL-5 .cvsignore, 1.3,
	1.4 perl-Params-Check.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20080922003445.543FD700FE@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/extras/rpms/perl-Params-Check/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28087

Modified Files:
	.cvsignore perl-Params-Check.spec sources 
Log Message:
copy from F-8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Check/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Jul 2006 13:34:23 -0000	1.3
+++ .cvsignore	22 Sep 2008 00:34:14 -0000	1.4
@@ -1 +1 @@
-Params-Check-0.25.tar.gz
+Params-Check-0.26.tar.gz


Index: perl-Params-Check.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Check/EL-5/perl-Params-Check.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Params-Check.spec	17 Sep 2006 20:58:05 -0000	1.3
+++ perl-Params-Check.spec	22 Sep 2008 00:34:14 -0000	1.4
@@ -1,14 +1,16 @@
 Name:           perl-Params-Check
-Version:        0.25
+Version:        0.26
 Release:        2%{?dist}
 Summary:        Generic input parsing/checking mechanism
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Params-Check/
 Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Params-Check-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Locale::Maketext::Simple)
+BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -29,7 +31,7 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
@@ -44,6 +46,15 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec 31 2007 Ralf Cors??pius <rc040203 at freenet.de> 0.26-2
+- BR: perl(Test::More) (BZ 419631).
+- Adjust License-tag. 
+
+* Fri Mar 23 2007 Steven Pritchard <steve at kspei.com> 0.26-1
+- Update to 0.26.
+- Use fixperms macro instead of our own chmod incantation.
+- BR ExtUtils::MakeMaker.
+
 * Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 0.25-2
 - Fix find option order.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Check/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Jul 2006 13:34:23 -0000	1.3
+++ sources	22 Sep 2008 00:34:14 -0000	1.4
@@ -1 +1 @@
-1756a2b387544fea13b442f3be8a39dc  Params-Check-0.25.tar.gz
+d740a81f3078dcae83d8b6b4859885c7  Params-Check-0.26.tar.gz



From jeckersb at fedoraproject.org  Mon Sep 22 00:36:03 2008
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Mon, 22 Sep 2008 00:36:03 +0000 (UTC)
Subject: rpms/python-netaddr/devel .cvsignore, 1.2, 1.3 python-netaddr.spec, 
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080922003603.88466700FE@cvs1.fedora.phx.redhat.com>

Author: jeckersb

Update of /cvs/pkgs/rpms/python-netaddr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28330

Modified Files:
	.cvsignore python-netaddr.spec sources 
Log Message:
Update to new upstream release 0.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Aug 2008 19:30:01 -0000	1.2
+++ .cvsignore	22 Sep 2008 00:35:33 -0000	1.3
@@ -1 +1 @@
-netaddr-0.4.tar.gz
+netaddr-0.5.tar.gz


Index: python-netaddr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/python-netaddr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-netaddr.spec	13 Aug 2008 19:30:01 -0000	1.1
+++ python-netaddr.spec	22 Sep 2008 00:35:33 -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-netaddr
-Version:        0.4
+Version:        0.5
 Release:        1%{?dist}
 Summary:        Network address manipulation, done Pythonically
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 John Eckersberg <jeckersb at redhat.com> - 0.5-1
+- New upstream version
+
 * Mon Aug 11 2008 John Eckersberg <jeckersb at redhat.com> - 0.4-1
 - Initial packaging for Fedora
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Aug 2008 19:30:01 -0000	1.2
+++ sources	22 Sep 2008 00:35:33 -0000	1.3
@@ -1 +1 @@
-9f6450c2b868964afea248fa2a2af0f4  netaddr-0.4.tar.gz
+d35e72f63ec2871e25ef50dec4b3705b  netaddr-0.5.tar.gz



From mclasen at fedoraproject.org  Mon Sep 22 00:36:13 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 00:36:13 +0000 (UTC)
Subject: rpms/nautilus/devel .cvsignore, 1.82, 1.83 nautilus.spec, 1.228,
	1.229 sources, 1.86, 1.87
Message-ID: <20080922003613.84972700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27890

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- .cvsignore	9 Sep 2008 00:55:52 -0000	1.82
+++ .cvsignore	22 Sep 2008 00:35:42 -0000	1.83
@@ -1 +1 @@
-nautilus-2.23.92.tar.bz2
+nautilus-2.24.0.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- nautilus.spec	21 Sep 2008 04:38:24 -0000	1.228
+++ nautilus.spec	22 Sep 2008 00:35:43 -0000	1.229
@@ -18,11 +18,11 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
-Version: 	2.23.92
-Release:	3%{?dist}
+Version: 	2.24.0
+Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
-Source: 	http://download.gnome.org/sources/%{name}/2.23/%{name}-%{version}.tar.bz2
+Source: 	http://download.gnome.org/sources/%{name}/2.24/%{name}-%{version}.tar.bz2
 
 URL: 		http://www.gnome.org/projects/nautilus/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
@@ -99,10 +99,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=552310
-Patch22: 	nautilus-leaks.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=553073
 Patch23:	filesystem-id-cmp.patch
+
 # http://bugzilla.gnome.org/show_bug.cgi?id=553084
 Patch24: 	description-leak.patch
 
@@ -144,7 +143,6 @@
 %patch10 -p0 -b .gvfs-desktop-key
 %patch15 -p1 -b .xds
 %patch17 -p0 -b .symlink
-%patch22 -p1 -b .leaks
 %patch23 -p1 -b .filesystem-id-cmp
 %patch24 -p1 -b .description-leak
 
@@ -266,6 +264,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Sat Sep 20 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-3
 - Plug some memory leaks
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- sources	9 Sep 2008 00:55:52 -0000	1.86
+++ sources	22 Sep 2008 00:35:43 -0000	1.87
@@ -1 +1 @@
-bb187a4352764067391b963aa153b72c  nautilus-2.23.92.tar.bz2
+b80c29aaefa3a22cdf58f644ef3019d0  nautilus-2.24.0.tar.bz2



From iburrell at fedoraproject.org  Mon Sep 22 00:38:40 2008
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Mon, 22 Sep 2008 00:38:40 +0000 (UTC)
Subject: rpms/perl-Module-Load/EL-5 .cvsignore, 1.2,
	1.3 perl-Module-Load.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20080922003840.2DD15700FE@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/extras/rpms/perl-Module-Load/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28667

Modified Files:
	.cvsignore perl-Module-Load.spec sources 
Log Message:
copy from F-8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Load/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Apr 2006 17:36:56 -0000	1.2
+++ .cvsignore	22 Sep 2008 00:38:09 -0000	1.3
@@ -1 +1 @@
-Module-Load-0.10.tar.gz
+Module-Load-0.12.tar.gz


Index: perl-Module-Load.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Load/EL-5/perl-Module-Load.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Module-Load.spec	17 Sep 2006 20:52:33 -0000	1.2
+++ perl-Module-Load.spec	22 Sep 2008 00:38:09 -0000	1.3
@@ -1,13 +1,15 @@
 Name:           perl-Module-Load
-Version:        0.10
-Release:        2%{?dist}
+Version:        0.12
+Release:        1%{?dist}
 Summary:        Runtime require of both modules and files
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Module-Load/
 Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Module-Load-%{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
@@ -29,7 +31,7 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
@@ -39,11 +41,21 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README
+%doc CHANGES README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Mon Oct 15 2007 Steven Pritchard <steve at kspei.com> 0.12-1
+- Update to 0.12.
+- Update License tag.
+- Include CHANGES doc.
+- BR Test::More.
+
+* Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.10-3
+- Use fixperms macro instead of our own chmod incantation.
+- BR ExtUtils::MakeMaker.
+
 * Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 0.10-2
 - Fix find option order.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Load/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Apr 2006 17:36:56 -0000	1.2
+++ sources	22 Sep 2008 00:38:09 -0000	1.3
@@ -1 +1 @@
-ee40eb2fa3059381e43d1f14d414fe67  Module-Load-0.10.tar.gz
+be2f196d1f364887eb94d08bb1e24c1d  Module-Load-0.12.tar.gz



From jeckersb at fedoraproject.org  Mon Sep 22 01:02:22 2008
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Mon, 22 Sep 2008 01:02:22 +0000 (UTC)
Subject: rpms/python-netaddr/F-8 .cvsignore, 1.1, 1.2 python-netaddr.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080922010222.D3EFA700FE@cvs1.fedora.phx.redhat.com>

Author: jeckersb

Update of /cvs/pkgs/rpms/python-netaddr/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30057

Modified Files:
	.cvsignore python-netaddr.spec sources 
Log Message:
Update to new upstream release 0.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Aug 2008 17:30:34 -0000	1.1
+++ .cvsignore	22 Sep 2008 01:01:52 -0000	1.2
@@ -0,0 +1 @@
+netaddr-0.5.tar.gz


Index: python-netaddr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/F-8/python-netaddr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-netaddr.spec	13 Aug 2008 19:54:04 -0000	1.1
+++ python-netaddr.spec	22 Sep 2008 01:01:52 -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-netaddr
-Version:        0.4
+Version:        0.5
 Release:        1%{?dist}
 Summary:        Network address manipulation, done Pythonically
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 John Eckersberg <jeckersb at redhat.com> - 0.5-1
+- New upstream version
+
 * Mon Aug 11 2008 John Eckersberg <jeckersb at redhat.com> - 0.4-1
 - Initial packaging for Fedora
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Aug 2008 19:54:04 -0000	1.2
+++ sources	22 Sep 2008 01:01:52 -0000	1.3
@@ -1 +1 @@
-9f6450c2b868964afea248fa2a2af0f4  netaddr-0.4.tar.gz
+d35e72f63ec2871e25ef50dec4b3705b  netaddr-0.5.tar.gz



From mclasen at fedoraproject.org  Mon Sep 22 01:05:24 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 01:05:24 +0000 (UTC)
Subject: rpms/gnome-keyring/devel gnome-keyring.spec,1.95,1.96
Message-ID: <20080922010524.AFD6C700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30439

Modified Files:
	gnome-keyring.spec 
Log Message:
fix spec



Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gnome-keyring.spec	22 Sep 2008 00:25:44 -0000	1.95
+++ gnome-keyring.spec	22 Sep 2008 01:04:54 -0000	1.96
@@ -69,9 +69,6 @@
 %setup -q -n gnome-keyring-%{version}
 
 %build
-aclocal
-automake
-autoconf
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
 make %{?_smp_mflags}
 



From mclasen at fedoraproject.org  Mon Sep 22 01:06:39 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 01:06:39 +0000 (UTC)
Subject: rpms/gnome-keyring/devel gnome-keyring.spec,1.96,1.97
Message-ID: <20080922010639.1833C700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30703

Modified Files:
	gnome-keyring.spec 
Log Message:
bump rev



Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- gnome-keyring.spec	22 Sep 2008 01:04:54 -0000	1.96
+++ gnome-keyring.spec	22 Sep 2008 01:06:08 -0000	1.97
@@ -8,7 +8,7 @@
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
 Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.24/gnome-keyring-%{version}.tar.bz2
@@ -133,7 +133,7 @@
 
 
 %changelog
-* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-2
 - Update to 2.24.0
 
 * Sun Sep  7 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1



From jkratoch at fedoraproject.org  Mon Sep 22 01:11:23 2008
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 22 Sep 2008 01:11:23 +0000 (UTC)
Subject: rpms/binutils/F-9 binutils-2.18.50.0.9-eh_frame_hdr.patch, NONE,
	1.1 binutils.spec, 1.135, 1.136
Message-ID: <20080922011123.971B7700FE@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/binutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31227

Modified Files:
	binutils.spec 
Added Files:
	binutils-2.18.50.0.9-eh_frame_hdr.patch 
Log Message:
* Sun Sep 21 2008 Jan Kratochvil <jan.kratochvil at redhat.com> 2.18.50.0.6-6
- Fix .eh_frame_hdr build on C++ files with discarded common groups (BZ 458950).


binutils-2.18.50.0.9-eh_frame_hdr.patch:

--- NEW FILE binutils-2.18.50.0.9-eh_frame_hdr.patch ---
http://sourceware.org/ml/binutils-cvs/2008-09/msg00089.html
http://sourceware.org/ml/binutils/2008-09/msg00124.html

bfd/
2008-09-17  Jan Kratochvil  <jan.kratochvil at redhat.com>

	PR 6893 - Do not consider FDEs for discarded sections as invalid.
	* elf-eh-frame.c (_bfd_elf_parse_eh_frame): New REQUIRE_CLEARED_RELOCS.
	Consider FDEs with cleared relocations as valid and ignorable.

binutils/
2008-09-17  Jan Kratochvil  <jan.kratochvil at redhat.com>

	Suppress warnings on NONE relocations to discarded sections.
	* readelf.c (is_none_reloc): New function.
	(debug_apply_relocations): Ignore is_none_reloc() relocations.

testsuite/
2008-09-17  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* ld-elf/eh-group.exp, ld-elf/eh-group1.s, ld-elf/eh-group2.s: New test.

[ binutils/readelf.c patch backported for 2.18.50.0.6.  ]

===================================================================
RCS file: /cvs/src/src/bfd/elf-eh-frame.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- bfd/elf-eh-frame.c	2008/08/24 21:43:00	1.72
+++ bfd/elf-eh-frame.c	2008/09/17 07:50:28	1.73
@@ -549,6 +549,16 @@
 	     < (bfd_size_type) ((buf) - ehbuf)))	\
     cookie->rel++
 
+#define REQUIRE_CLEARED_RELOCS(buf)			\
+  while (cookie->rel < cookie->relend			\
+	 && (cookie->rel->r_offset			\
+	     < (bfd_size_type) ((buf) - ehbuf)))	\
+    {							\
+      REQUIRE (cookie->rel->r_info == 0);		\
+      REQUIRE (cookie->rel->r_addend == 0);		\
+      cookie->rel++;					\
+    }
+
 #define GET_RELOC(buf)					\
   ((cookie->rel < cookie->relend			\
     && (cookie->rel->r_offset				\
@@ -766,9 +776,14 @@
 
 	  /* Chain together the FDEs for each section.  */
 	  rsec = _bfd_elf_gc_mark_rsec (info, sec, gc_mark_hook, cookie);
-	  REQUIRE (rsec && rsec->owner == abfd);
-	  this_inf->u.fde.next_for_section = elf_fde_list (rsec);
-	  elf_fde_list (rsec) = this_inf;
+	  /* RSEC will be NULL if FDE was cleared out as it was belonging to
+	     a discarded SHT_GROUP.  */
+	  if (rsec)
+	    {
+	      REQUIRE (rsec->owner == abfd);
+	      this_inf->u.fde.next_for_section = elf_fde_list (rsec);
+	      elf_fde_list (rsec) = this_inf;
+	    }
 
 	  /* Skip the initial location and address range.  */
 	  start = buf;
@@ -801,7 +816,17 @@
 	  insns = buf;
 
 	  buf = last_fde + 4 + hdr_length;
-	  SKIP_RELOCS (buf);
+
+	  /* Cleared FDE?  The instructions will not be cleared but verify all
+	     the relocation entries for them are cleared.  */
+	  if (rsec == NULL)
+	    {
+	      REQUIRE_CLEARED_RELOCS (buf);
+	    }
+	  else
+	    {
+	      SKIP_RELOCS (buf);
+	    }
 	}
 
       /* Try to interpret the CFA instructions and find the first
===================================================================
RCS file: /cvs/src/src/binutils/readelf.c,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -r1.425 -r1.426
--- binutils/readelf.c	2008/09/05 14:49:05	1.425
+++ binutils/readelf.c	2008/09/17 07:50:28	1.426
@@ -8271,6 +8271,53 @@ is_16bit_abs_reloc (unsigned int reloc_t
     }
 }
 
+/* Returns TRUE iff RELOC_TYPE is a NONE relocation used for discarded
+   relocation entries (possibly formerly used for SHT_GROUP sections).  */
+
+static bfd_boolean
+is_none_reloc (unsigned int reloc_type)
+{
+  switch (elf_header.e_machine)
+    {
+    case EM_68K:
+      return reloc_type == 0; /* R_68K_NONE.  */
+    case EM_386:
+      return reloc_type == 0; /* R_386_NONE.  */
+    case EM_SPARC32PLUS:
+    case EM_SPARCV9:
+    case EM_SPARC:
+      return reloc_type == 0; /* R_SPARC_NONE.  */
+    case EM_MIPS:
+      return reloc_type == 0; /* R_MIPS_NONE.  */
+    case EM_PARISC:
+      return reloc_type == 0; /* R_PARISC_NONE.  */
+    case EM_ALPHA:
+      return reloc_type == 0; /* R_ALPHA_NONE.  */
+    case EM_PPC:
+      return reloc_type == 0; /* R_PPC_NONE.  */
+    case EM_PPC64:
+      return reloc_type == 0; /* R_PPC64_NONE.  */
+    case EM_ARM:
+      return reloc_type == 0; /* R_ARM_NONE.  */
+    case EM_IA_64:
+      return reloc_type == 0; /* R_IA64_NONE.  */
+    case EM_SH:
+      return reloc_type == 0; /* R_SH_NONE.  */
+    case EM_S390_OLD:
+    case EM_S390:
+      return reloc_type == 0; /* R_390_NONE.  */
+    case EM_CRIS:
+      return reloc_type == 0; /* R_CRIS_NONE.  */
+    case EM_X86_64:
+      return reloc_type == 0; /* R_X86_64_NONE.  */
+    case EM_MN10300:
+      return reloc_type == 0; /* R_MN10300_NONE.  */
+    case EM_M32R:
+      return reloc_type == 0; /* R_M32R_NONE.  */
+    }
+  return FALSE;
+}
+
 /* Apply relocations to a debug section.  */
 
 static void
@@ -8419,6 +8466,9 @@
 
 	  reloc_type = get_reloc_type (rp->r_info);
 
+	  if (is_none_reloc (reloc_type))
+	    continue;
+
 	  if (is_32bit_abs_reloc (reloc_type)
 	      || is_32bit_pcrel_reloc (reloc_type))
 	    reloc_size = 4;
/cvs/src/src/ld/testsuite/ld-elf/eh-group.exp,v  -->  standard output
revision 1.1
--- ld/testsuite/ld-elf/eh-group.exp
+++ ld/testsuite/ld-elf/eh-group.exp	2008-09-21 22:56:18.321559000 +0000
@@ -0,0 +1,51 @@
+# Expect script for .eh_frame entries to a removed section.
+#   Copyright 2008  Free Software Foundation, Inc.
+#
+# This file is part of the GNU Binutils.
+#
+# 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., 51 Franklin Street - Fifth Floor, Boston,
+# MA 02110-1301, USA.
+#
+
+#
+# Written by Jan Kratochvil (jan.kratochvil at redhat.com)
+#
+# .eh_frame with relocations to a removed (group) section did result to:
+# error in tmpdir/eh-group.o(.eh_frame); no .eh_frame_hdr table will be created.
+# The purpose of this test is to merge two .o files with -r and then link this
+# merged file (containing a discarded R_X86_64_NONE relocation) to the final
+# executable trying to create .eh_frame_hdr.  It needs a separate .exp file due
+# to the requirement of two `ld' runs.
+
+# Exclude non-ELF targets.
+
+if ![is_elf_format] {
+    return
+}
+
+set build_tests_ld {
+  {"Build eh-group1.o"
+   "-r" ""
+   {eh-group1.s eh-group2.s} {} "eh-group.o"}
+}
+
+run_ld_link_tests $build_tests_ld
+
+set testname "Link eh-group.o to eh-group"
+if [ld_simple_link $ld "tmpdir/eh-group" "-e _start tmpdir/eh-group.o"] {
+    pass $testname
+} else {
+    fail $testname
+}
/cvs/src/src/ld/testsuite/ld-elf/eh-group1.s,v  -->  standard output
revision 1.1
--- ld/testsuite/ld-elf/eh-group1.s
+++ ld/testsuite/ld-elf/eh-group1.s	2008-09-21 22:56:19.003793000 +0000
@@ -0,0 +1,6 @@
+	.section	sect, "axG", @progbits, sectgroup, comdat
+	.global	_start
+_start:
+	.cfi_startproc
+	.skip 16
+	.cfi_endproc
/cvs/src/src/ld/testsuite/ld-elf/eh-group2.s,v  -->  standard output
revision 1.1
--- ld/testsuite/ld-elf/eh-group2.s
+++ ld/testsuite/ld-elf/eh-group2.s	2008-09-21 22:56:19.663297000 +0000
@@ -0,0 +1,4 @@
+	.section	sect, "axG", @progbits, sectgroup, comdat
+	.cfi_startproc
+	.skip 16
+	.cfi_endproc

http://sourceware.org/ml/binutils-cvs/2008-09/msg00107.html
http://sourceware.org/ml/binutils/2008-09/msg00145.html

testsuite/
2008-09-20  Jan Kratochvil  <jan.kratochvil at redhat.com>

	Provide virtual target "cfi" for targets supporting CFI.
	* ld-elf/eh-frame-hdr.d: Replace target and xfail statements by single
	`target: cfi'.
	* ld-elf/eh-group.exp: Call check_as_cfi instead of is_elf_format.
	* ld-elf/eh-group1.s, elf/eh-group2.s: Use more compatible section
	flags prefix '%'.
	* ld-elf/eh5.d: Replace target statement by `target: cfi' with an Alpha
	exception.  Relax the `Code alignment factor' matching.
	* lib/ld-lib.exp: Rename istarget as istarget_ld.
	(istarget, check_as_cfi): New procedure.
	(run_dump_test): New comment for the virtual target `cfi'.

===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elf/eh-frame-hdr.d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ld/testsuite/ld-elf/eh-frame-hdr.d	2006/12/04 08:57:09	1.1
+++ ld/testsuite/ld-elf/eh-frame-hdr.d	2008/09/20 08:42:53	1.2
@@ -1,17 +1,7 @@
 #source: eh-frame-hdr.s
 #ld: -e _start --eh-frame-hdr
 #objdump: -hw
-#target: alpha*-*-*
-#target: arm*-*-*
-#target: i?86-*-*
-#target: m68k-*-*
-#target: mips*-*-*
-#target: powerpc*-*-*
-#target: s390*-*-*
-#target: sh*-*-*
-#xfail: sh*l*-*-*
-#target: sparc*-*-*
-#target: x86_64-*-*
+#target: cfi
 #...
   [0-9] .eh_frame_hdr 0*[12][048c] .*
 #pass
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elf/eh-group.exp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ld/testsuite/ld-elf/eh-group.exp	2008/09/17 07:50:29	1.1
+++ ld/testsuite/ld-elf/eh-group.exp	2008/09/20 08:42:53	1.2
@@ -29,9 +29,9 @@
 # executable trying to create .eh_frame_hdr.  It needs a separate .exp file due
 # to the requirement of two `ld' runs.
 
-# Exclude non-ELF targets.
+# Exclude non-CFI (such as ia64) targets.
 
-if ![is_elf_format] {
+if {![check_as_cfi]} {
     return
 }
 
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elf/eh-group1.s,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ld/testsuite/ld-elf/eh-group1.s	2008/09/17 07:50:29	1.1
+++ ld/testsuite/ld-elf/eh-group1.s	2008/09/20 08:42:53	1.2
@@ -1,4 +1,4 @@
-	.section	sect, "axG", @progbits, sectgroup, comdat
+	.section	sect, "axG", %progbits, sectgroup, comdat
 	.global	_start
 _start:
 	.cfi_startproc
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elf/eh-group2.s,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ld/testsuite/ld-elf/eh-group2.s	2008/09/17 07:50:29	1.1
+++ ld/testsuite/ld-elf/eh-group2.s	2008/09/20 08:42:53	1.2
@@ -1,4 +1,4 @@
-	.section	sect, "axG", @progbits, sectgroup, comdat
+	.section	sect, "axG", %progbits, sectgroup, comdat
 	.cfi_startproc
 	.skip 16
 	.cfi_endproc
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elf/eh5.d,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ld/testsuite/ld-elf/eh5.d	2008/01/28 15:15:32	1.2
+++ ld/testsuite/ld-elf/eh5.d	2008/09/20 08:42:53	1.3
@@ -3,14 +3,15 @@
 #source: eh5b.s
 #ld:
 #readelf: -wf
-#target: x86_64-*-* i?86-*-*
+#target: cfi
+#notarget: alpha*
 
 The section .eh_frame contains:
 
 00000000 0000001[04] 00000000 CIE
   Version:               1
   Augmentation:          "zR"
-  Code alignment factor: 1
+  Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
   Augmentation data:     1b
@@ -29,7 +30,7 @@
 000000(2c|30) 00000014 00000000 CIE
   Version:               1
   Augmentation:          "zPR"
-  Code alignment factor: 1
+  Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
   Augmentation data:     03 .. .. .. .. 1b
@@ -53,7 +54,7 @@
 0000007[48] 0000001[8c] 00000000 CIE
   Version:               1
   Augmentation:          "zPLR"
-  Code alignment factor: 1
+  Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
   Augmentation data:     03 .. .. .. .. 0c 1b
@@ -74,7 +75,7 @@
 000000b[08] 0000001[04] 00000000 CIE
   Version:               1
   Augmentation:          "zR"
-  Code alignment factor: 1
+  Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
   Augmentation data:     1b
@@ -89,7 +90,7 @@
 000000[de]8 00000014 00000000 CIE
   Version:               1
   Augmentation:          "zPR"
-  Code alignment factor: 1
+  Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
   Augmentation data:     03 .. .. .. .. 1b
@@ -111,7 +112,7 @@
 000001(1c|30) 0000001[8c] 00000000 CIE
   Version:               1
   Augmentation:          "zPLR"
-  Code alignment factor: 1
+  Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
   Augmentation data:     03 .. .. .. .. 0c 1b
===================================================================
RCS file: /cvs/src/src/ld/testsuite/lib/ld-lib.exp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ld/testsuite/lib/ld-lib.exp	2008/02/18 11:04:09	1.54
+++ ld/testsuite/lib/ld-lib.exp	2008/09/20 08:42:53	1.55
@@ -598,7 +598,8 @@
 #
 #   target: TARGET
 #       Only run the test for TARGET.  This may occur more than once; the
-#       target being tested must match at least one.
+#       target being tested must match at least one.  You may provide target
+#       name "cfi" for any target supporting the CFI statements.
 #
 #   notarget: TARGET
 #       Do not run the test for TARGET.  This may occur more than once;
@@ -1569,3 +1570,39 @@
     }
     return $gc_sections_available_saved
 }
+
+# Check if the assembler supports CFI statements.
+
+proc check_as_cfi { } {
+    global check_as_cfi_result
+    global as
+    if [info exists check_as_cfi_result] {
+	return $check_as_cfi_result
+    }
+    set as_file "tmpdir/check_as_cfi.s"
+    set as_fh [open $as_file w 0666]
+    puts $as_fh "# Generated file. DO NOT EDIT"
+    puts $as_fh "\t.cfi_startproc"
+    puts $as_fh "\t.cfi_endproc"
+    close $as_fh
+    remote_download host $as_file
+    verbose -log "Checking CFI support:"
+    rename "perror" "check_as_cfi_perror"
+    proc perror { args } { }
+    set success [ld_assemble $as $as_file "/dev/null"]
+    rename "perror" ""
+    rename "check_as_cfi_perror" "perror"
+    #remote_file host delete $as_file
+    set check_as_cfi_result $success
+    return $success
+}
+
+# Provide virtual target "cfi" for targets supporting CFI.
+
+rename "istarget" "istarget_ld"
+proc istarget { target } {
+    if {$target == "cfi"} {
+	return [check_as_cfi]
+    }
+    return [istarget_ld $target]
+}


Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/F-9/binutils.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- binutils.spec	31 Jul 2008 07:29:49 -0000	1.135
+++ binutils.spec	22 Sep 2008 01:10:53 -0000	1.136
@@ -1,7 +1,7 @@
 Summary: A GNU collection of binary utilities.
 Name: binutils
 Version: 2.18.50.0.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -16,6 +16,7 @@
 Patch8: binutils-2.18.50.0.6-pclmul.patch
 Patch9: binutils-2.18.50.0.6-spu_ovl-fatal.patch
 Patch10: binutils-2.18.50.0.6-spu_ovl-dependency.patch
+Patch14: binutils-2.18.50.0.9-eh_frame_hdr.patch
 
 Buildroot: %{_tmppath}/binutils-root
 BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison
@@ -71,6 +72,7 @@
 %patch8 -p0 -b .pclmul~
 %patch9 -p0 -b .spu_ovl-fatal~
 %patch10 -p0 -b .spu_ovl-dependency~
+%patch14 -p0 -b .eh_frame_hdr~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -250,6 +252,9 @@
 %{_infodir}/bfd*info*
 
 %changelog
+* Sun Sep 21 2008 Jan Kratochvil <jan.kratochvil at redhat.com> 2.18.50.0.6-6
+- Fix .eh_frame_hdr build on C++ files with discarded common groups (BZ 458950).
+
 * Thu Jul 31 2008 Jan Kratochvil <jan.kratochvil at redhat.com> 2.18.50.0.6-5
 - Enable the spu target on ppc/ppc64 (BZ 455242).
 



From mclasen at fedoraproject.org  Mon Sep 22 01:24:21 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 01:24:21 +0000 (UTC)
Subject: rpms/seahorse/devel .cvsignore, 1.18, 1.19 seahorse.spec, 1.49,
	1.50 sources, 1.20, 1.21
Message-ID: <20080922012421.345CF700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/seahorse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31945

Modified Files:
	.cvsignore seahorse.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	8 Sep 2008 03:56:36 -0000	1.18
+++ .cvsignore	22 Sep 2008 01:23:50 -0000	1.19
@@ -1 +1 @@
-seahorse-2.23.92.tar.bz2
+seahorse-2.24.0.tar.bz2


Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- seahorse.spec	8 Sep 2008 03:56:36 -0000	1.49
+++ seahorse.spec	22 Sep 2008 01:23:50 -0000	1.50
@@ -1,5 +1,5 @@
 Name: 		seahorse
-Version: 	2.23.92
+Version: 	2.24.0
 Release:        1%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
@@ -7,7 +7,7 @@
 # libcryptui is LGPLv2+
 License:        GPLv2+ and LGPLv2+
 URL:            http://projects.gnome.org/seahorse/
-Source:         http://download.gnome.org/sources/seahorse/2.23/%{name}-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/seahorse/2.24/%{name}-%{version}.tar.bz2
 Patch0:         seahorse-2.23.90-gpg2.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -142,6 +142,9 @@
 %{_libdir}/pkgconfig/cryptui-0.0.pc
 
 %changelog
+* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> 2.24.0-1
+- Update to 2.24.0
+
 * Sun Sep  7 2008 Matthias Clasen <mclasen at redhat.com> 2.23.92-1
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	8 Sep 2008 03:56:36 -0000	1.20
+++ sources	22 Sep 2008 01:23:50 -0000	1.21
@@ -1 +1 @@
-4980542dcd6fcbe1d3a180c5cf3592f3  seahorse-2.23.92.tar.bz2
+e8a7836c63b3a6f5b6c1311c86b7520b  seahorse-2.24.0.tar.bz2



From mbarnes at fedoraproject.org  Mon Sep 22 01:28:12 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 22 Sep 2008 01:28:12 +0000 (UTC)
Subject: rpms/gnome-python2/devel .cvsignore, 1.35, 1.36 gnome-python2.spec, 
	1.21, 1.22 sources, 1.35, 1.36
Message-ID: <20080922012812.BE3EC700FE@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32168

Modified Files:
	.cvsignore gnome-python2.spec sources 
Log Message:

* Sun Sep 21 2008 Matthew Barnes <mbarnes at redhat.com> - 2.22.2-1.fc10
- Update to 2.22.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	16 Jun 2008 17:51:55 -0000	1.35
+++ .cvsignore	22 Sep 2008 01:27:42 -0000	1.36
@@ -1 +1 @@
-gnome-python-2.22.1.tar.bz2
+gnome-python-2.22.2.tar.bz2


Index: gnome-python2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/gnome-python2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnome-python2.spec	25 Aug 2008 16:16:33 -0000	1.21
+++ gnome-python2.spec	22 Sep 2008 01:27:42 -0000	1.22
@@ -20,8 +20,8 @@
 ### Abstract ###
 
 Name: gnome-python2
-Version: 2.22.1
-Release: 3%{?dist}
+Version: 2.22.2
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: The sources for the PyGNOME Python extension module
@@ -209,6 +209,9 @@
 rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo}
 
 %changelog
+* Sun Sep 21 2008 Matthew Barnes <mbarnes at redhat.com> - 2.22.2-1.fc10
+- Update to 2.22.2
+
 * Mon Aug 25 2008 Daniel Drake <dsd at laptop.org> - 2.22.1-3.fc10
 - Split libgnome bindings into their own package (RH bug #456122).
 - Remove gnome-python2 dependency on gnome-python2-bonobo.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	16 Jun 2008 17:51:55 -0000	1.35
+++ sources	22 Sep 2008 01:27:42 -0000	1.36
@@ -1 +1 @@
-02054115dc86617da2a80eb87a1f988b  gnome-python-2.22.1.tar.bz2
+e3237c337352e23bbee68b6e0b471dcc  gnome-python-2.22.2.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 01:36:44 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 01:36:44 +0000 (UTC)
Subject: rpms/seahorse/devel seahorse.spec,1.50,1.51
Message-ID: <20080922013644.D4D08700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/seahorse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32750

Modified Files:
	seahorse.spec 
Log Message:
damn you, intltool



Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- seahorse.spec	22 Sep 2008 01:23:50 -0000	1.50
+++ seahorse.spec	22 Sep 2008 01:36:14 -0000	1.51
@@ -1,6 +1,6 @@
 Name: 		seahorse
 Version: 	2.24.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
 # seahorse is GPLv2+
@@ -28,6 +28,7 @@
 BuildRequires:  gnome-keyring-devel
 BuildRequires:  avahi-devel
 BuildRequires:  avahi-glib-devel
+BuildRequires:	intltool
 Requires(post): desktop-file-utils
 Requires(post): GConf2
 Requires(post): scrollkeeper
@@ -142,7 +143,7 @@
 %{_libdir}/pkgconfig/cryptui-0.0.pc
 
 %changelog
-* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> 2.24.0-1
+* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> 2.24.0-2
 - Update to 2.24.0
 
 * Sun Sep  7 2008 Matthias Clasen <mclasen at redhat.com> 2.23.92-1



From mclasen at fedoraproject.org  Mon Sep 22 01:48:13 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 01:48:13 +0000 (UTC)
Subject: rpms/seahorse-plugins/devel .cvsignore, 1.4,
	1.5 seahorse-plugins.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20080922014813.8081F700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/seahorse-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1199

Modified Files:
	.cvsignore seahorse-plugins.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Sep 2008 04:03:20 -0000	1.4
+++ .cvsignore	22 Sep 2008 01:47:43 -0000	1.5
@@ -1 +1 @@
-seahorse-plugins-2.23.92.tar.bz2
+seahorse-plugins-2.24.0.tar.bz2


Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/devel/seahorse-plugins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- seahorse-plugins.spec	8 Sep 2008 04:03:20 -0000	1.4
+++ seahorse-plugins.spec	22 Sep 2008 01:47:43 -0000	1.5
@@ -1,11 +1,11 @@
 Name: 		seahorse-plugins
-Version: 	2.23.92
+Version: 	2.24.0
 Release:        1%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
 Group: 		User Interface/Desktops
 License:        GPLv2+ and GFDL
 URL:            http://projects.gnome.org/seahorse/
-Source:         http://download.gnome.org/sources/seahorse-plugins/2.23/%{name}-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/seahorse-plugins/2.24/%{name}-%{version}.tar.bz2
 Source1:	seahorse-agent.sh
 
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -171,6 +171,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> 2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> 2.23.92-1
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Sep 2008 04:03:20 -0000	1.4
+++ sources	22 Sep 2008 01:47:43 -0000	1.5
@@ -1 +1 @@
-7bc684df26243936091e07b19540bc42  seahorse-plugins-2.23.92.tar.bz2
+b2678f84f3aa45165530e4e9420ee231  seahorse-plugins-2.24.0.tar.bz2



From cjb at fedoraproject.org  Mon Sep 22 01:50:04 2008
From: cjb at fedoraproject.org (Chris Ball)
Date: Mon, 22 Sep 2008 01:50:04 +0000 (UTC)
Subject: rpms/ohm/OLPC-3 .cvsignore, 1.9, 1.10 ohm.spec, 1.11, 1.12 sources, 
	1.9, 1.10
Message-ID: <20080922015004.8A586700FE@cvs1.fedora.phx.redhat.com>

Author: cjb

Update of /cvs/pkgs/rpms/ohm/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1371

Modified Files:
	.cvsignore ohm.spec sources 
Log Message:
OLPC #8562:  Correctly preserve user-set brightness.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/OLPC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Sep 2008 17:46:36 -0000	1.9
+++ .cvsignore	22 Sep 2008 01:49:34 -0000	1.10
@@ -1 +1 @@
-ohm-0.1.1-1.20080911git.tar.gz
+ohm-0.1.1-1.20080921git.tar.gz


Index: ohm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/OLPC-3/ohm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ohm.spec	10 Sep 2008 17:46:36 -0000	1.11
+++ ohm.spec	22 Sep 2008 01:49:34 -0000	1.12
@@ -2,12 +2,12 @@
 %define gtk2_version            2.10.0
 %define dbus_version            0.70
 %define gettext_version         0.14
-%define alphatag                20080911git
+%define alphatag                20080921git
 
 Summary: Open Hardware Manager
 Name: ohm
 Version: 0.1.1
-Release: 6.20.%{alphatag}%{?dist}
+Release: 6.21.%{alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/ohm
 Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz
 
@@ -137,6 +137,9 @@
 %{_includedir}/*
 
 %changelog
+* Sun Sep 21 2008 Chris Ball <cjb at laptop.org> - 0.1.1-6.21.20080921git.olpc
+- #8562:  Correctly preserve user-set brightness.
+
 * Wed Sep 10 2008 Chris Ball <cjb at laptop.org> - 0.1.1-6.20.20080911git.olpc
 - #8062:  Bugfix -- look for automaticpm, not automatic_pm. 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/OLPC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	10 Sep 2008 17:46:36 -0000	1.9
+++ sources	22 Sep 2008 01:49:34 -0000	1.10
@@ -1 +1 @@
-e5226422e8e455a27bb5b6a38d576594  ohm-0.1.1-1.20080911git.tar.gz
+2d1dbb168f2a06427e14f564b037222a  ohm-0.1.1-1.20080921git.tar.gz



From mbarnes at fedoraproject.org  Mon Sep 22 01:51:33 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 22 Sep 2008 01:51:33 +0000 (UTC)
Subject: rpms/gnome-python2-desktop/devel .cvsignore, 1.22,
	1.23 gnome-python2-desktop.spec, 1.37, 1.38 sources, 1.22, 1.23
Message-ID: <20080922015133.7C8B3700FE@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-serv1554

Modified Files:
	.cvsignore gnome-python2-desktop.spec sources 
Log Message:

* Sun Sep 21 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.0-1.fc10
- Update to 2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	1 Sep 2008 01:03:53 -0000	1.22
+++ .cvsignore	22 Sep 2008 01:51:03 -0000	1.23
@@ -1 +1 @@
-gnome-python-desktop-2.23.1.tar.bz2
+gnome-python-desktop-2.24.0.tar.bz2


Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gnome-python2-desktop.spec	1 Sep 2008 01:03:54 -0000	1.37
+++ gnome-python2-desktop.spec	22 Sep 2008 01:51:03 -0000	1.38
@@ -1,6 +1,6 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-# Last updated for version 2.23.1
+# Last updated for version 2.24.0
 # The order here corresponds to that in configure.ac,
 # for easier comparison.  Please do not alphabetize.
 %define pygtk_version                   2.10.3
@@ -25,7 +25,7 @@
 ### Abstract ###
 
 Name: gnome-python2-desktop
-Version: 2.23.1
+Version: 2.24.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Languages
@@ -302,6 +302,9 @@
 %{python_sitearch}/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Sun Sep 21 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.0-1.fc10
+- Update to 2.24.0
+
 * Sun Aug 31 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.1-1.fc10
 - Update to 2.23.1
 - Update version requirements.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	1 Sep 2008 01:03:54 -0000	1.22
+++ sources	22 Sep 2008 01:51:03 -0000	1.23
@@ -1 +1 @@
-815174cde8eb1be3d0924f7b8a04c7ee  gnome-python-desktop-2.23.1.tar.bz2
+a6689e581fc2e67937593033be7007f9  gnome-python-desktop-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 01:53:05 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 01:53:05 +0000 (UTC)
Subject: rpms/intltool/devel .cvsignore, 1.27, 1.28 intltool.spec, 1.49,
	1.50 sources, 1.27, 1.28
Message-ID: <20080922015305.CC387700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/intltool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1851

Modified Files:
	.cvsignore intltool.spec sources 
Log Message:
0.40.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/intltool/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	25 Jul 2008 21:11:39 -0000	1.27
+++ .cvsignore	22 Sep 2008 01:52:35 -0000	1.28
@@ -1 +1 @@
-intltool-0.40.3.tar.bz2
+intltool-0.40.4.tar.bz2


Index: intltool.spec
===================================================================
RCS file: /cvs/extras/rpms/intltool/devel/intltool.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- intltool.spec	6 Aug 2008 05:01:57 -0000	1.49
+++ intltool.spec	22 Sep 2008 01:52:35 -0000	1.50
@@ -3,8 +3,8 @@
 
 Name: intltool
 Summary: Utility for internationalizing various kinds of data files
-Version: 0.40.3
-Release: 3%{?dist}
+Version: 0.40.4
+Release: 1%{?dist}
 License: GPLv2 with exceptions
 Group: Development/Tools
 Source: http://download.gnome.org/sources/intltool/0.40/%{name}-%{version}.tar.bz2
@@ -50,6 +50,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 0.40.4-1
+- Update to 0.40.4
+
 * Wed Aug  6 2008 Matthias Clasen <mclasen at redhat.com> - 0.40.3-3
 - Require gettext-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/intltool/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	25 Jul 2008 21:11:39 -0000	1.27
+++ sources	22 Sep 2008 01:52:35 -0000	1.28
@@ -1 +1 @@
-7adee54938b22d32c63ecb5223fd4249  intltool-0.40.3.tar.bz2
+585a134f8e0ab0f5cad31cc586d3fa6d  intltool-0.40.4.tar.bz2



From ausil at fedoraproject.org  Mon Sep 22 01:59:42 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 22 Sep 2008 01:59:42 +0000 (UTC)
Subject: rpms/cdpr/devel .cvsignore,1.2,1.3
Message-ID: <20080922015942.E17F9700FE@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/cdpr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2380

Modified Files:
	.cvsignore 
Log Message:
update source  it seems to have not been uploaded



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cdpr/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Oct 2007 20:24:12 -0000	1.2
+++ .cvsignore	22 Sep 2008 01:59:12 -0000	1.3
@@ -1 +1 @@
-cdpr-2.2.1.tar.gz
+cdpr-2.3.tgz



From mclasen at fedoraproject.org  Mon Sep 22 02:04:55 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 02:04:55 +0000 (UTC)
Subject: rpms/sound-juicer/devel .cvsignore, 1.48, 1.49 sound-juicer.spec,
	1.102, 1.103 sources, 1.50, 1.51
Message-ID: <20080922020455.584F9700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/sound-juicer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2730

Modified Files:
	.cvsignore sound-juicer.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sound-juicer/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	8 Sep 2008 11:47:43 -0000	1.48
+++ .cvsignore	22 Sep 2008 02:04:24 -0000	1.49
@@ -1 +1 @@
-sound-juicer-2.23.3.tar.bz2
+sound-juicer-2.24.0.tar.bz2


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/extras/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- sound-juicer.spec	8 Sep 2008 11:47:43 -0000	1.102
+++ sound-juicer.spec	22 Sep 2008 02:04:24 -0000	1.103
@@ -11,11 +11,11 @@
 
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
-Version:	2.23.3
+Version:	2.24.0
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
-Source:		http://download.gnome.org/sources/sound-juicer/2.23/%{name}-%{version}.tar.bz2
+Source:		http://download.gnome.org/sources/sound-juicer/2.24/%{name}-%{version}.tar.bz2
 URL:		http://www.burtonini.com/blog/computers/sound-juicer
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
 Requires:	cdparanoia
@@ -119,6 +119,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep 08 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.3-1
 - Update to 2.23.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sound-juicer/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	8 Sep 2008 11:47:43 -0000	1.50
+++ sources	22 Sep 2008 02:04:24 -0000	1.51
@@ -1 +1 @@
-5507bcdc6051d520c6a7aa150c2f48ba  sound-juicer-2.23.3.tar.bz2
+504979aadec8df1e59c1050bc968b2aa  sound-juicer-2.24.0.tar.bz2



From iburrell at fedoraproject.org  Mon Sep 22 02:05:12 2008
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Mon, 22 Sep 2008 02:05:12 +0000 (UTC)
Subject: rpms/perl-Module-Loaded/EL-5 perl-Module-Loaded.spec,1.2,1.3
Message-ID: <20080922020512.6CEE1700FE@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/extras/rpms/perl-Module-Loaded/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2772

Modified Files:
	perl-Module-Loaded.spec 
Log Message:
copy from F-8


Index: perl-Module-Loaded.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Loaded/EL-5/perl-Module-Loaded.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Module-Loaded.spec	17 Sep 2006 20:53:30 -0000	1.2
+++ perl-Module-Loaded.spec	22 Sep 2008 02:04:42 -0000	1.3
@@ -1,13 +1,15 @@
 Name:           perl-Module-Loaded
 Version:        0.01
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Mark modules as loaded or unloaded
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Module-Loaded/
 Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Module-Loaded-%{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
@@ -33,7 +35,7 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
@@ -48,6 +50,14 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Dec 30 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.01-4
+- Adjust License-tag.
+- BR: perl(Test::More) (BZ 419631).
+
+* Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.01-3
+- Use fixperms macro instead of our own chmod incantation.
+- BR ExtUtils::MakeMaker.
+
 * Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 0.01-2
 - Fix find option order.
 



From pkgdb at fedoraproject.org  Mon Sep 22 02:06:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:06:43 +0000
Subject: [pkgdb] perl-Module-Loaded: iburrell has requested watchbugzilla
Message-ID: <20080922020643.4DFA8208D60@bastion.fedora.phx.redhat.com>

iburrell has requested the watchbugzilla acl on perl-Module-Loaded (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Loaded



From mclasen at fedoraproject.org  Mon Sep 22 02:06:47 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 02:06:47 +0000 (UTC)
Subject: rpms/seahorse-plugins/devel seahorse-plugins.spec,1.5,1.6
Message-ID: <20080922020647.A82697013D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/seahorse-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2909

Modified Files:
	seahorse-plugins.spec 
Log Message:
fix file lists



Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/devel/seahorse-plugins.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- seahorse-plugins.spec	22 Sep 2008 01:47:43 -0000	1.5
+++ seahorse-plugins.spec	22 Sep 2008 02:06:17 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		seahorse-plugins
 Version: 	2.24.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
 Group: 		User Interface/Desktops
 License:        GPLv2+ and GFDL
@@ -163,15 +163,15 @@
 %{_mandir}/man1/seahorse-agent.1.gz
 %{_mandir}/man1/seahorse-tool.1.gz
 %{_datadir}/pixmaps/seahorse-applet.svg
-%{_datadir}/pixmaps/seahorse/22x22/*
-%{_datadir}/pixmaps/seahorse/48x48/*
-%{_datadir}/pixmaps/seahorse/scalable/*
+%{_datadir}/pixmaps/seahorse-plugins/22x22/*
+%{_datadir}/pixmaps/seahorse-plugins/48x48/*
+%{_datadir}/pixmaps/seahorse-plugins/scalable/*
 %{_datadir}/icons/hicolor/48x48/apps/seahorse-applet.png
 %{_datadir}/icons/hicolor/scalable/apps/seahorse-applet.svg
 
 
 %changelog
-* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> 2.24.0-1
+* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> 2.24.0-2
 - Update to 2.24.0
 
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> 2.23.92-1



From pkgdb at fedoraproject.org  Mon Sep 22 02:06:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:06:46 +0000
Subject: [pkgdb] perl-Module-Loaded: iburrell has requested commit
Message-ID: <20080922020647.216AB208DA3@bastion.fedora.phx.redhat.com>

iburrell has requested the commit acl on perl-Module-Loaded (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Loaded



From pkgdb at fedoraproject.org  Mon Sep 22 02:06:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:06:50 +0000
Subject: [pkgdb] perl-Module-Loaded: iburrell has requested watchcommits
Message-ID: <20080922020651.2F99E208DA9@bastion.fedora.phx.redhat.com>

iburrell has requested the watchcommits acl on perl-Module-Loaded (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Loaded



From stahnma at fedoraproject.org  Mon Sep 22 02:07:35 2008
From: stahnma at fedoraproject.org (Michael Stahnke)
Date: Mon, 22 Sep 2008 02:07:35 +0000 (UTC)
Subject: rpms/cdpr/EL-5 cdpr.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20080922020735.165477013E@cvs1.fedora.phx.redhat.com>

Author: stahnma

Update of /cvs/extras/rpms/cdpr/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3069

Modified Files:
	cdpr.spec sources 
Log Message:
New version



Index: cdpr.spec
===================================================================
RCS file: /cvs/extras/rpms/cdpr/EL-5/cdpr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdpr.spec	31 Oct 2007 20:27:59 -0000	1.1
+++ cdpr.spec	22 Sep 2008 02:07:04 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           cdpr
-Version:        2.2.1
-Release:        2%{?dist}
+Version:        2.3
+Release:        1%{?dist}
 Summary:        Cisco Discovery Protocol Analyzer
 
 Group:          Applications/System
 License:        GPLv2+ 
 URL:            http://sourceforge.net/projects/cdpr/ 
-Source0:        http://downloads.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://www.monkeymental.com/mmfiles/%{name}-%{version}.tgz
   
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,6 +45,12 @@
 
 
 %changelog
+* Sat Sep 20 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.3-1
+- New version
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2.1-3
+- Autorebuild for GCC 4.3
+
 * Mon Oct 29 2007 <stahnma at fedoraproject.org>  2.2.1-2
 - Minor SPEC file cleanup from bug # 355631
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cdpr/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Oct 2007 20:27:59 -0000	1.2
+++ sources	22 Sep 2008 02:07:04 -0000	1.3
@@ -1 +1 @@
-1e682e7e9c03f9b004c1f97c0ed25431  cdpr-2.2.1.tar.gz
+c3eeaeb2641085647f13da6ff807aa0b  cdpr-2.3.tgz



From pkgdb at fedoraproject.org  Mon Sep 22 02:07:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:07:43 +0000
Subject: [pkgdb] perl-Object-Accessor: iburrell has requested watchbugzilla
Message-ID: <20080922020744.128BD208DA0@bastion.fedora.phx.redhat.com>

iburrell has requested the watchbugzilla acl on perl-Object-Accessor (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Object-Accessor



From pkgdb at fedoraproject.org  Mon Sep 22 02:07:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:07:50 +0000
Subject: [pkgdb] perl-Object-Accessor: iburrell has requested watchcommits
Message-ID: <20080922020750.CAB3E208DA3@bastion.fedora.phx.redhat.com>

iburrell has requested the watchcommits acl on perl-Object-Accessor (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Object-Accessor



From pkgdb at fedoraproject.org  Mon Sep 22 02:07:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:07:53 +0000
Subject: [pkgdb] perl-Object-Accessor: iburrell has requested commit
Message-ID: <20080922020753.E604E208DA8@bastion.fedora.phx.redhat.com>

iburrell has requested the commit acl on perl-Object-Accessor (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Object-Accessor



From pkgdb at fedoraproject.org  Mon Sep 22 02:09:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:09:53 +0000
Subject: [pkgdb] perl-Term-UI: iburrell has requested watchbugzilla
Message-ID: <20080922020953.1B455208D60@bastion.fedora.phx.redhat.com>

iburrell has requested the watchbugzilla acl on perl-Term-UI (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-UI



From pkgdb at fedoraproject.org  Mon Sep 22 02:09:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:09:53 +0000
Subject: [pkgdb] perl-Term-UI: iburrell has requested watchcommits
Message-ID: <20080922020953.B3401208DA3@bastion.fedora.phx.redhat.com>

iburrell has requested the watchcommits acl on perl-Term-UI (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-UI



From pkgdb at fedoraproject.org  Mon Sep 22 02:10:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:10:11 +0000
Subject: [pkgdb] perl-Module-Load: iburrell has requested watchcommits
Message-ID: <20080922021011.89D74208D60@bastion.fedora.phx.redhat.com>

iburrell has requested the watchcommits acl on perl-Module-Load (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Load



From pkgdb at fedoraproject.org  Mon Sep 22 02:09:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:09:59 +0000
Subject: [pkgdb] perl-Term-UI: iburrell has requested commit
Message-ID: <20080922020959.9DE1D208DA8@bastion.fedora.phx.redhat.com>

iburrell has requested the commit acl on perl-Term-UI (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-UI



From pkgdb at fedoraproject.org  Mon Sep 22 02:10:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:10:12 +0000
Subject: [pkgdb] perl-Module-Load: iburrell has requested watchbugzilla
Message-ID: <20080922021012.6412C208DAC@bastion.fedora.phx.redhat.com>

iburrell has requested the watchbugzilla acl on perl-Module-Load (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Load



From pkgdb at fedoraproject.org  Mon Sep 22 02:10:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:10:14 +0000
Subject: [pkgdb] perl-Module-Load: iburrell has requested commit
Message-ID: <20080922021014.6F9A8208DAF@bastion.fedora.phx.redhat.com>

iburrell has requested the commit acl on perl-Module-Load (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Load



From mbarnes at fedoraproject.org  Mon Sep 22 02:10:19 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 22 Sep 2008 02:10:19 +0000 (UTC)
Subject: rpms/gnome-python2-desktop/devel gnome-python2-desktop.spec, 1.38, 
	1.39
Message-ID: <20080922021019.18D56700FE@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-serv3413

Modified Files:
	gnome-python2-desktop.spec 
Log Message:

* Sun Sep 21 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.0-1.fc10
- Update to 2.24.0



Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gnome-python2-desktop.spec	22 Sep 2008 01:51:03 -0000	1.38
+++ gnome-python2-desktop.spec	22 Sep 2008 02:09:48 -0000	1.39
@@ -35,7 +35,7 @@
 
 ### Dependencies ###
 
-Requires: gnome-python2 >= %{gnome_python_version}
+Requires: gnome-python2-canvas >= %{gnome_python_version}
 
 ### Build Dependencies ###
 



From pkgdb at fedoraproject.org  Mon Sep 22 02:10:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:10:29 +0000
Subject: [pkgdb] perl-Module-Load-Conditional: iburrell has requested
	watchcommits
Message-ID: <20080922021030.0DBA7208D60@bastion.fedora.phx.redhat.com>

iburrell has requested the watchcommits acl on perl-Module-Load-Conditional (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Load-Conditional



From pkgdb at fedoraproject.org  Mon Sep 22 02:10:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:10:35 +0000
Subject: [pkgdb] perl-Module-Load-Conditional: iburrell has requested
	watchbugzilla
Message-ID: <20080922021037.051FC208DA8@bastion.fedora.phx.redhat.com>

iburrell has requested the watchbugzilla acl on perl-Module-Load-Conditional (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Load-Conditional



From pkgdb at fedoraproject.org  Mon Sep 22 02:10:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:10:37 +0000
Subject: [pkgdb] perl-Module-Load-Conditional: iburrell has requested commit
Message-ID: <20080922021037.D40D2208DB1@bastion.fedora.phx.redhat.com>

iburrell has requested the commit acl on perl-Module-Load-Conditional (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Load-Conditional



From pkgdb at fedoraproject.org  Mon Sep 22 02:11:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:11:37 +0000
Subject: [pkgdb] perl-File-Fetch: iburrell has requested watchcommits
Message-ID: <20080922021137.68644208D60@bastion.fedora.phx.redhat.com>

iburrell has requested the watchcommits acl on perl-File-Fetch (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-Fetch



From pkgdb at fedoraproject.org  Mon Sep 22 02:11:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:11:37 +0000
Subject: [pkgdb] perl-File-Fetch: iburrell has requested watchbugzilla
Message-ID: <20080922021137.94A27208DA3@bastion.fedora.phx.redhat.com>

iburrell has requested the watchbugzilla acl on perl-File-Fetch (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-Fetch



From pkgdb at fedoraproject.org  Mon Sep 22 02:11:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:11:39 +0000
Subject: [pkgdb] perl-File-Fetch: iburrell has requested commit
Message-ID: <20080922021139.A3B0C208DA8@bastion.fedora.phx.redhat.com>

iburrell has requested the commit acl on perl-File-Fetch (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-Fetch



From pkgdb at fedoraproject.org  Mon Sep 22 02:12:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:12:30 +0000
Subject: [pkgdb] perl-IPC-Cmd: iburrell has requested watchcommits
Message-ID: <20080922021230.2B9ED208D60@bastion.fedora.phx.redhat.com>

iburrell has requested the watchcommits acl on perl-IPC-Cmd (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-Cmd



From pkgdb at fedoraproject.org  Mon Sep 22 02:12:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:12:31 +0000
Subject: [pkgdb] perl-IPC-Cmd: iburrell has requested watchbugzilla
Message-ID: <20080922021231.D9097208DA3@bastion.fedora.phx.redhat.com>

iburrell has requested the watchbugzilla acl on perl-IPC-Cmd (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-Cmd



From pkgdb at fedoraproject.org  Mon Sep 22 02:12:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 02:12:32 +0000
Subject: [pkgdb] perl-IPC-Cmd: iburrell has requested commit
Message-ID: <20080922021232.EF98D208DA8@bastion.fedora.phx.redhat.com>

iburrell has requested the commit acl on perl-IPC-Cmd (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-Cmd



From mbarnes at fedoraproject.org  Mon Sep 22 02:18:51 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 22 Sep 2008 02:18:51 +0000 (UTC)
Subject: rpms/gnome-python2-desktop/devel gnome-python2-desktop.spec, 1.39, 
	1.40
Message-ID: <20080922021851.DBF74700FE@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-serv4039

Modified Files:
	gnome-python2-desktop.spec 
Log Message:

* Sun Sep 21 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.0-2.fc10
- Change gnome-python2 requirement to gnome-python2-canvas.



Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gnome-python2-desktop.spec	22 Sep 2008 02:09:48 -0000	1.39
+++ gnome-python2-desktop.spec	22 Sep 2008 02:18:21 -0000	1.40
@@ -26,7 +26,7 @@
 
 Name: gnome-python2-desktop
 Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Languages
 Summary: The sources for additional PyGNOME Python extension modules
@@ -302,6 +302,9 @@
 %{python_sitearch}/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Sun Sep 21 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.0-2.fc10
+- Change gnome-python2 requirement to gnome-python2-canvas.
+
 * Sun Sep 21 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.0-1.fc10
 - Update to 2.24.0
 



From lmacken at fedoraproject.org  Mon Sep 22 02:46:14 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 22 Sep 2008 02:46:14 +0000 (UTC)
Subject: rpms/python-turboflot/F-8 python-turboflot.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <20080922024614.B7104700FE@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-turboflot/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5741

Modified Files:
	python-turboflot.spec sources 
Log Message:
Update to 0.1.1


Index: python-turboflot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-turboflot/F-8/python-turboflot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-turboflot.spec	8 Mar 2008 19:38:38 -0000	1.3
+++ python-turboflot.spec	22 Sep 2008 02:45:43 -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:           python-turboflot
-Version:        0.1.0
+Version:        0.1.1
 Release:        1%{?dist}
 Summary:        A TurboGears widget for Flot, a jQuery plotting library
 
@@ -44,6 +44,10 @@
 
 
 %changelog
+* Sun May 11 2008 Luke Macken <lmacken at redhat.com> - 0.1.1-1
+- Call flot only when the document is ready
+- Properly instantiate the TurboFlot widget
+
 * Sat Mar 08 2008 Luke Macken <lmacken at redhat.com> - 0.1.0-1
 - Update to jQuery 1.2.3 and flot 0.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-turboflot/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Mar 2008 19:38:38 -0000	1.4
+++ sources	22 Sep 2008 02:45:43 -0000	1.5
@@ -1 +1 @@
-fd31dbf30ff6fb7e72e50b8508d96e25  TurboFlot-0.1.0.tar.bz2
+889c4efd9c33e58dc14231fa33c39bd9  TurboFlot-0.1.1.tar.bz2



From lmacken at fedoraproject.org  Mon Sep 22 02:47:03 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 22 Sep 2008 02:47:03 +0000 (UTC)
Subject: rpms/python-turboflot/F-9 python-turboflot.spec, 1.6, 1.7 sources,
	1.7, 1.8
Message-ID: <20080922024703.1B7E4700FE@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-turboflot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5959

Modified Files:
	python-turboflot.spec sources 
Log Message:
Update to 0.1.1


Index: python-turboflot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-turboflot/F-9/python-turboflot.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-turboflot.spec	8 Mar 2008 19:03:56 -0000	1.6
+++ python-turboflot.spec	22 Sep 2008 02:46:32 -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:           python-turboflot
-Version:        0.1.0
+Version:        0.1.1
 Release:        1%{?dist}
 Summary:        A TurboGears widget for Flot, a jQuery plotting library
 
@@ -44,6 +44,10 @@
 
 
 %changelog
+* Sun May 11 2008 Luke Macken <lmacken at redhat.com> - 0.1.1-1
+- Call flot only when the document is ready
+- Properly instantiate the TurboFlot widget
+
 * Sat Mar 08 2008 Luke Macken <lmacken at redhat.com> - 0.1.0-1
 - Update to jQuery 1.2.3 and flot 0.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-turboflot/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Mar 2008 19:03:56 -0000	1.7
+++ sources	22 Sep 2008 02:46:32 -0000	1.8
@@ -1 +1 @@
-fd31dbf30ff6fb7e72e50b8508d96e25  TurboFlot-0.1.0.tar.bz2
+889c4efd9c33e58dc14231fa33c39bd9  TurboFlot-0.1.1.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 02:52:48 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 02:52:48 +0000 (UTC)
Subject: rpms/gnome-games/devel .cvsignore, 1.85, 1.86 gnome-games.spec,
	1.184, 1.185 sources, 1.90, 1.91
Message-ID: <20080922025248.D568B700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6416

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- .cvsignore	9 Sep 2008 01:40:47 -0000	1.85
+++ .cvsignore	22 Sep 2008 02:52:16 -0000	1.86
@@ -1 +1 @@
-gnome-games-2.23.92.tar.bz2
+gnome-games-2.24.0.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- gnome-games.spec	9 Sep 2008 03:04:13 -0000	1.184
+++ gnome-games.spec	22 Sep 2008 02:52:18 -0000	1.185
@@ -43,12 +43,12 @@
 
 Summary: GNOME games
 Name: gnome-games
-Version: 2.23.92
+Version: 2.24.0
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: Amusements/Games
-Source: http://download.gnome.org/sources/gnome-games/2.23/gnome-games-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-games/2.24/gnome-games-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=551455 
 Patch0: ggz-api-changes.patch
 Patch1: gnome-games-2.19.4-gnometris-rebrand.patch
@@ -348,6 +348,9 @@
 %{_datadir}/omf/*
 
 %changelog
+* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.92-1
 - Update to 2.23.92
 - Adapt to api changes in the ggz snapshot we ship


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- sources	9 Sep 2008 01:40:47 -0000	1.90
+++ sources	22 Sep 2008 02:52:18 -0000	1.91
@@ -1 +1 @@
-73071016b24cd4ced1cc78efe1b27c61  gnome-games-2.23.92.tar.bz2
+23bf4e795725a74ebb37daacda784adb  gnome-games-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 02:56:41 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 02:56:41 +0000 (UTC)
Subject: rpms/gnome-applets/devel .cvsignore, 1.68, 1.69 gnome-applets.spec, 
	1.296, 1.297 sources, 1.74, 1.75
Message-ID: <20080922025641.A1DBE700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6621

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	10 Sep 2008 01:16:21 -0000	1.68
+++ .cvsignore	22 Sep 2008 02:56:11 -0000	1.69
@@ -1 +1 @@
-gnome-applets-2.23.92.tar.bz2
+gnome-applets-2.24.0.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- gnome-applets.spec	17 Sep 2008 02:43:11 -0000	1.296
+++ gnome-applets.spec	22 Sep 2008 02:56:11 -0000	1.297
@@ -34,13 +34,13 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.23.92
-Release: 	2%{?dist}
+Version:	2.24.0
+Release: 	1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
 URL:		http://www.gnome.org/
-Source: 	http://download.gnome.org/sources/%{name}/2.23/%{name}-%{version}.tar.bz2
+Source: 	http://download.gnome.org/sources/%{name}/2.24/%{name}-%{version}.tar.bz2
 Source2:	gnome-applets-2.9.3.1-modemlights.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -312,6 +312,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-1
+- Update to 2.24.0
+
 * Tue Sep 16 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.92-2
 - Plug a leak in the trash applet
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources	10 Sep 2008 01:52:31 -0000	1.74
+++ sources	22 Sep 2008 02:56:11 -0000	1.75
@@ -1,2 +1,2 @@
-b415bc9c44070dfe09ed1d341736d64e  gnome-applets-2.23.92.tar.bz2
+8918f61153093c8032fd672ed6a0abce  gnome-applets-2.24.0.tar.bz2
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2



From iburrell at fedoraproject.org  Mon Sep 22 03:05:31 2008
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Mon, 22 Sep 2008 03:05:31 +0000 (UTC)
Subject: rpms/perl-File-Fetch/EL-5 .cvsignore, 1.4, 1.5 perl-File-Fetch.spec,
	1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20080922030531.D9EC6700FE@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/extras/rpms/perl-File-Fetch/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7296

Modified Files:
	.cvsignore perl-File-Fetch.spec sources 
Log Message:
copy from F-8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Fetch/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Jan 2007 21:04:08 -0000	1.4
+++ .cvsignore	22 Sep 2008 03:05:01 -0000	1.5
@@ -1 +1 @@
-File-Fetch-0.10.tar.gz
+File-Fetch-0.12.tar.gz


Index: perl-File-Fetch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Fetch/EL-5/perl-File-Fetch.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-File-Fetch.spec	27 Jan 2007 21:04:08 -0000	1.4
+++ perl-File-Fetch.spec	22 Sep 2008 03:05:01 -0000	1.5
@@ -1,18 +1,19 @@
 Name:           perl-File-Fetch
-Version:        0.10
+Version:        0.12
 Release:        1%{?dist}
 Summary:        Generic file fetching mechanism
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/File-Fetch/
 Source0:        http://www.cpan.org/authors/id/K/KA/KANE/File-Fetch-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(IPC::Cmd) >= 0.04
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(IPC::Cmd) >= 0.36
 BuildRequires:  perl(Locale::Maketext::Simple)
 BuildRequires:  perl(Module::Load::Conditional) >= 0.04
 BuildRequires:  perl(Params::Check) >= 0.07
-Requires:       perl(IPC::Cmd) >= 0.04
+Requires:       perl(IPC::Cmd) >= 0.36
 Requires:       perl(Module::Load::Conditional) >= 0.04
 Requires:       perl(Params::Check) >= 0.07
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -50,6 +51,14 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Oct 15 2007 Steven Pritchard <steve at kspei.com> 0.12-1
+- Update to 0.12.
+- Update License tag.
+- Update BR IPC::Cmd to >= 0.36.
+
+* Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.10-2
+- BR ExtUtils::MakeMaker.
+
 * Sat Jan 27 2007 Steven Pritchard <steve at kspei.com> 0.10-1
 - Update to 0.10.
 - Use fixperms macro instead of our own chmod incantation.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Fetch/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Jan 2007 21:04:08 -0000	1.4
+++ sources	22 Sep 2008 03:05:01 -0000	1.5
@@ -1 +1 @@
-515746879e2ef1aa780e24c1e7b7f04f  File-Fetch-0.10.tar.gz
+0ecb9505b6cafad660e84f0ed9f8a3ef  File-Fetch-0.12.tar.gz



From mclasen at fedoraproject.org  Mon Sep 22 03:06:53 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 03:06:53 +0000 (UTC)
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.297,1.298
Message-ID: <20080922030653.03BAD700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7366

Modified Files:
	gnome-applets.spec 
Log Message:
drop upstreamed patch



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- gnome-applets.spec	22 Sep 2008 02:56:11 -0000	1.297
+++ gnome-applets.spec	22 Sep 2008 03:06:22 -0000	1.298
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.24.0
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -64,9 +64,6 @@
 # do the nullapplet dance for battstat
 Patch40:	gnome-applets-null-battstat.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=552577
-Patch42:	info-leak.patch
-
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -152,7 +149,6 @@
 %patch33 -p1 -b .node-leak
 %patch39 -p1 -b .gweather-network
 %patch40 -p1 -b .battstat-null
-%patch42 -p1 -b .info-leak
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -312,7 +308,7 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
-* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-1
+* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-2
 - Update to 2.24.0
 
 * Tue Sep 16 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.92-2



From iburrell at fedoraproject.org  Mon Sep 22 03:09:03 2008
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Mon, 22 Sep 2008 03:09:03 +0000 (UTC)
Subject: rpms/perl-IPC-Cmd/EL-5 .cvsignore, 1.6, 1.7 perl-IPC-Cmd.spec, 1.5, 
	1.6 sources, 1.6, 1.7
Message-ID: <20080922030903.478FC700FE@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/extras/rpms/perl-IPC-Cmd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7668

Modified Files:
	.cvsignore perl-IPC-Cmd.spec sources 
Log Message:
copy from F-8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Nov 2006 01:09:34 -0000	1.6
+++ .cvsignore	22 Sep 2008 03:08:32 -0000	1.7
@@ -1 +1 @@
-IPC-Cmd-0.36.tar.gz
+IPC-Cmd-0.38.tar.gz


Index: perl-IPC-Cmd.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/EL-5/perl-IPC-Cmd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-IPC-Cmd.spec	25 Nov 2006 01:09:34 -0000	1.5
+++ perl-IPC-Cmd.spec	22 Sep 2008 03:08:32 -0000	1.6
@@ -1,16 +1,18 @@
 Name:           perl-IPC-Cmd
-Version:        0.36
+Version:        0.38
 Release:        1%{?dist}
 Summary:        Finding and running system commands made easy
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/IPC-Cmd/
 Source0:        http://www.cpan.org/authors/id/K/KA/KANE/IPC-Cmd-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Locale::Maketext::Simple)
 BuildRequires:  perl(Module::Load::Conditional)
 BuildRequires:  perl(Params::Check) >= 0.20
+BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -47,6 +49,14 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Oct 15 2007 Steven Pritchard <steve at kspei.com> 0.38-1
+- Update to 0.38.
+- Update License tag.
+- BR Test::More.
+
+* Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.36-2
+- BR ExtUtils::MakeMaker.
+
 * Fri Nov 24 2006 Steven Pritchard <steve at kspei.com> 0.36-1
 - Update to 0.36.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Nov 2006 01:09:34 -0000	1.6
+++ sources	22 Sep 2008 03:08:32 -0000	1.7
@@ -1 +1 @@
-56c6a27022ba5ebc2701364313f751b9  IPC-Cmd-0.36.tar.gz
+3f0b171081b946c3fb836eb0b10e4dc5  IPC-Cmd-0.38.tar.gz



From iburrell at fedoraproject.org  Mon Sep 22 03:10:33 2008
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Mon, 22 Sep 2008 03:10:33 +0000 (UTC)
Subject: rpms/perl-Log-Message/EL-5 perl-Log-Message.spec,1.2,1.3
Message-ID: <20080922031033.51B757013F@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/extras/rpms/perl-Log-Message/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7893

Modified Files:
	perl-Log-Message.spec 
Log Message:
copy from F-8


Index: perl-Log-Message.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Message/EL-5/perl-Log-Message.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Log-Message.spec	17 Sep 2006 20:51:10 -0000	1.2
+++ perl-Log-Message.spec	22 Sep 2008 03:10:02 -0000	1.3
@@ -1,16 +1,18 @@
 Name:           perl-Log-Message
 Version:        0.01
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Generic message storage mechanism
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Log-Message/
 Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Log-Message-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Locale::Maketext::Simple)
 BuildRequires:  perl(Module::Load)
 BuildRequires:  perl(Params::Check)
+BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -36,7 +38,7 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
@@ -51,6 +53,14 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Dec 30 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.01-4
+- Adjust License-tag.
+- BR: perl(Test::More) (BZ 419631).
+
+* Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.01-3
+- Use fixperms macro instead of our own chmod incantation.
+- BR ExtUtils::MakeMaker.
+
 * Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 0.01-2
 - Fix find option order.
 



From iburrell at fedoraproject.org  Mon Sep 22 03:12:23 2008
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Mon, 22 Sep 2008 03:12:23 +0000 (UTC)
Subject: rpms/perl-Module-Load-Conditional/EL-5 .cvsignore, 1.6,
	1.7 perl-Module-Load-Conditional.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20080922031223.B96CC700FE@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/extras/rpms/perl-Module-Load-Conditional/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8240

Modified Files:
	.cvsignore perl-Module-Load-Conditional.spec sources 
Log Message:
copy from F-8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Load-Conditional/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Jan 2007 21:07:33 -0000	1.6
+++ .cvsignore	22 Sep 2008 03:11:53 -0000	1.7
@@ -1 +1 @@
-Module-Load-Conditional-0.16.tar.gz
+Module-Load-Conditional-0.18.tar.gz


Index: perl-Module-Load-Conditional.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Load-Conditional/EL-5/perl-Module-Load-Conditional.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Module-Load-Conditional.spec	27 Jan 2007 21:07:33 -0000	1.6
+++ perl-Module-Load-Conditional.spec	22 Sep 2008 03:11:53 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Module-Load-Conditional
-Version:        0.16
+Version:        0.18
 Release:        1%{?dist}
 Summary:        Looking up module information / loading at runtime
 License:        GPL or Artistic
@@ -8,9 +8,11 @@
 Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Module-Load-Conditional-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Locale::Maketext::Simple)
 BuildRequires:  perl(Module::Load)
 BuildRequires:  perl(Params::Check)
+BuildRequires:  perl(Test::More)
 BuildRequires:  perl(version) >= 0.69
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -48,6 +50,13 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 18 2007 Steven Pritchard <steve at kspei.com> 0.18-1
+- Update to 0.18.
+- BR Test::More.
+
+* Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.16-2
+- BR ExtUtils::MakeMaker.
+
 * Sat Jan 27 2007 Steven Pritchard <steve at kspei.com> 0.16-1
 - Update to 0.16.
 - BR: version.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Load-Conditional/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Jan 2007 21:07:33 -0000	1.6
+++ sources	22 Sep 2008 03:11:53 -0000	1.7
@@ -1 +1 @@
-fae73541e0b1d87d0bbe6e1676e5e738  Module-Load-Conditional-0.16.tar.gz
+8c5c2b0ae465cbbcca433bd8a2040ec3  Module-Load-Conditional-0.18.tar.gz



From iburrell at fedoraproject.org  Mon Sep 22 03:13:36 2008
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Mon, 22 Sep 2008 03:13:36 +0000 (UTC)
Subject: rpms/perl-Object-Accessor/EL-5 perl-Object-Accessor.spec,1.6,1.7
Message-ID: <20080922031336.BD053700FE@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/extras/rpms/perl-Object-Accessor/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8361

Modified Files:
	perl-Object-Accessor.spec 
Log Message:
copy fron F-8


Index: perl-Object-Accessor.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-Accessor/EL-5/perl-Object-Accessor.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Object-Accessor.spec	17 Oct 2006 20:39:47 -0000	1.6
+++ perl-Object-Accessor.spec	22 Sep 2008 03:13:06 -0000	1.7
@@ -1,13 +1,15 @@
 Name:           perl-Object-Accessor
 Version:        0.32
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Perl module that allows per object accessors
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Object-Accessor/
 Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Object-Accessor-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Params::Check) >= 0.23
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -45,6 +47,13 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 02 2008 Ralf Cors??pius <rc040203 at freenet.de> 0.32-3
+- Adjust License-tag.
+- BR: perl(Test::More) (BZ 419631).
+
+* Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.32-2
+- BR ExtUtils::MakeMaker.
+
 * Tue Oct 17 2006 Steven Pritchard <steve at kspei.com> 0.32-1
 - Update to 0.32.
 - Use fixperms macro instead of our own chmod incantation.



From iburrell at fedoraproject.org  Mon Sep 22 03:17:47 2008
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Mon, 22 Sep 2008 03:17:47 +0000 (UTC)
Subject: rpms/perl-Term-UI/EL-5 .cvsignore, 1.3, 1.4 perl-Term-UI.spec, 1.3, 
	1.4 sources, 1.3, 1.4
Message-ID: <20080922031747.635BB700FE@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/extras/rpms/perl-Term-UI/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8631

Modified Files:
	.cvsignore perl-Term-UI.spec sources 
Log Message:
copy from F-8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Term-UI/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Nov 2006 22:40:19 -0000	1.3
+++ .cvsignore	22 Sep 2008 03:17:17 -0000	1.4
@@ -1 +1 @@
-Term-UI-0.14.tar.gz
+Term-UI-0.16.tar.gz


Index: perl-Term-UI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Term-UI/EL-5/perl-Term-UI.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Term-UI.spec	3 Nov 2006 22:40:19 -0000	1.3
+++ perl-Term-UI.spec	22 Sep 2008 03:17:17 -0000	1.4
@@ -1,16 +1,18 @@
 Name:           perl-Term-UI
-Version:        0.14
+Version:        0.16
 Release:        1%{?dist}
 Summary:        Term::ReadLine UI made easy
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Term-UI/
 Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Term-UI-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Locale::Maketext::Simple)
 BuildRequires:  perl(Log::Message::Simple)
 BuildRequires:  perl(Params::Check)
+BuildRequires:  perl(Test::More)
 Requires:       perl(Log::Message::Simple)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -49,6 +51,14 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Oct 15 2007 Steven Pritchard <steve at kspei.com> 0.16-1
+- Update to 0.16.
+- Update License tag.
+- BR Test::More.
+
+* Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.14-2
+- BR ExtUtils::MakeMaker.
+
 * Fri Nov 03 2006 Steven Pritchard <steve at kspei.com> 0.14-1
 - Update to 0.14.
 - Use fixperms macro instead of our own chmod incantation.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Term-UI/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Nov 2006 22:40:19 -0000	1.3
+++ sources	22 Sep 2008 03:17:17 -0000	1.4
@@ -1 +1 @@
-a929235d67c718af3d1d431987796cd8  Term-UI-0.14.tar.gz
+0ca48478aaabe10c8c1134d970bab9fb  Term-UI-0.16.tar.gz



From mclasen at fedoraproject.org  Mon Sep 22 03:18:20 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 03:18:20 +0000 (UTC)
Subject: rpms/gtksourceview2/devel .cvsignore, 1.18, 1.19 gtksourceview2.spec,
	1.20, 1.21 sources, 1.18, 1.19
Message-ID: <20080922031820.8E381700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtksourceview2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8669

Modified Files:
	.cvsignore gtksourceview2.spec sources 
Log Message:
2.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	8 Sep 2008 20:28:16 -0000	1.18
+++ .cvsignore	22 Sep 2008 03:17:50 -0000	1.19
@@ -1 +1 @@
-gtksourceview-2.3.3.tar.bz2
+gtksourceview-2.4.0.tar.bz2


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/gtksourceview2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gtksourceview2.spec	8 Sep 2008 20:28:16 -0000	1.20
+++ gtksourceview2.spec	22 Sep 2008 03:17:50 -0000	1.21
@@ -5,13 +5,13 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview2
-Version: 2.3.3
+Version: 2.4.0
 Release: 1%{?dist} 
 License: LGPLv2+ and GPLv2+
 # the library itself is LGPL, some .lang files are GPL
 Group: System Environment/Libraries
 URL: http://gtksourceview.sourceforge.net/ 
-Source0: http://download.gnome.org/sources/gtksourceview/2.3/gtksourceview-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gtksourceview/2.4/gtksourceview-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: gnome-vfs2-devel
 BuildRequires: libxml2-devel
@@ -81,6 +81,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 2.4.0-1
+- Update to 2.4.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.3.3-1
 - Update to 2.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	8 Sep 2008 20:28:16 -0000	1.18
+++ sources	22 Sep 2008 03:17:50 -0000	1.19
@@ -1 +1 @@
-0586cd267ad5478771d65ff16074a87a  gtksourceview-2.3.3.tar.bz2
+e27588c897cd3a49d81b85466aec817f  gtksourceview-2.4.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 03:29:44 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 03:29:44 +0000 (UTC)
Subject: rpms/pygtksourceview/devel .cvsignore, 1.10,
	1.11 pygtksourceview.spec, 1.19, 1.20 sources, 1.10, 1.11
Message-ID: <20080922032944.764E7700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/pygtksourceview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9336

Modified Files:
	.cvsignore pygtksourceview.spec sources 
Log Message:
2.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pygtksourceview/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Mar 2008 23:43:22 -0000	1.10
+++ .cvsignore	22 Sep 2008 03:29:12 -0000	1.11
@@ -1 +1 @@
-pygtksourceview-2.2.0.tar.bz2
+pygtksourceview-2.4.0.tar.bz2


Index: pygtksourceview.spec
===================================================================
RCS file: /cvs/extras/rpms/pygtksourceview/devel/pygtksourceview.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pygtksourceview.spec	29 Aug 2008 21:08:09 -0000	1.19
+++ pygtksourceview.spec	22 Sep 2008 03:29:12 -0000	1.20
@@ -1,19 +1,19 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %define pygtk_version 2.8.0
-%define pygobject_version 2.8.0
-%define gtksourceview_version 2.1.2
+%define pygobject_version 2.15.2
+%define gtksourceview_version 2.3.0
 
 Name:           pygtksourceview
-Version:        2.2.0
-Release:        2%{?dist}
+Version:        2.4.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.2/pygtksourceview-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/pygtksourceview/2.4/pygtksourceview-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtksourceview2-devel >= %{gtksourceview_version}
@@ -76,6 +76,9 @@
 %{_datadir}/gtk-doc/html/pygtksourceview2
 
 %changelog
+* Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 2.4.0-1
+- Update to 2.4.0
+
 * Fri Aug 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.2.0-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pygtksourceview/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Mar 2008 23:43:22 -0000	1.10
+++ sources	22 Sep 2008 03:29:12 -0000	1.11
@@ -1 +1 @@
-5dd0a9aa99168f989ed04123a65077e4  pygtksourceview-2.2.0.tar.bz2
+436e2ec467035a8cd174b794932e4cdc  pygtksourceview-2.4.0.tar.bz2



From transif at fedoraproject.org  Mon Sep 22 04:51:29 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Mon, 22 Sep 2008 04:51:29 +0000 (UTC)
Subject: comps/po zh_CN.po,1.18,1.19
Message-ID: <20080922045129.42110700FE@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13052/po

Modified Files:
	zh_CN.po 
Log Message:
    2008-09-22  Wei Liu <lliu at redhat.com> (via leahliu at fedoraproject.org)
    
      * po/zh_CN.po: updated zh_CN translation
    



Index: zh_CN.po
===================================================================
RCS file: /cvs/pkgs/comps/po/zh_CN.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- zh_CN.po	17 Sep 2008 22:44:38 -0000	1.18
+++ zh_CN.po	22 Sep 2008 04:50:57 -0000	1.19
@@ -13,8 +13,8 @@
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-09-12 10:18+1000\n"
+"POT-Creation-Date: 2008-09-18 01:23+0000\n"
+"PO-Revision-Date: 2008-09-18 13:54+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"
@@ -400,14 +400,12 @@
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:81
-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:82 ../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
@@ -643,8 +641,7 @@
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
 #: ../comps-f10.xml.in.h:143 ../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:137
@@ -682,8 +679,7 @@
 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:144
 #: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
@@ -766,8 +762,7 @@
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
 #: ../comps-f10.xml.in.h:169
-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:160
@@ -777,20 +772,17 @@
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
 #: ../comps-f10.xml.in.h:171
-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:162
 #: ../comps-f10.xml.in.h:172 ../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:163
 #: ../comps-f10.xml.in.h:173
-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:164
@@ -897,14 +889,12 @@
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
 #: ../comps-f10.xml.in.h:190 ../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:181
 #: ../comps-f10.xml.in.h:191 ../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:182
@@ -912,13 +902,11 @@
 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:183
 #: ../comps-f10.xml.in.h:193
-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:184
@@ -1139,14 +1127,12 @@
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "???????????????"
+msgstr "?????????????????????"
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "????????????"
+msgstr "???????????????"
 
 #: ../comps-f10.xml.in.h:110
 msgid "Maithili Support"
@@ -1157,9 +1143,8 @@
 msgstr "???????????????"
 
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "???????????????"
+msgstr "???????????????"
 
 #: ../comps-f10.xml.in.h:156
 msgid "Support for developing programs in the Haskell programming language."
@@ -1201,8 +1186,7 @@
 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."
@@ -1221,18 +1205,15 @@
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "???????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1240,6 +1221,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??????????????????????????????????????????????????????"
+



From pkgdb at fedoraproject.org  Mon Sep 22 06:04:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 06:04:14 +0000
Subject: [pkgdb] freetennis had group_acl changed
Message-ID: <20080922060415.14D16208D9E@bastion.fedora.phx.redhat.com>

rjones has set the commit acl on freetennis (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetennis



From rjones at fedoraproject.org  Mon Sep 22 06:07:08 2008
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 22 Sep 2008 06:07:08 +0000 (UTC)
Subject: rpms/freetennis/devel freetennis.spec,1.9,1.10
Message-ID: <20080922060708.2BB75700FE@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/freetennis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17031

Modified Files:
	freetennis.spec 
Log Message:
* Mon Sep 22 2008 Richard W.M. Jones <rjones at redhat.com> - 0.4.8-13
- patch -> patch0 (rhbz #463055).



Index: freetennis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freetennis/devel/freetennis.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- freetennis.spec	18 Jul 2008 19:45:35 -0000	1.9
+++ freetennis.spec	22 Sep 2008 06:06:36 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           freetennis
 Version:        0.4.8
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Tennis simulation game
 
 Group:          Amusements/Games
@@ -34,7 +34,7 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 
 %build
 make %{?_smp_mflags}
@@ -79,6 +79,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/freetennis.png
 
 %changelog
+* Mon Sep 22 2008 Richard W.M. Jones <rjones at redhat.com> - 0.4.8-13
+- patch -> patch0 (rhbz #463055).
+
 * Fri Jul 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.8-12
 - fix license tag
 



From sharkcz at fedoraproject.org  Mon Sep 22 06:13:48 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 22 Sep 2008 06:13:48 +0000 (UTC)
Subject: rpms/codeblocks/F-8 codeblocks-run.patch, NONE,
	1.1 codeblocks-desktop.patch, 1.1, 1.2 codeblocks.spec, 1.24, 1.25
Message-ID: <20080922061349.01862700FE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/codeblocks/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17624

Modified Files:
	codeblocks-desktop.patch codeblocks.spec 
Added Files:
	codeblocks-run.patch 
Log Message:
* Sat Sep 20 2008 Dan Horak <dan[at]danny.cz> 8.02-2
- update desktop file
- fix running console applications (#461120)


codeblocks-run.patch:

--- NEW FILE codeblocks-run.patch ---
Index: src/plugins/compilergcc/compilergcc.cpp
===================================================================
--- src/plugins/compilergcc/compilergcc.cpp	(revision 5202)
+++ src/plugins/compilergcc/compilergcc.cpp	(working copy)
@@ -1723,6 +1723,7 @@
 
     wxString cmd;
     wxString command;
+    bool has_explicit_shell = false;
     wxFileName f(out);
     f.MakeAbsolute(m_Project->GetBasePath());
 
@@ -1770,6 +1771,9 @@
                 //  and its use for such purposes should be strictly banned!"
                 //                 -- Csh Programming Considered Harmful
                 command << DEFAULT_CONSOLE_SHELL << strSPACE;
+                
+                has_explicit_shell = true;
+                command << _T("'");
             }
         }
 
@@ -1820,6 +1824,9 @@
         return -1;
     }
 
+    if (has_explicit_shell)
+	command << _T("'");
+
     wxString script = command;
 
     if (platform::macosx)

codeblocks-desktop.patch:

Index: codeblocks-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/codeblocks/F-8/codeblocks-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks-desktop.patch	13 Sep 2006 20:21:13 -0000	1.1
+++ codeblocks-desktop.patch	22 Sep 2008 06:13:48 -0000	1.2
@@ -1,7 +1,19 @@
 --- codeblocks/src/setup/mime/codeblocks.desktop.old	2006-09-09 18:03:05.000000000 +0200
 +++ codeblocks/src/setup/mime/codeblocks.desktop	2006-09-10 10:37:08.000000000 +0200
-@@ -11,4 +11,3 @@
- Categories=Application;Development;
- StartupNotify=false
+@@ -1,14 +1,12 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ Name=Code::Blocks IDE
+ Comment=Configurable and extensible IDE
+ Exec=codeblocks %F
+-Icon=codeblocks.png
++Icon=codeblocks
+ Terminal=false
+ X-MultipleArgs=false
+ Type=Application
+-Categories=Application;Development;
++Categories=Development;
+ StartupNotify=true
  MimeType=application/x-codeblocks;application/x-codeblocks-workspace;
 -GenericName[en_GR]=


Index: codeblocks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/codeblocks/F-8/codeblocks.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- codeblocks.spec	2 Mar 2008 15:29:02 -0000	1.24
+++ codeblocks.spec	22 Sep 2008 06:13:48 -0000	1.25
@@ -1,6 +1,6 @@
 Name:		codeblocks
 Version:	8.02
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPLv3+
@@ -13,8 +13,12 @@
 BuildRequires:	desktop-file-utils
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	shared-mime-info
+# Fedora packaging rules
 Patch1:		codeblocks-plugins.patch
+# update to recent standards (http://developer.berlios.de/patch/?func=detailpatch&patch_id=2567&group_id=5358)
 Patch2:		codeblocks-desktop.patch
+# bug #461120 (http://developer.berlios.de/patch/?func=detailpatch&patch_id=2568&group_id=5358)
+Patch3:		codeblocks-run.patch
 
 %description
 Code::Blocks is a free C++ IDE built specifically to meet the most demanding
@@ -66,6 +70,7 @@
 %setup -q
 %patch1
 %patch2 -p1
+%patch3 -p0 -b .run
 
 # convert EOLs
 find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix --keepdate &> /dev/null
@@ -253,6 +258,10 @@
 
 
 %changelog
+* Sat Sep 20 2008 Dan Horak <dan[at]danny.cz> 8.02-2
+- update desktop file
+- fix running console applications (#461120)
+
 * Sun Mar  2 2008 Dan Horak <dan[at]danny.cz> 8.02-1
 - update to stable release 8.02
 - update BR to use system libraries



From alexlan at fedoraproject.org  Mon Sep 22 06:14:30 2008
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Mon, 22 Sep 2008 06:14:30 +0000 (UTC)
Subject: rpms/evolution-brutus/devel .cvsignore, 1.10,
	1.11 evolution-brutus.spec, 1.16, 1.17 sources, 1.10, 1.11
Message-ID: <20080922061430.51597700FE@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/evolution-brutus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17666

Modified Files:
	.cvsignore evolution-brutus.spec sources 
Log Message:
- Update to 1.2.27



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-brutus/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Sep 2008 10:07:13 -0000	1.10
+++ .cvsignore	22 Sep 2008 06:13:59 -0000	1.11
@@ -1 +1 @@
-evolution-brutus-1.2.20.tar.gz
+evolution-brutus-1.2.27.tar.gz


Index: evolution-brutus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-brutus/devel/evolution-brutus.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- evolution-brutus.spec	21 Sep 2008 10:07:13 -0000	1.16
+++ evolution-brutus.spec	22 Sep 2008 06:14:00 -0000	1.17
@@ -4,7 +4,7 @@
 %define eds_base_version 2.24
 
 Name:		evolution-brutus
-Version:	1.2.20
+Version:	1.2.27
 Release:	1%{?dist}
 Summary:	Brutus based Exchange connector for Novell Evolution 2.4 and later
 
@@ -120,8 +120,8 @@
 
 
 %changelog
-* Sun Sep 21 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.20-1
-- Update to 1.2.20
+* Sun Sep 21 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.27-1
+- Update to 1.2.27
 
 * Thu Sep 11 2008 Jesse Keating <jkeating at redhat.com> - 1.2.17-2
 - Rebuild for broken deps.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-brutus/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	21 Sep 2008 10:07:13 -0000	1.10
+++ sources	22 Sep 2008 06:14:00 -0000	1.11
@@ -1 +1 @@
-ebc9eb44b3ff724dec68258444bf7506  evolution-brutus-1.2.20.tar.gz
+4ee3864f9832eb58f3902302b579ea7b  evolution-brutus-1.2.27.tar.gz



From sharkcz at fedoraproject.org  Mon Sep 22 06:19:28 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 22 Sep 2008 06:19:28 +0000 (UTC)
Subject: rpms/codeblocks/F-9 codeblocks-run.patch, NONE,
	1.1 codeblocks-desktop.patch, 1.1, 1.2 codeblocks.spec, 1.25, 1.26
Message-ID: <20080922061928.D79F57013F@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18142

Modified Files:
	codeblocks-desktop.patch codeblocks.spec 
Added Files:
	codeblocks-run.patch 
Log Message:
* Sat Sep 20 2008 Dan Horak <dan[at]danny.cz> 8.02-2
- update desktop file
- fix running console applications (#461120)


codeblocks-run.patch:

--- NEW FILE codeblocks-run.patch ---
Index: src/plugins/compilergcc/compilergcc.cpp
===================================================================
--- src/plugins/compilergcc/compilergcc.cpp	(revision 5202)
+++ src/plugins/compilergcc/compilergcc.cpp	(working copy)
@@ -1723,6 +1723,7 @@
 
     wxString cmd;
     wxString command;
+    bool has_explicit_shell = false;
     wxFileName f(out);
     f.MakeAbsolute(m_Project->GetBasePath());
 
@@ -1770,6 +1771,9 @@
                 //  and its use for such purposes should be strictly banned!"
                 //                 -- Csh Programming Considered Harmful
                 command << DEFAULT_CONSOLE_SHELL << strSPACE;
+                
+                has_explicit_shell = true;
+                command << _T("'");
             }
         }
 
@@ -1820,6 +1824,9 @@
         return -1;
     }
 
+    if (has_explicit_shell)
+	command << _T("'");
+
     wxString script = command;
 
     if (platform::macosx)

codeblocks-desktop.patch:

Index: codeblocks-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/F-9/codeblocks-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks-desktop.patch	13 Sep 2006 20:21:13 -0000	1.1
+++ codeblocks-desktop.patch	22 Sep 2008 06:18:58 -0000	1.2
@@ -1,7 +1,19 @@
 --- codeblocks/src/setup/mime/codeblocks.desktop.old	2006-09-09 18:03:05.000000000 +0200
 +++ codeblocks/src/setup/mime/codeblocks.desktop	2006-09-10 10:37:08.000000000 +0200
-@@ -11,4 +11,3 @@
- Categories=Application;Development;
- StartupNotify=false
+@@ -1,14 +1,12 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ Name=Code::Blocks IDE
+ Comment=Configurable and extensible IDE
+ Exec=codeblocks %F
+-Icon=codeblocks.png
++Icon=codeblocks
+ Terminal=false
+ X-MultipleArgs=false
+ Type=Application
+-Categories=Application;Development;
++Categories=Development;
+ StartupNotify=true
  MimeType=application/x-codeblocks;application/x-codeblocks-workspace;
 -GenericName[en_GR]=


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/F-9/codeblocks.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- codeblocks.spec	2 Mar 2008 14:06:30 -0000	1.25
+++ codeblocks.spec	22 Sep 2008 06:18:58 -0000	1.26
@@ -1,6 +1,6 @@
 Name:		codeblocks
 Version:	8.02
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPLv3+
@@ -13,8 +13,12 @@
 BuildRequires:	desktop-file-utils
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	shared-mime-info
+# Fedora packaging rules
 Patch1:		codeblocks-plugins.patch
+# update to recent standards (http://developer.berlios.de/patch/?func=detailpatch&patch_id=2567&group_id=5358)
 Patch2:		codeblocks-desktop.patch
+# bug #461120 (http://developer.berlios.de/patch/?func=detailpatch&patch_id=2568&group_id=5358)
+Patch3:		codeblocks-run.patch
 
 %description
 Code::Blocks is a free C++ IDE built specifically to meet the most demanding
@@ -66,6 +70,7 @@
 %setup -q
 %patch1
 %patch2 -p1
+%patch3 -p0 -b .run
 
 # convert EOLs
 find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix --keepdate &> /dev/null
@@ -253,6 +258,10 @@
 
 
 %changelog
+* Sat Sep 20 2008 Dan Horak <dan[at]danny.cz> 8.02-2
+- update desktop file
+- fix running console applications (#461120)
+
 * Sun Mar  2 2008 Dan Horak <dan[at]danny.cz> 8.02-1
 - update to stable release 8.02
 - update BR to use system libraries



From rjones at fedoraproject.org  Mon Sep 22 06:25:27 2008
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 22 Sep 2008 06:25:27 +0000 (UTC)
Subject: rpms/ocaml-lablgtk/devel ocaml-lablgtk.spec,1.10,1.11
Message-ID: <20080922062527.65A53700FE@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-lablgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18787

Modified Files:
	ocaml-lablgtk.spec 
Log Message:
Ignore bogus requires GtkSourceView_types.



Index: ocaml-lablgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lablgtk/devel/ocaml-lablgtk.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ocaml-lablgtk.spec	18 Sep 2008 11:49:58 -0000	1.10
+++ ocaml-lablgtk.spec	22 Sep 2008 06:24:56 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           ocaml-lablgtk
 Version:        2.10.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
@@ -34,7 +34,7 @@
 
 
 %define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
+%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i GtkSourceView_types
 %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
 
@@ -148,6 +148,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Richard W.M. Jones <rjones at redhat.com> - 2.10.1-5
+- Ignore bogus requires GtkSourceView_types.
+
 * Thu Sep 18 2008 Richard W.M. Jones <rjones at redhat.com> - 2.10.1-4
 - Add missing BR for gtksourceview-devel (rhbz#462651).
 



From rjones at fedoraproject.org  Mon Sep 22 06:28:56 2008
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 22 Sep 2008 06:28:56 +0000 (UTC)
Subject: rpms/freetennis/devel freetennis.spec,1.10,1.11
Message-ID: <20080922062856.F0040700FE@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/freetennis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19236

Modified Files:
	freetennis.spec 
Log Message:
BR ocaml-lablgtk >= 2.10.1-5



Index: freetennis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freetennis/devel/freetennis.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- freetennis.spec	22 Sep 2008 06:06:36 -0000	1.10
+++ freetennis.spec	22 Sep 2008 06:28:26 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:           freetennis
 Version:        0.4.8
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Tennis simulation game
 
 Group:          Amusements/Games
@@ -16,12 +16,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ocaml, SDL_gfx-devel, SDL_mixer-devel, gdk-pixbuf-devel 
-BuildRequires:  lablgtk, libXmu-devel, gtk2-devel, desktop-file-utils
+BuildRequires:  libXmu-devel, gtk2-devel, desktop-file-utils
 BuildRequires:  SDL_ttf-devel
 BuildRequires:  ocaml-camlimages-devel
 BuildRequires:  ocaml-SDL-devel >= 0.7.2-8
 BuildRequires:  ocaml-lablgl-devel
-BuildRequires:  ocaml-lablgtk-devel
+BuildRequires:  ocaml-lablgtk-devel >= 2.10.1-5
 
 %define _use_internal_dependency_generator 0
 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
@@ -79,8 +79,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/freetennis.png
 
 %changelog
-* Mon Sep 22 2008 Richard W.M. Jones <rjones at redhat.com> - 0.4.8-13
+* Mon Sep 22 2008 Richard W.M. Jones <rjones at redhat.com> - 0.4.8-14
 - patch -> patch0 (rhbz #463055).
+- BR ocaml-lablgtk >= 2.10.1-5
 
 * Fri Jul 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.8-12
 - fix license tag



From sharkcz at fedoraproject.org  Mon Sep 22 06:29:05 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 22 Sep 2008 06:29:05 +0000 (UTC)
Subject: rpms/codeblocks/devel codeblocks-run.patch, NONE,
	1.1 codeblocks-desktop.patch, 1.2, 1.3 codeblocks.spec, 1.26, 1.27
Message-ID: <20080922062905.B9EAB700FE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19332

Modified Files:
	codeblocks-desktop.patch codeblocks.spec 
Added Files:
	codeblocks-run.patch 
Log Message:
* Sat Sep 20 2008 Dan Horak <dan[at]danny.cz> 8.02-3
- update desktop file
- fix running console applications (#461120)


codeblocks-run.patch:

--- NEW FILE codeblocks-run.patch ---
Index: src/plugins/compilergcc/compilergcc.cpp
===================================================================
--- src/plugins/compilergcc/compilergcc.cpp	(revision 5202)
+++ src/plugins/compilergcc/compilergcc.cpp	(working copy)
@@ -1723,6 +1723,7 @@
 
     wxString cmd;
     wxString command;
+    bool has_explicit_shell = false;
     wxFileName f(out);
     f.MakeAbsolute(m_Project->GetBasePath());
 
@@ -1770,6 +1771,9 @@
                 //  and its use for such purposes should be strictly banned!"
                 //                 -- Csh Programming Considered Harmful
                 command << DEFAULT_CONSOLE_SHELL << strSPACE;
+                
+                has_explicit_shell = true;
+                command << _T("'");
             }
         }
 
@@ -1820,6 +1824,9 @@
         return -1;
     }
 
+    if (has_explicit_shell)
+	command << _T("'");
+
     wxString script = command;
 
     if (platform::macosx)

codeblocks-desktop.patch:

Index: codeblocks-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks-desktop.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- codeblocks-desktop.patch	29 Aug 2008 05:53:16 -0000	1.2
+++ codeblocks-desktop.patch	22 Sep 2008 06:29:05 -0000	1.3
@@ -1,8 +1,19 @@
-diff -Nrup -x'*.orig' codeblocks-8.02.orig/src/setup/mime/codeblocks.desktop codeblocks-8.02/src/setup/mime/codeblocks.desktop
---- codeblocks-8.02.orig/src/setup/mime/codeblocks.desktop	2007-03-01 12:24:27.000000000 +0100
-+++ codeblocks-8.02/src/setup/mime/codeblocks.desktop	2008-08-29 07:40:30.000000000 +0200
-@@ -11,4 +11,3 @@ Type=Application
- Categories=Application;Development;
+--- codeblocks/src/setup/mime/codeblocks.desktop.old	2006-09-09 18:03:05.000000000 +0200
++++ codeblocks/src/setup/mime/codeblocks.desktop	2006-09-10 10:37:08.000000000 +0200
+@@ -1,14 +1,12 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ Name=Code::Blocks IDE
+ Comment=Configurable and extensible IDE
+ Exec=codeblocks %F
+-Icon=codeblocks.png
++Icon=codeblocks
+ Terminal=false
+ X-MultipleArgs=false
+ Type=Application
+-Categories=Application;Development;
++Categories=Development;
  StartupNotify=true
  MimeType=application/x-codeblocks;application/x-codeblocks-workspace;
 -GenericName[en_GR]=


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- codeblocks.spec	29 Aug 2008 05:53:16 -0000	1.26
+++ codeblocks.spec	22 Sep 2008 06:29:05 -0000	1.27
@@ -1,6 +1,6 @@
 Name:		codeblocks
 Version:	8.02
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPLv3+
@@ -13,8 +13,12 @@
 BuildRequires:	desktop-file-utils
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	shared-mime-info
-Patch1:		codeblocks-plugins.patch
-Patch2:		codeblocks-desktop.patch
+# Fedora packaging rules
+Patch1:         codeblocks-plugins.patch
+# update to recent standards (http://developer.berlios.de/patch/?func=detailpatch&patch_id=2567&group_id=5358)
+Patch2:         codeblocks-desktop.patch
+# bug #461120 (http://developer.berlios.de/patch/?func=detailpatch&patch_id=2568&group_id=5358)
+Patch3:         codeblocks-run.patch
 
 %description
 Code::Blocks is a free C++ IDE built specifically to meet the most demanding
@@ -66,6 +70,7 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p0 -b .run
 
 # convert EOLs
 find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix --keepdate &> /dev/null
@@ -253,6 +258,10 @@
 
 
 %changelog
+* Sat Sep 20 2008 Dan Horak <dan[at]danny.cz> 8.02-3
+- update desktop file
+- fix running console applications (#461120)
+
 * Fri Aug 29 2008 Dan Horak <dan[at]danny.cz> 8.02-2
 - refresh patches
 



From sharkcz at fedoraproject.org  Mon Sep 22 06:32:29 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 22 Sep 2008 06:32:29 +0000 (UTC)
Subject: rpms/codeblocks/EL-4 codeblocks-run.patch, NONE,
	1.1 codeblocks-desktop.patch, 1.1, 1.2 codeblocks.spec, 1.22, 1.23
Message-ID: <20080922063229.591E6700FE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19782

Modified Files:
	codeblocks-desktop.patch codeblocks.spec 
Added Files:
	codeblocks-run.patch 
Log Message:
* Sat Sep 20 2008 Dan Horak <dan[at]danny.cz> 8.02-2
- update desktop file
- fix running console applications (#461120)


codeblocks-run.patch:

--- NEW FILE codeblocks-run.patch ---
Index: src/plugins/compilergcc/compilergcc.cpp
===================================================================
--- src/plugins/compilergcc/compilergcc.cpp	(revision 5202)
+++ src/plugins/compilergcc/compilergcc.cpp	(working copy)
@@ -1723,6 +1723,7 @@
 
     wxString cmd;
     wxString command;
+    bool has_explicit_shell = false;
     wxFileName f(out);
     f.MakeAbsolute(m_Project->GetBasePath());
 
@@ -1770,6 +1771,9 @@
                 //  and its use for such purposes should be strictly banned!"
                 //                 -- Csh Programming Considered Harmful
                 command << DEFAULT_CONSOLE_SHELL << strSPACE;
+                
+                has_explicit_shell = true;
+                command << _T("'");
             }
         }
 
@@ -1820,6 +1824,9 @@
         return -1;
     }
 
+    if (has_explicit_shell)
+	command << _T("'");
+
     wxString script = command;
 
     if (platform::macosx)

codeblocks-desktop.patch:

Index: codeblocks-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/EL-4/codeblocks-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks-desktop.patch	13 Sep 2006 20:21:13 -0000	1.1
+++ codeblocks-desktop.patch	22 Sep 2008 06:31:58 -0000	1.2
@@ -1,7 +1,19 @@
 --- codeblocks/src/setup/mime/codeblocks.desktop.old	2006-09-09 18:03:05.000000000 +0200
 +++ codeblocks/src/setup/mime/codeblocks.desktop	2006-09-10 10:37:08.000000000 +0200
-@@ -11,4 +11,3 @@
- Categories=Application;Development;
- StartupNotify=false
+@@ -1,14 +1,12 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ Name=Code::Blocks IDE
+ Comment=Configurable and extensible IDE
+ Exec=codeblocks %F
+-Icon=codeblocks.png
++Icon=codeblocks
+ Terminal=false
+ X-MultipleArgs=false
+ Type=Application
+-Categories=Application;Development;
++Categories=Development;
+ StartupNotify=true
  MimeType=application/x-codeblocks;application/x-codeblocks-workspace;
 -GenericName[en_GR]=


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/EL-4/codeblocks.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- codeblocks.spec	15 Mar 2008 16:38:35 -0000	1.22
+++ codeblocks.spec	22 Sep 2008 06:31:58 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		codeblocks
 Version:	8.02
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPLv3+
@@ -13,8 +13,12 @@
 BuildRequires:	desktop-file-utils
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	shared-mime-info
+# Fedora packaging rules
 Patch1:		codeblocks-plugins.patch
+# update to recent standards (http://developer.berlios.de/patch/?func=detailpatch&patch_id=2567&group_id=5358)
 Patch2:		codeblocks-desktop.patch
+# bug #461120 (http://developer.berlios.de/patch/?func=detailpatch&patch_id=2568&group_id=5358)
+Patch3:		codeblocks-run.patch
 
 %description
 Code::Blocks is a free C++ IDE built specifically to meet the most demanding
@@ -66,6 +70,7 @@
 %setup -q
 %patch1
 %patch2 -p1
+%patch3 -p0 -b .run
 
 # convert EOLs
 find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix --keepdate &> /dev/null
@@ -253,6 +258,10 @@
 
 
 %changelog
+* Sat Sep 20 2008 Dan Horak <dan[at]danny.cz> 8.02-2
+- update desktop file
+- fix running console applications (#461120)
+
 * Sun Mar  2 2008 Dan Horak <dan[at]danny.cz> 8.02-1
 - update to stable release 8.02
 - update BR to use system libraries



From sharkcz at fedoraproject.org  Mon Sep 22 06:34:26 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 22 Sep 2008 06:34:26 +0000 (UTC)
Subject: rpms/codeblocks/EL-5 codeblocks-run.patch, NONE,
	1.1 codeblocks-desktop.patch, 1.1, 1.2 codeblocks.spec, 1.20, 1.21
Message-ID: <20080922063426.A2096700FE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20118

Modified Files:
	codeblocks-desktop.patch codeblocks.spec 
Added Files:
	codeblocks-run.patch 
Log Message:
* Sat Sep 20 2008 Dan Horak <dan[at]danny.cz> 8.02-2
- update desktop file
- fix running console applications (#461120)


codeblocks-run.patch:

--- NEW FILE codeblocks-run.patch ---
Index: src/plugins/compilergcc/compilergcc.cpp
===================================================================
--- src/plugins/compilergcc/compilergcc.cpp	(revision 5202)
+++ src/plugins/compilergcc/compilergcc.cpp	(working copy)
@@ -1723,6 +1723,7 @@
 
     wxString cmd;
     wxString command;
+    bool has_explicit_shell = false;
     wxFileName f(out);
     f.MakeAbsolute(m_Project->GetBasePath());
 
@@ -1770,6 +1771,9 @@
                 //  and its use for such purposes should be strictly banned!"
                 //                 -- Csh Programming Considered Harmful
                 command << DEFAULT_CONSOLE_SHELL << strSPACE;
+                
+                has_explicit_shell = true;
+                command << _T("'");
             }
         }
 
@@ -1820,6 +1824,9 @@
         return -1;
     }
 
+    if (has_explicit_shell)
+	command << _T("'");
+
     wxString script = command;
 
     if (platform::macosx)

codeblocks-desktop.patch:

Index: codeblocks-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/EL-5/codeblocks-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks-desktop.patch	13 Sep 2006 20:21:13 -0000	1.1
+++ codeblocks-desktop.patch	22 Sep 2008 06:34:26 -0000	1.2
@@ -1,7 +1,19 @@
 --- codeblocks/src/setup/mime/codeblocks.desktop.old	2006-09-09 18:03:05.000000000 +0200
 +++ codeblocks/src/setup/mime/codeblocks.desktop	2006-09-10 10:37:08.000000000 +0200
-@@ -11,4 +11,3 @@
- Categories=Application;Development;
- StartupNotify=false
+@@ -1,14 +1,12 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ Name=Code::Blocks IDE
+ Comment=Configurable and extensible IDE
+ Exec=codeblocks %F
+-Icon=codeblocks.png
++Icon=codeblocks
+ Terminal=false
+ X-MultipleArgs=false
+ Type=Application
+-Categories=Application;Development;
++Categories=Development;
+ StartupNotify=true
  MimeType=application/x-codeblocks;application/x-codeblocks-workspace;
 -GenericName[en_GR]=


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/EL-5/codeblocks.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- codeblocks.spec	15 Mar 2008 16:41:28 -0000	1.20
+++ codeblocks.spec	22 Sep 2008 06:34:26 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		codeblocks
 Version:	8.02
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPLv3+
@@ -13,8 +13,12 @@
 BuildRequires:	desktop-file-utils
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	shared-mime-info
+# Fedora packaging rules
 Patch1:		codeblocks-plugins.patch
+# update to recent standards (http://developer.berlios.de/patch/?func=detailpatch&patch_id=2567&group_id=5358)
 Patch2:		codeblocks-desktop.patch
+# bug #461120 (http://developer.berlios.de/patch/?func=detailpatch&patch_id=2568&group_id=5358)
+Patch3:		codeblocks-run.patch
 
 %description
 Code::Blocks is a free C++ IDE built specifically to meet the most demanding
@@ -66,6 +70,7 @@
 %setup -q
 %patch1
 %patch2 -p1
+%patch3 -p0 -b .run
 
 # convert EOLs
 find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix --keepdate &> /dev/null
@@ -253,6 +258,10 @@
 
 
 %changelog
+* Sat Sep 20 2008 Dan Horak <dan[at]danny.cz> 8.02-2
+- update desktop file
+- fix running console applications (#461120)
+
 * Sun Mar  2 2008 Dan Horak <dan[at]danny.cz> 8.02-1
 - update to stable release 8.02
 - update BR to use system libraries



From caolanm at fedoraproject.org  Mon Sep 22 06:53:59 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 22 Sep 2008 06:53:59 +0000 (UTC)
Subject: rpms/openoffice.org/devel .cvsignore, 1.187, 1.188 sources, 1.316,
	1.317
Message-ID: <20080922065400.1E138700FE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21750

Modified Files:
	.cvsignore sources 
Log Message:
sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- .cvsignore	15 Sep 2008 16:35:22 -0000	1.187
+++ .cvsignore	22 Sep 2008 06:53:27 -0000	1.188
@@ -6,3 +6,4 @@
 redhat-registry.tar.gz
 redhat-langpacks.tar.gz
 OOO300_m6.tar.bz2
+OOO300_m7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- sources	15 Sep 2008 16:35:22 -0000	1.316
+++ sources	22 Sep 2008 06:53:27 -0000	1.317
@@ -6,3 +6,4 @@
 5ff04a5d754f6770f07e679856d682f3  redhat-registry.tar.gz
 3a53d26158236a7a6a23fe836de721a8  redhat-langpacks.tar.gz
 317b1db9aa48b64d48365943bf601c02  OOO300_m6.tar.bz2
+bc8d246b62f5909864392ca6583e7da1  OOO300_m7.tar.bz2



From caolanm at fedoraproject.org  Mon Sep 22 06:58:29 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 22 Sep 2008 06:58:29 +0000 (UTC)
Subject: rpms/openoffice.org/devel .cvsignore, 1.188,
	1.189 openoffice.org.spec, 1.1656, 1.1657 sources, 1.317, 1.318
Message-ID: <20080922065829.71D9C700FE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22146

Modified Files:
	.cvsignore openoffice.org.spec sources 
Log Message:
next milestone


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- .cvsignore	22 Sep 2008 06:53:27 -0000	1.188
+++ .cvsignore	22 Sep 2008 06:57:58 -0000	1.189
@@ -5,5 +5,4 @@
 redhat-templates.tar.gz
 redhat-registry.tar.gz
 redhat-langpacks.tar.gz
-OOO300_m6.tar.bz2
 OOO300_m7.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1656
retrieving revision 1.1657
diff -u -r1.1656 -r1.1657
--- openoffice.org.spec	21 Sep 2008 18:12:08 -0000	1.1656
+++ openoffice.org.spec	22 Sep 2008 06:57:58 -0000	1.1657
@@ -1,6 +1,6 @@
 %define oootag OOO300
-%define ooomilestone 6
-%define rh_rpm_release 2
+%define ooomilestone 7
+%define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -3679,7 +3679,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Sun Sep 21 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-6.2
+* Sun Sep 21 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-7.1
 - Tswana, Ukrainian, Urdu spellcheckers
 - Resolves: rhbz#462833 openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch
 - Resolves: rhbz#463050 rejig desktop-file-utils, shared-mime-info usage


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- sources	22 Sep 2008 06:53:27 -0000	1.317
+++ sources	22 Sep 2008 06:57:59 -0000	1.318
@@ -5,5 +5,4 @@
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 5ff04a5d754f6770f07e679856d682f3  redhat-registry.tar.gz
 3a53d26158236a7a6a23fe836de721a8  redhat-langpacks.tar.gz
-317b1db9aa48b64d48365943bf601c02  OOO300_m6.tar.bz2
 bc8d246b62f5909864392ca6583e7da1  OOO300_m7.tar.bz2



From petersen at fedoraproject.org  Mon Sep 22 07:06:31 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 22 Sep 2008 07:06:31 +0000 (UTC)
Subject: rpms/darcs/devel darcs.spec,1.38,1.39
Message-ID: <20080922070631.C1FDB700FE@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/darcs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22664

Modified Files:
	darcs.spec 
Log Message:
undo full paths in %post and require policycoreutils for post (mtasaka, #462221)



Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- darcs.spec	19 Sep 2008 09:58:00 -0000	1.38
+++ darcs.spec	22 Sep 2008 07:06:01 -0000	1.39
@@ -1,6 +1,6 @@
 Name:           darcs
 Version:        2.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        David's advanced revision control system
 
 Group:          Development/Tools
@@ -15,7 +15,7 @@
 # for building the manual
 BuildRequires: latex2html
 # need chcon
-Requires(post): coreutils
+Requires(post): policycoreutils
 
 # see http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=246051
 # see http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=396501
@@ -108,8 +108,8 @@
 
 
 %post
-%{_sbindir}/semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/darcs >/dev/null 2>&1 || :
-/sbin/restorecon -v %{_bindir}/darcs
+semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/darcs >/dev/null 2>&1 || :
+restorecon -v %{_bindir}/darcs
 
 
 %files
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Jens Petersen <petersen at redhat.com> - 2.0.2-3
+- revert last change and require policycoreutils for post (mtasaka, #462221)
+
 * Fri Sep 19 2008 Jens Petersen <petersen at redhat.com> - 2.0.2-2
 - use full paths to selinux tools in %%post (Jon Stanley, #462221)
 



From mmaslano at fedoraproject.org  Mon Sep 22 07:07:09 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 22 Sep 2008 07:07:09 +0000 (UTC)
Subject: rpms/perl-libwww-perl/devel lwp-untaint.patch, NONE,
	1.1 perl-libwww-perl.spec, 1.26, 1.27
Message-ID: <20080922070709.06844700FE@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-libwww-perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22831

Modified Files:
	perl-libwww-perl.spec 
Added Files:
	lwp-untaint.patch 
Log Message:
* Thu Sep 18 2008 Marcela Maslanova <mmaslano at redhat.com> 5.814-2
- use untaint patch from Villa Skyte


lwp-untaint.patch:

--- NEW FILE lwp-untaint.patch ---
diff --git a/lib/HTTP/Message.pm b/lib/HTTP/Message.pm
index 12acdfa..4c15fb2 100644
--- a/lib/HTTP/Message.pm
+++ b/lib/HTTP/Message.pm
@@ -404,7 +404,7 @@ sub _stale_content {
 # delegate all other method calls the the _headers object.
 sub AUTOLOAD
 {
-    my $method = substr($AUTOLOAD, rindex($AUTOLOAD, '::')+2);
+    my ($method) = ($AUTOLOAD =~ /^.*::(.+)$/); # untaint
     return if $method eq "DESTROY";
 
     # We create the function here so that it will not need to be


Index: perl-libwww-perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/devel/perl-libwww-perl.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- perl-libwww-perl.spec	18 Sep 2008 12:08:49 -0000	1.26
+++ perl-libwww-perl.spec	22 Sep 2008 07:06:38 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           perl-libwww-perl
 Version:        5.814
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Perl interface to the World-Wide Web
 
 Group:          Development/Libraries
@@ -14,6 +14,7 @@
 # about being lazy and skipping these instead of figuring out why they
 # fail in mock and not on my box.
 Patch1:         perl-libwww-perl-5.808-skip-message-tests.patch
+Patch2:         lwp-untaint.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -36,6 +37,7 @@
 %prep
 %setup -q -n libwww-perl-%{version} 
 ##%patch1 -p1
+%patch2 -p1
 
 # Install the aliases by default
 %{__perl} -pi -e 's|my \$default = "n";|my \$default = "y";|' Makefile.PL
@@ -114,6 +116,9 @@
 
 
 %changelog
+* Thu Sep 18 2008 Marcela Maslanova <mmaslano at redhat.com> 5.814-2
+- use untaint patch from Villa Skyte
+
 * Thu Sep 18 2008 Marcela Maslanova <mmaslano at redhat.com> 5.814-1
 - update to 5.814
 - remove patch, now we have all upstream tests on



From mmaslano at fedoraproject.org  Mon Sep 22 07:07:40 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 22 Sep 2008 07:07:40 +0000 (UTC)
Subject: rpms/perl-libwww-perl/F-9 lwp-untaint.patch,NONE,1.1
Message-ID: <20080922070740.920AC700FE@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-libwww-perl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23121

Added Files:
	lwp-untaint.patch 
Log Message:
* Thu Sep 18 2008 Marcela Maslanova <mmaslano at redhat.com> 5.814-2
- update to 5.814
- tests for testing sending messages failed->net problem?
  tests switched off for a while


lwp-untaint.patch:

--- NEW FILE lwp-untaint.patch ---
diff --git a/lib/HTTP/Message.pm b/lib/HTTP/Message.pm
index 12acdfa..4c15fb2 100644
--- a/lib/HTTP/Message.pm
+++ b/lib/HTTP/Message.pm
@@ -404,7 +404,7 @@ sub _stale_content {
 # delegate all other method calls the the _headers object.
 sub AUTOLOAD
 {
-    my $method = substr($AUTOLOAD, rindex($AUTOLOAD, '::')+2);
+    my ($method) = ($AUTOLOAD =~ /^.*::(.+)$/); # untaint
     return if $method eq "DESTROY";
 
     # We create the function here so that it will not need to be



From mmaslano at fedoraproject.org  Mon Sep 22 07:10:28 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 22 Sep 2008 07:10:28 +0000 (UTC)
Subject: rpms/perl-libwww-perl/F-9 perl-libwww-perl.spec,1.28,1.29
Message-ID: <20080922071028.66923700FE@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-libwww-perl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23336

Modified Files:
	perl-libwww-perl.spec 
Log Message:
* Mon Sep 22 2008 Marcela Maslanova <mmaslano at redhat.com> 5.814-3
- use untaint patch from Villa Skyte



Index: perl-libwww-perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/F-9/perl-libwww-perl.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- perl-libwww-perl.spec	18 Sep 2008 12:44:49 -0000	1.28
+++ perl-libwww-perl.spec	22 Sep 2008 07:09:58 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           perl-libwww-perl
 Version:        5.814
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Perl interface to the World-Wide Web
 
 Group:          Development/Libraries
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Marcela Maslanova <mmaslano at redhat.com> 5.814-3
+- use untaint patch from Villa Skyte
+
 * Thu Sep 18 2008 Marcela Maslanova <mmaslano at redhat.com> 5.814-2
 - update to 5.814
 - tests for testing sending messages failed->net problem?



From mtasaka at fedoraproject.org  Mon Sep 22 07:12:20 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 22 Sep 2008 07:12:20 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.64, 1.65 cairo-dock.spec, 1.81, 
	1.82 sources, 1.64, 1.65
Message-ID: <20080922071220.CD684700FE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23717

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Mon Sep 22 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1317



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	21 Sep 2008 11:05:53 -0000	1.64
+++ .cvsignore	22 Sep 2008 07:11:50 -0000	1.65
@@ -1 +1 @@
-cairo-dock-sources-svn1315_trunk.tar.bz2
+cairo-dock-sources-svn1317_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- cairo-dock.spec	21 Sep 2008 11:14:53 -0000	1.81
+++ cairo-dock.spec	22 Sep 2008 07:11:50 -0000	1.82
@@ -7,7 +7,7 @@
 # For now build only stable plugin
 %define		build_other	1
 
-%define		tarballver	svn1315_trunk
+%define		tarballver	svn1317_trunk
 %define		mainver		1.6.3
 %undefine		betaver
 %define		build_gecko	1
@@ -608,8 +608,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Sun Sep 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1315
+* Mon Sep 22 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1317
 
 * Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.3-1
 - 1.6.2.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	21 Sep 2008 11:05:54 -0000	1.64
+++ sources	22 Sep 2008 07:11:50 -0000	1.65
@@ -1 +1 @@
-706508783a1e04116df01948c1b62998  cairo-dock-sources-svn1315_trunk.tar.bz2
+1058e16e095585ec8f4074293d16590f  cairo-dock-sources-svn1317_trunk.tar.bz2



From mtasaka at fedoraproject.org  Mon Sep 22 07:19:08 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 22 Sep 2008 07:19:08 +0000 (UTC)
Subject: rpms/jd/F-8 .cvsignore, 1.289, 1.290 jd.spec, 1.325, 1.326 sources, 
	1.290, 1.291 jd-2.0.1-cookie-change.patch, 1.2, NONE
Message-ID: <20080922071908.65623700FE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24310/F-8

Modified Files:
	.cvsignore jd.spec sources 
Removed Files:
	jd-2.0.1-cookie-change.patch 
Log Message:
* Mon Sep 22 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2360



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- .cvsignore	19 Sep 2008 15:17:02 -0000	1.289
+++ .cvsignore	22 Sep 2008 07:18:37 -0000	1.290
@@ -1 +1 @@
-jd-2.0.2-080919.tgz
+jd-2.0.3-svn2360_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- jd.spec	19 Sep 2008 15:17:02 -0000	1.325
+++ jd.spec	22 Sep 2008 07:18:37 -0000	1.326
@@ -9,11 +9,11 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      2.0.2
-%define         strtag        080919
+%define         main_ver      2.0.3
+%define         strtag        svn2360_trunk
 %define         repoid        32951
 # Define this if this is pre-version
-%define         pre_release   0
+%define         pre_release   1
 ##########################################
 
 ##########################################
@@ -136,6 +136,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Mon Sep 22 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2360
+
 * Sat Sep 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.2-1
 - 2.0.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/sources,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- sources	19 Sep 2008 15:17:02 -0000	1.290
+++ sources	22 Sep 2008 07:18:37 -0000	1.291
@@ -1 +1 @@
-5c2deead45fc7459ac8922958eb3a204  jd-2.0.2-080919.tgz
+8d2ed4e9d6d8c7db2fecbcd0e50c4307  jd-2.0.3-svn2360_trunk.tgz


--- jd-2.0.1-cookie-change.patch DELETED ---



From mtasaka at fedoraproject.org  Mon Sep 22 07:19:08 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 22 Sep 2008 07:19:08 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.296, 1.297 jd.spec, 1.336, 1.337 sources, 
	1.297, 1.298 jd-2.0.1-cookie-change.patch, 1.2, NONE
Message-ID: <20080922071908.9E201700FE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24310/F-9

Modified Files:
	.cvsignore jd.spec sources 
Removed Files:
	jd-2.0.1-cookie-change.patch 
Log Message:
* Mon Sep 22 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2360



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- .cvsignore	19 Sep 2008 15:17:02 -0000	1.296
+++ .cvsignore	22 Sep 2008 07:18:38 -0000	1.297
@@ -1 +1 @@
-jd-2.0.2-080919.tgz
+jd-2.0.3-svn2360_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- jd.spec	19 Sep 2008 15:17:02 -0000	1.336
+++ jd.spec	22 Sep 2008 07:18:38 -0000	1.337
@@ -9,11 +9,11 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      2.0.2
-%define         strtag        080919
+%define         main_ver      2.0.3
+%define         strtag        svn2360_trunk
 %define         repoid        32951
 # Define this if this is pre-version
-%define         pre_release   0
+%define         pre_release   1
 ##########################################
 
 ##########################################
@@ -136,6 +136,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Mon Sep 22 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2360
+
 * Sat Sep 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.2-1
 - 2.0.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- sources	19 Sep 2008 15:17:02 -0000	1.297
+++ sources	22 Sep 2008 07:18:38 -0000	1.298
@@ -1 +1 @@
-5c2deead45fc7459ac8922958eb3a204  jd-2.0.2-080919.tgz
+8d2ed4e9d6d8c7db2fecbcd0e50c4307  jd-2.0.3-svn2360_trunk.tgz


--- jd-2.0.1-cookie-change.patch DELETED ---



From mtasaka at fedoraproject.org  Mon Sep 22 07:19:09 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 22 Sep 2008 07:19:09 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.296, 1.297 jd.spec, 1.346, 1.347 sources,
	1.297, 1.298 jd-2.0.1-cookie-change.patch, 1.2, NONE
Message-ID: <20080922071909.1099B700FE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24310/devel

Modified Files:
	.cvsignore jd.spec sources 
Removed Files:
	jd-2.0.1-cookie-change.patch 
Log Message:
* Mon Sep 22 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2360



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- .cvsignore	19 Sep 2008 15:17:02 -0000	1.296
+++ .cvsignore	22 Sep 2008 07:18:38 -0000	1.297
@@ -1 +1 @@
-jd-2.0.2-080919.tgz
+jd-2.0.3-svn2360_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- jd.spec	19 Sep 2008 15:17:02 -0000	1.346
+++ jd.spec	22 Sep 2008 07:18:38 -0000	1.347
@@ -9,11 +9,11 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      2.0.2
-%define         strtag        080919
+%define         main_ver      2.0.3
+%define         strtag        svn2360_trunk
 %define         repoid        32951
 # Define this if this is pre-version
-%define         pre_release   0
+%define         pre_release   1
 ##########################################
 
 ##########################################
@@ -136,6 +136,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Mon Sep 22 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2360
+
 * Sat Sep 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.2-1
 - 2.0.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- sources	19 Sep 2008 15:17:02 -0000	1.297
+++ sources	22 Sep 2008 07:18:38 -0000	1.298
@@ -1 +1 @@
-5c2deead45fc7459ac8922958eb3a204  jd-2.0.2-080919.tgz
+8d2ed4e9d6d8c7db2fecbcd0e50c4307  jd-2.0.3-svn2360_trunk.tgz


--- jd-2.0.1-cookie-change.patch DELETED ---



From varekova at fedoraproject.org  Mon Sep 22 07:43:26 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 22 Sep 2008 07:43:26 +0000 (UTC)
Subject: rpms/sysstat/devel sysstat.spec,1.64,1.65
Message-ID: <20080922074327.19CBF700FE@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/sysstat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25963

Modified Files:
	sysstat.spec 
Log Message:
- Resolves: #463066 - Fix Patch0:/%%patch mismatch
thanks Ville Skytt??



Index: sysstat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysstat/devel/sysstat.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sysstat.spec	23 Apr 2008 08:53:48 -0000	1.64
+++ sysstat.spec	22 Sep 2008 07:42:53 -0000	1.65
@@ -1,6 +1,6 @@
 Name: sysstat
 Version: 8.0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: The sar and iostat system monitoring commands
 License: GPLv2+
 Group: Applications/System
@@ -24,7 +24,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b .ret
+%patch0 -p1 -b .ret
 %patch1 -p1 -b .nfse
 %patch2 -p1 -b .cpu
 iconv -f windows-1252 -t utf8 CREDITS > CREDITS.aux
@@ -78,6 +78,9 @@
 %{_localstatedir}/log/sa
 
 %changelog
+* Mon Sep 22 2008 Ivana Varekova <varekova at redhat.com> - 8.0.4-5
+- Resolves: #463066 - Fix Patch0:/%%patch mismatch
+
 * Wed Apr 23 2008 Ivana Varekova <varekova at redhat.com> - 8.0.4-4 
 - Resolves: #442801 mpstat shows one extra cpu
   thanks Chris Wright



From caolanm at fedoraproject.org  Mon Sep 22 07:54:27 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 22 Sep 2008 07:54:27 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.11, 1.12
Message-ID: <20080922075427.C4E327013F@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26587

Modified Files:
	openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 
Log Message:
adjust patch

openoffice.org-2.2.0.ooo68717.gstreamer.video.patch:

Index: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch	1 Sep 2008 12:09:08 -0000	1.11
+++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch	22 Sep 2008 07:53:57 -0000	1.12
@@ -303,7 +303,7 @@
 diff -rup slideshow-orig/source/engine/viewmediashape.cxx slideshow/source/engine/viewmediashape.cxx
 --- slideshow-orig/source/engine/shapes/viewmediashape.cxx	2006-08-17 16:15:39.000000000 +0200
 +++ slideshow/source/engine/shapes/viewmediashape.cxx	2006-08-17 17:26:09.000000000 +0200
-@@ -48,6 +48,7 @@
+@@ -44,6 +44,7 @@
  #include <vcl/window.hxx>
  #include <vcl/javachild.hxx>
  #include <vcl/salbtype.hxx>
@@ -311,7 +311,7 @@
  
  #include <basegfx/tools/canvastools.hxx>
  #include <basegfx/numeric/ftools.hxx>
-@@ -152,7 +153,11 @@
+@@ -148,7 +149,11 @@
  				mxPlayerWindow.clear();
  			}
  
@@ -323,17 +323,22 @@
              			
  			// shutdown player
  			if( mxPlayer.is() )
-@@ -287,7 +292,8 @@
+@@ -282,8 +287,12 @@
+ 							
  							aDeviceParams[ 0 ] >>= aImplName;
  						
- 							if( aImplName.endsWithIgnoreAsciiCaseAsciiL( 
--                                    RTL_CONSTASCII_STRINGPARAM("VCLCanvas") ))
-+                                    RTL_CONSTASCII_STRINGPARAM("VCLCanvas") ) || aImplName.endsWithIgnoreAsciiCaseAsciiL( 
-+                                    RTL_CONSTASCII_STRINGPARAM("CairoCanvas") ) )
+-							if( aImplName.endsWithIgnoreAsciiCaseAsciiL( 
+-                                    RTL_CONSTASCII_STRINGPARAM("VCL") ))
++							if( 
++                                aImplName.endsWithIgnoreAsciiCaseAsciiL( 
++                                    RTL_CONSTASCII_STRINGPARAM("VCL")) ||
++                                aImplName.endsWithIgnoreAsciiCaseAsciiL( 
++                                    RTL_CONSTASCII_STRINGPARAM("CairoCanvas"))
++                              )
                              {
  								implInitializeVCLBasedPlayerWindow( rBounds, aDeviceParams );
                              }
-@@ -393,6 +399,7 @@
+@@ -389,6 +398,7 @@
  		bool ViewMediaShape::implInitializeVCLBasedPlayerWindow( const ::basegfx::B2DRectangle&   rBounds,
  																 const uno::Sequence< uno::Any >& rVCLDeviceParams)
  		{
@@ -341,7 +346,7 @@
  			if( !mpMediaWindow.get() && !rBounds.isEmpty() )
  			{
  				try
-@@ -414,28 +421,50 @@
+@@ -410,28 +420,50 @@
  																	
  						if( !rRangePix.isEmpty() )
  						{



From nphilipp at fedoraproject.org  Mon Sep 22 08:07:36 2008
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 22 Sep 2008 08:07:36 +0000 (UTC)
Subject: rpms/gimp/devel gimp.spec,1.161,1.162
Message-ID: <20080922080737.01E6F700FE@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27561

Modified Files:
	gimp.spec 
Log Message:
don't require desktop-file-utils (#463049, patch by Ville Skytt??)



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- gimp.spec	17 Sep 2008 13:40:43 -0000	1.161
+++ gimp.spec	22 Sep 2008 08:07:06 -0000	1.162
@@ -51,7 +51,7 @@
 %define age 0
 %define minorver 400
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -98,7 +98,6 @@
 %endif
 
 Requires:       gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       desktop-file-utils >= 0.9
 Requires:       glib2 >= 2.12.3
 Requires:       gtk2 >= 2.10.13
 Requires:       pango >= 1.12.2
@@ -111,8 +110,6 @@
 Requires:       gimp-print-plugin
 %endif
 %endif
-Requires(post): /usr/bin/update-desktop-database
-Requires(postun):   /usr/bin/update-desktop-database
 Requires:       hicolor-icon-theme
 %if %{with xdg_open}
 Requires:       xdg-utils
@@ -309,7 +306,7 @@
 fi
 
 %post
-/usr/bin/update-desktop-database %{_datadir}/applications
+/usr/bin/update-desktop-database %{_datadir}/applications &> /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 || :
@@ -325,7 +322,7 @@
 
 %postun
 if [ "$1" = "0" ]; then
-    /usr/bin/update-desktop-database %{_datadir}/applications || :
+    /usr/bin/update-desktop-database %{_datadir}/applications &> /dev/null || :
 fi
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -454,6 +451,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Sep 22 2008 Nils Philippsen <nils at redhat.com> - 2:2.4.7-4
+- don't require desktop-file-utils (#463049, patch by Ville Skytt??)
+
 * Wed Sep 17 2008 Nils Philippsen <nils at redhat.com> - 2:2.4.7-3
 - don't make pyconsole.py plug-in executable as upstream indicates it shouldn't
   be



From ltinkl at fedoraproject.org  Mon Sep 22 08:20:42 2008
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 22 Sep 2008 08:20:42 +0000 (UTC)
Subject: rpms/kdebase/F-9 kdebase-4.1.1-kde#863180-fileassoc.patch, NONE,
	1.1 kdebase.spec, 1.331, 1.332
Message-ID: <20080922082042.28949700FE@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28231

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.1.1-kde#863180-fileassoc.patch 
Log Message:
file/service association crash fix


kdebase-4.1.1-kde#863180-fileassoc.patch:

--- NEW FILE kdebase-4.1.1-kde#863180-fileassoc.patch ---
Index: apps/konqueror/settings/filetypes/kservicelistwidget.cpp
===================================================================
--- apps/konqueror/settings/filetypes/kservicelistwidget.cpp	(revision 863179)
+++ apps/konqueror/settings/filetypes/kservicelistwidget.cpp	(revision 863180)
@@ -260,7 +260,7 @@
   }
 
   // if None is the only item, then there currently is no default
-  if (servicesLB->item(0)->text() == i18n("None")) {
+  if (servicesLB->count() >= 1 && servicesLB->item(0)->text() == i18n("None")) {
       delete servicesLB->takeItem(0);
       servicesLB->setEnabled(true);
   }


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-9/kdebase.spec,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -r1.331 -r1.332
--- kdebase.spec	29 Aug 2008 18:42:09 -0000	1.331
+++ kdebase.spec	22 Sep 2008 08:20:11 -0000	1.332
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -28,6 +28,7 @@
 Patch1:   kdebase-nsplugins-paths.patch
 
 ## upstream patches
+Patch100: kdebase-4.1.1-kde#863180-fileassoc.patch
 
 BuildRequires: kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -124,6 +125,7 @@
 %prep
 %setup -q -n kdebase-%{version}
 %patch1   -p0 -b .nsplugins-paths
+%patch100 -p0 -b .kde#863180-fileassoc
 # 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
 
@@ -303,6 +305,10 @@
 
 
 %changelog
+* Mon Sep 22 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-2
+- Fix crash if you delete all file associations and then add a new one
+  (kdebug:171395)
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 



From caolanm at fedoraproject.org  Mon Sep 22 08:24:43 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 22 Sep 2008 08:24:43 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch, 1.1, 1.2
Message-ID: <20080922082443.4AA4C700FE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28462

Modified Files:
	openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch 
Log Message:
defuzz

openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch:

Index: openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch	19 Sep 2008 11:44:59 -0000	1.1
+++ openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch	22 Sep 2008 08:24:12 -0000	1.2
@@ -13,7 +13,7 @@
      FcFontSet*      m_pOutlineSet;
  
      FcBool          (*m_pFcInit)();
-@@ -140,7 +139,6 @@
+@@ -141,7 +140,6 @@
      bool isValid() const 
      { return m_pLib != NULL;}
  
@@ -21,7 +21,7 @@
      FcFontSet* getFontSet();
      
      FcBool FcInit()
-@@ -252,7 +250,6 @@
+@@ -257,7 +255,6 @@
  
  FontCfgWrapper::FontCfgWrapper()
          : m_pLib( NULL ),
@@ -29,7 +29,7 @@
            m_pOutlineSet( NULL )
  {
       OUString aLib( RTL_CONSTASCII_USTRINGPARAM( "libfontconfig.so.1" ) );
-@@ -379,8 +376,7 @@
+@@ -387,8 +384,7 @@
  
  
      FcInit();
@@ -39,7 +39,7 @@
      {
          osl_unloadModule( (oslModule)m_pLib );
          m_pLib = NULL;
-@@ -394,7 +390,7 @@
+@@ -402,7 +398,7 @@
        add only acceptable outlined fonts to our config, 
        for future fontconfig use
      */
@@ -48,7 +48,7 @@
      if( !pOrig )
          return;
  
-@@ -794,7 +790,7 @@
+@@ -820,7 +816,7 @@
      if( nVersion <= 20400 )
          return false;
      const char* pDirName = (const char*)rDirName.getStr();
@@ -57,8 +57,8 @@
  
  #if OSL_DEBUG_LEVEL > 1
      fprintf( stderr, "FcConfigAppFontAddDir( \"%s\") => %d\n", pDirName, bRet );
-@@ -914,13 +910,13 @@
-     addtopattern(rWrapper, pPattern, eItalic, eWeight, eWidth, ePitch);
+@@ -940,13 +936,13 @@
+     addtopattern(rWrapper, pPattern, rItalic, rWeight, rWidth, rPitch);
  
      // query fontconfig for a substitute
 -    rWrapper.FcConfigSubstitute( rWrapper.getDefConfig(), pPattern, FcMatchPattern );
@@ -73,7 +73,7 @@
      rWrapper.FcPatternDestroy( pPattern );
  
      FcFontSet*  pSet = NULL;
-@@ -982,7 +978,7 @@
+@@ -1091,7 +1087,7 @@
      if( ! rWrapper.isValid() )
          return false;
  



From pmachata at fedoraproject.org  Mon Sep 22 08:42:51 2008
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 22 Sep 2008 08:42:51 +0000 (UTC)
Subject: rpms/make/devel make-3.81-fdleak.patch, NONE, 1.1 make.spec, 1.43,
	1.44
Message-ID: <20080922084251.722F6700FE@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/make/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29923

Modified Files:
	make.spec 
Added Files:
	make-3.81-fdleak.patch 
Log Message:
- Mark opened files as cloexec to prevent their leaking through fork
- Resolves: #462090


make-3.81-fdleak.patch:

--- NEW FILE make-3.81-fdleak.patch ---
diff -urp make-3.81/read.c make-3.81-leak/read.c
--- make-3.81/read.c	2006-03-17 15:24:20.000000000 +0100
+++ make-3.81-leak/read.c	2008-09-16 16:43:12.000000000 +0200
@@ -296,6 +300,37 @@ restore_conditionals (struct conditional
   conditionals = saved;
 }
 
+/* If possible, open the file and mark it close-on-exec, so that make
+   doesn't leak the descriptor to binaries called via $(shell ...).*/
+static FILE *
+open_makefile (char *filename)
+{
+  FILE *fp;
+
+#if HAVE_FDOPEN
+  int fd = open (filename, O_RDONLY);
+  int save;
+  if (fd < 0)
+    return NULL;
+
+  fp = fdopen (fd, "r");
+  if (fp == NULL)
+    {
+      save = errno;
+      close (fd);
+      errno = save;
+      return NULL;
+    }
+
+  CLOSE_ON_EXEC (fd);
+
+#else
+  fp = fopen (filename, "r");
+#endif
+
+  return fp;
+}
+
 static int
 eval_makefile (char *filename, int flags)
 {
@@ -335,7 +376,8 @@ eval_makefile (char *filename, int flags
 	filename = expanded;
     }
 
-  ebuf.fp = fopen (filename, "r");
+  ebuf.fp = open_makefile (filename);
+
   /* Save the error code so we print the right message later.  */
   makefile_errno = errno;
 
@@ -348,7 +390,7 @@ eval_makefile (char *filename, int flags
       for (i = 0; include_directories[i] != 0; ++i)
 	{
 	  included = concat (include_directories[i], "/", filename);
-	  ebuf.fp = fopen (included, "r");
+	  ebuf.fp = open_makefile (included);
 	  if (ebuf.fp)
 	    {
 	      filename = included;


Index: make.spec
===================================================================
RCS file: /cvs/pkgs/rpms/make/devel/make.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- make.spec	25 Mar 2008 17:38:16 -0000	1.43
+++ make.spec	22 Sep 2008 08:42:20 -0000	1.44
@@ -3,7 +3,7 @@
 Name: make
 Epoch: 1
 Version: 3.81
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/make/
@@ -16,6 +16,7 @@
 Patch8: make-3.81-rlimit.patch
 Patch9: make-3.81-newlines.patch
 Patch10: make-3.81-jobserver.patch
+Patch11: make-3.81-fdleak.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -38,6 +39,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 %configure
@@ -76,6 +78,10 @@
 %{_infodir}/*.info*
 
 %changelog
+* Tue Sep 16 2008 Petr Machata <pmachata at redhat.com> - 1:3.81-13
+- Mark opened files as cloexec to prevent their leaking through fork
+- Resolves: #462090
+
 * Tue Mar 25 2008 Petr Machata <pmachata at redhat.com> - 1:3.81-12
 - Fix the rlimit patch.  The success flag is kept in memory shared
   with parent process after vfork, and so cannot be reset.



From transif at fedoraproject.org  Mon Sep 22 08:50:29 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Mon, 22 Sep 2008 08:50:29 +0000 (UTC)
Subject: comps/po gu.po,1.16,1.17
Message-ID: <20080922085029.C2EF8700FE@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30689/po

Modified Files:
	gu.po 
Log Message:
    2008-09-22  Sweta Kothari <swkothar at redhat.com> (via
swkothar at fedoraproject.org)
    
      * po/gu.po: Updated Gujarati Translation
    



Index: gu.po
===================================================================
RCS file: /cvs/pkgs/comps/po/gu.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gu.po	17 Sep 2008 22:44:34 -0000	1.16
+++ gu.po	22 Sep 2008 08:49:58 -0000	1.17
@@ -6,13 +6,14 @@
 # Automatically generated, 2004.
 # Ankit Patel <ankit at redhat.com>, 2004, 2005, 2006, 2007, 2008.
 # Sweta Kothari <sweta2782 at yahoo.co.in>, 2008.
+# Sweta Kothari <swkothar at redhat.com>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-05-15 16:53+0530\n"
-"Last-Translator: Sweta Kothari <sweta2782 at yahoo.co.in>\n"
+"POT-Creation-Date: 2008-09-22 03:28+0000\n"
+"PO-Revision-Date: 2008-09-22 14:15+0530\n"
+"Last-Translator: Sweta Kothari <swkothar at redhat.com>\n"
 "Language-Team: Gujarati\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -409,18 +410,15 @@
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:81
-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:82 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31
-msgid ""
-"Install this group of packages to use the base graphical (X) user interface."
-msgstr ""
-"????????????????????? ???????????????????????????????????? (X) ?????????????????????????????? ???????????????????????? ?????????????????? ???????????? ??? ??????????????? ?????????????????? ????????????????????? ?????????."
+msgid "Install this group of packages to use the base graphical (X) user interface."
+msgstr "????????????????????? ???????????????????????????????????? (X) ?????????????????????????????? ???????????????????????? ?????????????????? ???????????? ??? ??????????????? ?????????????????? ????????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
 #: ../comps-f10.xml.in.h:84
@@ -655,8 +653,7 @@
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
 #: ../comps-f10.xml.in.h:143 ../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:137
@@ -779,8 +776,7 @@
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
 #: ../comps-f10.xml.in.h:169
-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:160
@@ -790,20 +786,17 @@
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
 #: ../comps-f10.xml.in.h:171
-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:162
 #: ../comps-f10.xml.in.h:172 ../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:163
 #: ../comps-f10.xml.in.h:173
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "??? ?????????????????? ????????????????????? ?????????????????? ?????????????????? ????????? ?????? DHCP, ????????????????????? ????????? NIS ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:164
@@ -916,14 +909,12 @@
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
 #: ../comps-f10.xml.in.h:190 ../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:181
 #: ../comps-f10.xml.in.h:191 ../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:182
@@ -937,8 +928,7 @@
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
 #: ../comps-f10.xml.in.h:193
-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:184
@@ -1135,70 +1125,60 @@
 msgstr "?????????????????? ???????????? ????????????"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:137
-#, fuzzy
 msgid "SUGAR Desktop Environment"
-msgstr "???????????????????????? ???????????????????????????"
+msgstr "SUGAR ???????????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:138
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
-msgstr ""
+msgstr "SUGAR ??? OLPC XO ???????????? ??????????????? ???????????? ???????????????????????? ???????????????????????? ??????."
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:211
 msgid "Walloon Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f10.xml.in.h:70
-#, fuzzy
 msgid "Haskell Development"
-msgstr "????????? ???????????????"
+msgstr "Haskell ???????????????"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
-msgstr ""
+msgstr "??????????????? ?????????????????????"
 
 #: ../comps-f10.xml.in.h:77
 msgid "Input method packages for the input of international text."
-msgstr ""
+msgstr "??????????????????????????????????????? ????????????????????? ??????????????? ???????????? ??????????????? ?????????????????? ??????????????????."
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "??????????????? ????????????"
+msgstr "????????????????????? ????????????"
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "????????????????????? ????????????"
+msgstr "????????????????????? ????????????"
 
 #: ../comps-f10.xml.in.h:110
-#, fuzzy
 msgid "Maithili Support"
-msgstr "??????????????? ????????????"
+msgstr "?????????????????? ????????????"
 
 #: ../comps-f10.xml.in.h:117
-#, fuzzy
 msgid "Myanmar (Burmese) Support"
-msgstr "??????????????????????????? ????????????"
+msgstr "???????????????????????? (??????????????????) ????????????"
 
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "??????????????? ????????????"
+msgstr "??????????????? ????????????"
 
 #: ../comps-f10.xml.in.h:156
-#, fuzzy
 msgid "Support for developing programs in the Haskell programming language."
-msgstr "???????????? ???????????????????????????????????? ????????????????????? ?????????????????????????????? ???????????????????????? ?????????????????? ????????????."
+msgstr "Haskell ???????????????????????????????????? ????????????????????? ?????????????????????????????? ???????????????????????? ?????????????????? ????????????."
 
 #: ../comps-f10.xml.in.h:163
-#, fuzzy
 msgid "Tajik Support"
-msgstr "????????? ????????????"
+msgstr "??????????????? ????????????"
 
 #: ../comps-f10.xml.in.h:205
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "????????? ????????????"
+msgstr "??????????????? ????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1249,18 +1229,15 @@
 msgstr "?????????????????? ??????????????? ???????????? ??? ????????? ??? ????????????????????? ???????????????????????? ???????????? ??????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????????????????? ??????????????????????????? ???????????? ??? ????????? ??? ??????????????? ????????? ???????????????????????? ???????????? ??????."
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????????????????? ??????????????????????????? ???????????? ??? ????????? ??? ??????????????? ????????? ???????????????????????? ???????????? ??????."
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????????????????? ??????????????????????????? ???????????? ??? ????????? ??? ??????????????? ????????? ???????????????????????? ???????????? ??????."
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1268,6 +1245,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "????????? ??????????????????????????? ???????????? ??? ????????? ??? ??????????????? ????????? ???????????????????????? ???????????? ??????."
+



From jreznik at fedoraproject.org  Mon Sep 22 08:52:08 2008
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Mon, 22 Sep 2008 08:52:08 +0000 (UTC)
Subject: rpms/system-config-bind/devel
	system-config-bind-4.0.11-modal-dialog.patch, NONE,
	1.1 system-config-bind.spec, 1.77, 1.78
Message-ID: <20080922085208.42518700FE@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/system-config-bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30777

Modified Files:
	system-config-bind.spec 
Added Files:
	system-config-bind-4.0.11-modal-dialog.patch 
Log Message:
* Mon Sep 22 2008 Jaroslav Reznik <jreznik at redhat.com> - 4.0.11-2
- Fixes modal dialog refuses to die (rhbz#462847)  


system-config-bind-4.0.11-modal-dialog.patch:

--- NEW FILE system-config-bind-4.0.11-modal-dialog.patch ---
diff -up system-config-bind-4.0.11/src/RRGUI.py.modal-dialog system-config-bind-4.0.11/src/RRGUI.py
--- system-config-bind-4.0.11/src/RRGUI.py.modal-dialog	2008-09-15 14:43:10.000000000 +0200
+++ system-config-bind-4.0.11/src/RRGUI.py	2008-09-22 09:55:30.000000000 +0200
@@ -139,7 +139,6 @@ class DNS_Name(Widget):
             for code,error in errors:
                 if code == -1:
                     s.gui.modalError(s.dialog.dialog,_("DNS Name Error"), _('Bad DNS Name: %s -\n%s.') %(v, error))
-                    entry.grab_focus()
                     if( type(dialogIssued) == dict ):
                         dialogIssued['yes']=1
                 else:


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/devel/system-config-bind.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- system-config-bind.spec	16 Sep 2008 07:06:21 -0000	1.77
+++ system-config-bind.spec	22 Sep 2008 08:51:37 -0000	1.78
@@ -1,11 +1,12 @@
 Summary:        BIND DNS Configuration Tool
 Name:           system-config-bind
 Version:        4.0.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://fedorahosted.org/system-config-bind
 License:        GPLv2
 Group:          Applications/System
 Source0:        https://fedorahosted.org/releases/s/y/system-config-bind/%{name}-%{version}.tar.gz
+Patch0:		system-config-bind-4.0.11-modal-dialog.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 BuildRequires:  python, gettext, make, intltool, desktop-file-utils
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .modal-dialog
 
 %build
 make 
@@ -81,6 +83,9 @@
 fi;
 
 %changelog
+* Mon Sep 22 2008 Jaroslav Reznik <jreznik at redhat.com> - 4.0.11-2
+- Fixes modal dialog refuses to die (rhbz#462847)
+
 * Tue Sep 16 2008 Jaroslav Reznik <jreznik at redhat.com> - 4.0.11-1
 - Missing translations
 



From mhlavink at fedoraproject.org  Mon Sep 22 08:59:02 2008
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 22 Sep 2008 08:59:02 +0000 (UTC)
Subject: rpms/pciutils/devel pciutils-3.0.2-multilib.patch, NONE,
	1.1 .cvsignore, 1.17, 1.18 pciutils.spec, 1.62, 1.63 sources,
	1.17, 1.18 pciutils-3.0.1-multilib.patch, 1.1, NONE
Message-ID: <20080922085902.AC7CA7013D@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31540

Modified Files:
	.cvsignore pciutils.spec sources 
Added Files:
	pciutils-3.0.2-multilib.patch 
Removed Files:
	pciutils-3.0.1-multilib.patch 
Log Message:
new version 3.0.2


pciutils-3.0.2-multilib.patch:

--- NEW FILE pciutils-3.0.2-multilib.patch ---
diff -up pciutils-3.0.2/lib/configure.multilib pciutils-3.0.2/lib/configure
--- pciutils-3.0.2/lib/configure.multilib	2008-09-19 20:04:37.000000000 +0200
+++ pciutils-3.0.2/lib/configure	2008-09-22 10:35:58.964527560 +0200
@@ -45,29 +45,62 @@ sys=`echo $host | sed 's/^\([^-]*\)-\([^
 echo " $host $rel"
 
 c=config.h
+cm=config.h.mk
 m=config.mk
-echo >$c '#define PCI_CONFIG_H'
-echo >>$c "#define PCI_ARCH_`echo $cpu | tr '[a-z]' '[A-Z]'`"
-echo >>$c "#define PCI_OS_`echo $sys | tr '[a-z]' '[A-Z]'`"
 echo >$m 'WITH_LIBS='
+cat >$c <<EOF
+#define PCI_CONFIG_H
+#if defined(__x86_64__)
+#define PCI_ARCH_X86_64
+#elif defined(__ia64__)
+#define PCI_ARCH_IA64
+#elif defined(__i386__)
+#define PCI_ARCH_I386
+#define PCI_HAVE_PM_INTEL_CONF
+#elif defined(__ppc64__) || defined(__powerpc64__)
+#define PCI_ARCH_PPC64
+#elif defined(__ppc__)  || defined(__powerpc__)
+#define PCI_ARCH_PPC
+#elif defined(__s390x__)
+define PCI_ARCH_S390X
+#elif defined(__s390__)
+#define PCI_ARCH_S390
+#elif defined(__alpha__)
+#define PCI_ARCH_ALPHA
+#else
+#error Unknown Arch
+#endif
+#define PCI_OS_LINUX
+#define PCI_HAVE_PM_LINUX_SYSFS
+#define PCI_HAVE_PM_LINUX_PROC
+#define PCI_HAVE_LINUX_BYTEORDER_H
+#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"
+#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"
+#define PCI_HAVE_64BIT_ADDRESS
+EOF
+
+rm -f $cm
+echo >$cm "#define PCI_ARCH_`echo $cpu | tr 'a-z' 'A-Z'`"
+echo >>$cm "#define PCI_OS_`echo $sys | tr 'a-z' 'A-Z'`"
 
 echo_n "Looking for access methods..."
+echo_n " sysfs proc"
 LIBRESOLV=-lresolv
 
 case $sys in
 	linux*)
 		echo_n " sysfs proc"
-		echo >>$c '#define PCI_HAVE_PM_LINUX_SYSFS'
-		echo >>$c '#define PCI_HAVE_PM_LINUX_PROC'
-		echo >>$c '#define PCI_HAVE_LINUX_BYTEORDER_H'
-		echo >>$c '#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"'
-		echo >>$c '#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"'
+		echo >>$cm '#define PCI_HAVE_PM_LINUX_SYSFS'
+		echo >>$cm '#define PCI_HAVE_PM_LINUX_PROC'
+		echo >>$cm '#define PCI_HAVE_LINUX_BYTEORDER_H'
+		echo >>$cm '#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"'
+		echo >>$cm '#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"'
 		case $cpu in
 				i386|x86_64)	echo_n " i386-ports"
-						echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'
+						echo >>$cm '#define PCI_HAVE_PM_INTEL_CONF'
 						;;
 		esac
-		echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
+		echo >>$cm '#define PCI_HAVE_64BIT_ADDRESS'
 		;;
 	sunos)
 		case $cpu in
@@ -123,7 +156,7 @@ case $sys in
 		;;
 esac
 
-echo >>$c '#define PCI_HAVE_PM_DUMP'
+echo >>$cm '#define PCI_HAVE_PM_DUMP'
 echo " dump"
 
 echo_n "Checking for zlib support... "
@@ -146,6 +179,7 @@ else
 	echo >>$c '#define PCI_IDS "pci.ids"'
 fi
 echo >>$c "#define PCI_PATH_IDS_DIR \"$IDSDIR\""
+echo >>$cm "#define PCI_PATH_IDS_DIR \"$IDSDIR\""
 
 echo_n "Checking for DNS support... "
 if [ "$DNS" = yes -o "$DNS" = no ] ; then
@@ -160,6 +194,7 @@ else
 fi
 if [ "$DNS" = yes ] ; then
 	echo >>$c "#define PCI_USE_DNS"
+	echo >>$cm "#define PCI_USE_DNS"
 	echo >>$c "#define PCI_ID_DOMAIN \"pci.id.ucw.cz\""
 	echo >>$m "WITH_LIBS+=$LIBRESOLV"
 fi
@@ -182,4 +217,5 @@ fi
 echo >>$m 'PCILIBPC=$(LIBNAME).pc'
 
 echo >>$c "#define PCILIB_VERSION \"$VERSION\""
-sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$c >>$m
+echo >>$cm "#define PCILIB_VERSION \"$VERSION\""
+sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$cm >>$m
\ No newline at end of file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	19 Sep 2008 10:24:41 -0000	1.17
+++ .cvsignore	22 Sep 2008 08:58:31 -0000	1.18
@@ -1 +1 @@
-pciutils-3.0.1.tar.gz
+pciutils-3.0.2.tar.gz


Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- pciutils.spec	19 Sep 2008 10:24:41 -0000	1.62
+++ pciutils.spec	22 Sep 2008 08:58:32 -0000	1.63
@@ -1,5 +1,5 @@
 Name:		pciutils
-Version:	3.0.1
+Version:	3.0.2
 Release: 	1%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch1: 	pciutils-2.2.4-buf.patch
@@ -7,7 +7,7 @@
 Patch3: 	pciutils-havepread.patch
 Patch6: 	pciutils-2.2.1-idpath.patch
 Patch7:		pciutils-2.1.99-gcc4.patch
-Patch8: 	pciutils-3.0.1-multilib.patch
+Patch8: 	pciutils-3.0.2-multilib.patch
 Patch9: 	pciutils-dir-d.patch
 Patch10:	pciutils-2.2.10-sparc-support.patch
 Patch11:	pciutils-3.0.1-superh-support.patch
@@ -114,6 +114,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Sep 22 2008 Michal Hlavinka <mhlavink at redhat.com> 3.0.1-1
+- version 3.0.2
+
 * Fri Sep 19 2008 Michal Hlavinka <mhlavink at redhat.com> 3.0.1-1
 - version 3.0.1
 - add support for Super-H (sh3,sh4) (#446600)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	19 Sep 2008 10:24:41 -0000	1.17
+++ sources	22 Sep 2008 08:58:32 -0000	1.18
@@ -1 +1 @@
-22ebed1ecc928bab51e82b91c6be1d4e  pciutils-3.0.1.tar.gz
+11ccb3cfd12d0ac7bc2e3839b0c3f807  pciutils-3.0.2.tar.gz


--- pciutils-3.0.1-multilib.patch DELETED ---



From turki at fedoraproject.org  Mon Sep 22 09:00:40 2008
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Mon, 22 Sep 2008 09:00:40 +0000 (UTC)
Subject: rpms/PyOpenGL/devel .cvsignore, 1.5, 1.6 PyOpenGL.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20080922090040.18D6F700FE@cvs1.fedora.phx.redhat.com>

Author: turki

Update of /cvs/pkgs/rpms/PyOpenGL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31878

Modified Files:
	.cvsignore PyOpenGL.spec sources 
Log Message:
New upstream release - 3.0.0b6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Jul 2008 08:24:58 -0000	1.5
+++ .cvsignore	22 Sep 2008 09:00:09 -0000	1.6
@@ -1 +1 @@
-PyOpenGL-3.0.0b5.tar.gz
+PyOpenGL-3.0.0b6.tar.gz


Index: PyOpenGL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/devel/PyOpenGL.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PyOpenGL.spec	28 Jul 2008 08:24:58 -0000	1.6
+++ PyOpenGL.spec	22 Sep 2008 09:00:09 -0000	1.7
@@ -1,9 +1,9 @@
-%define prever b5
+%define prever b6
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           PyOpenGL
 Version:        3.0.0
-Release:        0.7.%{prever}%{?dist}
+Release:        0.8.%{prever}%{?dist}
 Summary:        Python bindings for OpenGL
 License:        BSD
 Group:          System Environment/Libraries
@@ -86,6 +86,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> 3.0.0-0.8.b6
+- New upstream release 3.0.0b6
+
 * Mon Jul 28 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> 3.0.0-0.7.b5
 - New upstream release 3.0.0b5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Jul 2008 08:24:58 -0000	1.5
+++ sources	22 Sep 2008 09:00:09 -0000	1.6
@@ -1 +1 @@
-4e46b6ce318b82799109a4850dd37c50  PyOpenGL-3.0.0b5.tar.gz
+6a70dd315767064ec78b84a92d2420a8  PyOpenGL-3.0.0b6.tar.gz



From turki at fedoraproject.org  Mon Sep 22 09:06:56 2008
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Mon, 22 Sep 2008 09:06:56 +0000 (UTC)
Subject: rpms/PyOpenGL/F-9 .cvsignore, 1.5, 1.6 PyOpenGL.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20080922090656.53317700FE@cvs1.fedora.phx.redhat.com>

Author: turki

Update of /cvs/pkgs/rpms/PyOpenGL/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32470

Modified Files:
	.cvsignore PyOpenGL.spec sources 
Log Message:
New upstream release - 3.0.0b6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Jul 2008 08:34:54 -0000	1.5
+++ .cvsignore	22 Sep 2008 09:06:25 -0000	1.6
@@ -1 +1 @@
-PyOpenGL-3.0.0b5.tar.gz
+PyOpenGL-3.0.0b6.tar.gz


Index: PyOpenGL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/F-9/PyOpenGL.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PyOpenGL.spec	28 Jul 2008 08:34:55 -0000	1.6
+++ PyOpenGL.spec	22 Sep 2008 09:06:25 -0000	1.7
@@ -1,9 +1,9 @@
-%define prever b5
+%define prever b6
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           PyOpenGL
 Version:        3.0.0
-Release:        0.7.%{prever}%{?dist}
+Release:        0.8.%{prever}%{?dist}
 Summary:        Python bindings for OpenGL
 License:        BSD
 Group:          System Environment/Libraries
@@ -86,6 +86,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> 3.0.0-0.8.b6
+- New upstream release 3.0.0b6
+
 * Mon Jul 28 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> 3.0.0-0.7.b5
 - New upstream release 3.0.0b5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Jul 2008 08:34:55 -0000	1.5
+++ sources	22 Sep 2008 09:06:25 -0000	1.6
@@ -1 +1 @@
-4e46b6ce318b82799109a4850dd37c50  PyOpenGL-3.0.0b5.tar.gz
+6a70dd315767064ec78b84a92d2420a8  PyOpenGL-3.0.0b6.tar.gz



From turki at fedoraproject.org  Mon Sep 22 09:08:32 2008
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Mon, 22 Sep 2008 09:08:32 +0000 (UTC)
Subject: rpms/PyOpenGL/F-8 .cvsignore, 1.4, 1.5 PyOpenGL.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20080922090832.7C015700FE@cvs1.fedora.phx.redhat.com>

Author: turki

Update of /cvs/pkgs/rpms/PyOpenGL/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32713

Modified Files:
	.cvsignore PyOpenGL.spec sources 
Log Message:
New upstream release - 3.0.0b6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jul 2008 08:52:29 -0000	1.4
+++ .cvsignore	22 Sep 2008 09:08:02 -0000	1.5
@@ -1 +1 @@
-PyOpenGL-3.0.0b5.tar.gz
+PyOpenGL-3.0.0b6.tar.gz


Index: PyOpenGL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/F-8/PyOpenGL.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PyOpenGL.spec	28 Jul 2008 08:52:29 -0000	1.5
+++ PyOpenGL.spec	22 Sep 2008 09:08:02 -0000	1.6
@@ -1,9 +1,9 @@
-%define prever b5
+%define prever b6
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           PyOpenGL
 Version:        3.0.0
-Release:        0.7.%{prever}%{?dist}
+Release:        0.8.%{prever}%{?dist}
 Summary:        Python bindings for OpenGL
 License:        BSD
 Group:          System Environment/Libraries
@@ -86,6 +86,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> 3.0.0-0.8.b6
+- New upstream release 3.0.0b6
+
 * Mon Jul 28 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> 3.0.0-0.7.b5
 - New upstream release 3.0.0b5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jul 2008 08:52:29 -0000	1.4
+++ sources	22 Sep 2008 09:08:02 -0000	1.5
@@ -1 +1 @@
-4e46b6ce318b82799109a4850dd37c50  PyOpenGL-3.0.0b5.tar.gz
+6a70dd315767064ec78b84a92d2420a8  PyOpenGL-3.0.0b6.tar.gz



From sharkcz at fedoraproject.org  Mon Sep 22 09:26:27 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 22 Sep 2008 09:26:27 +0000 (UTC)
Subject: rpms/collectl/devel .cvsignore, 1.3, 1.4 collectl.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20080922092627.D212C700FE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1275

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Mon Sep 22 2008 Dan Horak <dan[at]danny.cz> 3.1.0-1
- upgrade to upstream version 3.1.0
- remove logrotate support because internal mechanism is used by default



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Jul 2008 08:42:03 -0000	1.3
+++ .cvsignore	22 Sep 2008 09:25:55 -0000	1.4
@@ -1 +1 @@
-collectl-3.0.0.src.tar.gz
+collectl-3.1.0.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/devel/collectl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- collectl.spec	8 Jul 2008 08:42:03 -0000	1.2
+++ collectl.spec	22 Sep 2008 09:25:56 -0000	1.3
@@ -1,13 +1,12 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.0.0
+Version: 3.1.0
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
 Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
 Source1: %{name}.initd
 Source2: %{name}.sysconfig
-Source3: %{name}.logrotate
 URL: http://collectl.sourceforge.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -50,7 +49,6 @@
 mkdir -p        $RPM_BUILD_ROOT%{_initrddir} \
                 $RPM_BUILD_ROOT%{_sysconfdir} \
                 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
-                $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d \
                 $RPM_BUILD_ROOT%{_bindir} \
                 $RPM_BUILD_ROOT%{_libexecdir}/%{name} \
                 $RPM_BUILD_ROOT%{_mandir}/man1/ \
@@ -69,7 +67,6 @@
 install -p -m 644  collectl.conf     $RPM_BUILD_ROOT%{_sysconfdir}
 install -p -m 755  %{SOURCE1}        $RPM_BUILD_ROOT%{_initrddir}/%{name}
 install -p -m 644  %{SOURCE2}        $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
-install -p -m 644  %{SOURCE3}        $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
 %post
 /sbin/chkconfig --add %{name}
@@ -91,13 +88,16 @@
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %{_initrddir}/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_bindir}/*
 %{_libexecdir}/%{name}
 %{_mandir}/man1/*
 %{_localstatedir}/log/%{name}
 
 %changelog
+* Mon Sep 22 2008 Dan Horak <dan[at]danny.cz> 3.1.0-1
+- upgrade to upstream version 3.1.0
+- remove logrotate support because internal mechanism is used by default
+
 * Tue Jul  8 2008 Karel Zak <kzak at redhat.com> 3.0.0-1
 - upgrade to upstream version 3.0.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Jul 2008 08:42:03 -0000	1.3
+++ sources	22 Sep 2008 09:25:56 -0000	1.4
@@ -1 +1 @@
-0f235ac3ad828b84f3f344fa0135b027  collectl-3.0.0.src.tar.gz
+393694547e13c9cfc0046872a80256a9  collectl-3.1.0.src.tar.gz



From pghmcfc at fedoraproject.org  Mon Sep 22 09:27:02 2008
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon, 22 Sep 2008 09:27:02 +0000 (UTC)
Subject: rpms/perl-IO-Socket-SSL/devel .cvsignore, 1.10,
	1.11 perl-IO-Socket-SSL.spec, 1.13, 1.14 sources, 1.10, 1.11
Message-ID: <20080922092702.1C336700FE@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-serv1354

Modified Files:
	.cvsignore perl-IO-Socket-SSL.spec sources 
Log Message:
Update to latest upstream version: 1.16


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Aug 2008 14:20:37 -0000	1.10
+++ .cvsignore	22 Sep 2008 09:26:31 -0000	1.11
@@ -1 +1 @@
-IO-Socket-SSL-1.15.tar.gz
+IO-Socket-SSL-1.16.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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-IO-Socket-SSL.spec	30 Aug 2008 14:20:37 -0000	1.13
+++ perl-IO-Socket-SSL.spec	22 Sep 2008 09:26:31 -0000	1.14
@@ -4,7 +4,7 @@
 #
 
 Name:		perl-IO-Socket-SSL
-Version:	1.15
+Version:	1.16
 Release:	1%{?dist}
 Summary:	Perl library for transparent SSL
 Group:		Development/Libraries
@@ -60,6 +60,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 22 2008 Paul Howarth <paul at city-fan.org> - 1.16-1
+- Update to latest upstream version: 1.16
+
 * Sat Aug 30 2008 Paul Howarth <paul at city-fan.org> - 1.15-1
 - Update to latest upstream version: 1.15
 - Add buildreq and req for perl(Net::LibIDN) to avoid croaking when trying to


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Aug 2008 14:20:37 -0000	1.10
+++ sources	22 Sep 2008 09:26:31 -0000	1.11
@@ -1 +1 @@
-a5e8df9227ed0cac47ed4c4ebea03bdc  IO-Socket-SSL-1.15.tar.gz
+9dbd4e23bdf1aaaf3c263015f1a43a42  IO-Socket-SSL-1.16.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 22 09:29:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:29:35 +0000
Subject: [pkgdb] gnome-applet-jalali-calendar was added for hedayat
Message-ID: <20080922092935.6D4B6208D2B@bastion.fedora.phx.redhat.com>

huzaifas has added Package gnome-applet-jalali-calendar with summary Jalali calendar panel applet for GNOME
huzaifas has approved Package gnome-applet-jalali-calendar
huzaifas has added a Fedora devel branch for gnome-applet-jalali-calendar with an owner of hedayat
huzaifas has approved gnome-applet-jalali-calendar in Fedora devel
huzaifas has approved Package gnome-applet-jalali-calendar
huzaifas has set commit to Approved for packager on gnome-applet-jalali-calendar (Fedora devel)
huzaifas has set build to Approved for packager on gnome-applet-jalali-calendar (Fedora devel)
huzaifas has set checkout to Approved for packager on gnome-applet-jalali-calendar (Fedora devel)
huzaifas has set commit to Approved for uberpackager on gnome-applet-jalali-calendar (Fedora devel)
huzaifas has set build to Approved for uberpackager on gnome-applet-jalali-calendar (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on gnome-applet-jalali-calendar (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-jalali-calendar



From pkgdb at fedoraproject.org  Mon Sep 22 09:31:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:31:29 +0000
Subject: [pkgdb] hunspell-vi was added for caolanm
Message-ID: <20080922093129.8FEA4208DA3@bastion.fedora.phx.redhat.com>

huzaifas has added Package hunspell-vi with summary Vietnamese hunspell dictionaries
huzaifas has approved Package hunspell-vi
huzaifas has added a Fedora devel branch for hunspell-vi with an owner of caolanm
huzaifas has approved hunspell-vi in Fedora devel
huzaifas has approved Package hunspell-vi
huzaifas has set commit to Approved for packager on hunspell-vi (Fedora devel)
huzaifas has set build to Approved for packager on hunspell-vi (Fedora devel)
huzaifas has set checkout to Approved for packager on hunspell-vi (Fedora devel)
huzaifas has set commit to Approved for uberpackager on hunspell-vi (Fedora devel)
huzaifas has set build to Approved for uberpackager on hunspell-vi (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on hunspell-vi (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-vi



From huzaifas at fedoraproject.org  Mon Sep 22 09:31:48 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:31:48 +0000 (UTC)
Subject: rpms/hunspell-vi - New directory
Message-ID: <20080922093148.3B8C7700FE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-vi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsMC2192/rpms/hunspell-vi

Log Message:
Directory /cvs/extras/rpms/hunspell-vi added to the repository




From huzaifas at fedoraproject.org  Mon Sep 22 09:31:48 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:31:48 +0000 (UTC)
Subject: rpms/hunspell-vi/devel - New directory
Message-ID: <20080922093148.84F88700FE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-vi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsMC2192/rpms/hunspell-vi/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-vi/devel added to the repository




From huzaifas at fedoraproject.org  Mon Sep 22 09:31:49 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:31:49 +0000 (UTC)
Subject: rpms/hunspell-vi Makefile,NONE,1.1
Message-ID: <20080922093149.C6A5F700FE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-vi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsMC2192/rpms/hunspell-vi

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-vi


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-vi
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Mon Sep 22 09:31:50 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:31:50 +0000 (UTC)
Subject: rpms/hunspell-vi/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080922093150.64AF9700FE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-vi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsMC2192/rpms/hunspell-vi/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-vi


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-vi
# $Id: Makefile,v 1.1 2008/09/22 09:31:50 huzaifas Exp $
NAME := hunspell-vi
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 22 09:33:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:33:00 +0000
Subject: [pkgdb] perl-Log-Dispatch-Perl was added for corsepiu
Message-ID: <20080922093300.960FE208D9F@bastion.fedora.phx.redhat.com>

huzaifas has added Package perl-Log-Dispatch-Perl with summary Use core Perl functions for logging
huzaifas has approved Package perl-Log-Dispatch-Perl
huzaifas has added a Fedora devel branch for perl-Log-Dispatch-Perl with an owner of corsepiu
huzaifas has approved perl-Log-Dispatch-Perl in Fedora devel
huzaifas has approved Package perl-Log-Dispatch-Perl
huzaifas has set commit to Approved for packager on perl-Log-Dispatch-Perl (Fedora devel)
huzaifas has set build to Approved for packager on perl-Log-Dispatch-Perl (Fedora devel)
huzaifas has set checkout to Approved for packager on perl-Log-Dispatch-Perl (Fedora devel)
huzaifas has set commit to Approved for uberpackager on perl-Log-Dispatch-Perl (Fedora devel)
huzaifas has set build to Approved for uberpackager on perl-Log-Dispatch-Perl (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on perl-Log-Dispatch-Perl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-Perl



From pkgdb at fedoraproject.org  Mon Sep 22 09:33:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:33:02 +0000
Subject: [pkgdb] perl-Log-Dispatch-Perl (Fedora, 9) updated by huzaifas
Message-ID: <20080922093302.E66C9208DA4@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for perl-Log-Dispatch-Perl
huzaifas has set commit to Approved for uberpackager on perl-Log-Dispatch-Perl (Fedora 9)
huzaifas has set build to Approved for uberpackager on perl-Log-Dispatch-Perl (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on perl-Log-Dispatch-Perl (Fedora 9)
huzaifas approved watchbugzilla on perl-Log-Dispatch-Perl (Fedora 9) for perl-sig
huzaifas approved watchcommits on perl-Log-Dispatch-Perl (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-Perl



From pkgdb at fedoraproject.org  Mon Sep 22 09:33:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:33:02 +0000
Subject: [pkgdb] perl-Log-Dispatch-Perl (Fedora, 8) updated by huzaifas
Message-ID: <20080922093303.1BBDC208DAC@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for perl-Log-Dispatch-Perl
huzaifas has set commit to Approved for uberpackager on perl-Log-Dispatch-Perl (Fedora 8)
huzaifas has set build to Approved for uberpackager on perl-Log-Dispatch-Perl (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on perl-Log-Dispatch-Perl (Fedora 8)
huzaifas approved watchbugzilla on perl-Log-Dispatch-Perl (Fedora 8) for perl-sig
huzaifas approved watchcommits on perl-Log-Dispatch-Perl (Fedora 8) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-Perl



From pkgdb at fedoraproject.org  Mon Sep 22 09:33:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:33:02 +0000
Subject: [pkgdb] perl-Log-Dispatch-Perl (Fedora, devel) updated by huzaifas
Message-ID: <20080922093303.05EEB208DA9@bastion.fedora.phx.redhat.com>

huzaifas approved watchbugzilla on perl-Log-Dispatch-Perl (Fedora devel) for perl-sig
huzaifas approved watchcommits on perl-Log-Dispatch-Perl (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-Perl



From huzaifas at fedoraproject.org  Mon Sep 22 09:33:35 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:33:35 +0000 (UTC)
Subject: rpms/perl-Log-Dispatch-Perl/devel - New directory
Message-ID: <20080922093335.652D070140@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-Log-Dispatch-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsbP2311/rpms/perl-Log-Dispatch-Perl/devel

Log Message:
Directory /cvs/extras/rpms/perl-Log-Dispatch-Perl/devel added to the repository




From huzaifas at fedoraproject.org  Mon Sep 22 09:33:35 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:33:35 +0000 (UTC)
Subject: rpms/perl-Log-Dispatch-Perl - New directory
Message-ID: <20080922093335.2BD5D700FE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-Log-Dispatch-Perl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsbP2311/rpms/perl-Log-Dispatch-Perl

Log Message:
Directory /cvs/extras/rpms/perl-Log-Dispatch-Perl added to the repository




From huzaifas at fedoraproject.org  Mon Sep 22 09:33:36 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:33:36 +0000 (UTC)
Subject: rpms/perl-Log-Dispatch-Perl Makefile,NONE,1.1
Message-ID: <20080922093336.63D48700FE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-Log-Dispatch-Perl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsbP2311/rpms/perl-Log-Dispatch-Perl

Added Files:
	Makefile 
Log Message:
Setup of module perl-Log-Dispatch-Perl


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Log-Dispatch-Perl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From huzaifas at fedoraproject.org  Mon Sep 22 09:33:36 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:33:36 +0000 (UTC)
Subject: rpms/perl-Log-Dispatch-Perl/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080922093336.F1616700FE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-Log-Dispatch-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsbP2311/rpms/perl-Log-Dispatch-Perl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Log-Dispatch-Perl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Log-Dispatch-Perl
# $Id: Makefile,v 1.1 2008/09/22 09:33:36 huzaifas Exp $
NAME := perl-Log-Dispatch-Perl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From sharkcz at fedoraproject.org  Mon Sep 22 09:37:48 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 22 Sep 2008 09:37:48 +0000 (UTC)
Subject: rpms/collectl/F-9 .cvsignore, 1.3, 1.4 collectl.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20080922093748.903A6700FE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2754

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Mon Sep 22 2008 Dan Horak <dan[at]danny.cz> 3.1.0-1
- upgrade to upstream version 3.1.0
- remove logrotate support because internal mechanism is used by default



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Jul 2008 06:44:24 -0000	1.3
+++ .cvsignore	22 Sep 2008 09:37:18 -0000	1.4
@@ -1 +1 @@
-collectl-3.0.0.src.tar.gz
+collectl-3.1.0.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-9/collectl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- collectl.spec	9 Jul 2008 06:44:24 -0000	1.2
+++ collectl.spec	22 Sep 2008 09:37:18 -0000	1.3
@@ -1,13 +1,12 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.0.0
+Version: 3.1.0
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
 Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
 Source1: %{name}.initd
 Source2: %{name}.sysconfig
-Source3: %{name}.logrotate
 URL: http://collectl.sourceforge.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -50,7 +49,6 @@
 mkdir -p        $RPM_BUILD_ROOT%{_initrddir} \
                 $RPM_BUILD_ROOT%{_sysconfdir} \
                 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
-                $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d \
                 $RPM_BUILD_ROOT%{_bindir} \
                 $RPM_BUILD_ROOT%{_libexecdir}/%{name} \
                 $RPM_BUILD_ROOT%{_mandir}/man1/ \
@@ -69,7 +67,6 @@
 install -p -m 644  collectl.conf     $RPM_BUILD_ROOT%{_sysconfdir}
 install -p -m 755  %{SOURCE1}        $RPM_BUILD_ROOT%{_initrddir}/%{name}
 install -p -m 644  %{SOURCE2}        $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
-install -p -m 644  %{SOURCE3}        $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
 %post
 /sbin/chkconfig --add %{name}
@@ -91,13 +88,16 @@
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %{_initrddir}/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_bindir}/*
 %{_libexecdir}/%{name}
 %{_mandir}/man1/*
 %{_localstatedir}/log/%{name}
 
 %changelog
+* Mon Sep 22 2008 Dan Horak <dan[at]danny.cz> 3.1.0-1
+- upgrade to upstream version 3.1.0
+- remove logrotate support because internal mechanism is used by default
+
 * Tue Jul  8 2008 Karel Zak <kzak at redhat.com> 3.0.0-1
 - upgrade to upstream version 3.0.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Jul 2008 06:44:24 -0000	1.3
+++ sources	22 Sep 2008 09:37:18 -0000	1.4
@@ -1 +1 @@
-0f235ac3ad828b84f3f344fa0135b027  collectl-3.0.0.src.tar.gz
+393694547e13c9cfc0046872a80256a9  collectl-3.1.0.src.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 22 09:38:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:38:05 +0000
Subject: [pkgdb] perl-IPC-Run-SafeHandles was added for corsepiu
Message-ID: <20080922093806.1B2A0208DA0@bastion.fedora.phx.redhat.com>

huzaifas has added Package perl-IPC-Run-SafeHandles with summary Use IPC::Run and IPC::Run3 safely
huzaifas has approved Package perl-IPC-Run-SafeHandles
huzaifas has added a Fedora devel branch for perl-IPC-Run-SafeHandles with an owner of corsepiu
huzaifas has approved perl-IPC-Run-SafeHandles in Fedora devel
huzaifas has approved Package perl-IPC-Run-SafeHandles
huzaifas has set commit to Approved for packager on perl-IPC-Run-SafeHandles (Fedora devel)
huzaifas has set build to Approved for packager on perl-IPC-Run-SafeHandles (Fedora devel)
huzaifas has set checkout to Approved for packager on perl-IPC-Run-SafeHandles (Fedora devel)
huzaifas has set commit to Approved for uberpackager on perl-IPC-Run-SafeHandles (Fedora devel)
huzaifas has set build to Approved for uberpackager on perl-IPC-Run-SafeHandles (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on perl-IPC-Run-SafeHandles (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-Run-SafeHandles



From pkgdb at fedoraproject.org  Mon Sep 22 09:38:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:38:15 +0000
Subject: [pkgdb] perl-IPC-Run-SafeHandles (Fedora, 8) updated by huzaifas
Message-ID: <20080922093815.999ED208DA5@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for perl-IPC-Run-SafeHandles
huzaifas has set commit to Approved for uberpackager on perl-IPC-Run-SafeHandles (Fedora 8)
huzaifas has set build to Approved for uberpackager on perl-IPC-Run-SafeHandles (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on perl-IPC-Run-SafeHandles (Fedora 8)
huzaifas approved watchbugzilla on perl-IPC-Run-SafeHandles (Fedora 8) for perl-sig
huzaifas approved watchcommits on perl-IPC-Run-SafeHandles (Fedora 8) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-Run-SafeHandles



From pkgdb at fedoraproject.org  Mon Sep 22 09:38:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:38:15 +0000
Subject: [pkgdb] perl-IPC-Run-SafeHandles (Fedora, devel) updated by huzaifas
Message-ID: <20080922093815.AB8C3208DAD@bastion.fedora.phx.redhat.com>

huzaifas approved watchbugzilla on perl-IPC-Run-SafeHandles (Fedora devel) for perl-sig
huzaifas approved watchcommits on perl-IPC-Run-SafeHandles (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-Run-SafeHandles



From pkgdb at fedoraproject.org  Mon Sep 22 09:38:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:38:15 +0000
Subject: [pkgdb] perl-IPC-Run-SafeHandles (Fedora, 9) updated by huzaifas
Message-ID: <20080922093815.A23BF208DAA@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for perl-IPC-Run-SafeHandles
huzaifas has set commit to Approved for uberpackager on perl-IPC-Run-SafeHandles (Fedora 9)
huzaifas has set build to Approved for uberpackager on perl-IPC-Run-SafeHandles (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on perl-IPC-Run-SafeHandles (Fedora 9)
huzaifas approved watchbugzilla on perl-IPC-Run-SafeHandles (Fedora 9) for perl-sig
huzaifas approved watchcommits on perl-IPC-Run-SafeHandles (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-Run-SafeHandles



From huzaifas at fedoraproject.org  Mon Sep 22 09:38:31 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:38:31 +0000 (UTC)
Subject: rpms/perl-IPC-Run-SafeHandles/devel - New directory
Message-ID: <20080922093831.6E8E8700FE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-IPC-Run-SafeHandles/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsnU2966/rpms/perl-IPC-Run-SafeHandles/devel

Log Message:
Directory /cvs/extras/rpms/perl-IPC-Run-SafeHandles/devel added to the repository




From huzaifas at fedoraproject.org  Mon Sep 22 09:38:31 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:38:31 +0000 (UTC)
Subject: rpms/perl-IPC-Run-SafeHandles - New directory
Message-ID: <20080922093831.2F49C700FE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-IPC-Run-SafeHandles
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsnU2966/rpms/perl-IPC-Run-SafeHandles

Log Message:
Directory /cvs/extras/rpms/perl-IPC-Run-SafeHandles added to the repository




From huzaifas at fedoraproject.org  Mon Sep 22 09:38:32 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:38:32 +0000 (UTC)
Subject: rpms/perl-IPC-Run-SafeHandles Makefile,NONE,1.1
Message-ID: <20080922093832.9BC7C700FE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-IPC-Run-SafeHandles
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsnU2966/rpms/perl-IPC-Run-SafeHandles

Added Files:
	Makefile 
Log Message:
Setup of module perl-IPC-Run-SafeHandles


--- NEW FILE Makefile ---
# Top level Makefile for module perl-IPC-Run-SafeHandles
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Mon Sep 22 09:38:32 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:38:32 +0000 (UTC)
Subject: rpms/perl-IPC-Run-SafeHandles/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080922093832.E75D3700FE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-IPC-Run-SafeHandles/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsnU2966/rpms/perl-IPC-Run-SafeHandles/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-IPC-Run-SafeHandles


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-IPC-Run-SafeHandles
# $Id: Makefile,v 1.1 2008/09/22 09:38:32 huzaifas Exp $
NAME := perl-IPC-Run-SafeHandles
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From sharkcz at fedoraproject.org  Mon Sep 22 09:39:46 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 22 Sep 2008 09:39:46 +0000 (UTC)
Subject: rpms/collectl/F-8 .cvsignore, 1.3, 1.4 collectl.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20080922093946.5C433700FE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3277

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Mon Sep 22 2008 Dan Horak <dan[at]danny.cz> 3.1.0-1
- upgrade to upstream version 3.1.0
- remove logrotate support because internal mechanism is used by default



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Jul 2008 06:47:25 -0000	1.3
+++ .cvsignore	22 Sep 2008 09:39:16 -0000	1.4
@@ -1 +1 @@
-collectl-3.0.0.src.tar.gz
+collectl-3.1.0.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-8/collectl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- collectl.spec	9 Jul 2008 06:47:25 -0000	1.2
+++ collectl.spec	22 Sep 2008 09:39:16 -0000	1.3
@@ -1,13 +1,12 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.0.0
+Version: 3.1.0
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
 Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
 Source1: %{name}.initd
 Source2: %{name}.sysconfig
-Source3: %{name}.logrotate
 URL: http://collectl.sourceforge.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -50,7 +49,6 @@
 mkdir -p        $RPM_BUILD_ROOT%{_initrddir} \
                 $RPM_BUILD_ROOT%{_sysconfdir} \
                 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
-                $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d \
                 $RPM_BUILD_ROOT%{_bindir} \
                 $RPM_BUILD_ROOT%{_libexecdir}/%{name} \
                 $RPM_BUILD_ROOT%{_mandir}/man1/ \
@@ -69,7 +67,6 @@
 install -p -m 644  collectl.conf     $RPM_BUILD_ROOT%{_sysconfdir}
 install -p -m 755  %{SOURCE1}        $RPM_BUILD_ROOT%{_initrddir}/%{name}
 install -p -m 644  %{SOURCE2}        $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
-install -p -m 644  %{SOURCE3}        $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
 %post
 /sbin/chkconfig --add %{name}
@@ -91,13 +88,16 @@
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %{_initrddir}/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_bindir}/*
 %{_libexecdir}/%{name}
 %{_mandir}/man1/*
 %{_localstatedir}/log/%{name}
 
 %changelog
+* Mon Sep 22 2008 Dan Horak <dan[at]danny.cz> 3.1.0-1
+- upgrade to upstream version 3.1.0
+- remove logrotate support because internal mechanism is used by default
+
 * Tue Jul  8 2008 Karel Zak <kzak at redhat.com> 3.0.0-1
 - upgrade to upstream version 3.0.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Jul 2008 06:47:25 -0000	1.3
+++ sources	22 Sep 2008 09:39:16 -0000	1.4
@@ -1 +1 @@
-0f235ac3ad828b84f3f344fa0135b027  collectl-3.0.0.src.tar.gz
+393694547e13c9cfc0046872a80256a9  collectl-3.1.0.src.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 22 09:39:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:39:46 +0000
Subject: [pkgdb] collectl: kzak has requested watchbugzilla
Message-ID: <20080922093946.ECA35208D9F@bastion.fedora.phx.redhat.com>

kzak has requested the watchbugzilla acl on collectl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From huzaifas at fedoraproject.org  Mon Sep 22 09:30:01 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:30:01 +0000 (UTC)
Subject: rpms/gnome-applet-jalali-calendar - New directory
Message-ID: <20080922093001.4DFF27013F@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/gnome-applet-jalali-calendar
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsWw1696/rpms/gnome-applet-jalali-calendar

Log Message:
Directory /cvs/extras/rpms/gnome-applet-jalali-calendar added to the repository




From huzaifas at fedoraproject.org  Mon Sep 22 09:30:01 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:30:01 +0000 (UTC)
Subject: rpms/gnome-applet-jalali-calendar/devel - New directory
Message-ID: <20080922093001.9C89F70141@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/gnome-applet-jalali-calendar/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsWw1696/rpms/gnome-applet-jalali-calendar/devel

Log Message:
Directory /cvs/extras/rpms/gnome-applet-jalali-calendar/devel added to the repository




From pkgdb at fedoraproject.org  Mon Sep 22 09:39:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:39:47 +0000
Subject: [pkgdb] collectl: kzak has requested watchcommits
Message-ID: <20080922093947.B0713208DA4@bastion.fedora.phx.redhat.com>

kzak has requested the watchcommits acl on collectl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:29:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:29:37 +0000
Subject: [pkgdb] gnome-applet-jalali-calendar (Fedora, 9) updated by huzaifas
Message-ID: <20080922092937.BEFF3208DA3@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for gnome-applet-jalali-calendar
huzaifas has set commit to Approved for uberpackager on gnome-applet-jalali-calendar (Fedora 9)
huzaifas has set build to Approved for uberpackager on gnome-applet-jalali-calendar (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on gnome-applet-jalali-calendar (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-jalali-calendar



From pkgdb at fedoraproject.org  Mon Sep 22 09:29:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:29:37 +0000
Subject: [pkgdb] gnome-applet-jalali-calendar (Fedora, 8) updated by huzaifas
Message-ID: <20080922092937.D1E54208DA6@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for gnome-applet-jalali-calendar
huzaifas has set commit to Approved for uberpackager on gnome-applet-jalali-calendar (Fedora 8)
huzaifas has set build to Approved for uberpackager on gnome-applet-jalali-calendar (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on gnome-applet-jalali-calendar (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-jalali-calendar



From huzaifas at fedoraproject.org  Mon Sep 22 09:30:03 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:30:03 +0000 (UTC)
Subject: rpms/gnome-applet-jalali-calendar Makefile,NONE,1.1
Message-ID: <20080922093003.91BC37013F@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/gnome-applet-jalali-calendar
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsWw1696/rpms/gnome-applet-jalali-calendar

Added Files:
	Makefile 
Log Message:
Setup of module gnome-applet-jalali-calendar


--- NEW FILE Makefile ---
# Top level Makefile for module gnome-applet-jalali-calendar
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Mon Sep 22 09:30:04 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:30:04 +0000 (UTC)
Subject: rpms/gnome-applet-jalali-calendar/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080922093004.14A487013F@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/gnome-applet-jalali-calendar/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsWw1696/rpms/gnome-applet-jalali-calendar/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnome-applet-jalali-calendar


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gnome-applet-jalali-calendar
# $Id: Makefile,v 1.1 2008/09/22 09:30:03 huzaifas Exp $
NAME := gnome-applet-jalali-calendar
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 22 09:39:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:39:48 +0000
Subject: [pkgdb] collectl: kzak has requested commit
Message-ID: <20080922093948.7F45B208DA9@bastion.fedora.phx.redhat.com>

kzak has requested the commit acl on collectl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:39:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:39:49 +0000
Subject: [pkgdb] collectl: kzak has requested approveacls
Message-ID: <20080922093949.6EE28208DAC@bastion.fedora.phx.redhat.com>

kzak has requested the approveacls acl on collectl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:39:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:39:53 +0000
Subject: [pkgdb] collectl: kzak has requested watchbugzilla
Message-ID: <20080922093953.DD208208DAF@bastion.fedora.phx.redhat.com>

kzak has requested the watchbugzilla acl on collectl (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:04 +0000
Subject: [pkgdb] collectl: kzak has requested approveacls
Message-ID: <20080922094004.7439F208D9F@bastion.fedora.phx.redhat.com>

kzak has requested the approveacls acl on collectl (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:04 +0000
Subject: [pkgdb] collectl: kzak has requested watchbugzilla
Message-ID: <20080922094004.7BFC6208DB3@bastion.fedora.phx.redhat.com>

kzak has requested the watchbugzilla acl on collectl (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:04 +0000
Subject: [pkgdb] collectl: kzak has requested watchcommits
Message-ID: <20080922094004.A2FD0208DB6@bastion.fedora.phx.redhat.com>

kzak has requested the watchcommits acl on collectl (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:06 +0000
Subject: [pkgdb] collectl: kzak has requested approveacls
Message-ID: <20080922094006.2B435208DB9@bastion.fedora.phx.redhat.com>

kzak has requested the approveacls acl on collectl (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:07 +0000
Subject: [pkgdb] collectl: kzak has requested watchcommits
Message-ID: <20080922094007.D321B208DBC@bastion.fedora.phx.redhat.com>

kzak has requested the watchcommits acl on collectl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:09 +0000
Subject: [pkgdb] collectl: kzak has requested approveacls
Message-ID: <20080922094010.02B62208DBE@bastion.fedora.phx.redhat.com>

kzak has requested the approveacls acl on collectl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:12 +0000
Subject: [pkgdb] collectl: kzak has requested watchbugzilla
Message-ID: <20080922094012.83ECD208DC3@bastion.fedora.phx.redhat.com>

kzak has requested the watchbugzilla acl on collectl (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:08 +0000
Subject: [pkgdb] collectl: kzak has requested commit
Message-ID: <20080922094013.AE56E208DA9@bastion.fedora.phx.redhat.com>

kzak has requested the commit acl on collectl (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:14 +0000
Subject: [pkgdb] collectl: kzak has requested commit
Message-ID: <20080922094014.96D5E208DC7@bastion.fedora.phx.redhat.com>

kzak has requested the commit acl on collectl (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:16 +0000
Subject: [pkgdb] collectl: kzak has requested approveacls
Message-ID: <20080922094016.201F2208DCA@bastion.fedora.phx.redhat.com>

kzak has requested the approveacls acl on collectl (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:08 +0000
Subject: [pkgdb] collectl: kzak has requested watchcommits
Message-ID: <20080922094019.7F204208DCC@bastion.fedora.phx.redhat.com>

kzak has requested the watchcommits acl on collectl (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:23 +0000
Subject: [pkgdb] collectl: kzak has requested watchbugzilla
Message-ID: <20080922094023.A05D7208DCF@bastion.fedora.phx.redhat.com>

kzak has requested the watchbugzilla acl on collectl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:23 +0000
Subject: [pkgdb] collectl: kzak has requested commit
Message-ID: <20080922094023.A29CB208DD0@bastion.fedora.phx.redhat.com>

kzak has requested the commit acl on collectl (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:23 +0000
Subject: [pkgdb] collectl: kzak has requested commit
Message-ID: <20080922094028.4CEE2208DB0@bastion.fedora.phx.redhat.com>

kzak has requested the commit acl on collectl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:34 +0000
Subject: [pkgdb] cpan-upload was added for cweyl
Message-ID: <20080922094035.182F7208DD4@bastion.fedora.phx.redhat.com>

huzaifas has added Package cpan-upload with summary Automate the uploading of files to the CPAN (PAUSE)
huzaifas has approved Package cpan-upload
huzaifas has added a Fedora devel branch for cpan-upload with an owner of cweyl
huzaifas has approved cpan-upload in Fedora devel
huzaifas has approved Package cpan-upload
huzaifas has set commit to Approved for packager on cpan-upload (Fedora devel)
huzaifas has set build to Approved for packager on cpan-upload (Fedora devel)
huzaifas has set checkout to Approved for packager on cpan-upload (Fedora devel)
huzaifas has set commit to Approved for uberpackager on cpan-upload (Fedora devel)
huzaifas has set build to Approved for uberpackager on cpan-upload (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on cpan-upload (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpan-upload



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:23 +0000
Subject: [pkgdb] collectl: kzak has requested watchcommits
Message-ID: <20080922094028.7BC50208DB2@bastion.fedora.phx.redhat.com>

kzak has requested the watchcommits acl on collectl (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:36 +0000
Subject: [pkgdb] collectl ownership updated
Message-ID: <20080922094036.58796208DD6@bastion.fedora.phx.redhat.com>

Package collectl in Fedora devel was orphaned by kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:36 +0000
Subject: [pkgdb] cpan-upload (Fedora, 9) updated by huzaifas
Message-ID: <20080922094036.8A85E208DD9@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for cpan-upload
huzaifas has set commit to Approved for uberpackager on cpan-upload (Fedora 9)
huzaifas has set build to Approved for uberpackager on cpan-upload (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on cpan-upload (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpan-upload



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:36 +0000
Subject: [pkgdb] cpan-upload (Fedora, 8) updated by huzaifas
Message-ID: <20080922094036.95F73208DDD@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for cpan-upload
huzaifas has set commit to Approved for uberpackager on cpan-upload (Fedora 8)
huzaifas has set build to Approved for uberpackager on cpan-upload (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on cpan-upload (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpan-upload



From pkgdb at fedoraproject.org  Mon Sep 22 09:40:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:43 +0000
Subject: [pkgdb] collectl ownership updated
Message-ID: <20080922094043.F3C45208DE1@bastion.fedora.phx.redhat.com>

Package collectl in Fedora EPEL 5 was orphaned by kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From huzaifas at fedoraproject.org  Mon Sep 22 09:40:50 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:40:50 +0000 (UTC)
Subject: rpms/cpan-upload - New directory
Message-ID: <20080922094050.2AAC9700FE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/cpan-upload
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvssa3507/rpms/cpan-upload

Log Message:
Directory /cvs/extras/rpms/cpan-upload added to the repository




From huzaifas at fedoraproject.org  Mon Sep 22 09:40:50 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:40:50 +0000 (UTC)
Subject: rpms/cpan-upload/devel - New directory
Message-ID: <20080922094050.6FB3C700FE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/cpan-upload/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvssa3507/rpms/cpan-upload/devel

Log Message:
Directory /cvs/extras/rpms/cpan-upload/devel added to the repository




From pkgdb at fedoraproject.org  Mon Sep 22 09:40:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:48 +0000
Subject: [pkgdb] collectl ownership updated
Message-ID: <20080922094048.5CE6B208DE2@bastion.fedora.phx.redhat.com>

Package collectl in Fedora EPEL 4 was orphaned by kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From huzaifas at fedoraproject.org  Mon Sep 22 09:40:51 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:40:51 +0000 (UTC)
Subject: rpms/cpan-upload Makefile,NONE,1.1
Message-ID: <20080922094051.931C4700FE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/cpan-upload
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvssa3507/rpms/cpan-upload

Added Files:
	Makefile 
Log Message:
Setup of module cpan-upload


--- NEW FILE Makefile ---
# Top level Makefile for module cpan-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 huzaifas at fedoraproject.org  Mon Sep 22 09:40:51 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 22 Sep 2008 09:40:51 +0000 (UTC)
Subject: rpms/cpan-upload/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080922094051.E76F5700FE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/cpan-upload/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvssa3507/rpms/cpan-upload/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cpan-upload


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cpan-upload
# $Id: Makefile,v 1.1 2008/09/22 09:40:51 huzaifas Exp $
NAME := cpan-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 Sep 22 09:40:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:40:56 +0000
Subject: [pkgdb] collectl ownership updated
Message-ID: <20080922094056.4CB47208DEE@bastion.fedora.phx.redhat.com>

Package collectl in Fedora 9 was orphaned by kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From sharkcz at fedoraproject.org  Mon Sep 22 09:41:45 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 22 Sep 2008 09:41:45 +0000 (UTC)
Subject: rpms/collectl/EL-5 .cvsignore, 1.3, 1.4 collectl.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20080922094145.2F2A2700FE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3721

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Mon Sep 22 2008 Dan Horak <dan[at]danny.cz> 3.1.0-1
- upgrade to upstream version 3.1.0
- remove logrotate support because internal mechanism is used by default



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Jul 2008 06:49:19 -0000	1.3
+++ .cvsignore	22 Sep 2008 09:41:14 -0000	1.4
@@ -1 +1 @@
-collectl-3.0.0.src.tar.gz
+collectl-3.1.0.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/collectl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- collectl.spec	9 Jul 2008 06:49:19 -0000	1.2
+++ collectl.spec	22 Sep 2008 09:41:14 -0000	1.3
@@ -1,13 +1,12 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.0.0
+Version: 3.1.0
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
 Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
 Source1: %{name}.initd
 Source2: %{name}.sysconfig
-Source3: %{name}.logrotate
 URL: http://collectl.sourceforge.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -50,7 +49,6 @@
 mkdir -p        $RPM_BUILD_ROOT%{_initrddir} \
                 $RPM_BUILD_ROOT%{_sysconfdir} \
                 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
-                $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d \
                 $RPM_BUILD_ROOT%{_bindir} \
                 $RPM_BUILD_ROOT%{_libexecdir}/%{name} \
                 $RPM_BUILD_ROOT%{_mandir}/man1/ \
@@ -69,7 +67,6 @@
 install -p -m 644  collectl.conf     $RPM_BUILD_ROOT%{_sysconfdir}
 install -p -m 755  %{SOURCE1}        $RPM_BUILD_ROOT%{_initrddir}/%{name}
 install -p -m 644  %{SOURCE2}        $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
-install -p -m 644  %{SOURCE3}        $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
 %post
 /sbin/chkconfig --add %{name}
@@ -91,13 +88,16 @@
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %{_initrddir}/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_bindir}/*
 %{_libexecdir}/%{name}
 %{_mandir}/man1/*
 %{_localstatedir}/log/%{name}
 
 %changelog
+* Mon Sep 22 2008 Dan Horak <dan[at]danny.cz> 3.1.0-1
+- upgrade to upstream version 3.1.0
+- remove logrotate support because internal mechanism is used by default
+
 * Tue Jul  8 2008 Karel Zak <kzak at redhat.com> 3.0.0-1
 - upgrade to upstream version 3.0.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Jul 2008 06:49:19 -0000	1.3
+++ sources	22 Sep 2008 09:41:14 -0000	1.4
@@ -1 +1 @@
-0f235ac3ad828b84f3f344fa0135b027  collectl-3.0.0.src.tar.gz
+393694547e13c9cfc0046872a80256a9  collectl-3.1.0.src.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 22 09:41:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:41:00 +0000
Subject: [pkgdb] collectl ownership updated
Message-ID: <20080922094100.D8BED208DBB@bastion.fedora.phx.redhat.com>

Package collectl in Fedora 8 was orphaned by kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:42:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:42:59 +0000
Subject: [pkgdb] collectl ownership updated
Message-ID: <20080922094259.A2B23208DB5@bastion.fedora.phx.redhat.com>

Package collectl in Fedora EPEL 5 is now owned by sharkcz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:43:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:43:15 +0000
Subject: [pkgdb] collectl ownership updated
Message-ID: <20080922094315.866D6208DB8@bastion.fedora.phx.redhat.com>

Package collectl in Fedora 9 is now owned by sharkcz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:42:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:42:56 +0000
Subject: [pkgdb] collectl ownership updated
Message-ID: <20080922094258.16710208DA3@bastion.fedora.phx.redhat.com>

Package collectl in Fedora devel is now owned by sharkcz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:43:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:43:09 +0000
Subject: [pkgdb] collectl ownership updated
Message-ID: <20080922094309.96ABD208DB6@bastion.fedora.phx.redhat.com>

Package collectl in Fedora EPEL 4 is now owned by sharkcz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:43:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:43:20 +0000
Subject: [pkgdb] collectl ownership updated
Message-ID: <20080922094320.3E659208DBE@bastion.fedora.phx.redhat.com>

Package collectl in Fedora 8 is now owned by sharkcz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:43:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:43:28 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094328.F0AA2208DC0@bastion.fedora.phx.redhat.com>

sharkcz has set the watchbugzilla acl on collectl (Fedora devel) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:43:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:43:30 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094330.DFEA9208DC3@bastion.fedora.phx.redhat.com>

sharkcz has set the watchcommits acl on collectl (Fedora devel) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:43:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:43:40 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094340.6CEDC208DAA@bastion.fedora.phx.redhat.com>

sharkcz has set the watchbugzilla acl on collectl (Fedora EPEL 5) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:43:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:43:42 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094342.50E30208DC4@bastion.fedora.phx.redhat.com>

sharkcz has set the watchcommits acl on collectl (Fedora EPEL 5) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:43:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:43:44 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094344.1D313208DC7@bastion.fedora.phx.redhat.com>

sharkcz has set the commit acl on collectl (Fedora EPEL 5) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:43:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:43:45 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094345.ECCF3208DC9@bastion.fedora.phx.redhat.com>

sharkcz has set the approveacls acl on collectl (Fedora EPEL 5) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:43:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:43:42 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094343.9D2F9208DAB@bastion.fedora.phx.redhat.com>

sharkcz has set the commit acl on collectl (Fedora devel) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:43:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:43:47 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094347.9335B208D9F@bastion.fedora.phx.redhat.com>

sharkcz has set the watchbugzilla acl on collectl (Fedora EPEL 4) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:43:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:43:42 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094348.937D8208DCD@bastion.fedora.phx.redhat.com>

sharkcz has set the approveacls acl on collectl (Fedora devel) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:43:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:43:56 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094356.A75D0208DD4@bastion.fedora.phx.redhat.com>

sharkcz has set the watchcommits acl on collectl (Fedora 9) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:44:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:44:00 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094400.25890208DBF@bastion.fedora.phx.redhat.com>

sharkcz has set the approveacls acl on collectl (Fedora 9) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:44:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:44:03 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094403.A3D24208DE3@bastion.fedora.phx.redhat.com>

sharkcz has set the watchcommits acl on collectl (Fedora 8) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:44:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:44:05 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094405.0E950208DDF@bastion.fedora.phx.redhat.com>

sharkcz has set the approveacls acl on collectl (Fedora 8) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:44:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:44:08 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094409.0F3AD208DB3@bastion.fedora.phx.redhat.com>

sharkcz has set the watchcommits acl on collectl (Fedora EPEL 4) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:43:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:43:50 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094350.43418208DD0@bastion.fedora.phx.redhat.com>

sharkcz has set the commit acl on collectl (Fedora EPEL 4) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:43:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:43:51 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094351.E100A208DD3@bastion.fedora.phx.redhat.com>

sharkcz has set the approveacls acl on collectl (Fedora EPEL 4) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:44:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:44:09 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094409.54C74208DE2@bastion.fedora.phx.redhat.com>

sharkcz has set the watchbugzilla acl on collectl (Fedora 9) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:44:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:44:09 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094409.72E7E208DE8@bastion.fedora.phx.redhat.com>

sharkcz has set the commit acl on collectl (Fedora 9) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:44:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:44:09 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094409.764D5208DE9@bastion.fedora.phx.redhat.com>

sharkcz has set the watchbugzilla acl on collectl (Fedora 8) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:44:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:44:09 +0000
Subject: [pkgdb] collectl had acl change status
Message-ID: <20080922094409.82C3D208DEC@bastion.fedora.phx.redhat.com>

sharkcz has set the commit acl on collectl (Fedora 8) to Approved for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From sharkcz at fedoraproject.org  Mon Sep 22 09:45:56 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 22 Sep 2008 09:45:56 +0000 (UTC)
Subject: rpms/collectl/EL-4 .cvsignore, 1.3, 1.4 collectl.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20080922094556.B54F2700FE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4267

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Mon Sep 22 2008 Dan Horak <dan[at]danny.cz> 3.1.0-1
- upgrade to upstream version 3.1.0
- remove logrotate support because internal mechanism is used by default



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Jul 2008 06:51:34 -0000	1.3
+++ .cvsignore	22 Sep 2008 09:45:26 -0000	1.4
@@ -1 +1 @@
-collectl-3.0.0.src.tar.gz
+collectl-3.1.0.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-4/collectl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- collectl.spec	9 Jul 2008 06:51:34 -0000	1.2
+++ collectl.spec	22 Sep 2008 09:45:26 -0000	1.3
@@ -1,13 +1,12 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.0.0
+Version: 3.1.0
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
 Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
 Source1: %{name}.initd
 Source2: %{name}.sysconfig
-Source3: %{name}.logrotate
 URL: http://collectl.sourceforge.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -50,7 +49,6 @@
 mkdir -p        $RPM_BUILD_ROOT%{_initrddir} \
                 $RPM_BUILD_ROOT%{_sysconfdir} \
                 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
-                $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d \
                 $RPM_BUILD_ROOT%{_bindir} \
                 $RPM_BUILD_ROOT%{_libexecdir}/%{name} \
                 $RPM_BUILD_ROOT%{_mandir}/man1/ \
@@ -69,7 +67,6 @@
 install -p -m 644  collectl.conf     $RPM_BUILD_ROOT%{_sysconfdir}
 install -p -m 755  %{SOURCE1}        $RPM_BUILD_ROOT%{_initrddir}/%{name}
 install -p -m 644  %{SOURCE2}        $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
-install -p -m 644  %{SOURCE3}        $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
 %post
 /sbin/chkconfig --add %{name}
@@ -91,13 +88,16 @@
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %{_initrddir}/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_bindir}/*
 %{_libexecdir}/%{name}
 %{_mandir}/man1/*
 %{_localstatedir}/log/%{name}
 
 %changelog
+* Mon Sep 22 2008 Dan Horak <dan[at]danny.cz> 3.1.0-1
+- upgrade to upstream version 3.1.0
+- remove logrotate support because internal mechanism is used by default
+
 * Tue Jul  8 2008 Karel Zak <kzak at redhat.com> 3.0.0-1
 - upgrade to upstream version 3.0.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Jul 2008 06:51:34 -0000	1.3
+++ sources	22 Sep 2008 09:45:26 -0000	1.4
@@ -1 +1 @@
-0f235ac3ad828b84f3f344fa0135b027  collectl-3.0.0.src.tar.gz
+393694547e13c9cfc0046872a80256a9  collectl-3.1.0.src.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 22 09:47:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:47:09 +0000
Subject: [pkgdb] collectl: sharkcz has given up watchbugzilla
Message-ID: <20080922094711.26151208D9E@bastion.fedora.phx.redhat.com>

sharkcz has given up the watchbugzilla acl on collectl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:49:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:49:21 +0000
Subject: [pkgdb] collectl: sharkcz has given up commit
Message-ID: <20080922094921.6ACF7208DA0@bastion.fedora.phx.redhat.com>

sharkcz has given up the commit acl on collectl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:49:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:49:21 +0000
Subject: [pkgdb] collectl: sharkcz has given up watchcommits
Message-ID: <20080922094921.A0656208DA5@bastion.fedora.phx.redhat.com>

sharkcz has given up the watchcommits acl on collectl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:49:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:49:22 +0000
Subject: [pkgdb] collectl: sharkcz has given up approveacls
Message-ID: <20080922094922.6C4B7208DA8@bastion.fedora.phx.redhat.com>

sharkcz has given up the approveacls acl on collectl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:49:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:49:23 +0000
Subject: [pkgdb] collectl: sharkcz has given up watchbugzilla
Message-ID: <20080922094923.DED5D208DAB@bastion.fedora.phx.redhat.com>

sharkcz has given up the watchbugzilla acl on collectl (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:49:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:49:25 +0000
Subject: [pkgdb] collectl: sharkcz has given up watchcommits
Message-ID: <20080922094925.9B47A208DAF@bastion.fedora.phx.redhat.com>

sharkcz has given up the watchcommits acl on collectl (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:49:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:49:26 +0000
Subject: [pkgdb] collectl: sharkcz has given up commit
Message-ID: <20080922094926.B787E208DB2@bastion.fedora.phx.redhat.com>

sharkcz has given up the commit acl on collectl (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:49:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:49:28 +0000
Subject: [pkgdb] collectl: sharkcz has given up approveacls
Message-ID: <20080922094928.9C524208DB5@bastion.fedora.phx.redhat.com>

sharkcz has given up the approveacls acl on collectl (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:49:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:49:31 +0000
Subject: [pkgdb] collectl: sharkcz has given up watchbugzilla
Message-ID: <20080922094931.2F3CE208DB8@bastion.fedora.phx.redhat.com>

sharkcz has given up the watchbugzilla acl on collectl (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:49:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:49:31 +0000
Subject: [pkgdb] collectl: sharkcz has given up watchcommits
Message-ID: <20080922094931.88F8D208DBB@bastion.fedora.phx.redhat.com>

sharkcz has given up the watchcommits acl on collectl (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:49:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:49:33 +0000
Subject: [pkgdb] collectl: sharkcz has given up commit
Message-ID: <20080922094933.19A77208DBD@bastion.fedora.phx.redhat.com>

sharkcz has given up the commit acl on collectl (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:49:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:49:34 +0000
Subject: [pkgdb] collectl: sharkcz has given up approveacls
Message-ID: <20080922094934.B5C7B208DBF@bastion.fedora.phx.redhat.com>

sharkcz has given up the approveacls acl on collectl (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:49:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:49:36 +0000
Subject: [pkgdb] collectl: sharkcz has given up watchbugzilla
Message-ID: <20080922094936.7118A208DC3@bastion.fedora.phx.redhat.com>

sharkcz has given up the watchbugzilla acl on collectl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:49:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:49:39 +0000
Subject: [pkgdb] collectl: sharkcz has given up commit
Message-ID: <20080922094939.0DE1C208DC9@bastion.fedora.phx.redhat.com>

sharkcz has given up the commit acl on collectl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:49:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:49:37 +0000
Subject: [pkgdb] collectl: sharkcz has given up watchcommits
Message-ID: <20080922094937.711E6208DC6@bastion.fedora.phx.redhat.com>

sharkcz has given up the watchcommits acl on collectl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:49:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:49:40 +0000
Subject: [pkgdb] collectl: sharkcz has given up approveacls
Message-ID: <20080922094940.98AF3208DCC@bastion.fedora.phx.redhat.com>

sharkcz has given up the approveacls acl on collectl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:49:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:49:41 +0000
Subject: [pkgdb] collectl: sharkcz has given up watchbugzilla
Message-ID: <20080922094941.C4BAF208DCF@bastion.fedora.phx.redhat.com>

sharkcz has given up the watchbugzilla acl on collectl (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:49:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:49:42 +0000
Subject: [pkgdb] collectl: sharkcz has given up watchcommits
Message-ID: <20080922094942.98906208DD2@bastion.fedora.phx.redhat.com>

sharkcz has given up the watchcommits acl on collectl (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:49:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:49:48 +0000
Subject: [pkgdb] collectl: sharkcz has given up commit
Message-ID: <20080922094949.047C1208DD3@bastion.fedora.phx.redhat.com>

sharkcz has given up the commit acl on collectl (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From pkgdb at fedoraproject.org  Mon Sep 22 09:49:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 09:49:44 +0000
Subject: [pkgdb] collectl: sharkcz has given up approveacls
Message-ID: <20080922094944.577CD208DA2@bastion.fedora.phx.redhat.com>

sharkcz has given up the approveacls acl on collectl (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectl



From mhlavink at fedoraproject.org  Mon Sep 22 10:02:29 2008
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 22 Sep 2008 10:02:29 +0000 (UTC)
Subject: rpms/pciutils/F-9 pciutils-2.2.10-wget-timestamping.patch, NONE,
	1.1 pciutils-3.0.1-superh-support.patch, NONE, 1.1 pciutils.spec,
	1.59, 1.60
Message-ID: <20080922100229.B87C27013E@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5109

Modified Files:
	pciutils.spec 
Added Files:
	pciutils-2.2.10-wget-timestamping.patch 
	pciutils-3.0.1-superh-support.patch 
Log Message:
support Super-H (#446600), fix: wget timestamping (#441946), broken -L in libpci.pc (#456469)


pciutils-2.2.10-wget-timestamping.patch:

--- NEW FILE pciutils-2.2.10-wget-timestamping.patch ---
diff -up pciutils-2.2.10/update-pciids.sh.wget-timestamping pciutils-2.2.10/update-pciids.sh
--- pciutils-2.2.10/update-pciids.sh.wget-timestamping	2008-09-22 11:31:22.000000000 +0200
+++ pciutils-2.2.10/update-pciids.sh	2008-09-22 11:39:11.102527588 +0200
@@ -33,7 +33,7 @@ if which curl >/dev/null 2>&1 ; then
 	DL="curl -o $DEST.new $SRC"
     ${quiet} && DL="$DL -s -S"
 elif which wget >/dev/null 2>&1 ; then
-	DL="wget -O $DEST.new $SRC"
+	DL="wget -no-timestamping -O $DEST.new $SRC"
 	${quiet} && DL="$DL -q"
 elif which lynx >/dev/null 2>&1 ; then
 	DL="eval lynx -source $SRC >$DEST.new"

pciutils-3.0.1-superh-support.patch:

--- NEW FILE pciutils-3.0.1-superh-support.patch ---
diff -up pciutils-3.0.1/lib/configure.superh pciutils-3.0.1/lib/configure
--- pciutils-3.0.1/lib/configure.superh	2008-09-19 11:37:51.000000000 +0200
+++ pciutils-3.0.1/lib/configure	2008-09-19 11:38:46.133527866 +0200
@@ -71,6 +71,8 @@ define PCI_ARCH_S390X
 #define PCI_ARCH_SPARC64
 #elif defined(__sparc__)
 #define PCI_ARCH_SPARC
+#elif defined(__sh__)
+#define PCI_ARCH_SH
 #else
 #error Unknown Arch
 #endif


Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-9/pciutils.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- pciutils.spec	27 May 2008 00:07:03 -0000	1.59
+++ pciutils.spec	22 Sep 2008 10:01:57 -0000	1.60
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	2.2.10
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch0:		pciutils-strip.patch
 Patch1: 	pciutils-2.2.4-buf.patch
@@ -11,6 +11,9 @@
 Patch8: 	pciutils-2.2.10-multilib.patch
 Patch9: 	pciutils-dir-d.patch
 Patch10:	pciutils-2.2.10-sparc-support.patch
+Patch11:	pciutils-3.0.1-superh-support.patch
+#backported patch from mainstream 3.0.1:
+Patch12:	pciutils-2.2.10-wget-timestamping.patch
 License:	GPLv2+
 URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,11 +49,18 @@
 %patch8 -p1 -b .multilib
 %patch9 -p1 -b .dird
 %patch10 -p1 -b .sparc
+%patch11 -p1 -b .superh
+%patch12 -p1 -b .wgettimestamp
+
 sed -i -e 's/^SRC=.*/SRC="http:\/\/pciids.sourceforge.net\/pci.ids"/' update-pciids.sh
 
 %build
 make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" PREFIX="/usr" IDSDIR="/usr/share/hwdata" PCI_IDS="pci.ids" %{?_smp_mflags}
 
+#fix lib vs. lib64 in libpci.pc (static Makefile is used)
+mv lib/libpci.pc lib/libpci.pc.old
+sed <lib/libpci.pc.old >lib/libpci.pc "s|^libdir=.*$|libdir=%{_libdir}|"
+rm lib/libpci.pc.old
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -81,6 +91,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Sep 22 2008 Michal Hlavinka <mhlavink at redhat.com> 2.2.10-3
+- add support for Super-H (sh3,sh4) (#446600)
+- fix: broken -L in libpci.pc (#456469)
+- fix: update-pciids broken with wget 1.11 and "timestamping = on" in wgetrc (#441946)
+
 * Mon May 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-2
 - add sparc support
 



From caolanm at fedoraproject.org  Mon Sep 22 10:08:10 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 22 Sep 2008 10:08:10 +0000 (UTC)
Subject: rpms/hunspell-vi/devel hunspell-vi.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080922100810.6C607700FE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-vi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5956/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-vi.spec import.log 
Log Message:



--- NEW FILE hunspell-vi.spec ---
Name: hunspell-vi
Summary: Vietnamese hunspell dictionaries
%define upstreamid 20080604
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://hunspell-spellcheck-vi.googlecode.com/files/vi_VN.zip
Group: Applications/Text
URL: http://code.google.com/p/hunspell-spellcheck-vi
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPL+
BuildArch: noarch

Requires: hunspell

%description
Vietnamese hunspell dictionaries.

%prep
%setup -q -c -n hunspell-vi

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_vi_VN.txt Copyright
%{_datadir}/myspell/*

%changelog
* Thu Sep 18 2006 Caolan McNamara <caolanm at redhat.com> - 0.20080604-1
- initial version


--- NEW FILE import.log ---
hunspell-vi-0_20080604-1_fc9:HEAD:hunspell-vi-0.20080604-1.fc9.src.rpm:1222078137


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-vi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Sep 2008 09:31:49 -0000	1.1
+++ .cvsignore	22 Sep 2008 10:07:39 -0000	1.2
@@ -0,0 +1 @@
+vi_VN.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-vi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 09:31:50 -0000	1.1
+++ sources	22 Sep 2008 10:07:40 -0000	1.2
@@ -0,0 +1 @@
+4145805858071f0c5f3b1201b4ceb91e  vi_VN.zip



From pkgdb at fedoraproject.org  Mon Sep 22 10:09:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 10:09:01 +0000
Subject: [pkgdb] perl-Log-Dispatch-Perl summary updated by huzaifas
Message-ID: <20080922100901.6C7C4208D9E@bastion.fedora.phx.redhat.com>

huzaifas set package perl-Log-Dispatch-Perl summary to Use core Perl functions for logging

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-Perl



From pkgdb at fedoraproject.org  Mon Sep 22 10:09:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 10:09:01 +0000
Subject: [pkgdb] perl-Log-Dispatch-Perl (Fedora, 9) updated by huzaifas
Message-ID: <20080922100901.75BC0208DA7@bastion.fedora.phx.redhat.com>

huzaifas changed owner of perl-Log-Dispatch-Perl in Fedora 9 to corsepiu
huzaifas approved watchbugzilla on perl-Log-Dispatch-Perl (Fedora 9) for perl-sig
huzaifas approved watchcommits on perl-Log-Dispatch-Perl (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-Perl



From pkgdb at fedoraproject.org  Mon Sep 22 10:09:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 10:09:01 +0000
Subject: [pkgdb] perl-Log-Dispatch-Perl (Fedora, 8) updated by huzaifas
Message-ID: <20080922100901.92487208DAB@bastion.fedora.phx.redhat.com>

huzaifas changed owner of perl-Log-Dispatch-Perl in Fedora 8 to corsepiu
huzaifas approved watchbugzilla on perl-Log-Dispatch-Perl (Fedora 8) for perl-sig
huzaifas approved watchcommits on perl-Log-Dispatch-Perl (Fedora 8) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-Perl



From pkgdb at fedoraproject.org  Mon Sep 22 10:09:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 10:09:01 +0000
Subject: [pkgdb] perl-Log-Dispatch-Perl (Fedora, devel) updated by huzaifas
Message-ID: <20080922100901.9624A208DAD@bastion.fedora.phx.redhat.com>

huzaifas changed owner of perl-Log-Dispatch-Perl in Fedora devel to corsepiu
huzaifas approved watchbugzilla on perl-Log-Dispatch-Perl (Fedora devel) for perl-sig
huzaifas approved watchcommits on perl-Log-Dispatch-Perl (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-Perl



From transif at fedoraproject.org  Mon Sep 22 10:17:22 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Mon, 22 Sep 2008 10:17:22 +0000 (UTC)
Subject: comps/po or.po,1.14,1.15
Message-ID: <20080922101722.DB1A8700FE@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6910/po

Modified Files:
	or.po 
Log Message:
    2008-09-22  Manoj Kumar Giri <mgiri at redhat.com> (via
mgiri at fedoraproject.org)
    
      * po/or.po: Updated Oriya Translation.
    



Index: or.po
===================================================================
RCS file: /cvs/pkgs/comps/po/or.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- or.po	17 Sep 2008 22:44:36 -0000	1.14
+++ or.po	22 Sep 2008 10:16:52 -0000	1.15
@@ -4,19 +4,20 @@
 #
 # Subhransu Behera <sbehera at redhat.com>, 2006, 2007.
 # Manoj Kumar Giri <giri.manojkr at gmail.com>, 2008.
+# Manoj Kumar Giri <mgiri at redhat.com>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.or\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-06-16 14:29+0530\n"
-"Last-Translator: Manoj Kumar Giri <giri.manojkr at gmail.com>\n"
+"POT-Creation-Date: 2008-09-22 03:28+0000\n"
+"PO-Revision-Date: 2008-09-22 15:41+0530\n"
+"Last-Translator: Manoj Kumar Giri <mgiri at redhat.com>\n"
 "Language-Team: Oriya\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"
@@ -31,8 +32,7 @@
 #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
-"??????????????? ?????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? ????????? ??????????????? ???????????????????????? ??????????????? ???????????? ????????????????????? ?????????????????????"
+msgstr "??????????????? ?????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? ????????? ??????????????? ???????????????????????? ??????????????? ???????????? ????????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
 #: ../comps-f10.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
@@ -391,8 +391,7 @@
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
-msgstr ""
-"??????.??????.??????. ???????????? ????????? ????????? ??? ?????????????????? ?????????????????? ??? ??????????????? ???????????? ????????? ????????????????????? ????????????????????? ?????????????????? ??????????????????"
+msgstr "??????.??????.??????. ???????????? ????????? ????????? ??? ?????????????????? ?????????????????? ??? ??????????????? ???????????? ????????? ????????????????????? ????????????????????? ?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
 #: ../comps-f10.xml.in.h:79
@@ -408,18 +407,15 @@
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:81
-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:82 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31
-msgid ""
-"Install this group of packages to use the base graphical (X) user interface."
-msgstr ""
-"????????? ?????????????????? (X) ???????????? ????????????????????????????????? ?????? ????????????????????? ??????????????? ???????????? ????????? ????????????????????? ???????????? ?????? ?????????????????? ??????????????????"
+msgid "Install this group of packages to use the base graphical (X) user interface."
+msgstr "????????? ?????????????????? (X) ???????????? ????????????????????????????????? ?????? ????????????????????? ??????????????? ???????????? ????????? ????????????????????? ???????????? ?????? ?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
 #: ../comps-f10.xml.in.h:84
@@ -654,8 +650,7 @@
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
 #: ../comps-f10.xml.in.h:143 ../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:137
@@ -775,13 +770,11 @@
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:158
 #: ../comps-f10.xml.in.h:168 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
-msgstr ""
-"????????? ?????????????????? ?????? ?????????????????????????????? ???????????????, ??????.??????.??????. ????????????????????????, ????????? ??????????????? ???????????? ?????????????????? ???????????????????????? ??????????????????"
+msgstr "????????? ?????????????????? ?????? ?????????????????????????????? ???????????????, ??????.??????.??????. ????????????????????????, ????????? ??????????????? ???????????? ?????????????????? ???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
 #: ../comps-f10.xml.in.h:169
-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:160
@@ -793,22 +786,19 @@
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
 #: ../comps-f10.xml.in.h:171
-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:162
 #: ../comps-f10.xml.in.h:172 ../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:163
 #: ../comps-f10.xml.in.h:173
-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 ""
 "????????? ????????????????????? ??????????????? ??????.?????????.??????.??????., ??????????????????????????? ????????? ?????????.??????.?????????. ????????? ???????????????????????? ???????????? ????????????????????? ???????????????????????? "
 "????????? ?????????"
@@ -818,8 +808,7 @@
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
-msgstr ""
-"????????? ????????????????????? ??????????????? ??????.?????????.?????????. ????????? ????????????????????? ????????? ?????????????????? ???????????????????????? ????????????????????? ????????????????????? ???????????????????????? ????????? ?????????"
+msgstr "????????? ????????????????????? ??????????????? ??????.?????????.?????????. ????????? ????????????????????? ????????? ?????????????????? ???????????????????????? ????????????????????? ????????????????????? ???????????????????????? ????????? ?????????"
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165
 #: ../comps-f10.xml.in.h:175
@@ -853,14 +842,12 @@
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:169
 #: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
-msgstr ""
-"????????? ??????????????? ??????????????? ?????????????????? ?????????????????? ?????? ??????????????? ????????? ???????????? ?????????????????? ???????????? ?????????????????? ?????????????????? ?????????????????????????????????"
+msgstr "????????? ??????????????? ??????????????? ?????????????????? ?????????????????? ?????? ??????????????? ????????? ???????????? ?????????????????? ???????????? ?????????????????? ?????????????????? ?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:170
 #: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
-msgstr ""
-"????????? ??????????????? ??????????????? ?????????????????? ?????????????????? ?????? ??????????????? ??????.??????.??????. ???????????? ?????????????????? ???????????? ?????????????????? ?????????????????? ?????? ?????????????????????"
+msgstr "????????? ??????????????? ??????????????? ?????????????????? ?????????????????? ?????? ??????????????? ??????.??????.??????. ???????????? ?????????????????? ???????????? ?????????????????? ?????????????????? ?????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:171
 #: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
@@ -874,8 +861,7 @@
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:172
 #: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
-msgstr ""
-"????????? ?????????????????? ?????????????????????, ?????????????????? ?????? ??????????????? ????????? ???????????? ????????? ?????? ????????????????????? ????????????????????? ?????????????????? ?????????????????? ????????? ?????????"
+msgstr "????????? ?????????????????? ?????????????????????, ?????????????????? ?????? ??????????????? ????????? ???????????? ????????? ?????? ????????????????????? ????????????????????? ?????????????????? ?????????????????? ????????? ?????????"
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:173
 #: ../comps-f10.xml.in.h:183
@@ -932,16 +918,13 @@
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
 #: ../comps-f10.xml.in.h:190 ../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:181
 #: ../comps-f10.xml.in.h:191 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
-msgid ""
-"This group is a collection of tools for various hardware specific utilities."
-msgstr ""
-"????????? ?????????????????? ????????????????????? ???????????????????????? ????????????????????????????????? ???????????????????????? ?????????????????? ???????????? ??????????????? ????????????????????? ??????????????? ?????????????????? ????????????"
+msgid "This group is a collection of tools for various hardware specific utilities."
+msgstr "????????? ?????????????????? ????????????????????? ???????????????????????? ????????????????????????????????? ???????????????????????? ?????????????????? ???????????? ??????????????? ????????????????????? ??????????????? ?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:182
 #: ../comps-f10.xml.in.h:192 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
@@ -954,8 +937,7 @@
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
 #: ../comps-f10.xml.in.h:193
-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 ""
 "????????? ????????????????????? ?????????????????? ????????????????????? ?????????????????? ?????? ??????.?????????.?????????. ????????? ???????????? (??????????????????) ?????? ?????????????????? ???????????? ?????????????????? "
 "?????????????????? ????????? ?????????"
@@ -972,8 +954,7 @@
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:185
 #: ../comps-f10.xml.in.h:195
 msgid "This package group contains packages useful for use with MySQL."
-msgstr ""
-"????????? ????????????????????? ?????????????????? ?????????-?????????.????????????.??????. ???????????? ????????????????????????????????? ?????????????????? ????????????????????? ????????????????????? ???????????? ??????????????????"
+msgstr "????????? ????????????????????? ?????????????????? ?????????-?????????.????????????.??????. ???????????? ????????????????????????????????? ?????????????????? ????????????????????? ????????????????????? ???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:186
 #: ../comps-f10.xml.in.h:196
@@ -1171,9 +1152,8 @@
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:70
-#, fuzzy
 msgid "Haskell Development"
-msgstr "????????? ???????????????"
+msgstr "??????????????? ???????????????"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
@@ -1184,44 +1164,36 @@
 msgstr "??????????????????????????????????????? ??????????????? ??????????????? ???????????? ??????????????? ?????????????????? ???????????????????????????????????????"
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "??????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:110
-#, fuzzy
 msgid "Maithili Support"
-msgstr "??????????????? ???????????????"
+msgstr "?????????????????? ???????????????"
 
 #: ../comps-f10.xml.in.h:117
-#, fuzzy
 msgid "Myanmar (Burmese) Support"
-msgstr "???????????????????????? ??????????????????"
+msgstr "???????????????????????? (??????????????????????????????) ??????????????????"
 
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "?????????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:156
-#, fuzzy
 msgid "Support for developing programs in the Haskell programming language."
-msgstr "???????????? ????????????????????????????????? ??????????????????????????? ?????? ??????????????????????????? ????????????????????? ??????????????? ??????????????? ???????????? ??????????????????"
+msgstr "??????????????? ??????????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ??????????????? ??????????????? ???????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:163
-#, fuzzy
 msgid "Tajik Support"
-msgstr "????????? ??????????????????"
+msgstr "??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:205
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "???????????? ??????????????????"
+msgstr "??????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1270,22 +1242,18 @@
 
 #: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
 msgid "This group is a collection of network servers for specific purposes"
-msgstr ""
-"????????? ?????????????????? ????????????????????? ???????????????????????? ????????????????????????????????? ???????????????????????? ?????????????????? ???????????? ??????????????? ????????????????????? ??????????????? ?????????????????? ????????????"
+msgstr "????????? ?????????????????? ????????????????????? ???????????????????????? ????????????????????????????????? ???????????????????????? ?????????????????? ???????????? ??????????????? ????????????????????? ??????????????? ?????????????????? ????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+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
@@ -1293,6 +1261,6 @@
 msgstr "????????????-???-???????????????"
 
 #: ../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 corsepiu at fedoraproject.org  Mon Sep 22 10:25:37 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 22 Sep 2008 10:25:37 +0000 (UTC)
Subject: rpms/perl-Log-Dispatch-Perl/F-8 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20080922102537.8C1DB7013F@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Log-Dispatch-Perl/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7337/F-8

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.03-2
- Fix License: tag.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Dispatch-Perl/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Sep 2008 09:33:36 -0000	1.1
+++ .cvsignore	22 Sep 2008 10:25:07 -0000	1.2
@@ -0,0 +1 @@
+Log-Dispatch-Perl-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Dispatch-Perl/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 09:33:36 -0000	1.1
+++ sources	22 Sep 2008 10:25:07 -0000	1.2
@@ -0,0 +1 @@
+e23dcef192fc33f0213e4c72553b76a7  Log-Dispatch-Perl-0.03.tar.gz



From corsepiu at fedoraproject.org  Mon Sep 22 10:25:37 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 22 Sep 2008 10:25:37 +0000 (UTC)
Subject: rpms/perl-Log-Dispatch-Perl/F-9 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20080922102537.C6362700FE@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Log-Dispatch-Perl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7337/F-9

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.03-2
- Fix License: tag.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Dispatch-Perl/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Sep 2008 09:33:36 -0000	1.1
+++ .cvsignore	22 Sep 2008 10:25:07 -0000	1.2
@@ -0,0 +1 @@
+Log-Dispatch-Perl-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Dispatch-Perl/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 09:33:36 -0000	1.1
+++ sources	22 Sep 2008 10:25:07 -0000	1.2
@@ -0,0 +1 @@
+e23dcef192fc33f0213e4c72553b76a7  Log-Dispatch-Perl-0.03.tar.gz



From corsepiu at fedoraproject.org  Mon Sep 22 10:25:37 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 22 Sep 2008 10:25:37 +0000 (UTC)
Subject: rpms/perl-Log-Dispatch-Perl/devel perl-Log-Dispatch-Perl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080922102537.87181700FE@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Log-Dispatch-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7337/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Log-Dispatch-Perl.spec 
Log Message:
* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.03-2
- Fix License: tag.



--- NEW FILE perl-Log-Dispatch-Perl.spec ---
Name:           perl-Log-Dispatch-Perl
Version:        0.03
Release:        2%{?dist}
Summary:        Use core Perl functions for logging
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Log-Dispatch-Perl/
Source0:        http://www.cpan.org/authors/id/E/EL/ELIZABETH/Log-Dispatch-Perl-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Log::Dispatch) >= 1.16
Requires:       perl(Log::Dispatch) >= 1.16
Requires:	perl(Carp)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The "Log::Dispatch::Perl" module offers a logging alternative using
standard Perl core functions. It allows you to fall back to the common Perl
alternatives for logging, such as "warn" and "cluck". It also adds the
possibility for a logging action to halt the current environment, such as
with "die" and "croak".

%prep
%setup -q -n Log-Dispatch-Perl-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGELOG README TODO VERSION
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.03-2
- Fix License: tag.

* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.03-1
- Add R: perl(Carp).
- Add BR: perl(Test::More).
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Dispatch-Perl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Sep 2008 09:33:36 -0000	1.1
+++ .cvsignore	22 Sep 2008 10:25:06 -0000	1.2
@@ -0,0 +1 @@
+Log-Dispatch-Perl-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Dispatch-Perl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 09:33:36 -0000	1.1
+++ sources	22 Sep 2008 10:25:06 -0000	1.2
@@ -0,0 +1 @@
+e23dcef192fc33f0213e4c72553b76a7  Log-Dispatch-Perl-0.03.tar.gz



From than at fedoraproject.org  Mon Sep 22 10:25:58 2008
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 22 Sep 2008 10:25:58 +0000 (UTC)
Subject: rpms/qt/F-9 qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch,
	NONE, 
	1.1 qt-x11-opensource-src-4.2.2-multilib-optflags.patch, NONE,
	1.1 qt.spec, 1.183, 1.184 sources, 1.35,
	1.36 qt-x11-opensource-src-4.2.2-multilib.patch, 1.1,
	NONE qt-x11-opensource-src-4.4.1-systray.patch, 1.1, NONE
Message-ID: <20080922102558.F1A86700FE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7376

Modified Files:
	qt.spec sources 
Added Files:
	qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch 
	qt-x11-opensource-src-4.2.2-multilib-optflags.patch 
Removed Files:
	qt-x11-opensource-src-4.2.2-multilib.patch 
	qt-x11-opensource-src-4.4.1-systray.patch 
Log Message:
4.4.2


qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch:

--- NEW FILE qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch ---
--- qt-x11-opensource-src-4.2.2/qmake/project.cpp.QMAKEPATH	2006-11-27 11:26:03.000000000 -0600
+++ qt-x11-opensource-src-4.2.2/qmake/project.cpp	2007-02-26 13:45:39.000000000 -0600
@@ -498,6 +498,7 @@
             ret << ((*it) + concat);
     }
     ret << QLibraryInfo::location(QLibraryInfo::DataPath) + concat;
+    ret << QLibraryInfo::location(QLibraryInfo::PrefixPath) + concat;
 
     return ret;
 }

qt-x11-opensource-src-4.2.2-multilib-optflags.patch:

--- NEW FILE qt-x11-opensource-src-4.2.2-multilib-optflags.patch ---
--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf	2007-02-26 15:01:02.000000000 -0600
@@ -14,6 +14,8 @@
 QMAKE_CFLAGS		= -m64
 QMAKE_LFLAGS		= -m64
 
+QMAKE_CFLAGS_RELEASE	+= -O2
+
 include(../common/g++.conf)
 include(../common/linux.conf)
 
--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf	2007-02-26 15:01:34.000000000 -0600
@@ -11,6 +11,8 @@
 QMAKE_CFLAGS		= -m32
 QMAKE_LFLAGS		= -m32
 
+QMAKE_CFLAGS_RELEASE	+= -O2
+
 include(../common/g++.conf)
 include(../common/linux.conf)
 load(qt_config)
--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf	2007-02-26 15:01:26.000000000 -0600
@@ -8,6 +8,8 @@
 QT			+= core gui
 QMAKE_INCREMENTAL_STYLE = sublib
 
+QMAKE_CFLAGS_RELEASE	+= -O2
+
 include(../common/g++.conf)
 include(../common/linux.conf)
 load(qt_config)


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-9/qt.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- qt.spec	6 Aug 2008 13:13:37 -0000	1.183
+++ qt.spec	22 Sep 2008 10:25:28 -0000	1.184
@@ -8,8 +8,8 @@
 %else
 Name:    qt4
 %endif
-Version: 4.4.1
-Release: 2%{?dist}
+Version: 4.4.2
+Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -30,17 +30,17 @@
 Source5: qconfig-multilib.h
 
 # multilib hacks 
-Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
+Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch
+Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch
 Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch
 # kill hardcoded font substitutions (#447298)
 Patch8: qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch
 # under GNOME, default to QGtkStyle if available
 # (otherwise fall back to QCleanlooksStyle)
 Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch
-Patch10: qt-x11-opensource-src-4.4.1-systray.patch
 
 ## qt-copy patches
-%define qt_copy 20080805
+%define qt_copy 20080920
 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}}
@@ -269,16 +269,21 @@
 %setup -q -n qt-x11-opensource-src-%{version}%{?pre} %{?qt_copy:-a 2}
 
 %if 0%{?qt_copy:1}
+echo "0242" >> patches/DISABLED
+echo "0250" >> patches/DISABLED
+echo "0251" >> patches/DISABLED
 test -x apply_patches && ./apply_patches
 %endif
 
 # don't use -b on mkspec files, else they get installed too.
 # multilib hacks no longer required
 %patch2 -p1
+%if "%{_qt4_datadir}" != "%{_qt4_prefix}"
+%patch3 -p1 -b .multilib-QMAKEPATH
+%endif
 %patch5 -p1 -b .bz#437440-as_IN-437440
 %patch8 -p1 -b .font-aliases
 %patch9 -p1 -b .qgtkstyle
-%patch10 -p1 -b .systray
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -726,6 +731,13 @@
 
 
 %changelog
+* Sat Sep 20 2008 Than Ngo <than at redhat.com> 4.4.2-1
+- 4.4.2
+
+* Mon Sep 08 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.4.1-3
+- apply QMAKEPATH portion of multilib patch only if needed
+- qt-copy-patches-20080908
+
 * Wed Aug 06 2008 Than Ngo <than at redhat.com> -  4.4.1-2
 - fix license tag
 - fix Obsoletes: qt-sqlite (missing epoch)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/F-9/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	6 Aug 2008 08:09:57 -0000	1.35
+++ sources	22 Sep 2008 10:25:28 -0000	1.36
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-a94a6f5ef01598bb9980891f2515ff45  qt-x11-opensource-src-4.4.1.tar.bz2
-21597a6486886398a7b771d240ad346b  qt-copy-patches-20080805svn.tar.bz2
+200faca22f861cd09f108df9924f195c  qt-x11-opensource-src-4.4.2.tar.bz2
+d77a7d864375b44b3e9dd3afa53017fa  qt-copy-patches-20080920svn.tar.bz2


--- qt-x11-opensource-src-4.2.2-multilib.patch DELETED ---


--- qt-x11-opensource-src-4.4.1-systray.patch DELETED ---



From corsepiu at fedoraproject.org  Mon Sep 22 10:32:58 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 22 Sep 2008 10:32:58 +0000 (UTC)
Subject: rpms/perl-Log-Dispatch-Perl/F-9 perl-Log-Dispatch-Perl.spec, NONE,
	1.1
Message-ID: <20080922103258.4A672700FE@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Log-Dispatch-Perl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7996

Added Files:
	perl-Log-Dispatch-Perl.spec 
Log Message:
New (Manually add after failed cvs-import.)


--- NEW FILE perl-Log-Dispatch-Perl.spec ---
Name:           perl-Log-Dispatch-Perl
Version:        0.03
Release:        2%{?dist}
Summary:        Use core Perl functions for logging
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Log-Dispatch-Perl/
Source0:        http://www.cpan.org/authors/id/E/EL/ELIZABETH/Log-Dispatch-Perl-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Log::Dispatch) >= 1.16
Requires:       perl(Log::Dispatch) >= 1.16
Requires:	perl(Carp)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The "Log::Dispatch::Perl" module offers a logging alternative using
standard Perl core functions. It allows you to fall back to the common Perl
alternatives for logging, such as "warn" and "cluck". It also adds the
possibility for a logging action to halt the current environment, such as
with "die" and "croak".

%prep
%setup -q -n Log-Dispatch-Perl-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGELOG README TODO VERSION
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.03-2
- Fix License: tag.

* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.03-1
- Add R: perl(Carp).
- Add BR: perl(Test::More).
- Specfile autogenerated by cpanspec 1.77.



From corsepiu at fedoraproject.org  Mon Sep 22 10:33:12 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 22 Sep 2008 10:33:12 +0000 (UTC)
Subject: rpms/perl-Log-Dispatch-Perl/F-8 perl-Log-Dispatch-Perl.spec, NONE,
	1.1
Message-ID: <20080922103312.F28467013F@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Log-Dispatch-Perl/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8034

Added Files:
	perl-Log-Dispatch-Perl.spec 
Log Message:
New (Manually add after failed cvs-import.)


--- NEW FILE perl-Log-Dispatch-Perl.spec ---
Name:           perl-Log-Dispatch-Perl
Version:        0.03
Release:        2%{?dist}
Summary:        Use core Perl functions for logging
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Log-Dispatch-Perl/
Source0:        http://www.cpan.org/authors/id/E/EL/ELIZABETH/Log-Dispatch-Perl-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Log::Dispatch) >= 1.16
Requires:       perl(Log::Dispatch) >= 1.16
Requires:	perl(Carp)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The "Log::Dispatch::Perl" module offers a logging alternative using
standard Perl core functions. It allows you to fall back to the common Perl
alternatives for logging, such as "warn" and "cluck". It also adds the
possibility for a logging action to halt the current environment, such as
with "die" and "croak".

%prep
%setup -q -n Log-Dispatch-Perl-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGELOG README TODO VERSION
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.03-2
- Fix License: tag.

* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.03-1
- Add R: perl(Carp).
- Add BR: perl(Test::More).
- Specfile autogenerated by cpanspec 1.77.



From mbarnes at fedoraproject.org  Mon Sep 22 10:39:38 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 22 Sep 2008 10:39:38 +0000 (UTC)
Subject: rpms/gtkhtml3/devel .cvsignore, 1.81, 1.82 gtkhtml3.spec, 1.132,
	1.133 sources, 1.81, 1.82
Message-ID: <20080922103938.294F5700FE@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8895

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:

* Mon Sep 22 2008 Matthew Barnes <mbarnes at redhat.com> - 3.24.0-1.fc10
- Update to 3.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- .cvsignore	8 Sep 2008 11:14:16 -0000	1.81
+++ .cvsignore	22 Sep 2008 10:39:07 -0000	1.82
@@ -1 +1 @@
-gtkhtml-3.23.92.tar.bz2
+gtkhtml-3.24.0.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- gtkhtml3.spec	8 Sep 2008 11:14:16 -0000	1.132
+++ gtkhtml3.spec	22 Sep 2008 10:39:07 -0000	1.133
@@ -9,7 +9,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.23.92
+Version: 3.24.0
 Release: 1%{?dist}
 License: LGPLv2+ and GPLv2
 Group: System Environment/Libraries
@@ -123,6 +123,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep 22 2008 Matthew Barnes <mbarnes at redhat.com> - 3.24.0-1.fc10
+- Update to 3.24.0
+
 * Mon Sep 08 2008 Matthew Barnes <mbarnes at redhat.com> - 3.23.92-1.fc10
 - Update to 3.23.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sources	8 Sep 2008 11:14:16 -0000	1.81
+++ sources	22 Sep 2008 10:39:07 -0000	1.82
@@ -1 +1 @@
-0081e3df67b5a39becf75334d819e8c0  gtkhtml-3.23.92.tar.bz2
+e83404511fb87837b0fac406b1c77400  gtkhtml-3.24.0.tar.bz2



From mhlavink at fedoraproject.org  Mon Sep 22 10:39:53 2008
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 22 Sep 2008 10:39:53 +0000 (UTC)
Subject: rpms/pciutils/F-8 pciutils-2.2.10-sparc-support.patch, NONE,
	1.1 pciutils-2.2.9-wget-timestamping.patch, NONE,
	1.1 pciutils-3.0.1-superh-support.patch, NONE, 1.1 pciutils.spec,
	1.50, 1.51
Message-ID: <20080922103953.28CC0700FE@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8820

Modified Files:
	pciutils.spec 
Added Files:
	pciutils-2.2.10-sparc-support.patch 
	pciutils-2.2.9-wget-timestamping.patch 
	pciutils-3.0.1-superh-support.patch 
Log Message:
fixes: broken -L in libpci.pc (#456469), timestamping=on in wgetrc (#441946), support for Super-H (sh3,sh4) (#446600)


pciutils-2.2.10-sparc-support.patch:

--- NEW FILE pciutils-2.2.10-sparc-support.patch ---
diff -up pciutils-2.2.10/lib/configure.BAD pciutils-2.2.10/lib/configure
--- pciutils-2.2.10/lib/configure.BAD	2008-05-26 18:28:51.000000000 -0500
+++ pciutils-2.2.10/lib/configure	2008-05-26 18:30:13.000000000 -0500
@@ -57,6 +57,10 @@ cat >$c <<EOF
 #define PCI_ARCH_S390
 #elif defined(__alpha__)
 #define PCI_ARCH_ALPHA
+#elif defined(__sparc__) && defined (__arch64__)
+#define PCI_ARCH_SPARC64
+#elif defined(__sparc__)
+#define PCI_ARCH_SPARC
 #else
 #error Unknown Arch
 #endif

pciutils-2.2.9-wget-timestamping.patch:

--- NEW FILE pciutils-2.2.9-wget-timestamping.patch ---
diff -up pciutils-2.2.9/update-pciids.sh.wget-timestamping pciutils-2.2.9/update-pciids.sh
--- pciutils-2.2.9/update-pciids.sh.wget-timestamping	2006-09-09 12:36:17.000000000 +0200
+++ pciutils-2.2.9/update-pciids.sh	2008-09-22 12:33:04.679529269 +0200
@@ -23,7 +23,7 @@ fi
 if which curl >/dev/null ; then
 	DL="curl -o $DEST.new $SRC"
 elif which wget >/dev/null ; then
-	DL="wget -O $DEST.new $SRC"
+	DL="wget -no-timestamping -O $DEST.new $SRC"
 elif which lynx >/dev/null ; then
 	DL="eval lynx -source $SRC >$DEST.new"
 else

pciutils-3.0.1-superh-support.patch:

--- NEW FILE pciutils-3.0.1-superh-support.patch ---
diff -up pciutils-3.0.1/lib/configure.superh pciutils-3.0.1/lib/configure
--- pciutils-3.0.1/lib/configure.superh	2008-09-19 11:37:51.000000000 +0200
+++ pciutils-3.0.1/lib/configure	2008-09-19 11:38:46.133527866 +0200
@@ -71,6 +71,8 @@ define PCI_ARCH_S390X
 #define PCI_ARCH_SPARC64
 #elif defined(__sparc__)
 #define PCI_ARCH_SPARC
+#elif defined(__sh__)
+#define PCI_ARCH_SH
 #else
 #error Unknown Arch
 #endif


Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-8/pciutils.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- pciutils.spec	4 Dec 2007 10:00:13 -0000	1.50
+++ pciutils.spec	22 Sep 2008 10:39:22 -0000	1.51
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	2.2.9
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch0:		pciutils-strip.patch
 Patch1: 	pciutils-2.2.4-buf.patch
@@ -9,6 +9,10 @@
 Patch6: 	pciutils-2.2.1-idpath.patch
 Patch7:		pciutils-2.1.99-gcc4.patch
 Patch8: 	pciutils-2.2.9-multilib.patch
+Patch10:	pciutils-2.2.10-sparc-support.patch
+Patch11:	pciutils-3.0.1-superh-support.patch
+#backported patch from mainstream 3.0.1:
+Patch12:	pciutils-2.2.9-wget-timestamping.patch
 License:	GPLv2+
 URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,11 +46,19 @@
 %patch6 -p1 -b .idpath
 %patch7 -p1 -b .glibcmacros
 %patch8 -p1 -b .multilib
+%patch10 -p1 -b .sparc
+%patch11 -p1 -b .superh
+%patch12 -p1 -b .wgettimestamp
+
 sed -i -e 's/^SRC=.*/SRC="http:\/\/pciids.sourceforge.net\/pci.ids"/' update-pciids.sh
 
 %build
 make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" PREFIX="/usr" IDSDIR="/usr/share/hwdata" PCI_IDS="pci.ids" %{?_smp_mflags}
 
+#fix lib vs. lib64 in libpci.pc (static Makefile is used)
+mv lib/libpci.pc lib/libpci.pc.old
+sed <lib/libpci.pc.old >lib/libpci.pc "s|^libdir=.*$|libdir=%{_libdir}|"
+rm lib/libpci.pc.old
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -77,6 +89,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Sep 22 2008 Michal Hlavinka <mhlavink at redhat.com> 2.2.9-2
+- add support for Super-H (sh3,sh4) (#446600)
+- fix: broken -L in libpci.pc (#456469)
+- fix: update-pciids broken with wget 1.11 and "timestamping = on" in wgetrc (#441946)
+
 * Tue Nov 20 2007 Harald Hoyer <harald at redhat.com> - 2.2.9-1
 - version 2.2.9
 - added package config file (rhbz#389451)



From jkratoch at fedoraproject.org  Mon Sep 22 10:43:55 2008
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 22 Sep 2008 10:43:55 +0000 (UTC)
Subject: rpms/binutils/devel binutils-2.18.50.0.9-output-format.sed, NONE,
	1.1 binutils.spec, 1.139, 1.140
Message-ID: <20080922104355.DA813700FE@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9478

Modified Files:
	binutils.spec 
Added Files:
	binutils-2.18.50.0.9-output-format.sed 
Log Message:
* Mon Sep 22 2008 Jan Kratochvil <jan.kratochvil at redhat.com> 2.18.50.0.9-4
- Fix *.so scripts for multilib linking (BZ 463101, suggested by Jakub Jelinek).



--- NEW FILE binutils-2.18.50.0.9-output-format.sed ---
# Generate OUTPUT_FORMAT line for .so files from the system linker output.
# Imported from glibc/Makerules.

/ld.*[ 	]-E[BL]/b f
/collect.*[ 	]-E[BL]/b f
/OUTPUT_FORMAT[^)]*$/{N
s/\n[	 ]*/ /
}
t o
: o
s/^.*OUTPUT_FORMAT(\([^,]*\), \1, \1).*$/OUTPUT_FORMAT(\1)/
t q
s/^.*OUTPUT_FORMAT(\([^,]*\), \([^,]*\), \([^,]*\)).*$/\1,\2,\3/
t s
s/^.*OUTPUT_FORMAT(\([^,)]*\).*$)/OUTPUT_FORMAT(\1)/
t q
d
: s
s/"//g
G
s/\n//
s/^\([^,]*\),\([^,]*\),\([^,]*\),B/OUTPUT_FORMAT(\2)/p
s/^\([^,]*\),\([^,]*\),\([^,]*\),L/OUTPUT_FORMAT(\3)/p
s/^\([^,]*\),\([^,]*\),\([^,]*\)/OUTPUT_FORMAT(\1)/p
/,/s|^|*** BUG in libc/scripts/output-format.sed *** |p
q
: q
s/"//g
p
q
: f
s/^.*[ 	]-E\([BL]\)[ 	].*$/,\1/
t h
s/^.*[ 	]-E\([BL]\)$/,\1/
t h
d
: h
h


Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- binutils.spec	22 Sep 2008 00:03:40 -0000	1.139
+++ binutils.spec	22 Sep 2008 10:43:25 -0000	1.140
@@ -17,11 +17,12 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.18.50.0.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
 Source: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2
+Source2: binutils-2.18.50.0.9-output-format.sed
 Patch1: binutils-2.18.50.0.6-ltconfig-multilib.patch
 Patch2: binutils-2.18.50.0.6-ppc64-pie.patch
 Patch3: binutils-2.18.50.0.8-place-orphan.patch
@@ -235,15 +236,29 @@
 %endif
 touch -r bfd/bfd-in2.h %{buildroot}%{_prefix}/include/bfd.h
 
-cat >%{buildroot}%{_prefix}/%{_lib}/libbfd.so <<EOH
-/* GNU ld script
-   The libz dependency is unexpected by legacy build scripts.  */
+# Generate .so linker scripts for dependencies; imported from glibc/Makerules:
 
+# This fragment of linker script gives the OUTPUT_FORMAT statement
+# for the configuration we are building.
+OUTPUT_FORMAT="\
+/* Ensure this .so library will not be used by a link for a different format
+   on a multi-architecture system.  */
+$(gcc $CFLAGS $LDFLAGS -shared -x c /dev/null -o /dev/null -Wl,--verbose -v 2>&1 | sed -n -f "%{SOURCE2}")"
+
+tee %{buildroot}%{_prefix}/%{_lib}/libbfd.so <<EOH
+/* GNU ld script */
+
+$OUTPUT_FORMAT
+
+/* The libz dependency is unexpected by legacy build scripts.  */
 INPUT ( %{_libdir}/libbfd.a -liberty -lz )
 EOH
-cat >%{buildroot}%{_prefix}/%{_lib}/libopcodes.so <<EOH
+
+tee %{buildroot}%{_prefix}/%{_lib}/libopcodes.so <<EOH
 /* GNU ld script */
 
+$OUTPUT_FORMAT
+
 INPUT ( %{_libdir}/libopcodes.a -lbfd )
 EOH
 
@@ -332,6 +347,9 @@
 %endif # %{isnative}
 
 %changelog
+* Mon Sep 22 2008 Jan Kratochvil <jan.kratochvil at redhat.com> 2.18.50.0.9-4
+- Fix *.so scripts for multilib linking (BZ 463101, suggested by Jakub Jelinek).
+
 * Sun Sep 21 2008 Jan Kratochvil <jan.kratochvil at redhat.com> 2.18.50.0.9-3
 - Provide libbfd.so and libopcodes.so for automatic dependencies (BZ 463101).
 - Fix .eh_frame_hdr build on C++ files with discarded common groups (BZ 458950).



From corsepiu at fedoraproject.org  Mon Sep 22 10:44:45 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 22 Sep 2008 10:44:45 +0000 (UTC)
Subject: rpms/perl-IPC-Run-SafeHandles/devel import.log, NONE,
	1.1 perl-IPC-Run-SafeHandles.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080922104445.E963C700FE@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-IPC-Run-SafeHandles/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9786/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-IPC-Run-SafeHandles.spec 
Log Message:



--- NEW FILE import.log ---
perl-IPC-Run-SafeHandles-0_02-1_fc10:HEAD:perl-IPC-Run-SafeHandles-0.02-1.fc10.src.rpm:1222080230


--- NEW FILE perl-IPC-Run-SafeHandles.spec ---
Name:           perl-IPC-Run-SafeHandles
Version:        0.02
Release:        1%{?dist}
Summary:        Use IPC::Run and IPC::Run3 safely
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/IPC-Run-SafeHandles/
Source0:        http://www.cpan.org/authors/id/C/CL/CLKAO/IPC-Run-SafeHandles-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 1:5.8.0
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)

# for improved tests
BuildRequires: perl(Test::Pod::Coverage) >= 1.04
BuildRequires: perl(Test::Pod) >= 1.14

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
IPC::Run and IPC::Run3 are both very upset when you try to use them under
environments where you have STDOUT and/or STDERR tied to something else,
such as under fastcgi.

%prep
%setup -q -n IPC-Run-SafeHandles-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.02-1
- Manually cleanup BRs.
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run-SafeHandles/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Sep 2008 09:38:32 -0000	1.1
+++ .cvsignore	22 Sep 2008 10:44:15 -0000	1.2
@@ -0,0 +1 @@
+IPC-Run-SafeHandles-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run-SafeHandles/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 09:38:32 -0000	1.1
+++ sources	22 Sep 2008 10:44:15 -0000	1.2
@@ -0,0 +1 @@
+bf4838a74b393d9a827e5b35e3c26a9e  IPC-Run-SafeHandles-0.02.tar.gz



From mbarnes at fedoraproject.org  Mon Sep 22 10:47:14 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 22 Sep 2008 10:47:14 +0000 (UTC)
Subject: rpms/evolution-exchange/devel
	evolution-exchange-2.24.0-compiler-warnings.patch, NONE,
	1.1 .cvsignore, 1.29, 1.30 evolution-exchange.spec, 1.41,
	1.42 sources, 1.29, 1.30
Message-ID: <20080922104714.D2CB0700FE@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10115

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Added Files:
	evolution-exchange-2.24.0-compiler-warnings.patch 
Log Message:

* Mon Sep 22 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.0-1.fc10
- Update to 2.24.0


evolution-exchange-2.24.0-compiler-warnings.patch:

--- NEW FILE evolution-exchange-2.24.0-compiler-warnings.patch ---
diff -up evolution-exchange-2.24.0/camel/camel-exchange-folder.c.compiler-warnings evolution-exchange-2.24.0/camel/camel-exchange-folder.c
--- evolution-exchange-2.24.0/camel/camel-exchange-folder.c.compiler-warnings	2008-09-22 06:39:45.000000000 -0400
+++ evolution-exchange-2.24.0/camel/camel-exchange-folder.c	2008-09-22 06:39:55.000000000 -0400
@@ -722,7 +722,6 @@ camel_exchange_folder_add_message (Camel
 	CamelFolderChangeInfo *changes;
 	CamelStream *stream;
 	CamelMimeMessage *msg;
-	guint32 unread_count, visible_count;
 
 	info = camel_folder_summary_uid (folder->summary, uid);
 	if (info) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	8 Sep 2008 12:41:55 -0000	1.29
+++ .cvsignore	22 Sep 2008 10:46:44 -0000	1.30
@@ -1 +1 @@
-evolution-exchange-2.23.92.tar.bz2
+evolution-exchange-2.24.0.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- evolution-exchange.spec	18 Sep 2008 15:06:17 -0000	1.41
+++ evolution-exchange.spec	22 Sep 2008 10:46:44 -0000	1.42
@@ -22,8 +22,8 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.23.92
-Release: 2%{?dist}
+Version: 2.24.0
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -44,6 +44,9 @@
 # GNOME bug #443022
 Patch13: evolution-exchange-2.11.2-fix-library-order.patch
 
+# New compiler warnings in 2.24.0
+Patch14: evolution-exchange-2.24.0-compiler-warnings.patch
+
 ### Dependencies ###
 
 Requires: gnutls
@@ -75,6 +78,7 @@
 %patch11 -p1 -b .fix-64bit-acinclude.m4
 %patch12 -p1 -b .no_gnome_common
 %patch13 -p1 -b .fix-library-order
+%patch14 -p1 -b .compiler-warnings
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
@@ -156,6 +160,9 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Mon Sep 22 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.0-1.fc10
+- Update to 2.24.0
+
 * Thu Sep 18 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.92-2.fc10
 - Fix unowned directories (RH bug #462346).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	8 Sep 2008 12:41:55 -0000	1.29
+++ sources	22 Sep 2008 10:46:44 -0000	1.30
@@ -1 +1 @@
-6e54f778da43161211aea70f1d9becff  evolution-exchange-2.23.92.tar.bz2
+5e8499a1d4205c703235710c5a22b194  evolution-exchange-2.24.0.tar.bz2



From corsepiu at fedoraproject.org  Mon Sep 22 10:47:09 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 22 Sep 2008 10:47:09 +0000 (UTC)
Subject: rpms/perl-IPC-Run-SafeHandles/F-8 perl-IPC-Run-SafeHandles.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080922104709.C21D9700FE@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-IPC-Run-SafeHandles/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10138/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	perl-IPC-Run-SafeHandles.spec 
Log Message:
Import


--- NEW FILE perl-IPC-Run-SafeHandles.spec ---
Name:           perl-IPC-Run-SafeHandles
Version:        0.02
Release:        1%{?dist}
Summary:        Use IPC::Run and IPC::Run3 safely
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/IPC-Run-SafeHandles/
Source0:        http://www.cpan.org/authors/id/C/CL/CLKAO/IPC-Run-SafeHandles-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 1:5.8.0
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)

# for improved tests
BuildRequires: perl(Test::Pod::Coverage) >= 1.04
BuildRequires: perl(Test::Pod) >= 1.14

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
IPC::Run and IPC::Run3 are both very upset when you try to use them under
environments where you have STDOUT and/or STDERR tied to something else,
such as under fastcgi.

%prep
%setup -q -n IPC-Run-SafeHandles-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.02-1
- Manually cleanup BRs.
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run-SafeHandles/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Sep 2008 09:38:32 -0000	1.1
+++ .cvsignore	22 Sep 2008 10:46:39 -0000	1.2
@@ -0,0 +1 @@
+IPC-Run-SafeHandles-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run-SafeHandles/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 09:38:32 -0000	1.1
+++ sources	22 Sep 2008 10:46:39 -0000	1.2
@@ -0,0 +1 @@
+bf4838a74b393d9a827e5b35e3c26a9e  IPC-Run-SafeHandles-0.02.tar.gz



From corsepiu at fedoraproject.org  Mon Sep 22 10:47:10 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 22 Sep 2008 10:47:10 +0000 (UTC)
Subject: rpms/perl-IPC-Run-SafeHandles/F-9 perl-IPC-Run-SafeHandles.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080922104710.0B287700FE@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-IPC-Run-SafeHandles/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10138/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	perl-IPC-Run-SafeHandles.spec 
Log Message:
Import


--- NEW FILE perl-IPC-Run-SafeHandles.spec ---
Name:           perl-IPC-Run-SafeHandles
Version:        0.02
Release:        1%{?dist}
Summary:        Use IPC::Run and IPC::Run3 safely
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/IPC-Run-SafeHandles/
Source0:        http://www.cpan.org/authors/id/C/CL/CLKAO/IPC-Run-SafeHandles-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 1:5.8.0
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)

# for improved tests
BuildRequires: perl(Test::Pod::Coverage) >= 1.04
BuildRequires: perl(Test::Pod) >= 1.14

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
IPC::Run and IPC::Run3 are both very upset when you try to use them under
environments where you have STDOUT and/or STDERR tied to something else,
such as under fastcgi.

%prep
%setup -q -n IPC-Run-SafeHandles-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.02-1
- Manually cleanup BRs.
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run-SafeHandles/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Sep 2008 09:38:32 -0000	1.1
+++ .cvsignore	22 Sep 2008 10:46:39 -0000	1.2
@@ -0,0 +1 @@
+IPC-Run-SafeHandles-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run-SafeHandles/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 09:38:32 -0000	1.1
+++ sources	22 Sep 2008 10:46:39 -0000	1.2
@@ -0,0 +1 @@
+bf4838a74b393d9a827e5b35e3c26a9e  IPC-Run-SafeHandles-0.02.tar.gz



From corsepiu at fedoraproject.org  Mon Sep 22 10:48:01 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 22 Sep 2008 10:48:01 +0000 (UTC)
Subject: rpms/perl-IPC-Run-SafeHandles/devel import.log,1.1,NONE
Message-ID: <20080922104801.C66A9700FE@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-IPC-Run-SafeHandles/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10399

Removed Files:
	import.log 
Log Message:
Remove.


--- import.log DELETED ---



From pmachata at fedoraproject.org  Mon Sep 22 10:52:48 2008
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 22 Sep 2008 10:52:48 +0000 (UTC)
Subject: rpms/make/devel make-3.79.1-noclock_gettime.patch, 1.3,
	1.4 make-3.80-getcwd.patch, 1.1,
	1.2 make-3.81-err-reporting.patch, 1.1, 1.2 make.spec, 1.44, 1.45
Message-ID: <20080922105248.85423700FE@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/make/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10998

Modified Files:
	make-3.79.1-noclock_gettime.patch make-3.80-getcwd.patch 
	make-3.81-err-reporting.patch make.spec 
Log Message:
- Fix patches to apply cleanly with fuzz=0


make-3.79.1-noclock_gettime.patch:

Index: make-3.79.1-noclock_gettime.patch
===================================================================
RCS file: /cvs/pkgs/rpms/make/devel/make-3.79.1-noclock_gettime.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- make-3.79.1-noclock_gettime.patch	4 Oct 2007 14:37:09 -0000	1.3
+++ make-3.79.1-noclock_gettime.patch	22 Sep 2008 10:52:47 -0000	1.4
@@ -1,11 +1,13 @@
---- make-3.80/configure
-+++ make-3.80/configure
-@@ -6794,7 +6794,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+diff -urp make-3.81/configure make-3.81-pm/configure
+--- make-3.81/configure	2006-04-01 08:40:00.000000000 +0200
++++ make-3.81-pm/configure	2008-09-22 10:50:40.000000000 +0200
+@@ -8018,7 +8018,7 @@ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
  if test "$ac_cv_search_clock_gettime" = no; then
 -  for ac_lib in rt posix4; do
 +  for ac_lib in posix4; do
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
      cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
+ /* confdefs.h.  */
+Only in make-3.81-pm/: configure.orig

make-3.80-getcwd.patch:

Index: make-3.80-getcwd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/make/devel/make-3.80-getcwd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- make-3.80-getcwd.patch	7 Mar 2005 14:57:54 -0000	1.1
+++ make-3.80-getcwd.patch	22 Sep 2008 10:52:47 -0000	1.2
@@ -1,11 +1,15 @@
---- make-3.80/make.h.jj	2002-09-11 12:55:44.000000000 -0400
-+++ make-3.80/make.h	2005-03-07 09:24:53.000000000 -0500
-@@ -474,7 +474,7 @@ extern long int lseek ();
+Only in make-3.81-pm/: configure.orig
+diff -urp make-3.81/make.h make-3.81-pm/make.h
+--- make-3.81/make.h	2006-02-16 00:54:43.000000000 +0100
++++ make-3.81-pm/make.h	2008-09-22 10:53:35.000000000 +0200
+@@ -488,7 +488,7 @@ extern long int lseek ();
  #endif  /* Not GNU C library or POSIX.  */
  
  #ifdef  HAVE_GETCWD
 -# if !defined(VMS) && !defined(__DECC)
 +# if !defined(VMS) && !defined(__DECC) && !defined(getcwd)
  extern char *getcwd ();
- #endif
+ # endif
  #else
+Only in make-3.81-pm/: make.h~
+Only in make-3.81-pm/: make.h.orig

make-3.81-err-reporting.patch:

Index: make-3.81-err-reporting.patch
===================================================================
RCS file: /cvs/pkgs/rpms/make/devel/make-3.81-err-reporting.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- make-3.81-err-reporting.patch	23 May 2006 14:18:17 -0000	1.1
+++ make-3.81-err-reporting.patch	22 Sep 2008 10:52:47 -0000	1.2
@@ -1,15 +1,16 @@
---- make-3.80/misc.c.jj	2002-09-12 18:15:58.000000000 -0400
-+++ make-3.80/misc.c	2005-08-22 05:46:05.000000000 -0400
-@@ -311,17 +311,31 @@ strerror (errnum)
+diff -urp make-3.81/misc.c make-3.81-pm/misc.c
+--- make-3.81/misc.c	2006-04-01 08:36:40.000000000 +0200
++++ make-3.81-pm/misc.c	2008-09-22 12:45:18.000000000 +0200
+@@ -311,17 +311,31 @@ strerror (int errnum)
  /* Print an error message from errno.  */
  
-+void
+ void
 +perror_with_name_err (const char *str, const char *name, int errnum)
 +{
 +  error (NILF, _("%s%s: %s"), str, name, strerror (errnum));
 +}
 +
- void
++void
  perror_with_name (const char *str, const char *name)
  {
 -  error (NILF, _("%s%s: %s"), str, name, strerror (errno));
@@ -18,7 +19,7 @@
  
  /* Print an error message from errno and exit.  */
  
-+void
+ void
 +pfatal_with_name_err (const char *name, int errnum)
 +{
 +  fatal (NILF, _("%s: %s"), name, strerror (errnum));
@@ -26,7 +27,7 @@
 +  /* NOTREACHED */
 +}
 +
- void
++void
  pfatal_with_name (const char *name)
  {
 -  fatal (NILF, _("%s: %s"), name, strerror (errno));
@@ -34,10 +35,10 @@
  
    /* NOTREACHED */
  }
-
---- make-3.81/main.c.jj	2006-05-23 12:51:25.000000000 +0200
-+++ make-3.81/main.c	2006-05-23 12:50:48.000000000 +0200
-@@ -1502,13 +1502,13 @@
+diff -urp make-3.81/main.c make-3.81-pm/main.c
+--- make-3.81/main.c	2008-09-22 12:45:07.000000000 +0200
++++ make-3.81-pm/main.c	2008-09-22 12:45:18.000000000 +0200
+@@ -1502,13 +1502,13 @@ main (int argc, char **argv, char **envp
  	    strcat (template, DEFAULT_TMPFILE);
  	    outfile = open_tmpfile (&stdin_nm, template);
  	    if (outfile == 0)
@@ -53,7 +54,7 @@
  	      }
  	    (void) fclose (outfile);
  
-@@ -1681,7 +1681,7 @@
+@@ -1681,7 +1681,7 @@ main (int argc, char **argv, char **envp
      else if ((job_rfd = dup (job_fds[0])) < 0)
        {
          if (errno != EBADF)
@@ -62,7 +63,7 @@
  
          error (NILF,
                 _("warning: jobserver unavailable: using -j1.  Add `+' to parent make rule."));
-@@ -1721,7 +1721,7 @@
+@@ -1721,7 +1721,7 @@ main (int argc, char **argv, char **envp
        char c = '+';
  
        if (pipe (job_fds) < 0 || (job_rfd = dup (job_fds[0])) < 0)
@@ -71,7 +72,7 @@
  
        /* Every make assumes that it always has one job it can run.  For the
           submakes it's the token they were given by their parent.  For the
-@@ -1736,7 +1736,7 @@
+@@ -1736,7 +1736,7 @@ main (int argc, char **argv, char **envp
  
            EINTRLOOP (r, write (job_fds[1], &c, 1));
            if (r != 1)
@@ -80,7 +81,7 @@
          }
  
        /* Fill in the jobserver_fds struct for our children.  */
-@@ -2151,8 +2151,8 @@
+@@ -2151,7 +2151,7 @@ main (int argc, char **argv, char **envp
    /* If there is a temp file from reading a makefile from stdin, get rid of
       it now.  */
    if (stdin_nm && unlink (stdin_nm) < 0 && errno != ENOENT)
@@ -89,10 +90,10 @@
  
    {
      int status;
-
---- make-3.81/make.h.jj	2006-05-23 12:54:45.000000000 +0200
-+++ make-3.81/make.h	2006-05-23 12:55:00.000000000 +0200
-@@ -414,6 +414,8 @@
+diff -urp make-3.81/make.h make-3.81-pm/make.h
+--- make-3.81/make.h	2008-09-22 12:45:07.000000000 +0200
++++ make-3.81-pm/make.h	2008-09-22 12:45:18.000000000 +0200
+@@ -414,6 +414,8 @@ extern void die PARAMS ((int)) __attribu
  extern void log_working_directory PARAMS ((int));
  extern void pfatal_with_name PARAMS ((const char *)) __attribute__ ((noreturn));
  extern void perror_with_name PARAMS ((const char *, const char *));
@@ -101,10 +102,10 @@
  extern char *savestring PARAMS ((const char *, unsigned int));
  extern char *concat PARAMS ((const char *, const char *, const char *));
  extern char *xmalloc PARAMS ((unsigned int));
-
---- make-3.81/job.c.jj	2006-05-23 13:01:35.000000000 +0200
-+++ make-3.81/job.c	2006-05-23 13:50:44.000000000 +0200
-@@ -859,7 +859,7 @@
+diff -urp make-3.81/job.c make-3.81-pm/job.c
+--- make-3.81/job.c	2006-03-20 04:03:04.000000000 +0100
++++ make-3.81-pm/job.c	2008-09-22 12:45:18.000000000 +0200
+@@ -859,7 +859,7 @@ free_child (struct child *child)
  
        EINTRLOOP (r, write (job_fds[1], &token, 1));
        if (r != 1)
@@ -113,7 +114,7 @@
  
        DB (DB_JOBS, (_("Released token for child 0x%08lx (%s).\n"),
                      (unsigned long int) child, child->file->name));
-@@ -1699,6 +1699,7 @@
+@@ -1699,6 +1699,7 @@ new_job (struct file *file)
  
          /* Set interruptible system calls, and read() for a job token.  */
  	set_child_handler_action_flags (1, waiting_jobs != NULL);
@@ -121,7 +122,7 @@
  	got_token = read (job_rfd, &token, 1);
  	saved_errno = errno;
  	set_child_handler_action_flags (0, waiting_jobs != NULL);
-@@ -1713,10 +1714,14 @@
+@@ -1713,10 +1714,14 @@ new_job (struct file *file)
  
          /* If the error _wasn't_ expected (EINTR or EBADF), punt.  Otherwise,
             go back and reap_children(), and try again.  */
@@ -140,7 +141,7 @@
            DB (DB_JOBS, ("Read returned EBADF.\n"));
        }
  #endif
-@@ -1831,7 +1836,7 @@
+@@ -1831,7 +1836,7 @@ load_too_high (void)
  	    error (NILF,
                     _("cannot enforce load limits on this operating system"));
  	  else


Index: make.spec
===================================================================
RCS file: /cvs/pkgs/rpms/make/devel/make.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- make.spec	22 Sep 2008 08:42:20 -0000	1.44
+++ make.spec	22 Sep 2008 10:52:47 -0000	1.45
@@ -3,7 +3,7 @@
 Name: make
 Epoch: 1
 Version: 3.81
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/make/
@@ -78,6 +78,9 @@
 %{_infodir}/*.info*
 
 %changelog
+* Mon Sep 22 2008 Petr Machata <pmachata at redhat.com> - 1:3.81-14
+- Fix patches to apply cleanly with fuzz=0
+
 * Tue Sep 16 2008 Petr Machata <pmachata at redhat.com> - 1:3.81-13
 - Mark opened files as cloexec to prevent their leaking through fork
 - Resolves: #462090



From mbarnes at fedoraproject.org  Mon Sep 22 10:58:12 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 22 Sep 2008 10:58:12 +0000 (UTC)
Subject: rpms/evolution-data-server/devel .cvsignore, 1.93,
	1.94 evolution-data-server.spec, 1.234, 1.235 sources, 1.93, 1.94
Message-ID: <20080922105812.16925700FE@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-serv11365

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Log Message:

* Mon Sep 22 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.0-1.fc10
- Update to 2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- .cvsignore	8 Sep 2008 11:23:48 -0000	1.93
+++ .cvsignore	22 Sep 2008 10:57:41 -0000	1.94
@@ -1 +1 @@
-evolution-data-server-2.23.92.tar.bz2
+evolution-data-server-2.24.0.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- evolution-data-server.spec	8 Sep 2008 11:23:49 -0000	1.234
+++ evolution-data-server.spec	22 Sep 2008 10:57:41 -0000	1.235
@@ -28,7 +28,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.23.92
+Version: 2.24.0
 Release: 1%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
@@ -374,6 +374,9 @@
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Sep 22 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.0-1.fc10
+- Update to 2.24.0
+
 * Mon Sep 08 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.92-1.fc10
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- sources	8 Sep 2008 11:23:49 -0000	1.93
+++ sources	22 Sep 2008 10:57:41 -0000	1.94
@@ -1 +1 @@
-f534bd9b2111efb76d95e3b625273851  evolution-data-server-2.23.92.tar.bz2
+376bbd5ab3072c9dc8f47747c578f71f  evolution-data-server-2.24.0.tar.bz2



From mbarnes at fedoraproject.org  Mon Sep 22 11:18:56 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 22 Sep 2008 11:18:56 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.98, 1.99 evolution.spec, 1.354, 
	1.355 sources, 1.98, 1.99
Message-ID: <20080922111856.7FC11700FE@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13389

Modified Files:
	.cvsignore evolution.spec sources 
Log Message:

* Mon Sep 22 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.0-1.fc10
- Update to 2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- .cvsignore	8 Sep 2008 12:41:50 -0000	1.98
+++ .cvsignore	22 Sep 2008 11:18:23 -0000	1.99
@@ -1 +1 @@
-evolution-2.23.92.tar.bz2
+evolution-2.24.0.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- evolution.spec	8 Sep 2008 12:41:50 -0000	1.354
+++ evolution.spec	22 Sep 2008 11:18:23 -0000	1.355
@@ -44,7 +44,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.23.92
+Version: 2.24.0
 Release: 1%{?dist}
 License: GPLv2 and GFDL
 Group: Applications/Productivity
@@ -652,6 +652,9 @@
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
 %changelog
+* Mon Sep 22 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.0-1.fc10
+- Update to 2.24.0
+
 * Mon Sep 08 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.92-1.fc10
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- sources	8 Sep 2008 12:41:50 -0000	1.98
+++ sources	22 Sep 2008 11:18:24 -0000	1.99
@@ -1 +1 @@
-f8bb33328b2e2d9fb3d3ff474e8ed1f8  evolution-2.23.92.tar.bz2
+50784255d9da0987032c806fc0226b10  evolution-2.24.0.tar.bz2



From deji at fedoraproject.org  Mon Sep 22 12:08:18 2008
From: deji at fedoraproject.org (Deji Akingunola)
Date: Mon, 22 Sep 2008 12:08:18 +0000 (UTC)
Subject: rpms/gnomesword/devel .cvsignore, 1.17, 1.18 gnomesword.spec, 1.50, 
	1.51 sources, 1.18, 1.19
Message-ID: <20080922120818.726D5700FE@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17306

Modified Files:
	.cvsignore gnomesword.spec sources 
Log Message:
* Sun Sep 21 2008 Deji Akingunola <dakingun at gmail.com> - 2.4.0-1
- Update to 2.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	2 Aug 2008 22:38:30 -0000	1.17
+++ .cvsignore	22 Sep 2008 12:07:47 -0000	1.18
@@ -1 +1 @@
-gnomesword-2.3.6.tar.gz
+gnomesword-2.4.0.tar.gz


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gnomesword.spec	4 Aug 2008 04:28:11 -0000	1.50
+++ gnomesword.spec	22 Sep 2008 12:07:47 -0000	1.51
@@ -1,6 +1,6 @@
 Name:		gnomesword           
-Version:	2.3.6
-Release:	2%{?dist}
+Version:	2.4.0
+Release:	1%{?dist}
 Summary:	GNOME-based Bible research tool
 
 Group:		Applications/Text
@@ -35,7 +35,7 @@
 %setup -q
 
 %build
-%configure --enable-exporter
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -46,6 +46,8 @@
 	--vendor=fedora \
 	--remove-category=X-Red-Hat-Extra \
 	--remove-category=Application	\
+	--add-category=X-Bible		\
+	--add-category=X-Religion	\
 	--remove-key=MultipleArgs	\
 	--dir=%buildroot%_datadir/applications \
 	--copy-name-to-generic-name \
@@ -75,6 +77,9 @@
 %_datadir/gnome/help/gnomesword/
 
 %changelog
+* Sun Sep 21 2008 Deji Akingunola <dakingun at gmail.com> - 2.4.0-1
+- Update to 2.4.0
+
 * Sun Aug 03 2008 Deji Akingunola <dakingun at gmail.com> - 2.3.6-2
 - Package the 'RELEASE-NOTES'
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	2 Aug 2008 22:38:30 -0000	1.18
+++ sources	22 Sep 2008 12:07:47 -0000	1.19
@@ -1 +1 @@
-b12e36f9728946fc6c9a405a827aabce  gnomesword-2.3.6.tar.gz
+bbe51aa42872ae756efafd37ab006942  gnomesword-2.4.0.tar.gz



From deji at fedoraproject.org  Mon Sep 22 12:11:13 2008
From: deji at fedoraproject.org (Deji Akingunola)
Date: Mon, 22 Sep 2008 12:11:13 +0000 (UTC)
Subject: rpms/gnomesword/F-9 .cvsignore, 1.17, 1.18 gnomesword.spec, 1.49,
	1.50 sources, 1.18, 1.19
Message-ID: <20080922121113.12C9D700FE@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gnomesword/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17924

Modified Files:
	.cvsignore gnomesword.spec sources 
Log Message:
* Sun Sep 21 2008 Deji Akingunola <dakingun at gmail.com> - 2.4.0-1
- Update to 2.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/F-9/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	2 Aug 2008 23:03:26 -0000	1.17
+++ .cvsignore	22 Sep 2008 12:10:42 -0000	1.18
@@ -1 +1 @@
-gnomesword-2.3.6.tar.gz
+gnomesword-2.4.0.tar.gz


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/F-9/gnomesword.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gnomesword.spec	4 Aug 2008 12:44:58 -0000	1.49
+++ gnomesword.spec	22 Sep 2008 12:10:42 -0000	1.50
@@ -1,6 +1,6 @@
 Name:		gnomesword           
-Version:	2.3.6
-Release:	2%{?dist}
+Version:	2.4.0
+Release:	1%{?dist}
 Summary:	GNOME-based Bible research tool
 
 Group:		Applications/Text
@@ -35,7 +35,7 @@
 %setup -q
 
 %build
-%configure --enable-exporter
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -46,6 +46,8 @@
 	--vendor=fedora \
 	--remove-category=X-Red-Hat-Extra \
 	--remove-category=Application	\
+	--add-category=X-Bible		\
+	--add-category=X-Religion	\
 	--remove-key=MultipleArgs	\
 	--dir=%buildroot%_datadir/applications \
 	--copy-name-to-generic-name \
@@ -75,6 +77,9 @@
 %_datadir/gnome/help/gnomesword/
 
 %changelog
+* Sun Sep 21 2008 Deji Akingunola <dakingun at gmail.com> - 2.4.0-1
+- Update to 2.4.0
+
 * Sun Aug 03 2008 Deji Akingunola <dakingun at gmail.com> - 2.3.6-2
 - Package the 'RELEASE-NOTES'
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	2 Aug 2008 23:03:26 -0000	1.18
+++ sources	22 Sep 2008 12:10:42 -0000	1.19
@@ -1 +1 @@
-b12e36f9728946fc6c9a405a827aabce  gnomesword-2.3.6.tar.gz
+bbe51aa42872ae756efafd37ab006942  gnomesword-2.4.0.tar.gz



From deji at fedoraproject.org  Mon Sep 22 12:14:01 2008
From: deji at fedoraproject.org (Deji Akingunola)
Date: Mon, 22 Sep 2008 12:14:01 +0000 (UTC)
Subject: rpms/gnomesword/F-8 .cvsignore, 1.16, 1.17 gnomesword.spec, 1.45,
	1.46 sources, 1.17, 1.18
Message-ID: <20080922121401.B1B11700FE@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gnomesword/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18321

Modified Files:
	.cvsignore gnomesword.spec sources 
Log Message:
* Sun Sep 21 2008 Deji Akingunola <dakingun at gmail.com> - 2.4.0-1
- Update to 2.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/F-8/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	2 Aug 2008 23:04:36 -0000	1.16
+++ .cvsignore	22 Sep 2008 12:13:31 -0000	1.17
@@ -1 +1 @@
-gnomesword-2.3.6.tar.gz
+gnomesword-2.4.0.tar.gz


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/F-8/gnomesword.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gnomesword.spec	4 Aug 2008 12:48:02 -0000	1.45
+++ gnomesword.spec	22 Sep 2008 12:13:31 -0000	1.46
@@ -1,6 +1,6 @@
 Name:		gnomesword           
-Version:	2.3.6
-Release:	2%{?dist}
+Version:	2.4.0
+Release:	1%{?dist}
 Summary:	GNOME-based Bible research tool
 
 Group:		Applications/Text
@@ -35,7 +35,7 @@
 %setup -q
 
 %build
-%configure --enable-exporter
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -46,6 +46,8 @@
 	--vendor=fedora \
 	--remove-category=X-Red-Hat-Extra \
 	--remove-category=Application	\
+	--add-category=X-Bible		\
+	--add-category=X-Religion	\
 	--remove-key=MultipleArgs	\
 	--dir=%buildroot%_datadir/applications \
 	--copy-name-to-generic-name \
@@ -75,6 +77,9 @@
 %_datadir/gnome/help/gnomesword/
 
 %changelog
+* Sun Sep 21 2008 Deji Akingunola <dakingun at gmail.com> - 2.4.0-1
+- Update to 2.4.0
+
 * Sun Aug 03 2008 Deji Akingunola <dakingun at gmail.com> - 2.3.6-2
 - Package the 'RELEASE-NOTES'
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/F-8/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	2 Aug 2008 23:04:36 -0000	1.17
+++ sources	22 Sep 2008 12:13:31 -0000	1.18
@@ -1 +1 @@
-b12e36f9728946fc6c9a405a827aabce  gnomesword-2.3.6.tar.gz
+bbe51aa42872ae756efafd37ab006942  gnomesword-2.4.0.tar.gz



From dwalsh at fedoraproject.org  Mon Sep 22 12:33:04 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 22 Sep 2008 12:33:04 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20080710.patch, 1.40,
	1.41 selinux-policy.spec, 1.707, 1.708
Message-ID: <20080922123304.978BD700FE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20236

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
* Sun Sep 21 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-4
- Fix transition to nsplugin
'
* Thu Sep 18 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-3
- Fix labeling on new pm*log
- Allow ssh to bind to all nodes


policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- policy-20080710.patch	18 Sep 2008 21:02:12 -0000	1.40
+++ policy-20080710.patch	22 Sep 2008 12:33:03 -0000	1.41
@@ -4268,8 +4268,8 @@
 +HOME_DIR/\.gstreamer-.*			gen_context(system_u:object_r:nsplugin_home_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.5.8/policy/modules/apps/nsplugin.if
 --- nsaserefpolicy/policy/modules/apps/nsplugin.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/apps/nsplugin.if	2008-09-17 19:08:43.000000000 -0400
-@@ -0,0 +1,495 @@
++++ serefpolicy-3.5.8/policy/modules/apps/nsplugin.if	2008-09-21 07:27:44.000000000 -0400
+@@ -0,0 +1,493 @@
 +
 +## <summary>policy for nsplugin</summary>
 +
@@ -4348,8 +4348,6 @@
 +template(`nsplugin_per_role_template_notrans',`
 +	gen_require(`
 +		type nsplugin_rw_t;
-+		type nsplugin_t;
-+		type nsplugin_config_t;
 +		type nsplugin_home_t;
 +		type nsplugin_exec_t;
 +		type nsplugin_config_exec_t;
@@ -4419,80 +4417,80 @@
 +	allow $1_nsplugin_config_t self:process { execstack execmem };
 +')
 +	
-+manage_dirs_pattern(nsplugin_t, nsplugin_home_t, nsplugin_home_t)
-+exec_files_pattern(nsplugin_t, nsplugin_home_t, nsplugin_home_t)
-+manage_files_pattern(nsplugin_t, nsplugin_home_t, nsplugin_home_t)
-+manage_lnk_files_pattern(nsplugin_t, nsplugin_home_t, nsplugin_home_t)
-+userdom_user_home_dir_filetrans(user, nsplugin_t, nsplugin_home_t, {file dir})
-+unprivuser_dontaudit_write_home_content_files(nsplugin_t)
-+
-+corecmd_exec_bin(nsplugin_t)
-+corecmd_exec_shell(nsplugin_t)
-+
-+corenet_all_recvfrom_unlabeled(nsplugin_t)
-+corenet_all_recvfrom_netlabel(nsplugin_t)
-+corenet_tcp_connect_flash_port(nsplugin_t)
-+corenet_tcp_connect_pulseaudio_port(nsplugin_t)
-+corenet_tcp_connect_http_port(nsplugin_t)
-+corenet_tcp_sendrecv_generic_if(nsplugin_t)
-+corenet_tcp_sendrecv_all_nodes(nsplugin_t)
-+
-+domain_dontaudit_read_all_domains_state(nsplugin_t)
-+
-+dev_read_rand(nsplugin_t)
-+dev_read_sound(nsplugin_t)
-+dev_write_sound(nsplugin_t)
-+dev_read_video_dev(nsplugin_t)
-+dev_write_video_dev(nsplugin_t)
-+dev_getattr_dri_dev(nsplugin_t)
-+dev_rwx_zero(nsplugin_t)
-+
-+kernel_read_kernel_sysctls(nsplugin_t)
-+kernel_read_system_state(nsplugin_t)
-+
-+files_read_usr_files(nsplugin_t)
-+files_read_etc_files(nsplugin_t)
-+files_read_config_files(nsplugin_t)
-+
-+fs_list_inotifyfs(nsplugin_t)
-+fs_manage_tmpfs_files(nsplugin_t)
-+fs_getattr_tmpfs(nsplugin_t)
-+fs_getattr_xattr_fs(nsplugin_t)
-+
-+term_dontaudit_getattr_all_user_ptys(nsplugin_t)
-+term_dontaudit_getattr_all_user_ttys(nsplugin_t)
-+
-+auth_use_nsswitch(nsplugin_t)
-+
-+libs_use_ld_so(nsplugin_t)
-+libs_use_shared_libs(nsplugin_t)
-+libs_exec_ld_so(nsplugin_t)
-+
-+miscfiles_read_localization(nsplugin_t)
-+miscfiles_read_fonts(nsplugin_t)
-+
-+unprivuser_manage_tmp_dirs(nsplugin_t)
-+unprivuser_manage_tmp_files(nsplugin_t)
-+unprivuser_manage_tmp_sockets(nsplugin_t)
++manage_dirs_pattern($1_nsplugin_t, nsplugin_home_t, nsplugin_home_t)
++exec_files_pattern($1_nsplugin_t, nsplugin_home_t, nsplugin_home_t)
++manage_files_pattern($1_nsplugin_t, nsplugin_home_t, nsplugin_home_t)
++manage_lnk_files_pattern($1_nsplugin_t, nsplugin_home_t, nsplugin_home_t)
++userdom_user_home_dir_filetrans(user, $1_nsplugin_t, nsplugin_home_t, {file dir})
++unprivuser_dontaudit_write_home_content_files($1_nsplugin_t)
++
++corecmd_exec_bin($1_nsplugin_t)
++corecmd_exec_shell($1_nsplugin_t)
++
++corenet_all_recvfrom_unlabeled($1_nsplugin_t)
++corenet_all_recvfrom_netlabel($1_nsplugin_t)
++corenet_tcp_connect_flash_port($1_nsplugin_t)
++corenet_tcp_connect_pulseaudio_port($1_nsplugin_t)
++corenet_tcp_connect_http_port($1_nsplugin_t)
++corenet_tcp_sendrecv_generic_if($1_nsplugin_t)
++corenet_tcp_sendrecv_all_nodes($1_nsplugin_t)
++
++domain_dontaudit_read_all_domains_state($1_nsplugin_t)
++
++dev_read_rand($1_nsplugin_t)
++dev_read_sound($1_nsplugin_t)
++dev_write_sound($1_nsplugin_t)
++dev_read_video_dev($1_nsplugin_t)
++dev_write_video_dev($1_nsplugin_t)
++dev_getattr_dri_dev($1_nsplugin_t)
++dev_rwx_zero($1_nsplugin_t)
++
++kernel_read_kernel_sysctls($1_nsplugin_t)
++kernel_read_system_state($1_nsplugin_t)
++
++files_read_usr_files($1_nsplugin_t)
++files_read_etc_files($1_nsplugin_t)
++files_read_config_files($1_nsplugin_t)
++
++fs_list_inotifyfs($1_nsplugin_t)
++fs_manage_tmpfs_files($1_nsplugin_t)
++fs_getattr_tmpfs($1_nsplugin_t)
++fs_getattr_xattr_fs($1_nsplugin_t)
++
++term_dontaudit_getattr_all_user_ptys($1_nsplugin_t)
++term_dontaudit_getattr_all_user_ttys($1_nsplugin_t)
++
++auth_use_nsswitch($1_nsplugin_t)
++
++libs_use_ld_so($1_nsplugin_t)
++libs_use_shared_libs($1_nsplugin_t)
++libs_exec_ld_so($1_nsplugin_t)
++
++miscfiles_read_localization($1_nsplugin_t)
++miscfiles_read_fonts($1_nsplugin_t)
++
++unprivuser_manage_tmp_dirs($1_nsplugin_t)
++unprivuser_manage_tmp_files($1_nsplugin_t)
++unprivuser_manage_tmp_sockets($1_nsplugin_t)
 +userdom_tmp_filetrans_user_tmp(user, $1_nsplugin_t, { file dir sock_file })
-+unprivuser_read_tmpfs_files(nsplugin_t)
-+unprivuser_rw_semaphores(nsplugin_t)
-+unprivuser_delete_tmpfs_files(nsplugin_t)
-+
-+unprivuser_read_home_content_symlinks(nsplugin_t)
-+unprivuser_read_home_content_files(nsplugin_t)
-+unprivuser_read_tmp_files(nsplugin_t)
++unprivuser_read_tmpfs_files($1_nsplugin_t)
++unprivuser_rw_semaphores($1_nsplugin_t)
++unprivuser_delete_tmpfs_files($1_nsplugin_t)
++
++unprivuser_read_home_content_symlinks($1_nsplugin_t)
++unprivuser_read_home_content_files($1_nsplugin_t)
++unprivuser_read_tmp_files($1_nsplugin_t)
 +userdom_write_user_tmp_sockets(user, $1_nsplugin_t)
-+unprivuser_dontaudit_append_home_content_files(nsplugin_t)
-+userdom_dontaudit_unlink_unpriv_home_content_files(nsplugin_t)
++unprivuser_dontaudit_append_home_content_files($1_nsplugin_t)
++userdom_dontaudit_unlink_unpriv_home_content_files($1_nsplugin_t)
 +userdom_dontaudit_manage_user_tmp_files(user, $1_nsplugin_t)
 +
 +optional_policy(`
-+	alsa_read_rw_config(nsplugin_t)
++	alsa_read_rw_config($1_nsplugin_t)
 +')
 +
 +optional_policy(`
-+	gnome_exec_gconf(nsplugin_t)
++	gnome_exec_gconf($1_nsplugin_t)
 +	gnome_manage_user_gnome_config(user, $1_nsplugin_t)
 +	allow $1_nsplugin_t gnome_home_t:sock_file write;
 +')
@@ -4503,25 +4501,25 @@
 +')
 +
 +optional_policy(`
-+	mplayer_exec(nsplugin_t)
++	mplayer_exec($1_nsplugin_t)
 +	mplayer_read_user_home_files(user, $1_nsplugin_t)
 +')
 +
 +optional_policy(`
-+	unconfined_execmem_signull(nsplugin_t)
-+	unconfined_delete_tmpfs_files(nsplugin_t)
++	unconfined_execmem_signull($1_nsplugin_t)
++	unconfined_delete_tmpfs_files($1_nsplugin_t)
 +')
 +
 +optional_policy(`
-+	xserver_stream_connect_xdm_xserver(nsplugin_t)
-+	xserver_xdm_rw_shm(nsplugin_t)
-+	xserver_read_xdm_tmp_files(nsplugin_t)
-+	xserver_read_xdm_pid(nsplugin_t)
++	xserver_stream_connect_xdm_xserver($1_nsplugin_t)
++	xserver_xdm_rw_shm($1_nsplugin_t)
++	xserver_read_xdm_tmp_files($1_nsplugin_t)
++	xserver_read_xdm_pid($1_nsplugin_t)
 +	xserver_read_user_xauth(user, $1_nsplugin_t)
 +	xserver_read_user_iceauth(user, $1_nsplugin_t)
 +	xserver_use_user_fonts(user, $1_nsplugin_t)
-+	xserver_manage_home_fonts(nsplugin_t)
-+	xserver_dontaudit_rw_xdm_home_files(nsplugin_t)
++	xserver_manage_home_fonts($1_nsplugin_t)
++	xserver_dontaudit_rw_xdm_home_files($1_nsplugin_t)
 +')
 +
 +########################################
@@ -4537,55 +4535,55 @@
 +allow $1_nsplugin_config_t self:fifo_file rw_file_perms;
 +allow $1_nsplugin_config_t self:unix_stream_socket create_stream_socket_perms;
 +
-+fs_list_inotifyfs(nsplugin_config_t)
++fs_list_inotifyfs($1_nsplugin_config_t)
 +
-+can_exec(nsplugin_config_t, nsplugin_rw_t)
-+manage_dirs_pattern(nsplugin_config_t, nsplugin_rw_t, nsplugin_rw_t)
-+manage_files_pattern(nsplugin_config_t, nsplugin_rw_t, nsplugin_rw_t)
-+manage_lnk_files_pattern(nsplugin_config_t, nsplugin_rw_t, nsplugin_rw_t)
++can_exec($1_nsplugin_config_t, nsplugin_rw_t)
++manage_dirs_pattern($1_nsplugin_config_t, nsplugin_rw_t, nsplugin_rw_t)
++manage_files_pattern($1_nsplugin_config_t, nsplugin_rw_t, nsplugin_rw_t)
++manage_lnk_files_pattern($1_nsplugin_config_t, nsplugin_rw_t, nsplugin_rw_t)
 +
-+manage_dirs_pattern(nsplugin_config_t, nsplugin_home_t, nsplugin_home_t)
-+manage_files_pattern(nsplugin_config_t, nsplugin_home_t, nsplugin_home_t)
-+manage_lnk_files_pattern(nsplugin_config_t, nsplugin_home_t, nsplugin_home_t)
++manage_dirs_pattern($1_nsplugin_config_t, nsplugin_home_t, nsplugin_home_t)
++manage_files_pattern($1_nsplugin_config_t, nsplugin_home_t, nsplugin_home_t)
++manage_lnk_files_pattern($1_nsplugin_config_t, nsplugin_home_t, nsplugin_home_t)
 +
-+corecmd_exec_bin(nsplugin_config_t)
-+corecmd_exec_shell(nsplugin_config_t)
++corecmd_exec_bin($1_nsplugin_config_t)
++corecmd_exec_shell($1_nsplugin_config_t)
 +
-+kernel_read_system_state(nsplugin_config_t)
++kernel_read_system_state($1_nsplugin_config_t)
 +
-+files_read_etc_files(nsplugin_config_t)
-+files_read_usr_files(nsplugin_config_t)
-+files_dontaudit_search_home(nsplugin_config_t)
-+files_list_tmp(nsplugin_config_t)
++files_read_etc_files($1_nsplugin_config_t)
++files_read_usr_files($1_nsplugin_config_t)
++files_dontaudit_search_home($1_nsplugin_config_t)
++files_list_tmp($1_nsplugin_config_t)
 +
-+auth_use_nsswitch(nsplugin_config_t)
++auth_use_nsswitch($1_nsplugin_config_t)
 +
-+libs_use_ld_so(nsplugin_config_t)
-+libs_use_shared_libs(nsplugin_config_t)
++libs_use_ld_so($1_nsplugin_config_t)
++libs_use_shared_libs($1_nsplugin_config_t)
 +
-+miscfiles_read_localization(nsplugin_config_t)
-+miscfiles_read_fonts(nsplugin_config_t)
++miscfiles_read_localization($1_nsplugin_config_t)
++miscfiles_read_fonts($1_nsplugin_config_t)
 +
-+userdom_search_all_users_home_content(nsplugin_config_t)
++userdom_search_all_users_home_content($1_nsplugin_config_t)
 +
 +tunable_policy(`use_nfs_home_dirs',`
-+	fs_manage_nfs_dirs(nsplugin_t)
-+	fs_manage_nfs_files(nsplugin_t)
-+	fs_manage_nfs_dirs(nsplugin_config_t)
-+	fs_manage_nfs_files(nsplugin_config_t)
++	fs_manage_nfs_dirs($1_nsplugin_t)
++	fs_manage_nfs_files($1_nsplugin_t)
++	fs_manage_nfs_dirs($1_nsplugin_config_t)
++	fs_manage_nfs_files($1_nsplugin_config_t)
 +')
 +
 +tunable_policy(`use_samba_home_dirs',`
-+	fs_manage_cifs_dirs(nsplugin_t)
-+	fs_manage_cifs_files(nsplugin_t)
-+	fs_manage_cifs_dirs(nsplugin_config_t)
-+	fs_manage_cifs_files(nsplugin_config_t)
++	fs_manage_cifs_dirs($1_nsplugin_t)
++	fs_manage_cifs_files($1_nsplugin_t)
++	fs_manage_cifs_dirs($1_nsplugin_config_t)
++	fs_manage_cifs_files($1_nsplugin_config_t)
 +')
 +
-+domtrans_pattern(nsplugin_config_t, nsplugin_exec_t, $1_nsplugin_t)
++domtrans_pattern($1_nsplugin_config_t, nsplugin_exec_t, $1_nsplugin_t)
 +
 +optional_policy(`
-+	xserver_read_home_fonts(nsplugin_config_t)
++	xserver_read_home_fonts($1_nsplugin_config_t)
 +')
 +
 +optional_policy(`
@@ -10745,7 +10743,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.5.8/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/apache.te	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/apache.te	2008-09-19 10:06:15.000000000 -0400
 @@ -20,6 +20,8 @@
  # Declarations
  #
@@ -10896,7 +10894,15 @@
  
  corenet_all_recvfrom_unlabeled(httpd_t)
  corenet_all_recvfrom_netlabel(httpd_t)
-@@ -312,12 +361,11 @@
+@@ -299,6 +348,7 @@
+ corenet_tcp_sendrecv_all_ports(httpd_t)
+ corenet_udp_sendrecv_all_ports(httpd_t)
+ corenet_tcp_bind_all_nodes(httpd_t)
++corenet_udp_bind_all_nodes(httpd_t)
+ corenet_tcp_bind_http_port(httpd_t)
+ corenet_tcp_bind_http_cache_port(httpd_t)
+ corenet_sendrecv_http_server_packets(httpd_t)
+@@ -312,12 +362,11 @@
  
  fs_getattr_all_fs(httpd_t)
  fs_search_auto_mountpoints(httpd_t)
@@ -10911,7 +10917,7 @@
  
  domain_use_interactive_fds(httpd_t)
  
-@@ -335,6 +383,10 @@
+@@ -335,6 +384,10 @@
  files_read_var_lib_symlinks(httpd_t)
  
  fs_search_auto_mountpoints(httpd_sys_script_t)
@@ -10922,7 +10928,7 @@
  
  libs_use_ld_so(httpd_t)
  libs_use_shared_libs(httpd_t)
-@@ -351,18 +403,33 @@
+@@ -351,18 +404,33 @@
  
  userdom_use_unpriv_users_fds(httpd_t)
  
@@ -10960,7 +10966,7 @@
  ')
  ')
  
-@@ -370,20 +437,45 @@
+@@ -370,20 +438,45 @@
  	corenet_tcp_connect_all_ports(httpd_t)
  ')
  
@@ -11007,7 +11013,7 @@
  
  	manage_dirs_pattern(httpd_t, httpdcontent, httpdcontent)
  	manage_files_pattern(httpd_t, httpdcontent, httpdcontent)
-@@ -394,11 +486,12 @@
+@@ -394,11 +487,12 @@
  	corenet_tcp_bind_ftp_port(httpd_t)
  ')
  
@@ -11023,7 +11029,7 @@
  	fs_read_nfs_files(httpd_t)
  	fs_read_nfs_symlinks(httpd_t)
  ')
-@@ -408,6 +501,11 @@
+@@ -408,6 +502,11 @@
  	fs_read_cifs_symlinks(httpd_t)
  ')
  
@@ -11035,7 +11041,7 @@
  tunable_policy(`httpd_ssi_exec',`
  	corecmd_shell_domtrans(httpd_t,httpd_sys_script_t)
  	allow httpd_sys_script_t httpd_t:fd use;
-@@ -441,8 +539,13 @@
+@@ -441,8 +540,13 @@
  ')
  
  optional_policy(`
@@ -11051,7 +11057,7 @@
  ')
  
  optional_policy(`
-@@ -454,18 +557,13 @@
+@@ -454,18 +558,13 @@
  ')
  
  optional_policy(`
@@ -11071,7 +11077,7 @@
  ')
  
  optional_policy(`
-@@ -475,6 +573,12 @@
+@@ -475,6 +574,12 @@
  	openca_kill(httpd_t)
  ')
  
@@ -11084,7 +11090,7 @@
  optional_policy(`
  	# Allow httpd to work with postgresql
  	postgresql_stream_connect(httpd_t)
-@@ -482,6 +586,7 @@
+@@ -482,6 +587,7 @@
  
  	tunable_policy(`httpd_can_network_connect_db',`
  		postgresql_tcp_connect(httpd_t)
@@ -11092,7 +11098,7 @@
  	')
  ')
  
-@@ -490,6 +595,7 @@
+@@ -490,6 +596,7 @@
  ')
  
  optional_policy(`
@@ -11100,7 +11106,7 @@
  	snmp_dontaudit_read_snmp_var_lib_files(httpd_t)
  	snmp_dontaudit_write_snmp_var_lib_files(httpd_t)
  ')
-@@ -519,9 +625,28 @@
+@@ -519,9 +626,28 @@
  logging_send_syslog_msg(httpd_helper_t)
  
  tunable_policy(`httpd_tty_comm',`
@@ -11129,7 +11135,7 @@
  ########################################
  #
  # Apache PHP script local policy
-@@ -551,22 +676,27 @@
+@@ -551,22 +677,27 @@
  
  fs_search_auto_mountpoints(httpd_php_t)
  
@@ -11163,7 +11169,7 @@
  ')
  
  ########################################
-@@ -590,6 +720,8 @@
+@@ -590,6 +721,8 @@
  manage_files_pattern(httpd_suexec_t, httpd_suexec_tmp_t, httpd_suexec_tmp_t)
  files_tmp_filetrans(httpd_suexec_t, httpd_suexec_tmp_t, { file dir })
  
@@ -11172,7 +11178,7 @@
  kernel_read_kernel_sysctls(httpd_suexec_t)
  kernel_list_proc(httpd_suexec_t)
  kernel_read_proc_symlinks(httpd_suexec_t)
-@@ -598,9 +730,7 @@
+@@ -598,9 +731,7 @@
  
  fs_search_auto_mountpoints(httpd_suexec_t)
  
@@ -11183,7 +11189,7 @@
  
  files_read_etc_files(httpd_suexec_t)
  files_read_usr_files(httpd_suexec_t)
-@@ -633,12 +763,25 @@
+@@ -633,12 +764,25 @@
  	corenet_sendrecv_all_client_packets(httpd_suexec_t)
  ')
  
@@ -11212,7 +11218,7 @@
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -647,6 +790,12 @@
+@@ -647,6 +791,12 @@
  	fs_exec_nfs_files(httpd_suexec_t)
  ')
  
@@ -11225,7 +11231,7 @@
  tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
  	fs_read_cifs_files(httpd_suexec_t)
  	fs_read_cifs_symlinks(httpd_suexec_t)
-@@ -664,10 +813,6 @@
+@@ -664,10 +814,6 @@
  	dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write };
  ')
  
@@ -11236,7 +11242,7 @@
  ########################################
  #
  # Apache system script local policy
-@@ -677,7 +822,8 @@
+@@ -677,7 +823,8 @@
  
  dontaudit httpd_sys_script_t httpd_config_t:dir search;
  
@@ -11246,7 +11252,7 @@
  
  allow httpd_sys_script_t squirrelmail_spool_t:dir list_dir_perms;
  read_files_pattern(httpd_sys_script_t, squirrelmail_spool_t, squirrelmail_spool_t)
-@@ -691,12 +837,15 @@
+@@ -691,12 +838,15 @@
  # Should we add a boolean?
  apache_domtrans_rotatelogs(httpd_sys_script_t)
  
@@ -11264,7 +11270,7 @@
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -704,6 +853,28 @@
+@@ -704,6 +854,30 @@
  	fs_read_nfs_symlinks(httpd_sys_script_t)
  ')
  
@@ -11272,6 +11278,8 @@
 +	allow httpd_sys_script_t self:tcp_socket create_stream_socket_perms;
 +	allow httpd_sys_script_t self:udp_socket create_socket_perms;
 +
++	corenet_tcp_bind_all_nodes(httpd_sys_script_t)
++	corenet_udp_bind_all_nodes(httpd_sys_script_t)
 +	corenet_all_recvfrom_unlabeled(httpd_sys_script_t)
 +	corenet_all_recvfrom_netlabel(httpd_sys_script_t)
 +	corenet_tcp_sendrecv_all_if(httpd_sys_script_t)
@@ -11293,7 +11301,7 @@
  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)
-@@ -716,10 +887,10 @@
+@@ -716,10 +890,10 @@
  optional_policy(`
  	mysql_stream_connect(httpd_sys_script_t)
  	mysql_rw_db_sockets(httpd_sys_script_t)
@@ -11308,7 +11316,7 @@
  ')
  
  ########################################
-@@ -727,6 +898,8 @@
+@@ -727,6 +901,8 @@
  # httpd_rotatelogs local policy
  #
  
@@ -11317,7 +11325,7 @@
  manage_files_pattern(httpd_rotatelogs_t, httpd_log_t, httpd_log_t)
  
  kernel_read_kernel_sysctls(httpd_rotatelogs_t)
-@@ -741,3 +914,56 @@
+@@ -741,3 +917,56 @@
  logging_search_logs(httpd_rotatelogs_t)
  
  miscfiles_read_localization(httpd_rotatelogs_t)
@@ -16314,6 +16322,17 @@
 +	spamassassin_exec(exim_t)
 +	spamassassin_exec_client(exim_t)
  ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.fc serefpolicy-3.5.8/policy/modules/services/fail2ban.fc
+--- nsaserefpolicy/policy/modules/services/fail2ban.fc	2008-09-08 10:18:37.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/fail2ban.fc	2008-09-19 11:19:25.000000000 -0400
+@@ -3,5 +3,5 @@
+ /usr/bin/fail2ban	--	gen_context(system_u:object_r:fail2ban_exec_t,s0)
+ /usr/bin/fail2ban-server --	gen_context(system_u:object_r:fail2ban_exec_t,s0)
+ /var/log/fail2ban\.log	--	gen_context(system_u:object_r:fail2ban_log_t,s0)
+-/var/run/fail2ban\.pid	--	gen_context(system_u:object_r:fail2ban_var_run_t,s0)
+-/var/run/fail2ban\.sock	-s	gen_context(system_u:object_r:fail2ban_var_run_t,s0)
++
++/var/run/fail2ban.*		gen_context(system_u:object_r:fail2ban_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.if serefpolicy-3.5.8/policy/modules/services/fail2ban.if
 --- nsaserefpolicy/policy/modules/services/fail2ban.if	2008-08-07 11:15:11.000000000 -0400
 +++ serefpolicy-3.5.8/policy/modules/services/fail2ban.if	2008-09-17 08:49:08.000000000 -0400
@@ -16385,6 +16404,21 @@
 +	files_list_pids($1)
 +        admin_pattern($1, fail2ban_var_run_t)
 +')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.te serefpolicy-3.5.8/policy/modules/services/fail2ban.te
+--- nsaserefpolicy/policy/modules/services/fail2ban.te	2008-09-05 10:28:20.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/fail2ban.te	2008-09-19 11:19:16.000000000 -0400
+@@ -37,9 +37,10 @@
+ logging_log_filetrans(fail2ban_t, fail2ban_log_t, file)
+ 
+ # pid file
++manage_dirs_pattern(fail2ban_t, fail2ban_var_run_t, fail2ban_var_run_t)
+ manage_sock_files_pattern(fail2ban_t, fail2ban_var_run_t, fail2ban_var_run_t)
+ manage_files_pattern(fail2ban_t, fail2ban_var_run_t, fail2ban_var_run_t)
+-files_pid_filetrans(fail2ban_t, fail2ban_var_run_t, { file sock_file })
++files_pid_filetrans(fail2ban_t, fail2ban_var_run_t, { dir file sock_file })
+ 
+ kernel_read_system_state(fail2ban_t)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.if serefpolicy-3.5.8/policy/modules/services/fetchmail.if
 --- nsaserefpolicy/policy/modules/services/fetchmail.if	2008-08-07 11:15:11.000000000 -0400
 +++ serefpolicy-3.5.8/policy/modules/services/fetchmail.if	2008-09-17 08:49:08.000000000 -0400
@@ -18031,8 +18065,21 @@
 +/usr/lib/mailman/mail/mailman --	gen_context(system_u:object_r:mailman_mail_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-3.5.8/policy/modules/services/mailman.if
 --- nsaserefpolicy/policy/modules/services/mailman.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/mailman.if	2008-09-17 08:49:08.000000000 -0400
-@@ -211,6 +211,7 @@
++++ serefpolicy-3.5.8/policy/modules/services/mailman.if	2008-09-19 10:41:48.000000000 -0400
+@@ -31,6 +31,12 @@
+ 	allow mailman_$1_t self:tcp_socket create_stream_socket_perms;
+ 	allow mailman_$1_t self:udp_socket create_socket_perms;
+ 
++	files_search_spool(mailman_$1_t)
++
++	manage_dirs_pattern(mailman_$1_t, mailman_archive_t, mailman_archive_t)
++	manage_files_pattern(mailman_$1_t, mailman_archive_t, mailman_archive_t)
++	manage_lnk_files_pattern(mailman_$1_t, mailman_archive_t, mailman_archive_t)
++
+ 	manage_dirs_pattern(mailman_$1_t, mailman_data_t, mailman_data_t)
+ 	manage_files_pattern(mailman_$1_t, mailman_data_t, mailman_data_t)
+ 	manage_lnk_files_pattern(mailman_$1_t, mailman_data_t, mailman_data_t)
+@@ -211,6 +217,7 @@
  		type mailman_data_t;
  	')
  
@@ -18040,7 +18087,7 @@
  	manage_files_pattern($1, mailman_data_t, mailman_data_t)
  ')
  
-@@ -252,6 +253,25 @@
+@@ -252,6 +259,25 @@
  
  #######################################
  ## <summary>
@@ -18068,7 +18115,7 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.5.8/policy/modules/services/mailman.te
 --- nsaserefpolicy/policy/modules/services/mailman.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/mailman.te	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/mailman.te	2008-09-19 10:39:55.000000000 -0400
 @@ -53,10 +53,9 @@
  	apache_use_fds(mailman_cgi_t)
  	apache_dontaudit_append_log(mailman_cgi_t)
@@ -18110,11 +18157,15 @@
  
  ########################################
  #
-@@ -104,6 +106,7 @@
+@@ -104,6 +106,11 @@
  # some of the following could probably be changed to dontaudit, someone who
  # knows mailman well should test this out and send the changes
  sysadm_search_home_dirs(mailman_queue_t)
 +sysadm_getattr_home_dirs(mailman_queue_t)
++
++optional_policy(`
++	apache_read_config(mailman_queue_t)
++')
  
  optional_policy(`
  	cron_system_entry(mailman_queue_t, mailman_queue_exec_t)
@@ -21509,7 +21560,7 @@
 +/var/spool/postfix/postgrey(/.*)?	gen_context(system_u:object_r:postgrey_spool_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.if serefpolicy-3.5.8/policy/modules/services/postgrey.if
 --- nsaserefpolicy/policy/modules/services/postgrey.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/postgrey.if	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/postgrey.if	2008-09-19 10:23:31.000000000 -0400
 @@ -12,10 +12,80 @@
  #
  interface(`postgrey_stream_connect',`
@@ -21519,8 +21570,9 @@
          ')
  
  	allow $1 postgrey_t:unix_stream_socket connectto;
-         allow $1 postgrey_var_run_t:sock_file write;
-+        allow $1 postgrey_spool_t:sock_file write;
+-        allow $1 postgrey_var_run_t:sock_file write;
++	write_sock_files_pattern($1, postgrey_var_run_t,  postgrey_var_run_t)
++	write_sock_files_pattern($1, postgrey_spool_t,  postgrey_spool_t)
  	files_search_pids($1)
  ')
 +
@@ -21954,7 +22006,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.5.8/policy/modules/services/prelude.te
 --- nsaserefpolicy/policy/modules/services/prelude.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/prelude.te	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/prelude.te	2008-09-19 10:06:36.000000000 -0400
 @@ -13,18 +13,56 @@
  type prelude_spool_t;
  files_type(prelude_spool_t)
@@ -22052,7 +22104,7 @@
  
  dev_read_rand(prelude_audisp_t)
  dev_read_urand(prelude_audisp_t)
-@@ -123,9 +173,119 @@
+@@ -123,9 +173,122 @@
  libs_use_shared_libs(prelude_audisp_t)
  
  logging_send_syslog_msg(prelude_audisp_t)
@@ -22104,6 +22156,8 @@
 +# prelude_lml local declarations
 +#
 +
++allow prelude_lml_t self:capability dac_override;
++
 +# Init script handling
 +domain_use_interactive_fds(prelude_lml_t)
 +
@@ -22166,13 +22220,14 @@
 +sysnet_dns_name_resolve(prelude_lml_t)
 +
 +optional_policy(`
++	apache_search_sys_content(prelude_lml_t)
 +	apache_read_log(prelude_lml_t)
 +')
 +
  ########################################
  #
  # prewikka_cgi Declarations
-@@ -133,8 +293,19 @@
+@@ -133,8 +296,19 @@
  
  optional_policy(`
  	apache_content_template(prewikka)
@@ -30386,8 +30441,15 @@
  allow iscsid_t self:unix_stream_socket { create_stream_socket_perms connectto };
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.5.8/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2008-08-13 15:24:56.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/libraries.fc	2008-09-17 08:49:09.000000000 -0400
-@@ -66,6 +66,8 @@
++++ serefpolicy-3.5.8/policy/modules/system/libraries.fc	2008-09-21 08:23:42.000000000 -0400
+@@ -60,12 +60,15 @@
+ #
+ # /opt
+ #
++/opt/.*\.so					gen_context(system_u:object_r:lib_t,s0)
+ /opt/(.*/)?lib(/.*)?				gen_context(system_u:object_r:lib_t,s0)
+ /opt/(.*/)?lib64(/.*)?				gen_context(system_u:object_r:lib_t,s0)
+ /opt/(.*/)?java/.+\.jar			--	gen_context(system_u:object_r:lib_t,s0)
  /opt/(.*/)?jre.*/.+\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /opt/(.*/)?jre/.+\.jar			--	gen_context(system_u:object_r:lib_t,s0)
  
@@ -30396,7 +30458,7 @@
  ifdef(`distro_gentoo',`
  # despite the extensions, they are actually libs
  /opt/Acrobat[5-9]/Reader/intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:lib_t,s0)
-@@ -84,7 +86,8 @@
+@@ -84,7 +87,8 @@
  
  ifdef(`distro_redhat',`
  /opt/Adobe(/.*?)/nppdf\.so 		-- 	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -30406,7 +30468,7 @@
  /opt/cisco-vpnclient/lib/libvpnapi\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /opt/cxoffice/lib/wine/.+\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /opt/f-secure/fspms/libexec/librapi\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -133,6 +136,7 @@
+@@ -133,6 +137,7 @@
  /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libnvidia.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libXvMCNVIDIA\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xorg/libGL\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -30414,7 +30476,7 @@
  /usr/lib(64)?/xulrunner-[^/]*/libgtkembedmoz\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xulrunner-[^/]*/libxul\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
-@@ -168,7 +172,8 @@
+@@ -168,7 +173,8 @@
  # Fedora Core packages: gstreamer-plugins, compat-libstdc++, Glide3, libdv
  # 	HelixPlayer, SDL, xorg-x11, xorg-x11-libs, Hermes, valgrind, openoffice.org-libs, httpd - php
  /usr/lib(64)?/gstreamer-.*/[^/]*\.so.* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -30424,7 +30486,7 @@
  
  /usr/lib/firefox-[^/]*/plugins/nppdf.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/libFLAC\.so.*			--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -187,6 +192,7 @@
+@@ -187,6 +193,7 @@
  /usr/lib(64)?/libdv\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/plugins/[^/]*\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/codecs/[^/]*\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -30432,7 +30494,7 @@
  /usr/lib(64)?/libSDL-.*\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xorg/modules/dri/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/X11R6/lib/modules/dri/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -246,7 +252,7 @@
+@@ -246,7 +253,7 @@
  
  # Flash plugin, Macromedia
  HOME_DIR/\.mozilla(/.*)?/plugins/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -30441,7 +30503,7 @@
  /usr/lib(64)?/.*/libflashplayer\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/local/(.*/)?libflashplayer\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  HOME_DIR/.*/plugins/nprhapengine\.so.* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -267,6 +273,8 @@
+@@ -267,6 +274,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)
  
@@ -30450,7 +30512,7 @@
  # Java, Sun Microsystems (JPackage SRPM)
  /usr/(.*/)?jre.*/.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/local/(.*/)?jre.*/.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -291,6 +299,8 @@
+@@ -291,6 +300,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)
@@ -30459,7 +30521,7 @@
  ') dnl end distro_redhat
  
  #
-@@ -310,3 +320,13 @@
+@@ -310,3 +321,13 @@
  /var/spool/postfix/lib(64)?(/.*)? 		gen_context(system_u:object_r:lib_t,s0)
  /var/spool/postfix/usr(/.*)?			gen_context(system_u:object_r:lib_t,s0)
  /var/spool/postfix/lib(64)?/ld.*\.so.*	--	gen_context(system_u:object_r:ld_so_t,s0)
@@ -33302,7 +33364,7 @@
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.5.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/userdomain.if	2008-09-17 09:11:15.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/userdomain.if	2008-09-21 07:04:00.000000000 -0400
 @@ -28,10 +28,14 @@
  		class context contains;
  	')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.707
retrieving revision 1.708
diff -u -r1.707 -r1.708
--- selinux-policy.spec	18 Sep 2008 20:46:41 -0000	1.707
+++ selinux-policy.spec	22 Sep 2008 12:33:03 -0000	1.708
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -381,6 +381,9 @@
 %endif
 
 %changelog
+* Sun Sep 21 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-4
+- Fix transition to nsplugin
+'
 * Thu Sep 18 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-3
 - Fix labeling on new pm*log
 - Allow ssh to bind to all nodes



From pkgdb at fedoraproject.org  Mon Sep 22 13:21:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 13:21:22 +0000
Subject: [pkgdb] iscsi-initiator-utils: jwrdegoede has requested
	watchbugzilla
Message-ID: <20080922132122.9EC46208DA5@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the watchbugzilla acl on iscsi-initiator-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Mon Sep 22 13:21:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 13:21:23 +0000
Subject: [pkgdb] iscsi-initiator-utils: jwrdegoede has requested watchcommits
Message-ID: <20080922132123.E2F35208DAB@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the watchcommits acl on iscsi-initiator-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Mon Sep 22 13:21:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 13:21:24 +0000
Subject: [pkgdb] iscsi-initiator-utils: jwrdegoede has requested commit
Message-ID: <20080922132125.071D0208DAF@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the commit acl on iscsi-initiator-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Mon Sep 22 13:21:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 13:21:31 +0000
Subject: [pkgdb] iscsi-initiator-utils: jwrdegoede has requested watchcommits
Message-ID: <20080922132131.44775208DB5@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the watchcommits acl on iscsi-initiator-utils (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Mon Sep 22 13:21:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 13:21:32 +0000
Subject: [pkgdb] iscsi-initiator-utils: jwrdegoede has requested commit
Message-ID: <20080922132132.8C13A208DB9@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the commit acl on iscsi-initiator-utils (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Mon Sep 22 13:21:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 13:21:33 +0000
Subject: [pkgdb] iscsi-initiator-utils: jwrdegoede has requested
	watchbugzilla
Message-ID: <20080922132134.0B22C208DBB@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the watchbugzilla acl on iscsi-initiator-utils (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Mon Sep 22 13:21:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 13:21:37 +0000
Subject: [pkgdb] iscsi-initiator-utils: jwrdegoede has requested
	watchbugzilla
Message-ID: <20080922132137.3B4D3208DBD@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the watchbugzilla acl on iscsi-initiator-utils (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Mon Sep 22 13:21:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 13:21:39 +0000
Subject: [pkgdb] iscsi-initiator-utils: jwrdegoede has requested watchcommits
Message-ID: <20080922132139.70826208DC3@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the watchcommits acl on iscsi-initiator-utils (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Mon Sep 22 13:21:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 13:21:41 +0000
Subject: [pkgdb] iscsi-initiator-utils: jwrdegoede has requested commit
Message-ID: <20080922132141.86406208DC7@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the commit acl on iscsi-initiator-utils (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From green at fedoraproject.org  Mon Sep 22 13:59:15 2008
From: green at fedoraproject.org (Anthony Green)
Date: Mon, 22 Sep 2008 13:59:15 +0000 (UTC)
Subject: rpms/cl-asdf/devel cl-asdf.spec,1.1,1.2
Message-ID: <20080922135915.6A0A1700FE@cvs1.fedora.phx.redhat.com>

Author: green

Update of /cvs/pkgs/rpms/cl-asdf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29597

Modified Files:
	cl-asdf.spec 
Log Message:
Install dir is now cl-asdf


Index: cl-asdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cl-asdf/devel/cl-asdf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cl-asdf.spec	7 Jul 2008 02:45:12 -0000	1.1
+++ cl-asdf.spec	22 Sep 2008 13:58:44 -0000	1.2
@@ -1,6 +1,6 @@
 Name:    cl-asdf
 Version: 20071110
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group:   Development/Libraries
 Source:  %{name}-%{version}.tar.bz2
 Summary: Another System Definition Facility
@@ -18,9 +18,9 @@
 
 %install
 %{__rm} -rf %{buildroot}
-mkdir -m 755 -p %{buildroot}%{_datadir}/common-lisp/source/asdf
-install -m 644 asdf.lisp %{buildroot}%{_datadir}/common-lisp/source/asdf
-install -m 644 wild-modules.lisp %{buildroot}%{_datadir}/common-lisp/source/asdf
+mkdir -m 755 -p %{buildroot}%{_datadir}/common-lisp/source/cl-asdf
+install -m 644 asdf.lisp %{buildroot}%{_datadir}/common-lisp/source/cl-asdf
+install -m 644 wild-modules.lisp %{buildroot}%{_datadir}/common-lisp/source/cl-asdf
 
 %build
 # Nothing to do.
@@ -33,9 +33,12 @@
 %doc LICENSE README
 %dir %{_datadir}/common-lisp
 %dir %{_datadir}/common-lisp/source
-%{_datadir}/common-lisp/source/asdf
+%{_datadir}/common-lisp/source/cl-asdf
 
 %changelog
+* Wed Jul 09 2008 Anthony Green <green at redhat.com> 20071110-5
+.- Rename install dir "cl-asdf"
+
 * Sun Jul 06 2008 Anthony Green <green at redhat.com> 20071110-4
 - Take ownership of all directories we create.
 



From limb at fedoraproject.org  Mon Sep 22 14:04:53 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 22 Sep 2008 14:04:53 +0000 (UTC)
Subject: rpms/wesnoth/EL-5 wesnoth.spec,1.40,1.41
Message-ID: <20080922140454.04ECC700FE@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/wesnoth/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30579

Modified Files:
	wesnoth.spec 
Log Message:
Maybe it's -386-only. . .



Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/EL-5/wesnoth.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- wesnoth.spec	22 Jul 2008 16:03:24 -0000	1.40
+++ wesnoth.spec	22 Sep 2008 14:04:23 -0000	1.41
@@ -11,7 +11,7 @@
 Source2:        %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #No friibidi-devel in ppc, apparently.
-ExcludeArch:	ppc
+ExcludeArch:	ppc, ppc63, x86_64
 
 BuildRequires:	SDL_image-devel
 BuildRequires:	SDL_mixer-devel



From kyle at fedoraproject.org  Mon Sep 22 14:07:36 2008
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 22 Sep 2008 14:07:36 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc7.bz2.sign, NONE, 1.1 .cvsignore, 
	1.927, 1.928 kernel.spec, 1.961, 1.962 sources, 1.889,
	1.890 upstream, 1.801, 1.802 patch-2.6.27-rc6-git6.bz2.sign, 1.1,
	NONE patch-2.6.27-rc6.bz2.sign, 1.1, NONE
Message-ID: <20080922140736.22EBA700FE@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31018

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.27-rc7.bz2.sign 
Removed Files:
	patch-2.6.27-rc6-git6.bz2.sign patch-2.6.27-rc6.bz2.sign 
Log Message:
* Mon Sep 22 2008 Kyle McMartin <kyle at redhat.com>
- Linux 2.6.27-rc7



--- NEW FILE patch-2.6.27-rc7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBI1s+gyGugalF9Dw4RAgReAJ0YZe8boi7zW0eB3bw+1oO8upYTUwCeMiYJ
Hikc6G7qk/yPasFnwAXU/Cc=
=wIV3
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.927
retrieving revision 1.928
diff -u -r1.927 -r1.928
--- .cvsignore	20 Sep 2008 01:00:56 -0000	1.927
+++ .cvsignore	22 Sep 2008 14:07:05 -0000	1.928
@@ -4,5 +4,4 @@
 temp-*
 kernel-2.6.26
 linux-2.6.26.tar.bz2
-patch-2.6.27-rc6.bz2
-patch-2.6.27-rc6-git6.bz2
+patch-2.6.27-rc7.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.961
retrieving revision 1.962
diff -u -r1.961 -r1.962
--- kernel.spec	20 Sep 2008 01:00:56 -0000	1.961
+++ kernel.spec	22 Sep 2008 14:07:05 -0000	1.962
@@ -43,9 +43,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 6
+%define rcrev 7
 # The git snapshot level
-%define gitrev 6
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1758,6 +1758,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Sep 22 2008 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.27-rc7
+
 * Fri Sep 19 2008 Dave Jones <davej at redhat.com>
 - 2.6.27-rc6-git6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.889
retrieving revision 1.890
diff -u -r1.889 -r1.890
--- sources	20 Sep 2008 01:00:56 -0000	1.889
+++ sources	22 Sep 2008 14:07:05 -0000	1.890
@@ -1,3 +1,2 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
-d3a173a00e15a6bf3c76068537a5c069  patch-2.6.27-rc6.bz2
-f07e706ce2c2507ef146de4130e919b5  patch-2.6.27-rc6-git6.bz2
+711e4624185c1e229e9aa4c736b57e05  patch-2.6.27-rc7.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.801
retrieving revision 1.802
diff -u -r1.801 -r1.802
--- upstream	20 Sep 2008 01:00:57 -0000	1.801
+++ upstream	22 Sep 2008 14:07:05 -0000	1.802
@@ -1,3 +1,2 @@
 linux-2.6.26.tar.bz2
-patch-2.6.27-rc6.bz2
-patch-2.6.27-rc6-git6.bz2
+patch-2.6.27-rc7.bz2


--- patch-2.6.27-rc6-git6.bz2.sign DELETED ---


--- patch-2.6.27-rc6.bz2.sign DELETED ---



From pkgdb at fedoraproject.org  Mon Sep 22 14:11:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:11:29 +0000
Subject: [pkgdb] LinLog: lucilanga has requested watchbugzilla
Message-ID: <20080922141129.D1F9C208DA2@bastion.fedora.phx.redhat.com>

lucilanga has requested the watchbugzilla acl on LinLog (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:11:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:11:31 +0000
Subject: [pkgdb] LinLog: lucilanga has requested watchcommits
Message-ID: <20080922141131.EC844208DA7@bastion.fedora.phx.redhat.com>

lucilanga has requested the watchcommits acl on LinLog (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:11:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:11:32 +0000
Subject: [pkgdb] LinLog: lucilanga has requested commit
Message-ID: <20080922141132.57D1C208DAD@bastion.fedora.phx.redhat.com>

lucilanga has requested the commit acl on LinLog (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:11:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:11:38 +0000
Subject: [pkgdb] LinLog: lucilanga has requested watchbugzilla
Message-ID: <20080922141138.99390208DB6@bastion.fedora.phx.redhat.com>

lucilanga has requested the watchbugzilla acl on LinLog (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:11:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:11:33 +0000
Subject: [pkgdb] LinLog: lucilanga has requested approveacls
Message-ID: <20080922141133.57CE5208DB2@bastion.fedora.phx.redhat.com>

lucilanga has requested the approveacls acl on LinLog (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:11:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:11:39 +0000
Subject: [pkgdb] LinLog: lucilanga has requested watchcommits
Message-ID: <20080922141139.8A385208DBB@bastion.fedora.phx.redhat.com>

lucilanga has requested the watchcommits acl on LinLog (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:11:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:11:40 +0000
Subject: [pkgdb] LinLog: lucilanga has requested commit
Message-ID: <20080922141140.EAFD7208DBF@bastion.fedora.phx.redhat.com>

lucilanga has requested the commit acl on LinLog (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:11:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:11:41 +0000
Subject: [pkgdb] LinLog: lucilanga has requested approveacls
Message-ID: <20080922141141.6F6E7208DC1@bastion.fedora.phx.redhat.com>

lucilanga has requested the approveacls acl on LinLog (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:11:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:11:45 +0000
Subject: [pkgdb] LinLog: lucilanga has requested watchbugzilla
Message-ID: <20080922141145.0FDFC208DC6@bastion.fedora.phx.redhat.com>

lucilanga has requested the watchbugzilla acl on LinLog (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:11:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:11:45 +0000
Subject: [pkgdb] LinLog: lucilanga has requested watchcommits
Message-ID: <20080922141145.BE8C0208DCA@bastion.fedora.phx.redhat.com>

lucilanga has requested the watchcommits acl on LinLog (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:11:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:11:46 +0000
Subject: [pkgdb] LinLog: lucilanga has requested commit
Message-ID: <20080922141146.9EE79208DCE@bastion.fedora.phx.redhat.com>

lucilanga has requested the commit acl on LinLog (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:11:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:11:47 +0000
Subject: [pkgdb] LinLog: lucilanga has requested approveacls
Message-ID: <20080922141147.31DC0208DD2@bastion.fedora.phx.redhat.com>

lucilanga has requested the approveacls acl on LinLog (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From hedayat at fedoraproject.org  Mon Sep 22 14:19:16 2008
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Mon, 22 Sep 2008 14:19:16 +0000 (UTC)
Subject: rpms/gnome-applet-jalali-calendar/devel
	gnome-applet-jalali-calendar-1.6.5-installfix.patch, NONE,
	1.1 gnome-applet-jalali-calendar-1.6.5-shebangfix.patch, NONE,
	1.1 gnome-applet-jalali-calendar.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080922141916.DBF6D700FE@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-serv304/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-applet-jalali-calendar-1.6.5-installfix.patch 
	gnome-applet-jalali-calendar-1.6.5-shebangfix.patch 
	gnome-applet-jalali-calendar.spec import.log 
Log Message:
Initial import


gnome-applet-jalali-calendar-1.6.5-installfix.patch:

--- NEW FILE gnome-applet-jalali-calendar-1.6.5-installfix.patch ---
diff -up jalali-calendar-1.6.5/Makefile.installfix jalali-calendar-1.6.5/Makefile
--- jalali-calendar-1.6.5/Makefile.installfix	2008-03-28 14:31:42.000000000 +0430
+++ jalali-calendar-1.6.5/Makefile	2008-09-12 15:23:21.000000000 +0430
@@ -2,17 +2,18 @@ PKGNAME = Jalali-applet
 VERSION= 1.6.4
 PYTHON=python
 PKGDIR = /usr/share/jalali-calendar
-
+LIBDIR=/usr/lib/
 
 install:
 	mkdir -p $(DESTDIR)$(PKGDIR)
 	mkdir -p $(DESTDIR)$(PKGDIR)/date
+	mkdir -p $(DESTDIR)$(LIBDIR)/bonobo/servers
 
-	install -m644 COPYING $(DESTDIR)$(PKGDIR)/.
-	install -m755 src/*.py $(DESTDIR)$(PKGDIR)/.
-	install -m644 src/138*.xml $(DESTDIR)$(PKGDIR)/.
-	install -m644 src/*.glade $(DESTDIR)$(PKGDIR)/.
-	install -m644 src/GNOME_PyJcalendarApplet.server $(DESTDIR)/usr/lib/bonobo/servers
-	install -m644 pixmaps/date/*.png $(DESTDIR)$(PKGDIR)/date/.
-	install -m644 pixmaps/*.png $(DESTDIR)$(PKGDIR)/.
+	install -p -m644 COPYING $(DESTDIR)$(PKGDIR)/.
+	install -p -m755 src/*.py $(DESTDIR)$(PKGDIR)/.
+	install -p -m644 src/138*.xml $(DESTDIR)$(PKGDIR)/.
+	install -p -m644 src/*.glade $(DESTDIR)$(PKGDIR)/.
+	install -p -m644 src/GNOME_PyJcalendarApplet.server $(DESTDIR)/$(LIBDIR)/bonobo/servers
+	install -p -m644 pixmaps/date/*.png $(DESTDIR)$(PKGDIR)/date/.
+	install -p -m644 pixmaps/*.png $(DESTDIR)$(PKGDIR)/.
 	chmod +x $(DESTDIR)$(PKGDIR)/jcalendar.py

gnome-applet-jalali-calendar-1.6.5-shebangfix.patch:

--- NEW FILE gnome-applet-jalali-calendar-1.6.5-shebangfix.patch ---
diff -up jalali-calendar-1.6.5/src/calendar.py.shebangfix jalali-calendar-1.6.5/src/calendar.py
--- jalali-calendar-1.6.5/src/calendar.py.shebangfix	2007-05-25 15:57:02.000000000 +0330
+++ jalali-calendar-1.6.5/src/calendar.py	2008-09-12 15:51:45.000000000 +0430
@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python
+## -*- coding: utf-8 -*-
 #
 ##
 #    
diff -up jalali-calendar-1.6.5/src/holiday.py.shebangfix jalali-calendar-1.6.5/src/holiday.py
--- jalali-calendar-1.6.5/src/holiday.py.shebangfix	2008-03-28 14:24:52.000000000 +0430
+++ jalali-calendar-1.6.5/src/holiday.py	2008-09-12 15:51:49.000000000 +0430
@@ -1,4 +1,5 @@
-##
+#!/usr/bin/env python
+###
 #    
 #    Copyright (C) 2007  Mola Pahnadayan
 #
diff -up jalali-calendar-1.6.5/src/utility.py.shebangfix jalali-calendar-1.6.5/src/utility.py
--- jalali-calendar-1.6.5/src/utility.py.shebangfix	2007-05-02 12:23:55.000000000 +0330
+++ jalali-calendar-1.6.5/src/utility.py	2008-09-12 15:51:37.000000000 +0430
@@ -1,4 +1,5 @@
-##
+#!/usr/bin/env python
+###
 #    
 #    Copyright (C) 2007  Mola Pahnadayan
 #


--- NEW FILE gnome-applet-jalali-calendar.spec ---
Name:           gnome-applet-jalali-calendar
Version:        1.6.5
Release:        3%{?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:         %{name}-1.6.5-installfix.patch
Patch1:         %{name}-1.6.5-shebangfix.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       gnome-python2-applet gnome-python2-gconf
Requires:       pygtk2-libglade
%if 0%{?fedora} >= 10
Requires: gnome-python2-gnome
%endif
BuildRequires:  python

%description
Jalali calendar applet for the GNOME desktop.
Features:
1. Displays holidays
2. Displays day names
3. Calendar event management (Adding birthdays, etc)

%prep
%setup -n jalali-calendar-%{version} -q
%patch0 -p1 -b .installfix
%patch1 -p1 -b .shebangfix

%build

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README 
%{_prefix}/lib/bonobo/servers/*
%{_datadir}/jalali-calendar

%changelog
* Sun Sep 21 2008 Hedayat Vatankhah <hedayat at grad.com> 1.6.5-3
- Fixed dependencies for Fedora 10
- Removed redundant dependencies

* Sun Sep 21 2008 Hedayat Vatankhah <hedayat at grad.com> 1.6.5-2
- Added missing dependencies
- Using lib directory even on x86_64 platforms to be a noarch package

* Fri Sep 12 2008 Hedayat Vatankhah <hedayat at grad.com> 1.6.5-1
- Initial version


--- NEW FILE import.log ---
gnome-applet-jalali-calendar-1_6_5-3_fc9:HEAD:gnome-applet-jalali-calendar-1.6.5-3.fc9.src.rpm:1222093029


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-jalali-calendar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Sep 2008 09:30:03 -0000	1.1
+++ .cvsignore	22 Sep 2008 14:18:46 -0000	1.2
@@ -0,0 +1 @@
+jalali-calendar-1.6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-jalali-calendar/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 09:30:03 -0000	1.1
+++ sources	22 Sep 2008 14:18:46 -0000	1.2
@@ -0,0 +1 @@
+5c8a7d46c98b22b28533a6c3e56a894a  jalali-calendar-1.6.5.tar.bz2



From langel at fedoraproject.org  Mon Sep 22 14:21:28 2008
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon, 22 Sep 2008 14:21:28 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-9 java-1.6.0-openjdk.spec,1.58,1.59
Message-ID: <20080922142128.DB87E700FE@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv903

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Mon Sep 22 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.19.b09
- Removed update-desktop-database dependency.
- Resolves: rhbz#463046




Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/java-1.6.0-openjdk.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- java-1.6.0-openjdk.spec	8 Sep 2008 19:05:59 -0000	1.58
+++ java-1.6.0-openjdk.spec	22 Sep 2008 14:20:58 -0000	1.59
@@ -134,7 +134,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.18.%{openjdkver}%{?dist}
+Release: 0.19.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -236,12 +236,6 @@
 Requires(post):   %{_sbindir}/alternatives
 # Postun requires alternatives to uninstall tool alternatives.
 Requires(postun): %{_sbindir}/alternatives
-# Post requires update-desktop-database to update desktop database
-# for jnlp files.
-Requires(post):   %{_bindir}/update-desktop-database
-# Postun requires update-desktop-database to update desktop database
-# for jnlp files.
-Requires(postun): %{_bindir}/update-desktop-database
 
 # java-1.6.0-openjdk replaces java-1.7.0-icedtea.
 Provides: java-1.7.0-icedtea = 0:1.7.0.0-0.999
@@ -648,7 +642,7 @@
   %{_jvmprivdir}/%{archname}/jce/vanilla/US_export_policy.jar
 
 # Update for jnlp handling.
-update-desktop-database -q %{_datadir}/applications || :
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
@@ -669,7 +663,7 @@
 fi
 
 # Update for jnlp handling.
-update-desktop-database -q %{_datadir}/applications || :
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
@@ -930,6 +924,10 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Sep 22 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.19.b09
+- Removed update-desktop-database dependency.
+- Resolves: rhbz#463046
+
 * Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.18.b09
 - Moved hotspot patch to only be applied to jit_arches.
 



From hedayat at fedoraproject.org  Mon Sep 22 14:23:45 2008
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Mon, 22 Sep 2008 14:23:45 +0000 (UTC)
Subject: rpms/gnome-applet-jalali-calendar/F-8
	gnome-applet-jalali-calendar-1.6.5-installfix.patch, NONE,
	1.1 gnome-applet-jalali-calendar-1.6.5-shebangfix.patch, NONE,
	1.1 gnome-applet-jalali-calendar.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080922142345.ABCC7700FE@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/gnome-applet-jalali-calendar/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1395

Modified Files:
	sources 
Added Files:
	gnome-applet-jalali-calendar-1.6.5-installfix.patch 
	gnome-applet-jalali-calendar-1.6.5-shebangfix.patch 
	gnome-applet-jalali-calendar.spec 
Log Message:
added f-8 branch

gnome-applet-jalali-calendar-1.6.5-installfix.patch:

--- NEW FILE gnome-applet-jalali-calendar-1.6.5-installfix.patch ---
diff -up jalali-calendar-1.6.5/Makefile.installfix jalali-calendar-1.6.5/Makefile
--- jalali-calendar-1.6.5/Makefile.installfix	2008-03-28 14:31:42.000000000 +0430
+++ jalali-calendar-1.6.5/Makefile	2008-09-12 15:23:21.000000000 +0430
@@ -2,17 +2,18 @@ PKGNAME = Jalali-applet
 VERSION= 1.6.4
 PYTHON=python
 PKGDIR = /usr/share/jalali-calendar
-
+LIBDIR=/usr/lib/
 
 install:
 	mkdir -p $(DESTDIR)$(PKGDIR)
 	mkdir -p $(DESTDIR)$(PKGDIR)/date
+	mkdir -p $(DESTDIR)$(LIBDIR)/bonobo/servers
 
-	install -m644 COPYING $(DESTDIR)$(PKGDIR)/.
-	install -m755 src/*.py $(DESTDIR)$(PKGDIR)/.
-	install -m644 src/138*.xml $(DESTDIR)$(PKGDIR)/.
-	install -m644 src/*.glade $(DESTDIR)$(PKGDIR)/.
-	install -m644 src/GNOME_PyJcalendarApplet.server $(DESTDIR)/usr/lib/bonobo/servers
-	install -m644 pixmaps/date/*.png $(DESTDIR)$(PKGDIR)/date/.
-	install -m644 pixmaps/*.png $(DESTDIR)$(PKGDIR)/.
+	install -p -m644 COPYING $(DESTDIR)$(PKGDIR)/.
+	install -p -m755 src/*.py $(DESTDIR)$(PKGDIR)/.
+	install -p -m644 src/138*.xml $(DESTDIR)$(PKGDIR)/.
+	install -p -m644 src/*.glade $(DESTDIR)$(PKGDIR)/.
+	install -p -m644 src/GNOME_PyJcalendarApplet.server $(DESTDIR)/$(LIBDIR)/bonobo/servers
+	install -p -m644 pixmaps/date/*.png $(DESTDIR)$(PKGDIR)/date/.
+	install -p -m644 pixmaps/*.png $(DESTDIR)$(PKGDIR)/.
 	chmod +x $(DESTDIR)$(PKGDIR)/jcalendar.py

gnome-applet-jalali-calendar-1.6.5-shebangfix.patch:

--- NEW FILE gnome-applet-jalali-calendar-1.6.5-shebangfix.patch ---
diff -up jalali-calendar-1.6.5/src/calendar.py.shebangfix jalali-calendar-1.6.5/src/calendar.py
--- jalali-calendar-1.6.5/src/calendar.py.shebangfix	2007-05-25 15:57:02.000000000 +0330
+++ jalali-calendar-1.6.5/src/calendar.py	2008-09-12 15:51:45.000000000 +0430
@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python
+## -*- coding: utf-8 -*-
 #
 ##
 #    
diff -up jalali-calendar-1.6.5/src/holiday.py.shebangfix jalali-calendar-1.6.5/src/holiday.py
--- jalali-calendar-1.6.5/src/holiday.py.shebangfix	2008-03-28 14:24:52.000000000 +0430
+++ jalali-calendar-1.6.5/src/holiday.py	2008-09-12 15:51:49.000000000 +0430
@@ -1,4 +1,5 @@
-##
+#!/usr/bin/env python
+###
 #    
 #    Copyright (C) 2007  Mola Pahnadayan
 #
diff -up jalali-calendar-1.6.5/src/utility.py.shebangfix jalali-calendar-1.6.5/src/utility.py
--- jalali-calendar-1.6.5/src/utility.py.shebangfix	2007-05-02 12:23:55.000000000 +0330
+++ jalali-calendar-1.6.5/src/utility.py	2008-09-12 15:51:37.000000000 +0430
@@ -1,4 +1,5 @@
-##
+#!/usr/bin/env python
+###
 #    
 #    Copyright (C) 2007  Mola Pahnadayan
 #


--- NEW FILE gnome-applet-jalali-calendar.spec ---
Name:           gnome-applet-jalali-calendar
Version:        1.6.5
Release:        3%{?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:         %{name}-1.6.5-installfix.patch
Patch1:         %{name}-1.6.5-shebangfix.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       gnome-python2-applet gnome-python2-gconf
Requires:       pygtk2-libglade
%if 0%{?fedora} >= 10
Requires: gnome-python2-gnome
%endif
BuildRequires:  python

%description
Jalali calendar applet for the GNOME desktop.
Features:
1. Displays holidays
2. Displays day names
3. Calendar event management (Adding birthdays, etc)

%prep
%setup -n jalali-calendar-%{version} -q
%patch0 -p1 -b .installfix
%patch1 -p1 -b .shebangfix

%build

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README 
%{_prefix}/lib/bonobo/servers/*
%{_datadir}/jalali-calendar

%changelog
* Sun Sep 21 2008 Hedayat Vatankhah <hedayat at grad.com> 1.6.5-3
- Fixed dependencies for Fedora 10
- Removed redundant dependencies

* Sun Sep 21 2008 Hedayat Vatankhah <hedayat at grad.com> 1.6.5-2
- Added missing dependencies
- Using lib directory even on x86_64 platforms to be a noarch package

* Fri Sep 12 2008 Hedayat Vatankhah <hedayat at grad.com> 1.6.5-1
- Initial version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-jalali-calendar/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 09:30:03 -0000	1.1
+++ sources	22 Sep 2008 14:23:15 -0000	1.2
@@ -0,0 +1 @@
+5c8a7d46c98b22b28533a6c3e56a894a  jalali-calendar-1.6.5.tar.bz2



From hedayat at fedoraproject.org  Mon Sep 22 14:23:57 2008
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Mon, 22 Sep 2008 14:23:57 +0000 (UTC)
Subject: rpms/gnome-applet-jalali-calendar/F-9
	gnome-applet-jalali-calendar-1.6.5-installfix.patch, NONE,
	1.1 gnome-applet-jalali-calendar-1.6.5-shebangfix.patch, NONE,
	1.1 gnome-applet-jalali-calendar.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080922142357.9C35F700FE@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/gnome-applet-jalali-calendar/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1443

Modified Files:
	sources 
Added Files:
	gnome-applet-jalali-calendar-1.6.5-installfix.patch 
	gnome-applet-jalali-calendar-1.6.5-shebangfix.patch 
	gnome-applet-jalali-calendar.spec 
Log Message:
commit f-9 branch

gnome-applet-jalali-calendar-1.6.5-installfix.patch:

--- NEW FILE gnome-applet-jalali-calendar-1.6.5-installfix.patch ---
diff -up jalali-calendar-1.6.5/Makefile.installfix jalali-calendar-1.6.5/Makefile
--- jalali-calendar-1.6.5/Makefile.installfix	2008-03-28 14:31:42.000000000 +0430
+++ jalali-calendar-1.6.5/Makefile	2008-09-12 15:23:21.000000000 +0430
@@ -2,17 +2,18 @@ PKGNAME = Jalali-applet
 VERSION= 1.6.4
 PYTHON=python
 PKGDIR = /usr/share/jalali-calendar
-
+LIBDIR=/usr/lib/
 
 install:
 	mkdir -p $(DESTDIR)$(PKGDIR)
 	mkdir -p $(DESTDIR)$(PKGDIR)/date
+	mkdir -p $(DESTDIR)$(LIBDIR)/bonobo/servers
 
-	install -m644 COPYING $(DESTDIR)$(PKGDIR)/.
-	install -m755 src/*.py $(DESTDIR)$(PKGDIR)/.
-	install -m644 src/138*.xml $(DESTDIR)$(PKGDIR)/.
-	install -m644 src/*.glade $(DESTDIR)$(PKGDIR)/.
-	install -m644 src/GNOME_PyJcalendarApplet.server $(DESTDIR)/usr/lib/bonobo/servers
-	install -m644 pixmaps/date/*.png $(DESTDIR)$(PKGDIR)/date/.
-	install -m644 pixmaps/*.png $(DESTDIR)$(PKGDIR)/.
+	install -p -m644 COPYING $(DESTDIR)$(PKGDIR)/.
+	install -p -m755 src/*.py $(DESTDIR)$(PKGDIR)/.
+	install -p -m644 src/138*.xml $(DESTDIR)$(PKGDIR)/.
+	install -p -m644 src/*.glade $(DESTDIR)$(PKGDIR)/.
+	install -p -m644 src/GNOME_PyJcalendarApplet.server $(DESTDIR)/$(LIBDIR)/bonobo/servers
+	install -p -m644 pixmaps/date/*.png $(DESTDIR)$(PKGDIR)/date/.
+	install -p -m644 pixmaps/*.png $(DESTDIR)$(PKGDIR)/.
 	chmod +x $(DESTDIR)$(PKGDIR)/jcalendar.py

gnome-applet-jalali-calendar-1.6.5-shebangfix.patch:

--- NEW FILE gnome-applet-jalali-calendar-1.6.5-shebangfix.patch ---
diff -up jalali-calendar-1.6.5/src/calendar.py.shebangfix jalali-calendar-1.6.5/src/calendar.py
--- jalali-calendar-1.6.5/src/calendar.py.shebangfix	2007-05-25 15:57:02.000000000 +0330
+++ jalali-calendar-1.6.5/src/calendar.py	2008-09-12 15:51:45.000000000 +0430
@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python
+## -*- coding: utf-8 -*-
 #
 ##
 #    
diff -up jalali-calendar-1.6.5/src/holiday.py.shebangfix jalali-calendar-1.6.5/src/holiday.py
--- jalali-calendar-1.6.5/src/holiday.py.shebangfix	2008-03-28 14:24:52.000000000 +0430
+++ jalali-calendar-1.6.5/src/holiday.py	2008-09-12 15:51:49.000000000 +0430
@@ -1,4 +1,5 @@
-##
+#!/usr/bin/env python
+###
 #    
 #    Copyright (C) 2007  Mola Pahnadayan
 #
diff -up jalali-calendar-1.6.5/src/utility.py.shebangfix jalali-calendar-1.6.5/src/utility.py
--- jalali-calendar-1.6.5/src/utility.py.shebangfix	2007-05-02 12:23:55.000000000 +0330
+++ jalali-calendar-1.6.5/src/utility.py	2008-09-12 15:51:37.000000000 +0430
@@ -1,4 +1,5 @@
-##
+#!/usr/bin/env python
+###
 #    
 #    Copyright (C) 2007  Mola Pahnadayan
 #


--- NEW FILE gnome-applet-jalali-calendar.spec ---
Name:           gnome-applet-jalali-calendar
Version:        1.6.5
Release:        3%{?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:         %{name}-1.6.5-installfix.patch
Patch1:         %{name}-1.6.5-shebangfix.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       gnome-python2-applet gnome-python2-gconf
Requires:       pygtk2-libglade
%if 0%{?fedora} >= 10
Requires: gnome-python2-gnome
%endif
BuildRequires:  python

%description
Jalali calendar applet for the GNOME desktop.
Features:
1. Displays holidays
2. Displays day names
3. Calendar event management (Adding birthdays, etc)

%prep
%setup -n jalali-calendar-%{version} -q
%patch0 -p1 -b .installfix
%patch1 -p1 -b .shebangfix

%build

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README 
%{_prefix}/lib/bonobo/servers/*
%{_datadir}/jalali-calendar

%changelog
* Sun Sep 21 2008 Hedayat Vatankhah <hedayat at grad.com> 1.6.5-3
- Fixed dependencies for Fedora 10
- Removed redundant dependencies

* Sun Sep 21 2008 Hedayat Vatankhah <hedayat at grad.com> 1.6.5-2
- Added missing dependencies
- Using lib directory even on x86_64 platforms to be a noarch package

* Fri Sep 12 2008 Hedayat Vatankhah <hedayat at grad.com> 1.6.5-1
- Initial version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-jalali-calendar/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 09:30:03 -0000	1.1
+++ sources	22 Sep 2008 14:23:27 -0000	1.2
@@ -0,0 +1 @@
+5c8a7d46c98b22b28533a6c3e56a894a  jalali-calendar-1.6.5.tar.bz2



From langel at fedoraproject.org  Mon Sep 22 14:25:30 2008
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon, 22 Sep 2008 14:25:30 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.70,1.71
Message-ID: <20080922142530.A377A700FE@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-serv1909

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Mon Sep 22 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.21.b11
- Removed update-desktop-database dependency.
- Resolves: rhbz#463046




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.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- java-1.6.0-openjdk.spec	8 Sep 2008 13:07:18 -0000	1.70
+++ java-1.6.0-openjdk.spec	22 Sep 2008 14:25:00 -0000	1.71
@@ -212,12 +212,6 @@
 Requires(post):   %{_sbindir}/alternatives
 # Postun requires alternatives to uninstall tool alternatives.
 Requires(postun): %{_sbindir}/alternatives
-# Post requires update-desktop-database to update desktop database
-# for jnlp files.
-Requires(post):   %{_bindir}/update-desktop-database
-# Postun requires update-desktop-database to update desktop database
-# for jnlp files.
-Requires(postun): %{_bindir}/update-desktop-database
 
 # java-1.6.0-openjdk replaces java-1.7.0-icedtea.
 Provides: java-1.7.0-icedtea = 0:1.7.0.0-0.999
@@ -622,7 +616,7 @@
   %{_jvmprivdir}/%{archname}/jce/vanilla/US_export_policy.jar
 
 # Update for jnlp handling.
-update-desktop-database -q %{_datadir}/applications || :
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
@@ -643,7 +637,7 @@
 fi
 
 # Update for jnlp handling.
-update-desktop-database -q %{_datadir}/applications || :
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
@@ -903,6 +897,10 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Sep 22 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.21.b11
+- Removed update-desktop-database dependency.
+- Resolves: rhbz#463046
+
 * Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.20.b11
 - Added rhino requirement.
 - Resolves: rhbz#461336



From pkgdb at fedoraproject.org  Mon Sep 22 14:27:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:27:29 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922142729.554A6208D9F@bastion.fedora.phx.redhat.com>

bjensen has set the watchbugzilla acl on LinLog (Fedora devel) to Approved for lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:27:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:27:37 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922142737.DB311208DA7@bastion.fedora.phx.redhat.com>

bjensen has set the approveacls acl on LinLog (Fedora devel) to Approved for lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:27:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:27:43 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922142745.50D01208DA8@bastion.fedora.phx.redhat.com>

bjensen has set the watchcommits acl on LinLog (Fedora devel) to Approved for lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:27:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:27:43 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922142745.BC671208DAE@bastion.fedora.phx.redhat.com>

bjensen has set the commit acl on LinLog (Fedora devel) to Approved for lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:27:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:27:45 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922142745.E1B45208DB3@bastion.fedora.phx.redhat.com>

bjensen has set the watchcommits acl on LinLog (Fedora 8) to Approved for lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:27:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:27:46 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922142746.3ACA5208DB7@bastion.fedora.phx.redhat.com>

bjensen has set the watchbugzilla acl on LinLog (Fedora 8) to Approved for lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:27:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:27:48 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922142748.72C85208DBB@bastion.fedora.phx.redhat.com>

bjensen has set the commit acl on LinLog (Fedora 8) to Approved for lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:27:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:27:50 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922142750.4594E208DBF@bastion.fedora.phx.redhat.com>

bjensen has set the approveacls acl on LinLog (Fedora 8) to Approved for lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:27:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:27:55 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922142755.9795D208DA5@bastion.fedora.phx.redhat.com>

bjensen has set the approveacls acl on LinLog (Fedora 8) to Approved for sindrepb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:27:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:27:56 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922142756.C766C208DC5@bastion.fedora.phx.redhat.com>

bjensen has set the commit acl on LinLog (Fedora 8) to Approved for sindrepb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:27:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:27:57 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922142757.8F258208DCB@bastion.fedora.phx.redhat.com>

bjensen has set the commit acl on LinLog (Fedora devel) to Approved for sindrepb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:27:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:27:59 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922142759.6E122208DD1@bastion.fedora.phx.redhat.com>

bjensen has set the approveacls acl on LinLog (Fedora devel) to Approved for sindrepb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:28:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:28:22 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922142822.95E0D208DAB@bastion.fedora.phx.redhat.com>

bjensen has set the watchbugzilla acl on LinLog (Fedora 9) to Approved for lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:28:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:28:24 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922142824.BD654208DB0@bastion.fedora.phx.redhat.com>

bjensen has set the watchcommits acl on LinLog (Fedora 9) to Approved for lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:28:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:28:50 +0000
Subject: [pkgdb] LinLog: bjensen has requested watchcommits
Message-ID: <20080922142850.75602208DBC@bastion.fedora.phx.redhat.com>

bjensen has requested the watchcommits acl on LinLog (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:28:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:28:51 +0000
Subject: [pkgdb] LinLog: bjensen has requested commit
Message-ID: <20080922142851.96FE3208DDA@bastion.fedora.phx.redhat.com>

bjensen has requested the commit acl on LinLog (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:28:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:28:52 +0000
Subject: [pkgdb] LinLog: bjensen has requested approveacls
Message-ID: <20080922142853.18084208DE0@bastion.fedora.phx.redhat.com>

bjensen has requested the approveacls acl on LinLog (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:30:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:30:32 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922143032.5C9FC208DC3@bastion.fedora.phx.redhat.com>

bjensen has set the watchcommits acl on LinLog (Fedora devel) to Approved for bjensen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:30:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:30:40 +0000
Subject: [pkgdb] LinLog: bjensen has requested watchbugzilla
Message-ID: <20080922143040.8918E208DBB@bastion.fedora.phx.redhat.com>

bjensen has requested the watchbugzilla acl on LinLog (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:30:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:30:42 +0000
Subject: [pkgdb] LinLog: bjensen has requested commit
Message-ID: <20080922143042.8EC18208DCA@bastion.fedora.phx.redhat.com>

bjensen has requested the commit acl on LinLog (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:30:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:30:56 +0000
Subject: [pkgdb] LinLog: bjensen has requested approveacls
Message-ID: <20080922143057.3C506208DEC@bastion.fedora.phx.redhat.com>

bjensen has requested the approveacls acl on LinLog (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:30:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:30:58 +0000
Subject: [pkgdb] LinLog: bjensen has requested watchbugzilla
Message-ID: <20080922143058.F1B27208DF0@bastion.fedora.phx.redhat.com>

bjensen has requested the watchbugzilla acl on LinLog (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:31:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:31:00 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922143100.CF4CA208DF3@bastion.fedora.phx.redhat.com>

bjensen has set the commit acl on LinLog (Fedora 9) to Approved for sindrepb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:31:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:31:01 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922143101.3EECE208DF7@bastion.fedora.phx.redhat.com>

bjensen has set the approveacls acl on LinLog (Fedora 9) to Approved for sindrepb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:31:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:31:55 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922143155.39B92208DA0@bastion.fedora.phx.redhat.com>

bjensen has set the watchbugzilla acl on LinLog (Fedora 8) to Approved for bjensen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:32:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:32:00 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922143200.D168D208DA8@bastion.fedora.phx.redhat.com>

bjensen has set the watchcommits acl on LinLog (Fedora 8) to Approved for bjensen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:32:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:32:06 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922143207.193E3208DB0@bastion.fedora.phx.redhat.com>

bjensen has set the watchcommits acl on LinLog (Fedora 9) to Approved for bjensen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:32:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:32:09 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922143209.2A652208DB5@bastion.fedora.phx.redhat.com>

bjensen has set the watchbugzilla acl on LinLog (Fedora 9) to Approved for bjensen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From rdieter at fedoraproject.org  Mon Sep 22 14:32:28 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 14:32:28 +0000 (UTC)
Subject: rpms/eric/devel eric.spec,1.30,1.31
Message-ID: <20080922143228.5ACF4700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/eric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3278

Modified Files:
	eric.spec 
Log Message:
make doc deps optional (when/if we ever get rpm support)



Index: eric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eric/devel/eric.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- eric.spec	7 Sep 2008 14:17:14 -0000	1.30
+++ eric.spec	22 Sep 2008 14:31:58 -0000	1.31
@@ -35,10 +35,10 @@
 Requires: qscintilla-python
 
 # Need this for the documentation
-Requires: python-docs
-Requires: qt4-designer
-Requires: qt4-doc
-
+Requires(hint): python-docs
+Requires(hint): qt4-designer
+# wow, at 80mb+, are we sure we want this?  -- Rex
+Requires(hint): qt4-doc
 
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
 %global full_python_ver %(%{__python} -c "import sys ; print sys.version[:5]")



From pkgdb at fedoraproject.org  Mon Sep 22 14:32:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:32:09 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922143209.E4130208DE6@bastion.fedora.phx.redhat.com>

bjensen has set the approveacls acl on LinLog (Fedora 9) to Approved for bjensen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From mclasen at fedoraproject.org  Mon Sep 22 14:33:40 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 14:33:40 +0000 (UTC)
Subject: rpms/atk/devel .cvsignore, 1.38, 1.39 atk.spec, 1.59, 1.60 sources, 
	1.38, 1.39
Message-ID: <20080922143340.5B9BE700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/atk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3508

Modified Files:
	.cvsignore atk.spec sources 
Log Message:
1.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/atk/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	22 Jul 2008 03:50:07 -0000	1.38
+++ .cvsignore	22 Sep 2008 14:33:10 -0000	1.39
@@ -1 +1 @@
-atk-1.23.5.tar.bz2
+atk-1.24.0.tar.bz2


Index: atk.spec
===================================================================
RCS file: /cvs/extras/rpms/atk/devel/atk.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- atk.spec	22 Jul 2008 03:46:18 -0000	1.59
+++ atk.spec	22 Sep 2008 14:33:10 -0000	1.60
@@ -2,11 +2,11 @@
 
 Summary: Interfaces for accessibility support
 Name: atk
-Version: 1.23.5
+Version: 1.24.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/atk/1.23/atk-%{version}.tar.bz2 
+Source: http://download.gnome.org/sources/atk/1.24/atk-%{version}.tar.bz2 
 URL: http://developer.gnome.org/projects/gap/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -72,6 +72,9 @@
 %{_datadir}/gtk-doc/html/atk
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 1.24.0-1
+- Update to 1.24.0
+
 * Mon Jul 21 2008 Matthias Clasen <mclasen at redhat.com> - 1.23.5-1
 - Update to 1.23.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/atk/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	22 Jul 2008 03:50:07 -0000	1.38
+++ sources	22 Sep 2008 14:33:10 -0000	1.39
@@ -1 +1 @@
-0b7d2800deb08b82c12f535b7d4199fd  atk-1.23.5.tar.bz2
+fb0ee9c7f18b15b490a0168b13740a4d  atk-1.24.0.tar.bz2



From rstrode at fedoraproject.org  Mon Sep 22 14:35:56 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 22 Sep 2008 14:35:56 +0000 (UTC)
Subject: rpms/eel2/devel eel-2.23.92-fade.patch, 1.1, 1.2 eel2.spec, 1.100,
	1.101
Message-ID: <20080922143556.BE302700FE@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/eel2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4094

Modified Files:
	eel-2.23.92-fade.patch eel2.spec 
Log Message:
- Don't fade desktop from themed gray color at startup


eel-2.23.92-fade.patch:

Index: eel-2.23.92-fade.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eel2/devel/eel-2.23.92-fade.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eel-2.23.92-fade.patch	19 Sep 2008 03:34:24 -0000	1.1
+++ eel-2.23.92-fade.patch	22 Sep 2008 14:35:26 -0000	1.2
@@ -1,14 +1,17 @@
---- a/eel/eel-background.c
-+++ b/eel/eel-background.c
-@@ -43,6 +43,7 @@
+diff -up eel-2.23.92/eel/eel-background.c.fade eel-2.23.92/eel/eel-background.c
+--- eel-2.23.92/eel/eel-background.c.fade	2008-09-08 17:26:14.000000000 -0400
++++ eel-2.23.92/eel/eel-background.c	2008-09-22 10:27:36.000000000 -0400
+@@ -43,6 +43,9 @@
  #include <stdio.h>
  #define GNOME_DESKTOP_USE_UNSTABLE_API
  #include <libgnomeui/gnome-bg.h>
 +#include <gdk/gdkx.h>
++
++#include <cairo-xlib.h>
  
  static void       eel_background_class_init                (gpointer       klass);
  static void       eel_background_init                      (gpointer       object,
-@@ -78,6 +79,7 @@ struct EelBackgroundDetails {
+@@ -78,6 +81,7 @@ struct EelBackgroundDetails {
  	/* Realized data: */
  	gboolean background_changes_with_size;
  	GdkPixmap *background_pixmap;
@@ -16,7 +19,7 @@
  	int background_entire_width;
  	int background_entire_height;
  	GdkColor default_color;
-@@ -182,6 +184,11 @@ eel_background_finalize (GObject *object)
+@@ -182,6 +186,11 @@ eel_background_finalize (GObject *object
  	background = EEL_BACKGROUND (object);
  
  	g_free (background->details->color);
@@ -28,7 +31,7 @@
  	eel_background_remove_current_image (background);
  
  	if (background->details->background_pixmap != NULL) {
-@@ -610,6 +619,25 @@ eel_background_reset (EelBackground *background)
+@@ -610,6 +619,25 @@ eel_background_reset (EelBackground *bac
  	g_signal_emit (GTK_OBJECT (background), signals[RESET], 0);
  }
  
@@ -54,7 +57,7 @@
  static void
  eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
  {
-@@ -644,14 +672,15 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
+@@ -644,14 +672,15 @@ eel_background_set_up_widget (EelBackgro
  	} else {
  		window = widget->window;
  	}
@@ -77,7 +80,7 @@
  
  	background->details->background_changes_with_size =
  		gnome_bg_changes_with_size (background->details->bg);
-@@ -679,6 +708,18 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
+@@ -679,6 +708,18 @@ eel_background_set_up_widget (EelBackgro
  static void
  eel_widget_background_changed (GtkWidget *widget, EelBackground *background)
  {
@@ -96,7 +99,7 @@
  	eel_background_unrealize (background);
  	eel_background_set_up_widget (background, widget);
  
-@@ -741,11 +782,22 @@ static void
+@@ -741,11 +782,55 @@ static void
  widget_realize_cb (GtkWidget *widget, gpointer data)
  {
  	EelBackground *background;
@@ -115,7 +118,40 @@
 +	gdk_drawable_get_size (widget->window, &width, &height);
 +	background->details->fade = gnome_bg_crossfade_new (width, height);
 +
-+	gnome_bg_crossfade_set_start_pixmap (background->details->fade, NULL);
++	if (background->details->is_desktop) {
++		GdkWindow *root_window;
++		GdkScreen *screen;
++		GdkPixmap *pixmap;
++		cairo_surface_t *surface;
++		int x, y;
++		cairo_pattern_t *pattern;
++		cairo_t *cr;
++
++		screen = gtk_widget_get_screen (widget);
++
++		root_window = gdk_screen_get_root_window (screen);
++		gdk_window_get_position (widget->window, &x, &y);
++
++		pixmap = gdk_pixmap_new (widget->window, width, height, -1);
++
++		cr = gdk_cairo_create (pixmap);
++
++		surface = cairo_xlib_surface_create (GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (widget)),
++						     GDK_WINDOW_XWINDOW (root_window),
++						     GDK_VISUAL_XVISUAL (gdk_drawable_get_visual (pixmap)),
++						     gdk_screen_get_width (screen),
++						     gdk_screen_get_height (screen));
++		cairo_set_source_surface (cr, surface, x, y);
++		cairo_paint (cr);
++
++		cairo_surface_destroy (surface);
++		cairo_destroy (cr);
++
++		gnome_bg_crossfade_set_start_pixmap (background->details->fade, pixmap);
++		g_object_unref (pixmap);
++	} else {
++		gnome_bg_crossfade_set_start_pixmap (background->details->fade, NULL);
++	}
 +
  	eel_background_set_up_widget (background, widget);
  }


Index: eel2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- eel2.spec	22 Sep 2008 00:26:28 -0000	1.100
+++ eel2.spec	22 Sep 2008 14:35:26 -0000	1.101
@@ -17,7 +17,7 @@
 Name:        eel2
 Summary:     Eazel Extensions Library
 Version:     2.24.0
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     LGPLv2+
 Group:       System Environment/Libraries
 Source:      http://download.gnome.org/sources/eel/2.24/eel-%{version}.tar.bz2
@@ -113,6 +113,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Mon Sep 22 2008 Ray Strode <rstrode at redhat.com> - 2.24.0-2
+- Don't fade desktop from themed gray color at startup
+
 * Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
 - Update to 2.24.0
 



From mclasen at fedoraproject.org  Mon Sep 22 14:39:13 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 14:39:13 +0000 (UTC)
Subject: rpms/gvfs/devel .cvsignore, 1.25, 1.26 gvfs.spec, 1.80, 1.81 sources,
	1.25, 1.26
Message-ID: <20080922143913.0E86E700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4833

Modified Files:
	.cvsignore gvfs.spec sources 
Log Message:
1.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	16 Sep 2008 01:12:16 -0000	1.25
+++ .cvsignore	22 Sep 2008 14:38:42 -0000	1.26
@@ -1 +1 @@
-gvfs-0.99.8.tar.bz2
+gvfs-1.0.0.tar.bz2


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- gvfs.spec	19 Sep 2008 18:15:39 -0000	1.80
+++ gvfs.spec	22 Sep 2008 14:38:42 -0000	1.81
@@ -1,11 +1,11 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 0.99.8
-Release: 6%{?dist}
+Version: 1.0.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
-Source: http://download.gnome.org/sources/gvfs/0.99/gvfs-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gvfs/1.0/gvfs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig
 BuildRequires: glib2-devel >= 2.17.4
@@ -255,6 +255,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com>  - 1.0.0-1
+- Update to 1.0.0
+
 * Fri Sep 19 2008 - Bastien Nocera <bnocera at redhat.com> - 0.99.8-6
 - Update patch for missing file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	16 Sep 2008 01:12:16 -0000	1.25
+++ sources	22 Sep 2008 14:38:42 -0000	1.26
@@ -1 +1 @@
-5a2caa410d2fb75317e3c07e437d79a7  gvfs-0.99.8.tar.bz2
+d32f32d3d227392e983cc61e07f57c0f  gvfs-1.0.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 14:45:58 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 14:45:58 +0000 (UTC)
Subject: rpms/gucharmap/devel .cvsignore, 1.15, 1.16 gucharmap.spec, 1.27,
	1.28 sources, 1.15, 1.16
Message-ID: <20080922144558.78F1A7013E@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gucharmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6008

Modified Files:
	.cvsignore gucharmap.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gucharmap/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	2 Sep 2008 23:08:37 -0000	1.15
+++ .cvsignore	22 Sep 2008 14:45:27 -0000	1.16
@@ -1 +1 @@
-gucharmap-2.23.91.tar.bz2
+gucharmap-2.24.0.tar.bz2


Index: gucharmap.spec
===================================================================
RCS file: /cvs/extras/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gucharmap.spec	2 Sep 2008 23:08:37 -0000	1.27
+++ gucharmap.spec	22 Sep 2008 14:45:27 -0000	1.28
@@ -3,7 +3,7 @@
 %define desktop_file_utils_version 0.9
 
 Name:           gucharmap
-Version:        2.23.91
+Version:        2.24.0
 Release:        1%{?dist}
 Summary:        Unicode character picker and font browser
 
@@ -11,7 +11,7 @@
 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.23/gucharmap-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gucharmap/2.24/gucharmap-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gnome-doc-utils >= 0.3.2
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gucharmap/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	2 Sep 2008 23:08:37 -0000	1.15
+++ sources	22 Sep 2008 14:45:28 -0000	1.16
@@ -1 +1 @@
-e78fe1e5f88a79c6116acc86e4012bb0  gucharmap-2.23.91.tar.bz2
+5dc5f1af56a5bd1a525125b315708d86  gucharmap-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 14:46:58 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 14:46:58 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs.spec,1.81,1.82
Message-ID: <20080922144658.38AC6700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6310

Modified Files:
	gvfs.spec 
Log Message:
1.0.0



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- gvfs.spec	22 Sep 2008 14:38:42 -0000	1.81
+++ gvfs.spec	22 Sep 2008 14:46:27 -0000	1.82
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -32,9 +32,6 @@
 
 Patch2: gvfs-obexftp-updated-apis-2.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=524498
-Patch3: gvfs-0.99.8-smb-kerberos-auth.patch
-
 %description
 The gvfs package provides backend implementations for the gio 
 framework in GLib. It includes ftp, sftp, cifs. 
@@ -117,7 +114,6 @@
 %setup -q
 %patch1 -p0 -b .archive-integration
 %patch2 -p0 -b .bluez-ods
-%patch3 -p0 -b .kerberos
 
 %build
 
@@ -255,7 +251,7 @@
 
 
 %changelog
-* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com>  - 1.0.0-1
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com>  - 1.0.0-2
 - Update to 1.0.0
 
 * Fri Sep 19 2008 - Bastien Nocera <bnocera at redhat.com> - 0.99.8-6



From pkgdb at fedoraproject.org  Mon Sep 22 14:30:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:30:55 +0000
Subject: [pkgdb] LinLog: bjensen has requested commit
Message-ID: <20080922143055.9C37B208DD9@bastion.fedora.phx.redhat.com>

bjensen has requested the commit acl on LinLog (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:30:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:30:43 +0000
Subject: [pkgdb] LinLog: bjensen has requested approveacls
Message-ID: <20080922143043.B5D7E208DCF@bastion.fedora.phx.redhat.com>

bjensen has requested the approveacls acl on LinLog (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:30:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:30:43 +0000
Subject: [pkgdb] LinLog: bjensen has requested watchcommits
Message-ID: <20080922143043.E39BB208DD5@bastion.fedora.phx.redhat.com>

bjensen has requested the watchcommits acl on LinLog (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:30:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:30:54 +0000
Subject: [pkgdb] LinLog: bjensen has requested watchcommits
Message-ID: <20080922143054.524C9208DBF@bastion.fedora.phx.redhat.com>

bjensen has requested the watchcommits acl on LinLog (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:28:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:28:26 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922142827.13D4A208DB5@bastion.fedora.phx.redhat.com>

bjensen has set the commit acl on LinLog (Fedora 9) to Approved for lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:28:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:28:55 +0000
Subject: [pkgdb] LinLog: bjensen has requested watchbugzilla
Message-ID: <20080922142856.3ED8A208DE8@bastion.fedora.phx.redhat.com>

bjensen has requested the watchbugzilla acl on LinLog (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:30:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:30:30 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922143030.A4CD8208DB4@bastion.fedora.phx.redhat.com>

bjensen has set the commit acl on LinLog (Fedora devel) to Approved for bjensen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:28:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:28:29 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922142829.476D8208DD7@bastion.fedora.phx.redhat.com>

bjensen has set the approveacls acl on LinLog (Fedora 9) to Approved for lucilanga

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 14:30:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:30:27 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922143027.7FF2A208DAE@bastion.fedora.phx.redhat.com>

bjensen has set the watchbugzilla acl on LinLog (Fedora devel) to Approved for bjensen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From mclasen at fedoraproject.org  Mon Sep 22 14:51:48 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 14:51:48 +0000 (UTC)
Subject: rpms/at-spi/devel .cvsignore, 1.53, 1.54 at-spi.spec, 1.97,
	1.98 sources, 1.53, 1.54
Message-ID: <20080922145148.24847700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7195

Modified Files:
	.cvsignore at-spi.spec sources 
Log Message:
fix spec



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	8 Sep 2008 16:47:48 -0000	1.53
+++ .cvsignore	22 Sep 2008 14:51:17 -0000	1.54
@@ -1 +1 @@
-at-spi-1.23.92.tar.bz2
+at-spi-1.24.0.tar.bz2


Index: at-spi.spec
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- at-spi.spec	8 Sep 2008 16:47:48 -0000	1.97
+++ at-spi.spec	22 Sep 2008 14:51:17 -0000	1.98
@@ -9,10 +9,10 @@
 
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
-Version: 1.23.92
-Release: 1%{?dist}
+Version: 1.24.0
+Release: 2%{?dist}
 URL: http://developer.gnome.org/projects/gap/
-Source0: http://download.gnome.org/sources/at-spi/1.23/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/at-spi/1.24/%{name}-%{version}.tar.bz2
 
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -22,12 +22,18 @@
 Requires: ORBit2 >= %{orbit2_version}
 Requires: gail >= %{gail_version}
 Requires: atk >= %{atk_version}
+
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
+
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: ORBit2-devel >= %{orbit2_version}
 BuildRequires: gail-devel >= %{gail_version}
 BuildRequires: atk-devel >= %{atk_version}
+BuildRequires: GConf2-devel
 BuildRequires: fontconfig
 BuildRequires: gettext
 BuildRequires: intltool
@@ -91,7 +97,23 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/orbit-2.0/*.la
 
-%post -p /sbin/ldconfig
+%pre
+if [ "$1" -gt 1 -a -f %{_sysconfdir}/gconf/schemas/at-spi.schemas ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/at-spi.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/at-spi.schemas >& /dev/null || :
+fi
+
+%post
+/sbin/ldconfig
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/at-spi.schemas >& /dev/null || :
+
 
 %postun -p /sbin/ldconfig
 
@@ -106,6 +128,7 @@
 %{_libdir}/orbit-2.0/*
 %{_libdir}/gtk-2.0/modules/*
 %{_libexecdir}/*
+%{_sysconfdir}/gconf/schemas/at-spi.schemas
 
 %files devel
 %defattr(-,root,root)
@@ -121,6 +144,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 1.24.0-2
+- Update to 1.24.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 1.23.92-1
 - Update to 1.23.92
 - Drop upstreamed patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	8 Sep 2008 16:47:48 -0000	1.53
+++ sources	22 Sep 2008 14:51:17 -0000	1.54
@@ -1 +1 @@
-e1c7bbf6eb19b9ca9c509acb238e5c56  at-spi-1.23.92.tar.bz2
+e546a35e21d127b502a3c57550a189a0  at-spi-1.24.0.tar.bz2



From rdieter at fedoraproject.org  Mon Sep 22 14:51:50 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 14:51:50 +0000 (UTC)
Subject: rpms/qscintilla/devel .cvsignore, 1.6, 1.7 qscintilla.spec, 1.19,
	1.20 sources, 1.6, 1.7
Message-ID: <20080922145150.C1D32700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qscintilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7253

Modified Files:
	.cvsignore qscintilla.spec sources 
Log Message:
* Mon Sep 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.3-1
- Qscintilla-gpl-2.3
- scintilla_ver is missing (#461777)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 May 2008 12:59:14 -0000	1.6
+++ .cvsignore	22 Sep 2008 14:51:20 -0000	1.7
@@ -1 +1 @@
-QScintilla-gpl-2.2.tar.gz
+QScintilla-gpl-2.3.tar.gz


Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/devel/qscintilla.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- qscintilla.spec	18 Jul 2008 18:40:48 -0000	1.19
+++ qscintilla.spec	22 Sep 2008 14:51:20 -0000	1.20
@@ -1,18 +1,18 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-Name:           qscintilla
-Version:        2.2
-Release:        3%{?dist}
-Summary:        A Scintilla port to Qt
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} 
+%define scintilla_ver 1.76
 
+Name:    qscintilla
+Version: 2.3
+Release: 1%{?dist}
+Summary: A Scintilla port to Qt
 # matches up (pretty much) with qt4
-License:        GPLv3 or GPLv2 with exceptions
-Group:          Development/Tools
-Url:            http://www.riverbankcomputing.com/software/qscintilla/
-Source0:        http://www.riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-%{version}.tar.gz  
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+License: GPLv3 or GPLv2 with exceptions
+Group:   Development/Tools
+Url:     http://www.riverbankcomputing.com/software/qscintilla/
+Source0: http://www.riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-%{version}.tar.gz  
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#why is this not upstream?
+# TODO: upstream this
 Patch1:         QScintilla-2-gpl-Qt4-incpath.patch
 
 BuildRequires:  qt4-devel
@@ -24,40 +24,38 @@
 %description
 QScintilla is a port of Scintilla to the Qt GUI toolkit.
 
-This version of QScintilla is based on Scintilla v%{scintilla_ver}.
+%{?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
+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
-Requires:       %{name} = %{version}-%{release}
-Requires:       qt4-devel 
+Summary:  QScintilla Development Files
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: qt4-devel 
 %description devel
 %{summary}.
 
 %package python
-Summary:        QScintilla PyQt4 bindings
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       PyQt4
-#Obsoletes:      PyQt-qscintilla
+Summary:  QScintilla PyQt4 bindings
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: PyQt4
 %description python
 %{summary}.
 
 %package python-devel
-Summary:        Development files for QScintilla PyQt4 bindings 
-Group:          Development/Libraries
-Requires:       %{name}-python = %{version}-%{release}
-Requires:       PyQt4-devel
-#Obsoletes:      PyQt-qscintilla-devel 
+Summary:  Development files for QScintilla PyQt4 bindings 
+Group:    Development/Libraries
+Requires: %{name}-python = %{version}-%{release}
+Requires: PyQt4-devel
 %description python-devel
 %{summary}.
 
@@ -126,7 +124,7 @@
 %doc ChangeLog NEWS README
 %doc LICENSE.GPL3
 %doc LICENSE.GPL2 GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT
-%{_qt4_libdir}/lib*.so.*
+%{_qt4_libdir}/libqscintilla2.so.4*
 %{_qt4_translationdir}/*
 %{_qt4_prefix}/qsci/
 
@@ -138,7 +136,7 @@
 %defattr(-,root,root,-)
 %doc doc/html-Qt4 doc/Scintilla example-Qt4
 %{_qt4_headerdir}/Qsci/
-%{_qt4_libdir}/lib*.so
+%{_qt4_libdir}/libqscintilla2.so
 
 %files python
 %defattr(-,root,root,-)
@@ -150,6 +148,10 @@
 
 
 %changelog
+* Mon Sep 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.3-1
+- Qscintilla-gpl-2.3
+- scintilla_ver is missing (#461777)
+
 * Fri Jul 18 2008 Dennis Gilmore <dennis at ausil.us> - 2.2-3
 - rebuild for newer PyQT4
 - fix #449423 properly


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 May 2008 12:59:14 -0000	1.6
+++ sources	22 Sep 2008 14:51:20 -0000	1.7
@@ -1 +1 @@
-a6056c444494f3f849020d241f86c286  QScintilla-gpl-2.2.tar.gz
+473d7793592fe96406310a2ab34e9e9b  QScintilla-gpl-2.3.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 22 14:55:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:55:38 +0000
Subject: [pkgdb] dwdiff had group_acl changed
Message-ID: <20080922145538.34B29208D2B@bastion.fedora.phx.redhat.com>

jhrozek has set the commit acl on dwdiff (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dwdiff



From pkgdb at fedoraproject.org  Mon Sep 22 14:55:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:55:40 +0000
Subject: [pkgdb] dwdiff had group_acl changed
Message-ID: <20080922145540.A5A7B208DA5@bastion.fedora.phx.redhat.com>

jhrozek has set the commit acl on dwdiff (Fedora 5) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dwdiff



From jhrozek at fedoraproject.org  Mon Sep 22 14:55:39 2008
From: jhrozek at fedoraproject.org (Jakub Hrozek)
Date: Mon, 22 Sep 2008 14:55:39 +0000 (UTC)
Subject: rpms/dwdiff/devel dwdiff.spec,1.8,1.9
Message-ID: <20080922145539.2089A700FE@cvs1.fedora.phx.redhat.com>

Author: jhrozek

Update of /cvs/extras/rpms/dwdiff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8062

Modified Files:
	dwdiff.spec 
Log Message:
BZ #317310: Patch0/patch mismatch (Ville Skytta)


Index: dwdiff.spec
===================================================================
RCS file: /cvs/extras/rpms/dwdiff/devel/dwdiff.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dwdiff.spec	10 Jul 2008 20:36:35 -0000	1.8
+++ dwdiff.spec	22 Sep 2008 14:55:08 -0000	1.9
@@ -1,6 +1,6 @@
 Name:    dwdiff       
 Version: 1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Front end to diff for comparing files on a word per word basis
 
 Group:   Applications/Text       
@@ -25,7 +25,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b .localedir
+%patch0 -p1 -b .localedir
 
 %build
 #dwdiff uses its own custom configure script
@@ -56,6 +56,9 @@
 %lang(nl) %{_mandir}/nl/man1/dwdiff.1*
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.4-2
+- Fix Patch0:/%%patch mismatch.
+
 * Tue Jul 08 2008 Jakub Hrozek <jhrozek at redhat.com> 1.4-1
 - New upstream release, which BR: libicu-devel
 



From pkgdb at fedoraproject.org  Mon Sep 22 14:55:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:55:45 +0000
Subject: [pkgdb] dwdiff had group_acl changed
Message-ID: <20080922145545.B7293208DA8@bastion.fedora.phx.redhat.com>

jhrozek has set the commit acl on dwdiff (Fedora 6) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dwdiff



From pkgdb at fedoraproject.org  Mon Sep 22 14:55:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:55:54 +0000
Subject: [pkgdb] dwdiff had group_acl changed
Message-ID: <20080922145554.04B44208DAC@bastion.fedora.phx.redhat.com>

jhrozek has set the commit acl on dwdiff (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dwdiff



From pkgdb at fedoraproject.org  Mon Sep 22 14:55:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 14:55:51 +0000
Subject: [pkgdb] dwdiff had group_acl changed
Message-ID: <20080922145551.2ACEE208DA2@bastion.fedora.phx.redhat.com>

jhrozek has set the commit acl on dwdiff (Fedora 8) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dwdiff



From mclasen at fedoraproject.org  Mon Sep 22 14:57:33 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 14:57:33 +0000 (UTC)
Subject: rpms/libgnome/devel libgnome.spec,1.124,1.125
Message-ID: <20080922145733.D706B700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8454

Modified Files:
	libgnome.spec 
Log Message:
2.24.0



Index: libgnome.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- libgnome.spec	22 Aug 2008 16:59:49 -0000	1.124
+++ libgnome.spec	22 Sep 2008 14:57:03 -0000	1.125
@@ -13,10 +13,10 @@
 
 Summary: GNOME base library
 Name: libgnome
-Version: 2.23.5
+Version: 2.24.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/libgnome/2.23/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libgnome/2.24/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -195,6 +195,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.5-1
 - Update to 2.23.5
 



From mclasen at fedoraproject.org  Mon Sep 22 15:01:04 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 15:01:04 +0000 (UTC)
Subject: rpms/gcalctool/devel .cvsignore, 1.48, 1.49 gcalctool.spec, 1.73,
	1.74 sources, 1.49, 1.50
Message-ID: <20080922150104.D8158700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gcalctool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9074

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	7 Sep 2008 20:41:40 -0000	1.48
+++ .cvsignore	22 Sep 2008 15:00:34 -0000	1.49
@@ -1 +1 @@
-gcalctool-5.23.92.tar.bz2
+gcalctool-5.24.0.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- gcalctool.spec	7 Sep 2008 20:41:40 -0000	1.73
+++ gcalctool.spec	22 Sep 2008 15:00:34 -0000	1.74
@@ -1,12 +1,12 @@
 Name:           gcalctool
-Version:        5.23.92
+Version:        5.24.0
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://directory.fsf.org/gcalctool.html
-Source0:        http://download.gnome.org/sources/gcalctool/5.23/gcalctool-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/gcalctool/5.24/gcalctool-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: atk-devel >= 1.5
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 5.24.0-1
+- Update to 5.24.0
+
 * Sun Sep  7 2008 Matthias Clasen <mclasen at redhat.com> - 5.23.92-1
 - Update to 5.23.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	7 Sep 2008 20:41:40 -0000	1.49
+++ sources	22 Sep 2008 15:00:34 -0000	1.50
@@ -1 +1 @@
-06ef5f50a9c442b02dbacdf3a6ba901b  gcalctool-5.23.92.tar.bz2
+0664d6a90b69e080e2ef8ebccba16675  gcalctool-5.24.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 15:04:27 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 15:04:27 +0000 (UTC)
Subject: rpms/libgnome/devel .cvsignore, 1.45, 1.46 libgnome.spec, 1.125,
	1.126 sources, 1.45, 1.46
Message-ID: <20080922150427.A216A700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9706

Modified Files:
	.cvsignore libgnome.spec sources 
Log Message:
fix sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	22 Aug 2008 16:59:49 -0000	1.45
+++ .cvsignore	22 Sep 2008 15:03:57 -0000	1.46
@@ -1 +1 @@
-libgnome-2.23.5.tar.bz2
+libgnome-2.24.0.tar.bz2


Index: libgnome.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- libgnome.spec	22 Sep 2008 14:57:03 -0000	1.125
+++ libgnome.spec	22 Sep 2008 15:03:57 -0000	1.126
@@ -14,7 +14,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnome/2.24/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -195,7 +195,7 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-2
 - Update to 2.24.0
 
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.5-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	22 Aug 2008 16:59:49 -0000	1.45
+++ sources	22 Sep 2008 15:03:57 -0000	1.46
@@ -1 +1 @@
-1177df4652cfc72b48d3a07f856e90a3  libgnome-2.23.5.tar.bz2
+35a2b6f214ddd9b6732b3b361140115a  libgnome-2.24.0.tar.bz2



From rstrode at fedoraproject.org  Mon Sep 22 15:08:56 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 22 Sep 2008 15:08:56 +0000 (UTC)
Subject: rpms/gdm/devel gdm-2.23.92-save-root-window.patch, 1.2, 1.3 gdm.spec,
	1.418, 1.419
Message-ID: <20080922150856.F2700700FE@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10361

Modified Files:
	gdm-2.23.92-save-root-window.patch gdm.spec 
Log Message:
- Flush X event queue after setting _XROOTPMAP_ID so there's
  no race with settings daemon reading the property


gdm-2.23.92-save-root-window.patch:

Index: gdm-2.23.92-save-root-window.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.23.92-save-root-window.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdm-2.23.92-save-root-window.patch	16 Sep 2008 20:54:52 -0000	1.2
+++ gdm-2.23.92-save-root-window.patch	22 Sep 2008 15:08:56 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up gdm-2.23.92/daemon/gdm-simple-slave.c.save-root-window gdm-2.23.92/daemon/gdm-simple-slave.c
 --- gdm-2.23.92/daemon/gdm-simple-slave.c.save-root-window	2008-09-03 16:52:53.000000000 -0400
-+++ gdm-2.23.92/daemon/gdm-simple-slave.c	2008-09-16 15:29:15.000000000 -0400
++++ gdm-2.23.92/daemon/gdm-simple-slave.c	2008-09-19 18:18:50.000000000 -0400
 @@ -825,6 +825,15 @@ setup_server (GdmSimpleSlave *slave)
  {
          /* Set the busy cursor */
@@ -19,7 +19,7 @@
  static void
 diff -up gdm-2.23.92/daemon/gdm-slave.c.save-root-window gdm-2.23.92/daemon/gdm-slave.c
 --- gdm-2.23.92/daemon/gdm-slave.c.save-root-window	2008-08-26 15:04:00.000000000 -0400
-+++ gdm-2.23.92/daemon/gdm-slave.c	2008-09-16 15:39:18.000000000 -0400
++++ gdm-2.23.92/daemon/gdm-slave.c	2008-09-22 11:06:36.000000000 -0400
 @@ -42,6 +42,7 @@
  #include <dbus/dbus-glib-lowlevel.h>
  
@@ -28,7 +28,7 @@
  #include <X11/cursorfont.h> /* for watch cursor */
  
  #include "gdm-common.h"
-@@ -341,6 +342,75 @@ gdm_slave_run_script (GdmSlave   *slave,
+@@ -341,6 +342,77 @@ gdm_slave_run_script (GdmSlave   *slave,
          return ret;
  }
  
@@ -99,6 +99,8 @@
 +        for (i = 0; i < number_of_screens; i++) {
 +                gdm_slave_save_root_window_of_screen (slave, atom, i);
 +        }
++
++        XSync (slave->priv->server_display, False);
 +}
 +
  void
@@ -106,7 +108,7 @@
  {
 diff -up gdm-2.23.92/daemon/gdm-slave.h.save-root-window gdm-2.23.92/daemon/gdm-slave.h
 --- gdm-2.23.92/daemon/gdm-slave.h.save-root-window	2008-08-26 15:04:00.000000000 -0400
-+++ gdm-2.23.92/daemon/gdm-slave.h	2008-09-16 15:29:15.000000000 -0400
++++ gdm-2.23.92/daemon/gdm-slave.h	2008-09-19 18:18:50.000000000 -0400
 @@ -69,6 +69,7 @@ gboolean            gdm_slave_switch_to_
  
  gboolean            gdm_slave_connect_to_x11_display (GdmSlave   *slave);


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -r1.418 -r1.419
--- gdm.spec	19 Sep 2008 14:11:10 -0000	1.418
+++ gdm.spec	22 Sep 2008 15:08:56 -0000	1.419
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.23.92
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -322,6 +322,10 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Mon Sep 22 2008 Ray Strode <rstrode at redhat.com> - 1:2.23.92-10
+- Flush X event queue after setting _XROOTPMAP_ID so there's
+  no race with settings daemon reading the property
+
 * Fri Sep 19 2008 Ray Strode <rstrode at redhat.com> - 1:2.23.92-9
 - Fix crash from language dialog
 



From mclasen at fedoraproject.org  Mon Sep 22 15:12:57 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 15:12:57 +0000 (UTC)
Subject: rpms/libgnomeui/devel .cvsignore, 1.55, 1.56 libgnomeui.spec, 1.107,
	1.108 sources, 1.55, 1.56
Message-ID: <20080922151257.5AE4D700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnomeui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11116

Modified Files:
	.cvsignore libgnomeui.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnomeui/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	22 Aug 2008 23:08:35 -0000	1.55
+++ .cvsignore	22 Sep 2008 15:12:27 -0000	1.56
@@ -1 +1 @@
-libgnomeui-2.23.90.tar.bz2
+libgnomeui-2.24.0.tar.bz2


Index: libgnomeui.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- libgnomeui.spec	19 Sep 2008 18:36:01 -0000	1.107
+++ libgnomeui.spec	22 Sep 2008 15:12:27 -0000	1.108
@@ -17,13 +17,15 @@
 
 Summary: GNOME base GUI library
 Name: libgnomeui
-Version: 2.23.90
-Release: 2%{?dist}
+Version: 2.24.0
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/libgnomeui/2.23/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libgnomeui/2.24/%{name}-%{version}.tar.bz2
 Patch0: libgnomeui-2.23.4-disable-event-sounds.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=552930
 Patch1: config_prefix-leak.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=553276
+Patch2: mime-leak.patch
 
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -107,6 +109,7 @@
 %setup -q
 %patch0 -p1 -b .disable-sound-events
 %patch1 -p1 -b .config_prefix-leak
+%patch2 -p1 -b .mime-leak
 aclocal
 automake
 autoconf
@@ -150,6 +153,12 @@
 %{_datadir}/gtk-doc/html/libgnomeui
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
+* Sat Sep 20 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-3
+- Plug a memory leak
+
 * Fri Sep 19 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-2
 - Plug a memory leak
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnomeui/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	22 Aug 2008 23:08:35 -0000	1.55
+++ sources	22 Sep 2008 15:12:27 -0000	1.56
@@ -1 +1 @@
-310ede3d7fd6dbdb0f53bfa7af46f09a  libgnomeui-2.23.90.tar.bz2
+7d50e1fc4c1ee3c268b26e8dfe7e677b  libgnomeui-2.24.0.tar.bz2



From rhughes at fedoraproject.org  Mon Sep 22 15:14:15 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 22 Sep 2008 15:14:15 +0000 (UTC)
Subject: rpms/PackageKit/devel .cvsignore, 1.28, 1.29 PackageKit.spec, 1.56, 
	1.57 sources, 1.29, 1.30
Message-ID: <20080922151415.6BECD700FE@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11375

Modified Files:
	.cvsignore PackageKit.spec sources 
Log Message:
* Mon Sep 22 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	16 Sep 2008 16:18:12 -0000	1.28
+++ .cvsignore	22 Sep 2008 15:13:45 -0000	1.29
@@ -1 +1 @@
-PackageKit-0.3.3.tar.gz
+PackageKit-0.3.4.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- PackageKit.spec	17 Sep 2008 09:38:16 -0000	1.56
+++ PackageKit.spec	22 Sep 2008 15:13:45 -0000	1.57
@@ -7,8 +7,8 @@
 
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
-Version:   0.3.3
-Release:   3%{?dist}
+Version:   0.3.4
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -16,10 +16,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # upstream: 51b020dca500141a6e78ab549765f09a34ac75fc
-Patch0:    pk-upgrades-mistake.patch
-
-# upstream: 0f2fa1f265aa0e7922d5acf03e1266081345df58
-Patch1:    pk-preupgrade-typo.patch
+#Patch0:    pk-upgrades-mistake.patch
 
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
@@ -145,8 +142,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -277,6 +273,9 @@
 %{_includedir}/*
 
 %changelog
+* Mon Sep 22 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-1
+- New upstream version
+
 * Tue Sep 17 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.3-3
 - Fix a silly typo where we might upgrade the kernel when we check for
   distro upgrades.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	16 Sep 2008 16:18:12 -0000	1.29
+++ sources	22 Sep 2008 15:13:45 -0000	1.30
@@ -1 +1 @@
-2c91101359e0331325d2acde7b9130f4  PackageKit-0.3.3.tar.gz
+5b02713b8b1a18508f64d3db746d710f  PackageKit-0.3.4.tar.gz



From rhughes at fedoraproject.org  Mon Sep 22 15:14:17 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 22 Sep 2008 15:14:17 +0000 (UTC)
Subject: rpms/gnome-packagekit/devel .cvsignore, 1.27,
	1.28 gnome-packagekit.spec, 1.46, 1.47 sources, 1.27, 1.28
Message-ID: <20080922151417.A6FF8700FE@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11405

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Log Message:
* Mon Sep 22 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	16 Sep 2008 16:18:16 -0000	1.27
+++ .cvsignore	22 Sep 2008 15:13:47 -0000	1.28
@@ -1 +1 @@
-gnome-packagekit-0.3.3.tar.gz
+gnome-packagekit-0.3.4.tar.gz


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gnome-packagekit.spec	17 Sep 2008 09:02:35 -0000	1.46
+++ gnome-packagekit.spec	22 Sep 2008 15:13:47 -0000	1.47
@@ -1,10 +1,10 @@
 %define dbus_version            0.61
-%define packagekit_version      0.3.3
+%define packagekit_version      0.3.4
 
 Summary:   GNOME PackageKit Client
 Name:      gnome-packagekit
-Version:   0.3.3
-Release:   2%{?dist}
+Version:   0.3.4
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
@@ -15,7 +15,7 @@
 Patch0:    gnome-packagekit-enable-kde.patch
 
 # Upstream: 0f01d00cb0e03262766a2f60327adad91466a0b6
-Patch1:    pk-use-different-gpk-clients.patch
+# Patch1:    pk-use-different-gpk-clients.patch
 
 Requires:  gtk2 >= 2.12.0
 Requires:  gnome-icon-theme
@@ -63,7 +63,7 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 
 %build
 %configure --disable-scrollkeeper --disable-schemas-install
@@ -147,6 +147,9 @@
 %{_datadir}/applications/gpk-*.desktop
 
 %changelog
+* Mon Sep 22 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-1
+- New upstream version
+
 * Wed Sep 17 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.3-2
 - Fix the interaction when the update check and the upgrade check are
   scheduled at the same time.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	16 Sep 2008 16:18:16 -0000	1.27
+++ sources	22 Sep 2008 15:13:47 -0000	1.28
@@ -1 +1 @@
-df5fdad0beb6d7f681aeead8edc73295  gnome-packagekit-0.3.3.tar.gz
+0815795f1bfa275161edc722d7566002  gnome-packagekit-0.3.4.tar.gz



From mclasen at fedoraproject.org  Mon Sep 22 15:17:35 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 15:17:35 +0000 (UTC)
Subject: rpms/libgnomeui/devel mime-leak.patch, NONE, 1.1 libgnomeui.spec,
	1.108, 1.109
Message-ID: <20080922151735.2C47D7013D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnomeui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12315

Modified Files:
	libgnomeui.spec 
Added Files:
	mime-leak.patch 
Log Message:
add patch


mime-leak.patch:

--- NEW FILE mime-leak.patch ---
diff -up libgnomeui-2.23.90/libgnomeui/gnome-thumbnail.c.mime-leak libgnomeui-2.23.90/libgnomeui/gnome-thumbnail.c
--- libgnomeui-2.23.90/libgnomeui/gnome-thumbnail.c.mime-leak	2008-09-20 20:32:55.000000000 -0400
+++ libgnomeui-2.23.90/libgnomeui/gnome-thumbnail.c	2008-09-20 20:33:15.000000000 -0400
@@ -442,7 +442,7 @@ mimetype_supported_by_gdk_pixbuf (const 
 	if (!formats_hash) {
 		GSList *formats, *list;
 		
-		formats_hash = g_hash_table_new (g_str_hash, g_str_equal);
+		formats_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
 
 		formats = gdk_pixbuf_get_formats ();
 		list = formats;


Index: libgnomeui.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- libgnomeui.spec	22 Sep 2008 15:12:27 -0000	1.108
+++ libgnomeui.spec	22 Sep 2008 15:17:04 -0000	1.109
@@ -18,7 +18,7 @@
 Summary: GNOME base GUI library
 Name: libgnomeui
 Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnomeui/2.24/%{name}-%{version}.tar.bz2
 Patch0: libgnomeui-2.23.4-disable-event-sounds.patch
@@ -153,7 +153,7 @@
 %{_datadir}/gtk-doc/html/libgnomeui
 
 %changelog
-* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-2
 - Update to 2.24.0
 
 * Sat Sep 20 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-3



From jeckersb at fedoraproject.org  Mon Sep 22 15:20:54 2008
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Mon, 22 Sep 2008 15:20:54 +0000 (UTC)
Subject: rpms/python-netaddr/F-9 .cvsignore, 1.1, 1.2 python-netaddr.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080922152054.52410700FE@cvs1.fedora.phx.redhat.com>

Author: jeckersb

Update of /cvs/pkgs/rpms/python-netaddr/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13094

Modified Files:
	.cvsignore python-netaddr.spec sources 
Log Message:
Update to new upstream release 0.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Aug 2008 17:30:34 -0000	1.1
+++ .cvsignore	22 Sep 2008 15:20:23 -0000	1.2
@@ -0,0 +1 @@
+netaddr-0.5.tar.gz


Index: python-netaddr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/F-9/python-netaddr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-netaddr.spec	13 Aug 2008 19:49:54 -0000	1.1
+++ python-netaddr.spec	22 Sep 2008 15:20:24 -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-netaddr
-Version:        0.4
+Version:        0.5
 Release:        1%{?dist}
 Summary:        Network address manipulation, done Pythonically
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 John Eckersberg <jeckersb at redhat.com> - 0.5-1
+- New upstream version
+
 * Mon Aug 11 2008 John Eckersberg <jeckersb at redhat.com> - 0.4-1
 - Initial packaging for Fedora
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Aug 2008 19:49:54 -0000	1.2
+++ sources	22 Sep 2008 15:20:24 -0000	1.3
@@ -1 +1 @@
-9f6450c2b868964afea248fa2a2af0f4  netaddr-0.4.tar.gz
+d35e72f63ec2871e25ef50dec4b3705b  netaddr-0.5.tar.gz



From jkratoch at fedoraproject.org  Mon Sep 22 15:20:54 2008
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 22 Sep 2008 15:20:54 +0000 (UTC)
Subject: rpms/binutils/devel binutils.spec,1.140,1.141
Message-ID: <20080922152054.546BE7013E@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13067

Modified Files:
	binutils.spec 
Log Message:
* Mon Sep 22 2008 Jan Kratochvil <jan.kratochvil at redhat.com> 2.18.50.0.9-5
- Remove %makeinstall to comply with the spu-binutils review (BZ 452211).



Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- binutils.spec	22 Sep 2008 10:43:25 -0000	1.140
+++ binutils.spec	22 Sep 2008 15:20:23 -0000	1.141
@@ -17,7 +17,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.18.50.0.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -186,7 +186,7 @@
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+make install DESTDIR=%{buildroot}
 %if %{isnative}
 make prefix=%{buildroot}%{_prefix} infodir=%{buildroot}%{_infodir} install-info
 
@@ -347,6 +347,9 @@
 %endif # %{isnative}
 
 %changelog
+* Mon Sep 22 2008 Jan Kratochvil <jan.kratochvil at redhat.com> 2.18.50.0.9-5
+- Remove %%makeinstall to comply with the spu-binutils review (BZ 452211).
+
 * Mon Sep 22 2008 Jan Kratochvil <jan.kratochvil at redhat.com> 2.18.50.0.9-4
 - Fix *.so scripts for multilib linking (BZ 463101, suggested by Jakub Jelinek).
 



From mclasen at fedoraproject.org  Mon Sep 22 15:21:33 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 15:21:33 +0000 (UTC)
Subject: rpms/libbonobo/devel .cvsignore, 1.35, 1.36 libbonobo.spec, 1.81,
	1.82 sources, 1.35, 1.36
Message-ID: <20080922152133.ABCB1700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libbonobo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13200

Modified Files:
	.cvsignore libbonobo.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libbonobo/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	22 Aug 2008 23:40:21 -0000	1.35
+++ .cvsignore	22 Sep 2008 15:21:03 -0000	1.36
@@ -1 +1 @@
-libbonobo-2.23.1.tar.bz2
+libbonobo-2.24.0.tar.bz2


Index: libbonobo.spec
===================================================================
RCS file: /cvs/extras/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- libbonobo.spec	20 Sep 2008 07:10:53 -0000	1.81
+++ libbonobo.spec	22 Sep 2008 15:21:03 -0000	1.82
@@ -5,10 +5,10 @@
 
 Summary: Bonobo component system
 Name: libbonobo
-Version: 2.23.1
-Release: 2%{?dist}
+Version: 2.24.0
+Release: 1%{?dist}
 URL: http://ftp.gnome.org
-Source0: http://download.gnome.org/sources/libbonobo/2.23/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libbonobo/2.24/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
 # bonobo-activation-server, bonobo-activation-sysconf and bonobo-slay are GPL 
 # libbonobo and libbonobo-activation are LGPLv2+
@@ -124,6 +124,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Sat Sep 20 2008 Peter Robinson <probinson at gmail.com> - 2.23.1-2
 - Kill dependency on perl RHBZ #462901
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libbonobo/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	22 Aug 2008 23:40:21 -0000	1.35
+++ sources	22 Sep 2008 15:21:03 -0000	1.36
@@ -1 +1 @@
-9031ec557888d63bac1cc206177c877f  libbonobo-2.23.1.tar.bz2
+b9dd7fcd377945b227db393ac4fa3c37  libbonobo-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 15:27:27 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 15:27:27 +0000 (UTC)
Subject: rpms/libbonoboui/devel .cvsignore, 1.36, 1.37 libbonoboui.spec, 1.64,
	1.65 sources, 1.37, 1.38
Message-ID: <20080922152727.9475F700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libbonoboui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14036

Modified Files:
	.cvsignore libbonoboui.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libbonoboui/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	5 Aug 2008 17:45:47 -0000	1.36
+++ .cvsignore	22 Sep 2008 15:26:57 -0000	1.37
@@ -1 +1 @@
-libbonoboui-2.23.5.tar.bz2
+libbonoboui-2.24.0.tar.bz2


Index: libbonoboui.spec
===================================================================
RCS file: /cvs/extras/rpms/libbonoboui/devel/libbonoboui.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- libbonoboui.spec	5 Aug 2008 17:45:47 -0000	1.64
+++ libbonoboui.spec	22 Sep 2008 15:26:57 -0000	1.65
@@ -13,10 +13,10 @@
 
 Summary: Bonobo user interface components
 Name: libbonoboui
-Version: 2.23.5
+Version: 2.24.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/libbonoboui/2.23/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libbonoboui/2.24/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
 # bonobo-browser is GPL, libbonoboui is LGPL
 Group: System Environment/Libraries
@@ -119,6 +119,9 @@
 %{_datadir}/gtk-doc/html/libbonoboui
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Tue Aug  5 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.5-1
 - Update to 2.23.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libbonoboui/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	5 Aug 2008 17:45:47 -0000	1.37
+++ sources	22 Sep 2008 15:26:57 -0000	1.38
@@ -1 +1 @@
-8c04cb1228b54c41278a5fa51fc36608  libbonoboui-2.23.5.tar.bz2
+2076638f9aa9565c12b2bc264ecc4f18  libbonoboui-2.24.0.tar.bz2



From pkgdb at fedoraproject.org  Mon Sep 22 15:46:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 15:46:54 +0000
Subject: [pkgdb] perl-prefork (Fedora EPEL, 5) updated by kevin
Message-ID: <20080922154654.2DC9D208DA3@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-prefork
kevin has set commit to Approved for uberpackager on perl-prefork (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on perl-prefork (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on perl-prefork (Fedora EPEL 5)
kevin changed owner of perl-prefork in Fedora EPEL 5 to iburrell

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-prefork



From mclasen at fedoraproject.org  Mon Sep 22 15:47:43 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 15:47:43 +0000 (UTC)
Subject: rpms/gtk2/devel gtk2.spec,1.322,1.323
Message-ID: <20080922154743.1D95F700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17919

Modified Files:
	gtk2.spec 
Log Message:
BR libXdamage-devel



Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -r1.322 -r1.323
--- gtk2.spec	18 Sep 2008 05:02:59 -0000	1.322
+++ gtk2.spec	22 Sep 2008 15:47:12 -0000	1.323
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
@@ -30,6 +30,8 @@
 # a workaround for some brokenness in the flash plugin
 # see http://bugzilla.gnome.org/show_bug.cgi?id=463773
 Patch2: workaround.patch
+Patch3: info-leak.patch
+Patch4: gail-leaks.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -50,6 +52,7 @@
 BuildRequires: libXfixes-devel
 BuildRequires: libXinerama-devel
 BuildRequires: libXcomposite-devel
+BuildRequires: libXdamage-devel
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -115,6 +118,8 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
+%patch3 -p1 -b .info-leak
+%patch4 -p1 -b .gail-leaks
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -298,6 +303,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.2-2
+- BR libXdamage-devel (#462971, Owen Taylor)
+
 * Thu Sep 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
 - Update to 2.14.2
 



From pkgdb at fedoraproject.org  Mon Sep 22 15:48:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 15:48:37 +0000
Subject: [pkgdb] perl-Test-MinimumVersion (Fedora EPEL, 5) updated by kevin
Message-ID: <20080922154837.F1B99208DA3@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-Test-MinimumVersion
kevin has set commit to Approved for uberpackager on perl-Test-MinimumVersion (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on perl-Test-MinimumVersion (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on perl-Test-MinimumVersion (Fedora EPEL 5)
kevin changed owner of perl-Test-MinimumVersion in Fedora EPEL 5 to iburrell

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-MinimumVersion



From pkgdb at fedoraproject.org  Mon Sep 22 15:49:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 15:49:46 +0000
Subject: [pkgdb] highlight (Fedora EPEL, 5) updated by kevin
Message-ID: <20080922154946.76F80208DA3@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for highlight
kevin has set commit to Approved for uberpackager on highlight (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on highlight (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on highlight (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/highlight



From pkgdb at fedoraproject.org  Mon Sep 22 15:49:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 15:49:46 +0000
Subject: [pkgdb] highlight (Fedora EPEL, 4) updated by kevin
Message-ID: <20080922154946.8E075208E8F@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for highlight
kevin has set commit to Approved for uberpackager on highlight (Fedora EPEL 4)
kevin has set build to Approved for uberpackager on highlight (Fedora EPEL 4)
kevin has set checkout to Approved for uberpackager on highlight (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/highlight



From mclasen at fedoraproject.org  Mon Sep 22 15:50:38 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 15:50:38 +0000 (UTC)
Subject: rpms/gtk2/devel gail-leaks.patch, NONE, 1.1 info-leak.patch, NONE, 
	1.1 gtk2.spec, 1.323, 1.324
Message-ID: <20080922155038.D1942700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18712

Modified Files:
	gtk2.spec 
Added Files:
	gail-leaks.patch info-leak.patch 
Log Message:
add patches


gail-leaks.patch:

--- NEW FILE gail-leaks.patch ---
diff -up gtk+-2.14.2/modules/other/gail/gailcell.c.gail-leaks gtk+-2.14.2/modules/other/gail/gailcell.c
--- gtk+-2.14.2/modules/other/gail/gailcell.c.gail-leaks	2008-09-19 00:55:50.000000000 -0400
+++ gtk+-2.14.2/modules/other/gail/gailcell.c	2008-09-19 00:56:24.000000000 -0400
@@ -118,6 +118,7 @@ gail_cell_destroyed (GtkWidget       *wi
    * GtkWidget. We set the  pointer location to NULL;
    */
   cell->widget = NULL;
+  g_signal_handlers_disconnect_by_func (widget, gail_cell_destroyed, cell);
 }
 
 static void
diff -up gtk+-2.14.2/modules/other/gail/gailtreeview.c.gail-leaks gtk+-2.14.2/modules/other/gail/gailtreeview.c
--- gtk+-2.14.2/modules/other/gail/gailtreeview.c.gail-leaks	2008-09-19 00:55:02.000000000 -0400
+++ gtk+-2.14.2/modules/other/gail/gailtreeview.c	2008-09-19 00:55:39.000000000 -0400
@@ -3667,12 +3667,12 @@ static gboolean
 garbage_collect_cell_data (gpointer data)
 {
       GailTreeView *tree_view;
-      GList *temp_list;
+      GList *temp_list, *list;
       GailTreeViewCellInfo *cell_info;
 
       g_assert (GAIL_IS_TREE_VIEW (data));
       tree_view = (GailTreeView *)data;
-      temp_list = g_list_copy (tree_view->cell_data);
+      list = g_list_copy (tree_view->cell_data);
 
       tree_view->garbage_collection_pending = FALSE;
       if (tree_view->idle_garbage_collect_id != 0) 
@@ -3682,6 +3682,7 @@ garbage_collect_cell_data (gpointer data
       }
 
       /* Must loop through them all */
+      temp_list = list;
       while (temp_list != NULL)
       {
           cell_info = temp_list->data;
@@ -3696,7 +3697,7 @@ garbage_collect_cell_data (gpointer data
 	  }
           temp_list = temp_list->next;
       }
-      g_list_free (temp_list);
+      g_list_free (list);
 
       return tree_view->garbage_collection_pending;
 }

info-leak.patch:

--- NEW FILE info-leak.patch ---
diff -up gtk+-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c.info-leak gtk+-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c
--- gtk+-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c.info-leak	2008-09-18 14:34:02.000000000 -0400
+++ gtk+-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c	2008-09-18 14:34:46.000000000 -0400
@@ -688,9 +688,10 @@ gdk_pixbuf_load_module_unlocked (GdkPixb
         if (fill_vtable) {
 		image_module->module = (void *) 1;
                 (* fill_vtable) (image_module);
-		image_module->info = g_new0 (GdkPixbufFormat, 1);
-		(* fill_info) (image_module->info);
-
+		if (image_module->info == NULL) {
+			image_module->info = g_new0 (GdkPixbufFormat, 1);
+			(* fill_info) (image_module->info);
+		}
                 return TRUE;
 	}
 	else 


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- gtk2.spec	22 Sep 2008 15:47:12 -0000	1.323
+++ gtk2.spec	22 Sep 2008 15:50:08 -0000	1.324
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
@@ -30,7 +30,9 @@
 # a workaround for some brokenness in the flash plugin
 # see http://bugzilla.gnome.org/show_bug.cgi?id=463773
 Patch2: workaround.patch
+# fixed upstream
 Patch3: info-leak.patch
+# fixed upstream
 Patch4: gail-leaks.patch
 
 BuildRequires: atk-devel >= %{atk_version}
@@ -303,8 +305,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
-* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.2-2
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.2-3
 - BR libXdamage-devel (#462971, Owen Taylor)
+- Plug some memory leaks
 
 * Thu Sep 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
 - Update to 2.14.2



From pkgdb at fedoraproject.org  Mon Sep 22 15:53:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 15:53:19 +0000
Subject: [pkgdb] perl-Test-MockTime (Fedora, 8) updated by kevin
Message-ID: <20080922155320.00798208E8F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for perl-Test-MockTime
kevin has set commit to Approved for uberpackager on perl-Test-MockTime (Fedora 8)
kevin has set build to Approved for uberpackager on perl-Test-MockTime (Fedora 8)
kevin has set checkout to Approved for uberpackager on perl-Test-MockTime (Fedora 8)
kevin approved watchbugzilla on perl-Test-MockTime (Fedora 8) for perl-sig
kevin approved watchcommits on perl-Test-MockTime (Fedora 8) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-MockTime



From pkgdb at fedoraproject.org  Mon Sep 22 15:53:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 15:53:18 +0000
Subject: [pkgdb] perl-Test-MockTime was added for corsepiu
Message-ID: <20080922155318.538F4208DA3@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Test-MockTime with summary Replaces actual time with simulated time
kevin has approved Package perl-Test-MockTime
kevin has added a Fedora devel branch for perl-Test-MockTime with an owner of corsepiu
kevin has approved perl-Test-MockTime in Fedora devel
kevin has approved Package perl-Test-MockTime
kevin has set commit to Approved for packager on perl-Test-MockTime (Fedora devel)
kevin has set build to Approved for packager on perl-Test-MockTime (Fedora devel)
kevin has set checkout to Approved for packager on perl-Test-MockTime (Fedora devel)
kevin has set commit to Approved for uberpackager on perl-Test-MockTime (Fedora devel)
kevin has set build to Approved for uberpackager on perl-Test-MockTime (Fedora devel)
kevin has set checkout to Approved for uberpackager on perl-Test-MockTime (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-MockTime



From pkgdb at fedoraproject.org  Mon Sep 22 15:53:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 15:53:19 +0000
Subject: [pkgdb] perl-Test-MockTime (Fedora, 9) updated by kevin
Message-ID: <20080922155320.09DEE208E92@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Test-MockTime
kevin has set commit to Approved for uberpackager on perl-Test-MockTime (Fedora 9)
kevin has set build to Approved for uberpackager on perl-Test-MockTime (Fedora 9)
kevin has set checkout to Approved for uberpackager on perl-Test-MockTime (Fedora 9)
kevin approved watchbugzilla on perl-Test-MockTime (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Test-MockTime (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-MockTime



From pkgdb at fedoraproject.org  Mon Sep 22 15:53:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 15:53:19 +0000
Subject: [pkgdb] perl-Test-MockTime (Fedora, devel) updated by kevin
Message-ID: <20080922155320.27446208E96@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Test-MockTime (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Test-MockTime (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-MockTime



From kevin at fedoraproject.org  Mon Sep 22 15:53:39 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 22 Sep 2008 15:53:39 +0000 (UTC)
Subject: rpms/perl-Test-MockTime - New directory
Message-ID: <20080922155339.2C30D700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Test-MockTime
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc19636/rpms/perl-Test-MockTime

Log Message:
Directory /cvs/extras/rpms/perl-Test-MockTime added to the repository




From kevin at fedoraproject.org  Mon Sep 22 15:53:39 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 22 Sep 2008 15:53:39 +0000 (UTC)
Subject: rpms/perl-Test-MockTime/devel - New directory
Message-ID: <20080922155339.6E481700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Test-MockTime/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc19636/rpms/perl-Test-MockTime/devel

Log Message:
Directory /cvs/extras/rpms/perl-Test-MockTime/devel added to the repository




From kevin at fedoraproject.org  Mon Sep 22 15:53:40 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 22 Sep 2008 15:53:40 +0000 (UTC)
Subject: rpms/perl-Test-MockTime/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20080922155340.9A026700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Test-MockTime/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc19636/rpms/perl-Test-MockTime/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-MockTime


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Test-MockTime
# $Id: Makefile,v 1.1 2008/09/22 15:53:40 kevin Exp $
NAME := perl-Test-MockTime
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Sep 22 15:53:40 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 22 Sep 2008 15:53:40 +0000 (UTC)
Subject: rpms/perl-Test-MockTime Makefile,NONE,1.1
Message-ID: <20080922155340.601D5700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Test-MockTime
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc19636/rpms/perl-Test-MockTime

Added Files:
	Makefile 
Log Message:
Setup of module perl-Test-MockTime


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-MockTime
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From rstrode at fedoraproject.org  Mon Sep 22 15:53:33 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 22 Sep 2008 15:53:33 +0000 (UTC)
Subject: rpms/gnome-desktop/devel gnome-desktop-2.23.92-fade.patch, 1.2,
	1.3 gnome-desktop.spec, 1.167, 1.168
Message-ID: <20080922155333.9D624700FE@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19380

Modified Files:
	gnome-desktop-2.23.92-fade.patch gnome-desktop.spec 
Log Message:
* Mon Sep 22 2008 Ray Strode <rstrode at redhat.com> - 2.23.92-4
- Add some flush calls to make transition smoother


gnome-desktop-2.23.92-fade.patch:

Index: gnome-desktop-2.23.92-fade.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop-2.23.92-fade.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-desktop-2.23.92-fade.patch	19 Sep 2008 04:19:45 -0000	1.2
+++ gnome-desktop-2.23.92-fade.patch	22 Sep 2008 15:53:03 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up gnome-desktop-2.23.92/libgnome-desktop/gnome-bg.c.fade gnome-desktop-2.23.92/libgnome-desktop/gnome-bg.c
 --- gnome-desktop-2.23.92/libgnome-desktop/gnome-bg.c.fade	2008-09-08 15:43:13.000000000 -0400
-+++ gnome-desktop-2.23.92/libgnome-desktop/gnome-bg.c	2008-09-18 22:34:56.000000000 -0400
++++ gnome-desktop-2.23.92/libgnome-desktop/gnome-bg.c	2008-09-22 11:13:54.000000000 -0400
 @@ -37,11 +37,15 @@ Author: Soren Sandmann <sandmann at redhat.
  #include <X11/Xlib.h>
  #include <X11/Xatom.h>
@@ -197,10 +197,10 @@
  }
  
  
-diff -up /dev/null gnome-desktop-2.23.92/libgnome-desktop/gnome-bg-crossfade.c
---- /dev/null	2008-09-18 15:36:53.295258620 -0400
-+++ gnome-desktop-2.23.92/libgnome-desktop/gnome-bg-crossfade.c	2008-09-18 22:34:56.000000000 -0400
-@@ -0,0 +1,429 @@
+diff -up gnome-desktop-2.23.92/libgnome-desktop/gnome-bg-crossfade.c.fade gnome-desktop-2.23.92/libgnome-desktop/gnome-bg-crossfade.c
+--- gnome-desktop-2.23.92/libgnome-desktop/gnome-bg-crossfade.c.fade	2008-09-18 22:40:12.000000000 -0400
++++ gnome-desktop-2.23.92/libgnome-desktop/gnome-bg-crossfade.c	2008-09-22 11:48:46.000000000 -0400
+@@ -0,0 +1,432 @@
 +/* gnome-bg-crossfade.h - fade window background between two pixmaps
 + *
 + * Copyright (C) 2008 Red Hat, Inc.
@@ -503,7 +503,7 @@
 +
 +	settings = gtk_settings_get_for_screen (screen);
 +
-+	g_object_get (settings, "gtk-enable-animations", &are_enabled, NULL);
++	g_object_get (settings, "gtk-enable-animatins", &are_enabled, NULL);
 +
 +	return !are_enabled;
 +}
@@ -513,6 +513,7 @@
 +{
 +	gdouble now, percent_done;
 +	cairo_t *cr;
++	cairo_status_t status;
 +
 +	g_return_val_if_fail (GNOME_IS_BG_CROSSFADE (fade), FALSE);
 +
@@ -544,19 +545,21 @@
 +	gdk_cairo_set_source_pixmap (cr, fade->priv->end_pixmap,
 +				     0.0, 0.0);
 +	cairo_paint_with_alpha (cr, percent_done);
++	status = cairo_status (cr);
++	cairo_destroy (cr);
 +
-+	if (cairo_status (cr) == CAIRO_STATUS_SUCCESS) {
++	if (status == CAIRO_STATUS_SUCCESS) {
 +		if (GDK_WINDOW_TYPE (fade->priv->window) == GDK_WINDOW_FOREIGN ||
 +		    GDK_WINDOW_TYPE (fade->priv->window) == GDK_WINDOW_ROOT) {
 +			GdkDisplay *display;
 +
 +			display = gdk_drawable_get_display (fade->priv->window);
 +			gdk_window_clear (fade->priv->window);
++			gdk_display_flush (display);
 +		} else {
 +        		gdk_window_invalidate_rect (fade->priv->window, NULL, FALSE);
 +		}
 +        }
-+	cairo_destroy (cr);
 +
 +	return percent_done <= .99;
 +}
@@ -630,9 +633,9 @@
 +		g_source_remove (fade->priv->timeout_id);
 +	}
 +}
-diff -up /dev/null gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/gnome-bg-crossfade.h
---- /dev/null	2008-09-18 15:36:53.295258620 -0400
-+++ gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/gnome-bg-crossfade.h	2008-09-18 22:34:56.000000000 -0400
+diff -up gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/gnome-bg-crossfade.h.fade gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/gnome-bg-crossfade.h
+--- gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/gnome-bg-crossfade.h.fade	2008-09-18 22:40:12.000000000 -0400
++++ gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/gnome-bg-crossfade.h	2008-09-18 22:40:12.000000000 -0400
 @@ -0,0 +1,79 @@
 +/* gnome-bg-crossfade.h - fade window background between two pixmaps
 +
@@ -714,8 +717,8 @@
 +
 +#endif
 diff -up gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/gnome-bg.h.fade gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/gnome-bg.h
---- gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/gnome-bg.h.fade	2008-09-18 22:38:29.000000000 -0400
-+++ gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/gnome-bg.h	2008-09-18 22:39:31.000000000 -0400
+--- gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/gnome-bg.h.fade	2008-09-08 15:43:13.000000000 -0400
++++ gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/gnome-bg.h	2008-09-18 22:40:12.000000000 -0400
 @@ -33,6 +33,8 @@
  #include <gdk/gdk.h>
  #include <gconf/gconf-client.h>
@@ -737,7 +740,7 @@
  
 diff -up gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/Makefile.am.fade gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/Makefile.am
 --- gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/Makefile.am.fade	2008-09-08 15:43:13.000000000 -0400
-+++ gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/Makefile.am	2008-09-18 22:34:56.000000000 -0400
++++ gnome-desktop-2.23.92/libgnome-desktop/libgnomeui/Makefile.am	2008-09-18 22:40:12.000000000 -0400
 @@ -3,6 +3,7 @@ libgnomeui_desktop_HEADERS =	\
  	gnome-ditem-edit.h	\
  	gnome-hint.h		\
@@ -748,7 +751,7 @@
  	gnome-rr-labeler.h
 diff -up gnome-desktop-2.23.92/libgnome-desktop/Makefile.am.fade gnome-desktop-2.23.92/libgnome-desktop/Makefile.am
 --- gnome-desktop-2.23.92/libgnome-desktop/Makefile.am.fade	2008-09-08 15:43:13.000000000 -0400
-+++ gnome-desktop-2.23.92/libgnome-desktop/Makefile.am	2008-09-18 22:34:56.000000000 -0400
++++ gnome-desktop-2.23.92/libgnome-desktop/Makefile.am	2008-09-18 22:40:12.000000000 -0400
 @@ -21,6 +21,7 @@ libgnome_desktop_2_la_SOURCES = \
  	gnome-ditem-edit.c	\
  	gnome-hint.c		\


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- gnome-desktop.spec	19 Sep 2008 13:23:06 -0000	1.167
+++ gnome-desktop.spec	22 Sep 2008 15:53:03 -0000	1.168
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.23.92
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.23/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -126,6 +126,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Mon Sep 22 2008 Ray Strode <rstrode at redhat.com> - 2.23.92-4
+- Add some flush calls to make transition smoother
+
 * Thu Sep 18 2008 Ray Strode <rstrode at redhat.com> - 2.23.92-3
 - s/animatins/animations/
 



From pkgdb at fedoraproject.org  Mon Sep 22 15:54:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 15:54:34 +0000
Subject: [pkgdb] perl-Test-HTTP-Server-Simple was added for corsepiu
Message-ID: <20080922155435.3A47D208DA7@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Test-HTTP-Server-Simple with summary Test::More functions for HTTP::Server::Simple
kevin has approved Package perl-Test-HTTP-Server-Simple
kevin has added a Fedora devel branch for perl-Test-HTTP-Server-Simple with an owner of corsepiu
kevin has approved perl-Test-HTTP-Server-Simple in Fedora devel
kevin has approved Package perl-Test-HTTP-Server-Simple
kevin has set commit to Approved for packager on perl-Test-HTTP-Server-Simple (Fedora devel)
kevin has set build to Approved for packager on perl-Test-HTTP-Server-Simple (Fedora devel)
kevin has set checkout to Approved for packager on perl-Test-HTTP-Server-Simple (Fedora devel)
kevin has set commit to Approved for uberpackager on perl-Test-HTTP-Server-Simple (Fedora devel)
kevin has set build to Approved for uberpackager on perl-Test-HTTP-Server-Simple (Fedora devel)
kevin has set checkout to Approved for uberpackager on perl-Test-HTTP-Server-Simple (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Mon Sep 22 15:54:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 15:54:36 +0000
Subject: [pkgdb] perl-Test-HTTP-Server-Simple (Fedora, 8) updated by kevin
Message-ID: <20080922155436.69CD6208E8F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for perl-Test-HTTP-Server-Simple
kevin has set commit to Approved for uberpackager on perl-Test-HTTP-Server-Simple (Fedora 8)
kevin has set build to Approved for uberpackager on perl-Test-HTTP-Server-Simple (Fedora 8)
kevin has set checkout to Approved for uberpackager on perl-Test-HTTP-Server-Simple (Fedora 8)
kevin approved watchbugzilla on perl-Test-HTTP-Server-Simple (Fedora 8) for perl-sig
kevin approved watchcommits on perl-Test-HTTP-Server-Simple (Fedora 8) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Mon Sep 22 15:54:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 15:54:36 +0000
Subject: [pkgdb] perl-Test-HTTP-Server-Simple (Fedora, 9) updated by kevin
Message-ID: <20080922155436.74C2A208E92@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Test-HTTP-Server-Simple
kevin has set commit to Approved for uberpackager on perl-Test-HTTP-Server-Simple (Fedora 9)
kevin has set build to Approved for uberpackager on perl-Test-HTTP-Server-Simple (Fedora 9)
kevin has set checkout to Approved for uberpackager on perl-Test-HTTP-Server-Simple (Fedora 9)
kevin approved watchbugzilla on perl-Test-HTTP-Server-Simple (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Test-HTTP-Server-Simple (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Mon Sep 22 15:54:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 15:54:36 +0000
Subject: [pkgdb] perl-Test-HTTP-Server-Simple (Fedora,
	devel) updated by kevin
Message-ID: <20080922155436.8374A208E95@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Test-HTTP-Server-Simple (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Test-HTTP-Server-Simple (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-HTTP-Server-Simple



From kevin at fedoraproject.org  Mon Sep 22 15:54:59 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 22 Sep 2008 15:54:59 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple - New directory
Message-ID: <20080922155459.291AB700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Test-HTTP-Server-Simple
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL20037/rpms/perl-Test-HTTP-Server-Simple

Log Message:
Directory /cvs/extras/rpms/perl-Test-HTTP-Server-Simple added to the repository




From kevin at fedoraproject.org  Mon Sep 22 15:54:59 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 22 Sep 2008 15:54:59 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple/devel - New directory
Message-ID: <20080922155459.62159700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Test-HTTP-Server-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL20037/rpms/perl-Test-HTTP-Server-Simple/devel

Log Message:
Directory /cvs/extras/rpms/perl-Test-HTTP-Server-Simple/devel added to the repository




From kevin at fedoraproject.org  Mon Sep 22 15:55:00 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 22 Sep 2008 15:55:00 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple Makefile,NONE,1.1
Message-ID: <20080922155500.4DEDD700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Test-HTTP-Server-Simple
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL20037/rpms/perl-Test-HTTP-Server-Simple

Added Files:
	Makefile 
Log Message:
Setup of module perl-Test-HTTP-Server-Simple


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-HTTP-Server-Simple
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Sep 22 15:55:00 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 22 Sep 2008 15:55:00 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080922155500.8B13A700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Test-HTTP-Server-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL20037/rpms/perl-Test-HTTP-Server-Simple/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-HTTP-Server-Simple


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Test-HTTP-Server-Simple
# $Id: Makefile,v 1.1 2008/09/22 15:55:00 kevin Exp $
NAME := perl-Test-HTTP-Server-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  Mon Sep 22 15:55:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 15:55:30 +0000
Subject: [pkgdb] libkipi (Fedora EPEL, 5) updated by kevin
Message-ID: <20080922155530.35EB3208DA3@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for libkipi
kevin has set commit to Approved for uberpackager on libkipi (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on libkipi (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on libkipi (Fedora EPEL 5)
kevin changed owner of libkipi in Fedora EPEL 5 to rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libkipi



From mclasen at fedoraproject.org  Mon Sep 22 15:57:02 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 15:57:02 +0000 (UTC)
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.184,1.185
Message-ID: <20080922155702.BE50B700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-vfs2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20199

Modified Files:
	gnome-vfs2.spec 
Log Message:
fix spec



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- gnome-vfs2.spec	22 Sep 2008 15:44:23 -0000	1.184
+++ gnome-vfs2.spec	22 Sep 2008 15:56:32 -0000	1.185
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+ 
@@ -68,9 +68,6 @@
 # RH bug #197868
 Patch6: gnome-vfs-2.15.91-mailto-command.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=356772
-Patch8: gnome-vfs-2.16.0-no-dbus.patch
-
 # https://bugzilla.redhat.com/show_bug.cgi?id=333041
 # https://bugzilla.redhat.com/show_bug.cgi?id=335241
 Patch300: gnome-vfs-2.20.0-ignore-certain-mountpoints.patch
@@ -122,8 +119,6 @@
 
 %patch104 -p1 -b .browser_default
 
-%patch8 -p1 -b .no-dbus
-
 %patch300 -p1 -b .ignore-certain-mount-points
 
 # for patch 10
@@ -231,8 +226,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
-* Mon Sep 22 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-1
+* Mon Sep 22 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-2
 - Update to 2.24.0
+- Drop upstreamed patches
 
 * Thu Sep 11 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.0-1
 - Rebuild against new bluez-libs



From mclasen at fedoraproject.org  Mon Sep 22 16:00:22 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 16:00:22 +0000 (UTC)
Subject: rpms/bug-buddy/devel .cvsignore, 1.43, 1.44 bug-buddy.spec, 1.104, 
	1.105 sources, 1.43, 1.44
Message-ID: <20080922160022.8185A700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/bug-buddy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21077

Modified Files:
	.cvsignore bug-buddy.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	3 Sep 2008 02:43:36 -0000	1.43
+++ .cvsignore	22 Sep 2008 15:59:52 -0000	1.44
@@ -1 +1 @@
-bug-buddy-2.23.91.1.tar.bz2
+bug-buddy-2.24.0.tar.bz2


Index: bug-buddy.spec
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- bug-buddy.spec	3 Sep 2008 02:43:36 -0000	1.104
+++ bug-buddy.spec	22 Sep 2008 15:59:52 -0000	1.105
@@ -5,14 +5,14 @@
 %define gconf_version 2.14
 
 Name: bug-buddy
-Version: 2.23.91.1
+Version: 2.24.0
 Release: 1%{?dist}
 Epoch: 1
 Summary: A bug reporting utility for GNOME
 License: GPLv2 and BSD
 Group: Applications/System
 URL: http://www.gnome.org
-Source: http://download.gnome.org/sources/bug-buddy/2.23/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/bug-buddy/2.24/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -140,6 +140,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-1
+- Update to 2.24.0
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.91.1-1
 - Update to 2.23.91.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	3 Sep 2008 02:43:36 -0000	1.43
+++ sources	22 Sep 2008 15:59:52 -0000	1.44
@@ -1 +1 @@
-17f77de7ba92eb467fa1b827ec64e9fa  bug-buddy-2.23.91.1.tar.bz2
+d0fa514747137ce56dc123392d066630  bug-buddy-2.24.0.tar.bz2



From spot at fedoraproject.org  Mon Sep 22 15:30:09 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 22 Sep 2008 15:30:09 +0000 (UTC)
Subject: rpms/google-perftools/F-9 google-perftools.spec, 1.14, 1.15 sources,
	1.7, 1.8
Message-ID: <20080922153009.E6153700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/google-perftools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14954/F-9

Modified Files:
	google-perftools.spec sources 
Log Message:
update to 0.99.1


Index: google-perftools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-perftools/F-9/google-perftools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- google-perftools.spec	25 Aug 2008 16:59:33 -0000	1.14
+++ google-perftools.spec	22 Sep 2008 15:29:39 -0000	1.15
@@ -1,17 +1,11 @@
 Name:		google-perftools
-Version:	0.98
+Version:	0.99.1
 Release:	1%{?dist}
 License:	BSD
 Group:		Development/Tools
 Summary:	Very fast malloc and performance analysis tools
 URL:		http://code.google.com/p/google-perftools/
 Source0:	http://google-perftools.googlecode.com/files/google-perftools-%{version}.tar.gz
-# Sent upstream
-# http://code.google.com/p/google-perftools/issues/detail?id=74
-Patch0:		google-perftools-0.98-dirent.patch
-# Sent upstream
-# http://code.google.com/p/google-perftools/issues/detail?id=75
-Patch1:		google-perftools-0.98-glibc-headers.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Still broken, bz 238390
 ExcludeArch:	ppc64
@@ -35,8 +29,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1 -b .glibc-headers
 
 %build
 %configure --disable-static
@@ -79,6 +71,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Sep 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.99.1-1
+- update to 0.99.1
+- previous patches in 0.98-1 were taken upstream
+
 * Mon Aug 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.98-1
 - update to 0.98
 - fix linuxthreads.c compile (upstream issue 74)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/google-perftools/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	25 Aug 2008 16:59:33 -0000	1.7
+++ sources	22 Sep 2008 15:29:39 -0000	1.8
@@ -1 +1 @@
-be6d283bb6177f1febaefd3570f3366d  google-perftools-0.98.tar.gz
+bc2c539e5d5ffaa27d638c35bb4f0125  google-perftools-0.99.1.tar.gz



From mclasen at fedoraproject.org  Mon Sep 22 15:43:39 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 15:43:39 +0000 (UTC)
Subject: rpms/gnome-terminal/devel .cvsignore, 1.52, 1.53 gnome-terminal.spec,
	1.104, 1.105 sources, 1.53, 1.54
Message-ID: <20080922154339.B8B27700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17194

Modified Files:
	.cvsignore gnome-terminal.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-terminal/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	2 Sep 2008 23:20:04 -0000	1.52
+++ .cvsignore	22 Sep 2008 15:43:09 -0000	1.53
@@ -1 +1 @@
-gnome-terminal-2.23.91.tar.bz2
+gnome-terminal-2.24.0.tar.bz2


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- gnome-terminal.spec	2 Sep 2008 23:20:04 -0000	1.104
+++ gnome-terminal.spec	22 Sep 2008 15:43:09 -0000	1.105
@@ -10,10 +10,10 @@
 
 Summary: GNOME Terminal
 Name: gnome-terminal
-Version: 2.23.91
+Version: 2.24.0
 Release: 1%{?dist}
 URL: http://www.gnome.org/
-Source0: http://download.gnome.org/sources/gnome-terminal/2.23/gnome-terminal-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-terminal/2.24/gnome-terminal-%{version}.tar.bz2
 # Fix gnome.org Bug 338913 ??? Terminal resized when switching tabs
 Patch2: gnome-terminal-2.15.0-338913-revert-336325.patch
 License: GPLv2+ and GFDL
@@ -121,6 +121,9 @@
 %{_libdir}/bonobo/servers/gnome-terminal.server
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-terminal/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	2 Sep 2008 23:20:04 -0000	1.53
+++ sources	22 Sep 2008 15:43:09 -0000	1.54
@@ -1 +1 @@
-dd5334aa1b85cc7a7254c92b5d508d4d  gnome-terminal-2.23.91.tar.bz2
+963d48ea909f513e05d611b8c80b8730  gnome-terminal-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 15:34:02 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 15:34:02 +0000 (UTC)
Subject: rpms/gedit/devel .cvsignore, 1.79, 1.80 gedit.spec, 1.168,
	1.169 sources, 1.81, 1.82
Message-ID: <20080922153402.2F152700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15893

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
forgotten sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- .cvsignore	8 Sep 2008 23:58:21 -0000	1.79
+++ .cvsignore	22 Sep 2008 15:33:31 -0000	1.80
@@ -1 +1 @@
-gedit-2.23.92.tar.bz2
+gedit-2.24.0.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- gedit.spec	22 Sep 2008 15:28:14 -0000	1.168
+++ gedit.spec	22 Sep 2008 15:33:31 -0000	1.169
@@ -18,7 +18,7 @@
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
 Version: 	2.24.0
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -189,7 +189,7 @@
 
 
 %changelog
-* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-1
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-2
 - Update to 2.24.0
 
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.92-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sources	8 Sep 2008 23:58:21 -0000	1.81
+++ sources	22 Sep 2008 15:33:31 -0000	1.82
@@ -1 +1 @@
-f3aca6ac9187a27ea89384c4054a1060  gedit-2.23.92.tar.bz2
+c6a13bd45ddde3e6a1e45131f430086b  gedit-2.24.0.tar.bz2



From green at fedoraproject.org  Mon Sep 22 15:28:56 2008
From: green at fedoraproject.org (Anthony Green)
Date: Mon, 22 Sep 2008 15:28:56 +0000 (UTC)
Subject: rpms/common-lisp-controller/devel common-lisp-controller.spec, 1.2, 
	1.3
Message-ID: <20080922152856.0C977700FE@cvs1.fedora.phx.redhat.com>

Author: green

Update of /cvs/pkgs/rpms/common-lisp-controller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14510

Modified Files:
	common-lisp-controller.spec 
Log Message:
Own %{_libdir}/common-lisp/bin


Index: common-lisp-controller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/common-lisp-controller/devel/common-lisp-controller.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- common-lisp-controller.spec	21 Sep 2008 12:11:51 -0000	1.2
+++ common-lisp-controller.spec	22 Sep 2008 15:28:25 -0000	1.3
@@ -78,6 +78,7 @@
 %doc DESIGN.txt debian/copyright
 %dir %{_sysconfdir}/common-lisp
 %dir %{_libdir}/common-lisp
+%dir %{_libdir}/common-lisp/bin
 %dir %{_localstatedir}/cache/common-lisp-controller
 %{_datadir}/common-lisp
 %{_bindir}/clc-*
@@ -89,8 +90,8 @@
 %{_mandir}/man8/*
 
 %changelog
-* Sun Sep 21 2008 Anthony Green <green at redhat.com> 6.15-4
-- Fix tagging error.
+* Mon Sep 22 2008 Anthony Green <green at redhat.com> 6.15-4
+- Own %{_libdir}/common-lisp/bin.
 
 * Sun Jul 13 2008 Anthony Green <green at redhat.com> 6.15-3
 - Fix cache directory permissions.



From green at fedoraproject.org  Mon Sep 22 15:31:03 2008
From: green at fedoraproject.org (Anthony Green)
Date: Mon, 22 Sep 2008 15:31:03 +0000 (UTC)
Subject: rpms/common-lisp-controller/devel common-lisp-controller.spec, 1.3, 
	1.4
Message-ID: <20080922153103.B1372700FE@cvs1.fedora.phx.redhat.com>

Author: green

Update of /cvs/pkgs/rpms/common-lisp-controller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15105

Modified Files:
	common-lisp-controller.spec 
Log Message:
Fix tagging error


Index: common-lisp-controller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/common-lisp-controller/devel/common-lisp-controller.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- common-lisp-controller.spec	22 Sep 2008 15:28:25 -0000	1.3
+++ common-lisp-controller.spec	22 Sep 2008 15:30:33 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:      Common Lisp source and compiler manager
 Name:         common-lisp-controller
 Version:      6.15
-Release:      4%{?dist}
+Release:      5%{?dist}
 URL:          https://alioth.debian.org/projects/clc
 Source0:      http://ftp.de.debian.org/debian/pool/main/c/common-lisp-controller/common-lisp-controller_%{version}.tar.gz
 Patch0:       common-lisp-controller-fedora.patch
@@ -90,7 +90,7 @@
 %{_mandir}/man8/*
 
 %changelog
-* Mon Sep 22 2008 Anthony Green <green at redhat.com> 6.15-4
+* Mon Sep 22 2008 Anthony Green <green at redhat.com> 6.15-5
 - Own %{_libdir}/common-lisp/bin.
 
 * Sun Jul 13 2008 Anthony Green <green at redhat.com> 6.15-3



From spot at fedoraproject.org  Mon Sep 22 15:30:09 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 22 Sep 2008 15:30:09 +0000 (UTC)
Subject: rpms/google-perftools/F-8 google-perftools.spec, 1.9, 1.10 sources, 
	1.5, 1.6
Message-ID: <20080922153009.9A06B700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/google-perftools/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14954/F-8

Modified Files:
	google-perftools.spec sources 
Log Message:
update to 0.99.1


Index: google-perftools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-perftools/F-8/google-perftools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- google-perftools.spec	25 Aug 2008 16:59:33 -0000	1.9
+++ google-perftools.spec	22 Sep 2008 15:29:39 -0000	1.10
@@ -1,17 +1,11 @@
 Name:		google-perftools
-Version:	0.98
+Version:	0.99.1
 Release:	1%{?dist}
 License:	BSD
 Group:		Development/Tools
 Summary:	Very fast malloc and performance analysis tools
 URL:		http://code.google.com/p/google-perftools/
 Source0:	http://google-perftools.googlecode.com/files/google-perftools-%{version}.tar.gz
-# Sent upstream
-# http://code.google.com/p/google-perftools/issues/detail?id=74
-Patch0:		google-perftools-0.98-dirent.patch
-# Sent upstream
-# http://code.google.com/p/google-perftools/issues/detail?id=75
-Patch1:		google-perftools-0.98-glibc-headers.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Still broken, bz 238390
 ExcludeArch:	ppc64
@@ -35,8 +29,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1 -b .glibc-headers
 
 %build
 %configure --disable-static
@@ -79,6 +71,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Sep 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.99.1-1
+- update to 0.99.1
+- previous patches in 0.98-1 were taken upstream
+
 * Mon Aug 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.98-1
 - update to 0.98
 - fix linuxthreads.c compile (upstream issue 74)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/google-perftools/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Aug 2008 16:59:33 -0000	1.5
+++ sources	22 Sep 2008 15:29:39 -0000	1.6
@@ -1 +1 @@
-be6d283bb6177f1febaefd3570f3366d  google-perftools-0.98.tar.gz
+bc2c539e5d5ffaa27d638c35bb4f0125  google-perftools-0.99.1.tar.gz



From spot at fedoraproject.org  Mon Sep 22 15:30:10 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 22 Sep 2008 15:30:10 +0000 (UTC)
Subject: rpms/google-perftools/devel .cvsignore, 1.7,
	1.8 google-perftools.spec, 1.14, 1.15 sources, 1.7, 1.8
Message-ID: <20080922153010.44EA7700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/google-perftools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14954/devel

Modified Files:
	.cvsignore google-perftools.spec sources 
Log Message:
update to 0.99.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/google-perftools/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	25 Aug 2008 16:59:33 -0000	1.7
+++ .cvsignore	22 Sep 2008 15:29:40 -0000	1.8
@@ -1 +1 @@
-google-perftools-0.98.tar.gz
+google-perftools-0.99.1.tar.gz


Index: google-perftools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-perftools/devel/google-perftools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- google-perftools.spec	25 Aug 2008 16:59:33 -0000	1.14
+++ google-perftools.spec	22 Sep 2008 15:29:40 -0000	1.15
@@ -1,17 +1,11 @@
 Name:		google-perftools
-Version:	0.98
+Version:	0.99.1
 Release:	1%{?dist}
 License:	BSD
 Group:		Development/Tools
 Summary:	Very fast malloc and performance analysis tools
 URL:		http://code.google.com/p/google-perftools/
 Source0:	http://google-perftools.googlecode.com/files/google-perftools-%{version}.tar.gz
-# Sent upstream
-# http://code.google.com/p/google-perftools/issues/detail?id=74
-Patch0:		google-perftools-0.98-dirent.patch
-# Sent upstream
-# http://code.google.com/p/google-perftools/issues/detail?id=75
-Patch1:		google-perftools-0.98-glibc-headers.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Still broken, bz 238390
 ExcludeArch:	ppc64
@@ -35,8 +29,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1 -b .glibc-headers
 
 %build
 %configure --disable-static
@@ -79,6 +71,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Sep 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.99.1-1
+- update to 0.99.1
+- previous patches in 0.98-1 were taken upstream
+
 * Mon Aug 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.98-1
 - update to 0.98
 - fix linuxthreads.c compile (upstream issue 74)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/google-perftools/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	25 Aug 2008 16:59:33 -0000	1.7
+++ sources	22 Sep 2008 15:29:40 -0000	1.8
@@ -1 +1 @@
-be6d283bb6177f1febaefd3570f3366d  google-perftools-0.98.tar.gz
+bc2c539e5d5ffaa27d638c35bb4f0125  google-perftools-0.99.1.tar.gz



From mclasen at fedoraproject.org  Mon Sep 22 15:28:44 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 15:28:44 +0000 (UTC)
Subject: rpms/gedit/devel gedit.spec,1.167,1.168
Message-ID: <20080922152844.96C47700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14420

Modified Files:
	gedit.spec 
Log Message:
2.24.0



Index: gedit.spec
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- gedit.spec	8 Sep 2008 23:58:21 -0000	1.167
+++ gedit.spec	22 Sep 2008 15:28:14 -0000	1.168
@@ -17,12 +17,12 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
-Version: 	2.23.92
+Version: 	2.24.0
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
-Source0:	http://download.gnome.org/sources/gedit/2.23/gedit-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/gedit/2.24/gedit-%{version}.tar.bz2
 
 URL:		http://gedit.sourceforge.net/
 BuildRoot:	 %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.92-1
 - Update to 2.23.92
 



From mclasen at fedoraproject.org  Mon Sep 22 16:06:17 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 16:06:17 +0000 (UTC)
Subject: rpms/vinagre/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 vinagre.spec, 1.31, 1.32
Message-ID: <20080922160617.940D0700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22097

Modified Files:
	.cvsignore sources vinagre.spec 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vinagre/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	8 Sep 2008 19:45:46 -0000	1.15
+++ .cvsignore	22 Sep 2008 16:05:47 -0000	1.16
@@ -1 +1 @@
-vinagre-2.23.92.tar.bz2
+vinagre-2.24.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vinagre/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	8 Sep 2008 19:45:46 -0000	1.15
+++ sources	22 Sep 2008 16:05:47 -0000	1.16
@@ -1 +1 @@
-0cf798ece1936d52fe78b53d94cfb3e8  vinagre-2.23.92.tar.bz2
+db396e9f4e008771468c34824196c8fc  vinagre-2.24.0.tar.bz2


Index: vinagre.spec
===================================================================
RCS file: /cvs/extras/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- vinagre.spec	8 Sep 2008 19:45:46 -0000	1.31
+++ vinagre.spec	22 Sep 2008 16:05:47 -0000	1.32
@@ -1,12 +1,12 @@
 Name:		vinagre
-Version:	2.23.92
+Version:	2.24.0
 Release:	1%{?dist}
 Summary:	VNC client for the GNOME desktop
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://www.gnome.org/projects/vinagre/
-Source0:	http://download.gnome.org/sources/vinagre/2.23/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/vinagre/2.24/%{name}-%{version}.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -101,6 +101,9 @@
 %doc README NEWS COPYING AUTHORS
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 



From mmaslano at fedoraproject.org  Mon Sep 22 16:07:35 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 22 Sep 2008 16:07:35 +0000 (UTC)
Subject: rpms/anacron/devel anacron.init,1.16,1.17
Message-ID: <20080922160735.4C09E700FE@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/anacron/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22351

Modified Files:
	anacron.init 
Log Message:
* Wed Jul 30 2008 Marcela Maslanova <mmaslano at redhat.com> 2.3-62
- 441576 really stop anacron daemon



Index: anacron.init
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.init,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- anacron.init	30 Jul 2008 14:09:55 -0000	1.16
+++ anacron.init	22 Sep 2008 16:07:05 -0000	1.17
@@ -29,6 +29,7 @@
     if [ $RETVAL -ne 0 ]; then
 	failure;
     fi;
+    [ "$RETVAL" = 0 ] && touch $LOCKFILE
     echo
 }
 



From mmaslano at fedoraproject.org  Mon Sep 22 16:09:17 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 22 Sep 2008 16:09:17 +0000 (UTC)
Subject: rpms/anacron/F-9 anacron.init,1.14,1.15 anacron.spec,1.47,1.48
Message-ID: <20080922160917.DF654700FE@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/anacron/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22692

Modified Files:
	anacron.init anacron.spec 
Log Message:
* Mon Sep 22 2008 Marcela Maslanova <mmaslano at redhat.com> 2.3-61
- correct init script - really kill anacron



Index: anacron.init
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/F-9/anacron.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- anacron.init	11 Dec 2007 08:09:04 -0000	1.14
+++ anacron.init	22 Sep 2008 16:08:47 -0000	1.15
@@ -28,6 +28,7 @@
     if [ $RETVAL -ne 0 ]; then
 	failure;
     fi;
+    [ "$RETVAL" = 0 ] && touch $LOCKFILE
     echo
 }
 
@@ -42,6 +43,7 @@
     else
 	failure;
     fi
+    [ "$RETVAL" = 0 ] && touch $LOCKFILE
     echo
 }
 


Index: anacron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/F-9/anacron.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- anacron.spec	9 Apr 2008 10:53:21 -0000	1.47
+++ anacron.spec	22 Sep 2008 16:08:47 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: A cron-like program that can run jobs lost during downtime
 Name: anacron
 Version: 2.3
-Release: 60%{?dist}
+Release: 61%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://packages.debian.org/stable/source/anacron
@@ -109,6 +109,9 @@
 %attr(755,root,root) %dir /etc/cron.weekly/0anacron
 
 %changelog
+* Mon Sep 22 2008 Marcela Maslanova <mmaslano at redhat.com> 2.3-61
+- correct init script - really kill anacron
+
 * Wed Apr  9 2008 Marcela Maslanova <mmaslano at redhat.com> 2.3-60
 - correct spooldir logged
 



From mclasen at fedoraproject.org  Mon Sep 22 16:09:17 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 16:09:17 +0000 (UTC)
Subject: rpms/devhelp/devel .cvsignore, 1.20, 1.21 devhelp.spec, 1.94,
	1.95 sources, 1.20, 1.21
Message-ID: <20080922160917.07E3C700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/devhelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22662

Modified Files:
	.cvsignore devhelp.spec sources 
Log Message:
0.21



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/devhelp/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	8 Sep 2008 16:15:03 -0000	1.20
+++ .cvsignore	22 Sep 2008 16:08:46 -0000	1.21
@@ -1 +1 @@
-devhelp-0.20.tar.bz2
+devhelp-0.21.tar.bz2


Index: devhelp.spec
===================================================================
RCS file: /cvs/extras/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- devhelp.spec	8 Sep 2008 16:48:27 -0000	1.94
+++ devhelp.spec	22 Sep 2008 16:08:46 -0000	1.95
@@ -6,13 +6,13 @@
 ### Abstract ###
 
 Name: devhelp
-Version: 0.20
+Version: 0.21
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API document browser
 URL: http://developer.imendio.com/projects/devhelp
-Source: http://download.gnome.org/sources/devhelp/0.20/devhelp-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/devhelp/0.21/devhelp-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/devhelp-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ### Dependencies ###
@@ -133,6 +133,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 0.21-1
+- Update to 0.21
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 0.20-1
 - Update to 0.20
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/devhelp/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	8 Sep 2008 16:15:03 -0000	1.20
+++ sources	22 Sep 2008 16:08:46 -0000	1.21
@@ -1 +1 @@
-ce24246fc62a8bf146205584aa7e4eea  devhelp-0.20.tar.bz2
+24ad71080dde0778cb42c30575b5aca6  devhelp-0.21.tar.bz2



From mmaslano at fedoraproject.org  Mon Sep 22 16:12:45 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 22 Sep 2008 16:12:45 +0000 (UTC)
Subject: rpms/anacron/devel anacron.init,1.17,1.18 anacron.spec,1.50,1.51
Message-ID: <20080922161245.90A30700FE@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/anacron/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23144

Modified Files:
	anacron.init anacron.spec 
Log Message:
* Wed Jul 30 2008 Marcela Maslanova <mmaslano at redhat.com> 2.3-63
- fix previous patch, thanks to mbroz



Index: anacron.init
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.init,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- anacron.init	22 Sep 2008 16:07:05 -0000	1.17
+++ anacron.init	22 Sep 2008 16:12:15 -0000	1.18
@@ -8,11 +8,11 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+[ -f /usr/sbin/anacron ] || exit 0
+
 prog="anacron"
-PIDFILE=/var/run/anacron.pid
+PIDFILE=/var/spool/anacron/cron.daily
 LOCKFILE=/var/lock/subsys/$prog
-ANACRON=/usr/sbin/anacron
-
 #
 #  NOTE: anacron exits after it has determined it has no more work to do.
 #        Hence, its initscript cannot do normal lock file management.
@@ -22,7 +22,6 @@
 #
 
 start() {
-    [ -x $ANACRON ] || exit 5
     echo -n $"Starting $prog: " 
     daemon +19 anacron -s
     RETVAL=$?
@@ -35,15 +34,16 @@
 
 stop() {
     echo -n $"Stopping $prog: "
-    # daemon exists only sometime -> hard to kill
-    killproc $ANACRON
-    RETVAL=3
-    # kill first, than ask
-    if [ -n "`pidfileofproc $ANACRON`" ]; then
-	failure $"Stopping $prog"
-	RETVAL=1
+    if [ -f $PIDFILE ]; then
+	killproc anacron
+	RETVAL=$?
+	if [ $RETVAL -ne 0 ]; then 
+	    failure;
+	fi;
+    else
+	failure;
     fi
-    [ "RETVAL" = 0 ] && rm -f $LOCK_FILE
+    [ "$RETVAL" = 0 ] && touch $LOCKFILE
     echo
 }
 
@@ -57,8 +57,7 @@
 	    ;;
 	
 	status)
-		## hard to say - anacron is up only when cron wake him
-		## and has some jobs to do.
+	    ## hard to say - anacron is up only when cron wake him
 	    status $prog
 	    RETVAL=$?
 	    ;;
@@ -83,4 +82,3 @@
 esac
 
 exit $RETVAL
-


Index: anacron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- anacron.spec	30 Jul 2008 14:09:55 -0000	1.50
+++ anacron.spec	22 Sep 2008 16:12:15 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: A cron-like program that can run jobs lost during downtime
 Name: anacron
 Version: 2.3
-Release: 62%{?dist}
+Release: 63%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://packages.debian.org/stable/source/anacron
@@ -111,6 +111,9 @@
 %dir /etc/cron.monthly/0anacron
 
 %changelog
+* Wed Jul 30 2008 Marcela Maslanova <mmaslano at redhat.com> 2.3-63
+- fix previous patch, thanks to mbroz
+
 * Wed Jul 30 2008 Marcela Maslanova <mmaslano at redhat.com> 2.3-62
 - 441576 really stop anacron daemon
 



From mclasen at fedoraproject.org  Mon Sep 22 16:15:47 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 16:15:47 +0000 (UTC)
Subject: rpms/gnome-python2/devel .cvsignore, 1.36, 1.37 gnome-python2.spec, 
	1.22, 1.23 sources, 1.36, 1.37
Message-ID: <20080922161547.57AA2700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-python2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23759

Modified Files:
	.cvsignore gnome-python2.spec sources 
Log Message:
2.22.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	22 Sep 2008 01:27:42 -0000	1.36
+++ .cvsignore	22 Sep 2008 16:15:16 -0000	1.37
@@ -1 +1 @@
-gnome-python-2.22.2.tar.bz2
+gnome-python-2.22.3.tar.bz2


Index: gnome-python2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2/devel/gnome-python2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnome-python2.spec	22 Sep 2008 01:27:42 -0000	1.22
+++ gnome-python2.spec	22 Sep 2008 16:15:16 -0000	1.23
@@ -20,7 +20,7 @@
 ### Abstract ###
 
 Name: gnome-python2
-Version: 2.22.2
+Version: 2.22.3
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
@@ -209,6 +209,9 @@
 rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo}
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.3-1
+- Update to 2.22.3
+
 * Sun Sep 21 2008 Matthew Barnes <mbarnes at redhat.com> - 2.22.2-1.fc10
 - Update to 2.22.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	22 Sep 2008 01:27:42 -0000	1.36
+++ sources	22 Sep 2008 16:15:16 -0000	1.37
@@ -1 +1 @@
-e3237c337352e23bbee68b6e0b471dcc  gnome-python-2.22.2.tar.bz2
+ab12d94954a57de39b25eb7903d8429c  gnome-python-2.22.3.tar.bz2



From s4504kr at fedoraproject.org  Mon Sep 22 16:15:50 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon, 22 Sep 2008 16:15:50 +0000 (UTC)
Subject: rpms/highlight/EL-5 highlight-2.6.11-makefile.patch, NONE,
	1.1 highlight.spec, 1.19, 1.20 sources, 1.8,
	1.9 highlight-2.4-makefile.patch, 1.5,
	NONE highlight-2.4-rpmoptflags.patch, 1.5, NONE
Message-ID: <20080922161550.A7C08700FE@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23803

Modified Files:
	highlight.spec sources 
Added Files:
	highlight-2.6.11-makefile.patch 
Removed Files:
	highlight-2.4-makefile.patch highlight-2.4-rpmoptflags.patch 
Log Message:
Initional EL-5 release

highlight-2.6.11-makefile.patch:

--- NEW FILE highlight-2.6.11-makefile.patch ---
diff -up highlight-2.6.9/makefile.mak highlight-2.6.9/makefile
--- highlight-2.6.9/makefile.mak	2008-03-26 22:17:36.000000000 +0100
+++ highlight-2.6.9/makefile	2008-03-31 20:40:34.000000000 +0200
@@ -51,21 +51,12 @@ all-gui-wx29:
 install:
 	@echo "This script will install highlight in the following directories:"
 	@echo "Data directory:	        ${DESTDIR}${data_dir}"
-	@echo "Documentation directory: ${DESTDIR}${doc_dir}"
-	@echo "Examples directory:      ${DESTDIR}${examples_dir}"
 	@echo "Manual directory:        ${DESTDIR}${man_dir}"
 	@echo "Binary directory:        ${DESTDIR}${bin_dir}"
 	@echo "Configuration directory: ${DESTDIR}${conf_dir}"
 	@echo
 
-	${MKDIR} ${DESTDIR}${doc_dir}
 	${MKDIR} ${DESTDIR}${conf_dir}
-	${MKDIR} ${DESTDIR}${examples_dir} \
-		${DESTDIR}${examples_dir}plugins \
-		${DESTDIR}${examples_dir}plugins/dokuwiki \
-		${DESTDIR}${examples_dir}plugins/movabletype \
-		${DESTDIR}${examples_dir}plugins/wordpress \
-		${DESTDIR}${examples_dir}swig
 	${MKDIR} ${DESTDIR}${data_dir} \
 		${DESTDIR}${data_dir}themes \
 		${DESTDIR}${data_dir}langDefs \
@@ -80,22 +71,6 @@ install:
 	${INSTALL_DATA} ./indentSchemes/*.indent ${DESTDIR}${data_dir}indentSchemes/
 	${INSTALL_DATA} ./helpmsg/*.help ${DESTDIR}${data_dir}helpmsg/
 	${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir}
-	${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./README ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./README_INDENT ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./README_REGEX ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./README_LANGLIST ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./ChangeLog ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./COPYING ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./INSTALL ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./examples/plugins/dokuwiki/* ${DESTDIR}${examples_dir}plugins/dokuwiki/
-	${INSTALL_DATA} ./examples/plugins/movabletype/* ${DESTDIR}${examples_dir}plugins/movabletype/
-	${INSTALL_DATA} ./examples/plugins/wordpress/* ${DESTDIR}${examples_dir}plugins/wordpress/
-	${INSTALL_DATA} ./examples/swig/*.py ./examples/swig/*.pl ${DESTDIR}${examples_dir}swig
-	${INSTALL_DATA} ./examples/swig/*.i ./examples/swig/makefile ${DESTDIR}${examples_dir}swig
-	${INSTALL_DATA} ./examples/swig/README_SWIG ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./examples/highlight_pipe.* ${DESTDIR}${examples_dir}
 	${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir}
 
 	@echo
@@ -121,7 +96,6 @@ install-gui:
 uninstall:
 	@echo "Removing highlight files from system..."
 	${RMDIR} ${DESTDIR}${data_dir}
-	${RMDIR} ${DESTDIR}${doc_dir}
 	${RMDIR} ${DESTDIR}${conf_dir}
 	${RMDIR} ${DESTDIR}${examples_dir}
 	rm ${DESTDIR}${man_dir}highlight.1.gz


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/EL-5/highlight.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- highlight.spec	6 Feb 2007 16:29:38 -0000	1.19
+++ highlight.spec	22 Sep 2008 16:15:20 -0000	1.20
@@ -1,15 +1,16 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.4.8
+Version:	2.6.12
 Release:	2%{?dist}
 
 Group:		Development/Tools
-License:	GPL
+License:	GPLv2
 
 URL:		http://www.andre-simon.de/
 Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
-Patch1:		highlight-2.4-makefile.patch
-Patch2:		highlight-2.4-rpmoptflags.patch
+Patch1:		highlight-2.6.11-makefile.patch
+
+BuildRequires:	wxGTK-devel
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -23,17 +24,37 @@
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1 -b .bak
+%patch1 -p1 -b .mak
+
+# Provides: exclude perl(highlight_pipe) from example
+cat <<__EOF__ > %{name}-perl.prov
+#!/bin/sh
+/usr/lib/rpm/perl.prov \$* | grep -v '^perl(highlight_pipe)$'
+__EOF__
+%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-perl.prov
+chmod +x %{__perl_provides}
+
+# Requires: exclude perl(IPC::Open3) from example
+cat <<__EOF__ > %{name}-perl.req
+#!/bin/sh
+/usr/lib/rpm/perl.req \$* | grep -v '^perl(IPC::Open3)$'
+__EOF__
+%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-perl.req
+chmod +x %{__perl_requires}
+
 
 %build
-make %{?_smp_mflags} LDFLAGS=
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# Packaging this example causes lots of incorrect perl provides and 
+# requires. Since it isn't going to work out of the box, I'm nuking it.
+rm -rf examples/plugins/movabletype
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -44,12 +65,57 @@
 %{_datadir}/highlight/
 %{_mandir}/man1/highlight.1*
 
-%config /etc/highlight/
+%config(noreplace) %{_sysconfdir}/highlight/
 
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
-* Tue Feb  6 2007 Jochen Schmitt <s4504kr at zeus.herr-schmitt.de> 2.4.8-2
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.12-2
+- don't package broken examples, causes bogus perl provides/requires
+- don't claim to Provide: perl(highlight_pipe)
+- don't claim to Requires: perl(IPC::Open3)
+
+* Mon Aug 18 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.12-1
+- New upstream release
+
+* Thu Jul 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.11-1
+- New upstream release
+
+* Mon May 12 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.10-1
+- New upstream release
+
+* Mon Mar 31 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.9-2
+- New upstream release
+
+* Sun Feb 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.8-1
+- New upstream release
+
+* Mon Jan 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.7-2
+- New upstream release
+- Fix gcc-4.3 issues
+
+* Tue Dec 11 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.6-1
+- New upstream release
+
+* Mon Oct 29 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.5-1
+- New upstream release
+
+* Sun Sep 16 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.4-1
+- New upstream release
+
+* Tue Sep 11 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.3-1
+- New upstream release
+
+* Thu Aug  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.2-1
+- New upstream release
+
+* Wed Aug  8 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.1-2
+- Changing license tag
+
+* Tue Jul 10 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.1-1
+- New upstream release
+
+* Tue Feb  6 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-2
 - fir rpmopt bug (#227292)
 
 * Mon Oct 23 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Oct 2006 17:34:38 -0000	1.8
+++ sources	22 Sep 2008 16:15:20 -0000	1.9
@@ -1 +1 @@
-8ffb1d62ef449ecf5ffef1f6931a3d16  highlight-2.4.8.tar.gz
+5ab9c50e537c199f359a7d9610aacc7f  highlight-2.6.12.tar.gz


--- highlight-2.4-makefile.patch DELETED ---


--- highlight-2.4-rpmoptflags.patch DELETED ---



From mclasen at fedoraproject.org  Mon Sep 22 15:44:53 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 15:44:53 +0000 (UTC)
Subject: rpms/gnome-vfs2/devel .cvsignore, 1.55, 1.56 gnome-vfs2.spec, 1.183,
	1.184 sources, 1.58, 1.59
Message-ID: <20080922154453.A5937700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-vfs2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17467

Modified Files:
	.cvsignore gnome-vfs2.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfs2/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	5 Aug 2008 01:54:48 -0000	1.55
+++ .cvsignore	22 Sep 2008 15:44:23 -0000	1.56
@@ -1 +1 @@
-gnome-vfs-2.23.0.tar.bz2
+gnome-vfs-2.24.0.tar.bz2


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- gnome-vfs2.spec	11 Sep 2008 05:16:54 -0000	1.183
+++ gnome-vfs2.spec	22 Sep 2008 15:44:23 -0000	1.184
@@ -13,13 +13,13 @@
 
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
-Version: 2.23.0
-Release: 2%{?dist}
+Version: 2.24.0
+Release: 1%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+ 
 Group: System Environment/Libraries
-Source0: http://download.gnome.org/sources/gnome-vfs/2.23/gnome-vfs-%{version}.tar.bz2
+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}
@@ -231,6 +231,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Thu Sep 11 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.0-1
 - Rebuild against new bluez-libs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfs2/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	5 Aug 2008 01:54:48 -0000	1.58
+++ sources	22 Sep 2008 15:44:23 -0000	1.59
@@ -1 +1 @@
-c1650c4432d2af7c0c05e2b75c4c19d0  gnome-vfs-2.23.0.tar.bz2
+870ee8861bfcaeb852934e95657ef83e  gnome-vfs-2.24.0.tar.bz2



From rdieter at fedoraproject.org  Mon Sep 22 16:19:51 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 16:19:51 +0000 (UTC)
Subject: rpms/libkipi/EL-5 .cvsignore, 1.6, 1.7 libkipi.spec, 1.14,
	1.15 sources, 1.6, 1.7
Message-ID: <20080922161951.82BC57013E@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkipi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24389

Modified Files:
	.cvsignore libkipi.spec sources 
Log Message:
sync F-9 branch
EL-5 fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkipi/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Dec 2006 12:00:06 -0000	1.6
+++ .cvsignore	22 Sep 2008 16:19:21 -0000	1.7
@@ -1 +1 @@
-libkipi-0.1.5.tar.bz2
+libkipi-0.1.6.tar.bz2


Index: libkipi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkipi/EL-5/libkipi.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libkipi.spec	28 Dec 2006 12:00:06 -0000	1.14
+++ libkipi.spec	22 Sep 2008 16:19:21 -0000	1.15
@@ -1,33 +1,44 @@
+
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
+%endif
+
+%if 0%{?fedora} > 8
+# see http://bugzilla.redhat.com/452392
+%define nuke_icons 1
+%endif
+
 Name:           libkipi
-Version:        0.1.5
-Release:        1%{?dist}
+Version:        0.1.6
+Release:        2%{?dist}
 Summary:        Common plugin infrastructure for KDE image applications
 
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2+
 URL:            http://extragear.kde.org/apps/kipi
-Source0:        http://dl.sf.net/kipi/libkipi-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/kipi/libkipi-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs-devel >= 6:3.0
-BuildRequires:  gettext, libacl-devel
+BuildRequires:  gettext
+BuildRequires:  %{kdelibs3}-devel
 
 %description
 Kipi (KDE Image Plugin Interface) is an effort to develop a common plugin
-structure for Digikam, KimDaBa, Showimg and Gwenview. Its aim is to share
+structure for Digikam, Kphotoalbum, Showimg and Gwenview. Its aim is to share
 image plugins among graphic applications.
 
 %package        devel
-Summary:        Common plugin infrastructure for KDE image applications
+Summary:        Development files for %{name} 
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       kdelibs-devel
+Requires:       %{kdelibs3}-devel
 Requires:       pkgconfig
 
 %description    devel
-Kipi (KDE Image Plugin Interface) is an effort to develop a common plugin
-structure for Digikam, KimDaBa, Showimg and Gwenview. Its aim is to share
-image plugins among graphic applications.
+%{summary}.
 This package contains the files needed to build applications with Kipi
 support
 
@@ -38,9 +49,13 @@
 
 %build
 unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
-# work around an improper ${kdelibsuff}
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
-%configure --disable-rpath --disable-debug --enable-final
+
+%configure \
+  --disable-rpath \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final
+
 make %{?_smp_mflags}
 
 
@@ -50,7 +65,11 @@
 
 %find_lang %{name}
 
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+# unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%if 0%{?nuke_icons}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
+%endif
 
 
 %clean
@@ -59,31 +78,52 @@
 
 %post 
 /sbin/ldconfig
+%if ! 0%{?nuke_icons}
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+%endif
 
 %postun
 /sbin/ldconfig
+%if ! 0%{?nuke_icons}
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+%endif
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
-%{_libdir}/*.so.*
-%{_datadir}/apps/kipi
-%{_datadir}/icons/hicolor/*/apps/kipi.png
+%{_libdir}/libkipi.so.0*
+%{_datadir}/apps/kipi/
+%if ! 0%{?nuke_icons}
+%{_datadir}/icons/hicolor/*/*/*
+%endif
 %{_datadir}/servicetypes/*.desktop
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/*.so
+%{_libdir}/libkipi.so
 %{_libdir}/pkgconfig/*.pc
-%{_includedir}/libkipi
+%{_includedir}/libkipi/
 
 
 %changelog
+* Tue Jun 24 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-2
+- fix conflicts with kdegraphics (f9+, #452392)
+
+* Fri May 08 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-1
+- libkipi-0.1.6
+
+* Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.5-4
+- cleanup, fixup for rawhide (#433965)
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.5-3
+- Autorebuild for GCC 4.3
+
+* Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.1.5-2
+- fix license tag
+
 * Fri Dec 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.1.5-1
 - version 0.1.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkipi/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Dec 2006 12:00:06 -0000	1.6
+++ sources	22 Sep 2008 16:19:21 -0000	1.7
@@ -1 +1 @@
-aef790871583444cd81bd9dea9c3fd0b  libkipi-0.1.5.tar.bz2
+6fd010aa8eab7039143f69543e806c65  libkipi-0.1.6.tar.bz2



From green at fedoraproject.org  Mon Sep 22 16:23:23 2008
From: green at fedoraproject.org (Anthony Green)
Date: Mon, 22 Sep 2008 16:23:23 +0000 (UTC)
Subject: rpms/sbcl/devel sbcl.spec,1.95,1.96
Message-ID: <20080922162323.9B4F4700FE@cvs1.fedora.phx.redhat.com>

Author: green

Update of /cvs/pkgs/rpms/sbcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25083

Modified Files:
	sbcl.spec 
Log Message:
Add missing directories


Index: sbcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- sbcl.spec	21 Sep 2008 12:41:43 -0000	1.95
+++ sbcl.spec	22 Sep 2008 16:22:53 -0000	1.96
@@ -13,7 +13,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 1.0.20
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: BSD
 Group: 	 Development/Languages
@@ -206,8 +206,11 @@
 # 'test-passed' files from %%check
 find %{buildroot} -name 'test-passed' | xargs rm -vf
 
+install -dm 755 %{buildroot}%{_libdir}/common-lisp/bin
 install -m 744 %{SOURCE200} %{buildroot}%{_libdir}/common-lisp/bin
+install -dm 755 %{buildroot}%{_sysconfdir}
 install -m 644 %{SOURCE201} %{buildroot}%{_sysconfdir}/sbcl.rc
+install -dm 755 %{buildroot}%{_libdir}/sbcl
 install -m 644 %{SOURCE202} %{buildroot}%{_libdir}/sbcl/install-clc.lisp
 cp %{buildroot}%{_libdir}/sbcl/sbcl.core %{buildroot}%{_libdir}/sbcl/sbcl-dist.core
 
@@ -252,6 +255,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Anthony Green <green at redhat.com> - 1.0.20-3
+- Create missing directories.
+
 * Sun Sep 21 2008 Anthony Green <green at redhat.com> - 1.0.20-2
 - Add common-lisp-controller bits.
 



From mclasen at fedoraproject.org  Mon Sep 22 16:27:26 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 16:27:26 +0000 (UTC)
Subject: rpms/gnome-utils/devel .cvsignore, 1.66, 1.67 gnome-utils.spec,
	1.168, 1.169 sources, 1.70, 1.71
Message-ID: <20080922162726.42D24700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25794

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore	8 Sep 2008 16:23:36 -0000	1.66
+++ .cvsignore	22 Sep 2008 16:26:55 -0000	1.67
@@ -1 +1 @@
-gnome-utils-2.23.92.tar.bz2
+gnome-utils-2.24.0.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- gnome-utils.spec	8 Sep 2008 16:23:36 -0000	1.168
+++ gnome-utils.spec	22 Sep 2008 16:26:55 -0000	1.169
@@ -9,7 +9,7 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.23.92
+Version:        2.24.0
 Release:        2%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
@@ -17,7 +17,7 @@
 Group:          Applications/System
 License:        GPLv2+
 URL: 	        http://www.gnome.org
-Source0:        http://download.gnome.org/sources/gnome-utils/2.23/gnome-utils-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/gnome-utils/2.24/gnome-utils-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: 	logview-close-crash.patch
@@ -243,6 +243,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.92-1
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	8 Sep 2008 16:23:36 -0000	1.70
+++ sources	22 Sep 2008 16:26:55 -0000	1.71
@@ -1 +1 @@
-9f623f2a167a1daf989fe3907397d8f8  gnome-utils-2.23.92.tar.bz2
+61b145af70c5a61d27037119a31429e5  gnome-utils-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 16:29:42 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 16:29:42 +0000 (UTC)
Subject: rpms/gnome-themes/devel .cvsignore, 1.65, 1.66 gnome-themes.spec,
	1.117, 1.118 sources, 1.70, 1.71
Message-ID: <20080922162942.66C92700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-themes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26211

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	8 Sep 2008 20:12:50 -0000	1.65
+++ .cvsignore	22 Sep 2008 16:29:12 -0000	1.66
@@ -1 +1 @@
-gnome-themes-2.23.92.tar.bz2
+gnome-themes-2.24.0.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- gnome-themes.spec	8 Sep 2008 20:12:50 -0000	1.117
+++ gnome-themes.spec	22 Sep 2008 16:29:12 -0000	1.118
@@ -1,9 +1,9 @@
 Summary: Themes collection for GNOME
 Name: gnome-themes
-Version: 2.23.92
+Version: 2.24.0
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/gnome-themes/
-Source: http://download.gnome.org/sources/gnome-themes/2.23/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-themes/2.24/%{name}-%{version}.tar.bz2
 License: LGPLv2 and GPLv2
 Group: User Interface/Desktops
 BuildArch: noarch
@@ -94,6 +94,9 @@
 %doc AUTHORS COPYING NEWS README
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	8 Sep 2008 20:12:50 -0000	1.70
+++ sources	22 Sep 2008 16:29:12 -0000	1.71
@@ -1 +1 @@
-464c6cf494fb8a6cd8416ba8c7209ff8  gnome-themes-2.23.92.tar.bz2
+0dd3fc0d034d7f51379ea6f335d1d257  gnome-themes-2.24.0.tar.bz2



From s4504kr at fedoraproject.org  Mon Sep 22 16:30:26 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon, 22 Sep 2008 16:30:26 +0000 (UTC)
Subject: rpms/highlight/EL-4 highlight-2.6.11-makefile.patch, NONE,
	1.1 highlight.spec, 1.4, 1.5 sources, 1.2,
	1.3 highlight-2.4-etcdir.patch, 1.1,
	NONE highlight-2.4-makefile.patch, 1.2,
	NONE highlight-2.4-rpmoptflags.patch, 1.1, NONE
Message-ID: <20080922163026.991ED700FE@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26320

Modified Files:
	highlight.spec sources 
Added Files:
	highlight-2.6.11-makefile.patch 
Removed Files:
	highlight-2.4-etcdir.patch highlight-2.4-makefile.patch 
	highlight-2.4-rpmoptflags.patch 
Log Message:
Initional EL-4 release

highlight-2.6.11-makefile.patch:

--- NEW FILE highlight-2.6.11-makefile.patch ---
diff -up highlight-2.6.9/makefile.mak highlight-2.6.9/makefile
--- highlight-2.6.9/makefile.mak	2008-03-26 22:17:36.000000000 +0100
+++ highlight-2.6.9/makefile	2008-03-31 20:40:34.000000000 +0200
@@ -51,21 +51,12 @@ all-gui-wx29:
 install:
 	@echo "This script will install highlight in the following directories:"
 	@echo "Data directory:	        ${DESTDIR}${data_dir}"
-	@echo "Documentation directory: ${DESTDIR}${doc_dir}"
-	@echo "Examples directory:      ${DESTDIR}${examples_dir}"
 	@echo "Manual directory:        ${DESTDIR}${man_dir}"
 	@echo "Binary directory:        ${DESTDIR}${bin_dir}"
 	@echo "Configuration directory: ${DESTDIR}${conf_dir}"
 	@echo
 
-	${MKDIR} ${DESTDIR}${doc_dir}
 	${MKDIR} ${DESTDIR}${conf_dir}
-	${MKDIR} ${DESTDIR}${examples_dir} \
-		${DESTDIR}${examples_dir}plugins \
-		${DESTDIR}${examples_dir}plugins/dokuwiki \
-		${DESTDIR}${examples_dir}plugins/movabletype \
-		${DESTDIR}${examples_dir}plugins/wordpress \
-		${DESTDIR}${examples_dir}swig
 	${MKDIR} ${DESTDIR}${data_dir} \
 		${DESTDIR}${data_dir}themes \
 		${DESTDIR}${data_dir}langDefs \
@@ -80,22 +71,6 @@ install:
 	${INSTALL_DATA} ./indentSchemes/*.indent ${DESTDIR}${data_dir}indentSchemes/
 	${INSTALL_DATA} ./helpmsg/*.help ${DESTDIR}${data_dir}helpmsg/
 	${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir}
-	${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./README ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./README_INDENT ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./README_REGEX ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./README_LANGLIST ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./ChangeLog ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./COPYING ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./INSTALL ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./examples/plugins/dokuwiki/* ${DESTDIR}${examples_dir}plugins/dokuwiki/
-	${INSTALL_DATA} ./examples/plugins/movabletype/* ${DESTDIR}${examples_dir}plugins/movabletype/
-	${INSTALL_DATA} ./examples/plugins/wordpress/* ${DESTDIR}${examples_dir}plugins/wordpress/
-	${INSTALL_DATA} ./examples/swig/*.py ./examples/swig/*.pl ${DESTDIR}${examples_dir}swig
-	${INSTALL_DATA} ./examples/swig/*.i ./examples/swig/makefile ${DESTDIR}${examples_dir}swig
-	${INSTALL_DATA} ./examples/swig/README_SWIG ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./examples/highlight_pipe.* ${DESTDIR}${examples_dir}
 	${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir}
 
 	@echo
@@ -121,7 +96,6 @@ install-gui:
 uninstall:
 	@echo "Removing highlight files from system..."
 	${RMDIR} ${DESTDIR}${data_dir}
-	${RMDIR} ${DESTDIR}${doc_dir}
 	${RMDIR} ${DESTDIR}${conf_dir}
 	${RMDIR} ${DESTDIR}${examples_dir}
 	rm ${DESTDIR}${man_dir}highlight.1.gz


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/EL-4/highlight.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- highlight.spec	10 Aug 2005 19:12:22 -0000	1.4
+++ highlight.spec	22 Sep 2008 16:29:56 -0000	1.5
@@ -1,16 +1,16 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.4.1
-Release:	6%{?dist}
+Version:	2.6.12
+Release:	2%{?dist}
 
 Group:		Development/Tools
-License:	GPL
+License:	GPLv2
 
 URL:		http://www.andre-simon.de/
-Source0:	http://www.andre-simon.de/zip/%{name}-2.4-1.tar.bz2
-Patch1:		highlight-2.4-makefile.patch
-Patch2:		highlight-2.4-rpmoptflags.patch
-Patch3:         highlight-2.4-etcdir.patch
+Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
+Patch1:		highlight-2.6.11-makefile.patch
+
+BuildRequires:	wxGTK-devel
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -23,20 +23,37 @@
 It is easily possible to create new language definitions and colour themes.
 
 %prep
-%setup -q -n %{name}-2.4-1
-%patch1 -p1 
-%patch2 -p1
-%patch3 -p1
+%setup -q
+%patch1 -p1 -b .mak
+
+# Provides: exclude perl(highlight_pipe) from example
+cat <<__EOF__ > %{name}-perl.prov
+#!/bin/sh
+/usr/lib/rpm/perl.prov \$* | grep -v '^perl(highlight_pipe)$'
+__EOF__
+%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-perl.prov
+chmod +x %{__perl_provides}
+
+# Requires: exclude perl(IPC::Open3) from example
+cat <<__EOF__ > %{name}-perl.req
+#!/bin/sh
+/usr/lib/rpm/perl.req \$* | grep -v '^perl(IPC::Open3)$'
+__EOF__
+%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-perl.req
+chmod +x %{__perl_requires}
+
 
 %build
-make %{?_smp_mflags} LDFLAGS=
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_docdir}/highlight
+# Packaging this example causes lots of incorrect perl provides and 
+# requires. Since it isn't going to work out of the box, I'm nuking it.
+rm -rf examples/plugins/movabletype
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,11 +65,94 @@
 %{_datadir}/highlight/
 %{_mandir}/man1/highlight.1*
 
-%config /etc/highlight/
+%config(noreplace) %{_sysconfdir}/highlight/
 
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.12-2
+- don't package broken examples, causes bogus perl provides/requires
+- don't claim to Provide: perl(highlight_pipe)
+- don't claim to Requires: perl(IPC::Open3)
+
+* Mon Aug 18 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.12-1
+- New upstream release
+
+* Thu Jul 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.11-1
+- New upstream release
+
+* Mon May 12 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.10-1
+- New upstream release
+
+* Mon Mar 31 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.9-2
+- New upstream release
+
+* Sun Feb 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.8-1
+- New upstream release
+
+* Mon Jan 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.7-2
+- New upstream release
+- Fix gcc-4.3 issues
+
+* Tue Dec 11 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.6-1
+- New upstream release
+
+* Mon Oct 29 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.5-1
+- New upstream release
+
+* Sun Sep 16 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.4-1
+- New upstream release
+
+* Tue Sep 11 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.3-1
+- New upstream release
+
+* Thu Aug  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.2-1
+- New upstream release
+
+* Wed Aug  8 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.1-2
+- Changing license tag
+
+* Tue Jul 10 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.1-1
+- New upstream release
+
+* Tue Feb  6 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-2
+- fir rpmopt bug (#227292)
+
+* Mon Oct 23 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-1
+- New upstream release
+
+* Sun Sep  3 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.7-2
+- Rebuilt for FC-6
+
+* Tue Jul  4 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.7-1
+- New upstream release
+
+* Wed Mar 22 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.5-2
+- New upstream relase
+- Add gcc41 patch
+
+* Wed Mar 15 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.4-2
+- Add fixcodegen patch from Eric Hopper #184245
+
+* Sun Mar 12 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.4-1
+- New upstream release
+- Adapt rpmopt patch to new upstream release
+
+* Sun Feb 12 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.3-2
+- Rebuilt for FC5
+
+* Tue Nov  1 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.3-1
+- New upstream release
+
+* Tue Oct 11 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.2-3
+- Fix typo in highlight-2.4-rpmoptflags.patch
+
+* Mon Oct 10 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.2-2
+- Use -DUSE_FN_MATCH
+
+* Sun Oct  9 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.2-1
+- New upstream release
+
 * Wed Aug 10 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.1-6
 - Rebuilt for FC-4/FC-3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Aug 2005 15:38:30 -0000	1.2
+++ sources	22 Sep 2008 16:29:56 -0000	1.3
@@ -1 +1 @@
-70066f7c4c0970fb84b0d84835d2f25f  highlight-2.4-1.tar.bz2
+5ab9c50e537c199f359a7d9610aacc7f  highlight-2.6.12.tar.gz


--- highlight-2.4-etcdir.patch DELETED ---


--- highlight-2.4-makefile.patch DELETED ---


--- highlight-2.4-rpmoptflags.patch DELETED ---



From rstrode at fedoraproject.org  Mon Sep 22 16:44:23 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 22 Sep 2008 16:44:23 +0000 (UTC)
Subject: rpms/gnome-desktop/devel gnome-desktop-2.23.92-fade.patch, 1.3,
	1.4 gnome-desktop.spec, 1.168, 1.169
Message-ID: <20080922164423.5D66E700FE@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28032

Modified Files:
	gnome-desktop-2.23.92-fade.patch gnome-desktop.spec 
Log Message:
- s/animatins/animations/ yes there's deja vu here


gnome-desktop-2.23.92-fade.patch:

Index: gnome-desktop-2.23.92-fade.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop-2.23.92-fade.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-desktop-2.23.92-fade.patch	22 Sep 2008 15:53:03 -0000	1.3
+++ gnome-desktop-2.23.92-fade.patch	22 Sep 2008 16:44:23 -0000	1.4
@@ -503,7 +503,7 @@
 +
 +	settings = gtk_settings_get_for_screen (screen);
 +
-+	g_object_get (settings, "gtk-enable-animatins", &are_enabled, NULL);
++	g_object_get (settings, "gtk-enable-animations", &are_enabled, NULL);
 +
 +	return !are_enabled;
 +}


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- gnome-desktop.spec	22 Sep 2008 15:53:03 -0000	1.168
+++ gnome-desktop.spec	22 Sep 2008 16:44:23 -0000	1.169
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.23.92
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.23/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -126,6 +126,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Mon Sep 22 2008 Ray Strode <rstrode at redhat.com> - 2.23.92-5
+- s/animatins/animations/ yes there's deja vu here
+
 * Mon Sep 22 2008 Ray Strode <rstrode at redhat.com> - 2.23.92-4
 - Add some flush calls to make transition smoother
 



From mclasen at fedoraproject.org  Mon Sep 22 16:46:06 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 16:46:06 +0000 (UTC)
Subject: rpms/libgnomeprint22/devel .cvsignore, 1.24,
	1.25 libgnomeprint22.spec, 1.59, 1.60 sources, 1.24, 1.25
Message-ID: <20080922164606.6B313700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnomeprint22/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28209

Modified Files:
	.cvsignore libgnomeprint22.spec sources 
Log Message:
2.18.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnomeprint22/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	13 Feb 2008 14:10:01 -0000	1.24
+++ .cvsignore	22 Sep 2008 16:45:36 -0000	1.25
@@ -1 +1 @@
-libgnomeprint-2.18.4.tar.bz2
+libgnomeprint-2.18.5.tar.bz2


Index: libgnomeprint22.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomeprint22/devel/libgnomeprint22.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- libgnomeprint22.spec	21 May 2008 21:42:14 -0000	1.59
+++ libgnomeprint22.spec	22 Sep 2008 16:45:36 -0000	1.60
@@ -12,8 +12,8 @@
 
 Summary: Printing library for GNOME
 Name:		libgnomeprint22
-Version: 	2.18.4
-Release:	2%{?dist}
+Version: 	2.18.5
+Release:	1%{?dist}
 License:	LGPLv2+ and BSD
 # BSD applies to ttsubset code that was taken from STSF
 Group:          System Environment/Base
@@ -122,6 +122,9 @@
 %{_datadir}/gtk-doc/html/libgnomeprint
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.18.5-1
+- Update to 2.18.5
+
 * Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.18.4-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnomeprint22/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	13 Feb 2008 14:10:01 -0000	1.24
+++ sources	22 Sep 2008 16:45:36 -0000	1.25
@@ -1 +1 @@
-bc460f875425a956176f07440b3fa46e  libgnomeprint-2.18.4.tar.bz2
+c325baf4487335259e050619185787b1  libgnomeprint-2.18.5.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 16:52:01 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 16:52:01 +0000 (UTC)
Subject: rpms/libgnomeprintui22/devel .cvsignore, 1.23,
	1.24 libgnomeprintui22.spec, 1.48, 1.49 sources, 1.23, 1.24
Message-ID: <20080922165201.77549700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnomeprintui22/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29048

Modified Files:
	.cvsignore libgnomeprintui22.spec sources 
Log Message:
2.18.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnomeprintui22/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	1 Feb 2008 01:20:10 -0000	1.23
+++ .cvsignore	22 Sep 2008 16:51:31 -0000	1.24
@@ -1 +1 @@
-libgnomeprintui-2.18.2.tar.bz2
+libgnomeprintui-2.18.3.tar.bz2


Index: libgnomeprintui22.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomeprintui22/devel/libgnomeprintui22.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- libgnomeprintui22.spec	21 May 2008 21:43:55 -0000	1.48
+++ libgnomeprintui22.spec	22 Sep 2008 16:51:31 -0000	1.49
@@ -5,8 +5,8 @@
 
 Summary: GUI support for libgnomeprint
 Name: libgnomeprintui22
-Version: 2.18.2
-Release: 2%{?dist}
+Version: 2.18.3
+Release: 1%{?dist}
 Source0: http://ftp.gnome.org/pub/gnome/sources/libgnomeprintui/2.18/libgnomeprintui-%{version}.tar.bz2
 URL: http://ftp.gnome.org/pub/gnome/sources/libgnomeprintui/
 License: LGPLv2+
@@ -84,6 +84,9 @@
 %{_datadir}/gtk-doc/html/libgnomeprintui
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.18.3-1
+- Update to 2.18.3
+
 * Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.18.2-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnomeprintui22/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	1 Feb 2008 01:20:10 -0000	1.23
+++ sources	22 Sep 2008 16:51:31 -0000	1.24
@@ -1 +1 @@
-88b404e7b62bb9ad96b25908c1315dcd  libgnomeprintui-2.18.2.tar.bz2
+f2c5796f15d6b6701bfa224d856098ce  libgnomeprintui-2.18.3.tar.bz2



From green at fedoraproject.org  Mon Sep 22 16:59:23 2008
From: green at fedoraproject.org (Anthony Green)
Date: Mon, 22 Sep 2008 16:59:23 +0000 (UTC)
Subject: rpms/common-lisp-controller/devel
	common-lisp-controller-special-chars.patch, NONE,
	1.1 common-lisp-controller.spec, 1.4, 1.5
Message-ID: <20080922165923.45EBA700FE@cvs1.fedora.phx.redhat.com>

Author: green

Update of /cvs/pkgs/rpms/common-lisp-controller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30374

Modified Files:
	common-lisp-controller.spec 
Added Files:
	common-lisp-controller-special-chars.patch 
Log Message:
Rev -6.  Support '+' in package names.

common-lisp-controller-special-chars.patch:

--- NEW FILE common-lisp-controller-special-chars.patch ---
--- unregister-common-lisp-source~	2008-06-13 00:59:34.000000000 -0700
+++ unregister-common-lisp-source	2008-09-22 09:50:20.000000000 -0700
@@ -12,7 +12,7 @@
 
 library="$1"
 
-echo "$library" | grep -q '[^a-zA-Z0-9-]' && echo "Found special characters in $1!" && exit 42
+echo "$library" | grep -q '[^a-zA-Z0-9\+-]' && echo "Found special characters in $1!" && exit 42
 
 echo "$library" | grep -q '\.\.' && echo "Found .. in $1!" && exit 1
 


Index: common-lisp-controller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/common-lisp-controller/devel/common-lisp-controller.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- common-lisp-controller.spec	22 Sep 2008 15:30:33 -0000	1.4
+++ common-lisp-controller.spec	22 Sep 2008 16:58:53 -0000	1.5
@@ -1,10 +1,11 @@
 Summary:      Common Lisp source and compiler manager
 Name:         common-lisp-controller
 Version:      6.15
-Release:      5%{?dist}
+Release:      6%{?dist}
 URL:          https://alioth.debian.org/projects/clc
 Source0:      http://ftp.de.debian.org/debian/pool/main/c/common-lisp-controller/common-lisp-controller_%{version}.tar.gz
 Patch0:       common-lisp-controller-fedora.patch
+Patch1:       common-lisp-controller-special-chars.patch
 License:      LLGPL
 Group:        Development/Libraries
 BuildArch:    noarch
@@ -20,6 +21,7 @@
 %prep
 %setup -q
 %patch0 -p0 
+%patch1 -p0 
 
 %build
 # Do nothing.
@@ -90,6 +92,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Mon Sep 22 2008 Anthony Green <green at redhat.com> 6.15-6
+- Add new patch to allow for '+' in package names.
+
 * Mon Sep 22 2008 Anthony Green <green at redhat.com> 6.15-5
 - Own %{_libdir}/common-lisp/bin.
 



From rdieter at fedoraproject.org  Mon Sep 22 17:08:28 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 17:08:28 +0000 (UTC)
Subject: rpms/libkipi/F-9 libkipi.spec,1.18,1.19
Message-ID: <20080922170828.F07AD700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkipi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31678

Modified Files:
	libkipi.spec 
Log Message:
sync mods from EL-5 branch



Index: libkipi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkipi/F-9/libkipi.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libkipi.spec	17 Jul 2008 14:20:52 -0000	1.18
+++ libkipi.spec	22 Sep 2008 17:07:58 -0000	1.19
@@ -1,4 +1,11 @@
 
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
+%endif
+
 %if 0%{?fedora} > 8
 # see http://bugzilla.redhat.com/452392
 %define nuke_icons 1
@@ -16,7 +23,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext
-BuildRequires:  kdelibs3-devel
+BuildRequires:  %{kdelibs3}-devel
 
 %description
 Kipi (KDE Image Plugin Interface) is an effort to develop a common plugin
@@ -27,7 +34,7 @@
 Summary:        Development files for %{name} 
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       kdelibs3-devel
+Requires:       %{kdelibs3}-devel
 Requires:       pkgconfig
 
 %description    devel



From mclasen at fedoraproject.org  Mon Sep 22 17:14:44 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 17:14:44 +0000 (UTC)
Subject: rpms/gnome-user-docs/devel .cvsignore, 1.23,
	1.24 gnome-user-docs.spec, 1.35, 1.36 sources, 1.23, 1.24
Message-ID: <20080922171444.A1CBD700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-user-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32697

Modified Files:
	.cvsignore gnome-user-docs.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-user-docs/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	10 Mar 2008 21:37:45 -0000	1.23
+++ .cvsignore	22 Sep 2008 17:14:14 -0000	1.24
@@ -1 +1 @@
-gnome-user-docs-2.22.0.tar.bz2
+gnome-user-docs-2.24.0.tar.bz2


Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnome-user-docs.spec	23 Jul 2008 16:58:26 -0000	1.35
+++ gnome-user-docs.spec	22 Sep 2008 17:14:14 -0000	1.36
@@ -1,9 +1,9 @@
 Summary:        GNOME User Documentation
 Name:           gnome-user-docs
-Version:        2.22.0
-Release:	2%{?dist}
+Version:        2.24.0
+Release:	1%{?dist}
 License:        GFDL
-Source:         http://download.gnome.org/sources/gnome-user-docs/2.22/gnome-user-docs-%{version}.tar.bz2 
+Source:         http://download.gnome.org/sources/gnome-user-docs/2.24/gnome-user-docs-%{version}.tar.bz2 
 Group:          Documentation
 
 BuildArch:      noarch
@@ -53,6 +53,9 @@
 %dir %{_datadir}/omf/gnome-access-guide
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Wed Jul 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.22.0-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-user-docs/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	10 Mar 2008 21:37:45 -0000	1.23
+++ sources	22 Sep 2008 17:14:14 -0000	1.24
@@ -1 +1 @@
-f3af808e754701b83105eab2f5ca690c  gnome-user-docs-2.22.0.tar.bz2
+f4a6ad3fe827f4b189b86345daf96e08  gnome-user-docs-2.24.0.tar.bz2



From corsepiu at fedoraproject.org  Mon Sep 22 17:16:56 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 22 Sep 2008 17:16:56 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple/devel import.log, NONE,
	1.1 perl-Test-HTTP-Server-Simple.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080922171656.AD80C700FE@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv802/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Test-HTTP-Server-Simple.spec 
Log Message:



--- NEW FILE import.log ---
perl-Test-HTTP-Server-Simple-0_09-3_fc10:HEAD:perl-Test-HTTP-Server-Simple-0.09-3.fc10.src.rpm:1222103761


--- NEW FILE perl-Test-HTTP-Server-Simple.spec ---
Name:           perl-Test-HTTP-Server-Simple
Version:        0.09
Release:        3%{?dist}
Summary:        Test::More functions for HTTP::Server::Simple
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-HTTP-Server-Simple/
Source0:        http://www.cpan.org/authors/id/J/JE/JESSE/Test-HTTP-Server-Simple-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(HTTP::Server::Simple)
BuildRequires:  perl(Test::Builder)
BuildRequires:  perl(Test::Builder::Tester) >= 1.04
BuildRequires:  perl(Test::More)

# for improved tests
BuildRequires:  perl(Test::Pod) >= 1.14
BuildRequires:  perl(Test::Pod::Coverage) >= 1.04

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This mixin class provides methods to test an HTTP::Server::Simple-based web
server. Currently, it provides only one such method: started_ok.

%prep
%setup -q -n Test-HTTP-Server-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
* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.09-3
- BR: perl(Test::Pod), perl(Test::Pod::Coverage).

* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.09-2
- Adjust License-tag.

* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.09-1
- Remove bogus R: generated by cpanspec.
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Sep 2008 15:55:00 -0000	1.1
+++ .cvsignore	22 Sep 2008 17:16:26 -0000	1.2
@@ -0,0 +1 @@
+Test-HTTP-Server-Simple-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 15:55:00 -0000	1.1
+++ sources	22 Sep 2008 17:16:26 -0000	1.2
@@ -0,0 +1 @@
+fcc1f09e7e83dc171a3e3b197aa70c08  Test-HTTP-Server-Simple-0.09.tar.gz



From corsepiu at fedoraproject.org  Mon Sep 22 17:18:10 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 22 Sep 2008 17:18:10 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple/devel import.log,1.1,NONE
Message-ID: <20080922171810.D680F700FE@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1252

Removed Files:
	import.log 
Log Message:
Remove.


--- import.log DELETED ---



From hadess at fedoraproject.org  Mon Sep 22 17:18:53 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 22 Sep 2008 17:18:53 +0000 (UTC)
Subject: rpms/gnome-user-share/devel gus-bluez4-update.patch, NONE,
	1.1 gnome-user-share.spec, 1.38, 1.39
Message-ID: <20080922171853.BD839700FE@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-serv1235

Modified Files:
	gnome-user-share.spec 
Added Files:
	gus-bluez4-update.patch 
Log Message:
* Mon Sep 22 2008 - Bastien Nocera <bnocera at redhat.com> - 0.31-3
- Add patch to port to BlueZ 4.x API


gus-bluez4-update.patch:

--- NEW FILE gus-bluez4-update.patch ---
Index: src/obexpush.c
===================================================================
--- src/obexpush.c	(revision 259)
+++ src/obexpush.c	(working copy)
@@ -184,7 +184,7 @@
 	DBusGConnection *connection;
 	DBusGProxy *manager;
 	GError *error = NULL;
-	char **adapters;
+	GPtrArray *adapters;
 	gboolean retval = FALSE;
 	guint i;
 
@@ -193,52 +193,74 @@
 		return FALSE;
 
 	manager = dbus_g_proxy_new_for_name (connection, "org.bluez",
-					     "/org/bluez", "org.bluez.Manager");
+					     "/", "org.bluez.Manager");
 	if (manager == NULL) {
 		dbus_g_connection_unref (connection);
 		return FALSE;
 	}
 
-	if (dbus_g_proxy_call (manager, "ListAdapters", &error, G_TYPE_INVALID, G_TYPE_STRV, &adapters, G_TYPE_INVALID) == FALSE) {
+	if (dbus_g_proxy_call (manager, "ListAdapters", &error, G_TYPE_INVALID, dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &adapters, G_TYPE_INVALID) == FALSE) {
 		g_object_unref (manager);
 		dbus_g_connection_unref (connection);
 		return FALSE;
 	}
 
-	for (i = 0; adapters[i] != NULL; i++) {
-		DBusGProxy *adapter;
-		gboolean bonded, trusted;
+	for (i = 0; i < adapters->len; i++) {
+		DBusGProxy *adapter, *device;
+		char *device_path;
+		GHashTable *props;
 
-		g_message ("checking adapter %s", adapters[i]);
+		g_message ("checking adapter %s", g_ptr_array_index (adapters, i));
 
 		adapter = dbus_g_proxy_new_for_name (connection, "org.bluez",
-						    adapters[i], "org.bluez.Adapter");
-		if (dbus_g_proxy_call (adapter, "HasBonding", NULL,
-				      G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
-				      G_TYPE_BOOLEAN, &bonded, G_TYPE_INVALID) != FALSE) {
+						    g_ptr_array_index (adapters, i), "org.bluez.Adapter");
+
+		if (dbus_g_proxy_call (adapter, "FindDevice", NULL,
+				       G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
+				       DBUS_TYPE_G_OBJECT_PATH, &device_path, G_TYPE_INVALID) == FALSE)
+		{
+			g_object_unref (adapter);
+			continue;
+		}
+
+		device = dbus_g_proxy_new_for_name (connection, "org.bluez", device_path, "org.bluez.Device");
+
+		if (dbus_g_proxy_call (device, "GetProperties", NULL,
+				       G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE),
+				       &props, G_TYPE_INVALID) != FALSE)
+		{
+			GValue *value;
+			gboolean bonded, trusted;
+
+			value = g_hash_table_lookup (props, "Paired");
+			bonded = g_value_get_boolean (value);
 			g_message ("%s is %s", bdaddr, bonded ? "bonded" : "not bonded");
-			if (bonded != FALSE) {
+
+			if (bonded) {
+				g_hash_table_destroy (props);
+				g_object_unref (device);
+				g_object_unref (adapter);
 				retval = TRUE;
-				g_object_unref (adapter);
 				break;
 			}
-		}
-		if (accept_setting == ACCEPT_BONDED_AND_TRUSTED &&
-		    dbus_g_proxy_call (adapter, "IsTrusted", NULL,
-				       G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
-				       G_TYPE_BOOLEAN, &trusted, G_TYPE_INVALID) != FALSE) {
+			value = g_hash_table_lookup (props, "Trusted");
+			trusted = g_value_get_boolean (value);
 			g_message ("%s is %s", bdaddr, trusted ? "trusted" : "not trusted");
-			if (trusted != FALSE) {
+
+			if (accept_setting == ACCEPT_BONDED_AND_TRUSTED
+			    && trusted) {
+				g_hash_table_destroy (props);
+				g_object_unref (device);
+				g_object_unref (adapter);
 				retval = TRUE;
-				g_object_unref (adapter);
 				break;
 			}
 		}
-
 		g_object_unref(adapter);
 	}
 
-	g_strfreev(adapters);
+	g_ptr_array_free (adapters, TRUE);
+
 	g_object_unref(manager);
 	dbus_g_connection_unref(connection);
 
@@ -351,7 +373,7 @@
 cancelled_cb (DBusGProxy *session,
 	      gpointer user_data)
 {
-	//FIXME implement properly
+	//FIXME implement properly, we never actually finished the transfer
 	g_message ("transfered was cancelled by the sender");
 	transfer_completed_cb (session, user_data);
 }


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gnome-user-share.spec	4 May 2008 23:06:43 -0000	1.38
+++ gnome-user-share.spec	22 Sep 2008 17:18:23 -0000	1.39
@@ -1,12 +1,14 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 0.31
-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/0.31/%{name}-%{version}.tar.gz
 
+Patch1: gus-bluez4-update.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires: httpd >= 2.2.0
 Requires: obex-data-server >= 0.3
@@ -38,6 +40,7 @@
 
 %prep
 %setup -q
+%patch1 -p0 -b .bluez4
 
 %build
 %configure
@@ -97,6 +100,9 @@
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
 
 %changelog
+* Mon Sep 22 2008 - Bastien Nocera <bnocera at redhat.com> - 0.31-3
+- Add patch to port to BlueZ 4.x API
+
 * Sun May  4 2008 Matthias Clasen <mclasen at redhat.com> - 0.31-2
 - Fix source url
 



From corsepiu at fedoraproject.org  Mon Sep 22 17:19:56 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 22 Sep 2008 17:19:56 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple/F-8
	perl-Test-HTTP-Server-Simple.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080922171956.C34AF700FE@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1574/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-HTTP-Server-Simple.spec 
Log Message:
Import.


--- NEW FILE perl-Test-HTTP-Server-Simple.spec ---
Name:           perl-Test-HTTP-Server-Simple
Version:        0.09
Release:        3%{?dist}
Summary:        Test::More functions for HTTP::Server::Simple
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-HTTP-Server-Simple/
Source0:        http://www.cpan.org/authors/id/J/JE/JESSE/Test-HTTP-Server-Simple-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(HTTP::Server::Simple)
BuildRequires:  perl(Test::Builder)
BuildRequires:  perl(Test::Builder::Tester) >= 1.04
BuildRequires:  perl(Test::More)

# for improved tests
BuildRequires:  perl(Test::Pod) >= 1.14
BuildRequires:  perl(Test::Pod::Coverage) >= 1.04

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This mixin class provides methods to test an HTTP::Server::Simple-based web
server. Currently, it provides only one such method: started_ok.

%prep
%setup -q -n Test-HTTP-Server-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
* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.09-3
- BR: perl(Test::Pod), perl(Test::Pod::Coverage).

* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.09-2
- Adjust License-tag.

* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.09-1
- Remove bogus R: generated by cpanspec.
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Sep 2008 15:55:00 -0000	1.1
+++ .cvsignore	22 Sep 2008 17:19:26 -0000	1.2
@@ -0,0 +1 @@
+Test-HTTP-Server-Simple-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 15:55:00 -0000	1.1
+++ sources	22 Sep 2008 17:19:26 -0000	1.2
@@ -0,0 +1 @@
+fcc1f09e7e83dc171a3e3b197aa70c08  Test-HTTP-Server-Simple-0.09.tar.gz



From corsepiu at fedoraproject.org  Mon Sep 22 17:19:57 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 22 Sep 2008 17:19:57 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple/F-9
	perl-Test-HTTP-Server-Simple.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080922171957.0DDC3700FE@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1574/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-HTTP-Server-Simple.spec 
Log Message:
Import.


--- NEW FILE perl-Test-HTTP-Server-Simple.spec ---
Name:           perl-Test-HTTP-Server-Simple
Version:        0.09
Release:        3%{?dist}
Summary:        Test::More functions for HTTP::Server::Simple
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-HTTP-Server-Simple/
Source0:        http://www.cpan.org/authors/id/J/JE/JESSE/Test-HTTP-Server-Simple-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(HTTP::Server::Simple)
BuildRequires:  perl(Test::Builder)
BuildRequires:  perl(Test::Builder::Tester) >= 1.04
BuildRequires:  perl(Test::More)

# for improved tests
BuildRequires:  perl(Test::Pod) >= 1.14
BuildRequires:  perl(Test::Pod::Coverage) >= 1.04

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This mixin class provides methods to test an HTTP::Server::Simple-based web
server. Currently, it provides only one such method: started_ok.

%prep
%setup -q -n Test-HTTP-Server-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
* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.09-3
- BR: perl(Test::Pod), perl(Test::Pod::Coverage).

* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.09-2
- Adjust License-tag.

* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.09-1
- Remove bogus R: generated by cpanspec.
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Sep 2008 15:55:00 -0000	1.1
+++ .cvsignore	22 Sep 2008 17:19:26 -0000	1.2
@@ -0,0 +1 @@
+Test-HTTP-Server-Simple-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 15:55:00 -0000	1.1
+++ sources	22 Sep 2008 17:19:26 -0000	1.2
@@ -0,0 +1 @@
+fcc1f09e7e83dc171a3e3b197aa70c08  Test-HTTP-Server-Simple-0.09.tar.gz



From mclasen at fedoraproject.org  Mon Sep 22 17:24:57 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 17:24:57 +0000 (UTC)
Subject: rpms/gnome-devel-docs/devel .cvsignore, 1.5,
	1.6 gnome-devel-docs.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20080922172457.364D6700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-devel-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2663

Modified Files:
	.cvsignore gnome-devel-docs.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-devel-docs/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Sep 2008 04:54:38 -0000	1.5
+++ .cvsignore	22 Sep 2008 17:24:26 -0000	1.6
@@ -1 +1 @@
-gnome-devel-docs-2.23.1.tar.bz2
+gnome-devel-docs-2.24.0.tar.bz2


Index: gnome-devel-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-devel-docs/devel/gnome-devel-docs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-devel-docs.spec	4 Sep 2008 05:20:32 -0000	1.7
+++ gnome-devel-docs.spec	22 Sep 2008 17:24:26 -0000	1.8
@@ -1,11 +1,11 @@
 Summary: GNOME developer documentation
 Name: gnome-devel-docs
-Version: 2.23.1
+Version: 2.24.0
 Release: 1%{?dist}
 License: GFDL
 Group: System Environment/Libraries
 URL: http://library.gnome.org 
-Source: http://download.gnome.org/sources/gnome-devel-docs/2.23/%{name}-%{version}.tar.bz2  
+Source: http://download.gnome.org/sources/gnome-devel-docs/2.24/%{name}-%{version}.tar.bz2  
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildArch: noarch
 BuildRequires: gnome-doc-utils
@@ -51,6 +51,9 @@
 %{_datadir}/omf/platform-overview
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.1-1
 - Update to 2.23.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-devel-docs/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Sep 2008 04:54:38 -0000	1.5
+++ sources	22 Sep 2008 17:24:26 -0000	1.6
@@ -1 +1 @@
-44269a2ba6d8c12d2c16cd88ef0fc79e  gnome-devel-docs-2.23.1.tar.bz2
+c4204366c5278d6212d5e55d2e808fa7  gnome-devel-docs-2.24.0.tar.bz2



From rdieter at fedoraproject.org  Mon Sep 22 17:25:20 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 17:25:20 +0000 (UTC)
Subject: rpms/digikam/EL-5 digikam.spec,1.34,1.35
Message-ID: <20080922172520.00D37700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2755

Modified Files:
	digikam.spec 
Log Message:
EL doesn't have sqlite, used embedded copy



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/EL-5/digikam.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- digikam.spec	21 Sep 2008 21:12:31 -0000	1.34
+++ digikam.spec	22 Sep 2008 17:24:49 -0000	1.35
@@ -14,6 +14,8 @@
 BuildRequires:  gettext
 %if 0%{?fedora} > 6
 BuildRequires:  kdelibs3-devel
+%define _without_included_sqlite3 --without-included-sqlite3
+BuildRequires:  sqlite-devel
 %else
 BuildRequires:  kdelibs-devel libutempter-devel
 %endif
@@ -32,7 +34,6 @@
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
 BuildRequires:	libtool-ltdl-devel
 %endif
-BuildRequires:  sqlite-devel
 
 Provides:	digikamimageplugins = %{version}-%{release}
 Obsoletes:	digikamimageplugins < 0.9.1-2
@@ -73,7 +74,7 @@
 	--disable-warnings \
 	--disable-dependency-tracking \
 	--enable-final \
-	--without-included-sqlite3
+        %{?_without_included_sqlite3} 
 
 make %{?_smp_mflags}
 



From hadess at fedoraproject.org  Mon Sep 22 17:32:47 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 22 Sep 2008 17:32:47 +0000 (UTC)
Subject: rpms/gnome-user-share/devel .cvsignore, 1.12,
	1.13 gnome-user-share.spec, 1.39, 1.40 sources, 1.12, 1.13
Message-ID: <20080922173247.DF382700FE@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-serv3903

Modified Files:
	.cvsignore gnome-user-share.spec sources 
Log Message:
* Mon Sep 22 2008 - Bastien Nocera <bnocera at redhat.com> - 0.40-1
- Update to 0.40



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	7 Apr 2008 09:37:52 -0000	1.12
+++ .cvsignore	22 Sep 2008 17:32:17 -0000	1.13
@@ -1 +1 @@
-gnome-user-share-0.31.tar.gz
+gnome-user-share-0.40.tar.gz


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gnome-user-share.spec	22 Sep 2008 17:18:23 -0000	1.39
+++ gnome-user-share.spec	22 Sep 2008 17:32:17 -0000	1.40
@@ -1,11 +1,11 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
-Version: 0.31
-Release: 3%{?dist}
+Version: 0.40
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-user-share/0.31/%{name}-%{version}.tar.gz
+Source0: http://download.gnome.org/sources/gnome-user-share/0.40/%{name}-%{version}.tar.gz
 
 Patch1: gus-bluez4-update.patch
 
@@ -100,6 +100,9 @@
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
 
 %changelog
+* Mon Sep 22 2008 - Bastien Nocera <bnocera at redhat.com> - 0.40-1
+- Update to 0.40
+
 * Mon Sep 22 2008 - Bastien Nocera <bnocera at redhat.com> - 0.31-3
 - Add patch to port to BlueZ 4.x API
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	7 Apr 2008 09:37:52 -0000	1.12
+++ sources	22 Sep 2008 17:32:17 -0000	1.13
@@ -1 +1 @@
-0a4156961e5c3eddf7035786c165f9ee  gnome-user-share-0.31.tar.gz
+91b7454be8f88eef5896c4b7757935bd  gnome-user-share-0.40.tar.gz



From mclasen at fedoraproject.org  Mon Sep 22 17:34:06 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 17:34:06 +0000 (UTC)
Subject: rpms/gdm/devel .cvsignore, 1.71, 1.72 gdm.spec, 1.419, 1.420 sources,
	1.106, 1.107
Message-ID: <20080922173406.A0388700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4252

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- .cvsignore	9 Sep 2008 01:44:42 -0000	1.71
+++ .cvsignore	22 Sep 2008 17:33:36 -0000	1.72
@@ -1 +1 @@
-gdm-2.23.92.tar.bz2
+gdm-2.24.0.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -r1.419 -r1.420
--- gdm.spec	22 Sep 2008 15:08:56 -0000	1.419
+++ gdm.spec	22 Sep 2008 17:33:36 -0000	1.420
@@ -15,13 +15,13 @@
 
 Summary: The GNOME Display Manager
 Name: gdm
-Version: 2.23.92
-Release: 10%{?dist}
+Version: 2.24.0
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
 URL: http://download.gnome.org/sources/gdm
-Source: http://download.gnome.org/sources/gdm/2.23/gdm-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gdm/2.24/gdm-%{version}.tar.bz2
 Source1: gdm-pam
 Source2: gdm-autologin-pam
 Source3: gdmsetup-pam
@@ -322,6 +322,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep 22 2008 Ray Strode <rstrode at redhat.com> - 1:2.23.92-10
 - Flush X event queue after setting _XROOTPMAP_ID so there's
   no race with settings daemon reading the property


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/sources,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- sources	9 Sep 2008 01:44:42 -0000	1.106
+++ sources	22 Sep 2008 17:33:36 -0000	1.107
@@ -1 +1 @@
-5b2523ced7678632b79ee3780fc3e749  gdm-2.23.92.tar.bz2
+c38e3debe8a02ad385f1c7077d21de9e  gdm-2.24.0.tar.bz2



From rdieter at fedoraproject.org  Mon Sep 22 17:37:36 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 17:37:36 +0000 (UTC)
Subject: rpms/kipi-plugins/EL-5 .cvsignore, 1.8, 1.9 kipi-plugins.spec, 1.22,
	1.23 sources, 1.8, 1.9
Message-ID: <20080922173736.B52A6700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4743

Modified Files:
	.cvsignore kipi-plugins.spec sources 
Log Message:
sync w/F-9 branch
EL-5 fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	25 Jan 2007 00:33:12 -0000	1.8
+++ .cvsignore	22 Sep 2008 17:37:06 -0000	1.9
@@ -1,3 +1 @@
-kipi-plugins-0.1.2.tar.bz2
-kipi-plugins-0.1.3-rc1.tar.bz2
-kipi-plugins-0.1.3.tar.bz2
+kipi-plugins-0.1.5.tar.bz2


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/EL-5/kipi-plugins.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kipi-plugins.spec	25 Jan 2007 00:33:12 -0000	1.22
+++ kipi-plugins.spec	22 Sep 2008 17:37:06 -0000	1.23
@@ -1,42 +1,56 @@
 
+# Fedora review: http://bugzilla.redhat.com/171504
+
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%define kdepim3 kdepim3
+%else
+%define kdelibs3 kdelibs
+%define kdepim3 kdepim
+BuildRequires: libutempter-devel
+%endif
+
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
-Version: 0.1.3
+Version: 0.1.5
 Release: 2%{?dist}
 
-License: LGPL
+License: GPLv2+
 Group:   Applications/Multimedia
-Url:	 http://sourceforge.net/projects/kipi 
-Source0: http://dl.sourceforge.net/sourceforge/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2
+Url:	 http://www.kipi-plugins.org/
+Source0: http://downloads.sourceforge.net/sourceforge/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
-BuildRequires: libkipi-devel >= 0.1.5
-BuildRequires: kdelibs-devel 
-BuildRequires: exiv2-devel
+BuildRequires: %{kdelibs3}-devel
+BuildRequires: libkdcraw-devel >= 0.1.4
+BuildRequires: libkexiv2-devel >= 0.1.7
+BuildRequires: libkipi-devel >= 0.1.6
+BuildRequires: exiv2-devel 
 %if 0%{?fedora} > 6
-## ipod support currently busted, omit, for now. -- Rex
-#define _with_libgpod --with-libgpod
-#BuildRequires: libgpod-devel >= 0.4.2
+%define _with_libgpod --with-libgpod
+BuildRequires: libgpod-devel >= 0.4.2, glib2-devel
 %endif
 ## slideshow plugin
-BuildRequires: imlib2-devel
+#BuildRequires: imlib2-devel
 ## acquireimages, jpeglossless and rawconverter plugins
 BuildRequires: libtiff-devel
 ## kameraklient plugin
 BuildRequires: gphoto2-devel 
 ## htmlexport plugin (libgcrypt is a bogus extra dep from libxslt.la)
 BuildRequires: libxml2-devel libxslt-devel libgcrypt-devel 
+## calendar plugin (uses libkcal) 
+BuildRequires: %{kdepim3}-devel
 
 ## jpeglossless plugin 
 Requires: ImageMagick 
 
-## Technically, optional bits, but nice to have
+## optional bits
 # wallpaper plugin
-#Requires(hint): kdebase 
+#Requires(hint): kdebase3
 # cdarchiver plugin
 #Requires(hint): k3b
-%if "%{?fedora}" > "3"
+%if 0%{?fedora} > 3
 # rawconverter plugin 
 Requires(hint): dcraw
 %endif
@@ -46,47 +60,48 @@
 %description
 This package contains plugins to use with Kipi, the KDE Image Plugin
 Interface.  Currently implemented plugins are:
- * RawConverter       : A raw image converter for digital cameras 
-                        (requires dcraw).
+ * RawConverter       : Raw image converter for digital cameras
  * SlideShow          : Slideshow with effects ripped out from kslideshow
-                        and 3D effects using OpenGL.
+                        and 3D effects using OpenGL
  * MpegEncoder        : Create an MPEG slideshow from your images
-                        (requires mjpegtools).
- * ImagesGallery      : An HTML gallery generator.
- * PrintWizard        : A wizard to print images in various format.
+                        (requires mjpegtools)
+ * PrintWizard:	      : Print multiple images/index pages in one page
+ * ImagesGallery      : An HTML gallery generator
+ * PrintWizard        : Print images in various format
  * JpegLossLess       : Batch process your JPEG images without losing meta 
-                        information and compression.
- * CdArchiving        : Archive your albums on CD or DVD (requires k3b).
+                        information and compression
+ * CdArchiving        : Archive your albums on CD or DVD (requires k3b)
  * AcquireImages      : Acquire images interface, includes these parts:
-                           ScanImages (scanner management using Kooka).
-                           ScreenshotImages (Snap Screen based on KSnapshot).
- * Calendar           : A plugin to create calendars.
- * SendImages         : A plugin to send images by email, allowing resizing
-                        and recompressing before sending.
- * BatchProcessImages : A batch process images plugin. Icludes these parts:
-                           RenameImages (Image file names renaming).
-                           ConvertImages (Image files format converting).
-                           BorderImages (Add border to images).
-                           FilterImages (Enhancements using digital filters).
-                           ColorImages (Image color enhancement).
-                           EffectImages (Image transformation effects).
-                           ResizeImages (Basic/Prepare-to-print resizing).
-                           RecompressImages (Recompress JPEG/TIFF/PNG/TGA).
- * TimeAdjust         : Adjust image file Time and Date.
- * WallPaper          : Image to KDE Desktop (requires kdebase).
+                           ScanImages (scanner management using Kooka)
+                           ScreenshotImages (Snap Screen based on KSnapshot)
+ * Calendar           : Create calendars
+ * SendImages         : Send images by email, allowing resizing
+                        and recompressing before sending
+ * BatchProcessImages : Batch process images: 
+                           RenameImages (Image file names renaming)
+                           ConvertImages (Image files format converting)
+                           BorderImages (Add border to images)
+                           FilterImages (Enhancements using digital filters)
+                           ColorImages (Image color enhancement)
+                           EffectImages (Image transformation effects)
+                           ResizeImages (Basic/Prepare-to-print resizing)
+                           RecompressImages (Recompress JPEG/TIFF/PNG/TGA)
+ * TimeAdjust         : Adjust image file Time and Date
+ * WallPaper          : Image to KDE Desktop (requires kdebase)
  * FindImages         : Find dupplicate images in albums
- * GalleryExport      : Plugin to export images to a remote Gallery server
+ * GalleryExport      : Export images to a remote Gallery server
                         (http://gallery.sf.net)
- * FlickrExport       : Plugin to export images to a remote Flickr web service
+ * FlickrExport       : Export images to a remote Flickr web service
                         (http://www.flickr.com)
- * HTMLExport         : New plugin to export images collections into HTML page
- * SimpleViewerExport : Plugin to export images to SimpleViewer
+ * HTMLExport         : Export images collections into HTML page
+ * SimpleViewerExport : Export images to SimpleViewer
                          (http://www.airtightinteractive.com/simpleviewer/)
- * GPSSync            : Plugin to geolocalize pictures.
+ * GPSSync            : Geolocalize pictures.
 %if "%{?_with_libgpod:1}" == "1"
- * IpodExport         : Plugin to export pictures with an Ipod device.
+ * IpodExport         : Export pictures with an Ipod device
 %endif
- * MetadataEdit       : Plugin to edit EXIF and IPTC pictures metadata.
+ * MetadataEdit       : Edit EXIF and IPTC pictures metadata
+ * PicasaWebExport    : Export pictures to Picasa web service
 
 
 %prep
@@ -98,16 +113,14 @@
 
 %configure \
   --disable-rpath \
-  --disable-gcc-hidden-visibility \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependancy-tracking --enable-final \
+  --disable-dependancy-tracking --disable-final \
   --with-opengl
 
 make %{?_smp_mflags}
 
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -161,11 +174,75 @@
 %{_mandir}/man[^3]/*
 %{_datadir}/apps/kipi/
 %{_datadir}/apps/kipiplugin_*
-%config %{_datadir}/config*/*
+%{_datadir}/config*/*
 %{_datadir}/services/*.desktop
 
 
 %changelog
+* Thu Jul 17 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.5-2
+- respin
+
+* Fri Mar 14 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.5-1
+- kipi-plugins-0.1.5
+
+* Thu Feb 21 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.5-0.6.rc2
+- libXrandr patch
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.5-0.5.rc2
+- Autorebuild for GCC 4.3
+
+* Sat Feb 02 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.5-0.4.rc2
+- kipi-plugins-0.1.5-rc2
+
+* Sun Dec 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.5-0.3.rc1
+- kipi-plugins-0.1.5-rc1
+
+* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.5-0.2.beta1
+- BR: kdelibs3-devel 
+
+* Wed Nov 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.5-0.1.beta1
+- kipi-plugins-0.1.5-beta1
+- cleanup %%description
+
+* Wed Nov 21 2007 Todd Zullinger <tmz at pobox.com> 0.1.4-5
+- rebuild against libgpod-0.6.0
+
+* Wed Sep 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.4-4
+- rebuild against libkdcraw libkexiv2
+
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.4-3
+- License: GPLv2+
+
+* Tue Aug 21 2007 Todd Zullinger <tmz at pobox.com> 0.1.4-2
+- rebuild against libgpod-0.5.2
+
+* Mon Jul 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.4-1
+- kipi-plugins-0.1.4(final)
+
+* Wed Jun 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.4-0.5.beta3
+- LIB_KIO.patch
+
+* Wed Jun 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.4-0.4.beta2
+- --disable-final
+
+* Tue Jun 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.4-0.3.beta2
+- BR: libkdcraw-devel >= 0.1.1
+
+* Tue Jun 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.4-0.2.beta2
+- kipi-plugins-0.1.4-beta2
+
+* Tue Jun 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.4-0.1.beta1
+- kipi-plugins-0.1.4-beta1
+
+* Mon May 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.3-5
+- respin against libkexiv2-0.1.5
+
+* Tue May 01 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.3-4
+- --with-libgpod (with patch)
+
+* Mon Apr 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.3-3
+- respin against exiv2-0.14
+
 * Wed Jan 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.3-2
 - drop --with-libgpod, still busted
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	25 Jan 2007 00:33:12 -0000	1.8
+++ sources	22 Sep 2008 17:37:06 -0000	1.9
@@ -1 +1 @@
-7b8e55906b5d08280ab3ad3c2b43e8ab  kipi-plugins-0.1.3.tar.bz2
+099122d802530d22e69b314b3e97e30b  kipi-plugins-0.1.5.tar.bz2



From hadess at fedoraproject.org  Mon Sep 22 17:41:01 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 22 Sep 2008 17:41:01 +0000 (UTC)
Subject: rpms/gnome-user-share/devel gnome-user-share.spec,1.40,1.41
Message-ID: <20080922174101.4F138700FE@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-serv5290

Modified Files:
	gnome-user-share.spec 
Log Message:
* Mon Sep 22 2008 - Bastien Nocera <bnocera at redhat.com> - 0.40-2
- Add missing intltool BR



Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gnome-user-share.spec	22 Sep 2008 17:32:17 -0000	1.40
+++ gnome-user-share.spec	22 Sep 2008 17:40:31 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 0.40
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
@@ -19,7 +19,7 @@
 BuildRequires: libselinux-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: gettext
-BuildRequires: perl(XML::Parser)
+BuildRequires: perl(XML::Parser) intltool
 Requires(post): GConf2
 Requires(pre): GConf2
 Requires(preun): GConf2
@@ -100,6 +100,9 @@
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
 
 %changelog
+* Mon Sep 22 2008 - Bastien Nocera <bnocera at redhat.com> - 0.40-2
+- Add missing intltool BR
+
 * Mon Sep 22 2008 - Bastien Nocera <bnocera at redhat.com> - 0.40-1
 - Update to 0.40
 



From mtasaka at fedoraproject.org  Mon Sep 22 17:43:21 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 22 Sep 2008 17:43:21 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.297, 1.298 jd.spec, 1.337, 1.338 sources, 
	1.298, 1.299
Message-ID: <20080922174321.A7631700FE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5963/F-9

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2361



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- .cvsignore	22 Sep 2008 07:18:38 -0000	1.297
+++ .cvsignore	22 Sep 2008 17:42:51 -0000	1.298
@@ -1 +1 @@
-jd-2.0.3-svn2360_trunk.tgz
+jd-2.0.3-svn2361_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- jd.spec	22 Sep 2008 07:18:38 -0000	1.337
+++ jd.spec	22 Sep 2008 17:42:51 -0000	1.338
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.3
-%define         strtag        svn2360_trunk
+%define         strtag        svn2361_trunk
 %define         repoid        32951
 # Define this if this is pre-version
 %define         pre_release   1
@@ -136,8 +136,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Sep 22 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2360
+* Tue Sep 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2361
 
 * Sat Sep 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.2-1
 - 2.0.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- sources	22 Sep 2008 07:18:38 -0000	1.298
+++ sources	22 Sep 2008 17:42:51 -0000	1.299
@@ -1 +1 @@
-8d2ed4e9d6d8c7db2fecbcd0e50c4307  jd-2.0.3-svn2360_trunk.tgz
+0fa8ceddd2f63c457c80a7e2ba231e29  jd-2.0.3-svn2361_trunk.tgz



From mtasaka at fedoraproject.org  Mon Sep 22 17:43:21 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 22 Sep 2008 17:43:21 +0000 (UTC)
Subject: rpms/jd/F-8 .cvsignore, 1.290, 1.291 jd.spec, 1.326, 1.327 sources, 
	1.291, 1.292
Message-ID: <20080922174321.80085700FE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5963/F-8

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2361



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- .cvsignore	22 Sep 2008 07:18:37 -0000	1.290
+++ .cvsignore	22 Sep 2008 17:42:51 -0000	1.291
@@ -1 +1 @@
-jd-2.0.3-svn2360_trunk.tgz
+jd-2.0.3-svn2361_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- jd.spec	22 Sep 2008 07:18:37 -0000	1.326
+++ jd.spec	22 Sep 2008 17:42:51 -0000	1.327
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.3
-%define         strtag        svn2360_trunk
+%define         strtag        svn2361_trunk
 %define         repoid        32951
 # Define this if this is pre-version
 %define         pre_release   1
@@ -136,8 +136,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Sep 22 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2360
+* Tue Sep 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2361
 
 * Sat Sep 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.2-1
 - 2.0.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/sources,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- sources	22 Sep 2008 07:18:37 -0000	1.291
+++ sources	22 Sep 2008 17:42:51 -0000	1.292
@@ -1 +1 @@
-8d2ed4e9d6d8c7db2fecbcd0e50c4307  jd-2.0.3-svn2360_trunk.tgz
+0fa8ceddd2f63c457c80a7e2ba231e29  jd-2.0.3-svn2361_trunk.tgz



From mtasaka at fedoraproject.org  Mon Sep 22 17:43:21 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 22 Sep 2008 17:43:21 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.297, 1.298 jd.spec, 1.347, 1.348 sources,
	1.298, 1.299
Message-ID: <20080922174321.EBACE700FE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5963/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2361



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- .cvsignore	22 Sep 2008 07:18:38 -0000	1.297
+++ .cvsignore	22 Sep 2008 17:42:51 -0000	1.298
@@ -1 +1 @@
-jd-2.0.3-svn2360_trunk.tgz
+jd-2.0.3-svn2361_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- jd.spec	22 Sep 2008 07:18:38 -0000	1.347
+++ jd.spec	22 Sep 2008 17:42:51 -0000	1.348
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.3
-%define         strtag        svn2360_trunk
+%define         strtag        svn2361_trunk
 %define         repoid        32951
 # Define this if this is pre-version
 %define         pre_release   1
@@ -136,8 +136,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Sep 22 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2360
+* Tue Sep 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2361
 
 * Sat Sep 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.2-1
 - 2.0.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- sources	22 Sep 2008 07:18:38 -0000	1.298
+++ sources	22 Sep 2008 17:42:51 -0000	1.299
@@ -1 +1 @@
-8d2ed4e9d6d8c7db2fecbcd0e50c4307  jd-2.0.3-svn2360_trunk.tgz
+0fa8ceddd2f63c457c80a7e2ba231e29  jd-2.0.3-svn2361_trunk.tgz



From mclasen at fedoraproject.org  Mon Sep 22 17:43:23 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 17:43:23 +0000 (UTC)
Subject: rpms/yelp/devel .cvsignore, 1.46, 1.47 sources, 1.48, 1.49 yelp.spec,
	1.144, 1.145
Message-ID: <20080922174323.6A571700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/yelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5944

Modified Files:
	.cvsignore sources yelp.spec 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yelp/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	2 Sep 2008 03:20:31 -0000	1.46
+++ .cvsignore	22 Sep 2008 17:42:53 -0000	1.47
@@ -1 +1 @@
-yelp-2.23.91.tar.bz2
+yelp-2.24.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yelp/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	2 Sep 2008 03:20:31 -0000	1.48
+++ sources	22 Sep 2008 17:42:53 -0000	1.49
@@ -1 +1 @@
-32d4edbb5401e0745ecbdc2ac1101082  yelp-2.23.91.tar.bz2
+1d308838bc6a492ac74ff89f58b0fc1b  yelp-2.24.0.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/extras/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- yelp.spec	2 Sep 2008 03:20:31 -0000	1.144
+++ yelp.spec	22 Sep 2008 17:42:53 -0000	1.145
@@ -19,9 +19,9 @@
 
 Summary: A system documentation reader from the Gnome project
 Name: yelp
-Version: 2.23.91
+Version: 2.24.0
 Release: 1%{?dist}
-Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.22/%{name}-%{version}.tar.bz2
+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
 Patch1: yelp-2.15.5-fedora-docs.patch
@@ -157,6 +157,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update ot 2.24.0
+
 * Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 



From rdieter at fedoraproject.org  Mon Sep 22 17:46:07 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 17:46:07 +0000 (UTC)
Subject: rpms/digikam/EL-5 digikam.spec,1.35,1.36
Message-ID: <20080922174607.814B9700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6703

Modified Files:
	digikam.spec 
Log Message:
expliticly undef _without_included_sqlite3



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/EL-5/digikam.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- digikam.spec	22 Sep 2008 17:24:49 -0000	1.35
+++ digikam.spec	22 Sep 2008 17:45:37 -0000	1.36
@@ -17,6 +17,7 @@
 %define _without_included_sqlite3 --without-included-sqlite3
 BuildRequires:  sqlite-devel
 %else
+%undef _without_included_sqlite3
 BuildRequires:  kdelibs-devel libutempter-devel
 %endif
 %if 0%{?fedora} > 9



From lucilanga at fedoraproject.org  Mon Sep 22 17:46:12 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 22 Sep 2008 17:46:12 +0000 (UTC)
Subject: rpms/LinLog/devel .cvsignore, 1.2, 1.3 LinLog.desktop, 1.1,
	1.2 LinLog.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080922174612.38E62700FE@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/LinLog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6828

Modified Files:
	.cvsignore LinLog.desktop LinLog.spec sources 
Log Message:
* Mon Sep 22 2008 Lucian Langa <cooly at gnome.eu.org> - 0.3.1-1
- new upstream 0.3.1
- add missing sql files
- fixed rpm macros
- fix build requires
- fix desktop file


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/LinLog/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Feb 2008 15:14:11 -0000	1.2
+++ .cvsignore	22 Sep 2008 17:45:41 -0000	1.3
@@ -1 +1 @@
-LinLog-0.3.tar.gz
+LinLog-0.3.1.tar.gz


Index: LinLog.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/LinLog/devel/LinLog.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LinLog.desktop	29 Feb 2008 15:14:11 -0000	1.1
+++ LinLog.desktop	22 Sep 2008 17:45:41 -0000	1.2
@@ -4,7 +4,7 @@
 GenericName=LinLogBook
 Comment=A ham radio logbook for linux
 Exec=linlog
-Icon=LinLog.png
+Icon=LinLog
 Terminal=false
 Type=Application
 Categories=HamRadio;


Index: LinLog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/LinLog/devel/LinLog.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LinLog.spec	29 Feb 2008 15:14:11 -0000	1.1
+++ LinLog.spec	22 Sep 2008 17:45:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           LinLog
-Version:        0.3
-Release:        4%{?dist}
+Version:        0.3.1
+Release:        1%{?dist}
 Summary:        A ham radio logbook for Linux
 
 Group:          Applications/Communications
@@ -11,7 +11,7 @@
 Source2:        %{name}.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt4-devel >= 4.3, sqlite-devel >= 3, desktop-file-utils
+BuildRequires:  qt4-devel >= 4.3, sqlite-devel >= 3, desktop-file-utils, libstdc++-devel 
 #Requires:       
 
 %description
@@ -31,14 +31,18 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/bin
-install -m 755 bin/linlog $RPM_BUILD_ROOT/usr/bin/linlog
+install -p -d $RPM_BUILD_ROOT%{_bindir}
+install -p -m 755 bin/linlog $RPM_BUILD_ROOT%{_bindir}/linlog
 
 # no upstream .desktop or icon yet
-mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
-desktop-file-install --vendor="fedora" \
+desktop-file-install \
         --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 644 BaseTables.sql $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 644 Example.sql $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 644 Statistics.sql $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -50,8 +54,17 @@
 %{_bindir}/linlog
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/*%{name}.desktop
+%{_datadir}/%{name}
+%{_datadir}/%{name}/*.sql
 
 %changelog
+* Mon Sep 22 2008 Lucian Langa <cooly at gnome.eu.org> - 0.3.1-1
+- new upstream 0.3.1
+- add missing sql files
+- fixed rpm macros
+- fix build requires
+- fix desktop file
+
 * Sat Feb 25 2008 Robert 'Bob' Jensen <bob at bobjensen.com> 0.3-4
 - Correct Lic. per Review
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/LinLog/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Feb 2008 15:14:11 -0000	1.2
+++ sources	22 Sep 2008 17:45:41 -0000	1.3
@@ -1 +1 @@
-a19c457eacc0a85382ced5a01123aafd  LinLog-0.3.tar.gz
+c3e0d9b66392ae4073726abebb4a02bf  LinLog-0.3.1.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 22 17:47:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 17:47:14 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922174714.72AA7208DA3@bastion.fedora.phx.redhat.com>

bjensen has set the approveacls acl on LinLog (Fedora devel) to Approved for bjensen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 17:47:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 17:47:20 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922174721.1CF8B208DAA@bastion.fedora.phx.redhat.com>

bjensen has set the approveacls acl on LinLog (Fedora 8) to Approved for bjensen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 17:47:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 17:47:27 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922174727.8CC65208DAD@bastion.fedora.phx.redhat.com>

bjensen has set the commit acl on LinLog (Fedora 8) to Approved for bjensen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Mon Sep 22 17:47:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 17:47:39 +0000
Subject: [pkgdb] LinLog had acl change status
Message-ID: <20080922174739.B364B208DA6@bastion.fedora.phx.redhat.com>

bjensen has set the commit acl on LinLog (Fedora 9) to Approved for bjensen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/LinLog



From rdieter at fedoraproject.org  Mon Sep 22 17:48:32 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 17:48:32 +0000 (UTC)
Subject: rpms/digikam/EL-5 digikam.spec,1.36,1.37
Message-ID: <20080922174832.E1C63700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7256

Modified Files:
	digikam.spec 
Log Message:
revert bogusity



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/EL-5/digikam.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- digikam.spec	22 Sep 2008 17:45:37 -0000	1.36
+++ digikam.spec	22 Sep 2008 17:48:02 -0000	1.37
@@ -17,7 +17,6 @@
 %define _without_included_sqlite3 --without-included-sqlite3
 BuildRequires:  sqlite-devel
 %else
-%undef _without_included_sqlite3
 BuildRequires:  kdelibs-devel libutempter-devel
 %endif
 %if 0%{?fedora} > 9



From mclasen at fedoraproject.org  Mon Sep 22 17:49:06 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 17:49:06 +0000 (UTC)
Subject: rpms/empathy/devel .cvsignore, 1.21, 1.22 empathy.spec, 1.35,
	1.36 sources, 1.21, 1.22
Message-ID: <20080922174906.34CFF700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7372

Modified Files:
	.cvsignore empathy.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	10 Sep 2008 01:41:48 -0000	1.21
+++ .cvsignore	22 Sep 2008 17:48:35 -0000	1.22
@@ -1 +1 @@
-empathy-2.23.92.tar.bz2
+empathy-2.24.0.tar.bz2


Index: empathy.spec
===================================================================
RCS file: /cvs/extras/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- empathy.spec	10 Sep 2008 01:41:48 -0000	1.35
+++ empathy.spec	22 Sep 2008 17:48:35 -0000	1.36
@@ -9,7 +9,7 @@
 %global	enchant_version		1.2.0		
 
 Name:		empathy
-Version:	2.23.92
+Version:	2.24.0
 Release:	1%{?dist}
 Summary:	GNOME Instant Messaging Client
 
@@ -17,7 +17,7 @@
 License:	GPLv2+
 URL:		http://live.gnome.org/Empathy
 
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.23/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.24/%{name}-%{version}.tar.bz2
 Source1:	%{name}-README.ConnectionManagers
 
 ## Fedora-specific, to automagically transition the profile names. (#459282)
@@ -224,6 +224,9 @@
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Tue Sep  9 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/empathy/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	10 Sep 2008 01:41:48 -0000	1.21
+++ sources	22 Sep 2008 17:48:35 -0000	1.22
@@ -1 +1 @@
-6bc1f3b9562e7645391a0950d1c2462a  empathy-2.23.92.tar.bz2
+89e6dc430ad198c8044f261645d8bc6c  empathy-2.24.0.tar.bz2



From hadess at fedoraproject.org  Mon Sep 22 17:50:11 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 22 Sep 2008 17:50:11 +0000 (UTC)
Subject: rpms/gnome-user-share/devel gnome-user-share.spec,1.41,1.42
Message-ID: <20080922175011.92858700FE@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-serv7536

Modified Files:
	gnome-user-share.spec 
Log Message:
* Mon Sep 22 2008 - Bastien Nocera <bnocera at redhat.com> - 0.40-3
- Add missing libnotify BR



Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gnome-user-share.spec	22 Sep 2008 17:40:31 -0000	1.41
+++ gnome-user-share.spec	22 Sep 2008 17:49:41 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 0.40
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
@@ -18,6 +18,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: libselinux-devel
 BuildRequires: dbus-glib-devel
+BuildRequires: libnotify-devel
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser) intltool
 Requires(post): GConf2
@@ -100,6 +101,9 @@
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
 
 %changelog
+* Mon Sep 22 2008 - Bastien Nocera <bnocera at redhat.com> - 0.40-3
+- Add missing libnotify BR
+
 * Mon Sep 22 2008 - Bastien Nocera <bnocera at redhat.com> - 0.40-2
 - Add missing intltool BR
 



From rdieter at fedoraproject.org  Mon Sep 22 17:50:58 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 17:50:58 +0000 (UTC)
Subject: rpms/kipi-plugins/EL-5 kipi-plugins.spec,1.23,1.24
Message-ID: <20080922175058.2F374700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7734

Modified Files:
	kipi-plugins.spec 
Log Message:
wow, no kdepim-devel on rhel5, ok.



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/EL-5/kipi-plugins.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- kipi-plugins.spec	22 Sep 2008 17:37:06 -0000	1.23
+++ kipi-plugins.spec	22 Sep 2008 17:50:27 -0000	1.24
@@ -6,7 +6,6 @@
 %define kdepim3 kdepim3
 %else
 %define kdelibs3 kdelibs
-%define kdepim3 kdepim
 BuildRequires: libutempter-devel
 %endif
 
@@ -40,7 +39,7 @@
 ## htmlexport plugin (libgcrypt is a bogus extra dep from libxslt.la)
 BuildRequires: libxml2-devel libxslt-devel libgcrypt-devel 
 ## calendar plugin (uses libkcal) 
-BuildRequires: %{kdepim3}-devel
+%{?kdepim3:BuildRequires: %{kdepim3}-devel}
 
 ## jpeglossless plugin 
 Requires: ImageMagick 
@@ -74,7 +73,9 @@
  * AcquireImages      : Acquire images interface, includes these parts:
                            ScanImages (scanner management using Kooka)
                            ScreenshotImages (Snap Screen based on KSnapshot)
+%if 0%{?kdepim3:1}
  * Calendar           : Create calendars
+%endif
  * SendImages         : Send images by email, allowing resizing
                         and recompressing before sending
  * BatchProcessImages : Batch process images: 



From dwalsh at fedoraproject.org  Mon Sep 22 17:53:00 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 22 Sep 2008 17:53:00 +0000 (UTC)
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.164,
	1.165 libselinux.spec, 1.341, 1.342
Message-ID: <20080922175300.DBD2A700FE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8163

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.71-5
- Add flask definitions for open, X and nlmsg_tty_audit


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- libselinux-rhat.patch	9 Sep 2008 20:24:22 -0000	1.164
+++ libselinux-rhat.patch	22 Sep 2008 17:52:29 -0000	1.165
@@ -1,11 +1,302 @@
+diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/av_permissions.h libselinux-2.0.71/include/selinux/av_permissions.h
+--- nsalibselinux/include/selinux/av_permissions.h	2008-08-28 09:34:24.000000000 -0400
++++ libselinux-2.0.71/include/selinux/av_permissions.h	2008-09-22 13:27:27.000000000 -0400
+@@ -85,6 +85,7 @@
+ #define DIR__REPARENT                             0x00080000UL
+ #define DIR__SEARCH                               0x00100000UL
+ #define DIR__RMDIR                                0x00200000UL
++#define DIR__OPEN                                 0x00400000UL
+ #define FILE__IOCTL                               0x00000001UL
+ #define FILE__READ                                0x00000002UL
+ #define FILE__WRITE                               0x00000004UL
+@@ -105,6 +106,7 @@
+ #define FILE__EXECUTE_NO_TRANS                    0x00020000UL
+ #define FILE__ENTRYPOINT                          0x00040000UL
+ #define FILE__EXECMOD                             0x00080000UL
++#define FILE__OPEN                                0x00100000UL
+ #define LNK_FILE__IOCTL                           0x00000001UL
+ #define LNK_FILE__READ                            0x00000002UL
+ #define LNK_FILE__WRITE                           0x00000004UL
+@@ -142,6 +144,7 @@
+ #define CHR_FILE__EXECUTE_NO_TRANS                0x00020000UL
+ #define CHR_FILE__ENTRYPOINT                      0x00040000UL
+ #define CHR_FILE__EXECMOD                         0x00080000UL
++#define CHR_FILE__OPEN                            0x00100000UL
+ #define BLK_FILE__IOCTL                           0x00000001UL
+ #define BLK_FILE__READ                            0x00000002UL
+ #define BLK_FILE__WRITE                           0x00000004UL
+@@ -159,6 +162,7 @@
+ #define BLK_FILE__SWAPON                          0x00004000UL
+ #define BLK_FILE__QUOTAON                         0x00008000UL
+ #define BLK_FILE__MOUNTON                         0x00010000UL
++#define BLK_FILE__OPEN                            0x00020000UL
+ #define SOCK_FILE__IOCTL                          0x00000001UL
+ #define SOCK_FILE__READ                           0x00000002UL
+ #define SOCK_FILE__WRITE                          0x00000004UL
+@@ -193,6 +197,7 @@
+ #define FIFO_FILE__SWAPON                         0x00004000UL
+ #define FIFO_FILE__QUOTAON                        0x00008000UL
+ #define FIFO_FILE__MOUNTON                        0x00010000UL
++#define FIFO_FILE__OPEN                           0x00020000UL
+ #define FD__USE                                   0x00000001UL
+ #define SOCKET__IOCTL                             0x00000001UL
+ #define SOCKET__READ                              0x00000002UL
+@@ -547,91 +552,102 @@
+ #define PASSWD__CHSH                              0x00000004UL
+ #define PASSWD__ROOTOK                            0x00000008UL
+ #define PASSWD__CRONTAB                           0x00000010UL
+-#define DRAWABLE__CREATE                          0x00000001UL
+-#define DRAWABLE__DESTROY                         0x00000002UL
+-#define DRAWABLE__DRAW                            0x00000004UL
+-#define DRAWABLE__COPY                            0x00000008UL
+-#define DRAWABLE__GETATTR                         0x00000010UL
+-#define GC__CREATE                                0x00000001UL
+-#define GC__FREE                                  0x00000002UL
+-#define GC__GETATTR                               0x00000004UL
+-#define GC__SETATTR                               0x00000008UL
+-#define WINDOW__ADDCHILD                          0x00000001UL
+-#define WINDOW__CREATE                            0x00000002UL
+-#define WINDOW__DESTROY                           0x00000004UL
+-#define WINDOW__MAP                               0x00000008UL
+-#define WINDOW__UNMAP                             0x00000010UL
+-#define WINDOW__CHSTACK                           0x00000020UL
+-#define WINDOW__CHPROPLIST                        0x00000040UL
+-#define WINDOW__CHPROP                            0x00000080UL
+-#define WINDOW__LISTPROP                          0x00000100UL
+-#define WINDOW__GETATTR                           0x00000200UL
+-#define WINDOW__SETATTR                           0x00000400UL
+-#define WINDOW__SETFOCUS                          0x00000800UL
+-#define WINDOW__MOVE                              0x00001000UL
+-#define WINDOW__CHSELECTION                       0x00002000UL
+-#define WINDOW__CHPARENT                          0x00004000UL
+-#define WINDOW__CTRLLIFE                          0x00008000UL
+-#define WINDOW__ENUMERATE                         0x00010000UL
+-#define WINDOW__TRANSPARENT                       0x00020000UL
+-#define WINDOW__MOUSEMOTION                       0x00040000UL
+-#define WINDOW__CLIENTCOMEVENT                    0x00080000UL
+-#define WINDOW__INPUTEVENT                        0x00100000UL
+-#define WINDOW__DRAWEVENT                         0x00200000UL
+-#define WINDOW__WINDOWCHANGEEVENT                 0x00400000UL
+-#define WINDOW__WINDOWCHANGEREQUEST               0x00800000UL
+-#define WINDOW__SERVERCHANGEEVENT                 0x01000000UL
+-#define WINDOW__EXTENSIONEVENT                    0x02000000UL
+-#define FONT__LOAD                                0x00000001UL
+-#define FONT__FREE                                0x00000002UL
+-#define FONT__GETATTR                             0x00000004UL
+-#define FONT__USE                                 0x00000008UL
+-#define COLORMAP__CREATE                          0x00000001UL
+-#define COLORMAP__FREE                            0x00000002UL
+-#define COLORMAP__INSTALL                         0x00000004UL
+-#define COLORMAP__UNINSTALL                       0x00000008UL
+-#define COLORMAP__LIST                            0x00000010UL
+-#define COLORMAP__READ                            0x00000020UL
+-#define COLORMAP__STORE                           0x00000040UL
+-#define COLORMAP__GETATTR                         0x00000080UL
+-#define COLORMAP__SETATTR                         0x00000100UL
+-#define PROPERTY__CREATE                          0x00000001UL
+-#define PROPERTY__FREE                            0x00000002UL
+-#define PROPERTY__READ                            0x00000004UL
+-#define PROPERTY__WRITE                           0x00000008UL
+-#define CURSOR__CREATE                            0x00000001UL
+-#define CURSOR__CREATEGLYPH                       0x00000002UL
+-#define CURSOR__FREE                              0x00000004UL
+-#define CURSOR__ASSIGN                            0x00000008UL
+-#define CURSOR__SETATTR                           0x00000010UL
+-#define XCLIENT__KILL                             0x00000001UL
+-#define XINPUT__LOOKUP                            0x00000001UL
+-#define XINPUT__GETATTR                           0x00000002UL
+-#define XINPUT__SETATTR                           0x00000004UL
+-#define XINPUT__SETFOCUS                          0x00000008UL
+-#define XINPUT__WARPPOINTER                       0x00000010UL
+-#define XINPUT__ACTIVEGRAB                        0x00000020UL
+-#define XINPUT__PASSIVEGRAB                       0x00000040UL
+-#define XINPUT__UNGRAB                            0x00000080UL
+-#define XINPUT__BELL                              0x00000100UL
+-#define XINPUT__MOUSEMOTION                       0x00000200UL
+-#define XINPUT__RELABELINPUT                      0x00000400UL
+-#define XSERVER__SCREENSAVER                      0x00000001UL
+-#define XSERVER__GETHOSTLIST                      0x00000002UL
+-#define XSERVER__SETHOSTLIST                      0x00000004UL
+-#define XSERVER__GETFONTPATH                      0x00000008UL
+-#define XSERVER__SETFONTPATH                      0x00000010UL
+-#define XSERVER__GETATTR                          0x00000020UL
+-#define XSERVER__GRAB                             0x00000040UL
+-#define XSERVER__UNGRAB                           0x00000080UL
+-#define XEXTENSION__QUERY                         0x00000001UL
+-#define XEXTENSION__USE                           0x00000002UL
+-#define PAX__PAGEEXEC                             0x00000001UL
+-#define PAX__EMUTRAMP                             0x00000002UL
+-#define PAX__MPROTECT                             0x00000004UL
+-#define PAX__RANDMMAP                             0x00000008UL
+-#define PAX__RANDEXEC                             0x00000010UL
+-#define PAX__SEGMEXEC                             0x00000020UL
++#define X_DRAWABLE__CREATE                        0x00000001UL
++#define X_DRAWABLE__DESTROY                       0x00000002UL
++#define X_DRAWABLE__READ                          0x00000004UL
++#define X_DRAWABLE__WRITE                         0x00000008UL
++#define X_DRAWABLE__BLEND                         0x00000010UL
++#define X_DRAWABLE__GETATTR                       0x00000020UL
++#define X_DRAWABLE__SETATTR                       0x00000040UL
++#define X_DRAWABLE__LIST_CHILD                    0x00000080UL
++#define X_DRAWABLE__ADD_CHILD                     0x00000100UL
++#define X_DRAWABLE__REMOVE_CHILD                  0x00000200UL
++#define X_DRAWABLE__LIST_PROPERTY                 0x00000400UL
++#define X_DRAWABLE__GET_PROPERTY                  0x00000800UL
++#define X_DRAWABLE__SET_PROPERTY                  0x00001000UL
++#define X_DRAWABLE__MANAGE                        0x00002000UL
++#define X_DRAWABLE__OVERRIDE                      0x00004000UL
++#define X_DRAWABLE__SHOW                          0x00008000UL
++#define X_DRAWABLE__HIDE                          0x00010000UL
++#define X_DRAWABLE__SEND                          0x00020000UL
++#define X_DRAWABLE__RECEIVE                       0x00040000UL
++#define X_SCREEN__GETATTR                         0x00000001UL
++#define X_SCREEN__SETATTR                         0x00000002UL
++#define X_SCREEN__HIDE_CURSOR                     0x00000004UL
++#define X_SCREEN__SHOW_CURSOR                     0x00000008UL
++#define X_SCREEN__SAVER_GETATTR                   0x00000010UL
++#define X_SCREEN__SAVER_SETATTR                   0x00000020UL
++#define X_SCREEN__SAVER_HIDE                      0x00000040UL
++#define X_SCREEN__SAVER_SHOW                      0x00000080UL
++#define X_GC__CREATE                              0x00000001UL
++#define X_GC__DESTROY                             0x00000002UL
++#define X_GC__GETATTR                             0x00000004UL
++#define X_GC__SETATTR                             0x00000008UL
++#define X_GC__USE                                 0x00000010UL
++#define X_FONT__CREATE                            0x00000001UL
++#define X_FONT__DESTROY                           0x00000002UL
++#define X_FONT__GETATTR                           0x00000004UL
++#define X_FONT__ADD_GLYPH                         0x00000008UL
++#define X_FONT__REMOVE_GLYPH                      0x00000010UL
++#define X_FONT__USE                               0x00000020UL
++#define X_COLORMAP__CREATE                        0x00000001UL
++#define X_COLORMAP__DESTROY                       0x00000002UL
++#define X_COLORMAP__READ                          0x00000004UL
++#define X_COLORMAP__WRITE                         0x00000008UL
++#define X_COLORMAP__GETATTR                       0x00000010UL
++#define X_COLORMAP__ADD_COLOR                     0x00000020UL
++#define X_COLORMAP__REMOVE_COLOR                  0x00000040UL
++#define X_COLORMAP__INSTALL                       0x00000080UL
++#define X_COLORMAP__UNINSTALL                     0x00000100UL
++#define X_COLORMAP__USE                           0x00000200UL
++#define X_PROPERTY__CREATE                        0x00000001UL
++#define X_PROPERTY__DESTROY                       0x00000002UL
++#define X_PROPERTY__READ                          0x00000004UL
++#define X_PROPERTY__WRITE                         0x00000008UL
++#define X_PROPERTY__APPEND                        0x00000010UL
++#define X_PROPERTY__GETATTR                       0x00000020UL
++#define X_PROPERTY__SETATTR                       0x00000040UL
++#define X_SELECTION__READ                         0x00000001UL
++#define X_SELECTION__WRITE                        0x00000002UL
++#define X_SELECTION__GETATTR                      0x00000004UL
++#define X_SELECTION__SETATTR                      0x00000008UL
++#define X_CURSOR__CREATE                          0x00000001UL
++#define X_CURSOR__DESTROY                         0x00000002UL
++#define X_CURSOR__READ                            0x00000004UL
++#define X_CURSOR__WRITE                           0x00000008UL
++#define X_CURSOR__GETATTR                         0x00000010UL
++#define X_CURSOR__SETATTR                         0x00000020UL
++#define X_CURSOR__USE                             0x00000040UL
++#define X_CLIENT__DESTROY                         0x00000001UL
++#define X_CLIENT__GETATTR                         0x00000002UL
++#define X_CLIENT__SETATTR                         0x00000004UL
++#define X_CLIENT__MANAGE                          0x00000008UL
++#define X_DEVICE__GETATTR                         0x00000001UL
++#define X_DEVICE__SETATTR                         0x00000002UL
++#define X_DEVICE__USE                             0x00000004UL
++#define X_DEVICE__READ                            0x00000008UL
++#define X_DEVICE__WRITE                           0x00000010UL
++#define X_DEVICE__GETFOCUS                        0x00000020UL
++#define X_DEVICE__SETFOCUS                        0x00000040UL
++#define X_DEVICE__BELL                            0x00000080UL
++#define X_DEVICE__FORCE_CURSOR                    0x00000100UL
++#define X_DEVICE__FREEZE                          0x00000200UL
++#define X_DEVICE__GRAB                            0x00000400UL
++#define X_DEVICE__MANAGE                          0x00000800UL
++#define X_SERVER__GETATTR                         0x00000001UL
++#define X_SERVER__SETATTR                         0x00000002UL
++#define X_SERVER__RECORD                          0x00000004UL
++#define X_SERVER__DEBUG                           0x00000008UL
++#define X_SERVER__GRAB                            0x00000010UL
++#define X_SERVER__MANAGE                          0x00000020UL
++#define X_EXTENSION__QUERY                        0x00000001UL
++#define X_EXTENSION__USE                          0x00000002UL
++#define X_RESOURCE__READ                          0x00000001UL
++#define X_RESOURCE__WRITE                         0x00000002UL
++#define X_EVENT__SEND                             0x00000001UL
++#define X_EVENT__RECEIVE                          0x00000002UL
++#define X_SYNTHETIC_EVENT__SEND                   0x00000001UL
++#define X_SYNTHETIC_EVENT__RECEIVE                0x00000002UL
+ #define NETLINK_ROUTE_SOCKET__IOCTL               0x00000001UL
+ #define NETLINK_ROUTE_SOCKET__READ                0x00000002UL
+ #define NETLINK_ROUTE_SOCKET__WRITE               0x00000004UL
+@@ -798,6 +814,7 @@
+ #define NETLINK_AUDIT_SOCKET__NLMSG_WRITE         0x00800000UL
+ #define NETLINK_AUDIT_SOCKET__NLMSG_RELAY         0x01000000UL
+ #define NETLINK_AUDIT_SOCKET__NLMSG_READPRIV      0x02000000UL
++#define NETLINK_AUDIT_SOCKET__NLMSG_TTY_AUDIT     0x04000000UL
+ #define NETLINK_IP6FW_SOCKET__IOCTL               0x00000001UL
+ #define NETLINK_IP6FW_SOCKET__READ                0x00000002UL
+ #define NETLINK_IP6FW_SOCKET__WRITE               0x00000004UL
+@@ -1004,3 +1021,6 @@
+ #define DB_BLOB__IMPORT                           0x00000100UL
+ #define DB_BLOB__EXPORT                           0x00000200UL
+ #define PEER__RECV                                0x00000001UL
++#define X_APPLICATION_DATA__PASTE                 0x00000001UL
++#define X_APPLICATION_DATA__PASTE_AFTER_CONFIRM   0x00000002UL
++#define X_APPLICATION_DATA__COPY                  0x00000004UL
+diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/flask.h libselinux-2.0.71/include/selinux/flask.h
+--- nsalibselinux/include/selinux/flask.h	2008-08-28 09:34:24.000000000 -0400
++++ libselinux-2.0.71/include/selinux/flask.h	2008-09-22 13:28:05.000000000 -0400
+@@ -35,18 +35,18 @@
+ #define SECCLASS_SHM                                     28
+ #define SECCLASS_IPC                                     29
+ #define SECCLASS_PASSWD                                  30
+-#define SECCLASS_DRAWABLE                                31
+-#define SECCLASS_WINDOW                                  32
+-#define SECCLASS_GC                                      33
+-#define SECCLASS_FONT                                    34
+-#define SECCLASS_COLORMAP                                35
+-#define SECCLASS_PROPERTY                                36
+-#define SECCLASS_CURSOR                                  37
+-#define SECCLASS_XCLIENT                                 38
+-#define SECCLASS_XINPUT                                  39
+-#define SECCLASS_XSERVER                                 40
+-#define SECCLASS_XEXTENSION                              41
+-#define SECCLASS_PAX                                     42
++#define SECCLASS_X_DRAWABLE                              31
++#define SECCLASS_X_SCREEN                                32
++#define SECCLASS_X_GC                                    33
++#define SECCLASS_X_FONT                                  34
++#define SECCLASS_X_COLORMAP                              35
++#define SECCLASS_X_PROPERTY                              36
++#define SECCLASS_X_SELECTION                             37
++#define SECCLASS_X_CURSOR                                38
++#define SECCLASS_X_CLIENT                                39
++#define SECCLASS_X_DEVICE                                40
++#define SECCLASS_X_SERVER                                41
++#define SECCLASS_X_EXTENSION                             42
+ #define SECCLASS_NETLINK_ROUTE_SOCKET                    43
+ #define SECCLASS_NETLINK_FIREWALL_SOCKET                 44
+ #define SECCLASS_NETLINK_TCPDIAG_SOCKET                  45
+@@ -74,6 +74,10 @@
+ #define SECCLASS_DB_BLOB                                 67
+ #define SECCLASS_PEER                                    68
+ #define SECCLASS_CAPABILITY2                             69
++#define SECCLASS_X_RESOURCE                              70
++#define SECCLASS_X_EVENT                                 71
++#define SECCLASS_X_SYNTHETIC_EVENT                       72
++#define SECCLASS_X_APPLICATION_DATA                      73
+ 
+ /*
+  * Security identifier indices for initial entities
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/fgetfilecon.3 libselinux-2.0.71/man/man3/fgetfilecon.3
 --- nsalibselinux/man/man3/fgetfilecon.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/fgetfilecon.3	2008-09-09 16:21:46.000000000 -0400
++++ libselinux-2.0.71/man/man3/fgetfilecon.3	2008-09-22 13:25:36.000000000 -0400
 @@ -0,0 +1 @@
 +.so man3/getfilecon.3
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/getkeycreatecon.3 libselinux-2.0.71/man/man3/getkeycreatecon.3
 --- nsalibselinux/man/man3/getkeycreatecon.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/getkeycreatecon.3	2008-09-09 16:21:49.000000000 -0400
++++ libselinux-2.0.71/man/man3/getkeycreatecon.3	2008-09-22 13:25:36.000000000 -0400
 @@ -0,0 +1,38 @@
 +.TH "getkeycreatecon" "3" "9 September 2008" "dwalsh at redhat.com from russell at coker.com.au" "SELinux API documentation"
 +.SH "NAME"
@@ -47,17 +338,17 @@
 +.BR selinux "(8), " freecon "(3), " getcon "(3), " getexeccon "(3)"
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/lgetfilecon.3 libselinux-2.0.71/man/man3/lgetfilecon.3
 --- nsalibselinux/man/man3/lgetfilecon.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/lgetfilecon.3	2008-09-09 16:21:46.000000000 -0400
++++ libselinux-2.0.71/man/man3/lgetfilecon.3	2008-09-22 13:25:36.000000000 -0400
 @@ -0,0 +1 @@
 +.so man3/getfilecon.3
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/setkeycreatecon.3 libselinux-2.0.71/man/man3/setkeycreatecon.3
 --- nsalibselinux/man/man3/setkeycreatecon.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/setkeycreatecon.3	2008-09-09 16:22:09.000000000 -0400
++++ libselinux-2.0.71/man/man3/setkeycreatecon.3	2008-09-22 13:25:36.000000000 -0400
 @@ -0,0 +1 @@
 +.so man3/getkeycreatecon.3
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.71/man/man8/selinuxconlist.8
 --- nsalibselinux/man/man8/selinuxconlist.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man8/selinuxconlist.8	2008-09-09 16:21:46.000000000 -0400
++++ libselinux-2.0.71/man/man8/selinuxconlist.8	2008-09-22 13:25:36.000000000 -0400
 @@ -0,0 +1,18 @@
 +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -79,7 +370,7 @@
 +secon(8), selinuxdefcon(8)
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.71/man/man8/selinuxdefcon.8
 --- nsalibselinux/man/man8/selinuxdefcon.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man8/selinuxdefcon.8	2008-09-09 16:21:46.000000000 -0400
++++ libselinux-2.0.71/man/man8/selinuxdefcon.8	2008-09-22 13:25:36.000000000 -0400
 @@ -0,0 +1,19 @@
 +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -100,9 +391,233 @@
 +
 +.SH "SEE ALSO"
 +secon(8), selinuxconlist(8)
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/av_perm_to_string.h libselinux-2.0.71/src/av_perm_to_string.h
+--- nsalibselinux/src/av_perm_to_string.h	2008-08-28 09:34:24.000000000 -0400
++++ libselinux-2.0.71/src/av_perm_to_string.h	2008-09-22 13:42:50.000000000 -0400
+@@ -14,12 +14,17 @@
+    S_(SECCLASS_DIR, DIR__REPARENT, "reparent")
+    S_(SECCLASS_DIR, DIR__SEARCH, "search")
+    S_(SECCLASS_DIR, DIR__RMDIR, "rmdir")
++   S_(SECCLASS_DIR, DIR__OPEN, "open")
+    S_(SECCLASS_FILE, FILE__EXECUTE_NO_TRANS, "execute_no_trans")
+    S_(SECCLASS_FILE, FILE__ENTRYPOINT, "entrypoint")
+    S_(SECCLASS_FILE, FILE__EXECMOD, "execmod")
++   S_(SECCLASS_FILE, FILE__OPEN, "open")
+    S_(SECCLASS_CHR_FILE, CHR_FILE__EXECUTE_NO_TRANS, "execute_no_trans")
+    S_(SECCLASS_CHR_FILE, CHR_FILE__ENTRYPOINT, "entrypoint")
+    S_(SECCLASS_CHR_FILE, CHR_FILE__EXECMOD, "execmod")
++   S_(SECCLASS_CHR_FILE, CHR_FILE__OPEN, "open")
++   S_(SECCLASS_BLK_FILE, BLK_FILE__OPEN, "open")
++   S_(SECCLASS_FIFO_FILE, FIFO_FILE__OPEN, "open")
+    S_(SECCLASS_FD, FD__USE, "use")
+    S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__CONNECTTO, "connectto")
+    S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__NEWCONN, "newconn")
+@@ -140,91 +145,102 @@
+    S_(SECCLASS_PASSWD, PASSWD__CHSH, "chsh")
+    S_(SECCLASS_PASSWD, PASSWD__ROOTOK, "rootok")
+    S_(SECCLASS_PASSWD, PASSWD__CRONTAB, "crontab")
+-   S_(SECCLASS_DRAWABLE, DRAWABLE__CREATE, "create")
+-   S_(SECCLASS_DRAWABLE, DRAWABLE__DESTROY, "destroy")
+-   S_(SECCLASS_DRAWABLE, DRAWABLE__DRAW, "draw")
+-   S_(SECCLASS_DRAWABLE, DRAWABLE__COPY, "copy")
+-   S_(SECCLASS_DRAWABLE, DRAWABLE__GETATTR, "getattr")
+-   S_(SECCLASS_GC, GC__CREATE, "create")
+-   S_(SECCLASS_GC, GC__FREE, "free")
+-   S_(SECCLASS_GC, GC__GETATTR, "getattr")
+-   S_(SECCLASS_GC, GC__SETATTR, "setattr")
+-   S_(SECCLASS_WINDOW, WINDOW__ADDCHILD, "addchild")
+-   S_(SECCLASS_WINDOW, WINDOW__CREATE, "create")
+-   S_(SECCLASS_WINDOW, WINDOW__DESTROY, "destroy")
+-   S_(SECCLASS_WINDOW, WINDOW__MAP, "map")
+-   S_(SECCLASS_WINDOW, WINDOW__UNMAP, "unmap")
+-   S_(SECCLASS_WINDOW, WINDOW__CHSTACK, "chstack")
+-   S_(SECCLASS_WINDOW, WINDOW__CHPROPLIST, "chproplist")
+-   S_(SECCLASS_WINDOW, WINDOW__CHPROP, "chprop")
+-   S_(SECCLASS_WINDOW, WINDOW__LISTPROP, "listprop")
+-   S_(SECCLASS_WINDOW, WINDOW__GETATTR, "getattr")
+-   S_(SECCLASS_WINDOW, WINDOW__SETATTR, "setattr")
+-   S_(SECCLASS_WINDOW, WINDOW__SETFOCUS, "setfocus")
+-   S_(SECCLASS_WINDOW, WINDOW__MOVE, "move")
+-   S_(SECCLASS_WINDOW, WINDOW__CHSELECTION, "chselection")
+-   S_(SECCLASS_WINDOW, WINDOW__CHPARENT, "chparent")
+-   S_(SECCLASS_WINDOW, WINDOW__CTRLLIFE, "ctrllife")
+-   S_(SECCLASS_WINDOW, WINDOW__ENUMERATE, "enumerate")
+-   S_(SECCLASS_WINDOW, WINDOW__TRANSPARENT, "transparent")
+-   S_(SECCLASS_WINDOW, WINDOW__MOUSEMOTION, "mousemotion")
+-   S_(SECCLASS_WINDOW, WINDOW__CLIENTCOMEVENT, "clientcomevent")
+-   S_(SECCLASS_WINDOW, WINDOW__INPUTEVENT, "inputevent")
+-   S_(SECCLASS_WINDOW, WINDOW__DRAWEVENT, "drawevent")
+-   S_(SECCLASS_WINDOW, WINDOW__WINDOWCHANGEEVENT, "windowchangeevent")
+-   S_(SECCLASS_WINDOW, WINDOW__WINDOWCHANGEREQUEST, "windowchangerequest")
+-   S_(SECCLASS_WINDOW, WINDOW__SERVERCHANGEEVENT, "serverchangeevent")
+-   S_(SECCLASS_WINDOW, WINDOW__EXTENSIONEVENT, "extensionevent")
+-   S_(SECCLASS_FONT, FONT__LOAD, "load")
+-   S_(SECCLASS_FONT, FONT__FREE, "free")
+-   S_(SECCLASS_FONT, FONT__GETATTR, "getattr")
+-   S_(SECCLASS_FONT, FONT__USE, "use")
+-   S_(SECCLASS_COLORMAP, COLORMAP__CREATE, "create")
+-   S_(SECCLASS_COLORMAP, COLORMAP__FREE, "free")
+-   S_(SECCLASS_COLORMAP, COLORMAP__INSTALL, "install")
+-   S_(SECCLASS_COLORMAP, COLORMAP__UNINSTALL, "uninstall")
+-   S_(SECCLASS_COLORMAP, COLORMAP__LIST, "list")
+-   S_(SECCLASS_COLORMAP, COLORMAP__READ, "read")
+-   S_(SECCLASS_COLORMAP, COLORMAP__STORE, "store")
+-   S_(SECCLASS_COLORMAP, COLORMAP__GETATTR, "getattr")
+-   S_(SECCLASS_COLORMAP, COLORMAP__SETATTR, "setattr")
+-   S_(SECCLASS_PROPERTY, PROPERTY__CREATE, "create")
+-   S_(SECCLASS_PROPERTY, PROPERTY__FREE, "free")
+-   S_(SECCLASS_PROPERTY, PROPERTY__READ, "read")
+-   S_(SECCLASS_PROPERTY, PROPERTY__WRITE, "write")
+-   S_(SECCLASS_CURSOR, CURSOR__CREATE, "create")
+-   S_(SECCLASS_CURSOR, CURSOR__CREATEGLYPH, "createglyph")
+-   S_(SECCLASS_CURSOR, CURSOR__FREE, "free")
+-   S_(SECCLASS_CURSOR, CURSOR__ASSIGN, "assign")
+-   S_(SECCLASS_CURSOR, CURSOR__SETATTR, "setattr")
+-   S_(SECCLASS_XCLIENT, XCLIENT__KILL, "kill")
+-   S_(SECCLASS_XINPUT, XINPUT__LOOKUP, "lookup")
+-   S_(SECCLASS_XINPUT, XINPUT__GETATTR, "getattr")
+-   S_(SECCLASS_XINPUT, XINPUT__SETATTR, "setattr")
+-   S_(SECCLASS_XINPUT, XINPUT__SETFOCUS, "setfocus")
+-   S_(SECCLASS_XINPUT, XINPUT__WARPPOINTER, "warppointer")
+-   S_(SECCLASS_XINPUT, XINPUT__ACTIVEGRAB, "activegrab")
+-   S_(SECCLASS_XINPUT, XINPUT__PASSIVEGRAB, "passivegrab")
+-   S_(SECCLASS_XINPUT, XINPUT__UNGRAB, "ungrab")
+-   S_(SECCLASS_XINPUT, XINPUT__BELL, "bell")
+-   S_(SECCLASS_XINPUT, XINPUT__MOUSEMOTION, "mousemotion")
+-   S_(SECCLASS_XINPUT, XINPUT__RELABELINPUT, "relabelinput")
+-   S_(SECCLASS_XSERVER, XSERVER__SCREENSAVER, "screensaver")
+-   S_(SECCLASS_XSERVER, XSERVER__GETHOSTLIST, "gethostlist")
+-   S_(SECCLASS_XSERVER, XSERVER__SETHOSTLIST, "sethostlist")
+-   S_(SECCLASS_XSERVER, XSERVER__GETFONTPATH, "getfontpath")
+-   S_(SECCLASS_XSERVER, XSERVER__SETFONTPATH, "setfontpath")
+-   S_(SECCLASS_XSERVER, XSERVER__GETATTR, "getattr")
+-   S_(SECCLASS_XSERVER, XSERVER__GRAB, "grab")
+-   S_(SECCLASS_XSERVER, XSERVER__UNGRAB, "ungrab")
+-   S_(SECCLASS_XEXTENSION, XEXTENSION__QUERY, "query")
+-   S_(SECCLASS_XEXTENSION, XEXTENSION__USE, "use")
+-   S_(SECCLASS_PAX, PAX__PAGEEXEC, "pageexec")
+-   S_(SECCLASS_PAX, PAX__EMUTRAMP, "emutramp")
+-   S_(SECCLASS_PAX, PAX__MPROTECT, "mprotect")
+-   S_(SECCLASS_PAX, PAX__RANDMMAP, "randmmap")
+-   S_(SECCLASS_PAX, PAX__RANDEXEC, "randexec")
+-   S_(SECCLASS_PAX, PAX__SEGMEXEC, "segmexec")
++   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__CREATE, "create")
++   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__DESTROY, "destroy")
++   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__READ, "read")
++   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__WRITE, "write")
++   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__BLEND, "blend")
++   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__GETATTR, "getattr")
++   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__SETATTR, "setattr")
++   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__LIST_CHILD, "list_child")
++   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__ADD_CHILD, "add_child")
++   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__REMOVE_CHILD, "remove_child")
++   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__LIST_PROPERTY, "list_property")
++   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__GET_PROPERTY, "get_property")
++   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__SET_PROPERTY, "set_property")
++   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__MANAGE, "manage")
++   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__OVERRIDE, "override")
++   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__SHOW, "show")
++   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__HIDE, "hide")
++   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__SEND, "send")
++   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__RECEIVE, "receive")
++   S_(SECCLASS_X_SCREEN, X_SCREEN__GETATTR, "getattr")
++   S_(SECCLASS_X_SCREEN, X_SCREEN__SETATTR, "setattr")
++   S_(SECCLASS_X_SCREEN, X_SCREEN__HIDE_CURSOR, "hide_cursor")
++   S_(SECCLASS_X_SCREEN, X_SCREEN__SHOW_CURSOR, "show_cursor")
++   S_(SECCLASS_X_SCREEN, X_SCREEN__SAVER_GETATTR, "saver_getattr")
++   S_(SECCLASS_X_SCREEN, X_SCREEN__SAVER_SETATTR, "saver_setattr")
++   S_(SECCLASS_X_SCREEN, X_SCREEN__SAVER_HIDE, "saver_hide")
++   S_(SECCLASS_X_SCREEN, X_SCREEN__SAVER_SHOW, "saver_show")
++   S_(SECCLASS_X_GC, X_GC__CREATE, "create")
++   S_(SECCLASS_X_GC, X_GC__DESTROY, "destroy")
++   S_(SECCLASS_X_GC, X_GC__GETATTR, "getattr")
++   S_(SECCLASS_X_GC, X_GC__SETATTR, "setattr")
++   S_(SECCLASS_X_GC, X_GC__USE, "use")
++   S_(SECCLASS_X_FONT, X_FONT__CREATE, "create")
++   S_(SECCLASS_X_FONT, X_FONT__DESTROY, "destroy")
++   S_(SECCLASS_X_FONT, X_FONT__GETATTR, "getattr")
++   S_(SECCLASS_X_FONT, X_FONT__ADD_GLYPH, "add_glyph")
++   S_(SECCLASS_X_FONT, X_FONT__REMOVE_GLYPH, "remove_glyph")
++   S_(SECCLASS_X_FONT, X_FONT__USE, "use")
++   S_(SECCLASS_X_COLORMAP, X_COLORMAP__CREATE, "create")
++   S_(SECCLASS_X_COLORMAP, X_COLORMAP__DESTROY, "destroy")
++   S_(SECCLASS_X_COLORMAP, X_COLORMAP__READ, "read")
++   S_(SECCLASS_X_COLORMAP, X_COLORMAP__WRITE, "write")
++   S_(SECCLASS_X_COLORMAP, X_COLORMAP__GETATTR, "getattr")
++   S_(SECCLASS_X_COLORMAP, X_COLORMAP__ADD_COLOR, "add_color")
++   S_(SECCLASS_X_COLORMAP, X_COLORMAP__REMOVE_COLOR, "remove_color")
++   S_(SECCLASS_X_COLORMAP, X_COLORMAP__INSTALL, "install")
++   S_(SECCLASS_X_COLORMAP, X_COLORMAP__UNINSTALL, "uninstall")
++   S_(SECCLASS_X_COLORMAP, X_COLORMAP__USE, "use")
++   S_(SECCLASS_X_PROPERTY, X_PROPERTY__CREATE, "create")
++   S_(SECCLASS_X_PROPERTY, X_PROPERTY__DESTROY, "destroy")
++   S_(SECCLASS_X_PROPERTY, X_PROPERTY__READ, "read")
++   S_(SECCLASS_X_PROPERTY, X_PROPERTY__WRITE, "write")
++   S_(SECCLASS_X_PROPERTY, X_PROPERTY__APPEND, "append")
++   S_(SECCLASS_X_PROPERTY, X_PROPERTY__GETATTR, "getattr")
++   S_(SECCLASS_X_PROPERTY, X_PROPERTY__SETATTR, "setattr")
++   S_(SECCLASS_X_SELECTION, X_SELECTION__READ, "read")
++   S_(SECCLASS_X_SELECTION, X_SELECTION__WRITE, "write")
++   S_(SECCLASS_X_SELECTION, X_SELECTION__GETATTR, "getattr")
++   S_(SECCLASS_X_SELECTION, X_SELECTION__SETATTR, "setattr")
++   S_(SECCLASS_X_CURSOR, X_CURSOR__CREATE, "create")
++   S_(SECCLASS_X_CURSOR, X_CURSOR__DESTROY, "destroy")
++   S_(SECCLASS_X_CURSOR, X_CURSOR__READ, "read")
++   S_(SECCLASS_X_CURSOR, X_CURSOR__WRITE, "write")
++   S_(SECCLASS_X_CURSOR, X_CURSOR__GETATTR, "getattr")
++   S_(SECCLASS_X_CURSOR, X_CURSOR__SETATTR, "setattr")
++   S_(SECCLASS_X_CURSOR, X_CURSOR__USE, "use")
++   S_(SECCLASS_X_CLIENT, X_CLIENT__DESTROY, "destroy")
++   S_(SECCLASS_X_CLIENT, X_CLIENT__GETATTR, "getattr")
++   S_(SECCLASS_X_CLIENT, X_CLIENT__SETATTR, "setattr")
++   S_(SECCLASS_X_CLIENT, X_CLIENT__MANAGE, "manage")
++   S_(SECCLASS_X_DEVICE, X_DEVICE__GETATTR, "getattr")
++   S_(SECCLASS_X_DEVICE, X_DEVICE__SETATTR, "setattr")
++   S_(SECCLASS_X_DEVICE, X_DEVICE__USE, "use")
++   S_(SECCLASS_X_DEVICE, X_DEVICE__READ, "read")
++   S_(SECCLASS_X_DEVICE, X_DEVICE__WRITE, "write")
++   S_(SECCLASS_X_DEVICE, X_DEVICE__GETFOCUS, "getfocus")
++   S_(SECCLASS_X_DEVICE, X_DEVICE__SETFOCUS, "setfocus")
++   S_(SECCLASS_X_DEVICE, X_DEVICE__BELL, "bell")
++   S_(SECCLASS_X_DEVICE, X_DEVICE__FORCE_CURSOR, "force_cursor")
++   S_(SECCLASS_X_DEVICE, X_DEVICE__FREEZE, "freeze")
++   S_(SECCLASS_X_DEVICE, X_DEVICE__GRAB, "grab")
++   S_(SECCLASS_X_DEVICE, X_DEVICE__MANAGE, "manage")
++   S_(SECCLASS_X_SERVER, X_SERVER__GETATTR, "getattr")
++   S_(SECCLASS_X_SERVER, X_SERVER__SETATTR, "setattr")
++   S_(SECCLASS_X_SERVER, X_SERVER__RECORD, "record")
++   S_(SECCLASS_X_SERVER, X_SERVER__DEBUG, "debug")
++   S_(SECCLASS_X_SERVER, X_SERVER__GRAB, "grab")
++   S_(SECCLASS_X_SERVER, X_SERVER__MANAGE, "manage")
++   S_(SECCLASS_X_EXTENSION, X_EXTENSION__QUERY, "query")
++   S_(SECCLASS_X_EXTENSION, X_EXTENSION__USE, "use")
++   S_(SECCLASS_X_RESOURCE, X_RESOURCE__READ, "read")
++   S_(SECCLASS_X_RESOURCE, X_RESOURCE__WRITE, "write")
++   S_(SECCLASS_X_EVENT, X_EVENT__SEND, "send")
++   S_(SECCLASS_X_EVENT, X_EVENT__RECEIVE, "receive")
++   S_(SECCLASS_X_SYNTHETIC_EVENT, X_SYNTHETIC_EVENT__SEND, "send")
++   S_(SECCLASS_X_SYNTHETIC_EVENT, X_SYNTHETIC_EVENT__RECEIVE, "receive")
+    S_(SECCLASS_NETLINK_ROUTE_SOCKET, NETLINK_ROUTE_SOCKET__NLMSG_READ, "nlmsg_read")
+    S_(SECCLASS_NETLINK_ROUTE_SOCKET, NETLINK_ROUTE_SOCKET__NLMSG_WRITE, "nlmsg_write")
+    S_(SECCLASS_NETLINK_FIREWALL_SOCKET, NETLINK_FIREWALL_SOCKET__NLMSG_READ, "nlmsg_read")
+@@ -237,6 +253,7 @@
+    S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_WRITE, "nlmsg_write")
+    S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_RELAY, "nlmsg_relay")
+    S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_READPRIV, "nlmsg_readpriv")
++   S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_TTY_AUDIT, "nlmsg_tty_audit")
+    S_(SECCLASS_NETLINK_IP6FW_SOCKET, NETLINK_IP6FW_SOCKET__NLMSG_READ, "nlmsg_read")
+    S_(SECCLASS_NETLINK_IP6FW_SOCKET, NETLINK_IP6FW_SOCKET__NLMSG_WRITE, "nlmsg_write")
+    S_(SECCLASS_DBUS, DBUS__ACQUIRE_SVC, "acquire_svc")
+@@ -303,3 +320,6 @@
+    S_(SECCLASS_DB_BLOB, DB_BLOB__IMPORT, "import")
+    S_(SECCLASS_DB_BLOB, DB_BLOB__EXPORT, "export")
+    S_(SECCLASS_PEER, PEER__RECV, "recv")
++   S_(SECCLASS_X_APPLICATION_DATA, X_APPLICATION_DATA__PASTE, "paste")
++   S_(SECCLASS_X_APPLICATION_DATA, X_APPLICATION_DATA__PASTE_AFTER_CONFIRM, "paste_after_confirm")
++   S_(SECCLASS_X_APPLICATION_DATA, X_APPLICATION_DATA__COPY, "copy")
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.71/src/callbacks.c
 --- nsalibselinux/src/callbacks.c	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/src/callbacks.c	2008-09-09 16:21:46.000000000 -0400
++++ libselinux-2.0.71/src/callbacks.c	2008-09-22 13:25:36.000000000 -0400
 @@ -16,6 +16,7 @@
  {
  	int rc;
@@ -111,9 +626,51 @@
  	va_start(ap, fmt);
  	rc = vfprintf(stderr, fmt, ap);
  	va_end(ap);
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/class_to_string.h libselinux-2.0.71/src/class_to_string.h
+--- nsalibselinux/src/class_to_string.h	2008-08-28 09:34:24.000000000 -0400
++++ libselinux-2.0.71/src/class_to_string.h	2008-09-22 13:43:02.000000000 -0400
+@@ -33,18 +33,18 @@
+     S_("shm")
+     S_("ipc")
+     S_("passwd")
+-    S_("drawable")
+-    S_("window")
+-    S_("gc")
+-    S_("font")
+-    S_("colormap")
+-    S_("property")
+-    S_("cursor")
+-    S_("xclient")
+-    S_("xinput")
+-    S_("xserver")
+-    S_("xextension")
+-    S_("pax")
++    S_("x_drawable")
++    S_("x_screen")
++    S_("x_gc")
++    S_("x_font")
++    S_("x_colormap")
++    S_("x_property")
++    S_("x_selection")
++    S_("x_cursor")
++    S_("x_client")
++    S_("x_device")
++    S_("x_server")
++    S_("x_extension")
+     S_("netlink_route_socket")
+     S_("netlink_firewall_socket")
+     S_("netlink_tcpdiag_socket")
+@@ -72,3 +72,7 @@
+     S_("db_blob")
+     S_("peer")
+     S_("capability2")
++    S_("x_resource")
++    S_("x_event")
++    S_("x_synthetic_event")
++    S_("x_application_data")
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.71/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/src/matchpathcon.c	2008-09-09 16:21:46.000000000 -0400
++++ libselinux-2.0.71/src/matchpathcon.c	2008-09-22 13:25:36.000000000 -0400
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- libselinux.spec	9 Sep 2008 20:24:22 -0000	1.341
+++ libselinux.spec	22 Sep 2008 17:52:30 -0000	1.342
@@ -5,7 +5,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.71
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -163,6 +163,9 @@
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.71-5
+- Add flask definitions for open, X and nlmsg_tty_audit
+
 * Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.71-4
 - Add missing get/setkeycreatecon man pages
 



From dwalsh at fedoraproject.org  Mon Sep 22 17:56:26 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 22 Sep 2008 17:56:26 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20080710.patch, 1.41,
	1.42 selinux-policy.spec, 1.708, 1.709
Message-ID: <20080922175626.9A566700FE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8911

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
* Mon Sep 22 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-5
- Add file context for /dev/mspblk.*


policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- policy-20080710.patch	22 Sep 2008 12:33:03 -0000	1.41
+++ policy-20080710.patch	22 Sep 2008 17:55:56 -0000	1.42
@@ -218,6 +218,17 @@
 +system_r:sshd_t		xguest_r:xguest_t
 +system_r:crond_t	xguest_r:xguest_crond_t
 +system_r:xdm_t		xguest_r:xguest_t
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.5.8/policy/flask/access_vectors
+--- nsaserefpolicy/policy/flask/access_vectors	2008-08-07 11:15:00.000000000 -0400
++++ serefpolicy-3.5.8/policy/flask/access_vectors	2008-09-22 13:22:25.000000000 -0400
+@@ -616,6 +616,7 @@
+ 	nlmsg_write
+ 	nlmsg_relay
+ 	nlmsg_readpriv
++	nlmsg_tty_audit
+ }
+ 
+ class netlink_ip6fw_socket
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.5.8/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2008-08-07 11:15:13.000000000 -0400
 +++ serefpolicy-3.5.8/policy/global_tunables	2008-09-17 08:49:08.000000000 -0400
@@ -870,7 +881,7 @@
  ifdef(`distro_suse', `
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.5.8/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/rpm.if	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/rpm.if	2008-09-22 09:09:03.000000000 -0400
 @@ -152,6 +152,24 @@
  
  ########################################
@@ -8049,7 +8060,7 @@
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.5.8/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/kernel.if	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/kernel.if	2008-09-22 12:18:03.000000000 -0400
 @@ -1198,6 +1198,7 @@
  	')
  
@@ -8058,7 +8069,15 @@
  ')
  
  ########################################
-@@ -1768,6 +1769,7 @@
+@@ -1234,6 +1235,7 @@
+ interface(`kernel_read_sysctl',`
+ 	gen_require(`
+ 		type sysctl_t;
++		type proc_t;
+ 	')
+ 
+ 	list_dirs_pattern($1, proc_t, sysctl_t)
+@@ -1768,6 +1770,7 @@
  	')
  
  	dontaudit $1 sysctl_type:dir list_dir_perms;
@@ -8066,7 +8085,7 @@
  ')
  
  ########################################
-@@ -2582,6 +2584,24 @@
+@@ -2582,6 +2585,24 @@
  
  ########################################
  ## <summary>
@@ -8271,6 +8290,25 @@
  neverallow ~{ selinux_unconfined_type can_load_policy } security_t:security load_policy;
  neverallow ~{ selinux_unconfined_type can_setenforce } security_t:security setenforce;
  neverallow ~{ selinux_unconfined_type can_setsecparam } security_t:security setsecparam;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-3.5.8/policy/modules/kernel/storage.fc
+--- nsaserefpolicy/policy/modules/kernel/storage.fc	2008-08-07 11:15:01.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/storage.fc	2008-09-22 12:22:40.000000000 -0400
+@@ -27,6 +27,7 @@
+ /dev/mcdx?		-b	gen_context(system_u:object_r:removable_device_t,s0)
+ /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/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)
+@@ -65,6 +66,7 @@
+ 
+ /dev/md/.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+ /dev/mapper/.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
++/dev/mspblk.*		-b	gen_context(system_u:object_r:removable_device_t,s0)
+ 
+ /dev/raw/raw[0-9]+	-c	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.fc serefpolicy-3.5.8/policy/modules/roles/guest.fc
 --- nsaserefpolicy/policy/modules/roles/guest.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.5.8/policy/modules/roles/guest.fc	2008-09-17 08:49:08.000000000 -0400
@@ -19377,7 +19415,7 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.5.8/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2008-09-11 11:28:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/networkmanager.te	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/networkmanager.te	2008-09-22 09:09:30.000000000 -0400
 @@ -29,9 +29,9 @@
  
  # networkmanager will ptrace itself if gdb is installed
@@ -19470,7 +19508,7 @@
  ')
  
  optional_policy(`
-@@ -168,9 +184,16 @@
+@@ -168,9 +184,17 @@
  ')
  
  optional_policy(`
@@ -19483,6 +19521,7 @@
 +')
 +
 +optional_policy(`
++	rpm_exec(NetworkManager_t)
 +	rpm_read_db(NetworkManager_t)
 +	rpm_dontaudit_manage_db(NetworkManager_t)
  ')
@@ -22006,7 +22045,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.5.8/policy/modules/services/prelude.te
 --- nsaserefpolicy/policy/modules/services/prelude.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/prelude.te	2008-09-19 10:06:36.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/prelude.te	2008-09-22 09:13:31.000000000 -0400
 @@ -13,18 +13,56 @@
  type prelude_spool_t;
  files_type(prelude_spool_t)
@@ -22074,7 +22113,7 @@
  corecmd_search_bin(prelude_t)
  
  corenet_all_recvfrom_unlabeled(prelude_t)
-@@ -56,6 +97,9 @@
+@@ -56,15 +97,23 @@
  corenet_tcp_sendrecv_all_if(prelude_t)
  corenet_tcp_sendrecv_all_nodes(prelude_t)
  corenet_tcp_bind_all_nodes(prelude_t)
@@ -22084,14 +22123,16 @@
  
  dev_read_rand(prelude_t)
  dev_read_urand(prelude_t)
-@@ -65,6 +109,11 @@
+ 
++kernel_read_sysctl(prelude_t)
++
+ # Init script handling
+ domain_use_interactive_fds(prelude_t)
  
  files_read_etc_files(prelude_t)
  files_read_usr_files(prelude_t)
 +files_search_tmp(prelude_t)
 +
-+files_search_tmp(prelude_t)
-+
 +fs_rw_anon_inodefs_files(prelude_t)
  
  auth_use_nsswitch(prelude_t)
@@ -22104,7 +22145,15 @@
  
  dev_read_rand(prelude_audisp_t)
  dev_read_urand(prelude_audisp_t)
-@@ -123,9 +173,122 @@
+@@ -117,15 +167,129 @@
+ # Init script handling
+ domain_use_interactive_fds(prelude_audisp_t)
+ 
++kernel_read_sysctl(prelude_audisp_t)
++
+ files_read_etc_files(prelude_audisp_t)
+ 
+ libs_use_ld_so(prelude_audisp_t)
  libs_use_shared_libs(prelude_audisp_t)
  
  logging_send_syslog_msg(prelude_audisp_t)
@@ -22216,7 +22265,6 @@
 +
 +miscfiles_read_localization(prelude_lml_t)
 +
-+# if prelude_lml wants to relay to a remote prelude-manager using dns
 +sysnet_dns_name_resolve(prelude_lml_t)
 +
 +optional_policy(`
@@ -22227,7 +22275,7 @@
  ########################################
  #
  # prewikka_cgi Declarations
-@@ -133,8 +296,19 @@
+@@ -133,8 +297,19 @@
  
  optional_policy(`
  	apache_content_template(prewikka)
@@ -28730,7 +28778,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.5.8/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/xserver.te	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/xserver.te	2008-09-22 09:10:33.000000000 -0400
 @@ -8,6 +8,14 @@
  
  ## <desc>
@@ -29035,7 +29083,7 @@
  	# Talk to the console mouse server.
  	gpm_stream_connect(xdm_t)
  	gpm_setattr_gpmctl(xdm_t)
-@@ -382,16 +485,32 @@
+@@ -382,16 +485,33 @@
  ')
  
  optional_policy(`
@@ -29045,6 +29093,7 @@
 +
 +# On crash gdm execs gdb to dump stack
 +optional_policy(`
++	rpm_exec(xdm_t)
 +	rpm_read_db(xdm_t)
 +	rpm_dontaudit_manage_db(xdm_t)
 +')
@@ -29069,7 +29118,7 @@
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -427,7 +546,7 @@
+@@ -427,7 +547,7 @@
  allow xdm_xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xdm_xserver_t xdm_var_lib_t:dir search;
  
@@ -29078,7 +29127,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xdm_xserver_t, xdm_tmp_t, xdm_tmp_t)
-@@ -439,6 +558,15 @@
+@@ -439,6 +559,15 @@
  can_exec(xdm_xserver_t, xkb_var_lib_t)
  files_search_var_lib(xdm_xserver_t)
  
@@ -29094,7 +29143,7 @@
  # VNC v4 module in X server
  corenet_tcp_bind_vnc_port(xdm_xserver_t)
  
-@@ -450,10 +578,19 @@
+@@ -450,10 +579,19 @@
  # xdm_xserver_t may no longer have any reason
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
@@ -29115,7 +29164,7 @@
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(xdm_xserver_t)
  	fs_manage_nfs_files(xdm_xserver_t)
-@@ -468,8 +605,19 @@
+@@ -468,8 +606,19 @@
  
  optional_policy(`
  	dbus_system_bus_client_template(xdm_xserver, xdm_xserver_t)
@@ -29135,7 +29184,7 @@
  
  optional_policy(`
  	resmgr_stream_connect(xdm_t)
-@@ -481,8 +629,25 @@
+@@ -481,8 +630,25 @@
  ')
  
  optional_policy(`
@@ -29163,7 +29212,7 @@
  
  	ifndef(`distro_redhat',`
  		allow xdm_xserver_t self:process { execheap execmem };
-@@ -491,7 +656,6 @@
+@@ -491,7 +657,6 @@
  	ifdef(`distro_rhel4',`
  		allow xdm_xserver_t self:process { execheap execmem };
  	')
@@ -29171,7 +29220,7 @@
  
  ########################################
  #
-@@ -544,3 +708,56 @@
+@@ -544,3 +709,56 @@
  #
  allow pam_t xdm_t:fifo_file { getattr ioctl write };
  ') dnl end TODO


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.708
retrieving revision 1.709
diff -u -r1.708 -r1.709
--- selinux-policy.spec	22 Sep 2008 12:33:03 -0000	1.708
+++ selinux-policy.spec	22 Sep 2008 17:55:56 -0000	1.709
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -381,6 +381,9 @@
 %endif
 
 %changelog
+* Mon Sep 22 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-5
+- Add file context for /dev/mspblk.*
+
 * Sun Sep 21 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-4
 - Fix transition to nsplugin
 '



From rdieter at fedoraproject.org  Mon Sep 22 17:58:34 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 17:58:34 +0000 (UTC)
Subject: rpms/eigen2/devel .cvsignore, 1.2, 1.3 eigen2.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20080922175834.2C62F700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/eigen2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9385

Modified Files:
	.cvsignore eigen2.spec sources 
Log Message:
* Mon Sep 22 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.4.beta1
- eigen-2.0-beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Sep 2008 16:36:55 -0000	1.2
+++ .cvsignore	22 Sep 2008 17:58:03 -0000	1.3
@@ -1 +1 @@
-eigen-2.0-alpha7.tar.bz2
+eigen-2.0-beta1.tar.bz2


Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/eigen2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eigen2.spec	12 Sep 2008 16:36:55 -0000	1.1
+++ eigen2.spec	22 Sep 2008 17:58:03 -0000	1.2
@@ -3,12 +3,12 @@
 # http://bugzilla.redhat.com/459705
 
 #define _with_check -DBUILD_TESTS=ON 
-%define pre alpha7
+%define pre beta1 
 
 Name:    eigen2
 Summary: A lightweight C++ template library for vector and matrix math
 Version: 2.0 
-Release: 0.3.%{pre}%{?dist} 
+Release: 0.4.%{pre}%{?dist} 
 Group:   System Environment/Libraries
 License: GPLv2+ or LGPLv3+
 URL:     http://eigen.tuxfamily.org/
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.4.beta1
+- eigen-2.0-beta1
+
 * Mon Aug 25 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.3.alpha7
 - disable buildtime tests, which tickle gcc bugs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Sep 2008 16:36:55 -0000	1.2
+++ sources	22 Sep 2008 17:58:03 -0000	1.3
@@ -1 +1 @@
-97f0d655dd020df6fa9d40dcdf967ef2  eigen-2.0-alpha7.tar.bz2
+6631f3fb3145b2f9a980cd64431104aa  eigen-2.0-beta1.tar.bz2



From mtasaka at fedoraproject.org  Mon Sep 22 18:00:45 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 22 Sep 2008 18:00:45 +0000 (UTC)
Subject: rpms/kita/F-8 .cvsignore, 1.3, 1.4 kita.spec, 1.13, 1.14 sources,
	1.3, 1.4
Message-ID: <20080922180045.AA1A9700FE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kita/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9885/F-8

Modified Files:
	.cvsignore kita.spec sources 
Log Message:
* Tue Sep 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.5-1
- 0.177.5
- cookie-change.patch accepted by upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kita/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Sep 2008 18:42:42 -0000	1.3
+++ .cvsignore	22 Sep 2008 18:00:15 -0000	1.4
@@ -1 +1 @@
-kita-0.177.4.tar.gz
+kita-0.177.5.tar.gz


Index: kita.spec
===================================================================
RCS file: /cvs/extras/rpms/kita/F-8/kita.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kita.spec	17 Sep 2008 04:04:19 -0000	1.13
+++ kita.spec	22 Sep 2008 18:00:15 -0000	1.14
@@ -1,5 +1,5 @@
-%define     version     0.177.4
-%define	    repood      32918
+%define     version     0.177.5
+%define	    repoid      32988
 
 Summary:    2ch client for KDE
 Name:       kita
@@ -7,7 +7,6 @@
 Release:    1%{?dist}
 Source:     http://downloads.sourceforge.jp/kita/%{repoid}/kita-%{version}.tar.gz
 #Patch0:     kita-0.177.3-nonweak-symbol.patch
-Patch1:	    kita-0.177.4-cookie-change.patch
 License:    GPLv2+
 URL:        http://sourceforge.jp/projects/kita/
 Group:      Applications/Internet
@@ -37,7 +36,6 @@
 %setup -q
 
 #%%patch0 -p2 -b .link
-%patch1 -p1 -b .cookie
 
 %{__sed} -i.soname \
    -e 's|kita_la_|libkitamain_la_|' \
@@ -135,6 +133,10 @@
 %{_datadir}/doc/HTML/en/kita/
 
 %changelog
+* Tue Sep 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.5-1
+- 0.177.5
+- cookie-change.patch accepted by upstream
+
 * Wed Sep 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.4-1
 - 0.177.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kita/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Sep 2008 18:42:42 -0000	1.3
+++ sources	22 Sep 2008 18:00:15 -0000	1.4
@@ -1 +1 @@
-0c183e1925883b165a50d88bff8380cb  kita-0.177.4.tar.gz
+475e41af8b71a61ff03092118eda392a  kita-0.177.5.tar.gz



From mtasaka at fedoraproject.org  Mon Sep 22 18:00:45 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 22 Sep 2008 18:00:45 +0000 (UTC)
Subject: rpms/kita/F-9 .cvsignore, 1.3, 1.4 kita.spec, 1.15, 1.16 sources,
	1.3, 1.4
Message-ID: <20080922180045.CB665700FE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kita/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9885/F-9

Modified Files:
	.cvsignore kita.spec sources 
Log Message:
* Tue Sep 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.5-1
- 0.177.5
- cookie-change.patch accepted by upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kita/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Sep 2008 18:42:43 -0000	1.3
+++ .cvsignore	22 Sep 2008 18:00:15 -0000	1.4
@@ -1 +1 @@
-kita-0.177.4.tar.gz
+kita-0.177.5.tar.gz


Index: kita.spec
===================================================================
RCS file: /cvs/extras/rpms/kita/F-9/kita.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kita.spec	17 Sep 2008 04:04:19 -0000	1.15
+++ kita.spec	22 Sep 2008 18:00:15 -0000	1.16
@@ -1,5 +1,5 @@
-%define     version     0.177.4
-%define	    repood      32918
+%define     version     0.177.5
+%define	    repoid      32988
 
 Summary:    2ch client for KDE
 Name:       kita
@@ -7,7 +7,6 @@
 Release:    1%{?dist}
 Source:     http://downloads.sourceforge.jp/kita/%{repoid}/kita-%{version}.tar.gz
 #Patch0:     kita-0.177.3-nonweak-symbol.patch
-Patch1:	    kita-0.177.4-cookie-change.patch
 License:    GPLv2+
 URL:        http://sourceforge.jp/projects/kita/
 Group:      Applications/Internet
@@ -37,7 +36,6 @@
 %setup -q
 
 #%%patch0 -p2 -b .link
-%patch1 -p1 -b .cookie
 
 %{__sed} -i.soname \
    -e 's|kita_la_|libkitamain_la_|' \
@@ -135,6 +133,10 @@
 %{_datadir}/doc/HTML/en/kita/
 
 %changelog
+* Tue Sep 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.5-1
+- 0.177.5
+- cookie-change.patch accepted by upstream
+
 * Wed Sep 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.4-1
 - 0.177.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kita/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Sep 2008 18:42:43 -0000	1.3
+++ sources	22 Sep 2008 18:00:15 -0000	1.4
@@ -1 +1 @@
-0c183e1925883b165a50d88bff8380cb  kita-0.177.4.tar.gz
+475e41af8b71a61ff03092118eda392a  kita-0.177.5.tar.gz



From mtasaka at fedoraproject.org  Mon Sep 22 18:00:46 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 22 Sep 2008 18:00:46 +0000 (UTC)
Subject: rpms/kita/devel .cvsignore, 1.3, 1.4 kita.spec, 1.17, 1.18 sources, 
	1.3, 1.4
Message-ID: <20080922180046.0E20E700FE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kita/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9885/devel

Modified Files:
	.cvsignore kita.spec sources 
Log Message:
* Tue Sep 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.5-1
- 0.177.5
- cookie-change.patch accepted by upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kita/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Sep 2008 18:42:43 -0000	1.3
+++ .cvsignore	22 Sep 2008 18:00:15 -0000	1.4
@@ -1 +1 @@
-kita-0.177.4.tar.gz
+kita-0.177.5.tar.gz


Index: kita.spec
===================================================================
RCS file: /cvs/extras/rpms/kita/devel/kita.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kita.spec	17 Sep 2008 04:04:20 -0000	1.17
+++ kita.spec	22 Sep 2008 18:00:15 -0000	1.18
@@ -1,5 +1,5 @@
-%define     version     0.177.4
-%define	    repood      32918
+%define     version     0.177.5
+%define	    repoid      32988
 
 Summary:    2ch client for KDE
 Name:       kita
@@ -7,7 +7,6 @@
 Release:    1%{?dist}
 Source:     http://downloads.sourceforge.jp/kita/%{repoid}/kita-%{version}.tar.gz
 #Patch0:     kita-0.177.3-nonweak-symbol.patch
-Patch1:	    kita-0.177.4-cookie-change.patch
 License:    GPLv2+
 URL:        http://sourceforge.jp/projects/kita/
 Group:      Applications/Internet
@@ -37,7 +36,6 @@
 %setup -q
 
 #%%patch0 -p2 -b .link
-%patch1 -p1 -b .cookie
 
 %{__sed} -i.soname \
    -e 's|kita_la_|libkitamain_la_|' \
@@ -135,6 +133,10 @@
 %{_datadir}/doc/HTML/en/kita/
 
 %changelog
+* Tue Sep 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.5-1
+- 0.177.5
+- cookie-change.patch accepted by upstream
+
 * Wed Sep 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.4-1
 - 0.177.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kita/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Sep 2008 18:42:43 -0000	1.3
+++ sources	22 Sep 2008 18:00:15 -0000	1.4
@@ -1 +1 @@
-0c183e1925883b165a50d88bff8380cb  kita-0.177.4.tar.gz
+475e41af8b71a61ff03092118eda392a  kita-0.177.5.tar.gz



From lucilanga at fedoraproject.org  Mon Sep 22 18:01:19 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 22 Sep 2008 18:01:19 +0000 (UTC)
Subject: rpms/LinLog/F-9 .cvsignore, 1.2, 1.3 LinLog.desktop, 1.1,
	1.2 LinLog.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080922180119.5C889700FE@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/LinLog/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10005

Modified Files:
	.cvsignore LinLog.desktop LinLog.spec sources 
Log Message:
* Mon Sep 22 2008 Lucian Langa <cooly at gnome.eu.org> - 0.3.1-1
- new upstream 0.3.1
- add missing sql files
- fixed rpm macros
- fix build requires
- fix desktop file


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/LinLog/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Feb 2008 15:14:11 -0000	1.2
+++ .cvsignore	22 Sep 2008 18:00:48 -0000	1.3
@@ -1 +1 @@
-LinLog-0.3.tar.gz
+LinLog-0.3.1.tar.gz


Index: LinLog.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/LinLog/F-9/LinLog.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LinLog.desktop	29 Feb 2008 15:14:11 -0000	1.1
+++ LinLog.desktop	22 Sep 2008 18:00:48 -0000	1.2
@@ -4,7 +4,7 @@
 GenericName=LinLogBook
 Comment=A ham radio logbook for linux
 Exec=linlog
-Icon=LinLog.png
+Icon=LinLog
 Terminal=false
 Type=Application
 Categories=HamRadio;


Index: LinLog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/LinLog/F-9/LinLog.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LinLog.spec	29 Feb 2008 15:14:11 -0000	1.1
+++ LinLog.spec	22 Sep 2008 18:00:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           LinLog
-Version:        0.3
-Release:        4%{?dist}
+Version:        0.3.1
+Release:        1%{?dist}
 Summary:        A ham radio logbook for Linux
 
 Group:          Applications/Communications
@@ -11,7 +11,7 @@
 Source2:        %{name}.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt4-devel >= 4.3, sqlite-devel >= 3, desktop-file-utils
+BuildRequires:  qt4-devel >= 4.3, sqlite-devel >= 3, desktop-file-utils, libstdc++-devel 
 #Requires:       
 
 %description
@@ -31,14 +31,18 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/bin
-install -m 755 bin/linlog $RPM_BUILD_ROOT/usr/bin/linlog
+install -p -d $RPM_BUILD_ROOT%{_bindir}
+install -p -m 755 bin/linlog $RPM_BUILD_ROOT%{_bindir}/linlog
 
 # no upstream .desktop or icon yet
-mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
-desktop-file-install --vendor="fedora" \
+desktop-file-install \
         --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 644 BaseTables.sql $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 644 Example.sql $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 644 Statistics.sql $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -50,8 +54,17 @@
 %{_bindir}/linlog
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/*%{name}.desktop
+%{_datadir}/%{name}
+%{_datadir}/%{name}/*.sql
 
 %changelog
+* Mon Sep 22 2008 Lucian Langa <cooly at gnome.eu.org> - 0.3.1-1
+- new upstream 0.3.1
+- add missing sql files
+- fixed rpm macros
+- fix build requires
+- fix desktop file
+
 * Sat Feb 25 2008 Robert 'Bob' Jensen <bob at bobjensen.com> 0.3-4
 - Correct Lic. per Review
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/LinLog/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Feb 2008 15:14:11 -0000	1.2
+++ sources	22 Sep 2008 18:00:49 -0000	1.3
@@ -1 +1 @@
-a19c457eacc0a85382ced5a01123aafd  LinLog-0.3.tar.gz
+c3e0d9b66392ae4073726abebb4a02bf  LinLog-0.3.1.tar.gz



From rdieter at fedoraproject.org  Mon Sep 22 18:06:08 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 18:06:08 +0000 (UTC)
Subject: rpms/kipi-plugins/EL-5 .cvsignore, 1.9, 1.10 kipi-plugins.spec, 1.24,
	1.25 sources, 1.9, 1.10
Message-ID: <20080922180609.06F51700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10919

Modified Files:
	.cvsignore kipi-plugins.spec sources 
Log Message:
* Mon May 26 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-0.1.beta2
- kipi-plugins-0.1.6-beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Sep 2008 17:37:06 -0000	1.9
+++ .cvsignore	22 Sep 2008 18:05:38 -0000	1.10
@@ -1 +1,2 @@
-kipi-plugins-0.1.5.tar.bz2
+kipi-plugins-0.1.6-beta1.tar.bz2
+kipi-plugins-0.1.6-beta1.tar.bz2.md5


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/EL-5/kipi-plugins.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kipi-plugins.spec	22 Sep 2008 17:50:27 -0000	1.24
+++ kipi-plugins.spec	22 Sep 2008 18:05:38 -0000	1.25
@@ -9,20 +9,23 @@
 BuildRequires: libutempter-devel
 %endif
 
+%define beta beta1 
+
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
-Version: 0.1.5
-Release: 2%{?dist}
+Version: 0.1.6
+Release: 0.1.%{beta}%{?dist}
 
 License: GPLv2+
 Group:   Applications/Multimedia
 Url:	 http://www.kipi-plugins.org/
 Source0: http://downloads.sourceforge.net/sourceforge/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2
+Source1: http://www.linux.it/~anaselli/kipi-plugins/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2.md5
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
 BuildRequires: %{kdelibs3}-devel
-BuildRequires: libkdcraw-devel >= 0.1.4
+BuildRequires: libkdcraw-devel >= 0.1.5
 BuildRequires: libkexiv2-devel >= 0.1.7
 BuildRequires: libkipi-devel >= 0.1.6
 BuildRequires: exiv2-devel 
@@ -180,8 +183,8 @@
 
 
 %changelog
-* Thu Jul 17 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.5-2
-- respin
+* Mon May 26 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-0.1.beta2
+- kipi-plugins-0.1.6-beta1
 
 * Fri Mar 14 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.5-1
 - kipi-plugins-0.1.5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Sep 2008 17:37:06 -0000	1.9
+++ sources	22 Sep 2008 18:05:38 -0000	1.10
@@ -1 +1,2 @@
-099122d802530d22e69b314b3e97e30b  kipi-plugins-0.1.5.tar.bz2
+1f3e98dc0cb1f34eaafa5c3b7f81a2f5  kipi-plugins-0.1.6-beta1.tar.bz2
+a37254ab99cf898f5af8c38c8118ba80  kipi-plugins-0.1.6-beta1.tar.bz2.md5



From lucilanga at fedoraproject.org  Mon Sep 22 18:07:39 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 22 Sep 2008 18:07:39 +0000 (UTC)
Subject: rpms/LinLog/F-8 .cvsignore, 1.1, 1.2 LinLog.desktop, 1.1,
	1.2 LinLog.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080922180739.ED112700FE@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/LinLog/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11163

Modified Files:
	.cvsignore LinLog.desktop LinLog.spec sources 
Log Message:
* Mon Sep 22 2008 Lucian Langa <cooly at gnome.eu.org> - 0.3.1-1
- new upstream 0.3.1
- add missing sql files
- fixed rpm macros
- fix build requires
- fix desktop file


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/LinLog/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Feb 2008 07:32:48 -0000	1.1
+++ .cvsignore	22 Sep 2008 18:07:09 -0000	1.2
@@ -0,0 +1 @@
+LinLog-0.3.1.tar.gz


Index: LinLog.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/LinLog/F-8/LinLog.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LinLog.desktop	29 Feb 2008 15:15:48 -0000	1.1
+++ LinLog.desktop	22 Sep 2008 18:07:09 -0000	1.2
@@ -4,7 +4,7 @@
 GenericName=LinLogBook
 Comment=A ham radio logbook for linux
 Exec=linlog
-Icon=LinLog.png
+Icon=LinLog
 Terminal=false
 Type=Application
 Categories=HamRadio;


Index: LinLog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/LinLog/F-8/LinLog.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LinLog.spec	29 Feb 2008 15:15:48 -0000	1.1
+++ LinLog.spec	22 Sep 2008 18:07:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           LinLog
-Version:        0.3
-Release:        4%{?dist}
+Version:        0.3.1
+Release:        1%{?dist}
 Summary:        A ham radio logbook for Linux
 
 Group:          Applications/Communications
@@ -11,7 +11,7 @@
 Source2:        %{name}.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt4-devel >= 4.3, sqlite-devel >= 3, desktop-file-utils
+BuildRequires:  qt4-devel >= 4.3, sqlite-devel >= 3, desktop-file-utils, libstdc++-devel 
 #Requires:       
 
 %description
@@ -31,14 +31,18 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/bin
-install -m 755 bin/linlog $RPM_BUILD_ROOT/usr/bin/linlog
+install -p -d $RPM_BUILD_ROOT%{_bindir}
+install -p -m 755 bin/linlog $RPM_BUILD_ROOT%{_bindir}/linlog
 
 # no upstream .desktop or icon yet
-mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
-desktop-file-install --vendor="fedora" \
+desktop-file-install \
         --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 644 BaseTables.sql $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 644 Example.sql $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 644 Statistics.sql $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -50,8 +54,17 @@
 %{_bindir}/linlog
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/*%{name}.desktop
+%{_datadir}/%{name}
+%{_datadir}/%{name}/*.sql
 
 %changelog
+* Mon Sep 22 2008 Lucian Langa <cooly at gnome.eu.org> - 0.3.1-1
+- new upstream 0.3.1
+- add missing sql files
+- fixed rpm macros
+- fix build requires
+- fix desktop file
+
 * Sat Feb 25 2008 Robert 'Bob' Jensen <bob at bobjensen.com> 0.3-4
 - Correct Lic. per Review
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/LinLog/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Feb 2008 15:15:48 -0000	1.2
+++ sources	22 Sep 2008 18:07:09 -0000	1.3
@@ -1 +1 @@
-a19c457eacc0a85382ced5a01123aafd  LinLog-0.3.tar.gz
+c3e0d9b66392ae4073726abebb4a02bf  LinLog-0.3.1.tar.gz



From steve at fedoraproject.org  Mon Sep 22 18:23:35 2008
From: steve at fedoraproject.org (Steven Pritchard)
Date: Mon, 22 Sep 2008 18:23:35 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Strptime/devel .cvsignore, 1.3,
	1.4 perl-DateTime-Format-Strptime.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20080922182335.A81E3700FE@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Strptime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13182

Modified Files:
	.cvsignore perl-DateTime-Format-Strptime.spec sources 
Log Message:
Update to 1.0800.
Update versions on build dependencies.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Strptime/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Jan 2008 17:28:37 -0000	1.3
+++ .cvsignore	22 Sep 2008 18:23:05 -0000	1.4
@@ -1 +1 @@
-DateTime-Format-Strptime-1.0702.tgz
+DateTime-Format-Strptime-1.0800.tgz


Index: perl-DateTime-Format-Strptime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Strptime/devel/perl-DateTime-Format-Strptime.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-DateTime-Format-Strptime.spec	8 Jul 2008 16:54:21 -0000	1.6
+++ perl-DateTime-Format-Strptime.spec	22 Sep 2008 18:23:05 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-Strptime
-Version:        1.0702
-Release:        3%{?dist}
+Version:        1.0800
+Release:        1%{?dist}
 Summary:        Parse and format strp and strf time patterns
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -9,9 +9,9 @@
 Patch0:         perl-DateTime-Format-Strptime-004_locale_defaults.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(DateTime)
-BuildRequires:  perl(DateTime::Locale) >= 0.02
-BuildRequires:  perl(DateTime::TimeZone) >= 0.25
+BuildRequires:  perl(DateTime) >= 0.4304
+BuildRequires:  perl(DateTime::Locale) >= 0.41
+BuildRequires:  perl(DateTime::TimeZone) >= 0.79
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Params::Validate) >= 0.64
 BuildRequires:  perl(Test::More)
@@ -54,6 +54,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 29 2008 Steven Pritchard <steve at kspei.com> 1.0800-1
+- Update to 1.0800.
+- Update versions on build dependencies.
+
 * Tue Jul 08 2008 Steven Pritchard <steve at kspei.com> 1.0702-3
 - Patch t/004_locale_defaults.t to work around change in DateTime::Locale.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Strptime/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Jan 2008 17:28:37 -0000	1.3
+++ sources	22 Sep 2008 18:23:05 -0000	1.4
@@ -1 +1 @@
-4a57ed0d53c49f68afefc1df1ec19043  DateTime-Format-Strptime-1.0702.tgz
+930bdda4cbf0e5414a70759861655a12  DateTime-Format-Strptime-1.0800.tgz



From deji at fedoraproject.org  Mon Sep 22 18:23:50 2008
From: deji at fedoraproject.org (Deji Akingunola)
Date: Mon, 22 Sep 2008 18:23:50 +0000 (UTC)
Subject: rpms/gparted/devel .cvsignore, 1.16, 1.17 gparted.spec, 1.42,
	1.43 sources, 1.16, 1.17
Message-ID: <20080922182350.E1466700FE@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13242

Modified Files:
	.cvsignore gparted.spec sources 
Log Message:
* Mon Sep 22 2008 Deji Akingunola <dakingun at gmail.com> - 0.3.9-1
- New upstream version
- Finally removed the 'preun' call that ensures the old gparted fdi (pre-FC6)
  file is removed on update



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	24 Jul 2008 23:10:52 -0000	1.16
+++ .cvsignore	22 Sep 2008 18:23:20 -0000	1.17
@@ -1 +1 @@
-gparted-0.3.8.tar.bz2
+gparted-0.3.9.tar.bz2


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gparted.spec	24 Jul 2008 23:28:50 -0000	1.42
+++ gparted.spec	22 Sep 2008 18:23:20 -0000	1.43
@@ -1,17 +1,20 @@
 Summary:	Gnome Partition Editor
 Name:		gparted
-Version:	0.3.8
+Version:	0.3.9
 Release:	1%{?dist}
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://gparted.sourceforge.net
-Source0:	http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:	gparted-console.apps
 Source2:	gparted-pam.d
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtkmm24-devel parted-devel 
 BuildRequires:	e2fsprogs-devel gettext perl(XML::Parser) 
 BuildRequires:	desktop-file-utils
+BuildRequires:  scrollkeeper
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 Requires:	hal >= 0.5.9
 
 %description
@@ -55,12 +58,11 @@
 %clean
 rm -rf %{buildroot}
 
-%preun
-if [ $1 -ge 0 ]; then
-    if [ -a %{_datadir}/hal/fdi/policy/gparted-disable-automount.fdi ]; then
-       rm -rf %{_datadir}/hal/fdi/policy/gparted-disable-automount.fdi
-    fi
-fi
+%post
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+
+%postun
+scrollkeeper-update -q || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -70,11 +72,18 @@
 %{_sbindir}/gpartedbin
 %{_datadir}/applications/fedora-gparted.desktop
 %{_datadir}/pixmaps/gparted.png
+%{_datadir}/gnome/help/gparted/
+%{_datadir}/omf/gparted/
 %{_mandir}/man8/gparted.*
 %config(noreplace) %{_sysconfdir}/pam.d/gparted
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Sep 22 2008 Deji Akingunola <dakingun at gmail.com> - 0.3.9-1
+- New upstream version
+- Finally removed the 'preun' call that ensures the old gparted fdi (pre-FC6)
+  file is removed on update
+
 * Sun Jul 13 2008 Deji Akingunola <dakingun at gmail.com> - 0.3.8-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	24 Jul 2008 23:10:52 -0000	1.16
+++ sources	22 Sep 2008 18:23:20 -0000	1.17
@@ -1 +1 @@
-7c890472168b0b5e5f353b445758ab3f  gparted-0.3.8.tar.bz2
+5b6dc1b154322c9721fce5fd5b9e066e  gparted-0.3.9.tar.bz2



From tibbs at fedoraproject.org  Mon Sep 22 18:26:47 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 22 Sep 2008 18:26:47 +0000 (UTC)
Subject: rpms/denyhosts/devel denyhosts-restorecon.plugin, NONE,
	1.1 denyhosts-2.6-config.patch, 1.2, 1.3 denyhosts.spec, 1.50, 1.51
Message-ID: <20080922182647.5BD28700FE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14179

Modified Files:
	denyhosts-2.6-config.patch denyhosts.spec 
Added Files:
	denyhosts-restorecon.plugin 
Log Message:
* Mon Sep 22 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.6-12
- Add plugin to restore file contexts after purging.



--- NEW FILE denyhosts-restorecon.plugin ---
#!/bin/sh
#
# Simple plugin to restore file contexts after the purge operation.
# Jonathan Stanton <jonathan at spreadconcepts.com>
#
/sbin/restorecon /etc/hosts.deny
/sbin/restorecon /etc/hosts.deny.purge.bak


denyhosts-2.6-config.patch:

Index: denyhosts-2.6-config.patch
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts-2.6-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- denyhosts-2.6-config.patch	28 Aug 2008 16:06:38 -0000	1.2
+++ denyhosts-2.6-config.patch	22 Sep 2008 18:26:46 -0000	1.3
@@ -1,7 +1,6 @@
-diff -up ./denyhosts.cfg-dist.orig ./denyhosts.cfg-dist
---- ./denyhosts.cfg-dist.orig	2006-08-20 09:09:57.000000000 -0500
-+++ ./denyhosts.cfg-dist	2008-08-28 11:03:16.000000000 -0500
-@@ -55,13 +55,18 @@ HOSTS_DENY = /etc/hosts.deny
+--- denyhosts.cfg-dist.config	2006-08-20 09:09:57.000000000 -0500
++++ denyhosts.cfg-dist	2008-09-22 10:49:14.000000000 -0500
+@@ -55,13 +55,18 @@
  #            'y' = years
  #
  # never purge:
@@ -21,7 +20,7 @@
  #######################################################################
  
  #######################################################################
-@@ -150,7 +155,7 @@ DENY_THRESHOLD_RESTRICTED = 1
+@@ -150,7 +155,7 @@
  # Note: it is recommended that you use an absolute pathname
  # for this value (eg. /home/foo/denyhosts/data)
  #
@@ -30,7 +29,7 @@
  #
  #######################################################################
  
-@@ -216,7 +221,7 @@ LOCK_FILE = /var/lock/subsys/denyhosts
+@@ -216,7 +221,7 @@
  # Multiple email addresses can be delimited by a comma, eg:
  # ADMIN_EMAIL = foo at bar.com, bar at foo.com, etc at foobar.com
  #
@@ -39,7 +38,7 @@
  #
  #######################################################################
  
-@@ -255,7 +260,7 @@ SMTP_FROM = DenyHosts <nobody at localhost>
+@@ -255,7 +260,7 @@
  #
  # SMTP_SUBJECT: you can specify the "Subject:" of messages sent
  # by DenyHosts when it reports thwarted abuse attempts
@@ -48,3 +47,17 @@
  #
  ######################################################################
  
+@@ -402,6 +407,13 @@
+ #
+ #PLUGIN_PURGE=/usr/bin/true
+ #
++# The following plugin will restore the file contexts on /etc/hosts.deny after
++# denyhosts purges old entries.  This prevents breakage when selinux is set to
++# enforcing mode, but still has a small window where the context is set
++# incorrectly.  The correct place to fix this is in the selinux policy.
++#
++#PLUGIN_PURGE=/usr/share/denyhosts/plugins/restorecon.sh
++#
+ ######################################################################
+ 
+ ######################################################################


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- denyhosts.spec	28 Aug 2008 16:06:38 -0000	1.50
+++ denyhosts.spec	22 Sep 2008 18:26:47 -0000	1.51
@@ -13,6 +13,7 @@
 Source4:    denyhosts.sysconfig
 Source5:    denyhosts.logrotate
 Source6:    README.fedora
+Source10:   denyhosts-restorecon.plugin
 Patch0:     denyhosts-2.6-config.patch
 Patch1:     denyhosts-2.4-setup.patch
 Patch2:     denyhosts-2.6-daemon-control.patch
@@ -87,6 +88,8 @@
 install -p -m 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/sysconfig/denyhosts
 install -p -m 644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/logrotate.d/denyhosts
 
+install -p -m 755 %{SOURCE10} %{buildroot}/%{_datadir}/denyhosts/plugins/restorecon.sh
+
 touch %{buildroot}/%{_localstatedir}/log/denyhosts
 
 for i in allowed-warned-hosts hosts hosts-restricted hosts-root \
@@ -158,6 +161,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.6-12
+- Add plugin to restore file contexts after purging.
+
 * Thu Aug 28 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.6-12
 - Fix up patches to apply with --fuzz=0.
 



From mclasen at fedoraproject.org  Mon Sep 22 18:27:29 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 18:27:29 +0000 (UTC)
Subject: rpms/vino/devel .cvsignore, 1.38, 1.39 sources, 1.38, 1.39 vino.spec,
	1.80, 1.81
Message-ID: <20080922182729.B5BC6700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/vino/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14106

Modified Files:
	.cvsignore sources vino.spec 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vino/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	8 Sep 2008 20:23:03 -0000	1.38
+++ .cvsignore	22 Sep 2008 18:26:59 -0000	1.39
@@ -1 +1 @@
-vino-2.23.92.tar.bz2
+vino-2.24.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vino/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	8 Sep 2008 20:23:03 -0000	1.38
+++ sources	22 Sep 2008 18:26:59 -0000	1.39
@@ -1 +1 @@
-1920426523584fb2453004ee088fe28c  vino-2.23.92.tar.bz2
+c02bec87196e1655043c60870bfec7a7  vino-2.24.0.tar.bz2


Index: vino.spec
===================================================================
RCS file: /cvs/extras/rpms/vino/devel/vino.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- vino.spec	8 Sep 2008 20:23:03 -0000	1.80
+++ vino.spec	22 Sep 2008 18:26:59 -0000	1.81
@@ -8,10 +8,10 @@
 
 Summary: A remote desktop system for GNOME
 Name: vino
-Version: 2.23.92
+Version: 2.24.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/vino/2.23/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/vino/2.24/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -107,6 +107,9 @@
 %{_datadir}/gnome/autostart/vino-server.desktop
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 



From tibbs at fedoraproject.org  Mon Sep 22 18:27:59 2008
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 22 Sep 2008 18:27:59 +0000 (UTC)
Subject: rpms/denyhosts/devel denyhosts.spec,1.51,1.52
Message-ID: <20080922182759.A7CBB700FE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14387

Modified Files:
	denyhosts.spec 
Log Message:
Actually bump the release....



Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- denyhosts.spec	22 Sep 2008 18:26:47 -0000	1.51
+++ denyhosts.spec	22 Sep 2008 18:27:29 -0000	1.52
@@ -1,6 +1,6 @@
 Name:       denyhosts
 Version:    2.6
-Release:    12%{?dist}
+Release:    13%{?dist}
 Summary:    A script to help thwart ssh server attacks
 
 Group:      Applications/System
@@ -161,7 +161,7 @@
 
 
 %changelog
-* Mon Sep 22 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.6-12
+* Mon Sep 22 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.6-13
 - Add plugin to restore file contexts after purging.
 
 * Thu Aug 28 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.6-12



From deji at fedoraproject.org  Mon Sep 22 18:37:42 2008
From: deji at fedoraproject.org (Deji Akingunola)
Date: Mon, 22 Sep 2008 18:37:42 +0000 (UTC)
Subject: rpms/gparted/F-9 .cvsignore, 1.15, 1.16 gparted.spec, 1.39,
	1.40 sources, 1.15, 1.16 gparted-refresh_crash-fix.patch, 1.3,
	NONE run-gparted, 1.3, NONE
Message-ID: <20080922183742.6B3A3700FE@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15822

Modified Files:
	.cvsignore gparted.spec sources 
Removed Files:
	gparted-refresh_crash-fix.patch run-gparted 
Log Message:
* Mon Sep 22 2008 Deji Akingunola <dakingun at gmail.com> - 0.3.9-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gparted/F-9/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Apr 2008 19:00:36 -0000	1.15
+++ .cvsignore	22 Sep 2008 18:37:12 -0000	1.16
@@ -1 +1 @@
-gparted-0.3.7.tar.bz2
+gparted-0.3.9.tar.bz2


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/F-9/gparted.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gparted.spec	30 Apr 2008 19:00:36 -0000	1.39
+++ gparted.spec	22 Sep 2008 18:37:12 -0000	1.40
@@ -1,18 +1,20 @@
 Summary:	Gnome Partition Editor
 Name:		gparted
-Version:	0.3.7
+Version:	0.3.9
 Release:	1%{?dist}
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://gparted.sourceforge.net
-Source0:	http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:	gparted-console.apps
 Source2:	gparted-pam.d
-Patch0:		gparted-refresh_crash-fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtkmm24-devel parted-devel 
 BuildRequires:	e2fsprogs-devel gettext perl(XML::Parser) 
 BuildRequires:	desktop-file-utils
+BuildRequires:  scrollkeeper
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 Requires:	hal >= 0.5.9
 
 %description
@@ -24,7 +26,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .refresh
 
 %build
 %configure
@@ -64,6 +65,12 @@
     fi
 fi
 
+%post
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+
+%postun
+scrollkeeper-update -q || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
@@ -72,11 +79,16 @@
 %{_sbindir}/gpartedbin
 %{_datadir}/applications/fedora-gparted.desktop
 %{_datadir}/pixmaps/gparted.png
+%{_datadir}/gnome/help/gparted/
+%{_datadir}/omf/gparted/
 %{_mandir}/man8/gparted.*
 %config(noreplace) %{_sysconfdir}/pam.d/gparted
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Sep 22 2008 Deji Akingunola <dakingun at gmail.com> - 0.3.9-1
+- New upstream version
+
 * Wed Apr 30 2008 Deji Akingunola <dakingun at gmail.com> - 0.3.7-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gparted/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	30 Apr 2008 19:00:36 -0000	1.15
+++ sources	22 Sep 2008 18:37:12 -0000	1.16
@@ -1 +1 @@
-6a96ab9b8871a58b6ca74941c30ab812  gparted-0.3.7.tar.bz2
+5b6dc1b154322c9721fce5fd5b9e066e  gparted-0.3.9.tar.bz2


--- gparted-refresh_crash-fix.patch DELETED ---


--- run-gparted DELETED ---



From spot at fedoraproject.org  Mon Sep 22 18:38:00 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 22 Sep 2008 18:38:00 +0000 (UTC)
Subject: rpms/tcl-snack/F-8 snack2.2.10-newALSA.patch, NONE,
	1.1 tcl-snack.spec, 1.3, 1.4
Message-ID: <20080922183800.6372C700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-snack/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15973/F-8

Modified Files:
	tcl-snack.spec 
Added Files:
	snack2.2.10-newALSA.patch 
Log Message:
fix snack to work with new alsa

snack2.2.10-newALSA.patch:

--- NEW FILE snack2.2.10-newALSA.patch ---
diff -up snack2.2.10/unix/jkAudIO_alsa.c.newALSA snack2.2.10/unix/jkAudIO_alsa.c
--- snack2.2.10/unix/jkAudIO_alsa.c.newALSA	2008-09-22 14:19:55.000000000 -0400
+++ snack2.2.10/unix/jkAudIO_alsa.c	2008-09-22 14:21:44.000000000 -0400
@@ -49,6 +49,8 @@ static int littleEndian = 0;
 
 static int minNumChan = 1;
 
+static snd_pcm_uframes_t hw_bufsize = 0; 
+
 int
 SnackAudioOpen(ADesc *A, Tcl_Interp *interp, char *device, int mode, int freq,
 	       int nchannels, int encoding)
@@ -135,6 +137,9 @@ SnackAudioOpen(ADesc *A, Tcl_Interp *int
     Tcl_AppendResult(interp, "Failed setting HW params.", NULL);
     return TCL_ERROR;
   }
+
+  snd_pcm_hw_params_get_buffer_size (hw_params, &hw_bufsize); 
+
   snd_pcm_hw_params_free(hw_params);
   snd_pcm_prepare(A->handle);
   if (A->mode == RECORD) {
@@ -202,6 +207,8 @@ SnackAudioPost(ADesc *A)
   int i;
   static char buf[64];
 
+  return;
+
   if (A->debug > 1) Snack_WriteLog("  Enter SnackAudioPost\n");
 
   for (i = 0; i < 1000; i++) {
@@ -267,12 +274,14 @@ SnackAudioWriteable(ADesc *A)
 long
 SnackAudioPlayed(ADesc *A)
 {
-  long avail = _snd_pcm_mmap_hw_ptr(A->handle);
+  // FIX Here, _snd_pcm_mmap_hw_ptr is deprecated in new alsalib
+  long played = A->nWritten - (hw_bufsize - SnackAudioWriteable(A));
+  // long avail = _snd_pcm_mmap_hw_ptr(A->handle); 
   
-  if (avail < 0)
-    avail = 0;
+  if (played < 0)
+    return 0;
 
-  return (avail+A->nPlayed);
+  return (played);
 }
 
 void


Index: tcl-snack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-snack/F-8/tcl-snack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tcl-snack.spec	18 Sep 2008 15:31:08 -0000	1.3
+++ tcl-snack.spec	22 Sep 2008 18:37:30 -0000	1.4
@@ -9,7 +9,7 @@
 
 Name:		tcl-%{realname}
 Version:	2.2.10
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Sound toolkit
 Group:		System Environment/Libraries
 License:	GPLv2+
@@ -24,6 +24,7 @@
 Patch0:		snack2.2.10-nomp3.patch
 Patch1:		snack2.2.10-extracflags.patch
 Patch2:		snack2.2.10-shared-stubs.patch
+Patch3:		snack2.2.10-newALSA.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	tcl-devel, tk-devel, alsa-lib-devel, libogg-devel, libvorbis-devel
 BuildRequires:	python-devel
@@ -59,6 +60,7 @@
 %patch0 -p1 -b .nomp3
 %patch1 -p1 -b .extracflags
 %patch2 -p1 -b .shared-stubs
+%patch3 -p1 -b .newALSA
 chmod -x generic/*.c generic/*.h unix/*.c COPYING README demos/python/*
 iconv -f iso-8859-1 -t utf-8 -o README{.utf8,}
 mv README{.utf8,}
@@ -101,6 +103,9 @@
 %{python_sitelib}/tkSnack*
 
 %changelog
+* Mon Sep 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-5
+- fix to work with new alsa (from Jeremiah at Myah OS)
+
 * Thu Sep 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-4
 - *sigh* hardcoding the tcl version is the only way to get it through the buildsystem
 



From spot at fedoraproject.org  Mon Sep 22 18:38:00 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 22 Sep 2008 18:38:00 +0000 (UTC)
Subject: rpms/tcl-snack/F-9 snack2.2.10-newALSA.patch, NONE,
	1.1 tcl-snack.spec, 1.3, 1.4
Message-ID: <20080922183800.9BFBE700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-snack/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15973/F-9

Modified Files:
	tcl-snack.spec 
Added Files:
	snack2.2.10-newALSA.patch 
Log Message:
fix snack to work with new alsa

snack2.2.10-newALSA.patch:

--- NEW FILE snack2.2.10-newALSA.patch ---
diff -up snack2.2.10/unix/jkAudIO_alsa.c.newALSA snack2.2.10/unix/jkAudIO_alsa.c
--- snack2.2.10/unix/jkAudIO_alsa.c.newALSA	2008-09-22 14:19:55.000000000 -0400
+++ snack2.2.10/unix/jkAudIO_alsa.c	2008-09-22 14:21:44.000000000 -0400
@@ -49,6 +49,8 @@ static int littleEndian = 0;
 
 static int minNumChan = 1;
 
+static snd_pcm_uframes_t hw_bufsize = 0; 
+
 int
 SnackAudioOpen(ADesc *A, Tcl_Interp *interp, char *device, int mode, int freq,
 	       int nchannels, int encoding)
@@ -135,6 +137,9 @@ SnackAudioOpen(ADesc *A, Tcl_Interp *int
     Tcl_AppendResult(interp, "Failed setting HW params.", NULL);
     return TCL_ERROR;
   }
+
+  snd_pcm_hw_params_get_buffer_size (hw_params, &hw_bufsize); 
+
   snd_pcm_hw_params_free(hw_params);
   snd_pcm_prepare(A->handle);
   if (A->mode == RECORD) {
@@ -202,6 +207,8 @@ SnackAudioPost(ADesc *A)
   int i;
   static char buf[64];
 
+  return;
+
   if (A->debug > 1) Snack_WriteLog("  Enter SnackAudioPost\n");
 
   for (i = 0; i < 1000; i++) {
@@ -267,12 +274,14 @@ SnackAudioWriteable(ADesc *A)
 long
 SnackAudioPlayed(ADesc *A)
 {
-  long avail = _snd_pcm_mmap_hw_ptr(A->handle);
+  // FIX Here, _snd_pcm_mmap_hw_ptr is deprecated in new alsalib
+  long played = A->nWritten - (hw_bufsize - SnackAudioWriteable(A));
+  // long avail = _snd_pcm_mmap_hw_ptr(A->handle); 
   
-  if (avail < 0)
-    avail = 0;
+  if (played < 0)
+    return 0;
 
-  return (avail+A->nPlayed);
+  return (played);
 }
 
 void


Index: tcl-snack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-snack/F-9/tcl-snack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tcl-snack.spec	18 Sep 2008 15:31:09 -0000	1.3
+++ tcl-snack.spec	22 Sep 2008 18:37:30 -0000	1.4
@@ -9,7 +9,7 @@
 
 Name:		tcl-%{realname}
 Version:	2.2.10
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Sound toolkit
 Group:		System Environment/Libraries
 License:	GPLv2+
@@ -24,6 +24,7 @@
 Patch0:		snack2.2.10-nomp3.patch
 Patch1:		snack2.2.10-extracflags.patch
 Patch2:		snack2.2.10-shared-stubs.patch
+Patch3:		snack2.2.10-newALSA.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	tcl-devel, tk-devel, alsa-lib-devel, libogg-devel, libvorbis-devel
 BuildRequires:	python-devel
@@ -59,6 +60,7 @@
 %patch0 -p1 -b .nomp3
 %patch1 -p1 -b .extracflags
 %patch2 -p1 -b .shared-stubs
+%patch3 -p1 -b .newALSA
 chmod -x generic/*.c generic/*.h unix/*.c COPYING README demos/python/*
 iconv -f iso-8859-1 -t utf-8 -o README{.utf8,}
 mv README{.utf8,}
@@ -101,6 +103,9 @@
 %{python_sitelib}/tkSnack*
 
 %changelog
+* Mon Sep 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-5
+- fix to work with new alsa (from Jeremiah at Myah OS)
+
 * Thu Sep 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-4
 - *sigh* hardcoding the tcl version is the only way to get it through the buildsystem
 



From spot at fedoraproject.org  Mon Sep 22 18:38:00 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 22 Sep 2008 18:38:00 +0000 (UTC)
Subject: rpms/tcl-snack/devel snack2.2.10-newALSA.patch, NONE,
	1.1 tcl-snack.spec, 1.3, 1.4
Message-ID: <20080922183800.D4857700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-snack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15973/devel

Modified Files:
	tcl-snack.spec 
Added Files:
	snack2.2.10-newALSA.patch 
Log Message:
fix snack to work with new alsa

snack2.2.10-newALSA.patch:

--- NEW FILE snack2.2.10-newALSA.patch ---
diff -up snack2.2.10/unix/jkAudIO_alsa.c.newALSA snack2.2.10/unix/jkAudIO_alsa.c
--- snack2.2.10/unix/jkAudIO_alsa.c.newALSA	2008-09-22 14:19:55.000000000 -0400
+++ snack2.2.10/unix/jkAudIO_alsa.c	2008-09-22 14:21:44.000000000 -0400
@@ -49,6 +49,8 @@ static int littleEndian = 0;
 
 static int minNumChan = 1;
 
+static snd_pcm_uframes_t hw_bufsize = 0; 
+
 int
 SnackAudioOpen(ADesc *A, Tcl_Interp *interp, char *device, int mode, int freq,
 	       int nchannels, int encoding)
@@ -135,6 +137,9 @@ SnackAudioOpen(ADesc *A, Tcl_Interp *int
     Tcl_AppendResult(interp, "Failed setting HW params.", NULL);
     return TCL_ERROR;
   }
+
+  snd_pcm_hw_params_get_buffer_size (hw_params, &hw_bufsize); 
+
   snd_pcm_hw_params_free(hw_params);
   snd_pcm_prepare(A->handle);
   if (A->mode == RECORD) {
@@ -202,6 +207,8 @@ SnackAudioPost(ADesc *A)
   int i;
   static char buf[64];
 
+  return;
+
   if (A->debug > 1) Snack_WriteLog("  Enter SnackAudioPost\n");
 
   for (i = 0; i < 1000; i++) {
@@ -267,12 +274,14 @@ SnackAudioWriteable(ADesc *A)
 long
 SnackAudioPlayed(ADesc *A)
 {
-  long avail = _snd_pcm_mmap_hw_ptr(A->handle);
+  // FIX Here, _snd_pcm_mmap_hw_ptr is deprecated in new alsalib
+  long played = A->nWritten - (hw_bufsize - SnackAudioWriteable(A));
+  // long avail = _snd_pcm_mmap_hw_ptr(A->handle); 
   
-  if (avail < 0)
-    avail = 0;
+  if (played < 0)
+    return 0;
 
-  return (avail+A->nPlayed);
+  return (played);
 }
 
 void


Index: tcl-snack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-snack/devel/tcl-snack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tcl-snack.spec	18 Sep 2008 15:31:09 -0000	1.3
+++ tcl-snack.spec	22 Sep 2008 18:37:30 -0000	1.4
@@ -9,7 +9,7 @@
 
 Name:		tcl-%{realname}
 Version:	2.2.10
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Sound toolkit
 Group:		System Environment/Libraries
 License:	GPLv2+
@@ -24,6 +24,7 @@
 Patch0:		snack2.2.10-nomp3.patch
 Patch1:		snack2.2.10-extracflags.patch
 Patch2:		snack2.2.10-shared-stubs.patch
+Patch3:		snack2.2.10-newALSA.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	tcl-devel, tk-devel, alsa-lib-devel, libogg-devel, libvorbis-devel
 BuildRequires:	python-devel
@@ -59,6 +60,7 @@
 %patch0 -p1 -b .nomp3
 %patch1 -p1 -b .extracflags
 %patch2 -p1 -b .shared-stubs
+%patch3 -p1 -b .newALSA
 chmod -x generic/*.c generic/*.h unix/*.c COPYING README demos/python/*
 iconv -f iso-8859-1 -t utf-8 -o README{.utf8,}
 mv README{.utf8,}
@@ -101,6 +103,9 @@
 %{python_sitelib}/tkSnack*
 
 %changelog
+* Mon Sep 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-5
+- fix to work with new alsa (from Jeremiah at Myah OS)
+
 * Thu Sep 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-4
 - *sigh* hardcoding the tcl version is the only way to get it through the buildsystem
 



From deji at fedoraproject.org  Mon Sep 22 18:41:51 2008
From: deji at fedoraproject.org (Deji Akingunola)
Date: Mon, 22 Sep 2008 18:41:51 +0000 (UTC)
Subject: rpms/gparted/devel gparted.spec,1.43,1.44
Message-ID: <20080922184151.910C4700FE@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16566

Modified Files:
	gparted.spec 
Log Message:
BR gnome-doc-utils



Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gparted.spec	22 Sep 2008 18:23:20 -0000	1.43
+++ gparted.spec	22 Sep 2008 18:41:21 -0000	1.44
@@ -1,7 +1,7 @@
 Summary:	Gnome Partition Editor
 Name:		gparted
 Version:	0.3.9
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://gparted.sourceforge.net
@@ -11,7 +11,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtkmm24-devel parted-devel 
 BuildRequires:	e2fsprogs-devel gettext perl(XML::Parser) 
-BuildRequires:	desktop-file-utils
+BuildRequires:	desktop-file-utils gnome-doc-utils
 BuildRequires:  scrollkeeper
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper



From mclasen at fedoraproject.org  Mon Sep 22 18:42:39 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 18:42:39 +0000 (UTC)
Subject: rpms/libsoup/devel .cvsignore, 1.37, 1.38 libsoup.spec, 1.72,
	1.73 sources, 1.37, 1.38
Message-ID: <20080922184239.BCF3C700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libsoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16662

Modified Files:
	.cvsignore libsoup.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsoup/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	9 Sep 2008 01:31:38 -0000	1.37
+++ .cvsignore	22 Sep 2008 18:42:09 -0000	1.38
@@ -1 +1 @@
-libsoup-2.23.92.tar.bz2
+libsoup-2.24.0.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/extras/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- libsoup.spec	9 Sep 2008 01:31:38 -0000	1.72
+++ libsoup.spec	22 Sep 2008 18:42:09 -0000	1.73
@@ -3,14 +3,14 @@
 ### Abstract ###
 
 Name: libsoup
-Version: 2.23.92
+Version: 2.24.0
 Release: 1%{?dist}
 License: LGPLv2
 Group: Development/Libraries
 Summary: Soup, an HTTP library implementation
 URL: http://live.gnome.org/LibSoup
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Source: http://download.gnome.org/sources/libsoup/2.23/libsoup-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/libsoup/2.24/libsoup-%{version}.tar.bz2
 
 ### Build Dependencies ###
 
@@ -80,6 +80,9 @@
 %{_datadir}/gtk-doc/html/%{name}-2.4
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsoup/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	9 Sep 2008 01:31:38 -0000	1.37
+++ sources	22 Sep 2008 18:42:09 -0000	1.38
@@ -1 +1 @@
-d2cb29312ee513da196cc1a9538a1053  libsoup-2.23.92.tar.bz2
+ffbccb92ec83a7278c5cbc8e64bbe10c  libsoup-2.24.0.tar.bz2



From robert at fedoraproject.org  Mon Sep 22 18:45:13 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 22 Sep 2008 18:45:13 +0000 (UTC)
Subject: rpms/phpMyAdmin/EL-4 .cvsignore, 1.22, 1.23 phpMyAdmin.spec, 1.30, 
	1.31 sources, 1.26, 1.27
Message-ID: <20080922184513.AB8D5700FE@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17712/EL-4

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 2.11.9.2 (#463260)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	16 Sep 2008 07:50:39 -0000	1.22
+++ .cvsignore	22 Sep 2008 18:44:43 -0000	1.23
@@ -1 +1 @@
-phpMyAdmin-2.11.9.1-all-languages.tar.bz2
+phpMyAdmin-2.11.9.2-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/phpMyAdmin.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- phpMyAdmin.spec	16 Sep 2008 07:50:39 -0000	1.30
+++ phpMyAdmin.spec	22 Sep 2008 18:44:43 -0000	1.31
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 2.11.9.1
+Version: 2.11.9.2
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Mon Sep 22 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9.2-1
+- Upstream released 2.11.9.2 (#463260)
+
 * Tue Sep 16 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9.1-1
 - Upstream released 2.11.9.1 (#462430)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	16 Sep 2008 07:50:39 -0000	1.26
+++ sources	22 Sep 2008 18:44:43 -0000	1.27
@@ -1 +1 @@
-04bebba1ef0f260018cbeec2a1e9b9ff  phpMyAdmin-2.11.9.1-all-languages.tar.bz2
+fa1f19b342cbd5d0e23dcc47bff40635  phpMyAdmin-2.11.9.2-all-languages.tar.bz2



From robert at fedoraproject.org  Mon Sep 22 18:45:13 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 22 Sep 2008 18:45:13 +0000 (UTC)
Subject: rpms/phpMyAdmin/EL-5 .cvsignore, 1.22, 1.23 phpMyAdmin.spec, 1.30, 
	1.31 sources, 1.26, 1.27
Message-ID: <20080922184513.DA8D1700FE@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17712/EL-5

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 2.11.9.2 (#463260)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	16 Sep 2008 07:50:40 -0000	1.22
+++ .cvsignore	22 Sep 2008 18:44:43 -0000	1.23
@@ -1 +1 @@
-phpMyAdmin-2.11.9.1-all-languages.tar.bz2
+phpMyAdmin-2.11.9.2-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/phpMyAdmin.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- phpMyAdmin.spec	16 Sep 2008 07:50:40 -0000	1.30
+++ phpMyAdmin.spec	22 Sep 2008 18:44:43 -0000	1.31
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 2.11.9.1
+Version: 2.11.9.2
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Mon Sep 22 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9.2-1
+- Upstream released 2.11.9.2 (#463260)
+
 * Tue Sep 16 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9.1-1
 - Upstream released 2.11.9.1 (#462430)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	16 Sep 2008 07:50:40 -0000	1.26
+++ sources	22 Sep 2008 18:44:43 -0000	1.27
@@ -1 +1 @@
-04bebba1ef0f260018cbeec2a1e9b9ff  phpMyAdmin-2.11.9.1-all-languages.tar.bz2
+fa1f19b342cbd5d0e23dcc47bff40635  phpMyAdmin-2.11.9.2-all-languages.tar.bz2



From robert at fedoraproject.org  Mon Sep 22 18:45:14 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 22 Sep 2008 18:45:14 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-8 .cvsignore, 1.23, 1.24 phpMyAdmin.spec, 1.30,
	1.31 sources, 1.26, 1.27
Message-ID: <20080922184514.1B991700FE@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17712/F-8

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 2.11.9.2 (#463260)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-8/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	16 Sep 2008 07:50:40 -0000	1.23
+++ .cvsignore	22 Sep 2008 18:44:43 -0000	1.24
@@ -1 +1 @@
-phpMyAdmin-2.11.9.1-all-languages.tar.bz2
+phpMyAdmin-2.11.9.2-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-8/phpMyAdmin.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- phpMyAdmin.spec	16 Sep 2008 07:50:40 -0000	1.30
+++ phpMyAdmin.spec	22 Sep 2008 18:44:43 -0000	1.31
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 2.11.9.1
+Version: 2.11.9.2
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Mon Sep 22 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9.2-1
+- Upstream released 2.11.9.2 (#463260)
+
 * Tue Sep 16 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9.1-1
 - Upstream released 2.11.9.1 (#462430)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-8/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	16 Sep 2008 07:50:40 -0000	1.26
+++ sources	22 Sep 2008 18:44:43 -0000	1.27
@@ -1 +1 @@
-04bebba1ef0f260018cbeec2a1e9b9ff  phpMyAdmin-2.11.9.1-all-languages.tar.bz2
+fa1f19b342cbd5d0e23dcc47bff40635  phpMyAdmin-2.11.9.2-all-languages.tar.bz2



From robert at fedoraproject.org  Mon Sep 22 18:45:14 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 22 Sep 2008 18:45:14 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-9 .cvsignore, 1.26, 1.27 phpMyAdmin.spec, 1.30,
	1.31 sources, 1.26, 1.27
Message-ID: <20080922184514.4DD9F700FE@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17712/F-9

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 2.11.9.2 (#463260)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	16 Sep 2008 07:50:40 -0000	1.26
+++ .cvsignore	22 Sep 2008 18:44:44 -0000	1.27
@@ -1 +1 @@
-phpMyAdmin-2.11.9.1-all-languages.tar.bz2
+phpMyAdmin-2.11.9.2-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/phpMyAdmin.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- phpMyAdmin.spec	16 Sep 2008 07:50:40 -0000	1.30
+++ phpMyAdmin.spec	22 Sep 2008 18:44:44 -0000	1.31
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 2.11.9.1
+Version: 2.11.9.2
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Mon Sep 22 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9.2-1
+- Upstream released 2.11.9.2 (#463260)
+
 * Tue Sep 16 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9.1-1
 - Upstream released 2.11.9.1 (#462430)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	16 Sep 2008 07:50:40 -0000	1.26
+++ sources	22 Sep 2008 18:44:44 -0000	1.27
@@ -1 +1 @@
-04bebba1ef0f260018cbeec2a1e9b9ff  phpMyAdmin-2.11.9.1-all-languages.tar.bz2
+fa1f19b342cbd5d0e23dcc47bff40635  phpMyAdmin-2.11.9.2-all-languages.tar.bz2



From robert at fedoraproject.org  Mon Sep 22 18:45:14 2008
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 22 Sep 2008 18:45:14 +0000 (UTC)
Subject: rpms/phpMyAdmin/devel .cvsignore, 1.26, 1.27 phpMyAdmin.spec, 1.30, 
	1.31 sources, 1.26, 1.27
Message-ID: <20080922184514.84F4B700FE@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17712/devel

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 2.11.9.2 (#463260)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	16 Sep 2008 07:50:41 -0000	1.26
+++ .cvsignore	22 Sep 2008 18:44:44 -0000	1.27
@@ -1 +1 @@
-phpMyAdmin-2.11.9.1-all-languages.tar.bz2
+phpMyAdmin-2.11.9.2-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- phpMyAdmin.spec	16 Sep 2008 07:50:41 -0000	1.30
+++ phpMyAdmin.spec	22 Sep 2008 18:44:44 -0000	1.31
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 2.11.9.1
+Version: 2.11.9.2
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Mon Sep 22 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9.2-1
+- Upstream released 2.11.9.2 (#463260)
+
 * Tue Sep 16 2008 Robert Scheck <robert at fedoraproject.org> 2.11.9.1-1
 - Upstream released 2.11.9.1 (#462430)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	16 Sep 2008 07:50:41 -0000	1.26
+++ sources	22 Sep 2008 18:44:44 -0000	1.27
@@ -1 +1 @@
-04bebba1ef0f260018cbeec2a1e9b9ff  phpMyAdmin-2.11.9.1-all-languages.tar.bz2
+fa1f19b342cbd5d0e23dcc47bff40635  phpMyAdmin-2.11.9.2-all-languages.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 18:45:24 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 18:45:24 +0000 (UTC)
Subject: rpms/metacity/devel .cvsignore, 1.77, 1.78 metacity.spec, 1.164,
	1.165 sources, 1.77, 1.78
Message-ID: <20080922184524.AC9CA700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17850

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- .cvsignore	10 Sep 2008 01:08:25 -0000	1.77
+++ .cvsignore	22 Sep 2008 18:44:54 -0000	1.78
@@ -1 +1 @@
-metacity-2.23.610.tar.bz2
+metacity-2.24.0.tar.bz2


Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- metacity.spec	19 Sep 2008 23:11:34 -0000	1.164
+++ metacity.spec	22 Sep 2008 18:44:54 -0000	1.165
@@ -1,9 +1,9 @@
 Summary: Metacity window manager
 Name: metacity
-Version: 2.23.610
-Release: 2%{?dist}
+Version: 2.24.0
+Release: 1%{?dist}
 URL: http://download.gnome.org/sources/metacity/
-Source0: http://download.gnome.org/sources/metacity/2.23/metacity-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/metacity/2.24/metacity-%{version}.tar.bz2
 Patch0: default-theme.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=482354
 Patch1: metacity-2.21.13-dont-move-windows.patch
@@ -161,6 +161,9 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Fri Sep 19 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.610-2
 - Fix some memory leaks
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- sources	10 Sep 2008 01:08:25 -0000	1.77
+++ sources	22 Sep 2008 18:44:54 -0000	1.78
@@ -1 +1 @@
-59bf58fc5c8f4b11014caf66483d6605  metacity-2.23.610.tar.bz2
+d4aa782d5f71b6c42514b239684a4aa3  metacity-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 18:48:52 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 18:48:52 +0000 (UTC)
Subject: rpms/GConf2/devel .cvsignore, 1.37, 1.38 GConf2.spec, 1.90,
	1.91 sources, 1.37, 1.38
Message-ID: <20080922184853.0536A700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/GConf2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19560

Modified Files:
	.cvsignore GConf2.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GConf2/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	23 Aug 2008 00:58:24 -0000	1.37
+++ .cvsignore	22 Sep 2008 18:48:22 -0000	1.38
@@ -1 +1 @@
-GConf-2.23.2.tar.bz2
+GConf-2.24.0.tar.bz2


Index: GConf2.spec
===================================================================
RCS file: /cvs/extras/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- GConf2.spec	23 Aug 2008 00:58:24 -0000	1.90
+++ GConf2.spec	22 Sep 2008 18:48:22 -0000	1.91
@@ -6,7 +6,7 @@
 
 Summary: A process-transparent configuration system
 Name: GConf2
-Version: 2.23.2
+Version: 2.24.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
@@ -33,8 +33,6 @@
 Requires: /usr/bin/killall
 
 Patch0: GConf-2.18.0.1-reload.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=356573
-Patch1: GConf2-2.14.0-timeout.patch
 
 %description
 GConf is a process-transparent configuration database API used to 
@@ -70,7 +68,6 @@
 %prep
 %setup -q -n GConf-%{version}
 %patch0 -p1 -b .reload
-%patch1 -p1 -b .timers  
 
 %build
 %configure --disable-static --enable-defaults-service
@@ -140,6 +137,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+- Drop obsolete timeout patch
+
 * Fri Aug 22 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.2-1
 - Update to 2.23.2
 - Drop upstreamed patches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GConf2/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	23 Aug 2008 00:58:24 -0000	1.37
+++ sources	22 Sep 2008 18:48:22 -0000	1.38
@@ -1 +1 @@
-e43e125e4ee84205d5e9215d91c3229d  GConf-2.23.2.tar.bz2
+4971d96f5ba94fe4a69396267bd5afe8  GConf-2.24.0.tar.bz2



From deji at fedoraproject.org  Mon Sep 22 18:58:21 2008
From: deji at fedoraproject.org (Deji Akingunola)
Date: Mon, 22 Sep 2008 18:58:21 +0000 (UTC)
Subject: rpms/gparted/F-9 gparted.spec,1.40,1.41
Message-ID: <20080922185821.10B2A700FE@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21199

Modified Files:
	gparted.spec 
Log Message:
add BR gnome-doc-utils



Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/F-9/gparted.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gparted.spec	22 Sep 2008 18:37:12 -0000	1.40
+++ gparted.spec	22 Sep 2008 18:57:50 -0000	1.41
@@ -11,7 +11,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtkmm24-devel parted-devel 
 BuildRequires:	e2fsprogs-devel gettext perl(XML::Parser) 
-BuildRequires:	desktop-file-utils
+BuildRequires:	desktop-file-utils gnome-doc-utils
 BuildRequires:  scrollkeeper
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper



From rstrode at fedoraproject.org  Mon Sep 22 18:59:06 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 22 Sep 2008 18:59:06 +0000 (UTC)
Subject: rpms/gdm/devel gdm-2.23.92-force-active-vt.patch, 1.3, 1.4 gdm.spec,
	1.420, 1.421
Message-ID: <20080922185906.4C317700FE@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21351

Modified Files:
	gdm-2.23.92-force-active-vt.patch gdm.spec 
Log Message:
- Fix permssions on spool dir


gdm-2.23.92-force-active-vt.patch:

Index: gdm-2.23.92-force-active-vt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.23.92-force-active-vt.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdm-2.23.92-force-active-vt.patch	12 Sep 2008 16:40:28 -0000	1.3
+++ gdm-2.23.92-force-active-vt.patch	22 Sep 2008 18:58:36 -0000	1.4
@@ -163,7 +163,7 @@
  
 +	if test '!' -d $(DESTDIR)$(spooldir); then \
 +		$(mkinstalldirs) $(DESTDIR)$(spooldir); \
-+		chmod 1770 $(DESTDIR)$(spooldir); \
++		chmod 775 $(DESTDIR)$(spooldir); \
 +		chown root:gdm $(DESTDIR)$(spooldir) || : ; \
 +	fi
 +


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -r1.420 -r1.421
--- gdm.spec	22 Sep 2008 17:33:36 -0000	1.420
+++ gdm.spec	22 Sep 2008 18:58:36 -0000	1.421
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -307,13 +307,13 @@
 %dir %{_datadir}/gdm/autostart/LoginWindow
 %config %{_datadir}/gdm/autostart/LoginWindow/*
 %dir %{_localstatedir}/log/gdm
+%dir %{_localstatedir}/spool/gdm
 %attr(1750, root, gdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory
 %attr(1640, root, gdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory/*.xml
 %attr(1640, root, gdm) %dir %{_localstatedir}/lib/gdm/.gconf.path
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 %attr(1770, root, gdm) %dir %{_localstatedir}/lib/gdm
 %attr(1777, root, gdm) %dir %{_localstatedir}/run/gdm
-%attr(1770, root, gdm) %dir %{_localstatedir}/spool/gdm
 
 %files user-switch-applet
 %defattr(-, root, root)
@@ -322,6 +322,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Mon Sep 22 2008 Ray Strode <rstrode at redhat.com> - 1:2.24.0-2
+- Fix permssions on spool dir
+
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-1
 - Update to 2.24.0
 



From krh at fedoraproject.org  Mon Sep 22 18:59:49 2008
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Mon, 22 Sep 2008 18:59:49 +0000 (UTC)
Subject: rpms/kernel/devel drm-create-handle-for-fb.patch, NONE,
	1.1 kernel.spec, 1.962, 1.963
Message-ID: <20080922185949.E81B3700FE@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21619

Modified Files:
	kernel.spec 
Added Files:
	drm-create-handle-for-fb.patch 
Log Message:
* Mon Sep 22 2008 Kristian H??gsberg <krh at redhat.com>
- Add patch to allow userspace to get a handle for the buffer object
  backing the drm fbdev buffer.


drm-create-handle-for-fb.patch:

--- NEW FILE drm-create-handle-for-fb.patch ---
>From ad69a5217c83468ee8f6edac931b8bef58b2f410 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
Date: Mon, 22 Sep 2008 12:00:57 -0400
Subject: [PATCH] Store the buffer object backing the fb as a void pointer, not a handle.

This lets us defer handle creation until userspace acutally asks for
one, at which point we also have a drm_file to associate it with.
---
 drivers/gpu/drm/drm_crtc.c                  |    2 +-
 drivers/gpu/drm/drm_crtc_helper.c           |    5 +-
 drivers/gpu/drm/radeon/atombios_crtc.c      |    4 +-
 drivers/gpu/drm/radeon/radeon_display.c     |   86 +++++++++------------------
 drivers/gpu/drm/radeon/radeon_fb.c          |    6 +-
 drivers/gpu/drm/radeon/radeon_legacy_crtc.c |    8 ++-
 drivers/gpu/drm/radeon/radeon_mode.h        |    7 +-
 drivers/gpu/drm/radeon/radeon_pm.c          |    9 ++-
 include/drm/drm_crtc.h                      |    5 +-
 include/drm/drm_crtc_helper.h               |    3 +-
 10 files changed, 58 insertions(+), 77 deletions(-)

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 8375bf9..15b9f3e 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -1629,8 +1629,8 @@ int drm_mode_getfb(struct drm_device *dev,
 	r->width = fb->width;
 	r->depth = fb->depth;
 	r->bpp = fb->bits_per_pixel;
-	r->handle = fb->mm_handle;
 	r->pitch = fb->pitch;
+	fb->funcs->create_handle(fb, file_priv, &r->handle);
 
 out:
 	mutex_unlock(&dev->mode_config.mutex);
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index b507315..b334f5b 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -771,14 +771,15 @@ int drm_helper_hotplug_stage_two(struct drm_device *dev)
 EXPORT_SYMBOL(drm_helper_hotplug_stage_two);
 
 int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb,
-				   struct drm_mode_fb_cmd *mode_cmd)
+				   struct drm_mode_fb_cmd *mode_cmd,
+				   void *mm_private)
 {
 	fb->width = mode_cmd->width;
 	fb->height = mode_cmd->height;
 	fb->pitch = mode_cmd->pitch;
 	fb->bits_per_pixel = mode_cmd->bpp;
 	fb->depth = mode_cmd->depth;
-	fb->mm_handle = mode_cmd->handle;
+	fb->mm_private = mm_private;
 	
 	return 0;
 }
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index a618132..20e6d02 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -231,6 +231,7 @@ void atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y)
 	struct drm_device *dev = crtc->dev;
 	struct drm_radeon_private *dev_priv = dev->dev_private;
 	struct radeon_framebuffer *radeon_fb;
+	struct drm_gem_object *obj;
 	struct drm_radeon_gem_object *obj_priv;
 	uint32_t fb_location, fb_format, fb_pitch_pixels;
 
@@ -239,7 +240,8 @@ void atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y)
 
 	radeon_fb = to_radeon_framebuffer(crtc->fb);
 
-	obj_priv = radeon_fb->obj->driver_private;
+	obj = radeon_fb->base.mm_private;
+	obj_priv = obj->driver_private;
 
 	fb_location = obj_priv->bo->offset + dev_priv->fb_location;
 
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index a2cb66a..c459338 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -518,15 +518,25 @@ static void radeon_user_framebuffer_destroy(struct drm_framebuffer *fb)
 	kfree(radeon_fb);
 }
 
+static int radeon_user_framebuffer_create_handle(struct drm_framebuffer *fb,
+						  struct drm_file *file_priv,
+						  unsigned int *handle)
+{
+	struct drm_gem_object *object = fb->mm_private;
+
+	return drm_gem_handle_create(file_priv, object, handle);
+}
+
 static const struct drm_framebuffer_funcs radeon_fb_funcs = {
 	.destroy = radeon_user_framebuffer_destroy,
+	.create_handle = radeon_user_framebuffer_create_handle,
 };
 
-struct drm_framebuffer *radeon_user_framebuffer_create(struct drm_device *dev,
-						       struct drm_file *filp,
-						       struct drm_mode_fb_cmd *mode_cmd)
+struct drm_framebuffer *
+radeon_framebuffer_create(struct drm_device *dev,
+			  struct drm_mode_fb_cmd *mode_cmd,
+			  void *mm_private)
 {
-
 	struct radeon_framebuffer *radeon_fb;
 
 	radeon_fb = kzalloc(sizeof(*radeon_fb), GFP_KERNEL);
@@ -534,26 +544,25 @@ struct drm_framebuffer *radeon_user_framebuffer_create(struct drm_device *dev,
 		return NULL;
 
 	drm_framebuffer_init(dev, &radeon_fb->base, &radeon_fb_funcs);
-	drm_helper_mode_fill_fb_struct(&radeon_fb->base, mode_cmd);
-
-	if (filp) {
-		radeon_fb->obj = drm_gem_object_lookup(dev, filp,
-						       mode_cmd->handle);
-		if (!radeon_fb->obj) {
-			kfree(radeon_fb);
-			return NULL;
-		}
-		/* copy the root into the object */
-		if (mode_cmd->flags & DRM_FB_COPY_ROOT) {
-			radeon_copy_fb(dev, radeon_fb->obj);
-		}
-		drm_gem_object_unreference(radeon_fb->obj);
-	}
-
+	drm_helper_mode_fill_fb_struct(&radeon_fb->base, mode_cmd, mm_private);
 		
 	return &radeon_fb->base;
 }
 
+static struct drm_framebuffer *
+radeon_user_framebuffer_create(struct drm_device *dev,
+			       struct drm_file *file_priv,
+			       struct drm_mode_fb_cmd *mode_cmd)
+{
+
+	struct radeon_framebuffer *radeon_fb;
+	void *mm_private;
+
+	mm_private = drm_gem_object_lookup(dev, file_priv, mode_cmd->handle);
+
+	return radeon_framebuffer_create(dev, mode_cmd, mm_private);
+}
+
 static const struct drm_mode_config_funcs radeon_mode_funcs = {
 	.fb_create = radeon_user_framebuffer_create,
 	.fb_changed = radeonfb_probe,
@@ -612,40 +621,3 @@ void radeon_modeset_cleanup(struct drm_device *dev)
 {
 	drm_mode_config_cleanup(dev);
 }
-
-void radeon_copy_fb(struct drm_device *dev, struct drm_gem_object *dst_obj)
-{
-	/* find the current fb */
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-	struct drm_crtc *crtc;
-	struct drm_framebuffer *fb = NULL;
-	struct radeon_framebuffer *radeon_fb;
-	struct drm_radeon_gem_object *obj_priv_dst, *obj_priv_src;
-
-	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-		if (crtc->fb) {
-			fb = crtc->fb;
-			break;
-		}
-	}
-
-	if (!fb) {
-		DRM_ERROR("can't find fb to copy from\n");
-		return;
-	}
-
-	radeon_fb = to_radeon_framebuffer(fb);
-
-	obj_priv_dst = dst_obj->driver_private;
-	obj_priv_src = radeon_fb->obj->driver_private;
-
-	DRM_DEBUG("copying fb %p to %p %d\n", obj_priv_dst->bo->offset + dev_priv->fb_location,
-		  obj_priv_src->bo->offset + dev_priv->fb_location, obj_priv_dst->bo->num_pages);
-
-	/* shove out a blit */
-	radeon_emit_copy_blit(dev,
-			      obj_priv_src->bo->offset + dev_priv->fb_location,
-			      obj_priv_dst->bo->offset + dev_priv->fb_location,
-			      obj_priv_dst->bo->num_pages);
-
-}
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index 83d39d3..3d1e4ea 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -504,7 +504,7 @@ int radeonfb_create(struct drm_device *dev, uint32_t fb_width, uint32_t fb_heigh
 	}
 
 	mutex_lock(&dev->struct_mutex);
-	fb = radeon_user_framebuffer_create(dev, NULL, &mode_cmd);
+	fb = radeon_framebuffer_create(dev, &mode_cmd, fbo);
 	if (!fb) {
 		DRM_ERROR("failed to allocate fb.\n");
 		ret = -ENOMEM;
@@ -516,8 +516,6 @@ int radeonfb_create(struct drm_device *dev, uint32_t fb_width, uint32_t fb_heigh
 	radeon_fb = to_radeon_framebuffer(fb);
 	*radeon_fb_p = radeon_fb;
 
-	radeon_fb->obj = fbo;
-
 	info = framebuffer_alloc(sizeof(struct radeonfb_par), device);
 	if (!info) {
 		ret = -ENOMEM;
@@ -910,7 +908,7 @@ int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
 		unregister_framebuffer(info);
 		drm_bo_kunmap(&radeon_fb->kmap_obj);
 		mutex_lock(&dev->struct_mutex);
-		drm_gem_object_unreference(radeon_fb->obj);
+		drm_gem_object_unreference(fb->mm_private);
 		mutex_unlock(&dev->struct_mutex);
 		framebuffer_release(info);
 	}
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
index 58c2f9d..71f60ec 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
@@ -176,6 +176,7 @@ static bool radeon_set_crtc1_base(struct drm_crtc *crtc, int x, int y)
 	struct drm_device *dev = crtc->dev;
 	struct drm_radeon_private *dev_priv = dev->dev_private;
 	struct radeon_framebuffer *radeon_fb;
+	struct drm_gem_object *obj;
 	struct drm_radeon_gem_object *obj_priv;
 	uint32_t base;
 	uint32_t crtc_offset, crtc_offset_cntl, crtc_tile_x0_y0 = 0;
@@ -185,7 +186,8 @@ static bool radeon_set_crtc1_base(struct drm_crtc *crtc, int x, int y)
 
 	radeon_fb = to_radeon_framebuffer(crtc->fb);
 
-	obj_priv = radeon_fb->obj->driver_private;
+	obj = radeon_fb->base.mm_private;
+	obj_priv = obj->driver_private;
 
 	crtc_offset = obj_priv->bo->offset;
 
@@ -594,6 +596,7 @@ static bool radeon_set_crtc2_base(struct drm_crtc *crtc, int x, int y)
 	struct drm_device *dev = crtc->dev;
 	struct drm_radeon_private *dev_priv = dev->dev_private;
 	struct radeon_framebuffer *radeon_fb;
+	struct drm_gem_object *obj;
 	struct drm_radeon_gem_object *obj_priv;
 	uint32_t base;
 	uint32_t crtc2_offset, crtc2_offset_cntl, crtc2_tile_x0_y0 = 0;
@@ -603,7 +606,8 @@ static bool radeon_set_crtc2_base(struct drm_crtc *crtc, int x, int y)
 
 	radeon_fb = to_radeon_framebuffer(crtc->fb);
 
-	obj_priv = radeon_fb->obj->driver_private;
+	obj = radeon_fb->base.mm_private;
+	obj_priv = obj->driver_private;
 
 	crtc2_offset = obj_priv->bo->offset;
 
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
index a4ee78a..7201f36 100644
--- a/drivers/gpu/drm/radeon/radeon_mode.h
+++ b/drivers/gpu/drm/radeon/radeon_mode.h
@@ -239,7 +239,6 @@ struct radeon_connector {
 
 struct radeon_framebuffer {
 	struct drm_framebuffer base;
-	struct drm_gem_object *obj;
 	struct drm_bo_kmap_obj kmap_obj;
 };
 
@@ -302,9 +301,9 @@ extern void radeon_atom_output_lock(struct drm_encoder *encoder, bool lock);
 extern void radeon_atom_initialize_bios_scratch_regs(struct drm_device *dev);
 extern void radeon_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
 				     u16 blue, int regno);
-struct drm_framebuffer *radeon_user_framebuffer_create(struct drm_device *dev,
-						       struct drm_file *filp,
-						       struct drm_mode_fb_cmd *mode_cmd);
+struct drm_framebuffer *radeon_framebuffer_create(struct drm_device *dev,
+						  struct drm_mode_fb_cmd *mode_cmd,
+						  void *mm_private);
 
 int radeonfb_probe(struct drm_device *dev);
 
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index c7a57b9..1eed239 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -54,10 +54,10 @@ int radeon_suspend(struct drm_device *dev, pm_message_t state)
 		if (!radeon_fb)
 			continue;
 
-		if (!radeon_fb->obj)
+		if (!radeon_fb->base.mm_private)
 			continue;
 		
-		radeon_gem_object_unpin(radeon_fb->obj);
+		radeon_gem_object_unpin(radeon_fb->base.mm_private);
 	}
 
 	if (!(dev_priv->flags & RADEON_IS_IGP))
@@ -168,10 +168,11 @@ int radeon_resume(struct drm_device *dev)
 		if (!radeon_fb)
 			continue;
 
-		if (!radeon_fb->obj)
+		if (!radeon_fb->base.mm_private)
 			continue;
 		
-		radeon_gem_object_pin(radeon_fb->obj, PAGE_SIZE, RADEON_GEM_DOMAIN_VRAM);
+		radeon_gem_object_pin(radeon_fb->base.mm_private,
+				      PAGE_SIZE, RADEON_GEM_DOMAIN_VRAM);
 	}
 	/* blat the mode back in */
 	drm_helper_resume_force_mode(dev);
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 5f63dc2..6a73a71 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -220,6 +220,9 @@ struct drm_display_info {
 
 struct drm_framebuffer_funcs {
 	void (*destroy)(struct drm_framebuffer *framebuffer);
+	int (*create_handle)(struct drm_framebuffer *fb,
+			     struct drm_file *file_priv,
+			     unsigned int *handle);
 };
 
 struct drm_framebuffer {
@@ -237,7 +240,7 @@ struct drm_framebuffer {
 	void *fbdev;
 	u32 pseudo_palette[17];
 	struct list_head filp_head;
-	uint32_t mm_handle;
+	void *mm_private;
 };
 
 struct drm_property_blob {
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
index c071915..01b1423 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
@@ -75,7 +75,8 @@ extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, struct drm_display_m
 extern bool drm_helper_crtc_in_use(struct drm_crtc *crtc);
 
 extern int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb,
-					  struct drm_mode_fb_cmd *mode_cmd);
+					  struct drm_mode_fb_cmd *mode_cmd,
+					  void *mm_private);
 
 static inline void drm_crtc_helper_add(struct drm_crtc *crtc, const struct drm_crtc_helper_funcs *funcs)
 {
-- 
1.5.6.GIT



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.962
retrieving revision 1.963
diff -u -r1.962 -r1.963
--- kernel.spec	22 Sep 2008 14:07:05 -0000	1.962
+++ kernel.spec	22 Sep 2008 18:59:19 -0000	1.963
@@ -609,6 +609,7 @@
 Patch1811: drm-modesetting-radeon.patch
 Patch1812: drm-modesetting-i915.patch
 Patch1813: drm-nouveau.patch
+Patch1814: drm-create-handle-for-fb.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1167,6 +1168,7 @@
 ApplyPatch drm-modesetting-radeon.patch
 ApplyPatch drm-modesetting-i915.patch
 ApplyPatch drm-nouveau.patch
+ApplyPatch drm-create-handle-for-fb.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1758,6 +1760,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Sep 22 2008 Kristian H??gsberg <krh at redhat.com>
+- Add patch to allow userspace to get a handle for the buffer object
+  backing the drm fbdev buffer.
+
 * Mon Sep 22 2008 Kyle McMartin <kyle at redhat.com>
 - Linux 2.6.27-rc7
 



From krh at fedoraproject.org  Mon Sep 22 19:01:40 2008
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Mon, 22 Sep 2008 19:01:40 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel copy-fb-contents.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.114, 1.115
Message-ID: <20080922190140.C34EB700FE@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22162

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	copy-fb-contents.patch 
Log Message:
* Fri Sep 19 2008 Kristian H??gsberg <krh at redhat.com> - 6.9.0-15
- Add copy-fb-contents.patch to initialize the root window contents
  with the fbdev contents for slick startup.


copy-fb-contents.patch:

--- NEW FILE copy-fb-contents.patch ---
diff -up xf86-video-ati-6.9.0/src/drmmode_display.c.copy-fb-contents xf86-video-ati-6.9.0/src/drmmode_display.c
--- xf86-video-ati-6.9.0/src/drmmode_display.c.copy-fb-contents	2008-09-19 15:46:48.000000000 -0400
+++ xf86-video-ati-6.9.0/src/drmmode_display.c	2008-09-22 14:05:15.000000000 -0400
@@ -31,8 +31,11 @@
 
 #ifdef XF86DRM_MODE
 #include "radeon.h"
+#include "radeon_reg.h"
 #include "sarea.h"
 
+#include "dri_bufmgr.h"
+
 static Bool drmmode_resize_fb(ScrnInfoPtr scrn, drmmode_ptr drmmode, int width, int height);
 
 static Bool
@@ -119,6 +122,76 @@ drmmode_crtc_dpms(xf86CrtcPtr drmmode_cr
 
 }
 
+struct radeon_exa_pixmap_priv {
+    dri_bo *bo;
+    int flags;
+};
+
+static PixmapPtr
+create_pixmap_for_fb(drmmode_ptr drmmode, ScrnInfoPtr pScrn, drmModeFBPtr fb)
+{
+	ScreenPtr pScreen = pScrn->pScreen;
+	PixmapPtr pPixmap;
+	struct radeon_exa_pixmap_priv *driver_priv;
+	dri_bo *bo;
+
+	pPixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, fb->depth, 0);
+	driver_priv = exaGetPixmapDriverPrivate(pPixmap);
+	if (!driver_priv) {
+		(*pScreen->DestroyPixmap)(pPixmap);
+		return NULL;
+	}
+
+	miModifyPixmapHeader(pPixmap, fb->width, fb->height, fb->depth,
+                             pScrn->bitsPerPixel, fb->pitch, NULL);
+
+	bo = radeon_bo_gem_create_from_handle(drmmode->bufmgr,
+					      fb->handle,
+					      fb->pitch * fb->height);
+	driver_priv->bo = bo;
+	if (bo == NULL) {
+		(*pScreen->DestroyPixmap)(pPixmap);
+		return NULL;
+	}
+
+    	return pPixmap;
+}
+
+static void
+copy_fb_contents (drmmode_ptr drmmode,
+		  ScrnInfoPtr pScrn,
+		  unsigned int dest_id, int x, int y, unsigned int src_id)
+{
+	RADEONInfoPtr info = RADEONPTR(pScrn);
+	drmModeFBPtr dest_fb, src_fb;
+	dri_bo *dest_bo, *src_bo;
+	PixmapPtr src_pixmap, dest_pixmap;
+	ScreenPtr pScreen = pScrn->pScreen;
+
+	dest_fb = drmModeGetFB(drmmode->fd, dest_id);
+	src_fb = drmModeGetFB(drmmode->fd, src_id);
+	if (src_fb == NULL) {
+		ErrorF("failed to get old fb, id %d\n", src_id);
+		return;
+	}
+
+	dest_pixmap = create_pixmap_for_fb(drmmode, pScrn, dest_fb);
+	src_pixmap = create_pixmap_for_fb(drmmode, pScrn, src_fb);
+
+	info->exa->PrepareCopy (src_pixmap, dest_pixmap,
+				0, 0, GXcopy, 0xffffff);
+	info->exa->Copy (dest_pixmap, 0, 0, x, y,
+			 src_fb->width, src_fb->height);
+	info->exa->DoneCopy (dest_pixmap);
+	RADEONCPFlushIndirect(pScrn, 0);
+
+	(*pScreen->DestroyPixmap)(dest_pixmap);
+	(*pScreen->DestroyPixmap)(src_pixmap);
+
+	drmFree(dest_fb);
+	drmFree(src_fb);
+}
+
 static Bool
 drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 		     Rotation rotation, int x, int y)
@@ -170,15 +243,14 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
 
 	drmmode_ConvertToKMode(crtc->scrn, &kmode, mode);
 
-
 	fb_id = drmmode->fb_id;
 	if (drmmode_crtc->rotate_fb_id)
 		fb_id = drmmode_crtc->rotate_fb_id;
-	ErrorF("fb id is %d\n", fb_id);
+	copy_fb_contents (drmmode, crtc->scrn, fb_id, x, y,
+			  drmmode_crtc->mode_crtc->buffer_id);
 	drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
 		       fb_id, x, y, output_ids, output_count, &kmode);
 
-
 done:
 	if (!ret) {
 		crtc->x = saved_x;
diff -up xf86-video-ati-6.9.0/src/radeon_bufmgr_gem.c.copy-fb-contents xf86-video-ati-6.9.0/src/radeon_bufmgr_gem.c
--- xf86-video-ati-6.9.0/src/radeon_bufmgr_gem.c.copy-fb-contents	2008-09-19 15:46:48.000000000 -0400
+++ xf86-video-ati-6.9.0/src/radeon_bufmgr_gem.c	2008-09-19 15:46:48.000000000 -0400
@@ -353,6 +353,27 @@ void radeon_bufmgr_gem_wait_rendering(dr
 	return;
 }
 
+dri_bo *
+radeon_bo_gem_create_from_handle(dri_bufmgr *bufmgr,
+				 uint32_t handle, unsigned long size)
+{
+    dri_bo_gem *bo_gem;
+
+    bo_gem = calloc(1, sizeof(*bo_gem));
+    if (!bo_gem)
+	return NULL;
+
+    bo_gem->bo.size = size;
+    bo_gem->bo.offset = 0;
+    bo_gem->bo.virtual = NULL;
+    bo_gem->bo.bufmgr = bufmgr;
+    bo_gem->name = 0;
+    bo_gem->refcount = 1;
+    bo_gem->gem_handle = handle;
+
+    return &bo_gem->bo;
+}
+
 /**
  * Returns a dri_bo wrapping the given buffer object handle.
  *
@@ -364,32 +385,20 @@ radeon_bo_gem_create_from_name(dri_bufmg
 			       unsigned int handle)
 {
     dri_bufmgr_gem *bufmgr_gem = (dri_bufmgr_gem *)bufmgr;
-    dri_bo_gem *bo_gem;
     int ret;
     struct drm_gem_open open_arg;
 
-    bo_gem = calloc(1, sizeof(*bo_gem));
-    if (!bo_gem)
-	return NULL;
-
     memset(&open_arg, 0, sizeof(open_arg));
     open_arg.name = handle;
     ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_GEM_OPEN, &open_arg);
     if (ret != 0) {
 	fprintf(stderr, "Couldn't reference %s handle 0x%08x: %s\n",
 	       name, handle, strerror(-ret));
-	free(bo_gem);
 	return NULL;
     }
-    bo_gem->bo.size = open_arg.size;
-    bo_gem->bo.offset = 0;
-    bo_gem->bo.virtual = NULL;
-    bo_gem->bo.bufmgr = bufmgr;
-    bo_gem->name = name;
-    bo_gem->refcount = 1;
-    bo_gem->gem_handle = open_arg.handle;
 
-    return &bo_gem->bo;
+    return radeon_bo_gem_create_from_handle(bufmgr,
+					    open_arg.handle, open_arg.size);
 }
 
 #define BUF_OUT_RING(x)	 do {			\
diff -up xf86-video-ati-6.9.0/src/radeon_bufmgr_gem.h.copy-fb-contents xf86-video-ati-6.9.0/src/radeon_bufmgr_gem.h
diff -up xf86-video-ati-6.9.0/src/radeon_bufmgr.h.copy-fb-contents xf86-video-ati-6.9.0/src/radeon_bufmgr.h
--- xf86-video-ati-6.9.0/src/radeon_bufmgr.h.copy-fb-contents	2008-09-19 15:46:48.000000000 -0400
+++ xf86-video-ati-6.9.0/src/radeon_bufmgr.h	2008-09-19 15:46:48.000000000 -0400
@@ -16,6 +16,8 @@ struct radeon_bufmgr {
 dri_bufmgr *radeon_bufmgr_gem_init(int fd);
 dri_bo *radeon_bo_gem_create_from_name(dri_bufmgr *bufmgr, const char *name,
 				       unsigned int handle);
+dri_bo *radeon_bo_gem_create_from_handle(dri_bufmgr *bufmgr,
+					 uint32_t handle, unsigned long size);
 
 void radeon_bufmgr_emit_reloc(dri_bo *buf, uint32_t *head, uint32_t *count_p, uint32_t read_domains, uint32_t write_domain);
 
diff -up xf86-video-ati-6.9.0/src/radeon_driver.c.copy-fb-contents xf86-video-ati-6.9.0/src/radeon_driver.c
--- xf86-video-ati-6.9.0/src/radeon_driver.c.copy-fb-contents	2008-09-19 15:46:48.000000000 -0400
+++ xf86-video-ati-6.9.0/src/radeon_driver.c	2008-09-19 15:46:48.000000000 -0400
@@ -3644,6 +3644,24 @@ Bool RADEONScreenInit(int scrnIndex, Scr
     /* xf86CrtcRotate() accesses pScrn->pScreen */
     pScrn->pScreen = pScreen;
 
+    /* Enable aceleration */
+    if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
+	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
+		       "Initializing Acceleration\n");
+	if (RADEONAccelInit(pScreen)) {
+	    xf86DrvMsg(scrnIndex, X_INFO, "Acceleration enabled\n");
+	    info->accelOn = TRUE;
+	} else {
+	    xf86DrvMsg(scrnIndex, X_ERROR,
+		       "Acceleration initialization failed\n");
+	    xf86DrvMsg(scrnIndex, X_INFO, "Acceleration disabled\n");
+	    info->accelOn = FALSE;
+	}
+    } else {
+	xf86DrvMsg(scrnIndex, X_INFO, "Acceleration disabled\n");
+	info->accelOn = FALSE;
+    }
+
     if (!xf86SetDesiredModes (pScrn))
 	return FALSE;
 
@@ -3714,25 +3732,6 @@ Bool RADEONScreenInit(int scrnIndex, Scr
         RADEONChangeSurfaces(pScrn);
     }
 
-
-    /* Enable aceleration */
-    if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
-	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
-		       "Initializing Acceleration\n");
-	if (RADEONAccelInit(pScreen)) {
-	    xf86DrvMsg(scrnIndex, X_INFO, "Acceleration enabled\n");
-	    info->accelOn = TRUE;
-	} else {
-	    xf86DrvMsg(scrnIndex, X_ERROR,
-		       "Acceleration initialization failed\n");
-	    xf86DrvMsg(scrnIndex, X_INFO, "Acceleration disabled\n");
-	    info->accelOn = FALSE;
-	}
-    } else {
-	xf86DrvMsg(scrnIndex, X_INFO, "Acceleration disabled\n");
-	info->accelOn = FALSE;
-    }
-
     /* Init DPMS */
     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
 		   "Initializing DPMS\n");


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.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- xorg-x11-drv-ati.spec	11 Sep 2008 19:44:55 -0000	1.114
+++ xorg-x11-drv-ati.spec	22 Sep 2008 19:01:10 -0000	1.115
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   14%{?dist}
+Release:   15%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -20,6 +20,7 @@
 Patch3:	    radeon-fix-pipe-config.patch
 Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
+Patch6:     copy-fb-contents.patch
 
 ExcludeArch: s390 s390x
 
@@ -44,6 +45,7 @@
 %patch3 -p1 -b .pipe-config
 %patch4 -p1 -b .remove-limit-heuristics
 %patch5 -p1 -b .panel-size
+%patch6 -p1 -b .copy-fb-contents
 
 %build
 autoreconf
@@ -75,6 +77,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Sep 19 2008 Kristian H??gsberg <krh at redhat.com> - 6.9.0-15
+- Add copy-fb-contents.patch to initialize the root window contents
+  with the fbdev contents for slick startup.
+
 * Thu Sep 11 2008 Adam Jackson <ajax at redhat.com> 6.9.0-14
 - radeon-6.9.0-panel-size-sanity.patch: Panels smaller than 800x480 are
   highly implausible, disable them if we find them.  If you have one,



From lkundrak at fedoraproject.org  Mon Sep 22 19:06:49 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 22 Sep 2008 19:06:49 +0000 (UTC)
Subject: rpms/libgda/EL-5 import.log, NONE, 1.1 libgda-3.0.0-man.patch, NONE,
	1.1 libgda-3.0.1-detect-sqlite.patch, NONE,
	1.1 libgda-3.0.1-ldap.patch, NONE,
	1.1 libgda-3.0.1-mdb-64bit.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 libgda.spec, 1.18, 1.19 sources, 1.3,
	1.4 libgda-1.9.100-64bit.patch, 1.1,
	NONE libgda-1.9.100-configure.patch, 1.1,
	NONE libgda-1.9.100-sharp.patch, 1.3,
	NONE libgda-1.9.100-syslibs.patch, 1.2, NONE
Message-ID: <20080922190649.7AE98700FE@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/libgda/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24087/EL-5

Modified Files:
	.cvsignore libgda.spec sources 
Added Files:
	import.log libgda-3.0.0-man.patch 
	libgda-3.0.1-detect-sqlite.patch libgda-3.0.1-ldap.patch 
	libgda-3.0.1-mdb-64bit.patch 
Removed Files:
	libgda-1.9.100-64bit.patch libgda-1.9.100-configure.patch 
	libgda-1.9.100-sharp.patch libgda-1.9.100-syslibs.patch 
Log Message:
Import libgda-3.0.1-6.fc9


--- NEW FILE import.log ---
libgda-3_0_1-6_fc10:EL-5:libgda-3.0.1-6.fc10.src.rpm:1222110344

libgda-3.0.0-man.patch:

--- NEW FILE libgda-3.0.0-man.patch ---
--- libgda-3.0.0/tools/gda-config-3.0.5.man	2007-04-24 09:42:36.000000000 +0200
+++ libgda-3.0.0/tools/gda-config-3.0.5	2007-04-24 09:42:05.000000000 +0200
@@ -0,0 +1,52 @@
+.\" 
+.\" gda-config man page
+.\" (C) 2003 GNOME Foundation
+.\" Author:
+.\"   Gonzalo Paniagua Javier (gonzalo at gnome-db.org)
+.\"
+.TH gda-config-3.0 "5" "January 2003" "libgda" "File Formats"
+.SH NAME
+$(sysconfdir)/libgda/config \- libgda global configuration file.
+$(HOME)/.libgda/config \- libgda user configuration file.
+.SH DESCRIPTION
+The config file of libgda is an XML file. The document starts with
+<libgda-config> tag, which contains sections that hold the configured
+database providers for libgda.
+.PP
+The values in the global configuration file are overriden by the ones in the
+user configuration file.
+.PP
+Each <section> has a 'path' attribute whose value \fImust\fP be something like
+"/apps/libgda/Datasources/XXXXXXXX", where XXXXXXXX is the name of the
+database backend (i.e., postgres, mysql,...)
+.PP
+Inside each <section> you can have for <entry> tags with 'name', 'type' and 'value'
+attributes. Valid values for 'name' are: \fIProvider\fP,
+\fIUsername\fP, \fIDSN\fP and \fIDescription\fP. 'type' value is always
+"string" and 'value' contains the value for the given 'name'.
+.SH EXAMPLE
+This is a sample file. You may modify it manually, add/remove sections,...
+.RS
+.sp
+.nf
+<?xml version="1.0"?>
+<libgda-config>
+  <section path="/apps/libgda/Datasources/postgres">
+    <entry name="Provider" type="string" value="PostgreSQL"/>
+    <entry name="Username" type="string" value="gonzalo"/>
+    <entry name="DSN" type="string"
+           value="DATABASE=test;USER=gonzalo"/>
+    <entry name="Description" type="string"
+           value="Mi favourite provider"/>
+  </section>
+</libgda-config>
+.fi
+.sp
+.RE
+You can also use \fBgda-config-tool-3.0\fR or \fBmergeant\fR (recommended) to modify
+this file.
+.SH SEE ALSO
+.BR mergeant (1),
+.BR gda-config-tool-3.0 (1)
+
+
--- libgda-3.0.0/tools/gda-config-tool-3.0.1.man	2007-04-24 09:42:41.000000000 +0200
+++ libgda-3.0.0/tools/gda-config-tool-3.0.1	2007-04-24 09:41:43.000000000 +0200
@@ -0,0 +1,63 @@
+.\" 
+.\" gda-config-tool man page
+.\" (C) 2002 GNOME Foundation
+.\" Author:
+.\"   Gonzalo Paniagua Javier (gonzalo at gnome-db.org)
+.\"
+.TH gda-config-tool-3.0 "1" "October 2002" "gda-config-tool-3.0 (libgda)" "User Commands"
+.SH NAME
+gda-config-tool-3.0 \- Tool for managing libgda configuration file.
+.SH SYNOPSIS
+.PP
+.B gda-config-tool-3.0 [OPTIONS]
+.SH DESCRIPTION
+The \fIgda-config-tool-3.0\fP program can be used create/edit/remove a libgda
+provider. It can be used both as a command line program and an interactive
+program.
+.SH OPTIONS
+.PP
+The following options are supported:
+.TP
+\fB\-?\fR, \fB\-\-help\fR
+Displays command line options.
+.TP
+\fB--usage\fR
+Display brief usage message.
+.TP
+\fB--l\fR, \fB\-\-list\-providers\fR
+Lists installed providers.
+.TP
+\fB--L\fR, \fB\-\-list\-datasources\fR
+Lists configured data sources.
+.TP
+\fB--n\fR, \fB\-\-name=NAME\fR
+User-assigned name for the provider and connection settings.
+.TP
+\fB--u\fR, \fB\-\-user=NAME\fR
+User name to pass to the provider when connecting.
+.TP
+\fB--p\fR, \fB\-\-password=NAME\fR
+Password for the given user to pass to the DB backend.
+.TP
+\fB--P\fR, \fB\-\-provider=NAME\fR
+Provider name.
+.TP
+\fB--d\fR, \fB\-\-DSN="NAME=VALUE;..."\fR
+Semi-colon separated list of parameter=value option to pass to the provider.
+.SH ENVIRONMENT VARIABLES
+.TP
+NONE
+.SH FILES
+.PP
+$(sysconfdir)/libgda/config
+.IP
+Global configurations settings read for every user.
+.PP
+${HOME}/.libgda/config
+.IP
+User settings. Override global settings.
+.SH SEE ALSO
+.BR mergeant(1),
+.BR gda-config-3.0(5)
+
+

libgda-3.0.1-detect-sqlite.patch:

--- NEW FILE libgda-3.0.1-detect-sqlite.patch ---
diff -up libgda-3.0.1/configure.in~ libgda-3.0.1/configure.in
--- libgda-3.0.1/configure.in~	2007-08-08 11:25:16.000000000 +0200
+++ libgda-3.0.1/configure.in	2007-08-08 11:25:16.000000000 +0200
@@ -925,9 +925,10 @@ PKG_CHECK_MODULES(SQLITE, $SQLITE_MODULE
 if test x"$have_sqlite" = "xyes"
 then
         realvers=`sqlite3 -version` 
+        minorvers=`sqlite3 -version | cut -d '.' -f 2`
         microvers=`sqlite3 -version | cut -d '.' -f 3`
         AC_MSG_CHECKING(for sqlite version)
-        if test $microvers -lt 100
+        if test $minorvers -lt 4 -a $microvers -lt 100
         then
                 AC_MSG_RESULT(Version $realvers of SQLite does not implement required pragmas, using embedded SQLite)
                 have_sqlite=no
diff -up libgda-3.0.1/configure.sqlite libgda-3.0.1/configure
--- libgda-3.0.1/configure.sqlite	2007-05-04 23:42:33.000000000 +0200
+++ libgda-3.0.1/configure	2007-08-16 13:18:24.000000000 +0200
@@ -24884,10 +24884,11 @@ fi
 if test x"$have_sqlite" = "xyes"
 then
         realvers=`sqlite3 -version`
+        minorvers=`sqlite3 -version | cut -d '.' -f 2`
         microvers=`sqlite3 -version | cut -d '.' -f 3`
         { echo "$as_me:$LINENO: checking for sqlite version" >&5
 echo $ECHO_N "checking for sqlite version... $ECHO_C" >&6; }
-        if test $microvers -lt 100
+        if test $minorvers -lt 4 -a $microvers -lt 100
         then
                 { echo "$as_me:$LINENO: result: Version $realvers of SQLite does not implement required pragmas" >&5
 echo "${ECHO_T}Version $realvers of SQLite does not implement required pragmas" >&6; }

libgda-3.0.1-ldap.patch:

--- NEW FILE libgda-3.0.1-ldap.patch ---
--- libgda-3.0.1/providers/ldap/gda-ldap.h~	2007-05-27 21:03:31.000000000 +0200
+++ libgda-3.0.1/providers/ldap/gda-ldap.h	2007-05-27 21:03:31.000000000 +0200
@@ -32,6 +32,8 @@
 #include <glib/gi18n-lib.h>
 #include <libgda/gda-value.h>
 #include "gda-ldap-provider.h"
+/* we use the old API (time to update) */
+#define LDAP_DEPRECATED 1
 #include <ldap.h>
 #include <ldap_schema.h>
 

libgda-3.0.1-mdb-64bit.patch:

--- NEW FILE libgda-3.0.1-mdb-64bit.patch ---
diff -up libgda-3.0.1/providers/mdb/gda-mdb-table.c~ libgda-3.0.1/providers/mdb/gda-mdb-table.c
--- libgda-3.0.1/providers/mdb/gda-mdb-table.c~	2007-08-16 13:36:34.000000000 +0200
+++ libgda-3.0.1/providers/mdb/gda-mdb-table.c	2007-08-16 13:36:34.000000000 +0200
@@ -23,6 +23,7 @@
 
 #include "gda-mdb-table.h"
 #include <libgda/gda-data-model-private.h>
+#include <libgda/gda-data-model-array.h>
 
 GdaDataModel *
 gda_mdb_table_new (GdaMdbConnection *mdb_cnc, const gchar *name)
@@ -40,7 +41,7 @@ gda_mdb_table_new (GdaMdbConnection *mdb
 	for (i = 0; i < mdb_cnc->mdb->num_catalog; i++) {
 		entry = g_ptr_array_index (mdb_cnc->mdb->catalog, i);
 		if (entry->object_type == MDB_TABLE
-		    && !strcmp (entry->object_type, name))
+		    && !strcmp (entry->object_name, name))
 			break;
 		else
 			entry = NULL;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Nov 2005 20:30:33 -0000	1.3
+++ .cvsignore	22 Sep 2008 19:06:19 -0000	1.4
@@ -1 +1 @@
-libgda-1.9.100.tar.bz2
+libgda-3.0.1.tar.bz2


Index: libgda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/EL-5/libgda.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libgda.spec	29 Aug 2006 05:54:51 -0000	1.18
+++ libgda.spec	22 Sep 2008 19:06:19 -0000	1.19
@@ -1,61 +1,70 @@
-# Default provider build options (MySQL, Postgres & unixODBC)
+# Default provider build options (MySQL, Postgres, unixODBC, LDAP, FreeTDS)
 #
 # Package build options:
-# --with tds
 # --with db2
 # --with oracle
 # --with sybase
-# --with mdb
 # --without ldap
+# --without mdb
 # --without mysql
 # --without odbc
 # --without postgres
+# --without tds
+# --without xbase
 # 
 
-%define           FREETDS  0
 %define           IBMDB2   0
+%define           ORACLE   0
+%define           SYBASE   0
+%define           LDAP     1
+%define           MDB      1
 %define           MYSQL    1
 %define           ODBC     1
-%define           ORACLE   0
 %define           POSTGRES 1
-%define           SYBASE   0
-%define 	  MDB	   0
-%define		  LDAP	   1
+%define           FREETDS  1
+%define           XBASE    1
 
-%{?_with_tds:%define FREETDS 	1}
-%{?_with_db2:%define IBMDB2 	1}
-%{?_with_mdb:%define MDB 	1}
-%{?_with_oracle:%define ORACLE 	1}
-%{?_with_sybase:%define SYBASE 	1}
-%{?_without_ldap:%define LDAP 	0}
+%{?_with_db2:%define IBMDB2     1}
+%{?_with_oracle:%define ORACLE  1}
+%{?_with_sybase:%define SYBASE  1}
+%{?_without_ldap:%define LDAP   0}
+%{?_without_mdb:%define MDB     0}
 %{?_without_mysql:%define MYSQL 0}
-%{?_without_odbc:%define ODBC 	0}
-%{?_without_postgres:%define POSTGRES 	0}
+%{?_without_odbc:%define ODBC   0}
+%{?_without_postgres:%define POSTGRES 0}
+%{?_without_tds:%define FREETDS 0}
+%{?_without_xbase:%define XBASE 0}
 
-Summary:          Library for writing gnome database programs
 Name:             libgda
-Version:          1.9.100
-Release:          10%{?dist}
 Epoch:            1
-Source:           http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.9/%{name}-%{version}.tar.bz2
-URL:              http://www.gnome-db.org/
+Version:          3.0.1
+Release:          6%{?dist}
+Summary:          Library for writing gnome database programs
 Group:            System Environment/Libraries
-License:          LGPL
-BuildRoot:        %{_tmppath}/%{name}-%{version}-root
+License:          LGPLv2+
+URL:              http://www.gnome-db.org/
+Source:           http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.0/%{name}-%{version}.tar.bz2
+Patch1:           libgda-3.0.0-man.patch
+Patch2:           libgda-3.0.1-ldap.patch
+Patch3:           libgda-3.0.1-detect-sqlite.patch
+Patch4:           libgda-3.0.1-mdb-64bit.patch
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    pkgconfig >= 0.8
 BuildRequires:    glib2-devel >= 2.0.0
 BuildRequires:    libxslt-devel >= 1.0.9
-BuildRequires:    libxml2-devel ncurses-devel sqlite-devel readline-devel
-BuildRequires:    db4-devel mono-devel gtk-sharp2-devel gtk-sharp2-gapi
-BuildRequires:    gamin-devel gtk-doc scrollkeeper groff gettext flex bison
-BuildRequires:    intltool automake libtool
+BuildRequires:    sqlite-devel >= 3.4.0
+BuildRequires:    libxml2-devel readline-devel db4-devel gamin-devel
+BuildRequires:    gtk-doc scrollkeeper gettext flex bison perl(XML::Parser)
+# note we do not provide these, they no longer exist
+Obsoletes:        %{name}-sharp < %{epoch}:%{version}-%{release}
+Obsoletes:        %{name}-sharp-devel < %{epoch}:%{version}-%{release}
 
 %if %{FREETDS}
 BuildRequires:    freetds-devel
 %endif
 
 %if %{MYSQL}
-BuildRequires:    mysqlclient10-devel
+BuildRequires:    mysql-devel
 %endif
 
 %if %{POSTGRES}
@@ -67,17 +76,16 @@
 %endif
 
 %if %{MDB}
-BuildRequires:	  mdbtools-devel
+BuildRequires:    mdbtools-devel
 %endif
 
 %if %{LDAP}
-BuildRequires:	  openldap-devel
+BuildRequires:    openldap-devel
 %endif
 
-Patch0: libgda-1.9.100-configure.patch
-Patch1: libgda-1.9.100-sharp.patch
-Patch2: libgda-1.9.100-syslibs.patch
-Patch3: libgda-1.9.100-64bit.patch
+%if %{XBASE}
+BuildRequires:    xbase-devel
+%endif
 
 %description
 libgda is a library that eases the task of writing
@@ -89,137 +97,237 @@
 Group:            Development/Libraries
 Requires:         glib2-devel >= 2.0.0
 Requires:         libxslt-devel >= 1.0.9
-Requires:         db4-devel libxml2-devel
-Requires:	  %{name} = %{epoch}:%{version}-%{release}
+Requires:         db4-devel libxml2-devel pkgconfig
+Requires:         %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
 This package contains the header files and libraries needed to write
 or compile programs that use libgda.
 
 
-%package sharp
-Summary:          Mono bindings for libgda
+%package sqlite
+Summary:          SQLite provider for libgda
 Group:            System Environment/Libraries
 Requires:         %{name} = %{epoch}:%{version}-%{release}
-
-%description sharp
-This package contains the dll files needed to run (and compile) Mono
-applications which use libgda.
-
-
-%package sqlite
-Summary:	libgda SQLite Provider
-Group:		System Environment/Libraries
-Obsoletes:	gda-sqlite < %{epoch}:%{version}-%{release}
-Provides:	gda-sqlite = %{epoch}:%{version}-%{release}
+Obsoletes:        gda-sqlite < %{epoch}:%{version}-%{release}
+Provides:         gda-sqlite = %{epoch}:%{version}-%{release}
 %description sqlite
 This package includes the libgda SQLite provider.
 
+%package sqlite-devel
+Summary:          SQLite provider for libgda pkgconfig file
+Group:            Development/Libraries
+Requires:         pkgconfig
+Requires:         %{name}-sqlite = %{epoch}:%{version}-%{release}
+%description sqlite-devel
+This package includes the pkgconfig file for the libgda SQLite provider.
+
 
 %if %{FREETDS}
 %package freetds
-Summary:	libgda FreeTDS Provider
-Group:		System Environment/Libraries
-Obsoletes:	gda-freetds < %{epoch}:%{version}-%{release}
-Provides:	gda-freetds = %{epoch}:%{version}-%{release}
+Summary:          FreeTDS provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
+Obsoletes:        gda-freetds < %{epoch}:%{version}-%{release}
+Provides:         gda-freetds = %{epoch}:%{version}-%{release}
 %description freetds
 This package includes the libgda FreeTDS provider.
+
+%package freetds-devel
+Summary:          FreeTDS provider for libgda pkgconfig file
+Group:            Development/Libraries
+Requires:         pkgconfig
+Requires:         %{name}-freetds = %{epoch}:%{version}-%{release}
+%description freetds-devel
+This package includes the pkgconfig file for the libgda FreeTDS provider.
 %endif
 
 %if %{IBMDB2}
 %package ibmdb2
-Summary:	libgda IBM DB2 Provider
-Group:		System Environment/Libraries
-Obsoletes:	gda-ibmdb2 < %{epoch}:%{version}-%{release}
-Provides:	gda-ibmdb2 = %{epoch}:%{version}-%{release}
+Summary:          IBM DB2 provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
+Obsoletes:        gda-ibmdb2 < %{epoch}:%{version}-%{release}
+Provides:         gda-ibmdb2 = %{epoch}:%{version}-%{release}
 %description ibmdb2
 This package includes the libgda IBM DB2 provider.
+
+%package ibmdb2-devel
+Summary:          IBM DB2 provider for libgda pkgconfig file
+Group:            Development/Libraries
+Requires:         pkgconfig
+Requires:         %{name}-ibmdb2 = %{epoch}:%{version}-%{release}
+%description ibmdb2-devel
+This package includes the pkgconfig file for the libgda IBM DB2 provider.
 %endif
 
 %if %{MYSQL}
 %package mysql
-Summary:	libgda MySQL Provider
-Group:		System Environment/Libraries
-Obsoletes:	gda-mysql < %{epoch}:%{version}-%{release}
-Provides:	gda-mysql = %{epoch}:%{version}-%{release}
+Summary:          MySQL provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
+Obsoletes:        gda-mysql < %{epoch}:%{version}-%{release}
+Provides:         gda-mysql = %{epoch}:%{version}-%{release}
 %description mysql
 This package includes the libgda MySQL provider.
+
+%package mysql-devel
+Summary:          MySQL provider for libgda pkgconfig file
+Group:            Development/Libraries
+Requires:         pkgconfig
+Requires:         %{name}-mysql = %{epoch}:%{version}-%{release}
+%description mysql-devel
+This package includes the pkgconfig file for the libgda MySQL provider.
 %endif
 
 %if %{ODBC}
 %package odbc
-Summary:	libgda ODBC Provider
-Group:		System Environment/Libraries
-Obsoletes:	gda-odbc < %{epoch}:%{version}-%{release}
-Provides:	gda-odbc = %{epoch}:%{version}-%{release}
+Summary:          ODBC provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
+Obsoletes:        gda-odbc < %{epoch}:%{version}-%{release}
+Provides:         gda-odbc = %{epoch}:%{version}-%{release}
 %description odbc
 This package includes the libgda ODBC provider.
+
+%package odbc-devel
+Summary:          ODBC provider for libgda pkgconfig file
+Group:            Development/Libraries
+Requires:         pkgconfig
+Requires:         %{name}-odbc = %{epoch}:%{version}-%{release}
+%description odbc-devel
+This package includes the pkgconfig file for the libgda ODBC provider.
 %endif
 
 %if %{ORACLE}
 %package oracle
-Summary:	libgda Oracle Provider
-Group:		System Environment/Libraries
-Obsoletes:	gda-oracle < %{epoch}:%{version}-%{release}
-Provides:	gda-oracle = %{epoch}:%{version}-%{release}
+Summary:          Oracle provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
+Obsoletes:        gda-oracle < %{epoch}:%{version}-%{release}
+Provides:         gda-oracle = %{epoch}:%{version}-%{release}
 %description oracle
 This package includes the libgda Oracle provider.
+
+%package oracle-devel
+Summary:          Oracle provider for libgda pkgconfig file
+Group:            Development/Libraries
+Requires:         pkgconfig
+Requires:         %{name}-oracle = %{epoch}:%{version}-%{release}
+%description oracle-devel
+This package includes the pkgconfig file for the libgda Oracle provider.
 %endif
 
 %if %{POSTGRES}
 %package postgres
-Summary:	libgda PostgreSQL Provider
-Group:		System Environment/Libraries
-Obsoletes:	gda-postgres < %{epoch}:%{version}-%{release}
-Provides:	gda-postgres = %{epoch}:%{version}-%{release}
+Summary:          PostgreSQL provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
+Obsoletes:        gda-postgres < %{epoch}:%{version}-%{release}
+Provides:         gda-postgres = %{epoch}:%{version}-%{release}
 %description postgres
 This package includes the libgda PostgreSQL provider.
+
+%package postgres-devel
+Summary:          PostgreSQL provider for libgda pkgconfig file
+Group:            Development/Libraries
+Requires:         pkgconfig
+Requires:         %{name}-postgres = %{epoch}:%{version}-%{release}
+%description postgres-devel
+This package includes the pkgconfig file for the libgda PostgreSQL provider.
 %endif
 
 %if %{SYBASE}
 %package sybase
-Summary:	libgda Sybase Provider
-Group:		System Environment/Libraries
-Obsoletes:	gda-sybase < %{epoch}:%{version}-%{release}
-Provides:	gda-sybase = %{epoch}:%{version}-%{release}
+Summary:          Sybase provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
+Obsoletes:        gda-sybase < %{epoch}:%{version}-%{release}
+Provides:         gda-sybase = %{epoch}:%{version}-%{release}
 %description sybase
 This package includes the libgda Sybase provider.
+
+%package sybase-devel
+Summary:          Sybase provider for libgda pkgconfig file
+Group:            Development/Libraries
+Requires:         pkgconfig
+Requires:         %{name}-sybase = %{epoch}:%{version}-%{release}
+%description sybase-devel
+This package includes the pkgconfig file for the libgda Sybase provider.
 %endif
 
 %if %{MDB}
 %package mdb
-Summary:	libgda MDB Provider
-Group:		System Environment/Libraries
-Obsoletes:	gda-mdb < %{epoch}:%{version}-%{release}
-Provides:	gda-mdb = %{epoch}:%{version}-%{release}
+Summary:          MDB provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
+Obsoletes:        gda-mdb < %{epoch}:%{version}-%{release}
+Provides:         gda-mdb = %{epoch}:%{version}-%{release}
 %description mdb
 This package includes the libgda MDB provider.
-%endif
 
+%package mdb-devel
+Summary:          MDB provider for libgda pkgconfig file
+Group:            Development/Libraries
+Requires:         pkgconfig
+Requires:         %{name}-mdb = %{epoch}:%{version}-%{release}
+%description mdb-devel
+This package includes the pkgconfig file for the libgda MDB provider.
+%endif
+		
 %if %{LDAP}
 %package ldap
-Summary:	libgda LDAP Provider
-Group:		System Environment/Libraries
-Obsoletes:	gda-ldap < %{epoch}:%{version}-%{release}
-Provides:	gda-ldap = %{epoch}:%{version}-%{release}
+Summary:          LDAP provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
+Obsoletes:        gda-ldap < %{epoch}:%{version}-%{release}
+Provides:         gda-ldap = %{epoch}:%{version}-%{release}
 %description ldap
 This package includes the libgda LDAP provider.
+
+%package ldap-devel
+Summary:          LDAP provider for libgda pkgconfig file
+Group:            Development/Libraries
+Requires:         pkgconfig
+Requires:         %{name}-ldap = %{epoch}:%{version}-%{release}
+%description ldap-devel
+This package includes the pkgconfig file for the libgda LDAP provider.
+%endif
+
+%if %{XBASE}
+%package xbase
+Summary:          XBASE provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
+%description xbase
+This package includes the GDA XBASE provider.
+
+%package xbase-devel
+Summary:          XBASE provider for libgda pkgconfig file
+Group:            Development/Libraries
+Requires:         %{name}-xbase = %{epoch}:%{version}-%{release}, pkgconfig
+%description xbase-devel
+This package includes the pkgconfig file for the libgda XBASE provider.
 %endif
 
 
 %prep
 %setup -q
-rm -fr providers/sqlite/sqlite-src
-%patch0 -p1 -b .configure
-%patch1 -p1 -b .sharp
-%patch2 -p1 -b .syslibs
-%patch3 -p1 -b .64bit
+%patch1 -p1 -b .man
+%patch2 -p1 -b .ldap
+%patch3 -p1 -b .sqlite
+%patch4 -p1 -b .64bit
+# fix ppc64 postgres detection
+sed -i 's/x86_64\* | sparc64\*) lib="lib64";;/x86_64\* | sparc64\* | powerpc64\*) lib="lib64";;/' \
+  configure configure.in
+# stop autoxxx rerunning because of our patches above
+touch aclocal.m4
+touch `find -name Makefile.in`
 
 
 %build
-aclocal
-automake
-autoconf
+CONFIG="--disable-static --disable-dependency-tracking"
+
 %if %{FREETDS}
 CONFIG="$CONFIG --with-tds"
 %else
@@ -274,27 +382,32 @@
 CONFIG="$CONFIG --without-ldap"
 %endif
 
+%if %{XBASE}
+CONFIG="$CONFIG --with-xbase"
+%else
+CONFIG="$CONFIG --without-xbase"
+%endif
+
 %configure $CONFIG
-make
+# 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
+# work around gda-report-test-3.0 linking failing because of the disabling of
+# rpath above
+export LD_LIBRARY_PATH=`pwd`/libsql/.libs
+make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
-%makeinstall
-
-#fixup mono / sharp related files install
-mkdir -p %{buildroot}/%{_datadir}/gapi-2.0
-mv %{buildroot}/%{_libdir}/libgda/gda-api.xml %{buildroot}/%{_datadir}/gapi-2.0
-mkdir -p %{buildroot}/usr/lib/mono/gda-sharp-2.0
-mv %{buildroot}/%{_libdir}/libgda/* %{buildroot}/usr/lib/mono/gda-sharp-2.0
-rmdir %{buildroot}/%{_libdir}/libgda
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # Cleanup unnecessary, unpackaged files
-rm -f %{buildroot}/%{_libdir}/libgda-1.9/providers/*.{a,la}
-rm -f %{buildroot}/%{_libdir}/*.{a,la}
-rm -f %{buildroot}/%{_sysconfdir}/libgda/sales_test.db
+rm $RPM_BUILD_ROOT/%{_libdir}/libgda-3.0/providers/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm $RPM_BUILD_ROOT/%{_sysconfdir}/libgda-3.0/sales_test.db
 
-%find_lang libgda-3
+%find_lang libgda-3.0
 
 
 %post -p /sbin/ldconfig
@@ -307,99 +420,179 @@
 %postun devel
 if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
 
+
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
-%files -f libgda-3.lang
-%defattr(-,root,root)
+
+%files -f libgda-3.0.lang
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README NEWS
-#%doc %{_datadir}/gnome/help/libgda
-%dir %{_sysconfdir}/libgda
-%config(noreplace) %{_sysconfdir}/libgda/config
+%config(noreplace) %{_sysconfdir}/libgda-3.0
 %{_bindir}/*
-%{_datadir}/libgda
+%{_datadir}/libgda-3.0
 %{_libdir}/*.so.*
-%dir %{_libdir}/libgda-1.9
-%dir %{_libdir}/libgda-1.9/providers
+%dir %{_libdir}/libgda-3.0
+%dir %{_libdir}/libgda-3.0/providers
 # note this file really should be in its own subpackage too, but libgda
 # needs to have atleast one provider present to be of any use.
-%{_libdir}/libgda-1.9/providers/libgda-bdb.so
+%{_libdir}/libgda-3.0/providers/libgda-bdb.so
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 
 %files devel
-%defattr(-,root,root)
-%doc %{_datadir}/gtk-doc/html/libgda
+%defattr(-,root,root,-)
+%doc %{_datadir}/gtk-doc/html/libgda-3.0
 %{_includedir}/*
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/libgda-2.0.pc
-
-%files sharp
-%defattr(-,root,root)
-%{_datadir}/gapi-2.0
-/usr/lib/mono/gda-sharp-2.0
-%{_libdir}/pkgconfig/gda-sharp-2.0.pc
+%{_libdir}/pkgconfig/libgda-3.0.pc
+%{_libdir}/pkgconfig/libgda-bdb-3.0.pc
 
 %files sqlite
-%defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-sqlite.so
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-sqlite.so
+
+%files sqlite-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-sqlite-3.0.pc
 
 %if %{FREETDS}
 %files freetds
-%defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-freetds.so
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-freetds.so
+
+%files freetds-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-freetds-3.0.pc
 %endif
 
 %if %{IBMDB2}
 %files ibmdb2
-%defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-ibmdb2.so
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-ibmdb2.so
+
+%files ibmdb2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-imdb2-3.0.pc
 %endif
 
 %if %{MYSQL}
 %files mysql
-%defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-mysql.so
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-mysql.so
+
+%files mysql-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-mysql-3.0.pc
 %endif
 
 %if %{ODBC}
 %files odbc
-%defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-odbc.so
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-odbc.so
+
+%files odbc-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-odbc-3.0.pc
 %endif
 
 %if %{ORACLE}
 %files oracle
-%defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-oracle.so
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-oracle.so
+
+%files oracle-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-oracle-3.0.pc
 %endif
 
 %if %{POSTGRES}
 %files postgres
-%defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-postgres.so
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-postgres.so
+
+%files postgres-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-postgres-3.0.pc
 %endif
 
 %if %{SYBASE}
 %files sybase
-%defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-sybase.so
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-sybase.so
+
+%files sybase-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-sybase-3.0.pc
 %endif
 
 %if %{MDB}
 %files mdb
-%defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-mdb.so
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-mdb.so
+
+%files mdb-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-mdb-3.0.pc
 %endif
 
 %if %{LDAP}
 %files ldap
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-ldap.so
+
+%files ldap-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-ldap-3.0.pc
+%endif
+
+%if %{XBASE}
+%files xbase
 %defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-ldap.so
+%{_libdir}/libgda-3.0/providers/libgda-xbase.so
+
+%files xbase-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-xbase-3.0.pc
 %endif
 
 
 %changelog
+* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 3.0.1-6
+- Rebuild for deps
+
+* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.1-5
+- Rebuild to fix untranslated strings on x86_64 in
+  /usr/share/libgda-3.0/sqlite_specs_drop_index.xml
+  which caused multilib problems (bz 342101)
+
+* Fri Aug 17 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.1-4
+- Fix building on ppc64 again (patch configure not configure.in, now we are
+  no longer running autoconf)
+
+* Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.1-3
+- Enable microsoft access (mdb) support now that mdbtools is in Fedora
+- Enable xBase (dBase, Clipper, FoxPro) support, it seems that xbase has been
+  available for quite a while now
+- Switch from using mysqlclient10 to using mysql-libs for the msql provider
+
+* Wed Aug  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.1-2
+- Build against system sqlite instead of own private copy (this is possible now
+  that the system sqlite is of a high enough version) 
+- Enable FreeTDS provider (FreeTDS is in Fedora now)
+- Update License tag for new Licensing Guidelines compliance
+
+* Sun May 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.1-1
+- New upstream release 3.0.1
+- Remove mono bindings sub-package as upstream no longer includes them
+
+* Thu May 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-12
+- Don't build mono/sharp bits on ppc64
+- Fixup packaging of sharp bindings to match the mono packaging guidelines
+
+* Fri Dec 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-11
+- Rebuild for new postgres
+
 * Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-10
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2005 20:30:33 -0000	1.3
+++ sources	22 Sep 2008 19:06:19 -0000	1.4
@@ -1 +1 @@
-c943610dc4c9c286bb14d6ce3c6e549b  libgda-1.9.100.tar.bz2
+1aaf23c27ba94d0b231f2b123350110a  libgda-3.0.1.tar.bz2


--- libgda-1.9.100-64bit.patch DELETED ---


--- libgda-1.9.100-configure.patch DELETED ---


--- libgda-1.9.100-sharp.patch DELETED ---


--- libgda-1.9.100-syslibs.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Sep 22 19:12:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 19:12:34 +0000
Subject: [pkgdb] octave had acl change status
Message-ID: <20080922191234.65CE1208DA2@bastion.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on octave (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave



From pkgdb at fedoraproject.org  Mon Sep 22 19:12:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 19:12:43 +0000
Subject: [pkgdb] octave had acl change status
Message-ID: <20080922191243.69B0F208DA6@bastion.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on octave (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave



From pkgdb at fedoraproject.org  Mon Sep 22 19:12:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 19:12:48 +0000
Subject: [pkgdb] octave had acl change status
Message-ID: <20080922191248.3AF53208DA8@bastion.fedora.phx.redhat.com>

rakesh has set the commit acl on octave (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave



From pkgdb at fedoraproject.org  Mon Sep 22 19:13:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 19:13:13 +0000
Subject: [pkgdb] octave had acl change status
Message-ID: <20080922191313.68993208DA2@bastion.fedora.phx.redhat.com>

rakesh has set the approveacls acl on octave (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave



From rdieter at fedoraproject.org  Mon Sep 22 19:21:32 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 19:21:32 +0000 (UTC)
Subject: rpms/libkdcraw/EL-5 libkdcraw.spec,1.6,1.7 sources,1.6,1.7
Message-ID: <20080922192132.2F979700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkdcraw/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26595

Modified Files:
	libkdcraw.spec sources 
Log Message:
revert back to 1.1.4 (1.1.5 breaks api for kipi-plugins)



Index: libkdcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/EL-5/libkdcraw.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libkdcraw.spec	21 Sep 2008 21:45:00 -0000	1.6
+++ libkdcraw.spec	22 Sep 2008 19:21:01 -0000	1.7
@@ -5,7 +5,7 @@
 %endif
 
 Name:		libkdcraw
-Version:	0.1.5
+Version:	0.1.4
 Release:	1%{?dist}
 Summary:	A library for decoding RAW picture files
 
@@ -95,8 +95,8 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{_libdir}/libkdcraw.so.4*
-%{_libdir}/libkdcraw4/
+%{_libdir}/libkdcraw.so.3*
+%{_libdir}/libkdcraw3/
 %if ! 0%{?nuke_icons}
 %{_datadir}/icons/hicolor/*/*/*
 %endif
@@ -109,12 +109,6 @@
 
 
 %changelog
-* Sun Sep 21 2008 Rex Dieter <rdieter at fedoraproject.org> 1.1.5-1
-- libkdcraw-0.1.5
-
-* Tue Jun 24 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.4-2
-- fix conflicts with kdegraphics (f9+, #452392)
-
 * Wed Mar 12 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.4-1
 - libkdcraw-0.1.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Sep 2008 21:32:12 -0000	1.6
+++ sources	22 Sep 2008 19:21:01 -0000	1.7
@@ -1 +0,0 @@
-cdf9af92d6caf0b052a5e368afdece3d  libkdcraw-0.1.5.tar.bz2



From davej at fedoraproject.org  Mon Sep 22 19:21:48 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Mon, 22 Sep 2008 19:21:48 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.166, 1.167 config-x86-generic, 
	1.47, 1.48 kernel.spec, 1.963, 1.964
Message-ID: <20080922192148.00AB1700FE@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26722

Modified Files:
	config-generic config-x86-generic kernel.spec 
Log Message:
Commit Bills demodularisation patch.


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- config-generic	9 Sep 2008 06:16:19 -0000	1.166
+++ config-generic	22 Sep 2008 19:21:17 -0000	1.167
@@ -333,7 +333,7 @@
 CONFIG_CISS_SCSI_TAPE=y
 CONFIG_BLK_DEV_DAC960=m
 CONFIG_BLK_DEV_UMEM=m
-CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_RAM=y
@@ -427,7 +427,7 @@
 #
 # SCSI device support
 #
-CONFIG_SCSI=m
+CONFIG_SCSI=y
 
 CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_PROC_FS=y
@@ -448,7 +448,7 @@
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_SCH=m
@@ -508,11 +508,11 @@
 
 CONFIG_ATA=y
 CONFIG_ATA_SFF=y
-CONFIG_ATA_PIIX=m
+CONFIG_ATA_PIIX=y
 CONFIG_ATA_ACPI=y
 CONFIG_BLK_DEV_SX8=m
 CONFIG_PDC_ADMA=m
-CONFIG_SATA_AHCI=m
+CONFIG_SATA_AHCI=y
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
@@ -636,7 +636,7 @@
 CONFIG_MD_RAID5_RESHAPE=y
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM=y
 CONFIG_DM_CRYPT=m
 CONFIG_DM_DEBUG=y
 # CONFIG_DM_DELAY is not set
@@ -790,7 +790,7 @@
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XTABLES=y
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
@@ -808,7 +808,7 @@
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
@@ -841,7 +841,7 @@
 #
 # IP: Netfilter Configuration
 #
-CONFIG_NF_CONNTRACK_ENABLED=m
+CONFIG_NF_CONNTRACK_ENABLED=y
 
 CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y
@@ -857,8 +857,8 @@
 CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_NF_CONNTRACK_IPV6=y
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_CT_PROTO_DCCP=m
@@ -1284,7 +1284,7 @@
 CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-CONFIG_MAC80211=m
+CONFIG_MAC80211=y
 CONFIG_MAC80211_QOS=y
 CONFIG_MAC80211_RC_DEFAULT_PID=y
 # CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set
@@ -1299,7 +1299,7 @@
 # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
 # CONFIG_MAC80211_DEBUG is not set
 
-CONFIG_IEEE80211=m
+CONFIG_IEEE80211=y
 CONFIG_IEEE80211_DEBUG=y
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
@@ -2461,17 +2461,17 @@
 #
 # Advanced Linux Sound Architecture
 #
-CONFIG_SND=m
+CONFIG_SND=y
 CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQUENCER=y
 CONFIG_SND_SEQ_DUMMY=m
 CONFIG_SND_SEQUENCER_OSS=y
 CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
 CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
 CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_RTCTIMER=m
+CONFIG_SND_RTCTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 
@@ -2528,7 +2528,7 @@
 CONFIG_SND_ES1968=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_INTEL=y
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_CODEC_REALTEK=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
@@ -2545,7 +2545,7 @@
 CONFIG_SND_HIFIER=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0=y
 CONFIG_SND_INTEL8X0M=m
 CONFIG_SND_KORG1212=m
 CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL=y
@@ -2886,11 +2886,11 @@
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 CONFIG_EXT2_FS_XIP=y
-CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
-CONFIG_JBD=m
+CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
 CONFIG_EXT4DEV_FS=m
 CONFIG_EXT4DEV_FS_XATTR=y
@@ -3199,6 +3199,7 @@
 #
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_MANAGER=m
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AES=m


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- config-x86-generic	27 Jul 2008 07:22:15 -0000	1.47
+++ config-x86-generic	22 Sep 2008 19:21:17 -0000	1.48
@@ -127,12 +127,12 @@
 CONFIG_X86_MPPARSE=y
 
 CONFIG_ACPI=y
-CONFIG_ACPI_AC=m
+CONFIG_ACPI_AC=y
 # CONFIG_ACPI_ASUS is not set
 CONFIG_ACPI_PROCFS_POWER=y
 CONFIG_ACPI_SYSFS_POWER=y
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BAY=m
+CONFIG_ACPI_BATTERY=y
+CONFIG_ACPI_BAY=y
 CONFIG_ACPI_BLACKLIST_YEAR=1999
 CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_CONTAINER=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.963
retrieving revision 1.964
diff -u -r1.963 -r1.964
--- kernel.spec	22 Sep 2008 18:59:19 -0000	1.963
+++ kernel.spec	22 Sep 2008 19:21:17 -0000	1.964
@@ -1760,6 +1760,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Sep 22 2008 Dave Jones <davej at redhat.com>
+- Commit Bills demodularisation patch.
+
 * Mon Sep 22 2008 Kristian H??gsberg <krh at redhat.com>
 - Add patch to allow userspace to get a handle for the buffer object
   backing the drm fbdev buffer.



From rdieter at fedoraproject.org  Mon Sep 22 19:22:07 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 19:22:07 +0000 (UTC)
Subject: rpms/libkdcraw/EL-5 .cvsignore,1.6,1.7
Message-ID: <20080922192207.CACB1700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkdcraw/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26783

Modified Files:
	.cvsignore 
Log Message:
revert



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Sep 2008 21:32:12 -0000	1.6
+++ .cvsignore	22 Sep 2008 19:21:37 -0000	1.7
@@ -1 +1 @@
-libkdcraw-0.1.5.tar.bz2
+libkdcraw-0.1.4.tar.bz2



From rdieter at fedoraproject.org  Mon Sep 22 19:29:14 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 19:29:14 +0000 (UTC)
Subject: rpms/libkdcraw/F-9 libkdcraw.spec,1.14,1.15
Message-ID: <20080922192914.8A76C700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkdcraw/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28147

Modified Files:
	libkdcraw.spec 
Log Message:
revert 1.1.5 breaks kipi-plugins



Index: libkdcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/F-9/libkdcraw.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libkdcraw.spec	21 Sep 2008 21:43:52 -0000	1.14
+++ libkdcraw.spec	22 Sep 2008 19:28:44 -0000	1.15
@@ -5,8 +5,8 @@
 %endif
 
 Name:		libkdcraw
-Version:	0.1.5
-Release:	1%{?dist}
+Version:	0.1.4
+Release:	2%{?dist}
 Summary:	A library for decoding RAW picture files
 
 Group:		Applications/Multimedia
@@ -95,8 +95,8 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{_libdir}/libkdcraw.so.4*
-%{_libdir}/libkdcraw4/
+%{_libdir}/libkdcraw.so.3*
+%{_libdir}/libkdcraw3/
 %if ! 0%{?nuke_icons}
 %{_datadir}/icons/hicolor/*/*/*
 %endif
@@ -109,9 +109,6 @@
 
 
 %changelog
-* Sun Sep 21 2008 Rex Dieter <rdieter at fedoraproject.org> 1.1.5-1
-- libkdcraw-0.1.5
-
 * Tue Jun 24 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.4-2
 - fix conflicts with kdegraphics (f9+, #452392)
 



From rdieter at fedoraproject.org  Mon Sep 22 19:31:18 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 19:31:18 +0000 (UTC)
Subject: rpms/libkdcraw/EL-5 sources,1.7,1.8
Message-ID: <20080922193118.17C6C700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkdcraw/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28338/EL-5

Modified Files:
	sources 
Log Message:
ugh, sources too



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Sep 2008 19:21:01 -0000	1.7
+++ sources	22 Sep 2008 19:30:47 -0000	1.8
@@ -0,0 +1 @@
+4fa5de407e9acf2eb5650d3fb5836f7d  libkdcraw-0.1.4.tar.bz2



From rdieter at fedoraproject.org  Mon Sep 22 19:31:18 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 19:31:18 +0000 (UTC)
Subject: rpms/libkdcraw/F-9 .cvsignore,1.9,1.10 sources,1.9,1.10
Message-ID: <20080922193118.35F01700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkdcraw/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28338/F-9

Modified Files:
	.cvsignore sources 
Log Message:
ugh, sources too



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 Sep 2008 21:30:03 -0000	1.9
+++ .cvsignore	22 Sep 2008 19:30:48 -0000	1.10
@@ -1 +1 @@
-libkdcraw-0.1.5.tar.bz2
+libkdcraw-0.1.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Sep 2008 21:30:03 -0000	1.9
+++ sources	22 Sep 2008 19:30:48 -0000	1.10
@@ -1 +1 @@
-cdf9af92d6caf0b052a5e368afdece3d  libkdcraw-0.1.5.tar.bz2
+4fa5de407e9acf2eb5650d3fb5836f7d  libkdcraw-0.1.4.tar.bz2



From rdieter at fedoraproject.org  Mon Sep 22 19:35:12 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 19:35:12 +0000 (UTC)
Subject: rpms/libkdcraw/EL-5 libkdcraw.spec,1.7,1.8
Message-ID: <20080922193512.77CB9700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkdcraw/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28771

Modified Files:
	libkdcraw.spec 
Log Message:
sync with F-9 branch again (last time really)



Index: libkdcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/EL-5/libkdcraw.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libkdcraw.spec	22 Sep 2008 19:21:01 -0000	1.7
+++ libkdcraw.spec	22 Sep 2008 19:34:42 -0000	1.8
@@ -6,7 +6,7 @@
 
 Name:		libkdcraw
 Version:	0.1.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A library for decoding RAW picture files
 
 Group:		Applications/Multimedia
@@ -109,6 +109,9 @@
 
 
 %changelog
+* Tue Jun 24 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.4-2
+- fix conflicts with kdegraphics (f9+, #452392)
+
 * Wed Mar 12 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.4-1
 - libkdcraw-0.1.4
 



From sharkcz at fedoraproject.org  Mon Sep 22 19:35:38 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 22 Sep 2008 19:35:38 +0000 (UTC)
Subject: rpms/wxGTK/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 wxGTK.spec, 1.40, 1.41
Message-ID: <20080922193538.EFA1E700FE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxGTK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28903

Modified Files:
	.cvsignore sources wxGTK.spec 
Log Message:
* Mon Sep 22 2008 Dan Horak <dan[at]danny.cz> - 2.8.9-1
- update to 2.8.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	31 Jul 2008 17:10:53 -0000	1.10
+++ .cvsignore	22 Sep 2008 19:35:08 -0000	1.11
@@ -1 +1 @@
-wxGTK-2.8.8.tar.bz2
+wxGTK-2.8.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	31 Jul 2008 17:10:53 -0000	1.10
+++ sources	22 Sep 2008 19:35:08 -0000	1.11
@@ -1 +1 @@
-6c73103878bd2a44b42a7b5fbb4c5605  wxGTK-2.8.8.tar.bz2
+495c0287e102c8864eb5237a279ce9c2  wxGTK-2.8.9.tar.bz2


Index: wxGTK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/devel/wxGTK.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- wxGTK.spec	6 Sep 2008 21:26:50 -0000	1.40
+++ wxGTK.spec	22 Sep 2008 19:35:08 -0000	1.41
@@ -5,8 +5,8 @@
 %define withodbc 0
 
 Name:           wxGTK
-Version:        2.8.8
-Release:        2%{?dist}
+Version:        2.8.9
+Release:        1%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -262,6 +262,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Dan Horak <dan[at]danny.cz> - 2.8.9-1
+- update to 2.8.9
+
 * Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.8-2
 - fix license tag
 



From lkundrak at fedoraproject.org  Mon Sep 22 19:36:26 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 22 Sep 2008 19:36:26 +0000 (UTC)
Subject: rpms/libgda/EL-5 libgda.spec, 1.19,
	1.20 libgda-3.0.1-detect-sqlite.patch, 1.1, NONE
Message-ID: <20080922193626.358C1700FE@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/libgda/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29260

Modified Files:
	libgda.spec 
Removed Files:
	libgda-3.0.1-detect-sqlite.patch 
Log Message:
* Mon Sep 22 2008 Lubomir Rintel <lkundrak at v3.sk> - 3.0.1-6.1
- Back into using embedded sqlite for el5



Index: libgda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/EL-5/libgda.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libgda.spec	22 Sep 2008 19:06:19 -0000	1.19
+++ libgda.spec	22 Sep 2008 19:35:56 -0000	1.20
@@ -38,7 +38,7 @@
 Name:             libgda
 Epoch:            1
 Version:          3.0.1
-Release:          6%{?dist}
+Release:          6%{?dist}.1
 Summary:          Library for writing gnome database programs
 Group:            System Environment/Libraries
 License:          LGPLv2+
@@ -46,7 +46,6 @@
 Source:           http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.0/%{name}-%{version}.tar.bz2
 Patch1:           libgda-3.0.0-man.patch
 Patch2:           libgda-3.0.1-ldap.patch
-Patch3:           libgda-3.0.1-detect-sqlite.patch
 Patch4:           libgda-3.0.1-mdb-64bit.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    pkgconfig >= 0.8
@@ -315,7 +314,6 @@
 %setup -q
 %patch1 -p1 -b .man
 %patch2 -p1 -b .ldap
-%patch3 -p1 -b .sqlite
 %patch4 -p1 -b .64bit
 # fix ppc64 postgres detection
 sed -i 's/x86_64\* | sparc64\*) lib="lib64";;/x86_64\* | sparc64\* | powerpc64\*) lib="lib64";;/' \
@@ -558,6 +556,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Lubomir Rintel <lkundrak at v3.sk> - 3.0.1-6.1
+- Back into using embedded sqlite for el5
+
 * Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 3.0.1-6
 - Rebuild for deps
 


--- libgda-3.0.1-detect-sqlite.patch DELETED ---



From lkundrak at fedoraproject.org  Mon Sep 22 19:37:31 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 22 Sep 2008 19:37:31 +0000 (UTC)
Subject: rpms/libgda/EL-5 libgda.spec,1.20,1.21
Message-ID: <20080922193731.6A71A700FE@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/libgda/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29476

Modified Files:
	libgda.spec 
Log Message:
* Mon Sep 22 2008 Lubomir Rintel <lkundrak at v3.sk> - 3.0.1-6.1
- Back into using embedded sqlite for el5



Index: libgda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/EL-5/libgda.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libgda.spec	22 Sep 2008 19:35:56 -0000	1.20
+++ libgda.spec	22 Sep 2008 19:37:01 -0000	1.21
@@ -51,7 +51,6 @@
 BuildRequires:    pkgconfig >= 0.8
 BuildRequires:    glib2-devel >= 2.0.0
 BuildRequires:    libxslt-devel >= 1.0.9
-BuildRequires:    sqlite-devel >= 3.4.0
 BuildRequires:    libxml2-devel readline-devel db4-devel gamin-devel
 BuildRequires:    gtk-doc scrollkeeper gettext flex bison perl(XML::Parser)
 # note we do not provide these, they no longer exist



From spot at fedoraproject.org  Mon Sep 22 19:40:40 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 22 Sep 2008 19:40:40 +0000 (UTC)
Subject: rpms/fedora-release-notes/devel fedora-release-notes.spec, 1.28,
	1.29
Message-ID: <20080922194040.94D74700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-release-notes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30050

Modified Files:
	fedora-release-notes.spec 
Log Message:
Provides: system-release-notes


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- fedora-release-notes.spec	3 Apr 2008 01:48:48 -0000	1.28
+++ fedora-release-notes.spec	22 Sep 2008 19:40:10 -0000	1.29
@@ -1,6 +1,6 @@
 Name:		fedora-release-notes
 Version:	8.92
-Release:	1
+Release:	2
 Summary:	Release Notes for Fedora %{version}
 URL:		http://fedoraproject.org/wiki/Docs/Beats
 
@@ -22,6 +22,8 @@
 Provides:	indexhtml = %{version}-%{release}
 Obsoletes:	indexhtml < 9-3
 
+Provides:	system-release-notes = %{version}-%{release}
+
 %description 
 These are the official Release Notes for Fedora 8,
 written and edited by the Fedora community.  For more
@@ -120,6 +122,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 8.92-2
+- Provides: system-release-notes
+
 * Thu Mar 20 2008 Paul W. Frields <stickster at gmail.com> - 8.92-1
 - Bump version for Fedora 9 Preview Release
 



From rdieter at fedoraproject.org  Mon Sep 22 19:42:43 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 19:42:43 +0000 (UTC)
Subject: rpms/digikam/EL-5 digikam.spec,1.37,1.38
Message-ID: <20080922194243.AF52C700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30599

Modified Files:
	digikam.spec 
Log Message:
respin



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/EL-5/digikam.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- digikam.spec	22 Sep 2008 17:48:02 -0000	1.37
+++ digikam.spec	22 Sep 2008 19:42:13 -0000	1.38
@@ -1,7 +1,7 @@
 
 Name:		digikam
 Version:	0.9.4
-Release: 	2%{?dist}
+Release: 	2%{?dist}.1
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia



From davej at fedoraproject.org  Mon Sep 22 19:44:19 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Mon, 22 Sep 2008 19:44:19 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.167, 1.168 kernel.spec, 1.964,
	1.965
Message-ID: <20080922194419.AF9A9700FE@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31131

Modified Files:
	config-generic kernel.spec 
Log Message:
Readd CONFIG_IWLCORE that disappeared for no apparent reason.


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- config-generic	22 Sep 2008 19:21:17 -0000	1.167
+++ config-generic	22 Sep 2008 19:43:49 -0000	1.168
@@ -1346,6 +1346,7 @@
 CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
 CONFIG_LIBERTAS_DEBUG=y
+CONFIG_IWLCORE=m
 CONFIG_IWLCORE_RFKILL=y
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLWIFI_RUN_TIME_CALIB=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.964
retrieving revision 1.965
diff -u -r1.964 -r1.965
--- kernel.spec	22 Sep 2008 19:21:17 -0000	1.964
+++ kernel.spec	22 Sep 2008 19:43:49 -0000	1.965
@@ -1761,6 +1761,9 @@
 
 %changelog
 * Mon Sep 22 2008 Dave Jones <davej at redhat.com>
+- Readd CONFIG_IWLCORE that disappeared for no apparent reason.
+
+* Mon Sep 22 2008 Dave Jones <davej at redhat.com>
 - Commit Bills demodularisation patch.
 
 * Mon Sep 22 2008 Kristian H??gsberg <krh at redhat.com>



From iburrell at fedoraproject.org  Mon Sep 22 19:46:24 2008
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Mon, 22 Sep 2008 19:46:24 +0000 (UTC)
Subject: rpms/perl-prefork/EL-5 .cvsignore, 1.3, 1.4 perl-prefork.spec, 1.6, 
	1.7 sources, 1.3, 1.4
Message-ID: <20080922194624.8E216700FE@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/pkgs/rpms/perl-prefork/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31506

Modified Files:
	.cvsignore perl-prefork.spec sources 
Log Message:
copy from F-8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-prefork/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Aug 2006 04:45:24 -0000	1.3
+++ .cvsignore	22 Sep 2008 19:45:54 -0000	1.4
@@ -1 +1 @@
-prefork-1.01.tar.gz
+prefork-1.02.tar.gz


Index: perl-prefork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-prefork/EL-5/perl-prefork.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-prefork.spec	17 Aug 2007 04:07:10 -0000	1.6
+++ perl-prefork.spec	22 Sep 2008 19:45:54 -0000	1.7
@@ -1,6 +1,6 @@
 Name: 		perl-prefork
-Version: 	1.01
-Release: 	3%{?dist}
+Version: 	1.02
+Release: 	1%{?dist}
 Summary: 	Optimized module loading for forking or non-forking processes
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -17,6 +17,7 @@
 
 # Required by tests
 BuildRequires: perl(Test::Pod) >= 1.00
+BuildRequires: perl(Test::MinimumVersion) >= 0.007
 
 %description
 Optimized module loading for forking or non-forking processes
@@ -43,7 +44,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-make test
+make test AUTOMATED_TESTING=1
 
 %files
 %defattr(-,root,root,-)
@@ -52,6 +53,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Nov 25 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.02-1
+- Upstream update.
+- Add BR: perl(Test::MinimumVersion).
+
 * Fri Aug 17 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.01-3
 - Update license tag.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-prefork/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Aug 2006 04:45:24 -0000	1.3
+++ sources	22 Sep 2008 19:45:54 -0000	1.4
@@ -1 +1 @@
-42413de51d691f82fe32d6eee0adede2  prefork-1.01.tar.gz
+3dccdbbb32439aa07a8d87eb217f0011  prefork-1.02.tar.gz



From mitr at fedoraproject.org  Mon Sep 22 19:46:44 2008
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Mon, 22 Sep 2008 19:46:44 +0000 (UTC)
Subject: rpms/stunnel/devel .cvsignore, 1.25, 1.26 sources, 1.25,
	1.26 stunnel.spec, 1.52, 1.53 stunnel-4.25-EAI_SERVICE.patch,
	1.1, NONE
Message-ID: <20080922194644.78A1A700FE@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/stunnel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31582

Modified Files:
	.cvsignore sources stunnel.spec 
Removed Files:
	stunnel-4.25-EAI_SERVICE.patch 
Log Message:
* Mon Sep 22 2008 Miloslav Trma?? <mitr at redhat.com> - 4.26-1
- Update to stunnel-4.26.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	2 Jun 2008 01:11:51 -0000	1.25
+++ .cvsignore	22 Sep 2008 19:46:14 -0000	1.26
@@ -1,2 +1,2 @@
-stunnel-4.25.tar.gz
-stunnel-4.25.tar.gz.asc
+stunnel-4.26.tar.gz
+stunnel-4.26.tar.gz.asc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	2 Jun 2008 01:11:51 -0000	1.25
+++ sources	22 Sep 2008 19:46:14 -0000	1.26
@@ -1,2 +1,2 @@
-7f00799f43910c0362df0e69c65965aa  stunnel-4.25.tar.gz
-6b2ba26735b81014fbbaf1982b132084  stunnel-4.25.tar.gz.asc
+0f6706540fbe000513940f4860698405  stunnel-4.26.tar.gz
+a20f1fafdbfe58c60367618935702ff0  stunnel-4.26.tar.gz.asc


Index: stunnel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/stunnel.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- stunnel.spec	8 Jun 2008 05:01:32 -0000	1.52
+++ stunnel.spec	22 Sep 2008 19:46:14 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
-Version: 4.25
-Release: 2
+Version: 4.26
+Release: 1
 License: GPLv2
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/
@@ -14,7 +14,6 @@
 Source6: stunnel-pop3s-client.conf
 Patch0: stunnel-4.08-authpriv.patch
 Patch1: stunnel-4.18-sample.patch
-Patch2: stunnel-4.25-EAI_SERVICE.patch
 Buildroot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
@@ -28,7 +27,6 @@
 %setup -q
 %patch0 -p1 -b .authpriv
 %patch1 -p1 -b .sample
-%patch2 -p1 -b .EAI_SERVICE
 
 iconv -f iso-8859-1 -t utf-8 < doc/stunnel.fr.8 > doc/stunnel.fr.8_
 mv doc/stunnel.fr.8_ doc/stunnel.fr.8
@@ -83,6 +81,9 @@
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Mon Sep 22 2008 Miloslav Trma?? <mitr at redhat.com> - 4.26-1
+- Update to stunnel-4.26.
+
 * Sun Jun  8 2008 Miloslav Trma?? <mitr at redhat.com> - 4.25-2
 - Use a clearer error message if the service name is unknown in "accept"
   Resolves: #450344


--- stunnel-4.25-EAI_SERVICE.patch DELETED ---



From clumens at fedoraproject.org  Mon Sep 22 19:46:58 2008
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Mon, 22 Sep 2008 19:46:58 +0000 (UTC)
Subject: rpms/pykickstart/devel .cvsignore, 1.97, 1.98 pykickstart.spec,
	1.105, 1.106 sources, 1.106, 1.107
Message-ID: <20080922194658.BF045700FE@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31656

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- .cvsignore	3 Sep 2008 20:34:59 -0000	1.97
+++ .cvsignore	22 Sep 2008 19:46:28 -0000	1.98
@@ -31,3 +31,4 @@
 pykickstart-1.41.tar.gz
 pykickstart-1.42.tar.gz
 pykickstart-1.43.tar.gz
+pykickstart-1.44.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- pykickstart.spec	3 Sep 2008 20:34:59 -0000	1.105
+++ pykickstart.spec	22 Sep 2008 19:46:28 -0000	1.106
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.43
+Version: 1.44
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -44,6 +44,10 @@
 %{_bindir}/ksflatten
 
 %changelog
+* Mon Sep 22 2008 Chris Lumens <clumens at redhat.com> - 1.44-1
+- Add support for reverse CHAP to the kickstart iscsi command (hans)
+- Fix typo (katzj)
+
 * Wed Sep 03 2008 Chris Lumens <clumens at redhat.com> - 1.43-1
 - Revert "Do not include passphrases for encrypted block devices in
   anaconda-ks.cfg." (dlehman)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- sources	3 Sep 2008 20:34:59 -0000	1.106
+++ sources	22 Sep 2008 19:46:28 -0000	1.107
@@ -1 +1 @@
-36469ea69fd78e77f278bd6893c39c5a  pykickstart-1.43.tar.gz
+600f1cda9038be2de7d0f3de5e53a44f  pykickstart-1.44.tar.gz



From dwalsh at fedoraproject.org  Mon Sep 22 19:47:09 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 22 Sep 2008 19:47:09 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.86, 1.87 setroubleshoot.spec,
	1.106, 1.107 sources, 1.97, 1.98
Message-ID: <20080922194709.9EC5E700FE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31719

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Mon Sep 22 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.11-1
- Update to upstream
  - 2008-10-22    <jdennis at redhat.com>
	- Fix pruning code
	- Fix time stamps



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- .cvsignore	10 Sep 2008 17:19:05 -0000	1.86
+++ .cvsignore	22 Sep 2008 19:46:39 -0000	1.87
@@ -2,3 +2,4 @@
 setroubleshoot-2.0.8.tar.gz
 setroubleshoot-2.0.9.tar.gz
 setroubleshoot-2.0.10.tar.gz
+setroubleshoot-2.0.11.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- setroubleshoot.spec	10 Sep 2008 18:09:05 -0000	1.106
+++ setroubleshoot.spec	22 Sep 2008 19:46:39 -0000	1.107
@@ -1,7 +1,7 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.0.10
-Release: 2%{?dist}
+Version: 2.0.11
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -182,6 +182,12 @@
 %attr(0755,root,root) /etc/rc.d/init.d/%{name}
 
 %changelog
+* Mon Sep 22 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.11-1
+- Update to upstream
+  - 2008-10-22    <jdennis at redhat.com>
+	- Fix pruning code
+	- Fix time stamps
+
 * Wed Sep 10 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.10-2
 - Fix requires line to gnome-python2-gnome
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- sources	10 Sep 2008 17:19:05 -0000	1.97
+++ sources	22 Sep 2008 19:46:39 -0000	1.98
@@ -1 +1 @@
-91ad882b93b6c38e6ede6c9766c45fe8  setroubleshoot-2.0.10.tar.gz
+d4474597371981b03069116840710b3a  setroubleshoot-2.0.11.tar.gz



From deji at fedoraproject.org  Mon Sep 22 19:49:56 2008
From: deji at fedoraproject.org (Deji Akingunola)
Date: Mon, 22 Sep 2008 19:49:56 +0000 (UTC)
Subject: rpms/file-browser-applet/devel .cvsignore, 1.3,
	1.4 file-browser-applet.spec, 1.3, 1.4 sources, 1.3,
	1.4 fba-cflags.patch, 1.1, NONE fba-libdir.patch, 1.1,
	NONE fba-libexecdir.patch, 1.1, NONE
Message-ID: <20080922194956.73E93700FE@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-serv32403

Modified Files:
	.cvsignore file-browser-applet.spec sources 
Removed Files:
	fba-cflags.patch fba-libdir.patch fba-libexecdir.patch 
Log Message:
* Mon Sep 22 2008 Deji Akingunola <dakingun at gmail.com> - 0.5.9-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/file-browser-applet/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Aug 2008 12:33:36 -0000	1.3
+++ .cvsignore	22 Sep 2008 19:49:26 -0000	1.4
@@ -1 +1 @@
-file-browser-applet-0.5.8.tar.gz
+file-browser-applet-0.5.9.tar.gz


Index: file-browser-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-browser-applet/devel/file-browser-applet.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- file-browser-applet.spec	30 Aug 2008 12:33:36 -0000	1.3
+++ file-browser-applet.spec	22 Sep 2008 19:49:26 -0000	1.4
@@ -1,12 +1,11 @@
 Name:		file-browser-applet
-Version:	0.5.8
+Version:	0.5.9
 Release:	1%{?dist}
 Summary:	File Browser Applet for the GNOME Panel
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://code.google.com/p/gnome-menu-file-browser-applet/
 Source0:	http://gnome-menu-file-browser-applet.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:		fba-libdir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.4.7
@@ -26,7 +25,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .libdir
 
 %build
 mkdir fedora
@@ -34,8 +32,9 @@
 export CFLAGS="%{optflags}"
 export CXXFLAGS="%{optflags}"
 export FFLAGS="%{optflags}"
-cmake	-DCMAKE_INSTALL_PATH=%{_prefix}			\
-	-DCMAKE_LIB_DESTINATION=%{_libdir}		\
+cmake	-DCMAKE_INSTALL_PREFIX=%{_prefix}			\
+	-DCMAKE_INSTALL_LIB_PREFIX=%{_libdir}		\
+	-DCMAKE_INSTALL_LIB_EXEC_DIR=%{_libexecdir}	\
 	-DCMAKE_INSTALL_GCONF_SCHEMA_DIR=%{_sysconfdir}/gconf/schemas ..
 make VERBOSE=1 %{?_smp_mflags}
 
@@ -82,13 +81,16 @@
 %defattr(-,root,root,-)
 %doc COPYING HISTORY README
 %{_libdir}/bonobo/servers/GNOME_FileBrowserApplet_Factory.server
-%{_libdir}/file-browser-applet/
+%{_libexecdir}/file-browser-applet
 %{_datadir}/file-browser-applet/
 %{_datadir}/icons/hicolor/128x128/apps/file-browser-applet.png
 %{_datadir}/pixmaps/file-browser-applet.png
 %{_sysconfdir}/gconf/schemas/file-browser-applet.schemas
 
 %changelog
+* Mon Sep 22 2008 Deji Akingunola <dakingun at gmail.com> - 0.5.9-1
+- New upstream version
+
 * Sat Aug 30 2008 Deji Akingunola <dakingun at gmail.com> - 0.5.8-1
 - Update to 0.5.8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/file-browser-applet/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Aug 2008 12:33:36 -0000	1.3
+++ sources	22 Sep 2008 19:49:26 -0000	1.4
@@ -1 +1 @@
-7164949c92fa0fe96b56d733861dc906  file-browser-applet-0.5.8.tar.gz
+b50806d349e5c29f012f588a71cbb8e1  file-browser-applet-0.5.9.tar.gz


--- fba-cflags.patch DELETED ---


--- fba-libdir.patch DELETED ---


--- fba-libexecdir.patch DELETED ---



From corsepiu at fedoraproject.org  Mon Sep 22 19:56:36 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 22 Sep 2008 19:56:36 +0000 (UTC)
Subject: rpms/perl-Test-MockTime/devel import.log, NONE,
	1.1 perl-Test-MockTime.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080922195636.0D647700FE@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-MockTime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1196/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Test-MockTime.spec 
Log Message:



--- NEW FILE import.log ---
perl-Test-MockTime-0_09-1_fc10:HEAD:perl-Test-MockTime-0.09-1.fc10.src.rpm:1222113331


--- NEW FILE perl-Test-MockTime.spec ---
Name:           perl-Test-MockTime
Version:        0.09
Release:        1%{?dist}
Summary:        Replaces actual time with simulated time
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-MockTime/
Source0:        http://www.cpan.org/authors/id/D/DD/DDICK/Test-MockTime-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Time::Piece) >= 1.08

# for improved tests
BuildRequires:  perl(Test::Pod) >= 1.00

Requires:       perl(Time::Piece) >= 1.08
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module was created to enable test suites to test code at specific
points in time. Specifically it overrides localtime, gmtime and time at
compile time and then relies on the user supplying a mock time via
set_relative_time, set_absolute_time or set_fixed_time to alter future
calls to gmtime,time or localtime.

%prep
%setup -q -n Test-MockTime-%{version}

# fix up broken permissions
chmod -x lib/Test/MockTime.pm t/test.t

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.09-1
- Cleanup spec file.
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockTime/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Sep 2008 15:53:40 -0000	1.1
+++ .cvsignore	22 Sep 2008 19:56:05 -0000	1.2
@@ -0,0 +1 @@
+Test-MockTime-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockTime/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 15:53:40 -0000	1.1
+++ sources	22 Sep 2008 19:56:05 -0000	1.2
@@ -0,0 +1 @@
+cc3945c4f8d333a1a9314c0a987ef33a  Test-MockTime-0.09.tar.gz



From corsepiu at fedoraproject.org  Mon Sep 22 19:57:43 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 22 Sep 2008 19:57:43 +0000 (UTC)
Subject: rpms/perl-Test-MockTime/devel import.log,1.1,NONE
Message-ID: <20080922195743.8B26E700FE@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-MockTime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1629

Removed Files:
	import.log 
Log Message:
Remove.


--- import.log DELETED ---



From stahnma at fedoraproject.org  Mon Sep 22 19:58:30 2008
From: stahnma at fedoraproject.org (Michael Stahnke)
Date: Mon, 22 Sep 2008 19:58:30 +0000 (UTC)
Subject: rpms/cdpr/EL-4 cdpr.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20080922195830.573BF7013D@cvs1.fedora.phx.redhat.com>

Author: stahnma

Update of /cvs/extras/rpms/cdpr/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1694

Modified Files:
	cdpr.spec sources 
Log Message:
New version



Index: cdpr.spec
===================================================================
RCS file: /cvs/extras/rpms/cdpr/EL-4/cdpr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cdpr.spec	5 Nov 2007 23:03:09 -0000	1.2
+++ cdpr.spec	22 Sep 2008 19:58:00 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           cdpr
-Version:        2.2.1
-Release:        3%{?dist}
+Version:        2.3
+Release:        1%{?dist}
 Summary:        Cisco Discovery Protocol Analyzer
 
 Group:          Applications/System
 License:        GPLv2+ 
 URL:            http://sourceforge.net/projects/cdpr/ 
-Source0:        http://downloads.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://www.monkeymental.com/mmfiles/%{name}-%{version}.tgz
   
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,8 +45,11 @@
 
 
 %changelog
-* Mon Nov 05 2007 <stahnma at fedoraproject.org>  2.2.1-3
-- Fix for RHEL 4 specific BR (libpcap is not broken into -devel) 
+* Sat Sep 20 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.3-1
+- New version
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2.1-3
+- Autorebuild for GCC 4.3
 
 * Mon Oct 29 2007 <stahnma at fedoraproject.org>  2.2.1-2
 - Minor SPEC file cleanup from bug # 355631


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cdpr/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Oct 2007 20:27:54 -0000	1.2
+++ sources	22 Sep 2008 19:58:00 -0000	1.3
@@ -1 +1 @@
-1e682e7e9c03f9b004c1f97c0ed25431  cdpr-2.2.1.tar.gz
+c3eeaeb2641085647f13da6ff807aa0b  cdpr-2.3.tgz



From corsepiu at fedoraproject.org  Mon Sep 22 19:59:15 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 22 Sep 2008 19:59:15 +0000 (UTC)
Subject: rpms/perl-Test-MockTime/F-8 perl-Test-MockTime.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080922195915.E8194700FE@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-MockTime/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2111/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-MockTime.spec 
Log Message:
Import.


--- NEW FILE perl-Test-MockTime.spec ---
Name:           perl-Test-MockTime
Version:        0.09
Release:        1%{?dist}
Summary:        Replaces actual time with simulated time
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-MockTime/
Source0:        http://www.cpan.org/authors/id/D/DD/DDICK/Test-MockTime-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Time::Piece) >= 1.08

# for improved tests
BuildRequires:  perl(Test::Pod) >= 1.00

Requires:       perl(Time::Piece) >= 1.08
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module was created to enable test suites to test code at specific
points in time. Specifically it overrides localtime, gmtime and time at
compile time and then relies on the user supplying a mock time via
set_relative_time, set_absolute_time or set_fixed_time to alter future
calls to gmtime,time or localtime.

%prep
%setup -q -n Test-MockTime-%{version}

# fix up broken permissions
chmod -x lib/Test/MockTime.pm t/test.t

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.09-1
- Cleanup spec file.
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockTime/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Sep 2008 15:53:40 -0000	1.1
+++ .cvsignore	22 Sep 2008 19:58:45 -0000	1.2
@@ -0,0 +1 @@
+Test-MockTime-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockTime/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 15:53:40 -0000	1.1
+++ sources	22 Sep 2008 19:58:45 -0000	1.2
@@ -0,0 +1 @@
+cc3945c4f8d333a1a9314c0a987ef33a  Test-MockTime-0.09.tar.gz



From corsepiu at fedoraproject.org  Mon Sep 22 19:59:16 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 22 Sep 2008 19:59:16 +0000 (UTC)
Subject: rpms/perl-Test-MockTime/F-9 perl-Test-MockTime.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080922195916.333F4700FE@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-MockTime/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2111/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-MockTime.spec 
Log Message:
Import.


--- NEW FILE perl-Test-MockTime.spec ---
Name:           perl-Test-MockTime
Version:        0.09
Release:        1%{?dist}
Summary:        Replaces actual time with simulated time
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-MockTime/
Source0:        http://www.cpan.org/authors/id/D/DD/DDICK/Test-MockTime-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Time::Piece) >= 1.08

# for improved tests
BuildRequires:  perl(Test::Pod) >= 1.00

Requires:       perl(Time::Piece) >= 1.08
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module was created to enable test suites to test code at specific
points in time. Specifically it overrides localtime, gmtime and time at
compile time and then relies on the user supplying a mock time via
set_relative_time, set_absolute_time or set_fixed_time to alter future
calls to gmtime,time or localtime.

%prep
%setup -q -n Test-MockTime-%{version}

# fix up broken permissions
chmod -x lib/Test/MockTime.pm t/test.t

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.09-1
- Cleanup spec file.
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockTime/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Sep 2008 15:53:40 -0000	1.1
+++ .cvsignore	22 Sep 2008 19:58:45 -0000	1.2
@@ -0,0 +1 @@
+Test-MockTime-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockTime/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 15:53:40 -0000	1.1
+++ sources	22 Sep 2008 19:58:46 -0000	1.2
@@ -0,0 +1 @@
+cc3945c4f8d333a1a9314c0a987ef33a  Test-MockTime-0.09.tar.gz



From deji at fedoraproject.org  Mon Sep 22 19:59:51 2008
From: deji at fedoraproject.org (Deji Akingunola)
Date: Mon, 22 Sep 2008 19:59:51 +0000 (UTC)
Subject: rpms/file-browser-applet/F-9 .cvsignore, 1.2,
	1.3 file-browser-applet.spec, 1.1, 1.2 sources, 1.2,
	1.3 fba-cflags.patch, 1.1, NONE fba-libexecdir.patch, 1.1, NONE
Message-ID: <20080922195951.EDDE7700FE@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/file-browser-applet/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2238

Modified Files:
	.cvsignore file-browser-applet.spec sources 
Removed Files:
	fba-cflags.patch fba-libexecdir.patch 
Log Message:
* Mon Sep 22 2008 Deji Akingunola <dakingun at gmail.com> - 0.5.9-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/file-browser-applet/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jun 2008 19:35:03 -0000	1.2
+++ .cvsignore	22 Sep 2008 19:59:21 -0000	1.3
@@ -1 +1 @@
-file-browser-applet-0.5.6.tar.gz
+file-browser-applet-0.5.9.tar.gz


Index: file-browser-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-browser-applet/F-9/file-browser-applet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- file-browser-applet.spec	3 Jun 2008 19:35:03 -0000	1.1
+++ file-browser-applet.spec	22 Sep 2008 19:59:21 -0000	1.2
@@ -1,20 +1,16 @@
 Name:		file-browser-applet
-Version:	0.5.6
-Release:	2%{?dist}
+Version:	0.5.9
+Release:	1%{?dist}
 Summary:	File Browser Applet for the GNOME Panel
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://code.google.com/p/gnome-menu-file-browser-applet/
 Source0:	http://gnome-menu-file-browser-applet.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:		fba-libexecdir.patch
-Patch1:		fba-cflags.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	cmake >= 2.4.5
-BuildRequires:	gnome-vfs2-devel
+BuildRequires:	cmake >= 2.4.7
 BuildRequires:	libglade2-devel
 BuildRequires:	gnome-panel-devel
-BuildRequires:  gnome-desktop-devel
 Requires(pre):	GConf2
 Requires(post):	GConf2
 Requires(preun):GConf2
@@ -29,8 +25,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .libexec
-%patch1 -p0 -b .flags
 
 %build
 mkdir fedora
@@ -38,9 +32,9 @@
 export CFLAGS="%{optflags}"
 export CXXFLAGS="%{optflags}"
 export FFLAGS="%{optflags}"
-cmake	-DCMAKE_INSTALL_PATH=%{_prefix}			\
-	-DCMAKE_INSTALL_LIB_DIR=%{_libdir}		\
-	-DCMAKE_INSTALL_LIBEXEC_DIR=%{_libexecdir}		\
+cmake	-DCMAKE_INSTALL_PREFIX=%{_prefix}			\
+	-DCMAKE_INSTALL_LIB_PREFIX=%{_libdir}		\
+	-DCMAKE_INSTALL_LIB_EXEC_DIR=%{_libexecdir}	\
 	-DCMAKE_INSTALL_GCONF_SCHEMA_DIR=%{_sysconfdir}/gconf/schemas ..
 make VERBOSE=1 %{?_smp_mflags}
 
@@ -94,6 +88,9 @@
 %{_sysconfdir}/gconf/schemas/file-browser-applet.schemas
 
 %changelog
+* Mon Sep 22 2008 Deji Akingunola <dakingun at gmail.com> - 0.5.9-1
+- New upstream version
+
 * Mon May 26 2008 Deji Akingunola <dakingun at gmail.com> - 0.5.6-2
 - Fixes arising from Fedora Packaging review (#446160)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/file-browser-applet/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jun 2008 19:35:03 -0000	1.2
+++ sources	22 Sep 2008 19:59:21 -0000	1.3
@@ -1 +1 @@
-ccd2ddc0ca85aaaa8ff66445668912cb  file-browser-applet-0.5.6.tar.gz
+b50806d349e5c29f012f588a71cbb8e1  file-browser-applet-0.5.9.tar.gz


--- fba-cflags.patch DELETED ---


--- fba-libexecdir.patch DELETED ---



From dwalsh at fedoraproject.org  Mon Sep 22 20:07:59 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 22 Sep 2008 20:07:59 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20080710.patch, 1.42,
	1.43 selinux-policy.spec, 1.709, 1.710
Message-ID: <20080922200759.B53BA700FE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3439

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
* Mon Sep 22 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-6
- Fix transition to nsplugin


policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- policy-20080710.patch	22 Sep 2008 17:55:56 -0000	1.42
+++ policy-20080710.patch	22 Sep 2008 20:07:59 -0000	1.43
@@ -79,13 +79,17 @@
  $(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/config/appconfig-mcs/default_contexts serefpolicy-3.5.8/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/default_contexts	2008-09-17 08:49:08.000000000 -0400
-@@ -1,15 +0,0 @@
++++ serefpolicy-3.5.8/config/appconfig-mcs/default_contexts	2008-09-22 15:25:07.000000000 -0400
+@@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
 -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:sulogin_t:s0		sysadm_r:sysadm_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
@@ -96,6 +100,7 @@
 -
 -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.5.8/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-08-07 11:15:14.000000000 -0400
 +++ serefpolicy-3.5.8/config/appconfig-mcs/failsafe_context	2008-09-17 08:49:08.000000000 -0400
@@ -104,19 +109,20 @@
 +system_r:unconfined_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-mcs/guest_u_default_contexts	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/guest_u_default_contexts	2008-09-22 15:33:55.000000000 -0400
 @@ -0,0 +1,6 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
 +system_r:sshd_t:s0		guest_r:guest_t:s0
-+system_r:crond_t:s0		guest_r:guest_crond_t:s0
++system_r:crond_t:s0		guest_r:guest_t:s0
 +system_r:initrc_su_t:s0		guest_r:guest_t:s0
 +guest_r:guest_t:s0		guest_r:guest_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/root_default_contexts	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/root_default_contexts	2008-09-22 15:36:05.000000000 -0400
 @@ -1,11 +1,7 @@
- system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
+-system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
++system_r: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
@@ -130,8 +136,13 @@
 +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/staff_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/staff_u_default_contexts	2008-09-17 08:49:08.000000000 -0400
-@@ -5,6 +5,8 @@
++++ serefpolicy-3.5.8/config/appconfig-mcs/staff_u_default_contexts	2008-09-22 15:33:36.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:staff_crond_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
@@ -152,8 +163,13 @@
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/user_u_default_contexts	2008-09-17 08:49:08.000000000 -0400
-@@ -5,4 +5,5 @@
++++ serefpolicy-3.5.8/config/appconfig-mcs/user_u_default_contexts	2008-09-22 15:33:49.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:user_crond_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
@@ -168,23 +184,103 @@
 +system_u:system_r:unconfined_t:s0	
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-mcs/xguest_u_default_contexts	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/xguest_u_default_contexts	2008-09-22 15:34:01.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
 +system_r:sshd_t		xguest_r:xguest_t:s0
-+system_r:crond_t	xguest_r:xguest_crond_t:s0
++system_r:crond_t	xguest_r:xguest_t:s0
 +system_r:xdm_t		xguest_r:xguest_t:s0
 +system_r:initrc_su_t:s0	xguest_r:xguest_t:s0
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.5.8/config/appconfig-mls/default_contexts
+--- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-08-07 11:15:14.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mls/default_contexts	2008-09-22 15:37:18.000000000 -0400
+@@ -1,15 +1,6 @@
+-system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_t:s0
+-system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
+-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/guest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-mls/guest_u_default_contexts	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mls/guest_u_default_contexts	2008-09-22 15:34:31.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
 +system_r:sshd_t:s0		guest_r:guest_t:s0
-+system_r:crond_t:s0		guest_r:guest_crond_t:s0
++system_r:crond_t:s0		guest_r:guest_t:s0
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.5.8/config/appconfig-mls/root_default_contexts
+--- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mls/root_default_contexts	2008-09-22 15:47:13.000000000 -0400
+@@ -1,11 +1,11 @@
+-system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
+-system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
++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/staff_u_default_contexts serefpolicy-3.5.8/config/appconfig-mls/staff_u_default_contexts
+--- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mls/staff_u_default_contexts	2008-09-22 15:34:13.000000000 -0400
+@@ -1,7 +1,7 @@
+ 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:staff_crond_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
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.5.8/config/appconfig-mls/user_u_default_contexts
+--- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mls/user_u_default_contexts	2008-09-22 15:34:21.000000000 -0400
+@@ -1,7 +1,7 @@
+ 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:user_crond_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
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mls/xguest_u_default_contexts
+--- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.5.8/config/appconfig-mls/xguest_u_default_contexts	2008-09-22 15:37:37.000000000 -0400
+@@ -0,0 +1,7 @@
++system_r:local_login_t	xguest_r:xguest_t:s0
++system_r:remote_login_t	xguest_r:xguest_t:s0
++system_r:sshd_t		xguest_r:xguest_t:s0
++system_r:crond_t	xguest_r:xguest_t:s0
++system_r:xdm_t		xguest_r:xguest_t:s0
++system_r:initrc_su_t:s0	xguest_r:xguest_t:s0
++xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.8/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.5.8/config/appconfig-standard/guest_u_default_contexts	2008-09-17 08:49:08.000000000 -0400
@@ -209,6 +305,30 @@
  #
 -#system_r:sshd_t	unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
 +system_r:sshd_t	unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts serefpolicy-3.5.8/config/appconfig-standard/staff_u_default_contexts
+--- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-standard/staff_u_default_contexts	2008-09-22 15:34:45.000000000 -0400
+@@ -1,7 +1,7 @@
+ system_r:local_login_t		staff_r:staff_t sysadm_r:sysadm_t
+ system_r:remote_login_t		staff_r:staff_t
+ system_r:sshd_t			staff_r:staff_t sysadm_r:sysadm_t
+-system_r:crond_t		staff_r:staff_crond_t
++system_r:crond_t		staff_r:staff_t
+ system_r:xdm_t			staff_r:staff_t
+ staff_r:staff_su_t		staff_r:staff_t
+ staff_r:staff_sudo_t		staff_r:staff_t
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/user_u_default_contexts serefpolicy-3.5.8/config/appconfig-standard/user_u_default_contexts
+--- nsaserefpolicy/config/appconfig-standard/user_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-standard/user_u_default_contexts	2008-09-22 15:34:52.000000000 -0400
+@@ -1,7 +1,7 @@
+ system_r:local_login_t		user_r:user_t
+ system_r:remote_login_t		user_r:user_t
+ system_r:sshd_t			user_r:user_t
+-system_r:crond_t		user_r:user_crond_t
++system_r:crond_t		user_r:user_t
+ system_r:xdm_t			user_r:user_t
+ user_r:user_su_t		user_r:user_t
+ user_r:user_sudo_t		user_r:user_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.8/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.5.8/config/appconfig-standard/xguest_u_default_contexts	2008-09-17 08:49:08.000000000 -0400
@@ -4279,8 +4399,8 @@
 +HOME_DIR/\.gstreamer-.*			gen_context(system_u:object_r:nsplugin_home_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.5.8/policy/modules/apps/nsplugin.if
 --- nsaserefpolicy/policy/modules/apps/nsplugin.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/apps/nsplugin.if	2008-09-21 07:27:44.000000000 -0400
-@@ -0,0 +1,493 @@
++++ serefpolicy-3.5.8/policy/modules/apps/nsplugin.if	2008-09-22 15:35:16.000000000 -0400
+@@ -0,0 +1,293 @@
 +
 +## <summary>policy for nsplugin</summary>
 +
@@ -4363,247 +4483,45 @@
 +		type nsplugin_exec_t;
 +		type nsplugin_config_exec_t;
 +		type $1_tmpfs_t;
++		type nsplugin_t;
++		type nsplugin_config_t;
 +	')
-+	type $1_nsplugin_t;
-+	domain_type($1_nsplugin_t)
-+	domain_entry_file($1_nsplugin_t, nsplugin_exec_t)
-+	role $3 types $1_nsplugin_t;
-+
-+	type $1_nsplugin_config_t;
-+	domain_type($1_nsplugin_config_t)
-+	domain_entry_file($1_nsplugin_config_t, nsplugin_config_exec_t)
-+	role $3 types $1_nsplugin_config_t;
 +
-+	role $3 types $1_nsplugin_t;
-+	role $3 types $1_nsplugin_config_t;
++	role $3 types nsplugin_t;
++	role $3 types nsplugin_config_t;
 +
-+	allow $1_nsplugin_t $2:process signull;
++	allow nsplugin_t $2:process signull;
 +
 +	list_dirs_pattern($2, nsplugin_rw_t, nsplugin_rw_t)
 +	read_files_pattern($2, nsplugin_rw_t, nsplugin_rw_t)
 +	read_lnk_files_pattern($2, nsplugin_rw_t, nsplugin_rw_t)
 +	can_exec($2, nsplugin_rw_t)
 +
-+	allow $1_nsplugin_t $1_tmpfs_t:file { read getattr };
-+
 +	#Leaked File Descriptors
-+	dontaudit $1_nsplugin_t $2:tcp_socket rw_socket_perms;
-+	dontaudit $1_nsplugin_t $2:udp_socket rw_socket_perms;
-+	dontaudit $1_nsplugin_t $2:unix_stream_socket rw_socket_perms;
-+	dontaudit $1_nsplugin_t $2:unix_dgram_socket rw_socket_perms;
-+	dontaudit $1_nsplugin_config_t $2:tcp_socket rw_socket_perms;
-+	dontaudit $1_nsplugin_config_t $2:udp_socket rw_socket_perms;
-+	dontaudit $1_nsplugin_config_t $2:unix_stream_socket rw_socket_perms;
-+	dontaudit $1_nsplugin_config_t $2:unix_dgram_socket rw_socket_perms;
-+	allow $1_nsplugin_t $2:unix_stream_socket connectto;
-+	dontaudit $1_nsplugin_t $2:process ptrace;
++	dontaudit nsplugin_t $2:tcp_socket rw_socket_perms;
++	dontaudit nsplugin_t $2:udp_socket rw_socket_perms;
++	dontaudit nsplugin_t $2:unix_stream_socket rw_socket_perms;
++	dontaudit nsplugin_t $2:unix_dgram_socket rw_socket_perms;
++	dontaudit nsplugin_config_t $2:tcp_socket rw_socket_perms;
++	dontaudit nsplugin_config_t $2:udp_socket rw_socket_perms;
++	dontaudit nsplugin_config_t $2:unix_stream_socket rw_socket_perms;
++	dontaudit nsplugin_config_t $2:unix_dgram_socket rw_socket_perms;
++	allow nsplugin_t $2:unix_stream_socket connectto;
++	dontaudit nsplugin_t $2:process ptrace;
 +
-+	allow $2 $1_nsplugin_t:process { getattr ptrace signal_perms };
-+	allow $2 $1_nsplugin_t:unix_stream_socket connectto;
++	allow $2 nsplugin_t:process { getattr ptrace signal_perms };
++	allow $2 nsplugin_t:unix_stream_socket connectto;
 +
 +	# Connect to pulseaudit server
-+	stream_connect_pattern($1_nsplugin_t, user_home_t, user_home_t, $2)
-+	gnome_stream_connect($1_nsplugin_t, $2)
-+
-+	userdom_use_user_terminals($1, $1_nsplugin_t)
-+	userdom_use_user_terminals($1, $1_nsplugin_config_t)
-+
-+	xserver_common_app($1, $1_nsplugin_t)
-+	
-+########################################
-+#
-+# nsplugin local policy
-+#
-+dontaudit $1_nsplugin_t self:capability sys_tty_config;
-+allow $1_nsplugin_t self:fifo_file rw_file_perms;
-+allow $1_nsplugin_t self:process { ptrace getsched setsched signal_perms };
-+
-+allow $1_nsplugin_t self:sem create_sem_perms;
-+allow $1_nsplugin_t self:shm create_shm_perms;
-+allow $1_nsplugin_t self:msgq create_msgq_perms;
-+allow $1_nsplugin_t self:unix_stream_socket { connectto create_stream_socket_perms };
-+
-+tunable_policy(`allow_nsplugin_execmem',`
-+	allow $1_nsplugin_t self:process { execstack execmem };
-+	allow $1_nsplugin_config_t self:process { execstack execmem };
-+')
-+	
-+manage_dirs_pattern($1_nsplugin_t, nsplugin_home_t, nsplugin_home_t)
-+exec_files_pattern($1_nsplugin_t, nsplugin_home_t, nsplugin_home_t)
-+manage_files_pattern($1_nsplugin_t, nsplugin_home_t, nsplugin_home_t)
-+manage_lnk_files_pattern($1_nsplugin_t, nsplugin_home_t, nsplugin_home_t)
-+userdom_user_home_dir_filetrans(user, $1_nsplugin_t, nsplugin_home_t, {file dir})
-+unprivuser_dontaudit_write_home_content_files($1_nsplugin_t)
-+
-+corecmd_exec_bin($1_nsplugin_t)
-+corecmd_exec_shell($1_nsplugin_t)
-+
-+corenet_all_recvfrom_unlabeled($1_nsplugin_t)
-+corenet_all_recvfrom_netlabel($1_nsplugin_t)
-+corenet_tcp_connect_flash_port($1_nsplugin_t)
-+corenet_tcp_connect_pulseaudio_port($1_nsplugin_t)
-+corenet_tcp_connect_http_port($1_nsplugin_t)
-+corenet_tcp_sendrecv_generic_if($1_nsplugin_t)
-+corenet_tcp_sendrecv_all_nodes($1_nsplugin_t)
-+
-+domain_dontaudit_read_all_domains_state($1_nsplugin_t)
-+
-+dev_read_rand($1_nsplugin_t)
-+dev_read_sound($1_nsplugin_t)
-+dev_write_sound($1_nsplugin_t)
-+dev_read_video_dev($1_nsplugin_t)
-+dev_write_video_dev($1_nsplugin_t)
-+dev_getattr_dri_dev($1_nsplugin_t)
-+dev_rwx_zero($1_nsplugin_t)
-+
-+kernel_read_kernel_sysctls($1_nsplugin_t)
-+kernel_read_system_state($1_nsplugin_t)
-+
-+files_read_usr_files($1_nsplugin_t)
-+files_read_etc_files($1_nsplugin_t)
-+files_read_config_files($1_nsplugin_t)
-+
-+fs_list_inotifyfs($1_nsplugin_t)
-+fs_manage_tmpfs_files($1_nsplugin_t)
-+fs_getattr_tmpfs($1_nsplugin_t)
-+fs_getattr_xattr_fs($1_nsplugin_t)
-+
-+term_dontaudit_getattr_all_user_ptys($1_nsplugin_t)
-+term_dontaudit_getattr_all_user_ttys($1_nsplugin_t)
-+
-+auth_use_nsswitch($1_nsplugin_t)
-+
-+libs_use_ld_so($1_nsplugin_t)
-+libs_use_shared_libs($1_nsplugin_t)
-+libs_exec_ld_so($1_nsplugin_t)
-+
-+miscfiles_read_localization($1_nsplugin_t)
-+miscfiles_read_fonts($1_nsplugin_t)
-+
-+unprivuser_manage_tmp_dirs($1_nsplugin_t)
-+unprivuser_manage_tmp_files($1_nsplugin_t)
-+unprivuser_manage_tmp_sockets($1_nsplugin_t)
-+userdom_tmp_filetrans_user_tmp(user, $1_nsplugin_t, { file dir sock_file })
-+unprivuser_read_tmpfs_files($1_nsplugin_t)
-+unprivuser_rw_semaphores($1_nsplugin_t)
-+unprivuser_delete_tmpfs_files($1_nsplugin_t)
-+
-+unprivuser_read_home_content_symlinks($1_nsplugin_t)
-+unprivuser_read_home_content_files($1_nsplugin_t)
-+unprivuser_read_tmp_files($1_nsplugin_t)
-+userdom_write_user_tmp_sockets(user, $1_nsplugin_t)
-+unprivuser_dontaudit_append_home_content_files($1_nsplugin_t)
-+userdom_dontaudit_unlink_unpriv_home_content_files($1_nsplugin_t)
-+userdom_dontaudit_manage_user_tmp_files(user, $1_nsplugin_t)
-+
-+optional_policy(`
-+	alsa_read_rw_config($1_nsplugin_t)
-+')
-+
-+optional_policy(`
-+	gnome_exec_gconf($1_nsplugin_t)
-+	gnome_manage_user_gnome_config(user, $1_nsplugin_t)
-+	allow $1_nsplugin_t gnome_home_t:sock_file write;
-+')
-+
-+optional_policy(`
-+	mozilla_read_user_home_files(user, $1_nsplugin_t)
-+	mozilla_write_user_home_files(user, $1_nsplugin_t)
-+')
-+
-+optional_policy(`
-+	mplayer_exec($1_nsplugin_t)
-+	mplayer_read_user_home_files(user, $1_nsplugin_t)
-+')
-+
-+optional_policy(`
-+	unconfined_execmem_signull($1_nsplugin_t)
-+	unconfined_delete_tmpfs_files($1_nsplugin_t)
-+')
-+
-+optional_policy(`
-+	xserver_stream_connect_xdm_xserver($1_nsplugin_t)
-+	xserver_xdm_rw_shm($1_nsplugin_t)
-+	xserver_read_xdm_tmp_files($1_nsplugin_t)
-+	xserver_read_xdm_pid($1_nsplugin_t)
-+	xserver_read_user_xauth(user, $1_nsplugin_t)
-+	xserver_read_user_iceauth(user, $1_nsplugin_t)
-+	xserver_use_user_fonts(user, $1_nsplugin_t)
-+	xserver_manage_home_fonts($1_nsplugin_t)
-+	xserver_dontaudit_rw_xdm_home_files($1_nsplugin_t)
-+')
-+
-+########################################
-+#
-+# $1_nsplugin_config local policy
-+#
-+
-+allow $1_nsplugin_config_t self:capability { dac_override dac_read_search sys_nice setuid setgid };
-+allow $1_nsplugin_config_t self:process { setsched sigkill getsched execmem };
-+#execing pulseaudio
-+dontaudit $1_nsplugin_t self:process { getcap setcap };
-+
-+allow $1_nsplugin_config_t self:fifo_file rw_file_perms;
-+allow $1_nsplugin_config_t self:unix_stream_socket create_stream_socket_perms;
-+
-+fs_list_inotifyfs($1_nsplugin_config_t)
-+
-+can_exec($1_nsplugin_config_t, nsplugin_rw_t)
-+manage_dirs_pattern($1_nsplugin_config_t, nsplugin_rw_t, nsplugin_rw_t)
-+manage_files_pattern($1_nsplugin_config_t, nsplugin_rw_t, nsplugin_rw_t)
-+manage_lnk_files_pattern($1_nsplugin_config_t, nsplugin_rw_t, nsplugin_rw_t)
-+
-+manage_dirs_pattern($1_nsplugin_config_t, nsplugin_home_t, nsplugin_home_t)
-+manage_files_pattern($1_nsplugin_config_t, nsplugin_home_t, nsplugin_home_t)
-+manage_lnk_files_pattern($1_nsplugin_config_t, nsplugin_home_t, nsplugin_home_t)
++	stream_connect_pattern(nsplugin_t, user_home_t, user_home_t, $2)
++	gnome_stream_connect(nsplugin_t, $2)
 +
-+corecmd_exec_bin($1_nsplugin_config_t)
-+corecmd_exec_shell($1_nsplugin_config_t)
++	allow nsplugin_t $1_tmpfs_t:file { read getattr };
 +
-+kernel_read_system_state($1_nsplugin_config_t)
++	userdom_use_user_terminals($1, nsplugin_t)
++	userdom_use_user_terminals($1, nsplugin_config_t)
 +
-+files_read_etc_files($1_nsplugin_config_t)
-+files_read_usr_files($1_nsplugin_config_t)
-+files_dontaudit_search_home($1_nsplugin_config_t)
-+files_list_tmp($1_nsplugin_config_t)
-+
-+auth_use_nsswitch($1_nsplugin_config_t)
-+
-+libs_use_ld_so($1_nsplugin_config_t)
-+libs_use_shared_libs($1_nsplugin_config_t)
-+
-+miscfiles_read_localization($1_nsplugin_config_t)
-+miscfiles_read_fonts($1_nsplugin_config_t)
-+
-+userdom_search_all_users_home_content($1_nsplugin_config_t)
-+
-+tunable_policy(`use_nfs_home_dirs',`
-+	fs_manage_nfs_dirs($1_nsplugin_t)
-+	fs_manage_nfs_files($1_nsplugin_t)
-+	fs_manage_nfs_dirs($1_nsplugin_config_t)
-+	fs_manage_nfs_files($1_nsplugin_config_t)
-+')
-+
-+tunable_policy(`use_samba_home_dirs',`
-+	fs_manage_cifs_dirs($1_nsplugin_t)
-+	fs_manage_cifs_files($1_nsplugin_t)
-+	fs_manage_cifs_dirs($1_nsplugin_config_t)
-+	fs_manage_cifs_files($1_nsplugin_config_t)
-+')
-+
-+domtrans_pattern($1_nsplugin_config_t, nsplugin_exec_t, $1_nsplugin_t)
-+
-+optional_policy(`
-+	xserver_read_home_fonts($1_nsplugin_config_t)
-+')
-+
-+optional_policy(`
-+	mozilla_read_user_home_files(user, $1_nsplugin_config_t)
-+')
-+
-+	optional_policy(`
-+		openoffice_plugin_per_role_template($1, $1_nsplugin_t)
-+	')
++	xserver_common_app($1, nsplugin_t)
 +')
 +
 +#######################################
@@ -4642,12 +4560,14 @@
 +	gen_require(`
 +		type nsplugin_exec_t;
 +		type nsplugin_config_exec_t;
++		type nsplugin_t;
++		type nsplugin_config_t;
 +	')
 +
 +	nsplugin_per_role_template_notrans($1, $2, $3)
 +
-+	domtrans_pattern($2, nsplugin_exec_t, $1_nsplugin_t)
-+	domtrans_pattern($2, nsplugin_config_exec_t, $1_nsplugin_config_t)
++	domtrans_pattern($2, nsplugin_exec_t, nsplugin_t)
++	domtrans_pattern($2, nsplugin_config_exec_t, nsplugin_config_t)
 +')
 +
 +#######################################
@@ -4680,10 +4600,10 @@
 +interface(`nsplugin_domtrans_user',`
 +	gen_require(`
 +		type nsplugin_exec_t;
-+		type $1_nsplugin_t;
++		type nsplugin_t;
 +	')
 +
-+	domtrans_pattern($2, nsplugin_exec_t, $1_nsplugin_t)
++	domtrans_pattern($2, nsplugin_exec_t, nsplugin_t)
 +')
 +#######################################
 +## <summary>
@@ -4715,10 +4635,10 @@
 +interface(`nsplugin_domtrans_user_config',`
 +	gen_require(`
 +		type nsplugin_config_exec_t;
-+		type $1_nsplugin_config_t;
++		type nsplugin_config_t;
 +	')
 +
-+	domtrans_pattern($2, nsplugin_config_exec_t, $1_nsplugin_config_t)
++	domtrans_pattern($2, nsplugin_config_exec_t, nsplugin_config_t)
 +')
 +
 +########################################
@@ -4776,8 +4696,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.5.8/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/apps/nsplugin.te	2008-09-17 19:06:31.000000000 -0400
-@@ -0,0 +1,36 @@
++++ serefpolicy-3.5.8/policy/modules/apps/nsplugin.te	2008-09-22 14:52:12.000000000 -0400
+@@ -0,0 +1,234 @@
 +
 +policy_module(nsplugin, 1.0.0)
 +
@@ -4810,10 +4730,208 @@
 +userdom_user_home_content(user, nsplugin_home_t)
 +typealias nsplugin_home_t alias user_nsplugin_home_t;
 +
++type nsplugin_t;
++domain_type(nsplugin_t)
++domain_entry_file(nsplugin_t, nsplugin_exec_t)
++
++type nsplugin_config_t;
++domain_type(nsplugin_config_t)
++domain_entry_file(nsplugin_config_t, nsplugin_config_exec_t)
++
 +application_executable_file(nsplugin_exec_t)
 +application_executable_file(nsplugin_config_exec_t)
 +
 +
++########################################
++#
++# nsplugin local policy
++#
++dontaudit nsplugin_t self:capability sys_tty_config;
++allow nsplugin_t self:fifo_file rw_file_perms;
++allow nsplugin_t self:process { ptrace getsched setsched signal_perms };
++
++allow nsplugin_t self:sem create_sem_perms;
++allow nsplugin_t self:shm create_shm_perms;
++allow nsplugin_t self:msgq create_msgq_perms;
++allow nsplugin_t self:unix_stream_socket { connectto create_stream_socket_perms };
++
++tunable_policy(`allow_nsplugin_execmem',`
++	allow nsplugin_t self:process { execstack execmem };
++	allow nsplugin_config_t self:process { execstack execmem };
++')
++	
++manage_dirs_pattern(nsplugin_t, nsplugin_home_t, nsplugin_home_t)
++exec_files_pattern(nsplugin_t, nsplugin_home_t, nsplugin_home_t)
++manage_files_pattern(nsplugin_t, nsplugin_home_t, nsplugin_home_t)
++manage_lnk_files_pattern(nsplugin_t, nsplugin_home_t, nsplugin_home_t)
++userdom_user_home_dir_filetrans(user, nsplugin_t, nsplugin_home_t, {file dir})
++unprivuser_dontaudit_write_home_content_files(nsplugin_t)
++
++corecmd_exec_bin(nsplugin_t)
++corecmd_exec_shell(nsplugin_t)
++
++corenet_all_recvfrom_unlabeled(nsplugin_t)
++corenet_all_recvfrom_netlabel(nsplugin_t)
++corenet_tcp_connect_flash_port(nsplugin_t)
++corenet_tcp_connect_pulseaudio_port(nsplugin_t)
++corenet_tcp_connect_http_port(nsplugin_t)
++corenet_tcp_sendrecv_generic_if(nsplugin_t)
++corenet_tcp_sendrecv_all_nodes(nsplugin_t)
++
++domain_dontaudit_read_all_domains_state(nsplugin_t)
++
++dev_read_rand(nsplugin_t)
++dev_read_sound(nsplugin_t)
++dev_write_sound(nsplugin_t)
++dev_read_video_dev(nsplugin_t)
++dev_write_video_dev(nsplugin_t)
++dev_getattr_dri_dev(nsplugin_t)
++dev_rwx_zero(nsplugin_t)
++
++kernel_read_kernel_sysctls(nsplugin_t)
++kernel_read_system_state(nsplugin_t)
++
++files_read_usr_files(nsplugin_t)
++files_read_etc_files(nsplugin_t)
++files_read_config_files(nsplugin_t)
++
++fs_list_inotifyfs(nsplugin_t)
++fs_manage_tmpfs_files(nsplugin_t)
++fs_getattr_tmpfs(nsplugin_t)
++fs_getattr_xattr_fs(nsplugin_t)
++
++term_dontaudit_getattr_all_user_ptys(nsplugin_t)
++term_dontaudit_getattr_all_user_ttys(nsplugin_t)
++
++auth_use_nsswitch(nsplugin_t)
++
++libs_use_ld_so(nsplugin_t)
++libs_use_shared_libs(nsplugin_t)
++libs_exec_ld_so(nsplugin_t)
++
++miscfiles_read_localization(nsplugin_t)
++miscfiles_read_fonts(nsplugin_t)
++
++unprivuser_manage_tmp_dirs(nsplugin_t)
++unprivuser_manage_tmp_files(nsplugin_t)
++unprivuser_manage_tmp_sockets(nsplugin_t)
++userdom_tmp_filetrans_user_tmp(user, nsplugin_t, { file dir sock_file })
++unprivuser_read_tmpfs_files(nsplugin_t)
++unprivuser_rw_semaphores(nsplugin_t)
++unprivuser_delete_tmpfs_files(nsplugin_t)
++
++unprivuser_read_home_content_symlinks(nsplugin_t)
++unprivuser_read_home_content_files(nsplugin_t)
++unprivuser_read_tmp_files(nsplugin_t)
++userdom_write_user_tmp_sockets(user, nsplugin_t)
++unprivuser_dontaudit_append_home_content_files(nsplugin_t)
++userdom_dontaudit_unlink_unpriv_home_content_files(nsplugin_t)
++userdom_dontaudit_manage_user_tmp_files(user, nsplugin_t)
++
++optional_policy(`
++	alsa_read_rw_config(nsplugin_t)
++')
++
++optional_policy(`
++	gnome_exec_gconf(nsplugin_t)
++	gnome_manage_user_gnome_config(user, nsplugin_t)
++	allow nsplugin_t gnome_home_t:sock_file write;
++')
++
++optional_policy(`
++	mozilla_read_user_home_files(user, nsplugin_t)
++	mozilla_write_user_home_files(user, nsplugin_t)
++')
++
++optional_policy(`
++	mplayer_exec(nsplugin_t)
++	mplayer_read_user_home_files(user, nsplugin_t)
++')
++
++optional_policy(`
++	unconfined_execmem_signull(nsplugin_t)
++	unconfined_delete_tmpfs_files(nsplugin_t)
++')
++
++optional_policy(`
++	xserver_stream_connect_xdm_xserver(nsplugin_t)
++	xserver_xdm_rw_shm(nsplugin_t)
++	xserver_read_xdm_tmp_files(nsplugin_t)
++	xserver_read_xdm_pid(nsplugin_t)
++	xserver_read_user_xauth(user, nsplugin_t)
++	xserver_read_user_iceauth(user, nsplugin_t)
++	xserver_use_user_fonts(user, nsplugin_t)
++	xserver_manage_home_fonts(nsplugin_t)
++	xserver_dontaudit_rw_xdm_home_files(nsplugin_t)
++')
++
++########################################
++#
++# nsplugin_config local policy
++#
++
++allow nsplugin_config_t self:capability { dac_override dac_read_search sys_nice setuid setgid };
++allow nsplugin_config_t self:process { setsched sigkill getsched execmem };
++#execing pulseaudio
++dontaudit nsplugin_t self:process { getcap setcap };
++
++allow nsplugin_config_t self:fifo_file rw_file_perms;
++allow nsplugin_config_t self:unix_stream_socket create_stream_socket_perms;
++
++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)
++manage_files_pattern(nsplugin_config_t, nsplugin_rw_t, nsplugin_rw_t)
++manage_lnk_files_pattern(nsplugin_config_t, nsplugin_rw_t, nsplugin_rw_t)
++
++manage_dirs_pattern(nsplugin_config_t, nsplugin_home_t, nsplugin_home_t)
++manage_files_pattern(nsplugin_config_t, nsplugin_home_t, nsplugin_home_t)
++manage_lnk_files_pattern(nsplugin_config_t, nsplugin_home_t, nsplugin_home_t)
++
++corecmd_exec_bin(nsplugin_config_t)
++corecmd_exec_shell(nsplugin_config_t)
++
++kernel_read_system_state(nsplugin_config_t)
++
++files_read_etc_files(nsplugin_config_t)
++files_read_usr_files(nsplugin_config_t)
++files_dontaudit_search_home(nsplugin_config_t)
++files_list_tmp(nsplugin_config_t)
++
++auth_use_nsswitch(nsplugin_config_t)
++
++libs_use_ld_so(nsplugin_config_t)
++libs_use_shared_libs(nsplugin_config_t)
++
++miscfiles_read_localization(nsplugin_config_t)
++miscfiles_read_fonts(nsplugin_config_t)
++
++userdom_search_all_users_home_content(nsplugin_config_t)
++
++tunable_policy(`use_nfs_home_dirs',`
++	fs_manage_nfs_dirs(nsplugin_t)
++	fs_manage_nfs_files(nsplugin_t)
++	fs_manage_nfs_dirs(nsplugin_config_t)
++	fs_manage_nfs_files(nsplugin_config_t)
++')
++
++tunable_policy(`use_samba_home_dirs',`
++	fs_manage_cifs_dirs(nsplugin_t)
++	fs_manage_cifs_files(nsplugin_t)
++	fs_manage_cifs_dirs(nsplugin_config_t)
++	fs_manage_cifs_files(nsplugin_config_t)
++')
++
++domtrans_pattern(nsplugin_config_t, nsplugin_exec_t, nsplugin_t)
++
++optional_policy(`
++	xserver_read_home_fonts(nsplugin_config_t)
++')
++
++optional_policy(`
++	mozilla_read_user_home_files(user, nsplugin_config_t)
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.fc serefpolicy-3.5.8/policy/modules/apps/openoffice.fc
 --- nsaserefpolicy/policy/modules/apps/openoffice.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.5.8/policy/modules/apps/openoffice.fc	2008-09-17 08:49:08.000000000 -0400
@@ -8292,7 +8410,7 @@
  neverallow ~{ selinux_unconfined_type can_setsecparam } security_t:security setsecparam;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-3.5.8/policy/modules/kernel/storage.fc
 --- nsaserefpolicy/policy/modules/kernel/storage.fc	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/storage.fc	2008-09-22 12:22:40.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/storage.fc	2008-09-22 15:56:42.000000000 -0400
 @@ -27,6 +27,7 @@
  /dev/mcdx?		-b	gen_context(system_u:object_r:removable_device_t,s0)
  /dev/megadev.*		-c	gen_context(system_u:object_r:removable_device_t,s0)
@@ -8301,14 +8419,6 @@
  /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)
-@@ -65,6 +66,7 @@
- 
- /dev/md/.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
- /dev/mapper/.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
-+/dev/mspblk.*		-b	gen_context(system_u:object_r:removable_device_t,s0)
- 
- /dev/raw/raw[0-9]+	-c	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
- 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.fc serefpolicy-3.5.8/policy/modules/roles/guest.fc
 --- nsaserefpolicy/policy/modules/roles/guest.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.5.8/policy/modules/roles/guest.fc	2008-09-17 08:49:08.000000000 -0400
@@ -13976,7 +14086,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.5.8/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2008-09-03 07:59:15.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/cups.te	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/cups.te	2008-09-22 14:18:53.000000000 -0400
 @@ -48,6 +48,10 @@
  type hplip_t;
  type hplip_exec_t;
@@ -14058,7 +14168,7 @@
  allow cupsd_t hplip_var_run_t:file { read getattr };
  
  stream_connect_pattern(cupsd_t, ptal_var_run_t, ptal_var_run_t, ptal_t)
-@@ -149,44 +174,48 @@
+@@ -149,44 +174,49 @@
  corenet_tcp_bind_reserved_port(cupsd_t)
  corenet_dontaudit_tcp_bind_all_reserved_ports(cupsd_t)
  corenet_tcp_connect_all_ports(cupsd_t)
@@ -14072,6 +14182,7 @@
  dev_read_urand(cupsd_t)
  dev_read_sysfs(cupsd_t)
 -dev_read_usbfs(cupsd_t)
++dev_rw_input_dev(cupsd_t)  #447878
 +dev_rw_generic_usb_dev(cupsd_t)
 +dev_rw_usbfs(cupsd_t)
  dev_getattr_printer_dev(cupsd_t)
@@ -14112,7 +14223,7 @@
  files_list_world_readable(cupsd_t)
  files_read_world_readable_files(cupsd_t)
  files_read_world_readable_symlinks(cupsd_t)
-@@ -195,15 +224,16 @@
+@@ -195,15 +225,16 @@
  files_read_var_symlinks(cupsd_t)
  # for /etc/printcap
  files_dontaudit_write_etc_files(cupsd_t)
@@ -14133,7 +14244,7 @@
  auth_use_nsswitch(cupsd_t)
  
  libs_use_ld_so(cupsd_t)
-@@ -219,17 +249,22 @@
+@@ -219,17 +250,22 @@
  miscfiles_read_fonts(cupsd_t)
  
  seutil_read_config(cupsd_t)
@@ -14158,7 +14269,7 @@
  ')
  
  optional_policy(`
-@@ -246,8 +281,16 @@
+@@ -246,8 +282,16 @@
  	userdom_dbus_send_all_users(cupsd_t)
  
  	optional_policy(`
@@ -14175,7 +14286,7 @@
  ')
  
  optional_policy(`
-@@ -263,6 +306,10 @@
+@@ -263,6 +307,10 @@
  ')
  
  optional_policy(`
@@ -14186,7 +14297,7 @@
  	# cups execs smbtool which reads samba_etc_t files
  	samba_read_config(cupsd_t)
  	samba_rw_var_files(cupsd_t)
-@@ -281,7 +328,7 @@
+@@ -281,7 +329,7 @@
  # Cups configuration daemon local policy
  #
  
@@ -14195,7 +14306,7 @@
  dontaudit cupsd_config_t self:capability sys_tty_config;
  allow cupsd_config_t self:process signal_perms;
  allow cupsd_config_t self:fifo_file rw_fifo_file_perms;
-@@ -326,6 +373,7 @@
+@@ -326,6 +374,7 @@
  dev_read_sysfs(cupsd_config_t)
  dev_read_urand(cupsd_config_t)
  dev_read_rand(cupsd_config_t)
@@ -14203,7 +14314,7 @@
  
  fs_getattr_all_fs(cupsd_config_t)
  fs_search_auto_mountpoints(cupsd_config_t)
-@@ -343,7 +391,7 @@
+@@ -343,7 +392,7 @@
  files_read_var_symlinks(cupsd_config_t)
  
  # Alternatives asks for this
@@ -14212,7 +14323,7 @@
  
  auth_use_nsswitch(cupsd_config_t)
  
-@@ -353,6 +401,7 @@
+@@ -353,6 +402,7 @@
  logging_send_syslog_msg(cupsd_config_t)
  
  miscfiles_read_localization(cupsd_config_t)
@@ -14220,7 +14331,7 @@
  
  seutil_dontaudit_search_config(cupsd_config_t)
  
-@@ -365,14 +414,16 @@
+@@ -365,14 +415,16 @@
  sysadm_dontaudit_search_home_dirs(cupsd_config_t)
  
  ifdef(`distro_redhat',`
@@ -14239,7 +14350,7 @@
  	cron_system_entry(cupsd_config_t, cupsd_config_exec_t)
  ')
  
-@@ -388,6 +439,7 @@
+@@ -388,6 +440,7 @@
  optional_policy(`
  	hal_domtrans(cupsd_config_t)
  	hal_read_tmp_files(cupsd_config_t)
@@ -14247,7 +14358,7 @@
  ')
  
  optional_policy(`
-@@ -500,7 +552,7 @@
+@@ -500,7 +553,7 @@
  allow hplip_t self:udp_socket create_socket_perms;
  allow hplip_t self:rawip_socket create_socket_perms;
  
@@ -14256,7 +14367,7 @@
  
  cups_stream_connect(hplip_t)
  
-@@ -509,6 +561,8 @@
+@@ -509,6 +562,8 @@
  read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
  files_search_etc(hplip_t)
  
@@ -14265,7 +14376,7 @@
  manage_files_pattern(hplip_t, hplip_var_run_t, hplip_var_run_t)
  files_pid_filetrans(hplip_t, hplip_var_run_t, file)
  
-@@ -538,7 +592,8 @@
+@@ -538,7 +593,8 @@
  dev_read_urand(hplip_t)
  dev_read_rand(hplip_t)
  dev_rw_generic_usb_dev(hplip_t)
@@ -14275,7 +14386,7 @@
  
  fs_getattr_all_fs(hplip_t)
  fs_search_auto_mountpoints(hplip_t)
-@@ -564,12 +619,14 @@
+@@ -564,12 +620,14 @@
  userdom_dontaudit_use_unpriv_user_fds(hplip_t)
  userdom_dontaudit_search_all_users_home_content(hplip_t)
  
@@ -14291,7 +14402,7 @@
  ')
  
  optional_policy(`
-@@ -651,3 +708,45 @@
+@@ -651,3 +709,45 @@
  optional_policy(`
  	udev_read_db(ptal_t)
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.709
retrieving revision 1.710
diff -u -r1.709 -r1.710
--- selinux-policy.spec	22 Sep 2008 17:55:56 -0000	1.709
+++ selinux-policy.spec	22 Sep 2008 20:07:59 -0000	1.710
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -381,6 +381,9 @@
 %endif
 
 %changelog
+* Mon Sep 22 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-6
+- Fix transition to nsplugin
+
 * Mon Sep 22 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-5
 - Add file context for /dev/mspblk.*
 



From roland at fedoraproject.org  Mon Sep 22 20:11:25 2008
From: roland at fedoraproject.org (Roland McGrath)
Date: Mon, 22 Sep 2008 20:11:25 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.965, 1.966 linux-2.6-utrace.patch, 
	1.97, 1.98 linux-2.6-x86-tracehook.patch, 1.8, 1.9
Message-ID: <20080922201125.BC123700FE@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3918

Modified Files:
	kernel.spec linux-2.6-utrace.patch 
	linux-2.6-x86-tracehook.patch 
Log Message:
utrace update


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.965
retrieving revision 1.966
diff -u -r1.965 -r1.966
--- kernel.spec	22 Sep 2008 19:43:49 -0000	1.965
+++ kernel.spec	22 Sep 2008 20:10:55 -0000	1.966
@@ -1760,6 +1760,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Sep 22 2008 Roland McGrath <roland at redhat.com>
+- utrace update
+
 * Mon Sep 22 2008 Dave Jones <davej at redhat.com>
 - Readd CONFIG_IWLCORE that disappeared for no apparent reason.
 

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- linux-2.6-utrace.patch	7 Sep 2008 18:01:05 -0000	1.97
+++ linux-2.6-utrace.patch	22 Sep 2008 20:10:55 -0000	1.98
@@ -1,17 +1,16 @@
  Documentation/DocBook/Makefile    |    2 +-
  Documentation/DocBook/utrace.tmpl |  566 +++++++++
  fs/proc/array.c                   |    3 +
- include/asm-generic/syscall.h     |    2 +-
  include/linux/ptrace.h            |   21 +
  include/linux/sched.h             |    6 +
- include/linux/tracehook.h         |   67 +-
+ include/linux/tracehook.h         |   65 +-
  include/linux/utrace.h            |  706 +++++++++++
  init/Kconfig                      |   26 +
  kernel/Makefile                   |    1 +
  kernel/ptrace.c                   |  605 +++++++++-
  kernel/signal.c                   |   14 +-
- kernel/utrace.c                   | 2516 +++++++++++++++++++++++++++++++++++++
- 13 files changed, 4525 insertions(+), 10 deletions(-)
+ kernel/utrace.c                   | 2538 +++++++++++++++++++++++++++++++++++++
+ 12 files changed, 4545 insertions(+), 8 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
 index 1615350..92ca631 100644  
@@ -599,7 +598,7 @@
 +
 +</book>
 diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 0d6eb33..99041de 100644  
+index 71c9be5..adc7a53 100644  
 --- a/fs/proc/array.c
 +++ b/fs/proc/array.c
 @@ -81,6 +81,7 @@
@@ -659,7 +658,7 @@
   * ptrace_init_task - initialize ptrace state for a new child
   * @child:		new child task
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index cfb0d87..581c487 100644  
+index 3d9120c..e063c78 100644  
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
 @@ -1196,6 +1196,11 @@ struct task_struct {
@@ -674,7 +673,7 @@
  /* Thread group tracking */
     	u32 parent_exec_id;
     	u32 self_exec_id;
-@@ -1768,6 +1773,7 @@ extern int kill_pgrp(struct pid *pid, in
+@@ -1772,6 +1777,7 @@ extern int kill_pgrp(struct pid *pid, in
  extern int kill_pid(struct pid *pid, int sig, int priv);
  extern int kill_proc_info(int, struct siginfo *, pid_t);
  extern int do_notify_parent(struct task_struct *, int);
@@ -683,7 +682,7 @@
  extern void force_sig_specific(int, struct task_struct *);
  extern int send_sig(int, struct task_struct *, int);
 diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
-index b48d819..968909d 100644  
+index 6186a78..968909d 100644  
 --- a/include/linux/tracehook.h
 +++ b/include/linux/tracehook.h
 @@ -49,6 +49,7 @@
@@ -2430,10 +2429,10 @@
  			  struct pt_regs *regs, void *cookie)
 diff --git a/kernel/utrace.c b/kernel/utrace.c
 new file mode 100644
-index ...5ef8fcd 100644  
+index ...1b794bb 100644  
 --- /dev/null
 +++ b/kernel/utrace.c
-@@ -0,0 +1,2516 @@
+@@ -0,0 +1,2538 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -2671,6 +2670,17 @@
 +}
 +
 +/*
++ * This is called with @utrace->lock held when the task is safely
++ * quiescent, i.e. it won't consult utrace->attached without the lock.
++ * Move any engines attached asynchronously from @utrace->attaching
++ * onto the @utrace->attached list.
++ */
++static void splice_attaching(struct utrace *utrace)
++{
++	list_splice_tail_init(&utrace->attaching, &utrace->attached);
++}
++
++/*
 + * Allocate a new engine structure.  It starts out with two refs:
 + * one ref for utrace_attach_task() to return, and ref for being attached.
 + */
@@ -2798,7 +2808,29 @@
 +	rcu_read_unlock();
 +
 +	list_add_tail(&engine->entry, &utrace->attaching);
-+	utrace->report = 1;
++
++	/*
++	 * Now the new engine is on the pending ->attaching list.  Make
++	 * sure it gets onto the ->attached list by the next time it's
++	 * examined.  When called on current (e.g. from inside a callback),
++	 * we can do it right away.  Otherwise, we set ->report to ensure
++	 * that start_report() takes the lock and does it next time.
++	 */
++
++	if (target == current) {
++		splice_attaching(utrace);
++	} else {
++		/*
++		 * Whenever setting ->report, we must maintain the
++		 * invariant that TIF_NOTIFY_RESUME is also set.
++		 * Otherwise utrace_control() or utrace_do_stop()
++		 * might skip setting TIF_NOTIFY_RESUME upon seeing
++		 * ->report already set, and we'd miss a necessary
++		 * callback.
++		 */
++		utrace->report = 1;
++		set_notify_resume(target);
++	}
 +	goto finish;
 +
 +first:
@@ -2848,17 +2880,6 @@
 +EXPORT_SYMBOL_GPL(utrace_attach_pid);
 +
 +/*
-+ * This is called with @utrace->lock held when the task is safely
-+ * quiescent, i.e. it won't consult utrace->attached without the lock.
-+ * Move any engines attached asynchronously from @utrace->attaching
-+ * onto the @utrace->attached list.
-+ */
-+static void splice_attaching(struct utrace *utrace)
-+{
-+	list_splice_tail_init(&utrace->attaching, &utrace->attached);
-+}
-+
-+/*
 + * When an engine is detached, the target thread may still see it and
 + * make callbacks until it quiesces.  We install a special ops vector
 + * with these two callbacks.  When the target thread quiesces, it can

linux-2.6-x86-tracehook.patch:

Index: linux-2.6-x86-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-x86-tracehook.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-x86-tracehook.patch	20 Aug 2008 20:23:16 -0000	1.8
+++ linux-2.6-x86-tracehook.patch	22 Sep 2008 20:10:55 -0000	1.9
@@ -3,12 +3,12 @@
  arch/x86/kernel/signal_32.c   |   11 ++-
  arch/x86/kernel/signal_64.c   |   49 +++-------
  include/asm-x86/ptrace.h      |    5 +
- include/asm-x86/syscall.h     |  210 +++++++++++++++++++++++++++++++++++++++++
+ include/asm-x86/syscall.h     |  211 +++++++++++++++++++++++++++++++++++++++++
  include/asm-x86/thread_info.h |    4 +-
- 7 files changed, 248 insertions(+), 66 deletions(-)
+ 7 files changed, 249 insertions(+), 66 deletions(-)
 
 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index ac2fb06..2206787 100644  
+index ed92864..ebfd7ff 100644  
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
 @@ -29,6 +29,7 @@ config X86
@@ -134,7 +134,7 @@
  	clear_thread_flag(TIF_IRET);
  }
 diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
-index b45ef8d..d01e3f6 100644  
+index ca316b5..1e19338 100644  
 --- a/arch/x86/kernel/signal_64.c
 +++ b/arch/x86/kernel/signal_64.c
 @@ -15,6 +15,7 @@
@@ -153,7 +153,7 @@
  #include "sigframe.h"
  
  #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
-@@ -346,35 +348,6 @@ give_sigsegv:
+@@ -355,35 +357,6 @@ give_sigsegv:
  }
  
  /*
@@ -189,7 +189,7 @@
   * OK, we're invoking a handler
   */	
  
-@@ -385,9 +358,9 @@ handle_signal(unsigned long sig, siginfo
+@@ -394,9 +367,9 @@ handle_signal(unsigned long sig, siginfo
  	int ret;
  
  	/* Are we from a system call? */
@@ -201,7 +201,7 @@
  		case -ERESTART_RESTARTBLOCK:
  		case -ERESTARTNOHAND:
  			regs->ax = -EINTR;
-@@ -444,8 +417,6 @@ handle_signal(unsigned long sig, siginfo
+@@ -453,8 +426,6 @@ handle_signal(unsigned long sig, siginfo
  		 * handler too.
  		 */
  		regs->flags &= ~X86_EFLAGS_TF;
@@ -210,7 +210,7 @@
  
  		spin_lock_irq(&current->sighand->siglock);
  		sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
-@@ -453,6 +424,9 @@ handle_signal(unsigned long sig, siginfo
+@@ -462,6 +433,9 @@ handle_signal(unsigned long sig, siginfo
  			sigaddset(&current->blocked,sig);
  		recalc_sigpending();
  		spin_unlock_irq(&current->sighand->siglock);
@@ -220,7 +220,7 @@
  	}
  
  	return ret;
-@@ -509,9 +483,9 @@ static void do_signal(struct pt_regs *re
+@@ -518,9 +492,9 @@ static void do_signal(struct pt_regs *re
  	}
  
  	/* Did we come from a system call? */
@@ -232,7 +232,7 @@
  		case -ERESTARTNOHAND:
  		case -ERESTARTSYS:
  		case -ERESTARTNOINTR:
-@@ -549,6 +523,11 @@ void do_notify_resume(struct pt_regs *re
+@@ -558,6 +532,11 @@ void do_notify_resume(struct pt_regs *re
  	/* deal with pending signal delivery */
  	if (thread_info_flags & _TIF_SIGPENDING)
  		do_signal(regs);
@@ -262,10 +262,10 @@
   */
 diff --git a/include/asm-x86/syscall.h b/include/asm-x86/syscall.h
 new file mode 100644
-index ...6f29389 100644  
+index ...04c47dc 100644  
 --- /dev/null
 +++ b/include/asm-x86/syscall.h
-@@ -0,0 +1,210 @@
+@@ -0,0 +1,211 @@
 +/*
 + * Access to user system call parameters and results
 + *
@@ -282,6 +282,7 @@
 +#define _ASM_SYSCALL_H	1
 +
 +#include <linux/sched.h>
++#include <linux/err.h>
 +
 +static inline long syscall_get_nr(struct task_struct *task,
 +				  struct pt_regs *regs)
@@ -315,7 +316,7 @@
 +		 */
 +		error = (long) (int) error;
 +#endif
-+	return error >= -4095L ? error : 0;
++	return IS_ERR_VALUE(error) ? error : 0;
 +}
 +
 +static inline long syscall_get_return_value(struct task_struct *task,



From rdieter at fedoraproject.org  Mon Sep 22 20:38:03 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 20:38:03 +0000 (UTC)
Subject: rpms/kphotoalbum/EL-5 kphotoalbum-3.0.2-dt.patch, NONE,
	1.1 kphotoalbum-3.1.1-gcc43.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 kphotoalbum.spec, 1.7, 1.8 sources, 1.2, 1.3
Message-ID: <20080922203803.D8991700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kphotoalbum/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7060

Modified Files:
	.cvsignore kphotoalbum.spec sources 
Added Files:
	kphotoalbum-3.0.2-dt.patch kphotoalbum-3.1.1-gcc43.patch 
Log Message:
sync from F-9 branch
EL-5 fixups


kphotoalbum-3.0.2-dt.patch:

--- NEW FILE kphotoalbum-3.0.2-dt.patch ---
diff -up kphotoalbum-3.0.2/src/kphotoalbum-import.desktop.dt kphotoalbum-3.0.2/src/kphotoalbum-import.desktop
--- kphotoalbum-3.0.2/src/kphotoalbum-import.desktop.dt	2007-04-15 03:22:29.000000000 -0500
+++ kphotoalbum-3.0.2/src/kphotoalbum-import.desktop	2007-08-26 10:32:29.000000000 -0500
@@ -40,4 +40,4 @@ X-KDE-StartupNotify=true
 Icon=kphotoalbum
 Categories=Qt;KDE;Graphics;
 NoDisplay=true
-MimeType=application/vnd.kde.kphotoalbum-import
+MimeType=application/vnd.kde.kphotoalbum-import;

kphotoalbum-3.1.1-gcc43.patch:

--- NEW FILE kphotoalbum-3.1.1-gcc43.patch ---
diff -up kphotoalbum-3.1.1/src/MainWindow/Window.cpp.gcc43 kphotoalbum-3.1.1/src/MainWindow/Window.cpp
--- kphotoalbum-3.1.1/src/MainWindow/Window.cpp.gcc43	2008-03-17 13:56:23.000000000 -0500
+++ kphotoalbum-3.1.1/src/MainWindow/Window.cpp	2008-03-18 15:45:05.000000000 -0500
@@ -108,6 +108,7 @@
 #include <kurldrag.h>
 #include <qclipboard.h>
 #include <stdexcept>
+#include <typeinfo>
 
 MainWindow::Window* MainWindow::Window::_instance = 0;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Nov 2006 16:01:40 -0000	1.3
+++ .cvsignore	22 Sep 2008 20:37:33 -0000	1.4
@@ -1,2 +1 @@
-clog
-kphotoalbum-2.2.tar.bz2
+kphotoalbum-3.1.1.tar.bz2


Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/EL-5/kphotoalbum.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kphotoalbum.spec	28 Nov 2006 16:01:40 -0000	1.7
+++ kphotoalbum.spec	22 Sep 2008 20:37:33 -0000	1.8
@@ -1,25 +1,32 @@
 
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
-Version: 2.2
-Release: 7%{?dist}
+Version: 3.1.1
+Release: 2%{?dist}
 
-License: GPL
+License: GPLv2+
 Group:   Applications/Multimedia 
-URL:	 http://www.kphotoalbum.org/
-Source:  http://www.kphotoalbum.org/download/kphotoalbum-%{version}.tar.bz2
+URL:	 http://kphotoalbum.org/
+Source0:  http://kphotoalbum.org/download/kphotoalbum-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: kphotoalbum-3.0.2-dt.patch
+Patch2: kphotoalbum-3.1.1-gcc43.patch
+
 Obsoletes: kimdaba < %{version}
 #Provides:  kimdaba = %{version}
 
+BuildRequires: desktop-file-utils
+BuildRequires: exiv2-devel >= 0.15
 BuildRequires: gettext
-BuildRequires: libkipi-devel 
-BuildRequires: qt-devel
+%if 0%{?fedora} > 6
+BuildRequires: kdelibs3-devel
+%else
 BuildRequires: kdelibs-devel
-# versioning isn't strictly required, just need to be sure we're 
-# building against the latest exiv2 -- Rex
-BuildRequires: exiv2-devel >= 0.12
+BuildRequires: libutempter-devel
+%endif
+BuildRequires: libkdcraw-devel >= 0.1.4
+BuildRequires: libkipi-devel
 
 ## Optional, not strictly required.
 #Requires(hint): kipi-plugins
@@ -34,7 +41,10 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?beta}
+%setup -q -n %{name}-%{version}%{?beta:-%{beta}}
+
+%patch1 -p1 -b .dt
+%patch2 -p1 -b .gcc43
 
 
 %build
@@ -42,7 +52,6 @@
 
 %configure \
   --disable-rpath \
-  --disable-gcc-hidden-visibility \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
   --disable-dependancy-tracking --disable-final
@@ -76,6 +85,12 @@
 fi
 
 
+%check
+for dt_file in $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop ; do
+  desktop-file-validate $dt_file 
+done
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -92,17 +107,54 @@
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc ChangeLog COPYING README TODO
 %{_bindir}/*
 %{_datadir}/apps/kphotoalbum/
 %{_datadir}/applications/kde/*.desktop
-%config %{_datadir}/config/*rc
+%{_datadir}/config/*rc
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
 
 
 %changelog
+* Thu Jul 17 2008 Rex Dieter <rdieter at fedoraproject.org> 3.1.1-2
+- respin
+
+* Tue Mar 18 2008 Rex Dieter <rdieter at fedoraproject.org> 3.1.1-1
+- kphotoalbum-3.1.1
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.1.0-2
+- Autorebuild for GCC 4.3
+
+* Sat Nov 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.1.0-1
+- kphotoalbum-3.1.0
+
+* Tue Nov 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.0.2-7
+- respin for exiv2-0.16
+
+* Sun Aug 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.0.2-6
+- desktop file patch (make MimeType=... end with ;)
+
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.0.2-5
+- fix %%check
+
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.0.2-3
+- specfile cosmetics
+- respin (BuildID)
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.0.2-2
+- License: GPLv2+
+
+* Thu Apr 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.0.2-1
+- kphotoalbum-3.0.2
+
+* Wed Apr 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.0.1-1
+- kphotoalbum-3.0.1
+
+* Sun Dec 31 2006 Rex Dieter <rdieter[AT]fedoraproject.org> 3.0-1
+- kphotoalbum-3.0
+
 * Tue Nov 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.2-7
 - BR: exiv2-devel >= 0.12
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 May 2006 19:45:44 -0000	1.2
+++ sources	22 Sep 2008 20:37:33 -0000	1.3
@@ -1 +1 @@
-0584b3d5f54d8a2e19cd7bc40967c026  kphotoalbum-2.2.tar.bz2
+0ced1a53efa25b70dbb1ca19b1d0afc3  kphotoalbum-3.1.1.tar.bz2



From iburrell at fedoraproject.org  Mon Sep 22 20:44:53 2008
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Mon, 22 Sep 2008 20:44:53 +0000 (UTC)
Subject: rpms/perl-Log-Message-Simple/EL-5 .cvsignore, 1.2,
	1.3 perl-Log-Message-Simple.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20080922204453.D8A8B700FE@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/pkgs/rpms/perl-Log-Message-Simple/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7874

Modified Files:
	.cvsignore perl-Log-Message-Simple.spec sources 
Log Message:
copy from F-8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Message-Simple/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Apr 2006 23:10:21 -0000	1.2
+++ .cvsignore	22 Sep 2008 20:44:23 -0000	1.3
@@ -1 +1 @@
-Log-Message-Simple-0.01.tar.gz
+Log-Message-Simple-0.02.tar.gz


Index: perl-Log-Message-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Message-Simple/EL-5/perl-Log-Message-Simple.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Log-Message-Simple.spec	17 Sep 2006 20:52:11 -0000	1.2
+++ perl-Log-Message-Simple.spec	22 Sep 2008 20:44:23 -0000	1.3
@@ -1,13 +1,15 @@
 Name:           perl-Log-Message-Simple
-Version:        0.01
+Version:        0.02
 Release:        2%{?dist}
 Summary:        Simplified frontend to Log::Message
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Log-Message-Simple/
 Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Log-Message-Simple-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Log::Message)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -30,7 +32,7 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
@@ -40,11 +42,23 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README
+%doc CHANGES README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Sun Dec 30 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.02-2
+- Adjust License-tag.
+- BR: perl(Test::More) (BZ 419631).
+
+* Mon May 28 2007 Steven Pritchard <steve at kspei.com> 0.02-1
+- Update to 0.02.
+- Include CHANGES.
+
+* Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.01-3
+- Use fixperms macro instead of our own chmod incantation.
+- BR ExtUtils::MakeMaker.
+
 * Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 0.01-2
 - Fix find option order.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Message-Simple/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Apr 2006 23:10:21 -0000	1.2
+++ sources	22 Sep 2008 20:44:23 -0000	1.3
@@ -1 +1 @@
-0c60795da495f6a79d09362e8b4f0061  Log-Message-Simple-0.01.tar.gz
+99bc2df8229cc12a4781af6d63cfeafd  Log-Message-Simple-0.02.tar.gz



From krh at fedoraproject.org  Mon Sep 22 20:47:26 2008
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Mon, 22 Sep 2008 20:47:26 +0000 (UTC)
Subject: rpms/kernel/devel drm-modesetting-intel-mm-private.patch, NONE,
	1.1 kernel.spec, 1.966, 1.967
Message-ID: <20080922204726.0A913700FE@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8390

Modified Files:
	kernel.spec 
Added Files:
	drm-modesetting-intel-mm-private.patch 
Log Message:
* Mon Sep 22 2008 Kristian H??gsberg <krh at redhat.com>
- Add patch to allow userspace to get a handle for the buffer object
  backing the drm fbdev buffer.
- Update intel modesetting for the buffer object change.


drm-modesetting-intel-mm-private.patch:

--- NEW FILE drm-modesetting-intel-mm-private.patch ---
>From 63901e2b76b591fd7e5b86c09228c953a28f992d Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
Date: Mon, 22 Sep 2008 16:43:04 -0400
Subject: [PATCH] Update intel modesetting to use mm_private instead of mm_handle.

---
 drivers/gpu/drm/i915/intel_display.c |   57 ++++++++++++++++++++++------------
 drivers/gpu/drm/i915/intel_drv.h     |    8 ++--
 drivers/gpu/drm/i915/intel_fb.c      |    6 +--
 3 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index d7e02a2..10d120a 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -370,6 +370,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y)
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 	struct intel_framebuffer *intel_fb;
 	struct drm_i915_gem_object *obj_priv;
+	struct drm_gem_object *obj;
 	int pipe = intel_crtc->pipe;
 	unsigned long Start, Offset;
 	int dspbase = (pipe == 0 ? DSPAADDR : DSPBADDR);
@@ -386,7 +387,8 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y)
 
 	intel_fb = to_intel_framebuffer(crtc->fb);
 
-	obj_priv = intel_fb->obj->driver_private;
+	obj = intel_fb->base.mm_private;
+	obj_priv = obj->driver_private;
 
 	Start = obj_priv->gtt_offset;
 	Offset = y * crtc->fb->pitch + x * (crtc->fb->bits_per_pixel / 8);
@@ -1464,21 +1466,34 @@ static void intel_user_framebuffer_destroy(struct drm_framebuffer *fb)
 {
 	struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb);
 	struct drm_device *dev = fb->dev;
+
 	if (fb->fbdev)
 		intelfb_remove(dev, fb);
 
 	drm_framebuffer_cleanup(fb);
+	drm_gem_object_unreference(fb->mm_private);
 
 	kfree(intel_fb);
 }
+
+static int intel_user_framebuffer_create_handle(struct drm_framebuffer *fb,
+						struct drm_file *file_priv,
+						unsigned int *handle)
+{
+	struct drm_gem_object *object = fb->mm_private;
+
+	return drm_gem_handle_create(file_priv, object, handle);
+}
       
 static const struct drm_framebuffer_funcs intel_fb_funcs = {
 	.destroy = intel_user_framebuffer_destroy,
+	.create_handle = intel_user_framebuffer_create_handle,
 };
 
-struct drm_framebuffer *intel_user_framebuffer_create(struct drm_device *dev,
-						      struct drm_file *filp,
-						      struct drm_mode_fb_cmd *mode_cmd)
+struct drm_framebuffer *
+intel_framebuffer_create(struct drm_device *dev,
+			 struct drm_mode_fb_cmd *mode_cmd,
+			 void *mm_private)
 {
 	struct intel_framebuffer *intel_fb;
 
@@ -1489,20 +1504,26 @@ struct drm_framebuffer *intel_user_framebuffer_create(struct drm_device *dev,
 	if (!drm_framebuffer_init(dev, &intel_fb->base, &intel_fb_funcs))
 		return NULL;
 
-	drm_helper_mode_fill_fb_struct(&intel_fb->base, mode_cmd);
+	drm_helper_mode_fill_fb_struct(&intel_fb->base, mode_cmd, mm_private);
 
-	if (filp) {
-		intel_fb->obj = drm_gem_object_lookup(dev, filp,
-						      mode_cmd->handle);
-		if (!intel_fb->obj) {
-			kfree(intel_fb);
-			return NULL;
-		}
-	}
-	drm_gem_object_unreference(intel_fb->obj);
 	return &intel_fb->base;
 }
 
+
+static struct drm_framebuffer *
+intel_user_framebuffer_create(struct drm_device *dev,
+			      struct drm_file *filp,
+			      struct drm_mode_fb_cmd *mode_cmd)
+{
+	struct drm_gem_object *obj;
+
+	obj = drm_gem_object_lookup(dev, filp, mode_cmd->handle);
+	if (!obj)
+		return NULL;
+
+	return intel_framebuffer_create(dev, mode_cmd, obj);
+}
+
 static int intel_insert_new_fb(struct drm_device *dev, struct drm_file *file_priv,
 				struct drm_framebuffer *fb, struct drm_mode_fb_cmd *mode_cmd)
 {
@@ -1519,14 +1540,10 @@ static int intel_insert_new_fb(struct drm_device *dev, struct drm_file *file_pri
 		mutex_unlock(&dev->struct_mutex);
 		return -EINVAL;
 	}
-	drm_helper_mode_fill_fb_struct(fb, mode_cmd);
-
-	drm_gem_object_unreference(intel_fb->obj);
-	drm_gem_object_unreference(obj);
+	drm_gem_object_unreference(intel_fb->base.mm_private);
+	drm_helper_mode_fill_fb_struct(fb, mode_cmd, obj);
 	mutex_unlock(&dev->struct_mutex);
 
-	intel_fb->obj = obj;
-
 	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
 		if (crtc->fb == fb) {
 			struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index bffbeef..256deac 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -50,7 +50,6 @@ struct intel_i2c_chan {
 
 struct intel_framebuffer {
 	struct drm_framebuffer base;
-	struct drm_gem_object *obj;
 };
 
 
@@ -119,7 +118,8 @@ extern int intelfb_resize(struct drm_device *dev, struct drm_crtc *crtc);
 extern void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
 				    u16 blue, int regno);
 
-extern struct drm_framebuffer *intel_user_framebuffer_create(struct drm_device *dev,
-							     struct drm_file *file_priv,
-							     struct drm_mode_fb_cmd *mode_cmd);
+extern struct drm_framebuffer *
+intel_framebuffer_create(struct drm_device *dev,
+			 struct drm_mode_fb_cmd *mode_cmd,
+			 void *mm_private);
 #endif /* __INTEL_DRV_H__ */
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index fea083b..8ec8e73 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -488,7 +488,7 @@ int intelfb_create(struct drm_device *dev, uint32_t fb_width, uint32_t fb_height
 
 	i915_gem_clflush_object(fbo);
 
-	fb = intel_user_framebuffer_create(dev, NULL, &mode_cmd);
+	fb = intel_framebuffer_create(dev, &mode_cmd, fbo);
 	if (!fb) {
 		DRM_ERROR("failed to allocate fb.\n");
 		ret = -ENOMEM;
@@ -500,8 +500,6 @@ int intelfb_create(struct drm_device *dev, uint32_t fb_width, uint32_t fb_height
 	intel_fb = to_intel_framebuffer(fb);
 	*intel_fb_p = intel_fb;
 
-	intel_fb->obj = fbo;
-
 	info = framebuffer_alloc(sizeof(struct intelfb_par), device);
 	if (!info) {
 		ret = -ENOMEM;
@@ -897,7 +895,7 @@ int intelfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
 		unregister_framebuffer(info);
 		iounmap(info->screen_base);
 		mutex_lock(&dev->struct_mutex);
-		drm_gem_object_unreference(intel_fb->obj);
+		drm_gem_object_unreference(intel_fb->base.mm_private);
 		mutex_unlock(&dev->struct_mutex);
 		framebuffer_release(info);
 	}
-- 
1.5.6.GIT



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.966
retrieving revision 1.967
diff -u -r1.966 -r1.967
--- kernel.spec	22 Sep 2008 20:10:55 -0000	1.966
+++ kernel.spec	22 Sep 2008 20:46:55 -0000	1.967
@@ -610,6 +610,7 @@
 Patch1812: drm-modesetting-i915.patch
 Patch1813: drm-nouveau.patch
 Patch1814: drm-create-handle-for-fb.patch
+Patch1815: drm-modesetting-intel-mm-private.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1169,6 +1170,7 @@
 ApplyPatch drm-modesetting-i915.patch
 ApplyPatch drm-nouveau.patch
 ApplyPatch drm-create-handle-for-fb.patch
+ApplyPatch drm-modesetting-intel-mm-private.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1772,6 +1774,7 @@
 * Mon Sep 22 2008 Kristian H??gsberg <krh at redhat.com>
 - Add patch to allow userspace to get a handle for the buffer object
   backing the drm fbdev buffer.
+- Update intel modesetting for the buffer object change.
 
 * Mon Sep 22 2008 Kyle McMartin <kyle at redhat.com>
 - Linux 2.6.27-rc7



From dwmw2 at fedoraproject.org  Mon Sep 22 20:50:52 2008
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Mon, 22 Sep 2008 20:50:52 +0000 (UTC)
Subject: rpms/bluez-hcidump/devel bluez-hcidump.spec,1.32,1.33
Message-ID: <20080922205052.7B4FA700FE@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-hcidump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8987

Modified Files:
	bluez-hcidump.spec 
Log Message:
rebuild


Index: bluez-hcidump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-hcidump/devel/bluez-hcidump.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- bluez-hcidump.spec	17 Jun 2008 14:09:51 -0000	1.32
+++ bluez-hcidump.spec	22 Sep 2008 20:50:22 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Bluetooth HCI protocol analyser
 Name: bluez-hcidump
 Version: 1.42
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -41,6 +41,9 @@
 %{_mandir}/man8/hcidump.8.gz
 
 %changelog
+* Mon Sep 22 2008 - David Woodhouse <David.Woodhouse at intel.com> - 1.42-2
+- Rebuild for libbluetooth.so.3
+
 * Tue Jun 17 2008 - Bastien Nocera <bnocera at redhat.com> - 1.42-1
 - Update to 1.42
 



From victorv at fedoraproject.org  Mon Sep 22 21:00:10 2008
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Mon, 22 Sep 2008 21:00:10 +0000 (UTC)
Subject: rpms/netbeans-platform8/devel
	netbeans-platform8-6.1-issue_143729.patch, NONE,
	1.1 netbeans-platform8.spec, 1.1, 1.2
Message-ID: <20080922210010.DB06B700FE@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/netbeans-platform8/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10868

Modified Files:
	netbeans-platform8.spec 
Added Files:
	netbeans-platform8-6.1-issue_143729.patch 
Log Message:
Patch for the issue http://www.netbeans.org/issues/show_bug.cgi?id=143729


netbeans-platform8-6.1-issue_143729.patch:

--- NEW FILE netbeans-platform8-6.1-issue_143729.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/core.startup/test/unit/src/org/netbeans/core/startup/ModuleManagerTest.java netbeans-6.1.new/core.startup/test/unit/src/org/netbeans/core/startup/ModuleManagerTest.java
--- libnb-platform-java-6.1/core.startup/test/unit/src/org/netbeans/core/startup/ModuleManagerTest.java	2008-05-30 03:09:24.000000000 +0400
+++ libnb-platform-java-6.1.new/core.startup/test/unit/src/org/netbeans/core/startup/ModuleManagerTest.java	2008-08-20 19:48:17.000000000 +0400
@@ -439,6 +439,31 @@
             Module m2 = mgr.create(new File(jars, "depends-on-simple-module.jar"), null, false, false, true);
             assertTrue(m1.isEnabled());
             assertTrue(m2.isEnabled());
+        } finally {
+            mgr.mutexPrivileged().exitWriteAccess();
+	}
+    }
+
+    public void testEagerEnablementRobust() throws Exception { // #144005
+        FileObject dir = FileUtil.toFileObject(getWorkDir());
+        assertNotNull(dir);
+        FakeModuleInstaller installer = new FakeModuleInstaller();
+        FakeEvents ev = new FakeEvents();
+        ModuleManager mgr = new ModuleManager(installer, ev);
+        mgr.mutexPrivileged().enterWriteAccess();
+        try {
+            Module eager1 = mgr.create(FileUtil.toFile(TestFileUtils.writeZipFile(dir, "eager1.jar",
+                "META-INF/MANIFEST.MF:OpenIDE-Module: eager1\nOpenIDE-Module-Module-Dependencies: autoload\n\n")), null, false, false, true);
+            assertEquals(Collections.emptySet(), mgr.getEnabledModules());
+            Module autoload = mgr.create(FileUtil.toFile(TestFileUtils.writeZipFile(dir, "autoload.jar",
+                "META-INF/MANIFEST.MF:OpenIDE-Module: autoload\n\n")), null, false, true, false);
+            assertEquals(new HashSet<Module>(Arrays.asList(autoload, eager1)), mgr.getEnabledModules());
+            Module eager2 = mgr.create(FileUtil.toFile(TestFileUtils.writeZipFile(dir, "eager2.jar",
+                "META-INF/MANIFEST.MF:OpenIDE-Module: eager2\nOpenIDE-Module-Module-Dependencies: missing\n\n")), null, false, false, true);
+            assertEquals(new HashSet<Module>(Arrays.asList(autoload, eager1)), mgr.getEnabledModules());
+            Module eager3 = mgr.create(FileUtil.toFile(TestFileUtils.writeZipFile(dir, "eager3.jar",
+                "META-INF/MANIFEST.MF:OpenIDE-Module: eager3\nOpenIDE-Module-Module-Dependencies: autoload\n\n")), null, false, false, true);
+            assertEquals(new HashSet<Module>(Arrays.asList(autoload, eager1, eager3)), mgr.getEnabledModules());
         } finally {
             mgr.mutexPrivileged().exitWriteAccess();
         }
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/o.n.bootstrap/src/org/netbeans/ModuleManager.java netbeans-6.1.new/o.n.bootstrap/src/org/netbeans/ModuleManager.java
--- libnb-platform-java-6.1/o.n.bootstrap/src/org/netbeans/ModuleManager.java	2008-05-30 03:10:46.000000000 +0400
+++ libnb-platform-java-6.1.new/o.n.bootstrap/src/org/netbeans/ModuleManager.java	2008-08-20 19:56:00.000000000 +0400
@@ -511,24 +511,24 @@
                         history, reloadable, autoload, eager, this, ev);
         ev.log(Events.FINISH_CREATE_REGULAR_MODULE, jar);
         subCreate(m);
-        if (m.isEager()) {
-            List<Module> immediate = simulateEnable(Collections.<Module>emptySet());
-            if (!immediate.isEmpty()) {
-                if (!immediate.contains(m)) {
-                    throw new IllegalStateException("Can immediately enable modules " + immediate + ", but not including " + m + "; its problems: " + m.getProblems()); // NOI18N
-                }
-                boolean ok = true;
-		for (Module other: immediate) {
-                    if (!other.isAutoload() && !other.isEager()) {
-                        // Nope, would require a real module to be turned on first.
-                        ok = false;
-                        break;
-                    }
-                }
-                if (ok) {
-                    Util.err.fine("Enabling " + m + " immediately");
-                    enable(Collections.<Module>emptySet());
-                }
+        // Must run eager enablement check for *every* module that is created,
+        // even if it itself is not eager. Otherwise it is possible that an eager
+        // module gets created, followed immediately by one of its dependencies,
+        // and does not get turned on.
+        List<Module> immediate = simulateEnable(Collections.<Module>emptySet());
+        if (!immediate.isEmpty()) {
+            assert immediate.contains(m) : "Can immediately enable modules " + immediate + ", but not including " + m + "; its problems: " + m.getProblems();
+            boolean ok = true;
+            for (Module other: immediate) {
+                if (!other.isAutoload() && !other.isEager()) {
+                    // Nope, would require a real module to be turned on first.
+                    ok = false;
+                    break;
+                }
+            }
+            if (ok) {
+                Util.err.fine("Enabling " + m + " immediately");
+                enable(Collections.<Module>emptySet());
             }
         }
         return m;


Index: netbeans-platform8.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform8/devel/netbeans-platform8.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netbeans-platform8.spec	8 Sep 2008 16:35:53 -0000	1.1
+++ netbeans-platform8.spec	22 Sep 2008 20:59:40 -0000	1.2
@@ -31,7 +31,7 @@
 
 Name:         %{nb_}-%{nb_platform}
 Version:      %{nb_ver}
-Release:      4%{?dist}
+Release:      5%{?dist}
 Summary:      NetBeans Platform %{nb_platform_ver}
 Group:        Development/Libraries
 License:      GPLv2 with exceptions or CDDL
@@ -42,8 +42,10 @@
 
 Patch0: %{name}-%{version}-build_bootstrap.patch
 Patch1: %{name}-%{version}-properties.patch
-# Issue http://www.netbeans.org/issues/show_bug.cgi?id=134544
+# http://www.netbeans.org/issues/show_bug.cgi?id=134544
 Patch2: %{name}-%{version}-win_launcher.patch
+# http://www.netbeans.org/issues/show_bug.cgi?id=143729
+Patch3: %{name}-%{version}-issue_143729.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -120,6 +122,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 
@@ -241,6 +244,9 @@
 %doc %{nb_javadoc_dir}/
 
 %changelog
+* Mon Sep 22 2008 Victor Vasilyev <victor.vasilyev at sun.com> 6.1-5
+- Patch3: Issue http://www.netbeans.org/issues/show_bug.cgi?id=143729
+
 * Mon Sep 08 2008 Victor Vasilyev <victor.vasilyev at sun.com> 6.1-4
 - Linking to the external JARs is moved to the %%install script from the %%post scripts
 - Canonical value for %%defattr is used



From rdieter at fedoraproject.org  Mon Sep 22 21:01:59 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 22 Sep 2008 21:01:59 +0000 (UTC)
Subject: rpms/xine-lib/EL-5 xine-lib-1.1.15-ansi.patch, NONE, 1.1 .cvsignore,
	1.8, 1.9 sources, 1.8, 1.9 xine-lib-cleanup-sources.sh, 1.3,
	1.4 xine-lib.spec, 1.19,
	1.20 xine-lib-1.1.12-CVE-2008-1878.patch, 1.1,
	NONE xine-lib-1.1.5-multilib-devel.patch, 1.1,
	NONE xine-lib-1.1.8-CVE-2006-1664.patch, 1.1,
	NONE xine-lib-1.1.8-CVE-2008-0225.patch, 1.1,
	NONE xine-lib-1.1.8-CVE-2008-0486.patch, 1.1, NONE
Message-ID: <20080922210159.E34C0700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12876

Modified Files:
	.cvsignore sources xine-lib-cleanup-sources.sh xine-lib.spec 
Added Files:
	xine-lib-1.1.15-ansi.patch 
Removed Files:
	xine-lib-1.1.12-CVE-2008-1878.patch 
	xine-lib-1.1.5-multilib-devel.patch 
	xine-lib-1.1.8-CVE-2006-1664.patch 
	xine-lib-1.1.8-CVE-2008-0225.patch 
	xine-lib-1.1.8-CVE-2008-0486.patch 
Log Message:
* Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-1
- xine-lib-1.1.15, plugin ABI 1.24 (rh#455752, CVE-2008-3231)
- Obsoletes: -arts (f9+)


xine-lib-1.1.15-ansi.patch:

--- NEW FILE xine-lib-1.1.15-ansi.patch ---
diff -up xine-lib-1.1.15/src/xine-engine/buffer.h.ansi xine-lib-1.1.15/src/xine-engine/buffer.h
--- xine-lib-1.1.15/src/xine-engine/buffer.h.ansi	2008-07-16 16:01:56.000000000 -0500
+++ xine-lib-1.1.15/src/xine-engine/buffer.h	2008-08-19 12:08:46.000000000 -0500
@@ -676,7 +676,7 @@ void _x_bmiheader_le2me( xine_bmiheader 
 /* convert xine_waveformatex struct from little endian */
 void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED;
 
-static inline _x_is_fourcc(void *ptr, void *tag) {
+static __inline _x_is_fourcc(void *ptr, void *tag) {
   return memcmp(ptr, tag, 4) == 0;
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Sep 2007 15:17:50 -0000	1.8
+++ .cvsignore	22 Sep 2008 21:01:29 -0000	1.9
@@ -1,2 +1,2 @@
-xine-lib-1.1.8-pruned.tar.bz2
-xine-lib-1.1.8-autotools.patch.bz2
+xine-lib-1.1.15-autotools.patch.bz2
+xine-lib-1.1.15-pruned.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Sep 2007 15:17:50 -0000	1.8
+++ sources	22 Sep 2008 21:01:29 -0000	1.9
@@ -1,2 +1,2 @@
-6cbfae9d31fc138c7cb3c3d178e1286d  xine-lib-1.1.8-pruned.tar.bz2
-b4a7c7a9af428b26667402d6dc180107  xine-lib-1.1.8-autotools.patch.bz2
+ffd74ec893a5f1167c69987a68f436fd  xine-lib-1.1.15-autotools.patch.bz2
+acdbdc024382afac111eb076304448ed  xine-lib-1.1.15-pruned.tar.bz2


Index: xine-lib-cleanup-sources.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib-cleanup-sources.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xine-lib-cleanup-sources.sh	13 Apr 2007 20:52:22 -0000	1.3
+++ xine-lib-cleanup-sources.sh	22 Sep 2008 21:01:29 -0000	1.4
@@ -21,19 +21,27 @@
 tar -xjf $tarball
 cd $dir
 
+rmpluglib()
+{
+    echo "removing src/$1/$2..."
+    rm -rf src/$1/$2
+    sed -i -e "s/SUBDIRS = \(.*\)$2\(.*\)/SUBDIRS = \1\2/g" src/$1/Makefile.am
+    sed -i -e "/^src\/$1\/$2/d" configure.ac
+}
+
 # Main libraries
-for remove in libfaad libffmpeg libmad libmpeg2 dxr3 libspudec libspucmml libspucc liba52 libdts; do
+for remove in libfaad libffmpeg libmad libmpeg2 dxr3 liba52 libdts; do
     echo "removing src/$remove..."
     rm -rf src/$remove 
     sed -i -e "/$remove/d" src/Makefile.am
     sed -i -e "/^src\/$remove/d" configure.ac
 done
 # Input plugin libraries
-for remove in libdvdnav vcd; do
-    echo "removing src/input/$remove..."
-    rm -rf src/input/$remove 
-    sed -i -e "s/SUBDIRS = \(.*\)${remove}\(.*\)/SUBDIRS = \1\2/g" src/input/Makefile.am
-    sed -i -e "/^src\/input\/$remove/d" configure.ac
+for remove in vcd; do
+    rmpluglib input vcd
+done
+for remove in ffmpeg; do
+    rmpluglib combined ffmpeg
 done
 # Input plugins
 for p in dvd vcd mms; do
@@ -66,7 +74,7 @@
        -e /xineplug_decode_nsf/d \
        -e 's/ nosefart//' \
        src/libxineadec/Makefile.am
-sed -i -e /nosefart/d configure.ac
+sed -i -e '/nosefart\/Makefile/d' configure.ac
 
 # All clean !
 


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xine-lib.spec	24 Apr 2008 13:21:30 -0000	1.19
+++ xine-lib.spec	22 Sep 2008 21:01:29 -0000	1.20
@@ -2,66 +2,71 @@
 # - libstk:  http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog
 # - drop the opengl video out plugin?
 #   http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html
-# - move pulseaudio to main package from -extras?
-#   http://fedoraproject.org/wiki/Releases/FeaturePulseaudio
-#   --> not yet:
-#    http://www.redhat.com/archives/fedora-devel-list/2007-August/msg01411.html
+# - external dvdnav - not compatible as of 1.1.11 and 4.1.1
+# - deprecate ESD support?
+
+%define         abiver      1.24
+%define         codecdir    %{_libdir}/codecs
 
-%define         codecdir %{_libdir}/codecs
 %ifarch %{ix86}
     %define     have_vidix  1
 %else
     %define     have_vidix  0
-%endif
-%if 0%{?fedora} >= 8
-    %define     with_xcb    %{?_without_xcb:0}%{!?_without_xcb:1}
-%else
-    %define     with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
-%endif
-    %define     with_jack   %{?_without_jack:0}%{!?_without_jack:1}
-    %define     with_wpack  %{?_without_wavpack:0}%{!?_without_wavpack:1}
+%endif # ix86
+
 %if 0%{?fedora}
     %define     with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
     %define     with_caca   %{?_without_caca:0}%{!?_without_caca:1}
     %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
+    %define     with_xcb    %{?_without_xcb:0}%{!?_without_xcb:1}
 %else
     %define     with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
     %define     with_caca   %{?_with_caca:1}%{!?_with_caca:0}
     %define     with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
+    %define     with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
+%endif # Fedora
+
+%if 0%{?fedora} > 8
+%define _without_arts --without-arts
 %endif
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.8
-Release:        9%{?dist}
+Version:        1.1.15
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
 # The tarball is generated from the upstream tarball using
 # the script in SOURCE1. It prunes potentially patented code
-#Source0:        http://dl.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
+#Source0:        http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
 Source0:        %{name}-%{version}-pruned.tar.bz2
 Source1:        %{name}-cleanup-sources.sh
 Source2:        %{name}-mk-autotools-patch.sh
 # autotools patch created with source2
 Patch0:         %{name}-%{version}-autotools.patch.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Patch1:         %{name}-1.1.4-optflags.patch
-Patch2:         %{name}-1.1.8-CVE-2008-0225.patch
-Patch3:         %{name}-1.1.8-CVE-2006-1664.patch
-Patch4:         %{name}-1.1.8-CVE-2008-0486.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
-Patch7:         %{name}-1.1.5-multilib-devel.patch
-Patch8:         %{name}-1.1.12-CVE-2008-1878.patch
+## upstream patches
+# phonon-xine doesn't compile with xine-lib-1.1.15, http://bugs.kde.org/169365
+Patch100:       xine-lib-1.1.15-ansi.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Provides:       xine-lib(plugin-abi) = %{abiver}
 # X11
-BuildRequires:  libX11-devel libXv-devel libXinerama-devel libXvMC-devel
+BuildRequires:  libX11-devel
+BuildRequires:  libXv-devel
+BuildRequires:  libXinerama-devel
+BuildRequires:  libXvMC-devel
 BuildRequires:  libGLU-devel
 %if %{with_xcb}
 BuildRequires:  libxcb-devel
 %endif # xcb
 # Video
-BuildRequires:  SDL-devel libtheora-devel libmng-devel
+BuildRequires:  SDL-devel
+BuildRequires:  libtheora-devel
+BuildRequires:  libmng-devel
 %if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
@@ -78,43 +83,34 @@
 BuildRequires:  fontconfig-devel
 %endif # freetype
 # Audio
-BuildRequires:  libogg-devel libvorbis-devel flac-devel libmodplug-devel
-BuildRequires:  esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0
+BuildRequires:  alsa-lib-devel >= 0.9.0
+BuildRequires:  esound-devel
+BuildRequires:  flac-devel
+BuildRequires:  jack-audio-connection-kit-devel
+BuildRequires:  libmodplug-devel
 BuildRequires:  libmpcdec-devel
-%if %{with_wpack}
-BuildRequires:  wavpack-devel
-%endif # wpack
+BuildRequires:  libvorbis-devel
 %if %{with_pa}
 BuildRequires:  pulseaudio-lib-devel
 %endif # pa
-%if %{with_jack}
-BuildRequires:  jack-audio-connection-kit-devel
-%endif # jack
+BuildRequires:  speex-devel
+%if 0%{?_without_arts:1}
+Obsoletes:      xine-lib-arts < %{version}-%{release}
+%else
+BuildRequires:  arts-devel
+%endif
+BuildRequires:  wavpack-devel
 # CDs
 BuildRequires:  libcdio-devel
 # Other
-BuildRequires:  pkgconfig gnome-vfs2-devel gtk2-devel
-# samba-common in <= FC-6, libsmbclient-devel in FC7+
-BuildRequires:  %{_includedir}/libsmbclient.h
-
-%package devel
-Summary:         Xine library development files
-Group:           Development/Libraries
-Requires:        %{name} = %{version}-%{release}
-Requires:        pkgconfig zlib-devel
-
-%package arts
-Summary:         aRts plugin for xine-lib
-Group:           System Environment/Libraries
-Requires:        %{name} = %{version}-%{release}
-# -arts was split off the -extras subpackage at 1.1.7-3
-Obsoletes:       xine-lib-extras < 1.1.7-3
-
-%package extras
-Summary:         Additional plugins for xine-lib
-Group:           System Environment/Libraries
-Requires:        %{name} = %{version}-%{release}
-
+BuildRequires:  pkgconfig
+BuildRequires:  gnome-vfs2-devel
+BuildRequires:  gtk2-devel
+%if 0%{?fedora} > 6 || 0%{?rhel} > 5
+BuildRequires:  libsmbclient-devel
+%else
+BuildRequires:  samba-common
+%endif
 
 %description
 This package contains the Xine library. Xine is a free multimedia player.
@@ -123,24 +119,50 @@
 interprets many of the most common multimedia formats available - and some
 of the most uncommon formats, too.  --with/--without rpmbuild options
 (some default values depend on target distribution): aalib, caca, directfb,
-imagemagick, freetype, antialiasing (with freetype), jack, pulseaudio,
-wavpack, xcb.
+imagemagick, freetype, antialiasing (with freetype), pulseaudio, xcb.
+
+%package        devel
+Summary:        Xine library development files
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+Requires:       zlib-devel
 
-%description devel
+%description    devel
 This package contains development files for xine-lib.
 
-%description arts
+%package        arts
+Summary:        aRts plugin for xine-lib
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+#Requires:      xine-lib(plugin-abi) = %{abiver}
+# -arts was split off the -extras subpackage at 1.1.7-3
+Obsoletes:      xine-lib-extras < 1.1.7-3
+
+%description    arts
 This package contains the aRts extra plugin for xine-lib.
 
-%description extras
+%package        pulseaudio
+Summary:        Pulseaudio plugin for xine-lib
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+# -pulseaudio was split off -extras at 1.1.11.1-2
+#Obsoletes:     xine-lib-extras < 1.1.11.1-2
+
+%description    pulseaudio
+This package contains the pulseaudio plugin for xine-lib.
+
+
+%package        extras
+Summary:        Additional plugins for xine-lib
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+#Requires:      xine-lib(plugin-abi) = %{abiver}
+
+%description    extras
 This package contains extra plugins for xine-lib:
   - EsounD
-%if %{with_jack}
   - JACK
-%endif # jack
-%if %{with_pa}
-  - Pulseaudio
-%endif # pa
   - GDK-Pixbuf
   - GNOME VFS
   - SMB
@@ -166,13 +188,10 @@
 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
 %patch1 -p1 -b .optflags
 touch -r m4/optimizations.m4.stamp m4/optimizations.m4
-%patch2 -p1 -b .CVE-2008-0225
-%patch3 -p1 -b .CVE-2006-1664
-%patch4 -p1 -b .CVE-2008-0486
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
-%patch7 -p0 -b .multilib-devel
-%patch8 -p1 -b .CVE-2008-1878
+
+%patch100 -p1 -b .ansi
 
 # Avoid standard rpaths on lib64 archs:
 sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -191,7 +210,6 @@
 %endif # directfb
     --disable-a52dec \
     --disable-mad \
-    --disable-dvdnavtest --with-external-dvdnav \
     --disable-vcd \
     --disable-asf \
     --disable-faad \
@@ -209,10 +227,8 @@
 %if 0%{?_without_imagemagick:1}
     --without-imagemagick \
 %endif # imagemagick
-    --with-arts \
-%if %{with_wpack}
+    %{!?_without_arts:--with-arts} %{?_without_arts} \
     --with-wavpack \
-%endif
     --with-real-codecs-path=%{codecdir} \
     --with-w32-path=%{codecdir}
 
@@ -254,155 +270,208 @@
 %{_mandir}/man5/xine.5*
 %dir %{_libdir}/xine/
 %dir %{_libdir}/xine/plugins/
-%dir %{_libdir}/xine/plugins/%{version}/
-%{_libdir}/xine/plugins/%{version}/mime.types
+%dir %{_libdir}/xine/plugins/%{abiver}/
+%{_libdir}/xine/plugins/%{abiver}/mime.types
 # Listing every plugin separately for better control over binary packages
 # containing exactly the plugins we want, nothing accidentally snuck in
 # nor dropped.
-%dir %{_libdir}/xine/plugins/%{version}/post/
-%{_libdir}/xine/plugins/%{version}/post/xineplug_post_audio_filters.so
-%{_libdir}/xine/plugins/%{version}/post/xineplug_post_goom.so
-%{_libdir}/xine/plugins/%{version}/post/xineplug_post_mosaico.so
-%{_libdir}/xine/plugins/%{version}/post/xineplug_post_switch.so
-%{_libdir}/xine/plugins/%{version}/post/xineplug_post_visualizations.so
+%dir %{_libdir}/xine/plugins/%{abiver}/post/
+%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_audio_filters.so
+%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_goom.so
+%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_mosaico.so
+%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_switch.so
+%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_visualizations.so
 %if %{have_vidix}
-%dir %{_libdir}/xine/plugins/%{version}/vidix/
-%{_libdir}/xine/plugins/%{version}/vidix/cyberblade_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/mach64_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/mga_crtc2_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/mga_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/nvidia_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/pm2_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/pm3_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/radeon_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/rage128_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/savage_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/sis_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/unichrome_vid.so
+%dir %{_libdir}/xine/plugins/%{abiver}/vidix/
+%{_libdir}/xine/plugins/%{abiver}/vidix/cyberblade_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/mach64_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/mga_crtc2_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/mga_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/nvidia_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/pm2_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/pm3_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/radeon_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/rage128_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/savage_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/sis_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/unichrome_vid.so
 %endif # vidix
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_alsa.so
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_file.so
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_none.so
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_oss.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_bitplane.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_gsm610.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_lpcm.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_alsa.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_file.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_none.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_oss.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_bitplane.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gsm610.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_lpcm.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_mpc.so
 %ifarch %ix86
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_qt.so
 %endif # ix86
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_real.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_rgb.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_speex.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_spudvb.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_theora.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_real.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_rgb.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_speex.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spu.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spucc.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spucmml.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spudvb.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_sputext.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_theora.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_vorbis.so
 %ifarch %ix86
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_w32dll.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_w32dll.so
 %endif # ix86
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_yuv.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_avi.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_fli.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_flv.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_games.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_iff.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_image.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_matroska.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_mng.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_nsv.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_ogg.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_pva.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_qt.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_rawdv.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_real.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_slave.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_sputext.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_yuv_frames.so
-%{_libdir}/xine/plugins/%{version}/xineplug_flac.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_cdda.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_dvb.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_file.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_http.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_net.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_pnm.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_pvr.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_rtp.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_rtsp.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_stdin_fifo.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_v4l.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_fb.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_none.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_opengl.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_syncfb.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_yuv.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_audio.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_avi.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_fli.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_flv.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_games.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_iff.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_image.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_matroska.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mng.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_nsv.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_ogg.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_pva.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_qt.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_rawdv.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_real.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_slave.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_sputext.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_yuv_frames.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_flac.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_cdda.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_dvb.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_file.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_http.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_net.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_pnm.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_pvr.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_rtp.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_rtsp.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_stdin_fifo.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_v4l.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_fb.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_none.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_opengl.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_raw.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_syncfb.so
 %if %{have_vidix}
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_vidix.so
 %endif # vidix
 %if %{with_xcb}
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xcbshm.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xcbxv.so
 %endif # xcb
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so
-%if %{with_wpack}
-%{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so
-%endif # wpack
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xshm.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xv.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xvmc.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xxmc.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_wavpack.so
 
+%if 0%{!?_without_arts:1}
 %files arts
 %defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_arts.so
+%endif
+
+%if %{with_pa}
+%files pulseaudio
+%defattr(-,root,root,-)
+%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_pulseaudio.so
+%endif
 
 %files extras
 %defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so
-%if %{with_jack}
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so
-%endif # jack
-%if %{with_pa}
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_pulseaudio.so
-%endif # pa
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_gdk_pixbuf.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_esd.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_jack.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gdk_pixbuf.so
 %if 0%{!?_without_imagemagick:1}
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_image.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_image.so
 %endif # imagemagick
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_gnome_vfs.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_smb.so
 %if %{with_aalib}
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
 %endif # aalib
 %if %{with_caca}
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
 %endif # caca
 %if 0%{!?_without_directfb:1}
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_directfb.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xdirectfb.so
 %endif # directfb
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_sdl.so
 
 %files devel
 %defattr(-,root,root,-)
 %doc __docs/hackersguide/*
 %{_bindir}/xine-config
+%{_bindir}/xine-list*
 %{_datadir}/aclocal/xine.m4
 %{_includedir}/xine.h
 %{_includedir}/xine/
 %{_libdir}/libxine.so
 %{_libdir}/pkgconfig/libxine.pc
 %{_mandir}/man1/xine-config.1*
+%{_mandir}/man1/xine-list*.1*
 
 
 %changelog
-* Thu Apr 24 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.8-9
-- CVE-2008-1878 (#443969)
+* Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-1
+- xine-lib-1.1.15, plugin ABI 1.24 (rh#455752, CVE-2008-3231)
+- Obsoletes: -arts (f9+)
+
+* Sun Apr 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.12-3
+- rebuild for new ImageMagick (6.4.0.10)
+
+* Thu Apr 24 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.12-2
+- CVE-2008-1878
+
+* Wed Apr 16 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.12-1
+- 1.1.12 (plugin ABI 1.21); qt, mkv, and pulseaudio patches applied upstream.
+
+* Wed Apr  9 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.11.1-3
+- Apply upstream fixes for Quicktime (#441705) and Matroska regressions
+  introduced in 1.1.11.1.
+
+* Mon Apr 07 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.11.1-2
+- pulse-rework2 patch (#439731)
+- -pulseaudio subpkg (#439731)
+
+* Sun Mar 30 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.11.1-1
+- 1.1.11.1 (security update, #438663, CVE-2008-1482).
+- Provide versioned xine-lib(plugin-abi) so 3rd party packages installing
+  plugins can use it instead of requiring a version of xine-lib.
+
+* Wed Mar 19 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.11-1
+- 1.1.11 (security update, #438182, CVE-2008-0073).
+- Drop jack and wavpack build conditionals.
+- Specfile cleanups.
+
+* Fri Mar  7 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.10.1-1.1
+- xcb support for f7+ (#373411)
+
+* Fri Feb  8 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.10.1-1
+- 1.1.10.1 (security update, #431541).
+
+* Sun Jan 27 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.10-2
+- Include spu, spucc, and spucmml decoders (#213597).
+
+* Sun Jan 27 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.10-1
+- 1.1.10 (security update).
+
+* Mon Jan 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.9.1-3
+- Fix version number in libxine.pc (#429487).
+
+* Sun Jan 20 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.9.1-2
+- Disable upstream "discard buffers on ao close" 1.1.9 changeset (#429182).
 
-* Fri Feb  8 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-8
-- Include ASF and FLAC comment security fixes from 1.1.10 and 1.1.10.1.
+* Sat Jan 12 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.9.1-1
+- 1.1.9.1 (security update).
 
-* Sat Jan 12 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-7
-- Include RTSP security fixes from 1.1.9.1.
+* Sun Jan  6 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.9-1
+- 1.1.9.
 
 * Thu Sep 27 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-6
 - Enable wavpack support by default for all distros.


--- xine-lib-1.1.12-CVE-2008-1878.patch DELETED ---


--- xine-lib-1.1.5-multilib-devel.patch DELETED ---


--- xine-lib-1.1.8-CVE-2006-1664.patch DELETED ---


--- xine-lib-1.1.8-CVE-2008-0225.patch DELETED ---


--- xine-lib-1.1.8-CVE-2008-0486.patch DELETED ---



From iburrell at fedoraproject.org  Mon Sep 22 21:03:37 2008
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Mon, 22 Sep 2008 21:03:37 +0000 (UTC)
Subject: rpms/perl-CPANPLUS/EL-5 CPANPLUS-filter-provides.sh, NONE,
	1.1 .cvsignore, 1.5, 1.6 perl-CPANPLUS.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <20080922210337.10A43700FE@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/pkgs/rpms/perl-CPANPLUS/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13362

Modified Files:
	.cvsignore perl-CPANPLUS.spec sources 
Added Files:
	CPANPLUS-filter-provides.sh 
Log Message:
copy from F-8


--- NEW FILE CPANPLUS-filter-provides.sh ---
#!/bin/sh

@@PERL_PROV@@ "$@" | sed -e '/^perl(Log::Message::Handlers)$/d'


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CPANPLUS/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Oct 2006 00:07:26 -0000	1.5
+++ .cvsignore	22 Sep 2008 21:03:06 -0000	1.6
@@ -1 +1 @@
-CPANPLUS-0.076.tar.gz
+CPANPLUS-0.82.tar.gz


Index: perl-CPANPLUS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CPANPLUS/EL-5/perl-CPANPLUS.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-CPANPLUS.spec	30 Jan 2007 15:37:23 -0000	1.6
+++ perl-CPANPLUS.spec	22 Sep 2008 21:03:06 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-CPANPLUS
-Version:        0.076
-Release:        2%{?dist}
+Version:        0.82
+Release:        1%{?dist}
 Summary:        API & CLI access to the CPAN mirrors
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -9,6 +9,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Archive::Extract) >= 0.07
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(File::Fetch) >= 0.07
 BuildRequires:  perl(IPC::Cmd) >= 0.24
 BuildRequires:  perl(IPC::Run) >= 0.79
@@ -21,8 +22,13 @@
 BuildRequires:  perl(Object::Accessor) >= 0.03
 BuildRequires:  perl(Params::Check) >= 0.22
 BuildRequires:  perl(Term::UI) >= 0.05
-%{?_with_check:BuildRequires:  perl(Package::Constants)}
+%{?_with_check:BuildRequires:  perl(Archive::Tar) >= 1.23}
+%{?_with_check:BuildRequires:  perl(IO::Zlib) >= 1.04}
 %{?_with_check:BuildRequires:  perl(Module::CoreList)}
+%{?_with_check:BuildRequires:  perl(Package::Constants)}
+%{?_with_check:BuildRequires:  perl(Test::Harness)}
+%{?_with_check:BuildRequires:  perl(Test::More) >= 0.47}
+%{?_with_check:BuildRequires:  perl(version)}
 Requires:       perl(IPC::Run) >= 0.79
 Requires:       perl(Module::Pluggable) >= 2.4
 Requires:       perl(Module::CoreList)
@@ -32,6 +38,10 @@
 %global real_perl_requires %{__perl_requires}
 %define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires
 
+Source99:       CPANPLUS-filter-provides.sh
+%global real_perl_provides %{__perl_provides}
+%define __perl_provides %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-provides
+
 %description
 The CPANPLUS library is an API to the CPAN mirrors and a collection of
 interactive shells, commandline programs, etc, that use this API.
@@ -42,10 +52,13 @@
 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}
+
 perl -pi -e 'print "#!/usr/bin/perl\n\n" if ($. == 1)' bin/cpanp-run-perl
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor AUTOINSTALL=1
+%{__perl} Makefile.PL INSTALLDIRS=vendor #AUTOINSTALL=1
 make %{?_smp_mflags}
 
 %install
@@ -54,7 +67,6 @@
 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 -size 0 -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
 %{_fixperms} $RPM_BUILD_ROOT/*
@@ -63,7 +75,7 @@
 %{?_with_check:make test}
 
 %clean
-rm -rf $RPM_BUILD_ROOT %{__perl_requires}
+rm -rf $RPM_BUILD_ROOT %{__perl_requires} %{__perl_provides}
 
 %files
 %defattr(-,root,root,-)
@@ -74,6 +86,20 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Aug 23 2007 Steven Pritchard <steve at kspei.com> 0.82-1
+- Update to 0.82.
+
+* Tue Jun 26 2007 Steven Pritchard <steve at kspei.com> 0.80-1
+- Update to 0.80.
+- BR Test::Harness, Test::More, and version when running tests.
+
+* Wed Apr 04 2007 Steven Pritchard <steve at kspei.com> 0.78-1
+- Update to 0.78.
+- BR Archive::Tar, ExtUtils::MakeMaker, and IO::Zlib.
+- Drop the AUTOINSTALL=1.  It isn't necessary anymore.
+- Drop the find -size 0.  That shouldn't be necessary for noarch packages.
+- Filter out Log::Message::Handlers auto-provides.
+
 * Tue Jan 30 2007 Steven Pritchard <steve at kspei.com> 0.076-2
 - Add missing explicit dependencies on IPC::Run, Module::CoreList, and
   Module::Pluggable (#225357).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CPANPLUS/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Oct 2006 00:07:26 -0000	1.5
+++ sources	22 Sep 2008 21:03:06 -0000	1.6
@@ -1 +1 @@
-a301bb6240ded8eea9f33ce7c8f969fb  CPANPLUS-0.076.tar.gz
+370acee7b7538c4ca85d3dc3c199ad90  CPANPLUS-0.82.tar.gz



From cweyl at fedoraproject.org  Mon Sep 22 21:08:15 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 22 Sep 2008 21:08:15 +0000 (UTC)
Subject: rpms/cpan-upload/devel cpan-upload.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080922210815.4821D700FE@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/cpan-upload/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14079/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cpan-upload.spec import.log 
Log Message:
initial commit



--- NEW FILE cpan-upload.spec ---
Name:           cpan-upload
Version:        2.2       
Release:        2%{?dist}
Summary:        Automate the uploading of files to the CPAN (PAUSE)

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/src/NEILB/cpan-upload-2.2/ 
Source0:        http://search.cpan.org/pub/CPAN/authors/id/N/NE/NEILB/scripts/cpan-upload-%{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(AppConfig::Std)  
BuildRequires:  perl(File::Basename)  
BuildRequires:  perl(HTTP::Request::Common)  
BuildRequires:  perl(HTTP::Status)  
BuildRequires:  perl(LWP::UserAgent)  
BuildRequires:  perl(Net::FTP)  
BuildRequires:  perl(Term::ReadKey)

# not automagically picked up ("require" construct)
Requires:       perl(Term::ReadKey)

%description
cpan-upload is a script which automates the process of uploading a file to
CPAN using PAUSE, the Perl Authors Upload Server.  For example, to upload a
recent version of the Net::Dict module I ran: 

    % cpan-upload -verbose Net-Dict-1.07.tar.gz

If everything went OK, you???ll get two mail messages from the PAUSE monitor: 
one to acknowledge the upload, and one to let you know if your upload made 
it through to CPAN.

%prep
%setup -q


%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 ChangeLog README
%{_bindir}/*
%{_mandir}/man1/*.1*


%changelog
* Mon Sep 22 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.2-2
- update source/url

* Sat Sep 20 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.2-1
- initial Fedora packaging


--- NEW FILE import.log ---
cpan-upload-2_2-2_fc9:HEAD:cpan-upload-2.2-2.fc9.src.rpm:1222117658


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cpan-upload/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Sep 2008 09:40:51 -0000	1.1
+++ .cvsignore	22 Sep 2008 21:07:45 -0000	1.2
@@ -0,0 +1 @@
+cpan-upload-2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpan-upload/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 09:40:51 -0000	1.1
+++ sources	22 Sep 2008 21:07:45 -0000	1.2
@@ -0,0 +1 @@
+e900a0b3e78f9f2a4dabc1d1b5e1cdb6  cpan-upload-2.2.tar.gz



From cweyl at fedoraproject.org  Mon Sep 22 21:08:59 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 22 Sep 2008 21:08:59 +0000 (UTC)
Subject: rpms/cpan-upload/devel cpan-upload.spec,1.1,1.2
Message-ID: <20080922210859.50AE6700FE@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/cpan-upload/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14360

Modified Files:
	cpan-upload.spec 
Log Message:
release bump


Index: cpan-upload.spec
===================================================================
RCS file: /cvs/extras/rpms/cpan-upload/devel/cpan-upload.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cpan-upload.spec	22 Sep 2008 21:07:45 -0000	1.1
+++ cpan-upload.spec	22 Sep 2008 21:08:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           cpan-upload
 Version:        2.2       
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Automate the uploading of files to the CPAN (PAUSE)
 
 Group:          Development/Libraries
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.2-3
+- bump
+
 * Mon Sep 22 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.2-2
 - update source/url
 



From cweyl at fedoraproject.org  Mon Sep 22 21:09:40 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 22 Sep 2008 21:09:40 +0000 (UTC)
Subject: rpms/cpan-upload/F-8 cpan-upload.spec, NONE, 1.1 import.log, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20080922210940.01577700FE@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/cpan-upload/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14571

Modified Files:
	sources 
Added Files:
	cpan-upload.spec import.log 
Log Message:
pseudo-branch of cpan-upload to F-8


--- NEW FILE cpan-upload.spec ---
Name:           cpan-upload
Version:        2.2       
Release:        3%{?dist}
Summary:        Automate the uploading of files to the CPAN (PAUSE)

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/src/NEILB/cpan-upload-2.2/ 
Source0:        http://search.cpan.org/pub/CPAN/authors/id/N/NE/NEILB/scripts/cpan-upload-%{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(AppConfig::Std)  
BuildRequires:  perl(File::Basename)  
BuildRequires:  perl(HTTP::Request::Common)  
BuildRequires:  perl(HTTP::Status)  
BuildRequires:  perl(LWP::UserAgent)  
BuildRequires:  perl(Net::FTP)  
BuildRequires:  perl(Term::ReadKey)

# not automagically picked up ("require" construct)
Requires:       perl(Term::ReadKey)

%description
cpan-upload is a script which automates the process of uploading a file to
CPAN using PAUSE, the Perl Authors Upload Server.  For example, to upload a
recent version of the Net::Dict module I ran: 

    % cpan-upload -verbose Net-Dict-1.07.tar.gz

If everything went OK, you???ll get two mail messages from the PAUSE monitor: 
one to acknowledge the upload, and one to let you know if your upload made 
it through to CPAN.

%prep
%setup -q


%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 ChangeLog README
%{_bindir}/*
%{_mandir}/man1/*.1*


%changelog
* Mon Sep 22 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.2-3
- bump

* Mon Sep 22 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.2-2
- update source/url

* Sat Sep 20 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.2-1
- initial Fedora packaging


--- NEW FILE import.log ---
cpan-upload-2_2-2_fc9:HEAD:cpan-upload-2.2-2.fc9.src.rpm:1222117658


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpan-upload/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 09:40:51 -0000	1.1
+++ sources	22 Sep 2008 21:09:09 -0000	1.2
@@ -0,0 +1 @@
+e900a0b3e78f9f2a4dabc1d1b5e1cdb6  cpan-upload-2.2.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 22 21:21:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 21:21:22 +0000
Subject: [pkgdb] libdvdread: rdieter has requested watchcommits
Message-ID: <20080922212122.5B969208DA4@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on libdvdread (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdvdread



From pkgdb at fedoraproject.org  Mon Sep 22 21:21:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 21:21:22 +0000
Subject: [pkgdb] libdvdread: rdieter has requested watchbugzilla
Message-ID: <20080922212122.45752208D2B@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on libdvdread (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdvdread



From pkgdb at fedoraproject.org  Mon Sep 22 21:21:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 21:21:27 +0000
Subject: [pkgdb] libdvdread: rdieter has requested watchcommits
Message-ID: <20080922212127.22E0F208DA9@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on libdvdread (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdvdread



From pkgdb at fedoraproject.org  Mon Sep 22 21:21:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 21:21:26 +0000
Subject: [pkgdb] libdvdread: rdieter has requested watchbugzilla
Message-ID: <20080922212126.857EF208D60@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on libdvdread (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdvdread



From pkgdb at fedoraproject.org  Mon Sep 22 21:21:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 21:21:29 +0000
Subject: [pkgdb] libdvdread: rdieter has requested watchbugzilla
Message-ID: <20080922212129.24181208DAC@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on libdvdread (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdvdread



From pkgdb at fedoraproject.org  Mon Sep 22 21:21:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 21:21:30 +0000
Subject: [pkgdb] libdvdread: rdieter has requested watchcommits
Message-ID: <20080922212130.877A5208DB0@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on libdvdread (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdvdread



From spot at fedoraproject.org  Mon Sep 22 21:26:02 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 22 Sep 2008 21:26:02 +0000 (UTC)
Subject: rpms/ntfs-3g/devel .cvsignore, 1.23, 1.24 ntfs-3g.spec, 1.33,
	1.34 sources, 1.25, 1.26
Message-ID: <20080922212602.78E72700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16313

Modified Files:
	.cvsignore ntfs-3g.spec sources 
Log Message:
update rawhide to 1.2926-RC


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	22 Aug 2008 17:30:12 -0000	1.23
+++ .cvsignore	22 Sep 2008 21:25:32 -0000	1.24
@@ -1 +1 @@
-ntfs-3g-1.2812.tgz
+ntfs-3g-1.2926-RC.tgz


Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/ntfs-3g.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ntfs-3g.spec	22 Aug 2008 17:30:12 -0000	1.33
+++ ntfs-3g.spec	22 Sep 2008 21:25:32 -0000	1.34
@@ -4,11 +4,11 @@
 
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
-Version:	1.2812
-Release:	1%{?dist}
+Version:	1.2926
+Release:	0.1.RC%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
-Source0:	http://www.ntfs-3g.org/%{name}-%{version}.tgz
+Source0:	http://ntfs-3g.org/ntfs-3g-%{version}-RC.tgz
 Patch0:		ntfs-3g-1.2216-nomtab.patch
 URL:		http://www.ntfs-3g.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,7 +46,7 @@
 functionality.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}-RC
 %patch0 -p1
 
 %build
@@ -123,6 +123,9 @@
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
+* Mon Sep 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.2926-0.1.RC
+- update to 1.2926-RC (rawhide, F10)
+
 * Fri Aug 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.2812-1
 - update to 1.2812
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	22 Aug 2008 17:30:12 -0000	1.25
+++ sources	22 Sep 2008 21:25:32 -0000	1.26
@@ -1 +1 @@
-b250a8d6603dc8c5411ee50bea444ccb  ntfs-3g-1.2812.tgz
+78b22240cd0113642802f6d18f83f775  ntfs-3g-1.2926-RC.tgz



From spot at fedoraproject.org  Mon Sep 22 21:28:08 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 22 Sep 2008 21:28:08 +0000 (UTC)
Subject: rpms/ntfs-3g/F-8 .cvsignore, 1.14, 1.15 ntfs-3g.spec, 1.26,
	1.27 sources, 1.20, 1.21
Message-ID: <20080922212808.22473700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16679/F-8

Modified Files:
	.cvsignore ntfs-3g.spec sources 
Log Message:
1.2918 stable for F-8 and F-9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-8/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	6 Oct 2007 18:28:19 -0000	1.14
+++ .cvsignore	22 Sep 2008 21:27:37 -0000	1.15
@@ -1,7 +1 @@
-ntfs-3g-1.417.tgz
-ntfs-3g-1.516.tgz
-ntfs-3g-1.710.tgz
-ntfs-3g-1.810.tgz
-ntfs-3g-1.826.tgz
-ntfs-3g-1.913.tgz
-ntfs-3g-1.1004.tgz
+ntfs-3g-1.2918.tgz


Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-8/ntfs-3g.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ntfs-3g.spec	13 Jul 2008 02:33:14 -0000	1.26
+++ ntfs-3g.spec	22 Sep 2008 21:27:37 -0000	1.27
@@ -4,7 +4,7 @@
 
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
-Version:	1.2712
+Version:	1.2918
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
@@ -123,12 +123,15 @@
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
+* Mon Sep 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.2918-1
+- update to 1.2918
+
+* Fri Aug 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.2812-1
+- update to 1.2812
+
 * Sat Jul 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.2712-1
 - update to 1.2712
 
-* Mon May  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.2506-1.1
-- missing patch
-
 * Mon May  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.2506-1
 - update to 1.2506
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-8/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	13 Jul 2008 02:33:14 -0000	1.20
+++ sources	22 Sep 2008 21:27:37 -0000	1.21
@@ -1 +1 @@
-9e50dac71261dbb401511be4e9020def  ntfs-3g-1.2712.tgz
+8d87f12702dd0d97c3aa269582159848  ntfs-3g-1.2918.tgz



From spot at fedoraproject.org  Mon Sep 22 21:28:08 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 22 Sep 2008 21:28:08 +0000 (UTC)
Subject: rpms/ntfs-3g/F-9 ntfs-3g.spec,1.33,1.34 sources,1.25,1.26
Message-ID: <20080922212808.45EF7700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16679/F-9

Modified Files:
	ntfs-3g.spec sources 
Log Message:
1.2918 stable for F-8 and F-9


Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-9/ntfs-3g.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ntfs-3g.spec	22 Aug 2008 17:30:12 -0000	1.33
+++ ntfs-3g.spec	22 Sep 2008 21:27:38 -0000	1.34
@@ -4,7 +4,7 @@
 
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
-Version:	1.2812
+Version:	1.2918
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
@@ -123,6 +123,9 @@
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
+* Mon Sep 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.2918-1
+- update to 1.2918
+
 * Fri Aug 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.2812-1
 - update to 1.2812
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-9/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	22 Aug 2008 17:30:12 -0000	1.25
+++ sources	22 Sep 2008 21:27:38 -0000	1.26
@@ -1 +1 @@
-b250a8d6603dc8c5411ee50bea444ccb  ntfs-3g-1.2812.tgz
+8d87f12702dd0d97c3aa269582159848  ntfs-3g-1.2918.tgz



From deji at fedoraproject.org  Mon Sep 22 21:29:08 2008
From: deji at fedoraproject.org (Deji Akingunola)
Date: Mon, 22 Sep 2008 21:29:08 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.110,1.111 comps-f9.xml.in,1.389,1.390
Message-ID: <20080922212908.916C4700FE@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16737

Modified Files:
	comps-f10.xml.in comps-f9.xml.in 
Log Message:
Add bibletime, file-browser-applet, and gnomesword



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- comps-f10.xml.in	20 Sep 2008 14:13:38 -0000	1.110
+++ comps-f10.xml.in	22 Sep 2008 21:28:38 -0000	1.111
@@ -1886,6 +1886,7 @@
       <packagereq type="optional">cairo-dock</packagereq>
       <packagereq type="optional">deskbar-applet</packagereq>
       <packagereq type="optional">esc</packagereq>
+      <packagereq type="optional">file-browser-applet</packagereq>
       <packagereq type="optional">gconf-editor</packagereq>
       <packagereq type="optional">gdesklets</packagereq>
       <packagereq type="optional">gimmie</packagereq>
@@ -1904,6 +1905,7 @@
       <packagereq type="optional">gnome-netstatus</packagereq>
       <packagereq type="optional">gnome-pilot-conduits</packagereq>
       <packagereq type="optional">gnome-schedule</packagereq>
+      <packagereq type="optional">gnomesword</packagereq>
       <packagereq type="optional">gnome-theme-curvylooks</packagereq>
       <packagereq type="optional">gnotime</packagereq>
       <packagereq type="optional">gonvert</packagereq>
@@ -2836,6 +2838,7 @@
       <packagereq type="default">zenity</packagereq>
       <packagereq type="optional">apollon</packagereq>
       <packagereq type="optional">basket</packagereq>
+      <packagereq type="optional">bibletime</packagereq>
       <packagereq type="optional">compiz-kde</packagereq>
       <packagereq type="optional">crystal</packagereq>
       <packagereq type="optional">gtk-qt-engine</packagereq>


Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f9.xml.in,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- comps-f9.xml.in	20 Sep 2008 14:13:38 -0000	1.389
+++ comps-f9.xml.in	22 Sep 2008 21:28:38 -0000	1.390
@@ -1831,6 +1831,7 @@
       <packagereq type="optional">cairo-dock</packagereq>
       <packagereq type="optional">deskbar-applet</packagereq>
       <packagereq type="optional">esc</packagereq>
+      <packagereq type="optional">file-browser-applet</packagereq>
       <packagereq type="optional">gconf-editor</packagereq>
       <packagereq type="optional">gdesklets</packagereq>
       <packagereq type="optional">gimmie</packagereq>
@@ -1849,6 +1850,7 @@
       <packagereq type="optional">gnome-netstatus</packagereq>
       <packagereq type="optional">gnome-pilot-conduits</packagereq>
       <packagereq type="optional">gnome-schedule</packagereq>
+      <packagereq type="optional">gnomesword</packagereq>
       <packagereq type="optional">gnome-theme-curvylooks</packagereq>
       <packagereq type="optional">gnotime</packagereq>
       <packagereq type="optional">gonvert</packagereq>
@@ -2609,6 +2611,7 @@
       <packagereq type="default">zenity</packagereq>
       <packagereq type="optional">apollon</packagereq>
       <packagereq type="optional">basket</packagereq>
+      <packagereq type="optional">bibletime</packagereq>
       <packagereq type="optional">compiz-kde</packagereq>
       <packagereq type="optional">crystal</packagereq>
       <packagereq type="optional">dragonplayer</packagereq>



From pkgdb at fedoraproject.org  Mon Sep 22 21:39:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 22 Sep 2008 21:39:48 +0000
Subject: [pkgdb] generic-release was added for spot
Message-ID: <20080922213948.B791F208DA0@bastion.fedora.phx.redhat.com>

spot has added Package generic-release with summary Generic release files
spot has approved Package generic-release
spot has added a Fedora devel branch for generic-release with an owner of spot
spot has approved generic-release in Fedora devel
spot has approved Package generic-release
spot has set commit to Approved for packager on generic-release (Fedora devel)
spot has set build to Approved for packager on generic-release (Fedora devel)
spot has set checkout to Approved for packager on generic-release (Fedora devel)
spot has set commit to Approved for uberpackager on generic-release (Fedora devel)
spot has set build to Approved for uberpackager on generic-release (Fedora devel)
spot has set checkout to Approved for uberpackager on generic-release (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/generic-release



From spot at fedoraproject.org  Mon Sep 22 21:39:55 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 22 Sep 2008 21:39:55 +0000 (UTC)
Subject: rpms/generic-release - New directory
Message-ID: <20080922213955.203E1700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/generic-release
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsY18567/rpms/generic-release

Log Message:
Directory /cvs/extras/rpms/generic-release added to the repository




From spot at fedoraproject.org  Mon Sep 22 21:39:55 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 22 Sep 2008 21:39:55 +0000 (UTC)
Subject: rpms/generic-release/devel - New directory
Message-ID: <20080922213955.5104E700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/generic-release/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsY18567/rpms/generic-release/devel

Log Message:
Directory /cvs/extras/rpms/generic-release/devel added to the repository




From spot at fedoraproject.org  Mon Sep 22 21:39:56 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 22 Sep 2008 21:39:56 +0000 (UTC)
Subject: rpms/generic-release Makefile,NONE,1.1
Message-ID: <20080922213956.25B67700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/generic-release
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsY18567/rpms/generic-release

Added Files:
	Makefile 
Log Message:
Setup of module generic-release


--- NEW FILE Makefile ---
# Top level Makefile for module generic-release
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From spot at fedoraproject.org  Mon Sep 22 21:39:56 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 22 Sep 2008 21:39:56 +0000 (UTC)
Subject: rpms/generic-release/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080922213956.57214700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/generic-release/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsY18567/rpms/generic-release/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module generic-release


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: generic-release
# $Id: Makefile,v 1.1 2008/09/22 21:39:56 spot Exp $
NAME := generic-release
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Sep 22 21:42:33 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 22 Sep 2008 21:42:33 +0000 (UTC)
Subject: rpms/generic-release/devel generic-release.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080922214233.0D695700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/generic-release/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18992/devel

Modified Files:
	.cvsignore sources 
Added Files:
	generic-release.spec import.log 
Log Message:

initial commit



--- NEW FILE generic-release.spec ---
%define release_name Generic
%define dist_version 10

Summary:	Generic release files
Name:		generic-release
Version:	9.91
Release:	1
License:	GPLv2
Group:		System Environment/Base
Source:		%{name}-%{version}.tar.gz
Obsoletes:	redhat-release
Provides:	redhat-release = %{version}-%{release}
Provides:	system-release = %{version}-%{release}
Requires:	system-release-notes >= 8
# We require release notes to make sure that they don't get dropped during
# upgrades, and just because we always want the release notes available
# instead of explicitly asked for
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

%description
Generic release files such as yum configs and various /etc/ files that
define the release. This package explicitly is a replacement for the 
fedora-release package, if you are unable for any reason to abide by the 
trademark restrictions on the fedora-release package.

%package notes
Summary:	Release Notes
License:	Open Publication
Group:		System Environment/Base
Provides:	system-release-notes = %{version}-%{release}

%description notes
Generic release notes package. This package explicitly is a replacement 
for the fedora-release-notes package, if you are unable for any reason
to abide by the trademark restrictions on the fedora-release-notes 
package. Please note that there is no actual useful content here.


%prep
%setup -q

%build

%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc
echo "Generic release %{version} (%{release_name})" > $RPM_BUILD_ROOT/etc/fedora-release
echo "cpe://o:generic:generic:%{version}" > $RPM_BUILD_ROOT/etc/system-release-cpe
cp -p $RPM_BUILD_ROOT/etc/fedora-release $RPM_BUILD_ROOT/etc/issue
echo "Kernel \r on an \m (\l)" >> $RPM_BUILD_ROOT/etc/issue
cp -p $RPM_BUILD_ROOT/etc/issue $RPM_BUILD_ROOT/etc/issue.net
echo >> $RPM_BUILD_ROOT/etc/issue
ln -s fedora-release $RPM_BUILD_ROOT/etc/redhat-release
ln -s fedora-release $RPM_BUILD_ROOT/etc/system-release

install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg

install -m 644 RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/

# Install all the keys, link the primary keys to primary arch files
# and to compat generic location
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
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
# dist macros.

%%fedora		%{dist_version}
%%dist		.fc%{dist_version}
%%fc%{dist_version}		1
EOF

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc GPL 
%config %attr(0644,root,root) /etc/fedora-release
/etc/redhat-release
/etc/system-release
%config %attr(0644,root,root) /etc/system-release-cpe
%dir /etc/yum.repos.d
%config(noreplace) /etc/yum.repos.d/*
%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/*

%files notes
%defattr(-,root,root,-)
%doc README.Generic-Release-Notes

%changelog
* Mon Sep 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 9.91-1
- initial package for generic-release and generic-release-notes


--- NEW FILE import.log ---
generic-release-9_91-1:HEAD:generic-release-9.91-1.src.rpm:1222119636


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/generic-release/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Sep 2008 21:39:56 -0000	1.1
+++ .cvsignore	22 Sep 2008 21:42:02 -0000	1.2
@@ -0,0 +1 @@
+generic-release-9.91.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/generic-release/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 21:39:56 -0000	1.1
+++ sources	22 Sep 2008 21:42:02 -0000	1.2
@@ -0,0 +1 @@
+be8d90967e9306123b861e2f8e49f994  generic-release-9.91.tar.gz



From mclasen at fedoraproject.org  Mon Sep 22 21:43:49 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 21:43:49 +0000 (UTC)
Subject: rpms/cheese/devel .cvsignore, 1.17, 1.18 cheese.spec, 1.34,
	1.35 sources, 1.17, 1.18
Message-ID: <20080922214349.0657F700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/cheese/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19018

Modified Files:
	.cvsignore cheese.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cheese/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	10 Sep 2008 02:12:54 -0000	1.17
+++ .cvsignore	22 Sep 2008 21:43:18 -0000	1.18
@@ -1 +1 @@
-cheese-2.23.92.tar.bz2
+cheese-2.24.0.tar.bz2


Index: cheese.spec
===================================================================
RCS file: /cvs/extras/rpms/cheese/devel/cheese.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cheese.spec	10 Sep 2008 02:12:54 -0000	1.34
+++ cheese.spec	22 Sep 2008 21:43:18 -0000	1.35
@@ -1,12 +1,12 @@
 Name:           cheese
-Version:        2.23.92
-Release:        3%{?dist}
+Version:        2.24,0
+Release:        1%{?dist}
 Summary:        A webcam application for snapshots and movies
 
 Group:          Amusements/Graphics
 License:        GPLv2+
 URL:            http://live.gnome.org/Cheese
-Source0:        http://download.gnome.org/sources/cheese/2.23/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/cheese/2.24/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel >= 2.10.0
@@ -110,6 +110,9 @@
 %{_datadir}/dbus-1/services/org.gnome.Cheese.service
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen  <mclasen at redhat.com> 2.24.0-1
+- Update to 2.24.0
+
 * Tue Sep  9 2008 Matthias Clasen  <mclasen at redhat.com> 2.23.92-3
 - Update to 2.23.92
 - Drop upstreamed patches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cheese/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	10 Sep 2008 02:12:54 -0000	1.17
+++ sources	22 Sep 2008 21:43:18 -0000	1.18
@@ -1 +1 @@
-323e0db49d9cee1e85d3dd4b8d8c015f  cheese-2.23.92.tar.bz2
+12536184509158aeffadb3f4aa1fd3fc  cheese-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 21:47:56 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 21:47:56 +0000 (UTC)
Subject: rpms/libgnomekbd/devel .cvsignore, 1.16, 1.17 libgnomekbd.spec, 1.39,
	1.40 sources, 1.16, 1.17
Message-ID: <20080922214756.58D14700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnomekbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19681

Modified Files:
	.cvsignore libgnomekbd.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	4 Sep 2008 04:56:42 -0000	1.16
+++ .cvsignore	22 Sep 2008 21:47:26 -0000	1.17
@@ -1 +1 @@
-libgnomekbd-2.23.91.tar.bz2
+libgnomekbd-2.24.0.tar.bz2


Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/libgnomekbd.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libgnomekbd.spec	4 Sep 2008 05:16:46 -0000	1.39
+++ libgnomekbd.spec	22 Sep 2008 21:47:26 -0000	1.40
@@ -1,12 +1,12 @@
 Name:           libgnomekbd
-Version:       	2.23.91
+Version:       	2.24.0
 Release:        1%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gswitchit.sourceforge.net
-Source0:        http://download.gnome.org/sources/libgnomekbd/2.23/libgnomekbd-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/libgnomekbd/2.24/libgnomekbd-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -133,6 +133,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	4 Sep 2008 04:56:42 -0000	1.16
+++ sources	22 Sep 2008 21:47:26 -0000	1.17
@@ -1 +1 @@
-5d2a377c038f8a9e34778f65a80516bd  libgnomekbd-2.23.91.tar.bz2
+43e4d090bc67a1984bebf551637783fd  libgnomekbd-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 21:50:50 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 21:50:50 +0000 (UTC)
Subject: rpms/cheese/devel cheese.spec,1.35,1.36
Message-ID: <20080922215050.EF6A3700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/cheese/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20131

Modified Files:
	cheese.spec 
Log Message:
fix spec



Index: cheese.spec
===================================================================
RCS file: /cvs/extras/rpms/cheese/devel/cheese.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- cheese.spec	22 Sep 2008 21:43:18 -0000	1.35
+++ cheese.spec	22 Sep 2008 21:50:20 -0000	1.36
@@ -1,5 +1,5 @@
 Name:           cheese
-Version:        2.24,0
+Version:        2.24.0
 Release:        1%{?dist}
 Summary:        A webcam application for snapshots and movies
 



From spot at fedoraproject.org  Mon Sep 22 21:52:32 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 22 Sep 2008 21:52:32 +0000 (UTC)
Subject: rpms/generic-release/devel generic-release.spec,1.1,1.2
Message-ID: <20080922215232.6FA8B700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/generic-release/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20453

Modified Files:
	generic-release.spec 
Log Message:
add conflicts, slight description changes


Index: generic-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/generic-release/devel/generic-release.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- generic-release.spec	22 Sep 2008 21:42:02 -0000	1.1
+++ generic-release.spec	22 Sep 2008 21:52:02 -0000	1.2
@@ -4,7 +4,7 @@
 Summary:	Generic release files
 Name:		generic-release
 Version:	9.91
-Release:	1
+Release:	2
 License:	GPLv2
 Group:		System Environment/Base
 Source:		%{name}-%{version}.tar.gz
@@ -17,23 +17,25 @@
 # instead of explicitly asked for
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
+Conflicts:	fedora-release
 
 %description
 Generic release files such as yum configs and various /etc/ files that
 define the release. This package explicitly is a replacement for the 
-fedora-release package, if you are unable for any reason to abide by the 
-trademark restrictions on the fedora-release package.
+trademarked release package, if you are unable for any reason to abide by the 
+trademark restrictions on that release package.
 
 %package notes
 Summary:	Release Notes
 License:	Open Publication
 Group:		System Environment/Base
 Provides:	system-release-notes = %{version}-%{release}
+Conflicts:	fedora-release-notes
 
 %description notes
 Generic release notes package. This package explicitly is a replacement 
-for the fedora-release-notes package, if you are unable for any reason
-to abide by the trademark restrictions on the fedora-release-notes 
+for the trademarked release-notes package, if you are unable for any reason
+to abide by the trademark restrictions on that release-notes 
 package. Please note that there is no actual useful content here.
 
 
@@ -115,5 +117,9 @@
 %doc README.Generic-Release-Notes
 
 %changelog
+* Mon Sep 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 9.91-2
+- add Conflicts
+- further sanitize descriptions
+
 * Mon Sep 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 9.91-1
 - initial package for generic-release and generic-release-notes



From mclasen at fedoraproject.org  Mon Sep 22 21:54:25 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 21:54:25 +0000 (UTC)
Subject: rpms/gtk2-engines/devel .cvsignore, 1.55, 1.56 gtk2-engines.spec,
	1.95, 1.96 sources, 1.56, 1.57
Message-ID: <20080922215425.7B35C700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2-engines/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20092

Modified Files:
	.cvsignore gtk2-engines.spec sources 
Log Message:
2.16.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	3 Sep 2008 00:31:34 -0000	1.55
+++ .cvsignore	22 Sep 2008 21:53:55 -0000	1.56
@@ -1 +1 @@
-gtk-engines-2.15.4.tar.bz2
+gtk-engines-2.16.0.tar.bz2


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gtk2-engines.spec	3 Sep 2008 00:31:34 -0000	1.95
+++ gtk2-engines.spec	22 Sep 2008 21:53:55 -0000	1.96
@@ -2,12 +2,12 @@
 
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
-Version:        2.15.4
+Version:        2.16.0
 Release:	1%{?dist}
 # for details on which engines are GPL vs LGPL, see COPYING
 License:        GPLv2+ and LGPLv2+
 Group:          System Environment/Libraries
-Source:         http://download.gnome.org/sources/gtk-engines/2.15/gtk-engines-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gtk-engines/2.16/gtk-engines-%{version}.tar.bz2
 
 Conflicts:  	gnome-themes < 2.9.0
 Obsoletes:      gnome-theme-clearlooks <= 0.5
@@ -67,6 +67,9 @@
 %{_datadir}/gtk-engines
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.16.0-1
+- Update to 2.16.0
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
 - Update to 2.15.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	3 Sep 2008 00:31:34 -0000	1.56
+++ sources	22 Sep 2008 21:53:55 -0000	1.57
@@ -1 +1 @@
-060ea25c471e5f4cf5c1baeac27d0345  gtk-engines-2.15.4.tar.bz2
+a301ca944d8c839298ec45a01a4a30c8  gtk-engines-2.16.0.tar.bz2



From rstrode at fedoraproject.org  Mon Sep 22 21:58:45 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 22 Sep 2008 21:58:45 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec,1.53,1.54 sources,1.21,1.22
Message-ID: <20080922215845.9FE69700FE@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21414

Modified Files:
	plymouth.spec sources 
Log Message:
- Update to latest snapshot to get better transition support



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- plymouth.spec	19 Sep 2008 19:32:48 -0000	1.53
+++ plymouth.spec	22 Sep 2008 21:58:15 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: Plymouth Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.6.0
-Release: 0.2008.09.15.2%{?dist}
+Release: 0.2008.09.22.1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -227,6 +227,9 @@
 %{_libdir}/plymouth/spinfinity.so
 
 %changelog
+* Mon Sep 22 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.22.1
+- Update to latest snapshot to get better transition support
+
 * Fri Sep 19 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.15.2
 - Turn on gdm trigger for transition
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	15 Sep 2008 20:37:49 -0000	1.21
+++ sources	22 Sep 2008 21:58:15 -0000	1.22
@@ -1 +1 @@
-6118b5282105817d1baf2190ba7f1eb8  plymouth-0.6.0.tar.bz2
+2231b2effa336bc5f95806146a4ee3d6  plymouth-0.6.0.tar.bz2



From iburrell at fedoraproject.org  Mon Sep 22 22:05:55 2008
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Mon, 22 Sep 2008 22:05:55 +0000 (UTC)
Subject: rpms/perl-prefork/EL-5 perl-prefork.spec,1.7,1.8
Message-ID: <20080922220555.3981E700FE@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/pkgs/rpms/perl-prefork/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22730

Modified Files:
	perl-prefork.spec 
Log Message:
Remove BR perl(Test::MinimumVersion) for optional tests


Index: perl-prefork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-prefork/EL-5/perl-prefork.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-prefork.spec	22 Sep 2008 19:45:54 -0000	1.7
+++ perl-prefork.spec	22 Sep 2008 22:05:24 -0000	1.8
@@ -1,6 +1,6 @@
 Name: 		perl-prefork
 Version: 	1.02
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Optimized module loading for forking or non-forking processes
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -17,7 +17,6 @@
 
 # Required by tests
 BuildRequires: perl(Test::Pod) >= 1.00
-BuildRequires: perl(Test::MinimumVersion) >= 0.007
 
 %description
 Optimized module loading for forking or non-forking processes
@@ -53,6 +52,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 22 2008 Ian M. Burrell <ianburrell at gmail.com> - 1.02-2
+- Remove BR perl(Test::MinimumVersion) for optional tests
+
 * Sun Nov 25 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.02-1
 - Upstream update.
 - Add BR: perl(Test::MinimumVersion).



From mclasen at fedoraproject.org  Mon Sep 22 22:10:48 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 22:10:48 +0000 (UTC)
Subject: rpms/gnome-desktop/devel .cvsignore, 1.71, 1.72 gnome-desktop.spec, 
	1.169, 1.170 sources, 1.71, 1.72
Message-ID: <20080922221048.88249700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23298

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- .cvsignore	8 Sep 2008 23:49:27 -0000	1.71
+++ .cvsignore	22 Sep 2008 22:10:18 -0000	1.72
@@ -1 +1 @@
-gnome-desktop-2.23.92.tar.bz2
+gnome-desktop-2.24.0.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- gnome-desktop.spec	22 Sep 2008 16:44:23 -0000	1.169
+++ gnome-desktop.spec	22 Sep 2008 22:10:18 -0000	1.170
@@ -11,10 +11,10 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.23.92
-Release: 5%{?dist}
+Version: 2.24.0
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-desktop/2.23/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-desktop/2.24/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -126,6 +126,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep 22 2008 Ray Strode <rstrode at redhat.com> - 2.23.92-5
 - s/animatins/animations/ yes there's deja vu here
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	8 Sep 2008 23:49:27 -0000	1.71
+++ sources	22 Sep 2008 22:10:18 -0000	1.72
@@ -1 +1 @@
-6c1aba90eb57de56044669e6f9dbeb9c  gnome-desktop-2.23.92.tar.bz2
+a2cc0424619f271bf1a65cc0fbe782f0  gnome-desktop-2.24.0.tar.bz2



From iburrell at fedoraproject.org  Mon Sep 22 22:12:34 2008
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Mon, 22 Sep 2008 22:12:34 +0000 (UTC)
Subject: rpms/perl-Class-Autouse/EL-5 .cvsignore, 1.7,
	1.8 perl-Class-Autouse.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20080922221234.E809D700FE@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/pkgs/rpms/perl-Class-Autouse/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23577

Modified Files:
	.cvsignore perl-Class-Autouse.spec sources 
Log Message:
copy from F-8 1.29-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Autouse/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Sep 2006 11:56:37 -0000	1.7
+++ .cvsignore	22 Sep 2008 22:12:04 -0000	1.8
@@ -1 +1 @@
-Class-Autouse-1.27.tar.gz
+Class-Autouse-1.29.tar.gz


Index: perl-Class-Autouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Autouse/EL-5/perl-Class-Autouse.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Class-Autouse.spec	5 Sep 2006 11:56:37 -0000	1.9
+++ perl-Class-Autouse.spec	22 Sep 2008 22:12:04 -0000	1.10
@@ -1,8 +1,8 @@
 Name: 		perl-Class-Autouse
-Version: 	1.27
+Version: 	1.29
 Release: 	1%{?dist}
 Summary: 	Run-time class loading on first method call
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Class-Autouse/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Class-Autouse-%{version}.tar.gz
@@ -14,6 +14,9 @@
 BuildRequires: 	perl(Test::More) >= 0.47
 BuildRequires: 	perl(Carp)
 BuildRequires: 	perl(File::Spec) >= 0.80
+# FIXME: Class-Autouse actually wants perl(List::Util) >= 1.19
+# perl is currently being shipped with perl(List::Util) == 1.18
+# Should be safe to ignore
 BuildRequires:	perl(List::Util) >= 1.18
 
 # for improved tests
@@ -53,6 +56,13 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Nov 20 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.29-1
+- Upstream update.
+
+* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.28-1
+- Upstream update.
+- Update license.
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.27-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Autouse/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Sep 2006 11:56:37 -0000	1.7
+++ sources	22 Sep 2008 22:12:04 -0000	1.8
@@ -1 +1 @@
-f6b69cae6db84d6c1728384e6e7bd281  Class-Autouse-1.27.tar.gz
+da37cc729e01a504b93bc8bdc548d9a9  Class-Autouse-1.29.tar.gz



From mclasen at fedoraproject.org  Mon Sep 22 22:19:41 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 22:19:41 +0000 (UTC)
Subject: rpms/libgnome/devel .cvsignore, 1.46, 1.47 libgnome.spec, 1.126,
	1.127 sources, 1.46, 1.47
Message-ID: <20080922221941.7A66E700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24402

Modified Files:
	.cvsignore libgnome.spec sources 
Log Message:
2.24.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	22 Sep 2008 15:03:57 -0000	1.46
+++ .cvsignore	22 Sep 2008 22:19:11 -0000	1.47
@@ -1 +1 @@
-libgnome-2.24.0.tar.bz2
+libgnome-2.24.1.tar.bz2


Index: libgnome.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- libgnome.spec	22 Sep 2008 15:03:57 -0000	1.126
+++ libgnome.spec	22 Sep 2008 22:19:11 -0000	1.127
@@ -13,8 +13,8 @@
 
 Summary: GNOME base library
 Name: libgnome
-Version: 2.24.0
-Release: 2%{?dist}
+Version: 2.24.1
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnome/2.24/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -195,6 +195,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-1
+- Update to 2.24.1
+
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-2
 - Update to 2.24.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	22 Sep 2008 15:03:57 -0000	1.46
+++ sources	22 Sep 2008 22:19:11 -0000	1.47
@@ -1 +1 @@
-35a2b6f214ddd9b6732b3b361140115a  libgnome-2.24.0.tar.bz2
+3b2a30329898b37b2461b3aa886e5ad9  libgnome-2.24.1.tar.bz2



From transif at fedoraproject.org  Mon Sep 22 22:35:54 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Mon, 22 Sep 2008 22:35:54 +0000 (UTC)
Subject: comps/po de.po,1.27,1.28
Message-ID: <20080922223554.D165E700FE@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26362/po

Modified Files:
	de.po 
Log Message:
    2008-09-22  Fabian Affolter <fabian at bernewireless.net> (via
fab at fedoraproject.org)
    
      * po/de.po: Update the (c) details
    



Index: de.po
===================================================================
RCS file: /cvs/pkgs/comps/po/de.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- de.po	17 Sep 2008 22:44:34 -0000	1.27
+++ de.po	22 Sep 2008 22:35:24 -0000	1.28
@@ -1,6 +1,7 @@
-# translation of comps.HEAD.de.po to German
 # German translation of comps
 #
+# Copyright (C) 2002-2008 Red Hat, Inc.
+# This file is distributed under the same license as the comps package.
 #
 # Ronny Buchmann <ronny-vlug at vlugnet.org> 2004, 2005.
 # Bernd Groh <bgroh at redhat.com>, 2003,2004.
@@ -11,11 +12,12 @@
 # Fabian Affolter <fab at fedoraproject.org>, 2007,2008.
 # Daniela Kugelmann <dkugelma at redhat.com >, 2008.
 # Dominik Sandjaja <dominiksandjaja at fedoraproject.org>, 2008.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
+"POT-Creation-Date: 2008-09-22 17:26+0000\n"
 "PO-Revision-Date: 2008-09-17 09:31+0100\n"
 "Last-Translator: Dominik Sandjaja <dominiksandjaja at fedoraproject.org>\n"
 "Language-Team: German <i18 at redhat.com>\n"



From krh at fedoraproject.org  Mon Sep 22 22:51:27 2008
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Mon, 22 Sep 2008 22:51:27 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.967,1.968
Message-ID: <20080922225127.7007A700FE@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28158

Modified Files:
	kernel.spec 
Log Message:
* Mon Sep 22 2008 Kristian H??gsberg <krh at redhat.com>
- Fix check for radeon external TMDS.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.967
retrieving revision 1.968
diff -u -r1.967 -r1.968
--- kernel.spec	22 Sep 2008 20:46:55 -0000	1.967
+++ kernel.spec	22 Sep 2008 22:50:57 -0000	1.968
@@ -611,6 +611,7 @@
 Patch1813: drm-nouveau.patch
 Patch1814: drm-create-handle-for-fb.patch
 Patch1815: drm-modesetting-intel-mm-private.patch
+Patch1816: drm-modesetting-fix-external-tmds-check.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1171,6 +1172,7 @@
 ApplyPatch drm-nouveau.patch
 ApplyPatch drm-create-handle-for-fb.patch
 ApplyPatch drm-modesetting-intel-mm-private.patch
+ApplyPatch drm-modesetting-fix-external-tmds-check.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1762,6 +1764,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Sep 22 2008 Kristian H??gsberg <krh at redhat.com>
+- Fix check for radeon external TMDS.
+
 * Mon Sep 22 2008 Roland McGrath <roland at redhat.com>
 - utrace update
 



From mclasen at fedoraproject.org  Mon Sep 22 22:51:43 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 22:51:43 +0000 (UTC)
Subject: rpms/file-roller/devel .cvsignore, 1.77, 1.78 file-roller.spec,
	1.131, 1.132 sources, 1.77, 1.78
Message-ID: <20080922225143.847AD700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27625

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- .cvsignore	8 Sep 2008 19:48:11 -0000	1.77
+++ .cvsignore	22 Sep 2008 22:51:13 -0000	1.78
@@ -1 +1 @@
-file-roller-2.23.92.tar.bz2
+file-roller-2.24.0.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- file-roller.spec	8 Sep 2008 19:48:11 -0000	1.131
+++ file-roller.spec	22 Sep 2008 22:51:13 -0000	1.132
@@ -10,12 +10,12 @@
 
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
-Version:	2.23.92
+Version:	2.24.0
 Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
-Source:		http://download.gnome.org/sources/file-roller/2.23/file-roller-%{version}.tar.bz2
+Source:		http://download.gnome.org/sources/file-roller/2.24/file-roller-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -128,6 +128,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- sources	8 Sep 2008 19:48:11 -0000	1.77
+++ sources	22 Sep 2008 22:51:13 -0000	1.78
@@ -1 +1 @@
-fe64e84b19fcb245a2c08f73ba978677  file-roller-2.23.92.tar.bz2
+f0ccbf549e6a2d899b8d664c34e2afd2  file-roller-2.24.0.tar.bz2



From krh at fedoraproject.org  Mon Sep 22 22:53:17 2008
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Mon, 22 Sep 2008 22:53:17 +0000 (UTC)
Subject: rpms/kernel/devel drm-modesetting-fix-external-tmds-check.patch,
	NONE, 1.1
Message-ID: <20080922225317.78E39700FE@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28639

Added Files:
	drm-modesetting-fix-external-tmds-check.patch 
Log Message:
* Mon Sep 22 2008 Kristian H??gsberg <krh at redhat.com>
- Fix check for radeon external TMDS.


drm-modesetting-fix-external-tmds-check.patch:

--- NEW FILE drm-modesetting-fix-external-tmds-check.patch ---
>From 2e4c1f30072203bc1de2200cf6066e581dad37c2 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
Date: Mon, 22 Sep 2008 18:40:36 -0400
Subject: [PATCH] radeon: Fix type in check for tmds type.

---
 drivers/gpu/drm/radeon/radeon_display.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index c459338..3dd2905 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -269,7 +269,7 @@ bool radeon_setup_enc_conn(struct drm_device *dev)
 			else {
 				if (mode_info->bios_connector[i].tmds_type == TMDS_INT)
 					encoder = radeon_encoder_legacy_tmds_int_add(dev, i);
-				else if (mode_info->bios_connector[i].dac_type == TMDS_EXT)
+				else if (mode_info->bios_connector[i].tmds_type == TMDS_EXT)
 					encoder = radeon_encoder_legacy_tmds_ext_add(dev, i);
 			}
 			if (encoder)
-- 
1.5.6.GIT




From mclasen at fedoraproject.org  Mon Sep 22 23:14:06 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 23:14:06 +0000 (UTC)
Subject: rpms/vte/devel .cvsignore, 1.70, 1.71 sources, 1.70, 1.71 vte.spec, 
	1.132, 1.133
Message-ID: <20080922231406.BA466700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/vte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31186

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
0.17.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vte/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	9 Sep 2008 00:38:09 -0000	1.70
+++ .cvsignore	22 Sep 2008 23:13:36 -0000	1.71
@@ -1 +1 @@
-vte-0.17.3.tar.bz2
+vte-0.17.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vte/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	9 Sep 2008 00:38:09 -0000	1.70
+++ sources	22 Sep 2008 23:13:36 -0000	1.71
@@ -1 +1 @@
-a0a84d0472854ebb428882f12a142efd  vte-0.17.3.tar.bz2
+ec6cb2668db7146eae7cfc48af98f3ed  vte-0.17.4.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/extras/rpms/vte/devel/vte.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- vte.spec	9 Sep 2008 00:38:09 -0000	1.132
+++ vte.spec	22 Sep 2008 23:13:36 -0000	1.133
@@ -1,5 +1,5 @@
 Name: vte
-Version: 0.17.3
+Version: 0.17.4
 Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
@@ -105,6 +105,9 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 0.17.4-1
+- Update to 0.17.4
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 0.17.3-1
 - Update to 0.17.3
 



From mclasen at fedoraproject.org  Mon Sep 22 23:26:41 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 23:26:41 +0000 (UTC)
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.30,
	1.31 gnome-doc-utils.spec, 1.47, 1.48 sources, 1.30, 1.31
Message-ID: <20080922232641.A32CF700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-doc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32441

Modified Files:
	.cvsignore gnome-doc-utils.spec sources 
Log Message:
0.14.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	2 Sep 2008 22:30:29 -0000	1.30
+++ .cvsignore	22 Sep 2008 23:26:11 -0000	1.31
@@ -1 +1 @@
-gnome-doc-utils-0.13.1.tar.bz2
+gnome-doc-utils-0.14.0.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gnome-doc-utils.spec	2 Sep 2008 22:30:29 -0000	1.47
+++ gnome-doc-utils.spec	22 Sep 2008 23:26:11 -0000	1.48
@@ -1,14 +1,14 @@
 ### Abstract ###
 
 Name: gnome-doc-utils
-Version: 0.13.1
+Version: 0.14.1
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group: Development/Tools
 Summary: Documentation utilities for the GNOME project
 URL: http://www.gnome.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-Source: http://download.gnome.org/sources/gnome-doc-utils/0.13/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-doc-utils/0.14/%{name}-%{version}.tar.bz2
 
 BuildArch: noarch
 
@@ -96,6 +96,9 @@
 %{_datadir}/xml/gnome
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 0.14.0-1
+- Update to 0.14.0
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 0.13.1-1
 - Update to 0.13.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	2 Sep 2008 22:30:29 -0000	1.30
+++ sources	22 Sep 2008 23:26:11 -0000	1.31
@@ -1 +1 @@
-7cb98de7c6bdc9ebffaf37c653f126a5  gnome-doc-utils-0.13.1.tar.bz2
+3aee9b504f6c9b1cb0f34f80264f2239  gnome-doc-utils-0.14.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 23:29:06 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 23:29:06 +0000 (UTC)
Subject: rpms/gnome-doc-utils/devel gnome-doc-utils.spec,1.48,1.49
Message-ID: <20080922232906.1B496700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-doc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32761

Modified Files:
	gnome-doc-utils.spec 
Log Message:
gah



Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gnome-doc-utils.spec	22 Sep 2008 23:26:11 -0000	1.48
+++ gnome-doc-utils.spec	22 Sep 2008 23:28:35 -0000	1.49
@@ -1,7 +1,7 @@
 ### Abstract ###
 
 Name: gnome-doc-utils
-Version: 0.14.1
+Version: 0.14.0
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group: Development/Tools



From mclasen at fedoraproject.org  Mon Sep 22 23:32:06 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 23:32:06 +0000 (UTC)
Subject: rpms/libgweather/devel .cvsignore, 1.13, 1.14 libgweather.spec, 1.23,
	1.24 sources, 1.13, 1.14
Message-ID: <20080922233206.654F2700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgweather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv676

Modified Files:
	.cvsignore libgweather.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgweather/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	9 Sep 2008 01:20:17 -0000	1.13
+++ .cvsignore	22 Sep 2008 23:31:36 -0000	1.14
@@ -1 +1 @@
-libgweather-2.23.92.tar.bz2
+libgweather-2.24.0.tar.bz2


Index: libgweather.spec
===================================================================
RCS file: /cvs/extras/rpms/libgweather/devel/libgweather.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libgweather.spec	9 Sep 2008 01:20:17 -0000	1.23
+++ libgweather.spec	22 Sep 2008 23:31:36 -0000	1.24
@@ -1,12 +1,12 @@
 Name:           libgweather
-Version:        2.23.92
+Version:        2.24.0
 Release:        1%{?dist}
 Summary:        A library for weather information 
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.gnome.org 
-Source0:        http://download.gnome.org/sources/libgweather/2.23/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/libgweather/2.24/%{name}-%{version}.tar.bz2
 Source1:	copy.xsl
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> 2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> 2.23.92-1
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgweather/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	9 Sep 2008 01:20:17 -0000	1.13
+++ sources	22 Sep 2008 23:31:36 -0000	1.14
@@ -1 +1 @@
-b316b1e153ca56afeaa80b1aa4f0fd94  libgweather-2.23.92.tar.bz2
+d006328ec5cebc5dbf3a18834db95bba  libgweather-2.24.0.tar.bz2



From kwade at fedoraproject.org  Mon Sep 22 23:34:20 2008
From: kwade at fedoraproject.org (Karsten Wade)
Date: Mon, 22 Sep 2008 23:34:20 +0000 (UTC)
Subject: CVSROOT avail,1.49,1.50
Message-ID: <20080922233420.B8120700FE@cvs1.fedora.phx.redhat.com>

Author: kwade

Update of /cvs/fedora/CVSROOT
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1061

Modified Files:
	avail 
Log Message:
adding Michael Beckwith (tw2113) in case I can get him in cvsfedora group


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- avail	27 Sep 2007 16:46:14 -0000	1.49
+++ avail	22 Sep 2008 23:33:50 -0000	1.50
@@ -22,7 +22,7 @@
 unavail | | web
 avail | notting,sopwith,gdk,katzj,kwade,bjensen,mmcgrath| web
 avail | havill,hp,nman64,ivazquez,jkeating,glezos,pfrields,duffy,ricky,couf | web
-avail | kwade,pfrields | web/html/docs
+avail | kwade,pfrields,tw2113 | web/html/docs
 avail | sarahs,aalam,ccheng | web/html/docs/translation-faq
 avail | sarahs,aalam,ccheng | web/html/docs/translation-guide
 avail | sarahs,aalam,ccheng | web/html/docs/translation-windows



From kwade at fedoraproject.org  Mon Sep 22 23:35:51 2008
From: kwade at fedoraproject.org (Karsten Wade)
Date: Mon, 22 Sep 2008 23:35:51 +0000 (UTC)
Subject: CVSROOT avail,1.50,1.51
Message-ID: <20080922233551.A08E3700FE@cvs1.fedora.phx.redhat.com>

Author: kwade

Update of /cvs/fedora/CVSROOT
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1410

Modified Files:
	avail 
Log Message:
changing how I add this user and giving him more range to design


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- avail	22 Sep 2008 23:33:50 -0000	1.50
+++ avail	22 Sep 2008 23:35:51 -0000	1.51
@@ -21,8 +21,7 @@
 # Fedora Web site
 unavail | | web
 avail | notting,sopwith,gdk,katzj,kwade,bjensen,mmcgrath| web
-avail | havill,hp,nman64,ivazquez,jkeating,glezos,pfrields,duffy,ricky,couf | web
-avail | kwade,pfrields,tw2113 | web/html/docs
+avail | havill,hp,nman64,ivazquez,jkeating,glezos,pfrields,duffy,ricky,couf,tw2113 | web
 avail | sarahs,aalam,ccheng | web/html/docs/translation-faq
 avail | sarahs,aalam,ccheng | web/html/docs/translation-guide
 avail | sarahs,aalam,ccheng | web/html/docs/translation-windows



From stahnma at fedoraproject.org  Mon Sep 22 23:36:08 2008
From: stahnma at fedoraproject.org (Michael Stahnke)
Date: Mon, 22 Sep 2008 23:36:08 +0000 (UTC)
Subject: rpms/cdpr/F-8 cdpr.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20080922233608.70B0B700FE@cvs1.fedora.phx.redhat.com>

Author: stahnma

Update of /cvs/extras/rpms/cdpr/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1358/F-8

Modified Files:
	cdpr.spec sources 
Log Message:
New version



Index: cdpr.spec
===================================================================
RCS file: /cvs/extras/rpms/cdpr/F-8/cdpr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdpr.spec	31 Oct 2007 20:28:07 -0000	1.1
+++ cdpr.spec	22 Sep 2008 23:35:38 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           cdpr
-Version:        2.2.1
-Release:        2%{?dist}
+Version:        2.3
+Release:        1%{?dist}
 Summary:        Cisco Discovery Protocol Analyzer
 
 Group:          Applications/System
 License:        GPLv2+ 
 URL:            http://sourceforge.net/projects/cdpr/ 
-Source0:        http://downloads.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://www.monkeymental.com/mmfiles/%{name}-%{version}.tgz
   
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,6 +45,12 @@
 
 
 %changelog
+* Sat Sep 20 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.3-1
+- New version
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2.1-3
+- Autorebuild for GCC 4.3
+
 * Mon Oct 29 2007 <stahnma at fedoraproject.org>  2.2.1-2
 - Minor SPEC file cleanup from bug # 355631
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cdpr/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Oct 2007 20:28:07 -0000	1.2
+++ sources	22 Sep 2008 23:35:38 -0000	1.3
@@ -1 +1 @@
-1e682e7e9c03f9b004c1f97c0ed25431  cdpr-2.2.1.tar.gz
+c3eeaeb2641085647f13da6ff807aa0b  cdpr-2.3.tgz



From stahnma at fedoraproject.org  Mon Sep 22 23:36:08 2008
From: stahnma at fedoraproject.org (Michael Stahnke)
Date: Mon, 22 Sep 2008 23:36:08 +0000 (UTC)
Subject: rpms/cdpr/F-9 cdpr.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20080922233608.A6FE7700FE@cvs1.fedora.phx.redhat.com>

Author: stahnma

Update of /cvs/extras/rpms/cdpr/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1358/F-9

Modified Files:
	cdpr.spec sources 
Log Message:
New version



Index: cdpr.spec
===================================================================
RCS file: /cvs/extras/rpms/cdpr/F-9/cdpr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cdpr.spec	20 Feb 2008 02:41:18 -0000	1.2
+++ cdpr.spec	22 Sep 2008 23:35:38 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           cdpr
-Version:        2.2.1
-Release:        3%{?dist}
+Version:        2.3
+Release:        1%{?dist}
 Summary:        Cisco Discovery Protocol Analyzer
 
 Group:          Applications/System
 License:        GPLv2+ 
 URL:            http://sourceforge.net/projects/cdpr/ 
-Source0:        http://downloads.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://www.monkeymental.com/mmfiles/%{name}-%{version}.tgz
   
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Sat Sep 20 2008 Michael Stahnke <stahnma at fedoraproject.org> - 2.3-1
+- New version
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2.1-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cdpr/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Oct 2007 20:24:12 -0000	1.2
+++ sources	22 Sep 2008 23:35:38 -0000	1.3
@@ -1 +1 @@
-1e682e7e9c03f9b004c1f97c0ed25431  cdpr-2.2.1.tar.gz
+c3eeaeb2641085647f13da6ff807aa0b  cdpr-2.3.tgz



From mclasen at fedoraproject.org  Mon Sep 22 23:38:42 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 23:38:42 +0000 (UTC)
Subject: rpms/libwnck/devel .cvsignore, 1.66, 1.67 libwnck.spec, 1.101,
	1.102 sources, 1.66, 1.67
Message-ID: <20080922233842.A3481700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libwnck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1980

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore	8 Sep 2008 23:37:24 -0000	1.66
+++ .cvsignore	22 Sep 2008 23:38:12 -0000	1.67
@@ -1 +1 @@
-libwnck-2.23.92.tar.bz2
+libwnck-2.24.0.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- libwnck.spec	8 Sep 2008 23:37:24 -0000	1.101
+++ libwnck.spec	22 Sep 2008 23:38:12 -0000	1.102
@@ -5,10 +5,10 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.23.92
+Version: 2.24.0
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/libwnck/
-Source0: http://download.gnome.org/sources/libwnck/2.23/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libwnck/2.24/%{name}-%{version}.tar.bz2
 License: LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -93,6 +93,9 @@
 %doc %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	8 Sep 2008 23:37:24 -0000	1.66
+++ sources	22 Sep 2008 23:38:12 -0000	1.67
@@ -1 +1 @@
-3924d0b346e9e361f19a8aadc6631c4f  libwnck-2.23.92.tar.bz2
+860cd0ddce03c41a328e580d4efd4654  libwnck-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 23:43:46 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 23:43:46 +0000 (UTC)
Subject: rpms/gnome-menus/devel .cvsignore, 1.47, 1.48 gnome-menus.spec, 1.88,
	1.89 sources, 1.47, 1.48
Message-ID: <20080922234346.844D0700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-menus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2798

Modified Files:
	.cvsignore gnome-menus.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	9 Sep 2008 01:14:17 -0000	1.47
+++ .cvsignore	22 Sep 2008 23:43:16 -0000	1.48
@@ -1 +1 @@
-gnome-menus-2.23.92.tar.bz2
+gnome-menus-2.24.0.tar.bz2


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- gnome-menus.spec	9 Sep 2008 01:14:17 -0000	1.88
+++ gnome-menus.spec	22 Sep 2008 23:43:16 -0000	1.89
@@ -5,12 +5,12 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.23.92
+Version: 2.24.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
-Source0: http://download.gnome.org/sources/gnome-menus/2.23/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-menus/2.24/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  redhat-menus >= 7.8.9-2
 BuildRequires: gamin-devel
@@ -99,6 +99,9 @@
 %{_includedir}/gnome-menus
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	9 Sep 2008 01:14:17 -0000	1.47
+++ sources	22 Sep 2008 23:43:16 -0000	1.48
@@ -1 +1 @@
-f8e5124ea3fe435aa4b8bf178957629e  gnome-menus-2.23.92.tar.bz2
+1816a0d21ef99d5b3a8bcd033c88f732  gnome-menus-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 23:50:53 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 23:50:53 +0000 (UTC)
Subject: rpms/mousetweaks/devel .cvsignore, 1.10, 1.11 mousetweaks.spec, 1.14,
	1.15 sources, 1.10, 1.11
Message-ID: <20080922235053.C3EF6700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/mousetweaks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3706

Modified Files:
	.cvsignore mousetweaks.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mousetweaks/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	8 Sep 2008 16:59:57 -0000	1.10
+++ .cvsignore	22 Sep 2008 23:50:23 -0000	1.11
@@ -1 +1 @@
-mousetweaks-2.23.92.tar.bz2
+mousetweaks-2.24.0.tar.bz2


Index: mousetweaks.spec
===================================================================
RCS file: /cvs/extras/rpms/mousetweaks/devel/mousetweaks.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mousetweaks.spec	8 Sep 2008 16:59:57 -0000	1.14
+++ mousetweaks.spec	22 Sep 2008 23:50:23 -0000	1.15
@@ -1,11 +1,11 @@
 Name:		mousetweaks
-Version:	2.23.92
+Version:	2.24.0
 Release:	1%{?dist}
 Summary:	Mouse accessibility support for the GNOME desktop
 Group:		User Interface/Desktops
 License:	GPLv3 and GFDL
 URL:		http://live.gnome.org/Mousetweaks/Home   
-Source0:	http://download.gnome.org/sources/mousetweaks/2.23/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/mousetweaks/2.24/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gettext
@@ -93,6 +93,9 @@
 %doc %{_mandir}/man1/*
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mousetweaks/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	8 Sep 2008 16:59:57 -0000	1.10
+++ sources	22 Sep 2008 23:50:23 -0000	1.11
@@ -1 +1 @@
-47f82d4994088f70711d7229b4b660c2  mousetweaks-2.23.92.tar.bz2
+0d65ed828b1ef092861e337d2c86cc72  mousetweaks-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 23:55:32 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 23:55:32 +0000 (UTC)
Subject: rpms/pango/devel .cvsignore, 1.79, 1.80 pango.spec, 1.144,
	1.145 sources, 1.79, 1.80
Message-ID: <20080922235532.1736B70032@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4395

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
1.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- .cvsignore	8 Sep 2008 20:10:17 -0000	1.79
+++ .cvsignore	22 Sep 2008 23:55:01 -0000	1.80
@@ -1 +1 @@
-pango-1.21.6.tar.bz2
+pango-1.22.0.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/pango.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- pango.spec	8 Sep 2008 20:10:17 -0000	1.144
+++ pango.spec	22 Sep 2008 23:55:01 -0000	1.145
@@ -8,11 +8,11 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.21.6
+Version: 1.22.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/pango/1.21/pango-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/pango/1.22/pango-%{version}.tar.bz2
 URL: http://www.pango.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -218,6 +218,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 1.22.0-1
+- Update to 1.22.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 1.21.6-1
 - Update to 1.21.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- sources	8 Sep 2008 20:10:17 -0000	1.79
+++ sources	22 Sep 2008 23:55:01 -0000	1.80
@@ -1 +1 @@
-db7b24c685d488dd9d06b66b42faed50  pango-1.21.6.tar.bz2
+37a185a3cb5c1a39ade7fdc3e6c75349  pango-1.22.0.tar.bz2



From mclasen at fedoraproject.org  Mon Sep 22 23:59:59 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 22 Sep 2008 23:59:59 +0000 (UTC)
Subject: rpms/orca/devel .cvsignore, 1.39, 1.40 orca.spec, 1.65, 1.66 sources,
	1.40, 1.41
Message-ID: <20080922235959.38DEB70032@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/orca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5082

Modified Files:
	.cvsignore orca.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	8 Sep 2008 20:17:29 -0000	1.39
+++ .cvsignore	22 Sep 2008 23:59:28 -0000	1.40
@@ -1 +1 @@
-orca-2.23.92.tar.bz2
+orca-2.24.0.tar.bz2


Index: orca.spec
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/orca.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- orca.spec	8 Sep 2008 20:17:29 -0000	1.65
+++ orca.spec	22 Sep 2008 23:59:28 -0000	1.66
@@ -17,14 +17,14 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.23.92
+Version:	2.24.0
 Release: 	1%{?dist}
 Summary:	Flexible, extensible, and powerful assistive technology
 
 Group:		User Interface/Desktops
 License:	LGPLv2+
 URL:		http://www.gnome.org/projects/orca/
-Source0:	http://download.gnome.org/sources/orca/2.23/orca-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/orca/2.24/orca-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	python-devel >= %{python_version}
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	8 Sep 2008 20:17:29 -0000	1.40
+++ sources	22 Sep 2008 23:59:28 -0000	1.41
@@ -1 +1 @@
-d190ebd8a1f2cddd987de63e673d0a60  orca-2.23.92.tar.bz2
+ff13ffcfb2c829969f2e927e540eac46  orca-2.24.0.tar.bz2



From lkundrak at fedoraproject.org  Tue Sep 23 00:00:53 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 23 Sep 2008 00:00:53 +0000 (UTC)
Subject: rpms/libgda/EL-5 libgda.spec,1.21,1.22
Message-ID: <20080923000053.A2AA970033@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/libgda/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5268

Modified Files:
	libgda.spec 
Log Message:
Add missing BR


Index: libgda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/EL-5/libgda.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libgda.spec	22 Sep 2008 19:37:01 -0000	1.21
+++ libgda.spec	23 Sep 2008 00:00:23 -0000	1.22
@@ -51,6 +51,7 @@
 BuildRequires:    pkgconfig >= 0.8
 BuildRequires:    glib2-devel >= 2.0.0
 BuildRequires:    libxslt-devel >= 1.0.9
+BuildRequires:    ncurses-devel
 BuildRequires:    libxml2-devel readline-devel db4-devel gamin-devel
 BuildRequires:    gtk-doc scrollkeeper gettext flex bison perl(XML::Parser)
 # note we do not provide these, they no longer exist
@@ -557,6 +558,7 @@
 %changelog
 * Mon Sep 22 2008 Lubomir Rintel <lkundrak at v3.sk> - 3.0.1-6.1
 - Back into using embedded sqlite for el5
+- Add ncurses-devel dependency, that's missing from readline-devel
 
 * Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 3.0.1-6
 - Rebuild for deps



From whot at fedoraproject.org  Tue Sep 23 00:09:50 2008
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue, 23 Sep 2008 00:09:50 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/F-9
	xf86-input-synaptics-0.15.1-stale-option-list.patch, NONE,
	1.1 xorg-x11-drv-synaptics.spec, 1.4, 1.5
Message-ID: <20080923000950.6CBF070033@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6660

Modified Files:
	xorg-x11-drv-synaptics.spec 
Added Files:
	xf86-input-synaptics-0.15.1-stale-option-list.patch 
Log Message:
* Mon Sep 22 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.1-2
- xf86-input-synaptics-0.15.1-stale-option-list.patch - don't use stale option
  list pointers. RH #462771.



xf86-input-synaptics-0.15.1-stale-option-list.patch:

--- NEW FILE xf86-input-synaptics-0.15.1-stale-option-list.patch ---
>From 566b4dcc0b0f45ad83012314b67836ba2018cf9e Mon Sep 17 00:00:00 2001
From: Henrik Rydberg <rydberg at euromail.se>
Date: Wed, 10 Sep 2008 20:53:43 +0200
Subject: [PATCH] Do not use stale option list pointers

The xf86ReplaceStrOption may change the option list pointer. Also make sure
no stale option pointers are used after a call to SetDeviceAndProtocol().

Signed-off-by: Henrik Rydberg <rydberg at euromail.se>
---
 src/eventcomm.c |    3 ++-
 src/synaptics.c |   13 ++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/eventcomm.c b/src/eventcomm.c
index 8474c54..25d0c73 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -365,7 +365,8 @@ EventAutoDevProbe(LocalDevicePtr local)
 				touchpad_found = TRUE;
 			    xf86Msg(X_PROBED, "%s auto-dev sets device to %s\n",
 				    local->name, fname);
-			    xf86ReplaceStrOption(local->options, "Device", fname);
+			    local->options =
+			    	xf86ReplaceStrOption(local->options, "Device", fname);
 			    event_query_axis_ranges(fd, local);
 			}
 			SYSCALL(close(fd));
diff --git a/src/synaptics.c b/src/synaptics.c
index 045a051..1f96cc3 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -177,8 +177,10 @@ SetDeviceAndProtocol(LocalDevicePtr local)
     device = xf86FindOptionValue(local->options, "Device");
     if (!device) {
 	device = xf86FindOptionValue(local->options, "Path");
-	if (device)
-	    xf86ReplaceStrOption(local->options, "Device", device);
+	if (device) {
+	    local->options =
+	    	xf86ReplaceStrOption(local->options, "Device", device);
+	}
     }
     if (device && strstr(device, "/dev/input/event")) {
 #ifdef BUILD_EVENTCOMM
@@ -351,12 +353,13 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
 
     xf86CollectInputOptions(local, NULL, NULL);
 
-    opts = local->options;
-
-    xf86OptionListReport(opts);
+    xf86OptionListReport(local->options);
 
+    /* may change local->options */
     SetDeviceAndProtocol(local);
 
+    opts = local->options;
+
     /* open the touchpad device */
     local->fd = xf86OpenSerial(opts);
     if (local->fd == -1) {
-- 
1.5.4.3



Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-9/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-drv-synaptics.spec	9 Sep 2008 14:35:28 -0000	1.4
+++ xorg-x11-drv-synaptics.spec	23 Sep 2008 00:09:19 -0000	1.5
@@ -5,7 +5,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 synaptics input driver
 Version:        0.15.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -17,6 +17,8 @@
 Patch3:		 xf86-input-synaptics-0.15.1-edges.patch
 Patch4:		 xf86-input-synaptics-0.15.1-preprobe.patch
 Patch5:		 xf86-input-synaptics-0.15.1-dont-crash-without-Device.patch
+# Bug 462771 - Changes in synaptics.fdi don't have any effect.
+Patch6:		 xf86-input-synaptics-0.15.1-stale-option-list.patch
 ExcludeArch:    s390 s390x
 
 BuildRequires:  libtool pkgconfig
@@ -65,6 +67,7 @@
 %patch3 -p1 -b .edges
 %patch4 -p1 -b .preprobe
 %patch5 -p1 -b .dont-crash-without-device
+%patch6 -p1 -b .stale-option-list
 
 %build
 autoreconf -v --install --force || exit 1
@@ -98,6 +101,10 @@
 %doc COPYING README
 
 %changelog
+* Mon Sep 22 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.1-2
+- xf86-input-synaptics-0.15.1-stale-option-list.patch - don't use stale option
+  list pointers. RH #462771.
+
 * Tue Sep 9 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.15.1-1
 - update to upstream 0.15.1
 - remove xf86-input-synaptics-0.15.0-tap.patch - merged in upstream.



From pkgdb at fedoraproject.org  Tue Sep 23 00:24:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 00:24:17 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080923002417.92382208DA0@bastion.fedora.phx.redhat.com>

michaelc has set the commit acl on iscsi-initiator-utils (Fedora devel) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 23 00:24:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 00:24:19 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080923002419.325A9208DA6@bastion.fedora.phx.redhat.com>

michaelc has set the watchcommits acl on iscsi-initiator-utils (Fedora devel) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 23 00:24:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 00:24:20 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080923002420.B3044208DAA@bastion.fedora.phx.redhat.com>

michaelc has set the watchbugzilla acl on iscsi-initiator-utils (Fedora devel) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 23 00:24:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 00:24:30 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080923002431.0C3F3208DAC@bastion.fedora.phx.redhat.com>

michaelc has set the watchbugzilla acl on iscsi-initiator-utils (Fedora 8) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 23 00:24:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 00:24:32 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080923002433.0EEF0208DB3@bastion.fedora.phx.redhat.com>

michaelc has set the watchcommits acl on iscsi-initiator-utils (Fedora 8) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 23 00:24:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 00:24:39 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080923002439.E2617208DB7@bastion.fedora.phx.redhat.com>

michaelc has set the watchcommits acl on iscsi-initiator-utils (Fedora 9) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 23 00:24:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 00:24:41 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080923002441.48E40208DA4@bastion.fedora.phx.redhat.com>

michaelc has set the watchbugzilla acl on iscsi-initiator-utils (Fedora 9) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 23 00:24:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 00:24:43 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080923002443.508F4208DBC@bastion.fedora.phx.redhat.com>

michaelc has set the commit acl on iscsi-initiator-utils (Fedora 8) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 23 00:24:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 00:24:43 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080923002443.6415D208DC0@bastion.fedora.phx.redhat.com>

michaelc has set the commit acl on iscsi-initiator-utils (Fedora 9) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From nbecker at fedoraproject.org  Tue Sep 23 00:31:06 2008
From: nbecker at fedoraproject.org (Neal Becker)
Date: Tue, 23 Sep 2008 00:31:06 +0000 (UTC)
Subject: rpms/mercurial/F-8 mercurial.spec,1.41,1.42
Message-ID: <20080923003106.C5D1C70033@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9070

Modified Files:
	mercurial.spec 
Log Message:
Update to 1.0.2



Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-8/mercurial.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mercurial.spec	25 Aug 2008 13:25:12 -0000	1.41
+++ mercurial.spec	23 Sep 2008 00:30:36 -0000	1.42
@@ -3,7 +3,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 1.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -84,7 +84,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python setup.py install -O1 --root $RPM_BUILD_ROOT --prefix %{_prefix} --record=%{name}.files
+%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT --prefix %{_prefix} --record=%{name}.files
 make install-doc DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir}
 
 grep -v 'hgk.py*' < %{name}.files > %{name}-base.files
@@ -163,9 +163,12 @@
 %{_sysconfdir}/mercurial/hgrc.d/hgk.rc
 
 #%%check
-#cd tests && python run-tests.py
+#cd tests && %{__python} run-tests.py
 
 %changelog
+* Thu Aug 28 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.2-2
+- Use macro for python executable
+
 * Fri Aug 15 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.2-1
 - Update to 1.0.2
 



From mclasen at fedoraproject.org  Tue Sep 23 00:32:39 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 00:32:39 +0000 (UTC)
Subject: rpms/gthumb/devel .cvsignore, 1.34, 1.35 gthumb.spec, 1.91,
	1.92 sources, 1.36, 1.37
Message-ID: <20080923003239.2D21D70033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gthumb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9559

Modified Files:
	.cvsignore gthumb.spec sources 
Log Message:
fix spec



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gthumb/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	5 Aug 2008 05:03:49 -0000	1.34
+++ .cvsignore	23 Sep 2008 00:32:08 -0000	1.35
@@ -1 +1 @@
-gthumb-2.10.9.tar.bz2
+gthumb-2.10.10.tar.bz2


Index: gthumb.spec
===================================================================
RCS file: /cvs/extras/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- gthumb.spec	5 Aug 2008 05:24:41 -0000	1.91
+++ gthumb.spec	23 Sep 2008 00:32:08 -0000	1.92
@@ -75,7 +75,7 @@
 %ifarch s390 s390x
 %define gphoto_flags --disable-gphoto2
 %else
-%define gphoto_flags 
+%define gphoto_flags  %{nil}
 %endif
 %configure %{gphoto_flags}
 make


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gthumb/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	5 Aug 2008 05:03:49 -0000	1.36
+++ sources	23 Sep 2008 00:32:08 -0000	1.37
@@ -1 +1 @@
-bd93e0c0388019c638afa907620bf3b1  gthumb-2.10.9.tar.bz2
+b3344b31f82830fdcf86865f4ecb7a95  gthumb-2.10.10.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 23 00:36:22 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 00:36:22 +0000 (UTC)
Subject: rpms/gthumb/devel gthumb.spec,1.92,1.93
Message-ID: <20080923003622.3198B70033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gthumb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10121

Modified Files:
	gthumb.spec 
Log Message:
2.10.10



Index: gthumb.spec
===================================================================
RCS file: /cvs/extras/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- gthumb.spec	23 Sep 2008 00:32:08 -0000	1.92
+++ gthumb.spec	23 Sep 2008 00:35:51 -0000	1.93
@@ -10,7 +10,7 @@
 
 Summary: Image viewer, editor, organizer
 Name: gthumb
-Version: 2.10.9
+Version: 2.10.10
 Release: 1%{?dist}
 URL: http://gthumb.sourceforge.net
 Source0: http://download.gnome.org/sources/gthumb/2.10/%{name}-%{version}.tar.bz2
@@ -142,6 +142,9 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen  <mclasen at redhat.com> - 2.10.10-1
+- Update to 2.10.10
+
 * Tue Aug  5 2008 Matthias Clasen  <mclasen at redhat.com> - 2.10.9-1
 - Update to 2.10.9 
 



From cebbert at fedoraproject.org  Tue Sep 23 00:40:09 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 23 Sep 2008 00:40:09 +0000 (UTC)
Subject: rpms/kernel/F-8
	linux-2.6-libata-pata_it821x-driver-updates-and-reworking.patch,
	NONE, 1.1 kernel.spec, 1.538, 1.539
Message-ID: <20080923004009.EEFB070103@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10862

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-libata-pata_it821x-driver-updates-and-reworking.patch 
Log Message:
Copy forgotten libata patch from F9.

linux-2.6-libata-pata_it821x-driver-updates-and-reworking.patch:

--- NEW FILE linux-2.6-libata-pata_it821x-driver-updates-and-reworking.patch ---
From: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Thu, 24 Jul 2008 16:16:06 +0000 (+0100)
Subject: pata_it821x: Driver updates and reworking
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=963e4975c6f93c148ca809d986d412201df9af89

pata_it821x: Driver updates and reworking

- Add support for the RDC 1010 variant
- Rework the core library to have a read_id method. This allows the hacky
  bits of it821x to go and prepares us for pata_hd
- Switch from WARN to BUG in ata_id_string as it will reboot if you get
  it wrong so WARN won't be seen
- Allow the issue of command 0xFC on the 821x. This is needed to query
  rebuild status.
- Tidy up printk formatting
- Do more ident rewriting on RAID volumes to handle firmware provided
  ident data which is rather wonky
- Report the firmware revision and device layout in RAID mode
- Don't try and disable raid on the 8211 or RDC - they don't have the
  relevant bits

Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index f69d154..5ba96c5 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1132,6 +1132,8 @@ void ata_id_string(const u16 *id, unsigned char *s,
 {
 	unsigned int c;
 
+	BUG_ON(len & 1);
+
 	while (len > 0) {
 		c = id[ofs] >> 8;
 		*s = c;
@@ -1165,8 +1167,6 @@ void ata_id_c_string(const u16 *id, unsigned char *s,
 {
 	unsigned char *p;
 
-	WARN_ON(!(len & 1));
-
 	ata_id_string(id, s, ofs, len - 1);
 
 	p = s + strnlen(s, len - 1);
@@ -1886,6 +1886,23 @@ static u32 ata_pio_mask_no_iordy(const struct ata_device *adev)
 }
 
 /**
+ *	ata_do_dev_read_id		-	default ID read method
+ *	@dev: device
+ *	@tf: proposed taskfile
+ *	@id: data buffer
+ *
+ *	Issue the identify taskfile and hand back the buffer containing
+ *	identify data. For some RAID controllers and for pre ATA devices
+ *	this function is wrapped or replaced by the driver
+ */
+unsigned int ata_do_dev_read_id(struct ata_device *dev,
+					struct ata_taskfile *tf, u16 *id)
+{
+	return ata_exec_internal(dev, tf, NULL, DMA_FROM_DEVICE,
+				     id, sizeof(id[0]) * ATA_ID_WORDS, 0);
+}
+
+/**
  *	ata_dev_read_id - Read ID data from the specified device
  *	@dev: target device
  *	@p_class: pointer to class of the target device (may be changed)
@@ -1920,7 +1937,7 @@ int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,
 	if (ata_msg_ctl(ap))
 		ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER\n", __func__);
 
- retry:
+retry:
 	ata_tf_init(dev, &tf);
 
 	switch (class) {
@@ -1948,8 +1965,11 @@ int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,
 	 */
 	tf.flags |= ATA_TFLAG_POLLING;
 
-	err_mask = ata_exec_internal(dev, &tf, NULL, DMA_FROM_DEVICE,
-				     id, sizeof(id[0]) * ATA_ID_WORDS, 0);
+	if (ap->ops->read_id)
+		err_mask = ap->ops->read_id(dev, &tf, id);
+	else
+		err_mask = ata_do_dev_read_id(dev, &tf, id);
+
 	if (err_mask) {
 		if (err_mask & AC_ERR_NODEV_HINT) {
 			ata_dev_printk(dev, KERN_DEBUG,
@@ -6283,6 +6303,7 @@ EXPORT_SYMBOL_GPL(ata_host_resume);
 #endif /* CONFIG_PM */
 EXPORT_SYMBOL_GPL(ata_id_string);
 EXPORT_SYMBOL_GPL(ata_id_c_string);
+EXPORT_SYMBOL_GPL(ata_do_dev_read_id);
 EXPORT_SYMBOL_GPL(ata_scsi_simulate);
 
 EXPORT_SYMBOL_GPL(ata_pio_need_iordy);
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index e108169..27843c7 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -80,7 +80,7 @@
 
 
 #define DRV_NAME "pata_it821x"
-#define DRV_VERSION "0.3.8"
+#define DRV_VERSION "0.4.0"
 
 struct it821x_dev
 {
@@ -425,6 +425,8 @@ static unsigned int it821x_smart_qc_issue(struct ata_queued_cmd *qc)
 		case ATA_CMD_WRITE_MULTI:
 		case ATA_CMD_WRITE_MULTI_EXT:
 		case ATA_CMD_ID_ATA:
+		case ATA_CMD_INIT_DEV_PARAMS:
+		case 0xFC:	/* Internal 'report rebuild state' */
 		/* Arguably should just no-op this one */
 		case ATA_CMD_SET_FEATURES:
 			return ata_sff_qc_issue(qc);
@@ -509,7 +511,7 @@ static void it821x_dev_config(struct ata_device *adev)
 
 	if (strstr(model_num, "Integrated Technology Express")) {
 		/* RAID mode */
-		printk(KERN_INFO "IT821x %sRAID%d volume",
+		ata_dev_printk(adev, KERN_INFO, "%sRAID%d volume",
 			adev->id[147]?"Bootable ":"",
 			adev->id[129]);
 		if (adev->id[129] != 1)
@@ -519,37 +521,51 @@ static void it821x_dev_config(struct ata_device *adev)
 	/* This is a controller firmware triggered funny, don't
 	   report the drive faulty! */
 	adev->horkage &= ~ATA_HORKAGE_DIAGNOSTIC;
+	/* No HPA in 'smart' mode */
+	adev->horkage |= ATA_HORKAGE_BROKEN_HPA;
 }
 
 /**
- *	it821x_ident_hack	-	Hack identify data up
- *	@ap: Port
+ *	it821x_read_id	-	Hack identify data up
+ *	@adev: device to read
+ *	@tf: proposed taskfile
+ *	@id: buffer for returned ident data
  *
- *	Walk the devices on this firmware driven port and slightly
+ *	Query the devices on this firmware driven port and slightly
  *	mash the identify data to stop us and common tools trying to
  *	use features not firmware supported. The firmware itself does
  *	some masking (eg SMART) but not enough.
- *
- *	This is a bit of an abuse of the cable method, but it is the
- *	only method called at the right time. We could modify the libata
- *	core specifically for ident hacking but while we have one offender
- *	it seems better to keep the fallout localised.
  */
 
-static int it821x_ident_hack(struct ata_port *ap)
+static unsigned int it821x_read_id(struct ata_device *adev,
+					struct ata_taskfile *tf, u16 *id)
 {
-	struct ata_device *adev;
-	ata_link_for_each_dev(adev, &ap->link) {
-		if (ata_dev_enabled(adev)) {
-			adev->id[84] &= ~(1 << 6);	/* No FUA */
-			adev->id[85] &= ~(1 << 10);	/* No HPA */
-			adev->id[76] = 0;		/* No NCQ/AN etc */
-		}
+	unsigned int err_mask;
+	unsigned char model_num[ATA_ID_PROD_LEN + 1];
+
+	err_mask = ata_do_dev_read_id(adev, tf, id);
+	if (err_mask)
+		return err_mask;
+	ata_id_c_string(id, model_num, ATA_ID_PROD, sizeof(model_num));
+
+	id[83] &= ~(1 << 12);	/* Cache flush is firmware handled */
+	id[83] &= ~(1 << 13);	/* Ditto for LBA48 flushes */
+	id[84] &= ~(1 << 6);	/* No FUA */
+	id[85] &= ~(1 << 10);	/* No HPA */
+	id[76] = 0;		/* No NCQ/AN etc */
+
+	if (strstr(model_num, "Integrated Technology Express")) {
+		/* Set feature bits the firmware neglects */
+		id[49] |= 0x0300;	/* LBA, DMA */
+		id[82] |= 0x0400;	/* LBA48 */
+		id[83] &= 0x7FFF;
+		id[83] |= 0x4000;	/* Word 83 is valid */
+		id[86] |= 0x0400;	/* LBA48 on */
+		id[ATA_ID_MAJOR_VER] |= 0x1F;
 	}
-	return ata_cable_unknown(ap);
+	return err_mask;
 }
 
-
 /**
  *	it821x_check_atapi_dma	-	ATAPI DMA handler
  *	@qc: Command we are about to issue
@@ -577,6 +593,136 @@ static int it821x_check_atapi_dma(struct ata_queued_cmd *qc)
 	return 0;
 }
 
+/**
+ *	it821x_display_disk	-	display disk setup
+ *	@n: Device number
+ *	@buf: Buffer block from firmware
+ *
+ *	Produce a nice informative display of the device setup as provided
+ *	by the firmware.
+ */
+
+static void it821x_display_disk(int n, u8 *buf)
+{
+	unsigned char id[41];
+	int mode = 0;
+	char *mtype;
+	char mbuf[8];
+	char *cbl = "(40 wire cable)";
+
+	static const char *types[5] = {
+		"RAID0", "RAID1" "RAID 0+1", "JBOD", "DISK"
+	};
+
+	if (buf[52] > 4)	/* No Disk */
+		return;
+
+	ata_id_c_string((u16 *)buf, id, 0, 41); 
+
+	if (buf[51]) {
+		mode = ffs(buf[51]);
+		mtype = "UDMA";
+	} else if (buf[49]) {
+		mode = ffs(buf[49]);
+		mtype = "MWDMA";
+	}
+
+	if (buf[76])
+		cbl = "";
+
+	if (mode)
+		snprintf(mbuf, 8, "%5s%d", mtype, mode - 1);
+	else
+		strcpy(mbuf, "PIO");
+	if (buf[52] == 4)
+		printk(KERN_INFO "%d: %-6s %-8s          %s %s\n",
+				n, mbuf, types[buf[52]], id, cbl);
+	else
+		printk(KERN_INFO "%d: %-6s %-8s Volume: %1d %s %s\n",
+				n, mbuf, types[buf[52]], buf[53], id, cbl);
+	if (buf[125] < 100)
+		printk(KERN_INFO "%d: Rebuilding: %d%%\n", n, buf[125]);
+}
+
+/**
+ *	it821x_firmware_command		-	issue firmware command
+ *	@ap: IT821x port to interrogate
+ *	@cmd: command
+ *	@len: length
+ *
+ *	Issue firmware commands expecting data back from the controller. We
+ *	use this to issue commands that do not go via the normal paths. Other
+ *	commands such as 0xFC can be issued normally.
+ */
+
+static u8 *it821x_firmware_command(struct ata_port *ap, u8 cmd, int len)
+{
+	u8 status;
+	int n = 0;
+	u16 *buf = kmalloc(len, GFP_KERNEL);
+	if (buf == NULL) {
+		printk(KERN_ERR "it821x_firmware_command: Out of memory\n");
+		return NULL;
+	}
+	/* This isn't quite a normal ATA command as we are talking to the
+	   firmware not the drives */
+	ap->ctl |= ATA_NIEN;
+	iowrite8(ap->ctl, ap->ioaddr.ctl_addr);
+	ata_wait_idle(ap);
+	iowrite8(ATA_DEVICE_OBS, ap->ioaddr.device_addr);
+	iowrite8(cmd, ap->ioaddr.command_addr);
+	udelay(1);
+	/* This should be almost immediate but a little paranoia goes a long
+	   way. */
+	while(n++ < 10) {
+		status = ioread8(ap->ioaddr.status_addr);
+		if (status & ATA_ERR) {
+			kfree(buf);
+			printk(KERN_ERR "it821x_firmware_command: rejected\n");
+			return NULL;
+		}
+		if (status & ATA_DRQ) {
+			ioread16_rep(ap->ioaddr.data_addr, buf, len/2);
+			return (u8 *)buf;
+		}
+		mdelay(1);
+	}
+	kfree(buf);
+	printk(KERN_ERR "it821x_firmware_command: timeout\n");
+	return NULL;
+}
+
+/**
+ *	it821x_probe_firmware	-	firmware reporting/setup
+ *	@ap: IT821x port being probed
+ *
+ *	Probe the firmware of the controller by issuing firmware command
+ *	0xFA and analysing the returned data.
+ */
+
+static void it821x_probe_firmware(struct ata_port *ap)
+{
+	u8 *buf;
+	int i;
+
+	/* This is a bit ugly as we can't just issue a task file to a device
+	   as this is controller magic */
+
+	buf = it821x_firmware_command(ap, 0xFA, 512);
+
+	if (buf != NULL) {
+		printk(KERN_INFO "pata_it821x: Firmware %02X/%02X/%02X%02X\n",
+				buf[505],
+				buf[506],
+				buf[507],
+				buf[508]);
+		for (i = 0; i < 4; i++)
+ 			it821x_display_disk(i, buf + 128 * i);
+		kfree(buf);
+	}
+}
+
+
 
 /**
  *	it821x_port_start	-	port setup
@@ -610,6 +756,8 @@ static int it821x_port_start(struct ata_port *ap)
 		/* Long I/O's although allowed in LBA48 space cause the
 		   onboard firmware to enter the twighlight zone */
 		/* No ATAPI DMA in this mode either */
+		if (ap->port_no == 0)
+			it821x_probe_firmware(ap);
 	}
 	/* Pull the current clocks from 0x50 */
 	if (conf & (1 << (1 + ap->port_no)))
@@ -631,6 +779,25 @@ static int it821x_port_start(struct ata_port *ap)
 	return 0;
 }
 
+/**
+ *	it821x_rdc_cable	-	Cable detect for RDC1010
+ *	@ap: port we are checking
+ *
+ *	Return the RDC1010 cable type. Unlike the IT821x we know how to do
+ *	this and can do host side cable detect
+ */
+
+static int it821x_rdc_cable(struct ata_port *ap)
+{
+	u16 r40;
+	struct pci_dev *pdev = to_pci_dev(ap->host->dev);
+
+	pci_read_config_word(pdev, 0x40, &r40);
+	if (r40 & (1 << (2 + ap->port_no)))
+		return ATA_CBL_PATA40;
+	return ATA_CBL_PATA80;
+}
+
 static struct scsi_host_template it821x_sht = {
 	ATA_BMDMA_SHT(DRV_NAME),
 };
@@ -641,9 +808,10 @@ static struct ata_port_operations it821x_smart_port_ops = {
 	.check_atapi_dma= it821x_check_atapi_dma,
 	.qc_issue	= it821x_smart_qc_issue,
 
-	.cable_detect	= it821x_ident_hack,
+	.cable_detect	= ata_cable_80wire,
 	.set_mode	= it821x_smart_set_mode,
 	.dev_config	= it821x_dev_config,
+	.read_id	= it821x_read_id,
 
 	.port_start	= it821x_port_start,
 };
@@ -664,8 +832,29 @@ static struct ata_port_operations it821x_passthru_port_ops = {
 	.port_start	= it821x_port_start,
 };
 
+static struct ata_port_operations it821x_rdc_port_ops = {
+	.inherits	= &ata_bmdma_port_ops,
+
+	.check_atapi_dma= it821x_check_atapi_dma,
+	.sff_dev_select	= it821x_passthru_dev_select,
+	.bmdma_start 	= it821x_passthru_bmdma_start,
+	.bmdma_stop	= it821x_passthru_bmdma_stop,
+	.qc_issue	= it821x_passthru_qc_issue,
+
+	.cable_detect	= it821x_rdc_cable,
+	.set_piomode	= it821x_passthru_set_piomode,
+	.set_dmamode	= it821x_passthru_set_dmamode,
+
+	.port_start	= it821x_port_start,
+};
+
 static void it821x_disable_raid(struct pci_dev *pdev)
 {
+	/* Neither the RDC nor the IT8211 */
+	if (pdev->vendor != PCI_VENDOR_ID_ITE ||
+			pdev->device != PCI_DEVICE_ID_ITE_8212)
+			return;
+
 	/* Reset local CPU, and set BIOS not ready */
 	pci_write_config_byte(pdev, 0x5E, 0x01);
 
@@ -690,6 +879,7 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 		.flags = ATA_FLAG_SLAVE_POSS,
 		.pio_mask = 0x1f,
 		.mwdma_mask = 0x07,
+		.udma_mask = ATA_UDMA6,
 		.port_ops = &it821x_smart_port_ops
 	};
 	static const struct ata_port_info info_passthru = {
@@ -699,6 +889,13 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 		.udma_mask = ATA_UDMA6,
 		.port_ops = &it821x_passthru_port_ops
 	};
+	static const struct ata_port_info info_rdc = {
+		.flags = ATA_FLAG_SLAVE_POSS,
+		.pio_mask = 0x1f,
+		.mwdma_mask = 0x07,
+		/* No UDMA */
+		.port_ops = &it821x_rdc_port_ops
+	};
 
 	const struct ata_port_info *ppi[] = { NULL, NULL };
 	static char *mode[2] = { "pass through", "smart" };
@@ -707,21 +904,25 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 	rc = pcim_enable_device(pdev);
 	if (rc)
 		return rc;
+		
+	if (pdev->vendor == PCI_VENDOR_ID_RDC) {
+		ppi[0] = &info_rdc;
+	} else {
+		/* Force the card into bypass mode if so requested */
+		if (it8212_noraid) {
+			printk(KERN_INFO DRV_NAME ": forcing bypass mode.\n");
+			it821x_disable_raid(pdev);
+		}
+		pci_read_config_byte(pdev, 0x50, &conf);
+		conf &= 1;
 
-	/* Force the card into bypass mode if so requested */
-	if (it8212_noraid) {
-		printk(KERN_INFO DRV_NAME ": forcing bypass mode.\n");
-		it821x_disable_raid(pdev);
+		printk(KERN_INFO DRV_NAME": controller in %s mode.\n",
+								mode[conf]);
+		if (conf == 0)
+			ppi[0] = &info_passthru;
+		else
+			ppi[0] = &info_smart;
 	}
-	pci_read_config_byte(pdev, 0x50, &conf);
-	conf &= 1;
-
-	printk(KERN_INFO DRV_NAME ": controller in %s mode.\n", mode[conf]);
-	if (conf == 0)
-		ppi[0] = &info_passthru;
-	else
-		ppi[0] = &info_smart;
-
 	return ata_pci_sff_init_one(pdev, ppi, &it821x_sht, NULL);
 }
 
@@ -745,6 +946,7 @@ static int it821x_reinit_one(struct pci_dev *pdev)
 static const struct pci_device_id it821x[] = {
 	{ PCI_VDEVICE(ITE, PCI_DEVICE_ID_ITE_8211), },
 	{ PCI_VDEVICE(ITE, PCI_DEVICE_ID_ITE_8212), },
+	{ PCI_VDEVICE(RDC, 0x1010), },
 
 	{ },
 };
diff --git a/include/linux/libata.h b/include/linux/libata.h
index d4b8e5f..06b8033 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -750,6 +750,7 @@ struct ata_port_operations {
 	void (*set_piomode)(struct ata_port *ap, struct ata_device *dev);
 	void (*set_dmamode)(struct ata_port *ap, struct ata_device *dev);
 	int  (*set_mode)(struct ata_link *link, struct ata_device **r_failed_dev);
+	unsigned int (*read_id)(struct ata_device *dev, struct ata_taskfile *tf, u16 *id);
 
 	void (*dev_config)(struct ata_device *dev);
 
@@ -951,6 +952,8 @@ extern void ata_id_string(const u16 *id, unsigned char *s,
 			  unsigned int ofs, unsigned int len);
 extern void ata_id_c_string(const u16 *id, unsigned char *s,
 			    unsigned int ofs, unsigned int len);
+extern unsigned int ata_do_dev_read_id(struct ata_device *dev,
+					struct ata_taskfile *tf, u16 *id);
 extern void ata_qc_complete(struct ata_queued_cmd *qc);
 extern int ata_qc_complete_multiple(struct ata_port *ap, u32 qc_active);
 extern void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.538
retrieving revision 1.539
diff -u -r1.538 -r1.539
--- kernel.spec	20 Sep 2008 12:53:25 -0000	1.538
+++ kernel.spec	23 Sep 2008 00:39:39 -0000	1.539
@@ -651,6 +651,7 @@
 Patch640: linux-2.6-defaults-pci_no_msi.patch
 
 Patch670: linux-2.6-ata-quirk.patch
+Patch671: linux-2.6-libata-pata_it821x-driver-updates-and-reworking.patch
 Patch674: linux-2.6-sata-eeepc-faster.patch
 Patch675: linux-2.6-libata-pata_marvell-play-nice-with-ahci.patch
 Patch676: linux-2.6-libata-fix-a-large-collection-of-DMA-mode-mismatches.patch
@@ -1185,6 +1186,8 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 # eepc short cable quirk
 ApplyPatch linux-2.6-sata-eeepc-faster.patch
+# fix it821x
+ApplyPatch linux-2.6-libata-pata_it821x-driver-updates-and-reworking.patch
 # don't use ahci for pata_marvell adapters
 ApplyPatch linux-2.6-libata-pata_marvell-play-nice-with-ahci.patch
 # fix drivers making wrong assumptions about what dma values mean
@@ -1873,6 +1876,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-29
+- Copy forgotten libata patch from F9.
+
 * Sat Sep 20 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-28
 - pci: three patches to disable PCIe ASPM on old devices/systems (F9#462210)
 



From roland at fedoraproject.org  Tue Sep 23 00:40:23 2008
From: roland at fedoraproject.org (Roland McGrath)
Date: Tue, 23 Sep 2008 00:40:23 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc7-git1.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.928, 1.929 kernel.spec, 1.968, 1.969 sources, 1.890,
	1.891 upstream, 1.802, 1.803
Message-ID: <20080923004023.DA47370103@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10958

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.27-rc7-git1.bz2.sign 
Log Message:
2.6.27-rc7-git1


--- NEW FILE patch-2.6.27-rc7-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBI2DH8yGugalF9Dw4RAryGAJ9ZqFppdI9sAprXTbFzIMWEf9fGLQCdF6fg
rqMFL81XNrrK3lHV+gF/DeY=
=oiEa
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.928
retrieving revision 1.929
diff -u -r1.928 -r1.929
--- .cvsignore	22 Sep 2008 14:07:05 -0000	1.928
+++ .cvsignore	23 Sep 2008 00:39:53 -0000	1.929
@@ -5,3 +5,4 @@
 kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc7.bz2
+patch-2.6.27-rc7-git1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.968
retrieving revision 1.969
diff -u -r1.968 -r1.969
--- kernel.spec	22 Sep 2008 22:50:57 -0000	1.968
+++ kernel.spec	23 Sep 2008 00:39:53 -0000	1.969
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1764,6 +1764,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Sep 22 2008 Roland McGrath <roland at redhat.com>
+- 2.6.27-rc7-git1
+
 * Mon Sep 22 2008 Kristian H??gsberg <krh at redhat.com>
 - Fix check for radeon external TMDS.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.890
retrieving revision 1.891
diff -u -r1.890 -r1.891
--- sources	22 Sep 2008 14:07:05 -0000	1.890
+++ sources	23 Sep 2008 00:39:53 -0000	1.891
@@ -1,2 +1,3 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 711e4624185c1e229e9aa4c736b57e05  patch-2.6.27-rc7.bz2
+76c36e968f058a91bd8401c1a8b731fc  patch-2.6.27-rc7-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.802
retrieving revision 1.803
diff -u -r1.802 -r1.803
--- upstream	22 Sep 2008 14:07:05 -0000	1.802
+++ upstream	23 Sep 2008 00:39:53 -0000	1.803
@@ -1,2 +1,3 @@
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc7.bz2
+patch-2.6.27-rc7-git1.bz2



From mclasen at fedoraproject.org  Tue Sep 23 00:42:40 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 00:42:40 +0000 (UTC)
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.48,
	1.49 gnome-power-manager.spec, 1.125, 1.126 sources, 1.48, 1.49
Message-ID: <20080923004240.F148070033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11319

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	1 Sep 2008 14:18:31 -0000	1.48
+++ .cvsignore	23 Sep 2008 00:42:10 -0000	1.49
@@ -1 +1 @@
-gnome-power-manager-2.23.91.tar.gz
+gnome-power-manager-2.24.0.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- gnome-power-manager.spec	1 Sep 2008 14:18:31 -0000	1.125
+++ gnome-power-manager.spec	23 Sep 2008 00:42:10 -0000	1.126
@@ -4,11 +4,11 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.23.91
+Version: 2.24.0
 Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
-Source: http://download.gnome.org/sources/gnome-power-manager/2.23/gnome-power-manager-%{version}.tar.gz
+Source: http://download.gnome.org/sources/gnome-power-manager/2.24/gnome-power-manager-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org/projects/gnome-power-manager/
 
@@ -124,6 +124,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep 01 2008 Richard Hughes  <rhughes at redhat.com> - 2.23.91-1
 - Update to 2.23.91, which should some translation issues.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	1 Sep 2008 14:18:31 -0000	1.48
+++ sources	23 Sep 2008 00:42:10 -0000	1.49
@@ -1 +1 @@
-8f3f07ca7ab091d8fe5d7d27b0b68c49  gnome-power-manager-2.23.91.tar.gz
+074d67b0c229ba0f792bcac6dd775d11  gnome-power-manager-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 23 00:47:53 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 00:47:53 +0000 (UTC)
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec, 1.126,
	1.127
Message-ID: <20080923004753.87F1370033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12055

Modified Files:
	gnome-power-manager.spec 
Log Message:
use the right source



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- gnome-power-manager.spec	23 Sep 2008 00:42:10 -0000	1.126
+++ gnome-power-manager.spec	23 Sep 2008 00:47:23 -0000	1.127
@@ -5,10 +5,10 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
-Source: http://download.gnome.org/sources/gnome-power-manager/2.24/gnome-power-manager-%{version}.tar.gz
+Source: http://download.gnome.org/sources/gnome-power-manager/2.24/gnome-power-manager-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org/projects/gnome-power-manager/
 
@@ -124,7 +124,7 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
-* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-2
 - Update to 2.24.0
 
 * Mon Sep 01 2008 Richard Hughes  <rhughes at redhat.com> - 2.23.91-1



From cebbert at fedoraproject.org  Tue Sep 23 00:52:20 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 23 Sep 2008 00:52:20 +0000 (UTC)
Subject: rpms/kernel/F-9
	linux-2.6-pcmcia-fix-broken-abuse-of-dev-driver_data.patch, NONE,
	1.1 kernel.spec, 1.772, 1.773
Message-ID: <20080923005220.8DA8470033@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12575

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-pcmcia-fix-broken-abuse-of-dev-driver_data.patch 
Log Message:
pcmcia: Fix broken abuse of dev->driver_data (#462178)

linux-2.6-pcmcia-fix-broken-abuse-of-dev-driver_data.patch:

--- NEW FILE linux-2.6-pcmcia-fix-broken-abuse-of-dev-driver_data.patch ---
From: Alan Cox <alan at redhat.com>
Date: Mon, 22 Sep 2008 14:58:14 +0000 (+0100)
Subject: pcmcia: Fix broken abuse of dev->driver_data
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=cec5eb7be3a104fffd27ca967ee8e15a123050e2

pcmcia: Fix broken abuse of dev->driver_data

PCMCIA abuses dev->private_data in the probe methods. Unfortunately it
continues to abuse it after calling drv->probe() which leads to crashes and
other nasties (such as bogus probes of multifunction devices) giving errors like

pcmcia: registering new device pcmcia0.1
kernel: 0.1: GetNextTuple: No more items

Extract the passed data before calling the driver probe function that way
we don't blow up when the driver reuses dev->private_data as its right.

As its close to the final release just move the hack so it works out,
hopefully someone will be sufficiently embarrassed to produce a nice rework
for 2.6.28.

Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
BZ 462178

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 4174d96..34c83d3 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -427,6 +427,18 @@ static int pcmcia_device_probe(struct device * dev)
 	p_drv = to_pcmcia_drv(dev->driver);
 	s = p_dev->socket;
 
+	/* The PCMCIA code passes the match data in via dev->driver_data
+	 * which is an ugly hack. Once the driver probe is called it may
+	 * and often will overwrite the match data so we must save it first
+	 *
+	 * handle pseudo multifunction devices:
+	 * there are at most two pseudo multifunction devices.
+	 * if we're matching against the first, schedule a
+	 * call which will then check whether there are two
+	 * pseudo devices, and if not, add the second one.
+	 */
+	did = p_dev->dev.driver_data;
+
 	ds_dbg(1, "trying to bind %s to %s\n", p_dev->dev.bus_id,
 	       p_drv->drv.name);
 
@@ -455,21 +467,14 @@ static int pcmcia_device_probe(struct device * dev)
 		goto put_module;
 	}
 
-	/* handle pseudo multifunction devices:
-	 * there are at most two pseudo multifunction devices.
-	 * if we're matching against the first, schedule a
-	 * call which will then check whether there are two
-	 * pseudo devices, and if not, add the second one.
-	 */
-	did = p_dev->dev.driver_data;
 	if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
 	    (p_dev->socket->device_count == 1) && (p_dev->device_no == 0))
 		pcmcia_add_device_later(p_dev->socket, 0);
 
- put_module:
+put_module:
 	if (ret)
 		module_put(p_drv->owner);
- put_dev:
+put_dev:
 	if (ret)
 		put_device(dev);
 	return (ret);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.772
retrieving revision 1.773
diff -u -r1.772 -r1.773
--- kernel.spec	20 Sep 2008 07:04:43 -0000	1.772
+++ kernel.spec	23 Sep 2008 00:51:50 -0000	1.773
@@ -699,6 +699,7 @@
 
 Patch2700: linux-2.6-intel-msr-backport.patch
 Patch2701: linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch
+Patch2703: linux-2.6-pcmcia-fix-broken-abuse-of-dev-driver_data.patch
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1291,6 +1292,8 @@
 
 ApplyPatch linux-2.6-intel-msr-backport.patch
 ApplyPatch linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch
+# fix subtle but annoying PCMCIA bug
+ApplyPatch linux-2.6-pcmcia-fix-broken-abuse-of-dev-driver_data.patch
 # ---------- below all scheduled for 2.6.24 -----------------
 
 # END OF PATCH APPLICATIONS
@@ -1882,6 +1885,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Mon Sep 22 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-46
+- pcmcia: Fix broken abuse of dev->driver_data (#462178)
+
 * Fri Sep 19 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-45
 - pci: three patches to disable PCIe ASPM on old devices/systems (#462210)
 



From cebbert at fedoraproject.org  Tue Sep 23 00:59:03 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 23 Sep 2008 00:59:03 +0000 (UTC)
Subject: rpms/kernel/F-8
	linux-2.6-pcmcia-fix-broken-abuse-of-dev-driver_data.patch, NONE,
	1.1 kernel.spec, 1.539, 1.540
Message-ID: <20080923005903.A183170033@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13261

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-pcmcia-fix-broken-abuse-of-dev-driver_data.patch 
Log Message:
pcmcia: Fix broken abuse of dev->driver_data (F9#462178)

linux-2.6-pcmcia-fix-broken-abuse-of-dev-driver_data.patch:

--- NEW FILE linux-2.6-pcmcia-fix-broken-abuse-of-dev-driver_data.patch ---
From: Alan Cox <alan at redhat.com>
Date: Mon, 22 Sep 2008 14:58:14 +0000 (+0100)
Subject: pcmcia: Fix broken abuse of dev->driver_data
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=cec5eb7be3a104fffd27ca967ee8e15a123050e2

pcmcia: Fix broken abuse of dev->driver_data

PCMCIA abuses dev->private_data in the probe methods. Unfortunately it
continues to abuse it after calling drv->probe() which leads to crashes and
other nasties (such as bogus probes of multifunction devices) giving errors like

pcmcia: registering new device pcmcia0.1
kernel: 0.1: GetNextTuple: No more items

Extract the passed data before calling the driver probe function that way
we don't blow up when the driver reuses dev->private_data as its right.

As its close to the final release just move the hack so it works out,
hopefully someone will be sufficiently embarrassed to produce a nice rework
for 2.6.28.

Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
BZ 462178

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 4174d96..34c83d3 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -427,6 +427,18 @@ static int pcmcia_device_probe(struct device * dev)
 	p_drv = to_pcmcia_drv(dev->driver);
 	s = p_dev->socket;
 
+	/* The PCMCIA code passes the match data in via dev->driver_data
+	 * which is an ugly hack. Once the driver probe is called it may
+	 * and often will overwrite the match data so we must save it first
+	 *
+	 * handle pseudo multifunction devices:
+	 * there are at most two pseudo multifunction devices.
+	 * if we're matching against the first, schedule a
+	 * call which will then check whether there are two
+	 * pseudo devices, and if not, add the second one.
+	 */
+	did = p_dev->dev.driver_data;
+
 	ds_dbg(1, "trying to bind %s to %s\n", p_dev->dev.bus_id,
 	       p_drv->drv.name);
 
@@ -455,21 +467,14 @@ static int pcmcia_device_probe(struct device * dev)
 		goto put_module;
 	}
 
-	/* handle pseudo multifunction devices:
-	 * there are at most two pseudo multifunction devices.
-	 * if we're matching against the first, schedule a
-	 * call which will then check whether there are two
-	 * pseudo devices, and if not, add the second one.
-	 */
-	did = p_dev->dev.driver_data;
 	if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
 	    (p_dev->socket->device_count == 1) && (p_dev->device_no == 0))
 		pcmcia_add_device_later(p_dev->socket, 0);
 
- put_module:
+put_module:
 	if (ret)
 		module_put(p_drv->owner);
- put_dev:
+put_dev:
 	if (ret)
 		put_device(dev);
 	return (ret);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.539
retrieving revision 1.540
diff -u -r1.539 -r1.540
--- kernel.spec	23 Sep 2008 00:39:39 -0000	1.539
+++ kernel.spec	23 Sep 2008 00:58:33 -0000	1.540
@@ -701,6 +701,8 @@
 Patch1910: linux-2.6-firewire-git-update.patch
 #Patch1911: linux-2.6-firewire-git-pending.patch
 
+Patch2703: linux-2.6-pcmcia-fix-broken-abuse-of-dev-driver_data.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
@@ -1278,9 +1280,8 @@
 ApplyPatch linux-2.6-firewire-git-update.patch
 #ApplyPatch linux-2.6-firewire-git-pending.patch
 
-# ---------- below all scheduled for 2.6.25 -----------------
-
-# SELinux perf patches
+# fix subtle but annoying PCMCIA bug
+ApplyPatch linux-2.6-pcmcia-fix-broken-abuse-of-dev-driver_data.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1876,6 +1877,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-30
+- pcmcia: Fix broken abuse of dev->driver_data (F9#462178)
+
 * Mon Sep 22 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-29
 - Copy forgotten libata patch from F9.
 



From mclasen at fedoraproject.org  Tue Sep 23 01:25:20 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 01:25:20 +0000 (UTC)
Subject: rpms/librsvg2/devel .cvsignore, 1.35, 1.36 librsvg2.spec, 1.71,
	1.72 sources, 1.36, 1.37
Message-ID: <20080923012520.68A8970033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/librsvg2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16179

Modified Files:
	.cvsignore librsvg2.spec sources 
Log Message:
2.22.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/librsvg2/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	5 Mar 2008 01:17:28 -0000	1.35
+++ .cvsignore	23 Sep 2008 01:24:50 -0000	1.36
@@ -1 +1 @@
-librsvg-2.22.2.tar.bz2
+librsvg-2.22.3.tar.bz2


Index: librsvg2.spec
===================================================================
RCS file: /cvs/extras/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- librsvg2.spec	18 Sep 2008 18:45:02 -0000	1.71
+++ librsvg2.spec	23 Sep 2008 01:24:50 -0000	1.72
@@ -12,8 +12,8 @@
 
 Name: 	 librsvg2
 Summary: An SVG library based on cairo
-Version: 2.22.2
-Release: 2%{?dist}
+Version: 2.22.3
+Release: 1%{?dist}
 
 License: 	LGPLv2+
 Group: 		System Environment/Libraries
@@ -122,6 +122,9 @@
 %doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.3-1
+- Update to 2.22.3
+
 * Thu Sep 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.2-2
 - Plug a memory leak
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/librsvg2/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	5 Mar 2008 01:17:28 -0000	1.36
+++ sources	23 Sep 2008 01:24:50 -0000	1.37
@@ -1 +1 @@
-aae602677ce201b1a0ed6a0c18c207f2  librsvg-2.22.2.tar.bz2
+c4ec4fdb2b1842e221ca39127e85682d  librsvg-2.22.3.tar.bz2



From katzj at fedoraproject.org  Tue Sep 23 01:53:17 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Tue, 23 Sep 2008 01:53:17 +0000 (UTC)
Subject: rpms/kernel/devel config-x86-generic, 1.48, 1.49 kernel.spec, 1.969,
	1.970
Message-ID: <20080923015317.AACE570033@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19084

Modified Files:
	config-x86-generic kernel.spec 
Log Message:
* Mon Sep 22 2008 Jeremy Katz <katzj at redhat.com>
- Enable Geode framebuffer so that we can have a console on the XO



Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- config-x86-generic	22 Sep 2008 19:21:17 -0000	1.48
+++ config-x86-generic	23 Sep 2008 01:52:47 -0000	1.49
@@ -83,6 +83,11 @@
 CONFIG_FB_EFI=y
 # CONFIG_FB_N411 is not set
 
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=y
+CONFIG_FB_GEODE_GX=y
+# CONFIG_FB_GEODE_GX1 is not set
+
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GODIRECT is not set
 # CONFIG_PCI_GOMMCONFIG is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.969
retrieving revision 1.970
diff -u -r1.969 -r1.970
--- kernel.spec	23 Sep 2008 00:39:53 -0000	1.969
+++ kernel.spec	23 Sep 2008 01:52:47 -0000	1.970
@@ -1764,6 +1764,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Sep 22 2008 Jeremy Katz <katzj at redhat.com>
+- Enable Geode framebuffer so that we can have a console on the XO
+
 * Mon Sep 22 2008 Roland McGrath <roland at redhat.com>
 - 2.6.27-rc7-git1
 



From kaigai at fedoraproject.org  Tue Sep 23 02:04:43 2008
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Tue, 23 Sep 2008 02:04:43 +0000 (UTC)
Subject: rpms/sepostgresql/devel sepostgresql-policy-8.3.3-2.patch, 1.1,
	1.2 sepostgresql-sepgsql-8.3.3-2.patch, 1.3, 1.4 sepostgresql.8,
	1.1, 1.2 sepostgresql.init, 1.22, 1.23 sepostgresql.spec, 1.23, 1.24
Message-ID: <20080923020443.E2F7170033@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20196

Modified Files:
	sepostgresql-policy-8.3.3-2.patch 
	sepostgresql-sepgsql-8.3.3-2.patch sepostgresql.8 
	sepostgresql.init sepostgresql.spec 
Log Message:
bugfix: trusted procedure invokation via operators
bugfix: FK insertion with invisible PK cases


sepostgresql-policy-8.3.3-2.patch:

Index: sepostgresql-policy-8.3.3-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql-policy-8.3.3-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sepostgresql-policy-8.3.3-2.patch	11 Jul 2008 08:39:31 -0000	1.1
+++ sepostgresql-policy-8.3.3-2.patch	23 Sep 2008 02:04:13 -0000	1.2
@@ -103,9 +103,9 @@
 +## There are no interface declaration
 diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql-devel.te sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.te
 --- base/src/backend/security/sepgsql/policy/sepostgresql-devel.te	1970-01-01 09:00:00.000000000 +0900
-+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.te	2008-07-11 14:10:51.000000000 +0900
-@@ -0,0 +1,82 @@
-+policy_module(sepostgresql-devel, 3.11)
++++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.te	2008-09-23 09:00:34.000000000 +0900
+@@ -0,0 +1,125 @@
++policy_module(sepostgresql-devel, 3.14)
 +
 +gen_require(`
 +	class db_database all_db_database_perms;
@@ -125,6 +125,49 @@
 +	attribute sepgsql_procedure_type;
 +	attribute sepgsql_blob_type;
 +	attribute sepgsql_module_type;
++
++	# for testcases
++	attribute tmpfile;
++	role unconfined_r;
++	type unconfined_t;
++	type sepgsql_trusted_proc_t;
++')
++
++#################################
++#
++# Domain for Testcases
++#
++
++type sepgsql_test_t;
++domain_type(sepgsql_test_t)
++
++allow unconfined_t sepgsql_test_t : process transition;
++role unconfined_r types sepgsql_test_t;
++role unconfined_r types sepgsql_trusted_proc_t;
++
++corecmd_exec_bin(sepgsql_test_t)
++allow sepgsql_test_t bin_t : file { entrypoint };
++
++files_read_usr_files(sepgsql_test_t)
++files_read_etc_files(sepgsql_test_t)
++libs_use_ld_so(sepgsql_test_t)
++libs_use_shared_libs(sepgsql_test_t)
++
++term_use_all_terms(sepgsql_test_t)
++
++files_search_home(sepgsql_test_t)
++allow sepgsql_test_t home_type : file rw_file_perms;
++allow sepgsql_test_t home_type : dir search_dir_perms;
++miscfiles_read_localization(sepgsql_test_t)
++
++allow sepgsql_test_t tmpfile : dir search_dir_perms;
++allow sepgsql_test_t tmpfile : file rw_file_perms;
++
++postgresql_stream_connect(sepgsql_test_t)
++postgresql_unpriv_client(sepgsql_test_t)
++
++optional_policy(`
++	nscd_shm_use(sepgsql_test_t)
 +')
 +
 +#################################

sepostgresql-sepgsql-8.3.3-2.patch:

Index: sepostgresql-sepgsql-8.3.3-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql-sepgsql-8.3.3-2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sepostgresql-sepgsql-8.3.3-2.patch	13 Aug 2008 13:54:49 -0000	1.3
+++ sepostgresql-sepgsql-8.3.3-2.patch	23 Sep 2008 02:04:13 -0000	1.4
@@ -2503,7 +2503,7 @@
  				estate->es_output_cid,
 diff -rpNU3 base/src/backend/executor/execQual.c sepgsql/src/backend/executor/execQual.c
 --- base/src/backend/executor/execQual.c	2008-01-07 23:51:33.000000000 +0900
-+++ sepgsql/src/backend/executor/execQual.c	2008-08-13 22:24:28.000000000 +0900
++++ sepgsql/src/backend/executor/execQual.c	2008-08-15 11:22:38.000000000 +0900
 @@ -47,6 +47,7 @@
  #include "nodes/makefuncs.h"
  #include "optimizer/planmain.h"
@@ -2512,60 +2512,16 @@
  #include "utils/acl.h"
  #include "utils/builtins.h"
  #include "utils/lsyscache.h"
-@@ -1494,6 +1495,8 @@ ExecMakeTableFunctionResult(ExprState *f
- 			FuncExpr   *func = (FuncExpr *) fcache->xprstate.expr;
- 
- 			init_fcache(func->funcid, fcache, econtext->ecxt_per_query_memory);
+@@ -1015,6 +1016,9 @@ init_fcache(Oid foid, FuncExprState *fca
+ 	fcache->setArgsValid = false;
+ 	fcache->shutdown_reg = false;
+ 	fcache->func.fn_expr = (Node *) fcache->xprstate.expr;
 +
-+			pgaceCallFunction(&fcache->func);
- 		}
- 		returnsSet = fcache->func.fn_retset;
- 
-@@ -1750,6 +1753,8 @@ ExecEvalFunc(FuncExprState *fcache,
- 	/* Go directly to ExecMakeFunctionResult on subsequent uses */
- 	fcache->xprstate.evalfunc = (ExprStateEvalFunc) ExecMakeFunctionResult;
- 
++	/* Check permission to call function by security subsystem */
 +	pgaceCallFunction(&fcache->func);
-+
- 	return ExecMakeFunctionResult(fcache, econtext, isNull, isDone);
  }
  
-@@ -1772,6 +1777,8 @@ ExecEvalOper(FuncExprState *fcache,
- 	/* Go directly to ExecMakeFunctionResult on subsequent uses */
- 	fcache->xprstate.evalfunc = (ExprStateEvalFunc) ExecMakeFunctionResult;
- 
-+	pgaceCallFunction(&fcache->func);
-+
- 	return ExecMakeFunctionResult(fcache, econtext, isNull, isDone);
- }
- 
-@@ -1811,6 +1818,8 @@ ExecEvalDistinct(FuncExprState *fcache,
- 
- 		init_fcache(op->opfuncid, fcache, econtext->ecxt_per_query_memory);
- 		Assert(!fcache->func.fn_retset);
-+
-+		pgaceCallFunction(&fcache->func);
- 	}
- 
- 	/*
-@@ -1891,6 +1900,8 @@ ExecEvalScalarArrayOp(ScalarArrayOpExprS
- 		init_fcache(opexpr->opfuncid, &sstate->fxprstate,
- 					econtext->ecxt_per_query_memory);
- 		Assert(!sstate->fxprstate.func.fn_retset);
-+
-+		pgaceCallFunction(&sstate->fxprstate.func);
- 	}
- 
- 	/* Need to prep callinfo structure */
-@@ -3084,6 +3095,8 @@ ExecEvalNullIf(FuncExprState *nullIfExpr
- 
- 		init_fcache(op->opfuncid, nullIfExpr, econtext->ecxt_per_query_memory);
- 		Assert(!nullIfExpr->func.fn_retset);
-+
-+		pgaceCallFunction(&nullIfExpr->func);
- 	}
- 
- 	/*
+ /*
 diff -rpNU3 base/src/backend/executor/execScan.c sepgsql/src/backend/executor/execScan.c
 --- base/src/backend/executor/execScan.c	2008-01-07 23:51:33.000000000 +0900
 +++ sepgsql/src/backend/executor/execScan.c	2008-06-14 02:36:58.000000000 +0900
@@ -2706,7 +2662,7 @@
  	PG_RETURN_INT32(0);
 diff -rpNU3 base/src/backend/nodes/copyfuncs.c sepgsql/src/backend/nodes/copyfuncs.c
 --- base/src/backend/nodes/copyfuncs.c	2008-03-19 09:48:23.000000000 +0900
-+++ sepgsql/src/backend/nodes/copyfuncs.c	2008-06-14 02:36:58.000000000 +0900
++++ sepgsql/src/backend/nodes/copyfuncs.c	2008-09-22 15:02:01.000000000 +0900
 @@ -24,6 +24,7 @@
  
  #include "nodes/plannodes.h"
@@ -2723,7 +2679,15 @@
  
  	return newnode;
  }
-@@ -1523,6 +1525,7 @@ _copyRangeTblEntry(RangeTblEntry *from)
+@@ -226,6 +228,7 @@ CopyScanFields(Scan *from, Scan *newnode
+ 	CopyPlanFields((Plan *) from, (Plan *) newnode);
+ 
+ 	COPY_SCALAR_FIELD(scanrelid);
++	COPY_SCALAR_FIELD(pgaceTuplePerms);
+ }
+ 
+ /*
+@@ -1523,6 +1526,7 @@ _copyRangeTblEntry(RangeTblEntry *from)
  	COPY_SCALAR_FIELD(inFromCl);
  	COPY_SCALAR_FIELD(requiredPerms);
  	COPY_SCALAR_FIELD(checkAsUser);
@@ -2731,7 +2695,7 @@
  
  	return newnode;
  }
-@@ -1789,6 +1792,7 @@ _copyColumnDef(ColumnDef *from)
+@@ -1789,6 +1793,7 @@ _copyColumnDef(ColumnDef *from)
  	COPY_NODE_FIELD(raw_default);
  	COPY_STRING_FIELD(cooked_default);
  	COPY_NODE_FIELD(constraints);
@@ -2739,7 +2703,7 @@
  
  	return newnode;
  }
-@@ -1869,6 +1873,7 @@ _copyQuery(Query *from)
+@@ -1869,6 +1874,7 @@ _copyQuery(Query *from)
  	COPY_NODE_FIELD(limitCount);
  	COPY_NODE_FIELD(rowMarks);
  	COPY_NODE_FIELD(setOperations);
@@ -2747,7 +2711,7 @@
  
  	return newnode;
  }
-@@ -2105,6 +2110,7 @@ _copyCreateStmt(CreateStmt *from)
+@@ -2105,6 +2111,7 @@ _copyCreateStmt(CreateStmt *from)
  	COPY_NODE_FIELD(options);
  	COPY_SCALAR_FIELD(oncommit);
  	COPY_STRING_FIELD(tablespacename);
@@ -2755,7 +2719,7 @@
  
  	return newnode;
  }
-@@ -2998,6 +3004,49 @@ _copyValue(Value *from)
+@@ -2998,6 +3005,49 @@ _copyValue(Value *from)
  	return newnode;
  }
  
@@ -2805,7 +2769,7 @@
  /*
   * copyObject
   *
-@@ -3600,6 +3649,15 @@ copyObject(void *from)
+@@ -3600,6 +3650,15 @@ copyObject(void *from)
  		case T_XmlSerialize:
  			retval = _copyXmlSerialize(from);
  			break;
@@ -2821,9 +2785,100 @@
  
  		default:
  			elog(ERROR, "unrecognized node type: %d", (int) nodeTag(from));
+diff -rpNU3 base/src/backend/nodes/equalfuncs.c sepgsql/src/backend/nodes/equalfuncs.c
+--- base/src/backend/nodes/equalfuncs.c	2008-03-19 09:48:23.000000000 +0900
++++ sepgsql/src/backend/nodes/equalfuncs.c	2008-09-22 16:53:15.000000000 +0900
+@@ -26,6 +26,7 @@
+ #include "postgres.h"
+ 
+ #include "nodes/relation.h"
++#include "nodes/security.h"
+ #include "utils/datum.h"
+ 
+ 
+@@ -768,6 +769,7 @@ _equalQuery(Query *a, Query *b)
+ 	COMPARE_NODE_FIELD(limitCount);
+ 	COMPARE_NODE_FIELD(rowMarks);
+ 	COMPARE_NODE_FIELD(setOperations);
++	COMPARE_NODE_FIELD(pgaceItem);
+ 
+ 	return true;
+ }
+@@ -970,6 +972,7 @@ _equalCreateStmt(CreateStmt *a, CreateSt
+ 	COMPARE_NODE_FIELD(options);
+ 	COMPARE_SCALAR_FIELD(oncommit);
+ 	COMPARE_STRING_FIELD(tablespacename);
++	COMPARE_NODE_FIELD(pgaceItem);
+ 
+ 	return true;
+ }
+@@ -1818,6 +1821,7 @@ _equalColumnDef(ColumnDef *a, ColumnDef 
+ 	COMPARE_NODE_FIELD(raw_default);
+ 	COMPARE_STRING_FIELD(cooked_default);
+ 	COMPARE_NODE_FIELD(constraints);
++	COMPARE_NODE_FIELD(pgaceItem);
+ 
+ 	return true;
+ }
+@@ -1925,6 +1929,39 @@ _equalXmlSerialize(XmlSerialize *a, XmlS
+ }
+ 
+ /*
++ * Stuff from nodes/security.h
++ */
++static bool
++_equalSEvalItemRelation(SEvalItemRelation *a, SEvalItemRelation *b)
++{
++	COMPARE_SCALAR_FIELD(perms);
++	COMPARE_SCALAR_FIELD(relid);
++	COMPARE_SCALAR_FIELD(inh);
++
++	return true;
++}
++
++static bool
++_equalSEvalItemAttribute(SEvalItemAttribute *a, SEvalItemAttribute *b)
++{
++	COMPARE_SCALAR_FIELD(perms);
++	COMPARE_SCALAR_FIELD(relid);
++	COMPARE_SCALAR_FIELD(inh);
++	COMPARE_SCALAR_FIELD(attno);
++
++	return true;
++}
++
++static bool
++_equalSEvalItemProcedure(SEvalItemProcedure *a, SEvalItemProcedure *b)
++{
++	COMPARE_SCALAR_FIELD(perms);
++	COMPARE_SCALAR_FIELD(funcid);
++
++	return true;
++}
++
++/*
+  * Stuff from pg_list.h
+  */
+ 
+@@ -2527,6 +2564,15 @@ equal(void *a, void *b)
+ 		case T_XmlSerialize:
+ 			retval = _equalXmlSerialize(a, b);
+ 			break;
++		case T_SEvalItemRelation:
++			retval = _equalSEvalItemRelation(a, b);
++			break;
++		case T_SEvalItemAttribute:
++			retval = _equalSEvalItemAttribute(a, b);
++			break;
++		case T_SEvalItemProcedure:
++			retval = _equalSEvalItemProcedure(a, b);
++			break;
+ 
+ 		default:
+ 			elog(ERROR, "unrecognized node type: %d",
 diff -rpNU3 base/src/backend/nodes/outfuncs.c sepgsql/src/backend/nodes/outfuncs.c
 --- base/src/backend/nodes/outfuncs.c	2008-01-14 22:59:48.000000000 +0900
-+++ sepgsql/src/backend/nodes/outfuncs.c	2008-06-14 02:36:58.000000000 +0900
++++ sepgsql/src/backend/nodes/outfuncs.c	2008-09-22 16:53:15.000000000 +0900
 @@ -26,6 +26,7 @@
  #include "lib/stringinfo.h"
  #include "nodes/plannodes.h"
@@ -2840,7 +2895,39 @@
  }
  
  /*
-@@ -1748,6 +1750,7 @@ _outQuery(StringInfo str, Query *node)
+@@ -282,6 +284,7 @@ _outScanInfo(StringInfo str, Scan *node)
+ 	_outPlanInfo(str, (Plan *) node);
+ 
+ 	WRITE_UINT_FIELD(scanrelid);
++	WRITE_UINT_FIELD(pgaceTuplePerms);
+ }
+ 
+ /*
+@@ -1376,6 +1379,7 @@ _outRelOptInfo(StringInfo str, RelOptInf
+ 	WRITE_BOOL_FIELD(has_eclass_joins);
+ 	WRITE_BITMAPSET_FIELD(index_outer_relids);
+ 	WRITE_NODE_FIELD(index_inner_paths);
++	WRITE_UINT_FIELD(pgaceTuplePerms);
+ }
+ 
+ static void
+@@ -1544,6 +1548,7 @@ _outCreateStmt(StringInfo str, CreateStm
+ 	WRITE_NODE_FIELD(options);
+ 	WRITE_ENUM_FIELD(oncommit, OnCommitAction);
+ 	WRITE_STRING_FIELD(tablespacename);
++	WRITE_NODE_FIELD(pgaceItem);
+ }
+ 
+ static void
+@@ -1659,6 +1664,7 @@ _outColumnDef(StringInfo str, ColumnDef 
+ 	WRITE_NODE_FIELD(raw_default);
+ 	WRITE_STRING_FIELD(cooked_default);
+ 	WRITE_NODE_FIELD(constraints);
++	WRITE_NODE_FIELD(pgaceItem);
+ }
+ 
+ static void
+@@ -1748,6 +1754,7 @@ _outQuery(StringInfo str, Query *node)
  	WRITE_NODE_FIELD(limitCount);
  	WRITE_NODE_FIELD(rowMarks);
  	WRITE_NODE_FIELD(setOperations);
@@ -2848,7 +2935,7 @@
  }
  
  static void
-@@ -1833,6 +1836,7 @@ _outRangeTblEntry(StringInfo str, RangeT
+@@ -1833,6 +1840,7 @@ _outRangeTblEntry(StringInfo str, RangeT
  	WRITE_BOOL_FIELD(inFromCl);
  	WRITE_UINT_FIELD(requiredPerms);
  	WRITE_OID_FIELD(checkAsUser);
@@ -2856,7 +2943,7 @@
  }
  
  static void
-@@ -2045,6 +2049,43 @@ _outFkConstraint(StringInfo str, FkConst
+@@ -2045,6 +2053,43 @@ _outFkConstraint(StringInfo str, FkConst
  	WRITE_BOOL_FIELD(skip_validation);
  }
  
@@ -2900,7 +2987,7 @@
  
  /*
   * _outNode -
-@@ -2438,6 +2479,15 @@ _outNode(StringInfo str, void *obj)
+@@ -2438,6 +2483,15 @@ _outNode(StringInfo str, void *obj)
  			case T_XmlSerialize:
  				_outXmlSerialize(str, obj);
  				break;
@@ -6077,8 +6164,8 @@
 +}
 diff -rpNU3 base/src/backend/security/sepgsql/hooks.c sepgsql/src/backend/security/sepgsql/hooks.c
 --- base/src/backend/security/sepgsql/hooks.c	1970-01-01 09:00:00.000000000 +0900
-+++ sepgsql/src/backend/security/sepgsql/hooks.c	2008-07-11 14:10:51.000000000 +0900
-@@ -0,0 +1,882 @@
++++ sepgsql/src/backend/security/sepgsql/hooks.c	2008-09-22 17:51:21.000000000 +0900
+@@ -0,0 +1,892 @@
 +/*
 + * src/backend/security/sepgsql/hooks.c
 + *	  implementations of PGACE framework
@@ -6674,21 +6761,31 @@
 +}
 +
 +/* ----------------------------------------------------------
-+ * special cases in foreign key constraint
++ * special cases for Foreign Key constraint
 + * ---------------------------------------------------------- */
 +void
-+sepgsqlPreparePlanCheck(Relation rel, Datum *pgace_saved)
++sepgsqlBeginPerformCheckFK(Relation rel, bool is_primary, Datum *save_pgace)
 +{
-+	/* store the current status */
-+	*pgace_saved = BoolGetDatum(abort_on_violated_tuple);
++	/*
++	 * NOTE: when a tuple is inserted/updated on FK side, all we should do
++	 * is simply filtering violated tuples on PK size, as normal row-level
++	 * access control doin.
++	 * In the result, INSERT/UPDATE with invisible tuple is failed.
++	 */
++	if (is_primary)
++		return;
 +
++	*save_pgace = BoolGetDatum(abort_on_violated_tuple);
 +	abort_on_violated_tuple = true;
 +}
 +
 +void
-+sepgsqlRestorePlanCheck(Relation rel, Datum pgace_saved)
++sepgsqlEndPerformCheckFK(Relation rel, bool is_primary, Datum save_pgace)
 +{
-+	abort_on_violated_tuple = DatumGetBool(pgace_saved);
++	if (is_primary)
++		return;
++
++	abort_on_violated_tuple = DatumGetBool(save_pgace);
 +}
 +
 +/*******************************************************************************
@@ -9126,7 +9223,7 @@
  			/*
 diff -rpNU3 base/src/backend/utils/adt/ri_triggers.c sepgsql/src/backend/utils/adt/ri_triggers.c
 --- base/src/backend/utils/adt/ri_triggers.c	2008-06-12 22:34:19.000000000 +0900
-+++ sepgsql/src/backend/utils/adt/ri_triggers.c	2008-06-14 02:36:58.000000000 +0900
++++ sepgsql/src/backend/utils/adt/ri_triggers.c	2008-09-22 17:51:21.000000000 +0900
 @@ -37,6 +37,7 @@
  #include "parser/parse_coerce.h"
  #include "parser/parse_relation.h"
@@ -9135,34 +9232,42 @@
  #include "utils/acl.h"
  #include "utils/fmgroids.h"
  #include "utils/lsyscache.h"
-@@ -3202,6 +3203,7 @@ ri_PlanCheck(const char *querystr, int n
- 	Relation	query_rel;
+@@ -3256,6 +3257,7 @@ ri_PerformCheck(RI_QueryKey *qkey, SPIPl
+ 	int			spi_result;
  	Oid			save_userid;
  	bool		save_secdefcxt;
 +	Datum		save_pgace;
+ 	Datum		vals[RI_MAX_NUMKEYS * 2];
+ 	char		nulls[RI_MAX_NUMKEYS * 2];
  
- 	/*
- 	 * The query is always run against the FK table except when this is an
-@@ -3219,7 +3221,18 @@ ri_PlanCheck(const char *querystr, int n
+@@ -3336,11 +3338,22 @@ ri_PerformCheck(RI_QueryKey *qkey, SPIPl
+ 	GetUserIdAndContext(&save_userid, &save_secdefcxt);
  	SetUserIdAndContext(RelationGetForm(query_rel)->relowner, true);
  
- 	/* Create the plan */
--	qplan = SPI_prepare(querystr, nargs, argtypes);
-+	pgacePreparePlanCheck(query_rel, &save_pgace);
+-	/* Finally we can run the query. */
+-	spi_result = SPI_execute_snapshot(qplan,
+-									  vals, nulls,
+-									  test_snapshot, crosscheck_snapshot,
+-									  false, false, limit);
++	pgaceBeginPerformCheckFK(query_rel, query_rel == pk_rel, &save_pgace);
 +	PG_TRY();
 +	{
-+		qplan = SPI_prepare(querystr, nargs, argtypes);
++		/* Finally we can run the query. */
++		spi_result = SPI_execute_snapshot(qplan,
++										  vals, nulls,
++										  test_snapshot, crosscheck_snapshot,
++										  false, false, limit);
 +	}
 +	PG_CATCH();
 +	{
-+		pgaceRestorePlanCheck(query_rel, save_pgace);
++		pgaceEndPerformCheckFK(query_rel, query_rel == pk_rel, save_pgace);
 +		PG_RE_THROW();
 +	}
 +	PG_END_TRY();
-+	pgaceRestorePlanCheck(query_rel, save_pgace);
++	pgaceEndPerformCheckFK(query_rel, query_rel == pk_rel, save_pgace);
  
- 	if (qplan == NULL)
- 		elog(ERROR, "SPI_prepare returned %d for %s", SPI_result, querystr);
+ 	/* Restore UID */
+ 	SetUserIdAndContext(save_userid, save_secdefcxt);
 diff -rpNU3 base/src/backend/utils/cache/catcache.c sepgsql/src/backend/utils/cache/catcache.c
 --- base/src/backend/utils/cache/catcache.c	2008-03-19 09:48:23.000000000 +0900
 +++ sepgsql/src/backend/utils/cache/catcache.c	2008-06-14 02:36:58.000000000 +0900
@@ -9882,8 +9987,8 @@
  
 diff -rpNU3 base/src/include/security/pgace.h sepgsql/src/include/security/pgace.h
 --- base/src/include/security/pgace.h	1970-01-01 09:00:00.000000000 +0900
-+++ sepgsql/src/include/security/pgace.h	2008-07-11 14:10:51.000000000 +0900
-@@ -0,0 +1,1183 @@
++++ sepgsql/src/include/security/pgace.h	2008-09-22 17:51:21.000000000 +0900
+@@ -0,0 +1,1202 @@
 +/*
 + * include/security/pgace.h
 + *    headers for PostgreSQL Access Control Extension (PGACE)
@@ -10018,7 +10123,7 @@
 +}
 +
 +/*
-+ * pgaceInitialize
++ * pgaceStartupWorkerProcess
 + *
 + * The guest can create a worker process in this hook, if necessary.
 + * (currently, PGACE does not support multiple worker processes.)
@@ -10621,39 +10726,40 @@
 +}
 +
 +/*
-+ * pgacePreparePlanCheck
++ * pgaceBeginPerformCheckFK
 + *
-+ * This hook is invoked just before FK/PK constraint checks.
-+ * The guest can change its state during FK/PK constraint checks,
-+ * and restore it on pgaceRestorePlanCheck().
-+ * If it needs an opaque data, pgace_saved can be used to store
-+ * an opaque data.
++ * This hook is invoked just before performing FK constraint checks.
++ * The guest can change its internal state during the checks.
++ * The major purpose of this function is to prevent violation of
++ * integrity consistentency violation due to row-level access control.
++ * If the guest requires an opaque data, save_pgace can be used
++ * to store it.
 + */
 +static inline void
-+pgacePreparePlanCheck(Relation rel, Datum *pgace_saved)
++pgaceBeginPerformCheckFK(Relation rel, bool rel_is_primary, Datum *save_pgace)
 +{
 +#ifdef HAVE_SELINUX
 +	if (sepgsqlIsEnabled())
 +	{
-+		sepgsqlPreparePlanCheck(rel, pgace_saved);
++		sepgsqlBeginPerformCheckFK(rel, rel_is_primary, save_pgace);
 +		return;
 +	}
 +#endif
 +}
 +
 +/*
-+ * pgaceRestorePlanCheck
++ * pgaceEndPerformCheckFK
 + *
-+ * This hook is invoked just after FK/PK constraint checks.
-+ * When the guest change something, it can be restored in this hook.
++ * This hook is invoked just after performing FK constraint checks.
++ * The guest can restore its internal state using this hook.
 + */
 +static inline void
-+pgaceRestorePlanCheck(Relation rel, Datum pgace_saved)
++pgaceEndPerformCheckFK(Relation rel, bool rel_is_primary, Datum save_pgace)
 +{
 +#ifdef HAVE_SELINUX
 +	if (sepgsqlIsEnabled())
 +	{
-+		sepgsqlRestorePlanCheck(rel, pgace_saved);
++		sepgsqlEndPerformCheckFK(rel, rel_is_primary, save_pgace);
 +		return;
 +	}
 +#endif
@@ -11066,11 +11172,29 @@
 +#define TextDatumGetCString(x)					\
 +	(DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(x))))
 +
++/******************************************************************
++ * SQL function declaration related to PGACE security framework
++ ******************************************************************/
++
++/*
++ * SE-PostgreSQL SQL FUNCTIONS
++ */
++extern Datum sepgsql_getcon(PG_FUNCTION_ARGS);
++extern Datum sepgsql_getservcon(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 // PGACE_H
 diff -rpNU3 base/src/include/security/sepgsql.h sepgsql/src/include/security/sepgsql.h
 --- base/src/include/security/sepgsql.h	1970-01-01 09:00:00.000000000 +0900
-+++ sepgsql/src/include/security/sepgsql.h	2008-07-11 14:10:51.000000000 +0900
-@@ -0,0 +1,223 @@
++++ sepgsql/src/include/security/sepgsql.h	2008-09-22 17:51:21.000000000 +0900
+@@ -0,0 +1,208 @@
 +/*
 + * src/include/security/sepgsql.h
 + *    headers for Security-Enhanced PostgreSQL (SE-PostgreSQL)
@@ -11176,9 +11300,9 @@
 +
 +extern bool sepgsqlCallFunctionTrigger(FmgrInfo *finfo, TriggerData *tgdata);
 +
-+extern void sepgsqlPreparePlanCheck(Relation rel, Datum *pgace_saved);
++extern void sepgsqlBeginPerformCheckFK(Relation rel, bool rel_is_primary, Datum *save_pgace);
 +
-+extern void sepgsqlRestorePlanCheck(Relation rel, Datum pgace_saved);
++extern void sepgsqlEndPerformCheckFK(Relation rel, bool rel_is_primary, Datum save_pgace);
 +
 +/* TABLE related hooks */
 +extern void sepgsqlLockTable(Oid relid);
@@ -11278,21 +11402,6 @@
 +
 +extern bool sepgsqlCheckTuplePerms(Relation rel, HeapTuple tuple,
 +								   HeapTuple oldtup, uint32 perms, bool abort);
-+
-+/*
-+ * SE-PostgreSQL SQL FUNCTIONS
-+ */
-+extern Datum sepgsql_getcon(PG_FUNCTION_ARGS);
-+extern Datum sepgsql_getservcon(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 -rpNU3 base/src/include/storage/fd.h sepgsql/src/include/storage/fd.h
 --- base/src/include/storage/fd.h	2008-01-07 23:51:33.000000000 +0900


Index: sepostgresql.8
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.8,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sepostgresql.8	1 Sep 2007 13:07:32 -0000	1.1
+++ sepostgresql.8	23 Sep 2008 02:04:13 -0000	1.2
@@ -4,47 +4,67 @@
 sepostgresql \- Security-Enhances PostgreSQL
 
 .SH "DESCRIPTION"
-Security-Enhanced PostgreSQL (SE-PostgreSQL) is an enhancement of PostgreSQL, to apply fine grained mandatory access control for database objects based on the security policy of SELinux. 
-These features enable to apply flexible integrated access control policy between operating system and database management system, during all stages of the life of the information.
+Security-Enhanced PostgreSQL (SE-PostgreSQL) is an enhancement of PostgreSQL,
+to apply fine grained mandatory access control for database objects based on
+the security policy of SELinux. 
+These features enable to apply flexible integrated access control policy
+on both of operating system and database management system, during all
+stages of the life of the information.
 .PP
-This document describes the way to customize SE-PostgreSQL on the default security policy.
+This document describes the way to customize SE-PostgreSQL on the default
+security policy.
 
 .SH "BOOLEANS"
-The SELinux policy is customizable via BOOLEAN variable. This variable has two states, 1 (on) or 0 (off). A part of the policy is enabled or disabled depending on related boolean variables.
-
-\fBsepgsql_enable_unconfined\fP toggles whether \fIunconfined_t\fP and \fIsysadm_t\fP domains are allowed to access database objects without any restruction on type enforcement, or not.
-When \fIsepgsql_enable_unconfined\fP is off, those domains are also restricted its operation as other domains begin applied. In the default, it is set to on.
-You can set it as follows:
+The SELinux policy is customizable via BOOLEAN variable. This variable has
+two states, 1 (on) or 0 (off). We can validate or invalidate a part of the
+security policy depending on the state of boolean variables.
+
+\fBsepgsql_enable_users_ddl\fP enables to toggle permissions of confined
+users/applications to invoke DDL statement, like CREATE TABLE. It is set to
+\fBon\fP in the default.
+In most cases, DDL statements are used to set up initial database structure,
+and permissions to invoke them are not necessary on operation phase.
+You can turn off this boolean as follows:
 
 .EX
-setsebool -P sepgsql_enable_unconfined ( \fBon\fP | off )
+setsebool -P sepgsql_enable_users_ddl ( \fBon\fP | off )
 .EE
 
-\fBsepgsql_enable_users_ddl\fP toggles whether non-administrative domain is allowed to use DDL statement like CREATE TABLE and so on.
-In the default, it is set to on. You can set it as follows:
+Rest of booleans are provided by \fBselinux-devel.pp\fP policy module.
+It provides developments/debugs related permissions.
+You can install it as follows:
 
 .EX
-setsebool -P sepgsql_enable_users_ddl ( \fBon\fP | off )
+semodule -i /usr/share/selinux/targeted/sepostgresql-devel.pp
 .EE
 
-\fBsepgsql_enable_auditallow\fP toggles output of audit messages in the case when required permission checks are allowed. In the default, it is set to off. You can set it as follows:
+\fBsepgsql_enable_auditallow\fP toggles output of audit messages in the case
+when required permission checks are allowed, except for tuples because it
+easily make a flood of audit logs.
+In the default, it is set to off. You can set it as follows:
 
 .EX
 setsebool -P sepgsql_enable_auditallow ( on | \fBoff\fP )
 .EE
 
-\fBsepgsql_enable_auditdeny\fP toggles output of audit messages in the case when required permission checks are denied. In the default, it is set to on. You can set it as follows:
+\fBsepgsql_enable_auditdeny\fP toggles output of audit messages in the case
+when required permission checks are denied, except for tuples because it
+easily make a flood of audit logs.
+In the default, it is set to on. You can set it as follows:
 
 .EX
 setsebool -P sepgsql_enable_auditdeny ( \fBon\fP | off )
 .EE
 
-\fBsepgsql_enable_audittuple\fP toggles output of audit messages for any tuple. Because audit messages for tuples in a large size table can cause flood of messages, we can set \fIsepgsql_enable_audittuple\fP independently from any other object classes.
-Audit messages for tuples are generated in the only case when \fIsepgsql_enable_audittuple\fP and either \fIsepgsql_enable_auditallow\fP or \fIsepgsql_enable_auditdeny\fP are enabled.
+\fBsepgsql_regression_test_mode\fP allows to load shared libraries deployed
+on user's home directory. We recommend you to keep \fBoff\fP in operation
+phase to prevent to load malicious libraries.
+However, typical PostgreSQL regression test requires to load it, so we
+have to reduce several restriction during the test.
 In the default, it is set to off. You can set it as follows:
 
 .EX
-setsebool -P sepgsql_enable_audittuple ( on | \fBoff\fP )
+setsebool -P sepgsql_regression_test_mode ( on | \fBoff\fP )
 .EE
 
 .SH "TYPES"
@@ -53,29 +73,46 @@
 It is attched for newly created databases in the default.
 
 \fBsepgsql_table_t\fP is a type for tables, columns and tuples.
-It is attached for newly created the objects in the default.
-Non-administrative clients can do any kinds of operations except for relabeling.
+It is the default type of newly created tables by unconfined or
+non-roled domain. It allows confined clietns to access with any
+kind of operations except for relabeling, so we can use this type
+for compatible purpose.
 
 \fBsepgsql_secret_table_t\fP is a type for tables, columns and tuples.
-Non-administrative clients cannot access the objects with this type.
+It never allows confined clients to access, so we can use this type
+to store sensitive information. We reccomend to apply trusted procedures
+to access tables/columns/tuples with this type under safe operation.
 
 \fBsepgsql_ro_table_t\fP is a type for read-only tables, columns and tuples.
-Non-administrative clients cannot modify the objects with this type.
+It does not allow confined clients to modify any objects with this type.
 
-\fBsepgsql_fixed_table_t\fP is a type for non-manupulatable tables, columns and tuples.
-Non-administrative clients cannot update or delete the objects with this type.
+\fBsepgsql_fixed_table_t\fP is a type for non-manupulatable tables, columns
+and tuples. It does not allow confined clients to update or delete any
+objects with this type.
+
+\fBsepgsql_ROLE_table_t\fP is a type for a role specific tables, columns
+and tuples. It allows confined clients with its role to access with any
+kind of operations except for relabeling.
+It is the default type of newly created tables by confined clients with
+its role, and we can use this type to describe role level separation.
 
 \fBsepgsql_proc_t\fP is a type for procedures.
-It is attached for newly created procedures by adminictrative domain.
-Any client can call these procedures with this type.
-
-\fBsepgsql_userproc_t\fP is a type for procedures.
-It is attached for newly created procedures by non-administrative domain.
-Administrative domains cannot call the procedure for safety. He have to relabel it into \fIsepgsql_proc_t\fP at first. It is a policy to avoid to execute doubtful code under administrative domain.
-
-\fBsepgsql_trusted_proc_t\fP is a type for trusted procedures.
-Calling procedures with this type invokes domain transition.
-Then the function works as an administrative domain, so database administrator can provide limited path to access protected object.
+It is attached for newly created procedures by unconfined clients.
+It allows any clients to invoke procedures with this type.
+All of PostgreSQL built-in functions are labeled as this type in the default.
+
+\fBsepgsql_ROLE_proc_t\fP is a type for a role specific procedure.
+It is attached for newly created procedures by confined clients with its role.
+It allows clients with same role to invoke procedure with this type.
+Note that unconfined clients cannot invoke this type to avoid to execute
+dangerous functions with unconfined authorities. They have to confirm its
+contains and relabel to \fBsepgsql_proc_t\fP for its invocation.
+
+\fBsepgsql_trusted_proc_exec_t\fP is a type for trusted procedures.
+To call procedures with this type invokes domain transition to
+unconfined domain, so it can access any kind of database objects.
+We can use this type to provide a secure method to access sensitive
+information.
 
 \fBsepgsql_blob_t\fP is a type for binary large objects (blob).
 It is attached for newly created blob in the default.


Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.init,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sepostgresql.init	13 Aug 2008 13:54:49 -0000	1.22
+++ sepostgresql.init	23 Sep 2008 02:04:13 -0000	1.23
@@ -9,7 +9,7 @@
 
 PGVERSION="8.3.3"
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'`
-SEPGVERSION="2.964"
+SEPGVERSION="2.1042"
 
 # source function library
 . /etc/rc.d/init.d/functions


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sepostgresql.spec	13 Aug 2008 13:54:49 -0000	1.23
+++ sepostgresql.spec	23 Sep 2008 02:04:13 -0000	1.24
@@ -24,7 +24,7 @@
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
 Version: 8.3.3
-Release: 2.964%{?sepgsql_extension}%{?dist}
+Release: 2.1042%{?sepgsql_extension}%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/



From mclasen at fedoraproject.org  Tue Sep 23 02:24:03 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 02:24:03 +0000 (UTC)
Subject: rpms/libgweather/devel libgweather.spec,1.24,1.25
Message-ID: <20080923022403.AD14E70033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgweather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22578

Modified Files:
	libgweather.spec 
Log Message:
add %lang tags to localized xml files



Index: libgweather.spec
===================================================================
RCS file: /cvs/extras/rpms/libgweather/devel/libgweather.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libgweather.spec	22 Sep 2008 23:31:36 -0000	1.24
+++ libgweather.spec	23 Sep 2008 02:23:33 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           libgweather
 Version:        2.24.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library for weather information 
 
 Group:          System Environment/Libraries
@@ -64,6 +64,10 @@
 
 %find_lang %{name}
 
+# do the %%lang tag game for the localized xml files, too
+find $RPM_BUILD_ROOT -name Locations.*.xml | sed 's:'"$RPM_BUILD_ROOT"'::
+s:\(.*\)/Locations\.\([^.]*\)\.xml:%lang(\2) \1/Locations.\2.xml:' >> %{name}.lang
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -92,7 +96,9 @@
 %doc COPYING
 %{_sysconfdir}/gconf/schemas/gweather.schemas
 %{_libdir}/libgweather.so.*
-%{_datadir}/libgweather
+%dir %{_datadir}/libgweather
+%{_datadir}/libgweather/Locations.xml
+%{_datadir}/libgweather/locations.dtd
 
 %files devel
 %defattr(-,root,root,-)
@@ -102,6 +108,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> 2.24.0-2
+- Apply %%lang tags to localized xml files
+
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> 2.24.0-1
 - Update to 2.24.0
 



From phuang at fedoraproject.org  Tue Sep 23 02:26:04 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 23 Sep 2008 02:26:04 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.12, 1.13 ibus.spec, 1.15, 1.16 sources,
	1.15, 1.16
Message-ID: <20080923022604.0A8E770033@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23145

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 0.1.1.20080923


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Sep 2008 13:31:12 -0000	1.12
+++ .cvsignore	23 Sep 2008 02:25:33 -0000	1.13
@@ -1 +1 @@
-ibus-0.1.1.20080917.tar.gz
+ibus-0.1.1.20080923.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ibus.spec	17 Sep 2008 13:31:12 -0000	1.15
+++ ibus.spec	23 Sep 2008 02:25:33 -0000	1.16
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define mod_path ibus-0.1
 Name:       ibus
-Version:    0.1.1.20080917
+Version:    0.1.1.20080923
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -121,6 +121,9 @@
 %{_libdir}/qt4/plugins/inputmethods/libibus.so
 
 %changelog
+* Tue Sep 23 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080923-1
+- Update to 0.1.1.20080923.
+
 * Wed Sep 17 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080917-1
 - Update to 0.1.1.20080917.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	17 Sep 2008 14:06:49 -0000	1.15
+++ sources	23 Sep 2008 02:25:33 -0000	1.16
@@ -1 +1 @@
-5dc60488fe2f30895e2bbf9a9a6010c4  ibus-0.1.1.20080917.tar.gz
+6ffdfc6779d709b75b382dbe948288a4  ibus-0.1.1.20080923.tar.gz



From mclasen at fedoraproject.org  Tue Sep 23 02:29:58 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 02:29:58 +0000 (UTC)
Subject: rpms/gtk2/devel gtk2.spec,1.324,1.325
Message-ID: <20080923022958.7F3EF70033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23653

Modified Files:
	gtk2.spec 
Log Message:
Rebuild



Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- gtk2.spec	22 Sep 2008 15:50:08 -0000	1.324
+++ gtk2.spec	23 Sep 2008 02:29:28 -0000	1.325
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
@@ -34,6 +34,7 @@
 Patch3: info-leak.patch
 # fixed upstream
 Patch4: gail-leaks.patch
+Patch5: bad-filechooser.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -122,6 +123,7 @@
 %patch2 -p1 -b .workaround
 %patch3 -p1 -b .info-leak
 %patch4 -p1 -b .gail-leaks
+%patch5 -p0 -b .bad-filechooser 
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -305,6 +307,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.2-4
+- Rebuild
+
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.2-3
 - BR libXdamage-devel (#462971, Owen Taylor)
 - Plug some memory leaks



From mclasen at fedoraproject.org  Tue Sep 23 02:31:44 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 02:31:44 +0000 (UTC)
Subject: rpms/gtk2/devel bad-filechooser.patch,NONE,1.1
Message-ID: <20080923023144.E677370033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23983

Added Files:
	bad-filechooser.patch 
Log Message:
add patch


bad-filechooser.patch:

--- NEW FILE bad-filechooser.patch ---
Index: gtk/gtkfilechooserdefault.c
===================================================================
--- gtk/gtkfilechooserdefault.c	(revision 21491)
+++ gtk/gtkfilechooserdefault.c	(working copy)
@@ -456,6 +456,7 @@
                                               GtkTreeIter           *child_iter,
                                               GtkTreeIter           *iter);
 static void     set_file_system_backend      (GtkFileChooserDefault *impl);
+static void     unset_file_system_backend    (GtkFileChooserDefault *impl);
 
 
 
@@ -923,6 +924,8 @@
   GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (object);
   GSList *l;
 
+  unset_file_system_backend (impl);
+
   if (impl->shortcuts_pane_filter_model)
     g_object_unref (impl->shortcuts_pane_filter_model);
 
@@ -5373,6 +5376,19 @@
   profile_end ("end", NULL);
 }
 
+static void
+unset_file_system_backend (GtkFileChooserDefault *impl)
+{
+  g_signal_disconnect_by_func (impl->file_system, "volumes-changed",
+		               G_CALLBACK (volumes_bookmarks_changed_cb), impl);
+  g_signal_disconnect_by_func (impl->file_system, "bookmarks-changed",
+		               G_CALLBACK (volumes_bookmarks_changed_cb), impl);
+
+  g_object_unref (impl->file_system);
+
+  impl->file_system = NULL;
+}
+
 /* This function is basically a do_all function.
  *
  * It sets the visibility on all the widgets based on the current state, and



From mclasen at fedoraproject.org  Tue Sep 23 02:33:17 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 02:33:17 +0000 (UTC)
Subject: rpms/gtk2/devel gtk2.spec,1.325,1.326
Message-ID: <20080923023317.AD98770033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24094

Modified Files:
	gtk2.spec 
Log Message:
fix spec



Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- gtk2.spec	23 Sep 2008 02:29:28 -0000	1.325
+++ gtk2.spec	23 Sep 2008 02:32:47 -0000	1.326
@@ -16,7 +16,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.14/gtk+-%{version}.tar.bz2
@@ -307,8 +307,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
-* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.2-4
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.2-5
 - Rebuild
+- Fix a filechooser crash
 
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.2-3
 - BR libXdamage-devel (#462971, Owen Taylor)



From phuang at fedoraproject.org  Tue Sep 23 02:34:31 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 23 Sep 2008 02:34:31 +0000 (UTC)
Subject: rpms/ibus/devel ibus.spec,1.16,1.17
Message-ID: <20080923023431.10A1370033@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24255

Modified Files:
	ibus.spec 
Log Message:
Disable checking iso-codes


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ibus.spec	23 Sep 2008 02:25:33 -0000	1.16
+++ ibus.spec	23 Sep 2008 02:34:00 -0000	1.17
@@ -52,7 +52,7 @@
 %setup -q
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-iso-codes-check
 # make -C po update-gmo
 make %{?_smp_mflags}
 



From phuang at fedoraproject.org  Tue Sep 23 02:40:01 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 23 Sep 2008 02:40:01 +0000 (UTC)
Subject: rpms/ibus/devel ibus.spec,1.17,1.18
Message-ID: <20080923024001.BC45B70033@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25056

Modified Files:
	ibus.spec 
Log Message:
Add requires iso-codes


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ibus.spec	23 Sep 2008 02:34:00 -0000	1.17
+++ ibus.spec	23 Sep 2008 02:39:31 -0000	1.18
@@ -23,6 +23,7 @@
 Requires:   dbus-python >= 0.83.0
 Requires:   gnome-python2-gconf
 Requires:   pyxdg
+Requires:   iso-codes
 
 %description
 IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides



From phuang at fedoraproject.org  Tue Sep 23 02:41:13 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 23 Sep 2008 02:41:13 +0000 (UTC)
Subject: rpms/ibus/F-9 .cvsignore, 1.9, 1.10 ibus.spec, 1.11, 1.12 sources, 
	1.12, 1.13
Message-ID: <20080923024113.89A9070033@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25272

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 0.1.1.20080923


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	17 Sep 2008 13:52:36 -0000	1.9
+++ .cvsignore	23 Sep 2008 02:40:43 -0000	1.10
@@ -1 +1 @@
-ibus-0.1.1.20080917.tar.gz
+ibus-0.1.1.20080923.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/ibus.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ibus.spec	17 Sep 2008 13:52:36 -0000	1.11
+++ ibus.spec	23 Sep 2008 02:40:43 -0000	1.12
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define mod_path ibus-0.1
 Name:       ibus
-Version:    0.1.1.20080917
+Version:    0.1.1.20080923
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -23,6 +23,7 @@
 Requires:   dbus-python >= 0.83.0
 Requires:   gnome-python2-gconf
 Requires:   pyxdg
+Requires:   iso-codes
 
 %description
 IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides
@@ -52,7 +53,7 @@
 %setup -q
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-iso-codes-check
 # make -C po update-gmo
 make %{?_smp_mflags}
 
@@ -121,6 +122,9 @@
 %{_libdir}/qt4/plugins/inputmethods/libibus.so
 
 %changelog
+* Tue Sep 23 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080923-1
+- Update to 0.1.1.20080923.
+
 * Wed Sep 17 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080917-1
 - Update to 0.1.1.20080917.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Sep 2008 14:11:24 -0000	1.12
+++ sources	23 Sep 2008 02:40:43 -0000	1.13
@@ -1 +1 @@
-5dc60488fe2f30895e2bbf9a9a6010c4  ibus-0.1.1.20080917.tar.gz
+6ffdfc6779d709b75b382dbe948288a4  ibus-0.1.1.20080923.tar.gz



From behdad at fedoraproject.org  Tue Sep 23 02:42:22 2008
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Tue, 23 Sep 2008 02:42:22 +0000 (UTC)
Subject: rpms/cairo/devel .cvsignore, 1.44, 1.45 cairo.spec, 1.92,
	1.93 sources, 1.44, 1.45
Message-ID: <20080923024222.0E84E70033@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25574

Modified Files:
	.cvsignore cairo.spec sources 
Log Message:
Update to 1.7.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cairo/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	12 Aug 2008 01:53:46 -0000	1.44
+++ .cvsignore	23 Sep 2008 02:41:51 -0000	1.45
@@ -1 +1 @@
-cairo-1.7.4.tar.gz
+cairo-1.7.6.tar.gz


Index: cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- cairo.spec	12 Aug 2008 01:53:46 -0000	1.92
+++ cairo.spec	23 Sep 2008 02:41:51 -0000	1.93
@@ -4,7 +4,7 @@
 
 Summary:	A vector graphics library
 Name:		cairo
-Version:	1.7.4
+Version:	1.7.6
 Release:	1%{?dist}
 URL:		http://cairographics.org
 Source0:	http://cairographics.org/releases/%{name}-%{version}.tar.gz
@@ -85,6 +85,9 @@
 %{_datadir}/gtk-doc/html/cairo
 
 %changelog
+* Mon Sep 22 2008 Behdad Esfahbod <besfahbo at redhat.com> 1.7.6-1
+- Update to 1.7.6
+
 * Mon Aug 11 2008 Matthias Clasen <mclasen at redhat.com> 1.7.4-1
 - Update to 1.7.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cairo/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	12 Aug 2008 01:53:46 -0000	1.44
+++ sources	23 Sep 2008 02:41:51 -0000	1.45
@@ -1 +1 @@
-7583b6ff663a708fbfe1501c74d8fd77  cairo-1.7.4.tar.gz
+c612f581b18903b0751a171685fc38dd  cairo-1.7.6.tar.gz



From dchen at fedoraproject.org  Tue Sep 23 02:43:49 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue, 23 Sep 2008 02:43:49 +0000 (UTC)
Subject: rpms/libUnihan/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 libUnihan.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080923024349.BB53670033@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libUnihan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25953/devel

Modified Files:
	.cvsignore import.log libUnihan.spec sources 
Log Message:
PinYin and ZhuYin format conversion support.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2008 05:21:10 -0000	1.2
+++ .cvsignore	23 Sep 2008 02:43:19 -0000	1.3
@@ -1 +1 @@
-libUnihan-0.4.1-Source.tar.gz
+libUnihan-0.5.0-Source.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Sep 2008 05:21:10 -0000	1.1
+++ import.log	23 Sep 2008 02:43:19 -0000	1.2
@@ -1 +1,2 @@
 libUnihan-0_4_1-1_fc9:HEAD:libUnihan-0.4.1-1.fc9.src.rpm:1220245157
+libUnihan-0_5_0-0_fc9:HEAD:libUnihan-0.5.0-0.fc9.src.rpm:1222137766


Index: libUnihan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/devel/libUnihan.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libUnihan.spec	1 Sep 2008 05:21:10 -0000	1.1
+++ libUnihan.spec	23 Sep 2008 02:43:19 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           libUnihan
 %define         libUnihan_ver_major 0
-%define         libUnihan_ver_minor 4
-Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.1
-Release:        1%{?dist}
+%define         libUnihan_ver_minor 5
+Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.0
+Release:        0%{?dist}
 Group:          System Environment/Libraries
 License:        LGPLv2+
 Summary:        C library for Unihan character database in fifth normal form 
@@ -86,6 +86,26 @@
 
 
 %changelog
+* Tue Sep 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.5.0-0
+- New Features:
+  + PinYin accent format conversion functions (C and SQL scalar).
+  + ZhuYin tone mark format conversion functions (C and SQL scalar).
+  + PinYin <-->  ZhuYin conversion functions (C and SQL scalar).
+  + Display as ZhuYin.
+- Fixed:
+  + Correct counting in FreqRank field of kMandarin table.
+  + The query functions such as unihan_find_all_matched() returns SQL_Results type, to avoid the memory leaking problems.
+- Changed:
+  + unihanDb_open() now supports the R/W control.
+  + Changed CMakefile.txt to reflects the version scheme change of UnihanDb
+  + StringList type for storing const string arrays.
+  + Add test suite.
+  + Where-clause-generator is now able to escape the quote character(').
+  + unihan_field_validation is moved to test/, therefore it will not be in binary package.
+  + New make targets: rpm and srpm to generate rpm and srpm.
+- Removed:
+  + unihanSql_get_result_table(). As it uses sqlite3_get_table() which might cause memory leak.
+
 * Mon Aug 11 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.4.1-1
 - [Bug 453520] C#10 addressed.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2008 05:21:10 -0000	1.2
+++ sources	23 Sep 2008 02:43:19 -0000	1.3
@@ -1 +1 @@
-315d731a5fed989853d6aaf324729149  libUnihan-0.4.1-Source.tar.gz
+f7cc02c3764bc692a588024e72ddcc00  libUnihan-0.5.0-Source.tar.gz



From dchen at fedoraproject.org  Tue Sep 23 02:45:06 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue, 23 Sep 2008 02:45:06 +0000 (UTC)
Subject: rpms/libUnihan/F-9 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 libUnihan.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080923024506.E783D7013E@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libUnihan/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26232/F-9

Modified Files:
	.cvsignore import.log libUnihan.spec sources 
Log Message:
PinYin and ZhuYin format conversion support.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2008 05:37:47 -0000	1.2
+++ .cvsignore	23 Sep 2008 02:44:36 -0000	1.3
@@ -1 +1 @@
-libUnihan-0.4.1-Source.tar.gz
+libUnihan-0.5.0-Source.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Sep 2008 05:37:47 -0000	1.1
+++ import.log	23 Sep 2008 02:44:36 -0000	1.2
@@ -1 +1,2 @@
 libUnihan-0_4_1-1_fc9:F-9:libUnihan-0.4.1-1.fc9.src.rpm:1220247194
+libUnihan-0_5_0-0_fc9:F-9:libUnihan-0.5.0-0.fc9.src.rpm:1222137869


Index: libUnihan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/F-9/libUnihan.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libUnihan.spec	1 Sep 2008 05:37:47 -0000	1.1
+++ libUnihan.spec	23 Sep 2008 02:44:36 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           libUnihan
 %define         libUnihan_ver_major 0
-%define         libUnihan_ver_minor 4
-Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.1
-Release:        1%{?dist}
+%define         libUnihan_ver_minor 5
+Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.0
+Release:        0%{?dist}
 Group:          System Environment/Libraries
 License:        LGPLv2+
 Summary:        C library for Unihan character database in fifth normal form 
@@ -86,6 +86,26 @@
 
 
 %changelog
+* Tue Sep 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.5.0-0
+- New Features:
+  + PinYin accent format conversion functions (C and SQL scalar).
+  + ZhuYin tone mark format conversion functions (C and SQL scalar).
+  + PinYin <-->  ZhuYin conversion functions (C and SQL scalar).
+  + Display as ZhuYin.
+- Fixed:
+  + Correct counting in FreqRank field of kMandarin table.
+  + The query functions such as unihan_find_all_matched() returns SQL_Results type, to avoid the memory leaking problems.
+- Changed:
+  + unihanDb_open() now supports the R/W control.
+  + Changed CMakefile.txt to reflects the version scheme change of UnihanDb
+  + StringList type for storing const string arrays.
+  + Add test suite.
+  + Where-clause-generator is now able to escape the quote character(').
+  + unihan_field_validation is moved to test/, therefore it will not be in binary package.
+  + New make targets: rpm and srpm to generate rpm and srpm.
+- Removed:
+  + unihanSql_get_result_table(). As it uses sqlite3_get_table() which might cause memory leak.
+
 * Mon Aug 11 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.4.1-1
 - [Bug 453520] C#10 addressed.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2008 05:37:47 -0000	1.2
+++ sources	23 Sep 2008 02:44:36 -0000	1.3
@@ -1 +1 @@
-315d731a5fed989853d6aaf324729149  libUnihan-0.4.1-Source.tar.gz
+f7cc02c3764bc692a588024e72ddcc00  libUnihan-0.5.0-Source.tar.gz



From dchen at fedoraproject.org  Tue Sep 23 02:46:15 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue, 23 Sep 2008 02:46:15 +0000 (UTC)
Subject: rpms/libUnihan/F-8 import.log, 1.1, 1.2 libUnihan.spec, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080923024615.CFF1270033@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libUnihan/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26677/F-8

Modified Files:
	import.log libUnihan.spec sources 
Log Message:
PinYin and ZhuYin format conversion support.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/F-8/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Sep 2008 23:34:55 -0000	1.1
+++ import.log	23 Sep 2008 02:45:45 -0000	1.2
@@ -1 +1,2 @@
 libUnihan-0_4_1-1_fc9:F-8:libUnihan-0.4.1-1.fc9.src.rpm:1221694440
+libUnihan-0_5_0-0_fc9:F-8:libUnihan-0.5.0-0.fc9.src.rpm:1222137937


Index: libUnihan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/F-8/libUnihan.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libUnihan.spec	17 Sep 2008 23:34:55 -0000	1.1
+++ libUnihan.spec	23 Sep 2008 02:45:45 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           libUnihan
 %define         libUnihan_ver_major 0
-%define         libUnihan_ver_minor 4
-Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.1
-Release:        1%{?dist}
+%define         libUnihan_ver_minor 5
+Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.0
+Release:        0%{?dist}
 Group:          System Environment/Libraries
 License:        LGPLv2+
 Summary:        C library for Unihan character database in fifth normal form 
@@ -86,6 +86,26 @@
 
 
 %changelog
+* Tue Sep 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.5.0-0
+- New Features:
+  + PinYin accent format conversion functions (C and SQL scalar).
+  + ZhuYin tone mark format conversion functions (C and SQL scalar).
+  + PinYin <-->  ZhuYin conversion functions (C and SQL scalar).
+  + Display as ZhuYin.
+- Fixed:
+  + Correct counting in FreqRank field of kMandarin table.
+  + The query functions such as unihan_find_all_matched() returns SQL_Results type, to avoid the memory leaking problems.
+- Changed:
+  + unihanDb_open() now supports the R/W control.
+  + Changed CMakefile.txt to reflects the version scheme change of UnihanDb
+  + StringList type for storing const string arrays.
+  + Add test suite.
+  + Where-clause-generator is now able to escape the quote character(').
+  + unihan_field_validation is moved to test/, therefore it will not be in binary package.
+  + New make targets: rpm and srpm to generate rpm and srpm.
+- Removed:
+  + unihanSql_get_result_table(). As it uses sqlite3_get_table() which might cause memory leak.
+
 * Mon Aug 11 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.4.1-1
 - [Bug 453520] C#10 addressed.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 23:34:55 -0000	1.1
+++ sources	23 Sep 2008 02:45:45 -0000	1.2
@@ -1 +1 @@
-315d731a5fed989853d6aaf324729149  libUnihan-0.4.1-Source.tar.gz
+f7cc02c3764bc692a588024e72ddcc00  libUnihan-0.5.0-Source.tar.gz



From dchen at fedoraproject.org  Tue Sep 23 02:47:47 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue, 23 Sep 2008 02:47:47 +0000 (UTC)
Subject: rpms/libUnihan/EL-5 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 libUnihan.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080923024747.B245F70033@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libUnihan/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27064/EL-5

Modified Files:
	.cvsignore import.log libUnihan.spec sources 
Log Message:
PinYin and ZhuYin format conversion support.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2008 06:10:19 -0000	1.2
+++ .cvsignore	23 Sep 2008 02:47:17 -0000	1.3
@@ -1 +1 @@
-libUnihan-0.4.1-Source.tar.gz
+libUnihan-0.5.0-Source.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Sep 2008 06:10:19 -0000	1.1
+++ import.log	23 Sep 2008 02:47:17 -0000	1.2
@@ -1 +1,2 @@
 libUnihan-0_4_1-1_fc9:EL-5:libUnihan-0.4.1-1.fc9.src.rpm:1220247605
+libUnihan-0_5_0-0_fc9:EL-5:libUnihan-0.5.0-0.fc9.src.rpm:1222138007


Index: libUnihan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/EL-5/libUnihan.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libUnihan.spec	1 Sep 2008 06:10:19 -0000	1.1
+++ libUnihan.spec	23 Sep 2008 02:47:17 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           libUnihan
 %define         libUnihan_ver_major 0
-%define         libUnihan_ver_minor 4
-Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.1
-Release:        1%{?dist}
+%define         libUnihan_ver_minor 5
+Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.0
+Release:        0%{?dist}
 Group:          System Environment/Libraries
 License:        LGPLv2+
 Summary:        C library for Unihan character database in fifth normal form 
@@ -86,6 +86,26 @@
 
 
 %changelog
+* Tue Sep 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.5.0-0
+- New Features:
+  + PinYin accent format conversion functions (C and SQL scalar).
+  + ZhuYin tone mark format conversion functions (C and SQL scalar).
+  + PinYin <-->  ZhuYin conversion functions (C and SQL scalar).
+  + Display as ZhuYin.
+- Fixed:
+  + Correct counting in FreqRank field of kMandarin table.
+  + The query functions such as unihan_find_all_matched() returns SQL_Results type, to avoid the memory leaking problems.
+- Changed:
+  + unihanDb_open() now supports the R/W control.
+  + Changed CMakefile.txt to reflects the version scheme change of UnihanDb
+  + StringList type for storing const string arrays.
+  + Add test suite.
+  + Where-clause-generator is now able to escape the quote character(').
+  + unihan_field_validation is moved to test/, therefore it will not be in binary package.
+  + New make targets: rpm and srpm to generate rpm and srpm.
+- Removed:
+  + unihanSql_get_result_table(). As it uses sqlite3_get_table() which might cause memory leak.
+
 * Mon Aug 11 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.4.1-1
 - [Bug 453520] C#10 addressed.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2008 06:10:19 -0000	1.2
+++ sources	23 Sep 2008 02:47:17 -0000	1.3
@@ -1 +1 @@
-315d731a5fed989853d6aaf324729149  libUnihan-0.4.1-Source.tar.gz
+f7cc02c3764bc692a588024e72ddcc00  libUnihan-0.5.0-Source.tar.gz



From behdad at fedoraproject.org  Tue Sep 23 02:52:53 2008
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Tue, 23 Sep 2008 02:52:53 +0000 (UTC)
Subject: rpms/pango/devel pango.spec,1.145,1.146
Message-ID: <20080923025253.F02B170033@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27764

Modified Files:
	pango.spec 
Log Message:
Rebuild against new cairo



Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- pango.spec	22 Sep 2008 23:55:01 -0000	1.145
+++ pango.spec	23 Sep 2008 02:52:23 -0000	1.146
@@ -1,15 +1,15 @@
-%define glib2_base_version 2.14.0
+%define glib2_base_version 2.17.3
 %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 cairo_version 1.2.2
+%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.22.0
-Release: 1%{?dist}
+Release: 1.1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/pango/1.22/pango-%{version}.tar.bz2
@@ -218,6 +218,10 @@
 
 
 %changelog
+* Mon Sep 22 2008 Behdad Esfahbod <besfahbo at redhat.com> - 1.22.0-1.1
+- Rebuild against cairo 1.7.6
+- Update cairo and glib required versions
+
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 1.22.0-1
 - Update to 1.22.0
 



From dcantrel at fedoraproject.org  Tue Sep 23 03:14:41 2008
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 23 Sep 2008 03:14:41 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.570, 1.571 anaconda.spec, 1.712, 
	1.713 sources, 1.704, 1.705
Message-ID: <20080923031441.2A69C70033@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30508

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Mon Sep 22 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.39-1
- Fix a traceback when getting the interface settings (#462592). (clumens)
- self.anaconda -> anaconda (clumens)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.570
retrieving revision 1.571
diff -u -r1.570 -r1.571
--- .cvsignore	21 Sep 2008 03:06:15 -0000	1.570
+++ .cvsignore	23 Sep 2008 03:14:10 -0000	1.571
@@ -1 +1 @@
-anaconda-11.4.1.38.tar.bz2
+anaconda-11.4.1.39.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.712
retrieving revision 1.713
diff -u -r1.712 -r1.713
--- anaconda.spec	21 Sep 2008 03:06:15 -0000	1.712
+++ anaconda.spec	23 Sep 2008 03:14:10 -0000	1.713
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.4.1.38
+Version: 11.4.1.39
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -205,6 +205,10 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Sep 22 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.39-1
+- Fix a traceback when getting the interface settings (#462592). (clumens)
+- self.anaconda -> anaconda (clumens)
+
 * Sat Sep 20 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.38-1
 - Restore old lang-names generation method (dcantrell)
 - Remount /mnt/sysimage/dev after migrating filesystems. (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.704
retrieving revision 1.705
diff -u -r1.704 -r1.705
--- sources	21 Sep 2008 03:06:15 -0000	1.704
+++ sources	23 Sep 2008 03:14:10 -0000	1.705
@@ -1 +1 @@
-8ee02e3e02a89bafa83316983600b394  anaconda-11.4.1.38.tar.bz2
+74e03b1146ba24bb2ad917f04b85a877  anaconda-11.4.1.39.tar.bz2



From mathstuf at fedoraproject.org  Tue Sep 23 03:21:32 2008
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 23 Sep 2008 03:21:32 +0000 (UTC)
Subject: rpms/krazy2/devel import.log, NONE,
	1.1 krazy2-passbyvalue-libsuffix.patch, NONE, 1.1 krazy2.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080923032132.7250670033@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29468/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log krazy2-passbyvalue-libsuffix.patch krazy2.spec 
Log Message:
* Mon Sep 22 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.19.20080907svn262
- Initial import



--- NEW FILE import.log ---
krazy2-2_6-4_20080918svn862357_fc9:HEAD:krazy2-2.6-4.20080918svn862357.fc9.src.rpm:1222139026

krazy2-passbyvalue-libsuffix.patch:

--- NEW FILE krazy2-passbyvalue-libsuffix.patch ---
diff -r -U 5 src/passbyvalue/passbyvalue.pro src/passbyvalue/passbyvalue.pro
--- src/passbyvalue/passbyvalue.pro	2008-09-13 11:58:09.000000000 -0400
+++ src/passbyvalue/passbyvalue.pro	2008-09-17 20:38:46.000000000 -0400
@@ -9,8 +9,8 @@
 
 # Input
 SOURCES += passbyvalue.cpp
 
 # install
-target.path = $$[INSTALL_ROOT]/lib/krazy2/krazy-plugins/c++
-sources.path = $$[INSTALL_ROOT]/lib/krazy2/krazy-plugins/c++/passbyvalue
+target.path = $$[INSTALL_ROOT]/lib$(LIBSUFFIX)/krazy2/krazy-plugins/c++
+sources.path = $$[INSTALL_ROOT]/lib$(LIBSUFFIX)/krazy2/krazy-plugins/c++/passbyvalue
 INSTALLS += target sources


--- NEW FILE krazy2.spec ---
Name:           krazy2
Version:        2.6
Release:        4.20080918svn862357%{?dist}
Summary:        Krazy is a tool for checking code against the KDE coding guidelines

Group:          Development/Libraries
License:        GPLv2+
URL:            http://techbase.kde.org/Development/Tutorials/Code_Checking
# The source for this package was pulled from upstream's vcs.  Use the
# following commands to generate the tarball:
#  svn export -r 862357 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.6
#  tar -c krazy2-2.6 | bzip2 --best -c > krazy2-2.6.tar.bz2
Source0:        krazy2-%{version}.tar.bz2
Patch0:         krazy2-passbyvalue-libsuffix.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  groff
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(HTML::Parser)
BuildRequires:  perl(Tie::IxHash)
BuildRequires:  perl(XML::LibXML)
BuildRequires:  qt4-devel
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:       desktop-file-utils

%description
Krazy scans KDE source code looking for issues that should be fixed
for reasons of policy, good coding practice, optimization, or any other
good reason.


%prep
%setup -q
%patch0


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make
pushd src/passbyvalue
%{_qt4_qmake}
make %{?_smp_mflags}
popd


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
chmod 0755 %{buildroot}%{_bindir}/krazy2{,all,ebn}
pushd helpers
make DESTDIR=%{buildroot} PREFIX=%{_prefix} \
    %if "%{_lib}" == "lib64"
        LIBSUFFIX=64 \
    %endif
    install
popd
pushd plugins
make PREFIX=%{buildroot}%{_prefix} \
    %if "%{_lib}" == "lib64"
        LIBSUFFIX=64 \
    %endif
    install
popd
pushd extras
make DESTDIR=%{buildroot} PREFIX=%{_prefix} \
    %if "%{_lib}" == "lib64"
        LIBSUFFIX=64 \
    %endif
    install
popd
pushd src/passbyvalue
make INSTALL_ROOT=%{buildroot}%{_prefix} \
    %if "%{_lib}" == "lib64"
        LIBSUFFIX=64 \
    %endif
    install
popd
pushd share
mkdir -p %{buildroot}%{_datadir}/dtd
install -m 644 -p kpartgui.dtd %{buildroot}%{_datadir}/dtd/kpartgui.dtd
install -m 644 -p kcfg.dtd %{buildroot}%{_datadir}/dtd/kcfg.dtd
popd
pushd doc
make DESTDIR=%{buildroot}%{_mandir} install
popd
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
# chmod -R ug+w %{buildroot}%{_bindir}
# chmod -R ug+w %{buildroot}%{_libdir}


%check


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README
%{_mandir}/man1/krazy2.1.gz
%{_mandir}/man1/krazy2all.1.gz
%{_mandir}/man1/krazy2ebn.1.gz
%{_mandir}/man5/krazyrc.5.gz
%{_bindir}/krazy2
%{_bindir}/krazy2all
%{_bindir}/krazy2ebn
%{_libdir}/krazy2
%{_datadir}/dtd
%{perl_vendorlib}/Krazy


%changelog
* Thu Sep 18 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-4.20080918svn862357
- Updated SVN
- Spec file cleaned up

* Thu Sep 18 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-3
- Fixed where the plugins get installed to

* Wed Sep 17 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-2
- Fixed the rpmlint errors

* Wed Sep 17 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-1
- Fixed the spec file up

* Wed May 21 2008 Ben Boeckel <MathStuf at gmail.com> 1.11-1
- Created


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2008 00:31:39 -0000	1.1
+++ .cvsignore	23 Sep 2008 03:21:02 -0000	1.2
@@ -0,0 +1 @@
+krazy2-2.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2008 00:31:39 -0000	1.1
+++ sources	23 Sep 2008 03:21:02 -0000	1.2
@@ -0,0 +1 @@
+c1b62bb886755bf028e08e4ad3ee41bd  krazy2-2.6.tar.bz2



From mathstuf at fedoraproject.org  Tue Sep 23 03:25:57 2008
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 23 Sep 2008 03:25:57 +0000 (UTC)
Subject: rpms/krazy2/F-9 import.log, NONE,
	1.1 krazy2-passbyvalue-libsuffix.patch, NONE, 1.1 krazy2.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080923032557.EFFB070033@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32025/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log krazy2-passbyvalue-libsuffix.patch krazy2.spec 
Log Message:
* Mon Sep 22 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.19.20080907svn262
- Initial import



--- NEW FILE import.log ---
krazy2-2_6-4_20080918svn862357_fc9:F-9:krazy2-2.6-4.20080918svn862357.fc9.src.rpm:1222140097

krazy2-passbyvalue-libsuffix.patch:

--- NEW FILE krazy2-passbyvalue-libsuffix.patch ---
diff -r -U 5 src/passbyvalue/passbyvalue.pro src/passbyvalue/passbyvalue.pro
--- src/passbyvalue/passbyvalue.pro	2008-09-13 11:58:09.000000000 -0400
+++ src/passbyvalue/passbyvalue.pro	2008-09-17 20:38:46.000000000 -0400
@@ -9,8 +9,8 @@
 
 # Input
 SOURCES += passbyvalue.cpp
 
 # install
-target.path = $$[INSTALL_ROOT]/lib/krazy2/krazy-plugins/c++
-sources.path = $$[INSTALL_ROOT]/lib/krazy2/krazy-plugins/c++/passbyvalue
+target.path = $$[INSTALL_ROOT]/lib$(LIBSUFFIX)/krazy2/krazy-plugins/c++
+sources.path = $$[INSTALL_ROOT]/lib$(LIBSUFFIX)/krazy2/krazy-plugins/c++/passbyvalue
 INSTALLS += target sources


--- NEW FILE krazy2.spec ---
Name:           krazy2
Version:        2.6
Release:        4.20080918svn862357%{?dist}
Summary:        Krazy is a tool for checking code against the KDE coding guidelines

Group:          Development/Libraries
License:        GPLv2+
URL:            http://techbase.kde.org/Development/Tutorials/Code_Checking
# The source for this package was pulled from upstream's vcs.  Use the
# following commands to generate the tarball:
#  svn export -r 862357 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.6
#  tar -c krazy2-2.6 | bzip2 --best -c > krazy2-2.6.tar.bz2
Source0:        krazy2-%{version}.tar.bz2
Patch0:         krazy2-passbyvalue-libsuffix.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  groff
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(HTML::Parser)
BuildRequires:  perl(Tie::IxHash)
BuildRequires:  perl(XML::LibXML)
BuildRequires:  qt4-devel
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:       desktop-file-utils

%description
Krazy scans KDE source code looking for issues that should be fixed
for reasons of policy, good coding practice, optimization, or any other
good reason.


%prep
%setup -q
%patch0


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make
pushd src/passbyvalue
%{_qt4_qmake}
make %{?_smp_mflags}
popd


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
chmod 0755 %{buildroot}%{_bindir}/krazy2{,all,ebn}
pushd helpers
make DESTDIR=%{buildroot} PREFIX=%{_prefix} \
    %if "%{_lib}" == "lib64"
        LIBSUFFIX=64 \
    %endif
    install
popd
pushd plugins
make PREFIX=%{buildroot}%{_prefix} \
    %if "%{_lib}" == "lib64"
        LIBSUFFIX=64 \
    %endif
    install
popd
pushd extras
make DESTDIR=%{buildroot} PREFIX=%{_prefix} \
    %if "%{_lib}" == "lib64"
        LIBSUFFIX=64 \
    %endif
    install
popd
pushd src/passbyvalue
make INSTALL_ROOT=%{buildroot}%{_prefix} \
    %if "%{_lib}" == "lib64"
        LIBSUFFIX=64 \
    %endif
    install
popd
pushd share
mkdir -p %{buildroot}%{_datadir}/dtd
install -m 644 -p kpartgui.dtd %{buildroot}%{_datadir}/dtd/kpartgui.dtd
install -m 644 -p kcfg.dtd %{buildroot}%{_datadir}/dtd/kcfg.dtd
popd
pushd doc
make DESTDIR=%{buildroot}%{_mandir} install
popd
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
# chmod -R ug+w %{buildroot}%{_bindir}
# chmod -R ug+w %{buildroot}%{_libdir}


%check


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README
%{_mandir}/man1/krazy2.1.gz
%{_mandir}/man1/krazy2all.1.gz
%{_mandir}/man1/krazy2ebn.1.gz
%{_mandir}/man5/krazyrc.5.gz
%{_bindir}/krazy2
%{_bindir}/krazy2all
%{_bindir}/krazy2ebn
%{_libdir}/krazy2
%{_datadir}/dtd
%{perl_vendorlib}/Krazy


%changelog
* Thu Sep 18 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-4.20080918svn862357
- Updated SVN
- Spec file cleaned up

* Thu Sep 18 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-3
- Fixed where the plugins get installed to

* Wed Sep 17 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-2
- Fixed the rpmlint errors

* Wed Sep 17 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-1
- Fixed the spec file up

* Wed May 21 2008 Ben Boeckel <MathStuf at gmail.com> 1.11-1
- Created


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2008 00:31:39 -0000	1.1
+++ .cvsignore	23 Sep 2008 03:25:27 -0000	1.2
@@ -0,0 +1 @@
+krazy2-2.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2008 00:31:39 -0000	1.1
+++ sources	23 Sep 2008 03:25:27 -0000	1.2
@@ -0,0 +1 @@
+c1b62bb886755bf028e08e4ad3ee41bd  krazy2-2.6.tar.bz2



From mathstuf at fedoraproject.org  Tue Sep 23 03:27:42 2008
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 23 Sep 2008 03:27:42 +0000 (UTC)
Subject: rpms/krazy2/F-8 import.log, NONE,
	1.1 krazy2-passbyvalue-libsuffix.patch, NONE, 1.1 krazy2.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080923032742.DAC0270033@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32445/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log krazy2-passbyvalue-libsuffix.patch krazy2.spec 
Log Message:
* Mon Sep 22 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.19.20080907svn262
- Initial import



--- NEW FILE import.log ---
krazy2-2_6-4_20080918svn862357_fc9:F-8:krazy2-2.6-4.20080918svn862357.fc9.src.rpm:1222140324

krazy2-passbyvalue-libsuffix.patch:

--- NEW FILE krazy2-passbyvalue-libsuffix.patch ---
diff -r -U 5 src/passbyvalue/passbyvalue.pro src/passbyvalue/passbyvalue.pro
--- src/passbyvalue/passbyvalue.pro	2008-09-13 11:58:09.000000000 -0400
+++ src/passbyvalue/passbyvalue.pro	2008-09-17 20:38:46.000000000 -0400
@@ -9,8 +9,8 @@
 
 # Input
 SOURCES += passbyvalue.cpp
 
 # install
-target.path = $$[INSTALL_ROOT]/lib/krazy2/krazy-plugins/c++
-sources.path = $$[INSTALL_ROOT]/lib/krazy2/krazy-plugins/c++/passbyvalue
+target.path = $$[INSTALL_ROOT]/lib$(LIBSUFFIX)/krazy2/krazy-plugins/c++
+sources.path = $$[INSTALL_ROOT]/lib$(LIBSUFFIX)/krazy2/krazy-plugins/c++/passbyvalue
 INSTALLS += target sources


--- NEW FILE krazy2.spec ---
Name:           krazy2
Version:        2.6
Release:        4.20080918svn862357%{?dist}
Summary:        Krazy is a tool for checking code against the KDE coding guidelines

Group:          Development/Libraries
License:        GPLv2+
URL:            http://techbase.kde.org/Development/Tutorials/Code_Checking
# The source for this package was pulled from upstream's vcs.  Use the
# following commands to generate the tarball:
#  svn export -r 862357 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.6
#  tar -c krazy2-2.6 | bzip2 --best -c > krazy2-2.6.tar.bz2
Source0:        krazy2-%{version}.tar.bz2
Patch0:         krazy2-passbyvalue-libsuffix.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  groff
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(HTML::Parser)
BuildRequires:  perl(Tie::IxHash)
BuildRequires:  perl(XML::LibXML)
BuildRequires:  qt4-devel
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:       desktop-file-utils

%description
Krazy scans KDE source code looking for issues that should be fixed
for reasons of policy, good coding practice, optimization, or any other
good reason.


%prep
%setup -q
%patch0


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make
pushd src/passbyvalue
%{_qt4_qmake}
make %{?_smp_mflags}
popd


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
chmod 0755 %{buildroot}%{_bindir}/krazy2{,all,ebn}
pushd helpers
make DESTDIR=%{buildroot} PREFIX=%{_prefix} \
    %if "%{_lib}" == "lib64"
        LIBSUFFIX=64 \
    %endif
    install
popd
pushd plugins
make PREFIX=%{buildroot}%{_prefix} \
    %if "%{_lib}" == "lib64"
        LIBSUFFIX=64 \
    %endif
    install
popd
pushd extras
make DESTDIR=%{buildroot} PREFIX=%{_prefix} \
    %if "%{_lib}" == "lib64"
        LIBSUFFIX=64 \
    %endif
    install
popd
pushd src/passbyvalue
make INSTALL_ROOT=%{buildroot}%{_prefix} \
    %if "%{_lib}" == "lib64"
        LIBSUFFIX=64 \
    %endif
    install
popd
pushd share
mkdir -p %{buildroot}%{_datadir}/dtd
install -m 644 -p kpartgui.dtd %{buildroot}%{_datadir}/dtd/kpartgui.dtd
install -m 644 -p kcfg.dtd %{buildroot}%{_datadir}/dtd/kcfg.dtd
popd
pushd doc
make DESTDIR=%{buildroot}%{_mandir} install
popd
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
# chmod -R ug+w %{buildroot}%{_bindir}
# chmod -R ug+w %{buildroot}%{_libdir}


%check


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README
%{_mandir}/man1/krazy2.1.gz
%{_mandir}/man1/krazy2all.1.gz
%{_mandir}/man1/krazy2ebn.1.gz
%{_mandir}/man5/krazyrc.5.gz
%{_bindir}/krazy2
%{_bindir}/krazy2all
%{_bindir}/krazy2ebn
%{_libdir}/krazy2
%{_datadir}/dtd
%{perl_vendorlib}/Krazy


%changelog
* Thu Sep 18 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-4.20080918svn862357
- Updated SVN
- Spec file cleaned up

* Thu Sep 18 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-3
- Fixed where the plugins get installed to

* Wed Sep 17 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-2
- Fixed the rpmlint errors

* Wed Sep 17 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-1
- Fixed the spec file up

* Wed May 21 2008 Ben Boeckel <MathStuf at gmail.com> 1.11-1
- Created


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2008 00:31:39 -0000	1.1
+++ .cvsignore	23 Sep 2008 03:27:12 -0000	1.2
@@ -0,0 +1 @@
+krazy2-2.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2008 00:31:39 -0000	1.1
+++ sources	23 Sep 2008 03:27:12 -0000	1.2
@@ -0,0 +1 @@
+c1b62bb886755bf028e08e4ad3ee41bd  krazy2-2.6.tar.bz2



From transif at fedoraproject.org  Tue Sep 23 03:42:50 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Tue, 23 Sep 2008 03:42:50 +0000 (UTC)
Subject: comps/po fr.po,1.16,1.17
Message-ID: <20080923034250.9390D70033@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1813/po

Modified Files:
	fr.po 
Log Message:
    2008-09-23  Corina Roe <croe at redhat.com> (via croe at fedoraproject.org)
    
      * po/fr.po: French translation updated
    



Index: fr.po
===================================================================
RCS file: /cvs/pkgs/comps/po/fr.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- fr.po	17 Sep 2008 22:44:34 -0000	1.16
+++ fr.po	23 Sep 2008 03:42:20 -0000	1.17
@@ -1,26 +1,29 @@
+# translation of comps.HEAD.fr.po to French
 # French translation of comps
 # This file is distributed under the same license as the comps package.
 # Copyright (C) 2006-2008 Fedora Project.
 #
+#
 # Audrey Simons <asimons at redhat.com>, 2003, 2004.
 # Thomas Canniot <mrtom at fedoraproject.org>, 2006, 2007, 2008.
 # Damien Durand <splinux at fedoraproject.org>, 2006.
 # Decroux Fabien <fdecroux at redhat.com>, 2006.
 # Gauthier Ancelin <gauthier.ancelin at laposte.net>, 2008.
 # Micha??l Ughetto <telimektar1er at gmail.com>, 2008.
-# Robert-Andr?? Mauchin <zebob.m at pengzone.org>, 2008
-#
+# Robert-Andr?? Mauchin <zebob.m at pengzone.org>, 2008.
+# Corina Roe <croe at redhat.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: comps.HEAD\n"
+"Project-Id-Version: comps.HEAD.fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-09-01 02:01+0200\n"
-"Last-Translator: Robert-Andr?? Mauchin <zebob.m at pengzone.org>\n"
-"Language-Team: Fedora French <fedora-trans-fr at redhat.com>\n"
+"POT-Creation-Date: 2008-09-23 01:23+0000\n"
+"PO-Revision-Date: 2008-09-23 13:38+1000\n"
+"Last-Translator: Corina Roe <croe at redhat.com>\n"
+"Language-Team: French <i18 at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bitPlural-Forms: nplurals=2; plural=n>1;\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
@@ -402,21 +405,18 @@
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
 #: ../comps-f10.xml.in.h:80 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
-msgstr ""
-"Installer ces paquets pour d??velopper les applications graphiques QT et KDE."
+msgstr "Installer ces paquets pour d??velopper les applications graphiques QT et KDE."
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:81
-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 ""
 "Installer ces outils pour habiliter le syst??me ?? imprimer ou agir comme un "
 "serveur d'impression."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
 #: ../comps-f10.xml.in.h:82 ../comps-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 ""
 "Installer ce groupe de paquets pour utiliser l'interface utilisateur "
 "graphique de base (X)."
@@ -657,8 +657,7 @@
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
 #: ../comps-f10.xml.in.h:143 ../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 ""
 "Simples gestionnaires de fen??tres n'appartenant ?? aucun environnement de "
 "bureau."
@@ -788,8 +787,7 @@
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
 #: ../comps-f10.xml.in.h:169
-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 ""
 "Les paquets de ce groupe sont des biblioth??ques centrales n??cessaires au "
 "d??veloppement d'applications."
@@ -803,24 +801,21 @@
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
 #: ../comps-f10.xml.in.h:171
-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 ""
 "Ces paquets vous permettent de d??velopper des applications pour le syst??me X "
 "Window."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:162
 #: ../comps-f10.xml.in.h:172 ../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 ""
 "Ces paquets sont utiles pour d??velopper des applications web ou des pages "
 "web."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:163
 #: ../comps-f10.xml.in.h:173
-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 ""
 "Ces paquets comprennent des serveurs concernant le r??seau comme DHCP, "
 "Kerberos et NIS."
@@ -887,8 +882,7 @@
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:172
 #: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
-msgstr ""
-"Ce groupe vous permet de configurer le syst??me comme un serveur de news."
+msgstr "Ce groupe vous permet de configurer le syst??me comme un serveur de news."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:173
 #: ../comps-f10.xml.in.h:183
@@ -950,16 +944,14 @@
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
 #: ../comps-f10.xml.in.h:190 ../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 ""
 "Ce groupe comprend un ensemble d'outils et de ressources pour les "
 "environnements en arm??nien."
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:181
 #: ../comps-f10.xml.in.h:191 ../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 "Ce groupe comprend un ensemble d'outils pour du mat??riel sp??cifique."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:182
@@ -974,8 +966,7 @@
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
 #: ../comps-f10.xml.in.h:193
-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 ""
 "Ce groupe de paquets vous permet d'ex??cuter un serveur de noms DNS (BIND) "
 "sur le syst??me."
@@ -1188,9 +1179,8 @@
 msgstr "Prise en charge du wallon"
 
 #: ../comps-f10.xml.in.h:70
-#, fuzzy
 msgid "Haskell Development"
-msgstr "D??veloppement web"
+msgstr "D??veloppement Haskell"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
@@ -1201,45 +1191,38 @@
 msgstr "Paquets de m??thodes de saisie de textes internationaux."
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "Prise en charge du khmer"
+msgstr "Prise en charge du Kachm??r??"
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "Prise en charge du cor??en"
+msgstr "Prise en charge du Konkani"
 
 #: ../comps-f10.xml.in.h:110
-#, fuzzy
 msgid "Maithili Support"
-msgstr "Prise en charge du marathi"
+msgstr "Prise en charge du Maithili"
 
 #: ../comps-f10.xml.in.h:117
-#, fuzzy
 msgid "Myanmar (Burmese) Support"
-msgstr "Prise en charge du vietnamien"
+msgstr "Prise en charge du Birman"
 
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "Prise en charge de l'hindi"
+msgstr "Prise en charge du Sindhi"
 
 #: ../comps-f10.xml.in.h:156
-#, fuzzy
 msgid "Support for developing programs in the Haskell programming language."
 msgstr ""
 "Prise en charge du d??veloppement d'applications en langage de programmation "
-"Java"
+"Haskell"
 
 #: ../comps-f10.xml.in.h:163
 msgid "Tajik Support"
 msgstr "Prise en charge du tadjik"
 
 #: ../comps-f10.xml.in.h:205
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "Prise en charge du tch??que"
+msgstr "Prise en charge de l'Ouzbek"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1294,22 +1277,19 @@
 "sp??cifiques"
 
 #: ../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 ""
 "Ce groupe comprend un ensemble d'outils et de ressources pour les "
 "environnements en arabe."
 
 #: ../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 ""
 "Ce groupe comprend un ensemble d'outils et de ressources pour les "
 "environnements en h??breu."
 
 #: ../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 ""
 "Ce groupe comprend un ensemble d'outils et de ressources pour les "
 "environnements en japonais."
@@ -1319,11 +1299,8 @@
 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 ""
 "Ce groupe comprend un ensemble d'outils et de ressources pour les "
 "environnements en tch??que."
 
-#~ msgid "Haskell"
-#~ msgstr "Haskell"



From mclasen at fedoraproject.org  Tue Sep 23 03:45:14 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 03:45:14 +0000 (UTC)
Subject: rpms/evince/devel .cvsignore, 1.51, 1.52 evince.spec, 1.131,
	1.132 sources, 1.50, 1.51
Message-ID: <20080923034514.DBB1570033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/evince/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2077

Modified Files:
	.cvsignore evince.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	10 Sep 2008 01:19:04 -0000	1.51
+++ .cvsignore	23 Sep 2008 03:44:44 -0000	1.52
@@ -1 +1 @@
-evince-2.23.92.tar.bz2
+evince-2.24.0.tar.bz2


Index: evince.spec
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/evince.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- evince.spec	12 Sep 2008 13:57:01 -0000	1.131
+++ evince.spec	23 Sep 2008 03:44:44 -0000	1.132
@@ -5,14 +5,14 @@
 %define theme_version 2.17.1
 
 Name:		evince
-Version:	2.23.92
-Release:	2%{?dist}
+Version:	2.24.0
+Release:	1%{?dist}
 Summary:	Document viewer
 
 License: 	GPLv2+ and GFDL
 Group:		Applications/Publishing
 URL:		http://www.gnome.org/projects/evince/
-Source0: 	http://download.gnome.org/sources/%{name}/2.23/%{name}-%{version}.tar.bz2
+Source0: 	http://download.gnome.org/sources/%{name}/2.24/%{name}-%{version}.tar.bz2
 Patch0:		evince-0.6.0-print-error.patch
 Patch1:		duplex-copies.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -232,6 +232,9 @@
 %{_libdir}/evince/backends/djvudocument.evince-backend
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Fri Sep  12 2008 Marek Kasik <mkasik at redhat.com> - 2.23.92-2
 - fix duplex printing of copies
 - upstream bug #455759


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	10 Sep 2008 01:19:04 -0000	1.50
+++ sources	23 Sep 2008 03:44:44 -0000	1.51
@@ -1 +1 @@
-2615136c97934b490aa0d61037a73775  evince-2.23.92.tar.bz2
+7d0f9850b0f33267d3977532f027ac95  evince-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 23 03:47:27 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 03:47:27 +0000 (UTC)
Subject: rpms/alacarte/devel .cvsignore, 1.11, 1.12 alacarte.spec, 1.40,
	1.41 sources, 1.11, 1.12
Message-ID: <20080923034727.0D52670103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/alacarte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2429

Modified Files:
	.cvsignore alacarte.spec sources 
Log Message:
0.11.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alacarte/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	11 Mar 2008 03:35:24 -0000	1.11
+++ .cvsignore	23 Sep 2008 03:46:56 -0000	1.12
@@ -1 +1 @@
-alacarte-0.11.5.tar.bz2
+alacarte-0.11.6.tar.bz2


Index: alacarte.spec
===================================================================
RCS file: /cvs/extras/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- alacarte.spec	11 Mar 2008 03:35:24 -0000	1.40
+++ alacarte.spec	23 Sep 2008 03:46:56 -0000	1.41
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           alacarte
-Version:        0.11.5
+Version:        0.11.6
 Release:        1%{?dist}
 Summary:        Simple menu editor for GNOME
 
@@ -64,6 +64,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/alacarte.svg
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 0.11.6-1
+- Update to 0.11.6
+
 * Mon Mar 10 2008 Matthias Clasen <mclasen at redhat.com> - 0.11.5-1
 - Update to 0.11.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alacarte/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	11 Mar 2008 03:35:24 -0000	1.11
+++ sources	23 Sep 2008 03:46:56 -0000	1.12
@@ -1 +1 @@
-e4dc193d36c76b974e66e517e9c7ea33  alacarte-0.11.5.tar.bz2
+de6535f728a8000795753623c46e8378  alacarte-0.11.6.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 23 03:51:16 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 03:51:16 +0000 (UTC)
Subject: rpms/eog/devel .cvsignore, 1.69, 1.70 eog.spec, 1.121, 1.122 sources,
	1.69, 1.70
Message-ID: <20080923035116.1267D70033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/eog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3284

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	9 Sep 2008 01:35:36 -0000	1.69
+++ .cvsignore	23 Sep 2008 03:50:45 -0000	1.70
@@ -1 +1 @@
-eog-2.23.92.tar.bz2
+eog-2.24.0.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/eog.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- eog.spec	9 Sep 2008 01:35:36 -0000	1.121
+++ eog.spec	23 Sep 2008 03:50:45 -0000	1.122
@@ -13,10 +13,10 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.23.92
+Version: 2.24.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source: http://download.gnome.org/sources/eog/2.23/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/eog/2.24/%{name}-%{version}.tar.bz2
 # needs to be redone
 #Patch0: eog-2.19.4-svgz.patch
 # The GFDL has an "or later version" clause embedded inside the license.
@@ -155,6 +155,9 @@
 %{_datadir}/gtk-doc/html/eog
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	9 Sep 2008 01:35:36 -0000	1.69
+++ sources	23 Sep 2008 03:50:45 -0000	1.70
@@ -1 +1 @@
-b9790f4beb1dda69d4e4182f5e3be63b  eog-2.23.92.tar.bz2
+9a8cb17555df81980ac0492715a195e3  eog-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 23 03:55:30 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 03:55:30 +0000 (UTC)
Subject: rpms/alacarte/devel alacarte.spec,1.41,1.42
Message-ID: <20080923035530.F125E70033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/alacarte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3823

Modified Files:
	alacarte.spec 
Log Message:
hate, intltool, hate



Index: alacarte.spec
===================================================================
RCS file: /cvs/extras/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- alacarte.spec	23 Sep 2008 03:46:56 -0000	1.41
+++ alacarte.spec	23 Sep 2008 03:55:00 -0000	1.42
@@ -2,7 +2,7 @@
 
 Name:           alacarte
 Version:        0.11.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple menu editor for GNOME
 
 Group:          Applications/System
@@ -16,6 +16,7 @@
 BuildRequires:  pygtk2-devel
 BuildRequires:  pkgconfig
 BuildRequires:  gnome-menus-devel >= 2.15.4
+BuildRequires:  intltool
 Requires:       pygtk2, gnome-python2-gconf
 Requires:       gnome-menus >= 2.15.4
 
@@ -64,7 +65,7 @@
 %{_datadir}/icons/hicolor/scalable/apps/alacarte.svg
 
 %changelog
-* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 0.11.6-1
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 0.11.6-2
 - Update to 0.11.6
 
 * Mon Mar 10 2008 Matthias Clasen <mclasen at redhat.com> - 0.11.5-1



From corsepiu at fedoraproject.org  Tue Sep 23 03:56:16 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 23 Sep 2008 03:56:16 +0000 (UTC)
Subject: rpms/rt3/devel rt-3.8.1-test-dependencies.diff,NONE,1.1
Message-ID: <20080923035616.CA05870033@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4116

Added Files:
	rt-3.8.1-test-dependencies.diff 
Log Message:
New.

rt-3.8.1-test-dependencies.diff:

--- NEW FILE rt-3.8.1-test-dependencies.diff ---
--- rt-3.8.1.orig/sbin/rt-test-dependencies.in	2008-09-22 10:24:58.000000000 +0200
+++ rt-3.8.1/sbin/rt-test-dependencies.in	2008-08-18 17:13:58.000000000 +0200
@@ -280,7 +280,6 @@
 
 $deps{'DEV'} = [ text_to_hash( << '.') ];
 HTML::Form
-HTML::TokeParser
 WWW::Mechanize
 Test::WWW::Mechanize 1.04
 Module::Refresh 0.03



From corsepiu at fedoraproject.org  Tue Sep 23 03:57:25 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 23 Sep 2008 03:57:25 +0000 (UTC)
Subject: rpms/rt3/devel rt-3.8.1-Makefile.diff, NONE,
	1.1 rt-3.8.1-config.diff, NONE, 1.1
Message-ID: <20080923035725.3185470033@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4329

Added Files:
	rt-3.8.1-Makefile.diff rt-3.8.1-config.diff 
Log Message:
New.

rt-3.8.1-Makefile.diff:

--- NEW FILE rt-3.8.1-Makefile.diff ---
--- rt-3.8.1.orig/Makefile.in	2008-08-18 17:13:58.000000000 +0200
+++ rt-3.8.1/Makefile.in	2008-09-09 15:45:00.000000000 +0200
@@ -281,7 +281,7 @@
 	@echo "	   $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --prompt-for-dba-password --action upgrade"
 
 
-upgrade: testdeps config-install dirs files-install fixperms upgrade-instruct
+upgrade: testdeps config-install dirs files-install upgrade-instruct
 
 upgrade-noclobber: config-install dirs libs-install html-install bin-install local-install doc-install fixperms
 
@@ -361,7 +361,7 @@
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(LOCAL_LEXICON_PATH)
 # }}}
 
-install: testdeps config-install dirs files-install fixperms instruct
+install: testdeps config-install dirs files-install instruct
 
 files-install: libs-install etc-install config-install bin-install sbin-install html-install local-install doc-install
 

rt-3.8.1-config.diff:

--- NEW FILE rt-3.8.1-config.diff ---
--- rt-3.8.1.orig/etc/RT_SiteConfig.pm	2008-08-18 17:14:12.000000000 +0200
+++ rt-3.8.1/etc/RT_SiteConfig.pm	2008-09-08 16:43:16.000000000 +0200
@@ -15,5 +15,14 @@
 #   perl -c /path/to/your/etc/RT_SiteConfig.pm
 
 Set( $rtname, 'example.com');
-#Set(@Plugins,(qw(Extension::QuickDelete)));
+
+# Set( $Organization , "example.com");
+
+# Look into the zoneinfo database for valid values (/usr/share/zoneinfo/)
+# Set( $Timezone , 'US/Eastern');
+
+# Set( $WebBaseURL , "http://localhost");
+
+Set( $WebPath , "/rt3");
+
 1;



From mclasen at fedoraproject.org  Tue Sep 23 03:59:16 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 03:59:16 +0000 (UTC)
Subject: rpms/gnome-session/devel .cvsignore, 1.64, 1.65 gnome-session.spec, 
	1.194, 1.195 sources, 1.68, 1.69
Message-ID: <20080923035916.D2AEF70033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4452

Modified Files:
	.cvsignore gnome-session.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	8 Sep 2008 23:48:28 -0000	1.64
+++ .cvsignore	23 Sep 2008 03:58:46 -0000	1.65
@@ -1 +1 @@
-gnome-session-2.23.92.tar.bz2
+gnome-session-2.24.0.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- gnome-session.spec	19 Sep 2008 16:07:22 -0000	1.194
+++ gnome-session.spec	23 Sep 2008 03:58:46 -0000	1.195
@@ -11,10 +11,10 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.23.92
-Release: 6%{?dist}
+Version: 2.24.0
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-session/2.24/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
 Source2: gnome.desktop
 License: GPLv2+
@@ -190,6 +190,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Thu Sep 18 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.92-6
 - Plug memory leaks
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	8 Sep 2008 23:48:28 -0000	1.68
+++ sources	23 Sep 2008 03:58:46 -0000	1.69
@@ -1 +1 @@
-cb7e32539a884ca77de6fa57ceab4546  gnome-session-2.23.92.tar.bz2
+2f586c2829430937fb2d18b4b8478bad  gnome-session-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 23 04:03:38 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 04:03:38 +0000 (UTC)
Subject: rpms/alacarte/devel alacarte.spec,1.42,1.43
Message-ID: <20080923040338.76C9C70033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/alacarte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5040

Modified Files:
	alacarte.spec 
Log Message:
fix file lists



Index: alacarte.spec
===================================================================
RCS file: /cvs/extras/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- alacarte.spec	23 Sep 2008 03:55:00 -0000	1.42
+++ alacarte.spec	23 Sep 2008 04:03:08 -0000	1.43
@@ -61,8 +61,12 @@
 %{_bindir}/*
 %{_datadir}/applications/*
 %{_datadir}/alacarte
+%{_datadir}/icons/hicolor/16x16/apps/alacarte.png
 %{_datadir}/icons/hicolor/22x22/apps/alacarte.png
-%{_datadir}/icons/hicolor/scalable/apps/alacarte.svg
+%{_datadir}/icons/hicolor/24x24/apps/alacarte.png
+%{_datadir}/icons/hicolor/32x32/apps/alacarte.png
+%{_datadir}/icons/hicolor/48x48/apps/alacarte.png
+%{_datadir}/icons/hicolor/256x256/apps/alacarte.png
 
 %changelog
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 0.11.6-2



From corsepiu at fedoraproject.org  Tue Sep 23 04:07:21 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 23 Sep 2008 04:07:21 +0000 (UTC)
Subject: rpms/rt3/devel .cvsignore,1.10,1.11 sources,1.10,1.11
Message-ID: <20080923040721.D041A70033@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5722

Modified Files:
	.cvsignore sources 
Log Message:
Add rt-3.8.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	26 Jun 2008 14:12:49 -0000	1.10
+++ .cvsignore	23 Sep 2008 04:06:51 -0000	1.11
@@ -1 +1,2 @@
 rt-3.6.7.tar.gz
+rt-3.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	26 Jun 2008 14:12:49 -0000	1.10
+++ sources	23 Sep 2008 04:06:51 -0000	1.11
@@ -1 +1,2 @@
 46c0b29cd14010ee6a3f181743aeb6ef  rt-3.6.7.tar.gz
+72b4419816e43bde6b50ba68374882e3  rt-3.8.1.tar.gz



From mclasen at fedoraproject.org  Tue Sep 23 04:09:00 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 04:09:00 +0000 (UTC)
Subject: rpms/gnome-session/devel gnome-session.spec,1.195,1.196
Message-ID: <20080923040900.181AF70033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5860

Modified Files:
	gnome-session.spec 
Log Message:
drop upstreamed patches



Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- gnome-session.spec	23 Sep 2008 03:58:46 -0000	1.195
+++ gnome-session.spec	23 Sep 2008 04:08:29 -0000	1.196
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.24/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -63,16 +63,6 @@
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(preun): GConf2 >= %{gconf2_version}
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=552292
-Patch0: ListenObjs-leak.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=552293
-Patch1: previous_id-leak.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=552294
-Patch2: inhibitor-leak.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=552302
-Patch3: empty-string-leak.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=552255
-Patch4: ice-leak.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=552780
 Patch5: xml-leak.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=552815
@@ -85,11 +75,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .ListenObjs-leak
-%patch1 -p1 -b .previous_id-leak
-%patch2 -p1 -b .inhibitor-leak
-%patch3 -p1 -b .empty-string-leak
-%patch4 -p0 -b .ice-leak
 %patch5 -p1 -b .xml-leak
 %patch6 -p1 -b .startup_id-leak.patch
 
@@ -190,8 +175,9 @@
 
 
 %changelog
-* Mon Sep 22 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-1
+* Mon Sep 22 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-2
 - Update to 2.24.0
+- Drop upstreamed patches
 
 * Thu Sep 18 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.92-6
 - Plug memory leaks



From mclasen at fedoraproject.org  Tue Sep 23 04:04:48 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 04:04:48 +0000 (UTC)
Subject: rpms/alacarte/devel alacarte.spec,1.43,1.44
Message-ID: <20080923040448.E046270033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/alacarte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5242

Modified Files:
	alacarte.spec 
Log Message:
bump rev



Index: alacarte.spec
===================================================================
RCS file: /cvs/extras/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- alacarte.spec	23 Sep 2008 04:03:08 -0000	1.43
+++ alacarte.spec	23 Sep 2008 04:04:18 -0000	1.44
@@ -2,7 +2,7 @@
 
 Name:           alacarte
 Version:        0.11.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple menu editor for GNOME
 
 Group:          Applications/System
@@ -69,7 +69,7 @@
 %{_datadir}/icons/hicolor/256x256/apps/alacarte.png
 
 %changelog
-* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 0.11.6-2
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 0.11.6-3
 - Update to 0.11.6
 
 * Mon Mar 10 2008 Matthias Clasen <mclasen at redhat.com> - 0.11.5-1



From mclasen at fedoraproject.org  Tue Sep 23 04:13:09 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 04:13:09 +0000 (UTC)
Subject: rpms/gnome-panel/devel .cvsignore, 1.84, 1.85 gnome-panel.spec,
	1.317, 1.318 sources, 1.87, 1.88
Message-ID: <20080923041309.5DC3270033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6397

Modified Files:
	.cvsignore gnome-panel.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- .cvsignore	9 Sep 2008 01:42:04 -0000	1.84
+++ .cvsignore	23 Sep 2008 04:12:38 -0000	1.85
@@ -1 +1 @@
-gnome-panel-2.23.92.tar.bz2
+gnome-panel-2.24.0.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- gnome-panel.spec	9 Sep 2008 01:42:04 -0000	1.317
+++ gnome-panel.spec	23 Sep 2008 04:12:38 -0000	1.318
@@ -22,10 +22,10 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.23.92
+Version: 2.24.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar.bz2
 
 Source3: redhat-panel-default-setup.entries
 Source4: gnome-compiler-flags.m4
@@ -346,6 +346,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/sources,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- sources	9 Sep 2008 01:42:04 -0000	1.87
+++ sources	23 Sep 2008 04:12:39 -0000	1.88
@@ -1 +1 @@
-8720f9b42692904ce7df371715248255  gnome-panel-2.23.92.tar.bz2
+0d246880611a4c58fe2ff99614b96918  gnome-panel-2.24.0.tar.bz2



From corsepiu at fedoraproject.org  Tue Sep 23 04:13:22 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 23 Sep 2008 04:13:22 +0000 (UTC)
Subject: rpms/rt3/devel rt3.spec,1.26,1.27
Message-ID: <20080923041322.15C1D70033@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6451

Modified Files:
	rt3.spec 
Log Message:
* Mon Sep 23 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.1-0
- First try at public release.
- Completely rework the spec.
- Upstream update.



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rt3.spec	26 Jun 2008 14:12:49 -0000	1.26
+++ rt3.spec	23 Sep 2008 04:12:51 -0000	1.27
@@ -4,6 +4,33 @@
 # package are under the same license as the package itself.
 #
 
+# Supported rpmbuild options:
+#
+# --with gd/--without gd 
+#	enable/disable gd support
+#	Default: --with (had been default in rt < 3.8.0)
+%bcond_without gd 
+
+# --with graphviz/--without graphviz
+#	enable/disable graphiz support
+#	Default: --without (missing deps)
+%bcond_with graphviz
+
+# --with devel_mode/--without devel_mode
+#	enable/disable building/installing devel files
+#	Default: without (missing deps; TBA in spec)
+%bcond_with devel_mode
+
+# --with gpg/--without gpg
+#	enable/disable building gpg support
+#	Default: without
+%bcond_with gpg
+
+# --with tests
+#	run testsuite when building the rpm
+#	Default: without (doesn't work in chroots.)
+%bcond_with tests
+
 %define RT3_BINDIR		%{_sbindir}
 %define RT3_LIBDIR		%{perl_vendorlib}
 %define RT3_WWWDIR		%{_datadir}/rt3/html
@@ -12,8 +39,8 @@
 %define RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
 
 Name:		rt3
-Version:	3.6.7
-Release:	1%{?dist}
+Version:	3.8.1
+Release:	0%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -24,9 +51,10 @@
 Source4:	README.fedora.in
 Source5:	rt3.logrotate.in
 
-Patch0:		rt-3.6.1-config.diff
+Patch0:		rt-3.8.1-config.diff
 Patch1:		rt-3.4.1-I18N.diff
-Patch2:		rt-3.6.0-Makefile.diff
+Patch2:		rt-3.8.1-Makefile.diff
+Patch3:		rt-3.8.1-test-dependencies.diff
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,7 +62,8 @@
 # For Debian compatibility
 Provides:	request-tracker3 = %{version}-%{release}
 
-%if 0%{?_with_testdeps} 
+# This list is alpha sorted
+BuildRequires: perl(Apache::DBI)
 BuildRequires: perl(Apache::Session) >= 1.53
 BuildRequires: perl(Cache::Simple::TimedExpiry)
 BuildRequires: perl(Calendar::Simple)
@@ -42,44 +71,71 @@
 BuildRequires: perl(Class::ReturnValue) >= 0.40
 BuildRequires: perl(CPAN)
 BuildRequires: perl(CSS::Squish) >= 0.06
+BuildRequires: perl(Data::ICal)
 BuildRequires: perl(Date::Format)
 BuildRequires: perl(DBD::mysql) >= 2.1018
 BuildRequires: perl(DBI) >= 1.37
-BuildRequires: perl(DBIx::SearchBuilder) >= 1.53
+BuildRequires: perl(DBIx::SearchBuilder) >= 1.54
 BuildRequires: perl(Devel::StackTrace) >= 1.19
 BuildRequires: perl(Digest::base)
 BuildRequires: perl(Digest::MD5) >= 2.27
+BuildRequires: perl(Email::Address)
+BuildRequires: perl(Encode) >= 2.13
 BuildRequires: perl(Errno)
+%{?with_devel_mode:BuildRequires: perl(File::Find)}
+BuildRequires: perl(File::Glob)
+BuildRequires: perl(File::ShareDir)
 BuildRequires: perl(File::Spec) >= 0.8
-BuildRequires: perl(File::Temp)
-BuildRequires: perl(GD)
-BuildRequires: perl(GD::Graph)
-BuildRequires: perl(GD::Text)
-BuildRequires: perl(Getopt::Long)
+BuildRequires: perl(File::Temp) >= 0.18
+%{?with_gd:BuildRequires: perl(GD)}
+%{?with_gd:BuildRequires: perl(GD::Graph)}
+%{?with_gd:BuildRequires: perl(GD::Text)}
+%{?with_gpg:BuildRequires: perl(GnuPG::Interface)}
+%{?with_graphviz:BuildRequires: perl(GraphViz)}
 BuildRequires: perl(Getopt::Long) >= 2.24
 BuildRequires: perl(HTML::Entities)
+%{?with_devel_mode:BuildRequires: perl(HTML::Form)}
 BuildRequires: perl(HTML::FormatText)
-BuildRequires: perl(HTML::Mason) >= 1.23
+BuildRequires: perl(HTML::Mason) >= 1.36
+BuildRequires: perl(HTML::RewriteAttributes) >= 0.02
 BuildRequires: perl(HTML::Scrubber) >= 0.08
 BuildRequires: perl(HTML::TreeBuilder)
 BuildRequires: perl(HTTP::Request::Common)
+BuildRequires: perl(HTTP::Server::Simple) >= 0.34
+BuildRequires: perl(HTTP::Server::Simple::Mason) >= 0.09
+%{?with_graphviz:BuildRequires: perl(IPC::Run)}
+%{?with_devel_mode:BuildRequires: perl(IPC::Run3)}
+%{?with_graphviz:BuildRequires: perl(IPC::Run::SafeHandles)}
 BuildRequires: perl(Locale::Maketext) >= 1.06
 BuildRequires: perl(Locale::Maketext::Fuzzy)
 BuildRequires: perl(Locale::Maketext::Lexicon) >= 0.32
 BuildRequires: perl(Log::Dispatch) >= 2.0
+%{?with_devel_mode:BuildRequires: perl(Log::Dispatch::Perl)}
 BuildRequires: perl(LWP)
 BuildRequires: perl(LWP::UserAgent)
 BuildRequires: perl(Mail::Mailer) >= 1.57
-BuildRequires: perl(MIME::Entity) >= 5.108
-BuildRequires: perl(Module::Versions::Report) >= 1.03
+BuildRequires: perl(MIME::Entity) >= 5.425
+BuildRequires: perl(MIME::Types)
+%{?with_devel_mode:BuildRequires: perl(Module::Refresh) >= 0.03}
+BuildRequires: perl(Module::Versions::Report) >= 1.05
+BuildRequires: perl(Net::Server)
+BuildRequires: perl(Net::Server::PreFork)
 BuildRequires: perl(Net::SMTP)
+%{?with_gpg:BuildRequires: perl(PerlIO::eol)}
 BuildRequires: perl(Pod::Usage)
 BuildRequires: perl(Regexp::Common)
 BuildRequires: perl(Scalar::Util)
 BuildRequires: perl(Storable) >= 2.08
+%{?with_devel_mode:BuildRequires: perl(String::ShellQuote)}
 BuildRequires: perl(Term::ReadKey)
 BuildRequires: perl(Term::ReadLine)
-BuildRequires: perl(Text::Autoformat)
+%{?with_devel_mode:BuildRequires: perl(Test::Builder) >= 0.77}
+%{?with_devel_mode:BuildRequires: perl(Test::Deep)}
+%{?with_devel_mode:BuildRequires: perl(Test::Expect) >= 0.31}
+%{?with_devel_mode:BuildRequires: perl(Test::HTTP::Server::Simple) >= 0.09}
+%{?with_devel_mode:BuildRequires: perl(Test::MockTime)}
+%{?with_devel_mode:BuildRequires: perl(Test::Warn)}
+%{?with_devel_mode:BuildRequires: perl(Test::WWW::Mechanize)}
 BuildRequires: perl(Text::ParseWords)
 BuildRequires: perl(Text::Quoted) >= 2.02
 BuildRequires: perl(Text::Template)
@@ -89,8 +145,10 @@
 BuildRequires: perl(Time::ParseDate)
 BuildRequires: perl(Tree::Simple) >= 1.04
 BuildRequires: perl(UNIVERSAL::require)
+%{?with_devel_mode:BuildRequires: perl(WWW::Mechanize)}
 BuildRequires: perl(XML::RSS) >= 1.05
-%endif
+%{?with_devel_mode:BuildRequires: perl(XML::Simple)}
+
 
 BuildRequires:	/usr/bin/pod2man
 BuildRequires:	/usr/sbin/apachectl
@@ -99,24 +157,25 @@
 
 Requires(postun): /bin/rm
 
+# FIXME: The list below needs to be cleaned up
 # rpm doesn't catch these:
 Requires: perl(Apache::Session)
 Requires: perl(Calendar::Simple)
-Requires: perl(CSS::Squish)
-Requires: perl(File::Temp)
+# Requires: perl(CSS::Squish)
+# Requires: perl(File::Temp)
 Requires: perl(GD::Text)
 Requires: perl(GD::Graph::bars) perl(GD::Graph::pie)
-Requires: perl(HTML::Mason)
-Requires: perl(HTML::FormatText)
-Requires: perl(HTML::TreeBuilder)
+# Requires: perl(HTML::Mason)
+# Requires: perl(HTML::FormatText)
+# Requires: perl(HTML::TreeBuilder)
 Requires: perl(HTTP::Server::Simple::Mason)
 Requires: perl(I18N::LangTags::List)
 Requires: perl(Locale::Maketext::Fuzzy)
 Requires: perl(LWP::MediaTypes)
-Requires: perl(MIME::Entity)
+# Requires: perl(MIME::Entity)
 Requires: perl(mod_perl2)
 Requires: perl(Module::Versions::Report)
-Requires: perl(Regexp::Common)
+# Requires: perl(Regexp::Common)
 Requires: perl(Tree::Simple)
 Requires: perl(URI::URL)
 
@@ -154,8 +213,9 @@
 find etc -type f -exec chmod a-x {} \;
 
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Patch backups added by rpm disturb
 find -name '*.orig' -exec rm -f {} \;
@@ -173,8 +233,8 @@
 cat << \EOF > %{name}-req
 #!/bin/sh
 %{__perl_requires} $* |\
-    sed -e '/^perl(Encode::compat)$/d' \
-        -e '/^perl(RT::/d'
+    sed -e '/^perl(RT::/d' \
+	-e '/^perl()/d'
 EOF
 %define __perl_requires %{_builddir}/rt-%{version}/%{name}-req
 chmod +x %{__perl_requires}
@@ -207,6 +267,7 @@
 	-e 's,	chgrp,	: chrgp,g' \
 	-e 's,	chown,	: chown,g' \
 	-e 's,$(DESTDIR)/,$(DESTDIR),g' \
+	-e 's,-o $(BIN_OWNER) -g $(RTGROUP),,g' \
 Makefile.in
 
 %build
@@ -214,7 +275,13 @@
 --with-apachectl=/usr/sbin/apachectl \
 --with-web-user=apache --with-web-group=apache \
 --enable-layout=Fedora --with-modperl2 \
---libdir=%{RT3_LIBDIR}
+--with-web-handler=modperl2 \
+--libdir=%{RT3_LIBDIR} \
+%{?with_graphviz:--enable-graphviz}%{!?with_graphviz:--disable-graphviz} \
+%{?with_gd:--enable-gd}%{!?with_gd:--disable-gd} \
+%{?with_gpg:--enable-gpg}%{!?with_gpg:--disable-gpg} \
+%{?with_devel_mode:--enable-devel-mode}%{!?with_devel_mode:--disable-devel-mode}
+
 make %{?_smp_mflags}
 
 # Generate man-pages
@@ -273,16 +340,19 @@
 
 install -d -m755 ${RPM_BUILD_ROOT}%{RT3_LOCALSTATEDIR}
 
+install -d -m755 ${RPM_BUILD_ROOT}%{_sysconfdir}/rt3/upgrade
+cp -R etc/upgrade/* ${RPM_BUILD_ROOT}%{_sysconfdir}/rt3/upgrade
+
 # Fix permissions
 find ${RPM_BUILD_ROOT}%{RT3_WWWDIR} \
   -type f -exec chmod a-x {} \;
 
 %check
-%{?_with_testdeps:make testdeps}
 # The tests don't work:
 # - Require to be run as root
 # - Require an operational rt3 system
-%{?_with_tests:make test}
+# - Require packages which are n/a in Fedora
+%{?with_tests:make test}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -302,6 +372,7 @@
 %{_mandir}/man1/*
 %exclude %{_mandir}/man1/rt-mailgate*
 %{RT3_LIBDIR}/*
+%exclude %{RT3_LIBDIR}/RT/Test*
 %attr(0700,apache,apache) %{RT3_LOGDIR}
 
 %dir %{_sysconfdir}/rt3
@@ -333,6 +404,11 @@
 %{_mandir}/man1/rt-mailgate*
 
 %changelog
+* Mon Sep 23 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.1-0
+- First try at public release.
+- Completely rework the spec.
+- Upstream update.
+
 * Wed Jun 26 2008 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.7-1
 - Upstream update.
 - Add --with-testdeps.



From mclasen at fedoraproject.org  Tue Sep 23 04:24:44 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 04:24:44 +0000 (UTC)
Subject: rpms/gnome-netstatus/devel .cvsignore, 1.14,
	1.15 gnome-netstatus.spec, 1.41, 1.42 sources, 1.14, 1.15
Message-ID: <20080923042444.9F51870033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-netstatus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8219

Modified Files:
	.cvsignore gnome-netstatus.spec sources 
Log Message:
2.12.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-netstatus/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	13 Feb 2007 19:35:19 -0000	1.14
+++ .cvsignore	23 Sep 2008 04:24:14 -0000	1.15
@@ -1 +1 @@
-gnome-netstatus-2.12.1.tar.bz2
+gnome-netstatus-2.12.2.tar.bz2


Index: gnome-netstatus.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-netstatus/devel/gnome-netstatus.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gnome-netstatus.spec	29 May 2008 17:36:20 -0000	1.41
+++ gnome-netstatus.spec	23 Sep 2008 04:24:14 -0000	1.42
@@ -6,8 +6,8 @@
 
 Summary: Network status applet
 Name: gnome-netstatus
-Version: 2.12.1
-Release: 5%{?dist}
+Version: 2.12.2
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.12/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL
@@ -49,6 +49,7 @@
 
 # stuff we don't want
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
+rm $RPM_BUILD_ROOT/usr/share/icons/hicolor/icon-theme.cache
 
 %find_lang %{name} --with-gnome
 
@@ -99,13 +100,14 @@
 %{_datadir}/gnome-2.0/ui/*.xml
 %{_datadir}/gnome-netstatus
 %{_datadir}/icons/hicolor/48x48/apps/*.png
-%{_datadir}/omf/gnome-netstatus
-%{_datadir}/pixmaps/*.png
 %{_libdir}/bonobo/servers/*.server
 %{_libexecdir}/*
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen  <mclasen at redhat.com> - 2.12.2-1
+- Update to 2.12.2
+
 * Thu May 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.12.1-5
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-netstatus/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	13 Feb 2007 19:35:19 -0000	1.14
+++ sources	23 Sep 2008 04:24:14 -0000	1.15
@@ -1 +1 @@
-8651ca1694a6c222ae5cad6e21814d24  gnome-netstatus-2.12.1.tar.bz2
+f1f9e18b48d46adb32c9002e4325f80e  gnome-netstatus-2.12.2.tar.bz2



From mathstuf at fedoraproject.org  Tue Sep 23 04:31:30 2008
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 23 Sep 2008 04:31:30 +0000 (UTC)
Subject: rpms/krazy2/F-8 krazy2.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20080923043130.5AE6470033@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8862/F-8

Modified Files:
	krazy2.spec sources 
Log Message:
* Tue Sep 23 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-5.20080923svn862962
- Updated SVN



Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-8/krazy2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- krazy2.spec	23 Sep 2008 03:27:12 -0000	1.1
+++ krazy2.spec	23 Sep 2008 04:31:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           krazy2
 Version:        2.6
-Release:        4.20080918svn862357%{?dist}
+Release:        5.20080923svn862962%{?dist}
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -8,7 +8,7 @@
 URL:            http://techbase.kde.org/Development/Tutorials/Code_Checking
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 862357 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.6
+#  svn export -r 862962 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.6
 #  tar -c krazy2-2.6 | bzip2 --best -c > krazy2-2.6.tar.bz2
 Source0:        krazy2-%{version}.tar.bz2
 Patch0:         krazy2-passbyvalue-libsuffix.patch
@@ -21,6 +21,7 @@
 BuildRequires:  perl(XML::LibXML)
 BuildRequires:  qt4-devel
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# Krazy2 uses desktop-file-validate, so this is an actual Requires
 Requires:       desktop-file-utils
 
 %description
@@ -113,6 +114,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-5.20080923svn862962
+- Updated SVN
+
 * Thu Sep 18 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-4.20080918svn862357
 - Updated SVN
 - Spec file cleaned up


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Sep 2008 03:27:12 -0000	1.2
+++ sources	23 Sep 2008 04:31:00 -0000	1.3
@@ -1 +1 @@
-c1b62bb886755bf028e08e4ad3ee41bd  krazy2-2.6.tar.bz2
+792b05904cd872f54f4a17021caa99fa  krazy2-2.6.tar.bz2



From mathstuf at fedoraproject.org  Tue Sep 23 04:31:30 2008
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 23 Sep 2008 04:31:30 +0000 (UTC)
Subject: rpms/krazy2/F-9 krazy2.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20080923043130.78CCE70033@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8862/F-9

Modified Files:
	krazy2.spec sources 
Log Message:
* Tue Sep 23 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-5.20080923svn862962
- Updated SVN



Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-9/krazy2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- krazy2.spec	23 Sep 2008 03:25:27 -0000	1.1
+++ krazy2.spec	23 Sep 2008 04:31:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           krazy2
 Version:        2.6
-Release:        4.20080918svn862357%{?dist}
+Release:        5.20080923svn862962%{?dist}
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -8,7 +8,7 @@
 URL:            http://techbase.kde.org/Development/Tutorials/Code_Checking
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 862357 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.6
+#  svn export -r 862962 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.6
 #  tar -c krazy2-2.6 | bzip2 --best -c > krazy2-2.6.tar.bz2
 Source0:        krazy2-%{version}.tar.bz2
 Patch0:         krazy2-passbyvalue-libsuffix.patch
@@ -21,6 +21,7 @@
 BuildRequires:  perl(XML::LibXML)
 BuildRequires:  qt4-devel
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# Krazy2 uses desktop-file-validate, so this is an actual Requires
 Requires:       desktop-file-utils
 
 %description
@@ -113,6 +114,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-5.20080923svn862962
+- Updated SVN
+
 * Thu Sep 18 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-4.20080918svn862357
 - Updated SVN
 - Spec file cleaned up


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Sep 2008 03:25:27 -0000	1.2
+++ sources	23 Sep 2008 04:31:00 -0000	1.3
@@ -1 +1 @@
-c1b62bb886755bf028e08e4ad3ee41bd  krazy2-2.6.tar.bz2
+792b05904cd872f54f4a17021caa99fa  krazy2-2.6.tar.bz2



From mathstuf at fedoraproject.org  Tue Sep 23 04:31:30 2008
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 23 Sep 2008 04:31:30 +0000 (UTC)
Subject: rpms/krazy2/devel krazy2.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20080923043130.B697670033@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8862/devel

Modified Files:
	krazy2.spec sources 
Log Message:
* Tue Sep 23 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-5.20080923svn862962
- Updated SVN



Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/krazy2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- krazy2.spec	23 Sep 2008 03:21:02 -0000	1.1
+++ krazy2.spec	23 Sep 2008 04:31:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           krazy2
 Version:        2.6
-Release:        4.20080918svn862357%{?dist}
+Release:        5.20080923svn862962%{?dist}
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -8,7 +8,7 @@
 URL:            http://techbase.kde.org/Development/Tutorials/Code_Checking
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 862357 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.6
+#  svn export -r 862962 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.6
 #  tar -c krazy2-2.6 | bzip2 --best -c > krazy2-2.6.tar.bz2
 Source0:        krazy2-%{version}.tar.bz2
 Patch0:         krazy2-passbyvalue-libsuffix.patch
@@ -21,6 +21,7 @@
 BuildRequires:  perl(XML::LibXML)
 BuildRequires:  qt4-devel
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# Krazy2 uses desktop-file-validate, so this is an actual Requires
 Requires:       desktop-file-utils
 
 %description
@@ -113,6 +114,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-5.20080923svn862962
+- Updated SVN
+
 * Thu Sep 18 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-4.20080918svn862357
 - Updated SVN
 - Spec file cleaned up


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Sep 2008 03:21:02 -0000	1.2
+++ sources	23 Sep 2008 04:31:00 -0000	1.3
@@ -1 +1 @@
-c1b62bb886755bf028e08e4ad3ee41bd  krazy2-2.6.tar.bz2
+792b05904cd872f54f4a17021caa99fa  krazy2-2.6.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 23 04:33:37 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 04:33:37 +0000 (UTC)
Subject: rpms/gnome-netstatus/devel gnome-netstatus.spec,1.42,1.43
Message-ID: <20080923043337.B07C270033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-netstatus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9440

Modified Files:
	gnome-netstatus.spec 
Log Message:
damn you, intltool



Index: gnome-netstatus.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-netstatus/devel/gnome-netstatus.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gnome-netstatus.spec	23 Sep 2008 04:24:14 -0000	1.42
+++ gnome-netstatus.spec	23 Sep 2008 04:33:07 -0000	1.43
@@ -7,7 +7,7 @@
 Summary: Network status applet
 Name: gnome-netstatus
 Version: 2.12.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.12/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL
@@ -28,6 +28,7 @@
 BuildRequires: gnome-doc-utils
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser)
+BuildRequires: intltool
 
 %description
 gnome-netstatus is an applet which provides information about a
@@ -105,7 +106,7 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
-* Tue Sep 23 2008 Matthias Clasen  <mclasen at redhat.com> - 2.12.2-1
+* Tue Sep 23 2008 Matthias Clasen  <mclasen at redhat.com> - 2.12.2-2
 - Update to 2.12.2
 
 * Thu May 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.12.1-5



From dchen at fedoraproject.org  Tue Sep 23 04:33:47 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue, 23 Sep 2008 04:33:47 +0000 (UTC)
Subject: rpms/libUnihan/devel .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 libUnihan.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20080923043347.8487170033@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libUnihan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9637/devel

Modified Files:
	.cvsignore import.log libUnihan.spec sources 
Log Message:
PinYin and ZhuYin format conversion support.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Sep 2008 02:43:19 -0000	1.3
+++ .cvsignore	23 Sep 2008 04:33:17 -0000	1.4
@@ -1 +1 @@
-libUnihan-0.5.0-Source.tar.gz
+libUnihan-0.5.1-Source.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	23 Sep 2008 02:43:19 -0000	1.2
+++ import.log	23 Sep 2008 04:33:17 -0000	1.3
@@ -1,2 +1,3 @@
 libUnihan-0_4_1-1_fc9:HEAD:libUnihan-0.4.1-1.fc9.src.rpm:1220245157
 libUnihan-0_5_0-0_fc9:HEAD:libUnihan-0.5.0-0.fc9.src.rpm:1222137766
+libUnihan-0_5_1-0_fc9:HEAD:libUnihan-0.5.1-0.fc9.src.rpm:1222144388


Index: libUnihan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/devel/libUnihan.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libUnihan.spec	23 Sep 2008 02:43:19 -0000	1.2
+++ libUnihan.spec	23 Sep 2008 04:33:17 -0000	1.3
@@ -1,7 +1,7 @@
 Name:           libUnihan
 %define         libUnihan_ver_major 0
 %define         libUnihan_ver_minor 5
-Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.0
+Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.1
 Release:        0%{?dist}
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -58,6 +58,9 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+#%check
+#make test
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -78,7 +81,6 @@
 %{_includedir}/%{name}/
 %{_libdir}/%{name}.so
 %{_bindir}/unihan_converter
-%{_bindir}/unihan_field_validation
 
 %files doc
 %defattr(-,root,root,-)
@@ -86,7 +88,7 @@
 
 
 %changelog
-* Tue Sep 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.5.0-0
+* Tue Sep 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.5.1-0
 - New Features:
   + PinYin accent format conversion functions (C and SQL scalar).
   + ZhuYin tone mark format conversion functions (C and SQL scalar).
@@ -102,7 +104,7 @@
   + Add test suite.
   + Where-clause-generator is now able to escape the quote character(').
   + unihan_field_validation is moved to test/, therefore it will not be in binary package.
-  + New make targets: rpm and srpm to generate rpm and srpm.
+  + New make targets: rpm, srpm, rpm_db and srpm_db to generate rpm and srpm for libUnihan and UnihanDb.
 - Removed:
   + unihanSql_get_result_table(). As it uses sqlite3_get_table() which might cause memory leak.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Sep 2008 02:43:19 -0000	1.3
+++ sources	23 Sep 2008 04:33:17 -0000	1.4
@@ -1 +1 @@
-f7cc02c3764bc692a588024e72ddcc00  libUnihan-0.5.0-Source.tar.gz
+a5232942a5b2743d30c9eca2c6d7a7c5  libUnihan-0.5.1-Source.tar.gz



From mathstuf at fedoraproject.org  Tue Sep 23 04:34:02 2008
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 23 Sep 2008 04:34:02 +0000 (UTC)
Subject: rpms/sigen/devel import.log, NONE, 1.1 sigen.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080923043402.09BA470033@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/sigen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9617/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sigen.spec 
Log Message:
* Tue Sep 23 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.20.20080923svn266
- Initial import



--- NEW FILE import.log ---
sigen-0_0_2-0_20_20080923svn266_fc9:HEAD:sigen-0.0.2-0.20.20080923svn266.fc9.src.rpm:1222144316


--- NEW FILE sigen.spec ---
Name:           sigen
Version:        0.0.2
Release:        0.20.20080923svn266%{?dist}
Summary:        An RPG/Strategy engine inspired by the Pok??mon??? games

Group:          Amusements/Games
License:        GPLv3+
URL:            http://www.sourceforge.net/projects/sigen
# The source for this package was pulled from upstream's vcs.  Use the
# following commands to generate the tarball:
#  svn export -r 266 http://sigen.svn.sourceforge.net/svnroot/sigen/trunk sigen-0.0.2
#  tar -c sigen-0.0.2 | bzip2 --best -c > sigen-0.0.2.tar.bz2
Source0:        %{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cmake
BuildRequires:  kdelibs4-devel >= 4.1.0
BuildRequires:  qt-devel >= 4.4.0
BuildRequires:  tetex-latex
BuildRequires:  desktop-file-utils

Requires:       qt >= 4.4.0

%description
The Sigma Game Engine is an RPG/Strategy game engine.
The following libraries and tools are provided:
Sigmod - library for loading, editing, and saving Sigmod files
Sigmodr - modding program for Sigmod files
Sigscript - library for scripts to use the data in a Sigmod
Sigbattle - library for the battle system

%package devel
Summary:        Files needed to develop programs which use the Sigma Game Engine
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       kdelibs4-devel >= 4.1.0
Requires:       qt-devel >= 4.4.0

%description devel
Development files used for creating apps based on the Sigma Game
Engine libraries and tools


%prep
%setup -q


%build
%{cmake_kde4}
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}
make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
# Following is based off of KTIGCC's .spec file
# GNOME (shared-mime-info) MIME type registration
mkdir -p %{buildroot}%{_datadir}/mime/packages
cat > %{buildroot}%{_datadir}/mime/packages/sigmodr.xml << EOF1
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
  <mime-type type="application/x-sigmod+xml">
    <sub-class-of type="application/xml" />
    <comment>Sigmod</comment>
    <glob pattern="*.[sS][mM][oO][dD]" />
  </mime-type>
</mime-info>
EOF1
# KDE (legacy) MIME type registration
mkdir -p %{buildroot}%{_datadir}/mimelnk/application
cat > %{buildroot}%{_datadir}/mimelnk/application/x-sigmod+xml.desktop << EOF2
[Desktop Entry]
Encoding=UTF-8
Type=MimeType
MimeType=application/x-sigmod+xml
Icon=application-x-sigmod+xml
Patterns=*.smod;*.SMOD;
Comment=Sigmod
[Property::X-KDE-text]
Type=bool
Value=true
EOF2
# Sigmodr menu entry
mkdir -p %{buildroot}%{_datadir}/applications
cat > %{buildroot}%{_datadir}/applications/sigmodr.desktop << EOF3
[Desktop Entry]
Name=Sigmodr
Comment=Program to edit Sigmods
GenericName=Program to edit Sigmods
Encoding=UTF-8
Type=Application
Exec=%{_bindir}/sigmodr %U
Icon=sigmodr
Terminal=false
Categories=Qt;KDE;Game;
MimeType=application/x-sigmod+xml;
EOF3
desktop-file-install --delete-original       \
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/sigmodr.desktop


%clean
rm -rf %{buildroot}


%post
/sbin/ldconfig
update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :


%postun
/sbin/ldconfig
update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :


%files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}
%{_bindir}/sigmodr
%{_libdir}/libsigmod.so.0
%{_libdir}/libsigmod.so.0.0.2
%{_libdir}/libsigscript.so.0
%{_libdir}/libsigscript.so.0.0.2
%{_libdir}/libsigbattle.so.0
%{_libdir}/libsigbattle.so.0.0.2
%{_datadir}/mime/packages/sigmodr.xml
%{_datadir}/mimelnk/application/x-sigmod+xml.desktop
%{_datadir}/applications/sigmodr.desktop
%{_kde4_appsdir}/sigmodr
%{_kde4_configdir}/sigmod.knsrc


%files devel
%defattr(-,root,root,-)
%{_libdir}/libsigmod.so
%{_libdir}/libsigscript.so
%{_libdir}/libsigbattle.so
%{_includedir}/%{name}


%changelog
* Tue Sep 23 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.20.20080923svn266
- Newer SVN

* Sat Sep 13 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.19.20080907svn262
- Newer SVN

* Sun Sep 08 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.18.20080907svn257
- Spec file fixes

* Sun Sep 08 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.17.20080907svn256
- Spec file fixes

* Sun Sep 07 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.16.20080907svn255
- Newer SVN

* Sun Sep 07 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.15.20080907svn254
- Renamed project

* Mon Aug 18 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.14.20080818svn240
- Newer SVN
- Fixed some unused linkings

* Tue Aug 05 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.13.20080805svn239
- Newer SVN

* Mon Aug 04 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.12.20080804svn236
- Newer SVN
- Fixes for Fedora packaging

* Mon Aug 04 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.11.20080804svn234
- New RPM doesn't automatically create the buildroot

* Sun Aug 03 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.10.20080804svn233
- Newer SVN

* Sat Aug 02 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.9.20080802svn232
- Newer SVN build
- Added the XMLGUI file
- Bumped KDE to 4.1

* Fri Jul 11 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.8.20080711svn227
- Updated the version

* Mon Jun 30 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.7.20080630svn221
- Build/install use of buildroot fixed
- Fixed up changelog
- Fixed version requirements on Qt

* Mon Jun 30 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.6.20080630svn220
- Rebuild for new SVN version
- Qt 4.4 needed

* Sun Jun 22 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.5.20080628svn216
- Fixed the versions in the changelog
- Minor spelling mistakes in descriptions/summaries

* Fri Jun 20 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.4.20080618svn214
- Using cmake now
- Fixed up the -devel package
- .0.0 libs not made with cmake

* Tue Jun 17 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.3.20080617svn210
- New SVN revision
- Fixes for release versioning
- clean section fixed

* Sun Jun 08 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-2
- New SVN revision
- Fixes for name change

* Sun Jun 08 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-1
- Rebuild for version 0.0.2

* Sat Jun 07 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.1-4
- Added libpokebattle
- Moved headers to be under pokegen directory

* Fri Jun 06 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.1-3
- Created devel subpackage

* Sun Jun 01 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.1-2
- No longer need the images stored anywhere

* Mon Mar 04 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.1-1
- Created


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sigen/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2008 00:33:17 -0000	1.1
+++ .cvsignore	23 Sep 2008 04:33:31 -0000	1.2
@@ -0,0 +1 @@
+sigen-0.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sigen/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2008 00:33:17 -0000	1.1
+++ sources	23 Sep 2008 04:33:31 -0000	1.2
@@ -0,0 +1 @@
+d0555807dff75502576ac9f18ec804bc  sigen-0.0.2.tar.bz2



From mathstuf at fedoraproject.org  Tue Sep 23 04:35:44 2008
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 23 Sep 2008 04:35:44 +0000 (UTC)
Subject: rpms/sigen/F-9 import.log, NONE, 1.1 sigen.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080923043544.344B370033@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/sigen/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10282/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sigen.spec 
Log Message:
* Tue Sep 23 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.20.20080923svn266
- Initial import



--- NEW FILE import.log ---
sigen-0_0_2-0_20_20080923svn266_fc9:F-9:sigen-0.0.2-0.20.20080923svn266.fc9.src.rpm:1222144430


--- NEW FILE sigen.spec ---
Name:           sigen
Version:        0.0.2
Release:        0.20.20080923svn266%{?dist}
Summary:        An RPG/Strategy engine inspired by the Pok??mon??? games

Group:          Amusements/Games
License:        GPLv3+
URL:            http://www.sourceforge.net/projects/sigen
# The source for this package was pulled from upstream's vcs.  Use the
# following commands to generate the tarball:
#  svn export -r 266 http://sigen.svn.sourceforge.net/svnroot/sigen/trunk sigen-0.0.2
#  tar -c sigen-0.0.2 | bzip2 --best -c > sigen-0.0.2.tar.bz2
Source0:        %{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cmake
BuildRequires:  kdelibs4-devel >= 4.1.0
BuildRequires:  qt-devel >= 4.4.0
BuildRequires:  tetex-latex
BuildRequires:  desktop-file-utils

Requires:       qt >= 4.4.0

%description
The Sigma Game Engine is an RPG/Strategy game engine.
The following libraries and tools are provided:
Sigmod - library for loading, editing, and saving Sigmod files
Sigmodr - modding program for Sigmod files
Sigscript - library for scripts to use the data in a Sigmod
Sigbattle - library for the battle system

%package devel
Summary:        Files needed to develop programs which use the Sigma Game Engine
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       kdelibs4-devel >= 4.1.0
Requires:       qt-devel >= 4.4.0

%description devel
Development files used for creating apps based on the Sigma Game
Engine libraries and tools


%prep
%setup -q


%build
%{cmake_kde4}
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}
make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
# Following is based off of KTIGCC's .spec file
# GNOME (shared-mime-info) MIME type registration
mkdir -p %{buildroot}%{_datadir}/mime/packages
cat > %{buildroot}%{_datadir}/mime/packages/sigmodr.xml << EOF1
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
  <mime-type type="application/x-sigmod+xml">
    <sub-class-of type="application/xml" />
    <comment>Sigmod</comment>
    <glob pattern="*.[sS][mM][oO][dD]" />
  </mime-type>
</mime-info>
EOF1
# KDE (legacy) MIME type registration
mkdir -p %{buildroot}%{_datadir}/mimelnk/application
cat > %{buildroot}%{_datadir}/mimelnk/application/x-sigmod+xml.desktop << EOF2
[Desktop Entry]
Encoding=UTF-8
Type=MimeType
MimeType=application/x-sigmod+xml
Icon=application-x-sigmod+xml
Patterns=*.smod;*.SMOD;
Comment=Sigmod
[Property::X-KDE-text]
Type=bool
Value=true
EOF2
# Sigmodr menu entry
mkdir -p %{buildroot}%{_datadir}/applications
cat > %{buildroot}%{_datadir}/applications/sigmodr.desktop << EOF3
[Desktop Entry]
Name=Sigmodr
Comment=Program to edit Sigmods
GenericName=Program to edit Sigmods
Encoding=UTF-8
Type=Application
Exec=%{_bindir}/sigmodr %U
Icon=sigmodr
Terminal=false
Categories=Qt;KDE;Game;
MimeType=application/x-sigmod+xml;
EOF3
desktop-file-install --delete-original       \
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/sigmodr.desktop


%clean
rm -rf %{buildroot}


%post
/sbin/ldconfig
update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :


%postun
/sbin/ldconfig
update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :


%files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}
%{_bindir}/sigmodr
%{_libdir}/libsigmod.so.0
%{_libdir}/libsigmod.so.0.0.2
%{_libdir}/libsigscript.so.0
%{_libdir}/libsigscript.so.0.0.2
%{_libdir}/libsigbattle.so.0
%{_libdir}/libsigbattle.so.0.0.2
%{_datadir}/mime/packages/sigmodr.xml
%{_datadir}/mimelnk/application/x-sigmod+xml.desktop
%{_datadir}/applications/sigmodr.desktop
%{_kde4_appsdir}/sigmodr
%{_kde4_configdir}/sigmod.knsrc


%files devel
%defattr(-,root,root,-)
%{_libdir}/libsigmod.so
%{_libdir}/libsigscript.so
%{_libdir}/libsigbattle.so
%{_includedir}/%{name}


%changelog
* Tue Sep 23 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.20.20080923svn266
- Newer SVN

* Sat Sep 13 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.19.20080907svn262
- Newer SVN

* Sun Sep 08 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.18.20080907svn257
- Spec file fixes

* Sun Sep 08 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.17.20080907svn256
- Spec file fixes

* Sun Sep 07 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.16.20080907svn255
- Newer SVN

* Sun Sep 07 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.15.20080907svn254
- Renamed project

* Mon Aug 18 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.14.20080818svn240
- Newer SVN
- Fixed some unused linkings

* Tue Aug 05 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.13.20080805svn239
- Newer SVN

* Mon Aug 04 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.12.20080804svn236
- Newer SVN
- Fixes for Fedora packaging

* Mon Aug 04 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.11.20080804svn234
- New RPM doesn't automatically create the buildroot

* Sun Aug 03 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.10.20080804svn233
- Newer SVN

* Sat Aug 02 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.9.20080802svn232
- Newer SVN build
- Added the XMLGUI file
- Bumped KDE to 4.1

* Fri Jul 11 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.8.20080711svn227
- Updated the version

* Mon Jun 30 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.7.20080630svn221
- Build/install use of buildroot fixed
- Fixed up changelog
- Fixed version requirements on Qt

* Mon Jun 30 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.6.20080630svn220
- Rebuild for new SVN version
- Qt 4.4 needed

* Sun Jun 22 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.5.20080628svn216
- Fixed the versions in the changelog
- Minor spelling mistakes in descriptions/summaries

* Fri Jun 20 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.4.20080618svn214
- Using cmake now
- Fixed up the -devel package
- .0.0 libs not made with cmake

* Tue Jun 17 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.3.20080617svn210
- New SVN revision
- Fixes for release versioning
- clean section fixed

* Sun Jun 08 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-2
- New SVN revision
- Fixes for name change

* Sun Jun 08 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-1
- Rebuild for version 0.0.2

* Sat Jun 07 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.1-4
- Added libpokebattle
- Moved headers to be under pokegen directory

* Fri Jun 06 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.1-3
- Created devel subpackage

* Sun Jun 01 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.1-2
- No longer need the images stored anywhere

* Mon Mar 04 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.1-1
- Created


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sigen/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2008 00:33:17 -0000	1.1
+++ .cvsignore	23 Sep 2008 04:35:13 -0000	1.2
@@ -0,0 +1 @@
+sigen-0.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sigen/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2008 00:33:17 -0000	1.1
+++ sources	23 Sep 2008 04:35:13 -0000	1.2
@@ -0,0 +1 @@
+d0555807dff75502576ac9f18ec804bc  sigen-0.0.2.tar.bz2



From mathstuf at fedoraproject.org  Tue Sep 23 04:37:35 2008
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 23 Sep 2008 04:37:35 +0000 (UTC)
Subject: rpms/sigen/F-8 import.log, NONE, 1.1 sigen.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080923043735.C48CF70033@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/sigen/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10597/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sigen.spec 
Log Message:
* Tue Sep 23 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.20.20080923svn266
- Initial import



--- NEW FILE import.log ---
sigen-0_0_2-0_20_20080923svn266_fc9:F-8:sigen-0.0.2-0.20.20080923svn266.fc9.src.rpm:1222144505


--- NEW FILE sigen.spec ---
Name:           sigen
Version:        0.0.2
Release:        0.20.20080923svn266%{?dist}
Summary:        An RPG/Strategy engine inspired by the Pok??mon??? games

Group:          Amusements/Games
License:        GPLv3+
URL:            http://www.sourceforge.net/projects/sigen
# The source for this package was pulled from upstream's vcs.  Use the
# following commands to generate the tarball:
#  svn export -r 266 http://sigen.svn.sourceforge.net/svnroot/sigen/trunk sigen-0.0.2
#  tar -c sigen-0.0.2 | bzip2 --best -c > sigen-0.0.2.tar.bz2
Source0:        %{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cmake
BuildRequires:  kdelibs4-devel >= 4.1.0
BuildRequires:  qt-devel >= 4.4.0
BuildRequires:  tetex-latex
BuildRequires:  desktop-file-utils

Requires:       qt >= 4.4.0

%description
The Sigma Game Engine is an RPG/Strategy game engine.
The following libraries and tools are provided:
Sigmod - library for loading, editing, and saving Sigmod files
Sigmodr - modding program for Sigmod files
Sigscript - library for scripts to use the data in a Sigmod
Sigbattle - library for the battle system

%package devel
Summary:        Files needed to develop programs which use the Sigma Game Engine
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       kdelibs4-devel >= 4.1.0
Requires:       qt-devel >= 4.4.0

%description devel
Development files used for creating apps based on the Sigma Game
Engine libraries and tools


%prep
%setup -q


%build
%{cmake_kde4}
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}
make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
# Following is based off of KTIGCC's .spec file
# GNOME (shared-mime-info) MIME type registration
mkdir -p %{buildroot}%{_datadir}/mime/packages
cat > %{buildroot}%{_datadir}/mime/packages/sigmodr.xml << EOF1
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
  <mime-type type="application/x-sigmod+xml">
    <sub-class-of type="application/xml" />
    <comment>Sigmod</comment>
    <glob pattern="*.[sS][mM][oO][dD]" />
  </mime-type>
</mime-info>
EOF1
# KDE (legacy) MIME type registration
mkdir -p %{buildroot}%{_datadir}/mimelnk/application
cat > %{buildroot}%{_datadir}/mimelnk/application/x-sigmod+xml.desktop << EOF2
[Desktop Entry]
Encoding=UTF-8
Type=MimeType
MimeType=application/x-sigmod+xml
Icon=application-x-sigmod+xml
Patterns=*.smod;*.SMOD;
Comment=Sigmod
[Property::X-KDE-text]
Type=bool
Value=true
EOF2
# Sigmodr menu entry
mkdir -p %{buildroot}%{_datadir}/applications
cat > %{buildroot}%{_datadir}/applications/sigmodr.desktop << EOF3
[Desktop Entry]
Name=Sigmodr
Comment=Program to edit Sigmods
GenericName=Program to edit Sigmods
Encoding=UTF-8
Type=Application
Exec=%{_bindir}/sigmodr %U
Icon=sigmodr
Terminal=false
Categories=Qt;KDE;Game;
MimeType=application/x-sigmod+xml;
EOF3
desktop-file-install --delete-original       \
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/sigmodr.desktop


%clean
rm -rf %{buildroot}


%post
/sbin/ldconfig
update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :


%postun
/sbin/ldconfig
update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :


%files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}
%{_bindir}/sigmodr
%{_libdir}/libsigmod.so.0
%{_libdir}/libsigmod.so.0.0.2
%{_libdir}/libsigscript.so.0
%{_libdir}/libsigscript.so.0.0.2
%{_libdir}/libsigbattle.so.0
%{_libdir}/libsigbattle.so.0.0.2
%{_datadir}/mime/packages/sigmodr.xml
%{_datadir}/mimelnk/application/x-sigmod+xml.desktop
%{_datadir}/applications/sigmodr.desktop
%{_kde4_appsdir}/sigmodr
%{_kde4_configdir}/sigmod.knsrc


%files devel
%defattr(-,root,root,-)
%{_libdir}/libsigmod.so
%{_libdir}/libsigscript.so
%{_libdir}/libsigbattle.so
%{_includedir}/%{name}


%changelog
* Tue Sep 23 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.20.20080923svn266
- Newer SVN

* Sat Sep 13 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.19.20080907svn262
- Newer SVN

* Sun Sep 08 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.18.20080907svn257
- Spec file fixes

* Sun Sep 08 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.17.20080907svn256
- Spec file fixes

* Sun Sep 07 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.16.20080907svn255
- Newer SVN

* Sun Sep 07 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.15.20080907svn254
- Renamed project

* Mon Aug 18 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.14.20080818svn240
- Newer SVN
- Fixed some unused linkings

* Tue Aug 05 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.13.20080805svn239
- Newer SVN

* Mon Aug 04 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.12.20080804svn236
- Newer SVN
- Fixes for Fedora packaging

* Mon Aug 04 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.11.20080804svn234
- New RPM doesn't automatically create the buildroot

* Sun Aug 03 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.10.20080804svn233
- Newer SVN

* Sat Aug 02 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.9.20080802svn232
- Newer SVN build
- Added the XMLGUI file
- Bumped KDE to 4.1

* Fri Jul 11 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.8.20080711svn227
- Updated the version

* Mon Jun 30 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.7.20080630svn221
- Build/install use of buildroot fixed
- Fixed up changelog
- Fixed version requirements on Qt

* Mon Jun 30 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.6.20080630svn220
- Rebuild for new SVN version
- Qt 4.4 needed

* Sun Jun 22 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.5.20080628svn216
- Fixed the versions in the changelog
- Minor spelling mistakes in descriptions/summaries

* Fri Jun 20 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.4.20080618svn214
- Using cmake now
- Fixed up the -devel package
- .0.0 libs not made with cmake

* Tue Jun 17 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.3.20080617svn210
- New SVN revision
- Fixes for release versioning
- clean section fixed

* Sun Jun 08 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-2
- New SVN revision
- Fixes for name change

* Sun Jun 08 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-1
- Rebuild for version 0.0.2

* Sat Jun 07 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.1-4
- Added libpokebattle
- Moved headers to be under pokegen directory

* Fri Jun 06 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.1-3
- Created devel subpackage

* Sun Jun 01 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.1-2
- No longer need the images stored anywhere

* Mon Mar 04 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.1-1
- Created


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sigen/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2008 00:33:17 -0000	1.1
+++ .cvsignore	23 Sep 2008 04:37:05 -0000	1.2
@@ -0,0 +1 @@
+sigen-0.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sigen/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2008 00:33:17 -0000	1.1
+++ sources	23 Sep 2008 04:37:05 -0000	1.2
@@ -0,0 +1 @@
+d0555807dff75502576ac9f18ec804bc  sigen-0.0.2.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 23 04:41:51 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 04:41:51 +0000 (UTC)
Subject: rpms/sabayon/devel .cvsignore, 1.19, 1.20 sabayon.spec, 1.53,
	1.54 sources, 1.19, 1.20
Message-ID: <20080923044151.DBC1C70033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11460

Modified Files:
	.cvsignore sabayon.spec sources 
Log Message:
2.22.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	12 Mar 2008 01:11:35 -0000	1.19
+++ .cvsignore	23 Sep 2008 04:41:21 -0000	1.20
@@ -1 +1 @@
-sabayon-2.22.0.tar.bz2
+sabayon-2.22.1.tar.bz2


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sabayon.spec	10 Sep 2008 13:17:56 -0000	1.53
+++ sabayon.spec	23 Sep 2008 04:41:21 -0000	1.54
@@ -7,8 +7,8 @@
 %define sabayon_user_uid 86
 
 Name:    sabayon
-Version: 2.22.0
-Release: 4%{?dist}
+Version: 2.22.1
+Release: 1%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -285,6 +285,9 @@
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.1-1
+- Update to 2.22.1
+
 * Wed Sep 10 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.22.0-4
 - Fix saving lockdown settings
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	12 Mar 2008 01:11:35 -0000	1.19
+++ sources	23 Sep 2008 04:41:21 -0000	1.20
@@ -1 +1 @@
-39159282db60bfdfcd8569ecb5a992f5  sabayon-2.22.0.tar.bz2
+b7dde445040d022899ae3f452a686c80  sabayon-2.22.1.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep 23 04:48:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 04:48:33 +0000
Subject: [pkgdb] wifiroamd: kstate2800 has requested watchbugzilla
Message-ID: <20080923044833.E37D9208D68@bastion.fedora.phx.redhat.com>

kstate2800 has requested the watchbugzilla acl on wifiroamd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wifiroamd



From pkgdb at fedoraproject.org  Tue Sep 23 04:48:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 04:48:43 +0000
Subject: [pkgdb] wifiroamd: kstate2800 has requested watchcommits
Message-ID: <20080923044843.1F354208DA4@bastion.fedora.phx.redhat.com>

kstate2800 has requested the watchcommits acl on wifiroamd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wifiroamd



From pkgdb at fedoraproject.org  Tue Sep 23 04:48:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 04:48:55 +0000
Subject: [pkgdb] wifiroamd: kstate2800 has given up watchbugzilla
Message-ID: <20080923044855.E9B2F208DA7@bastion.fedora.phx.redhat.com>

kstate2800 has given up the watchbugzilla acl on wifiroamd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wifiroamd



From pkgdb at fedoraproject.org  Tue Sep 23 04:48:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 04:48:57 +0000
Subject: [pkgdb] wifiroamd: kstate2800 has given up watchcommits
Message-ID: <20080923044857.C0E57208DA2@bastion.fedora.phx.redhat.com>

kstate2800 has given up the watchcommits acl on wifiroamd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wifiroamd



From pkgdb at fedoraproject.org  Tue Sep 23 04:49:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 04:49:01 +0000
Subject: [pkgdb] wifiroamd: kstate2800 has requested watchbugzilla
Message-ID: <20080923044901.3FB53208DA8@bastion.fedora.phx.redhat.com>

kstate2800 has requested the watchbugzilla acl on wifiroamd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wifiroamd



From pkgdb at fedoraproject.org  Tue Sep 23 04:49:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 04:49:03 +0000
Subject: [pkgdb] wifiroamd: kstate2800 has given up watchbugzilla
Message-ID: <20080923044903.9E40E208DAB@bastion.fedora.phx.redhat.com>

kstate2800 has given up the watchbugzilla acl on wifiroamd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wifiroamd



From mclasen at fedoraproject.org  Tue Sep 23 04:49:54 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 04:49:54 +0000 (UTC)
Subject: rpms/epiphany/devel .cvsignore, 1.72, 1.73 epiphany.spec, 1.197,
	1.198 sources, 1.75, 1.76
Message-ID: <20080923044955.0233E70103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12794

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- .cvsignore	3 Sep 2008 02:57:43 -0000	1.72
+++ .cvsignore	23 Sep 2008 04:49:24 -0000	1.73
@@ -1 +1 @@
-epiphany-2.23.91.tar.bz2
+epiphany-2.24.0.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- epiphany.spec	3 Sep 2008 02:57:43 -0000	1.197
+++ epiphany.spec	23 Sep 2008 04:49:24 -0000	1.198
@@ -7,12 +7,12 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.23.91
+Version: 2.24.0
 Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
-Source0: http://download.gnome.org/sources/epiphany/2.23/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/epiphany/2.24/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires(post): scrollkeeper
@@ -212,6 +212,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- sources	3 Sep 2008 02:57:43 -0000	1.75
+++ sources	23 Sep 2008 04:49:24 -0000	1.76
@@ -1 +1 @@
-280e097f42fcab5f1a76f8e6a59dd741  epiphany-2.23.91.tar.bz2
+d46089988045c17adaa70af963b3e47a  epiphany-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 23 04:57:51 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 04:57:51 +0000 (UTC)
Subject: rpms/tomboy/devel .cvsignore, 1.34, 1.35 sources, 1.34,
	1.35 tomboy.spec, 1.86, 1.87
Message-ID: <20080923045751.4E5B070033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/tomboy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14406

Modified Files:
	.cvsignore sources tomboy.spec 
Log Message:
0.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tomboy/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	23 Aug 2008 05:06:01 -0000	1.34
+++ .cvsignore	23 Sep 2008 04:57:20 -0000	1.35
@@ -1 +1 @@
-tomboy-0.11.3.tar.bz2
+tomboy-0.12.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tomboy/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	23 Aug 2008 05:06:01 -0000	1.34
+++ sources	23 Sep 2008 04:57:21 -0000	1.35
@@ -1 +1 @@
-8b7be45684dd4ce10d02dbafe9068242  tomboy-0.11.3.tar.bz2
+d5d02ab455fde92d66e8edf167ce43c1  tomboy-0.12.0.tar.bz2


Index: tomboy.spec
===================================================================
RCS file: /cvs/extras/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- tomboy.spec	8 Sep 2008 21:21:13 -0000	1.86
+++ tomboy.spec	23 Sep 2008 04:57:21 -0000	1.87
@@ -1,6 +1,6 @@
 Name:           tomboy
-Version:        0.11.3
-Release: 	2%{?dist}
+Version:        0.12.0
+Release: 	1%{?dist}
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix
 
 Group:          User Interface/Desktops
@@ -9,7 +9,7 @@
 # libtomboy contains GPL+ code
 # Mono.Addins is MIT
 URL:            http://www.beatniksoftware.com/tomboy/
-Source0:        http://download.gnome.org/sources/tomboy/0.11/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/tomboy/0.12/%{name}-%{version}.tar.bz2
 Patch1:         tomboy-wrapper.patch
 Patch2:		no-start-here.patch
 Patch3:		tomboy-0.11.0-fill-empty-lines.patch
@@ -119,6 +119,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 0.12.0-1
+- Update to 0.12.0
+
 * Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.11.3-2
 - fix license tag
 



From fabbione at fedoraproject.org  Tue Sep 23 05:01:16 2008
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue, 23 Sep 2008 05:01:16 +0000 (UTC)
Subject: rpms/cman/F-9 fix-init.diff,NONE,1.1 cman.spec,1.108,1.109
Message-ID: <20080923050116.A06F370033@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cman/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15176

Modified Files:
	cman.spec 
Added Files:
	fix-init.diff 
Log Message:
Fix cman init script


fix-init.diff:

--- NEW FILE fix-init.diff ---
commit 04b532e83dd7fef23daf1ba89677a09c18fbca49
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Fri Sep 19 11:38:54 2008 +0200

    cman: fix broken init script
    
    remove merge/cherry-pick leftovers from
    55ea74998e36f6f43380fdd3a8a15943b1123792
    
    fix BZ #461004
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>

diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index b2106d3..8594675 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -276,7 +276,6 @@ fence_xvmd_enabled()
     return 0
 }
 
-<<<<<<< HEAD:cman/init.d/cman.in
 set_networking_params()
 {
     if [ ! -f  /proc/sys/net/core/rmem_default ]


Index: cman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cman/F-9/cman.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- cman.spec	14 Aug 2008 12:17:30 -0000	1.108
+++ cman.spec	23 Sep 2008 05:00:46 -0000	1.109
@@ -19,13 +19,14 @@
 Name: cman
 Summary: CMAN - The Cluster Manager
 Version: 2.03.07
-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}.tar.gz
 Patch0: kernel-2.6.25.diff
 Patch1: userland-2.6.26.diff
+Patch2: fix-init.diff
 
 Requires(post): chkconfig
 Requires(preun): initscripts
@@ -57,6 +58,7 @@
 %setup -q -n cluster-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 # for legacy reasons, all binaries have always been installed in /sbin
@@ -167,6 +169,9 @@
 CMAN - The Cluster Manager development package
 
 %changelog
+* Tue Sep 23 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.03.07-2
+- Fix cman init script. BZ #461004
+
 * Thu Aug 14 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.03.07-1
 - New upstream release
 - Fix rgmanager startup locking issues



From mclasen at fedoraproject.org  Tue Sep 23 05:01:14 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 05:01:14 +0000 (UTC)
Subject: rpms/gnome-media/devel .cvsignore, 1.45, 1.46 gnome-media.spec,
	1.140, 1.141 sources, 1.44, 1.45
Message-ID: <20080923050114.25EAE70033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15003

Modified Files:
	.cvsignore gnome-media.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-media/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	9 Sep 2008 00:08:12 -0000	1.45
+++ .cvsignore	23 Sep 2008 05:00:43 -0000	1.46
@@ -1 +1 @@
-gnome-media-2.23.92.tar.bz2
+gnome-media-2.24.0.tar.bz2


Index: gnome-media.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- gnome-media.spec	9 Sep 2008 00:58:17 -0000	1.140
+++ gnome-media.spec	23 Sep 2008 05:00:43 -0000	1.141
@@ -13,11 +13,11 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.23.92
+Version:        2.24.0
 Release:        1%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
-Source:         http://download.gnome.org/sources/gnome-media/2.23/gnome-media-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gnome-media/2.24/gnome-media-%{version}.tar.bz2
 Patch0:         gnome-media-2.13.5-hide-help-button.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -201,6 +201,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com>  2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com>  2.23.92-1
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-media/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	9 Sep 2008 00:08:12 -0000	1.44
+++ sources	23 Sep 2008 05:00:43 -0000	1.45
@@ -1 +1 @@
-49d30a2c182d626226999a2d54e1511d  gnome-media-2.23.92.tar.bz2
+f2eedfe741d2dfc028fde45eb61eb6fc  gnome-media-2.24.0.tar.bz2



From airlied at fedoraproject.org  Tue Sep 23 05:06:42 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 23 Sep 2008 05:06:42 +0000 (UTC)
Subject: rpms/kernel/devel drm-modesetting-i915.patch, 1.2,
	1.3 drm-modesetting-radeon.patch, 1.29, 1.30 kernel.spec, 1.970, 1.971
Message-ID: <20080923050642.AA0A870033@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15867

Modified Files:
	drm-modesetting-i915.patch drm-modesetting-radeon.patch 
	kernel.spec 
Log Message:
- rebase drm patches with latest upstream GEM bits


drm-modesetting-i915.patch:

Index: drm-modesetting-i915.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-i915.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- drm-modesetting-i915.patch	15 Sep 2008 22:49:20 -0000	1.2
+++ drm-modesetting-i915.patch	23 Sep 2008 05:06:11 -0000	1.3
@@ -1,64 +1,70 @@
-commit 30ff7e1eb97ba42a7e71890a77345a495f022eb5
+commit 2b391e551baddf9dabb06bee61023797ca810791
+Author: Kristian H??gsberg <krh at redhat.com>
+Date:   Mon Sep 22 16:43:04 2008 -0400
+
+    Update intel modesetting to use mm_private instead of mm_handle.
+
+commit 0e6b3649ab58deafd5fb531264ce89718cd31344
 Author: Dave Airlie <airlied at linux.ie>
 Date:   Tue Sep 16 08:46:41 2008 +1000
 
     drm/i915: fixup irqs and make i915 ints work again
 
-commit df3fafd56d88d44b7f691bc275406f19ac555869
+commit 033f754b3d4b903e79d314d072a1f6ffd89e0851
 Author: Dave Airlie <airlied at linux.ie>
 Date:   Tue Sep 16 06:59:58 2008 +1000
 
     enable msi interrupts
 
-commit 6fbaf1dee397b1f2240b3026dc89d0d39b789641
+commit af5c14da9b93227aa417ca08c53537772cb7cb04
 Author: Dave Airlie <airlied at linux.ie>
 Date:   Tue Sep 16 05:10:56 2008 +1000
 
     i915: fix issues with interrupts
 
-commit f0f6b59a6ab4f6a54780a4b7a8807659b3b9799a
+commit 9fcee2a986584c3bc9b743f53d6d9bebbd407161
 Author: Dave Airlie <airlied at panoply-rh.(none)>
 Date:   Tue Sep 9 16:03:12 2008 +1000
 
     i915: fixup hws page
 
-commit dae9cc44a08b0d5e79dec6b3cccc7f8f70cbe542
+commit d6964afe2fbb73b8d5d83d463bc9b122116099b0
 Author: Dave Airlie <airlied at linux.ie>
 Date:   Mon Sep 8 17:08:29 2008 +1000
 
     drm/i915: add modeset default config option support
 
-commit e4143dd833eec57e7f3ad9d54dc2e4d2315b10c0
+commit 065db6e5171231de0970540553d3845ea8b3ce63
 Author: Dave Airlie <airlied at linux.ie>
 Date:   Mon Sep 8 17:08:04 2008 +1000
 
     drm: export drm_mm_takedown
 
-commit 54608765a84591ecc16fe4fb468db12f8b603124
+commit bd0b4b01f6831f7e8f3ae4d743dfe7b4f1e710ae
 Author: Dave Airlie <airlied at linux.ie>
 Date:   Mon Sep 8 17:07:30 2008 +1000
 
     i915: fix master priv accesses
 
-commit 948a856992c8ebd2615c1c9b6d74a757d4e34e64
+commit 2284c4e99382fee59c07c61ae744a48100739463
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Sep 8 13:45:34 2008 +1000
 
     intel: make build
 
-commit b8f2747a954a95e426baac1da0bb4cfee4dd534e
+commit 457d906e8c391e11326031a873c2daf7cee60411
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Sep 8 13:28:52 2008 +1000
 
     jbarnes: add gtt map code
 
-commit 661f42dd5878bbea4f1c785bbe8b290bb2495437
+commit 922f29104a8fdcb54c73c426be413ea988231b79
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Sep 8 13:27:53 2008 +1000
 
     jbarnes: add mmap_io_region
 
-commit d8dfa0ecb3fd079dbc7d0c709692ff417b86a6c7
+commit 7cfa2f3f752aa4353f81f93eb87cbd15fa7ff4d2
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Sep 8 13:25:58 2008 +1000
 
@@ -2250,7 +2256,7 @@
 +	.destroy = tfp410_destroy,
 +};
 diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index bad0144..07b02d0 100644
+index 66e4b8e..0fd7f9d 100644
 --- a/drivers/gpu/drm/i915/i915_dma.c
 +++ b/drivers/gpu/drm/i915/i915_dma.c
 @@ -122,9 +122,19 @@ void i915_free_hws(struct drm_device *dev)
@@ -2283,7 +2289,7 @@
  {
  	drm_i915_private_t *dev_priv = dev->dev_private;
  	/* Make sure interrupts are disabled here because the uninstall ioctl
-@@ -760,6 +770,9 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
+@@ -776,6 +786,9 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
  		return -EINVAL;
  	}
  
@@ -2293,7 +2299,7 @@
  	printk(KERN_DEBUG "set status page addr 0x%08x\n", (u32)hws->addr);
  
  	dev_priv->status_gfx_addr = hws->addr & (0x1ffff<<12);
-@@ -788,129 +801,6 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
+@@ -804,129 +817,6 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
  	return 0;
  }
  
@@ -2423,7 +2429,7 @@
  struct drm_ioctl_desc i915_ioctls[] = {
  	DRM_IOCTL_DEF(DRM_I915_INIT, i915_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
  	DRM_IOCTL_DEF(DRM_I915_FLUSH, i915_flush_ioctl, DRM_AUTH),
-@@ -941,6 +831,7 @@ struct drm_ioctl_desc i915_ioctls[] = {
+@@ -957,6 +847,7 @@ struct drm_ioctl_desc i915_ioctls[] = {
  	DRM_IOCTL_DEF(DRM_I915_GEM_PREAD, i915_gem_pread_ioctl, 0),
  	DRM_IOCTL_DEF(DRM_I915_GEM_PWRITE, i915_gem_pwrite_ioctl, 0),
  	DRM_IOCTL_DEF(DRM_I915_GEM_MMAP, i915_gem_mmap_ioctl, 0),
@@ -2954,7 +2960,7 @@
  }
  
 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index 22b6925..52a16ed 100644
+index 5811601..19bbf6e 100644
 --- a/drivers/gpu/drm/i915/i915_drv.h
 +++ b/drivers/gpu/drm/i915/i915_drv.h
 @@ -32,6 +32,7 @@
@@ -3041,7 +3047,7 @@
  	/* Register state */
  	u8 saveLBB;
  	u32 saveDSPACNTR;
-@@ -404,8 +438,16 @@ struct drm_i915_file_private {
+@@ -407,8 +441,16 @@ struct drm_i915_file_private {
  	} mm;
  };
  
@@ -3058,7 +3064,7 @@
  
  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);
-@@ -426,6 +468,9 @@ extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,
+@@ -429,6 +471,9 @@ extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,
  extern int i915_emit_box(struct drm_device *dev,
  			 struct drm_clip_rect __user *boxes,
  			 int i, int DR1, int DR4);
@@ -3068,7 +3074,7 @@
  
  /* i915_irq.c */
  extern int i915_irq_emit(struct drm_device *dev, void *data,
-@@ -448,6 +493,7 @@ extern int i915_vblank_pipe_get(struct drm_device *dev, void *data,
+@@ -452,6 +497,7 @@ extern int i915_vblank_pipe_get(struct drm_device *dev, void *data,
  extern int i915_vblank_swap(struct drm_device *dev, void *data,
  			    struct drm_file *file_priv);
  extern void i915_enable_irq(drm_i915_private_t *dev_priv, u32 mask);
@@ -3076,7 +3082,7 @@
  
  /* i915_mem.c */
  extern int i915_mem_alloc(struct drm_device *dev, void *data,
-@@ -461,6 +507,11 @@ extern int i915_mem_destroy_heap(struct drm_device *dev, void *data,
+@@ -465,6 +511,11 @@ extern int i915_mem_destroy_heap(struct drm_device *dev, void *data,
  extern void i915_mem_takedown(struct mem_block **heap);
  extern void i915_mem_release(struct drm_device * dev,
  			     struct drm_file *file_priv, struct mem_block *heap);
@@ -3088,7 +3094,7 @@
  /* i915_gem.c */
  int i915_gem_init_ioctl(struct drm_device *dev, void *data,
  			struct drm_file *file_priv);
-@@ -472,6 +523,8 @@ int i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
+@@ -476,6 +527,8 @@ int i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
  			  struct drm_file *file_priv);
  int i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
  			struct drm_file *file_priv);
@@ -3097,7 +3103,7 @@
  int i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
  			      struct drm_file *file_priv);
  int i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,
-@@ -506,6 +559,13 @@ uint32_t i915_get_gem_seqno(struct drm_device *dev);
+@@ -510,6 +563,13 @@ uint32_t i915_get_gem_seqno(struct drm_device *dev);
  void i915_gem_retire_requests(struct drm_device *dev);
  void i915_gem_retire_work_handler(struct work_struct *work);
  void i915_gem_clflush_object(struct drm_gem_object *obj);
@@ -3111,9 +3117,9 @@
  
  /* i915_gem_tiling.c */
  void i915_gem_detect_bit_6_swizzle(struct drm_device *dev);
-@@ -529,10 +589,16 @@ extern void intel_opregion_free(struct drm_device *dev);
- extern void opregion_asle_intr(struct drm_device *dev);
- extern void opregion_enable_asle(struct drm_device *dev);
+@@ -544,10 +604,16 @@ extern void opregion_enable_asle(struct drm_device *dev);
+ 		LOCK_TEST_WITH_RETURN(dev, file_priv);			\
+ } while (0)
  
 +/* modesetting */
 +extern void intel_modeset_init(struct drm_device *dev);
@@ -3128,7 +3134,7 @@
  
  #define I915_VERBOSE 0
  
-@@ -608,7 +674,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
+@@ -623,7 +689,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
  
  #define IS_I965GM(dev) ((dev)->pci_device == 0x2A02)
  
@@ -3137,7 +3143,7 @@
  
  #define IS_G4X(dev) ((dev)->pci_device == 0x2E02 || \
  		     (dev)->pci_device == 0x2E12 || \
-@@ -622,9 +688,9 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
+@@ -637,9 +703,9 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
  		      IS_I945GM(dev) || IS_I965G(dev) || IS_G33(dev))
  
  #define IS_MOBILE(dev) (IS_I830(dev) || IS_I85X(dev) || IS_I915GM(dev) || \
@@ -3150,7 +3156,7 @@
  #define PRIMARY_RINGBUFFER_SIZE         (128*1024)
  
 diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
-index 440659e..ee112ae 100644
+index 64dff87..c295621 100644
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
 @@ -30,11 +30,9 @@
@@ -3316,7 +3322,7 @@
  i915_gem_object_set_domain(struct drm_gem_object *obj,
  			    uint32_t read_domains,
  			    uint32_t write_domain)
-@@ -1736,6 +1803,7 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file_priv)
+@@ -1738,6 +1805,7 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file_priv)
  	seqno = i915_file_priv->mm.last_gem_throttle_seqno;
  	i915_file_priv->mm.last_gem_throttle_seqno =
  		i915_file_priv->mm.last_gem_seqno;
@@ -3324,7 +3330,7 @@
  	if (seqno)
  		ret = i915_wait_request(dev, seqno);
  	mutex_unlock(&dev->struct_mutex);
-@@ -2324,7 +2392,8 @@ i915_gem_init_hws(struct drm_device *dev)
+@@ -2316,7 +2384,8 @@ i915_gem_init_hws(struct drm_device *dev)
  	int ret;
  
  	/* If we need a physical address for the status page, it's already
@@ -3334,7 +3340,7 @@
  	 */
  	if (!I915_NEED_GFX_HWS(dev))
  		return 0;
-@@ -2365,7 +2434,7 @@ i915_gem_init_hws(struct drm_device *dev)
+@@ -2357,7 +2426,7 @@ i915_gem_init_hws(struct drm_device *dev)
  	return 0;
  }
  
@@ -3343,7 +3349,7 @@
  i915_gem_init_ringbuffer(struct drm_device *dev)
  {
  	drm_i915_private_t *dev_priv = dev->dev_private;
-@@ -2429,7 +2498,7 @@ i915_gem_init_ringbuffer(struct drm_device *dev)
+@@ -2421,7 +2490,7 @@ i915_gem_init_ringbuffer(struct drm_device *dev)
  	return 0;
  }
  
@@ -3352,7 +3358,7 @@
  i915_gem_cleanup_ringbuffer(struct drm_device *dev)
  {
  	drm_i915_private_t *dev_priv = dev->dev_private;
-@@ -2462,6 +2531,9 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data,
+@@ -2454,6 +2523,9 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data,
  	drm_i915_private_t *dev_priv = dev->dev_private;
  	int ret;
  
@@ -3362,7 +3368,7 @@
  	if (dev_priv->mm.wedged) {
  		DRM_ERROR("Reenabling wedged hardware, good luck\n");
  		dev_priv->mm.wedged = 0;
-@@ -2490,6 +2562,9 @@ i915_gem_leavevt_ioctl(struct drm_device *dev, void *data,
+@@ -2482,6 +2554,9 @@ i915_gem_leavevt_ioctl(struct drm_device *dev, void *data,
  {
  	int ret;
  
@@ -3810,7 +3816,7 @@
 +	return 0;
 +}
 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 965ec74..3c2fc12 100644
+index 53db0cc..17c5621 100644
 --- a/drivers/gpu/drm/i915/i915_irq.c
 +++ b/drivers/gpu/drm/i915/i915_irq.c
 @@ -30,16 +30,27 @@
@@ -3843,7 +3849,7 @@
  void
  i915_enable_irq(drm_i915_private_t *dev_priv, u32 mask)
  {
-@@ -257,19 +268,16 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -272,19 +283,16 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
  {
  	struct drm_device *dev = (struct drm_device *) arg;
  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -3866,7 +3872,7 @@
  	if (iir == 0) {
  		if (dev->pdev->msi_enabled) {
  			I915_WRITE(IMR, dev_priv->irq_mask_reg);
-@@ -278,38 +286,47 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -293,38 +301,47 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
  		return IRQ_NONE;
  	}
  
@@ -3932,7 +3938,7 @@
  
  		DRM_WAKEUP(&dev->vbl_queue);
  		drm_vbl_send_signals(dev);
-@@ -485,6 +502,120 @@ int i915_irq_wait(struct drm_device *dev, void *data,
+@@ -503,6 +520,120 @@ int i915_irq_wait(struct drm_device *dev, void *data,
  	return i915_wait_irq(dev, irqwait->irq_seq);
  }
  
@@ -4053,7 +4059,7 @@
  /* Set the vblank monitor pipe
   */
  int i915_vblank_pipe_set(struct drm_device *dev, void *data,
-@@ -492,7 +623,6 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
+@@ -510,7 +641,6 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
  {
  	drm_i915_private_t *dev_priv = dev->dev_private;
  	drm_i915_vblank_pipe_t *pipe = data;
@@ -4061,7 +4067,7 @@
  
  	if (!dev_priv) {
  		DRM_ERROR("called with no initialization\n");
-@@ -504,18 +634,10 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
+@@ -522,18 +652,10 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
  		return -EINVAL;
  	}
  
@@ -4083,7 +4089,7 @@
  
  	dev_priv->vblank_pipe = pipe->pipe;
  
-@@ -527,18 +649,19 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
+@@ -545,18 +667,19 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
  {
  	drm_i915_private_t *dev_priv = dev->dev_private;
  	drm_i915_vblank_pipe_t *pipe = data;
@@ -4107,7 +4113,7 @@
  		pipe->pipe |= DRM_I915_VBLANK_PIPE_B;
  
  	return 0;
-@@ -657,7 +780,7 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
+@@ -675,7 +798,7 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
  {
  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
  
@@ -4116,7 +4122,7 @@
  	I915_WRITE(IMR, 0x0);
  	I915_WRITE(IER, 0x0);
  }
-@@ -670,24 +793,11 @@ void i915_driver_irq_postinstall(struct drm_device * dev)
+@@ -688,24 +811,11 @@ void i915_driver_irq_postinstall(struct drm_device * dev)
  	INIT_LIST_HEAD(&dev_priv->vbl_swaps.head);
  	dev_priv->swaps_pending = 0;
  
@@ -5583,10 +5589,10 @@
 +}
 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
 new file mode 100644
-index 0000000..d7e02a2
+index 0000000..10d120a
 --- /dev/null
 +++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -0,0 +1,1602 @@
+@@ -0,0 +1,1619 @@
 +/*
 + * Copyright ?? 2006-2007 Intel Corporation
 + *
@@ -5959,6 +5965,7 @@
 +	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 +	struct intel_framebuffer *intel_fb;
 +	struct drm_i915_gem_object *obj_priv;
++	struct drm_gem_object *obj;
 +	int pipe = intel_crtc->pipe;
 +	unsigned long Start, Offset;
 +	int dspbase = (pipe == 0 ? DSPAADDR : DSPBADDR);
@@ -5975,7 +5982,8 @@
 +
 +	intel_fb = to_intel_framebuffer(crtc->fb);
 +
-+	obj_priv = intel_fb->obj->driver_private;
++	obj = intel_fb->base.mm_private;
++	obj_priv = obj->driver_private;
 +
 +	Start = obj_priv->gtt_offset;
 +	Offset = y * crtc->fb->pitch + x * (crtc->fb->bits_per_pixel / 8);
@@ -7053,21 +7061,34 @@
 +{
 +	struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb);
 +	struct drm_device *dev = fb->dev;
++
 +	if (fb->fbdev)
 +		intelfb_remove(dev, fb);
 +
 +	drm_framebuffer_cleanup(fb);
++	drm_gem_object_unreference(fb->mm_private);
 +
 +	kfree(intel_fb);
 +}
++
++static int intel_user_framebuffer_create_handle(struct drm_framebuffer *fb,
++						struct drm_file *file_priv,
++						unsigned int *handle)
++{
++	struct drm_gem_object *object = fb->mm_private;
++
++	return drm_gem_handle_create(file_priv, object, handle);
++}
 +      
 +static const struct drm_framebuffer_funcs intel_fb_funcs = {
 +	.destroy = intel_user_framebuffer_destroy,
++	.create_handle = intel_user_framebuffer_create_handle,
 +};
 +
-+struct drm_framebuffer *intel_user_framebuffer_create(struct drm_device *dev,
-+						      struct drm_file *filp,
-+						      struct drm_mode_fb_cmd *mode_cmd)
++struct drm_framebuffer *
++intel_framebuffer_create(struct drm_device *dev,
++			 struct drm_mode_fb_cmd *mode_cmd,
++			 void *mm_private)
 +{
 +	struct intel_framebuffer *intel_fb;
 +
@@ -7078,20 +7099,26 @@
 +	if (!drm_framebuffer_init(dev, &intel_fb->base, &intel_fb_funcs))
 +		return NULL;
 +
-+	drm_helper_mode_fill_fb_struct(&intel_fb->base, mode_cmd);
++	drm_helper_mode_fill_fb_struct(&intel_fb->base, mode_cmd, mm_private);
 +
-+	if (filp) {
-+		intel_fb->obj = drm_gem_object_lookup(dev, filp,
-+						      mode_cmd->handle);
-+		if (!intel_fb->obj) {
-+			kfree(intel_fb);
-+			return NULL;
-+		}
-+	}
-+	drm_gem_object_unreference(intel_fb->obj);
 +	return &intel_fb->base;
 +}
 +
++
++static struct drm_framebuffer *
++intel_user_framebuffer_create(struct drm_device *dev,
++			      struct drm_file *filp,
++			      struct drm_mode_fb_cmd *mode_cmd)
++{
++	struct drm_gem_object *obj;
++
++	obj = drm_gem_object_lookup(dev, filp, mode_cmd->handle);
++	if (!obj)
++		return NULL;
++
++	return intel_framebuffer_create(dev, mode_cmd, obj);
++}
++
 +static int intel_insert_new_fb(struct drm_device *dev, struct drm_file *file_priv,
 +				struct drm_framebuffer *fb, struct drm_mode_fb_cmd *mode_cmd)
 +{
@@ -7108,14 +7135,10 @@
 +		mutex_unlock(&dev->struct_mutex);
 +		return -EINVAL;
 +	}
-+	drm_helper_mode_fill_fb_struct(fb, mode_cmd);
-+
-+	drm_gem_object_unreference(intel_fb->obj);
-+	drm_gem_object_unreference(obj);
++	drm_gem_object_unreference(intel_fb->base.mm_private);
++	drm_helper_mode_fill_fb_struct(fb, mode_cmd, obj);
 +	mutex_unlock(&dev->struct_mutex);
 +
-+	intel_fb->obj = obj;
-+
 +	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
 +		if (crtc->fb == fb) {
 +			struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
@@ -7191,7 +7214,7 @@
 +}
 diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
 new file mode 100644
-index 0000000..bffbeef
+index 0000000..256deac
 --- /dev/null
 +++ b/drivers/gpu/drm/i915/intel_drv.h
 @@ -0,0 +1,125 @@
@@ -7247,7 +7270,6 @@
 +
 +struct intel_framebuffer {
 +	struct drm_framebuffer base;
-+	struct drm_gem_object *obj;
 +};
 +
 +
@@ -7316,9 +7338,10 @@
 +extern void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
 +				    u16 blue, int regno);
 +
-+extern struct drm_framebuffer *intel_user_framebuffer_create(struct drm_device *dev,
-+							     struct drm_file *file_priv,
-+							     struct drm_mode_fb_cmd *mode_cmd);
++extern struct drm_framebuffer *
++intel_framebuffer_create(struct drm_device *dev,
++			 struct drm_mode_fb_cmd *mode_cmd,
++			 void *mm_private);
 +#endif /* __INTEL_DRV_H__ */
 diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
 new file mode 100644
@@ -7827,10 +7850,10 @@
 +}
 diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
 new file mode 100644
-index 0000000..fea083b
+index 0000000..8ec8e73
 --- /dev/null
 +++ b/drivers/gpu/drm/i915/intel_fb.c
-@@ -0,0 +1,910 @@
+@@ -0,0 +1,908 @@
 +/*
 + * Copyright ?? 2007 David Airlie
 + *
@@ -8321,7 +8344,7 @@
 +
 +	i915_gem_clflush_object(fbo);
 +
-+	fb = intel_user_framebuffer_create(dev, NULL, &mode_cmd);
++	fb = intel_framebuffer_create(dev, &mode_cmd, fbo);
 +	if (!fb) {
 +		DRM_ERROR("failed to allocate fb.\n");
 +		ret = -ENOMEM;
@@ -8333,8 +8356,6 @@
 +	intel_fb = to_intel_framebuffer(fb);
 +	*intel_fb_p = intel_fb;
 +
-+	intel_fb->obj = fbo;
-+
 +	info = framebuffer_alloc(sizeof(struct intelfb_par), device);
 +	if (!info) {
 +		ret = -ENOMEM;
@@ -8730,7 +8751,7 @@
 +		unregister_framebuffer(info);
 +		iounmap(info->screen_base);
 +		mutex_lock(&dev->struct_mutex);
-+		drm_gem_object_unreference(intel_fb->obj);
++		drm_gem_object_unreference(intel_fb->base.mm_private);
 +		mutex_unlock(&dev->struct_mutex);
 +		framebuffer_release(info);
 +	}
@@ -12837,10 +12858,10 @@
  	/** Handle for the object */
  	uint32_t handle;
 diff --git a/mm/mmap.c b/mm/mmap.c
-index 339cf5c..62f54fe 100644
+index e7a5a68..d689d36 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
-@@ -1244,6 +1244,171 @@ unacct_error:
+@@ -1248,6 +1248,171 @@ unacct_error:
  	return error;
  }
  

drm-modesetting-radeon.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.29 -r 1.30 drm-modesetting-radeon.patch
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- drm-modesetting-radeon.patch	19 Sep 2008 17:12:29 -0000	1.29
+++ drm-modesetting-radeon.patch	23 Sep 2008 05:06:11 -0000	1.30
@@ -1,22 +1,43 @@
-commit 68d1f0df534df3cadc55a064e38c9afb4a66b875
+commit 14eed5a3ffea4629d8189605a6ece8762f07d9fe
+Author: Kristian H??gsberg <krh at redhat.com>
+Date:   Mon Sep 22 18:40:36 2008 -0400
+
+    radeon: Fix type in check for tmds type.
+
+commit 0168869442658dbd7e33e65be597f9089a79e6a8
+Author: Kristian H??gsberg <krh at redhat.com>
+Date:   Mon Sep 22 12:00:57 2008 -0400
+
+    Store the buffer object backing the fb as a void pointer, not a handle.
+    
+    This lets us defer handle creation until userspace acutally asks for
+    one, at which point we also have a drm_file to associate it with.
+
+commit 0664262b8159ef0c66ad392d2d503c9f016985dc
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Sun Sep 21 09:48:51 2008 +1000
+
+    drm: fixups on top of rebase
+
+commit 061cefa1df3eb9529d343188d3897155f00ff16c
 Author: Dave Airlie <airlied at linux.ie>
 Date:   Sat Sep 20 03:08:05 2008 +1000
 
     radeon: rmx_fixup() fixes for legacy chips
 
-commit 59a50b92d61cdd939026d7b5bcb2584e936927b0
+commit 3b23502dc6c04204635dc3a84ba5bcea1d190621
 Author: Dave Airlie <airlied at linux.ie>
 Date:   Sat Sep 20 01:55:27 2008 +1000
 
     radeon: fix combios
 
-commit 6a804321a2b1220143a64a3a78d72b03770fd285
+commit c059d6eff66af51a9444a01c39b3d759a6a0c729
 Author: Dave Airlie <airlied at linux.ie>
 Date:   Fri Sep 19 09:17:36 2008 +1000
 
     radeon: port Alexs patches from modesetting-gem
 
-commit 757bdeefa398c5b856d6321e3622436c676d04a5
+commit f35ce101abe8623172636bac692db1d0fd4e529c
 Author: Kristian H??gsberg <krh at redhat.com>
 Date:   Thu Sep 18 16:10:29 2008 -0400
 
@@ -25,7 +46,7 @@
     Shouldn't trigger under normal use and when something breaks, it will
     be easier to debug.
 
-commit 90f000493d3f8ea7338756e06fd644e0dcf0aff6
+commit e36fdeebf9d0ea75618b693abb1877a1b4a19bdf
 Author: Kristian H??gsberg <krh at redhat.com>
 Date:   Thu Sep 18 16:07:50 2008 -0400
 
@@ -34,25 +55,25 @@
     The X server emits writes to R300_DST_PIPE_CONFIG for R420 chipsets during
     accel init.
 
-commit af13076bbaad40f3553346a366b25942483f54fb
+commit d9852d3eff1b6d9f164aff30d9a22e6f93a6df08
 Author: Kristian H??gsberg <krh at redhat.com>
 Date:   Thu Sep 18 14:53:46 2008 -0400
 
     radeon kms: Get precedence right when computing PLL values.
 
-commit 41b33ad8bfd879c37f72e560e0b1e1b57f537093
+commit 2b786dcd4c4d53c4a6cb6405999c968f5ca304ac
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Sep 18 09:55:14 2008 +1000
 
     radeon: further LVDS fixes
 
-commit 882f9bc454b85149fdf96db79932a8f1d57b5136
+commit 0ecedf0ffa7266e3652aee0995e23ca2fe5d8775
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Sep 18 09:54:12 2008 +1000
 
     radeon: legacy lvds updates
 
-commit 7d7949742ae5d6d0aca8857bfcab77b2fffaf0d7
+commit e46e9dc68d2d3c01b14e19703134252452af724e
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Sep 11 18:26:27 2008 +1000
 
@@ -60,7 +81,7 @@
     
     just fallback around busted stuff for now
 
-commit 3bd833adf4e37a47d9e794498c4cdb4bff09d167
+commit 48df612620c266cf324fdd12248b82e4f4d214d8
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Sep 11 18:25:18 2008 +1000
 
@@ -68,13 +89,13 @@
     
     also dirty buffer on validate
 
-commit c323b90fe655fcee25aa7e39671c1594e897c4f6
+commit 3a58875d091f808f39b2684480b392a8e1858692
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Sep 11 17:13:32 2008 +1000
 
     radeon: disable blit moves
 
-commit 7783a2254b7707861662b3f94ca2ca38c83ce64b
+commit 26421bce94db32eb3582bd852aca57e5ff3f3760
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Sep 11 16:18:27 2008 +1000
 
@@ -82,73 +103,73 @@
     
     Normally this will be due to an AGP driver needing updating
 
-commit ed3d32c22ed856ef32594fe2efb88c55c8006627
+commit 5e7c7a1f7cf302847b6a9632d60cd0daf9f61eb8
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Sep 10 14:35:43 2008 +1000
 
     radeon: do proper memory controller init and setup
 
-commit b20aa3e4a453fe5132794e6fddd0e03d0209466a
+commit 8bc3f7fe8ca6ad91354902eee4285838bf00eeaf
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Sep 10 14:35:08 2008 +1000
 
     radeon: fix return value
 
-commit e64d245c67dce41434a5f9504d7f6f530cf7e5c2
+commit 722125d4dc2748c0b64dbe67492295f4d6d31511
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Sep 10 14:34:39 2008 +1000
 
     radeon: fixup reference counting properly
 
-commit dc35ec837f7a0ff258e6fde4326ccae7fd77650b
+commit ac4ff77cf50396c58bddc797983b231e8245f744
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Sep 9 15:55:38 2008 +1000
 
     radeon: sort out atom vs combios tables for r400 cards
 
-commit 3f4de41530215c5fe6a15b75defa1164615f4878
+commit b73c5ac2f7ed4d2fffb39308f2cf4071d6de4230
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Sep 8 11:37:26 2008 +1000
 
     radeon: remove unneeded debugging
 
-commit 2a5b61e6726691102e075e07e6d9f8b1817b73d4
+commit 6f1ffd8613c786d51b7367f0ae30b61b72e05498
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Sep 8 11:25:12 2008 +1000
 
     radeon: don't do full edid for detection purposes
 
-commit 563e90db2ca306fe0dee104703a48b5bc5d7fd93
+commit 41c9a919040f89a369291748448c4941cc4a8509
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Sep 8 10:27:48 2008 +1000
 
     radeon: disable debugging that sneaky itself on
 
-commit aa65ff0b4b4e5309a5df36886170b97780245d53
+commit e179c186597b46e3931d30c09d2030ba0a865e0b
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Sep 8 10:20:44 2008 +1000
 
     radeon: make text reserve 256k
 
-commit 65e46dddb8d5626c7299b22ee775a2592cbcca1b
+commit f78df3fab9f421253adfbdf353bcb2cefd16037a
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Sep 8 10:11:27 2008 +1000
 
     radeon: don't disable VGA bits it breaks X later
 
-commit 7111e3e07597d2eaeea9e39e22e9228458eb615b
+commit 4559a458f95747e18c3a524b1c4fcb58d7bcd5e4
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Sep 5 11:26:55 2008 +1000
 
     drm: export drm_i915_flip_t type to userspace to build Mesa
 
-commit b27e23f97a6896b0b9fb3981fbcc78246598fb1d
+commit 39014717471465c27bd9d234ae65767d5a44725f
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Sep 5 16:12:59 2008 +1000
 
     radeon: further suspend/resume support
[...1989 lines suppressed...]
++		drm_gem_object_unreference(fb->mm_private);
 +		mutex_unlock(&dev->struct_mutex);
 +		framebuffer_release(info);
 +	}
@@ -38644,10 +38780,10 @@
  	radeon_enable_interrupt(dev);
 diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
 new file mode 100644
-index 0000000..d51fc52
+index 0000000..bc28c43
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
-@@ -0,0 +1,1025 @@
+@@ -0,0 +1,1029 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -38826,6 +38962,7 @@
 +	struct drm_device *dev = crtc->dev;
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
 +	struct radeon_framebuffer *radeon_fb;
++	struct drm_gem_object *obj;
 +	struct drm_radeon_gem_object *obj_priv;
 +	uint32_t base;
 +	uint32_t crtc_offset, crtc_offset_cntl, crtc_tile_x0_y0 = 0;
@@ -38835,7 +38972,8 @@
 +
 +	radeon_fb = to_radeon_framebuffer(crtc->fb);
 +
-+	obj_priv = radeon_fb->obj->driver_private;
++	obj = radeon_fb->base.mm_private;
++	obj_priv = obj->driver_private;
 +
 +	crtc_offset = obj_priv->bo->offset;
 +
@@ -39249,6 +39387,7 @@
 +	struct drm_device *dev = crtc->dev;
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
 +	struct radeon_framebuffer *radeon_fb;
++	struct drm_gem_object *obj;
 +	struct drm_radeon_gem_object *obj_priv;
 +	uint32_t base;
 +	uint32_t crtc2_offset, crtc2_offset_cntl, crtc2_tile_x0_y0 = 0;
@@ -39258,7 +39397,8 @@
 +
 +	radeon_fb = to_radeon_framebuffer(crtc->fb);
 +
-+	obj_priv = radeon_fb->obj->driver_private;
++	obj = radeon_fb->base.mm_private;
++	obj_priv = obj->driver_private;
 +
 +	crtc2_offset = obj_priv->bo->offset;
 +
@@ -41055,10 +41195,10 @@
  
 diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
 new file mode 100644
-index 0000000..d4b33dd
+index 0000000..577c3cf
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_mode.h
-@@ -0,0 +1,348 @@
+@@ -0,0 +1,347 @@
 +/*
 + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
 + *                VA Linux Systems Inc., Fremont, California.
@@ -41309,7 +41449,6 @@
 +
 +struct radeon_framebuffer {
 +	struct drm_framebuffer base;
-+	struct drm_gem_object *obj;
 +	struct drm_bo_kmap_obj kmap_obj;
 +};
 +
@@ -41374,9 +41513,9 @@
 +extern void radeon_atom_initialize_bios_scratch_regs(struct drm_device *dev);
 +extern void radeon_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
 +				     u16 blue, int regno);
-+struct drm_framebuffer *radeon_user_framebuffer_create(struct drm_device *dev,
-+						       struct drm_file *filp,
-+						       struct drm_mode_fb_cmd *mode_cmd);
++struct drm_framebuffer *radeon_framebuffer_create(struct drm_device *dev,
++						  struct drm_mode_fb_cmd *mode_cmd,
++						  void *mm_private);
 +
 +int radeonfb_probe(struct drm_device *dev);
 +
@@ -41409,10 +41548,10 @@
 +#endif
 diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
 new file mode 100644
-index 0000000..92d44b5
+index 0000000..6b53c60
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_pm.c
-@@ -0,0 +1,240 @@
+@@ -0,0 +1,241 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -41469,10 +41608,10 @@
 +		if (!radeon_fb)
 +			continue;
 +
-+		if (!radeon_fb->obj)
++		if (!radeon_fb->base.mm_private)
 +			continue;
 +		
-+		radeon_gem_object_unpin(radeon_fb->obj);
++		radeon_gem_object_unpin(radeon_fb->base.mm_private);
 +	}
 +
 +	if (!(dev_priv->flags & RADEON_IS_IGP))
@@ -41583,10 +41722,11 @@
 +		if (!radeon_fb)
 +			continue;
 +
-+		if (!radeon_fb->obj)
++		if (!radeon_fb->base.mm_private)
 +			continue;
 +		
-+		radeon_gem_object_pin(radeon_fb->obj, PAGE_SIZE, RADEON_GEM_DOMAIN_VRAM);
++		radeon_gem_object_pin(radeon_fb->base.mm_private,
++				      PAGE_SIZE, RADEON_GEM_DOMAIN_VRAM);
 +	}
 +	/* blat the mode back in */
 +	drm_helper_resume_force_mode(dev);
@@ -47744,7 +47884,7 @@
  		struct drm_sman_mm sman_mm;
  		sman_mm.private = (void *)0xFFFFFFFF;
 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
-index cce2f4c..4db67c5 100644
+index 36698e5..63b56f3 100644
 --- a/drivers/pci/probe.c
 +++ b/drivers/pci/probe.c
 @@ -203,13 +203,6 @@ static u64 pci_size(u64 base, u64 maxbase, u64 mask)
@@ -47761,7 +47901,7 @@
  static inline enum pci_bar_type decode_bar(struct resource *res, u32 bar)
  {
  	if ((bar & PCI_BASE_ADDRESS_SPACE) == PCI_BASE_ADDRESS_SPACE_IO) {
-@@ -322,6 +315,46 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
+@@ -328,6 +321,46 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
  	goto out;
  }
  
@@ -48756,10 +48896,10 @@
  #endif				/* __KERNEL__ */
 diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
 new file mode 100644
-index 0000000..5f63dc2
+index 0000000..6a73a71
 --- /dev/null
 +++ b/include/drm/drm_crtc.h
-@@ -0,0 +1,714 @@
+@@ -0,0 +1,717 @@
 +/*
 + * Copyright ?? 2006 Keith Packard
 + * Copyright ?? 2007 Intel Corporation
@@ -48982,6 +49122,9 @@
 +
 +struct drm_framebuffer_funcs {
 +	void (*destroy)(struct drm_framebuffer *framebuffer);
++	int (*create_handle)(struct drm_framebuffer *fb,
++			     struct drm_file *file_priv,
++			     unsigned int *handle);
 +};
 +
 +struct drm_framebuffer {
@@ -48999,7 +49142,7 @@
 +	void *fbdev;
 +	u32 pseudo_palette[17];
 +	struct list_head filp_head;
-+	uint32_t mm_handle;
++	void *mm_private;
 +};
 +
 +struct drm_property_blob {
@@ -49476,10 +49619,10 @@
 +
 diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
 new file mode 100644
-index 0000000..c071915
+index 0000000..01b1423
 --- /dev/null
 +++ b/include/drm/drm_crtc_helper.h
-@@ -0,0 +1,96 @@
+@@ -0,0 +1,97 @@
 +/*
 + * Copyright ?? 2006 Keith Packard
 + * Copyright ?? 2007 Intel Corporation
@@ -49557,7 +49700,8 @@
 +extern bool drm_helper_crtc_in_use(struct drm_crtc *crtc);
 +
 +extern int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb,
-+					  struct drm_mode_fb_cmd *mode_cmd);
++					  struct drm_mode_fb_cmd *mode_cmd,
++					  void *mm_private);
 +
 +static inline void drm_crtc_helper_add(struct drm_crtc *crtc, const struct drm_crtc_helper_funcs *funcs)
 +{


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.970
retrieving revision 1.971
diff -u -r1.970 -r1.971
--- kernel.spec	23 Sep 2008 01:52:47 -0000	1.970
+++ kernel.spec	23 Sep 2008 05:06:11 -0000	1.971
@@ -609,9 +609,6 @@
 Patch1811: drm-modesetting-radeon.patch
 Patch1812: drm-modesetting-i915.patch
 Patch1813: drm-nouveau.patch
-Patch1814: drm-create-handle-for-fb.patch
-Patch1815: drm-modesetting-intel-mm-private.patch
-Patch1816: drm-modesetting-fix-external-tmds-check.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1170,9 +1167,6 @@
 ApplyPatch drm-modesetting-radeon.patch
 ApplyPatch drm-modesetting-i915.patch
 ApplyPatch drm-nouveau.patch
-ApplyPatch drm-create-handle-for-fb.patch
-ApplyPatch drm-modesetting-intel-mm-private.patch
-ApplyPatch drm-modesetting-fix-external-tmds-check.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1764,6 +1758,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Sep 23 2008 Dave Airlie <airlied at redhat.com>
+- rebase drm patches with latest upstream GEM bits
+
 * Mon Sep 22 2008 Jeremy Katz <katzj at redhat.com>
 - Enable Geode framebuffer so that we can have a console on the XO
 



From dchen at fedoraproject.org  Tue Sep 23 05:13:40 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue, 23 Sep 2008 05:13:40 +0000 (UTC)
Subject: rpms/libUnihan/F-9 .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 libUnihan.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20080923051340.A224D70033@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libUnihan/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16925/F-9

Modified Files:
	.cvsignore import.log libUnihan.spec sources 
Log Message:
PinYin and ZhuYin tonemark format support.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Sep 2008 02:44:36 -0000	1.3
+++ .cvsignore	23 Sep 2008 05:13:09 -0000	1.4
@@ -1 +1 @@
-libUnihan-0.5.0-Source.tar.gz
+libUnihan-0.5.1-Source.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	23 Sep 2008 02:44:36 -0000	1.2
+++ import.log	23 Sep 2008 05:13:09 -0000	1.3
@@ -1,2 +1,3 @@
 libUnihan-0_4_1-1_fc9:F-9:libUnihan-0.4.1-1.fc9.src.rpm:1220247194
 libUnihan-0_5_0-0_fc9:F-9:libUnihan-0.5.0-0.fc9.src.rpm:1222137869
+libUnihan-0_5_1-0_fc9:F-9:libUnihan-0.5.1-0.fc9.src.rpm:1222146781


Index: libUnihan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/F-9/libUnihan.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libUnihan.spec	23 Sep 2008 02:44:36 -0000	1.2
+++ libUnihan.spec	23 Sep 2008 05:13:09 -0000	1.3
@@ -1,7 +1,7 @@
 Name:           libUnihan
 %define         libUnihan_ver_major 0
 %define         libUnihan_ver_minor 5
-Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.0
+Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.1
 Release:        0%{?dist}
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -58,6 +58,9 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+#%check
+#make test
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -78,7 +81,6 @@
 %{_includedir}/%{name}/
 %{_libdir}/%{name}.so
 %{_bindir}/unihan_converter
-%{_bindir}/unihan_field_validation
 
 %files doc
 %defattr(-,root,root,-)
@@ -86,7 +88,7 @@
 
 
 %changelog
-* Tue Sep 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.5.0-0
+* Tue Sep 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.5.1-0
 - New Features:
   + PinYin accent format conversion functions (C and SQL scalar).
   + ZhuYin tone mark format conversion functions (C and SQL scalar).
@@ -102,7 +104,7 @@
   + Add test suite.
   + Where-clause-generator is now able to escape the quote character(').
   + unihan_field_validation is moved to test/, therefore it will not be in binary package.
-  + New make targets: rpm and srpm to generate rpm and srpm.
+  + New make targets: rpm, srpm, rpm_db and srpm_db to generate rpm and srpm for libUnihan and UnihanDb.
 - Removed:
   + unihanSql_get_result_table(). As it uses sqlite3_get_table() which might cause memory leak.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Sep 2008 02:44:36 -0000	1.3
+++ sources	23 Sep 2008 05:13:09 -0000	1.4
@@ -1 +1 @@
-f7cc02c3764bc692a588024e72ddcc00  libUnihan-0.5.0-Source.tar.gz
+a5232942a5b2743d30c9eca2c6d7a7c5  libUnihan-0.5.1-Source.tar.gz



From dchen at fedoraproject.org  Tue Sep 23 05:14:53 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue, 23 Sep 2008 05:14:53 +0000 (UTC)
Subject: rpms/libUnihan/F-8 import.log, 1.2, 1.3 libUnihan.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20080923051453.B8B4070033@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libUnihan/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17200/F-8

Modified Files:
	import.log libUnihan.spec sources 
Log Message:
PinYin and ZhuYin tonemark format support.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/F-8/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	23 Sep 2008 02:45:45 -0000	1.2
+++ import.log	23 Sep 2008 05:14:23 -0000	1.3
@@ -1,2 +1,3 @@
 libUnihan-0_4_1-1_fc9:F-8:libUnihan-0.4.1-1.fc9.src.rpm:1221694440
 libUnihan-0_5_0-0_fc9:F-8:libUnihan-0.5.0-0.fc9.src.rpm:1222137937
+libUnihan-0_5_1-0_fc9:F-8:libUnihan-0.5.1-0.fc9.src.rpm:1222146855


Index: libUnihan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/F-8/libUnihan.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libUnihan.spec	23 Sep 2008 02:45:45 -0000	1.2
+++ libUnihan.spec	23 Sep 2008 05:14:23 -0000	1.3
@@ -1,7 +1,7 @@
 Name:           libUnihan
 %define         libUnihan_ver_major 0
 %define         libUnihan_ver_minor 5
-Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.0
+Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.1
 Release:        0%{?dist}
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -58,6 +58,9 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+#%check
+#make test
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -78,7 +81,6 @@
 %{_includedir}/%{name}/
 %{_libdir}/%{name}.so
 %{_bindir}/unihan_converter
-%{_bindir}/unihan_field_validation
 
 %files doc
 %defattr(-,root,root,-)
@@ -86,7 +88,7 @@
 
 
 %changelog
-* Tue Sep 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.5.0-0
+* Tue Sep 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.5.1-0
 - New Features:
   + PinYin accent format conversion functions (C and SQL scalar).
   + ZhuYin tone mark format conversion functions (C and SQL scalar).
@@ -102,7 +104,7 @@
   + Add test suite.
   + Where-clause-generator is now able to escape the quote character(').
   + unihan_field_validation is moved to test/, therefore it will not be in binary package.
-  + New make targets: rpm and srpm to generate rpm and srpm.
+  + New make targets: rpm, srpm, rpm_db and srpm_db to generate rpm and srpm for libUnihan and UnihanDb.
 - Removed:
   + unihanSql_get_result_table(). As it uses sqlite3_get_table() which might cause memory leak.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Sep 2008 02:45:45 -0000	1.2
+++ sources	23 Sep 2008 05:14:23 -0000	1.3
@@ -1 +1 @@
-f7cc02c3764bc692a588024e72ddcc00  libUnihan-0.5.0-Source.tar.gz
+a5232942a5b2743d30c9eca2c6d7a7c5  libUnihan-0.5.1-Source.tar.gz



From dchen at fedoraproject.org  Tue Sep 23 05:16:11 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue, 23 Sep 2008 05:16:11 +0000 (UTC)
Subject: rpms/libUnihan/EL-5 .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 libUnihan.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20080923051611.45DAE70033@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libUnihan/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17468/EL-5

Modified Files:
	.cvsignore import.log libUnihan.spec sources 
Log Message:
PinYin and ZhuYin tonemark format support.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Sep 2008 02:47:17 -0000	1.3
+++ .cvsignore	23 Sep 2008 05:15:41 -0000	1.4
@@ -1 +1 @@
-libUnihan-0.5.0-Source.tar.gz
+libUnihan-0.5.1-Source.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	23 Sep 2008 02:47:17 -0000	1.2
+++ import.log	23 Sep 2008 05:15:41 -0000	1.3
@@ -1,2 +1,3 @@
 libUnihan-0_4_1-1_fc9:EL-5:libUnihan-0.4.1-1.fc9.src.rpm:1220247605
 libUnihan-0_5_0-0_fc9:EL-5:libUnihan-0.5.0-0.fc9.src.rpm:1222138007
+libUnihan-0_5_1-0_fc9:EL-5:libUnihan-0.5.1-0.fc9.src.rpm:1222146931


Index: libUnihan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/EL-5/libUnihan.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libUnihan.spec	23 Sep 2008 02:47:17 -0000	1.2
+++ libUnihan.spec	23 Sep 2008 05:15:41 -0000	1.3
@@ -1,7 +1,7 @@
 Name:           libUnihan
 %define         libUnihan_ver_major 0
 %define         libUnihan_ver_minor 5
-Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.0
+Version:        %{libUnihan_ver_major}.%{libUnihan_ver_minor}.1
 Release:        0%{?dist}
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -58,6 +58,9 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+#%check
+#make test
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -78,7 +81,6 @@
 %{_includedir}/%{name}/
 %{_libdir}/%{name}.so
 %{_bindir}/unihan_converter
-%{_bindir}/unihan_field_validation
 
 %files doc
 %defattr(-,root,root,-)
@@ -86,7 +88,7 @@
 
 
 %changelog
-* Tue Sep 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.5.0-0
+* Tue Sep 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.5.1-0
 - New Features:
   + PinYin accent format conversion functions (C and SQL scalar).
   + ZhuYin tone mark format conversion functions (C and SQL scalar).
@@ -102,7 +104,7 @@
   + Add test suite.
   + Where-clause-generator is now able to escape the quote character(').
   + unihan_field_validation is moved to test/, therefore it will not be in binary package.
-  + New make targets: rpm and srpm to generate rpm and srpm.
+  + New make targets: rpm, srpm, rpm_db and srpm_db to generate rpm and srpm for libUnihan and UnihanDb.
 - Removed:
   + unihanSql_get_result_table(). As it uses sqlite3_get_table() which might cause memory leak.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libUnihan/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Sep 2008 02:47:17 -0000	1.3
+++ sources	23 Sep 2008 05:15:41 -0000	1.4
@@ -1 +1 @@
-f7cc02c3764bc692a588024e72ddcc00  libUnihan-0.5.0-Source.tar.gz
+a5232942a5b2743d30c9eca2c6d7a7c5  libUnihan-0.5.1-Source.tar.gz



From lucilanga at fedoraproject.org  Tue Sep 23 05:18:55 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue, 23 Sep 2008 05:18:55 +0000 (UTC)
Subject: rpms/xlog/devel xlog-1.8.1-doc.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 xlog.spec, 1.4, 1.5 xlog-1.7-doc.patch,
	1.1, NONE
Message-ID: <20080923051855.714CA70033@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xlog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17961

Modified Files:
	.cvsignore sources xlog.spec 
Added Files:
	xlog-1.8.1-doc.patch 
Removed Files:
	xlog-1.7-doc.patch 
Log Message:
* Mon Sep 22 2008 Lucian Langa <cooly at gnome.eu.org> - 1.8.1-1
- new upstream versuion
- change category to HamRadio

xlog-1.8.1-doc.patch:

--- NEW FILE xlog-1.8.1-doc.patch ---
--- xlog-1.8.1/data/Makefile.am	2007-03-29 18:29:40.000000000 +0300
+++ xlog-1.8.1-mod/data/Makefile.am	2008-07-17 16:15:39.000000000 +0300
@@ -1 +1 @@
-SUBDIRS = desktop doc dxcc glabels images man maps mime pixmaps remote utils
+SUBDIRS = desktop dxcc images man maps mime pixmaps remote utils
--- xlog-1.8.1/Makefile.am	2007-12-08 15:28:59.000000000 +0200
+++ xlog-1.8.1-mod/Makefile.am	2008-07-17 16:22:59.000000000 +0300
@@ -11,13 +11,9 @@
 
 install-data-local:
 	@$(NORMAL_INSTALL)
-	$(INSTALL_DATA) AUTHORS $(DESTDIR)$(pkgdatadir)
-	$(INSTALL_DATA) ChangeLog $(DESTDIR)$(pkgdatadir)
-	$(INSTALL_DATA) BUGS $(DESTDIR)$(pkgdatadir)
 
 rpm: Makefile
 	make dist
 	$(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
 	rm $(PACKAGE)-$(VERSION).tar.gz
 
-ACLOCAL_AMFLAGS = -I m4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Aug 2008 15:23:01 -0000	1.2
+++ .cvsignore	23 Sep 2008 05:18:25 -0000	1.3
@@ -1 +1 @@
-xlog-1.7.tar.gz
+xlog-1.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Aug 2008 15:23:01 -0000	1.2
+++ sources	23 Sep 2008 05:18:25 -0000	1.3
@@ -1 +1 @@
-f7d52236715f8ce30f251209dc3753d2  xlog-1.7.tar.gz
+df1b8bf7bc88cf8273936a13ace8bc0d  xlog-1.8.1.tar.gz


Index: xlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/devel/xlog.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xlog.spec	29 Aug 2008 10:06:33 -0000	1.4
+++ xlog.spec	23 Sep 2008 05:18:25 -0000	1.5
@@ -1,13 +1,13 @@
 Name:           xlog
-Version:        1.7
-Release:        4%{?dist}
+Version:        1.8.1
+Release:        1%{?dist}
 Summary:        Logging program for Hamradio Operators
 
 Group:          Applications/Communications
 License:        GPLv3
 URL:            http://pg4i.chronos.org.uk/linux/%{name}.html
 Source0:        http://pg4i.chronos.org.uk/download/%{name}-%{version}.tar.gz
-Patch0:         xlog-1.7-doc.patch
+Patch0:         xlog-1.8.1-doc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #BuildRequires: pkgconfig
 BuildRequires: gtk2-devel
@@ -29,6 +29,7 @@
 %patch0 -p1 -b doc
 #fix bogus .desktop file
 sed -i -e "s/ApplicationHamRadio/Application/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
+sed -i -e "s/Utility;Database;HamRadio;GTK/HamRadio/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
 sed -i -e "s/.png//g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
 
 %build
@@ -45,9 +46,8 @@
 
 %find_lang %{name}
 
-desktop-file-install --vendor fedora --delete-original  \
+desktop-file-install \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
-        --remove-category Application \
         $RPM_BUILD_ROOT%{_datadir}/applications/xlog.desktop
 
 %post
@@ -69,6 +69,7 @@
 %{_bindir}/%{name}
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/dxcc
+%{_datadir}/%{name}/maps
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/gnome-mime-text-x-%{name}.png
 %{_datadir}/icons/%{name}-icon.png
@@ -79,6 +80,10 @@
 
 
 %changelog
+* Mon Sep 22 2008 Lucian Langa <cooly at gnome.eu.org> - 1.8.1-1
+- new upstream versuion
+- change category to HamRadio
+
 * Fri Aug 29 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.7-4
 - include /usr/share/xlog
 


--- xlog-1.7-doc.patch DELETED ---



From pgordon at fedoraproject.org  Tue Sep 23 05:24:16 2008
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Tue, 23 Sep 2008 05:24:16 +0000 (UTC)
Subject: rpms/deluge/devel .cvsignore, 1.41, 1.42 deluge.spec, 1.64,
	1.65 sources, 1.41, 1.42
Message-ID: <20080923052416.E065370033@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18853

Modified Files:
	.cvsignore deluge.spec sources 
Log Message:
Update to 1.0.0 Final - W00t!


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	17 Sep 2008 04:24:27 -0000	1.41
+++ .cvsignore	23 Sep 2008 05:23:46 -0000	1.42
@@ -1 +1 @@
-deluge-0.9.09.tar.bz2
+deluge-1.0.0.tar.bz2


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- deluge.spec	17 Sep 2008 04:24:27 -0000	1.64
+++ deluge.spec	23 Sep 2008 05:23:46 -0000	1.65
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		deluge
-Version:	0.9.09
+Version:	1.0.0
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Peter Gordon <peter at thecodergeek.com> - 1.0.0-1
+- Update to new upstream release (1.0.0 Final)
+
 * Tue Sep 16 2008 Peter Gordon <peter at thecodergeek.com> - 0.9.09-1
 - Update to new upstream release candidate (1.0.0 RC9)
 - Drop mt-boost patch (fixed upstream):


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	17 Sep 2008 04:24:27 -0000	1.41
+++ sources	23 Sep 2008 05:23:46 -0000	1.42
@@ -1 +1 @@
-b8e6c53f4cf07fd715c7c596d06274f1  deluge-0.9.09.tar.bz2
+5b7e846d5f6fe1a561e743ab07838090  deluge-1.0.0.tar.bz2



From lucilanga at fedoraproject.org  Tue Sep 23 05:27:33 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue, 23 Sep 2008 05:27:33 +0000 (UTC)
Subject: rpms/xlog/F-8 xlog-1.8.1-doc.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 xlog.spec, 1.2, 1.3 xlog-1.7-doc.patch,
	1.1, NONE
Message-ID: <20080923052733.75DBF70033@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xlog/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19406

Modified Files:
	.cvsignore sources xlog.spec 
Added Files:
	xlog-1.8.1-doc.patch 
Removed Files:
	xlog-1.7-doc.patch 
Log Message:
* Mon Sep 22 2008 Lucian Langa <cooly at gnome.eu.org> - 1.8.1-1
- new upstream versuion
- change category to HamRadio

xlog-1.8.1-doc.patch:

--- NEW FILE xlog-1.8.1-doc.patch ---
--- xlog-1.8.1/data/Makefile.am	2007-03-29 18:29:40.000000000 +0300
+++ xlog-1.8.1-mod/data/Makefile.am	2008-07-17 16:15:39.000000000 +0300
@@ -1 +1 @@
-SUBDIRS = desktop doc dxcc glabels images man maps mime pixmaps remote utils
+SUBDIRS = desktop dxcc images man maps mime pixmaps remote utils
--- xlog-1.8.1/Makefile.am	2007-12-08 15:28:59.000000000 +0200
+++ xlog-1.8.1-mod/Makefile.am	2008-07-17 16:22:59.000000000 +0300
@@ -11,13 +11,9 @@
 
 install-data-local:
 	@$(NORMAL_INSTALL)
-	$(INSTALL_DATA) AUTHORS $(DESTDIR)$(pkgdatadir)
-	$(INSTALL_DATA) ChangeLog $(DESTDIR)$(pkgdatadir)
-	$(INSTALL_DATA) BUGS $(DESTDIR)$(pkgdatadir)
 
 rpm: Makefile
 	make dist
 	$(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
 	rm $(PACKAGE)-$(VERSION).tar.gz
 
-ACLOCAL_AMFLAGS = -I m4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Aug 2008 15:29:05 -0000	1.2
+++ .cvsignore	23 Sep 2008 05:27:03 -0000	1.3
@@ -1 +1 @@
-xlog-1.7.tar.gz
+xlog-1.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Aug 2008 15:29:05 -0000	1.2
+++ sources	23 Sep 2008 05:27:03 -0000	1.3
@@ -1 +1 @@
-f7d52236715f8ce30f251209dc3753d2  xlog-1.7.tar.gz
+df1b8bf7bc88cf8273936a13ace8bc0d  xlog-1.8.1.tar.gz


Index: xlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/F-8/xlog.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xlog.spec	3 Aug 2008 15:42:38 -0000	1.2
+++ xlog.spec	23 Sep 2008 05:27:03 -0000	1.3
@@ -1,13 +1,13 @@
 Name:           xlog
-Version:        1.7
-Release:        2%{?dist}
+Version:        1.8.1
+Release:        1%{?dist}
 Summary:        Logging program for Hamradio Operators
 
 Group:          Applications/Communications
 License:        GPLv3
 URL:            http://pg4i.chronos.org.uk/linux/%{name}.html
 Source0:        http://pg4i.chronos.org.uk/download/%{name}-%{version}.tar.gz
-Patch0:         xlog-1.7-doc.patch
+Patch0:         xlog-1.8.1-doc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #BuildRequires: pkgconfig
 BuildRequires: gtk2-devel
@@ -17,7 +17,6 @@
 BuildRequires: gettext-devel
 BuildRequires: desktop-file-utils
 
-
 %description
 xlog is a logging program for amateur radio operators. The log is stored
 into a text file. QSO's are presented in a list. Items in the list can be
@@ -30,6 +29,7 @@
 %patch0 -p1 -b doc
 #fix bogus .desktop file
 sed -i -e "s/ApplicationHamRadio/Application/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
+sed -i -e "s/Utility;Database;HamRadio;GTK/HamRadio/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
 sed -i -e "s/.png//g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
 
 %build
@@ -46,9 +46,8 @@
 
 %find_lang %{name}
 
-desktop-file-install --vendor fedora --delete-original  \
+desktop-file-install \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
-        --remove-category Application \
         $RPM_BUILD_ROOT%{_datadir}/applications/xlog.desktop
 
 %post
@@ -68,7 +67,9 @@
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS ChangeLog COPYING NEWS README data/doc/manual data/doc/manual.tex data/glabels/qsllabels.glabels
 %{_bindir}/%{name}
+%dir %{_datadir}/%{name}
 %{_datadir}/%{name}/dxcc
+%{_datadir}/%{name}/maps
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/gnome-mime-text-x-%{name}.png
 %{_datadir}/icons/%{name}-icon.png
@@ -79,6 +80,16 @@
 
 
 %changelog
+* Mon Sep 22 2008 Lucian Langa <cooly at gnome.eu.org> - 1.8.1-1
+- new upstream versuion
+- change category to HamRadio
+
+* Fri Aug 29 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.7-4
+- include /usr/share/xlog
+
+* Sat Aug 23 2008 Lucian Langa <cooly at gnome.eu.org> - 1.7-3
+- fix rh bug 458817
+
 * Wed Jul 16 2008 Lucian Langa <cooly at gnome.eu.org> - 1.7-2
 - Proper documentation packing
 - Misc cleanups


--- xlog-1.7-doc.patch DELETED ---



From lucilanga at fedoraproject.org  Tue Sep 23 05:27:48 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue, 23 Sep 2008 05:27:48 +0000 (UTC)
Subject: rpms/xlog/F-9 xlog-1.8.1-doc.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 xlog.spec, 1.2, 1.3 xlog-1.7-doc.patch,
	1.1, NONE
Message-ID: <20080923052748.3EB7370033@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xlog/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19475

Modified Files:
	.cvsignore sources xlog.spec 
Added Files:
	xlog-1.8.1-doc.patch 
Removed Files:
	xlog-1.7-doc.patch 
Log Message:
* Mon Sep 22 2008 Lucian Langa <cooly at gnome.eu.org> - 1.8.1-1
- new upstream versuion
- change category to HamRadio

xlog-1.8.1-doc.patch:

--- NEW FILE xlog-1.8.1-doc.patch ---
--- xlog-1.8.1/data/Makefile.am	2007-03-29 18:29:40.000000000 +0300
+++ xlog-1.8.1-mod/data/Makefile.am	2008-07-17 16:15:39.000000000 +0300
@@ -1 +1 @@
-SUBDIRS = desktop doc dxcc glabels images man maps mime pixmaps remote utils
+SUBDIRS = desktop dxcc images man maps mime pixmaps remote utils
--- xlog-1.8.1/Makefile.am	2007-12-08 15:28:59.000000000 +0200
+++ xlog-1.8.1-mod/Makefile.am	2008-07-17 16:22:59.000000000 +0300
@@ -11,13 +11,9 @@
 
 install-data-local:
 	@$(NORMAL_INSTALL)
-	$(INSTALL_DATA) AUTHORS $(DESTDIR)$(pkgdatadir)
-	$(INSTALL_DATA) ChangeLog $(DESTDIR)$(pkgdatadir)
-	$(INSTALL_DATA) BUGS $(DESTDIR)$(pkgdatadir)
 
 rpm: Makefile
 	make dist
 	$(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
 	rm $(PACKAGE)-$(VERSION).tar.gz
 
-ACLOCAL_AMFLAGS = -I m4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Aug 2008 15:27:19 -0000	1.2
+++ .cvsignore	23 Sep 2008 05:27:17 -0000	1.3
@@ -1 +1 @@
-xlog-1.7.tar.gz
+xlog-1.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Aug 2008 15:27:19 -0000	1.2
+++ sources	23 Sep 2008 05:27:17 -0000	1.3
@@ -1 +1 @@
-f7d52236715f8ce30f251209dc3753d2  xlog-1.7.tar.gz
+df1b8bf7bc88cf8273936a13ace8bc0d  xlog-1.8.1.tar.gz


Index: xlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/F-9/xlog.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xlog.spec	3 Aug 2008 15:35:28 -0000	1.2
+++ xlog.spec	23 Sep 2008 05:27:18 -0000	1.3
@@ -1,13 +1,13 @@
 Name:           xlog
-Version:        1.7
-Release:        2%{?dist}
+Version:        1.8.1
+Release:        1%{?dist}
 Summary:        Logging program for Hamradio Operators
 
 Group:          Applications/Communications
 License:        GPLv3
 URL:            http://pg4i.chronos.org.uk/linux/%{name}.html
 Source0:        http://pg4i.chronos.org.uk/download/%{name}-%{version}.tar.gz
-Patch0:         xlog-1.7-doc.patch
+Patch0:         xlog-1.8.1-doc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #BuildRequires: pkgconfig
 BuildRequires: gtk2-devel
@@ -29,6 +29,7 @@
 %patch0 -p1 -b doc
 #fix bogus .desktop file
 sed -i -e "s/ApplicationHamRadio/Application/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
+sed -i -e "s/Utility;Database;HamRadio;GTK/HamRadio/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
 sed -i -e "s/.png//g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
 
 %build
@@ -45,9 +46,8 @@
 
 %find_lang %{name}
 
-desktop-file-install --vendor fedora --delete-original  \
+desktop-file-install \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
-        --remove-category Application \
         $RPM_BUILD_ROOT%{_datadir}/applications/xlog.desktop
 
 %post
@@ -67,7 +67,9 @@
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS ChangeLog COPYING NEWS README data/doc/manual data/doc/manual.tex data/glabels/qsllabels.glabels
 %{_bindir}/%{name}
+%dir %{_datadir}/%{name}
 %{_datadir}/%{name}/dxcc
+%{_datadir}/%{name}/maps
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/gnome-mime-text-x-%{name}.png
 %{_datadir}/icons/%{name}-icon.png
@@ -78,6 +80,16 @@
 
 
 %changelog
+* Mon Sep 22 2008 Lucian Langa <cooly at gnome.eu.org> - 1.8.1-1
+- new upstream versuion
+- change category to HamRadio
+
+* Fri Aug 29 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.7-4
+- include /usr/share/xlog
+
+* Sat Aug 23 2008 Lucian Langa <cooly at gnome.eu.org> - 1.7-3
+- fix rh bug 458817
+
 * Wed Jul 16 2008 Lucian Langa <cooly at gnome.eu.org> - 1.7-2
 - Proper documentation packing
 - Misc cleanups


--- xlog-1.7-doc.patch DELETED ---



From transif at fedoraproject.org  Tue Sep 23 05:45:43 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Tue, 23 Sep 2008 05:45:43 +0000 (UTC)
Subject: comps/po bn_IN.po,1.13,1.14
Message-ID: <20080923054543.AEFEF70033@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21439/po

Modified Files:
	bn_IN.po 
Log Message:
    2008-09-23  Runa Bhattacharjee <runab at redhat.com> (via
runab at fedoraproject.org)
    
      * po/bn_IN.po: Updated Bengali India Translation
    



Index: bn_IN.po
===================================================================
RCS file: /cvs/pkgs/comps/po/bn_IN.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bn_IN.po	17 Sep 2008 22:44:33 -0000	1.13
+++ bn_IN.po	23 Sep 2008 05:45:12 -0000	1.14
@@ -5,15 +5,15 @@
 #
 # Deepayan Sarkar <deepayan at bengalinux.org>, 2003, 2004.
 # Progga <progga at BengaLinux.Org>, 2004.
-# Runa Bhattacharjee <runab at redhat.com>, 2004, 2005, 2006, 2007.
+# Runa Bhattacharjee <runab at redhat.com>, 2004, 2005, 2006, 2007, 2008.
 # Runa Bhattacharjee <runab at fedoraproject.org>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-03-13 09:51+0530\n"
-"Last-Translator: Runa Bhattacharjee <runab at fedoraproject.org>\n"
+"POT-Creation-Date: 2008-09-23 01:23+0000\n"
+"PO-Revision-Date: 2008-09-23 11:01+0530\n"
+"Last-Translator: Runa Bhattacharjee <runab at redhat.com>\n"
 "Language-Team: Bengali INDIA <fedora-trans-bn_IN at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +31,7 @@
 #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr "??????????????? ??????????????????????????????????????? ?????????????????? ???????????? ???????????????????????????????????? ?????????????????????????????? ????????????????????? ?????????????????????"
+msgstr "??????????????? ??????????????????????????????????????? ?????????????????? ???????????? ???????????????????????????????????? ????????????????????????????????? ????????????????????? ?????????????????????"
 
 # modified for RHEL
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
@@ -414,27 +414,23 @@
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
-msgstr ""
-"GTK+ ??? GNOME ????????????????????? ???????????????????????????????????? ??????????????????????????? ???????????? ?????? ????????????????????????????????? ?????????????????? ????????? ?????????????????????"
+msgstr "GTK+ ??? GNOME ????????????????????? ???????????????????????????????????? ??????????????????????????? ???????????? ?????? ????????????????????????????????? ?????????????????? ????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
 #: ../comps-f10.xml.in.h:79
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
-msgstr ""
-"GTK+ ??? XFCE ????????????????????? ???????????????????????????????????? ??????????????????????????? ???????????? ?????? ????????????????????????????????? ?????????????????? ????????? ?????????????????????"
+msgstr "GTK+ ??? XFCE ????????????????????? ???????????????????????????????????? ??????????????????????????? ???????????? ?????? ????????????????????????????????? ?????????????????? ????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
 #: ../comps-f10.xml.in.h:80 ../comps-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:81
-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 ""
 "??????????????? ????????????????????? ???????????? ????????????????????? ????????? ???????????? ???????????? ????????????????????? ????????????????????? ?????????????????? ????????????????????? ???????????? ???????????? "
 "????????????????????? ????????????????????????????????? ?????????????????? ????????? ?????????????????????"
@@ -442,10 +438,8 @@
 # Altered by Progga
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
 #: ../comps-f10.xml.in.h:82 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31
-msgid ""
-"Install this group of packages to use the base graphical (X) user interface."
-msgstr ""
-"?????????????????? ??????????????????????????? (X) ??????????????????????????? ??????????????????????????? ???????????? ????????????????????? ????????????????????? ??????????????? ?????????????????? ????????? ?????????????????????"
+msgid "Install this group of packages to use the base graphical (X) user interface."
+msgstr "?????????????????? ??????????????????????????? (X) ??????????????????????????? ??????????????????????????? ???????????? ????????????????????? ????????????????????? ??????????????? ?????????????????? ????????? ?????????????????????"
 
 # modified for RHEL
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
@@ -689,8 +683,7 @@
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
 #: ../comps-f10.xml.in.h:143 ../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:137
@@ -822,34 +815,29 @@
 # Altered by Progga
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
 #: ../comps-f10.xml.in.h:169
-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:160
 #: ../comps-f10.xml.in.h:170 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
-msgstr ""
-"?????? ???????????????????????????????????? ???????????????????????? ???????????? IMAP ????????? SMTP ???????????? ????????????????????? ????????????????????? ???????????? ?????????????????????"
+msgstr "?????? ???????????????????????????????????? ???????????????????????? ???????????? IMAP ????????? SMTP ???????????? ????????????????????? ????????????????????? ???????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
 #: ../comps-f10.xml.in.h:171
-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:162
 #: ../comps-f10.xml.in.h:172 ../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:163
 #: ../comps-f10.xml.in.h:173
-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 ????????????????????? ??????????????????????????? ????????????????????? ????????????????????? "
 "????????????????????? ??????????????????"
@@ -918,8 +906,7 @@
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:173
 #: ../comps-f10.xml.in.h:183
 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:174
 #: ../comps-f10.xml.in.h:184
@@ -947,8 +934,7 @@
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:177
 #: ../comps-f10.xml.in.h:187 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
-msgstr ""
-"?????? ????????????????????? ???????????????????????????????????? ???????????????????????? ???????????? ????????? ????????????????????? ???????????? ?????? ???????????????????????? ???????????? ?????????????????????"
+msgstr "?????? ????????????????????? ???????????????????????????????????? ???????????????????????? ???????????? ????????? ????????????????????? ???????????? ?????? ???????????????????????? ???????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:178
 #: ../comps-f10.xml.in.h:188 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
@@ -971,14 +957,12 @@
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
 #: ../comps-f10.xml.in.h:190 ../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:181
 #: ../comps-f10.xml.in.h:191 ../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:182
@@ -992,8 +976,7 @@
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
 #: ../comps-f10.xml.in.h:193
-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:184
@@ -1162,8 +1145,7 @@
 
 #: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
 msgid "Integrated Development Environments based on Eclipse."
-msgstr ""
-"Eclipse-??? ????????? ?????????????????? ????????? ????????????????????? ???????????????????????????????????? ????????????????????????????????? ???????????????????????????????????? (IDE)???"
+msgstr "Eclipse-??? ????????? ?????????????????? ????????? ????????????????????? ???????????????????????????????????? ????????????????????????????????? ???????????????????????????????????? (IDE)???"
 
 #: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:102
 msgid "Legacy Fonts"
@@ -1188,98 +1170,83 @@
 msgstr "?????????????????? ???????????????????????? ??? ?????????????????? ???????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44
-#, fuzzy
 msgid "Esperanto Support"
-msgstr "????????????????????? ???????????? ??????????????????????????? ??????????????????"
+msgstr "?????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95
-#, fuzzy
 msgid "Kashubian Support"
-msgstr "???????????????????????? ???????????? ??????????????????????????? ??????????????????"
+msgstr "??????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:108
-#, fuzzy
 msgid "Macedonian Support"
-msgstr "?????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
+msgstr "????????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:121
-#, fuzzy
 msgid "Northern Sami Support"
-msgstr "??????????????? ???????????? ???????????? ??????????????????????????? ??????????????????"
+msgstr "??????????????? ???????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:137
-#, fuzzy
 msgid "SUGAR Desktop Environment"
-msgstr "????????????????????? ??????????????????"
+msgstr "SUGAR ????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:138
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
-msgstr ""
+msgstr "OLPC XO-??? ???????????? ????????????????????? ????????????????????? ?????????????????? SUGAR ???????????? ?????????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:211
-#, fuzzy
 msgid "Walloon Support"
-msgstr "????????? ???????????? ??????????????????????????? ??????????????????"
+msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f10.xml.in.h:70
-#, fuzzy
 msgid "Haskell Development"
-msgstr "???????????? ?????????????????????????????????"
+msgstr "Haskell ?????????????????????????????????"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
-msgstr ""
+msgstr "??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:77
 msgid "Input method packages for the input of international text."
-msgstr ""
+msgstr "????????????????????? ????????????????????????????????? ??????????????? ??????????????? ???????????? ??????????????????????????? ??????????????? ????????????????????? ????????????????????????"
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "???????????? ???????????? ??????????????????????????? ??????????????????"
+msgstr "???????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "????????????????????? ???????????? ??????????????????????????? ??????????????????"
+msgstr "???????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f10.xml.in.h:110
-#, fuzzy
 msgid "Maithili Support"
-msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
+msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f10.xml.in.h:117
-#, fuzzy
 msgid "Myanmar (Burmese) Support"
-msgstr "?????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
+msgstr "???????????????????????? (?????????????????????) ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
+msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:156
-#, fuzzy
 msgid "Support for developing programs in the Haskell programming language."
-msgstr "Java ????????????????????????????????? ???????????? ?????????????????? ????????? ??????????????????????????? ????????????????????? ??????????????????????????? ?????????????????????"
+msgstr "Haskell ????????????????????????????????? ???????????? ?????????????????? ????????? ??????????????????????????? ????????????????????? ??????????????????????????? ?????????????????????"
 
 # modified for RHEL
 #: ../comps-f10.xml.in.h:163
-#, fuzzy
 msgid "Tajik Support"
-msgstr "????????? ???????????? ??????????????????????????? ??????????????????"
+msgstr "??????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f10.xml.in.h:205
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "????????? ???????????? ??????????????????????????? ??????????????????"
+msgstr "??????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1333,22 +1300,19 @@
 "????????????????????? ???????????????"
 
 #: ../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 ""
 "?????????????????? ??????????????? ????????????????????? ???????????????????????????????????? ????????????????????? ??? ????????????????????? ????????????????????? ?????? ????????????????????? ??????????????? "
 "????????????????????? ??????????????????"
@@ -1358,45 +1322,8 @@
 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 ""
 "????????? ??????????????? ????????????????????? ???????????????????????????????????? ????????????????????? ??? ????????????????????? ????????????????????? ?????? ????????????????????? ??????????????? ????????????????????? "
 "??????????????????"
 
-# modified for RHEL
-#, fuzzy
-#~ msgid "British Support"
-#~ msgstr "??????????????? ??????????????????????????? ??????????????????"
-
-#, fuzzy
-#~ msgid "Cluster Storage"
-#~ msgstr "??????????????????????????? ??????????????????????????? ??????????????????"
-
-#, fuzzy
-#~ msgid "Clustering Support."
-#~ msgstr "??????????????????????????? ??????????????????????????? ??????????????????"
-
-# modified for RHEL
-#, fuzzy
-#~ msgid "Single Node GFS Support"
-#~ msgstr "???????????? ???????????? ??????????????????????????? ??????????????????"
-
-#, fuzzy
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "?????? ????????????????????????????????? ?????????????????????????????? ??????????????????????????? ???????????? ?????????????????? ???????????? ???????????? ??????????????????"
-
-# modified for RHEL
-#, fuzzy
-#~ msgid "Multimedia applications"
-#~ msgstr "????????????????????????????????????"
-
-#, fuzzy
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr "???????????????????????????????????? ????????????????????????????????? ??? ??????????????? ???????????? ??????????????? ????????????????????????"
-
-#, fuzzy
-#~ msgid "Virtualization Support."
-#~ msgstr "?????????????????????????????????????????????"



From pkgdb at fedoraproject.org  Tue Sep 23 06:34:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 06:34:11 +0000
Subject: [pkgdb] python-ethtool: ruben has requested commit
Message-ID: <20080923063411.7768C208DA2@bastion.fedora.phx.redhat.com>

ruben has requested the commit acl on python-ethtool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-ethtool



From pkgdb at fedoraproject.org  Tue Sep 23 06:34:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 06:34:13 +0000
Subject: [pkgdb] python-ethtool: ruben has requested watchbugzilla
Message-ID: <20080923063415.0F083208D1A@bastion.fedora.phx.redhat.com>

ruben has requested the watchbugzilla acl on python-ethtool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-ethtool



From corsepiu at fedoraproject.org  Tue Sep 23 06:45:20 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 23 Sep 2008 06:45:20 +0000 (UTC)
Subject: rpms/rt3/devel rt3.spec,1.27,1.28
Message-ID: <20080923064520.B956770033@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27357

Modified Files:
	rt3.spec 
Log Message:
* Mon Sep 23 2008 Ralf Cors??pius <corsepiu at fedoraproject.org>
- Don't package %{_sysconfdir}/rt3/upgrade/*.in
- Cleanup Requires, __perl_requires, __perl_provides.



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rt3.spec	23 Sep 2008 04:12:51 -0000	1.27
+++ rt3.spec	23 Sep 2008 06:44:50 -0000	1.28
@@ -161,21 +161,15 @@
 # rpm doesn't catch these:
 Requires: perl(Apache::Session)
 Requires: perl(Calendar::Simple)
-# Requires: perl(CSS::Squish)
-# Requires: perl(File::Temp)
-Requires: perl(GD::Text)
-Requires: perl(GD::Graph::bars) perl(GD::Graph::pie)
-# Requires: perl(HTML::Mason)
-# Requires: perl(HTML::FormatText)
-# Requires: perl(HTML::TreeBuilder)
+%{?with_gd:Requires: perl(GD::Text)}
+%{?with_gd:Requires: perl(GD::Graph::bars)}
+%{?with_gd:Requires: perl(GD::Graph::pie)}
 Requires: perl(HTTP::Server::Simple::Mason)
 Requires: perl(I18N::LangTags::List)
 Requires: perl(Locale::Maketext::Fuzzy)
 Requires: perl(LWP::MediaTypes)
-# Requires: perl(MIME::Entity)
 Requires: perl(mod_perl2)
 Requires: perl(Module::Versions::Report)
-# Requires: perl(Regexp::Common)
 Requires: perl(Tree::Simple)
 Requires: perl(URI::URL)
 
@@ -225,7 +219,7 @@
 %{__perl_provides} $* |\
     sed -e '/^perl(RT)$/d' \
     	-e '/^perl(HTML::Mason/d' \
-        -e '/^perl(Log::Dispatch/d'
+	-e '/^perl(IO::Handle::CRLF)$/d'
 EOF
 %define __perl_provides %{_builddir}/rt-%{version}/%{name}-prov
 chmod +x %{__perl_provides}
@@ -233,8 +227,7 @@
 cat << \EOF > %{name}-req
 #!/bin/sh
 %{__perl_requires} $* |\
-    sed -e '/^perl(RT::/d' \
-	-e '/^perl()/d'
+    sed -e '/^perl()/d'
 EOF
 %define __perl_requires %{_builddir}/rt-%{version}/%{name}-req
 chmod +x %{__perl_requires}
@@ -342,6 +335,7 @@
 
 install -d -m755 ${RPM_BUILD_ROOT}%{_sysconfdir}/rt3/upgrade
 cp -R etc/upgrade/* ${RPM_BUILD_ROOT}%{_sysconfdir}/rt3/upgrade
+rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/rt3/upgrade/*.in
 
 # Fix permissions
 find ${RPM_BUILD_ROOT}%{RT3_WWWDIR} \
@@ -404,7 +398,11 @@
 %{_mandir}/man1/rt-mailgate*
 
 %changelog
-* Mon Sep 23 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.1-0
+* Mon Sep 23 2008 Ralf Cors??pius <corsepiu at fedoraproject.org>
+- Don't package %%{_sysconfdir}/rt3/upgrade/*.in
+- Cleanup Requires, __perl_requires, __perl_provides.
+
+* Tue Sep 23 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.1-0
 - First try at public release.
 - Completely rework the spec.
 - Upstream update.



From mmaslano at fedoraproject.org  Tue Sep 23 06:48:10 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 23 Sep 2008 06:48:10 +0000 (UTC)
Subject: rpms/anacron/devel anacron.spec,1.51,1.52
Message-ID: <20080923064810.681CC70033@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/anacron/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27531

Modified Files:
	anacron.spec 
Log Message:
Fix fuzz.



Index: anacron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- anacron.spec	22 Sep 2008 16:12:15 -0000	1.51
+++ anacron.spec	23 Sep 2008 06:47:39 -0000	1.52
@@ -8,13 +8,13 @@
 Source: http://ftp.debian.org/debian/pool/main/a/anacron/%{name}_%{version}.orig.tar.gz
 Source1: anacrontab
 Source2: anacron.init
-Patch0: anacron_2.3-13.patch
-Patch1: anacron-2.3-mail-content-type-77108.patch
-Patch2: anacron-2.3-fdclose.patch
-Patch3: anacron-2.3-pic.patch
-Patch4: anacron-2.3-memleaking.patch
-Patch5: anacron-2.3-spooldir.patch
-Patch6: anacron-2.3-hourly.patch
+Patch1: anacron_2.3-13.patch
+Patch2: anacron-2.3-mail-content-type-77108.patch
+Patch3: anacron-2.3-fdclose.patch
+Patch4: anacron-2.3-pic.patch
+Patch5: anacron-2.3-memleaking.patch
+Patch6: anacron-2.3-spooldir.patch
+Patch7: anacron-2.3-hourly.patch
 
 Requires: crontabs
 Requires: initscripts
@@ -41,13 +41,13 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .try
-%patch1 -p1 -b .charset
-%patch2 -p1 -b .fdclose
-%patch3 -p1 -b .pic
-%patch4 -p1 -b .memleaking
-%patch5 -p1 -b .spool
-%patch6 -p1
+%patch1 -p1 -b .try
+%patch2 -p1 -b .charset
+%patch3 -p1 -b .fdclose
+%patch4 -p1 -b .pic
+%patch5 -p1 -b .memleaking
+%patch6 -p1 -b .spool
+%patch7 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}



From transif at fedoraproject.org  Tue Sep 23 06:48:13 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Tue, 23 Sep 2008 06:48:13 +0000 (UTC)
Subject: comps/po as.po,1.15,1.16
Message-ID: <20080923064813.54F9370033@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27684/po

Modified Files:
	as.po 
Log Message:
    2008-09-23  Amitakhya Phukan <aphukan.fedora at gmail.com> (via
aphukan at fedoraproject.org)
    
      * po/as.po: Updated Assamese Translations.
    



Index: as.po
===================================================================
RCS file: /cvs/pkgs/comps/po/as.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- as.po	17 Sep 2008 22:44:33 -0000	1.15
+++ as.po	23 Sep 2008 06:47:42 -0000	1.16
@@ -1,4 +1,4 @@
-# translation of comps.HEAD.as.po to Assamese
+# translation of comps.HEAD.po to Assamese
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
@@ -7,10 +7,10 @@
 # Amitakhya Phukan <aphukan at fedoraproject.org>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: comps.HEAD.as\n"
+"Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-04-14 13:23+0530\n"
+"POT-Creation-Date: 2008-09-23 03:29+0000\n"
+"PO-Revision-Date: 2008-09-23 12:13+0530\n"
 "Last-Translator: Amitakhya Phukan <aphukan at fedoraproject.org>\n"
 "Language-Team: Assamese\n"
 "MIME-Version: 1.0\n"
@@ -381,16 +381,14 @@
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
-msgstr ""
-"GTK+ ????????? GNOME ??? ?????????????????????????????? ??????????????????????????? ??????????????? ????????????'?????? ?????? ????????????????????????????????? ???????????????????????? ????????? ???"
+msgstr "GTK+ ????????? GNOME ??? ?????????????????????????????? ??????????????????????????? ??????????????? ????????????'?????? ?????? ????????????????????????????????? ???????????????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
 #: ../comps-f10.xml.in.h:79
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
-msgstr ""
-"GTK+ ????????? XFCE ??? ?????????????????????????????? ??????????????????????????? ??????????????? ????????????'?????? ?????? ????????????????????????????????? ???????????????????????? ????????? ???"
+msgstr "GTK+ ????????? XFCE ??? ?????????????????????????????? ??????????????????????????? ??????????????? ????????????'?????? ?????? ????????????????????????????????? ???????????????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
 #: ../comps-f10.xml.in.h:80 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
@@ -399,16 +397,14 @@
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:81
-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:82 ../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) ??????????????????????????????????????? ??????????????? ?????????????????? ????????????????????? ????????????'?????? ?????? ????????????????????????????????? ???????????????????????? "
 "????????? ???"
@@ -646,8 +642,7 @@
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
 #: ../comps-f10.xml.in.h:143 ../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:137
@@ -772,8 +767,7 @@
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
 #: ../comps-f10.xml.in.h:169
-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 ""
 "?????? ???????????? ????????????????????? ???????????? ?????????????????????????????? ?????????????????? ???????????? ??????????????????????????? ????????? ?????????????????????  ?????????????????? ?????????????????????????????? "
 "?????????-?????????????????? ???"
@@ -781,37 +775,31 @@
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:160
 #: ../comps-f10.xml.in.h:170 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
-msgstr ""
-"?????? ????????????????????? ??????????????? ?????????????????? ??????????????? ????????? IMAP ?????? SMTP ????????? ??????????????? ????????????????????? ???????????? ???????????? ???"
+msgstr "?????? ????????????????????? ??????????????? ?????????????????? ??????????????? ????????? IMAP ?????? SMTP ????????? ??????????????? ????????????????????? ???????????? ???????????? ???"
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
 #: ../comps-f10.xml.in.h:171
-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:162
 #: ../comps-f10.xml.in.h:172 ../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:163
 #: ../comps-f10.xml.in.h:173
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
-msgstr ""
-"?????? ????????????????????? ??????????????? ????????????????????????????????? ????????? ??????'??????????????? ?????????????????? ???????????? ???????????? DHCP, Kerberos ????????? 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:164
 #: ../comps-f10.xml.in.h:174
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
-msgstr ""
-"?????? ????????????????????? ??????????????? ????????????????????????????????? ????????? ??????????????? ??????'??????????????? ???????????????-??????????????? ???????????? ???????????? rsh ????????? telnet ???"
+msgstr "?????? ????????????????????? ??????????????? ????????????????????????????????? ????????? ??????????????? ??????'??????????????? ???????????????-??????????????? ???????????? ???????????? rsh ????????? telnet ???"
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165
 #: ../comps-f10.xml.in.h:175
@@ -828,8 +816,7 @@
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
-msgstr ""
-"?????? ????????????????????? ??????????????? ????????????????????? ???????????????????????? ????????? ????????? ????????? ??????????????? ????????????????????? ????????????????????? ??????????????? ????????? ???"
+msgstr "?????? ????????????????????? ??????????????? ????????????????????? ???????????????????????? ????????? ????????? ????????? ??????????????? ????????????????????? ????????????????????? ??????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:168
 #: ../comps-f10.xml.in.h:178
@@ -915,14 +902,12 @@
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
 #: ../comps-f10.xml.in.h:190 ../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:181
 #: ../comps-f10.xml.in.h:191 ../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:182
@@ -936,10 +921,8 @@
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
 #: ../comps-f10.xml.in.h:193
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
-msgstr ""
-"?????? ???????????????????????? ?????????????????? ???????????????????????????????????????????????? DNS ????????????????????? ????????????(BIND) ??????????????? ??????????????? ????????? ???"
+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:184
 #: ../comps-f10.xml.in.h:194
@@ -1121,91 +1104,76 @@
 msgstr "??????????????? bitmap ????????? vector ???????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44
-#, fuzzy
 msgid "Esperanto Support"
-msgstr "????????????????????? ??????????????? ??????????????????"
+msgstr "????????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95
-#, fuzzy
 msgid "Kashubian Support"
-msgstr "???????????????????????? ??????????????? ??????????????????"
+msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:108
-#, fuzzy
 msgid "Macedonian Support"
-msgstr "???????????????????????? ??????????????? ??????????????????"
+msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:121
-#, fuzzy
 msgid "Northern Sami Support"
-msgstr "????????????????????? ???'???' ??????????????? ??????????????????"
+msgstr "????????????????????? ???????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:137
-#, fuzzy
 msgid "SUGAR Desktop Environment"
-msgstr "????????????????????? ??????????????????????????????"
+msgstr "SUGAR ????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:138
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
-msgstr ""
+msgstr "SUGAR ???????????? OLPC XO ??? ???????????? ????????????????????? ????????? ??????????????????'??? ?????????????????? ???"
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:211
-#, fuzzy
 msgid "Walloon Support"
-msgstr "????????? ??????????????? ??????????????????"
+msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:70
-#, fuzzy
 msgid "Haskell Development"
-msgstr "??????????????? ???????????????"
+msgstr "Haskell ??? ???????????????"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
-msgstr ""
+msgstr "??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:77
 msgid "Input method packages for the input of international text."
-msgstr ""
+msgstr "????????????????????????????????? ???????????? ??????????????? ?????????????????? ??????????????? ????????????????????? ????????????????????? ???"
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "??????????????? ??????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "???'??????????????? ??????????????? ??????????????????"
+msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:110
-#, fuzzy
 msgid "Maithili Support"
-msgstr "?????????????????? ??????????????? ??????????????????"
+msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:117
-#, fuzzy
 msgid "Myanmar (Burmese) Support"
-msgstr "??????????????????????????? ??????????????? ??????????????????"
+msgstr "??????????????????????????? (???????????????????????????) ??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "?????????????????? ??????????????? ??????????????????"
+msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:156
-#, fuzzy
 msgid "Support for developing programs in the Haskell programming language."
-msgstr " ???????????? ?????????'????????????????????? ??????????????? ?????????'?????????????????? ??????????????? ???????????? ??????????????????"
+msgstr "Haskell ?????????'????????????????????? ??????????????? ?????????'?????????????????? ??????????????? ???????????? ?????????????????? ???"
 
 #: ../comps-f10.xml.in.h:163
-#, fuzzy
 msgid "Tajik Support"
-msgstr "????????? ??????????????? ??????????????????"
+msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:205
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "???????????? ??????????????? ??????????????????"
+msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1258,18 +1226,15 @@
 msgstr "???????????? ????????????????????????????????? ??????????????? ???????????? ??????'??????????????? ??????????????? ???????????? ????????? ?????????????????? ?????? ???"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????? ????????? ??????????????? ????????????????????? ???????????? ????????????????????? ????????? ?????????????????? ????????? ?????????????????? ???"
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????? ????????? ????????????????????? ????????????????????? ???????????? ????????????????????? ????????? ?????????????????? ????????? ?????????????????? ???"
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????? ????????? ????????????????????? ????????????????????? ???????????? ????????????????????? ????????? ?????????????????? ????????? ?????????????????? ???"
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1277,69 +1242,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "?????? ????????? ????????? ????????????????????? ???????????? ????????????????????? ????????? ?????????????????? ????????? ?????????????????? ???"
 
-#~ msgid "British Support"
-#~ msgstr "??????????????????????????? ??????????????? ??????????????????"
-
-#~ msgid "Cluster Storage"
-#~ msgstr "??????????????????????????? ?????????'???????????????"
-
-#~ msgid "Clustering Support."
-#~ msgstr "??????????????????????????? ??????????????????????????? ????????????????????? ?????????????????? ???"
-
-#~ msgid "Libraries for applications built on older releases."
-#~ msgstr "??????????????? ????????????????????? ???????????? ?????????????????? ????????? ?????????????????????????????? ??????????????????????????? ???"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "????????????????????????????????? ????????? ???????????????????????? ?????????????????????"
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "??????????????????????????? ?????????'?????????????????? ?????????????????? ???????????? ????????????????????? ???"
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "single-node GFS ??? ?????????????????? ???????????? ????????????????????? ???"
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "Single Node GFS ??? ??????????????????"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "?????? ????????????????????? ??????????????? ???????????????????????? ???????????????????????????????????? ?????????????????? ????????????????????? ??????????????? ????????? ???"
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "Java Runtime ?????????????????????????????? ????????? ?????????????????? ?????????"
-
-#~ msgid "Misc"
-#~ msgstr "????????????????????????"
-
-#~ msgid "Misc packages"
-#~ msgstr "???????????????????????? ?????????????????????"
-
-#~ msgid "Multimedia"
-#~ msgstr "????????????????????????????????????"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "??????????????????????????????????????? ???????????????????????????"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr "Red Hat Enterprise Linux ??? ???????????? ???????????????????????? ???????????????????????????????????? ???????????? ?????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux Supplementary"
-#~ msgstr "Red Hat Enterprise Linux ?????????????????????"
-
-#~ msgid ""
-#~ "Components used for high performance networking and clustering, such as "
-#~ "Infiniband and RDMA."
-#~ msgstr ""
-#~ "Infiniband ????????? RDMA ??? ????????? ???????????? ????????????????????????????????? ??????'????????????????????? ?????? ???????????????????????????????????? ????????????????????? ????????? "
-#~ "????????? ???."
-
-#~ msgid "OpenFabrics Enterprise Distribution"
-#~ msgstr "OpenFabrics Enterprise ???????????????"
-
-#~ msgid "Virtualization Support."
-#~ msgstr "??????????????????????????????????????????????????? ??????????????????"



From pkgdb at fedoraproject.org  Tue Sep 23 06:49:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 06:49:54 +0000
Subject: [pkgdb] python-id3: mnowak has given up watchcommits
Message-ID: <20080923064954.1AD5F208D60@bastion.fedora.phx.redhat.com>

mnowak has given up the watchcommits acl on python-id3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-id3



From pkgdb at fedoraproject.org  Tue Sep 23 06:49:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 06:49:56 +0000
Subject: [pkgdb] python-id3: mnowak has given up approveacls
Message-ID: <20080923064956.8F07A208D9F@bastion.fedora.phx.redhat.com>

mnowak has given up the approveacls acl on python-id3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-id3



From pkgdb at fedoraproject.org  Tue Sep 23 06:50:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 06:50:02 +0000
Subject: [pkgdb] python-id3: mnowak has given up watchbugzilla
Message-ID: <20080923065002.EB60A208DA5@bastion.fedora.phx.redhat.com>

mnowak has given up the watchbugzilla acl on python-id3 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-id3



From pkgdb at fedoraproject.org  Tue Sep 23 06:50:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 06:50:02 +0000
Subject: [pkgdb] python-id3: mnowak has given up watchcommits
Message-ID: <20080923065001.F3C18208DA2@bastion.fedora.phx.redhat.com>

mnowak has given up the watchcommits acl on python-id3 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-id3



From pkgdb at fedoraproject.org  Tue Sep 23 06:50:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 06:50:02 +0000
Subject: [pkgdb] python-id3: mnowak has given up commit
Message-ID: <20080923065002.F1FB6208DA8@bastion.fedora.phx.redhat.com>

mnowak has given up the commit acl on python-id3 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-id3



From pkgdb at fedoraproject.org  Tue Sep 23 06:50:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 06:50:06 +0000
Subject: [pkgdb] python-id3: mnowak has given up commit
Message-ID: <20080923065006.7F64B208DAA@bastion.fedora.phx.redhat.com>

mnowak has given up the commit acl on python-id3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-id3



From pkgdb at fedoraproject.org  Tue Sep 23 06:50:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 06:50:06 +0000
Subject: [pkgdb] python-id3: mnowak has given up watchbugzilla
Message-ID: <20080923065006.792BE208D60@bastion.fedora.phx.redhat.com>

mnowak has given up the watchbugzilla acl on python-id3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-id3



From airlied at fedoraproject.org  Tue Sep 23 06:57:59 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 23 Sep 2008 06:57:59 +0000 (UTC)
Subject: rpms/kernel/devel drm-modesetting-radeon.patch, 1.30,
	1.31 kernel.spec, 1.971, 1.972 drm-create-handle-for-fb.patch, 1.1,
	NONE drm-modesetting-fix-external-tmds-check.patch, 1.1,
	NONE drm-modesetting-intel-mm-private.patch, 1.1, NONE
Message-ID: <20080923065759.2466570033@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28907

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Removed Files:
	drm-create-handle-for-fb.patch 
	drm-modesetting-fix-external-tmds-check.patch 
	drm-modesetting-intel-mm-private.patch 
Log Message:
- fix radeon cursor disappearing bug.


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- drm-modesetting-radeon.patch	23 Sep 2008 05:06:11 -0000	1.30
+++ drm-modesetting-radeon.patch	23 Sep 2008 06:57:58 -0000	1.31
@@ -1,3 +1,9 @@
+commit 39f9d73e619b02a17731c737b3452664e7599ec5
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Sep 23 16:34:55 2008 +1000
+
+    radeon: fix minor cursor disappearing issues
+
 commit 14eed5a3ffea4629d8189605a6ece8762f07d9fe
 Author: Kristian H??gsberg <krh at redhat.com>
 Date:   Mon Sep 22 18:40:36 2008 -0400
@@ -33005,7 +33011,7 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c
 new file mode 100644
-index 0000000..e71b325
+index 0000000..d352d10
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_cursor.c
 @@ -0,0 +1,243 @@
@@ -33207,11 +33213,11 @@
 +	if (x < 0)
 +		xorigin = -x + 1;
 +	if (y < 0)
-+		yorigin = -x + 1;
++		yorigin = -y + 1;
 +	if (xorigin >= CURSOR_WIDTH)
 +		xorigin = CURSOR_WIDTH - 1;
-+	if (yorigin >= CURSOR_WIDTH)
-+		yorigin = CURSOR_WIDTH - 1;
++	if (yorigin >= CURSOR_HEIGHT)
++		yorigin = CURSOR_HEIGHT - 1;
 +
 +	radeon_lock_cursor(crtc, true);
 +	if (radeon_is_avivo(dev_priv)) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.971
retrieving revision 1.972
diff -u -r1.971 -r1.972
--- kernel.spec	23 Sep 2008 05:06:11 -0000	1.971
+++ kernel.spec	23 Sep 2008 06:57:58 -0000	1.972
@@ -1759,6 +1759,9 @@
 
 %changelog
 * Tue Sep 23 2008 Dave Airlie <airlied at redhat.com>
+- fix radeon cursor disappearing bug.
+
+* Tue Sep 23 2008 Dave Airlie <airlied at redhat.com>
 - rebase drm patches with latest upstream GEM bits
 
 * Mon Sep 22 2008 Jeremy Katz <katzj at redhat.com>


--- drm-create-handle-for-fb.patch DELETED ---


--- drm-modesetting-fix-external-tmds-check.patch DELETED ---


--- drm-modesetting-intel-mm-private.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Sep 23 07:10:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 07:10:09 +0000
Subject: [pkgdb] iproute: rvokal has requested commit
Message-ID: <20080923071009.7C69A208D9F@bastion.fedora.phx.redhat.com>

rvokal has requested the commit acl on iproute (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iproute



From pkgdb at fedoraproject.org  Tue Sep 23 07:11:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 07:11:40 +0000
Subject: [pkgdb] iproute had acl change status
Message-ID: <20080923071140.3B709208D9F@bastion.fedora.phx.redhat.com>

mmaslano has set the approveacls acl on iproute (Fedora devel) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iproute



From pkgdb at fedoraproject.org  Tue Sep 23 07:11:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 07:11:51 +0000
Subject: [pkgdb] libdvdread had acl change status
Message-ID: <20080923071152.099E3208D2B@bastion.fedora.phx.redhat.com>

rathann has set the watchbugzilla acl on libdvdread (Fedora devel) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdvdread



From pkgdb at fedoraproject.org  Tue Sep 23 07:11:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 07:11:54 +0000
Subject: [pkgdb] libdvdread had acl change status
Message-ID: <20080923071154.2076B208DA4@bastion.fedora.phx.redhat.com>

rathann has set the watchcommits acl on libdvdread (Fedora devel) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdvdread



From pkgdb at fedoraproject.org  Tue Sep 23 07:11:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 07:11:55 +0000
Subject: [pkgdb] iproute had acl change status
Message-ID: <20080923071155.F1084208DA8@bastion.fedora.phx.redhat.com>

mmaslano has set the commit acl on iproute (Fedora 7) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iproute



From pkgdb at fedoraproject.org  Tue Sep 23 07:11:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 07:11:58 +0000
Subject: [pkgdb] iproute had acl change status
Message-ID: <20080923071159.0158A208DAB@bastion.fedora.phx.redhat.com>

mmaslano has set the commit acl on iproute (Fedora devel) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iproute



From pkgdb at fedoraproject.org  Tue Sep 23 07:12:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 07:12:03 +0000
Subject: [pkgdb] iproute had acl change status
Message-ID: <20080923071203.75079208D1A@bastion.fedora.phx.redhat.com>

mmaslano has set the approveacls acl on iproute (Fedora 7) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iproute



From pkgdb at fedoraproject.org  Tue Sep 23 07:12:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 07:12:28 +0000
Subject: [pkgdb] libdvdread had acl change status
Message-ID: <20080923071228.1FD7D208DA4@bastion.fedora.phx.redhat.com>

rathann has set the watchbugzilla acl on libdvdread (Fedora 8) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdvdread



From pkgdb at fedoraproject.org  Tue Sep 23 07:12:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 07:12:29 +0000
Subject: [pkgdb] libdvdread had acl change status
Message-ID: <20080923071229.954F4208DA7@bastion.fedora.phx.redhat.com>

rathann has set the watchcommits acl on libdvdread (Fedora 8) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdvdread



From pkgdb at fedoraproject.org  Tue Sep 23 07:12:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 07:12:32 +0000
Subject: [pkgdb] libdvdread had acl change status
Message-ID: <20080923071232.9BC68208DAA@bastion.fedora.phx.redhat.com>

rathann has set the watchbugzilla acl on libdvdread (Fedora 9) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdvdread



From pkgdb at fedoraproject.org  Tue Sep 23 07:12:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 07:12:34 +0000
Subject: [pkgdb] libdvdread had acl change status
Message-ID: <20080923071234.74FB3208DAF@bastion.fedora.phx.redhat.com>

rathann has set the watchcommits acl on libdvdread (Fedora 9) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdvdread



From lkundrak at fedoraproject.org  Tue Sep 23 07:26:42 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 23 Sep 2008 07:26:42 +0000 (UTC)
Subject: rpms/libgnomedb/EL-5 import.log, NONE,
	1.1 libgnomedb-3.0.0-64bit.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 libgnomedb.spec, 1.20, 1.21 sources, 1.3,
	1.4 libgnomedb-1.2.0-desktop.patch, 1.1,
	NONE libgnomedb-1.9.100-64bit.patch, 1.1,
	NONE libgnomedb-1.9.100-sharp.patch, 1.2,
	NONE libgnomedb-1.9.100-unknown-datatype-fix.patch, 1.2, NONE
Message-ID: <20080923072642.1619970033@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/libgnomedb/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv973/EL-5

Modified Files:
	.cvsignore libgnomedb.spec sources 
Added Files:
	import.log libgnomedb-3.0.0-64bit.patch 
Removed Files:
	libgnomedb-1.2.0-desktop.patch libgnomedb-1.9.100-64bit.patch 
	libgnomedb-1.9.100-sharp.patch 
	libgnomedb-1.9.100-unknown-datatype-fix.patch 
Log Message:
Import from devel


--- NEW FILE import.log ---
libgnomedb-3_0_0-6_fc10:EL-5:libgnomedb-3.0.0-6.fc10.src.rpm:1222154748

libgnomedb-3.0.0-64bit.patch:

--- NEW FILE libgnomedb-3.0.0-64bit.patch ---
--- libgnomedb-3.0.0/extra/demos/console.c~	2007-05-27 21:37:35.000000000 +0200
+++ libgnomedb-3.0.0/extra/demos/console.c	2007-05-27 21:37:35.000000000 +0200
@@ -4,6 +4,7 @@
  */
 
 #include <libgnomedb/libgnomedb.h>
+#include <libgnomedb-extra/gnome-db-sql-console.h>
 
 extern GdaDict *demo_dict;
 static GtkWidget *window = NULL;
--- libgnomedb-3.0.0/libgnomedb/gnome-db-data-source-selector.c~	2007-05-27 21:36:12.000000000 +0200
+++ libgnomedb-3.0.0/libgnomedb/gnome-db-data-source-selector.c	2007-05-27 21:36:12.000000000 +0200
@@ -28,6 +28,7 @@
 #include <libgnomedb/gnome-db-util.h>
 #include <gtk/gtkcelllayout.h>
 #include <gtk/gtkcellrenderer.h>
+#include <gtk/gtkcellrenderertext.h>
 
 #define PARENT_TYPE GTK_TYPE_COMBO_BOX
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomedb/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Nov 2005 20:31:02 -0000	1.3
+++ .cvsignore	23 Sep 2008 07:26:11 -0000	1.4
@@ -1 +1 @@
-libgnomedb-1.9.100.tar.bz2
+libgnomedb-3.0.0.tar.bz2


Index: libgnomedb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomedb/EL-5/libgnomedb.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libgnomedb.spec	10 Sep 2006 05:27:51 -0000	1.20
+++ libgnomedb.spec	23 Sep 2008 07:26:11 -0000	1.21
@@ -1,25 +1,25 @@
 Name:            libgnomedb
 Epoch:           1
-Version:         1.9.100
-Release:         11%{?dist}
+Version:         3.0.0
+Release:         6%{?dist}
 Summary:         Library for writing gnome database programs
 Group:           System Environment/Libraries
-License:         LGPL
+License:         LGPLv2+
 URL:             http://www.gnome-db.org/
-Source:          http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.9/%{name}-%{version}.tar.bz2
-Patch0:          libgnomedb-1.2.0-desktop.patch
-Patch1:          libgnomedb-1.9.100-sharp.patch
-Patch2:          libgnomedb-1.9.100-unknown-datatype-fix.patch
-Patch3:          libgnomedb-1.9.100-64bit.patch
+Source:          http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.0/%{name}-%{version}.tar.bz2
+Patch0:          libgnomedb-3.0.0-64bit.patch
 BuildRoot:       %{_tmppath}/%{name}-%{version}-root
 BuildRequires:   libgnomeui-devel libgda-devel openssl-devel
-BuildRequires:   gtksourceview-devel mono-devel gtk-sharp2-devel
-BuildRequires:   gnome-sharp-devel gtk-sharp2-gapi libgda-sharp gtk-doc
+BuildRequires:   gtksourceview-devel
 BuildRequires:   gettext scrollkeeper perl(XML::Parser) desktop-file-utils
-Requires:        scrollkeeper
+Requires:        scrollkeeper hicolor-icon-theme
 Requires(pre):   GConf2
 Requires(post):  GConf2 /sbin/ldconfig
 Requires(preun): GConf2
+Requires(postun): /sbin/ldconfig
+# note we do not provide these, they no longer exist
+Obsoletes:       %{name}-sharp < %{epoch}:%{version}-%{release}
+Obsoletes:       %{name}-sharp-devel < %{epoch}:%{version}-%{release}
 
 %description
 libgnomedb is a library that eases the task of writing
@@ -27,7 +27,7 @@
 
 
 %package devel
-Summary:         Development libraries and header files for libgnomedb.
+Summary:         Development libraries and header files for libgnomedb
 Group:           Development/Libraries
 Requires:        %{name} = %{epoch}:%{version}-%{release}
 Requires:        pkgconfig libgnomeui-devel libgda-devel
@@ -39,57 +39,52 @@
 or compile programs that use libgda.
 
 
-%package sharp
-Summary:         Mono bindings for libgnomedb
-Group:           System Environment/Libraries
-Requires:        %{name} = %{epoch}:%{version}-%{release}
-
-%description sharp
-This package contains the dll files needed to run (and compile) Mono
-applications which use libgnomedb.
-
-
 %prep
 %setup -q
-%patch0 -p1 -b .desktop.patch
-%patch1 -p1 -b .sharp
-%patch2 -p1 -b .unknown
-%patch3 -p1 -b .64bit
+%patch0 -p1 -z .64bit
 
 
 %build
-%configure
+%configure --disable-static --disable-dependency-tracking --disable-gtk-doc
+# 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
+# dirty hack to make building the gtkdocs work despite us disabling rpath
+export LD_LIBRARY_PATH=`pwd`/libgnomedb/.libs:`pwd`/libgnomedb/plugins/.libs:`pwd`/libgnomedb-extra/.libs:`pwd`/libgnomedb-graph/.libs
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT \
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" \
   LIBGNOMEDB_DTDDIR=%{_datadir}/libgnomedb/dtd
-%find_lang libgnomedb-3
+%find_lang libgnomedb-3.0
 
+# below is the desktop file and icon stuff.
 desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --vendor fedora --add-category X-Fedora --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/database-properties.desktop
-
-# fixup mono / sharp related files install
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gapi-2.0
-install -m 644 gnomedb-sharp/gnomedb-api.xml $RPM_BUILD_ROOT/%{_datadir}/gapi-2.0
-mkdir -p $RPM_BUILD_ROOT/usr/lib/mono/gnomedb-sharp-2.0
-mv $RPM_BUILD_ROOT/%{_libdir}/libgnomedb/gnomedb-sharp.dll* \
-  $RPM_BUILD_ROOT/usr/lib/mono/gnomedb-sharp-2.0
+  --vendor fedora --remove-category Application \
+  --remove-category AdvancedSettings --delete-original \
+  --add-category X-GNOME-SystemSettings \
+  $RPM_BUILD_ROOT%{_datadir}/applications/database-properties-3.0.desktop
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-db.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 
 # remove unpackaged files
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{a,la}
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libgnomedb/plugins/*.{a,la}
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libglade/2.0/*.{a,la}
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/libgnomedb/plugins/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/libglade/2.0/*.la
+
+# put the demo in -devel %%doc
+mv $RPM_BUILD_ROOT/%{_datadir}/gnome-db/demo .
 
 
 %pre
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/libgnomedb.schemas >/dev/null || :
+      %{_sysconfdir}/gconf/schemas/libgnomedb-3.0.schemas >/dev/null || :
 fi
 
 
@@ -97,18 +92,27 @@
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/libgnomedb.schemas > /dev/null || :
+  %{_sysconfdir}/gconf/schemas/libgnomedb-3.0.schemas > /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
 
 
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/libgnomedb.schemas > /dev/null || :
+      %{_sysconfdir}/gconf/schemas/libgnomedb-3.0.schemas > /dev/null || :
 fi
 
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %post devel
@@ -123,14 +127,14 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -f libgnomedb-3.lang
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog README NEWS
+%files -f libgnomedb-3.0.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog NEWS
 %{_bindir}/*
-%{_datadir}/mime-info/*
-%{_datadir}/pixmaps/libgnomedb
-%{_datadir}/applications/*.desktop
-%{_datadir}/libgnomedb
+%{_datadir}/pixmaps/libgnomedb-3.0
+%{_datadir}/applications/fedora-database-properties-3.0.desktop
+%{_datadir}/icons/hicolor/48x48/apps/gnome-db.png
+%{_datadir}/gnome-db
 %{_libdir}/*.so.*
 %dir %{_libdir}/libgnomedb
 %{_libdir}/libgnomedb/plugins
@@ -138,21 +142,51 @@
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
 
 %files devel
-%defattr(-,root,root)
-%{_includedir}/libgnomedb-1.9
+%defattr(-,root,root,-)
+%doc demo
+%{_includedir}/libgnomedb-3.0
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/libgnomedb-2.0.pc
+%{_libdir}/pkgconfig/libgnomedb-3.0.pc
+%{_libdir}/pkgconfig/libgnomedb-extra-3.0.pc
+%{_libdir}/pkgconfig/libgnomedb-graph-3.0.pc
 %{_datadir}/omf/%{name}
-%{_datadir}/gtk-doc/html/libgnomedb
-
-%files sharp
-%defattr(-,root,root)
-%{_datadir}/gapi-2.0
-/usr/lib/mono/gnomedb-sharp-2.0
-%{_libdir}/pkgconfig/gnomedb-sharp-2.0.pc
+%{_datadir}/gtk-doc/html/libgnomedb-3.0
 
 
 %changelog
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:3.0.0-6
+- Autorebuild for GCC 4.3
+
+* Thu Dec  6 2007 Jeremy Katz <katzj at redhat.com> - 1:3.0.0-5
+- rebuild for new openssl
+
+* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.0-4
+- Don't rebuild the documentation to avoid multilib conflicts (bz 342141)
+
+* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.0-3
+- Update License tag for new Licensing Guidelines compliance
+
+* Fri Jun 29 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.0-2
+- Rebuild for new gtksourceview (bz 246202)
+
+* Sun May 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.0-1
+- New upstream release 3.0.0
+- Remove mono bindings sub-package as upstream no longer includes them
+
+* Thu May 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-15
+- Don't build mono/sharp bits on ppc64
+
+* Mon Apr 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-14
+- Fix closing of the about dialog (bz 238404)
+
+* Tue Mar 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-13
+- Fix categories in fedora-database-properties.desktop file (bz 234164)
+- Fixup packaging of sharp bindings to match the mono packaging guidelines
+
+* Thu Jan 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-12
+- Install icon under /usr/share/icons and don't reference it with an
+  absolute path (bz 221101)
+
 * Sun Sep 10 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-11
 - Don't own /usr/share/omf (bug 205669)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomedb/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2005 20:31:02 -0000	1.3
+++ sources	23 Sep 2008 07:26:11 -0000	1.4
@@ -1 +1 @@
-a98ac52f084b1b0abad6b2c53ec034cc  libgnomedb-1.9.100.tar.bz2
+2a41abd14b123f0c9d4f540b9c07bedd  libgnomedb-3.0.0.tar.bz2


--- libgnomedb-1.2.0-desktop.patch DELETED ---


--- libgnomedb-1.9.100-64bit.patch DELETED ---


--- libgnomedb-1.9.100-sharp.patch DELETED ---


--- libgnomedb-1.9.100-unknown-datatype-fix.patch DELETED ---



From denis at fedoraproject.org  Tue Sep 23 07:40:54 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 23 Sep 2008 07:40:54 +0000 (UTC)
Subject: rpms/glibmm24/devel .cvsignore, 1.31, 1.32 glibmm.spec, 1.42,
	1.43 sources, 1.32, 1.33
Message-ID: <20080923074054.3526770033@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3160

Modified Files:
	.cvsignore glibmm.spec sources 
Log Message:
Update to upstream 2.18.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	24 Aug 2008 14:05:24 -0000	1.31
+++ .cvsignore	23 Sep 2008 07:40:23 -0000	1.32
@@ -1 +1 @@
-glibmm-2.17.2.tar.bz2
+glibmm-2.18.0.tar.bz2


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- glibmm.spec	24 Aug 2008 14:05:24 -0000	1.42
+++ glibmm.spec	23 Sep 2008 07:40:23 -0000	1.43
@@ -1,12 +1,12 @@
 Name:           glibmm24
-Version:        2.17.2
+Version:        2.18.0
 Release:        1%{?dist}
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gtkmm.sourceforge.net/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.16/glibmm-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.18/glibmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsigc++20-devel >= 2.0.0
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Denis Leroy <denis at poolshark.org> - 2.18.0-1
+- Update to upstream 2.18.0
+
 * Sun Aug 24 2008 Denis Leroy <denis at poolshark.org> - 2.17.2-1
 - Update to upstream 2.17.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	24 Aug 2008 14:05:24 -0000	1.32
+++ sources	23 Sep 2008 07:40:23 -0000	1.33
@@ -1 +1 @@
-b0c42ee7b40f8e931b7dd11970a36a4d  glibmm-2.17.2.tar.bz2
+1a0df362e15e7f850b8361b5102f1f16  glibmm-2.18.0.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep 23 07:54:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 07:54:03 +0000
Subject: [pkgdb] iso-codes had group_acl changed
Message-ID: <20080923075403.42223208D60@bastion.fedora.phx.redhat.com>

pnemade has set the commit acl on iso-codes (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iso-codes



From pkgdb at fedoraproject.org  Tue Sep 23 07:54:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 07:54:21 +0000
Subject: [pkgdb] iso-codes had group_acl changed
Message-ID: <20080923075421.5749C208D60@bastion.fedora.phx.redhat.com>

pnemade has set the commit acl on iso-codes (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iso-codes



From lkundrak at fedoraproject.org  Tue Sep 23 07:55:20 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 23 Sep 2008 07:55:20 +0000 (UTC)
Subject: rpms/gnumeric/EL-5 gnumeric-1.6.3-excel-overflow.patch, NONE,
	1.1 gnumeric-1.6.3-gda3.patch, NONE,
	1.1 gnumeric-1.6.3-gpl-md5.patch, NONE,
	1.1 gnumeric-1.6.3-stf-parse.patch, NONE, 1.1 import.log, NONE,
	1.1 gnumeric.spec, 1.22, 1.23
Message-ID: <20080923075520.4819B70033@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gnumeric/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5070/EL-5

Modified Files:
	gnumeric.spec 
Added Files:
	gnumeric-1.6.3-excel-overflow.patch gnumeric-1.6.3-gda3.patch 
	gnumeric-1.6.3-gpl-md5.patch gnumeric-1.6.3-stf-parse.patch 
	import.log 
Log Message:
Import from F-8

gnumeric-1.6.3-excel-overflow.patch:

--- NEW FILE gnumeric-1.6.3-excel-overflow.patch ---
diff -up gnumeric-1.6.3/plugins/excel/ms-excel-read.c.excel gnumeric-1.6.3/plugins/excel/ms-excel-read.c
--- gnumeric-1.6.3/plugins/excel/ms-excel-read.c.excel	2008-02-04 09:36:31.000000000 +0100
+++ gnumeric-1.6.3/plugins/excel/ms-excel-read.c	2008-02-04 15:38:54.000000000 +0100
@@ -95,6 +95,43 @@ typedef struct {
 
 #define N_BYTES_BETWEEN_PROGRESS_UPDATES   0x1000
 
+/*
+ * Check whether the product of the first two arguments exceeds
+ * the third.  The function should be overflow-proof.
+ */
+static gboolean
+product_gt (size_t count, size_t itemsize, size_t space)
+{
+	return itemsize > 0 &&
+		(count > G_MAXUINT / itemsize || count * itemsize > space);
+}
+
+static void
+record_size_barf (size_t count, size_t itemsize, size_t space,
+		  const char *locus)
+{
+	g_warning ("File is most likely corrupted.\n"
+		   "(Requested %u*%u bytes, but only %u bytes left in record.\n"
+		   "The problem occurred in %s.)",
+		   (unsigned)count, (unsigned)itemsize,
+		   (unsigned)space,
+		   locus);
+}
+
+#define XL_NEED_BYTES(count) XL_NEED_ITEMS(count,1)
+
+#define XL_NEED_ITEMS(count__,size__)					\
+  do {									\
+	  size_t count_ = (count__);					\
+	  size_t size_ = (size__);					\
+	  size_t space_ = q->length - (data - q->data);			\
+	  if (G_UNLIKELY (product_gt (count_, size_, space_))) {	\
+                record_size_barf (count_, size_, space_, G_STRFUNC);	\
+		return;							\
+          }								\
+  } while (0)
+
+
 /* #define NO_DEBUG_EXCEL */
 #ifndef NO_DEBUG_EXCEL
 #define d(level, code)	do { if (ms_excel_read_debug > level) { code } } while (0)
@@ -3386,29 +3423,40 @@ excel_read_XCT (BiffQuery *q, GnmXLImpor
 			continue;
 
 		for (data = q->data + 4; ep.eval.col <= last_col ; ep.eval.col++) {
-			g_return_if_fail (data + 1 - q->data <= (int)q->length);
+			guint8 oper;
+			XL_NEED_BYTES (1);
 
-			switch (*data) {
-			case  1: v = value_new_float (GSF_LE_GET_DOUBLE (data+1));
-				 data += 9;
-				 break;
-			case  2: len = data[1];
-				 v = value_new_string_nocopy (
-					excel_get_text (importer, data + 2, len, NULL));
-				 data += 2 + len;
-				 break;
-
-			case  4: v = value_new_bool (GSF_LE_GET_GUINT16 (data+1) != 0);
-				 data += 9;
-				 break;
-
-			case 16: v = biff_get_error (&ep, GSF_LE_GET_GUINT16 (data+1));
-				 data += 9;
-				 break;
+			oper = *data++;
+			switch (oper) {
+			case  1:
+				XL_NEED_BYTES (8);
+				v = value_new_float (GSF_LE_GET_DOUBLE (data));
+				data += 8;
+				break;
+			case  2:
+				XL_NEED_BYTES (1);
+				len = *data++;
+				v = value_new_string_nocopy (
+					excel_get_text (importer, data, len, NULL));
+				data += len;
+				break;
+
+			case  4:
+				XL_NEED_BYTES (2);
+				v = value_new_bool (GSF_LE_GET_GUINT16 (data) != 0);
+				/* FIXME: 8?? */
+				data += 8;
+				break;
+
+			case 16:
+				XL_NEED_BYTES (2);
+				v = biff_get_error (&ep, GSF_LE_GET_GUINT16 (data));
+				/* FIXME: 8?? */
+				data += 8;
+				break;
 
 			default :
-				g_warning ("Unknown oper type 0x%x in a CRN record", (int)*data);
-				data++;
+				g_warning ("Unknown oper type 0x%x in a CRN record", (guint)oper);
 				v = NULL;
 			}
 
@@ -4935,7 +4983,7 @@ excel_read_HLINK (BiffQuery *q, ExcelRea
 	if ((options & 0x14) == 0x14) {
 		len = GSF_LE_GET_GUINT32 (data);
 		data += 4;
-		g_return_if_fail (data + len*2 - q->data <= (int)q->length);
+		XL_NEED_ITEMS (len, 2);
 		label = read_utf16_str (len, data);
 		data += len*2;
 	}
@@ -4944,7 +4992,7 @@ excel_read_HLINK (BiffQuery *q, ExcelRea
 	if (options & 0x80) {
 		len = GSF_LE_GET_GUINT32 (data);
 		data += 4;
-		g_return_if_fail (len*2 + data - q->data <= (int)q->length);
+		XL_NEED_ITEMS (len, 2);
 		target = read_utf16_str (len, data);
 		data += len*2;
 	}
@@ -4955,7 +5003,7 @@ excel_read_HLINK (BiffQuery *q, ExcelRea
 		data += sizeof (url_guid);
 		len = GSF_LE_GET_GUINT32 (data);
 		data += 4;
-		g_return_if_fail (len + data - q->data <= (int)q->length);
+		XL_NEED_BYTES (len);
 
 		url = read_utf16_str (len/2, data);
 		link = g_object_new (gnm_hlink_url_get_type (), NULL);
@@ -4971,7 +5019,7 @@ excel_read_HLINK (BiffQuery *q, ExcelRea
 
 		gsf_mem_dump (data, q->length - (data - q->data));
 
-		g_return_if_fail (len + data - q->data <= (int)q->length);
+		XL_NEED_BYTES (len);
 		data += len;
 
 	} else if ((options & 0x1e3) == 0x103) {
@@ -4988,7 +5036,7 @@ excel_read_HLINK (BiffQuery *q, ExcelRea
 	if (options & 0x8) {
 		len = GSF_LE_GET_GUINT32 (data);
 		data += 4;
-		g_return_if_fail (len*2 + data - q->data <= (int)q->length);
+		XL_NEED_ITEMS (len, 2);
 		target = read_utf16_str (len, data);
 		data += len*2;
 	}

gnumeric-1.6.3-gda3.patch:

--- NEW FILE gnumeric-1.6.3-gda3.patch ---
--- gnumeric-1.6.3/configure.orig	2007-08-22 13:08:26.000000000 +0200
+++ gnumeric-1.6.3/configure	2007-08-22 13:08:26.000000000 +0200
@@ -22088,12 +22088,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_GDA_CFLAGS="$GDA_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-2.0 >= 1.3.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgda-2.0 >= 1.3.0") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-3.0 >= 1.3.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libgda-3.0 >= 1.3.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GDA_CFLAGS=`$PKG_CONFIG --cflags "libgda-2.0 >= 1.3.0" 2>/dev/null`
+  pkg_cv_GDA_CFLAGS=`$PKG_CONFIG --cflags "libgda-3.0 >= 1.3.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -22106,12 +22106,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_GDA_LIBS="$GDA_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-2.0 >= 1.3.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgda-2.0 >= 1.3.0") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-3.0 >= 1.3.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libgda-3.0 >= 1.3.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GDA_LIBS=`$PKG_CONFIG --libs "libgda-2.0 >= 1.3.0" 2>/dev/null`
+  pkg_cv_GDA_LIBS=`$PKG_CONFIG --libs "libgda-3.0 >= 1.3.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -22130,9 +22130,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgda-2.0 >= 1.3.0"`
+	        GDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgda-3.0 >= 1.3.0"`
         else
-	        GDA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgda-2.0 >= 1.3.0"`
+	        GDA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgda-3.0 >= 1.3.0"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GDA_PKG_ERRORS" >&5
@@ -22158,12 +22158,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_GNOMEDB_CFLAGS="$GNOMEDB_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-2.0 >= 1.3.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgnomedb-2.0 >= 1.3.0") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-3.0 >= 1.3.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libgnomedb-3.0 >= 1.3.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GNOMEDB_CFLAGS=`$PKG_CONFIG --cflags "libgnomedb-2.0 >= 1.3.0" 2>/dev/null`
+  pkg_cv_GNOMEDB_CFLAGS=`$PKG_CONFIG --cflags "libgnomedb-3.0 >= 1.3.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -22176,12 +22176,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_GNOMEDB_LIBS="$GNOMEDB_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-2.0 >= 1.3.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgnomedb-2.0 >= 1.3.0") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-3.0 >= 1.3.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libgnomedb-3.0 >= 1.3.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GNOMEDB_LIBS=`$PKG_CONFIG --libs "libgnomedb-2.0 >= 1.3.0" 2>/dev/null`
+  pkg_cv_GNOMEDB_LIBS=`$PKG_CONFIG --libs "libgnomedb-3.0 >= 1.3.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -22200,9 +22200,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomedb-2.0 >= 1.3.0"`
+	        GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomedb-3.0 >= 1.3.0"`
         else
-	        GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomedb-2.0 >= 1.3.0"`
+	        GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomedb-3.0 >= 1.3.0"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GNOMEDB_PKG_ERRORS" >&5
--- gnumeric-1.6.3/configure.in.orig	2007-05-01 18:21:36.000000000 -0400
+++ gnumeric-1.6.3/configure.in	2007-05-01 18:22:54.000000000 -0400
@@ -369,11 +369,11 @@
 	fi
 )
 if test "$try_gda" = "true"; then
-	PKG_CHECK_MODULES(GDA, [libgda-2.0 >= 1.3.0],
+	PKG_CHECK_MODULES(GDA, [libgda-3.0 >= 1.3.0],
 		[gda_msg=yes],
 		[gda_msg="NO.  libgda problem"])
 	if test "$gda_msg" = "yes"; then
-		PKG_CHECK_MODULES(GNOMEDB, [libgnomedb-2.0 >= 1.3.0],
+		PKG_CHECK_MODULES(GNOMEDB, [libgnomedb-3.0 >= 1.3.0],
 			[gnomedb_msg="yes"],
 			[gnomedb_msg="NO. libgnomedb problem"])
 		if test "$gnomedb_msg" = "yes"; then
--- gnumeric-1.6.3/plugins/gda/plugin-gda.c.orig	2007-05-01 18:52:12.000000000 -0400
+++ gnumeric-1.6.3/plugins/gda/plugin-gda.c	2007-05-01 19:01:11.000000000 -0400
@@ -1,6 +1,8 @@
+/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* Interface Gnumeric to Databases
  * Copyright (C) 1998,1999 Michael Lausch
  * Copyright (C) 2000-2002 Rodrigo Moya
+ * Copyright (C) 2006 Vivien Malerba
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -20,6 +22,7 @@
 #include <gnumeric-config.h>
 #include <gnumeric.h>
 #include <libgda/libgda.h>
+#include <string.h>
 #ifdef HAVE_LIBGNOMEDB
 #include <libgnomedb/gnome-db-login-dialog.h>
 #include <libgnomedb/gnome-db-login.h>
@@ -28,18 +31,116 @@
 #include "func.h"
 #include "expr.h"
 #include "value.h"
+#include "workbook.h"
+#include "sheet.h"
 #include "gnm-i18n.h"
 #include <goffice/app/go-plugin.h>
 #include <goffice/app/error-info.h>
+#include <goffice/utils/datetime.h>
+#include <goffice/utils/go-format.h>
 #include <gnm-plugin.h>
 
 GNM_PLUGIN_MODULE_HEADER;
 
-static GdaClient* connection_pool = NULL;
+static GdaClient  *connection_pool = NULL;
+static gboolean    libgda_init_done = FALSE;
+static GHashTable *cnc_hash = NULL;
+
+static GnmValue *
+gnm_value_new_from_gda (GValue const *gval,
+			GODateConventions const *date_conv)
+{
+	GnmValue *res;
+	GType t;
+
+	if (NULL == gval) 
+		return value_new_empty ();
+
+	g_return_val_if_fail (G_IS_VALUE (gval), value_new_empty ());
+
+	t = G_VALUE_TYPE (gval);
+	if (t == GDA_TYPE_SHORT)
+		return value_new_int (gda_value_get_short (gval));
+	if (t == GDA_TYPE_USHORT)
+		return value_new_int (gda_value_get_ushort (gval));
+	if (t ==  G_TYPE_DATE) {
+		res = value_new_int (datetime_g_to_serial (
+			(GDate const *) g_value_get_boxed (gval), date_conv));
+		value_set_fmt (res, go_format_default_date ());
+		return res;
+	}
+
+	if (t == GDA_TYPE_TIME) {
+		GdaTime const *time = gda_value_get_time (gval);
+		res = value_new_float ( (time->hour +
+					 (time->minute +
+					  time->second / 60.) / 60.) / 24.),
+		value_set_fmt (res, go_format_default_time ());
+		return res;
+	}
+
+	switch (t) {
+	case G_TYPE_BOOLEAN :
+		return value_new_bool (g_value_get_boolean (gval));
+
+	case G_TYPE_DOUBLE :
+		return value_new_float (g_value_get_double (gval));
+	case G_TYPE_FLOAT :
+		return value_new_float (g_value_get_float (gval));
+#if 0
+	case G_TYPE_INT64 : /* g_value_get_int64 (gval) */
+	case G_TYPE_UINT64 : /* g_value_get_uint64 (gval) */
+#endif
+	case G_TYPE_INT :
+		return value_new_int (g_value_get_int (gval));
+	case G_TYPE_UINT :
+		return value_new_int (g_value_get_uint (gval));
+
+#if 0
+	/* No way to represent a timezone, leave it as a string for now */
+	case GDA_TYPE_TIMESTAMP:
+#endif
+#if 0
+	/* Do we want to consider nested arrays ??
+	 * The rest of the system is not strong enough yet. */
+	case GDA_TYPE_LIST : {
+		GList const *ptr;
+		for (ptr = gda_value_get_list (gval) ; NULL != ptr ; ptr = ptr->next) {
+		}
+		return array;
+	}
+#endif
+
+#if 0
+	/* Use the default gvalue conversions for these */
+	case G_TYPE_CHAR :
+	case G_TYPE_UCHAR :
+	case G_TYPE_STRING :
+	case GDA_TYPE_GEOMETRIC_POINT :
+	case GDA_TYPE_BINARY :
+
+	/* this is stored as a string, let gda handle it */
+	case GDA_TYPE_NUMERIC :
+#endif
+	default :
+		break;
+	}
+
+	if (g_value_type_transformable (G_VALUE_TYPE (gval), G_TYPE_STRING)) {
+		GValue str = { 0 };
+		g_value_init (&str, G_TYPE_STRING);
+		if (g_value_transform (gval, &str))
+			return value_new_string (g_value_get_string (&str));
+		g_value_unset (&str);
+	}
+
+	return value_new_empty ();
+}
 
 static GnmValue *
 display_recordset (GdaDataModel *recset, FunctionEvalInfo *ei)
 {
+	GODateConventions const *date_conv;
 	GnmValue* array = NULL;
 	gint   col;
 	gint   row;
@@ -48,8 +149,8 @@
 
 	g_return_val_if_fail (GDA_IS_DATA_MODEL (recset), NULL);
 
-	fieldcount = gda_data_model_get_n_columns (GDA_DATA_MODEL (recset));
-	rowcount = gda_data_model_get_n_rows (GDA_DATA_MODEL (recset));
+	fieldcount = gda_data_model_get_n_columns (recset);
+	rowcount = gda_data_model_get_n_rows (recset);
 
 	/* convert the GdaDataModel in an array */
 	if (rowcount <= 0)
@@ -58,31 +159,75 @@
 	if (rowcount >= SHEET_MAX_ROWS)
 		return value_new_error (ei->pos, _("Too much data returned"));
 
+	date_conv = workbook_date_conv (ei->pos->sheet->workbook);
 	array = value_new_array_empty (fieldcount, rowcount);
 	for (row = 0; row < rowcount; row++) {
 		for (col = 0; col < fieldcount; col++) {
-			gchar *str;
-			const GdaValue *value;
-
-			value = gda_data_model_get_value_at (GDA_DATA_MODEL (recset),
-							     col, row);
-			str = gda_value_stringify ((GdaValue *) value);
-			value_array_set (array,
-					 col,
-					 row,
-					 value_new_string(str));
-
-			g_free (str);
+			value_array_set (array, col, row,
+				gnm_value_new_from_gda (
+					gda_data_model_get_value_at (recset, col, row),
+					date_conv));
 		}
 	}
 
 	return array;
 }
 
+/*
+ * Key structure and hash functions for that structure
+ */
+typedef struct {
+	gchar *dsn;
+	gchar *user;
+	gchar *pass;
+} CncKey;
+
+static guint
+cnc_key_hash_func (CncKey *key)
+{
+	guint retval = 0;
+
+	if (key->dsn)
+		retval = g_str_hash (key->dsn);
+	if (key->user)
+		retval = (retval << 4) + g_str_hash (key->user);
+	if (key->pass)
+		retval = (retval << 4) + g_str_hash (key->pass);
+
+	return retval;
+}
+
+static gboolean
+cnc_key_equal_func (CncKey *key1, CncKey *key2)
+{
+	if ((key1->dsn && !key2->dsn) ||
+	    (!key1->dsn && key2->dsn) ||
+	    (key1->dsn && key2->dsn && strcmp (key1->dsn, key2->dsn)))
+		return FALSE;
+	if ((key1->user && !key2->user) ||
+	    (!key1->user && key2->user) ||
+	    (key1->user && key2->user && strcmp (key1->user, key2->user)))
+		return FALSE;
+	if ((key1->pass && !key2->pass) ||
+	    (!key1->pass && key2->pass) ||
+	    (key1->pass && key2->pass && strcmp (key1->pass, key2->pass)))
+		return FALSE;
+	return TRUE;
+}
+
+static void
+cnc_key_free (CncKey *key)
+{
+	g_free (key->dsn);
+	g_free (key->user);
+	g_free (key->pass);
+	g_free (key);
+}
+
 static GdaConnection *
 open_connection (const gchar *dsn, const gchar *user, const gchar *password, GdaConnectionOptions options)
 {
-	GdaConnection *cnc;
+	GdaConnection *cnc = NULL;
 	gchar *real_dsn, *real_user, *real_password;
 #ifdef HAVE_LIBGNOMEDB
 	GtkWidget *dialog, *login;
@@ -91,44 +236,77 @@
 
 	/* initialize connection pool if first time */
 	if (!GDA_IS_CLIENT (connection_pool)) {
+		if (!libgda_init_done) {
+			gda_init (NULL, NULL, 0, NULL);
+			libgda_init_done = TRUE;	
+		}
 		connection_pool = gda_client_new ();
 		if (!connection_pool)
 			return NULL;
 	}
 
-#ifdef HAVE_LIBGNOMEDB
-	dialog = gnome_db_login_dialog_new (_("Database Connection"));
-	login = gnome_db_login_dialog_get_login_widget (GNOME_DB_LOGIN_DIALOG (dialog));
+	/* try to find a cnc object if we already have one */
+	if (!cnc_hash) 
+		cnc_hash = g_hash_table_new_full ((GHashFunc) cnc_key_hash_func,
+						  (GEqualFunc) cnc_key_equal_func,
+						  (GDestroyNotify) cnc_key_free,
+						  (GDestroyNotify) g_object_unref);
+	else {
+		CncKey key;
+
+		key.dsn = (gchar *) dsn;
+		key.user = (gchar *) user;
+		key.pass = (gchar *) password;
 
-	gnome_db_login_set_dsn (GNOME_DB_LOGIN (login), dsn);
-	gnome_db_login_set_username (GNOME_DB_LOGIN (login), user);
-	gnome_db_login_set_password (GNOME_DB_LOGIN (login), password);
-
-	if (gnome_db_login_dialog_run (GNOME_DB_LOGIN_DIALOG (dialog))) {
-		real_dsn = g_strdup (gnome_db_login_get_dsn (GNOME_DB_LOGIN (login)));
-		real_user = g_strdup (gnome_db_login_get_username (GNOME_DB_LOGIN (login)));
-		real_password = g_strdup (gnome_db_login_get_password (GNOME_DB_LOGIN (login)));
-
-		gtk_widget_destroy (dialog);
-	} else {
-		gtk_widget_destroy (dialog);
-		return NULL;
+		cnc = g_hash_table_lookup (cnc_hash, &key);
 	}
-#else
-	real_dsn = g_strdup (dsn);
-	real_user = g_strdup (user);
-	real_password = g_strdup (password);
-#endif
 
-	cnc = gda_client_open_connection (connection_pool, real_dsn, real_user, real_password, options, &error);
 	if (!cnc) {
-		g_warning ("Libgda error: %s\n", error->message);
-		g_error_free (error);
-	}
+		CncKey *key;
 
-	g_free (real_dsn);
-	g_free (real_user);
-	g_free (real_password);
+#ifdef HAVE_LIBGNOMEDB
+		dialog = gnome_db_login_dialog_new (_("Database Connection"));
+		login = gnome_db_login_dialog_get_login_widget (GNOME_DB_LOGIN_DIALOG (dialog));
+		
+		gnome_db_login_set_dsn (GNOME_DB_LOGIN (login), dsn);
+		gnome_db_login_set_username (GNOME_DB_LOGIN (login), user);
+		gnome_db_login_set_password (GNOME_DB_LOGIN (login), password);
+		
+		if (gnome_db_login_dialog_run (GNOME_DB_LOGIN_DIALOG (dialog))) {
+			real_dsn = g_strdup (gnome_db_login_get_dsn (GNOME_DB_LOGIN (login)));
+			real_user = g_strdup (gnome_db_login_get_username (GNOME_DB_LOGIN (login)));
+			real_password = g_strdup (gnome_db_login_get_password (GNOME_DB_LOGIN (login)));
+			
+			gtk_widget_destroy (dialog);
+		} else {
+			gtk_widget_destroy (dialog);
+			return NULL;
+		}
+#else
+		real_dsn = g_strdup (dsn);
+		real_user = g_strdup (user);
+		real_password = g_strdup (password);
+#endif
+		
+		cnc = gda_client_open_connection (connection_pool, real_dsn, real_user, real_password, options, &error);
+		if (!cnc) {
+			g_warning ("Libgda error: %s\n", error->message);
+			g_error_free (error);
+		}
+		
+		g_free (real_dsn);
+		g_free (real_user);
+		g_free (real_password);
+
+		key = g_new0 (CncKey, 1);
+		if (dsn)
+			key->dsn = g_strdup (dsn);
+		if (user)
+			key->user = g_strdup (user);
+		if (password)
+			key->pass = g_strdup (password);
+		g_hash_table_insert (cnc_hash, key, cnc);
+	}
 
 	return cnc;
 }
@@ -293,7 +471,13 @@
 }
 
 GnmFuncDescriptor gdaif_functions[] = {
-	{"execSQL", "ssss", "dsn,username,password,sql", help_execSQL, &gnumeric_execSQL, NULL, NULL, NULL },
-	{"readDBTable", "ssss", "dsn,username,password,table", help_readDBTable, &gnumeric_readDBTable, NULL, NULL, NULL },
+	{
+		"execSQL",	"ssss", "dsn,username,password,sql",
+		help_execSQL, &gnumeric_execSQL, NULL, NULL, NULL
+	},
+	{
+		"readDBTable", "ssss", "dsn,username,password,table",
+		help_readDBTable, &gnumeric_readDBTable, NULL, NULL, NULL
+	},
 	{NULL}
 };
--- gnumeric-1.6.3/plugins/gnome-db/plugin-gnomedb.c.orig	2005-03-03 02:50:56.000000000 -0500
+++ gnumeric-1.6.3/plugins/gnome-db/plugin-gnomedb.c	2007-05-01 19:02:19.000000000 -0400
@@ -1,5 +1,5 @@
 #include <gnumeric-config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <glib.h>
 
 #include <workbook-control-gui.h>
@@ -16,7 +16,7 @@ view_data_sources (GnmAction const *acti
 	char *argv[2];
 
 	/* run gnome-database-properties config tool */
-	argv[0] = (char *) "gnome-database-properties";
+	argv[0] = (char *) "gnome-database-properties-3.0";
 	argv[1] = NULL;
 
 	if (!g_spawn_async (NULL, argv, NULL, G_SPAWN_SEARCH_PATH,

gnumeric-1.6.3-gpl-md5.patch:

--- NEW FILE gnumeric-1.6.3-gpl-md5.patch ---
diff -up gnumeric-1.6.3/plugins/excel/ms-biff.c.gpl-md5 gnumeric-1.6.3/plugins/excel/ms-biff.c
--- gnumeric-1.6.3/plugins/excel/ms-biff.c.gpl-md5	2005-07-15 14:31:34.000000000 +0200
+++ gnumeric-1.6.3/plugins/excel/ms-biff.c	2007-09-19 16:20:34.000000000 +0200
@@ -16,6 +16,7 @@
 
 #include "ms-biff.h"
 #include "biff-types.h"
+#include "md5.h"
 
 #include <gsf/gsf-input.h>
 #include <gsf/gsf-output.h>
@@ -154,39 +155,17 @@ ms_biff_pre_biff8_query_set_decrypt  (Bi
 	return TRUE;
 }
 
-/* 
-this is just cut out of wvMD5Final to get the byte order correct
-under MSB systems, the previous code was woefully tied to intel
-x86
-
-C.
-*/
-static void
-wvMD5StoreDigest (MD5_CTX *mdContext)
-{
-	unsigned int i, ii;
-	/* store buffer in digest */
-	for (i = 0, ii = 0; i < 4; i++, ii += 4) {
-		mdContext->digest[ii] = (unsigned char) (mdContext->buf[i] & 0xFF);
-		mdContext->digest[ii + 1] =
-			(unsigned char) ((mdContext->buf[i] >> 8) & 0xFF);
-		mdContext->digest[ii + 2] =
-			(unsigned char) ((mdContext->buf[i] >> 16) & 0xFF);
-		mdContext->digest[ii + 3] =
-			(unsigned char) ((mdContext->buf[i] >> 24) & 0xFF);
-	}
-}
-
 static void
-makekey (guint32 block, RC4_KEY *key, MD5_CTX *valContext)
+makekey (guint32 block, RC4_KEY *key, const unsigned char *valDigest)
 {
-	MD5_CTX mdContext;
+	struct md5_ctx ctx;
+	unsigned char digest[16];
 	guint8 pwarray[64];
 
 	memset (pwarray, 0, 64);
 
 	/* 40 bit of hashed password, set by verify_password () */
-	memcpy (pwarray, valContext->digest, 5);
+	memcpy (pwarray, valDigest, 5);
 
 	/* put block number in byte 6...9 */
 	pwarray[5] = (guint8) (block & 0xFF);
@@ -197,12 +176,13 @@ makekey (guint32 block, RC4_KEY *key, MD
 	pwarray[9] = 0x80;
 	pwarray[56] = 0x48;
 
-	wvMD5Init (&mdContext);
-	wvMD5Update (&mdContext, pwarray, 64);
-	wvMD5StoreDigest (&mdContext);
-	prepare_key (mdContext.digest, 16, key);
+	md5_init_ctx (&ctx);
+	md5_process_block (pwarray, 64, &ctx);
+	md5_read_ctx (&ctx, digest);
+	prepare_key (digest, 16, key);
 
-	destroy_sensitive (&mdContext, sizeof (mdContext));
+	destroy_sensitive (&ctx, sizeof (ctx));
+	destroy_sensitive (digest, sizeof (digest));
 	destroy_sensitive (pwarray, sizeof (pwarray));
 }
 
@@ -214,10 +193,11 @@ makekey (guint32 block, RC4_KEY *key, MD
 static gboolean
 verify_password (guint8 const *password, guint8 const *docid,
 		 guint8 const *salt_data, guint8 const *hashedsalt_data,
-		 MD5_CTX *valContext)
+		 unsigned char *valDigest)
 {
 	guint8 pwarray [64], salt [64], hashedsalt [16];
-	MD5_CTX mdContext1, mdContext2;
+	struct md5_ctx mdContext;
+	unsigned char digest[16];
 	RC4_KEY key;
 	int offset, keyoffset, i;
 	unsigned int tocopy;
@@ -238,24 +218,24 @@ verify_password (guint8 const *password,
 	pwarray[2 * i] = 0x80;
 	pwarray[56] = (i << 4);
 
-	wvMD5Init (&mdContext1);
-	wvMD5Update (&mdContext1, pwarray, 64);
-	wvMD5StoreDigest (&mdContext1);
+	md5_init_ctx (&mdContext);
+	md5_process_block (pwarray, 64, &mdContext);
+	md5_read_ctx (&mdContext, digest);
 
 	offset = 0;
 	keyoffset = 0;
 	tocopy = 5;
 
-	wvMD5Init (valContext);
+	md5_init_ctx (&mdContext);
 	while (offset != 16) {
 		if ((64 - offset) < 5)
 			tocopy = 64 - offset;
 
-		memcpy (pwarray + offset, mdContext1.digest + keyoffset, tocopy);
+		memcpy (pwarray + offset, digest + keyoffset, tocopy);
 		offset += tocopy;
 
 		if (offset == 64) {
-			wvMD5Update (valContext, pwarray, 64);
+			md5_process_block (pwarray, 64, &mdContext);
 			keyoffset = tocopy;
 			tocopy = 5 - tocopy;
 			offset = 0;
@@ -274,11 +254,11 @@ verify_password (guint8 const *password,
 	pwarray[56] = 0x80;
 	pwarray[57] = 0x0A;
 
-	wvMD5Update (valContext, pwarray, 64);
-	wvMD5StoreDigest (valContext);
+	md5_process_block (pwarray, 64, &mdContext);
+	md5_read_ctx (&mdContext, valDigest);
 
 	/* Generate 40-bit RC4 key from 128-bit hashed password */
-	makekey (0, &key, valContext);
+	makekey (0, &key, valDigest);
 
 	memcpy (salt, salt_data, 16);
 	rc4 (salt, 16, &key);
@@ -289,17 +269,17 @@ verify_password (guint8 const *password,
 	memset (salt + 17, 0, 47);
 	salt[56] = 0x80;
 
-	wvMD5Init (&mdContext2);
-	wvMD5Update (&mdContext2, salt, 64);
-	wvMD5StoreDigest (&mdContext2);
+	md5_init_ctx (&mdContext);
+	md5_process_block (salt, 64, &mdContext);
+	md5_read_ctx (&mdContext, digest);
 
-	res = memcmp (mdContext2.digest, hashedsalt, 16) == 0;
+	res = memcmp (digest, hashedsalt, 16) == 0;
 
 	destroy_sensitive (pwarray, sizeof (pwarray));
 	destroy_sensitive (salt, sizeof (salt));
 	destroy_sensitive (hashedsalt, sizeof (hashedsalt));
-	destroy_sensitive (&mdContext1, sizeof (mdContext1));
-	destroy_sensitive (&mdContext2, sizeof (mdContext2));
+	destroy_sensitive (&mdContext, sizeof (mdContext));
+	destroy_sensitive (digest, sizeof (digest));
 	destroy_sensitive (&key, sizeof (key));
 
 	return res;
@@ -315,7 +294,7 @@ skip_bytes (BiffQuery *q, int start, int
 	block = (start + count) / REKEY_BLOCK;
 
 	if (block != q->block) {
-		makekey (q->block = block, &q->rc4_key, &q->md5_ctxt);
+		makekey (q->block = block, &q->rc4_key, q->md5_digest);
 		count = (start + count) % REKEY_BLOCK;
 	}
 
@@ -343,7 +322,7 @@ ms_biff_query_set_decrypt (BiffQuery *q,
 	g_return_val_if_fail (q->length == sizeof_BIFF_8_FILEPASS, FALSE);
 
 	if (!verify_password (password, q->data + 6,
-			      q->data + 22, q->data + 38, &q->md5_ctxt))
+			      q->data + 22, q->data + 38, q->md5_digest))
 		return FALSE;
 
 	q->encryption = MS_BIFF_CRYPTO_RC4;
@@ -484,7 +463,7 @@ ms_biff_query_next (BiffQuery *q)
 				data += step;
 				pos += step;
 				len -= step;
-				makekey (++q->block, &q->rc4_key, &q->md5_ctxt);
+				makekey (++q->block, &q->rc4_key, q->md5_digest);
 			}
 
 			rc4 (data, len, &q->rc4_key);
diff -up gnumeric-1.6.3/plugins/excel/ms-biff.h.gpl-md5 gnumeric-1.6.3/plugins/excel/ms-biff.h
--- gnumeric-1.6.3/plugins/excel/ms-biff.h.gpl-md5	2005-07-15 14:31:34.000000000 +0200
+++ gnumeric-1.6.3/plugins/excel/ms-biff.h	2007-09-19 16:01:04.000000000 +0200
@@ -14,7 +14,6 @@
 
 #include <gsf/gsf.h>
 #include "rc4.h"
-#include "md5.h"
 
 typedef enum { MS_BIFF_CRYPTO_NONE = 0,
 	       MS_BIFF_CRYPTO_XOR,
@@ -51,7 +50,7 @@ typedef struct {
 	MsBiffCrypto encryption;
 	guint8   xor_key[16];
 	RC4_KEY	 rc4_key;
-	MD5_CTX  md5_ctxt;
+	unsigned char md5_digest[16];
 	int	 block;
 	gboolean dont_decrypt_next_record;
 } BiffQuery;
diff -up gnumeric-1.6.3/plugins/excel/md5.h.gpl-md5 gnumeric-1.6.3/plugins/excel/md5.h
--- gnumeric-1.6.3/plugins/excel/md5.h.gpl-md5	2005-05-07 19:22:41.000000000 +0200
+++ gnumeric-1.6.3/plugins/excel/md5.h	2007-09-19 16:01:04.000000000 +0200
@@ -1,66 +1,124 @@
-/* vim: set sw=8 ts=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef GNM_EXCEL_MD5_H
-#define GNM_EXCEL_MD5_H
+/* Declaration of functions and data types used for MD5 sum computing
+   library functions.
+   Copyright (C) 1995-1997,1999,2000,2001,2004,2005,2006
+      Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _MD5_H
+#define _MD5_H 1
+
+#include <stdio.h>
+#include <stdint.h>
+
+#define MD5_DIGEST_SIZE 16
+#define MD5_BLOCK_SIZE 64
+
+#ifndef __GNUC_PREREQ
+# if defined __GNUC__ && defined __GNUC_MINOR__
+#  define __GNUC_PREREQ(maj, min)					\
+  ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+# else
+#  define __GNUC_PREREQ(maj, min) 0
+# endif
+#endif
+
+#ifndef __THROW
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+#  define __THROW	throw ()
+# else
+#  define __THROW
+# endif
+#endif
+
+#ifndef _LIBC
+# define __md5_buffer md5_buffer
+# define __md5_finish_ctx md5_finish_ctx
+# define __md5_init_ctx md5_init_ctx
+# define __md5_process_block md5_process_block
+# define __md5_process_bytes md5_process_bytes
+# define __md5_read_ctx md5_read_ctx
+# define __md5_stream md5_stream
+#endif
+
+/* Structure to save state of computation between the single steps.  */
+struct md5_ctx
+{
+  uint32_t A;
+  uint32_t B;
+  uint32_t C;
+  uint32_t D;
+
+  uint32_t total[2];
+  uint32_t buflen;
+  uint32_t buffer[32];
+};
 
 /*
- **********************************************************************
- ** md5.h -- Header file for implementation of MD5                   **
- ** RSA Data Security, Inc. MD5 Message Digest Algorithm             **
- ** Created: 2/17/90 RLR                                             **
- ** Revised: 12/27/90 SRD,AJ,BSK,JT Reference C version              **
- ** Revised (for MD5): RLR 4/27/91                                   **
- **   -- G modified to have y&~z instead of y&z                      **
- **   -- FF, GG, HH modified to add in last register done            **
- **   -- Access pattern: round 2 works mod 5, round 3 works mod 3    **
- **   -- distinct additive constant for each step                    **
- **   -- round 4 added, working mod 7                                **
- **********************************************************************
+ * The following three functions are build up the low level used in
+ * the functions `md5_stream' and `md5_buffer'.
  */
 
-/*
- **********************************************************************
- ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. **
- **                                                                  **
- ** License to copy and use this software is granted provided that   **
- ** it is identified as the "RSA Data Security, Inc. MD5 Message     **
- ** Digest Algorithm" in all material mentioning or referencing this **
- ** software or this function.                                       **
- **                                                                  **
- ** License is also granted to make and use derivative works         **
- ** provided that such works are identified as "derived from the RSA **
- ** Data Security, Inc. MD5 Message Digest Algorithm" in all         **
- ** material mentioning or referencing the derived work.             **
- **                                                                  **
- ** RSA Data Security, Inc. makes no representations concerning      **
- ** either the merchantability of this software or the suitability   **
- ** of this software for any particular purpose.  It is provided "as **
- ** is" without express or implied warranty of any kind.             **
- **                                                                  **
- ** These notices must be retained in any copies of any part of this **
- ** documentation and/or software.                                   **
- **********************************************************************
- */
-
-/* typedef a 32 bit type */
-#include <glib.h>
-typedef guint32 UINT4;
-
-/* Data structure for MD5 (Message Digest) computation */
-typedef struct {
-    UINT4 i[2];			/* number of _bits_ handled mod 2^64 */
-    UINT4 buf[4];		/* scratch buffer */
-    unsigned char in[64];	/* input buffer */
-    unsigned char digest[16];	/* actual digest after MD5Final call */
-} MD5_CTX;
-
-void wvMD5Init   (MD5_CTX *mdContext);
-void wvMD5Update (MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen);
-/* void wvMD5Final (); */
-
-/*
- **********************************************************************
- ** End of md5.h                                                     **
- ******************************* (cut) ********************************
- */
+/* Initialize structure containing state of computation.
+   (RFC 1321, 3.3: Step 3)  */
+extern void __md5_init_ctx (struct md5_ctx *ctx) __THROW;
+
+/* Starting with the result of former calls of this function (or the
+   initialization function update the context for the next LEN bytes
+   starting at BUFFER.
+   It is necessary that LEN is a multiple of 64!!! */
+extern void __md5_process_block (const void *buffer, size_t len,
+				 struct md5_ctx *ctx) __THROW;
+
+/* Starting with the result of former calls of this function (or the
+   initialization function update the context for the next LEN bytes
+   starting at BUFFER.
+   It is NOT required that LEN is a multiple of 64.  */
+extern void __md5_process_bytes (const void *buffer, size_t len,
+				 struct md5_ctx *ctx) __THROW;
+
+/* Process the remaining bytes in the buffer and put result from CTX
+   in first 16 bytes following RESBUF.  The result is always in little
+   endian byte order, so that a byte-wise output yields to the wanted
+   ASCII representation of the message digest.
+
+   IMPORTANT: On some systems, RESBUF must be aligned to a 32-bit
+   boundary. */
+extern void *__md5_finish_ctx (struct md5_ctx *ctx, void *resbuf) __THROW;
+
+
+/* Put result from CTX in first 16 bytes following RESBUF.  The result is
+   always in little endian byte order, so that a byte-wise output yields
+   to the wanted ASCII representation of the message digest.
+
+   IMPORTANT: On some systems, RESBUF must be aligned to a 32-bit
+   boundary. */
+extern void *__md5_read_ctx (const struct md5_ctx *ctx, void *resbuf) __THROW;
+
+
+/* Compute MD5 message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 16 bytes
+   beginning at RESBLOCK.  */
+extern int __md5_stream (FILE *stream, void *resblock) __THROW;
+
+/* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
+   result is always in little endian byte order, so that a byte-wise
+   output yields to the wanted ASCII representation of the message
+   digest.  */
+extern void *__md5_buffer (const char *buffer, size_t len,
+			   void *resblock) __THROW;
 
-#endif /* GNM_EXCEL_MD5_H */
+#endif /* md5.h */
diff -up gnumeric-1.6.3/plugins/excel/md5.c.gpl-md5 gnumeric-1.6.3/plugins/excel/md5.c
--- gnumeric-1.6.3/plugins/excel/md5.c.gpl-md5	2004-08-31 17:25:21.000000000 +0200
+++ gnumeric-1.6.3/plugins/excel/md5.c	2007-09-19 16:01:04.000000000 +0200
@@ -1,221 +1,448 @@
-/*
- **********************************************************************
- ** md5.c                                                            **
- ** RSA Data Security, Inc. MD5 Message Digest Algorithm             **
- ** Created: 2/17/90 RLR                                             **
- ** Revised: 1/91 SRD,AJ,BSK,JT Reference C Version                  **
- **********************************************************************
- */
-
-/*
- **********************************************************************
- ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. **
- **                                                                  **
- ** License to copy and use this software is granted provided that   **
- ** it is identified as the "RSA Data Security, Inc. MD5 Message     **
- ** Digest Algorithm" in all material mentioning or referencing this **
- ** software or this function.                                       **
- **                                                                  **
- ** License is also granted to make and use derivative works         **
- ** provided that such works are identified as "derived from the RSA **
- ** Data Security, Inc. MD5 Message Digest Algorithm" in all         **
- ** material mentioning or referencing the derived work.             **
- **                                                                  **
- ** RSA Data Security, Inc. makes no representations concerning      **
- ** either the merchantability of this software or the suitability   **
- ** of this software for any particular purpose.  It is provided "as **
- ** is" without express or implied warranty of any kind.             **
- **                                                                  **
- ** These notices must be retained in any copies of any part of this **
- ** documentation and/or software.                                   **
- **********************************************************************
- */
+/* Functions to compute MD5 message digest of files or memory blocks.
+   according to the definition of MD5 in RFC 1321 from April 1992.
+   Copyright (C) 1995,1996,1997,1999,2000,2001,2005,2006
+	Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Ulrich Drepper <drepper at gnu.ai.mit.edu>, 1995.  */
+
+
 
-/* -- include the following line if the md5.h header file is separate -- */
 #include "md5.h"
 
-/* F, G and H are basic MD5 functions: selection, majority, parity */
-#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
-#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define I(x, y, z) ((y) ^ ((x) | (~z)))
-
-/* ROTATE_LEFT rotates x left n bits */
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
-
-/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4 */
-/* Rotation is separate from addition to prevent recomputation */
-#define FF(a, b, c, d, x, s, ac) \
-  {(a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \
-   (a) = ROTATE_LEFT ((a), (s)); \
-   (a) += (b); \
-  }
-#define GG(a, b, c, d, x, s, ac) \
-  {(a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \
-   (a) = ROTATE_LEFT ((a), (s)); \
-   (a) += (b); \
-  }
-#define HH(a, b, c, d, x, s, ac) \
-  {(a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \
-   (a) = ROTATE_LEFT ((a), (s)); \
-   (a) += (b); \
-  }
-#define II(a, b, c, d, x, s, ac) \
-  {(a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \
-   (a) = ROTATE_LEFT ((a), (s)); \
-   (a) += (b); \
-  }
-
-
-/* Basic MD5 step. Transform buf based on in.  */
-static void
-Transform (UINT4 *buf, UINT4 *in)
-{
-    UINT4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
-
-    /* Round 1 */
-#define S11 7
-#define S12 12
-#define S13 17
-#define S14 22
-    FF (a, b, c, d, in[0], S11, 3614090360UL);	/* 1 */
-    FF (d, a, b, c, in[1], S12, 3905402710UL);	/* 2 */
-    FF (c, d, a, b, in[2], S13, 606105819UL);	/* 3 */
-    FF (b, c, d, a, in[3], S14, 3250441966UL);	/* 4 */
-    FF (a, b, c, d, in[4], S11, 4118548399UL);	/* 5 */
-    FF (d, a, b, c, in[5], S12, 1200080426UL);	/* 6 */
-    FF (c, d, a, b, in[6], S13, 2821735955UL);	/* 7 */
-    FF (b, c, d, a, in[7], S14, 4249261313UL);	/* 8 */
-    FF (a, b, c, d, in[8], S11, 1770035416UL);	/* 9 */
-    FF (d, a, b, c, in[9], S12, 2336552879UL);	/* 10 */
-    FF (c, d, a, b, in[10], S13, 4294925233UL);	/* 11 */
-    FF (b, c, d, a, in[11], S14, 2304563134UL);	/* 12 */
-    FF (a, b, c, d, in[12], S11, 1804603682UL);	/* 13 */
-    FF (d, a, b, c, in[13], S12, 4254626195UL);	/* 14 */
-    FF (c, d, a, b, in[14], S13, 2792965006UL);	/* 15 */
-    FF (b, c, d, a, in[15], S14, 1236535329UL);	/* 16 */
-
-    /* Round 2 */
-#define S21 5
-#define S22 9
-#define S23 14
-#define S24 20
-    GG (a, b, c, d, in[1], S21, 4129170786UL);	/* 17 */
-    GG (d, a, b, c, in[6], S22, 3225465664UL);	/* 18 */
-    GG (c, d, a, b, in[11], S23, 643717713UL);	/* 19 */
-    GG (b, c, d, a, in[0], S24, 3921069994UL);	/* 20 */
-    GG (a, b, c, d, in[5], S21, 3593408605UL);	/* 21 */
-    GG (d, a, b, c, in[10], S22, 38016083UL);	/* 22 */
-    GG (c, d, a, b, in[15], S23, 3634488961UL);	/* 23 */
-    GG (b, c, d, a, in[4], S24, 3889429448UL);	/* 24 */
-    GG (a, b, c, d, in[9], S21, 568446438UL);	/* 25 */
-    GG (d, a, b, c, in[14], S22, 3275163606UL);	/* 26 */
-    GG (c, d, a, b, in[3], S23, 4107603335UL);	/* 27 */
-    GG (b, c, d, a, in[8], S24, 1163531501UL);	/* 28 */
-    GG (a, b, c, d, in[13], S21, 2850285829UL);	/* 29 */
-    GG (d, a, b, c, in[2], S22, 4243563512UL);	/* 30 */
-    GG (c, d, a, b, in[7], S23, 1735328473UL);	/* 31 */
-    GG (b, c, d, a, in[12], S24, 2368359562UL);	/* 32 */
-
-    /* Round 3 */
-#define S31 4
-#define S32 11
-#define S33 16
-#define S34 23
-    HH (a, b, c, d, in[5], S31, 4294588738UL);	/* 33 */
-    HH (d, a, b, c, in[8], S32, 2272392833UL);	/* 34 */
-    HH (c, d, a, b, in[11], S33, 1839030562UL);	/* 35 */
-    HH (b, c, d, a, in[14], S34, 4259657740UL);	/* 36 */
-    HH (a, b, c, d, in[1], S31, 2763975236UL);	/* 37 */
-    HH (d, a, b, c, in[4], S32, 1272893353UL);	/* 38 */
-    HH (c, d, a, b, in[7], S33, 4139469664UL);	/* 39 */
-    HH (b, c, d, a, in[10], S34, 3200236656UL);	/* 40 */
-    HH (a, b, c, d, in[13], S31, 681279174UL);	/* 41 */
-    HH (d, a, b, c, in[0], S32, 3936430074UL);	/* 42 */
-    HH (c, d, a, b, in[3], S33, 3572445317UL);	/* 43 */
-    HH (b, c, d, a, in[6], S34, 76029189UL);	/* 44 */
-    HH (a, b, c, d, in[9], S31, 3654602809UL);	/* 45 */
-    HH (d, a, b, c, in[12], S32, 3873151461UL);	/* 46 */
-    HH (c, d, a, b, in[15], S33, 530742520UL);	/* 47 */
-    HH (b, c, d, a, in[2], S34, 3299628645UL);	/* 48 */
-
-    /* Round 4 */
-#define S41 6
-#define S42 10
-#define S43 15
-#define S44 21
-    II (a, b, c, d, in[0], S41, 4096336452UL);	/* 49 */
-    II (d, a, b, c, in[7], S42, 1126891415UL);	/* 50 */
-    II (c, d, a, b, in[14], S43, 2878612391UL);	/* 51 */
-    II (b, c, d, a, in[5], S44, 4237533241UL);	/* 52 */
-    II (a, b, c, d, in[12], S41, 1700485571UL);	/* 53 */
-    II (d, a, b, c, in[3], S42, 2399980690UL);	/* 54 */
-    II (c, d, a, b, in[10], S43, 4293915773UL);	/* 55 */
-    II (b, c, d, a, in[1], S44, 2240044497UL);	/* 56 */
-    II (a, b, c, d, in[8], S41, 1873313359UL);	/* 57 */
-    II (d, a, b, c, in[15], S42, 4264355552UL);	/* 58 */
-    II (c, d, a, b, in[6], S43, 2734768916UL);	/* 59 */
-    II (b, c, d, a, in[13], S44, 1309151649UL);	/* 60 */
-    II (a, b, c, d, in[4], S41, 4149444226UL);	/* 61 */
-    II (d, a, b, c, in[11], S42, 3174756917UL);	/* 62 */
-    II (c, d, a, b, in[2], S43, 718787259UL);	/* 63 */
-    II (b, c, d, a, in[9], S44, 3951481745UL);	/* 64 */
-
-    buf[0] += a;
-    buf[1] += b;
-    buf[2] += c;
-    buf[3] += d;
-}
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <endian.h>
+
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
+
+#ifdef _LIBC
+/* We need to keep the namespace clean so define the MD5 function
+   protected using leading __ .  */
+# define md5_init_ctx __md5_init_ctx
+# define md5_process_block __md5_process_block
+# define md5_process_bytes __md5_process_bytes
+# define md5_finish_ctx __md5_finish_ctx
+# define md5_read_ctx __md5_read_ctx
+# define md5_stream __md5_stream
+# define md5_buffer __md5_buffer
+#endif
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+# define SWAP(n)							\
+    (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
+#else
+# define SWAP(n) (n)
+#endif
+
+#define BLOCKSIZE 4096
+#if BLOCKSIZE % 64 != 0
+# error "invalid BLOCKSIZE"
+#endif
+
+/* This array contains the bytes used to pad the buffer to the next
+   64-byte boundary.  (RFC 1321, 3.1: Step 1)  */
+static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
+
+
+/* Initialize structure containing state of computation.
+   (RFC 1321, 3.3: Step 3)  */
 void
-wvMD5Init (MD5_CTX *mdContext)
+md5_init_ctx (struct md5_ctx *ctx)
 {
-    mdContext->i[0] = mdContext->i[1] = (UINT4) 0;
+  ctx->A = 0x67452301;
+  ctx->B = 0xefcdab89;
+  ctx->C = 0x98badcfe;
+  ctx->D = 0x10325476;
 
-    /* Load magic initialization constants.
-     */
-    mdContext->buf[0] = (UINT4) 0x67452301;
-    mdContext->buf[1] = (UINT4) 0xefcdab89;
-    mdContext->buf[2] = (UINT4) 0x98badcfe;
-    mdContext->buf[3] = (UINT4) 0x10325476;
+  ctx->total[0] = ctx->total[1] = 0;
+  ctx->buflen = 0;
 }
 
-void
-wvMD5Update (MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen)
+/* Put result from CTX in first 16 bytes following RESBUF.  The result
+   must be in little endian byte order.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32-bit value.  */
+void *
+md5_read_ctx (const struct md5_ctx *ctx, void *resbuf)
+{
+  ((uint32_t *) resbuf)[0] = SWAP (ctx->A);
+  ((uint32_t *) resbuf)[1] = SWAP (ctx->B);
+  ((uint32_t *) resbuf)[2] = SWAP (ctx->C);
+  ((uint32_t *) resbuf)[3] = SWAP (ctx->D);
+
+  return resbuf;
+}
+
+/* Process the remaining bytes in the internal buffer and the usual
+   prolog according to the standard and write the result to RESBUF.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32-bit value.  */
+void *
+md5_finish_ctx (struct md5_ctx *ctx, void *resbuf)
+{
+  /* Take yet unprocessed bytes into account.  */
+  uint32_t bytes = ctx->buflen;
+  size_t size = (bytes < 56) ? 64 / 4 : 64 * 2 / 4;
+
+  /* Now count remaining bytes.  */
+  ctx->total[0] += bytes;
+  if (ctx->total[0] < bytes)
+    ++ctx->total[1];
+
+  /* Put the 64-bit file length in *bits* at the end of the buffer.  */
+  ctx->buffer[size - 2] = SWAP (ctx->total[0] << 3);
+  ctx->buffer[size - 1] = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29));
+
+  memcpy (&((char *) ctx->buffer)[bytes], fillbuf, (size - 2) * 4 - bytes);
+
+  /* Process last bytes.  */
+  md5_process_block (ctx->buffer, size * 4, ctx);
+
+  return md5_read_ctx (ctx, resbuf);
+}
+
+/* Compute MD5 message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 16 bytes
+   beginning at RESBLOCK.  */
+int
+md5_stream (FILE *stream, void *resblock)
 {
-    UINT4 in[16];
-    int mdi;
-    unsigned int i, ii;
-
-    /* compute number of bytes mod 64 */
-    mdi = (int) ((mdContext->i[0] >> 3) & 0x3F);
-
-    /* update number of bits */
-    if ((mdContext->i[0] + ((UINT4) inLen << 3)) < mdContext->i[0])
-	mdContext->i[1]++;
-    mdContext->i[0] += ((UINT4) inLen << 3);
-    mdContext->i[1] += ((UINT4) inLen >> 29);
-
-    while (inLen--)
-      {
-	  /* add new character to buffer, increment mdi */
-	  mdContext->in[mdi++] = *inBuf++;
+  struct md5_ctx ctx;
+  char buffer[BLOCKSIZE + 72];
+  size_t sum;
+
+  /* Initialize the computation context.  */
+  md5_init_ctx (&ctx);
+
+  /* Iterate over full file contents.  */
+  while (1)
+    {
+      /* We read the file in blocks of BLOCKSIZE bytes.  One call of the
+         computation function processes the whole buffer so that with the
+         next round of the loop another block can be read.  */
+      size_t n;
+      sum = 0;
+
+      /* Read block.  Take care for partial reads.  */
+      while (1)
+	{
+	  n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream);
 
-	  /* transform if necessary */
-	  if (mdi == 0x40)
+	  sum += n;
+
+	  if (sum == BLOCKSIZE)
+	    break;
+
+	  if (n == 0)
 	    {
-		for (i = 0, ii = 0; i < 16; i++, ii += 4)
-		    in[i] = (((UINT4) mdContext->in[ii + 3]) << 24) |
-			(((UINT4) mdContext->in[ii + 2]) << 16) |
-			(((UINT4) mdContext->in[ii + 1]) << 8) |
-			((UINT4) mdContext->in[ii]);
-		Transform (mdContext->buf, in);
-		mdi = 0;
+	      /* Check for the error flag IFF N == 0, so that we don't
+	         exit the loop after a partial read due to e.g., EAGAIN
+	         or EWOULDBLOCK.  */
+	      if (ferror (stream))
+		return 1;
+	      goto process_partial_block;
 	    }
-      }
+
+	  /* We've read at least one byte, so ignore errors.  But always
+	     check for EOF, since feof may be true even though N > 0.
+	     Otherwise, we could end up calling fread after EOF.  */
+	  if (feof (stream))
+	    goto process_partial_block;
+	}
+
+      /* Process buffer with BLOCKSIZE bytes.  Note that
+         BLOCKSIZE % 64 == 0
+       */
+      md5_process_block (buffer, BLOCKSIZE, &ctx);
+    }
+
+process_partial_block:
+
+  /* Process any remaining bytes.  */
+  if (sum > 0)
+    md5_process_bytes (buffer, sum, &ctx);
+
+  /* Construct result in desired memory.  */
+  md5_finish_ctx (&ctx, resblock);
+  return 0;
+}
+
+/* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
+   result is always in little endian byte order, so that a byte-wise
+   output yields to the wanted ASCII representation of the message
+   digest.  */
+void *
+md5_buffer (const char *buffer, size_t len, void *resblock)
+{
+  struct md5_ctx ctx;
+
+  /* Initialize the computation context.  */
+  md5_init_ctx (&ctx);
+
+  /* Process whole buffer but last len % 64 bytes.  */
+  md5_process_bytes (buffer, len, &ctx);
+
+  /* Put result in desired memory area.  */
+  return md5_finish_ctx (&ctx, resblock);
+}
+
+
+void
+md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
+{
+  /* When we already have some bits in our internal buffer concatenate
+     both inputs first.  */
+  if (ctx->buflen != 0)
+    {
+      size_t left_over = ctx->buflen;
+      size_t add = 128 - left_over > len ? len : 128 - left_over;
+
+      memcpy (&((char *) ctx->buffer)[left_over], buffer, add);
+      ctx->buflen += add;
+
+      if (ctx->buflen > 64)
+	{
+	  md5_process_block (ctx->buffer, ctx->buflen & ~63, ctx);
+
+	  ctx->buflen &= 63;
+	  /* The regions in the following copy operation cannot overlap.  */
+	  memcpy (ctx->buffer,
+		  &((char *) ctx->buffer)[(left_over + add) & ~63],
+		  ctx->buflen);
+	}
+
+      buffer = (const char *) buffer + add;
+      len -= add;
+    }
+
+  /* Process available complete blocks.  */
+  if (len >= 64)
+    {
+#if !_STRING_ARCH_unaligned
+# define alignof(type) offsetof (struct { char c; type x; }, x)
+# define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0)
+      if (UNALIGNED_P (buffer))
+	while (len > 64)
+	  {
+	    md5_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
+	    buffer = (const char *) buffer + 64;
+	    len -= 64;
+	  }
+      else
+#endif
+	{
+	  md5_process_block (buffer, len & ~63, ctx);
+	  buffer = (const char *) buffer + (len & ~63);
+	  len &= 63;
+	}
+    }
+
+  /* Move remaining bytes in internal buffer.  */
+  if (len > 0)
+    {
+      size_t left_over = ctx->buflen;
+
+      memcpy (&((char *) ctx->buffer)[left_over], buffer, len);
+      left_over += len;
+      if (left_over >= 64)
+	{
+	  md5_process_block (ctx->buffer, 64, ctx);
+	  left_over -= 64;
+	  memcpy (ctx->buffer, &ctx->buffer[16], left_over);
+	}
+      ctx->buflen = left_over;
+    }
 }
 
-/*
- **********************************************************************
- ** End of md5.c                                                     **
- ******************************* (cut) ********************************
- */
+
+/* These are the four functions used in the four steps of the MD5 algorithm
+   and defined in the RFC 1321.  The first function is a little bit optimized
+   (as found in Colin Plumbs public domain implementation).  */
+/* #define FF(b, c, d) ((b & c) | (~b & d)) */
+#define FF(b, c, d) (d ^ (b & (c ^ d)))
+#define FG(b, c, d) FF (d, b, c)
+#define FH(b, c, d) (b ^ c ^ d)
+#define FI(b, c, d) (c ^ (b | ~d))
+
+/* Process LEN bytes of BUFFER, accumulating context into CTX.
+   It is assumed that LEN % 64 == 0.  */
+
+void
+md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
+{
+  uint32_t correct_words[16];
+  const uint32_t *words = buffer;
+  size_t nwords = len / sizeof (uint32_t);
+  const uint32_t *endp = words + nwords;
+  uint32_t A = ctx->A;
+  uint32_t B = ctx->B;
+  uint32_t C = ctx->C;
+  uint32_t D = ctx->D;
+
+  /* First increment the byte count.  RFC 1321 specifies the possible
+     length of the file up to 2^64 bits.  Here we only compute the
+     number of bytes.  Do a double word increment.  */
+  ctx->total[0] += len;
+  if (ctx->total[0] < len)
+    ++ctx->total[1];
+
+  /* Process all bytes in the buffer with 64 bytes in each round of
+     the loop.  */
+  while (words < endp)
+    {
+      uint32_t *cwp = correct_words;
+      uint32_t A_save = A;
+      uint32_t B_save = B;
+      uint32_t C_save = C;
+      uint32_t D_save = D;
+
+      /* First round: using the given function, the context and a constant
+         the next context is computed.  Because the algorithms processing
+         unit is a 32-bit word and it is determined to work on words in
+         little endian byte order we perhaps have to change the byte order
+         before the computation.  To reduce the work for the next steps
+         we store the swapped words in the array CORRECT_WORDS.  */
+
+#define OP(a, b, c, d, s, T)						\
+      do								\
+        {								\
+	  a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T;		\
+	  ++words;							\
+	  CYCLIC (a, s);						\
+	  a += b;							\
+        }								\
+      while (0)
+
+      /* It is unfortunate that C does not provide an operator for
+         cyclic rotation.  Hope the C compiler is smart enough.  */
+#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
+
+      /* Before we start, one word to the strange constants.
+         They are defined in RFC 1321 as
+
+         T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
+
+         Here is an equivalent invocation using Perl:
+
+         perl -e 'foreach(1..64){printf "0x%08x\n", int (4294967296 * abs (sin $_))}'
+       */
+
+      /* Round 1.  */
+      OP (A, B, C, D, 7, 0xd76aa478);
+      OP (D, A, B, C, 12, 0xe8c7b756);
+      OP (C, D, A, B, 17, 0x242070db);
+      OP (B, C, D, A, 22, 0xc1bdceee);
+      OP (A, B, C, D, 7, 0xf57c0faf);
+      OP (D, A, B, C, 12, 0x4787c62a);
+      OP (C, D, A, B, 17, 0xa8304613);
+      OP (B, C, D, A, 22, 0xfd469501);
+      OP (A, B, C, D, 7, 0x698098d8);
+      OP (D, A, B, C, 12, 0x8b44f7af);
+      OP (C, D, A, B, 17, 0xffff5bb1);
+      OP (B, C, D, A, 22, 0x895cd7be);
+      OP (A, B, C, D, 7, 0x6b901122);
+      OP (D, A, B, C, 12, 0xfd987193);
+      OP (C, D, A, B, 17, 0xa679438e);
+      OP (B, C, D, A, 22, 0x49b40821);
+
+      /* For the second to fourth round we have the possibly swapped words
+         in CORRECT_WORDS.  Redefine the macro to take an additional first
+         argument specifying the function to use.  */
+#undef OP
+#define OP(f, a, b, c, d, k, s, T)					\
+      do								\
+	{								\
+	  a += f (b, c, d) + correct_words[k] + T;			\
+	  CYCLIC (a, s);						\
+	  a += b;							\
+	}								\
+      while (0)
+
+      /* Round 2.  */
+      OP (FG, A, B, C, D, 1, 5, 0xf61e2562);
+      OP (FG, D, A, B, C, 6, 9, 0xc040b340);
+      OP (FG, C, D, A, B, 11, 14, 0x265e5a51);
+      OP (FG, B, C, D, A, 0, 20, 0xe9b6c7aa);
+      OP (FG, A, B, C, D, 5, 5, 0xd62f105d);
+      OP (FG, D, A, B, C, 10, 9, 0x02441453);
+      OP (FG, C, D, A, B, 15, 14, 0xd8a1e681);
+      OP (FG, B, C, D, A, 4, 20, 0xe7d3fbc8);
+      OP (FG, A, B, C, D, 9, 5, 0x21e1cde6);
+      OP (FG, D, A, B, C, 14, 9, 0xc33707d6);
+      OP (FG, C, D, A, B, 3, 14, 0xf4d50d87);
+      OP (FG, B, C, D, A, 8, 20, 0x455a14ed);
+      OP (FG, A, B, C, D, 13, 5, 0xa9e3e905);
+      OP (FG, D, A, B, C, 2, 9, 0xfcefa3f8);
+      OP (FG, C, D, A, B, 7, 14, 0x676f02d9);
+      OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
+
+      /* Round 3.  */
+      OP (FH, A, B, C, D, 5, 4, 0xfffa3942);
+      OP (FH, D, A, B, C, 8, 11, 0x8771f681);
+      OP (FH, C, D, A, B, 11, 16, 0x6d9d6122);
+      OP (FH, B, C, D, A, 14, 23, 0xfde5380c);
+      OP (FH, A, B, C, D, 1, 4, 0xa4beea44);
+      OP (FH, D, A, B, C, 4, 11, 0x4bdecfa9);
+      OP (FH, C, D, A, B, 7, 16, 0xf6bb4b60);
+      OP (FH, B, C, D, A, 10, 23, 0xbebfbc70);
+      OP (FH, A, B, C, D, 13, 4, 0x289b7ec6);
+      OP (FH, D, A, B, C, 0, 11, 0xeaa127fa);
+      OP (FH, C, D, A, B, 3, 16, 0xd4ef3085);
+      OP (FH, B, C, D, A, 6, 23, 0x04881d05);
+      OP (FH, A, B, C, D, 9, 4, 0xd9d4d039);
+      OP (FH, D, A, B, C, 12, 11, 0xe6db99e5);
+      OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8);
+      OP (FH, B, C, D, A, 2, 23, 0xc4ac5665);
+
+      /* Round 4.  */
+      OP (FI, A, B, C, D, 0, 6, 0xf4292244);
+      OP (FI, D, A, B, C, 7, 10, 0x432aff97);
+      OP (FI, C, D, A, B, 14, 15, 0xab9423a7);
+      OP (FI, B, C, D, A, 5, 21, 0xfc93a039);
+      OP (FI, A, B, C, D, 12, 6, 0x655b59c3);
+      OP (FI, D, A, B, C, 3, 10, 0x8f0ccc92);
+      OP (FI, C, D, A, B, 10, 15, 0xffeff47d);
+      OP (FI, B, C, D, A, 1, 21, 0x85845dd1);
+      OP (FI, A, B, C, D, 8, 6, 0x6fa87e4f);
+      OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0);
+      OP (FI, C, D, A, B, 6, 15, 0xa3014314);
+      OP (FI, B, C, D, A, 13, 21, 0x4e0811a1);
+      OP (FI, A, B, C, D, 4, 6, 0xf7537e82);
+      OP (FI, D, A, B, C, 11, 10, 0xbd3af235);
+      OP (FI, C, D, A, B, 2, 15, 0x2ad7d2bb);
+      OP (FI, B, C, D, A, 9, 21, 0xeb86d391);
+
+      /* Add the starting values of the context.  */
+      A += A_save;
+      B += B_save;
+      C += C_save;
+      D += D_save;
+    }
+
+  /* Put checksum in context given as argument.  */
+  ctx->A = A;
+  ctx->B = B;
+  ctx->C = C;
+  ctx->D = D;
+}

gnumeric-1.6.3-stf-parse.patch:

--- NEW FILE gnumeric-1.6.3-stf-parse.patch ---
--- trunk/src/stf-parse.c	2006/05/25 16:09:39	14862
+++ trunk/src/stf-parse.c	2006/06/21 00:39:23	14888
@@ -1400,6 +1400,7 @@
 		if (count_character (lines, (c = sepchar), 0.5) > 0 ||
 		    count_character (lines, (c = format_get_col_sep ()), 0.5) > 0 ||
 		    count_character (lines, (c = ':'), 0.5) > 0 ||
+		    count_character (lines, (c = ','), 0.5) > 0 ||
 		    count_character (lines, (c = ';'), 0.5) > 0 ||
 		    count_character (lines, (c = '|'), 0.5) > 0 ||
 		    count_character (lines, (c = '!'), 0.5) > 0 ||


--- NEW FILE import.log ---
gnumeric-1_6_3-15_fc8:EL-5:gnumeric-1.6.3-15.fc8.src.rpm:1222156454


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/EL-5/gnumeric.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnumeric.spec	9 Sep 2006 13:26:31 -0000	1.22
+++ gnumeric.spec	23 Sep 2008 07:54:49 -0000	1.23
@@ -1,27 +1,30 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.6.3
-Release:          5%{?dist}
+Release:          15%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
-License:          GPL
+# bug filed upstream about this being GPL v2 only:
+# http://bugzilla.gnome.org/show_bug.cgi?id=463247
+License:          GPLv2
 URL:              http://www.gnome.org/gnumeric/
-Source:           ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}.tar.bz2
+Source:           ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.6/%{name}-%{version}.tar.bz2
 Patch0:           gnumeric-1.6.1-desktop.patch
 Patch1:           gnumeric-1.4.1-excelcrash.patch
 Patch2:           gnumeric-1.6.3-helppath.patch
+Patch3:           gnumeric-1.6.3-gda3.patch
+Patch4:           gnumeric-1.6.3-gpl-md5.patch
+Patch5:           gnumeric-1.6.3-stf-parse.patch
+Patch6:           gnumeric-1.6.3-excel-overflow.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
-BuildRequires:    desktop-file-utils >= 0.9
 BuildRequires:    libgnomeui-devel >= 2.4.0
 BuildRequires:    libgnomeprintui22-devel >= 2.8.2
-BuildRequires:    python-devel
-BuildRequires:    libgsf-devel >= 1.13.2
-BuildRequires:    automake autoconf libtool
-BuildRequires:    intltool scrollkeeper gettext
-BuildRequires:    libgnomedb-devel >= 1.0.4
+BuildRequires:    libgsf-gnome-devel >= 1.13.2
+BuildRequires:    libgnomedb-devel >= 3.0.0
 BuildRequires:    pygtk2-devel >= 2.6.0
 BuildRequires:    goffice-devel >= 0.2.0
-BuildRequires:    guile-devel
+BuildRequires:    python-devel guile-devel perl(XML::Parser) scrollkeeper
+BuildRequires:    gettext desktop-file-utils
 Requires:         scrollkeeper hicolor-icon-theme
 Requires(pre):    GConf2
 Requires(post):   /sbin/ldconfig GConf2 scrollkeeper
@@ -34,7 +37,7 @@
 
 
 %package devel
-Summary: Files necessary to develop gnumeric-based applications.
+Summary: Files necessary to develop gnumeric-based applications
 Group: Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
 
@@ -49,13 +52,19 @@
 %patch0 -p1 -b .desktop
 %patch1 -p1 -b .excelcrash
 %patch2 -p1 -b .helppath
+%patch3 -p1 -b .gda3
+%patch4 -p1 -b .gpl-md5
+%patch5 -p1 -b .csv
+%patch6 -p1 -b .excel
+chmod -x plugins/excel/rc4.?
 
 
 %build
-libtoolize --force --copy && aclocal && autoconf
-export mllibname=%{_lib}
 %configure --without-gb --enable-ssindex
-OLD_PO_FILE_INPUT=yes make
+# 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
+make %{?_smp_mflags}
 
 
 %install
@@ -70,9 +79,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora --delete-original                  \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications                         \
-  --add-category X-Fedora                                               \
   --add-category Office                                                 \
-  --add-category Application                                            \
   --add-category Spreadsheet                                            \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
@@ -82,22 +89,22 @@
   $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/%{name}.png
 
 #remove unused mime type icons
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/pixmaps/gnome-application-*.png
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}-gnome-application-*.png
+rm $RPM_BUILD_ROOT/%{_datadir}/pixmaps/gnome-application-*.png
+rm $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/gnome-application-*.png
 
 #remove spurious .ico thing
-rm -rf $RPM_BUILD_ROOT/usr/share/pixmaps/win32-%{name}.ico
-rm -rf $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}/win32-%{name}.ico
+rm $RPM_BUILD_ROOT/usr/share/pixmaps/win32-%{name}.ico
+rm $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}/win32-%{name}.ico
 
 #remove scrollkeeper stuff
 rm -rf $RPM_BUILD_ROOT/var
 
 #remove .la files
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/libspreadsheet.la
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/%{version}/plugins/*/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/libspreadsheet.la
+rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/%{version}/plugins/*/*.la
 
 #remove bogus mc stuff
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/mc
+rm -r $RPM_BUILD_ROOT/%{_datadir}/mc
 
 
 %clean
@@ -157,7 +164,8 @@
 %exclude %{_datadir}/%{name}/%{version}/idl
 %{_datadir}/mime-info
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/omf/%{name}
+# The actual omf file is in gnumeric.lang, but find-lang doesn't own the dir!
+%dir %{_datadir}/omf/%{name}
 %{_mandir}/man1/*
 
 %files devel
@@ -167,6 +175,40 @@
 
 
 %changelog
+* Wed Feb  6 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-15
+- Fix launching of gnome-database-properties from the Data -> Databases
+  menu-entry (bug 431618)
+
+* Sun Feb  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-14
+- Fix integer overflow and signedness errors in XLS processing (Bug 431229)
+
+* Thu Nov 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-13
+- Fix opening of csv files in non-English locales (bz 385441)
+
+* Wed Sep 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-12
+- Replace GPL incompatible licensed md5 code with GPL compatible code from
+  gnulib
+
+* Fri Aug 31 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-11
+- Fix Source0 URL
+
+* Mon Aug  6 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-10
+- Update License tag for new Licensing Guidelines compliance
+- Don't regenerate all the autoxxx stuff (not needed) this fixes building with
+  the latest intltool
+
+* Sun Jun 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-9
+- Remove yelp Requires again <sigh> (bz 243361)
+
+* Fri Jun  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-8
+- Add yelp Requires so that the help will always work (bz 243361)
+
+* Sun May 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-7
+- Build against new libgda + libgnomedb
+
+* Mon Feb 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-6
+- Change BuildRequires: libgsf-devel to libgsf-gnome-devel to fix rawhide build
+
 * Sat Sep  9 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-5
 - Various specfile cleanups
 - Don't own /usr/share/omf (bug 205667)
@@ -325,7 +367,7 @@
 - add ssconvert
 
 * Tue Oct 14 2003 Havoc Pennington <hp at redhat.com> 1:1.2.1-1
-- add %post to install schemas
+- add %%post to install schemas
 - 1.2.1
 
 * Fri Sep 19 2003 Havoc Pennington <hp at redhat.com> 1:1.2.0-1
@@ -450,7 +492,7 @@
 * Mon Jul 16 2001 Jonathan Blandford <jrb at redhat.com>
 - backport sheet corruption fix
 
-* Tue Jul 10 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Jul 10 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - Make devel subpackage depend on main package
 
 * Sat Jul 07 2001 Owen Taylor <otaylor at redhat.com>



From lkundrak at fedoraproject.org  Tue Sep 23 08:04:00 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 23 Sep 2008 08:04:00 +0000 (UTC)
Subject: rpms/gnumeric/EL-5 gnumeric.spec,1.23,1.24
Message-ID: <20080923080400.6D2F470033@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gnumeric/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6514

Modified Files:
	gnumeric.spec 
Log Message:
* Tue Sep 23 2008 Lubomir Rintel <lkundrak at v3.sk> 1:1.6.3-15.1
- libgsf-gnome-devel does not exist in el5 yet, replace with libgsf-devel



Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/EL-5/gnumeric.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gnumeric.spec	23 Sep 2008 07:54:49 -0000	1.23
+++ gnumeric.spec	23 Sep 2008 08:03:30 -0000	1.24
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.6.3
-Release:          15%{?dist}
+Release:          15%{?dist}.1
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -19,7 +19,7 @@
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 BuildRequires:    libgnomeui-devel >= 2.4.0
 BuildRequires:    libgnomeprintui22-devel >= 2.8.2
-BuildRequires:    libgsf-gnome-devel >= 1.13.2
+BuildRequires:    libgsf-devel >= 1.13.2
 BuildRequires:    libgnomedb-devel >= 3.0.0
 BuildRequires:    pygtk2-devel >= 2.6.0
 BuildRequires:    goffice-devel >= 0.2.0
@@ -175,6 +175,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Lubomir Rintel <lkundrak at v3.sk> 1:1.6.3-15.1
+- libgsf-gnome-devel does not exist in el5 yet, replace with libgsf-devel
+
 * Wed Feb  6 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-15
 - Fix launching of gnome-database-properties from the Data -> Databases
   menu-entry (bug 431618)



From petersen at fedoraproject.org  Tue Sep 23 08:05:40 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 23 Sep 2008 08:05:40 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.111,1.112
Message-ID: <20080923080540.B7ED170033@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6832

Modified Files:
	comps-f10.xml.in 
Log Message:
make smc-fonts-meera the default for Malayalam



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- comps-f10.xml.in	22 Sep 2008 21:28:38 -0000	1.111
+++ comps-f10.xml.in	23 Sep 2008 08:05:10 -0000	1.112
@@ -1365,13 +1365,13 @@
       <packagereq type="default">lohit-fonts-hindi</packagereq>
       <packagereq type="default">lohit-fonts-kannada</packagereq>
       <packagereq type="default">lohit-fonts-maithili</packagereq>
-      <packagereq type="default">lohit-fonts-malayalam</packagereq>
       <packagereq type="default">lohit-fonts-oriya</packagereq>
       <packagereq type="default">lohit-fonts-punjabi</packagereq>
       <packagereq type="default">lohit-fonts-tamil</packagereq>
       <packagereq type="default">lohit-fonts-telugu</packagereq>
       <packagereq type="default">padauk-fonts</packagereq>
       <packagereq type="default">paktype-fonts</packagereq>
+      <packagereq type="default">smc-fonts-meera</packagereq>
       <packagereq type="default">stix-fonts</packagereq>
       <packagereq type="default">thaifonts-scalable</packagereq>
       <packagereq type="default">un-core-fonts-dotum</packagereq>
@@ -1425,6 +1425,7 @@
       <packagereq type="optional">lohit-fonts-kashmiri</packagereq>
       <packagereq type="optional">lohit-fonts-konkani</packagereq>
       <packagereq type="optional">lohit-fonts-maithili</packagereq>
+      <packagereq type="optional">lohit-fonts-malayalam</packagereq>
       <packagereq type="optional">lohit-fonts-marathi</packagereq>
       <packagereq type="optional">lohit-fonts-nepali</packagereq>
       <packagereq type="optional">lohit-fonts-sindhi</packagereq>
@@ -1447,7 +1448,6 @@
       <packagereq type="optional">smc-fonts-anjalioldlipi</packagereq>
       <packagereq type="optional">smc-fonts-dyuthi</packagereq>
       <packagereq type="optional">smc-fonts-kalyani</packagereq>
-      <packagereq type="optional">smc-fonts-meera</packagereq>
       <packagereq type="optional">smc-fonts-rachana</packagereq>
       <packagereq type="optional">smc-fonts-raghumalayalam</packagereq>
       <packagereq type="optional">smc-fonts-suruma</packagereq>
@@ -3222,7 +3222,6 @@
     <packagelist>
       <packagereq type="mandatory">m17n-contrib-malayalam</packagereq>
       <packagereq type="mandatory">m17n-db-malayalam</packagereq>
-      <packagereq type="mandatory">smc-fonts-meera</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-ml</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ml</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ml</packagereq>
@@ -3233,6 +3232,7 @@
       <packagereq type="default">smc-fonts-anjalioldlipi</packagereq>
       <packagereq type="default">smc-fonts-dyuthi</packagereq>
       <packagereq type="default">smc-fonts-kalyani</packagereq>
+      <packagereq type="default">smc-fonts-meera</packagereq>
       <packagereq type="default">smc-fonts-rachana</packagereq>
       <packagereq type="default">smc-fonts-raghumalayalam</packagereq>
       <packagereq type="default">smc-fonts-suruma</packagereq>



From lkundrak at fedoraproject.org  Tue Sep 23 08:23:34 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 23 Sep 2008 08:23:34 +0000 (UTC)
Subject: rpms/gnumeric/EL-5 gnumeric.spec,1.24,1.25
Message-ID: <20080923082334.6807270033@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gnumeric/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9123

Modified Files:
	gnumeric.spec 
Log Message:
* Tue Sep 23 2008 Lubomir Rintel <lkundrak at v3.sk> 1:1.6.3-15.1
- libgsf-gnome-devel does not exist in el5 yet, replace with libgsf-devel
- Package the omf file



Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/EL-5/gnumeric.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnumeric.spec	23 Sep 2008 08:03:30 -0000	1.24
+++ gnumeric.spec	23 Sep 2008 08:23:04 -0000	1.25
@@ -164,8 +164,7 @@
 %exclude %{_datadir}/%{name}/%{version}/idl
 %{_datadir}/mime-info
 %{_datadir}/applications/fedora-%{name}.desktop
-# The actual omf file is in gnumeric.lang, but find-lang doesn't own the dir!
-%dir %{_datadir}/omf/%{name}
+%{_datadir}/omf/%{name}
 %{_mandir}/man1/*
 
 %files devel
@@ -177,6 +176,7 @@
 %changelog
 * Tue Sep 23 2008 Lubomir Rintel <lkundrak at v3.sk> 1:1.6.3-15.1
 - libgsf-gnome-devel does not exist in el5 yet, replace with libgsf-devel
+- Package the omf file
 
 * Wed Feb  6 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-15
 - Fix launching of gnome-database-properties from the Data -> Databases



From mmaslano at fedoraproject.org  Tue Sep 23 08:23:45 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 23 Sep 2008 08:23:45 +0000 (UTC)
Subject: rpms/anacron/devel anacron-2.3-fdclose.patch, 1.1,
	1.2 anacron-2.3-mail-content-type-77108.patch, 1.1,
	1.2 anacron.init, 1.18, 1.19 anacron-2.3-onbattery.patch, 1.1,
	NONE anacron-2.3-sterr_null.patch, 1.1, NONE
Message-ID: <20080923082345.0818270033@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/anacron/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9043

Modified Files:
	anacron-2.3-fdclose.patch 
	anacron-2.3-mail-content-type-77108.patch anacron.init 
Removed Files:
	anacron-2.3-onbattery.patch anacron-2.3-sterr_null.patch 
Log Message:
Fix fuzz problem, remove unused patches.


anacron-2.3-fdclose.patch:

Index: anacron-2.3-fdclose.patch
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron-2.3-fdclose.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anacron-2.3-fdclose.patch	12 Sep 2006 11:34:21 -0000	1.1
+++ anacron-2.3-fdclose.patch	23 Sep 2008 08:23:14 -0000	1.2
@@ -1,7 +1,7 @@
-diff -uNr anacron-2.3-orig/global.h anacron-2.3/global.h
---- anacron-2.3-orig/global.h	2000-06-23 01:00:14.000000000 +0100
-+++ anacron-2.3/global.h	2006-03-20 15:31:28.000000000 +0000
-@@ -60,6 +60,7 @@
+diff -up anacron-2.3/global.h.fdclose anacron-2.3/global.h
+--- anacron-2.3/global.h.fdclose	2008-09-23 10:06:04.000000000 +0200
++++ anacron-2.3/global.h	2008-09-23 10:06:04.000000000 +0200
+@@ -63,6 +63,7 @@ struct job_rec1 {
     int tab_line;
     int arg_num;
     int timestamp_fd;
@@ -9,9 +9,9 @@
     int output_fd;
     int mail_header_size;
     pid_t job_pid;
-diff -uNr anacron-2.3-orig/runjob.c anacron-2.3/runjob.c
---- anacron-2.3-orig/runjob.c	2006-02-21 14:05:08.000000000 +0000
-+++ anacron-2.3/runjob.c	2006-03-20 15:32:32.000000000 +0000
+diff -up anacron-2.3/runjob.c.fdclose anacron-2.3/runjob.c
+--- anacron-2.3/runjob.c.fdclose	2008-09-23 10:06:04.000000000 +0200
++++ anacron-2.3/runjob.c	2008-09-23 10:06:04.000000000 +0200
 @@ -38,12 +38,12 @@
  #include <langinfo.h>
  
@@ -27,7 +27,7 @@
  
      i = 0;
      name = NULL;
-@@ -53,16 +53,24 @@
+@@ -53,16 +53,24 @@ temp_file()
  	free(name);
  	name = tempnam(NULL, NULL);
  	if (name == NULL) die("Can't find a unique temporary filename");
@@ -58,7 +58,7 @@
  }
  
  static off_t
-@@ -170,17 +178,28 @@
+@@ -167,17 +175,28 @@ launch_mailer(job_rec *jr)
      pid = xfork();
      if (pid == 0)
      {
@@ -88,16 +88,16 @@
  	/* Here, I basically mirrored the way /usr/sbin/sendmail is called
  	 * by cron on a Debian system, except for the "-oem" and "-or0s"
  	 * options, which don't seem to be appropriate here.
-@@ -225,7 +244,7 @@
-     setup_env(jr);
+@@ -236,7 +255,7 @@ launch_job(job_rec *jr)
+ 	    jr->mailto = username ();
  
      /* create temporary file for stdout and stderr of the job */
 -    fd = jr->output_fd = temp_file();
 +    temp_file(jr); fd = jr->output_fd;
      /* write mail header */
      xwrite(fd, "From: ");
-     xwrite(fd, username());
-@@ -283,6 +302,7 @@
+     xwrite(fd, "Anacron <");
+@@ -302,6 +321,7 @@ tend_job(job_rec *jr, int status)
      running_jobs--;
      if (mail_output) launch_mailer(jr);
      xclose(jr->output_fd);

anacron-2.3-mail-content-type-77108.patch:

Index: anacron-2.3-mail-content-type-77108.patch
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron-2.3-mail-content-type-77108.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anacron-2.3-mail-content-type-77108.patch	9 Sep 2004 03:00:12 -0000	1.1
+++ anacron-2.3-mail-content-type-77108.patch	23 Sep 2008 08:23:14 -0000	1.2
@@ -1,6 +1,6 @@
-diff -u anacron-2.3/runjob.c~ anacron-2.3/runjob.c
---- anacron-2.3/runjob.c~	2003-07-10 15:25:44.000000000 +0900
-+++ anacron-2.3/runjob.c	2003-07-10 15:25:44.000000000 +0900
+diff -up anacron-2.3/runjob.c.charset anacron-2.3/runjob.c
+--- anacron-2.3/runjob.c.charset	2008-09-23 09:42:49.000000000 +0200
++++ anacron-2.3/runjob.c	2008-09-23 09:42:49.000000000 +0200
 @@ -35,6 +35,8 @@
  #include <string.h>
  #include "global.h"
@@ -10,13 +10,13 @@
  static int
  temp_file()
  /* Open a temporary file and return its file descriptor */
-@@ -217,6 +219,9 @@
-     xwrite(fd, "To: ");
-     xwrite(fd, username());
+@@ -247,6 +249,9 @@ launch_job(job_rec *jr)
+        xwrite(fd, username());
+     }
      xwrite(fd, "\n");
 +    xwrite(fd, "Content-Type: text/plain; charset=\"");
 +    xwrite(fd, nl_langinfo(CODESET));
 +    xwrite(fd, "\"\n");
      xwrite(fd, "Subject: Anacron job '");
      xwrite(fd, jr->ident);
-     xwrite(fd, "'\n\n");
+     xwrite(fd, "' on ");


Index: anacron.init
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.init,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- anacron.init	22 Sep 2008 16:12:15 -0000	1.18
+++ anacron.init	23 Sep 2008 08:23:14 -0000	1.19
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Startup script for anacron
 #
-# chkconfig: 2345 99 05
+# chkconfig: 2345 95 05
 # description: Run cron jobs that were left out due to downtime
 # pidfile: /var/run/anacron.pid
 #
@@ -11,14 +11,15 @@
 [ -f /usr/sbin/anacron ] || exit 0
 
 prog="anacron"
-PIDFILE=/var/spool/anacron/cron.daily
+PIDFILE=/var/run/${prog}.pid
 LOCKFILE=/var/lock/subsys/$prog
 #
 #  NOTE: anacron exits after it has determined it has no more work to do.
 #        Hence, its initscript cannot do normal lock file management.
-#        The anacron binary now creates its own timestamps in files 
-#	 /var/spool/anacron/cron.{daily,monthly,weekly}
-#        and /var/lock/subsys lock files. 
+#        The anacron binary now creates its own /var/run/anacron.pid pid file
+#        and /var/lock/subsys lock files, and removes them automatically at exit,
+#        so at least there will be no more "anacron is dead but subsys locked" 
+#        messages.
 #
 
 start() {
@@ -28,8 +29,8 @@
     if [ $RETVAL -ne 0 ]; then
 	failure;
     fi;
-    [ "$RETVAL" = 0 ] && touch $LOCKFILE
     echo
+    return $RETVAL
 }
 
 stop() {
@@ -41,10 +42,11 @@
 	    failure;
 	fi;
     else
+	RETVAL=1
 	failure;
     fi
-    [ "$RETVAL" = 0 ] && touch $LOCKFILE
     echo
+    return $RETVAL
 }
 
 case "$1" in
@@ -57,9 +59,7 @@
 	    ;;
 	
 	status)
-	    ## hard to say - anacron is up only when cron wake him
-	    status $prog
-	    RETVAL=$?
+	    status anacron
 	    ;;
 
 	restart)
@@ -68,16 +68,15 @@
 	    ;;
 
 	condrestart)
-		if [ -f /var/lock/subsys/anacron ]; then
-			stop
-			sleep 2
-			start
-		fi
-		;;
-
+	    if [ -f $LOCKFILE ]; then
+		stop
+		start
+	    fi
+	    ;;
+	
 	*)
 	    echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-	    RETVAL=3
+	    exit 1
 
 esac
 


--- anacron-2.3-onbattery.patch DELETED ---


--- anacron-2.3-sterr_null.patch DELETED ---



From mmaslano at fedoraproject.org  Tue Sep 23 08:27:41 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 23 Sep 2008 08:27:41 +0000 (UTC)
Subject: rpms/anacron/devel anacron.spec,1.52,1.53
Message-ID: <20080923082741.1AF9370033@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/anacron/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9718

Modified Files:
	anacron.spec 
Log Message:
* Wed Jul 30 2008 Marcela Maslanova <mmaslano at redhat.com> 2.3-64
- fix fuzz
- fix previous patch, thanks to mbroz



Index: anacron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- anacron.spec	23 Sep 2008 06:47:39 -0000	1.52
+++ anacron.spec	23 Sep 2008 08:27:10 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: A cron-like program that can run jobs lost during downtime
 Name: anacron
 Version: 2.3
-Release: 63%{?dist}
+Release: 64%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://packages.debian.org/stable/source/anacron
@@ -111,7 +111,8 @@
 %dir /etc/cron.monthly/0anacron
 
 %changelog
-* Wed Jul 30 2008 Marcela Maslanova <mmaslano at redhat.com> 2.3-63
+* Wed Jul 30 2008 Marcela Maslanova <mmaslano at redhat.com> 2.3-64
+- fix fuzz
 - fix previous patch, thanks to mbroz
 
 * Wed Jul 30 2008 Marcela Maslanova <mmaslano at redhat.com> 2.3-62



From thias at fedoraproject.org  Tue Sep 23 08:59:21 2008
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue, 23 Sep 2008 08:59:21 +0000 (UTC)
Subject: rpms/lighttpd/devel lighttpd-1.4.19-ticket1774.patch, NONE,
	1.1 .cvsignore, 1.23, 1.24 lighttpd.spec, 1.46, 1.47 sources,
	1.23, 1.24 lighttpd-1.4.19-sslshutdownfix.patch, 1.1, NONE
Message-ID: <20080923085921.87F4270033@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14818

Modified Files:
	.cvsignore lighttpd.spec sources 
Added Files:
	lighttpd-1.4.19-ticket1774.patch 
Removed Files:
	lighttpd-1.4.19-sslshutdownfix.patch 
Log Message:
Update to 1.4.20 pre-release, normally the last one before the final, which includes security and bug fixes.


lighttpd-1.4.19-ticket1774.patch:

--- NEW FILE lighttpd-1.4.19-ticket1774.patch ---
Index: /branches/lighttpd-1.4.x/src/request.c
===================================================================
--- /branches/lighttpd-1.4.x/src/request.c (revision 1947)
+++ /branches/lighttpd-1.4.x/src/request.c (revision 2305)
@@ -826,4 +826,5 @@
 												con->request.request);
 									}
+									array_insert_unique(con->request.headers, (data_unset *)ds);
 									return 0;
 								}
@@ -875,4 +876,5 @@
 												con->request.request);
 									}
+									array_insert_unique(con->request.headers, (data_unset *)ds);
 									return 0;
 								}
@@ -912,4 +914,5 @@
 												con->request.request);
 									}
+									array_insert_unique(con->request.headers, (data_unset *)ds);
 									return 0;
 								}
@@ -937,4 +940,5 @@
 												con->request.request);
 									}
+									array_insert_unique(con->request.headers, (data_unset *)ds);
 									return 0;
 								}
@@ -954,4 +958,5 @@
 												con->request.request);
 									}
+									array_insert_unique(con->request.headers, (data_unset *)ds);
 									return 0;
 								}
@@ -977,4 +982,5 @@
 												con->request.request);
 									}
+									array_insert_unique(con->request.headers, (data_unset *)ds);
 									return 0;
 								}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	12 Mar 2008 09:43:57 -0000	1.23
+++ .cvsignore	23 Sep 2008 08:58:51 -0000	1.24
@@ -1 +1 @@
-lighttpd-1.4.19.tar.bz2
+lighttpd-1.4.20.prerelease.r2303.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- lighttpd.spec	24 Apr 2008 15:17:17 -0000	1.46
+++ lighttpd.spec	23 Sep 2008 08:58:51 -0000	1.47
@@ -2,12 +2,13 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.19
-Release: 4%{?dist}
+Version: 1.4.20
+Release: 0.1.r2303%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
-Source0: http://www.lighttpd.net/download/lighttpd-%{version}.tar.bz2
+#Source0: http://www.lighttpd.net/download/lighttpd-%{version}.tar.bz2
+Source0: http://opensu.se/~darix/lighttpd/lighttpd-1.4.20.prerelease.r2303.tar.bz2
 Source1: lighttpd.logrotate
 Source2: php.d-lighttpd.ini
 Source10: index.html
@@ -18,8 +19,8 @@
 Source101: lighttpd-mod_geoip.txt
 Patch0: lighttpd-1.4.17-defaultconf.patch
 Patch1: lighttpd-1.4.18-mod_geoip.patch
-# Security fixes
-Patch10: lighttpd-1.4.19-sslshutdownfix.patch
+# Security and bug fixes
+Patch10: lighttpd-1.4.19-ticket1774.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: system-logos >= 7.92.1
 Requires(pre): /usr/sbin/useradd
@@ -89,7 +90,7 @@
 %setup -q
 %patch0 -p1 -b .defaultconf
 %patch1 -p1 -b .mod_geoip
-%patch10 -p1 -b .sslshutdown
+%patch10 -p3 -b .memleak
 %{__install} -p -m 0644 %{SOURCE100} src/mod_geoip.c
 %{__install} -p -m 0644 %{SOURCE101} mod_geoip.txt
 
@@ -214,6 +215,12 @@
 
 
 %changelog
+* Mon Sep 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-0.1.r2303
+- Update to 1.4.20 r2303 pre-release.
+
+* Mon Sep 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.19-5
+- Include memory leak patch (changeset #2305 from ticket #1774).
+
 * Thu Apr 24 2008 Matthias Saou <http://freshrpms.net/> 1.4.19-4
 - Merge in second changest from upstream fix for upstream bug #285.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	12 Mar 2008 09:43:57 -0000	1.23
+++ sources	23 Sep 2008 08:58:51 -0000	1.24
@@ -1 +1 @@
-d787374e4e4aaa09d5cfa9ab9d23ad40  lighttpd-1.4.19.tar.bz2
+4fcf61a620909490c742b751fe8aa3b7  lighttpd-1.4.20.prerelease.r2303.tar.bz2


--- lighttpd-1.4.19-sslshutdownfix.patch DELETED ---



From twaugh at fedoraproject.org  Tue Sep 23 09:00:29 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 23 Sep 2008 09:00:29 +0000 (UTC)
Subject: rpms/foomatic/F-8 foomatic-ppd-filenames.patch, 1.1,
	1.2 foomatic.spec, 1.180, 1.181
Message-ID: <20080923090029.6246F70033@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15284

Modified Files:
	foomatic-ppd-filenames.patch foomatic.spec 
Log Message:
* Tue Sep 23 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-67
- Really fixed filename handling in foomatic-rip (bug #457679).


foomatic-ppd-filenames.patch:

Index: foomatic-ppd-filenames.patch
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-8/foomatic-ppd-filenames.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- foomatic-ppd-filenames.patch	5 Sep 2008 14:56:37 -0000	1.1
+++ foomatic-ppd-filenames.patch	23 Sep 2008 08:59:59 -0000	1.2
@@ -1,7 +1,12 @@
 diff -U0 foomatic-filters-3.0-20080904/ChangeLog.ppd-filenames foomatic-filters-3.0-20080904/ChangeLog
 --- foomatic-filters-3.0-20080904/ChangeLog.ppd-filenames	2008-09-04 08:20:14.000000000 +0100
-+++ foomatic-filters-3.0-20080904/ChangeLog	2008-09-05 15:51:23.000000000 +0100
-@@ -0,0 +1,6 @@
++++ foomatic-filters-3.0-20080904/ChangeLog	2008-09-23 09:58:01.000000000 +0100
+@@ -0,0 +1,11 @@
++2008-09-23  Tim Waugh <twaugh at redhat.com>
++
++	* foomatic-rip.in: Remove final incorrect instance of
++	removespecialchars (bug #169).
++
 +2008-09-05  Till Kamppeter <till.kamppeter at gmail.com>
 +
 +	* foomatic-rip.in: Make foomatic-rip also working with PPD file
@@ -9,8 +14,17 @@
 +	  #169).
 +
 diff -up foomatic-filters-3.0-20080904/foomatic-rip.in.ppd-filenames foomatic-filters-3.0-20080904/foomatic-rip.in
---- foomatic-filters-3.0-20080904/foomatic-rip.in.ppd-filenames	2008-09-05 15:49:54.000000000 +0100
-+++ foomatic-filters-3.0-20080904/foomatic-rip.in	2008-09-05 15:51:23.000000000 +0100
+--- foomatic-filters-3.0-20080904/foomatic-rip.in.ppd-filenames	2008-09-23 09:57:43.000000000 +0100
++++ foomatic-filters-3.0-20080904/foomatic-rip.in	2008-09-23 09:58:01.000000000 +0100
+@@ -349,7 +349,7 @@ foreach my $shell ('/bin/sh', '/bin/bash
+ if (defined($ENV{'PPD'})) {
+     # Clean the file name from weird characters which could cause
+     # unexpected behaviour
+-    $ppdfile = removespecialchars($ENV{'PPD'});
++    $ppdfile = $ENV{'PPD'};
+     # CUPS, Solaris LP, and PPR (RIP filter) use the "PPD" environment variable
+     # to make the PPD file name available (we set CUPS here preliminarily,
+     # in the next step we check for Solaris LP and the PPR)
 @@ -517,10 +517,10 @@ if (defined($ENV{'PRINTCAP_ENTRY'})){
  # PPD file name given via the command line
  # allow duplicates, and use the last specified one


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-8/foomatic.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- foomatic.spec	5 Sep 2008 14:56:37 -0000	1.180
+++ foomatic.spec	23 Sep 2008 08:59:59 -0000	1.181
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    66%{?dist}
+Release:    67%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -235,6 +235,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Sep 23 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-67
+- Really fixed filename handling in foomatic-rip (bug #457679).
+
 * Fri Sep  5 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-66
 - Fixed filename handling in foomatic-rip (bug #457679).
 



From twaugh at fedoraproject.org  Tue Sep 23 09:00:50 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 23 Sep 2008 09:00:50 +0000 (UTC)
Subject: rpms/foomatic/F-9 foomatic-ppd-filenames.patch, 1.1,
	1.2 foomatic.spec, 1.191, 1.192
Message-ID: <20080923090050.124D270033@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15607

Modified Files:
	foomatic-ppd-filenames.patch foomatic.spec 
Log Message:
* Tue Sep 23 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-67
- Really fixed filename handling in foomatic-rip (bug #457679).


foomatic-ppd-filenames.patch:

Index: foomatic-ppd-filenames.patch
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-9/foomatic-ppd-filenames.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- foomatic-ppd-filenames.patch	5 Sep 2008 14:56:00 -0000	1.1
+++ foomatic-ppd-filenames.patch	23 Sep 2008 09:00:49 -0000	1.2
@@ -1,7 +1,12 @@
 diff -U0 foomatic-filters-3.0-20080904/ChangeLog.ppd-filenames foomatic-filters-3.0-20080904/ChangeLog
 --- foomatic-filters-3.0-20080904/ChangeLog.ppd-filenames	2008-09-04 08:20:14.000000000 +0100
-+++ foomatic-filters-3.0-20080904/ChangeLog	2008-09-05 15:51:23.000000000 +0100
-@@ -0,0 +1,6 @@
++++ foomatic-filters-3.0-20080904/ChangeLog	2008-09-23 09:58:01.000000000 +0100
+@@ -0,0 +1,11 @@
++2008-09-23  Tim Waugh <twaugh at redhat.com>
++
++	* foomatic-rip.in: Remove final incorrect instance of
++	removespecialchars (bug #169).
++
 +2008-09-05  Till Kamppeter <till.kamppeter at gmail.com>
 +
 +	* foomatic-rip.in: Make foomatic-rip also working with PPD file
@@ -9,8 +14,17 @@
 +	  #169).
 +
 diff -up foomatic-filters-3.0-20080904/foomatic-rip.in.ppd-filenames foomatic-filters-3.0-20080904/foomatic-rip.in
---- foomatic-filters-3.0-20080904/foomatic-rip.in.ppd-filenames	2008-09-05 15:49:54.000000000 +0100
-+++ foomatic-filters-3.0-20080904/foomatic-rip.in	2008-09-05 15:51:23.000000000 +0100
+--- foomatic-filters-3.0-20080904/foomatic-rip.in.ppd-filenames	2008-09-23 09:57:43.000000000 +0100
++++ foomatic-filters-3.0-20080904/foomatic-rip.in	2008-09-23 09:58:01.000000000 +0100
+@@ -349,7 +349,7 @@ foreach my $shell ('/bin/sh', '/bin/bash
+ if (defined($ENV{'PPD'})) {
+     # Clean the file name from weird characters which could cause
+     # unexpected behaviour
+-    $ppdfile = removespecialchars($ENV{'PPD'});
++    $ppdfile = $ENV{'PPD'};
+     # CUPS, Solaris LP, and PPR (RIP filter) use the "PPD" environment variable
+     # to make the PPD file name available (we set CUPS here preliminarily,
+     # in the next step we check for Solaris LP and the PPR)
 @@ -517,10 +517,10 @@ if (defined($ENV{'PRINTCAP_ENTRY'})){
  # PPD file name given via the command line
  # allow duplicates, and use the last specified one


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-9/foomatic.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- foomatic.spec	5 Sep 2008 14:56:00 -0000	1.191
+++ foomatic.spec	23 Sep 2008 09:00:49 -0000	1.192
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    66%{?dist}
+Release:    67%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -235,6 +235,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Sep 23 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-67
+- Really fixed filename handling in foomatic-rip (bug #457679).
+
 * Fri Sep  5 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-66
 - Fixed filename handling in foomatic-rip (bug #457679).
 



From corsepiu at fedoraproject.org  Tue Sep 23 09:19:06 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 23 Sep 2008 09:19:06 +0000 (UTC)
Subject: rpms/rt3/devel rt3.spec,1.28,1.29
Message-ID: <20080923091906.4D2DA70033@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19673

Modified Files:
	rt3.spec 
Log Message:
* Mon Sep 23 2008 Ralf Cors??pius <corsepiu at fedoraproject.org>
- Add Provides for perl-deps rpm doesn't catch.
- Treat Spamassassin optional



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- rt3.spec	23 Sep 2008 06:44:50 -0000	1.28
+++ rt3.spec	23 Sep 2008 09:18:36 -0000	1.29
@@ -157,7 +157,6 @@
 
 Requires(postun): /bin/rm
 
-# FIXME: The list below needs to be cleaned up
 # rpm doesn't catch these:
 Requires: perl(Apache::Session)
 Requires: perl(Calendar::Simple)
@@ -173,6 +172,12 @@
 Requires: perl(Tree::Simple)
 Requires: perl(URI::URL)
 
+# rpm fails to add these:
+Provides: perl(RT::Shredder::Exceptions)
+Provides: perl(RT::Shredder::Record)
+Provides: perl(RT::Shredder::Transaction)
+Provides: perl(RT::Tickets_Overlay_SQL)
+
 # Split out. Technically, not actually necessary, but ... let's keep it for now.
 Requires: rt3-mailgate
 
@@ -224,10 +229,13 @@
 %define __perl_provides %{_builddir}/rt-%{version}/%{name}-prov
 chmod +x %{__perl_provides}
 
+# Filter out a bogus R:perl() rpm adds.
+# Keep SpamAssassin optional
 cat << \EOF > %{name}-req
 #!/bin/sh
 %{__perl_requires} $* |\
-    sed -e '/^perl()/d'
+    sed -e '/^perl()/d' \
+	-e '/^perl(Mail::SpamAssassin)$/d'
 EOF
 %define __perl_requires %{_builddir}/rt-%{version}/%{name}-req
 chmod +x %{__perl_requires}
@@ -399,6 +407,10 @@
 
 %changelog
 * Mon Sep 23 2008 Ralf Cors??pius <corsepiu at fedoraproject.org>
+- Add Provides for perl-deps rpm doesn't catch.
+- Treat Spamassassin optional
+
+* Mon Sep 23 2008 Ralf Cors??pius <corsepiu at fedoraproject.org>
 - Don't package %%{_sysconfdir}/rt3/upgrade/*.in
 - Cleanup Requires, __perl_requires, __perl_provides.
 



From denis at fedoraproject.org  Tue Sep 23 09:34:20 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 23 Sep 2008 09:34:20 +0000 (UTC)
Subject: rpms/pangomm/devel .cvsignore, 1.2, 1.3 pangomm.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20080923093420.3E5097013F@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/pangomm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23142

Modified Files:
	.cvsignore pangomm.spec sources 
Log Message:
Update to stable 2.14.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pangomm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Aug 2008 10:36:51 -0000	1.2
+++ .cvsignore	23 Sep 2008 09:33:49 -0000	1.3
@@ -1 +1 @@
-pangomm-2.13.7.tar.bz2
+pangomm-2.14.0.tar.bz2


Index: pangomm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pangomm/devel/pangomm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pangomm.spec	29 Aug 2008 16:51:43 -0000	1.2
+++ pangomm.spec	23 Sep 2008 09:33:49 -0000	1.3
@@ -1,8 +1,8 @@
 %define apiver 1.4
 
 Name:           pangomm
-Version:        2.13.7
-Release:        3%{?dist}
+Version:        2.14.0
+Release:        1%{?dist}
 Summary:        C++ interface for Pango
 
 Group:          System Environment/Libraries
@@ -13,7 +13,7 @@
 
 BuildRequires:  glibmm24-devel >= 2.14.1
 BuildRequires:  cairomm-devel >= 1.2.2
-BuildRequires:  pango-devel >= 1.21.3
+BuildRequires:  pango-devel >= 1.21.4
 BuildRequires:  doxygen graphviz
 
 Obsoletes:      gtkmm24 < 2.13.5
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Denis Leroy <denis at poolshark.org> - 2.14.0-1
+- Update to stable 2.14.0
+
 * Fri Aug 29 2008 Denis Leroy <denis at poolshark.org> - 2.13.7-3
 - Obsoletes older gtkmm to avoid libpangomm conflict 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pangomm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Aug 2008 10:36:51 -0000	1.2
+++ sources	23 Sep 2008 09:33:49 -0000	1.3
@@ -1 +1 @@
-148578fbfa7286de2141f3291d64d1e3  pangomm-2.13.7.tar.bz2
+85be0a654ed521e5594f64efdb3fa7d8  pangomm-2.14.0.tar.bz2



From varekova at fedoraproject.org  Tue Sep 23 09:45:56 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 23 Sep 2008 09:45:56 +0000 (UTC)
Subject: rpms/pilot-link/F-9 pilot-link-0.12.3-clio.patch, 1.1,
	1.2 pilot-link.spec, 1.80, 1.81
Message-ID: <20080923094556.2912870033@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/pilot-link/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25699

Modified Files:
	pilot-link-0.12.3-clio.patch pilot-link.spec 
Log Message:
- extend clio patch - thanks Kevin R. Page



pilot-link-0.12.3-clio.patch:

Index: pilot-link-0.12.3-clio.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pilot-link/F-9/pilot-link-0.12.3-clio.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pilot-link-0.12.3-clio.patch	19 Sep 2008 10:12:23 -0000	1.1
+++ pilot-link-0.12.3-clio.patch	23 Sep 2008 09:45:25 -0000	1.2
@@ -1,7 +1,6 @@
-Index: pilot-link-0.12.3/libpisock/usb.c
-===================================================================
---- pilot-link-0.12.3.orig/libpisock/usb.c
-+++ pilot-link-0.12.3/libpisock/usb.c
+diff -up pilot-link-0.12.3/libpisock/usb.c.clio pilot-link-0.12.3/libpisock/usb.c
+--- pilot-link-0.12.3/libpisock/usb.c.clio	2008-09-19 12:06:52.000000000 +0200
++++ pilot-link-0.12.3/libpisock/usb.c	2008-09-23 10:57:22.000000000 +0200
 @@ -655,6 +655,7 @@ pi_usb_dev_t known_devices[] = {
  		.vendor 	= 0x054c,
  		.product 	= 0x0066,
@@ -10,3 +9,11 @@
  	},
  
  	{
+@@ -698,6 +699,7 @@ pi_usb_dev_t known_devices[] = {
+ 		.vendor 	= 0x054c,
+ 		.product 	= 0x0169,
+ 		.idstr 		= "Sony TJ",
++		.flags 		= USB_INIT_SONY_CLIE,
+ 	},
+ 
+ 	/* AlphaSmart */


Index: pilot-link.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pilot-link/F-9/pilot-link.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- pilot-link.spec	19 Sep 2008 10:12:23 -0000	1.80
+++ pilot-link.spec	23 Sep 2008 09:45:25 -0000	1.81
@@ -3,7 +3,7 @@
 
 Name: pilot-link
 Version: 0.12.3
-Release: 15%{?dist}
+Release: 16%{?dist}
 Epoch: 2
 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL
 Group: Applications/Communications
@@ -181,6 +181,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Tue Sep 23 2008 Ivana Varekova <varekova at redhat.com> - 2:0.12.3-16
+- extend clio patch - thanks Kevin R. Page
+
 * Fri Sep 19 2008 Ivana Varekova <varekova at redhat.com> - 2:0.12.3-15
 - add clio patch (454178) - thanks Michael Ekstrand
 



From rhughes at fedoraproject.org  Tue Sep 23 10:03:10 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 23 Sep 2008 10:03:10 +0000 (UTC)
Subject: rpms/PackageKit/devel pk-dont-send-finished-from-dispatcher.patch, 
	NONE, 1.1 PackageKit.spec, 1.57, 1.58 pk-preupgrade-typo.patch,
	1.1, NONE pk-upgrades-mistake.patch, 1.1, NONE
Message-ID: <20080923100310.85FCC70033@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29594

Modified Files:
	PackageKit.spec 
Added Files:
	pk-dont-send-finished-from-dispatcher.patch 
Removed Files:
	pk-preupgrade-typo.patch pk-upgrades-mistake.patch 
Log Message:
* Tue Sep 23 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-2
- Don't send ::Finished when the script exits because of a dispatcher exit.
- This only seems to happen when we are making the dispatcher be reloaded
  from multiple sessions with different locales.


pk-dont-send-finished-from-dispatcher.patch:

--- NEW FILE pk-dont-send-finished-from-dispatcher.patch ---
commit c9a01198d494f06ae9e0b3e2a002f941da118f00
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Sep 23 10:45:23 2008 +0100

    bugfix: don't send ::Finished() when the script exits because of a dispatcher exit
    
    What we are seeing here is the backend being finished when it is in another transaction
    and hence returns no results and then puts up warnings that there was no status reports.
    This only seems to happen when we are making the dispatcher be reloaded again and again,
    for instance using pk-import-specspo and a RefreshCache() at the same time

diff --git a/src/pk-backend-spawn.c b/src/pk-backend-spawn.c
index 5609580..9878340 100644
--- a/src/pk-backend-spawn.c
+++ b/src/pk-backend-spawn.c
@@ -409,8 +409,12 @@ pk_backend_spawn_exit_cb (PkSpawn *spawn, PkSpawnExitType exit, PkBackendSpawn *
 
 	/* only emit if not finished */
 	if (!backend_spawn->priv->finished) {
-		egg_debug ("script exited without doing finished");
-		pk_backend_finished (backend_spawn->priv->backend);
+		/* ignore when we exit from a dispatcher */
+		if (exit != PK_SPAWN_EXIT_TYPE_DISPATCHER_EXIT &&
+		    exit != PK_SPAWN_EXIT_TYPE_DISPATCHER_CHANGED) {
+			egg_warning ("script exited without doing finished");
+			pk_backend_finished (backend_spawn->priv->backend);
+		}
 	}
 }
 


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- PackageKit.spec	22 Sep 2008 15:13:45 -0000	1.57
+++ PackageKit.spec	23 Sep 2008 10:02:40 -0000	1.58
@@ -8,15 +8,15 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.4
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# upstream: 51b020dca500141a6e78ab549765f09a34ac75fc
-#Patch0:    pk-upgrades-mistake.patch
+# upstream: c9a01198d494f06ae9e0b3e2a002f941da118f00
+Patch0:    pk-dont-send-finished-from-dispatcher.patch
 
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
@@ -142,7 +142,7 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -273,6 +273,11 @@
 %{_includedir}/*
 
 %changelog
+* Tue Sep 23 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-2
+- Don't send ::Finished when the script exits because of a dispatcher exit.
+- This only seems to happen when we are making the dispatcher be reloaded
+  from multiple sessions with different locales.
+
 * Mon Sep 22 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-1
 - New upstream version
 


--- pk-preupgrade-typo.patch DELETED ---


--- pk-upgrades-mistake.patch DELETED ---



From pbrobinson at fedoraproject.org  Tue Sep 23 10:06:07 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 23 Sep 2008 10:06:07 +0000 (UTC)
Subject: rpms/ptlib/devel .cvsignore, 1.2, 1.3 ptlib.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <20080923100607.AC0EA70033@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ptlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30596

Modified Files:
	.cvsignore ptlib.spec sources 
Log Message:
- Update to new stable release 2.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Sep 2008 09:25:45 -0000	1.2
+++ .cvsignore	23 Sep 2008 10:05:37 -0000	1.3
@@ -1 +1 @@
-ptlib-2.3.1.tar.bz2
+ptlib-2.4.1.tar.bz2


Index: ptlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/ptlib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ptlib.spec	11 Sep 2008 09:25:45 -0000	1.1
+++ ptlib.spec	23 Sep 2008 10:05:37 -0000	1.2
@@ -1,16 +1,16 @@
 Name:		ptlib
 Summary:	Portable Tools Library
-Version:	2.3.1
-Release:	2%{?dist}
+Version:	2.4.1
+Release:	1%{?dist}
 URL:		http://www.opalvoip.org/
-Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ptlib/2.3/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
 License:	MPLv1.0
 Group:		System Environment/Libraries
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat openssl-devel pkgconfig
 BuildRequires:  alsa-lib-devel, libstdc++-devel, libv4l-devel
-BuildRequires:  openldap-devel, expat-devel, SDL-devel, flex, bison
+BuildRequires:  openldap-devel, expat-devel, flex, bison
 
 %description
 PTLib (Portable Tools Library) is a moderately large class library that 
@@ -36,7 +36,7 @@
 
 %build
 export CFLAGS="$CFLAGS -DLDAP_DEPRECATED"
-%configure --prefix=%{_prefix} --disable-static --enable-opal --enable-plugins --disable-oss --enable-v4l2 --disable-avc
+%configure --prefix=%{_prefix} --disable-static --enable-opal --enable-plugins --disable-oss --enable-v4l2 --disable-avc --disable-v4l
 make %{?_smp_mflags}
 
 %install
@@ -51,6 +51,7 @@
 
 # Remove empty include file
 rm -rf $RPM_BUILD_ROOT%{_includedir}/ptlib/devplugin.h
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libpt_s.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -62,14 +63,13 @@
 %defattr(-,root,root)
 %doc History.txt ReadMe.txt mpl-1.0.htm
 %attr(755,root,root) %{_libdir}/libpt*.so.*
-%dir %{_libdir}/ptlib
-%dir %{_libdir}/ptlib/devices
-%dir %{_libdir}/ptlib/devices/sound
-%dir %{_libdir}/ptlib/devices/videoinput
+%dir %{_libdir}/ptlib-%{version}
+%dir %{_libdir}/ptlib-%{version}/devices
+%dir %{_libdir}/ptlib-%{version}/devices/sound
+%dir %{_libdir}/ptlib-%{version}/devices/videoinput
 # List these explicitly so we don't get any surprises
-%attr(755,root,root) %{_libdir}/ptlib/devices/sound/alsa_pwplugin.so
-%attr(755,root,root) %{_libdir}/ptlib/devices/videoinput/v4l_pwplugin.so
-%attr(755,root,root) %{_libdir}/ptlib/devices/videoinput/v4l2_pwplugin.so
+%attr(755,root,root) %{_libdir}/ptlib-%{version}/devices/sound/alsa_pwplugin.so
+%attr(755,root,root) %{_libdir}/ptlib-%{version}/devices/videoinput/v4l2_pwplugin.so
 
 %files devel
 %defattr(-,root,root)
@@ -80,6 +80,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Sep 23 2008 Peter Robinson <pbrobinson at gmail.com> - 2.4.1-1
+- Update to new stable release for ekiga 3, disable v4l1
+
 * Wed Sep 10 2008 Peter Robinson <pbrobinson at gmail.com> - 2.3.1-2
 - Build fixes from package review
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Sep 2008 09:25:45 -0000	1.2
+++ sources	23 Sep 2008 10:05:37 -0000	1.3
@@ -1 +1 @@
-bd495deba21a292348bb57ae2cb05d6a  ptlib-2.3.1.tar.bz2
+79d6431a30ec7a558633e67c25e689f9  ptlib-2.4.1.tar.bz2



From pbrobinson at fedoraproject.org  Tue Sep 23 10:13:16 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 23 Sep 2008 10:13:16 +0000 (UTC)
Subject: rpms/ptlib/devel ptlib.spec,1.2,1.3
Message-ID: <20080923101316.2671E70033@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ptlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32166

Modified Files:
	ptlib.spec 
Log Message:
- Obsolete pwlib



Index: ptlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/ptlib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ptlib.spec	23 Sep 2008 10:05:37 -0000	1.2
+++ ptlib.spec	23 Sep 2008 10:12:45 -0000	1.3
@@ -11,6 +11,7 @@
 BuildRequires:	expat openssl-devel pkgconfig
 BuildRequires:  alsa-lib-devel, libstdc++-devel, libv4l-devel
 BuildRequires:  openldap-devel, expat-devel, flex, bison
+Obsoletes:	pwlib
 
 %description
 PTLib (Portable Tools Library) is a moderately large class library that 
@@ -27,6 +28,7 @@
 Group:		Development/Libraries
 Requires:	ptlib = %{version}-%{release}
 Requires:	pkgconfig
+Obsoletes:	pwlib-devel
 
 %description devel
 The ptlib-devel package includes the libraries and header files for ptlib.



From pbrobinson at fedoraproject.org  Tue Sep 23 10:36:12 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 23 Sep 2008 10:36:12 +0000 (UTC)
Subject: rpms/ptlib/devel ptlib.spec,1.3,1.4
Message-ID: <20080923103612.D0F8B7013E@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ptlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4697

Modified Files:
	ptlib.spec 
Log Message:
- some name/version cleanups



Index: ptlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/ptlib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ptlib.spec	23 Sep 2008 10:12:45 -0000	1.3
+++ ptlib.spec	23 Sep 2008 10:35:42 -0000	1.4
@@ -65,13 +65,13 @@
 %defattr(-,root,root)
 %doc History.txt ReadMe.txt mpl-1.0.htm
 %attr(755,root,root) %{_libdir}/libpt*.so.*
-%dir %{_libdir}/ptlib-%{version}
-%dir %{_libdir}/ptlib-%{version}/devices
-%dir %{_libdir}/ptlib-%{version}/devices/sound
-%dir %{_libdir}/ptlib-%{version}/devices/videoinput
+%dir %{_libdir}/%{name}-%{version}
+%dir %{_libdir}/%{name}-%{version}/devices
+%dir %{_libdir}/%{name}-%{version}/devices/sound
+%dir %{_libdir}/%{name}-%{version}/devices/videoinput
 # List these explicitly so we don't get any surprises
-%attr(755,root,root) %{_libdir}/ptlib-%{version}/devices/sound/alsa_pwplugin.so
-%attr(755,root,root) %{_libdir}/ptlib-%{version}/devices/videoinput/v4l2_pwplugin.so
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/devices/sound/alsa_pwplugin.so
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/devices/videoinput/v4l2_pwplugin.so
 
 %files devel
 %defattr(-,root,root)



From berrange at fedoraproject.org  Tue Sep 23 10:39:37 2008
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Tue, 23 Sep 2008 10:39:37 +0000 (UTC)
Subject: rpms/perl-Test-AutoBuild/devel
	perl-Test-AutoBuild-1.2.2-cvs-sticky.patch, NONE,
	1.1 perl-Test-AutoBuild-1.2.2-mtn-migrate.patch, NONE,
	1.1 perl-Test-AutoBuild.spec, 1.10, 1.11
Message-ID: <20080923103937.D9E2B70033@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/perl-Test-AutoBuild/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5697

Modified Files:
	perl-Test-AutoBuild.spec 
Added Files:
	perl-Test-AutoBuild-1.2.2-cvs-sticky.patch 
	perl-Test-AutoBuild-1.2.2-mtn-migrate.patch 
Log Message:
Fix bugs in CVS and Monotone test suites. Make package arch dependant

perl-Test-AutoBuild-1.2.2-cvs-sticky.patch:

--- NEW FILE perl-Test-AutoBuild-1.2.2-cvs-sticky.patch ---
diff -rup Test-AutoBuild-1.2.2/lib/Test/AutoBuild/Repository/CVS.pm Test-AutoBuild-1.2.2-new/lib/Test/AutoBuild/Repository/CVS.pm
--- Test-AutoBuild-1.2.2/lib/Test/AutoBuild/Repository/CVS.pm	2007-12-08 15:10:26.000000000 -0500
+++ Test-AutoBuild-1.2.2-new/lib/Test/AutoBuild/Repository/CVS.pm	2008-09-23 05:13:32.000000000 -0400
@@ -76,7 +76,7 @@ sub export {
 
     my $cmd = -e $dst ?
 	($branch ?
-	 ['cvs', '-q', 'update', '-D', $date, '-r', $branch, '-APdC'] :
+	 ['cvs', '-q', 'update', '-D', $date, '-r', $branch, '-PdC'] :
 	 ['cvs', '-q', 'update', '-D', $date, '-APdC']) :
 	 ($branch ?
 	  ['cvs', '-q', 'checkout', '-D', $date, '-d', $dst, '-r', $branch, '-P', $src] :

perl-Test-AutoBuild-1.2.2-mtn-migrate.patch:

--- NEW FILE perl-Test-AutoBuild-1.2.2-mtn-migrate.patch ---
diff -rup Test-AutoBuild-1.2.2/t/110-Repository-Monotone.t Test-AutoBuild-1.2.2-new/t/110-Repository-Monotone.t
--- Test-AutoBuild-1.2.2/t/110-Repository-Monotone.t	2007-12-11 22:33:00.000000000 -0500
+++ Test-AutoBuild-1.2.2-new/t/110-Repository-Monotone.t	2008-09-23 05:33:18.000000000 -0400
@@ -55,6 +55,8 @@ SKIP: {
 
   system "cd $build_repos && (gunzip -c $archive | tar xf -)";
 
+  system "cd $build_repos && mtn db migrate -d main.db";
+
   my $head = "main.db:trunk";
   my $branch = "main.db:wibble";
 


Index: perl-Test-AutoBuild.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-AutoBuild/devel/perl-Test-AutoBuild.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Test-AutoBuild.spec	18 Sep 2008 00:06:54 -0000	1.10
+++ perl-Test-AutoBuild.spec	23 Sep 2008 10:39:07 -0000	1.11
@@ -12,14 +12,19 @@
 Summary: Framework for performing continuous, unattended, automated software builds
 Name: perl-%{appname}
 Version: 1.2.2
-Release: 4%{_extra_release}
+Release: 5%{_extra_release}
 License: GPLv2+
 Group: Development/Tools
 Url: http://autobuild.org/
 Source: http://www.cpan.org/authors/id/D/DA/DANBERR/%{appname}-%{version}.tar.gz
 Patch1: %{name}-%{version}-git-output.patch
+Patch2: %{name}-%{version}-cvs-sticky.patch
+Patch3: %{name}-%{version}-mtn-migrate.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArchitectures: noarch
+# Technically this is a noarch package, but due to lack of ghc
+# on ppc/sparc we need to use arch specific conditionals to kill
+# off the darcs sub-RPM.
+#BuildArchitectures: noarch
 
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -245,6 +250,8 @@
 %prep
 %setup -q -n %{appname}-%{version}
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -275,6 +282,11 @@
 echo "%%_topdir %{_localstatedir}/lib/builder/package-root/rpm" \
   >> $RPM_BUILD_ROOT%{_localstatedir}/lib/builder/.rpmmacros
 
+%ifarch alpha ppc64
+rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/Test/AutoBuild/Repository/Darcs.pm
+%endif
+
+
 %check
 %__make test
 
@@ -435,6 +447,11 @@
 %config(noreplace) %attr(-,builder,builder) %{_localstatedir}/lib/builder/.cvspass
 
 %changelog
+* Tue Sep 23 2008 Daniel P. Berrange <berrange at redhat.com> - 1.2.2-5.fc10
+- Don't use -A to clear sticky tag when specifying a branch
+- Perform 'mtn db migrate' when running monotone test suite
+- Drop noarch until ghc comes to ppc/alpha
+
 * Thu Sep 18 2008 Jens Petersen <petersen at redhat.com> - 1.2.2-4.fc10
 - exclude darcs subpackage on ppc64 and alpha where there is no ghc currently
 



From pbrobinson at fedoraproject.org  Tue Sep 23 10:43:34 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 23 Sep 2008 10:43:34 +0000 (UTC)
Subject: rpms/opal/devel .cvsignore, 1.12, 1.13 opal.spec, 1.27, 1.28 sources,
	1.13, 1.14
Message-ID: <20080923104334.549A770033@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/opal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6510

Modified Files:
	.cvsignore opal.spec sources 
Log Message:
- Update to new stable release for ekiga 3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	14 Sep 2008 17:39:16 -0000	1.12
+++ .cvsignore	23 Sep 2008 10:43:03 -0000	1.13
@@ -1 +1 @@
-opal-3.3.1.tar.bz2
+opal-3.4.1.tar.bz2


Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- opal.spec	14 Sep 2008 17:39:16 -0000	1.27
+++ opal.spec	23 Sep 2008 10:43:04 -0000	1.28
@@ -1,15 +1,14 @@
 Name:		opal
 Summary:	Open Phone Abstraction Library
-Version:	3.3.1
+Version:	3.4.1
 Release:	1%{?dist}
 URL:		http://www.opalvoip.org/
-Source0:	ftp://ftp.gnome.org/pub/gnome/sources/opal/3.3/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.4/%{name}-%{version}.tar.bz2
 License:	MPLv1.0
 Group:		System Environment/Libraries
-BuildRequires:	ptlib-devel >= 2.3.1
+BuildRequires:	ptlib-devel >= 2.4.1
 BuildRequires:	openldap-devel
 BuildRequires:	openssl-devel
-BuildRequires:	SDL-devel
 BuildRequires:	libtheora-devel
 BuildRequires:	speex-devel
 
@@ -24,7 +23,7 @@
 Summary:	Development package for opal
 Group:		Development/Libraries
 Requires:	opal = %{version}-%{release}
-Requires:	ptlib-devel >= 2.3.1
+Requires:	ptlib-devel >= 2.4.1
 Requires:	pkgconfig
 Obsoletes:	openh323-devel
 
@@ -38,7 +37,7 @@
 %build
 %configure --prefix=/usr
 
-make optshared OPTCCFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make OPTCCFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +47,7 @@
 rm -f $RPM_BUILD_ROOT/%{_datadir}/opal/opal_inc.mak
 # Remove empty header from build
 rm -f $RPM_BUILD_ROOT/%{_includedir}/opal/sip/sdpcaps.h
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libopal_s.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,18 +59,20 @@
 %defattr(-,root,root)
 %doc  mpl-1.0.htm
 %{_libdir}/*.so.*
-%{_libdir}/ptlib/plugins/codec/audio/*.so
-%{_libdir}/ptlib/plugins/codec/video/*.so
-%{_libdir}/ptlib/plugins/lid/*.so
+%{_libdir}/%{name}-%{version}/codecs/audio/*.so
+%{_libdir}/%{name}-%{version}/codecs/video/*.so
+%{_libdir}/%{name}-%{version}/lid/*.so
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/*
-%{_datadir}/opal
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/opal.pc
 
 %changelog
+* Tue Sep 23 2008 Peter Robinson <pbrobinson at gmail.com> - 3.4.1-1
+- Update to new stable release for ekiga 3
+
 * Thu Sep 11 2008 Peter Robinson <pbrobinson at gmail.com> - 3.3.1-1
 - Update release to 3.3.1 for ekiga 3 beta
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	14 Sep 2008 17:39:16 -0000	1.13
+++ sources	23 Sep 2008 10:43:04 -0000	1.14
@@ -1 +1 @@
-6e7525b440c9fb2d68b8767996ab4a76  opal-3.3.1.tar.bz2
+f600066f362ba61e00375bf327f28458  opal-3.4.1.tar.bz2



From jnovy at fedoraproject.org  Tue Sep 23 10:50:26 2008
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Tue, 23 Sep 2008 10:50:26 +0000 (UTC)
Subject: rpms/libgphoto2/devel libgphoto2.spec,1.12,1.13
Message-ID: <20080923105026.E959870033@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libgphoto2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8137

Modified Files:
	libgphoto2.spec 
Log Message:
* Tue Sep 23 2008 Jindrich Novy <jnovy at redhat.com> 2.4.2-2
- convert all shipped docs to UTF-8



Index: libgphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/libgphoto2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libgphoto2.spec	1 Aug 2008 19:07:24 -0000	1.12
+++ libgphoto2.spec	23 Sep 2008 10:49:56 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Library for accessing digital cameras
 Name: libgphoto2
 Version: 2.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
 Group: Development/Libraries
@@ -55,6 +55,13 @@
 %patch3 -p1 -b .ixany
 %patch4 -p1 -b .maxentries
 
+for i in AUTHORS COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB `find -name 'README.*'`; do
+	mv ${i} ${i}.old
+	iconv -f ISO-8859-1 -t UTF-8 < ${i}.old > ${i}
+	touch -r ${i}.old ${i} || :
+	rm -f ${i}.old
+done
+
 # FIXME: These .pc.in files aren't actually being installed?
 cat > gphoto2.pc.in << \EOF
 prefix=@prefix@
@@ -102,13 +109,6 @@
 grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
 popd
 
-for i in AUTHORS COPYING; do
-	mv ${i} ${i}.old
-	iconv -f cp1250 -t utf-8 < ${i}.old > ${i}
-	touch -r ${i}.old ${i} || :
-	rm -f ${i}.old
-done
-
 rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a
 rm -rf %{buildroot}%{_libdir}/libgphoto2_port/*/*a
 rm -rf %{buildroot}%{_libdir}/*.a
@@ -151,6 +151,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 23 2008 Jindrich Novy <jnovy at redhat.com> 2.4.2-2
+- convert all shipped docs to UTF-8
+
 * Fri Aug 01 2008 Jindrich Novy <jnovy at redhat.com> 2.4.2-1
 - update to 2.4.2
 - contains many fixes in the Canon camera communication interface



From pbrobinson at fedoraproject.org  Tue Sep 23 11:06:52 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 23 Sep 2008 11:06:52 +0000 (UTC)
Subject: rpms/ekiga/devel .cvsignore, 1.13, 1.14 ekiga.spec, 1.53,
	1.54 sources, 1.15, 1.16
Message-ID: <20080923110653.1CBBD70103@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11495

Modified Files:
	.cvsignore ekiga.spec sources 
Log Message:
- Ekiga 3 final release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	14 Sep 2008 17:45:45 -0000	1.13
+++ .cvsignore	23 Sep 2008 11:06:17 -0000	1.14
@@ -1 +1 @@
-ekiga-2.9.90.tar.bz2
+ekiga-3.0.0.tar.bz2


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ekiga.spec	20 Sep 2008 12:47:42 -0000	1.53
+++ ekiga.spec	23 Sep 2008 11:06:17 -0000	1.54
@@ -1,9 +1,9 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
-Version:	2.9.90
-Release:	3%{?dist}
+Version:	3.0.0
+Release:	1%{?dist}
 URL:		http://www.ekiga.org/
-Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/2.9/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.0/%{name}-%{version}.tar.bz2
 License:	GPLv2+
 Group:		Applications/Communications
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,8 +19,8 @@
 BuildRequires:	dbus-glib-devel >= 0.70
 BuildRequires:	openldap-devel
 BuildRequires:	openssl-devel
-BuildRequires:	ptlib-devel >= 2.3.1
-BuildRequires:	opal-devel >= 3.3.1
+BuildRequires:	ptlib-devel >= 2.4.1
+BuildRequires:	opal-devel >= 3.4.1
 BuildRequires:	libxml2-devel >= 2.5.0
 BuildRequires:	libXv-devel
 BuildRequires:	intltool >= 0.22
@@ -89,6 +89,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Tue Sep 23 2008 Peter Robinson <pbrobinson at gmail.com> - 3.0.0-1
+- Ekiga 3 final release
+
 * Sun Sep 14 2008 Peter Robinson <pbrobinson at gmail.com> - 2.9.90-3
 - more rawhide build fixes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	14 Sep 2008 17:45:45 -0000	1.15
+++ sources	23 Sep 2008 11:06:17 -0000	1.16
@@ -1 +1 @@
-306982219c94f4866bbd0a5873da7b8a  ekiga-2.9.90.tar.bz2
+a774e89a5812eb7d03be29502ee99620  ekiga-3.0.0.tar.bz2



From denis at fedoraproject.org  Tue Sep 23 11:07:14 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 23 Sep 2008 11:07:14 +0000 (UTC)
Subject: rpms/gtkmm24/devel .cvsignore, 1.27, 1.28 gtkmm.spec, 1.42,
	1.43 sources, 1.29, 1.30 gtkmm-2.13.7-compile-with-gtk0214.patch,
	1.1, NONE
Message-ID: <20080923110714.78A587013D@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gtkmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12023

Modified Files:
	.cvsignore gtkmm.spec sources 
Removed Files:
	gtkmm-2.13.7-compile-with-gtk0214.patch 
Log Message:
Update to stable 2.14.0, gtk0214 patch upstreamed


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	24 Aug 2008 14:24:44 -0000	1.27
+++ .cvsignore	23 Sep 2008 11:06:44 -0000	1.28
@@ -1 +1 @@
-gtkmm-2.13.7.tar.bz2
+gtkmm-2.14.0.tar.bz2


Index: gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gtkmm.spec	5 Sep 2008 07:34:25 -0000	1.42
+++ gtkmm.spec	23 Sep 2008 11:06:44 -0000	1.43
@@ -1,6 +1,6 @@
 Name:           gtkmm24
-Version:        2.13.7
-Release:        2%{?dist}
+Version:        2.14.0
+Release:        1%{?dist}
 
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
@@ -8,16 +8,14 @@
 License:        LGPLv2+
 URL:            http://gtkmm.sourceforge.net/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.10/gtkmm-%{version}.tar.bz2
-# Patch pulled from svn to make compatible with GTK 2.14
-Patch0:		gtkmm-2.13.7-compile-with-gtk0214.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  glibmm24-devel >= 2.16.0
+BuildRequires:  glibmm24-devel >= 2.18.0
 BuildRequires:  atk-devel >= 1.9.0
 BuildRequires:  pango-devel >= 1.5.2
-BuildRequires:  gtk2-devel >= 2.13.4
+BuildRequires:  gtk2-devel >= 2.14.0
 BuildRequires:  cairomm-devel >= 1.2.2
-BuildRequires:  pangomm-devel >= 2.13.5
+BuildRequires:  pangomm-devel >= 2.14.0
 
 
 %description
@@ -57,18 +55,6 @@
 %prep
 %setup -q -n gtkmm-%{version}
 
-# Temporary fixes until 2.14 is released
-# All already applied in svn
-%patch0 -p0 -b .svn
-rm -f gtk/gtkmm/widget.* gtk/gtkmm/selectiondata.*
-( cd gtk/src
-  for f in widget selectiondata ; do
-    `pkg-config --variable=gmmprocdir glibmm-2.4`/gmmproc \
-      -I ../../tools/m4 --defs . $f . ../gtkmm || exit 1
-  done
-)
-# Temporary fixes end
-
 
 %build
 %configure %{!?_with_static: --disable-static} --enable-shared  --disable-demos
@@ -123,6 +109,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Denis Leroy <denis at poolshark.org> - 2.14.0-1
+- Update to stable 2.14.0
+
 * Fri Sep  5 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.13.7-2
 - Patch from svn temporarily to make compatible with GTK 2.14
   (bug 461227)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	24 Aug 2008 14:24:44 -0000	1.29
+++ sources	23 Sep 2008 11:06:44 -0000	1.30
@@ -1 +1 @@
-d859b9b78e8d7659aa34899303b2df8f  gtkmm-2.13.7.tar.bz2
+621764afa971b54a8f1e20ded369f756  gtkmm-2.14.0.tar.bz2


--- gtkmm-2.13.7-compile-with-gtk0214.patch DELETED ---



From transif at fedoraproject.org  Tue Sep 23 11:15:18 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Tue, 23 Sep 2008 11:15:18 +0000 (UTC)
Subject: comps/po es.po,1.19,1.20
Message-ID: <20080923111518.249F570033@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14565/po

Modified Files:
	es.po 
Log Message:
    2008-09-23  Domingo Becker <domingobecker at gmail.com> (via
beckerde at fedoraproject.org)
    
      * po/es.po: updated spanish translation
    



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.19 -r 1.20 es.po
Index: es.po
===================================================================
RCS file: /cvs/pkgs/comps/po/es.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- es.po	17 Sep 2008 22:44:34 -0000	1.19
+++ es.po	23 Sep 2008 11:14:47 -0000	1.20
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-09-03 10:34-0300\n"
+"POT-Creation-Date: 2008-09-23 09:24+0000\n"
+"PO-Revision-Date: 2008-09-23 08:08-0300\n"
 "Last-Translator: Domingo Becker <domingobecker at gmail.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -20,188 +20,282 @@
 "Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Spanish\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
+#: ../comps-f7.xml.in.h:1
+#: ../comps-f8.xml.in.h:1
+#: ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
-"Un entorno de escritorio liviano que funciona bien en m??quinas peque??as."
+msgstr "Un entorno de escritorio liviano que funciona bien en m??quinas peque??as."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../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:2
+#: ../comps-el4.xml.in.h:1
+#: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Herramientas de Administraci??n"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
+#: ../comps-f7.xml.in.h:3
+#: ../comps-f8.xml.in.h:3
+#: ../comps-f9.xml.in.h:3
 #: ../comps-f10.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "Soporte para africano"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
+#: ../comps-f7.xml.in.h:4
+#: ../comps-f8.xml.in.h:4
+#: ../comps-f9.xml.in.h:4
 #: ../comps-f10.xml.in.h:4
 msgid "Albanian Support"
 msgstr "Soporte para alban??s"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../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:5
+#: ../comps-el4.xml.in.h:2
+#: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Aplicaciones"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
+#: ../comps-f7.xml.in.h:6
+#: ../comps-f8.xml.in.h:6
+#: ../comps-f9.xml.in.h:6
 #: ../comps-f10.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
 msgstr "Aplicaciones para una variedad de tareas"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../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:7
+#: ../comps-el4.xml.in.h:4
+#: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Soporte para ??rabe"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../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:8
+#: ../comps-el4.xml.in.h:5
+#: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Soporte para armenio"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
+#: ../comps-f7.xml.in.h:9
+#: ../comps-f8.xml.in.h:9
+#: ../comps-f9.xml.in.h:9
 #: ../comps-f10.xml.in.h:9
 msgid "Assamese Support"
 msgstr "Soporte para assam??s"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../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:10
+#: ../comps-el4.xml.in.h:6
+#: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Autor??a y publicaci??n"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
+#: ../comps-f7.xml.in.h:11
+#: ../comps-f8.xml.in.h:11
+#: ../comps-f9.xml.in.h:11
 #: ../comps-f10.xml.in.h:11
 msgid "Base"
 msgstr "Base"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-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:12
+#: ../comps-el4.xml.in.h:7
+#: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Sistema Base"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
+#: ../comps-f7.xml.in.h:13
+#: ../comps-f8.xml.in.h:13
+#: ../comps-f9.xml.in.h:13
 #: ../comps-f10.xml.in.h:13
 msgid "Basic support for the Ruby programming language."
 msgstr "Soporte b??sico para el lenguaje de programaci??n Ruby."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
+#: ../comps-f7.xml.in.h:14
+#: ../comps-f8.xml.in.h:14
+#: ../comps-f9.xml.in.h:14
 #: ../comps-f10.xml.in.h:14
 msgid "Basque Support"
 msgstr "Soporte para vascuence"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
+#: ../comps-f7.xml.in.h:15
+#: ../comps-f8.xml.in.h:15
+#: ../comps-f9.xml.in.h:15
 #: ../comps-f10.xml.in.h:15
 msgid "Belarusian Support"
 msgstr "Soporte para bielorruso"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
+#: ../comps-f7.xml.in.h:16
+#: ../comps-f8.xml.in.h:16
+#: ../comps-f9.xml.in.h:16
 #: ../comps-f10.xml.in.h:16
 msgid "Bengali Support"
 msgstr "Soporte para bengal??"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
+#: ../comps-f7.xml.in.h:17
+#: ../comps-f8.xml.in.h:17
+#: ../comps-f9.xml.in.h:17
 #: ../comps-f10.xml.in.h:17
 msgid "Bhutanese Support"
 msgstr "Soporte para bhutanese"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
+#: ../comps-f7.xml.in.h:18
+#: ../comps-f8.xml.in.h:18
+#: ../comps-f9.xml.in.h:18
 #: ../comps-f10.xml.in.h:18
 msgid "Bosnian Support"
 msgstr "Soporte para bosnio"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
+#: ../comps-f7.xml.in.h:19
+#: ../comps-f8.xml.in.h:19
+#: ../comps-f9.xml.in.h:19
 #: ../comps-f10.xml.in.h:19
 msgid "Brazilian Portuguese Support"
 msgstr "Soporte para portugu??s brasile??o"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
+#: ../comps-f7.xml.in.h:20
+#: ../comps-f8.xml.in.h:20
+#: ../comps-f9.xml.in.h:20
 #: ../comps-f10.xml.in.h:20
[...1862 lines suppressed...]
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:138
+#: ../comps-f9.xml.in.h:131
+#: ../comps-f10.xml.in.h:138
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR es el entorno de escritorio desarrollado para la OLPC XO."
 
-#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:211
+#: ../comps-f9.xml.in.h:200
+#: ../comps-f10.xml.in.h:211
 msgid "Walloon Support"
 msgstr "Soporte para wallon??s"
 
 #: ../comps-f10.xml.in.h:70
-#, fuzzy
 msgid "Haskell Development"
-msgstr "Desarrollo Web"
+msgstr "Desarrollo Haskell"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
@@ -1185,125 +1620,104 @@
 
 #: ../comps-f10.xml.in.h:77
 msgid "Input method packages for the input of international text."
-msgstr ""
-"Los paquetes de m??todos de entrada para la entrada de texto internacional."
+msgstr "Los paquetes de m??todos de entrada para la entrada de texto internacional."
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "Soporte para jemer"
+msgstr "Soporte para Kashmiri"
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "Soporte para coreano"
+msgstr "Soporte para Konkani"
 
 #: ../comps-f10.xml.in.h:110
-#, fuzzy
 msgid "Maithili Support"
-msgstr "Soporte para marathi"
+msgstr "Soporte para Maithili"
 
 #: ../comps-f10.xml.in.h:117
-#, fuzzy
 msgid "Myanmar (Burmese) Support"
-msgstr "Soporte para burmese"
+msgstr "Soporte para Myanmar (burmese)"
 
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "Soporte para ind??"
+msgstr "Soporte para Sindhi"
 
 #: ../comps-f10.xml.in.h:156
-#, fuzzy
 msgid "Support for developing programs in the Haskell programming language."
-msgstr ""
-"Soporte para el desarrollo de programas en el lenguaje de programaci??n Java."
+msgstr "Soporte para el desarrollo de programas en el lenguaje de programaci??n Haskell."
 
 #: ../comps-f10.xml.in.h:163
 msgid "Tajik Support"
 msgstr "Soporte para Tajik"
 
 #: ../comps-f10.xml.in.h:205
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "Soporte para checo"
+msgstr "Soporte para Uszbek"
 
-#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
+#: ../comps-el4.xml.in.h:3
+#: ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Aplicaciones para una variedad de tareas"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12
+#: ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "Soporte de red mediante discado"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
-msgid ""
-"GNOME is a powerful, graphical user interface which includes a panel, "
-"desktop, system icons, and a graphical file manager."
-msgstr ""
-"GNOME es una potente interfaz gr??fica de usuario que incluye un panel, un "
-"escritorio, iconos del sistema y gestores gr??ficos de archivos."
-
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
-msgid ""
-"KDE is a powerful, graphical user interface which includes a panel, desktop, "
-"system icons, and a graphical file manager."
-msgstr ""
-"KDE es una interfaz de usuario gr??fica y potente que incluye un panel, un "
-"escritorio, iconos del sistema y un gestor gr??fico de archivos. "
-
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
-msgid ""
-"Sometimes called text editors, these are programs that allow you to create "
-"and edit files. These include Emacs and Vi."
-msgstr ""
-"Existen programas que permiten crear y modificar archivos, a veces llamados "
-"editores de texto. Estos incluyen Emacs y Vi."
+#: ../comps-el4.xml.in.h:22
+#: ../comps-el5.xml.in.h:23
+msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "GNOME es una potente interfaz gr??fica de usuario que incluye un panel, un escritorio, iconos del sistema y gestores gr??ficos de archivos."
+
+#: ../comps-el4.xml.in.h:35
+#: ../comps-el5.xml.in.h:35
+msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "KDE es una interfaz de usuario gr??fica y potente que incluye un panel, un escritorio, iconos del sistema y un gestor gr??fico de archivos. "
+
+#: ../comps-el4.xml.in.h:44
+#: ../comps-el5.xml.in.h:44
+msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi."
+msgstr "Existen programas que permiten crear y modificar archivos, a veces llamados editores de texto. Estos incluyen Emacs y Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50
+#: ../comps-el5.xml.in.h:48
 msgid "The XEmacs text editor."
 msgstr "Editor de textos XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
-msgid ""
-"These tools allow you to create documentation in the DocBook format and "
-"convert them to HTML, PDF, Postscript, and text."
-msgstr ""
-"Estas herramientas le permiten crear documentaci??n en formato DocBook y "
-"convertirla a HTML, PDF, Postscript y texto."
+#: ../comps-el4.xml.in.h:54
+#: ../comps-el5.xml.in.h:52
+msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text."
+msgstr "Estas herramientas le permiten crear documentaci??n en formato DocBook y convertirla a HTML, PDF, Postscript y texto."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64
+#: ../comps-el5.xml.in.h:62
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "Este grupo es un conjunto de servidores para prop??sitos espec??ficos"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
-msgstr ""
-"Este grupo es un conjunto de herramientas y recursos para entornos en Ar??be."
-
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
-msgstr ""
-"Este grupo es un conjunto de herramientas y recursos para entornos en Hebreo."
-
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
-msgstr ""
-"Este grupo es un conjunto de herramientas y recursos para entornos en "
-"Japon??s."
+#: ../comps-el4.xml.in.h:65
+#: ../comps-el5.xml.in.h:63
+msgid "This group is a collection of tools and resources of Arabic environments."
+msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Ar??be."
+
+#: ../comps-el4.xml.in.h:67
+#: ../comps-el5.xml.in.h:66
+msgid "This group is a collection of tools and resources of Hebrew environments."
+msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Hebreo."
+
+#: ../comps-el4.xml.in.h:68
+#: ../comps-el5.xml.in.h:67
+msgid "This group is a collection of tools and resources of Japanese environments."
+msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Japon??s."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77
+#: ../comps-el5.xml.in.h:77
 msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
-msgstr ""
-"Este grupo es un conjunto de herramientas y recursos para entornos en Checo."
+msgid "This group is a collection of tools and resources of Czech environments."
+msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Checo."
 
 #~ msgid "Haskell"
 #~ msgstr "Haskell"
+



From rhughes at fedoraproject.org  Tue Sep 23 11:20:57 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 23 Sep 2008 11:20:57 +0000 (UTC)
Subject: rpms/PackageKit/devel pk-dont-schedule-the-whole-queue.patch, NONE, 
	1.1 PackageKit.spec, 1.58, 1.59
Message-ID: <20080923112057.8C1B470033@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15765

Modified Files:
	PackageKit.spec 
Added Files:
	pk-dont-schedule-the-whole-queue.patch 
Log Message:
* Tue Sep 23 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-3
- Don't try to run all the committed transactions at once with a deep queue.
- This fixes the bug where the dispatcher would sometimes fail to run the
  next method and PkSpawn would warn the user with 'timeout already set'.


pk-dont-schedule-the-whole-queue.patch:

--- NEW FILE pk-dont-schedule-the-whole-queue.patch ---
commit 95a2dcf78ba0e2ae6262bfae897a16b0e26408c8
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Sep 23 11:43:36 2008 +0100

    bugfix: when we have more than one transaction queued, don't try to run them all at once
    
    This bug was never triggered before as we were running each pk_transaction_run in a loop
    and so blocked at this point. Now we are idle_add'ing them, it's possible for all of
    the remaining queue to be dispatched at the same time.
    This fixes the bug where the dispatcher would sometimes fail to run the second method
    and PkSpawn would error out with 'trying to set timeout when already set'.

diff --git a/src/pk-transaction-list.c b/src/pk-transaction-list.c
index d8da409..23bbcf0 100644
--- a/src/pk-transaction-list.c
+++ b/src/pk-transaction-list.c
@@ -293,8 +293,10 @@
 		item = (PkTransactionItem *) g_ptr_array_index (tlist->priv->array, i);
 		if (item->committed &&
 		    !item->running &&
-		    !item->finished)
+		    !item->finished) {
 			pk_transaction_list_run_item (tlist, item);
+			break;
+		}
 	}
 }
 


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- PackageKit.spec	23 Sep 2008 10:02:40 -0000	1.58
+++ PackageKit.spec	23 Sep 2008 11:20:27 -0000	1.59
@@ -8,7 +8,7 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.4
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -18,6 +18,9 @@
 # upstream: c9a01198d494f06ae9e0b3e2a002f941da118f00
 Patch0:    pk-dont-send-finished-from-dispatcher.patch
 
+# upstream: 95a2dcf78ba0e2ae6262bfae897a16b0e26408c8
+Patch1:    pk-dont-schedule-the-whole-queue.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-libs = %{version}-%{release}
@@ -143,6 +146,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -273,6 +277,11 @@
 %{_includedir}/*
 
 %changelog
+* Tue Sep 23 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-3
+- Don't try to run all the committed transactions at once with a deep queue.
+- This fixes the bug where the dispatcher would sometimes fail to run the
+  next method and PkSpawn would warn the user with 'timeout already set'.
+
 * Tue Sep 23 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-2
 - Don't send ::Finished when the script exits because of a dispatcher exit.
 - This only seems to happen when we are making the dispatcher be reloaded



From pbrobinson at fedoraproject.org  Tue Sep 23 11:24:12 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 23 Sep 2008 11:24:12 +0000 (UTC)
Subject: rpms/ptlib/F-9 ptlib.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20080923112412.AAA6670033@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ptlib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16518

Modified Files:
	ptlib.spec sources 
Log Message:
- New stable release - 2.4.1



Index: ptlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/F-9/ptlib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ptlib.spec	11 Sep 2008 12:04:37 -0000	1.1
+++ ptlib.spec	23 Sep 2008 11:23:42 -0000	1.2
@@ -1,16 +1,17 @@
 Name:		ptlib
 Summary:	Portable Tools Library
-Version:	2.3.1
-Release:	2%{?dist}
+Version:	2.4.1
+Release:	1%{?dist}
 URL:		http://www.opalvoip.org/
-Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ptlib/2.3/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
 License:	MPLv1.0
 Group:		System Environment/Libraries
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat openssl-devel pkgconfig
 BuildRequires:  alsa-lib-devel, libstdc++-devel, libv4l-devel
-BuildRequires:  openldap-devel, expat-devel, SDL-devel, flex, bison
+BuildRequires:  openldap-devel, expat-devel, flex, bison
+Obsoletes:	pwlib
 
 %description
 PTLib (Portable Tools Library) is a moderately large class library that 
@@ -27,6 +28,7 @@
 Group:		Development/Libraries
 Requires:	ptlib = %{version}-%{release}
 Requires:	pkgconfig
+Obsoletes:	pwlib-devel
 
 %description devel
 The ptlib-devel package includes the libraries and header files for ptlib.
@@ -36,7 +38,7 @@
 
 %build
 export CFLAGS="$CFLAGS -DLDAP_DEPRECATED"
-%configure --prefix=%{_prefix} --disable-static --enable-opal --enable-plugins --disable-oss --enable-v4l2 --disable-avc
+%configure --prefix=%{_prefix} --disable-static --enable-opal --enable-plugins --disable-oss --enable-v4l2 --disable-avc --disable-v4l
 make %{?_smp_mflags}
 
 %install
@@ -51,6 +53,7 @@
 
 # Remove empty include file
 rm -rf $RPM_BUILD_ROOT%{_includedir}/ptlib/devplugin.h
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libpt_s.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -62,14 +65,13 @@
 %defattr(-,root,root)
 %doc History.txt ReadMe.txt mpl-1.0.htm
 %attr(755,root,root) %{_libdir}/libpt*.so.*
-%dir %{_libdir}/ptlib
-%dir %{_libdir}/ptlib/devices
-%dir %{_libdir}/ptlib/devices/sound
-%dir %{_libdir}/ptlib/devices/videoinput
+%dir %{_libdir}/%{name}-%{version}
+%dir %{_libdir}/%{name}-%{version}/devices
+%dir %{_libdir}/%{name}-%{version}/devices/sound
+%dir %{_libdir}/%{name}-%{version}/devices/videoinput
 # List these explicitly so we don't get any surprises
-%attr(755,root,root) %{_libdir}/ptlib/devices/sound/alsa_pwplugin.so
-%attr(755,root,root) %{_libdir}/ptlib/devices/videoinput/v4l_pwplugin.so
-%attr(755,root,root) %{_libdir}/ptlib/devices/videoinput/v4l2_pwplugin.so
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/devices/sound/alsa_pwplugin.so
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/devices/videoinput/v4l2_pwplugin.so
 
 %files devel
 %defattr(-,root,root)
@@ -80,6 +82,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Sep 23 2008 Peter Robinson <pbrobinson at gmail.com> - 2.4.1-1
+- Update to new stable release for ekiga 3, disable v4l1
+
 * Wed Sep 10 2008 Peter Robinson <pbrobinson at gmail.com> - 2.3.1-2
 - Build fixes from package review
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Sep 2008 12:04:37 -0000	1.2
+++ sources	23 Sep 2008 11:23:42 -0000	1.3
@@ -1 +1 @@
-bd495deba21a292348bb57ae2cb05d6a  ptlib-2.3.1.tar.bz2
+79d6431a30ec7a558633e67c25e689f9  ptlib-2.4.1.tar.bz2



From jnovy at fedoraproject.org  Tue Sep 23 11:27:17 2008
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Tue, 23 Sep 2008 11:27:17 +0000 (UTC)
Subject: rpms/libusb1/devel .cvsignore, 1.3, 1.4 libusb1.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20080923112717.E50D770033@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libusb1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17348

Modified Files:
	.cvsignore libusb1.spec sources 
Log Message:
* Tue Sep 23 2008 Jindrich Novy <jnovy at redhat.com> 0.9.3-0.1
- update to 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libusb1/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Jul 2008 15:30:53 -0000	1.3
+++ .cvsignore	23 Sep 2008 11:26:47 -0000	1.4
@@ -1 +1 @@
-libusb-0.9.1.tar.bz2
+libusb-0.9.3.tar.bz2


Index: libusb1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libusb1/devel/libusb1.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libusb1.spec	6 Jul 2008 15:30:53 -0000	1.2
+++ libusb1.spec	23 Sep 2008 11:26:47 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: A library which allows userspace access to USB devices
 Name: libusb1
-Version: 0.9.1
-Release: 1%{?dist}
+Version: 0.9.3
+Release: 0.1%{?dist}
 Source0: http://downloads.sourceforge.net/libusb/libusb-%{version}.tar.bz2
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -71,6 +71,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Tue Sep 23 2008 Jindrich Novy <jnovy at redhat.com> 0.9.3-0.1
+- update to 0.9.3
+
 * Sun Jul 06 2008 - Bastien Nocera <bnocera at redhat.com> - 0.9.1
 - Update to 0.9.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libusb1/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Jul 2008 15:30:53 -0000	1.3
+++ sources	23 Sep 2008 11:26:47 -0000	1.4
@@ -1 +1 @@
-e420199634a21c628db46b4ea1f1397b  libusb-0.9.1.tar.bz2
+a7a2d880be18303109cc7c0f9f21ced2  libusb-0.9.3.tar.bz2



From pbrobinson at fedoraproject.org  Tue Sep 23 11:32:15 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 23 Sep 2008 11:32:15 +0000 (UTC)
Subject: rpms/ptlib/F-9 ptlib.spec,1.2,1.3
Message-ID: <20080923113215.0687670033@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ptlib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18492

Modified Files:
	ptlib.spec 
Log Message:
- Remove lib-v4l reuqirement as its not in F-9



Index: ptlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/F-9/ptlib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ptlib.spec	23 Sep 2008 11:23:42 -0000	1.2
+++ ptlib.spec	23 Sep 2008 11:31:44 -0000	1.3
@@ -1,7 +1,7 @@
 Name:		ptlib
 Summary:	Portable Tools Library
 Version:	2.4.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 URL:		http://www.opalvoip.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
 License:	MPLv1.0
@@ -9,7 +9,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat openssl-devel pkgconfig
-BuildRequires:  alsa-lib-devel, libstdc++-devel, libv4l-devel
+BuildRequires:  alsa-lib-devel, libstdc++-devel
 BuildRequires:  openldap-devel, expat-devel, flex, bison
 Obsoletes:	pwlib
 
@@ -82,6 +82,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Sep 23 2008 Peter Robinson <pbrobinson at gmail.com> - 2.4.1-2
+- remove lib-v4l requirement as its not in F-9
+
 * Tue Sep 23 2008 Peter Robinson <pbrobinson at gmail.com> - 2.4.1-1
 - Update to new stable release for ekiga 3, disable v4l1
 



From varekova at fedoraproject.org  Tue Sep 23 11:40:17 2008
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 23 Sep 2008 11:40:17 +0000 (UTC)
Subject: rpms/pilot-link/devel pilot-link-0.12.3-clio.patch, 1.1,
	1.2 pilot-link.spec, 1.82, 1.83
Message-ID: <20080923114017.565A870033@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/pilot-link/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20486

Modified Files:
	pilot-link-0.12.3-clio.patch pilot-link.spec 
Log Message:
- extend clio patch - thanks Kevin R. Page


pilot-link-0.12.3-clio.patch:

Index: pilot-link-0.12.3-clio.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pilot-link/devel/pilot-link-0.12.3-clio.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pilot-link-0.12.3-clio.patch	19 Sep 2008 10:17:23 -0000	1.1
+++ pilot-link-0.12.3-clio.patch	23 Sep 2008 11:40:17 -0000	1.2
@@ -1,7 +1,6 @@
-Index: pilot-link-0.12.3/libpisock/usb.c
-===================================================================
---- pilot-link-0.12.3.orig/libpisock/usb.c
-+++ pilot-link-0.12.3/libpisock/usb.c
+diff -up pilot-link-0.12.3/libpisock/usb.c.clio pilot-link-0.12.3/libpisock/usb.c
+--- pilot-link-0.12.3/libpisock/usb.c.clio	2008-09-19 12:06:52.000000000 +0200
++++ pilot-link-0.12.3/libpisock/usb.c	2008-09-23 10:57:22.000000000 +0200
 @@ -655,6 +655,7 @@ pi_usb_dev_t known_devices[] = {
  		.vendor 	= 0x054c,
  		.product 	= 0x0066,
@@ -10,3 +9,11 @@
  	},
  
  	{
+@@ -698,6 +699,7 @@ pi_usb_dev_t known_devices[] = {
+ 		.vendor 	= 0x054c,
+ 		.product 	= 0x0169,
+ 		.idstr 		= "Sony TJ",
++		.flags 		= USB_INIT_SONY_CLIE,
+ 	},
+ 
+ 	/* AlphaSmart */


Index: pilot-link.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pilot-link/devel/pilot-link.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- pilot-link.spec	19 Sep 2008 11:27:03 -0000	1.82
+++ pilot-link.spec	23 Sep 2008 11:40:17 -0000	1.83
@@ -2,7 +2,7 @@
 
 Name: pilot-link
 Version: 0.12.3
-Release: 17%{?dist}
+Release: 18%{?dist}
 Epoch: 2
 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL
 Group: Applications/Communications
@@ -185,6 +185,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Ivana Varekova <varekova at redhat.com> - 2:0.12.3-18 
+- extend clio patch - thanks Kevin R. Page
+
 * Fri Sep 19 2008 Ivana Varekova <varekova at redhat.com> - 2:0.12.3-17
 - split perl subpackage (461758) - thanks Peter Robinson
 - spec file cleanup



From zprikryl at fedoraproject.org  Tue Sep 23 12:27:51 2008
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Tue, 23 Sep 2008 12:27:51 +0000 (UTC)
Subject: rpms/mtr/devel mtr.spec, 1.45, 1.46 mtr-0.69-CVE-2002-0497.patch,
	1.2, 
	NONE mtr-0.69-format.patch, 1.1, NONE mtr-0.71-underflow.patch,
	1.2, NONE
Message-ID: <20080923122751.A640F70033@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/mtr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30210

Modified Files:
	mtr.spec 
Removed Files:
	mtr-0.69-CVE-2002-0497.patch mtr-0.69-format.patch 
	mtr-0.71-underflow.patch 
Log Message:
Removed confusing underflow patch
Removed format patch bacause of -w option



Index: mtr.spec
===================================================================
RCS file: /cvs/extras/rpms/mtr/devel/mtr.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- mtr.spec	11 Sep 2008 11:43:56 -0000	1.45
+++ mtr.spec	23 Sep 2008 12:27:21 -0000	1.46
@@ -1,8 +1,8 @@
 Summary: A network diagnostic tool
 Name: mtr
-Version: 0.74
+Version: 0.75
 Release: 1%{?dist}
-Epoch:	2
+Epoch:	1
 Group: Applications/Internet
 License: GPLv2+
 URL: http://www.BitWizard.nl/mtr
@@ -10,9 +10,6 @@
 Source1: xmtr.consolehelper
 Source2: xmtr.pam
 Source3: net-x%{name}.desktop
-Patch1:	mtr-0.69-CVE-2002-0497.patch
-Patch2:	mtr-0.69-format.patch
-Patch3: mtr-0.71-underflow.patch
 BuildRequires: ncurses-devel gtk2-devel desktop-file-utils gtk+-devel
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,9 +32,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .CVE-2002-0497
-%patch2 -p1 -b .format
-%patch3 -p1 -b .underflow
 
 %build
 %configure --enable-gtk2
@@ -88,6 +82,10 @@
 %{_datadir}/pixmaps/mtr_icon.xpm
 
 %changelog
+* Tue Sep 23 2008 Zdenek Prikryl <zprikryl at redhat.com> - 2:0.75-1
+- Removed confusing underflow patch
+- Removed format patch bacause of -w option
+
 * Thu Sep 09 2008 Zdenek Prikryl <zprikryl at redhat.com> - 2:0.74-1
 - Updated to 0.74
 


--- mtr-0.69-CVE-2002-0497.patch DELETED ---


--- mtr-0.69-format.patch DELETED ---


--- mtr-0.71-underflow.patch DELETED ---



From zprikryl at fedoraproject.org  Tue Sep 23 12:28:42 2008
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Tue, 23 Sep 2008 12:28:42 +0000 (UTC)
Subject: rpms/mtr/devel mtr.spec,1.46,1.47
Message-ID: <20080923122842.EF36F70033@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/mtr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30400

Modified Files:
	mtr.spec 
Log Message:
Minor fix in changelog



Index: mtr.spec
===================================================================
RCS file: /cvs/extras/rpms/mtr/devel/mtr.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- mtr.spec	23 Sep 2008 12:27:21 -0000	1.46
+++ mtr.spec	23 Sep 2008 12:28:12 -0000	1.47
@@ -83,6 +83,7 @@
 
 %changelog
 * Tue Sep 23 2008 Zdenek Prikryl <zprikryl at redhat.com> - 2:0.75-1
+- Updated to 0.75
 - Removed confusing underflow patch
 - Removed format patch bacause of -w option
 



From zprikryl at fedoraproject.org  Tue Sep 23 12:29:48 2008
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Tue, 23 Sep 2008 12:29:48 +0000 (UTC)
Subject: rpms/mtr/devel mtr.spec,1.47,1.48
Message-ID: <20080923122948.D1FF570033@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/mtr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30586

Modified Files:
	mtr.spec 
Log Message:
Fixed epoch verison



Index: mtr.spec
===================================================================
RCS file: /cvs/extras/rpms/mtr/devel/mtr.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- mtr.spec	23 Sep 2008 12:28:12 -0000	1.47
+++ mtr.spec	23 Sep 2008 12:29:18 -0000	1.48
@@ -2,7 +2,7 @@
 Name: mtr
 Version: 0.75
 Release: 1%{?dist}
-Epoch:	1
+Epoch:	2
 Group: Applications/Internet
 License: GPLv2+
 URL: http://www.BitWizard.nl/mtr



From zprikryl at fedoraproject.org  Tue Sep 23 12:31:07 2008
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Tue, 23 Sep 2008 12:31:07 +0000 (UTC)
Subject: rpms/mtr/devel .cvsignore,1.13,1.14 sources,1.13,1.14
Message-ID: <20080923123107.E51C270033@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/mtr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31027

Modified Files:
	.cvsignore sources 
Log Message:
Added new source



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mtr/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	11 Sep 2008 11:43:55 -0000	1.13
+++ .cvsignore	23 Sep 2008 12:30:37 -0000	1.14
@@ -1,2 +1 @@
-mtr-0.73.tar.gz
-mtr-0.74.tar.gz
+mtr-0.75.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mtr/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	11 Sep 2008 11:43:56 -0000	1.13
+++ sources	23 Sep 2008 12:30:37 -0000	1.14
@@ -1,2 +1 @@
-52223cc34c72092a0392865356a3dc76  mtr-0.73.tar.gz
-0bc1601c9bc6f2a4af58c6b5baca4668  mtr-0.74.tar.gz
+23baca52d0922c2ecba7eba05317868c  mtr-0.75.tar.gz



From pbrobinson at fedoraproject.org  Tue Sep 23 12:57:16 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 23 Sep 2008 12:57:16 +0000 (UTC)
Subject: rpms/ekiga/devel ekiga.spec,1.54,1.55
Message-ID: <20080923125716.E86B870033@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4294

Modified Files:
	ekiga.spec 
Log Message:
- add libnotify-devel as a build dep



Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ekiga.spec	23 Sep 2008 11:06:17 -0000	1.54
+++ ekiga.spec	23 Sep 2008 12:56:46 -0000	1.55
@@ -1,7 +1,7 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
 Version:	3.0.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.0/%{name}-%{version}.tar.bz2
 License:	GPLv2+
@@ -14,6 +14,7 @@
 BuildRequires:	GConf2-devel >= 2.2.0
 BuildRequires:	libgnomeui-devel >= 2.0
 BuildRequires:	libgnome-devel >= 2.0
+BuildRequires:	libnotify-devel
 BuildRequires:	avahi-devel >= 0.6.9
 BuildRequires:	avahi-glib-devel >= 0.6.9
 BuildRequires:	dbus-glib-devel >= 0.70
@@ -89,6 +90,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Tue Sep 23 2008 Peter Robinson <pbrobinson at gmail.com> - 3.0.0-2
+- add libnotify-devel as a build dep
+
 * Tue Sep 23 2008 Peter Robinson <pbrobinson at gmail.com> - 3.0.0-1
 - Ekiga 3 final release
 



From mbarnes at fedoraproject.org  Tue Sep 23 13:02:15 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 23 Sep 2008 13:02:15 +0000 (UTC)
Subject: rpms/pyorbit/devel .cvsignore, 1.8, 1.9 pyorbit.spec, 1.26,
	1.27 sources, 1.8, 1.9
Message-ID: <20080923130215.5D7FE70033@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pyorbit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5440

Modified Files:
	.cvsignore pyorbit.spec sources 
Log Message:

* Tue Sep 23 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.0-1.fc10
- Update to 2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyorbit/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Oct 2007 20:07:56 -0000	1.8
+++ .cvsignore	23 Sep 2008 13:01:45 -0000	1.9
@@ -1 +1 @@
-pyorbit-2.14.3.tar.bz2
+pyorbit-2.24.0.tar.bz2


Index: pyorbit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyorbit/devel/pyorbit.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- pyorbit.spec	29 Aug 2008 21:14:54 -0000	1.26
+++ pyorbit.spec	23 Sep 2008 13:01:45 -0000	1.27
@@ -3,8 +3,8 @@
 ### Abstract ###
 
 Name: pyorbit
-Version: 2.14.3
-Release: 3%{?dist}
+Version: 2.24.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: Python bindings for ORBit2.
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Sep 23 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.0-1.fc10
+- Update to 2.24.0
+
 * Fri Aug 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14.3-3
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyorbit/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Oct 2007 20:07:56 -0000	1.8
+++ sources	23 Sep 2008 13:01:45 -0000	1.9
@@ -1 +1 @@
-3c4d42ae1a7303fd85071a842617043f  pyorbit-2.14.3.tar.bz2
+574593815e75ee6e98062c75d6d1581f  pyorbit-2.24.0.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep 23 13:12:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 13:12:39 +0000
Subject: [pkgdb] python-ethtool ownership updated
Message-ID: <20080923131239.86CE3208D9F@bastion.fedora.phx.redhat.com>

Package python-ethtool in Fedora devel was orphaned by acme

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-ethtool



From pkgdb at fedoraproject.org  Tue Sep 23 13:12:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 13:12:57 +0000
Subject: [pkgdb] python-ethtool ownership updated
Message-ID: <20080923131257.BFB50208D9F@bastion.fedora.phx.redhat.com>

Package python-ethtool in Fedora devel is now owned by acme

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-ethtool



From dwalsh at fedoraproject.org  Tue Sep 23 13:27:34 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 23 Sep 2008 13:27:34 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.212,
	1.213 selinux-policy.spec, 1.709, 1.710
Message-ID: <20080923132734.F034B70033@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11215

Modified Files:
	policy-20071130.patch selinux-policy.spec 
Log Message:
* Mon Sep 22 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-93
- Add /dev/msp* support
- Update prewikka support


policy-20071130.patch:

Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- policy-20071130.patch	19 Sep 2008 14:42:25 -0000	1.212
+++ policy-20071130.patch	23 Sep 2008 13:27:34 -0000	1.213
@@ -2205,7 +2205,7 @@
 -')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.3.1/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/admin/logrotate.te	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/admin/logrotate.te	2008-09-23 08:36:21.000000000 -0400
 @@ -96,9 +96,11 @@
  files_read_etc_files(logrotate_t)
  files_read_etc_runtime_files(logrotate_t)
@@ -2218,6 +2218,15 @@
  
  # cjp: why is this needed?
  init_domtrans_script(logrotate_t)
+@@ -161,7 +163,7 @@
+ ')
+ 
+ optional_policy(`
+-	mailman_exec(logrotate_t)
++	mailman_domtrans(logrotate_t)
+ 	mailman_search_data(logrotate_t)
+ 	mailman_manage_log(logrotate_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.3.1/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2008-06-12 23:38:01.000000000 -0400
 +++ serefpolicy-3.3.1/policy/modules/admin/logwatch.te	2008-09-08 11:45:12.000000000 -0400
@@ -14502,7 +14511,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.3.1/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/cups.te	2008-09-12 13:42:32.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/cups.te	2008-09-22 14:18:58.000000000 -0400
 @@ -43,14 +43,13 @@
  
  type cupsd_var_run_t;
@@ -14599,7 +14608,7 @@
  allow cupsd_t hplip_var_run_t:file { read getattr };
  
  stream_connect_pattern(cupsd_t,ptal_var_run_t,ptal_var_run_t,ptal_t)
-@@ -149,32 +171,35 @@
+@@ -149,32 +171,36 @@
  corenet_tcp_bind_reserved_port(cupsd_t)
  corenet_dontaudit_tcp_bind_all_reserved_ports(cupsd_t)
  corenet_tcp_connect_all_ports(cupsd_t)
@@ -14613,6 +14622,7 @@
  dev_read_urand(cupsd_t)
  dev_read_sysfs(cupsd_t)
 -dev_read_usbfs(cupsd_t)
++dev_rw_input_dev(cupsd_t)  #447878
 +dev_rw_generic_usb_dev(cupsd_t)
 +dev_rw_usbfs(cupsd_t)
  dev_getattr_printer_dev(cupsd_t)
@@ -14639,7 +14649,7 @@
  # Filter scripts may be shell scripts, and may invoke progs like /bin/mktemp
  corecmd_exec_shell(cupsd_t)
  corecmd_exec_bin(cupsd_t)
-@@ -186,7 +211,7 @@
+@@ -186,7 +212,7 @@
  # read python modules
  files_read_usr_files(cupsd_t)
  # for /var/lib/defoma
@@ -14648,7 +14658,7 @@
  files_list_world_readable(cupsd_t)
  files_read_world_readable_files(cupsd_t)
  files_read_world_readable_symlinks(cupsd_t)
-@@ -195,15 +220,16 @@
+@@ -195,15 +221,16 @@
  files_read_var_symlinks(cupsd_t)
  # for /etc/printcap
  files_dontaudit_write_etc_files(cupsd_t)
@@ -14669,7 +14679,7 @@
  auth_use_nsswitch(cupsd_t)
  
  libs_use_ld_so(cupsd_t)
-@@ -219,17 +245,22 @@
+@@ -219,17 +246,22 @@
  miscfiles_read_fonts(cupsd_t)
  
  seutil_read_config(cupsd_t)
@@ -14694,7 +14704,7 @@
  ')
  
  optional_policy(`
-@@ -242,12 +273,21 @@
+@@ -242,12 +274,21 @@
  
  optional_policy(`
  	dbus_system_bus_client_template(cupsd,cupsd_t)
@@ -14716,7 +14726,7 @@
  ')
  
  optional_policy(`
-@@ -263,6 +303,10 @@
+@@ -263,6 +304,10 @@
  ')
  
  optional_policy(`
@@ -14727,7 +14737,7 @@
  	# cups execs smbtool which reads samba_etc_t files
  	samba_read_config(cupsd_t)
  	samba_rw_var_files(cupsd_t)
-@@ -281,7 +325,7 @@
+@@ -281,7 +326,7 @@
  # Cups configuration daemon local policy
  #
  
@@ -14736,7 +14746,7 @@
  dontaudit cupsd_config_t self:capability sys_tty_config;
  allow cupsd_config_t self:process signal_perms;
  allow cupsd_config_t self:fifo_file rw_fifo_file_perms;
-@@ -326,6 +370,7 @@
+@@ -326,6 +371,7 @@
  dev_read_sysfs(cupsd_config_t)
  dev_read_urand(cupsd_config_t)
  dev_read_rand(cupsd_config_t)
@@ -14744,7 +14754,7 @@
  
  fs_getattr_all_fs(cupsd_config_t)
  fs_search_auto_mountpoints(cupsd_config_t)
-@@ -353,6 +398,7 @@
+@@ -353,6 +399,7 @@
  logging_send_syslog_msg(cupsd_config_t)
  
  miscfiles_read_localization(cupsd_config_t)
@@ -14752,7 +14762,7 @@
  
  seutil_dontaudit_search_config(cupsd_config_t)
  
-@@ -372,6 +418,10 @@
+@@ -372,6 +419,10 @@
  ')
  
  optional_policy(`
@@ -14763,7 +14773,7 @@
  	cron_system_entry(cupsd_config_t, cupsd_config_exec_t)
  ')
  
-@@ -387,6 +437,7 @@
+@@ -387,6 +438,7 @@
  optional_policy(`
  	hal_domtrans(cupsd_config_t)
  	hal_read_tmp_files(cupsd_config_t)
@@ -14771,7 +14781,7 @@
  ')
  
  optional_policy(`
-@@ -499,15 +550,10 @@
+@@ -499,15 +551,10 @@
  allow hplip_t self:udp_socket create_socket_perms;
  allow hplip_t self:rawip_socket create_socket_perms;
  
@@ -14788,7 +14798,7 @@
  manage_files_pattern(hplip_t,hplip_var_run_t,hplip_var_run_t)
  files_pid_filetrans(hplip_t,hplip_var_run_t,file)
  
-@@ -537,14 +583,14 @@
+@@ -537,14 +584,14 @@
  dev_read_urand(hplip_t)
  dev_read_rand(hplip_t)
  dev_rw_generic_usb_dev(hplip_t)
@@ -14805,7 +14815,7 @@
  domain_use_interactive_fds(hplip_t)
  
  files_read_etc_files(hplip_t)
-@@ -564,7 +610,8 @@
+@@ -564,7 +611,8 @@
  userdom_dontaudit_search_sysadm_home_dirs(hplip_t)
  userdom_dontaudit_search_all_users_home_content(hplip_t)
  
@@ -14815,7 +14825,7 @@
  
  optional_policy(`
  	seutil_sigchld_newrole(hplip_t)
-@@ -645,3 +692,45 @@
+@@ -645,3 +693,45 @@
  optional_policy(`
  	udev_read_db(ptal_t)
  ')
@@ -16985,13 +16995,15 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.fc serefpolicy-3.3.1/policy/modules/services/fail2ban.fc
 --- nsaserefpolicy/policy/modules/services/fail2ban.fc	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/fail2ban.fc	2008-09-08 11:45:12.000000000 -0400
-@@ -1,3 +1,7 @@
++++ serefpolicy-3.3.1/policy/modules/services/fail2ban.fc	2008-09-19 11:19:39.000000000 -0400
+@@ -1,3 +1,8 @@
  /usr/bin/fail2ban	--	gen_context(system_u:object_r:fail2ban_exec_t,s0)
 +/usr/bin/fail2ban-server --	gen_context(system_u:object_r:fail2ban_exec_t,s0)
  /var/log/fail2ban\.log	--	gen_context(system_u:object_r:fail2ban_log_t,s0)
- /var/run/fail2ban\.pid	--	gen_context(system_u:object_r:fail2ban_var_run_t,s0)
-+/var/run/fail2ban\.sock	-s	gen_context(system_u:object_r:fail2ban_var_run_t,s0)
+-/var/run/fail2ban\.pid	--	gen_context(system_u:object_r:fail2ban_var_run_t,s0)
++
++/var/run/fail2ban.*		gen_context(system_u:object_r:fail2ban_var_run_t,s0)
++
 +/etc/rc\.d/init\.d/fail2ban	--	gen_context(system_u:object_r:fail2ban_script_exec_t,s0)
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.if serefpolicy-3.3.1/policy/modules/services/fail2ban.if
@@ -17068,7 +17080,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.te serefpolicy-3.3.1/policy/modules/services/fail2ban.te
 --- nsaserefpolicy/policy/modules/services/fail2ban.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/fail2ban.te	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/fail2ban.te	2008-09-19 11:19:08.000000000 -0400
 @@ -18,6 +18,9 @@
  type fail2ban_var_run_t;
  files_pid_file(fail2ban_var_run_t)
@@ -17088,18 +17100,19 @@
  
  # log files
  allow fail2ban_t fail2ban_log_t:dir setattr;
-@@ -33,8 +36,9 @@
+@@ -33,8 +36,10 @@
  logging_log_filetrans(fail2ban_t,fail2ban_log_t,file)
  
  # pid file
++manage_dirs_pattern(fail2ban_t, fail2ban_var_run_t, fail2ban_var_run_t)
 +manage_sock_files_pattern(fail2ban_t,fail2ban_var_run_t,fail2ban_var_run_t)
  manage_files_pattern(fail2ban_t,fail2ban_var_run_t,fail2ban_var_run_t)
 -files_pid_filetrans(fail2ban_t,fail2ban_var_run_t, file)
-+files_pid_filetrans(fail2ban_t,fail2ban_var_run_t, { file sock_file })
++files_pid_filetrans(fail2ban_t,fail2ban_var_run_t, { dir file sock_file })
  
  kernel_read_system_state(fail2ban_t)
  
-@@ -46,15 +50,26 @@
+@@ -46,15 +51,26 @@
  domain_use_interactive_fds(fail2ban_t)
  
  files_read_etc_files(fail2ban_t)
@@ -17127,7 +17140,7 @@
  optional_policy(`
  	apache_read_log(fail2ban_t)
  ')
-@@ -64,5 +79,11 @@
+@@ -64,5 +80,11 @@
  ')
  
  optional_policy(`
@@ -22242,7 +22255,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.3.1/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/postfix.te	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/postfix.te	2008-09-23 09:11:49.000000000 -0400
 @@ -6,6 +6,14 @@
  # Declarations
  #
@@ -22331,7 +22344,18 @@
  
  optional_policy(`
  	cyrus_stream_connect(postfix_master_t)
-@@ -248,6 +271,10 @@
+@@ -189,6 +212,10 @@
+ ')
+ 
+ optional_policy(`
++	postgrey_search_spool(postfix_master_t)
++')
++
++optional_policy(`
+ 	sendmail_signal(postfix_master_t)
+ ')
+ 
+@@ -248,6 +275,10 @@
  
  corecmd_exec_bin(postfix_cleanup_t)
  
@@ -22342,7 +22366,7 @@
  ########################################
  #
  # Postfix local local policy
-@@ -273,18 +300,25 @@
+@@ -273,18 +304,25 @@
  
  files_read_etc_files(postfix_local_t)
  
@@ -22368,7 +22392,7 @@
  ')
  
  optional_policy(`
-@@ -295,8 +329,7 @@
+@@ -295,8 +333,7 @@
  #
  # Postfix map local policy
  #
@@ -22378,7 +22402,7 @@
  allow postfix_map_t self:unix_stream_socket create_stream_socket_perms;
  allow postfix_map_t self:unix_dgram_socket create_socket_perms;
  allow postfix_map_t self:tcp_socket create_stream_socket_perms;
-@@ -346,8 +379,6 @@
+@@ -346,8 +383,6 @@
  
  miscfiles_read_localization(postfix_map_t)
  
@@ -22387,7 +22411,7 @@
  tunable_policy(`read_default_t',`
  	files_list_default(postfix_map_t)
  	files_read_default_files(postfix_map_t)
-@@ -360,6 +391,11 @@
+@@ -360,6 +395,11 @@
  	locallogin_dontaudit_use_fds(postfix_map_t)
  ')
  
@@ -22399,7 +22423,7 @@
  ########################################
  #
  # Postfix pickup local policy
-@@ -384,6 +420,7 @@
+@@ -384,6 +424,7 @@
  #
  
  allow postfix_pipe_t self:fifo_file rw_fifo_file_perms;
@@ -22407,7 +22431,7 @@
  
  write_sock_files_pattern(postfix_pipe_t,postfix_private_t,postfix_private_t)
  
-@@ -391,6 +428,12 @@
+@@ -391,6 +432,12 @@
  
  rw_files_pattern(postfix_pipe_t,postfix_spool_t,postfix_spool_t)
  
@@ -22420,7 +22444,7 @@
  optional_policy(`
  	procmail_domtrans(postfix_pipe_t)
  ')
-@@ -400,6 +443,10 @@
+@@ -400,6 +447,10 @@
  ')
  
  optional_policy(`
@@ -22431,7 +22455,7 @@
  	uucp_domtrans_uux(postfix_pipe_t)
  ')
  
-@@ -436,8 +483,7 @@
+@@ -436,8 +487,7 @@
  ')
  
  optional_policy(`
@@ -22441,7 +22465,7 @@
  ')
  
  #######################################
-@@ -463,6 +509,15 @@
+@@ -463,6 +513,15 @@
  init_sigchld_script(postfix_postqueue_t)
  init_use_script_fds(postfix_postqueue_t)
  
@@ -22457,7 +22481,7 @@
  ########################################
  #
  # Postfix qmgr local policy
-@@ -532,9 +587,6 @@
+@@ -532,9 +591,6 @@
  # connect to master process
  stream_connect_pattern(postfix_smtpd_t,{ postfix_private_t postfix_public_t },{ postfix_private_t postfix_public_t },postfix_master_t)
  
@@ -22467,7 +22491,7 @@
  # for prng_exch
  allow postfix_smtpd_t postfix_spool_t:file rw_file_perms;
  allow postfix_smtpd_t postfix_prng_t:file rw_file_perms;
-@@ -557,6 +609,10 @@
+@@ -557,6 +613,10 @@
  	sasl_connect(postfix_smtpd_t)
  ')
  
@@ -22478,7 +22502,7 @@
  ########################################
  #
  # Postfix virtual local policy
-@@ -572,7 +628,7 @@
+@@ -572,7 +632,7 @@
  files_tmp_filetrans(postfix_virtual_t, postfix_virtual_tmp_t, { file dir })
  
  # connect to master process
@@ -23251,7 +23275,7 @@
 +kernel_relabelfrom_unlabeled_database(sepgsql_unconfined_type)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.fc serefpolicy-3.3.1/policy/modules/services/postgrey.fc
 --- nsaserefpolicy/policy/modules/services/postgrey.fc	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/postgrey.fc	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/postgrey.fc	2008-09-23 09:06:46.000000000 -0400
 @@ -7,3 +7,7 @@
  
  /var/run/postgrey(/.*)?		gen_context(system_u:object_r:postgrey_var_run_t,s0)
@@ -23262,8 +23286,8 @@
 +/var/spool/postfix/postgrey(/.*)?	gen_context(system_u:object_r:postgrey_spool_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.if serefpolicy-3.3.1/policy/modules/services/postgrey.if
 --- nsaserefpolicy/policy/modules/services/postgrey.if	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/postgrey.if	2008-09-19 10:23:53.000000000 -0400
-@@ -12,10 +12,82 @@
++++ serefpolicy-3.3.1/policy/modules/services/postgrey.if	2008-09-23 09:13:12.000000000 -0400
+@@ -12,10 +12,100 @@
  #
  interface(`postgrey_stream_connect',`
          gen_require(`
@@ -23280,6 +23304,24 @@
 +
 +########################################
 +## <summary>
++##      Search the spool directory
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access
++##      </summary>
++## </param>
++#
++interface(`postgrey_search_spool',`
++        gen_require(`
++                type postgrey_spool_t;
++        ')
++
++	allow $1 postgrey_spool_t:dir search_dir_perms;
++')
++
++########################################
++## <summary>
 +##	Execute postgrey server in the postgrey domain.
 +## </summary>
 +## <param name="domain">
@@ -23569,8 +23611,8 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.fc serefpolicy-3.3.1/policy/modules/services/prelude.fc
 --- nsaserefpolicy/policy/modules/services/prelude.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/prelude.fc	2008-09-08 11:45:12.000000000 -0400
-@@ -0,0 +1,20 @@
++++ serefpolicy-3.3.1/policy/modules/services/prelude.fc	2008-09-22 09:14:58.000000000 -0400
+@@ -0,0 +1,24 @@
 +/sbin/audisp-prelude		--	gen_context(system_u:object_r:prelude_audisp_exec_t,s0)
 +
 +/usr/bin/prelude-manager	--	gen_context(system_u:object_r:prelude_exec_t,s0)
@@ -23588,9 +23630,13 @@
 +/usr/bin/prelude-lml   --      gen_context(system_u:object_r:prelude_lml_exec_t,s0)
 +/var/run/prelude-lml.pid       --      gen_context(system_u:object_r:prelude_lml_var_run_t,s0)
 +
++/etc/rc\.d/init\.d/prelude-correlator   --      gen_context(system_u:object_r:prelude_correlator_script_exec_t, s0)
 +/etc/rc\.d/init\.d/prelude-lml --      gen_context(system_u:object_r:prelude_lml_script_exec_t,s0)
 +/etc/rc\.d/init\.d/prelude-manager	--	gen_context(system_u:object_r:prelude_script_exec_t,s0)
 +
++/etc/prelude-correlator(/.*)?   gen_context(system_u:object_r:prelude_correlator_config_t, s0)
++/usr/bin/prelude-correlator     --      gen_context(system_u:object_r:prelude_correlator_exec_t, s0)
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.if serefpolicy-3.3.1/policy/modules/services/prelude.if
 --- nsaserefpolicy/policy/modules/services/prelude.if	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.3.1/policy/modules/services/prelude.if	2008-09-08 11:45:12.000000000 -0400
@@ -23788,8 +23834,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.3.1/policy/modules/services/prelude.te
 --- nsaserefpolicy/policy/modules/services/prelude.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/prelude.te	2008-09-19 10:06:47.000000000 -0400
-@@ -0,0 +1,260 @@
++++ serefpolicy-3.3.1/policy/modules/services/prelude.te	2008-09-22 09:14:34.000000000 -0400
+@@ -0,0 +1,325 @@
 +
 +policy_module(prelude, 1.0.0)
 +
@@ -23842,6 +23888,22 @@
 +
 +########################################
 +#
++# prelude_correlator declarations
++#
++
++type prelude_correlator_t;
++type prelude_correlator_exec_t;
++init_daemon_domain(prelude_correlator_t, prelude_correlator_exec_t)
++role system_r types prelude_correlator_t;
++
++type prelude_correlator_script_exec_t;
++init_script_file(prelude_correlator_script_exec_t)
++
++type prelude_correlator_config_t;
++files_config_file(prelude_correlator_config_t)
++
++########################################
++#
 +# prelude local policy
 +#
 +
@@ -23875,15 +23937,19 @@
 +corenet_tcp_bind_all_nodes(prelude_t)
 +corenet_tcp_bind_prelude_port(prelude_t)
 +corenet_tcp_connect_prelude_port(prelude_t)
++corenet_tcp_connect_postgresql_port(prelude_t)
 +
 +dev_read_rand(prelude_t)
 +dev_read_urand(prelude_t)
 +
++kernel_read_sysctl(prelude_t)
++
 +# Init script handling
 +domain_use_interactive_fds(prelude_t)
 +
 +files_read_etc_files(prelude_t)
 +files_read_usr_files(prelude_t)
++files_search_tmp(prelude_t)
 +
 +fs_rw_anon_inodefs_files(prelude_t)
 +
@@ -23939,6 +24005,8 @@
 +# Init script handling
 +domain_use_interactive_fds(prelude_audisp_t)
 +
++kernel_read_sysctl(prelude_audisp_t)
++
 +files_read_etc_files(prelude_audisp_t)
 +
 +libs_use_ld_so(prelude_audisp_t)
@@ -23953,13 +24021,49 @@
 +
 +########################################
 +#
++# prelude_correlator local policy
++#
++
++allow prelude_correlator_t self:netlink_route_socket r_netlink_socket_perms;
++allow prelude_correlator_t self:tcp_socket create_stream_socket_perms;
++allow prelude_correlator_t self:unix_dgram_socket create_socket_perms;
++
++read_files_pattern(prelude_correlator_t, prelude_correlator_config_t, prelude_correlator_config_t)
++
++prelude_manage_spool(prelude_correlator_t)
++
++corecmd_search_sbin(prelude_correlator_t)
++
++corenet_all_recvfrom_unlabeled(prelude_correlator_t)
++corenet_all_recvfrom_netlabel(prelude_correlator_t)
++corenet_tcp_sendrecv_all_if(prelude_correlator_t)
++corenet_tcp_sendrecv_all_nodes(prelude_correlator_t)
++corenet_tcp_connect_prelude_port(prelude_correlator_t)
++
++dev_read_rand(prelude_correlator_t)
++dev_read_urand(prelude_correlator_t)
++
++files_read_etc_files(prelude_correlator_t)
++files_read_usr_files(prelude_correlator_t)
++files_search_spool(prelude_correlator_t)
++
++libs_use_ld_so(prelude_correlator_t)
++libs_use_shared_libs(prelude_correlator_t)
++
++logging_send_syslog_msg(prelude_correlator_t)
++
++miscfiles_read_localization(prelude_correlator_t)
++
++sysnet_dns_name_resolve(prelude_correlator_t)
++
++########################################
++#
 +# prelude_lml local declarations
 +#
 +
 +allow prelude_lml_t self:capability dac_override;
 +
 +# Init script handling
-+# Test me
 +domain_use_interactive_fds(prelude_lml_t)
 +
 +allow prelude_lml_t self:tcp_socket { write getattr setopt read create connect };
@@ -24017,6 +24121,8 @@
 +
 +miscfiles_read_localization(prelude_lml_t)
 +
++sysnet_dns_name_resolve(prelude_lml_t)
++
 +optional_policy(`
 +	gamin_exec(prelude_lml_t)
 +')
@@ -24033,8 +24139,13 @@
 +
 +optional_policy(`
 +	apache_content_template(prewikka)
++	files_search_tmp(httpd_prewikka_script_t)
 +	files_read_etc_files(httpd_prewikka_script_t)
 +
++	apache_search_sys_content(httpd_prewikka_script_t)
++
++	corenet_tcp_connect_postgresql_port(httpd_prewikka_script_t)
++
 +	auth_use_nsswitch(httpd_prewikka_script_t)
 +
 +	logging_send_syslog_msg(httpd_prewikka_script_t)
@@ -33690,7 +33801,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.3.1/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/logging.te	2008-09-15 13:03:33.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/system/logging.te	2008-09-23 08:51:57.000000000 -0400
 @@ -61,10 +61,29 @@
  logging_log_file(var_log_t)
  files_mountpoint(var_log_t)
@@ -33756,7 +33867,16 @@
  # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
  # Probably want a transition, and a new auditd_helper app
  corecmd_exec_bin(auditd_t)
-@@ -158,9 +188,12 @@
+@@ -150,6 +180,8 @@
+ 
+ logging_set_audit_parameters(auditd_t)
+ logging_send_syslog_msg(auditd_t)
++logging_domtrans_audisp(auditd_t)
++logging_audisp_signal(auditd_t)
+ 
+ libs_use_ld_so(auditd_t)
+ libs_use_shared_libs(auditd_t)
+@@ -158,9 +190,12 @@
  
  mls_file_read_all_levels(auditd_t)
  mls_file_write_all_levels(auditd_t) # Need to be able to write to /var/run/ directory
@@ -33769,7 +33889,7 @@
  userdom_dontaudit_use_unpriv_user_fds(auditd_t)
  userdom_dontaudit_search_sysadm_home_dirs(auditd_t)
  
-@@ -171,6 +204,10 @@
+@@ -171,6 +206,10 @@
  ')
  
  optional_policy(`
@@ -33780,7 +33900,7 @@
  	seutil_sigchld_newrole(auditd_t)
  ')
  
-@@ -208,6 +245,7 @@
+@@ -208,6 +247,7 @@
  
  fs_getattr_all_fs(klogd_t)
  fs_search_auto_mountpoints(klogd_t)
@@ -33788,7 +33908,7 @@
  
  domain_use_interactive_fds(klogd_t)
  
-@@ -252,7 +290,6 @@
+@@ -252,7 +292,6 @@
  dontaudit syslogd_t self:capability sys_tty_config;
  # setpgid for metalog
  allow syslogd_t self:process { signal_perms setpgid };
@@ -33796,7 +33916,7 @@
  # receive messages to be logged
  allow syslogd_t self:unix_dgram_socket create_socket_perms;
  allow syslogd_t self:unix_stream_socket create_stream_socket_perms;
-@@ -262,7 +299,7 @@
+@@ -262,7 +301,7 @@
  allow syslogd_t self:tcp_socket create_stream_socket_perms;
  
  allow syslogd_t syslog_conf_t:file read_file_perms;
@@ -33805,7 +33925,7 @@
  # Create and bind to /dev/log or /var/run/log.
  allow syslogd_t devlog_t:sock_file manage_sock_file_perms;
  files_pid_filetrans(syslogd_t,devlog_t,sock_file)
-@@ -274,6 +311,9 @@
+@@ -274,6 +313,9 @@
  # Allow access for syslog-ng
  allow syslogd_t var_log_t:dir { create setattr };
  
@@ -33815,7 +33935,7 @@
  # manage temporary files
  manage_dirs_pattern(syslogd_t,syslogd_tmp_t,syslogd_tmp_t)
  manage_files_pattern(syslogd_t,syslogd_tmp_t,syslogd_tmp_t)
-@@ -289,12 +329,14 @@
+@@ -289,12 +331,14 @@
  manage_files_pattern(syslogd_t,syslogd_var_run_t,syslogd_var_run_t)
  files_pid_filetrans(syslogd_t,syslogd_var_run_t,file)
  
@@ -33830,7 +33950,7 @@
  
  dev_filetrans(syslogd_t,devlog_t,sock_file)
  dev_read_sysfs(syslogd_t)
-@@ -327,6 +369,8 @@
+@@ -327,6 +371,8 @@
  # Allow users to define additional syslog ports to connect to
  corenet_tcp_bind_syslogd_port(syslogd_t)
  corenet_tcp_connect_syslogd_port(syslogd_t)
@@ -33839,7 +33959,7 @@
  
  # syslog-ng can send or receive logs
  corenet_sendrecv_syslogd_client_packets(syslogd_t)
-@@ -339,19 +383,20 @@
+@@ -339,19 +385,20 @@
  domain_use_interactive_fds(syslogd_t)
  
  files_read_etc_files(syslogd_t)
@@ -33862,7 +33982,7 @@
  miscfiles_read_localization(syslogd_t)
  
  userdom_dontaudit_use_unpriv_user_fds(syslogd_t)
-@@ -380,15 +425,11 @@
+@@ -380,15 +427,11 @@
  ')
  
  optional_policy(`
@@ -33880,7 +34000,7 @@
  ')
  
  optional_policy(`
-@@ -399,3 +440,67 @@
+@@ -399,3 +442,66 @@
  	# log to the xconsole
  	xserver_rw_console(syslogd_t)
  ')
@@ -33918,8 +34038,7 @@
 +corecmd_search_bin(audisp_t)
 +allow audisp_t self:unix_dgram_socket create_socket_perms;
 +
-+logging_domtrans_audisp(auditd_t)
-+logging_audisp_signal(auditd_t)
++sysnet_dns_name_resolve(audisp_t)
 +
 +########################################
 +#


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v
retrieving revision 1.709
retrieving revision 1.710
diff -u -r1.709 -r1.710
--- selinux-policy.spec	19 Sep 2008 13:54:22 -0000	1.709
+++ selinux-policy.spec	23 Sep 2008 13:27:34 -0000	1.710
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.3.1
-Release: 92%{?dist}
+Release: 93%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -386,6 +386,10 @@
 %endif
 
 %changelog
+* Mon Sep 22 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-93
+- Add /dev/msp* support
+- Update prewikka support
+
 * Tue Sep 18 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-92
 - Dontaudit attempts to write user_tmp_t by gssd_t
 



From rstrode at fedoraproject.org  Tue Sep 23 13:31:42 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 23 Sep 2008 13:31:42 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec,1.54,1.55 sources,1.22,1.23
Message-ID: <20080923133142.7B9FD70033@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12304

Modified Files:
	plymouth.spec sources 
Log Message:
- Last snapshot was broken



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- plymouth.spec	22 Sep 2008 21:58:15 -0000	1.54
+++ plymouth.spec	23 Sep 2008 13:31:12 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: Plymouth Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.6.0
-Release: 0.2008.09.22.1%{?dist}
+Release: 0.2008.09.23.1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -227,6 +227,9 @@
 %{_libdir}/plymouth/spinfinity.so
 
 %changelog
+* Tue Sep 23 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.23.1
+- Last snapshot was broken
+
 * Mon Sep 22 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.22.1
 - Update to latest snapshot to get better transition support
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	22 Sep 2008 21:58:15 -0000	1.22
+++ sources	23 Sep 2008 13:31:12 -0000	1.23
@@ -1 +1 @@
-2231b2effa336bc5f95806146a4ee3d6  plymouth-0.6.0.tar.bz2
+f0ac92c8b0b21c36d625c8c1f765e065  plymouth-0.6.0.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep 23 13:42:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 13:42:29 +0000
Subject: [pkgdb] time: kasal has requested commit
Message-ID: <20080923134229.9DA2B208DA0@bastion.fedora.phx.redhat.com>

kasal has requested the commit acl on time (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/time



From rhughes at fedoraproject.org  Tue Sep 23 13:50:40 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 23 Sep 2008 13:50:40 +0000 (UTC)
Subject: rpms/PackageKit/devel pk-fix-yum-error-name.patch, NONE,
	1.1 PackageKit.spec, 1.59, 1.60
Message-ID: <20080923135040.B32F170033@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16718

Modified Files:
	PackageKit.spec 
Added Files:
	pk-fix-yum-error-name.patch 
Log Message:
* Tue Sep 23 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-4
- Fix the error dialog when no mirrors are found


pk-fix-yum-error-name.patch:

--- NEW FILE pk-fix-yum-error-name.patch ---
commit 16bea44b16fd8b1ac36cc5939caf1017eece12eb
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Sep 23 14:43:31 2008 +0100

    yum: fix the name of the enum when no mirrors are found

diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index b445e0d..8a29917 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -915,7 +915,7 @@ class PackageKitYumBackend(PackageKitBaseBackend,PackagekitPackage):
         except yum.Errors.RepoError,e:
                 message = self._format_msgs(e.value)
                 if message.find ("No more mirrors to try") != -1:
-                    self.error(ERROR_FILE_NO_MORE_MIRRORS_TO_TRY,message)
+                    self.error(ERROR_NO_MORE_MIRRORS_TO_TRY,message)
                 else:
                     self.error(ERROR_REPO_CONFIGURATION_ERROR,message)
         except yum.Errors.YumBaseError,e:


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- PackageKit.spec	23 Sep 2008 11:20:27 -0000	1.59
+++ PackageKit.spec	23 Sep 2008 13:50:10 -0000	1.60
@@ -8,7 +8,7 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.4
-Release:   3%{?dist}
+Release:   4%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -21,6 +21,9 @@
 # upstream: 95a2dcf78ba0e2ae6262bfae897a16b0e26408c8
 Patch1:    pk-dont-schedule-the-whole-queue.patch
 
+# upstream: 16bea44b16fd8b1ac36cc5939caf1017eece12eb
+Patch2:    pk-fix-yum-error-name.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-libs = %{version}-%{release}
@@ -147,6 +150,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -277,6 +281,9 @@
 %{_includedir}/*
 
 %changelog
+* Tue Sep 23 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-4
+- Fix the error dialog when no mirrors are found
+
 * Tue Sep 23 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-3
 - Don't try to run all the committed transactions at once with a deep queue.
 - This fixes the bug where the dispatcher would sometimes fail to run the



From rstrode at fedoraproject.org  Tue Sep 23 14:02:34 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 23 Sep 2008 14:02:34 +0000 (UTC)
Subject: rpms/gdm/devel gdm-2.23.92-fix-bg-priority.patch, NONE, 1.1 gdm.spec,
	1.421, 1.422
Message-ID: <20080923140234.6163B70033@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19188

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.23.92-fix-bg-priority.patch 
Log Message:
- Load background after everything else, so the crossfade
  isn't choppy.


gdm-2.23.92-fix-bg-priority.patch:

--- NEW FILE gdm-2.23.92-fix-bg-priority.patch ---
diff -up gdm-2.23.92/gui/simple-greeter/gdm-simple-greeter.schemas.in.fix-bg-priority gdm-2.23.92/gui/simple-greeter/gdm-simple-greeter.schemas.in
--- gdm-2.23.92/gui/simple-greeter/gdm-simple-greeter.schemas.in.fix-bg-priority	2008-09-23 09:59:12.000000000 -0400
+++ gdm-2.23.92/gui/simple-greeter/gdm-simple-greeter.schemas.in	2008-09-23 09:59:30.000000000 -0400
@@ -177,7 +177,7 @@
       <applyto>/apps/gdm/simple-greeter/settings-manager-plugins/background/priority</applyto>
       <owner>gdm-simple-greeter</owner>
       <type>int</type>
-      <default>5</default>
+      <default>25</default>
       <locale name="C">
         <short></short>
         <long></long>


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -r1.421 -r1.422
--- gdm.spec	22 Sep 2008 18:58:36 -0000	1.421
+++ gdm.spec	23 Sep 2008 14:02:03 -0000	1.422
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.24.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -90,6 +90,7 @@
 Patch7: gdm-2.23.92-filter-dupes-from-lang-list.patch
 Patch8: gdm-2.23.92-another-locale-fixup.patch
 Patch9: gdm-2.23.92-fix-crash.patch
+Patch10: gdm-2.23.92-fix-bg-priority.patch
 
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
@@ -120,6 +121,7 @@
 %patch7 -p1 -b .filter-dupes-from-lang-list
 %patch8 -p1 -b .another-locale-fixup
 %patch9 -p1 -b .fix-crash
+%patch10 -p1 -b .fix-bg-priority
 
 %patch99 -p1 -b .fedora-logo
 
@@ -322,6 +324,10 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Tue Sep 23 2008 Ray Strode <rstrode at redhat.com> - 1:2.24.0-3
+- Load background after everything else, so the crossfade
+  isn't choppy.
+
 * Mon Sep 22 2008 Ray Strode <rstrode at redhat.com> - 1:2.24.0-2
 - Fix permssions on spool dir
 



From pkgdb at fedoraproject.org  Tue Sep 23 14:04:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 14:04:43 +0000
Subject: [pkgdb] astyle ownership updated
Message-ID: <20080923140443.63F8E208DA8@bastion.fedora.phx.redhat.com>

Package astyle in Fedora 9 was orphaned by addutko

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/astyle



From pkgdb at fedoraproject.org  Tue Sep 23 14:04:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 14:04:47 +0000
Subject: [pkgdb] astyle ownership updated
Message-ID: <20080923140447.5E0E1208DA7@bastion.fedora.phx.redhat.com>

Package astyle in Fedora 8 was orphaned by addutko

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/astyle



From pkgdb at fedoraproject.org  Tue Sep 23 14:04:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 14:04:49 +0000
Subject: [pkgdb] astyle ownership updated
Message-ID: <20080923140449.A53B9208DAB@bastion.fedora.phx.redhat.com>

Package astyle in Fedora 6 was orphaned by addutko

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/astyle



From pkgdb at fedoraproject.org  Tue Sep 23 14:04:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 14:04:52 +0000
Subject: [pkgdb] astyle ownership updated
Message-ID: <20080923140452.83F1E208DAD@bastion.fedora.phx.redhat.com>

Package astyle in Fedora 7 was orphaned by addutko

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/astyle



From pkgdb at fedoraproject.org  Tue Sep 23 14:04:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 14:04:55 +0000
Subject: [pkgdb] astyle ownership updated
Message-ID: <20080923140455.2FEE5208DB2@bastion.fedora.phx.redhat.com>

Package astyle in Fedora devel was orphaned by addutko

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/astyle



From dwalsh at fedoraproject.org  Tue Sep 23 14:04:57 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 23 Sep 2008 14:04:57 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch,1.213,1.214
Message-ID: <20080923140457.4CF0A70033@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20196

Modified Files:
	policy-20071130.patch 
Log Message:
* Mon Sep 22 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-93
- Add /dev/msp* support
- Update prewikka support


policy-20071130.patch:

Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- policy-20071130.patch	23 Sep 2008 13:27:34 -0000	1.213
+++ policy-20071130.patch	23 Sep 2008 14:04:56 -0000	1.214
@@ -2267,7 +2267,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.3.1/policy/modules/admin/mrtg.te
 --- nsaserefpolicy/policy/modules/admin/mrtg.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/admin/mrtg.te	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/admin/mrtg.te	2008-09-23 10:04:40.000000000 -0400
 @@ -78,6 +78,7 @@
  dev_read_urand(mrtg_t)
  
@@ -2276,7 +2276,15 @@
  
  files_read_usr_files(mrtg_t)
  files_search_var(mrtg_t)
-@@ -101,6 +102,8 @@
+@@ -92,6 +93,7 @@
+ 
+ fs_search_auto_mountpoints(mrtg_t)
+ fs_getattr_xattr_fs(mrtg_t)
++fs_list_inotifyfs(mrtg_t)
+ 
+ term_dontaudit_use_console(mrtg_t)
+ 
+@@ -101,6 +103,8 @@
  init_read_utmp(mrtg_t)
  init_dontaudit_write_utmp(mrtg_t)
  
@@ -2285,7 +2293,7 @@
  libs_read_lib_files(mrtg_t)
  libs_use_ld_so(mrtg_t)
  libs_use_shared_libs(mrtg_t)
-@@ -111,11 +114,9 @@
+@@ -111,11 +115,9 @@
  
  selinux_dontaudit_getattr_dir(mrtg_t)
  
@@ -2298,7 +2306,7 @@
  
  ifdef(`enable_mls',`
  	corenet_udp_sendrecv_lo_if(mrtg_t)
-@@ -139,14 +140,6 @@
+@@ -139,14 +141,6 @@
  ')
  
  optional_policy(`
@@ -2313,7 +2321,7 @@
  	seutil_sigchld_newrole(mrtg_t)
  ')
  
-@@ -162,9 +155,3 @@
+@@ -162,9 +156,3 @@
  	udev_read_db(mrtg_t)
  ')
  
@@ -9271,7 +9279,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.3.1/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/kernel/kernel.if	2008-09-12 10:26:53.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/kernel/kernel.if	2008-09-23 09:46:59.000000000 -0400
 @@ -330,6 +330,11 @@
  
  	allow $1 self:capability sys_module;
@@ -9431,8 +9439,11 @@
  ')
  
  ########################################
-@@ -1032,7 +1036,7 @@
+@@ -1030,9 +1034,10 @@
+ interface(`kernel_search_network_state',`
+ 	gen_require(`
  		type proc_net_t;
++		type proc_t;
  	')
  
 -	search_dirs_pattern($1,proc_t,proc_net_t)
@@ -9440,7 +9451,7 @@
  ')
  
  ########################################
-@@ -1051,10 +1055,10 @@
+@@ -1051,10 +1056,10 @@
  		type proc_t, proc_net_t;
  	')
  
@@ -9454,7 +9465,7 @@
  ')
  
  ########################################
-@@ -1072,9 +1076,9 @@
+@@ -1072,9 +1077,9 @@
  		type proc_t, proc_net_t;
  	')
  
@@ -9466,7 +9477,7 @@
  ')
  
  ########################################
-@@ -1093,7 +1097,7 @@
+@@ -1093,7 +1098,7 @@
  		type proc_t, proc_xen_t;
  	')
  
@@ -9475,7 +9486,7 @@
  ')
  
  ########################################
-@@ -1132,10 +1136,10 @@
+@@ -1132,10 +1137,10 @@
  		type proc_t, proc_xen_t;
  	')
  
@@ -9489,7 +9500,7 @@
  ')
  
  ########################################
-@@ -1154,9 +1158,9 @@
+@@ -1154,9 +1159,9 @@
  		type proc_t, proc_xen_t;
  	')
  
@@ -9501,7 +9512,7 @@
  ')
  
  ########################################
-@@ -1175,7 +1179,7 @@
+@@ -1175,7 +1180,7 @@
  		type proc_t, proc_xen_t;
  	')
  
@@ -9510,7 +9521,7 @@
  ')
  
  ########################################
-@@ -1194,6 +1198,7 @@
+@@ -1194,6 +1199,7 @@
  	')
  
  	dontaudit $1 proc_type:dir list_dir_perms;
@@ -9518,8 +9529,11 @@
  ')
  
  ########################################
-@@ -1232,7 +1237,7 @@
+@@ -1230,9 +1236,10 @@
+ interface(`kernel_read_sysctl',`
+ 	gen_require(`
  		type sysctl_t;
++		type proc_t;
  	')
  
 -	list_dirs_pattern($1,proc_t,sysctl_t)
@@ -9527,7 +9541,7 @@
  ')
  
  ########################################
-@@ -1251,9 +1256,9 @@
+@@ -1251,9 +1258,9 @@
  		type proc_t, sysctl_t, sysctl_dev_t;
  	')
  
@@ -9539,7 +9553,7 @@
  ')
  
  ########################################
-@@ -1272,9 +1277,9 @@
+@@ -1272,9 +1279,9 @@
  		type proc_t, sysctl_t, sysctl_dev_t;
  	')
  
@@ -9551,7 +9565,7 @@
  ')
  
  ########################################
-@@ -1292,7 +1297,7 @@
+@@ -1292,7 +1299,7 @@
  		type proc_t, sysctl_t, sysctl_vm_t;
  	')
  
@@ -9560,7 +9574,7 @@
  ')
  
  ########################################
-@@ -1311,9 +1316,9 @@
+@@ -1311,9 +1318,9 @@
  		type proc_t, sysctl_t, sysctl_vm_t;
  	')
  
@@ -9572,7 +9586,7 @@
  ')
  
  ########################################
-@@ -1332,8 +1337,8 @@
+@@ -1332,8 +1339,8 @@
  		type proc_t, sysctl_t, sysctl_vm_t;
  	')
  
@@ -9583,7 +9597,7 @@
  
  	# hal needs this
  	allow $1 sysctl_vm_t:dir write;
-@@ -1354,7 +1359,7 @@
+@@ -1354,7 +1361,7 @@
  		type proc_t, sysctl_t, sysctl_net_t;
  	')
  
@@ -9592,7 +9606,7 @@
  ')
  
  ########################################
-@@ -1391,9 +1396,9 @@
+@@ -1391,9 +1398,9 @@
  		type proc_t, sysctl_t, sysctl_net_t;
  	')
  
@@ -9604,7 +9618,7 @@
  ')
  
  ########################################
-@@ -1412,9 +1417,9 @@
+@@ -1412,9 +1419,9 @@
  		type proc_t, sysctl_t, sysctl_net_t;
  	')
  
@@ -9616,7 +9630,7 @@
  ')
  
  ########################################
-@@ -1434,9 +1439,9 @@
+@@ -1434,9 +1441,9 @@
  		type proc_t, sysctl_t, sysctl_net_t, sysctl_net_unix_t;
  	')
  
@@ -9628,7 +9642,7 @@
  ')
  
  ########################################
-@@ -1456,9 +1461,9 @@
+@@ -1456,9 +1463,9 @@
  		type proc_t, sysctl_t, sysctl_net_t, sysctl_net_unix_t;
  	')
  
@@ -9640,7 +9654,7 @@
  ')
  
  ########################################
-@@ -1477,9 +1482,9 @@
+@@ -1477,9 +1484,9 @@
  		type proc_t, sysctl_t, sysctl_kernel_t, sysctl_hotplug_t;
  	')
  
@@ -9652,7 +9666,7 @@
  ')
  
  ########################################
-@@ -1498,9 +1503,9 @@
+@@ -1498,9 +1505,9 @@
  		type proc_t, sysctl_t, sysctl_kernel_t, sysctl_hotplug_t;
  	')
  
@@ -9664,7 +9678,7 @@
  ')
  
  ########################################
-@@ -1519,9 +1524,9 @@
+@@ -1519,9 +1526,9 @@
  		type proc_t, sysctl_t, sysctl_kernel_t, sysctl_modprobe_t;
  	')
  
@@ -9676,7 +9690,7 @@
  ')
  
  ########################################
-@@ -1540,9 +1545,9 @@
+@@ -1540,9 +1547,9 @@
  		type proc_t, sysctl_t, sysctl_kernel_t, sysctl_modprobe_t;
  	')
  
@@ -9688,7 +9702,7 @@
  ')
  
  ########################################
-@@ -1578,9 +1583,9 @@
+@@ -1578,9 +1585,9 @@
  		type proc_t, sysctl_t, sysctl_kernel_t;
  	')
  
@@ -9700,7 +9714,7 @@
  ')
  
  ########################################
-@@ -1617,9 +1622,9 @@
+@@ -1617,9 +1624,9 @@
  		type proc_t, sysctl_t, sysctl_kernel_t;
  	')
  
@@ -9712,7 +9726,7 @@
  ')
  
  ########################################
-@@ -1638,9 +1643,9 @@
+@@ -1638,9 +1645,9 @@
  		type proc_t, sysctl_t, sysctl_fs_t;
  	')
  
@@ -9724,7 +9738,7 @@
  ')
  
  ########################################
-@@ -1659,9 +1664,9 @@
+@@ -1659,9 +1666,9 @@
  		type proc_t, sysctl_t, sysctl_fs_t;
  	')
  
@@ -9736,7 +9750,7 @@
  ')
  
  ########################################
-@@ -1680,9 +1685,9 @@
+@@ -1680,9 +1687,9 @@
  		type proc_t, sysctl_irq_t;
  	')
  
@@ -9748,7 +9762,7 @@
  ')
  
  ########################################
-@@ -1701,9 +1706,9 @@
+@@ -1701,9 +1708,9 @@
  		type proc_t, sysctl_irq_t;
  	')
  
@@ -9760,7 +9774,7 @@
  ')
  
  ########################################
-@@ -1722,9 +1727,9 @@
+@@ -1722,9 +1729,9 @@
  		type proc_t, proc_net_t, sysctl_rpc_t;
  	')
  
@@ -9772,7 +9786,7 @@
  ')
  
  ########################################
-@@ -1743,9 +1748,9 @@
+@@ -1743,9 +1750,9 @@
  		type proc_t, proc_net_t, sysctl_rpc_t;
  	')
  
@@ -9784,7 +9798,7 @@
  ')
  
  ########################################
-@@ -1764,6 +1769,7 @@
+@@ -1764,6 +1771,7 @@
  	')
  
  	dontaudit $1 sysctl_type:dir list_dir_perms;
@@ -9792,7 +9806,7 @@
  ')
  
  ########################################
-@@ -1784,9 +1790,9 @@
+@@ -1784,9 +1792,9 @@
  	')
  
  	# proc_net_t for /proc/net/rpc sysctls
@@ -9804,7 +9818,7 @@
  ')
  
  ########################################
-@@ -1807,7 +1813,7 @@
+@@ -1807,7 +1815,7 @@
  	')
  
  	# proc_net_t for /proc/net/rpc sysctls
@@ -9813,7 +9827,7 @@
  
  	allow $1 sysctl_type:dir list_dir_perms;
  	# why is setattr needed?
-@@ -1938,8 +1944,8 @@
+@@ -1938,8 +1946,8 @@
  	')
  
  	allow $1 unlabeled_t:dir list_dir_perms;
@@ -9824,7 +9838,7 @@
  ')
  
  
-@@ -2493,6 +2499,109 @@
+@@ -2493,6 +2501,109 @@
  
  ########################################
  ## <summary>



From pkgdb at fedoraproject.org  Tue Sep 23 14:05:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 14:05:36 +0000
Subject: [pkgdb] mrxvt ownership updated
Message-ID: <20080923140536.80A82208DA5@bastion.fedora.phx.redhat.com>

Package mrxvt in Fedora devel was orphaned by addutko

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mrxvt



From pkgdb at fedoraproject.org  Tue Sep 23 14:05:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 14:05:38 +0000
Subject: [pkgdb] mrxvt ownership updated
Message-ID: <20080923140538.BA2D7208DA8@bastion.fedora.phx.redhat.com>

Package mrxvt in Fedora 7 was orphaned by addutko

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mrxvt



From pkgdb at fedoraproject.org  Tue Sep 23 14:05:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 14:05:41 +0000
Subject: [pkgdb] mrxvt ownership updated
Message-ID: <20080923140541.356BB208DAF@bastion.fedora.phx.redhat.com>

Package mrxvt in Fedora 6 was orphaned by addutko

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mrxvt



From pkgdb at fedoraproject.org  Tue Sep 23 14:05:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 14:05:42 +0000
Subject: [pkgdb] mrxvt ownership updated
Message-ID: <20080923140543.11620208DAD@bastion.fedora.phx.redhat.com>

Package mrxvt in Fedora 8 was orphaned by addutko

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mrxvt



From pkgdb at fedoraproject.org  Tue Sep 23 14:05:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 14:05:46 +0000
Subject: [pkgdb] mrxvt ownership updated
Message-ID: <20080923140546.B3433208DB1@bastion.fedora.phx.redhat.com>

Package mrxvt in Fedora 9 was orphaned by addutko

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mrxvt



From tmraz at fedoraproject.org  Tue Sep 23 14:06:48 2008
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 23 Sep 2008 14:06:48 +0000 (UTC)
Subject: rpms/pam/devel pam-0.99.6.2-lastlog-failed.patch, NONE,
	1.1 pam-1.0.2-cracklib-pwquality.patch, NONE,
	1.1 pam-1.0.2-many-groups.patch, NONE,
	1.1 pam-1.0.2-tally-fdleak.patch, NONE, 1.1 pam.spec, 1.183, 1.184
Message-ID: <20080923140648.6212270033@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20825

Modified Files:
	pam.spec 
Added Files:
	pam-0.99.6.2-lastlog-failed.patch 
	pam-1.0.2-cracklib-pwquality.patch pam-1.0.2-many-groups.patch 
	pam-1.0.2-tally-fdleak.patch 
Log Message:
* Tue Sep 23 2008 Tomas Mraz <tmraz at redhat.com> 1.0.2-2
- new password quality checks in pam_cracklib
- report failed logins from btmp in pam_lastlog
- allow larger groups in modutil functions
- fix leaked file descriptor in pam_tally


pam-0.99.6.2-lastlog-failed.patch:

--- NEW FILE pam-0.99.6.2-lastlog-failed.patch ---
diff -up Linux-PAM-0.99.6.2/modules/pam_lastlog/pam_lastlog.c.failed Linux-PAM-0.99.6.2/modules/pam_lastlog/pam_lastlog.c
--- Linux-PAM-0.99.6.2/modules/pam_lastlog/pam_lastlog.c.failed	2006-08-24 20:03:44.000000000 +0200
+++ Linux-PAM-0.99.6.2/modules/pam_lastlog/pam_lastlog.c	2008-09-12 21:21:42.000000000 +0200
@@ -46,6 +46,10 @@ struct lastlog {
 };
 #endif /* hpux */
 
+#ifndef _PATH_BTMP
+# define _PATH_BTMP "/var/log/btmp"
+#endif
+
 /* XXX - time before ignoring lock. Is 1 sec enough? */
 #define LASTLOG_IGNORE_LOCK_TIME     1
 
@@ -75,11 +79,13 @@ struct lastlog {
 #define LASTLOG_DEBUG      020  /* send info to syslog(3) */
 #define LASTLOG_QUIET      040  /* keep quiet about things */
 #define LASTLOG_WTMP      0100  /* log to wtmp as well as lastlog */
+#define LASTLOG_BTMP      0200  /* display failed login info from btmp */
+#define LASTLOG_UPDATE    0400  /* update the lastlog and wtmp files (default) */
 
 static int
 _pam_parse(pam_handle_t *pamh, int flags, int argc, const char **argv)
 {
-    int ctrl=(LASTLOG_DATE|LASTLOG_HOST|LASTLOG_LINE|LASTLOG_WTMP);
+    int ctrl=(LASTLOG_DATE|LASTLOG_HOST|LASTLOG_LINE|LASTLOG_WTMP|LASTLOG_UPDATE);
 
     /* does the appliction require quiet? */
     if (flags & PAM_SILENT) {
@@ -105,6 +111,10 @@ _pam_parse(pam_handle_t *pamh, int flags
 	    ctrl |= LASTLOG_NEVER;
 	} else if (!strcmp(*argv,"nowtmp")) {
 	    ctrl &= ~LASTLOG_WTMP;
+	} else if (!strcmp(*argv,"noupdate")) {
+	    ctrl &= ~(LASTLOG_WTMP|LASTLOG_UPDATE);
+	} else if (!strcmp(*argv,"showfailed")) {
+	    ctrl |= LASTLOG_BTMP;
 	} else {
 	    pam_syslog(pamh, LOG_ERR, "unknown option: %s", *argv);
 	}
@@ -135,7 +145,7 @@ get_tty(pam_handle_t *pamh)
 }
 
 static int
-last_login_read(pam_handle_t *pamh, int announce, int last_fd, uid_t uid)
+last_login_read(pam_handle_t *pamh, int announce, int last_fd, uid_t uid, time_t *lltime)
 {
     struct flock last_lock;
     struct lastlog last_login;
@@ -166,6 +176,7 @@ last_login_read(pam_handle_t *pamh, int 
     last_lock.l_type = F_UNLCK;
     (void) fcntl(last_fd, F_SETLK, &last_lock);        /* unlock */
 
+    *lltime = last_login.ll_time;
     if (!last_login.ll_time) {
         if (announce & LASTLOG_DEBUG) {
 	    pam_syslog(pamh, LOG_DEBUG,
@@ -320,13 +331,13 @@ last_login_write(pam_handle_t *pamh, int
 }
 
 static int
-last_login_date(pam_handle_t *pamh, int announce, uid_t uid, const char *user)
+last_login_date(pam_handle_t *pamh, int announce, uid_t uid, const char *user, time_t *lltime)
 {
     int retval;
     int last_fd;
 
     /* obtain the last login date and all the relevant info */
-    last_fd = open(_PATH_LASTLOG, O_RDWR);
+    last_fd = open(_PATH_LASTLOG, announce&LASTLOG_UPDATE ? O_RDWR : O_RDONLY);
     if (last_fd < 0) {
         if (errno == ENOENT) {
 	     last_fd = open(_PATH_LASTLOG, O_RDWR|O_CREAT,
@@ -353,7 +364,7 @@ last_login_date(pam_handle_t *pamh, int 
 	return PAM_SERVICE_ERR;
     }
 
-    retval = last_login_read(pamh, announce, last_fd, uid);
+    retval = last_login_read(pamh, announce, last_fd, uid, lltime);
     if (retval != PAM_SUCCESS)
       {
 	close(last_fd);
@@ -361,7 +372,9 @@ last_login_date(pam_handle_t *pamh, int 
 	return retval;
       }
 
-    retval = last_login_write(pamh, announce, last_fd, uid, user);
+    if (announce & LASTLOG_UPDATE) {
+	retval = last_login_write(pamh, announce, last_fd, uid, user);
+    }
 
     close(last_fd);
     D(("all done with last login"));
@@ -369,6 +382,116 @@ last_login_date(pam_handle_t *pamh, int 
     return retval;
 }
 
+static int
+last_login_failed(pam_handle_t *pamh, int announce, const char *user, time_t lltime)
+{
+    int retval;
+    int fd;
+    struct utmp ut;
+    struct utmp utuser;
+    int failed = 0;
+    char the_time[256];
+    char *date = NULL;
+    char *host = NULL;
+    char *line = NULL;
+
+    if (strlen(user) > UT_NAMESIZE) {
+	pam_syslog(pamh, LOG_WARNING, "username too long, output might be inaccurate");
+    }
+
+    /* obtain the failed login attempt records from btmp */
+    fd = open(_PATH_BTMP, O_RDONLY);
+    if (fd < 0) {
+	pam_syslog(pamh, LOG_ERR, "unable to open %s: %m", _PATH_BTMP);
+	D(("unable to open %s file", _PATH_BTMP));
+	return PAM_SERVICE_ERR;
+    }
+
+    while ((retval=pam_modutil_read(fd, (void *)&ut,
+			 sizeof(ut))) == sizeof(ut)) {
+	if (ut.ut_tv.tv_sec >= lltime && strncmp(ut.ut_user, user, UT_NAMESIZE) == 0) {
+	    memcpy(&utuser, &ut, sizeof(utuser));
+	    failed++;
+	}
+    }
+
+    if (failed) {
+	/* we want the date? */
+	if (announce & LASTLOG_DATE) {
+	    struct tm *tm, tm_buf;
+	    time_t lf_time;
+
+	    lf_time = utuser.ut_tv.tv_sec;
+	    tm = localtime_r (&lf_time, &tm_buf);
+	    strftime (the_time, sizeof (the_time),
+	        /* TRANSLATORS: "strftime options for date of last login" */
+		_(" %a %b %e %H:%M:%S %Z %Y"), tm);
+
+	    date = the_time;
+	}
+
+	/* we want & have the host? */
+	if ((announce & LASTLOG_HOST)
+		&& (utuser.ut_host[0] != '\0')) {
+	    /* TRANSLATORS: " from <host>" */
+	    if (asprintf(&host, _(" from %.*s"), UT_HOSTSIZE,
+		    utuser.ut_host) < 0) {
+		pam_syslog(pamh, LOG_ERR, "out of memory");
+		retval = PAM_BUF_ERR;
+		goto cleanup;
+	    }
+	}
+
+	/* we want and have the terminal? */
+	if ((announce & LASTLOG_LINE)
+		&& (utuser.ut_line[0] != '\0')) {
+	    /* TRANSLATORS: " on <terminal>" */
+	    if (asprintf(&line, _(" on %.*s"), UT_LINESIZE,
+			utuser.ut_line) < 0) {
+		pam_syslog(pamh, LOG_ERR, "out of memory");
+		retval = PAM_BUF_ERR;
+		goto cleanup;
+	    }
+	}
+	
+	if (announce & (LASTLOG_LINE|LASTLOG_DATE|LASTLOG_HOST)) {
+	    /* TRANSLATORS: "Last failed login: <date> from <host> on <terminal>" */
+	    pam_info(pamh, _("Last failed login:%s%s%s"),
+			      date ? date : "",
+			      host ? host : "",
+			      line ? line : "");
+	}
+
+	_pam_drop(line);
+#if defined HAVE_DNGETTEXT && defined ENABLE_NLS
+        asprintf (&line, dngettext(PACKAGE,
+		"There was %d failed login attempt since the last successful login.",
+		"There were %d failed login attempts since the last successful login.",
+		failed),
+	    failed);
+#else
+	if (daysleft == 1)
+	    asprintf(&line,
+		_("There was %d failed login attempt since the last successful login."),
+		failed);
+	else
+	    asprintf(&line,
+		/* TRANSLATORS: only used if dngettext is not supported */
+		_("There were %d failed login attempts since the last successful login."),
+		failed);
+#endif
+	retval = pam_info(pamh, "%s", line);
+    }
+
+cleanup:
+    free(host);
+    free(line);
+    close(fd);
+    D(("all done with btmp"));
+
+    return retval;
+}
+
 /* --- authentication management functions (only) --- */
 
 PAM_EXTERN int
@@ -379,6 +502,7 @@ pam_sm_open_session(pam_handle_t *pamh, 
     const void *user;
     const struct passwd *pwd;
     uid_t uid;
+    time_t lltime = 0;
 
     /*
      * this module gets the uid of the PAM_USER. Uses it to display
@@ -407,7 +531,11 @@ pam_sm_open_session(pam_handle_t *pamh, 
 
     /* process the current login attempt (indicate last) */
 
-    retval = last_login_date(pamh, ctrl, uid, user);
+    retval = last_login_date(pamh, ctrl, uid, user, &lltime);
+
+    if ((ctrl & LASTLOG_BTMP) && retval == PAM_SUCCESS) {
+	    retval = last_login_failed(pamh, ctrl, user, lltime);
+    }
 
     /* indicate success or failure */
 
diff -up Linux-PAM-0.99.6.2/modules/pam_lastlog/pam_lastlog.8.xml.failed Linux-PAM-0.99.6.2/modules/pam_lastlog/pam_lastlog.8.xml
--- Linux-PAM-0.99.6.2/modules/pam_lastlog/pam_lastlog.8.xml.failed	2006-06-09 18:44:07.000000000 +0200
+++ Linux-PAM-0.99.6.2/modules/pam_lastlog/pam_lastlog.8.xml	2008-09-12 21:12:35.000000000 +0200
@@ -39,6 +39,12 @@
       <arg choice="opt">
         nowtmp
       </arg>
+      <arg choice="opt">
+        noupdate
+      </arg>
+      <arg choice="opt">
+        showfailed
+      </arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
@@ -137,6 +143,28 @@
           </para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <option>noupdate</option>
+        </term>
+        <listitem>
+          <para>
+            Don't update any file.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <option>showfailed</option>
+        </term>
+        <listitem>
+          <para>
+            Display number of failed login attempts and the date of the
+            last failed attempt from btmp. The date is not displayed
+            when <option>nodate</option> is specified.
+          </para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
 
@@ -213,7 +241,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>

pam-1.0.2-cracklib-pwquality.patch:

--- NEW FILE pam-1.0.2-cracklib-pwquality.patch ---
diff -up Linux-PAM-1.0.2/modules/pam_cracklib/pam_cracklib.8.xml.pwquality Linux-PAM-1.0.2/modules/pam_cracklib/pam_cracklib.8.xml
--- Linux-PAM-1.0.2/modules/pam_cracklib/pam_cracklib.8.xml.pwquality	2007-11-06 15:58:54.000000000 +0100
+++ Linux-PAM-1.0.2/modules/pam_cracklib/pam_cracklib.8.xml	2008-09-23 15:06:40.000000000 +0200
@@ -59,7 +59,7 @@
         <term>Palindrome</term>
         <listitem>
           <para>
-            Is the new password a palindrome of the old one?
+            Is the new password a palindrome?
           </para>
         </listitem>
       </varlistentry>
@@ -120,6 +120,23 @@
           </para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>Same consecutive characters</term>
+        <listitem>
+          <para>
+            Optional check for same consecutive characters.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Contains user name</term>
+        <listitem>
+          <para>
+            Optional check whether the password contains the user's name
+            in some form.
+          </para>
+        </listitem>
+      </varlistentry>
     </variablelist>
     <para>
       This module with no arguments will work well for standard unix
@@ -281,7 +298,7 @@
               than 10.
             </para>
             <para>
-              (N &gt; 0) This is the minimum number of upper
+              (N &lt; 0) This is the minimum number of upper
               case letters that must be met for a new password.
             </para>
           </listitem>
@@ -349,6 +366,50 @@
 
         <varlistentry>
           <term>
+            <option>minclass=<replaceable>N</replaceable></option>
+          </term>
+          <listitem>
+            <para>
+              The minimum number of required classes of characters for
+              the new password. The default number is zero. The four
+              classes are digits, upper and lower letters and other
+              characters.
+              The difference to the <option>credit</option> check is
+              that a specific class if of characters is not required.
+              Instead <replaceable>N</replaceable> out of four of the
+              classes are required.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <option>maxrepeat=<replaceable>N</replaceable></option>
+          </term>
+          <listitem>
+            <para>
+              Reject passwords which contain more than N same consecutive
+              characters. The default is 0 which means that this check
+              is disabled.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <option>reject_username</option>
+          </term>
+          <listitem>
+            <para>
+              Check whether the name of the user in straight or reversed
+              form is contained in the new password. If it is found the
+              new password is rejected.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
             <option>use_authtok</option>
           </term>
           <listitem>
@@ -495,7 +556,7 @@ password  required pam_unix.so use_autht
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
diff -up Linux-PAM-1.0.2/modules/pam_cracklib/pam_cracklib.c.pwquality Linux-PAM-1.0.2/modules/pam_cracklib/pam_cracklib.c
--- Linux-PAM-1.0.2/modules/pam_cracklib/pam_cracklib.c.pwquality	2008-09-23 15:06:40.000000000 +0200
+++ Linux-PAM-1.0.2/modules/pam_cracklib/pam_cracklib.c	2008-09-23 15:10:14.000000000 +0200
@@ -99,6 +99,8 @@ struct cracklib_options {
         int min_class;
 	int use_authtok;
 	int try_first_pass;
+	int max_repeat;
+	int reject_user;
 	char prompt_type[BUFSIZ];
         const char *cracklib_dictpath;
 };
@@ -166,8 +168,14 @@ _pam_parse (pam_handle_t *pamh, struct c
              opt->min_class = strtol(*argv+9,&ep,10);
              if (!ep)
                  opt->min_class = 0;
-                 if (opt->min_class > 4)
-                     opt->min_class = 4 ;
+             if (opt->min_class > 4)
+                 opt->min_class = 4;
+         } else if (!strncmp(*argv,"maxrepeat=",10)) {
+             opt->max_repeat = strtol(*argv+10,&ep,10);
+             if (!ep)
+                 opt->max_repeat = 0;
+	 } else if (!strncmp(*argv,"reject_username",15)) {
+		 opt->reject_user = 1;
 	 } else if (!strncmp(*argv,"use_authtok",11)) {
 		 opt->use_authtok = 1;
 	 } else if (!strncmp(*argv,"use_first_pass",14)) {
@@ -418,6 +426,58 @@ static int simple(struct cracklib_option
     return 1;
 }
 
+static int consecutive(struct cracklib_options *opt, const char *new)
+{
+    char c;
+    int i;
+    int same;
+
+    if (opt->max_repeat == 0)
+	return 0;
+
+    for (i = 0; new[i]; i++) {
+	if (i > 0 && new[i] == c) {
+	    ++same;
+	    if (same > opt->max_repeat)
+		return 1;
+	} else {
+	    c = new[i];
+	    same = 1;
+	}
+    }
+    return 0;
+}
+
+static int usercheck(struct cracklib_options *opt, const char *new,
+		     char *user)
+{
+    char *f, *b;
+
+    if (!opt->reject_user)
+	return 0;
+
+    if (strstr(new, user) != NULL)
+	return 1;
+
+    /* now reverse the username, we can do that in place
+       as it is strdup-ed */
+    f = user;
+    b = user+strlen(user)-1;    
+    while (f < b) {
+	char c;
+
+	c = *f;
+	*f = *b;
+	*b = c;
+	--b;
+	++f;
+    }
+
+    if (strstr(new, user) != NULL)
+	return 1;
+    return 0;
+}
+
 static char * str_lower(char *string)
 {
 	char *cp;
@@ -428,10 +488,12 @@ static char * str_lower(char *string)
 }
 
 static const char *password_check(struct cracklib_options *opt,
-				  const char *old, const char *new)
+				  const char *old, const char *new,
+				  const char *user)
 {
 	const char *msg = NULL;
 	char *oldmono = NULL, *newmono, *wrapped = NULL;
+	char *usermono = NULL;
 
 	if (old && strcmp(new, old) == 0) {
 	    msg = _("is the same as the old one");
@@ -439,6 +501,7 @@ static const char *password_check(struct
 	}
 
 	newmono = str_lower(x_strdup(new));
+	usermono = str_lower(x_strdup(user));
 	if (old) {
 	  oldmono = str_lower(x_strdup(old));
 	  wrapped = malloc(strlen(oldmono) * 2 + 1);
@@ -464,8 +527,15 @@ static const char *password_check(struct
 	if (!msg && minclass (opt, new))
 	        msg = _("not enough character classes");
 
+	if (!msg && consecutive(opt, new))
+	        msg = _("contains too many same characters consecutively");
+
+	if (!msg && usercheck(opt, newmono, usermono))
+	        msg = _("contains the user name in some form");
+
 	memset(newmono, 0, strlen(newmono));
 	free(newmono);
+	free(usermono);
 	if (old) {
 	  memset(oldmono, 0, strlen(oldmono));
 	  memset(wrapped, 0, strlen(wrapped));
@@ -532,18 +602,18 @@ static int _pam_unix_approve_pass(pam_ha
         return PAM_AUTHTOK_ERR;
     }
 
+    retval = pam_get_item(pamh, PAM_USER, &user);
+    if (retval != PAM_SUCCESS || user == NULL) {
+	if (ctrl & PAM_DEBUG_ARG)
+		pam_syslog(pamh,LOG_ERR,"Can not get username");
+	return PAM_AUTHTOK_ERR;
+    }
     /*
      * if one wanted to hardwire authentication token strength
      * checking this would be the place
      */
-    msg = password_check(opt, pass_old, pass_new);
+    msg = password_check(opt, pass_old, pass_new, user);
     if (!msg) {
-	retval = pam_get_item(pamh, PAM_USER, &user);
-	if (retval != PAM_SUCCESS || user == NULL) {
-	    if (ctrl & PAM_DEBUG_ARG)
-		pam_syslog(pamh,LOG_ERR,"Can not get username");
-	    return PAM_AUTHTOK_ERR;
-	}
 	msg = check_old_password(user, pass_new);
     }
 

pam-1.0.2-many-groups.patch:

--- NEW FILE pam-1.0.2-many-groups.patch ---
diff -up Linux-PAM-1.0.2/libpam/pam_modutil_getpwnam.c.many-groups Linux-PAM-1.0.2/libpam/pam_modutil_getpwnam.c
--- Linux-PAM-1.0.2/libpam/pam_modutil_getpwnam.c.many-groups	2007-08-30 06:00:39.000000000 +0200
+++ Linux-PAM-1.0.2/libpam/pam_modutil_getpwnam.c	2008-09-23 15:59:46.000000000 +0200
@@ -104,7 +104,7 @@ pam_modutil_getpwnam(pam_handle_t *pamh,
                 break;
         }
 	
-	length <<= 2;
+	length <<= PWD_LENGTH_SHIFT;
 
     } while (length < PWD_ABSURD_PWD_LENGTH);
 
diff -up Linux-PAM-1.0.2/libpam/pam_modutil_getpwuid.c.many-groups Linux-PAM-1.0.2/libpam/pam_modutil_getpwuid.c
--- Linux-PAM-1.0.2/libpam/pam_modutil_getpwuid.c.many-groups	2007-08-30 06:00:39.000000000 +0200
+++ Linux-PAM-1.0.2/libpam/pam_modutil_getpwuid.c	2008-09-23 15:59:59.000000000 +0200
@@ -115,7 +115,7 @@ pam_modutil_getpwuid(pam_handle_t *pamh,
                 break;
         }
 	
-	length <<= 2;
+	length <<= PWD_LENGTH_SHIFT;
 
     } while (length < PWD_ABSURD_PWD_LENGTH);
 
diff -up Linux-PAM-1.0.2/libpam/pam_modutil_getgrnam.c.many-groups Linux-PAM-1.0.2/libpam/pam_modutil_getgrnam.c
--- Linux-PAM-1.0.2/libpam/pam_modutil_getgrnam.c.many-groups	2007-08-30 06:00:39.000000000 +0200
+++ Linux-PAM-1.0.2/libpam/pam_modutil_getgrnam.c	2008-09-23 15:59:29.000000000 +0200
@@ -104,7 +104,7 @@ pam_modutil_getgrnam(pam_handle_t *pamh,
                 break;
         }
 	
-	length <<= 2;
+	length <<= PWD_LENGTH_SHIFT;
 
     } while (length < PWD_ABSURD_PWD_LENGTH);
 
diff -up Linux-PAM-1.0.2/libpam/pam_modutil_getspnam.c.many-groups Linux-PAM-1.0.2/libpam/pam_modutil_getspnam.c
--- Linux-PAM-1.0.2/libpam/pam_modutil_getspnam.c.many-groups	2007-08-30 06:00:39.000000000 +0200
+++ Linux-PAM-1.0.2/libpam/pam_modutil_getspnam.c	2008-09-23 16:00:11.000000000 +0200
@@ -104,7 +104,7 @@ pam_modutil_getspnam(pam_handle_t *pamh,
                 break;
         }
 	
-	length <<= 2;
+	length <<= PWD_LENGTH_SHIFT;
 
     } while (length < PWD_ABSURD_PWD_LENGTH);
 
diff -up Linux-PAM-1.0.2/libpam/pam_modutil_getgrgid.c.many-groups Linux-PAM-1.0.2/libpam/pam_modutil_getgrgid.c
--- Linux-PAM-1.0.2/libpam/pam_modutil_getgrgid.c.many-groups	2007-08-30 06:00:39.000000000 +0200
+++ Linux-PAM-1.0.2/libpam/pam_modutil_getgrgid.c	2008-09-23 15:59:07.000000000 +0200
@@ -115,7 +115,7 @@ pam_modutil_getgrgid(pam_handle_t *pamh,
 		break;
 	}
 	
-	length <<= 2;
+	length <<= PWD_LENGTH_SHIFT;
 
     } while (length < PWD_ABSURD_PWD_LENGTH);
 
diff -up Linux-PAM-1.0.2/libpam/pam_modutil_private.h.many-groups Linux-PAM-1.0.2/libpam/pam_modutil_private.h
--- Linux-PAM-1.0.2/libpam/pam_modutil_private.h.many-groups	2005-09-21 12:00:58.000000000 +0200
+++ Linux-PAM-1.0.2/libpam/pam_modutil_private.h	2008-09-23 16:00:30.000000000 +0200
@@ -13,8 +13,9 @@
 #include <security/pam_modules.h>
 #include <security/pam_modutil.h>
 
-#define PWD_INITIAL_LENGTH     0x100
-#define PWD_ABSURD_PWD_LENGTH  0x8000
+#define PWD_INITIAL_LENGTH     0x400
+#define PWD_ABSURD_PWD_LENGTH  0x40001
+#define PWD_LENGTH_SHIFT 4 /* 2^4 == 16 */
 
 extern void
 pam_modutil_cleanup(pam_handle_t *pamh, void *data,

pam-1.0.2-tally-fdleak.patch:

--- NEW FILE pam-1.0.2-tally-fdleak.patch ---
Index: pam_tally.c
===================================================================
RCS file: /cvsroot/pam/Linux-PAM/modules/pam_tally/pam_tally.c,v
retrieving revision 1.30
diff -u -p -r1.30 pam_tally.c
--- pam/modules/pam_tally/pam_tally.c	9 Jul 2008 12:23:23 -0000	1.30
+++ pam/modules/pam_tally/pam_tally.c	19 Sep 2008 12:29:21 -0000
@@ -350,7 +350,7 @@ get_tally(pam_handle_t *pamh, tally_t *t
     }
 
     if ( ! ( *TALLY = fopen(filename,(*tally!=TALLY_HI)?"r+":"r") ) ) {
-      pam_syslog(pamh, LOG_ALERT, "Error opening %s for update", filename);
+      pam_syslog(pamh, LOG_ALERT, "Error opening %s for %s", filename, *tally!=TALLY_HI?"update":"read");
 
 /* Discovering why account service fails: e/uid are target user.
  *
@@ -504,7 +504,7 @@ tally_check (time_t oldtime, pam_handle_
   tally_t
     deny          = opts->deny;
   tally_t
-    tally         = 0;  /* !TALLY_HI --> Log opened for update */
+    tally         = TALLY_HI;
   long
     lock_time     = opts->lock_time;
 
@@ -515,6 +515,10 @@ tally_check (time_t oldtime, pam_handle_
     i=get_tally(pamh, &tally, uid, opts->filename, &TALLY, fsp);
     if ( i != PAM_SUCCESS ) { RETURN_ERROR( i ); }
 
+    if ( TALLY != NULL ) {
+      fclose(TALLY);
+    }
+
     if ( !(opts->ctrl & OPT_MAGIC_ROOT) || getuid() ) {       /* magic_root skips tally check */
 
       /* To deny or not to deny; that is the question */


Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- pam.spec	8 Sep 2008 11:01:44 -0000	1.183
+++ pam.spec	23 Sep 2008 14:06:48 -0000	1.184
@@ -3,7 +3,7 @@
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 1.0.2
-Release: 1%{?dist}
+Release: 2%{?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
@@ -27,7 +27,11 @@
 Patch22: pam-1.0.1-unix-prompts.patch
 Patch31: pam-1.0.1-cracklib-try-first-pass.patch
 Patch32: pam-1.0.1-tally-fail-close.patch
+Patch33: pam-1.0.2-tally-fdleak.patch
 Patch41: pam-1.0.1-namespace-create.patch
+Patch42: pam-1.0.2-cracklib-pwquality.patch
+Patch43: pam-0.99.6.2-lastlog-failed.patch
+Patch44: pam-1.0.2-many-groups.patch
 
 %define _sbindir /sbin
 %define _moduledir /%{_lib}/security
@@ -97,7 +101,11 @@
 %patch22 -p1 -b .prompts
 %patch31 -p1 -b .try-first-pass
 %patch32 -p1 -b .fail-close
+%patch33 -p1 -b .fdleak
 %patch41 -p1 -b .create
+%patch42 -p1 -b .pwquality
+%patch43 -p1 -b .failed
+%patch44 -p1 -b .many-groups
 
 autoreconf
 
@@ -327,6 +335,12 @@
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Tue Sep 23 2008 Tomas Mraz <tmraz at redhat.com> 1.0.2-2
+- new password quality checks in pam_cracklib
+- report failed logins from btmp in pam_lastlog
+- allow larger groups in modutil functions
+- fix leaked file descriptor in pam_tally
+
 * Mon Sep  8 2008 Tomas Mraz <tmraz at redhat.com> 1.0.2-1
 - pam_loginuid: uids are unsigned (#460241)
 - new minor upstream release



From pkgdb at fedoraproject.org  Tue Sep 23 14:20:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 14:20:00 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20080923142000.9C504208DA2@bastion.fedora.phx.redhat.com>

clumens has set the watchbugzilla acl on anaconda (Fedora devel) to Obsolete for clumens

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From mclasen at fedoraproject.org  Tue Sep 23 14:20:18 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 14:20:18 +0000 (UTC)
Subject: rpms/libgsf/devel libgsf.spec,1.59,1.60
Message-ID: <20080923142018.2851C70033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23760

Modified Files:
	libgsf.spec 
Log Message:
Drop the ImageMagick dependency, since it causes size problems on the live cd



Index: libgsf.spec
===================================================================
RCS file: /cvs/extras/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- libgsf.spec	3 Sep 2008 14:52:21 -0000	1.59
+++ libgsf.spec	23 Sep 2008 14:19:47 -0000	1.60
@@ -4,7 +4,7 @@
 Summary: GNOME Structured File library
 Name: libgsf
 Version: 1.14.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.bz2
@@ -24,7 +24,7 @@
 Summary: GNOME integration bits for libgsf
 Group: System Environment/Libraries
 Requires: libgsf = %{version}-%{release}
-Requires: ImageMagick, gnome-vfs2
+Requires: gnome-vfs2
 
 %description gnome
 Libraries for using libgsf in conjunction with the GNOME applications
@@ -132,6 +132,10 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen  <mclasen at redhat.com> - 1.14.9-2
+- Drop the ImageMagick dependency again, since it causes size problems on 
+  the live cd
+
 * Wed Sep 03 2008 Caol??n McNamara <caolanm at redhat.com> 1.14.9-1
 - latest version with gio support
 



From pkgdb at fedoraproject.org  Tue Sep 23 14:20:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 14:20:21 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20080923142022.2BBC7208DA4@bastion.fedora.phx.redhat.com>

clumens has set the watchbugzilla acl on anaconda (Fedora 8) to Obsolete for clumens

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Tue Sep 23 14:20:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 14:20:23 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20080923142023.A95D4208DA8@bastion.fedora.phx.redhat.com>

clumens has set the watchbugzilla acl on anaconda (Fedora 9) to Obsolete for clumens

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From dwalsh at fedoraproject.org  Tue Sep 23 14:23:23 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 23 Sep 2008 14:23:23 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20080710.patch,1.43,1.44
Message-ID: <20080923142323.B28BA70033@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24792

Modified Files:
	policy-20080710.patch 
Log Message:
* Mon Sep 22 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-6
- Fix transition to nsplugin


policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- policy-20080710.patch	22 Sep 2008 20:07:59 -0000	1.43
+++ policy-20080710.patch	23 Sep 2008 14:23:23 -0000	1.44
@@ -564,7 +564,7 @@
  files_read_etc_files(kismet_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.5.8/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2008-09-03 10:17:00.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/logrotate.te	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/logrotate.te	2008-09-23 08:33:35.000000000 -0400
 @@ -97,6 +97,7 @@
  files_read_etc_files(logrotate_t)
  files_read_etc_runtime_files(logrotate_t)
@@ -573,6 +573,15 @@
  # Write to /var/spool/slrnpull - should be moved into its own type.
  files_manage_generic_spool(logrotate_t)
  files_manage_generic_spool_dirs(logrotate_t)
+@@ -167,7 +168,7 @@
+ ')
+ 
+ optional_policy(`
+-	mailman_exec(logrotate_t)
++	mailman_domtrans(logrotate_t)
+ 	mailman_search_data(logrotate_t)
+ 	mailman_manage_log(logrotate_t)
+ ')
 @@ -189,6 +190,5 @@
  ')
  
@@ -615,7 +624,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.5.8/policy/modules/admin/mrtg.te
 --- nsaserefpolicy/policy/modules/admin/mrtg.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/mrtg.te	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/mrtg.te	2008-09-23 10:04:14.000000000 -0400
 @@ -78,6 +78,7 @@
  dev_read_urand(mrtg_t)
  
@@ -624,7 +633,15 @@
  
  files_read_usr_files(mrtg_t)
  files_search_var(mrtg_t)
-@@ -101,6 +102,8 @@
+@@ -92,6 +93,7 @@
+ 
+ fs_search_auto_mountpoints(mrtg_t)
+ fs_getattr_xattr_fs(mrtg_t)
++fs_list_inotifyfs(mrtg_t)
+ 
+ term_dontaudit_use_console(mrtg_t)
+ 
+@@ -101,6 +103,8 @@
  init_read_utmp(mrtg_t)
  init_dontaudit_write_utmp(mrtg_t)
  
@@ -633,7 +650,7 @@
  libs_read_lib_files(mrtg_t)
  libs_use_ld_so(mrtg_t)
  libs_use_shared_libs(mrtg_t)
-@@ -111,12 +114,10 @@
+@@ -111,12 +115,10 @@
  
  selinux_dontaudit_getattr_dir(mrtg_t)
  
@@ -647,7 +664,7 @@
  
  ifdef(`enable_mls',`
  	corenet_udp_sendrecv_lo_if(mrtg_t)
-@@ -140,14 +141,6 @@
+@@ -140,14 +142,6 @@
  ')
  
  optional_policy(`
@@ -662,7 +679,7 @@
  	seutil_sigchld_newrole(mrtg_t)
  ')
  
-@@ -162,10 +155,3 @@
+@@ -162,10 +156,3 @@
  optional_policy(`
  	udev_read_db(mrtg_t)
  ')
@@ -5119,7 +5136,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.te serefpolicy-3.5.8/policy/modules/apps/podsleuth.te
 --- nsaserefpolicy/policy/modules/apps/podsleuth.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/podsleuth.te	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/podsleuth.te	2008-09-22 16:03:15.000000000 -0400
 @@ -11,24 +11,55 @@
  application_domain(podsleuth_t, podsleuth_exec_t)
  role system_r types podsleuth_t;
@@ -5136,7 +5153,7 @@
  #
 -
 -allow podsleuth_t self:process { signal getsched execheap execmem };
-+allow podsleuth_t self:capability sys_admin;
++allow podsleuth_t self:capability { sys_admin sys_rawio };
 +allow podsleuth_t self:process { ptrace signal getsched execheap execmem };
  allow podsleuth_t self:fifo_file rw_file_perms;
  allow podsleuth_t self:unix_stream_socket create_stream_socket_perms;
@@ -18214,7 +18231,7 @@
 +/usr/lib/mailman/mail/mailman --	gen_context(system_u:object_r:mailman_mail_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-3.5.8/policy/modules/services/mailman.if
 --- nsaserefpolicy/policy/modules/services/mailman.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/mailman.if	2008-09-19 10:41:48.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/mailman.if	2008-09-23 08:33:22.000000000 -0400
 @@ -31,6 +31,12 @@
  	allow mailman_$1_t self:tcp_socket create_stream_socket_perms;
  	allow mailman_$1_t self:udp_socket create_socket_perms;
@@ -21197,7 +21214,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.5.8/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/postfix.te	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/postfix.te	2008-09-23 09:58:09.000000000 -0400
 @@ -6,6 +6,14 @@
  # Declarations
  #
@@ -21311,7 +21328,18 @@
  #	for postalias
  	mailman_manage_data_files(postfix_master_t)
  ')
-@@ -255,6 +275,10 @@
+@@ -196,6 +216,10 @@
+ ')
+ 
+ optional_policy(`
++	postgrey_search_spool(postfix_master_t)
++')
++
++optional_policy(`
+ 	sendmail_signal(postfix_master_t)
+ ')
+ 
+@@ -255,6 +279,10 @@
  
  corecmd_exec_bin(postfix_cleanup_t)
  
@@ -21322,7 +21350,7 @@
  ########################################
  #
  # Postfix local local policy
-@@ -280,18 +304,25 @@
+@@ -280,18 +308,25 @@
  
  files_read_etc_files(postfix_local_t)
  
@@ -21348,7 +21376,7 @@
  ')
  
  optional_policy(`
-@@ -302,8 +333,7 @@
+@@ -302,8 +337,7 @@
  #
  # Postfix map local policy
  #
@@ -21358,7 +21386,7 @@
  allow postfix_map_t self:unix_stream_socket create_stream_socket_perms;
  allow postfix_map_t self:unix_dgram_socket create_socket_perms;
  allow postfix_map_t self:tcp_socket create_stream_socket_perms;
-@@ -353,8 +383,6 @@
+@@ -353,8 +387,6 @@
  
  miscfiles_read_localization(postfix_map_t)
  
@@ -21367,7 +21395,7 @@
  tunable_policy(`read_default_t',`
  	files_list_default(postfix_map_t)
  	files_read_default_files(postfix_map_t)
-@@ -367,6 +395,11 @@
+@@ -367,6 +399,11 @@
  	locallogin_dontaudit_use_fds(postfix_map_t)
  ')
  
@@ -21379,7 +21407,7 @@
  ########################################
  #
  # Postfix pickup local policy
-@@ -391,6 +424,7 @@
+@@ -391,6 +428,7 @@
  #
  
  allow postfix_pipe_t self:fifo_file rw_fifo_file_perms;
@@ -21387,7 +21415,7 @@
  
  write_sock_files_pattern(postfix_pipe_t, postfix_private_t, postfix_private_t)
  
-@@ -398,6 +432,12 @@
+@@ -398,6 +436,12 @@
  
  rw_files_pattern(postfix_pipe_t, postfix_spool_t, postfix_spool_t)
  
@@ -21400,7 +21428,7 @@
  optional_policy(`
  	procmail_domtrans(postfix_pipe_t)
  ')
-@@ -407,6 +447,14 @@
+@@ -407,6 +451,14 @@
  ')
  
  optional_policy(`
@@ -21415,7 +21443,7 @@
  	uucp_domtrans_uux(postfix_pipe_t)
  ')
  
-@@ -443,8 +491,11 @@
+@@ -443,8 +495,11 @@
  ')
  
  optional_policy(`
@@ -21429,7 +21457,7 @@
  ')
  
  #######################################
-@@ -470,6 +521,15 @@
+@@ -470,6 +525,15 @@
  init_sigchld_script(postfix_postqueue_t)
  init_use_script_fds(postfix_postqueue_t)
  
@@ -21445,7 +21473,7 @@
  ########################################
  #
  # Postfix qmgr local policy
-@@ -553,6 +613,10 @@
+@@ -553,6 +617,10 @@
  mta_read_aliases(postfix_smtpd_t)
  
  optional_policy(`
@@ -21456,7 +21484,7 @@
  	mailman_read_data_files(postfix_smtpd_t)
  ')
  
-@@ -579,7 +643,7 @@
+@@ -579,7 +647,7 @@
  files_tmp_filetrans(postfix_virtual_t, postfix_virtual_tmp_t, { file dir })
  
  # connect to master process
@@ -21710,8 +21738,8 @@
 +/var/spool/postfix/postgrey(/.*)?	gen_context(system_u:object_r:postgrey_spool_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.if serefpolicy-3.5.8/policy/modules/services/postgrey.if
 --- nsaserefpolicy/policy/modules/services/postgrey.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/postgrey.if	2008-09-19 10:23:31.000000000 -0400
-@@ -12,10 +12,80 @@
++++ serefpolicy-3.5.8/policy/modules/services/postgrey.if	2008-09-23 09:13:18.000000000 -0400
+@@ -12,10 +12,98 @@
  #
  interface(`postgrey_stream_connect',`
          gen_require(`
@@ -21728,6 +21756,24 @@
 +
 +########################################
 +## <summary>
++##      Search the spool directory
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access
++##      </summary>
++## </param>
++#
++interface(`postgrey_search_spool',`
++        gen_require(`
++                type postgrey_spool_t;
++        ')
++
++	allow $1 postgrey_spool_t:dir search_dir_perms;
++')
++
++########################################
++## <summary>
 +##	Execute postgrey server in the postgrey domain.
 +## </summary>
 +## <param name="domain">
@@ -21796,7 +21842,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.te serefpolicy-3.5.8/policy/modules/services/postgrey.te
 --- nsaserefpolicy/policy/modules/services/postgrey.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/postgrey.te	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/postgrey.te	2008-09-23 09:17:06.000000000 -0400
 @@ -13,26 +13,38 @@
  type postgrey_etc_t;
  files_config_file(postgrey_etc_t)
@@ -30951,7 +30997,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.5.8/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2008-09-03 10:17:00.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/logging.te	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/logging.te	2008-09-23 08:51:04.000000000 -0400
 @@ -72,6 +72,12 @@
  logging_log_file(var_log_t)
  files_mountpoint(var_log_t)
@@ -30992,7 +31038,16 @@
  # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
  # Probably want a transition, and a new auditd_helper app
  corecmd_exec_bin(auditd_t)
-@@ -241,6 +257,7 @@
+@@ -230,6 +246,8 @@
+ 
+ miscfiles_read_localization(audisp_t)
+ 
++sysnet_dns_name_resolve(audisp_t)
++
+ ########################################
+ #
+ # Audit remote logger local policy
+@@ -241,6 +259,7 @@
  corenet_all_recvfrom_netlabel(audisp_remote_t)
  corenet_tcp_sendrecv_all_if(audisp_remote_t)
  corenet_tcp_sendrecv_all_nodes(audisp_remote_t)



From kwizart at fedoraproject.org  Tue Sep 23 14:40:51 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Tue, 23 Sep 2008 14:40:51 +0000 (UTC)
Subject: rpms/aimage/devel aimage.spec, 1.2, 1.3 .cvsignore, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <20080923144051.DD93870033@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/aimage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28463

Modified Files:
	aimage.spec .cvsignore sources 
Log Message:
- Update to 3.2.0



Index: aimage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aimage/devel/aimage.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aimage.spec	4 Sep 2008 18:12:20 -0000	1.2
+++ aimage.spec	23 Sep 2008 14:40:21 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           aimage
-Version:        3.1.2
+Version:        3.2.0
 Release:        1%{?dist}
 Summary:        Advanced Disk Imager
 
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 kwizart < kwizart at gmail.com > - 3.2.0-1
+- Update to 3.2.0
+
 * Thu Sep  4 2008 kwizart < kwizart at gmail.com > - 3.1.2-1
 - Update to 3.1.2
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aimage/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Sep 2008 18:12:20 -0000	1.3
+++ .cvsignore	23 Sep 2008 14:40:21 -0000	1.4
@@ -1 +1 @@
-aimage-3.1.2.tar.gz
+aimage-3.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aimage/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Sep 2008 18:12:20 -0000	1.3
+++ sources	23 Sep 2008 14:40:21 -0000	1.4
@@ -1 +1 @@
-5e9ac74251977832d05da74683698a31  aimage-3.1.2.tar.gz
+58218cfc5cfcfdbabb216f1f8c0f9c39  aimage-3.2.0.tar.gz



From scop at fedoraproject.org  Tue Sep 23 14:46:01 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 23 Sep 2008 14:46:01 +0000 (UTC)
Subject: rpms/iso-codes/devel .cvsignore, 1.19, 1.20 iso-codes.spec, 1.25,
	1.26 sources, 1.20, 1.21
Message-ID: <20080923144601.B0FC670103@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/iso-codes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29686

Modified Files:
	.cvsignore iso-codes.spec sources 
Log Message:
* Sat Sep 20 2008 Ville Skytt?? <ville.skytta at iki.fi> - 3.3-1
- Update to 3.3.
- Address minor issues in merge review (#225918): update %description,
  don't use %makeinstall, drop unneeded %debug_package override, use
  parallel build.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	3 Jul 2008 04:10:30 -0000	1.19
+++ .cvsignore	23 Sep 2008 14:45:31 -0000	1.20
@@ -1 +1 @@
-iso-codes-3.1.tar.bz2
+iso-codes-3.3.tar.bz2


Index: iso-codes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/devel/iso-codes.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- iso-codes.spec	3 Jul 2008 04:10:30 -0000	1.25
+++ iso-codes.spec	23 Sep 2008 14:45:31 -0000	1.26
@@ -1,9 +1,7 @@
-%define debug_package %{nil}
-
 Name:	iso-codes
 Summary:	ISO code lists and translations
 
-Version:	3.1
+Version:	3.3
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:	System Environment/Base
@@ -16,9 +14,9 @@
 Requires: xml-common
 
 %description
-This package provides the ISO-639 Language code list, the ISO-3166 
-Territory code list, and ISO-3166-2 sub-territory lists, and all their 
-translations in gettext .po form.
+This package provides the ISO 639 Language code list, the ISO 4217
+Currency code list, the ISO 3166 Territory code list, and ISO 3166-2
+sub-territory lists, and all their translations in gettext format.
 
 %package devel
 Summary:	Files for development using %{name}
@@ -37,11 +35,11 @@
 
 %build
 %configure
-make
+make %{_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang iso-codes --all-name
 
@@ -61,6 +59,12 @@
 %{_datadir}/pkgconfig/iso-codes.pc
 
 %changelog
+* Sat Sep 20 2008 Ville Skytt?? <ville.skytta at iki.fi> - 3.3-1
+- Update to 3.3.
+- Address minor issues in merge review (#225918): update %%description,
+  don't use %%makeinstall, drop unneeded %%debug_package override, use
+  parallel build.
+
 * Wed Jul  2 2008 Christopher Aillon <caillon at redhat.com> - 3.1-1
 - Update to 3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	3 Jul 2008 04:10:30 -0000	1.20
+++ sources	23 Sep 2008 14:45:31 -0000	1.21
@@ -1 +1 @@
-570d30a0ebc5412f6aff7904c2b5404b  iso-codes-3.1.tar.bz2
+2fb4f5400f28923d679d7b98fd7f3ab8  iso-codes-3.3.tar.bz2



From spot at fedoraproject.org  Tue Sep 23 14:54:46 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 23 Sep 2008 14:54:46 +0000 (UTC)
Subject: rpms/lincity-ng/devel .cvsignore, 1.7, 1.8 lincity-ng.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <20080923145446.392F170033@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31749/devel

Modified Files:
	.cvsignore lincity-ng.spec sources 
Log Message:
update to 1.92.beta


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Feb 2008 21:11:14 -0000	1.7
+++ .cvsignore	23 Sep 2008 14:54:16 -0000	1.8
@@ -1 +1 @@
-lincity-ng-1.91.beta.tar.bz2
+lincity-ng-1.92.beta.tar.bz2


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/lincity-ng.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- lincity-ng.spec	20 Feb 2008 01:20:33 -0000	1.14
+++ lincity-ng.spec	23 Sep 2008 14:54:16 -0000	1.15
@@ -1,12 +1,11 @@
 Name:		lincity-ng
-Version:	1.91
-Release:	0.2.beta%{?dist}
+Version:	1.92
+Release:	0.1.beta%{?dist}
 License:	GPLv2+
 Group:		Amusements/Games
 Summary:	City Simulation Game
 URL:		http://lincity-ng.berlios.de/
 Source0:	http://download.berlios.de/lincity-ng/lincity-ng-%{version}.beta.tar.bz2
-Patch0:		lincity-ng-1.91.beta-gcc43.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	jam, physfs-devel, zlib-devel, libxml2-devel
 BuildRequires:	SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_gfx-devel
@@ -32,9 +31,9 @@
 
 %prep
 %setup -q -n %{name}-%{version}.beta
-%patch0 -p1
 sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules
 sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules
+sed -i "s|lincity-ng.png|lincity-ng|g' lincity-ng.desktop
 
 %build
 %configure
@@ -66,6 +65,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Tue Sep 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.92-0.1.beta
+- update to 1.92.beta
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.91-0.2.beta
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Feb 2008 21:11:14 -0000	1.7
+++ sources	23 Sep 2008 14:54:16 -0000	1.8
@@ -1 +1 @@
-c0a6983aefcd394e6a0c0ec58a6f7815  lincity-ng-1.91.beta.tar.bz2
+ef8434c1902352d864420e7b4962f06b  lincity-ng-1.92.beta.tar.bz2



From spot at fedoraproject.org  Tue Sep 23 14:54:46 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 23 Sep 2008 14:54:46 +0000 (UTC)
Subject: rpms/lincity-ng/F-9 lincity-ng.spec,1.14,1.15 sources,1.7,1.8
Message-ID: <20080923145446.1519770033@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31749/F-9

Modified Files:
	lincity-ng.spec sources 
Log Message:
update to 1.92.beta


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/F-9/lincity-ng.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- lincity-ng.spec	20 Feb 2008 01:20:33 -0000	1.14
+++ lincity-ng.spec	23 Sep 2008 14:54:15 -0000	1.15
@@ -1,12 +1,11 @@
 Name:		lincity-ng
-Version:	1.91
-Release:	0.2.beta%{?dist}
+Version:	1.92
+Release:	0.1.beta%{?dist}
 License:	GPLv2+
 Group:		Amusements/Games
 Summary:	City Simulation Game
 URL:		http://lincity-ng.berlios.de/
 Source0:	http://download.berlios.de/lincity-ng/lincity-ng-%{version}.beta.tar.bz2
-Patch0:		lincity-ng-1.91.beta-gcc43.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	jam, physfs-devel, zlib-devel, libxml2-devel
 BuildRequires:	SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_gfx-devel
@@ -32,9 +31,9 @@
 
 %prep
 %setup -q -n %{name}-%{version}.beta
-%patch0 -p1
 sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules
 sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules
+sed -i "s|lincity-ng.png|lincity-ng|g' lincity-ng.desktop
 
 %build
 %configure
@@ -66,6 +65,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Tue Sep 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.92-0.1.beta
+- update to 1.92.beta
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.91-0.2.beta
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Feb 2008 21:11:14 -0000	1.7
+++ sources	23 Sep 2008 14:54:15 -0000	1.8
@@ -1 +1 @@
-c0a6983aefcd394e6a0c0ec58a6f7815  lincity-ng-1.91.beta.tar.bz2
+ef8434c1902352d864420e7b4962f06b  lincity-ng-1.92.beta.tar.bz2



From ausil at fedoraproject.org  Tue Sep 23 14:55:59 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 23 Sep 2008 14:55:59 +0000 (UTC)
Subject: rpms/ctemplate/devel ctemplate.spec,1.1,1.2
Message-ID: <20080923145559.56C0370033@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ctemplate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31871

Modified Files:
	ctemplate.spec 
Log Message:
clean up headers



Index: ctemplate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/devel/ctemplate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ctemplate.spec	6 Sep 2008 07:10:33 -0000	1.1
+++ ctemplate.spec	23 Sep 2008 14:55:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ctemplate
 Version:        0.91
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A simple but powerful template language for C++
 
 Group:          Development/Tools
@@ -50,6 +50,7 @@
 
 mkdir -p $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 {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
@@ -87,6 +88,9 @@
 %{_includedir}/%{name}/*.h
 
 %changelog
+* Tue Sep 23 2008 Dennis Gilmore <dennis at ausil.us> - 0.91-3
+- clean up headers so that they include each other as intended
+
 * Wed Sep 03 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.91-2
 - Added %%check section to run tests
 



From mclasen at fedoraproject.org  Tue Sep 23 14:57:53 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 14:57:53 +0000 (UTC)
Subject: rpms/zenity/devel .cvsignore, 1.27, 1.28 sources, 1.27,
	1.28 zenity.spec, 1.47, 1.48
Message-ID: <20080923145753.A888670033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/zenity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32761

Modified Files:
	.cvsignore sources zenity.spec 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zenity/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	18 Jun 2008 04:38:57 -0000	1.27
+++ .cvsignore	23 Sep 2008 14:57:23 -0000	1.28
@@ -1 +1 @@
-zenity-2.23.3.1.tar.bz2
+zenity-2.24.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zenity/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	18 Jun 2008 04:38:57 -0000	1.27
+++ sources	23 Sep 2008 14:57:23 -0000	1.28
@@ -1 +1 @@
-2d121835bc269bb7edbc32cfa162665f  zenity-2.23.3.1.tar.bz2
+aa4486482210856848fa7d6634fc126a  zenity-2.24.0.tar.bz2


Index: zenity.spec
===================================================================
RCS file: /cvs/extras/rpms/zenity/devel/zenity.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- zenity.spec	18 Jun 2008 04:38:57 -0000	1.47
+++ zenity.spec	23 Sep 2008 14:57:23 -0000	1.48
@@ -1,11 +1,11 @@
 Name:		zenity
-Version:	2.23.3.1
+Version:	2.24.0
 Release:	1%{?dist}
 Summary:	Display dialog boxes from shell scripts
 Group:		Applications/System
 License:	LGPLv2+
 URL:		http://directory.fsf.org/zenity.html
-Source:		http://download.gnome.org/sources/zenity/2.23/zenity-%{version}.tar.bz2
+Source:		http://download.gnome.org/sources/zenity/2.24/zenity-%{version}.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Wed Jun 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.3.1-1
 - Update to 2.23.3.1
 



From mclasen at fedoraproject.org  Tue Sep 23 15:00:30 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 15:00:30 +0000 (UTC)
Subject: rpms/gok/devel .cvsignore, 1.30, 1.31 gok.spec, 1.60, 1.61 sources, 
	1.30, 1.31
Message-ID: <20080923150030.D887870033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1024

Modified Files:
	.cvsignore gok.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	2 Sep 2008 22:25:39 -0000	1.30
+++ .cvsignore	23 Sep 2008 15:00:00 -0000	1.31
@@ -1 +1 @@
-gok-2.23.91.tar.bz2
+gok-2.24.0.tar.bz2


Index: gok.spec
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/gok.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- gok.spec	2 Sep 2008 22:25:39 -0000	1.60
+++ gok.spec	23 Sep 2008 15:00:00 -0000	1.61
@@ -2,12 +2,12 @@
 
 Summary: GNOME Onscreen Keyboard
 Name: gok
-Version: 2.23.91
+Version: 2.24.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
 URL: http://www.gok.ca/
-Source0: http://download.gnome.org/sources/gok/2.23/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gok/2.24/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Patch0: gok-0.10.2-launcher.patch
 
@@ -123,6 +123,9 @@
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	2 Sep 2008 22:25:39 -0000	1.30
+++ sources	23 Sep 2008 15:00:00 -0000	1.31
@@ -1 +1 @@
-b67f4df192bb41965ce0bc6413064512  gok-2.23.91.tar.bz2
+3fff3dee0d673eef32ab149d4a0a480e  gok-2.24.0.tar.bz2



From limb at fedoraproject.org  Tue Sep 23 15:02:15 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 23 Sep 2008 15:02:15 +0000 (UTC)
Subject: rpms/wesnoth/F-9 sources,1.27,1.28 wesnoth.spec,1.53,1.54
Message-ID: <20080923150215.A9D1770033@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/wesnoth/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1535

Modified Files:
	sources wesnoth.spec 
Log Message:
BZ 463444.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/F-9/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	22 Aug 2008 16:02:03 -0000	1.27
+++ sources	23 Sep 2008 15:01:45 -0000	1.28
@@ -1 +1 @@
-b2260808e94eba12aa7ceaa40fa0ee4d  wesnoth-1.4.4.tar.bz2
+09b7b76d4a4eedf502f38df9d551d827  wesnoth-1.4.5.tar.bz2


Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/F-9/wesnoth.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- wesnoth.spec	22 Aug 2008 16:02:03 -0000	1.53
+++ wesnoth.spec	23 Sep 2008 15:01:45 -0000	1.54
@@ -1,6 +1,6 @@
 %define _default_patch_fuzz 2
 Name:           wesnoth
-Version:        1.4.4
+Version:        1.4.5
 Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
@@ -201,6 +201,9 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Tue Sep 09 2008 Jon Ciesla <limb at jcomserv.net> - 1.4.5-1
+- New upstream release.
+
 * Tue Aug 12 2008 Jon Ciesla <limb at jcomserv.net> - 1.4.4-1
 - New upstream release.
 - Introduced patch fuzz workaround, will fix.



From mclasen at fedoraproject.org  Tue Sep 23 15:04:58 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 15:04:58 +0000 (UTC)
Subject: rpms/gnome-backgrounds/devel .cvsignore, 1.14,
	1.15 gnome-backgrounds.spec, 1.20, 1.21 sources, 1.14, 1.15
Message-ID: <20080923150458.DD50370033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2280

Modified Files:
	.cvsignore gnome-backgrounds.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	8 Sep 2008 23:20:21 -0000	1.14
+++ .cvsignore	23 Sep 2008 15:04:28 -0000	1.15
@@ -1 +1 @@
-gnome-backgrounds-2.23.92.tar.bz2
+gnome-backgrounds-2.24.0.tar.bz2


Index: gnome-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/gnome-backgrounds.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnome-backgrounds.spec	8 Sep 2008 23:20:21 -0000	1.20
+++ gnome-backgrounds.spec	23 Sep 2008 15:04:28 -0000	1.21
@@ -1,11 +1,11 @@
 Summary: Desktop backgrounds packaged with the GNOME desktop
 Name: gnome-backgrounds
-Version: 2.23.92
+Version: 2.24.0
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-backgrounds/2.23/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-backgrounds/2.24/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: intltool
@@ -51,6 +51,9 @@
 %{_datadir}/backgrounds/*
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	8 Sep 2008 23:20:21 -0000	1.14
+++ sources	23 Sep 2008 15:04:28 -0000	1.15
@@ -1 +1 @@
-c532820d4cabb5d2ba3406a18c70287d  gnome-backgrounds-2.23.92.tar.bz2
+fb84a0b2e63dd0aaa47d490d2a43209f  gnome-backgrounds-2.24.0.tar.bz2



From kwizart at fedoraproject.org  Tue Sep 23 15:06:32 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Tue, 23 Sep 2008 15:06:32 +0000 (UTC)
Subject: rpms/filezilla/devel sources, 1.19, 1.20 .cvsignore, 1.15,
	1.16 filezilla.spec, 1.20, 1.21
Message-ID: <20080923150632.75D5370033@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/filezilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2792

Modified Files:
	sources .cvsignore filezilla.spec 
Log Message:
- Update to 3.1.3



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	1 Sep 2008 10:59:59 -0000	1.19
+++ sources	23 Sep 2008 15:06:02 -0000	1.20
@@ -1 +1 @@
-3fbd78bf631ebc82ba981e5a75cab481  FileZilla_3.1.2_src.tar.bz2
+1f4dba6912441f478deac8c585203581  FileZilla_3.1.3_src.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	1 Sep 2008 10:59:59 -0000	1.15
+++ .cvsignore	23 Sep 2008 15:06:02 -0000	1.16
@@ -1 +1 @@
-FileZilla_3.1.2_src.tar.bz2
+FileZilla_3.1.3_src.tar.bz2


Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- filezilla.spec	1 Sep 2008 10:59:59 -0000	1.20
+++ filezilla.spec	23 Sep 2008 15:06:02 -0000	1.21
@@ -1,5 +1,5 @@
 Name:           filezilla
-Version:        3.1.2
+Version:        3.1.3
 Release:        1%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
@@ -117,6 +117,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 kwizart < kwizart at gmail.com > - 3.1.3-1
+- Update to 3.1.3
+
 * Mon Sep  1 2008 kwizart < kwizart at gmail.com > - 3.1.2-1
 - Update to 3.1.2
 



From mbroz at fedoraproject.org  Tue Sep 23 15:09:17 2008
From: mbroz at fedoraproject.org (Milan Broz)
Date: Tue, 23 Sep 2008 15:09:17 +0000 (UTC)
Subject: rpms/cryptsetup-luks/devel cryptsetup-descriptive-errors.patch, NONE,
	1.1 cryptsetup-detect-dm.patch, NONE, 1.1 cryptsetup-luks.spec,
	1.61, 1.62 cryptsetup-remove-udev.patch, 1.1, 1.2
Message-ID: <20080923150917.340F070033@cvs1.fedora.phx.redhat.com>

Author: mbroz

Update of /cvs/pkgs/rpms/cryptsetup-luks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3465

Modified Files:
	cryptsetup-luks.spec cryptsetup-remove-udev.patch 
Added Files:
	cryptsetup-descriptive-errors.patch cryptsetup-detect-dm.patch 
Log Message:
- Change new project home page.
- Print more descriptive messages for initialization errors.
- Refresh patches to versions commited upstream.



cryptsetup-descriptive-errors.patch:

--- NEW FILE cryptsetup-descriptive-errors.patch ---
Do not replace error message for IO or format errors.

--- cryptsetup-1.0.6.old/lib/setup.c	2008-09-23 15:18:25.000000000 +0200
+++ cryptsetup-1.0.6/lib/setup.c	2008-09-23 15:25:45.000000000 +0200
@@ -484,13 +484,14 @@ start:
 	if(!password) {
 		r = -EINVAL; goto out;
 	}
-        
+
         r = LUKS_open_any_key(options->device, password, passwordLen, &hdr, &mk, backend);
-	if(r < 0) {
+	if (r == -EPERM)
 		set_error("No key available with this passphrase.\n");
+	if (r < 0)
 		goto out1;
-	} else
-                logger(options, CRYPT_LOG_NORMAL,"key slot %d unlocked.\n", r);
+
+	logger(options, CRYPT_LOG_NORMAL,"key slot %d unlocked.\n", r);
 
 	
 	options->offset = hdr.payloadOffset;

cryptsetup-detect-dm.patch:

--- NEW FILE cryptsetup-detect-dm.patch ---
Properly detect if device-mapper is loaded.

--- cryptsetup-1.0.6.old/lib/libdevmapper.c	2008-09-23 15:18:05.000000000 +0200
+++ cryptsetup-1.0.6/lib/libdevmapper.c	2008-09-23 15:18:25.000000000 +0200
@@ -32,9 +32,16 @@ static void set_dm_error(int level, cons
 	va_end(va);
 }
 
+static int _dm_simple(int task, const char *name);
+
 static int dm_init(void)
 {
 	dm_log_init(set_dm_error);
+	if (!_dm_simple(DM_DEVICE_LIST_VERSIONS, "test")) {
+		set_error("Cannot communicate with device-mapper. Is the dm_mod module loaded?");
+		return -1;
+	}
+
 	return 1;	/* unsafe memory */
 }
 
--- cryptsetup-1.0.6.old/lib/setup.c	2008-09-23 15:18:05.000000000 +0200
+++ cryptsetup-1.0.6/lib/setup.c	2008-09-23 15:18:25.000000000 +0200
@@ -695,7 +695,10 @@ static int crypt_job(int (*job)(int arg,
 
 	backend = get_setup_backend(default_backend);
 
-	setup_enter(backend,options->icb->log);
+	if (setup_enter(backend,options->icb->log) < 0) {
+		r = -ENOSYS;
+		goto out;
+	}
 
 	if (!backend) {
 		set_error("No setup backend available");


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- cryptsetup-luks.spec	7 Sep 2008 08:54:51 -0000	1.61
+++ cryptsetup-luks.spec	23 Sep 2008 15:08:46 -0000	1.62
@@ -3,20 +3,20 @@
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
 Version: 1.0.6
-Release: 4%{?devrelease:.%{devrelease}}%{?dist}
+Release: 5%{?devrelease:.%{devrelease}}%{?dist}
 License: GPLv2
 Group: Applications/System
-URL: http://luks.endorphin.org/
-Source: http://luks.endorphin.org/source/cryptsetup-%{version}%{?devrelease:-%{devrelease}}.tar.bz2
+URL: http://cryptsetup.googlecode.com/
+Source: http://cryptsetup.googlecode.com/files/cryptsetup-%{version}%{?devrelease:-%{devrelease}}.tar.bz2
 # 2008-04-15: sent to upstream via personal e-mail to Clemens Fruhwirth
 Patch0: cryptsetup-prompt.patch
 # 2008-05-28: sent to upstream via newsgroup:
 # http://permalink.gmane.org/gmane.linux.kernel.device-mapper.dm-crypt/2735
 Patch1: cryptsetup-luks-1.0.6-duplicate_sentence.patch
-# http://permalink.gmane.org/gmane.linux.kernel.device-mapper.dm-crypt/2803
 Patch2: cryptsetup-fix-fd.patch
-# http://permalink.gmane.org/gmane.linux.kernel.device-mapper.dm-crypt/2804
 Patch3: cryptsetup-remove-udev.patch
+Patch4: cryptsetup-detect-dm.patch
+Patch5: cryptsetup-descriptive-errors.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel
 BuildRequires: libgpg-error-devel, e2fsprogs-devel, libsepol-devel
@@ -48,6 +48,9 @@
 %patch1 -p1 -b .duplicate_sentence
 %patch2 -p1 -b .fd
 %patch3 -p1 -b .udev
+%patch4 -p1 -b .dm
+%patch5 -p1 -b .errors
+
 iconv -f latin1 -t utf8 ChangeLog > ChangeLog.new
 mv -f ChangeLog.new ChangeLog 
 
@@ -92,6 +95,11 @@
 
 
 %changelog
+* Sat Sep 23 2008 Milan Broz <mbroz at redhat.com> - 1.0.6-5
+- Change new project home page.
+- Print more descriptive messages for initialization errors.
+- Refresh patches to versions commited upstream.
+
 * Sat Sep 06 2008 Milan Broz <mbroz at redhat.com> - 1.0.6-4
 - Fix close of zero decriptor.
 - Fix udevsettle delays - use temporary crypt device remapping.

cryptsetup-remove-udev.patch:

Index: cryptsetup-remove-udev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/cryptsetup-remove-udev.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cryptsetup-remove-udev.patch	7 Sep 2008 08:54:51 -0000	1.1
+++ cryptsetup-remove-udev.patch	23 Sep 2008 15:08:46 -0000	1.2
@@ -1,7 +1,7 @@
 Replace udevsettle with remmaping to error target.
 
 --- cryptsetup-1.0.6.old/lib/internal.h	2007-10-25 09:11:19.000000000 +0200
-+++ cryptsetup-1.0.6/lib/internal.h	2008-09-06 14:27:41.000000000 +0200
++++ cryptsetup-1.0.6/lib/internal.h	2008-09-23 15:15:19.000000000 +0200
 @@ -40,7 +40,7 @@ struct setup_backend {
  			          const char *key);
  	int		(*status)(int details, struct crypt_options *options,
@@ -12,7 +12,7 @@
  	const char *	(*dir)(void);
  };
 --- cryptsetup-1.0.6.old/lib/libdevmapper.c	2007-10-25 09:11:19.000000000 +0200
-+++ cryptsetup-1.0.6/lib/libdevmapper.c	2008-09-06 14:28:56.000000000 +0200
++++ cryptsetup-1.0.6/lib/libdevmapper.c	2008-09-23 15:15:19.000000000 +0200
 @@ -17,13 +17,7 @@
  #define DEVICE_DIR	"/dev"
  
@@ -24,7 +24,7 @@
 -{
 -	system(UDEVSETTLE);
 -}
-+#define RETRY_COUNT	5
++#define	RETRY_COUNT	5
  
  static void set_dm_error(int level, const char *file, int line,
                           const char *f, ...)
@@ -200,8 +200,8 @@
  }
  
  
---- cryptsetup-1.0.6.old/lib/setup.c	2008-09-06 14:20:24.000000000 +0200
-+++ cryptsetup-1.0.6/lib/setup.c	2008-09-06 14:27:41.000000000 +0200
+--- cryptsetup-1.0.6.old/lib/setup.c	2008-09-23 15:14:34.000000000 +0200
++++ cryptsetup-1.0.6/lib/setup.c	2008-09-23 15:15:19.000000000 +0200
 @@ -369,7 +369,7 @@ static int __crypt_remove_device(int arg
  		return -EBUSY;
  	}
@@ -211,83 +211,79 @@
  }
  
  static int __crypt_luks_format(int arg, struct setup_backend *backend, struct crypt_options *options)
---- cryptsetup-1.0.6.old/luks/keyencryption.c	2008-09-06 14:24:21.000000000 +0200
-+++ cryptsetup-1.0.6/luks/keyencryption.c	2008-09-06 14:27:41.000000000 +0200
-@@ -50,10 +50,8 @@ static int setup_mapping(const char *cip
+--- cryptsetup-1.0.6.old/luks/keyencryption.c	2008-09-23 15:14:34.000000000 +0200
++++ cryptsetup-1.0.6/luks/keyencryption.c	2008-09-23 15:15:19.000000000 +0200
+@@ -45,6 +45,11 @@ static inline int round_up_modulo(int x,
+ 	return div_round_up(x, m) * m;
+ }
+ 
++static struct setup_backend *cleaner_backend=NULL;
++static const char *cleaner_name=NULL;
++static uint64_t cleaner_size = 0;
++static int devfd=-1;
++
+ static int setup_mapping(const char *cipher, const char *name, 
+ 			 const char *device, unsigned int payloadOffset,
  			 const char *key, size_t keyLength, 
- 			 unsigned int sector, size_t srcLength, 
+@@ -52,7 +57,7 @@ static int setup_mapping(const char *cip
  			 struct setup_backend *backend,
--			 int mode)
-+			 int mode, struct crypt_options *options)
+ 			 int mode)
  {
 -	struct crypt_options k;
--	struct crypt_options *options = &k;
++	struct crypt_options k = {0};
+ 	struct crypt_options *options = &k;
  	int device_sector_size = sector_size_for_device(device);
  	int r;
+@@ -66,6 +71,7 @@ static int setup_mapping(const char *cip
+ 		return -EINVAL;
+ 	}
+ 	options->size = round_up_modulo(srcLength,device_sector_size)/SECTOR_SIZE;
++	cleaner_size = options->size;
  
-@@ -87,16 +85,14 @@ static int setup_mapping(const char *cip
+ 	options->offset = sector;
+ 	options->cipher = cipher;
+@@ -87,25 +93,21 @@ static int setup_mapping(const char *cip
  	return r;
  }
  
 -static int clear_mapping(const char *name, struct setup_backend *backend)
-+static int clear_mapping(struct crypt_options *options, struct setup_backend *backend)
++static int clear_mapping(const char *name, uint64_t size, struct setup_backend *backend)
  {
 -	struct crypt_options options;
--	options.name=name;
++	struct crypt_options options = {0};
+ 	options.name=name;
 -	return backend->remove(&options);
-+	return backend->remove(1, options);
++	options.size = size;
++	return backend->remove(1, &options);
  }
  
- /* I miss closures in C! */
- static struct setup_backend *cleaner_backend=NULL;
+-/* I miss closures in C! */
+-static struct setup_backend *cleaner_backend=NULL;
 -static const char *cleaner_name=NULL; 
-+static struct crypt_options *cleaner_options = NULL;
- static int devfd=-1;
- 
+-static int devfd=-1;
+-
  static void sigint_handler(int sig)
-@@ -104,8 +100,8 @@ static void sigint_handler(int sig)
+ {
          if(devfd >= 0)
                  close(devfd);
          devfd = -1;
--        if(cleaner_backend && cleaner_name) 
+         if(cleaner_backend && cleaner_name) 
 -                clear_mapping(cleaner_name, cleaner_backend);
-+        if(cleaner_backend && cleaner_options)
-+                clear_mapping(cleaner_options, cleaner_backend);
++                clear_mapping(cleaner_name, cleaner_size, cleaner_backend);
          signal(SIGINT, SIG_DFL);
          kill(getpid(), SIGINT);
  }
-@@ -120,6 +116,7 @@ static int LUKS_endec_template(char *src
- 			       ssize_t (*func)(int, void *, size_t),
- 			       int mode)
- {
-+	struct crypt_options options = {0};
- 	char *name = NULL;
- 	char *fullpath = NULL;
- 	char *dmCipherSpec = NULL;
-@@ -138,10 +135,11 @@ static int LUKS_endec_template(char *src
-         }
- 	
- 	signal(SIGINT, sigint_handler);
--	cleaner_name = name;
-+	options.name = name;
-+	cleaner_options = &options;
- 	cleaner_backend = backend;
- 
--	r = setup_mapping(dmCipherSpec,name,device,hdr->payloadOffset,key,keyLength,sector,srcLength,backend,mode);
-+	r = setup_mapping(dmCipherSpec,name,device,hdr->payloadOffset,key,keyLength,sector,srcLength,backend,mode,&options);
- 	if(r < 0) {
- 		if(!get_error())
- 			set_error("Failed to setup dm-crypt key mapping.\nCheck kernel for support for the %s cipher spec and verify that %s contains at least %d sectors",
-@@ -163,10 +161,10 @@ static int LUKS_endec_template(char *src
+@@ -163,11 +165,12 @@ static int LUKS_endec_template(char *src
  	close(devfd);
  	devfd = -1;
   out2:
 -	clear_mapping(name,backend);
-+	clear_mapping(&options,backend);
++	clear_mapping(cleaner_name, cleaner_size, cleaner_backend);
   out1:
  	signal(SIGINT, SIG_DFL);
--	cleaner_name = NULL;
-+	cleaner_options = NULL;
+ 	cleaner_name = NULL;
  	cleaner_backend = NULL;
++	cleaner_size = 0;
  	free(dmCipherSpec);
  	free(fullpath); 
+ 	free(name); 



From mclasen at fedoraproject.org  Tue Sep 23 15:10:01 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 15:10:01 +0000 (UTC)
Subject: rpms/gconf-editor/devel .cvsignore, 1.27, 1.28 gconf-editor.spec,
	1.58, 1.59 sources, 1.27, 1.28
Message-ID: <20080923151001.5887170033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gconf-editor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3648

Modified Files:
	.cvsignore gconf-editor.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	3 Sep 2008 00:52:13 -0000	1.27
+++ .cvsignore	23 Sep 2008 15:09:30 -0000	1.28
@@ -1 +1 @@
-gconf-editor-2.23.91.tar.bz2
+gconf-editor-2.24.0.tar.bz2


Index: gconf-editor.spec
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gconf-editor.spec	3 Sep 2008 02:06:54 -0000	1.58
+++ gconf-editor.spec	23 Sep 2008 15:09:31 -0000	1.59
@@ -7,10 +7,10 @@
 
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
-Version: 2.23.91
+Version: 2.24.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gconf-editor/2.22/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gconf-editor/2.24/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -104,6 +104,9 @@
 %dir %{_datadir}/omf/gconf-editor
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	3 Sep 2008 00:52:13 -0000	1.27
+++ sources	23 Sep 2008 15:09:31 -0000	1.28
@@ -1 +1 @@
-61e4e284c8f73d24858195800a6c61fe  gconf-editor-2.23.91.tar.bz2
+845321d47b34f6ae19ac7e930c454e3d  gconf-editor-2.24.0.tar.bz2



From ausil at fedoraproject.org  Tue Sep 23 15:12:18 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 23 Sep 2008 15:12:18 +0000 (UTC)
Subject: rpms/ctemplate/F-9 ctemplate.spec,1.1,1.2
Message-ID: <20080923151218.90B2B70033@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ctemplate/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4334

Modified Files:
	ctemplate.spec 
Log Message:
cleanup headers so they include themselves correctly 



Index: ctemplate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/F-9/ctemplate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ctemplate.spec	6 Sep 2008 07:16:40 -0000	1.1
+++ ctemplate.spec	23 Sep 2008 15:11:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ctemplate
 Version:        0.91
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A simple but powerful template language for C++
 
 Group:          Development/Tools
@@ -50,6 +50,7 @@
 
 mkdir -p $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 {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
@@ -87,6 +88,9 @@
 %{_includedir}/%{name}/*.h
 
 %changelog
+* Tue Sep 23 2008 Dennis Gilmore <dennis at ausil.us> - 0.91-3
+- clean up headers so that they include each other as intended
+
 * Wed Sep 03 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.91-2
 - Added %%check section to run tests
 



From ausil at fedoraproject.org  Tue Sep 23 15:14:40 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 23 Sep 2008 15:14:40 +0000 (UTC)
Subject: rpms/ctemplate/F-8 ctemplate.spec,1.1,1.2
Message-ID: <20080923151440.736AF70033@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ctemplate/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5012

Modified Files:
	ctemplate.spec 
Log Message:
clean up headers so they include themselves propperlly



Index: ctemplate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/F-8/ctemplate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ctemplate.spec	6 Sep 2008 07:13:22 -0000	1.1
+++ ctemplate.spec	23 Sep 2008 15:14:10 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ctemplate
 Version:        0.91
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A simple but powerful template language for C++
 
 Group:          Development/Tools
@@ -50,6 +50,7 @@
 
 mkdir -p $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 {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
@@ -87,6 +88,9 @@
 %{_includedir}/%{name}/*.h
 
 %changelog
+* Tue Sep 23 2008 Dennis Gilmore <dennis at ausil.us> - 0.91-3
+- clean up headers so that they include each other as intended
+
 * Wed Sep 03 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.91-2
 - Added %%check section to run tests
 



From dwalsh at fedoraproject.org  Tue Sep 23 15:15:23 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 23 Sep 2008 15:15:23 +0000 (UTC)
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.710,1.711
Message-ID: <20080923151523.F1C0070033@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5336

Modified Files:
	selinux-policy.spec 
Log Message:
* Mon Sep 22 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-6
- Fix transition to nsplugin



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.710
retrieving revision 1.711
diff -u -r1.710 -r1.711
--- selinux-policy.spec	22 Sep 2008 20:07:59 -0000	1.710
+++ selinux-policy.spec	23 Sep 2008 15:14:53 -0000	1.711
@@ -130,6 +130,7 @@
 %dir %{_sysconfdir}/selinux/%1/contexts/users \
 %config(noreplace) %{_sysconfdir}/selinux/%1/contexts/users/root \
 %config(noreplace) %{_sysconfdir}/selinux/%1/contexts/users/guest_u \
+%config(noreplace) %{_sysconfdir}/selinux/%1/contexts/users/xguest_u \
 %config(noreplace) %{_sysconfdir}/selinux/%1/contexts/users/user_u \
 %config(noreplace) %{_sysconfdir}/selinux/%1/contexts/users/staff_u 
 
@@ -317,7 +318,6 @@
 
 %files targeted
 %config(noreplace) %{_sysconfdir}/selinux/targeted/contexts/users/unconfined_u
-%config(noreplace) %{_sysconfdir}/selinux/targeted/contexts/users/xguest_u
 %fileList targeted
 %endif
 



From mbroz at fedoraproject.org  Tue Sep 23 15:23:48 2008
From: mbroz at fedoraproject.org (Milan Broz)
Date: Tue, 23 Sep 2008 15:23:48 +0000 (UTC)
Subject: rpms/cryptsetup-luks/devel cryptsetup-luks.spec,1.62,1.63
Message-ID: <20080923152348.DFAB670033@cvs1.fedora.phx.redhat.com>

Author: mbroz

Update of /cvs/pkgs/rpms/cryptsetup-luks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7338

Modified Files:
	cryptsetup-luks.spec 
Log Message:
Fix typo in spec.




Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- cryptsetup-luks.spec	23 Sep 2008 15:08:46 -0000	1.62
+++ cryptsetup-luks.spec	23 Sep 2008 15:23:18 -0000	1.63
@@ -95,7 +95,7 @@
 
 
 %changelog
-* Sat Sep 23 2008 Milan Broz <mbroz at redhat.com> - 1.0.6-5
+* Tue Sep 23 2008 Milan Broz <mbroz at redhat.com> - 1.0.6-5
 - Change new project home page.
 - Print more descriptive messages for initialization errors.
 - Refresh patches to versions commited upstream.



From mathstuf at fedoraproject.org  Tue Sep 23 15:24:48 2008
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 23 Sep 2008 15:24:48 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.112, 1.113 comps-f8.xml.in, 1.263,
	1.264 comps-f9.xml.in, 1.390, 1.391
Message-ID: <20080923152448.0A97870033@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7474

Modified Files:
	comps-f10.xml.in comps-f8.xml.in comps-f9.xml.in 
Log Message:
- Added krazy2



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- comps-f10.xml.in	23 Sep 2008 08:05:10 -0000	1.112
+++ comps-f10.xml.in	23 Sep 2008 15:24:17 -0000	1.113
@@ -2920,6 +2920,7 @@
       <packagereq type="optional">kdepim-devel</packagereq>
       <packagereq type="optional">kdesvn</packagereq>
       <packagereq type="optional">kdewebdev-devel</packagereq>
+      <packagereq type="optional">krazy2</packagereq>
       <packagereq type="optional">PyKDE-devel</packagereq>
       <packagereq type="optional">PyQt-devel</packagereq>
     </packagelist>


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- comps-f8.xml.in	31 Aug 2008 13:24:45 -0000	1.263
+++ comps-f8.xml.in	23 Sep 2008 15:24:17 -0000	1.264
@@ -2604,6 +2604,7 @@
       <packagereq type="optional">gambas</packagereq>
       <packagereq type="optional">kdesdk-devel</packagereq>
       <packagereq type="optional">kdesvn</packagereq>
+      <packagereq type="optional">krazy2</packagereq>
       <packagereq type="optional">PyKDE-devel</packagereq>
       <packagereq type="optional">qt4-devel</packagereq>
     </packagelist>


Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- comps-f9.xml.in	22 Sep 2008 21:28:38 -0000	1.390
+++ comps-f9.xml.in	23 Sep 2008 15:24:17 -0000	1.391
@@ -2696,6 +2696,7 @@
       <packagereq type="optional">kdepim-devel</packagereq>
       <packagereq type="optional">kdesvn</packagereq>
       <packagereq type="optional">kdewebdev-devel</packagereq>
+      <packagereq type="optional">krazy2</packagereq>
       <packagereq type="optional">PyKDE-devel</packagereq>
       <packagereq type="optional">PyQt-devel</packagereq>
     </packagelist>



From mclasen at fedoraproject.org  Tue Sep 23 15:26:21 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 15:26:21 +0000 (UTC)
Subject: rpms/gconf-editor/devel gconf-editor.spec,1.59,1.60
Message-ID: <20080923152621.C5A9F70033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gconf-editor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7880

Modified Files:
	gconf-editor.spec 
Log Message:
fix file list



Index: gconf-editor.spec
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- gconf-editor.spec	23 Sep 2008 15:09:31 -0000	1.59
+++ gconf-editor.spec	23 Sep 2008 15:25:51 -0000	1.60
@@ -8,7 +8,7 @@
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
 Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gconf-editor/2.24/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL
@@ -94,7 +94,8 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING NEWS README
+%doc AUTHORS NEWS README 
+# 2.24.0 lost COPYING 
 %{_bindir}/gconf-editor
 %{_datadir}/icons/hicolor/*/apps/gconf-editor.png
 %{_datadir}/gconf-editor
@@ -104,7 +105,7 @@
 %dir %{_datadir}/omf/gconf-editor
 
 %changelog
-* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-2
 - Update to 2.24.0
 
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1



From spot at fedoraproject.org  Tue Sep 23 15:28:34 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 23 Sep 2008 15:28:34 +0000 (UTC)
Subject: rpms/lincity-ng/devel lincity-ng.spec,1.15,1.16
Message-ID: <20080923152834.0412470103@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8677/devel

Modified Files:
	lincity-ng.spec 
Log Message:
fix typo in spec file


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/lincity-ng.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- lincity-ng.spec	23 Sep 2008 14:54:16 -0000	1.15
+++ lincity-ng.spec	23 Sep 2008 15:28:03 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		lincity-ng
 Version:	1.92
-Release:	0.1.beta%{?dist}
+Release:	0.2.beta%{?dist}
 License:	GPLv2+
 Group:		Amusements/Games
 Summary:	City Simulation Game
@@ -33,7 +33,7 @@
 %setup -q -n %{name}-%{version}.beta
 sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules
 sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules
-sed -i "s|lincity-ng.png|lincity-ng|g' lincity-ng.desktop
+sed -i 's|lincity-ng.png|lincity-ng|g' lincity-ng.desktop
 
 %build
 %configure
@@ -65,6 +65,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Tue Sep 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.92-0.2.beta
+- fix typo in spec file
+
 * Tue Sep 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.92-0.1.beta
 - update to 1.92.beta
 



From spot at fedoraproject.org  Tue Sep 23 15:28:33 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 23 Sep 2008 15:28:33 +0000 (UTC)
Subject: rpms/lincity-ng/F-9 lincity-ng.spec,1.15,1.16
Message-ID: <20080923152833.DC63370033@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8677/F-9

Modified Files:
	lincity-ng.spec 
Log Message:
fix typo in spec file


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/F-9/lincity-ng.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- lincity-ng.spec	23 Sep 2008 14:54:15 -0000	1.15
+++ lincity-ng.spec	23 Sep 2008 15:28:03 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		lincity-ng
 Version:	1.92
-Release:	0.1.beta%{?dist}
+Release:	0.2.beta%{?dist}
 License:	GPLv2+
 Group:		Amusements/Games
 Summary:	City Simulation Game
@@ -33,7 +33,7 @@
 %setup -q -n %{name}-%{version}.beta
 sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules
 sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules
-sed -i "s|lincity-ng.png|lincity-ng|g' lincity-ng.desktop
+sed -i 's|lincity-ng.png|lincity-ng|g' lincity-ng.desktop
 
 %build
 %configure
@@ -65,6 +65,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Tue Sep 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.92-0.2.beta
+- fix typo in spec file
+
 * Tue Sep 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.92-0.1.beta
 - update to 1.92.beta
 



From pghmcfc at fedoraproject.org  Tue Sep 23 15:38:05 2008
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 23 Sep 2008 15:38:05 +0000 (UTC)
Subject: rpms/imlib/devel imlib.spec,1.13,1.14
Message-ID: <20080923153805.176F170033@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/imlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11149

Modified Files:
	imlib.spec 
Log Message:
* Tue Sep 23 2008 Paul Howarth <paul at city-fan.org> 1:1.9.15-9
- specify Instruction Set Architecture (%{?_isa}) in devel package requires
  (where available)



Index: imlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/devel/imlib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- imlib.spec	29 Aug 2008 17:03:13 -0000	1.13
+++ imlib.spec	23 Sep 2008 15:37:34 -0000	1.14
@@ -3,7 +3,7 @@
 Summary:	An image loading and rendering library for X11R6
 Name:		imlib
 Version:	1.9.15
-Release:	8%{?dist}
+Release:	9%{?dist}
 Epoch:		1
 License:	LGPLv2+
 Group:		System Environment/Libraries
@@ -20,13 +20,14 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires:	automake
 BuildRequires:	giflib-devel
+BuildRequires:	glib-devel%{?_isa}
 BuildRequires:	gtk+-devel
-BuildRequires:	libpng-devel >= 1.2.2
+BuildRequires:	libpng-devel%{?_isa} >= 1.2.2
 BuildRequires:	libjpeg-devel
-BuildRequires:	libtiff-devel
+BuildRequires:	libtiff-devel%{?_isa}
 BuildRequires:	libtool
-BuildRequires:	libX11-devel
-BuildRequires:	libXt-devel
+BuildRequires:	libX11-devel%{?_isa}
+BuildRequires:	libXt-devel%{?_isa}
 BuildRequires:	zlib-devel
 Obsoletes:	imlib-cfgeditor <= %{version}-%{release}, Imlib <= %{version}-%{release}
 Provides:	imlib-cfgeditor = %{version}-%{release}, Imlib = %{version}-%{release}
@@ -47,8 +48,8 @@
 %package devel
 Summary:	Development tools for Imlib applications
 Group:		Development/Libraries
-Requires:	imlib = %{epoch}:%{version}-%{release}
-Requires:	giflib-devel, gtk+-devel, libjpeg-devel, libtiff-devel
+Requires:	imlib%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:	giflib-devel, glib-devel%{?_isa}, gtk+-devel, libjpeg-devel, libtiff-devel
 Requires:	libX11-devel, zlib-devel
 Requires:	%{_datadir}/aclocal, pkgconfig
 
@@ -151,6 +152,10 @@
 %{_mandir}/man1/imlib-config.1*
 
 %changelog
+* Tue Sep 23 2008 Paul Howarth <paul at city-fan.org> 1:1.9.15-9
+- specify Instruction Set Architecture (%%{?_isa}) in devel package requires
+  (where available)
+
 * Fri Aug 29 2008 Paul Howarth <paul at city-fan.org> 1:1.9.15-8
 - fix patches to apply without fuzz
 



From mclasen at fedoraproject.org  Tue Sep 23 15:40:16 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 15:40:16 +0000 (UTC)
Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.61,
	1.62 gnome-icon-theme.spec, 1.94, 1.95 sources, 1.64, 1.65
Message-ID: <20080923154016.698A170033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11436

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	9 Sep 2008 03:17:53 -0000	1.61
+++ .cvsignore	23 Sep 2008 15:39:46 -0000	1.62
@@ -1 +1 @@
-gnome-icon-theme-2.23.92.tar.bz2
+gnome-icon-theme-2.24.0.tar.bz2


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- gnome-icon-theme.spec	9 Sep 2008 03:17:53 -0000	1.94
+++ gnome-icon-theme.spec	23 Sep 2008 15:39:46 -0000	1.95
@@ -1,8 +1,8 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
-Version: 2.23.92
+Version: 2.24.0
 Release: 1%{?dist}
-Source0: http://download.gnome.org/sources/gnome-icon-theme/2.23/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-icon-theme/2.24/%{name}-%{version}.tar.bz2
 Source1: gnome-icon-theme-extra-device-icons-4.tar.bz2
 Source2: legacy-icon-mapping.xml
 License: GPL+
@@ -100,6 +100,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	9 Sep 2008 03:17:53 -0000	1.64
+++ sources	23 Sep 2008 15:39:46 -0000	1.65
@@ -1,3 +1,3 @@
-54d049c8ff7305571a33bbe50d903345  gnome-icon-theme-2.23.92.tar.bz2
+17ba571e5dd83434dc5b2b06ada7b56e  gnome-icon-theme-2.24.0.tar.bz2
 881e28a01badeead87578edd2d1bbc1c  gnome-icon-theme-extra-device-icons-4.tar.bz2
 



From mclasen at fedoraproject.org  Tue Sep 23 15:49:13 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 15:49:13 +0000 (UTC)
Subject: rpms/libgtop2/devel .cvsignore, 1.46, 1.47 libgtop2.spec, 1.66,
	1.67 sources, 1.46, 1.47
Message-ID: <20080923154913.CF4E67013D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgtop2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13569

Modified Files:
	.cvsignore libgtop2.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgtop2/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	22 Aug 2008 23:46:46 -0000	1.46
+++ .cvsignore	23 Sep 2008 15:48:43 -0000	1.47
@@ -1 +1 @@
-libgtop-2.23.90.tar.bz2
+libgtop-2.24.0.tar.bz2


Index: libgtop2.spec
===================================================================
RCS file: /cvs/extras/rpms/libgtop2/devel/libgtop2.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- libgtop2.spec	22 Aug 2008 23:46:46 -0000	1.66
+++ libgtop2.spec	23 Sep 2008 15:48:43 -0000	1.67
@@ -6,12 +6,12 @@
 
 Name:		libgtop2
 Summary:        libgtop library (version 2)
-Version: 	2.23.90
+Version: 	2.24.0
 Release: 	1%{?dist}
 License: 	GPLv2+
-URL:            http://download.gnome.org/sources/libgtop/2.23
+URL:            http://download.gnome.org/sources/libgtop/2.24
 Group:          System Environment/Libraries
-Source: 	http://download.gnome.org/sources/libgtop/2.23/libgtop-%{version}.tar.bz2
+Source: 	http://download.gnome.org/sources/libgtop/2.24/libgtop-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
 Requires:	glib2 >= %{glib2_version}
 BuildRequires:	glib2-devel >= %{glib2_version}
@@ -75,6 +75,9 @@
 %exclude %{_datadir}/info
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-1
 - Update to 2.23.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgtop2/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	22 Aug 2008 23:46:46 -0000	1.46
+++ sources	23 Sep 2008 15:48:43 -0000	1.47
@@ -1 +1 @@
-2796d6461fd4501387ac1609d0b08575  libgtop-2.23.90.tar.bz2
+f0e3584b9157d3425184a9e21e3ac482  libgtop-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 23 15:53:51 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 15:53:51 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel .cvsignore, 1.18,
	1.19 gnome-settings-daemon.spec, 1.57, 1.58 sources, 1.19, 1.20
Message-ID: <20080923155351.22DAA70033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15098

Modified Files:
	.cvsignore gnome-settings-daemon.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-settings-daemon/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	8 Sep 2008 16:34:05 -0000	1.18
+++ .cvsignore	23 Sep 2008 15:53:50 -0000	1.19
@@ -1 +1 @@
-gnome-settings-daemon-2.23.92.tar.bz2
+gnome-settings-daemon-2.24.0.tar.bz2


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gnome-settings-daemon.spec	19 Sep 2008 13:25:20 -0000	1.57
+++ gnome-settings-daemon.spec	23 Sep 2008 15:53:50 -0000	1.58
@@ -1,12 +1,12 @@
 Name:		gnome-settings-daemon
-Version:	2.23.92
-Release:	3%{?dist}
+Version:	2.24.0
+Release:	1%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
 License:	GPLv2+
 URL:		http://ftp.gnome.org/pub/gnome/sources/%{name}
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.23/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.24/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): GConf2 >= 2.14
@@ -159,6 +159,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Thu Sep 18 2008 Ray Strode <rstrode at redhat.com> - 2.23.92-3
 - When switching desktop backgrounds fade between them
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-settings-daemon/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	8 Sep 2008 16:34:05 -0000	1.19
+++ sources	23 Sep 2008 15:53:50 -0000	1.20
@@ -1 +1 @@
-6027af9d6792c61ebca2adc6e94473da  gnome-settings-daemon-2.23.92.tar.bz2
+2e30e9d17b810103d493e474fbfd20e5  gnome-settings-daemon-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 23 15:57:39 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 15:57:39 +0000 (UTC)
Subject: rpms/libgail-gnome/devel .cvsignore, 1.9, 1.10 libgail-gnome.spec, 
	1.29, 1.30 sources, 1.9, 1.10
Message-ID: <20080923155739.785CD70033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgail-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16045

Modified Files:
	.cvsignore libgail-gnome.spec sources 
Log Message:
1.20.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgail-gnome/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	17 Sep 2007 15:38:23 -0000	1.9
+++ .cvsignore	23 Sep 2008 15:57:09 -0000	1.10
@@ -1 +1 @@
-libgail-gnome-1.20.0.tar.bz2
+libgail-gnome-1.20.1.tar.bz2


Index: libgail-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/libgail-gnome/devel/libgail-gnome.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libgail-gnome.spec	9 Feb 2008 05:00:38 -0000	1.29
+++ libgail-gnome.spec	23 Sep 2008 15:57:09 -0000	1.30
@@ -6,8 +6,8 @@
 
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: libgail-gnome
-Version: 1.20.0
-Release: 2%{?dist}
+Version: 1.20.1
+Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap
 Source0: http://download.gnome.org/sources/libgail-gnome/1.20/%{name}-%{version}.tar.bz2
 License: LGPLv2+
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 1.20.1-1
+- Update to 1.20.1
+
 * Fri Feb  8 2008 Matthias Clasen <mclasen at redhat.com> - 1.20.0-2
 - Rebuild for gcc 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgail-gnome/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	17 Sep 2007 15:38:23 -0000	1.9
+++ sources	23 Sep 2008 15:57:09 -0000	1.10
@@ -1 +1 @@
-5a7662e3d637c86baa95a50adb225e56  libgail-gnome-1.20.0.tar.bz2
+5c5b71af5a8ab2a9403bdae52b20e46c  libgail-gnome-1.20.1.tar.bz2



From erikos at fedoraproject.org  Tue Sep 23 15:59:15 2008
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Tue, 23 Sep 2008 15:59:15 +0000 (UTC)
Subject: rpms/sugar-artwork/OLPC-3 .cvsignore, 1.8, 1.9 sources, 1.9,
	1.10 sugar-artwork.spec, 1.12, 1.13
Message-ID: <20080923155915.1B21470033@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-artwork/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16536

Modified Files:
	.cvsignore sources sugar-artwork.spec 
Log Message:
* Tue Sep 23 2008 Simon Schampijer <simon at laptop.org> - 0.82.3-1
- Fix corrupted network-wireless-060.svg




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/OLPC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	1 Aug 2008 16:12:11 -0000	1.8
+++ .cvsignore	23 Sep 2008 15:58:44 -0000	1.9
@@ -1 +1 @@
-sugar-artwork-0.81.3.tar.bz2
+sugar-artwork-0.82.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/OLPC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 Sep 2008 10:37:05 -0000	1.9
+++ sources	23 Sep 2008 15:58:44 -0000	1.10
@@ -1 +1 @@
-e23f29c97e294873d4a9d3d9f9892c1f  sugar-artwork-0.82.2.tar.bz2
+cb0083f640835d34e07000c32819752e  sugar-artwork-0.82.3.tar.bz2


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/OLPC-3/sugar-artwork.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sugar-artwork.spec	20 Sep 2008 13:31:08 -0000	1.12
+++ sugar-artwork.spec	23 Sep 2008 15:58:44 -0000	1.13
@@ -3,8 +3,8 @@
 
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
-Version: 0.82.2
-Release: 2%{?dist}
+Version: 0.82.3
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/artwork
@@ -62,6 +62,9 @@
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Tue Sep 23 2008 Simon Schampijer <simon at laptop.org> - 0.82.3-1
+- Fix corrupted network-wireless-060.svg
+
 * Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.2-2
 - Resync with devel
 



From mclasen at fedoraproject.org  Tue Sep 23 16:00:08 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 16:00:08 +0000 (UTC)
Subject: rpms/control-center/devel .cvsignore, 1.80, 1.81 control-center.spec,
	1.394, 1.395 sources, 1.83, 1.84
Message-ID: <20080923160008.A08D470033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16823

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- .cvsignore	23 Aug 2008 03:48:53 -0000	1.80
+++ .cvsignore	23 Sep 2008 15:59:38 -0000	1.81
@@ -1 +1 @@
-gnome-control-center-2.23.90.tar.bz2
+gnome-control-center-2.24.0.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- control-center.spec	23 Aug 2008 04:01:54 -0000	1.394
+++ control-center.spec	23 Sep 2008 15:59:38 -0000	1.395
@@ -21,7 +21,7 @@
 
 Summary: GNOME Control Center
 Name: control-center
-Version: 2.23.90
+Version: 2.24.0
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
@@ -330,6 +330,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-1
 - Update to 2.23.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- sources	23 Aug 2008 03:48:54 -0000	1.83
+++ sources	23 Sep 2008 15:59:38 -0000	1.84
@@ -1 +1 @@
-831ddcaad205dc84323275480c7cb89c  gnome-control-center-2.23.90.tar.bz2
+6a4f4037a386bb8988e88033d8251488  gnome-control-center-2.24.0.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep 23 16:02:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 16:02:06 +0000
Subject: [pkgdb] aircrack-ng: robertoestrella has given up watchcommits
Message-ID: <20080923160206.6202E208DA4@bastion.fedora.phx.redhat.com>

robertoestrella has given up the watchcommits acl on aircrack-ng (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aircrack-ng



From pkgdb at fedoraproject.org  Tue Sep 23 16:02:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 16:02:14 +0000
Subject: [pkgdb] aircrack-ng: robertoestrella has requested watchcommits
Message-ID: <20080923160214.C8EFF208D2B@bastion.fedora.phx.redhat.com>

robertoestrella has requested the watchcommits acl on aircrack-ng (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aircrack-ng



From pkgdb at fedoraproject.org  Tue Sep 23 16:02:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 16:02:03 +0000
Subject: [pkgdb] aircrack-ng: robertoestrella has requested watchcommits
Message-ID: <20080923160203.09BD5208D2B@bastion.fedora.phx.redhat.com>

robertoestrella has requested the watchcommits acl on aircrack-ng (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aircrack-ng



From spot at fedoraproject.org  Tue Sep 23 16:04:21 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 23 Sep 2008 16:04:21 +0000 (UTC)
Subject: rpms/blacs/devel blacs-fedora.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 Bmake.inc, 1.8, 1.9 blacs.spec, 1.29, 1.30 sources, 1.2,
	1.3 Bmake.inc.64bit, 1.8, NONE blacs-shared.patch, 1.2, NONE
Message-ID: <20080923160421.5AB3D70033@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18325

Modified Files:
	.cvsignore Bmake.inc blacs.spec sources 
Added Files:
	blacs-fedora.patch 
Removed Files:
	Bmake.inc.64bit blacs-shared.patch 
Log Message:
use openmpi

blacs-fedora.patch:

--- NEW FILE blacs-fedora.patch ---
--- blacs/BLACS/SRC/MPI/Makefile	2007-10-04 13:09:14.000000000 -0400
+++ blacs/BLACS/SRC/MPI/Makefile.new	2008-09-18 14:12:10.000000000 -0400
@@ -88,12 +88,14 @@
 	make $(BLACSCINIT)
 	$(ARCH) $(ARCHFLAGS) $(BLACSLIB) $(Fintobj) $(Cintobj)
 	$(RANLIB) $(BLACSLIB)
+	( mkdir tmp ; cp $(BLACSLIB) tmp ; cd tmp ; ar x $(BLACSLIB) ; mpif77 -shared -o $(BLACSdir)/$(BLACSLIBS).0.0 *.o *.oo -Wl,-soname=$(BLACSLIBS) ; cd .. )
 
 $(BLACSFINIT) :
 	$(CC) -o Cblacs_pinfo.o -c $(CCFLAGS) $(BLACSDEFS) -DCallFromC -DMainInF77 \
                  blacs_pinfo_.c
 	$(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInF77 blacs_pinfo_.c
 	$(ARCH) $(ARCHFLAGS) $(BLACSFINIT) blacs_pinfo_.o Cblacs_pinfo.o
+	$(CC) $(CCFLAGS) -shared -Wl,-soname=$(BLACSFINITS) -o $(BLACSdir)/$(BLACSFINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o
 	$(RANLIB) $(BLACSFINIT)
 
 $(BLACSCINIT) :
@@ -101,6 +103,7 @@
                  blacs_pinfo_.c
 	$(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInC blacs_pinfo_.c
 	$(ARCH) $(ARCHFLAGS) $(BLACSCINIT) blacs_pinfo_.o Cblacs_pinfo.o
+	$(CC) $(CCFLAGS) -shared -Wl,-soname=$(BLACSCINITS) -o $(BLACSdir)/$(BLACSCINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o
 	$(RANLIB) $(BLACSCINIT)
 
 #  ------------------
@@ -129,7 +132,7 @@
 	( cd INTERNAL ; rm -f bi_f77_get_constants.o bi_f77_mpi_attr_get.o \
                               bi_f77_mpi_initialized.o bi_f77_mpi_op_create.o \
                               bi_f77_mpi_test.o bi_f77_mpi_testall.o \
-                              bi_f77_init.o Bdef.h Bconfig.h mpif.h )
+                              bi_f77_init.o Bdef.h Bconfig.h )
 	( cd INTERNAL ; rm -f $(internal) )
 
 #  -------------------------------------
@@ -142,7 +145,7 @@
 	( cd INTERNAL ; rm -f $(internal:.o=.c) Bdef.h Bconfig.h )
 	( cd INTERNAL ; rm -f bi_f77_get_constants.f bi_f77_mpi_attr_get.f \
                               bi_f77_mpi_initialized.f bi_f77_mpi_op_create.f \
-                              bi_f77_mpi_test.f bi_f77_mpi_testall.f mpif.h )
+                              bi_f77_mpi_test.f bi_f77_mpi_testall.f )
 
 #  -------------------------------------------------------------------------
 #  Establish how to make logical links to the long-name C interface routines
@@ -180,25 +183,21 @@
 #  -------------------------------------
 #  Compile the (ouch!) fortran internals
 #  -------------------------------------
-bi_f77_init.o : mpif.h bi_f77_init.f
+bi_f77_init.o : bi_f77_init.f
 	$(F77) -c $(F77FLAGS) $*.f
-bi_f77_get_constants.o : mpif.h bi_f77_get_constants.f
+bi_f77_get_constants.o :bi_f77_get_constants.f
 	$(F77) -c $(F77FLAGS) $*.f
-bi_f77_mpi_attr_get.o : mpif.h bi_f77_mpi_attr_get.f
+bi_f77_mpi_attr_get.o : bi_f77_mpi_attr_get.f
 	$(F77) -c $(F77FLAGS) $*.f
-bi_f77_mpi_initialized.o : mpif.h bi_f77_mpi_initialized.f
+bi_f77_mpi_initialized.o : bi_f77_mpi_initialized.f
 	$(F77) -c $(F77FLAGS) $*.f
-bi_f77_mpi_op_create.o : mpif.h bi_f77_mpi_op_create.f
+bi_f77_mpi_op_create.o : bi_f77_mpi_op_create.f
 	$(F77) -c $(F77FLAGS) $*.f
-bi_f77_mpi_test.o : mpif.h bi_f77_mpi_test.f
+bi_f77_mpi_test.o : bi_f77_mpi_test.f
 	$(F77) -c $(F77FLAGS) $*.f
-bi_f77_mpi_testall.o : mpif.h bi_f77_mpi_testall.f
+bi_f77_mpi_testall.o : bi_f77_mpi_testall.f
 	$(F77) -c $(F77FLAGS) $*.f
 
-mpif.h : $(MPIINCdir)/mpif.h
-	rm -f mpif.h
-	ln -s $(MPIINCdir)/mpif.h mpif.h
-
 #  ------------------------------------------------------------------------
 #  We move C .o files to .oo so that we can use the portable suffix rule for
 #  compilation, and still have them coexist with the fortran interface
--- blacs/BLACS/TESTING/Makefile	2006-01-18 16:36:03.000000000 -0500
+++ blacs/BLACS/TESTING/Makefile.new	2008-09-18 15:41:47.000000000 -0400
@@ -51,22 +51,17 @@
 	cp $(BTOPdir)/TESTING/comb.dat $(TESTdir)/
 
 btprim_MPI.o : btprim_MPI.f
-	make mpif.h
 	$(F77) -c $(F77FLAGS) $*.f
 
 btprim_PVM.o : btprim_PVM.f
 	make fpvm3.h
 	$(F77) -c $(F77FLAGS) $*.f
 
-mpif.h : $(MPIINCdir)/mpif.h
-	rm -f mpif.h
-	ln -s $(MPIINCdir)/mpif.h mpif.h
-
 fpvm3.h : $(PVMINCdir)/fpvm3.h
 	rm -f fpvm3.h
 	ln -s $(PVMINCdir)/fpvm3.h fpvm3.h
 
 clean :
-	rm -f $(obj) tools.o Cbt.o mpif.h fpvm3.h
+	rm -f $(obj) tools.o Cbt.o fpvm3.h
 
 .f.o: ; $(F77) -c $(F77FLAGS) $*.f
--- blacs/BLACS/INSTALL/Makefile	2006-01-18 16:36:03.000000000 -0500
+++ blacs/BLACS/INSTALL/Makefile.new	2008-09-18 15:43:07.000000000 -0400
@@ -28,7 +28,7 @@
 $(INSTdir)/xsyserrors : syserrors.o
 	$(CCLOADER) $(CCLOADFLAGS) -o $@ syserrors.o $(MPILIB)
 
-$(INSTdir)/xtc_CsameF77 : mpif.h tc_fCsameF77.o tc_cCsameF77.o
+$(INSTdir)/xtc_CsameF77 : tc_fCsameF77.o tc_cCsameF77.o
 	$(F77LOADER) $(F77LOADFLAGS) -o $@ tc_fCsameF77.o tc_cCsameF77.o $(MPILIB)
 
 $(INSTdir)/xtc_UseMpich : tc_UseMpich.o
@@ -37,17 +37,13 @@
 $(INSTdir)/xcmpi_sane : cmpi_sane.o
 	$(CCLOADER) $(CCLOADFLAGS) -o $@ cmpi_sane.o $(MPILIB)
 
-$(INSTdir)/xfmpi_sane : mpif.h fmpi_sane.o
+$(INSTdir)/xfmpi_sane : fmpi_sane.o
 	$(F77LOADER) $(F77LOADFLAGS) -o $@ fmpi_sane.o $(MPILIB)
 
 clean:
 	rm -f size.o Fintface.o Cintface.o syserrors.o transcomm.o \
               mpi_sane.o fmpi_sane.o tc_UseMpich.o tc_fCsameF77.o tc_cCsameF77.o
 
-mpif.h : $(MPIINCdir)/mpif.h
-	rm -f mpif.h
-	ln -s $(MPIINCdir)/mpif.h mpif.h
-
 .f.o: ; $(F77) -c $(F77FLAGS) $*.f
 .c.o:
 	$(CC) -c $(CCFLAGS) $(BLACSDEFS) $<


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Apr 2005 17:42:47 -0000	1.2
+++ .cvsignore	23 Sep 2008 16:03:50 -0000	1.3
@@ -1,2 +1,7 @@
-blacstester.tgz
 mpiblacs.tgz
+blacs_install.ps
+cblacsqref.ps
+f77blacsqref.ps
+lawn94.ps
+mpiblacs_issues.ps
+mpi_prop.ps


Index: Bmake.inc
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Bmake.inc	8 Jul 2008 17:54:20 -0000	1.8
+++ Bmake.inc	23 Sep 2008 16:03:50 -0000	1.9
@@ -54,16 +54,11 @@
 #  Name and location of the MPI library.
 #  -------------------------------------
    MPIdir = /usr
-   MPILIBdir = $(MPIdir)/lib/lam/lib
-   MPIINCdir = $(MPIdir)/lib/lam/include
-   MPILIB = -lmpi
-   LAMLIBS = -llam -llamf77mpi
-   EXTRALIBS = -ldl -lpthread -lutil
 
 #  -------------------------------------
 #  All libraries required by the tester.
 #  -------------------------------------
-   BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) -L$(MPILIBdir) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
+   BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL)
 
 #  ----------------------------------------------------------------
 #  The directory to put the installation help routines' executables
@@ -94,7 +89,7 @@
 #  The directory to find the required communication library include files, 
 #  if they are required by your system.
 #  -----------------------------------------------------------------------
-   SYSINC = -I$(MPIINCdir) -I$(MPIINCdir)/32
+   SYSINC = 
 
 #  ---------------------------------------------------------------------------
 #  The Fortran 77 to C interface to be used.  If you are unsure of the correct
@@ -203,12 +198,12 @@
 #  optimization.  This is the F77NO_OPTFLAG.  The usage of the remaining
 #  macros should be obvious from the names.
 #=============================================================================
-   F77            = gfortran
+   F77            = mpif77
    F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -fPIC
    F77FLAGS       = $(F77NO_OPTFLAGS) -O
    F77LOADER      = $(F77)
    F77LOADFLAGS   = 
-   CC             = gcc
+   CC             = mpicc
    CCFLAGS        = $(RPM_OPT_FLAGS) -fPIC
    CCLOADER       = $(CC)
    CCLOADFLAGS    = 


Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- blacs.spec	8 Jul 2008 17:54:20 -0000	1.29
+++ blacs.spec	23 Sep 2008 16:03:50 -0000	1.30
@@ -1,28 +1,23 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 29%{?dist}
+Release: 30%{?dist}
 License: Public Domain
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
 Source0: http://www.netlib.org/blacs/mpiblacs.tgz
-Source1: http://www.netlib.org/blacs/blacstester.tgz
-Source2: Bmake.inc
-Source3: http://www.netlib.org/blacs/mpi_prop.ps
-Source4: http://www.netlib.org/blacs/blacs_install.ps
-Source5: http://www.netlib.org/blacs/mpiblacs_issues.ps
-Source6: http://www.netlib.org/blacs/f77blacsqref.ps
-Source7: http://www.netlib.org/blacs/cblacsqref.ps
-Source8: http://www.netlib.org/blacs/lawn94.ps
-Source9: Bmake.inc.64bit
+Source1: Bmake.inc
+Source2: http://www.netlib.org/blacs/mpi_prop.ps
+Source3: http://www.netlib.org/blacs/blacs_install.ps
+Source4: http://www.netlib.org/blacs/mpiblacs_issues.ps
+Source5: http://www.netlib.org/blacs/f77blacsqref.ps
+Source6: http://www.netlib.org/blacs/cblacsqref.ps
+Source7: http://www.netlib.org/blacs/lawn94.ps
 BuildRequires: gcc-gfortran
-# Lam before 7.1.1-5 is missing:
-# -shared library support
-# -fPIC compilation flag
-BuildRequires: lapack, blas, lam-devel >= 2:7.1.1-5
-Requires: lapack, blas, lam >= 2:7.1.1-5
+BuildRequires: lapack, blas, openmpi-devel
+Requires: lapack, blas
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: blacs-shared.patch
+Patch0: blacs-fedora.patch
 
 %description
 The BLACS (Basic Linear Algebra Communication Subprograms) project is 
@@ -45,17 +40,9 @@
 
 %prep
 %setup -q -c -n %{name}
-%setup -q -D -T -a 1 -n %{name}
 %patch0 -p1
 cd BLACS/
-%ifarch ppc64 sparc64 x86_64 ia64
-cp -f %{SOURCE9} ./Bmake.inc
-%else
-cp -f %{SOURCE2} .
-%endif
-%ifarch ia64
-sed -i -e 's,/lib64/,/lib/,g' ./Bmake.inc
-%endif
+cp -f %{SOURCE1} .
 
 %build
 cd BLACS/
@@ -67,12 +54,12 @@
 make
 cd ../..
 
-cp %{SOURCE3} mpi_prop.ps
-cp %{SOURCE4} blacs_install.ps
-cp %{SOURCE5} mpiblacs_issues.ps
-cp %{SOURCE6} f77blacsqref.ps
-cp %{SOURCE7} cblacsqref.ps
-cp %{SOURCE8} lawn94.ps
+cp %{SOURCE2} mpi_prop.ps
+cp %{SOURCE3} blacs_install.ps
+cp %{SOURCE4} mpiblacs_issues.ps
+cp %{SOURCE5} f77blacsqref.ps
+cp %{SOURCE6} cblacsqref.ps
+cp %{SOURCE7} lawn94.ps
 
 %install
 rm -fr ${RPM_BUILD_ROOT}
@@ -112,6 +99,10 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Tue Sep 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-30
+- incorporate Deji Akingunola's changes
+- use openmpi rather than lam
+
 * Tue Jul  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-29
 - fix lam paths
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Apr 2005 17:42:47 -0000	1.2
+++ sources	23 Sep 2008 16:03:50 -0000	1.3
@@ -1,2 +1 @@
-5cdd9cf792b793baaeb8acef17b9bb71  blacstester.tgz
-850b302d5f7786a6bc895cac5e9382bb  mpiblacs.tgz
+28ae5b91b3193402fe1ae8d06adcf500  mpiblacs.tgz


--- Bmake.inc.64bit DELETED ---


--- blacs-shared.patch DELETED ---



From mclasen at fedoraproject.org  Tue Sep 23 16:06:48 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 16:06:48 +0000 (UTC)
Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.70,
	1.71 gnome-system-monitor.spec, 1.126, 1.127 sources, 1.70, 1.71
Message-ID: <20080923160648.37BFD70033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-system-monitor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19008

Modified Files:
	.cvsignore gnome-system-monitor.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	3 Sep 2008 02:47:12 -0000	1.70
+++ .cvsignore	23 Sep 2008 16:06:17 -0000	1.71
@@ -1 +1 @@
-gnome-system-monitor-2.23.91.tar.bz2
+gnome-system-monitor-2.24.0.tar.bz2


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- gnome-system-monitor.spec	3 Sep 2008 02:47:12 -0000	1.126
+++ gnome-system-monitor.spec	23 Sep 2008 16:06:17 -0000	1.127
@@ -12,12 +12,12 @@
 
 Summary: Simple process monitor
 Name: gnome-system-monitor
-Version: 2.23.91
+Version: 2.24.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnome.org/
-Source: http://download.gnome.org/sources/gnome-system-monitor/2.23/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-system-monitor/2.24/%{name}-%{version}.tar.bz2
 Source1: about-this-computer.desktop
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: GConf2-devel
@@ -126,6 +126,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.91-1
 - Update to 2.23.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	3 Sep 2008 02:47:12 -0000	1.70
+++ sources	23 Sep 2008 16:06:17 -0000	1.71
@@ -1 +1 @@
-f465d83c11fcb573c970d41de5c4c4cd  gnome-system-monitor-2.23.91.tar.bz2
+edd7f02e30683054b94a89aa62c74d1e  gnome-system-monitor-2.24.0.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep 23 16:02:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 16:02:16 +0000
Subject: [pkgdb] aircrack-ng: robertoestrella has given up watchcommits
Message-ID: <20080923160216.D470E208DA8@bastion.fedora.phx.redhat.com>

robertoestrella has given up the watchcommits acl on aircrack-ng (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aircrack-ng



From mclasen at fedoraproject.org  Tue Sep 23 16:11:29 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 16:11:29 +0000 (UTC)
Subject: rpms/gnome-nettool/devel .cvsignore, 1.13, 1.14 gnome-nettool.spec, 
	1.31, 1.32 sources, 1.14, 1.15
Message-ID: <20080923161129.B363570033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-nettool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20136

Modified Files:
	.cvsignore gnome-nettool.spec sources 
Log Message:
2.22.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-nettool/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	11 Mar 2008 04:06:58 -0000	1.13
+++ .cvsignore	23 Sep 2008 16:10:59 -0000	1.14
@@ -1 +1 @@
-gnome-nettool-2.22.0.tar.bz2
+gnome-nettool-2.22.1.tar.bz2


Index: gnome-nettool.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-nettool/devel/gnome-nettool.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnome-nettool.spec	29 May 2008 17:38:12 -0000	1.31
+++ gnome-nettool.spec	23 Sep 2008 16:10:59 -0000	1.32
@@ -5,8 +5,8 @@
 
 Summary: A GNOME interface for various networking tools
 Name: gnome-nettool
-Version: 2.22.0
-Release: 2%{?dist}
+Version: 2.22.1
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-nettool/2.22/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL
@@ -87,6 +87,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.1-1
+- Update to 2.22.1
+
 * Thu May 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.22.0-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-nettool/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	11 Mar 2008 04:06:58 -0000	1.14
+++ sources	23 Sep 2008 16:10:59 -0000	1.15
@@ -1 +1 @@
-290dd50a08a3859332afb6daf46dde25  gnome-nettool-2.22.0.tar.bz2
+afcaff8ebc76b5f352902ed424dc2856  gnome-nettool-2.22.1.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 23 16:02:18 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 16:02:18 +0000 (UTC)
Subject: rpms/gnome-mag/devel .cvsignore, 1.33, 1.34 gnome-mag.spec, 1.57,
	1.58 sources, 1.34, 1.35
Message-ID: <20080923160218.8D17070033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-mag/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17590

Modified Files:
	.cvsignore gnome-mag.spec sources 
Log Message:
0.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	3 Sep 2008 01:39:08 -0000	1.33
+++ .cvsignore	23 Sep 2008 16:01:48 -0000	1.34
@@ -1 +1 @@
-gnome-mag-0.15.3.tar.bz2
+gnome-mag-0.15.4.tar.bz2


Index: gnome-mag.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gnome-mag.spec	3 Sep 2008 00:55:22 -0000	1.57
+++ gnome-mag.spec	23 Sep 2008 16:01:48 -0000	1.58
@@ -2,7 +2,7 @@
 
 Summary: GNOME Magnifier
 Name: gnome-mag
-Version: 0.15.3
+Version: 0.15.4
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
@@ -74,6 +74,9 @@
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 0.15.4-1
+- Update to 0.15.4
+
 * Tue Sep  2 2008 Matthias Clasen <mclasen at redhat.com> - 0.15.3-1
 - Update to 0.15.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	3 Sep 2008 01:39:08 -0000	1.34
+++ sources	23 Sep 2008 16:01:48 -0000	1.35
@@ -1 +1 @@
-1045cdf4e548564de7e653de0169c85a  gnome-mag-0.15.3.tar.bz2
+77c099335ff2d913ac813e79f127acc0  gnome-mag-0.15.4.tar.bz2



From mclasen at fedoraproject.org  Tue Sep 23 16:19:32 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 16:19:32 +0000 (UTC)
Subject: rpms/gnome-nettool/devel gnome-nettool.spec,1.32,1.33
Message-ID: <20080923161932.4233D70033@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-nettool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21860

Modified Files:
	gnome-nettool.spec 
Log Message:
damn you, intltool



Index: gnome-nettool.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-nettool/devel/gnome-nettool.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gnome-nettool.spec	23 Sep 2008 16:10:59 -0000	1.32
+++ gnome-nettool.spec	23 Sep 2008 16:19:01 -0000	1.33
@@ -6,7 +6,7 @@
 Summary: A GNOME interface for various networking tools
 Name: gnome-nettool
 Version: 2.22.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-nettool/2.22/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL
@@ -22,6 +22,7 @@
 BuildRequires: gettext
 BuildRequires: gnome-doc-utils
 BuildRequires: scrollkeeper
+BuildRequires: intltool
 
 Requires(post): desktop-file-utils
 Requires(post): scrollkeeper
@@ -87,7 +88,7 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
-* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.1-1
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.1-2
 - Update to 2.22.1
 
 * Thu May 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.22.0-2



From kraxel at fedoraproject.org  Tue Sep 23 16:44:41 2008
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Tue, 23 Sep 2008 16:44:41 +0000 (UTC)
Subject: rpms/xenwatch/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xenwatch.spec, 1.3, 1.4
Message-ID: <20080923164441.0CEB170033@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xenwatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27580

Modified Files:
	.cvsignore sources xenwatch.spec 
Log Message:
- update to 0.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xenwatch/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Dec 2007 09:31:31 -0000	1.2
+++ .cvsignore	23 Sep 2008 16:44:10 -0000	1.3
@@ -1 +1 @@
-xenwatch-0.5.2.tar.gz
+xenwatch-0.5.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xenwatch/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Dec 2007 09:31:31 -0000	1.2
+++ sources	23 Sep 2008 16:44:10 -0000	1.3
@@ -1 +1 @@
-c0ff0bc66945f2e664ca6a7afb7b67e5  xenwatch-0.5.2.tar.gz
+c370b90e61bf281ce6f8c19db90b20ee  xenwatch-0.5.3.tar.gz


Index: xenwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xenwatch/devel/xenwatch.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xenwatch.spec	27 Jun 2008 13:36:04 -0000	1.3
+++ xenwatch.spec	23 Sep 2008 16:44:10 -0000	1.4
@@ -1,7 +1,7 @@
 Name:         xenwatch
 License:      GPLv2+
-Version:      0.5.2
-Release:      4%{?dist}
+Version:      0.5.3
+Release:      1%{?dist}
 Summary:      Virtualization utilities, mostly for Xen
 Group:        Applications/Emulators
 Source:       %{name}-%{version}.tar.gz
@@ -61,6 +61,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Tue Sep 23 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.5.3-1
+- update to 0.5.3.
+
 * Fri Jun 27 2008 Richard W.M. Jones <rjones at redhat.com> - 0.5.2-4
 - Rebuild against new gnutls library.
 



From kraxel at fedoraproject.org  Tue Sep 23 16:55:14 2008
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Tue, 23 Sep 2008 16:55:14 +0000 (UTC)
Subject: rpms/xenwatch/F-9 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xenwatch.spec, 1.2, 1.3
Message-ID: <20080923165514.8B50470033@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xenwatch/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30205

Modified Files:
	.cvsignore sources xenwatch.spec 
Log Message:
- update to 0.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xenwatch/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Dec 2007 09:31:31 -0000	1.2
+++ .cvsignore	23 Sep 2008 16:54:44 -0000	1.3
@@ -1 +1 @@
-xenwatch-0.5.2.tar.gz
+xenwatch-0.5.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xenwatch/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Dec 2007 09:31:31 -0000	1.2
+++ sources	23 Sep 2008 16:54:44 -0000	1.3
@@ -1 +1 @@
-c0ff0bc66945f2e664ca6a7afb7b67e5  xenwatch-0.5.2.tar.gz
+c370b90e61bf281ce6f8c19db90b20ee  xenwatch-0.5.3.tar.gz


Index: xenwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xenwatch/F-9/xenwatch.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xenwatch.spec	19 Feb 2008 10:21:23 -0000	1.2
+++ xenwatch.spec	23 Sep 2008 16:54:44 -0000	1.3
@@ -1,7 +1,7 @@
 Name:         xenwatch
 License:      GPLv2+
-Version:      0.5.2
-Release:      3%{?dist}
+Version:      0.5.3
+Release:      1%{?dist}
 Summary:      Virtualization utilities, mostly for Xen
 Group:        Applications/Emulators
 Source:       %{name}-%{version}.tar.gz
@@ -61,6 +61,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Tue Sep 23 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.5.3-1
+- update to 0.5.3.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.2-3
 - Autorebuild for GCC 4.3
 



From pbrobinson at fedoraproject.org  Tue Sep 23 17:00:53 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 23 Sep 2008 17:00:53 +0000 (UTC)
Subject: rpms/ptlib/F-9 ptlib.spec,1.3,1.4
Message-ID: <20080923170053.E5FC570033@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ptlib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31893

Modified Files:
	ptlib.spec 
Log Message:
- We don't want to obsolete pwlib just yet



Index: ptlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/F-9/ptlib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ptlib.spec	23 Sep 2008 11:31:44 -0000	1.3
+++ ptlib.spec	23 Sep 2008 17:00:23 -0000	1.4
@@ -1,7 +1,7 @@
 Name:		ptlib
 Summary:	Portable Tools Library
 Version:	2.4.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://www.opalvoip.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
 License:	MPLv1.0
@@ -11,7 +11,6 @@
 BuildRequires:	expat openssl-devel pkgconfig
 BuildRequires:  alsa-lib-devel, libstdc++-devel
 BuildRequires:  openldap-devel, expat-devel, flex, bison
-Obsoletes:	pwlib
 
 %description
 PTLib (Portable Tools Library) is a moderately large class library that 
@@ -28,7 +27,6 @@
 Group:		Development/Libraries
 Requires:	ptlib = %{version}-%{release}
 Requires:	pkgconfig
-Obsoletes:	pwlib-devel
 
 %description devel
 The ptlib-devel package includes the libraries and header files for ptlib.
@@ -82,6 +80,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Sep 23 2008 Peter Robinson <pbrobinson at gmail.com> - 2.4.1-3
+- We don't want to obsolete pwlib just yet
+
 * Tue Sep 23 2008 Peter Robinson <pbrobinson at gmail.com> - 2.4.1-2
 - remove lib-v4l requirement as its not in F-9
 



From ajax at fedoraproject.org  Tue Sep 23 17:21:55 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 23 Sep 2008 17:21:55 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.113,1.114
Message-ID: <20080923172155.5178E70033@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3930

Modified Files:
	comps-f10.xml.in 
Log Message:
Move system-config-display to optional

Practically speaking it doesn't work that well, might as well not taunt
the users.



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- comps-f10.xml.in	23 Sep 2008 15:24:17 -0000	1.113
+++ comps-f10.xml.in	23 Sep 2008 17:21:24 -0000	1.114
@@ -316,7 +316,6 @@
       <packagereq type="default">setroubleshoot</packagereq>
       <packagereq type="default">smolt-firstboot</packagereq>
       <packagereq type="default">system-config-date</packagereq>
-      <packagereq type="default">system-config-display</packagereq>
       <packagereq type="default">system-config-firewall</packagereq>
       <packagereq type="default">system-config-network</packagereq>
       <packagereq type="default">system-config-printer</packagereq>
@@ -337,6 +336,7 @@
       <packagereq type="optional">rss-glx-xscreensaver</packagereq>
       <packagereq type="optional">rxvt</packagereq>
       <packagereq type="optional">switchdesk</packagereq>
+      <packagereq type="optional">system-config-display</packagereq>
       <packagereq type="optional">uim-gtk2</packagereq>
       <packagereq type="optional">vnc-server</packagereq>
       <packagereq type="optional">workrave</packagereq>



From kraxel at fedoraproject.org  Tue Sep 23 17:23:39 2008
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Tue, 23 Sep 2008 17:23:39 +0000 (UTC)
Subject: rpms/xenwatch/EL-5 .cvsignore, 1.1, 1.2 sources, 1.2,
	1.3 xenwatch.spec, 1.3, 1.4
Message-ID: <20080923172339.51C5D7013D@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xenwatch/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4454

Modified Files:
	.cvsignore sources xenwatch.spec 
Log Message:
- update to 0.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xenwatch/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Dec 2007 16:54:31 -0000	1.1
+++ .cvsignore	23 Sep 2008 17:23:08 -0000	1.2
@@ -0,0 +1 @@
+xenwatch-0.5.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xenwatch/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Dec 2007 11:00:22 -0000	1.2
+++ sources	23 Sep 2008 17:23:08 -0000	1.3
@@ -1 +1 @@
-c0ff0bc66945f2e664ca6a7afb7b67e5  xenwatch-0.5.2.tar.gz
+c370b90e61bf281ce6f8c19db90b20ee  xenwatch-0.5.3.tar.gz


Index: xenwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xenwatch/EL-5/xenwatch.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xenwatch.spec	11 Dec 2007 22:21:44 -0000	1.3
+++ xenwatch.spec	23 Sep 2008 17:23:08 -0000	1.4
@@ -1,7 +1,7 @@
 Name:         xenwatch
 License:      GPLv2+
-Version:      0.5.2
-Release:      4%{?dist}
+Version:      0.5.3
+Release:      1%{?dist}
 Summary:      Virtualization utilities, mostly for Xen
 Group:        Applications/Emulators
 Source:       %{name}-%{version}.tar.gz
@@ -62,6 +62,8 @@
 rm -rf %{buildroot}
 
 %changelog
+* Tue Sep 23 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.5.3-1
+- update to 0.5.3.
 * Tue Dec 11 2007 Gerd Hoffmann <kraxel at redhat.com> - 0.5.2-4
 - exclude ppc on EL-5.
 * Tue Dec 11 2007 Gerd Hoffmann <kraxel at redhat.com> - 0.5.2-3



From kyle at fedoraproject.org  Tue Sep 23 17:32:55 2008
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 23 Sep 2008 17:32:55 +0000 (UTC)
Subject: rpms/kernel/F-9
	linux-2.6-wireless-p54-fix-regression-due-to-delete-NETDEVICES_MULTIQUEUE-option.patch,
	NONE, 1.1
	linux-2.6-wireless-revert-b43-add-RFKILL_STATE_HARD_BLOCKED-support.patch,
	NONE, 1.1 kernel.spec, 1.773, 1.774
Message-ID: <20080923173255.0F14370033@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6625

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-wireless-p54-fix-regression-due-to-delete-NETDEVICES_MULTIQUEUE-option.patch 
	linux-2.6-wireless-revert-b43-add-RFKILL_STATE_HARD_BLOCKED-support.patch 
Log Message:
* Tue Sep 23 2008 Kyle McMartin <kyle at redhat.com> 2.6.26.5-47
- two more wireless fixes from John
   p54: Fix regression due to "net: Delete NETDEVICES_MULTIQUEUE kconfig option
   Revert "b43/b43legacy: add RFKILL_STATE_HARD_BLOCKED support"


linux-2.6-wireless-p54-fix-regression-due-to-delete-NETDEVICES_MULTIQUEUE-option.patch:

--- NEW FILE linux-2.6-wireless-p54-fix-regression-due-to-delete-NETDEVICES_MULTIQUEUE-option.patch ---
commit aaa1553512b9105699113ea7e2ea726f3d9d4de2
Author: Christian Lamparter <chunkeey at web.de>
Date:   Sat Aug 9 19:20:47 2008 -0500

    p54: Fix regression due to "net: Delete NETDEVICES_MULTIQUEUE kconfig option"
    
    Commit b19fa1f, entitled "net: Delete NETDEVICES_MULTIQUEUE kconfig
    option" breaks p54pci and p54usb.
    
    Additionally, the old logic always tx'ed cts frames (if enabled)
    with a short preamble when [rate > 3]. (i.e. with any 802.11g rate).
    Of course this isn't that bad, but it's still wrong!
    
    (This patch also clarifies the meanings of some of the fields in the tx
    header for the hardware. -- JWL)
    
    Signed-off-by: Christian Lamparter <chunkeey at web.de>
    Acked-by: Larry Finger <Larry.Finger at lwfinger.net>
    Cc: <stable at kernel.org>		[2.6.25.x, 2.6.26.x]
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c
index 83cd85e..49afd20 100644
--- a/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@ -413,12 +413,12 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb)
 			last_addr = range->end_addr;
 			__skb_unlink(entry, &priv->tx_queue);
 			memset(&info->status, 0, sizeof(info->status));
-			priv->tx_stats[skb_get_queue_mapping(skb)].len--;
 			entry_hdr = (struct p54_control_hdr *) entry->data;
 			entry_data = (struct p54_tx_control_allocdata *) entry_hdr->data;
 			if ((entry_hdr->magic1 & cpu_to_le16(0x4000)) != 0)
 				pad = entry_data->align[0];
 
+			priv->tx_stats[entry_data->hw_queue - 4].len--;
 			if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) {
 				if (!(payload->status & 0x01))
 					info->flags |= IEEE80211_TX_STAT_ACK;
@@ -557,6 +557,7 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
 	struct p54_tx_control_allocdata *txhdr;
 	size_t padding, len;
 	u8 rate;
+	u8 cts_rate = 0x20;
 
 	current_queue = &priv->tx_stats[skb_get_queue_mapping(skb)];
 	if (unlikely(current_queue->len > current_queue->limit))
@@ -581,28 +582,28 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
 	hdr->type = (info->flags & IEEE80211_TX_CTL_NO_ACK) ? 0 : cpu_to_le16(1);
 	hdr->retry1 = hdr->retry2 = info->control.retry_limit;
 
-	memset(txhdr->wep_key, 0x0, 16);
-	txhdr->padding = 0;
-	txhdr->padding2 = 0;
-
 	/* TODO: add support for alternate retry TX rates */
 	rate = ieee80211_get_tx_rate(dev, info)->hw_value;
-	if (info->flags & IEEE80211_TX_CTL_SHORT_PREAMBLE)
+	if (info->flags & IEEE80211_TX_CTL_SHORT_PREAMBLE) {
 		rate |= 0x10;
-	if (info->flags & IEEE80211_TX_CTL_USE_RTS_CTS)
+		cts_rate |= 0x10;
+	}
+	if (info->flags & IEEE80211_TX_CTL_USE_RTS_CTS) {
 		rate |= 0x40;
-	else if (info->flags & IEEE80211_TX_CTL_USE_CTS_PROTECT)
+		cts_rate |= ieee80211_get_rts_cts_rate(dev, info)->hw_value;
+	} else if (info->flags & IEEE80211_TX_CTL_USE_CTS_PROTECT) {
 		rate |= 0x20;
+		cts_rate |= ieee80211_get_rts_cts_rate(dev, info)->hw_value;
+	}
 	memset(txhdr->rateset, rate, 8);
-	txhdr->wep_key_present = 0;
-	txhdr->wep_key_len = 0;
-	txhdr->frame_type = cpu_to_le32(skb_get_queue_mapping(skb) + 4);
-	txhdr->magic4 = 0;
-	txhdr->antenna = (info->antenna_sel_tx == 0) ?
+	txhdr->key_type = 0;
+	txhdr->key_len = 0;
+	txhdr->hw_queue = skb_get_queue_mapping(skb) + 4;
+	txhdr->tx_antenna = (info->antenna_sel_tx == 0) ?
 		2 : info->antenna_sel_tx - 1;
 	txhdr->output_power = 0x7f; // HW Maximum
-	txhdr->magic5 = (info->flags & IEEE80211_TX_CTL_NO_ACK) ?
-		0 : ((rate > 0x3) ? cpu_to_le32(0x33) : cpu_to_le32(0x23));
+	txhdr->cts_rate = (info->flags & IEEE80211_TX_CTL_NO_ACK) ?
+			  0 : cts_rate;
 	if (padding)
 		txhdr->align[0] = padding;
 
diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireless/p54/p54common.h
index 2245fcc..8db6c0e 100644
--- a/drivers/net/wireless/p54/p54common.h
+++ b/drivers/net/wireless/p54/p54common.h
@@ -183,16 +183,16 @@ struct p54_frame_sent_hdr {
 
 struct p54_tx_control_allocdata {
 	u8 rateset[8];
-	u16 padding;
-	u8 wep_key_present;
-	u8 wep_key_len;
-	u8 wep_key[16];
-	__le32 frame_type;
-	u32 padding2;
-	__le16 magic4;
-	u8 antenna;
+	u8 unalloc0[2];
+	u8 key_type;
+	u8 key_len;
+	u8 key[16];
+	u8 hw_queue;
+	u8 unalloc1[9];
+	u8 tx_antenna;
 	u8 output_power;
-	__le32 magic5;
+	u8 cts_rate;
+	u8 unalloc2[3];
 	u8 align[0];
 } __attribute__ ((packed));
 

linux-2.6-wireless-revert-b43-add-RFKILL_STATE_HARD_BLOCKED-support.patch:

--- NEW FILE linux-2.6-wireless-revert-b43-add-RFKILL_STATE_HARD_BLOCKED-support.patch ---
commit e95926d05d028a6bf0ab60b21b484c3d622fdcd1
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Sep 16 19:32:30 2008 -0700

    Revert "b43/b43legacy: add RFKILL_STATE_HARD_BLOCKED support"
    
    This reverts commit bc19d6e0b74ef03a3baf035412c95192b54dfc6f, which as
    Larry Finger reports causes the radio LED on his system to no longer
    respond to rfkill switch events.
    
    Reported-by: Larry Finger <Larry.Finger at lwfinger.net>
    Requested-by: John W. Linville <linville at tuxdriver.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c
index fec5645..34ae125 100644
--- a/drivers/net/wireless/b43/rfkill.c
+++ b/drivers/net/wireless/b43/rfkill.c
@@ -43,23 +43,6 @@ static bool b43_is_hw_radio_enabled(struct b43_wldev *dev)
 	return 0;
 }
 
-/* Update the rfkill state */
-static void b43_rfkill_update_state(struct b43_wldev *dev)
-{
-	struct b43_rfkill *rfk = &(dev->wl->rfkill);
-
-	if (!dev->radio_hw_enable) {
-		rfk->rfkill->state = RFKILL_STATE_HARD_BLOCKED;
-		return;
-	}
-
-	if (!dev->phy.radio_on)
-		rfk->rfkill->state = RFKILL_STATE_SOFT_BLOCKED;
-	else
-		rfk->rfkill->state = RFKILL_STATE_UNBLOCKED;
-
-}
-
 /* The poll callback for the hardware button. */
 static void b43_rfkill_poll(struct input_polled_dev *poll_dev)
 {
@@ -77,7 +60,6 @@ static void b43_rfkill_poll(struct input_polled_dev *poll_dev)
 	if (unlikely(enabled != dev->radio_hw_enable)) {
 		dev->radio_hw_enable = enabled;
 		report_change = 1;
-		b43_rfkill_update_state(dev);
 		b43info(wl, "Radio hardware status changed to %s\n",
 			enabled ? "ENABLED" : "DISABLED");
 	}
diff --git a/drivers/net/wireless/b43legacy/rfkill.c b/drivers/net/wireless/b43legacy/rfkill.c
index 476add9..b32bf6a 100644
--- a/drivers/net/wireless/b43legacy/rfkill.c
+++ b/drivers/net/wireless/b43legacy/rfkill.c
@@ -44,23 +44,6 @@ static bool b43legacy_is_hw_radio_enabled(struct b43legacy_wldev *dev)
 	return 0;
 }
 
-/* Update the rfkill state */
-static void b43legacy_rfkill_update_state(struct b43legacy_wldev *dev)
-{
-	struct b43legacy_rfkill *rfk = &(dev->wl->rfkill);
-
-	if (!dev->radio_hw_enable) {
-		rfk->rfkill->state = RFKILL_STATE_HARD_BLOCKED;
-		return;
-	}
-
-	if (!dev->phy.radio_on)
-		rfk->rfkill->state = RFKILL_STATE_SOFT_BLOCKED;
-	else
-		rfk->rfkill->state = RFKILL_STATE_UNBLOCKED;
-
-}
-
 /* The poll callback for the hardware button. */
 static void b43legacy_rfkill_poll(struct input_polled_dev *poll_dev)
 {
@@ -78,7 +61,6 @@ static void b43legacy_rfkill_poll(struct input_polled_dev *poll_dev)
 	if (unlikely(enabled != dev->radio_hw_enable)) {
 		dev->radio_hw_enable = enabled;
 		report_change = 1;
-		b43legacy_rfkill_update_state(dev);
 		b43legacyinfo(wl, "Radio hardware status changed to %s\n",
 			enabled ? "ENABLED" : "DISABLED");
 	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.773
retrieving revision 1.774
diff -u -r1.773 -r1.774
--- kernel.spec	23 Sep 2008 00:51:50 -0000	1.773
+++ kernel.spec	23 Sep 2008 17:32:24 -0000	1.774
@@ -652,9 +652,12 @@
 Patch681: linux-2.6-wireless-pending.patch
 #Patch682: linux-2.6-wireless-fixups.patch
 Patch683: linux-2.6-wireless-stable-backports.patch
-Patch685: linux-2.6-rt2500usb-fix.patch
-Patch686: linux-2.6-wireless-rt2500pci-restoring-missing-line.patch
-Patch690: linux-2.6-at76.patch
+Patch685: linux-2.6-wireless-rt2500pci-restoring-missing-line.patch
+Patch686: linux-2.6-wireless-p54-fix-regression-due-to-delete-NETDEVICES_MULTIQUEUE-option.patch
+Patch687: linux-2.6-wireless-revert-b43-add-RFKILL_STATE_HARD_BLOCKED-support.patch
+
+Patch698: linux-2.6-rt2500usb-fix.patch
+Patch699: linux-2.6-at76.patch
 
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
 
@@ -1249,6 +1252,10 @@
 
 # bf4634afd8bb72936d2d56425ec792ca1bfa92a2
 ApplyPatch linux-2.6-wireless-rt2500pci-restoring-missing-line.patch
+# e95926d05d028a6bf0ab60b21b484c3d622fdcd1
+ApplyPatch linux-2.6-wireless-revert-b43-add-RFKILL_STATE_HARD_BLOCKED-support.patch
+# aaa1553512b9105699113ea7e2ea726f3d9d4de2
+ApplyPatch linux-2.6-wireless-p54-fix-regression-due-to-delete-NETDEVICES_MULTIQUEUE-option.patch
 
 # implement smarter atime updates support.
 ApplyPatch linux-2.6-smarter-relatime.patch
@@ -1885,6 +1892,11 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Tue Sep 23 2008 Kyle McMartin <kyle at redhat.com> 2.6.26.5-47
+- two more wireless fixes from John
+   p54: Fix regression due to "net: Delete NETDEVICES_MULTIQUEUE kconfig option
+   Revert "b43/b43legacy: add RFKILL_STATE_HARD_BLOCKED support"
+  
 * Mon Sep 22 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-46
 - pcmcia: Fix broken abuse of dev->driver_data (#462178)
 



From pkgdb at fedoraproject.org  Tue Sep 23 17:45:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 17:45:59 +0000
Subject: [pkgdb] astyle ownership updated
Message-ID: <20080923174559.B3FAC208D9F@bastion.fedora.phx.redhat.com>

Package astyle in Fedora devel is now owned by rishi

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/astyle



From pkgdb at fedoraproject.org  Tue Sep 23 17:46:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 17:46:18 +0000
Subject: [pkgdb] astyle had acl change status
Message-ID: <20080923174618.C05C5208D68@bastion.fedora.phx.redhat.com>

rishi has set the commit acl on astyle (Fedora devel) to Approved for bpepple

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/astyle



From pkgdb at fedoraproject.org  Tue Sep 23 17:46:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 17:46:24 +0000
Subject: [pkgdb] astyle ownership updated
Message-ID: <20080923174624.384FB208DA6@bastion.fedora.phx.redhat.com>

Package astyle in Fedora 8 is now owned by rishi

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/astyle



From pkgdb at fedoraproject.org  Tue Sep 23 17:46:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 17:46:25 +0000
Subject: [pkgdb] astyle ownership updated
Message-ID: <20080923174626.0D778208DA9@bastion.fedora.phx.redhat.com>

Package astyle in Fedora 9 is now owned by rishi

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/astyle



From pkgdb at fedoraproject.org  Tue Sep 23 17:46:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 17:46:36 +0000
Subject: [pkgdb] astyle had acl change status
Message-ID: <20080923174636.21170208D9F@bastion.fedora.phx.redhat.com>

rishi has set the commit acl on astyle (Fedora 9) to Approved for bpepple

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/astyle



From kraxel at fedoraproject.org  Tue Sep 23 17:53:17 2008
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Tue, 23 Sep 2008 17:53:17 +0000 (UTC)
Subject: rpms/xenwatch/EL-5 xenwatch.spec,1.4,1.5
Message-ID: <20080923175317.3C1A570033@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xenwatch/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10943

Modified Files:
	xenwatch.spec 
Log Message:
no ppc build


Index: xenwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xenwatch/EL-5/xenwatch.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xenwatch.spec	23 Sep 2008 17:23:08 -0000	1.4
+++ xenwatch.spec	23 Sep 2008 17:52:46 -0000	1.5
@@ -11,15 +11,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: gtk2-devel
 BuildRequires: libvirt-devel libxml2-devel
-
-%ifnarch ppc ppc64
-BuildRequires: xen-devel xen-libs
-%endif
-
-%if "%{?fedora}" != ""
-BuildRequires: gnutls-devel gtk-vnc-devel
 ExcludeArch: ppc ppc64
-%endif
 
 # Don't build experimental/broken mDNS bits.
 #BuildRequires: avahi-glib-devel



From kaitlin at fedoraproject.org  Tue Sep 23 17:55:06 2008
From: kaitlin at fedoraproject.org (Kaitlin Rupert)
Date: Tue, 23 Sep 2008 17:55:06 +0000 (UTC)
Subject: rpms/libvirt-cim/devel hyp_conn_fail.patch, NONE,
	1.1 mem_parse.patch, 
	NONE, 1.1 mig_prof_ver.patch, NONE, 1.1 rm_def_virtdev.patch,
	NONE, 1.1 rm_eafp_err.patch, NONE, 1.1 sdc_unsup.patch, NONE,
	1.1 vsmigser_schema.patch, NONE, 1.1 libvirt-cim.spec, 1.19, 1.20
Message-ID: <20080923175506.A7D3C70103@cvs1.fedora.phx.redhat.com>

Author: kaitlin

Update of /cvs/pkgs/rpms/libvirt-cim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11558

Modified Files:
	libvirt-cim.spec 
Added Files:
	hyp_conn_fail.patch mem_parse.patch mig_prof_ver.patch 
	rm_def_virtdev.patch rm_eafp_err.patch sdc_unsup.patch 
	vsmigser_schema.patch 
Log Message:
Add new patches needed for release 0.5.1-5.  Also update rpm spec to include new patches.



hyp_conn_fail.patch:

--- NEW FILE hyp_conn_fail.patch ---
# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1220551376 25200
# Node ID f0f2c7bf7ec73c937ec24c2c7e1d1c455174c39c
# Parent  f54687a160bf4a80558e14ed58ae5b60c00781ec
Fix case where connecting to hypervisor fails in VSMS functions

In the associations, we want to silently exit when we can't connect to the
hypervisor because of the way the CIMOM implements the association
traversal.  In VSMS, where the user has specifically invoked a method on
a particular reference, that is not the correct behavior.

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r f54687a160bf -r f0f2c7bf7ec7 src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c	Thu Sep 04 11:02:54 2008 -0700
+++ b/src/Virt_VirtualSystemManagementService.c	Thu Sep 04 11:02:56 2008 -0700
@@ -1029,6 +1029,7 @@
         CMPIInstance *sys;
         CMPIArray *res;
         CMPIStatus s;
+        uint32_t rc = CIM_SVPC_RETURN_FAILED;
 
         CU_DEBUG("DefineSystem");
 
@@ -1054,6 +1055,10 @@
                            "ComputerSystemCreatedIndication",
                            reference);
  out:
+        if (s.rc == CMPI_RC_OK)
+                rc = CIM_SVPC_RETURN_COMPLETED;
+        CMReturnData(results, &rc, CMPI_uint32);
+
         return s;
 }
 
@@ -1538,16 +1543,22 @@
 
 static CMPIStatus _update_resource_settings(const CMPIObjectPath *ref,
                                             CMPIArray *resources,
+                                            const CMPIResult *results,
                                             resmod_fn func)
 {
         int i;
         virConnectPtr conn = NULL;
         CMPIStatus s;
         int count;
+        uint32_t rc = CIM_SVPC_RETURN_FAILED;
 
         conn = connect_by_classname(_BROKER, CLASSNAME(ref), &s);
-        if (conn == NULL)
+        if (conn == NULL) {
+                cu_statusf(_BROKER, &s,
+                           CMPI_RC_ERR_FAILED,
+                           "Unable to connect to hypervisor");
                 goto out;
+        }
 
         count = CMGetArrayCount(resources, NULL);
 
@@ -1596,6 +1607,11 @@
 
         }
  out:
+        if (s.rc == CMPI_RC_OK)
+                rc = CIM_SVPC_RETURN_COMPLETED;
+
+        CMReturnData(results, &rc, CMPI_uint32);
+
         virConnectClose(conn);
 
         return s;
@@ -1603,6 +1619,7 @@
 
 static CMPIStatus update_resource_settings(const CMPIObjectPath *ref,
                                            const CMPIArgs *argsin,
+                                           const CMPIResult *results,
                                            resmod_fn func)
 {
         CMPIArray *arr;
@@ -1615,7 +1632,7 @@
                 goto out;
         }
 
-        s = _update_resource_settings(ref, arr, func);
+        s = _update_resource_settings(ref, arr, results, func);
 
  out:
         return s;
@@ -1689,7 +1706,10 @@
                                         const CMPIArgs *argsin,
                                         CMPIArgs *argsout)
 {
-        return update_resource_settings(reference, argsin, resource_add);
+        return update_resource_settings(reference,
+                                        argsin,
+                                        results,
+                                        resource_add);
 }
 
 static CMPIStatus mod_resource_settings(CMPIMethodMI *self,
@@ -1699,7 +1719,10 @@
                                         const CMPIArgs *argsin,
                                         CMPIArgs *argsout)
 {
-        return update_resource_settings(reference, argsin, resource_mod);
+        return update_resource_settings(reference,
+                                        argsin,
+                                        results,
+                                        resource_mod);
 }
 
 static CMPIStatus rm_resource_settings(CMPIMethodMI *self,
@@ -1728,7 +1751,10 @@
         if (s.rc != CMPI_RC_OK)
                 goto out;
 
-        s = _update_resource_settings(reference, resource_arr, resource_del);
+        s = _update_resource_settings(reference,
+                                      resource_arr,
+                                      results,
+                                      resource_del);
  out:
         return s;
 }
diff -r f54687a160bf -r f0f2c7bf7ec7 src/svpc_types.h
--- a/src/svpc_types.h	Thu Sep 04 11:02:54 2008 -0700
+++ b/src/svpc_types.h	Thu Sep 04 11:02:56 2008 -0700
@@ -45,6 +45,7 @@
 #define CIM_VSSD_RECOVERY_PRESERVE 123
 
 #define CIM_SVPC_RETURN_JOB_STARTED   4096
+#define CIM_SVPC_RETURN_FAILED           2
 #define CIM_SVPC_RETURN_COMPLETED        0
 
 #define CIM_EC_CHAR_DEFAULT 2

mem_parse.patch:

--- NEW FILE mem_parse.patch ---
# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1220392087 25200
# Node ID 2796fd3e2eaa202206430ad59c01dd01cd982ccd
# Parent  2db1158cea318cfee11a77724c97a0b4758ffb2c
Fix memory XML parsing so that max_size is set to the memory value...

And size is set to the value of currentMem.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 2db1158cea31 -r 2796fd3e2eaa libxkutil/device_parsing.c
--- a/libxkutil/device_parsing.c	Fri Aug 29 08:16:56 2008 -0700
+++ b/libxkutil/device_parsing.c	Tue Sep 02 14:48:07 2008 -0700
@@ -407,9 +407,9 @@
 
         content = get_node_content(node);
 
-        if (XSTREQ(node->name, "memory"))
+        if (XSTREQ(node->name, "currentMemory"))
                 sscanf(content, "%" PRIu64, &mdev->size);
-        else if (XSTREQ(node->name, "currentMemory"))
+        else if (XSTREQ(node->name, "memory"))
                 sscanf(content, "%" PRIu64, &mdev->maxsize);
 
         free(content);

mig_prof_ver.patch:

--- NEW FILE mig_prof_ver.patch ---
# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1220551374 25200
# Node ID f54687a160bf4a80558e14ed58ae5b60c00781ec
# Parent  2796fd3e2eaa202206430ad59c01dd01cd982ccd
Update migration profile version

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 2796fd3e2eaa -r f54687a160bf src/profiles.h
--- a/src/profiles.h	Tue Sep 02 14:48:07 2008 -0700
+++ b/src/profiles.h	Thu Sep 04 11:02:54 2008 -0700
@@ -73,9 +73,9 @@
 
 struct reg_prof VirtualSystemMigration = {
         .reg_org = 2,
-        .reg_id = "CIM:DSP1081-VirtualSystemMigration-1.0",
+        .reg_id = "CIM:DSP1081-VirtualSystemMigration-0.8.1",
         .reg_name = "Virtual System Migration",
-        .reg_version = "1.0",
+        .reg_version = "0.8.1",
         .scoping_class = NULL,
         .scoping_profile = &SystemVirtualization
 };

rm_def_virtdev.patch:

--- NEW FILE rm_def_virtdev.patch ---
# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1221063953 25200
# Node ID b3f75efd7baf6dd6e1b023fdb91163f699c1a7c9
# Parent  e4e78fce79575db03c1629d625a53ec13f33992b
Remove the default implied VirtualDevice on DiskRASD

I'm not sure what I was thinking when I allowed the client to not specify
a VirtualDevice for a given disk, but this patch removes that and turns
it into an error.

The Address field needs to have similar semantics, but will be a little
more complicated for CDROM and thus will be handled in the upcoming set.

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r e4e78fce7957 -r b3f75efd7baf src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c	Fri Sep 05 11:55:57 2008 -0700
+++ b/src/Virt_VirtualSystemManagementService.c	Wed Sep 10 09:25:53 2008 -0700
@@ -440,7 +440,7 @@
         const char *val = NULL;
 
         if (cu_get_str_prop(inst, "VirtualDevice", &val) != CMPI_RC_OK)
-                val = "hda";
+                return "Missing `VirtualDevice' property";
 
         free(dev->dev.disk.virtual_dev);
         dev->dev.disk.virtual_dev = strdup(val);

rm_eafp_err.patch:

--- NEW FILE rm_eafp_err.patch ---
# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1221064059 25200
# Node ID 6a8e14dc94847ac449a65a28f83e6f8ee2b22fbd
# Parent  5d114b296a8228d1e591e1908fbecd4a96152e5e
Eliminate error status on EAFP when no pool link exists

I think that the proper behavior is to just not return anything instead of an
error.  Since not being affiliated with a pool isn't necessarily an error, we
shouldn't kill an entire associaton operation as a result.

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 5d114b296a82 -r 6a8e14dc9484 src/Virt_ElementAllocatedFromPool.c
--- a/src/Virt_ElementAllocatedFromPool.c	Wed Sep 10 09:27:19 2008 -0700
+++ b/src/Virt_ElementAllocatedFromPool.c	Wed Sep 10 09:27:39 2008 -0700
@@ -75,9 +75,7 @@
 
         poolid = pool_member_of(_BROKER, CLASSNAME(ref), type, id);
         if (poolid == NULL) {
-                cu_statusf(_BROKER, &s,
-                           CMPI_RC_ERR_FAILED,
-                           "Unknown pool membership for `%s'", id);
+                CU_DEBUG("No pool membership for `%s'", id);
                 goto out;
         }
 

sdc_unsup.patch:

--- NEW FILE sdc_unsup.patch ---
# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1221066318 25200
# Node ID 86aa60d7eb8c85c8ebeab009c231b9abe1afe156
# Parent  6a8e14dc94847ac449a65a28f83e6f8ee2b22fbd
Make SDC not return UNSUPPORTED for the rasd_to_alloc_cap case

Pegasus treats this as a soft error and ignores it, but SFCB halts
the entire association process (as would probably be expected).

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 6a8e14dc9484 -r 86aa60d7eb8c src/Virt_SettingsDefineCapabilities.c
--- a/src/Virt_SettingsDefineCapabilities.c	Wed Sep 10 09:27:39 2008 -0700
+++ b/src/Virt_SettingsDefineCapabilities.c	Wed Sep 10 10:05:18 2008 -0700
@@ -1002,7 +1002,7 @@
                                     struct std_assoc_info *info,
                                     struct inst_list *list)
 {
-        RETURN_UNSUPPORTED();
+        return (CMPIStatus){CMPI_RC_OK, NULL};
 }
 
 static CMPIStatus migrate_cap_to_vsmsd(const CMPIObjectPath *ref,

vsmigser_schema.patch:

--- NEW FILE vsmigser_schema.patch ---
# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1220021032 25200
# Node ID e2c21aedef202a43dfc29f64d4849589ca581292
# Parent  a8130304d2f225657fd8c58c0eedb5d0eea37b7f
Fix VSMigrationService schema to remove duplicate method name

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r a8130304d2f2 -r e2c21aedef20 schema/VSMigrationService.mof
--- a/schema/VSMigrationService.mof	Fri Aug 22 10:50:48 2008 -0700
+++ b/schema/VSMigrationService.mof	Fri Aug 29 07:43:52 2008 -0700
@@ -49,7 +49,7 @@
 	       CIM_ConcreteJob REF Job
       );
 
-      uint32 MigrateVirtualSystemToHost(
+      uint32 MigrateVirtualSystemToSystem(
 	     [In]
 	       CIM_ComputerSystem REF ComputerSystem,
 	     [In]


Index: libvirt-cim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/libvirt-cim.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libvirt-cim.spec	28 Aug 2008 15:56:44 -0000	1.19
+++ libvirt-cim.spec	23 Sep 2008 17:55:06 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: A CIM provider for libvirt
 Name: libvirt-cim
 Version: 0.5.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-cim-%{version}.tar.gz
@@ -28,6 +28,13 @@
 Patch8: add_shutdown_rsc.patch
 Patch9: vsmc_add_remove.patch
 Patch10: override_refconf.patch
+Patch11: vsmigser_schema.patch
+Patch12: mem_parse.patch
+Patch13: mig_prof_ver.patch
+Patch14: hyp_conn_fail.patch
+Patch15: rm_def_virtdev.patch
+Patch16: rm_eafp_err.patch
+Patch17: sdc_unsup.patch
 
 %description
 Libvirt-cim is a CMPI CIM provider that implements the DMTF SVPC
@@ -50,6 +57,13 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 %build
 %configure --disable-werror
@@ -114,7 +128,7 @@
 
 %files 
 %defattr(-, root, root)
-/etc/libvirt/cim
+%{_sysconfdir}/libvirt/cim
 
 %doc README COPYING doc/CodingStyle doc/SubmittingPatches
 #%doc base_schema/README.DMTF
@@ -131,6 +145,15 @@
 /etc/ld.so.conf.d/libvirt-cim.conf
 
 %changelog
+* Tue Sep 23 2008 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.1-5
+- Added vsmigser_schema patch to remove dup method name from VSMigrationService
+- Added mem_parse patch to set proper mem max_size and mem values
+- Added mig_prof_ver patch to report the proper Migration Profile version
+- Added hyp_conn_fail patch to fix when not connecting to hyp returns a failure
+- Added rm_def_virtdev patch to remove default DiskRADSD virtual device
+- Added rm_eafp_err patch to remove error status when EAFP no pool link exists
+- Added sdc_unsup patch to make SDC not return unsup for RASD to AC case
+
 * Wed Aug 27 2008 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.1-4
 - Added nostate patch to consider XenFV no state guests as running guests
 - Added createsnap_override patch to add vendor defined values to CreateSnapshot



From kraxel at fedoraproject.org  Tue Sep 23 17:57:50 2008
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Tue, 23 Sep 2008 17:57:50 +0000 (UTC)
Subject: rpms/xenwatch/EL-5 xenwatch.spec,1.5,1.6
Message-ID: <20080923175750.E965870033@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xenwatch/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12567

Modified Files:
	xenwatch.spec 
Log Message:
need new tag, bump release


Index: xenwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xenwatch/EL-5/xenwatch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xenwatch.spec	23 Sep 2008 17:52:46 -0000	1.5
+++ xenwatch.spec	23 Sep 2008 17:57:20 -0000	1.6
@@ -1,7 +1,7 @@
 Name:         xenwatch
 License:      GPLv2+
 Version:      0.5.3
-Release:      1%{?dist}
+Release:      2%{?dist}
 Summary:      Virtualization utilities, mostly for Xen
 Group:        Applications/Emulators
 Source:       %{name}-%{version}.tar.gz
@@ -54,7 +54,7 @@
 rm -rf %{buildroot}
 
 %changelog
-* Tue Sep 23 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.5.3-1
+* Tue Sep 23 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.5.3-2
 - update to 0.5.3.
 * Tue Dec 11 2007 Gerd Hoffmann <kraxel at redhat.com> - 0.5.2-4
 - exclude ppc on EL-5.



From spot at fedoraproject.org  Tue Sep 23 17:59:13 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 23 Sep 2008 17:59:13 +0000 (UTC)
Subject: rpms/scalapack/devel scalapack-1.7-fedora.patch, 1.8,
	1.9 scalapack.spec, 1.22, 1.23 scalapack-1.7-64bitlibs.patch,
	1.7, NONE
Message-ID: <20080923175913.7028570033@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/scalapack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13087

Modified Files:
	scalapack-1.7-fedora.patch scalapack.spec 
Removed Files:
	scalapack-1.7-64bitlibs.patch 
Log Message:
compile against new blacs, openmpi

scalapack-1.7-fedora.patch:

Index: scalapack-1.7-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/scalapack/devel/scalapack-1.7-fedora.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scalapack-1.7-fedora.patch	8 Jul 2008 19:05:54 -0000	1.8
+++ scalapack-1.7-fedora.patch	23 Sep 2008 17:59:13 -0000	1.9
@@ -27,14 +27,7 @@
  #
  #  The platform identifier to suffix to the end of library names
  #
-@@ -29,16 +29,16 @@
- #  and the directory where the BLACS libraries are
- #
- BLACSDBGLVL   = 0
--BLACSdir      = /usr/local/lib
-+BLACSdir      = /usr/lib
- #
- #  MPI setup; tailor to your system if using MPIBLACS
+@@ -35,10 +35,10 @@
  #  Will need to comment out these 6 lines if using PVM
  #
  USEMPI        = -DUsingMpiBlacs
@@ -42,7 +35,7 @@
 -BLACSFINIT    = $(BLACSdir)/libmpiblacsF77init-p4.a
 -BLACSCINIT    = $(BLACSdir)/libmpiblacsCinit-p4.a
 -BLACSLIB      = $(BLACSdir)/libmpiblacs-p4.a
-+SMPLIB        = -L/usr/lib/lam/lib -lmpi
++SMPLIB        = 
 +BLACSFINIT    = -lmpiblacsF77init
 +BLACSCINIT    = -lmpiblacsCinit
 +BLACSLIB      = -lmpiblacs
@@ -54,12 +47,13 @@
  #  The fortran and C compilers, loaders, and their flags
  #
 -F77           = g77
-+F77           = gfortran
++F77           = mpif77
  #F77           = /usr/local/pgi/linux86/bin/pgf77
- CC            = gcc
+-CC            = gcc
 -NOOPT         = 
 -F77FLAGS      =  -O3 $(NOOPT)
 -CCFLAGS       = -O4
++CC            = mpicc
 +NOOPT         = -fPIC
 +F77FLAGS      = $(RPM_OPT_FLAGS) $(NOOPT)
 +CCFLAGS       = $(RPM_OPT_FLAGS) $(NOOPT)
@@ -75,7 +69,7 @@
  #
  #  The archiver and the flag(s) to use when building archive (library)
  #  Also the ranlib routine.  If your system has no ranlib, set RANLIB = echo
-@@ -94,9 +94,13 @@
+@@ -94,9 +94,10 @@
  #  The name of the libraries to be created/linked to
  #
  SCALAPACKLIB  = $(home)/libscalapack.a
@@ -86,10 +80,7 @@
 -PBLIBS        = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB)
 -PRLIBS        = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB)
 -RLIBS         = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB)
-+LAMLIBS       = -L/usr/lib/lam/lib -llam -lmpi -llamf77mpi
-+EXTRALIBS     = -ldl -lpthread -lutil
-+
-+PBLIBS        = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
-+PRLIBS        = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
-+RLIBS         = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
++PBLIBS        = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB)
++PRLIBS        = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB)
++RLIBS         = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB)
  LIBS          = $(PBLIBS)


Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/devel/scalapack.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- scalapack.spec	8 Jul 2008 19:05:54 -0000	1.22
+++ scalapack.spec	23 Sep 2008 17:59:13 -0000	1.23
@@ -1,18 +1,16 @@
 Summary: A subset of LAPACK routines redesigned for heterogenous computing
 Name: scalapack
 Version: 1.7.5
-Release: 3%{?dist}
+Release: 4%{?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, lam-devel, blacs-devel
+BuildRequires: lapack-devel, blas-devel, openmpi-devel, blacs-devel
 BuildRequires: gcc-gfortran, glibc-devel
-Requires: lapack, blas-devel, lam, blacs-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: scalapack-1.7-fedora.patch
-Patch1: scalapack-1.7-64bitlibs.patch
 
 %description
 The ScaLAPACK (or Scalable LAPACK) library includes a subset 
@@ -51,9 +49,8 @@
 %prep
 %setup -q -c -n %{name}-%{version}
 %patch0 -p1
-%ifarch x86_64 ppc64 sparc64 ia64
-%patch1 -p1 -b .64
-%endif
+cd %{name}-%{version}/
+sed -i 's!BLACSdir      =.*!BLACSdir      = %{_libdir}!' SLmake.inc
 
 %build
 cd %{name}-%{version}
@@ -96,6 +93,10 @@
 %{_libdir}/libscalapack.so
 
 %changelog
+* Tue Sep 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.7.5-4
+- incorporate Deji Akingunola's changes (bz 462424)
+- build against openmpi instead of lam
+
 * Tue Jul  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.7.5-3
 - fix compile against new lam paths
 


--- scalapack-1.7-64bitlibs.patch DELETED ---



From kraxel at fedoraproject.org  Tue Sep 23 18:07:34 2008
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Tue, 23 Sep 2008 18:07:34 +0000 (UTC)
Subject: rpms/xenwatch/EL-5 xenwatch.spec,1.6,1.7
Message-ID: <20080923180734.5EFAB70033@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xenwatch/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14942

Modified Files:
	xenwatch.spec 
Log Message:
fixup buildrequires


Index: xenwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xenwatch/EL-5/xenwatch.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xenwatch.spec	23 Sep 2008 17:57:20 -0000	1.6
+++ xenwatch.spec	23 Sep 2008 18:07:04 -0000	1.7
@@ -1,7 +1,7 @@
 Name:         xenwatch
 License:      GPLv2+
 Version:      0.5.3
-Release:      2%{?dist}
+Release:      3%{?dist}
 Summary:      Virtualization utilities, mostly for Xen
 Group:        Applications/Emulators
 Source:       %{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: gtk2-devel
 BuildRequires: libvirt-devel libxml2-devel
+BuildRequires: xen-devel xen-libs
 ExcludeArch: ppc ppc64
 
 # Don't build experimental/broken mDNS bits.
@@ -54,7 +55,7 @@
 rm -rf %{buildroot}
 
 %changelog
-* Tue Sep 23 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.5.3-2
+* Tue Sep 23 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.5.3-3
 - update to 0.5.3.
 * Tue Dec 11 2007 Gerd Hoffmann <kraxel at redhat.com> - 0.5.2-4
 - exclude ppc on EL-5.



From kaitlin at fedoraproject.org  Tue Sep 23 18:11:58 2008
From: kaitlin at fedoraproject.org (Kaitlin Rupert)
Date: Tue, 23 Sep 2008 18:11:58 +0000 (UTC)
Subject: rpms/libvirt-cim/F-9 hyp_conn_fail.patch, NONE, 1.1 mem_parse.patch,
	NONE, 1.1 mig_prof_ver.patch, NONE, 1.1 rm_def_virtdev.patch,
	NONE, 1.1 rm_eafp_err.patch, NONE, 1.1 sdc_unsup.patch, NONE,
	1.1 vsmigser_schema.patch, NONE, 1.1 libvirt-cim.spec, 1.19, 1.20
Message-ID: <20080923181158.A854370033@cvs1.fedora.phx.redhat.com>

Author: kaitlin

Update of /cvs/pkgs/rpms/libvirt-cim/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16171

Modified Files:
	libvirt-cim.spec 
Added Files:
	hyp_conn_fail.patch mem_parse.patch mig_prof_ver.patch 
	rm_def_virtdev.patch rm_eafp_err.patch sdc_unsup.patch 
	vsmigser_schema.patch 
Log Message:
Added new patches and updated spec to prepare for release 0.5.1-5.




hyp_conn_fail.patch:

--- NEW FILE hyp_conn_fail.patch ---
# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1220551376 25200
# Node ID f0f2c7bf7ec73c937ec24c2c7e1d1c455174c39c
# Parent  f54687a160bf4a80558e14ed58ae5b60c00781ec
Fix case where connecting to hypervisor fails in VSMS functions

In the associations, we want to silently exit when we can't connect to the
hypervisor because of the way the CIMOM implements the association
traversal.  In VSMS, where the user has specifically invoked a method on
a particular reference, that is not the correct behavior.

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r f54687a160bf -r f0f2c7bf7ec7 src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c	Thu Sep 04 11:02:54 2008 -0700
+++ b/src/Virt_VirtualSystemManagementService.c	Thu Sep 04 11:02:56 2008 -0700
@@ -1029,6 +1029,7 @@
         CMPIInstance *sys;
         CMPIArray *res;
         CMPIStatus s;
+        uint32_t rc = CIM_SVPC_RETURN_FAILED;
 
         CU_DEBUG("DefineSystem");
 
@@ -1054,6 +1055,10 @@
                            "ComputerSystemCreatedIndication",
                            reference);
  out:
+        if (s.rc == CMPI_RC_OK)
+                rc = CIM_SVPC_RETURN_COMPLETED;
+        CMReturnData(results, &rc, CMPI_uint32);
+
         return s;
 }
 
@@ -1538,16 +1543,22 @@
 
 static CMPIStatus _update_resource_settings(const CMPIObjectPath *ref,
                                             CMPIArray *resources,
+                                            const CMPIResult *results,
                                             resmod_fn func)
 {
         int i;
         virConnectPtr conn = NULL;
         CMPIStatus s;
         int count;
+        uint32_t rc = CIM_SVPC_RETURN_FAILED;
 
         conn = connect_by_classname(_BROKER, CLASSNAME(ref), &s);
-        if (conn == NULL)
+        if (conn == NULL) {
+                cu_statusf(_BROKER, &s,
+                           CMPI_RC_ERR_FAILED,
+                           "Unable to connect to hypervisor");
                 goto out;
+        }
 
         count = CMGetArrayCount(resources, NULL);
 
@@ -1596,6 +1607,11 @@
 
         }
  out:
+        if (s.rc == CMPI_RC_OK)
+                rc = CIM_SVPC_RETURN_COMPLETED;
+
+        CMReturnData(results, &rc, CMPI_uint32);
+
         virConnectClose(conn);
 
         return s;
@@ -1603,6 +1619,7 @@
 
 static CMPIStatus update_resource_settings(const CMPIObjectPath *ref,
                                            const CMPIArgs *argsin,
+                                           const CMPIResult *results,
                                            resmod_fn func)
 {
         CMPIArray *arr;
@@ -1615,7 +1632,7 @@
                 goto out;
         }
 
-        s = _update_resource_settings(ref, arr, func);
+        s = _update_resource_settings(ref, arr, results, func);
 
  out:
         return s;
@@ -1689,7 +1706,10 @@
                                         const CMPIArgs *argsin,
                                         CMPIArgs *argsout)
 {
-        return update_resource_settings(reference, argsin, resource_add);
+        return update_resource_settings(reference,
+                                        argsin,
+                                        results,
+                                        resource_add);
 }
 
 static CMPIStatus mod_resource_settings(CMPIMethodMI *self,
@@ -1699,7 +1719,10 @@
                                         const CMPIArgs *argsin,
                                         CMPIArgs *argsout)
 {
-        return update_resource_settings(reference, argsin, resource_mod);
+        return update_resource_settings(reference,
+                                        argsin,
+                                        results,
+                                        resource_mod);
 }
 
 static CMPIStatus rm_resource_settings(CMPIMethodMI *self,
@@ -1728,7 +1751,10 @@
         if (s.rc != CMPI_RC_OK)
                 goto out;
 
-        s = _update_resource_settings(reference, resource_arr, resource_del);
+        s = _update_resource_settings(reference,
+                                      resource_arr,
+                                      results,
+                                      resource_del);
  out:
         return s;
 }
diff -r f54687a160bf -r f0f2c7bf7ec7 src/svpc_types.h
--- a/src/svpc_types.h	Thu Sep 04 11:02:54 2008 -0700
+++ b/src/svpc_types.h	Thu Sep 04 11:02:56 2008 -0700
@@ -45,6 +45,7 @@
 #define CIM_VSSD_RECOVERY_PRESERVE 123
 
 #define CIM_SVPC_RETURN_JOB_STARTED   4096
+#define CIM_SVPC_RETURN_FAILED           2
 #define CIM_SVPC_RETURN_COMPLETED        0
 
 #define CIM_EC_CHAR_DEFAULT 2

mem_parse.patch:

--- NEW FILE mem_parse.patch ---
# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1220392087 25200
# Node ID 2796fd3e2eaa202206430ad59c01dd01cd982ccd
# Parent  2db1158cea318cfee11a77724c97a0b4758ffb2c
Fix memory XML parsing so that max_size is set to the memory value...

And size is set to the value of currentMem.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 2db1158cea31 -r 2796fd3e2eaa libxkutil/device_parsing.c
--- a/libxkutil/device_parsing.c	Fri Aug 29 08:16:56 2008 -0700
+++ b/libxkutil/device_parsing.c	Tue Sep 02 14:48:07 2008 -0700
@@ -407,9 +407,9 @@
 
         content = get_node_content(node);
 
-        if (XSTREQ(node->name, "memory"))
+        if (XSTREQ(node->name, "currentMemory"))
                 sscanf(content, "%" PRIu64, &mdev->size);
-        else if (XSTREQ(node->name, "currentMemory"))
+        else if (XSTREQ(node->name, "memory"))
                 sscanf(content, "%" PRIu64, &mdev->maxsize);
 
         free(content);

mig_prof_ver.patch:

--- NEW FILE mig_prof_ver.patch ---
# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1220551374 25200
# Node ID f54687a160bf4a80558e14ed58ae5b60c00781ec
# Parent  2796fd3e2eaa202206430ad59c01dd01cd982ccd
Update migration profile version

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 2796fd3e2eaa -r f54687a160bf src/profiles.h
--- a/src/profiles.h	Tue Sep 02 14:48:07 2008 -0700
+++ b/src/profiles.h	Thu Sep 04 11:02:54 2008 -0700
@@ -73,9 +73,9 @@
 
 struct reg_prof VirtualSystemMigration = {
         .reg_org = 2,
-        .reg_id = "CIM:DSP1081-VirtualSystemMigration-1.0",
+        .reg_id = "CIM:DSP1081-VirtualSystemMigration-0.8.1",
         .reg_name = "Virtual System Migration",
-        .reg_version = "1.0",
+        .reg_version = "0.8.1",
         .scoping_class = NULL,
         .scoping_profile = &SystemVirtualization
 };

rm_def_virtdev.patch:

--- NEW FILE rm_def_virtdev.patch ---
# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1221063953 25200
# Node ID b3f75efd7baf6dd6e1b023fdb91163f699c1a7c9
# Parent  e4e78fce79575db03c1629d625a53ec13f33992b
Remove the default implied VirtualDevice on DiskRASD

I'm not sure what I was thinking when I allowed the client to not specify
a VirtualDevice for a given disk, but this patch removes that and turns
it into an error.

The Address field needs to have similar semantics, but will be a little
more complicated for CDROM and thus will be handled in the upcoming set.

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r e4e78fce7957 -r b3f75efd7baf src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c	Fri Sep 05 11:55:57 2008 -0700
+++ b/src/Virt_VirtualSystemManagementService.c	Wed Sep 10 09:25:53 2008 -0700
@@ -440,7 +440,7 @@
         const char *val = NULL;
 
         if (cu_get_str_prop(inst, "VirtualDevice", &val) != CMPI_RC_OK)
-                val = "hda";
+                return "Missing `VirtualDevice' property";
 
         free(dev->dev.disk.virtual_dev);
         dev->dev.disk.virtual_dev = strdup(val);

rm_eafp_err.patch:

--- NEW FILE rm_eafp_err.patch ---
# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1221064059 25200
# Node ID 6a8e14dc94847ac449a65a28f83e6f8ee2b22fbd
# Parent  5d114b296a8228d1e591e1908fbecd4a96152e5e
Eliminate error status on EAFP when no pool link exists

I think that the proper behavior is to just not return anything instead of an
error.  Since not being affiliated with a pool isn't necessarily an error, we
shouldn't kill an entire associaton operation as a result.

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 5d114b296a82 -r 6a8e14dc9484 src/Virt_ElementAllocatedFromPool.c
--- a/src/Virt_ElementAllocatedFromPool.c	Wed Sep 10 09:27:19 2008 -0700
+++ b/src/Virt_ElementAllocatedFromPool.c	Wed Sep 10 09:27:39 2008 -0700
@@ -75,9 +75,7 @@
 
         poolid = pool_member_of(_BROKER, CLASSNAME(ref), type, id);
         if (poolid == NULL) {
-                cu_statusf(_BROKER, &s,
-                           CMPI_RC_ERR_FAILED,
-                           "Unknown pool membership for `%s'", id);
+                CU_DEBUG("No pool membership for `%s'", id);
                 goto out;
         }
 

sdc_unsup.patch:

--- NEW FILE sdc_unsup.patch ---
# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1221066318 25200
# Node ID 86aa60d7eb8c85c8ebeab009c231b9abe1afe156
# Parent  6a8e14dc94847ac449a65a28f83e6f8ee2b22fbd
Make SDC not return UNSUPPORTED for the rasd_to_alloc_cap case

Pegasus treats this as a soft error and ignores it, but SFCB halts
the entire association process (as would probably be expected).

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 6a8e14dc9484 -r 86aa60d7eb8c src/Virt_SettingsDefineCapabilities.c
--- a/src/Virt_SettingsDefineCapabilities.c	Wed Sep 10 09:27:39 2008 -0700
+++ b/src/Virt_SettingsDefineCapabilities.c	Wed Sep 10 10:05:18 2008 -0700
@@ -1002,7 +1002,7 @@
                                     struct std_assoc_info *info,
                                     struct inst_list *list)
 {
-        RETURN_UNSUPPORTED();
+        return (CMPIStatus){CMPI_RC_OK, NULL};
 }
 
 static CMPIStatus migrate_cap_to_vsmsd(const CMPIObjectPath *ref,

vsmigser_schema.patch:

--- NEW FILE vsmigser_schema.patch ---
# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1220021032 25200
# Node ID e2c21aedef202a43dfc29f64d4849589ca581292
# Parent  a8130304d2f225657fd8c58c0eedb5d0eea37b7f
Fix VSMigrationService schema to remove duplicate method name

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r a8130304d2f2 -r e2c21aedef20 schema/VSMigrationService.mof
--- a/schema/VSMigrationService.mof	Fri Aug 22 10:50:48 2008 -0700
+++ b/schema/VSMigrationService.mof	Fri Aug 29 07:43:52 2008 -0700
@@ -49,7 +49,7 @@
 	       CIM_ConcreteJob REF Job
       );
 
-      uint32 MigrateVirtualSystemToHost(
+      uint32 MigrateVirtualSystemToSystem(
 	     [In]
 	       CIM_ComputerSystem REF ComputerSystem,
 	     [In]


Index: libvirt-cim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/F-9/libvirt-cim.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libvirt-cim.spec	27 Aug 2008 23:00:03 -0000	1.19
+++ libvirt-cim.spec	23 Sep 2008 18:11:58 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: A CIM provider for libvirt
 Name: libvirt-cim
 Version: 0.5.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-cim-%{version}.tar.gz
@@ -28,6 +28,13 @@
 Patch8: add_shutdown_rsc.patch
 Patch9: vsmc_add_remove.patch
 Patch10: override_refconf.patch
+Patch11: vsmigser_schema.patch
+Patch12: mem_parse.patch
+Patch13: mig_prof_ver.patch
+Patch14: hyp_conn_fail.patch
+Patch15: rm_def_virtdev.patch
+Patch16: rm_eafp_err.patch
+Patch17: sdc_unsup.patch
 
 %description
 Libvirt-cim is a CMPI CIM provider that implements the DMTF SVPC
@@ -50,6 +57,13 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 %build
 %configure --disable-werror
@@ -114,7 +128,7 @@
 
 %files 
 %defattr(-, root, root)
-/etc/libvirt/cim
+%{_sysconfdir}/libvirt/cim
 
 %doc README COPYING doc/CodingStyle doc/SubmittingPatches
 #%doc base_schema/README.DMTF
@@ -131,6 +145,15 @@
 /etc/ld.so.conf.d/libvirt-cim.conf
 
 %changelog
+* Tue Sep 23 2008 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.1-5
+- Added vsmigser_schema patch to remove dup method name from VSMigrationService
+- Added mem_parse patch to set proper mem max_size and mem values
+- Added mig_prof_ver patch to report the proper Migration Profile version
+- Added hyp_conn_fail patch to fix when not connecting to hyp returns a failure
+- Added rm_def_virtdev patch to remove default DiskRADSD virtual device
+- Added rm_eafp_err patch to remove error status when EAFP no pool link exists
+- Added sdc_unsup patch to make SDC not return unsup for RASD to AC case
+
 * Wed Aug 27 2008 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.1-4
 - Added nostate patch to consider XenFV no state guests as running guests
 - Added createsnap_override patch to add vendor defined values to CreateSnapshot



From katzj at fedoraproject.org  Tue Sep 23 18:13:23 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Tue, 23 Sep 2008 18:13:23 +0000 (UTC)
Subject: rpms/mkinitrd/devel .cvsignore, 1.202, 1.203 mkinitrd.spec, 1.288, 
	1.289 sources, 1.244, 1.245
Message-ID: <20080923181323.D248070033@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/mkinitrd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16643

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
* Tue Sep 23 2008 Jeremy Katz <katzj at redhat.com> - 6.0.64-1
- Fix live initrds for some built-in modules



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- .cvsignore	9 Sep 2008 19:36:56 -0000	1.202
+++ .cvsignore	23 Sep 2008 18:12:53 -0000	1.203
@@ -1 +1 @@
-mkinitrd-6.0.63.tar.bz2
+mkinitrd-6.0.64.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- mkinitrd.spec	11 Sep 2008 19:00:29 -0000	1.288
+++ mkinitrd.spec	23 Sep 2008 18:12:53 -0000	1.289
@@ -2,8 +2,8 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.63
-Release: 2%{?dist}
+Version: 6.0.64
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
@@ -120,6 +120,9 @@
 %dir %{_sysconfdir}/kernel/prerm.d
 
 %changelog
+* Tue Sep 23 2008 Jeremy Katz <katzj at redhat.com> - 6.0.64-1
+- Fix live initrds for some built-in modules
+
 * Thu Sep 11 2008 Peter Jones <pjones at redhat.com> - 6.0.63-2
 - Require a newer plymouth
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkinitrd/devel/sources,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- sources	9 Sep 2008 19:36:56 -0000	1.244
+++ sources	23 Sep 2008 18:12:53 -0000	1.245
@@ -1 +1 @@
-99203fcbd44e34991d55a64f5b745a9e  mkinitrd-6.0.63.tar.bz2
+27eeba52790d618a30961102e4c14e8a  mkinitrd-6.0.64.tar.bz2



From lkundrak at fedoraproject.org  Tue Sep 23 18:27:36 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 23 Sep 2008 18:27:36 +0000 (UTC)
Subject: rpms/gdm/F-9 gdm-2.22.0-fix-xdmcp.patch, NONE, 1.1 gdm.spec, 1.390, 
	1.391
Message-ID: <20080923182736.60B8370033@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gdm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20240

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.22.0-fix-xdmcp.patch 
Log Message:
* Tue Sep 23 2008 Lubomir Rintel <lkundrak at v3.sk> - 1:2.22.0-9
- Fix XDMCP, thanks to Michael Young (bug 446224)


gdm-2.22.0-fix-xdmcp.patch:

--- NEW FILE gdm-2.22.0-fix-xdmcp.patch ---
Bug 446224 -  xdmcp broken in gdm

"It seems gdm_manager_constructor is being called before manager->priv->xdmcp_enabled is
configured, so manager->priv->xdmcp_factory is never set. I am attaching an
illustrative patch which allows XDMCP to start listening."

-- Patch by Michael Young

https://bugzilla.redhat.com/show_bug.cgi?id=446224
https://bugzilla.redhat.com/attachment.cgi?id=305955
https://bugzilla.redhat.com/attachment.cgi?id=305245

diff -Nurp gdm-2.22.0.orig/daemon/gdm-display.c gdm-2.22.0/daemon/gdm-display.c
--- gdm-2.22.0.orig/daemon/gdm-display.c	2008-04-18 05:29:28.000000000 +0200
+++ gdm-2.22.0/daemon/gdm-display.c	2008-09-23 19:29:23.000000000 +0200
@@ -465,7 +465,7 @@ gdm_display_real_manage (GdmDisplay *dis
 
         g_assert (display->priv->slave_proxy == NULL);
 
-        if (!gdm_display_create_authority (display)) {
+        if (display->priv->access_file == NULL && !gdm_display_create_authority (display)) {
                 g_warning ("Unable to set up access control for display %d",
                            display->priv->x11_display_number);
                 return FALSE;
diff -Nurp gdm-2.22.0.orig/daemon/gdm-manager.c gdm-2.22.0/daemon/gdm-manager.c
--- gdm-2.22.0.orig/daemon/gdm-manager.c	2008-04-18 05:29:28.000000000 +0200
+++ gdm-2.22.0/daemon/gdm-manager.c	2008-09-23 19:29:42.000000000 +0200
@@ -323,9 +323,9 @@ gdm_manager_constructor (GType          
 
         manager->priv->local_factory = gdm_local_display_factory_new (manager->priv->display_store);
 
-        if (manager->priv->xdmcp_enabled) {
+/*        if (manager->priv->xdmcp_enabled) { */
                 manager->priv->xdmcp_factory = gdm_xdmcp_display_factory_new (manager->priv->display_store);
-        }
+/*        } */
 
         return G_OBJECT (manager);
 }
diff -Nurp gdm-2.22.0.orig/daemon/gdm-xdmcp-display-factory.c gdm-2.22.0/daemon/gdm-xdmcp-display-factory.c
--- gdm-2.22.0.orig/daemon/gdm-xdmcp-display-factory.c	2008-04-18 05:29:28.000000000 +0200
+++ gdm-2.22.0/daemon/gdm-xdmcp-display-factory.c	2008-09-23 19:29:23.000000000 +0200
@@ -2274,6 +2274,8 @@ gdm_xdmcp_handle_request (GdmXdmcpDispla
                                 gsize   cookie_size;
                                 char   *name;
 
+				gdm_display_create_authority (display);
+
                                 gdm_display_get_x11_cookie (display, &cookie,
                                                             &cookie_size, NULL);
 


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-9/gdm.spec,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- gdm.spec	30 Jun 2008 14:10:34 -0000	1.390
+++ gdm.spec	23 Sep 2008 18:27:06 -0000	1.391
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.22.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -86,6 +86,8 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=446672
 Patch6: gdm-2.22.0-enable-tcp.patch
 Patch7: gdm-2.22.0-fix-auto-login.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=446224
+Patch8: gdm-2.22.0-fix-xdmcp.patch
 Patch99: gdm-2.21.8-fedora-logo.patch
 
 %package user-switch-applet
@@ -112,6 +114,7 @@
 %patch5 -p1 -b .fix-pam-mkhomedir
 %patch6 -p1 -b .enable-tcp
 %patch7 -p1 -b .fix-auto-login
+%patch8 -p1 -b .fix-xdmcp
 %patch99 -p1 -b .fedora-logo
 
 %build
@@ -309,6 +312,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Tue Sep 23 2008 Lubomir Rintel <lkundrak at v3.sk> - 1:2.22.0-9
+- Fix XDMCP, thanks to Michael Young (bug 446224)
+
 * Mon Jun 30 2008 Ray Strode <rstrode at redhat.com> - 1:2.22.0-8
 - Fix automatic login option fix
 



From rdieter at fedoraproject.org  Tue Sep 23 18:38:32 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 23 Sep 2008 18:38:32 +0000 (UTC)
Subject: rpms/libksba/devel .cvsignore, 1.13, 1.14 libksba.spec, 1.30,
	1.31 sources, 1.13, 1.14
Message-ID: <20080923183832.53C1D70033@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libksba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22827

Modified Files:
	.cvsignore libksba.spec sources 
Log Message:
* Thu Sep 23 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.4-1
- libksba-1.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libksba/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	12 Feb 2008 21:39:06 -0000	1.13
+++ .cvsignore	23 Sep 2008 18:38:01 -0000	1.14
@@ -1,2 +1,2 @@
-libksba-1.0.3.tar.bz2
-libksba-1.0.3.tar.bz2.sig
+libksba-1.0.4.tar.bz2
+libksba-1.0.4.tar.bz2.sig


Index: libksba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libksba/devel/libksba.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libksba.spec	3 Apr 2008 15:24:11 -0000	1.30
+++ libksba.spec	23 Sep 2008 18:38:01 -0000	1.31
@@ -1,8 +1,8 @@
 
 Summary: X.509 library
 Name:    libksba
-Version: 1.0.3
-Release: 2%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
 
 License: GPLv3
 Group:   System Environment/Libraries
@@ -15,6 +15,7 @@
 Patch1: libksba-1.0.3-multilib.patch
 
 BuildRequires: gawk
+# >= 1.4 preferred
 BuildRequires: libgpg-error-devel >= 1.2 
 BuildRequires: libgcrypt-devel >= 1.2.0
 
@@ -79,18 +80,21 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README* THANKS TODO VERSION
-%{_libdir}/lib*.so.*
+%{_libdir}/libksba.so.8*
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/ksba-config
-%{_libdir}/lib*.so
+%{_libdir}/libksba.so
 %{_includedir}/*
 %{_datadir}/aclocal/*
 %{_infodir}/*
 
 
 %changelog
+* Thu Sep 23 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.4-1
+- libksba-1.0.4
+
 * Thu Apr 03 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.3-2
 - multiarch conflicts (#342201)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libksba/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	12 Feb 2008 21:39:06 -0000	1.13
+++ sources	23 Sep 2008 18:38:01 -0000	1.14
@@ -1,2 +1,2 @@
-91682491186d4ed43fff351aab2f5aad  libksba-1.0.3.tar.bz2
-3c058d06813c88e6ba5d2615e01963e3  libksba-1.0.3.tar.bz2.sig
+9a512633269e8f30e88abfd3b4105c3c  libksba-1.0.4.tar.bz2
+f383e74ac306b316169c5fc44bf11812  libksba-1.0.4.tar.bz2.sig



From rishi at fedoraproject.org  Tue Sep 23 18:52:38 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue, 23 Sep 2008 18:52:38 +0000 (UTC)
Subject: rpms/anjuta/F-9 anjuta-2.4.2-makefile.patch, NONE, 1.1 .cvsignore, 
	1.11, 1.12 anjuta.spec, 1.42, 1.43 sources, 1.11,
	1.12 anjuta-2.4.1-makefile.patch, 1.1, NONE
Message-ID: <20080923185238.D3B6F70033@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/anjuta/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26064

Modified Files:
	.cvsignore anjuta.spec sources 
Added Files:
	anjuta-2.4.2-makefile.patch 
Removed Files:
	anjuta-2.4.1-makefile.patch 
Log Message:
* Sat Sep 20 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.4.2-1
- Version bump to 2.4.2.
- Enabled Valgrind plugin and added 'BuildRequires: binutils-devel'.


anjuta-2.4.2-makefile.patch:

--- NEW FILE anjuta-2.4.2-makefile.patch ---
diff -urNp anjuta-2.4.2.orig/src/Makefile.in anjuta-2.4.2/src/Makefile.in
--- anjuta-2.4.2.orig/src/Makefile.in	2008-09-20 21:30:59.213869709 +0530
+++ anjuta-2.4.2/src/Makefile.in	2008-09-20 21:34:31.322102739 +0530
@@ -421,6 +421,7 @@ anjuta_pixmaps_DATA = \
 
 AM_CPPFLAGS = \
 	$(GNOME_UI_CFLAGS)\
+	$(GLADE_CFLAGS) \
 	$(GDL_CFLAGS)\
 	-I$(top_srcdir)\
 	-I.. -I. -DPACKAGE_BIN_DIR=\"$(bindir)\" \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 May 2008 19:15:33 -0000	1.11
+++ .cvsignore	23 Sep 2008 18:52:08 -0000	1.12
@@ -1 +1 @@
-anjuta-2.4.1.tar.bz2
+anjuta-2.4.2.tar.gz


Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/F-9/anjuta.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- anjuta.spec	26 May 2008 19:04:29 -0000	1.42
+++ anjuta.spec	23 Sep 2008 18:52:08 -0000	1.43
@@ -1,12 +1,12 @@
 Summary:	A GNOME development IDE for C/C++
 Name:		anjuta
 Epoch:		1
-Version:	2.4.1
+Version:	2.4.2
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
-Source0:	http://downloads.sourceforge.net/anjuta/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.4/%{name}-%{version}.tar.gz
 
 Patch0:		%{name}-%{version}-makefile.patch
 
@@ -24,6 +24,7 @@
 Requires(postun): /sbin/ldconfig
 
 BuildRequires:	autogen
+BuildRequires:	binutils-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	devhelp-devel
 BuildRequires:	gettext
@@ -105,7 +106,7 @@
 %configure --disable-schemas-install --disable-static --enable-gtk-doc \
   --enable-devhelp --enable-plugin-glade --enable-graphviz \
   --enable-plugin-scintilla --enable-plugin-sourceview \
-  --disable-plugin-valgrind --enable-plugin-subversion \
+  --enable-plugin-subversion --enable-plugin-valgrind \
   --with-svn-lib=%{_libdir}
 
 # Omit unused direct shared library dependencies.
@@ -137,9 +138,9 @@
 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 || :
+  %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
   gconftool-2 --makefile-uninstall-rule \
-    %{_sysconfdir}/gconf/schemas/%{name}-*.schemas >/dev/null || :
+  %{_sysconfdir}/gconf/schemas/%{name}-*.schemas >/dev/null || :
 fi
 
 %post
@@ -170,9 +171,9 @@
 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 || :
+  %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
   gconftool-2 --makefile-uninstall-rule \
-    %{_sysconfdir}/gconf/schemas/%{name}-*.schemas > /dev/null || :
+  %{_sysconfdir}/gconf/schemas/%{name}-*.schemas > /dev/null || :
 fi
 
 %postun
@@ -265,6 +266,10 @@
 %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf
 
 %changelog
+* Sat Sep 20 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.4.2-1
+- Version bump to 2.4.2.
+- Enabled Valgrind plugin and added 'BuildRequires: binutils-devel'.
+
 * Sat May 24 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.4.1-1
 - Version bump to 2.4.1. Closes Red Hat Bugzilla bug #446242.
 - Spurious file modification messages from Scintilla fixed by upstream. Closes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	26 May 2008 19:15:33 -0000	1.11
+++ sources	23 Sep 2008 18:52:08 -0000	1.12
@@ -1 +1 @@
-97d919cade598ab86442b34bbc2cbe1e  anjuta-2.4.1.tar.bz2
+7cda0fab0e0e946f461737c3eac7a6a3  anjuta-2.4.2.tar.gz


--- anjuta-2.4.1-makefile.patch DELETED ---



From rishi at fedoraproject.org  Tue Sep 23 18:56:00 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue, 23 Sep 2008 18:56:00 +0000 (UTC)
Subject: rpms/anjuta/devel anjuta-2.4.2-makefile.patch, NONE, 1.1 .cvsignore,
	1.11, 1.12 anjuta.spec, 1.44, 1.45 sources, 1.11,
	1.12 anjuta-2.4.1-makefile.patch, 1.1, NONE
Message-ID: <20080923185600.6C75870033@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/anjuta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27097

Modified Files:
	.cvsignore anjuta.spec sources 
Added Files:
	anjuta-2.4.2-makefile.patch 
Removed Files:
	anjuta-2.4.1-makefile.patch 
Log Message:
* Sat Sep 20 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.4.2-1
- Version bump to 2.4.2.
- Enabled Valgrind plugin and added 'BuildRequires: binutils-devel'.


anjuta-2.4.2-makefile.patch:

--- NEW FILE anjuta-2.4.2-makefile.patch ---
diff -urNp anjuta-2.4.2.orig/src/Makefile.in anjuta-2.4.2/src/Makefile.in
--- anjuta-2.4.2.orig/src/Makefile.in	2008-09-20 21:30:59.213869709 +0530
+++ anjuta-2.4.2/src/Makefile.in	2008-09-20 21:34:31.322102739 +0530
@@ -421,6 +421,7 @@ anjuta_pixmaps_DATA = \
 
 AM_CPPFLAGS = \
 	$(GNOME_UI_CFLAGS)\
+	$(GLADE_CFLAGS) \
 	$(GDL_CFLAGS)\
 	-I$(top_srcdir)\
 	-I.. -I. -DPACKAGE_BIN_DIR=\"$(bindir)\" \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	25 May 2008 10:48:50 -0000	1.11
+++ .cvsignore	23 Sep 2008 18:55:29 -0000	1.12
@@ -1 +1 @@
-anjuta-2.4.1.tar.bz2
+anjuta-2.4.2.tar.gz


Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- anjuta.spec	26 May 2008 18:56:00 -0000	1.44
+++ anjuta.spec	23 Sep 2008 18:55:30 -0000	1.45
@@ -1,12 +1,12 @@
 Summary:	A GNOME development IDE for C/C++
 Name:		anjuta
 Epoch:		1
-Version:	2.4.1
+Version:	2.4.2
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
-Source0:	http://downloads.sourceforge.net/anjuta/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.4/%{name}-%{version}.tar.gz
 
 Patch0:		%{name}-%{version}-makefile.patch
 
@@ -24,6 +24,7 @@
 Requires(postun): /sbin/ldconfig
 
 BuildRequires:	autogen
+BuildRequires:	binutils-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	devhelp-devel
 BuildRequires:	gettext
@@ -105,7 +106,7 @@
 %configure --disable-schemas-install --disable-static --enable-gtk-doc \
   --enable-devhelp --enable-plugin-glade --enable-graphviz \
   --enable-plugin-scintilla --enable-plugin-sourceview \
-  --disable-plugin-valgrind --enable-plugin-subversion \
+  --enable-plugin-subversion --enable-plugin-valgrind \
   --with-svn-lib=%{_libdir}
 
 # Omit unused direct shared library dependencies.
@@ -137,9 +138,9 @@
 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 || :
+  %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
   gconftool-2 --makefile-uninstall-rule \
-    %{_sysconfdir}/gconf/schemas/%{name}-*.schemas >/dev/null || :
+  %{_sysconfdir}/gconf/schemas/%{name}-*.schemas >/dev/null || :
 fi
 
 %post
@@ -170,9 +171,9 @@
 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 || :
+  %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
   gconftool-2 --makefile-uninstall-rule \
-    %{_sysconfdir}/gconf/schemas/%{name}-*.schemas > /dev/null || :
+  %{_sysconfdir}/gconf/schemas/%{name}-*.schemas > /dev/null || :
 fi
 
 %postun
@@ -265,6 +266,10 @@
 %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf
 
 %changelog
+* Sat Sep 20 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.4.2-1
+- Version bump to 2.4.2.
+- Enabled Valgrind plugin and added 'BuildRequires: binutils-devel'.
+
 * Sat May 24 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.4.1-1
 - Version bump to 2.4.1. Closes Red Hat Bugzilla bug #446242.
 - Spurious file modification messages from Scintilla fixed by upstream. Closes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	25 May 2008 10:48:50 -0000	1.11
+++ sources	23 Sep 2008 18:55:30 -0000	1.12
@@ -1 +1 @@
-97d919cade598ab86442b34bbc2cbe1e  anjuta-2.4.1.tar.bz2
+7cda0fab0e0e946f461737c3eac7a6a3  anjuta-2.4.2.tar.gz


--- anjuta-2.4.1-makefile.patch DELETED ---



From mclasen at fedoraproject.org  Tue Sep 23 18:57:06 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 23 Sep 2008 18:57:06 +0000 (UTC)
Subject: rpms/gdm/devel gdm.spec,1.422,1.423
Message-ID: <20080923185706.730CD70103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27420

Modified Files:
	gdm.spec 
Log Message:
fix sound on the login screen



Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -r1.422 -r1.423
--- gdm.spec	23 Sep 2008 14:02:03 -0000	1.422
+++ gdm.spec	23 Sep 2008 18:56:36 -0000	1.423
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.24.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -310,11 +310,11 @@
 %config %{_datadir}/gdm/autostart/LoginWindow/*
 %dir %{_localstatedir}/log/gdm
 %dir %{_localstatedir}/spool/gdm
-%attr(1750, root, gdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory
-%attr(1640, root, gdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory/*.xml
-%attr(1640, root, gdm) %dir %{_localstatedir}/lib/gdm/.gconf.path
+%attr(1770, gdm, gdm) %dir %{_localstatedir}/lib/gdm
+%attr(1750, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory
+%attr(1640, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory/*.xml
+%attr(1640, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.gconf.path
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
-%attr(1770, root, gdm) %dir %{_localstatedir}/lib/gdm
 %attr(1777, root, gdm) %dir %{_localstatedir}/run/gdm
 
 %files user-switch-applet
@@ -324,6 +324,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-4
+- Let /var/lib/gdm be owned by gdm, to make pulseaudio happy
+
 * Tue Sep 23 2008 Ray Strode <rstrode at redhat.com> - 1:2.24.0-3
 - Load background after everything else, so the crossfade
   isn't choppy.



From tmraz at fedoraproject.org  Tue Sep 23 18:57:17 2008
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 23 Sep 2008 18:57:17 +0000 (UTC)
Subject: rpms/gnutls/devel .cvsignore, 1.15, 1.16 gnutls.spec, 1.34,
	1.35 sources, 1.15, 1.16
Message-ID: <20080923185717.742CA7013D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gnutls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27515

Modified Files:
	.cvsignore gnutls.spec sources 
Log Message:
* Tue Sep 23 2008 Tomas Mraz <tmraz at redhat.com> 2.4.2-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	1 Jul 2008 07:21:07 -0000	1.15
+++ .cvsignore	23 Sep 2008 18:56:47 -0000	1.16
@@ -1 +1 @@
-gnutls-2.4.1-nosrp.tar.bz2
+gnutls-2.4.2-nosrp.tar.bz2


Index: gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/devel/gnutls.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gnutls.spec	1 Jul 2008 07:21:07 -0000	1.34
+++ gnutls.spec	23 Sep 2008 18:56:47 -0000	1.35
@@ -1,6 +1,6 @@
 Summary: A TLS protocol implementation
 Name: gnutls
-Version: 2.4.1
+Version: 2.4.2
 Release: 1%{?dist}
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
 License: GPLv3+ and LGPLv2+
@@ -123,6 +123,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Sep 23 2008 Tomas Mraz <tmraz at redhat.com> 2.4.2-1
+- new upstream version
+
 * Tue Jul  1 2008 Tomas Mraz <tmraz at redhat.com> 2.4.1-1
 - new upstream version
 - correct the license tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	1 Jul 2008 07:21:07 -0000	1.15
+++ sources	23 Sep 2008 18:56:47 -0000	1.16
@@ -1 +1 @@
-1ddb4dcb078fc5664d939dc652dab193  gnutls-2.4.1-nosrp.tar.bz2
+dcc09099518f4560a01d3b153bcafc5d  gnutls-2.4.2-nosrp.tar.bz2



From rishi at fedoraproject.org  Tue Sep 23 19:10:03 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue, 23 Sep 2008 19:10:03 +0000 (UTC)
Subject: rpms/astyle/F-9 astyle-1.21-gcc43.patch, NONE, 1.1 astyle.spec, 1.7,
	1.8
Message-ID: <20080923191003.0B6E870033@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/astyle/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30439

Modified Files:
	astyle.spec 
Added Files:
	astyle-1.21-gcc43.patch 
Log Message:
* Wed Sep 24 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.21-9
- Fixed build failure with gcc-4.3. Closes Red Hat Bugzilla bug #433971.


astyle-1.21-gcc43.patch:

--- NEW FILE astyle-1.21-gcc43.patch ---
diff -urNp astyle.orig/src/astyle.h astyle/src/astyle.h
--- astyle.orig/src/astyle.h	2007-05-12 19:38:02.000000000 +0530
+++ astyle/src/astyle.h	2008-09-23 18:40:53.381016582 +0530
@@ -37,6 +37,7 @@
 #include <string>
 #include <vector>
 #include <cctype>
+#include <cstring>
 
 using namespace std;
 


Index: astyle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/astyle/F-9/astyle.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- astyle.spec	18 Feb 2008 18:42:57 -0000	1.7
+++ astyle.spec	23 Sep 2008 19:09:32 -0000	1.8
@@ -1,12 +1,15 @@
 Name:           astyle
 Version:        1.21
-Release:        7%{?dist}
+Release:        9%{?dist}
 Summary:        Source code formatter for C-like programming languages
 
 Group:          Development/Tools
-License:        LGPL
+License:        LGPLv2+
 URL:            http://astyle.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{version}_linux.tar.gz
+
+Patch0:         %{name}-%{version}-gcc43.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -17,7 +20,7 @@
 
 %prep
 %setup -q -n %{name}
-
+%patch0 -p1
 
 %build
 g++ -o astyle $RPM_OPT_FLAGS src/*.cpp
@@ -41,6 +44,12 @@
 %doc doc/*.html
 
 %changelog
+* Wed Sep 24 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.21-9
+- Fixed build failure with gcc-4.3. Closes Red Hat Bugzilla bug #433971.
+
+* Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.21-8
+- fix license tag
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.21-7
 - Autorebuild for GCC 4.3
 



From rishi at fedoraproject.org  Tue Sep 23 19:21:13 2008
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue, 23 Sep 2008 19:21:13 +0000 (UTC)
Subject: rpms/astyle/devel astyle-1.21-gcc43.patch, NONE, 1.1 astyle.spec,
	1.8, 1.9
Message-ID: <20080923192113.6FD8570033@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/astyle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv493

Modified Files:
	astyle.spec 
Added Files:
	astyle-1.21-gcc43.patch 
Log Message:
* Wed Sep 24 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.21-9
- Fixed build failure with gcc-4.3. Closes Red Hat Bugzilla bug #433971.


astyle-1.21-gcc43.patch:

--- NEW FILE astyle-1.21-gcc43.patch ---
diff -urNp astyle.orig/src/astyle.h astyle/src/astyle.h
--- astyle.orig/src/astyle.h	2007-05-12 19:38:02.000000000 +0530
+++ astyle/src/astyle.h	2008-09-23 18:40:53.381016582 +0530
@@ -37,6 +37,7 @@
 #include <string>
 #include <vector>
 #include <cctype>
+#include <cstring>
 
 using namespace std;
 


Index: astyle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/astyle/devel/astyle.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- astyle.spec	21 May 2008 16:48:53 -0000	1.8
+++ astyle.spec	23 Sep 2008 19:20:43 -0000	1.9
@@ -1,12 +1,15 @@
 Name:           astyle
 Version:        1.21
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Source code formatter for C-like programming languages
 
 Group:          Development/Tools
 License:        LGPLv2+
 URL:            http://astyle.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{version}_linux.tar.gz
+
+Patch0:         %{name}-%{version}-gcc43.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -17,7 +20,7 @@
 
 %prep
 %setup -q -n %{name}
-
+%patch0 -p1
 
 %build
 g++ -o astyle $RPM_OPT_FLAGS src/*.cpp
@@ -41,6 +44,9 @@
 %doc doc/*.html
 
 %changelog
+* Wed Sep 24 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.21-9
+- Fixed build failure with gcc-4.3. Closes Red Hat Bugzilla bug #433971.
+
 * Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.21-8
 - fix license tag
 



From ajax at fedoraproject.org  Tue Sep 23 19:36:50 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 23 Sep 2008 19:36:50 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel .cvsignore, 1.47, 1.48 import.log, 1.1, 
	1.2 sources, 1.42, 1.43 xorg-x11-server.spec, 1.352, 1.353
Message-ID: <20080923193650.D156370033@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-serv4396/devel

Modified Files:
	.cvsignore import.log sources xorg-x11-server.spec 
Log Message:
xserver 1.5.1 and changelog trim



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	3 Sep 2008 23:41:17 -0000	1.47
+++ .cvsignore	23 Sep 2008 19:36:20 -0000	1.48
@@ -1 +1 @@
-xorg-server-1.5.0.tar.bz2
+xorg-server-1.5.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Sep 2008 23:41:17 -0000	1.1
+++ import.log	23 Sep 2008 19:36:20 -0000	1.2
@@ -1 +1,2 @@
 xorg-x11-server-1_5_0-1_fc10:HEAD:xorg-x11-server-1.5.0-1.fc10.src.rpm:1220485219
+xorg-x11-server-1_5_1-1_fc10:HEAD:xorg-x11-server-1.5.1-1.fc10.src.rpm:1222198557


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	3 Sep 2008 23:41:17 -0000	1.42
+++ sources	23 Sep 2008 19:36:20 -0000	1.43
@@ -1 +1 @@
-9a817e5f7374d45b4dbe64b21bc0fb61  xorg-server-1.5.0.tar.bz2
+d16f5a033f001c9069b4141194614da2  xorg-server-1.5.1.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- xorg-x11-server.spec	11 Sep 2008 18:33:48 -0000	1.352
+++ xorg-x11-server.spec	23 Sep 2008 19:36:20 -0000	1.353
@@ -18,8 +18,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.5.0
-Release:   6%{?dist}
+Version:   1.5.1
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -500,6 +500,10 @@
 
 
 %changelog
+* Tue Sep 23 2008 Adam Jackson <ajax at redhat.com> 1.5.1-1
+- xserver 1.5.1
+- Trim %%changelog.
+
 * Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 1.5.0-6
 - Comment out glxdri2.c since it doesn't compile. (krh says it
   won't break at runtime). 
@@ -817,912 +821,3 @@
 * Wed Oct 31 2007 Adam Jackson <ajax at redhat.com> 1.4.99.1-0.1
 - Begin rebasing to git master.  It almost builds, assuming you disable
   glx, kdrive, and dmx, and remove like half the patches.
-
-* Thu Oct 18 2007 Dave Airlie <airlied at redhat.com> 1.3.0.0-33
-- xserver-1.3.0-xorg-conf-man-randr-update.patch - update man page for randr setup
-- xserver-1.3.0-update-quirks.patch - update quirks for more monitor issues
-- BuildReq: mesa-source >= 7.0.1-6.
-
-* Mon Oct 15 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-31.jx
-- xserver-1.3.0-late-sigusr1.patch: Test, move kill(getppid(), SIGUSR1)
-  as late as possible.
-
-* Fri Oct 12 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-31
-- xorg-x11-server-Red-Hat-extramodes.patch: Remove 2560x1600 GTF timing.
-
-* Thu Oct 11 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-30
-- xserver-1.3.0-avoid-ps2-probe.patch: /dev/input/mice is always ExplorerPS/2,
-  so don't waste time on startup probing for it.
-
-* Fri Oct 05 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-29
-- xserver-1.3.0-randr-preferred-mode-fix.patch: Fix infinite loop on X
-  startup when a mode is requested in the config file. (#318731)
-- Fix License tag.
-
-* Wed Oct 03 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-28
-- xserver-1.3.0-accidental-abi.patch: Make sure some symbols from parser/
-  get exported, since apparently the intel driver uses them despite their
-  not being in the documented ABI list.  Thanks guys.
-
-* Mon Oct 01 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-27
-- BuildReq: mesa-source >= 7.0.1-5.
-
-* Wed Sep 26 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-26
-- xserver-1.3.0-randr-updates.patch: Default ModeDebug to TRUE, better to
-  have too much information than too little.
-- xorg-x11-server-1.0.1-fpic-libxf86config.patch: Build the parser library
-  with hidden symbols to shrink pyf86config a bit.
-- xserver-1.3.0-intel-by-default.patch: Use intel, not i810, when starting
-  without a config file.
-- Enable maintainer mode when building so I swear at autotools less.
-
-* Wed Sep 26 2007 Dave Airlie <airlied at redhat.com> 1.3.0.0-25
-- xserver-1.3.0-randr-updates.patch: Backport randr from server git
-  This contains a lot of fixes since 1.3.0 went out, and saves
-  us backporting each fix individually
-- xserver-1.3.0-less-randr-fakerama.patch - dropped
-- xorg-x11-server-1.2.0-maxpixclock-option.patch - dropped
-- xserver-1.3.0-edid-quirk-backports.patch - dropped
-- xserver-1.2.0-honor-displaysize.patch - dropped
-- xserver-1.3.0-honor-displaysize.patch - reapply to new code layout
-- xserver-1.3.0-randr12-config-hack.patch - rebased
-
-* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-24
-- xserver-1.3.0-edid-quirk-backports.patch: Update the EDID quirks code
-  to match current git.
-
-* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-23
-- xserver-1.3.0-xrandr-timestamp-buglet.patch: Make sure xrandr doesn't
-  stop working after several hours. (Marius Gedminas, #273801)
-
-* Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-22
-- Bump BuildRequires: xorg-x11-xtrans-devel to pull in abstract socket
-  support.
-
-* Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-21
-- xserver-1.3.0-document-fontpath-correctly.patch: Fix man page to point to
-  directories that exist. (#251203, Mat??j Cepl)
-
-* Wed Aug 15 2007 Dave Airlie <airlied at redhat.com> 1.3.0.0-20
-- xserver-1.3.0-newglx-offscreen-pixmaps.patch: fix zero-copy TFP again
-
-* Tue Aug 14 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-19
-- xserver-1.3.0-newglx-offscreen-pixmaps.patch: Zero-copy TFP is busted
-  on at least my laptop, so turn it off again.
-
-* Mon Aug 13 2007 Dave Airlie <airlied at redhat.com> 1.3.0.0-18
-- xserver-1.3.0-mesa7.patch: Add support for building against mesa 7.0.1
-  along with DRI zero-copy TFP hopefully
-- xserver-1.3.0-exaupgrade.patch: Add updated EXA support
-- dropped xserver-1.2.99.901-xephyr-crash-at-exit.patch - upstream
-- rebase xorg-x11-server-1.1.1-offscreen-pixmaps.patch to xserver-1.3.0-newglx-offscreen-pixmaps.patch
-- dropped xorg-x11-server-1.1.1-glcore-visual-matching.patch - fixed upstream
-
-* Thu Aug 09 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-17
-- xserver-1.3.0-default-dpi.patch: Switch default DPI to 100, on the
-  principle that 75 is almost never right and 100 is much more likely.
-
-* Thu Aug 02 2007 Dave Airlie <airlied at redhat.com> 1.3.0.0-16
-- xserver-1.3.0-add-really-slow-bcopy.patch: Speed server start on some cards
-
-* Thu Jul 12 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-15
-- xserver-1.3.0-edid-quirk-backports.patch: Backport EDID quirks from
-  master; fixes some Samsung monitors. (#232810)
-
-* Thu Jul 12 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-14
-- xserver-1.3.0-composite-version.patch: Force the server to report the
-  Composite extension version it supports, not simply the version defined
-  by the protocol headers it was built against.
-
-* Mon Jul 02 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-13
-- Add IDLETIME sync counter for great powersaving justice.
-- Conditionalise default font path for F7 spec compatibility.
-
-* Wed Jun 27 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-12
-- Tweak %%post Xorg slightly to not demolish ModulePath lines installed by
-  the nvidia driver.  (#244359)
-
-* Wed Jun 27 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-11
-- Obsolete the joystick and elo2300 drivers, they never worked and shouldn't
-  be installed.
-
-* Fri Jun 22 2007 Kristian H??gsberg <krh at redhat.com> - 1.3.0.0-10
-- Change the default font path to catalogue:/etc/X11/fontpath.d,built-ins
-- Drop build dependency xorg-x11-font-utils.
-
-* Mon Jun 11 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-9
-- xserver-1.3.0-reput-video.patch: Don't crash when minimizing an Xv
-  window. (#241214)
-
-* Wed Jun 06 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-8
-- xserver-1.3.0-ramdac-export.patch: Make sure the old ramdac symbols are
-  exported, since they're in-server now. (#242800)
-
-* Mon Jun 04 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-7
-- xserver-1.3.0-randrama-no-zero-screens.patch: For RANDR 1.2's fake
-  Xinerama info, don't report Xinerama as being active if there are no
-  RANDR 1.2 CRTCs active for that screen.  (#234567)
-- xserver-1.3.0-arm-iopl.patch: Add __arm__ conditionals to many #ifdefs.
-
-* Sat May 26 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-6
-- Make sdk subpackage Require: pkgconfig.  Spotted in review for
-  xorg-x11-drv-apm. (#226577)
-
-* Fri May 11 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-5
-- xserver-1.3.0-fbdevhw-magic-numbers.patch: If the fbdev driver claims to
-  have a zero pixel clock, believe it.  Fixes Xen paravirt. (#238451)
-
-* Mon May 07 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-4
-- xorg-x11-server-1.1.1-offscreen-pixmaps.patch: Fix a crash when activating
-  GLX_EXT_texture_from_pixmap without XAA.
-- xserver-1.3.0-randr12-config-hack.patch: If a Modes line is given in
-  the Screen section, and no PreferredMode option is given for a RANDR 1.2
-  monitor, use the first mode in the Modes line as the preferred mode.
-  Fixes anaconda ugliness on monitors larger than 800x600. (#238991)
-
-* Mon Apr 30 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-3
-- xserver-1.3.0-xkb-and-loathing.patch: Ignore (not just block) SIGALRM
-  around calls to Popen()/Pclose().  Fixes a hang in openoffice when
-  opening menus.
-- Modify BuildRequires to use the virtual protocol Provides.
-
-* Wed Apr 25 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-2
-- xserver-1.3.0-less-randr-fakerama.patch: Disable RANDR's fake Xinerama
-  geometry when there's more than one protocol screen. (#231257)
-
-* Mon Apr 23 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-1
-- xserver 1.3.0.
-
-* Fri Apr 13 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-5
-- xserver-rc5-to-now.patch: Updates from git.
-
-* Wed Apr 11 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-4
-- xserver-1.3.0-no-prerelease-warning.patch: Hush the useless prerelease
-  warning if we happen to be building one (and even if not).
-- xserver-1.3.0-pci-device-enable.patch: Make sure the PCI device is enabled
-  in sysfs before we start touching it, otherwise, armageddon.
-
-* Tue Apr 10 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-3
-- xserver-1.3.0-domain-obiwan.patch: Fix a PCI domain off-by-one. (#235861)
-- xserver-1.3.0-x86emu-imul-int64.patch: Fix imul in x86emu. (#235861)
-
-* Mon Apr 09 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-2
-- xserver-1.3.0-pci-bus-count.patch: Allocate the PCI bus array dynamically,
-  so as not to run off the end of it.
-- xserver-1.3.0-mmap-failure-check.patch: Check for failure when mmap'ing
-  bus memory. (#234073)
-- xserver-1.3.0-rom-search.patch: Look for the sysfs ROM file in the (flat)
-  /sys/bus/pci/devices tree, instead of the (bus-topological) /sys/devices,
-  so we don't fail to find ROMs merely because they're behind a bridge.
-- xserver-1.3.0-no-pseudocolor-composite.patch: Refuse to initialize
-  Composite when Render is missing or when the root window is using
-  a pseudocolor visual. (#217388)
-- xserver-1.3.0-xnest-exposures.patch: Fix Motif app redraw in Xnest. (#229350)
-
-* Fri Apr 06 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-1
-- xserver 1.3 RC5.
-
-* Fri Mar 30 2007 David Woodhouse <dwmw2 at redhat.com> 1.2.99.903-2
-- Fix regression with PCI domains, but disjoint bus numbers (#207659)
-
-* Fri Mar 30 2007 Adam Jackson <ajax at redhat.com> 1.2.99.903-1
-- xserver 1.3 RC3.
-
-* Mon Mar 19 2007 Adam Jackson <ajax at redhat.com> 1.2.99.902-1
-- xserver 1.3 RC2.
-
-* Tue Mar 13 2007 Adam Jackson <ajax at redhat.com> 1.2.99.901-2
-- xserver-1.2.99.901-xephyr-crash-at-exit.patch: Fix yet another GLX visual
-  mess. (#231425)
-
-* Mon Mar 05 2007 Adam Jackson <ajax at redhat.com> 1.2.99.901-1
-- xserver 1.3 RC1.  RANDR 1.2 hotness in the hizzouse.
-- xserver-1.2.0-honor-displaysize.patch: Honor the DisplaySize config
-  directive again (#220248)
-- Clean up the post-install cleanup
-
-* Fri Mar 02 2007 Adam Tkac <atkac at redhat.com> 1.2.0-10
-- change permissions of files in source package to default from read-only
-
-* Mon Feb 26 2007 Adam Tkac <atkac at redhat.com> 1.2.0-9
-- Created new package (xorg-x11-server-source) which is needed to build VNC
-  server.
-
-* Fri Feb 23 2007 Adam Jackson <ajax at redhat.com> 1.2.0-8
-- xserver-1.2.0-proper-randr-version.patch: Report the RANDR version we
-  actually implement, instead of the version defined by the protocol headers.
-
-* Thu Feb 22 2007 Adam Jackson <ajax at redhat.com> 1.2.0-7
-- Various backports from git master:
-  - xserver-1.2.0-xfixes-clientgone-check.patch: Avoids a crash when sending
-    events to clients that just disconnected.
-  - xserver-1.2.0-os-memory-leak.patch: Plugs a per-connection memory leak.
-  - xserver-1.2.0-int10-rdtsc.patch: Implement rdtsc in the int10 emulator.
-  - xserver-1.2.0-glcore-visual-count.patch: Count glcore visuals properly,
-    fixes crash at exit.
-
-* Mon Feb 05 2007 Adam Jackson <ajax at redhat.com> 1.2.0-6
-- xorg-x11-server-Red-Hat-extramodes.patch:
-  - Add 1360x768 normal and reduced-blanking.
-  - Add reduced-blanking versions of 1680x1050 and 1920x{1200,1080}.
-  - Remove the >60Hz versions of 2560x1600.  Even leaving the 60Hz timing is
-    kind of ridiculous, since every real LCD that size I've seen uses the
-    reduced blanking timings.  But presumably if you have that nice of a
-    monitor, you also have a video card with working DDC.
-
-* Sun Feb 04 2007 Adam Jackson <ajax at redhat.com> 1.2.0-5
-- Massive spec formatting and style cleanup.
-- Build Xdmx on all arches.
-- Enable GL support even on non-DRI machines.
-- Re-add DRI to ppc64.
-- Update BuildRequires to current versions.
-- Remove some bogus Requires.
-
-* Wed Jan 31 2007 Adam Jackson <ajax at redhat.com> 1.2.0-4
-- Fix typo in SDK header. (#222487)
-
-* Mon Jan 29 2007 Adam Jackson <ajax at redhat.com> 1.2.0-3
-- Fix MMX check on AMD CPUs. (#222332)
-- Fix Xephyr keysym init on LP64. (#224311)
-
-* Wed Jan 24 2007 Adam Jackson <ajax at redhat.com> 1.2.0-2
-- Delete ModulePath lines rather than attempt to munge them.  (#186338)
-
-* Tue Jan 23 2007 Adam Jackson <ajax at redhat.com> 1.2.0-1
-- Xorg server 1.2.0.
-
-* Tue Jan 09 2007 Adam Jackson <ajax at redhat.com> 1.1.1-57
-- xorg-xserver-1.1.0-dbe-render.diff: CVE #2006-6101
-- xorg-x11-server-1.1.0-redhat-xephyr-only-hack.patch: Skip building the
-  non-Xephyr kdrive servers entirely.
-
-* Mon Dec 18 2006 Adam Jackson <ajax at redhat.com> 1.1.1-56
-- RHEL5 sync:
-  - xorg-x11-server-1.1.1-maxpixclock-option.patch: Allow the maximum pixel
-    clock of a monitor to be specified in the config file.
-  - xorg-x11-server-1.1.1-glcore-visual-matching.patch: Fix a client crash
-    when creating software indirect GLX contexts.
-  - xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch: During server
-    init, abort if either VT activation ioctl fails.  During shutdown, be
-    sure to wait for the VT switch to finish before exiting.
-
-* Mon Dec 11 2006 Adam Jackson <ajax at redhat.com> 1.1.1-55
-- xorg-x11-server-1.1.1-lid-close-crash.patch: Added, backport from head.
-  (#197921)
-
-* Mon Dec 11 2006 Adam Tkac <atkac redhat com> 1.1.1-54.1.fc7
-- fixed building against mesa-6.5.2
-
-* Fri Dec 1 2006 Adam Jackson <ajax at redhat.com> 1.1.1-54.fc7
-- xorg-x11-server-1.1.1-xkb-vidmode-switch.patch: Fix string matching on
-  XKB actions to be case-insensitive again.  (#216656)
-
-* Fri Dec 1 2006 Adam Jackson <ajax at redhat.com> 1.1.1-53.fc7
-- xorg-x11-server-1.1.1-automake-1.10-fixes.patch: Tweak automakefiles to be
-  1.10-compliant.
-- Misc spec fixes.
-
-* Mon Nov 27 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-52.fc7
-- RHEL5 sync:
-  - Deliver SecurityPolicy in Xvfb when !with_hw_servers (s390, s390x)
-  - xorg-x11-server-1.1.1-ia64-int10.patch: Fix int10 on ia64.
-  - xorg-x11-server-1.1.1-ia64-pci-chipsets.patch: ia64 PCI chipset support.
-- Unify the autoconfig patches.
-- xorg-x11-server-1.1.1-xf86config-comment-less.patch: Added, makes
-  pyxf86config not grow the config file every time it's run.
-- Remove with_developer_utils macro.
-
-* Fri Nov 10 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-51.fc7
-- xorg-x11-server-1.1.1-no-scanpci.patch: Drop scanpci, it's huge and
-  there's no added value relative to lspci.
-- xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch: Minor linktime
-  fixup.  There's no reason for libxf4bpp to link against libxf1bpp.
-
-* Thu Nov 9 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-50.fc7
-- Fix man page globs to not care whether it's .1.gz or .1x.gz, etc.
-
-* Wed Nov 8 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-49.fc7
-- Switch to using the x86emu version of libint10 even on x86.  Unifies
-  behaviour among CPUs and works around Xen vm86 emulation bogosity.
-
-* Wed Nov 8 2006 Adam Jackson <ajackson at redhat.com>
-- Add FC7 todo list
-- Bump Release number back to 48, got reduced somehow.
-
-* Fri Oct 13 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-48.fc7
-- Do not try own /usr/lib/pkgconfig in sdk package.
-- Drop dependency on xorg-x11-fonts-base now that we compile in
-  'fixed' and 'cursor' fonts.
-- Drop xorg-redhat-die-ugly-pattern-die-die-die.patch; use -br option
-  instead.
-
-* Wed Oct  4 2006 Soren Sandmann <sandmann at redhat.com> - 1.1.1-47.fc6
-- graphics-expose.patch: Call miHandleExposures() with non-translated
-  coordinates. 
-
-* Wed Oct  4 2006 Soren Sandmann <sandmann at redhat.com> - 1.1.1-46.fc6
-- Fix over-zealous code deletion in graphics-expose.patch. 
-
-* Wed Oct  4 2006 Soren Sandmann <sandmann at redhat.com> - 1.1.1-45.fc6
-- xorg-x11-server-1.1.1-graphics-expose.patch: call
-  miHandleExposures() in CopyArea/CopyPlane explicitly in cw to
-  generate GraphicsExposes correctly. (#209336).
-
-* Mon Oct  2 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-44.fc6
-- xorg-x11-server-1.1.1-offscreen-pixmaps.patch: Take the server lock
-  before calling back into XAA to evict pixmaps (#204810).
-
-* Wed Sep 27 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-43.fc6
-- xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch: Since the
-  VT_ACTIVATE/VT_WAITACTIVE pair are never guaranteed to successfully
-  complete, set a 5 second timeout on the WAITACTIVE, and retry the pair
-  until we win.  (#207746)
-- xorg-x11-server-1.1.0-pci-scan-fixes.patch: Partial revert to unbreak some
-  (but not all) domainful machines, including Pegasos. (#207659)
-
-* Mon Sep 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-42.fc6
-- xorg-x11-server-1.1.1-getconfig-pl-die-die-die.patch: Fix XGI cards (#208000)
-
-* Fri Sep 22 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-41.fc6
-- xorg-x11-server-1.1.1-vbe-filter-less.patch: Be gentler about rejecting
-  VESA modes early, since xf86ValidateModes should handle them just fine.
-
-* Wed Sep 20 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-40.fc6
-- xorg-x11-server-1.1.1-pclose-confusion.patch: Be sure to call Pclose()
-  on pipes created with Popen(), since the additional magic done by Popen()
-  relative to popen() is not undone by plain pclose().  (Third base!)
-- xorg-x11-server-1.1.1-edid-hex-dump.patch: Backport EDID hex dump code
-  from git.
-
-* Wed Sep 20 2006 Kristian H??gsberg <krh at redhat.com> 1.1.1-39.fc6
-- Bump xorg-x11-proto-devel BuildRequires version and add Conflict
-  line for older mesa releases, so GLX_EXT_texture_from_pixmap opcodes
-  match.
-
-* Thu Sep  7 2006 Adam Jackson <ajackson at redhat.coM> - 1.1.1-38.fc6
-- xorg-x11-server-1.1.1-believe-monitor-rb-modes.patch: Always believe the
-  monitor when it reports a reduced-blanking mode, even over VGA.
-
-* Thu Sep  7 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-37.fc6
-- Add "built-ins" to default font path.
-
-* Wed Sep  6 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-36.fc6
-- Enable builtin fallback versions of cursor and fixed fonts.
-
-* Tue Sep  5 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-35.fc6
-- xorg-x11-server-1.1.1-always-mouse-thyself.patch: Fix the check to look
-  for mouse/void drivers in the running layout, as opposed to the config file,
-  so as not to synthesize two mouse devices.
-
-* Thu Aug 31 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-34.fc6
-- xorg-x11-server-1.1.1-infer-virtual.patch: Be slightly more paranoid about
-  setting line pitch, and rescan the mode list after pruning to re-validate
-  the estimated virtual size.
-
-* Wed Aug 30 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-33.fc6
-- Update xorg-x11-server-1.1.1-offscreen-pixmaps.patch to evict pixmap
-  when GLX_EXT_texture_from_pixmap is first used.
-
-* Wed Aug 30 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-32.fc6
-- Drop xorg-x11-server-1.1.0-gl-include-inferiors.patch now that
-  compiz can uses the composite overlay window.
-
-* Mon Aug 28 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-31.fc6
-- Update xorg-x11-server-1.1.1-offscreen-pixmaps.patch to log transitions.
-- Update xorg-x11-server-1.1.0-tfp-damage.patch to always bind to
-  GL_TEXTURE_RECTANGLE_ARB target.
-
-* Fri Aug 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-30.fc6
-- xorg-x11-server-1.1.1-pci-paranoia.patch: In xf86MatchPciInstances, fail
-  gracefully if xf86PciVideoInfo is NULL (like, on Xen).
-
-* Fri Aug 25 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-29.fc6
-- Add xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch to fix VT
-  switching (and suspend/resume) when using AIGLX. (#199692, fdo #7916).
-- Bump mesa source and libGL BuildRequires.
-- Update mesa-6.5.1 patch to work with 6.5.1 rc1 (slang_version_syn.h
-  renamed to slang_pp_version_syn.h).
-
-* Thu Aug 24 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-28.fc6
-- xorg-x11-server-1.1.1-infer-virtual.patch: Only flag modes as preferred
-  if the EDID block says to.
-- xorg-x11-server-1.1.1-mode-sort-kung-fu.patch: Enforce a sort order on
-  modes during lookup: builtin before driver before userdef before other,
-  and preferred modes within a class before others in that class.
-
-* Tue Aug 22 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-27.fc6
-- xorg-x11-server-1.1.1-edid-quirks-list.patch: Don't set an arbitrary
-  pixclock limit if the monitor didn't claim to have one.
-
-* Mon Aug 21 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-26.fc6
-- Add Tilman Sauerbecks patch to fix AIGLX DRI locking.
-
-* Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-25.fc6
-- xorg-x11-server-1.1.1-xvfb-composite-crash.patch: Fix Xvfb's -render flag
-  to also disable the Composite extension.
-- xorg-x11-server-1.1.1-mesa-6.5.1.patch: Update build system to account for
-  Mesa 6.5.1 snapshots.
-- xorg-x11-server-1.1.0-edid-mode-injection-2.patch: Add all available
-  standard timings from EDID rather than just the first five.
-
-* Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-24.fc6
-- xorg-x11-server-1.1.1-edid-quirks-list.patch: Unbreak.
-
-* Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-23.fc6
-- xorg-x11-server-1.1.1-xkb-in-xnest.patch: Added. (#193431)
-
-* Thu Aug 17 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-22.fc6
-- xorg-x11-server-1.1.1-infer-virtual.patch: When no modes or virtual size
-  are given in the config file, attempt to pick a sensible one by examining
-  the EDID modes and physical geometry.  Also generally make the server
-  aware of driver-provided modes.
-- xorg-x11-server-1.1.1-edid-quirks-list.patch: Redo, since the property I was
-  checking for is both fairly common and fairly predictable.  
-
-* Tue Aug 15 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-21.fc6
-- xorg-x11-server-1.1.1-fix-default-mouse-device-yet-again.patch: Added.
-
-* Thu Aug 10 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-20.fc6
-- xorg-x11-server-1.1.1-always-mouse-thyself.patch: If we lack a mouse
-  device in the config, and the user hasn't asked for any void devices,
-  synthesize a mouse section.  (#200347)
-- xorg-x11-server-1.1.1-edid-quirks-list.patch: Better formatting.
-
-* Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-19.fc6
-- xorg-x11-server-1.1.1-builderstring.patch: Enable the builder info
-  string at configure time;
-- ... and use it to print the package name and version.
-- xorg-x11-server-1.1.1-defaultdepth-24.patch: Set default depth to 24.
-- xorg-x11-server-1.1.1-edid-quirks-list.patch: Add EDID quirks list as
-  an experiment; needs a better solution though. 
-
-* Tue Aug  8 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-18.fc6
-- Update offscreen-pixmaps patch to migrate pixmaps when the compiz
-  selection is taken.
-
-* Mon Aug  7 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-17.fc5.aiglx
-- Build for fc5 aiglx repo.
-
-* Mon Aug  7 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-17.fc6
-- Add xorg-x11-server-1.1.1-offscreen-pixmaps.patch to default
-  XaaNoOffscreenPixmaps to false, for now.
-
-* Mon Aug  7 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-16.fc6
-- xorg-x11-server-1.1.0-edid-mode-injection-2.patch: Off-by-one error in
-  range storage.
-
-* Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-15.fc6
-- xorg-x11-server-1.1.0-edid-mode-injection-2.patch: Allow HorizSync and
-  VertRefresh to be overridden independently.
-
-* Fri Jul 28 2006 Kevin E Martin <kem at redhat.com> - 1.1.1-14.fc6
-- xorg-x11-server-1.1.1-revert-xkb-change.patch: Revert change to xkb that
-  broke XkbGetKeyboard().
-
-* Fri Jul 28 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-13.fc5.aiglx
-- Add conflicts for ABI incompatible version of xorg-x11-drv-i810 and
-  xorg-x11-drv-ati.
-
-* Fri Jul 28 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-13.fc6
-- Comment out the 848x480 modes from the extramodes patch.  Any panel that
-  wants it should be doing EDID injection by now, and it screws up
-  autoconfig by _just_ fitting in the ranges for 800x600.
-
-* Wed Jul 26 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-12.fc6
-- Added "1920x1080" CVT modes to Red-Hat-extramodes patch for (#195272)
-- Sorted the extramodes file by X res, then Y res for ease of maintenance.
-
-* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-11.fc6
-- Add selinux{,-devel} buildreqs.
-
-* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-10.fc6
-- xorg-x11-server-1.1.1-selinux-awareness.patch: Added for new Mesa
-  selinux code.
-- xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch: Backport a Render
-  fix for Xdmx.
-- xorg-x11-server-1.1.1-no-composite-in-xnest.patch: Disable Composite in
-  Xnest, as it's known not to work.
-- Fix default font path to match the config file we used to generate.
-- Fix default module set to match the config file we used to generate.
-- Disable use of TLS GLX dispatch to match Mesa selinux nonsense.
-
-* Mon Jul 24 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-8.fc6
-- Added "1440x900 at 60" CVT mode to Red-Hat-extramodes patch for (#179865)
-
-* Fri Jul 21 2006 Mike A. Harris <mharris at redhat.com>
-- Added "1152x864 @ 100.00" GTF mode to Red-Hat-extramodes patch (#49264)
-
-* Fri Jul 21 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-7.fc6
-- Only ship pcitweak manpage if we are building it (#199653)
-- Fix dist tag usage (Was {dist}, should be {?dist})
-- Added xorg-x11-server-libxf86config-dont-write-empty-sections.patch to
-  prevent config file parser/writer from writing out empty sections (#198653)
-- Add dependency on xorg-x11-fonts-base to all X server subpackages (#186091)
-
-* Tue Jul 18 2006 Jeremy Katz <katzj at redhat.com> 1.1.1-6.fc6
-- Saner defaults for hsync/vrefresh on monitors that can't be probed
-
-* Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com>  1.1.1-5.fc6
-- Tag as 1.1.1-5.fc6.
-
-* Wed Jul 12 2006 Kristian H??gsberg <krh at redhat.com>  1.1.1-5.fc5.aiglx
-- Enable composite by default.
-- Split spiffiffity patch into one patch per change:
-  xorg-x11-server-1.1.0-no-move-damage.patch and
-  xorg-x11-server-1.1.0-dont-backfill-bg-none.patch.
-
-* Wed Jul 12 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-4.fc6
-- Restore placing the raw EDID block on the root window.
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.1.1-3.1.fc6
-- rebuild
-
-* Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-3.fc6
-- Enable DPMS by default.
-
-* Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-2.fc6
-- Remove nonsensical runtime perl dependency.
-
-* Sat Jul 08 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-1.fc6
-- Update to 1.1.1.
-
-* Sat Jul 08 2006 Kristian H??gsberg <krh at redhat.com>  1.1.0-27.fc6
-- Enable TLS for GLX to match the mesa build config.
-
-* Fri Jul 07 2006 Kristian H??gsberg <krh at redhat.com>  1.1.0-26
-- Add xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch to hook up the
-  GLX_MESA_copy_sub_buffer extension.
-
-* Fri Jun 30 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-25.fc6
-- Start using the new %%{dist} tag <http://fedoraproject.org/wiki/DistTag>
-  experimentally in the package Release field to help prevent problems like
-  (#197266) from occuring in the future.
-
-* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com>
-- Disable build dependency on zlib-devel now that we are not uselessly linking
-  against it.
-
-* Tue Jun 27 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-24
-- Don't (uselessly) link the server against zlib.
-- Fix the 1680x1050 modes to be the CVT timings instead of GTF.
-
-* Mon Jun 26 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-23
-- Fix an open-coded check for reduced-blanking modes to only apply to analog
-  connectors.
-- Reorder the EDID patches slightly.
-
-* Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-22
-- Added xorg-xserver-1.1.0-setuid.diff to fix potential security issue (#196094)
-- Disable DRI on ppc64 builds.
-- Conditionalize inclusion of DRI related X server modules to with_dri builds.
-
-* Tue Jun 20 2006 Kristian H??gsberg <krh at redhat.com> 1.1.0-21
-- Update xorg-x11-server-1.1.0-tfp-damage.patch to use glTexSubImage2D
-  to only update the part of the texture that changed, based on damage
-  regions.
-
-* Mon Jun 19 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-20
-- Remove with_xnest_server conditional, and fix more BuildRequires to pull
-  in libX11-devel, libXext-devel, zlib-devel, etc. for Xnest and Xephyr.
-- Remove unwanted files leftover in buildroot for s390/s390x builds.
-- Add Xserver.1x manpage to multiple subpackages, as it applies equally to
-  Xorg, Xnest, Xvfb, Xephyr.
-
-* Mon Jun 19 2006 Kristian H??gsberg <krh at redhat.com> 1.1.0-19
-- Add with_xnest_server conditional and disable on s390, since Xnest
-  fails to build on there (Xlib doesn't get added to the link line).
-- Add -f to removal of xorgconfig and others which may or may not be built.
-
-* Mon Jun 19 2006 Kristian H??gsberg <krh at redhat.com> 1.1.0-18
-- Add xorg-x11-server-1.1.0-convolution-filter-fix.patch and
-  xorg-x11-server-1.1.0-tfp-damage.patch backported to make compiz go
-  faster and make compiz shadows work.
-
-* Mon Jun 19 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-17
-- Disable filling in monitor gamma info from EDID momentarily, since drivers
-  will use that field to set the card's gamma ramp.
-- Backport some stuff from git: cw crash fix, faster pci scanning, some
-  log message cleanup.
-
-* Fri Jun 16 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-16
-- Enable spec support for s390, s390x, alpha, sparc, and sparc64 architectures.
-- Add with_hw_servers conditional to disable hardware servers on s390/s390x.
-- Add with_dmx_server to disable DMX on s390/s390x.
-- Added "release" number to "BuildRequires: freetype-devel >= 2.1.9-1" for
-  dependency futureproofing.
-- Force "--disable-dri" on s390/s390x, to attempt to work around ./configure
-  failure to find libdrm, which should not be needed on s390 builds anyway.
-
-* Thu Jun 15 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-15
-- Add loader infrastructure for publishing PCI ID lists in the drivers, and
-  autodetecting drivers based on that.  Currently unused since no drivers
-  publish such a list yet.
-- Fix mouse autoconfig to use /dev/input/mice instead of /dev/mouse.
-
-* Wed Jun 14 2006 Kristian H??gsberg <krh at redhat.com> 1.1.0-14
-- Change selection atom to _COMPIZ_GL_INCLUDE_INFERIORS in
-  xorg-x11-server-1.1.0-gl-include-inferiors.patch.
-
-* Tue Jun 13 2006 Jeremy Katz <katzj at redhat.com> 1.1.0-13
-- put back my -fPIC patch, libxf86config isn't built with fPIC otherwise
-
-* Tue Jun 13 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-12
-- Add EDID mode autodetection.
-
-* Mon Jun 12 2006 Kristian H??gsberg <krh at redhat.com> 1.1.0-11
-- Add xorg-x11-server-1.1.0-gl-include-inferiors.patch to let GL
-  rendering include child windows.
-
-* Mon Jun 12 2006 Adam Jackson <ajax at redhat.com> 1.1.0-10
-- Misc build fixes for ppc64.
-
-* Mon Jun 12 2006 Adam Jackson <ajax at redhat.com> 1.1.0-9
-- --enable-xorg on ppc64 too.
-- Re-add cvt, got dropped somehow.
-
-* Fri Jun 09 2006 Kristian H??gsberg <krh at redhat.com> 1.1.0-8
-- Add our friend, libtool, to BuildRequires.
-
-* Thu Jun 08 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-7
-- Change "BuildRequires: freetype-devel >= 2.1.10" to 2.1.9, as Xorg 7.0
-  contains 2.1.9 in "extras" and 7.1 does not appear to have a requirement on
-  a newer freetype.
-- Janitorial cleanups for spec file changelog consistency.
-- Call aclocal before automake, otherwise automake >= 1.9.6 is required in
-  order to rebuild the package.
-- Build 1.1.0-4, 1.1.0-5, and 1.1.0-6 appear to have failed in brew but nobody
-  fixed them.  It appears automake 1.9 breaks the build.
-
-* Wed Jun 07 2006 Jeremy Katz <katzj at redhat.com> 1.1.0-6
-- BR automake and autoconf
-
-* Wed Jun 07 2006 Jeremy Katz <katzj at redhat.com> 1.1.0-5
-- build on ppc64 so that we have an X server there
-
-* Tue Jun 06 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-4
-- Hack the kdrive makefile to only attempt to build Xephyr, avoids linking
-  sixteen extra servers just to delete them.
-- Move cvt to the default install set, same as gtf.
-
-* Mon Jun 05 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-3
-- Drop the libxf86config -fPIC patch, just build the whole thing with
-  --with-pic instead.  Add void and evdev to the required driver list for
-  upcoming autoconfig magic.
-
-* Thu May 25 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-2
-- Add "Requires: xorg-x11-proto-devel >= 7.1-1" to sdk for numerous (52) bug
-  reports of drivers failing to build with mock.
-
-* Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
-- Xorg 7.1 final.
-
-* Tue May 23 2006 Mike A. Harris <mharris at redhat.com> 1.0.99.903-2
-- Disable dependency on xorg-x11-drivers package, for OLPC.  (#191781)
-- Add "BuildRequires: freetype-devel >= 2.1.10" for bug (#192021)
-
-* Fri May 12 2006 Adam Jackson <ajackson at redhat.com> 1.0.99.903-1
-- Update to 7.1RC3, plus experimental fix for fdo bug #6827.
-
-* Mon May 01 2006 Adam Jackson <ajackson at redhat.com> 1.0.99.902-1
-- Update to 7.1RC2 plus fix for CVE 2006-1526.  Disable the fastpathing
-  patch for fdo bug #4320 since that should be covered in the generic
-  Render code now.
-
-* Mon Apr 24 2006 Adam Jackson <ajackson at redhat.com> 1.0.99.901-6
-- Backport a Render crash fix from HEAD.
-
-* Thu Apr 13 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.901-5
-- Update spiffiffity patch to only suppress move damage events for
-  manually redirected windows.
-
-* Wed Apr 12 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.901-4
-- Bump for rawhide build.
-
-* Wed Apr 12 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.901-3
-- Add xorg-x11-server-1.0.99.901-cow-fix.patch to fix crash when
-  releasing the COW.
-
-* Tue Apr 11 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.901-2
-- Bump for fc5 build.
-
-* Sat Apr 08 2006 Adam Jackson <ajackson at redhat.com> 1.0.99.901-1
-- Update to 7.1 RC1.
-
-* Thu Apr 06 2006 Adam Jackson <ajax at redhat.com> 1.0.99.2-2
-- Remove LBX to match upstream policy.
-- Add Xephyr server.
-
-* Tue Apr 04 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.2-1
-- Update to 1.0.99.2 snapshot and go back to using mesa-source package.
-- Drop xorg-server-1.0.99-composite-visibility.patch.
-- Drop xorg-server-1.0.1-backtrace.patch.
-- Drop xorg-server-0.99.3-rgb.txt-dix-config-fix.patch.
-- Add xorg-server-1.0.99.2-spiffiffity.patch.
-
-* Thu Mar 23 2006 Kristian H??gsberg <krh at redhat.com>
-- Pass --with-dri-driver-path so we're sure to point it to the right path.
-
-* Wed Mar 22 2006 Soren Sandmann <sandmann at redhat.com> 1.0.99.1-2
-- Add xorg-server-1.0.99-composite-visibility.patch to get rid of flashing
-  titlebars in compositing metacity.
-
-* Tue Mar 21 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.1-1
-- Update to 1.0.99.1 snapshot.
-
-* Mon Mar 06 2006 Jeremy Katz <katzj at redhat.com> 1.0.1-8
-- build libxf86config with -fPIC (#181292)
-- fix sgi 1600sw extra mode (#182430)
-
-* Wed Feb 22 2006 Jeremy Katz <katzj at redhat.com> 1.0.1-7
-- install randrstr.h as part of sdk as required for building some drivers
-
-* Tue Feb 21 2006 Mike A. Harris <mharris at redhat.com>
-- Added xorg-server-1.0.1-backtrace.patch which enables the Xorg server's
-  built in backtrace support by default, as it was inadvertently disabled in
-  7.0.
-
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-6.1
-- bump again for double-long bug on ppc(64)
-
-* Wed Feb 08 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-6
-- Added xorg-x11-server-1.0.1-Red-Hat-extramodes.patch which is a merger of
-  XFree86-4.2.99.2-redhat-custom-modelines.patch and
-  xorg-x11-6.8.2-laptop-modes.patch from FC4 for (#180301)
-- Install a copy of the vesamodes and extramodes files which contain the list
-  of video modes that are built into the X server, so that the "rhpxl" package
-  does not have to carry around an out of sync copy for itself. (#180301)
-
-* Tue Feb 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-5
-- Updated "BuildRequires: mesa-source >= 6.4.2-2" to get fix for (#176976)
-
-* Mon Feb 06 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-4
-- Fix brown paper bag error introduced in rpm post script in 1.0.1-4.
-
-* Mon Feb 06 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
-- Added xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch with changes
-  suggested by ajax to fix (fdo#4320).
-- Cosmetic cleanups to satiate the banshees.
-
-* Sun Feb 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
-- Added xorg-x11-server-1.0.1-fbpict-fix-rounding.patch from CVS HEAD.
-- Added xorg-x11-server-1.0.1-SEGV-on-null-interface.patch which prevents a
-  SEGV on null interfaces (#174279,178986)
-
-* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1
-- Updated to xserver 1.0.1 from X11R7.0
-
-* Thu Dec 22 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-3
-- Added "Provides: libxf86config-devel = %{version}-%{release}" to sdk package.
-
-* Wed Dec 21 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-2
-- Added xserver-1.0.0-parser-add-missing-headers-to-sdk.patch to provide the
-  necessary libxf86config.a headers to be able to use the library. (#173084)
-
-* Sat Dec 17 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
-- Updated to xserver 1.0.0 from X11R7 RC4
-- Removed the following patches, which are now integrated upstream:
-  - xorg-server-0.99.3-rgb.txt-dix-config-fix.patch,
-  - xorg-server-0.99.3-fbmmx-fix-for-non-SSE-cpu.patch
-- Changed manNx directories to manN to match upstream defaults.
-- Added libxf86config.a to sdk subpackage.
-- Updated build dependency of "mesa-libGL-devel >= 6.4.1-1"
-- Added "BuildRequires: xorg-x11-font-utils >= 1.0.0-1" to be able to query
-  the fontdir from fontutil.pc which is implemented currently by a custom
-  patch.
-- Enable xtrap, xcsecurity, xevie, and lbx on all builds, not just DRI builds.
-- Fix sdk installation path, so that drivers can find the files again.
-- Update file manifest, to deal with X server modules that have moved to
-  a subdir, etc.
-
-* Mon Nov 28 2005 Kristian H??gsberg <krh at redhat.com>
-- Add a few missing BuildRequires.
-
-* Fri Nov 25 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-9
-- Added "Requires: xorg-x11-drivers >= 0.99.2-4" as a dependency of the Xorg
-  subpackage, to ensure that anaconda installs all of the drivers during OS
-  installs and upgrades, as requested by Jeremy Katz.
-
-* Fri Nov 25 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-8
-- Added xorg-server-0.99.3-rgb.txt-dix-config-fix.patch which fixes the
-  --with-rgb-path option to actually *work*.
-- Updated libdrm dep to 1.0.5
-
-* Wed Nov 23 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-7
-- Update xorg-x11-server-utils dep to 0.99.2-5 to ensure rgb.txt is installed
-  in correct location - _datadir/X11/rgb
-- Added --with-rgb-path configure option to specify _datadir/X11/rgb so the
-  X server finds the rgb.txt database properly, for bugs (#173453, 173435,
-  173428, 173483, 173734, 173737, 173594)
-- Added xorg-server-0.99.3-fbmmx-fix-for-non-SSE-cpu.patch to prevent SSE/MMX
-  code from being activated on non-capable VIA CPU. (#173384,fdo#5093)
-
-* Thu Nov 17 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-6
-- Add the missing rpm pre script from monolithic xorg-x11 packaging,
-  clean it up a bit, reorder it for slight performance gain.
-- Add some perl magic to pre script to remove RgbPath from xorg.conf,
-  in order to fix bug (#173036, 173435, 173453, 173428)
-- Add more perl magic to pre script to update ModulePath to the new
-  location if it is specified in xorg.conf.
-- Added xorg-x11-server-0.99.3-init-origins-fix.patch ported from monolithic
-  xorg-x11 package to fix Xinerama bug.
-- Added xorg-redhat-die-ugly-pattern-die-die-die.patch to kill the ugly grey
-  stipple once again for bug (#173423).
-- Added "BuildRequires: libdrm-devel" for DRI enabled builds.
-
-* Mon Nov 14 2005 Jeremy Katz <katzj at redhat.com> 0.99.3-5
-- Xorg server should be suid for users to be able to run startx (#173064)
-
-* Mon Nov 14 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-4
-- Added temporary "BuildRequires: libXfont-devel >= 0.99.2-3" and
-  "Requires: libXfont-devel >= 0.99.2-3" to ensure early-testers of
-  pre-rawhide modular X have installed the work around for (#172997).
-- Added implementation specific "Requires: xkbdata" to Xorg subpackage, as
-  we want to ensure the xkb data files are present, but allow us the option
-  of easily switching implementations to "xkeyboard-config" at a future
-  date, if we decide to go that route.
-- Re-enable _smp_mflags during build.
-- Added "Requires: xorg-x11-drv-vesa" to Xorg subpackage (#173060)
-
-* Mon Nov 14 2005 Jeremy Katz <katzj at redhat.com> 0.99.3-3
-- provide Xserver
-- add another requires for basic bits
-
-* Sun Nov 13 2005 Jeremy Katz <katzj at redhat.com> 0.99.3-2
-- add some deps to the Xorg subpackage for base fonts, keyboard and mouse 
-  drivers, and rgb.txt that the server really wont work without
-
-* Fri Nov 11 2005 Mike A. Harris <mharris at redhat.com> 0.99.3-1
-- Update to xorg-server-0.99.3 from X11R7 RC2.
-- Add xorg-server.m4 to sdk subpackage, and "X" symlink to Xorg subpackage.
-
-* Thu Nov 10 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-4
-- Added "Requires: xkbcomp" for Xorg server, as it invokes it internally.
-
-* Wed Nov 09 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-3
-- Added "BuildRequires: libXtst-devel" for Xtst examples.
-
-* Mon Nov 07 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-2
-- Added versioning to Xorg virtual Provide, to allow config tools and driver
-  packages to have version based requires.
-
-* Thu Oct 27 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-1
-- Update to xorg-server-0.99.2 from X11R7 RC1.
-- Add "BuildRequires: xorg-x11-util-macros >= 0.99.1".
-- Add "BuildRequires: mesa-source >= 6.4-4" for DRI builds.
-- Added dmx related utilities to Xdmx subpackage.
-- Individually list each X server module in file manifest.
-- Hack man1 manpages to be installed into man1x.
-- Add the following ./configure options --disable-dependency-tracking,
-  --enable-composite, --enable-xtrap, --enable-xcsecurity, --enable-xevie,
-  --enable-lbx, --enable-dri, --with-mesa-source, --with-module-dir,
-  --with-os-name, --with-os-vendor, --with-xkb-output, --disable-xorgcfg
-- Added getconfig, scanpci et al to Xorg subpackage
-- Added inb, inl, inw, ioport, outboutl, outw, pcitweak utils to Xorg package
-  conditionally, defaulting to "off".  These utilities are potentially
-  dangerous and can physically damage hardware and/or destroy data, so are
-  not shipped by default.
-- Added "BuildRequires: libdmx-devel" for dmx utilities
-- Added "BuildRequires: libXres-devel" for Xres examples
-- Added {_libdir}/xserver/SecurityPolicy to Xorg subpackage for XSECURITY
-
-* Mon Oct 03 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2.cvs20050830.2
-- Fix license tag to be "MIT/X11"
-- Change Xdmx subpackage to Obsolete xorg-x11-Xdmx instead of xorg-x11-Xnest
-
-* Sun Oct 02 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2.cvs20050830.1
-- Update BuildRequires for new library package naming (libX...)
-- Use Fedora Extras style BuildRoot tag
-- Invoke make with _smp_mflags to take advantage of SMP systems
-
-* Tue Aug 30 2005 Kristian Hogsberg <krh at redhat.com> 0.99.1-2.cvs20050830
-- Go back to %spec -n, use new cvs snapshot that supports overriding
-  moduledir during make install, use %makeinstall.
-- Drop %{moduledir}/multimedia globs.
-
-* Fri Aug 26 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2.cvs20050825.0
-- Added build dependency on xorg-x11-libfontenc-devel, as the build fails
-  half way through without it, even though upstream dependencies do not
-  specify it as required.
-
-* Tue Aug 23 2005 Kristian Hogsberg <krh at redhat.com> 0.99.1-1
-- Initial spec file for the modular X server.



From maxx at fedoraproject.org  Tue Sep 23 19:48:00 2008
From: maxx at fedoraproject.org (Mads Villadsen)
Date: Tue, 23 Sep 2008 19:48:00 +0000 (UTC)
Subject: rpms/hamster-applet/devel .cvsignore, 1.12, 1.13 hamster-applet.spec,
	1.17, 1.18 sources, 1.12, 1.13
Message-ID: <20080923194800.30F4070033@cvs1.fedora.phx.redhat.com>

Author: maxx

Update of /cvs/pkgs/rpms/hamster-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7000

Modified Files:
	.cvsignore hamster-applet.spec sources 
Log Message:
* Tue Sep 23 2008 Mads Villadsen <maxx at krakoa.dk> - 2.24.0-1
- Update to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	9 Sep 2008 14:46:05 -0000	1.12
+++ .cvsignore	23 Sep 2008 19:47:29 -0000	1.13
@@ -1 +1 @@
-hamster-applet-2.23.92.tar.bz2
+hamster-applet-2.24.0.tar.bz2


Index: hamster-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/hamster-applet.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- hamster-applet.spec	9 Sep 2008 14:46:05 -0000	1.17
+++ hamster-applet.spec	23 Sep 2008 19:47:29 -0000	1.18
@@ -2,14 +2,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           hamster-applet
-Version:        2.23.92
+Version:        2.24.0
 Release:        1%{?dist}
 Summary:        Time tracking applet
 
 Group:          Development/Languages
 License:        GPLv3+
 URL:            http://code.google.com/p/projecthamster/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/hamster-applet/2.23/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/hamster-applet/2.24/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel pygtk2-devel pygobject2-devel gnome-python2-devel
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Mads Villadsen <maxx at krakoa.dk> - 2.24.0-1
+- Update to latest upstream release
+
 * Tue Sep  9 2008 Mads Villadsen <maxx at krakoa.dk> - 2.23.92-1
 - Update to latest upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	9 Sep 2008 14:46:05 -0000	1.12
+++ sources	23 Sep 2008 19:47:29 -0000	1.13
@@ -1 +1 @@
-aadde58031ecc751c64acccfe56085a0  hamster-applet-2.23.92.tar.bz2
+fd05dbe0e010a2fcc35ab49e6dadcce7  hamster-applet-2.24.0.tar.bz2



From dwalsh at fedoraproject.org  Tue Sep 23 20:09:05 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 23 Sep 2008 20:09:05 +0000 (UTC)
Subject: rpms/selinux-policy/F-8 policy-20070703.patch, 1.223,
	1.224 selinux-policy.spec, 1.643, 1.644
Message-ID: <20080923200905.A948770033@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11846

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> 3.0.8-116
- add mimedefang to spamd


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-8/policy-20070703.patch,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- policy-20070703.patch	8 Sep 2008 20:59:24 -0000	1.223
+++ policy-20070703.patch	23 Sep 2008 20:09:04 -0000	1.224
@@ -9924,8 +9924,18 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.0.8/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2008-06-12 23:37:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/dbus.te	2008-06-12 23:37:59.000000000 -0400
-@@ -20,9 +20,25 @@
++++ serefpolicy-3.0.8/policy/modules/services/dbus.te	2008-09-23 15:30:42.000000000 -0400
+@@ -9,7 +9,8 @@
+ #
+ # Delcarations
+ #
+-
++attribute dbusd_unconfined;
++ 
+ type dbusd_etc_t alias etc_dbusd_t;
+ files_type(dbusd_etc_t)
+ 
+@@ -20,9 +21,25 @@
  type system_dbusd_tmp_t;
  files_tmp_file(system_dbusd_tmp_t)
  
@@ -9951,7 +9961,7 @@
  ##############################
  #
  # Local policy
-@@ -32,7 +48,7 @@
+@@ -32,7 +49,7 @@
  # cjp: dac_override should probably go in a distro_debian
  allow system_dbusd_t self:capability { dac_override setgid setpcap setuid };
  dontaudit system_dbusd_t self:capability sys_tty_config;
@@ -9960,7 +9970,7 @@
  allow system_dbusd_t self:fifo_file { read write };
  allow system_dbusd_t self:dbus { send_msg acquire_svc };
  allow system_dbusd_t self:unix_stream_socket { connectto create_stream_socket_perms connectto };
-@@ -40,6 +56,8 @@
+@@ -40,6 +57,8 @@
  # Receive notifications of policy reloads and enforcing status changes.
  allow system_dbusd_t self:netlink_selinux_socket { create bind read };
  
@@ -9969,7 +9979,7 @@
  allow system_dbusd_t dbusd_etc_t:dir list_dir_perms;
  read_files_pattern(system_dbusd_t,dbusd_etc_t,dbusd_etc_t)
  read_lnk_files_pattern(system_dbusd_t,dbusd_etc_t,dbusd_etc_t)
-@@ -48,6 +66,8 @@
+@@ -48,6 +67,8 @@
  manage_files_pattern(system_dbusd_t,system_dbusd_tmp_t,system_dbusd_tmp_t)
  files_tmp_filetrans(system_dbusd_t, system_dbusd_tmp_t, { file dir })
  
@@ -9978,7 +9988,7 @@
  manage_files_pattern(system_dbusd_t,system_dbusd_var_run_t,system_dbusd_var_run_t)
  manage_sock_files_pattern(system_dbusd_t,system_dbusd_var_run_t,system_dbusd_var_run_t)
  files_pid_filetrans(system_dbusd_t,system_dbusd_var_run_t,file)
-@@ -60,6 +80,8 @@
+@@ -60,6 +81,8 @@
  
  fs_getattr_all_fs(system_dbusd_t)
  fs_search_auto_mountpoints(system_dbusd_t)
@@ -9987,16 +9997,25 @@
  
  selinux_get_fs_mount(system_dbusd_t)
  selinux_validate_context(system_dbusd_t)
-@@ -86,6 +108,8 @@
+@@ -76,7 +99,6 @@
+ corecmd_list_bin(system_dbusd_t)
+ corecmd_read_bin_pipes(system_dbusd_t)
+ corecmd_read_bin_sockets(system_dbusd_t)
+-corecmd_exec_bin(system_dbusd_t)
+ 
+ domain_use_interactive_fds(system_dbusd_t)
+ 
+@@ -86,6 +108,9 @@
  
  init_use_fds(system_dbusd_t)
  init_use_script_ptys(system_dbusd_t)
 +init_dbus_chat_script(system_dbusd_t)
 +init_bin_domtrans_spec(system_dbusd_t)
++init_domtrans_script(system_dbusd_t)
  
  libs_use_ld_so(system_dbusd_t)
  libs_use_shared_libs(system_dbusd_t)
-@@ -116,9 +140,26 @@
+@@ -116,9 +141,26 @@
  ')
  
  optional_policy(`
@@ -10004,7 +10023,7 @@
 +')
 +
 +optional_policy(`
-+	networkmanager_init_script_domtrans_spec(system_dbusd_t)
++	networkmanager_script_domtrans(system_dbusd_t)
 +')
 +
 +optional_policy(`
@@ -12773,25 +12792,37 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.0.8/policy/modules/services/networkmanager.fc
 --- nsaserefpolicy/policy/modules/services/networkmanager.fc	2008-06-12 23:37:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/networkmanager.fc	2008-07-24 14:08:47.000000000 -0400
-@@ -1,7 +1,13 @@
++++ serefpolicy-3.0.8/policy/modules/services/networkmanager.fc	2008-09-23 15:25:05.000000000 -0400
+@@ -1,7 +1,16 @@
++/etc/NetworkManager/dispatcher\.d(/.*)	gen_context(system_u:object_r:NetworkManager_script_exec_t,s0)
++
++/sbin/wpa_supplicant		--	gen_context(system_u:object_r:NetworkManager_exec_t,s0)
++
  /usr/s?bin/NetworkManager	--	gen_context(system_u:object_r:NetworkManager_exec_t,s0)
  /usr/s?bin/wpa_supplicant	--	gen_context(system_u:object_r:NetworkManager_exec_t,s0)
 +/usr/sbin/NetworkManagerDispatcher	--	gen_context(system_u:object_r:NetworkManager_exec_t,s0)
 +/usr/sbin/nm-system-settings	--	gen_context(system_u:object_r:NetworkManager_exec_t,s0)
++
++/var/log/wpa_supplicant.*	--	gen_context(system_u:object_r:NetworkManager_log_t,s0)
  
  /var/run/NetworkManager\.pid	--	gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
  /var/run/NetworkManager(/.*)?		gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
  /var/run/wpa_supplicant(/.*)?		gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
  /var/run/wpa_supplicant-global	-s	gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
 +/var/run/nm-dhclient.*			gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
-+
-+/var/log/wpa_supplicant\.log.*	--	gen_context(system_u:object_r:NetworkManager_log_t,s0)
-+/etc/NetworkManager/dispatcher.d(/.*)	gen_context(system_u:object_r:NetworkManager_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-3.0.8/policy/modules/services/networkmanager.if
 --- nsaserefpolicy/policy/modules/services/networkmanager.if	2008-06-12 23:37:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/networkmanager.if	2008-07-24 14:08:32.000000000 -0400
-@@ -97,3 +97,59 @@
++++ serefpolicy-3.0.8/policy/modules/services/networkmanager.if	2008-09-23 15:25:58.000000000 -0400
+@@ -74,7 +74,7 @@
+ 	')
+ 
+ 	corecmd_search_bin($1)
+-	domtrans_pattern($1,NetworkManager_exec_t,NetworkManager_t)
++	domtrans_pattern($1, NetworkManager_exec_t, NetworkManager_t)
+ ')
+ 
+ ########################################
+@@ -97,3 +97,58 @@
  	allow $1 NetworkManager_t:dbus send_msg;
  	allow NetworkManager_t $1:dbus send_msg;
  ')
@@ -12824,7 +12855,7 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`networkmanager_init_script_domtrans_spec',`
++interface(`networkmanager_script_domtrans',`
 +	gen_require(`
 +		type NetworkManager_script_exec_t;
 +	')
@@ -12832,7 +12863,6 @@
 +	init_script_domtrans_spec($1, NetworkManager_script_exec_t)
 +')
 +
-+
 +########################################
 +## <summary>
 +##	Read NetworkManager PID files.
@@ -12853,47 +12883,62 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.0.8/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2008-06-12 23:37:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te	2008-08-11 15:45:47.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te	2008-09-23 16:05:47.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(networkmanager,1.7.1)
-+policy_module(networkmanager,1.9.0)
++policy_module(networkmanager, 1.10.2)
  
  ########################################
  #
-@@ -13,6 +13,13 @@
- type NetworkManager_var_run_t;
- files_pid_file(NetworkManager_var_run_t)
+@@ -8,7 +8,16 @@
  
+ type NetworkManager_t;
+ type NetworkManager_exec_t;
+-init_daemon_domain(NetworkManager_t,NetworkManager_exec_t)
++init_daemon_domain(NetworkManager_t, NetworkManager_exec_t)
++
 +type NetworkManager_log_t;
 +logging_log_file(NetworkManager_log_t)
 +
 +type NetworkManager_script_exec_t;
 +init_script_type(NetworkManager_script_exec_t)
-+init_script_domtrans_spec(NetworkManager_t, NetworkManager_script_exec_t)
 +
- ########################################
- #
- # Local policy
-@@ -20,9 +27,9 @@
++type NetworkManager_tmp_t;
++files_tmp_file(NetworkManager_tmp_t)
+ 
+ type NetworkManager_var_run_t;
+ files_pid_file(NetworkManager_var_run_t)
+@@ -20,9 +29,9 @@
  
  # networkmanager will ptrace itself if gdb is installed
  # and it receives a unexpected signal (rh bug #204161) 
 -allow NetworkManager_t self:capability { kill setgid setuid sys_nice dac_override net_admin net_raw net_bind_service ipc_lock };
-+allow NetworkManager_t self:capability { chown fsetid kill setgid setuid sys_nice dac_override net_admin net_raw net_bind_service ipc_lock };
++allow NetworkManager_t self:capability { chown fsetid kill setgid setuid sys_admin sys_nice dac_override net_admin net_raw net_bind_service ipc_lock };
  dontaudit NetworkManager_t self:capability { sys_tty_config sys_ptrace };
 -allow NetworkManager_t self:process { ptrace setcap setpgid getsched signal_perms };
 +allow NetworkManager_t self:process { ptrace getcap setcap setpgid getsched setsched signal_perms };
  allow NetworkManager_t self:fifo_file rw_fifo_file_perms;
  allow NetworkManager_t self:unix_dgram_socket { sendto create_socket_perms };
  allow NetworkManager_t self:unix_stream_socket create_stream_socket_perms;
-@@ -38,10 +45,14 @@
- manage_sock_files_pattern(NetworkManager_t,NetworkManager_var_run_t,NetworkManager_var_run_t)
+@@ -33,15 +42,22 @@
+ 
+ can_exec(NetworkManager_t, NetworkManager_exec_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)
+-manage_sock_files_pattern(NetworkManager_t,NetworkManager_var_run_t,NetworkManager_var_run_t)
++manage_files_pattern(NetworkManager_t, NetworkManager_log_t, NetworkManager_log_t)
++logging_log_filetrans(NetworkManager_t, NetworkManager_log_t, file)
++
++manage_sock_files_pattern(NetworkManager_t, NetworkManager_tmp_t, NetworkManager_tmp_t)
++files_tmp_filetrans(NetworkManager_t, NetworkManager_tmp_t, sock_file)
++
++manage_dirs_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
++manage_files_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
++manage_sock_files_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
  files_pid_filetrans(NetworkManager_t,NetworkManager_var_run_t, { dir file sock_file })
  
-+manage_files_pattern(NetworkManager_t,NetworkManager_log_t,NetworkManager_log_t)
-+logging_log_filetrans(NetworkManager_t,NetworkManager_log_t, file)
-+
  kernel_read_system_state(NetworkManager_t)
  kernel_read_network_state(NetworkManager_t)
  kernel_read_kernel_sysctls(NetworkManager_t)
@@ -12902,7 +12947,7 @@
  
  corenet_all_recvfrom_unlabeled(NetworkManager_t)
  corenet_all_recvfrom_netlabel(NetworkManager_t)
-@@ -64,9 +75,11 @@
+@@ -64,9 +80,11 @@
  dev_read_sysfs(NetworkManager_t)
  dev_read_rand(NetworkManager_t)
  dev_read_urand(NetworkManager_t)
@@ -12914,14 +12959,12 @@
  
  mls_file_read_all_levels(NetworkManager_t)
  
-@@ -82,10 +95,16 @@
- files_read_etc_files(NetworkManager_t)
+@@ -83,9 +101,14 @@
  files_read_etc_runtime_files(NetworkManager_t)
  files_read_usr_files(NetworkManager_t)
-+files_list_tmp(NetworkManager_t)
-+
-+storage_getattr_fixed_disk_dev(NetworkManager_t)
  
++storage_getattr_fixed_disk_dev(NetworkManager_t)
++
  init_read_utmp(NetworkManager_t)
 +init_dontaudit_write_utmp(NetworkManager_t)
  init_domtrans_script(NetworkManager_t)
@@ -12931,17 +12974,23 @@
  libs_use_ld_so(NetworkManager_t)
  libs_use_shared_libs(NetworkManager_t)
  
-@@ -113,6 +132,9 @@
+@@ -109,10 +132,14 @@
+ sysnet_etc_filetrans_config(NetworkManager_t)
+ 
+ userdom_dontaudit_use_unpriv_user_fds(NetworkManager_t)
+-userdom_dontaudit_search_sysadm_home_dirs(NetworkManager_t)
  userdom_dontaudit_use_unpriv_users_ttys(NetworkManager_t)
  # Read gnome-keyring
  userdom_read_unpriv_users_home_content_files(NetworkManager_t)
 +userdom_unpriv_users_stream_connect(NetworkManager_t)
 +
++userdom_dontaudit_search_sysadm_home_dirs(NetworkManager_t)
++
 +cron_read_system_job_lib_files(NetworkManager_t)
  
  optional_policy(`
  	bind_domtrans(NetworkManager_t)
-@@ -129,28 +151,22 @@
+@@ -129,28 +156,26 @@
  ')
  
  optional_policy(`
@@ -12954,12 +13003,11 @@
 -	dbus_system_bus_client_template(NetworkManager,NetworkManager_t)
 -	dbus_connect_system_bus(NetworkManager_t)
 -	dbus_send_system_bus(NetworkManager_t)
-+	dbus_system_domain(NetworkManager_t,NetworkManager_exec_t)
++	dbus_system_domain(NetworkManager_t, NetworkManager_exec_t)
  ')
  
  optional_policy(`
 -	howl_signal(NetworkManager_t)
-+	hal_dontaudit_list_lib_dirs(NetworkManager_t)
 +	hal_write_log(NetworkManager_t)
  ')
  
@@ -12970,35 +13018,33 @@
  
  optional_policy(`
 -	nscd_socket_use(NetworkManager_t)
++	nscd_domtrans(NetworkManager_t)
  	nscd_signal(NetworkManager_t)
 +	nscd_script_domtrans(NetworkManager_t)
-+	nscd_domtrans(NetworkManager_t)
- ')
- 
- optional_policy(`
-@@ -162,19 +178,21 @@
- 	ppp_domtrans(NetworkManager_t)
- 	ppp_read_pid_files(NetworkManager_t)
- 	ppp_signal(NetworkManager_t)
-+	ppp_signull(NetworkManager_t)
-+	ppp_read_config(NetworkManager_t)
- ')
- 
- optional_policy(`
--	seutil_sigchld_newrole(NetworkManager_t)
++')
++
++optional_policy(`
 +	# Dispatcher starting and stoping ntp
 +	ntp_script_domtrans(NetworkManager_t)
  ')
  
  optional_policy(`
--	udev_read_db(NetworkManager_t)
-+	seutil_sigchld_newrole(NetworkManager_t)
+@@ -159,9 +184,17 @@
  ')
  
  optional_policy(`
--	# Read gnome-keyring
--	unconfined_read_home_content_files(NetworkManager_t)
-+	udev_read_db(NetworkManager_t)
+-	ppp_domtrans(NetworkManager_t)
++	ppp_script_domtrans(NetworkManager_t)
+ 	ppp_read_pid_files(NetworkManager_t)
+ 	ppp_signal(NetworkManager_t)
++	ppp_signull(NetworkManager_t)
++	ppp_read_config(NetworkManager_t)
++')
++
++optional_policy(`
++	rpm_exec(NetworkManager_t)
++	rpm_read_db(NetworkManager_t)
++	rpm_dontaudit_manage_db(NetworkManager_t)
  ')
  
  optional_policy(`
@@ -14393,7 +14439,7 @@
  # Fix pptp sockets
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.if serefpolicy-3.0.8/policy/modules/services/ppp.if
 --- nsaserefpolicy/policy/modules/services/ppp.if	2008-06-12 23:37:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/ppp.if	2008-08-11 15:46:05.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/ppp.if	2008-09-23 15:56:03.000000000 -0400
 @@ -76,6 +76,24 @@
  
  ########################################
@@ -14419,7 +14465,41 @@
  ##	 Execute domain in the ppp domain.
  ## </summary>
  ## <param name="domain">
-@@ -159,6 +177,25 @@
+@@ -102,6 +120,16 @@
+ ##	 Domain allowed access.
+ ##	</summary>
+ ## </param>
++## <param name="role">
++##	<summary>
++##	The role to allow the ppp domain.
++##	</summary>
++## </param>
++## <param name="terminal">
++##	<summary>
++##	The type of the terminal allow the ppp domain to use.
++##	</summary>
++## </param>
+ ## <rolecap/>
+ #
+ interface(`ppp_run_cond',`
+@@ -126,6 +154,16 @@
+ ##	 Domain allowed access.
+ ##	</summary>
+ ## </param>
++## <param name="role">
++##	<summary>
++##	The role to allow the ppp domain.
++##	</summary>
++## </param>
++## <param name="terminal">
++##	<summary>
++##	The type of the terminal allow the ppp domain to use.
++##	</summary>
++## </param>
+ ## <rolecap/>
+ #
+ interface(`ppp_run',`
+@@ -159,6 +197,25 @@
  
  ########################################
  ## <summary>
@@ -14445,9 +14525,41 @@
  ##	Read PPP-writable configuration files.
  ## </summary>
  ## <param name="domain">
+@@ -248,5 +305,23 @@
+ 		type pppd_var_run_t;
+ 	')
+ 
+-	files_pid_filetrans($1,pppd_var_run_t,file)
++	files_pid_filetrans($1, pppd_var_run_t, file)
++')
++
++########################################
++## <summary>
++##	Execute ppp server in the ntpd domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`ppp_script_domtrans',`
++	gen_require(`
++		type pppd_script_exec_t;
++	')
++
++	init_script_domtrans_spec($1, pppd_script_exec_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.0.8/policy/modules/services/ppp.te
 --- nsaserefpolicy/policy/modules/services/ppp.te	2008-06-12 23:37:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/ppp.te	2008-08-11 16:47:54.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/ppp.te	2008-09-23 16:00:30.000000000 -0400
+@@ -1,5 +1,5 @@
+ 
+-policy_module(ppp,1.5.0)
++policy_module(ppp,1.6.1)
+ 
+ ########################################
+ #
 @@ -71,7 +71,7 @@
  # PPPD Local policy
  #
@@ -14466,7 +14578,33 @@
  kernel_read_network_state(pppd_t)
  kernel_load_module(pppd_t)
  
-@@ -197,11 +197,7 @@
+@@ -162,6 +162,8 @@
+ init_read_utmp(pppd_t)
+ init_dontaudit_write_utmp(pppd_t)
+ 
++auth_use_nsswitch(pppd_t)
++
+ libs_use_ld_so(pppd_t)
+ libs_use_shared_libs(pppd_t)
+ 
+@@ -174,10 +176,9 @@
+ sysnet_etc_filetrans_config(pppd_t)
+ 
+ userdom_dontaudit_use_unpriv_user_fds(pppd_t)
+-userdom_dontaudit_search_sysadm_home_dirs(pppd_t)
+ # for ~/.ppprc - if it actually exists then you need some policy to read it
+ #allow pppd_t { sysadm_home_dir_t home_root_t user_home_dir_type }:dir search;
+-userdom_search_sysadm_home_dirs(pppd_t)
++userdom_dontaudit_search_sysadm_home_dirs(pppd_t)
+ userdom_search_unpriv_users_home_dirs(pppd_t)
+ 
+ ppp_exec(pppd_t)
+@@ -194,14 +195,12 @@
+ 
+ optional_policy(`
+ 	mta_send_mail(pppd_t)
++	mta_mailcontent(pppd_etc_t)
++	mta_mailcontent(pppd_etc_rw_t)
  ')
  
  optional_policy(`
@@ -14479,14 +14617,32 @@
  ')
  
  optional_policy(`
-@@ -221,6 +217,7 @@
+@@ -221,8 +220,9 @@
  # PPTP Local policy
  #
  
-+allow pptp_t self:process signal; 
- dontaudit pptp_t self:capability sys_tty_config;
+-dontaudit pptp_t self:capability sys_tty_config;
  allow pptp_t self:capability net_raw;
++dontaudit pptp_t self:capability sys_tty_config;
++allow pptp_t self:process signal; 
  allow pptp_t self:fifo_file { read write };
+ allow pptp_t self:unix_dgram_socket create_socket_perms;
+ allow pptp_t self:unix_stream_socket { connectto create_stream_socket_perms };
+@@ -292,6 +292,14 @@
+ ')
+ 
+ optional_policy(`
++	dbus_system_domain(pppd_t,pppd_exec_t)
++
++	optional_policy(`
++		networkmanager_dbus_chat(pppd_t)
++	')
++')
++
++optional_policy(`
+ 	hostname_exec(pptp_t)
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.fc serefpolicy-3.0.8/policy/modules/services/prelude.fc
 --- nsaserefpolicy/policy/modules/services/prelude.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.0.8/policy/modules/services/prelude.fc	2008-06-12 23:37:59.000000000 -0400
@@ -17141,15 +17297,27 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.0.8/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2008-06-12 23:37:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/spamassassin.fc	2008-06-12 23:37:58.000000000 -0400
-@@ -11,6 +11,7 @@
++++ serefpolicy-3.0.8/policy/modules/services/spamassassin.fc	2008-09-09 08:19:50.000000000 -0400
+@@ -6,11 +6,18 @@
+ /usr/bin/spamd		--	gen_context(system_u:object_r:spamd_exec_t,s0)
+ 
+ /usr/sbin/spamd		--	gen_context(system_u:object_r:spamd_exec_t,s0)
++/usr/sbin/spamass-milter --	gen_context(system_u:object_r:spamd_exec_t,s0)
++/usr/bin/mimedefang-multiplexor --	gen_context(system_u:object_r:spamd_exec_t,s0)
+ 
+ /var/lib/spamassassin(/.*)?	gen_context(system_u:object_r:spamd_var_lib_t,s0)
  
++/var/log/spamd\.log	--	gen_context(system_u:object_r:spamd_log_t,s0)
++/var/log/mimedefang	--	gen_context(system_u:object_r:spamd_log_t,s0)
++
  /var/run/spamassassin(/.*)?	gen_context(system_u:object_r:spamd_var_run_t,s0)
  /var/run/spamass-milter(/.*)?	gen_context(system_u:object_r:spamd_var_run_t,s0)
+-
 +/var/spool/milter-regex(/.*)?	gen_context(system_u:object_r:spamd_var_run_t,s0)
- 
  /var/spool/spamassassin(/.*)?	gen_context(system_u:object_r:spamd_spool_t,s0)
  /var/spool/spamd(/.*)?		gen_context(system_u:object_r:spamd_spool_t,s0)
++/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)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-3.0.8/policy/modules/services/spamassassin.if
 --- nsaserefpolicy/policy/modules/services/spamassassin.if	2008-06-12 23:37:57.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/spamassassin.if	2008-06-12 23:37:59.000000000 -0400
@@ -17267,8 +17435,18 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.0.8/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2008-06-12 23:37:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/spamassassin.te	2008-06-12 23:37:58.000000000 -0400
-@@ -53,7 +53,7 @@
++++ serefpolicy-3.0.8/policy/modules/services/spamassassin.te	2008-09-09 08:22:51.000000000 -0400
+@@ -31,6 +31,9 @@
+ type spamd_spool_t;
+ files_type(spamd_spool_t)
+ 
++type spamd_log_t;
++logging_log_file(spamd_log_t)
++
+ type spamd_tmp_t;
+ files_tmp_file(spamd_tmp_t)
+ 
+@@ -53,7 +56,7 @@
  # setuids to the user running spamc.  Comment this if you are not
  # using this ability.
  
@@ -17277,7 +17455,22 @@
  dontaudit spamd_t self:capability sys_tty_config;
  allow spamd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow spamd_t self:fd use;
-@@ -81,11 +81,12 @@
+@@ -69,10 +72,13 @@
+ allow spamd_t self:unix_stream_socket connectto;
+ allow spamd_t self:tcp_socket create_stream_socket_perms;
+ allow spamd_t self:udp_socket create_socket_perms;
+-allow spamd_t self:netlink_route_socket r_netlink_socket_perms;
++
++manage_files_pattern(spamd_t, spamd_log_t, spamd_log_t)
++logging_log_filetrans(spamd_t, spamd_log_t, file)
+ 
+ manage_dirs_pattern(spamd_t,spamd_spool_t,spamd_spool_t)
+ manage_files_pattern(spamd_t,spamd_spool_t,spamd_spool_t)
++manage_sock_files_pattern(spamd_t, spamd_spool_t, spamd_spool_t)
+ files_spool_filetrans(spamd_t,spamd_spool_t, { file dir })
+ 
+ manage_dirs_pattern(spamd_t,spamd_tmp_t,spamd_tmp_t)
+@@ -81,11 +87,12 @@
  
  # var/lib files for spamd
  allow spamd_t spamd_var_lib_t:dir list_dir_perms;
@@ -17292,7 +17485,25 @@
  
  kernel_read_all_sysctls(spamd_t)
  kernel_read_system_state(spamd_t)
-@@ -150,10 +151,12 @@
+@@ -134,6 +141,8 @@
+ 
+ init_dontaudit_rw_utmp(spamd_t)
+ 
++auth_use_nsswitch(spamd_t)
++
+ libs_use_ld_so(spamd_t)
+ libs_use_shared_libs(spamd_t)
+ 
+@@ -141,19 +150,17 @@
+ 
+ miscfiles_read_localization(spamd_t)
+ 
+-sysnet_read_config(spamd_t)
+-sysnet_use_ldap(spamd_t)
+-sysnet_dns_name_resolve(spamd_t)
+-
+ userdom_use_unpriv_users_fds(spamd_t)
+ userdom_search_unpriv_users_home_dirs(spamd_t)
  userdom_dontaudit_search_sysadm_home_dirs(spamd_t)
  
  tunable_policy(`use_nfs_home_dirs',`
@@ -17305,7 +17516,7 @@
  	fs_manage_cifs_files(spamd_t)
  ')
  
-@@ -171,6 +174,7 @@
+@@ -171,6 +178,7 @@
  
  optional_policy(`
  	dcc_domtrans_client(spamd_t)
@@ -17313,6 +17524,17 @@
  	dcc_stream_connect_dccifd(spamd_t)
  ')
  
+@@ -180,10 +188,6 @@
+ ')
+ 
+ optional_policy(`
+-	nis_use_ypbind(spamd_t)
+-')
+-
+-optional_policy(`
+ 	postfix_read_config(spamd_t)
+ ')
+ 
 @@ -212,3 +216,30 @@
  optional_policy(`
  	udev_read_db(spamd_t)
@@ -23598,7 +23820,7 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-06-12 23:37:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2008-07-02 17:13:24.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2008-09-23 15:36:50.000000000 -0400
 @@ -29,8 +29,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-8/selinux-policy.spec,v
retrieving revision 1.643
retrieving revision 1.644
diff -u -r1.643 -r1.644
--- selinux-policy.spec	8 Sep 2008 20:59:24 -0000	1.643
+++ selinux-policy.spec	23 Sep 2008 20:09:05 -0000	1.644
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 115%{?dist}
+Release: 116%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -381,6 +381,9 @@
 %endif
 
 %changelog
+* Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> 3.0.8-116
+- add mimedefang to spamd
+
 * Tue Aug 26 2008 Dan Walsh <dwalsh at redhat.com> 3.0.8-115
 - Remove definition for /var/run/mod_fcgid(/.*)?	
 



From dwalsh at fedoraproject.org  Tue Sep 23 20:09:58 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 23 Sep 2008 20:09:58 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.214,
	1.215 selinux-policy.spec, 1.710, 1.711
Message-ID: <20080923200958.CB67170033@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12131

Modified Files:
	policy-20071130.patch selinux-policy.spec 
Log Message:
* Tue Sep 23 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-94
- Update to latest policy for NetworkManager 


policy-20071130.patch:

Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- policy-20071130.patch	23 Sep 2008 14:04:56 -0000	1.214
+++ policy-20071130.patch	23 Sep 2008 20:09:57 -0000	1.215
@@ -15267,7 +15267,7 @@
  /var/run/dbus(/.*)?		gen_context(system_u:object_r:system_dbusd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.3.1/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/dbus.if	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/dbus.if	2008-09-23 15:34:07.000000000 -0400
 @@ -53,6 +53,7 @@
  	gen_require(`
  		type system_dbusd_exec_t, system_dbusd_t, dbusd_etc_t;
@@ -15479,7 +15479,7 @@
  ##	Read dbus configuration.
  ## </summary>
  ## <param name="domain">
-@@ -366,3 +431,73 @@
+@@ -366,3 +431,74 @@
  
  	allow $1 system_dbusd_t:dbus *;
  ')
@@ -15552,10 +15552,11 @@
 +	')
 +
 +	allow $1 system_dbusd_t:tcp_socket { read write };
++	allow $1 system_dbusd_t:fd use;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.3.1/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/dbus.te	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/dbus.te	2008-09-23 15:32:58.000000000 -0400
 @@ -9,9 +9,10 @@
  #
  # Delcarations
@@ -15628,20 +15629,25 @@
  
  domain_use_interactive_fds(system_dbusd_t)
  
-@@ -91,6 +107,8 @@
+@@ -91,6 +107,9 @@
  
  init_use_fds(system_dbusd_t)
  init_use_script_ptys(system_dbusd_t)
 +init_dbus_chat_script(system_dbusd_t)
 +init_bin_domtrans_spec(system_dbusd_t)
++init_domtrans_script(system_dbusd_t)
  
  libs_use_ld_so(system_dbusd_t)
  libs_use_shared_libs(system_dbusd_t)
-@@ -121,9 +139,37 @@
+@@ -121,9 +140,37 @@
  ')
  
  optional_policy(`
-+	networkmanager_init_script_domtrans_spec(system_dbusd_t)
++	consolekit_dbus_chat(system_dbusd_t)
++')
++
++optional_policy(`
++	networkmanager_script_domtrans(system_dbusd_t)
 +')
 +
 +optional_policy(`
@@ -15658,10 +15664,6 @@
  ')
 +
 +optional_policy(`
-+	consolekit_dbus_chat(system_dbusd_t)
-+')
-+
-+optional_policy(`
 +	gen_require(`
 +		type unconfined_dbusd_t;
 +		attribute domain;
@@ -20330,24 +20332,36 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.3.1/policy/modules/services/networkmanager.fc
 --- nsaserefpolicy/policy/modules/services/networkmanager.fc	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/networkmanager.fc	2008-09-08 11:45:12.000000000 -0400
-@@ -1,7 +1,13 @@
++++ serefpolicy-3.3.1/policy/modules/services/networkmanager.fc	2008-09-23 15:27:49.000000000 -0400
+@@ -1,7 +1,16 @@
++/etc/NetworkManager/dispatcher\.d(/.*)	gen_context(system_u:object_r:NetworkManager_script_exec_t,s0)
++
++/sbin/wpa_supplicant		--	gen_context(system_u:object_r:NetworkManager_exec_t,s0)
++
  /usr/s?bin/NetworkManager	--	gen_context(system_u:object_r:NetworkManager_exec_t,s0)
  /usr/s?bin/wpa_supplicant	--	gen_context(system_u:object_r:NetworkManager_exec_t,s0)
 +/usr/sbin/NetworkManagerDispatcher	--	gen_context(system_u:object_r:NetworkManager_exec_t,s0)
 +/usr/sbin/nm-system-settings	--	gen_context(system_u:object_r:NetworkManager_exec_t,s0)
++
++/var/log/wpa_supplicant.*	--	gen_context(system_u:object_r:NetworkManager_log_t,s0)
  
  /var/run/NetworkManager\.pid	--	gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
  /var/run/NetworkManager(/.*)?		gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
  /var/run/wpa_supplicant(/.*)?		gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
  /var/run/wpa_supplicant-global	-s	gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
 +/var/run/nm-dhclient.*			gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
-+
-+/var/log/wpa_supplicant\.log.*	--	gen_context(system_u:object_r:NetworkManager_log_t,s0)
-+/etc/NetworkManager/dispatcher.d(/.*)	gen_context(system_u:object_r:NetworkManager_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-3.3.1/policy/modules/services/networkmanager.if
 --- nsaserefpolicy/policy/modules/services/networkmanager.if	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/networkmanager.if	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/networkmanager.if	2008-09-23 15:27:57.000000000 -0400
+@@ -74,7 +74,7 @@
+ 	')
+ 
+ 	corecmd_search_bin($1)
+-	domtrans_pattern($1,NetworkManager_exec_t,NetworkManager_t)
++	domtrans_pattern($1, NetworkManager_exec_t, NetworkManager_t)
+ ')
+ 
+ ########################################
 @@ -97,3 +97,58 @@
  	allow $1 NetworkManager_t:dbus send_msg;
  	allow NetworkManager_t $1:dbus send_msg;
@@ -20381,7 +20395,7 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`networkmanager_init_script_domtrans_spec',`
++interface(`networkmanager_script_domtrans',`
 +	gen_require(`
 +		type NetworkManager_script_exec_t;
 +	')
@@ -20405,44 +20419,66 @@
 +	')
 +
 +	files_search_pids($1)
-+	read_files_pattern($1, NetworkManager_var_run_t, NetworkManager_var_run_t)
++	allow $1 NetworkManager_var_run_t:file read_file_perms;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.3.1/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/networkmanager.te	2008-09-08 11:45:12.000000000 -0400
-@@ -13,6 +13,13 @@
- type NetworkManager_var_run_t;
- files_pid_file(NetworkManager_var_run_t)
++++ serefpolicy-3.3.1/policy/modules/services/networkmanager.te	2008-09-23 16:07:05.000000000 -0400
+@@ -1,5 +1,5 @@
  
+-policy_module(networkmanager,1.9.0)
++policy_module(networkmanager, 1.10.2)
+ 
+ ########################################
+ #
+@@ -8,7 +8,16 @@
+ 
+ type NetworkManager_t;
+ type NetworkManager_exec_t;
+-init_daemon_domain(NetworkManager_t,NetworkManager_exec_t)
++init_daemon_domain(NetworkManager_t, NetworkManager_exec_t)
++
 +type NetworkManager_log_t;
 +logging_log_file(NetworkManager_log_t)
 +
 +type NetworkManager_script_exec_t;
 +init_script_file(NetworkManager_script_exec_t)
-+init_script_domtrans_spec(NetworkManager_t, NetworkManager_script_exec_t)
 +
- ########################################
- #
- # Local policy
-@@ -20,9 +27,9 @@
++type NetworkManager_tmp_t;
++files_tmp_file(NetworkManager_tmp_t)
+ 
+ type NetworkManager_var_run_t;
+ files_pid_file(NetworkManager_var_run_t)
+@@ -20,9 +29,9 @@
  
  # networkmanager will ptrace itself if gdb is installed
  # and it receives a unexpected signal (rh bug #204161) 
 -allow NetworkManager_t self:capability { kill setgid setuid sys_nice dac_override net_admin net_raw net_bind_service ipc_lock };
-+allow NetworkManager_t self:capability { chown fsetid kill setgid setuid sys_nice dac_override net_admin net_raw net_bind_service ipc_lock };
++allow NetworkManager_t self:capability { chown fsetid kill setgid setuid sys_admin sys_nice dac_override net_admin net_raw net_bin_dservice ipc_lock };
  dontaudit NetworkManager_t self:capability { sys_tty_config sys_ptrace };
 -allow NetworkManager_t self:process { ptrace setcap setpgid getsched signal_perms };
 +allow NetworkManager_t self:process { ptrace getcap setcap setpgid getsched setsched signal_perms };
  allow NetworkManager_t self:fifo_file rw_fifo_file_perms;
  allow NetworkManager_t self:unix_dgram_socket { sendto create_socket_perms };
  allow NetworkManager_t self:unix_stream_socket create_stream_socket_perms;
-@@ -38,10 +45,14 @@
- manage_sock_files_pattern(NetworkManager_t,NetworkManager_var_run_t,NetworkManager_var_run_t)
+@@ -33,15 +42,22 @@
+ 
+ can_exec(NetworkManager_t, NetworkManager_exec_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)
+-manage_sock_files_pattern(NetworkManager_t,NetworkManager_var_run_t,NetworkManager_var_run_t)
++manage_files_pattern(NetworkManager_t, NetworkManager_log_t, NetworkManager_log_t)
++logging_log_filetrans(NetworkManager_t, NetworkManager_log_t, file)
++
++manage_sock_files_pattern(NetworkManager_t, NetworkManager_tmp_t, NetworkManager_tmp_t)
++files_tmp_filetrans(NetworkManager_t, NetworkManager_tmp_t, sock_file)
++
++manage_dirs_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
++manage_files_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
++manage_sock_files_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
  files_pid_filetrans(NetworkManager_t,NetworkManager_var_run_t, { dir file sock_file })
  
-+manage_files_pattern(NetworkManager_t,NetworkManager_log_t,NetworkManager_log_t)
-+logging_log_filetrans(NetworkManager_t,NetworkManager_log_t, file)
-+
  kernel_read_system_state(NetworkManager_t)
  kernel_read_network_state(NetworkManager_t)
  kernel_read_kernel_sysctls(NetworkManager_t)
@@ -20451,7 +20487,7 @@
  
  corenet_all_recvfrom_unlabeled(NetworkManager_t)
  corenet_all_recvfrom_netlabel(NetworkManager_t)
-@@ -64,9 +75,11 @@
+@@ -64,9 +80,11 @@
  dev_read_sysfs(NetworkManager_t)
  dev_read_rand(NetworkManager_t)
  dev_read_urand(NetworkManager_t)
@@ -20463,14 +20499,12 @@
  
  mls_file_read_all_levels(NetworkManager_t)
  
-@@ -82,10 +95,16 @@
- files_read_etc_files(NetworkManager_t)
+@@ -83,9 +101,14 @@
  files_read_etc_runtime_files(NetworkManager_t)
  files_read_usr_files(NetworkManager_t)
-+files_list_tmp(NetworkManager_t)
-+
-+storage_getattr_fixed_disk_dev(NetworkManager_t)
  
++storage_getattr_fixed_disk_dev(NetworkManager_t)
++
  init_read_utmp(NetworkManager_t)
 +init_dontaudit_write_utmp(NetworkManager_t)
  init_domtrans_script(NetworkManager_t)
@@ -20480,23 +20514,29 @@
  libs_use_ld_so(NetworkManager_t)
  libs_use_shared_libs(NetworkManager_t)
  
-@@ -113,6 +132,9 @@
+@@ -109,10 +132,14 @@
+ sysnet_etc_filetrans_config(NetworkManager_t)
+ 
+ userdom_dontaudit_use_unpriv_user_fds(NetworkManager_t)
+-userdom_dontaudit_search_sysadm_home_dirs(NetworkManager_t)
  userdom_dontaudit_use_unpriv_users_ttys(NetworkManager_t)
  # Read gnome-keyring
  userdom_read_unpriv_users_home_content_files(NetworkManager_t)
 +userdom_unpriv_users_stream_connect(NetworkManager_t)
 +
++userdom_dontaudit_search_sysadm_home_dirs(NetworkManager_t)
++
 +cron_read_system_job_lib_files(NetworkManager_t)
  
  optional_policy(`
  	bind_domtrans(NetworkManager_t)
-@@ -129,21 +151,21 @@
+@@ -129,21 +156,26 @@
  ')
  
  optional_policy(`
 -	dbus_system_bus_client_template(NetworkManager,NetworkManager_t)
 -	dbus_connect_system_bus(NetworkManager_t)
-+	dbus_system_domain(NetworkManager_t,NetworkManager_exec_t)
++	dbus_system_domain(NetworkManager_t, NetworkManager_exec_t)
  ')
  
  optional_policy(`
@@ -20511,14 +20551,23 @@
  
  optional_policy(`
 -	nscd_socket_use(NetworkManager_t)
++	nscd_domtrans(NetworkManager_t)
  	nscd_signal(NetworkManager_t)
 +	nscd_script_domtrans(NetworkManager_t)
-+	nscd_domtrans(NetworkManager_t)
++')
++
++optional_policy(`
++	# Dispatcher starting and stoping ntp
++	ntp_script_domtrans(NetworkManager_t)
  ')
  
  optional_policy(`
-@@ -155,19 +177,21 @@
- 	ppp_domtrans(NetworkManager_t)
+@@ -152,22 +184,25 @@
+ ')
+ 
+ optional_policy(`
+-	ppp_domtrans(NetworkManager_t)
++	ppp_script_domtrans(NetworkManager_t)
  	ppp_read_pid_files(NetworkManager_t)
  	ppp_signal(NetworkManager_t)
 +	ppp_signull(NetworkManager_t)
@@ -20527,8 +20576,9 @@
  
  optional_policy(`
 -	seutil_sigchld_newrole(NetworkManager_t)
-+	# Dispatcher starting and stoping ntp
-+	ntp_script_domtrans(NetworkManager_t)
++	rpm_exec(NetworkManager_t)
++	rpm_read_db(NetworkManager_t)
++	rpm_dontaudit_manage_db(NetworkManager_t)
  ')
  
  optional_policy(`
@@ -23461,17 +23511,20 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.fc serefpolicy-3.3.1/policy/modules/services/ppp.fc
 --- nsaserefpolicy/policy/modules/services/ppp.fc	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/ppp.fc	2008-09-08 11:45:12.000000000 -0400
-@@ -33,3 +33,5 @@
- 
- /var/log/ppp-connect-errors.*	--	gen_context(system_u:object_r:pppd_log_t,s0)
- /var/log/ppp/.*			--	gen_context(system_u:object_r:pppd_log_t,s0)
-+
++++ serefpolicy-3.3.1/policy/modules/services/ppp.fc	2008-09-23 15:54:31.000000000 -0400
+@@ -1,6 +1,8 @@
+ #
+ # /etc
+ #
 +/etc/rc\.d/init\.d/ppp	--	gen_context(system_u:object_r:pppd_script_exec_t,s0)
++
+ /etc/ppp			-d	gen_context(system_u:object_r:pppd_etc_t,s0)
+ /etc/ppp(/.*)?			--	gen_context(system_u:object_r:pppd_etc_rw_t,s0)
+ /etc/ppp/peers(/.*)?			gen_context(system_u:object_r:pppd_etc_rw_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.if serefpolicy-3.3.1/policy/modules/services/ppp.if
 --- nsaserefpolicy/policy/modules/services/ppp.if	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/ppp.if	2008-09-08 11:45:12.000000000 -0400
-@@ -95,6 +95,24 @@
++++ serefpolicy-3.3.1/policy/modules/services/ppp.if	2008-09-23 15:53:51.000000000 -0400
+@@ -76,6 +76,24 @@
  
  ########################################
  ## <summary>
@@ -23493,16 +23546,62 @@
 +
 +########################################
 +## <summary>
- ##	 Conditionally execute ppp daemon on behalf of a user or staff type.
+ ##	 Execute domain in the ppp domain.
  ## </summary>
  ## <param name="domain">
-@@ -297,38 +315,42 @@
+@@ -102,6 +120,16 @@
+ ##	 Domain allowed access.
+ ##	</summary>
+ ## </param>
++## <param name="role">
++##	<summary>
++##	The role to allow the ppp domain.
++##	</summary>
++## </param>
++## <param name="terminal">
++##	<summary>
++##	The type of the terminal allow the ppp domain to use.
++##	</summary>
++## </param>
+ ## <rolecap/>
+ #
+ interface(`ppp_run_cond',`
+@@ -272,6 +300,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Execute ppp server in the ntpd domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`ppp_script_domtrans',`
++	gen_require(`
++		type pppd_script_exec_t;
++	')
++
++	init_script_domtrans_spec($1, pppd_script_exec_t)
++')
++
++########################################
++## <summary>
+ ##	All of the rules required to administrate 
+ ##	an ppp environment
+ ## </summary>
+@@ -295,40 +341,51 @@
+ interface(`ppp_admin',`
+ 	gen_require(`
  		type pppd_t, pppd_tmp_t, pppd_log_t, pppd_lock_t;
- 		type pppd_etc_t, pppd_script_t, pppd_secret_t;
- 		type pppd_etc_rw_t, pppd_var_lib_t, pppd_var_run_t;
--
+-		type pppd_etc_t, pppd_script_t, pppd_secret_t;
+-		type pppd_etc_rw_t, pppd_var_lib_t, pppd_var_run_t;
++		type pppd_etc_t, pppd_secret_t;
++		type pppd_etc_rw_t, pppd_var_run_t;
+ 
  		type pptp_t, pptp_log_t, pptp_var_run_t;
-+		type pppd_script_exec_t;
++ 		type pppd_script_exec_t;
  	')
  
  	allow $1 pppd_t:process { ptrace signal_perms getattr };
@@ -23511,6 +23610,12 @@
 +	allow $1 pptp_t:process { ptrace signal_perms getattr };
 +	ps_process_pattern($1, pptp_t)
 +
++	# Allow admin domain to restart the pppd_t service
++	ppp_script_domtrans($1)
++	domain_system_change_exemption($1)
++	role_transition $2 pppd_script_exec_t system_r;
++	allow $2 system_r;
++
  	files_list_tmp($1)
 -	manage_files_pattern($1, pppd_tmp_t, pppd_tmp_t)
 +        manage_all_pattern($1,pppd_tmp_t)
@@ -23518,22 +23623,22 @@
  	logging_list_logs($1)
 -	manage_files_pattern($1, pppd_log_t, pppd_log_t)
 +        manage_all_pattern($1,pppd_log_t)
++
++        manage_all_pattern($1,pptp_log_t)
  
 -	manage_files_pattern($1, pppd_lock_t, pppd_lock_t)
-+        manage_all_pattern($1,pptp_log_t)
-+
 +        manage_all_pattern($1,pppd_lock_t)
  
  	files_list_etc($1)
 -	manage_files_pattern($1, pppd_etc_t, pppd_etc_t)
 +	manage_all_pattern($1,pppd_etc_t)
-+
-+	manage_all_pattern($1,pppd_etc_rw_t)
  
 -	manage_files_pattern($1, pppd_etc_rw_t, pppd_etc_rw_t)
-+	manage_all_pattern($1,pppd_secret_t)
++	manage_all_pattern($1,pppd_etc_rw_t)
  
 -	manage_files_pattern($1, pppd_secret_t, pppd_secret_t)
++	manage_all_pattern($1,pppd_secret_t)
++
 +	manage_all_pattern($1,pppd_script_exec_t)
  
  	files_list_var_lib($1)
@@ -28744,7 +28849,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.3.1/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/squid.te	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/squid.te	2008-09-23 15:23:50.000000000 -0400
 @@ -31,12 +31,15 @@
  type squid_var_run_t;
  files_pid_file(squid_var_run_t)
@@ -28795,7 +28900,11 @@
  
  libs_use_ld_so(squid_t)
  libs_use_shared_libs(squid_t)
-@@ -148,11 +156,7 @@
+@@ -145,14 +153,11 @@
+ 
+ tunable_policy(`squid_connect_any',`
+ 	corenet_tcp_connect_all_ports(squid_t)
++	corenet_tcp_bind_all_ports(squid_t)
  ')
  
  optional_policy(`
@@ -28808,7 +28917,7 @@
  ')
  
  optional_policy(`
-@@ -167,7 +171,12 @@
+@@ -167,7 +172,12 @@
  	udev_read_db(squid_t)
  ')
  
@@ -32875,7 +32984,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.3.1/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/init.te	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/system/init.te	2008-09-23 15:44:00.000000000 -0400
 @@ -10,6 +10,20 @@
  # Declarations
  #
@@ -33054,7 +33163,15 @@
  
  selinux_get_enforce_mode(initrc_t)
  
-@@ -496,6 +535,31 @@
+@@ -352,6 +391,7 @@
+ libs_use_shared_libs(initrc_t)
+ libs_exec_lib_files(initrc_t)
+ 
++logging_send_audit_msgs(initrc_t)
+ logging_send_syslog_msg(initrc_t)
+ logging_manage_generic_logs(initrc_t)
+ logging_read_all_logs(initrc_t)
+@@ -496,6 +536,31 @@
  	')
  ')
  
@@ -33086,7 +33203,7 @@
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -554,16 +618,12 @@
+@@ -554,16 +619,12 @@
  	dbus_read_config(initrc_t)
  
  	optional_policy(`
@@ -33107,7 +33224,7 @@
  ')
  
  optional_policy(`
-@@ -639,12 +699,6 @@
+@@ -639,12 +700,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -33120,7 +33237,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -705,6 +759,9 @@
+@@ -705,6 +760,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -33130,7 +33247,7 @@
  ')
  
  optional_policy(`
-@@ -717,9 +774,11 @@
+@@ -717,9 +775,11 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -33145,7 +33262,7 @@
  ')
  
  optional_policy(`
-@@ -738,6 +797,11 @@
+@@ -738,6 +798,11 @@
  	uml_setattr_util_sockets(initrc_t)
  ')
  
@@ -33157,7 +33274,7 @@
  optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -752,6 +816,10 @@
+@@ -752,6 +817,10 @@
  ')
  
  optional_policy(`
@@ -33168,7 +33285,7 @@
  	vmware_read_system_config(initrc_t)
  	vmware_append_system_config(initrc_t)
  ')
-@@ -774,3 +842,4 @@
+@@ -774,3 +843,4 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v
retrieving revision 1.710
retrieving revision 1.711
diff -u -r1.710 -r1.711
--- selinux-policy.spec	23 Sep 2008 13:27:34 -0000	1.710
+++ selinux-policy.spec	23 Sep 2008 20:09:58 -0000	1.711
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.3.1
-Release: 93%{?dist}
+Release: 94%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -386,6 +386,9 @@
 %endif
 
 %changelog
+* Tue Sep 23 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-94
+- Update to latest policy for NetworkManager 
+
 * Mon Sep 22 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-93
 - Add /dev/msp* support
 - Update prewikka support



From dwalsh at fedoraproject.org  Tue Sep 23 20:15:18 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 23 Sep 2008 20:15:18 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20080710.patch, 1.44,
	1.45 selinux-policy.spec, 1.711, 1.712
Message-ID: <20080923201518.2D1A570033@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13294

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
* Tue Sep 23 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-7
- Allow confined users to login with dbus


policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- policy-20080710.patch	23 Sep 2008 14:23:23 -0000	1.44
+++ policy-20080710.patch	23 Sep 2008 20:14:47 -0000	1.45
@@ -14730,7 +14730,7 @@
  /var/run/dbus(/.*)?		gen_context(system_u:object_r:system_dbusd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.5.8/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/dbus.if	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/dbus.if	2008-09-23 15:34:03.000000000 -0400
 @@ -53,6 +53,7 @@
  	gen_require(`
  		type system_dbusd_exec_t, system_dbusd_t, dbusd_etc_t;
@@ -14748,7 +14748,7 @@
  	type $1_dbusd_tmp_t;
  	files_tmp_file($1_dbusd_tmp_t)
  
-@@ -84,14 +83,18 @@
+@@ -84,14 +83,19 @@
  	allow $1_dbusd_t self:tcp_socket create_stream_socket_perms;
  	allow $1_dbusd_t self:netlink_selinux_socket create_socket_perms;
  
@@ -14760,6 +14760,7 @@
 -	type_change $2 $1_dbusd_t:dbus $1_dbusd_$1_t;
 +	allow $2 $1_dbusd_t:unix_stream_socket { getattr connectto };
 +	allow $2 $1_dbusd_t:unix_dgram_socket getattr;
++	allow $1_dbusd_t $2:unix_stream_socket rw_socket_perms;
  
  	# SE-DBus specific permissions
 -	allow $1_dbusd_$1_t { $1_dbusd_t self }:dbus send_msg;
@@ -14771,7 +14772,7 @@
  
  	allow $1_dbusd_t dbusd_etc_t:dir list_dir_perms;
  	read_files_pattern($1_dbusd_t, dbusd_etc_t, dbusd_etc_t)
-@@ -102,10 +105,9 @@
+@@ -102,10 +106,9 @@
  	files_tmp_filetrans($1_dbusd_t, $1_dbusd_tmp_t, { file dir })
  
  	domtrans_pattern($2, system_dbusd_exec_t, $1_dbusd_t)
@@ -14784,7 +14785,7 @@
  	allow $1_dbusd_t $2:process sigkill;
  	allow $2 $1_dbusd_t:fd use;
  	allow $2 $1_dbusd_t:fifo_file rw_fifo_file_perms;
-@@ -115,8 +117,8 @@
+@@ -115,8 +118,8 @@
  	kernel_read_kernel_sysctls($1_dbusd_t)
  
  	corecmd_list_bin($1_dbusd_t)
@@ -14794,7 +14795,7 @@
  	corecmd_read_bin_pipes($1_dbusd_t)
  	corecmd_read_bin_sockets($1_dbusd_t)
  
-@@ -139,6 +141,7 @@
+@@ -139,6 +142,7 @@
  
  	fs_getattr_romfs($1_dbusd_t)
  	fs_getattr_xattr_fs($1_dbusd_t)
@@ -14802,7 +14803,7 @@
  
  	selinux_get_fs_mount($1_dbusd_t)
  	selinux_validate_context($1_dbusd_t)
-@@ -161,12 +164,24 @@
+@@ -161,12 +165,24 @@
  	seutil_read_config($1_dbusd_t)
  	seutil_read_default_contexts($1_dbusd_t)
  
@@ -14828,7 +14829,7 @@
  	tunable_policy(`read_default_t',`
  		files_list_default($1_dbusd_t)
  		files_read_default_files($1_dbusd_t)
-@@ -180,8 +195,15 @@
+@@ -180,9 +196,17 @@
  	')
  
  	optional_policy(`
@@ -14842,9 +14843,11 @@
 +		xserver_dontaudit_xdm_lib_search($1_dbusd_t)
 +		xserver_rw_xdm_home_files($1_dbusd_t)
  	')
++
  ')
  
-@@ -207,14 +229,12 @@
+ #######################################
+@@ -207,14 +231,12 @@
  		type system_dbusd_t, system_dbusd_t;
  		type system_dbusd_var_run_t, system_dbusd_var_lib_t;
  		class dbus send_msg;
@@ -14862,7 +14865,7 @@
  
  	read_files_pattern($2, system_dbusd_var_lib_t, system_dbusd_var_lib_t)
  	files_search_var_lib($2)
-@@ -223,6 +243,10 @@
+@@ -223,6 +245,10 @@
  	files_search_pids($2)
  	stream_connect_pattern($2, system_dbusd_var_run_t, system_dbusd_var_run_t, system_dbusd_t)
  	dbus_read_config($2)
@@ -14873,7 +14876,7 @@
  ')
  
  #######################################
-@@ -251,18 +275,16 @@
+@@ -251,18 +277,16 @@
  template(`dbus_user_bus_client_template',`
  	gen_require(`
  		type $1_dbusd_t;
@@ -14894,7 +14897,7 @@
  ')
  
  ########################################
-@@ -292,6 +314,55 @@
+@@ -292,6 +316,55 @@
  
  ########################################
  ## <summary>
@@ -14950,7 +14953,7 @@
  ##	Read dbus configuration.
  ## </summary>
  ## <param name="domain">
-@@ -366,3 +437,75 @@
+@@ -366,3 +439,75 @@
  
  	allow $1 system_dbusd_t:dbus *;
  ')
@@ -15028,7 +15031,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.5.8/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/dbus.te	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/dbus.te	2008-09-23 15:32:31.000000000 -0400
 @@ -9,9 +9,10 @@
  #
  # Delcarations
@@ -15115,6 +15118,10 @@
  ')
  
  optional_policy(`
++	consolekit_dbus_chat(system_dbusd_t)
++')
++
++optional_policy(`
 +	gnome_exec_gconf(system_dbusd_t)
 +')
 +
@@ -15136,10 +15143,6 @@
  ')
 +
 +optional_policy(`
-+	consolekit_dbus_chat(system_dbusd_t)
-+')
-+
-+optional_policy(`
 +	gen_require(`
 +		type unconfined_dbusd_t;
 +	')
@@ -19515,7 +19518,7 @@
 +/var/run/nm-dhclient.*			gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-3.5.8/policy/modules/services/networkmanager.if
 --- nsaserefpolicy/policy/modules/services/networkmanager.if	2008-09-11 11:28:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/networkmanager.if	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/networkmanager.if	2008-09-23 11:18:34.000000000 -0400
 @@ -118,6 +118,24 @@
  
  ########################################
@@ -19543,13 +19546,13 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.5.8/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2008-09-11 11:28:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/networkmanager.te	2008-09-22 09:09:30.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/networkmanager.te	2008-09-23 16:02:33.000000000 -0400
 @@ -29,9 +29,9 @@
  
  # networkmanager will ptrace itself if gdb is installed
  # and it receives a unexpected signal (rh bug #204161) 
 -allow NetworkManager_t self:capability { kill setgid setuid dac_override net_admin net_raw net_bind_service ipc_lock };
-+allow NetworkManager_t self:capability { chown fsetid kill setgid setuid sys_nice dac_override net_admin net_raw net_bind_service ipc_lock };
++allow NetworkManager_t self:capability { chown fsetid kill setgid setuid sys_admin sys_nice dac_override net_admin net_raw net_bind_service ipc_lock };
  dontaudit NetworkManager_t self:capability { sys_tty_config sys_ptrace };
 -allow NetworkManager_t self:process { ptrace setcap setpgid getsched signal_perms };
 +allow NetworkManager_t self:process { ptrace getcap setcap setpgid getsched setsched signal_perms };
@@ -21909,7 +21912,7 @@
  /etc/ppp(/.*)?			--	gen_context(system_u:object_r:pppd_etc_rw_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.if serefpolicy-3.5.8/policy/modules/services/ppp.if
 --- nsaserefpolicy/policy/modules/services/ppp.if	2008-09-11 11:28:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ppp.if	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ppp.if	2008-09-23 15:53:43.000000000 -0400
 @@ -310,6 +310,24 @@
  
  ########################################
@@ -26773,7 +26776,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.5.8/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/squid.te	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/squid.te	2008-09-23 15:23:35.000000000 -0400
 @@ -31,12 +31,15 @@
  type squid_var_run_t;
  files_pid_file(squid_var_run_t)
@@ -26829,7 +26832,11 @@
  
  libs_use_ld_so(squid_t)
  libs_use_shared_libs(squid_t)
-@@ -149,11 +158,7 @@
+@@ -146,14 +155,11 @@
+ 
+ tunable_policy(`squid_connect_any',`
+ 	corenet_tcp_connect_all_ports(squid_t)
++	corenet_tcp_bind_all_ports(squid_t)
  ')
  
  optional_policy(`
@@ -26842,7 +26849,7 @@
  ')
  
  optional_policy(`
-@@ -168,7 +173,12 @@
+@@ -168,7 +174,12 @@
  	udev_read_db(squid_t)
  ')
  
@@ -30107,7 +30114,7 @@
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.5.8/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2008-09-12 10:48:05.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/init.if	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/init.if	2008-09-23 11:15:16.000000000 -0400
 @@ -278,6 +278,27 @@
  			kernel_dontaudit_use_fds($1)
  		')
@@ -30320,7 +30327,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.5.8/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2008-09-12 10:48:05.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/init.te	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/init.te	2008-09-23 15:44:50.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -30393,7 +30400,7 @@
  	nscd_socket_use(init_t)
  ')
  
-@@ -204,7 +230,7 @@
+@@ -204,9 +230,10 @@
  #
  
  allow initrc_t self:process { getpgid setsched setpgid setrlimit getsched };
@@ -30401,8 +30408,11 @@
 +allow initrc_t self:capability ~{ audit_control audit_write sys_admin sys_module };
  dontaudit initrc_t self:capability sys_module; # sysctl is triggering this
  allow initrc_t self:passwd rootok;
++allow initrc_t self:key { search };
  
-@@ -219,7 +245,8 @@
+ # Allow IPC with self
+ allow initrc_t self:unix_dgram_socket create_socket_perms;
+@@ -219,7 +246,8 @@
  term_create_pty(initrc_t,initrc_devpts_t)
  
  # Going to single user mode
@@ -30412,7 +30422,7 @@
  
  can_exec(initrc_t, init_script_file_type)
  
-@@ -232,6 +259,7 @@
+@@ -232,6 +260,7 @@
  
  allow initrc_t initrc_var_run_t:file manage_file_perms;
  files_pid_filetrans(initrc_t,initrc_var_run_t,file)
@@ -30420,7 +30430,7 @@
  
  can_exec(initrc_t,initrc_tmp_t)
  allow initrc_t initrc_tmp_t:file manage_file_perms;
-@@ -276,7 +304,7 @@
+@@ -276,7 +305,7 @@
  dev_read_sound_mixer(initrc_t)
  dev_write_sound_mixer(initrc_t)
  dev_setattr_all_chr_files(initrc_t)
@@ -30429,7 +30439,15 @@
  dev_delete_lvm_control_dev(initrc_t)
  dev_manage_generic_symlinks(initrc_t)
  dev_manage_generic_files(initrc_t)
-@@ -521,6 +549,31 @@
+@@ -371,6 +400,7 @@
+ libs_use_shared_libs(initrc_t)
+ libs_exec_lib_files(initrc_t)
+ 
++logging_send_audit_msgs(initrc_t)
+ logging_send_syslog_msg(initrc_t)
+ logging_manage_generic_logs(initrc_t)
+ logging_read_all_logs(initrc_t)
+@@ -521,6 +551,31 @@
  	')
  ')
  
@@ -30461,7 +30479,7 @@
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -579,6 +632,10 @@
+@@ -579,6 +634,10 @@
  	dbus_read_config(initrc_t)
  
  	optional_policy(`
@@ -30472,7 +30490,7 @@
  		networkmanager_dbus_chat(initrc_t)
  	')
  ')
-@@ -664,12 +721,6 @@
+@@ -664,12 +723,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -30485,7 +30503,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -730,6 +781,9 @@
+@@ -730,6 +783,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -30495,7 +30513,7 @@
  ')
  
  optional_policy(`
-@@ -742,10 +796,12 @@
+@@ -742,10 +798,12 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -30508,7 +30526,7 @@
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -763,6 +819,11 @@
+@@ -763,6 +821,11 @@
  	uml_setattr_util_sockets(initrc_t)
  ')
  
@@ -30520,7 +30538,7 @@
  optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -777,6 +838,10 @@
+@@ -777,6 +840,10 @@
  ')
  
  optional_policy(`
@@ -30531,7 +30549,7 @@
  	vmware_read_system_config(initrc_t)
  	vmware_append_system_config(initrc_t)
  ')
-@@ -799,3 +864,11 @@
+@@ -799,3 +866,11 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -32469,8 +32487,16 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.8/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.fc	2008-09-17 08:49:09.000000000 -0400
-@@ -57,3 +57,5 @@
++++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.fc	2008-09-23 14:00:14.000000000 -0400
+@@ -11,6 +11,7 @@
+ /etc/dhclient-script	--	gen_context(system_u:object_r:dhcp_etc_t,s0)
+ /etc/dhcpc.*			gen_context(system_u:object_r:dhcp_etc_t,s0)
+ /etc/dhcpd\.conf	--	gen_context(system_u:object_r:dhcp_etc_t,s0)
++/etc/hosts		--	gen_context(system_u:object_r:net_conf_t,s0)
+ /etc/resolv\.conf.*	--	gen_context(system_u:object_r:net_conf_t,s0)
+ /etc/yp\.conf.*		--	gen_context(system_u:object_r:net_conf_t,s0)
+ 
+@@ -57,3 +58,5 @@
  ifdef(`distro_gentoo',`
  /var/lib/dhcpc(/.*)?		gen_context(system_u:object_r:dhcpc_state_t,s0)
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.711
retrieving revision 1.712
diff -u -r1.711 -r1.712
--- selinux-policy.spec	23 Sep 2008 15:14:53 -0000	1.711
+++ selinux-policy.spec	23 Sep 2008 20:14:47 -0000	1.712
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.8
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -381,6 +381,9 @@
 %endif
 
 %changelog
+* Tue Sep 23 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-7
+- Allow confined users to login with dbus
+
 * Mon Sep 22 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-6
 - Fix transition to nsplugin
 



From mstone at fedoraproject.org  Tue Sep 23 20:23:17 2008
From: mstone at fedoraproject.org (Michael Stone)
Date: Tue, 23 Sep 2008 20:23:17 +0000 (UTC)
Subject: rpms/olpc-utils/OLPC-3 .cvsignore, 1.13, 1.14 olpc-utils.spec, 1.19,
	1.20 sources, 1.14, 1.15
Message-ID: <20080923202317.8168F70033@cvs1.fedora.phx.redhat.com>

Author: mstone

Update of /cvs/pkgs/rpms/olpc-utils/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14988

Modified Files:
	.cvsignore olpc-utils.spec sources 
Log Message:
- Chris Ball (1):
    dlo#7932: Set up utf8 environment, and display a UTF-8 string.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	3 Sep 2008 21:11:54 -0000	1.13
+++ .cvsignore	23 Sep 2008 20:22:47 -0000	1.14
@@ -1 +1 @@
-olpc-utils-0.86.tar.bz2
+olpc-utils-0.87.tar.bz2


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/olpc-utils.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- olpc-utils.spec	3 Sep 2008 21:11:54 -0000	1.19
+++ olpc-utils.spec	23 Sep 2008 20:22:47 -0000	1.20
@@ -1,5 +1,5 @@
 Name:       olpc-utils
-Version:    0.86
+Version:    0.87
 Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
@@ -85,6 +85,10 @@
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-foreground-compat.ck
 
 %changelog
+* Tue Sep 23 2008 Michael Stone <michael at laptop.org> 0.87-1
+- Chris Ball (1):
+    dlo#7932: Set up utf8 environment, and display a UTF-8 string.
+
 * Tue Sep 02 2008 Michael Stone <michael at laptop.org> 0.86-1
 - Guillaume Desmottes (1):
     xsession-example: open Telepathy log files in append mode instead of trunc (#8142)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	3 Sep 2008 21:11:54 -0000	1.14
+++ sources	23 Sep 2008 20:22:47 -0000	1.15
@@ -1 +1 @@
-58a74678030b6066a933eae1348d896e  olpc-utils-0.86.tar.bz2
+ed673848ec9073df68533b0bf80612c0  olpc-utils-0.87.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep 23 20:34:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 20:34:36 +0000
Subject: [pkgdb] rtorrent (Fedora EPEL, 5) updated by kevin
Message-ID: <20080923203436.5A1D1208D68@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for rtorrent
kevin has set commit to Approved for uberpackager on rtorrent (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on rtorrent (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on rtorrent (Fedora EPEL 5)
kevin changed owner of rtorrent in Fedora EPEL 5 to iburrell
kevin approved watchbugzilla on rtorrent (Fedora EPEL 5) for chabotc
kevin approved watchcommits on rtorrent (Fedora EPEL 5) for chabotc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rtorrent



From cweyl at fedoraproject.org  Tue Sep 23 20:34:39 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 23 Sep 2008 20:34:39 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.114,1.115
Message-ID: <20080923203439.68E3F70033@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17717

Modified Files:
	comps-f10.xml.in 
Log Message:
add cpan-upload



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- comps-f10.xml.in	23 Sep 2008 17:21:24 -0000	1.114
+++ comps-f10.xml.in	23 Sep 2008 20:34:09 -0000	1.115
@@ -844,6 +844,7 @@
       <packagereq type="optional">colordiff</packagereq>
       <packagereq type="optional">cpan2rpm</packagereq>
       <packagereq type="optional">cpanspec</packagereq>
+      <packagereq type="optional">cpan-upload</packagereq>
       <packagereq type="optional">cppunit</packagereq>
       <packagereq type="optional">cproto</packagereq>
       <packagereq type="optional">crossvc</packagereq>



From pkgdb at fedoraproject.org  Tue Sep 23 20:35:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 20:35:27 +0000
Subject: [pkgdb] libtorrent (Fedora EPEL, 5) updated by kevin
Message-ID: <20080923203527.7F794208D68@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for libtorrent
kevin has set commit to Approved for uberpackager on libtorrent (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on libtorrent (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on libtorrent (Fedora EPEL 5)
kevin changed owner of libtorrent in Fedora EPEL 5 to iburrell
kevin approved watchbugzilla on libtorrent (Fedora EPEL 5) for chabotc
kevin approved watchcommits on libtorrent (Fedora EPEL 5) for chabotc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtorrent



From lkundrak at fedoraproject.org  Tue Sep 23 20:39:22 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 23 Sep 2008 20:39:22 +0000 (UTC)
Subject: rpms/sunbird/devel sunbird-0.9-libical.patch, NONE, 1.1 .cvsignore, 
	1.9, 1.10 sources, 1.9, 1.10 sunbird.spec, 1.15,
	1.16 sunbird-0.3.1-link-layout.patch, 1.1, NONE
Message-ID: <20080923203922.0658070033@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18950

Modified Files:
	.cvsignore sources sunbird.spec 
Added Files:
	sunbird-0.9-libical.patch 
Removed Files:
	sunbird-0.3.1-link-layout.patch 
Log Message:
* Tue Sep 23 2008 Lubomir Rintel <lkundrak at v3.sk> 0.9-1
- 0.9 GOLD
- Fix use of system nss and nspr4
- Link against system libical (#459923)
- Add language packs for lightning (#449770)


sunbird-0.9-libical.patch:

--- NEW FILE sunbird-0.9-libical.patch ---
Link against system libical instead of bundled.
https://bugzilla.redhat.com/show_bug.cgi?id=459923

Lubomir Rintel <lkundrak at v3.sk>

--- mozilla/calendar/base/src/calDateTime.cpp.libical	2008-09-23 17:12:32.000000000 +0200
+++ mozilla/calendar/base/src/calDateTime.cpp	2008-09-23 17:10:35.000000000 +0200
@@ -592,7 +592,7 @@
     }
 
     if (mIsDate || otherIsDate) {
-        *aResult = icaltime_compare_date_only(a, b, cal::getIcalTimezone(mTimezone));
+        *aResult = icaltime_compare_date_only(a, b);
     } else {
         *aResult = icaltime_compare(a, b);
     }
--- mozilla/calendar/base/build/Makefile.in.libical	2007-12-27 11:01:41.000000000 +0100
+++ mozilla/calendar/base/build/Makefile.in	2008-09-23 16:02:42.000000000 +0200
@@ -63,7 +63,6 @@
 	js \
 	xpconnect \
 	string \
-	ical \
 	calbase
 
 CPPSRCS = calBaseModule.cpp \
@@ -74,7 +73,6 @@
 
 SHARED_LIBRARY_LIBS = \
     $(DEPTH)/calendar/base/src/$(LIB_PREFIX)calbase_s.$(LIB_SUFFIX) \
-    $(DEPTH)/calendar/libical/src/libical/$(LIB_PREFIX)mozical.$(LIB_SUFFIX) \
     $(NULL)
 
 ifdef MOZILLA_INTERNAL_API
@@ -94,4 +92,7 @@
 	$(NULL)
 endif
 
+# External libical
+EXTRA_DSO_LDOPTS += -lical
+
 include $(topsrcdir)/config/rules.mk
--- mozilla/calendar/Makefile.in.libical	2008-09-23 17:13:34.000000000 +0200
+++ mozilla/calendar/Makefile.in	2008-09-23 17:07:30.000000000 +0200
@@ -42,7 +42,7 @@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE	= calendar
-DIRS = libical resources base providers import-export locales
+DIRS = resources base providers import-export locales
 
 ifdef ENABLE_TESTS
 DIRS += test
--- mozilla/calendar/lightning/Makefile.in.libical	2008-07-24 03:07:05.000000000 +0200
+++ mozilla/calendar/lightning/Makefile.in	2008-09-23 16:02:42.000000000 +0200
@@ -71,7 +71,7 @@
 endif
 endif
 
-DIRS = ../libical \
+DIRS = \
        ../locales \
        ../base \
        ../providers \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	24 Aug 2008 20:37:24 -0000	1.9
+++ .cvsignore	23 Sep 2008 20:38:51 -0000	1.10
@@ -1,2 +1,3 @@
-sunbird-0.9pre.tar.gz
-sunbird-langpacks-0.9pre.tar.gz
+lightning-0.9.linux-i686.xpi
+sunbird-langpacks-0.9.tar.gz
+lightning-sunbird-0.9-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 Aug 2008 20:37:24 -0000	1.9
+++ sources	23 Sep 2008 20:38:51 -0000	1.10
@@ -1,2 +1,3 @@
-85ea2996f33a403b9dd3c752f0ea0bc4  sunbird-0.9pre.tar.gz
-2d3b4e492e1c791cf280653c2eab0ac5  sunbird-langpacks-0.9pre.tar.gz
+8086ee725f2d3eca17c375a3812c3618  lightning-0.9.linux-i686.xpi
+adcef4eab2cbc14c1534ab80cb684273  sunbird-langpacks-0.9.tar.gz
+ff4ae1e9c1071d8d478504d95d7dabee  lightning-sunbird-0.9-source.tar.bz2


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sunbird.spec	24 Aug 2008 20:37:24 -0000	1.15
+++ sunbird.spec	23 Sep 2008 20:38:51 -0000	1.16
@@ -1,9 +1,4 @@
-# TODO:	sunbird.i386: E: shared-lib-without-dependency-information /usr/lib/sunbird-0.9/libnspr4.so
-# 	we should be linking against system nspr
-# TODO: link against system libical (rishi)
-# TODO: language packs, also for lightning
-
-%define progdir %{_prefix}/%{_lib}/%{name}-%{version}pre
+%define progdir %{_prefix}/%{_lib}/%{name}-%{version}
 %define docs LEGAL LICENSE README.txt
 %{?_with_official:%define official 1}
 
@@ -13,18 +8,21 @@
 
 Name:           sunbird
 Version:        0.9
-Release:        0.3.20080824cvs%{?dist}
+Release:        1%{?dist}
 Summary:        Mozilla Sunbird Calendar
 
 Group:          Applications/Productivity
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/calendar/sunbird/
-Source0:        sunbird-0.9pre.tar.gz
-#http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
+Source0:        http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
 Source1:        sunbird.desktop
-Source2:        sunbird-langpacks-0.9pre.tar.gz
+Source2:        sunbird-langpacks-%{version}.tar.gz
 Source3:        mozilla-extension-update.sh
+# This is used just for langpacks.
+# TODO: build them!
+Source4:        http://releases.mozilla.org/pub/mozilla.org/calendar/lightning/releases/%{version}/lightning-%{version}.linux-i686.xpi
 Source100:      find-external-requires
+Patch0:         sunbird-0.9-libical.patch
 
 # build patches
 Patch2:         sunbird-0.7-path.patch
@@ -40,6 +38,9 @@
 BuildRequires:  freetype-devel >= 2.1.9
 BuildRequires:  libXt-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  nss-devel
+BuildRequires:  nspr-devel
+BuildRequires:  libical-devel
 BuildRequires:  zip
 
 Requires(post):  desktop-file-utils
@@ -80,6 +81,7 @@
 
 %prep
 %setup -q -n mozilla
+%patch0 -p1 -b .libical
 %patch2 -p1 -b .path
 %patch3 -p1 -b .uilocale
 # Fix source perms to avoid errors in the debuginfo RPM (bug 357661)
@@ -183,7 +185,7 @@
   language=$(basename $langpack .xpi)
   extensiondir=$RPM_BUILD_ROOT%{progdir}/extensions/langpack-$language at sunbird.mozilla.org
   mkdir -p $extensiondir
-  unzip $langpack -d $extensiondir
+  unzip -qod $extensiondir $langpack
   find $extensiondir -type f -print0 |xargs -0 chmod 644
   # Fix #441500
   sed 's/\r//g' $extensiondir/install.rdf |awk '/^$/ {next} {print}' >lala
@@ -191,12 +193,22 @@
 done
 
 # Lightning
-unzip -d $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning dist/xpi-stage/lightning.xpi
+unzip -qod $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning dist/xpi-stage/lightning.xpi
 install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/mozilla-extension-update.sh
 # Fix some permissions
 chmod -x $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/js/calAlarmMonitor.js \
   $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/js/calFreeBusyService.js
 
+# Unpack lightning language packs, except en_US
+unzip -l %{SOURCE4} '*.jar'                                     |
+  awk '/-[^\/]*\.jar/ && !/en-US/ {print $4}'                   |
+  xargs unzip -qod $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning %{SOURCE4}
+# Register them
+ls $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/chrome       |
+  sed -n '/en-US/n;s/\(\([^-]*\)-\(.*\)\.jar\)/locale \2 \3 jar:chrome\/\1!\/locale\/\3\/\2\//p' \
+  >> $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/chrome.manifest
+# ^^^ I'm going to burn in hell for this ^^^
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -265,6 +277,12 @@
 
 
 %changelog
+* Tue Sep 23 2008 Lubomir Rintel <lkundrak at v3.sk> 0.9-1
+- 0.9 GOLD
+- Fix use of system nss and nspr4
+- Link against system libical (#459923)
+- Add language packs for lightning (#449770)
+
 * Sun Aug 24 2008 Lubomir Rintel <lkundrak at v3.sk> 0.9-0.3.20080824cvs
 - Newer snapshot closer to RC
 - New langpacks


--- sunbird-0.3.1-link-layout.patch DELETED ---



From kevin at fedoraproject.org  Tue Sep 23 20:42:55 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 23 Sep 2008 20:42:55 +0000 (UTC)
Subject: rpms/hunspell-wa - New directory
Message-ID: <20080923204255.2624170033@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-wa
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19746/rpms/hunspell-wa

Log Message:
Directory /cvs/extras/rpms/hunspell-wa added to the repository




From pkgdb at fedoraproject.org  Tue Sep 23 20:42:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 20:42:37 +0000
Subject: [pkgdb] hunspell-wa was added for caolanm
Message-ID: <20080923204237.647D2208D9F@bastion.fedora.phx.redhat.com>

kevin has added Package hunspell-wa with summary Walloon hunspell dictionaries
kevin has approved Package hunspell-wa
kevin has added a Fedora devel branch for hunspell-wa with an owner of caolanm
kevin has approved hunspell-wa in Fedora devel
kevin has approved Package hunspell-wa
kevin has set commit to Approved for packager on hunspell-wa (Fedora devel)
kevin has set build to Approved for packager on hunspell-wa (Fedora devel)
kevin has set checkout to Approved for packager on hunspell-wa (Fedora devel)
kevin has set commit to Approved for uberpackager on hunspell-wa (Fedora devel)
kevin has set build to Approved for uberpackager on hunspell-wa (Fedora devel)
kevin has set checkout to Approved for uberpackager on hunspell-wa (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-wa



From kevin at fedoraproject.org  Tue Sep 23 20:42:55 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 23 Sep 2008 20:42:55 +0000 (UTC)
Subject: rpms/hunspell-wa/devel - New directory
Message-ID: <20080923204255.5CBE170033@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-wa/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19746/rpms/hunspell-wa/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-wa/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 23 20:42:56 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 23 Sep 2008 20:42:56 +0000 (UTC)
Subject: rpms/hunspell-wa Makefile,NONE,1.1
Message-ID: <20080923204256.37A1970033@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-wa
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19746/rpms/hunspell-wa

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-wa


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-wa
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep 23 20:42:56 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 23 Sep 2008 20:42:56 +0000 (UTC)
Subject: rpms/hunspell-wa/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080923204256.6C75E70033@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-wa/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19746/rpms/hunspell-wa/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-wa


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-wa
# $Id: Makefile,v 1.1 2008/09/23 20:42:56 kevin Exp $
NAME := hunspell-wa
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Sep 23 20:43:32 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 23 Sep 2008 20:43:32 +0000 (UTC)
Subject: rpms/hunspell-uz - New directory
Message-ID: <20080923204332.23EFC70033@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-uz
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd19917/rpms/hunspell-uz

Log Message:
Directory /cvs/extras/rpms/hunspell-uz added to the repository




From pkgdb at fedoraproject.org  Tue Sep 23 20:43:21 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 20:43:21 +0000
Subject: [pkgdb] hunspell-uz was added for caolanm
Message-ID: <20080923204321.B92DD208DA0@bastion.fedora.phx.redhat.com>

kevin has added Package hunspell-uz with summary Uzbek hunspell dictionaries
kevin has approved Package hunspell-uz
kevin has added a Fedora devel branch for hunspell-uz with an owner of caolanm
kevin has approved hunspell-uz in Fedora devel
kevin has approved Package hunspell-uz
kevin has set commit to Approved for packager on hunspell-uz (Fedora devel)
kevin has set build to Approved for packager on hunspell-uz (Fedora devel)
kevin has set checkout to Approved for packager on hunspell-uz (Fedora devel)
kevin has set commit to Approved for uberpackager on hunspell-uz (Fedora devel)
kevin has set build to Approved for uberpackager on hunspell-uz (Fedora devel)
kevin has set checkout to Approved for uberpackager on hunspell-uz (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-uz



From kevin at fedoraproject.org  Tue Sep 23 20:43:32 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 23 Sep 2008 20:43:32 +0000 (UTC)
Subject: rpms/hunspell-uz/devel - New directory
Message-ID: <20080923204332.5570170033@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-uz/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd19917/rpms/hunspell-uz/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-uz/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 23 20:43:33 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 23 Sep 2008 20:43:33 +0000 (UTC)
Subject: rpms/hunspell-uz Makefile,NONE,1.1
Message-ID: <20080923204333.210CB70033@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-uz
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd19917/rpms/hunspell-uz

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-uz


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-uz
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Sep 23 20:43:33 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 23 Sep 2008 20:43:33 +0000 (UTC)
Subject: rpms/hunspell-uz/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080923204333.51AAF70033@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-uz/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd19917/rpms/hunspell-uz/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-uz


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-uz
# $Id: Makefile,v 1.1 2008/09/23 20:43:33 kevin Exp $
NAME := hunspell-uz
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Sep 23 20:44:03 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 23 Sep 2008 20:44:03 +0000 (UTC)
Subject: rpms/hunspell-sq - New directory
Message-ID: <20080923204403.1EC0070033@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-sq
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw20054/rpms/hunspell-sq

Log Message:
Directory /cvs/extras/rpms/hunspell-sq added to the repository




From kevin at fedoraproject.org  Tue Sep 23 20:44:03 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 23 Sep 2008 20:44:03 +0000 (UTC)
Subject: rpms/hunspell-sq/devel - New directory
Message-ID: <20080923204403.4E31870033@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-sq/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw20054/rpms/hunspell-sq/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-sq/devel added to the repository




From kevin at fedoraproject.org  Tue Sep 23 20:44:04 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 23 Sep 2008 20:44:04 +0000 (UTC)
Subject: rpms/hunspell-sq/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080923204404.5476C70033@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-sq/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw20054/rpms/hunspell-sq/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-sq


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-sq
# $Id: Makefile,v 1.1 2008/09/23 20:44:04 kevin Exp $
NAME := hunspell-sq
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Sep 23 20:44:04 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 23 Sep 2008 20:44:04 +0000 (UTC)
Subject: rpms/hunspell-sq Makefile,NONE,1.1
Message-ID: <20080923204404.1C65970033@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-sq
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw20054/rpms/hunspell-sq

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-sq


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-sq
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Sep 23 20:43:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 20:43:56 +0000
Subject: [pkgdb] hunspell-sq was added for caolanm
Message-ID: <20080923204356.6B2A2208D9F@bastion.fedora.phx.redhat.com>

kevin has added Package hunspell-sq with summary Albanian hunspell dictionaries
kevin has approved Package hunspell-sq
kevin has added a Fedora devel branch for hunspell-sq with an owner of caolanm
kevin has approved hunspell-sq in Fedora devel
kevin has approved Package hunspell-sq
kevin has set commit to Approved for packager on hunspell-sq (Fedora devel)
kevin has set build to Approved for packager on hunspell-sq (Fedora devel)
kevin has set checkout to Approved for packager on hunspell-sq (Fedora devel)
kevin has set commit to Approved for uberpackager on hunspell-sq (Fedora devel)
kevin has set build to Approved for uberpackager on hunspell-sq (Fedora devel)
kevin has set checkout to Approved for uberpackager on hunspell-sq (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-sq



From pkgdb at fedoraproject.org  Tue Sep 23 20:45:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 20:45:03 +0000
Subject: [pkgdb] libdvdread (Fedora EPEL, 5) updated by kevin
Message-ID: <20080923204503.392B4208D9F@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for libdvdread
kevin has set commit to Approved for uberpackager on libdvdread (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on libdvdread (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on libdvdread (Fedora EPEL 5)
kevin changed owner of libdvdread in Fedora EPEL 5 to rathann
kevin approved watchbugzilla on libdvdread (Fedora EPEL 5) for rdieter
kevin approved watchcommits on libdvdread (Fedora EPEL 5) for rdieter
kevin approved commit on libdvdread (Fedora EPEL 5) for rdieter
kevin approved build on libdvdread (Fedora EPEL 5) for rdieter
kevin approved approveacls on libdvdread (Fedora EPEL 5) for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdvdread



From dwalsh at fedoraproject.org  Tue Sep 23 20:48:12 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 23 Sep 2008 20:48:12 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch,1.215,1.216
Message-ID: <20080923204812.67E7A70033@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20958

Modified Files:
	policy-20071130.patch 
Log Message:
* Tue Sep 23 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-94
- Update to latest policy for NetworkManager 


policy-20071130.patch:

Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- policy-20071130.patch	23 Sep 2008 20:09:57 -0000	1.215
+++ policy-20071130.patch	23 Sep 2008 20:48:11 -0000	1.216
@@ -20423,7 +20423,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.3.1/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/networkmanager.te	2008-09-23 16:07:05.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/networkmanager.te	2008-09-23 16:14:12.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(networkmanager,1.9.0)
@@ -20454,7 +20454,7 @@
  # networkmanager will ptrace itself if gdb is installed
  # and it receives a unexpected signal (rh bug #204161) 
 -allow NetworkManager_t self:capability { kill setgid setuid sys_nice dac_override net_admin net_raw net_bind_service ipc_lock };
-+allow NetworkManager_t self:capability { chown fsetid kill setgid setuid sys_admin sys_nice dac_override net_admin net_raw net_bin_dservice ipc_lock };
++allow NetworkManager_t self:capability { chown fsetid kill setgid setuid sys_admin sys_nice dac_override net_admin net_raw net_bind_service ipc_lock };
  dontaudit NetworkManager_t self:capability { sys_tty_config sys_ptrace };
 -allow NetworkManager_t self:process { ptrace setcap setpgid getsched signal_perms };
 +allow NetworkManager_t self:process { ptrace getcap setcap setpgid getsched setsched signal_perms };



From caolanm at fedoraproject.org  Tue Sep 23 21:06:27 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 23 Sep 2008 21:06:27 +0000 (UTC)
Subject: rpms/hunspell-wa/devel hunspell-wa-0.4.15-buildfix.patch, NONE,
	1.1 hunspell-wa.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080923210627.BC84970033@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-wa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25135/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-wa-0.4.15-buildfix.patch hunspell-wa.spec import.log 
Log Message:


hunspell-wa-0.4.15-buildfix.patch:

--- NEW FILE hunspell-wa-0.4.15-buildfix.patch ---
--- aspell-wa-0.4.15.orig/Makefile	2008-09-20 16:46:39.000000000 +0100
+++ aspell-wa-0.4.15/Makefile	2008-09-20 17:00:02.000000000 +0100
@@ -27,7 +27,7 @@
 	buildhash dj.lst walon.aff dj.hash
 
 walon_lst:
-	if [ ! -r walon.lst -o -n "`find mots* -type f -newer walon.lst`" ] ; \
+	if [ ! -r walon.lst -o -n "`find mots* -type f -newer walon.lst > /dev/null 2>&1`" ] ; \
 	then \
 	  grep -v '^#' mots*/* ${EXTRA} |cut -d: -f2- |cut -d'	' -f1|\
 	  tr ' ' '\n'|(LC_ALL=C sort -u) | grep -v '^$$' > walon.lst ; \
@@ -119,7 +119,7 @@
 	aspell --local-data-dir=. --lang=wa at ni create master ./wa at ni.rws < wa.lst
 
 myspell: walon_lst
-	wc -l walon.lst > wa.dic
+	cat walon.lst | wc -l > wa.dic
 	cat walon.lst >> wa.dic
 	# myspell is unable to handle comments and tabs :-(
 	grep -v '^#' wa_affix.dat | sed 's/	/    /g' > wa.aff


--- NEW FILE hunspell-wa.spec ---
Name: hunspell-wa
Summary: Walloon hunspell dictionaries
Version: 0.4.15
Release: 1%{?dist}
Source0: http://chanae.walon.org/walon/aspell-wa-%{version}.tar.bz2
Group: Applications/Text
URL: http://chanae.walon.org/walon/aspell.php
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+
BuildArch: noarch
Patch0: hunspell-wa-0.4.15-buildfix.patch

Requires: hunspell

%description
Walloon hunspell dictionaries.

%prep
%setup -q -n aspell-wa-%{version}
%patch0 -p1 -b .buildfix

%build
make myspell
for i in TODO README; do
    iconv -f ISO-8859-1 -t UTF-8 $i > $i.new
    mv -f $i.new $i
done

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p wa.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/wa_BE.dic
cp -p wa.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/wa_BE.aff

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README LGPL ChangeLog TODO
%{_datadir}/myspell/*

%changelog
* Mon Sep 22 2008 Caolan McNamara <caolanm at redhat.com> - 0.4.15-1
- initial version


--- NEW FILE import.log ---
hunspell-wa-0_4_15-1_fc9:HEAD:hunspell-wa-0.4.15-1.fc9.src.rpm:1222204046


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-wa/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Sep 2008 20:42:56 -0000	1.1
+++ .cvsignore	23 Sep 2008 21:05:57 -0000	1.2
@@ -0,0 +1 @@
+aspell-wa-0.4.15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-wa/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Sep 2008 20:42:56 -0000	1.1
+++ sources	23 Sep 2008 21:05:57 -0000	1.2
@@ -0,0 +1 @@
+eeae4714b38648ee5d336c0094930309  aspell-wa-0.4.15.tar.bz2



From caolanm at fedoraproject.org  Tue Sep 23 21:08:09 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 23 Sep 2008 21:08:09 +0000 (UTC)
Subject: rpms/hunspell-uz/devel hunspell-uz.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080923210809.8CF4570033@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-uz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25630/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-uz.spec import.log 
Log Message:



--- NEW FILE hunspell-uz.spec ---
Name: hunspell-uz
Summary: Uzbek hunspell dictionaries
Version: 0.6
Release: 1%{?dist}
Source0: http://www-user.uni-bremen.de/~kmashrab/uzbek-word-list/uzbek-wordlist-%{version}.tar.bz2
Group: Applications/Text
URL: http://www-user.uni-bremen.de/~kmashrab/uzbek-word-list
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv2+
BuildArch: noarch

Requires: hunspell

%description
Uzbek hunspell dictionaries.

%prep
%setup -q -n uzbek-wordlist-%{version}

%build
cd hunspell
make
cp -p README ../README.hunspell

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p hunspell/uz_UZ* $RPM_BUILD_ROOT/%{_datadir}/myspell/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ChangeLog Copyright README README.hunspell COPYING TODO
%{_datadir}/myspell/*

%changelog
* Sat Sep 20 2006 Caolan McNamara <caolanm at redhat.com> - 0.6-1
- initial version


--- NEW FILE import.log ---
hunspell-uz-0_6-1_fc9:HEAD:hunspell-uz-0.6-1.fc9.src.rpm:1222204100


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-uz/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Sep 2008 20:43:33 -0000	1.1
+++ .cvsignore	23 Sep 2008 21:07:39 -0000	1.2
@@ -0,0 +1 @@
+uzbek-wordlist-0.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-uz/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Sep 2008 20:43:33 -0000	1.1
+++ sources	23 Sep 2008 21:07:39 -0000	1.2
@@ -0,0 +1 @@
+ec744b792da1b76db80a57b2187f966d  uzbek-wordlist-0.6.tar.bz2



From caolanm at fedoraproject.org  Tue Sep 23 21:15:02 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 23 Sep 2008 21:15:02 +0000 (UTC)
Subject: rpms/hunspell-sq/devel hunspell-sq.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080923211502.850D670033@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-sq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26977/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-sq.spec import.log 
Log Message:



--- NEW FILE hunspell-sq.spec ---
Name: hunspell-sq
Summary: Albanian hunspell dictionaries
Version: 1.6
Release: 1%{?dist}
Source: http://www.shkenca.org/shkarkime/myspell-sq_AL-%{version}.zip
Group: Applications/Text
URL: http://www.shkenca.org/k6i/albanian_dictionary_for_myspell_en.html
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv2+
BuildArch: noarch

Requires: hunspell

%description
Albanian hunspell dictionaries.

%prep
%setup -q -c -n hunspell-sq

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p sq_AL.* $RPM_BUILD_ROOT/%{_datadir}/myspell/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README.txt Copyright
%{_datadir}/myspell/*

%changelog
* Tue Sep 23 2008 Caolan McNamara <caolanm at redhat.com> - 1.6-1
- initial version


--- NEW FILE import.log ---
hunspell-sq-1_6-1_fc9:HEAD:hunspell-sq-1.6-1.fc9.src.rpm:1222204368


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-sq/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Sep 2008 20:44:04 -0000	1.1
+++ .cvsignore	23 Sep 2008 21:14:32 -0000	1.2
@@ -0,0 +1 @@
+myspell-sq_AL-1.6.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-sq/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Sep 2008 20:44:04 -0000	1.1
+++ sources	23 Sep 2008 21:14:32 -0000	1.2
@@ -0,0 +1 @@
+4709aa9d2dd201f2cc2bab9c29112370  myspell-sq_AL-1.6.zip



From veillard at fedoraproject.org  Tue Sep 23 21:27:44 2008
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue, 23 Sep 2008 21:27:44 +0000 (UTC)
Subject: rpms/libvirt/devel sources, 1.33,
	1.34 libvirt-0.4.5-no-emulator-segfault.patch, 1.1, NONE
Message-ID: <20080923212744.2C1C870033@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30604

Modified Files:
	sources 
Removed Files:
	libvirt-0.4.5-no-emulator-segfault.patch 
Log Message:
More cleanups, Daniel



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	23 Sep 2008 21:25:17 -0000	1.33
+++ sources	23 Sep 2008 21:27:13 -0000	1.34
@@ -1,2 +1 @@
-dcb590a6202c332907eae7b44e47ca4b  libvirt-0.4.5.tar.gz
 abdf727deaffd868172f7243eb75ffe3  libvirt-0.4.6.tar.gz


--- libvirt-0.4.5-no-emulator-segfault.patch DELETED ---



From spot at fedoraproject.org  Tue Sep 23 21:29:50 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 23 Sep 2008 21:29:50 +0000 (UTC)
Subject: rpms/fedora-logos/devel .cvsignore, 1.78, 1.79 fedora-logos.spec,
	1.111, 1.112 sources, 1.88, 1.89
Message-ID: <20080923212950.4682F70033@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31198

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
update to 9.99.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- .cvsignore	10 Sep 2008 20:55:57 -0000	1.78
+++ .cvsignore	23 Sep 2008 21:29:19 -0000	1.79
@@ -1 +1 @@
-fedora-logos-9.99.3.tar.bz2
+fedora-logos-9.99.4.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- fedora-logos.spec	10 Sep 2008 20:55:57 -0000	1.111
+++ fedora-logos.spec	23 Sep 2008 21:29:19 -0000	1.112
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 9.99.3
+Version: 9.99.4
 Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
@@ -172,6 +172,10 @@
 # end i386 bits
 
 %changelog
+* Tue Sep 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 9.99.4-1
+- update to 9.99.4
+- replace firstboot workstation logo with something modern for F10
+
 * Wed Sep 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 9.99.3-1
 - move to its new home
 - package up xfce4_xicon1.svg (bz 445986)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- sources	10 Sep 2008 20:55:57 -0000	1.88
+++ sources	23 Sep 2008 21:29:19 -0000	1.89
@@ -1 +1 @@
-38bc3510b2658748dc17d698e92c34aa  fedora-logos-9.99.3.tar.bz2
+1f4b558daeae07c38173542efae129c4  fedora-logos-9.99.4.tar.bz2



From veillard at fedoraproject.org  Tue Sep 23 21:25:47 2008
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue, 23 Sep 2008 21:25:47 +0000 (UTC)
Subject: rpms/libvirt/devel .cvsignore, 1.32, 1.33 libvirt.spec, 1.96,
	1.97 sources, 1.32, 1.33
Message-ID: <20080923212547.93AC470033@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30132

Modified Files:
	.cvsignore libvirt.spec sources 
Log Message:
Upstream release 0.4.6 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	8 Sep 2008 16:55:43 -0000	1.32
+++ .cvsignore	23 Sep 2008 21:25:17 -0000	1.33
@@ -3,3 +3,4 @@
 i686
 x86_64
 libvirt-*.tar.gz
+libvirt-0.4.6.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- libvirt.spec	9 Sep 2008 15:02:19 -0000	1.96
+++ libvirt.spec	23 Sep 2008 21:25:17 -0000	1.97
@@ -1,11 +1,15 @@
 # -*- rpm-spec -*-
 
-%define with_xen       1
-%define with_xen_proxy 1
-%define with_qemu      1
-%define with_openvz    1
-%define with_lxc       1
-%define with_polkit    0
+%define with_xen       0%{!?_without_xen:1}
+%define with_xen_proxy 0%{!?_without_xen_proxy:1}
+%define with_qemu      0%{!?_without_qemu:1}
+%define with_openvz    0%{!?_without_openvz:1}
+%define with_lxc       0%{!?_without_lxc:1}
+%define with_sasl      0%{!?_without_sasl:1}
+%define with_avahi     0%{!?_without_avahi:1}
+%define with_polkit    0%{!?_without_polkit:0}
+%define with_python    0%{!?_without_python:1}
+%define with_libvirtd  0%{!?_without_libvirtd:1}
 
 # Xen is available only on i386 x86_64 ia64
 %ifnarch i386 i686 x86_64 ia64
@@ -23,18 +27,17 @@
 %endif
 
 %if 0%{fedora} >= 8
-%define with_polkit    1
+%define with_polkit    0%{!?_without_polkit:1}
 %define with_xen_proxy 0
 %endif
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.4.5
-Release: 2%{?dist}%{?extra_release}
+Version: 0.4.6
+Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
-Patch0: libvirt-0.4.5-no-emulator-segfault.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
@@ -47,10 +50,12 @@
 # So remote clients can access libvirt over SSH tunnel
 # (client invokes 'nc' against the UNIX socket on the server)
 Requires: nc
+%if %{with_sasl}
 Requires: cyrus-sasl
 # Not technically required, but makes 'out-of-box' config
 # work correctly & doesn't have onerous dependencies
 Requires: cyrus-sasl-md5
+%endif
 %if %{with_polkit}
 Requires: PolicyKit >= 0.6
 %endif
@@ -83,14 +88,18 @@
 BuildRequires: ncurses-devel
 BuildRequires: gettext
 BuildRequires: gnutls-devel
+%if %{with_avahi}
 BuildRequires: avahi-devel
+%endif
 BuildRequires: libselinux-devel
 BuildRequires: dnsmasq
 BuildRequires: bridge-utils
 %if %{with_qemu}
 BuildRequires: qemu
 %endif
+%if %{with_sasl}
 BuildRequires: cyrus-sasl-devel
+%endif
 %if %{with_polkit}
 BuildRequires: PolicyKit-devel >= 0.6
 %endif
@@ -134,6 +143,7 @@
 Includes and documentations for the C library providing an API to use
 the virtualization capabilities of recent versions of Linux (and other OSes).
 
+%if %{with_python}
 %package python
 Summary: Python bindings for the libvirt library
 Group: Development/Libraries
@@ -145,10 +155,10 @@
 written in the Python programming language to use the interface
 supplied by the libvirt library to use the virtualization capabilities
 of recent versions of Linux (and other OSes).
+%endif
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %if ! %{with_xen}
@@ -167,10 +177,35 @@
 %define _without_lxc --without-lxc
 %endif
 
+%if ! %{with_sasl}
+%define _without_sasl --without-sasl
+%endif
+
+%if ! %{with_avahi}
+%define _without_avahi --without-avahi
+%endif
+
+%if ! %{with_polkit}
+%define _without_polkit --without-polkit
+%endif
+
+%if ! %{with_python}
+%define _without_python --without-python
+%endif
+
+%if ! %{with_libvirtd}
+%define _without_libvirtd --without-libvirtd
+%endif
+
 %configure %{?_without_xen} \
            %{?_without_qemu} \
            %{?_without_openvz} \
            %{?_without_lxc} \
+           %{?_without_sasl} \
+           %{?_without_avahi} \
+           %{?_without_polkit} \
+           %{?_without_python} \
+           %{?_without_libvirtd} \
            --with-init-script=redhat \
            --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
            --with-remote-file=%{_localstatedir}/run/libvirtd.pid
@@ -192,6 +227,7 @@
 # Default dir for kernel+initrd images defnied in SELinux policy
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/boot/
 
+%if %{with_qemu}
 # We don't want to install /etc/libvirt/qemu/networks in the main %files list
 # because if the admin wants to delete the default network completely, we don't
 # want to end up re-incarnating it on every RPM upgrade.
@@ -202,14 +238,24 @@
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
 # Strip auto-generated UUID - we need it generated per-install
 sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml
+%endif
 %find_lang %{name}
 
+%if ! %{with_python}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version}
+%endif
+
+%if ! %{with_qemu}
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf
+%endif
+
 %clean
 rm -fr %{buildroot}
 
 %post
 /sbin/ldconfig
 
+%if %{with_libvirtd}
 # We want to install the default network for initial RPM installs
 # or on the first upgrade from a non-network aware libvirt only.
 # We check this by looking to see if the daemon is already installed
@@ -224,12 +270,15 @@
 fi
 
 /sbin/chkconfig --add libvirtd
+%endif
 
 %preun
+%if %{with_libvirtd}
 if [ $1 = 0 ]; then
     /sbin/service libvirtd stop 1>/dev/null 2>&1
     /sbin/chkconfig --del libvirtd
 fi
+%endif
 
 %postun
 /sbin/ldconfig
@@ -242,37 +291,69 @@
 %{_bindir}/virsh
 %{_libdir}/lib*.so.*
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
+
+%if %{with_qemu}
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
+%endif
+
+%if %{with_libvirtd}
 %{_sysconfdir}/rc.d/init.d/libvirtd
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
+%endif
+
+%if %{with_qemu}
 %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
+%endif
+
+%if %{with_sasl}
 %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
+%endif
+
+%if %{with_qemu}
 %dir %{_datadir}/libvirt/
 %dir %{_datadir}/libvirt/networks/
 %{_datadir}/libvirt/networks/default.xml
+%endif
+
 %dir %{_localstatedir}/run/libvirt/
 %dir %{_localstatedir}/lib/libvirt/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
-%{_datadir}/augeas/lenses/libvirtd.aug
+
+%if %{with_qemu}
 %{_datadir}/augeas/lenses/libvirtd_qemu.aug
-%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
+%endif
+
+%if %{with_libvirtd}
+%{_datadir}/augeas/lenses/libvirtd.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
+%endif
+
 %if %{with_polkit}
 %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
 %endif
+
+%if %{with_qemu}
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
+%endif
+
 %if %{with_xen_proxy}
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
 %endif
-%attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
+
 %if %{with_lxc}
 %attr(0755, root, root) %{_libexecdir}/libvirt_lxc
 %endif
+
+%if %{with_libvirtd}
+%attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
 %attr(0755, root, root) %{_sbindir}/libvirtd
+%endif
+
 %doc docs/*.rng
 %doc docs/*.xml
 
@@ -292,6 +373,7 @@
 %doc docs/examples
 %doc docs/libvirt-api.xml
 
+%if %{with_python}
 %files python
 %defattr(-, root, root)
 
@@ -302,6 +384,7 @@
 %doc python/TODO
 %doc python/libvirtclass.txt
 %doc docs/examples/python
+%endif
 
 %changelog
 * Tue Sep  9 2008 Daniel Veillard <veillard at redhat.com> - 0.4.5-2.fc10


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	8 Sep 2008 16:55:43 -0000	1.32
+++ sources	23 Sep 2008 21:25:17 -0000	1.33
@@ -1 +1,2 @@
 dcb590a6202c332907eae7b44e47ca4b  libvirt-0.4.5.tar.gz
+abdf727deaffd868172f7243eb75ffe3  libvirt-0.4.6.tar.gz



From lkundrak at fedoraproject.org  Tue Sep 23 21:41:06 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 23 Sep 2008 21:41:06 +0000 (UTC)
Subject: rpms/perl-TAP-Harness-Archive/devel .cvsignore, 1.3,
	1.4 perl-TAP-Harness-Archive.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20080923214106.A72D770033@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-TAP-Harness-Archive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1878

Modified Files:
	.cvsignore perl-TAP-Harness-Archive.spec sources 
Log Message:
* Tue Sep 23 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.12-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness-Archive/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Jul 2008 21:36:20 -0000	1.3
+++ .cvsignore	23 Sep 2008 21:40:36 -0000	1.4
@@ -1 +1 @@
-TAP-Harness-Archive-0.10.tar.gz
+TAP-Harness-Archive-0.12.tar.gz


Index: perl-TAP-Harness-Archive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness-Archive/devel/perl-TAP-Harness-Archive.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-TAP-Harness-Archive.spec	15 Jul 2008 21:36:20 -0000	1.2
+++ perl-TAP-Harness-Archive.spec	23 Sep 2008 21:40:36 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           perl-TAP-Harness-Archive
-Version:        0.10
+Version:        0.12
 Release:        1%{?dist}
 Summary:        Create an archive of TAP test results
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/TAP-Harness-Archive/
-Source0:        http://archive.cpan.cz//authors/id/W/WO/WONKO/TAP-Harness-Archive-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/W/WO/WONKO/TAP-Harness-Archive-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Archive::Tar)
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.12-1
+- New upstream version
+
 * Tue Jul 15 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.10-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness-Archive/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Jul 2008 21:36:20 -0000	1.3
+++ sources	23 Sep 2008 21:40:36 -0000	1.4
@@ -1 +1 @@
-ed5d2143b5796996e600175f99999a2d  TAP-Harness-Archive-0.10.tar.gz
+0bc01720af0da25bd921a0216a5637e4  TAP-Harness-Archive-0.12.tar.gz



From caolanm at fedoraproject.org  Tue Sep 23 21:52:39 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 23 Sep 2008 21:52:39 +0000 (UTC)
Subject: rpms/hunspell/devel hunspell.spec,1.51,1.52
Message-ID: <20080923215239.9EF3970033@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3193

Modified Files:
	hunspell.spec 
Log Message:
affixcompress


Index: hunspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/devel/hunspell.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- hunspell.spec	15 Sep 2008 08:38:38 -0000	1.51
+++ hunspell.spec	23 Sep 2008 21:52:09 -0000	1.52
@@ -58,6 +58,8 @@
 rm -f $RPM_BUILD_ROOT/%{_bindir}/example
 mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell
 mv $RPM_BUILD_ROOT/%{_includedir}/*munch* $RPM_BUILD_ROOT/%{_includedir}/%{name}
+install -m 755 src/tools/affixcompress $RPM_BUILD_ROOT/%{_bindir}/affixcompress
+install -m 755 src/tools/makealias $RPM_BUILD_ROOT/%{_bindir}/makealias
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/ispellaff2myspell
 install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/wordlist2hunspell
 
@@ -83,6 +85,8 @@
 %defattr(-,root,root,-)
 %{_includedir}/%{name}
 %{_libdir}/*.so
+%{_bindir}/affixcompress
+%{_bindir}/makealias
 %{_bindir}/munch
 %{_bindir}/unmunch
 %{_bindir}/analyze



From caillon at fedoraproject.org  Tue Sep 23 22:01:39 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 23 Sep 2008 22:01:39 +0000 (UTC)
Subject: rpms/xulrunner/F-9 .cvsignore, 1.50, 1.51 sources, 1.52,
	1.53 xulrunner.spec, 1.130, 1.131
Message-ID: <20080923220139.3F89B70033@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4110

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> 1.9.0.2-1
- Update to 1.9.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-9/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	16 Jul 2008 19:18:54 -0000	1.50
+++ .cvsignore	23 Sep 2008 22:01:08 -0000	1.51
@@ -1 +1 @@
-xulrunner-1.9.0.1-source.tar.bz2
+xulrunner-1.9.0.2-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-9/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	16 Jul 2008 19:18:54 -0000	1.52
+++ sources	23 Sep 2008 22:01:08 -0000	1.53
@@ -1 +1 @@
-a14e4ac2e9fc5b29f80995c97a1c9748  xulrunner-1.9.0.1-source.tar.bz2
+0a6c68a5ab5b065fef221b586b8a3b8a  xulrunner-1.9.0.2-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-9/xulrunner.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- xulrunner.spec	12 Sep 2008 13:03:25 -0000	1.130
+++ xulrunner.spec	23 Sep 2008 22:01:08 -0000	1.131
@@ -7,7 +7,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.0.1
+Version:        1.9.0.2
 Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -379,6 +379,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> 1.9.0.2-1
+- Update to 1.9.0.2
+
 * Wed Jul 16 2008 Christopher Aillon <caillon at redhat.com> 1.9.0.1-1
 - Update to 1.9.0.1
 



From caillon at fedoraproject.org  Tue Sep 23 22:16:35 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 23 Sep 2008 22:16:35 +0000 (UTC)
Subject: rpms/xulrunner/F-9 xulrunner.spec,1.131,1.132
Message-ID: <20080923221635.C9BA370033@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5620

Modified Files:
	xulrunner.spec 
Log Message:
also update the nss/nspr requirements



Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-9/xulrunner.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- xulrunner.spec	23 Sep 2008 22:01:08 -0000	1.131
+++ xulrunner.spec	23 Sep 2008 22:16:05 -0000	1.132
@@ -1,5 +1,5 @@
-%define nspr_version 4.6.99
-%define nss_version 3.11.99.5
+%define nspr_version 4.7.1
+%define nss_version 3.12.1.1
 %define cairo_version 0.5
 
 %define version_internal  1.9



From rmeggins at fedoraproject.org  Tue Sep 23 22:30:53 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 23 Sep 2008 22:30:53 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-8 .cvsignore, 1.9, 1.10 fedora-ds-base-cvs.sh,
	1.7, 1.8 fedora-ds-base.spec, 1.11, 1.12 sources, 1.12, 1.13
Message-ID: <20080923223053.8506870033@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6899/F-8

Modified Files:
	.cvsignore fedora-ds-base-cvs.sh fedora-ds-base.spec sources 
Log Message:
this is the 1.1.3 release - this release only contains some winsync api improvements for modify operations


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Sep 2008 14:31:14 -0000	1.9
+++ .cvsignore	23 Sep 2008 22:30:23 -0000	1.10
@@ -1,3 +1,4 @@
 fedora-ds-base-1.1.0.tar.bz2
 fedora-ds-base-1.1.1.tar.bz2
 fedora-ds-base-1.1.2.tar.bz2
+fedora-ds-base-1.1.3.tar.bz2


Index: fedora-ds-base-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-8/fedora-ds-base-cvs.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-ds-base-cvs.sh	30 May 2008 19:03:33 -0000	1.7
+++ fedora-ds-base-cvs.sh	23 Sep 2008 22:30:23 -0000	1.8
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSvr111
-VERSION=1.1.1
+CVSTAG=FedoraDirSvr_1_1_3
+VERSION=1.1.3
 PKGNAME=fedora-ds-base
 export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-8/fedora-ds-base.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fedora-ds-base.spec	4 Sep 2008 14:31:15 -0000	1.11
+++ fedora-ds-base.spec	23 Sep 2008 22:30:23 -0000	1.12
@@ -4,7 +4,7 @@
 
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
-Version:          1.1.2
+Version:          1.1.3
 Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
@@ -153,6 +153,9 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Tue Sep 23 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.3-1
+- winsync api improvements for modify operations
+
 * Fri Jun 13 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.2-1
 - This is the 1.1.2 release.  The bugs fixed can be found here
 - https://bugzilla.redhat.com/showdependencytree.cgi?id=452721


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-8/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	4 Sep 2008 14:31:15 -0000	1.12
+++ sources	23 Sep 2008 22:30:23 -0000	1.13
@@ -1,3 +1,4 @@
 a60d1ce51207e61c48b70aa85ae5e5a5  fedora-ds-base-1.1.0.tar.bz2
 c525e0412ae4b9582adbd01305126975  fedora-ds-base-1.1.1.tar.bz2
 797c93351e8fcca9bac6326e7270355e  fedora-ds-base-1.1.2.tar.bz2
+54c4c6d6ed64d97d63c032e82805d2ef  fedora-ds-base-1.1.3.tar.bz2



From rmeggins at fedoraproject.org  Tue Sep 23 22:30:53 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 23 Sep 2008 22:30:53 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-9 .cvsignore, 1.10, 1.11 fedora-ds-base-cvs.sh,
	1.7, 1.8 fedora-ds-base.spec, 1.17, 1.18 sources, 1.14, 1.15
Message-ID: <20080923223053.A8AEA70033@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6899/F-9

Modified Files:
	.cvsignore fedora-ds-base-cvs.sh fedora-ds-base.spec sources 
Log Message:
this is the 1.1.3 release - this release only contains some winsync api improvements for modify operations


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Sep 2008 14:31:16 -0000	1.10
+++ .cvsignore	23 Sep 2008 22:30:23 -0000	1.11
@@ -1,3 +1,4 @@
 fedora-ds-base-1.1.0.tar.bz2
 fedora-ds-base-1.1.1.tar.bz2
 fedora-ds-base-1.1.2.tar.bz2
+fedora-ds-base-1.1.3.tar.bz2


Index: fedora-ds-base-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/fedora-ds-base-cvs.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-ds-base-cvs.sh	30 May 2008 19:03:55 -0000	1.7
+++ fedora-ds-base-cvs.sh	23 Sep 2008 22:30:23 -0000	1.8
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSvr111
-VERSION=1.1.1
+CVSTAG=FedoraDirSvr_1_1_3
+VERSION=1.1.3
 PKGNAME=fedora-ds-base
 export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/fedora-ds-base.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fedora-ds-base.spec	4 Sep 2008 14:31:16 -0000	1.17
+++ fedora-ds-base.spec	23 Sep 2008 22:30:23 -0000	1.18
@@ -4,7 +4,7 @@
 
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
-Version:          1.1.2
+Version:          1.1.3
 Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
@@ -156,6 +156,9 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Tue Sep 23 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.3-1
+- winsync api improvements for modify operations
+
 * Fri Jun 13 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.2-1
 - This is the 1.1.2 release.  The bugs fixed can be found here
 - https://bugzilla.redhat.com/showdependencytree.cgi?id=452721


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Sep 2008 14:31:16 -0000	1.14
+++ sources	23 Sep 2008 22:30:23 -0000	1.15
@@ -1,3 +1,4 @@
 a60d1ce51207e61c48b70aa85ae5e5a5  fedora-ds-base-1.1.0.tar.bz2
 c525e0412ae4b9582adbd01305126975  fedora-ds-base-1.1.1.tar.bz2
 797c93351e8fcca9bac6326e7270355e  fedora-ds-base-1.1.2.tar.bz2
+54c4c6d6ed64d97d63c032e82805d2ef  fedora-ds-base-1.1.3.tar.bz2



From rmeggins at fedoraproject.org  Tue Sep 23 22:30:53 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 23 Sep 2008 22:30:53 +0000 (UTC)
Subject: rpms/fedora-ds-base/FC-6 .cvsignore, 1.8, 1.9 fedora-ds-base-cvs.sh,
	1.7, 1.8 fedora-ds-base.spec, 1.11, 1.12 sources, 1.11, 1.12
Message-ID: <20080923223053.E95F870033@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/FC-6
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6899/FC-6

Modified Files:
	.cvsignore fedora-ds-base-cvs.sh fedora-ds-base.spec sources 
Log Message:
this is the 1.1.3 release - this release only contains some winsync api improvements for modify operations


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Sep 2008 14:31:16 -0000	1.8
+++ .cvsignore	23 Sep 2008 22:30:23 -0000	1.9
@@ -1,3 +1,4 @@
 fedora-ds-base-1.1.0.tar.bz2
 fedora-ds-base-1.1.1.tar.bz2
 fedora-ds-base-1.1.2.tar.bz2
+fedora-ds-base-1.1.3.tar.bz2


Index: fedora-ds-base-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/FC-6/fedora-ds-base-cvs.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-ds-base-cvs.sh	30 May 2008 19:04:12 -0000	1.7
+++ fedora-ds-base-cvs.sh	23 Sep 2008 22:30:23 -0000	1.8
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSvr111
-VERSION=1.1.1
+CVSTAG=FedoraDirSvr_1_1_3
+VERSION=1.1.3
 PKGNAME=fedora-ds-base
 export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/FC-6/fedora-ds-base.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fedora-ds-base.spec	4 Sep 2008 14:31:16 -0000	1.11
+++ fedora-ds-base.spec	23 Sep 2008 22:30:23 -0000	1.12
@@ -4,7 +4,7 @@
 
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
-Version:          1.1.2
+Version:          1.1.3
 Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
@@ -153,6 +153,9 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Tue Sep 23 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.3-1
+- winsync api improvements for modify operations
+
 * Fri Jun 13 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.2-1
 - This is the 1.1.2 release.  The bugs fixed can be found here
 - https://bugzilla.redhat.com/showdependencytree.cgi?id=452721


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	4 Sep 2008 14:31:16 -0000	1.11
+++ sources	23 Sep 2008 22:30:23 -0000	1.12
@@ -1,3 +1,4 @@
 a60d1ce51207e61c48b70aa85ae5e5a5  fedora-ds-base-1.1.0.tar.bz2
 c525e0412ae4b9582adbd01305126975  fedora-ds-base-1.1.1.tar.bz2
 797c93351e8fcca9bac6326e7270355e  fedora-ds-base-1.1.2.tar.bz2
+54c4c6d6ed64d97d63c032e82805d2ef  fedora-ds-base-1.1.3.tar.bz2



From rmeggins at fedoraproject.org  Tue Sep 23 22:30:54 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 23 Sep 2008 22:30:54 +0000 (UTC)
Subject: rpms/fedora-ds-base/devel .cvsignore, 1.10,
	1.11 fedora-ds-base-cvs.sh, 
	1.7, 1.8 fedora-ds-base.spec, 1.18, 1.19 sources, 1.14, 1.15
Message-ID: <20080923223054.752A770033@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6899/devel

Modified Files:
	.cvsignore fedora-ds-base-cvs.sh fedora-ds-base.spec sources 
Log Message:
this is the 1.1.3 release - this release only contains some winsync api improvements for modify operations


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Sep 2008 14:31:17 -0000	1.10
+++ .cvsignore	23 Sep 2008 22:30:23 -0000	1.11
@@ -1,3 +1,4 @@
 fedora-ds-base-1.1.0.tar.bz2
 fedora-ds-base-1.1.1.tar.bz2
 fedora-ds-base-1.1.2.tar.bz2
+fedora-ds-base-1.1.3.tar.bz2


Index: fedora-ds-base-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/fedora-ds-base-cvs.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-ds-base-cvs.sh	30 May 2008 19:04:29 -0000	1.7
+++ fedora-ds-base-cvs.sh	23 Sep 2008 22:30:24 -0000	1.8
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSvr111
-VERSION=1.1.1
+CVSTAG=FedoraDirSvr_1_1_3
+VERSION=1.1.3
 PKGNAME=fedora-ds-base
 export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/fedora-ds-base.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fedora-ds-base.spec	4 Sep 2008 14:31:17 -0000	1.18
+++ fedora-ds-base.spec	23 Sep 2008 22:30:24 -0000	1.19
@@ -4,7 +4,7 @@
 
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
-Version:          1.1.2
+Version:          1.1.3
 Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
@@ -156,6 +156,9 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Tue Sep 23 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.3-1
+- winsync api improvements for modify operations
+
 * Fri Jun 13 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.2-1
 - This is the 1.1.2 release.  The bugs fixed can be found here
 - https://bugzilla.redhat.com/showdependencytree.cgi?id=452721


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Sep 2008 14:31:17 -0000	1.14
+++ sources	23 Sep 2008 22:30:24 -0000	1.15
@@ -1,3 +1,4 @@
 a60d1ce51207e61c48b70aa85ae5e5a5  fedora-ds-base-1.1.0.tar.bz2
 c525e0412ae4b9582adbd01305126975  fedora-ds-base-1.1.1.tar.bz2
 797c93351e8fcca9bac6326e7270355e  fedora-ds-base-1.1.2.tar.bz2
+54c4c6d6ed64d97d63c032e82805d2ef  fedora-ds-base-1.1.3.tar.bz2



From iburrell at fedoraproject.org  Tue Sep 23 22:46:37 2008
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Tue, 23 Sep 2008 22:46:37 +0000 (UTC)
Subject: rpms/libtorrent/EL-5 .cvsignore, 1.5, 1.6 libtorrent.spec, 1.13,
	1.14 sources, 1.7, 1.8
Message-ID: <20080923224637.C82C970033@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/pkgs/rpms/libtorrent/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8752

Modified Files:
	.cvsignore libtorrent.spec sources 
Log Message:
copy from F-8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtorrent/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Sep 2006 09:55:14 -0000	1.5
+++ .cvsignore	23 Sep 2008 22:46:07 -0000	1.6
@@ -1 +1 @@
-libtorrent-0.10.2.tar.gz
+libtorrent-0.11.8.tar.gz


Index: libtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtorrent/EL-5/libtorrent.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libtorrent.spec	26 Nov 2006 11:40:46 -0000	1.13
+++ libtorrent.spec	23 Sep 2008 22:46:07 -0000	1.14
@@ -1,7 +1,7 @@
 Name:          libtorrent
 License:       GPL
 Group:         System Environment/Libraries
-Version:       0.10.4
+Version:       0.11.8
 Release:       1%{?dist}
 Summary:       BitTorrent library with a focus on high performance & good code
 URL:           http://libtorrent.rakshasa.no/
@@ -62,6 +62,15 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 18 2007 Marek Mahut <mmahut at fedoraproject dot org> - 0.11.8-1
+- New upstream version
+
+* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.11.4-2
+- Rebuild for selinux ppc32 issue.
+
+* Thu Jun 28 2007 Chris Chabot <chabotc at xs4all.nl> - 0.11.4-1
+- New upstream version
+
 * Sun Nov 26 2006 Chris Chabot <chabotc at xs4all.nl> - 0.10.4-1
 - New upstream version
 - Compile with -Os to work around a gcc 4.1 incompatibility


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtorrent/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Nov 2006 11:40:46 -0000	1.7
+++ sources	23 Sep 2008 22:46:07 -0000	1.8
@@ -1 +1 @@
-3154a686d9616f04012596b8daa2ff52  libtorrent-0.10.4.tar.gz
+1e50de4a4f0ee6d9c643993aea9bdbf0  libtorrent-0.11.8.tar.gz



From agk at fedoraproject.org  Tue Sep 23 22:46:53 2008
From: agk at fedoraproject.org (Alasdair Kergon)
Date: Tue, 23 Sep 2008 22:46:53 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2.spec,1.138,1.139
Message-ID: <20080923224653.D1D7A70033@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8791

Modified Files:
	lvm2.spec 
Log Message:
Change %%patch to %%patch0 to match Patch0 as required by RPM package update.



Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- lvm2.spec	16 Sep 2008 23:03:25 -0000	1.138
+++ lvm2.spec	23 Sep 2008 22:46:23 -0000	1.139
@@ -6,7 +6,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.39
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -38,7 +38,7 @@
 %prep
 %setup -q -n LVM2.%{version}
 %setup -q -T -D -a 1 -n LVM2.%{version}
-%patch -p1 -b .locking
+%patch0 -p1 -b .locking
 
 %build
 cd device-mapper.%{device_mapper_version}
@@ -270,8 +270,11 @@
 
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 2.02.39-5
+- Change %%patch to %%patch0 to match Patch0 as required by RPM package update.
+
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.02.39-4
-- fix license tag
+- Fix license tag.
 
 * Fri Jun 27 2008 Alasdair Kergon <agk at redhat.com>> - 2.02.39-3
 - Fix up cache for PVs without mdas after consistent VG metadata is processed.



From caillon at fedoraproject.org  Tue Sep 23 22:49:19 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 23 Sep 2008 22:49:19 +0000 (UTC)
Subject: rpms/xulrunner/devel .cvsignore, 1.61, 1.62 sources, 1.64,
	1.65 xulrunner.spec, 1.132, 1.133
Message-ID: <20080923224919.E23B170033@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9179

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> 1.9.0.2-1
- Update to 1.9.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	18 Jul 2008 17:23:55 -0000	1.61
+++ .cvsignore	23 Sep 2008 22:48:49 -0000	1.62
@@ -1 +1 @@
-xulrunner-1.9.0.1-source.tar.bz2
+xulrunner-1.9.0.2-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	18 Jul 2008 17:23:55 -0000	1.64
+++ sources	23 Sep 2008 22:48:49 -0000	1.65
@@ -1 +1 @@
-a14e4ac2e9fc5b29f80995c97a1c9748  xulrunner-1.9.0.1-source.tar.bz2
+0a6c68a5ab5b065fef221b586b8a3b8a  xulrunner-1.9.0.2-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- xulrunner.spec	12 Sep 2008 13:02:14 -0000	1.132
+++ xulrunner.spec	23 Sep 2008 22:48:49 -0000	1.133
@@ -1,5 +1,5 @@
 %define nspr_version 4.7.1
-%define nss_version 3.12.0.3
+%define nss_version 3.12.1.1
 %define cairo_version 0.6
 
 %define version_internal  1.9
@@ -7,8 +7,8 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.0.1
-Release:        2%{?dist}
+Version:        1.9.0.2
+Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -380,6 +380,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> 1.9.0.2-1
+- Update to 1.9.0.2
+
 * Wed Jul 23 2008 Christopher Aillon <caillon at redhat.com> 1.9.0.1-2
 - Disable system hunspell for now as it's causing some crashes (447444)
 



From iburrell at fedoraproject.org  Tue Sep 23 22:53:46 2008
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Tue, 23 Sep 2008 22:53:46 +0000 (UTC)
Subject: rpms/rtorrent/EL-5 .cvsignore, 1.6, 1.7 rtorrent.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <20080923225346.76B3070033@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/pkgs/rpms/rtorrent/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9797

Modified Files:
	.cvsignore rtorrent.spec sources 
Log Message:
copy from F-8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rtorrent/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Sep 2006 09:52:34 -0000	1.6
+++ .cvsignore	23 Sep 2008 22:53:16 -0000	1.7
@@ -1 +1 @@
-rtorrent-0.6.2.tar.gz
+rtorrent-0.7.8.tar.gz


Index: rtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rtorrent/EL-5/rtorrent.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rtorrent.spec	26 Nov 2006 12:20:34 -0000	1.14
+++ rtorrent.spec	23 Sep 2008 22:53:16 -0000	1.15
@@ -1,15 +1,16 @@
 Name:          rtorrent
-License:       GPL
+# OpenSSL exception, see README
+License:       GPLv2+ with exceptions
 Group:         Applications/Internet
-Version:       0.6.4
-Release:       2%{?dist}
+Version:       0.7.8
+Release:       1%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
 Source1:       rtorrent.rc.example
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libstdc++-devel, pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.10.4, curl-devel, ncurses-devel
-Requires:      libtorrent >= 0.10.4
+BuildRequires: libstdc++-devel, pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.11.4, curl-devel, ncurses-devel
+Requires:      libtorrent >= 0.11.8
 
 %description
 A BitTorrent client using libtorrent, which on high-bandwidth connections is 
@@ -44,6 +45,18 @@
 %{_mandir}/man1/rtorrent*
 
 %changelog
+* Tue Sep 18 2007 Marek Mahut <mmahut fedoraproject.org> - 0.7.8-1
+- New upstream release
+
+* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.7.4-3
+- Rebuild for selinux ppc32 issue.
+
+* Thu Jun 28 2007 Chris Chabot <chabotc at xs4all.nl> - 0.7.4-2
+- Fixed BR
+
+* Thu Jun 28 2007 Chris Chabot <chabotc at xs4all.nl> - 0.7.4-1
+- New upstream release
+
 * Sun Nov 26 2006 Chris Chabot <chabotc at xs4all.nl> - 0.6.4-1
 - New upstream version
 - Compile with -Os to work around a gcc 4.1 incompatibility


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rtorrent/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Nov 2006 11:48:09 -0000	1.7
+++ sources	23 Sep 2008 22:53:16 -0000	1.8
@@ -1,2 +1 @@
-9077817e5a0f505e0b71add9c57b89f7  rtorrent-0.6.4.tar.gz
-e362ef8649f0c015f894c29cb6c932be  rtorrent.rc.example
+50886a98fa2ae16ae33367ef61772e1e  rtorrent-0.7.8.tar.gz



From michich at fedoraproject.org  Tue Sep 23 22:54:09 2008
From: michich at fedoraproject.org (Michal Schmidt)
Date: Tue, 23 Sep 2008 22:54:09 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.115,1.116
Message-ID: <20080923225409.221EC70033@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9854

Modified Files:
	comps-f10.xml.in 
Log Message:
add jabbim



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- comps-f10.xml.in	23 Sep 2008 20:34:09 -0000	1.115
+++ comps-f10.xml.in	23 Sep 2008 22:53:38 -0000	1.116
@@ -2066,6 +2066,7 @@
       <packagereq type="optional">gtorrentviewer</packagereq>
       <packagereq type="optional">gwget</packagereq>
       <packagereq type="optional">gyachi</packagereq>
+      <packagereq type="optional">jabbim</packagereq>
       <packagereq type="optional">jd</packagereq>
       <packagereq type="optional">kadu</packagereq>
       <packagereq type="optional">kasablanca</packagereq>



From pkgdb at fedoraproject.org  Tue Sep 23 22:56:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 23 Sep 2008 22:56:26 +0000
Subject: [pkgdb] wine: mkquake has requested watchbugzilla
Message-ID: <20080923225626.24530208DA0@bastion.fedora.phx.redhat.com>

mkquake has requested the watchbugzilla acl on wine (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wine



From davej at fedoraproject.org  Tue Sep 23 23:02:09 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Tue, 23 Sep 2008 23:02:09 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.168, 1.169 kernel.spec, 1.972,
	1.973
Message-ID: <20080923230209.72D6570033@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10632

Modified Files:
	config-generic kernel.spec 
Log Message:
Disable E1000E driver until bz 459202 is solved.


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- config-generic	22 Sep 2008 19:43:49 -0000	1.168
+++ config-generic	23 Sep 2008 23:01:38 -0000	1.169
@@ -1218,7 +1218,8 @@
 CONFIG_E1000=m
 CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-CONFIG_E1000E=m
+# FIXME: Disable until bz 459202 is solved
+# CONFIG_E1000E is not set
 CONFIG_IGB=m
 # CONFIG_IGB_LRO is not set
 CONFIG_NS83820=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.972
retrieving revision 1.973
diff -u -r1.972 -r1.973
--- kernel.spec	23 Sep 2008 06:57:58 -0000	1.972
+++ kernel.spec	23 Sep 2008 23:01:39 -0000	1.973
@@ -1758,6 +1758,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Sep 23 2008 Dave Jones <davej at redhat.com>
+- Disable E1000E driver until bz 459202 is solved.
+
 * Tue Sep 23 2008 Dave Airlie <airlied at redhat.com>
 - fix radeon cursor disappearing bug.
 



From agk at fedoraproject.org  Tue Sep 23 23:12:13 2008
From: agk at fedoraproject.org (Alasdair Kergon)
Date: Tue, 23 Sep 2008 23:12:13 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2.spec,1.139,1.140
Message-ID: <20080923231213.11A5370033@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11911

Modified Files:
	lvm2.spec 
Log Message:
Explicitly create /sbin in the build root.  (It used to work without this.)



Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- lvm2.spec	23 Sep 2008 22:46:23 -0000	1.139
+++ lvm2.spec	23 Sep 2008 23:11:42 -0000	1.140
@@ -62,6 +62,7 @@
 install -m 0600 /dev/null $RPM_BUILD_ROOT/etc/lvm/cache/.cache
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d
 install scripts/clvmd_init_rhel4 $RPM_BUILD_ROOT/etc/rc.d/init.d/clvmd
+mkdir -p -m755 $RPM_BUILD_ROOT/sbin
 install -m 0755 scripts/lvmconf.sh $RPM_BUILD_ROOT/sbin/lvmconf
 
 cd device-mapper.%{device_mapper_version}
@@ -270,6 +271,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Alasdair Kergon <agk at redhat.com>> - 2.02.39-5
+- Explicitly create /sbin in the build root.
+
 * Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 2.02.39-5
 - Change %%patch to %%patch0 to match Patch0 as required by RPM package update.
 



From bpepple at fedoraproject.org  Tue Sep 23 23:20:30 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 23 Sep 2008 23:20:30 +0000 (UTC)
Subject: rpms/xchat-gnome/devel .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 xchat-gnome.spec, 1.53, 1.54 xchat-gnome-0.23.92-deps.patch,
	1.1, NONE
Message-ID: <20080923232030.656EA70033@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/xchat-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13387

Modified Files:
	.cvsignore sources xchat-gnome.spec 
Removed Files:
	xchat-gnome-0.23.92-deps.patch 
Log Message:
* Tue Sep 23 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.24.0-1
- Update to 0.24.0.
- Drop deps patch.  Fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	10 Sep 2008 01:06:55 -0000	1.17
+++ .cvsignore	23 Sep 2008 23:20:00 -0000	1.18
@@ -1 +1 @@
-xchat-gnome-0.23.92.tar.bz2
+xchat-gnome-0.24.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	10 Sep 2008 01:06:55 -0000	1.17
+++ sources	23 Sep 2008 23:20:00 -0000	1.18
@@ -1 +1 @@
-780963419d487cefa7c1dac14696140c  xchat-gnome-0.23.92.tar.bz2
+925010f01f593e6ff7027f2ba523c607  xchat-gnome-0.24.0.tar.bz2


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xchat-gnome.spec	10 Sep 2008 01:06:55 -0000	1.53
+++ xchat-gnome.spec	23 Sep 2008 23:20:00 -0000	1.54
@@ -1,5 +1,5 @@
 Name:           xchat-gnome
-Version:        0.23.92
+Version:        0.24.0
 Release:        1%{?dist}
 Summary:        GNOME front-end to xchat
 
@@ -8,10 +8,7 @@
 URL:            http://%{name}.navi.cx/
 Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
 # Patch specific to Fedora to use .xchat-gnome, instead of .xchat2
-Patch0:		%{name}-%{version}-config.patch
-# Backported patch to correctly set the libnotify and libcanberra options 
-# http://bugzilla.gnome.org/show_bug.cgi?id=551515
-Patch1:		%{name}-%{version}-deps.patch
+Patch0:		%{name}-0.23.92-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -30,13 +27,6 @@
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	perl(ExtUtils::Embed)
 BuildRequires:	gnome-doc-utils
-# The following BR can be dropped when deps patch is removed.
-BuildRequires: 	autoconf
-BuildRequires:	automake
-BuildRequires:	libtool
-BuildRequires:	gettext-devel
-BuildRequires:	gnome-common
-BuildRequires:	gtk-doc
 
 Requires: 	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -58,8 +48,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .config
-%patch1 -p1 -b .deps
-autoreconf
+
 
 %build
 %configure --disable-tcl		\
@@ -147,6 +136,10 @@
 
 
 %changelog
+* Tue Sep 23 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.24.0-1
+- Update to 0.24.0.
+- Drop deps patch.  Fixed upstream.
+
 * Tue Sep  9 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.23.92-1
 - Update to 0.23.92.
 - Add deps patch to correctly set libnotify & libcanberra options.


--- xchat-gnome-0.23.92-deps.patch DELETED ---



From caillon at fedoraproject.org  Tue Sep 23 23:41:18 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 23 Sep 2008 23:41:18 +0000 (UTC)
Subject: rpms/firefox/F-8 .cvsignore, 1.44, 1.45 firefox.spec, 1.216,
	1.217 sources, 1.50, 1.51
Message-ID: <20080923234118.EBB5B70033@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15647

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> 2.0.0.17-1
- Update to 2.0.0.17



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-8/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	15 Jul 2008 23:36:38 -0000	1.44
+++ .cvsignore	23 Sep 2008 23:40:48 -0000	1.45
@@ -1,2 +1,2 @@
-firefox-2.0.0.16-source.tar.bz2
-firefox-langpacks-2.0.0.16-20080715.tar.bz2
+firefox-2.0.0.17-source.tar.bz2
+firefox-langpacks-2.0.0.17-20080923.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-8/firefox.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- firefox.spec	15 Jul 2008 23:36:38 -0000	1.216
+++ firefox.spec	23 Sep 2008 23:40:48 -0000	1.217
@@ -11,7 +11,7 @@
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
-Version:        2.0.0.16
+Version:        2.0.0.17
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -22,7 +22,7 @@
 %define tarball firefox-2.0rc3-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source2:        firefox-langpacks-%{version}-20080715.tar.bz2
+Source2:        firefox-langpacks-%{version}-20080923.tar.bz2
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
 Source12:       firefox-redhat-default-prefs.js
@@ -439,6 +439,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> 2.0.0.17-1
+- Update to 2.0.0.17
+
 * Tue Jul 15 2008 Christopher Aillon <caillon at redhat.com> 2.0.0.16-1
 - Update to 2.0.0.16
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-8/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	15 Jul 2008 23:36:38 -0000	1.50
+++ sources	23 Sep 2008 23:40:48 -0000	1.51
@@ -1,2 +1,2 @@
-90e0b7996a14fdbe6d4e6e4d87980647  firefox-2.0.0.16-source.tar.bz2
-4415f9166c99048c4ae9e58f6dabc1b2  firefox-langpacks-2.0.0.16-20080715.tar.bz2
+e14669e53226fd7fc084c2e3d58d5b64  firefox-2.0.0.17-source.tar.bz2
+bb9467c8f226eafe16f7dcac2f634dad  firefox-langpacks-2.0.0.17-20080923.tar.bz2



From caillon at fedoraproject.org  Tue Sep 23 23:43:18 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 23 Sep 2008 23:43:18 +0000 (UTC)
Subject: rpms/firefox/F-9 .cvsignore, 1.82, 1.83 firefox.spec, 1.303,
	1.304 sources, 1.94, 1.95
Message-ID: <20080923234318.4EE4E70033@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15955

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> 3.0.2-1
- Update to 3.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-9/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- .cvsignore	16 Jul 2008 22:03:25 -0000	1.82
+++ .cvsignore	23 Sep 2008 23:42:47 -0000	1.83
@@ -1,2 +1,2 @@
-firefox-3.0.1-source.tar.bz2
-firefox-langpacks-3.0.1-20080716.tar.bz2
+firefox-3.0.2-source.tar.bz2
+firefox-langpacks-3.0.2-20080923.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-9/firefox.spec,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- firefox.spec	24 Jul 2008 14:41:32 -0000	1.303
+++ firefox.spec	23 Sep 2008 23:42:47 -0000	1.304
@@ -6,7 +6,7 @@
 
 %define mozappdir            %{_libdir}/%{name}-%{version}
 
-%define gecko_version 1.9.0.1
+%define gecko_version 1.9.0.2
 
 %define official_branding    1
 %define build_langpacks      1
@@ -18,7 +18,7 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.0.1
+Version:        3.0.2
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -30,7 +30,7 @@
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-20080716.tar.bz2
+Source2:        firefox-langpacks-%{version}-20080923.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -332,6 +332,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> 3.0.2-1
+- Update to 3.0.2
+
 * Wed Jul 16 2008 Christopher Aillon <caillon at redhat.com> 3.0.1-1
 - Update to 3.0.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-9/sources,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- sources	16 Jul 2008 22:03:25 -0000	1.94
+++ sources	23 Sep 2008 23:42:47 -0000	1.95
@@ -1,2 +1,2 @@
-a14e4ac2e9fc5b29f80995c97a1c9748  firefox-3.0.1-source.tar.bz2
-cf5dc720cfc20e2b219cb5cef9a295a1  firefox-langpacks-3.0.1-20080716.tar.bz2
+0a6c68a5ab5b065fef221b586b8a3b8a  firefox-3.0.2-source.tar.bz2
+869f67d6bec2776d36fe454264172b69  firefox-langpacks-3.0.2-20080923.tar.bz2



From caillon at fedoraproject.org  Tue Sep 23 23:57:36 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 23 Sep 2008 23:57:36 +0000 (UTC)
Subject: rpms/firefox/devel .cvsignore, 1.91, 1.92 firefox.spec, 1.312,
	1.313 sources, 1.104, 1.105
Message-ID: <20080923235736.AA85F70105@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17408

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> 3.0.2-1
- Update to 3.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- .cvsignore	19 Jul 2008 00:38:13 -0000	1.91
+++ .cvsignore	23 Sep 2008 23:57:06 -0000	1.92
@@ -1,2 +1,2 @@
-firefox-3.0.1-source.tar.bz2
-firefox-langpacks-3.0.1-20080716.tar.bz2
+firefox-3.0.2-source.tar.bz2
+firefox-langpacks-3.0.2-20080923.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- firefox.spec	24 Jul 2008 14:42:59 -0000	1.312
+++ firefox.spec	23 Sep 2008 23:57:06 -0000	1.313
@@ -6,7 +6,7 @@
 
 %define mozappdir            %{_libdir}/%{name}-%{version}
 
-%define gecko_version 1.9.0.1
+%define gecko_version 1.9.0.2
 
 %define official_branding    1
 %define build_langpacks      1
@@ -18,7 +18,7 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.0.1
+Version:        3.0.2
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -30,7 +30,7 @@
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-20080716.tar.bz2
+Source2:        firefox-langpacks-%{version}-20080923.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -333,6 +333,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> 3.0.2-1
+- Update to 3.0.2
+
 * Wed Jul 16 2008 Christopher Aillon <caillon at redhat.com> 3.0.1-1
 - Update to 3.0.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- sources	19 Jul 2008 00:38:14 -0000	1.104
+++ sources	23 Sep 2008 23:57:06 -0000	1.105
@@ -1,2 +1,2 @@
-a14e4ac2e9fc5b29f80995c97a1c9748  firefox-3.0.1-source.tar.bz2
-cf5dc720cfc20e2b219cb5cef9a295a1  firefox-langpacks-3.0.1-20080716.tar.bz2
+0a6c68a5ab5b065fef221b586b8a3b8a  firefox-3.0.2-source.tar.bz2
+869f67d6bec2776d36fe454264172b69  firefox-langpacks-3.0.2-20080923.tar.bz2



From devrim at fedoraproject.org  Wed Sep 24 00:36:43 2008
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Wed, 24 Sep 2008 00:36:43 +0000 (UTC)
Subject: rpms/classpathx-jaf/devel classpathx-jaf.spec,1.24,1.25
Message-ID: <20080924003643.620727010A@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/classpathx-jaf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21822

Modified Files:
	classpathx-jaf.spec 
Log Message:
Fix Patch0:/%%patch mismatch.
Ville Skytt??



Index: classpathx-jaf.spec
===================================================================
RCS file: /cvs/extras/rpms/classpathx-jaf/devel/classpathx-jaf.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- classpathx-jaf.spec	9 Jul 2008 17:44:13 -0000	1.24
+++ classpathx-jaf.spec	24 Sep 2008 00:36:10 -0000	1.25
@@ -35,7 +35,7 @@
 
 Name:           classpathx-jaf
 Version:        1.0
-Release:        12%{?dist}
+Release:        13%{?dist}
 Epoch:          0
 Summary:        GNU JavaBeans(tm) Activation Framework
 Group:          System Environment/Libraries
@@ -84,7 +84,7 @@
 %prep
 %setup -q -n activation-%{version}
 
-%patch -p0
+%patch0 -p0
 
 %build
 export JAVAC=%{javac}
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0-13
+- Fix Patch0:/%%patch mismatch.
+
 * Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:1.0-12
 - drop repotag
 - fix license tag



From davej at fedoraproject.org  Wed Sep 24 00:54:45 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Wed, 24 Sep 2008 00:54:45 +0000 (UTC)
Subject: rpms/kernel/devel git-linus.diff, 1.9, 1.10 kernel.spec, 1.973,
	1.974 linux-2.6-usb-fix-hcd-interrupt-disabling.patch, 1.1, NONE
Message-ID: <20080924005445.5D1BA70103@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23933

Modified Files:
	git-linus.diff kernel.spec 
Removed Files:
	linux-2.6-usb-fix-hcd-interrupt-disabling.patch 
Log Message:
Merge Linux-2.6 up to commit fb478da5ba69ecf40729ae8ab37ca406b1e5be48

git-linus.diff:

Index: git-linus.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-linus.diff,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- git-linus.diff	27 Aug 2008 00:40:32 -0000	1.9
+++ git-linus.diff	24 Sep 2008 00:54:42 -0000	1.10
@@ -0,0 +1,1757 @@
+diff --git a/Documentation/DMA-mapping.txt b/Documentation/DMA-mapping.txt
+index b463ecd..c74fec8 100644
+--- a/Documentation/DMA-mapping.txt
++++ b/Documentation/DMA-mapping.txt
+@@ -740,7 +740,7 @@ failure can be determined by:
+ 	dma_addr_t dma_handle;
+ 
+ 	dma_handle = pci_map_single(pdev, addr, size, direction);
+-	if (pci_dma_mapping_error(dma_handle)) {
++	if (pci_dma_mapping_error(pdev, dma_handle)) {
+ 		/*
+ 		 * reduce current DMA mapping usage,
+ 		 * delay and try again later or
+diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
+index 276a7e6..e1ff0d9 100644
+--- a/Documentation/sysctl/kernel.txt
++++ b/Documentation/sysctl/kernel.txt
+@@ -351,9 +351,10 @@ kernel.  This value defaults to SHMMAX.
+ 
+ softlockup_thresh:
+ 
+-This value can be used to lower the softlockup tolerance
+-threshold. The default threshold is 10s.  If a cpu is locked up
+-for 10s, the kernel complains.  Valid values are 1-60s.
++This value can be used to lower the softlockup tolerance threshold.  The
++default threshold is 60 seconds.  If a cpu is locked up for 60 seconds,
++the kernel complains.  Valid values are 1-60 seconds.  Setting this
++tunable to zero will disable the softlockup detection altogether.
+ 
+ ==============================================================
+ 
+diff --git a/Documentation/usb/anchors.txt b/Documentation/usb/anchors.txt
+index 7304bcf..5e6b64c 100644
+--- a/Documentation/usb/anchors.txt
++++ b/Documentation/usb/anchors.txt
+@@ -42,9 +42,21 @@ This function kills all URBs associated with an anchor. The URBs
+ are called in the reverse temporal order they were submitted.
+ This way no data can be reordered.
+ 
++usb_unlink_anchored_urbs()
++--------------------------
++
++This function unlinks all URBs associated with an anchor. The URBs
++are processed in the reverse temporal order they were submitted.
++This is similar to usb_kill_anchored_urbs(), but it will not sleep.
++Therefore no guarantee is made that the URBs have been unlinked when
++the call returns. They may be unlinked later but will be unlinked in
++finite time.
++
+ usb_wait_anchor_empty_timeout()
+ -------------------------------
+ 
+ This function waits for all URBs associated with an anchor to finish
+ or a timeout, whichever comes first. Its return value will tell you
+ whether the timeout was reached.
++
++
+diff --git a/MAINTAINERS b/MAINTAINERS
+index cad81a2..42ebbfd 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -3833,11 +3833,12 @@ S:	Maintained
+ 
+ SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT
+ P:	Liam Girdwood
+-M:	liam.girdwood at wolfsonmicro.com
++M:	lrg at slimlogic.co.uk
+ P:	Mark Brown
+ M:	broonie at opensource.wolfsonmicro.com
+ T:	git opensource.wolfsonmicro.com/linux-2.6-asoc
+ L:	alsa-devel at alsa-project.org (subscribers-only)
++W:	http://alsa-project.org/main/index.php/ASoC
+ S:	Supported
+ 
+ SPI SUBSYSTEM
+diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
+index d45f215..51b75ce 100644
+--- a/arch/ia64/kernel/efi.c
++++ b/arch/ia64/kernel/efi.c
+@@ -1232,9 +1232,10 @@ efi_initialize_iomem_resources(struct resource *code_resource,
+ 				if (md->attribute & EFI_MEMORY_WP) {
+ 					name = "System ROM";
+ 					flags |= IORESOURCE_READONLY;
+-				} else {
++				} else if (md->attribute == EFI_MEMORY_UC)
++					name = "Uncached RAM";
++				else
+ 					name = "System RAM";
+-				}
+ 				break;
+ 
+ 			case EFI_ACPI_MEMORY_NVS:
+diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
+index c27d5b2..de636b2 100644
+--- a/arch/ia64/kernel/setup.c
++++ b/arch/ia64/kernel/setup.c
+@@ -616,7 +616,9 @@ setup_arch (char **cmdline_p)
+ 		ia64_mca_init();
+ 
+ 	platform_setup(cmdline_p);
++#ifndef CONFIG_IA64_HP_SIM
+ 	check_sal_cache_flush();
++#endif
+ 	paging_init();
+ }
+ 
+diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
+index f845f15..100ebd5 100644
+--- a/arch/sparc64/kernel/of_device.c
++++ b/arch/sparc64/kernel/of_device.c
+@@ -169,7 +169,7 @@ static unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long fla
+ 
+ static int of_bus_pci_match(struct device_node *np)
+ {
+-	if (!strcmp(np->type, "pci") || !strcmp(np->type, "pciex")) {
++	if (!strcmp(np->name, "pci")) {
+ 		const char *model = of_get_property(np, "model", NULL);
+ 
+ 		if (model && !strcmp(model, "SUNW,simba"))
+@@ -200,7 +200,7 @@ static int of_bus_simba_match(struct device_node *np)
+ 	/* Treat PCI busses lacking ranges property just like
+ 	 * simba.
+ 	 */
+-	if (!strcmp(np->type, "pci") || !strcmp(np->type, "pciex")) {
++	if (!strcmp(np->name, "pci")) {
+ 		if (!of_find_property(np, "ranges", NULL))
+ 			return 1;
+ 	}
+@@ -429,7 +429,7 @@ static int __init use_1to1_mapping(struct device_node *pp)
+ 	 * it lacks a ranges property, and this will include
+ 	 * cases like Simba.
+ 	 */
+-	if (!strcmp(pp->type, "pci") || !strcmp(pp->type, "pciex"))
++	if (!strcmp(pp->name, "pci"))
+ 		return 0;
+ 
+ 	return 1;
+@@ -714,8 +714,7 @@ static unsigned int __init build_one_device_irq(struct of_device *op,
+ 				break;
+ 			}
+ 		} else {
+-			if (!strcmp(pp->type, "pci") ||
+-			    !strcmp(pp->type, "pciex")) {
++			if (!strcmp(pp->name, "pci")) {
+ 				unsigned int this_orig_irq = irq;
+ 
+ 				irq = pci_irq_swizzle(dp, pp, irq);
+diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
+index 5509619..80dad76 100644
+--- a/arch/sparc64/kernel/pci.c
++++ b/arch/sparc64/kernel/pci.c
+@@ -425,7 +425,7 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
+ 	dev->current_state = 4;		/* unknown power state */
+ 	dev->error_state = pci_channel_io_normal;
+ 
+-	if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {
++	if (!strcmp(node->name, "pci")) {
+ 		/* a PCI-PCI bridge */
+ 		dev->hdr_type = PCI_HEADER_TYPE_BRIDGE;
+ 		dev->rom_base_reg = PCI_ROM_ADDRESS1;
+diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
+index 69b4d06..042fdc2 100644
+--- a/arch/x86/kernel/amd_iommu.c
++++ b/arch/x86/kernel/amd_iommu.c
+@@ -101,10 +101,10 @@ static int iommu_queue_command(struct amd_iommu *iommu, struct iommu_cmd *cmd)
+  */
+ static int iommu_completion_wait(struct amd_iommu *iommu)
+ {
+-	int ret, ready = 0;
++	int ret = 0, ready = 0;
+ 	unsigned status = 0;
+ 	struct iommu_cmd cmd;
+-	unsigned long i = 0;
++	unsigned long flags, i = 0;
+ 
+ 	memset(&cmd, 0, sizeof(cmd));
+ 	cmd.data[0] = CMD_COMPL_WAIT_INT_MASK;
+@@ -112,10 +112,12 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
+ 
+ 	iommu->need_sync = 0;
+ 
+-	ret = iommu_queue_command(iommu, &cmd);
++	spin_lock_irqsave(&iommu->lock, flags);
++
++	ret = __iommu_queue_command(iommu, &cmd);
+ 
+ 	if (ret)
+-		return ret;
++		goto out;
+ 
+ 	while (!ready && (i < EXIT_LOOP_COUNT)) {
+ 		++i;
+@@ -130,6 +132,8 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
+ 
+ 	if (unlikely((i == EXIT_LOOP_COUNT) && printk_ratelimit()))
+ 		printk(KERN_WARNING "AMD IOMMU: Completion wait loop failed\n");
++out:
++	spin_unlock_irqrestore(&iommu->lock, flags);
+ 
+ 	return 0;
+ }
+@@ -140,6 +144,7 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
+ static int iommu_queue_inv_dev_entry(struct amd_iommu *iommu, u16 devid)
+ {
+ 	struct iommu_cmd cmd;
++	int ret;
+ 
+ 	BUG_ON(iommu == NULL);
+ 
+@@ -147,9 +152,11 @@ static int iommu_queue_inv_dev_entry(struct amd_iommu *iommu, u16 devid)
+ 	CMD_SET_TYPE(&cmd, CMD_INV_DEV_ENTRY);
+ 	cmd.data[0] = devid;
+ 
++	ret = iommu_queue_command(iommu, &cmd);
++
+ 	iommu->need_sync = 1;
+ 
+-	return iommu_queue_command(iommu, &cmd);
++	return ret;
+ }
+ 
+ /*
+@@ -159,6 +166,7 @@ static int iommu_queue_inv_iommu_pages(struct amd_iommu *iommu,
+ 		u64 address, u16 domid, int pde, int s)
+ {
+ 	struct iommu_cmd cmd;
++	int ret;
+ 
+ 	memset(&cmd, 0, sizeof(cmd));
+ 	address &= PAGE_MASK;
+@@ -171,9 +179,11 @@ static int iommu_queue_inv_iommu_pages(struct amd_iommu *iommu,
+ 	if (pde) /* PDE bit - we wan't flush everything not only the PTEs */
+ 		cmd.data[2] |= CMD_INV_IOMMU_PAGES_PDE_MASK;
+ 
++	ret = iommu_queue_command(iommu, &cmd);
++
+ 	iommu->need_sync = 1;
+ 
+-	return iommu_queue_command(iommu, &cmd);
++	return ret;
+ }
+ 
+ /*
+diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
+index 7fc4d5b..876e918 100644
+--- a/arch/x86/kernel/process.c
++++ b/arch/x86/kernel/process.c
+@@ -246,6 +246,14 @@ static int __cpuinit check_c1e_idle(const struct cpuinfo_x86 *c)
+ 	return 1;
+ }
+ 
++static cpumask_t c1e_mask = CPU_MASK_NONE;
++static int c1e_detected;
++
++void c1e_remove_cpu(int cpu)
++{
++	cpu_clear(cpu, c1e_mask);
++}
++
+ /*
+  * C1E aware idle routine. We check for C1E active in the interrupt
+  * pending message MSR. If we detect C1E, then we handle it the same
+@@ -253,9 +261,6 @@ static int __cpuinit check_c1e_idle(const struct cpuinfo_x86 *c)
+  */
+ static void c1e_idle(void)
+ {
+-	static cpumask_t c1e_mask = CPU_MASK_NONE;
+-	static int c1e_detected;
+-
+ 	if (need_resched())
+ 		return;
+ 
+@@ -265,8 +270,10 @@ static void c1e_idle(void)
+ 		rdmsr(MSR_K8_INT_PENDING_MSG, lo, hi);
+ 		if (lo & K8_INTP_C1E_ACTIVE_MASK) {
+ 			c1e_detected = 1;
+-			mark_tsc_unstable("TSC halt in C1E");
+-			printk(KERN_INFO "System has C1E enabled\n");
++			if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC))
++				mark_tsc_unstable("TSC halt in AMD C1E");
++			printk(KERN_INFO "System has AMD C1E enabled\n");
++			set_cpu_cap(&boot_cpu_data, X86_FEATURE_AMDC1E);
+ 		}
+ 	}
+ 
+diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
+index 3b7a1dd..4b3cfdf 100644
+--- a/arch/x86/kernel/process_32.c
++++ b/arch/x86/kernel/process_32.c
+@@ -88,6 +88,7 @@ static void cpu_exit_clear(void)
+ 	cpu_clear(cpu, cpu_callin_map);
+ 
+ 	numa_remove_cpu(cpu);
++	c1e_remove_cpu(cpu);
+ }
+ 
+ /* We don't actually take CPU down, just spin without interrupts. */
+diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
+index 71553b6..e12e0e4 100644
+--- a/arch/x86/kernel/process_64.c
++++ b/arch/x86/kernel/process_64.c
+@@ -93,6 +93,8 @@ DECLARE_PER_CPU(int, cpu_state);
+ static inline void play_dead(void)
+ {
+ 	idle_task_exit();
++	c1e_remove_cpu(raw_smp_processor_id());
++
+ 	mb();
+ 	/* Ack it */
+ 	__get_cpu_var(cpu_state) = CPU_DEAD;
+diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
+index 0c029e8..7766d36 100644
+--- a/arch/x86/kernel/vsmp_64.c
++++ b/arch/x86/kernel/vsmp_64.c
+@@ -61,7 +61,7 @@ static void vsmp_irq_enable(void)
+ 	native_restore_fl((flags | X86_EFLAGS_IF) & (~X86_EFLAGS_AC));
+ }
+ 
+-static unsigned __init vsmp_patch(u8 type, u16 clobbers, void *ibuf,
++static unsigned __init_or_module vsmp_patch(u8 type, u16 clobbers, void *ibuf,
+ 				  unsigned long addr, unsigned len)
+ {
+ 	switch (type) {
+diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
+index 0227694..8a5f161 100644
+--- a/arch/x86/oprofile/nmi_int.c
++++ b/arch/x86/oprofile/nmi_int.c
+@@ -295,10 +295,12 @@ static void nmi_cpu_shutdown(void *dummy)
+ 
+ static void nmi_shutdown(void)
+ {
+-	struct op_msrs *msrs = &get_cpu_var(cpu_msrs);
++	struct op_msrs *msrs;
++
+ 	nmi_enabled = 0;
+ 	on_each_cpu(nmi_cpu_shutdown, NULL, 1);
+ 	unregister_die_notifier(&profile_exceptions_nb);
++	msrs = &get_cpu_var(cpu_msrs);
+ 	model->shutdown(msrs);
+ 	free_msrs();
+ 	put_cpu_var(cpu_msrs);
+diff --git a/drivers/net/wireless/ath9k/core.c b/drivers/net/wireless/ath9k/core.c
+index f6c4528..c049593 100644
+--- a/drivers/net/wireless/ath9k/core.c
++++ b/drivers/net/wireless/ath9k/core.c
+@@ -294,8 +294,6 @@ static int ath_stop(struct ath_softc *sc)
+ 	 * hardware is gone (invalid).
+ 	 */
+ 
+-	if (!sc->sc_invalid)
+-		ath9k_hw_set_interrupts(ah, 0);
+ 	ath_draintxq(sc, false);
+ 	if (!sc->sc_invalid) {
+ 		ath_stoprecv(sc);
+@@ -1336,6 +1334,8 @@ void ath_deinit(struct ath_softc *sc)
+ 
+ 	DPRINTF(sc, ATH_DBG_CONFIG, "%s\n", __func__);
+ 
++	tasklet_kill(&sc->intr_tq);
++	tasklet_kill(&sc->bcon_tasklet);
+ 	ath_stop(sc);
+ 	if (!sc->sc_invalid)
+ 		ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_AWAKE);
+diff --git a/drivers/net/wireless/ath9k/core.h b/drivers/net/wireless/ath9k/core.h
+index 4ee695b..2f84093 100644
+--- a/drivers/net/wireless/ath9k/core.h
++++ b/drivers/net/wireless/ath9k/core.h
+@@ -974,7 +974,6 @@ struct ath_softc {
+ 	u32 sc_keymax;		/* size of key cache */
+ 	DECLARE_BITMAP(sc_keymap, ATH_KEYMAX);	/* key use bit map */
+ 	u8 sc_splitmic;		/* split TKIP MIC keys */
+-	int sc_keytype;
+ 
+ 	/* RX */
+ 	struct list_head sc_rxbuf;
+diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
+index 99badf1..acebdf1 100644
+--- a/drivers/net/wireless/ath9k/main.c
++++ b/drivers/net/wireless/ath9k/main.c
+@@ -206,8 +206,6 @@ static int ath_key_config(struct ath_softc *sc,
+ 	if (!ret)
+ 		return -EIO;
+ 
+-	if (mac)
+-		sc->sc_keytype = hk.kv_type;
+ 	return 0;
+ }
+ 
+@@ -778,7 +776,6 @@ static int ath9k_set_key(struct ieee80211_hw *hw,
+ 	case DISABLE_KEY:
+ 		ath_key_delete(sc, key);
+ 		clear_bit(key->keyidx, sc->sc_keymap);
+-		sc->sc_keytype = ATH9K_CIPHER_CLR;
+ 		break;
+ 	default:
+ 		ret = -EINVAL;
+@@ -1414,10 +1411,17 @@ static void ath_pci_remove(struct pci_dev *pdev)
+ {
+ 	struct ieee80211_hw *hw = pci_get_drvdata(pdev);
+ 	struct ath_softc *sc = hw->priv;
++	enum ath9k_int status;
+ 
+-	if (pdev->irq)
++	if (pdev->irq) {
++		ath9k_hw_set_interrupts(sc->sc_ah, 0);
++		/* clear the ISR */
++		ath9k_hw_getisr(sc->sc_ah, &status);
++		sc->sc_invalid = 1;
+ 		free_irq(pdev->irq, sc);
++	}
+ 	ath_detach(sc);
++
+ 	pci_iounmap(pdev, sc->mem);
+ 	pci_release_region(pdev, 0);
+ 	pci_disable_device(pdev);
+diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c
+index 550129f..8b332e1 100644
+--- a/drivers/net/wireless/ath9k/xmit.c
++++ b/drivers/net/wireless/ath9k/xmit.c
+@@ -315,11 +315,11 @@ static int ath_tx_prepare(struct ath_softc *sc,
+ 		txctl->keyix = tx_info->control.hw_key->hw_key_idx;
+ 		txctl->frmlen += tx_info->control.icv_len;
+ 
+-		if (sc->sc_keytype == ATH9K_CIPHER_WEP)
++		if (tx_info->control.hw_key->alg == ALG_WEP)
+ 			txctl->keytype = ATH9K_KEY_TYPE_WEP;
+-		else if (sc->sc_keytype == ATH9K_CIPHER_TKIP)
++		else if (tx_info->control.hw_key->alg == ALG_TKIP)
+ 			txctl->keytype = ATH9K_KEY_TYPE_TKIP;
+-		else if (sc->sc_keytype == ATH9K_CIPHER_AES_CCM)
++		else if (tx_info->control.hw_key->alg == ALG_CCMP)
+ 			txctl->keytype = ATH9K_KEY_TYPE_AES;
+ 	}
+ 
+diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
+index da8b743..a60ae86 100644
+--- a/drivers/net/wireless/zd1211rw/zd_usb.c
++++ b/drivers/net/wireless/zd1211rw/zd_usb.c
+@@ -58,6 +58,7 @@ static struct usb_device_id usb_ids[] = {
+ 	{ USB_DEVICE(0x0586, 0x3407), .driver_info = DEVICE_ZD1211 },
+ 	{ USB_DEVICE(0x129b, 0x1666), .driver_info = DEVICE_ZD1211 },
+ 	{ USB_DEVICE(0x157e, 0x300a), .driver_info = DEVICE_ZD1211 },
++	{ USB_DEVICE(0x0105, 0x145f), .driver_info = DEVICE_ZD1211 },
+ 	/* ZD1211B */
+ 	{ USB_DEVICE(0x0ace, 0x1215), .driver_info = DEVICE_ZD1211B },
+ 	{ USB_DEVICE(0x157e, 0x300d), .driver_info = DEVICE_ZD1211B },
+diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
+index 9a7c9e1..851f5b8 100644
+--- a/drivers/pci/pcie/aspm.c
++++ b/drivers/pci/pcie/aspm.c
+@@ -527,7 +527,7 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
+ 		 */
+ 		pci_read_config_dword(child_dev, child_pos + PCI_EXP_DEVCAP,
+ 			&reg32);
+-		if (!(reg32 & PCI_EXP_DEVCAP_RBER && !aspm_force)) {
++		if (!(reg32 & PCI_EXP_DEVCAP_RBER) && !aspm_force) {
+ 			printk("Pre-1.1 PCIe device detected, "
+ 				"disable ASPM for %s. It can be enabled forcedly"
+ 				" with 'pcie_aspm=force'\n", pci_name(pdev));
+diff --git a/drivers/pci/search.c b/drivers/pci/search.c
+index 3b3b5f1..4edfc47 100644
+--- a/drivers/pci/search.c
++++ b/drivers/pci/search.c
+@@ -162,7 +162,7 @@ EXPORT_SYMBOL(pci_find_slot);
+  * time.
+  */
+ struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device,
+-				const struct pci_dev *from)
++				struct pci_dev *from)
+ {
+ 	struct pci_dev *pdev;
+ 
+@@ -263,7 +263,7 @@ static int match_pci_dev_by_id(struct device *dev, void *data)
+  * this file.
+  */
+ static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
+-					 const struct pci_dev *from)
++					 struct pci_dev *from)
+ {
+ 	struct device *dev;
+ 	struct device *dev_start = NULL;
+@@ -303,7 +303,7 @@ static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
+  */
+ struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device,
+ 			       unsigned int ss_vendor, unsigned int ss_device,
+-			       const struct pci_dev *from)
++			       struct pci_dev *from)
+ {
+ 	struct pci_dev *pdev;
+ 	struct pci_device_id *id;
+diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
+index 3a6da80..61fb8b6 100644
+--- a/drivers/serial/atmel_serial.c
++++ b/drivers/serial/atmel_serial.c
+@@ -131,7 +131,8 @@ struct atmel_uart_char {
+ struct atmel_uart_port {
+ 	struct uart_port	uart;		/* uart */
+ 	struct clk		*clk;		/* uart clock */
+-	unsigned short		suspended;	/* is port suspended? */
++	int			may_wakeup;	/* cached value of device_may_wakeup for times we need to disable it */
++	u32			backup_imr;	/* IMR saved during suspend */
+ 	int			break_active;	/* break being received */
+ 
+ 	short			use_dma_rx;	/* enable PDC receiver */
+@@ -984,8 +985,15 @@ static void atmel_serial_pm(struct uart_port *port, unsigned int state,
+ 		 * This is called on uart_open() or a resume event.
+ 		 */
+ 		clk_enable(atmel_port->clk);
++
++		/* re-enable interrupts if we disabled some on suspend */
++		UART_PUT_IER(port, atmel_port->backup_imr);
+ 		break;
+ 	case 3:
++		/* Back up the interrupt mask and disable all interrupts */
++		atmel_port->backup_imr = UART_GET_IMR(port);
++		UART_PUT_IDR(port, -1);
++
+ 		/*
+ 		 * Disable the peripheral clock for this serial port.
+ 		 * This is called on uart_close() or a suspend event.
+@@ -1475,13 +1483,12 @@ static int atmel_serial_suspend(struct platform_device *pdev,
+ 			cpu_relax();
+ 	}
+ 
+-	if (device_may_wakeup(&pdev->dev)
+-	    && !atmel_serial_clk_will_stop())
+-		enable_irq_wake(port->irq);
+-	else {
+-		uart_suspend_port(&atmel_uart, port);
+-		atmel_port->suspended = 1;
+-	}
++	/* we can not wake up if we're running on slow clock */
++	atmel_port->may_wakeup = device_may_wakeup(&pdev->dev);
++	if (atmel_serial_clk_will_stop())
++		device_set_wakeup_enable(&pdev->dev, 0);
++
++	uart_suspend_port(&atmel_uart, port);
+ 
+ 	return 0;
+ }
+@@ -1491,11 +1498,8 @@ static int atmel_serial_resume(struct platform_device *pdev)
+ 	struct uart_port *port = platform_get_drvdata(pdev);
+ 	struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
+ 
+-	if (atmel_port->suspended) {
+-		uart_resume_port(&atmel_uart, port);
+-		atmel_port->suspended = 0;
+-	} else
+-		disable_irq_wake(port->irq);
++	uart_resume_port(&atmel_uart, port);
++	device_set_wakeup_enable(&pdev->dev, atmel_port->may_wakeup);
+ 
+ 	return 0;
+ }
+@@ -1513,6 +1517,8 @@ static int __devinit atmel_serial_probe(struct platform_device *pdev)
+ 	BUILD_BUG_ON(!is_power_of_2(ATMEL_SERIAL_RINGSIZE));
+ 
+ 	port = &atmel_ports[pdev->id];
++	port->backup_imr = 0;
++
+ 	atmel_init_port(port, pdev);
+ 
+ 	if (!atmel_use_dma_rx(&port->uart)) {
+diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
+index 8abd4e5..8ab389d 100644
+--- a/drivers/usb/core/hcd.c
++++ b/drivers/usb/core/hcd.c
+@@ -1876,7 +1876,8 @@ int usb_add_hcd(struct usb_hcd *hcd,
+ 		 * with IRQF_SHARED. As usb_hcd_irq() will always disable
+ 		 * interrupts we can remove it here.
+ 		 */
+-		irqflags &= ~IRQF_DISABLED;
++		if (irqflags & IRQF_SHARED)
++			irqflags &= ~IRQF_DISABLED;
+ 
+ 		snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d",
+ 				hcd->driver->description, hcd->self.busnum);
+diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
+index 6a5cb01..d999638 100644
+--- a/drivers/usb/core/hub.c
++++ b/drivers/usb/core/hub.c
+@@ -2683,35 +2683,17 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
+ 				USB_PORT_STAT_C_ENABLE);
+ #endif
+ 
+-	/* Try to use the debounce delay for protection against
+-	 * port-enable changes caused, for example, by EMI.
+-	 */
+-	if (portchange & (USB_PORT_STAT_C_CONNECTION |
+-				USB_PORT_STAT_C_ENABLE)) {
+-		status = hub_port_debounce(hub, port1);
+-		if (status < 0) {
+-			if (printk_ratelimit())
+-				dev_err (hub_dev, "connect-debounce failed, "
+-						"port %d disabled\n", port1);
+-			portstatus &= ~USB_PORT_STAT_CONNECTION;
+-		} else {
+-			portstatus = status;
+-		}
+-	}
+-
+ 	/* Try to resuscitate an existing device */
+ 	udev = hdev->children[port1-1];
+ 	if ((portstatus & USB_PORT_STAT_CONNECTION) && udev &&
+ 			udev->state != USB_STATE_NOTATTACHED) {
+-
+ 		usb_lock_device(udev);
+ 		if (portstatus & USB_PORT_STAT_ENABLE) {
+ 			status = 0;		/* Nothing to do */
+-		} else if (!udev->persist_enabled) {
+-			status = -ENODEV;	/* Mustn't resuscitate */
+ 
+ #ifdef CONFIG_USB_SUSPEND
+-		} else if (udev->state == USB_STATE_SUSPENDED) {
++		} else if (udev->state == USB_STATE_SUSPENDED &&
++				udev->persist_enabled) {
+ 			/* For a suspended device, treat this as a
+ 			 * remote wakeup event.
+ 			 */
+@@ -2726,7 +2708,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
+ #endif
+ 
+ 		} else {
+-			status = usb_reset_device(udev);
++			status = -ENODEV;	/* Don't resuscitate */
+ 		}
+ 		usb_unlock_device(udev);
+ 
+@@ -2741,6 +2723,19 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
+ 		usb_disconnect(&hdev->children[port1-1]);
+ 	clear_bit(port1, hub->change_bits);
+ 
++	if (portchange & (USB_PORT_STAT_C_CONNECTION |
++				USB_PORT_STAT_C_ENABLE)) {
++		status = hub_port_debounce(hub, port1);
++		if (status < 0) {
++			if (printk_ratelimit())
++				dev_err(hub_dev, "connect-debounce failed, "
++						"port %d disabled\n", port1);
++			portstatus &= ~USB_PORT_STAT_CONNECTION;
++		} else {
++			portstatus = status;
++		}
++	}
++
+ 	/* Return now if debouncing failed or nothing is connected */
+ 	if (!(portstatus & USB_PORT_STAT_CONNECTION)) {
+ 
+@@ -2748,7 +2743,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
+ 		if ((wHubCharacteristics & HUB_CHAR_LPSM) < 2
+ 				&& !(portstatus & (1 << USB_PORT_FEAT_POWER)))
+ 			set_port_feature(hdev, port1, USB_PORT_FEAT_POWER);
+- 
++
+ 		if (portstatus & USB_PORT_STAT_ENABLE)
+   			goto done;
+ 		return;
+diff --git a/drivers/usb/gadget/fsl_usb2_udc.c b/drivers/usb/gadget/fsl_usb2_udc.c
+index 1cfccf1..45ad556 100644
+--- a/drivers/usb/gadget/fsl_usb2_udc.c
++++ b/drivers/usb/gadget/fsl_usb2_udc.c
+@@ -223,7 +223,7 @@ static int dr_controller_setup(struct fsl_udc *udc)
+ 	fsl_writel(tmp, &dr_regs->endpointlistaddr);
+ 
+ 	VDBG("vir[qh_base] is %p phy[qh_base] is 0x%8x reg is 0x%8x",
+-		(int)udc->ep_qh, (int)tmp,
++		udc->ep_qh, (int)tmp,
+ 		fsl_readl(&dr_regs->endpointlistaddr));
+ 
+ 	/* Config PHY interface */
+diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
+index 574c538..bb54cca 100644
+--- a/drivers/usb/gadget/omap_udc.c
++++ b/drivers/usb/gadget/omap_udc.c
+@@ -787,7 +787,7 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel)
+ 			omap_set_dma_dest_params(ep->lch,
+ 				OMAP_DMA_PORT_TIPB,
+ 				OMAP_DMA_AMODE_CONSTANT,
+-				(unsigned long) io_v2p(UDC_DATA_DMA),
++				UDC_DATA_DMA,
+ 				0, 0);
+ 		}
+ 	} else {
+@@ -804,7 +804,7 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel)
+ 			omap_set_dma_src_params(ep->lch,
+ 				OMAP_DMA_PORT_TIPB,
+ 				OMAP_DMA_AMODE_CONSTANT,
+-				(unsigned long) io_v2p(UDC_DATA_DMA),
++				UDC_DATA_DMA,
+ 				0, 0);
+ 			/* EMIFF or SDRC */
+ 			omap_set_dma_dest_burst_mode(ep->lch,
+diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
+index d9d53f2..8409e07 100644
+--- a/drivers/usb/host/ehci-hcd.c
++++ b/drivers/usb/host/ehci-hcd.c
+@@ -145,16 +145,6 @@ static int handshake (struct ehci_hcd *ehci, void __iomem *ptr,
+ 	return -ETIMEDOUT;
+ }
+ 
+-static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr,
+-				       u32 mask, u32 done, int usec)
+-{
+-	int error = handshake(ehci, ptr, mask, done, usec);
+-	if (error)
+-		ehci_to_hcd(ehci)->state = HC_STATE_HALT;
+-
+-	return error;
+-}
+-
+ /* force HC to halt state from unknown (EHCI spec section 2.3) */
+ static int ehci_halt (struct ehci_hcd *ehci)
+ {
+@@ -173,6 +163,22 @@ static int ehci_halt (struct ehci_hcd *ehci)
+ 			  STS_HALT, STS_HALT, 16 * 125);
+ }
+ 
++static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr,
++				       u32 mask, u32 done, int usec)
++{
++	int error;
++
++	error = handshake(ehci, ptr, mask, done, usec);
++	if (error) {
++		ehci_halt(ehci);
++		ehci_to_hcd(ehci)->state = HC_STATE_HALT;
++		ehci_err(ehci, "force halt; handhake %p %08x %08x -> %d\n",
++			ptr, mask, done, error);
++	}
++
++	return error;
++}
++
+ /* put TDI/ARC silicon into EHCI mode */
+ static void tdi_reset (struct ehci_hcd *ehci)
+ {
+diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
+index b7853c8..4a0c5a7 100644
+--- a/drivers/usb/host/ehci-sched.c
++++ b/drivers/usb/host/ehci-sched.c
+@@ -437,6 +437,9 @@ static int enable_periodic (struct ehci_hcd *ehci)
+ 	u32	cmd;
+ 	int	status;
+ 
++	if (ehci->periodic_sched++)
++		return 0;
++
+ 	/* did clearing PSE did take effect yet?
+ 	 * takes effect only at frame boundaries...
+ 	 */
+@@ -461,6 +464,9 @@ static int disable_periodic (struct ehci_hcd *ehci)
+ 	u32	cmd;
+ 	int	status;
+ 
++	if (--ehci->periodic_sched)
++		return 0;
++
+ 	/* did setting PSE not take effect yet?
+ 	 * takes effect only at frame boundaries...
+ 	 */
+@@ -544,13 +550,10 @@ static int qh_link_periodic (struct ehci_hcd *ehci, struct ehci_qh *qh)
+ 		: (qh->usecs * 8);
+ 
+ 	/* maybe enable periodic schedule processing */
+-	if (!ehci->periodic_sched++)
+-		return enable_periodic (ehci);
+-
+-	return 0;
++	return enable_periodic(ehci);
+ }
+ 
+-static void qh_unlink_periodic (struct ehci_hcd *ehci, struct ehci_qh *qh)
++static int qh_unlink_periodic(struct ehci_hcd *ehci, struct ehci_qh *qh)
+ {
+ 	unsigned	i;
+ 	unsigned	period;
+@@ -586,9 +589,7 @@ static void qh_unlink_periodic (struct ehci_hcd *ehci, struct ehci_qh *qh)
+ 	qh_put (qh);
+ 
+ 	/* maybe turn off periodic schedule */
+-	ehci->periodic_sched--;
+-	if (!ehci->periodic_sched)
+-		(void) disable_periodic (ehci);
++	return disable_periodic(ehci);
+ }
+ 
+ static void intr_deschedule (struct ehci_hcd *ehci, struct ehci_qh *qh)
+@@ -1562,9 +1563,7 @@ itd_link_urb (
+ 	urb->hcpriv = NULL;
+ 
+ 	timer_action (ehci, TIMER_IO_WATCHDOG);
+-	if (unlikely (!ehci->periodic_sched++))
+-		return enable_periodic (ehci);
+-	return 0;
++	return enable_periodic(ehci);
+ }
+ 
+ #define	ISO_ERRS (EHCI_ISOC_BUF_ERR | EHCI_ISOC_BABBLE | EHCI_ISOC_XACTERR)
+@@ -1642,7 +1641,7 @@ itd_complete (
+ 	ehci_urb_done(ehci, urb, 0);
+ 	retval = true;
+ 	urb = NULL;
+-	ehci->periodic_sched--;
++	(void) disable_periodic(ehci);
+ 	ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--;
+ 
+ 	if (unlikely (list_empty (&stream->td_list))) {
+@@ -1951,9 +1950,7 @@ sitd_link_urb (
+ 	urb->hcpriv = NULL;
+ 
+ 	timer_action (ehci, TIMER_IO_WATCHDOG);
+-	if (!ehci->periodic_sched++)
+-		return enable_periodic (ehci);
+-	return 0;
++	return enable_periodic(ehci);
+ }
+ 
+ /*-------------------------------------------------------------------------*/
+@@ -2019,7 +2016,7 @@ sitd_complete (
+ 	ehci_urb_done(ehci, urb, 0);
+ 	retval = true;
+ 	urb = NULL;
+-	ehci->periodic_sched--;
++	(void) disable_periodic(ehci);
+ 	ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--;
+ 
+ 	if (list_empty (&stream->td_list)) {
+@@ -2243,8 +2240,7 @@ restart:
+ 			if (unlikely (modified)) {
+ 				if (likely(ehci->periodic_sched > 0))
+ 					goto restart;
+-				/* maybe we can short-circuit this scan! */
+-				disable_periodic(ehci);
++				/* short-circuit this scan */
+ 				now_uframe = clock;
+ 				break;
+ 			}
+diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
+index a001748..58b2b8f 100644
+--- a/drivers/usb/musb/Kconfig
++++ b/drivers/usb/musb/Kconfig
+@@ -9,6 +9,7 @@ comment "Enable Host or Gadget support to see Inventra options"
+ # (M)HDRC = (Multipoint) Highspeed Dual-Role Controller
+ config USB_MUSB_HDRC
+ 	depends on (USB || USB_GADGET) && HAVE_CLK
++	depends on !SUPERH
+ 	select TWL4030_USB if MACH_OMAP_3430SDP
+ 	tristate 'Inventra Highspeed Dual Role Controller (TI, ...)'
+ 	help
+diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
+index c5b8f02..128e949 100644
+--- a/drivers/usb/musb/musb_core.c
++++ b/drivers/usb/musb/musb_core.c
+@@ -100,8 +100,8 @@
+ #include <linux/io.h>
+ 
+ #ifdef	CONFIG_ARM
+-#include <asm/arch/hardware.h>
+-#include <asm/arch/memory.h>
++#include <mach/hardware.h>
++#include <mach/memory.h>
+ #include <asm/mach-types.h>
+ #endif
+ 
+diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
+index 298b22e..9d2dcb1 100644
+--- a/drivers/usb/musb/omap2430.c
++++ b/drivers/usb/musb/omap2430.c
+@@ -35,8 +35,8 @@
+ #include <linux/io.h>
+ 
+ #include <asm/mach-types.h>
+-#include <asm/arch/hardware.h>
+-#include <asm/arch/mux.h>
++#include <mach/hardware.h>
++#include <mach/mux.h>
+ 
+ #include "musb_core.h"
+ #include "omap2430.h"
+diff --git a/drivers/usb/musb/omap2430.h b/drivers/usb/musb/omap2430.h
+index 786a620..dc76707 100644
+--- a/drivers/usb/musb/omap2430.h
++++ b/drivers/usb/musb/omap2430.h
+@@ -11,8 +11,8 @@
+ #define __MUSB_OMAP243X_H__
+ 
+ #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430)
+-#include <asm/arch/hardware.h>
+-#include <asm/arch/usb.h>
++#include <mach/hardware.h>
++#include <mach/usb.h>
+ 
+ /*
+  * OMAP2430-specific definitions
+diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
+index 442cba6..1279553 100644
+--- a/drivers/usb/serial/cp2101.c
++++ b/drivers/usb/serial/cp2101.c
+@@ -72,6 +72,7 @@ static struct usb_device_id id_table [] = {
+ 	{ USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */
+ 	{ USB_DEVICE(0x10C4, 0x80DD) }, /* Tracient RFID */
+ 	{ USB_DEVICE(0x10C4, 0x80F6) }, /* Suunto sports instrument */
++	{ USB_DEVICE(0x10C4, 0x8115) }, /* Arygon NFC/Mifare Reader */
+ 	{ USB_DEVICE(0x10C4, 0x813D) }, /* Burnside Telecom Deskmobile */
+ 	{ USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */
+ 	{ USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */
+@@ -83,6 +84,7 @@ static struct usb_device_id id_table [] = {
+ 	{ USB_DEVICE(0x10C4, 0x81E7) }, /* Aerocomm Radio */
+ 	{ USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */
+ 	{ USB_DEVICE(0x10c4, 0x8293) }, /* Telegesys ETRX2USB */
++	{ USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */
+ 	{ USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
+ 	{ USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
+ 	{ USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */
+@@ -93,6 +95,7 @@ static struct usb_device_id id_table [] = {
+ 	{ USB_DEVICE(0x13AD, 0x9999) }, /* Baltech card reader */
+ 	{ USB_DEVICE(0x166A, 0x0303) }, /* Clipsal 5500PCU C-Bus USB interface */
+ 	{ USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */
++	{ USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */
+ 	{ } /* Terminating Entry */
+ };
+ 
+diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
+index 984f6ef..3dc93b5 100644
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -654,6 +654,9 @@ static struct usb_device_id id_table_combined [] = {
+ 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+ 	{ USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_REU_TINY_PID) },
++	{ USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO4x4_PID) },
++	{ USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DGQG_PID) },
++	{ USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DUSB_PID) },
+ 	{ },					/* Optional parameter entry */
+ 	{ }					/* Terminating entry */
+ };
+diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
+index 382265b..8a5b6df 100644
+--- a/drivers/usb/serial/ftdi_sio.h
++++ b/drivers/usb/serial/ftdi_sio.h
+@@ -750,6 +750,7 @@
+ 
+ #define PAPOUCH_VID			0x5050	/* Vendor ID */
+ #define PAPOUCH_TMU_PID			0x0400	/* TMU USB Thermometer */
++#define PAPOUCH_QUIDO4x4_PID		0x0900	/* Quido 4/4 Module */
+ 
+ /*
+  * ACG Identification Technologies GmbH products (http://www.acg.de/).
+@@ -838,6 +839,10 @@
+ /* Rig Expert Ukraine devices */
+ #define FTDI_REU_TINY_PID		0xED22	/* RigExpert Tiny */
+ 
++/* Domintell products  http://www.domintell.com */
++#define FTDI_DOMINTELL_DGQG_PID	0xEF50	/* Master */
++#define FTDI_DOMINTELL_DUSB_PID	0xEF51	/* DUSB01 module */
++
+ /* Commands */
+ #define FTDI_SIO_RESET 		0 /* Reset the port */
+ #define FTDI_SIO_MODEM_CTRL 	1 /* Set the modem control register */
+diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
+index 9f9cd36..73f8277 100644
+--- a/drivers/usb/serial/option.c
++++ b/drivers/usb/serial/option.c
+@@ -218,6 +218,7 @@ static int  option_send_setup(struct tty_struct *tty, struct usb_serial_port *po
+ /* ZTE PRODUCTS */
+ #define ZTE_VENDOR_ID				0x19d2
+ #define ZTE_PRODUCT_MF628			0x0015
++#define ZTE_PRODUCT_CDMA_TECH			0xfffe
+ 
+ static struct usb_device_id option_ids[] = {
+ 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
+@@ -347,6 +348,7 @@ static struct usb_device_id option_ids[] = {
+ 	{ USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */
+ 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) },
+ 	{ USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) },
++	{ USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) },
+ 	{ } /* Terminating entry */
+ };
+ MODULE_DEVICE_TABLE(usb, option_ids);
+diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
+index 7060337..ea1a103 100644
+--- a/drivers/usb/serial/sierra.c
++++ b/drivers/usb/serial/sierra.c
+@@ -14,7 +14,7 @@
+   Whom based his on the Keyspan driver by Hugh Blemings <hugh at blemings.org>
+ */
+ 
+-#define DRIVER_VERSION "v.1.2.13a"
++#define DRIVER_VERSION "v.1.3.2"
+ #define DRIVER_AUTHOR "Kevin Lloyd <klloyd at sierrawireless.com>"
+ #define DRIVER_DESC "USB Driver for Sierra Wireless USB modems"
+ 
+@@ -30,9 +30,6 @@
+ 
+ #define SWIMS_USB_REQUEST_SetPower	0x00
+ #define SWIMS_USB_REQUEST_SetNmea	0x07
+-#define SWIMS_USB_REQUEST_SetMode	0x0B
+-#define SWIMS_USB_REQUEST_GetSwocInfo	0x0A
+-#define SWIMS_SET_MODE_Modem		0x0001
+ 
+ /* per port private data */
+ #define N_IN_URB	4
+@@ -163,7 +160,7 @@ static struct usb_device_id id_table [] = {
+ 	{ USB_DEVICE(0x1199, 0x0017) },	/* Sierra Wireless EM5625 */
+ 	{ USB_DEVICE(0x1199, 0x0018) },	/* Sierra Wireless MC5720 */
+ 	{ USB_DEVICE(0x1199, 0x0218) },	/* Sierra Wireless MC5720 */
+-	{ USB_DEVICE(0x0f30, 0x1b1d) },	/* Sierra Wireless MC5720 */
++	{ USB_DEVICE(0x03f0, 0x1b1d) }, /* HP ev2200 a.k.a MC5720 */
+ 	{ USB_DEVICE(0x1199, 0x0020) },	/* Sierra Wireless MC5725 */
+ 	{ USB_DEVICE(0x1199, 0x0024) },	/* Sierra Wireless MC5727 */
+ 	{ USB_DEVICE(0x1199, 0x0220) },	/* Sierra Wireless MC5725 */
+@@ -175,6 +172,8 @@ static struct usb_device_id id_table [] = {
+ 	 /* Sierra Wireless Device */
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x0025, 0xFF, 0xFF, 0xFF) },
+ 	{ USB_DEVICE(0x1199, 0x0026) }, /* Sierra Wireless Device */
++	{ USB_DEVICE(0x1199, 0x0027) }, /* Sierra Wireless Device */
++	{ USB_DEVICE(0x1199, 0x0028) }, /* Sierra Wireless Device */
+ 
+ 	{ USB_DEVICE(0x1199, 0x6802) },	/* Sierra Wireless MC8755 */
+ 	{ USB_DEVICE(0x1199, 0x6804) },	/* Sierra Wireless MC8755 */
+@@ -187,6 +186,7 @@ static struct usb_device_id id_table [] = {
+ 	{ USB_DEVICE(0x1199, 0x6821) },	/* Sierra Wireless AirCard 875U */
+ 	{ USB_DEVICE(0x1199, 0x6832) },	/* Sierra Wireless MC8780 */
+ 	{ USB_DEVICE(0x1199, 0x6833) },	/* Sierra Wireless MC8781 */
++	{ USB_DEVICE(0x1199, 0x683A) },	/* Sierra Wireless MC8785 */
+ 	{ USB_DEVICE(0x1199, 0x683B) },	/* Sierra Wireless MC8785 Composite */
+ 	{ USB_DEVICE(0x1199, 0x683C) },	/* Sierra Wireless MC8790 */
+ 	{ USB_DEVICE(0x1199, 0x683D) },	/* Sierra Wireless MC8790 */
+@@ -204,6 +204,8 @@ static struct usb_device_id id_table [] = {
+ 	/* Sierra Wireless Device */
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6890, 0xFF, 0xFF, 0xFF)},
+ 	/* Sierra Wireless Device */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6891, 0xFF, 0xFF, 0xFF)},
++	/* Sierra Wireless Device */
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6892, 0xFF, 0xFF, 0xFF)},
+ 
+ 	{ USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless AirCard 580 */
+diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
+index e39c779..9a3e495 100644
+--- a/drivers/usb/serial/ti_usb_3410_5052.c
++++ b/drivers/usb/serial/ti_usb_3410_5052.c
+@@ -1744,7 +1744,7 @@ static int ti_download_firmware(struct ti_device *tdev, int type)
+ 	if (buffer) {
+ 		memcpy(buffer, fw_p->data, fw_p->size);
+ 		memset(buffer + fw_p->size, 0xff, buffer_size - fw_p->size);
+-		ti_do_download(dev, pipe, buffer, fw_p->size);
++		status = ti_do_download(dev, pipe, buffer, fw_p->size);
+ 		kfree(buffer);
+ 	}
+ 	release_firmware(fw_p);
+diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
+index b157c48..4f7f9e3 100644
+--- a/drivers/usb/serial/usb-serial.c
++++ b/drivers/usb/serial/usb-serial.c
+@@ -733,7 +733,9 @@ int usb_serial_probe(struct usb_interface *interface,
+ 	    ((le16_to_cpu(dev->descriptor.idVendor) == ATEN_VENDOR_ID) &&
+ 	     (le16_to_cpu(dev->descriptor.idProduct) == ATEN_PRODUCT_ID)) ||
+ 	    ((le16_to_cpu(dev->descriptor.idVendor) == ALCOR_VENDOR_ID) &&
+-	     (le16_to_cpu(dev->descriptor.idProduct) == ALCOR_PRODUCT_ID))) {
++	     (le16_to_cpu(dev->descriptor.idProduct) == ALCOR_PRODUCT_ID)) ||
++	    ((le16_to_cpu(dev->descriptor.idVendor) == SIEMENS_VENDOR_ID) &&
++	     (le16_to_cpu(dev->descriptor.idProduct) == SIEMENS_PRODUCT_ID_EF81))) {
+ 		if (interface != dev->actconfig->interface[0]) {
+ 			/* check out the endpoints of the other interface*/
+ 			iface_desc = dev->actconfig->interface[0]->cur_altsetting;
+diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
+index c760346..3d92496 100644
+--- a/drivers/usb/storage/Kconfig
++++ b/drivers/usb/storage/Kconfig
+@@ -146,18 +146,6 @@ config USB_STORAGE_KARMA
+ 	  on the resulting scsi device node returns the Karma to normal
+ 	  operation.
+ 
+-config USB_STORAGE_SIERRA
+-	bool "Sierra Wireless TRU-Install Feature Support"
+-	depends on USB_STORAGE
+-	help
+-	  Say Y here to include additional code to support Sierra Wireless
+-	  products with the TRU-Install feature (e.g., AC597E, AC881U).
+-
+-	  This code switches the Sierra Wireless device from being in
+-	  Mass Storage mode to Modem mode. It also has the ability to
+-	  support host software upgrades should full Linux support be added
+-	  to TRU-Install.
+-
+ config USB_STORAGE_CYPRESS_ATACB
+ 	bool "SAT emulation on Cypress USB/ATA Bridge with ATACB"
+ 	depends on USB_STORAGE
+diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile
+index bc3415b..7f8beb5 100644
+--- a/drivers/usb/storage/Makefile
++++ b/drivers/usb/storage/Makefile
+@@ -21,11 +21,10 @@ usb-storage-obj-$(CONFIG_USB_STORAGE_JUMPSHOT)	+= jumpshot.o
+ usb-storage-obj-$(CONFIG_USB_STORAGE_ALAUDA)	+= alauda.o
+ usb-storage-obj-$(CONFIG_USB_STORAGE_ONETOUCH)	+= onetouch.o
+ usb-storage-obj-$(CONFIG_USB_STORAGE_KARMA)	+= karma.o
+-usb-storage-obj-$(CONFIG_USB_STORAGE_SIERRA)	+= sierra_ms.o
+ usb-storage-obj-$(CONFIG_USB_STORAGE_CYPRESS_ATACB) += cypress_atacb.o
+ 
+ usb-storage-objs :=	scsiglue.o protocol.o transport.o usb.o \
+-			initializers.o $(usb-storage-obj-y)
++			initializers.o sierra_ms.o $(usb-storage-obj-y)
+ 
+ ifneq ($(CONFIG_USB_LIBUSUAL),)
+ 	obj-$(CONFIG_USB)	+= libusual.o
+diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
+index ba412e6..cd15547 100644
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -160,6 +160,13 @@ UNUSUAL_DEV(  0x0421, 0x0019, 0x0592, 0x0592,
+ 		US_SC_DEVICE, US_PR_DEVICE, NULL,
+ 		US_FL_MAX_SECTORS_64 ),
+ 
++/* Reported by Filip Joelsson <filip at blueturtle.nu> */
++UNUSUAL_DEV(  0x0421, 0x005d, 0x0001, 0x0600,
++		"Nokia",
++		"Nokia 3110c",
++		US_SC_DEVICE, US_PR_DEVICE, NULL,
++		US_FL_FIX_CAPACITY ),
++
+ /* Reported by Mario Rettig <mariorettig at web.de> */
+ UNUSUAL_DEV(  0x0421, 0x042e, 0x0100, 0x0100,
+ 		"Nokia",
+@@ -232,6 +239,20 @@ UNUSUAL_DEV(  0x0421, 0x04b9, 0x0551, 0x0551,
+ 		US_SC_DEVICE, US_PR_DEVICE, NULL,
+ 		US_FL_FIX_CAPACITY ),
+ 
++/* Reported by Richard Nauber <RichardNauber at web.de> */
++UNUSUAL_DEV(  0x0421, 0x04fa, 0x0601, 0x0601,
++		"Nokia",
++		"6300",
++		US_SC_DEVICE, US_PR_DEVICE, NULL,
++		US_FL_FIX_CAPACITY ),
++
++/* Patch for Nokia 5310 capacity */
++UNUSUAL_DEV(  0x0421, 0x006a, 0x0000, 0x0591,
++	"Nokia",
++	"5310",
++	US_SC_DEVICE, US_PR_DEVICE, NULL,
++	US_FL_FIX_CAPACITY ),
++
+ /* Reported by Olaf Hering <olh at suse.de> from novell bug #105878 */
+ UNUSUAL_DEV(  0x0424, 0x0fdc, 0x0210, 0x0210,
+ 		"SMSC",
+@@ -987,6 +1008,13 @@ UNUSUAL_DEV(  0x069b, 0x3004, 0x0001, 0x0001,
+ 		US_SC_DEVICE, US_PR_DEVICE, NULL,
+ 		US_FL_FIX_CAPACITY ),
+ 
++/* Reported by Adrian Pilchowiec <adi1981 at epf.pl> */
++UNUSUAL_DEV(  0x071b, 0x3203, 0x0000, 0x0000,
++		"RockChip",
++		"MP3",
++		US_SC_DEVICE, US_PR_DEVICE, NULL,
++		US_FL_NO_WP_DETECT | US_FL_MAX_SECTORS_64),
++
+ /* Reported by Massimiliano Ghilardi <massimiliano.ghilardi at gmail.com>
+  * This USB MP3/AVI player device fails and disconnects if more than 128
+  * sectors (64kB) are read/written in a single command, and may be present
+@@ -1576,7 +1604,6 @@ UNUSUAL_DEV(  0x10d6, 0x2200, 0x0100, 0x0100,
+ 		US_SC_DEVICE, US_PR_DEVICE, NULL,
+ 		0),
+ 
+-#ifdef CONFIG_USB_STORAGE_SIERRA
+ /* Reported by Kevin Lloyd <linux at sierrawireless.com>
+  * Entry is needed for the initializer function override,
+  * which instructs the device to load as a modem
+@@ -1587,7 +1614,6 @@ UNUSUAL_DEV(  0x1199, 0x0fff, 0x0000, 0x9999,
+ 		"USB MMC Storage",
+ 		US_SC_DEVICE, US_PR_DEVICE, sierra_ms_init,
+ 		0),
+-#endif
+ 
+ /* Reported by Jaco Kroon <jaco at kroon.co.za>
+  * The usb-storage module found on the Digitech GNX4 (and supposedly other
+diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
+index 73679aa..27016fd 100644
+--- a/drivers/usb/storage/usb.c
++++ b/drivers/usb/storage/usb.c
+@@ -102,9 +102,7 @@
+ #ifdef CONFIG_USB_STORAGE_CYPRESS_ATACB
+ #include "cypress_atacb.h"
+ #endif
+-#ifdef CONFIG_USB_STORAGE_SIERRA
+ #include "sierra_ms.h"
+-#endif
+ 
+ /* Some informational data */
+ MODULE_AUTHOR("Matthew Dharm <mdharm-usb at one-eyed-alien.net>");
+diff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c
+index 614a5c7..6799a6d 100644
+--- a/drivers/watchdog/geodewdt.c
++++ b/drivers/watchdog/geodewdt.c
+@@ -130,8 +130,8 @@ static ssize_t geodewdt_write(struct file *file, const char __user *data,
+ 	return len;
+ }
+ 
+-static int geodewdt_ioctl(struct inode *inode, struct file *file,
+-				unsigned int cmd, unsigned long arg)
++static long geodewdt_ioctl(struct file *file, unsigned int cmd,
++				unsigned long arg)
+ {
+ 	void __user *argp = (void __user *)arg;
+ 	int __user *p = argp;
+@@ -198,7 +198,7 @@ static const struct file_operations geodewdt_fops = {
+ 	.owner          = THIS_MODULE,
+ 	.llseek         = no_llseek,
+ 	.write          = geodewdt_write,
+-	.ioctl          = geodewdt_ioctl,
++	.unlocked_ioctl = geodewdt_ioctl,
+ 	.open           = geodewdt_open,
+ 	.release        = geodewdt_release,
+ };
+diff --git a/drivers/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c
+index b82405c..89fcefc 100644
+--- a/drivers/watchdog/ibmasr.c
++++ b/drivers/watchdog/ibmasr.c
+@@ -85,7 +85,6 @@ static void __asr_toggle(void)
+ 
+ 	outb(reg & ~asr_toggle_mask, asr_write_addr);
+ 	reg = inb(asr_read_addr);
+-	spin_unlock(&asr_lock);
+ }
+ 
+ static void asr_toggle(void)
+diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
+index 0ed8416..6d9f3d4 100644
+--- a/drivers/watchdog/pnx4008_wdt.c
++++ b/drivers/watchdog/pnx4008_wdt.c
+@@ -173,8 +173,8 @@ static const struct watchdog_info ident = {
+ 	.identity = "PNX4008 Watchdog",
+ };
+ 
+-static long pnx4008_wdt_ioctl(struct inode *inode, struct file *file,
+-					unsigned int cmd, unsigned long arg)
++static long pnx4008_wdt_ioctl(struct file *file, unsigned int cmd,
++				unsigned long arg)
+ {
+ 	int ret = -ENOTTY;
+ 	int time;
+diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
+index 6756bcb..c9c73b6 100644
+--- a/drivers/watchdog/rc32434_wdt.c
++++ b/drivers/watchdog/rc32434_wdt.c
+@@ -182,8 +182,8 @@ static ssize_t rc32434_wdt_write(struct file *file, const char *data,
+ 	return 0;
+ }
+ 
+-static int rc32434_wdt_ioctl(struct inode *inode, struct file *file,
+-	unsigned int cmd, unsigned long arg)
++static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd,
++				unsigned long arg)
+ {
+ 	void __user *argp = (void __user *)arg;
+ 	int new_timeout;
+@@ -242,7 +242,7 @@ static struct file_operations rc32434_wdt_fops = {
+ 	.owner		= THIS_MODULE,
+ 	.llseek		= no_llseek,
+ 	.write		= rc32434_wdt_write,
+-	.ioctl		= rc32434_wdt_ioctl,
++	.unlocked_ioctl	= rc32434_wdt_ioctl,
+ 	.open		= rc32434_wdt_open,
+ 	.release	= rc32434_wdt_release,
+ };
+diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
+index 9108efa..bf92802 100644
+--- a/drivers/watchdog/rdc321x_wdt.c
++++ b/drivers/watchdog/rdc321x_wdt.c
+@@ -144,8 +144,8 @@ static int rdc321x_wdt_release(struct inode *inode, struct file *file)
+ 	return 0;
+ }
+ 
+-static int rdc321x_wdt_ioctl(struct inode *inode, struct file *file,
+-				unsigned int cmd, unsigned long arg)
++static long rdc321x_wdt_ioctl(struct file *file, unsigned int cmd,
++				unsigned long arg)
+ {
+ 	void __user *argp = (void __user *)arg;
+ 	unsigned int value;
+@@ -204,7 +204,7 @@ static ssize_t rdc321x_wdt_write(struct file *file, const char __user *buf,
+ static const struct file_operations rdc321x_wdt_fops = {
+ 	.owner		= THIS_MODULE,
+ 	.llseek		= no_llseek,
+-	.ioctl		= rdc321x_wdt_ioctl,
++	.unlocked_ioctl	= rdc321x_wdt_ioctl,
+ 	.open		= rdc321x_wdt_open,
+ 	.write		= rdc321x_wdt_write,
+ 	.release	= rdc321x_wdt_release,
+diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c
+index db362c3..191ea63 100644
+--- a/drivers/watchdog/wdt285.c
++++ b/drivers/watchdog/wdt285.c
+@@ -115,8 +115,8 @@ static int watchdog_release(struct inode *inode, struct file *file)
+ 	return 0;
+ }
+ 
+-static ssize_t watchdog_write(struct file *file, const char *data,
+-						size_t len, loff_t *ppos)
++static ssize_t watchdog_write(struct file *file, const char __user *data,
++			      size_t len, loff_t *ppos)
+ {
+ 	/*
+ 	 *	Refresh the timer.
+@@ -133,21 +133,22 @@ static const struct watchdog_info ident = {
+ };
+ 
+ static long watchdog_ioctl(struct file *file, unsigned int cmd,
+-							unsigned long arg)
++			   unsigned long arg)
+ {
+ 	unsigned int new_margin;
++	int __user *int_arg = (int __user *)arg;
+ 	int ret = -ENOTTY;
+ 
+ 	switch (cmd) {
+ 	case WDIOC_GETSUPPORT:
+ 		ret = 0;
+-		if (copy_to_user((void *)arg, &ident, sizeof(ident)))
++		if (copy_to_user((void __user *)arg, &ident, sizeof(ident)))
+ 			ret = -EFAULT;
+ 		break;
+ 
+ 	case WDIOC_GETSTATUS:
+ 	case WDIOC_GETBOOTSTATUS:
+-		ret = put_user(0, (int *)arg);
++		ret = put_user(0, int_arg);
+ 		break;
+ 
+ 	case WDIOC_KEEPALIVE:
+@@ -156,7 +157,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
+ 		break;
+ 
+ 	case WDIOC_SETTIMEOUT:
+-		ret = get_user(new_margin, (int *)arg);
++		ret = get_user(new_margin, int_arg);
+ 		if (ret)
+ 			break;
+ 
+@@ -171,7 +172,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
+ 		watchdog_ping();
+ 		/* Fall */
+ 	case WDIOC_GETTIMEOUT:
+-		ret = put_user(soft_margin, (int *)arg);
++		ret = put_user(soft_margin, int_arg);
+ 		break;
+ 	}
+ 	return ret;
+diff --git a/include/asm-x86/acpi.h b/include/asm-x86/acpi.h
+index 635d764..35d1743 100644
+--- a/include/asm-x86/acpi.h
++++ b/include/asm-x86/acpi.h
+@@ -140,6 +140,8 @@ static inline unsigned int acpi_processor_cstate_check(unsigned int max_cstate)
+ 	    boot_cpu_data.x86_model <= 0x05 &&
+ 	    boot_cpu_data.x86_mask < 0x0A)
+ 		return 1;
++	else if (boot_cpu_has(X86_FEATURE_AMDC1E))
++		return 1;
+ 	else
+ 		return max_cstate;
+ }
+diff --git a/include/asm-x86/cpufeature.h b/include/asm-x86/cpufeature.h
+index 9489283..cfcfb0a 100644
+--- a/include/asm-x86/cpufeature.h
++++ b/include/asm-x86/cpufeature.h
+@@ -81,6 +81,7 @@
+ #define X86_FEATURE_LFENCE_RDTSC (3*32+18) /* Lfence synchronizes RDTSC */
+ #define X86_FEATURE_11AP	(3*32+19) /* Bad local APIC aka 11AP */
+ #define X86_FEATURE_NOPL	(3*32+20) /* The NOPL (0F 1F) instructions */
++#define X86_FEATURE_AMDC1E	(3*32+21) /* AMD C1E detected */
+ 
+ /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */
+ #define X86_FEATURE_XMM3	(4*32+ 0) /* Streaming SIMD Extensions-3 */
+diff --git a/include/asm-x86/idle.h b/include/asm-x86/idle.h
+index d240e5b..cbb6491 100644
+--- a/include/asm-x86/idle.h
++++ b/include/asm-x86/idle.h
+@@ -10,4 +10,6 @@ void idle_notifier_register(struct notifier_block *n);
+ void enter_idle(void);
+ void exit_idle(void);
+ 
++void c1e_remove_cpu(int cpu);
++
+ #endif
+diff --git a/include/linux/pci.h b/include/linux/pci.h
+index c0e1400..98dc624 100644
+--- a/include/linux/pci.h
++++ b/include/linux/pci.h
+@@ -534,7 +534,7 @@ extern void pci_sort_breadthfirst(void);
+ #ifdef CONFIG_PCI_LEGACY
+ struct pci_dev __deprecated *pci_find_device(unsigned int vendor,
+ 					     unsigned int device,
+-					     const struct pci_dev *from);
++					     struct pci_dev *from);
+ struct pci_dev __deprecated *pci_find_slot(unsigned int bus,
+ 					   unsigned int devfn);
+ #endif /* CONFIG_PCI_LEGACY */
+@@ -550,7 +550,7 @@ struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device,
+ 				struct pci_dev *from);
+ struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device,
+ 				unsigned int ss_vendor, unsigned int ss_device,
+-				const struct pci_dev *from);
++				struct pci_dev *from);
+ struct pci_dev *pci_get_slot(struct pci_bus *bus, unsigned int devfn);
+ struct pci_dev *pci_get_bus_and_slot(unsigned int bus, unsigned int devfn);
+ struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *from);
+@@ -816,7 +816,7 @@ _PCI_NOP_ALL(write,)
+ 
+ static inline struct pci_dev *pci_find_device(unsigned int vendor,
+ 					      unsigned int device,
+-					      const struct pci_dev *from)
++					      struct pci_dev *from)
+ {
+ 	return NULL;
+ }
+@@ -838,7 +838,7 @@ static inline struct pci_dev *pci_get_subsys(unsigned int vendor,
+ 					     unsigned int device,
+ 					     unsigned int ss_vendor,
+ 					     unsigned int ss_device,
+-					     const struct pci_dev *from)
++					     struct pci_dev *from)
+ {
+ 	return NULL;
+ }
+diff --git a/include/linux/smb.h b/include/linux/smb.h
+index caa43b2..82fefdd 100644
+--- a/include/linux/smb.h
++++ b/include/linux/smb.h
+@@ -11,7 +11,9 @@
+ 
+ #include <linux/types.h>
+ #include <linux/magic.h>
++#ifdef __KERNEL__
+ #include <linux/time.h>
++#endif
+ 
+ enum smb_protocol { 
+ 	SMB_PROTOCOL_NONE, 
+diff --git a/kernel/kexec.c b/kernel/kexec.c
+index 59f3f0d..aef2653 100644
+--- a/kernel/kexec.c
++++ b/kernel/kexec.c
+@@ -753,8 +753,14 @@ static struct page *kimage_alloc_page(struct kimage *image,
+ 			*old = addr | (*old & ~PAGE_MASK);
+ 
+ 			/* The old page I have found cannot be a
+-			 * destination page, so return it.
++			 * destination page, so return it if it's
++			 * gfp_flags honor the ones passed in.
+ 			 */
++			if (!(gfp_mask & __GFP_HIGHMEM) &&
++			    PageHighMem(old_page)) {
++				kimage_free_pages(old_page);
++				continue;
++			}
+ 			addr = old_addr;
+ 			page = old_page;
+ 			break;
+diff --git a/kernel/sched.c b/kernel/sched.c
+index 9889080..13dd2db 100644
+--- a/kernel/sched.c
++++ b/kernel/sched.c
+@@ -1087,7 +1087,7 @@ hotplug_hrtick(struct notifier_block *nfb, unsigned long action, void *hcpu)
+ 	return NOTIFY_DONE;
+ }
+ 
+-static void init_hrtick(void)
++static __init void init_hrtick(void)
+ {
+ 	hotcpu_notifier(hotplug_hrtick, 0);
+ }
+diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
+index f1f3eee..bd70345 100644
+--- a/kernel/time/tick-broadcast.c
++++ b/kernel/time/tick-broadcast.c
+@@ -235,7 +235,7 @@ static void tick_do_broadcast_on_off(void *why)
+ 	case CLOCK_EVT_NOTIFY_BROADCAST_FORCE:
+ 		if (!cpu_isset(cpu, tick_broadcast_mask)) {
+ 			cpu_set(cpu, tick_broadcast_mask);
+-			if (td->mode == TICKDEV_MODE_PERIODIC)
++			if (bc->mode == TICKDEV_MODE_PERIODIC)
+ 				clockevents_shutdown(dev);
+ 		}
+ 		if (*reason == CLOCK_EVT_NOTIFY_BROADCAST_FORCE)
+@@ -245,7 +245,7 @@ static void tick_do_broadcast_on_off(void *why)
+ 		if (!tick_broadcast_force &&
+ 		    cpu_isset(cpu, tick_broadcast_mask)) {
+ 			cpu_clear(cpu, tick_broadcast_mask);
+-			if (td->mode == TICKDEV_MODE_PERIODIC)
++			if (bc->mode == TICKDEV_MODE_PERIODIC)
+ 				tick_setup_periodic(dev, 0);
+ 		}
+ 		break;
+@@ -575,4 +575,12 @@ void tick_shutdown_broadcast_oneshot(unsigned int *cpup)
+ 	spin_unlock_irqrestore(&tick_broadcast_lock, flags);
+ }
+ 
++/*
++ * Check, whether the broadcast device is in one shot mode
++ */
++int tick_broadcast_oneshot_active(void)
++{
++	return tick_broadcast_device.mode == TICKDEV_MODE_ONESHOT;
++}
++
+ #endif
+diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
+index 019315e..df12434 100644
+--- a/kernel/time/tick-common.c
++++ b/kernel/time/tick-common.c
+@@ -33,7 +33,7 @@ DEFINE_PER_CPU(struct tick_device, tick_cpu_device);
+  */
+ ktime_t tick_next_period;
+ ktime_t tick_period;
+-int tick_do_timer_cpu __read_mostly = -1;
++int tick_do_timer_cpu __read_mostly = TICK_DO_TIMER_BOOT;
+ DEFINE_SPINLOCK(tick_device_lock);
+ 
+ /*
+@@ -109,7 +109,8 @@ void tick_setup_periodic(struct clock_event_device *dev, int broadcast)
+ 	if (!tick_device_is_functional(dev))
+ 		return;
+ 
+-	if (dev->features & CLOCK_EVT_FEAT_PERIODIC) {
++	if ((dev->features & CLOCK_EVT_FEAT_PERIODIC) &&
++	    !tick_broadcast_oneshot_active()) {
+ 		clockevents_set_mode(dev, CLOCK_EVT_MODE_PERIODIC);
+ 	} else {
+ 		unsigned long seq;
+@@ -148,7 +149,7 @@ static void tick_setup_device(struct tick_device *td,
+ 		 * If no cpu took the do_timer update, assign it to
+ 		 * this cpu:
+ 		 */
+-		if (tick_do_timer_cpu == -1) {
++		if (tick_do_timer_cpu == TICK_DO_TIMER_BOOT) {
+ 			tick_do_timer_cpu = cpu;
+ 			tick_next_period = ktime_get();
+ 			tick_period = ktime_set(0, NSEC_PER_SEC / HZ);
+@@ -300,7 +301,8 @@ static void tick_shutdown(unsigned int *cpup)
+ 	if (*cpup == tick_do_timer_cpu) {
+ 		int cpu = first_cpu(cpu_online_map);
+ 
+-		tick_do_timer_cpu = (cpu != NR_CPUS) ? cpu : -1;
++		tick_do_timer_cpu = (cpu != NR_CPUS) ? cpu :
++			TICK_DO_TIMER_NONE;
+ 	}
+ 	spin_unlock_irqrestore(&tick_device_lock, flags);
+ }
+diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h
+index 6e9db97..4692487 100644
+--- a/kernel/time/tick-internal.h
++++ b/kernel/time/tick-internal.h
+@@ -1,6 +1,10 @@
+ /*
+  * tick internal variable and functions used by low/high res code
+  */
++
++#define TICK_DO_TIMER_NONE	-1
++#define TICK_DO_TIMER_BOOT	-2
++
+ DECLARE_PER_CPU(struct tick_device, tick_cpu_device);
+ extern spinlock_t tick_device_lock;
+ extern ktime_t tick_next_period;
+@@ -31,6 +35,7 @@ extern void tick_broadcast_oneshot_control(unsigned long reason);
+ extern void tick_broadcast_switch_to_oneshot(void);
+ extern void tick_shutdown_broadcast_oneshot(unsigned int *cpup);
+ extern int tick_resume_broadcast_oneshot(struct clock_event_device *bc);
++extern int tick_broadcast_oneshot_active(void);
+ # else /* BROADCAST */
+ static inline void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
+ {
+@@ -39,6 +44,7 @@ static inline void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
+ static inline void tick_broadcast_oneshot_control(unsigned long reason) { }
+ static inline void tick_broadcast_switch_to_oneshot(void) { }
+ static inline void tick_shutdown_broadcast_oneshot(unsigned int *cpup) { }
++static inline int tick_broadcast_oneshot_active(void) { return 0; }
+ # endif /* !BROADCAST */
+ 
+ #else /* !ONESHOT */
+@@ -68,6 +74,7 @@ static inline int tick_resume_broadcast_oneshot(struct clock_event_device *bc)
+ {
+ 	return 0;
+ }
++static inline int tick_broadcast_oneshot_active(void) { return 0; }
+ #endif /* !TICK_ONESHOT */
+ 
+ /*
+diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
+index a87b046..39019b3 100644
+--- a/kernel/time/tick-sched.c
++++ b/kernel/time/tick-sched.c
+@@ -75,6 +75,9 @@ static void tick_do_update_jiffies64(ktime_t now)
+ 							   incr * ticks);
+ 		}
+ 		do_timer(++ticks);
++
++		/* Keep the tick_next_period variable up to date */
++		tick_next_period = ktime_add(last_jiffies_update, tick_period);
+ 	}
+ 	write_sequnlock(&xtime_lock);
+ }
+@@ -221,7 +224,7 @@ void tick_nohz_stop_sched_tick(int inidle)
+ 	 */
+ 	if (unlikely(!cpu_online(cpu))) {
+ 		if (cpu == tick_do_timer_cpu)
+-			tick_do_timer_cpu = -1;
++			tick_do_timer_cpu = TICK_DO_TIMER_NONE;
+ 	}
+ 
+ 	if (unlikely(ts->nohz_mode == NOHZ_MODE_INACTIVE))
+@@ -303,7 +306,7 @@ void tick_nohz_stop_sched_tick(int inidle)
+ 		 * invoked.
+ 		 */
+ 		if (cpu == tick_do_timer_cpu)
+-			tick_do_timer_cpu = -1;
++			tick_do_timer_cpu = TICK_DO_TIMER_NONE;
+ 
+ 		ts->idle_sleeps++;
+ 
+@@ -468,7 +471,7 @@ static void tick_nohz_handler(struct clock_event_device *dev)
+ 	 * this duty, then the jiffies update is still serialized by
+ 	 * xtime_lock.
+ 	 */
+-	if (unlikely(tick_do_timer_cpu == -1))
++	if (unlikely(tick_do_timer_cpu == TICK_DO_TIMER_NONE))
+ 		tick_do_timer_cpu = cpu;
+ 
+ 	/* Check, if the jiffies need an update */
+@@ -570,7 +573,7 @@ static enum hrtimer_restart tick_sched_timer(struct hrtimer *timer)
+ 	 * this duty, then the jiffies update is still serialized by
+ 	 * xtime_lock.
+ 	 */
+-	if (unlikely(tick_do_timer_cpu == -1))
++	if (unlikely(tick_do_timer_cpu == TICK_DO_TIMER_NONE))
+ 		tick_do_timer_cpu = cpu;
+ #endif
+ 
+diff --git a/mm/memcontrol.c b/mm/memcontrol.c
+index 0f1f7a7..c0500e4 100644
+--- a/mm/memcontrol.c
++++ b/mm/memcontrol.c
+@@ -806,6 +806,7 @@ int mem_cgroup_shrink_usage(struct mm_struct *mm, gfp_t gfp_mask)
+ 
+ 	do {
+ 		progress = try_to_free_mem_cgroup_pages(mem, gfp_mask);
++		progress += res_counter_check_under_limit(&mem->res);
+ 	} while (!progress && --retry);
+ 
+ 	css_put(&mem->css);
+diff --git a/mm/tiny-shmem.c b/mm/tiny-shmem.c
+index ae532f5..d17cb6f 100644
+--- a/mm/tiny-shmem.c
++++ b/mm/tiny-shmem.c
+@@ -65,31 +65,25 @@ struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags)
+ 	if (!dentry)
+ 		goto put_memory;
+ 
+-	error = -ENOSPC;
+-	inode = ramfs_get_inode(root->d_sb, S_IFREG | S_IRWXUGO, 0);
+-	if (!inode)
+-		goto put_dentry;
+-
+-	d_instantiate(dentry, inode);
+ 	error = -ENFILE;
+-	file = alloc_file(shm_mnt, dentry, FMODE_WRITE | FMODE_READ,
+-			&ramfs_file_operations);
++	file = get_empty_filp();
+ 	if (!file)
+ 		goto put_dentry;
+ 
+-	inode->i_nlink = 0;	/* It is unlinked */
+-
+-	/* notify everyone as to the change of file size */
+-	error = do_truncate(dentry, size, 0, file);
+-	if (error < 0)
++	error = -ENOSPC;
++	inode = ramfs_get_inode(root->d_sb, S_IFREG | S_IRWXUGO, 0);
++	if (!inode)
+ 		goto close_file;
+ 
++	d_instantiate(dentry, inode);
++	inode->i_size = size;
++	inode->i_nlink = 0;	/* It is unlinked */
++	init_file(file, shm_mnt, dentry, FMODE_WRITE | FMODE_READ,
++			&ramfs_file_operations);
+ 	return file;
+ 
+ close_file:
+ 	put_filp(file);
+-	return ERR_PTR(error);
+-
+ put_dentry:
+ 	dput(dentry);
+ put_memory:
+diff --git a/net/socket.c b/net/socket.c
+index 8ef8ba8..3e8d4e3 100644
+--- a/net/socket.c
++++ b/net/socket.c
+@@ -1511,6 +1511,7 @@ out_fd:
+ 	goto out_put;
+ }
+ 
++#if 0
+ #ifdef HAVE_SET_RESTORE_SIGMASK
+ asmlinkage long sys_paccept(int fd, struct sockaddr __user *upeer_sockaddr,
+ 			    int __user *upeer_addrlen,
+@@ -1564,6 +1565,7 @@ asmlinkage long sys_paccept(int fd, struct sockaddr __user *upeer_sockaddr,
+ 	return do_accept(fd, upeer_sockaddr, upeer_addrlen, flags);
+ }
+ #endif
++#endif
+ 
+ asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr,
+ 			   int __user *upeer_addrlen)
+diff --git a/scripts/kernel-doc b/scripts/kernel-doc
+index ff787e6..44ee94d 100755
+--- a/scripts/kernel-doc
++++ b/scripts/kernel-doc
+@@ -781,6 +781,7 @@ sub output_struct_xml(%) {
+     print " <refsect1>\n";
+     print "  <title>Members</title>\n";
+ 
++    if ($#{$args{'parameterlist'}} >= 0) {
+     print "  <variablelist>\n";
+     foreach $parameter (@{$args{'parameterlist'}}) {
+       ($parameter =~ /^#/) && next;
+@@ -798,6 +799,9 @@ sub output_struct_xml(%) {
+       print "    </varlistentry>\n";
+     }
+     print "  </variablelist>\n";
++    } else {
++	print " <para>\n  None\n </para>\n";
++    }
+     print " </refsect1>\n";
+ 
+     output_section_xml(@_);
+diff --git a/sound/soc/at32/at32-pcm.c b/sound/soc/at32/at32-pcm.c
+index 435f1da..c83584f 100644
+--- a/sound/soc/at32/at32-pcm.c
++++ b/sound/soc/at32/at32-pcm.c
+@@ -434,7 +434,8 @@ static int at32_pcm_suspend(struct platform_device *pdev,
+ 	params = prtd->params;
+ 
+ 	/* Disable the PDC and save the PDC registers */
+-	ssc_writex(params->ssc->regs, PDC_PTCR, params->mask->pdc_disable);
++	ssc_writex(params->ssc->regs, ATMEL_PDC_PTCR,
++		   params->mask->pdc_disable);
+ 
+ 	prtd->pdc_xpr_save = ssc_readx(params->ssc->regs, params->pdc->xpr);
+ 	prtd->pdc_xcr_save = ssc_readx(params->ssc->regs, params->pdc->xcr);
+@@ -464,7 +465,7 @@ static int at32_pcm_resume(struct platform_device *pdev,
+ 	ssc_writex(params->ssc->regs, params->pdc->xnpr, prtd->pdc_xnpr_save);
+ 	ssc_writex(params->ssc->regs, params->pdc->xncr, prtd->pdc_xncr_save);
+ 
+-	ssc_writex(params->ssc->regs, PDC_PTCR, params->mask->pdc_enable);
++	ssc_writex(params->ssc->regs, ATMEL_PDC_PTCR, params->mask->pdc_enable);
+ 	return 0;
+ }
+ #else /* CONFIG_PM */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.973
retrieving revision 1.974
diff -u -r1.973 -r1.974
--- kernel.spec	23 Sep 2008 23:01:39 -0000	1.973
+++ kernel.spec	24 Sep 2008 00:54:44 -0000	1.974
@@ -634,8 +634,6 @@
 Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch
 # Fix HID usage descriptor on MS wireless desktop receiver
 Patch2301: linux-2.6-ms-wireless-receiver.patch
-# fix hang on boot on PS3
-Patch2302: linux-2.6-usb-fix-hcd-interrupt-disabling.patch
 
 # get rid of imacfb and make efifb work everywhere it was used
 Patch2600: linux-2.6-merge-efifb-imacfb.patch
@@ -980,7 +978,7 @@
   done
 %endif
 
-#ApplyPatch git-linus.diff
+ApplyPatch git-linus.diff
 
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
 # also gives a list of missing options at the end. Useful for automated
@@ -1055,7 +1053,6 @@
 
 # USB
 ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch
-ApplyPatch linux-2.6-usb-fix-hcd-interrupt-disabling.patch
 
 # ACPI
 
@@ -1759,6 +1756,9 @@
 
 %changelog
 * Tue Sep 23 2008 Dave Jones <davej at redhat.com>
+- Merge Linux-2.6 up to commit fb478da5ba69ecf40729ae8ab37ca406b1e5be48
+
+* Tue Sep 23 2008 Dave Jones <davej at redhat.com>
 - Disable E1000E driver until bz 459202 is solved.
 
 * Tue Sep 23 2008 Dave Airlie <airlied at redhat.com>


--- linux-2.6-usb-fix-hcd-interrupt-disabling.patch DELETED ---



From davej at fedoraproject.org  Wed Sep 24 01:03:51 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Wed, 24 Sep 2008 01:03:51 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.175,1.176
Message-ID: <20080924010351.8D32C70103@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25164

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
compile fix

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- linux-2.6-compile-fixes.patch	1 Aug 2008 19:55:06 -0000	1.175
+++ linux-2.6-compile-fixes.patch	24 Sep 2008 01:03:50 -0000	1.176
@@ -5,3 +5,18 @@
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
 
+arch/x86/kernel/process_32.c: In function 'cpu_exit_clear':
+arch/x86/kernel/process_32.c:91: error: implicit declaration of function 'c1e_remove_cpu'
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+
+--- linux-2.6.26.noarch/arch/x86/kernel/process_32.c~	2008-09-23 21:02:13.000000000 -0400
++++ linux-2.6.26.noarch/arch/x86/kernel/process_32.c	2008-09-23 21:02:34.000000000 -0400
+@@ -55,6 +55,7 @@
+ #include <asm/tlbflush.h>
+ #include <asm/cpu.h>
+ #include <asm/kdebug.h>
++#include <asm/idle.h>
+ 
+ asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
+ 



From davej at fedoraproject.org  Wed Sep 24 01:05:27 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Wed, 24 Sep 2008 01:05:27 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.974,1.975
Message-ID: <20080924010527.7DD9070103@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25377

Modified Files:
	kernel.spec 
Log Message:
x86 compile fix.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.974
retrieving revision 1.975
diff -u -r1.974 -r1.975
--- kernel.spec	24 Sep 2008 00:54:44 -0000	1.974
+++ kernel.spec	24 Sep 2008 01:04:57 -0000	1.975
@@ -1756,6 +1756,9 @@
 
 %changelog
 * Tue Sep 23 2008 Dave Jones <davej at redhat.com>
+- x86 compile fix.
+
+* Tue Sep 23 2008 Dave Jones <davej at redhat.com>
 - Merge Linux-2.6 up to commit fb478da5ba69ecf40729ae8ab37ca406b1e5be48
 
 * Tue Sep 23 2008 Dave Jones <davej at redhat.com>



From hadess at fedoraproject.org  Wed Sep 24 01:06:42 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 24 Sep 2008 01:06:42 +0000 (UTC)
Subject: rpms/bluez-gnome/devel
	0001-Fix-getting-names-of-remote-devices.patch, 
	NONE, 1.1 bluetooth-sendto-ods-svn.patch, NONE,
	1.1 bluez-gnome.spec, 1.57, 1.58
Message-ID: <20080924010642.D28A370103@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25607

Modified Files:
	bluez-gnome.spec 
Added Files:
	0001-Fix-getting-names-of-remote-devices.patch 
	bluetooth-sendto-ods-svn.patch 
Log Message:
* Tue Sep 23 2008 - Bastien Nocera <bnocera at redhat.com> - 1.4-4
- Update bluetooth-sendto to the BlueZ 4.x API, and obex-data-server
  SVN APIs


0001-Fix-getting-names-of-remote-devices.patch:

--- NEW FILE 0001-Fix-getting-names-of-remote-devices.patch ---
>From 71bd2202a5407af206f2476de20e379d8bbea264 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 23 Sep 2008 17:53:49 -0700
Subject: [PATCH] Fix getting names of remote devices

Look in the BlueZ device database to find the name of the
remote device, porting code from BlueZ 3.x to the 4.x APIs
---
 sendto/main.c |   80 +++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/sendto/main.c b/sendto/main.c
index daccf91..044bbbc 100644
--- a/sendto/main.c
+++ b/sendto/main.c
@@ -415,52 +415,76 @@ static void create_notify(DBusGProxy *proxy,
 							G_TYPE_INVALID);
 }
 
+static char *
+get_name (DBusGProxy *device)
+{
+	GHashTable *hash;
+
+	if (dbus_g_proxy_call(device, "GetProperties", NULL,
+			      G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE),
+			      &hash, G_TYPE_INVALID) != FALSE) {
+		GValue *value;
+		char *name;
+
+		value = g_hash_table_lookup(hash, "Name");
+		name = value ? g_value_dup_string(value) : NULL;
+		g_hash_table_destroy(hash);
+		return name;
+	}
+
+	return NULL;
+}
+
 static gchar *get_device_name(const gchar *address)
 {
 	DBusGConnection *connection;
-	DBusGProxy *manager, *proxy;
-	gchar *adapter, *name;
+	DBusGProxy *manager;
+	GPtrArray *adapters;
+	gchar *name;
+	guint i;
+
+	name = NULL;
 
 	connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL);
 	if (connection == NULL)
-		return NULL;
+		return name;
 
 	manager = dbus_g_proxy_new_for_name(connection, "org.bluez",
-					"/org/bluez", "org.bluez.Manager");
+					    "/", "org.bluez.Manager");
 	if (manager == NULL) {
 		dbus_g_connection_unref(connection);
-		return NULL;
+		return name;
 	}
 
-	if (dbus_g_proxy_call(manager, "DefaultAdapter", NULL, G_TYPE_INVALID,
-			G_TYPE_STRING, &adapter, G_TYPE_INVALID) == FALSE) {
+	if (dbus_g_proxy_call(manager, "ListAdapters", NULL,
+			      G_TYPE_INVALID, dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &adapters,
+			      G_TYPE_INVALID) == FALSE) {
 		g_object_unref(manager);
 		dbus_g_connection_unref(connection);
-		return NULL;
+		return name;
 	}
 
-	g_object_unref(manager);
-
-	proxy = dbus_g_proxy_new_for_name(connection, "org.bluez",
-						adapter, "org.bluez.Adapter");
-	if (proxy == NULL) {
-		g_free(adapter);
-		dbus_g_connection_unref(connection);
-		return NULL;
-	}
-
-	g_free(adapter);
-
-	if (dbus_g_proxy_call(proxy, "GetRemoteName", NULL,
-			G_TYPE_STRING, address, G_TYPE_INVALID,
-			G_TYPE_STRING, &name, G_TYPE_INVALID) == FALSE) {
-		g_object_unref(proxy);
-		dbus_g_connection_unref(connection);
-		return NULL;
+	for (i = 0; i < adapters->len && name == NULL; i++)
+	{
+		DBusGProxy *adapter;
+		char *device_path;
+
+		adapter = dbus_g_proxy_new_for_name(connection, "org.bluez",
+						    g_ptr_array_index (adapters, i), "org.bluez.Adapter");
+		if (dbus_g_proxy_call(adapter, "FindDevice", NULL,
+				      G_TYPE_STRING, address, G_TYPE_INVALID,
+				      DBUS_TYPE_G_OBJECT_PATH, &device_path, G_TYPE_INVALID) != FALSE) {
+			DBusGProxy *device;
+			device = dbus_g_proxy_new_for_name(connection, "org.bluez", device_path, "org.bluez.Device");
+			name = get_name(device);
+			g_object_unref(device);
+			break;
+		}
+		g_object_unref(adapter);
 	}
 
-	g_object_unref(proxy);
-
+	g_ptr_array_free(adapters, TRUE);
+	g_object_unref(manager);
 	dbus_g_connection_unref(connection);
 
 	return name;
-- 
1.6.0.1


bluetooth-sendto-ods-svn.patch:

--- NEW FILE bluetooth-sendto-ods-svn.patch ---
diff --git a/sendto/main.c b/sendto/main.c
index 044bbbc..f0c435b 100644
--- a/sendto/main.c
+++ b/sendto/main.c
@@ -619,6 +619,7 @@ int main(int argc, char *argv[])
 	dbus_g_proxy_begin_call(proxy, "CreateBluetoothSession",
 				create_notify, NULL, NULL,
 				G_TYPE_STRING, option_device,
+				G_TYPE_STRING, "00:00:00:00:00:00",
 				G_TYPE_STRING, "opp", G_TYPE_INVALID);
 
 	gtk_main();


Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- bluez-gnome.spec	14 Sep 2008 21:07:30 -0000	1.57
+++ bluez-gnome.spec	24 Sep 2008 01:06:12 -0000	1.58
@@ -1,6 +1,6 @@
 Name:		bluez-gnome
 Version:	1.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
@@ -8,6 +8,9 @@
 URL:		http://www.bluez.org/
 Source0:	http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
 
+Patch0:		0001-Fix-getting-names-of-remote-devices.patch
+Patch1:		bluetooth-sendto-ods-svn.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExcludeArch:	s390 s390x
@@ -44,6 +47,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .bluez4
+%patch1 -p1 -b .ods-svn
 
 %build
 %configure --disable-mime-update --disable-desktop-update --disable-icon-update
@@ -136,6 +141,10 @@
 %{_mandir}/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Tue Sep 23 2008 - Bastien Nocera <bnocera at redhat.com> - 1.4-4
+- Update bluetooth-sendto to the BlueZ 4.x API, and obex-data-server
+  SVN APIs
+
 * Sun Sep 14 2008 - David Woodhouse <David.Woodhouse at intel.com>
 - Tidy up specfile, fix source URL
 



From hadess at fedoraproject.org  Wed Sep 24 01:10:42 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 24 Sep 2008 01:10:42 +0000 (UTC)
Subject: rpms/nautilus-sendto/devel .cvsignore, 1.15,
	1.16 nautilus-sendto.spec, 1.56, 1.57 sources, 1.15, 1.16
Message-ID: <20080924011042.3807970103@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/nautilus-sendto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26096

Modified Files:
	.cvsignore nautilus-sendto.spec sources 
Log Message:
* Tue Sep 23 2008 - Bastien Nocera <bnocera at redhat.com> - 1.1.0
- Update to 1.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	23 Jul 2008 10:27:21 -0000	1.15
+++ .cvsignore	24 Sep 2008 01:10:10 -0000	1.16
@@ -1 +1 @@
-nautilus-sendto-1.0.1.tar.bz2
+nautilus-sendto-1.1.0.tar.bz2


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- nautilus-sendto.spec	23 Jul 2008 10:53:17 -0000	1.56
+++ nautilus-sendto.spec	24 Sep 2008 01:10:11 -0000	1.57
@@ -1,5 +1,5 @@
 Name:           nautilus-sendto
-Version:        1.0.1
+Version:        1.1.0
 Release: 	1%{?dist}
 Summary:        Nautilus context menu for sending files
 
@@ -91,6 +91,9 @@
 %{_mandir}/man1/nautilus-sendto.1.gz
 
 %changelog
+* Tue Sep 23 2008 - Bastien Nocera <bnocera at redhat.com> - 1.1.0
+- Update to 1.1.0
+
 * Wed Jul 23 2008 - Bastien Nocera <bnocera at redhat.com> - 1.0.1
 - Update to 1.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	23 Jul 2008 10:27:21 -0000	1.15
+++ sources	24 Sep 2008 01:10:11 -0000	1.16
@@ -1 +1 @@
-33f2a9b27a7641967f97493453ca60ac  nautilus-sendto-1.0.1.tar.bz2
+fb2e115a33653496416847c61477b857  nautilus-sendto-1.1.0.tar.bz2



From caillon at fedoraproject.org  Wed Sep 24 01:10:44 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 01:10:44 +0000 (UTC)
Subject: rpms/firefox/F-9 mozilla-firstrun.patch,1.1,1.2
Message-ID: <20080924011044.CA1FE70103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26239

Modified Files:
	mozilla-firstrun.patch 
Log Message:
merge

mozilla-firstrun.patch:

Index: mozilla-firstrun.patch
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-9/mozilla-firstrun.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozilla-firstrun.patch	17 Jun 2008 19:16:07 -0000	1.1
+++ mozilla-firstrun.patch	24 Sep 2008 01:10:44 -0000	1.2
@@ -14,16 +14,15 @@
 diff -up mozilla/browser/components/nsBrowserGlue.js.firstrun mozilla/browser/components/nsBrowserGlue.js
 --- mozilla/browser/components/nsBrowserGlue.js.firstrun	2008-06-15 11:28:29.000000000 -0700
 +++ mozilla/browser/components/nsBrowserGlue.js	2008-06-15 11:28:36.000000000 -0700
-@@ -175,34 +175,6 @@ BrowserGlue.prototype = {
+@@ -175,33 +175,6 @@ BrowserGlue.prototype = {
    // profile startup handler (contains profile initialization routines)
    _onProfileStartup: function() 
    {
 -    // Check to see if the EULA must be shown on startup
 -
--    // Global override for tinderbox machines
 -    var prefBranch = Cc["@mozilla.org/preferences-service;1"].
 -                     getService(Ci.nsIPrefBranch);
--    var mustDisplayEULA = true;
+-    var mustDisplayEULA = false;
 -    try {
 -      mustDisplayEULA = !prefBranch.getBoolPref("browser.EULA.override");
 -    } catch (e) {



From caillon at fedoraproject.org  Wed Sep 24 01:12:19 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 01:12:19 +0000 (UTC)
Subject: rpms/firefox/devel mozilla-firstrun.patch,1.1,1.2
Message-ID: <20080924011219.DAD2A70103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26606

Modified Files:
	mozilla-firstrun.patch 
Log Message:
merge

mozilla-firstrun.patch:

Index: mozilla-firstrun.patch
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/mozilla-firstrun.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozilla-firstrun.patch	18 Jun 2008 00:52:47 -0000	1.1
+++ mozilla-firstrun.patch	24 Sep 2008 01:11:49 -0000	1.2
@@ -14,16 +14,15 @@
 diff -up mozilla/browser/components/nsBrowserGlue.js.firstrun mozilla/browser/components/nsBrowserGlue.js
 --- mozilla/browser/components/nsBrowserGlue.js.firstrun	2008-06-15 11:28:29.000000000 -0700
 +++ mozilla/browser/components/nsBrowserGlue.js	2008-06-15 11:28:36.000000000 -0700
-@@ -175,34 +175,6 @@ BrowserGlue.prototype = {
+@@ -175,33 +175,6 @@ BrowserGlue.prototype = {
    // profile startup handler (contains profile initialization routines)
    _onProfileStartup: function() 
    {
 -    // Check to see if the EULA must be shown on startup
 -
--    // Global override for tinderbox machines
 -    var prefBranch = Cc["@mozilla.org/preferences-service;1"].
 -                     getService(Ci.nsIPrefBranch);
--    var mustDisplayEULA = true;
+-    var mustDisplayEULA = false;
 -    try {
 -      mustDisplayEULA = !prefBranch.getBoolPref("browser.EULA.override");
 -    } catch (e) {



From jeckersb at fedoraproject.org  Wed Sep 24 01:26:29 2008
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Wed, 24 Sep 2008 01:26:29 +0000 (UTC)
Subject: rpms/python-netaddr/devel .cvsignore, 1.3, 1.4 python-netaddr.spec, 
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20080924012629.84C8370103@cvs1.fedora.phx.redhat.com>

Author: jeckersb

Update of /cvs/pkgs/rpms/python-netaddr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28401

Modified Files:
	.cvsignore python-netaddr.spec sources 
Log Message:
New upsteam version 0.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Sep 2008 00:35:33 -0000	1.3
+++ .cvsignore	24 Sep 2008 01:25:59 -0000	1.4
@@ -1 +1 @@
-netaddr-0.5.tar.gz
+netaddr-0.5.1.tar.gz


Index: python-netaddr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/python-netaddr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-netaddr.spec	22 Sep 2008 00:35:33 -0000	1.2
+++ python-netaddr.spec	24 Sep 2008 01:25:59 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-netaddr
-Version:        0.5
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        Network address manipulation, done Pythonically
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 John Eckersberg <jeckersb at redhat.com> - 0.5.1-1
+- New upstream version, bug fixes for 0.5
+
 * Sun Sep 21 2008 John Eckersberg <jeckersb at redhat.com> - 0.5-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Sep 2008 00:35:33 -0000	1.3
+++ sources	24 Sep 2008 01:25:59 -0000	1.4
@@ -1 +1 @@
-d35e72f63ec2871e25ef50dec4b3705b  netaddr-0.5.tar.gz
+9a8261b90fe810e55990e92cdda79a28  netaddr-0.5.1.tar.gz



From jeckersb at fedoraproject.org  Wed Sep 24 01:31:44 2008
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Wed, 24 Sep 2008 01:31:44 +0000 (UTC)
Subject: rpms/python-netaddr/F-8 .cvsignore, 1.2, 1.3 python-netaddr.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20080924013144.2A40970103@cvs1.fedora.phx.redhat.com>

Author: jeckersb

Update of /cvs/pkgs/rpms/python-netaddr/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29016

Modified Files:
	.cvsignore python-netaddr.spec sources 
Log Message:
New upsteam version 0.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Sep 2008 01:01:52 -0000	1.2
+++ .cvsignore	24 Sep 2008 01:31:13 -0000	1.3
@@ -1 +1 @@
-netaddr-0.5.tar.gz
+netaddr-0.5.1.tar.gz


Index: python-netaddr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/F-8/python-netaddr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-netaddr.spec	22 Sep 2008 01:01:52 -0000	1.2
+++ python-netaddr.spec	24 Sep 2008 01:31:13 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-netaddr
-Version:        0.5
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        Network address manipulation, done Pythonically
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 John Eckersberg <jeckersb at redhat.com> - 0.5.1-1
+- New upstream version, bug fixes for 0.5
+
 * Sun Sep 21 2008 John Eckersberg <jeckersb at redhat.com> - 0.5-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Sep 2008 01:01:52 -0000	1.3
+++ sources	24 Sep 2008 01:31:13 -0000	1.4
@@ -1 +1 @@
-d35e72f63ec2871e25ef50dec4b3705b  netaddr-0.5.tar.gz
+9a8261b90fe810e55990e92cdda79a28  netaddr-0.5.1.tar.gz



From pkgdb at fedoraproject.org  Wed Sep 24 01:34:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 01:34:34 +0000
Subject: [pkgdb] nautilus-python: bpepple has requested commit
Message-ID: <20080924013434.20539208D6B@bastion.fedora.phx.redhat.com>

bpepple has requested the commit acl on nautilus-python (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus-python



From pkgdb at fedoraproject.org  Wed Sep 24 01:34:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 01:34:41 +0000
Subject: [pkgdb] nautilus-python: bpepple has requested commit
Message-ID: <20080924013441.504DF208DA4@bastion.fedora.phx.redhat.com>

bpepple has requested the commit acl on nautilus-python (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus-python



From jeckersb at fedoraproject.org  Wed Sep 24 01:35:56 2008
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Wed, 24 Sep 2008 01:35:56 +0000 (UTC)
Subject: rpms/python-netaddr/F-9 .cvsignore, 1.2, 1.3 python-netaddr.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20080924013556.5109870103@cvs1.fedora.phx.redhat.com>

Author: jeckersb

Update of /cvs/pkgs/rpms/python-netaddr/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29497

Modified Files:
	.cvsignore python-netaddr.spec sources 
Log Message:
New upsteam version 0.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Sep 2008 15:20:23 -0000	1.2
+++ .cvsignore	24 Sep 2008 01:35:26 -0000	1.3
@@ -1 +1 @@
-netaddr-0.5.tar.gz
+netaddr-0.5.1.tar.gz


Index: python-netaddr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/F-9/python-netaddr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-netaddr.spec	22 Sep 2008 15:20:24 -0000	1.2
+++ python-netaddr.spec	24 Sep 2008 01:35:26 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-netaddr
-Version:        0.5
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        Network address manipulation, done Pythonically
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 John Eckersberg <jeckersb at redhat.com> - 0.5.1-1
+- New upstream version, bug fixes for 0.5
+
 * Sun Sep 21 2008 John Eckersberg <jeckersb at redhat.com> - 0.5-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Sep 2008 15:20:24 -0000	1.3
+++ sources	24 Sep 2008 01:35:26 -0000	1.4
@@ -1 +1 @@
-d35e72f63ec2871e25ef50dec4b3705b  netaddr-0.5.tar.gz
+9a8261b90fe810e55990e92cdda79a28  netaddr-0.5.1.tar.gz



From caillon at fedoraproject.org  Wed Sep 24 01:55:23 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 01:55:23 +0000 (UTC)
Subject: rpms/epiphany/F-8 epiphany.spec,1.180,1.181
Message-ID: <20080924015523.E7ACE70103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31335

Modified Files:
	epiphany.spec 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 2.20.3-7
- Rebuild against newer gecko



Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/F-8/epiphany.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- epiphany.spec	16 Jul 2008 01:17:19 -0000	1.180
+++ epiphany.spec	24 Sep 2008 01:54:53 -0000	1.181
@@ -1,4 +1,4 @@
-%define gecko_ver 1.8.1.16
+%define gecko_ver 1.8.1.17
 %define desktop_file_utils_version 0.9
 %define glib2_devel_ver 2.12.0
 %define gtk2_devel_ver 2.10.0
@@ -8,7 +8,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.20.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -198,6 +198,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 2.20.3-7
+- Rebuild against newer gecko
+
 * Tue Jul 15 2008 Christopher Aillon <caillon at redhat.com> - 2.20.3-6
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Wed Sep 24 01:55:57 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 01:55:57 +0000 (UTC)
Subject: rpms/epiphany/F-9 epiphany.spec,1.192,1.193
Message-ID: <20080924015557.6CE9270103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31426

Modified Files:
	epiphany.spec 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 2.22.2-4
- Rebuild against newer gecko



Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/F-9/epiphany.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- epiphany.spec	16 Jul 2008 22:12:30 -0000	1.192
+++ epiphany.spec	24 Sep 2008 01:55:27 -0000	1.193
@@ -1,4 +1,4 @@
-%define gecko_ver 1.9.0.1
+%define gecko_ver 1.9.0.2
 %define desktop_file_utils_version 0.9
 %define glib2_devel_ver 2.15.2
 %define gtk2_devel_ver 2.12.0
@@ -8,7 +8,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.22.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -213,6 +213,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 2.22.2-4
+- Rebuild against newer gecko
+
 * Wed Jul 16 2008 Christopher Aillon <caillon at redhat.com> - 2.22.2-3
 - Rebuild against newer gecko
 



From davej at fedoraproject.org  Wed Sep 24 01:57:50 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Wed, 24 Sep 2008 01:57:50 +0000 (UTC)
Subject: rpms/kernel/devel Makefile,1.79,1.80
Message-ID: <20080924015750.9B0EC70103@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31777

Modified Files:
	Makefile 
Log Message:
resurrect a force-tag target


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- Makefile	20 Aug 2008 20:33:17 -0000	1.79
+++ Makefile	24 Sep 2008 01:57:20 -0000	1.80
@@ -112,6 +112,9 @@
 	@VERSION="2.6.27" make -f Makefile.config configs
 	@scripts/reconfig.sh
 
+force-tag:
+	make tag TAG_OPTS="-F"
+
 # since i386 isn't a target...
 compile compile-short: DIST_DEFINES += --target $(shell uname -m)
 



From transif at fedoraproject.org  Wed Sep 24 02:02:57 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Wed, 24 Sep 2008 02:02:57 +0000 (UTC)
Subject: comps/po zh_TW.po,1.15,1.16
Message-ID: <20080924020257.1FD3B70103@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32260/po

Modified Files:
	zh_TW.po 
Log Message:
    2008-09-24  Terry Chuang <tchuang at redhat.com> (via
tchuang at fedoraproject.org)
    
      * po/zh_TW.po: Translation Completed.
    



Index: zh_TW.po
===================================================================
RCS file: /cvs/pkgs/comps/po/zh_TW.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- zh_TW.po	18 Sep 2008 06:16:15 -0000	1.15
+++ zh_TW.po	24 Sep 2008 02:02:26 -0000	1.16
@@ -12,8 +12,8 @@
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 19:54+0000\n"
-"PO-Revision-Date: 2008-09-01 16:48+1000\n"
+"POT-Creation-Date: 2008-09-18 01:23+0000\n"
+"PO-Revision-Date: 2008-09-24 12:01+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -462,219 +462,219 @@
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:95
+#: ../comps-f10.xml.in.h:96
 msgid "Khmer Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:96
+#: ../comps-f10.xml.in.h:98
 msgid "Korean Support"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:94
-#: ../comps-f10.xml.in.h:97
+#: ../comps-f10.xml.in.h:99
 msgid "Languages"
 msgstr "??????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:98
+#: ../comps-f10.xml.in.h:100
 msgid "Lao Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:99
+#: ../comps-f10.xml.in.h:101
 msgid "Latvian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:98
-#: ../comps-f10.xml.in.h:101
+#: ../comps-f10.xml.in.h:103
 msgid "Legacy Network Server"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:102
+#: ../comps-f10.xml.in.h:104
 msgid "Legacy Software Development"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:103
+#: ../comps-f10.xml.in.h:105
 msgid "Legacy Software Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:104
+#: ../comps-f10.xml.in.h:106
 msgid "Lithuanian Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:104
-#: ../comps-f10.xml.in.h:107 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
+#: ../comps-f10.xml.in.h:109 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:108
+#: ../comps-f10.xml.in.h:111
 msgid "Malay Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:109
+#: ../comps-f10.xml.in.h:112
 msgid "Malayalam Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:110
+#: ../comps-f10.xml.in.h:113
 msgid "Maori Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:111
+#: ../comps-f10.xml.in.h:114
 msgid "Marathi Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:110
-#: ../comps-f10.xml.in.h:113
+#: ../comps-f10.xml.in.h:116
 msgid "MySQL Database"
 msgstr "MySQL ?????????"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:112
-#: ../comps-f10.xml.in.h:115 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
+#: ../comps-f10.xml.in.h:119 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:116 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
+#: ../comps-f10.xml.in.h:120 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:115
-#: ../comps-f10.xml.in.h:118
+#: ../comps-f10.xml.in.h:122
 msgid "Northern Sotho Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:119
+#: ../comps-f10.xml.in.h:123
 msgid "Norwegian Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:120 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
+#: ../comps-f10.xml.in.h:124 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "????????????/???????????????"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:119
-#: ../comps-f10.xml.in.h:122
+#: ../comps-f10.xml.in.h:126
 msgid "Oriya Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:123 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
+#: ../comps-f10.xml.in.h:127 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
 msgstr "????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:124
+#: ../comps-f10.xml.in.h:128
 msgid "Persian Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:125
+#: ../comps-f10.xml.in.h:129
 msgid "Polish Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:126
+#: ../comps-f10.xml.in.h:130
 msgid "Portuguese Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:127
+#: ../comps-f10.xml.in.h:131
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ?????????"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:128
+#: ../comps-f10.xml.in.h:132
 msgid "Printing Support"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:129
+#: ../comps-f10.xml.in.h:133
 msgid "Punjabi Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:130
+#: ../comps-f10.xml.in.h:134
 msgid "Romanian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:131
+#: ../comps-f10.xml.in.h:135
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:132
+#: ../comps-f10.xml.in.h:136
 msgid "Russian Support"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:132
-#: ../comps-f10.xml.in.h:135
+#: ../comps-f10.xml.in.h:139
 msgid "Samoan Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:136
+#: ../comps-f10.xml.in.h:140
 msgid "Serbian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:137
+#: ../comps-f10.xml.in.h:141
 msgid "Server Configuration Tools"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:138 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
+#: ../comps-f10.xml.in.h:142 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:139 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
+#: ../comps-f10.xml.in.h:143 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
 msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:140
+#: ../comps-f10.xml.in.h:145
 msgid "Sinhala Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:141
+#: ../comps-f10.xml.in.h:146
 msgid "Slovak Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:142
+#: ../comps-f10.xml.in.h:147
 msgid "Slovenian Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:143
+#: ../comps-f10.xml.in.h:148
 msgid "Smallest possible installation"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:144 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
+#: ../comps-f10.xml.in.h:149 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:145
+#: ../comps-f10.xml.in.h:150
 msgid "Somali Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:146
+#: ../comps-f10.xml.in.h:151
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -683,72 +683,72 @@
 "??? Vi???"
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:147 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
+#: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:148
+#: ../comps-f10.xml.in.h:153
 msgid "Southern Ndebele Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:149
+#: ../comps-f10.xml.in.h:154
 msgid "Southern Sotho Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:150
+#: ../comps-f10.xml.in.h:155
 msgid "Spanish Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:151 ../comps-el4.xml.in.h:46
+#: ../comps-f10.xml.in.h:157 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "Java ????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:47
+#: ../comps-f10.xml.in.h:158 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "Java ????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:153
+#: ../comps-f10.xml.in.h:159
 msgid "Swati Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:154
+#: ../comps-f10.xml.in.h:160
 msgid "Swedish Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:155 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
+#: ../comps-f10.xml.in.h:161 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:156
+#: ../comps-f10.xml.in.h:162
 msgid "Tagalog Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:158
+#: ../comps-f10.xml.in.h:164
 msgid "Tamil Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:159
+#: ../comps-f10.xml.in.h:165
 msgid "Telugu Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:160 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
+#: ../comps-f10.xml.in.h:166 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:161
+#: ../comps-f10.xml.in.h:167
 msgid "Thai Support"
 msgstr "????????????"
 
@@ -757,61 +757,61 @@
 msgstr "Eclipse ?????????????????????"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:162 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
+#: ../comps-f10.xml.in.h:168 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "?????????????????????????????????????????????PDF ??????????????????"
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:163
+#: ../comps-f10.xml.in.h:169
 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:160
-#: ../comps-f10.xml.in.h:164 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
+#: ../comps-f10.xml.in.h:170 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "?????????????????????????????? IMAP ??? SMTP ??????????????????"
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:165
+#: ../comps-f10.xml.in.h:171
 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:162
-#: ../comps-f10.xml.in.h:166 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
+#: ../comps-f10.xml.in.h:172 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
 msgid "These packages are helpful when developing web applications or web pages."
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:167
+#: ../comps-f10.xml.in.h:173
 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:164
-#: ../comps-f10.xml.in.h:168
+#: ../comps-f10.xml.in.h:174
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
 msgstr "????????????????????????????????????????????????????????? rsh ??? telnet???"
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:169
+#: ../comps-f10.xml.in.h:175
 msgid "These packages provide a virtualization environment."
 msgstr "???????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:170
+#: ../comps-f10.xml.in.h:176
 msgid "These packages provide compatibility with previous releases."
 msgstr "??????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:171
+#: ../comps-f10.xml.in.h:177
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
 msgstr "??????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:172
+#: ../comps-f10.xml.in.h:178
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -820,58 +820,58 @@
 "Postscript ?????????????????????"
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:173 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
+#: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:174 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
+#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "?????????????????????????????????????????? FTP ????????????"
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
+#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
 msgstr "???????????????????????????????????????????????? automake, gcc, perl, python ?????? debuggers???"
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
+#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:177
+#: ../comps-f10.xml.in.h:183
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "???????????????????????? Red Hat ?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:178
+#: ../comps-f10.xml.in.h:184
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
 msgstr "??????????????????????????????????????????????????????????????? / ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
+#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
+#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
+#: ../comps-f10.xml.in.h:187 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
+#: ../comps-f10.xml.in.h:188 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -880,24 +880,24 @@
 "????????????"
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
+#: ../comps-f10.xml.in.h:189 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
+#: ../comps-f10.xml.in.h:190 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
 msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
+#: ../comps-f10.xml.in.h:191 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
+#: ../comps-f10.xml.in.h:192 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
 "client for connecting to SMB shares and tools to monitor network traffic."
@@ -906,144 +906,144 @@
 "????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:187
+#: ../comps-f10.xml.in.h:193
 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:184
-#: ../comps-f10.xml.in.h:188
+#: ../comps-f10.xml.in.h:194
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
 msgstr "????????????????????????????????? Linux ??? MS Windows (tm) ????????????????????????"
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:189
+#: ../comps-f10.xml.in.h:195
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "?????????????????????????????????????????? MySQL ????????????"
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:190
+#: ../comps-f10.xml.in.h:196
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "?????????????????????????????????????????? Postgresql ????????????"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:191
+#: ../comps-f10.xml.in.h:197
 msgid "Tibetan Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:192
+#: ../comps-f10.xml.in.h:198
 msgid "Tonga Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:193 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
+#: ../comps-f10.xml.in.h:199 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Fedora ????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:194
+#: ../comps-f10.xml.in.h:200
 msgid "Tsonga Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:195
+#: ../comps-f10.xml.in.h:201
 msgid "Tswana Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:196
+#: ../comps-f10.xml.in.h:202
 msgid "Turkish Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:197
+#: ../comps-f10.xml.in.h:203
 msgid "Ukrainian Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:198
+#: ../comps-f10.xml.in.h:204
 msgid "Urdu Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:199 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
+#: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:200 ../comps-el5.xml.in.h:72
+#: ../comps-f10.xml.in.h:207 ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:201
+#: ../comps-f10.xml.in.h:208
 msgid "Venda Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:202
+#: ../comps-f10.xml.in.h:209
 msgid "Vietnamese Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:203
+#: ../comps-f10.xml.in.h:210
 msgid "Virtualization"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:201
-#: ../comps-f10.xml.in.h:205 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
+#: ../comps-f10.xml.in.h:212 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
+#: ../comps-f10.xml.in.h:213 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:207
+#: ../comps-f10.xml.in.h:214
 msgid "Welsh Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:208 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
+#: ../comps-f10.xml.in.h:215 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:209
+#: ../comps-f10.xml.in.h:216
 msgid "Windows File Server"
 msgstr "Windows ???????????????"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:210
+#: ../comps-f10.xml.in.h:217
 msgid "X Software Development"
 msgstr "X ????????????"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:211 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
+#: ../comps-f10.xml.in.h:218 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X ????????????"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:212
+#: ../comps-f10.xml.in.h:219
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:213
+#: ../comps-f10.xml.in.h:220
 msgid "XFCE Software Development"
 msgstr "XFCE ????????????"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:214
+#: ../comps-f10.xml.in.h:221
 msgid "Xhosa Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:215
+#: ../comps-f10.xml.in.h:222
 msgid "Zulu Support"
 msgstr "???????????????"
 
@@ -1067,23 +1067,23 @@
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "????????? Eclipse ????????????????????????"
 
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:100
+#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:102
 msgid "Legacy Fonts"
 msgstr "???????????????"
 
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:105
+#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:107
 msgid "Low Saxon Support"
 msgstr "??????????????????"
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:112
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:115
 msgid "Mongolian Support"
 msgstr "???????????????"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:114
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:118
 msgid "Nepali Support"
 msgstr "??????????????????"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:121
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:125
 msgid "Older bitmap and vector fonts packages"
 msgstr "????????? bitmap ?????????????????????"
 
@@ -1091,33 +1091,33 @@
 msgid "Esperanto Support"
 msgstr "???????????????"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:94
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95
 msgid "Kashubian Support"
 msgstr "??????????????????"
 
-#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:106
+#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:108
 msgid "Macedonian Support"
 msgstr "??????????????????"
 
-#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:117
+#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:121
 msgid "Northern Sami Support"
 msgstr "??????????????????"
 
-#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:133
+#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:137
 msgid "SUGAR Desktop Environment"
 msgstr "SUGAR ????????????"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:134
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:138
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR ????????? OLPC XO ???????????????????????????"
 
-#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:204
+#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:211
 msgid "Walloon Support"
 msgstr "???????????????"
 
 #: ../comps-f10.xml.in.h:70
-msgid "Haskell"
-msgstr "Haskell"
+msgid "Haskell Development"
+msgstr "Haskell ??????"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
@@ -1127,10 +1127,38 @@
 msgid "Input method packages for the input of international text."
 msgstr "??????????????????????????????????????????"
 
-#: ../comps-f10.xml.in.h:157
+#: ../comps-f10.xml.in.h:94
+msgid "Kashmiri Support"
+msgstr "?????????????????????"
+
+#: ../comps-f10.xml.in.h:97
+msgid "Konkani Support"
+msgstr "???????????????"
+
+#: ../comps-f10.xml.in.h:110
+msgid "Maithili Support"
+msgstr "??????????????????"
+
+#: ../comps-f10.xml.in.h:117
+msgid "Myanmar (Burmese) Support"
+msgstr "???????????????"
+
+#: ../comps-f10.xml.in.h:144
+msgid "Sindhi Support"
+msgstr "???????????????"
+
+#: ../comps-f10.xml.in.h:156
+msgid "Support for developing programs in the Haskell programming language."
+msgstr "Haskell ????????????????????????????????????"
+
+#: ../comps-f10.xml.in.h:163
 msgid "Tajik Support"
 msgstr "??????????????????"
 
+#: ../comps-f10.xml.in.h:205
+msgid "Uzbek Support"
+msgstr "?????????????????????"
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "???????????????????????????????????????"



From caillon at fedoraproject.org  Wed Sep 24 02:05:41 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 02:05:41 +0000 (UTC)
Subject: rpms/blam/F-8 blam.spec,1.27,1.28
Message-ID: <20080924020541.1B2CB70103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/blam/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32536

Modified Files:
	blam.spec 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 1.8.3-18
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/extras/rpms/blam/F-8/blam.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- blam.spec	16 Jul 2008 01:18:21 -0000	1.27
+++ blam.spec	24 Sep 2008 02:05:10 -0000	1.28
@@ -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.8.1.16
+%define	gecko_version		1.8.1.17
 
 Name:		blam
 Version:	1.8.3
-Release:	17%{?dist}
+Release:	18%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -129,6 +129,9 @@
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 1.8.3-18
+- Rebuild against newer gecko
+
 * Tue Jul 15 2008 Christopher Aillon <caillon at redhat.com> - 1.8.3-17
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Wed Sep 24 02:06:34 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 02:06:34 +0000 (UTC)
Subject: rpms/cairo-dock/F-8 cairo-dock.spec,1.24,1.25
Message-ID: <20080924020634.4DFEB70103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/cairo-dock/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32717

Modified Files:
	cairo-dock.spec 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 1.6.2.3-1.1
- Rebuild against newer gecko



Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-8/cairo-dock.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- cairo-dock.spec	9 Sep 2008 03:15:52 -0000	1.24
+++ cairo-dock.spec	24 Sep 2008 02:06:04 -0000	1.25
@@ -33,12 +33,12 @@
 %define		gecko_ver	>= 1.9
 %endif
 %if 0%{?fedora} == 8
-%define		gecko_ver	= 1.8.1.16
+%define		gecko_ver	= 1.8.1.17
 %endif
 
 Name:		cairo-dock
 Version:	%{mainver}
-Release:	%{fedora_rel}%{?dist}
+Release:	%{fedora_rel}%{?dist}.1
 Summary:	Light eye-candy fully themable animated dock
 
 Group:		User Interface/Desktops
@@ -645,6 +645,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 1.6.2.3-1.1
+- Rebuild against newer gecko
+
 * Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.3-1
 - 1.6.2.3
 



From caillon at fedoraproject.org  Wed Sep 24 02:07:27 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 02:07:27 +0000 (UTC)
Subject: rpms/chmsee/F-8 chmsee.spec,1.20,1.21
Message-ID: <20080924020727.531D170103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/chmsee/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv432

Modified Files:
	chmsee.spec 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 1.0.0-4.31
- Rebuild against newer gecko



Index: chmsee.spec
===================================================================
RCS file: /cvs/extras/rpms/chmsee/F-8/chmsee.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- chmsee.spec	16 Jul 2008 01:20:29 -0000	1.20
+++ chmsee.spec	24 Sep 2008 02:06:57 -0000	1.21
@@ -1,9 +1,9 @@
-%define gecko_version 1.8.1.16
+%define gecko_version 1.8.1.17
 %define firefox_version 2.0.0.16
 
 Name:		chmsee
 Version:	1.0.0
-Release:	3.31%{?dist}
+Release:	4.31%{?dist}
 Summary(zh_CN):	CHM ??????????????????, ?????? Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
@@ -118,6 +118,9 @@
 %{_datadir}/icons/hicolor/*/apps/chmsee.png
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 1.0.0-4.31
+- Rebuild against newer gecko
+
 * Tue Jul 15 2008 Christopher Aillon <caillon at redhat.com> - 1.0.0-3.31
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Wed Sep 24 02:08:20 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 02:08:20 +0000 (UTC)
Subject: rpms/devhelp/F-8 devhelp.spec,1.83,1.84
Message-ID: <20080924020820.BC70A70103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/devhelp/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv617

Modified Files:
	devhelp.spec 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 0.16.1-10
- Rebuild against newer gecko



Index: devhelp.spec
===================================================================
RCS file: /cvs/extras/rpms/devhelp/F-8/devhelp.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- devhelp.spec	16 Jul 2008 01:21:54 -0000	1.83
+++ devhelp.spec	24 Sep 2008 02:07:50 -0000	1.84
@@ -1,12 +1,12 @@
 # To determine the current gecko-devel version:
 # rpm -q --provides firefox-devel | grep gecko-devel
-%define gecko_ver 1.8.1.16
+%define gecko_ver 1.8.1.17
 
 ### Abstract ###
 
 Name: devhelp
 Version: 0.16.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API document browser
@@ -128,6 +128,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 0.16.1-10
+- Rebuild against newer gecko
+
 * Tue Jul 15 2008 Christopher Aillon <caillon at redhat.com> - 0.16.1-9
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Wed Sep 24 02:09:14 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 02:09:14 +0000 (UTC)
Subject: rpms/evolution-rss/F-8 evolution-rss.spec,1.15,1.16
Message-ID: <20080924020914.527AF70103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/evolution-rss/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv795

Modified Files:
	evolution-rss.spec 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 0.0.8-12
- Rebuild against newer gecko



Index: evolution-rss.spec
===================================================================
RCS file: /cvs/extras/rpms/evolution-rss/F-8/evolution-rss.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- evolution-rss.spec	16 Jul 2008 05:17:32 -0000	1.15
+++ evolution-rss.spec	24 Sep 2008 02:08:44 -0000	1.16
@@ -1,8 +1,8 @@
-%define gecko_ver 1.8.1.16
+%define gecko_ver 1.8.1.17
 Summary: Evolution RSS Reader
 Name: evolution-rss
 Version: 0.0.8
-Release: 11%{?dist}
+Release: 12%{?dist}
 Group: Applications/Internet
 License: GPLv2 and GPLv2+
 Source: http://gnome.eu.org/%{name}-%{version}.tar.gz
@@ -93,8 +93,11 @@
 %doc TODO
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 0.0.8-12
+- Rebuild against newer gecko
+
 * Mon Jul 16 2008 Lucian Langa <cooly at gnome.eu.org> - 0.0.8-11
-- Rebuild against newer gecko (1.8.1.16)
+- Rebuild against newer gecko (1.8.1.17)
 
 * Mon Jul  7 2008 Lucian Langa <cooly at gnome.eu.org> - 0.0.8-10
 - Rebuild against newer gecko (1.8.1.15)



From caillon at fedoraproject.org  Wed Sep 24 02:10:07 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 02:10:07 +0000 (UTC)
Subject: rpms/galeon/F-8 galeon.spec,1.50,1.51
Message-ID: <20080924021007.6E04070103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/galeon/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv989

Modified Files:
	galeon.spec 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 2.0.4-5.3
- Rebuild against newer gecko



Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/F-8/galeon.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- galeon.spec	16 Jul 2008 01:24:09 -0000	1.50
+++ galeon.spec	24 Sep 2008 02:09:37 -0000	1.51
@@ -1,9 +1,9 @@
-%define gecko_ver 1.8.1.16
+%define gecko_ver 1.8.1.17
 
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.4
-Release:	4%{?dist}.3
+Release:	5%{?dist}.3
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -115,6 +115,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 2.0.4-5.3
+- Rebuild against newer gecko
+
 * Tue Jul 15 2008 Christopher Aillon <caillon at redhat.com> - 2.0.4-4.3
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Wed Sep 24 02:11:10 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 02:11:10 +0000 (UTC)
Subject: rpms/gnome-python2-extras/F-8 gnome-python2-extras.spec,1.27,1.28
Message-ID: <20080924021110.E8E7570103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gnome-python2-extras/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1198

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 2.19.1-17
- Rebuild against newer gecko



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-extras/F-8/gnome-python2-extras.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnome-python2-extras.spec	16 Jul 2008 01:25:04 -0000	1.27
+++ gnome-python2-extras.spec	24 Sep 2008 02:10:40 -0000	1.28
@@ -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.8.1.16
+%define gecko_version 1.8.1.17
 %define gtkspell_version 2.0.7
 %define libgda_version 2.99.6
 %define anjuta_gdl_version 0.7.1
@@ -21,7 +21,7 @@
 
 Name: gnome-python2-extras
 Version: 2.19.1
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPL/LGPL
 Group: Development/Languages
 Summary: The sources for additional. PyGNOME Python extension modules.
@@ -194,6 +194,9 @@
 %{_libdir}/pkgconfig/pygda-3.0.pc
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 2.19.1-17
+- Rebuild against newer gecko
+
 * Tue Jul 15 2008 Christopher Aillon <caillon at redhat.com> - 2.19.1-16
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Wed Sep 24 02:12:03 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 02:12:03 +0000 (UTC)
Subject: rpms/gnome-web-photo/F-8 gnome-web-photo.spec,1.10,1.11
Message-ID: <20080924021203.A228C70103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gnome-web-photo/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1388

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 0.3-13
- Rebuild against newer gecko



Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-web-photo/F-8/gnome-web-photo.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-web-photo.spec	16 Jul 2008 01:26:08 -0000	1.10
+++ gnome-web-photo.spec	24 Sep 2008 02:11:33 -0000	1.11
@@ -1,9 +1,9 @@
-%define gecko_version 1.8.1.16
+%define gecko_version 1.8.1.17
 
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.3
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: LGPLv2+
 Group: Applications/Internet
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
@@ -74,6 +74,9 @@
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 0.3-13
+- Rebuild against newer gecko
+
 * Tue Jul 15 2008 Christopher Aillon <caillon at redhat.com> - 0.3-12
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Wed Sep 24 02:13:00 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 02:13:00 +0000 (UTC)
Subject: rpms/gtkmozembedmm/F-8 gtkmozembedmm.spec,1.26,1.27
Message-ID: <20080924021300.B4C0070103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gtkmozembedmm/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1581

Modified Files:
	gtkmozembedmm.spec 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 1.4.2.cvs20060817-23
- Rebuild against newer gecko



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/F-8/gtkmozembedmm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gtkmozembedmm.spec	16 Jul 2008 01:27:06 -0000	1.26
+++ gtkmozembedmm.spec	24 Sep 2008 02:12:30 -0000	1.27
@@ -1,7 +1,7 @@
-%define gecko_ver 1.8.1.16
+%define gecko_ver 1.8.1.17
 Name:           gtkmozembedmm
 Version:        1.4.2.cvs20060817
-Release: 22%{?dist}
+Release: 23%{?dist}
 
 Summary:        C++ wrapper for GtkMozembed
 
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 1.4.2.cvs20060817-23
+- Rebuild against newer gecko
+
 * Tue Jul 15 2008 Christopher Aillon <caillon at redhat.com> - 1.4.2.cvs20060817-22
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Wed Sep 24 02:13:53 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 02:13:53 +0000 (UTC)
Subject: rpms/kazehakase/F-8 kazehakase.spec,1.59,1.60
Message-ID: <20080924021353.2DC1B70103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/kazehakase/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1787

Modified Files:
	kazehakase.spec 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 0.5.5-1.1
- Rebuild against newer gecko



Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-8/kazehakase.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kazehakase.spec	29 Jul 2008 16:33:30 -0000	1.59
+++ kazehakase.spec	24 Sep 2008 02:13:22 -0000	1.60
@@ -16,7 +16,7 @@
 %define		Geckover	1.9
 %endif
 %if 0%{?fedora} == 8
-%define		Geckover	1.8.1.16
+%define		Geckover	1.8.1.17
 %endif
 
 %if 0%{?use_svn} > 0
@@ -35,7 +35,7 @@
 
 Name:		kazehakase
 Version:	0.5.5
-Release:	%{_release}%{?dist}
+Release:	%{_release}%{?dist}.1
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
@@ -293,6 +293,9 @@
 %endif
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 0.5.5-1.1
+- Rebuild against newer gecko
+
 * Wed Jul 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.5-1
 - 0.5.5
 



From caillon at fedoraproject.org  Wed Sep 24 02:14:45 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 02:14:45 +0000 (UTC)
Subject: rpms/liferea/F-8 liferea.spec,1.112,1.113
Message-ID: <20080924021445.3CE7070103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/liferea/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1984

Modified Files:
	liferea.spec 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 1.4.15-4
- Rebuild against newer gecko



Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/F-8/liferea.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- liferea.spec	16 Jul 2008 01:29:17 -0000	1.112
+++ liferea.spec	24 Sep 2008 02:14:14 -0000	1.113
@@ -1,8 +1,8 @@
-%define gecko_ver 1.8.1.16
+%define gecko_ver 1.8.1.17
 
 Name:           liferea
 Version:        1.4.15
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 1.4.15-4
+- Rebuild against newer gecko
+
 * Tue Jul 15 2008 Christopher Aillon <caillon at redhat.com> - 1.4.15-3
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Wed Sep 24 02:15:37 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 02:15:37 +0000 (UTC)
Subject: rpms/Miro/F-8 Miro.spec,1.18,1.19
Message-ID: <20080924021537.EF9DF7013D@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/Miro/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2167

Modified Files:
	Miro.spec 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 1.2.3-4
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-8/Miro.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Miro.spec	16 Jul 2008 01:30:24 -0000	1.18
+++ Miro.spec	24 Sep 2008 02:15:07 -0000	1.19
@@ -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.8.1.16
+%define gecko_ver 1.8.1.17
 
 Name:           Miro
 Version:        1.2.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Miro - Internet TV Player
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 1.2.3-4
+- Rebuild against newer gecko
+
 * Tue Jul 15 2008 Christopher Aillon <caillon at redhat.com> - 1.2.3-3
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Wed Sep 24 02:16:40 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 02:16:40 +0000 (UTC)
Subject: rpms/openvrml/F-8 openvrml.spec,1.49,1.50
Message-ID: <20080924021640.B44E87013E@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/openvrml/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2515

Modified Files:
	openvrml.spec 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 0.17.8-2.0
- Rebuild against newer gecko



Index: openvrml.spec
===================================================================
RCS file: /cvs/extras/rpms/openvrml/F-8/openvrml.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- openvrml.spec	13 Aug 2008 20:50:36 -0000	1.49
+++ openvrml.spec	24 Sep 2008 02:16:10 -0000	1.50
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.17.8
-Release:        1.0%{?dist}
+Release:        2.0%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
@@ -68,7 +68,7 @@
 Group:          Applications/Internet
 License:        GPLv3+
 Requires:       %{name}-gl = %{version}-%{release}
-Requires:       gecko-libs = 1.8.1.16
+Requires:       gecko-libs = 1.8.1.17
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Obsoletes:      %{name}-gtkplug
@@ -171,6 +171,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 0.17.8-2.0
+- Rebuild against newer gecko
+
 * Wed Aug 13 2008  Braden McDaniel  <braden at endoframe.com>
 - Build with -Wno-missing-braces.
 



From caillon at fedoraproject.org  Wed Sep 24 02:17:38 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 02:17:38 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-8 ruby-gnome2.spec,1.24,1.25
Message-ID: <20080924021738.CAEE270103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/ruby-gnome2/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2756

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 0.17.0-2
- Rebuild against newer gecko



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-8/ruby-gnome2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ruby-gnome2.spec	18 Sep 2008 14:18:18 -0000	1.24
+++ ruby-gnome2.spec	24 Sep 2008 02:17:08 -0000	1.25
@@ -10,7 +10,7 @@
 
 Name:           ruby-gnome2
 Version:        0.17.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -298,13 +298,13 @@
 %endif
 
 %if 0%{?fedora} == 8
-BuildRequires:  gecko-devel = 1.8.1.16
-Requires:       gecko-libs = 1.8.1.16
+BuildRequires:  gecko-devel = 1.8.1.17
+Requires:       gecko-libs = 1.8.1.17
 %endif
 
 %if 0%{?fedora} == 7
-BuildRequires:  gecko-devel = 1.8.1.16
-Requires:       gecko-libs = 1.8.1.16
+BuildRequires:  gecko-devel = 1.8.1.17
+Requires:       gecko-libs = 1.8.1.17
 %endif
 
 %if 0%{?fedora} == 6
@@ -700,6 +700,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 0.17.0-2
+- Rebuild against newer gecko
+
 * Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.17.0-1
 - Update to 0.17.0
 - Patch from svn to fix Ruby/GLib bug (bug 456816)



From caillon at fedoraproject.org  Wed Sep 24 02:18:36 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 02:18:36 +0000 (UTC)
Subject: rpms/yelp/F-8 yelp.spec,1.123,1.124
Message-ID: <20080924021836.7386270103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/yelp/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2942

Modified Files:
	yelp.spec 
Log Message:
* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 2.20.0-13
- Rebuild against newer gecko



Index: yelp.spec
===================================================================
RCS file: /cvs/extras/rpms/yelp/F-8/yelp.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- yelp.spec	25 Aug 2008 17:26:45 -0000	1.123
+++ yelp.spec	24 Sep 2008 02:18:06 -0000	1.124
@@ -12,7 +12,7 @@
 %define libxslt_version 1.1.4
 %define startup_notification_version 0.8
 %define rarian_version 0.5.0
-%define gecko_version 1.8.1.16
+%define gecko_version 1.8.1.17
 
 %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.20.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.19/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -160,6 +160,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 2.20.0-13
+- Rebuild against newer gecko
+
 * Mon Aug 25 2008 Matthew Barnes <mbarnes at redhat.com> - 2.20.0-12
 - Add patch for RH bug #459487 (format string vulnerability).
 



From mclasen at fedoraproject.org  Wed Sep 24 03:41:08 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 24 Sep 2008 03:41:08 +0000 (UTC)
Subject: rpms/gconf-editor/devel .cvsignore, 1.28, 1.29 gconf-editor.spec,
	1.60, 1.61 sources, 1.28, 1.29
Message-ID: <20080924034108.AB12570103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gconf-editor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12801

Modified Files:
	.cvsignore gconf-editor.spec sources 
Log Message:
2.24.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	23 Sep 2008 15:09:30 -0000	1.28
+++ .cvsignore	24 Sep 2008 03:40:38 -0000	1.29
@@ -1 +1 @@
-gconf-editor-2.24.0.tar.bz2
+gconf-editor-2.24.0.1.tar.bz2


Index: gconf-editor.spec
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- gconf-editor.spec	23 Sep 2008 15:25:51 -0000	1.60
+++ gconf-editor.spec	24 Sep 2008 03:40:38 -0000	1.61
@@ -7,8 +7,8 @@
 
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
-Version: 2.24.0
-Release: 2%{?dist}
+Version: 2.24.0.1
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gconf-editor/2.24/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL
@@ -94,8 +94,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS NEWS README 
-# 2.24.0 lost COPYING 
+%doc AUTHORS NEWS README COPYING 
 %{_bindir}/gconf-editor
 %{_datadir}/icons/hicolor/*/apps/gconf-editor.png
 %{_datadir}/gconf-editor
@@ -105,6 +104,9 @@
 %dir %{_datadir}/omf/gconf-editor
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-1
+- Update to 2.24.0.1
+
 * Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-2
 - Update to 2.24.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	23 Sep 2008 15:09:31 -0000	1.28
+++ sources	24 Sep 2008 03:40:38 -0000	1.29
@@ -1 +1 @@
-845321d47b34f6ae19ac7e930c454e3d  gconf-editor-2.24.0.tar.bz2
+e2e1cddbebda87e794fabdbe3928ef6f  gconf-editor-2.24.0.1.tar.bz2



From denis at fedoraproject.org  Wed Sep 24 03:45:49 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 24 Sep 2008 03:45:49 +0000 (UTC)
Subject: rpms/gconfmm26/devel .cvsignore, 1.11, 1.12 gconfmm.spec, 1.19,
	1.20 sources, 1.11, 1.12
Message-ID: <20080924034550.0188E70103@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gconfmm26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13540

Modified Files:
	.cvsignore gconfmm.spec sources 
Log Message:
Update to upstream 2.24.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gconfmm26/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Mar 2008 17:32:56 -0000	1.11
+++ .cvsignore	24 Sep 2008 03:45:19 -0000	1.12
@@ -1 +1 @@
-gconfmm-2.22.0.tar.bz2
+gconfmm-2.24.0.tar.bz2


Index: gconfmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gconfmm26/devel/gconfmm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gconfmm.spec	12 Mar 2008 17:32:56 -0000	1.19
+++ gconfmm.spec	24 Sep 2008 03:45:19 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           gconfmm26
-Version:        2.22.0
+Version:        2.24.0
 Release:        1%{?dist}
 
 Summary:        C++ wrapper for GConf2
@@ -75,7 +75,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Wed Mar 12 2008 Denis Leroy <denis at dedibox.albator.org> - 2.22.0-1
+* Wed Sep 24 2008 Denis Leroy <denis at poolshark.org> - 2.24.0-1
+- Update to upstream 2.24.0
+
+* Wed Mar 12 2008 Denis Leroy <denis at poolshark.org> - 2.22.0-1
 - Update to upstream 2.22.0
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.20.0-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gconfmm26/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Mar 2008 17:32:56 -0000	1.11
+++ sources	24 Sep 2008 03:45:19 -0000	1.12
@@ -1 +1 @@
-4090b7333a928c6baeff583a9a0b2b55  gconfmm-2.22.0.tar.bz2
+cd2c3c919dbf8f90f703680d2fa088b2  gconfmm-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Wed Sep 24 03:47:11 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 24 Sep 2008 03:47:11 +0000 (UTC)
Subject: rpms/epiphany/devel .cvsignore, 1.73, 1.74 epiphany.spec, 1.198,
	1.199 sources, 1.76, 1.77
Message-ID: <20080924034711.C230370103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13327

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.24.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore	23 Sep 2008 04:49:24 -0000	1.73
+++ .cvsignore	24 Sep 2008 03:46:41 -0000	1.74
@@ -1 +1 @@
-epiphany-2.24.0.tar.bz2
+epiphany-2.24.0.1.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- epiphany.spec	23 Sep 2008 04:49:24 -0000	1.198
+++ epiphany.spec	24 Sep 2008 03:46:41 -0000	1.199
@@ -7,7 +7,7 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.24.0
+Version: 2.24.0.1
 Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/Internet
@@ -212,6 +212,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-1
+- Update to 2.24.0.1
+
 * Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
 - Update to 2.24.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- sources	23 Sep 2008 04:49:24 -0000	1.76
+++ sources	24 Sep 2008 03:46:41 -0000	1.77
@@ -1 +1 @@
-d46089988045c17adaa70af963b3e47a  epiphany-2.24.0.tar.bz2
+24e284d77e782faeec219574def7f34f  epiphany-2.24.0.1.tar.bz2



From mclasen at fedoraproject.org  Wed Sep 24 03:49:44 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 24 Sep 2008 03:49:44 +0000 (UTC)
Subject: rpms/nautilus-cd-burner/devel .cvsignore, 1.56,
	1.57 nautilus-cd-burner.spec, 1.105, 1.106 sources, 1.56, 1.57
Message-ID: <20080924034944.0726D7013E@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/nautilus-cd-burner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14149

Modified Files:
	.cvsignore nautilus-cd-burner.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus-cd-burner/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	23 Aug 2008 04:43:12 -0000	1.56
+++ .cvsignore	24 Sep 2008 03:49:13 -0000	1.57
@@ -1 +1 @@
-nautilus-cd-burner-2.23.90.tar.bz2
+nautilus-cd-burner-2.24.0.tar.bz2


Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- nautilus-cd-burner.spec	23 Aug 2008 05:01:37 -0000	1.105
+++ nautilus-cd-burner.spec	24 Sep 2008 03:49:13 -0000	1.106
@@ -11,9 +11,9 @@
 
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
-Version: 2.23.90
+Version: 2.24.0
 Release: 1%{?dist}
-Source0: http://download.gnome.org/sources/nautilus-cd-burner/2.23/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/nautilus-cd-burner/2.24/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -138,6 +138,9 @@
 
 
 %changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Sat Aug 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-1
 - Update to 2.23.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus-cd-burner/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	23 Aug 2008 04:43:12 -0000	1.56
+++ sources	24 Sep 2008 03:49:13 -0000	1.57
@@ -1 +1 @@
-ff0a2479a1dbbc270c007ca2e268da67  nautilus-cd-burner-2.23.90.tar.bz2
+eb211dd03d0518263fa4eadccc3caa88  nautilus-cd-burner-2.24.0.tar.bz2



From denis at fedoraproject.org  Wed Sep 24 03:58:02 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 24 Sep 2008 03:58:02 +0000 (UTC)
Subject: rpms/libglademm24/devel .cvsignore, 1.8, 1.9 libglademm.spec, 1.14, 
	1.15 sources, 1.8, 1.9
Message-ID: <20080924035802.3B0BB70103@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libglademm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15344

Modified Files:
	.cvsignore libglademm.spec sources 
Log Message:
Update to upstream 2.6.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libglademm24/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	11 Feb 2008 10:34:32 -0000	1.8
+++ .cvsignore	24 Sep 2008 03:57:31 -0000	1.9
@@ -1 +1 @@
-libglademm-2.6.6.tar.bz2
+libglademm-2.6.7.tar.bz2


Index: libglademm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libglademm24/devel/libglademm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libglademm.spec	11 Feb 2008 10:34:32 -0000	1.14
+++ libglademm.spec	24 Sep 2008 03:57:31 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           libglademm24
-Version:        2.6.6
+Version:        2.6.7
 Release:        1%{?dist}
 
 Summary:        C++ wrapper for libglade
@@ -13,7 +13,7 @@
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  gtkmm24-devel >= 2.6.0
-BuildRequires:  libglade2-devel >= 2.3.6
+BuildRequires:  libglade2-devel >= 2.6.1
 
 %description
 This package provides a C++ interface for libglademm. It is a
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Sep 24 2008 Denis Leroy <denis at poolshark.org> - 2.6.7-1
+- Update to upstream 2.6.7
+
 * Mon Feb 11 2008 Denis Leroy <denis at poolshark.org> - 2.6.6-1
 - Update to 2.6.6, bugfix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libglademm24/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Feb 2008 10:34:32 -0000	1.8
+++ sources	24 Sep 2008 03:57:31 -0000	1.9
@@ -1 +1 @@
-c4b2440d5e816ff4d692a246bce55dfb  libglademm-2.6.6.tar.bz2
+f9ca5b67f6c551ea98790ab5f21c19d0  libglademm-2.6.7.tar.bz2



From mclasen at fedoraproject.org  Wed Sep 24 04:01:38 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 24 Sep 2008 04:01:38 +0000 (UTC)
Subject: rpms/gnome-screensaver/devel .cvsignore, 1.48,
	1.49 gnome-screensaver.spec, 1.192, 1.193 sources, 1.52, 1.53
Message-ID: <20080924040138.9F0FE70103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15825

Modified Files:
	.cvsignore gnome-screensaver.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	28 Aug 2008 18:53:49 -0000	1.48
+++ .cvsignore	24 Sep 2008 04:01:08 -0000	1.49
@@ -1 +1 @@
-gnome-screensaver-2.23.90.tar.bz2
+gnome-screensaver-2.24.0.tar.bz2


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- gnome-screensaver.spec	28 Aug 2008 21:41:28 -0000	1.192
+++ gnome-screensaver.spec	24 Sep 2008 04:01:08 -0000	1.193
@@ -13,11 +13,11 @@
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.23.90
-Release: 2%{?dist}
+Version: 2.24.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
-Source0: http://download.gnome.org/sources/gnome-screensaver/2.23/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-screensaver/2.24/%{name}-%{version}.tar.bz2
 Source1: gnome-screensaver-hide-xscreensaver.menu
 
 Patch1: gnome-screensaver-2.20.0-default-theme.patch
@@ -146,6 +146,9 @@
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Wed Sep 24 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Thu Aug 28 2008 Jon McCann <jmccann at redhat.com> - 2.23.90-2
 - Fix patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	28 Aug 2008 18:53:50 -0000	1.52
+++ sources	24 Sep 2008 04:01:08 -0000	1.53
@@ -1 +1 @@
-2a4dbb7efaea5bb5fe12efcf1e2dbd01  gnome-screensaver-2.23.90.tar.bz2
+aef361edcc32468d8dc50cf710d9bb80  gnome-screensaver-2.24.0.tar.bz2



From denis at fedoraproject.org  Wed Sep 24 04:14:33 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 24 Sep 2008 04:14:33 +0000 (UTC)
Subject: rpms/gnome-vfsmm26/devel .cvsignore, 1.9, 1.10 gnome-vfsmm.spec,
	1.18, 1.19 sources, 1.10, 1.11
Message-ID: <20080924041433.658AA70103@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gnome-vfsmm26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17196

Modified Files:
	.cvsignore gnome-vfsmm.spec sources 
Log Message:
Update to upstream 2.24.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfsmm26/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Mar 2008 18:07:10 -0000	1.9
+++ .cvsignore	24 Sep 2008 04:14:02 -0000	1.10
@@ -1 +1 @@
-gnome-vfsmm-2.22.0.tar.bz2
+gnome-vfsmm-2.24.0.tar.bz2


Index: gnome-vfsmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfsmm26/devel/gnome-vfsmm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnome-vfsmm.spec	12 Mar 2008 19:26:41 -0000	1.18
+++ gnome-vfsmm.spec	24 Sep 2008 04:14:02 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           gnome-vfsmm26
-Version:        2.22.0
+Version:        2.24.0
 Release:        1%{?dist}
 
 Summary:        C++ wrapper for gnome-vfs
@@ -75,7 +75,10 @@
 
 
 %changelog
-* Wed Mar 12 2008 Denis Leroy <denis at dedibox.albator.org> - 2.22.0-1
+* Wed Sep 24 2008 Denis Leroy <denis at poolshark.org> - 2.24.0-1
+- Update to upstream 2.24.0
+
+* Wed Mar 12 2008 Denis Leroy <denis at poolshark.org> - 2.22.0-1
 - Update to upstream 2.22.0
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.20.0-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfsmm26/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	12 Mar 2008 18:07:10 -0000	1.10
+++ sources	24 Sep 2008 04:14:02 -0000	1.11
@@ -1 +1 @@
-80b86e6f88ee0bd3a1babb686d0be03a  gnome-vfsmm-2.22.0.tar.bz2
+f02257451583832c4d67f4accba7ad62  gnome-vfsmm-2.24.0.tar.bz2



From mclasen at fedoraproject.org  Wed Sep 24 04:15:55 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 24 Sep 2008 04:15:55 +0000 (UTC)
Subject: rpms/epiphany/devel epiphany.spec,1.199,1.200
Message-ID: <20080924041555.8212E70103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17238

Modified Files:
	epiphany.spec 
Log Message:
fix gecko deps



Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- epiphany.spec	24 Sep 2008 03:46:41 -0000	1.199
+++ epiphany.spec	24 Sep 2008 04:15:25 -0000	1.200
@@ -1,4 +1,4 @@
-%define gecko_ver 1.9.0.1
+%define gecko_ver 1.9.0.2
 %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.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -212,7 +212,7 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
-* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-1
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-2
 - Update to 2.24.0.1
 
 * Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1



From dchen at fedoraproject.org  Wed Sep 24 04:17:18 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 24 Sep 2008 04:17:18 +0000 (UTC)
Subject: rpms/UnihanDb/devel UnihanDb.spec, 1.1, 1.2 import.log, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080924041718.0A1A970103@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/UnihanDb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17804/devel

Modified Files:
	UnihanDb.spec import.log sources 
Log Message:
Correct FreqRank field in kMandarinTable


Index: UnihanDb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/UnihanDb/devel/UnihanDb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnihanDb.spec	1 Sep 2008 07:51:50 -0000	1.1
+++ UnihanDb.spec	24 Sep 2008 04:16:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           UnihanDb
 %define         UnihanDb_name Unihan.db
-%define         rel_num 4
+%define         rel_num 7
 Version:        5.1.0
 Release:        %{rel_num}%{?dist}
 Group:          System Environment/Libraries
@@ -11,8 +11,8 @@
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-BuildRequires:  libUnihan-devel >= 0.4.1
-Requires:	sqlite
+BuildRequires:  libUnihan-devel >= 0.5.0
+Requires:       sqlite
 URL:            http://www.unicode.org/charts/unihan.html
 
 Source0:        ftp://ftp.unicode.org/Public/UNIDATA/Unihan.zip
@@ -50,6 +50,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Tue Sep 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1.0-7
+- Correct counting in FreqRank field of kMandarin table.
+
 * Thu Aug 14 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1.0-4
 - Change the license to MIT.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/UnihanDb/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Sep 2008 07:51:50 -0000	1.1
+++ import.log	24 Sep 2008 04:16:47 -0000	1.2
@@ -1 +1,2 @@
 UnihanDb-5_1_0-4_fc9:HEAD:UnihanDb-5.1.0-4.fc9.src.rpm:1220254739
+UnihanDb-5_1_0-7_fc9:HEAD:UnihanDb-5.1.0-7.fc9.src.rpm:1222229798


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/UnihanDb/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2008 07:51:50 -0000	1.2
+++ sources	24 Sep 2008 04:16:47 -0000	1.3
@@ -1,2 +1,2 @@
 b6c8116d4a0f4895e4bd7ea48b3d6679  Unihan.zip
-cc2281b6b7baa00eb7c9114176e9a2c5  UnihanDb-doc-5.1.0.tar.gz
+ba5f5db7c4f0e6e593e4375a945576f4  UnihanDb-doc-5.1.0.tar.gz



From dchen at fedoraproject.org  Wed Sep 24 04:18:36 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 24 Sep 2008 04:18:36 +0000 (UTC)
Subject: rpms/UnihanDb/F-9 UnihanDb.spec, 1.2, 1.3 import.log, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20080924041836.4F66F70103@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/UnihanDb/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18088/F-9

Modified Files:
	UnihanDb.spec import.log sources 
Log Message:
Correct FreqRank field in kMandarinTable


Index: UnihanDb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/UnihanDb/F-9/UnihanDb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UnihanDb.spec	2 Sep 2008 02:47:27 -0000	1.2
+++ UnihanDb.spec	24 Sep 2008 04:18:05 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           UnihanDb
 %define         UnihanDb_name Unihan.db
-%define         rel_num 5
+%define         rel_num 7
 Version:        5.1.0
 Release:        %{rel_num}%{?dist}
 Group:          System Environment/Libraries
@@ -11,8 +11,8 @@
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-BuildRequires:  libUnihan-devel >= 0.4.1, net-tools
-Requires:	sqlite
+BuildRequires:  libUnihan-devel >= 0.5.0
+Requires:       sqlite
 URL:            http://www.unicode.org/charts/unihan.html
 
 Source0:        ftp://ftp.unicode.org/Public/UNIDATA/Unihan.zip
@@ -50,8 +50,8 @@
 %{_datadir}/%{name}
 
 %changelog
-* Tue Sep 02 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1.0-5
-- For Koji build .
+* Tue Sep 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1.0-7
+- Correct counting in FreqRank field of kMandarin table.
 
 * Thu Aug 14 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1.0-4
 - Change the license to MIT.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/UnihanDb/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	2 Sep 2008 02:47:27 -0000	1.2
+++ import.log	24 Sep 2008 04:18:05 -0000	1.3
@@ -1,2 +1,3 @@
 UnihanDb-5_1_0-4_fc9:F-9:UnihanDb-5.1.0-4.fc9.src.rpm:1220257255
 UnihanDb-5_1_0-5_fc9:F-9:UnihanDb-5.1.0-5.fc9.src.rpm:1220323650
+UnihanDb-5_1_0-7_fc9:F-9:UnihanDb-5.1.0-7.fc9.src.rpm:1222229875


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/UnihanDb/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2008 08:26:27 -0000	1.2
+++ sources	24 Sep 2008 04:18:05 -0000	1.3
@@ -1,2 +1,2 @@
 b6c8116d4a0f4895e4bd7ea48b3d6679  Unihan.zip
-cc2281b6b7baa00eb7c9114176e9a2c5  UnihanDb-doc-5.1.0.tar.gz
+ba5f5db7c4f0e6e593e4375a945576f4  UnihanDb-doc-5.1.0.tar.gz



From dchen at fedoraproject.org  Wed Sep 24 04:21:52 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 24 Sep 2008 04:21:52 +0000 (UTC)
Subject: rpms/UnihanDb/F-8 - New directory
Message-ID: <20080924042152.29B167013D@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/UnihanDb/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18724/F-8

Log Message:
Directory /cvs/pkgs/rpms/UnihanDb/F-8 added to the repository




From denis at fedoraproject.org  Wed Sep 24 04:23:10 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 24 Sep 2008 04:23:10 +0000 (UTC)
Subject: rpms/libgnomemm26/devel .cvsignore, 1.11, 1.12 libgnomemm.spec, 1.19,
	1.20 sources, 1.12, 1.13
Message-ID: <20080924042310.9529C70103@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomemm26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18963

Modified Files:
	.cvsignore libgnomemm.spec sources 
Log Message:
Update to upstream 2.24.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomemm26/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Mar 2008 18:12:40 -0000	1.11
+++ .cvsignore	24 Sep 2008 04:22:40 -0000	1.12
@@ -1 +1 @@
-libgnomemm-2.22.0.tar.bz2
+libgnomemm-2.24.0.tar.bz2


Index: libgnomemm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomemm26/devel/libgnomemm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libgnomemm.spec	12 Mar 2008 18:12:40 -0000	1.19
+++ libgnomemm.spec	24 Sep 2008 04:22:40 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           libgnomemm26
-Version:        2.22.0
+Version:        2.24.0
 Release:        1
 
 Summary:        C++ interface for Gnome libs (a GUI library for X)
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Sep 24 2008 Denis Leroy <denis at poolshark.org> - 2.24.0-1
+- Update to upstream 2.24.0
+
 * Wed Mar 12 2008 Denis Leroy <denis at dedibox.albator.org> - 2.22.0-1
 - Update to upstream 2.22.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomemm26/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	12 Mar 2008 18:12:40 -0000	1.12
+++ sources	24 Sep 2008 04:22:40 -0000	1.13
@@ -1 +1 @@
-a07209b2cfbc630f8c4d46b6a6f1db32  libgnomemm-2.22.0.tar.bz2
+e77dd1df8e2eb1652d28e30d7c5252a4  libgnomemm-2.24.0.tar.bz2



From dchen at fedoraproject.org  Wed Sep 24 04:24:01 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 24 Sep 2008 04:24:01 +0000 (UTC)
Subject: rpms/UnihanDb/F-8 Makefile, NONE, 1.1 UnihanDb.spec, NONE,
	1.1 import.log, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080924042401.D9C8D70103@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/UnihanDb/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19193/F-8

Added Files:
	Makefile UnihanDb.spec import.log sources 
Log Message:
Correct FreqRank field in kMandarinTable


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE UnihanDb.spec ---
Name:           UnihanDb
%define         UnihanDb_name Unihan.db
%define         rel_num 7
Version:        5.1.0
Release:        %{rel_num}%{?dist}
Group:          System Environment/Libraries
License:        MIT
Summary:        The Unihan character database in fifth normal form
Summary(zh_CN): ?????????????????????????????????(Unihan)?????????
Summary(zh_TW): ?????????????????????????????????(Unihan)?????????

BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
BuildRequires:  libUnihan-devel >= 0.5.0
Requires:       sqlite
URL:            http://www.unicode.org/charts/unihan.html

Source0:        ftp://ftp.unicode.org/Public/UNIDATA/Unihan.zip
Source1:        http://downloads.sourceforge.net/libunihan/%{name}-doc-%{version}.tar.gz

%description
UnihanDb provides a Unihan character database in fifth normal form.
The original Unihan textual data is not normalized, and further parsing 
effort is needed to obtain data from compound values of Unihan "tags".
This database splits those tag value into atom fields, thus in most case
further parsing is not required.

The version number of this package is same as the upstream Unicode
standard it follows.

%prep
%setup -q -a 1 -c -n %{name}-%{version}


%build
unihan_converter Unihan.txt %{UnihanDb_name}.%{version}-%{rel_num}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
cp %{UnihanDb_name}.%{version}-%{rel_num} $RPM_BUILD_ROOT/%{_datadir}/%{name}
ln -sf %{UnihanDb_name}.%{version}-%{rel_num} $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{UnihanDb_name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README-db ChangeLog-db
%{_datadir}/%{name}

%changelog
* Tue Sep 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1.0-7
- Correct counting in FreqRank field of kMandarin table.

* Thu Aug 14 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1.0-4
- Change the license to MIT.

* Mon Aug 11 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1.0-3
- Sync with upstream version.
- UnihanDb-doc version has changed from {version}-{rel} to {version}.

* Fri Aug 01 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1-2
- Field kIRGKangXi and kKangXi are split into kangXi_page, kangXi_charNum, and
kangXi_virtrul
- Field kHanyuPinlu are split into pinyin and pinyin_freq

* Fri Jul 04 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1-1
- Add kMandarin frequency rank support.


* Tue Jul 01 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1-0
- Initial public release.



--- NEW FILE import.log ---
UnihanDb-5_1_0-7_fc9:F-8:UnihanDb-5.1.0-7.fc9.src.rpm:1222230174


--- NEW FILE sources ---
b6c8116d4a0f4895e4bd7ea48b3d6679  Unihan.zip
ba5f5db7c4f0e6e593e4375a945576f4  UnihanDb-doc-5.1.0.tar.gz



From dchen at fedoraproject.org  Wed Sep 24 04:48:12 2008
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 24 Sep 2008 04:48:12 +0000 (UTC)
Subject: rpms/UnihanDb/EL-5 UnihanDb.spec, 1.1, 1.2 import.log, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080924044812.9DDF470103@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/UnihanDb/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21685/EL-5

Modified Files:
	UnihanDb.spec import.log sources 
Log Message:
Correct FreqRank field in kMandarinTable


Index: UnihanDb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/UnihanDb/EL-5/UnihanDb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnihanDb.spec	1 Sep 2008 08:30:21 -0000	1.1
+++ UnihanDb.spec	24 Sep 2008 04:47:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           UnihanDb
 %define         UnihanDb_name Unihan.db
-%define         rel_num 4
+%define         rel_num 7
 Version:        5.1.0
 Release:        %{rel_num}%{?dist}
 Group:          System Environment/Libraries
@@ -11,8 +11,8 @@
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-BuildRequires:  libUnihan-devel >= 0.4.1
-Requires:	sqlite
+BuildRequires:  libUnihan-devel >= 0.5.0
+Requires:       sqlite
 URL:            http://www.unicode.org/charts/unihan.html
 
 Source0:        ftp://ftp.unicode.org/Public/UNIDATA/Unihan.zip
@@ -50,6 +50,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Tue Sep 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1.0-7
+- Correct counting in FreqRank field of kMandarin table.
+
 * Thu Aug 14 2008 Ding-Yi Chen <dchen at redhat dot com> - 5.1.0-4
 - Change the license to MIT.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/UnihanDb/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Sep 2008 08:30:21 -0000	1.1
+++ import.log	24 Sep 2008 04:47:42 -0000	1.2
@@ -1 +1,2 @@
 UnihanDb-5_1_0-4_fc9:EL-5:UnihanDb-5.1.0-4.fc9.src.rpm:1220257826
+UnihanDb-5_1_0-7_fc9:EL-5:UnihanDb-5.1.0-7.fc9.src.rpm:1222231450


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/UnihanDb/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2008 08:30:21 -0000	1.2
+++ sources	24 Sep 2008 04:47:42 -0000	1.3
@@ -1,2 +1,2 @@
 b6c8116d4a0f4895e4bd7ea48b3d6679  Unihan.zip
-cc2281b6b7baa00eb7c9114176e9a2c5  UnihanDb-doc-5.1.0.tar.gz
+ba5f5db7c4f0e6e593e4375a945576f4  UnihanDb-doc-5.1.0.tar.gz



From pkgdb at fedoraproject.org  Wed Sep 24 04:48:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 04:48:45 +0000
Subject: [pkgdb] nautilus-python had group_acl changed
Message-ID: <20080924044845.902BE208D1A@bastion.fedora.phx.redhat.com>

trondd has set the commit acl on nautilus-python (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus-python



From pkgdb at fedoraproject.org  Wed Sep 24 04:48:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 04:48:50 +0000
Subject: [pkgdb] nautilus-python had group_acl changed
Message-ID: <20080924044850.4F452208DA0@bastion.fedora.phx.redhat.com>

trondd has set the commit acl on nautilus-python (Fedora EPEL 5) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus-python



From pkgdb at fedoraproject.org  Wed Sep 24 04:48:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 04:48:53 +0000
Subject: [pkgdb] nautilus-python had group_acl changed
Message-ID: <20080924044853.93818208DA4@bastion.fedora.phx.redhat.com>

trondd has set the commit acl on nautilus-python (Fedora 7) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus-python



From pkgdb at fedoraproject.org  Wed Sep 24 04:48:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 04:48:55 +0000
Subject: [pkgdb] nautilus-python had group_acl changed
Message-ID: <20080924044855.12B63208DA8@bastion.fedora.phx.redhat.com>

trondd has set the commit acl on nautilus-python (Fedora 8) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus-python



From pkgdb at fedoraproject.org  Wed Sep 24 04:48:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 04:48:53 +0000
Subject: [pkgdb] nautilus-python had group_acl changed
Message-ID: <20080924044853.A1519208DA6@bastion.fedora.phx.redhat.com>

trondd has set the commit acl on nautilus-python (Fedora 6) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus-python



From pkgdb at fedoraproject.org  Wed Sep 24 04:48:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 04:48:56 +0000
Subject: [pkgdb] nautilus-python had group_acl changed
Message-ID: <20080924044856.B8DFB208DAA@bastion.fedora.phx.redhat.com>

trondd has set the commit acl on nautilus-python (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus-python



From pkgdb at fedoraproject.org  Wed Sep 24 05:02:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 05:02:55 +0000
Subject: [pkgdb] nautilus-python had acl change status
Message-ID: <20080924050255.C731A208D68@bastion.fedora.phx.redhat.com>

trondd has set the commit acl on nautilus-python (Fedora devel) to Approved for bpepple

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus-python



From transif at fedoraproject.org  Wed Sep 24 05:33:22 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Wed, 24 Sep 2008 05:33:22 +0000 (UTC)
Subject: comps/po zh_TW.po,1.16,1.17
Message-ID: <20080924053323.1953670103@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26536/po

Modified Files:
	zh_TW.po 
Log Message:
    2008-09-24  Terry Chuang <tchuang at redhat.com> (via
tchuang at fedoraproject.org)
    
      * po/zh_TW.po: Translation updated.
    



Index: zh_TW.po
===================================================================
RCS file: /cvs/pkgs/comps/po/zh_TW.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- zh_TW.po	24 Sep 2008 02:02:26 -0000	1.16
+++ zh_TW.po	24 Sep 2008 05:32:51 -0000	1.17
@@ -13,7 +13,7 @@
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-18 01:23+0000\n"
-"PO-Revision-Date: 2008-09-24 12:01+1000\n"
+"PO-Revision-Date: 2008-09-24 14:10+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -405,7 +405,7 @@
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
 #: ../comps-f10.xml.in.h:82 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31
 msgid "Install this group of packages to use the base graphical (X) user interface."
-msgstr "???????????????????????????????????????????????? (X) ??????????????????"
+msgstr "???????????????????????????????????????????????????X?????????????????????"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
 #: ../comps-f10.xml.in.h:84
@@ -876,7 +876,7 @@
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
 msgstr ""
-"??????????????????????????????????????????????????????????????????????????? ?????????????????? ???????????? X ???"
+"????????????????????????????????????????????????????????????????????????????????????????????? ???????????? X ???"
 "????????????"
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:179
@@ -902,20 +902,20 @@
 "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 ""
-"????????????????????????????????????????????????????????????????????????????????????(SAMBA)?????????????????????"
+"???????????????????????????????????????????????????????????????????????????????????????SAMBA????????????????????????"
 "????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
 #: ../comps-f10.xml.in.h:193
 msgid "This package group allows you to run a DNS name server (BIND) on the system."
-msgstr "???????????????????????????????????????????????? DNS ??????????????? (BIND)???"
+msgstr "???????????????????????????????????????????????? DNS ??????????????????BIND??????"
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:184
 #: ../comps-f10.xml.in.h:194
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
-msgstr "????????????????????????????????? Linux ??? MS Windows (tm) ????????????????????????"
+msgstr "????????????????????????????????? Linux ??? MS Windows???tm???????????????????????????"
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:185
 #: ../comps-f10.xml.in.h:195
@@ -1173,7 +1173,7 @@
 "desktop, system icons, and a graphical file manager."
 msgstr ""
 "GNOME ???????????????????????????????????????????????????????????????????????????????????? ?????????????????????"
-"????????????(?????????????????????)"
+"???????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
 msgid ""
@@ -1188,7 +1188,7 @@
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
 msgstr ""
-"??????????????????????????????????????????????????????????????????????????????????????? ??????????????? Emacs "
+"?????????????????????????????????????????????????????????????????????????????????????????????????????? Emacs "
 "??? Vi???"
 
 #: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48



From caillon at fedoraproject.org  Wed Sep 24 06:07:30 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 06:07:30 +0000 (UTC)
Subject: rpms/blam/F-9 blam.spec,1.24,1.25
Message-ID: <20080924060730.2E9F370103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/blam/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30824

Modified Files:
	blam.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 1.8.5-2
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/extras/rpms/blam/F-9/blam.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- blam.spec	21 Jul 2008 14:08:19 -0000	1.24
+++ blam.spec	24 Sep 2008 06:06:59 -0000	1.25
@@ -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.1
+%define	gecko_version		1.9.0.2
 
 Name:		blam
 Version:	1.8.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -135,9 +135,12 @@
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 1.8.5-2
+- Rebuild against newer gecko
+
 * Mon Jul 21 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.8.5-1
 - Update to upstream (1.8.5), fixes FTBS (#434382)
-- Set gecko version to new xulrunner: 1.9.0.1
+- Set gecko version to new xulrunner: 1.9.0.2
 - BR: gecko-devel-unstable
 - Drop a number of patches which no longer apply
 - Add new icons to file list.



From caillon at fedoraproject.org  Wed Sep 24 06:08:29 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 06:08:29 +0000 (UTC)
Subject: rpms/cairo-dock/F-9 cairo-dock.spec,1.20,1.21
Message-ID: <20080924060829.B6BB770103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/cairo-dock/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31033

Modified Files:
	cairo-dock.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 1.6.2.3-1.1
- Rebuild against newer gecko



Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-9/cairo-dock.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cairo-dock.spec	9 Sep 2008 03:15:52 -0000	1.20
+++ cairo-dock.spec	24 Sep 2008 06:07:59 -0000	1.21
@@ -38,7 +38,7 @@
 
 Name:		cairo-dock
 Version:	%{mainver}
-Release:	%{fedora_rel}%{?dist}
+Release:	%{fedora_rel}%{?dist}.1
 Summary:	Light eye-candy fully themable animated dock
 
 Group:		User Interface/Desktops
@@ -645,6 +645,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 1.6.2.3-1.1
+- Rebuild against newer gecko
+
 * Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.3-1
 - 1.6.2.3
 



From caillon at fedoraproject.org  Wed Sep 24 06:09:23 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 06:09:23 +0000 (UTC)
Subject: rpms/chmsee/F-9 chmsee.spec,1.28,1.29
Message-ID: <20080924060923.2A6AF70103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/chmsee/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31220

Modified Files:
	chmsee.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 1.0.1-5
- Rebuild against newer gecko



Index: chmsee.spec
===================================================================
RCS file: /cvs/extras/rpms/chmsee/F-9/chmsee.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- chmsee.spec	20 Jun 2008 11:08:59 -0000	1.28
+++ chmsee.spec	24 Sep 2008 06:08:52 -0000	1.29
@@ -1,6 +1,6 @@
 Name:		chmsee
 Version:	1.0.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary(zh_CN):	CHM ??????????????????, ?????? Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
@@ -108,6 +108,9 @@
 %{_datadir}/icons/hicolor/*/apps/chmsee.png
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 1.0.1-5
+- Rebuild against newer gecko
+
 * Fri Jun 20 2008 Martin Stransky <stransky at redhat.com> - 1.0.1-4
 - Rebuild against new xulrunner
 



From caillon at fedoraproject.org  Wed Sep 24 06:10:20 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 06:10:20 +0000 (UTC)
Subject: rpms/devhelp/F-9 devhelp.spec,1.90,1.91
Message-ID: <20080924061020.8227370103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/devhelp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31424

Modified Files:
	devhelp.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 0.19.1-4
- Rebuild against newer gecko



Index: devhelp.spec
===================================================================
RCS file: /cvs/extras/rpms/devhelp/F-9/devhelp.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- devhelp.spec	16 Jul 2008 22:12:52 -0000	1.90
+++ devhelp.spec	24 Sep 2008 06:09:50 -0000	1.91
@@ -1,5 +1,5 @@
 # Last updated for 0.17
-%define gecko_version 1.9.0.1
+%define gecko_version 1.9.0.2
 %define gtk2_version 2.8.0
 %define libwnck_version 2.10.0
 
@@ -7,7 +7,7 @@
 
 Name: devhelp
 Version: 0.19.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API document browser
@@ -135,6 +135,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 0.19.1-4
+- Rebuild against newer gecko
+
 * Wed Jul 16 2008 Christopher Aillon <caillon at redhat.com> - 0.19.1-3
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Wed Sep 24 06:11:13 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 06:11:13 +0000 (UTC)
Subject: rpms/evolution-rss/F-9 evolution-rss.spec,1.17,1.18
Message-ID: <20080924061113.8C60A70103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/evolution-rss/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31630

Modified Files:
	evolution-rss.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 0.1.0-3
- Rebuild against newer gecko



Index: evolution-rss.spec
===================================================================
RCS file: /cvs/extras/rpms/evolution-rss/F-9/evolution-rss.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- evolution-rss.spec	5 Jul 2008 15:59:05 -0000	1.17
+++ evolution-rss.spec	24 Sep 2008 06:10:43 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Evolution RSS Reader
 Name: evolution-rss
 Version: 0.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Internet
 License: GPLv2 and GPLv2+
 Source: http://gnome.eu.org/%{name}-%{version}.tar.gz
@@ -89,6 +89,9 @@
 %doc TODO
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 0.1.0-3
+- Rebuild against newer gecko
+
 * Sat Jul  5 2008 Lucian Langa <cooly at gnome.eu.org> - 0.1.0-2
 - Fix firefox import RH bug #452322
 



From caillon at fedoraproject.org  Wed Sep 24 06:12:06 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 06:12:06 +0000 (UTC)
Subject: rpms/galeon/F-9 galeon.spec,1.50,1.51
Message-ID: <20080924061206.8112770103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/galeon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31822

Modified Files:
	galeon.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 2.0.5-3
- Rebuild against newer gecko



Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/F-9/galeon.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- galeon.spec	18 Jun 2008 07:33:38 -0000	1.50
+++ galeon.spec	24 Sep 2008 06:11:35 -0000	1.51
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -119,6 +119,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 2.0.5-3
+- Rebuild against newer gecko
+
 * Wed Jun 18 2008 Denis Leroy <denis at poolshark.org> - 2.0.5-2
 - Rebuild with xulrunner 1.9
 



From caillon at fedoraproject.org  Wed Sep 24 06:13:05 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 06:13:05 +0000 (UTC)
Subject: rpms/gnome-python2-extras/F-9 gnome-python2-extras.spec,1.29,1.30
Message-ID: <20080924061305.1AD3170103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gnome-python2-extras/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32115

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 2.19.1-18
- Rebuild against newer gecko



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-extras/F-9/gnome-python2-extras.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnome-python2-extras.spec	18 Jul 2008 20:49:30 -0000	1.29
+++ gnome-python2-extras.spec	24 Sep 2008 06:12:34 -0000	1.30
@@ -21,7 +21,7 @@
 
 Name: gnome-python2-extras
 Version: 2.19.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPL/LGPL
 Group: Development/Languages
 Summary: The sources for additional. PyGNOME Python extension modules.
@@ -199,8 +199,11 @@
 %{_libdir}/pkgconfig/pygda-3.0.pc
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 2.19.1-18
+- Rebuild against newer gecko
+
 * Fri Jul 18 2008 Paul W. Frields <stickster at gmail.com> - 2.19.1-17.fc9
-- Rebuild against new xulrunner (1.9.0.1) and fix dependencies
+- Rebuild against new xulrunner (1.9.0.2) and fix dependencies
 
 * Fri Jun 20 2008 Martin Stransky <stransky at redhat.com> - 2.19.1-16.fc9
 - Rebuild against new gecko-libs 1.9 (xulrunner)



From caillon at fedoraproject.org  Wed Sep 24 06:14:03 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 06:14:03 +0000 (UTC)
Subject: rpms/gnome-web-photo/F-9 gnome-web-photo.spec,1.13,1.14
Message-ID: <20080924061403.2BF1F70103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gnome-web-photo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32438

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 0.3-14
- Rebuild against newer gecko



Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-web-photo/F-9/gnome-web-photo.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-web-photo.spec	21 Jul 2008 13:33:48 -0000	1.13
+++ gnome-web-photo.spec	24 Sep 2008 06:13:32 -0000	1.14
@@ -3,7 +3,7 @@
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.3
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: LGPLv2+
 Group: Applications/Internet
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
@@ -81,6 +81,9 @@
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 0.3-14
+- Rebuild against newer gecko
+
 * Mon Jul 21 2008 Martin Stransky <stransky at redhat.com> - 0.3-13
 - Rebuild against new xulrunner
 



From erikos at fedoraproject.org  Wed Sep 24 06:14:18 2008
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Wed, 24 Sep 2008 06:14:18 +0000 (UTC)
Subject: rpms/sugar-artwork/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 sugar-artwork.spec, 1.11, 1.12
Message-ID: <20080924061418.C953270103@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-artwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32481

Modified Files:
	.cvsignore sources sugar-artwork.spec 
Log Message:
* Tue Sep 23 2008 Simon Schampijer <simon at laptop.org> - 0.82.3-1
- Fix corrupted network-wireless-060.svg




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Sep 2008 10:35:49 -0000	1.8
+++ .cvsignore	24 Sep 2008 06:13:48 -0000	1.9
@@ -1,2 +1 @@
-sugar-artwork-0.82.1.tar.bz2
-sugar-artwork-0.82.2.tar.bz2
+sugar-artwork-0.82.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Sep 2008 10:35:49 -0000	1.8
+++ sources	24 Sep 2008 06:13:48 -0000	1.9
@@ -1 +1 @@
-e23f29c97e294873d4a9d3d9f9892c1f  sugar-artwork-0.82.2.tar.bz2
+cb0083f640835d34e07000c32819752e  sugar-artwork-0.82.3.tar.bz2


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sugar-artwork.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sugar-artwork.spec	20 Sep 2008 10:35:49 -0000	1.11
+++ sugar-artwork.spec	24 Sep 2008 06:13:48 -0000	1.12
@@ -3,8 +3,8 @@
 
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
-Version: 0.82.2
-Release: 2%{?dist}
+Version: 0.82.3
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/artwork
@@ -62,6 +62,9 @@
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Tue Sep 23 2008 Simon Schampijer <simon at laptop.org> - 0.82.3-1
+- Fix corrupted network-wireless-060.svg
+
 * Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.2-1
 - #7685 Alternate home layouts; fixed ring scaling; better modularization of layouts
 - #8554 Indicate connected AP in Neighborhood view.



From caillon at fedoraproject.org  Wed Sep 24 06:14:56 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 06:14:56 +0000 (UTC)
Subject: rpms/google-gadgets/F-9 google-gadgets.spec,1.3,1.4
Message-ID: <20080924061456.2A7BB70103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/google-gadgets/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32662

Modified Files:
	google-gadgets.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 0.10.1-5
- Rebuild against newer gecko



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/extras/rpms/google-gadgets/F-9/google-gadgets.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- google-gadgets.spec	3 Sep 2008 02:46:48 -0000	1.3
+++ google-gadgets.spec	24 Sep 2008 06:14:25 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           google-gadgets
 Version:        0.10.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -170,6 +170,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 0.10.1-5
+- Rebuild against newer gecko
+
 * Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 0.10.1-4
 - Unquote version strings in .pc files
 



From caillon at fedoraproject.org  Wed Sep 24 06:15:48 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 06:15:48 +0000 (UTC)
Subject: rpms/gtkmozembedmm/F-9 gtkmozembedmm.spec,1.26,1.27
Message-ID: <20080924061548.8D0CE70103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gtkmozembedmm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv512

Modified Files:
	gtkmozembedmm.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 1.4.2.cvs20060817-21
- Rebuild against newer gecko



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/F-9/gtkmozembedmm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gtkmozembedmm.spec	20 Jun 2008 11:26:35 -0000	1.26
+++ gtkmozembedmm.spec	24 Sep 2008 06:15:18 -0000	1.27
@@ -1,7 +1,7 @@
 %define gecko_ver 1.9
 Name:           gtkmozembedmm
 Version:        1.4.2.cvs20060817
-Release:        20%{?dist}
+Release:        21%{?dist}
 
 Summary:        C++ wrapper for GtkMozembed
 
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 1.4.2.cvs20060817-21
+- Rebuild against newer gecko
+
 * Fri Jun 20 2008 Martin Stransky <stransky at redhat.com> - 1.4.2.cvs20060817-20
 - rebuild against new gecko-libs 1.9 (xulrunner)
 



From caillon at fedoraproject.org  Wed Sep 24 06:16:56 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 06:16:56 +0000 (UTC)
Subject: rpms/kazehakase/F-9 kazehakase.spec,1.63,1.64
Message-ID: <20080924061656.EC47370103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/kazehakase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv816

Modified Files:
	kazehakase.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 0.5.5-1.1
- Rebuild against newer gecko



Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-9/kazehakase.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kazehakase.spec	29 Jul 2008 16:33:31 -0000	1.63
+++ kazehakase.spec	24 Sep 2008 06:16:26 -0000	1.64
@@ -35,7 +35,7 @@
 
 Name:		kazehakase
 Version:	0.5.5
-Release:	%{_release}%{?dist}
+Release:	%{_release}%{?dist}.1
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
@@ -293,6 +293,9 @@
 %endif
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 0.5.5-1.1
+- Rebuild against newer gecko
+
 * Wed Jul 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.5-1
 - 0.5.5
 



From caillon at fedoraproject.org  Wed Sep 24 06:17:49 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 06:17:49 +0000 (UTC)
Subject: rpms/Miro/F-9 Miro.spec,1.33,1.34
Message-ID: <20080924061749.C54B770103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/Miro/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1007

Modified Files:
	Miro.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 1.2.4-3
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-9/Miro.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Miro.spec	18 Jul 2008 21:12:07 -0000	1.33
+++ Miro.spec	24 Sep 2008 06:17:19 -0000	1.34
@@ -5,7 +5,7 @@
 
 Name:           Miro
 Version:        1.2.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Miro - Internet TV Player
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 1.2.4-3
+- Rebuild against newer gecko
+
 * Fri Jul 18 2008 Paul W. Frields <stickster at gmail.com> - 1.2.4-2
 - Rebuild against xulrunner and fix dependencies
 



From caillon at fedoraproject.org  Wed Sep 24 06:18:47 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 06:18:47 +0000 (UTC)
Subject: rpms/mozvoikko/F-9 mozvoikko.spec,1.2,1.3
Message-ID: <20080924061847.7207370103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/mozvoikko/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1236

Modified Files:
	mozvoikko.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 0.9.5-3
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/extras/rpms/mozvoikko/F-9/mozvoikko.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mozvoikko.spec	30 Aug 2008 17:14:20 -0000	1.2
+++ mozvoikko.spec	24 Sep 2008 06:18:17 -0000	1.3
@@ -1,5 +1,5 @@
 # For the xulrunner unstable requires
-%define gecko_ver 1.9.0.1
+%define gecko_ver 1.9.0.2
 # 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:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
@@ -70,9 +70,12 @@
 
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 0.9.5-3
+- Rebuild against newer gecko
+
 * Sat Aug 30 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.5-2
 - Fix the xulrunner requires:
-  - Add define gecko_ver 1.9.0.1
+  - Add define gecko_ver 1.9.0.2
   - Add Requires: gecko-libs = gecko_ver
   - Add BuildRequires: gecko-devel-unstable = gecko_ver
   - Remove all actual xulrunner requires



From caillon at fedoraproject.org  Wed Sep 24 06:19:40 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 06:19:40 +0000 (UTC)
Subject: rpms/mugshot/F-9 mugshot.spec,1.41,1.42
Message-ID: <20080924061940.498E770103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/mugshot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1446

Modified Files:
	mugshot.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 1.2.2-2
- Rebuild against newer gecko



Index: mugshot.spec
===================================================================
RCS file: /cvs/extras/rpms/mugshot/F-9/mugshot.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mugshot.spec	30 Jul 2008 17:31:31 -0000	1.41
+++ mugshot.spec	24 Sep 2008 06:19:10 -0000	1.42
@@ -3,7 +3,7 @@
 
 Name:           mugshot
 Version:        1.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -168,6 +168,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 1.2.2-2
+- Rebuild against newer gecko
+
 * Wed Jul 30 2008 Owen Taylor <otaylor at redhat.com> - 1.2.2-1
 - Update to 1.2.2 
   - Fixes Firefox min version to 3.0.x,  #451918 again



From caillon at fedoraproject.org  Wed Sep 24 06:20:33 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 06:20:33 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-9 ruby-gnome2.spec,1.29,1.30
Message-ID: <20080924062033.282DA70103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/ruby-gnome2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1662

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 0.17.0-2
- Rebuild against newer gecko



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-9/ruby-gnome2.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ruby-gnome2.spec	18 Sep 2008 12:11:50 -0000	1.29
+++ ruby-gnome2.spec	24 Sep 2008 06:20:02 -0000	1.30
@@ -10,7 +10,7 @@
 
 Name:           ruby-gnome2
 Version:        0.17.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -700,6 +700,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 0.17.0-2
+- Rebuild against newer gecko
+
 * Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.17.0-1
 - Update to 0.17.0
 - Patch from svn to fix Ruby/GLib bug (bug 456816)



From caillon at fedoraproject.org  Wed Sep 24 06:21:26 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 06:21:26 +0000 (UTC)
Subject: rpms/totem/F-9 totem.spec,1.190,1.191
Message-ID: <20080924062126.033A970103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/totem/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1861

Modified Files:
	totem.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 2.23.2-7
- Rebuild against newer gecko



Index: totem.spec
===================================================================
RCS file: /cvs/extras/rpms/totem/F-9/totem.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- totem.spec	25 Jul 2008 10:11:52 -0000	1.190
+++ totem.spec	24 Sep 2008 06:20:55 -0000	1.191
@@ -11,7 +11,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.23.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2 with exception
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/totem/
@@ -436,11 +436,14 @@
 %endif
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 2.23.2-7
+- Rebuild against newer gecko
+
 * Fri Jul 25 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.2-6
 - Add patch to make FLV videos thumbnail (#449279)
 
 * Fri Jul 18 2008 Martin Stransky <stransky at redhat.com> - 2.23.2-5
-- Rebuild against xulrunner 1.9.0.1 and fixed gecko dependency
+- Rebuild against xulrunner 1.9.0.2 and fixed gecko dependency
 
 * Wed Jun 18 2008 Owen Taylor <otaylor at redhat.com> - 2.23.2-4
 - Rebuild against xulrunner 1.9 final



From caillon at fedoraproject.org  Wed Sep 24 06:22:23 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 06:22:23 +0000 (UTC)
Subject: rpms/yelp/F-9 yelp.spec,1.137,1.138
Message-ID: <20080924062223.7732E70103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/yelp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2063

Modified Files:
	yelp.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 2.22.1-5
- Rebuild against newer gecko



Index: yelp.spec
===================================================================
RCS file: /cvs/extras/rpms/yelp/F-9/yelp.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- yelp.spec	16 Jul 2008 22:14:08 -0000	1.137
+++ yelp.spec	24 Sep 2008 06:21:53 -0000	1.138
@@ -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.1
+%define gecko_version 1.9.0.2
 
 %define pango_version 1.0.99
 %define desktop_file_utils_version 0.3-7
@@ -20,7 +20,7 @@
 Summary: A system documentation reader from the Gnome project
 Name: yelp
 Version: 2.22.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.22/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -164,6 +164,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 2.22.1-5
+- Rebuild against newer gecko
+
 * Wed Jul 16 2008 Christopher Aillon <caillon at redhat.com> - 2.22.1-4
 - Rebuild against newer gecko
 



From veillard at fedoraproject.org  Wed Sep 24 07:10:41 2008
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Wed, 24 Sep 2008 07:10:41 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt.spec,1.97,1.98
Message-ID: <20080924071041.7958F70103@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6739

Modified Files:
	libvirt.spec 
Log Message:
Fix a build failure in ppc64 for unpackaged file since without_qemu
Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- libvirt.spec	23 Sep 2008 21:25:17 -0000	1.97
+++ libvirt.spec	24 Sep 2008 07:10:11 -0000	1.98
@@ -238,6 +238,11 @@
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
 # Strip auto-generated UUID - we need it generated per-install
 sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml
+%else
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
+rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_qemu.aug
+rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
 %endif
 %find_lang %{name}
 
@@ -256,6 +261,7 @@
 /sbin/ldconfig
 
 %if %{with_libvirtd}
+%if %{with_qemu}
 # We want to install the default network for initial RPM installs
 # or on the first upgrade from a non-network aware libvirt only.
 # We check this by looking to see if the daemon is already installed
@@ -268,6 +274,7 @@
          > %{_sysconfdir}/libvirt/qemu/networks/default.xml
     ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
 fi
+%endif
 
 /sbin/chkconfig --add libvirtd
 %endif



From veillard at fedoraproject.org  Wed Sep 24 07:17:03 2008
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Wed, 24 Sep 2008 07:17:03 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt.spec,1.98,1.99
Message-ID: <20080924071703.4CCE470103@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7372

Modified Files:
	libvirt.spec 
Log Message:
Apparently make force-tag doesn't exist anymore, so rev'ing, Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- libvirt.spec	24 Sep 2008 07:10:11 -0000	1.98
+++ libvirt.spec	24 Sep 2008 07:16:32 -0000	1.99
@@ -34,7 +34,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.4.6
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz



From veillard at fedoraproject.org  Wed Sep 24 07:19:32 2008
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Wed, 24 Sep 2008 07:19:32 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt.spec,1.99,1.100
Message-ID: <20080924071932.51D8070103@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7619

Modified Files:
	libvirt.spec 
Log Message:
Try to fix ppc64 build, rev'ing and updating changelog, Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- libvirt.spec	24 Sep 2008 07:16:32 -0000	1.99
+++ libvirt.spec	24 Sep 2008 07:19:01 -0000	1.100
@@ -394,6 +394,10 @@
 %endif
 
 %changelog
+* Wed Sep 24 2008 Daniel Veillard <veillard at redhat.com> - 0.4.6-2.fc10
+- upstream release 0.4.6
+- fixes some problems with 0.4.5
+
 * Tue Sep  9 2008 Daniel Veillard <veillard at redhat.com> - 0.4.5-2.fc10
 - fix a crash if a QEmu/KVM domain is defined without an emulator path
 



From petersen at fedoraproject.org  Wed Sep 24 07:35:15 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 24 Sep 2008 07:35:15 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.42,1.43
Message-ID: <20080924073515.603FA70103@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9375

Modified Files:
	ghc.spec 
Log Message:
- bring back including haddock-generated lib docs, now under docdir/ghc
- fix macros.ghc filepath (#460304)
- spec file cleanups:
- fix the source urls back
- drop requires chkconfig
- do not override __spec_install_post
- override _target_platform so we can use %%configure
- setup docs building in build.mk
- no longer need to remove network/include/Typeable.h
- install binaries under libdir not libexec
- remove hsc2hs and runhaskell binaries since are alternatives




Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ghc.spec	17 Sep 2008 07:11:56 -0000	1.42
+++ ghc.spec	24 Sep 2008 07:34:44 -0000	1.43
@@ -2,32 +2,20 @@
 %define build_prof 1
 %define build_doc 1
 
-# Fixing packaging problems can be a tremendous pain because it
-# generally requires a complete rebuild, which takes hours.  To offset
-# the misery, do a complete build once using "rpmbuild -bc", then copy
-# your built tree to a directory of the same name suffixed with
-# ".built", using "cp -al".  Finally, set this variable, and it will
-# copy the already-built tree into place during build instead of
-# actually doing the build.
-#
-# Obviously, this can only work if you leave the build section
-# completely untouched between builds.
-%define package_debugging 0
-
 Name:		ghc
 Version:	6.8.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Glasgow Haskell Compilation system
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
 ExcludeArch:	alpha ppc64
 License:	BSD
 Group:		Development/Languages
-Source0:	http://www.haskell.org/ghc/dist/stable/dist/ghc-%{version}-src.tar.bz2
-Source1:	http://www.haskell.org/ghc/dist/stable/dist/ghc-%{version}-src-extralibs.tar.bz2
+Source0:	http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2
+Source1:	http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src-extralibs.tar.bz2
 Source2:	ghc-rpm-macros.ghc
 Patch0:		ghc-6.8.3-libraries-config.patch
 URL:		http://haskell.org/ghc/
-Requires:	chkconfig, gcc, gmp-devel, readline-devel
+Requires:	gcc, gmp-devel, readline-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      ghc682, ghc681, ghc661, ghc66
 BuildRequires:  ghc, happy, sed
@@ -75,85 +63,51 @@
 
 # the debuginfo subpackage is currently empty anyway, so don't generate it
 %define debug_package %{nil}
-%define __spec_install_post /usr/lib/rpm/brp-compress
 
 %prep
 %setup -q -n %{name}-%{version} -b1
-
-%patch0 -p1 -b .hdkl
+%patch0 -p1 -b .0-haddock~
 
 %build
-%if %{package_debugging}
-cd ..
-rm -rf %{name}-%{version}
-cp -al %{name}-%{version}.built %{name}-%{version}
-cd %{name}-%{version}
-exit 0
-%endif
-
 %if !%{build_prof}
 echo "GhcLibWays=" >> mk/build.mk
 echo "GhcRTSWays=thr debug" >> mk/build.mk
 %endif
 
-HaddockCmd=%{_bindir}/haddock-0.9 \
-./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
-  --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
-  --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \
-  --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \
-  --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir}
-
-cat <<HADDOCK_PATH_HACK >> mk/build.mk
-docdir  := %{_docdir}/%{name}-%{version}
-htmldir := \$(docdir)
-dvidir  := \$(docdir)
-pdfdir  := \$(docdir)
-psdir   := \$(docdir)
-HADDOCK_PATH_HACK
+%if %{build_doc}
+echo "XMLDocWays   = html" >> mk/build.mk
+echo "HADDOCK_DOCS = YES" >> mk/build.mk
+%endif
+
+export HaddockCmd=%{_bindir}/haddock-0.9
+# workaround ghc configure script hysteria about archs
+%define _target_platform %{_build}
+%configure
 
-# drop truncated copy of header (#222865)
-rm libraries/network/include/Typeable.h
+make %{_smp_mflags}
+make %{_smp_mflags} -C libraries
 
-make %{_smp_mflags} all libexecdir=%{_libexecdir}
 %if %{build_doc}
 make %{_smp_mflags} html
-make %{_smp_mflags} -C libraries HADDOCK_DOCS=YES
-( cd libraries/Cabal && docbook2html doc/Cabal.xml --output doc/Cabal )
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir}/%{name}-%{version} \
-  libexecdir=%{_libexecdir}/%{name}-%{version} install
-
-pushd ${RPM_BUILD_ROOT}/%{_libexecdir}/%{name}-%{version}
-strip cgprof ghc-%{version} ghc-pkg.bin hsc2hs-bin unlit
-popd
-
-pushd ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-%{version}
-for i in ../../libexec/%{name}-%{version}/*; do
-  ln -s $i .
-done
-popd
+make DESTDIR=${RPM_BUILD_ROOT} install
 
 %if %{build_doc}
-make DESTDIR=${RPM_BUILD_ROOT} XMLDocWays="html" HADDOCK_DOCS=YES install-docs
-if [ -d ${RPM_BUILD_ROOT}/%{_docdir}/%{name}/libraries ]; then
-  mv ${RPM_BUILD_ROOT}/%{_docdir}/%{name}/libraries \
-    ${RPM_BUILD_ROOT}/%{_docdir}/%{name}-%{version}
-fi
-cp libraries/*.html ${RPM_BUILD_ROOT}/%{_docdir}/%{name}-%{version}/libraries
+make DESTDIR=${RPM_BUILD_ROOT} install-docs
 %endif
 
 # install rpm macros
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm/macros.ghc
+mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm
 cp -p %{SOURCE2} ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm/macros.ghc
 			
 SRC_TOP=$PWD
 rm -f rpm-*-filelist rpm-*.files
 ( cd $RPM_BUILD_ROOT
-  find .%{_libdir}/%{name}-%{version} .%{_libexecdir}/%{name}-%{version} \( -type d -fprintf $SRC_TOP/rpm-dir.files "%%%%dir %%p\n" \) -o \( -type f \( -name '*.p_hi' -o -name '*_p.a' \) -fprint $SRC_TOP/rpm-prof.files \) -o \( -not -name 'package.conf' -fprint $SRC_TOP/rpm-lib.files \)
+  find .%{_libdir}/%{name}-%{version} \( -type d -fprintf $SRC_TOP/rpm-dir.files "%%%%dir %%p\n" \) -o \( -type f \( -name '*.p_hi' -o -name '*_p.a' \) -fprint $SRC_TOP/rpm-prof.files \) -o \( -not -name 'package.conf' -fprint $SRC_TOP/rpm-lib.files \)
 )
 
 # make paths absolute (filter "./usr" to "/usr")
@@ -167,7 +121,8 @@
 # create package.conf.old
 touch $RPM_BUILD_ROOT%{_libdir}/ghc-%{version}/package.conf.old
 
-mv ${RPM_BUILD_ROOT}%{_bindir}/hsc2hs ${RPM_BUILD_ROOT}%{_bindir}/hsc2hs-ghc
+# these are handled as alternatives
+rm ${RPM_BUILD_ROOT}%{_bindir}/{hsc2hs,runhaskell}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -216,12 +171,25 @@
 %if %{build_doc}
 %files doc
 %defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}
+%{_docdir}/%{name}
 %endif
 
 
 %changelog
-* Wed Sep 17 2008 Jens Petersen <petersen at redhat.com> - 6.8.3-4
+* Wed Sep 24 2008 Jens Petersen <petersen at redhat.com> - 6.8.3-5.fc10
+- bring back haddock-generated lib docs, now under docdir/ghc
+- fix macros.ghc filepath (#460304)
+- spec file cleanups:
+- fix the source urls back
+- drop requires chkconfig
+- do not override __spec_install_post
+- override _target_platform so we can use %%configure
+- setup docs building in build.mk
+- no longer need to remove network/include/Typeable.h
+- install binaries under libdir not libexec
+- remove hsc2hs and runhaskell binaries since are alternatives
+
+* Wed Sep 17 2008 Jens Petersen <petersen at redhat.com> - 6.8.3-4.fc10
 - add macros.ghc for new Haskell Packaging Guidelines (#460304)
 
 * Wed Jun 18 2008 Bryan O'Sullivan <bos at serpentine.com> - 6.8.3-3



From petersen at fedoraproject.org  Wed Sep 24 07:36:41 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 24 Sep 2008 07:36:41 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.43,1.44
Message-ID: <20080924073641.758AB70103@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9571

Modified Files:
	ghc.spec 
Log Message:
tweak docs changelog entries



Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ghc.spec	24 Sep 2008 07:34:44 -0000	1.43
+++ ghc.spec	24 Sep 2008 07:36:11 -0000	1.44
@@ -177,7 +177,7 @@
 
 %changelog
 * Wed Sep 24 2008 Jens Petersen <petersen at redhat.com> - 6.8.3-5.fc10
-- bring back haddock-generated lib docs, now under docdir/ghc
+- bring back including haddock-generated lib docs, now under docdir/ghc
 - fix macros.ghc filepath (#460304)
 - spec file cleanups:
 - fix the source urls back



From veillard at fedoraproject.org  Wed Sep 24 07:36:54 2008
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Wed, 24 Sep 2008 07:36:54 +0000 (UTC)
Subject: rpms/libvirt/F-9 libvirt.spec, 1.91, 1.92 sources, 1.32,
	1.33 libvirt-0.4.5-no-emulator-segfault.patch, 1.1, NONE
Message-ID: <20080924073654.F155A70103@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9608

Modified Files:
	libvirt.spec sources 
Removed Files:
	libvirt-0.4.5-no-emulator-segfault.patch 
Log Message:
update to 0.4.6 to fix a couple of bugs, Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-9/libvirt.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- libvirt.spec	9 Sep 2008 15:25:51 -0000	1.91
+++ libvirt.spec	24 Sep 2008 07:36:24 -0000	1.92
@@ -29,12 +29,11 @@
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.4.5
-Release: 2%{?dist}%{?extra_release}
+Version: 0.4.6
+Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
-Patch0: libvirt-0.4.5-no-emulator-segfault.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
@@ -148,7 +147,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %if ! %{with_xen}
@@ -304,6 +302,10 @@
 %doc docs/examples/python
 
 %changelog
+* Wed Sep 24 2008 Daniel Veillard <veillard at redhat.com> - 0.4.6-1.fc9
+- upstream release 0.4.6
+- fixes a couple of serious bugs in the previous release
+
 * Tue Sep  9 2008 Daniel Veillard <veillard at redhat.com> - 0.4.5-2.fc9
 - fix a crash if a QEmu/KVM domain is defined without an emulator path
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-9/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	9 Sep 2008 14:32:15 -0000	1.32
+++ sources	24 Sep 2008 07:36:24 -0000	1.33
@@ -1 +1 @@
-dcb590a6202c332907eae7b44e47ca4b  libvirt-0.4.5.tar.gz
+abdf727deaffd868172f7243eb75ffe3  libvirt-0.4.6.tar.gz


--- libvirt-0.4.5-no-emulator-segfault.patch DELETED ---



From transif at fedoraproject.org  Wed Sep 24 07:37:05 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Wed, 24 Sep 2008 07:37:05 +0000 (UTC)
Subject: comps/po ja.po,1.17,1.18
Message-ID: <20080924073705.AEB5F70103@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9709/po

Modified Files:
	ja.po 
Log Message:
    2008-09-24  kiyoto hashida <khashida at redhat.com> (via
khasida at fedoraproject.org)
    
      * po/ja.po: Updated Head for Japanese
    



Index: ja.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ja.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ja.po	17 Sep 2008 22:44:35 -0000	1.17
+++ ja.po	24 Sep 2008 07:36:35 -0000	1.18
@@ -1,4 +1,4 @@
-# translation of ja.po to Japanese
+# translation of comps.HEAD.ja.po to Japanese
 # coms-po Japanese translation
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) Red Hat Inc.2002
@@ -9,12 +9,12 @@
 # Kiyoto Hashida <khashida at redhat.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: ja\n"
+"Project-Id-Version: comps.HEAD.ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-09-09 19:23+1000\n"
-"Last-Translator: Noriko Mizumoto <noriko at redhat.com>\n"
-"Language-Team: Japanese <fedora-trans-ja at redhat.com>\n"
+"POT-Creation-Date: 2008-09-24 03:30+0000\n"
+"PO-Revision-Date: 2008-09-24 17:32+1000\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"
@@ -404,16 +404,14 @@
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:81
-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:82 ../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) ??????????????????????????????????????????????????????????????????????????????"
 "?????????????????????????????????????????????????????????"
@@ -651,8 +649,7 @@
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
 #: ../comps-f10.xml.in.h:143 ../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 ""
 "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 "??????"
@@ -779,8 +776,7 @@
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
 #: ../comps-f10.xml.in.h:169
-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 ""
 "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 "??????"
@@ -792,21 +788,17 @@
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
 #: ../comps-f10.xml.in.h:171
-msgid ""
-"These packages allow you to develop applications for the X Window System."
-msgstr ""
-"?????????????????????????????? X Window System ??????????????????????????????????????????????????????"
+msgid "These packages allow you to develop applications for the X Window System."
+msgstr "?????????????????????????????? X Window System ??????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:162
 #: ../comps-f10.xml.in.h:172 ../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:163
 #: ../comps-f10.xml.in.h:173
-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 ????????? ????????????????????????????????????"
 "?????????????????????????????????"
@@ -851,14 +843,12 @@
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:169
 #: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
-msgstr ""
-"?????????????????????????????????????????????????????? Web ???????????????????????????????????????????????????"
+msgstr "?????????????????????????????????????????????????????? Web ???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:170
 #: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
-msgstr ""
-"?????????????????????????????????????????????????????? FTP ???????????????????????????????????????????????????"
+msgstr "?????????????????????????????????????????????????????? FTP ???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:171
 #: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
@@ -911,8 +901,7 @@
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:177
 #: ../comps-f10.xml.in.h:187 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
-msgstr ""
-"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:178
 #: ../comps-f10.xml.in.h:188 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
@@ -934,16 +923,13 @@
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
 #: ../comps-f10.xml.in.h:190 ../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:181
 #: ../comps-f10.xml.in.h:191 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
-msgid ""
-"This group is a collection of tools for various hardware specific utilities."
-msgstr ""
-"????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+msgid "This group is a collection of tools for various hardware specific utilities."
+msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:182
 #: ../comps-f10.xml.in.h:192 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
@@ -956,8 +942,7 @@
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
 #: ../comps-f10.xml.in.h:193
-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) ?????????"
 "???????????????"
@@ -1174,9 +1159,8 @@
 msgstr "???????????????????????????"
 
 #: ../comps-f10.xml.in.h:70
-#, fuzzy
 msgid "Haskell Development"
-msgstr "???????????????"
+msgstr "Haskell ??????"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
@@ -1187,42 +1171,36 @@
 msgstr "????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "??????????????????????????????"
+msgstr "?????????????????????????????????"
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f10.xml.in.h:110
-#, fuzzy
 msgid "Maithili Support"
-msgstr "????????????????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f10.xml.in.h:117
 msgid "Myanmar (Burmese) Support"
 msgstr "??????????????? (?????????) ??????????????????"
 
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "?????????????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f10.xml.in.h:156
-#, fuzzy
 msgid "Support for developing programs in the Haskell programming language."
-msgstr "Java ???????????????????????????????????????????????????????????????"
+msgstr "Haskell ???????????????????????????????????????????????????????????????"
 
 #: ../comps-f10.xml.in.h:163
 msgid "Tajik Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f10.xml.in.h:205
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "???????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1273,18 +1251,15 @@
 msgstr "????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1292,9 +1267,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????"
 
-#~ msgid "Haskell"
-#~ msgstr "Haskell"



From caolanm at fedoraproject.org  Wed Sep 24 07:40:25 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 24 Sep 2008 07:40:25 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.vcl94.patch, NONE,
	1.1 openoffice.org.spec, 1.1657,
	1.1658 openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch,
	1.2, NONE
Message-ID: <20080924074025.D26E370103@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10304

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.vcl94.patch 
Removed Files:
	openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch 
Log Message:
use upstream workspace name

workspace.vcl94.patch:

--- NEW FILE workspace.vcl94.patch ---
Index: source/fontmanager/fontconfig.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/fontmanager/fontconfig.cxx,v
retrieving revision 1.30.20.1
diff -u -r1.30.20.1 fontconfig.cxx
--- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx	10 Sep 2008 13:53:12 -0000	1.30.20.1
+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx	19 Sep 2008 11:32:56 -0000
@@ -91,7 +91,6 @@
 class FontCfgWrapper
 {
     oslModule		m_pLib;
-    FcConfig*		m_pDefConfig;
     FcFontSet*      m_pOutlineSet;
 
     FcBool          (*m_pFcInit)();
@@ -141,7 +140,6 @@
     bool isValid() const 
     { return m_pLib != NULL;}
 
-    FcConfig* getDefConfig() { return m_pDefConfig; }
     FcFontSet* getFontSet();
     
     FcBool FcInit()
@@ -257,7 +255,6 @@
 
 FontCfgWrapper::FontCfgWrapper()
         : m_pLib( NULL ),
-          m_pDefConfig( NULL ),
           m_pOutlineSet( NULL )
 {
      OUString aLib( RTL_CONSTASCII_USTRINGPARAM( "libfontconfig.so.1" ) );
@@ -387,8 +384,7 @@
 
 
     FcInit();
-    m_pDefConfig = FcConfigGetCurrent();
-    if( ! m_pDefConfig )
+    if( ! FcConfigGetCurrent() )
     {
         osl_unloadModule( (oslModule)m_pLib );
         m_pLib = NULL;
@@ -402,7 +398,7 @@
       add only acceptable outlined fonts to our config, 
       for future fontconfig use
     */
-    FcFontSet* pOrig = FcConfigGetFonts( getDefConfig(), eSetName );
+    FcFontSet* pOrig = FcConfigGetFonts( FcConfigGetCurrent(), eSetName );
     if( !pOrig )
         return;
 
@@ -820,7 +816,7 @@
     if( nVersion <= 20400 )
         return false;
     const char* pDirName = (const char*)rDirName.getStr();
-    bool bRet = (rWrapper.FcConfigAppFontAddDir( rWrapper.getDefConfig(), (FcChar8*)pDirName ) == FcTrue);
+    bool bRet = (rWrapper.FcConfigAppFontAddDir( rWrapper.FcConfigGetCurrent(), (FcChar8*)pDirName ) == FcTrue);
 
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "FcConfigAppFontAddDir( \"%s\") => %d\n", pDirName, bRet );
@@ -940,13 +936,13 @@
     addtopattern(rWrapper, pPattern, rItalic, rWeight, rWidth, rPitch);
 
     // query fontconfig for a substitute
-    rWrapper.FcConfigSubstitute( rWrapper.getDefConfig(), pPattern, FcMatchPattern );
+    rWrapper.FcConfigSubstitute( rWrapper.FcConfigGetCurrent(), pPattern, FcMatchPattern );
     rWrapper.FcDefaultSubstitute( pPattern );
 
     // process the result of the fontconfig query
     FcResult eResult = FcResultNoMatch;
     FcFontSet* pFontSet = rWrapper.getFontSet();
-    FcPattern* pResult = rWrapper.FcFontSetMatch( rWrapper.getDefConfig(), &pFontSet, 1, pPattern, &eResult );
+    FcPattern* pResult = rWrapper.FcFontSetMatch( rWrapper.FcConfigGetCurrent(), &pFontSet, 1, pPattern, &eResult );
     rWrapper.FcPatternDestroy( pPattern );
 
     FcFontSet*  pSet = NULL;
@@ -1091,7 +1087,7 @@
     if( ! rWrapper.isValid() )
         return false;
 
-    FcConfig* pConfig = rWrapper.getDefConfig();
+    FcConfig* pConfig = rWrapper.FcConfigGetCurrent();
     FcPattern* pPattern = rWrapper.FcPatternCreate();
 
     OString aLangAttrib;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1657
retrieving revision 1.1658
diff -u -r1.1657 -r1.1658
--- openoffice.org.spec	22 Sep 2008 06:57:58 -0000	1.1657
+++ openoffice.org.spec	24 Sep 2008 07:39:55 -0000	1.1658
@@ -114,7 +114,7 @@
 Patch43: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
 Patch44: openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch
 Patch45: openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch
-Patch46: openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch
+Patch46: workspace.vcl94.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1314,7 +1314,7 @@
 %patch43 -p1 -b .ooo93515.vcl.jrb-frames.patch
 %patch44 -p1 -b .ooo93942.svx.accessibity-loops.patch
 %patch45 -p1 -b .ooo93949.sw.better_rtf_encodings.patch
-%patch46 -p1 -b .ooo94069.psprint.defconfig.patch
+%patch46 -p1 -b .workspace.vcl94.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`


--- openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch DELETED ---



From petersen at fedoraproject.org  Wed Sep 24 08:03:52 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 24 Sep 2008 08:03:52 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.44,1.45
Message-ID: <20080924080352.956F470103@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12614

Modified Files:
	ghc.spec 
Log Message:
revert back from using %configure since it fails on ppc


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ghc.spec	24 Sep 2008 07:36:11 -0000	1.44
+++ ghc.spec	24 Sep 2008 08:03:22 -0000	1.45
@@ -80,9 +80,12 @@
 %endif
 
 export HaddockCmd=%{_bindir}/haddock-0.9
-# workaround ghc configure script hysteria about archs
-%define _target_platform %{_build}
-%configure
+
+./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
+  --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
+  --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \
+  --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \
+  --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir}
 
 make %{_smp_mflags}
 make %{_smp_mflags} -C libraries
@@ -183,7 +186,6 @@
 - fix the source urls back
 - drop requires chkconfig
 - do not override __spec_install_post
-- override _target_platform so we can use %%configure
 - setup docs building in build.mk
 - no longer need to remove network/include/Typeable.h
 - install binaries under libdir not libexec



From huzaifas at fedoraproject.org  Wed Sep 24 08:22:00 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 24 Sep 2008 08:22:00 +0000 (UTC)
Subject: rpms/corosync - New directory
Message-ID: <20080924082200.8D2FB70103@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/corosync
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvse14496/rpms/corosync

Log Message:
Directory /cvs/extras/rpms/corosync added to the repository




From huzaifas at fedoraproject.org  Wed Sep 24 08:22:00 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 24 Sep 2008 08:22:00 +0000 (UTC)
Subject: rpms/corosync/devel - New directory
Message-ID: <20080924082200.CD7177013D@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/corosync/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvse14496/rpms/corosync/devel

Log Message:
Directory /cvs/extras/rpms/corosync/devel added to the repository




From pkgdb at fedoraproject.org  Wed Sep 24 08:21:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 08:21:42 +0000
Subject: [pkgdb] corosync was added for sdake
Message-ID: <20080924082143.2C77E208D9F@bastion.fedora.phx.redhat.com>

huzaifas has added Package corosync with summary The Corosync Cluster Engine
huzaifas has approved Package corosync
huzaifas has added a Fedora devel branch for corosync with an owner of sdake
huzaifas has approved corosync in Fedora devel
huzaifas has approved Package corosync
huzaifas has set commit to Approved for packager on corosync (Fedora devel)
huzaifas has set build to Approved for packager on corosync (Fedora devel)
huzaifas has set checkout to Approved for packager on corosync (Fedora devel)
huzaifas has set commit to Approved for uberpackager on corosync (Fedora devel)
huzaifas has set build to Approved for uberpackager on corosync (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on corosync (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/corosync



From huzaifas at fedoraproject.org  Wed Sep 24 08:22:01 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 24 Sep 2008 08:22:01 +0000 (UTC)
Subject: rpms/corosync Makefile,NONE,1.1
Message-ID: <20080924082201.EEE2B70103@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/corosync
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvse14496/rpms/corosync

Added Files:
	Makefile 
Log Message:
Setup of module corosync


--- NEW FILE Makefile ---
# Top level Makefile for module corosync
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Wed Sep 24 08:22:02 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 24 Sep 2008 08:22:02 +0000 (UTC)
Subject: rpms/corosync/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080924082202.3F3AF70103@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/corosync/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvse14496/rpms/corosync/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module corosync


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: corosync
# $Id: Makefile,v 1.1 2008/09/24 08:22:02 huzaifas Exp $
NAME := corosync
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 24 08:51:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 08:51:00 +0000
Subject: [pkgdb] hunspell-ro was added for caolanm
Message-ID: <20080924085100.CAD05208D9F@bastion.fedora.phx.redhat.com>

huzaifas has added Package hunspell-ro with summary Romanian hunspell dictionaries
huzaifas has approved Package hunspell-ro
huzaifas has added a Fedora devel branch for hunspell-ro with an owner of caolanm
huzaifas has approved hunspell-ro in Fedora devel
huzaifas has approved Package hunspell-ro
huzaifas has set commit to Approved for packager on hunspell-ro (Fedora devel)
huzaifas has set build to Approved for packager on hunspell-ro (Fedora devel)
huzaifas has set checkout to Approved for packager on hunspell-ro (Fedora devel)
huzaifas has set commit to Approved for uberpackager on hunspell-ro (Fedora devel)
huzaifas has set build to Approved for uberpackager on hunspell-ro (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on hunspell-ro (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-ro



From huzaifas at fedoraproject.org  Wed Sep 24 08:51:20 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 24 Sep 2008 08:51:20 +0000 (UTC)
Subject: rpms/hunspell-ro - New directory
Message-ID: <20080924085120.2F6E870103@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-ro
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsL17464/rpms/hunspell-ro

Log Message:
Directory /cvs/extras/rpms/hunspell-ro added to the repository




From huzaifas at fedoraproject.org  Wed Sep 24 08:51:20 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 24 Sep 2008 08:51:20 +0000 (UTC)
Subject: rpms/hunspell-ro/devel - New directory
Message-ID: <20080924085120.8930270140@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-ro/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsL17464/rpms/hunspell-ro/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-ro/devel added to the repository




From huzaifas at fedoraproject.org  Wed Sep 24 08:51:21 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 24 Sep 2008 08:51:21 +0000 (UTC)
Subject: rpms/hunspell-ro Makefile,NONE,1.1
Message-ID: <20080924085121.E2A3370103@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-ro
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsL17464/rpms/hunspell-ro

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-ro


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-ro
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Wed Sep 24 08:51:22 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 24 Sep 2008 08:51:22 +0000 (UTC)
Subject: rpms/hunspell-ro/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080924085122.4B5E170103@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-ro/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsL17464/rpms/hunspell-ro/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-ro


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-ro
# $Id: Makefile,v 1.1 2008/09/24 08:51:22 huzaifas Exp $
NAME := hunspell-ro
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 24 08:55:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 08:55:44 +0000
Subject: [pkgdb] perl-Log-TraceMessages (Fedora EPEL, 5) updated by huzaifas
Message-ID: <20080924085544.29169208DA4@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 5 branch for perl-Log-TraceMessages
huzaifas has set commit to Approved for uberpackager on perl-Log-TraceMessages (Fedora EPEL 5)
huzaifas has set build to Approved for uberpackager on perl-Log-TraceMessages (Fedora EPEL 5)
huzaifas has set checkout to Approved for uberpackager on perl-Log-TraceMessages (Fedora EPEL 5)
huzaifas approved watchbugzilla on perl-Log-TraceMessages (Fedora EPEL 5) for perl-sig
huzaifas approved watchcommits on perl-Log-TraceMessages (Fedora EPEL 5) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-TraceMessages



From pkgdb at fedoraproject.org  Wed Sep 24 08:55:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 08:55:43 +0000
Subject: [pkgdb] perl-Log-TraceMessages was added for kwizart
Message-ID: <20080924085543.3474C208D9F@bastion.fedora.phx.redhat.com>

huzaifas has added Package perl-Log-TraceMessages with summary Perl extension for trace messages used in debugging
huzaifas has approved Package perl-Log-TraceMessages
huzaifas has added a Fedora devel branch for perl-Log-TraceMessages with an owner of kwizart
huzaifas has approved perl-Log-TraceMessages in Fedora devel
huzaifas has approved Package perl-Log-TraceMessages
huzaifas has set commit to Approved for packager on perl-Log-TraceMessages (Fedora devel)
huzaifas has set build to Approved for packager on perl-Log-TraceMessages (Fedora devel)
huzaifas has set checkout to Approved for packager on perl-Log-TraceMessages (Fedora devel)
huzaifas has set commit to Approved for uberpackager on perl-Log-TraceMessages (Fedora devel)
huzaifas has set build to Approved for uberpackager on perl-Log-TraceMessages (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on perl-Log-TraceMessages (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-TraceMessages



From pkgdb at fedoraproject.org  Wed Sep 24 08:55:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 08:55:44 +0000
Subject: [pkgdb] perl-Log-TraceMessages (Fedora, 9) updated by huzaifas
Message-ID: <20080924085544.31014208DA7@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for perl-Log-TraceMessages
huzaifas has set commit to Approved for uberpackager on perl-Log-TraceMessages (Fedora 9)
huzaifas has set build to Approved for uberpackager on perl-Log-TraceMessages (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on perl-Log-TraceMessages (Fedora 9)
huzaifas approved watchbugzilla on perl-Log-TraceMessages (Fedora 9) for perl-sig
huzaifas approved watchcommits on perl-Log-TraceMessages (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-TraceMessages



From pkgdb at fedoraproject.org  Wed Sep 24 08:55:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 08:55:44 +0000
Subject: [pkgdb] perl-Log-TraceMessages (Fedora, 8) updated by huzaifas
Message-ID: <20080924085544.42840208DAD@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for perl-Log-TraceMessages
huzaifas has set commit to Approved for uberpackager on perl-Log-TraceMessages (Fedora 8)
huzaifas has set build to Approved for uberpackager on perl-Log-TraceMessages (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on perl-Log-TraceMessages (Fedora 8)
huzaifas approved watchbugzilla on perl-Log-TraceMessages (Fedora 8) for perl-sig
huzaifas approved watchcommits on perl-Log-TraceMessages (Fedora 8) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-TraceMessages



From pkgdb at fedoraproject.org  Wed Sep 24 08:55:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 08:55:44 +0000
Subject: [pkgdb] perl-Log-TraceMessages (Fedora, devel) updated by huzaifas
Message-ID: <20080924085544.3B625208DAA@bastion.fedora.phx.redhat.com>

huzaifas approved watchbugzilla on perl-Log-TraceMessages (Fedora devel) for perl-sig
huzaifas approved watchcommits on perl-Log-TraceMessages (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-TraceMessages



From denis at fedoraproject.org  Wed Sep 24 08:55:44 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 24 Sep 2008 08:55:44 +0000 (UTC)
Subject: rpms/libgnomeuimm26/devel .cvsignore, 1.11, 1.12 libgnomeuimm.spec, 
	1.19, 1.20 sources, 1.12, 1.13
Message-ID: <20080924085544.6C4F070103@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomeuimm26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17966

Modified Files:
	.cvsignore libgnomeuimm.spec sources 
Log Message:
Update to upstream 2.24.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeuimm26/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Mar 2008 20:04:51 -0000	1.11
+++ .cvsignore	24 Sep 2008 08:55:13 -0000	1.12
@@ -1 +1 @@
-libgnomeuimm-2.22.0.tar.bz2
+libgnomeuimm-2.24.0.tar.bz2


Index: libgnomeuimm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeuimm26/devel/libgnomeuimm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libgnomeuimm.spec	12 Mar 2008 20:04:51 -0000	1.19
+++ libgnomeuimm.spec	24 Sep 2008 08:55:14 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           libgnomeuimm26
-Version:        2.22.0
+Version:        2.24.0
 Release:        1%{?dist}
 
 Summary:        C++ interface for Gnome libs (a GUI library for X)
@@ -82,7 +82,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Wed Mar 12 2008 Denis Leroy <denis at dedibox.albator.org> - 2.22.0-1
+* Wed Sep 24 2008 Denis Leroy <denis at poolshark.org> - 2.24.0-1
+- Update to upstream 2.24.0
+
+* Wed Mar 12 2008 Denis Leroy <denis at poolshark.org> - 2.22.0-1
 - Update to 2.22.0
 
 * Mon Feb 11 2008 Denis Leroy <denis at poolshark.org> - 2.20.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeuimm26/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	12 Mar 2008 20:04:51 -0000	1.12
+++ sources	24 Sep 2008 08:55:14 -0000	1.13
@@ -1 +1 @@
-74b22fd00133e683ffa23b060d1862e7  libgnomeuimm-2.22.0.tar.bz2
+e4caf43ee829200bef9ad87415ae39a5  libgnomeuimm-2.24.0.tar.bz2



From pkgdb at fedoraproject.org  Wed Sep 24 08:55:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 08:55:44 +0000
Subject: [pkgdb] perl-Log-TraceMessages (Fedora EPEL, 4) updated by huzaifas
Message-ID: <20080924085544.57E1B208DB2@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 4 branch for perl-Log-TraceMessages
huzaifas has set commit to Approved for uberpackager on perl-Log-TraceMessages (Fedora EPEL 4)
huzaifas has set build to Approved for uberpackager on perl-Log-TraceMessages (Fedora EPEL 4)
huzaifas has set checkout to Approved for uberpackager on perl-Log-TraceMessages (Fedora EPEL 4)
huzaifas approved watchbugzilla on perl-Log-TraceMessages (Fedora EPEL 4) for perl-sig
huzaifas approved watchcommits on perl-Log-TraceMessages (Fedora EPEL 4) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-TraceMessages



From huzaifas at fedoraproject.org  Wed Sep 24 08:56:03 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 24 Sep 2008 08:56:03 +0000 (UTC)
Subject: rpms/perl-Log-TraceMessages - New directory
Message-ID: <20080924085603.301CC70103@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-Log-TraceMessages
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsD18137/rpms/perl-Log-TraceMessages

Log Message:
Directory /cvs/extras/rpms/perl-Log-TraceMessages added to the repository




From huzaifas at fedoraproject.org  Wed Sep 24 08:56:03 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 24 Sep 2008 08:56:03 +0000 (UTC)
Subject: rpms/perl-Log-TraceMessages/devel - New directory
Message-ID: <20080924085603.7302770103@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-Log-TraceMessages/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsD18137/rpms/perl-Log-TraceMessages/devel

Log Message:
Directory /cvs/extras/rpms/perl-Log-TraceMessages/devel added to the repository




From huzaifas at fedoraproject.org  Wed Sep 24 08:56:04 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 24 Sep 2008 08:56:04 +0000 (UTC)
Subject: rpms/perl-Log-TraceMessages Makefile,NONE,1.1
Message-ID: <20080924085604.6291770103@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-Log-TraceMessages
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsD18137/rpms/perl-Log-TraceMessages

Added Files:
	Makefile 
Log Message:
Setup of module perl-Log-TraceMessages


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Log-TraceMessages
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Wed Sep 24 08:56:04 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 24 Sep 2008 08:56:04 +0000 (UTC)
Subject: rpms/perl-Log-TraceMessages/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080924085604.A6DEE70103@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-Log-TraceMessages/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsD18137/rpms/perl-Log-TraceMessages/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Log-TraceMessages


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Log-TraceMessages
# $Id: Makefile,v 1.1 2008/09/24 08:56:04 huzaifas Exp $
NAME := perl-Log-TraceMessages
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From atkac at fedoraproject.org  Wed Sep 24 09:00:35 2008
From: atkac at fedoraproject.org (Adam Tkac)
Date: Wed, 24 Sep 2008 09:00:35 +0000 (UTC)
Subject: rpms/bind/devel .cvsignore, 1.44, 1.45 bind.spec, 1.279,
	1.280 sources, 
	1.53, 1.54 bind-9.5-edns.patch, 1.4, NONE bind95-rh450995.patch,
	1.1, NONE bind95-rh454783.patch, 1.1, NONE bind95-rh457175.patch,
	1.1, NONE
Message-ID: <20080924090035.1CE2770103@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18932

Modified Files:
	.cvsignore bind.spec sources 
Removed Files:
	bind-9.5-edns.patch bind95-rh450995.patch 
	bind95-rh454783.patch bind95-rh457175.patch 
Log Message:
- 9.5.1b2 release
- patches merged
  - bind95-rh454783.patch
  - bind-9.5-edns.patch
  - bind95-rh450995.patch
  - bind95-rh457175.patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	11 Jul 2008 10:16:21 -0000	1.44
+++ .cvsignore	24 Sep 2008 09:00:03 -0000	1.45
@@ -1,4 +1,4 @@
-bind-chroot.tar.bz2
 config-4.tar.bz2
 libbind-man.tar.gz
-bind-9.5.1b1.tar.gz
+bind-chroot.tar.bz2
+bind-9.5.1b2.tar.gz


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- bind.spec	17 Sep 2008 08:03:03 -0000	1.279
+++ bind.spec	24 Sep 2008 09:00:03 -0000	1.280
@@ -2,7 +2,7 @@
 # Red Hat BIND package .spec file
 #
 
-%define PREVER b1
+%define PREVER b2
 %define VERSION %{version}%{PREVER}
 
 %{?!SDB:       %define SDB       1}
@@ -19,7 +19,7 @@
 Name:     bind
 License:  ISC
 Version:  9.5.1
-Release:  0.6.%{PREVER}%{?dist}
+Release:  0.7.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,10 +57,6 @@
 Patch71: bind-9.5-overflow.patch
 Patch72: bind-9.5-dlz-64bit.patch
 Patch87: bind-9.5-parallel-build.patch
-Patch90: bind-9.5-edns.patch
-Patch91: bind95-rh450995.patch
-Patch92: bind95-rh457175.patch
-Patch93: bind95-rh454783.patch
 
 # SDB patches
 Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -186,7 +182,6 @@
 %patch5 -p1 -b .nonexec
 %patch10 -p1 -b .PIE
 %patch16 -p1 -b .redhat_doc
-%patch93 -p1 -b .rh454783
 %if %{SDB}
 mkdir bin/named-sdb
 cp -r bin/named/* bin/named-sdb
@@ -243,9 +238,6 @@
 %patch83 -p1 -b .libidn2
 %patch85 -p1 -b .libidn3
 %patch87 -p1 -b .parallel
-%patch90 -p1 -b .edns
-%patch91 -p1 -b .rh450995
-%patch92 -p1 -b .rh457175
 %patch94 -p1 -b .rh461409
 
 # Sparc and s390 arches need to use -fPIE
@@ -590,7 +582,7 @@
 %{_bindir}/nslookup
 %{_bindir}/nsupdate
 %{_mandir}/man1/host.1*
-%{_mandir}/man8/nsupdate.8*
+%{_mandir}/man1/nsupdate.1*
 %{_mandir}/man1/dig.1*
 %{_mandir}/man1/nslookup.1*
 
@@ -644,6 +636,14 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Wed Sep 24 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.7.b2
+- 9.5.1b2 release
+- patches merged
+  - bind95-rh454783.patch
+  - bind-9.5-edns.patch
+  - bind95-rh450995.patch
+  - bind95-rh457175.patch
+
 * Wed Sep 17 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.6.b1
 - IDN output strings didn't honour locale settings (#461409)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	11 Jul 2008 10:16:21 -0000	1.53
+++ sources	24 Sep 2008 09:00:04 -0000	1.54
@@ -1,4 +1,4 @@
-4faa4395b955e5f8a3d50f308b9fabc8  bind-chroot.tar.bz2
 de68e10e91e05ab100be879b5bcaa6cb  config-4.tar.bz2
 13fef79f99fcefebb51d84b08805de51  libbind-man.tar.gz
-bbd52aadb39f76b50e8413fa165f805e  bind-9.5.1b1.tar.gz
+4faa4395b955e5f8a3d50f308b9fabc8  bind-chroot.tar.bz2
+7c2ca5b5c49b6259498a3822142afd34  bind-9.5.1b2.tar.gz


--- bind-9.5-edns.patch DELETED ---


--- bind95-rh450995.patch DELETED ---


--- bind95-rh454783.patch DELETED ---


--- bind95-rh457175.patch DELETED ---



From kengert at fedoraproject.org  Wed Sep 24 09:08:24 2008
From: kengert at fedoraproject.org (Kai Engert)
Date: Wed, 24 Sep 2008 09:08:24 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.52,1.53
Message-ID: <20080924090824.1BA7470103@cvs1.fedora.phx.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20116

Modified Files:
	nss.spec 
Log Message:
* Wed Sep 24 2008 Kai Engert <kaie at redhat.com> - 3.12.1.1-3
- bug 456847, move pkgconfig requirement to devel package



Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- nss.spec	5 Sep 2008 19:24:57 -0000	1.52
+++ nss.spec	24 Sep 2008 09:07:52 -0000	1.53
@@ -4,13 +4,12 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.1.1
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
 Requires:         nspr >= %{nspr_version}
 Requires:         sqlite
-Requires:         pkgconfig
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
 BuildRequires:    sqlite-devel
@@ -63,6 +62,7 @@
 Group:            Development/Libraries
 Requires:         nss = %{version}-%{release}
 Requires:         nspr-devel >= %{nspr_version}
+Requires:         pkgconfig
 
 %description devel
 Header and Library files for doing development with Network Security Services.
@@ -442,6 +442,8 @@
 
 
 %changelog
+* Wed Sep 24 2008 Kai Engert <kaie at redhat.com> - 3.12.1.1-3
+- bug 456847, move pkgconfig requirement to devel package
 * Fri Sep 05 2008 Kai Engert <kengert at redhat.com> - 3.12.1.1-2
 - Update to NSS_3_12_1_RC2
 * Fri Aug 22 2008 Kai Engert <kaie at redhat.com> - 3.12.1.0-2



From dcbw at fedoraproject.org  Wed Sep 24 09:40:13 2008
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Wed, 24 Sep 2008 09:40:13 +0000 (UTC)
Subject: rpms/NetworkManager/F-9 crypto-init.patch, NONE,
	1.1 NetworkManager.spec, 1.238, 1.239
Message-ID: <20080924094013.99CAC70103@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23542

Modified Files:
	NetworkManager.spec 
Added Files:
	crypto-init.patch 
Log Message:
* Thu Sep 11 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.2
- Fix hang when reading system connections from ifcfg files



crypto-init.patch:

--- NEW FILE crypto-init.patch ---
diff -up NetworkManager-0.7.0/libnm-util/crypto_nss.c.crypto-init NetworkManager-0.7.0/libnm-util/crypto_nss.c
--- NetworkManager-0.7.0/libnm-util/crypto_nss.c.crypto-init	2008-08-22 12:14:12.000000000 -0400
+++ NetworkManager-0.7.0/libnm-util/crypto_nss.c	2008-09-11 16:22:29.000000000 -0400
@@ -29,27 +29,39 @@
 #include <pk11pub.h>
 #include <pkcs11t.h>
 #include <cert.h>
+#include <prerror.h>
 
 #include "crypto.h"
 
-static guint32 refcount = 0;
+static gboolean initialized = FALSE;
 
 gboolean
 crypto_init (GError **error)
 {
-	if (refcount == 0) {
-		PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 1);
-		NSS_NoDB_Init (NULL);
+	SECStatus ret;
+
+	if (initialized)
+		return TRUE;
+
+	PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 1);
+	ret = NSS_NoDB_Init (NULL);
+	if (ret != SECSuccess) {
+		PR_Cleanup ();
+		g_set_error (error, NM_CRYPTO_ERROR,
+		             0,
+		             _("Failed to initialize the crypto engine: %d."),
+		             PR_GetError ());
+		return FALSE;
 	}
-	refcount++;
+
+	initialized = TRUE;
 	return TRUE;
 }
 
 void
 crypto_deinit (void)
 {
-	refcount--;
-	if (refcount == 0) {
+	if (initialized) {
 		NSS_Shutdown ();
 		PR_Cleanup ();
 	}
diff -up NetworkManager-0.7.0/libnm-util/nm-utils.c.crypto-init NetworkManager-0.7.0/libnm-util/nm-utils.c
--- NetworkManager-0.7.0/libnm-util/nm-utils.c.crypto-init	2008-08-22 12:14:12.000000000 -0400
+++ NetworkManager-0.7.0/libnm-util/nm-utils.c	2008-09-11 16:19:25.000000000 -0400
@@ -1152,7 +1152,6 @@ nm_utils_uuid_generate_from_string (cons
 
 out:
 	g_free (uuid);
-	crypto_deinit ();
 	return buf;
 }
 


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- NetworkManager.spec	4 Sep 2008 17:55:55 -0000	1.238
+++ NetworkManager.spec	24 Sep 2008 09:39:41 -0000	1.239
@@ -16,7 +16,7 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.11.%{snapshot}.1%{?dist}
+Release: 0.11.%{snapshot}.2%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -29,6 +29,7 @@
 Patch4: serial-debug.patch
 Patch5: explain-dns1-dns2.patch
 Patch6: wpa-adhoc-fix.patch
+Patch7: crypto-init.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -155,6 +156,7 @@
 %patch4 -p1 -b .serial-debug
 %patch5 -p1 -b .explain-dns1-dns2
 %patch6 -p1 -b .wpa-adhoc-fix
+%patch7 -p1 -b .crypto-init
 
 %build
 autoreconf -i
@@ -309,6 +311,9 @@
 %{_datadir}/gtk-doc/html/libnm-glib/
 
 %changelog
+* Thu Sep 11 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.2
+- Fix hang when reading system connections from ifcfg files
+
 * Thu Sep  4 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.1
 - Fix WPA Ad-Hoc connections
 



From dcbw at fedoraproject.org  Wed Sep 24 09:43:20 2008
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Wed, 24 Sep 2008 09:43:20 +0000 (UTC)
Subject: rpms/NetworkManager/F-8 crypto-init.patch, NONE,
	1.1 wpa-adhoc-fix.patch, NONE, 1.1 NetworkManager.spec, 1.220, 1.221
Message-ID: <20080924094320.B9C9C70103@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24042

Modified Files:
	NetworkManager.spec 
Added Files:
	crypto-init.patch wpa-adhoc-fix.patch 
Log Message:
* Thu Sep 11 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.2
- Fix hang when reading system connections from ifcfg files

* Thu Sep  4 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.1
- Fix WPA Ad-Hoc connections



crypto-init.patch:

--- NEW FILE crypto-init.patch ---
diff -up NetworkManager-0.7.0/libnm-util/crypto_nss.c.crypto-init NetworkManager-0.7.0/libnm-util/crypto_nss.c
--- NetworkManager-0.7.0/libnm-util/crypto_nss.c.crypto-init	2008-08-22 12:14:12.000000000 -0400
+++ NetworkManager-0.7.0/libnm-util/crypto_nss.c	2008-09-11 16:22:29.000000000 -0400
@@ -29,27 +29,39 @@
 #include <pk11pub.h>
 #include <pkcs11t.h>
 #include <cert.h>
+#include <prerror.h>
 
 #include "crypto.h"
 
-static guint32 refcount = 0;
+static gboolean initialized = FALSE;
 
 gboolean
 crypto_init (GError **error)
 {
-	if (refcount == 0) {
-		PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 1);
-		NSS_NoDB_Init (NULL);
+	SECStatus ret;
+
+	if (initialized)
+		return TRUE;
+
+	PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 1);
+	ret = NSS_NoDB_Init (NULL);
+	if (ret != SECSuccess) {
+		PR_Cleanup ();
+		g_set_error (error, NM_CRYPTO_ERROR,
+		             0,
+		             _("Failed to initialize the crypto engine: %d."),
+		             PR_GetError ());
+		return FALSE;
 	}
-	refcount++;
+
+	initialized = TRUE;
 	return TRUE;
 }
 
 void
 crypto_deinit (void)
 {
-	refcount--;
-	if (refcount == 0) {
+	if (initialized) {
 		NSS_Shutdown ();
 		PR_Cleanup ();
 	}
diff -up NetworkManager-0.7.0/libnm-util/nm-utils.c.crypto-init NetworkManager-0.7.0/libnm-util/nm-utils.c
--- NetworkManager-0.7.0/libnm-util/nm-utils.c.crypto-init	2008-08-22 12:14:12.000000000 -0400
+++ NetworkManager-0.7.0/libnm-util/nm-utils.c	2008-09-11 16:19:25.000000000 -0400
@@ -1152,7 +1152,6 @@ nm_utils_uuid_generate_from_string (cons
 
 out:
 	g_free (uuid);
-	crypto_deinit ();
 	return buf;
 }
 

wpa-adhoc-fix.patch:

--- NEW FILE wpa-adhoc-fix.patch ---
diff -up NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c.foo NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c
--- NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c.foo	2008-09-04 13:33:24.000000000 -0400
+++ NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c	2008-09-04 13:33:32.000000000 -0400
@@ -66,7 +66,7 @@ static const struct validate_entry valid
 const char * pairwise_allowed[] = { "CCMP", "TKIP", "NONE", NULL };
 const char * group_allowed[] =    { "CCMP", "TKIP", "WEP104", "WEP40", NULL };
 const char * proto_allowed[] =    { "WPA", "RSN", NULL };
-const char * key_mgmt_allowed[] = { "WPA-PSK", "WPA-EAP", "IEEE8021X",
+const char * key_mgmt_allowed[] = { "WPA-PSK", "WPA-EAP", "IEEE8021X", "WPA-NONE",
                                     "NONE", NULL };
 const char * auth_alg_allowed[] = { "OPEN", "SHARED", "LEAP", NULL };
 const char * eap_allowed[] =      { "LEAP", "MD5", "TLS", "PEAP", "TTLS", "SIM",


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/NetworkManager.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- NetworkManager.spec	27 Aug 2008 20:57:11 -0000	1.220
+++ NetworkManager.spec	24 Sep 2008 09:42:50 -0000	1.221
@@ -16,7 +16,7 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.11.%{snapshot}%{?dist}
+Release: 0.11.%{snapshot}.2%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -28,8 +28,10 @@
 Patch3: old-dbus-glib.patch
 Patch4: serial-debug.patch
 Patch5: explain-dns1-dns2.patch
-Patch6: pk-06-fixes.patch
-Patch7: preserve-f8-priorities.patch
+Patch6: wpa-adhoc-fix.patch
+Patch7: crypto-init.patch
+Patch20: pk-06-fixes.patch
+Patch21: preserve-f8-priorities.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -156,8 +158,10 @@
 %patch3 -p1 -b .old-dbus-glib
 %patch4 -p1 -b .serial-debug
 %patch5 -p1 -b .explain-dns1-dns2
-%patch6 -p1 -b .pk-06-fixes
-%patch7 -p1 -b .f8-priorities
+%patch6 -p1 -b .wpa-adhoc-fix
+%patch7 -p1 -b .crypto-init
+%patch20 -p1 -b .pk-06-fixes
+%patch21 -p1 -b .f8-priorities
 
 %build
 autoreconf -i
@@ -311,6 +315,12 @@
 %{_datadir}/gtk-doc/html/libnm-glib/
 
 %changelog
+* Thu Sep 11 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.2
+- Fix hang when reading system connections from ifcfg files
+
+* Thu Sep  4 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.1
+- Fix WPA Ad-Hoc connections
+
 * Wed Aug 27 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022
 - Fix parsing of DOMAIN in ifcfg files (rh #459370)
 - Fix reconnection to mobile broadband networks after an auth failure



From caolanm at fedoraproject.org  Wed Sep 24 09:48:03 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 24 Sep 2008 09:48:03 +0000 (UTC)
Subject: rpms/hunspell-ro/devel hunspell-ro.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080924094803.9F00970103@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24694/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-ro.spec import.log 
Log Message:



--- NEW FILE hunspell-ro.spec ---
Name: hunspell-ro
Summary: Romanian hunspell dictionaries
Version: 3.2
Release: 1%{?dist}
Source0: http://downloads.sourceforge.net/rospell/%{name}.%{version}.tar.gz
Group: Applications/Text
URL: http://rospell.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv2+ or LGPLv2+ or MPLv1.1
BuildArch: noarch

Requires: hunspell

%description
Romanian hunspell dictionaries.

%prep
%setup -q -n %{name}.%{version}

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p ro_RO.* $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README COPYING.GPL COPYING.LGPL COPYING.MPL
%{_datadir}/myspell/*

%changelog
* Sat Sep 20 2006 Caolan McNamara <caolanm at redhat.com> - 3.2-1
- initial version


--- NEW FILE import.log ---
hunspell-ro-3_2-1_fc9:HEAD:hunspell-ro-3.2-1.fc9.src.rpm:1222249708


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ro/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2008 08:51:22 -0000	1.1
+++ .cvsignore	24 Sep 2008 09:47:33 -0000	1.2
@@ -0,0 +1 @@
+hunspell-ro.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ro/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2008 08:51:22 -0000	1.1
+++ sources	24 Sep 2008 09:47:33 -0000	1.2
@@ -0,0 +1 @@
+ab70681d2e7a534e638d8c598593cd15  hunspell-ro.3.2.tar.gz



From lkundrak at fedoraproject.org  Wed Sep 24 09:51:42 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 24 Sep 2008 09:51:42 +0000 (UTC)
Subject: rpms/sunbird/devel sunbird-0.9-libical.patch, 1.1, 1.2 sunbird.spec,
	1.16, 1.17
Message-ID: <20080924095142.1BB4370103@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25244

Modified Files:
	sunbird-0.9-libical.patch sunbird.spec 
Log Message:
* Wed Sep 24 2008 Lubomir Rintel <lkundrak at v3.sk> 0.9-2
- Fix problem with symbol visibility and newer gcc I introduced with libical patch


sunbird-0.9-libical.patch:

Index: sunbird-0.9-libical.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird-0.9-libical.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sunbird-0.9-libical.patch	23 Sep 2008 20:38:51 -0000	1.1
+++ sunbird-0.9-libical.patch	24 Sep 2008 09:51:11 -0000	1.2
@@ -62,3 +62,9 @@
         ../locales \
         ../base \
         ../providers \
+--- /dev/null	2008-09-23 20:44:22.879046487 +0200
++++ mozilla/calendar/base/src/ical.h	2008-09-24 11:28:09.000000000 +0200
+@@ -0,0 +1,3 @@
++#pragma GCC visibility push(default)
++#include <libical/ical.h>
++#pragma GCC visibility pop


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sunbird.spec	23 Sep 2008 20:38:51 -0000	1.16
+++ sunbird.spec	24 Sep 2008 09:51:11 -0000	1.17
@@ -8,7 +8,7 @@
 
 Name:           sunbird
 Version:        0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Mozilla Sunbird Calendar
 
 Group:          Applications/Productivity
@@ -277,6 +277,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Lubomir Rintel <lkundrak at v3.sk> 0.9-2
+- Fix problem with symbol visibility and newer gcc I introduced with libical patch
+
 * Tue Sep 23 2008 Lubomir Rintel <lkundrak at v3.sk> 0.9-1
 - 0.9 GOLD
 - Fix use of system nss and nspr4



From huzaifas at fedoraproject.org  Wed Sep 24 10:32:22 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 24 Sep 2008 10:32:22 +0000 (UTC)
Subject: rpms/hunspell-oc - New directory
Message-ID: <20080924103222.6745E70103@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-oc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsk29000/rpms/hunspell-oc

Log Message:
Directory /cvs/extras/rpms/hunspell-oc added to the repository




From huzaifas at fedoraproject.org  Wed Sep 24 10:32:22 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 24 Sep 2008 10:32:22 +0000 (UTC)
Subject: rpms/hunspell-oc/devel - New directory
Message-ID: <20080924103222.CA2DB7013F@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-oc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsk29000/rpms/hunspell-oc/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-oc/devel added to the repository




From pkgdb at fedoraproject.org  Wed Sep 24 10:32:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 10:32:04 +0000
Subject: [pkgdb] hunspell-oc was added for caolanm
Message-ID: <20080924103204.AC96E208D9F@bastion.fedora.phx.redhat.com>

huzaifas has added Package hunspell-oc with summary Occitan hunspell dictionary
huzaifas has approved Package hunspell-oc
huzaifas has added a Fedora devel branch for hunspell-oc with an owner of caolanm
huzaifas has approved hunspell-oc in Fedora devel
huzaifas has approved Package hunspell-oc
huzaifas has set commit to Approved for packager on hunspell-oc (Fedora devel)
huzaifas has set build to Approved for packager on hunspell-oc (Fedora devel)
huzaifas has set checkout to Approved for packager on hunspell-oc (Fedora devel)
huzaifas has set commit to Approved for uberpackager on hunspell-oc (Fedora devel)
huzaifas has set build to Approved for uberpackager on hunspell-oc (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on hunspell-oc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-oc



From huzaifas at fedoraproject.org  Wed Sep 24 10:32:24 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 24 Sep 2008 10:32:24 +0000 (UTC)
Subject: rpms/hunspell-oc Makefile,NONE,1.1
Message-ID: <20080924103224.2DDC270103@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-oc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsk29000/rpms/hunspell-oc

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-oc


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-oc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Wed Sep 24 10:32:24 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 24 Sep 2008 10:32:24 +0000 (UTC)
Subject: rpms/hunspell-oc/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080924103224.7A4C27013F@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-oc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsk29000/rpms/hunspell-oc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-oc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-oc
# $Id: Makefile,v 1.1 2008/09/24 10:32:24 huzaifas Exp $
NAME := hunspell-oc
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From mpg at fedoraproject.org  Wed Sep 24 10:55:49 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Wed, 24 Sep 2008 10:55:49 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.17, 1.18 sources, 1.20,
	1.21 sugar-toolkit.spec, 1.25, 1.26
Message-ID: <20080924105549.4CC0570103@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31794

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Wed Sep 24 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.11-1
- #8626 Icons overlap unnecessarily in crowded neighborhood view.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	20 Sep 2008 10:30:58 -0000	1.17
+++ .cvsignore	24 Sep 2008 10:55:16 -0000	1.18
@@ -1 +1 @@
-sugar-toolkit-0.82.10.tar.bz2
+sugar-toolkit-0.82.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	20 Sep 2008 10:30:58 -0000	1.20
+++ sources	24 Sep 2008 10:55:17 -0000	1.21
@@ -1 +1 @@
-9aa6da3ecc1920951114149d6ae99861  sugar-toolkit-0.82.10.tar.bz2
+c3a2c45d6444efcd3fa59c50198f9483  sugar-toolkit-0.82.11.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sugar-toolkit.spec	20 Sep 2008 10:30:58 -0000	1.25
+++ sugar-toolkit.spec	24 Sep 2008 10:55:17 -0000	1.26
@@ -5,8 +5,8 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.82.10
-Release: 2%{?dist}
+Version: 0.82.11
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -68,6 +68,9 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Wed Sep 24 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.11-1
+- #8626 Icons overlap unnecessarily in crowded neighborhood view.
+
 * Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.10-1
 - #8532 SIGCHLD fights with threads.
 - #8485 Switching between zoom levels seem to leak



From mpg at fedoraproject.org  Wed Sep 24 10:57:20 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Wed, 24 Sep 2008 10:57:20 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel remove-pseudopo.patch,1.1,NONE
Message-ID: <20080924105720.9974E70103@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32274

Removed Files:
	remove-pseudopo.patch 
Log Message:
remove unused patch


--- remove-pseudopo.patch DELETED ---



From mpg at fedoraproject.org  Wed Sep 24 10:59:22 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Wed, 24 Sep 2008 10:59:22 +0000 (UTC)
Subject: rpms/sugar-toolkit/OLPC-3 sources, 1.18, 1.19 sugar-toolkit.spec,
	1.22, 1.23
Message-ID: <20080924105922.A568570103@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-toolkit/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32540

Modified Files:
	sources sugar-toolkit.spec 
Log Message:
* Wed Sep 24 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.11-1
- #8626 Icons overlap unnecessarily in crowded neighborhood view.




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	20 Sep 2008 10:32:02 -0000	1.18
+++ sources	24 Sep 2008 10:58:52 -0000	1.19
@@ -1 +1 @@
-9aa6da3ecc1920951114149d6ae99861  sugar-toolkit-0.82.10.tar.bz2
+c3a2c45d6444efcd3fa59c50198f9483  sugar-toolkit-0.82.11.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sugar-toolkit.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sugar-toolkit.spec	20 Sep 2008 10:32:02 -0000	1.22
+++ sugar-toolkit.spec	24 Sep 2008 10:58:52 -0000	1.23
@@ -5,8 +5,8 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.82.10
-Release: 2%{?dist}
+Version: 0.82.11
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -66,6 +66,9 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Wed Sep 24 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.11-1
+- #8626 Icons overlap unnecessarily in crowded neighborhood view.
+
 * Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.10-1
 - #8532 SIGCHLD fights with threads.
 - #8485 Switching between zoom levels seem to leak



From trondd at fedoraproject.org  Wed Sep 24 11:11:08 2008
From: trondd at fedoraproject.org (Trond Danielsen)
Date: Wed, 24 Sep 2008 11:11:08 +0000 (UTC)
Subject: rpms/nautilus-python/devel .cvsignore, 1.2, 1.3 nautilus-python.spec,
	1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20080924111109.2C9DB70103@cvs1.fedora.phx.redhat.com>

Author: trondd

Update of /cvs/pkgs/rpms/nautilus-python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1669

Modified Files:
	.cvsignore nautilus-python.spec sources 
Log Message:
* Wed Sep 24 2008 Trond Danielsen <trondd at fedoraproject.org> - 0.5.1-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-python/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Apr 2007 20:12:10 -0000	1.2
+++ .cvsignore	24 Sep 2008 11:10:35 -0000	1.3
@@ -1 +1 @@
-nautilus-python-0.4.3.tar.gz
+nautilus-python-0.5.1.tar.bz2


Index: nautilus-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-python/devel/nautilus-python.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nautilus-python.spec	11 Aug 2008 17:54:24 -0000	1.4
+++ nautilus-python.spec	24 Sep 2008 11:10:36 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           nautilus-python
-Version:        0.4.3
-Release:        6%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        Python bindings for Nautilus
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://www.gnome.org/
-Source0:        http://ftp.acc.umu.se/pub/GNOME/sources/%{name}/0.4/%{name}-%{version}.tar.gz
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.5/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -43,9 +43,10 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT/%{_docdir}/%{name} installed_docs
-rm $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-1.0/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-2.0/*.la
 rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/*.la
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-1.0/python/
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-2.0/python/
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -57,17 +58,20 @@
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS
 %{_libdir}/%{name}
-%{_libdir}/nautilus/extensions-1.0/lib%{name}.*
-%dir %{_libdir}/nautilus/extensions-1.0/python/
+%{_libdir}/nautilus/extensions-2.0/lib%{name}.*
+%dir %{_libdir}/nautilus/extensions-2.0/python/
 
 
 %files devel
 %defattr(-,root,root,-)
-%doc installed_docs/examples
+%doc installed_docs/examples installed_docs/documentation.py
 %{_libdir}/pkgconfig/%{name}.pc
 
 
 %changelog
+* Wed Sep 24 2008 Trond Danielsen <trondd at fedoraproject.org> - 0.5.1-1
+- New upstream version
+
 * Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.3-6
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-python/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Apr 2007 20:12:10 -0000	1.2
+++ sources	24 Sep 2008 11:10:36 -0000	1.3
@@ -1 +1 @@
-f4bd5de3a9e01c80fc0a2ef7aeb64dd7  nautilus-python-0.4.3.tar.gz
+83136937cdb790a2ee5823e96de20acf  nautilus-python-0.5.1.tar.bz2



From than at fedoraproject.org  Wed Sep 24 11:50:54 2008
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 24 Sep 2008 11:50:54 +0000 (UTC)
Subject: rpms/kdesdk/devel kdesdk-4.1.1-quit.patch, NONE, 1.1 kdesdk.spec,
	1.113, 1.114
Message-ID: <20080924115054.A681C70103@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdesdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6079

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-4.1.1-quit.patch 
Log Message:
* show quit in the menu



kdesdk-4.1.1-quit.patch:

--- NEW FILE kdesdk-4.1.1-quit.patch ---
diff -up kdesdk-4.1.1/lokalize/src/kaider.cpp.orig kdesdk-4.1.1/lokalize/src/kaider.cpp
--- kdesdk-4.1.1/lokalize/src/kaider.cpp.orig	2008-09-24 12:23:07.000000000 +0200
+++ kdesdk-4.1.1/lokalize/src/kaider.cpp	2008-09-24 12:18:31.000000000 +0200
@@ -221,11 +221,11 @@ void KAider::setupActions()
     connect (_catalog,SIGNAL(cleanChanged(bool)),action,SLOT(setDisabled(bool)));
     connect (_catalog,SIGNAL(cleanChanged(bool)),this,SLOT(setModificationSign(bool)));
     action = KStandardAction::saveAs(this, SLOT(fileSaveAs()), ac);
-    //action = KStandardAction::quit(qApp, SLOT(quit()), ac);
-    //action->setText(i18nc("@action:inmenu","Close all Lokalize windows"));
+    action = KStandardAction::quit(qApp, SLOT(quit()), ac);
+    action->setText(i18nc("@action:inmenu","Close all Lokalize windows"));
 
-    //KStandardAction::quit(kapp, SLOT(quit()), ac);
-    //KStandardAction::quit(this, SLOT(deleteLater()), ac);
+    KStandardAction::quit(kapp, SLOT(quit()), ac);
+    KStandardAction::quit(this, SLOT(deleteLater()), ac);
 
 
 //Settings


Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- kdesdk.spec	29 Aug 2008 16:16:01 -0000	1.113
+++ kdesdk.spec	24 Sep 2008 11:50:23 -0000	1.114
@@ -1,7 +1,7 @@
 
 Name:           kdesdk
 Version:        4.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -9,6 +9,8 @@
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+# upstream patches
+Patch100:       kdesdk-4.1.1-quit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kde-filesystem >= 4
@@ -87,6 +89,8 @@
 %prep
 %setup -q
 
+# upstream patches
+%patch100 -p1 -b .quit
 
 %build
 mkdir -p %{_target_platform}
@@ -216,6 +220,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Than Ngo <than at redhat.com> 4.1.1-2
+- show quit in the menu
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 



From caolanm at fedoraproject.org  Wed Sep 24 11:52:14 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 24 Sep 2008 11:52:14 +0000 (UTC)
Subject: rpms/hunspell-oc/devel hunspell-oc.spec, NONE, 1.1 import.log, NONE,
	1.1 occitan-languedocien-0.5-fx+tb+sm.xpi, NONE, 1.1
Message-ID: <20080924115214.CF1D870103@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-oc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6339/devel

Added Files:
	hunspell-oc.spec import.log 
	occitan-languedocien-0.5-fx+tb+sm.xpi 
Log Message:



--- NEW FILE hunspell-oc.spec ---
Name: hunspell-oc
Summary: Occitan hunspell dictionaries
Version: 0.5
Release: 1%{?dist}
Source: https://addons.mozilla.org/en-US/firefox/downloads/file/34604/occitan-languedocien-%{version}-fx+tb+sm.xpi
Group: Applications/Text
URL: https://addons.mozilla.org/en-US/firefox/addon/8235
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv3+
BuildArch: noarch
BuildRequires: redland

Requires: hunspell

%description
Occitan hunspell dictionaries.

%prep
%setup -q -c -n hunspell-oc

%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/oc-FR.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/oc_FR.aff
cp -p dictionaries/oc-FR.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/oc_FR.dic

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CREDITS
%{_datadir}/myspell/*

%changelog
* Sat Sep 20 2008 Caolan McNamara <caolanm at redhat.com> - 0.5-1
- initial version


--- NEW FILE import.log ---
hunspell-oc-0_5-1_fc9:HEAD:hunspell-oc-0.5-1.fc9.src.rpm:1222257104


--- NEW FILE occitan-languedocien-0.5-fx+tb+sm.xpi ---
PK



}??]?4???v7J???%????i?H???o???"??? ???!%H?v?ewj2?Oh:??v)?MW???C?z????????C?Z???5V?I???H?M????c?????4%?@?R]??$9,Ucr $J7???,m??t??IQ?b?&+??????P'F?m??t????Z?j????)???*v?:??<?'|??b?|???CK:???"lg??8IG?R?~-Y
???4kz?c=2?~@??\????q???n?G^?Z???v???]:e?S?%.?|X???f??8?
?&????`:???.?&jo??|c?+6Q????kw?$7(5hP?V:x?
?F?
???
???Ee?N3??????~xi??B?? 1>~wy
?~Qkx?~g???R???!ib;?B??l?f?????????L?Q?bS5?n?DH?
?F??q????D???fOHiY???K6?v"%.???????P??????????=?T????y?v?@?????2?%???$X?jlV"?5H46#?wq??y?7h?%%)???c?^?9??u???d?Oha???H?z
??B?R.K?Sl
???????
?u? ??Q#?*???J
?z??`
?XIU?j?s,????f?9???2O??Z?z??O?%?[S'
???"*?:??a??0?<??????g)?????qW??#?(??)?}??
?`??^??6?@?.??u=?l???f???*)[x?P?
?!?8??t	?e?l?S?\k#+=:????????`aME?G??1?3?O??????ido??? ?`2+8?1q?=N?]???W?q??'?r|l?J????	J2???_7?'?'t0???
???(?V?J???`Wh????f?f?;???"????????k5??f?????R????
??`B:K0??7h????D?+??I3W??`d_
Ym?h
?#=#W??~
1?L#??{?dE?????)?
1?u"6???P????w?P?=????.<???]y?&u?Mj???????i?6j??*,?X?_
I]
??'??3???$?E$<???=??,?(???"c?P]???c??Jm?e?qpQ4?K ???r?FtQ9?E??
??$\????]EU???p??#0'Q?S??e?H??????
-?hq?_?A?
?[
^?N??q?????3-bxP???&??(4????9??)??C?I??q??8;
???V?y?4@?_MqU?|? ?fN|V>??ZA??#?*???|e?????/?(r?O83|NY#?????b?FR{????<a???<?e?IP??o??????{??z?k??t?fc?n?`??9X]Z?????H??????,??
~EK???5~?????????1?c?.??W?5!?j^m?dU?>xTg?b?cC????vQ^???????CS????
PK

0O?`??????!???A???L????<B???C?????~????u???<??s??%I?
d???!Wo?%???%????qH???:$+?[5???d?????5???,e??(?$??HH???&?N???CF??`HbP?????B{?CK??<??3?????i
?????>W_u?<????????(7?V??5}L
??N??\??????!?
2?j?r??s??2?qa???tZ{:/?;o?a??T.?2???d?9?%_=,1m???????k???"-9?????k???y<>B(*}????;??????}?????5?=?~???????C??'??I???????,?Q?"Fp??:?Pa?g??O?V?????)?11?z??h1?c]r? ??s? ?l?b??y'NE:???
j?^?o??$v???0?????#??:???,????4H???pi}??????	?k ?&?>?pa??*??4?6??Y???T
#_????h?????N????W??G??%,y??j???n!???? 
???[O???;??"?_?????Wb?3zP?S??<%Ect?tN??B??;uhO????Wd??????t at Ig??????NX?!??b<?b??R;???Q?&K@??
D??A??*?QyP?]?o????8vCO??
?/??b???k~??
C?????
%LF?|???[?
??0????8????:8???o??-?7>V??!?e2o????Pa?????]?8P?A????s
w?%??G???R?????c?S??
????_???N?X-??@*9??G?}???]uN????`|z?????"?[?D\_?K{??\??"?#n?#|????RG????'????w?q?8~!???,??k?_qB??VA??&??Z?a??7Q/u?_???~?n??AOrc??z?%??qeB	?^?'????|)+????)?2B&??ea?8?e???8M4
?D$?7N???K8y}
`b?0`r??
???|%ko???!??????_qJ?0VO?????_??'??
?z?2???t[??=???????g??7?M???P/%?
???.?%?KUxh????V?ah????k]/3?jS??????@1?Cl1@???}???m<
???}?? ??S???n?pZ4
D3?W
?v?W???????BF??@?J???D???5
-?n??%F?~?Se???0fY??>?@???T!??????n`b?Ct?>?K???????qwi??O??t??v7????{?e?????p?I
??????\??vpDVGt??#????????N?OB?t???O?o?%????!	?^j???7.??g????????z?-2?1??
P#??#2f????5??g?@?|ud????`???????D'??s??-dd-?G(Yd????9]??R?kz????????{?#2y???v??&??>mz??:????N??/TrT???Q?w?I
P)!2$?G:?Q?w=V?'??b??m(?P4z$?0$q7??/??tS2:????J??x?1???/f8G?}
????A????>N?o?????????v???9?Cr??j???5??%????vI|K??A?~~q2?r??V??h??<V/JL?@{????
344
?U??????S?U?"?G6?=l?QHq???8?9V
?R???8(k?G%?B9?XJ-f?ijZ?????^???zm??5??_9b?x?i??e?bYc[/Q????8????#??/??V??z?/??N????r[/?n?R???&?|)???fT?zN?%	??`?
?P???Q???:???KGu?x=Vs??????wm?}??A	???A???D<????5!?u?>?w?9??????e??1???#??V????63$U_????>9???W??????0??4? 3?t.n??2???K??o=????Xs?b?2Ca\D&?K???"S?Q?[
?8l?aS?P?=???esG ??J?r?w?s` ?r?9?G?o
Sd????8??I?D,?\????M[??G?/%IvE??+/?Vs?T?\???"???f?\p?K??s%????B???nC|FA???-{$P??a??X>????Z')?5?# ?K?n??Z???y%%??[?v????!??[?I?K
???>r??e???=?r??+??W?[l@?S????E????>??????D?pK?!,??e?L??E;J$|?l??>|0?????m+kL??g3????Q?????#?>f???=.?a????????S/i?8V???N?Kw?u\??&???????/???;,d??%?)?/Y%??????fk??????|?9???%???tu???2j????bZ/i<?Fe???Z?40?4C;q?t?#???`5~?p??????!????????{??]U????"C?W=?e.??`?*????e??6?
?Y???????H^"?q\$?@?V?r??5^??????*?3(J??c????}?EN?
?ud???NEbp?Y?0P#@-

????4??5??C??F4??M??I????????J-???'?4B??WBx1??d?wv
???N?????\}?8??N;<??~b?,??r??????????z??,?e6???)?/???f??L?????????^??????X?= ??9?xy????zIg????I?Du?,|?	???W?L?Z???y?_0?N?"?
?0*?-?w?>h
c?'vU?? ???|$?1?]K???<n-,?????
N)i????y?x.!jheOa*'??u?>??ny???R??:Y*G"??????nDQ?J?F?.1?????o?$??7???A?5?8?U|???ux
!???	`L<?.2.?O?????Z?6?x*?,????)?
?R}r?????=???D?????f_??????L4??6w???cfv????%?8???u?p?_?
?-?Q7?$?D[?&??V\3??p??tT9??3?S[*??T??N? ?x#i?I???g`??'Z?>A?	:???B?=%??
?8?PK??????s??????&hIi??X????9C??+?t?2?_??l??VLM????_??
????7 ?&H????????????	??SP?@R\)??"?S?????J
????iB?????3n0?J?KM?-,t???o?c?-??N????-?q?>8vE?yS[?0???~F??????L?1?y
??HJ?[???I?c4??:?H?R??b????@?~1?E?x??????M8?|Ik(??????]?e8Q???????7?W(?WH?K??is?
??w??O???AaH`??&?Z?U????=?%$??m?ai?Z???3I?6??0?q??u??H?:????(??I????)??K?:]?d?????2??z)???,0????]?R?`???}??????{8AEJ???(??????{Y/Neu???j??O???9?????v??h???q???
???K?G??G????h ????r?7Sb?c???y??2s?.?6?]m?
??!h??-^?K ??r??&s?r&H????B?w?j2KPgk~??f??p?(?5???D?;v?u.?	????mTr?
?????pI??F??
?=?x?u????^???D??o??n?mPZ??????B?I ?]L?r$?.?d
$D^?????"{QA??da	???=|R|?????jH??/?
?3.?
?????j???u??'?y???`}?hv
?k?qC??????c??? ?????C
{?w??Rc?U-?8?????-?We?|x??
???/??2?D???Z1???{?H?CL\5???C?j4?t?Zc?|?J?e?^m?0_??lV#F?6?
???c??????Z????;?????j3B?`?]?o
7??d???H??#6#b??y???<??&?
^C>g?%????|?
Y?b+S?Q?xR??B???????vK_]??_??*??g????????????'.j??1X5????N??teEd???w??
?u???E*??H????:?1?X??;?????u?,Wq:?
<Q??@?yl?_?A??~??P$=n???????>&9&
B?x2ULs?j?????a????
v?????2???l@?U?

D?AX?3C>?:??,??^R?O?<}????*?@??=D6?w3O??LT?`Ml?>??]?@??7??0? ????_????K????xP??2??o?
??;Y{?5???????ak??`}??X?????i??$l7+?-?=?????M????=?w?????vR?8~?l?1????Y?5????f??W&?'*G???(??U???U???zq?-?o??g?Y?G?U/???8[}??xk??w?
???6?b?
??8???h??1?u? 2??~u?{?K?????)????????0U~??
@q"?9???W?:SD,??4?n2-n?.n?Vb2$??@?S???'L%???w?
V]s!D]K???Q?V?\??X" ?p
?95`?3???Q?)??K???!??)?6??n{\t????:e??????%??W??
?|?P?zW??T??B??\?R??????vUtD!???;4?#????1?!?C#????t???7??A0?~?!?G?
~???p?c???%??????/_1I??BL?
)???*3??5???n_#?Mk??k?p?|?	??????????f?5??L!C????u<.nZT)^f?:zsnD?SL???3??????%
?6p2??2?-?a?q??z?.?(G???
>???E2?}?k9L??&?5?|????
??/?????-.k????)??u??+?????????xY?h??
??0C????
NXg???*?
kf8?K>?K>?C,q???eo
8?P[c??%?f??KX?v	??????J??w5?c??????	7???8????X??X??Xt'???t??\?p???*??*????C-i???pP'??j?{???U??7m_??'}????n????}fp,??B|??h!>??????????gU?c???@?x???!3p???p?=9?n????e=?^iF?h??>Q?p??n?a???
?nJqWc?{??v??L??t*?8?????hR??U????YC&?b?k?N???d?T?D2???8Pa?G?O@???o??m???{E(2?s??.f??g6>~3?]?R\S?YLg???g?w9~?F?y???F?Y????{?Y.F??c?K}?N?
?m(?X??VQ<?;_2?
???ij+?c?mz+Lk?l???>?Y02?J???????<^=?C?$??Y8???k?;???R8??2??"e??q???M,I[????I?Q??^?pYx	T?M???t??????Z?U??6j?1C?<s
T????S???H???w
?>?m?!?k?&yU???^\Kf]KfP?6`??H???? ???????({????s?(p&?A?p?
O??3?UD?G"{????
q?G?,V??5?<
J?v??????1?c?????L????<??$s??p???????c????j???L>&?????\??????B,^?c:?kw??#>??53~???x??aGk????x??
l~?????&???PU???(L~???sB??D?e`??0??+<?????3X|
?+?|??}???e??,????5??c?}?HF?`?m?b??????????zT?\?g????S1@??+?
c???u?I??????????.30z??u6I:P???bj]?EH?j	s?T???y??3???V?????H?W?_M?f???B?>??V?kT
 ??Z?&??VUyXA???????#w??!??&O?YD???b???&j?4???????f?~W?b??aw????(_?{??]k*N??W??S??a?/????\vy?t?G??=?s???Nx?????
W???q?Zu?Z?"?
q, N?d??a???>|???O`}X'????>??)/>?a?wZ%]/%V?????"????n?D?n???f?H?2?$?e:?????
?#*????I??????y??)L?????C1D?Q	i? ? ?l?SK??1??J?9???;C^??\}????'?5??????K?\
o?????_2??????\6??hq?)?97`y?????Df
?
??h??h???o??????=x ??cs?????
?V6E?wQ?p???4W??j?o?l???F?V????QS@????za?,IC??*?d?Xg?????x?e?
F??<????!????zI]?????
?????P
u~???w\?????)nirsh"?iLb?????3hsc?;P???????D??T??*)=???3k"???P7/??	z??}?"
P?<I??Y???ZBk???????? ?????'#b????Y.N??b????S?F?f??DI?y??~?+b??F?2
?st??????C??
????U??v??yJ?L?Q?>????ovCY??????J?hhk??Ns?????A3j??
j??
[q??!?
y??O3?|J???????Y??)?bHa5C

M??~?ov????B?C?????jt)?n?0
??
,1r????y??
??,Ya??/<"p??a???????>??????????o>?aV4AH?$???Q??
-)?7X ????
>????3T?~???O????F??w??????
??P?R????dH`Kkv???G[??`??rLR?h`??H???S?5?d??v u??Y?N?N?<???^}????n wZ[?*???*	Lj?
??ew??Y?/??Dc????#?z?????Mt???b?2?'"@Y?d?????;?????~??e?P>??}?U???iN\????????t??)E?H??^
??$2C???^??W9>???????H???N???Z??}?H at al??KqZ?p^??3??e^w???????8?;??,o@???Z??O???????W?'	g?$?:I8??^?l:?|??u??As?????????????X1,kqj???6????%??d?????o??1???LLk?'Jrr???~B;???????1????-????-3
?A??B???)|??b?z,?O ?:?'&?n????????????L?"~?|?[B?????????9?0'?????j??d???X4sKL??_??%??Y???K??????B?8
#??Y+??????*???]nf?a-????[G??u??R?0??1??X??/?qf?c,??????????8{P#?z??R\??*??t??/x???i??q?|??`?l??=??!???y???x?Y8?|qS?K+s?*??}?r?W??q1?????'@?]?{????L??3???#'Vq???I????!)v?u`?O>?
???w???i???????w1???C????_?????1????M??????@K^?z???0??e??????7&%?3????z?ia??|HJ??z??,u??9?F$1B?6?*?b??gG???~8=^<>B_???7a\??y?? _????????[?~^;??u6?eg???C?{?vq???l?q??M6?h?_S?b?%N3/Z~?:p67tv?W??;<??E???????????
z?n??(???E(???u???o at 8??7??Qh?<l????C?????;?
l??+??w?G?p9t?eH???o?B?a?T?6???zx%??f??E?3????7?6j??.?5???OR?P?????W?'????v????????8^???G??i???u????l??????X???3?;gu????F??7???O???????z???SC+???????qv?B#?_Y??x??&???v]???%?n+?0;?iw?d?8~?p?yu~?5sc??]??#?;?%????X??????J#?????(,??.?????
???|?t`??8?9%?
?? jc??-B??b?k?}?y?J?a??_ ?U??2lyC???y,??????}????/??????t??$?TDr??kK???#b???Vm???y??Y
?|??~??AMf?D ?1j`
??`BMQ	so?gF??=i?s?
Pf??R??????m$??C??xav?
?l3!??I??|X?4???:?T?~??#^<X??B(u???ZA?3?J??????????z?y?o?r2??????????
ei?1???-?????@?o|?e>W9?&,6??:??O????????v#?$-l???5?A?????Dg????v?gKP????v??U??&"??j\t???G?V'???????????e?L??b?u??????$L?
?nt???{s?d?`??T4dC?y
??!p????1i???c???@
Y??4????Cq???? ?????Shb?????d?f_????)?N
x????n?w?????;[???-t?%<??$???/@u???-/?!_<???????o????6?????E??|PB>.????b*?=?????.{_?P??6???!m????w????????K?6?X?rO? ??u:~??}?]vY?o?????q?@;?????6uA??Q1kS?C3}uw?+?A???g&xx?9-?Dyji?Y??????\?n?X?????Vn?????Q??;#?Z@?W"v????????"C?8????[;??9U@j?H.;k?%??????mu;???E??g???~?.o??Qy??|u???nA?.]a?W????M??/7??3?j??|h???W???7?Y?GH?1?KZ?U????
???\???mN???	????O???Cx?C????
????4??????N''?C???s???^???P??B???/?-?-N*?^?a???,W_??s
?\/!\D?:I????6?|i???o?k??sl??????#?'????@Vs?3>????0??6?d??p(?[?\j?2B9??b?{/\]??
&hZ????b?V%?????f/?<?????c?9Ve??????CE9?U?P?????????H??????c??r??}?W?B???4x???????(???"??U??(??[X???r0?????J???s)W?g?????Q???K?ZTA8???y?r????^?????B?s?I#VL??!A-J[???[???OfMm?[ ?????-oBQR?
?
t,??H=z?z?????O?????C-?:
?`?fi	??@????:?Y?#????????2????XP???)h4	??,)??S?9???v????}??Z?p?w??A??	??#?????:?,*0?Y?8?y???`2??????	?]?>??t??-?R
*K}_5?4?????@?M????X7u8??=???+?v???????p???Z??c?x}?#?
D>D?m??????!E_?$7?	????X??Bv??S8=???????Dg?G
#>7???dH????h?0??'f`>.UW???
???E?5??IO????????$s?K$B??0\]??=?i???2??=??IHx%R??I??][??{?q^????C]?A?vO?
.c???5??}n`K[vSb??a????1????M????{??F?#?!n?C?/???T?????>?a??(????s7???zK?~r???Q??@_???4???0?]????????H??????L;?h;??e???7?kz?????%?? 0?r
??b??Be?O;?????p"?M(+o??M0eh?kuD????&?Kg????E???U????????eI`8??->?!.&?r???X|!???K???P|?&	>??KY??V???Q????!??k???F?`??m?9?d?W?x:??h_??/???:??2?/#??*?xDYK,?J???N??Z???[+????????IzZII?0Q?S_?%????uN??o?8?C??\F??	#]?i'e????
N??nSo".????p????_?`[????????9??!1?B???Q?,/?
??'???{?H[?")QU???4w???HZ
")???$C<????????`??6	/f??^??H^??????u6?,?I??l3??;?f????&4??f?WHe???FE?V??e?m??"?????/$??+??j?9]
??2(?????'?@??1iX???DH??N??
?&???t??r?W&??!(???????p??A??
X???l???I|???X?,??Z??ai???P*????>???S??o?-??}?W?I2?NI?>???i??>???H=~??w	??DS*?zq??N?*X5F
??7
??_)f??P?
P&Sb???????er?K???a$?????C??B<,?#???F?C]5?1???Q;????crm?1??????-B?y?'??p??B?????9?G??@'W1D?k?DR6
???W???=?3?????5
/???
??x?????j~???
?e?ZY?k??J*??h??e?|G?l!??g?{??z#?????p???pb?z?	???G:?o???cr
?1?%T1q????? C?%1??k??K????H?|????9?z?<T???"#?8?(z?B?=m9Z?R?z(^???
?????K?M????5????1?????X??b?O???j;??.d??????1??X??????_/?????J??u??b?\$}7Y???"??`f?'Uz]?????~w??????,>?]??mX?????oU???d?kD?<?y??I_g?U?G?)?41?Au??FAo*?m?i?n*???! ?DG????-?f?\?/k
Y??0??v???K??????y????*<??$?k8.?B??<.?2?????U??????g?~??<????[??P??2???9?|\uNI?_??"??q????S????h7M???m????????<???@???<??Eo??;???Y?G?{?????06@??B?:???X?].?_????D?S??b?r??O????kPr?d?Xmf????Y????????!F??-????	??j=h9]?.O?
'?`#??H?$???u^K?2U*6Q*??L*??I?]D???<?????Vz?W?_j????iwmr????=?i??)f?kq?????I?	?????;?>??x5??/???zz??84?????N3c?y???3?~???!#?;it
?0M?t ?0?Z=??Hb????????l???B?f?)?u8u??v"?6$w
Z+??4?mo0
??@?????????3?I??lK???-}??;?'?I4)?'U@?v4}+?|Y]C????????P'???x??(?
?<)?
?????????buPd????``????d
s\? ?9??Gf?9?1??C?rRs???&c??ALfo??????'!??T}?8?K??\?tJ?o?DS????#)?????H??&?_
%??7?o??B"V??v?????"??H?!????&??j 
E?&??x?u???9zj?@_~H??????f??;?,?Y??`+?%a)?QV?Wz??M????MX??*K9??#?R!????	?5?7-??:7?=???o?d8??.m???[? ??W?????:?/??\?,?????????$?2]???	?.2?L?U=?Y2?6?C????d?_?????Yb?5???7u????-?1??;?>?y?w??p?>?Hk^DO;L	KVY??G??? ??????s?????#???????!?hO?????I?|??_?u'?<?[\????
?
r??9>??D?H?z?S?]??^?PbrTH??1???????/!d?#??#????H????B?W7c??uI??B???V???^?
G?????wC??~^#???X?Sd?7{??=?b??9<?B&??`L?#?5?`??hq?s&,bhNK$Ct???R?)&b??3[/v??#??6d
??WFN6p???W??~	?k?c>G~R,n C?"C????????-? N?}r??<@qRHq??%?:?2?|???.=??`??????v<?K??h?2??(?^Z?as?ct????C3?v???0_r?I>s????v)???/??0r?f?$
?Ky???B??g?r?4w{?????=??e
?b?M?n????H*?G??kz?K?%??
?????D_f????6??Kb?<e??<????m~?H^?|???BRZ??IY?????f?
?=O???6?D??[s?????)?
?;?S?
?`7?hq?	??/????l"?s??wr
???'0?9^?:L??nj??hVn????.q?+?9?P???
!U???
Dl???
?{?,qZ??D?i1?]&*??N!$??/??K?[??5nG?c???@=??m^???i??/???8 at YV??????????i{)????G~??l?2i&???l"?c?????T?!??9??/??!b:??c?f?|?^???X?K?^I'??t??s4???U?Z/
W?*??c@???@??I?f??^:?Kk???K?yM?vH%?c?8?%JY_??E???E?O?b???G?$f???#?1??~??c???{?????H?u?Q??
zo??;??%`7I09?B*)?~????????9Z???(Q???=?S??R9h?s;e:??' ]?#?.UgQfT`?
g?Kf?'O<???????z????O???3X?'?? =~??jY???[??c?????????6??>?CHH??&S?Bj??L1A?
?v?Lh?@=????H7I??9????]??_?I?e{???V??????v????G?'S]N??/?5x?/&"????vh@??/K??1?Bz'?T#Eu
X??k?????Mc??:??
??=?>{`;?kS? @R??~ym\8?1??H?9??}0???nA?hOZp?@??h
?8h?*???K?o?????@??0}n??/x$?w,??Q!CB?'???Y?[
n????N??R????w????x?HHz??E???J?WK?-????8?u?'??~????hh]??(~???'????*A?]?&?1|???`?????/{??.L>????#??@
/r?^???????t?)t?I:?S'?Z?N??? ?'>4????o?????[[?5D?U??qVmS????z/?9??_U?\?,G51?R0???????u[T(oQ'??Jx?(????!?c??????s??)|?/%?d?????u??~^|>??3f?????!z????3?0/?,??^????V?Es???xz?@??U??j????xz???s???:ly??
???-????m?!?-:5s???35?~?4?.????e?? b???/4R???wh?!??A????x??,?6?ys/?????wY'??????s?8V2??K???^?????Z??R~h?????h?_??j??zyu?]?X'?|????V6M??p?v?R???I&?%?$%??H?\??Z~??%,}?^????????t?Sbcz???S?*?
X?????@?????d?^V???????????b1?g?j?5?DG?VVu>???qJ?[?k?-\?n?Zw?w????n???:????,vPn????]??FZM?>
???]??o_?cL???8;%?e3?[??b
??-(??????0?k?!2GB???????[?Z?b??&(he#)????#?a[?hv*7/?????BI?[hh???p?BoU?7????????E???V?%???%??0??????_???,???{?U???o3????wl7??t?/75????? ?9???#?5}}???_??n?k??D??????
???W?J?6??????IM$??6??s??????????A??hv?O?z(??4Q???W? ?r?2??-????#?????????!??????$??g?????L??I+7???W????????????a?3???
??{@??0;D????q??k:?C?0?k???????AK?wW.?????G???Y?y?j?????D??*??$RkaF?x??	U??D?"?&??aL&\?XoJ???Y?>{?9?0?L{f??f@&?q?.Rn?t???@???P?;?2????dk?>??
\KI,?t??/???????Mg/g??j^????c?g%I?8??!$??Xq???c?c]O?K???nM?????]?~wWlFs???k???^3\?f??L\?b~??????!?!'K????j???o?J????f{?????K??????m?~?^$?Iq????On????^?})??
????1?[?D??p?RU??`w??iB????
6?"]??
+.p9?W=?Z;???1??"u???T? S7???;?!OP???}??W,??ug???`??_,6?=JMd???f??_m6?h?a???N?0?C????|?1????:??3????lv1???r???]??Zp|??|???*????M?????^?
M????;C?t?Cg,,LR?X??Lk?pX?	???r??}?)?????KGr?????|w???%H-?/p7??U????8??C7???%%??r? ?I??*}??]???i???H??4*wK??s?lz
]????????1>j???F?O+?PB??$}?
?|fQab??q?i???F?????Su3???I???hw}??sB0????h?`?;e?????A?[???m??-??ry???{??1??.xIp?6?u??????h?"hl??e???S??????'Gm at 019*itN?!??8???S@??)6!lTv_Eew?\v_?eo?[`??W??|fs
?0???i?c??T???n?h~?x??????K?y}Vxk?xO?R???
k$^??<$3?T?3?S^????y?{??????L!?^?59??????????u???????NUe?`?
?_r??e?+^W????*{???!e??V?7? $X-Q!?!??
	???T'?D?d????Ai
iva????w^:?????\y??#????????????>*>???????-??
????e(?i?P{??]?O?#^?y??w#
E"????????G?,r?g]?1Y\????
???K??6?????uH??e#?G?]?c???7|?u5??Cf?/?(,????r?R??D2?^?\)0???X??;?
?6???'??????R??L??L?
?A^?2?+e?Y??
?uD??g???Y]??
:$%????@???:?r???Q????
??$???%?J?({Q*?&?_???'?????rlPz?q????8???b???=\?J???:?fr?i{<??cF??????_Y~u{?????[??<]~?
????z?m?lH?????z?s????z??5?R|.W???+\?{??=??G?? ????*??U?9???G
.?PGB?{z??~h??????_?O?#???XJjh????W>]???W?G??1u??`????I_??????/xa2t?P?????K??v?^????????_???@k?xq-A?
?/???|?!b????kz??T?<0???7?^b??
?????W?U?!??
J???$|{??L?l?[Bk(k?
?]?q_zc?-???;{?F?N?<]?????BrC???
?????_????z????P??????v?L`??W?B???O???????s?V?
??m5?N{??q???_/G$_?????I	?KDH??O7|?*MC?'SX?????+????"????g?
\:
v???w]????n?)??
<??"@??k???p?f<?%??A??J???=zZ5d????	?7%(???XY??=?g????8??U?i???????5Hj`??`?u?.?'??f??'+(?3J???yK?>?????jg/????????'????K??|xy?_eh??d??.?+????
,??
zY??
?<?'v?c?5?????dg?|?A???L
V'Nb? 4'@?W?sn???_??@??;?G?U?^??|"!???H????:?4????8???~J?&dc@???X???@.?V?X
#??$??<?#???[?G?o?????-am
?:5
o?9\?7q
??????E?u?S??????=???W/U]D?V?
?=?i?@
0?#?x??S?n?????????BB?`?u?2?(??$?#?A??r??4Z???u?????)8n??:??>	-??B?K?^0?6kb???yUW???Rbc??wL??
?S??N?C;??7f????????????4?&C?E???.Z???!??`?$u?Z?????:?y??N;??w???m??K5B
i??w?4Z??? a?????????-??_?{?
?M??Y????V??%d????"O????~????(?;)??Y?????.?_?EE??;?gH,??,?????H?????n??r??87????&]??':??B>???"??????????.???"u???w???Z?+?????r??d?G?????j=??U?k??42??b?Xg?DX)`OU?YA??x}?????l???????BK???vO??<?|u????X9?:??R????z????s?~c@??}y?'???-?w1?Jz
?E'????3?????n^??
?E?"????t????.
.?!?]?O????????k?v?/*D? ??%??,+G|??
K??d4J?Z+?$??T????\B??)[k???o?[?Y?e??)?b??'n?l??????*K??}iu?K??kR???U
???T???*???`?{?????????>?d??]"w????+E?VN???W>-?l??:??|?6????Z?P?'??U?!E?,?C?i?a?:
'?????#f??a^?#[F??w?R?6*%??$y?3D????8HA
?%??n?????????P????N?z}W\?
?N?K?j?_u=Vm>?&a?PmW??>?nE?s#m)"?qV???Y?}????? H??dP??"?R|j???????>&C????? ?a??V??P??C?,???&7i	e??T???T?KXs?gW???3??|? <?[?V?Y?W?	H6??r?]y????d?l7M??-N??WWX??"???V?Q[ceC??,?@?i?C?9????m,n?
?o?<u??m?@?'?)??`???X?????5[???A2??rso6???(~ ?N??L:oC???'%????7???\t?Il???+???O?EO??=????$?E???U????uB??????(_?? zj?xc}??mp??n??2??dS??mS??<?C8fW??~???*??;?>m?w???^?)??	???P!???+>mF???Ep?H?Xd?????Y;??C?u???wj??Du??<???|???)??;g?Ab@?:>??
 ????e?N?????????$???7S%????a?@??|?Y?C??|`???$?<?'????I
???-???q!??Z???dk?iy??l.?>???t?A??6????D!?{f???@Z????Feb}?d:TyLx??9??'?a?5P???]x&???????????e4????z????e????S??j?7?	?)?R???`o???U?y????!
??n?R8+<F???%???:?`psXi*?E??(?H??rN?
?D??????\?oR?Kk?0?U????5U*[?'???d??<S??u??,M":????_Ku????Z$?(?9??????&?
??????;<?xKT??x??????`@}?.{?3?)yP%?u0a??A?
?'Q? ??&?H??_??/????%?_2
?-???t?????8-???]??}??S??4HhH?K
:j.?}t?3??
??D??	??5??`$?)???&?2??2????V
???'?`&??)DZ??n?[Im
0?&?X?/?o?N|p???z???
Y?EJ?
'?*?Q??X?o??qu?9??
#?????)?5?????????<g???t????;?i??
??$Jr??J??
?zLRLy?I_?f??'??-?{R?????1?p??-O+iR?kh?p?]X<??/???????f?W??D???4???7???
!T????U?P?@???y2[??l??Y????`
T???? ?????9??\???n???9T???"??N?R*+?
?|>?#?o?????9?/?a#?0??:o???V8K?~d???C%?It7?X8?r???Dy_?0?B??o?) :E&4)?P??H?G?JC(?h????9????3???}??R??b????????l&???L??4Z?Ar???L?/
l
??4?O-HC??"??7Kq???
ppc??????]?L%%^?????+e?w??=n]?????????yo?zs???@?<X??_?8?????x?w??<??????c??{S?#u?y???
??LhwK;??????FX?:???	#?_?r???N????
V?2????F??~??.??#?uZ???|?V?????????jV??[?1?j?`s
0???}R ?????C???0???_??pr?%?J????a?+???v?g??_?. ??.E????von
??D???or?!?)??Bim??
??Sj)K?o?'#ku?$9OR????
??%?@??+Ij)DpK
f?
??Y?"?wS???v^KRUVl!?J?5'V?X???iB??|k	?+?AH\p??????FHq???:???4???o??????VSbX?b?x?T?\??$A???*W????,?	]NS}'Bk.?t0y?HX?
??3Th?_??

VZ???w+????oW??
E-?
zK2R?@|*??-?1q???]??	-?;)?#?DQ)r7P??A??d?3???!??y?????I??N????]0????pQ??\$
?g??%
u?
????Rp?
H??q?K?>?*?????>?qa
iq????$??r?
?
??Ew?)?R??*?:Z$Iy??d??n+?l
??^??t?u
V!?H????V^?
?????*?he??????????q
C?rq???9h???:UVwi????bv????*??<]?]?*???*??9~??
@i??X?????c
????j?????h?9`E???3sT2??m?b??U????J?SY??(??
:k??O\0?\-?L?W??WMn?iL?~??'??~oD??????8=PSW?
??KA}e?_??[?j??&b?d~??n???K???W?E1??=0?L<?k???3`VC??????
-??.?c?!#!??v?F????m?1?:??H*m?Xb?? ?m?n?1???K???vSA;[
?ei??*R.<?D?\?G?i-nPvk\(????Wj?%j?3?"??E?n??mg;???2C??l?6????\.???Z@?V??l?{??x???P4 at i??>???"l_??}????`??;?:??????????
?S?=????$n$
???>
\?)rdUvT5/Z?{;?&?R??X?v?@??=?????
?k?~????N?L?ig???TQsWE?
?Vfv?
????)?F???k??k???F?WyW???@B?s??(??/?'?O???	`???2\?6??U???^'??mBx?Om;?bAL???? +D2????)?
%Z]%?$+?Z???]?*???ii?1
E???Y???B?|??ka|??YA?O??n?6a'???W[Q???*?V`?~ ??0??&B2_?7q[???G?f???jkq?6Y?x*r?p?R???????,??6us?:8U\??????j`?Vt?d^kG?????n?????O???*?5????)?zQ??s?7GwJ'????u??3eZCE??
 ]??/N9|;MZ	jk???h??TR?
P:??+?P??????O?JI?+?sV??u?G?????,)??wRD?????SC????`
?H!??7t?n?)s{
???E^?
?T??r[?M??!??
|??~k5????6_ XhJ???#U????M7???H^E???js?M?C=
?N??;;k?????Y??u6^^????e??F?K??u_hH??_#`
{w?MWbE???;?????X^???l?%????Zi???j??$??"N7?U
???_Y??ME??d??tM??+%U?x?n??
(?*???&J?{h?0??Hp?V???*??\??(@??????>?|?4??wMd??<xZ<?\?ryW?
???T?M'????r?3+;?el??6????@?K?}?~*?Ja???\?Z????I????\?6???h?V{????%??3va?o?6??????1 at p??O,??]?L|??0xT{?
???;a?_@??>?-???{3???p???l1?C???T_??56??]M)???b???
??w-M??{??s??
z?BI????d????]LzIvl??p??*??
w????g?31??Nv?H?:?S?"??"`?l-3??2???Z?
??@??L??N??"????????4?N?a?M%??da??&???????????B?e?a??Y?L"v?5H?
?8DXj?)	?%??AV??j????=?X3
Ke??????Ix.??dy?????k`??r?{ ?G?o?????N????L??B&?
Y?_M?{?	??Mr?-dE
???noP
??4H/ZvU,Eg+???e7????U?1@}??;?h"Cq??dw??]?i??s?Uz9?*??WK?W?r6?S?5k?|U?N"???]???}m????iu?L?$?>?~=???.P-??N?Hi?~q??<?Y??z???dDR|T???P???(?6???;??K?????"????R????-t??M??i?*?R2???)p?~6??HE??
?l??[?l:I/??L0?~f`?i??	??&?hZ?????????S
G???[??h???	1??b????????	.h?r[??m??????t?lt6???,[9v?R?????E??\,????h9???}????0k??]G??????~S??4`????????*?M?????ed?nd?<2t??BwB?
???
???4y??????H7?a?????p??????
?Y>????E]?`?2?? ?<???????e?;???<????u?'???^???yrq??w?G??&d???]oBv?	???c????w'????>c?????3v????c????b?v?q@
|??=$???b???]?+???I??S??F??G?a?f?0?Hu%???????Yw?;??#?i?+?Z?????K[?F??N????W?q?\????Ad?,???0!f???(r???(???X???B, ?z}X@?@???_*???3???j?a?
??????~o	??j???3P
?>???J??cTb?F???????!?gz?(M
x?~E??,?l?T??R)??
?S6?t????pd?O???>M?
?n?????y????N?????4X????%???H????d?M/6??M?.???+
??~?~??B?W???0??? ?1 ??x?o*?4?Lb?IB?_???-?*?J??%c?d?g?????<?U?CC???????$?Y?B?M".?J??`?W????t5 i????H?u??R????????N?e ????u-g^?
?Z????ba????Y??M?'????1w???4?L??2???
?HrZ?C???U?b???#Wi??P??+?HnK??o??2Bu?[LiZ3Y[B?Xf?qS??{IR?z?EX?????S??J?? @?"V????R???"a??CP?k?5k?????I?????!!S????|???????????U??=@??O???d???g7??Y?????Bc-???(??)v7??0?vX?X;?>	??g???,G?V??S?"???Dz}????!edI^L?????4?h??o?3?I?jI_???<O?|??_?|?Ed?p?99,?p??A?UuH??W?????????I??,??R??:O?????z????-??	q??O?Jo?z???.?P???-??z??ZH??????O?6???W?y??4_?????jqJ_eC??m?2?VP*bN??\??W??#v???L??>?3??T?b?L?@???1???1???U??)?U?du?gN?w]d?I?????Sf??H?nH??	?"?o??Y?-?v??kIR?:M?	??v\0?jn??y????g"?K??%]c-??l?D2bU?a?$?=@V??y?l?_?Y
?3??}r#]$????????n???pW?X?O?qk)????g???.?{?<??Jj?
??,a??/k"|?O?\??@!??E???t?r????/g?*?[???l?????x??????p?!
??)ln%????????C??,???Y?pad?????%?2?[1?R??H~C?5??/?50
^??TW?R-q at Xy???e????????????Z|?b???ZY????!vr??uN??????G?
??R?o??Z?@p1?y??Pg	????U???o?Rd0?@B??n(?K?F?????,L?
????????a?K?&???M:j????G?V?*?|H???&?s???????djLK?6??6??????D??E1?`t-????NJB??J??u???%???????\?b?YcZ?????s?`??Z??9?;?]W?8??a??
??????i?:?^y??.*A
?E??}X/?8[Uwu`Q?'?qbskU?m??@q?+??????A?M????N-??G??S???=??i????Dc?g????3H????*U.???Xsr??]E]nH#?
n???q??JP?
?~Z=[sGfD?w??Q??4???v?u??,VZ?n?GQ????????QRY@}???
Z}?y<?n???+?,/`?U?&???l9??O??D??W?????v??\-MnK?}?M???????54??$??????????z?d?k?\ov?9???(??A?*?
?n??-piw??n?N?
????mD???
q?vF???q?2??????0?8?.I?]t?f???? ??
?i;M????=?
m????@>?Td?????w?u??(bx?????(???8|+[??p???25B?8?k?Vs??;????S?@?????99(??HY???	??!??7??
[??\n5?M?9?@>W>?I3?)??!?M???U??\v?^{???i Q???)^?y?u?&Gaq???????????r 5??<?.????????uw??????w[????"??Y?Vvw????sxK0;K:$w?J&d??.?]?(????7-0?????????RQ&????<?z????o@??KF!???AeA????H?"?;/?w9??g5WJ??????6p?Lm?Y????>? ?w at K??7@???w?
k?,??M?^?U
jq???;???Ow??/6????c_BI,6`
?ME0?!U?d???L?p? ???YMf?b%????K_.R]???^wh?Ln?Lf?*;????)????u?????????rDP<<?:??;??3???H??e\???"&,?O3w???z?????? i?O?????Y??$????E?n
?He?g??w]~w???????x??]?AF???."`??=S?d???EK??D?????c????&-??zs?o?????Y?.:????E????v???.????q'????N?J??S?g,??u>??|???J?ToX??wv{?@??l?|1???t?n at 9??3????L?	?SC??????4]8????
???6?|4???i??
???d?L?x?l?
????]?????9?na?j?Z??d?9e&?'Z?]e??????z,??f`?-?Cl*H??h??????
J<f??~L?)????????d?Ip@%???	?>|? t??a?!??6??????@?!
BU\Dh????"3HH?[?x?H??3?C???_=h9T??????o.q,??q?$??Y??|?0?DH?2?8lM~?vx7?i??? ?]$]?
?????9\?U??????^??MS
??p?>??5?,?	"??V??????	?? ??E????????
??V?m}?#?V??????=??/`/?>V????NW~???m2??c???C??k??<?????C|?]:RS?C????????C??[?E????v?Y??-???x{??0?????????"-y ???3??"_?L??
CD^v]$RV???I&.?????GK?uL??;D`???w<F??;+???!?qH?????,,N?f%"???c??Ta??!???????X??m%???Y-????u?&?Rm??se?Z:?
`??^?	QZa/?GRQ?????Y?&?v??]??e?>Y?!t?8??)?j$??Tw????(;X???\?????|W?;?u??9???q?CRl[Mh???????)??u?NM???3?&+??fI?n>????! ???I???u3?N'?????$??Y?}6?t??=?
Y????e?S? 4????$?{?y?
??w??9UU???7?V?3??
???P??U???????6??R?7??yc?+?*'yphU7A()x?????w??T??????^???WEK????i??;T?s??@]o??
J?^B????????*?K+?G-?????6j?e
?$???????#Wm?\?l????*l-??-?>T/????@2m??s?.Ue{.?9I>??ZB?????$?"D????DJsD9?g??^?T?M???jmq?m??U??1 
zwz??V?
t\]hT??$(^??(???????~??????OI??E???????????`?????9?;??T?i???R)?C??C?J??E at N? ??,??&)?p?4??v?+?@?:???"?Zz?&??u???p???F?}^?.Z??D"??I?]!(aV?????V?????]?????5a%w??
?ju?|?????B^/!?w??{?
?K i??????Z????????\t??j_??f?s???M;O^?s????????O	?;?o'n6????b???U?????????????4???????
CO??K?)?#D?a?o?#y??????????<O????W
:???(?,???
?F???!|?D[3B????????>???zz?5??????,???M?
??a?<"R?J????
|??
)??F?R??b??
?????]??dP??v??;?Y `?
? E???'?????"???.#?~w6
?9??c?.},P
?"???_??g?AJ??!????Y?l??U??&??r??fNbXv?
???' ???W???*???"??
????????z:7?[C??????k??????'???????8?M?	.?p
f??i?.eO?&??e.?t$?]6?Z???R?$CZ?????(5Vav??z???qh????	?\??WjYv?????(?ZG|?&
M?C??????u?m@?????{?"??"????zSP?m?w???7~w?!^>4?'???2?
?[N?????yn!?"?A??&??C?0?,I?Xr*XJm|??????3?ux???v???D>????????&?wP?-?QE+
??]???r??u??B??H??M
9;@????E?}??@}1??r?????dW????J`?+??]	D????%Q??}?A??2??7;??2e?	+
9]r???D?1t?f#W??>???_??#?e?@?p?m?w??????x???`?JEBo|v?DU:j???d=??????lG??@?{oL?EH?V}M2?}?.<B??a[?l?M????#??m[?????odi??{?/[0?&????;@???????r`??|}?x??%?K??K[?K???????pFFX??z??+-??X???k"???e???4??rb
	??????}K7????KK7?

?*??K?Wgm?2??`?Q~\G5?,??%=a??*c???"?y???E+3!??(???H??X?BH3Zb???I???$;p
?C?
??r??*??ix??>I???7U?.C.?W???Zwn???ZnM2 at 0?Luw?.S??	u???7???|-E??M???#????B??g??6?FV??oE_??TH??A????5??FL???e?????;a?j???t*????SG??~%??
ig[?uD??h?hf;~??O?v?t?>???{V?Te?????Q?_? ???hj???6?'???????????}z???M2?F`???|:??O3??T??Oo?????>?n????T#k??dS?)??%Lb1????g?????]?3E??1????O?"??????c??????????w?a?9=??\?.u-?L????
nZ&???n????[??<?jt??1?A?\*??K?v?tl7?z?/I??r?0??@????PL	?y?0
???dqi??X????]?<'Y???B"??v)????O???W+??iO?
??I?E???8W???E??	(?!?R?j1M???!	Wj???C?'G??x???<?????V????h??|????{?j?????]?z?*?"???>?+YLH??S???Di?U?V??!????c?^?9U?QE
????(?^??8?G?PQi@:???D?X?~??d??y?o2???4?|?9??X?}?????.b>3????z?d?+?&
?5??y??l?h ????_?F?,???????Z?w?wr?????#?k?? ???HG??ci??g?j[?iu??T????m??!
,??@?v??R??????? oR??}???l???2x?4v??)???????JRV??:?b????????DdWYF?? J
???g?a)??:~2?-?W??G??_??)?a?_?n5?v?cE????}>?U?????|
(d?`?6????M?W?G?&?h0N??(??M????T?Es??FH?}??????5??E????T+
7NQ?Q????N??^?T??dU?d2??A6???&?Z?>?[O?mw?????h98???F=m?Z]????????Jb?n7T???!??#H4?.|??/FgD{a?F???/?EK9?5???#?V??7u?bR?lX?K??]?<??S????'g?ja
?b?C}??$?????D/W??qa?_?R
??a?v"$
?Z"?RTT?)?f???5y?b?s
LD2>w?d?<S??r??HFs???7y?????f?W????Xt?;I?vs?o2??R`,^{"?
?cK39K???????h??W??M?uF?>???
???????????7???0	?Xi?O??E???:?{Y?1?;8y???i?????F????X?1????@"{\?????w2??X6?~???TY?7C2?I?k?????Sv???_J?^?PI?}r??!??=??w~??\?!???_?n#??[??%w`??I{?MX!,/??dE?i??h?\??N??
0?1a????CC?$?????mIM?j!bEs?U?2Q"????_??????%???????{r	?.qTXV9??u?V_?d?K????W-????
???R+?k??5??V?r?_(I4?????w^???F??????9V?uY??D?h'd?tb?{?Z??,??M????+?m?p????????l!XJ"?)m??h??:??????????p??Pe???@??????j??????./8"`?(o?/_V?/?MU\V?????????X???@?vv???Mp@"s??f??gV?
.?v.?o
T
???Jq??{??Y$^???mb8????E?<?L????z
?y?????E?(D?)P(?p>???@rAlu???5t?[??my????#??`????|h?>(a??????@?<W??;k?%?F?!4???qD??ln?T???O?[?1?*?Tr?+??J??d?.z5?!???D?J[l????a??W?.?_IMN?f??7???z????k???U?<
?c|
?M??e?????.j???T??j|?[??[
?1J??=?I,<g??8??E
?[	|?C?'C??&?R`E9+?????VZ??b?
Yd>]L???>??`?MY"h?A????|Je\9HE????*??????tI?)`.???&??/x?.?N({E5	??GXnbt??????Do??u/?????HJG??P?-?5???????<
?????|?YM???Jk?B7?-R ?	?b7?F???"????(???{?a?=??Q&???e?6E?qQ?*sY?)?'f?
?^??.???d??e,9lH?,?Y???x]5U?6?L???B?1*???T????guE?'???5?*YRU\??',Q?,&Z,???6??m[j?+???V??"'3:$8???%?
?}qWE7???c??
?$|Q???????Y
>?(?s?#??}????U???/
 ?&k??????PSHN?4^?c?(???????X??]n?
N?"?????
??/??W#$~?)??/???LD??M?"F?J\j???^?_???m????????^??
??x?e??? ?E?????=??=?4.@??V????w??????>?8
;?k?0???1"l?{#???1dJn?Lg??+i?9?,?{????$!??6{??\??}qH6?????E???????0o?l?m???????4????^????\Z???'w?l????	F[??;I??%?7?d65??M??K?u????|??o?
e?uu6?iu'??b.?<n?d???a?-?A?<j??4???s?-m???6??????
?*m???????g???9??N5
9???b?&??0?J?g?0?+?H=?AZ
@i??3FT???Sm?????#??z?????????(?X??>j?c?#!????????]B??????J??
&?
"?n?R?????????
^?????[D?~??:n??????%??????? ?>m?J???w)?tfK?????~f????P.??e?+???\????3,????!????o?T<
?t?e?&?/?H4??p??1?]C?F????L>X??/XU??'?].?H?)-M??????Z?(8B{P?E??gs\?[a2?~~??0????????x? ??-.
???p????^?6?vM`-?[??a?,'??2??W??Z?%?t??.???U???P]6u&?R!Sg????????l?4??z?@O
T?O???M:????7?pM??+\?u}^?wW?J???&?@??RS(??J??`?V)?~???+^	?R]6??*?Sl?????j??mST?E?z?z??????M,?Nr??"6D7???L????S$_4=??TX?	???<???*q?BIb?(????x?6??{????7?u8?????]????g`?? )=
Zc???.?R??om.``n?n)????B[??K%Q?)js???(??<?O?0?N??UP??????0q?
d?????s?2??%C-\;Y??0?| ?????gLiX?.?x&Q????d?}??k!,7D7?,V?$?27?8#
??3?8??%j??o????(?,???lo?5?M=g,?}c??Q?@/????hM
Tr???w????????b?@????Cl?Zu}????b???L????\????5???
T?b??S?e+?
?$G?gY
???~?')?!?Q????C7
J???VF???}t??4?}?*.?>???w8?IBEi??E?i$?!|O??+6?)Q
 $??z??J[?o|??Y????0{E???BBK	?????q????
JP>mP4????????????nW???BAU?
@D??$U?N???w??s?R?A
eg\????!+?Z?zlu>????[?8?O$,???c$???E??4??p?i?L??m9y???,??5e?sE"l?>HK???,	???^'????4???
??HK
R?????u????l?q????????8??m???'?QC??TJ-??G?N??:<??K???%?9?? ??????
??c???Y`v??h????yt???U??????g???5????c"B??r??????J??H?=-?n?F?E?}
uW'}?|
??aW??5??%?%c?1&??c8??h??T??s"*)???d"?'?}??]????q??P???5??VC~D?>a4??+[??>???\"???8?6`_??/????z?*n??(4??,!??? ??KK??.P????W/]Z??i5tj?b?|???3?Q?f/????????<^?P?i????kLy?yY??????Q??\?[??
$}??u?A?5x
"??
?kiB?[??&zs?3$???9?Q?sv???U?^??)?GB?%]?3??!???R'1?J???^J? a?h&???
U0????zg????Y}?>??*??????????????R?vEJ???K?????3?
????zJuN???Nsy??:???s??K?bR1???y?m???[???(??O`?{?b5?7e?.IT?SS???]$?VS>??????Z??w?????R"?:????f??a??rr???!?????=2??????Px?=)~<dT?uEH`?3M??EC?8?#???;1BJ%?o???????
()?N?\n?
KK??????????v?q??7???4s??U?7?7????H??`Fv61
6?r???pmw%??K????g???K?n?i??????}?$????????
?W??bK??8Tm?p ???????Hu???u???K??y???4BM?"?
?V{???P?U+1?h???? ?_?7eB^?v??h???.??t9D?/rx?? ??C??!N
Hj?*(
cZ??Is????=i??3?PBk??????b???,?>??+?=?)?????j???o?b?zBW?.^uU??u??z ??????Z?2??Q?;?
Bny?{??h?5??@?3Hh?????iou?Yd'Qs??_j???]???1Bu#??(?
?x?V???"B???7?;??J?}?'???DWg?
)?,)?J$
"$?~??A?a?JXf?
??s9?
bg??t?v???i????,?Kx??x????vQ?)?211?4??i???vuz?????qM?K??-"?w???k?????i??/m??k&???
s?)]~??bxQ8|'I/$????????W
U????X&i????1?/?????9?Y???-??;?uR??
`?ge?:??"??H:i
o??ps?]M??|??=U??J???6p???ME?oL???r????]?v??_?_
DSv?\?1s????uP??]???????~?!????m??>?y?
??a%?h?6_y???W????$?Mw\l???4AI??^? B2*{??????s????}????sm
??	5Ip??
?dc5???Pl?ww??h?(?r?Lm,BhQ??$oo?%?I??j????J?qM`?~??'1??????P??=!??:?&S4????#K3?Im??M?IZy\?G????!?=^Q??r???/+???6?&k@IP????Tiiz
M??t??i???RN?????3e??n9
uA???e?Ln????N??@???*j??KH?U8???*?Wz??
??????Aj!??Awybc?U???Q??E$?????]_?????VS???S?|
 iH?!?HfYO+
????IBvQ?????h`RN??^?????????FH?
??3????8,??I?a?e;?M????8<?????:]'-T?j_7d????M?%??m]??	veNc??H??.?	)]K'??N#???
??D.j?#????I?sHLhN??a??????[????U???KJ?????B???:???2??(?
z??r'??~??`??z????}??Q????W??J?=q??}n?g?????9?Q??q???R?~(-G@??H????????K?^??$brU?????}????X?w??
?7??????gSU{?^???z?t??mD;?R?}???T|??????VxZ????^h????T???C
v???/????~.?.????v??_??n??!{5?hz?B
}N!?\???*,[jf?-??20???:??
??!?RTLI??????&=j??!m?E?<+,?wZ???g??e-???????	U;?Z?l?E2u????h<?g?????ZL????iH??z?P]??{??@B?z?/??ev~k??o?u??ME?????4??"?@?t??ue;iL??:I?=????Lp+"?6???D?m?Ft?#D=Zo{2???c??^???65b????{?a?M????????Bk??\Z7?
?g'??d?;Q?jI?3??????J&?:I?s????dh??T?K????;???$??@&????C?????m??????{???$?%?.??^ L?/)dFg!bR?W?)??w~_'??Z ???j?
??d??????????8????H?hN?s`K?Lr??3??8IF???]??!??_+????q?tK?'??????????-72?.???????^????????SM??o?????;?|\??`?????????N?;?E_?<_?jb?c???$Dh9L?\?F$?M\??BB??L?;y?d
T?/Z?n?_!,L?luJ?Q|?)?????jbB?W??*UEG?>????X??????????????y ???R#?2??6rn??3??oj7?6?d????????BI?vl_?o???????W'??????w>L???I'???`??]&{@????]??????L? ????g??r???p?x?u????|??????q?Z5?c??"	?b?s???3<??_=
?=?c-V???i??
+??P???
$??B!??L?[E???k??6? ?????h????????y?????B(?;"???H??y4???]Q?u??v??j1??5?1?(??(e????a??*????&s??y??d?Iw?????QE?o??eB+???u???n?H?m????-2?`?l,????>?n?J.?#*?_nR?]?????
~k*??h?Un??wJ???bR?*&???????????????O?5.&???=??W'???
??kdOm,??`???8?,%???	?KK?^?Hy(????V?S?x???z?ZD??5?&
#u==????D
?-?<?*??w\LJ??%???????9??Z?|S?H
_?3?O?7r?%??????;aL}d???R???Q?/m?O:?,?????6$??q??k7'#d??'	n?T?m???????3y M+=?b?y????1?????
@?>
???u8`7??
?,FwR????$m?v??U??????/m}+?!??MK?:???q?O!?f*????l??2V%u"-1???F?U`??u???VI???????^u#??}}??????c4?O????:yZ???[#?o??
?F?????,??A?????;?B???9d?????x?_=?@?t?<9?r?S???:??????#
]L??n'?????l?+?????;L?I???NVu?V5???Sg?}*D/`??P?'??t?ty#]????s?w?:-???}4i????L?
?????Q?????c???v?s?????,\?3????????g???????x?d???????{???NQ*U?y?????
:??????h????5Qv??,?~T??UYrH???ob??i
?????%c???r_?"????6V??????????	?$"5????ha????a?o?9?????Un?????M?K???K?w}3?(??????1I?2??xq0? ZE?hsZ?2%7?R??2??GS73U?"?V)3yH0????)??f?UI?NO?tZ???.???????]????w?#C???|??h]<?`?|I?N?=C?I?FJ	?C?
bYR&7???O+{
??e_Zc????????0??T?G
z?d8??~?:&/???k#??x?}
?????\??????????Jk??.H?D?"OP????o?K??7-??T?1?z\??F??CF???`Al?*??b1?k6J?--tA?ZFk????B/?y????i???????9?u???a????^h?WU?!??0Nr?X??"??Me??!`#?o?9-?????????S???vG?.?W??????
l#V/???]H9?????'??-[?Z???7(?M?m?6?l0CX|???Vv6e???
?T.?M'?5?
?OM?i?????1??b???'|p??I??~?.\d??k??x?????iCb??l???&?8???DB\z??????????G???B?A?4?U?	??????	???i??p??2???????F???V??[???/k??U???.{???n?{??i}I??J_?fw??iNK??z???S?,?F??????h?RDi1????>??????????jx?.???}??~???y:S??Q??N??V?W?>?as??N?nB/l?G[w??,???df?q??,*???a???M4?~q?s=f:?^>???gQn?lsH?????6
?]??w??O>9????Fl?p?Z?U???A??"S#y???g4?r???????)??;-CWL?????????9??(C?2??HD??_n??2??U????????-???]????dMR^?I??O+?FK??b?t>%????|?vJ??#G???KFz?,
?:?\??n(]d???>Ay?g???'????????1?t???????n????'G??G=[?7H?k
n???A?Z?????+?G?e?r?NR????%??c?]z??A???1LO?R?O?I4?1|P|?@V(??z@??H"??=?kV??J&H???@f??D}C??d>]?,(AK?%??eX?????E?L?O??W4r?????2??w?r?/??6?@_?????CX??eqE??
?/?'A2??x?m???f???*?G(???????
??#????L?I>??
??g4B???'(
z??@??r??????
Pv8
?T?
f?V*?PrG?>??7??J_?r??l?;??0?e??2?10?????c:?[???W????O???4???)??r????8"??o??????-{?~???c???,H???u<???D??.???nZ?41C?????F]?O3???}$?b7?a????????/?????i????J?W????0q????5x`?5?p?QK?!?n?$??2?;???Qn??h??]'??????
?81]g?^???|'?????D?|?f>k(?zA;??b=?!????(i?'?T??u?[?d=?3*+1?/????`?????????J??8???Z0? ?O\???e?BS?$???FpD????t!E?T?:p#cs2?l??????$a?r?#J??
?P??tGa???F?tE??w?im?#}?H??x??)??
??uW?O4??/?
C?a|??0???-\UW?(v?e?????'?C??o<O??x??)F{z???
????C??\f?./?p????8????G?).~b??????????H?s?]??~?0M?????jeqs??h??c?w???????.3?#??t"????.j?
E?/i ??u?????M??.`c? ???W`.??u1?????
d????"??:??K???????m?"?1?G??
??????}1?g??o?S?????>?I?)	?%d?]y1t!;`M????????????B&???Xxy>8?@???????}?w`??Ml??????????6??q5A)adQ?=????l? ?#D5?W4W?????!????#??_??R6?7s????%^?c?????i?(qTxp?v.?
D????)A?F?;B!??+oY?[	???#???:?*h?^cz?5&?^1?5?UW~?f???
??0?/????8????42??y??&M?dJ?M?a???6?hn?e]??o????p~A??!?K'T???
????AC??f".??????#I?&?????Y?????1a??	????u?6)??:??oe??u
%??m???g?????? ?????	?@#R[C?<?}?1q{?????+?~@h?tB#a????2??`?`??	?3?z
????p??X	?MiCZ?PH?aY?O?%?!?aYc0XU?x
?OI"Sz??s(???"(X
?u8??o????.??'G??Q???CT?T????A?:????????P?
FP{??z?R?:??y*?????-2?
??P??*W??6??\???(P??K??_?n?1"5pkC????o?&;??wFN(?	???Q?????mZp????g??????????I4?s??,?,?y?????i??b???{;??[???Q)?!D???5DQL?!???i?????????Q?7Q
[!???\;???W.Y??`??G$??/?6?!?????6??B?F?oJC????Q 0+1???W??v??u???@?W????y??0zu??n??0??|????Y?b?;||??%????v??n??rwn?3???p?`??????n1R?????$fc??Fb?}??d??p?????Nz
?)?Q?MT????????A?lx~?`?Eo?v?X??:??g??W???
-?+????=????.4?P??f@??1@??>i??XGop?
$?m2?
fF?{?Wz.7?K?
?!???bOV?]C@?????Z`???v8??)??bV????0??
?kxL?3?P?????1???>??0u??i?????6??????B?q0??5Z?&??0?:8`?g?????a\.?b at 14?/?m'(?s?Y???|8?v
?/???ZZ??N?1??????
F?#pa?
????{fLW%?X-,b??)??mh?	yCbf4?mL=-C????T????d\|[6.{??f??{?b?[(??m???m?mrw???i?'??@;?gG??
!?PMd??;.?\??1
>??#W??AF??13??k?r?????cps?_??j??B|??8??:F?c?ut+?,C???Z??
N#$?/?
?0)?aRXa?\J?X???^?dW7???????q7a??r
+k??R5w?5w?5v?
B9^?`??
?
?Mt
?J8???
5?M4????7??&a?B???:?6???????????T????x?L}?e??/S?q?1
??x_?dq?"N?????+????j??0???,??a8? ?4?`?D?????H?A??`L	??<%e?=??k(??!??w?G??????tf?L?4+????Q?????1xvKR?0K
mKp?B<#??"?5]C?G???q?	???+jga?'\?H=??1?s?}?9?1]b?]??J???f
Jd????+????B???????X?1?8CQ????????t?+2B;\?)>?
o??8v?Y;?|7=F????l1&\(8
????U?cK??k?*:
<1IaE??
Kn??[r	5???yA??]x?i????B??0??X?~??z???????+x???A=?H???@`=?(???C??????)??????????uA??A?
?????c# ??=?;?z??????-j?;???|?A?????U?B?4
???0e?????^???S???^C????????g???????1?m???ZB?l?*???v???>??>c43Cr?#0N^?7T\h??`?#K{???(!	??P?|X?3?)>??m?{]?P{?3??&<"BV???a?0JZ??3\Px?
?q??U$??ba?1?????[z?c??=????3V??"8?]???	B?O???3??K??R:???n??S0!?7??L?2?C??Q??&??m?e
??3t0g?P??P	??g????lK?3??U??S?+??g?4?r?X?s?Xl_???G????k
%??????????????0l4AoB
??-??????]7??a^?jX?=?K???n$?z
C?{????<?;????a???0O?"?24???S??I?
2???a????;?????yNG?nu'?gS??B??w??w??????-8t?mq??C?????g?+???!A),???z??>?a??? ??)???O???xn???h?f??Yw??x#Y6??Q???????Uw8]u??U???9>??L$,	`P???s2`M??tyw????>????
?[??7cK??l??K???
??|;tY???/?????w&?hn???????:E???!@??[???$????0y????'?dk??g?'??0??????n??5Q0???(?*?W?????
??
Ay?x8?kA33
????#Q?]m?l????
??%?h??@cF?!?z???.i?0Y??6?1???=?(?O;BB??e?%Eo?k7????1?1?n??
??? ??i?I(?3?3??o?=?9??
?8???q>??P?z?#??GX?y?1???x?!????8F?????T???t?Jz/?O???????|???????8?-?? }`??@????.o?rCq??^0/	7??	????;???{?,??Y_?????=%L?|?SV?ti,8e??(>eq@#??=??am??????Dm??(?y???-??Z?@?Y????	?zZ~???K???-??z??????h1

?=J?R?????F"?>?o???C?9}q??c?????z-c??@7??g?aYt????/?????G
???(???z??[{? #P~?O???R??a?2???)????
.?}?]~/Z3??????"??F?'(?a@?i?OP~??????[7#???)O?Y???}?%?`;??a;?[C??2??$??<x??8??g?F;aaqF??????6?K$h?o?c??8
??S???kC??)>?	?$h??????cd???e??A&?WGF????&;????7?&]3J??5?t?(]?K???e??a[???C??N=t??x?aqJSv~b?N?q1W?+?.?????B?2?2???l?St?v??~c?A,
????*??mR?*	??????1?%?^n(x]?e?\?????mE???.F#????????`??
???<'??5?????0=??x??o<
????^ff78??(>?	Vu???L??q:?(@????X9????`??R?m????
?b-IbK	`BY:0?p!????	??-??	L?????&???Zc??Q??;Ve?a?M??j?N]?-?0?j????oa?
?.#??'?"?e???-k??]I	?????
????50??@ooj?Q?_??1? ???Y~?9??q?<xg??????????????fz???5???)?r??-??w?
qP??????_S?g????A5m)?[J(]?m#7zu????|/I??p?o_?zb????D?????`?w?EP???8?X?m"W0??5?&"K???A?k?????+?84d?=??}4x 
^?drAXL??I?
s??v???????K?9?ozq?{??x?AeKh???`?H
/?o??_?H{.?TZs??Ed5?h?w+?cv?2^??$ Y/?S2[2????0?B?Hh?M"?b?g?2i"v??S??????^0!??t?v???G?Y*2y???Yq-v?N
?=l??!?3['q????
??	B????8I?Y`Uf*?:
9?????
?j??????)4??B??1?2???^?<???_?<??????X\?o~;?hcG?<x;???N?|??rBh?F0Dt?)?nW?O?l1DW?j?<??n0? d???kBBj??<??e????d?y;???;???	?%?W??	????7???`zSi????????;??????n'?v??????k?I8e??F?
?
G:??E?p?;?i,}_n5ePt?N=??s?bl8???
?1X?fve??J??A??
?Z?????C[^????Gx?W??Q????>?g(?h?????????????p?O??M?:?? 	d??J??????p??????A~C	???p6	?&?x???;?z??(????f???giA?M???>m8???]=DZw??A2??7d?j???o`?G0?+?hX??7p??V?	?<WC?&???|?G??]_8p)?_B??pQ=|??C;?z???6????????
?
???54??
?	>G k3?????????H?'x??@(|???Z?o?VI7???X?^????1?VY8oM?#?????N1?/`?O?de?R1??F?y	???Y??x$#?!k4?*p?J?."<+QW7?K????? ?z?D??}\w??!??[$?@??s`????0s???p?W?'?D'^m`??g???????	???'ea?)?C?j;?????
?Si
???fT???N?$}1???j?w?L!??9/?1<Z8(-????&#c???edD???B??\L:????+N??t?I?l???_??nh???s????y??v??3????????????????
;P??????;??^?!57Y?kH??????????????0?6>???
y????????'.?v??;?'.???"snxm???V.??
????Yx8iA?8eRN+;&`?rU?o|???P?$?j?????5???????Z??o???xU?l??H?|hB?\??
H???s??I?r?????
?N??b??1M;	????s?
F8h&?????f_??b??x?Y2??a???z??C??:O+V??`P0L)???@4???cB??????
'???7???KL'5-S20?Mf?????????Q?????v
u?<?9?X?}?E?4?f????~U?5??U???_?t?vA#?i?j?}?3???W?|??>8bo??;"?
{????wC?????
h???@??FB??????1???????-W????OK?${3D?*;
+?i??F at wi?^?L~???T???5??F??3u???a?cU??	??<??!???f?S
?6?z?Dn???[?g??f???W????>???e?p??:??*
R?}????;?)W&T9????a>?[r????-?????m?[%??Z^????z
o~=??7???????b:??t?y?)i4?&M???
4]???A?Z?o??F??&`??????A??V?W???bB??,?3)o?T^??E?g??N?):#A?c??e,?????TcH??m5|jd{??
?(?#?UWK???H?j?D??
e?_? ????TM??2??y*M?h???w~?^???3??H?9(?%????N+??u(a?~1???~?[?z???????Ye$P??????Bn????&~????_yk?$?;\??5?kZB??E???<?[9?}~]?:%&?N???ptg:#???o??~?T??GL<??????M?h?F??`4H?g
??GW$tJb.??Cg?Bz(2cd?)5,?D????????o|?5r?j#??`?(%?:??jNh???=???	???????:??N??????,??N??R	'R???f?T?????0??{????x?)????i??=???Oa?G???A?X?}???*f?
??9?Z?4?I:?Fxp??j;???HoB?8??%?????-????>?o???:??????????
??S??_n<?d??
:???{?x?O?g??y?W??P?~<???%?8????[???/.mZ*t?[???_?;??I9????6Q#?W??C~?@?FKF?d??????????Z??N=??Ck?~*????!ov??2*?^???j:u?s????+n/?l:&ab??E7 ????`c??'???*???w??2???m?w?5?M?w?>?k???r???"|??}????8&l ???bN???????e??=??,aow?f?XF????m?1SZ?p??i?
?NW6[??l?b????
??:T#u$??W???su??Dk?7/??+??#5J?
|?Wg??S?@??~???a>???^G??#-?<?3?$?R?)?>????um>?).6???????????em?AQr???????W^4??ct?C5??K????.???????9??0{?H?.z????f%x8CK645???:-?~P????J?E?g???*??a?Y{??P???BIV??b???????1?AH_??????????j? ???m??h?Zd???B`qK4?I/?	
?D?m@??D&?:????????!?:??  j???<??{
bC???????%c?RtxBr_?qu??D?)?m??d?h??w??V?j??V?jzZm?Pe????m??K?????????A??f???Z?????O??l]????PH?/?O?zj?Z|?????`<?NY?P]-?U?]??I??????\5??????g?wJ[?2??_?_?~/4Ll?;^??Q?
??g?????6e????n???\7?1|SFwkQ?4?_?c??[?y?????????s?M??W?4?F]?v????1???#e????/??=??V?Y????<??*????w???U?i?Q?fX?????/?????[??4?p??j???m
?????5i(????II? ???O???<w?u:???Jm?wBJ?_?L?W%g#?<>????u-???i:?7??N2???Xx?
??????????s??????_????N?U??~N?G?<????k?G???#?P?1?????1]? Aw?[7?fN??h?/^L'???i?6Dz???3??????xf(?F?X??5d?'@s?TN?nc???A?A???Om(w????????#dI????B?^W?R????C?:??,1????????7??????W05??tg6??
?????????C??zm?y?<7?y^??"Y?W|3?????V???(?4;?SR??7??c?I+???C??}???d????5
?p????)g???k??N,?^?I8=
???j?A?VLB?????(?r	?b??????^,cj?7???	???>L?H??????G??~!??NeTs?3???;A?vcT???7??,?????Y?ax??
?~U???G???de?D1=????/?\??????M??@?Hb?gI??N{k?J?G??)??#:?+??,`B??hKm
U??z!q?????o?0??o?$Hs?9?b???1vuM??e9?@?79|%9??S?????(??}G?=C??R??!M!?	???H??U9vz at 0?
f?M??].a????'?d??/? ?5S{0????n?&IZ???`_??`p??Hu?N??????1???x????:?????[?????&?X?|f???$P?x
c(a??m?c?7?T?I?i?sp??R?-^??????qM??,???p???V^7|?3d??4
???6y?X???c?%???F/???X?ps??????KF!9??????P\??x????;X?fT?)?J???qu??P????	?H???q?*?p?D???r???p
%?!?I?~?:s<?????S??R(7?x?e?z??S??u?
+9?b/o1?????_%qr?=z?
??8?@??V??^R7^????\?????I@^?G?d?N0" ?	)??p??I#?R??????	???^m'V????
?+?t??)<?eeJ?;??
??,>W>I??[:OH???;a??`????&~??d?2YSV??A??$??j1??|`7[0???:+Tf]bo??>?????Q?6??}j??????A????j?Z?%??????'?????Zu/z?"s???Y`?Q[?C???ZQ????}?8i??w????t???????
oW?0??	rT/+????G:a??s??:'d?9??G?Gf?????4??34???????	?!s?db???????g/
????FP???9?Auw:G??Xt ???X.c&wNHs4Pz???EA)?$(eNS???P?N?PIJJ?B?X?b??u?,?.?j?&8?F??x????pQGSRb`?EH?7??FK??:??????!3????????TGt??~?cH??[??????!v2?%?I?M{?????-t?c1tN?~??\??C??L?Ac??^????9?)?st???T?C????O????s?z?????u?9?I+?Y??G2c????>!OVZ??})f???U?#!????r?????>??l??Z????Q?l?$??6x??G?	KB]??lYKn?$?7?%???????k?^????%???/rC????nI??t.B9??z?%?I:E?p?c???v[n6?????&18B?`??My?9??$??!??<????h(??M???????Rs.??3.mm???V????????a2H?b??D?????y?V:6=?m>}ZK?\????p?eA??C????g"?w+|?;P???L?t??o??????%-????1???a?T?^??o???S8????????zB?????????9ma???BZ??|	??????,?lY?????6\H??g????\6/?
?p???0&dM?[??Jq????ud<?a???#}|???Sl?a??{H?'0??O?s??%9.???p??OI3?jeDp?IW?

?7G???u7???Sy???S	??(?1?iQ8????N??~???d?gu??????,s?y???B]?o5??zX?js??\??r?U?:??@?h?"?~?n???&
????Ae)?{:5???C	??$?]pL??<fK??o3:?(^????e?9
??3s??s?5?????ort?:???8???2???????7%?c???kmmu??d;V?\"P????b?N????8A??<0"V??67}K??????:7PCg???u?v6?????~??H?Vb1?b?X???k?I?l?T?????Lr?Kt#?N0????l?????????W?a??P ?m? v?XF?@?????s???C:<????9MQ	?S??)??vh:
E??$?H2??
?9???-1??>o????????<?=?u?=?Ho??-??8????`/???d@ci?8a?p??k|>s???+?*????
i?'??w0?]???}\??#???Q??|?g?O?a???[|?B<=?v?1OX??????m?,-??
m?B??S*???Kc	
?@???2????15Z_??y?O	??iz?????(I??Kr??\?,?????g2??O?#]gY
?b?m???t???n????{???o???8c??}&??/&n??Y'-?#??:?????	h<???j?G&?K?i??1	??r7??h??(?
???_?L???Kh?s:@??;?Vg?n?xbg??5??b?NQ?_W<??o??F-S[qm.?[q???k??
7???E?9!O?x3?o8??Q??c@??q????
^???a??`Hvj????
}?!??????????|??|+'???Bd??????8??J??[9!?T?%hD:Z?su???NC?~z????@?og??m??? ?YJ????8x??8??T?D?Q?j?}?wz&????
??O??c??????????????????ej??8??oBEl!?D??????x?8?P?8?e?9B?5+??????yt?+
?????8h^m???????n?Q??k?s??,??KX??????%?n?bj?W?|????]UnT<S)p?fL?n?C-!??	?B?<ippze;?1=?S??SRzbUT???Z?=????0]?7m????Y??vV???#z??+8??E9?oH)?C6???c???i??????-]*4?{x??6`??????z???_?,w???@?m?A?:#?FM"g??0??w?????OHV??1????:????{(!???????????n??????L^??P?oU??c?????@?'z??C?w?~????????0?W?9o?????#???p?p?Q9??jgW???C8!????3~??)xD?N?_???Kl'a???E?????s????%+??????????\?T?2!G?
"????
j}?n???zWT??
??R???0?????9?????b??\O,?v?>_???!4?q7????Q????????g?fW?????????(P?+??2? {???r??=????w????-??????=???qD;???@J<?h??!?R?qD????[?u?T???J??R%y
??t:???)%???P??aX0yLP?'?[(?
Q??Q?<dq(obTP???XYz?9?????l??X??-??"N???b??0x*Iw????)???s|?q]???%<????b?"{k??n??ln?G?*T??9?0$?1??c???l??y??Y9?m:6b??x?????i?||???3 6?~}&u?
R?h??q??>E?
????zGR???????C???o?????Y?5?$????<Ox?L??????s???d??2???+??xl?D?tN?X>?!a?|P??F???5*Tf??7???!???????'dfMsGf??p???-v????5q>?*?UNpt.v3?W?;??rbts?L???Q??gGMW?????
+Pa???%???A?X?????????F?i??Y???f?c?y?F?1L?G????4??S???P?~;?QI2#~??=?O=?????c;R?:GJ3??X?y?G?V???+?<]???????y???d?L?_C}??x0?:z^?X?????R??8????Mf}
?d?lt4:? ?3{j??B??@????Y??U?`?1??X?#?P? ?5????????.s?--???`?%??&au?Z?K?(?s?#??Q"?????)??N??5^=???????n?p??????'[??)J???X?#?R???8???S?3?I??4>+U?J!??g?O??@????
a???cG))~
g?nQ?L?5?(?o3a????3?R?t?6?Qj_A?my?}?????CCa%
??`??}z?Hz?m}???	O?Zok??^Ra4fZ?`?	)??pR0qv
kE[??s>?}?g?z??6?>!?0?y???????M{71??o??M?-ipW?????]Mg?g?;"p?cQ?R?7t?p??G???<Zi?8Z??m?V???st]S???WFyN&?? ?s??+N???[?.oMl?/AF?2NT??\?<???S?>T??QEYqLEF?`K0?a?U??=i??$
?1?s?e|f?_NP??l\tf?:?y	y;?G{?vf??????Sq??fWt?s]???:??K:???X???7??_o?J,]?+?yX??*?
X?87oJ??Dw_W*i)??ZF#???s?????2y
???e??7B??u???#?y??7??Op??L?4??t???????lq??l?All'J	?f;R?0???_?>M?{1uG?>??
y???????tv??-?0??????jUFtH=34s}X?"h
l+?VR#????jgJx??"6?JdT/??@?? ??b???:?????J?4??????s????u?{o??????q?(?Y??^???I????HVx????a??1t:.??\??????|N???-	?CJ?ic?????v?9.?\??N???}?Zz???????????
g;n??W????r?N?6?????PG!t???[??f??????'8??????Sy?2G??3??P?Q?'^??M22oJ???6??61Jr?9?6????p??d??Gv<?19???%?p?*h?_j???v???4?+????vNL???K\a?9??#}Ouva?SM????:\?????0B?B????xr?*^P?[?4?
?[4??????+DB???????o??</??? ?/???"????o?0???Kn{Z^?????C????????8?l?>?sb?s?2????q{???????;?z?
????_~??
W?y??V????j?'?.??cM??W?????
????[?s?3???u
y'?N?
???-m?????????????????F?
y`??f???3?"?0C|?x???
i?)???aF)?p?'La??d=??????r?B(?????	?p?t???G??}?x??
cJ???gJ?RrZC??XY?sF8("?? ??h#T&c?+??=???v?~|K??<?[???M?Z??h?M9????O?????(q
?3??GZBi???r?o}{???P-iI??k??:??79?N??9?y?9?I
bZ?K&j0
k^?T???XI??V???C	??$?D???v?:CK????s?s
w??)??t?6?}???
?????~eiY?Q???<?xp?7?N?
&???	&?j?s???s<SNgo????mc??#?
??
&}?5?????
$??????b 0"??U???-$??!??j?p?Y8?2?q%,?N*0a?????V?Z?e"????V?R	??t?*??
??
,r/kL???Xg&O?2??,|???R`?
???]m?I??%?^??V?yH?c????M??~?n?pI?ie????N???y???????K?1?H??+A?;?-?t??r??V?N<c???A+????4 ??????#4?y?R????[??????~`?.?Y??(|?X'r??;B?s?'<??????[?2G
?f?Y
h???a?????10?q/S8???e)	'F=?d?2<???????~.????#?~z??O?t.????C?????t???	?MQ?j??*t~???????o????@??jcT`?A?[@??TEM?????6:wo|????}
M???-WN(84?.8&h??s??&j?&jj???kM???L???+u~??B{b/?.???~???z?#??????dw\???)?=?=?????O????yY???????????1#tN??q{?1?3E@??W)?????E?v?"????????????X.???z|yg??)?n???G??l??Mo?r??TJ:?/?<??x*??P?S?=`,N??ug?c?:?x?%nv?!C??A???gES\?glN&?????6rON?9???????4?`?8?WW:6?4B?????H;???????3+??e????:3??= ?<??#?9????????}??gV
K=lS4EB??MDXjc????M^O????h\?{?/??6v?B?cNCV21?+@?dq???ew&?E?????` ~??j??????H.=??KH?v?]I?h?
????????5l?t?z?G??9??a{K????t	???fz7P??T'jl?W?d5?.?B??Hg??j??)?????F?%lN)K>???siL#,??
6?{???m??\X?JG??D$?|x??7?????[>?i???P?J:?%tNy'?;G?3?Q?????Wy[L,??X????
R???-s??s?D{n??????$6A?NqyL?G?%??d???T??
N/?????x?????=J2??(?<J6????%o,	Gx?Z"V??????{ p?J?[@??Uc?:w#?o
a??q5???>m??Q??:?eH??_/?sWb???E?k?|????@Z???d????D???????s?w???Wcaq???!6?[@'?q?F>??????+$???#^???~q1?[?k?q??????C?A?}?3??J???P????k??qu?3?}???gz???_?!B(1?w#??w?B?O???/???-??>?????E?s?A2??*6?>e??????&,?D??y?T	
cn?4(?X??<0C?^S?m??o?n?8-??Bw?$i$yk??v?0RK?E?I-?F???????2{Q?2?t]4?KF?9?5?&??c?????0Ze?dl??_? $??Lo0??szc??0??H?lO<dkw`?nNOc??6??yS?n????R?????pfo8l?4m)?}?m#?E/Aw23nu?	)??pR0G??a
<??d???j??G48(??A????%?9???????B
??????s???k?$e???[???O??f??}?>4??u????E??1???{L???E1NsB????5\$4 ??p??cLcMo??5??16??l?~S???wN??????
U??B???????n?d7VX!R??	?:?dC~M?^??T?7????
???0?^?.???_o?_?}?p???&?p???B???h!??Q?a??S??!??
%???+aPP???(T?2???????46?;??uF?X??u????h??m?I?8?d_9u>???=??>$?`???????h?kp?:??
??4???A?g???/)6*??
?rLI$?i
?5;z?10?[???W?U?????????=U~MW?xy?E?e??Vx?
[gd???x??????G	???L?0?G4_l????#??I ?6???D??1?M??????Q?[t??Cz?V8?J?8?:???????9?
)?o?+???a??s??
B?c???@???;??k??!w3q?R?=lZ?|
v??n?C?G:e<?,?&ISz??3??????1?2??????????????'o???R????m+?h[IF????????U??E??L&?$?? ?[?????m???P1??e????E'`??e?]y??h??q???	-3m???II???F,qG??~vQ;?o??????I??#?HfhxI?}??m?&?????}
?FHb?:??l~?H#??Gq?Kf9]???)?Ez?!f??!?e??Z?=??i?4??xP?a???b??,?lV!
<
9??t?;??!?N???.??,?????[\n?&m  c?a????y?&#?n???'??-tz???C?z6
<?(??bI??#?L?&????s?9W??j?;??cP????.e:?:?????G\M?@?	?j8?
aH?M????t?!?F?y'??>????f???}???A4???G?????=??8??)????[?9?S?<8?x????9??z????I??c_?ar"?6?t????v'??c??s???????????
?U?#??>C???'q???	W?6?J:??h1???BZ??Z?y?t4`YB????;?['&:?!?L??O????}???>ik?I???Cy?Td?,??9??r??;???????6?;?<?1Iq???[??? 
>???q??O?P??????m??L?|??<aRz???- ?????r?>??wQ?????c|?x??????8???
?r??
?L??????FE5??2??=:?????C?Jt?2M}	?$??;C???????7???H7yn{?)3??*?-!?4?=??8?%??Ww????

??~?p?9??Q?yH?8???W???z????z??2???_	???U2????W??????B???r?C??o????m??s???n*???t??!
[=????????"u???%]??s?y?a\80??????
??
???8|?Y?.q%W8??e??N?r???04gN?x?@Y?aLs,a??-??SzC??y?????
\?}??!????,?|???Y??=???????????7?t?.y'??O??*?=?3?d}Oa
)???c????P?>k?$??)???u?xSe;?k^??h?oz1?????n????0?s??4?[}?Y?'?#?:??6
?R????????c?9???&??	?L7k????k?AAg?3."??{
?0???:\s???n???1#H???t?XxK????o????,u18?)i?:???????r:/%?y??G????2#?H??2}i???
???9H?j.??xk?6???/=?5?!q?`???????S????????N??j??q??y?V?
??N??
?C?Y??r?My?JpO???	#{F)a???s?&M%?a?b?????????(?=l?????N?1?L????b?:d?"f?)?$?j<,dZw????S???1GH?*?<??7?!r?Zs?x	??*'g??y8?D1???eU?K??$???????'>?17$fy??????K?0&zZ??Y?4???>????%5fA@?{r6L?n???q?%?E??C???3????B?z??\?]?????s?I?b??4	??.c?<?Ld-?i3???LV??e?D?K?????Fx???#??9?
r?%???p???????[=??+#?H?J>&?#??cDt?N
?AD?}F>?9l
??3=?F?oh?0"??kL?2?y??2????f???a??7gY
{??-???u???T??6?@D???[7=K?e???p8Z???? *'=???Nz?)??????Y??7???????z?Z???\gt??"Z?B=???????IW"?BD?i?}??P??|????w?#Q?@>??8????O<??\W!??e5?????tH??9???	????`RG???3?S????mY4?n?7????'???3??f??2Oqq?3??z???.??k?n&c?r>?P%??d?
_??:|???w?s????1?%?W|??,??????C?????(????????}_?j?>p???	?z~gRY???}????????p?<?=kP???P	y?KJ???
)
cY??	k@?)ZK??7????oNc\??u??(?V????[??q???=?X??]v8?*?J8^I>V???c!?????8!?n*?9????f'O??a??
??N?pG???7?6?,O2=8x!h.X
?H??T6?[r??@??-?ovKm??r?d??q?up?h0??(y???F?f?moev7??K???,?m??9?~??_???I?
?pE???}??m?>?.??!?o???jcM??v???L.?gQ?O???5?Y?>???????K?=Wt??]?w??a5??????{j?Twq?r?^?GD.?L?;???????E^.ah?P|?>i|)??2W,?b??F>_i?~?D7???0$??????7h??H?~?ou???a/!4????u|l???B??<?\	=f??	+?1?*???%?N????%?;?d?H????L?4?????$@%X?(jo?V4???"o???Lg??G??<???h??|?{?%=?T?9???(?^
?????%z??_??bk??G???z?+Zp$?Pn)????F{?6?T?jc???	???M??D??O????\??CyI?l???W????x??T?.?????iW?EM?2a%??%M??-??1??W?
W
\??????????m?k????8???h:????D????V<?????Q??3?M?t$L??A0+?Q??:??>8!??IH6????f*.O?r?6
??Z9!?9?'R??t+??;#?K?1??-?sn?z???,???:U??6?>?????4??b???0?W1?*?k??]??5???????????|sDa?c??*?`!?s?8??RT?~?[??wa?L??????a?N?????aO?
{????BaH?S2^H?WH????z??
<??b?K=u?a?	b&?
?0????>??0??????!?$???n?13??1{??+?F&L0m[?r"
??\???Q?9?L?s???L?	?|?????a?#??
????}??5c?7?r?|?S*;~v??m?kkT??9?<!X?xYs ,???????W?T?~ DPp!?1?2eV???M??0 ???0I?,{?^4?$q,????v|:L]v?uA	)??a??gr{??(j??x?Q???????s??????O??WA:6???
r??Yk+x??E?X]???P??^?7??Rh????????x_Z[?????WHw}KuMi?%?h??q{7?<_\
F}!????
e???
c?"?>????8XD?U?
|u???s??}????????>? ??? X?w??^???? ???????aw?*^?Q????
??J?ebS
!??X0N/.0Z\???K).???H?"
Cf?
E???bJ?t? ??c!??
F?>"????.eYd????'???
??p?a?a<a??y??q ,8??z?TN?(RU????]oS(?)e?
??N???H??N???sjJ???/?<?g+2J?f????
??.o?O?
J`????4??????#ZSN????B???q,????US?F{??d?5SRLQ/%????+?F?a?i}g???-v?Lp?qO)?????????c/?OL????{?}??m3?;??6c8?Z?y??i[?????1Jj????i??@~?3???GQ+?}???JSP??7EZP???4???X??q?K???|_b?6?[????LX)??q?HUP?}????~N????mU??,??{	^B^?\?2???7?'8OWL?t
????]?Rw???FX'r?
????? N?3?9?X??I9)W5M??5gFNH]?Rd0???-d8???(???8v???Y??AN????
??|? !<????3???????$
q?+?0?<c??o????????e?y??[6??+g????Yqp#??}?w???????G????????a?[T??mN?????9?w???q?3ajqhguT?Bz-??,??W?	
?D???f>'?{??N???z?&?????????W?????<??$^5?k???1?R}?|?J????a?!?g???j?Z???\o?????D????z??:z?
?/mW?E??d?????v??v???c
;??>=??D?##5??T????????[??Y?
v?j???K??%
]??????cK?????~?.?????,u??W|?
???+N?ku?;??Ph? 9 ?qRO,?3/]?V????<???-?g??:???>?????M?Q???3k?'(????y&
CVV?
H?3???\??<??cL9??%|?-?}sG9?	g<?"??8c??S?dyq????C?k?T?z??>2?KB??c}?a?O???g?c<??Q??A????I?5?i??s4?i=?????g?=8??~yw??????&?wN:i????0??m?? ??=?i????'m???"?7D?O@?gn?7.???????6 ?'k
??????????	?R?p??3??b?}\?????_k?Q+\????<???b??(? r~?l?7??_???@!?????a?o???????
???OldA	?!=\yx_???U?y*_????b?V>Q,A?*??sjxFP??D|B\\?6R?????????'k,??x??S?t;#7A?>??V[6?i,???XW?8??`|"\?q???s??cq?( X????z ?????%1?T2???=s,Ie????G?z=??|??W?"8%t_
???1.?????WX????FbY?Nm?5??\?P?l?M?~???V???
??\?P???H?}????)????Kla?t????%??]:??????????+??li}e;?? aK?uESvS?k
??9?q	a?*?????sc[??Xw???????i??8???N?v?????D??fc?hL??[i?s+???????,?W??3?j??7?w?s?C??CZ?y?K0AG?????x":?_l?;>6??
_q&??I	???RIoR?????X??Y?A???k	?KZ^o?2?&?
?)?G?<q??9!}io???K?Oo.?T??o0?t?ZP???"????8S?????w?????G?n?D??MO8??0??T??#??y???:X ?????^?aa???|,??R?6^T??
?|{??O????Z????w;
?IsSb?F?u?BfW?????\0?Nn*??q?AHg??1?P?aL0t[?B??_`2?c??#L3<*)??m;?Cx?:?(\?j
?1DG?????I?????4???lm??fa?9?U$?[??? ????z???L???gRe????jJ^N\???p*??
?*mr??p???O6N4vx?/HW??V[??;?&???_wT?O?t?a?`?!???`??@??????*????2,??DVK?LT???U?[
DtQZZ??du};X]?
???(?????:??xd?.6?????0p???d89]??t-9?|l?6?2G4
?????}?e????
?[`??????"??'g???}??~y~@.??IW?P??h??N&?1???=_S??]J??i
g?T?$???T???<????=??
,.v??N??
???t^?1S????{\	??s43r??zJ??48??d???h:????!#? n?1??0??O???????p'?Pp\??URi4lm?N?c??A%C3??*n?0#Ke?3rO?????G?I"?
??????'H?{W????<6?v?:?ee??L4?s???3y???f?SC?!??
t@w?
?.S
%'?L??y?????GZ?}????O?7??G?8h?s????:??????o?S?????????op8F?E??????T?Hu?Y)???5???/??????(?@5??tHc???Q?}{???X??
=??????$=aN???l~??\d???%:8N??o??????0???h?{?????????s???nD?^??[C_?9|????>?
	$?EcM??,#?Q?P?C?????????E???9?ia2??Jnc?????Y?V]?Y?_?????%^??&???6?.~??HH????tlK-j=?I??B?c????7?b?
??C??c?^b[!??B?t???t??Ij0???C
?a???0?X??PcI?v	????I????c?????`K?????Z???]-?M????`v?z?8?[?u????Y%[??????3V??D=a?7??G???p?T???)????|MX??G??????}?eO??w?]?0?j?8???k??~?H[E ???dat???%???/??H????n????????????7l{B?f?5ft?v?!??JoN??{?&2|$??GX???
?=
??qX??s?<>?
??5??m8?8?_B???R????kyy?Y:?(g	??<??b?$D?IRD_1Z???????_?$"mq?i????$/7oH??L
R???0??^?`M?!l??H??-????8????????aM??>????R%?\????W?5U???W??hp
?l?::????)oE^???@h?t=-??????c??q??
??<?? :&=P\?sB
?Y?8?uFNV?%-????|GA??
g?=u)????{??3??f
?4?0f???}8BTAgIg`d!=?Y??:???|?A??
^?t?<? @??????
?\??`??Q??3d??A#?3*?s?Q@?i5m?aY?<dD????	?9??9???4???FQjC;bXI?
???
?g?R?O??y??? ???a?a???aHq?	b=>?@????x??R?xI;3???r?;???acZ ??1???5??1??F\Jh(L???/\G d??:C?1m??_?Vo8???;??O?v???/Eu??}???????
??3?1?jB??Kj?)M(??9\g(?.3????j???B?Q?$??uA~?d??7????}LSgZ??b[~{Z?`???????8?-???q1????/????r??;???D4:?????A?C.?8??C?1?d???X?q?O0]??????????K|??sr?Y	?L??H[??
??i?:?q 5sP???"?R???Z0???CQ?c?1?-??b??
??:3???8??> ?#???qm6???s?}??Y?_C???Z?*????
*?0???:?\?f??}V?D?
?????57*L??B?IMuu?"??'?-t???b*uVk_xn?????U??:N{??*?????n3t?MMx?s	u?{?wt;HCc????2?,??]??????t?Q??<<{?=??????<Vzxww?????k???+??rK?????3=?X?-?2??
P?$	0??D?DR688BH????y?A??3x????N?'?}?gKz??X?q??sL^?z/??+???B`
m?Z
A1w?f??????;?!Z?~c|??oO???7????%???-???p,"L?<&=????;??{[?=k??j??)????`??54?pc???A?7??*?????J??-???0HM?x?
?Q.?????y???W??8GRa?g?????C????:A?`????QU9????c???????w???G?p???[T???8h???o}?h??[M|???<[:&?F??s?9????}?a??????L?0??????9`??c;?1U???#,??G?=???{??x?????
/?[*??o??,?#???_???4?H=?w?i???=???7?-??p??M??A???????{???
??s?c?s?1????3/????*l?0hu?;????J8>???n????????>
?]?kM????=????v;???<m??vvf?m?fu?"???3????&\Bh?????h?T{d?Q?TS???
?c+$??????#????'3"??????Y!eQ}3?#J??s??-QEL?????
?o????????WKR?????y??`F?*???|???W?@!????AE
`p???L??m
?B?P???????J??LcMhNGZ"?(f??
?9?P????v??0??`??????X-?????f??9?\??e???g{?????:??D??~??KKp?'??hOX?i?KSND
?P?qg??:?>'z ??????PV?p????b???t=?3?1??	?<?????n"c?????}?wp?W?o?3'?Yg}O??????a??4??u??$n?>?p???mi7b?y??6?V????F??f?????vC?q Y(??+8b??U???O?[J??b?1'??c????.??6?2???R????g?a71?K>F????0????|>0X??????<? ?d??'?#?;?=???J*Tf???H??'???m?S?-?4???????2?????i"#??%??g??y???B??x???'?@jL??C?7??C|0???f??S?
??SxwzOW0w?t???Z^??%it?????????Q[???	?5Lb6?"?K????-?-nmy?h??????p??l?t m3???Me??jXA?
d,??z???????D?????-??@??q?W?o???+	h~???z???j.j??zp?Uj"
?Y??0????%2$?Sr?
?????
?f?|5;???M???????x?KY?CR?'??eyf??v?x?????cs?^.?W?3???$??m???p,-Q?&EkN?1t(-?u?i?e??5?????????????W?61???Q?%EU???I t???bG????{?H?z??eN2
}/????c(???9??*?J??d:?DX?|Yk%{^???[???4	b???g,??
?2P???^4????9?
b9?:z9$[?%?<?0XP???-?? ??a??#?)Y???2~?????
??@:?????.?????????????![{??=E??@w3dr??*C??r/?_?b7??:??x?0Q???????s"tP???#1???Bb??F?y8?1<X???J???y?q????sD?Q??V???Oi???vo???}tw?H?4?p??i`?nsp?FK~????1?#Z????????Q???:(_?k#???G???0???Tx?J!?i?0?8HPzp?C??????
??f?m?.? ?A?pV?!?M????B?S????-?
?|NI??T)?x?E81?????
?G????}5o?
?[
???\?B-?|??AW???????B?? ??=??
?c|N?3.??'??X at KhjKljKH??l???P?????^Pvp0x?\?
??7?=?fO??c~???0?o?j{?????{T??cw?)>?
?D??????????
???9g??r????????:?ie????1????
?
?[DP_
?b?^6?JGSPWi??4_?p??N??g?O4P??r at Y?????|@?????uy~dL8?????<?tx?B9=?s
?zN~}?z?Ni=!?????C???+????@???1?x?????,?R??^L??????3?S??????,?9???,Qs~?uz??>Rp??v???h???:5F
????N?M5??"??2???G???o??6?;?W????W?>+?\c6la?????2?kHUo!???????
???????RG????ice?? ??^?0T??&5u?? 5???=?4?&???4?5?x?'?;C????F??V??77?#n??@"?????0?X"??{?????g?P{?K??-?<q2?@????
?PXQ?<?KR'?:?t?c??!?q?w?????!fxr?s

c?_?????&??O?????v?SX
c??b?+cSZ	#??????I???e??%??[@?=?zaT??????9???C?11][???p2?Q?9(??9??? ?|?m?/x??/?h'Op*/???u?y?u>?!???Z /sB????n7???SX?o???P
A?A?	?F]???q???oQ^???6^????j*??z?????wr\?????ay9A
?P%?|?\\??J?????zh?@???????p,??_?J??w??Nn??P??$"?i(??*
j??AlyR???h??cD'?"jl2?
nE%??8?+CaY???_d,?t???9???n)?3??Y1.??9??
!?????
W??=???$:?[V?v?B?????}A8?o?}?M?x????d?????QEYIm%?1????'????eyw8?
????c?KNLI?'?8??????+?9jkP%????/????:????-?<4?6??Bxin?9???J?????Y?0?wX4kh
?Su???-X?%?v??????7U??
UYl|?C~???(?i?|???????:??l?4:s??4~0?'=Q^0?.??M|	???i?LX???G7;?j/??B?0?.?y?1??)I???
??????UF&?{??Q*???;
g????}?!?e
?R?x??E?$A?$??)?#????d6jX??
5?????&?%??\?P??1?
t^???|a???6Y.?????`b??PO????k?????????Z??En?m?9d???[3jI^?w??A?}?????p4??Nw=B|?{hB?????????6?ce{?V?S*??$????5d???,?&U6h?5??y8H???[???O(???}?(?`????)????J?gp?????\???0u?????BFy????1A???Uz?-?(??O}z9??i????s?>?C?2?qf?<?
?l??3?'?~?N ?t??=?i|1??
o?0?????L.&??t??)
???$l?la?????????L3?t??'??6??p??@\??tN?b???????=??-?$&?{??????Jw???
-H?b?v?d!t??X???<?x?Xy
Be?#??????????7?H8?\?b)??bK??????????k??";?8????#?W78???<????B?-???tV?Ugi5i??
????????:G2R??T^8????W{_????
^?f??H??????[?4?W??R??C0??H??z?????1?ZS???Q
~?;x?Uc?hH?|????b5?????`\
J$????Q4?Z??????0??+.????X5???Gl??????A>?|?i??g4??4#}?B??????jc?t?7?????[????p/[?8????LZ:t?S?T????%??v=?UO4??G?O??N?`??^K???4?~P?yN??????'??3?????l??2??;+s???s?.]??x??????????{s??5???\&??d?NT??*\Yk?e??????m????9h???mG$?7!V?=???j??????z????T6R??????'?????,?<??6#?t_#?6k,z??w???o??l8v,N?&	y3#?=??i?T??QU^%Z?R?????e>?T?s<?*???a?`?l?i????
?i??z??tp???m??Z?|nW,?m???SV???\?m?aEzp
????k%??????W??Bi3?`?}??????hk?u?N
-?N??j???????7s???????_??c;e4?G???"?Jz??y?????wz?2TV??e?C,4??G|???~??????5?,?z|?y?=??$??;?=??>??G| ??6?4?b?2
????????lA?h?u?F?0???Me)?5E*??*n?j?s???????m]?+???@?e??J?????zw???\?Q??/????F?;-A?K?mh??Cg?{??8T5???.#1?4)?Y???
 ??)???>??yZO?k
??:???.?	C?????L?o?Z???Z??s-D??O?3?qO?p?j?o?#}u???#????w????H[??-???????-?B-????????A(?[ e6?G?s???;-??/z??)E\?sF??????????'??????~????v`?W&X)
,M at xW?yS?>?r?~a1??#??K?,??SDD?~P??Q?S???G????????P?????B????-12???!?????&??k?L?
.#Y????s?V#??
??q?????_?L???M9tjo?0/g?????;?????5??~?g????@?????D??????{E|;?7EZ??\ ,+?:???s??I?7??????M?<wR?????-?NJm7?e?Y?4Zz2[???
??UA?b_??/?????S??????y???"	~???Y????J???=???(y??=??d??x)?T?7?n???r????%??#?NA~????h?b?a??p?????H??m?p??f9Z?z???;?????*i???|C????ma3?O)?ZT?????-?^?M???IUK???)=??D?1e??????i?&??Y????}y0????"?S??V???sT?)??????=?l'#m????)	?????|u?4r??=s????.?v???kE6_??4????????M'?W?"????(?{2??6[?1S??Y-?D?Er?e&???????????F?%???S?Fj?zz>]?I?Po?)?????]????f#Jn????O!??yH?J???%#?,?C???4_?e?v
5??????2??????\?=)E?:??&(?xh4???5????N?ip??&Xv!$N?????????h???El&?aDY{Y?)?ft??????.R??????mw??0Ig???:-e????JS4????e&??AJ?(/eB4?Z??4XA?:???????!5?op@??vi??S??
f?_W
(qE?`?-??}?NV!??C???6???????Q?fc?>
4pj?Hs?g??!???I?t?????r?AiCk?9:???t?\U??4?:kad?M????}?e1ay??????4]T???N?
(??e_>c??q?????N?????9??n?Qw-???Pdz??????:xp??l?]?]????h?^??3?Wg?
??!J(v?(?sR?b?E?C?O???
????HU2??Y??>?mH]?V?????\??y???????????U?d?N?&???B?HJ??hlU?U?j?????("t<W???????uA5??3?vS6n????y?%??.?$L??
m9Y=+t+??U?????jU?*???T??;-?wR}?????U?????????Q?T???Se??(????O????s????RO???????:?m?uZ5???OWKO???kO?????=u??i???dfJ?????4&?>y??t?_3??H?????
c? ???*?MS?????d????????X47?-???D??1???F????"????=?UA?"??93??X?&R+|?VN???^?????????a??|??i51%??d??W?3??5W?Y?W?H	X????)%?????i+?2E?(v?#_y?]'??RK?K~{?W??Fdk?3?5??W?8X???h????|H=XS??Z!-?V???p???@??@?(y\?@???;???Ff?O?Ix??????R	?}zv?j?>?}?????~j??tU?$rvZ????-];?/?~7D\??D??rw?*?oD~???|????{q?~)??7?j?????'Q?vD??;&??????4?e???????8?L????Ve}???]}? ????|?V????7????Vs?Q?????97?,??e?o5?Ev?,?z??@<??Uq]d?????_T?7J? ??
m?????AM?bc??X???????
???QR.?????wl?X?
J???Q??(]??l??
?5q?/?}Q	?l??)???????=?F??????4???"?n?Z?HE|}??q?H?S?M??j???????V#?????&?/?,N?5?*??????6b=6j??f?????c?????k?_u?o???v?)??a?*??G?Z&?]'[9?l.2]?g^E????~?=?FtK?D?????C????????R??4NV??U??l?w?E??=??&<"z??Q'XDj?D?$3???
?qM?????????????~%u??1???@?B?j???1$-5??R??????H"t???????LKA)???S)7"???/?M?S???(????B??EKFw$?:#??R&??>??z?I?=???0 ???P%fd?3?@???5?z?d??^,??!??>_}??
?Pe??k???Z?"W??O>?L>?k??e??:Y?<???tL5?Vs'-?
?V|???X???l$?(Y???%(	?????i????:9???I?"?/V???|-?y?_MO?v??Ms?V>?? RZH??X??ut?????(?f*?I?????N???c]??t?2??3&M????A\?t???H?*??s??;??/&$????"?kP??k???T?2?%BZ?N0??n?"??dzz?4??S?-??3??rZ?m??~k?{k?$?+{??lTC?J?S?'?N???S??sq?s
???????7???????????_?$	????T?~LSV?D??j7<Z?N?F^????'R#1)VB?????????=
??K????4>[??G???J????ZI??7=???	]?T??AwR???$??I}???Va?5~????????j??y?p,??\?G??.?N??<??bQ(????E?{~?A???Z}cx??5??m???*?KU???K??y"????^???????/???(iz???s??l?:????2??BW_?*J?p?rt?~?9?E??t/??????D??=??j???7 e??@!Lk???w-??2?_i?Dj+#??@??h~	??'???????\?
?????????T??	?Y=??$?7??4;?????n7y????Q	??????H??
d????j??g?`~???)O&?$????I?????V???N??fzu??>??^???)O???eqZ ?W?????N???H??b??=Y?????h?}7??h??C;?Fk[?r???
?T???-IO????CN?????H??K???[? b:?V??]??{o{Wr1????C?\%????t1[)?@\??u???I~??
??b?[???U?k?
????D??N6??????;??kn?Z:???l?
???%i?LGm?nSV?E~~???_vRd????8z%?2??>?3%eC?&??n?e	?Y?????2d
iu????_???7???d??Sx?me-????RUHd????f[?NYR??O5??????_iN~f?HK????%?Kv??8h?B?S???????\??&]?<V?z???|?????tiVavY6??x??????6????S???r2e?t?c???~D?6_?%R
?H)?m
??ll}"???^]lz4o{??o{?,?_?2%?????r????.&0%)????_c`????#?z??QD??$?>??~(C2??u??2xp??????O6?x?????WO6?q?????n?l~???????#??????Ze3??????7I?????]'????s?~!.xn<@????,?4Jfk????M??6?To??l?I?????$w???+$B???,m"??R??J???7].y)???Jhs?MJ??z?@?T???{;-t"?!??1?????I?????i?M?:5*????!??d?	???(n?3;???`??G`K??2?c?<~p???4D???m?H-????@???h?y\?k??.-??+??Ew??w?i}s?????{???hy??z?Qu?-???i?8y?????FZ2?6?d???3v???6==D????u?????b??~???j4W?7k`?>???zA@??v?l?2
??.R?????}#X?Zu??S??'??W??z?0n?k@
B?F????|??PFH-'?6?h??????7M????X???F?J?h/???:S??8???17?1?Y??q6???k???i?m??????K??D?25)Sn?-x29&5??G?%???`?z??????~oFY??i???
???s,????(??????m??6}$???Mi$???????m$2WU#??????2???H??????!?Z?a?W???Y?F*.???_!T???????]???+??d?;V#c????
z??y?mxULt?<~???2-?|?h?Em?z8M(???????w?EO4H??%?EM??Eow??=?W??'?E???*?M7???E?x?,??'?_?6<!?N?p"?aA???BGrT?;=???t??/t???&?$k??J??.?]?)?Y???Ep??
?`???????Z_??(QP??EbD??????Y?Y?Y?F???1s??????>Y???v ?2??U??ec????^????z??????P#?v??XRM?kI??N#U
?X?`??.???????A??3?#37-??Q?4??F?M_?Q?????9??d>W????n???D???o?9t!???w??=??0,?7?6?(m?$a???Dh???*SD????	i??????N_??z&?3v??T?S/nr??J?]}???7NzsMD?H?????mv#l?S??N??Y?h????j????^?C???r?
yC?P?H??UW??]W??7;
??P?????*	.????+?j'?????g?m??F}???
?tR?????????O%O?"/h?G????jT/?F??#?L?;=??7w???<??	Y??Q|'mM?I????d?~?
x*?F?!?o?N???????g?Bd?a???S?i???-??O?mH?;????y?S?~b????1?C5w?i
//3t???m??????H??W???#?f???N???-_???z?SS?$??R????N?h?A6?e???xj??K????:?i]Tw??|??????m"a???????AV??\??'F,????H?<??c??w?[??I?;&u???3?????>????i?mL????[:w?a????L?*{?/5u?+??ni?A???W`??h9?????jEH??{?e??????o?2vmL?uB:?+?:?d'?Q?,??
?3,z????_mGD??"????z????<???hb4?dA? ?h
??D?rbG?t?@'J?!g"?????*?2Ob???SWli??:}Y????T?,??2???????
??D[????!???????"ON??&??%??b?EZ]P)r??S_B???I?BS??T??L??tqA???t??5????R???E?:?V&?v????L??.P??h??S7?e|B?h?????'?????????"T?j?I??j???k?rQm~?\????6?6uK??D?2i?l48?1?F?p??????5(???~!R]??Jm>????fkQ?vi:e%?H??\?u)??Qd???44?j!?{[uD???D?*'?)Zu?McC?c
k@???v??zZ?GMol?g"??/?1eZ?????j???B?W\?(?
??????????u???XJh??????+?U?Z"d???Z???U?U;V"d???z??!?:?
????LJ??Z?O??cSg1A????%?? ??? ?c?n???/S}hj3????`J&dD?f????Z??X5;U???G>H'?n$6R<??d1kl??{?z??/??fyf?6????u?O?bz?\??
U?Z???6???$??p?????v??[?"?W?i?K??*?b?ZqG??u?]?F????d???????Uum???X???TUD0??????	????o?rM?05????qB|?@??`Jh6?Lj??#
bZ??X7?$????IE???g???bn??,?id?1???4?/??H?;?K`???b????g?xH<*????nX?D3e?M???&J?(l??)_?$?}???yZGs}?)??NX?m&F??g?????,?4?`????/?<?~?C-y????C?????P???????????@???w???tA???????}???aZh??]??zB??b??1??]??n%qf??T?eO?^=??Q*?????,??#W????qE?ov??,&??nps??0????8???[??WZRJ?sWR??>??zdqD"GaxC?x+p#y S!???|-?B?bls?m
??9`?f????4??r?v'za
????YDq???m??{f?,N??Q??.? ?J?P?/ ????@?^?L?????????
!??w4(Y??I??8???sz??E?e?&?????????i
?0W??????0?$?
?@iXB???J??????)\ta??;??????
??)??Aw?P?"?????\???f???*a????PyD?Mo?-??9???T?aZ'?C????E??|???????
?9?C???){??S?'+H~X??I?et?????{?pQ??/~N?yC?i?.?W??+??:[=????lma?!?0???C;??]"?6?"?`?T???56????ZDd'k??6'?C$7EV4??"????2A?????|q3??>?4[
FK??j??LK{???E?z????I?a?i5??f=2???r?????b??????Z?????D?V????]??@3???y?????#??W?[-,???|??_5??wl???[?`??yj???-?|????~ShM????vv?R???Nc??F at sC@Y?6?
e6?6?????&`f???V???1??????kl???Q]?E]????8?Q?lH?oY???7?
u?i?oZ??f?e}?b
?????~	???%?&?X?yz?[#??4/*?Y????>gG??????????????E97S???~#???$`OA??q8???`??`O6R?U?.??(?? l??u	<#?P?]/'??x?_q?v??*c)1??P???g?????????-??5?]?9?F???t1?????C_?+?+9-}Y?=?f???t?:??????3???????Z?r>-
?q??#|?V'?`Ax?f?q;E?_<??`3??+????km??/>Z?;?8?7?:]U?W??k#W}???:#t???F??4w0???%f??????E??eUb??????n?M??j/f??N???9??J"eo??q? 61?j??? ??
??B" ]??k1?_????????-?14?????~?P??/!?????.<!?_M????W}?E?W?????????/?????s*"?:?????>u`?p??#7?7??
??h??o,/??:[-???]???w?C????Q?b?f????)Qg[????K?>?!h?J?
_?d??L??c)?rK?#|	???aq??K
Lj?(?0S?6U????????~???gt?<???????p1???O?c?.??0??8?A??PN?o?????uC?M0?Q$??	w?J 9???f???cdWc??`2??[???U????r??e????@X?(????^`?L???W?-@?? ???2?*?????g??:~Z??m??[8G????T\??$?z?V??I.?
?? ?j7?dL--???e?6?L??|Z?r?h????
?d?g??	b???x?93l???m6Rn???0hnt?????g??vN]??Z??1*B?????d???F???.S?/?W~?D;&8 ???U?
P
}?)??c??C?>gl??U?h?????I8??6+?~}???k?e?A?D??[???"#?????!?U?X??
?]???z*???qG???n-?????ga?????????>?????|O?Gx?????nRw,?3??????E?V??'?????0eS.lN??H???????'NPQ???;$?#B???L#?G??Uy??Q?3.?HK=?Y{
??w???R??S?X??[? ???i?x6?	J????
?oA	??O?V?
??5HP??Dqn?!??d7?F1?yu?N?j???4???b'M?K?[??2g???????C*u!?-?.v??H`??C?S?-?
?Ku?|cI?Q?_?	??"U'??WD8^"j??????C?V?t??????Q-??R???D???)???Z??_??=?@<?8<?0:9H???n???c>22=~?)??0pr??(?%?????3??HgB???1{a ?o?h8???8???4? '???1Z?@P?^7_????L?3?_?m?Z
?)??.p???????g_??? ??G
?E?d????G??9?2???u???[N7yB???&(?
mL]o?;8???/??X%?8ho0bQ?EXu
??o3(??????I-??_%???(_????a?p`<????	?p??J?l|Q?y?????????1?,H?@???o2?????????W-??b??????vFX?sr?N'W?????l!??fy?r?????????E?????J???????OpAQ??L??	?R??
?p6X?#????UL?Q?:5G?;*7?:???p?|?????!?;?S}??-Ya2????=?2&??!-$?Z,?~	)'??7?7?JTV'?O??T
,I?"?,WK???q~??>(?k????{X?????v??/q:???'?Y?5#???P??@ZX"??O
yj>?Y???*??i??Z?M?h??8?0?/?Cu?E,?	y'?UB?.P?kk'????!?d?BN?>??G??t????|?O?
????????"5??r???Z?EW?R????/5w5#?r.|@????*]?Z4#?1U???+?? '???b??W'-K?[?d?????"/o?1?S???(
??_?p?B?.=
a?R?q???
,????dP ????BkqjhZ??|cE?S?4H.??#??M???R?E^j&S???H???&??.(?p???eW??W?8W?B+????u?-??UJ??t^??????R?
v'??Z???=p????|
;E?a???E??J??;?2uH&??v??~u?>H??????(?j?c??2}????>?????????????
??????n?&\????k?6vP?=:??????x5?v~???3?@?????????C?^???e?7?v??"
?????l????y?r??!?
?4???d??[??$????????X?h?8
??P;>,??6j:?2????a
???M??*B
????U???;
$??I?j????{E?F}?b??M?Y?.2n??!c?j?D"??vk?-??hDZ?u?2X,?Eoi?FQf????b?Z?1?"?Y????.	???	???2??Z`!?n~ ?{
???
????}?\}?LC);??*&Q??
???dDU?V????E%??j?l_K0?????b?kG??k??S?GH?z	UTM???gj?0??!-???3??W??/$I
????'?K????a>?
K?????o?H{BcKS??	???1??PY?
??/??J?v?	?\y??~??z?`??{
?+!?$?????	i'1X???F??~C?R?f??8?r????,????"?r1???[?BXN??d0?
???m???????????^L??"eT!6?Cy5?h]c?$?Bf?=h?/?/*)?__?DmeK?mj???u^??>???fZ?:Is?SS??????f???LX?v???/7? 8Ob????;Y????a?????{?=??d?f???Ho???C?h??~m??i?B?
?v??Xv?
?????Bp??61d???	?	?f???<%,.?\H??,?'?|??
?T?rL0gn?:;<??Eu?1??
?p?<tT.h
??C???]????%_Bw.??X??sF:#?=G??c4h6?>z?@"B5(???,^
L?f?	?^_%??uz6OO???
I`???6?!?c????????????MX`\cQ??^7???L~???y?V?0_????C?]??R??KTa??qZ,p??
????fu??l????}???z???;??????yj??2Av?h_?]?]???\???1=?R?0?????{??-4?????7k?d|???[??=?)?????[kf?k	???1!?'?L~?ZH?#4??h??c_N?#
?s?`?(??m?????b?4#??|G???,?Vq????????'??X?Sd?{N??[??X???????w??XC???={???E??Vb?at??4}?m???@?????,??0?Zh???LR?	??Rf)??H.??s,?Km*i?0<????Py?????????AgBM??c????->Y?,Y??XA#?qm????M?$?+H$^??]\?$A??tB<??U??91
?bM??
#?d??????:/o???[lE?Z??????)??? Y??}aY?!??????L&&?D????g?1?yV?????}o?{?7??u?&??h&???(:H??????4
?$???`???{E?k???-O?h"9<????,`?9pB??l??Z?	mX??%*??U?k??G?C!,??\?%&&??r??az)	!??)??k6????c?3D?4K/???`??????p??k?o???7j?f?.??:?*6?)?*?;??uW??YK?io^Ub0?eL?H
?mkV???
?l????>??A?/???,?r? ??_.?r??l??o???]>?	?lh?7???6:a??0?)6???(????@????d'??????i<q`A???n??=???EH??1???k?,??`???i?<???>?
????w,?u??~?t?#????h???i??{6Q??7?!???X
F?v???q?K???U??y???}???%?s?8?]?/s ????z?8+9?k!??R?X??$????
?????-????}????????o?????????XU?=?|?????p??L3z?}???]w??"cc????f??8?N8??*A-??????}:A???`??/??Ma"?8??a??)u???=<V8?.L?B????}??kvd??i*!?Y?????-???????C??-P?s??????????5b8???X??E??Pa]Zd*94?)J???R?)[???v=????????7?|?@qN??cb??2?l:?F?Y(?X/?p??UfvN??? ??D<??Ve?@???\?
HJ??+j?6n[6]
??s,?XDQ??]?A??
?<XGDj?A1????g?X??[???_vVS%v??=?
'y?ldVL#????!?W
?????????_??hZ???P???????*6???/????_$?_w??^c????????s??~?&??U???-?Y??c|7?|?<?T?<?
????|}???Yi?>?%??y?`?@??G???g?
d>E
??n??????~yT???m?x!?SM????~<-?,:D?2j!	e??l??0?!??`???E??O??-h?Q:???SH^??|&V?????Z?a!+???[hgBk?????.[?_
?-??]??
}??RF?h???}>%Gu?fR????B?W?#?c
?vw?e^G,r:???}?q?!?d??^>??k???_???Y??h?G?t????yb???)???????:???$???????>i?2\m?ws???$?????/l??????Y??????i??+??MJ}??"?02?? dP??5A??SV?yy????????z0?\gb????o???Y!??(/e
????#?}.?*!?????
#k??\?
??f?J??????m????2??v^?????????D??2??V
^
?Wo~????P?g???`?(??]=?ra'?oJ??P??+???????S?????yw???Q???J?????}??%mLk0??&???`z?'?k\)-??n??{??8?_/9??m?rq/??&?t^??bS*T??H??B{.?A'?UyM =?{??-?._I?T^????D?????F	1?}~??c?S~A????S??Eb!~??I??0?^??} _???-+7`?}??????-)?]C1?NF?????f>?8?0("????@Y8??[?I???;?F?8?9????K?)???PB??t?5??U?&???I??vd+b?U>[l9D???f~???"Z,?S,????????^)mJ?bQ???????Bz?gK?K???\)?gD?F???????<^e#????P??7?????9=2FXg\?:?R?????1?@8_b]??:p??y]???z?@,?[5????_8?-?c??s?^|??3?z
?~???M??c7?I??S???P;??*B??s????Q??????????????????l?i????$?3[? ??7????iD?d?c??va???09j?e?V????? |iJ???????1??YO???`??uu????????F??????Qn?|???A?????????r?V//??`>oo??L????k?Kz???|?%??A6L:?????????y?5?9_n?&?M??^???$???y???(g?q??Q?El?????L?ES`??W??H??V?c????????
???V/[?!??$?????i????5?b4+s?=f,?5_Ih??1?"g?l"??k?7??
?????Z??q?DW??j[??????^?????,?t?5rA ??H?????????X???(1??? ??????m?}HfM[?QSh?D?.????*kZ??h??WD?,???	?^hd?v?
?3E
?
?mF??>+??????m?46????{???QO?G?Awx???7(Z??G
?????,!?????CO)m???s?Ry{9r???^g}b?K8 ??U?W[????|????c
?z?????9|?_gcn??P?Q??.m-?U??7=D6??
g?6?l??/cE??O???X?d???????q?
?x?
??U-6?????F?Q J?7? ?1%"<???G?@???a?9??5?????P?	a*??|%?}?{??
?]=_???????*d>???$????	???\???????m??-K9?IGaB???g?t3?????~+?{o?6?????/,VV??j|jv?x???{????h?B?Z???@?!'#^<"a?BZ?8?
???/S-b?p?a?q?#??C? $?9?f??Z??D?~-v??P?Ul??l????????tXI$;$??8??)"BCl)TDF??S????????=???O?*?"9~?9?BN&?nb??%{?G??ub???|?RF5????$?f?? u??G at 9}?????#????x
^L??Ln??<?%2	??r??k|+?R??iI?I?a+????v!^>yKZb'x	?.?Ol"W?|???e???h?r?@k?!??^??5?#k???Z<A????D?????M0E???5??7a????nSDAhDD??'Ws????~	q?<?_?????~?{?L?D^LT?P(?v???????:???}?D
|???0????$(?Z?;???.oj???|??]?` W???0?????P?)0n?*>'?????S(2dRG??_?""S??|?~??gE?r????r??????c??^??K?Z??6??z?^&?.?????%??KrG????eD5?G?????"??9AKO?.`???U#???z]Y)M???????Z?P??F _??!??P??2?M??WT???>Q??>??>????Pg?k?Hz??}u?lj"U?6[y?
?????z?^_?'Z&!D?p?V+??y?,?3iY`1??
?????????]??;???j?????k???~W??+H?????E?????{V?l??D?#p	??,??R?;??5?g?~=
?a]?0@??.P?{??j??m???,&?Y??Z???tU????J????y????/?w????)zgC[#????7E??L???h?%??\&???PK?L(??????
????dj5??%R??????/?U?!
z??!??u1.PKl ?8]{??0F???B???t?????
XY????u4?W??.+h??x??gY@{??3?U?4?<?v"e@??????????	VZ???z
{u???p????!"z???"????????/?|?4???v?????hI???5?g????;]n??/?AU??jaV?u4??z?5}t8????a;:?j???B?^7??G??k_?.?7 ??'-5m???Z8=???y??????M??W$?l?(?????>4????C??@???1??E?Z???????????n!?Bj??????G????????N?[?????_????_f??9Z?????~n???%???P?????Sn???
8?#?O???r!?/?????i???????<N2??*K`?0tG1E?
v???V???0???~H?(um?q??????????Bf???B?-?A??????????7???=?????=?u???j????????x?W????l?g?~9??8?UeC???S??????{???jj_
?7???Wyf???R??	?lH5
?aL???c?+V?a?C?z?Y???R4
J?[?E?i?l KI^?
1?"??/??b;?D%-~????[?|?jT???qu??f????<???04?I????_?A??g~rC
??zl???s5[???f?%7+?fg??N???%?z2H??|?`h???&]?????\???=???????w?-?2"????????{?????
?i?
8E?9a?????%??yub
\???-???????uU?(?#d???4??T?c{???
?;?
??"J6at8s????`??pbOb?+
Yur??1?"????o??Y
??7^kU!????*??????SZ	?:?"???^??????d2?&S????pM?.
??\??????A????>0???~s???<c????V??J????g???F???|??????????$?*???=?Y?m*??p?B
??r???:9~?6?&???5?
%???mz?B-?0?h&???9W??l??[V?[??.?&ZK?H!8???U?4???N?~I0/bDf???Ub??SWE???~hw??>????_O???????=Z]???j#??n7f??2E?C??l???>??????L???l??a
?c;k??t???M
??W??'5t0sG9??l??~?nA?}?u??O?L??s?????P???????p?!???C?N??o<??????>??
?E?*??
K?51????????a?"*?A?2?x?????v$????F??~? ??y?k???ZrI???<F?$%@@V?
?%]?@x_o?1?+??F??n%X??X??BYW%
I]4Q?J]~?Gd???]?_I?l??{?xG`???/:??-??>W D?I?@?d??jk??%k??yuH?Ee?8???XT)??????UW?Y6A?/???;D?l@|+?????&l??e?LU?[$DKx[?c%B??$?6??R??S?N:???	HC?D?0?Ml??c?Ee??L?0j??q?????45O???MA??|2?o???????????c???~+??&??D:?N?) tP??wo?:?N.???\?L3????pue??r?P?!??S?Ca^?!q^???L??21?M]?%???t??A?Zy??K??Mj?????%n:??d???lvhE?????l?b?c?^#?0????U% a)?????t"?S[?Y4?l?BVaq?	???)???pG:q?b}?
&???B?@??S?t?|??B?IBj2I ????Nr=?cj?????	q+n?R??
q?.?*4?Wa?H?????i?JX?????????a??@
??6 ]?n)S?=D
6?]?????b.?:?i????W?t?L??M?g?5????H|???4?M/??<?*??k,Es6??i
?????(?>?&?<:??6=B?kI??.??%???/_??=W?l??K?x6[????d,??0?????;???<?????1???b0?mq??X~)?m?	?_t?3lth?/?&?w?N??I;???8?$CXu;LXT?^???	?
HWF?KE(:?#`?,?CF?o??????}??_?"???P?m?-?_$\AX???]?a????[?v$??Ps?;?O?
-???V??HXeMu?
6?^???1A?zR??-?'WF,?????!?????~?2$&u??????iY?A*FZh'??/????B7??VAN?qZ??w`?<?.?KO9?
\?]J?????F?i?1`+??]?cbW2?Q????oYU3)?Yq1{^
?????}?/???Hi??OB?*?{
?D???183>????)?
V?]?-C??x?	?)?	HDh??p?}N???0?'???J?P?a_
?-???????(2?+D?e09-??A?????dB?h?I?S?G??.X????=fc?Lgd??$B?-Z3y?&O??%j??e?
?????XC??l)???EU?
?%??f???=?8+)?U??8fa?i?b??3?w??k?Y?p?D???Ix"? ???l???????:?i???????&??J?|'i?c?w????] K?/*????`???7??m5???zX??';?k]??d ??cx?5?	??m?RS?#h?]??W?*'????u?qM?????t???w??B{!?)Z???H????X????t?D????l???(???}?m????vW???r:?~?n
?oYY?Z?BF$=??y??>+<????A???? ??r??n??k?????????7o?D????????
N?wd?7????k?????-~??\B7???_8??t???0W??YetE?
=?2?1?^?r????????"??_?t???8?)?G????c??c??c????	?#?R??????????HXF??
Gck^?L?t??????5????pN??h??v?????5i:??B??	VW?????.?qpR??a????"?2F?[_d?*J????}????A?t=?)V,???7??o)??1?
?\??po?J???,??sD?+??hBz??54?oCH?-yo?U?2F??4?k???eh?#}??Il*)q@|:?Y?????????M#n????b?H?["?&?????
?L?mx?E&<?9?9{???ep&>`P?4*????/Y|??????	??Z?????YBI????#scBk`H*?M?t???????th^clY??c???z?`?D??/?~????c
?*?b
4?? ?6
~??}<??y;UP??a
?PMV?7?}	S-?j?c????????o?a????4?}?V$W?L??X??S???%?]?
?"??0;k??*?qb??????(P??J????>#/w^2R?\?|d?=??V??%Ck:;B>f?n8?)??h=?@X*g?n!t???=R???E?W7??r???m?K???9
1???V]??K~	?????H?b????8,?????R??\
g?"?6B?PpDnv?????b[p ?F\Os;I?t=???Y?Q?hw?N-7ZN?3??*K??K?Q???}?\????Jg? ?%<??{6MTD???????-?"??=a??????kd=??!???5&?????MW??x??z?xw???[??`?'n????w??nm?????=?????????8/??1^}wQ???_w9??@G?DWl????D;.?jTO}?=+?f7??[??4???o(??fsa???M??c,???X9?.?'??6???d?	!?<???IV*??Bl>? ??????4?`|?0??9>>?^?M??E?d?/V?Dxq?????~?ypE?:\4o>
??x???Kp??~???"??s??D?oD?t?!R?m???n???c%??
v?u6?K??=????|P~??aJS?bC?C???N??O?&Vj?b??*??[?{????h????;?u???J,T?2R??o+?N?1a??]/&?e?W??z?EsA?
Q?;#??#a?'????O??a?????Vuwv?????kA?o???	L???<????j???]}
?????NGU4&????j??5?2a]??A???`?0??'
-?Dh	??j??>?~>??b?*1Y?j>L??k??~???}?B?X2??
X???f+???.??<)0Wa@?(5?^J?OC?R^F%??%?I_?DT~r?BVV??V[D?z*???Y??eU????F?%
-?M0m????s
??j??a?}?dn?X?3?fe3??^A? ?x???????z?j?(6????o2??w_'?$??"N?:??.?	????LI??<N????qG????x>#c??}#????#7"0?!?]?

9???j'
??&["?
????????Z???T?N?f??0/^?D$?*?\&??NJ?3{
e?B?U ????`l???u?V#fI?{??t??sA??????C`HX
c?????????_W?:?~lH
L?b?-?? p??<?V=??&?p?$(???
??}???g?m'?;???i>?i???M+ ?&?1?pb?(_F8G?Dy3
?(?V??[@??s??{?/???L????[{??`??WI?m}3R?K???????:L?M<z?y?0??6??5_l??lv?cf???QZ??,?????o?a??uq???N??????#&??y????:?8)?t???,????[??7?G?l???zh?hW???J??)?/?Y??M???\2"?%??????????	??b???XJ??%4?jp???!?i?z???????A,?.d??,%?Tx??!"t???L???????TD???d at yr^?2????Be?	&?$] ??I???]?+`?1?Vb??I??y?,?w?o??A	7u?]?]
xd??>m?}??
?B?N??aW?`?/?_?P
??V??z??Z??????&??f?*V?uE?w??CQ?GW?1??1???O>?K+?q??m8z+??rlX?4)E??4W??????I!4S?5?*???????5?
m?{rS???hq???@:?KkA3"tqK???d??R??"?????c????r(Oc*?X??Sku=-??I?)f?{2*$~
~Lk???mh????)?1???i+????mY???2
A???????	?????? dU`????'??o???oZL??Fd??FXG??'??2??4|?[l????.>?V??C0??y{?D?,l??I^??g?2??[????B?F?s^<?3? #H??????'?H(??*??.?nT8??(???????	??A??b??*YF[?[??7??y?V
Z???c???????U?iH???)GL???g??`
r?qRpjN.T?????
???$??wc?iw	??|X???m???@?????&zu[?6I~?,z?"1????>??y???
U??6?hA??????m??????JBa?(????8?~q?sa??WB9kU-z?1??S???XSO%???|w??Nk???BU
??5"-.???M??7????????K??U??l^?~??08%?p7?????????????P"a???????? ????1(^?_U?a??B??O[?#H5?`0??U1	???:tG?0"?:
g?oZ??m?l?????U??M?5[??o??Y?7???R?!?[?j??#??6?1???
??c`1???l?&*?.!??[;\???3/?{I?
????_?N???-(?????????$?w?3?????;???#Q?8Fg??
??d?H?)??'?
????(?
???P??????OAyI?o1?c
?K
?K
??/??^_?^-?5e?&???,0?t{???%
???????C?c??_z??
???>7v?gB{>??????????????8?OH??|B\?????\O?C??E?u
?)????=?j?f?? ?6x?? ???z"=wn?%?V?"T%L??'C???IlyN?s?7kLz?????5SVnL??d"?
//nI???0,??I???pi{/X??!?=?d?B????,????	?i6??8#??'T???l-??0?X??B????????>Oel6LO??T????+V?4???rz0B{????&??\?p?nb?*	??h???j??/H?????x?@???FC?|??P*?+??xQD?e?????Z%Hp?J7????i??/???*???????????f??*{2!?c????g<
??>Jm??$?????|'???<?h?Y????x?-??~?:K??`5?X???}???8,?-T@?_????tPE?[??HV?>??p
???Qv?????Xo??????,?G???W6??R?
f???h?'>
?<????-??r?N?B????owK??m!?	B?6r??
?[P??p????l?s??9G?e???A?qk?????du??D??g#GkR?cC/h?ZZ;???HQ???f?
T?!

???uB?????1&}??H*??K?Jbv???XB#pXu?|`???6?5?h{q???f_?#?a)???}??I?a??9?`?h"{??
???0???2>c??%????K??k????{? t?? ????*df?S3?<?G|=?????t???(d???Je+#D??N?O?l?2%!?_5t???Y????g?(???^	??-???!??_V?rX??z?8Ct??R??
|??
R?? -??R???)W\???{
??????????3E?Z?4q?rX???P6tZHQ?~O)?lO?? k?MH????=I?$Lusj?y?YA?W??F??#?,&?e???dO>~??bI)?
I???????X59?vk???M<????*@0?
?A<?Y?t8?Q?q
>?i#'??fk??W,?R?&??n?lK???????%zW???!??*?????"7????d>?a~?
aB?Y???????&?.2?"+w0??e???SRfB????Ww?????*??vk??;??#??s???	?H??b??????M??_?????
??S?H;:?]?V?@4??F?w;e^?usO've????
^?[???|???'??M_???????W?Ha??@E
?e_?n????8??8A@??7-???b???e??????
(???????,U?P?+J3h?+?'???H???????8vx?;???k"Oz???q???yQ\	E
?????????j????U?????
?y0.????|???
??J/?C*?Ah?He?????l?n??K?????2?_?8??e#,Y3?`??K??{W??!?S????*?????????<?D?>?k~???5?U?g-??Vp?-?????g%?9??=??I???&d\
?R?u??@8F/d???u)<#???1ct]?dk?e??q??????*?tehH?S??
???????0v?????{E:?.tN_>C<?????f?g
?'.???YV??gQ?`6(?%?.4R?'?`?}???`?????$???`?g?!?pCA`???|F?z??????$???5?
,ap,?g'?S?r&?o#??,e-??????Zhe??h??T???9g5;?F???M?????$?2????????k?E?b???,~S????_t?u@??w%?]?A????
?eJH???f?jH??
???h?8
b`????bLX??9-S???v??`?H???b????;?:K???:??????????!?R5?;T?;/r?Z????&?*?~????y??7???Zd9
??!??@????a???_?,??V??%?#??jE?????rn??=PB&??b??L??!?w??Z?R???nz2AV??2?aJ????tH?????M?]????q??i??m??+Z
?M
??@?~??)?????Ux????H??W?W??????0?(
`?U9R??xN/Uk$?????????P?	P???6??Y?`?]??Z?R?ff??1??f??yH????y-?	??j???
???B???8?g??.w??.?ja!d????00?`?9w?J?uJ????N?p?p~!,???(D&?J?S^???????T^?~??F
DM'??9?tQ?
?????P?
?z-??B?:?F?^W?yhw???p<_~ja???bo ???{[a?L6?+???i? ?2Xv?[R|W???5??5S??p?wX?1
?&???2(?$?Z?????{???
?o?c???????#S?u??FB
N?Xm@d?g??;m??o>??
O??Z
?6????j/???/J@???c??o??e??J?Y
?.wh??:E?4!???@kK~?@X?????5????}q??w??n{??N???]??#??3?A?????wL?????P?A??T??????G??~??%y?u_7??H&?o?????;???SV?8i?mh??(??!?
^?}?F?H?????I?0?C??????????.???G???A??aL??M?h
"????Y??X|?>Z!
????????????0?1CEOEW?w?fj?X?;c
????C?O|s?s?G?{?e?????(???(?B?"7??NzF???	?????????bj???$??W?H??????I?dwR?x???sSh???0Uy?????????;??V/?s?RD?d?n?C??I?n*I?)W%??2???Re?eW-W??K-?2XU??????7M???D
???Yy]???!`		?!??'????,?4X??]T?????vy
?
;?-,HbT>?n~???}?
?
?Jd?W???*
?WK?j???2??????$?%Dk???\???d???n???8??
???4Q?;,O8kC????;??
??????\??!^???I???C?@??MO?+??%?E?p?F?7???L8yC!R?K6?0?C???,????dN?,?CX?"?????"??w??k3?9?z?Ht$?K?HF?
)K??^?t^J??e??04??6a???"??.?Z?\?
??X??$?*?d??????Y@/a?VN???????k?Z?7s??[\U?j\li]??dP???3?????*#???'???|?/}??Q??>??????A?????`
<?????iLo?????Y?a????d?,???w??z??vf??bg)?P?9`?-5!?@??9#C????????_W??%E+???M?!?Li?<7?z?qICS?????
??kb??O??z????@J?w$?n????@??n???.?;,O*6?'H6w?yO?j?XU???]?s??4???
??f???-???A?|{3????f??"@?L?Y;"2?d ?x?#?n??O@?@??H????N?M,
???v?n?GR?C?
K??k?&b$e?1?$W\:??&?lhC?f@S?uh???????????@J???v?
??F??A?1/?*?????Q?|`,?<d?W??Z??	]?????!??&
a???J?=??~2P??ws?E????s?l?B\??y_????@?aB????'?H?????vrvNM?	~
c???#?;????-F????:?x????
Q5?CS!?I??
?y?w???d??????N=
A?PY?ni?????zzX????MM?????????8d?PW"{2?Cz???3]|??????????U?
?????_?+?	??d?)??%]?h	?B?O	?e?- at a&z{SC?A?e?C????7??
]Cx?????&H*?Nw?zs?#?????$????;?|?p??c;?7K??2?	?a?,?!??|???;??F???D?%6/??Q??.cc2??????B????I???w??e????9&h?????w}??????1???L??F?<Y\JM??q???m??&y???J?[{?Lv
?9P?(??GG3???P?C{???BA??(??D7!??????|???
?a?V???k?)m^????j1C?????l??
?'?>?lVtY???)?g???:v!????eA?t??ZT
!?<?2?w???????	QlD?W~	r?G???lI???`!#_(9dLl?r??z????|??{!????M?$??o???E?
?J??z-?	Ry???,???E?SAY8<??N#???)?M?K6I9?EII???K???Q??&%???p?????8?d??????io/D??????]????A???dw???T2?!|@??=c?*W?'?????,5?r???P?????,?~I????dC??D??LS'??VJ??????c????c?nU?`??;?i}?9?C????F?!?U??H??Fc??y@*(?!???Z???M???L;#?%????i?Cc!?lv?E?Y?T???hVqg????Z.X?,W??o???<F^^Ae}???CU
J$??+????$?/?F:???2Q(o????*??E,?N?]8????"+???M??]??)}WZ?R?#qS?k?^D????
?????$$}^??m??q????e?????C{?	?X
????Je??????%J;Q????jO????7??j-?????Gh$D?1?B
J??
??B???=?LZ`(n???es?a/?Nj?M??i????<?R?B?4r???	e??????s??G???2i?P??????J?*?>????$lU?????
??8???*???V??????.??]Yt9?? ?N???????X??~?TtY????Y?"?k?]???9?a"???????????G??<p~$?z???O?s?~hui??t????i?Sj????Dx?????S#??}?>???????????|?Z???2]??>?5l???????#??s?z???6?fo???A??$?h?A?5]C?4O\???/e?_?????K???t?L?f?;??sB??????*T????;??(???g,?H!d???8?A???BY?Cim???I? H????d??n?+??
???"??"???? ?7???	v?/?rH8?)??g?+<J??0?gd?\???4X???????9|???hT+N??wc]???/??;e???:e?????????????&??H??S$,q?s???9??0??7?]7?{??34???J???_?3????????G'6??//-?I.??r????&3??-??r??_n?m?.????K	yV6???md?*?UR#??e??l??M\0?"?a?
??d?n|?/???>???!Qa???];?@??u7q(?2?$???H??!A?????????+W?????~???@hv??:?%u?j???=??d?H???)?8+)??/K?-???%?j?FE??y`"???7_!8???7?
?%g(??`c??p??/???a?HMN6y?J?j`2?nf?N/??s	k?;??????~?=08??+|zB??B6?j!?bk??????~s?7m?e?,??a????[?????b?
GF???
q6@??????0???+??{?+??h]E??Z~??1]?&<O??3?????X????6???qn??gR??M?i6/N?9?Uq??????1?v?(;???}[???????2\F2????dqj??
&z?????x?^t(??-p1??U?W??t?V?
?J???????????<??'??????
?kj?????1g?D0?b?Eo ;c?q??!>??(?/Sh?B????!????????Rl???????su"? ?!_?h&LF?R??\???f?????Plc>??l?|???c????????*????nt
&,D?-?E???A??/rRx?t?w?E????{??x??sO???;???o????6???9????x?:`?{V????j??*??X???tKG};???b?2c?>??-[?Xr???????K?l?`B?T3,-~m?oP?D
?X:?
p????#D??p???h?}???kv?Z????6[	?Q^??j??I
??%?@?dO??
???N???	?n????+Q???7????V??J??M???s-$???$J8|???PL3O???$?7b9??<?l?y???}qn=?[????jg?P?@#?????u??i??
1xL~?6??G??VH
??(???D? B.U?~?7[?|???H?q6?i__
?%p??G?D[?????`??Hl??????J?`?'P??:^>)????0!FZ??????>?e7_?nq%??,d???????#gl?8?x?F?%?)?g8Av~y9?????????O??@?U?c??7????C?!?|~K???W
??
??????f??N??X?8R?????~pVq???n????????uW()?
??D??S(a???9??#??????RTb??,???ny??????
e
D???P??e???D3????
Ev<?}???oRKP?}L~A??x4??????4?????A?S?Iw??.	u?f??
????GV?B ???_?K=C??d????????R??(E???OK0??B?k?B???C?Vyq????????)?
y?0N??????yF????Z?[c???C?f(???u??????(??4??#8;_?'?0?r?????LU S+Pm^???*iY?/Z?????0????2A{8??=v&???z???i??`I????"/R??t?S
?A???%o?]<??/?
'd
?|MV?????'?F????
Z}~??	:,?H??!?????
??)??`?7???Pf??????X??RC~q??q2???<<?,?en?$?Vv?Y
???z??K???d???
h?????????$?cL46??k?V?"?K?/-??H?????K???0]R???h?1?_?ie?Ow`?y??????L(?ZS.ds??9I??1I??E????~??!0?v????l?Ni?,H(&??@??7??R??????? ??av??a?
F?i??[l???vw?>a???4X?g???W1??Y[?T?#????0??l??Yj?l?????xQY3,???????\??YD???Y????.
??8z???}P?????#???]{??x{"?C????
??I?xN?/f?~?T??T?M???2&????4??(qvmvt??&+ J?X?a&??Db??}of??ioa???5p?,?-???z?????L??13
?x??? ????6?]??3
??
nNK?? ??Jw&Bk??I???-?C??n??n?U?J???s?>???????/????^3?g?/@rE??w?@?????`)/7
?z?~?E?J*???G?w?+aY?$??@?X?-??jfEZY?_8??J?v
i?N??r???gL??
????D?|<?lh?m????,?-?OF?C<??xD?D?????S??e??&?J??O???@c2?<??*?[???qw??WW6*D??n?^??*?0??w?v??;F?5N?+????????X\???s??Z4j??i??y??,ShoiF=%oy??gj2?????
d?_???????o?H???cB2????5??5}??$??/?a???\?o?_f?u??W?????^?L??YR^~?qJ?x??b\}?|?8?d???*E?6?R??x]?R????O?(??v%M??S?CZ+????B?uxX???????s"LF????a??U?+?t?????5???c-???@??k2??If?]KNR}?C???e?P{??
??
????x??????2????f?M???&??
tz9?b???j&_p?^???????v?%4?w??
h??]m???.Z6??????=M&
?????g ?%21 ?12??$?ER6LJ?i????????W *}H??m??:8=)x4>??????
p???K?
b?H=YW?? n??HtL?Y""	?Lw? ????|????;O??C??K-????'???"H?H??????!??u?vC??(?ji?tFO(?0.?????????v
?^??i??????	??lu?r-???O?p?>??1??X??f??i?X:6?#?s$V?C??Bv?T=a??t????K???v)C?h6-?J(?v?^N*0iu?|?l???NV?j?YiwX'+?Rc4?>??|?`?????V#?:?B?5??j5?I??0?#?|??UQ?1?j#{"B??W(*?(m??&*?!?l? [?sl?
:{?*???d&??
b??<?k.??5??+??-?d2??*??0|
5??4k????b
???K??8?????bBVT5HZ??gs????mZQ5???B?X?adZ??I?H???2?D?
?+dL?V???R??:??E}
?H???w?D??)
K??K???.?Q?F?Jt?[?????W?4mq%c:?!k??hL??|)??k??,U??dC??>??
C?~????$?/w??????B???=L/?????	????6z:=?fIQ?UEo?am??????u???nZ??kF0v?e@?R?h
?>??#?y4}?t?E?}?R,*??	kFp?3??l?Oov????????)?u?1?;?nm?7??Op??a???z at H?????T????hr?yG/~?SwM?!w??d?rO??;????=?*?????Lq?T????????]??1??LH???_xk?MzC???
;???Nx????????H???ur??7??
???P?C???`09????N}?(C'{??
?????d???B5
????Ue~??=??B??p?o&C???z?<????????2?@$T??<?yA??????wx@zf?????]?5	??D?:??]???/?^aJY< $mU???? 0L????
\;?>????????C?do??%?}x(??H???G?&?????
cm_????HZ'????	I;??????#???N??????5(??3 ?f?QZ?!	? ??T???J??[?S??C?)^MH?5??u?????fW"??@X?Y????>/p]??_?9??';?NHG?)?)?%???????'?i
z???
??UO?????9	kzLX??>jXWKN?d9??)@Ov
p??4??#d'v?l?2a?8?#l?.??????h??????c?M???5o???????s??A??S?e???~??????	??????* ^?i^????c;? W???;?????~7??O????`H?7?@	?^J?S
RLH?E?5`?4y???fG???i?????bj?0h?6?[????S???
???'?D??\~?s?.P?]M??++???0?aAC???f??@0Z?g]?1uw?9??m~O????uF??0?????Q?NwQ	b?1>?b Y??'	???2?J????V?`&v$C??&???X7?6?
?L}c?LZ?o????Rw??{Je??_?n???K?D?#`n????F?`???{+z?-P???w?8
?Y?;??sb1????~z=??O??,R???.M???FNo??
???[???hM?b???97?j_N|t??c????????H,??????qd5$?#????5-B?Z=?A ?q>q?h????e?} ??S??{??N??;[b???o??t?k?QRUd[O?ge
b?<U_
??p?o??d?1???(&??6?a~5?V&"?@`????:??M????
?.????F**?G"?n?T?t8Y2????k\??*EO?????+??$??nc????(??{???b
?^???c??|T?????<?(
??:???d?'\?d?mL.:m`>8 ?????G??l?S??r
\?Wy"??q}` 9 f,-?k??+?k4?T]P1^?f??M??@s?+??D??WJ?r';??!??????W	????W?????VW??Yu????????3d?{???????b???>*???V??i?4r??
ZXJi?M??j|???L???????%obZ1??C??9?]??/6Ld?d?ZD?Z2N?040Jq'r+?????i??1??f?8)H???<??4?3K???9SH???V???.j?w?M??C?????~`2??g/Pt?????0i??Jf?v??-?g`??s?X,?[H?????}????!VS??D????????1??>wb??RT??
?~?!6V!?l???gq?e??'??Y????n??????G9A%@"??Lj??]????????????C?Jb|#??f+?*?I8?L?? ??V,?T~b?LTE?????xT?Q@??uF??g]???$
`,E??IJx?H??"z??y?mU%?X?8<??*?[?2!??B????)?RbBb0??e?a???S?g?,1]?9???9{?:b9f0[?KFr?	c?
_D
19D?6Q`?3W0<8?-??????~&?Yb??s?T?f?#=#iG2??1??4??Eg?biED??C?j4???bZ?vX???\|H?\???;s?>???1A?v(?W?~F/???????? ??F??<X?? E1B??9QTtsN???7|2?3&M(3e?aS???r???c?p?[????Dg?1
?GYx7?g??????d???kO?X{??v??A?=Ug???6??J&|?nb???vD?????????N??cy??V{N????a??aE??uT9??H??i???v??
&???i??5?????????,?yv?!"?X?#-??8K?`bw?A?if?A?~?HB?????^??O?????k???^???F??7?Cf??{?N?
?
6t?G?L??K?S??????`??MoXhh?L?|9? ????????+
]a????j.?V??w????? 
j??????????????????6??3????KS?@x?]??p?)???x>???!?@?
\???N?:?J?:m)???d)???GK?]???r[??a5e?????@W?R6]
?a??B&??`Y2?-?????I?
1?'??d?????V;???-\RL?yUN???'@x?/???/xP?K7H????yk????hC??kL??!{^??'u?O4	
?,??'~@>????(DR??F??!??J~??YwY?U??3???:$?.?6???d???f??5O?V????????%L???i???k??:????u~??6?-??+Y????&????aJni-L???*?J??<??b?n?????g???'p??R?Q?l??0???@? -?KT??/&\h?????o&N?2??_?e
????,????x??
?PJ??!;?u?H?cDy+?cu'??5?????&?F92	B0????|??4m1/_t-o
S8?IU)
????i??[????HC??M??+n~d?~7`??H
HX? n^p;/h?KL???1k???????L?Z3
eP?4?z??????????_^U?@^??Vg6???xm???wn#?x??F?=?L?????j?????E????1n?	??0.d??5????H+???2gLp:mK?~??a???nU?-?f???r?????2?BeP?I)??xww?
??b?u??]??Nm????n]???d??????.?*;?ja>??=???????????h?n???~?d??v?????WV?B??q??t`]?P???}??	7?b!?????cd~??:0r??w?1????87?@%???#(????u?`^?'17+??+?@??d?f???{f??w???T?Nq????????AVw?v??P????????3??t???_|??K3N?b?l?????4??(p???(VF???@?U?3?k?D??O?05V?w&M?{????--?g?B;??????m?d,??R???
 ??k?vVgMh??&1,5?do"?????C?:cl1??M~?g?]??/2T!??,]?"??~?@?vN?T?=?? ?s?S%5	kl??D ??????156/J?V??hs?;?kR???\????tDq?`??????Rq&
?t
PA7?^?d$???4????2K?;??Q?r]??;U?Z1m?z?????~?r????w!?B??,??pe??0O0?G{5????A?V??G?f?U?)?K???EZB?vE?a?a??`E???aeU?8
?<P,????v?'????ze`/??g???r?]?$YM}*A????????
????Nae???k????[)?7^F?ZV????3>?????<??kj???z???g7xh?
%\m??o?!????,?w?:?AM?8)-?e???NuK????'?7???Q
$6?G-O+9[?$???^O??ipz??s???k??q???)?]??U??????4S??>h?D??????>???&?6?.a??o}??`Sd?[
??io?5?
j?M-X??i{?#D=n?v\h?++r_???H???A??rfG?I
?g??f?WC?"??rv??K)?????0????????`?-!^???-?
??
?<~g?]U?
??vZ?M????????]??;??????????a<????????fw??._-?M????????E????R??q<C?&????d?M?6?$P
?|F???[=??????T|??Z#?h?F"+???k2?CI P|B?_m??h?B?E?JHj??????8??&?c??>?B???"5??y9??w9\????.q??	
=??W?
??#???*?r?R?g????t??x+V_	?b'!????j???T;^=??????0e???i)???+???-f
?%?`??@_wA ????bx	qA,???
???/?)?aA?"?>1hUU?toOV;K?15??h?P?`????<l???%c?z ???i??E,??pF??????+?Y+??iI?eE??G?#[Tp#9y?
??L?	??eSV???7-??z???6??i???#?Ka?z ??[)A6A??Y????S?	??_l???`??[?0?<??Z???C?P????FrL?+?;&7B4O???U???Zjo|?>?\???
??&G???^M??O?)x???H????c??B?????bCi??Y|3???{?????????Zxn??614??j?J???q?r???Bi???xJ|0?,?Ao?Hr?9
??l??}?Z?y&\?"|F???=?L?_??f?d~lA??????D???x????L????l?p?2?J?)???W??W??
?"?l^?h????F???d?P??W$
V?Fjf;?R????;+6??? m?&?H?~6v$b???????So???O?W??? ?!TH1-I?G?b3?O=?
?R???j?4????K?????0?b?!?
%N??M?LeI????,???{'0??{???_?
??????F??Y?S6???*????UwKOh'??z?????W5???.?n??)N
3)!?Boi?E/???????eJ
</?Y+?N???s?a???????????[?]g?	c?#????XDZ?X??"/??=S?E??5?1???y???L?+!]EM???%O?
??
???l*?2!?X?????.t"??d?1
"?&??
????aq?ex??\?/jX^N??"????MG???????&P?????{?Qk?U?????????????H
??q?Llb?t??h?Y??E?Fh???,WL????Kz?wk?y??PKtbT+??o?r??9?R[???????DB#?Wc???????Y0?p]??-H?(?*I??g?!??gO???????mKUH????e?
?
+???yn?t?=????+?R????%G4???a?M???2?l???j?'?KKL?-{n?w?7?X????????vs]?B??????&??>~
J?x?a?Gn???u????y?
??[V???[?*H????(q??p???u????????t?HO?4???SK(???
gi'??@k?0)???????a??7??????p????t?@?{a??U:Z??G??Z????,Y?C?^1o6N?h*v?cj6??p?	?Ia?-???}?Ba???????z??c?????!?Y?@??50?????=?p?
)??`}!?1???,??&=
???`q>i?C?[??~	?#??????IE"+t&??
B"	?4?_bed?`?????d)??r3f!????F?????@??k?v???3{?y??.?k??;???????3F'?W?`?;u??C{?ia?2?????"_2?,?/???Ma?I,?
???_|??3???yPUB??n???Yr?Z??H	?D????C??X??N:e\q??@20*5??N?e???A??X.C?6?`B???e???1N??E?q?g-????b&|?+??0qs4?~?	&l?2(??a}??
??5?r?"?U?Z2eux??w??????s?~+?6W???;k??Mxp??(??X?)h?M????6? [fJx????"??}3?????[p?P?????J?h????@??l??,?h????V?w[z-???S?&????
:H&???%N??M????????@?-#??0?.?W?1?{?v??
&=e????mK?S?,%?Q?)??KX+??;C??5?r?5?VuZTY??|??8??r3h?h??	??M?????Z????k???Rr.??&?*-zHy?u??w?\6???O
?l?q7s????Q??P?X?{??8?????%?/?"2l??:NL
?5????0#?R???n??i?
sN???idl?????;0??k???(`???N0????bP???A
?{!?u?}???gd????N?E?Ge??WOE?I
)?n??????N?r?I?????j????JXEp??2e???Q?d0????$?XS8S?~t??"???z^???H??UN??N=jyUS?????Vpd????]??$?KP?
}e??????a????????p?C_?H?????E??u??g}?
?Q?*????z?Q@????>e??&?C?V??S?O w?6AH??????????D???MC?R?on7??Td?x????]/:(???E?!;,?;?z?M0?l?,?G???}????m;??%?
???Zct?A?????C?7?????]\?2???f
??9i?`OX?\???G??F??:?????????/???~[????3???N??'?????O?????(?F?S????????????z???/mHs??HF<???'}?D?????O??O????3??yn?wC??F+?c?????n)Af
?	v?F/???T?nS???????DDrb}q???U
??SiJ????0?@B?G~??H????O???I??Z6??? *???????RER??D?U???#?????????k	?$6<???<?(??9&"????,???_?j '??5?n%?Q????????q?1l??9????????r?{X?)Fz?P9??qf?8(?)?xJ?D]?????P??Av????
??D?????,?????? Z??4?w??????d\N???S??O??i1c?@?7??q??f?r????????tYyn%?F??W'P
???>b??F??)?,cp?%b???l
???xj?A?????3E???????)?C4?
??9?'??+T??l0??k?l?BO/;??5?=m?[h?8?f?@????"?:Y??KFH??N??B?z?????N,??L|l???!2=?D?
?N??????v'??v??"?=?G@???1???U?Vy*??b?&?x&P??e7??%^?[???,??Py??r? 
T
??Z???/??????S_?i#X:[P??i?NNp????V[j?h?X0??~???d??? ??????eM9n??
??x??.%d???\?"?Am&??
;???K???
?";?A?
??&8kH?^n??A?D?=?:#?	<0*?"?I??8?
&xe?1??+?D??Y???q?????h??,'>j???Y?{?i3?????~?K?2??m??M?gZy???!???
????????<?F-??$?:??????
h?V??Y?????;??{???:?I?@?n1D](b?<|????L	@??&k??lM?????????P?/?P{?Y?e??+8a+??d?V???Se??)??%?^&??U'????{???bp???-??,?l?=`?-??^??r??l-O???????3?.3?-?L?_?@???p??#???H?f????@X7o???2Qu$????]*?????F???l?Mu?c>??
WC?'?h?`?}???c?w/?w
O?U??{?&?d!?M?WV???=??]????;A???;??n?A???R??6[{)?!x{@kE??c???bmOk?????v?e?~q?!???l?teRS???7(? ???4??'??>gw?????h????)?o?:7???d5,nv:r?7s??"?|!p~!????0?T????]y&?????V,???!j/f*??g?VSeml??J????`a{?#{:?????? [q???N0?:Y?`???g?`?qh???*s???=4cK?2}?\??a?5??5?{?????????????1@?p?s?!J?{??=~5?]???L?f`?c9???U??????m??U
?_????B,??K????$?sy???L?*v;_+Xk????l??`5`?gkLmrK??v?M???s?cH]}|???8?
?D??.{?K?@???6????=A??????e`T 
Q??K?????AY	<???	?LwT?D?Q?m???
??/?m?~????+?B4X??c?eZ?s?,?A????L!?gLyKZ"-?
?}[????`H_K^L???|w???6H?c?
sRp?e?y????1U????A???t)???<????,	>?x??'
0<?'????B?@5a`}??c??V_y?t}??20??????[??B??Li??~+a?*???l??E?ka?I	???ZeJE?W
?t?(??7?????'?uz?????1?<}?d???
???:u%c?_
??s????L?^??n??h?5w^&?]=/? !N?U	?\??????GU?c????k}5C
???c?VsX?!?k???\??,??'i??O_ S????tHy^???q?8?m?2?\]&????W????3?fg?`Zid???;L?O?F?????????^??V?I_9.?J?s?3???????w'????4aI?j??x`??h
p???|??8^?B6???l??8?0&8???&???K?$.A?6_
M?;??D,*???4?N?'@6y
#?8?f-h??Zl?YM?? ?,E?/
??80?Fz????????????f?;?^?al???D??????????b??c?i k?]g????~?_???W?y?^\?D???#??e??5{?u??{(????"?
??u]?cu????Q??9}\?p?%??E???c?RS?=??c?a ??}	&Lo?nH?m]v1a?!G????_=4{?"??_?b?ebD?1?&R?|??n???_???6!??$?~??<?$OO???vZ?????<:?I???+?w????75??q:z??H????pI????Ho?$L?x??]?6X?-???/?w??????`?K
????g[?#???2)o)?^{d????f$?N?$x?[?b??4?*??[?X%$?r1?0??
??$c??$??M??ZC8h?C???7n?A?#c?1d??/?n(?2[?^?L?B]?P?5lG? ?clR?-???
rz???=?E??\`?W???C9?-?????????U??:K,??uC?RB=?Khf?b?*???V?h???	{3??#?l??D???n{?E??
?K???eCA:!#??6??N????#????R?[c	~?????lr?????/3e???&?U???{*??l9?^???P????w??Z?[A???
?_#I??C??%?U}>
???BY??o??:{??????????????&=?'????5p?i??!dF?}2???"??	???T?u?s???????|@??Y???>[??b@??6{?G(?S28??m??|F????U
?F<?C?&AW??:??\???F??k?8?l?_???*3??cTS?1"??Y????X-;??aeTcK`??Q????k????Z\?Eaj?[?:\?????;???K????I?3?Zt????5?A"??m??????'y?WHs?!???b?y??]?<O???xq? e??T?5???Q??`??????s?ge?K8??D??\?????-$?2W?:.StL??/?????y?q?r?ENd$y???^??U??D?d
	XS?f:b?
?=?k?{P?o?????1?an???=??hfV!-?????vx?"Q/_?????z(?Z???@1?NK???5F??](?(???0z?#??<??L???????+?=?Rk,?Z?Hj???L}?dq?

?0?????<|??Y;!????{?	;(LX0?|???K?
????OY??71??h Rt&?	???%?s?48???I??g?
?????????!??????`[Pl??????????'?w/??Ptd]?jv??}?PVT?R???
????`?V???b?P?UGy???+Fy#F??.????n??o???e?7??b?i?@?g??y?xL	?@WG6???J?{?V?.????4V?uj???6??t??C????69?	s????-f
e#??(???
K??:)Q??0C?[????\d??B7??PRL:C
mbIH???:?ZsC?????,E?????S??_HU?D???Z?PV?Q??Ko?R??fO&??????????? :?
Bj???Fg????~
?_???WR?i/????O+?[R??
?B(V%??????!W%???????Sq?a???r???L=W?GP??t?V*&]???@"?h?m????????s??
?A?E)?75Y?????L6@??????
??]?Wu
b?J?`???:?m|?^?=Oc??B???l?H??H?i?ZA?????4?V? ?????C;zg??bV)?VV????{???h}?Y???E?????Yu?Q_eG
???H??q^,!6E<y
?~??`u?y????z?.`?p
?1V???,r?%???5?[L?&S???m???rF?Zw??&z??5??-?N!2?Q J??d??x?{??LH???!?????`?????H}??}??(??7AV??????rt????B??P??'??'??&*?q??D??????5d??!.????Y?.z?T????G+>???????Uc"Z?sXq?i-%0O??9lY??V
??????gm?s?c?9!T~?H,??f?_?P????"?M??aH.??yI??1??Q?d`Nw/?t??c	???-
j?4??,?Ip?????9?H??:L?g???HD2B?f?_ 
?'A?^?B?`
??7.1?rX)?>@??VC0?? ?L??/?uC??P?r?._?eE?t???Y_a?K???H/
?pG??_Kf?n2e????BY??T?9	??5?0??m?9??mun?Zc??:?U/??+o"?*?R?:pDG???AU???4&z????"?-0??Y?M)?|b????dZ?1ZGC
?3?j??1??wh??C??_?\E?MY???'?t5?R??_ ?????/a?????u???/????o????k?^?5????\?	??J?????`?M?k?]???~?Ik???v\?~*?I?p????????I&,?*?h~?#?P0O????a????+&(W??\K?u=^dM?????+u?+|Q?D???J??Z?????4?@C??q1???.???U???^^P???d?(`{??h?By<Dq\???yy????~?P?&0b????????%@T8r??;??P?y???P????/??,?cj6*?HL?f?
?/.???"?/?[?????????\}J??pPH??????&
X??2c???u??LHH?5??}???9?L*?+SG?l??	???{8???B??u?BA?????h?1?gH???z
%??,>?XL??z?Eg?7&????X???p?B?k"?B??[??7#3XY?V?
???%
w???P%???K?f#??0WrQ??0/%????K?V???????9??#?????????)????k??.V?%?u??.(????+????????%?????kE??H??,?~u???????1?/?m???"??F????p??=L.?~??q9IHM?6?`\\?H$?^BZ??#?mi??CoC{R??g_???d5??'$8?T??p??8??M?,?p??	???L9&?\???	af`?d6?`?M????R
q?`_???B????Hq?;?u?????????vw<G???? 0??R??B?L[?e?2-?z	?B?Z0????{??7m??\??W3x??tq???
z(L?:???m???[?B?'??B?lY??Z??I?????
???Bm?LC+?????Y?x?>|?r7?????x??k????6?78Ph?e
???
?"???????O8??H???|v??}L?ds8oL?X??????W>???????????}??????-?G?IO??
!??Mw??ah?????????^v?Q?1??????Q???'?W?1??
)???)?`??????7?,?????????????T??O??r)a[;?K<??lK{???{????M?????j?z???F?4? ??p????CMH??????9?S???qR????q#
???>?b?}1V<?B+k{\;?????%?=(??sH?=????6{X+=?]2??Ft`??w?~F??????d0cH???3?XqL?????m{???il???=`??s`UL8?^
)?VqjM ??PM????GS?Jp4?[???`?^??,@??vGPo'??r???|G???
G??:???????=?f?xL?ck/?T??%l??gt?<e??dIfA;?????>	&g??B7?????????#L???=?,??9
??:???
Z?i?c?GW??9;?[k3?
B$?9?X#"????Bm??C?o?i??~V???#???#c???\??????z?^?q$]p??wwU??P?????VF???N.??a?$*?Pe?_?Y?'?
??L???+??8??
?Q?[????Z??n?,o#??MC??r`9v?nV???z?n??(??~???NV??w?V?_|?;c?Q?
??K}???k???????"KV????#???z6?$??`?????????	??:??kX?I?|?'t??t??0?W??H????d?Mf/n2P???:!?M??Z)?Q?t,?6T+?
>!V?{?,??P????^
????p??|[??g
VO?jx"??fm????\?????1????????`??
?k???^??b??V?u?UZG????a??@???o????
e??t??E??
,uLY'Y_l(????y??T3pPa????E????B??d?Zu
???q?????u??.??&??c??\???T??
?/LtKl??U-O???o?T?#M&E??J??YR(O"E'
a@?
A??	?c??????z?X?3V?+???]a?y@??R??dJ?%a??1?PyY?Lh]|????????A3??r??>???M3-???=???
W?:?`k?5?l?A??<?$^?T=?????9??????F???=
w->r?m?????nex,);?V??l?5c????v=|;?b????C??t?????^)D?o?]6>E??????5???c???d?B?|??Q=^?S?UX?????p?xb(??[tY_?[?<?QG??w??	"l?Z??^?
=F!/?????Dn^:??j??F??L?G??????????W?.>?FA&,x???=????[$??S.?le@??)??	_??? ???????$?_+D?{?C??????,t?'^???p??!p?@??I???/???q9V1Y????b?F?t<5????|
M?G?Lp2a???????$m?5T>??p??re?
,nn`??Z}???S.??+???????Q+j:Y??>0t?5????1???i????????)v??b????ia|Mv?CH?i???
??!=?????>???H?M?i??2??!?jY8i?q?m~?t?`L?nb?P?(x?^&J8?;???-X???W?Ym?m???T?d?
?x??&7? D(nI???T?86&|?
?Vcwt???R?A??au???[{9?????l?2?O??S
-??j???l????i????Y????.8??{x????*&??*?=GAv5?I????g??mX??,%M??}??
ht??e???????3??Pk???????Nn?*9"|?y??x??
w?1???s(LY??(:J?@#"???E4??:/W?8?=%?^?tx???>W+?`O??=???7????????`P?p
?
??p??m?w??%??Rj?9??yZ??????ob????{??269??????n?K?sG?0???5???6`?i?3??yj??$???
|}	????7/?M<???s??_^???&<??)\????<
a/?r5E?f?3.??j)H7
??=+??????/6X???8}?????????U\????
FH?\}1?4$???P?<?D--??tC?f$???S?DO[?<S????1=??x?
?N???VE???]?:?`u?r?9?`????i???????3????S???????~?3???i?}??????>'?,?l(V+?'??g0?}S????>??O?????2????8'??R'???{???wi?O
???Je?@jT??1??zP?d,,~.???-??QZ ?Co???????erG?X?1?????(YI?I~	&??????N??W?$ldc-D"BN????????.?}??o?I??'
??'A??J???C?????9=?on?I??a!4?????/
J0???t??DU?B
?L?I??????Kn?$?1??#I??|???C???A7????M?D??qaZ?JE%?K	|?'??f????Bh66?`???l?1\7?6??-2?????k???&=tCO????D]<tY?J????T???H?1'lrL????P??w;&lv$798????-??\!XMv?:#???T?P??? &??G??C?^?c???-?%[?H_?.????2??;???t?9?T?????5????j????l?0?#??.???z?w?e??Y??:????4??|6cS?8BO}?????5?U????v:?u???_&???z???
?c??/?n?????uF:k?E?1K??h???
"$??u???Zc?v3_?(???W~b$?C???T7??\?"? ?????V?Jd???R??W?M?l?kHD?}@%???FW?N?b23?ve;C???W??z<.(?K?M?????????/??%A;X?Qq? ???=Ft<???'????Y???
_?\??????^?Yoq?WKx?4/?}^?f2???S'r?K??zB5?????c%???d?????o???[L??95??
???-??,?~?
9\??5??&m.n??|??X??n?3?A???Sp?:??"??R?%4\-??ZRb???{B?)d?|?q?/?"?????=5????,???s?????E???]???5?'???e)??????????t???Sf??CQ??`P???Q?K?(???t~
????Z???+??K?ee???p?rH'	??X????D??>F?
?m??????a~L?+??d???????

?|?`??]?!??C?y?
R??7m??
e?N?@T????z??&??mt-???']????'??w?C??_?+M?d7?6]*?E?????vZdSJ?
%??x??!!`?(??????a*Wm??'???/??:??{????7;B????:D)]?t#
???????wD{[=\?Vj@?
???n????{??l????-????????t2??)?
Es??_:4??????p9L????#?#?????
??????&d@?V?????V???\???,^=35<??????U???w?;???+J??m????l????U???f?s??"3????D?Vp?????b6?`
????????%?????{E?+M??????l{'??[;1??inVh^i
=m????$`h'?K????C???at
eE?"??2
???veQ
?kJ?NLN?2?4^=? *\s?????m?}??2?/??	F~???
@F?d(?$???W???^
?]PC?*e?J??h?????j2vct?-B???7?_J??+???~C??t?>?~?|?_??A?K??*??:??]?;?v?!??????????
??H+??5?A?
3?'?l
=?????.j`??B?r??R?V#??b?A?????Xd???(I?? 1g&?U68SD?J?#T?7???Y|(N{t?????>??1????????8?S??B
??sM?M???u???????'??x
????5??????7%?j?V????*+E???? j??l?E?`???????P?3u?!?Tq@`	US"??C???$p???vQL?`y?
YgY??N????NF??d??u??nr???[v?m?c??????vq??tE?\wonz????????kI??0?h?kh,?,??>u?c??w????"???L?u????
7?K??6?i???t+?{?k???=????+?^???@o*???????Z^2????V?R_??*`?:?:??@??=<2m??c'??jv??????@?O????Fd?????~??A????i??8????F?????bTY??vQ???r?.>?,?????)??ej??G
\*?S?5??y? ??@5?d??R/WF
omg(?tP??J??{b??
;,?j?I]K??r?H`Z3??? b??Cr?/?&?<w???
?????X?2?WG;?99R?u?V?H?,???6Q?
x??a|?p??-?9????????Q?r?7???5?R`??? S???XMTX`?????x????"?
?s
??=??5?D?(4Wk???J@&??E?V1 ?~?$??m??htj?cod at Z@m???-D??,{????%?A?????j??????Q/??s?C??~Z?*m??:?UP?Ix?C\??&??2?9I??(???n???|?
y ?D?&_m???jBLA??s???	????+q????+z??)`?i'?Ht?w?2D??Z?lR?????t0??????x?D????Dd_????qN5???nx??A?????&g?O??? ?}?Y??
=??GS?7????8?*???l?;????A???A?????YBM'K??tI???WlS??<?\
-?(???J??k?N???x?~?z`L?MB?k???-w?????b???X`C????^}s??K$J-??=???,kB?2lun?o?<n??????7??????]?N????:????????nc7?4?k/t?o????????R,wj%???vo?A3y????rh_4??????	
????w??N!?/d??}.?l?[??)???????Ls/???#??????5?g?_??P???L59????-_?c??!9#?Zt?Tq
C??pw~?	+F??i?C?x??d20???<:Cs?tA???&f???????DG?p?????
?uZ??>O??o1?j??
2???j???^?z?>c?i|1?K<?H"????SJ???A?5?`t??	?5????~5?????.n?U?|????????I??Q?\?{?[/???8?*?m?J????s1???'???1/JnA???/E?%?@????F?tH?#"??4DA0???? ???9?o??0??T????
a4?:;??Ho??g???J???gP??wr(:??"??????,???k?.T?1??/?G?A?1C;\&???]??@dyK??B??^?)R??t?\?)qO????*?)_B!??[????%s>$)???s?(??#???
d+?G?O?,	2U??n0????cv??vi?Gy?+?a`?e?@?v?s?$0F??Y??-|X?????????????;???-?q???I???s2puh?7]Ve?K8?????,?3?5C??V?H,{????GF??d?^!??(n?????e??p????h?=x??]_`?T?)_-??Wq???????I???a%0?%vu???h?PN?k??{5?[H?@?y?????C????&??M??hI???,g_Yt%[??r?
??]?{???Bhv?vq????<4?k??:???>??Hp????L?
D??Ma?????ox?aN???????u???M?Q=w??(p?tu=?u???;?0D???VrC?i????????[??.?*w?????$?}????neyw?uw?u??n??}W?
ZFpeA??e?????????DA??"t??OY?.??????%=	?*?&????AY?y??zT?9R??i?
????V;???a~QU???:%C$???]?????|?w??qj6V?	
a???U?? W?U?~??^??E?'?u6???dk?I?xh?[?d?aD??X???7???7{???!
6!*H???oUi)AB?X??^?w?S6?	?:??~??O????N???M?v~?l???d?O!?????F?<?M?#C?C~5<???	?<
qd??S?d??#?$lVL?p??J-??+)???6??????Q???
Q?V????Q??AXgx??????U?n?fE????????@"	=?? Epn? ^7WAV?Jv9??z??W?E??!??Q?s??<H\??p?H^???????>??a2?????R??A?????:^??q??{??f=-z????L??%?	AI?ENnO???-?????[??7(?<2!?{_?x?P??i?zj
?8?????>?????s????uj??,2_??????3??????????u{???dB5E"P?E?)d?"??????U?B????n)b?0?<?W?P???o??&???n4?j?#?}	?u?=}?B?i?nu??8????}v?u?1?uQ????
??f=??#??$}[?;?]{P??0?td???C???
m 1??
?D?????f?{^??
?k2	A????F?yXMV3??c?????uw???F?Z_T????O/h??]P????)??v[?U??I??)2????p?	??)6Z.???h???D??Y??0???l??????.u?????Eh.isRm(
??dh????H?e??O??2:?n????<?
???J??{l?Xa4?-?
?_?2?G?rlK:'?a?f???Y?<????$R????^?
lk?v
?7???n?w??6??o"c
??1???-???a?????x??'+?Y?_?oT	u?i)v?????<Z~u.1Y???q??]?v????+	?????-??N?U?????Lr????|?bxf%???G??Ju~????U9>???


x??n?#mr???'?9???,????4Q???RxN;??5?-?2'?5I?D^L?w?C?`????o????-0??Hgx?-????Z??$??Bb ???m>???S???LP8??V????x?BD????U???4H3?2?3?#.????9+tDg??Q???v?]^??.O????????@U?a09B?\???????????????2??r???j?<f$?cAp????;KBuBk??w??n??7?'?3I???q?5?p{??6u?/???????nA?~???	.?`?&lezMVa??jQ???F?%B??y??????|??<&y?????D?$?bW?
\???!??9?OJ???E????Up???
h??W??GA$????Ij%=?u2?
?%Y
?????I???\?!????%???O
5B???(?E]?????b?b???)";r???????|?z??B?\Y??4?!??}G3?iIl?nt????}?K????A??O?x????!??/??F???#?D????mV?v*?????=T?[?????}5#???yj?????dt|?`<??*?h?i}3l?M?1Z?D?>?!?1n??nQ????????x?Z?z??]???????
?????????z?`?D??j?7?	?
@?9??w?,?????????Gq?(?-?M?+?Z?c??(u?v
?Z??yB???M????	?????)?A`Zk?;??I?e???
???v??n?|????-;??b>+Np5??????????[4]??I????|m?f{?
v??D?(dHG??'4D&P?t?BK	???P*:+??d??
wZ?2]??e?6OHXQ??
???Q?d???.4????????d????J???eg)?"?D?????L?????2gWU???Pu?U??n??R?_|??G?LVA?vI.;?;??dj
t?9&l?D??(?Zp????Ba?`
???????????=L?U?I^???>__??!o?"?6Q???????d???v?e???_???*??t??vq?Y?)K?6?D??m??1???
D???7Z??=??Jh?O????zQ?<??$????U??VB??Q?L??Z
?-k?;6??.f{?1r?y
;X$$(????H???g??0?fV?`!b??? >E?(??w???32t??ak?K?Z??>??i
?z'???"??v?;?~'??+?d?P+c?A@M?!??L???M?t?YN????G?=??????X<??????G<V?63S8`V???????N?J???	?? ????ZBPg?}?,|??"?????X??o?I???W?sj???`???-Sf??/????9?
{??f?eW?	V
??j-s??9?5??i}????g
??)?????????GS4?????j?.60f?m'???@z???2???$?N???	%???????j??=??????U?O?f?D??N?5?>de??G@?G0Z?O?2)??a?z<L????R??????.????J??Nh0??Xp??a
cd?.p??i??K??d?)?|d???????$lB(1?[??9C%c????@??/'?:!??!???y??:/???@?y?
????zv????H?U??Pr?3??
p?
??
?????oe*R?1f??????M?]+??Xu?g|'6???nm(2???Lh??W4????)}bG?=?5??v?YF????_?#?????K??$????-?^?7?W?dNz&?!??gah??.?&\?HHv?'???.??R????VM?paS???	g?@???q?N-???.?6?	????8??!MJ???32????????{i3??YYM(U???N{?????????	?????t9??????^P???{k???]????j,yZQ??b?3???????bm?JAz?/E??
A|Y??7_0@#???V??M??."??i%??)b??`?????*x???&o?Y?m?c???!/<f???=???????p??!z?,??n??U?}?J?/?8????p?$U!?CdLU9??????I??Y????6:/,w*?'????&%?U~S??????~????=Gy???B?L?????g????????U???????<?b>?`?
-???1 {?
???~?+??T?5[??$??*???b??? GA??z]P?r3????i?	???]L?B:??
A??D1?V{6??B?&K?\??,?R??????J`p?Y~1?d),??%?
?C??lc?G?.\?D????GN?b?U0???f[d?K?Y.c?0d?TC?N???w??C<?????B???~?A&d9??ox???????`+??>???????

????Q?????????!}?H???jS"09??%&T2?z#~??B??^?k?\?
~57??r??????@??????`?:C?uV??.??0xz]6?[	k?
?,???G??t???Jw[??[-|???%DV?iHA?????E??04??#"???o??]???????????&?\P?"~????Vfo~@?J.???z???Vt?kB???j???7V?L???a??????????.??7??#
%?2XQhE'/h?B?2????-I????sy??7rBs???
e?ND????x?VN?K??
????8?:??r?t?[??G?t???pQ^0-h=IMzJ?I
u?=w?&u????R?????;??g,?
?g?g2???w??&????2|V#B'???ZJ6??]??M?L???g??<#e:??|?s??t?????M~????Wc
?(?7????e???z????7?o??i?g????
{v?I?7??Ml`oN?qt?z??????Zf,??p?=????!??I??4;?8?}kaa??????0_?q0;??|?<?-?g?W??"?6C:????|?b'??gG.???h?	?
dB??X?$}??b?O.|?'?????gD?b?-?	??/?ex??U?X~??3?8???|X|?y`$???ozj?/W??
????z????\??)???O	
?92??^??_
-XRk?A3???C?n??W??X???"@?u????+????#c:o????b??_;?????gA??I?a??0?Ge??????}<?lFt<?(?Q???
?5_8h?k?yb??Pq??
?????J?bF3?hd?t1Jj?<G?p?U/(??&?:t??+??zz??i?K????????{.2	&`R?K???B,????!????T?@??}r-??1? z?VH??~??Yi?E??(?!?f???FuM1?t8?K
|t7d??f?ER1??ag??uHNT5???5J???eH??????`?e????HM?u<*?qF9hfT???p????????;??/uE??y?e9????A?}j5???6M??MLY??w?n??;o???>?J??f&?i7`2??0
J??*?*??d???z?;?h??0SJH??,)c
??/?!?,$??F?f ??P???l????CYJb???Z??L?,?2?l???r*r 7??gE????????i??k+?0??m|!?BTG????q??A???L????"??????7~ER?3 ?n?n?? ?0?|~?b?M?A??A]???q4?J????Ob??C????d:^?(&?YD?=?TADt??????+i????,n??w???}:'<E)p?Y{???C/?/Wi?
~???# E6*??X9?^??d?K?8(???? v?]3????c???
q?????{M??fM??m1U??]!?????NkD?0?E~q\/z??q?#?Fo?TqK??F ?D??R8H????3a*Stm^]?\5???i?ph?*?i???v?Fj?h??[ ?B?	?R&lL???	?4&(?\S??h?%NO?p????W|??.T?????zt??5?????????1??}?d??oVt???|AR?.????vLKv??
?[?????{Xy
??cYy???????8???!??"$S
????R???1?5???TN?C??f?k?F??`
??5L`O??a2L??C?2??//??Zj
<!??lcI?gM04??????%?Co?/m0????^W.???qK?5??B??\?? ??Xm_??F?IZ??&k?
[??J?gO??P?	'?eU	?zF?'???????k??I??|?C???????_`?W?s?s??L??.N??]?El??????g??S????
??????(9??C???c?C?X??g?3????K????d??Ot????? ?\?0?3?T???$?H?STbz
G?|?I?k??D???s?(Lu?)Z???+?g+??& ??h.???>?Y*?:?O?f??mh??????%]???????I?K[=??2???y?r?Xg???????z3K3'8?b at w1?Fbc?SC???)????.c?n*w?:???_<T}9lH??C=???^??E?EUHXE??k??f?g?2???d?b?????a?@?]?????:N?p?$??:?

???"??r?f?K??]???;J?'???1!?????!?j????|?Q?}??*?C'???>??G?\????~}???/j^??5??H?????E	?????iN#'??v!??	~ur?Ce???
???^?????E?????J?b??Tj?2Q???my??uC???J?dO?\??^}????k?>????+?@??????0o???U?y?^?.\?J[_?
??*?w{?t?5j?4?d???E}?A??}??E????????{?/?N?p????=I?(?/??A?C?>y??????`o
j5?*???C+????"]?F????????R"B?LU??*?U???PMU?AU?T?*"???T????w7??Oa?S???????'????????}??<?#sV?>w}j0????G?4 ?:?&?}Wu??q???3?a4???z?^?8y??<?0?2??D???l?????uD?N???? ?i???S???f>??? ?eW???|
!-?2??8??7??
	??%F???jb????X?c|
????n??'j??????7?iA?o^???$0?q_$s?z???o?????-??9A?~???@???m??S???*z?csu???????<?`MAT??\P???2??0]???,?H?nd????W?%??i?????????????BU??r??W???M??hN?{?>m????/,??}???;6???4dw???A??`\?)=am?????du??)k?J;?`N???????)??	VA????M ?}??a??sg??3eYDSp???#o????????????o?t1?[??
VL>O??v??AaG?@?N? 6?5T???xV?@??>&<??,?V??
??_0???&;?=?%??R???q??	UF???|=??No??	?"?}_d? ??dRc????s ???????x?c???U???
?N^??t???"??,???
N)????s????c??>?e?B??|y???O??u??Y?????X)?
N?
?0??:?v??)??SmJ???????Y??r?v3D{???B???q???]???U7?1??N??U.D??r?:{???@???hs??w???4???6
xK?T1$3e??|??3???EB??X???????b1?/?????2?=.??_??=??,?K???
Q????o???R?6??q?F???K?uI^?????IMu2d0???@L?/Q{.
2?????f?Z]??@?`?]K7?
{>?4???xF???A????I}?<????8?w?:?????Fa??`???
]???k=(?h??T??:?O??i??2?????S}??4?*?zE?.??,???7??,yO?g@
?
??:$?l?R}h]???.?z???#D????zl?-???w >????cmQ'???v?D??H3???w?:#3P?,??L>|&4??????'PEG??>m?OQ??{???WS8??w,6ZT??n?????L????n?\]???????jz/Z??dgg?GM?j]??m5???????1?????|t??
?? ??	6????f?"N{(?3J?????XX??y?&??GA\d?l5?%????7?'??_y??i7?????	?Dr???m????N?
X????~?i?$?EX??(?????;S?<?3?"ede(W?<M????(k?(???!a?3?j???S????;???p0.???&??e?	_l???,?h?7?#??o?d%??nh???????.E??SD????lNf/?YtD8?3i??7????G???a????'F????ka????A+??.?p?%?k??Ck?L?????bG?T?$???t? ???H|f5]???????$??[>%7??M????g??E3@???R??0<??&D??/?IF<5(['!F?^z1I?X#^-?]+i?pmq????
??Q?#?6???!,?_????
???D????????mb?????.k?;??}Q?_??@?'??3FXV????=??	',??L?HC??T9?	z?E??L?????t?????
)??-W?!???M&???[t"o??<YV?	??>k(??F?}??/2?????2_?????A???3B?x.?rI???+?~K?2Q????`???5t????&??<t???|???
?(?c?X?|?o?C?`?j?I???2"
??
?
???????p Nb????%L???+?^????H???s?P?????vO???HH"u??U?(ld???'62?R?Q?X?y?#6?????
??v4Em??YB&5?R??)??????
?F??M??????#m??E~o???_?'???&?4??]f}?T?s?"[?a???5F??E`?p?b??????PX?<t
???/_-?:?T???$?M?h:j??c?3T????;m?G??P0??|DG?n
7????=?$-?JzZ??y?J.
E???h???O??
B?B??????U9G.???o?????'?b??%?w|?Gwu??G`&?RRUeH??K?`2j??#?0??T???4???P-??$.?????q???<*F?U??p???c K?<d???Y????%??
?\x;???:j?????y???Ps??Ly????h????F<??Kpf
?????-b$XHOK??:
E:??2??e?fzZ1s?2N?Du?Q??`X????'????$!?cl?U? 1x???K????????2Ba~6sG???!#?J?@4??9?????a?~??????
???F???f??,???k??+Ldnx???o??M?}?*-?W?	?.???Z???dNHM?????h???!;??????^?t???43???<7#????IF??)=d|?0?E\,??,M?._?e?E}??@????P??a??BN??????t?t???.OK_??]=g
``????%?pq?%?(??\????u-z????j
f??<DK!?C?H?????s?+???MK`A??C????v?d?+?
W?e?b?$`??M???*???<"?6Yy2??iS?!??_<?sKTC?Z???????5:??c>P?y?A???(iK?+???eL?g.:??????t???_??[qH|?M'??>???+?+??9"???R?#??????+F?JA>
J??f3?l#?1q?6?9??6?4	t?;Y????F:),~F??]ub????s?&=?k??M%H?0Jb??{???!!ip????t1)?(f??nBO?[7??b?1????I???N?????>E??????_z?0?Z
??d??Y??z??1???{?L??@??@g?Rn6??_?'??`?Y?nj_??}iNA????u?Qr??s?^???\????Id?f "?K?m?w?e[??ml????gg?#??8???o[????x??2d?
.????F0?v?????Ae??5a??v??6Q?!????D????)?
????Sy?Xx?a?B???~???F$??]n??2V??HV?1??]????5lO]??S??C+??????'??<L+D?b?????H~??3nG????}O?F?v_?&???u\???]k?????e??:???4??$??
???YU-[7?=???	]6????N3?m3 at Y??LU??????Q??ZZD????'????z?)?=_p???M^????/c??n??L???)??33??????S~?k?T?MeS??????U????'?
:??}??A??!?u
N??X?T??!X??Q=A.?.??XRg[W"lBc`A??$????|??Dg]_"d?J?-?	?BZ??????w???
h?`??h?_CQ]mK?????(????(*?????G?n@?A=?{)???S?>????!??
?]???/??h?????pcI#?????;??~x3>??? h???O?XCa???N?E?I??'?a?1??=?O????r?"??k?B???mDB?5?Db??3?L?????>9>jvH8j?v?#????mJ?EqqQ &?.???M?x9??urq@??f?/3?M?JB????R?"W???3/F???????!|1???X?-???????QVb?*y???kT???t?"U*?;???X???????D-?MCQ??"?u???????7o??uHC??
Kh????[8?
U??	?? /??[O?????I???e5?????O????v?#??!??*a?>D5??1?m??+kL
>)??s???L???M
?9W?6e?aG?R???O??!?8/??Fv???$)c?lHM?
Z?$?snU???F?ZO.?_?????)?
Is???R??G?????JI????R????? p????={???{???B??P??{L????WG??7?e??\?zt??zS|U????[DW??7H?i?B?Ps?ZE:???f?4D?^> ???b??R????H??%m???jW at p?ap??\4?P?-b??hc%C??4?+???VFG?????oxNl?O??'`;???V???RA??
?,??????76???>9??^??????|1???a??w?(?;L??=G??n?}?<???a??????kB~??^~???????#??{v~?_?X^)?2?CE?@H*???YzS?	e???C]E,??\f?FL??C?8
QL${???%?^?Ch??[???????07>?}??hv[_?
??????????%?v?#????~;??oG???????Ic?
?!^????v???Qu???????m0??a???O$?Xd?%?2%????j?h?2?N{????)??+m????d??f?N??y]????;??????Ew?i???02??{?/??!*????a/N?X?k?{
???[7k`;??Z???Z,?_???&}???C?<9J R?Dy?????:<\?????bn^
???R??H7!@1F????X?:X??VH?
????C?
b;b/??;4?x?????C??
;?km????n????$X???i???_?\???'E?2??+?^????t?J?????!t?M!?DN?/A??f?O	?I??1,??*?N?#"?g????j@???xB?x??y3?m??????Z??,tu?"?Jr?y?r{?a?a?d??	????$w?????D??.???j:K?zH???d*?J?(?4[?$(/D??d?w?|b?tdY?????Z?;?Qh??QE????Zt+????J??0CG?E.????@I?-???E4F?&KS?A??????2??????M??P???P???<38?????lw????2?????b]??3?>?
????*???^F????????A???g?c7?4?KB??]?? ??K???H1?a??M|?tQ?c???
???d?6??
&;c/sdC?s?qC?Hz9S?v???]:d?'>]J???lA?a
?
w?JLFt???>w??yf??3?,;?d?v?O?
???A?
.?S[&?????u7??f???
;??+1a,??7&?|?K?w??(??	O?????8??i??(??
>#?C?????eA)~????????D?9??n(??'8????cjQ????5?F?N?Q fZl??A.a?p	,b#hrl???u1W?>????
?,^)?a$x????[??|?}??????(c?-p-a4r"??'xp?l??P???F?????i????V??(???	
?&????@?^jg???%r?????^m??P^*/Mh?Mhmf??Tl????w??/????e??8m??O??"?p/??????????E?_????j??~b??;&?^???d
[?? ?a???	?,?m8???}??????wd??XwLY?o.v???B2???(??]~Q:???)|?Il^-
]:??K??/}*M?F?P??
?U>??{?2dLpxS??puP?K?$???j??a??a???)
?;????X???Q???gS?tn??s5?5???L?L"?B?x??X??$T(??G?X` L?.5?F
B???S???#0????^???????\
??U?y??;?l???k??Iz?Jz!#??3qo8??l[h
d?+!????|[BQg?@?w?
?@?#??r=??F"?/`???60
F7??,@?????l,F8?i?qy??B?????
NP??M??????;]]?!l?w2?8}??	K???)5JOK??z????}?|h???	z]Y??ad??V:???&????4I?/??l,??X????6??i`?Gq!<?????4??Ok?q?'??1??T?
??Z?8? O??>????u????}?y??U???v?XC????{?????&?I":,x??????Zq??G+?K???pH?|.????MS???`?????Ft?FtX#?b?=?)?????j???>?? ??g?	/?????\5
8?N;?5?????s???????%?l
#Mi?5???|??$)_???E??&?"'??S???dY????!1rZ??????????#?*	vl ?.??B?g[s???,???}g?7???'Ht????0C???5??zd??/?$?i?-??RE*[??;9?h?a>2?6?0u-??	??0?s???xZW?ezt?)??W,0p7L0	?F???T?$???F??<??F?GOP???P????v??wc???B:c/C??.?}$?1????%?l??J????
%LL???"??xw?_?????\?<?
?????
W?U ?/v<?1rs?{??Q??G??
LK?dm?"??&?G??Kq9??so????????a?I@`???B???~?}B???U???dX{??LX??????R\??	?n7S???M?????g?w7}u???^
Y
o~-H??c?y?o?????A???&&??5?-??'JGR!?z?Y]eVw???????n{???+?????\?????%????s	???N9????y?h?:;&????w???t?A:
?_?w??nr?S??w=]????R?????U?R?\S??)??i?i?n??]?{;6`??5~/???H??4c*?as???~C:????>?~?0????}???$?R???v ?l",??]?Z??W	K#???jR????6h???"OQ?n??_??:?,V??b?m???EM? z???D>??=?
???>?h>????P????
y&?1O??%??>B?N?<?^??????T?D???? ?r????K ?40??=??nH7aK?nVX??j?.C????????9Y?6??f???I?
?lnB?ova.C?????v62??&???M?y?n????`@+?-??I+s ???fn??????????'?????????????/
{???~d?????B?Z??y?xt"??-m?j7?????_??????????V?????? k??a???JH?00/8?????~?$??5NP??Hi???_w??)?h9?6???VHbNw
?????C??~?_?h:?@nO??!+???.?C}?@R?Yt?q???x??????8????Q?L ???_???x?8??????????.?
TqTB??2??p?F?I???S????%4a?=?G?e??;t?c?B?y??w??+????O?
o-?V?????????^tB?n4?fm?Y[o~`???J??+^{?O?PO?xZ?2=??'?8?I???rZ?W??6B2?g????????/'???p38?N9Xh
Z?2^??{	?Q) ^+%?HO????@???q????Bt?s??W??=?D???'??1?	)H?????f??N??'q??(a???f?c?k
????b!L?
?J|P%??;??????>???~2dN?9?e*?D??[?H?$w??f*???K??t??WL?X ?r??
"?{???&\??VZ?????Q?X?r???C???+???k?`<cP?RM?A??????????O0?S???=y`?$?,g??D1???,??XL^&&p??+????5?????|'wm?RH?0#m~f???G??MSK\?b4?c{??7O??
+5(q?|t<e??B??)????H????%?}??zh?4?y?4
?\4/?v_????.Cy
???NV?$?]??[w??}??FrO6???{?j?>i!v??M-??kzj]?r???^{{$?????<?}j?N??
??8?X?r??5?z???_?????_4[??????=??(%RI???[4???u?JHu?=
Ro?
F?/	?o?S5?
X?^kr-@a?+??J}??$J???????i@|?'?????>???I??Rd?Mm?Y??]S at w+?S????????HoZ?]eO??~?????r?X\?.jt??V-???????A???7??:
?????_<??+?E6?9L
????`m??_`CX????m??"????}A???EN????????.z?????[(???L\
??n?9a??6?
??,fO??"???:nH8i??????o??t?r 5n???Y5v?b?????s???>?jFAz??:?@e?PgU?Y??`?????x?G?o???7m????t<??~`m?"w?????K?V??5??@KnGnv???e?2G_??^?@3?????5v
3?lZ???i???dE??i5B?;R?=???E??-???%O2S??(m?L??r
D?z+4??_?#?)?|?	Hz??:B?M	j?^??? r?G????5H?A8??CEw_B?^???-?3|[Y?+?Y?Z?lgE?CY?+?F??"?Z\?=??(?DP?"???+???~q??????]PB?U?=??=?V????? ???TH)??>??W???

??0??4???'p?K(?G??)6}?6??)?Dm?

YqH??K:AF???^7???BC?%T?n?6?P?[?kRw4????xz??Q3
?-cJ`?+??:?r?S??
?T,9ESS?????]OJ?LJG????????B?Q???n?7??Y??s??L?U???x????v8????q????ch:???	??n[.?q(??m;?!Z?^?K??,
K?T?7???O-5?$?0<?~'???????H?IS??????7.U???B"???1v?"J???M]!B?B??
w?y?????D0#ID???;??0?$B??z???,??|?gZ4??????<)?T?Y?(?M?z%?????=???6?]?6YF?t????5????SKK:-N??????x??A????a[?????+?x?5?????+??W??_??D?!N?&?3???c?
T???0
??4?Mf??3??b?~q?!y9k?1?
n???M3f~?n
'J?
?t7:?	???e!??	?????Y????*?X?;??R,??????V?o?9???*?
??'???0!5??D?BA+v/?& ?Z?"_??tv????Mp{?A?bR?7Z?	???u???!
?????	0?R??\?k?U???9?X?z????t??V??WK??b???'=?/?
G???[?????#?U??!?1??r???u9m
e?&ps?AW?~5?~?~?/M?V????S??a?%?:O?8 at F'z?'A??$?]?{??X?e?s#o?4?T
??f$S?t??P????9???.#?&????Z?4????E??E???'$?n?~???)?
o?q??$!p[C]?8D?J:~h??	p6??n???s!????gO??.?:???0??U?,???????S;???[&s
i	??QP?2o%?&?\q??<?????/?]???U?~??a#????W??;?N??P?fKX?axRk
N???????H??z?;???????????J@

??<???V???'????R??bq??NV'?????~_????f\???&Pgt:?M?V?f?q?OSh{j??[?~????%6?Y??([????"o???b????Y?gE??? }S?T<qNqx???j%??.a?03?JC|z?,?<????
?W?-???\P???]??&?M?]X+?D????l????????K3?+Ij
??2,??QZ5B????T??~????/???OD?'?;?}?=}????????a??2?e???`YOP?
?????;?&Sxh?JIL9??o??Q??h?{?c?X_??
PK
??^???????5?????/-?????+??)????
??Zp??????M??F?.???W?_PK

	??rO??Z?d???????o??????4,?WzPK














From than at fedoraproject.org  Wed Sep 24 12:19:36 2008
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 24 Sep 2008 12:19:36 +0000 (UTC)
Subject: rpms/kdesdk/F-9 kdesdk-4.1.1-quit.patch, NONE, 1.1 kdesdk.spec,
	1.103, 1.104
Message-ID: <20080924121936.1B5FC70103@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdesdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9283

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-4.1.1-quit.patch 
Log Message:
show quit in the menu


kdesdk-4.1.1-quit.patch:

--- NEW FILE kdesdk-4.1.1-quit.patch ---
diff -up kdesdk-4.1.1/lokalize/src/kaider.cpp.orig kdesdk-4.1.1/lokalize/src/kaider.cpp
--- kdesdk-4.1.1/lokalize/src/kaider.cpp.orig	2008-09-24 12:23:07.000000000 +0200
+++ kdesdk-4.1.1/lokalize/src/kaider.cpp	2008-09-24 12:18:31.000000000 +0200
@@ -221,11 +221,11 @@ void KAider::setupActions()
     connect (_catalog,SIGNAL(cleanChanged(bool)),action,SLOT(setDisabled(bool)));
     connect (_catalog,SIGNAL(cleanChanged(bool)),this,SLOT(setModificationSign(bool)));
     action = KStandardAction::saveAs(this, SLOT(fileSaveAs()), ac);
-    //action = KStandardAction::quit(qApp, SLOT(quit()), ac);
-    //action->setText(i18nc("@action:inmenu","Close all Lokalize windows"));
+    action = KStandardAction::quit(qApp, SLOT(quit()), ac);
+    action->setText(i18nc("@action:inmenu","Close all Lokalize windows"));
 
-    //KStandardAction::quit(kapp, SLOT(quit()), ac);
-    //KStandardAction::quit(this, SLOT(deleteLater()), ac);
+    KStandardAction::quit(kapp, SLOT(quit()), ac);
+    KStandardAction::quit(this, SLOT(deleteLater()), ac);
 
 
 //Settings


Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-9/kdesdk.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- kdesdk.spec	29 Aug 2008 19:32:29 -0000	1.103
+++ kdesdk.spec	24 Sep 2008 12:19:05 -0000	1.104
@@ -1,7 +1,7 @@
 
 Name:           kdesdk
 Version:        4.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -9,6 +9,8 @@
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+# upstream patches
+Patch100:       kdesdk-4.1.1-quit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kde-filesystem >= 4
@@ -87,6 +89,8 @@
 %prep
 %setup -q
 
+# upstream patches
+%patch100 -p1 -b .quit
 
 %build
 mkdir -p %{_target_platform}
@@ -216,6 +220,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Than Ngo <than at redhat.com> 4.1.1-2
+- show quit in the menu
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 



From corsepiu at fedoraproject.org  Wed Sep 24 12:39:54 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Wed, 24 Sep 2008 12:39:54 +0000 (UTC)
Subject: rpms/lib3ds/devel lib3ds.spec,1.19,1.20
Message-ID: <20080924123954.1FD7670103@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/lib3ds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12025

Modified Files:
	lib3ds.spec 
Log Message:
clog


Index: lib3ds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lib3ds/devel/lib3ds.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- lib3ds.spec	7 Jul 2008 18:53:56 -0000	1.19
+++ lib3ds.spec	24 Sep 2008 12:39:23 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           lib3ds
 Version:        1.3.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        3D Studio file format library
 
@@ -63,10 +63,10 @@
 
 %prep
 %setup -q
-%patch -p1 -P 2
+%patch2 -p1
 
 %if 0%{?fedora} < 9
-%patch -p1 -P 3
+%patch2 -p1
 %endif
 
 %build
@@ -123,6 +123,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Wed Sep 24 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.3.0-4
+- Work around rpmbuild having stopped supporting %%patch -P N.
+
 * Mon Jul  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3.0-3
 - fix conditional comparison
 



From kwizart at fedoraproject.org  Wed Sep 24 12:41:18 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Wed, 24 Sep 2008 12:41:18 +0000 (UTC)
Subject: rpms/perl-Log-TraceMessages/devel import.log, NONE,
	1.1 perl-Log-TraceMessages.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080924124118.79C2370103@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-Log-TraceMessages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12045/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Log-TraceMessages.spec 
Log Message:
Initial import for Rawhide



--- NEW FILE import.log ---
perl-Log-TraceMessages-1_4-1_fc8_kwizart:HEAD:perl-Log-TraceMessages-1.4-1.fc8.kwizart.src.rpm:1222259936


--- NEW FILE perl-Log-TraceMessages.spec ---
Name:           perl-Log-TraceMessages
Version:        1.4
Release:        1%{?dist}
Summary:        Perl extension for trace messages used in debugging

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/Log-TraceMessages/
Source0:        http://www.cpan.org/modules/by-module/Log/Log-TraceMessages-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(HTML::FromText) >= 1.004
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module is a better way of putting 'hello there' trace messages in
your code.  It lets you turn tracing on and off without commenting out
trace statements, and provides other useful things like HTML-ified
trace messages for CGI scripts and an easy way to trace out data
structures using Data::Dumper.


%prep
%setup -q -n Log-TraceMessages-%{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 README
%{perl_vendorlib}/Log/
%{perl_vendorlib}/auto/*
%{_mandir}/man3/*.3*


%changelog
* Thu Jul 31 2008 kwizart < kwizart at gmail.com > - 1.4-1
- Initial package for Fedora



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-TraceMessages/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2008 08:56:04 -0000	1.1
+++ .cvsignore	24 Sep 2008 12:40:48 -0000	1.2
@@ -0,0 +1 @@
+Log-TraceMessages-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-TraceMessages/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2008 08:56:04 -0000	1.1
+++ sources	24 Sep 2008 12:40:48 -0000	1.2
@@ -0,0 +1 @@
+77687c9858a476628f0299cf4f29c727  Log-TraceMessages-1.4.tar.gz



From kwizart at fedoraproject.org  Wed Sep 24 12:52:20 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Wed, 24 Sep 2008 12:52:20 +0000 (UTC)
Subject: rpms/perl-Log-TraceMessages/F-9 perl-Log-TraceMessages.spec, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20080924125220.7EE0E70103@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-Log-TraceMessages/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13851

Modified Files:
	sources 
Added Files:
	perl-Log-TraceMessages.spec 
Log Message:
Initial import for F-9



--- NEW FILE perl-Log-TraceMessages.spec ---
Name:           perl-Log-TraceMessages
Version:        1.4
Release:        1%{?dist}
Summary:        Perl extension for trace messages used in debugging

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/Log-TraceMessages/
Source0:        http://www.cpan.org/modules/by-module/Log/Log-TraceMessages-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(HTML::FromText) >= 1.004
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module is a better way of putting 'hello there' trace messages in
your code.  It lets you turn tracing on and off without commenting out
trace statements, and provides other useful things like HTML-ified
trace messages for CGI scripts and an easy way to trace out data
structures using Data::Dumper.


%prep
%setup -q -n Log-TraceMessages-%{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 README
%{perl_vendorlib}/Log/
%{perl_vendorlib}/auto/*
%{_mandir}/man3/*.3*


%changelog
* Thu Jul 31 2008 kwizart < kwizart at gmail.com > - 1.4-1
- Initial package for Fedora



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-TraceMessages/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2008 08:56:04 -0000	1.1
+++ sources	24 Sep 2008 12:51:50 -0000	1.2
@@ -0,0 +1 @@
+77687c9858a476628f0299cf4f29c727  Log-TraceMessages-1.4.tar.gz



From kwizart at fedoraproject.org  Wed Sep 24 12:53:38 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Wed, 24 Sep 2008 12:53:38 +0000 (UTC)
Subject: rpms/perl-Log-TraceMessages/F-8 perl-Log-TraceMessages.spec, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20080924125338.6D24170103@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-Log-TraceMessages/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14007

Modified Files:
	sources 
Added Files:
	perl-Log-TraceMessages.spec 
Log Message:
Initial import for F-8



--- NEW FILE perl-Log-TraceMessages.spec ---
Name:           perl-Log-TraceMessages
Version:        1.4
Release:        1%{?dist}
Summary:        Perl extension for trace messages used in debugging

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/Log-TraceMessages/
Source0:        http://www.cpan.org/modules/by-module/Log/Log-TraceMessages-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(HTML::FromText) >= 1.004
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module is a better way of putting 'hello there' trace messages in
your code.  It lets you turn tracing on and off without commenting out
trace statements, and provides other useful things like HTML-ified
trace messages for CGI scripts and an easy way to trace out data
structures using Data::Dumper.


%prep
%setup -q -n Log-TraceMessages-%{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 README
%{perl_vendorlib}/Log/
%{perl_vendorlib}/auto/*
%{_mandir}/man3/*.3*


%changelog
* Thu Jul 31 2008 kwizart < kwizart at gmail.com > - 1.4-1
- Initial package for Fedora



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-TraceMessages/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2008 08:56:04 -0000	1.1
+++ sources	24 Sep 2008 12:53:08 -0000	1.2
@@ -0,0 +1 @@
+77687c9858a476628f0299cf4f29c727  Log-TraceMessages-1.4.tar.gz



From corsepiu at fedoraproject.org  Wed Sep 24 13:14:09 2008
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Wed, 24 Sep 2008 13:14:09 +0000 (UTC)
Subject: rpms/lib3ds/devel lib3ds.spec,1.20,1.21
Message-ID: <20080924131409.8601C70103@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/lib3ds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16698

Modified Files:
	lib3ds.spec 
Log Message:
* Wed Sep 24 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.3.0-5
- Fix silly typo in previous change.



Index: lib3ds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lib3ds/devel/lib3ds.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- lib3ds.spec	24 Sep 2008 12:39:23 -0000	1.20
+++ lib3ds.spec	24 Sep 2008 13:13:39 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           lib3ds
 Version:        1.3.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        3D Studio file format library
 
@@ -66,7 +66,7 @@
 %patch2 -p1
 
 %if 0%{?fedora} < 9
-%patch2 -p1
+%patch3 -p1
 %endif
 
 %build
@@ -123,6 +123,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Wed Sep 24 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.3.0-5
+- Fix silly typo in previous change.
+
 * Wed Sep 24 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.3.0-4
 - Work around rpmbuild having stopped supporting %%patch -P N.
 



From adrian at fedoraproject.org  Wed Sep 24 13:17:02 2008
From: adrian at fedoraproject.org (Adrian Reber)
Date: Wed, 24 Sep 2008 13:17:02 +0000 (UTC)
Subject: rpms/jhead/devel jhead-makefile.patch,1.1,1.2 jhead.spec,1.20,1.21
Message-ID: <20080924131702.640F770103@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/jhead/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17224

Modified Files:
	jhead-makefile.patch jhead.spec 
Log Message:
* Wed Sep 24 2008 Adrian Reber <adrian at lisas.de> - 2.82-2
- rebased makefile patch


jhead-makefile.patch:

Index: jhead-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/jhead/devel/jhead-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jhead-makefile.patch	8 Nov 2004 04:37:02 -0000	1.1
+++ jhead-makefile.patch	24 Sep 2008 13:17:02 -0000	1.2
@@ -1,11 +1,20 @@
---- makefile.save	2004-10-13 20:39:03.744659640 +0200
-+++ makefile	2004-10-13 20:39:34.955914808 +0200
-@@ -9,7 +9,7 @@
- objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/exif.o $(OBJ)/makernote.o
+diff --git a/makefile b/makefile
+index 6549678..38d2371 100644
+--- a/makefile
++++ b/makefile
+@@ -3,13 +3,14 @@
+ #--------------------------------
+ OBJ=.
+ SRC=.
++CFLAGS?= -O3
+ 
+ all: jhead
+ 
+ objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/exif.o $(OBJ)/iptc.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o 
  
  $(OBJ)/%.o:$(SRC)/%.c
 -	${CC} -O3 -Wall -c $< -o $@
-+	${CC} ${CFLAGS} -Wall -c $< -o $@
++	${CC} $(CFLAGS) -Wall -c $< -o $@
  
  jhead: $(objs) jhead.h
  	${CC} -o jhead $(objs) -lm


Index: jhead.spec
===================================================================
RCS file: /cvs/extras/rpms/jhead/devel/jhead.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jhead.spec	5 Apr 2008 11:47:58 -0000	1.20
+++ jhead.spec	24 Sep 2008 13:17:02 -0000	1.21
@@ -1,6 +1,6 @@
 Name: jhead
 Version: 2.82
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Tool for displaying EXIF data embedded in JPEG images
 Group: Applications/Multimedia
 License: Public Domain
@@ -15,7 +15,7 @@
 
 %prep
 %setup -q
-%patch0
+%patch0 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
@@ -37,6 +37,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Sep 24 2008 Adrian Reber <adrian at lisas.de> - 2.82-2
+- rebased makefile patch
+
 * Sat Apr 05 2008 Adrian Reber <adrian at lisas.de> - 2.82-1
 - updated to 2.82
 



From pvrabec at fedoraproject.org  Wed Sep 24 13:26:49 2008
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Wed, 24 Sep 2008 13:26:49 +0000 (UTC)
Subject: rpms/shadow-utils/devel shadow-4.1.2-checkName.patch, NONE,
	1.1 shadow-4.1.2-gmNoGroup.patch, NONE, 1.1 shadow-utils.spec,
	1.122, 1.123
Message-ID: <20080924132649.4269670103@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/shadow-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18488

Modified Files:
	shadow-utils.spec 
Added Files:
	shadow-4.1.2-checkName.patch shadow-4.1.2-gmNoGroup.patch 
Log Message:
- groupmems: check username for valid character (#455603)
- groupmems: don't segfault on nonexistent group (#456088)


shadow-4.1.2-checkName.patch:

--- NEW FILE shadow-4.1.2-checkName.patch ---
diff -up shadow-4.1.2/src/groupmems.c.checkName shadow-4.1.2/src/groupmems.c
--- shadow-4.1.2/src/groupmems.c.checkName	2008-09-24 11:17:02.000000000 +0200
+++ shadow-4.1.2/src/groupmems.c	2008-09-24 14:03:01.000000000 +0200
@@ -43,6 +43,7 @@
 #include <pwd.h>
 #include "defines.h"
 #include "groupio.h"
+#include "chkname.h"
 
 /* Exit Status Values */
 
@@ -54,6 +55,7 @@
 #define EXIT_NOT_PRIMARY	5	/* not primary owner of group  */
 #define EXIT_NOT_MEMBER		6	/* member of group does not exist */
 #define EXIT_MEMBER_EXISTS	7	/* member of group already exists */
+#define E_BAD_ARG		8       /* invalid argument to option */
 
 #define TRUE 1
 #define FALSE 0
@@ -225,6 +227,12 @@ int main (int argc, char **argv) 
 		usage ();
 	}
 
+        /* check if user names is valid */
+	if ( adduser && !check_user_name (adduser)) {
+	        fprintf (stderr, _("%s is not a valid user name\n"), adduser);
+	        exit (E_BAD_ARG);
+	}
+
 	if (!isroot () && NULL != thisgroup) {
 		fputs (_("Only root can add members to different groups\n"),
 		       stderr);

shadow-4.1.2-gmNoGroup.patch:

--- NEW FILE shadow-4.1.2-gmNoGroup.patch ---
diff -up shadow-4.1.2/src/groupmems.c.gmNoGroup shadow-4.1.2/src/groupmems.c
--- shadow-4.1.2/src/groupmems.c.gmNoGroup	2008-09-24 15:00:30.000000000 +0200
+++ shadow-4.1.2/src/groupmems.c	2008-09-24 15:07:20.000000000 +0200
@@ -56,6 +56,7 @@
 #define EXIT_NOT_MEMBER		6	/* member of group does not exist */
 #define EXIT_MEMBER_EXISTS	7	/* member of group already exists */
 #define E_BAD_ARG		8       /* invalid argument to option */
+#define EXIT_NOT_GROUP		8	/* group does not exist */
 
 #define TRUE 1
 #define FALSE 0
@@ -293,6 +294,10 @@ int main (int argc, char **argv) 
 	}
 
 	grp = (struct group *) gr_locate (name);
+	if (NULL == grp) {
+		fputs (_("Specified group does not exist\n"), stderr);
+		exit (EXIT_NOT_GROUP);
+	}
 
 	if (NULL != adduser) {
 		grp->gr_mem = addtogroup (adduser, grp->gr_mem);


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- shadow-utils.spec	11 Sep 2008 11:47:39 -0000	1.122
+++ shadow-utils.spec	24 Sep 2008 13:26:18 -0000	1.123
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.1.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
 Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2
@@ -19,6 +19,8 @@
 Patch4: shadow-4.1.2-gmSEGV.patch
 Patch5: shadow-4.1.2-audit.patch
 Patch6: shadow-4.1.1-selinuxUserMappings.patch
+Patch7: shadow-4.1.2-checkName.patch
+Patch8: shadow-4.1.2-gmNoGroup.patch
 
 License: BSD
 Group: System Environment/Base
@@ -50,6 +52,8 @@
 %patch4 -p1 -b .gmSEGV
 %patch5 -p1 -b .audit
 %patch6 -p1 -b .selinuxUserMappings
+%patch7 -p1 -b .checkName
+%patch8 -p1 -b .gmNoGroup
 
 
 rm po/*.gmo
@@ -190,6 +194,10 @@
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Wed Sep 24 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-8
+- groupmems: check username for valid character (#455603)
+- groupmems: don't segfault on nonexistent group (#456088)
+
 * Thu Sep 11 2008 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-7
 - fix usermod SELinux user mappings change (#458766)
 



From veillard at fedoraproject.org  Wed Sep 24 13:30:00 2008
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Wed, 24 Sep 2008 13:30:00 +0000 (UTC)
Subject: rpms/libvirt/F-9 python_make.patch,NONE,1.1 libvirt.spec,1.92,1.93
Message-ID: <20080924133000.7518970103@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18842

Modified Files:
	libvirt.spec 
Added Files:
	python_make.patch 
Log Message:
- a subtle bug in python submakefile broke the 0.4.6-1.fc9 build #463733
daniel


python_make.patch:

--- NEW FILE python_make.patch ---
Index: python/Makefile.am
===================================================================
RCS file: /data/cvs/libxen/python/Makefile.am,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile.am
--- python/Makefile.am	5 Feb 2008 19:27:37 -0000	1.13
+++ python/Makefile.am	24 Sep 2008 13:21:06 -0000
@@ -50,7 +50,7 @@ GENERATED= libvirt-export.c \
 $(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
 	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
 
-libvirt.py: $(srcdir)/libvir.py libvirtclass.py
+libvirt.py: $(srcdir)/libvir.py $(GENERATED)
 	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
 	mv $@-t $@
 
*** python/Makefile.in.orig	2008-09-24 15:19:20.000000000 +0200
--- python/Makefile.in	2008-09-24 15:20:07.000000000 +0200
*************** uninstall-am: uninstall-local uninstall-
*** 1027,1033 ****
  @WITH_PYTHON_TRUE@$(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
  @WITH_PYTHON_TRUE@	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
  
! @WITH_PYTHON_TRUE at libvirt.py: $(srcdir)/libvir.py libvirtclass.py
  @WITH_PYTHON_TRUE@	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
  @WITH_PYTHON_TRUE@	mv $@-t $@
  
--- 1027,1033 ----
  @WITH_PYTHON_TRUE@$(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
  @WITH_PYTHON_TRUE@	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
  
! @WITH_PYTHON_TRUE at libvirt.py: $(srcdir)/libvir.py $(GENERATED)
  @WITH_PYTHON_TRUE@	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
  @WITH_PYTHON_TRUE@	mv $@-t $@
  


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-9/libvirt.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- libvirt.spec	24 Sep 2008 07:36:24 -0000	1.92
+++ libvirt.spec	24 Sep 2008 13:29:30 -0000	1.93
@@ -30,10 +30,11 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.4.6
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
+Patch0: python_make.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
@@ -147,6 +148,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %if ! %{with_xen}
@@ -302,6 +304,9 @@
 %doc docs/examples/python
 
 %changelog
+* Wed Sep 24 2008 Daniel Veillard <veillard at redhat.com> - 0.4.6-2.fc9
+- a subtle bug in python submakefile broke the 0.4.6-1.fc9 build #463733
+
 * Wed Sep 24 2008 Daniel Veillard <veillard at redhat.com> - 0.4.6-1.fc9
 - upstream release 0.4.6
 - fixes a couple of serious bugs in the previous release



From veillard at fedoraproject.org  Wed Sep 24 13:34:50 2008
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Wed, 24 Sep 2008 13:34:50 +0000 (UTC)
Subject: rpms/libvirt/devel python_make.patch, NONE, 1.1 libvirt.spec, 1.100,
	1.101
Message-ID: <20080924133450.A861D70103@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19457

Modified Files:
	libvirt.spec 
Added Files:
	python_make.patch 
Log Message:
- apply the python makefile patch for #463733
daniel


python_make.patch:

--- NEW FILE python_make.patch ---
Index: python/Makefile.am
===================================================================
RCS file: /data/cvs/libxen/python/Makefile.am,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile.am
--- python/Makefile.am	5 Feb 2008 19:27:37 -0000	1.13
+++ python/Makefile.am	24 Sep 2008 13:21:06 -0000
@@ -50,7 +50,7 @@ GENERATED= libvirt-export.c \
 $(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
 	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
 
-libvirt.py: $(srcdir)/libvir.py libvirtclass.py
+libvirt.py: $(srcdir)/libvir.py $(GENERATED)
 	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
 	mv $@-t $@
 
*** python/Makefile.in.orig	2008-09-24 15:19:20.000000000 +0200
--- python/Makefile.in	2008-09-24 15:20:07.000000000 +0200
*************** uninstall-am: uninstall-local uninstall-
*** 1027,1033 ****
  @WITH_PYTHON_TRUE@$(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
  @WITH_PYTHON_TRUE@	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
  
! @WITH_PYTHON_TRUE at libvirt.py: $(srcdir)/libvir.py libvirtclass.py
  @WITH_PYTHON_TRUE@	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
  @WITH_PYTHON_TRUE@	mv $@-t $@
  
--- 1027,1033 ----
  @WITH_PYTHON_TRUE@$(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
  @WITH_PYTHON_TRUE@	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
  
! @WITH_PYTHON_TRUE at libvirt.py: $(srcdir)/libvir.py $(GENERATED)
  @WITH_PYTHON_TRUE@	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
  @WITH_PYTHON_TRUE@	mv $@-t $@
  


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- libvirt.spec	24 Sep 2008 07:19:01 -0000	1.100
+++ libvirt.spec	24 Sep 2008 13:34:20 -0000	1.101
@@ -34,10 +34,11 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.4.6
-Release: 2%{?dist}%{?extra_release}
+Release: 3%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
+Patch0: python_make.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
@@ -159,6 +160,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %if ! %{with_xen}
@@ -394,6 +396,9 @@
 %endif
 
 %changelog
+* Wed Sep 24 2008 Daniel Veillard <veillard at redhat.com> - 0.4.6-3.fc10
+- apply the python makefile patch for #463733
+
 * Wed Sep 24 2008 Daniel Veillard <veillard at redhat.com> - 0.4.6-2.fc10
 - upstream release 0.4.6
 - fixes some problems with 0.4.5



From afb at fedoraproject.org  Wed Sep 24 13:42:33 2008
From: afb at fedoraproject.org (=?utf-8?q?Anders_F_Bj=C3=B6rklund?=)
Date: Wed, 24 Sep 2008 13:42:33 +0000 (UTC)
Subject: rpms/slim/devel slim-1.3.0-fedora.patch, NONE,
	1.1 slim-1.3.0-usexwd.patch, NONE, 1.1 slim.spec, 1.7,
	1.8 slim-1.2.6-fedora.patch, 1.1, NONE slim-1.2.6-usexwd.patch,
	1.1, NONE
Message-ID: <20080924134233.BF63970103@cvs1.fedora.phx.redhat.com>

Author: afb

Update of /cvs/pkgs/rpms/slim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20811

Modified Files:
	slim.spec 
Added Files:
	slim-1.3.0-fedora.patch slim-1.3.0-usexwd.patch 
Removed Files:
	slim-1.2.6-fedora.patch slim-1.2.6-usexwd.patch 
Log Message:
fix patch fuzz

slim-1.3.0-fedora.patch:

--- NEW FILE slim-1.3.0-fedora.patch ---
--- slim-1.3.0/slim.conf.orig	2007-05-07 10:01:02.000000000 +0200
+++ slim-1.3.0/slim.conf	2007-05-13 23:55:18.000000000 +0200
@@ -7,7 +7,7 @@
 # Commands for halt, login, etc.
 halt_cmd            /sbin/shutdown -h now
 reboot_cmd          /sbin/shutdown -r now
-console_cmd         /usr/X11R6/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login"
+console_cmd         /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue | sed -e 's/\\\\r/`uname -r`/' -e 's/\\\\m/`uname -m`/'; exec /bin/login"
 #suspend_cmd        /usr/sbin/suspend
 
 # Full path to the xauth binary
@@ -33,7 +33,7 @@ authfile           /var/run/slim.auth
 # to adjust the command according to your preferred shell,
 # i.e. for freebsd use:
 # login_cmd           exec /bin/sh - ~/.xinitrc %session
-login_cmd           exec /bin/bash -login ~/.xinitrc %session
+login_cmd           if [ -r ~/.xinitrc ]; then exec /bin/bash -login ~/.xinitrc %session; else PREFERRED=%session exec /bin/bash -login /etc/X11/xinit/xinitrc; fi
 
 # Commands executed when starting and exiting a session.
 # They can be used for registering a X11 session with

slim-1.3.0-usexwd.patch:

--- NEW FILE slim-1.3.0-usexwd.patch ---
diff -up slim-1.3.0/slim.conf.orig slim-1.3.0/slim.conf
--- slim-1.3.0/slim.conf.orig	2007-07-15 16:09:28.000000000 +0200
+++ slim-1.3.0/slim.conf	2008-09-24 15:32:17.000000000 +0200
@@ -54,7 +54,8 @@ login_cmd           exec /bin/bash -logi
 sessions            xfce4,icewm,wmaker,blackbox
 
 # Executed when pressing F11 (requires imagemagick)
-screenshot_cmd      import -window root /slim.png
+#screenshot_cmd      import -window root /slim.png
+screenshot_cmd      xwd -root > /slim.xwd
 
 # welcome message. Available variables: %host, %domain
 welcome_msg         Welcome to %host


Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/devel/slim.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- slim.spec	19 May 2008 15:19:32 -0000	1.7
+++ slim.spec	24 Sep 2008 13:42:03 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.3.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -15,8 +15,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         slim-1.3.0-make.patch
-Patch1:         slim-1.2.6-usexwd.patch
-Patch2:         slim-1.2.6-fedora.patch
+Patch1:         slim-1.3.0-usexwd.patch
+Patch2:         slim-1.3.0-fedora.patch
 Patch3:         slim-1.3.0-strtol.patch
 
 BuildRequires:  libXmu-devel libXft-devel libXrender-devel
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Anders F Bjorklund <afb at users.sourceforge.net> 1.3.0-6
+- fix patch fuzz
+
 * Fri May 16 2008 Anders F Bjorklund <afb at users.sourceforge.net> 1.3.0-5
 - all the images are now in desktop-backgrounds-basic
 


--- slim-1.2.6-fedora.patch DELETED ---


--- slim-1.2.6-usexwd.patch DELETED ---



From silfreed at fedoraproject.org  Wed Sep 24 13:48:27 2008
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Wed, 24 Sep 2008 13:48:27 +0000 (UTC)
Subject: rpms/pytrainer/devel .cvsignore, 1.2, 1.3 pytrainer.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <20080924134827.9BC6B70103@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/pytrainer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21649

Modified Files:
	.cvsignore pytrainer.spec sources 
Log Message:
* Mon Sep 15 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-1
- updating to 1.6.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jul 2008 14:41:34 -0000	1.2
+++ .cvsignore	24 Sep 2008 13:47:57 -0000	1.3
@@ -1 +1 @@
-pytrainer-1.5.0.0.1.tar.gz
+pytrainer-1.6.0.5.tar.gz


Index: pytrainer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/devel/pytrainer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pytrainer.spec	25 Jul 2008 17:24:07 -0000	1.5
+++ pytrainer.spec	24 Sep 2008 13:47:57 -0000	1.6
@@ -5,8 +5,8 @@
 %define xulrunner_pkgver %{xulrunner_ver}.0.1
 
 Name: pytrainer
-Version: 1.5.0.0.1
-Release: 6%{?dist}
+Version: 1.6.0.5
+Release: 1%{?dist}
 Summary: A tool to log all your sport excursions
 
 Group: Development/Languages
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-1
+- updating to 1.6.0.5
+
 * Mon Jul 07 2008 Douglas E. Warner <silfreed at silfreed.net> 1.5.0.0.1-6
 - bumping xulrunner dep to 1.9.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jul 2008 14:41:34 -0000	1.2
+++ sources	24 Sep 2008 13:47:57 -0000	1.3
@@ -1 +1 @@
-9165d6a04a5293f900d1e2940ac0214d  pytrainer-1.5.0.0.1.tar.gz
+0c1f6fd49456e901d22ce47d95dffedd  pytrainer-1.6.0.5.tar.gz



From silfreed at fedoraproject.org  Wed Sep 24 13:53:27 2008
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Wed, 24 Sep 2008 13:53:27 +0000 (UTC)
Subject: rpms/pytrainer/F-9 .cvsignore, 1.2, 1.3 pytrainer.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20080924135327.7AA017013D@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/pytrainer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22323

Modified Files:
	.cvsignore pytrainer.spec sources 
Log Message:
* Mon Sep 15 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-1
- updating to 1.6.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jul 2008 14:47:51 -0000	1.2
+++ .cvsignore	24 Sep 2008 13:52:57 -0000	1.3
@@ -1 +1 @@
-pytrainer-1.5.0.0.1.tar.gz
+pytrainer-1.6.0.5.tar.gz


Index: pytrainer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/F-9/pytrainer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pytrainer.spec	21 Jul 2008 18:42:23 -0000	1.4
+++ pytrainer.spec	24 Sep 2008 13:52:57 -0000	1.5
@@ -5,8 +5,8 @@
 %define xulrunner_pkgver %{xulrunner_ver}.0.1
 
 Name: pytrainer
-Version: 1.5.0.0.1
-Release: 5%{?dist}
+Version: 1.6.0.5
+Release: 1%{?dist}
 Summary: A tool to log all your sport excursions
 
 Group: Development/Languages
@@ -90,6 +90,12 @@
 
 
 %changelog
+* Mon Sep 15 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-1
+- updating to 1.6.0.5
+
+* Mon Jul 07 2008 Douglas E. Warner <silfreed at silfreed.net> 1.5.0.0.1-6
+- bumping xulrunner dep to 1.9.0.1
+
 * Mon Jul 07 2008 Douglas E. Warner <silfreed at silfreed.net> 1.5.0.0.1-5
 - bumping xulrunner dep to 1.9.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jul 2008 14:47:51 -0000	1.2
+++ sources	24 Sep 2008 13:52:57 -0000	1.3
@@ -1 +1 @@
-9165d6a04a5293f900d1e2940ac0214d  pytrainer-1.5.0.0.1.tar.gz
+0c1f6fd49456e901d22ce47d95dffedd  pytrainer-1.6.0.5.tar.gz



From silfreed at fedoraproject.org  Wed Sep 24 13:54:07 2008
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Wed, 24 Sep 2008 13:54:07 +0000 (UTC)
Subject: rpms/ale/devel ale-0.9.0.1-gcc43.patch, NONE, 1.1 ale.spec, 1.1,
	1.2 ale-0.9.0-gcc-4.3.patch, 1.1, NONE
Message-ID: <20080924135407.805EB70103@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/ale/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22585

Modified Files:
	ale.spec 
Added Files:
	ale-0.9.0.1-gcc43.patch 
Removed Files:
	ale-0.9.0-gcc-4.3.patch 
Log Message:
* Wed Sep 23 2008 Douglas E. Warner <silfreed at silfreed.net> 0.9.0.1-2
- updated gcc4.3 patch for 0.9.0.1 to compile w/ new fuzz settings


ale-0.9.0.1-gcc43.patch:

--- NEW FILE ale-0.9.0.1-gcc43.patch ---
diff -ruN ale-0.9.0.1-orig/ui/ui.h ale-0.9.0.1/ui/ui.h
--- ale-0.9.0.1-orig/ui/ui.h	2008-06-13 18:20:56.000000000 -0400
+++ ale-0.9.0.1/ui/ui.h	2008-09-24 09:32:51.000000000 -0400
@@ -21,6 +21,7 @@
 #ifndef __ui_h__
 #define __ui_h__
 
+#include <cstring>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


Index: ale.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ale/devel/ale.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ale.spec	18 Jun 2008 18:00:03 -0000	1.1
+++ ale.spec	24 Sep 2008 13:53:37 -0000	1.2
@@ -1,13 +1,14 @@
 Name: ale
 Version: 0.9.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Combines multiple inputs of the same scene
 
 Group: Applications/Multimedia
 License: GPLv3
 URL: http://auricle.dyndns.org/ALE/
 Source0: http://auricle.dyndns.org/ALE/download/%{name}-%{version}.tar.gz
-Patch0: ale-0.9.0-gcc-4.3.patch
+# sent patch to upstream mailing list on 2008.09.23
+Patch0: ale-0.9.0.1-gcc43.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ImageMagick-devel
@@ -59,6 +60,9 @@
 
 
 %changelog
+* Wed Sep 23 2008 Douglas E. Warner <silfreed at silfreed.net> 0.9.0.1-2
+- updated gcc4.3 patch for 0.9.0.1 to compile w/ new fuzz settings
+
 * Wed Jun 18 2008 Douglas E. Warner <silfreed at silfreed.net> 0.9.0.1-1
 - updating to ale 0.9.0.1
 


--- ale-0.9.0-gcc-4.3.patch DELETED ---



From bpepple at fedoraproject.org  Wed Sep 24 13:55:19 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed, 24 Sep 2008 13:55:19 +0000 (UTC)
Subject: rpms/nautilus-python/F-9 .cvsignore, 1.2, 1.3 nautilus-python.spec, 
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20080924135519.1615E70103@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/nautilus-python/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23011

Modified Files:
	.cvsignore nautilus-python.spec sources 
Log Message:
* Wed Sep 24 2008 Trond Danielsen <trondd at fedoraproject.org> - 0.5.1-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-python/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Apr 2007 20:12:10 -0000	1.2
+++ .cvsignore	24 Sep 2008 13:54:48 -0000	1.3
@@ -1 +1 @@
-nautilus-python-0.4.3.tar.gz
+nautilus-python-0.5.1.tar.bz2


Index: nautilus-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-python/F-9/nautilus-python.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nautilus-python.spec	20 Feb 2008 05:50:04 -0000	1.3
+++ nautilus-python.spec	24 Sep 2008 13:54:48 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           nautilus-python
-Version:        0.4.3
-Release:        5%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        Python bindings for Nautilus
 
 Group:          Development/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://www.gnome.org/
-Source0:        http://ftp.acc.umu.se/pub/GNOME/sources/%{name}/0.4/%{name}-%{version}.tar.gz
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.5/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -23,7 +23,6 @@
 %package devel
 Summary:        Python bindings for Nautilus
 Group:          Development/Libraries
-License:        GPL
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 
@@ -44,9 +43,10 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT/%{_docdir}/%{name} installed_docs
-rm $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-1.0/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-2.0/*.la
 rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/*.la
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-1.0/python/
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-2.0/python/
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -58,17 +58,23 @@
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS
 %{_libdir}/%{name}
-%{_libdir}/nautilus/extensions-1.0/lib%{name}.*
-%dir %{_libdir}/nautilus/extensions-1.0/python/
+%{_libdir}/nautilus/extensions-2.0/lib%{name}.*
+%dir %{_libdir}/nautilus/extensions-2.0/python/
 
 
 %files devel
 %defattr(-,root,root,-)
-%doc installed_docs/examples
+%doc installed_docs/examples installed_docs/documentation.py
 %{_libdir}/pkgconfig/%{name}.pc
 
 
 %changelog
+* Wed Sep 24 2008 Trond Danielsen <trondd at fedoraproject.org> - 0.5.1-1
+- New upstream version
+
+* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.3-6
+- fix license tag
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.3-5
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-python/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Apr 2007 20:12:10 -0000	1.2
+++ sources	24 Sep 2008 13:54:48 -0000	1.3
@@ -1 +1 @@
-f4bd5de3a9e01c80fc0a2ef7aeb64dd7  nautilus-python-0.4.3.tar.gz
+83136937cdb790a2ee5823e96de20acf  nautilus-python-0.5.1.tar.bz2



From mmaslano at fedoraproject.org  Wed Sep 24 13:58:49 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 24 Sep 2008 13:58:49 +0000 (UTC)
Subject: rpms/perl-Crypt-SSLeay/devel perl-Crypt-SSLeay-cryptdef.patch, 1.1, 
	1.2 perl-Crypt-SSLeay.spec, 1.35, 1.36
Message-ID: <20080924135849.21A1570103@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Crypt-SSLeay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23523

Modified Files:
	perl-Crypt-SSLeay-cryptdef.patch perl-Crypt-SSLeay.spec 
Log Message:
* Wed Sep 24 2008 Marcela Maslanova <mmaslano at redhat.com> - 0.57-8
- fix patches for fuzz


perl-Crypt-SSLeay-cryptdef.patch:

Index: perl-Crypt-SSLeay-cryptdef.patch
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-SSLeay/devel/perl-Crypt-SSLeay-cryptdef.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Crypt-SSLeay-cryptdef.patch	9 Sep 2004 10:04:12 -0000	1.1
+++ perl-Crypt-SSLeay-cryptdef.patch	24 Sep 2008 13:58:48 -0000	1.2
@@ -1,5 +1,6 @@
---- Crypt-SSLeay-0.37/SSLeay.xs.cryptdef	Tue Jun 11 10:58:56 2002
-+++ Crypt-SSLeay-0.37/SSLeay.xs	Tue Jun 11 10:59:24 2002
+diff -up Crypt-SSLeay-0.57/SSLeay.xs.cryptdef Crypt-SSLeay-0.57/SSLeay.xs
+--- Crypt-SSLeay-0.57/SSLeay.xs.cryptdef	2007-08-13 19:42:33.000000000 +0200
++++ Crypt-SSLeay-0.57/SSLeay.xs	2008-09-24 15:33:48.000000000 +0200
 @@ -9,9 +9,6 @@
  #ifdef __cplusplus
  extern "C" {
@@ -8,9 +9,9 @@
 -#include "perl.h"
 -#include "XSUB.h"
  
- /* ssl.h or openssl/ssl.h is included from the crypt_ssleay_version
-  * file which is written when building with perl Makefile.PL
-@@ -20,6 +17,11 @@
+ /* build problem under openssl 0.9.6 and some builds of perl 5.8.x */
+ #ifndef PERL5
+@@ -25,6 +22,11 @@ extern "C" {
  #include "crypt_ssleay_version.h"
  
  #undef Free /* undo namespace pollution from crypto.h */


Index: perl-Crypt-SSLeay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-SSLeay/devel/perl-Crypt-SSLeay.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- perl-Crypt-SSLeay.spec	5 Mar 2008 22:28:34 -0000	1.35
+++ perl-Crypt-SSLeay.spec	24 Sep 2008 13:58:48 -0000	1.36
@@ -1,12 +1,12 @@
 Name:           perl-Crypt-SSLeay
 Summary:        Crypt::SSLeay - OpenSSL glue that provides LWP https support
 Version:        0.57
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 Source0:        http://www.cpan.org/authors/id/D/DL/DLAND/Crypt-SSLeay-%{version}.tar.gz
-Patch0:         perl-Crypt-SSLeay-cryptdef.patch
-Patch1:         perl-Crypt-SSLeay-0.57-live-tests.patch
+Patch1:         perl-Crypt-SSLeay-cryptdef.patch
+Patch2:         perl-Crypt-SSLeay-0.57-live-tests.patch
 URL:            http://search.cpan.org/dist/Crypt-SSLeay/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,8 +33,8 @@
 
 %prep
 %setup -q -n Crypt-SSLeay-%{version} 
-%patch0 -p1 -b .cryptdef
-%patch1 -p1
+%patch1 -p1 -b .cryptdef
+%patch2 -p1
 
 # Filter unwanted Provides:
 cat << EOF > %{name}-prov
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Marcela Maslanova <mmaslano at redhat.com> - 0.57-8
+- fix patches for fuzz
+
 * Wed Mar  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.57-7
 - rebuild for new perl
 



From silfreed at fedoraproject.org  Wed Sep 24 14:00:35 2008
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Wed, 24 Sep 2008 14:00:35 +0000 (UTC)
Subject: rpms/ale/F-9 ale-0.9.0.1-gcc43.patch, NONE, 1.1 ale.spec, 1.1,
	1.2 ale-0.9.0-gcc-4.3.patch, 1.1, NONE
Message-ID: <20080924140035.DBE8A70103@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/ale/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23850

Modified Files:
	ale.spec 
Added Files:
	ale-0.9.0.1-gcc43.patch 
Removed Files:
	ale-0.9.0-gcc-4.3.patch 
Log Message:
* Wed Sep 23 2008 Douglas E. Warner <silfreed at silfreed.net> 0.9.0.1-2
- updated gcc4.3 patch for 0.9.0.1 to compile w/ new fuzz settings


ale-0.9.0.1-gcc43.patch:

--- NEW FILE ale-0.9.0.1-gcc43.patch ---
diff -ruN ale-0.9.0.1-orig/ui/ui.h ale-0.9.0.1/ui/ui.h
--- ale-0.9.0.1-orig/ui/ui.h	2008-06-13 18:20:56.000000000 -0400
+++ ale-0.9.0.1/ui/ui.h	2008-09-24 09:32:51.000000000 -0400
@@ -21,6 +21,7 @@
 #ifndef __ui_h__
 #define __ui_h__
 
+#include <cstring>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


Index: ale.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ale/F-9/ale.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ale.spec	18 Jun 2008 17:59:44 -0000	1.1
+++ ale.spec	24 Sep 2008 14:00:05 -0000	1.2
@@ -1,13 +1,14 @@
 Name: ale
 Version: 0.9.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Combines multiple inputs of the same scene
 
 Group: Applications/Multimedia
 License: GPLv3
 URL: http://auricle.dyndns.org/ALE/
 Source0: http://auricle.dyndns.org/ALE/download/%{name}-%{version}.tar.gz
-Patch0: ale-0.9.0-gcc-4.3.patch
+# sent patch to upstream mailing list on 2008.09.23
+Patch0: ale-0.9.0.1-gcc43.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ImageMagick-devel
@@ -59,6 +60,9 @@
 
 
 %changelog
+* Wed Sep 23 2008 Douglas E. Warner <silfreed at silfreed.net> 0.9.0.1-2
+- updated gcc4.3 patch for 0.9.0.1 to compile w/ new fuzz settings
+
 * Wed Jun 18 2008 Douglas E. Warner <silfreed at silfreed.net> 0.9.0.1-1
 - updating to ale 0.9.0.1
 


--- ale-0.9.0-gcc-4.3.patch DELETED ---



From silfreed at fedoraproject.org  Wed Sep 24 14:02:51 2008
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Wed, 24 Sep 2008 14:02:51 +0000 (UTC)
Subject: rpms/ale/F-8 ale-0.9.0.1-gcc43.patch, NONE, 1.1 ale.spec, 1.1,
	1.2 ale-0.9.0-gcc-4.3.patch, 1.1, NONE
Message-ID: <20080924140251.7931370103@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/ale/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24347

Modified Files:
	ale.spec 
Added Files:
	ale-0.9.0.1-gcc43.patch 
Removed Files:
	ale-0.9.0-gcc-4.3.patch 
Log Message:
* Wed Sep 23 2008 Douglas E. Warner <silfreed at silfreed.net> 0.9.0.1-2
- updated gcc4.3 patch for 0.9.0.1 to compile w/ new fuzz settings


ale-0.9.0.1-gcc43.patch:

--- NEW FILE ale-0.9.0.1-gcc43.patch ---
diff -ruN ale-0.9.0.1-orig/ui/ui.h ale-0.9.0.1/ui/ui.h
--- ale-0.9.0.1-orig/ui/ui.h	2008-06-13 18:20:56.000000000 -0400
+++ ale-0.9.0.1/ui/ui.h	2008-09-24 09:32:51.000000000 -0400
@@ -21,6 +21,7 @@
 #ifndef __ui_h__
 #define __ui_h__
 
+#include <cstring>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


Index: ale.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ale/F-8/ale.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ale.spec	18 Jun 2008 17:59:31 -0000	1.1
+++ ale.spec	24 Sep 2008 14:02:21 -0000	1.2
@@ -1,13 +1,14 @@
 Name: ale
 Version: 0.9.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Combines multiple inputs of the same scene
 
 Group: Applications/Multimedia
 License: GPLv3
 URL: http://auricle.dyndns.org/ALE/
 Source0: http://auricle.dyndns.org/ALE/download/%{name}-%{version}.tar.gz
-Patch0: ale-0.9.0-gcc-4.3.patch
+# sent patch to upstream mailing list on 2008.09.23
+Patch0: ale-0.9.0.1-gcc43.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ImageMagick-devel
@@ -59,6 +60,9 @@
 
 
 %changelog
+* Wed Sep 23 2008 Douglas E. Warner <silfreed at silfreed.net> 0.9.0.1-2
+- updated gcc4.3 patch for 0.9.0.1 to compile w/ new fuzz settings
+
 * Wed Jun 18 2008 Douglas E. Warner <silfreed at silfreed.net> 0.9.0.1-1
 - updating to ale 0.9.0.1
 


--- ale-0.9.0-gcc-4.3.patch DELETED ---



From silfreed at fedoraproject.org  Wed Sep 24 14:03:17 2008
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Wed, 24 Sep 2008 14:03:17 +0000 (UTC)
Subject: rpms/pytrainer/F-8 .cvsignore, 1.2, 1.3 pytrainer.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20080924140317.886BD70103@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/pytrainer/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24431

Modified Files:
	.cvsignore pytrainer.spec sources 
Log Message:
* Mon Sep 15 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-1
- updating to 1.6.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jul 2008 14:50:56 -0000	1.2
+++ .cvsignore	24 Sep 2008 14:02:47 -0000	1.3
@@ -1 +1 @@
-pytrainer-1.5.0.0.1.tar.gz
+pytrainer-1.6.0.5.tar.gz


Index: pytrainer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/F-8/pytrainer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pytrainer.spec	21 Jul 2008 18:42:07 -0000	1.4
+++ pytrainer.spec	24 Sep 2008 14:02:47 -0000	1.5
@@ -5,8 +5,8 @@
 %define xulrunner_pkgver %{xulrunner_ver}.0.1
 
 Name: pytrainer
-Version: 1.5.0.0.1
-Release: 5%{?dist}
+Version: 1.6.0.5
+Release: 1%{?dist}
 Summary: A tool to log all your sport excursions
 
 Group: Development/Languages
@@ -90,6 +90,12 @@
 
 
 %changelog
+* Mon Sep 15 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-1
+- updating to 1.6.0.5
+
+* Mon Jul 07 2008 Douglas E. Warner <silfreed at silfreed.net> 1.5.0.0.1-6
+- bumping xulrunner dep to 1.9.0.1
+
 * Mon Jul 07 2008 Douglas E. Warner <silfreed at silfreed.net> 1.5.0.0.1-5
 - bumping xulrunner dep to 1.9.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jul 2008 14:50:56 -0000	1.2
+++ sources	24 Sep 2008 14:02:47 -0000	1.3
@@ -1 +1 @@
-9165d6a04a5293f900d1e2940ac0214d  pytrainer-1.5.0.0.1.tar.gz
+0c1f6fd49456e901d22ce47d95dffedd  pytrainer-1.6.0.5.tar.gz



From mclasen at fedoraproject.org  Wed Sep 24 14:17:19 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 24 Sep 2008 14:17:19 +0000 (UTC)
Subject: rpms/gvfs/devel .cvsignore, 1.26, 1.27 gvfs.spec, 1.82, 1.83 sources,
	1.26, 1.27
Message-ID: <20080924141719.3D5FA70103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25932

Modified Files:
	.cvsignore gvfs.spec sources 
Log Message:
1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	22 Sep 2008 14:38:42 -0000	1.26
+++ .cvsignore	24 Sep 2008 14:16:48 -0000	1.27
@@ -1 +1 @@
-gvfs-1.0.0.tar.bz2
+gvfs-1.0.1.tar.bz2


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- gvfs.spec	22 Sep 2008 14:46:27 -0000	1.82
+++ gvfs.spec	24 Sep 2008 14:16:48 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 1.0.0
-Release: 2%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -251,6 +251,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Matthias Clasen <mclasen at redhat.com>  - 1.0.1-1
+- Update to 1.0.1
+
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com>  - 1.0.0-2
 - Update to 1.0.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	22 Sep 2008 14:38:42 -0000	1.26
+++ sources	24 Sep 2008 14:16:48 -0000	1.27
@@ -1 +1 @@
-d32f32d3d227392e983cc61e07f57c0f  gvfs-1.0.0.tar.bz2
+0d123f87e3e660271cd9d11b8c592c5a  gvfs-1.0.1.tar.bz2



From twaugh at fedoraproject.org  Wed Sep 24 14:20:32 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 24 Sep 2008 14:20:32 +0000 (UTC)
Subject: rpms/pnm2ppa/devel pbm2ppa-20000205.diff, 1.2,
	1.3 pnm2ppa-redhat.patch, 1.2, 1.3 pnm2ppa.spec, 1.12, 1.13
Message-ID: <20080924142032.A6D9A70103@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/pnm2ppa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26652

Modified Files:
	pbm2ppa-20000205.diff pnm2ppa-redhat.patch pnm2ppa.spec 
Log Message:
* Wed Sep 24 2008 Tim Waugh <twaugh at redhat.com> 1:1.04-16
- Removed patch fuzz.


pbm2ppa-20000205.diff:

Index: pbm2ppa-20000205.diff
===================================================================
RCS file: /cvs/pkgs/rpms/pnm2ppa/devel/pbm2ppa-20000205.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pbm2ppa-20000205.diff	9 Sep 2004 10:33:17 -0000	1.2
+++ pbm2ppa-20000205.diff	24 Sep 2008 14:20:32 -0000	1.3
@@ -1,7 +1,7 @@
-diff -uNr pbm2ppa-0.8.6/CALIBRATION pbm2ppa-20000205/CALIBRATION
---- pbm2ppa-0.8.6/CALIBRATION	Sat Aug 22 09:44:07 1998
-+++ pbm2ppa-20000205/CALIBRATION	Sun Feb  6 01:32:25 2000
-@@ -10,9 +10,22 @@
+diff -up pbm2ppa-0.8.6/CALIBRATION.20000205 pbm2ppa-0.8.6/CALIBRATION
+--- pbm2ppa-0.8.6/CALIBRATION.20000205	1998-08-22 14:44:07.000000000 +0100
++++ pbm2ppa-0.8.6/CALIBRATION	2008-09-24 15:15:53.000000000 +0100
+@@ -10,9 +10,22 @@ during this procedure (like 600)]
    The 'pbmtpg' program generates a full-page (8.5"x11") test pattern in
  pbmraw (P4) format on stdout.  The output may be fed directly into pbm2ppa
  in order to print a calibration pattern on your printer with commands such as:
@@ -25,7 +25,7 @@
  
        - or -
  
-@@ -33,3 +46,7 @@
+@@ -33,3 +46,7 @@ paper.  Also, the margins should be able
  causing the printer to choke with 'blinking lights syndrome'.
  
  [TODO: Add shearing adjustments to pbm2ppa and explain here]
@@ -33,9 +33,135 @@
 +
 +
 +
-diff -uNr pbm2ppa-0.8.6/INSTALL pbm2ppa-20000205/INSTALL
---- pbm2ppa-0.8.6/INSTALL	Sun Oct 18 21:27:16 1998
-+++ pbm2ppa-20000205/INSTALL	Sat Feb  5 14:14:54 2000
+diff -up pbm2ppa-0.8.6/defaults.1000.h.20000205 pbm2ppa-0.8.6/defaults.1000.h
+--- pbm2ppa-0.8.6/defaults.1000.h.20000205	1998-08-22 14:44:12.000000000 +0100
++++ pbm2ppa-0.8.6/defaults.1000.h	2008-09-24 15:17:47.000000000 +0100
+@@ -1,19 +0,0 @@
+-/* defaults.h
+- * Default printer values.  Edit these and recompile if so desired.
+- * [Note: a /etc/pbm2ppa.conf file will override these]
+- */
+-#ifndef _DEFAULTS_H
+-#define _DEFAULTS_H
+-
+-#define DEFAULT_PRINTER        ( HP1000 )
+-
+-/* Refer to CALIBRATION file about these settings */
+-#define DEFAULT_X_OFFSET       (   100 )
+-#define DEFAULT_Y_OFFSET       (  -650 )
+-
+-#define DEFAULT_TOP_MARGIN     (   150 )
+-#define DEFAULT_LEFT_MARGIN    (   150 )
+-#define DEFAULT_RIGHT_MARGIN   (   150 )
+-#define DEFAULT_BOTTOM_MARGIN  (   150 )
+-
+-#endif
+diff -up pbm2ppa-0.8.6/defaults.720.h.20000205 pbm2ppa-0.8.6/defaults.720.h
+--- pbm2ppa-0.8.6/defaults.720.h.20000205	1998-08-22 14:44:12.000000000 +0100
++++ pbm2ppa-0.8.6/defaults.720.h	2008-09-24 15:17:47.000000000 +0100
+@@ -1,19 +0,0 @@
+-/* defaults.h
+- * Default printer values.  Edit these and recompile if so desired.
+- * [Note: a /etc/pbm2ppa.conf file will override these]
+- */
+-#ifndef _DEFAULTS_H
+-#define _DEFAULTS_H
+-
+-#define DEFAULT_PRINTER        ( HP720 )
+-
+-/* Refer to CALIBRATION file about these settings */
+-#define DEFAULT_X_OFFSET       (   169 )
+-#define DEFAULT_Y_OFFSET       (  -569 )
+-
+-#define DEFAULT_TOP_MARGIN     (   150 )
+-#define DEFAULT_LEFT_MARGIN    (   150 )
+-#define DEFAULT_RIGHT_MARGIN   (   150 )
+-#define DEFAULT_BOTTOM_MARGIN  (   150 )
+-
+-#endif
+diff -up pbm2ppa-0.8.6/defaults.820.h.20000205 pbm2ppa-0.8.6/defaults.820.h
+--- pbm2ppa-0.8.6/defaults.820.h.20000205	1998-08-22 14:44:12.000000000 +0100
++++ pbm2ppa-0.8.6/defaults.820.h	2008-09-24 15:17:47.000000000 +0100
+@@ -1,19 +0,0 @@
+-/* defaults.h
+- * Default printer values.  Edit these and recompile if so desired.
+- * [Note: a /etc/pbm2ppa.conf file will override these]
+- */
+-#ifndef _DEFAULTS_H
+-#define _DEFAULTS_H
+-
+-#define DEFAULT_PRINTER        ( HP820 )
+-
+-/* Refer to CALIBRATION file about these settings */
+-#define DEFAULT_X_OFFSET       (    75 )
+-#define DEFAULT_Y_OFFSET       (  -500 )
+-
+-#define DEFAULT_TOP_MARGIN     (    80 )
+-#define DEFAULT_LEFT_MARGIN    (    80 )
+-#define DEFAULT_RIGHT_MARGIN   (    80 )
+-#define DEFAULT_BOTTOM_MARGIN  (   150 )
+-
+-#endif
+diff -up /dev/null pbm2ppa-0.8.6/defaults.h
+--- /dev/null	2008-09-24 08:53:03.196006296 +0100
++++ pbm2ppa-0.8.6/defaults.h	2008-09-24 15:15:53.000000000 +0100
+@@ -0,0 +1,53 @@
++/* defaults.h
++ * Default printer values.  Edit these and recompile if so desired.
++ * [Note: a /etc/pbm2ppa.conf file will override these]
++ */
++
++#ifndef _DEFAULTS_H
++#define _DEFAULTS_H
++
++#ifndef DEFAULT_PRINTER
++#define DEFAULT_PRINTER        ( HP720 )
++#endif
++
++/* for HP720 series */
++/* Refer to CALIBRATION file about these settings */
++#define HP720_X_OFFSET       (   169 )
++#define HP720_Y_OFFSET       (  -569 )
++
++#define HP720_TOP_MARGIN     (   150 )
++#define HP720_LEFT_MARGIN    (   150 )
++#define HP720_RIGHT_MARGIN   (   150 )
++#define HP720_BOTTOM_MARGIN  (   150 )
++
++/* for HP820 series */
++/* Refer to CALIBRATION file about these settings */
++#define HP820_X_OFFSET       (    75 )
++#define HP820_Y_OFFSET       (  -500 )
++
++#define HP820_TOP_MARGIN     (    80 )
++#define HP820_LEFT_MARGIN    (    80 )
++#define HP820_RIGHT_MARGIN   (    80 )
++#define HP820_BOTTOM_MARGIN  (   150 )
++
++/* for HP1000 series */
++/* Refer to CALIBRATION file about these settings */
++#define HP1000_X_OFFSET       (   100 )
++#define HP1000_Y_OFFSET       (  -650 )
++
++#define HP1000_TOP_MARGIN     (   150 )
++#define HP1000_LEFT_MARGIN    (   150 )
++#define HP1000_RIGHT_MARGIN   (   150 )
++#define HP1000_BOTTOM_MARGIN  (   150 )
++
++#endif
++
++
++
++
++
++
++
++
++
++
+diff -up pbm2ppa-0.8.6/INSTALL.20000205 pbm2ppa-0.8.6/INSTALL
+--- pbm2ppa-0.8.6/INSTALL.20000205	1998-10-19 02:27:16.000000000 +0100
++++ pbm2ppa-0.8.6/INSTALL	2008-09-24 15:15:53.000000000 +0100
 @@ -1,6 +1,6 @@
  Overview
  --------
@@ -44,7 +170,7 @@
  complete step-by-step instruction on how to install pbm2ppa for your
  printer, please see INSTALL-MORE.  (It was written for the 820, but it
  should work for all supported models) Thanks to Michael Buehlmann for
-@@ -9,14 +9,19 @@
+@@ -9,14 +9,19 @@ writing that guide!
  Compilation
  -----------
  	To compile, you should simply run 'make' with the series of your
@@ -67,7 +193,7 @@
  
  Installation
  ------------
-@@ -26,17 +31,23 @@
+@@ -26,17 +31,23 @@ but you might want to tweak them).  See 
  
  	The other binary created, pbm2ppa, is a converter from a PBM
  image to a stream of PPA data that can be sent directly to the printer.
@@ -96,10 +222,10 @@
  
  	You can also set up a printer filter.  See the documentation for
  your print spooler for information on how to do that, or look in
-diff -uNr pbm2ppa-0.8.6/INSTALL-MORE pbm2ppa-20000205/INSTALL-MORE
---- pbm2ppa-0.8.6/INSTALL-MORE	Sun Oct 18 21:27:17 1998
-+++ pbm2ppa-20000205/INSTALL-MORE	Sat Feb  5 04:34:45 2000
-@@ -36,14 +36,21 @@
+diff -up pbm2ppa-0.8.6/INSTALL-MORE.20000205 pbm2ppa-0.8.6/INSTALL-MORE
+--- pbm2ppa-0.8.6/INSTALL-MORE.20000205	1998-10-19 02:27:17.000000000 +0100
++++ pbm2ppa-0.8.6/INSTALL-MORE	2008-09-24 15:15:53.000000000 +0100
+@@ -36,14 +36,21 @@ or put in your printer number (720, 820 
  file).
  
  
@@ -124,9 +250,9 @@
  For A4 size paper:
  # pbmtpg -a4 | pbm2ppa -s a4 > /dev/lp1 ( as root )
  
-diff -uNr pbm2ppa-0.8.6/Makefile pbm2ppa-20000205/Makefile
---- pbm2ppa-0.8.6/Makefile	Sun Oct 11 11:17:16 1998
-+++ pbm2ppa-20000205/Makefile	Sat Feb  5 04:34:45 2000
+diff -up pbm2ppa-0.8.6/Makefile.20000205 pbm2ppa-0.8.6/Makefile
+--- pbm2ppa-0.8.6/Makefile.20000205	1998-10-11 16:17:16.000000000 +0100
++++ pbm2ppa-0.8.6/Makefile	2008-09-24 15:15:53.000000000 +0100
 @@ -1,36 +1,23 @@
  CC=gcc
 -CFLAGS=-Wall -O2
@@ -175,7 +301,7 @@
  
  pbm2ppa: pbm2ppa.o ppa.o pbm.o cutswath.o
  	$(CC) $(LDFLAGS) -o pbm2ppa pbm2ppa.o ppa.o pbm.o cutswath.o
-@@ -39,4 +26,11 @@
+@@ -39,4 +26,11 @@ pbmtpg: pbmtpg.o
  	$(CC) $(CFLAGS) -o pbmtpg pbmtpg.o -lm
  
  .c.o: $*.c ppa.h pbm.h
@@ -188,189 +314,9 @@
 +
 +
 +
-diff -uNr pbm2ppa-0.8.6/README.REDHAT pbm2ppa-20000205/README.REDHAT
---- pbm2ppa-0.8.6/README.REDHAT	Sat Aug 22 09:48:40 1998
-+++ pbm2ppa-20000205/README.REDHAT	Sun Feb  6 00:53:29 2000
-@@ -1,12 +1,28 @@
--RedHat users may find the following tip from Panayotis Vryonis <vrypan at hol.gr>
--helpful!
-+The best way to integrate support for the HP PPA Printers into RedHat's
-+Linux Print System Manager (printtool) is to replace e.g., the
-+rhs-printfilters-1.57-3 RPM package that comes with Red Hat 6.1,
-+with a  PPA-aware version from the pnm2ppa project  whic h has a
-+homepage at http://www.sourceforge.net/projects/?group_id=1322
- 
--Here is a tip to intergrate HP720C support in RedHat's printtool:
-+At the time of writing, the latest release is
-+     rhs-printfilters-1.57-4ppa1
-+This package includes support for both pbm2ppa and the new
-+color driver pnm2ppa.
- 
--Install pbm2ppa. Copy pbm2ppa to /usr/bin.
--Edit "printerdb" (in my system it is found in
--/usr/lib/rhs/rhs-printfilters )
--and append the following lines:
-+   -------------------------------------
-+
-+If for some reason, they cannot use this PPA-aware version of
-+rhs-printfilters, RedHat users may still find the following tip from 
-+Panayotis Vryonis <vrypan at hol.gr> helpful!  
-+It will work with the standard rhs-printfilters that comes with  the 
-+Red Hat release:
-+	
-+	Here is a tip to integrate HP720C support in RedHat's printtool:
-+
-+	Install pbm2ppa. Copy pbm2ppa to /usr/bin.
-+	Edit "printerdb" (in my system it is found in	
-+	/usr/lib/rhs/rhs-printfilters )
-+	and append the following lines:
- ----------------------Cut here
- -------------------------------------------
- StartEntry: DeskJet720C
-@@ -23,7 +39,11 @@
- EndEntry
- --------------------------------------------------------------------------
- 
--Now you can add an HP720C printer just like any other, using printtool.
-+	Now you can add an HP720C printer just like any other, using printtool.
-+
-+	[Author's (P. Vryonis) Note: The same should work for the 820 and 
-+	1000, but it hasn't been tested.  Also, use the pbmraw GSDriver if 
-+	you have it; it's faster. ]
-+
-+
- 
--[Author's Note: The same should work for the 820 and 1000, but it hasn't
--been tested.  Also, use the pbmraw GSDriver if you have it; it's faster. ]
-diff -uNr pbm2ppa-0.8.6/defaults.1000.h pbm2ppa-20000205/defaults.1000.h
---- pbm2ppa-0.8.6/defaults.1000.h	Sat Aug 22 09:44:12 1998
-+++ pbm2ppa-20000205/defaults.1000.h	Wed Dec 31 19:00:00 1969
-@@ -1,19 +0,0 @@
--/* defaults.h
-- * Default printer values.  Edit these and recompile if so desired.
-- * [Note: a /etc/pbm2ppa.conf file will override these]
-- */
--#ifndef _DEFAULTS_H
--#define _DEFAULTS_H
--
--#define DEFAULT_PRINTER        ( HP1000 )
--
--/* Refer to CALIBRATION file about these settings */
--#define DEFAULT_X_OFFSET       (   100 )
--#define DEFAULT_Y_OFFSET       (  -650 )
--
--#define DEFAULT_TOP_MARGIN     (   150 )
--#define DEFAULT_LEFT_MARGIN    (   150 )
--#define DEFAULT_RIGHT_MARGIN   (   150 )
--#define DEFAULT_BOTTOM_MARGIN  (   150 )
--
--#endif
-diff -uNr pbm2ppa-0.8.6/defaults.720.h pbm2ppa-20000205/defaults.720.h
---- pbm2ppa-0.8.6/defaults.720.h	Sat Aug 22 09:44:12 1998
-+++ pbm2ppa-20000205/defaults.720.h	Wed Dec 31 19:00:00 1969
-@@ -1,19 +0,0 @@
--/* defaults.h
-- * Default printer values.  Edit these and recompile if so desired.
-- * [Note: a /etc/pbm2ppa.conf file will override these]
-- */
--#ifndef _DEFAULTS_H
--#define _DEFAULTS_H
--
--#define DEFAULT_PRINTER        ( HP720 )
--
--/* Refer to CALIBRATION file about these settings */
--#define DEFAULT_X_OFFSET       (   169 )
--#define DEFAULT_Y_OFFSET       (  -569 )
--
--#define DEFAULT_TOP_MARGIN     (   150 )
--#define DEFAULT_LEFT_MARGIN    (   150 )
--#define DEFAULT_RIGHT_MARGIN   (   150 )
--#define DEFAULT_BOTTOM_MARGIN  (   150 )
--
--#endif
-diff -uNr pbm2ppa-0.8.6/defaults.820.h pbm2ppa-20000205/defaults.820.h
---- pbm2ppa-0.8.6/defaults.820.h	Sat Aug 22 09:44:12 1998
-+++ pbm2ppa-20000205/defaults.820.h	Wed Dec 31 19:00:00 1969
-@@ -1,19 +0,0 @@
--/* defaults.h
-- * Default printer values.  Edit these and recompile if so desired.
-- * [Note: a /etc/pbm2ppa.conf file will override these]
-- */
--#ifndef _DEFAULTS_H
--#define _DEFAULTS_H
--
--#define DEFAULT_PRINTER        ( HP820 )
--
--/* Refer to CALIBRATION file about these settings */
--#define DEFAULT_X_OFFSET       (    75 )
--#define DEFAULT_Y_OFFSET       (  -500 )
--
--#define DEFAULT_TOP_MARGIN     (    80 )
--#define DEFAULT_LEFT_MARGIN    (    80 )
--#define DEFAULT_RIGHT_MARGIN   (    80 )
--#define DEFAULT_BOTTOM_MARGIN  (   150 )
--
--#endif
-diff -uNr pbm2ppa-0.8.6/defaults.h pbm2ppa-20000205/defaults.h
---- pbm2ppa-0.8.6/defaults.h	Wed Dec 31 19:00:00 1969
-+++ pbm2ppa-20000205/defaults.h	Sat Feb  5 04:34:45 2000
-@@ -0,0 +1,53 @@
-+/* defaults.h
-+ * Default printer values.  Edit these and recompile if so desired.
-+ * [Note: a /etc/pbm2ppa.conf file will override these]
-+ */
-+
-+#ifndef _DEFAULTS_H
-+#define _DEFAULTS_H
-+
-+#ifndef DEFAULT_PRINTER
-+#define DEFAULT_PRINTER        ( HP720 )
-+#endif
-+
-+/* for HP720 series */
-+/* Refer to CALIBRATION file about these settings */
-+#define HP720_X_OFFSET       (   169 )
-+#define HP720_Y_OFFSET       (  -569 )
-+
-+#define HP720_TOP_MARGIN     (   150 )
-+#define HP720_LEFT_MARGIN    (   150 )
-+#define HP720_RIGHT_MARGIN   (   150 )
-+#define HP720_BOTTOM_MARGIN  (   150 )
-+
-+/* for HP820 series */
-+/* Refer to CALIBRATION file about these settings */
-+#define HP820_X_OFFSET       (    75 )
-+#define HP820_Y_OFFSET       (  -500 )
-+
-+#define HP820_TOP_MARGIN     (    80 )
-+#define HP820_LEFT_MARGIN    (    80 )
-+#define HP820_RIGHT_MARGIN   (    80 )
-+#define HP820_BOTTOM_MARGIN  (   150 )
-+
-+/* for HP1000 series */
-+/* Refer to CALIBRATION file about these settings */
-+#define HP1000_X_OFFSET       (   100 )
-+#define HP1000_Y_OFFSET       (  -650 )
-+
-+#define HP1000_TOP_MARGIN     (   150 )
-+#define HP1000_LEFT_MARGIN    (   150 )
-+#define HP1000_RIGHT_MARGIN   (   150 )
-+#define HP1000_BOTTOM_MARGIN  (   150 )
-+
-+#endif
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-diff -uNr pbm2ppa-0.8.6/pbm2ppa.1 pbm2ppa-20000205/pbm2ppa.1
---- pbm2ppa-0.8.6/pbm2ppa.1	Wed Dec 31 19:00:00 1969
-+++ pbm2ppa-20000205/pbm2ppa.1	Sun Feb  6 00:11:42 2000
+diff -up /dev/null pbm2ppa-0.8.6/pbm2ppa.1
+--- /dev/null	2008-09-24 08:53:03.196006296 +0100
++++ pbm2ppa-0.8.6/pbm2ppa.1	2008-09-24 15:15:53.000000000 +0100
 @@ -0,0 +1,135 @@
 +.TH pnm2ppa "5 Feb 2000"
 +.SH NAME
@@ -507,9 +453,9 @@
 +
 +
 +
-diff -uNr pbm2ppa-0.8.6/pbm2ppa.c pbm2ppa-20000205/pbm2ppa.c
---- pbm2ppa-0.8.6/pbm2ppa.c	Tue Sep 15 20:00:27 1998
-+++ pbm2ppa-20000205/pbm2ppa.c	Sat Feb  5 17:27:58 2000
+diff -up pbm2ppa-0.8.6/pbm2ppa.c.20000205 pbm2ppa-0.8.6/pbm2ppa.c
+--- pbm2ppa-0.8.6/pbm2ppa.c.20000205	1998-09-16 01:00:27.000000000 +0100
++++ pbm2ppa-0.8.6/pbm2ppa.c	2008-09-24 15:15:53.000000000 +0100
 @@ -17,10 +17,15 @@
  
  /* Paper sizes in 600ths of an inch. */
@@ -529,7 +475,7 @@
  
  /* A4 is 210 mm by 297 mm == 8.27 in by 11.69 in */
  
-@@ -121,16 +126,35 @@
+@@ -121,16 +126,35 @@ int print_pbm (FILE *in)
  
  void set_printer_specific_defaults()
  {
@@ -567,7 +513,7 @@
      printer.marg_diff=0x62;
      printer.bufsize = 100*1024;
      break;
-@@ -144,15 +168,17 @@
+@@ -144,15 +168,17 @@ void show_usage(char* prog)
  {
    printf("usage: %s [ options ] [ <infile> [ <outfile> ] ]\n\n",prog);
    printf("  Prints a pbm- or pbmraw-format <infile> to HP720/820/1000-format <outfile>.\n\n");
@@ -593,7 +539,7 @@
    printf("  The -x and -y options accumulate.  The -v option resets the horizontal and\n");
    printf("  vertical adjustments to an internal default.  <infile> and <outfile> default\n");
    printf("  to stdin and stdout.  '-' is a synonym for stdin and stdout.\n\n");
-@@ -173,7 +199,13 @@
+@@ -173,7 +199,13 @@ void show_usage(char* prog)
  
  void parm_version(char* arg)
  {
@@ -608,7 +554,7 @@
      printer.version=HP720;
    else if(!strcasecmp(arg,"hp820") || !strcmp(arg,"820"))
      printer.version=HP820;
-@@ -191,7 +223,10 @@
+@@ -191,7 +223,10 @@ void parm_iversion(int arg)
  {
    switch(arg)
    {
@@ -619,7 +565,7 @@
      printer.version=HP720;
      break;
    case 820:
-@@ -262,10 +297,15 @@
+@@ -262,10 +297,15 @@ void read_config_file(char* fname)
  	printer.bottom_margin=value;
        else if(!strncmp(key,"papersize",len))
        {
@@ -638,7 +584,7 @@
  	}
  	else if(!strcmp(buf,"a4"))
  	{
-@@ -313,15 +353,9 @@
+@@ -313,15 +353,9 @@ int main (int argc, char *argv[])
    FILE *in=stdin, *out=stdout;
    struct stat tmpstat;
  
@@ -657,7 +603,7 @@
    set_printer_specific_defaults();
  
    if(!stat(defaultcfgfile,&tmpstat))
-@@ -356,10 +390,15 @@
+@@ -356,10 +390,15 @@ int main (int argc, char *argv[])
        else if(!strcmp(argv[argn],"-s"))
        {
  	argn++;
@@ -676,15 +622,14 @@
  	}
  	else if(!strcmp(argv[argn],"a4"))
  	{
-@@ -413,4 +452,5 @@
- 
+@@ -414,3 +453,4 @@ int main (int argc, char *argv[])
    return print_pbm (in);
  }
-+
  
-diff -uNr pbm2ppa-0.8.6/pbm2ppa.conf pbm2ppa-20000205/pbm2ppa.conf
---- pbm2ppa-0.8.6/pbm2ppa.conf	Wed Dec 31 19:00:00 1969
-+++ pbm2ppa-20000205/pbm2ppa.conf	Sat Feb  5 17:27:58 2000
++
+diff -up /dev/null pbm2ppa-0.8.6/pbm2ppa.conf
+--- /dev/null	2008-09-24 08:53:03.196006296 +0100
++++ pbm2ppa-0.8.6/pbm2ppa.conf	2008-09-24 15:15:53.000000000 +0100
 @@ -0,0 +1,58 @@
 +# Sample configuration file for the HP720/HP820/HP1000 PPA Printers
 +#
@@ -744,9 +689,9 @@
 +
 +
 +
-diff -uNr pbm2ppa-0.8.6/pbm2ppa.conf.hp1000 pbm2ppa-20000205/pbm2ppa.conf.hp1000
---- pbm2ppa-0.8.6/pbm2ppa.conf.hp1000	Sun Oct 18 21:27:19 1998
-+++ pbm2ppa-20000205/pbm2ppa.conf.hp1000	Wed Dec 31 19:00:00 1969
+diff -up pbm2ppa-0.8.6/pbm2ppa.conf.hp1000.20000205 pbm2ppa-0.8.6/pbm2ppa.conf.hp1000
+--- pbm2ppa-0.8.6/pbm2ppa.conf.hp1000.20000205	1998-10-19 02:27:19.000000000 +0100
++++ pbm2ppa-0.8.6/pbm2ppa.conf.hp1000	2008-09-24 15:17:47.000000000 +0100
 @@ -1,18 +0,0 @@
 -# Sample configuration file for the HP720
 -#
@@ -766,9 +711,9 @@
 -bottom   150
 -left     150
 -right    150
-diff -uNr pbm2ppa-0.8.6/pbm2ppa.conf.hp720 pbm2ppa-20000205/pbm2ppa.conf.hp720
---- pbm2ppa-0.8.6/pbm2ppa.conf.hp720	Sun Oct 18 21:27:20 1998
-+++ pbm2ppa-20000205/pbm2ppa.conf.hp720	Wed Dec 31 19:00:00 1969
+diff -up pbm2ppa-0.8.6/pbm2ppa.conf.hp720.20000205 pbm2ppa-0.8.6/pbm2ppa.conf.hp720
+--- pbm2ppa-0.8.6/pbm2ppa.conf.hp720.20000205	1998-10-19 02:27:20.000000000 +0100
++++ pbm2ppa-0.8.6/pbm2ppa.conf.hp720	2008-09-24 15:17:47.000000000 +0100
 @@ -1,18 +0,0 @@
 -# Sample configuration file for the HP720
 -#
@@ -788,9 +733,9 @@
 -bottom   150
 -left     150
 -right    150
-diff -uNr pbm2ppa-0.8.6/pbm2ppa.conf.hp820 pbm2ppa-20000205/pbm2ppa.conf.hp820
---- pbm2ppa-0.8.6/pbm2ppa.conf.hp820	Sun Oct 18 21:27:21 1998
-+++ pbm2ppa-20000205/pbm2ppa.conf.hp820	Wed Dec 31 19:00:00 1969
+diff -up pbm2ppa-0.8.6/pbm2ppa.conf.hp820.20000205 pbm2ppa-0.8.6/pbm2ppa.conf.hp820
+--- pbm2ppa-0.8.6/pbm2ppa.conf.hp820.20000205	1998-10-19 02:27:21.000000000 +0100
++++ pbm2ppa-0.8.6/pbm2ppa.conf.hp820	2008-09-24 15:17:47.000000000 +0100
 @@ -1,18 +0,0 @@
 -# Sample configuration file for the HP820
 -#
@@ -810,10 +755,11 @@
 -bottom   150
 -left      80
 -right     80
-diff -uNr pbm2ppa-0.8.6/pbmtpg.c pbm2ppa-20000205/pbmtpg.c
---- pbm2ppa-0.8.6/pbmtpg.c	Tue Sep 15 20:00:28 1998
-+++ pbm2ppa-20000205/pbmtpg.c	Sat Feb  5 04:34:45 2000
-@@ -2,12 +2,18 @@
+diff -up pbm2ppa-0.8.6/pbmtpg.c.20000205 pbm2ppa-0.8.6/pbmtpg.c
+--- pbm2ppa-0.8.6/pbmtpg.c.20000205	1998-09-16 01:00:28.000000000 +0100
++++ pbm2ppa-0.8.6/pbmtpg.c	2008-09-24 15:15:53.000000000 +0100
+@@ -1,13 +1,19 @@
+ #include <math.h>
  #include <stdio.h>
  #include <stdlib.h>
 +#include <string.h>
@@ -836,7 +782,7 @@
  
  /* A4 is 210 mm by 297 mm == 8.27 in by 11.69 in */
  
-@@ -137,8 +142,24 @@
+@@ -137,8 +143,24 @@ int main(int argc,char** argv)
    char buf[128];
    char *progname = *argv;
  
@@ -863,7 +809,7 @@
    if(argc>1 && strcmp(argv[1], "-a4")==0)
    {
      Width = A4WIDTH;
-@@ -146,6 +167,9 @@
+@@ -146,6 +168,9 @@ int main(int argc,char** argv)
      argc--;
      argv++;
    }
@@ -873,7 +819,7 @@
    Pwidth = (Width+7)/8;
    bitmap = (char *)malloc(Pwidth*Height);
  
-@@ -192,6 +216,7 @@
+@@ -192,6 +217,7 @@ int main(int argc,char** argv)
      return 1;
    }
  
@@ -881,7 +827,7 @@
    printf("P4\n%d %d\n",Width,Height);
  
    for(x=0; x<Pwidth*Height; x++)
-@@ -199,3 +224,10 @@
+@@ -199,3 +225,10 @@ int main(int argc,char** argv)
  
    return 0;
  }
@@ -892,3 +838,57 @@
 +
 +
 +
+diff -up pbm2ppa-0.8.6/README.REDHAT.20000205 pbm2ppa-0.8.6/README.REDHAT
+--- pbm2ppa-0.8.6/README.REDHAT.20000205	1998-08-22 14:48:40.000000000 +0100
++++ pbm2ppa-0.8.6/README.REDHAT	2008-09-24 15:15:53.000000000 +0100
+@@ -1,12 +1,28 @@
+-RedHat users may find the following tip from Panayotis Vryonis <vrypan at hol.gr>
+-helpful!
++The best way to integrate support for the HP PPA Printers into RedHat's
++Linux Print System Manager (printtool) is to replace e.g., the
++rhs-printfilters-1.57-3 RPM package that comes with Red Hat 6.1,
++with a  PPA-aware version from the pnm2ppa project  whic h has a
++homepage at http://www.sourceforge.net/projects/?group_id=1322
+ 
+-Here is a tip to intergrate HP720C support in RedHat's printtool:
++At the time of writing, the latest release is
++     rhs-printfilters-1.57-4ppa1
++This package includes support for both pbm2ppa and the new
++color driver pnm2ppa.
+ 
+-Install pbm2ppa. Copy pbm2ppa to /usr/bin.
+-Edit "printerdb" (in my system it is found in
+-/usr/lib/rhs/rhs-printfilters )
+-and append the following lines:
++   -------------------------------------
++
++If for some reason, they cannot use this PPA-aware version of
++rhs-printfilters, RedHat users may still find the following tip from 
++Panayotis Vryonis <vrypan at hol.gr> helpful!  
++It will work with the standard rhs-printfilters that comes with  the 
++Red Hat release:
++	
++	Here is a tip to integrate HP720C support in RedHat's printtool:
++
++	Install pbm2ppa. Copy pbm2ppa to /usr/bin.
++	Edit "printerdb" (in my system it is found in	
++	/usr/lib/rhs/rhs-printfilters )
++	and append the following lines:
+ ----------------------Cut here
+ -------------------------------------------
+ StartEntry: DeskJet720C
+@@ -23,7 +39,11 @@ StartEntry: DeskJet720C
+ EndEntry
+ --------------------------------------------------------------------------
+ 
+-Now you can add an HP720C printer just like any other, using printtool.
++	Now you can add an HP720C printer just like any other, using printtool.
++
++	[Author's (P. Vryonis) Note: The same should work for the 820 and 
++	1000, but it hasn't been tested.  Also, use the pbmraw GSDriver if 
++	you have it; it's faster. ]
++
++
+ 
+-[Author's Note: The same should work for the 820 and 1000, but it hasn't
+-been tested.  Also, use the pbmraw GSDriver if you have it; it's faster. ]

pnm2ppa-redhat.patch:

Index: pnm2ppa-redhat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pnm2ppa/devel/pnm2ppa-redhat.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pnm2ppa-redhat.patch	9 Sep 2004 10:33:17 -0000	1.2
+++ pnm2ppa-redhat.patch	24 Sep 2008 14:20:32 -0000	1.3
@@ -1,16 +1,18 @@
-diff -uNr pnm2ppa-0.99pre3/pnm2ppa.conf pnm2ppa-0.99pre3-redhat/pnm2ppa.conf
---- pnm2ppa-0.99pre3/pnm2ppa.conf	Fri May 26 01:35:52 2000
-+++ pnm2ppa-0.99pre3-redhat/pnm2ppa.conf	Fri May 26 04:03:56 2000
-@@ -12,7 +12,6 @@
- # will be used.   The printer version can also be set with the command line
- # option e.g., "-v 720".
+diff -up pnm2ppa-1.04/Makefile.rh pnm2ppa-1.04/Makefile
+--- pnm2ppa-1.04/Makefile.rh	2000-11-02 18:33:08.000000000 +0000
++++ pnm2ppa-1.04/Makefile	2008-09-24 15:18:26.000000000 +0100
+@@ -10,7 +10,7 @@ CC=gcc
+ INSTALL=install
  
--version   ERROR    # PNM2PPA WIIL *NOT* WORK UNTIUL THIS ENTRY IS REMOVED!!!!
- #version  720	# 710, 712, 722 also acceptable
- #version  820
- #version 1000
---- pnm2ppa/pbm2ppa-0.8.6/Makefile.rh	Thu Feb 10 15:28:55 2000
-+++ pnm2ppa/pbm2ppa-0.8.6/Makefile	Thu Feb 10 15:30:06 2000
+ # production build
+-CFLAGS=-Wall -pedantic -O2 -g -DNDEBUG 
++CFLAGS=$(RPM_OPT_FLAGS) -DNDEBUG 
+ LDFLAGS=-lm
+ OBJS = pnm2ppa.o syslog.o ppa.o image.o dither.o cutswath.o hash_ink.o gamma.o
+ SRC =  pnm2ppa.c syslog.c ppa.c image.c dither.c cutswath.c hash_ink.c gamma.c
+diff -up pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile.rh pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile
+--- pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile.rh	2008-09-24 15:18:26.000000000 +0100
++++ pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile	2008-09-24 15:18:26.000000000 +0100
 @@ -1,5 +1,5 @@
  CC=gcc
 -CFLAGS=-Wall -O2 
@@ -18,17 +20,14 @@
  LDFLAGS=
  PRINTER=HP720
  
---- pnm2ppa/Makefile.rh	Thu Feb 10 15:29:06 2000
-+++ pnm2ppa/Makefile	Thu Feb 10 15:29:39 2000
-@@ -9,7 +9,7 @@
- INSTALL=install
+diff -up pnm2ppa-1.04/pnm2ppa.conf.rh pnm2ppa-1.04/pnm2ppa.conf
+--- pnm2ppa-1.04/pnm2ppa.conf.rh	2000-10-28 16:02:57.000000000 +0100
++++ pnm2ppa-1.04/pnm2ppa.conf	2008-09-24 15:18:26.000000000 +0100
+@@ -12,7 +12,6 @@
+ # will be used.   The printer version can also be set with the command line
+ # option e.g., "-v 720".
  
- # production build
--CFLAGS=-Wall -pedantic -O2 -g -DNDEBUG 
-+CFLAGS=$(RPM_OPT_FLAGS) -DNDEBUG 
- LDFLAGS=-lm
- OBJS = pnm2ppa.o ppa.o image.o dither.o cutswath.o hash_ink.o
- SRC =  pnm3ppa.c ppa.c image.c dither.c cutswath.c hash_ink.c
---- pnm2ppa.conf	Tue Dec 12 05:13:59 2000
-+++ foo	Tue Dec 12 05:15:57 2000
-
+-version   ERROR    # PNM2PPA WIIL *NOT* WORK UNTIUL THIS ENTRY IS REMOVED!!!!
+ #version  720	# 710, 712, 722 also acceptable
+ #version  820
+ #version 1000


Index: pnm2ppa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pnm2ppa/devel/pnm2ppa.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pnm2ppa.spec	13 Feb 2008 10:45:55 -0000	1.12
+++ pnm2ppa.spec	24 Sep 2008 14:20:32 -0000	1.13
@@ -3,7 +3,7 @@
 Epoch: 1
 Obsoletes: ppa
 Version: 1.04
-Release: 15%{?dist}
+Release: 16%{?dist}
 URL: http://sourceforge.net/projects/pnm2ppa 
 Source: http://download.sourceforge.net/pnm2ppa/pnm2ppa-%{version}.tar.gz
 Source1: http://www.httptech.com/ppa/files/ppa-0.8.6.tar.gz
@@ -29,7 +29,7 @@
 
 #pbm2ppa source
 %setup -T -D -a 1 -n %{topdir}
-%patch2 -p0
+%patch2 -p0 -b .20000205
 %patch3 -p1 -b .rh
 
 %build
@@ -80,6 +80,9 @@
 %config /etc/pbm2ppa.conf
 
 %changelog
+* Wed Sep 24 2008 Tim Waugh <twaugh at redhat.com> 1:1.04-16
+- Removed patch fuzz.
+
 * Wed Feb 13 2008 Tim Waugh <twaugh at redhat.com> 1:1.04-15
 - Rebuild for GCC 4.3.
 



From mclasen at fedoraproject.org  Wed Sep 24 14:20:35 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 24 Sep 2008 14:20:35 +0000 (UTC)
Subject: rpms/gtk2/devel .cvsignore, 1.93, 1.94 gtk2.spec, 1.326,
	1.327 sources, 1.101, 1.102
Message-ID: <20080924142035.D374570103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26530

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- .cvsignore	18 Sep 2008 05:02:59 -0000	1.93
+++ .cvsignore	24 Sep 2008 14:20:05 -0000	1.94
@@ -1 +1 @@
-gtk+-2.14.2.tar.bz2
+gtk+-2.14.3.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- gtk2.spec	23 Sep 2008 02:32:47 -0000	1.326
+++ gtk2.spec	24 Sep 2008 14:20:05 -0000	1.327
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.14.2
+%define base_version 2.14.3
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 5%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
@@ -30,11 +30,6 @@
 # a workaround for some brokenness in the flash plugin
 # see http://bugzilla.gnome.org/show_bug.cgi?id=463773
 Patch2: workaround.patch
-# fixed upstream
-Patch3: info-leak.patch
-# fixed upstream
-Patch4: gail-leaks.patch
-Patch5: bad-filechooser.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -121,9 +116,6 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
-%patch3 -p1 -b .info-leak
-%patch4 -p1 -b .gail-leaks
-%patch5 -p0 -b .bad-filechooser 
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -307,6 +299,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Wed Sep 24 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1
+- Update to 2.14.3
+
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.2-5
 - Rebuild
 - Fix a filechooser crash


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- sources	18 Sep 2008 05:02:59 -0000	1.101
+++ sources	24 Sep 2008 14:20:05 -0000	1.102
@@ -1 +1 @@
-b693a2c1c2dd95457b87d0d042aa5bba  gtk+-2.14.2.tar.bz2
+359e44c8e47dfe04a09ac09b8e015e58  gtk+-2.14.3.tar.bz2



From kraxel at fedoraproject.org  Wed Sep 24 14:27:52 2008
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Wed, 24 Sep 2008 14:27:52 +0000 (UTC)
Subject: rpms/xenner/devel .cvsignore, 1.21, 1.22 sources, 1.20,
	1.21 xenner.spec, 1.33, 1.34
Message-ID: <20080924142752.ED00770103@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xenner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27945

Modified Files:
	.cvsignore sources xenner.spec 
Log Message:
- update to version 0.45


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	4 Sep 2008 10:53:37 -0000	1.21
+++ .cvsignore	24 Sep 2008 14:27:22 -0000	1.22
@@ -1 +1 @@
-xenner-0.44.tar.gz
+xenner-0.45.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	4 Sep 2008 10:53:37 -0000	1.20
+++ sources	24 Sep 2008 14:27:22 -0000	1.21
@@ -1 +1 @@
-ddb4ff50a64ee1a84f9d3337c09b1c79  xenner-0.44.tar.gz
+371789ce3ae650a60964a7f25968b9ba  xenner-0.45.tar.gz


Index: xenner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/devel/xenner.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xenner.spec	4 Sep 2008 10:53:37 -0000	1.33
+++ xenner.spec	24 Sep 2008 14:27:22 -0000	1.34
@@ -1,6 +1,6 @@
 Name:         xenner
 License:      GPLv2+
-Version:      0.44
+Version:      0.45
 Release:      1%{?dist}
 Summary:      Xen emulator for kvm
 Group:        Applications/Emulators
@@ -57,6 +57,8 @@
 rm -rf %{buildroot}
 
 %changelog
+* Thu Sep 24 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.45-1.fc10
+- update to version 0.45
 * Thu Sep 4 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.44-1.fc10
 - update to version 0.44
 * Mon Sep 1 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.43-1.fc10



From silfreed at fedoraproject.org  Wed Sep 24 14:38:47 2008
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Wed, 24 Sep 2008 14:38:47 +0000 (UTC)
Subject: rpms/eventlog/devel .cvsignore, 1.2, 1.3 eventlog.spec, 1.11,
	1.12 sources, 1.2, 1.3
Message-ID: <20080924143847.C96DD70103@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/eventlog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29441

Modified Files:
	.cvsignore eventlog.spec sources 
Log Message:
* Wed Apr 09 2008 Douglas E. Warner <silfreed at silfreed.net> 0.2.7-1
- updated to 0.2.7 library
- removed static library



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eventlog/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Sep 2006 18:38:36 -0000	1.2
+++ .cvsignore	24 Sep 2008 14:38:17 -0000	1.3
@@ -1 +1 @@
-eventlog-0.2.5.tar.gz
+eventlog-0.2.7.tar.gz


Index: eventlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eventlog/devel/eventlog.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eventlog.spec	19 Feb 2008 23:58:38 -0000	1.11
+++ eventlog.spec	24 Sep 2008 14:38:17 -0000	1.12
@@ -1,26 +1,18 @@
-#
-# Rebuild option:
-#
-#   --with static             creates the -static subpackage
-#
-
-%define static  0
-
-%{?_with_static:%define static 1}
-
-
 %define libdir /%{_lib}
 
-Name:           eventlog
-Version:        0.2.5
-Release:        9%{?dist}
-Summary:        Syslog-ng v2 support library
-
-Group:          System Environment/Libraries
-License:        BSD
-Url:            http://www.balabit.com/products/syslog-ng/
-Source:         http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/eventlog-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name: eventlog
+Version: 0.2.7
+Release: 1%{?dist}
+Summary: Syslog-ng v2 support library
+
+Group: System Environment/Libraries
+License: BSD
+Url: http://www.balabit.com/products/syslog-ng/
+Source:  http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
 The EventLog library aims to be a replacement of the simple syslog() API
@@ -35,12 +27,9 @@
 
 
 %package devel
-Summary:        Syslog-ng v2 support library development files
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-%if ! %{static}
-Obsoletes:      eventlog-static
-%endif
+Summary: Syslog-ng v2 support library development files
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 The EventLog library aims to be a replacement of the simple syslog() API
@@ -54,45 +43,33 @@
 This package contains the development files.
 
 
-%if %{static}
-%package static
-Summary:        Eventlog static library
-Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
-
-%description static
-The eventlog-static package includes the eventlog static library.
-%endif
-
-
 %prep
 %setup -q
 
+
 %build
 %configure
 make %{?_smp_mflags}
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
 # we build into /usr/lib,
 # but we want the library (but not the devel stuff) in /lib
-install -d -m 755 $RPM_BUILD_ROOT/%{_lib}
-pushd $RPM_BUILD_ROOT%{_libdir}
-mv libevtlog.so.* ../../%{_lib}
+install -d -m 755 %{buildroot}/%{libdir}
+pushd %{buildroot}%{_libdir}
+mv libevtlog.so.* %{buildroot}/%{libdir}
 ln -sf ../../%{_lib}/libevtlog.so.*.* libevtlog.so
 popd
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/libevtlog.la
-
-%if ! %{static}
-rm -f $RPM_BUILD_ROOT%{_libdir}/libevtlog.a
-%endif
+rm -f %{buildroot}%{_libdir}/libevtlog.la
+rm -f %{buildroot}%{_libdir}/libevtlog.a
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -103,24 +80,22 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README
-%{libdir}/libevtlog.so.0
-%{libdir}/libevtlog.so.0.0.0
+%{libdir}/libevtlog.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/*
 %{_libdir}/libevtlog.so
 %{_libdir}/pkgconfig/eventlog.pc
-%{_includedir}/%{name}/
-
-%if %{static}
-%files static
-%defattr(-,root,root,-)
-%{_libdir}/libevtlog.a
-%endif
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}
 
 
 %changelog
+* Wed Apr 09 2008 Douglas E. Warner <silfreed at silfreed.net> 0.2.7-1
+- updated to 0.2.7 library
+- removed static library
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2.5-9
 - Autorebuild for GCC 4.3
 
@@ -168,4 +143,3 @@
 * Wed Jan 12 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.2.1-0.fdr.0
 - Initial build (version 0.2.1).
 
-# vim:set ai ts=4 sw=4 sts=4 et:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eventlog/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Sep 2006 18:38:36 -0000	1.2
+++ sources	24 Sep 2008 14:38:17 -0000	1.3
@@ -1 +1 @@
-a6bdba91f88540cc69b398fd138d86cd  eventlog-0.2.5.tar.gz
+51ac5bff610194ad57f3d632277bdf49  eventlog-0.2.7.tar.gz



From mclasen at fedoraproject.org  Wed Sep 24 14:40:01 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 24 Sep 2008 14:40:01 +0000 (UTC)
Subject: rpms/libsoup/devel .cvsignore, 1.38, 1.39 libsoup.spec, 1.73,
	1.74 sources, 1.38, 1.39
Message-ID: <20080924144001.0181070103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libsoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29289

Modified Files:
	.cvsignore libsoup.spec sources 
Log Message:
2.24.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsoup/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	22 Sep 2008 18:42:09 -0000	1.38
+++ .cvsignore	24 Sep 2008 14:39:30 -0000	1.39
@@ -1 +1 @@
-libsoup-2.24.0.tar.bz2
+libsoup-2.24.0.1.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/extras/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- libsoup.spec	22 Sep 2008 18:42:09 -0000	1.73
+++ libsoup.spec	24 Sep 2008 14:39:30 -0000	1.74
@@ -3,7 +3,7 @@
 ### Abstract ###
 
 Name: libsoup
-Version: 2.24.0
+Version: 2.24.0.1
 Release: 1%{?dist}
 License: LGPLv2
 Group: Development/Libraries
@@ -80,6 +80,9 @@
 %{_datadir}/gtk-doc/html/%{name}-2.4
 
 %changelog
+* Wed Sep 24 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0.1-1
+- Update to 2.24.0.1
+
 * Mon Sep 22 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-1
 - Update to 2.24.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsoup/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	22 Sep 2008 18:42:09 -0000	1.38
+++ sources	24 Sep 2008 14:39:30 -0000	1.39
@@ -1 +1 @@
-ffbccb92ec83a7278c5cbc8e64bbe10c  libsoup-2.24.0.tar.bz2
+44187699fe135f03a2a1adec702e1fa8  libsoup-2.24.0.1.tar.bz2



From silfreed at fedoraproject.org  Wed Sep 24 14:42:54 2008
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Wed, 24 Sep 2008 14:42:54 +0000 (UTC)
Subject: rpms/eventlog/F-9 .cvsignore, 1.2, 1.3 eventlog.spec, 1.11,
	1.12 sources, 1.2, 1.3
Message-ID: <20080924144254.3701D70103@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/eventlog/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30102

Modified Files:
	.cvsignore eventlog.spec sources 
Log Message:
* Wed Apr 09 2008 Douglas E. Warner <silfreed at silfreed.net> 0.2.7-1
- updated to 0.2.7 library
- removed static library



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eventlog/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Sep 2006 18:38:36 -0000	1.2
+++ .cvsignore	24 Sep 2008 14:42:23 -0000	1.3
@@ -1 +1 @@
-eventlog-0.2.5.tar.gz
+eventlog-0.2.7.tar.gz


Index: eventlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eventlog/F-9/eventlog.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eventlog.spec	19 Feb 2008 23:58:38 -0000	1.11
+++ eventlog.spec	24 Sep 2008 14:42:23 -0000	1.12
@@ -1,26 +1,18 @@
-#
-# Rebuild option:
-#
-#   --with static             creates the -static subpackage
-#
-
-%define static  0
-
-%{?_with_static:%define static 1}
-
-
 %define libdir /%{_lib}
 
-Name:           eventlog
-Version:        0.2.5
-Release:        9%{?dist}
-Summary:        Syslog-ng v2 support library
-
-Group:          System Environment/Libraries
-License:        BSD
-Url:            http://www.balabit.com/products/syslog-ng/
-Source:         http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/eventlog-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name: eventlog
+Version: 0.2.7
+Release: 1%{?dist}
+Summary: Syslog-ng v2 support library
+
+Group: System Environment/Libraries
+License: BSD
+Url: http://www.balabit.com/products/syslog-ng/
+Source:  http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
 The EventLog library aims to be a replacement of the simple syslog() API
@@ -35,12 +27,9 @@
 
 
 %package devel
-Summary:        Syslog-ng v2 support library development files
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-%if ! %{static}
-Obsoletes:      eventlog-static
-%endif
+Summary: Syslog-ng v2 support library development files
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 The EventLog library aims to be a replacement of the simple syslog() API
@@ -54,45 +43,33 @@
 This package contains the development files.
 
 
-%if %{static}
-%package static
-Summary:        Eventlog static library
-Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
-
-%description static
-The eventlog-static package includes the eventlog static library.
-%endif
-
-
 %prep
 %setup -q
 
+
 %build
 %configure
 make %{?_smp_mflags}
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
 # we build into /usr/lib,
 # but we want the library (but not the devel stuff) in /lib
-install -d -m 755 $RPM_BUILD_ROOT/%{_lib}
-pushd $RPM_BUILD_ROOT%{_libdir}
-mv libevtlog.so.* ../../%{_lib}
+install -d -m 755 %{buildroot}/%{libdir}
+pushd %{buildroot}%{_libdir}
+mv libevtlog.so.* %{buildroot}/%{libdir}
 ln -sf ../../%{_lib}/libevtlog.so.*.* libevtlog.so
 popd
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/libevtlog.la
-
-%if ! %{static}
-rm -f $RPM_BUILD_ROOT%{_libdir}/libevtlog.a
-%endif
+rm -f %{buildroot}%{_libdir}/libevtlog.la
+rm -f %{buildroot}%{_libdir}/libevtlog.a
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -103,24 +80,22 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README
-%{libdir}/libevtlog.so.0
-%{libdir}/libevtlog.so.0.0.0
+%{libdir}/libevtlog.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/*
 %{_libdir}/libevtlog.so
 %{_libdir}/pkgconfig/eventlog.pc
-%{_includedir}/%{name}/
-
-%if %{static}
-%files static
-%defattr(-,root,root,-)
-%{_libdir}/libevtlog.a
-%endif
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}
 
 
 %changelog
+* Wed Apr 09 2008 Douglas E. Warner <silfreed at silfreed.net> 0.2.7-1
+- updated to 0.2.7 library
+- removed static library
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2.5-9
 - Autorebuild for GCC 4.3
 
@@ -168,4 +143,3 @@
 * Wed Jan 12 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.2.1-0.fdr.0
 - Initial build (version 0.2.1).
 
-# vim:set ai ts=4 sw=4 sts=4 et:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eventlog/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Sep 2006 18:38:36 -0000	1.2
+++ sources	24 Sep 2008 14:42:23 -0000	1.3
@@ -1 +1 @@
-a6bdba91f88540cc69b398fd138d86cd  eventlog-0.2.5.tar.gz
+51ac5bff610194ad57f3d632277bdf49  eventlog-0.2.7.tar.gz



From silfreed at fedoraproject.org  Wed Sep 24 14:44:06 2008
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Wed, 24 Sep 2008 14:44:06 +0000 (UTC)
Subject: rpms/eventlog/F-8 .cvsignore, 1.2, 1.3 eventlog.spec, 1.10,
	1.11 sources, 1.2, 1.3
Message-ID: <20080924144406.1FD5770103@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/eventlog/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30296

Modified Files:
	.cvsignore eventlog.spec sources 
Log Message:
* Wed Apr 09 2008 Douglas E. Warner <silfreed at silfreed.net> 0.2.7-1
- updated to 0.2.7 library
- removed static library



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eventlog/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Sep 2006 18:38:36 -0000	1.2
+++ .cvsignore	24 Sep 2008 14:43:35 -0000	1.3
@@ -1 +1 @@
-eventlog-0.2.5.tar.gz
+eventlog-0.2.7.tar.gz


Index: eventlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eventlog/F-8/eventlog.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- eventlog.spec	7 Jun 2007 19:42:43 -0000	1.10
+++ eventlog.spec	24 Sep 2008 14:43:35 -0000	1.11
@@ -1,26 +1,18 @@
-#
-# Rebuild option:
-#
-#   --with static             creates the -static subpackage
-#
-
-%define static  0
-
-%{?_with_static:%define static 1}
-
-
 %define libdir /%{_lib}
 
-Name:           eventlog
-Version:        0.2.5
-Release:        8%{?dist}
-Summary:        Syslog-ng v2 support library
-
-Group:          System Environment/Libraries
-License:        BSD
-Url:            http://www.balabit.com/products/syslog-ng/
-Source:         http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/eventlog-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name: eventlog
+Version: 0.2.7
+Release: 1%{?dist}
+Summary: Syslog-ng v2 support library
+
+Group: System Environment/Libraries
+License: BSD
+Url: http://www.balabit.com/products/syslog-ng/
+Source:  http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
 The EventLog library aims to be a replacement of the simple syslog() API
@@ -35,12 +27,9 @@
 
 
 %package devel
-Summary:        Syslog-ng v2 support library development files
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-%if ! %{static}
-Obsoletes:      eventlog-static
-%endif
+Summary: Syslog-ng v2 support library development files
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 The EventLog library aims to be a replacement of the simple syslog() API
@@ -54,45 +43,33 @@
 This package contains the development files.
 
 
-%if %{static}
-%package static
-Summary:        Eventlog static library
-Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
-
-%description static
-The eventlog-static package includes the eventlog static library.
-%endif
-
-
 %prep
 %setup -q
 
+
 %build
 %configure
 make %{?_smp_mflags}
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
 # we build into /usr/lib,
 # but we want the library (but not the devel stuff) in /lib
-install -d -m 755 $RPM_BUILD_ROOT/%{_lib}
-pushd $RPM_BUILD_ROOT%{_libdir}
-mv libevtlog.so.* ../../%{_lib}
+install -d -m 755 %{buildroot}/%{libdir}
+pushd %{buildroot}%{_libdir}
+mv libevtlog.so.* %{buildroot}/%{libdir}
 ln -sf ../../%{_lib}/libevtlog.so.*.* libevtlog.so
 popd
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/libevtlog.la
-
-%if ! %{static}
-rm -f $RPM_BUILD_ROOT%{_libdir}/libevtlog.a
-%endif
+rm -f %{buildroot}%{_libdir}/libevtlog.la
+rm -f %{buildroot}%{_libdir}/libevtlog.a
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -103,24 +80,25 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README
-%{libdir}/libevtlog.so.0
-%{libdir}/libevtlog.so.0.0.0
+%{libdir}/libevtlog.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/*
 %{_libdir}/libevtlog.so
 %{_libdir}/pkgconfig/eventlog.pc
-%{_includedir}/%{name}/
-
-%if %{static}
-%files static
-%defattr(-,root,root,-)
-%{_libdir}/libevtlog.a
-%endif
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}
 
 
 %changelog
+* Wed Apr 09 2008 Douglas E. Warner <silfreed at silfreed.net> 0.2.7-1
+- updated to 0.2.7 library
+- removed static library
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2.5-9
+- Autorebuild for GCC 4.3
+
 * Thu Jun  7 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.2.5-8
 - Fixed URL typo.
 
@@ -165,4 +143,3 @@
 * Wed Jan 12 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.2.1-0.fdr.0
 - Initial build (version 0.2.1).
 
-# vim:set ai ts=4 sw=4 sts=4 et:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eventlog/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Sep 2006 18:38:36 -0000	1.2
+++ sources	24 Sep 2008 14:43:35 -0000	1.3
@@ -1 +1 @@
-a6bdba91f88540cc69b398fd138d86cd  eventlog-0.2.5.tar.gz
+51ac5bff610194ad57f3d632277bdf49  eventlog-0.2.7.tar.gz



From twaugh at fedoraproject.org  Wed Sep 24 14:47:01 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 24 Sep 2008 14:47:01 +0000 (UTC)
Subject: rpms/a2ps/devel a2ps-external-libtool.patch, 1.1, 1.2 a2ps-mb.patch,
	1.1, 1.2 a2ps.spec, 1.88, 1.89
Message-ID: <20080924144701.308EE70103@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/a2ps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30687

Modified Files:
	a2ps-external-libtool.patch a2ps-mb.patch a2ps.spec 
Log Message:
* Wed Sep 24 2008 Tim Waugh <twaugh at redhat.com> 4.14-6
- Removed patch fuzz.


a2ps-external-libtool.patch:

Index: a2ps-external-libtool.patch
===================================================================
RCS file: /cvs/pkgs/rpms/a2ps/devel/a2ps-external-libtool.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- a2ps-external-libtool.patch	8 Mar 2007 17:09:57 -0000	1.1
+++ a2ps-external-libtool.patch	24 Sep 2008 14:46:30 -0000	1.2
@@ -1,12 +1,13 @@
---- a2ps-4.13/configure.external-libtool	2007-02-28 22:32:48.000000000 +0100
-+++ a2ps-4.13/configure	2007-02-28 22:32:48.000000000 +0100
-@@ -2673,7 +2673,8 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+diff -up a2ps-4.14/configure.external-libtool a2ps-4.14/configure
+--- a2ps-4.14/configure.external-libtool	2008-09-24 15:28:13.000000000 +0100
++++ a2ps-4.14/configure	2008-09-24 15:28:13.000000000 +0100
+@@ -21864,7 +21864,8 @@ fi
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
 -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 +#LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 +LIBTOOL='/usr/bin/libtool'
  
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
+ # Prevent multiple expansion
+ 

a2ps-mb.patch:

Index: a2ps-mb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/a2ps/devel/a2ps-mb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- a2ps-mb.patch	25 Oct 2006 15:24:34 -0000	1.1
+++ a2ps-mb.patch	24 Sep 2008 14:46:30 -0000	1.2
@@ -1,7 +1,8 @@
---- a2ps-4.13/lib/psgen.c.mb	2006-10-25 16:16:44.000000000 +0100
-+++ a2ps-4.13/lib/psgen.c	2006-10-25 16:18:54.000000000 +0100
-@@ -97,7 +97,8 @@
-   fprintf(stderr,"%d\n",job->status->face);
+diff -up a2ps-4.14/lib/psgen.c.mb a2ps-4.14/lib/psgen.c
+--- a2ps-4.14/lib/psgen.c.mb	2008-09-24 15:29:30.000000000 +0100
++++ a2ps-4.14/lib/psgen.c	2008-09-24 15:29:30.000000000 +0100
+@@ -96,7 +96,8 @@ ps_escape_char (a2ps_job * job, uchar c,
+   /* Printable, but not 7bit clean caracters */
    if (encoding_char_exists (job->encoding, job->status->face, c)
        && ((0177 < c) || (c < 040))) {
 -    sprintf ((char *)res, "%s\\%o", res, c);
@@ -10,7 +11,7 @@
      return 1;
    }
  
-@@ -894,8 +895,8 @@
+@@ -893,8 +894,8 @@ ps_print_char (a2ps_job * job, int c, en
    if (c > 127 && encoding_get_composite_flag (job->encoding) &&
        job->status->face != Symbol) {
      if (mb_flag) {


Index: a2ps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- a2ps.spec	29 May 2008 16:14:55 -0000	1.88
+++ a2ps.spec	24 Sep 2008 14:46:30 -0000	1.89
@@ -13,7 +13,7 @@
 Summary: Converts text and other types of files to PostScript(TM)
 Name: a2ps
 Version: 4.14
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Source0: http://ftp.gnu.org/gnu/a2ps/%{name}-%{version}.tar.gz
@@ -288,6 +288,9 @@
 %{emacs_lispdir}/*.el
 
 %changelog
+* Wed Sep 24 2008 Tim Waugh <twaugh at redhat.com> 4.14-6
+- Removed patch fuzz.
+
 * Thu May 29 2008 Tim Waugh <twaugh at redhat.com> 4.14-5
 - Removed old patches.
 



From mclasen at fedoraproject.org  Wed Sep 24 14:48:35 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 24 Sep 2008 14:48:35 +0000 (UTC)
Subject: rpms/gnome-media/devel .cvsignore, 1.46, 1.47 gnome-media.spec,
	1.141, 1.142 sources, 1.45, 1.46
Message-ID: <20080924144835.7FD3E70103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31051

Modified Files:
	.cvsignore gnome-media.spec sources 
Log Message:
2.24.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-media/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	23 Sep 2008 05:00:43 -0000	1.46
+++ .cvsignore	24 Sep 2008 14:48:05 -0000	1.47
@@ -1 +1 @@
-gnome-media-2.24.0.tar.bz2
+gnome-media-2.24.0.1.tar.bz2


Index: gnome-media.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- gnome-media.spec	23 Sep 2008 05:00:43 -0000	1.141
+++ gnome-media.spec	24 Sep 2008 14:48:05 -0000	1.142
@@ -13,7 +13,7 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.24.0
+Version:        2.24.0.1
 Release:        1%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
@@ -201,6 +201,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Sep 24 2008 Matthias Clasen <mclasen at redhat.com>  2.24.0.1-1
+- Update to 2.24.0
+
 * Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com>  2.24.0-1
 - Update to 2.24.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-media/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	23 Sep 2008 05:00:43 -0000	1.45
+++ sources	24 Sep 2008 14:48:05 -0000	1.46
@@ -1 +1 @@
-f2eedfe741d2dfc028fde45eb61eb6fc  gnome-media-2.24.0.tar.bz2
+d0a9b0784872cecd09038aceea22e16f  gnome-media-2.24.0.1.tar.bz2



From ovasik at fedoraproject.org  Wed Sep 24 14:49:30 2008
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed, 24 Sep 2008 14:49:30 +0000 (UTC)
Subject: rpms/docbook-dtds/devel docbook-dtds.spec,1.24,1.25
Message-ID: <20080924144930.B71B370103@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-dtds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31224

Modified Files:
	docbook-dtds.spec 
Log Message:
Fixed wrong filenames for xml-dtd-4.4 and xml-dtd-4.5 iso entities(#461206) , fixed /ent/iso-cyrl.ent typo, fixed broken unregistration of xml-dtds from catalog due to missing CAT_DIR variable


Index: docbook-dtds.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-dtds/devel/docbook-dtds.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- docbook-dtds.spec	29 Aug 2008 12:56:03 -0000	1.24
+++ docbook-dtds.spec	24 Sep 2008 14:49:00 -0000	1.25
@@ -1,6 +1,6 @@
 Name: docbook-dtds
 Version: 1.0
-Release: 39%{?dist}
+Release: 40%{?dist}
 Group: Applications/Text
 
 Summary: SGML and XML document type definitions for DocBook
@@ -342,9 +342,6 @@
 touch $RPM_BUILD_ROOT/etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat
 touch $RPM_BUILD_ROOT/etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat
 
-
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -699,7 +696,7 @@
     "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
     "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
@@ -788,7 +785,7 @@
     "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
     "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
@@ -877,7 +874,7 @@
     "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
     "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
@@ -915,43 +912,43 @@
   # DocBook XML V4.4
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isopub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isobox.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML V4.4//EN" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isonum.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Character Entities V4.4//EN" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Notations V4.4//EN" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isodia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.4//EN" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG
@@ -960,19 +957,19 @@
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isotech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG
@@ -981,19 +978,19 @@
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org/docbook/xml/4.4" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG
@@ -1004,43 +1001,43 @@
    # DocBook XML V4.5
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isopub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isobox.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML V4.5//EN" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isonum.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isodia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG
@@ -1049,19 +1046,19 @@
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isotech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG
@@ -1070,19 +1067,19 @@
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org/docbook/xml/4.5" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG
@@ -1189,6 +1186,7 @@
 ## XML catalog
 ##
 
+CAT_DIR=/usr/share/sgml/docbook/
 CATALOG=/usr/share/sgml/docbook/xmlcatalog
 
 if [ -w $CATALOG ]
@@ -1229,7 +1227,7 @@
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
@@ -1287,7 +1285,7 @@
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
@@ -1345,7 +1343,7 @@
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
@@ -1369,122 +1367,130 @@
 
   # DocBook XML V4.4
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isopub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isobox.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isonum.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isodia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isotech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG
 
   # DocBook XML V4.5
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isopub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isobox.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isonum.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isodia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isotech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG
 fi
 
 %changelog
+* Wed Sep 24 2008 Ondrej Vasik <ovasik at redhat.com> - 1.0-40
+- Fix wrong filenames for xml-dtd-4.4 and xml-dtd-4.5 
+  iso entities(#461206)
+- /ent/iso-cyr1.ent now correctly registered in xml catalog
+  (there was /ent/iso-cyrl.ent typo)
+- fixed broken unregistration of xml-dtds from catalog
+  (missing CAT_DIR variable)
+
 * Fri Aug 29 2008 Ondrej Vasik <ovasik at redhat.com> - 1.0-39
 - rebuild with F9 spec file to fix some heavy-weight black 
   magic causing failures of sgml documents 



From dbhole at fedoraproject.org  Wed Sep 24 14:52:28 2008
From: dbhole at fedoraproject.org (Deepak Bhole)
Date: Wed, 24 Sep 2008 14:52:28 +0000 (UTC)
Subject: rpms/plexus-xmlrpc/devel plexus-xmlrpc-add-codec-dep.patch, 1.1,
	1.2 plexus-xmlrpc.spec, 1.10, 1.11
Message-ID: <20080924145228.D68BF70103@cvs1.fedora.phx.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-xmlrpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31819

Modified Files:
	plexus-xmlrpc-add-codec-dep.patch plexus-xmlrpc.spec 
Log Message:

- Update patch0 to remove fuzz.



plexus-xmlrpc-add-codec-dep.patch:

Index: plexus-xmlrpc-add-codec-dep.patch
===================================================================
RCS file: /cvs/extras/rpms/plexus-xmlrpc/devel/plexus-xmlrpc-add-codec-dep.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plexus-xmlrpc-add-codec-dep.patch	13 Mar 2007 21:00:00 -0000	1.1
+++ plexus-xmlrpc-add-codec-dep.patch	24 Sep 2008 14:51:58 -0000	1.2
@@ -1,5 +1,6 @@
---- ./pom.xml.sav	2006-10-17 18:12:03.000000000 -0400
-+++ ./pom.xml	2006-10-17 18:12:08.000000000 -0400
+diff -up ./pom.xml.sav ./pom.xml
+--- ./pom.xml.sav	2008-09-24 10:51:06.000000000 -0400
++++ ./pom.xml	2008-09-24 10:51:01.000000000 -0400
 @@ -14,6 +14,12 @@
        <artifactId>xmlrpc</artifactId>
        <version>1.2</version>


Index: plexus-xmlrpc.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-xmlrpc/devel/plexus-xmlrpc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plexus-xmlrpc.spec	9 Jul 2008 21:50:53 -0000	1.10
+++ plexus-xmlrpc.spec	24 Sep 2008 14:51:58 -0000	1.11
@@ -42,7 +42,7 @@
 
 Name:           plexus-xmlrpc
 Version:        1.0
-Release:        0.2.b4.2.9%{?dist}
+Release:        0.2.b4.2.10%{?dist}
 Epoch:          0
 Summary:        Plexus XML RPC Component
 License:        ASL 1.1 and MIT
@@ -209,6 +209,9 @@
 %doc %{_javadocdir}/*
 
 %changelog
+* Wed Sep 24 2008 Deepak Bhole <dbhole at redhat.com> 1.0-0.2.b4.2.10
+- Update patch0 to remove fuzz.
+
 * Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-0.2.b4.2.9
 - drop repotag
 



From pkgdb at fedoraproject.org  Wed Sep 24 14:54:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 14:54:34 +0000
Subject: [pkgdb] python-xmpp: silfreed has given up commit
Message-ID: <20080924145434.67DB4208DA6@bastion.fedora.phx.redhat.com>

silfreed has given up the commit acl on python-xmpp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From pkgdb at fedoraproject.org  Wed Sep 24 14:54:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 14:54:35 +0000
Subject: [pkgdb] python-xmpp: silfreed has given up watchcommits
Message-ID: <20080924145435.76115208DAA@bastion.fedora.phx.redhat.com>

silfreed has given up the watchcommits acl on python-xmpp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From pkgdb at fedoraproject.org  Wed Sep 24 14:54:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 14:54:37 +0000
Subject: [pkgdb] python-xmpp: silfreed has given up watchbugzilla
Message-ID: <20080924145437.27B25208DA4@bastion.fedora.phx.redhat.com>

silfreed has given up the watchbugzilla acl on python-xmpp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From pkgdb at fedoraproject.org  Wed Sep 24 14:54:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 14:54:38 +0000
Subject: [pkgdb] python-xmpp: silfreed has given up watchbugzilla
Message-ID: <20080924145438.64936208DAD@bastion.fedora.phx.redhat.com>

silfreed has given up the watchbugzilla acl on python-xmpp (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From pkgdb at fedoraproject.org  Wed Sep 24 14:54:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 14:54:39 +0000
Subject: [pkgdb] python-xmpp: silfreed has given up watchcommits
Message-ID: <20080924145439.14BCB208DB1@bastion.fedora.phx.redhat.com>

silfreed has given up the watchcommits acl on python-xmpp (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From pkgdb at fedoraproject.org  Wed Sep 24 14:54:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 14:54:39 +0000
Subject: [pkgdb] python-xmpp: silfreed has given up commit
Message-ID: <20080924145439.DCBA2208DB3@bastion.fedora.phx.redhat.com>

silfreed has given up the commit acl on python-xmpp (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From pkgdb at fedoraproject.org  Wed Sep 24 14:54:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 14:54:43 +0000
Subject: [pkgdb] python-xmpp: silfreed has given up watchbugzilla
Message-ID: <20080924145443.88654208DB7@bastion.fedora.phx.redhat.com>

silfreed has given up the watchbugzilla acl on python-xmpp (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From pkgdb at fedoraproject.org  Wed Sep 24 14:54:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 14:54:44 +0000
Subject: [pkgdb] python-xmpp: silfreed has given up watchcommits
Message-ID: <20080924145444.194C5208DBA@bastion.fedora.phx.redhat.com>

silfreed has given up the watchcommits acl on python-xmpp (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From pkgdb at fedoraproject.org  Wed Sep 24 14:54:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 14:54:45 +0000
Subject: [pkgdb] python-xmpp: silfreed has given up commit
Message-ID: <20080924145445.56FE9208DBC@bastion.fedora.phx.redhat.com>

silfreed has given up the commit acl on python-xmpp (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From pkgdb at fedoraproject.org  Wed Sep 24 14:54:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 14:54:46 +0000
Subject: [pkgdb] python-xmpp: silfreed has given up watchcommits
Message-ID: <20080924145446.16424208DC2@bastion.fedora.phx.redhat.com>

silfreed has given up the watchcommits acl on python-xmpp (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From pkgdb at fedoraproject.org  Wed Sep 24 14:54:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 14:54:45 +0000
Subject: [pkgdb] python-xmpp: silfreed has given up commit
Message-ID: <20080924145445.7C372208DC0@bastion.fedora.phx.redhat.com>

silfreed has given up the commit acl on python-xmpp (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From pkgdb at fedoraproject.org  Wed Sep 24 14:54:49 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 14:54:49 +0000
Subject: [pkgdb] python-xmpp: silfreed has given up watchbugzilla
Message-ID: <20080924145450.2E789208DC7@bastion.fedora.phx.redhat.com>

silfreed has given up the watchbugzilla acl on python-xmpp (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From pkgdb at fedoraproject.org  Wed Sep 24 14:54:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 14:54:50 +0000
Subject: [pkgdb] python-xmpp: silfreed has given up watchbugzilla
Message-ID: <20080924145450.0044B208DC5@bastion.fedora.phx.redhat.com>

silfreed has given up the watchbugzilla acl on python-xmpp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From pkgdb at fedoraproject.org  Wed Sep 24 14:54:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 14:54:50 +0000
Subject: [pkgdb] python-xmpp: silfreed has given up watchcommits
Message-ID: <20080924145450.86770208DCA@bastion.fedora.phx.redhat.com>

silfreed has given up the watchcommits acl on python-xmpp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From pkgdb at fedoraproject.org  Wed Sep 24 14:54:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 14:54:51 +0000
Subject: [pkgdb] python-xmpp: silfreed has given up commit
Message-ID: <20080924145451.3F41E208DCD@bastion.fedora.phx.redhat.com>

silfreed has given up the commit acl on python-xmpp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From twaugh at fedoraproject.org  Wed Sep 24 14:57:30 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 24 Sep 2008 14:57:30 +0000 (UTC)
Subject: rpms/dos2unix/devel dos2unix.spec,1.33,1.34
Message-ID: <20080924145730.521C770103@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/dos2unix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv535

Modified Files:
	dos2unix.spec 
Log Message:
* Wed Sep 24 2008 Tim Waugh <twaugh at redhat.com> 3.1-34
- Moved 'make clean' to prep section and added comment about there
  being no upstream (bug #225706).



Index: dos2unix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dos2unix/devel/dos2unix.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- dos2unix.spec	8 Sep 2008 09:17:56 -0000	1.33
+++ dos2unix.spec	24 Sep 2008 14:57:00 -0000	1.34
@@ -1,10 +1,13 @@
 Summary: Text file format converter
 Name: dos2unix
 Version: 3.1
-Release: 33%{?dist}
+Release: 34%{?dist}
 Group: Applications/Text
 License: BSD
+
+# There is no upstream for this.
 Source: %{name}-%{version}.tar.bz2
+
 Patch0: %{name}-%{version}.patch
 Patch1: dos2unix-3.1-segfault.patch
 Patch2: dos2unix-3.1-safeconv.patch
@@ -38,9 +41,9 @@
 	sed -e 's,#endif.*,#endif,g' -e 's,#else.*,#else,g' $I > $I.new
 	mv -f $I.new $I
 done
+make clean
 
 %build
-make clean
 make CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE $(getconf LFS_CFLAGS)" \
   %{?_smp_mflags}
 
@@ -64,6 +67,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Sep 24 2008 Tim Waugh <twaugh at redhat.com> 3.1-34
+- Moved 'make clean' to prep section and added comment about there
+  being no upstream (bug #225706).
+
 * Mon Sep  8 2008 Tim Waugh <twaugh at redhat.com> 3.1-33
 - Preserve file modes (bug #437465).
 - Fixed manpage grammar (bug #460731).



From dbhole at fedoraproject.org  Wed Sep 24 14:58:04 2008
From: dbhole at fedoraproject.org (Deepak Bhole)
Date: Wed, 24 Sep 2008 14:58:04 +0000 (UTC)
Subject: rpms/tanukiwrapper/devel tanukiwrapper-nosun-jvm-64.patch, 1.1,
	1.2 tanukiwrapper.spec, 1.28, 1.29
Message-ID: <20080924145804.AF51970103@cvs1.fedora.phx.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/tanukiwrapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv770

Modified Files:
	tanukiwrapper-nosun-jvm-64.patch tanukiwrapper.spec 
Log Message:

- Update nosun-jvm-64.patch to remove fuzz



tanukiwrapper-nosun-jvm-64.patch:

Index: tanukiwrapper-nosun-jvm-64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tanukiwrapper/devel/tanukiwrapper-nosun-jvm-64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tanukiwrapper-nosun-jvm-64.patch	4 Aug 2006 23:02:25 -0000	1.1
+++ tanukiwrapper-nosun-jvm-64.patch	24 Sep 2008 14:58:04 -0000	1.2
@@ -1,8 +1,9 @@
---- ./build.xml.old	2006-08-04 02:49:07.000000000 -0400
-+++ ./build.xml	2006-08-04 02:50:25.000000000 -0400
+diff -up ./build.xml.sav ./build.xml
+--- ./build.xml.sav	2006-10-17 10:21:20.000000000 -0400
++++ ./build.xml	2008-09-24 10:57:02.000000000 -0400
 @@ -65,6 +65,7 @@
-                 <equals arg1="${os.arch}" arg2="IA32"/>
                  <equals arg1="${os.arch}" arg2="ia64"/>
+                 <equals arg1="${os.arch}" arg2="x86_64"/>
                  <equals arg1="${os.arch}" arg2="x86"/>
 +                <equals arg1="${os.arch}" arg2="x86_64"/>
                  <equals arg1="${os.arch}" arg2="i686"/>


Index: tanukiwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tanukiwrapper/devel/tanukiwrapper.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- tanukiwrapper.spec	10 Jul 2008 19:40:44 -0000	1.28
+++ tanukiwrapper.spec	24 Sep 2008 14:58:04 -0000	1.29
@@ -34,7 +34,7 @@
 
 Name:		tanukiwrapper
 Version:	3.2.3
-Release:	2.2%{?dist}
+Release:	2.3%{?dist}
 Summary:	Java Service Wrapper
 Epoch:		0
 License:	BSD
@@ -202,6 +202,9 @@
 %doc doc/*
 
 %changelog
+* Wed Sep 24 2008 Deepak Bhole <dbhole at redhat.com> 3.2.3-2.3
+- Update nosun-jvm-64.patch to remove fuzz
+
 * Thu Jul 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:3.2.3-2.2
 - drop repotag
 



From mclasen at fedoraproject.org  Wed Sep 24 15:01:27 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 24 Sep 2008 15:01:27 +0000 (UTC)
Subject: rpms/gnome-volume-manager/devel .cvsignore, 1.24,
	1.25 gnome-volume-manager.spec, 1.79, 1.80 sources, 1.24, 1.25
Message-ID: <20080924150127.A76C970103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-volume-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1174

Modified Files:
	.cvsignore gnome-volume-manager.spec sources 
Log Message:
2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-volume-manager/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	26 Apr 2008 18:46:17 -0000	1.24
+++ .cvsignore	24 Sep 2008 15:00:57 -0000	1.25
@@ -1 +1 @@
-gnome-volume-manager-2.22.5.tar.gz
+gnome-volume-manager-2.24.0.tar.bz2


Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- gnome-volume-manager.spec	1 Aug 2008 17:35:48 -0000	1.79
+++ gnome-volume-manager.spec	24 Sep 2008 15:00:57 -0000	1.80
@@ -1,10 +1,10 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
-Version: 2.22.5
-Release: 3%{?dist}
+Version: 2.24.0
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
-Source0: http://download.gnome.org/sources/gnome-volume-manager/2.22/gnome-volume-manager-%{version}.tar.gz
+Source0: http://download.gnome.org/sources/gnome-volume-manager/2.24/gnome-volume-manager-%{version}.tar.bz2
 Source1: magicdev-wrapper
 Source2: gthumb-import
 Source3: gnome-cdda-handler
@@ -12,10 +12,6 @@
 Patch1: rh-defaults.patch
 Patch2: gnome-volume-manager-2.17.0-add-console-user-check.patch 
 Patch3: gnome-volume-manager-2.22.0-check-screensaver.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=545856
-Patch4: icon-names.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=509823
-#Patch4: gvm-nomedia.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: libgnomeui-devel
 BuildRequires: libglade2-devel
@@ -55,7 +51,6 @@
 %patch1 -p1 -b .rh-defaults
 %patch2 -p1 -b .add-console-user-check
 %patch3 -p1 -b .screensaver
-%patch4 -p1 -b .icon-names
 
 %build
 %configure --disable-automount
@@ -121,6 +116,9 @@
 %{_sysconfdir}/xdg/autostart/gnome-volume-manager.desktop
 
 %changelog
+* Wed Sep 24 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
 * Fri Aug  1 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.5-3
 - Overlooked one icon 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-volume-manager/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	26 Apr 2008 18:46:17 -0000	1.24
+++ sources	24 Sep 2008 15:00:57 -0000	1.25
@@ -1 +1 @@
-f1b1b6101240c892056406c61d1b7f68  gnome-volume-manager-2.22.5.tar.gz
+a8ae620c2633f3ac13444736ef61122a  gnome-volume-manager-2.24.0.tar.bz2



From dbhole at fedoraproject.org  Wed Sep 24 15:02:40 2008
From: dbhole at fedoraproject.org (Deepak Bhole)
Date: Wed, 24 Sep 2008 15:02:40 +0000 (UTC)
Subject: rpms/jpackage-utils/devel jpackage-utils-enable-gcj-support.patch,
	1.1, 1.2 jpackage-utils.spec, 1.45, 1.46
Message-ID: <20080924150240.2847770103@cvs1.fedora.phx.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/jpackage-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1530

Modified Files:
	jpackage-utils-enable-gcj-support.patch jpackage-utils.spec 
Log Message:

- Update enable-gcj-support.patch to remove fuzz.



jpackage-utils-enable-gcj-support.patch:

Index: jpackage-utils-enable-gcj-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jpackage-utils/devel/jpackage-utils-enable-gcj-support.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jpackage-utils-enable-gcj-support.patch	22 Jan 2008 21:40:13 -0000	1.1
+++ jpackage-utils-enable-gcj-support.patch	24 Sep 2008 15:02:09 -0000	1.2
@@ -1,7 +1,8 @@
---- misc/macros.jpackage.orig	2006-07-21 04:00:28.000000000 -0400
-+++ misc/macros.jpackage	2006-07-21 04:07:32.000000000 -0400
-@@ -123,6 +123,10 @@
- %add_jvm_extension JAVA_LIBDIR=%{buildroot}/%{_javadir}	%{_bindir}/jvmjar -l
+diff -up ./misc/macros.jpackage.sav ./misc/macros.jpackage
+--- ./misc/macros.jpackage.sav	2008-01-04 06:21:42.000000000 -0500
++++ ./misc/macros.jpackage	2008-09-24 11:00:36.000000000 -0400
+@@ -171,6 +171,10 @@ echo -e "</dependencies>\\n" >> %{_maven
+ %{nil}
  
  #==============================================================================
 +# ---- GCJ support


Index: jpackage-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jpackage-utils/devel/jpackage-utils.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- jpackage-utils.spec	9 Jul 2008 20:09:55 -0000	1.45
+++ jpackage-utils.spec	24 Sep 2008 15:02:09 -0000	1.46
@@ -34,7 +34,7 @@
 
 Name:           jpackage-utils
 Version:        1.7.5
-Release:        1.5%{?dist}
+Release:        1.6%{?dist}
 Epoch:          0
 Summary:        JPackage utilities
 License:        BSD
@@ -230,6 +230,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Deepak Bhole <dbhole at redhat.com> 1.7.5-1.6
+- Update enable-gcj-support.patch to remove fuzz.
+
 * Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.7.5-1.5
 - drop repotag
 - fix license tag



From ovasik at fedoraproject.org  Wed Sep 24 15:06:29 2008
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed, 24 Sep 2008 15:06:29 +0000 (UTC)
Subject: rpms/docbook-dtds/F-9 docbook-dtds.spec,1.22,1.23
Message-ID: <20080924150629.132F570103@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-dtds/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2244

Modified Files:
	docbook-dtds.spec 
Log Message:
Fixed wrong filenames for xml-dtd-4.4 and xml-dtd-4.5 iso entities(#461206) , fixed /ent/iso-cyrl.ent typo, fixed broken unregistration of xml-dtds from catalog due to missing CAT_DIR variable


Index: docbook-dtds.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-dtds/F-9/docbook-dtds.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- docbook-dtds.spec	11 Jul 2008 10:18:09 -0000	1.22
+++ docbook-dtds.spec	24 Sep 2008 15:05:58 -0000	1.23
@@ -1,6 +1,6 @@
 Name: docbook-dtds
 Version: 1.0
-Release: 37%{?dist}
+Release: 38%{?dist}
 Group: Applications/Text
 
 Summary: SGML and XML document type definitions for DocBook
@@ -699,7 +699,7 @@
     "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
     "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
@@ -788,7 +788,7 @@
     "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
     "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
@@ -877,7 +877,7 @@
     "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
     "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
@@ -915,43 +915,43 @@
   # DocBook XML V4.4
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isopub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isobox.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML V4.4//EN" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isonum.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Character Entities V4.4//EN" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Notations V4.4//EN" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isodia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.4//EN" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG
@@ -960,19 +960,19 @@
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isotech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG
@@ -981,19 +981,19 @@
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org/docbook/xml/4.4" \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG
@@ -1004,43 +1004,43 @@
    # DocBook XML V4.5
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isopub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isobox.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML V4.5//EN" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isonum.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isodia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG
@@ -1049,19 +1049,19 @@
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isotech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG
@@ -1070,19 +1070,19 @@
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org/docbook/xml/4.5" \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG
@@ -1189,6 +1189,8 @@
 ## XML catalog
 ##
 
+
+CAT_DIR=/usr/share/sgml/docbook/
 CATALOG=/usr/share/sgml/docbook/xmlcatalog
 
 if [ -w $CATALOG ]
@@ -1229,7 +1231,7 @@
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
@@ -1287,7 +1289,7 @@
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
@@ -1345,7 +1347,7 @@
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
@@ -1369,122 +1371,130 @@
 
   # DocBook XML V4.4
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isopub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isobox.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isonum.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isodia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isotech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG
 
   # DocBook XML V4.5
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isopub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isobox.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isonum.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isodia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isotech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
     "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG
 fi
 
 %changelog
+* Wed Sep 24 2008 Ondrej Vasik <ovasik at redhat.com> - 1.0-38
+- Fix wrong filenames for xml-dtd-4.4 and xml-dtd-4.5 
+  iso entities(#461206)
+- /ent/iso-cyr1.ent now correctly registered in xml catalog
+  (there was /ent/iso-cyrl.ent typo)
+- fixed broken unregistration of xml-dtds from catalog
+  (missing CAT_DIR variable)
+
 * Fri Jul 11 2008 Ondrej Vasik <ovasik at redhat.com> - 1.0-37
 - fixed typo in post scriptlet(causing mishandling of DocBook 
   4.4 and 4.5 DTDs)-#453513



From dbhole at fedoraproject.org  Wed Sep 24 15:09:29 2008
From: dbhole at fedoraproject.org (Deepak Bhole)
Date: Wed, 24 Sep 2008 15:09:29 +0000 (UTC)
Subject: rpms/plexus-xmlrpc/devel plexus-xmlrpc-add-codec-dep.patch, 1.2,
	1.3 plexus-xmlrpc.spec, 1.11, 1.12
Message-ID: <20080924150929.2B39A70103@cvs1.fedora.phx.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-xmlrpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2618

Modified Files:
	plexus-xmlrpc-add-codec-dep.patch plexus-xmlrpc.spec 
Log Message:

- Update xmlrpc-add-codec-dep.patch to remove fuzz... for real this time



plexus-xmlrpc-add-codec-dep.patch:

Index: plexus-xmlrpc-add-codec-dep.patch
===================================================================
RCS file: /cvs/extras/rpms/plexus-xmlrpc/devel/plexus-xmlrpc-add-codec-dep.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plexus-xmlrpc-add-codec-dep.patch	24 Sep 2008 14:51:58 -0000	1.2
+++ plexus-xmlrpc-add-codec-dep.patch	24 Sep 2008 15:09:28 -0000	1.3
@@ -1,7 +1,7 @@
 diff -up ./pom.xml.sav ./pom.xml
---- ./pom.xml.sav	2008-09-24 10:51:06.000000000 -0400
-+++ ./pom.xml	2008-09-24 10:51:01.000000000 -0400
-@@ -14,6 +14,12 @@
+--- ./pom.xml.sav	2005-10-24 06:41:24.000000000 -0400
++++ ./pom.xml	2008-09-24 11:07:49.000000000 -0400
+@@ -14,5 +14,11 @@
        <artifactId>xmlrpc</artifactId>
        <version>1.2</version>
      </dependency>
@@ -13,4 +13,4 @@
 +    </dependency>
    </dependencies>
  </project>
- 
+\ No newline at end of file


Index: plexus-xmlrpc.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-xmlrpc/devel/plexus-xmlrpc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- plexus-xmlrpc.spec	24 Sep 2008 14:51:58 -0000	1.11
+++ plexus-xmlrpc.spec	24 Sep 2008 15:09:28 -0000	1.12
@@ -42,7 +42,7 @@
 
 Name:           plexus-xmlrpc
 Version:        1.0
-Release:        0.2.b4.2.10%{?dist}
+Release:        0.2.b4.2.11%{?dist}
 Epoch:          0
 Summary:        Plexus XML RPC Component
 License:        ASL 1.1 and MIT
@@ -209,6 +209,9 @@
 %doc %{_javadocdir}/*
 
 %changelog
+* Wed Sep 24 2008 Deepak Bhole <dbhole at redhat.com> 1.0-0.2.b4.2.11
+- Update xmlrpc-add-codec-dep.patch to remove fuzz... for real this time
+
 * Wed Sep 24 2008 Deepak Bhole <dbhole at redhat.com> 1.0-0.2.b4.2.10
 - Update patch0 to remove fuzz.
 



From silfreed at fedoraproject.org  Wed Sep 24 15:13:36 2008
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Wed, 24 Sep 2008 15:13:36 +0000 (UTC)
Subject: rpms/pytrainer/devel pytrainer-1.5.0.0.1.tar.gz,1.1,NONE
Message-ID: <20080924151336.5732770103@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/pytrainer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3321

Removed Files:
	pytrainer-1.5.0.0.1.tar.gz 
Log Message:
removing source file


--- pytrainer-1.5.0.0.1.tar.gz DELETED ---



From dbhole at fedoraproject.org  Wed Sep 24 15:14:28 2008
From: dbhole at fedoraproject.org (Deepak Bhole)
Date: Wed, 24 Sep 2008 15:14:28 +0000 (UTC)
Subject: rpms/plexus-runtime-builder/devel plexus-runtime-builder.spec, 1.6, 
	1.7
Message-ID: <20080924151428.A21C170103@cvs1.fedora.phx.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-runtime-builder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3460

Modified Files:
	plexus-runtime-builder.spec 
Log Message:

- Add proper patch number




Index: plexus-runtime-builder.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-runtime-builder/devel/plexus-runtime-builder.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plexus-runtime-builder.spec	9 Jul 2008 21:47:37 -0000	1.6
+++ plexus-runtime-builder.spec	24 Sep 2008 15:13:58 -0000	1.7
@@ -38,7 +38,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.2.a9.1.5%{?dist}
+Release:        0.2.a9.1.6%{?dist}
 Epoch:          0
 Summary:        Plexus Component Descriptor Creator
 License:        MIT
@@ -119,7 +119,7 @@
 %prep
 %setup -q -n %{name}
 
-%patch -b .sav
+%patch0 -b .sav
 
 %build
 
@@ -203,6 +203,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Deepak Bhole <dbhole at redhat.com> 1.0-0.2.a9.1.6
+- Add proper patch number
+
 * Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-0.2.a9.1.5
 - drop repotag
 



From silfreed at fedoraproject.org  Wed Sep 24 15:15:08 2008
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Wed, 24 Sep 2008 15:15:08 +0000 (UTC)
Subject: rpms/pytrainer/devel pytrainer-1.6.0.5-desktop-fixes.patch, NONE,
	1.1 pytrainer.sh, NONE, 1.1 pytrainer.spec, 1.6,
	1.7 pytrainer-libgtkmozembed.patch, 1.1, NONE
Message-ID: <20080924151508.42C8370103@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/pytrainer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3702

Modified Files:
	pytrainer.spec 
Added Files:
	pytrainer-1.6.0.5-desktop-fixes.patch pytrainer.sh 
Removed Files:
	pytrainer-libgtkmozembed.patch 
Log Message:
* Wed Sep 23 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-2
- replacing environ hack patch with shell script
- adding patch to clean up desktop file


pytrainer-1.6.0.5-desktop-fixes.patch:

--- NEW FILE pytrainer-1.6.0.5-desktop-fixes.patch ---
Common subdirectories: pytrainer-1.6.0.5-orig/bin and pytrainer-1.6.0.5/bin
Common subdirectories: pytrainer-1.6.0.5-orig/extensions and pytrainer-1.6.0.5/extensions
Common subdirectories: pytrainer-1.6.0.5-orig/glade and pytrainer-1.6.0.5/glade
Common subdirectories: pytrainer-1.6.0.5-orig/locale and pytrainer-1.6.0.5/locale
Common subdirectories: pytrainer-1.6.0.5-orig/maps and pytrainer-1.6.0.5/maps
Common subdirectories: pytrainer-1.6.0.5-orig/plugins and pytrainer-1.6.0.5/plugins
Common subdirectories: pytrainer-1.6.0.5-orig/pytrainer and pytrainer-1.6.0.5/pytrainer
diff -ub pytrainer-1.6.0.5-orig/pytrainer.desktop pytrainer-1.6.0.5/pytrainer.desktop
--- pytrainer-1.6.0.5-orig/pytrainer.desktop	2008-08-31 15:02:46.000000000 -0400
+++ pytrainer-1.6.0.5/pytrainer.desktop	2008-09-24 10:46:45.000000000 -0400
@@ -5,5 +5,5 @@
 Name=pyTrainer sport training log
 Comment=The Free Sport Training Center
 Exec=pytrainer
-Icon=pytrainer.png
-Categories=Office
+Icon=pytrainer
+Categories=Office;


--- NEW FILE pytrainer.sh ---
#!/bin/bash
MOZILLA_FIVE_HOME="MOZLIBLOC" python PYTHONPATH/pytrainer.py $@


Index: pytrainer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/devel/pytrainer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pytrainer.spec	24 Sep 2008 13:47:57 -0000	1.6
+++ pytrainer.spec	24 Sep 2008 15:14:38 -0000	1.7
@@ -6,15 +6,17 @@
 
 Name: pytrainer
 Version: 1.6.0.5
-Release: 1%{?dist}
+Release: 2%{?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
-Patch0: pytrainer-libgtkmozembed.patch
-Patch1: pytrainer-1.5.0.0.1-sqlite3.patch
+Source1: pytrainer.sh
+# http://sourceforge.net/tracker2/?func=detail&aid=2126411&group_id=213157&atid=1024592
+Patch0: pytrainer-1.5.0.0.1-sqlite3.patch
+Patch1: pytrainer-1.6.0.5-desktop-fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -28,10 +30,6 @@
 %if 0%{fedora} >= 9
 Requires: xulrunner = %{xulrunner_pkgver}
 %endif
-#Requires: python-libxml
-#Requires: PyXML
-#Requires: pygtk2
-#Requires: pygtkglext
 BuildRequires: python-devel
 BuildRequires: desktop-file-utils
 
@@ -40,25 +38,22 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+
+%{__sed} -i 's|PYTHONPATH|%{python_sitelib}|' %{SOURCE1}
 
 # make patch work for current firefox version
 %if 0%{fedora} <= 8
-%{__sed} -i 's|MOZLIBLOC|/usr/lib/firefox-%{firefox_ver}|' %{PATCH0}
+%{__sed} -i 's|MOZLIBLOC|/usr/lib/firefox-%{firefox_ver}|' %{SOURCE1}
 %endif
 %if 0%{fedora} >= 9
-%{__sed} -i 's|MOZLIBLOC|%{_libdir}/xulrunner-%{xulrunner_ver}|' %{PATCH0}
+%{__sed} -i 's|MOZLIBLOC|%{_libdir}/xulrunner-%{xulrunner_ver}|' %{SOURCE1}
 %endif
-%patch0 -p1
-
-%patch1 -p1
 
 # fix non-exacutable scripts
-%{__chmod} +x extensions/wordpress/example.py
 %{__chmod} +x plugins/garmin-hr/gtrnctr2gpx.py
 
-# fix invalid EOL encoding
-%{__sed} -i 's/\r//' extensions/wordpress/example.py
-
 
 %build
 %{__python} setup.py build
@@ -68,6 +63,10 @@
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
+# install our own executable to set proper lib dirs
+%{__mv} %{buildroot}%{_bindir}/%{name} %{buildroot}%{python_sitelib}/%{name}.py
+%{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
+
 desktop-file-install --vendor="fedora" --delete-original \
 	--dir=%{buildroot}/%{_datadir}/applications \
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
@@ -90,6 +89,10 @@
 
 
 %changelog
+* Wed Sep 23 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-2
+- replacing environ hack patch with shell script
+- adding patch to clean up desktop file
+
 * Mon Sep 15 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-1
 - updating to 1.6.0.5
 


--- pytrainer-libgtkmozembed.patch DELETED ---



From silfreed at fedoraproject.org  Wed Sep 24 15:19:19 2008
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Wed, 24 Sep 2008 15:19:19 +0000 (UTC)
Subject: rpms/pytrainer/F-9 pytrainer-1.5.0.0.1.tar.gz,1.1,NONE
Message-ID: <20080924151919.3ABD570103@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/pytrainer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4522

Removed Files:
	pytrainer-1.5.0.0.1.tar.gz 
Log Message:
removing source file


--- pytrainer-1.5.0.0.1.tar.gz DELETED ---



From silfreed at fedoraproject.org  Wed Sep 24 15:19:57 2008
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Wed, 24 Sep 2008 15:19:57 +0000 (UTC)
Subject: rpms/pytrainer/F-9 pytrainer-1.6.0.5-desktop-fixes.patch, NONE,
	1.1 pytrainer.sh, NONE, 1.1 pytrainer.spec, 1.5,
	1.6 pytrainer-libgtkmozembed.patch, 1.1, NONE
Message-ID: <20080924151957.528E070103@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/pytrainer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4562

Modified Files:
	pytrainer.spec 
Added Files:
	pytrainer-1.6.0.5-desktop-fixes.patch pytrainer.sh 
Removed Files:
	pytrainer-libgtkmozembed.patch 
Log Message:
* Wed Sep 23 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-2
- replacing environ hack patch with shell script
- adding patch to clean up desktop file


pytrainer-1.6.0.5-desktop-fixes.patch:

--- NEW FILE pytrainer-1.6.0.5-desktop-fixes.patch ---
Common subdirectories: pytrainer-1.6.0.5-orig/bin and pytrainer-1.6.0.5/bin
Common subdirectories: pytrainer-1.6.0.5-orig/extensions and pytrainer-1.6.0.5/extensions
Common subdirectories: pytrainer-1.6.0.5-orig/glade and pytrainer-1.6.0.5/glade
Common subdirectories: pytrainer-1.6.0.5-orig/locale and pytrainer-1.6.0.5/locale
Common subdirectories: pytrainer-1.6.0.5-orig/maps and pytrainer-1.6.0.5/maps
Common subdirectories: pytrainer-1.6.0.5-orig/plugins and pytrainer-1.6.0.5/plugins
Common subdirectories: pytrainer-1.6.0.5-orig/pytrainer and pytrainer-1.6.0.5/pytrainer
diff -ub pytrainer-1.6.0.5-orig/pytrainer.desktop pytrainer-1.6.0.5/pytrainer.desktop
--- pytrainer-1.6.0.5-orig/pytrainer.desktop	2008-08-31 15:02:46.000000000 -0400
+++ pytrainer-1.6.0.5/pytrainer.desktop	2008-09-24 10:46:45.000000000 -0400
@@ -5,5 +5,5 @@
 Name=pyTrainer sport training log
 Comment=The Free Sport Training Center
 Exec=pytrainer
-Icon=pytrainer.png
-Categories=Office
+Icon=pytrainer
+Categories=Office;


--- NEW FILE pytrainer.sh ---
#!/bin/bash
MOZILLA_FIVE_HOME="MOZLIBLOC" python PYTHONPATH/pytrainer.py $@


Index: pytrainer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/F-9/pytrainer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pytrainer.spec	24 Sep 2008 13:52:57 -0000	1.5
+++ pytrainer.spec	24 Sep 2008 15:19:27 -0000	1.6
@@ -6,15 +6,17 @@
 
 Name: pytrainer
 Version: 1.6.0.5
-Release: 1%{?dist}
+Release: 2%{?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
-Patch0: pytrainer-libgtkmozembed.patch
-Patch1: pytrainer-1.5.0.0.1-sqlite3.patch
+Source1: pytrainer.sh
+# http://sourceforge.net/tracker2/?func=detail&aid=2126411&group_id=213157&atid=1024592
+Patch0: pytrainer-1.5.0.0.1-sqlite3.patch
+Patch1: pytrainer-1.6.0.5-desktop-fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -28,10 +30,6 @@
 %if 0%{fedora} >= 9
 Requires: xulrunner = %{xulrunner_pkgver}
 %endif
-#Requires: python-libxml
-#Requires: PyXML
-#Requires: pygtk2
-#Requires: pygtkglext
 BuildRequires: python-devel
 BuildRequires: desktop-file-utils
 
@@ -40,25 +38,22 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+
+%{__sed} -i 's|PYTHONPATH|%{python_sitelib}|' %{SOURCE1}
 
 # make patch work for current firefox version
 %if 0%{fedora} <= 8
-%{__sed} -i 's|MOZLIBLOC|/usr/lib/firefox-%{firefox_ver}|' %{PATCH0}
+%{__sed} -i 's|MOZLIBLOC|/usr/lib/firefox-%{firefox_ver}|' %{SOURCE1}
 %endif
 %if 0%{fedora} >= 9
-%{__sed} -i 's|MOZLIBLOC|%{_libdir}/xulrunner-%{xulrunner_ver}|' %{PATCH0}
+%{__sed} -i 's|MOZLIBLOC|%{_libdir}/xulrunner-%{xulrunner_ver}|' %{SOURCE1}
 %endif
-%patch0 -p1
-
-%patch1 -p1
 
 # fix non-exacutable scripts
-%{__chmod} +x extensions/wordpress/example.py
 %{__chmod} +x plugins/garmin-hr/gtrnctr2gpx.py
 
-# fix invalid EOL encoding
-%{__sed} -i 's/\r//' extensions/wordpress/example.py
-
 
 %build
 %{__python} setup.py build
@@ -68,6 +63,10 @@
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
+# install our own executable to set proper lib dirs
+%{__mv} %{buildroot}%{_bindir}/%{name} %{buildroot}%{python_sitelib}/%{name}.py
+%{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
+
 desktop-file-install --vendor="fedora" --delete-original \
 	--dir=%{buildroot}/%{_datadir}/applications \
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
@@ -90,6 +89,10 @@
 
 
 %changelog
+* Wed Sep 23 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-2
+- replacing environ hack patch with shell script
+- adding patch to clean up desktop file
+
 * Mon Sep 15 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-1
 - updating to 1.6.0.5
 


--- pytrainer-libgtkmozembed.patch DELETED ---



From silfreed at fedoraproject.org  Wed Sep 24 15:21:13 2008
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Wed, 24 Sep 2008 15:21:13 +0000 (UTC)
Subject: rpms/pytrainer/F-8 pytrainer-1.5.0.0.1.tar.gz,1.1,NONE
Message-ID: <20080924152113.D5B3370103@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/pytrainer/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4890

Removed Files:
	pytrainer-1.5.0.0.1.tar.gz 
Log Message:
removing source file


--- pytrainer-1.5.0.0.1.tar.gz DELETED ---



From silfreed at fedoraproject.org  Wed Sep 24 15:22:04 2008
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Wed, 24 Sep 2008 15:22:04 +0000 (UTC)
Subject: rpms/pytrainer/F-8 pytrainer-1.6.0.5-desktop-fixes.patch, NONE,
	1.1 pytrainer.sh, NONE, 1.1 pytrainer.spec, 1.5,
	1.6 pytrainer-libgtkmozembed.patch, 1.1, NONE
Message-ID: <20080924152204.B08E970103@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/pytrainer/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4950

Modified Files:
	pytrainer.spec 
Added Files:
	pytrainer-1.6.0.5-desktop-fixes.patch pytrainer.sh 
Removed Files:
	pytrainer-libgtkmozembed.patch 
Log Message:
* Wed Sep 23 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-2
- replacing environ hack patch with shell script
- adding patch to clean up desktop file


pytrainer-1.6.0.5-desktop-fixes.patch:

--- NEW FILE pytrainer-1.6.0.5-desktop-fixes.patch ---
Common subdirectories: pytrainer-1.6.0.5-orig/bin and pytrainer-1.6.0.5/bin
Common subdirectories: pytrainer-1.6.0.5-orig/extensions and pytrainer-1.6.0.5/extensions
Common subdirectories: pytrainer-1.6.0.5-orig/glade and pytrainer-1.6.0.5/glade
Common subdirectories: pytrainer-1.6.0.5-orig/locale and pytrainer-1.6.0.5/locale
Common subdirectories: pytrainer-1.6.0.5-orig/maps and pytrainer-1.6.0.5/maps
Common subdirectories: pytrainer-1.6.0.5-orig/plugins and pytrainer-1.6.0.5/plugins
Common subdirectories: pytrainer-1.6.0.5-orig/pytrainer and pytrainer-1.6.0.5/pytrainer
diff -ub pytrainer-1.6.0.5-orig/pytrainer.desktop pytrainer-1.6.0.5/pytrainer.desktop
--- pytrainer-1.6.0.5-orig/pytrainer.desktop	2008-08-31 15:02:46.000000000 -0400
+++ pytrainer-1.6.0.5/pytrainer.desktop	2008-09-24 10:46:45.000000000 -0400
@@ -5,5 +5,5 @@
 Name=pyTrainer sport training log
 Comment=The Free Sport Training Center
 Exec=pytrainer
-Icon=pytrainer.png
-Categories=Office
+Icon=pytrainer
+Categories=Office;


--- NEW FILE pytrainer.sh ---
#!/bin/bash
MOZILLA_FIVE_HOME="MOZLIBLOC" python PYTHONPATH/pytrainer.py $@


Index: pytrainer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/F-8/pytrainer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pytrainer.spec	24 Sep 2008 14:02:47 -0000	1.5
+++ pytrainer.spec	24 Sep 2008 15:21:34 -0000	1.6
@@ -6,15 +6,17 @@
 
 Name: pytrainer
 Version: 1.6.0.5
-Release: 1%{?dist}
+Release: 2%{?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
-Patch0: pytrainer-libgtkmozembed.patch
-Patch1: pytrainer-1.5.0.0.1-sqlite3.patch
+Source1: pytrainer.sh
+# http://sourceforge.net/tracker2/?func=detail&aid=2126411&group_id=213157&atid=1024592
+Patch0: pytrainer-1.5.0.0.1-sqlite3.patch
+Patch1: pytrainer-1.6.0.5-desktop-fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -28,10 +30,6 @@
 %if 0%{fedora} >= 9
 Requires: xulrunner = %{xulrunner_pkgver}
 %endif
-#Requires: python-libxml
-#Requires: PyXML
-#Requires: pygtk2
-#Requires: pygtkglext
 BuildRequires: python-devel
 BuildRequires: desktop-file-utils
 
@@ -40,25 +38,22 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+
+%{__sed} -i 's|PYTHONPATH|%{python_sitelib}|' %{SOURCE1}
 
 # make patch work for current firefox version
 %if 0%{fedora} <= 8
-%{__sed} -i 's|MOZLIBLOC|/usr/lib/firefox-%{firefox_ver}|' %{PATCH0}
+%{__sed} -i 's|MOZLIBLOC|/usr/lib/firefox-%{firefox_ver}|' %{SOURCE1}
 %endif
 %if 0%{fedora} >= 9
-%{__sed} -i 's|MOZLIBLOC|%{_libdir}/xulrunner-%{xulrunner_ver}|' %{PATCH0}
+%{__sed} -i 's|MOZLIBLOC|%{_libdir}/xulrunner-%{xulrunner_ver}|' %{SOURCE1}
 %endif
-%patch0 -p1
-
-%patch1 -p1
 
 # fix non-exacutable scripts
-%{__chmod} +x extensions/wordpress/example.py
 %{__chmod} +x plugins/garmin-hr/gtrnctr2gpx.py
 
-# fix invalid EOL encoding
-%{__sed} -i 's/\r//' extensions/wordpress/example.py
-
 
 %build
 %{__python} setup.py build
@@ -68,6 +63,10 @@
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
+# install our own executable to set proper lib dirs
+%{__mv} %{buildroot}%{_bindir}/%{name} %{buildroot}%{python_sitelib}/%{name}.py
+%{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
+
 desktop-file-install --vendor="fedora" --delete-original \
 	--dir=%{buildroot}/%{_datadir}/applications \
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
@@ -90,6 +89,10 @@
 
 
 %changelog
+* Wed Sep 23 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-2
+- replacing environ hack patch with shell script
+- adding patch to clean up desktop file
+
 * Mon Sep 15 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-1
 - updating to 1.6.0.5
 


--- pytrainer-libgtkmozembed.patch DELETED ---



From kraxel at fedoraproject.org  Wed Sep 24 15:23:04 2008
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Wed, 24 Sep 2008 15:23:04 +0000 (UTC)
Subject: rpms/xenner/F-9 .cvsignore, 1.12, 1.13 sources, 1.11,
	1.12 xenner.spec, 1.20, 1.21
Message-ID: <20080924152304.B1A0C70103@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xenner/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5165

Modified Files:
	.cvsignore sources xenner.spec 
Log Message:
- update to version 0.45


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	21 Jul 2008 12:05:11 -0000	1.12
+++ .cvsignore	24 Sep 2008 15:22:34 -0000	1.13
@@ -1 +1 @@
-xenner-0.41.tar.gz
+xenner-0.45.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	21 Jul 2008 12:05:11 -0000	1.11
+++ sources	24 Sep 2008 15:22:34 -0000	1.12
@@ -1 +1 @@
-7f2845ccc32e8a72c3e4d24e96900f2a  xenner-0.41.tar.gz
+371789ce3ae650a60964a7f25968b9ba  xenner-0.45.tar.gz


Index: xenner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/F-9/xenner.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xenner.spec	21 Jul 2008 12:05:11 -0000	1.20
+++ xenner.spec	24 Sep 2008 15:22:34 -0000	1.21
@@ -1,6 +1,6 @@
 Name:         xenner
 License:      GPLv2+
-Version:      0.41
+Version:      0.45
 Release:      1%{?dist}
 Summary:      Xen emulator for kvm
 Group:        Applications/Emulators
@@ -57,6 +57,8 @@
 rm -rf %{buildroot}
 
 %changelog
+* Wed Sep 24 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.45-1.fc9
+- update to version 0.45
 * Mon Jul 21 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.41-1.fc9
 - update to version 0.41
   * 64-bit smp fix merged.



From mtasaka at fedoraproject.org  Wed Sep 24 15:37:27 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 24 Sep 2008 15:37:27 +0000 (UTC)
Subject: rpms/ruby-aws/F-8 .cvsignore, 1.10, 1.11 ruby-aws.spec, 1.9,
	1.10 sources, 1.10, 1.11
Message-ID: <20080924153727.A7AAB70103@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-aws/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7539/ruby-aws/F-8

Modified Files:
	.cvsignore ruby-aws.spec sources 
Log Message:
ruby-mechanize, ruby-aws, tzclock update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/F-8/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	17 Sep 2008 18:18:45 -0000	1.10
+++ .cvsignore	24 Sep 2008 15:36:57 -0000	1.11
@@ -1 +1 @@
-ruby-aws-0.4.2.tar.gz
+ruby-aws-0.4.3.tar.gz


Index: ruby-aws.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/F-8/ruby-aws.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ruby-aws.spec	17 Sep 2008 18:18:45 -0000	1.9
+++ ruby-aws.spec	24 Sep 2008 15:36:57 -0000	1.10
@@ -2,7 +2,7 @@
 %define		rubyabi		1.8
 
 Name:		ruby-aws
-Version:	0.4.2
+Version:	0.4.3
 Release:	1%{?dist}
 Summary:	Ruby interface to Amazon Web Services
 Group:		Development/Languages
@@ -78,6 +78,9 @@
 %doc test/
 
 %changelog
+* Thu Sep 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.3-1
+- 0.4.3
+
 * Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.2-1
 - 0.4.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/F-8/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Sep 2008 18:18:45 -0000	1.10
+++ sources	24 Sep 2008 15:36:57 -0000	1.11
@@ -1 +1 @@
-ed97d574477a775b3620473330475d41  ruby-aws-0.4.2.tar.gz
+6a4e7299a388ced5069c87a473ce57e9  ruby-aws-0.4.3.tar.gz



From mtasaka at fedoraproject.org  Wed Sep 24 15:37:27 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 24 Sep 2008 15:37:27 +0000 (UTC)
Subject: rpms/ruby-aws/F-9 .cvsignore, 1.10, 1.11 ruby-aws.spec, 1.9,
	1.10 sources, 1.10, 1.11
Message-ID: <20080924153727.D084070103@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-aws/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7539/ruby-aws/F-9

Modified Files:
	.cvsignore ruby-aws.spec sources 
Log Message:
ruby-mechanize, ruby-aws, tzclock update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	17 Sep 2008 18:18:45 -0000	1.10
+++ .cvsignore	24 Sep 2008 15:36:57 -0000	1.11
@@ -1 +1 @@
-ruby-aws-0.4.2.tar.gz
+ruby-aws-0.4.3.tar.gz


Index: ruby-aws.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/F-9/ruby-aws.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ruby-aws.spec	17 Sep 2008 18:18:45 -0000	1.9
+++ ruby-aws.spec	24 Sep 2008 15:36:57 -0000	1.10
@@ -2,7 +2,7 @@
 %define		rubyabi		1.8
 
 Name:		ruby-aws
-Version:	0.4.2
+Version:	0.4.3
 Release:	1%{?dist}
 Summary:	Ruby interface to Amazon Web Services
 Group:		Development/Languages
@@ -78,6 +78,9 @@
 %doc test/
 
 %changelog
+* Thu Sep 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.3-1
+- 0.4.3
+
 * Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.2-1
 - 0.4.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Sep 2008 18:18:45 -0000	1.10
+++ sources	24 Sep 2008 15:36:57 -0000	1.11
@@ -1 +1 @@
-ed97d574477a775b3620473330475d41  ruby-aws-0.4.2.tar.gz
+6a4e7299a388ced5069c87a473ce57e9  ruby-aws-0.4.3.tar.gz



From mtasaka at fedoraproject.org  Wed Sep 24 15:37:28 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 24 Sep 2008 15:37:28 +0000 (UTC)
Subject: rpms/ruby-mechanize/F-9 .cvsignore, 1.9, 1.10 ruby-mechanize.spec,
	1.8, 1.9 sources, 1.9, 1.10
Message-ID: <20080924153728.931D670103@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-mechanize/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7539/ruby-mechanize/F-9

Modified Files:
	.cvsignore ruby-mechanize.spec sources 
Log Message:
ruby-mechanize, ruby-aws, tzclock update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-mechanize/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Aug 2008 15:32:08 -0000	1.9
+++ .cvsignore	24 Sep 2008 15:36:58 -0000	1.10
@@ -1 +1 @@
-mechanize-0.7.8.tgz
+mechanize-0.8.0.tgz


Index: ruby-mechanize.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-mechanize/F-9/ruby-mechanize.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ruby-mechanize.spec	27 Aug 2008 15:32:08 -0000	1.8
+++ ruby-mechanize.spec	24 Sep 2008 15:36:58 -0000	1.9
@@ -1,12 +1,12 @@
 %{!?ruby_sitelib:	%define ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 
 %define		rubyabi		1.8
-%define		repoid		41995
+%define		repoid		43727
 
 %define		modname		mechanize
 
 Name:		ruby-%{modname}
-Version:	0.7.8
+Version:	0.8.0
 Release:	1%{?dist}
 Summary:	A handy web browsing ruby object
 Group:		Development/Languages
@@ -76,12 +76,15 @@
 %doc LICENSE.txt 
 %doc NOTES.txt
 %doc README.txt 
-%doc eg/
+%doc examples/
 
 %{ruby_sitelib}/%{modname}.rb
 %{ruby_sitelib}/www/
 
 %changelog
+* Thu Sep 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.0-1
+- 0.8.0
+
 * Thu Aug 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.8-1
 - 0.7.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-mechanize/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	27 Aug 2008 15:32:08 -0000	1.9
+++ sources	24 Sep 2008 15:36:58 -0000	1.10
@@ -1 +1 @@
-c5a5958640f29a3bafad35bf0813e4e3  mechanize-0.7.8.tgz
+efa57a32fe66ed78e078113bbdba32c2  mechanize-0.8.0.tgz



From mtasaka at fedoraproject.org  Wed Sep 24 15:37:28 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 24 Sep 2008 15:37:28 +0000 (UTC)
Subject: rpms/ruby-mechanize/devel .cvsignore, 1.9, 1.10 ruby-mechanize.spec,
	1.8, 1.9 sources, 1.9, 1.10
Message-ID: <20080924153728.C1E5C70103@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-mechanize/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7539/ruby-mechanize/devel

Modified Files:
	.cvsignore ruby-mechanize.spec sources 
Log Message:
ruby-mechanize, ruby-aws, tzclock update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-mechanize/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Aug 2008 15:32:08 -0000	1.9
+++ .cvsignore	24 Sep 2008 15:36:58 -0000	1.10
@@ -1 +1 @@
-mechanize-0.7.8.tgz
+mechanize-0.8.0.tgz


Index: ruby-mechanize.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-mechanize/devel/ruby-mechanize.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ruby-mechanize.spec	27 Aug 2008 15:32:08 -0000	1.8
+++ ruby-mechanize.spec	24 Sep 2008 15:36:58 -0000	1.9
@@ -1,12 +1,12 @@
 %{!?ruby_sitelib:	%define ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 
 %define		rubyabi		1.8
-%define		repoid		41995
+%define		repoid		43727
 
 %define		modname		mechanize
 
 Name:		ruby-%{modname}
-Version:	0.7.8
+Version:	0.8.0
 Release:	1%{?dist}
 Summary:	A handy web browsing ruby object
 Group:		Development/Languages
@@ -76,12 +76,15 @@
 %doc LICENSE.txt 
 %doc NOTES.txt
 %doc README.txt 
-%doc eg/
+%doc examples/
 
 %{ruby_sitelib}/%{modname}.rb
 %{ruby_sitelib}/www/
 
 %changelog
+* Thu Sep 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.0-1
+- 0.8.0
+
 * Thu Aug 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.8-1
 - 0.7.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-mechanize/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	27 Aug 2008 15:32:08 -0000	1.9
+++ sources	24 Sep 2008 15:36:58 -0000	1.10
@@ -1 +1 @@
-c5a5958640f29a3bafad35bf0813e4e3  mechanize-0.7.8.tgz
+efa57a32fe66ed78e078113bbdba32c2  mechanize-0.8.0.tgz



From mtasaka at fedoraproject.org  Wed Sep 24 15:37:29 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 24 Sep 2008 15:37:29 +0000 (UTC)
Subject: rpms/tzclock/F-8 .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 tzclock.spec,
	1.6, 1.7
Message-ID: <20080924153729.088BC70103@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tzclock/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7539/tzclock/F-8

Modified Files:
	.cvsignore sources tzclock.spec 
Log Message:
ruby-mechanize, ruby-aws, tzclock update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tzclock/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 May 2008 14:11:34 -0000	1.4
+++ .cvsignore	24 Sep 2008 15:36:58 -0000	1.5
@@ -1 +1 @@
-tzclock-2.7.1.tar.gz
+tzclock-2.7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tzclock/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 May 2008 14:11:34 -0000	1.5
+++ sources	24 Sep 2008 15:36:58 -0000	1.6
@@ -1 +1 @@
-4546a3bd5fe7b473a6af18e689435164  tzclock-2.7.1.tar.gz
+2b47c36a978373b401e61a8f23d78377  tzclock-2.7.2.tar.gz


Index: tzclock.spec
===================================================================
RCS file: /cvs/extras/rpms/tzclock/F-8/tzclock.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tzclock.spec	15 May 2008 14:11:34 -0000	1.6
+++ tzclock.spec	24 Sep 2008 15:36:58 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		tzclock
-Version:	2.7.1
+Version:	2.7.2
 Release:	1%{?dist}
 Summary:	GTK+ graphical Clock displaying the time around the world
 
@@ -67,6 +67,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.7.2-1
+- 2.7.2
+
 * Thu May 15 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.7.1-1
 - 2.7.1
 



From mtasaka at fedoraproject.org  Wed Sep 24 15:37:29 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 24 Sep 2008 15:37:29 +0000 (UTC)
Subject: rpms/tzclock/F-9 .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 tzclock.spec,
	1.7, 1.8
Message-ID: <20080924153729.3EFB470103@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tzclock/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7539/tzclock/F-9

Modified Files:
	.cvsignore sources tzclock.spec 
Log Message:
ruby-mechanize, ruby-aws, tzclock update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tzclock/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 May 2008 14:11:44 -0000	1.4
+++ .cvsignore	24 Sep 2008 15:36:59 -0000	1.5
@@ -1 +1 @@
-tzclock-2.7.1.tar.gz
+tzclock-2.7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tzclock/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 May 2008 14:11:44 -0000	1.5
+++ sources	24 Sep 2008 15:36:59 -0000	1.6
@@ -1 +1 @@
-4546a3bd5fe7b473a6af18e689435164  tzclock-2.7.1.tar.gz
+2b47c36a978373b401e61a8f23d78377  tzclock-2.7.2.tar.gz


Index: tzclock.spec
===================================================================
RCS file: /cvs/extras/rpms/tzclock/F-9/tzclock.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tzclock.spec	15 May 2008 14:11:44 -0000	1.7
+++ tzclock.spec	24 Sep 2008 15:36:59 -0000	1.8
@@ -1,5 +1,5 @@
 Name:		tzclock
-Version:	2.7.1
+Version:	2.7.2
 Release:	1%{?dist}
 Summary:	GTK+ graphical Clock displaying the time around the world
 
@@ -67,6 +67,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.7.2-1
+- 2.7.2
+
 * Thu May 15 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.7.1-1
 - 2.7.1
 



From mtasaka at fedoraproject.org  Wed Sep 24 15:37:28 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 24 Sep 2008 15:37:28 +0000 (UTC)
Subject: rpms/ruby-mechanize/F-8 .cvsignore, 1.9, 1.10 ruby-mechanize.spec,
	1.8, 1.9 sources, 1.9, 1.10
Message-ID: <20080924153728.5DCFC70103@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-mechanize/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7539/ruby-mechanize/F-8

Modified Files:
	.cvsignore ruby-mechanize.spec sources 
Log Message:
ruby-mechanize, ruby-aws, tzclock update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-mechanize/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Aug 2008 15:32:08 -0000	1.9
+++ .cvsignore	24 Sep 2008 15:36:58 -0000	1.10
@@ -1 +1 @@
-mechanize-0.7.8.tgz
+mechanize-0.8.0.tgz


Index: ruby-mechanize.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-mechanize/F-8/ruby-mechanize.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ruby-mechanize.spec	27 Aug 2008 15:32:08 -0000	1.8
+++ ruby-mechanize.spec	24 Sep 2008 15:36:58 -0000	1.9
@@ -1,12 +1,12 @@
 %{!?ruby_sitelib:	%define ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 
 %define		rubyabi		1.8
-%define		repoid		41995
+%define		repoid		43727
 
 %define		modname		mechanize
 
 Name:		ruby-%{modname}
-Version:	0.7.8
+Version:	0.8.0
 Release:	1%{?dist}
 Summary:	A handy web browsing ruby object
 Group:		Development/Languages
@@ -76,12 +76,15 @@
 %doc LICENSE.txt 
 %doc NOTES.txt
 %doc README.txt 
-%doc eg/
+%doc examples/
 
 %{ruby_sitelib}/%{modname}.rb
 %{ruby_sitelib}/www/
 
 %changelog
+* Thu Sep 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.0-1
+- 0.8.0
+
 * Thu Aug 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.8-1
 - 0.7.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-mechanize/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	27 Aug 2008 15:32:08 -0000	1.9
+++ sources	24 Sep 2008 15:36:58 -0000	1.10
@@ -1 +1 @@
-c5a5958640f29a3bafad35bf0813e4e3  mechanize-0.7.8.tgz
+efa57a32fe66ed78e078113bbdba32c2  mechanize-0.8.0.tgz



From mtasaka at fedoraproject.org  Wed Sep 24 15:37:28 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 24 Sep 2008 15:37:28 +0000 (UTC)
Subject: rpms/ruby-aws/devel .cvsignore, 1.10, 1.11 ruby-aws.spec, 1.9,
	1.10 sources, 1.10, 1.11
Message-ID: <20080924153728.1BDCB70103@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-aws/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7539/ruby-aws/devel

Modified Files:
	.cvsignore ruby-aws.spec sources 
Log Message:
ruby-mechanize, ruby-aws, tzclock update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	17 Sep 2008 18:18:45 -0000	1.10
+++ .cvsignore	24 Sep 2008 15:36:57 -0000	1.11
@@ -1 +1 @@
-ruby-aws-0.4.2.tar.gz
+ruby-aws-0.4.3.tar.gz


Index: ruby-aws.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/devel/ruby-aws.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ruby-aws.spec	17 Sep 2008 18:18:45 -0000	1.9
+++ ruby-aws.spec	24 Sep 2008 15:36:57 -0000	1.10
@@ -2,7 +2,7 @@
 %define		rubyabi		1.8
 
 Name:		ruby-aws
-Version:	0.4.2
+Version:	0.4.3
 Release:	1%{?dist}
 Summary:	Ruby interface to Amazon Web Services
 Group:		Development/Languages
@@ -78,6 +78,9 @@
 %doc test/
 
 %changelog
+* Thu Sep 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.3-1
+- 0.4.3
+
 * Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.2-1
 - 0.4.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Sep 2008 18:18:45 -0000	1.10
+++ sources	24 Sep 2008 15:36:57 -0000	1.11
@@ -1 +1 @@
-ed97d574477a775b3620473330475d41  ruby-aws-0.4.2.tar.gz
+6a4e7299a388ced5069c87a473ce57e9  ruby-aws-0.4.3.tar.gz



From mtasaka at fedoraproject.org  Wed Sep 24 15:37:29 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 24 Sep 2008 15:37:29 +0000 (UTC)
Subject: rpms/tzclock/devel .cvsignore, 1.4, 1.5 sources, 1.5,
	1.6 tzclock.spec, 1.7, 1.8
Message-ID: <20080924153729.7E75770103@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tzclock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7539/tzclock/devel

Modified Files:
	.cvsignore sources tzclock.spec 
Log Message:
ruby-mechanize, ruby-aws, tzclock update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tzclock/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 May 2008 14:11:53 -0000	1.4
+++ .cvsignore	24 Sep 2008 15:36:59 -0000	1.5
@@ -1 +1 @@
-tzclock-2.7.1.tar.gz
+tzclock-2.7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tzclock/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 May 2008 14:11:53 -0000	1.5
+++ sources	24 Sep 2008 15:36:59 -0000	1.6
@@ -1 +1 @@
-4546a3bd5fe7b473a6af18e689435164  tzclock-2.7.1.tar.gz
+2b47c36a978373b401e61a8f23d78377  tzclock-2.7.2.tar.gz


Index: tzclock.spec
===================================================================
RCS file: /cvs/extras/rpms/tzclock/devel/tzclock.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tzclock.spec	15 May 2008 14:11:53 -0000	1.7
+++ tzclock.spec	24 Sep 2008 15:36:59 -0000	1.8
@@ -1,5 +1,5 @@
 Name:		tzclock
-Version:	2.7.1
+Version:	2.7.2
 Release:	1%{?dist}
 Summary:	GTK+ graphical Clock displaying the time around the world
 
@@ -67,6 +67,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.7.2-1
+- 2.7.2
+
 * Thu May 15 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.7.1-1
 - 2.7.1
 



From gemi at fedoraproject.org  Wed Sep 24 15:41:48 2008
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Wed, 24 Sep 2008 15:41:48 +0000 (UTC)
Subject: rpms/abcMIDI/devel .cvsignore, 1.14, 1.15 abcMIDI.spec, 1.18,
	1.19 sources, 1.14, 1.15 abcmidi-snprintf.patch, 1.1,
	NONE abcmidi-sprintf.patch, 1.1, NONE
Message-ID: <20080924154148.4B99370103@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/abcMIDI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8895

Modified Files:
	.cvsignore abcMIDI.spec sources 
Removed Files:
	abcmidi-snprintf.patch abcmidi-sprintf.patch 
Log Message:
new release 20080924


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abcMIDI/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	9 Jan 2007 10:13:30 -0000	1.14
+++ .cvsignore	24 Sep 2008 15:41:17 -0000	1.15
@@ -1 +1 @@
-abcMIDI-2007-01-06.zip
+abcMIDI-2008-09-24.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcMIDI/devel/abcMIDI.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- abcMIDI.spec	14 Jul 2008 16:33:53 -0000	1.18
+++ abcMIDI.spec	24 Sep 2008 15:41:17 -0000	1.19
@@ -1,12 +1,12 @@
 Name:           abcMIDI
-Version:        20070106
-Release:        3%{?dist}
+Version:        20080924
+Release:        1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2007-01-06.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2008-09-24.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description 
@@ -22,7 +22,9 @@
 %prep
 %setup -q -n abcmidi
 # correct end-of-line encoding
-sed -i 's/\r//' doc/*.txt demo.abc doc/AUTHORS VERSION
+sed -i 's/\r//' doc/*.txt *.abc doc/AUTHORS VERSION
+# remove executable flag from text files
+chmod 0644 *.abc VERSION doc/*.txt doc/AUTHORS doc/CHANGES
 
 
 %build
@@ -55,12 +57,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc demo.abc VERSION doc/*.txt doc/AUTHORS doc/CHANGES
+%doc *.abc VERSION doc/*.txt doc/AUTHORS doc/CHANGES
 %{_mandir}/man*/*
 %{_bindir}/*
 
 
 %changelog
+* Wed Sep 24 2008 Gerard Milmeister <gemi at bluewin.ch> - 20080924-1
+- new release 2008-09-24
+
 * Mon Jul 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 20070106-3
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abcMIDI/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	9 Jan 2007 10:13:30 -0000	1.14
+++ sources	24 Sep 2008 15:41:17 -0000	1.15
@@ -1 +1 @@
-be1d03c642ae5a6d99728e4108aa6ae6  abcMIDI-2007-01-06.zip
+3aa16f97bfc3bf187dc6ce5ea6a60750  abcMIDI-2008-09-24.zip


--- abcmidi-snprintf.patch DELETED ---


--- abcmidi-sprintf.patch DELETED ---



From gemi at fedoraproject.org  Wed Sep 24 15:45:38 2008
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Wed, 24 Sep 2008 15:45:38 +0000 (UTC)
Subject: rpms/abcMIDI/F-9 .cvsignore, 1.14, 1.15 abcMIDI.spec, 1.17,
	1.18 sources, 1.14, 1.15 abcmidi-snprintf.patch, 1.1,
	NONE abcmidi-sprintf.patch, 1.1, NONE
Message-ID: <20080924154538.8F1DE7013E@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/abcMIDI/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9457/F-9

Modified Files:
	.cvsignore abcMIDI.spec sources 
Removed Files:
	abcmidi-snprintf.patch abcmidi-sprintf.patch 
Log Message:
new release 20080924


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abcMIDI/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	9 Jan 2007 10:13:30 -0000	1.14
+++ .cvsignore	24 Sep 2008 15:45:08 -0000	1.15
@@ -1 +1 @@
-abcMIDI-2007-01-06.zip
+abcMIDI-2008-09-24.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcMIDI/F-9/abcMIDI.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- abcMIDI.spec	19 Feb 2008 03:24:14 -0000	1.17
+++ abcMIDI.spec	24 Sep 2008 15:45:08 -0000	1.18
@@ -4,9 +4,9 @@
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2+
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2007-01-06.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2008-09-24.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description 
@@ -22,7 +22,9 @@
 %prep
 %setup -q -n abcmidi
 # correct end-of-line encoding
-sed -i 's/\r//' doc/*.txt demo.abc doc/AUTHORS VERSION
+sed -i 's/\r//' doc/*.txt *.abc doc/AUTHORS VERSION
+# remove executable flag from text files
+chmod 0644 *.abc VERSION doc/*.txt doc/AUTHORS doc/CHANGES
 
 
 %build
@@ -55,12 +57,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc demo.abc VERSION doc/*.txt doc/AUTHORS doc/CHANGES
+%doc *.abc VERSION doc/*.txt doc/AUTHORS doc/CHANGES
 %{_mandir}/man*/*
 %{_bindir}/*
 
 
 %changelog
+* Wed Sep 24 2008 Gerard Milmeister <gemi at bluewin.ch> - 20080924-1
+- new release 2008-09-24
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 20070106-2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abcMIDI/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	9 Jan 2007 10:13:30 -0000	1.14
+++ sources	24 Sep 2008 15:45:08 -0000	1.15
@@ -1 +1 @@
-be1d03c642ae5a6d99728e4108aa6ae6  abcMIDI-2007-01-06.zip
+3aa16f97bfc3bf187dc6ce5ea6a60750  abcMIDI-2008-09-24.zip


--- abcmidi-snprintf.patch DELETED ---


--- abcmidi-sprintf.patch DELETED ---



From gemi at fedoraproject.org  Wed Sep 24 15:45:38 2008
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Wed, 24 Sep 2008 15:45:38 +0000 (UTC)
Subject: rpms/abcMIDI/F-8 .cvsignore, 1.14, 1.15 abcMIDI.spec, 1.16,
	1.17 sources, 1.14, 1.15 abcmidi-snprintf.patch, 1.1,
	NONE abcmidi-sprintf.patch, 1.1, NONE
Message-ID: <20080924154538.6166C70103@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/abcMIDI/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9457/F-8

Modified Files:
	.cvsignore abcMIDI.spec sources 
Removed Files:
	abcmidi-snprintf.patch abcmidi-sprintf.patch 
Log Message:
new release 20080924


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abcMIDI/F-8/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	9 Jan 2007 10:13:30 -0000	1.14
+++ .cvsignore	24 Sep 2008 15:45:07 -0000	1.15
@@ -1 +1 @@
-abcMIDI-2007-01-06.zip
+abcMIDI-2008-09-24.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcMIDI/F-8/abcMIDI.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- abcMIDI.spec	9 Jan 2007 10:13:30 -0000	1.16
+++ abcMIDI.spec	24 Sep 2008 15:45:08 -0000	1.17
@@ -1,12 +1,12 @@
 Name:           abcMIDI
-Version:        20070106
+Version:        20080924
 Release:        1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2+
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2007-01-06.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2008-09-24.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description 
@@ -22,7 +22,9 @@
 %prep
 %setup -q -n abcmidi
 # correct end-of-line encoding
-sed -i 's/\r//' doc/*.txt demo.abc doc/AUTHORS VERSION
+sed -i 's/\r//' doc/*.txt *.abc doc/AUTHORS VERSION
+# remove executable flag from text files
+chmod 0644 *.abc VERSION doc/*.txt doc/AUTHORS doc/CHANGES
 
 
 %build
@@ -55,12 +57,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc demo.abc VERSION doc/*.txt doc/AUTHORS doc/CHANGES
+%doc *.abc VERSION doc/*.txt doc/AUTHORS doc/CHANGES
 %{_mandir}/man*/*
 %{_bindir}/*
 
 
 %changelog
+* Wed Sep 24 2008 Gerard Milmeister <gemi at bluewin.ch> - 20080924-1
+- new release 2008-09-24
+
 * Tue Jan  9 2007 Gerard Milmeister <gemi at bluewin.ch> - 20070106-1
 - new version 20070106
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abcMIDI/F-8/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	9 Jan 2007 10:13:30 -0000	1.14
+++ sources	24 Sep 2008 15:45:08 -0000	1.15
@@ -1 +1 @@
-be1d03c642ae5a6d99728e4108aa6ae6  abcMIDI-2007-01-06.zip
+3aa16f97bfc3bf187dc6ce5ea6a60750  abcMIDI-2008-09-24.zip


--- abcmidi-snprintf.patch DELETED ---


--- abcmidi-sprintf.patch DELETED ---



From gemi at fedoraproject.org  Wed Sep 24 15:47:24 2008
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Wed, 24 Sep 2008 15:47:24 +0000 (UTC)
Subject: rpms/abcMIDI/F-9 abcMIDI.spec,1.18,1.19
Message-ID: <20080924154724.CC86670103@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/abcMIDI/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9773/F-9

Modified Files:
	abcMIDI.spec 
Log Message:
new release 20080924


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcMIDI/F-9/abcMIDI.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- abcMIDI.spec	24 Sep 2008 15:45:08 -0000	1.18
+++ abcMIDI.spec	24 Sep 2008 15:46:54 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           abcMIDI
-Version:        20070106
-Release:        2%{?dist}
+Version:        20080924
+Release:        1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia



From pkgdb at fedoraproject.org  Wed Sep 24 15:48:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 24 Sep 2008 15:48:39 +0000
Subject: [pkgdb] javasqlite had acl change status
Message-ID: <20080924154839.D2819208DA2@bastion.fedora.phx.redhat.com>

toshio has set the watchbugzilla acl on javasqlite (Fedora 9) to Obsolete for mora

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javasqlite



From than at fedoraproject.org  Wed Sep 24 16:28:02 2008
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 24 Sep 2008 16:28:02 +0000 (UTC)
Subject: rpms/system-switch-displaymanager/devel .cvsignore, 1.2, 1.3 sources,
	1.2, 1.3 system-switch-displaymanager.spec, 1.1, 1.2
Message-ID: <20080924162802.7060770103@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/system-switch-displaymanager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14107

Modified Files:
	.cvsignore sources system-switch-displaymanager.spec 
Log Message:
- 1.2
- WDM setting issue
- add missing icons for WDM/XDM




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/system-switch-displaymanager/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Sep 2008 06:32:52 -0000	1.2
+++ .cvsignore	24 Sep 2008 16:27:32 -0000	1.3
@@ -1 +1,2 @@
 system-switch-displaymanager-1.1.tar.bz2
+system-switch-displaymanager-1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-switch-displaymanager/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Sep 2008 06:32:52 -0000	1.2
+++ sources	24 Sep 2008 16:27:32 -0000	1.3
@@ -1 +1 @@
-81a1112ea0de8fa57984d242e6810094  system-switch-displaymanager-1.1.tar.bz2
+77d33edd09e54c298291b5c7e8e3a650  system-switch-displaymanager-1.2.tar.bz2


Index: system-switch-displaymanager.spec
===================================================================
RCS file: /cvs/extras/rpms/system-switch-displaymanager/devel/system-switch-displaymanager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- system-switch-displaymanager.spec	12 Sep 2008 06:33:25 -0000	1.1
+++ system-switch-displaymanager.spec	24 Sep 2008 16:27:32 -0000	1.2
@@ -1,6 +1,6 @@
 Name: system-switch-displaymanager
 Summary: A display manager switcher for GDM, KDM, XDM and WDM
-Version: 1.1
+Version: 1.2
 Release: 1
 URL: http://fedoraproject.org/wiki/switch-displaymanager
 Source: %{name}-%{version}.tar.bz2
@@ -64,8 +64,14 @@
 %{_datadir}/%{name}/*.glade
 %{_datadir}/%{name}/*.py*
 %{_datadir}/applications/*
+%{_datadir}/icons/hicolor/*/*/*.png
 
 %changelog
+* Wed Sep 24 2008 Than Ngo <than at redhat.com> 1.2-1
+- 1.2
+- WDM setting issue
+- add missing icons for WDM/XDM
+
 * Thu Sep 11 2008 Than Ngo <than at redhat.com> 1.1-1
 - rename to system-switch-displaymanager
 



From mclasen at fedoraproject.org  Wed Sep 24 16:41:04 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 24 Sep 2008 16:41:04 +0000 (UTC)
Subject: rpms/devhelp/devel devhelp.spec,1.95,1.96
Message-ID: <20080924164104.6517770103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/devhelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15629

Modified Files:
	devhelp.spec 
Log Message:
Rebuild



Index: devhelp.spec
===================================================================
RCS file: /cvs/extras/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- devhelp.spec	22 Sep 2008 16:08:46 -0000	1.95
+++ devhelp.spec	24 Sep 2008 16:40:34 -0000	1.96
@@ -1,5 +1,5 @@
 # Last updated for 0.17
-%define gecko_version 1.9.0.1
+%define gecko_version 1.9.0.2
 %define gtk2_version 2.8.0
 %define libwnck_version 2.10.0
 
@@ -7,7 +7,7 @@
 
 Name: devhelp
 Version: 0.21
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API document browser
@@ -133,6 +133,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Sep 24 2008 Matthias Clasen <mclasen at redhat.com> - 0.21-2
+- Rebuild against newer gecko
+
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 0.21-1
 - Update to 0.21
 



From jjames at fedoraproject.org  Wed Sep 24 17:02:27 2008
From: jjames at fedoraproject.org (Jerry James)
Date: Wed, 24 Sep 2008 17:02:27 +0000 (UTC)
Subject: rpms/latexmk/devel .cvsignore, 1.3, 1.4 latexmk-README.fedora, 1.2, 
	1.3 latexmk-conf.patch, 1.2, 1.3 latexmk.conf, 1.2,
	1.3 latexmk.spec, 1.4, 1.5 sources, 1.3, 1.4 latexmk-perl.patch,
	1.2, NONE
Message-ID: <20080924170227.54F0870103@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/latexmk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18037

Modified Files:
	.cvsignore latexmk-README.fedora latexmk-conf.patch 
	latexmk.conf latexmk.spec sources 
Removed Files:
	latexmk-perl.patch 
Log Message:
* Wed Sep 24 2008 Jerry James <loganjerry at gmail.com> - 4.00e-1
- New version 4.00e.
- Drop the perl patch; the script finds it just fine
- Change the tetex requires to texlive requires



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Sep 2007 04:18:15 -0000	1.3
+++ .cvsignore	24 Sep 2008 17:01:56 -0000	1.4
@@ -1 +1 @@
-latexmk-320.zip
+latexmk-400e.zip


Index: latexmk-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk-README.fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- latexmk-README.fedora	1 Sep 2007 04:18:15 -0000	1.2
+++ latexmk-README.fedora	24 Sep 2008 17:01:56 -0000	1.3
@@ -1,12 +1,11 @@
 I. CHANGES FROM UPSTREAM
 
-Latexmk almost works out of the box.  Three changes have been made to
-conform to Fedora Core conventions.  First, the default DVI, PostScript,
-and PDF previewers have been changed to 'xdg-open'; see below for more
-information. Second, the script has been altered so that it does not
-search for the perl binary; perl is in a known location on Fedora Core
-systems.  Finally, the site-wide configuration file is /etc/latexmk.conf
-only, as opposed to the list of names searched by the original latexmk.
+Latexmk almost works out of the box.  Two changes have been made to
+conform to Fedora conventions.  First, the default DVI, PostScript, and
+PDF previewers have been changed to 'xdg-open'; see below for more
+information. Second, the site-wide configuration file is
+/etc/latexmk.conf only, as opposed to the list of names searched by the
+original latexmk.
 
 II. PREVIEWERS
 

latexmk-conf.patch:

Index: latexmk-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk-conf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- latexmk-conf.patch	1 Sep 2007 04:18:15 -0000	1.2
+++ latexmk-conf.patch	24 Sep 2008 17:01:56 -0000	1.3
@@ -1,10 +1,10 @@
-diff -dur latexmk-3.20.ORIG/latexmk.1 latexmk-3.20/latexmk.1
---- latexmk-3.20.ORIG/latexmk.1	2007-07-03 14:22:44.000000000 -0600
-+++ latexmk-3.20/latexmk.1	2007-08-31 21:44:15.000000000 -0600
+diff -dur latexmk-4.00e.ORIG/latexmk.1 latexmk-4.00e/latexmk.1
+--- latexmk-4.00e.ORIG/latexmk.1	2008-03-12 09:34:24.000000000 -0600
++++ latexmk-4.00e/latexmk.1	2008-09-24 10:05:29.000000000 -0600
 @@ -1,9 +1,9 @@
--.TH LATEXMK 1L "3 July 2007" ""
+-.TH LATEXMK 1L "12 March 2008" ""
 -.SH NAME
-+.TH "LATEXMK" "1L" "3 July 2007" "" ""
++.TH "LATEXMK" "1L" "12 March 2008" "" ""
 +.SH "NAME"
  latexmk \- generate LaTeX document
 -.SH SYNOPSIS
@@ -12,7 +12,7 @@
  .B latexmk [options] [file ...] 
 -.SH DESCRIPTION
 +.SH "DESCRIPTION"
- .I LatexMk
+ .I Latexmk
  completely automates the process of compiling a LaTeX document.
  Essentially, it is like a specialized relative of the general
 @@ -15,8 +15,8 @@
@@ -88,18 +88,18 @@
  \fR.fdb_latexmk\fR, by default) that contains the source file
  information.
  
--.SH LATEXMK OPTIONS AND ARGUMENTS
+-.SH LATEXMK OPTIONS AND ARGUMENTS ON COMMAND LINE
 -(All options can be introduced by single or double "-" characters,
 -e.g., "latexmk -help" or "latexmk --help".)
 -.TP
-+.SH "LATEXMK OPTIONS AND ARGUMENTS"
++.SH "LATEXMK OPTIONS AND ARGUMENTS ON COMMAND LINE"
 +(All options can be introduced by single or double "\-" characters,
 +e.g., "latexmk \-help" or "latexmk \-\-help".)
 +.TP 
  .B file
  One or more files can be specified.  If no files are specified,
  \fIlatexmk\fR will, by default, run on all files in the current working directory
-@@ -95,79 +95,79 @@
+@@ -97,32 +97,32 @@
  	latexmk foo
  
  then \fIlatexmk\fR will operate on the file "foo.tex".  
@@ -138,11 +138,12 @@
  .TP 
 -.B -c
 +.B \-c
- Clean up (remove) all regenerateable files generated by \fIlatex\fR
- and \fIbibtex\fR except dvi, postscript and pdf.  In addition, files
- specified by the $clean_ext configuration variable are removed.  But
- the file containing a database of source file information is not
- removed.
+ Clean up (remove) all regeneratable files generated by \fIlatex\fR and
+ \fIbibtex\fR except dvi, postscript and pdf.  These files are a
+ combination of log files, aux files, and those with extensions
+@@ -131,44 +131,44 @@
+ removed.  But the file containing a database of source file
+ information is not removed.
  
 -This cleanup is instead of a regular make.  See the \fB-gg\fR option
 +This cleanup is instead of a regular make.  See the \fB\-gg\fR option
@@ -150,11 +151,11 @@
  .TP 
 -.B -C
 +.B \-C
- Clean up (remove) all regenerateable files generated by \fIlatex\fR
- and \fIbibtex\fR including aux, dep, dvi, postscript and pdf.  In
- addition, those specified by the $clean_ext and $clean_full_ext
- configuration variables are removed.  But the file containing a
- database of source file information is not removed.
+ Clean up (remove) all regeneratable files generated by \fIlatex\fR and
+-\fIbibtex\fR.  This is the same as the \fB-c\fR option with the
++\fIbibtex\fR.  This is the same as the \fB\-c\fR option with the
+ addition of dvi, postscript and pdf files, and those with extensions
+ in the \fI$clean_full_ext\fR configuration variable.
  
 -This cleanup is instead of a regular make.  See the \fB-gg\fR option
 +This cleanup is instead of a regular make.  See the \fB\-gg\fR option
@@ -162,11 +163,10 @@
  .TP 
 -.B -CA
 +.B \-CA
- Clean up (remove) absolutely all regenerateable files generated by
- \fIlatex\fR and \fIbibtex\fR including aux, dep, dvi, postscript and
- pdf.  In addition, those specified by the $clean_ext, $clean_full_ext,
- and @generated_exts configuration variables are removed, and the file
- containing a database of source file information.
+ Clean up (remove) absolutely all regeneratable files.  This is the
+-action specified by \fB-C\fR with the addition of deleting the file
++action specified by \fB\-C\fR with the addition of deleting the file
+ containing the database of source file information.
  
 -This cleanup is instead of a regular make.  It is the same as \fB-C
 --CF\fR.  See the \fB-gg\fR option if you want to do a cleanup then a
@@ -201,7 +201,7 @@
  Dvi file filtering.  The argument to this option is a filter which will
  generate a filtered dvi file with the extension ".dviF".  All extra
  processing (e.g. conversion to postscript, preview, printing) will then
-@@ -175,117 +175,117 @@
+@@ -176,145 +176,145 @@
  
  Example usage: To use dviselect to select only the even pages of the dvi file:
  
@@ -224,10 +224,49 @@
 +.TP 
 +.B \-dvi\-
  Turn off generation of dvi version of document.  (This may get
- overridden, if some other file is made (a .ps file) that is generated from
- the dvi file, or if no generated file at all is requested.)
+ overridden, if some other file is made (e.g., a .ps file) that is
+ generated from the dvi file, or if no generated file at all is
+ requested.) 
+-.TP
+-.B -e <code>
++.TP 
++.B \-e <code>
+ Execute the specified initialization code before processing.  The code
+ is \fIPerl\fR code of the same form as is used in \fIlatexmk\fR's
+-initialization files -- for more details, see the information on the
+-\fB-r\fR option, and the section about "Configuration/initialization
++initialization files \-\- for more details, see the information on the
++\fB\-r\fR option, and the section about "Configuration/initialization
+ (RC) files".  The code is typically a sequence of assignment
+ statements separated by semicolons.
+ 
+-The code is executed when the \fB-e\fR option is encountered during
+-\fIlatexmk\fR's parsing of its command line.  See the \fB-r\fR option
++The code is executed when the \fB\-e\fR option is encountered during
++\fIlatexmk\fR's parsing of its command line.  See the \fB\-r\fR option
+ for a way of executing initialization code from a file.  An error
+-results in \fIlatexmk\fR stopping.  Multiple instances of the \fB-r\fR
+-and \fB-e\fR options can be used, and they are executed in the order
++results in \fIlatexmk\fR stopping.  Multiple instances of the \fB\-r\fR
++and \fB\-e\fR options can be used, and they are executed in the order
+ they appear on the command line.
+ 
+ Some care is needed to deal with proper quoting of special characters
+ in the code on the command line.  For example, suppose it is desired
+-to set the latex command to use its -shell-escape option, then under
++to set the latex command to use its \-shell\-escape option, then under
+ UNIX/LINUX you could use the line
+ 
+-	latexmk -e '$latex=q/latex %O -shell-escape %S/' file.tex
++	latexmk \-e '$latex=q/latex %O \-shell\-escape %S/' file.tex
+ 
+ (Note that the q/.../ construct is a \fIPerl\fR idiom equivalent to using
+ single quotes.  This is easier than arranging to get a quote character
+ correctly escaped in a way that is independent of the shell and the
+-operating-system.)
 -.TP
 -.B -f
++operating\-system.)
 +.TP 
 +.B \-f
  Force \fIlatexmk\fR to continue document processing despite errors.
@@ -249,7 +288,7 @@
 +.B \-g
  Force \fIlatexmk\fR to process document fully, even under situations
  where \fIlatexmk\fR would normally decide that no changes in the
- source files have occured since the previous run. 
+ source files have occurred since the previous run. 
  This option is useful, for example, if you change some options and
  wish to reprocess the files.
 -.TP
@@ -379,9 +418,9 @@
  Postscript file filtering.  The argument to this option is a filter
  which will generate a filtered postscript file with the extension
  ".psF".  All extra processing (e.g. preview, printing) will then be
-@@ -293,54 +293,54 @@
+@@ -322,51 +322,51 @@
  
- Example usage: Use psnup to print two pages on the one page:
+ Example of usage: Use psnup to print two pages on the one page:
  
 -	latexmk -ps -pF 'psnup -2' foo.tex
 +	latexmk \-ps \-pF 'psnup \-2' foo.tex
@@ -425,11 +464,6 @@
 -governed by the other options, and is the same as for the \fB-pv\fR
 +governed by the other options, and is the same as for the \fB\-pv\fR
  option. 
--This option also turns on the \fB-f\fR option, since it is normally
--desirable in preview-continuous-mode to continue working even if
-+This option also turns on the \fB\-f\fR option, since it is normally
-+desirable in preview\-continuous\-mode to continue working even if
- errors are found.
 -The preview-continuous option \fB-pvc\fR can only work with one file.
 +The preview\-continuous option \fB\-pvc\fR can only work with one file.
  So in this case you will normally only specify one filename on
@@ -457,7 +491,7 @@
  
  There are some other methods for arranging an update, notably useful
  for many versions of xdvi and xpdf.  These are best set in
-@@ -348,65 +348,65 @@
+@@ -374,26 +374,26 @@
  
  Note that if \fIlatexmk\fR dies or is stopped by the user, the
  "forked" previewer will continue to run.  Successive invocations with
@@ -485,18 +519,31 @@
  Read the specified initialization file ("RC file") before processing.
  
 -Be careful about the ordering: (1) Standard initialization files --
--see the section below on "Initialization (RC) files" -- are read
+-see the section below on "Configuration/initialization (RC) files" --
 +Be careful about the ordering: (1) Standard initialization files \-\-
-+see the section below on "Initialization (RC) files" \-\- are read
- first.  (2) Then the options on the command line are acted on in the
- order they are given.  Therefore if an initialization file is
++see the section below on "Configuration/initialization (RC) files" \-\-
+ are read first.  (2) Then the options on the command line are acted on
+ in the order they are given.  Therefore if an initialization file is
 -specified by the \fB-r\fR option, it is read during this second step.
 -Thus an initialization file specified with the \fB-r\fR option can
 +specified by the \fB\-r\fR option, it is read during this second step.
 +Thus an initialization file specified with the \fB\-r\fR option can
  override both the standard initialization files and \fIpreviously\fR
  specified options.  But all of these can be overridden by \fIlater\fR
- options.  See below for more details about initialization (RC) files.
+ options.
+@@ -401,48 +401,48 @@
+ The contents of the RC file just comprise a piece of code in the
+ \fIPerl\fR programming language
+ (typically a sequence of assignment statements); they are executed
+-when the \fB-r\fR option is encountered during \fIlatexmk\fR's parsing
+-of its command line.  See the \fB-e\fR option for a way of giving
++when the \fB\-r\fR option is encountered during \fIlatexmk\fR's parsing
++of its command line.  See the \fB\-e\fR option for a way of giving
+ initialization code directly on \fIlatexmk\fR's command line.  An
+ error results in \fIlatexmk\fR stopping.  Multiple instances of the
+-\fB-r\fR and \fB-e\fR options can be used, and they are executed in
++\fB\-r\fR and \fB\-e\fR options can be used, and they are executed in
+ the order they appear on the command line.
 -.TP
 -.B -silent
 +.TP 
@@ -556,24 +603,26 @@
  					file, start a previewer.  Then
  					watch for changes in the source
  					file thesis.tex and any files it
-@@ -416,55 +416,56 @@
+@@ -452,37 +452,38 @@
  					encounters an error, latexmk will
  					keep running.
  
--% \fBlatexmk -c\fR		\fI# remove .aux, .log, .bbl, .blg, .dep,
-+% \fBlatexmk \-c\fR		\fI# remove .aux, .log, .bbl, .blg, .dep,
- 				.dvi, .pdf, .ps & .bbl files\fR
--.SH INITIALIZATION (RC) FILES
+-% \fBlatexmk -c\fR		\fI# remove .aux, .log, .bbl, .blg, .dvi, 
++% \fBlatexmk \-c\fR		\fI# remove .aux, .log, .bbl, .blg, .dvi, 
+ 					.pdf, .ps & .bbl files\fR
+ 
+ 
+-.SH CONFIGURATION/INITIALIZATION (RC) FILES
 -.PP
-+.SH "INITIALIZATION (RC) FILES"
++.SH "CONFIGURATION/INITIALIZATION (RC) FILES"
 +.PP 
- There are four initialization files ("RC files") that \fIlatexmk\fR can
- read at startup: 
+ \fILatexmk\fR can be customized using initialization files, which are
+ read at startup in the following order:
 -.PP
 +.PP 
  1) The system RC file, if it exists.  
     On a UNIX system, \fIlatexmk\fR searches for following places for its
-    system RC file, in the following order, and reads the first it finds:
+ system RC file, in the following order, and reads the first it finds:
     "/opt/local/share/latexmk/LatexMk",
     "/usr/local/share/latexmk/LatexMk",
     "/usr/local/lib/latexmk/LatexMk".
@@ -582,41 +631,50 @@
 +   On Fedora systems, it only looks for "/etc/latexmk.conf".
 +   On a MS\-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
 +.PP 
- 2) The user's RC file in "$HOME/.latexmkrc", where $HOME is the value
- of the environment variable HOME.  On UNIX and clones (including LINUX),
- this variable 
--is set by the system; on MS-Windows, the user may choose to set it.
+ 2) The user's RC file, "$HOME/.latexmkrc", if it exists.  Here $HOME
+ is the value of the environment variable HOME.  On UNIX and clones
+-(including LINUX), this variable is set by the system; on MS-Windows,
++(including LINUX), this variable is set by the system; on MS\-Windows,
+ the user may choose to set it.
 -.PP
-+is set by the system; on MS\-Windows, the user may choose to set it.
 +.PP 
- 3) The RC file in the current working directory called "latexmkrc".
+ 3) The RC file in the current working directory.  This file can be
+ named either "latexmkrc" or ".latexmkrc", and the first of these to be
+ found is used, if any.
 -.PP
 -4) Any RC file(s) specified on the command line with the \fB-r\fR option.
 -.PP
 +.PP 
 +4) Any RC file(s) specified on the command line with the \fB\-r\fR option.
 +.PP 
- Each RC file is a sequence of Perl commands.  Usually it will be just a
--sequence of assignment statements that override the built-in settings of
-+sequence of assignment statements that override the built\-in settings of
- \fILatexmk\fR.  Comment lines are introduced by the "#" character.
+ Each RC file is a sequence of \fIPerl\fR commands.  Naturally a user can use
+ this in creative ways.  But for most purposes, one simply uses a
+-sequence of assignment statements that override some of the built-in
++sequence of assignment statements that override some of the built\-in
+ settings of \fILatexmk\fR.  Straightforward cases can be handled
+ without knowledge of the \fIPerl\fR language by using the examples in this
+ document as templates.  Comment lines are introduced by the "#"
+@@ -490,27 +491,27 @@
  
  Note that command line options are obeyed in the order in which
  they are written; thus any RC file specified on the command line with
 -the \fB-r\fR option can override previous options but can be itself
 +the \fB\-r\fR option can override previous options but can be itself
- overridden by later options on the command line.  
+ overridden by later options on the command line.  There is also the
+-\fB-e\fR option, which allows initialization code to be specified in
++\fB\-e\fR option, which allows initialization code to be specified in
+ \fIlatexm\fR's command line.
  
--.SH RC VARIABLES IN INITIALIZATION FILES
+-.SH HOW TO SET VARIABLES IN INITIALIZATION FILES
 -.PP
-+.SH "RC VARIABLES IN INITIALIZATION FILES"
++.SH "HOW TO SET VARIABLES IN INITIALIZATION FILES"
 +.PP 
- Many of the available variables that can be set are shown in the next
- section.  Syntax for the statements in an initialization file is of
- the form:
+ The important variables that can be configured are described in the
+ section "List of configuration variables usable in initialization
+ files".  Syntax for setting these variables is of the following forms:
 -.PP
 +.PP 
- 	$bibtex = 'bibtex';
+ 	$bibtex = 'bibtex %O %B';
 -.PP
 +.PP 
  for the setting of a string variable, 
@@ -631,23 +689,88 @@
  	@default_files = ('paper', 'paper1');
 -.PP
 +.PP 
- for the setting of an array of strings.
+ for the setting of an array of strings.  It is possible to append an
+ item to an array variable as follows:
+ 
+@@ -525,8 +526,7 @@
+ 
+ 
+ 
+-.SH FORMAT OF COMMAND SPECIFICATIONS
+-
++.SH "FORMAT OF COMMAND SPECIFICATIONS"
+ Some of the variables set the commands that \fIlatexmk\fR uses for
+ carrying out its work, for example to generate a dvi file from a tex
+ file or to view a postscript file.  This section describes some
+@@ -534,42 +534,42 @@
+ 
+ \fBPlaceholders\fR:  Supposed you wanted \fIlatexmk\fR to use the
+ command elatex in place of the regular latex command, and suppose
+-moreover that you wanted to give it the option "--shell-escape".  You
++moreover that you wanted to give it the option "\-\-shell\-escape".  You
+ could do this by the following setting:
+ 
+-	$latex = 'elatex --shell-escape %O %S';
++	$latex = 'elatex \-\-shell\-escape %O %S';
  
- Some of the variables set the names of the commands that \fIlatexmk\fR
-@@ -472,37 +473,37 @@
+ The two items starting with the % character are placeholders.  These
+ are substituted by appropriate values before the command is run.  Thus
+ %S will be replaced by the source file that elatex will be applied to,
+ and %O will be replaced by any options that \fIlatexmk\fR has decided
+-to use for this command.  (E.g., if you used the -silent option it
+-would replace %O by "-interaction=batchmode".)
++to use for this command.  (E.g., if you used the \-silent option it
++would replace %O by "\-interaction=batchmode".)
  
- \fB"Detaching" a command\fR: If a command is to be run detached this
- is indicated by preceding it with "start", as in
+ The available placeholders are:
+-.TP
++.TP 
+ .B %B
+ base of filename for current command.  E.g., if a postscript file
+ document.ps is being made from the dvi file document.dvi, then the
+ basename is document.
+-.TP
++.TP 
+ .B %D
+ destination file (e.g., the name of the postscript file when
+ converting a dvi file to postscript).
+-.TP
++.TP 
+ .B %O
+ options
+-.TP
++.TP 
+ .B %R
+ root filename.  This is the base name for the main tex file.  
+-.TP
++.TP 
+ .B %S
+ source file (e.g., the name of the dvi file when converting a dvi file
+ to ps).
+-.TP
++.TP 
+ .B %T
+ The name of the primary tex file.
+-.PP
++.PP 
+ The distinction between %B and %R needs a bit of care, since they are
+ often the same, but not always.  For example on a simple document, the
+ basename of a bibtex run is the same as for the texfile.  But in a
+@@ -601,9 +601,9 @@
+ the previewer running and then returns to its next task (or exits if
+ there is nothing else to do).  To achieve this effect of detaching a
+ command, you need to precede the command name with "start ", as in
 -.PP
 +.PP 
- 	$dvi_previewer = 'start xdvi';
+ 	$dvi_previewer = 'start xdvi %O %S';
 -.PP
 +.PP 
  This will be translated to whatever is appropriate for your operating
- system. (Note: in some circumstances, \fIlatex\fR will always run a
- command detached.  This is the case for a previewer in preview
- continuous mode, since otherwise previewing continuously makes no
- sense.)
+ system.
+ 
+@@ -615,28 +615,28 @@
+ of the command string, that is equivalent to having just one.
+ 
  
 -\fBCommand names containing spaces\fR: Under MS-Windows it is common
 +\fBCommand names containing spaces\fR: Under MS\-Windows it is common
@@ -655,7 +778,7 @@
  installed in a subdirectory of "C:\Program Files".  Such command names
  should be enclosed in double quotes, as in
  
-   $lpr_pdf = '"c:/Program Files/Ghostgum/gsview/gsview32.exe" /p';
+ 	$lpr_pdf = '"c:/Program Files/Ghostgum/gsview/gsview32.exe" /p %S';
  
 -\fBUsing MS-Windows file associations\fR: A useful trick under modern
 -versions of MS-Windows (e.g., WinXP) is to use just the command
@@ -664,7 +787,7 @@
  'start' by itself:
 -.PP
 +.PP 
- 	$dvi_previewer = 'start';
+ 	$dvi_previewer = 'start %S';
 -.PP
 -Under recent versions of MS-Windows, this will cause to be run
 +.PP 
@@ -679,56 +802,48 @@
  	$lpr  = 'NONE lpr';
 -.PP
 +.PP 
- This means that an appropriate command has not been configured.  The
- string after the 'NONE' is effectively a comment.
+ This typically is used when an appropriate command does not exist on
+ your system.  The string after the "NONE" is effectively a comment.
  
-@@ -512,9 +513,9 @@
+@@ -646,9 +646,9 @@
  Suppose you want \fIlatexmk\fR to use latex with source specials
  enabled.  Then you might use the following line in an initialization
  file:
 -.PP
--	$latex = 'latex --src-specials';
+-	$latex = 'latex --src-specials %O %S';
 -.PP
 +.PP 
-+	$latex = 'latex \-\-src\-specials';
++	$latex = 'latex \-\-src\-specials %O %S';
 +.PP 
  
- \fBAdvanced tricks\fR: Normally \fIlatexmk\fR assumes certain behavior
- for commands and in particular it assumes certain kinds and ordering
-@@ -522,50 +523,50 @@
- example you might want to use Distiller to convert postscript files to
- pdf files.  You cannot simply change the name of the ps2pdf conversion
- program, as in
--.PP
-+.PP 
- 	$ps2pdf = 'distiller';  ######### WRONG
--.PP
-+.PP 
- because the command line arguments will be wrong.  In such a
--situation, your best bet is to write a batch file (under MS-Windows) or
-+situation, your best bet is to write a batch file (under MS\-Windows) or
- a script (under UNIX) that will do the conversion.  Then you set
--.PP
-+.PP 
- 	$ps2pdf = 'special_script';
--.PP
-+.PP 
- Your script will be invoked by \fIlatexmk\fR in its usual way as
- "Special_script file.ps file.pdf".  Your script calls Distiller with
- Distiller's correct arguments.
+ \fBAdvanced tricks\fR: Normally one specifies a single command for the
+ commands invoked by \fIlatexmk\fR.  Naturally, if there is some
+@@ -662,45 +662,45 @@
+ file from a tex file you need to run another program after pdflatex to
+ perform some extra processing, you could do something like:
+ 
+-     $pdflatex = 'pdflatex --shell-escape %O %S; pst2pdf_for_latexmk %B';
++     $pdflatex = 'pdflatex \-\-shell\-escape %O %S; pst2pdf_for_latexmk %B';
+ 
+-This definition assumes you are using a UNIX-like system, so that the
++This definition assumes you are using a UNIX\-like system, so that the
+ two commands to be run are separated by the semicolon in the middle of
+ the string.  
+ 
  
--.SH LIST OF RC VARIABLES IN INITIALIZATION FILES
+-.SH LIST OF CONFIGURATION VARIABLES USABLE IN INITIALIZATION FILES
 -.PP
-+.SH "LIST OF RC VARIABLES IN INITIALIZATION FILES"
++.SH "LIST OF CONFIGURATION VARIABLES USABLE IN INITIALIZATION FILES"
 +.PP 
  Default values are indicated in brackets.
 -.TP
 +.TP 
  .B $banner [0]
- If nonzero, the banner message is printed across each page when converting
- the dvi file to postscript.  Without modifying $banner_message, this is
--equivalent to specifying the \fB-d\fR option.
-+equivalent to specifying the \fB\-d\fR option.
+ If nonzero, the banner message is printed across each page when
+ converting the dvi file to postscript.  Without modifying the variable
+-\fI$banner_message\fR, this is equivalent to specifying the \fB-d\fR
++\fI$banner_message\fR, this is equivalent to specifying the \fB\-d\fR
+ option.
  
  Note that if \fB$banner\fR is nonzero, the \fB$postscript_mode\fR is
  assumed and the postscript file is always generated, even if it is newer
@@ -760,15 +875,15 @@
 +\fB\-bs\fR option.
 +.TP 
  .B @BIBINPUTS
- This is an array variable that specifies directories where
- \fIlatexmk\fR should look for .bib files.  By default it is set from
-@@ -588,13 +589,13 @@
- 
- This variable is likely to become obsolete in a future version of
- \fIlatexmk\fR which uses a better method of searching for files.
+ This is an array variable, now mostly obsolete, that specifies
+ directories where 
+@@ -728,13 +728,13 @@
+ since it has a better method of searching for files using the
+ kpsewhich command.  However, if your system is an unusual one without
+ the kpsewhich command, you may need to set the variable \fI at BIBINPUTS\fR.
 -.TP
 +.TP 
- .B $bibtex ["bibtex"]
+ .B $bibtex ["bibtex %O %S"]
  The BibTeX processing program.
 -.TP
 -.B $bibtex_silent_switch ["-terse"]
@@ -780,8 +895,8 @@
  .B $cleanup_mode [0]
  If nonzero, specifies cleanup mode: 1 for full cleanup, 2 for cleanup
  except for dvi, ps and pdf files, 3 for cleanup except for dep and aux
-@@ -602,21 +603,21 @@
- $clean_full_ext and @generated_exts variables.)
+@@ -743,21 +743,21 @@
+ variables.)
  
  This variable is equivalent to specifying one of
 -the \fB-c\fR, \fB-c1\fR, or \fB-C\fR options.  But there should be no need
@@ -811,7 +926,7 @@
  .B @default_files [('*.tex')]
  Default list of files to be processed.  
  
-@@ -643,30 +644,30 @@
+@@ -784,56 +784,56 @@
  is '.tex'.  Wild cards are allowed.  The parentheses are because
  \fI at default_files\fR is an array variable, i.e., a sequence of
  filename specifications is possible.
@@ -823,7 +938,13 @@
 -.TP
 +other processing.  Equivalent to specifying the \fB\-dF\fR option.
 +.TP 
- .B $dvi_previewer ["start xdvi" under UNIX]
+ .B $dvi_mode [0]
+ If nonzero, generate a dvi version of the document.  
+-Equivalent to the \fB-dvi\fR option.
+-.TP
++Equivalent to the \fB\-dvi\fR option.
++.TP 
+ .B $dvi_previewer ["start xdvi %O %S" under UNIX]
 -The command to invoke a dvi-previewer.
 -[Default is "start" under MS-WINDOWS; under more recent versions of
 +The command to invoke a dvi\-previewer.
@@ -832,7 +953,7 @@
  associated with .dvi files.] 
 -.TP
 +.TP 
- .B $dvi_previewer_landscape ["start xdvi"]
+ .B $dvi_previewer_landscape ["start xdvi %O %S"]
 -The command to invoke a dvi-previewer in landscape mode.
 -[Default is "start" under MS-WINDOWS; under more recent versions of
 +The command to invoke a dvi\-previewer in landscape mode.
@@ -841,32 +962,32 @@
  associated with .dvi files.] 
 -.TP
 +.TP 
- .B $dvipdf ["dvipdf"]
- Command to convert dvi to pdf file.  
+ .B $dvipdf ["dvipdf %O %S %D"]
+ Command to convert dvi to pdf file.  A common reconfiguration is to
+ use the dvipdfm command, which needs its arguments in a different order:
+ 
+-	$dvipdf = 'dvipdfm %O -o %D %S';
++	$dvipdf = 'dvipdfm %O \-o %D %S';
+ 
+ WARNING: The default dvipdf script generates pdf files with bitmapped
+ fonts, which do not look good when viewed by acroread.  That script
+-should be modified to give dvips the options "-P pdf" to ensure that
++should be modified to give dvips the options "\-P pdf" to ensure that
+ type 1 fonts are used in the pdf file.
  
- WARNING1: The default dvipdf
- script generates pdf files with bitmapped fonts, which don't look
- good when viewed by acroread.  The script should be modified to give
--dvips the options "-P pdf" to ensure that type 1 fonts are used in the
-+dvips the options "\-P pdf" to ensure that type 1 fonts are used in the
- pdf file.
- 
- WARNING 2: If you want to use one of the programs dvipdfm or dvipdfmx
-@@ -676,29 +677,29 @@
- the command line.  See the extra_scripts directory of the latexmk
- distribution, where the necessary scripts dvipdfm_call, etc are to be
- found, together with instructions for their use in the file README1.
 -.TP
+-.B $dvips ["dvips %O -o %D %S"]
 +.TP 
- .B $dvips ["dvips"]
++.B $dvips ["dvips %O \-o %D %S"]
  The program to used as a filter to convert a .dvi file to a .ps file.  
  If pdf is going to be generated from pdf, then the value of the
--$dvips_pdf_switch -- see below -- will be appended.
+-$dvips_pdf_switch -- see below -- will be included in the options
++$dvips_pdf_switch \-\- see below \-\- will be included in the options
+ substituted for '%O'.
 -.TP
--.B $dvips_landscape ["dvips -tlandscape"]
-+$dvips_pdf_switch \-\- see below \-\- will be appended.
+-.B $dvips_landscape ["dvips -tlandscape %O -o %D %S"]
 +.TP 
-+.B $dvips_landscape ["dvips \-tlandscape"]
++.B $dvips_landscape ["dvips \-tlandscape %O \-o %D %S"]
  The program to used as a filter to convert a .dvi file to a .ps file
  in landscape mode.
 -.TP
@@ -885,33 +1006,41 @@
  .B $dvi_update_command [""]
  When the dvi previewer is set to be updated by running a command, this
  is the command that is run.  See the information for the variable
- \fI$dvi_update_method\fR. 
+@@ -841,8 +841,8 @@
+ on the variable \fI$pdf_update_method\fR for an example for the
+ analogous case of a pdf previewer.
+ 
 -.TP
 -.B $dvi_update_method [2 under UNIX, 1 under MS-Windows]
 +.TP 
 +.B $dvi_update_method [2 under UNIX, 1 under MS\-Windows]
  How the dvi viewer updates its display when the dvi file has changed.
-   0 => update is automatic, 
-   1=> manual update by user, which may only mean a mouse click on the
-@@ -706,26 +707,26 @@
+ The values here apply equally to the \fI$pdf_update_method\fR and to
+ the \fI$ps_update_method\fR variables.
+@@ -852,38 +852,38 @@
     2 => Send the signal, whose number is in the variable
- $dvi_update_signal.  The default value under UNIX is suitable for xdvi.
+ \fI$dvi_update_signal\fR.  The default value under UNIX is suitable for xdvi.
     3 => Viewer cannot do an update, because it locks the file. (As with
 -acroread under MS-Windows.)
 +acroread under MS\-Windows.)
    4 => run a command to do the update.  The command is specified by
- the variable $dvi_update_command.   
+ the variable \fI$dvi_update_command\fR.   
+ 
+ See information on the variable \fI$pdf_update_method\fR for an
+ example of updating by command.
+ 
 -.TP
 -.B $dvi_update_signal [Under UNIX: SIGUSR1, which is a system-dependent value]
 +.TP 
 +.B $dvi_update_signal [Under UNIX: SIGUSR1, which is a system\-dependent value]
  The number of the signal that is sent to the dvi viewer when it is
--updated by sending a signal -- see $dvi_update_method.  The default
-+updated by sending a signal \-\- see $dvi_update_method.  The default
- value is the one appropriate for xdvi on a UNIX system.
+-updated by sending a signal -- see the information on the variable
++updated by sending a signal \-\- see the information on the variable
+ \fI$dvi_update_method\fR.  The default value is the one appropriate
+ for xdvi on a UNIX system.
 -.TP
 +.TP 
- .B $fdb_ext ["fdb_latex"]
+ .B $fdb_ext ["fdb_latexmk"]
  The extension of the file which \fIlatexmk\fR generates to contain a
  database of information on source files.  You will not normally need
  to change this.
@@ -921,30 +1050,50 @@
  If nonzero, continue processing past minor \fIlatex\fR errors 
  including unrecognized cross references.  Equivalent to specifying the
 -\fB-f\fR option.
--Note that specifying the \fB-pvc\fR sets $force_mode to 1.
 -.TP
 +\fB\-f\fR option.
-+Note that specifying the \fB\-pvc\fR sets $force_mode to 1.
 +.TP 
- .B @generated_exts [( 'ind', 'lof', 'lot', 'out', 'toc', $fdb_ext)]
- This contains a list of extensions for files that are generated
- (directly or indirectly) during a LaTeX run and that are read in by
-@@ -750,38 +751,38 @@
+ .B @generated_exts [( 'aux', 'bbl', 'idx', 'ind', 'lof', 'lot', 'out', 'toc', $fdb_ext )]
+ This contains a list of extensions for files that are generated during
+ a LaTeX run and that are read in by LaTeX in later runs, either
+ directly or indirectly. 
+ 
+ This list has two uses: (a) to set the kinds of file to be deleted in
+-a cleanup operation (with the \fB-c\fR, \fB-C\fR, \fB-CA\fR, \fB-g\fR
+-and \fB-gg\fR options), and (b) in the determination of whether a
++a cleanup operation (with the \fB\-c\fR, \fB\-C\fR, \fB\-CA\fR, \fB\-g\fR
++and \fB\-gg\fR options), and (b) in the determination of whether a
+ rerun of (pdf)LaTeX is needed after a run that gives an error.
+ 
+ (Normally, a change of a source file during a run should provoke a
+@@ -892,7 +892,7 @@
+ an error, a new run should occur until the user has made a change in
+ the files.  But the user may have corrected an error in a source .tex
+ file during the run.  So \fIlatexmk\fR needs to distinguish
+-user-generated and automatically generated files; it determines the
++user\-generated and automatically generated files; it determines the
+ automatically generated files as those with extensions in the list in
+ @generated_exts.)
  
+@@ -905,11 +905,11 @@
  adds the extension 'end' to the list of predefined generated
- extensions. 
+ extensions.  (This extension is used by the RevTeX package, for
+ example.) 
 -.TP
 +.TP 
  .B $go_mode [0]
- If nonzero, process files regardless of timestamps.  Equivalent to the
--\fB-g\fR option.
+ If nonzero, process files regardless of timestamps, and is then
+-equivalent to the \fB-g\fR option.
 -.TP
-+\fB\-g\fR option.
++equivalent to the \fB\-g\fR option.
 +.TP 
- .B $index_mode [0 and then as determined from the results of a run]
- If nonzero, run \fImakeindex\fR to produce index of document.  
- Normally you should not need to set this variable in an RC file, since
- latexmk determines automatically if \fImakeindex\fR needs to be run.
+ .B $kpsewhich ["kpsewhich %S"]
+ The program called to locate a source file when the name alone is not
+ sufficient.  Most filenames used by \fIlatexmk\fR have sufficient path
+@@ -921,28 +921,28 @@
+ See also the \fI at BIBINPUTS\fR variable for another way that \fIlatexmk\fR
+ also uses to try to locate files; it applies only in the case of .bib
+ files.
 -.TP
 +.TP 
  .B $landscape_mode [0]
@@ -954,7 +1103,7 @@
  Normally not needed with current previewers.
 -.TP
 +.TP 
- .B $latex ["latex"]
+ .B $latex ["latex %O %S"]
  The LaTeX processing program.  Note that as with other programs, you
  can use this variable not just to change the name of the program used,
  but also specify options to the program.  E.g.,
@@ -965,16 +1114,15 @@
 +	$latex = 'latex \-\-src\-specials';
 +.TP 
 +.B $latex_silent_switch ["\-interaction=batchmode"]
- \fBSwitch(es)\fR for the LaTeX processing program when silent mode is on.
+ Switch(es) for the LaTeX processing program when silent mode is on.
 -Under MS-Windows, the default value is changed to 
 -"-interaction=batchmode -c-style-errors", as used by MikTeX and fpTeX.
 -.TP
+-.B $lpr ["lpr  %O %S", or "NONE lpr" under MS-WINDOWS]
 +Under MS\-Windows, the default value is changed to 
 +"\-interaction=batchmode \-c\-style\-errors", as used by MikTeX and fpTeX.
 +.TP 
- .B $lpr ["lpr"]
--[Default is "NONE lpr" under MS-WINDOWS.]
-+[Default is "NONE lpr" under MS\-WINDOWS.]
++.B $lpr ["lpr  %O %S", or "NONE lpr" under MS\-WINDOWS]
  The command to print postscript files.
  
 -Under MS-Windows (unlike UNIX/LINUX), there is no standard program for
@@ -982,7 +1130,7 @@
  printing files.  But there are ways you can do it.  For example, if
  you have gsview installed, you could use it with the option '/p':
  
-@@ -795,14 +796,14 @@
+@@ -956,14 +956,14 @@
  the command obeyed; this is necessary because one part of the command
  name ('Program Files') contains a space which would otherwise be
  misinterpreted.
@@ -1000,55 +1148,57 @@
  e.g.,
  
      $lpr = '"c:/Program Files/Ghostgum/gsview/gsview32.exe" /p';
-@@ -812,18 +813,18 @@
+@@ -973,18 +973,18 @@
  is necessary because one part of the command name ('Program Files')
  contains a space which would otherwise be misinterpreted. 
  
 -.TP
+-.B $makeindex ["makeindex %O -o %D %S"]
 +.TP 
- .B $makeindex ["makeindex"]
++.B $makeindex ["makeindex %O \-o %D %S"]
  The index processing program.
 -.TP
 +.TP 
  .B $new_viewer_always [0]
  This variable applies to \fIlatexmk\fR \fBonly\fR in
--continuous-preview mode.  If $new_viewer_always is 0,
-+continuous\-preview mode.  If $new_viewer_always is 0,
+-continuous-preview mode.  If \fI$new_viewer_always\fR is 0,
++continuous\-preview mode.  If \fI$new_viewer_always\fR is 0,
  \fIlatexmk\fR will check for a previously running previewer on the
  same file, and if one is running will not start a new one.  If
--$new_viewer_always is non-zero, this check will be skipped, and
-+$new_viewer_always is non\-zero, this check will be skipped, and
+-\fI$new_viewer_always\fR is non-zero, this check will be skipped, and
++\fI$new_viewer_always\fR is non\-zero, this check will be skipped, and
  \fIlatexmk\fR will behave as if no viewer is running.
 -.TP
 +.TP 
  .B $pdf_mode [0]
  If zero, do NOT generate a pdf version of the document.
  If equal to 1, generate a pdf version of the document using pdflatex.  
-@@ -831,153 +832,153 @@
- file, by using the command specified by the $ps2pdf variable.  
+@@ -993,39 +993,39 @@
  If equal to 3, generate a pdf version of the document from the dvi
- file, by using the command specified by the $dvipdf variable.  
+ file, by using the command specified by the \fI$dvipdf\fR variable.  
+ 
 -Equivalent to the \fB-pdf-\fR, \fB-pdf\fR, \fB-pdfdvi\fR, 
 -\fB-pdfps\fR options.
 -.TP
 +Equivalent to the \fB\-pdf\-\fR, \fB\-pdf\fR, \fB\-pdfdvi\fR, 
 +\fB\-pdfps\fR options.
 +.TP 
- .B $pdflatex ["pdflatex"]
+ .B $pdflatex ["pdflatex %O %S"]
  The LaTeX processing program in the version that makes a pdf file instead
  of a dvi file.
 -.TP
 -.B $pdflatex_silent_switch  ["-interaction=batchmode"]
 +.TP 
 +.B $pdflatex_silent_switch  ["\-interaction=batchmode"]
- Switch(es) for the LaTeX processing program when silent mode is on.
+ Switch(es) for the pdflatex program (specified in the variable
+ \fI$pdflatex\fR when silent mode is on.
 -Under MS-Windows, the default value is changed to 
 -"-interaction=batchmode -c-style-errors", as used by MikTeX and fpTeX.
 -.TP
 +Under MS\-Windows, the default value is changed to 
 +"\-interaction=batchmode \-c\-style\-errors", as used by MikTeX and fpTeX.
 +.TP 
- .B $pdf_previewer ["start acroread"]
+ .B $pdf_previewer ["start acroread %O %S"]
 -The command to invoke a pdf-previewer.
 -[Default is changed to "start" on MS-WINDOWS; under more recent versions of
 +The command to invoke a pdf\-previewer.
@@ -1056,8 +1206,8 @@
  Windows, this will cause to be run whatever command the system has
  associated with .pdf files.]  
  
--Potential problem under MS-Windows:
-+Potential problem under MS\-Windows:
+-\fBWARNING\fR: Potential problem under MS-Windows:
++\fBWARNING\fR: Potential problem under MS\-Windows:
  if acroread is used as the pdf previewer, and it is
  actually viewing a pdf file, the pdf file cannot be updated.  Thus
  makes acroread a bad choice of previewer if you use \fIlatexmk\fR's
@@ -1076,36 +1226,55 @@
 +.TP 
 +.B $pdf_update_method [1 under UNIX, 3 under MS\-Windows]
  How the pdf viewer updates its display when the pdf file has
- changed. See $dvi_update_method for the codes, with the change that
- for the value 4, to run a command to do the update, the command is
- specified by the variable $pdf_update_command.
+ changed. See the information on the variable \fI$dvi_update_method\fR
+ for the codes.  (Note that information needs be changed slightly so
+@@ -1034,95 +1034,95 @@
+ value 2, to specify update by signal, the signal is specified by
+ \fI$pdf_update_signal\fR.)
  
 -Note that acroread under MS-Windows (but not UNIX) locks the pdf file, so
 +Note that acroread under MS\-Windows (but not UNIX) locks the pdf file, so
  the default value is then 3.  
+ 
+ Arranging to use a command to get a previewer explicitly updated
+ requires three variables to be set.  For example:
+ 
+-    $pdf_previewer = 'start xpdf -remote %R %O %S';
++    $pdf_previewer = 'start xpdf \-remote %R %O %S';
+     $pdf_update_method = 4;
+-    $pdf_update_command = 'xpdf -remote %R -reload';
++    $pdf_update_command = 'xpdf \-remote %R \-reload';
+ 
+ The first setting arranges for the xpdf program to be used in its
+ 'remote server mode', with the server name specified as the rootname
+ of the TeX file.  The second setting arranges for updating to be done
+ in response to a command, and the third setting sets the update command.
+ 
 -.TP
 -.B $pdf_update_signal [Under UNIX: SIGHUP, which is a system-dependent value]
 +.TP 
 +.B $pdf_update_signal [Under UNIX: SIGHUP, which is a system\-dependent value]
  The number of the signal that is sent to the pdf viewer when it is
--updated by sending a signal -- see $pdf_update_method.  The default
-+updated by sending a signal \-\- see $pdf_update_method.  The default
- value is the one appropriate for gv on a UNIX system.
+-updated by sending a signal -- see the information on the variable
++updated by sending a signal \-\- see the information on the variable
+ \fI$pdf_update_method\fR.  The default value is the one appropriate
+ for gv on a UNIX system.
 -.TP
 -.B $pid_position = [1 under UNIX, -1 under MS-Windows]     
 +.TP 
 +.B $pid_position = [1 under UNIX, \-1 under MS\-Windows]     
- Command used to get all the processes currently run by the user.  
--The -pvc option uses the command specified by the variable $pscmd to
-+The \-pvc option uses the command specified by the variable $pscmd to
+ Command used to get all the processes currently run by the user.  The
+--pvc option uses the command specified by the variable \fI$pscmd\fR to
++\-pvc option uses the command specified by the variable \fI$pscmd\fR to
  determine if there is an already running previewer, and to find the
- process ID (needed if \fIlatexmk\fR needs to signal the previewer about
- file changes).  The variable $pid_position is used to specify which word
- in lines of the output from $pscmd corresponds to the process ID.  The
- first word in the line is numbered 0.  The default value of 1 (2nd word in
--line) is correct for Solaris 2.6 and Linux.  Setting the variable to -1 is
-+line) is correct for Solaris 2.6 and Linux.  Setting the variable to \-1 is
- used to indicate that $pscmd is not to be used.
+ process ID (needed if \fIlatexmk\fR needs to signal the previewer
+ about file changes).  The variable \fI$pid_position\fR is used to
+ specify which word in lines of the output from \fI$pscmd\fR
+ corresponds to the process ID.  The first word in the line is numbered
+ 0.  The default value of 1 (2nd word in line) is correct for Solaris
+-2.6 and Linux.  Setting the variable to -1 is used to indicate that
++2.6 and Linux.  Setting the variable to \-1 is used to indicate that
+ \fI$pscmd\fR is not to be used.
 -.TP
 +.TP 
  .B $postscript_mode [0]
@@ -1153,7 +1322,8 @@
 +[On UNIX, the default is "ps \-f \-u $ENV{USER}", with changes for Linux
 +and OS\-X.
 +On MS\-WINDOWS the default in "NONE pscmd".]
- Command used to get all the processes currently run by the user.  This
+ 
+ Command used to get a list all the processes currently run by the user.  This
 -is used by the -pvc option to determine if there is an already running
 +is used by the \-pvc option to determine if there is an already running
  previewer. 
@@ -1164,7 +1334,7 @@
  NOTE: The variable \fI$pid_position\fR must also be set; see its description.
 -.TP
 +.TP 
- .B $ps2pdf ["ps2pdf"]
+ .B $ps2pdf ["ps2pdf  %O %S %D"]
  Command to convert ps to pdf file.  
 -.TP
 +.TP 
@@ -1174,25 +1344,30 @@
 +file before other processing.  Equivalent to specifying the \fB\-pF\fR
  option.
 -.TP
--.B $ps_previewer ["start gv -watch"]
++.TP 
+ .B $ps_previewer ["start gv %O %S"]
 -The command to invoke a ps-previewer.
 -[Default is "start" on MS-WINDOWS; under more recent versions of
-+.TP 
-+.B $ps_previewer ["start gv \-watch"]
 +The command to invoke a ps\-previewer.
 +[Default is "start" on MS\-WINDOWS; under more recent versions of
  Windows, this will cause to be run whatever command the system has
  associated with .ps files.]  
  
--Note that gv with the -watch option updates its display whenever the
-+Note that gv with the \-watch option updates its display whenever the
- postscript file changes, whereas ghostview does not. 
+-Note that gv could be used with the -watch option updates its display
++Note that gv could be used with the \-watch option updates its display
+ whenever the postscript file changes, whereas ghostview does not.
+ However, different versions of gv have slightly different ways of
+ writing this option.  Moreover, you can always configure gv to do this
+@@ -1131,19 +1131,19 @@
+ \fBWARNING\fR: Linux systems may have installed one (or more) versions
+ of gv under different names, e.g., ggv, kghostview, etc, but perhaps
+ not one called gv.  
 -.TP
--.B $ps_previewer_landscape ["start gv -swap -watch"]
+-.B $ps_previewer_landscape ["start gv -swap %O %S"]
 -The command to invoke a ps-previewer in landscape mode.
 -[Default is "start" on MS-WINDOWS; under more recent versions of
 +.TP 
-+.B $ps_previewer_landscape ["start gv \-swap \-watch"]
++.B $ps_previewer_landscape ["start gv \-swap %O %S"]
 +The command to invoke a ps\-previewer in landscape mode.
 +[Default is "start" on MS\-WINDOWS; under more recent versions of
  Windows, this will cause to be run whatever command the system has
@@ -1208,17 +1383,20 @@
 +.TP 
 +.B $ps_update_method [0 under UNIX, 1 under MS\-Windows]
  How the postscript viewer updates its display when the ps file has
- changed. See $dvi_update_method for the codes, with the change that
- for the value 4, to run a command to do the update, the command is
- specified by the variable $ps_update_command.
+ changed. See the information on the variable \fI$dvi_update_method\fR
+ for the codes.  (Note that information needs be changed slightly so
+@@ -1152,25 +1152,25 @@
+ value 2, to specify update by signal, the signal is specified by
+ \fI$ps_update_signal\fR.)
+ 
 -.TP
 -.B $ps_update_signal [Under UNIX: SIGHUP, which is a system-dependent value]
 +.TP 
 +.B $ps_update_signal [Under UNIX: SIGHUP, which is a system\-dependent value]
  The number of the signal that is sent to the pdf viewer when it is
--updated by sending a signal -- see $ps_update_method.  The default
-+updated by sending a signal \-\- see $ps_update_method.  The default
- value is the one appropriate for gv on a UNIX system.
+-updated by sending a signal -- see \fI$ps_update_method\fR.  The
++updated by sending a signal \-\- see \fI$ps_update_method\fR.  The
+ default value is the one appropriate for gv on a UNIX system.
 -.TP
 +.TP 
  .B $sleep_time [2]
@@ -1241,13 +1419,13 @@
  .B $tmpdir [See below for default]
  Directory to store temporary files that \fIlatexmk\fR may generate while
  running.  
-@@ -986,62 +987,62 @@
+@@ -1179,54 +1179,54 @@
  \fI$tmpdir\fR to the value of the first of whichever of the system
  environment variables TMPDIR or TEMP exists, otherwise to the current
  directory.  Under other operating systems (expected to be UNIX/Linux,
 -including OS-X), the default is the value of the system environment
 +including OS\-X), the default is the value of the system environment
- variable TMPDIR if it exists, otherwise to "/tmp".
+ variable TMPDIR if it exists, otherwise "/tmp".
 -.TP
 +.TP 
  .B $view ["default"]
@@ -1278,8 +1456,8 @@
 -.TP
 +.TP 
  .B must:
--If non-zero, the file we are converting from \fBmust\fR exist, if it
-+If non\-zero, the file we are converting from \fBmust\fR exist, if it
+-If non-zero, the file from which we are converting \fBmust\fR exist, if it
++If non\-zero, the file from which we are converting \fBmust\fR exist, if it
  doesn't exist \fIlatexmk\fR will give an error message and exit unless
 -the \fB-f\fR option is specified.  If \fImust\fR is zero and the file
 +the \fB\-f\fR option is specified.  If \fImust\fR is zero and the file
@@ -1290,39 +1468,49 @@
  The name of the subroutine that \fIlatexmk\fR should call to perform the
  file conversion.  The first argument to the subroutine is the base name
  of the file to be converted without any extension.  The subroutines are
- declared in the syntax of \fIperl\fR.  The function should return 0 if
+ declared in the syntax of \fIPerl\fR.  The function should return 0 if
  it was successful and a nonzero number if it failed.
 -.PP
--Example in an RC file to convert a \fI.fig\fR file to a \fI.eps\fR file:
+-Example in an RC file to ensure automatic conversion of \fI.fig\fR
 +.PP 
-+Example in an RC file to convert a \fI.fi g\fR file to a \fI.eps\fR file:
++Example in an RC file to ensure automatic conversion of \fI.fi g\fR
+ files to \fI.eps\fR files:
  
- @cus_dep_list = (@cus_dep_list, "fig eps 0 fig2eps");
+     push @cus_dep_list, "fig eps 0 fig2eps";
  
- sub fig2eps
- {
--  system("fig2dev -Lps $_[0].fig $_[0].eps");
-+  system("fig2dev \-Lps $_[0].fi g $_[0].eps");
- }
- 
--The subroutine \fIfig2eps\fR will only be called if the \fI.fig\fR file
-+The subroutine \fIfig2eps\fR will only be called if the \fI.fi g\fR file
- was modified more recently then the \fI.eps\fR file, or the \fI.eps\fR
- file does not exist.
+     sub fig2eps {
+-        system("fig2dev -Lps $_[0].fig $_[0].eps");
++        system("fig2dev \-Lps $_[0].fi g $_[0].eps");
+     }
+ 
+ The first line specifies the custom dependency, which specifies that
+-the subroutine \fIfig2eps\fR will be called if the \fI.fig\fR file has
++the subroutine \fIfig2eps\fR will be called if the \fI.fi g\fR file has
+ changed since the \fI.eps\fR file was last made, or if the \fI.eps\fR
+ file does not exist.  The remaining lines define this subroutine.
+ When it is called, this subroutine will have one argument which is the
+@@ -1236,7 +1236,7 @@
+ \fIPerl\fR idiom that signify that each string of the form of a variable
+ name, $_[0] in this case, is to be substituted by its value.
  
 -If the return value of the subroutine is non-zero, then \fIlatexmk\fR
 +If the return value of the subroutine is non\-zero, then \fIlatexmk\fR
  will assume an error occurred during the execution of the subroutine.
+ In the above example, no explicit return value is given, and instead
+ the return value is the value returned by the last (and only)
+@@ -1244,9 +1244,9 @@
+ on success.
+ 
  
 -.SH SEE ALSO
 +.SH "SEE ALSO"
  latex(1), bibtex(1).
 -.SH BUGS
 +.SH "BUGS"
- Search for .bib files is not correct if they are not in the current
- directory; the problem is that the log file generated by bibtex does not
- give the full path to the .bib files.  The easiest fix at the moment is to
-@@ -1062,29 +1063,29 @@
+ Sometimes a viewer (gv) tries to read an updated .ps or .pdf file
+ after its creation is started but before the file is complete.  Work
+ around: manually refresh (or reopen) display.  Or use one of the other
+@@ -1258,32 +1258,32 @@
  Gv on UNIX/LINUX works for both postscript and pdf.
  Ghostview on UNIX/LINUX needs a manual update (reopen); it views
  postscript and pdf. 
@@ -1340,7 +1528,8 @@
  Authors of previous versions.  Many users with their feedback, and
  especially 
  David Coppit (username david at node coppit.org) who made many useful
- suggestions that contributed to version 3. (Please note that the
+ suggestions that contributed to version 3. 
+ (Please note that the
 -e-mail addresses are not written in their standard form to avoid being
 +e\-mail addresses are not written in their standard form to avoid being
  harvested by worms and viruses.)
@@ -1348,7 +1537,7 @@
 +.SH "AUTHOR"
  Current version, with substantial modifications, enhancements and bug
  fixes by John Collins (username collins at node phys.psu.edu).
- (Version 3.09).
+ (Version 4.00).
  
  It can be obtained from CTAN:
 -<http://www.tug.org/tex-archive/support/latexmk/>, and from the
@@ -1360,10 +1549,12 @@
 -.br
 +.br 
  Original script called "go" by David J. Musliner (RCS Version 3.2)
-diff -dur latexmk-3.20.ORIG/latexmk.pl latexmk-3.20/latexmk.pl
---- latexmk-3.20.ORIG/latexmk.pl	2007-08-31 21:46:47.000000000 -0600
-+++ latexmk-3.20/latexmk.pl	2007-08-31 21:45:50.000000000 -0600
-@@ -584,10 +584,8 @@
+ 
+ \"  LocalWords:  fR fIlatexmk dvi ps fILatexmk pdflatex bibtex makeindex fB pv
+diff -dur latexmk-4.00e.ORIG/latexmk.pl latexmk-4.00e/latexmk.pl
+--- latexmk-4.00e.ORIG/latexmk.pl	2008-09-22 16:45:08.000000000 -0600
++++ latexmk-4.00e/latexmk.pl	2008-09-24 10:06:40.000000000 -0600
+@@ -777,10 +777,8 @@
      ## /usr/local/share, depending on the local conventions.
      ## /usr/local/lib/latexmk/LatexMk is put in the list for
      ## compatibility with older versions of latexmk.


Index: latexmk.conf
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- latexmk.conf	1 Sep 2007 04:18:15 -0000	1.2
+++ latexmk.conf	24 Sep 2008 17:01:56 -0000	1.3
@@ -4,6 +4,10 @@
 # The following options are given their default values.
 # Uncomment them and change the values if the defaults do not suit your needs.
 
+# When previewing, whether to make the viewer read from the generated file or
+# from a temporary copy
+# $always_view_file_via_temporary = 0;
+
 # If nonzero, DVI-to-postscript conversion adds a banner message on each page
 # $banner = 0;
 
@@ -14,55 +18,75 @@
 # $banner_message = 'DRAFT';
 
 # The size of the banner message (about 1100 divided by the message length)
-# $banner_scale = 220.0;
+# $banner_scale = 220;
 
 # An array of directory names where BibTeX should look for .bib files.
 # @BIBINPUTS = $ENV('BIBINPUTS') converted to an array of strings
 
 # The name of the BibTeX executable
-# $bibtex = 'bibtex';
+# $bibtex = 'bibtex %O %B';
 
 # The switch that puts BibTeX in silent mode
 # $bibtex_silent_switch = '-terse';
 
-# How much cleaning to do: 0 specifies normal operation (no cleaning),
-# 1 specifies a full cleanup, 2 specifies a cleanup that leaves DVI,
-# PostScript, and PDF files, and 3 specifies a cleanup that also leaves dep
-# and aux files.  You probably should not set this option.
-# $cleanup_mode = 0;
-
 # Extra file extensions to remove when cleaning
 # $clean_ext = "";
 
 # Extra file extensions to remove when doing a full clean
 # $clean_full_ext = "";
 
+# Whether to just cleanup, or also generate files
+# $cleanup_only = 0;
+
+# Whether to clean latexmk's file database too
+# $cleanup_fdb = 0;
+
+# How much cleaning to do: 0 specifies normal operation (no cleaning),
+# 1 specifies a full cleanup, 2 specifies a cleanup that leaves DVI,
+# PostScript, and PDF files, and 3 specifies a cleanup that also leaves dep
+# and aux files.  You probably should not set this option.
+# $cleanup_mode = 0;
+
 # A custom dependency list; see the man page for details
 # @cus_dep_list = ();
 
+# The default list of files to not be processed; see the man page for details
+# @default_excluded_files = ( );
+
 # The default list of files to be processed; see the man page for details
 # @default_files = ('*.tex');
 
+# Whether to display lists of dependencies
+# $dependents_list = 0;
+
+# Whether to get diagnostic output from latexmk
+# $diagnostics = 0;
+
+# Whether to change to the directory of the source file
+# $do_cd = 0;
+
 # The DVI file filter to be run on newly produced DVI files
 # $dvi_filter = '';
 
+# Always make a DVI file
+# $dvi_mode = 0;
+
 # The command to start a DVI previewer
-# $dvi_previewer = 'start xdvi';
-$dvi_previewer = 'xdg-open';
+# $dvi_previewer = 'start xdvi %O %S';
+$dvi_previewer = 'xdg-open %O %S';
 
 # The command to start a DVI previewer in landscape mode
-# $dvi_previewer_landscape = 'start xdvi -paper usr';
-$dvi_previewer_landscape = 'xdg-open';
+# $dvi_previewer_landscape = 'start xdvi -paper usr %O %S';
+$dvi_previewer_landscape = 'xdg-open %O %S';
 
 # The command to convert a DVI file into a PDF file.
 # See the warnings on the man page
-# $dvipdf = 'dvipdf';
-
+# $dvipdf = 'dvipdf %O %S %D';
 # The command to convert a DVI file into a PostScript file
-# $dvips = 'dvips';
+# $dvips = 'dvips %O -o %D %S';
 
 # The command to convert a DVI file into a PostScript file in landscape mode
-# $dvips_landscape = 'dvips -tlandscape';
+# $dvips_landscape = 'dvips -tlandscape %O -o %D %S';
 
 # Command line switch for dvips when a PDF file is to be generated
 # $dvips_pdf_switch = '-P pdf';
@@ -79,43 +103,55 @@
 $dvi_update_method = 1;
 
 # When DVI update method 2 is used, the number of the Unix signal to send
-# $dvi_update_signal = SIGUSR1
+# $dvi_update_signal = $signo{USR1}
+
+# Which treatment of default extension and filenames with multiple extensions
+# is used.  The possibilities are:
+#   - miktex_old, for Miktex version 1.20d or earlier
+#   - unix, for web2c 7.3.1 or later
+# $extension_treatment = 'unix';
 
 # The extension of the file which latexmk generates to contain a database
 # of information on source files.
-# $fdb_ext = 'fdb_latex';
+# $fdb_ext = 'fdb_latexmk';
 
-# If nonzero, continue processing past minor LaTeX errors
-# This option is made nonzero if the -pvs command line option is used.
-# $force_mode = 0;
+# Version number for kind of fdb_file
+# $fdb_ver = 2;
 
 # If nonzero, force latexmk to include files that don't exist when generating
 # dependency files.
 # $force_include_mode = 0;
 
+# If nonzero, continue processing past minor LaTeX errors
+# This option is made nonzero if the -pvc command line option is used.
+# $force_mode = 0;
+
 # The list of extensions for files that are generated in one run and consumed
 # by later runs of one of the LaTeX tools.  The 'aux' and 'bbl' extensions are
-# treated specially, and hence are not in this list.
-# @generated_exts = ( 'ind', 'lof', 'lot', 'out', 'toc', $fdb_ext );
+# treated specially.
+# @generated_exts = ( 'aux', 'bbl', 'idx', 'ind', 'lof', 'lot', 'out', 'toc' );
 
-# If nonzero, process files regardless of timestamps
+# 1 = process files regardless of timestamps
+# 2 = do a full cleanup first
 # $go_mode = 0;
 
-# If nonzero, run makeindex to produce a document index.  Normally, latexmk
-# should be able to figure out when this is necessary.
-# $index_mode = 0;
+# The basename of generated files
+# $jobname = "";
+
+# The command to search for tex-related files
+# $kpsewhich = 'kpsewhich %S';
 
-# If nonzero, run in landscape mode
+# If nonzero, run in landscape mode; otherwise in portrait mode
 # $landscape_mode = 0;
 
 # The name of the LaTeX program
-# $latex = 'latex';
+# $latex = 'latex %O %S';
 
 # The command line switch to make LaTeX run in silent mode
 # $latex_silent_switch = '-interaction=batchmode';
 
 # The program that prints PostScript files
-# $lpr = 'lpr';
+# $lpr = 'lpr %O %S';
 
 # The program that prints DVI files
 # $lpr_dvi = 'NONE $lpr_dvi variable is not configured to allow printing of dvi files';
@@ -124,30 +160,35 @@
 # $lpr_pdf = 'NONE $lpr_pdf variable is not configured to allow printing of pdf files';
 
 # The name of the makeindex program
-# $makeindex = 'makeindex';
+# $makeindex = 'makeindex %O -o %D %S';
 
 # The command line switch to make makeindex run in silent mode
 # $makeindex_silent_switch = '-q';
 
+# The maximum number of times latex will be invoked in an effort to fix up
+# references.
+# $max_repeat = 5;
+
 # This variable is used only when running in continuous-preview mode.  If zero,
 # check for a previously running previewer on the same file and update it.  If
 # nonzero, always start a new previewer.
 # $new_viewer_always = 0;
 
-# If zero, generate a DVI file.  If 1, generate a PDF file using pdflatex.
-# If 2, generate a PostScript file, then convert it using ps2pdf.
-# If 3, generate a DVI file, then convert it using dvipdf.
+# 0 = do not create a PDF file
+# 1 = Create a PDF file with pdflatex
+# 2 = Create a PDF file with ps2pdf
+# 3 = Create a PDF file with dvipdf
 # $pdf_mode = 0;
 
 # The name of the LaTeX program that produces PDF files by default
-# $pdflatex = 'pdflatex';
+# $pdflatex = 'pdflatex %O %S';
 
 # The command line switch to make pdflatex run in silent mode
 # $pdflatex_silent_switch = '-interaction=batchmode';
 
 # The command to invoke a PDF previewer
-# $pdf_previewer = 'start acroread';
-$pdf_previewer = 'xdg-open';
+# $pdf_previewer = 'start acroread %O %S';
+$pdf_previewer = 'xdg-open %O %S';
 
 # The command to run when the PDF viewer is set to be updated by a command
 # $pdf_update_command = '';
@@ -157,12 +198,12 @@
 # $pdf_update_method = 1;
 
 # When PDF update method 2 is used, the number of the Unix signal to send
-# $pdf_update_signal = SIGHUP
+# $pdf_update_signal = $signo{HUP}
 
 # Where the pid is in the output of $pscmd; see the man page
 # $pid_position = 1;
 
-# If zero, generate a DVI file.  If nonzero, generate a PostScript file
+# Always make a PostScript file
 # $postscript_mode = 0;
 
 # If nonzero, run a previewer to view the document and keep the DVI file up
@@ -179,21 +220,21 @@
 # $print_type = 'ps';
 
 # Command used to list all the processes currently run by the user
-# $pscmd = "ps -f -u $ENV{USER}";
+# $pscmd = "ps --width 200 -f -u $ENV{USER}";
 
 # Command to convert a PostScript file to a PDF file
-# $ps2pdf = 'ps2pdf';
+# $ps2pdf = 'ps2pdf %O %S %D';
 
 # Filter to run on newly created PostScript files
 # $ps_filter = '';
 
 # The command to invoke a PostScript previewer
-# $ps_previewer = 'start gv -watch';
-$ps_previewer = 'xdg-open';
+# $ps_previewer = 'start gv %O %S';
+$ps_previewer = 'xdg-open %O %S';
 
 # The command to invoke a PostScript previewer in landscape mode
-# $ps_previewer_landscape = 'start gv -swap -watch';
-$ps_previewer_landscape = 'xdg-open';
+# $ps_previewer_landscape = 'start gv -swap %O %S';
+$ps_previewer_landscape = 'xdg-open %O %S';
 
 # The command to run when the PostScript viewer is set to be updated by a
 # command
@@ -206,14 +247,33 @@
 
 # When PostScript update method 2 is used, the number of the Unix signal to
 # send
-# $ps_update_signal = SIGHUP
+# $ps_update_signal = $signo{HUP}
+
+# When previewing in -pvc mode, whether to make the viewer read from the
+# generated file or from a temporary copy
+# $pvc_view_file_via_temporary = 1;
+
+# Quote filenames in external commands.  This is essential for filenames
+# containing spaces.
+# $quote_filenames = 1;
+
+# The character that separates paths in a list of paths
+# $search_path_separator = ':';
+
+# Whether to suppress latex messages
+# $silent = 0;
 
 # The time to sleep in seconds between checking for source file changes when
 # running in continuous update mode
 # $sleep_time = 2;
 
+# Space-separated list of extra files to search for when no files are specified
+# on the command line and the @default_files list is empty.  Wildcards are
+# allowed.  These files are in addition to *.tex in the current directory.
+# $texfile_search = "";
+
 # The directory to store temporary files; omit the trailing '/'
-# $tmpdir = '/tmp';
+# $tmpdir = $ENV{TMPDIR} || '/tmp';
 
 # Which kind of file is to be previewed if a previewer is used.  The possible
 # values are 'default', 'dvi', 'ps', and 'pdf'.  The value of 'default' means


Index: latexmk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- latexmk.spec	1 Sep 2007 04:18:15 -0000	1.4
+++ latexmk.spec	24 Sep 2008 17:01:56 -0000	1.5
@@ -1,20 +1,23 @@
 Name:           latexmk
-Version:        3.20
+Version:        4.00e
 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-320.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-400e.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
-Patch0:         latexmk-perl.patch
-Patch1:         latexmk-conf.patch
+# Change the system-wide configuration file to /etc/latexmk.conf and fix the
+# man page accordingly.  This patch has not been submitted upstream, as
+# upstream needs to be backwards compatible with previous versions of latexmk.
+# Fedora has only ever used /etc/latexmk.conf.
+Patch0:         latexmk-conf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       tetex, tetex-latex, ghostscript, xdg-utils
+Requires:       texlive, texlive-latex, ghostscript, xdg-utils
 
 %description
 Latexmk is a perl script for running LaTeX the correct number of times to
@@ -30,15 +33,9 @@
 
 %prep
 %setup -q -c
+%patch0 -p1
 cp %{SOURCE2} README.fedora
 
-# Remove the path searching facility; we know where the perl binary is located
-%patch0
-
-# Change the system-wide configuration file to /etc/latexmk.conf and fix
-# the man page accordingly.
-%patch1 -p1
-
 %build
 
 %install
@@ -61,6 +58,10 @@
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Wed Sep 24 2008 Jerry James <loganjerry at gmail.com> - 4.00e-1
+- New version 4.00e.
+- Drop the perl patch; the script finds it just fine
+
 * Fri Aug 31 2007 Jerry James <loganjerry at gmail.com> - 3.20-1
 - New version 3.20.
 - Texlive isn't as near as I thought; require the tetex packages for now.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Sep 2007 04:18:15 -0000	1.3
+++ sources	24 Sep 2008 17:01:56 -0000	1.4
@@ -1 +1 @@
-fba0740fd6e5b9001c1300b3425cb659  latexmk-320.zip
+1914293f3c903bad3a543ce948c0157f  latexmk-400e.zip


--- latexmk-perl.patch DELETED ---



From katzj at fedoraproject.org  Wed Sep 24 17:20:34 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Wed, 24 Sep 2008 17:20:34 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.62,
	1.63
Message-ID: <20080924172034.B582770103@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20129

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
* Wed Sep 24 2008 Jeremy Katz <katzj at redhat.com> - 0.10.20-5
- gst-visualize is just a test program that we don't really need to include 
  and having it means that perl gets pulled into small images (#462620)



Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- gstreamer-plugins-base.spec	11 Sep 2008 23:50:09 -0000	1.62
+++ gstreamer-plugins-base.spec	24 Sep 2008 17:20:04 -0000	1.63
@@ -5,7 +5,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.20
-Release:  	4%{?dist}	
+Release:  	5%{?dist}	
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -76,6 +76,8 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_bindir}/gst-visualise*
+rm -f $RPM_BUILD_ROOT%{_docdir}/man1/gst-visualise*
 
 %find_lang gst-plugins-base-%{majorminor}
 
@@ -86,10 +88,6 @@
 %defattr(-, root, root)
 %doc AUTHORS COPYING README REQUIREMENTS
 
-# helper programs
-%{_bindir}/gst-visualise-%{majorminor}
-%{_mandir}/man1/gst-visualise-%{majorminor}*
-
 # libraries
 %{_libdir}/libgstinterfaces-%{majorminor}.so.*
 %{_libdir}/libgstaudio-%{majorminor}.so.*
@@ -242,6 +240,10 @@
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Wed Sep 24 2008 Jeremy Katz <katzj at redhat.com> - 0.10.20-5
+- gst-visualize is just a test program that we don't really need to include 
+  and having it means that perl gets pulled into small images (#462620)
+
 * Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.20-4
 - Another rebuild
 



From caillon at fedoraproject.org  Wed Sep 24 17:24:36 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 17:24:36 +0000 (UTC)
Subject: rpms/epiphany-extensions/F-8 epiphany-extensions.spec,1.47,1.48
Message-ID: <20080924172436.2DB8170103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany-extensions/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20682

Modified Files:
	epiphany-extensions.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 2.20.1-10
- Rebuild against newer gecko



Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/F-8/epiphany-extensions.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- epiphany-extensions.spec	16 Jul 2008 01:22:56 -0000	1.47
+++ epiphany-extensions.spec	24 Sep 2008 17:24:05 -0000	1.48
@@ -1,10 +1,10 @@
 %global	ephy_major		2.20
 %global	ephy_min_version	%{ephy_major}.0
-%global gecko_version		1.8.1.16
+%global gecko_version		1.8.1.17
 
 Name:		epiphany-extensions
 Version:	%{ephy_major}.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 2.20.1-10
+- Rebuild against newer gecko
+
 * Tue Jul 15 2008 Christopher Aillon <caillon at redhat.com> - 2.20.1-9
 - Rebuild against newer gecko
 



From spot at fedoraproject.org  Wed Sep 24 17:24:54 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 24 Sep 2008 17:24:54 +0000 (UTC)
Subject: rpms/KoboDeluxe/devel
	KoboDeluxe-0.5.1-avoid-unistd-pipe-collision.patch, NONE,
	1.1 KoboDeluxe.spec, 1.6, 1.7
Message-ID: <20080924172454.9D01470103@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/KoboDeluxe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20754

Modified Files:
	KoboDeluxe.spec 
Added Files:
	KoboDeluxe-0.5.1-avoid-unistd-pipe-collision.patch 
Log Message:
fix FTBFS

KoboDeluxe-0.5.1-avoid-unistd-pipe-collision.patch:

--- NEW FILE KoboDeluxe-0.5.1-avoid-unistd-pipe-collision.patch ---
diff -up KoboDeluxe-0.5.1/enemies.h.pipe-unistd KoboDeluxe-0.5.1/enemies.h
--- KoboDeluxe-0.5.1/enemies.h.pipe-unistd	2007-12-24 03:18:52.000000000 -0500
+++ KoboDeluxe-0.5.1/enemies.h	2008-09-24 13:06:16.000000000 -0400
@@ -70,9 +70,9 @@ extern const enemy_kind bomb1;
 extern const enemy_kind bomb2;
 extern const enemy_kind bombdeto;
 extern const enemy_kind cannon;
-extern const enemy_kind pipe1;
+extern const enemy_kind pipe_1;
 extern const enemy_kind core;
-extern const enemy_kind pipe2;
+extern const enemy_kind pipe_2;
 extern const enemy_kind rock;
 extern const enemy_kind ring;
 extern const enemy_kind enemy_m1;
@@ -430,7 +430,7 @@ inline int _enemy::realize()
 
 inline int _enemy::is_pipe()
 {
-	return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe2)));
+	return ((_state != notuse) && ((ek == &pipe_1) || (ek == &pipe_2)));
 }
 
 
diff -up KoboDeluxe-0.5.1/enemy.cpp.pipe-unistd KoboDeluxe-0.5.1/enemy.cpp
--- KoboDeluxe-0.5.1/enemy.cpp.pipe-unistd	2007-12-24 05:36:46.000000000 -0500
+++ KoboDeluxe-0.5.1/enemy.cpp	2008-09-24 13:07:54.000000000 -0400
@@ -713,7 +713,7 @@ void _enemy::move_cannon()
 
 void _enemy::kill_cannon()
 {
-	enemies.make(&pipe1, CS2PIXEL(x), CS2PIXEL(y));
+	enemies.make(&pipe_1, CS2PIXEL(x), CS2PIXEL(y));
 	sound.g_base_node_explo(x, y);
 	release();
 }
@@ -755,10 +755,10 @@ void _enemy::move_core()
 
 void _enemy::kill_core()
 {
-	enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
-	enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
-	enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
-	enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
+	enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
+	enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
+	enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
+	enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
 	enemies.make(&explosion4, CS2PIXEL(x), CS2PIXEL(y));
 	sound.g_base_core_explo(x, y);
 	release();
@@ -777,7 +777,7 @@ const enemy_kind core = {
 
 /*
  * ===========================================================================
- *                                pipe1
+ *                                pipe_1
  * ===========================================================================
  */
 void _enemy::make_pipe1()
@@ -851,7 +851,7 @@ void _enemy::move_pipe1()
 		screen.set_map(x1, y1, m ^ a);
 	release();
 }
-const enemy_kind pipe1 = {
+const enemy_kind pipe_1 = {
 	0,
 	&_enemy::make_pipe1,
 	&_enemy::move_pipe1,
@@ -863,7 +863,7 @@ const enemy_kind pipe1 = {
 
 /*
  * ===========================================================================
- *                                pipe2
+ *                                pipe_2
  * ===========================================================================
  */
 void _enemy::make_pipe2()
@@ -978,19 +978,19 @@ void _enemy::move_pipe2()
 	}
 	p ^= a;
 	if(p & U_MASK)
-		enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
+		enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
 	if(p & R_MASK)
-		enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
+		enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
 	if(p & D_MASK)
-		enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
+		enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
 	if(p & L_MASK)
-		enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
+		enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
 	manage.add_score(10);
 	release();
 }
 
 
-const enemy_kind pipe2 = {
+const enemy_kind pipe_2 = {
 	0,
 	&_enemy::make_pipe2,
 	&_enemy::move_pipe2,


Index: KoboDeluxe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/KoboDeluxe/devel/KoboDeluxe.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- KoboDeluxe.spec	19 Feb 2008 07:43:48 -0000	1.6
+++ KoboDeluxe.spec	24 Sep 2008 17:24:24 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           KoboDeluxe
 Version:        0.5.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        3'rd person scrolling 2D shooter
 Group:          Amusements/Games
 License:        GPLv2+
@@ -9,6 +9,7 @@
 Source1:        %{name}.png
 Source2:        %{name}.desktop
 Patch1:         KoboDeluxe-defaults.patch
+Patch2:         KoboDeluxe-0.5.1-avoid-unistd-pipe-collision.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_image-devel desktop-file-utils
 Requires:       hicolor-icon-theme
@@ -28,6 +29,7 @@
 %prep
 %setup -q
 %patch1 -p1 -z .defaults
+%patch2 -p1 -b .pipe-unistd
 sed -i 's|$(sharedstatedir)/kobo-deluxe/scores|%{_var}/games/kobo-deluxe|g' \
   configure
 iconv -f ISO-8859-1 -t UTF8 README > tmp;         mv tmp README
@@ -89,6 +91,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.1-3
+- avoid variable collision between "pipe2" and unistd.h
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.1-2
 - Autorebuild for GCC 4.3
 



From caillon at fedoraproject.org  Wed Sep 24 17:25:01 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 17:25:01 +0000 (UTC)
Subject: rpms/epiphany-extensions/F-9 epiphany-extensions.spec,1.48,1.49
Message-ID: <20080924172501.221E470103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany-extensions/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20791

Modified Files:
	epiphany-extensions.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 2.22.1-4
- Rebuild against newer gecko



Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/F-9/epiphany-extensions.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- epiphany-extensions.spec	17 Jul 2008 15:51:10 -0000	1.48
+++ epiphany-extensions.spec	24 Sep 2008 17:24:30 -0000	1.49
@@ -1,10 +1,10 @@
 %global ephy_major          2.22
 %global ephy_min_version    %{ephy_major}.0
-%global gecko_version       1.9.0.1
+%global gecko_version       1.9.0.2
 
 Name:           epiphany-extensions
 Version:        %{ephy_major}.1
-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
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 2.22.1-4
+- Rebuild against newer gecko
+
 * Thu Jul 17 2008 Christopher Aillon <caillon at redhat.com> - 2.22.1-3
 - Rebuild against newer gecko
 



From katzj at fedoraproject.org  Wed Sep 24 17:30:09 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Wed, 24 Sep 2008 17:30:09 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.63,
	1.64
Message-ID: <20080924173009.A2E3D70103@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21693

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
fix my typo


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- gstreamer-plugins-base.spec	24 Sep 2008 17:20:04 -0000	1.63
+++ gstreamer-plugins-base.spec	24 Sep 2008 17:29:39 -0000	1.64
@@ -5,7 +5,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.20
-Release:  	5%{?dist}	
+Release:  	6%{?dist}	
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -77,7 +77,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_bindir}/gst-visualise*
-rm -f $RPM_BUILD_ROOT%{_docdir}/man1/gst-visualise*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gst-visualise*
 
 %find_lang gst-plugins-base-%{majorminor}
 
@@ -240,7 +240,7 @@
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
-* Wed Sep 24 2008 Jeremy Katz <katzj at redhat.com> - 0.10.20-5
+* Wed Sep 24 2008 Jeremy Katz <katzj at redhat.com> - 0.10.20-6
 - gst-visualize is just a test program that we don't really need to include 
   and having it means that perl gets pulled into small images (#462620)
 



From anyremote at fedoraproject.org  Wed Sep 24 17:46:46 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Wed, 24 Sep 2008 17:46:46 +0000 (UTC)
Subject: rpms/kanyremote/F-9 .cvsignore, 1.6, 1.7 import.log, 1.3,
	1.4 kanyremote.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <20080924174646.B2B8A70103@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23973/F-9

Modified Files:
	.cvsignore import.log kanyremote.spec sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Sep 2008 19:46:07 -0000	1.6
+++ .cvsignore	24 Sep 2008 17:46:16 -0000	1.7
@@ -1 +1 @@
-kanyremote-5.2.1.tar.gz
+kanyremote-5.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Sep 2008 20:07:22 -0000	1.3
+++ import.log	24 Sep 2008 17:46:16 -0000	1.4
@@ -1,3 +1,4 @@
 kanyremote-5_1-1_fc9:F-9:kanyremote-5.1-1.fc9.src.rpm:1219602985
 kanyremote-5_2_1-1_fc9:F-9:kanyremote-5.2.1-1.fc9.src.rpm:1220903172
 kanyremote-5_2_1-2_fc9:F-9:kanyremote-5.2.1-2.fc9.src.rpm:1220904450
+kanyremote-5_3-1_fc9:F-9:kanyremote-5.3-1.fc9.src.rpm:1222278264


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/kanyremote.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kanyremote.spec	8 Sep 2008 20:07:23 -0000	1.6
+++ kanyremote.spec	24 Sep 2008 17:46:16 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
-Version: 5.2.1
-Release: 2%{?dist}
+Version: 5.3
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
@@ -38,6 +38,9 @@
 
 %changelog
 
+* Wed Sep 24 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.3-1
+- Add icons to menu and buttons.
+
 * Mon Sep 8 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.2.1-1
 - Small bugfixes.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Sep 2008 20:07:23 -0000	1.7
+++ sources	24 Sep 2008 17:46:16 -0000	1.8
@@ -1 +1 @@
-d77a8dcbd7ae36fea43a522c3ba1d514  kanyremote-5.2.1.tar.gz
+af0a5a399d5006f08216e66fbc2b4bcd  kanyremote-5.3.tar.gz



From anyremote at fedoraproject.org  Wed Sep 24 17:46:49 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Wed, 24 Sep 2008 17:46:49 +0000 (UTC)
Subject: rpms/ganyremote/F-9 .cvsignore, 1.6, 1.7 ganyremote.spec, 1.5,
	1.6 import.log, 1.2, 1.3 sources, 1.7, 1.8
Message-ID: <20080924174649.ED9BD70103@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/ganyremote/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24004/F-9

Modified Files:
	.cvsignore ganyremote.spec import.log sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Sep 2008 19:46:26 -0000	1.6
+++ .cvsignore	24 Sep 2008 17:46:19 -0000	1.7
@@ -1 +1 @@
-ganyremote-5.2.1.tar.gz
+ganyremote-5.3.tar.gz


Index: ganyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-9/ganyremote.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ganyremote.spec	8 Sep 2008 19:46:26 -0000	1.5
+++ ganyremote.spec	24 Sep 2008 17:46:19 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: GTK frontend for anyRemote
 Name: ganyremote
-Version: 5.2.1
+Version: 5.3
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -38,6 +38,9 @@
 
 %changelog
 
+* Wed Sep 24 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.3-1
+- Add icons to menu and buttons.
+
 * Mon Sep 8 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.2.1-1
 - Small bugfixes.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Sep 2008 19:46:26 -0000	1.2
+++ import.log	24 Sep 2008 17:46:19 -0000	1.3
@@ -1,2 +1,3 @@
 ganyremote-5_1-1_fc9:F-9:ganyremote-5.1-1.fc9.src.rpm:1219603064
 ganyremote-5_2_1-1_fc9:F-9:ganyremote-5.2.1-1.fc9.src.rpm:1220903161
+ganyremote-5_3-1_fc9:F-9:ganyremote-5.3-1.fc9.src.rpm:1222278298


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Sep 2008 19:46:26 -0000	1.7
+++ sources	24 Sep 2008 17:46:19 -0000	1.8
@@ -1 +1 @@
-beea475d0caf27f3c4ee2666ac32b0e0  ganyremote-5.2.1.tar.gz
+af070df47e5fd8fae77b296dd12efc19  ganyremote-5.3.tar.gz



From anyremote at fedoraproject.org  Wed Sep 24 17:57:57 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Wed, 24 Sep 2008 17:57:57 +0000 (UTC)
Subject: rpms/kanyremote/devel .cvsignore, 1.6, 1.7 import.log, 1.5,
	1.6 kanyremote.spec, 1.6, 1.7 sources, 1.8, 1.9
Message-ID: <20080924175757.F024670103@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25534/devel

Modified Files:
	.cvsignore import.log kanyremote.spec sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Sep 2008 19:47:43 -0000	1.6
+++ .cvsignore	24 Sep 2008 17:57:27 -0000	1.7
@@ -1 +1 @@
-kanyremote-5.2.1.tar.gz
+kanyremote-5.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	8 Sep 2008 20:07:26 -0000	1.5
+++ import.log	24 Sep 2008 17:57:27 -0000	1.6
@@ -3,3 +3,4 @@
 kanyremote-5_2_1-1_fc9:HEAD:kanyremote-5.2.1-1.fc9.src.rpm:1220903980
 kanyremote-5_2_1-1_fc9:HEAD:kanyremote-5.2.1-1.fc9.src.rpm:1220904171
 kanyremote-5_2_1-2_fc9:HEAD:kanyremote-5.2.1-2.fc9.src.rpm:1220904451
+kanyremote-5_3-1_fc9:HEAD:kanyremote-5.3-1.fc9.src.rpm:1222278992


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/kanyremote.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kanyremote.spec	8 Sep 2008 20:07:27 -0000	1.6
+++ kanyremote.spec	24 Sep 2008 17:57:27 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
-Version: 5.2.1
-Release: 2%{?dist}
+Version: 5.3
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
@@ -38,6 +38,9 @@
 
 %changelog
 
+* Wed Sep 24 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.3-1
+- Add icons to menu and buttons.
+
 * Mon Sep 8 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.2.1-1
 - Small bugfixes.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Sep 2008 20:07:27 -0000	1.8
+++ sources	24 Sep 2008 17:57:27 -0000	1.9
@@ -1 +1 @@
-d77a8dcbd7ae36fea43a522c3ba1d514  kanyremote-5.2.1.tar.gz
+af0a5a399d5006f08216e66fbc2b4bcd  kanyremote-5.3.tar.gz



From anyremote at fedoraproject.org  Wed Sep 24 17:58:01 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Wed, 24 Sep 2008 17:58:01 +0000 (UTC)
Subject: rpms/ganyremote/devel .cvsignore, 1.6, 1.7 ganyremote.spec, 1.5,
	1.6 import.log, 1.2, 1.3 sources, 1.7, 1.8
Message-ID: <20080924175801.F1DA970103@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/ganyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25567/devel

Modified Files:
	.cvsignore ganyremote.spec import.log sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Sep 2008 19:47:06 -0000	1.6
+++ .cvsignore	24 Sep 2008 17:57:31 -0000	1.7
@@ -1 +1 @@
-ganyremote-5.2.1.tar.gz
+ganyremote-5.3.tar.gz


Index: ganyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/devel/ganyremote.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ganyremote.spec	8 Sep 2008 19:47:06 -0000	1.5
+++ ganyremote.spec	24 Sep 2008 17:57:31 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: GTK frontend for anyRemote
 Name: ganyremote
-Version: 5.2.1
+Version: 5.3
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -38,6 +38,9 @@
 
 %changelog
 
+* Wed Sep 24 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.3-1
+- Add icons to menu and buttons.
+
 * Mon Sep 8 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.2.1-1
 - Small bugfixes.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Sep 2008 19:47:06 -0000	1.2
+++ import.log	24 Sep 2008 17:57:31 -0000	1.3
@@ -1,2 +1,3 @@
 ganyremote-5_1-1_fc9:HEAD:ganyremote-5.1-1.fc9.src.rpm:1219603799
 ganyremote-5_2_1-1_fc9:HEAD:ganyremote-5.2.1-1.fc9.src.rpm:1220903230
+ganyremote-5_3-1_fc9:HEAD:ganyremote-5.3-1.fc9.src.rpm:1222279005


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Sep 2008 19:47:06 -0000	1.7
+++ sources	24 Sep 2008 17:57:31 -0000	1.8
@@ -1 +1 @@
-beea475d0caf27f3c4ee2666ac32b0e0  ganyremote-5.2.1.tar.gz
+af070df47e5fd8fae77b296dd12efc19  ganyremote-5.3.tar.gz



From spot at fedoraproject.org  Wed Sep 24 18:04:06 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 24 Sep 2008 18:04:06 +0000 (UTC)
Subject: rpms/LabPlot/devel .cvsignore, 1.4, 1.5 LabPlot.spec, 1.11,
	1.12 sources, 1.4, 1.5
Message-ID: <20080924180406.71D2970103@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/LabPlot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26669

Modified Files:
	.cvsignore LabPlot.spec sources 
Log Message:
1.6.0.2, drop unnecessary patches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Jun 2008 18:02:48 -0000	1.4
+++ .cvsignore	24 Sep 2008 18:03:36 -0000	1.5
@@ -1 +1 @@
-LabPlot-1.6.0.1-2.tar.bz2
+LabPlot-1.6.0.2.tar.bz2


Index: LabPlot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/devel/LabPlot.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- LabPlot.spec	10 Jun 2008 18:02:48 -0000	1.11
+++ LabPlot.spec	24 Sep 2008 18:03:36 -0000	1.12
@@ -1,5 +1,5 @@
 Name:              LabPlot
-Version:           1.6.0.1
+Version:           1.6.0.2
 Release:           1%{?dist}
 Summary:           Data Analysis and Visualization
 
@@ -8,10 +8,8 @@
 URL:               http://labplot.sourceforge.net/
 
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:           http://downloads.sourceforge.net/labplot/%{name}-%{version}-2.tar.bz2
+Source0:           http://downloads.sourceforge.net/labplot/%{name}-%{version}.tar.bz2
 
-Patch0:            LabPlot-gcc43.patch
-Patch1: 	   LabPlot-init-smg-before-open-files.patch
 Patch2:            LabPlot-20080225.patch
 
 BuildRequires:     kdelibs3-devel libselinux-devel desktop-file-utils libexif-devel netcdf-devel
@@ -112,10 +110,8 @@
 
 
 %prep
-%setup -q -n %{name}-1.6.0.1
+%setup -q -n %{name}-%{version}
 
-%patch0 -p1 -b .orig
-%patch1 -p1 -b .orig
 %patch2 -p1 -b .orig
 
 
@@ -353,6 +349,10 @@
 
 
 %Changelog
+* Wed Sep 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.6.0.2-1
+- update to 1.6.0.2
+- drop useless gcc43 patch, init-smg-before-open-files patch
+
 * Tue Jun 10 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.0.1-1
 - New upstream release 1.6.0.1
 - Now compatible with liborigin 20080225


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Jun 2008 18:02:48 -0000	1.4
+++ sources	24 Sep 2008 18:03:36 -0000	1.5
@@ -1 +1 @@
-869726e8c0fe7376a8d3c039f6e02298  LabPlot-1.6.0.1-2.tar.bz2
+59a9448190b2ebc9b23670f9262a1947  LabPlot-1.6.0.2.tar.bz2



From spot at fedoraproject.org  Wed Sep 24 18:16:02 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 24 Sep 2008 18:16:02 +0000 (UTC)
Subject: rpms/PyAmanith/devel PyAmanith-0.3.34-buildfix.patch, 1.1,
	1.2 PyAmanith.spec, 1.1, 1.2
Message-ID: <20080924181602.38C7970103@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/PyAmanith/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28526

Modified Files:
	PyAmanith-0.3.34-buildfix.patch PyAmanith.spec 
Log Message:
fix FTBFS

PyAmanith-0.3.34-buildfix.patch:

Index: PyAmanith-0.3.34-buildfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/PyAmanith/devel/PyAmanith-0.3.34-buildfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PyAmanith-0.3.34-buildfix.patch	10 Mar 2008 19:41:00 -0000	1.1
+++ PyAmanith-0.3.34-buildfix.patch	24 Sep 2008 18:16:01 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up PyAmanith-0.3.34/setup.py.BAD PyAmanith-0.3.34/setup.py
---- PyAmanith-0.3.34/setup.py.BAD	2007-11-15 09:33:20.000000000 -0500
-+++ PyAmanith-0.3.34/setup.py	2007-11-15 09:34:14.000000000 -0500
+diff -up PyAmanith-0.3.35/setup.py.BAD PyAmanith-0.3.35/setup.py
+--- PyAmanith-0.3.35/setup.py.BAD	2008-09-24 14:04:33.000000000 -0400
++++ PyAmanith-0.3.35/setup.py	2008-09-24 14:05:39.000000000 -0400
 @@ -16,7 +16,7 @@ libs = ["amanith"]
  inc = [join("changes", "include"), join(amanith_base, "include"), "include"]
  lib = [join(amanith_base, "lib")]
@@ -10,10 +10,7 @@
  
  if os.name == "nt":
    if debug:
-diff -up PyAmanith-0.3.34/setup.py.BAD PyAmanith-0.3.34/setup.py
---- PyAmanith-0.3.34/setup.py.BAD	2007-11-15 09:51:39.000000000 -0500
-+++ PyAmanith-0.3.34/setup.py	2007-11-15 09:51:45.000000000 -0500
-@@ -38,15 +38,6 @@ class build_ext(_build_ext):
+@@ -38,20 +38,8 @@ class build_ext(_build_ext):
          relPath = join(root, file).replace(source + os.sep, "")
          shutil.copy(join(source, relPath), join(target, relPath))
    
@@ -27,20 +24,11 @@
 -    _build_ext.run(self)
 -
  ext_amanith = Extension('_amanith', ['amanith.i'],
-                         include_dirs = inc,
-                         library_dirs = lib,
-diff -up PyAmanith-0.3.34/setup.py.BAD PyAmanith-0.3.34/setup.py
---- PyAmanith-0.3.34/setup.py.BAD	2007-11-15 09:53:25.000000000 -0500
-+++ PyAmanith-0.3.34/setup.py	2007-11-15 09:53:39.000000000 -0500
-@@ -39,10 +39,7 @@ class build_ext(_build_ext):
-         shutil.copy(join(source, relPath), join(target, relPath))
-   
- ext_amanith = Extension('_amanith', ['amanith.i'],
 -                        include_dirs = inc,
 -                        library_dirs = lib,
 -                        libraries = libs,
 -                        extra_compile_args = cc_args)
-+			swig_opts = swig_args, extra_compile_args = swig_args, libraries = libs)
++                        swig_opts = swig_args, extra_compile_args = swig_args, libraries = libs)
                          
  setup(name = 'PyAmanith',
-       version = '0.3.34',
+       version = '0.3.35',


Index: PyAmanith.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyAmanith/devel/PyAmanith.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PyAmanith.spec	10 Mar 2008 19:41:00 -0000	1.1
+++ PyAmanith.spec	24 Sep 2008 18:16:01 -0000	1.2
@@ -3,7 +3,7 @@
 Name:			PyAmanith
 Summary: 		Python bindings for Amanith
 Version:		0.3.35
-Release:		2%{?dist}
+Release:		3%{?dist}
 # Exception is permission to link to Amanith, which is QPL.
 License:		GPLv2+ with exceptions
 Group:			Development/Tools
@@ -53,6 +53,9 @@
 %endif
 
 %changelog
+* Wed Sep 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.35-3
+- rework PyAmanith-0.3.34-buildfix.patch to apply without fuzz
+
 * Thu Feb 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.35-2
 - include COPYING file
 - fix permissions on .so file



From ssp at fedoraproject.org  Wed Sep 24 18:16:02 2008
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Wed, 24 Sep 2008 18:16:02 +0000 (UTC)
Subject: rpms/gnome-desktop/devel clone-modes.patch, 1.2,
	1.3 gnome-desktop.spec, 1.170, 1.171
Message-ID: <20080924181602.8E23E70103@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28456

Modified Files:
	clone-modes.patch gnome-desktop.spec 
Log Message:
MAke clone modes work again

clone-modes.patch:

Index: clone-modes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/clone-modes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- clone-modes.patch	4 Sep 2008 17:11:02 -0000	1.2
+++ clone-modes.patch	24 Sep 2008 18:15:32 -0000	1.3
@@ -1,63 +1,7 @@
-Index: libgnome-desktop/libgnomeui/gnome-rr-config.h
-===================================================================
---- libgnome-desktop/libgnomeui/gnome-rr-config.h	(revision 5210)
-+++ libgnome-desktop/libgnomeui/gnome-rr-config.h	(working copy)
-@@ -34,6 +34,13 @@
- typedef struct GnomeOutputInfo GnomeOutputInfo;
- typedef struct GnomeRRConfig GnomeRRConfig;
- 
-+/* FIXME:
-+ *
-+ * This structure is a Frankenstein monster where all of the fields
-+ * are generated by the system, but some of them can be changed by
-+ * the client.
-+ */
-+
- struct GnomeOutputInfo
- {
-     char *		name;
-@@ -66,14 +73,24 @@
- };
- 
- GnomeRRConfig  *gnome_rr_config_new_current  (GnomeRRScreen  *screen);
-+GnomeRRConfig  *gnome_rr_config_new_stored   (GnomeRRScreen  *screen);
- void            gnome_rr_config_free         (GnomeRRConfig  *configuration);
- gboolean        gnome_rr_config_match        (GnomeRRConfig  *config1,
- 					      GnomeRRConfig  *config2);
-+gboolean        gnome_rr_config_equal	     (GnomeRRConfig  *config1,
-+					      GnomeRRConfig  *config2);
- gboolean        gnome_rr_config_save         (GnomeRRConfig  *configuration,
- 					      GError        **err);
- void            gnome_rr_config_sanitize     (GnomeRRConfig  *configuration);
-+gboolean	gnome_rr_config_apply        (GnomeRRConfig  *configuration,
-+					      GnomeRRScreen  *screen);
- gboolean        gnome_rr_config_apply_stored (GnomeRRScreen  *screen);
- gboolean        gnome_rr_config_applicable   (GnomeRRConfig  *configuration,
- 					      GnomeRRScreen  *screen);
- 
-+/* A utility function that isn't really in the spirit of this file, but I don't
-+ * don't know a better place for it.
-+ */
-+GnomeRRMode **gnome_rr_create_clone_modes (GnomeRRScreen *screen);
-+
- #endif
-Index: libgnome-desktop/libgnomeui/gnome-rr.h
-===================================================================
---- libgnome-desktop/libgnomeui/gnome-rr.h	(revision 5210)
-+++ libgnome-desktop/libgnomeui/gnome-rr.h	(working copy)
-@@ -56,6 +56,7 @@
- GnomeRROutput **gnome_rr_screen_list_outputs       (GnomeRRScreen         *screen);
- GnomeRRCrtc **  gnome_rr_screen_list_crtcs         (GnomeRRScreen         *screen);
- GnomeRRMode **  gnome_rr_screen_list_modes         (GnomeRRScreen         *screen);
-+GnomeRRMode **  gnome_rr_screen_list_clone_modes   (GnomeRRScreen	  *screen);
- void            gnome_rr_screen_set_size           (GnomeRRScreen         *screen,
- 						    int                    width,
- 						    int                    height,
-Index: libgnome-desktop/gnome-rr.c
-===================================================================
---- libgnome-desktop/gnome-rr.c	(revision 5210)
-+++ libgnome-desktop/gnome-rr.c	(working copy)
-@@ -50,6 +50,8 @@
+diff -up gnome-desktop-2.24.0/libgnome-desktop/gnome-rr.c.clone-modes gnome-desktop-2.24.0/libgnome-desktop/gnome-rr.c
+--- gnome-desktop-2.24.0/libgnome-desktop/gnome-rr.c.clone-modes	2008-09-24 14:09:09.000000000 -0400
++++ gnome-desktop-2.24.0/libgnome-desktop/gnome-rr.c	2008-09-24 14:09:09.000000000 -0400
+@@ -50,6 +50,8 @@ struct ScreenInfo
      GnomeRRMode **	modes;
      
      GnomeRRScreen *	screen;
@@ -66,7 +10,7 @@
  };
  
  struct GnomeRRScreen
-@@ -222,11 +224,86 @@
+@@ -222,11 +224,86 @@ screen_info_free (ScreenInfo *info)
  	    mode_free (*mode);
  	g_free (info->modes);
      }
@@ -153,7 +97,7 @@
  fill_out_screen_info (Display *xdisplay,
  		      Window xroot,
  		      ScreenInfo *info)
-@@ -322,6 +399,8 @@
+@@ -322,6 +399,8 @@ fill_out_screen_info (Display *xdisplay,
  	    
  	    mode_initialize (mode, &(resources->modes[i]));
  	}
@@ -162,7 +106,7 @@
  	
  	return TRUE;
      }
-@@ -526,6 +605,15 @@
+@@ -526,6 +605,15 @@ gnome_rr_screen_list_modes (GnomeRRScree
      return screen->info->modes;
  }
  
@@ -178,11 +122,10 @@
  GnomeRRCrtc **
  gnome_rr_screen_list_crtcs (GnomeRRScreen *screen)
  {
-Index: libgnome-desktop/gnome-rr-config.c
-===================================================================
---- libgnome-desktop/gnome-rr-config.c	(revision 5210)
-+++ libgnome-desktop/gnome-rr-config.c	(working copy)
-@@ -745,6 +745,42 @@
+diff -up gnome-desktop-2.24.0/libgnome-desktop/gnome-rr-config.c.clone-modes gnome-desktop-2.24.0/libgnome-desktop/gnome-rr-config.c
+--- gnome-desktop-2.24.0/libgnome-desktop/gnome-rr-config.c.clone-modes	2008-09-24 14:09:09.000000000 -0400
++++ gnome-desktop-2.24.0/libgnome-desktop/gnome-rr-config.c	2008-09-24 14:11:34.000000000 -0400
+@@ -748,6 +748,42 @@ output_match (GnomeOutputInfo *output1, 
      return TRUE;
  }
  
@@ -225,7 +168,7 @@
  static GnomeOutputInfo *
  find_output (GnomeRRConfig *config, const char *name)
  {
-@@ -761,6 +797,9 @@
+@@ -764,6 +800,9 @@ find_output (GnomeRRConfig *config, cons
      return NULL;
  }
  
@@ -235,7 +178,7 @@
  gboolean
  gnome_rr_config_match (GnomeRRConfig *c1, GnomeRRConfig *c2)
  {
-@@ -779,6 +818,28 @@
+@@ -782,6 +821,28 @@ gnome_rr_config_match (GnomeRRConfig *c1
      return TRUE;
  }
  
@@ -264,7 +207,7 @@
  static GnomeOutputInfo **
  make_outputs (GnomeRRConfig *config)
  {
-@@ -840,21 +901,6 @@
+@@ -843,21 +904,6 @@ gnome_rr_config_applicable (GnomeRRConfi
      return result;
  }
  
@@ -286,7 +229,7 @@
  /* Database management */
  
  static gchar *
-@@ -1036,13 +1082,68 @@
+@@ -1039,14 +1085,69 @@ gnome_rr_config_save (GnomeRRConfig *con
      return result;
  }
  
@@ -294,7 +237,7 @@
 -apply_configuration (GnomeRRConfig *conf, GnomeRRScreen *screen)
 +static GnomeRRConfig *
 +gnome_rr_config_copy (GnomeRRConfig *config)
- {
++{
 +    GnomeRRConfig *copy = g_new0 (GnomeRRConfig, 1);
 +    int i;
 +    GPtrArray *array = g_ptr_array_new ();
@@ -349,16 +292,17 @@
 +gboolean
 +gnome_rr_config_apply (GnomeRRConfig *config,
 +		       GnomeRRScreen *screen)
-+{
+ {
      CrtcAssignment *assignment;
      GnomeOutputInfo **outputs;
+     gboolean result = FALSE;
  
 -    outputs = make_outputs (conf);
 +    outputs = make_outputs (config);
  
      assignment = crtc_assignment_new (screen, outputs);
  
-@@ -1065,42 +1166,51 @@
+@@ -1068,42 +1169,51 @@ apply_configuration (GnomeRRConfig *conf
  gboolean
  gnome_rr_config_apply_stored (GnomeRRScreen *screen)
  {
@@ -432,3 +376,56 @@
  /*
   * CRTC assignment
   */
+diff -up gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-rr-config.h.clone-modes gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-rr-config.h
+--- gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-rr-config.h.clone-modes	2008-09-22 17:01:45.000000000 -0400
++++ gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-rr-config.h	2008-09-24 14:09:09.000000000 -0400
+@@ -34,6 +34,13 @@
+ typedef struct GnomeOutputInfo GnomeOutputInfo;
+ typedef struct GnomeRRConfig GnomeRRConfig;
+ 
++/* FIXME:
++ *
++ * This structure is a Frankenstein monster where all of the fields
++ * are generated by the system, but some of them can be changed by
++ * the client.
++ */
++
+ struct GnomeOutputInfo
+ {
+     char *		name;
+@@ -66,14 +73,24 @@ struct GnomeRRConfig
+ };
+ 
+ GnomeRRConfig  *gnome_rr_config_new_current  (GnomeRRScreen  *screen);
++GnomeRRConfig  *gnome_rr_config_new_stored   (GnomeRRScreen  *screen);
+ void            gnome_rr_config_free         (GnomeRRConfig  *configuration);
+ gboolean        gnome_rr_config_match        (GnomeRRConfig  *config1,
+ 					      GnomeRRConfig  *config2);
++gboolean        gnome_rr_config_equal	     (GnomeRRConfig  *config1,
++					      GnomeRRConfig  *config2);
+ gboolean        gnome_rr_config_save         (GnomeRRConfig  *configuration,
+ 					      GError        **err);
+ void            gnome_rr_config_sanitize     (GnomeRRConfig  *configuration);
++gboolean	gnome_rr_config_apply        (GnomeRRConfig  *configuration,
++					      GnomeRRScreen  *screen);
+ gboolean        gnome_rr_config_apply_stored (GnomeRRScreen  *screen);
+ gboolean        gnome_rr_config_applicable   (GnomeRRConfig  *configuration,
+ 					      GnomeRRScreen  *screen);
+ 
++/* A utility function that isn't really in the spirit of this file, but I don't
++ * don't know a better place for it.
++ */
++GnomeRRMode **gnome_rr_create_clone_modes (GnomeRRScreen *screen);
++
+ #endif
+diff -up gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-rr.h.clone-modes gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-rr.h
+--- gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-rr.h.clone-modes	2008-09-22 17:01:45.000000000 -0400
++++ gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-rr.h	2008-09-24 14:09:09.000000000 -0400
+@@ -56,6 +56,7 @@ void            gnome_rr_screen_destroy 
+ GnomeRROutput **gnome_rr_screen_list_outputs       (GnomeRRScreen         *screen);
+ GnomeRRCrtc **  gnome_rr_screen_list_crtcs         (GnomeRRScreen         *screen);
+ GnomeRRMode **  gnome_rr_screen_list_modes         (GnomeRRScreen         *screen);
++GnomeRRMode **  gnome_rr_screen_list_clone_modes   (GnomeRRScreen	  *screen);
+ void            gnome_rr_screen_set_size           (GnomeRRScreen         *screen,
+ 						    int                    width,
+ 						    int                    height,


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- gnome-desktop.spec	22 Sep 2008 22:10:18 -0000	1.170
+++ gnome-desktop.spec	24 Sep 2008 18:15:32 -0000	1.171
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.24/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -78,7 +78,7 @@
 %prep
 %setup -q
 %patch2 -p1 -b .rr-leaks
-%patch3 -p0 -b .clone-modes
+%patch3 -p1 -b .clone-modes
 %patch4 -p1 -b .fade
 
 %build
@@ -126,6 +126,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Wed Sep 24 2008 Soren Sandmann <sandmann at redhat.com> - 2.24.0-2
+- Make clone-modes.patch work again
+
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
 - Update to 2.24.0
 



From anyremote at fedoraproject.org  Wed Sep 24 18:19:49 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Wed, 24 Sep 2008 18:19:49 +0000 (UTC)
Subject: rpms/kanyremote/F-8 .cvsignore, 1.5, 1.6 import.log, 1.1,
	1.2 kanyremote.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20080924181949.8BCEE70103@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29338/F-8

Modified Files:
	.cvsignore import.log kanyremote.spec sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2008 20:00:31 -0000	1.5
+++ .cvsignore	24 Sep 2008 18:19:19 -0000	1.6
@@ -1 +1 @@
-kanyremote-5.2.1.tar.gz
+kanyremote-5.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-8/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Sep 2008 20:00:31 -0000	1.1
+++ import.log	24 Sep 2008 18:19:19 -0000	1.2
@@ -1 +1,2 @@
 kanyremote-5_2_1-1_fc9:F-8:kanyremote-5.2.1-1.fc9.src.rpm:1220903994
+kanyremote-5_3-1_fc9:F-8:kanyremote-5.3-1.fc9.src.rpm:1222279770


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-8/kanyremote.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kanyremote.spec	8 Sep 2008 20:00:31 -0000	1.4
+++ kanyremote.spec	24 Sep 2008 18:19:19 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
-Version: 5.2.1
+Version: 5.3
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -38,6 +38,9 @@
 
 %changelog
 
+* Wed Sep 24 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.3-1
+- Add icons to menu and buttons.
+
 * Mon Sep 8 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.2.1-1
 - Small bugfixes.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2008 20:00:31 -0000	1.5
+++ sources	24 Sep 2008 18:19:19 -0000	1.6
@@ -1 +1 @@
-5893683d6cd5d5cc4994edb0a3532c73  kanyremote-5.2.1.tar.gz
+af0a5a399d5006f08216e66fbc2b4bcd  kanyremote-5.3.tar.gz



From anyremote at fedoraproject.org  Wed Sep 24 18:19:51 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Wed, 24 Sep 2008 18:19:51 +0000 (UTC)
Subject: rpms/ganyremote/F-8 .cvsignore, 1.5, 1.6 ganyremote.spec, 1.4,
	1.5 import.log, 1.1, 1.2 sources, 1.5, 1.6
Message-ID: <20080924181951.B3C9470103@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/ganyremote/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29367/F-8

Modified Files:
	.cvsignore ganyremote.spec import.log sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2008 19:58:17 -0000	1.5
+++ .cvsignore	24 Sep 2008 18:19:21 -0000	1.6
@@ -1 +1 @@
-ganyremote-5.2.1.tar.gz
+ganyremote-5.3.tar.gz


Index: ganyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-8/ganyremote.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ganyremote.spec	8 Sep 2008 19:58:17 -0000	1.4
+++ ganyremote.spec	24 Sep 2008 18:19:21 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: GTK frontend for anyRemote
 Name: ganyremote
-Version: 5.2.1
+Version: 5.3
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -38,6 +38,9 @@
 
 %changelog
 
+* Wed Sep 24 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.3-1
+- Add icons to menu and buttons.
+
 * Mon Sep 8 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.2.1-1
 - Small bugfixes.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-8/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Sep 2008 19:58:17 -0000	1.1
+++ import.log	24 Sep 2008 18:19:21 -0000	1.2
@@ -1 +1,2 @@
 ganyremote-5_2_1-1_fc9:F-8:ganyremote-5.2.1-1.fc9.src.rpm:1220903676
+ganyremote-5_3-1_fc9:F-8:ganyremote-5.3-1.fc9.src.rpm:1222279796


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2008 19:58:17 -0000	1.5
+++ sources	24 Sep 2008 18:19:21 -0000	1.6
@@ -1 +1 @@
-beea475d0caf27f3c4ee2666ac32b0e0  ganyremote-5.2.1.tar.gz
+af070df47e5fd8fae77b296dd12efc19  ganyremote-5.3.tar.gz



From langel at fedoraproject.org  Wed Sep 24 18:20:09 2008
From: langel at fedoraproject.org (Lillian Angel)
Date: Wed, 24 Sep 2008 18:20:09 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel .cvsignore, 1.39,
	1.40 java-1.6.0-openjdk.spec, 1.71, 1.72 sources, 1.39, 1.40
Message-ID: <20080924182009.155D670103@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-serv29433

Modified Files:
	.cvsignore java-1.6.0-openjdk.spec sources 
Log Message:
* Wed Sep 24 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.21.b12
- Updated icedteasnapshot.
- Updated release.
- Updated openjdkver.
- Updated openjdkdate.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	8 Sep 2008 13:07:18 -0000	1.39
+++ .cvsignore	24 Sep 2008 18:19:38 -0000	1.40
@@ -1,4 +1,5 @@
 mauve-2008-03-11.tar.gz
 mauve_tests
 java-access-bridge-1.23.0.tar.gz
-openjdk-6-src-b11-10_jul_2008-fedora.tar.gz
+openjdk-6-src-b12-28_aug_2008-fedora.tar.gz
+icedtea6-1.3-098f7819fe90d0cc65e701763ed375b2099885b9.tar.gz


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.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- java-1.6.0-openjdk.spec	22 Sep 2008 14:25:00 -0000	1.71
+++ java-1.6.0-openjdk.spec	24 Sep 2008 18:19:38 -0000	1.72
@@ -7,9 +7,9 @@
 %define runtests 0
 
 %define icedteaver 1.3
-%define icedteasnapshot -94838da771970032c91d65eb2588e2f916055aad
-%define openjdkver b11
-%define openjdkdate 10_jul_2008
+%define icedteasnapshot -098f7819fe90d0cc65e701763ed375b2099885b9
+%define openjdkver b12
+%define openjdkdate 28_aug_2008
 
 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
 
@@ -109,7 +109,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.20.%{openjdkver}%{?dist}
+Release: 0.21.%{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
@@ -350,7 +350,6 @@
 %ifarch sparc64
 export ARCH_DATA_MODEL=64
 %endif
-./autogen.sh
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
@@ -897,7 +896,13 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
-* Mon Sep 22 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.21.b11
+* Wed Sep 24 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.21.b12
+- Updated icedteasnapshot.
+- Updated release.
+- Updated openjdkver.
+- Updated openjdkdate.
+
+* Mon Sep 22 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.20.b11
 - Removed update-desktop-database dependency.
 - Resolves: rhbz#463046
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	8 Sep 2008 13:07:18 -0000	1.39
+++ sources	24 Sep 2008 18:19:38 -0000	1.40
@@ -1,4 +1,5 @@
 079e5dc01f2a8720ee3b3dd39119a601  mauve-2008-03-11.tar.gz
 7a0c160c03012cd40957a7a112e25038  mauve_tests
 1db4280d3228f20ad39ad22382ce2b00  java-access-bridge-1.23.0.tar.gz
-0997dea46b42ed9bbebff8cbe5f70aa0  openjdk-6-src-b11-10_jul_2008-fedora.tar.gz
+482c858d25959c0cb77c1fa59161ce2a  openjdk-6-src-b12-28_aug_2008-fedora.tar.gz
+8ba50de8bb257a7fd96bcd4500fa4c6b  icedtea6-1.3-098f7819fe90d0cc65e701763ed375b2099885b9.tar.gz



From spot at fedoraproject.org  Wed Sep 24 18:26:23 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 24 Sep 2008 18:26:23 +0000 (UTC)
Subject: rpms/PyX/devel PyX-0.8.1-siteconfig.patch,1.1,1.2
Message-ID: <20080924182623.35AD170103@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/PyX/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30672

Modified Files:
	PyX-0.8.1-siteconfig.patch 
Log Message:
fix patch to apply cleanly, resolves FTBFS

PyX-0.8.1-siteconfig.patch:

Index: PyX-0.8.1-siteconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/PyX/devel/PyX-0.8.1-siteconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PyX-0.8.1-siteconfig.patch	2 May 2006 13:49:32 -0000	1.1
+++ PyX-0.8.1-siteconfig.patch	24 Sep 2008 18:25:52 -0000	1.2
@@ -1,7 +1,7 @@
-diff -ur PyX-0.8.1/setup.py PyX-0.8.1-patched/setup.py
---- PyX-0.8.1/setup.py	2005-08-13 05:32:46.000000000 -0700
-+++ PyX-0.8.1-patched/setup.py	2006-04-29 02:49:37.000000000 -0700
-@@ -15,8 +15,6 @@
+diff -up PyX-0.10/setup.py.orig PyX-0.10/setup.py
+--- PyX-0.10/setup.py.orig	2006-05-24 09:33:56.000000000 -0400
++++ PyX-0.10/setup.py	2008-09-24 14:22:47.000000000 -0400
+@@ -15,8 +15,6 @@ except:
      log = None
  from distutils.core import setup, Extension
  from distutils.util import change_root, convert_path
@@ -10,7 +10,7 @@
  from distutils.command.install_lib import install_lib
  import ConfigParser
  import sys, os
-@@ -81,79 +79,21 @@
+@@ -81,79 +79,21 @@ adddatafiles("pyxrcdir", os.name != "nt"
  # extend install commands to overwrite siteconfig.py during build and install
  #
  
@@ -98,8 +98,8 @@
          return result
  
  ################################################################################
-@@ -193,7 +133,5 @@
-       packages=["pyx", "pyx/graph", "pyx/graph/axis", "pyx/t1strip", "pyx/pykpathsea"],
+@@ -193,7 +133,5 @@ setup(name="PyX",
+       packages=["pyx", "pyx/graph", "pyx/graph/axis", "pyx/font", "pyx/pykpathsea"],
        ext_modules=ext_modules,
        data_files=data_files,
 -      cmdclass = {"build_py": pyx_build_py,



From spot at fedoraproject.org  Wed Sep 24 18:30:14 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 24 Sep 2008 18:30:14 +0000 (UTC)
Subject: rpms/LabPlot/devel LabPlot.spec,1.12,1.13
Message-ID: <20080924183014.F0A6A70103@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/LabPlot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31281

Modified Files:
	LabPlot.spec 
Log Message:
handle libLabPlotnetCDF.so*


Index: LabPlot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/devel/LabPlot.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- LabPlot.spec	24 Sep 2008 18:03:36 -0000	1.12
+++ LabPlot.spec	24 Sep 2008 18:29:44 -0000	1.13
@@ -1,6 +1,6 @@
 Name:              LabPlot
 Version:           1.6.0.2
-Release:           1%{?dist}
+Release:           2%{?dist}
 Summary:           Data Analysis and Visualization
 
 License:           GPLv2+
@@ -260,6 +260,7 @@
 
 %{__rm} -f %{buildroot}%{_libdir}/lib%{name}.so
 %{__rm} -f %{buildroot}%{_libdir}/lib%{name}cephes.so
+%{__rm} -f %{buildroot}%{_libdir}/lib%{name}netCDF.so
 
 
 %clean
@@ -297,6 +298,7 @@
 %{_datadir}/mimelnk/application/x-l?l.desktop
 %{_libdir}/lib%{name}.so.1*
 %{_libdir}/lib%{name}cephes.so.1*
+%{_libdir}/lib%{name}netCDF.so.*
 # needed on Help -> LabPlot Handbook
 %{_docdir}/HTML/en/%{name}/
 
@@ -349,6 +351,9 @@
 
 
 %Changelog
+* Wed Sep 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.6.0.2-2
+- handle libLabPlotnetCDF.so*
+
 * Wed Sep 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.6.0.2-1
 - update to 1.6.0.2
 - drop useless gcc43 patch, init-smg-before-open-files patch



From rdieter at fedoraproject.org  Wed Sep 24 18:30:32 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 24 Sep 2008 18:30:32 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.209,1.210
Message-ID: <20080924183032.E371770103@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31363

Modified Files:
	qt.spec 
Log Message:
* Wed Sep 24 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.2-2
- omit systray patch (for now)



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- qt.spec	21 Sep 2008 22:16:59 -0000	1.209
+++ qt.spec	24 Sep 2008 18:30:02 -0000	1.210
@@ -9,7 +9,7 @@
 Name:    qt4
 %endif
 Version: 4.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -38,7 +38,6 @@
 # under GNOME, default to QGtkStyle if available
 # (otherwise fall back to QCleanlooksStyle)
 Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch
-Patch10: qt-x11-opensource-src-4.4.1-systray.patch
 
 ## qt-copy patches
 %define qt_copy 20080920
@@ -285,7 +284,6 @@
 %patch5 -p1 -b .bz#437440-as_IN-437440
 %patch8 -p1 -b .font-aliases
 %patch9 -p1 -b .qgtkstyle
-%patch10 -p1 -b .systray
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -733,6 +731,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.2-2
+- omit systray patch (for now)
+
 * Sat Sep 20 2008 Than Ngo <than at redhat.com> 4.4.2-1
 - 4.4.2
 



From salimma at fedoraproject.org  Wed Sep 24 18:42:34 2008
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 24 Sep 2008 18:42:34 +0000 (UTC)
Subject: rpms/google-gadgets/F-9 google-gadgets.spec,1.4,1.5
Message-ID: <20080924184234.140F870103@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/google-gadgets/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv844

Modified Files:
	google-gadgets.spec 
Log Message:
Keep F9 E-V-R below Rawhide's



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-9/google-gadgets.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- google-gadgets.spec	24 Sep 2008 06:14:25 -0000	1.4
+++ google-gadgets.spec	24 Sep 2008 18:42:03 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           google-gadgets
 Version:        0.10.1
-Release:        5%{?dist}
+Release:        4%{?dist}.1
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -170,7 +170,7 @@
 
 
 %changelog
-* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 0.10.1-5
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 0.10.1-4.fc9.1
 - Rebuild against newer gecko
 
 * Tue Sep  2 2008 Michel Salim <salimma at fedoraproject.org> - 0.10.1-4



From timj at fedoraproject.org  Wed Sep 24 18:47:25 2008
From: timj at fedoraproject.org (Tim Jackson)
Date: Wed, 24 Sep 2008 18:47:25 +0000 (UTC)
Subject: rpms/awstats/EL-5 awstats.README.Fedora, NONE, 1.1 awstats.spec,
	1.22, 1.23
Message-ID: <20080924184725.E8F0870103@cvs1.fedora.phx.redhat.com>

Author: timj

Update of /cvs/extras/rpms/awstats/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1633

Modified Files:
	awstats.spec 
Added Files:
	awstats.README.Fedora 
Log Message:
Add README.Fedora file to point people towards the -selinux subpackage



--- NEW FILE awstats.README.Fedora ---
SELinux support
---------------
If you have SELinux enabled, please install the package "awstats-selinux" as
this provides the necessary policy and labelling for AWStats to work
correctly under SELinux.


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/EL-5/awstats.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- awstats.spec	23 Aug 2008 09:03:41 -0000	1.22
+++ awstats.spec	24 Sep 2008 18:46:55 -0000	1.23
@@ -1,12 +1,13 @@
 Name:       awstats
 Version:    6.7
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPLv2
 Group:      Applications/Internet
 URL:        http://awstats.sourceforge.net
 Source0:    http://dl.sf.net/awstats/awstats-%{version}.tar.gz
 Source1:    awstats.README.SELinux
+Source2:    awstats.README.Fedora
 
 # Fix pb in xml output for history files
 # http://awstats.cvs.sourceforge.net/awstats/awstats/wwwroot/cgi-bin/awstats.pl?r1=1.892&r2=1.894&view=patch
@@ -62,6 +63,7 @@
 perl -pi -e 's/\r//g' tools/httpd_conf tools/logresolvemerge.pl
 # SELinux README
 cp -a %{SOURCE1} README.SELinux
+cp -a %{SOURCE2} README.Fedora
 mkdir selinux
 
 
@@ -202,7 +204,7 @@
 %{_datadir}/%{name}/wwwroot/cgi-bin
 # Different defattr to fix lots of files which should not be +x.
 %defattr(644,root,root,755)
-%doc README.TXT docs/*
+%doc README.TXT README.Fedora docs/*
 %{_datadir}/%{name}/lang
 %{_datadir}/%{name}/lib
 %{_datadir}/%{name}/plugins
@@ -218,6 +220,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Tim Jackson <rpm at timj.co.uk> 6.7-4
+- Add README.Fedora file pointing people towards the -selinux subpackage
+
 * Sat Aug 23 2008 Tim Jackson <rpm at timj.co.uk> 6.7-3
 - Fix CVE-2008-3714: cross-site scripting security issue (#459605)
 



From langel at fedoraproject.org  Wed Sep 24 18:59:09 2008
From: langel at fedoraproject.org (Lillian Angel)
Date: Wed, 24 Sep 2008 18:59:09 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.72,1.73
Message-ID: <20080924185909.F327E70103@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-serv2537

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Mon Sep 22 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.19.b09
- Removed all instances of security jars.




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.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- java-1.6.0-openjdk.spec	24 Sep 2008 18:19:38 -0000	1.72
+++ java-1.6.0-openjdk.spec	24 Sep 2008 18:58:39 -0000	1.73
@@ -67,14 +67,10 @@
 %define syslibdir       %{_prefix}/lib64
 %define _libdir         %{_prefix}/lib
 %define archname        %{name}.%{_arch}
-%define localpolicy     jce_%{javaver}_%{origin}_local_policy.%{_arch}
-%define uspolicy        jce_%{javaver}_%{origin}_us_export_policy.%{_arch}
 %define javaplugin      libjavaplugin.so.%{_arch}
 %else
 %define syslibdir       %{_libdir}
 %define archname        %{name}
-%define localpolicy     jce_%{javaver}_%{origin}_local_policy
-%define uspolicy        jce_%{javaver}_%{origin}_us_export_policy
 %define javaplugin      libjavaplugin.so
 %endif
 
@@ -451,13 +447,6 @@
 
   # Install JCE policy symlinks.
   install -d -m 755 $RPM_BUILD_ROOT%{_jvmprivdir}/%{archname}/jce/vanilla
-  for file in local_policy.jar US_export_policy.jar
-  do
-    mv -f $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/$file \
-      $RPM_BUILD_ROOT%{_jvmprivdir}/%{archname}/jce/vanilla
-    # Touch files for ghosts.
-    touch $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/$file
-  done
 
   # Install versionless symlinks.
   pushd $RPM_BUILD_ROOT%{_jvmdir}
@@ -603,17 +592,6 @@
   --slave %{_jvmjardir}/jre-%{javaver} \
   jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk}
 
-alternatives \
-  --install \
-  %{_jvmdir}/%{jrelnk}/lib/security/local_policy.jar \
-  %{localpolicy} \
-  %{_jvmprivdir}/%{archname}/jce/vanilla/local_policy.jar \
-  %{priority} \
-  --slave \
-  %{_jvmdir}/%{jrelnk}/lib/security/US_export_policy.jar \
-  %{uspolicy} \
-  %{_jvmprivdir}/%{archname}/jce/vanilla/US_export_policy.jar
-
 # Update for jnlp handling.
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
@@ -630,9 +608,6 @@
   alternatives --remove java %{jrebindir}/java
   alternatives --remove jre_%{origin} %{_jvmdir}/%{jrelnk}
   alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
-  alternatives --remove \
-    %{localpolicy} \
-    %{_jvmprivdir}/%{archname}/jce/vanilla/local_policy.jar
 fi
 
 # Update for jnlp handling.
@@ -809,8 +784,6 @@
 %{_jvmdir}/%{jredir}/lib/security/cacerts
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
-%ghost %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
-%ghost %{_jvmdir}/%{jredir}/lib/security/US_export_policy.jar
 %{_datadir}/applications/*policytool.desktop
 %{_datadir}/icons/hicolor/*x*/apps/java.png
 %{_mandir}/man1/java-%{name}.1*
@@ -896,6 +869,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Sep 22 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.19.b09
+- Removed all instances of security jars.
+
 * Wed Sep 24 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.21.b12
 - Updated icedteasnapshot.
 - Updated release.



From langel at fedoraproject.org  Wed Sep 24 19:00:43 2008
From: langel at fedoraproject.org (Lillian Angel)
Date: Wed, 24 Sep 2008 19:00:43 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.73,1.74
Message-ID: <20080924190043.85FC070103@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-serv2734

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
Fixed changelog




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.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- java-1.6.0-openjdk.spec	24 Sep 2008 18:58:39 -0000	1.73
+++ java-1.6.0-openjdk.spec	24 Sep 2008 19:00:13 -0000	1.74
@@ -869,7 +869,7 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
-* Mon Sep 22 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.19.b09
+* Wed Sep 24 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.19.b09
 - Removed all instances of security jars.
 
 * Wed Sep 24 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.21.b12



From rathann at fedoraproject.org  Wed Sep 24 19:12:06 2008
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Wed, 24 Sep 2008 19:12:06 +0000 (UTC)
Subject: rpms/dx/devel dx-rpm.patch,1.2,1.3 dx.spec,1.8,1.9
Message-ID: <20080924191206.8F93E70103@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/dx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4056

Modified Files:
	dx-rpm.patch dx.spec 
Log Message:
* Wed Sep 24 2008 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-7
- rediff patch to fix build with new rpm


dx-rpm.patch:

Index: dx-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dx/devel/dx-rpm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dx-rpm.patch	17 Sep 2006 01:46:09 -0000	1.2
+++ dx-rpm.patch	24 Sep 2008 19:12:06 -0000	1.3
@@ -1,279 +1,7 @@
---- dx-4.4.0/src/misc/Makefile.am.r	2003-07-12 02:12:13.000000000 +0200
-+++ dx-4.4.0/src/misc/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -4,7 +4,7 @@
- 
- dxbindir = $(prefix)/bin
- noinst_PROGRAMS = dxlocal
--archmakdir = $(prefix)/dx/lib_$(ARCH)
-+archmakdir = $(libdir)
- archmak_DATA = arch.mak
- 
- dxlocal_SOURCES = dx.c utils.c
-@@ -15,5 +15,5 @@
- 	if test ! -z "@INSTALL_BIN_PROGRAM@" ; then		         \
- 		$(mkinstalldirs) $(prefix)/bin ;                	         \
- 		$(INSTALL) dxlocal at EXEEXT@ 				         \
--		$(prefix)/dx/bin_$(ARCH)/@INSTALL_BIN_PROGRAM@@EXEEXT@ ; \
-+		$(libdir)/dx/bin_$(ARCH)/@INSTALL_BIN_PROGRAM@@EXEEXT@ ; \
- 	fi
---- dx-4.4.0/src/uipp/startup/Makefile.am.r	2003-07-12 02:12:29.000000000 +0200
-+++ dx-4.4.0/src/uipp/startup/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -2,7 +2,7 @@
- 
- INCLUDES =  -I${top_srcdir}/include -I${srcdir}/../base -D at ARCH@
- 
--dxbindir = $(prefix)/dx/bin_ at ARCH@
-+dxbindir = $(libdir)/dx/bin_ at ARCH@
- 
- dxbin_PROGRAMS = startupui
- 
---- dx-4.4.0/src/uipp/ui/Makefile.am.r	2001-04-12 16:29:02.000000000 +0200
-+++ dx-4.4.0/src/uipp/ui/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--uidatadir = $(prefix)/dx/ui
-+uidatadir = $(datadir)/dx/ui
- 
- DATA1 = \
- 	icon50.dat icon50.xpm logo.dat logo.xpm ui.mdf Basic2D.cfg Basic2D.net \
---- dx-4.4.0/src/uipp/java/Makefile.am.r	2006-01-11 17:25:35.000000000 +0100
-+++ dx-4.4.0/src/uipp/java/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -27,12 +27,12 @@
- ## libtool and the -shrext flag to make this much more 
- ## portable.
- 
--javadxdir = $(prefix)/dx/java/htmlpages
-+javadxdir = $(libdir)/dx/java/htmlpages
- javadx_DATA = dx.jar 
--javasrvdir = $(prefix)/dx/java/server/class
-+javasrvdir = $(libdir)/dx/java/server/class
- javasrv_DATA = server.jar 
- EXTRA_DIST = $(DX_SRCS) DXServer.java makeall.java makewrl.java exports.awk README
--javalibdir = $(prefix)/dx/java/server/lib_ at ARCH@
-+javalibdir = $(libdir)/dx/java/server/lib_ at ARCH@
- 
- javalib_DATA = @ANYDX@
- SUBDIRS = server dx layout
---- dx-4.4.0/src/uipp/java/server/Makefile.am.r	2001-05-21 16:47:39.000000000 +0200
-+++ dx-4.4.0/src/uipp/java/server/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -1,6 +1,6 @@
--srvbindir = $(prefix)/dx/java/server/bin
--srvoutputdir = $(prefix)/dx/java/output
--userhtmldir = $(prefix)/dx/java/user
-+srvbindir = $(libdir)/dx/java/server/bin
-+srvoutputdir = $(libdir)/dx/java/output
-+userhtmldir = $(libdir)/dx/java/user
- # the server script (in srvbindir) will actually cd and run from the class subdir so that java will find the classes
- # the server will expect to find a file dxserver.paths there to tell the exec where to find .net files
- srvrundir = $(srvbindir)/../class
---- dx-4.4.0/src/uipp/java/server/macros/Makefile.am.r	1999-07-09 21:25:13.000000000 +0200
-+++ dx-4.4.0/src/uipp/java/server/macros/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -1,6 +1,6 @@
- ##  Process this file with automake to produce Makefile.in
- 
--serverdatadir = $(prefix)/dx/java/server/dxmacros
-+serverdatadir = $(libdir)/dx/java/server/dxmacros
- 
- serverdata_DATA = $(MACRO_FILES)
- 
---- dx-4.4.0/src/uipp/tutor/Makefile.am.r	2003-07-12 02:12:29.000000000 +0200
-+++ dx-4.4.0/src/uipp/tutor/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -2,7 +2,7 @@
- 
- INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D at ARCH@
- 
--dxbindir = $(prefix)/dx/bin_ at ARCH@
-+dxbindir = $(libdir)/dx/bin_ at ARCH@
- 
- dxbin_PROGRAMS = tutor
- 
---- dx-4.4.0/src/uipp/dxui/Makefile.am.r	2003-07-12 02:12:17.000000000 +0200
-+++ dx-4.4.0/src/uipp/dxui/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -2,7 +2,7 @@
- 
- INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -I${srcdir}/../dxuilib -D at ARCH@
- 
--dxbindir = $(prefix)/dx/bin_ at ARCH@
-+dxbindir = $(libdir)/dx/bin_ at ARCH@
- dxbin_PROGRAMS = dxui
- 
- 
---- dx-4.4.0/src/uipp/prompter/Makefile.am.r	2003-11-04 05:20:14.000000000 +0100
-+++ dx-4.4.0/src/uipp/prompter/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -2,7 +2,7 @@
- 
- INCLUDES =  -I${srcdir}/../base -I${top_srcdir}/include -D at ARCH@
- 
--dxbindir = $(prefix)/dx/bin_ at ARCH@
-+dxbindir = $(libdir)/dx/bin_ at ARCH@
- 
- dxbin_PROGRAMS = prompter
- 
---- dx-4.4.0/src/uipp/mb/Makefile.am.r	2003-08-20 16:21:33.000000000 +0200
-+++ dx-4.4.0/src/uipp/mb/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -2,7 +2,7 @@
- 
- INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -I${srcdir}/../widgets -D at ARCH@
- 
--dxbindir = $(prefix)/dx/bin_ at ARCH@
-+dxbindir = $(libdir)/dx/bin_ at ARCH@
- 
- dxbin_PROGRAMS = builder
- 
---- dx-4.4.0/src/uipp/dxl/Makefile.am.r	2003-07-12 02:12:16.000000000 +0200
-+++ dx-4.4.0/src/uipp/dxl/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -7,7 +7,7 @@
- 
- INCLUDES = -I${top_srcdir}/include  -D at ARCH@
- 
--dxlibdir = $(prefix)/dx/lib_ at ARCH@
-+dxlibdir = $(libdir)
- 
- noinst_HEADERS = \
- 	dxlP.h \
---- dx-4.4.0/src/exec/Makefile.am.r	2003-09-17 00:40:40.000000000 +0200
-+++ dx-4.4.0/src/exec/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -1,6 +1,6 @@
- SUBDIRS = libdx dxmods hwrender dpexec dxexec
- 
--dxlibdir = $(prefix)/dx/lib_ at ARCH@
-+dxlibdir = $(libdir)
- 
- MAJOR_VERSION=@MAJOR_VERSION@
- MINOR_VERSION=@MINOR_VERSION@
---- dx-4.4.0/src/exec/dxexec/Makefile.am.r	2006-01-11 17:24:39.000000000 +0100
-+++ dx-4.4.0/src/exec/dxexec/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -9,7 +9,7 @@
- libDXEXEC_la_SOURCES = main.c
- libDXEXEC_la_CFLAGS = $(AM_CFLAGS)
- 
--bindir = $(prefix)/dx/bin_ at ARCH@
-+bindir = $(libdir)/dx/bin_ at ARCH@
- bin_PROGRAMS = dxexec
- 
- dxexec_LDADD = ../dpexec/libDPEXEC.la ../dxmods/libDXMODS.la ../dxmods/user.lo \
---- dx-4.4.0/src/exec/libdx/Makefile.am.r	2005-10-28 18:25:02.000000000 +0200
-+++ dx-4.4.0/src/exec/libdx/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -7,7 +7,7 @@
- #INCLUDES = -I../../../include  -D at ARCH@
- INCLUDES = -I${top_srcdir}/include  -D at ARCH@
- 
--dxlibdir = $(prefix)/dx/lib_ at ARCH@
-+dxlibdir = $(libdir)
- 
- noinst_LTLIBRARIES = libLIBDX.la libcallm.la libmem.la
- #dxlib_LIBRARIES = libDXlite.a 
---- dx-4.4.0/src/exec/libdx/memory.c.r	2006-01-03 01:57:41.000000000 +0100
-+++ dx-4.4.0/src/exec/libdx/memory.c	2006-09-17 03:29:07.000000000 +0200
-@@ -66,7 +66,6 @@
- 
- #if linux
- #include <linux/kernel.h>
--#include <linux/sys.h>
- #include <sys/sysinfo.h>
- #endif
- 
---- dx-4.4.0/src/exec/dxmods/Makefile.am.r	2003-08-19 00:51:10.000000000 +0200
-+++ dx-4.4.0/src/exec/dxmods/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -1,8 +1,9 @@
- ## Process this file with automake to produce Makefile.in
- 
- INCLUDES = -I${top_srcdir}/include -I${srcdir}/../dpexec -I$(BUILDBASE)/include -D at ARCH@
-+INCLUDES+=-I/usr/include/netcdf-3
- 
--dxmdfdir = $(prefix)/dx/lib
-+dxmdfdir = $(datadir)/dx/lib
- noinst_LTLIBRARIES = libDXMODS.la libusercm.la libuser.la libDXMODSN.la
- SUFFIXES = .c .y .c .s .h .o 
- 
-@@ -13,6 +14,8 @@
- 
- dxmdf_DATA = dx.mdf
- 
-+user.c: dx.mdf
-+
- _complex.o: _compparse.h
- 
- HEADERS1 = \
---- dx-4.4.0/src/exec/dxmods/local.mk.in.r	2003-07-12 02:12:06.000000000 +0200
-+++ dx-4.4.0/src/exec/dxmods/local.mk.in	2006-09-17 03:31:32.000000000 +0200
-@@ -14,23 +14,23 @@
- 
- dxcm.mdf:  ${srcdir}/dxmdf.src
- 	-rm -f dxcm.mdf
--	cp ${srcdir}/dxmdf.src tmp.c
--	$(CPP) $(INCLUDES) $(MDF) $(DEFS) tmp.c > dxcm.mdf
--	-rm -f tmp.c
-+	cp ${srcdir}/dxmdf.src dxcm.tmp.c
-+	$(CPP) $(INCLUDES) $(MDF) $(DEFS) dxcm.tmp.c > dxcm.mdf
-+	-rm -f dxcm.tmp.c
- 
- dx.mdf:  ${srcdir}/dxmdf.src
- 	echo MYINC: $(MYINC)
- 	-rm -f dx.mdf
--	cp ${srcdir}/dxmdf.src tmp.c
--	$(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS tmp.c > dx.mdf
-+	cp ${srcdir}/dxmdf.src dx.tmp.c
-+	$(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS dx.tmp.c > dx.mdf
- 	@echo '/^ *$$/{' > stripl.sed
- 	@echo 'N' >> stripl.sed
- 	@echo '/^ *\\n *$$/D' >> stripl.sed
- 	@echo '}' >> stripl.sed
--	cat dx.mdf |sed '/^#/d' > tmp.mdf
--	cat tmp.mdf |sed -f stripl.sed > dx.mdf
--	@rm -f stripl.sed tmp.mdf
--	-rm -f tmp.c
-+	cat dx.mdf |sed '/^#/d' > dx.tmp.mdf
-+	cat dx.tmp.mdf |sed -f stripl.sed > dx.mdf
-+	@rm -f stripl.sed dx.tmp.mdf
-+	-rm -f dx.tmp.c
- 
- .y.h:
- 	$(YACC) $(YFLAGS) -d ${srcdir}/$*.y
---- dx-4.4.0/include/Makefile.am.r	2001-08-16 22:12:41.000000000 +0200
-+++ dx-4.4.0/include/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -1,3 +1,3 @@
--dxincdir = $(prefix)/dx/include
-+dxincdir = $(prefix)/include
- SUBDIRS = dx
- dxinc_HEADERS = dxl.h dxconfig.h dxstereo.h
---- dx-4.4.0/include/dx/Makefile.am.r	1999-05-26 01:35:16.000000000 +0200
-+++ dx-4.4.0/include/dx/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--dxincdir = $(prefix)/dx/include/dx
-+dxincdir = $(prefix)/include/dx
-  
- dxinc_HEADERS = \
- 	UserInteractors.h advanced.h arch.h array.h arrayhandles.h \
---- dx-4.4.0/bin/Makefile.am.r	2003-07-12 02:11:37.000000000 +0200
-+++ dx-4.4.0/bin/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--dxbindir = $(prefix)/dx/bin
-+dxbindir = $(libdir)/dx/bin
- bindir = $(prefix)/bin
- 
- EXTRA_SCRIPTS = mdf2c dx
---- dx-4.4.0/bin/url_handler.sh.r	2002-04-11 01:32:54.000000000 +0200
-+++ dx-4.4.0/bin/url_handler.sh	2006-09-17 03:29:07.000000000 +0200
-@@ -39,8 +39,8 @@
- 		if [ $use_xbrowser = n ]; then
- 			lynx "$url" 
- 		else
--			netscape -remote "openURL($url)" 2> /dev/null || \
--			(netscape "$url" &)
-+			firefox -remote "openURL($url)" 2> /dev/null || \
-+			(firefox "$url" &)
-                 fi
- 		;;
- esac
---- dx-4.4.0/bin/dx.in.r	2004-05-31 18:12:05.000000000 +0200
-+++ dx-4.4.0/bin/dx.in	2006-09-17 03:29:07.000000000 +0200
-@@ -60,14 +60,7 @@
+diff -up dx-4.4.4/bin/dx.in.r dx-4.4.4/bin/dx.in
+--- dx-4.4.4/bin/dx.in.r	2004-05-31 18:12:05.000000000 +0200
++++ dx-4.4.4/bin/dx.in	2008-09-24 19:14:35.000000000 +0200
+@@ -60,14 +60,7 @@ exit 1
  #
  longhelp() {
  
@@ -289,7 +17,7 @@
  
  cat << EOFlonghelp
  command line parameters:
-@@ -286,7 +279,7 @@
+@@ -286,7 +279,7 @@ fi
  
  
  if [ -z "$DXROOT" ]; then
@@ -298,7 +26,7 @@
    DXROOT=$prefix/dx
  fi
  export DXROOT
-@@ -298,6 +291,13 @@
+@@ -298,6 +291,13 @@ if [ -z "$DXDATA" ]; then
    fi
  fi
  
@@ -312,7 +40,7 @@
  # if DXMACROS not set, default it to the usual unless dir doesn't exist
  if [ -z "$DXMACROS" ]; then
    DXMACROS=$DXROOT/samples/macros
-@@ -507,7 +507,7 @@
+@@ -507,7 +507,7 @@ export DXARCH
  
  # default to running locally, from @prefix@/dx  
  exhost=$thishost
@@ -321,7 +49,7 @@
  startup=1   # run the startup window by default
  
  
-@@ -1469,8 +1469,8 @@
+@@ -1469,8 +1469,8 @@ done
  
  # Now set some needed results 
  
@@ -332,7 +60,7 @@
  dxexecdef="$dxexroot/bin_${exarch}/dxexec"
  if test -z "$dxexec" ; then
     dxexec=$dxexecdef
-@@ -1600,7 +1600,7 @@
+@@ -1600,7 +1600,7 @@ fi
  #
  if test $tutor -eq 1 ; then
    
@@ -341,7 +69,7 @@
    if test $seecomline -eq 1 ; then
      set
      echo "$echoparms exec $cmd $xparms"
-@@ -1619,7 +1619,7 @@
+@@ -1619,7 +1619,7 @@ if test $prompter -eq 1 ; then
      prompterflags="$prompterflags -file \"$FileName\""
    fi
  
@@ -350,7 +78,7 @@
    if test $seecomline -eq 1 ; then
      set
      echo "$echoparms exec $cmd $prompterflags $xparms"
-@@ -1635,7 +1635,7 @@
+@@ -1635,7 +1635,7 @@ fi
  if test $startup -eq 1 ; then
  
    
@@ -359,7 +87,7 @@
    if test $seecomline -eq 1 ; then
      set
      echo "$echoparms exec $cmd $xparms $*"
-@@ -1649,7 +1649,7 @@
+@@ -1649,7 +1649,7 @@ fi
  #
  if test $builder -eq 1 ; then
  
@@ -368,7 +96,7 @@
    if test $seecomline -eq 1 ; then
      set
      echo "exec $cmd $xparms $motifcmd $motifbind $FileName"
-@@ -1674,7 +1674,7 @@
+@@ -1674,7 +1674,7 @@ if test $encoder -eq 1 ; then
    EncodedBase="${Base}-e"
  
    echo "Creating encoded version of $FileName in ${EncodedBase}.net "
@@ -377,8 +105,20 @@
    if test -f $CfgName ; then
      echo "Copying $CfgName to ${EncodedBase}.cfg"
      cmd2="cp $CfgName ${EncodedBase}.cfg"
---- dx-4.4.0/bin/mdf2c.in.r	1999-12-14 05:13:04.000000000 +0100
-+++ dx-4.4.0/bin/mdf2c.in	2006-09-17 03:29:07.000000000 +0200
+diff -up dx-4.4.4/bin/Makefile.am.r dx-4.4.4/bin/Makefile.am
+--- dx-4.4.4/bin/Makefile.am.r	2003-07-12 02:11:37.000000000 +0200
++++ dx-4.4.4/bin/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-dxbindir = $(prefix)/dx/bin
++dxbindir = $(libdir)/dx/bin
+ bindir = $(prefix)/bin
+ 
+ EXTRA_SCRIPTS = mdf2c dx
+diff -up dx-4.4.4/bin/mdf2c.in.r dx-4.4.4/bin/mdf2c.in
+--- dx-4.4.4/bin/mdf2c.in.r	1999-12-14 05:13:04.000000000 +0100
++++ dx-4.4.4/bin/mdf2c.in	2008-09-24 19:14:35.000000000 +0200
 @@ -1,6 +1,6 @@
  #!/bin/sh
  # Configure is looking for the following line
@@ -387,9 +127,24 @@
  DFLTROOT=$prefix/dx
  root=${DXROOT=${DXEXECROOT=$DFLTROOT}}
  
---- dx-4.4.0/configure.ac.r	2006-01-03 22:20:51.000000000 +0100
-+++ dx-4.4.0/configure.ac	2006-09-17 03:29:07.000000000 +0200
-@@ -672,7 +672,7 @@
+diff -up dx-4.4.4/bin/url_handler.sh.r dx-4.4.4/bin/url_handler.sh
+--- dx-4.4.4/bin/url_handler.sh.r	2002-04-11 01:32:54.000000000 +0200
++++ dx-4.4.4/bin/url_handler.sh	2008-09-24 19:14:35.000000000 +0200
+@@ -39,8 +39,8 @@ case $method in
+ 		if [ $use_xbrowser = n ]; then
+ 			lynx "$url" 
+ 		else
+-			netscape -remote "openURL($url)" 2> /dev/null || \
+-			(netscape "$url" &)
++			firefox -remote "openURL($url)" 2> /dev/null || \
++			(firefox "$url" &)
+                 fi
+ 		;;
+ esac
+diff -up dx-4.4.4/configure.ac.r dx-4.4.4/configure.ac
+--- dx-4.4.4/configure.ac.r	2006-08-21 23:56:08.000000000 +0200
++++ dx-4.4.4/configure.ac	2008-09-24 19:14:35.000000000 +0200
+@@ -677,7 +677,7 @@ if test "$ARCH" = "intelnt" ; then
      fi
  dnl -- check for unix
  else
@@ -398,7 +153,7 @@
      AC_MSG_CHECKING(if HDF package is complete)
      if test $passed -gt 0
      then
-@@ -681,7 +681,7 @@
+@@ -686,7 +686,7 @@ else
  	AC_MSG_RESULT(no -- some components failed test)
          have_hdf='no (failed tests)'
      else
@@ -407,7 +162,7 @@
  	LIBS="$LIB_HDF $LIBS"
  	FMT_LIBS="$FMT_LIBS libdf.a"
  	AC_DEFINE(HAVE_LIBDF, 1, [Define to 1 if you have the HDF libraries])
-@@ -761,8 +761,8 @@
+@@ -766,8 +766,8 @@ then
      AS_MESSAGE([checking for NETCDF support ......])
      failed=0;
      passed=0;
@@ -418,7 +173,7 @@
      AC_MSG_CHECKING(if NETCDF package is complete)
      if test $passed -gt 0
      then
-@@ -771,7 +771,7 @@
+@@ -776,7 +776,7 @@ then
  	AC_MSG_RESULT(no -- some components failed test)
          have_netcdf='no (failed tests)'
      else
@@ -427,7 +182,7 @@
  	LIBS="$LIB_NETCDF $LIBS"
  	FMT_LIBS="$FMT_LIBS libnetcdf.a"
  	AC_DEFINE(HAVE_LIBNETCDF, 1, [Define to 1 if you have the NetCDF libraries])
-@@ -1001,7 +1001,7 @@
+@@ -1011,7 +1011,7 @@ DX_CHECK_HEADERS( \
    Xm/ScrolledWP.h Xm/SelectioB.h Xm/SeparatoG.h Xm/SeparatoGP.h Xm/Separator.h \
    Xm/Text.h Xm/TextF.h Xm/ToggleB.h Xm/ToggleBG.h Xm/Xm.h Xm/XmP.h Xm/XmStrDefs.h \
    gl.h gl/device.h gl/gl.h invent.h iop/afb.h iop/mov.h iop/pfs.h license.h \
@@ -436,35 +191,31 @@
    os2.h setjmp.h starbase.c.h stddef.h stdio.h synch.h sys/access.h \
    sys/ipc.h sys/m88kbcs.h sys/mman.h sys/mode.h sys/pstat.h sys/resource.h \
    sys/svs.h sys/sysconfig.h sys/syslimits.h sys/sysmacros.h ulocks.h x11/xlibxtra.h \
---- dx-4.4.0/html/Makefile.am.r	2003-07-12 02:11:39.000000000 +0200
-+++ dx-4.4.0/html/Makefile.am	2006-09-17 03:29:07.000000000 +0200
+diff -up dx-4.4.4/doc/Makefile.am.r dx-4.4.4/doc/Makefile.am
+--- dx-4.4.4/doc/Makefile.am.r	1999-04-05 13:57:03.000000000 +0200
++++ dx-4.4.4/doc/Makefile.am	2008-09-24 19:14:35.000000000 +0200
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
--htmldir = $(prefix)/dx/html
-+htmldir = $(datadir)/dx/html
- 
- SUBDIRS = pages images
- 
---- dx-4.4.0/html/pages/Makefile.am.r	2002-06-20 06:38:03.000000000 +0200
-+++ dx-4.4.0/html/pages/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -1,4 +1,4 @@
--pagesdir = $(prefix)/dx/html/pages
-+pagesdir = $(datadir)/dx/html/pages
+-docdir = $(prefix)/dx/doc
++docdir = $(datadir)/dx/doc
  
- pages1 = \
- 	insgu002.htm insgu003.htm insgu004.htm insgu005.htm insgu006.htm \
---- dx-4.4.0/html/images/Makefile.am.r	2002-04-01 10:51:13.000000000 +0200
-+++ dx-4.4.0/html/images/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -1,5 +1,5 @@
+ doc_DATA = \
+ 	README README_SMP README_alphax README_aviion README_hp700 \
+diff -up dx-4.4.4/fonts/Makefile.am.r dx-4.4.4/fonts/Makefile.am
+--- dx-4.4.4/fonts/Makefile.am.r	2003-07-12 02:11:37.000000000 +0200
++++ dx-4.4.4/fonts/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
  
--imagesdir = $(prefix)/dx/html/images
-+imagesdir = $(datadir)/dx/html/images
+-fontdir = $(prefix)/dx/fonts
++fontdir = $(datadir)/dx/fonts
  
- images1 = \
- 	3dcurs.gif adctlpt.gif arch.gif autoax.gif autoexp.gif		\
---- dx-4.4.0/help/Makefile.am.r	2003-07-12 02:11:37.000000000 +0200
-+++ dx-4.4.0/help/Makefile.am	2006-09-17 03:29:07.000000000 +0200
+ font_DATA = \
+ 	README area.dx cyril_d.dx \
+diff -up dx-4.4.4/help/Makefile.am.r dx-4.4.4/help/Makefile.am
+--- dx-4.4.4/help/Makefile.am.r	2003-07-12 02:11:37.000000000 +0200
++++ dx-4.4.4/help/Makefile.am	2008-09-24 19:14:35.000000000 +0200
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -473,7 +224,7 @@
  
  EXTRA_DIST = $(helpfiles1) $(helpfiles2) $(helpfiles3) $(helpfiles4) $(helpfiles5)  \
  	$(helpfiles6) $(helpfiles7) $(helpfiles8) $(helpfiles9) $(helpfiles10)  \
-@@ -257,7 +257,7 @@
+@@ -257,7 +257,7 @@ install-data-hook:
  		 $(LN_S) hlpalhtl svsmstrh ; \
  		 $(LN_S) hlpalhtl ugidx ; \
  		 $(LN_S) hlpalhtl usrefidx ; \
@@ -482,7 +233,7 @@
  		 $(LN_S) HelpDir MBHelpDir ; \
  		 echo "cd $(DESTDIR)$(helpdir)" ; \
  		 echo "$(LN_S) hlpalhtl mbidx" ; \
-@@ -265,6 +265,6 @@
+@@ -265,6 +265,6 @@ install-data-hook:
  		 echo "$(LN_S) hlpalhtl svsmstrh" ; \
  		 echo "$(LN_S) hlpalhtl ugidx" ; \
  		 echo "$(LN_S) hlpalhtl usrefidx" ; \
@@ -490,16 +241,77 @@
 +		 echo "$(LN_S) HelpDir GARHelpDir" ; \
  		 echo "$(LN_S) HelpDir MBHelpDir" ) \
  	'
---- dx-4.4.0/man/Makefile.am.r	1999-04-03 18:31:28.000000000 +0200
-+++ dx-4.4.0/man/Makefile.am	2006-09-17 03:29:07.000000000 +0200
+diff -up dx-4.4.4/html/images/Makefile.am.r dx-4.4.4/html/images/Makefile.am
+--- dx-4.4.4/html/images/Makefile.am.r	2002-04-01 10:51:13.000000000 +0200
++++ dx-4.4.4/html/images/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -1,5 +1,5 @@
+ 
+-imagesdir = $(prefix)/dx/html/images
++imagesdir = $(datadir)/dx/html/images
+ 
+ images1 = \
+ 	3dcurs.gif adctlpt.gif arch.gif autoax.gif autoexp.gif		\
+diff -up dx-4.4.4/html/Makefile.am.r dx-4.4.4/html/Makefile.am
+--- dx-4.4.4/html/Makefile.am.r	2003-07-12 02:11:39.000000000 +0200
++++ dx-4.4.4/html/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-htmldir = $(prefix)/dx/html
++htmldir = $(datadir)/dx/html
+ 
+ SUBDIRS = pages images
+ 
+diff -up dx-4.4.4/html/pages/Makefile.am.r dx-4.4.4/html/pages/Makefile.am
+--- dx-4.4.4/html/pages/Makefile.am.r	2002-06-20 06:38:03.000000000 +0200
++++ dx-4.4.4/html/pages/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-pagesdir = $(prefix)/dx/html/pages
++pagesdir = $(datadir)/dx/html/pages
+ 
+ pages1 = \
+ 	insgu002.htm insgu003.htm insgu004.htm insgu005.htm insgu006.htm \
+diff -up dx-4.4.4/include/dx/Makefile.am.r dx-4.4.4/include/dx/Makefile.am
+--- dx-4.4.4/include/dx/Makefile.am.r	1999-05-26 01:35:16.000000000 +0200
++++ dx-4.4.4/include/dx/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-dxincdir = $(prefix)/dx/include/dx
++dxincdir = $(prefix)/include/dx
+  
+ dxinc_HEADERS = \
+ 	UserInteractors.h advanced.h arch.h array.h arrayhandles.h \
+diff -up dx-4.4.4/include/Makefile.am.r dx-4.4.4/include/Makefile.am
+--- dx-4.4.4/include/Makefile.am.r	2006-04-09 05:44:49.000000000 +0200
++++ dx-4.4.4/include/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-dxincdir = $(prefix)/dx/include
++dxincdir = $(prefix)/include
+ SUBDIRS = dx
+ dxinc_HEADERS = dxl.h dxstereo.h
+ nodist_dxinc_HEADERS = dxconfig.h
+diff -up dx-4.4.4/lib/Makefile.am.r dx-4.4.4/lib/Makefile.am
+--- dx-4.4.4/lib/Makefile.am.r	2003-08-22 01:22:13.000000000 +0200
++++ dx-4.4.4/lib/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-libsdir = $(prefix)/dx/lib
++libsdir = $(datadir)/dx/lib
+ 
+ libs_DATA = colors.txt dxexec.def dxexec.exp dxexec.imp dxexec.ifs \
+ 	dxfSaveCurrentImage.net dxrc mdf2c.awk messages outboard.c
+diff -up dx-4.4.4/man/Makefile.am.r dx-4.4.4/man/Makefile.am
+--- dx-4.4.4/man/Makefile.am.r	1999-04-03 18:31:28.000000000 +0200
++++ dx-4.4.4/man/Makefile.am	2008-09-24 19:14:35.000000000 +0200
 @@ -1,4 +1,4 @@
  ## Process this file with automake to produce Makefile.in
  
 -SUBDIRS = manl catl
 +SUBDIRS = manl
  
---- dx-4.4.0/man/manl/Makefile.am.r	2002-05-20 06:47:06.000000000 +0200
-+++ dx-4.4.0/man/manl/Makefile.am	2006-09-17 03:29:07.000000000 +0200
+diff -up dx-4.4.4/man/manl/Makefile.am.r dx-4.4.4/man/manl/Makefile.am
+--- dx-4.4.4/man/manl/Makefile.am.r	2002-05-20 06:47:06.000000000 +0200
++++ dx-4.4.4/man/manl/Makefile.am	2008-09-24 19:14:35.000000000 +0200
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -508,31 +320,253 @@
  
  man_MANS = dx.l
  EXTRA_DIST = $(man_MANS)
---- dx-4.4.0/fonts/Makefile.am.r	2003-07-12 02:11:37.000000000 +0200
-+++ dx-4.4.0/fonts/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -1,6 +1,6 @@
+diff -up dx-4.4.4/src/exec/dxexec/Makefile.am.r dx-4.4.4/src/exec/dxexec/Makefile.am
+--- dx-4.4.4/src/exec/dxexec/Makefile.am.r	2006-01-11 17:24:39.000000000 +0100
++++ dx-4.4.4/src/exec/dxexec/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -9,7 +9,7 @@ noinst_LTLIBRARIES = libDXEXEC.la
+ libDXEXEC_la_SOURCES = main.c
+ libDXEXEC_la_CFLAGS = $(AM_CFLAGS)
+ 
+-bindir = $(prefix)/dx/bin_ at ARCH@
++bindir = $(libdir)/dx/bin_ at ARCH@
+ bin_PROGRAMS = dxexec
+ 
+ dxexec_LDADD = ../dpexec/libDPEXEC.la ../dxmods/libDXMODS.la ../dxmods/user.lo \
+diff -up dx-4.4.4/src/exec/dxmods/local.mk.in.r dx-4.4.4/src/exec/dxmods/local.mk.in
+--- dx-4.4.4/src/exec/dxmods/local.mk.in.r	2003-07-12 02:12:06.000000000 +0200
++++ dx-4.4.4/src/exec/dxmods/local.mk.in	2008-09-24 19:14:35.000000000 +0200
+@@ -14,23 +14,23 @@ user.c:  dx.mdf
+ 
+ dxcm.mdf:  ${srcdir}/dxmdf.src
+ 	-rm -f dxcm.mdf
+-	cp ${srcdir}/dxmdf.src tmp.c
+-	$(CPP) $(INCLUDES) $(MDF) $(DEFS) tmp.c > dxcm.mdf
+-	-rm -f tmp.c
++	cp ${srcdir}/dxmdf.src dxcm.tmp.c
++	$(CPP) $(INCLUDES) $(MDF) $(DEFS) dxcm.tmp.c > dxcm.mdf
++	-rm -f dxcm.tmp.c
+ 
+ dx.mdf:  ${srcdir}/dxmdf.src
+ 	echo MYINC: $(MYINC)
+ 	-rm -f dx.mdf
+-	cp ${srcdir}/dxmdf.src tmp.c
+-	$(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS tmp.c > dx.mdf
++	cp ${srcdir}/dxmdf.src dx.tmp.c
++	$(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS dx.tmp.c > dx.mdf
+ 	@echo '/^ *$$/{' > stripl.sed
+ 	@echo 'N' >> stripl.sed
+ 	@echo '/^ *\\n *$$/D' >> stripl.sed
+ 	@echo '}' >> stripl.sed
+-	cat dx.mdf |sed '/^#/d' > tmp.mdf
+-	cat tmp.mdf |sed -f stripl.sed > dx.mdf
+-	@rm -f stripl.sed tmp.mdf
+-	-rm -f tmp.c
++	cat dx.mdf |sed '/^#/d' > dx.tmp.mdf
++	cat dx.tmp.mdf |sed -f stripl.sed > dx.mdf
++	@rm -f stripl.sed dx.tmp.mdf
++	-rm -f dx.tmp.c
+ 
+ .y.h:
+ 	$(YACC) $(YFLAGS) -d ${srcdir}/$*.y
+diff -up dx-4.4.4/src/exec/dxmods/Makefile.am.r dx-4.4.4/src/exec/dxmods/Makefile.am
+--- dx-4.4.4/src/exec/dxmods/Makefile.am.r	2003-08-19 00:51:10.000000000 +0200
++++ dx-4.4.4/src/exec/dxmods/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -1,8 +1,9 @@
  ## Process this file with automake to produce Makefile.in
  
--fontdir = $(prefix)/dx/fonts
-+fontdir = $(datadir)/dx/fonts
+ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../dpexec -I$(BUILDBASE)/include -D at ARCH@
++INCLUDES+=-I/usr/include/netcdf-3
  
- font_DATA = \
- 	README area.dx cyril_d.dx \
---- dx-4.4.0/lib/Makefile.am.r	2003-08-22 01:22:13.000000000 +0200
-+++ dx-4.4.0/lib/Makefile.am	2006-09-17 03:29:07.000000000 +0200
-@@ -1,4 +1,4 @@
--libsdir = $(prefix)/dx/lib
-+libsdir = $(datadir)/dx/lib
+-dxmdfdir = $(prefix)/dx/lib
++dxmdfdir = $(datadir)/dx/lib
+ noinst_LTLIBRARIES = libDXMODS.la libusercm.la libuser.la libDXMODSN.la
+ SUFFIXES = .c .y .c .s .h .o 
  
- libs_DATA = colors.txt dxexec.def dxexec.exp dxexec.imp dxexec.ifs \
- 	dxfSaveCurrentImage.net dxrc mdf2c.awk messages outboard.c
---- dx-4.4.0/doc/Makefile.am.r	1999-04-05 13:57:03.000000000 +0200
-+++ dx-4.4.0/doc/Makefile.am	2006-09-17 03:29:07.000000000 +0200
+@@ -13,6 +14,8 @@ DISTCLEANFILES = dx.mdf dxcm.mdf user.c 
+ 
+ dxmdf_DATA = dx.mdf
+ 
++user.c: dx.mdf
++
+ _complex.o: _compparse.h
+ 
+ HEADERS1 = \
+diff -up dx-4.4.4/src/exec/libdx/Makefile.am.r dx-4.4.4/src/exec/libdx/Makefile.am
+--- dx-4.4.4/src/exec/libdx/Makefile.am.r	2006-03-27 20:56:53.000000000 +0200
++++ dx-4.4.4/src/exec/libdx/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@
+ #INCLUDES = -I../../../include  -D at ARCH@
+ INCLUDES = -I${top_srcdir}/include  -D at ARCH@
+ 
+-dxlibdir = $(prefix)/dx/lib_ at ARCH@
++dxlibdir = $(libdir)
+ 
+ noinst_LTLIBRARIES = libLIBDX.la libcallm.la libmem.la
+ #dxlib_LIBRARIES = libDXlite.a 
+diff -up dx-4.4.4/src/exec/libdx/memory.c.r dx-4.4.4/src/exec/libdx/memory.c
+--- dx-4.4.4/src/exec/libdx/memory.c.r	2006-08-21 18:42:42.000000000 +0200
++++ dx-4.4.4/src/exec/libdx/memory.c	2008-09-24 19:14:35.000000000 +0200
+@@ -66,7 +66,6 @@
+ 
+ #if linux
+ #include <linux/kernel.h>
+-#include <linux/sys.h>
+ #include <sys/sysinfo.h>
+ #endif
+ 
+diff -up dx-4.4.4/src/exec/Makefile.am.r dx-4.4.4/src/exec/Makefile.am
+--- dx-4.4.4/src/exec/Makefile.am.r	2003-09-17 00:40:40.000000000 +0200
++++ dx-4.4.4/src/exec/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -1,6 +1,6 @@
+ SUBDIRS = libdx dxmods hwrender dpexec dxexec
+ 
+-dxlibdir = $(prefix)/dx/lib_ at ARCH@
++dxlibdir = $(libdir)
+ 
+ MAJOR_VERSION=@MAJOR_VERSION@
+ MINOR_VERSION=@MINOR_VERSION@
+diff -up dx-4.4.4/src/misc/Makefile.am.r dx-4.4.4/src/misc/Makefile.am
+--- dx-4.4.4/src/misc/Makefile.am.r	2003-07-12 02:12:13.000000000 +0200
++++ dx-4.4.4/src/misc/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -4,7 +4,7 @@ INCLUDES = -I${top_srcdir}/include -D at AR
+ 
+ dxbindir = $(prefix)/bin
+ noinst_PROGRAMS = dxlocal
+-archmakdir = $(prefix)/dx/lib_$(ARCH)
++archmakdir = $(libdir)
+ archmak_DATA = arch.mak
+ 
+ dxlocal_SOURCES = dx.c utils.c
+@@ -15,5 +15,5 @@ install-exec-local: 
+ 	if test ! -z "@INSTALL_BIN_PROGRAM@" ; then		         \
+ 		$(mkinstalldirs) $(prefix)/bin ;                	         \
+ 		$(INSTALL) dxlocal at EXEEXT@ 				         \
+-		$(prefix)/dx/bin_$(ARCH)/@INSTALL_BIN_PROGRAM@@EXEEXT@ ; \
++		$(libdir)/dx/bin_$(ARCH)/@INSTALL_BIN_PROGRAM@@EXEEXT@ ; \
+ 	fi
+diff -up dx-4.4.4/src/uipp/dxl/Makefile.am.r dx-4.4.4/src/uipp/dxl/Makefile.am
+--- dx-4.4.4/src/uipp/dxl/Makefile.am.r	2003-07-12 02:12:16.000000000 +0200
++++ dx-4.4.4/src/uipp/dxl/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@
+ 
+ INCLUDES = -I${top_srcdir}/include  -D at ARCH@
+ 
+-dxlibdir = $(prefix)/dx/lib_ at ARCH@
++dxlibdir = $(libdir)
+ 
+ noinst_HEADERS = \
+ 	dxlP.h \
+diff -up dx-4.4.4/src/uipp/dxui/Makefile.am.r dx-4.4.4/src/uipp/dxui/Makefile.am
+--- dx-4.4.4/src/uipp/dxui/Makefile.am.r	2003-07-12 02:12:17.000000000 +0200
++++ dx-4.4.4/src/uipp/dxui/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -I${srcdir}/../dxuilib -D at ARCH@
+ 
+-dxbindir = $(prefix)/dx/bin_ at ARCH@
++dxbindir = $(libdir)/dx/bin_ at ARCH@
+ dxbin_PROGRAMS = dxui
+ 
+ 
+diff -up dx-4.4.4/src/uipp/java/Makefile.am.r dx-4.4.4/src/uipp/java/Makefile.am
+--- dx-4.4.4/src/uipp/java/Makefile.am.r	2006-03-27 20:06:09.000000000 +0200
++++ dx-4.4.4/src/uipp/java/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -27,12 +27,12 @@
+ ## libtool and the -shrext flag to make this much more 
+ ## portable.
+ 
+-javadxdir = $(prefix)/dx/java/htmlpages
++javadxdir = $(libdir)/dx/java/htmlpages
+ javadx_DATA = dx.jar 
+-javasrvdir = $(prefix)/dx/java/server/class
++javasrvdir = $(libdir)/dx/java/server/class
+ javasrv_DATA = server.jar 
+ EXTRA_DIST = $(DX_SRCS) DXServer.java makeall.java makewrl.java exports.awk README
+-javalibdir = $(prefix)/dx/java/server/lib_ at ARCH@
++javalibdir = $(libdir)/dx/java/server/lib_ at ARCH@
+ 
+ javalib_DATA = @ANYDX@
+ SUBDIRS = server dx layout
+diff -up dx-4.4.4/src/uipp/java/server/macros/Makefile.am.r dx-4.4.4/src/uipp/java/server/macros/Makefile.am
+--- dx-4.4.4/src/uipp/java/server/macros/Makefile.am.r	1999-07-09 21:25:13.000000000 +0200
++++ dx-4.4.4/src/uipp/java/server/macros/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -1,6 +1,6 @@
+ ##  Process this file with automake to produce Makefile.in
+ 
+-serverdatadir = $(prefix)/dx/java/server/dxmacros
++serverdatadir = $(libdir)/dx/java/server/dxmacros
+ 
+ serverdata_DATA = $(MACRO_FILES)
+ 
+diff -up dx-4.4.4/src/uipp/java/server/Makefile.am.r dx-4.4.4/src/uipp/java/server/Makefile.am
+--- dx-4.4.4/src/uipp/java/server/Makefile.am.r	2001-05-21 16:47:39.000000000 +0200
++++ dx-4.4.4/src/uipp/java/server/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -1,6 +1,6 @@
+-srvbindir = $(prefix)/dx/java/server/bin
+-srvoutputdir = $(prefix)/dx/java/output
+-userhtmldir = $(prefix)/dx/java/user
++srvbindir = $(libdir)/dx/java/server/bin
++srvoutputdir = $(libdir)/dx/java/output
++userhtmldir = $(libdir)/dx/java/user
+ # the server script (in srvbindir) will actually cd and run from the class subdir so that java will find the classes
+ # the server will expect to find a file dxserver.paths there to tell the exec where to find .net files
+ srvrundir = $(srvbindir)/../class
+diff -up dx-4.4.4/src/uipp/mb/Makefile.am.r dx-4.4.4/src/uipp/mb/Makefile.am
+--- dx-4.4.4/src/uipp/mb/Makefile.am.r	2003-08-20 16:21:33.000000000 +0200
++++ dx-4.4.4/src/uipp/mb/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -I${srcdir}/../widgets -D at ARCH@
+ 
+-dxbindir = $(prefix)/dx/bin_ at ARCH@
++dxbindir = $(libdir)/dx/bin_ at ARCH@
+ 
+ dxbin_PROGRAMS = builder
+ 
+diff -up dx-4.4.4/src/uipp/prompter/Makefile.am.r dx-4.4.4/src/uipp/prompter/Makefile.am
+--- dx-4.4.4/src/uipp/prompter/Makefile.am.r	2003-11-04 05:20:14.000000000 +0100
++++ dx-4.4.4/src/uipp/prompter/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ INCLUDES =  -I${srcdir}/../base -I${top_srcdir}/include -D at ARCH@
+ 
+-dxbindir = $(prefix)/dx/bin_ at ARCH@
++dxbindir = $(libdir)/dx/bin_ at ARCH@
+ 
+ dxbin_PROGRAMS = prompter
+ 
+diff -up dx-4.4.4/src/uipp/startup/Makefile.am.r dx-4.4.4/src/uipp/startup/Makefile.am
+--- dx-4.4.4/src/uipp/startup/Makefile.am.r	2003-07-12 02:12:29.000000000 +0200
++++ dx-4.4.4/src/uipp/startup/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ INCLUDES =  -I${top_srcdir}/include -I${srcdir}/../base -D at ARCH@
+ 
+-dxbindir = $(prefix)/dx/bin_ at ARCH@
++dxbindir = $(libdir)/dx/bin_ at ARCH@
+ 
+ dxbin_PROGRAMS = startupui
+ 
+diff -up dx-4.4.4/src/uipp/tutor/Makefile.am.r dx-4.4.4/src/uipp/tutor/Makefile.am
+--- dx-4.4.4/src/uipp/tutor/Makefile.am.r	2003-07-12 02:12:29.000000000 +0200
++++ dx-4.4.4/src/uipp/tutor/Makefile.am	2008-09-24 19:14:35.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D at ARCH@
+ 
+-dxbindir = $(prefix)/dx/bin_ at ARCH@
++dxbindir = $(libdir)/dx/bin_ at ARCH@
+ 
+ dxbin_PROGRAMS = tutor
+ 
+diff -up dx-4.4.4/src/uipp/ui/Makefile.am.r dx-4.4.4/src/uipp/ui/Makefile.am
+--- dx-4.4.4/src/uipp/ui/Makefile.am.r	2001-04-12 16:29:02.000000000 +0200
++++ dx-4.4.4/src/uipp/ui/Makefile.am	2008-09-24 19:14:35.000000000 +0200
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
--docdir = $(prefix)/dx/doc
-+docdir = $(datadir)/dx/doc
+-uidatadir = $(prefix)/dx/ui
++uidatadir = $(datadir)/dx/ui
  
- doc_DATA = \
- 	README README_SMP README_alphax README_aviion README_hp700 \
+ DATA1 = \
+ 	icon50.dat icon50.xpm logo.dat logo.xpm ui.mdf Basic2D.cfg Basic2D.net \


Index: dx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dx/devel/dx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dx.spec	19 Feb 2008 20:36:22 -0000	1.8
+++ dx.spec	24 Sep 2008 19:12:06 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Open source version of IBM's Visualization Data Explorer 
 Name: dx
 Version: 4.4.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.opendx.org/
 Group: Applications/Engineering
 Source0: http://opendx.npaci.edu/source/%{name}-%{version}.tar.gz
@@ -57,6 +57,7 @@
 %patch0 -p1 -b .r
 %patch1 -p1 -b .open
 %patch2 -p1 -b .gcc43
+exit 0
 # fix debuginfo rpmlint warnings
 chmod a-x src/exec/{dxmods,dpexec,hwrender}/*.{c,h}
 
@@ -121,6 +122,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Wed Sep 24 2008 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-7
+- rediff patch to fix build with new rpm
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 4.4.4-6
 - Autorebuild for GCC 4.3
 



From caillon at fedoraproject.org  Wed Sep 24 19:32:34 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 19:32:34 +0000 (UTC)
Subject: rpms/gtkmozembedmm/F-9 gtkmozembedmm.spec,1.27,1.28
Message-ID: <20080924193234.07A9D70103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gtkmozembedmm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6382

Modified Files:
	gtkmozembedmm.spec 
Log Message:
fix up BR


Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/F-9/gtkmozembedmm.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gtkmozembedmm.spec	24 Sep 2008 06:15:18 -0000	1.27
+++ gtkmozembedmm.spec	24 Sep 2008 19:32:03 -0000	1.28
@@ -1,4 +1,4 @@
-%define gecko_ver 1.9
+%define gecko_ver 1.9.0.2
 Name:           gtkmozembedmm
 Version:        1.4.2.cvs20060817
 Release:        21%{?dist}
@@ -20,9 +20,7 @@
 BuildRequires:  gnome-vfsmm26 >= 2.12.0
 BuildRequires:  libgnomemm26 >= 2.12.0
 BuildRequires:  libgnomeuimm26-devel >= 2.12.0
-# Use mozilla-devel up to FC5, and gecko-devel for FC6+
-BuildRequires:  xulrunner-devel-unstable >= 1.9
-BuildRequires:  gecko-devel = %{gecko_ver}
+BuildRequires:  gecko-devel-unstable = %{gecko-devel}
 Requires:       gecko-libs = %{gecko_ver}
 BuildRequires:  automake >= 1.10
 BuildRequires:  libtool



From caillon at fedoraproject.org  Wed Sep 24 19:40:41 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 19:40:41 +0000 (UTC)
Subject: rpms/gtkmozembedmm/F-9 gtkmozembedmm.spec,1.28,1.29
Message-ID: <20080924194041.6334870103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gtkmozembedmm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7478

Modified Files:
	gtkmozembedmm.spec 
Log Message:
once more


Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/F-9/gtkmozembedmm.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gtkmozembedmm.spec	24 Sep 2008 19:32:03 -0000	1.28
+++ gtkmozembedmm.spec	24 Sep 2008 19:40:11 -0000	1.29
@@ -20,7 +20,7 @@
 BuildRequires:  gnome-vfsmm26 >= 2.12.0
 BuildRequires:  libgnomemm26 >= 2.12.0
 BuildRequires:  libgnomeuimm26-devel >= 2.12.0
-BuildRequires:  gecko-devel-unstable = %{gecko-devel}
+BuildRequires:  gecko-devel-unstable = %{gecko_ver}
 Requires:       gecko-libs = %{gecko_ver}
 BuildRequires:  automake >= 1.10
 BuildRequires:  libtool



From caillon at fedoraproject.org  Wed Sep 24 19:20:50 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 19:20:50 +0000 (UTC)
Subject: rpms/yelp/devel yelp.spec,1.145,1.146
Message-ID: <20080924192050.63B4F70103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/yelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4851

Modified Files:
	yelp.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 2.24.0-2
- Rebuild against newer gecko



Index: yelp.spec
===================================================================
RCS file: /cvs/extras/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- yelp.spec	22 Sep 2008 17:42:53 -0000	1.145
+++ yelp.spec	24 Sep 2008 19:20:20 -0000	1.146
@@ -12,7 +12,7 @@
 %define libxslt_version 1.1.4
 %define startup_notification_version 0.8
 %define rarian_version 0.7.0
-%define gecko_version 1.9
+%define gecko_version 1.9.0.2
 
 %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: 1%{?dist}
+Release: 2%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.24/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -157,6 +157,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 2.24.0-2
+- Rebuild against newer gecko
+
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
 - Update ot 2.24.0
 



From rathann at fedoraproject.org  Wed Sep 24 19:43:15 2008
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Wed, 24 Sep 2008 19:43:15 +0000 (UTC)
Subject: rpms/dx/devel dx.spec,1.9,1.10
Message-ID: <20080924194315.83E9E70103@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/dx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7715

Modified Files:
	dx.spec 
Log Message:
remove stray exit 0 leftover from testing


Index: dx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dx/devel/dx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dx.spec	24 Sep 2008 19:12:06 -0000	1.9
+++ dx.spec	24 Sep 2008 19:42:45 -0000	1.10
@@ -57,7 +57,6 @@
 %patch0 -p1 -b .r
 %patch1 -p1 -b .open
 %patch2 -p1 -b .gcc43
-exit 0
 # fix debuginfo rpmlint warnings
 chmod a-x src/exec/{dxmods,dpexec,hwrender}/*.{c,h}
 



From s4504kr at fedoraproject.org  Wed Sep 24 19:58:15 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 24 Sep 2008 19:58:15 +0000 (UTC)
Subject: rpms/stellarium/devel .cvsignore, 1.12, 1.13 sources, 1.14,
	1.15 stellarium.desktop, 1.3, 1.4 stellarium.spec, 1.48,
	1.49 stellarium-0.9.1-gcc43.patch, 1.2, NONE
Message-ID: <20080924195815.CD42770103@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9390

Modified Files:
	.cvsignore sources stellarium.desktop stellarium.spec 
Removed Files:
	stellarium-0.9.1-gcc43.patch 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 Jan 2008 16:31:57 -0000	1.12
+++ .cvsignore	24 Sep 2008 19:57:45 -0000	1.13
@@ -1,2 +1,2 @@
-stellarium-0.9.1.tar.gz
-stellarium_user_guide-0.9.0-1.pdf
+stellarium-0.10.0.tgz
+stellarium_user_guide-0.9.1-1.pdf


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	22 Jan 2008 16:31:57 -0000	1.14
+++ sources	24 Sep 2008 19:57:45 -0000	1.15
@@ -1,2 +1,2 @@
-d0d55cb1ff5acd08a4d3b27d953579c0  stellarium-0.9.1.tar.gz
-13370d7553538a803d181b1d3ac13d0e  stellarium_user_guide-0.9.0-1.pdf
+09465fa11a8caab7a4410f1e5ff6eb8c  stellarium-0.10.0.tgz
+0e708c4c0af77712c64b22cbfa398fb4  stellarium_user_guide-0.9.1-1.pdf


Index: stellarium.desktop
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- stellarium.desktop	26 Sep 2007 15:17:31 -0000	1.3
+++ stellarium.desktop	24 Sep 2008 19:57:45 -0000	1.4
@@ -3,7 +3,7 @@
 GenericName=Nightsky renderer
 Comment=A real-time nightsky renderer
 Categories=Education;Science;Astronomy;
-Icon=stellarium.png
+Icon=stellarium
 Exec=stellarium-wrapper
 Terminal=false
 Type=Application


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- stellarium.spec	6 Sep 2008 18:27:05 -0000	1.48
+++ stellarium.spec	24 Sep 2008 19:57:45 -0000	1.49
@@ -1,16 +1,17 @@
+%define guidever 0.9.1-1
+
 Name:           stellarium
-Version:        0.9.1
-Release:        7%{?dist}
+Version:        0.10.0
+Release:        1%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
 License:        GPLv2+
 URL:            http://stellarium.free.fr/
-Source0:        http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/stellarium/stellarium-%{version}.tgz
 Source1:        stellarium.desktop
-Source2:        http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.9.0-1.pdf
+Source2:        http://downloads.sourceforge.net/stellarum/stellarium_user_guide-%{guidever}.pdf
 Patch1:		stellarium-0.9.1-cmake.patch
-Patch3:		stellarium-0.9.1-gcc43.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,7 +47,6 @@
 %prep
 %setup -q
 %patch1 -p1 -b .cm
-%patch3 -p1 -b .gcc43
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -65,12 +65,14 @@
   %{SOURCE1}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 install -m 0644 -p stellarium.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/stellarium.png
-rm $RPM_BUILD_ROOT%{_datadir}/stellarium/data/{icon.bmp,stellarium.ico}
+rm $RPM_BUILD_ROOT%{_datadir}/stellarium/data/stellarium.ico
 cp %{SOURCE2} $RPM_BUILD_DIR/stellarium-%{version}
 
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/stellarium-wrapper
 
 %find_lang %{name}
+%find_lang %{name}-skycultures
+cat %{name}-skycultures.lang >>%{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,16 +85,20 @@
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
+%{_mandir}/man1/stellarium.1.gz
 
 %files doc
 %defattr(-,root,root,-) 
-%doc COPYING stellarium_user_guide-0.9.0-1.pdf
+%doc COPYING stellarium_user_guide-%{guidever}.pdf
 
 %changelog
-* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.1-7
+* Wed Sep 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.10.0-1
+- New upstream release
+
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.1-7
 - fix license tag
 
-* Mon Feb 11 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.1-6
+*  Mon Feb 11 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.1-6
 - Fix gcc-4.3 related issues
 
 * Tue Jan 22 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.1-1


--- stellarium-0.9.1-gcc43.patch DELETED ---



From orion at fedoraproject.org  Wed Sep 24 20:12:37 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 24 Sep 2008 20:12:37 +0000 (UTC)
Subject: rpms/hal/F-8
	hal-0.5.10-fix_invalid_fdi_cache_on_empty_matches.patch, 
	NONE, 1.1 hal.spec, 1.143, 1.144
Message-ID: <20080924201237.36E0D70103@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/hal/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10623

Modified Files:
	hal.spec 
Added Files:
	hal-0.5.10-fix_invalid_fdi_cache_on_empty_matches.patch 
Log Message:
* Wed Sep 24 2008 Orion Poplawski - 0.5.10-5
- Add patch to fix hal crash on Fujitsu laptops (#452701)


hal-0.5.10-fix_invalid_fdi_cache_on_empty_matches.patch:

--- NEW FILE hal-0.5.10-fix_invalid_fdi_cache_on_empty_matches.patch ---
commit 74ce4177ffecf8b455176cdf87e04a817e4c279a
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Sat Dec 22 15:42:54 2007 +0100

    ensure match rules are always stored before writing the jump_position in the cache
    
    When a match rule is empty the expat end callback is called while the match
    rule isn't saved yet. This patch ensures the match rule is saved _before_
    saving the jump_positions, if this is not done then the jump_position will be
    overwritten with 0.
    
    Fixes hal aborting on Fujitsu laptops because the fujitsu fdi contains an
    empty <match /> rule. Reported in
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=456314 and its  dupes

diff --git a/hald/create_cache.c b/hald/create_cache.c
index 37e2d10..882de1b 100644
--- a/hald/create_cache.c
+++ b/hald/create_cache.c
@@ -432,6 +432,11 @@ end (void *data, const char *el){
 
 	if (rtype == RULE_UNKNOWN) return;
 	if (rtype == RULE_MATCH){
+		if (fdi_ctx->rule.rtype == RULE_MATCH) {
+			/* the match rule wasn't stored yet, store it now. So it's stored
+			* _before_ jump_position is written into the cache */
+			store_rule(fdi_ctx);
+		}
 		set_jump_position(fdi_ctx);
 		return;
 	}


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/F-8/hal.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- hal.spec	18 Jul 2008 18:07:01 -0000	1.143
+++ hal.spec	24 Sep 2008 20:12:06 -0000	1.144
@@ -26,13 +26,14 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.10
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Patch0: hal-0.5.10-acltool-serialize.patch
 Patch1: hal-0.5.10-int_outof-fix.patch
 Patch2: hal-0.5.10-fix-memory-leaks.patch
 Patch3: hal-0.5.10-fix-input-spin.patch
+Patch4: hal-0.5.10-fix_invalid_fdi_cache_on_empty_matches.patch
 
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -128,6 +129,7 @@
 %patch1 -p1 -b .int_outof-fix
 %patch2 -p1 -b .memory-leaks-fix
 %patch3 -p1 -b .input-spin
+%patch4 -p1 -b .invalid_fdi_cache_on_empty_matches
 
 %build
 %configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} --with-os-type=redhat --enable-console-kit --enable-policy-kit --enable-acl-management --enable-umount-helper --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject
@@ -240,6 +242,9 @@
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Wed Sep 24 2008 Orion Poplawski - 0.5.10-5
+- Add patch to fix hal crash on Fujitsu laptops (#452701)
+
 * Fri Jul 18 2008 David Zeuthen <davidz at redhat.com> - 0.5.10-4
 - fix runaway input add-on (#452557)
 



From mclasen at fedoraproject.org  Wed Sep 24 20:12:42 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 24 Sep 2008 20:12:42 +0000 (UTC)
Subject: rpms/control-center/devel .cvsignore, 1.81, 1.82 control-center.spec,
	1.395, 1.396 sources, 1.84, 1.85
Message-ID: <20080924201242.9897970103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10599

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
2.24.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- .cvsignore	23 Sep 2008 15:59:38 -0000	1.81
+++ .cvsignore	24 Sep 2008 20:12:12 -0000	1.82
@@ -1 +1 @@
-gnome-control-center-2.24.0.tar.bz2
+gnome-control-center-2.24.0.1.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- control-center.spec	23 Sep 2008 15:59:38 -0000	1.395
+++ control-center.spec	24 Sep 2008 20:12:12 -0000	1.396
@@ -21,12 +21,12 @@
 
 Summary: GNOME Control Center
 Name: control-center
-Version: 2.24.0
+Version: 2.24.0.1
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
-Source: http://download.gnome.org/sources/gnome-control-center/2.23/gnome-control-center-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-control-center/2.24/gnome-control-center-%{version}.tar.bz2
 Source1: org.gnome.control-center.defaultbackground.policy
 
 Patch3: control-center-2.19.3-no-gnome-common.patch
@@ -330,6 +330,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Wed Sep 24 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-1
+- Update to 2.24.0.1
+
 * Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
 - Update to 2.24.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- sources	23 Sep 2008 15:59:38 -0000	1.84
+++ sources	24 Sep 2008 20:12:12 -0000	1.85
@@ -1 +1 @@
-6a4f4037a386bb8988e88033d8251488  gnome-control-center-2.24.0.tar.bz2
+dcaf6e91fddbb1d57d045a4de34ec25c  gnome-control-center-2.24.0.1.tar.bz2



From spot at fedoraproject.org  Wed Sep 24 20:16:13 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 24 Sep 2008 20:16:13 +0000 (UTC)
Subject: rpms/R-RScaLAPACK/devel R-RScaLAPACK-0.5.1-mpicc.patch, NONE,
	1.1 R-RScaLAPACK-0.5.1-openmpi.patch, NONE,
	1.1 R-RScaLAPACK.spec, 1.27, 1.28
Message-ID: <20080924201613.37F0470103@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R-RScaLAPACK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11029

Modified Files:
	R-RScaLAPACK.spec 
Added Files:
	R-RScaLAPACK-0.5.1-mpicc.patch 
	R-RScaLAPACK-0.5.1-openmpi.patch 
Log Message:
apply a lot more duct tape

R-RScaLAPACK-0.5.1-mpicc.patch:

--- NEW FILE R-RScaLAPACK-0.5.1-mpicc.patch ---
diff -up RScaLAPACK/RScaLAPACK/configure.in.orig RScaLAPACK/RScaLAPACK/configure.in
--- RScaLAPACK/RScaLAPACK/configure.in.orig	2008-09-24 15:53:21.000000000 -0400
+++ RScaLAPACK/RScaLAPACK/configure.in	2008-09-24 15:53:48.000000000 -0400
@@ -9,8 +9,8 @@ if test -z "${R_HOME}"; then
    exit 1
 fi
 
-CC=`"${R_HOME}/bin/R" CMD config CC`
-F77=`"${R_HOME}/bin/R" CMD config F77`
+CC="@MPICC@"
+F77="@MPIF77@"
 RCFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS`
 CFLAGS="${RCFLAGS} ${CFLAGS}"
 
diff -up RScaLAPACK/RScaLAPACK/src/Makefile.in.BAD RScaLAPACK/RScaLAPACK/src/Makefile.in
--- RScaLAPACK/RScaLAPACK/src/Makefile.in.BAD	2008-09-24 16:00:34.000000000 -0400
+++ RScaLAPACK/RScaLAPACK/src/Makefile.in	2008-09-24 16:00:41.000000000 -0400
@@ -8,6 +8,8 @@ CFLAGS=@CFLAGS@
 PALIBS=@PALIBS@
 exec_dir=../exec
 
+CC=@MPICC@
+SHLIB_LD=@MPISHLIB_LD@
 PA_OBJECTS=ParallelAgent.o PAdistData.o 
 CR_OBJECTS=CRscalapack.o callpdgesv.o callpdgeqrf.o callpdgesvd.o callpdgemm.o\
 		callpdpotrf.o callpdpotri.o callpdsyevd.o CRcollectData.o \

R-RScaLAPACK-0.5.1-openmpi.patch:

--- NEW FILE R-RScaLAPACK-0.5.1-openmpi.patch ---
diff -up RScaLAPACK/RScaLAPACK/configure.in.BAD RScaLAPACK/RScaLAPACK/configure.in
--- RScaLAPACK/RScaLAPACK/configure.in.BAD	2008-09-24 15:46:22.000000000 -0400
+++ RScaLAPACK/RScaLAPACK/configure.in	2008-09-24 15:47:12.000000000 -0400
@@ -20,7 +20,7 @@ supply_blacs=no
 supply_blas=no
 supply_scalapack=no
 MPI_LAM=no
-MPI_MPICH=no
+MPI_OPENMPI=no
 ATLAS_BLAS=yes
 
 AC_ARG_WITH(mpi,
@@ -150,62 +150,32 @@ else
 fi
 
 if test "${MPI_LAM}" = no; then
-	AC_MSG_CHECKING([for MPICH])
+	AC_MSG_CHECKING([for OPENMPI])
 
-	if test "${supply_mpi}" = yes; then
-		AC_MSG_CHECKING([MPI Libraries in ${MPI_HOME}])
-		
-		if test -d ${MPI_HOME}/lib; then
-			AC_MSG_NOTICE(MPICH2-lib detected @ ${MPI_HOME}..)
-
-				
-			if test -f ${MPI_HOME}/lib/libmpich.a; then
-				PALIBS="-lmpich ${PALIBS}"
-				MPI_MPICH=yes
-			else
-				AC_MSG_NOTICE(libmpich.a not found)
-				MPI_MPICH=no
-			fi
-
-			if test -f ${MPI_HOME}/lib/libfmpich.a; then
-				LIBS="-lfmpich ${PALIBS} ${LIBS}"
-				MPI_MPICH=yes
-			else
-				AC_MSG_NOTICE(libfmpich.a not found)
-				MPI_MPICH=no
-			fi
-
-		else
-			AC_MSG_NOTICE("MPICH2 libraries were not detected @ ${MPI_HOME} ..")
-			MPI_MPICH=no
-		fi
-	else
-
-		AC_SEARCH_LIBS(MPI_Comm_spawn, mpich fmpich,[
-			AC_CHECK_LIB(mpich, MPI_Intercomm_merge,[
-				PALIBS="-lmpich"	
-dnl				LIBS="-lmpich ${LIBS}"	
-				MPI_MPICH=yes
-				],[
-				AC_MSG_ERROR(libmpich.a not found,-1)
-				])
+	AC_SEARCH_LIBS(MPI_Comm_spawn, mpi,[
+		AC_CHECK_LIB(mpi, MPI_Intercomm_merge,[
+			PALIBS="-lmpi"	
+dnl			LIBS="-lmpi ${LIBS}"	
+			MPI_OPENMPI=yes
+			],[
+			AC_MSG_ERROR(libmpi not found,-1)
+			])
 			
-			AC_CHECK_LIB(fmpich, mpi_comm_create__,[
-				LIBS="-lfmpich ${LIBS}"
-				MPI_MPICH=yes
-				],[
-					AC_MSG_ERROR(libfmpich.a not found,-1)
-				])
-				],[
-				AC_MSG_NOTICE([MPICH-Libraries not found ..])
-				MPI_MPICH=no
-			]
-		)
-	fi		
+		AC_CHECK_LIB(mpi_f77, pmpi_comm_create__,[
+			LIBS="-lmpi_f77 ${LIBS}"
+			MPI_OPENMPI=yes
+			],[
+				AC_MSG_ERROR(libmpi_f77 not found,-1)
+			])
+			],[
+			AC_MSG_NOTICE([OPENMPI-Libraries not found ..])
+			MPI_OPENMPI=no
+		]
+	)	
 fi
 
-if test "${MPI_LAM}" = no && test "${MPI_MPICH}" = no; then
-	AC_MSG_ERROR(Neither MPICH nor LAM found ..exiting, -1)
+if test "${MPI_LAM}" = no && test "${MPI_OPENMPI}" = no; then
+	AC_MSG_ERROR(Neither OPENMPI nor LAM found ..exiting, -1)
 fi
 
 if test "${supply_blas}" = yes || test "${supply_scalapack}" = yes; then
@@ -362,8 +332,6 @@ dnl AC_OUTPUT()
 AC_SUBST(PALIBS)
 AC_OUTPUT(src/Makefile)
 
-if test "${MPI_MPICH}" = yes; then
-	AC_OUTPUT(R/StartUpMpich2.R)
-else
+if test "${MPI_LAM}" = yes; then
 	AC_OUTPUT(R/StartUpLam.R)
 fi


Index: R-RScaLAPACK.spec
===================================================================
RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- R-RScaLAPACK.spec	8 Jul 2008 21:40:50 -0000	1.27
+++ R-RScaLAPACK.spec	24 Sep 2008 20:15:42 -0000	1.28
@@ -1,5 +1,4 @@
 %define packname RScaLAPACK
-%define lamdir %{_libdir}/lam/lib
 
 %ifarch x86_64 ia64 ppc64 sparc64
 %define bitsize 64
@@ -9,24 +8,25 @@
 
 Name: R-%{packname}
 Version: 0.5.1
-Release: 15%{?dist}
+Release: 16%{?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: lam-libs, lam-devel, R-devel, tetex-latex, lapack-devel
+BuildRequires: openmpi-devel, R-devel, tetex-latex, lapack-devel, blas-devel
 BuildRequires: gcc-gfortran, blacs-devel, scalapack-devel, autoconf, automake
-Requires: R, scalapack, lam-libs
+Requires: R, scalapack, openmpi-libs
 Requires(post): R
 Requires(postun): R
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: R-RScaLAPACK-0.4.0-lam-mpi-blacs.patch
+Patch0: R-RScaLAPACK-0.5.1-mpi-blacs.patch
 Patch1: R-RScaLAPACK-0.5.1-gcc4.patch
-Patch2: R-RScaLAPACK-0.4.0-lam-mpi-blacs64.patch
 Patch3: R-RScaLAPACK-0.5.1-configurefix.patch
 Patch4: R-RScaLAPACK-0.5.1-blacsfix.patch
 Patch5: R-RScaLAPACK-0.5.1-mpi_comm_create_.patch
+Patch6: R-RScaLAPACK-0.5.1-mpicc.patch
+Patch7: R-RScaLAPACK-0.5.1-openmpi.patch
 
 %description
 R package:
@@ -36,27 +36,36 @@
 
 %prep
 %setup -q -c -n %{packname}
-%ifarch x86_64 ppc64 sparc64 alpha
-%patch2 -p1
-%else
 %patch0 -p1
-%endif
 %patch1 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-
-%build
+%patch6 -p1
+%patch7 -p1
 cd RScaLAPACK
+
+R_CC=`R CMD config CC`
+R_F77=`R CMD config F77`
+R_SHLIB_LD=`R CMD config SHLIB_LD`
+MPICC=`echo $R_CC| sed 's|gcc|mpicc|'`
+MPIF77=`echo $R_F77 | sed 's|gfortran|mpif77|'`
+MPISHLIB_LD=`echo $R_SHLIB_LD | sed 's|gcc|mpicc|'`
+sed -i "s|@MPICC@|$MPICC|g" configure.in
+sed -i "s|@MPIF77@|$MPIF77|g" configure.in
+sed -i "s|@MPICC@|$MPICC|g" src/Makefile.in
+sed -i "s|@MPISHLIB_LD@|$MPISHLIB_LD|" src/Makefile.in
+
 aclocal
 autoconf
 
+%build
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
 . /etc/profile.d/modules.sh
-module load %{_libdir}/lam/lam.module
-%{_bindir}/R CMD INSTALL --configure-args="CFLAGS='$RPM_OPT_FLAGS -I%{_libdir}/lam/include/ -L%{lamdir} -L%{_libdir}/lam/ -lutil -lmpiblacsCinit -lmpiblacs -llam -llamf77mpi -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS -I%{_libdir}/lam/include -L%{lamdir} -L%{_libdir}/lam/ -lutil -llapack -lmpi'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
+%{_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}
 # 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
@@ -79,6 +88,9 @@
 %{_libdir}/R/library/%{packname}/
 
 %changelog
+* Wed Sep 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.1-16
+- use openmpi instead of lam
+
 * Tue Jul  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.1-15
 - look for mpi_comm_create_ not mpi_comm_create__
 



From spot at fedoraproject.org  Wed Sep 24 20:24:40 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 24 Sep 2008 20:24:40 +0000 (UTC)
Subject: rpms/SimGear/devel SimGear-0.3.10-notabbed_value_test.patch, 1.1,
	1.2 SimGear.spec, 1.11, 1.12
Message-ID: <20080924202440.E0D3C70103@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/SimGear/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11653

Modified Files:
	SimGear-0.3.10-notabbed_value_test.patch SimGear.spec 
Log Message:
fix SimGear-0.3.10-notabbed_value_test.patch to apply without fuzz

SimGear-0.3.10-notabbed_value_test.patch:

Index: SimGear-0.3.10-notabbed_value_test.patch
===================================================================
RCS file: /cvs/pkgs/rpms/SimGear/devel/SimGear-0.3.10-notabbed_value_test.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimGear-0.3.10-notabbed_value_test.patch	28 Mar 2007 13:29:12 -0000	1.1
+++ SimGear-0.3.10-notabbed_value_test.patch	24 Sep 2008 20:24:40 -0000	1.2
@@ -1,17 +1,19 @@
---- SimGear-0.3.10/simgear/misc/Makefile.am.BAD	2006-10-04 09:12:29.000000000 -0500
-+++ SimGear-0.3.10/simgear/misc/Makefile.am	2006-10-04 09:12:43.000000000 -0500
-@@ -24,7 +24,7 @@ libsgmisc_la_SOURCES = \
- 
- libsgmisc_la_LDFLAGS = -version-info 1:0:0 -module
+diff -up SimGear-1.0.0/simgear/misc/Makefile.am.orig SimGear-1.0.0/simgear/misc/Makefile.am
+--- SimGear-1.0.0/simgear/misc/Makefile.am.orig	2008-09-24 16:21:37.000000000 -0400
++++ SimGear-1.0.0/simgear/misc/Makefile.am	2008-09-24 16:22:20.000000000 -0400
+@@ -28,7 +28,7 @@ libsgmisc_la_LIBADD = \
+ 	$(top_builddir)/simgear/structure/libsgstructure.la \
+ 	$(top_builddir)/simgear/props/libsgprops.la
  
 -noinst_PROGRAMS = tabbed_value_test swap_test
 +noinst_PROGRAMS = swap_test
  
  tabbed_value_test_SOURCES = tabbed_values_test.cxx
  tabbed_value_test_LDFLAGS = \
---- SimGear-0.3.10/simgear/misc/Makefile.in.BAD	2006-10-04 09:09:48.000000000 -0500
-+++ SimGear-0.3.10/simgear/misc/Makefile.in	2006-10-04 09:13:12.000000000 -0500
-@@ -38,7 +38,7 @@ PRE_UNINSTALL = :
+diff -up SimGear-1.0.0/simgear/misc/Makefile.in.orig SimGear-1.0.0/simgear/misc/Makefile.in
+--- SimGear-1.0.0/simgear/misc/Makefile.in.orig	2008-09-24 16:21:37.000000000 -0400
++++ SimGear-1.0.0/simgear/misc/Makefile.in	2008-09-24 16:21:37.000000000 -0400
+@@ -34,7 +34,7 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@


Index: SimGear.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SimGear/devel/SimGear.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SimGear.spec	13 May 2008 14:42:30 -0000	1.11
+++ SimGear.spec	24 Sep 2008 20:24:40 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		SimGear
 Version:	1.0.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPLv2+
 Group:		System Environment/Libraries
 Summary:	Simulation library components
@@ -110,6 +110,9 @@
 %{_libdir}/libsgxml.so
 
 %changelog
+* 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
+
 * Tue May 13 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.0-4
 - Rebuild for new plib
 



From mclasen at fedoraproject.org  Wed Sep 24 20:24:56 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 24 Sep 2008 20:24:56 +0000 (UTC)
Subject: rpms/gnome-applets/devel .cvsignore, 1.69, 1.70 gnome-applets.spec, 
	1.298, 1.299 sources, 1.75, 1.76
Message-ID: <20080924202456.CA53770103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11611

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
2.24.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	22 Sep 2008 02:56:11 -0000	1.69
+++ .cvsignore	24 Sep 2008 20:24:26 -0000	1.70
@@ -1 +1 @@
-gnome-applets-2.24.0.tar.bz2
+gnome-applets-2.24.0.1.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- gnome-applets.spec	22 Sep 2008 03:06:22 -0000	1.298
+++ gnome-applets.spec	24 Sep 2008 20:24:26 -0000	1.299
@@ -34,8 +34,8 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.24.0
-Release: 	2%{?dist}
+Version:	2.24.0.1
+Release: 	1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -308,6 +308,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Wed Sep 24 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0.1-1
+- Update to 2.24.0.1
+
 * Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-2
 - Update to 2.24.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- sources	22 Sep 2008 02:56:11 -0000	1.75
+++ sources	24 Sep 2008 20:24:26 -0000	1.76
@@ -1,2 +1 @@
-8918f61153093c8032fd672ed6a0abce  gnome-applets-2.24.0.tar.bz2
-ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2
+e6dcab2a0ee9519e8cfb62425d2c1b70  gnome-applets-2.24.0.1.tar.bz2



From mclasen at fedoraproject.org  Wed Sep 24 20:31:37 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 24 Sep 2008 20:31:37 +0000 (UTC)
Subject: rpms/gnome-applets/devel gnome-applets.spec, 1.299, 1.300 sources, 
	1.76, 1.77
Message-ID: <20080924203137.922AA70103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12176

Modified Files:
	gnome-applets.spec sources 
Log Message:
fix sources



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- gnome-applets.spec	24 Sep 2008 20:24:26 -0000	1.299
+++ gnome-applets.spec	24 Sep 2008 20:31:07 -0000	1.300
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.24.0.1
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -308,7 +308,7 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
-* Wed Sep 24 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0.1-1
+* Wed Sep 24 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0.1-2
 - Update to 2.24.0.1
 
 * Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- sources	24 Sep 2008 20:24:26 -0000	1.76
+++ sources	24 Sep 2008 20:31:07 -0000	1.77
@@ -1 +1,2 @@
 e6dcab2a0ee9519e8cfb62425d2c1b70  gnome-applets-2.24.0.1.tar.bz2
+ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2



From notting at fedoraproject.org  Wed Sep 24 20:33:02 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 24 Sep 2008 20:33:02 +0000 (UTC)
Subject: rpms/comps-extras/devel .cvsignore, 1.17, 1.18 comps-extras.spec,
	1.28, 1.29 sources, 1.21, 1.22
Message-ID: <20080924203302.79D8270103@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/comps-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12320

Modified Files:
	.cvsignore comps-extras.spec sources 
Log Message:
Update to 14-1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comps-extras/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	4 Sep 2007 19:57:12 -0000	1.17
+++ .cvsignore	24 Sep 2008 20:32:32 -0000	1.18
@@ -1 +1 @@
-comps-extras-13.tar.gz
+comps-extras-14.tar.gz


Index: comps-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/comps-extras/devel/comps-extras.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- comps-extras.spec	10 Sep 2008 23:31:22 -0000	1.28
+++ comps-extras.spec	24 Sep 2008 20:32:32 -0000	1.29
@@ -1,12 +1,11 @@
 Summary: Images for components included in Fedora
 Name: comps-extras
-Version: 13
-Release: 3
+Version: 14
+Release: 1
 # no upstream source releases; the src.rpm is the source much like 
 # with fedora-release, etc.  anonymous cvs available via
 # cvs -d:pserver:anonymous at rhlinux.redhat.com:/usr/local/CVS co comps-extras
 Source0: %{name}-%{version}.tar.gz
-Source1: sugar-desktop.png
 # while GPL isn't normal for images, it is the case here
 # No version specified.
 # Sugar logo is CC-BY-SA, by One Laptop Per Child, Inc.
@@ -27,7 +26,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/comps/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -38,8 +36,8 @@
 %{_datadir}/pixmaps/comps/*
 
 %changelog
-* Wed Sep 10 2008 Bill Nottingham <notting at redhat.com> - 13-3
-- add a logo for Sugar desktop
+* Wed Sep 24 2008 Bill Nottingham <notting at redhat.com> - 14-1
+- make more echo-y
 
 * Tue Jul 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 13-2
 - fix license tag


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comps-extras/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	4 Sep 2007 19:57:12 -0000	1.21
+++ sources	24 Sep 2008 20:32:32 -0000	1.22
@@ -1 +1 @@
-41e7dc244d279416fd78ddc3ab4810ab  comps-extras-13.tar.gz
+a775957ee08e2a4c3d6a01273bbc53e7  comps-extras-14.tar.gz



From rstrode at fedoraproject.org  Wed Sep 24 20:36:37 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed, 24 Sep 2008 20:36:37 +0000 (UTC)
Subject: rpms/gnome-desktop/devel gnome-desktop-2.23.92-fade.patch, 1.4,
	1.5 gnome-desktop.spec, 1.171, 1.172
Message-ID: <20080924203637.08CDA70103@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12629

Modified Files:
	gnome-desktop-2.23.92-fade.patch gnome-desktop.spec 
Log Message:
- make bg crossfade animation .75 seconds instead of .5


gnome-desktop-2.23.92-fade.patch:

Index: gnome-desktop-2.23.92-fade.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop-2.23.92-fade.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-desktop-2.23.92-fade.patch	22 Sep 2008 16:44:23 -0000	1.4
+++ gnome-desktop-2.23.92-fade.patch	24 Sep 2008 20:36:36 -0000	1.5
@@ -519,7 +519,7 @@
 +
 +	now = get_current_time ();
 +
-+	percent_done = (now - fade->priv->start_time) / .5;
++	percent_done = (now - fade->priv->start_time) / .75;
 +
 +	percent_done = CLAMP (percent_done, 0.0, 1.0);
 +
@@ -535,7 +535,7 @@
 +	 *
 +	 * This means 1) The fade is exponential, not linear (looks good!)
 +	 * 2) The rate of fade is not independent of frame rate. Slower machines
-+	 * will get a slower fade (but never longer than .5 seconds), and
++	 * will get a slower fade (but never longer than .75 seconds), and
 +	 * even the fastest machines will get *some* fade because the framerate
 +	 * is capped.
 +	 */


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- gnome-desktop.spec	24 Sep 2008 18:15:32 -0000	1.171
+++ gnome-desktop.spec	24 Sep 2008 20:36:36 -0000	1.172
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.24.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.24/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -126,6 +126,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Wed Sep 24 2008 Ray Strode <rstrode at redhat.com> - 2.24.0-3
+- make bg crossfade animation .75 seconds instead of .5
+
 * Wed Sep 24 2008 Soren Sandmann <sandmann at redhat.com> - 2.24.0-2
 - Make clone-modes.patch work again
 



From rstrode at fedoraproject.org  Wed Sep 24 20:42:29 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed, 24 Sep 2008 20:42:29 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel
	gnome-settings-daemon-2.23.92-fade.patch, 1.1,
	1.2 gnome-settings-daemon.spec, 1.58, 1.59
Message-ID: <20080924204229.6C79170103@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13344

Modified Files:
	gnome-settings-daemon-2.23.92-fade.patch 
	gnome-settings-daemon.spec 
Log Message:
- Don't draw background twice at startup


gnome-settings-daemon-2.23.92-fade.patch:

Index: gnome-settings-daemon-2.23.92-fade.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon-2.23.92-fade.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-settings-daemon-2.23.92-fade.patch	19 Sep 2008 03:25:26 -0000	1.1
+++ gnome-settings-daemon-2.23.92-fade.patch	24 Sep 2008 20:41:59 -0000	1.2
@@ -1,6 +1,7 @@
---- gnome-settings-daemon-2.23.92/plugins/background/gsd-background-manager.c	2008-08-04 10:25:52.000000000 -0400
-+++ fade/plugins/background/gsd-background-manager.c	2008-09-18 21:48:20.000000000 -0400
-@@ -174,6 +174,7 @@
+diff -up gnome-settings-daemon-2.24.0/plugins/background/gsd-background-manager.c.fade gnome-settings-daemon-2.24.0/plugins/background/gsd-background-manager.c
+--- gnome-settings-daemon-2.24.0/plugins/background/gsd-background-manager.c.fade	2008-08-04 10:25:52.000000000 -0400
++++ gnome-settings-daemon-2.24.0/plugins/background/gsd-background-manager.c	2008-09-24 16:37:50.000000000 -0400
+@@ -174,6 +174,7 @@ draw_background (GsdBackgroundManager *m
                  GdkScreen *screen;
                  GdkWindow *root_window;
                  GdkPixmap *pixmap;
@@ -8,7 +9,7 @@
  
                  screen = gdk_display_get_screen (display, i);
  
-@@ -185,7 +186,9 @@
+@@ -185,7 +186,9 @@ draw_background (GsdBackgroundManager *m
                                                   gdk_screen_get_height (screen),
                                                   TRUE);
  
@@ -19,3 +20,14 @@
  
                  g_object_unref (pixmap);
          }
+@@ -267,9 +270,7 @@ gsd_background_manager_start (GsdBackgro
+                                                        "/apps/nautilus/preferences/show_desktop",
+                                                        NULL);
+ 
+-        if (!nautilus_show_desktop) {
+-                draw_background (manager);
+-        } else {
++        if (nautilus_show_desktop) {
+                 /* even when nautilus is supposedly handling the
+                  * background, apply the settings eventually to make
+                  * people running a nautilus-less session happy */


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gnome-settings-daemon.spec	23 Sep 2008 15:53:50 -0000	1.58
+++ gnome-settings-daemon.spec	24 Sep 2008 20:41:59 -0000	1.59
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.24.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -159,6 +159,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Sep 28 2008 Ray Strode <rstrode at redhat.com> - 2.24.0-2
+- Don't draw background twice at startup
+
 * Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
 - Update to 2.24.0
 



From caillon at fedoraproject.org  Wed Sep 24 21:08:32 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 24 Sep 2008 21:08:32 +0000 (UTC)
Subject: rpms/epiphany-extensions/devel epiphany-extensions.spec,1.48,1.49
Message-ID: <20080924210832.0895570103@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15029

Modified Files:
	epiphany-extensions.spec 
Log Message:
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 2.23.91-2
- Rebuild against newer gecko



Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- epiphany-extensions.spec	8 Sep 2008 02:41:04 -0000	1.48
+++ epiphany-extensions.spec	24 Sep 2008 21:08:01 -0000	1.49
@@ -1,10 +1,10 @@
 %global ephy_major          2.23
 %global ephy_min_version    %{ephy_major}.0
-%global gecko_version       1.9.0.1
+%global gecko_version       1.9.0.2
 
 Name:           epiphany-extensions
 Version:        %{ephy_major}.91
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 2.23.91-2
+- Rebuild against newer gecko
+
 * Sun Sep 07 2008 Peter Gordon <peter at thecodergeek.com> - 2.23.91-1
 - Update to new upstream release (2.23.91)
 - Drop fixes for Ephy 2.23 API bump (applied upstream):



From spot at fedoraproject.org  Wed Sep 24 21:09:05 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 24 Sep 2008 21:09:05 +0000 (UTC)
Subject: rpms/R-RScaLAPACK/devel R-RScaLAPACK-0.5.1-mpi-blacs.patch, NONE,
	1.1 R-RScaLAPACK.spec, 1.28, 1.29
Message-ID: <20080924210905.1019670103@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R-RScaLAPACK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15090

Modified Files:
	R-RScaLAPACK.spec 
Added Files:
	R-RScaLAPACK-0.5.1-mpi-blacs.patch 
Log Message:
apply a lot more duct tape

R-RScaLAPACK-0.5.1-mpi-blacs.patch:

--- NEW FILE R-RScaLAPACK-0.5.1-mpi-blacs.patch ---
diff -up RScaLAPACK/RScaLAPACK/configure.orig RScaLAPACK/RScaLAPACK/configure
--- RScaLAPACK/RScaLAPACK/configure.orig	2005-09-02 10:11:12.000000000 -0400
+++ RScaLAPACK/RScaLAPACK/configure	2008-09-24 14:39:47.000000000 -0400
@@ -3682,13 +3682,13 @@ echo "$as_me: error: libcblacsF77init.a 
 	fi
 else
 
-echo "$as_me:$LINENO: checking for Cblacs_gridexit in -lblacs" >&5
-echo $ECHO_N "checking for Cblacs_gridexit in -lblacs... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for Cblacs_gridexit in -lmpiblacs" >&5
+echo $ECHO_N "checking for Cblacs_gridexit in -lmpiblacs... $ECHO_C" >&6
 if test "${ac_cv_lib_blacs_Cblacs_gridexit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lblacs  $LIBS"
+LIBS="-lmpiblacs  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3751,7 +3751,7 @@ if test $ac_cv_lib_blacs_Cblacs_gridexit
 #define HAVE_LIBBLACS 1
 _ACEOF
 
-  LIBS="-lblacs $LIBS"
+  LIBS="-lmpiblacs $LIBS"
 
 else
 
@@ -3763,13 +3763,13 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking for Cblacs_pinfo in -lblacsCinit" >&5
-echo $ECHO_N "checking for Cblacs_pinfo in -lblacsCinit... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for Cblacs_pinfo in -lmpiblacsCinit" >&5
+echo $ECHO_N "checking for Cblacs_pinfo in -lmpiblacsCinit... $ECHO_C" >&6
 if test "${ac_cv_lib_blacsCinit_Cblacs_pinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lblacsCinit  $LIBS"
+LIBS="-lmpiblacsCinit  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3832,7 +3832,7 @@ if test $ac_cv_lib_blacsCinit_Cblacs_pin
 #define HAVE_LIBBLACSCINIT 1
 _ACEOF
 
-  LIBS="-lblacsCinit $LIBS"
+  LIBS="-lmpiblacsCinit $LIBS"
 
 else
 
@@ -3844,13 +3844,13 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking for blacs_pinfo__ in -lblacsF77init" >&5
-echo $ECHO_N "checking for blacs_pinfo__ in -lblacsF77init... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for blacs_pinfo__ in -lmpiblacsF77init" >&5
+echo $ECHO_N "checking for blacs_pinfo__ in -lmpiblacsF77init... $ECHO_C" >&6
 if test "${ac_cv_lib_blacsF77init_blacs_pinfo__+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lblacsF77init  $LIBS"
+LIBS="-lmpiblacsF77init  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3913,7 +3913,7 @@ if test $ac_cv_lib_blacsF77init_blacs_pi
 #define HAVE_LIBBLACSF77INIT 1
 _ACEOF
 
-  LIBS="-lblacsF77init $LIBS"
+  LIBS="-lmpiblacsF77init $LIBS"
 
 else
 


Index: R-RScaLAPACK.spec
===================================================================
RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- R-RScaLAPACK.spec	24 Sep 2008 20:15:42 -0000	1.28
+++ R-RScaLAPACK.spec	24 Sep 2008 21:08:34 -0000	1.29
@@ -8,7 +8,7 @@
 
 Name: R-%{packname}
 Version: 0.5.1
-Release: 16%{?dist}
+Release: 17%{?dist}
 Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
 License: MIT
 URL: http://cran.r-project.org/contrib
@@ -88,6 +88,9 @@
 %{_libdir}/R/library/%{packname}/
 
 %changelog
+* Wed Sep 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.1-17
+- forgot to add one patch
+
 * Wed Sep 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.1-16
 - use openmpi instead of lam
 



From spot at fedoraproject.org  Wed Sep 24 21:15:30 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 24 Sep 2008 21:15:30 +0000 (UTC)
Subject: rpms/R-RScaLAPACK/devel R-RScaLAPACK.spec,1.29,1.30
Message-ID: <20080924211530.B977670103@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R-RScaLAPACK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15998

Modified Files:
	R-RScaLAPACK.spec 
Log Message:
still more duct tape


Index: R-RScaLAPACK.spec
===================================================================
RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- R-RScaLAPACK.spec	24 Sep 2008 21:08:34 -0000	1.29
+++ R-RScaLAPACK.spec	24 Sep 2008 21:15:00 -0000	1.30
@@ -8,7 +8,7 @@
 
 Name: R-%{packname}
 Version: 0.5.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
 License: MIT
 URL: http://cran.r-project.org/contrib
@@ -64,7 +64,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
-. /etc/profile.d/modules.sh
 %{_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}
 # Clean up in advance of check
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
@@ -88,6 +87,9 @@
 %{_libdir}/R/library/%{packname}/
 
 %changelog
+* Wed Sep 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.1-18
+- ... and forgot to remove one last bit of the lam ick
+
 * Wed Sep 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.1-17
 - forgot to add one patch
 



From davej at fedoraproject.org  Wed Sep 24 21:18:51 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Wed, 24 Sep 2008 21:18:51 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc7-git2.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.929, 1.930 git-linus.diff, 1.10, 1.11 kernel.spec, 1.975,
	1.976 sources, 1.891, 1.892 upstream, 1.803,
	1.804 patch-2.6.27-rc7-git1.bz2.sign, 1.1, NONE
Message-ID: <20080924211851.2DCBA70103@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16431

Modified Files:
	.cvsignore git-linus.diff kernel.spec sources upstream 
Added Files:
	patch-2.6.27-rc7-git2.bz2.sign 
Removed Files:
	patch-2.6.27-rc7-git1.bz2.sign 
Log Message:
2.6.27-rc7-git2


--- NEW FILE patch-2.6.27-rc7-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBI2btFyGugalF9Dw4RAiAPAJ93s22Uupl3MKvLYdXYwUFtQG21dACff6cX
kdpg3h3mv0kp+21nVqs3cik=
=vKVq
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.929
retrieving revision 1.930
diff -u -r1.929 -r1.930
--- .cvsignore	23 Sep 2008 00:39:53 -0000	1.929
+++ .cvsignore	24 Sep 2008 21:18:20 -0000	1.930
@@ -5,4 +5,4 @@
 kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc7.bz2
-patch-2.6.27-rc7-git1.bz2
+patch-2.6.27-rc7-git2.bz2

git-linus.diff:

Index: git-linus.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-linus.diff,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- git-linus.diff	24 Sep 2008 00:54:42 -0000	1.10
+++ git-linus.diff	24 Sep 2008 21:18:20 -0000	1.11
@@ -1,1757 +0,0 @@
-diff --git a/Documentation/DMA-mapping.txt b/Documentation/DMA-mapping.txt
-index b463ecd..c74fec8 100644
---- a/Documentation/DMA-mapping.txt
-+++ b/Documentation/DMA-mapping.txt
-@@ -740,7 +740,7 @@ failure can be determined by:
- 	dma_addr_t dma_handle;
- 
- 	dma_handle = pci_map_single(pdev, addr, size, direction);
--	if (pci_dma_mapping_error(dma_handle)) {
-+	if (pci_dma_mapping_error(pdev, dma_handle)) {
- 		/*
- 		 * reduce current DMA mapping usage,
- 		 * delay and try again later or
-diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
-index 276a7e6..e1ff0d9 100644
---- a/Documentation/sysctl/kernel.txt
-+++ b/Documentation/sysctl/kernel.txt
-@@ -351,9 +351,10 @@ kernel.  This value defaults to SHMMAX.
- 
- softlockup_thresh:
- 
--This value can be used to lower the softlockup tolerance
--threshold. The default threshold is 10s.  If a cpu is locked up
--for 10s, the kernel complains.  Valid values are 1-60s.
-+This value can be used to lower the softlockup tolerance threshold.  The
-+default threshold is 60 seconds.  If a cpu is locked up for 60 seconds,
-+the kernel complains.  Valid values are 1-60 seconds.  Setting this
-+tunable to zero will disable the softlockup detection altogether.
- 
- ==============================================================
- 
-diff --git a/Documentation/usb/anchors.txt b/Documentation/usb/anchors.txt
-index 7304bcf..5e6b64c 100644
---- a/Documentation/usb/anchors.txt
-+++ b/Documentation/usb/anchors.txt
-@@ -42,9 +42,21 @@ This function kills all URBs associated with an anchor. The URBs
- are called in the reverse temporal order they were submitted.
- This way no data can be reordered.
- 
-+usb_unlink_anchored_urbs()
-+--------------------------
-+
-+This function unlinks all URBs associated with an anchor. The URBs
-+are processed in the reverse temporal order they were submitted.
-+This is similar to usb_kill_anchored_urbs(), but it will not sleep.
-+Therefore no guarantee is made that the URBs have been unlinked when
-+the call returns. They may be unlinked later but will be unlinked in
-+finite time.
-+
- usb_wait_anchor_empty_timeout()
- -------------------------------
- 
- This function waits for all URBs associated with an anchor to finish
- or a timeout, whichever comes first. Its return value will tell you
- whether the timeout was reached.
-+
-+
-diff --git a/MAINTAINERS b/MAINTAINERS
-index cad81a2..42ebbfd 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -3833,11 +3833,12 @@ S:	Maintained
- 
- SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT
- P:	Liam Girdwood
--M:	liam.girdwood at wolfsonmicro.com
-+M:	lrg at slimlogic.co.uk
- P:	Mark Brown
- M:	broonie at opensource.wolfsonmicro.com
- T:	git opensource.wolfsonmicro.com/linux-2.6-asoc
- L:	alsa-devel at alsa-project.org (subscribers-only)
-+W:	http://alsa-project.org/main/index.php/ASoC
- S:	Supported
- 
- SPI SUBSYSTEM
-diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
-index d45f215..51b75ce 100644
---- a/arch/ia64/kernel/efi.c
-+++ b/arch/ia64/kernel/efi.c
-@@ -1232,9 +1232,10 @@ efi_initialize_iomem_resources(struct resource *code_resource,
- 				if (md->attribute & EFI_MEMORY_WP) {
- 					name = "System ROM";
- 					flags |= IORESOURCE_READONLY;
--				} else {
-+				} else if (md->attribute == EFI_MEMORY_UC)
-+					name = "Uncached RAM";
-+				else
- 					name = "System RAM";
--				}
- 				break;
- 
- 			case EFI_ACPI_MEMORY_NVS:
-diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
-index c27d5b2..de636b2 100644
---- a/arch/ia64/kernel/setup.c
-+++ b/arch/ia64/kernel/setup.c
-@@ -616,7 +616,9 @@ setup_arch (char **cmdline_p)
- 		ia64_mca_init();
- 
- 	platform_setup(cmdline_p);
-+#ifndef CONFIG_IA64_HP_SIM
- 	check_sal_cache_flush();
-+#endif
- 	paging_init();
- }
- 
-diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
-index f845f15..100ebd5 100644
---- a/arch/sparc64/kernel/of_device.c
-+++ b/arch/sparc64/kernel/of_device.c
-@@ -169,7 +169,7 @@ static unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long fla
- 
- static int of_bus_pci_match(struct device_node *np)
- {
--	if (!strcmp(np->type, "pci") || !strcmp(np->type, "pciex")) {
-+	if (!strcmp(np->name, "pci")) {
- 		const char *model = of_get_property(np, "model", NULL);
- 
- 		if (model && !strcmp(model, "SUNW,simba"))
-@@ -200,7 +200,7 @@ static int of_bus_simba_match(struct device_node *np)
- 	/* Treat PCI busses lacking ranges property just like
- 	 * simba.
- 	 */
--	if (!strcmp(np->type, "pci") || !strcmp(np->type, "pciex")) {
-+	if (!strcmp(np->name, "pci")) {
- 		if (!of_find_property(np, "ranges", NULL))
- 			return 1;
- 	}
-@@ -429,7 +429,7 @@ static int __init use_1to1_mapping(struct device_node *pp)
- 	 * it lacks a ranges property, and this will include
- 	 * cases like Simba.
- 	 */
--	if (!strcmp(pp->type, "pci") || !strcmp(pp->type, "pciex"))
-+	if (!strcmp(pp->name, "pci"))
- 		return 0;
- 
- 	return 1;
-@@ -714,8 +714,7 @@ static unsigned int __init build_one_device_irq(struct of_device *op,
- 				break;
- 			}
- 		} else {
--			if (!strcmp(pp->type, "pci") ||
--			    !strcmp(pp->type, "pciex")) {
-+			if (!strcmp(pp->name, "pci")) {
- 				unsigned int this_orig_irq = irq;
- 
- 				irq = pci_irq_swizzle(dp, pp, irq);
-diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
-index 5509619..80dad76 100644
---- a/arch/sparc64/kernel/pci.c
-+++ b/arch/sparc64/kernel/pci.c
-@@ -425,7 +425,7 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
- 	dev->current_state = 4;		/* unknown power state */
- 	dev->error_state = pci_channel_io_normal;
- 
--	if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {
-+	if (!strcmp(node->name, "pci")) {
- 		/* a PCI-PCI bridge */
- 		dev->hdr_type = PCI_HEADER_TYPE_BRIDGE;
- 		dev->rom_base_reg = PCI_ROM_ADDRESS1;
-diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
-index 69b4d06..042fdc2 100644
---- a/arch/x86/kernel/amd_iommu.c
-+++ b/arch/x86/kernel/amd_iommu.c
-@@ -101,10 +101,10 @@ static int iommu_queue_command(struct amd_iommu *iommu, struct iommu_cmd *cmd)
-  */
- static int iommu_completion_wait(struct amd_iommu *iommu)
- {
--	int ret, ready = 0;
-+	int ret = 0, ready = 0;
- 	unsigned status = 0;
- 	struct iommu_cmd cmd;
--	unsigned long i = 0;
-+	unsigned long flags, i = 0;
- 
- 	memset(&cmd, 0, sizeof(cmd));
- 	cmd.data[0] = CMD_COMPL_WAIT_INT_MASK;
-@@ -112,10 +112,12 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
- 
- 	iommu->need_sync = 0;
- 
--	ret = iommu_queue_command(iommu, &cmd);
-+	spin_lock_irqsave(&iommu->lock, flags);
-+
-+	ret = __iommu_queue_command(iommu, &cmd);
- 
- 	if (ret)
--		return ret;
-+		goto out;
- 
- 	while (!ready && (i < EXIT_LOOP_COUNT)) {
- 		++i;
-@@ -130,6 +132,8 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
- 
- 	if (unlikely((i == EXIT_LOOP_COUNT) && printk_ratelimit()))
- 		printk(KERN_WARNING "AMD IOMMU: Completion wait loop failed\n");
-+out:
-+	spin_unlock_irqrestore(&iommu->lock, flags);
- 
- 	return 0;
- }
-@@ -140,6 +144,7 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
- static int iommu_queue_inv_dev_entry(struct amd_iommu *iommu, u16 devid)
- {
- 	struct iommu_cmd cmd;
-+	int ret;
- 
- 	BUG_ON(iommu == NULL);
- 
-@@ -147,9 +152,11 @@ static int iommu_queue_inv_dev_entry(struct amd_iommu *iommu, u16 devid)
- 	CMD_SET_TYPE(&cmd, CMD_INV_DEV_ENTRY);
- 	cmd.data[0] = devid;
- 
-+	ret = iommu_queue_command(iommu, &cmd);
-+
- 	iommu->need_sync = 1;
- 
--	return iommu_queue_command(iommu, &cmd);
-+	return ret;
- }
- 
- /*
-@@ -159,6 +166,7 @@ static int iommu_queue_inv_iommu_pages(struct amd_iommu *iommu,
- 		u64 address, u16 domid, int pde, int s)
- {
- 	struct iommu_cmd cmd;
-+	int ret;
- 
- 	memset(&cmd, 0, sizeof(cmd));
- 	address &= PAGE_MASK;
-@@ -171,9 +179,11 @@ static int iommu_queue_inv_iommu_pages(struct amd_iommu *iommu,
- 	if (pde) /* PDE bit - we wan't flush everything not only the PTEs */
- 		cmd.data[2] |= CMD_INV_IOMMU_PAGES_PDE_MASK;
- 
-+	ret = iommu_queue_command(iommu, &cmd);
-+
- 	iommu->need_sync = 1;
- 
--	return iommu_queue_command(iommu, &cmd);
-+	return ret;
- }
- 
- /*
-diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
-index 7fc4d5b..876e918 100644
---- a/arch/x86/kernel/process.c
-+++ b/arch/x86/kernel/process.c
-@@ -246,6 +246,14 @@ static int __cpuinit check_c1e_idle(const struct cpuinfo_x86 *c)
- 	return 1;
- }
- 
-+static cpumask_t c1e_mask = CPU_MASK_NONE;
-+static int c1e_detected;
-+
-+void c1e_remove_cpu(int cpu)
-+{
-+	cpu_clear(cpu, c1e_mask);
-+}
-+
- /*
-  * C1E aware idle routine. We check for C1E active in the interrupt
-  * pending message MSR. If we detect C1E, then we handle it the same
-@@ -253,9 +261,6 @@ static int __cpuinit check_c1e_idle(const struct cpuinfo_x86 *c)
-  */
- static void c1e_idle(void)
- {
--	static cpumask_t c1e_mask = CPU_MASK_NONE;
--	static int c1e_detected;
--
- 	if (need_resched())
- 		return;
- 
-@@ -265,8 +270,10 @@ static void c1e_idle(void)
- 		rdmsr(MSR_K8_INT_PENDING_MSG, lo, hi);
- 		if (lo & K8_INTP_C1E_ACTIVE_MASK) {
- 			c1e_detected = 1;
--			mark_tsc_unstable("TSC halt in C1E");
--			printk(KERN_INFO "System has C1E enabled\n");
-+			if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC))
-+				mark_tsc_unstable("TSC halt in AMD C1E");
-+			printk(KERN_INFO "System has AMD C1E enabled\n");
-+			set_cpu_cap(&boot_cpu_data, X86_FEATURE_AMDC1E);
- 		}
- 	}
- 
-diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index 3b7a1dd..4b3cfdf 100644
---- a/arch/x86/kernel/process_32.c
-+++ b/arch/x86/kernel/process_32.c
-@@ -88,6 +88,7 @@ static void cpu_exit_clear(void)
- 	cpu_clear(cpu, cpu_callin_map);
- 
- 	numa_remove_cpu(cpu);
-+	c1e_remove_cpu(cpu);
- }
- 
- /* We don't actually take CPU down, just spin without interrupts. */
-diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
-index 71553b6..e12e0e4 100644
---- a/arch/x86/kernel/process_64.c
-+++ b/arch/x86/kernel/process_64.c
-@@ -93,6 +93,8 @@ DECLARE_PER_CPU(int, cpu_state);
- static inline void play_dead(void)
- {
- 	idle_task_exit();
-+	c1e_remove_cpu(raw_smp_processor_id());
-+
- 	mb();
- 	/* Ack it */
- 	__get_cpu_var(cpu_state) = CPU_DEAD;
-diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
-index 0c029e8..7766d36 100644
---- a/arch/x86/kernel/vsmp_64.c
-+++ b/arch/x86/kernel/vsmp_64.c
-@@ -61,7 +61,7 @@ static void vsmp_irq_enable(void)
- 	native_restore_fl((flags | X86_EFLAGS_IF) & (~X86_EFLAGS_AC));
- }
- 
--static unsigned __init vsmp_patch(u8 type, u16 clobbers, void *ibuf,
-+static unsigned __init_or_module vsmp_patch(u8 type, u16 clobbers, void *ibuf,
- 				  unsigned long addr, unsigned len)
- {
- 	switch (type) {
-diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
-index 0227694..8a5f161 100644
---- a/arch/x86/oprofile/nmi_int.c
-+++ b/arch/x86/oprofile/nmi_int.c
-@@ -295,10 +295,12 @@ static void nmi_cpu_shutdown(void *dummy)
- 
- static void nmi_shutdown(void)
- {
--	struct op_msrs *msrs = &get_cpu_var(cpu_msrs);
-+	struct op_msrs *msrs;
-+
- 	nmi_enabled = 0;
- 	on_each_cpu(nmi_cpu_shutdown, NULL, 1);
- 	unregister_die_notifier(&profile_exceptions_nb);
-+	msrs = &get_cpu_var(cpu_msrs);
- 	model->shutdown(msrs);
- 	free_msrs();
- 	put_cpu_var(cpu_msrs);
-diff --git a/drivers/net/wireless/ath9k/core.c b/drivers/net/wireless/ath9k/core.c
-index f6c4528..c049593 100644
---- a/drivers/net/wireless/ath9k/core.c
-+++ b/drivers/net/wireless/ath9k/core.c
-@@ -294,8 +294,6 @@ static int ath_stop(struct ath_softc *sc)
- 	 * hardware is gone (invalid).
- 	 */
- 
--	if (!sc->sc_invalid)
--		ath9k_hw_set_interrupts(ah, 0);
- 	ath_draintxq(sc, false);
- 	if (!sc->sc_invalid) {
- 		ath_stoprecv(sc);
-@@ -1336,6 +1334,8 @@ void ath_deinit(struct ath_softc *sc)
- 
- 	DPRINTF(sc, ATH_DBG_CONFIG, "%s\n", __func__);
- 
-+	tasklet_kill(&sc->intr_tq);
-+	tasklet_kill(&sc->bcon_tasklet);
- 	ath_stop(sc);
- 	if (!sc->sc_invalid)
- 		ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_AWAKE);
-diff --git a/drivers/net/wireless/ath9k/core.h b/drivers/net/wireless/ath9k/core.h
-index 4ee695b..2f84093 100644
---- a/drivers/net/wireless/ath9k/core.h
-+++ b/drivers/net/wireless/ath9k/core.h
-@@ -974,7 +974,6 @@ struct ath_softc {
- 	u32 sc_keymax;		/* size of key cache */
- 	DECLARE_BITMAP(sc_keymap, ATH_KEYMAX);	/* key use bit map */
- 	u8 sc_splitmic;		/* split TKIP MIC keys */
--	int sc_keytype;
- 
- 	/* RX */
- 	struct list_head sc_rxbuf;
-diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
-index 99badf1..acebdf1 100644
---- a/drivers/net/wireless/ath9k/main.c
-+++ b/drivers/net/wireless/ath9k/main.c
-@@ -206,8 +206,6 @@ static int ath_key_config(struct ath_softc *sc,
- 	if (!ret)
- 		return -EIO;
- 
--	if (mac)
--		sc->sc_keytype = hk.kv_type;
- 	return 0;
- }
- 
-@@ -778,7 +776,6 @@ static int ath9k_set_key(struct ieee80211_hw *hw,
- 	case DISABLE_KEY:
- 		ath_key_delete(sc, key);
- 		clear_bit(key->keyidx, sc->sc_keymap);
--		sc->sc_keytype = ATH9K_CIPHER_CLR;
- 		break;
- 	default:
- 		ret = -EINVAL;
-@@ -1414,10 +1411,17 @@ static void ath_pci_remove(struct pci_dev *pdev)
- {
- 	struct ieee80211_hw *hw = pci_get_drvdata(pdev);
- 	struct ath_softc *sc = hw->priv;
-+	enum ath9k_int status;
- 
--	if (pdev->irq)
-+	if (pdev->irq) {
-+		ath9k_hw_set_interrupts(sc->sc_ah, 0);
-+		/* clear the ISR */
-+		ath9k_hw_getisr(sc->sc_ah, &status);
-+		sc->sc_invalid = 1;
- 		free_irq(pdev->irq, sc);
-+	}
- 	ath_detach(sc);
-+
- 	pci_iounmap(pdev, sc->mem);
- 	pci_release_region(pdev, 0);
- 	pci_disable_device(pdev);
-diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c
-index 550129f..8b332e1 100644
---- a/drivers/net/wireless/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath9k/xmit.c
-@@ -315,11 +315,11 @@ static int ath_tx_prepare(struct ath_softc *sc,
- 		txctl->keyix = tx_info->control.hw_key->hw_key_idx;
- 		txctl->frmlen += tx_info->control.icv_len;
- 
--		if (sc->sc_keytype == ATH9K_CIPHER_WEP)
-+		if (tx_info->control.hw_key->alg == ALG_WEP)
- 			txctl->keytype = ATH9K_KEY_TYPE_WEP;
--		else if (sc->sc_keytype == ATH9K_CIPHER_TKIP)
-+		else if (tx_info->control.hw_key->alg == ALG_TKIP)
- 			txctl->keytype = ATH9K_KEY_TYPE_TKIP;
--		else if (sc->sc_keytype == ATH9K_CIPHER_AES_CCM)
-+		else if (tx_info->control.hw_key->alg == ALG_CCMP)
- 			txctl->keytype = ATH9K_KEY_TYPE_AES;
- 	}
- 
-diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
-index da8b743..a60ae86 100644
---- a/drivers/net/wireless/zd1211rw/zd_usb.c
-+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
-@@ -58,6 +58,7 @@ static struct usb_device_id usb_ids[] = {
- 	{ USB_DEVICE(0x0586, 0x3407), .driver_info = DEVICE_ZD1211 },
- 	{ USB_DEVICE(0x129b, 0x1666), .driver_info = DEVICE_ZD1211 },
- 	{ USB_DEVICE(0x157e, 0x300a), .driver_info = DEVICE_ZD1211 },
-+	{ USB_DEVICE(0x0105, 0x145f), .driver_info = DEVICE_ZD1211 },
- 	/* ZD1211B */
- 	{ USB_DEVICE(0x0ace, 0x1215), .driver_info = DEVICE_ZD1211B },
- 	{ USB_DEVICE(0x157e, 0x300d), .driver_info = DEVICE_ZD1211B },
-diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
-index 9a7c9e1..851f5b8 100644
---- a/drivers/pci/pcie/aspm.c
-+++ b/drivers/pci/pcie/aspm.c
-@@ -527,7 +527,7 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
- 		 */
- 		pci_read_config_dword(child_dev, child_pos + PCI_EXP_DEVCAP,
- 			&reg32);
--		if (!(reg32 & PCI_EXP_DEVCAP_RBER && !aspm_force)) {
-+		if (!(reg32 & PCI_EXP_DEVCAP_RBER) && !aspm_force) {
- 			printk("Pre-1.1 PCIe device detected, "
- 				"disable ASPM for %s. It can be enabled forcedly"
- 				" with 'pcie_aspm=force'\n", pci_name(pdev));
-diff --git a/drivers/pci/search.c b/drivers/pci/search.c
-index 3b3b5f1..4edfc47 100644
---- a/drivers/pci/search.c
-+++ b/drivers/pci/search.c
-@@ -162,7 +162,7 @@ EXPORT_SYMBOL(pci_find_slot);
-  * time.
-  */
- struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device,
--				const struct pci_dev *from)
-+				struct pci_dev *from)
- {
- 	struct pci_dev *pdev;
- 
-@@ -263,7 +263,7 @@ static int match_pci_dev_by_id(struct device *dev, void *data)
-  * this file.
-  */
- static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
--					 const struct pci_dev *from)
-+					 struct pci_dev *from)
- {
- 	struct device *dev;
- 	struct device *dev_start = NULL;
-@@ -303,7 +303,7 @@ static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
-  */
- struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device,
- 			       unsigned int ss_vendor, unsigned int ss_device,
--			       const struct pci_dev *from)
-+			       struct pci_dev *from)
- {
- 	struct pci_dev *pdev;
- 	struct pci_device_id *id;
-diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
-index 3a6da80..61fb8b6 100644
---- a/drivers/serial/atmel_serial.c
-+++ b/drivers/serial/atmel_serial.c
-@@ -131,7 +131,8 @@ struct atmel_uart_char {
- struct atmel_uart_port {
- 	struct uart_port	uart;		/* uart */
- 	struct clk		*clk;		/* uart clock */
--	unsigned short		suspended;	/* is port suspended? */
-+	int			may_wakeup;	/* cached value of device_may_wakeup for times we need to disable it */
-+	u32			backup_imr;	/* IMR saved during suspend */
- 	int			break_active;	/* break being received */
- 
- 	short			use_dma_rx;	/* enable PDC receiver */
-@@ -984,8 +985,15 @@ static void atmel_serial_pm(struct uart_port *port, unsigned int state,
- 		 * This is called on uart_open() or a resume event.
- 		 */
- 		clk_enable(atmel_port->clk);
-+
-+		/* re-enable interrupts if we disabled some on suspend */
-+		UART_PUT_IER(port, atmel_port->backup_imr);
- 		break;
- 	case 3:
-+		/* Back up the interrupt mask and disable all interrupts */
-+		atmel_port->backup_imr = UART_GET_IMR(port);
-+		UART_PUT_IDR(port, -1);
-+
- 		/*
- 		 * Disable the peripheral clock for this serial port.
- 		 * This is called on uart_close() or a suspend event.
-@@ -1475,13 +1483,12 @@ static int atmel_serial_suspend(struct platform_device *pdev,
- 			cpu_relax();
- 	}
- 
--	if (device_may_wakeup(&pdev->dev)
--	    && !atmel_serial_clk_will_stop())
--		enable_irq_wake(port->irq);
--	else {
--		uart_suspend_port(&atmel_uart, port);
--		atmel_port->suspended = 1;
--	}
-+	/* we can not wake up if we're running on slow clock */
-+	atmel_port->may_wakeup = device_may_wakeup(&pdev->dev);
-+	if (atmel_serial_clk_will_stop())
-+		device_set_wakeup_enable(&pdev->dev, 0);
-+
-+	uart_suspend_port(&atmel_uart, port);
- 
- 	return 0;
- }
-@@ -1491,11 +1498,8 @@ static int atmel_serial_resume(struct platform_device *pdev)
- 	struct uart_port *port = platform_get_drvdata(pdev);
- 	struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
- 
--	if (atmel_port->suspended) {
--		uart_resume_port(&atmel_uart, port);
--		atmel_port->suspended = 0;
--	} else
--		disable_irq_wake(port->irq);
-+	uart_resume_port(&atmel_uart, port);
-+	device_set_wakeup_enable(&pdev->dev, atmel_port->may_wakeup);
- 
- 	return 0;
- }
-@@ -1513,6 +1517,8 @@ static int __devinit atmel_serial_probe(struct platform_device *pdev)
- 	BUILD_BUG_ON(!is_power_of_2(ATMEL_SERIAL_RINGSIZE));
- 
- 	port = &atmel_ports[pdev->id];
-+	port->backup_imr = 0;
-+
- 	atmel_init_port(port, pdev);
- 
- 	if (!atmel_use_dma_rx(&port->uart)) {
-diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
-index 8abd4e5..8ab389d 100644
---- a/drivers/usb/core/hcd.c
-+++ b/drivers/usb/core/hcd.c
-@@ -1876,7 +1876,8 @@ int usb_add_hcd(struct usb_hcd *hcd,
- 		 * with IRQF_SHARED. As usb_hcd_irq() will always disable
- 		 * interrupts we can remove it here.
- 		 */
--		irqflags &= ~IRQF_DISABLED;
-+		if (irqflags & IRQF_SHARED)
-+			irqflags &= ~IRQF_DISABLED;
- 
- 		snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d",
- 				hcd->driver->description, hcd->self.busnum);
-diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 6a5cb01..d999638 100644
---- a/drivers/usb/core/hub.c
-+++ b/drivers/usb/core/hub.c
-@@ -2683,35 +2683,17 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
- 				USB_PORT_STAT_C_ENABLE);
- #endif
- 
--	/* Try to use the debounce delay for protection against
--	 * port-enable changes caused, for example, by EMI.
--	 */
--	if (portchange & (USB_PORT_STAT_C_CONNECTION |
--				USB_PORT_STAT_C_ENABLE)) {
--		status = hub_port_debounce(hub, port1);
--		if (status < 0) {
--			if (printk_ratelimit())
--				dev_err (hub_dev, "connect-debounce failed, "
--						"port %d disabled\n", port1);
--			portstatus &= ~USB_PORT_STAT_CONNECTION;
--		} else {
--			portstatus = status;
--		}
--	}
--
- 	/* Try to resuscitate an existing device */
- 	udev = hdev->children[port1-1];
- 	if ((portstatus & USB_PORT_STAT_CONNECTION) && udev &&
- 			udev->state != USB_STATE_NOTATTACHED) {
--
- 		usb_lock_device(udev);
- 		if (portstatus & USB_PORT_STAT_ENABLE) {
- 			status = 0;		/* Nothing to do */
--		} else if (!udev->persist_enabled) {
--			status = -ENODEV;	/* Mustn't resuscitate */
- 
- #ifdef CONFIG_USB_SUSPEND
--		} else if (udev->state == USB_STATE_SUSPENDED) {
-+		} else if (udev->state == USB_STATE_SUSPENDED &&
-+				udev->persist_enabled) {
- 			/* For a suspended device, treat this as a
- 			 * remote wakeup event.
- 			 */
-@@ -2726,7 +2708,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
- #endif
- 
- 		} else {
--			status = usb_reset_device(udev);
-+			status = -ENODEV;	/* Don't resuscitate */
- 		}
- 		usb_unlock_device(udev);
- 
-@@ -2741,6 +2723,19 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
- 		usb_disconnect(&hdev->children[port1-1]);
- 	clear_bit(port1, hub->change_bits);
- 
-+	if (portchange & (USB_PORT_STAT_C_CONNECTION |
-+				USB_PORT_STAT_C_ENABLE)) {
-+		status = hub_port_debounce(hub, port1);
-+		if (status < 0) {
-+			if (printk_ratelimit())
-+				dev_err(hub_dev, "connect-debounce failed, "
-+						"port %d disabled\n", port1);
-+			portstatus &= ~USB_PORT_STAT_CONNECTION;
-+		} else {
-+			portstatus = status;
-+		}
-+	}
-+
- 	/* Return now if debouncing failed or nothing is connected */
- 	if (!(portstatus & USB_PORT_STAT_CONNECTION)) {
- 
-@@ -2748,7 +2743,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
- 		if ((wHubCharacteristics & HUB_CHAR_LPSM) < 2
- 				&& !(portstatus & (1 << USB_PORT_FEAT_POWER)))
- 			set_port_feature(hdev, port1, USB_PORT_FEAT_POWER);
-- 
-+
- 		if (portstatus & USB_PORT_STAT_ENABLE)
-   			goto done;
- 		return;
-diff --git a/drivers/usb/gadget/fsl_usb2_udc.c b/drivers/usb/gadget/fsl_usb2_udc.c
-index 1cfccf1..45ad556 100644
---- a/drivers/usb/gadget/fsl_usb2_udc.c
-+++ b/drivers/usb/gadget/fsl_usb2_udc.c
-@@ -223,7 +223,7 @@ static int dr_controller_setup(struct fsl_udc *udc)
- 	fsl_writel(tmp, &dr_regs->endpointlistaddr);
- 
- 	VDBG("vir[qh_base] is %p phy[qh_base] is 0x%8x reg is 0x%8x",
--		(int)udc->ep_qh, (int)tmp,
-+		udc->ep_qh, (int)tmp,
- 		fsl_readl(&dr_regs->endpointlistaddr));
- 
- 	/* Config PHY interface */
-diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
-index 574c538..bb54cca 100644
---- a/drivers/usb/gadget/omap_udc.c
-+++ b/drivers/usb/gadget/omap_udc.c
-@@ -787,7 +787,7 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel)
- 			omap_set_dma_dest_params(ep->lch,
- 				OMAP_DMA_PORT_TIPB,
- 				OMAP_DMA_AMODE_CONSTANT,
--				(unsigned long) io_v2p(UDC_DATA_DMA),
-+				UDC_DATA_DMA,
- 				0, 0);
- 		}
- 	} else {
-@@ -804,7 +804,7 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel)
- 			omap_set_dma_src_params(ep->lch,
- 				OMAP_DMA_PORT_TIPB,
- 				OMAP_DMA_AMODE_CONSTANT,
--				(unsigned long) io_v2p(UDC_DATA_DMA),
-+				UDC_DATA_DMA,
- 				0, 0);
- 			/* EMIFF or SDRC */
- 			omap_set_dma_dest_burst_mode(ep->lch,
-diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
-index d9d53f2..8409e07 100644
---- a/drivers/usb/host/ehci-hcd.c
-+++ b/drivers/usb/host/ehci-hcd.c
-@@ -145,16 +145,6 @@ static int handshake (struct ehci_hcd *ehci, void __iomem *ptr,
- 	return -ETIMEDOUT;
- }
- 
--static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr,
--				       u32 mask, u32 done, int usec)
--{
--	int error = handshake(ehci, ptr, mask, done, usec);
--	if (error)
--		ehci_to_hcd(ehci)->state = HC_STATE_HALT;
--
--	return error;
--}
--
- /* force HC to halt state from unknown (EHCI spec section 2.3) */
- static int ehci_halt (struct ehci_hcd *ehci)
- {
-@@ -173,6 +163,22 @@ static int ehci_halt (struct ehci_hcd *ehci)
- 			  STS_HALT, STS_HALT, 16 * 125);
- }
- 
-+static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr,
-+				       u32 mask, u32 done, int usec)
-+{
-+	int error;
-+
-+	error = handshake(ehci, ptr, mask, done, usec);
-+	if (error) {
-+		ehci_halt(ehci);
-+		ehci_to_hcd(ehci)->state = HC_STATE_HALT;
-+		ehci_err(ehci, "force halt; handhake %p %08x %08x -> %d\n",
-+			ptr, mask, done, error);
-+	}
-+
-+	return error;
-+}
-+
- /* put TDI/ARC silicon into EHCI mode */
- static void tdi_reset (struct ehci_hcd *ehci)
- {
-diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
-index b7853c8..4a0c5a7 100644
---- a/drivers/usb/host/ehci-sched.c
-+++ b/drivers/usb/host/ehci-sched.c
-@@ -437,6 +437,9 @@ static int enable_periodic (struct ehci_hcd *ehci)
- 	u32	cmd;
- 	int	status;
- 
-+	if (ehci->periodic_sched++)
-+		return 0;
-+
- 	/* did clearing PSE did take effect yet?
- 	 * takes effect only at frame boundaries...
- 	 */
-@@ -461,6 +464,9 @@ static int disable_periodic (struct ehci_hcd *ehci)
- 	u32	cmd;
- 	int	status;
- 
-+	if (--ehci->periodic_sched)
-+		return 0;
-+
- 	/* did setting PSE not take effect yet?
- 	 * takes effect only at frame boundaries...
- 	 */
-@@ -544,13 +550,10 @@ static int qh_link_periodic (struct ehci_hcd *ehci, struct ehci_qh *qh)
- 		: (qh->usecs * 8);
- 
- 	/* maybe enable periodic schedule processing */
--	if (!ehci->periodic_sched++)
--		return enable_periodic (ehci);
--
--	return 0;
-+	return enable_periodic(ehci);
- }
- 
--static void qh_unlink_periodic (struct ehci_hcd *ehci, struct ehci_qh *qh)
-+static int qh_unlink_periodic(struct ehci_hcd *ehci, struct ehci_qh *qh)
- {
- 	unsigned	i;
- 	unsigned	period;
-@@ -586,9 +589,7 @@ static void qh_unlink_periodic (struct ehci_hcd *ehci, struct ehci_qh *qh)
- 	qh_put (qh);
- 
- 	/* maybe turn off periodic schedule */
--	ehci->periodic_sched--;
--	if (!ehci->periodic_sched)
--		(void) disable_periodic (ehci);
-+	return disable_periodic(ehci);
- }
- 
- static void intr_deschedule (struct ehci_hcd *ehci, struct ehci_qh *qh)
-@@ -1562,9 +1563,7 @@ itd_link_urb (
- 	urb->hcpriv = NULL;
- 
- 	timer_action (ehci, TIMER_IO_WATCHDOG);
--	if (unlikely (!ehci->periodic_sched++))
--		return enable_periodic (ehci);
--	return 0;
-+	return enable_periodic(ehci);
- }
- 
- #define	ISO_ERRS (EHCI_ISOC_BUF_ERR | EHCI_ISOC_BABBLE | EHCI_ISOC_XACTERR)
-@@ -1642,7 +1641,7 @@ itd_complete (
- 	ehci_urb_done(ehci, urb, 0);
- 	retval = true;
- 	urb = NULL;
--	ehci->periodic_sched--;
-+	(void) disable_periodic(ehci);
- 	ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--;
- 
- 	if (unlikely (list_empty (&stream->td_list))) {
-@@ -1951,9 +1950,7 @@ sitd_link_urb (
- 	urb->hcpriv = NULL;
- 
- 	timer_action (ehci, TIMER_IO_WATCHDOG);
--	if (!ehci->periodic_sched++)
--		return enable_periodic (ehci);
--	return 0;
-+	return enable_periodic(ehci);
- }
- 
- /*-------------------------------------------------------------------------*/
-@@ -2019,7 +2016,7 @@ sitd_complete (
- 	ehci_urb_done(ehci, urb, 0);
- 	retval = true;
- 	urb = NULL;
--	ehci->periodic_sched--;
-+	(void) disable_periodic(ehci);
- 	ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--;
- 
- 	if (list_empty (&stream->td_list)) {
-@@ -2243,8 +2240,7 @@ restart:
- 			if (unlikely (modified)) {
- 				if (likely(ehci->periodic_sched > 0))
- 					goto restart;
--				/* maybe we can short-circuit this scan! */
--				disable_periodic(ehci);
-+				/* short-circuit this scan */
- 				now_uframe = clock;
- 				break;
- 			}
-diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
-index a001748..58b2b8f 100644
---- a/drivers/usb/musb/Kconfig
-+++ b/drivers/usb/musb/Kconfig
-@@ -9,6 +9,7 @@ comment "Enable Host or Gadget support to see Inventra options"
- # (M)HDRC = (Multipoint) Highspeed Dual-Role Controller
- config USB_MUSB_HDRC
- 	depends on (USB || USB_GADGET) && HAVE_CLK
-+	depends on !SUPERH
- 	select TWL4030_USB if MACH_OMAP_3430SDP
- 	tristate 'Inventra Highspeed Dual Role Controller (TI, ...)'
- 	help
-diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
-index c5b8f02..128e949 100644
---- a/drivers/usb/musb/musb_core.c
-+++ b/drivers/usb/musb/musb_core.c
-@@ -100,8 +100,8 @@
- #include <linux/io.h>
- 
- #ifdef	CONFIG_ARM
--#include <asm/arch/hardware.h>
--#include <asm/arch/memory.h>
-+#include <mach/hardware.h>
-+#include <mach/memory.h>
- #include <asm/mach-types.h>
- #endif
- 
-diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
-index 298b22e..9d2dcb1 100644
---- a/drivers/usb/musb/omap2430.c
-+++ b/drivers/usb/musb/omap2430.c
-@@ -35,8 +35,8 @@
- #include <linux/io.h>
- 
- #include <asm/mach-types.h>
--#include <asm/arch/hardware.h>
--#include <asm/arch/mux.h>
-+#include <mach/hardware.h>
-+#include <mach/mux.h>
- 
- #include "musb_core.h"
- #include "omap2430.h"
-diff --git a/drivers/usb/musb/omap2430.h b/drivers/usb/musb/omap2430.h
-index 786a620..dc76707 100644
---- a/drivers/usb/musb/omap2430.h
-+++ b/drivers/usb/musb/omap2430.h
-@@ -11,8 +11,8 @@
- #define __MUSB_OMAP243X_H__
- 
- #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430)
--#include <asm/arch/hardware.h>
--#include <asm/arch/usb.h>
-+#include <mach/hardware.h>
-+#include <mach/usb.h>
- 
- /*
-  * OMAP2430-specific definitions
-diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
-index 442cba6..1279553 100644
---- a/drivers/usb/serial/cp2101.c
-+++ b/drivers/usb/serial/cp2101.c
-@@ -72,6 +72,7 @@ static struct usb_device_id id_table [] = {
- 	{ USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */
- 	{ USB_DEVICE(0x10C4, 0x80DD) }, /* Tracient RFID */
- 	{ USB_DEVICE(0x10C4, 0x80F6) }, /* Suunto sports instrument */
-+	{ USB_DEVICE(0x10C4, 0x8115) }, /* Arygon NFC/Mifare Reader */
- 	{ USB_DEVICE(0x10C4, 0x813D) }, /* Burnside Telecom Deskmobile */
- 	{ USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */
- 	{ USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */
-@@ -83,6 +84,7 @@ static struct usb_device_id id_table [] = {
- 	{ USB_DEVICE(0x10C4, 0x81E7) }, /* Aerocomm Radio */
- 	{ USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */
- 	{ USB_DEVICE(0x10c4, 0x8293) }, /* Telegesys ETRX2USB */
-+	{ USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */
- 	{ USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
- 	{ USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
- 	{ USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */
-@@ -93,6 +95,7 @@ static struct usb_device_id id_table [] = {
- 	{ USB_DEVICE(0x13AD, 0x9999) }, /* Baltech card reader */
- 	{ USB_DEVICE(0x166A, 0x0303) }, /* Clipsal 5500PCU C-Bus USB interface */
- 	{ USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */
-+	{ USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */
- 	{ } /* Terminating Entry */
- };
- 
-diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
-index 984f6ef..3dc93b5 100644
---- a/drivers/usb/serial/ftdi_sio.c
-+++ b/drivers/usb/serial/ftdi_sio.c
-@@ -654,6 +654,9 @@ static struct usb_device_id id_table_combined [] = {
- 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
- 	{ USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) },
- 	{ USB_DEVICE(FTDI_VID, FTDI_REU_TINY_PID) },
-+	{ USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO4x4_PID) },
-+	{ USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DGQG_PID) },
-+	{ USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DUSB_PID) },
- 	{ },					/* Optional parameter entry */
- 	{ }					/* Terminating entry */
- };
-diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
-index 382265b..8a5b6df 100644
---- a/drivers/usb/serial/ftdi_sio.h
-+++ b/drivers/usb/serial/ftdi_sio.h
-@@ -750,6 +750,7 @@
- 
- #define PAPOUCH_VID			0x5050	/* Vendor ID */
- #define PAPOUCH_TMU_PID			0x0400	/* TMU USB Thermometer */
-+#define PAPOUCH_QUIDO4x4_PID		0x0900	/* Quido 4/4 Module */
- 
- /*
-  * ACG Identification Technologies GmbH products (http://www.acg.de/).
-@@ -838,6 +839,10 @@
- /* Rig Expert Ukraine devices */
- #define FTDI_REU_TINY_PID		0xED22	/* RigExpert Tiny */
- 
-+/* Domintell products  http://www.domintell.com */
-+#define FTDI_DOMINTELL_DGQG_PID	0xEF50	/* Master */
-+#define FTDI_DOMINTELL_DUSB_PID	0xEF51	/* DUSB01 module */
-+
- /* Commands */
- #define FTDI_SIO_RESET 		0 /* Reset the port */
- #define FTDI_SIO_MODEM_CTRL 	1 /* Set the modem control register */
-diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
-index 9f9cd36..73f8277 100644
---- a/drivers/usb/serial/option.c
-+++ b/drivers/usb/serial/option.c
-@@ -218,6 +218,7 @@ static int  option_send_setup(struct tty_struct *tty, struct usb_serial_port *po
- /* ZTE PRODUCTS */
- #define ZTE_VENDOR_ID				0x19d2
- #define ZTE_PRODUCT_MF628			0x0015
-+#define ZTE_PRODUCT_CDMA_TECH			0xfffe
- 
- static struct usb_device_id option_ids[] = {
- 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
-@@ -347,6 +348,7 @@ static struct usb_device_id option_ids[] = {
- 	{ USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */
- 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) },
- 	{ USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) },
-+	{ USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) },
- 	{ } /* Terminating entry */
- };
- MODULE_DEVICE_TABLE(usb, option_ids);
-diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
-index 7060337..ea1a103 100644
---- a/drivers/usb/serial/sierra.c
-+++ b/drivers/usb/serial/sierra.c
-@@ -14,7 +14,7 @@
-   Whom based his on the Keyspan driver by Hugh Blemings <hugh at blemings.org>
- */
- 
--#define DRIVER_VERSION "v.1.2.13a"
-+#define DRIVER_VERSION "v.1.3.2"
- #define DRIVER_AUTHOR "Kevin Lloyd <klloyd at sierrawireless.com>"
- #define DRIVER_DESC "USB Driver for Sierra Wireless USB modems"
- 
-@@ -30,9 +30,6 @@
- 
- #define SWIMS_USB_REQUEST_SetPower	0x00
- #define SWIMS_USB_REQUEST_SetNmea	0x07
--#define SWIMS_USB_REQUEST_SetMode	0x0B
--#define SWIMS_USB_REQUEST_GetSwocInfo	0x0A
--#define SWIMS_SET_MODE_Modem		0x0001
- 
- /* per port private data */
- #define N_IN_URB	4
-@@ -163,7 +160,7 @@ static struct usb_device_id id_table [] = {
- 	{ USB_DEVICE(0x1199, 0x0017) },	/* Sierra Wireless EM5625 */
- 	{ USB_DEVICE(0x1199, 0x0018) },	/* Sierra Wireless MC5720 */
- 	{ USB_DEVICE(0x1199, 0x0218) },	/* Sierra Wireless MC5720 */
--	{ USB_DEVICE(0x0f30, 0x1b1d) },	/* Sierra Wireless MC5720 */
-+	{ USB_DEVICE(0x03f0, 0x1b1d) }, /* HP ev2200 a.k.a MC5720 */
- 	{ USB_DEVICE(0x1199, 0x0020) },	/* Sierra Wireless MC5725 */
- 	{ USB_DEVICE(0x1199, 0x0024) },	/* Sierra Wireless MC5727 */
- 	{ USB_DEVICE(0x1199, 0x0220) },	/* Sierra Wireless MC5725 */
-@@ -175,6 +172,8 @@ static struct usb_device_id id_table [] = {
- 	 /* Sierra Wireless Device */
- 	{ USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x0025, 0xFF, 0xFF, 0xFF) },
- 	{ USB_DEVICE(0x1199, 0x0026) }, /* Sierra Wireless Device */
-+	{ USB_DEVICE(0x1199, 0x0027) }, /* Sierra Wireless Device */
-+	{ USB_DEVICE(0x1199, 0x0028) }, /* Sierra Wireless Device */
- 
- 	{ USB_DEVICE(0x1199, 0x6802) },	/* Sierra Wireless MC8755 */
- 	{ USB_DEVICE(0x1199, 0x6804) },	/* Sierra Wireless MC8755 */
-@@ -187,6 +186,7 @@ static struct usb_device_id id_table [] = {
- 	{ USB_DEVICE(0x1199, 0x6821) },	/* Sierra Wireless AirCard 875U */
- 	{ USB_DEVICE(0x1199, 0x6832) },	/* Sierra Wireless MC8780 */
- 	{ USB_DEVICE(0x1199, 0x6833) },	/* Sierra Wireless MC8781 */
-+	{ USB_DEVICE(0x1199, 0x683A) },	/* Sierra Wireless MC8785 */
- 	{ USB_DEVICE(0x1199, 0x683B) },	/* Sierra Wireless MC8785 Composite */
- 	{ USB_DEVICE(0x1199, 0x683C) },	/* Sierra Wireless MC8790 */
- 	{ USB_DEVICE(0x1199, 0x683D) },	/* Sierra Wireless MC8790 */
-@@ -204,6 +204,8 @@ static struct usb_device_id id_table [] = {
- 	/* Sierra Wireless Device */
- 	{ USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6890, 0xFF, 0xFF, 0xFF)},
- 	/* Sierra Wireless Device */
-+	{ USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6891, 0xFF, 0xFF, 0xFF)},
-+	/* Sierra Wireless Device */
- 	{ USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6892, 0xFF, 0xFF, 0xFF)},
- 
- 	{ USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless AirCard 580 */
-diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
-index e39c779..9a3e495 100644
---- a/drivers/usb/serial/ti_usb_3410_5052.c
-+++ b/drivers/usb/serial/ti_usb_3410_5052.c
-@@ -1744,7 +1744,7 @@ static int ti_download_firmware(struct ti_device *tdev, int type)
- 	if (buffer) {
- 		memcpy(buffer, fw_p->data, fw_p->size);
- 		memset(buffer + fw_p->size, 0xff, buffer_size - fw_p->size);
--		ti_do_download(dev, pipe, buffer, fw_p->size);
-+		status = ti_do_download(dev, pipe, buffer, fw_p->size);
- 		kfree(buffer);
- 	}
- 	release_firmware(fw_p);
-diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
-index b157c48..4f7f9e3 100644
---- a/drivers/usb/serial/usb-serial.c
-+++ b/drivers/usb/serial/usb-serial.c
-@@ -733,7 +733,9 @@ int usb_serial_probe(struct usb_interface *interface,
- 	    ((le16_to_cpu(dev->descriptor.idVendor) == ATEN_VENDOR_ID) &&
- 	     (le16_to_cpu(dev->descriptor.idProduct) == ATEN_PRODUCT_ID)) ||
- 	    ((le16_to_cpu(dev->descriptor.idVendor) == ALCOR_VENDOR_ID) &&
--	     (le16_to_cpu(dev->descriptor.idProduct) == ALCOR_PRODUCT_ID))) {
-+	     (le16_to_cpu(dev->descriptor.idProduct) == ALCOR_PRODUCT_ID)) ||
-+	    ((le16_to_cpu(dev->descriptor.idVendor) == SIEMENS_VENDOR_ID) &&
-+	     (le16_to_cpu(dev->descriptor.idProduct) == SIEMENS_PRODUCT_ID_EF81))) {
- 		if (interface != dev->actconfig->interface[0]) {
- 			/* check out the endpoints of the other interface*/
- 			iface_desc = dev->actconfig->interface[0]->cur_altsetting;
-diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
-index c760346..3d92496 100644
---- a/drivers/usb/storage/Kconfig
-+++ b/drivers/usb/storage/Kconfig
-@@ -146,18 +146,6 @@ config USB_STORAGE_KARMA
- 	  on the resulting scsi device node returns the Karma to normal
- 	  operation.
- 
--config USB_STORAGE_SIERRA
--	bool "Sierra Wireless TRU-Install Feature Support"
--	depends on USB_STORAGE
--	help
--	  Say Y here to include additional code to support Sierra Wireless
--	  products with the TRU-Install feature (e.g., AC597E, AC881U).
--
--	  This code switches the Sierra Wireless device from being in
--	  Mass Storage mode to Modem mode. It also has the ability to
--	  support host software upgrades should full Linux support be added
--	  to TRU-Install.
--
- config USB_STORAGE_CYPRESS_ATACB
- 	bool "SAT emulation on Cypress USB/ATA Bridge with ATACB"
- 	depends on USB_STORAGE
-diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile
-index bc3415b..7f8beb5 100644
---- a/drivers/usb/storage/Makefile
-+++ b/drivers/usb/storage/Makefile
-@@ -21,11 +21,10 @@ usb-storage-obj-$(CONFIG_USB_STORAGE_JUMPSHOT)	+= jumpshot.o
- usb-storage-obj-$(CONFIG_USB_STORAGE_ALAUDA)	+= alauda.o
- usb-storage-obj-$(CONFIG_USB_STORAGE_ONETOUCH)	+= onetouch.o
- usb-storage-obj-$(CONFIG_USB_STORAGE_KARMA)	+= karma.o
--usb-storage-obj-$(CONFIG_USB_STORAGE_SIERRA)	+= sierra_ms.o
- usb-storage-obj-$(CONFIG_USB_STORAGE_CYPRESS_ATACB) += cypress_atacb.o
- 
- usb-storage-objs :=	scsiglue.o protocol.o transport.o usb.o \
--			initializers.o $(usb-storage-obj-y)
-+			initializers.o sierra_ms.o $(usb-storage-obj-y)
- 
- ifneq ($(CONFIG_USB_LIBUSUAL),)
- 	obj-$(CONFIG_USB)	+= libusual.o
-diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
-index ba412e6..cd15547 100644
---- a/drivers/usb/storage/unusual_devs.h
-+++ b/drivers/usb/storage/unusual_devs.h
-@@ -160,6 +160,13 @@ UNUSUAL_DEV(  0x0421, 0x0019, 0x0592, 0x0592,
- 		US_SC_DEVICE, US_PR_DEVICE, NULL,
- 		US_FL_MAX_SECTORS_64 ),
- 
-+/* Reported by Filip Joelsson <filip at blueturtle.nu> */
-+UNUSUAL_DEV(  0x0421, 0x005d, 0x0001, 0x0600,
-+		"Nokia",
-+		"Nokia 3110c",
-+		US_SC_DEVICE, US_PR_DEVICE, NULL,
-+		US_FL_FIX_CAPACITY ),
-+
- /* Reported by Mario Rettig <mariorettig at web.de> */
- UNUSUAL_DEV(  0x0421, 0x042e, 0x0100, 0x0100,
- 		"Nokia",
-@@ -232,6 +239,20 @@ UNUSUAL_DEV(  0x0421, 0x04b9, 0x0551, 0x0551,
- 		US_SC_DEVICE, US_PR_DEVICE, NULL,
- 		US_FL_FIX_CAPACITY ),
- 
-+/* Reported by Richard Nauber <RichardNauber at web.de> */
-+UNUSUAL_DEV(  0x0421, 0x04fa, 0x0601, 0x0601,
-+		"Nokia",
-+		"6300",
-+		US_SC_DEVICE, US_PR_DEVICE, NULL,
-+		US_FL_FIX_CAPACITY ),
-+
-+/* Patch for Nokia 5310 capacity */
-+UNUSUAL_DEV(  0x0421, 0x006a, 0x0000, 0x0591,
-+	"Nokia",
-+	"5310",
-+	US_SC_DEVICE, US_PR_DEVICE, NULL,
-+	US_FL_FIX_CAPACITY ),
-+
- /* Reported by Olaf Hering <olh at suse.de> from novell bug #105878 */
- UNUSUAL_DEV(  0x0424, 0x0fdc, 0x0210, 0x0210,
- 		"SMSC",
-@@ -987,6 +1008,13 @@ UNUSUAL_DEV(  0x069b, 0x3004, 0x0001, 0x0001,
- 		US_SC_DEVICE, US_PR_DEVICE, NULL,
- 		US_FL_FIX_CAPACITY ),
- 
-+/* Reported by Adrian Pilchowiec <adi1981 at epf.pl> */
-+UNUSUAL_DEV(  0x071b, 0x3203, 0x0000, 0x0000,
-+		"RockChip",
-+		"MP3",
-+		US_SC_DEVICE, US_PR_DEVICE, NULL,
-+		US_FL_NO_WP_DETECT | US_FL_MAX_SECTORS_64),
-+
- /* Reported by Massimiliano Ghilardi <massimiliano.ghilardi at gmail.com>
-  * This USB MP3/AVI player device fails and disconnects if more than 128
-  * sectors (64kB) are read/written in a single command, and may be present
-@@ -1576,7 +1604,6 @@ UNUSUAL_DEV(  0x10d6, 0x2200, 0x0100, 0x0100,
- 		US_SC_DEVICE, US_PR_DEVICE, NULL,
- 		0),
- 
--#ifdef CONFIG_USB_STORAGE_SIERRA
- /* Reported by Kevin Lloyd <linux at sierrawireless.com>
-  * Entry is needed for the initializer function override,
-  * which instructs the device to load as a modem
-@@ -1587,7 +1614,6 @@ UNUSUAL_DEV(  0x1199, 0x0fff, 0x0000, 0x9999,
- 		"USB MMC Storage",
- 		US_SC_DEVICE, US_PR_DEVICE, sierra_ms_init,
- 		0),
--#endif
- 
- /* Reported by Jaco Kroon <jaco at kroon.co.za>
-  * The usb-storage module found on the Digitech GNX4 (and supposedly other
-diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
-index 73679aa..27016fd 100644
---- a/drivers/usb/storage/usb.c
-+++ b/drivers/usb/storage/usb.c
-@@ -102,9 +102,7 @@
- #ifdef CONFIG_USB_STORAGE_CYPRESS_ATACB
- #include "cypress_atacb.h"
- #endif
--#ifdef CONFIG_USB_STORAGE_SIERRA
- #include "sierra_ms.h"
--#endif
- 
- /* Some informational data */
- MODULE_AUTHOR("Matthew Dharm <mdharm-usb at one-eyed-alien.net>");
-diff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c
-index 614a5c7..6799a6d 100644
---- a/drivers/watchdog/geodewdt.c
-+++ b/drivers/watchdog/geodewdt.c
-@@ -130,8 +130,8 @@ static ssize_t geodewdt_write(struct file *file, const char __user *data,
- 	return len;
- }
- 
--static int geodewdt_ioctl(struct inode *inode, struct file *file,
--				unsigned int cmd, unsigned long arg)
-+static long geodewdt_ioctl(struct file *file, unsigned int cmd,
-+				unsigned long arg)
- {
- 	void __user *argp = (void __user *)arg;
- 	int __user *p = argp;
-@@ -198,7 +198,7 @@ static const struct file_operations geodewdt_fops = {
- 	.owner          = THIS_MODULE,
- 	.llseek         = no_llseek,
- 	.write          = geodewdt_write,
--	.ioctl          = geodewdt_ioctl,
-+	.unlocked_ioctl = geodewdt_ioctl,
- 	.open           = geodewdt_open,
- 	.release        = geodewdt_release,
- };
-diff --git a/drivers/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c
-index b82405c..89fcefc 100644
---- a/drivers/watchdog/ibmasr.c
-+++ b/drivers/watchdog/ibmasr.c
-@@ -85,7 +85,6 @@ static void __asr_toggle(void)
- 
- 	outb(reg & ~asr_toggle_mask, asr_write_addr);
- 	reg = inb(asr_read_addr);
--	spin_unlock(&asr_lock);
- }
- 
- static void asr_toggle(void)
-diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
-index 0ed8416..6d9f3d4 100644
---- a/drivers/watchdog/pnx4008_wdt.c
-+++ b/drivers/watchdog/pnx4008_wdt.c
-@@ -173,8 +173,8 @@ static const struct watchdog_info ident = {
- 	.identity = "PNX4008 Watchdog",
- };
- 
--static long pnx4008_wdt_ioctl(struct inode *inode, struct file *file,
--					unsigned int cmd, unsigned long arg)
-+static long pnx4008_wdt_ioctl(struct file *file, unsigned int cmd,
-+				unsigned long arg)
- {
- 	int ret = -ENOTTY;
- 	int time;
-diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
-index 6756bcb..c9c73b6 100644
---- a/drivers/watchdog/rc32434_wdt.c
-+++ b/drivers/watchdog/rc32434_wdt.c
-@@ -182,8 +182,8 @@ static ssize_t rc32434_wdt_write(struct file *file, const char *data,
- 	return 0;
- }
- 
--static int rc32434_wdt_ioctl(struct inode *inode, struct file *file,
--	unsigned int cmd, unsigned long arg)
-+static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd,
-+				unsigned long arg)
- {
- 	void __user *argp = (void __user *)arg;
- 	int new_timeout;
-@@ -242,7 +242,7 @@ static struct file_operations rc32434_wdt_fops = {
- 	.owner		= THIS_MODULE,
- 	.llseek		= no_llseek,
- 	.write		= rc32434_wdt_write,
--	.ioctl		= rc32434_wdt_ioctl,
-+	.unlocked_ioctl	= rc32434_wdt_ioctl,
- 	.open		= rc32434_wdt_open,
- 	.release	= rc32434_wdt_release,
- };
-diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
-index 9108efa..bf92802 100644
---- a/drivers/watchdog/rdc321x_wdt.c
-+++ b/drivers/watchdog/rdc321x_wdt.c
-@@ -144,8 +144,8 @@ static int rdc321x_wdt_release(struct inode *inode, struct file *file)
- 	return 0;
- }
- 
--static int rdc321x_wdt_ioctl(struct inode *inode, struct file *file,
--				unsigned int cmd, unsigned long arg)
-+static long rdc321x_wdt_ioctl(struct file *file, unsigned int cmd,
-+				unsigned long arg)
- {
- 	void __user *argp = (void __user *)arg;
- 	unsigned int value;
-@@ -204,7 +204,7 @@ static ssize_t rdc321x_wdt_write(struct file *file, const char __user *buf,
- static const struct file_operations rdc321x_wdt_fops = {
- 	.owner		= THIS_MODULE,
- 	.llseek		= no_llseek,
--	.ioctl		= rdc321x_wdt_ioctl,
-+	.unlocked_ioctl	= rdc321x_wdt_ioctl,
- 	.open		= rdc321x_wdt_open,
- 	.write		= rdc321x_wdt_write,
- 	.release	= rdc321x_wdt_release,
-diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c
-index db362c3..191ea63 100644
---- a/drivers/watchdog/wdt285.c
-+++ b/drivers/watchdog/wdt285.c
-@@ -115,8 +115,8 @@ static int watchdog_release(struct inode *inode, struct file *file)
- 	return 0;
- }
- 
--static ssize_t watchdog_write(struct file *file, const char *data,
--						size_t len, loff_t *ppos)
-+static ssize_t watchdog_write(struct file *file, const char __user *data,
-+			      size_t len, loff_t *ppos)
- {
- 	/*
- 	 *	Refresh the timer.
-@@ -133,21 +133,22 @@ static const struct watchdog_info ident = {
- };
- 
- static long watchdog_ioctl(struct file *file, unsigned int cmd,
--							unsigned long arg)
-+			   unsigned long arg)
- {
- 	unsigned int new_margin;
-+	int __user *int_arg = (int __user *)arg;
- 	int ret = -ENOTTY;
- 
- 	switch (cmd) {
- 	case WDIOC_GETSUPPORT:
- 		ret = 0;
--		if (copy_to_user((void *)arg, &ident, sizeof(ident)))
-+		if (copy_to_user((void __user *)arg, &ident, sizeof(ident)))
- 			ret = -EFAULT;
- 		break;
- 
- 	case WDIOC_GETSTATUS:
- 	case WDIOC_GETBOOTSTATUS:
--		ret = put_user(0, (int *)arg);
-+		ret = put_user(0, int_arg);
- 		break;
- 
- 	case WDIOC_KEEPALIVE:
-@@ -156,7 +157,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
- 		break;
- 
- 	case WDIOC_SETTIMEOUT:
--		ret = get_user(new_margin, (int *)arg);
-+		ret = get_user(new_margin, int_arg);
- 		if (ret)
- 			break;
- 
-@@ -171,7 +172,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
- 		watchdog_ping();
- 		/* Fall */
- 	case WDIOC_GETTIMEOUT:
--		ret = put_user(soft_margin, (int *)arg);
-+		ret = put_user(soft_margin, int_arg);
- 		break;
- 	}
- 	return ret;
-diff --git a/include/asm-x86/acpi.h b/include/asm-x86/acpi.h
-index 635d764..35d1743 100644
---- a/include/asm-x86/acpi.h
-+++ b/include/asm-x86/acpi.h
-@@ -140,6 +140,8 @@ static inline unsigned int acpi_processor_cstate_check(unsigned int max_cstate)
- 	    boot_cpu_data.x86_model <= 0x05 &&
- 	    boot_cpu_data.x86_mask < 0x0A)
- 		return 1;
-+	else if (boot_cpu_has(X86_FEATURE_AMDC1E))
-+		return 1;
- 	else
- 		return max_cstate;
- }
-diff --git a/include/asm-x86/cpufeature.h b/include/asm-x86/cpufeature.h
-index 9489283..cfcfb0a 100644
---- a/include/asm-x86/cpufeature.h
-+++ b/include/asm-x86/cpufeature.h
-@@ -81,6 +81,7 @@
- #define X86_FEATURE_LFENCE_RDTSC (3*32+18) /* Lfence synchronizes RDTSC */
- #define X86_FEATURE_11AP	(3*32+19) /* Bad local APIC aka 11AP */
- #define X86_FEATURE_NOPL	(3*32+20) /* The NOPL (0F 1F) instructions */
-+#define X86_FEATURE_AMDC1E	(3*32+21) /* AMD C1E detected */
- 
- /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */
- #define X86_FEATURE_XMM3	(4*32+ 0) /* Streaming SIMD Extensions-3 */
-diff --git a/include/asm-x86/idle.h b/include/asm-x86/idle.h
-index d240e5b..cbb6491 100644
---- a/include/asm-x86/idle.h
-+++ b/include/asm-x86/idle.h
-@@ -10,4 +10,6 @@ void idle_notifier_register(struct notifier_block *n);
- void enter_idle(void);
- void exit_idle(void);
- 
-+void c1e_remove_cpu(int cpu);
-+
- #endif
-diff --git a/include/linux/pci.h b/include/linux/pci.h
-index c0e1400..98dc624 100644
---- a/include/linux/pci.h
-+++ b/include/linux/pci.h
-@@ -534,7 +534,7 @@ extern void pci_sort_breadthfirst(void);
- #ifdef CONFIG_PCI_LEGACY
- struct pci_dev __deprecated *pci_find_device(unsigned int vendor,
- 					     unsigned int device,
--					     const struct pci_dev *from);
-+					     struct pci_dev *from);
- struct pci_dev __deprecated *pci_find_slot(unsigned int bus,
- 					   unsigned int devfn);
- #endif /* CONFIG_PCI_LEGACY */
-@@ -550,7 +550,7 @@ struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device,
- 				struct pci_dev *from);
- struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device,
- 				unsigned int ss_vendor, unsigned int ss_device,
--				const struct pci_dev *from);
-+				struct pci_dev *from);
- struct pci_dev *pci_get_slot(struct pci_bus *bus, unsigned int devfn);
- struct pci_dev *pci_get_bus_and_slot(unsigned int bus, unsigned int devfn);
- struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *from);
-@@ -816,7 +816,7 @@ _PCI_NOP_ALL(write,)
- 
- static inline struct pci_dev *pci_find_device(unsigned int vendor,
- 					      unsigned int device,
--					      const struct pci_dev *from)
-+					      struct pci_dev *from)
- {
- 	return NULL;
- }
-@@ -838,7 +838,7 @@ static inline struct pci_dev *pci_get_subsys(unsigned int vendor,
- 					     unsigned int device,
- 					     unsigned int ss_vendor,
- 					     unsigned int ss_device,
--					     const struct pci_dev *from)
-+					     struct pci_dev *from)
- {
- 	return NULL;
- }
-diff --git a/include/linux/smb.h b/include/linux/smb.h
-index caa43b2..82fefdd 100644
---- a/include/linux/smb.h
-+++ b/include/linux/smb.h
-@@ -11,7 +11,9 @@
- 
- #include <linux/types.h>
- #include <linux/magic.h>
-+#ifdef __KERNEL__
- #include <linux/time.h>
-+#endif
- 
- enum smb_protocol { 
- 	SMB_PROTOCOL_NONE, 
-diff --git a/kernel/kexec.c b/kernel/kexec.c
-index 59f3f0d..aef2653 100644
---- a/kernel/kexec.c
-+++ b/kernel/kexec.c
-@@ -753,8 +753,14 @@ static struct page *kimage_alloc_page(struct kimage *image,
- 			*old = addr | (*old & ~PAGE_MASK);
- 
- 			/* The old page I have found cannot be a
--			 * destination page, so return it.
-+			 * destination page, so return it if it's
-+			 * gfp_flags honor the ones passed in.
- 			 */
-+			if (!(gfp_mask & __GFP_HIGHMEM) &&
-+			    PageHighMem(old_page)) {
-+				kimage_free_pages(old_page);
-+				continue;
-+			}
- 			addr = old_addr;
- 			page = old_page;
- 			break;
-diff --git a/kernel/sched.c b/kernel/sched.c
-index 9889080..13dd2db 100644
---- a/kernel/sched.c
-+++ b/kernel/sched.c
-@@ -1087,7 +1087,7 @@ hotplug_hrtick(struct notifier_block *nfb, unsigned long action, void *hcpu)
- 	return NOTIFY_DONE;
- }
- 
--static void init_hrtick(void)
-+static __init void init_hrtick(void)
- {
- 	hotcpu_notifier(hotplug_hrtick, 0);
- }
-diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
-index f1f3eee..bd70345 100644
---- a/kernel/time/tick-broadcast.c
-+++ b/kernel/time/tick-broadcast.c
-@@ -235,7 +235,7 @@ static void tick_do_broadcast_on_off(void *why)
- 	case CLOCK_EVT_NOTIFY_BROADCAST_FORCE:
- 		if (!cpu_isset(cpu, tick_broadcast_mask)) {
- 			cpu_set(cpu, tick_broadcast_mask);
--			if (td->mode == TICKDEV_MODE_PERIODIC)
-+			if (bc->mode == TICKDEV_MODE_PERIODIC)
- 				clockevents_shutdown(dev);
- 		}
- 		if (*reason == CLOCK_EVT_NOTIFY_BROADCAST_FORCE)
-@@ -245,7 +245,7 @@ static void tick_do_broadcast_on_off(void *why)
- 		if (!tick_broadcast_force &&
- 		    cpu_isset(cpu, tick_broadcast_mask)) {
- 			cpu_clear(cpu, tick_broadcast_mask);
--			if (td->mode == TICKDEV_MODE_PERIODIC)
-+			if (bc->mode == TICKDEV_MODE_PERIODIC)
- 				tick_setup_periodic(dev, 0);
- 		}
- 		break;
-@@ -575,4 +575,12 @@ void tick_shutdown_broadcast_oneshot(unsigned int *cpup)
- 	spin_unlock_irqrestore(&tick_broadcast_lock, flags);
- }
- 
-+/*
-+ * Check, whether the broadcast device is in one shot mode
-+ */
-+int tick_broadcast_oneshot_active(void)
-+{
-+	return tick_broadcast_device.mode == TICKDEV_MODE_ONESHOT;
-+}
-+
- #endif
-diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
-index 019315e..df12434 100644
---- a/kernel/time/tick-common.c
-+++ b/kernel/time/tick-common.c
-@@ -33,7 +33,7 @@ DEFINE_PER_CPU(struct tick_device, tick_cpu_device);
-  */
- ktime_t tick_next_period;
- ktime_t tick_period;
--int tick_do_timer_cpu __read_mostly = -1;
-+int tick_do_timer_cpu __read_mostly = TICK_DO_TIMER_BOOT;
- DEFINE_SPINLOCK(tick_device_lock);
- 
- /*
-@@ -109,7 +109,8 @@ void tick_setup_periodic(struct clock_event_device *dev, int broadcast)
- 	if (!tick_device_is_functional(dev))
- 		return;
- 
--	if (dev->features & CLOCK_EVT_FEAT_PERIODIC) {
-+	if ((dev->features & CLOCK_EVT_FEAT_PERIODIC) &&
-+	    !tick_broadcast_oneshot_active()) {
- 		clockevents_set_mode(dev, CLOCK_EVT_MODE_PERIODIC);
- 	} else {
- 		unsigned long seq;
-@@ -148,7 +149,7 @@ static void tick_setup_device(struct tick_device *td,
- 		 * If no cpu took the do_timer update, assign it to
- 		 * this cpu:
- 		 */
--		if (tick_do_timer_cpu == -1) {
-+		if (tick_do_timer_cpu == TICK_DO_TIMER_BOOT) {
- 			tick_do_timer_cpu = cpu;
- 			tick_next_period = ktime_get();
- 			tick_period = ktime_set(0, NSEC_PER_SEC / HZ);
-@@ -300,7 +301,8 @@ static void tick_shutdown(unsigned int *cpup)
- 	if (*cpup == tick_do_timer_cpu) {
- 		int cpu = first_cpu(cpu_online_map);
- 
--		tick_do_timer_cpu = (cpu != NR_CPUS) ? cpu : -1;
-+		tick_do_timer_cpu = (cpu != NR_CPUS) ? cpu :
-+			TICK_DO_TIMER_NONE;
- 	}
- 	spin_unlock_irqrestore(&tick_device_lock, flags);
- }
-diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h
-index 6e9db97..4692487 100644
---- a/kernel/time/tick-internal.h
-+++ b/kernel/time/tick-internal.h
-@@ -1,6 +1,10 @@
- /*
-  * tick internal variable and functions used by low/high res code
-  */
-+
-+#define TICK_DO_TIMER_NONE	-1
-+#define TICK_DO_TIMER_BOOT	-2
-+
- DECLARE_PER_CPU(struct tick_device, tick_cpu_device);
- extern spinlock_t tick_device_lock;
- extern ktime_t tick_next_period;
-@@ -31,6 +35,7 @@ extern void tick_broadcast_oneshot_control(unsigned long reason);
- extern void tick_broadcast_switch_to_oneshot(void);
- extern void tick_shutdown_broadcast_oneshot(unsigned int *cpup);
- extern int tick_resume_broadcast_oneshot(struct clock_event_device *bc);
-+extern int tick_broadcast_oneshot_active(void);
- # else /* BROADCAST */
- static inline void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
- {
-@@ -39,6 +44,7 @@ static inline void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
- static inline void tick_broadcast_oneshot_control(unsigned long reason) { }
- static inline void tick_broadcast_switch_to_oneshot(void) { }
- static inline void tick_shutdown_broadcast_oneshot(unsigned int *cpup) { }
-+static inline int tick_broadcast_oneshot_active(void) { return 0; }
- # endif /* !BROADCAST */
- 
- #else /* !ONESHOT */
-@@ -68,6 +74,7 @@ static inline int tick_resume_broadcast_oneshot(struct clock_event_device *bc)
- {
- 	return 0;
- }
-+static inline int tick_broadcast_oneshot_active(void) { return 0; }
- #endif /* !TICK_ONESHOT */
- 
- /*
-diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
-index a87b046..39019b3 100644
---- a/kernel/time/tick-sched.c
-+++ b/kernel/time/tick-sched.c
-@@ -75,6 +75,9 @@ static void tick_do_update_jiffies64(ktime_t now)
- 							   incr * ticks);
- 		}
- 		do_timer(++ticks);
-+
-+		/* Keep the tick_next_period variable up to date */
-+		tick_next_period = ktime_add(last_jiffies_update, tick_period);
- 	}
- 	write_sequnlock(&xtime_lock);
- }
-@@ -221,7 +224,7 @@ void tick_nohz_stop_sched_tick(int inidle)
- 	 */
- 	if (unlikely(!cpu_online(cpu))) {
- 		if (cpu == tick_do_timer_cpu)
--			tick_do_timer_cpu = -1;
-+			tick_do_timer_cpu = TICK_DO_TIMER_NONE;
- 	}
- 
- 	if (unlikely(ts->nohz_mode == NOHZ_MODE_INACTIVE))
-@@ -303,7 +306,7 @@ void tick_nohz_stop_sched_tick(int inidle)
- 		 * invoked.
- 		 */
- 		if (cpu == tick_do_timer_cpu)
--			tick_do_timer_cpu = -1;
-+			tick_do_timer_cpu = TICK_DO_TIMER_NONE;
- 
- 		ts->idle_sleeps++;
- 
-@@ -468,7 +471,7 @@ static void tick_nohz_handler(struct clock_event_device *dev)
- 	 * this duty, then the jiffies update is still serialized by
- 	 * xtime_lock.
- 	 */
--	if (unlikely(tick_do_timer_cpu == -1))
-+	if (unlikely(tick_do_timer_cpu == TICK_DO_TIMER_NONE))
- 		tick_do_timer_cpu = cpu;
- 
- 	/* Check, if the jiffies need an update */
-@@ -570,7 +573,7 @@ static enum hrtimer_restart tick_sched_timer(struct hrtimer *timer)
- 	 * this duty, then the jiffies update is still serialized by
- 	 * xtime_lock.
- 	 */
--	if (unlikely(tick_do_timer_cpu == -1))
-+	if (unlikely(tick_do_timer_cpu == TICK_DO_TIMER_NONE))
- 		tick_do_timer_cpu = cpu;
- #endif
- 
-diff --git a/mm/memcontrol.c b/mm/memcontrol.c
-index 0f1f7a7..c0500e4 100644
---- a/mm/memcontrol.c
-+++ b/mm/memcontrol.c
-@@ -806,6 +806,7 @@ int mem_cgroup_shrink_usage(struct mm_struct *mm, gfp_t gfp_mask)
- 
- 	do {
- 		progress = try_to_free_mem_cgroup_pages(mem, gfp_mask);
-+		progress += res_counter_check_under_limit(&mem->res);
- 	} while (!progress && --retry);
- 
- 	css_put(&mem->css);
-diff --git a/mm/tiny-shmem.c b/mm/tiny-shmem.c
-index ae532f5..d17cb6f 100644
---- a/mm/tiny-shmem.c
-+++ b/mm/tiny-shmem.c
-@@ -65,31 +65,25 @@ struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags)
- 	if (!dentry)
- 		goto put_memory;
- 
--	error = -ENOSPC;
--	inode = ramfs_get_inode(root->d_sb, S_IFREG | S_IRWXUGO, 0);
--	if (!inode)
--		goto put_dentry;
--
--	d_instantiate(dentry, inode);
- 	error = -ENFILE;
--	file = alloc_file(shm_mnt, dentry, FMODE_WRITE | FMODE_READ,
--			&ramfs_file_operations);
-+	file = get_empty_filp();
- 	if (!file)
- 		goto put_dentry;
- 
--	inode->i_nlink = 0;	/* It is unlinked */
--
--	/* notify everyone as to the change of file size */
--	error = do_truncate(dentry, size, 0, file);
--	if (error < 0)
-+	error = -ENOSPC;
-+	inode = ramfs_get_inode(root->d_sb, S_IFREG | S_IRWXUGO, 0);
-+	if (!inode)
- 		goto close_file;
- 
-+	d_instantiate(dentry, inode);
-+	inode->i_size = size;
-+	inode->i_nlink = 0;	/* It is unlinked */
-+	init_file(file, shm_mnt, dentry, FMODE_WRITE | FMODE_READ,
-+			&ramfs_file_operations);
- 	return file;
- 
- close_file:
- 	put_filp(file);
--	return ERR_PTR(error);
--
- put_dentry:
- 	dput(dentry);
- put_memory:
-diff --git a/net/socket.c b/net/socket.c
-index 8ef8ba8..3e8d4e3 100644
---- a/net/socket.c
-+++ b/net/socket.c
-@@ -1511,6 +1511,7 @@ out_fd:
- 	goto out_put;
- }
- 
-+#if 0
- #ifdef HAVE_SET_RESTORE_SIGMASK
- asmlinkage long sys_paccept(int fd, struct sockaddr __user *upeer_sockaddr,
- 			    int __user *upeer_addrlen,
-@@ -1564,6 +1565,7 @@ asmlinkage long sys_paccept(int fd, struct sockaddr __user *upeer_sockaddr,
- 	return do_accept(fd, upeer_sockaddr, upeer_addrlen, flags);
- }
- #endif
-+#endif
- 
- asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr,
- 			   int __user *upeer_addrlen)
-diff --git a/scripts/kernel-doc b/scripts/kernel-doc
-index ff787e6..44ee94d 100755
---- a/scripts/kernel-doc
-+++ b/scripts/kernel-doc
-@@ -781,6 +781,7 @@ sub output_struct_xml(%) {
-     print " <refsect1>\n";
-     print "  <title>Members</title>\n";
- 
-+    if ($#{$args{'parameterlist'}} >= 0) {
-     print "  <variablelist>\n";
-     foreach $parameter (@{$args{'parameterlist'}}) {
-       ($parameter =~ /^#/) && next;
-@@ -798,6 +799,9 @@ sub output_struct_xml(%) {
-       print "    </varlistentry>\n";
-     }
-     print "  </variablelist>\n";
-+    } else {
-+	print " <para>\n  None\n </para>\n";
-+    }
-     print " </refsect1>\n";
- 
-     output_section_xml(@_);
-diff --git a/sound/soc/at32/at32-pcm.c b/sound/soc/at32/at32-pcm.c
-index 435f1da..c83584f 100644
---- a/sound/soc/at32/at32-pcm.c
-+++ b/sound/soc/at32/at32-pcm.c
-@@ -434,7 +434,8 @@ static int at32_pcm_suspend(struct platform_device *pdev,
- 	params = prtd->params;
- 
- 	/* Disable the PDC and save the PDC registers */
--	ssc_writex(params->ssc->regs, PDC_PTCR, params->mask->pdc_disable);
-+	ssc_writex(params->ssc->regs, ATMEL_PDC_PTCR,
-+		   params->mask->pdc_disable);
- 
- 	prtd->pdc_xpr_save = ssc_readx(params->ssc->regs, params->pdc->xpr);
- 	prtd->pdc_xcr_save = ssc_readx(params->ssc->regs, params->pdc->xcr);
-@@ -464,7 +465,7 @@ static int at32_pcm_resume(struct platform_device *pdev,
- 	ssc_writex(params->ssc->regs, params->pdc->xnpr, prtd->pdc_xnpr_save);
- 	ssc_writex(params->ssc->regs, params->pdc->xncr, prtd->pdc_xncr_save);
- 
--	ssc_writex(params->ssc->regs, PDC_PTCR, params->mask->pdc_enable);
-+	ssc_writex(params->ssc->regs, ATMEL_PDC_PTCR, params->mask->pdc_enable);
- 	return 0;
- }
- #else /* CONFIG_PM */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.975
retrieving revision 1.976
diff -u -r1.975 -r1.976
--- kernel.spec	24 Sep 2008 01:04:57 -0000	1.975
+++ kernel.spec	24 Sep 2008 21:18:20 -0000	1.976
@@ -45,7 +45,7 @@
 # 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
@@ -978,7 +978,7 @@
   done
 %endif
 
-ApplyPatch git-linus.diff
+#ApplyPatch git-linus.diff
 
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
 # also gives a list of missing options at the end. Useful for automated
@@ -1755,6 +1755,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Sep 24 2008 Dave Jones <davej at redhat.com>
+- 2.6.27-rc7-git2
+
 * Tue Sep 23 2008 Dave Jones <davej at redhat.com>
 - x86 compile fix.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.891
retrieving revision 1.892
diff -u -r1.891 -r1.892
--- sources	23 Sep 2008 00:39:53 -0000	1.891
+++ sources	24 Sep 2008 21:18:20 -0000	1.892
@@ -1,3 +1,3 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 711e4624185c1e229e9aa4c736b57e05  patch-2.6.27-rc7.bz2
-76c36e968f058a91bd8401c1a8b731fc  patch-2.6.27-rc7-git1.bz2
+5e7b3785de718236827ec2f3a51346e8  patch-2.6.27-rc7-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.803
retrieving revision 1.804
diff -u -r1.803 -r1.804
--- upstream	23 Sep 2008 00:39:53 -0000	1.803
+++ upstream	24 Sep 2008 21:18:20 -0000	1.804
@@ -1,3 +1,3 @@
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc7.bz2
-patch-2.6.27-rc7-git1.bz2
+patch-2.6.27-rc7-git2.bz2


--- patch-2.6.27-rc7-git1.bz2.sign DELETED ---



From mclasen at fedoraproject.org  Wed Sep 24 21:34:08 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 24 Sep 2008 21:34:08 +0000 (UTC)
Subject: rpms/bluecurve-icon-theme/devel bluecurve-icon-theme.spec,1.5,1.6
Message-ID: <20080924213408.7359A70103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/bluecurve-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17351

Modified Files:
	bluecurve-icon-theme.spec 
Log Message:
Split off the cursor theme



Index: bluecurve-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/bluecurve-icon-theme/devel/bluecurve-icon-theme.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bluecurve-icon-theme.spec	7 Apr 2008 23:58:13 -0000	1.5
+++ bluecurve-icon-theme.spec	24 Sep 2008 21:33:38 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Bluecurve icon theme
 Name: bluecurve-icon-theme
 Version: 8.0.2
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 BuildArch: noarch
 License: GPL+
 Group: User Interface/Desktops
@@ -11,12 +11,20 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Requires: system-logos
+Requires: bluecurve-cursor-theme
 
 # we require XML::Parser for our in-tree intltool
 BuildRequires: perl(XML::Parser)
 
 %description
-This package contains Bluecurve style cursors and icons.
+This package contains Bluecurve style icons.
+
+%package -n bluecurve-cursor-theme
+Summary: Bluecurve cursor theme
+Group: User Interface/Desktops
+
+%description -n bluecurve-cursor-theme
+This package contains Bluecurve style cursors.
 
 %prep
 %setup -q 
@@ -32,6 +40,8 @@
 # These are empty
 rm -f ChangeLog NEWS README
 
+touch $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/icon-theme.cache
+
 # The upstream packages may gain po files at some point in the near future
 %find_lang %{name} || touch %{name}.lang
 
@@ -50,15 +60,33 @@
     %{_bindir}/gtk-update-icon-cache -f --quiet %{_datadir}/icons/Bluecurve || :
 fi
 
+
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING
-%{_datadir}/icons/Bluecurve
+%{_datadir}/icons/Bluecurve/index.theme
+%{_datadir}/icons/Bluecurve/16x16
+%{_datadir}/icons/Bluecurve/20x20
+%{_datadir}/icons/Bluecurve/24x24
+%{_datadir}/icons/Bluecurve/32x32
+%{_datadir}/icons/Bluecurve/36x36
+%{_datadir}/icons/Bluecurve/48x48
+%{_datadir}/icons/Bluecurve/64x64
+%{_datadir}/icons/Bluecurve/96x96
+%ghost %{_datadir}/icons/Bluecurve/icon-theme.cache
+
+%files -n bluecurve-cursor-theme
+%dir %{_datadir}/icons/Bluecurve
+%{_datadir}/icons/Bluecurve/Bluecurve.cursortheme
+%{_datadir}/icons/Bluecurve/cursors
 %{_datadir}/icons/Bluecurve-inverse
 %{_datadir}/icons/LBluecurve
 %{_datadir}/icons/LBluecurve-inverse
 
 %changelog
+* Wed Sep 24 2008 Matthias Clasen <mclasen at redhat.com> - 8.0.2-2
+- Split off cursor theme as a separate package
+
 * Mon Apr  7 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 8.0.2-1
 - Add some symlinks to make Bluecurve work well with KDE 4 (#408151)
 



From denis at fedoraproject.org  Wed Sep 24 21:39:55 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 24 Sep 2008 21:39:55 +0000 (UTC)
Subject: rpms/pstoedit/devel pstoedit.spec,1.9,1.10
Message-ID: <20080924213955.96E1B70103@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/pstoedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18094

Modified Files:
	pstoedit.spec 
Log Message:
Fixed cxxflags patch fuziness issue


Index: pstoedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pstoedit/devel/pstoedit.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pstoedit.spec	14 May 2008 11:27:16 -0000	1.9
+++ pstoedit.spec	24 Sep 2008 21:39:25 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           pstoedit
 Version:        3.45
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Translates PostScript and PDF graphics into other vector formats
 
 Group:          Applications/Productivity
@@ -88,6 +88,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Wed Sep 24 2008 Denis Leroy <denis at poolshark.org> - 3.45-4
+- Fixed cxxflags patch fuziness issue
+
 * Wed May 14 2008 Denis Leroy <denis at poolshark.org> - 3.45-3
 - Rebuild for new ImageMagick
 



From mclasen at fedoraproject.org  Wed Sep 24 21:43:45 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 24 Sep 2008 21:43:45 +0000 (UTC)
Subject: rpms/fedora-gnome-theme/devel fedora-gnome-theme.spec,1.6,1.7
Message-ID: <20080924214345.2C57670103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/fedora-gnome-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18577

Modified Files:
	fedora-gnome-theme.spec 
Log Message:
require bluecurve-cursor-theme



Index: fedora-gnome-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-gnome-theme/devel/fedora-gnome-theme.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-gnome-theme.spec	25 Aug 2008 18:38:05 -0000	1.6
+++ fedora-gnome-theme.spec	24 Sep 2008 21:43:14 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Fedora GNOME theme
 Name: fedora-gnome-theme
 Version: 8.0.0
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 BuildArch: noarch
 # No version given, no license attribution.
 License: GPL+
@@ -15,9 +15,7 @@
 Requires: gtk-nodoka-engine
 Requires: fedora-icon-theme
 Requires: notification-daemon-engine-nodoka
-
-# needed for the cursors, unfortunately
-Requires: bluecurve-icon-theme
+Requires: bluecurve-cursor-theme
 
 # we require XML::Parser for our in-tree intltool
 BuildRequires: perl(XML::Parser)
@@ -55,6 +53,9 @@
 %{_datadir}/themes/Fedora
 
 %changelog
+* Wed Sep 24 2008 Matthias Clasen  <mclasen at redhat.com> - 8.0.0-5
+- Only require bluecurve cursors, not the full icon theme
+
 * Mon Aug 25 2008 Matthias Clasen  <mclasen at redhat.com> - 8.0.0-4
 - Use nodoka notification theme (#460045)
 



From mclasen at fedoraproject.org  Wed Sep 24 21:46:16 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 24 Sep 2008 21:46:16 +0000 (UTC)
Subject: rpms/fedora-gnome-theme/devel fedora-gnome-theme.spec,1.7,1.8
Message-ID: <20080924214617.0530670103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/fedora-gnome-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19048

Modified Files:
	fedora-gnome-theme.spec 
Log Message:
bump rev



Index: fedora-gnome-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-gnome-theme/devel/fedora-gnome-theme.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-gnome-theme.spec	24 Sep 2008 21:43:14 -0000	1.7
+++ fedora-gnome-theme.spec	24 Sep 2008 21:45:46 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Fedora GNOME theme
 Name: fedora-gnome-theme
 Version: 8.0.0
-Release: 5%{?dist} 
+Release: 6%{?dist} 
 BuildArch: noarch
 # No version given, no license attribution.
 License: GPL+
@@ -53,7 +53,7 @@
 %{_datadir}/themes/Fedora
 
 %changelog
-* Wed Sep 24 2008 Matthias Clasen  <mclasen at redhat.com> - 8.0.0-5
+* Wed Sep 24 2008 Matthias Clasen  <mclasen at redhat.com> - 8.0.0-6
 - Only require bluecurve cursors, not the full icon theme
 
 * Mon Aug 25 2008 Matthias Clasen  <mclasen at redhat.com> - 8.0.0-4



From mclasen at fedoraproject.org  Wed Sep 24 21:49:14 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 24 Sep 2008 21:49:14 +0000 (UTC)
Subject: rpms/fedora-gnome-theme/devel fedora-gnome-theme.spec,1.8,1.9
Message-ID: <20080924214914.6559C70103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/fedora-gnome-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19346

Modified Files:
	fedora-gnome-theme.spec 
Log Message:
grr, try again



Index: fedora-gnome-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-gnome-theme/devel/fedora-gnome-theme.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-gnome-theme.spec	24 Sep 2008 21:45:46 -0000	1.8
+++ fedora-gnome-theme.spec	24 Sep 2008 21:48:44 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Fedora GNOME theme
 Name: fedora-gnome-theme
 Version: 8.0.0
-Release: 6%{?dist} 
+Release: 7%{?dist} 
 BuildArch: noarch
 # No version given, no license attribution.
 License: GPL+
@@ -53,7 +53,7 @@
 %{_datadir}/themes/Fedora
 
 %changelog
-* Wed Sep 24 2008 Matthias Clasen  <mclasen at redhat.com> - 8.0.0-6
+* Wed Sep 24 2008 Matthias Clasen  <mclasen at redhat.com> - 8.0.0-7
 - Only require bluecurve cursors, not the full icon theme
 
 * Mon Aug 25 2008 Matthias Clasen  <mclasen at redhat.com> - 8.0.0-4



From ajax at fedoraproject.org  Wed Sep 24 21:56:04 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 24 Sep 2008 21:56:04 +0000 (UTC)
Subject: rpms/rhpl/devel rhpl-0.216-no-model.patch, NONE, 1.1 rhpl.spec,
	1.115, 1.116
Message-ID: <20080924215604.82DBD70103@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/rhpl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20150

Modified Files:
	rhpl.spec 
Added Files:
	rhpl-0.216-no-model.patch 
Log Message:
* Wed Sep 24 2008 Adam Jackson <ajax at redhat.com> 0.216-2
- rhpl-0.216-no-model.patch: Don't set XKB model, it's not meaningful for
  evdev keyboards and it makes your arrow keys not work. (#461832)


rhpl-0.216-no-model.patch:

--- NEW FILE rhpl-0.216-no-model.patch ---
diff -up rhpl-0.216/src/keyboard.py.jx rhpl-0.216/src/keyboard.py
--- rhpl-0.216/src/keyboard.py.jx	2008-06-13 11:07:58.000000000 -0400
+++ rhpl-0.216/src/keyboard.py	2008-09-24 17:54:02.000000000 -0400
@@ -141,7 +141,7 @@ class Keyboard(SimpleConfigFile):
         if not os.environ.has_key("DISPLAY"):
             return
 
-        argv = [ "/usr/bin/setxkbmap", "-layout", layout, "-model", model ]
+        argv = [ "/usr/bin/setxkbmap", "-layout", layout ]
 
         # XXX setxkbmap(1) needs one -option flag for each option
         if options:


Index: rhpl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhpl/devel/rhpl.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- rhpl.spec	13 Jun 2008 15:07:32 -0000	1.115
+++ rhpl.spec	24 Sep 2008 21:55:34 -0000	1.116
@@ -3,7 +3,7 @@
 Summary: Library of Python code used by installation and configuration tools
 Name: rhpl
 Version: 0.216
-Release: 1
+Release: 2
 Source0: %{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: System Environment/Libraries
@@ -16,11 +16,14 @@
 Conflicts: wireless-tools < 28-0.pre8.5
 Conflicts: kbd < 1.12-21
 
+Patch0: rhpl-0.216-no-model.patch
+
 %description
 The rhpl package contains Python code used throughout the system.
 
 %prep
 %setup -q
+%patch0 -p1 -b .model
 
 %build
 make
@@ -41,6 +44,10 @@
 %{python_sitearch}/rhpl
 
 %changelog
+* Wed Sep 24 2008 Adam Jackson <ajax at redhat.com> 0.216-2
+- rhpl-0.216-no-model.patch: Don't set XKB model, it's not meaningful for
+  evdev keyboards and it makes your arrow keys not work. (#461832)
+
 * Fri Jun 13 2008 Chris Lumens <clumens at redhat.com> 0.216-1
 - Fix Swiss French keyboard layout (#448878).
 - Now with more Romanian keyboard layouts! (#450381)



From jwilson at fedoraproject.org  Wed Sep 24 22:16:19 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Wed, 24 Sep 2008 22:16:19 +0000 (UTC)
Subject: rpms/lirc/devel hw_commandir.h, NONE,
	1.1 lirc-0.8.4-standardize-remote-keycodes.patch, NONE,
	1.1 .cvsignore, 1.23,
	1.24 lirc-use-new-instead-of-conf-as-filename-suffix.patch, 1.1,
	1.2 lirc.spec, 1.38, 1.39 sources, 1.23,
	1.24 lirc-0.8.3-fix-remote-keycodes.patch, 1.1,
	NONE lirc-0.8.3-remote-includes-directive.patch, 1.1,
	NONE lirc-0.8.3-validate-transmit-buffer.patch, 1.2, NONE
Message-ID: <20080924221619.C408C70103@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/lirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21600

Modified Files:
	.cvsignore 
	lirc-use-new-instead-of-conf-as-filename-suffix.patch 
	lirc.spec sources 
Added Files:
	hw_commandir.h lirc-0.8.4-standardize-remote-keycodes.patch 
Removed Files:
	lirc-0.8.3-fix-remote-keycodes.patch 
	lirc-0.8.3-remote-includes-directive.patch 
	lirc-0.8.3-validate-transmit-buffer.patch 
Log Message:
* Wed Sep 24 2008 - Jarod Wilson <jarod at redhat.com> - 0.8.4-0.1.pre1
- Update to 0.8.4pre1
- Drop upstream patches
- Adds support for the CommandIR II userspace driver



--- NEW FILE hw_commandir.h ---
 
/****************************************************************************
 ** hw_commandir.h **********************************************************
 ****************************************************************************
 * 
 * Copyright (C) 1999 Christoph Bartelmus <lirc at bartelmus.de>
 * -- Original hw_default.h
 * Modified for CommandIR Transceivers, April-June 2008, Matthew Bodkin 
 *
 */

#ifndef HW_COMMANDIR_H
#define HW_COMMANDIR_H

#define RX_BUFFER_SIZE 1024
#define TX_BUFFER_SIZE 1024
#define TX_QUEUE 1
#define RX_QUEUE 0
#define MAX_COMMANDIRS 4
#define MAX_COMMAND 8192

/* transmitter channel control */
#define MAX_DEVICES		4
#define MAX_CHANNELS    16
#define DEVICE_CHANNELS	4
#define MAX_MASK 		0xffff
#define MAX_SIGNALQ		100

/* CommandIR control codes */
#define CHANNEL_EN_MASK	1
#define FREQ_HEADER     2
#define MCU_CTRL_SIZE   3
#define TX_HEADER       7
#define TX_HEADER_NEW	8
/* New for CommandIR II  */

#define READ_INPUTS		10
#define PROC_SET		11
#define INIT_FUNCTION	12
#define RX_SELECT		13
#define TX_COMMANDIR_II 14
/* Internal to driver */
#define TX_LIRC_T	    15
#define FREQ_HEADER_LIRC 16
#define RXDECODE_HEADER_LIRC 17
#define INIT_HEADER_LIRC 18
#define DEINIT_HEADER_LIRC 19
#define GET_VERSION 	20

#define COMMANDIR_2_PULSE_MASK 0x8000
#define COMMANDIR_2_OVERFLOW_MASK 0x4000

#define DEFAULT_PULSE_WIDTH 13

#define USB_CMDIR_VENDOR_ID		0x10c4
#define USB_CMDIR_PRODUCT_ID	0x0003
#define USB_CMDIR_MINOR_BASE	192

#define HW_COMMANDIR_MINI 	1
#define HW_COMMANDIR_2		2
#define HW_COMMANDIR_UNKNOWN 127

#define MAX_HW_MINI_PACKET 64

// CommandIR has lots of buffer room, we don't need to poll constantly
#define USB_TIMEOUT_MS 5000
#define USB_TIMEOUT_US 1000
#define WAIT_BETWEEN_READS_US 10000
#define MAX_WAIT_BETWEEN_READS_US 5000000
#define MIN_WAIT_BETWEEN_READS_US 5000

#define USB_MAX_BUSES	8
#define USB_MAX_BUSDEV	127

#define RX_HEADER_DATA 		0x01
#define RX_HEADER_EVENTS 	0x02
#define RX_HEADER_TXAVAIL 	0x03


// We keep CommandIR's OPEN even on -deinit for speed and to monitor 
// Other non-LIRC events (plugin, suspend, etc)
#define USB_KEEP_WARM 1

// CommandIR lircd.conf event driven code definitions
#define LIRCCODE_GAP  125000
#define JACK_PLUG_1		0x01
#define JACK_PLUG_2		0x02
#define JACK_PLUG_3		0x03
#define JACK_PLUG_4		0x04
#define JACK_PLUG_5		0x11
#define JACK_PLUG_6		0x12
#define JACK_PLUG_7		0x13
#define JACK_PLUG_8		0x14
#define JACK_PLUG_9		0x21
#define JACK_PLUG_10	0x22
#define JACK_PLUG_11	0x23
#define JACK_PLUG_12	0x24
#define JACK_PLUG_13	0x31
#define JACK_PLUG_14	0x32
#define JACK_PLUG_15	0x33
#define JACK_PLUG_16	0x34

#define JACK_UNPLUG_1	0x05
#define JACK_UNPLUG_2	0x06
#define JACK_UNPLUG_3	0x07
#define JACK_UNPLUG_4	0x08
#define JACK_UNPLUG_5	0x15
#define JACK_UNPLUG_6	0x16
#define JACK_UNPLUG_7	0x17
#define JACK_UNPLUG_8	0x18
#define JACK_UNPLUG_9	0x25
#define JACK_UNPLUG_10	0x26
#define JACK_UNPLUG_11	0x27
#define JACK_UNPLUG_12	0x28
#define JACK_UNPLUG_13	0x35
#define JACK_UNPLUG_14	0x36
#define JACK_UNPLUG_15	0x37
#define JACK_UNPLUG_16	0x38

#define SELECT_TX_INTERNAL	0x09
#define SELECT_TX_ExTERNAL	0x0A

#define SELECT_TX_ON_1		0x0D
#define SELECT_TX_ON_2		0x1D
#define SELECT_TX_ON_3		0x2D
#define SELECT_TX_ON_4		0x3D

#define JACK_PLUG_RX_1		0x0B
#define JACK_UNPLUG_RX_1	0x0C
#define JACK_PLUG_RX_2		0x1B
#define JACK_UNPLUG_RX_2	0x1C
#define JACK_PLUG_RX_3		0x2B
#define JACK_UNPLUG_RX_3	0x2C
#define JACK_PLUG_RX_4		0x3B
#define JACK_UNPLUG_RX_4	0x3C

#define COMMANDIR_PLUG_1	0x41
#define COMMANDIR_PLUG_2	0x42
#define COMMANDIR_PLUG_3	0x43
#define COMMANDIR_PLUG_4	0x44

#define COMMANDIR_UNPLUG_1	0x45
#define COMMANDIR_UNPLUG_2	0x46
#define COMMANDIR_UNPLUG_3	0x47
#define COMMANDIR_UNPLUG_4	0x48

#define COMMANDIR_REORDERED	0x50
#define COMMANDIR_READY		0x51
#define COMMANDIR_STOPPED	0x52
#define COMMANDIR_POLL_FASTER	0x53
#define COMMANDIR_POLL_SLOWER	0x54

#define SETTRANSMITTERS_1	0xf0
#define SETTRANSMITTERS_2	0xf1
#define SETTRANSMITTERS_3	0xf2
#define SETTRANSMITTERS_4	0xf3
#define SETTRANSMITTERS_5	0xf4
#define SETTRANSMITTERS_6	0xf5
#define SETTRANSMITTERS_7	0xf6
#define SETTRANSMITTERS_8	0xf7
#define SETTRANSMITTERS_9	0xf8
#define SETTRANSMITTERS_10	0xf9
#define SETTRANSMITTERS_11	0xfa
#define SETTRANSMITTERS_12	0xfb
#define SETTRANSMITTERS_13	0xfc
#define SETTRANSMITTERS_14	0xfd
#define SETTRANSMITTERS_15	0xfe
#define SETTRANSMITTERS_16	0xff

// What's in a returning data packet
#define COMMANDIR_RX_EVENTS 		0x02
#define COMMANDIR_RX_DATA			0x01


#endif

lirc-0.8.4-standardize-remote-keycodes.patch:

--- NEW FILE lirc-0.8.4-standardize-remote-keycodes.patch ---
diff -Naurp lirc-0.8.4pre1.orig/remotes/adaptec/lircd.conf.AVC-2410 lirc-0.8.4pre1/remotes/adaptec/lircd.conf.AVC-2410
--- lirc-0.8.4pre1.orig/remotes/adaptec/lircd.conf.AVC-2410	2005-03-28 04:25:36.000000000 -0500
+++ lirc-0.8.4pre1/remotes/adaptec/lircd.conf.AVC-2410	2008-09-24 17:06:37.000000000 -0400
@@ -29,30 +29,30 @@ begin remote
           Live                     0x00000000000025DA
           Timeshift                0x00000000000017E8
           Scan                     0x00000000000018e7
-          Power                    0x00000000000009f6
-          1                        0x00000000000026D9
-          2                        0x00000000000019E6
-          3                        0x00000000000010EF
-          4                        0x00000000000027D8
-          5                        0x00000000000020DF
-          6                        0x00000000000011EE
-          7                        0x00000000000028D7
-          8                        0x00000000000021DE
-          9                        0x00000000000012ED
-          0                        0x00000000000022DD
-          Mute                     0x00000000000013EC
+          KEY_POWER                    0x00000000000009f6
+          KEY_1                        0x00000000000026D9
+          KEY_2                        0x00000000000019E6
+          KEY_3                        0x00000000000010EF
+          KEY_4                        0x00000000000027D8
+          KEY_5                        0x00000000000020DF
+          KEY_6                        0x00000000000011EE
+          KEY_7                        0x00000000000028D7
+          KEY_8                        0x00000000000021DE
+          KEY_9                        0x00000000000012ED
+          KEY_0                        0x00000000000022DD
+          KEY_MUTE                     0x00000000000013EC
           Full                     0x00000000000029D6
-          Play                     0x00000000000030CF
-          Stop                     0x00000000000023DC
-          Skip                     0x00000000000024DB
-          Replay                   0x00000000000014EB
-          Rewind                   0x00000000000031CE
-          Forward                  0x00000000000015EA
-          Ch+                      0x00000000000001FE
-          Ch-                      0x00000000000005FA
-          Vol+                     0x00000000000004FB
-          Vol-                     0x00000000000002FD
-          Enter                    0x00000000000003FC
+          KEY_PLAY                     0x00000000000030CF
+          KEY_STOP                     0x00000000000023DC
+          KEY_NEXT                     0x00000000000024DB
+          KEY_AGAIN                   0x00000000000014EB
+          KEY_REWIND                   0x00000000000031CE
+          KEY_FORWARD                  0x00000000000015EA
+          KEY_CHANNELUP                      0x00000000000001FE
+          KEY_CHANNELDOWN                      0x00000000000005FA
+          KEY_VOLUMEUP                     0x00000000000004FB
+          KEY_VOLUMEDOWN                     0x00000000000002FD
+          KEY_ENTER                    0x00000000000003FC
           OSD                      0x00000000000032CD
           cc                       0x00000000000016E9
       end codes
diff -Naurp lirc-0.8.4pre1.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.4pre1/remotes/adstech/lircd.conf.usbx-707
--- lirc-0.8.4pre1.orig/remotes/adstech/lircd.conf.usbx-707	2008-09-24 17:05:54.000000000 -0400
+++ lirc-0.8.4pre1/remotes/adstech/lircd.conf.usbx-707	2008-09-24 17:06:37.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
-          Search                   0x02FD5DA200
+          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
+                               0x02FD55AA00
+          KEY_0                        0x02FD4DB200
+                             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
+          KEY_UP                       0x02FD0FF000
+          KEY_MENU                     0x02FD1FE000
+          KEY_LEFT                     0x02FD16E900
+          KEY_ENTER                    0x02FD0EF100
+          KEY_RIGHT                    0x02FD1EE100
+          KEY_INFO                     0x02FD5AA500
+          KEY_DOWN                     0x02FD46B900
+                               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.4pre1.orig/remotes/animax/lircd.conf.animax lirc-0.8.4pre1/remotes/animax/lircd.conf.animax
--- lirc-0.8.4pre1.orig/remotes/animax/lircd.conf.animax	1999-04-29 17:30:59.000000000 -0400
+++ lirc-0.8.4pre1/remotes/animax/lircd.conf.animax	2008-09-24 17:06:37.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
[...4137 lines suppressed...]
-          Down                     0x1d
+          KEY_BACK                     0x0b
+                                 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
-          Rew                      0x0d
-          Play                     0x09
-          Ffwd                     0x15
-          Prev                     0x1a
-          Stop                     0x01
-          Next                     0x1e
-          Pause                    0x05
-          Mute                     0x4a
+          KEY_REWIND                      0x0d
+          KEY_PLAY                     0x09
+                               0x15
+          KEY_PREVIOUS                     0x1a
+          KEY_STOP                     0x01
+          KEY_NEXT                     0x1e
+          KEY_PAUSE                    0x05
+          KEY_MUTE                     0x4a
           Warp_Mouse               0x47
-          Rec                      0x11
+          KEY_RECORD                      0x11
           DVD_Zoom                 0x14
           Detail                   0x4b
       end codes
diff -Naurp lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.4pre1/remotes/x10/lircd.conf.mouseremote
--- lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mouseremote	2005-01-22 05:40:43.000000000 -0500
+++ lirc-0.8.4pre1/remotes/x10/lircd.conf.mouseremote	2008-09-24 17:06:37.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.4pre1.orig/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.4pre1/remotes/x10/lircd.conf.mp3anywhere
--- lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mp3anywhere	2007-07-01 03:09:11.000000000 -0400
+++ lirc-0.8.4pre1/remotes/x10/lircd.conf.mp3anywhere	2008-09-24 17:06:37.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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	4 May 2008 18:08:35 -0000	1.23
+++ .cvsignore	24 Sep 2008 22:15:49 -0000	1.24
@@ -1 +1,2 @@
 lirc-0.8.3.tar.bz2
+lirc-0.8.4pre1.tar.bz2

lirc-use-new-instead-of-conf-as-filename-suffix.patch:

Index: lirc-use-new-instead-of-conf-as-filename-suffix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/lirc-use-new-instead-of-conf-as-filename-suffix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lirc-use-new-instead-of-conf-as-filename-suffix.patch	2 Jun 2008 18:57:47 -0000	1.1
+++ lirc-use-new-instead-of-conf-as-filename-suffix.patch	24 Sep 2008 22:15:49 -0000	1.2
@@ -6,23 +6,15 @@
  to prevent a buffer overrun for 'argv[optind]'.
 
 ---
- daemons/irrecord.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/daemons/irrecord.c b/daemons/irrecord.c
-index ea298e3..df03c7b 100644
---- a/daemons/irrecord.c
-+++ b/daemons/irrecord.c
-@@ -364,7 +364,7 @@ int main(int argc,char **argv)
+diff -Naurp lirc.orig/daemons/irrecord.c lirc/daemons/irrecord.c
+--- lirc.orig/daemons/irrecord.c	2008-08-27 13:04:46.000000000 -0400
++++ lirc/daemons/irrecord.c		2008-09-24 17:01:37.000000000 -0400
+@@ -493,7 +493,7 @@ int main(int argc,char **argv)
  			exit(EXIT_FAILURE);
  		}
  		strcpy(filename_new, filename);
 -		strcat(filename_new, ".conf");
-+		strcat(filename_new,".new");
-		filename = filename_new;
++		strcat(filename_new, ".new");
+ 		filename = filename_new;
  	}
- 	fout=fopen(filename,"w");
- 	if(fout==NULL)
--- 
-1.5.3.7
-
+ 	else


Index: lirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- lirc.spec	16 Sep 2008 13:36:23 -0000	1.38
+++ lirc.spec	24 Sep 2008 22:15:49 -0000	1.39
@@ -14,29 +14,26 @@
 %bcond_with     portaudio
 %bcond_with     svgalib
 %bcond_without  x
-#define pre     pre3
+%define pre     pre1
 
 Name:           lirc
-Version:        0.8.3
-Release:        7%{?pre:.%{pre}}%{?dist}
+Version:        0.8.4
+Release:        0.1%{?pre:.%{pre}}%{?dist}
 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://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
+#Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
-Patch0:         lirc-0.8.3-remote-includes-directive.patch
-Patch1:         lirc-0.8.3-validate-transmit-buffer.patch
-Patch2:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
+# temporary, was accidentally left out of 0.8.4pre1 tarball
+Source3:        hw_commandir.h
+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
-Patch3:		lirc-0.8.3-fix-remote-keycodes.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=440231
-# http://thread.gmane.org/gmane.comp.hardware.lirc/6889
-Patch4:		lirc-dont-exit.patch
+Patch1:		lirc-0.8.4-standardize-remote-keycodes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -120,10 +117,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?pre}
-%patch0 -p1 -b .incl
-%patch1 -p1 -b .xbuf
-%patch2 -p1 -b .suf
-%patch4 -p0 -b .exit
+%patch0 -p1 -b .suf
+cp %{SOURCE3} daemons/
 
 chmod 644 contrib/*
 
@@ -156,7 +151,7 @@
 touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 
 # Do this after, as we're touching the remote definitions earlier
-%patch3 -p1 -b .keycode
+%patch1 -p1 -b .keycode
 
 %build
 %configure \
@@ -268,6 +263,11 @@
 
 
 %changelog
+* Wed Sep 24 2008 - Jarod Wilson <jarod at redhat.com> - 0.8.4-0.1.pre1
+- Update to 0.8.4pre1
+- Drop upstream patches
+- Adds support for the CommandIR II userspace driver
+
 * Tue Sep 16 2008 - Jarod Wilson <jarod at redhat.com> - 0.8.3-7
 - Fix multilib upgrade path from F8 (Nicolas Chauvet, #462435)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	4 May 2008 18:08:35 -0000	1.23
+++ sources	24 Sep 2008 22:15:49 -0000	1.24
@@ -1 +1 @@
-8e78eeded7b31e5ad02e328970437c0f  lirc-0.8.3.tar.bz2
+b79601ea90fa552653dfc69e29fd5c4d  lirc-0.8.4pre1.tar.bz2


--- lirc-0.8.3-fix-remote-keycodes.patch DELETED ---


--- lirc-0.8.3-remote-includes-directive.patch DELETED ---


--- lirc-0.8.3-validate-transmit-buffer.patch DELETED ---



From mpg at fedoraproject.org  Wed Sep 24 22:47:32 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Wed, 24 Sep 2008 22:47:32 +0000 (UTC)
Subject: rpms/sugar-toolkit/OLPC-3 sugar-toolkit.spec,1.23,1.24
Message-ID: <20080924224732.59A3670103@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-toolkit/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23795

Modified Files:
	sugar-toolkit.spec 
Log Message:
* Wed Sep 24 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.11-2
- Add a patch to use system localedir for system installed bundles




Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sugar-toolkit.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sugar-toolkit.spec	24 Sep 2008 10:58:52 -0000	1.23
+++ sugar-toolkit.spec	24 Sep 2008 22:47:02 -0000	1.24
@@ -6,7 +6,7 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.82.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -19,6 +19,8 @@
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: localedir.patch
+
 BuildRequires: pkgconfig
 BuildRequires: pygtk2-devel
 BuildRequires: gettext
@@ -44,6 +46,8 @@
 %prep
 %setup -q
 
+%patch1  -p0 -b .localedir
+
 %build
 %configure
 make
@@ -66,6 +70,9 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Wed Sep 24 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.11-2
+- Add a patch to use system localedir for system installed bundles
+
 * Wed Sep 24 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.11-1
 - #8626 Icons overlap unnecessarily in crowded neighborhood view.
 



From mpg at fedoraproject.org  Wed Sep 24 22:53:46 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Wed, 24 Sep 2008 22:53:46 +0000 (UTC)
Subject: rpms/sugar-toolkit/OLPC-3 localedir.patch, NONE,
	1.1 sugar-toolkit.spec, 1.24, 1.25
Message-ID: <20080924225346.EB62570103@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-toolkit/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24276

Modified Files:
	sugar-toolkit.spec 
Added Files:
	localedir.patch 
Log Message:
* Wed Sep 24 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.11-3
- Apply the patch with -p1


localedir.patch:

--- NEW FILE localedir.patch ---
diff --git a/src/sugar/activity/activityfactory.py b/src/sugar/activity/activityfactory.py
index 99f8997..af6674e 100644
--- a/src/sugar/activity/activityfactory.py
+++ b/src/sugar/activity/activityfactory.py
@@ -115,6 +115,9 @@ def get_environment(activity):
     environ['PATH'] = bin_path + ':' + environ['PATH']
     #environ['RAINBOW_STRACE_LOG'] = '1'
 
+    if activity.path.startswith(env.get_user_activities_path()):
+        environ['SUGAR_LOCALEDIR'] = os.path.join(activity.path, 'locale')
+
     if activity.bundle_id in [ 'org.laptop.WebActivity', 
                                'org.laptop.GmailActivity',
                                'org.laptop.WikiBrowseActivity'
diff --git a/src/sugar/activity/main.py b/src/sugar/activity/main.py
index 28dfee3..0295bf9 100644
--- a/src/sugar/activity/main.py
+++ b/src/sugar/activity/main.py
@@ -89,8 +89,11 @@ def main():
 
     gtk.icon_theme_get_default().append_search_path(bundle.get_icons_path())
 
-    gettext.bindtextdomain(bundle.get_bundle_id(),
-                           bundle.get_locale_path())
+    locale_path = None
+    if 'SUGAR_LOCALEDIR' in os.environ:
+        locale_path = os.environ['SUGAR_LOCALEDIR']
+
+    gettext.bindtextdomain(bundle.get_bundle_id(), locale_path)
     gettext.textdomain(bundle.get_bundle_id())
 
     splitted_module = args[0].rsplit('.', 1)


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sugar-toolkit.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sugar-toolkit.spec	24 Sep 2008 22:47:02 -0000	1.24
+++ sugar-toolkit.spec	24 Sep 2008 22:53:16 -0000	1.25
@@ -6,7 +6,7 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.82.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -46,7 +46,7 @@
 %prep
 %setup -q
 
-%patch1  -p0 -b .localedir
+%patch1 -p1 -b .localedir
 
 %build
 %configure
@@ -70,6 +70,9 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Wed Sep 24 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.11-3
+- Apply the patch with -p1
+
 * Wed Sep 24 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.11-2
 - Add a patch to use system localedir for system installed bundles
 



From hadess at fedoraproject.org  Thu Sep 25 00:02:31 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 25 Sep 2008 00:02:31 +0000 (UTC)
Subject: rpms/bluez/devel bluez-bluetoothd-crasher.patch, NONE,
	1.1 bluez.spec, 1.6, 1.7
Message-ID: <20080925000231.6F1DD7013D@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29186

Modified Files:
	bluez.spec 
Added Files:
	bluez-bluetoothd-crasher.patch 
Log Message:
* Wed Sep 24 2008 - Bastien Nocera <bnocera at redhat.com> - 4.6-2
- Fix possible crasher on resume from suspend


bluez-bluetoothd-crasher.patch:

--- NEW FILE bluez-bluetoothd-crasher.patch ---
diff --git a/src/security.c b/src/security.c
index fd2535f..6a9a5c4 100644
--- a/src/security.c
+++ b/src/security.c
@@ -46,6 +46,7 @@
 
 #include <dbus/dbus.h>
 
+#include "hcid.h"
 #include "logging.h"
 #include "textfile.h"
 
@@ -789,6 +790,27 @@ static inline void conn_request(int dev, bdaddr_t *sba, void *ptr)
 	write_remote_class(sba, &evt->bdaddr, class);
 }
 
+static void delete_channel(GIOChannel *chan)
+{
+	gint i, found;
+
+	/* Look for the GIOChannel in the table */
+	found = -1;
+	for (i = 0; i < HCI_MAX_DEV; i++) {
+		if (io_data[i].channel == chan) {
+			found = i;
+			break;
+		}
+	}
+
+	if (found == -1) {
+		g_warning("IO channel not found in the io_data table");
+		return;
+	}
+
+	stop_security_manager(i);
+}
+
 static gboolean io_security_event(GIOChannel *chan, GIOCondition cond, gpointer data)
 {
 	unsigned char buf[HCI_MAX_EVENT_SIZE], *ptr = buf;
@@ -799,14 +821,14 @@ static gboolean io_security_event(GIOChannel *chan, GIOCondition cond, gpointer
 	GIOError err;
 
 	if (cond & (G_IO_NVAL | G_IO_HUP | G_IO_ERR)) {
-		g_io_channel_unref(chan);
+		delete_channel(chan);
 		return FALSE;
 	}
 
 	if ((err = g_io_channel_read(chan, (gchar *) buf, sizeof(buf), &len))) {
 		if (err == G_IO_ERROR_AGAIN)
 			return TRUE;
-		g_io_channel_unref(chan);
+		delete_channel(chan);
 		return FALSE;
 	}
 


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bluez.spec	14 Sep 2008 21:11:24 -0000	1.6
+++ bluez.spec	25 Sep 2008 00:02:00 -0000	1.7
@@ -1,13 +1,14 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.6
-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
 Patch1: bluez-utils-oui-usage.patch
+Patch2: bluez-bluetoothd-crasher.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -96,6 +97,7 @@
 
 %setup -q
 %patch1 -p0 -b .oui
+%patch2 -p0 -b .security
 
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
@@ -181,6 +183,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Wed Sep 24 2008 - Bastien Nocera <bnocera at redhat.com> - 4.6-2
+- Fix possible crasher on resume from suspend
+
 * Sun Sep 14 2008 - David Woodhouse <David.Woodhouse at intel.com> - 4.6-1
 - Update to 4.6
 



From hadess at fedoraproject.org  Thu Sep 25 00:13:46 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 25 Sep 2008 00:13:46 +0000 (UTC)
Subject: rpms/bluez/devel bluez.spec,1.7,1.8
Message-ID: <20080925001346.7643C7013D@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29979

Modified Files:
	bluez.spec 
Log Message:
* Wed Sep 24 2008 - Bastien Nocera <bnocera at redhat.com> - 4.6-3
- Add fuzz



Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bluez.spec	25 Sep 2008 00:02:00 -0000	1.7
+++ bluez.spec	25 Sep 2008 00:13:13 -0000	1.8
@@ -1,7 +1,9 @@
+%define _default_patch_fuzz 2
+
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -183,6 +185,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Wed Sep 24 2008 - Bastien Nocera <bnocera at redhat.com> - 4.6-3
+- Add fuzz
+
 * Wed Sep 24 2008 - Bastien Nocera <bnocera at redhat.com> - 4.6-2
 - Fix possible crasher on resume from suspend
 



From spot at fedoraproject.org  Thu Sep 25 00:58:18 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 25 Sep 2008 00:58:18 +0000 (UTC)
Subject: rpms/WindowMaker/devel WindowMaker-0.91.0-alt-clipnotext.patch, 1.1,
	1.2 WindowMaker-0.91.0-alt-menutrans.patch, 1.1,
	1.2 WindowMaker-0.91.0-wmcontrib-singleclick.patch, 1.1,
	1.2 WindowMaker.spec, 1.27, 1.28
Message-ID: <20080925005818.E30877010A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/WindowMaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv791

Modified Files:
	WindowMaker-0.91.0-alt-clipnotext.patch 
	WindowMaker-0.91.0-alt-menutrans.patch 
	WindowMaker-0.91.0-wmcontrib-singleclick.patch 
	WindowMaker.spec 
Log Message:
fix patches to apply without fuzz

WindowMaker-0.91.0-alt-clipnotext.patch:

Index: WindowMaker-0.91.0-alt-clipnotext.patch
===================================================================
RCS file: /cvs/pkgs/rpms/WindowMaker/devel/WindowMaker-0.91.0-alt-clipnotext.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WindowMaker-0.91.0-alt-clipnotext.patch	2 Mar 2006 14:16:26 -0000	1.1
+++ WindowMaker-0.91.0-alt-clipnotext.patch	25 Sep 2008 00:57:48 -0000	1.2
@@ -24,11 +24,11 @@
      {"LargeDisplayFont",DEF_WORKSPACE_NAME_FONT, NULL,
      NULL,				getFont,	setLargeDisplayFont
      },
---- WindowMaker-0.91.0/src/WindowMaker.h.vns	2005-05-18 16:29:46 +0400
-+++ WindowMaker-0.91.0/src/WindowMaker.h	2005-05-18 16:29:46 +0400
-@@ -490,6 +490,8 @@
-     /* single click to lauch applications */
-     char single_click;
+--- WindowMaker-0.92.0/src/WindowMaker.h.orig	2008-09-24 20:48:19.000000000 -0400
++++ WindowMaker-0.92.0/src/WindowMaker.h	2008-09-24 20:49:47.000000000 -0400
+@@ -481,6 +481,8 @@
+     RImage *swtileImage;
+     RImage *swbackImage[9];
  
 +    int show_clip_title;
 +

WindowMaker-0.91.0-alt-menutrans.patch:

Index: WindowMaker-0.91.0-alt-menutrans.patch
===================================================================
RCS file: /cvs/pkgs/rpms/WindowMaker/devel/WindowMaker-0.91.0-alt-menutrans.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WindowMaker-0.91.0-alt-menutrans.patch	2 Mar 2006 14:16:26 -0000	1.1
+++ WindowMaker-0.91.0-alt-menutrans.patch	25 Sep 2008 00:57:48 -0000	1.2
@@ -88,18 +88,6 @@
                           shortcut ? WMGetFromPLString(shortcut) : NULL,
                           WMGetFromPLString(command),
                           params ? WMGetFromPLString(params) : NULL, "WMRootMenu");
---- WindowMaker-0.91.0/src/defaults.c.vns	2005-05-18 14:12:23 +0400
-+++ WindowMaker-0.91.0/src/defaults.c	2005-05-18 14:12:23 +0400
-@@ -556,6 +556,9 @@
-     {"SingleClickLaunch",	"NO",	NULL,
-     &wPreferences.single_click,	getBool,	NULL
-     },
-+    {"TranslateMenu",	"YES",		NULL,
-+    &wPreferences.translate_menu,	getBool,	NULL
-+    },
-     /* style options */
-     {"MenuStyle", 	"normal",  		seMenuStyles,
-     &wPreferences.menu_style, getEnum, 	setMenuStyle
 --- WindowMaker-0.91.0/src/WindowMaker.h.vns	2005-05-18 14:12:23 +0400
 +++ WindowMaker-0.91.0/src/WindowMaker.h	2005-05-18 14:12:23 +0400
 @@ -466,6 +466,8 @@
@@ -165,3 +153,15 @@
      textdomain("WindowMaker");
  
      if (!XSupportsLocale()) {
+--- WindowMaker-0.92.0/src/defaults.c.orig	2005-04-08 06:59:16.000000000 -0400
++++ WindowMaker-0.92.0/src/defaults.c	2008-09-24 20:47:32.000000000 -0400
+@@ -553,6 +553,9 @@
+     {"DisableBlinking",	"NO",		NULL,
+     &wPreferences.dont_blink,	getBool,	NULL
+     },
++    {"TranslateMenu",	"YES",		NULL,
++    &wPreferences.translate_menu,	getBool,	NULL
++    },
+     /* style options */
+     {"MenuStyle", 	"normal",  		seMenuStyles,
+     &wPreferences.menu_style, getEnum, 	setMenuStyle

WindowMaker-0.91.0-wmcontrib-singleclick.patch:

Index: WindowMaker-0.91.0-wmcontrib-singleclick.patch
===================================================================
RCS file: /cvs/pkgs/rpms/WindowMaker/devel/WindowMaker-0.91.0-wmcontrib-singleclick.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WindowMaker-0.91.0-wmcontrib-singleclick.patch	2 Mar 2006 14:16:26 -0000	1.1
+++ WindowMaker-0.91.0-wmcontrib-singleclick.patch	25 Sep 2008 00:57:48 -0000	1.2
@@ -26,30 +26,6 @@
              done = 1;
              break;
          }
---- WindowMaker-0.91.0/src/WindowMaker.h.sc	2004-10-25 05:48:39 +0400
-+++ WindowMaker-0.91.0/src/WindowMaker.h	2005-05-17 23:37:26 +0400
-@@ -475,6 +475,9 @@
-     RImage *swtileImage;
-     RImage *swbackImage[9];
- 
-+    /* single click to lauch applications */
-+    char single_click;
-+
-     struct {
-         unsigned int nodock:1;	       /* don't display the dock */
-         unsigned int noclip:1;         /* don't display the clip */
---- WindowMaker-0.91.0/src/defaults.c.sc	2005-05-17 23:37:09 +0400
-+++ WindowMaker-0.91.0/src/defaults.c	2005-05-17 23:37:26 +0400
-@@ -553,6 +553,9 @@
-     {"DisableBlinking",	"NO",		NULL,
-     &wPreferences.dont_blink,	getBool,	NULL
-     },
-+    {"SingleClickLaunch",	"NO",	NULL,
-+    &wPreferences.single_click,	getBool,	NULL
-+    },
-     /* style options */
-     {"MenuStyle", 	"normal",  		seMenuStyles,
-     &wPreferences.menu_style, getEnum, 	setMenuStyle
 --- WindowMaker-0.91.0/src/dock.c.sc	2004-10-23 07:10:40 +0400
 +++ WindowMaker-0.91.0/src/dock.c	2005-05-17 23:37:26 +0400
 @@ -3758,7 +3758,7 @@
@@ -166,3 +142,27 @@
  }
  
  
+--- WindowMaker-0.92.0/src/defaults.c.orig	2008-09-24 20:51:16.000000000 -0400
++++ WindowMaker-0.92.0/src/defaults.c	2008-09-24 20:53:20.000000000 -0400
+@@ -555,6 +555,9 @@
+     {"DisableBlinking",	"NO",		NULL,
+     &wPreferences.dont_blink,	getBool,	NULL
+     },
++    {"SingleClickLaunch",	"NO",	NULL,
++    &wPreferences.single_click,		getBool,	NULL
++    },
+     {"TranslateMenu",	"YES",		NULL,
+     &wPreferences.translate_menu,	getBool,	NULL
+     },
+--- WindowMaker-0.92.0/src/WindowMaker.h.orig	2008-09-24 20:51:16.000000000 -0400
++++ WindowMaker-0.92.0/src/WindowMaker.h	2008-09-24 20:52:01.000000000 -0400
+@@ -481,6 +481,9 @@
+     RImage *swtileImage;
+     RImage *swbackImage[9];
+ 
++    /* single click to lauch applications */
++    char single_click;
++
+     int show_clip_title;
+ 
+     struct {


Index: WindowMaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/WindowMaker/devel/WindowMaker.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- WindowMaker.spec	11 Feb 2008 15:58:43 -0000	1.27
+++ WindowMaker.spec	25 Sep 2008 00:57:48 -0000	1.28
@@ -1,12 +1,12 @@
 Summary:	A fast, feature rich Window Manager
 Name:		WindowMaker
 Version:	0.92.0
-Release:	17%{?dist}
+Release:	18%{?dist}
 
 License:	GPLv2+
 Group:		User Interface/Desktops
-URL:		http://www.windowmaker.org/
-Source0:	ftp://windowmaker.org/pub/source/release/WindowMaker-0.92.0.tar.bz2
+URL:		http://www.windowmaker.info/
+Source0:	ftp://windowmaker.info/pub/source/release/WindowMaker-0.92.0.tar.bz2
 Source2:        WindowMaker.desktop
 Source3:	WindowMaker-uk.po
 Source4:	WPrefs-uk.po
@@ -260,6 +260,10 @@
 %{_includedir}/wraster.h
 
 %changelog
+* Wed Sep 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.92.0-18
+- fix patches to apply without fuzz
+- adjust URL/Source to new website
+
 * Mon Feb 11 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.92.0-17
 - Rebuilt for gcc43
 



From davej at fedoraproject.org  Thu Sep 25 00:59:19 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Thu, 25 Sep 2008 00:59:19 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc7-git3.bz2.sign, NONE,
	1.1 .cvsignore, 1.930, 1.931 kernel.spec, 1.976,
	1.977 linux-2.6-compile-fixes.patch, 1.176, 1.177 sources, 1.892,
	1.893 upstream, 1.804, 1.805 patch-2.6.27-rc7-git2.bz2.sign, 1.1, NONE
Message-ID: <20080925005919.7124D7010A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1177

Modified Files:
	.cvsignore kernel.spec linux-2.6-compile-fixes.patch sources 
	upstream 
Added Files:
	patch-2.6.27-rc7-git3.bz2.sign 
Removed Files:
	patch-2.6.27-rc7-git2.bz2.sign 
Log Message:
2.6.27-rc7-git3


--- NEW FILE patch-2.6.27-rc7-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBI2tU4yGugalF9Dw4RArmGAJ0QQ2rZtw/VqGphWdkpIsOWcX7pbACePsFz
KxMHhC7Pue90GiIWZ0AFVKY=
=MclN
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.930
retrieving revision 1.931
diff -u -r1.930 -r1.931
--- .cvsignore	24 Sep 2008 21:18:20 -0000	1.930
+++ .cvsignore	25 Sep 2008 00:58:49 -0000	1.931
@@ -5,4 +5,4 @@
 kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc7.bz2
-patch-2.6.27-rc7-git2.bz2
+patch-2.6.27-rc7-git3.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.976
retrieving revision 1.977
diff -u -r1.976 -r1.977
--- kernel.spec	24 Sep 2008 21:18:20 -0000	1.976
+++ kernel.spec	25 Sep 2008 00:58:49 -0000	1.977
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1756,6 +1756,9 @@
 
 %changelog
 * Wed Sep 24 2008 Dave Jones <davej at redhat.com>
+- 2.6.27-rc7-git3
+
+* Wed Sep 24 2008 Dave Jones <davej at redhat.com>
 - 2.6.27-rc7-git2
 
 * Tue Sep 23 2008 Dave Jones <davej at redhat.com>

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- linux-2.6-compile-fixes.patch	24 Sep 2008 01:03:50 -0000	1.176
+++ linux-2.6-compile-fixes.patch	25 Sep 2008 00:58:49 -0000	1.177
@@ -5,18 +5,3 @@
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
 
-arch/x86/kernel/process_32.c: In function 'cpu_exit_clear':
-arch/x86/kernel/process_32.c:91: error: implicit declaration of function 'c1e_remove_cpu'
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.26.noarch/arch/x86/kernel/process_32.c~	2008-09-23 21:02:13.000000000 -0400
-+++ linux-2.6.26.noarch/arch/x86/kernel/process_32.c	2008-09-23 21:02:34.000000000 -0400
-@@ -55,6 +55,7 @@
- #include <asm/tlbflush.h>
- #include <asm/cpu.h>
- #include <asm/kdebug.h>
-+#include <asm/idle.h>
- 
- asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
- 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.892
retrieving revision 1.893
diff -u -r1.892 -r1.893
--- sources	24 Sep 2008 21:18:20 -0000	1.892
+++ sources	25 Sep 2008 00:58:49 -0000	1.893
@@ -1,3 +1,3 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 711e4624185c1e229e9aa4c736b57e05  patch-2.6.27-rc7.bz2
-5e7b3785de718236827ec2f3a51346e8  patch-2.6.27-rc7-git2.bz2
+7b2aa1f4f0f82effc25155e01eef8380  patch-2.6.27-rc7-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.804
retrieving revision 1.805
diff -u -r1.804 -r1.805
--- upstream	24 Sep 2008 21:18:20 -0000	1.804
+++ upstream	25 Sep 2008 00:58:49 -0000	1.805
@@ -1,3 +1,3 @@
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc7.bz2
-patch-2.6.27-rc7-git2.bz2
+patch-2.6.27-rc7-git3.bz2


--- patch-2.6.27-rc7-git2.bz2.sign DELETED ---



From lmacken at fedoraproject.org  Thu Sep 25 02:03:27 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 25 Sep 2008 02:03:27 +0000 (UTC)
Subject: rpms/python-simplejson/devel .cvsignore, 1.10,
	1.11 python-simplejson.spec, 1.18, 1.19 sources, 1.10, 1.11
Message-ID: <20080925020327.6265E7010A@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-simplejson/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5601

Modified Files:
	.cvsignore python-simplejson.spec sources 
Log Message:
* Wed Sep 24 2008 Luke Macken <lmacken at redhat.com> - 1.9.3-1
- Update to 1.9.3, which includes a significant decoding speed boost, and
  various bug fixes.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 May 2008 04:39:20 -0000	1.10
+++ .cvsignore	25 Sep 2008 02:02:57 -0000	1.11
@@ -1 +1 @@
-simplejson-1.9.1.tar.gz
+simplejson-1.9.3.tar.gz


Index: python-simplejson.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/devel/python-simplejson.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- python-simplejson.spec	6 May 2008 04:39:20 -0000	1.18
+++ python-simplejson.spec	25 Sep 2008 02:02:57 -0000	1.19
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-simplejson
-Version:        1.9.1
+Version:        1.9.3
 Release:        1%{?dist}
 Summary:        Simple, fast, extensible JSON encoder/decoder for Python
 
@@ -62,6 +62,10 @@
 
 
 %changelog
+* Wed Sep 24 2008 Luke Macken <lmacken at redhat.com> - 1.9.3-1
+- Update to 1.9.3, which includes a significant decoding speed boost, and
+  various bug fixes.
+
 * Tue May 06 2008 Luke Macken <lmacken at redhat.com> - 1.9.1-1
 - Update to 1.9.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	6 May 2008 04:39:20 -0000	1.10
+++ sources	25 Sep 2008 02:02:57 -0000	1.11
@@ -1 +1 @@
-d2ee608bdf6397b82a7cd53c8602b29e  simplejson-1.9.1.tar.gz
+321f7ad3a347e5a11814bcfecf8b9d11  simplejson-1.9.3.tar.gz



From rmeggins at fedoraproject.org  Thu Sep 25 02:04:38 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu, 25 Sep 2008 02:04:38 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-8 fedora-ds-base.spec, 1.12, 1.13 sources,
	1.13, 1.14
Message-ID: <20080925020438.C09BC7010A@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5838/F-8

Modified Files:
	fedora-ds-base.spec sources 
Log Message:
back out erroneous winsync memory leak fix


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-8/fedora-ds-base.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fedora-ds-base.spec	23 Sep 2008 22:30:23 -0000	1.12
+++ fedora-ds-base.spec	25 Sep 2008 02:04:08 -0000	1.13
@@ -5,7 +5,7 @@
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
 Version:          1.1.3
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -153,6 +153,9 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Wed Sep 24 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.3-2
+- rolled back bogus winsync memory leak fix
+
 * Tue Sep 23 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.3-1
 - winsync api improvements for modify operations
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-8/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	23 Sep 2008 22:30:23 -0000	1.13
+++ sources	25 Sep 2008 02:04:08 -0000	1.14
@@ -1,4 +1,4 @@
 a60d1ce51207e61c48b70aa85ae5e5a5  fedora-ds-base-1.1.0.tar.bz2
 c525e0412ae4b9582adbd01305126975  fedora-ds-base-1.1.1.tar.bz2
 797c93351e8fcca9bac6326e7270355e  fedora-ds-base-1.1.2.tar.bz2
-54c4c6d6ed64d97d63c032e82805d2ef  fedora-ds-base-1.1.3.tar.bz2
+65aeecb66a6977f7f4706569d02ad8ce  fedora-ds-base-1.1.3.tar.bz2



From rmeggins at fedoraproject.org  Thu Sep 25 02:04:38 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu, 25 Sep 2008 02:04:38 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-9 fedora-ds-base.spec, 1.18, 1.19 sources,
	1.15, 1.16
Message-ID: <20080925020438.F32C27010A@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5838/F-9

Modified Files:
	fedora-ds-base.spec sources 
Log Message:
back out erroneous winsync memory leak fix


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/fedora-ds-base.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fedora-ds-base.spec	23 Sep 2008 22:30:23 -0000	1.18
+++ fedora-ds-base.spec	25 Sep 2008 02:04:08 -0000	1.19
@@ -5,7 +5,7 @@
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
 Version:          1.1.3
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -156,6 +156,9 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Wed Sep 24 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.3-2
+- rolled back bogus winsync memory leak fix
+
 * Tue Sep 23 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.3-1
 - winsync api improvements for modify operations
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	23 Sep 2008 22:30:23 -0000	1.15
+++ sources	25 Sep 2008 02:04:08 -0000	1.16
@@ -1,4 +1,4 @@
 a60d1ce51207e61c48b70aa85ae5e5a5  fedora-ds-base-1.1.0.tar.bz2
 c525e0412ae4b9582adbd01305126975  fedora-ds-base-1.1.1.tar.bz2
 797c93351e8fcca9bac6326e7270355e  fedora-ds-base-1.1.2.tar.bz2
-54c4c6d6ed64d97d63c032e82805d2ef  fedora-ds-base-1.1.3.tar.bz2
+65aeecb66a6977f7f4706569d02ad8ce  fedora-ds-base-1.1.3.tar.bz2



From rmeggins at fedoraproject.org  Thu Sep 25 02:04:39 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu, 25 Sep 2008 02:04:39 +0000 (UTC)
Subject: rpms/fedora-ds-base/FC-6 fedora-ds-base.spec, 1.12, 1.13 sources,
	1.12, 1.13
Message-ID: <20080925020439.3389D7010A@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/FC-6
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5838/FC-6

Modified Files:
	fedora-ds-base.spec sources 
Log Message:
back out erroneous winsync memory leak fix


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/FC-6/fedora-ds-base.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fedora-ds-base.spec	23 Sep 2008 22:30:23 -0000	1.12
+++ fedora-ds-base.spec	25 Sep 2008 02:04:08 -0000	1.13
@@ -5,7 +5,7 @@
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
 Version:          1.1.3
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -153,6 +153,9 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Wed Sep 24 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.3-2
+- rolled back bogus winsync memory leak fix
+
 * Tue Sep 23 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.3-1
 - winsync api improvements for modify operations
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/FC-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Sep 2008 22:30:23 -0000	1.12
+++ sources	25 Sep 2008 02:04:08 -0000	1.13
@@ -1,4 +1,4 @@
 a60d1ce51207e61c48b70aa85ae5e5a5  fedora-ds-base-1.1.0.tar.bz2
 c525e0412ae4b9582adbd01305126975  fedora-ds-base-1.1.1.tar.bz2
 797c93351e8fcca9bac6326e7270355e  fedora-ds-base-1.1.2.tar.bz2
-54c4c6d6ed64d97d63c032e82805d2ef  fedora-ds-base-1.1.3.tar.bz2
+65aeecb66a6977f7f4706569d02ad8ce  fedora-ds-base-1.1.3.tar.bz2



From rmeggins at fedoraproject.org  Thu Sep 25 02:04:39 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu, 25 Sep 2008 02:04:39 +0000 (UTC)
Subject: rpms/fedora-ds-base/devel fedora-ds-base.spec, 1.19, 1.20 sources, 
	1.15, 1.16
Message-ID: <20080925020439.6A5BE7010A@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5838/devel

Modified Files:
	fedora-ds-base.spec sources 
Log Message:
back out erroneous winsync memory leak fix


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/fedora-ds-base.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- fedora-ds-base.spec	23 Sep 2008 22:30:24 -0000	1.19
+++ fedora-ds-base.spec	25 Sep 2008 02:04:09 -0000	1.20
@@ -5,7 +5,7 @@
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
 Version:          1.1.3
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -156,6 +156,9 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Wed Sep 24 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.3-2
+- rolled back bogus winsync memory leak fix
+
 * Tue Sep 23 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.3-1
 - winsync api improvements for modify operations
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	23 Sep 2008 22:30:24 -0000	1.15
+++ sources	25 Sep 2008 02:04:09 -0000	1.16
@@ -1,4 +1,4 @@
 a60d1ce51207e61c48b70aa85ae5e5a5  fedora-ds-base-1.1.0.tar.bz2
 c525e0412ae4b9582adbd01305126975  fedora-ds-base-1.1.1.tar.bz2
 797c93351e8fcca9bac6326e7270355e  fedora-ds-base-1.1.2.tar.bz2
-54c4c6d6ed64d97d63c032e82805d2ef  fedora-ds-base-1.1.3.tar.bz2
+65aeecb66a6977f7f4706569d02ad8ce  fedora-ds-base-1.1.3.tar.bz2



From petersen at fedoraproject.org  Thu Sep 25 02:23:55 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 25 Sep 2008 02:23:55 +0000 (UTC)
Subject: rpms/emacspeak/devel emacspeak-28.0-no-httpd.patch, NONE,
	1.1 emacspeak-15.0-fixpref.patch, 1.1, 1.2 emacspeak.spec, 1.23,
	1.24 emacspeak-no-linux-espeak.patch, 1.1,
	NONE emacspeak-tcl-pkgreq-tclx.patch, 1.5, NONE
Message-ID: <20080925022355.A76197013F@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/emacspeak/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7735

Modified Files:
	emacspeak-15.0-fixpref.patch emacspeak.spec 
Added Files:
	emacspeak-28.0-no-httpd.patch 
Removed Files:
	emacspeak-no-linux-espeak.patch 
	emacspeak-tcl-pkgreq-tclx.patch 
Log Message:
- update to 28.0 with emacspeak-28.0-no-httpd.patch
- replace emacspeak-tcl-pkgreq-tclx.patch with sed
- emacspeak-no-linux-espeak.patch no longer needed
- update emacspeak-15.0-fixpref.patch for patch fuzz


emacspeak-28.0-no-httpd.patch:

--- NEW FILE emacspeak-28.0-no-httpd.patch ---
diff -u emacspeak-28.0/Makefile\~ emacspeak-28.0/Makefile
--- emacspeak-28.0/Makefile~	2008-01-28 11:13:27.000000000 +1000
+++ emacspeak-28.0/Makefile	2008-09-25 12:12:45.000000000 +1000
@@ -285,8 +285,6 @@
 	$(INSTALL)  -m 644 ${JS}  $(libdir)/js
 	$(INSTALL) -d $(libdir)/servers
 	$(INSTALL) -d $(libdir)/servers/python
-	$(INSTALL) -d $(libdir)/servers/httpd
-	$(INSTALL)  -m 644 ${TCLHTTPD}  $(libdir)/servers/tts.tcl
 	$(INSTALL) -d $(libdir)/servers/linux-outloud
 	$(INSTALL)  -m 755 ${OUTLOUD}  $(libdir)/servers/linux-outloud
 	cp   ${PYFILES}  $(libdir)/servers/python

emacspeak-15.0-fixpref.patch:

Index: emacspeak-15.0-fixpref.patch
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/devel/emacspeak-15.0-fixpref.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacspeak-15.0-fixpref.patch	9 Sep 2004 04:30:41 -0000	1.1
+++ emacspeak-15.0-fixpref.patch	25 Sep 2008 02:23:55 -0000	1.2
@@ -1,11 +1,12 @@
---- emacspeak-15.0/info/Makefile.fixpref	Tue Mar  5 12:33:18 2002
-+++ emacspeak-15.0/info/Makefile	Tue Mar  5 12:34:00 2002
-@@ -11,7 +11,7 @@
+diff -up emacspeak-28.0/info/Makefile.orig emacspeak-28.0/info/Makefile
+--- emacspeak-28.0/info/Makefile.orig	2007-05-04 11:08:58.000000000 +1000
++++ emacspeak-28.0/info/Makefile	2008-09-25 09:47:25.000000000 +1000
+@@ -28,7 +28,7 @@ options.texi:  
  
  install: emacspeak.info
  	if test  -x /sbin/install-info ; then \
 -		install-info emacspeak.info /etc/info-dir; \
 +		install-info emacspeak.info $(infodir)/info-dir; \
  	fi
- 	$(INSTALL)  -m 644 emacspeak.info* $(infodir)
+ 	$(INSTALL)  -m 644 *.info* $(infodir)
  


Index: emacspeak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/devel/emacspeak.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- emacspeak.spec	4 Oct 2007 06:35:09 -0000	1.23
+++ emacspeak.spec	25 Sep 2008 02:23:55 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: emacspeak -- The Complete Audio Desktop
 Name: emacspeak
-Version: 26
-Release: 3%{?dist}
+Version: 28.0
+Release: 1%{?dist}
 # main lisp files are GPL2+
 # lisp/atom-blogger and lisp/g-client are BSD
 License: GPLv2+ and BSD
@@ -17,8 +17,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: emacs, tclx
 Patch0: emacspeak-15.0-fixpref.patch
-Patch1: emacspeak-tcl-pkgreq-tclx.patch
-Patch2: emacspeak-no-linux-espeak.patch
+Patch1: emacspeak-28.0-no-httpd.patch
 
 %description 
 Emacspeak is a speech interface that allows visually impaired users to
@@ -32,31 +31,27 @@
 opens up the Internet to visually impaired users around the world.
 
 %prep
-%setup -q -n %{name}-%{version}.0
-%patch0 -p1
-%patch1 -p1 -b .1-tclx
-%patch2 -p1 -b .2-espeak
+%setup -q
+%patch0 -p1 -b .0-infodir
+%patch1 -p1 -b .1-httpd
 
 
+sed -i -e "s%#!/usr/bin/tcl$%#!/usr/bin/tclsh\npackage require Tclx%" \
+  servers/{dtk-exp,espeak,outloud,speech-server,ssh-dtk-exp,ssh-outloud}
+
 %build
 make  config SRC=`pwd`
 make
 
-
 %install
 rm -rf %{buildroot}
-# make sure install-info is in path
-export PATH=$PATH:/sbin
-#mkdir -p %{buildroot}%{_infodir}
 make install prefix=%{buildroot}%{_prefix} infodir=%{buildroot}%{_infodir}
 rm -f %{buildroot}%{_infodir}/*dir
-#rm %{buildroot}%{_infodir}/*.gz
-perl -pi -e "s|%{buildroot}||g" %{buildroot}%{_bindir}/emacspeak
+sed -i -e "s|%{buildroot}||g" %{buildroot}%{_bindir}/emacspeak
  
 rm %{buildroot}%{_datadir}/emacs/site-lisp/emacspeak/{.nosearch,sounds/emacspeak.mp3}
 rm -r %{buildroot}%{_datadir}/emacs/site-lisp/emacspeak/{realaudio,shoutcast}
 
-
 %post
 /sbin/install-info %{_infodir}/emacspeak.info.gz %{_infodir}/dir --section "Accessibility" || :
 
@@ -78,7 +73,14 @@
 %{_infodir}/*
 
 %changelog
-* Thu Oct  4 2007 Jens Petersen <petersen at redhat.com> - 26-3
+* Thu Sep 25 2008 Jens Petersen <petersen at redhat.com> - 28.0-1
+- update to 28.0 with emacspeak-28.0-no-httpd.patch
+- replace emacspeak-tcl-pkgreq-tclx.patch with sed
+- emacspeak-no-linux-espeak.patch no longer needed
+- update emacspeak-15.0-fixpref.patch for patch fuzz
+
+
+* Thu Oct  4 2007 Jens Petersen <petersen at redhat.com> - 26-3.fc8
 - use requires instead of prereq for post and preun install-info
 
 * Mon Aug 13 2007 Jens Petersen <petersen at redhat.com>


--- emacspeak-no-linux-espeak.patch DELETED ---


--- emacspeak-tcl-pkgreq-tclx.patch DELETED ---



From petersen at fedoraproject.org  Thu Sep 25 02:32:32 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 25 Sep 2008 02:32:32 +0000 (UTC)
Subject: rpms/emacspeak/devel emacspeak.spec,1.24,1.25
Message-ID: <20080925023232.52B5B7010A@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/emacspeak/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8595

Modified Files:
	emacspeak.spec 
Log Message:
remove empty line from changelog



Index: emacspeak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/devel/emacspeak.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- emacspeak.spec	25 Sep 2008 02:23:55 -0000	1.24
+++ emacspeak.spec	25 Sep 2008 02:32:02 -0000	1.25
@@ -79,7 +79,6 @@
 - emacspeak-no-linux-espeak.patch no longer needed
 - update emacspeak-15.0-fixpref.patch for patch fuzz
 
-
 * Thu Oct  4 2007 Jens Petersen <petersen at redhat.com> - 26-3.fc8
 - use requires instead of prereq for post and preun install-info
 



From petersen at fedoraproject.org  Thu Sep 25 02:35:29 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 25 Sep 2008 02:35:29 +0000 (UTC)
Subject: rpms/emacspeak/devel .cvsignore,1.8,1.9 sources,1.8,1.9
Message-ID: <20080925023529.0668B7010A@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/emacspeak/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8806

Modified Files:
	.cvsignore sources 
Log Message:
update source to new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 May 2007 03:56:49 -0000	1.8
+++ .cvsignore	25 Sep 2008 02:34:58 -0000	1.9
@@ -1,2 +1 @@
-emacspeak-25.tar.bz2
-emacspeak-26.tar.bz2
+emacspeak-28.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 May 2007 03:56:49 -0000	1.8
+++ sources	25 Sep 2008 02:34:58 -0000	1.9
@@ -1 +1 @@
-808f7a96bdfaed769b987774f5201669  emacspeak-26.tar.bz2
+c64e3894b7d7b4eeffa12a896bd68f7c  emacspeak-28.0.tar.bz2



From hadess at fedoraproject.org  Thu Sep 25 03:05:16 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 25 Sep 2008 03:05:16 +0000 (UTC)
Subject: rpms/bluez/devel bluez.spec,1.8,1.9
Message-ID: <20080925030516.238F87010A@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12033

Modified Files:
	bluez.spec 
Log Message:
* Wed Sep 24 2008 - Bastien Nocera <bnocera at redhat.com> - 4.6-4
- Fix patch application



Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bluez.spec	25 Sep 2008 00:13:13 -0000	1.8
+++ bluez.spec	25 Sep 2008 03:04:45 -0000	1.9
@@ -3,7 +3,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -99,7 +99,7 @@
 
 %setup -q
 %patch1 -p0 -b .oui
-%patch2 -p0 -b .security
+%patch2 -p1 -b .security
 
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
@@ -185,6 +185,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Wed Sep 24 2008 - Bastien Nocera <bnocera at redhat.com> - 4.6-4
+- Fix patch application
+
 * Wed Sep 24 2008 - Bastien Nocera <bnocera at redhat.com> - 4.6-3
 - Add fuzz
 



From tagoh at fedoraproject.org  Thu Sep 25 03:52:41 2008
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 25 Sep 2008 03:52:41 +0000 (UTC)
Subject: rpms/imsettings/devel .cvsignore, 1.8, 1.9 imsettings.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <20080925035241.189077010A@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19195

Modified Files:
	.cvsignore imsettings.spec sources 
Log Message:
* Thu Sep 25 2008 Akira TAGOH <tagoh at redhat.com> - 0.104.1-1
- New upstream release.
  - Fix a segfault issue. (#462899)
  - Suppress the unnecessary notification. (#463797)
  - Add .schemas file missing. real fix of #460703.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 Sep 2008 14:52:36 -0000	1.8
+++ .cvsignore	25 Sep 2008 03:52:10 -0000	1.9
@@ -7,3 +7,4 @@
 imsettings-0.102.0.tar.bz2
 imsettings-0.103.0.tar.bz2
 imsettings-0.104.0.tar.bz2
+imsettings-0.104.1.tar.bz2


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- imsettings.spec	17 Sep 2008 14:52:36 -0000	1.11
+++ imsettings.spec	25 Sep 2008 03:52:10 -0000	1.12
@@ -1,5 +1,5 @@
 Name:		imsettings
-Version:	0.104.0
+Version:	0.104.1
 Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
@@ -18,7 +18,9 @@
 Group:		Applications/System
 Requires:	xorg-x11-xinit >= 1.0.2-22.fc8
 Requires:	imsettings-libs = %{version}-%{release}
-Requires(post):	/bin/dbus-send %{_sbindir}/alternatives
+Requires(pre):	GConf2
+Requires(post):	/bin/dbus-send %{_sbindir}/alternatives GConf2
+Requires(preun):	GConf2
 Requires(postun):	/bin/dbus-send %{_sbindir}/alternatives
 
 %description
@@ -80,7 +82,8 @@
 %build
 %configure	\
 	--with-xinputsh=50-xinput.sh \
-	--disable-static
+	--disable-static \
+	--disable-schemas-install
 
 make %{?_smp_mflags}
 
@@ -107,11 +110,25 @@
 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/imsettings-applet.schemas > /dev/null || :
+fi
+
 %post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas > /dev/null || :
 alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.conf 10
 alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xim.conf 30
 dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig > /dev/null 2>&1 || :
 
+%preun
+if [ "$1" -eq 0 ]; then
+	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas > /dev/null || :
+fi
+
 %postun
 if [ "$1" = 0 ]; then
 	alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.conf
@@ -136,6 +153,7 @@
 %{_sysconfdir}/X11/xinit/xinitrc.d/50-xinput.sh
 %{_sysconfdir}/X11/xinit/xinput.d
 %{_sysconfdir}/xdg/autostart/imsettings-applet.desktop
+%{_sysconfdir}/gconf/schemas/imsettings-applet.schemas
 
 %files	libs
 %defattr(-, root, root, -)
@@ -160,6 +178,12 @@
 
 
 %changelog
+* Thu Sep 25 2008 Akira TAGOH <tagoh at redhat.com> - 0.104.1-1
+- New upstream release.
+  - Fix a segfault issue. (#462899)
+  - Suppress the unnecessary notification. (#463797)
+  - Add .schemas file missing. real fix of #460703.
+
 * Wed Sep 17 2008 Akira TAGOH <tagoh at redhat.com> - 0.104.0-1
 - New upstream release.
   - Fix deadkey issue under XIM. (#457901)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Sep 2008 14:52:36 -0000	1.7
+++ sources	25 Sep 2008 03:52:10 -0000	1.8
@@ -1 +1 @@
-9f4d176e3b87675b54863f7e042ff06c  imsettings-0.104.0.tar.bz2
+fbe4cf6e514809c4db8ef9283f1ab2d1  imsettings-0.104.1.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep 25 03:54:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 03:54:57 +0000
Subject: [pkgdb] octave had acl change status
Message-ID: <20080925035457.BFB0A208D1B@bastion.fedora.phx.redhat.com>

qspencer has set the watchbugzilla acl on octave (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave



From pkgdb at fedoraproject.org  Thu Sep 25 03:55:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 03:55:00 +0000
Subject: [pkgdb] octave had acl change status
Message-ID: <20080925035500.C4664208DA2@bastion.fedora.phx.redhat.com>

qspencer has set the watchcommits acl on octave (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave



From pkgdb at fedoraproject.org  Thu Sep 25 03:55:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 03:55:02 +0000
Subject: [pkgdb] octave had acl change status
Message-ID: <20080925035502.17E6B208DA6@bastion.fedora.phx.redhat.com>

qspencer has set the commit acl on octave (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave



From pkgdb at fedoraproject.org  Thu Sep 25 03:55:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 03:55:04 +0000
Subject: [pkgdb] octave had acl change status
Message-ID: <20080925035504.A251C208DA9@bastion.fedora.phx.redhat.com>

qspencer has set the approveacls acl on octave (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave



From dcantrel at fedoraproject.org  Thu Sep 25 05:10:23 2008
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Thu, 25 Sep 2008 05:10:23 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.571, 1.572 anaconda.spec, 1.713, 
	1.714 sources, 1.705, 1.706
Message-ID: <20080925051023.D1B097010A@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31986

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Wed Sep 24 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.40-1
- Fix network interface bring up in text mode (#463861, #462592) (dcantrell)
- Bring back isys.resetResolv() and fix NetworkManager polling in
  network.py. (dcantrell)
- Poll 'State' property from NetworkManager in network.bringUp() (dcantrell)
- Log error in rescue mode is network.bringUp() fails. (dcantrell)
- Set the first network device in the list to active. (dcantrell)
- Get rid of firstnetdevice in Network (dcantrell)
- Do not write /lib/udev.d rules if instPath is '' (dcantrell)
- Fix problems with bringDeviceUp() calls (#463512) (dcantrell)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.571
retrieving revision 1.572
diff -u -r1.571 -r1.572
--- .cvsignore	23 Sep 2008 03:14:10 -0000	1.571
+++ .cvsignore	25 Sep 2008 05:09:52 -0000	1.572
@@ -1 +1 @@
-anaconda-11.4.1.39.tar.bz2
+anaconda-11.4.1.40.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.713
retrieving revision 1.714
diff -u -r1.713 -r1.714
--- anaconda.spec	23 Sep 2008 03:14:10 -0000	1.713
+++ anaconda.spec	25 Sep 2008 05:09:52 -0000	1.714
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.4.1.39
+Version: 11.4.1.40
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -205,6 +205,17 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Sep 24 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.40-1
+- Fix network interface bring up in text mode (#463861, #462592) (dcantrell)
+- Bring back isys.resetResolv() and fix NetworkManager polling in
+  network.py. (dcantrell)
+- Poll 'State' property from NetworkManager in network.bringUp() (dcantrell)
+- Log error in rescue mode is network.bringUp() fails. (dcantrell)
+- Set the first network device in the list to active. (dcantrell)
+- Get rid of firstnetdevice in Network (dcantrell)
+- Do not write /lib/udev.d rules if instPath is '' (dcantrell)
+- Fix problems with bringDeviceUp() calls (#463512) (dcantrell)
+
 * Mon Sep 22 2008 David Cantrell <dcantrell at redhat.com> - 11.4.1.39-1
 - Fix a traceback when getting the interface settings (#462592). (clumens)
 - self.anaconda -> anaconda (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.705
retrieving revision 1.706
diff -u -r1.705 -r1.706
--- sources	23 Sep 2008 03:14:10 -0000	1.705
+++ sources	25 Sep 2008 05:09:52 -0000	1.706
@@ -1 +1 @@
-74e03b1146ba24bb2ad917f04b85a877  anaconda-11.4.1.39.tar.bz2
+08bb2877ef1d96ee30d24372578e8fc9  anaconda-11.4.1.40.tar.bz2



From airlied at fedoraproject.org  Thu Sep 25 05:48:28 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 25 Sep 2008 05:48:28 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel
	xserver-1.5.0-exa-master-fix-x11perf-crash.patch, NONE,
	1.1 xorg-x11-server.spec, 1.353, 1.354
Message-ID: <20080925054828.26A547010A@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-serv5426

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.0-exa-master-fix-x11perf-crash.patch 
Log Message:
- fix crash with x11perf on r500 modesetting


xserver-1.5.0-exa-master-fix-x11perf-crash.patch:

--- NEW FILE xserver-1.5.0-exa-master-fix-x11perf-crash.patch ---
>From 99838fad3c826c95736f93fc4f9492fbb93f9205 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at linux.ie>
Date: Thu, 25 Sep 2008 15:40:19 +1000
Subject: [PATCH] exa: make sure pixmap devPrivate.ptr is NULL at create time

---
 exa/exa.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/exa/exa.c b/exa/exa.c
index 6e769a7..d240126 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -325,6 +325,9 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
         pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED;
         pExaPixmap->fb_ptr = NULL;
         pExaPixmap->pDamage = NULL;
+        pExaPixmap->sys_ptr = pPixmap->devPrivate.ptr;
+        pPixmap->devPrivate.ptr = NULL;
+
     } else {
         pExaPixmap->driverPriv = NULL;
         /* Scratch pixmaps may have w/h equal to zero, and may not be
-- 
1.5.5.1



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- xorg-x11-server.spec	23 Sep 2008 19:36:20 -0000	1.353
+++ xorg-x11-server.spec	25 Sep 2008 05:47:57 -0000	1.354
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -46,6 +46,7 @@
 # XXX does this need rebasing still?
 Patch102:  xserver-1.5.0-exa-master-upgrade.patch
 Patch103:  xserver-1.5.0-bg-none-root.patch
+Patch104:  xserver-1.5.0-exa-master-fix-x11perf-crash.patch
 
 # Red Hat specific tweaking, not intended for upstream
 # XXX move these to the end of the list
@@ -500,6 +501,9 @@
 
 
 %changelog
+* Thu Sep 25 2008 Dave Airlie <airlied at redhat.com> 1.5.1-2
+- fix crash with x11perf on r500 modesetting
+
 * Tue Sep 23 2008 Adam Jackson <ajax at redhat.com> 1.5.1-1
 - xserver 1.5.1
 - Trim %%changelog.



From pkgdb at fedoraproject.org  Thu Sep 25 06:07:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 06:07:07 +0000
Subject: [pkgdb] purple-facebookchat was added for mcepl
Message-ID: <20080925060707.5EB52208D6F@bastion.fedora.phx.redhat.com>

huzaifas has added Package purple-facebookchat with summary libpurple plug-in supporting facebook IM
huzaifas has approved Package purple-facebookchat
huzaifas has added a Fedora devel branch for purple-facebookchat with an owner of mcepl
huzaifas has approved purple-facebookchat in Fedora devel
huzaifas has approved Package purple-facebookchat
huzaifas has set commit to Approved for packager on purple-facebookchat (Fedora devel)
huzaifas has set build to Approved for packager on purple-facebookchat (Fedora devel)
huzaifas has set checkout to Approved for packager on purple-facebookchat (Fedora devel)
huzaifas has set commit to Approved for uberpackager on purple-facebookchat (Fedora devel)
huzaifas has set build to Approved for uberpackager on purple-facebookchat (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on purple-facebookchat (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Sep 25 06:07:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 06:07:08 +0000
Subject: [pkgdb] purple-facebookchat (Fedora, 9) updated by huzaifas
Message-ID: <20080925060708.E2BCC208DA5@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for purple-facebookchat
huzaifas has set commit to Approved for uberpackager on purple-facebookchat (Fedora 9)
huzaifas has set build to Approved for uberpackager on purple-facebookchat (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on purple-facebookchat (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Sep 25 06:07:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 06:07:08 +0000
Subject: [pkgdb] purple-facebookchat (Fedora, 8) updated by huzaifas
Message-ID: <20080925060708.ED139208DA8@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for purple-facebookchat
huzaifas has set commit to Approved for uberpackager on purple-facebookchat (Fedora 8)
huzaifas has set build to Approved for uberpackager on purple-facebookchat (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on purple-facebookchat (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/purple-facebookchat



From huzaifas at fedoraproject.org  Thu Sep 25 06:07:26 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 25 Sep 2008 06:07:26 +0000 (UTC)
Subject: rpms/purple-facebookchat - New directory
Message-ID: <20080925060726.2EB897010A@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/purple-facebookchat
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsHo9043/rpms/purple-facebookchat

Log Message:
Directory /cvs/extras/rpms/purple-facebookchat added to the repository




From huzaifas at fedoraproject.org  Thu Sep 25 06:07:26 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 25 Sep 2008 06:07:26 +0000 (UTC)
Subject: rpms/purple-facebookchat/devel - New directory
Message-ID: <20080925060726.6766C70140@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/purple-facebookchat/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsHo9043/rpms/purple-facebookchat/devel

Log Message:
Directory /cvs/extras/rpms/purple-facebookchat/devel added to the repository




From huzaifas at fedoraproject.org  Thu Sep 25 06:07:27 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 25 Sep 2008 06:07:27 +0000 (UTC)
Subject: rpms/purple-facebookchat Makefile,NONE,1.1
Message-ID: <20080925060727.763287010A@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/purple-facebookchat
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsHo9043/rpms/purple-facebookchat

Added Files:
	Makefile 
Log Message:
Setup of module purple-facebookchat


--- NEW FILE Makefile ---
# Top level Makefile for module purple-facebookchat
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Thu Sep 25 06:07:27 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 25 Sep 2008 06:07:27 +0000 (UTC)
Subject: rpms/purple-facebookchat/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080925060727.B60927010A@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/purple-facebookchat/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsHo9043/rpms/purple-facebookchat/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module purple-facebookchat


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: purple-facebookchat
# $Id: Makefile,v 1.1 2008/09/25 06:07:27 huzaifas Exp $
NAME := purple-facebookchat
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 25 06:10:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 06:10:41 +0000
Subject: [pkgdb] fet was added for rezso
Message-ID: <20080925061041.AE586208DA0@bastion.fedora.phx.redhat.com>

huzaifas has added Package fet with summary Open source free timetabling software
huzaifas has approved Package fet
huzaifas has added a Fedora devel branch for fet with an owner of rezso
huzaifas has approved fet in Fedora devel
huzaifas has approved Package fet
huzaifas has set commit to Approved for packager on fet (Fedora devel)
huzaifas has set build to Approved for packager on fet (Fedora devel)
huzaifas has set checkout to Approved for packager on fet (Fedora devel)
huzaifas has set commit to Approved for uberpackager on fet (Fedora devel)
huzaifas has set build to Approved for uberpackager on fet (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on fet (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fet



From pkgdb at fedoraproject.org  Thu Sep 25 06:10:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 06:10:42 +0000
Subject: [pkgdb] fet (Fedora, 8) updated by huzaifas
Message-ID: <20080925061042.C222C208DA8@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for fet
huzaifas has set commit to Approved for uberpackager on fet (Fedora 8)
huzaifas has set build to Approved for uberpackager on fet (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on fet (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fet



From pkgdb at fedoraproject.org  Thu Sep 25 06:10:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 06:10:42 +0000
Subject: [pkgdb] fet (Fedora, 9) updated by huzaifas
Message-ID: <20080925061042.B32A7208DA5@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for fet
huzaifas has set commit to Approved for uberpackager on fet (Fedora 9)
huzaifas has set build to Approved for uberpackager on fet (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on fet (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fet



From huzaifas at fedoraproject.org  Thu Sep 25 06:11:00 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 25 Sep 2008 06:11:00 +0000 (UTC)
Subject: rpms/fet - New directory
Message-ID: <20080925061100.392907010A@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/fet
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvszo9721/rpms/fet

Log Message:
Directory /cvs/extras/rpms/fet added to the repository




From huzaifas at fedoraproject.org  Thu Sep 25 06:11:02 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 25 Sep 2008 06:11:02 +0000 (UTC)
Subject: rpms/fet Makefile,NONE,1.1
Message-ID: <20080925061102.694457010A@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/fet
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvszo9721/rpms/fet

Added Files:
	Makefile 
Log Message:
Setup of module fet


--- NEW FILE Makefile ---
# Top level Makefile for module fet
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Thu Sep 25 06:11:01 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 25 Sep 2008 06:11:01 +0000 (UTC)
Subject: rpms/fet/devel - New directory
Message-ID: <20080925061101.1A3997010A@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/fet/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvszo9721/rpms/fet/devel

Log Message:
Directory /cvs/extras/rpms/fet/devel added to the repository




From huzaifas at fedoraproject.org  Thu Sep 25 06:11:02 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 25 Sep 2008 06:11:02 +0000 (UTC)
Subject: rpms/fet/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080925061102.C02F87010A@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/fet/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvszo9721/rpms/fet/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fet


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fet
# $Id: Makefile,v 1.1 2008/09/25 06:11:02 huzaifas Exp $
NAME := fet
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From sdake at fedoraproject.org  Thu Sep 25 06:17:08 2008
From: sdake at fedoraproject.org (Steven Dake)
Date: Thu, 25 Sep 2008 06:17:08 +0000 (UTC)
Subject: rpms/corosync/devel corosync.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080925061708.87A477010A@cvs1.fedora.phx.redhat.com>

Author: sdake

Update of /cvs/pkgs/rpms/corosync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11170/devel

Modified Files:
	.cvsignore sources 
Added Files:
	corosync.spec import.log 
Log Message:
Initial release of corosync-0.92.



--- NEW FILE corosync.spec ---
Name: corosync
Summary: The Corosync Cluster Engine and Application Programming Interfaces
Version: 0.92
Release: 1%{?alphatag:.%{alphatag}}%{?dist}
License: BSD
Group: System Environment/Base
URL: http://www.openais.org
Source0: http://developer.osdl.org/dev/openais/downloads/corosync-%{version}/corosync-%{version}.tar.gz

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: i386 ppc x86_64 ppc64 ia64 s390 s390x alpha
Requires(pre): /usr/sbin/useradd
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig

%define ais_user_uid 39

%description 
This package contains the Corosync Cluster Engine Executive, several default
APIs and libraries, default configuration files, and an init script.

%package devel
Summary: The Corosync Cluster Engine
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
This package contains include files and man pages used to develop using
The Corosync Cluster Engine APIs.

%prep
%setup -q -n corosync-%{version}

%build

# -O3 required for performance reasons
# So we get proper debug output, for now we don't compile with O3
#CFLAGS="$(echo '%{optflags}' | sed -e 's/-O[0-9]*//') -O3"
CFLAGS="$(echo '%{optflags}')"
make CFLAGS="$CFLAGS"

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT STATICLIBS=NO
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
mkdir -p $RPM_BUILD_ROOT%{_initddir}
install -m 644 LICENSE SECURITY README.devmap \
 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
install -m 755 init/redhat $RPM_BUILD_ROOT%{_initddir}/corosync

%clean
rm -rf $RPM_BUILD_ROOT

%pre
# Add the "ais" user
/usr/sbin/useradd -c 'The Corosync Cluster Engine' \
 -u %{ais_user_uid} -s /sbin/nologin -r -d '/' ais 2> /dev/null || :

%post
/sbin/chkconfig --add corosync || :
/sbin/ldconfig > /dev/null

%preun
if [ $1 -eq 0 ]; then
	/sbin/service corosync stop &>/dev/null || :
	/sbin/chkconfig --del corosync || :
fi

%postun
[ "$1" -ge "1" ] && /sbin/service corosync condrestart &>/dev/null || :
/sbin/ldconfig > /dev/null

%files 
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/LICENSE
%doc %{_docdir}/%{name}-%{version}/SECURITY
%{_sbindir}/corosync
%{_sbindir}/corosync-keygen
%{_sbindir}/corosync-objctl
%{_sbindir}/corosync-cfgtool
%config(noreplace) /etc/corosync.conf
%config(noreplace) /etc/ld.so.conf.d/corosync-*.conf
%{_initddir}/corosync
%dir %{_libexecdir}/lcrso
%{_libexecdir}/lcrso/coroparse.lcrso
%{_libexecdir}/lcrso/objdb.lcrso
%{_libexecdir}/lcrso/service_cfg.lcrso
%{_libexecdir}/lcrso/service_cpg.lcrso
%{_libexecdir}/lcrso/service_evs.lcrso
%{_libexecdir}/lcrso/service_confdb.lcrso
%{_libexecdir}/lcrso/vsf_ykd.lcrso
%dir %{_libdir}/corosync
%{_libdir}/corosync/libcfg.so.*
%{_libdir}/corosync/libcpg.so.*
%{_libdir}/corosync/libconfdb.so.*
%{_libdir}/corosync/libevs.so.*
%{_libdir}/corosync/libtotem_pg.so.*
%{_libdir}/corosync/liblogsys.so.*
%{_libdir}/corosync/libcoroutil.so.*
%{_mandir}/man8/corosync_overview.8*
%{_mandir}/man8/corosync-objctl.8*
%{_mandir}/man5/corosync.conf.5*

%files devel
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/README.devmap
%dir %{_includedir}/corosync/
%{_includedir}/corosync/saAis.h
%{_includedir}/corosync/ais_util.h
%{_includedir}/corosync/cfg.h
%{_includedir}/corosync/confdb.h
%{_includedir}/corosync/cpg.h
%{_includedir}/corosync/evs.h
%{_includedir}/corosync/hdb.h
%{_includedir}/corosync/ipc_gen.h
%{_includedir}/corosync/list.h
%{_includedir}/corosync/mar_gen.h
%{_includedir}/corosync/swab.h
%dir %{_includedir}/corosync/totem/
%{_includedir}/corosync/totem/coropoll.h
%{_includedir}/corosync/totem/totem.h
%{_includedir}/corosync/totem/totemip.h
%{_includedir}/corosync/totem/totempg.h
%dir %{_includedir}/corosync/lcr/
%{_includedir}/corosync/lcr/lcr_ckpt.h
%{_includedir}/corosync/lcr/lcr_comp.h
%{_includedir}/corosync/lcr/lcr_ifact.h
%dir %{_includedir}/corosync/engine
%{_includedir}/corosync/engine/config.h
%{_includedir}/corosync/engine/coroapi.h
%{_includedir}/corosync/engine/logsys.h
%{_includedir}/corosync/engine/objdb.h
%{_libdir}/corosync/libcfg.so
%{_libdir}/corosync/libcpg.so
%{_libdir}/corosync/libconfdb.so
%{_libdir}/corosync/libevs.so
%{_libdir}/corosync/libtotem_pg.so
%{_libdir}/corosync/liblogsys.so
%{_libdir}/corosync/libcoroutil.so
%{_mandir}/man3/cpg_*3*
%{_mandir}/man3/evs_*3*
%{_mandir}/man3/confdb_*3*
%{_mandir}/man8/cpg_overview.8*
%{_mandir}/man8/evs_overview.8*
%{_mandir}/man8/confdb_overview.8*
%{_mandir}/man8/logsys_overview.8*

%changelog
* Wed Sep 24 2008 Steven Dake <sdake at redhat.com> - 0.92-1
- New upstream release corosync-0.92.

* Sun Aug 24 2008 Steven Dake <sdake at redhat.com> - 0.91-3
- move logsys_overview.8.* to devel package.
- move shared libs to main package.

* Wed Aug 20 2008 Steven Dake <sdake at redhat.com> - 0.91-2
- use /sbin/service instead of calling init script directly.
- put corosync-objctl man page in the main package.
- change all initrddir to initddir for fedora 10 guidelines.

* Thu Aug 14 2008 Steven Dake <sdake at redhat.com> - 0.91-1
- First upstream packaged version of corosync for rawhide review.


--- NEW FILE import.log ---
corosync-0_92-1_fc10:HEAD:corosync-0.92-1.fc10.src.rpm:1222323286


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2008 08:22:02 -0000	1.1
+++ .cvsignore	25 Sep 2008 06:16:38 -0000	1.2
@@ -0,0 +1 @@
+corosync-0.92.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2008 08:22:02 -0000	1.1
+++ sources	25 Sep 2008 06:16:38 -0000	1.2
@@ -0,0 +1 @@
+e0fec3c380de83711cf3f4609d59e16e  corosync-0.92.tar.gz



From stransky at fedoraproject.org  Thu Sep 25 06:43:36 2008
From: stransky at fedoraproject.org (Martin Stransky)
Date: Thu, 25 Sep 2008 06:43:36 +0000 (UTC)
Subject: rpms/xulrunner/devel xulrunner-mozconfig, 1.22, 1.23 xulrunner.spec,
	1.133, 1.134
Message-ID: <20080925064336.3A9B67010A@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16150

Modified Files:
	xulrunner-mozconfig xulrunner.spec 
Log Message:
Resolves: #463341


Index: xulrunner-mozconfig
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner-mozconfig,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xulrunner-mozconfig	23 Jul 2008 04:59:37 -0000	1.22
+++ xulrunner-mozconfig	25 Sep 2008 06:43:05 -0000	1.23
@@ -11,6 +11,7 @@
 ac_add_options --enable-system-lcms
 #ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-cairo
 ac_add_options --with-pthreads
 ac_add_options --disable-strip
 ac_add_options --disable-tests


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- xulrunner.spec	23 Sep 2008 22:48:49 -0000	1.133
+++ xulrunner.spec	25 Sep 2008 06:43:05 -0000	1.134
@@ -8,7 +8,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -380,6 +380,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Sep 25 2008 Martin Stransky <stransky at redhat.com> 1.9.0.2-2 
+- Build with system cairo (#463341)
+
 * Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> 1.9.0.2-1
 - Update to 1.9.0.2
 



From transif at fedoraproject.org  Thu Sep 25 07:39:12 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 25 Sep 2008 07:39:12 +0000 (UTC)
Subject: comps/po sq.po,1.12,1.13
Message-ID: <20080925073912.9E4507013D@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26270/po

Modified Files:
	sq.po 
Log Message:
    2008-09-25  Besnik Bleta <besnik at programeshqip.org> (via
besnik at fedoraproject.org)
    
      * po/sq.po: started translation
    



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.12 -r 1.13 sq.po
Index: sq.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sq.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sq.po	17 Sep 2008 22:44:37 -0000	1.12
+++ sq.po	25 Sep 2008 07:38:41 -0000	1.13
@@ -7,1208 +7,2102 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2003-10-14 20:25-0400\n"
-"Last-Translator: Automatically generated\n"
+"POT-Creation-Date: 2007-02-05 09:53-0500\n"
+"PO-Revision-Date: 2008-09-25 10:41+0200\n"
+"Last-Translator: Besnik Bleta <besnik at programeshqip.org>\n"
 "Language-Team: none\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
-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:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
+#: ../comps-taroon.xml.in.h:1
+#: ../comps-rhel4.xml.in.h:1
+#: ../comps-rhel4-u5.xml.in.h:1
+#: ../comps-fc6.xml.in.h:1
+#: ../comps-fc7.xml.in.h:2
+#: ../comps-rhel5-client-core.xml.in.h:1
+#: ../comps-rhel5-client-workstation.xml.in.h:1
+#: ../comps-rhel5-server-core.xml.in.h:1
 msgid "Administration Tools"
-msgstr ""
+msgstr "Mjete Administrimi"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:3
+#: ../comps-taroon.xml.in.h:2
+#: ../comps-fc6.xml.in.h:2
+#: ../comps-fc7.xml.in.h:3
+#: ../comps-rhel5-client-core.xml.in.h:2
+#: ../comps-rhel5-server-core.xml.in.h:2
+#, fuzzy
 msgid "Afrikaans Support"
-msgstr ""
-
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:4
-msgid "Albanian Support"
-msgstr ""
+msgstr "Suport SSL jo i mundsh??m"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2
+#: ../comps-taroon.xml.in.h:3
+#: ../comps-rhel4.xml.in.h:2
+#: ../comps-rhel4-u5.xml.in.h:2
+#: ../comps-fc6.xml.in.h:3
+#: ../comps-fc7.xml.in.h:4
+#: ../comps-rhel5-client-core.xml.in.h:3
+#: ../comps-rhel5-server-core.xml.in.h:3
 msgid "Applications"
-msgstr ""
-
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:6
-msgid "Applications to perform a variety of tasks"
-msgstr ""
-
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
-msgid "Arabic Support"
-msgstr ""
-
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
-msgid "Armenian Support"
-msgstr ""
-
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:9
-msgid "Assamese Support"
-msgstr ""
+msgstr "Zbatime"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
+#: ../comps-taroon.xml.in.h:4
+#: ../comps-rhel4.xml.in.h:3
+#: ../comps-rhel4-u5.xml.in.h:3
+#: ../comps-fc6.xml.in.h:7
+#: ../comps-fc7.xml.in.h:9
+#: ../comps-rhel5-client-core.xml.in.h:7
+#: ../comps-rhel5-server-core.xml.in.h:7
 msgid "Authoring and Publishing"
-msgstr ""
+msgstr "Krijim dhe Botim"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:11
+#: ../comps-taroon.xml.in.h:5
+#: ../comps-rhel4.xml.in.h:4
+#: ../comps-rhel4-u5.xml.in.h:4
+#: ../comps-fc6.xml.in.h:8
+#: ../comps-fc7.xml.in.h:10
+#: ../comps-rhel5-client-core.xml.in.h:8
+#: ../comps-rhel5-client-workstation.xml.in.h:2
+#: ../comps-rhel5-server-core.xml.in.h:8
 msgid "Base"
-msgstr ""
+msgstr "Baz??"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7
-msgid "Base System"
-msgstr ""
-
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:13
+#: ../comps-taroon.xml.in.h:6
+#: ../comps-rhel4.xml.in.h:5
+#: ../comps-rhel4-u5.xml.in.h:5
+#: ../comps-fc6.xml.in.h:10
+#: ../comps-fc7.xml.in.h:12
+#: ../comps-rhel5-client-core.xml.in.h:10
+#: ../comps-rhel5-client-workstation.xml.in.h:3
+#: ../comps-rhel5-server-core.xml.in.h:10
 msgid "Basic support for the Ruby programming language."
-msgstr ""
+msgstr "Mbulim fillestar p??r gjuh??n e programimit Ruby."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:14
-msgid "Basque Support"
-msgstr ""
-
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:15
-msgid "Belarusian Support"
-msgstr ""
-
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:16
-msgid "Bengali Support"
-msgstr ""
-
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:17
-msgid "Bhutanese Support"
-msgstr ""
-
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:18
-msgid "Bosnian Support"
-msgstr ""
-
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:19
-msgid "Brazilian Portuguese Support"
-msgstr ""
-
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:20
-msgid "Breton Support"
-msgstr ""
-
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:22
-msgid "Bulgarian Support"
-msgstr ""
-
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:23
+#: ../comps-taroon.xml.in.h:7
+#, fuzzy
+msgid "Brazilian Support"
+msgstr "Portugeze(Braziliane)"
+
+#: ../comps-taroon.xml.in.h:8
+#: ../comps-rhel5-client-core.xml.in.h:15
+#: ../comps-rhel5-server-core.xml.in.h:14
+#, fuzzy
+msgid "British Support"
+msgstr "Anglishte Britanike"
+
+#: ../comps-taroon.xml.in.h:9
+#, fuzzy
+msgid "Canadian Support"
+msgstr "Anglishte Kanadeze"
+
+#: ../comps-taroon.xml.in.h:10
+#: ../comps-fc6.xml.in.h:16
+#: ../comps-fc7.xml.in.h:18
[...2624 lines suppressed...]
 
-#: ../comps-f10.xml.in.h:76
-msgid "Input Methods"
-msgstr ""
+#: ../comps-rhel4-docs-dvd.xml.in.h:12
+msgid "Red Hat Enterprise Linux 4 Documentation"
+msgstr "Dokumentim p??r Red Hat Enterprise Linux 4"
 
-#: ../comps-f10.xml.in.h:77
-msgid "Input method packages for the input of international text."
-msgstr ""
+#: ../comps-rhel4-docs-dvd.xml.in.h:15
+#, fuzzy
+msgid "Tamil"
+msgstr "Tamileze"
 
-#: ../comps-f10.xml.in.h:94
-msgid "Kashmiri Support"
+#: ../comps-rhel4-docs-dvd.xml.in.h:16
+msgid "This group contains the Red Hat Enterprise Linux documentation in the Bengali language."
 msgstr ""
 
-#: ../comps-f10.xml.in.h:97
-msgid "Konkani Support"
+#: ../comps-rhel4-docs-dvd.xml.in.h:21
+msgid "This group contains the Red Hat Enterprise Linux documentation in the Gujarati language."
 msgstr ""
 
-#: ../comps-f10.xml.in.h:110
-msgid "Maithili Support"
+#: ../comps-rhel4-docs-dvd.xml.in.h:22
+msgid "This group contains the Red Hat Enterprise Linux documentation in the Hindi language."
 msgstr ""
 
-#: ../comps-f10.xml.in.h:117
-msgid "Myanmar (Burmese) Support"
+#: ../comps-rhel4-docs-dvd.xml.in.h:26
+msgid "This group contains the Red Hat Enterprise Linux documentation in the Punjabi language."
 msgstr ""
 
-#: ../comps-f10.xml.in.h:144
-msgid "Sindhi Support"
+#: ../comps-rhel4-docs-dvd.xml.in.h:29
+msgid "This group contains the Red Hat Enterprise Linux documentation in the Tamil language."
 msgstr ""
 
-#: ../comps-f10.xml.in.h:156
-msgid "Support for developing programs in the Haskell programming language."
-msgstr ""
+#: ../comps-rhel5-client-core.xml.in.h:4
+#: ../comps-rhel5-server-core.xml.in.h:4
+msgid "Applications for a variety of tasks"
+msgstr "Zbatime p??r nj?? larmi pun??sh"
 
-#: ../comps-f10.xml.in.h:163
-msgid "Tajik Support"
+#: ../comps-rhel5-client-core.xml.in.h:19
+#: ../comps-rhel5-cluster-st.xml.in.h:5
+msgid "Cluster Storage"
 msgstr ""
 
-#: ../comps-f10.xml.in.h:205
-msgid "Uzbek Support"
-msgstr ""
+#: ../comps-rhel5-client-core.xml.in.h:21
+#: ../comps-rhel5-cluster.xml.in.h:6
+#, fuzzy
+msgid "Clustering Support."
+msgstr "Suport SSL jo i mundsh??m"
 
-#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
-msgid "Applications for a variety of tasks"
+#: ../comps-rhel5-client-core.xml.in.h:89
+#: ../comps-rhel5-cluster-st.xml.in.h:17
+msgid "Packages which provide support for cluster storage."
 msgstr ""
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
-msgid "Dialup Networking Support"
+#: ../comps-rhel5-client-core.xml.in.h:90
+#: ../comps-rhel5-client-workstation.xml.in.h:29
+#: ../comps-rhel5-server-core.xml.in.h:84
+msgid "Packages which provide support for single-node GFS."
 msgstr ""
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
-msgid ""
-"GNOME is a powerful, graphical user interface which includes a panel, "
-"desktop, system icons, and a graphical file manager."
+#: ../comps-rhel5-client-core.xml.in.h:102
+#: ../comps-rhel5-client-workstation.xml.in.h:33
+#: ../comps-rhel5-server-core.xml.in.h:96
+msgid "Single Node GFS Support"
 msgstr ""
 
-#: ../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."
+#: ../comps-rhel5-client-core.xml.in.h:125
+#: ../comps-rhel5-client-workstation.xml.in.h:46
+#: ../comps-rhel5-server-core.xml.in.h:119
+msgid "These packages provide compatibility support with previous releases."
 msgstr ""
 
-#: ../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."
+#: ../comps-rhel5-client-supplementary.xml.in.h:3
+#: ../comps-rhel5-server-supplementary.xml.in.h:3
+msgid "Java Runtime Environments and Development Kits"
 msgstr ""
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
-msgid "The XEmacs text editor."
-msgstr ""
+#: ../comps-rhel5-client-supplementary.xml.in.h:4
+#: ../comps-rhel5-server-supplementary.xml.in.h:4
+msgid "Misc"
+msgstr "T?? ndryshme"
 
-#: ../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 ""
+#: ../comps-rhel5-client-supplementary.xml.in.h:5
+#: ../comps-rhel5-server-supplementary.xml.in.h:5
+msgid "Misc packages"
+msgstr "Paketa t?? ndryshme"
 
-#: ../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 ""
+#: ../comps-rhel5-client-supplementary.xml.in.h:6
+#: ../comps-rhel5-server-supplementary.xml.in.h:6
+msgid "Multimedia"
+msgstr "Multimedia"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
-msgstr ""
+#: ../comps-rhel5-client-supplementary.xml.in.h:7
+#: ../comps-rhel5-server-supplementary.xml.in.h:7
+msgid "Multimedia applications"
+msgstr "Zbatime multimedia"
 
-#: ../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-rhel5-client-supplementary.xml.in.h:8
+#: ../comps-rhel5-server-supplementary.xml.in.h:8
+msgid "Packages which provide additional functionality for Red Hat Enterprise Linux"
 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-rhel5-client-supplementary.xml.in.h:9
+#: ../comps-rhel5-server-supplementary.xml.in.h:9
+msgid "Red Hat Enterprise Linux Extras"
+msgstr "T?? tjera Red Hat Enterprise Linux"
+
+#: ../comps-rhel5-client-workstation.xml.in.h:62
+msgid "Workstation"
+msgstr "Stacion pune"
+
+#: ../comps-rhel5-client-workstation.xml.in.h:63
+msgid "Workstation applications and utilities."
 msgstr ""
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
-msgid "XEmacs"
+#: ../comps-rhel5-compatlayer-template.xml.in.h:1
+msgid "Compatibility Arch"
 msgstr ""
 
-#: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+#: ../comps-rhel5-compatlayer-template.xml.in.h:3
+#, fuzzy
+msgid "Compatibility Arch Libraries"
+msgstr "_Rikthe mund??si p??rputhshm??rie te vlerat e tyre parazgjedhje"
+
+#: ../comps-rhel5-compatlayer-template.xml.in.h:5
+#, fuzzy
+msgid "Multilib library packages"
+msgstr "Pa paketa t?? reja"
+
+#: ../comps-rhel5-compatlayer-template.xml.in.h:7
+msgid "Packages which provide functionality for the compatibility architecture."
 msgstr ""
+
+#: ../comps-rhel5-vt.xml.in.h:23
+msgid "Virtualization Support."
+msgstr "Mbulim Virtualizimi"
+



From rezso at fedoraproject.org  Thu Sep 25 07:48:36 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Thu, 25 Sep 2008 07:48:36 +0000 (UTC)
Subject: rpms/fet/devel fet.desktop, NONE, 1.1 fet.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080925074836.874FA7010A@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/fet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28070/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fet.desktop fet.spec import.log 
Log Message:
- initial import
 ----------------------------------------------------------------------
 Modified Files:
 	devel/.cvsignore devel/sources 
 Added Files:
 	devel/fet.desktop devel/fet.spec devel/import.log 
 ----------------------------------------------------------------------



--- NEW FILE fet.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=FET
Comment=Timetable software for schools
Exec=fet
Terminal=false
Type=Application
Categories=Education;

Name[en]=FET
Comment[en]=Timetable software for schools
Name[ro]=FET
Comment[ro]=Program orare ??colare
Name[hu]=FET
Comment[hu]=??rarend fejleszt?? program


--- NEW FILE fet.spec ---
Name:      fet
Version:   5.6.3
Release:   3%{?dist}
Summary:   Open source free timetabling software

Group:     Applications/Engineering
License:   GPLv2+
URL:       http://lalescu.ro/liviu/fet
Source0:   http://lalescu.ro/liviu/fet/download/fet-%{version}.tar.bz2
Source1:   fet.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: qt-devel > 4.3
BuildRequires: desktop-file-utils

%description
FET is open source free software for automatically scheduling
the timetable of a school, high-school or university. It uses
a fast and efficient timetabling algorithm.

%prep
%setup -q

# convert Arabic to UTF-8
pushd doc/ar*/
iconv -f WINDOWS-1256 -t UTF-8  < FET_Manual_Arabic.txt > FET_Manual_Arabic.tmp
mv -f FET_Manual_Arabic.tmp FET_Manual_Arabic.txt
popd

# convert Italian to UTF-8
pushd doc/it*/
iconv -f ISO-8859-1 -t UTF-8 < fet\ istruzioni.txt > fet\ istruzioni.tmp
mv -f fet\ istruzioni.tmp fet\ istruzioni.txt
iconv -f ISO-8859-1 -t UTF-8 < fet\ faq.txt > fet\ faq.tmp
mv -f fet\ faq.tmp fet\ faq.txt
popd

# remove binary translations
rm -rf translations/*.qm

%build

# build application
qmake-qt4 %{name}.pro
make %{?_smp_mflags}

# build translation files
pushd translations
lrelease-qt4 *.ts
popd

%install
rm -rf %{buildroot}

# prepare folders
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_mandir}/man1
mkdir -p %{buildroot}%{_datadir}/%{name}/translations

# install
install -p -m 0755 fet %{buildroot}%{_bindir}/
install -p -m 0644 doc/fet.1 %{buildroot}%{_mandir}/man1/
install -p -m 0644 translations/*.qm %{buildroot}%{_datadir}/%{name}/translations

# install desktop file
desktop-file-install --vendor="fedora" \
        --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog CONTRIBUTORS COPYING
%doc GUESTBOOK LINKS README REFERENCES SPONSORS
%doc THANKS TODO TRANSLATORS
%doc doc sample_inputs
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz
%{_datadir}/applications/fedora-%{name}.desktop
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*

%changelog
* Thu Sep 25 2008 Balint Cristian <rezso at rdsor.ro> - 5.6.3-3
- remove binary translations at prep time

* Mon Sep 15 2008 Balint Cristian <rezso at rdsor.ro> - 5.6.3-2
- add desktop file
- build translations

* Wed Sep 10 2008 Balint Cristian <rezso at rdsor.ro> - 5.6.3-1
- initial package for fedora


--- NEW FILE import.log ---
fet-5_6_3-3_fc10:HEAD:fet-5.6.3-3.fc10.src.rpm:1222328849


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2008 06:11:02 -0000	1.1
+++ .cvsignore	25 Sep 2008 07:48:06 -0000	1.2
@@ -0,0 +1 @@
+fet-5.6.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2008 06:11:02 -0000	1.1
+++ sources	25 Sep 2008 07:48:06 -0000	1.2
@@ -0,0 +1 @@
+aa806a3dd62a8a52470ffdf79e36a190  fet-5.6.3.tar.bz2



From fabbione at fedoraproject.org  Thu Sep 25 08:08:06 2008
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Thu, 25 Sep 2008 08:08:06 +0000 (UTC)
Subject: rpms/openais/devel .cvsignore, 1.9, 1.10 import.log, 1.1,
	1.2 openais.spec, 1.28, 1.29 sources, 1.10,
	1.11 openais-defaultconfig.patch, 1.1, NONE revision-1568.patch,
	1.1, NONE revision-1569.patch, 1.1, NONE revision-1570.patch,
	1.1, NONE revision-1571.patch, 1.1, NONE revision-1572.patch,
	1.1, NONE revision-1573.patch, 1.1, NONE revision-1574.patch,
	1.1, NONE revision-1575.patch, 1.1, NONE revision-1576.patch,
	1.1, NONE revision-1579.patch, 1.1, NONE
Message-ID: <20080925080806.CA6DA7010A@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/openais/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31734/devel

Modified Files:
	.cvsignore import.log openais.spec sources 
Removed Files:
	openais-defaultconfig.patch revision-1568.patch 
	revision-1569.patch revision-1570.patch revision-1571.patch 
	revision-1572.patch revision-1573.patch revision-1574.patch 
	revision-1575.patch revision-1576.patch revision-1579.patch 
Log Message:
New openais upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	24 Jun 2008 05:32:05 -0000	1.9
+++ .cvsignore	25 Sep 2008 08:07:36 -0000	1.10
@@ -1 +1 @@
-openais-0.84.tar.gz
+openais-0.91.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Jun 2008 05:32:05 -0000	1.1
+++ import.log	25 Sep 2008 08:07:36 -0000	1.2
@@ -1 +1,2 @@
 openais-0_84-1:HEAD:openais-0.84-1.src.rpm:1214285415
+openais-0_91-1_fc10:HEAD:openais-0.91-1.fc10.src.rpm:1222329999


Index: openais.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/openais.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- openais.spec	14 Jul 2008 11:40:34 -0000	1.28
+++ openais.spec	25 Sep 2008 08:07:36 -0000	1.29
@@ -1,36 +1,23 @@
-%define alphatag svn1579
-
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 0.84
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 0.91
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
-Source0: http://developer.osdl.org/dev/openais/downloads/openais-%{version}/openais-%{version}.tar.gz
-Patch0: openais-defaultconfig.patch
-Patch1: revision-1568.patch
-Patch2: revision-1569.patch
-Patch3: revision-1570.patch
-Patch4: revision-1571.patch
-Patch5: revision-1572.patch
-Patch6: revision-1573.patch
-Patch7: revision-1574.patch
-Patch8: revision-1575.patch
-Patch9: revision-1576.patch
-Patch10: revision-1579.patch
+Source0: http://www.osdl.org/downloads/openais-%{version}/openais-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: i386 ppc x86_64 ppc64 ia64 s390 s390x alpha
-Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
-
-%define ais_user_uid 39
+Requires: corosync
+BuildRequires: corosync-devel
+Conflicts: openais-devel <= 0.89
 
 %description 
-This package contains the openais executive, openais service handlers,
-default configuration files and init script.
+This package contains the openais service handlers, default configuration
+files, programming libraries, and init script.
 
 %package devel
 Summary: The openais Standards-Based Cluster Framework libraries
@@ -38,25 +25,12 @@
 Requires: %{name} = %{version}-%{release}
 
 %description devel
-This package contains the libraries and include files used to develop using
-openais APIs.
+This package contains the include files used to develop using openais APIs.
 
 %prep
 %setup -q -n openais-%{version}
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p0
-%patch9 -p0
-%patch10 -p0
 
 %build
-
 # -O3 required for performance reasons
 # So we get proper debug output, for now we don't compile with O3
 #CFLAGS="$(echo '%{optflags}' | sed -e 's/-O[0-9]*//') -O3"
@@ -68,29 +42,20 @@
 make install DESTDIR=$RPM_BUILD_ROOT STATICLIBS=NO
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -m 644 LICENSE SECURITY README.devmap README.amf \
- $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
+install -m 644 LICENSE README.amf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
 install -m 755 init/redhat $RPM_BUILD_ROOT%{_initrddir}/openais
-install -m 755 test/openais-cfgtool $RPM_BUILD_ROOT%{_sbindir}
-# fix install permissions and make rpmlint happy
-chmod 0755 $RPM_BUILD_ROOT%{_sbindir}/ais-keygen
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-# Add the "ais" user
-/usr/sbin/useradd -c 'openais Standards Based Cluster Framework' \
- -u %{ais_user_uid} -s /sbin/nologin -r -d '/' ais 2> /dev/null || :
-
 %post
 /sbin/chkconfig --add openais || :
 /sbin/ldconfig > /dev/null
 
 %preun
 if [ $1 -eq 0 ]; then
-	%{_initrddir}/openais stop &>/dev/null || :
-	/sbin/chkconfig --del openais || :
+    %{_initrddir}/openais stop &>/dev/null || :
+    /sbin/chkconfig --del openais || :
 fi
 
 %postun
@@ -101,66 +66,38 @@
 %defattr(-,root,root,-)
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/LICENSE
-%doc %{_docdir}/%{name}-%{version}/SECURITY
 %doc %{_docdir}/%{name}-%{version}/README.amf
-%{_sbindir}/aisexec
-%{_sbindir}/ais-keygen
-%{_sbindir}/openais-cfgtool
 %dir /etc/ais
 %config(noreplace) /etc/ais/openais.conf
 %config(noreplace) /etc/ais/amf.conf
 %config(noreplace) /etc/ld.so.conf.d/openais-*.conf
 %{_initrddir}/openais
 %dir %{_libexecdir}/lcrso
-%{_libexecdir}/lcrso/aisparser.lcrso
-%{_libexecdir}/lcrso/objdb.lcrso
+%{_libexecdir}/lcrso/openaisparser.lcrso
+%{_libexecdir}/lcrso/openaisserviceenable.lcrso
 %{_libexecdir}/lcrso/service_amf.lcrso
-%{_libexecdir}/lcrso/service_cfg.lcrso
 %{_libexecdir}/lcrso/service_ckpt.lcrso
 %{_libexecdir}/lcrso/service_clm.lcrso
-%{_libexecdir}/lcrso/service_cpg.lcrso
-%{_libexecdir}/lcrso/service_evs.lcrso
 %{_libexecdir}/lcrso/service_evt.lcrso
 %{_libexecdir}/lcrso/service_lck.lcrso
 %{_libexecdir}/lcrso/service_msg.lcrso
-%{_libexecdir}/lcrso/service_confdb.lcrso
-%{_libexecdir}/lcrso/vsf_ykd.lcrso
-%dir %{_libdir}/openais
-%{_libdir}/openais/libais.so*
-%{_libdir}/openais/libcpg.so*
-%{_libdir}/openais/libevs.so*
-%{_libdir}/openais/libcfg.so*
-%{_libdir}/openais/libSaAmf.so*
-%{_libdir}/openais/libSaCkpt.so*
-%{_libdir}/openais/libSaClm.so*
-%{_libdir}/openais/libSaEvt.so*
-%{_libdir}/openais/libSaLck.so*
-%{_libdir}/openais/libSaMsg.so*
-%{_libdir}/openais/libtotem_pg.so*
-%{_libdir}/openais/liblogsys.so*
-%{_libdir}/openais/libconfdb.so*
-%{_libdir}/openais/libaisutil.so*
 %{_mandir}/man8/openais_overview.8*
-%{_mandir}/man8/cpg_overview.8*
-%{_mandir}/man8/evs_overview.8*
-%{_mandir}/man8/confdb_overview.8*
-%{_mandir}/man8/logsys_overview.8*
 %{_mandir}/man5/openais.conf.5*
 %{_mandir}/man5/amf.conf.5*
+%dir %{_libdir}/openais
+%{_libdir}/openais/libSaAmf.so.*
+%{_libdir}/openais/libSaCkpt.so.*
+%{_libdir}/openais/libSaClm.so.*
+%{_libdir}/openais/libSaEvt.so.*
+%{_libdir}/openais/libSaLck.so.*
+%{_libdir}/openais/libSaMsg.so.*
+%{_sbindir}/aisexec
+%{_sbindir}/openais-instantiate
 
 %files devel
 %defattr(-,root,root,-)
 %dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/README.devmap
 %dir %{_includedir}/openais/
-%{_includedir}/openais/ais_util.h
-%{_includedir}/openais/confdb.h
-%{_includedir}/openais/ipc_gen.h
-%{_includedir}/openais/mar_gen.h
-%{_includedir}/openais/swab.h
-%{_includedir}/openais/cpg.h
-%{_includedir}/openais/cfg.h
-%{_includedir}/openais/evs.h
 %{_includedir}/openais/saAis.h
 %{_includedir}/openais/saAmf.h
 %{_includedir}/openais/saCkpt.h
@@ -168,54 +105,27 @@
 %{_includedir}/openais/saEvt.h
 %{_includedir}/openais/saLck.h
 %{_includedir}/openais/saMsg.h
-%dir %{_includedir}/openais/totem/
-%{_includedir}/openais/totem/aispoll.h
-%{_includedir}/openais/totem/totem.h
-%{_includedir}/openais/totem/totemip.h
-%{_includedir}/openais/totem/totempg.h
-%dir %{_includedir}/openais/lcr/
-%{_includedir}/openais/lcr/lcr_ckpt.h
-%{_includedir}/openais/lcr/lcr_comp.h
-%{_includedir}/openais/lcr/lcr_ifact.h
-%dir %{_includedir}/openais/service
-%{_includedir}/openais/service/flow.h
-%{_includedir}/openais/service/ipc.h
-%{_includedir}/openais/service/timer.h
-%{_includedir}/openais/service/config.h
-%{_includedir}/openais/service/objdb.h
-%{_includedir}/openais/service/logsys.h
-%{_includedir}/openais/service/swab.h
-%{_includedir}/openais/service/service.h
-%{_mandir}/man3/cpg_*3*
-%{_mandir}/man3/evs_*3*
-%{_mandir}/man3/confdb_*3*
+%{_libdir}/openais/libSaAmf.so
+%{_libdir}/openais/libSaCkpt.so
+%{_libdir}/openais/libSaClm.so
+%{_libdir}/openais/libSaEvt.so
+%{_libdir}/openais/libSaLck.so
+%{_libdir}/openais/libSaMsg.so
 
 %changelog
-* Mon Jul 14 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.84-2.svn1579
-- Update to svn trunk at revision 1579.
-  1577 (wrong commit) and 1578 (revert 1577) are not included (nor required)
-- Cleanup whitespace in spec file.
-
-* Mon Jun 23 2008 Steven Dake <sdake at redhat.com> - 0.84-1
-- New upstream release 0.84 with stability enhancements in protocols.
-
-* Tue May 20 2008 Steven Dake <sdake at redhat.com> - 0.83-3
-- Add upstream revision 1547 - Fix loading of multiple objects.
-- Add upstream revision 1549 - Remove exit when logsys files can't be created.
-- Add upstream revision 1550 - Fix linking of other projects against logsys on ppc64.
-
-* Mon May 12 2008 Steven Dake <sdake at redhat.com> - 0.83-2
-- Fix DOA on source tarball.
-
-* Mon May 12 2008 Steven Dake <sdake at redhat.com> - 0.83-1
-- Release 0.83.
-
-* Tue Apr 29 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.82-1.svn1528
-- Update to latest svn trunk in preparation for 0.83.
-- Fix a bunch of rpmlint warnings/errors.
-- Merge bits from the fedora package.
-- Remove all unrequired patches.
-- Update default config patch.
+* Fri Aug 15 2008 Steven dake <sdake at redhat.com> 0.91-1
+- Upgrade to work with upstream corosync cluster engine.
+
+* Mon May 19 2008 Steven Dake <sdake at redhat.com> 0.80.3-17
+- Resolves: rhbz#400941
+- Wrong bugzilla id caused rejection during commit.
+
+* Mon May 19 2008 Steven Dake <sdake at redhat.com> 0.80.3-16
+- Resolves: rhbz#400491
+- Add upstream revision 1521 - Compile on latest glibc.
+- Add upstream revision 1524 - Fix syscall usage in keygen application.
+- Add upstream revision 1546 - Fix build for authentication on bsd platforms.
+- Add upstream revision 1548 - Fix synchronization of checkpoint global id.
 
 * Tue Apr 1 2008 Steven Dake <sdake at redhat.com> - 0.80.3-15
 - Resolves: rhbz#432531
@@ -227,7 +137,6 @@
 - Add upstream revision 1509 - Remove double pthread_mutex_destroy from cpg service.
 - Add upstream revision 1508 - Remove double pthread_mutex_destroy from clm service.
 - Add upstream revision 1507 - Remove double pthread_mutex_destroy from checkpoint service.
-
 * Sat Mar 15 2008 Steven Dake <sdake at redhat.com> - 0.80.3-14
 - Resolves: rhbz#432531
 - Add upstream revision 1506 - Resolves incomplete checkpoing synchronization when totem queue is full.
@@ -239,6 +148,7 @@
 - Add upstream revision 1502 - Revert revision 1477 which exhibits problems with cman.
 - Add revision 1477 - This was reverted in a previous version but cherrypicked.  Now the patch has been applied and reverted in the rpm build process to match upstream.
 
+
 * Tue Feb 26 2008 Steven Dake <sdake at redhat.com> - 0.80.3-12
 - Resolves: rhbz#433839
 - Fix problem with cvs not allowing new checkin requires new revision.
@@ -248,7 +158,6 @@
 - Add upstream revision 1500 - IPC locks up if a POLLERR is returned in certain circumstances.
 - Resolves: rhbz#433839
 - Add upstream revision 1501 - A mcast is delivered before a join in some circumstances.
-
 * Fri Jan 18 2008 Steven Dake <sdake at redhat.com> - 0.80.3-10
 - Resolves: rhbz#249287
 - Remove upstream revision 1477 - Exhibits problem with revolver tester


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	24 Jun 2008 05:32:05 -0000	1.10
+++ sources	25 Sep 2008 08:07:36 -0000	1.11
@@ -1 +1 @@
-c0d4dc2bee121391e91354b538e12c87  openais-0.84.tar.gz
+b88301b21b4cb59765cb872c231128fb  openais-0.91.tar.gz


--- openais-defaultconfig.patch DELETED ---


--- revision-1568.patch DELETED ---


--- revision-1569.patch DELETED ---


--- revision-1570.patch DELETED ---


--- revision-1571.patch DELETED ---


--- revision-1572.patch DELETED ---


--- revision-1573.patch DELETED ---


--- revision-1574.patch DELETED ---


--- revision-1575.patch DELETED ---


--- revision-1576.patch DELETED ---


--- revision-1579.patch DELETED ---



From rezso at fedoraproject.org  Thu Sep 25 08:11:50 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Thu, 25 Sep 2008 08:11:50 +0000 (UTC)
Subject: rpms/fet/F-9 fet.desktop, NONE, 1.1 fet.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080925081150.D86877010A@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/fet/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv354/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	fet.desktop fet.spec import.log 
Log Message:
- initial import
 ----------------------------------------------------------------------
 Modified Files:
 	F-9/.cvsignore F-9/sources 
 Added Files:
 	F-9/fet.desktop F-9/fet.spec F-9/import.log 
 ----------------------------------------------------------------------



--- NEW FILE fet.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=FET
Comment=Timetable software for schools
Exec=fet
Terminal=false
Type=Application
Categories=Education;

Name[en]=FET
Comment[en]=Timetable software for schools
Name[ro]=FET
Comment[ro]=Program orare ??colare
Name[hu]=FET
Comment[hu]=??rarend fejleszt?? program


--- NEW FILE fet.spec ---
Name:      fet
Version:   5.6.3
Release:   3%{?dist}
Summary:   Open source free timetabling software

Group:     Applications/Engineering
License:   GPLv2+
URL:       http://lalescu.ro/liviu/fet
Source0:   http://lalescu.ro/liviu/fet/download/fet-%{version}.tar.bz2
Source1:   fet.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: qt-devel > 4.3
BuildRequires: desktop-file-utils

%description
FET is open source free software for automatically scheduling
the timetable of a school, high-school or university. It uses
a fast and efficient timetabling algorithm.

%prep
%setup -q

# convert Arabic to UTF-8
pushd doc/ar*/
iconv -f WINDOWS-1256 -t UTF-8  < FET_Manual_Arabic.txt > FET_Manual_Arabic.tmp
mv -f FET_Manual_Arabic.tmp FET_Manual_Arabic.txt
popd

# convert Italian to UTF-8
pushd doc/it*/
iconv -f ISO-8859-1 -t UTF-8 < fet\ istruzioni.txt > fet\ istruzioni.tmp
mv -f fet\ istruzioni.tmp fet\ istruzioni.txt
iconv -f ISO-8859-1 -t UTF-8 < fet\ faq.txt > fet\ faq.tmp
mv -f fet\ faq.tmp fet\ faq.txt
popd

# remove binary translations
rm -rf translations/*.qm

%build

# build application
qmake-qt4 %{name}.pro
make %{?_smp_mflags}

# build translation files
pushd translations
lrelease-qt4 *.ts
popd

%install
rm -rf %{buildroot}

# prepare folders
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_mandir}/man1
mkdir -p %{buildroot}%{_datadir}/%{name}/translations

# install
install -p -m 0755 fet %{buildroot}%{_bindir}/
install -p -m 0644 doc/fet.1 %{buildroot}%{_mandir}/man1/
install -p -m 0644 translations/*.qm %{buildroot}%{_datadir}/%{name}/translations

# install desktop file
desktop-file-install --vendor="fedora" \
        --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog CONTRIBUTORS COPYING
%doc GUESTBOOK LINKS README REFERENCES SPONSORS
%doc THANKS TODO TRANSLATORS
%doc doc sample_inputs
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz
%{_datadir}/applications/fedora-%{name}.desktop
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*

%changelog
* Thu Sep 25 2008 Balint Cristian <rezso at rdsor.ro> - 5.6.3-3
- remove binary translations at prep time

* Mon Sep 15 2008 Balint Cristian <rezso at rdsor.ro> - 5.6.3-2
- add desktop file
- build translations

* Wed Sep 10 2008 Balint Cristian <rezso at rdsor.ro> - 5.6.3-1
- initial package for fedora


--- NEW FILE import.log ---
fet-5_6_3-3_fc10:F-9:fet-5.6.3-3.fc10.src.rpm:1222330241


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fet/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2008 06:11:02 -0000	1.1
+++ .cvsignore	25 Sep 2008 08:11:20 -0000	1.2
@@ -0,0 +1 @@
+fet-5.6.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fet/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2008 06:11:02 -0000	1.1
+++ sources	25 Sep 2008 08:11:20 -0000	1.2
@@ -0,0 +1 @@
+aa806a3dd62a8a52470ffdf79e36a190  fet-5.6.3.tar.bz2



From rezso at fedoraproject.org  Thu Sep 25 08:24:01 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Thu, 25 Sep 2008 08:24:01 +0000 (UTC)
Subject: rpms/fet/F-8 fet.desktop, NONE, 1.1 fet.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080925082401.E65827010A@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/fet/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2994/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	fet.desktop fet.spec import.log 
Log Message:
- initial import
 ----------------------------------------------------------------------
 Modified Files:
 	F-8/.cvsignore F-8/sources 
 Added Files:
 	F-8/fet.desktop F-8/fet.spec F-8/import.log 
 ----------------------------------------------------------------------



--- NEW FILE fet.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=FET
Comment=Timetable software for schools
Exec=fet
Terminal=false
Type=Application
Categories=Education;

Name[en]=FET
Comment[en]=Timetable software for schools
Name[ro]=FET
Comment[ro]=Program orare ??colare
Name[hu]=FET
Comment[hu]=??rarend fejleszt?? program


--- NEW FILE fet.spec ---
Name:      fet
Version:   5.6.3
Release:   3%{?dist}
Summary:   Open source free timetabling software

Group:     Applications/Engineering
License:   GPLv2+
URL:       http://lalescu.ro/liviu/fet
Source0:   http://lalescu.ro/liviu/fet/download/fet-%{version}.tar.bz2
Source1:   fet.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: qt-devel > 4.3
BuildRequires: desktop-file-utils

%description
FET is open source free software for automatically scheduling
the timetable of a school, high-school or university. It uses
a fast and efficient timetabling algorithm.

%prep
%setup -q

# convert Arabic to UTF-8
pushd doc/ar*/
iconv -f WINDOWS-1256 -t UTF-8  < FET_Manual_Arabic.txt > FET_Manual_Arabic.tmp
mv -f FET_Manual_Arabic.tmp FET_Manual_Arabic.txt
popd

# convert Italian to UTF-8
pushd doc/it*/
iconv -f ISO-8859-1 -t UTF-8 < fet\ istruzioni.txt > fet\ istruzioni.tmp
mv -f fet\ istruzioni.tmp fet\ istruzioni.txt
iconv -f ISO-8859-1 -t UTF-8 < fet\ faq.txt > fet\ faq.tmp
mv -f fet\ faq.tmp fet\ faq.txt
popd

# remove binary translations
rm -rf translations/*.qm

%build

# build application
qmake-qt4 %{name}.pro
make %{?_smp_mflags}

# build translation files
pushd translations
lrelease-qt4 *.ts
popd

%install
rm -rf %{buildroot}

# prepare folders
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_mandir}/man1
mkdir -p %{buildroot}%{_datadir}/%{name}/translations

# install
install -p -m 0755 fet %{buildroot}%{_bindir}/
install -p -m 0644 doc/fet.1 %{buildroot}%{_mandir}/man1/
install -p -m 0644 translations/*.qm %{buildroot}%{_datadir}/%{name}/translations

# install desktop file
desktop-file-install --vendor="fedora" \
        --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog CONTRIBUTORS COPYING
%doc GUESTBOOK LINKS README REFERENCES SPONSORS
%doc THANKS TODO TRANSLATORS
%doc doc sample_inputs
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz
%{_datadir}/applications/fedora-%{name}.desktop
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*

%changelog
* Thu Sep 25 2008 Balint Cristian <rezso at rdsor.ro> - 5.6.3-3
- remove binary translations at prep time

* Mon Sep 15 2008 Balint Cristian <rezso at rdsor.ro> - 5.6.3-2
- add desktop file
- build translations

* Wed Sep 10 2008 Balint Cristian <rezso at rdsor.ro> - 5.6.3-1
- initial package for fedora


--- NEW FILE import.log ---
fet-5_6_3-3_fc10:F-8:fet-5.6.3-3.fc10.src.rpm:1222330974


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fet/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2008 06:11:02 -0000	1.1
+++ .cvsignore	25 Sep 2008 08:23:31 -0000	1.2
@@ -0,0 +1 @@
+fet-5.6.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fet/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2008 06:11:02 -0000	1.1
+++ sources	25 Sep 2008 08:23:31 -0000	1.2
@@ -0,0 +1 @@
+aa806a3dd62a8a52470ffdf79e36a190  fet-5.6.3.tar.bz2



From transif at fedoraproject.org  Thu Sep 25 08:29:23 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 25 Sep 2008 08:29:23 +0000 (UTC)
Subject: comps/po ja.po,1.18,1.19
Message-ID: <20080925082923.3FC307010A@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4448/po

Modified Files:
	ja.po 
Log Message:
    2008-09-25  kiyoto hashida <khashida at redhat.com> (via
khasida at fedoraproject.org)
    
      * po/ja.po: Updated Japanese for the 2nd time
    



Index: ja.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ja.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ja.po	24 Sep 2008 07:36:35 -0000	1.18
+++ ja.po	25 Sep 2008 08:28:52 -0000	1.19
@@ -12,7 +12,7 @@
 "Project-Id-Version: comps.HEAD.ja\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-24 03:30+0000\n"
-"PO-Revision-Date: 2008-09-24 17:32+1000\n"
+"PO-Revision-Date: 2008-09-25 18:25+1000\n"
 "Last-Translator: Kiyoto Hashida <khashida at redhat.com>\n"
 "Language-Team: Japanese <jp at li.org>\n"
 "MIME-Version: 1.0\n"



From thias at fedoraproject.org  Thu Sep 25 08:49:53 2008
From: thias at fedoraproject.org (Matthias Saou)
Date: Thu, 25 Sep 2008 08:49:53 +0000 (UTC)
Subject: rpms/thttpd/devel thttpd-2.25b-CVE-2005-3124.patch, 1.1,
	1.2 thttpd-2.25b-fixes.patch, 1.1, 1.2 thttpd.spec, 1.16, 1.17
Message-ID: <20080925084954.07FEF7010A@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/thttpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7978

Modified Files:
	thttpd-2.25b-CVE-2005-3124.patch thttpd-2.25b-fixes.patch 
	thttpd.spec 
Log Message:
Update patches to remove fuzz.


thttpd-2.25b-CVE-2005-3124.patch:

Index: thttpd-2.25b-CVE-2005-3124.patch
===================================================================
RCS file: /cvs/extras/rpms/thttpd/devel/thttpd-2.25b-CVE-2005-3124.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thttpd-2.25b-CVE-2005-3124.patch	7 Nov 2005 11:41:31 -0000	1.1
+++ thttpd-2.25b-CVE-2005-3124.patch	25 Sep 2008 08:49:23 -0000	1.2
@@ -1,7 +1,7 @@
-diff -ru thttpd-2.23beta1.orig/extras/syslogtocern thttpd-2.23beta1/extras/syslogtocern
---- thttpd-2.23beta1.orig/extras/syslogtocern	1999-09-15 18:00:54.000000000 +0200
-+++ thttpd-2.23beta1/extras/syslogtocern	2005-10-26 01:45:34.000000000 +0200
-@@ -31,8 +31,8 @@
+diff -Naupr thttpd-2.25b.orig/extras/syslogtocern thttpd-2.25b/extras/syslogtocern
+--- thttpd-2.25b.orig/extras/syslogtocern	2005-06-29 19:50:23.000000000 +0200
++++ thttpd-2.25b/extras/syslogtocern	2008-09-25 10:42:27.000000000 +0200
+@@ -31,8 +31,8 @@ if [ $# -lt 1 ] ; then
      exit 1
  fi
  
@@ -11,9 +11,81 @@
 +trap " [ -f \"$tmp1\" ] && /bin/rm -f -- \"$tmp1\"" 0 1 2 3 13 15
  
  # Gather up all the thttpd entries.
- egrep ' thttpd\[' $* > $tmp1
-@@ -65,4 +65,3 @@
+ egrep -h ' thttpd\[' "$@" > $tmp1
+@@ -65,4 +65,3 @@ awk < $tmp1 '{if ( ! ( NF >= 15 && $7 ==
    sed -e "s,\([A-Z][a-z][a-z] [0-9 ][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\) [^ ]* thttpd\[[0-9]*\]: \(.*\),[\1 ${year}] \2," > error_log
  
  # Done.
 -rm -f $tmp1
+diff -Naupr thttpd-2.25b.orig/extras/syslogtocern.orig thttpd-2.25b/extras/syslogtocern.orig
+--- thttpd-2.25b.orig/extras/syslogtocern.orig	1970-01-01 01:00:00.000000000 +0100
++++ thttpd-2.25b/extras/syslogtocern.orig	2005-06-29 19:50:23.000000000 +0200
+@@ -0,0 +1,68 @@
++#!/bin/sh
++#
++# syslogtocern - convert thttpd syslog entries into CERN Combined Log Format
++#
++# Copyright ? 1995,1998 by Jef Poskanzer <jef at mail.acme.com>.
++# All rights reserved.
++#
++# Redistribution and use in source and binary forms, with or without
++# modification, are permitted provided that the following conditions
++# are met:
++# 1. Redistributions of source code must retain the above copyright
++#    notice, this list of conditions and the following disclaimer.
++# 2. Redistributions in binary form must reproduce the above copyright
++#    notice, this list of conditions and the following disclaimer in the
++#    documentation and/or other materials provided with the distribution.
++# 
++# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
++# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
++# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++# SUCH DAMAGE.
++
++if [ $# -lt 1 ] ; then
++    echo "usage:  $0 logfile ..." >&2
++    exit 1
++fi
++
++tmp1=/tmp/stc1.$$
++rm -f $tmp1
++
++# Gather up all the thttpd entries.
++egrep -h ' thttpd\[' "$@" > $tmp1
++
++# Figure out the current year - it's not in syslog's output.  Some versions
++# of date have the %Y directive to give the full four-digit year, but others
++# only have %y.
++year=`date +%y`
++if [ $year -gt 70 ] ; then
++    year=19$year
++else
++    year=20$year
++fi
++
++# If the current year isn't the year that the logfile was generated, we need
++# to fix it.  This will most likely happen once a year, when this script is
++# run on January 1st for December 31st's logfile.  So, if the current month
++# is January and there are December dates in the log file, we subtract one.
++# This should cover most cases.
++if [ `date +%m` -eq 1 -a `head -1 $tmp1 | awk '{print $1}'` = "Dec" ] ; then
++    year=`echo $year - 1 | bc`
++fi
++
++# Do access_log.
++awk < $tmp1 '{if ( NF >= 15 && $7 == "-" && $12 >= 100 && $12 < 510) print;}' |
++  sed -e "s,\([A-Z][a-z][a-z]\) \([0-9 ][0-9]\) \([0-9][0-9]:[0-9][0-9]:[0-9][0-9]\) [^ ]* thttpd\[[0-9]*\]: \([^ ]* [^ ]* [^ ]*\) \(.*\),\4 [\2/\1/${year}:\3] \5," -e 's,\[ ,[0,' > access_log
++
++# Do error_log.
++awk < $tmp1 '{if ( ! ( NF >= 15 && $7 == "-" && $12 >= 100 && $12 < 510) ) print;}' |
++  sed -e "s,\([A-Z][a-z][a-z] [0-9 ][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\) [^ ]* thttpd\[[0-9]*\]: \(.*\),[\1 ${year}] \2," > error_log
++
++# Done.
++rm -f $tmp1

thttpd-2.25b-fixes.patch:

Index: thttpd-2.25b-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/thttpd/devel/thttpd-2.25b-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thttpd-2.25b-fixes.patch	4 Jul 2006 11:22:36 -0000	1.1
+++ thttpd-2.25b-fixes.patch	25 Sep 2008 08:49:23 -0000	1.2
@@ -1,8 +1,6 @@
-This patch comes from the Debian thttpd package. Many thanks to Daniel Baumann
-for all the recent changes.
-
---- thttpd-2.23beta1.orig/extras/htpasswd.1
-+++ thttpd-2.23beta1/extras/htpasswd.1
+diff -Naupr thttpd-2.25b.orig/extras/htpasswd.1 thttpd-2.25b/extras/htpasswd.1
+--- thttpd-2.25b.orig/extras/htpasswd.1	1998-05-07 19:01:04.000000000 +0200
++++ thttpd-2.25b/extras/htpasswd.1	2008-09-25 10:43:13.000000000 +0200
 @@ -1,8 +1,8 @@
 -.TH htpasswd 1 "05 May 1998"
 +.TH thtpasswd 1 "05 May 1998"
@@ -15,9 +13,10 @@
  .RB [ -c ]
  .I passwordfile
  .I username
---- thttpd-2.23beta1.orig/extras/htpasswd.c
-+++ thttpd-2.23beta1/extras/htpasswd.c
-@@ -21,7 +21,12 @@
+diff -Naupr thttpd-2.25b.orig/extras/htpasswd.c thttpd-2.25b/extras/htpasswd.c
+--- thttpd-2.25b.orig/extras/htpasswd.c	2001-12-19 01:08:08.000000000 +0100
++++ thttpd-2.25b/extras/htpasswd.c	2008-09-25 10:43:13.000000000 +0200
+@@ -21,7 +21,12 @@ extern char *crypt(const char *key, cons
  #define LF 10
  #define CR 13
  
@@ -30,7 +29,7 @@
  
  int tfd;
  char temp_template[] = "/tmp/htp.XXXXXX";
-@@ -137,8 +142,9 @@
+@@ -137,8 +142,9 @@ add_password( char* user, FILE* f )
      }
  
  static void usage(void) {
@@ -42,7 +41,7 @@
      exit(1);
  }
  
-@@ -151,17 +157,37 @@
+@@ -151,17 +157,37 @@ void interrupted(int signo) {
  int main(int argc, char *argv[]) {
      FILE *tfp,*f;
      char user[MAX_STRING_LEN];
@@ -83,7 +82,7 @@
          if(!(tfp = fopen(argv[2],"w"))) {
              fprintf(stderr,"Could not open passwd file %s for writing.\n",
                      argv[2]);
-@@ -172,12 +198,6 @@
+@@ -172,12 +198,6 @@ int main(int argc, char *argv[]) {
          add_password(argv[3],tfp);
          fclose(tfp);
          exit(0);
@@ -96,7 +95,7 @@
      }
  
      if(!(f = fopen(argv[1],"r"))) {
-@@ -186,16 +206,43 @@
+@@ -186,16 +206,43 @@ int main(int argc, char *argv[]) {
          fprintf(stderr,"Use -c option to create new one.\n");
          exit(1);
      }
@@ -143,7 +142,7 @@
          if(strcmp(user,w)) {
              putline(tfp,line);
              continue;
-@@ -210,10 +257,28 @@
+@@ -210,10 +257,28 @@ int main(int argc, char *argv[]) {
          printf("Adding user %s\n",user);
          add_password(user,tfp);
      }
@@ -174,8 +173,9 @@
      unlink(temp_template);
      exit(0);
  }
---- thttpd-2.23beta1.orig/extras/makeweb.1
-+++ thttpd-2.23beta1/extras/makeweb.1
+diff -Naupr thttpd-2.25b.orig/extras/makeweb.1 thttpd-2.25b/extras/makeweb.1
+--- thttpd-2.25b.orig/extras/makeweb.1	2005-06-29 19:53:22.000000000 +0200
++++ thttpd-2.25b/extras/makeweb.1	2008-09-25 10:43:13.000000000 +0200
 @@ -2,11 +2,17 @@
  .SH NAME
  makeweb - create user web directory
@@ -195,9 +195,10 @@
  .SH "SEE ALSO
  thttpd(8)
  .SH AUTHOR
---- thttpd-2.23beta1.orig/extras/makeweb.c
-+++ thttpd-2.23beta1/extras/makeweb.c
-@@ -47,6 +47,10 @@
+diff -Naupr thttpd-2.25b.orig/extras/makeweb.c thttpd-2.25b/extras/makeweb.c
+--- thttpd-2.25b.orig/extras/makeweb.c	2005-06-29 19:53:25.000000000 +0200
++++ thttpd-2.25b/extras/makeweb.c	2008-09-25 10:43:13.000000000 +0200
+@@ -48,6 +48,10 @@
  
  static char* argv0;
  
@@ -208,7 +209,7 @@
  
  static void
  check_room( int size, int len )
-@@ -120,28 +124,44 @@
+@@ -121,28 +125,44 @@ This is probably a configuration error.\
  int
  main( int argc, char** argv )
      {
@@ -259,7 +260,7 @@
  	}
      username = pwd->pw_name;
      homedir = pwd->pw_dir;
-@@ -158,11 +178,9 @@
+@@ -159,11 +179,9 @@ main( int argc, char** argv )
      (void) strcat( dirname, TILDE_MAP_2 );
  
      check_dir( dirname, pwd->pw_uid, pwd->pw_gid );
@@ -272,9 +273,270 @@
  #ifdef TILDE_MAP_1
      prefix = TILDE_MAP_1;
  #else /* TILDE_MAP_1 */
---- thttpd-2.23beta1.orig/thttpd.8
-+++ thttpd-2.23beta1/thttpd.8
-@@ -259,7 +259,7 @@
+diff -Naupr thttpd-2.25b.orig/extras/makeweb.c.orig thttpd-2.25b/extras/makeweb.c.orig
+--- thttpd-2.25b.orig/extras/makeweb.c.orig	1970-01-01 01:00:00.000000000 +0100
++++ thttpd-2.25b/extras/makeweb.c.orig	2005-06-29 19:53:25.000000000 +0200
+@@ -0,0 +1,256 @@
++/* makeweb.c - let a user create a web subdirectory
++**
++** Copyright ? 1995 by Jef Poskanzer <jef at mail.acme.com>.
++** All rights reserved.
++**
++** Redistribution and use in source and binary forms, with or without
++** modification, are permitted provided that the following conditions
++** are met:
++** 1. Redistributions of source code must retain the above copyright
++**    notice, this list of conditions and the following disclaimer.
++** 2. Redistributions in binary form must reproduce the above copyright
++**    notice, this list of conditions and the following disclaimer in the
++**    documentation and/or other materials provided with the distribution.
++** 
++** THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
++** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++** ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
++** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++** OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++** HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++** LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++** SUCH DAMAGE.
++*/
++
++/* This is intended to be installed setgid to a group that has
++** write access to the system web directory.  It allows any user
++** to create a subdirectory there.  It also makes a symbolic link
++** in the user's home directory pointing at the new web subdir.
++*/
++
++
++#include "../config.h"
++
++#include <stdlib.h>
++#include <unistd.h>
++#include <stdio.h>
++#include <string.h>
++#include <pwd.h>
++#include <errno.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++
++
++#define LINK "public_html"
++
++static char* argv0;
++
++
++static void
++check_room( int size, int len )
++    {
++    if ( len > size )
++	{
++	(void) fprintf( stderr, "%s: internal error, out of room\n", argv0 );
++	exit( 1 );
++	}
++    }
++
++
++static void
++end_with_slash( char* str )
++    {
++    if ( str[strlen( str ) - 1] != '/' )
++	(void) strcat( str, "/" );
++    }
++
++
++static void
++check_dir( char* dirname, uid_t uid, gid_t gid )
++    {
++    struct stat sb;
++
++    /* Check the directory. */
++    if ( stat( dirname, &sb ) < 0 )
++	{
++	if ( errno != ENOENT )
++	    {
++	    perror( dirname );
++	    exit( 1 );
++	    }
++	/* Doesn't exist.  Try to make it. */
++	if ( mkdir( dirname, 0755 ) < 0 )
++	    {
++	    if ( errno == ENOENT )
++		(void) printf( "\
++Some part of the path %s does not exist.\n\
++This is probably a configuration error.\n", dirname );
++	    else
++		perror( dirname );
++	    exit( 1 );
++	    }
++	(void) printf( "Created web directory %s\n", dirname );
++	/* Try to change the group of the new dir to the user's group. */
++	(void) chown( dirname, -1, gid );
++	}
++    else
++	{
++	/* The directory already exists.  Well, check that it is in
++	** fact a directory.
++	*/
++	if ( ! S_ISDIR( sb.st_mode ) )
++	    {
++	    (void) printf(
++		"%s already exists but is not a directory!\n", dirname );
++	    exit( 1 );
++	    }
++	if ( sb.st_uid != uid )
++	    {
++	    (void) printf(
++		"%s already exists but you don't own it!\n", dirname );
++	    exit( 1 );
++	    }
++	(void) printf( "Web directory %s already existed.\n", dirname );
++	}
++    }
++
++
++int
++main( int argc, char** argv )
++    {
++    char* webdir;
++    char* prefix;
++    struct passwd* pwd;
++    char* username;
++    char* homedir;
++    char dirname[5000];
++    char linkname[5000];
++    char linkbuf[5000];
++    struct stat sb;
++
++    argv0 = argv[0];
++    if ( argc != 1 )
++	{
++	(void) fprintf( stderr, "usage:  %s\n", argv0 );
++	exit( 1 );
++	}
++
++    pwd = getpwuid( getuid() );
++    if ( pwd == (struct passwd*) 0 )
++	{
++	(void) fprintf( stderr, "%s: can't find your username\n", argv0 );
++	exit( 1 );
++	}
++    username = pwd->pw_name;
++    homedir = pwd->pw_dir;
++
++#ifdef TILDE_MAP_2
++
++    /* All we have to do for the TILDE_MAP_2 case is make sure there's
++    ** a public_html subdirectory.
++    */
++    check_room(
++	sizeof(dirname), strlen( homedir ) + strlen( TILDE_MAP_2 ) + 2 );
++    (void) strcpy( dirname, homedir );
++    end_with_slash( dirname );
++    (void) strcat( dirname, TILDE_MAP_2 );
++
++    check_dir( dirname, pwd->pw_uid, pwd->pw_gid );
++
++#else /* TILDE_MAP_2 */
++
++    /* Gather the pieces. */
++    webdir = WEBDIR;
++#ifdef TILDE_MAP_1
++    prefix = TILDE_MAP_1;
++#else /* TILDE_MAP_1 */
++    prefix = "";
++#endif /* TILDE_MAP_1 */
++
++    /* Assemble the directory name.  Be paranoid cause we're sgid. */
++    check_room(
++	sizeof(dirname),
++	strlen( webdir ) + strlen( prefix ) + strlen( username ) + 3 );
++    (void) strcpy( dirname, webdir );
++    end_with_slash( dirname );
++    if ( strlen( prefix ) != 0 )
++	{
++	(void) strcat( dirname, prefix );
++	end_with_slash( dirname );
++	}
++    (void) strcat( dirname, username );
++
++    /* Assemble the link name. */
++    check_room( sizeof(linkname), strlen( homedir ) + strlen( LINK ) + 2 );
++    (void) strcpy( linkname, homedir );
++    end_with_slash( linkname );
++    (void) strcat( linkname, LINK );
++
++    check_dir( dirname, pwd->pw_uid, pwd->pw_gid );
++
++    /* Check the symlink. */
++    try_link_again: ;
++    if ( lstat( linkname, &sb ) < 0 )
++	{
++	if ( errno != ENOENT )
++	    {
++	    perror( linkname );
++	    exit( 1 );
++	    }
++	/* Doesn't exist.  Try to make it. */
++	if ( symlink( dirname, linkname ) < 0 )
++	    {
++	    if ( errno == ENOENT )
++		(void) printf( "\
++Some part of the path %s does not exist.\n\
++This is probably a configuration error.\n", linkname );
++	    else
++		perror( linkname );
++	    exit( 1 );
++	    }
++	(void) printf( "Created symbolic link %s\n", linkname );
++	}
++    else
++	{
++	/* The link already exists.  Well, check that it is in
++	** fact a link.
++	*/
++	if ( ! S_ISLNK( sb.st_mode ) )
++	    {
++	    (void) printf( "\
++%s already exists but is not a\n\
++symbolic link!  Perhaps you have a real web subdirectory in your\n\
++home dir from a previous web server configuration?  You may have\n\
++to rename it, run %s again, and then copy in the old\n\
++contents.\n", linkname, argv0 );
++	    exit( 1 );
++	    }
++	/* Check the existing link's contents. */
++	if ( readlink( linkname, linkbuf, sizeof(linkbuf) ) < 0 )
++	    {
++	    perror( linkname );
++	    exit( 1 );
++	    }
++	if ( strcmp( dirname, linkbuf ) == 0 )
++	    (void) printf( "Symbolic link %s already existed.\n", linkname );
++	else
++	    {
++	    (void) printf( "\
++Symbolic link %s already existed\n\
++but it points to the wrong place!  Attempting to remove and\n\
++recreate it.\n", linkname );
++	    if ( unlink( linkname ) < 0 )
++		{
++		perror( linkname );
++		exit( 1 );
++		}
++	    goto try_link_again;
++	    }
++	}
++#endif /* TILDE_MAP_2 */
++
++    exit( 0 );
++    }
+diff -Naupr thttpd-2.25b.orig/thttpd.8 thttpd-2.25b/thttpd.8
+--- thttpd-2.25b.orig/thttpd.8	2005-06-29 19:50:56.000000000 +0200
++++ thttpd-2.25b/thttpd.8	2008-09-25 10:43:13.000000000 +0200
+@@ -270,7 +270,7 @@ called .htpasswd by default.
  This file is formatted as the familiar colon-separated
  username/encrypted-password pair, records delimited by newlines.
  The protection does not carry over to subdirectories.
@@ -283,12 +545,612 @@
  modify .htpasswd files.
  .PP
  Relevant config.h option: AUTH_FILE
-@@ -534,7 +534,7 @@
- Currently the best alternative for log rotation is to send a USR1 signal,
- shutting down thttpd altogether, and then restart it.
+@@ -562,7 +562,7 @@ This is a little tricky to set up correc
+ chroot() then the log file must be within the chroot tree, but it's
+ definitely doable.
  .SH "SEE ALSO"
 -redirect(8), ssi(8), makeweb(1), htpasswd(1), syslogtocern(8), weblog_parse(1), http_get(1)
 +thtpasswd(1), syslogtocern(8)
  .SH THANKS
  .PP
  Many thanks to contributors, reviewers, testers:
+diff -Naupr thttpd-2.25b.orig/thttpd.8.orig thttpd-2.25b/thttpd.8.orig
+--- thttpd-2.25b.orig/thttpd.8.orig	1970-01-01 01:00:00.000000000 +0100
++++ thttpd-2.25b/thttpd.8.orig	2005-06-29 19:50:56.000000000 +0200
+@@ -0,0 +1,596 @@
++.TH thttpd 8 "29 February 2000"
++.SH NAME
++thttpd - tiny/turbo/throttling HTTP server
++.SH SYNOPSIS
++.B thttpd
++.RB [ -C
++.IR configfile ]
++.RB [ -p
++.IR port ]
++.RB [ -d
++.IR dir ]
++.RB [ -dd
++.IR data_dir ]
++.RB [ -r | -nor ]
++.RB [ -s | -nos ]
++.RB [ -v | -nov ]
++.RB [ -g | -nog ]
++.RB [ -u
++.IR user ]
++.RB [ -c
++.IR cgipat ]
++.RB [ -t
++.IR throttles ]
++.RB [ -h
++.IR host ]
++.RB [ -l
++.IR logfile ]
++.RB [ -i
++.IR pidfile ]
++.RB [ -T
++.IR charset ]
++.RB [ -P
++.IR P3P ]
++.RB [ -M
++.IR maxage ]
++.RB [ -V ]
++.RB [ -D ]
++.SH DESCRIPTION
++.PP
++.I thttpd
++is a simple, small, fast, and secure HTTP server.
++It doesn't have a lot of special features, but it suffices for most uses of
++the web, it's about as fast as the best full-featured servers (Apache, NCSA,
++Netscape),
++and it has one extremely useful feature (URL-traffic-based throttling)
++that no other server currently has.
++.SH OPTIONS
++.TP
++.B -C
++Specifies a config-file to read.
++All options can be set either by command-line flags or in the config file.
++See below for details.
++.TP
++.B -p
++Specifies an alternate port number to listen on.
++The default is 80.
++The config-file option name for this flag is "port",
++and the config.h option is DEFAULT_PORT.
++.TP
++.B -d
++Specifies a directory to chdir() to at startup.
++This is merely a convenience - you could just as easily
++do a cd in the shell script that invokes the program.
++The config-file option name for this flag is "dir",
++and the config.h options are WEBDIR, USE_USER_DIR.
++.TP
++.B -r
++Do a chroot() at initialization time, restricting file access
++to the program's current directory.
++If -r is the compiled-in default, then -nor disables it.
++See below for details.
++The config-file option names for this flag are "chroot" and "nochroot",
++and the config.h option is ALWAYS_CHROOT.
++.TP
++.B -dd
++Specifies a directory to chdir() to after chrooting.
++If you're not chrooting, you might as well do a single chdir() with
++the -d flag.
++If you are chrooting, this lets you put the web files in a subdirectory
++of the chroot tree, instead of in the top level mixed in with the
++chroot files.
++The config-file option name for this flag is "data_dir".
++.TP
++.B -nos
++Don't do explicit symbolic link checking.
++Normally, thttpd explicitly expands any symbolic links in filenames,
++to check that the resulting path stays within the original document tree.
++If you want to turn off this check and save some CPU time, you can use
++the -nos flag, however this is not recommended.
++Note, though, that if you are using the chroot option, the symlink
++checking is unnecessary and is turned off, so the safe way to save
++those CPU cycles is to use chroot.
++The config-file option names for this flag are "symlinkcheck" and "nosymlinkcheck".
++.TP
++.B -v
++Do el-cheapo virtual hosting.
++If -v is the compiled-in default, then -nov disables it.
++See below for details.
++The config-file option names for this flag are "vhost" and "novhost",
++and the config.h option is ALWAYS_VHOST.
++.TP
++.B -g
++Use a global passwd file.
++This means that every file in the entire document tree is protected by
++the single .htpasswd file at the top of the tree.
++Otherwise the semantics of the .htpasswd file are the same.
++If this option is set but there is no .htpasswd file in
++the top-level directory, then thttpd proceeds as if the option was
++not set - first looking for a local .htpasswd file, and if that doesn't
++exist either then serving the file without any password.
++If -g is the compiled-in default, then -nog disables it.
++The config-file option names for this flag are "globalpasswd" and
++"noglobalpasswd",
++and the config.h option is ALWAYS_GLOBAL_PASSWD.
++.TP
++.B -u
++Specifies what user to switch to after initialization when started as root.
++The default is "nobody".
++The config-file option name for this flag is "user",
++and the config.h option is DEFAULT_USER.
++.TP
++.B -c
++Specifies a wildcard pattern for CGI programs, for instance "**.cgi"
++or "/cgi-bin/*".
++See below for details.
++The config-file option name for this flag is "cgipat",
++and the config.h option is CGI_PATTERN.
++.TP
++.B -t
++Specifies a file of throttle settings.
++See below for details.
++The config-file option name for this flag is "throttles".
++.TP
++.B -h
++Specifies a hostname to bind to, for multihoming.
++The default is to bind to all hostnames supported on the local machine.
++See below for details.
++The config-file option name for this flag is "host",
++and the config.h option is SERVER_NAME.
++.TP
++.B -l
++Specifies a file for logging.
++If no -l argument is specified, thttpd logs via syslog().
++If "-l /dev/null" is specified, thttpd doesn't log at all.
++The config-file option name for this flag is "logfile".
++.TP
++.B -i
++Specifies a file to write the process-id to.
++If no file is specified, no process-id is written.
++You can use this file to send signals to thttpd.
++See below for details.
++The config-file option name for this flag is "pidfile".
++.TP
++.B -T
++Specifies the character set to use with text MIME types.
++The default is iso-8859-1.
++The config-file option name for this flag is "charset",
++and the config.h option is DEFAULT_CHARSET.
++.TP
++.B -P
++Specifies a P3P server privacy header to be returned with all responses.
++See http://www.w3.org/P3P/ for details.
++Thttpd doesn't do anything at all with the string except put it in the
++P3P: response header.
++The config-file option name for this flag is "p3p".
++.TP
++.B -M
++Specifies the number of seconds to be used in a "Cache-Control: max-age"
++header to be returned with all responses.
++An equivalent "Expires" header is also generated.
++The default is no Cache-Control or Expires headers,
++which is just fine for most sites.
++The config-file option name for this flag is "max_age".
++.TP
++.B -V
++Shows the current version info.
++.TP
++.B -D
++This was originally just a debugging flag, however it's worth mentioning
++because one of the things it does is prevent thttpd from making itself
++a background daemon.
++Instead it runs in the foreground like a regular program.
++This is necessary when you want to run thttpd wrapped in a little shell
++script that restarts it if it exits.
++.SH "CONFIG-FILE"
++.PP
++All the command-line options can also be set in a config file.
++One advantage of using a config file is that the file can be changed,
++and thttpd will pick up the changes with a restart.
++.PP
++The syntax of the config file is simple, a series of "option" or
++"option=value" separated by whitespace.
++The option names are listed above with their corresponding command-line flags.
++.SH "CHROOT"
++.PP
++chroot() is a system call that restricts the program's view
++of the filesystem to the current directory and directories
++below it.
++It becomes impossible for remote users to access any file
++outside of the initial directory.
++The restriction is inherited by child processes, so CGI programs get it too.
++This is a very strong security measure, and is recommended.
++The only downside is that only root can call chroot(), so this means
++the program must be started as root.
++However, the last thing it does during initialization is to
++give up root access by becoming another user, so this is safe.
++.PP
++The program can also be compile-time configured to always
++do a chroot(), without needing the -r flag.
++.PP
++Note that with some other web servers, such as NCSA httpd, setting
++up a directory tree for use with chroot() is complicated, involving
++creating a bunch of special directories and copying in various files.
++With thttpd it's a lot easier, all you have to do is make sure
++any shells, utilities, and config files used by your CGI programs and
++scripts are available.
++If you have CGI disabled, or if you make a policy that all CGI programs
++must be written in a compiled language such as C and statically linked,
++then you probably don't have to do any setup at all.
++.PP
++However, one thing you should do is tell syslogd about the chroot tree,
++so that thttpd can still generate syslog messages.
++Check your system's syslodg man page for how to do this.
++In FreeBSD you would put something like this in /etc/rc.conf:
++.nf
++    syslogd_flags="-l /usr/local/www/data/dev/log"
++.fi
++Substitute in your own chroot tree's pathname, of course.
++Don't worry about creating the log socket, syslogd wants to do that itself.
++(You may need to create the dev directory.)
++In Linux the flag is -a instead of -l, and there may be other differences.
++.PP
++Relevant config.h option: ALWAYS_CHROOT.
++.SH "CGI"
++.PP
++thttpd supports the CGI 1.1 spec.
++.PP
++In order for a CGI program to be run, its name must match the pattern
++specified either at compile time or on the command line with the -c flag.
++This is a simple shell-style filename pattern.
++You can use * to match any string not including a slash,
++or ** to match any string including slashes,
++or ? to match any single character.
++You can also use multiple such patterns separated by |.
++The patterns get checked against the filename
++part of the incoming URL.
++Don't forget to quote any wildcard characters so that the shell doesn't
++mess with them.
++.PP
++Restricting CGI programs to a single directory lets the site administrator
++review them for security holes, and is strongly recommended.
++If there are individual users that you trust, you can enable their
++directories too.
++.PP
++If no CGI pattern is specified, neither here nor at compile time,
++then CGI programs cannot be run at all.
++If you want to disable CGI as a security measure, that's how you do it, just
++comment out the patterns in the config file and don't run with the -c flag.
++.PP
++Note: the current working directory when a CGI program gets run is
++the directory that the CGI program lives in.
++This isn't in the CGI 1.1 spec, but it's what most other HTTP servers do.
++.PP
++Relevant config.h options: CGI_PATTERN, CGI_TIMELIMIT, CGI_NICE, CGI_PATH, CGI_LD_LIBRARY_PATH, CGIBINDIR.
++.SH "BASIC AUTHENTICATION"
++.PP
++Basic Authentication is available as an option at compile time.
++If enabled, it uses a password file in the directory to be protected,
++called .htpasswd by default.
++This file is formatted as the familiar colon-separated
++username/encrypted-password pair, records delimited by newlines.
++The protection does not carry over to subdirectories.
++The utility program htpasswd(1) is included to help create and
++modify .htpasswd files.
++.PP
++Relevant config.h option: AUTH_FILE
++.SH "THROTTLING"
++.PP
++The throttle file lets you set maximum byte rates on URLs or URL groups.
++You can optionally set a minimum rate too.
++The format of the throttle file is very simple.
++A # starts a comment, and the rest of the line is ignored.
++Blank lines are ignored.
++The rest of the lines should consist of a pattern, whitespace, and a number.
++The pattern is a simple shell-style filename pattern, using ?/**/*, or
++multiple such patterns separated by |.
++.PP
++The numbers in the file are byte rates, specified in units of bytes per second.
++For comparison, a v.90 modem gives about 5000 B/s depending on compression,
++a double-B-channel ISDN line about 12800 B/s, and a T1 line is about
++150000 B/s.
++If you want to set a minimum rate as well, use number-number.
++.PP
++Example:
++.nf
++  # throttle file for www.acme.com
++
++  **              2000-100000  # limit total web usage to 2/3 of our T1,
++                               # but never go below 2000 B/s
++  **.jpg|**.gif   50000   # limit images to 1/3 of our T1
++  **.mpg          20000   # and movies to even less
++  jef/**          20000   # jef's pages are too popular
++.fi
++.PP
++Throttling is implemented by checking each incoming URL filename against all
++of the patterns in the throttle file.
++The server accumulates statistics on how much bandwidth each pattern
++has accounted for recently (via a rolling average).
++If a URL matches a pattern that has been exceeding its specified limit,
++then the data returned is actually slowed down, with
++pauses between each block.
++If that's not possible (e.g. for CGI programs) or if the bandwidth has gotten
++way larger than the limit, then the server returns a special code
++saying 'try again later'.
++.PP
++The minimum rates are implemented similarly.
++If too many people are trying to fetch something at the same time,
++throttling may slow down each connection so much that it's not really
++useable.
++Furthermore, all those slow connections clog up the server, using
++up file handles and connection slots.
++Setting a minimum rate says that past a certain point you should not
++even bother - the server returns the 'try again later" code and the
++connection isn't even started.
++.PP
++There is no provision for setting a maximum connections/second throttle,
++because throttling a request uses as much cpu as handling it, so
++there would be no point.
++There is also no provision for throttling the number of simultaneous
++connections on a per-URL basis.
++However you can control the overall number of connections for the whole
++server very simply, by setting the operating system's per-process file
++descriptor limit before starting thttpd.
++Be sure to set the hard limit, not the soft limit.
++.SH "MULTIHOMING"
++.PP
++Multihoming means using one machine to serve multiple hostnames.
++For instance, if you're an internet provider and you want to let
++all of your customers have customized web addresses, you might
++have www.joe.acme.com, www.jane.acme.com, and your own www.acme.com,
++all running on the same physical hardware.
++This feature is also known as "virtual hosts".
++There are three steps to setting this up.
++.PP
++One, make DNS entries for all of the hostnames.
++The current way to do this, allowed by HTTP/1.1, is to use CNAME aliases,
++like so:
++.nf
++  www.acme.com IN A 192.100.66.1
++  www.joe.acme.com IN CNAME www.acme.com
++  www.jane.acme.com IN CNAME www.acme.com
++.fi
++However, this is incompatible with older HTTP/1.0 browsers.
++If you want to stay compatible, there's a different way - use A records
++instead, each with a different IP address, like so:
++.nf
++  www.acme.com IN A 192.100.66.1
++  www.joe.acme.com IN A 192.100.66.200
++  www.jane.acme.com IN A 192.100.66.201
++.fi
++This is bad because it uses extra IP addresses, a somewhat scarce resource.
++But if you want people with older browsers to be able to visit your
++sites, you still have to do it this way.
++.PP
++Step two.
++If you're using the modern CNAME method of multihoming, then you can
++skip this step.
++Otherwise, using the older multiple-IP-address method you
++must set up IP aliases or multiple interfaces for the extra addresses.
++You can use ifconfig(8)'s alias command to tell the machine to answer to
++all of the different IP addresses.
++Example:
++.nf
++  ifconfig le0 www.acme.com
++  ifconfig le0 www.joe.acme.com alias
++  ifconfig le0 www.jane.acme.com alias
++.fi
++If your OS's version of ifconfig doesn't have an alias command, you're
++probably out of luck (but see http://www.acme.com/software/thttpd/notes.html).
++.PP
++Third and last, you must set up thttpd to handle the multiple hosts.
++The easiest way is with the -v flag, or the ALWAYS_VHOST config.h option.
++This works with either CNAME multihosting or multiple-IP multihosting.
++What it does is send each incoming request to a subdirectory based on the
++hostname it's intended for.
++All you have to do in order to set things up is to create those subdirectories
++in the directory where thttpd will run.
++With the example above, you'd do like so:
++.nf
++  mkdir www.acme.com www.joe.acme.com www.jane.acme.com
++.fi
++If you're using old-style multiple-IP multihosting, you should also create
++symbolic links from the numeric addresses to the names, like so:
++.nf
++  ln -s www.acme.com 192.100.66.1
++  ln -s www.joe.acme.com 192.100.66.200
++  ln -s www.jane.acme.com 192.100.66.201
++.fi
++This lets the older HTTP/1.0 browsers find the right subdirectory.
++.PP
++There's an optional alternate step three if you're using multiple-IP
++multihosting: run a separate thttpd process for each hostname, using
++the -h flag to specify which one is which.
++This gives you more flexibility, since you can run each of these processes
++in separate directories, with different throttle files, etc.
++Example:
++.nf
++  thttpd -r -d /usr/www -h www.acme.com
++  thttpd -r -d /usr/www/joe -u joe -h www.joe.acme.com
++  thttpd -r -d /usr/www/jane -u jane -h www.jane.acme.com
++.fi
++But remember, this multiple-process method does not work with CNAME
++multihosting - for that, you must use a single thttpd process with
++the -v flag.
++.SH "CUSTOM ERRORS"
++.PP
++thttpd lets you define your own custom error pages for the various
++HTTP errors.
++There's a separate file for each error number, all stored in one
++special directory.
++The directory name is "errors", at the top of the web directory tree.
++The error files should be named "errNNN.html", where NNN is the error number.
++So for example, to make a custom error page for the authentication failure
++error, which is number 401, you would put your HTML into the file
++"errors/err401.html".
++If no custom error file is found for a given error number, then the
++usual built-in error page is generated.
++.PP
++If you're using the virtual hosts option, you can also have different
++custom error pages for each different virtual host.
++In this case you put another "errors" directory in the top of that
++virtual host's web tree.
++thttpd will look first in the virtual host errors directory, and
++then in the server-wide errors directory, and if neither of those
++has an appropriate error file then it will generate the built-in error.
++.SH "NON-LOCAL REFERERS"
++.PP
++Sometimes another site on the net will embed your image files in their
++HTML files, which basically means they're stealing your bandwidth.
++You can prevent them from doing this by using non-local referer filtering.
++With this option, certain files can only be fetched via a local referer.
++The files have to be referenced by a local web page.
++If a web page on some other site references the files, that fetch will
++be blocked.
++There are three config-file variables for this feature:
++.TP
++.B urlpat
++A wildcard pattern for the URLs that should require a local referer.
++This is typically just image files, sound files, and so on.
++For example:
++.nf
++  urlpat=**.jpg|**.gif|**.au|**.wav
++.fi
++For most sites, that one setting is all you need to enable referer filtering.
++.TP
++.B noemptyreferers
++By default, requests with no referer at all, or a null referer, or a
++referer with no apparent hostname, are allowed.
++With this variable set, such requests are disallowed.
++.TP
++.B localpat
++A wildcard pattern that specifies the local host or hosts.
++This is used to determine if the host in the referer is local or not.
++If not specified it defaults to the actual local hostname.
++.SH SYMLINKS
++.PP
++thttpd is very picky about symbolic links.
++Before delivering any file, it first checks each element in the path
++to see if it's a symbolic link, and expands them all out to get the final
++actual filename.
++Along the way it checks for things like links with ".." that go above
++the server's directory, and absolute symlinks (ones that start with a /).
++These are prohibited as security holes, so the server returns an
++error page for them.
++This means you can't set up your web directory with a bunch of symlinks
++pointing to individual users' home web directories.
++Instead you do it the other way around - the user web directories are
++real subdirs of the main web directory, and in each user's home
++dir there's a symlink pointing to their actual web dir.
++.PP
++The CGI pattern is also affected - it gets matched against the fully-expanded
++filename.  So, if you have a single CGI directory but then put a symbolic
++link in it pointing somewhere else, that won't work.  The CGI program will be
++treated as a regular file and returned to the client, instead of getting run.
++This could be confusing.
++.SH PERMISSIONS
++.PP
++thttpd is also picky about file permissions.
++It wants data files (HTML, images) to be world readable.
++Readable by the group that the thttpd process runs as is not enough - thttpd
++checks explicitly for the world-readable bit.
++This is so that no one ever gets surprised by a file that's not set
++world-readable and yet somehow is readable by the HTTP server and
++therefore the *whole* world.
++.PP
++The same logic applies to directories.
++As with the standard Unix "ls" program, thttpd will only let you
++look at the contents of a directory if its read bit is on; but
++as with data files, this must be the world-read bit, not just the
++group-read bit.
++.PP
++thttpd also wants the execute bit to be *off* for data files.
++A file that is marked executable but doesn't match the CGI pattern
++might be a script or program that got accidentally left in the
++wrong directory.
++Allowing people to fetch the contents of the file might be a security breach,
++so this is prohibited.
++Of course if an executable file *does* match the CGI pattern, then it
++just gets run as a CGI.
++.PP
++In summary, data files should be mode 644 (rw-r--r--),
++directories should be 755 (rwxr-xr-x) if you want to allow indexing and
++711 (rwx--x--x) to disallow it, and CGI programs should be mode
++755 (rwxr-xr-x) or 711 (rwx--x--x).
++.SH LOGS
++.PP
++thttpd does all of its logging via syslog(3).
++The facility it uses is configurable.
++Aside from error messages, there are only a few log entry types of interest,
++all fairly similar to CERN Common Log Format:
++.nf
++  Aug  6 15:40:34 acme thttpd[583]: 165.113.207.103 - - "GET /file" 200 357
++  Aug  6 15:40:43 acme thttpd[583]: 165.113.207.103 - - "HEAD /file" 200 0
++  Aug  6 15:41:16 acme thttpd[583]: referer http://www.acme.com/ -> /dir
++  Aug  6 15:41:16 acme thttpd[583]: user-agent Mozilla/1.1N
++.fi
++The package includes a script for translating these log entries info
++CERN-compatible files.
++Note that thttpd does not translate numeric IP addresses into domain names.
++This is both to save time and as a minor security measure (the numeric
++address is harder to spoof).
++.PP
++Relevant config.h option: LOG_FACILITY.
++.PP
++If you'd rather log directly to a file, you can use the -l command-line
++flag.  But note that error messages still go to syslog.
++.SH SIGNALS
++.PP
++thttpd handles a couple of signals, which you can send via the
++standard Unix kill(1) command:
++.TP
++.B INT,TERM
++These signals tell thttpd to shut down immediately.
++Any requests in progress get aborted.
++.TP
++.B USR1
++This signal tells thttpd to shut down as soon as it's done servicing
++all current requests.
++In addition, the network socket it uses to accept new connections gets
++closed immediately, which means a fresh thttpd can be started up
++immediately.
++.TP
++.B USR2
++This signal tells thttpd to generate the statistics syslog messages
++immediately, instead of waiting for the regular hourly update.
++.TP
++.B HUP
++This signal tells thttpd to close and re-open its (non-syslog) log file,
++for instance if you rotated the logs and want it to start using the
++new one.
++This is a little tricky to set up correctly, for instance if you are using
++chroot() then the log file must be within the chroot tree, but it's
++definitely doable.
++.SH "SEE ALSO"
++redirect(8), ssi(8), makeweb(1), htpasswd(1), syslogtocern(8), weblog_parse(1), http_get(1)
++.SH THANKS
++.PP
++Many thanks to contributors, reviewers, testers:
++John LoVerso, Jordan Hayes, Chris Torek, Jim Thompson, Barton Schaffer,
++Geoff Adams, Dan Kegel, John Hascall, Bennett Todd, KIKUCHI Takahiro,
++Catalin Ionescu.
++Special thanks to Craig Leres for substantial debugging and development,
++and for not complaining about my coding style very much.
++.SH AUTHOR
++Copyright ? 1995,1998,1999,2000 by Jef Poskanzer <jef at mail.acme.com>.
++All rights reserved.
++.\" Redistribution and use in source and binary forms, with or without
++.\" modification, are permitted provided that the following conditions
++.\" are met:
++.\" 1. Redistributions of source code must retain the above copyright
++.\"    notice, this list of conditions and the following disclaimer.
++.\" 2. Redistributions in binary form must reproduce the above copyright
++.\"    notice, this list of conditions and the following disclaimer in the
++.\"    documentation and/or other materials provided with the distribution.
++.\"
++.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
++.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
++.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++.\" SUCH DAMAGE.


Index: thttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/thttpd/devel/thttpd.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- thttpd.spec	20 Feb 2008 04:42:11 -0000	1.16
+++ thttpd.spec	25 Sep 2008 08:49:23 -0000	1.17
@@ -3,7 +3,7 @@
 Summary: Tiny, turbo, throttleable lightweight http server
 Name: thttpd
 Version: 2.25b
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.acme.com/software/thttpd/
@@ -156,7 +156,10 @@
 
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.25b-16
+* Thu Sep 25 2008 Matthias Saou <http://freshrpms.net/> 2.25b-17
+- Update patches to remove fuzz.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
 - Autorebuild for GCC 4.3
 
 * Mon Oct 22 2007 Matthias Saou <http://freshrpms.net/> 2.25b-15



From tmraz at fedoraproject.org  Thu Sep 25 09:13:52 2008
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 25 Sep 2008 09:13:52 +0000 (UTC)
Subject: rpms/gnutls/devel gnutls.spec,1.35,1.36
Message-ID: <20080925091352.F28777013D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gnutls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12485

Modified Files:
	gnutls.spec 
Log Message:
* Thu Sep 25 2008 Tomas Mraz <tmraz at redhat.com> 2.4.2-2
- add guile subpackage (#463735)
- force new libtool through autoreconf to drop unnecessary rpaths



Index: gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/devel/gnutls.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnutls.spec	23 Sep 2008 18:56:47 -0000	1.35
+++ gnutls.spec	25 Sep 2008 09:13:22 -0000	1.36
@@ -1,13 +1,14 @@
 Summary: A TLS protocol implementation
 Name: gnutls
 Version: 2.4.2
-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
 BuildRequires: libgcrypt-devel >= 1.2.2, gettext
 BuildRequires: zlib-devel, readline-devel, libtasn1-devel
-BuildRequires: lzo-devel
+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
@@ -33,6 +34,12 @@
 Group: Applications/System
 Requires: %{name} = %{version}-%{release}
 
+%package guile
+Summary: Guile bindings for the GNUTLS library
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: guile
+
 %description
 GnuTLS is a project that aims to develop a library which provides a secure 
 layer, over a reliable transport layer. Currently the GnuTLS library implements
@@ -52,6 +59,12 @@
 This package contains command line TLS client and server and certificate
 manipulation tools.
 
+%description guile
+GnuTLS is a project that aims to develop a library which provides a secure
+layer, over a reliable transport layer. Currently the GnuTLS library implements
+the proposed standards by the IETF's TLS working group.
+This package contains Guile bindings for the library.
+
 %prep
 %setup -q
 %patch1 -p1 -b .nosrp
@@ -61,6 +74,7 @@
 done
 
 %build
+autoreconf
 %configure --with-libtasn1-prefix=%{_prefix} \
            --with-included-libcfg \
            --disable-srp-authentication
@@ -77,6 +91,7 @@
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*srp*
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libguile*.a
 %find_lang %{name}
 
 %check
@@ -99,17 +114,21 @@
    /sbin/install-info --delete %{_infodir}/gnutls.info.gz %{_infodir}/dir || :
 fi
 
+%post guile -p /sbin/ldconfig
+
+%postun guile -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_libdir}/*.so.*
+%{_libdir}/libgnutls*.so.*
 %doc COPYING COPYING.LIB README AUTHORS
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/libgnutls*-config
 %{_includedir}/*
-%{_libdir}/*.a
-%{_libdir}/*.so
+%{_libdir}/libgnutls*.a
+%{_libdir}/libgnutls*.so
 %{_datadir}/aclocal/*
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/*
@@ -122,7 +141,17 @@
 %{_bindir}/gnutls*
 %{_mandir}/man1/*
 
+%files guile
+%defattr(-,root,root,-)
+%{_libdir}/libguile*.so*
+%{_datadir}/guile/site/gnutls
+%{_datadir}/guile/site/gnutls.scm
+
 %changelog
+* Thu Sep 25 2008 Tomas Mraz <tmraz at redhat.com> 2.4.2-2
+- add guile subpackage (#463735)
+- force new libtool through autoreconf to drop unnecessary rpaths
+
 * Tue Sep 23 2008 Tomas Mraz <tmraz at redhat.com> 2.4.2-1
 - new upstream version
 



From pkgdb at fedoraproject.org  Thu Sep 25 09:16:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 09:16:34 +0000
Subject: [pkgdb] texinfo: pertusus has requested commit
Message-ID: <20080925091634.EB452208D9F@bastion.fedora.phx.redhat.com>

pertusus has requested the commit acl on texinfo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/texinfo



From pkgdb at fedoraproject.org  Thu Sep 25 09:16:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 09:16:43 +0000
Subject: [pkgdb] texinfo: pertusus has requested watchcommits
Message-ID: <20080925091643.49ACB208DA4@bastion.fedora.phx.redhat.com>

pertusus has requested the watchcommits acl on texinfo (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/texinfo



From pkgdb at fedoraproject.org  Thu Sep 25 09:16:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 09:16:48 +0000
Subject: [pkgdb] texinfo: pertusus has requested commit
Message-ID: <20080925091648.EC470208DA5@bastion.fedora.phx.redhat.com>

pertusus has requested the commit acl on texinfo (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/texinfo



From pkgdb at fedoraproject.org  Thu Sep 25 09:16:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 09:16:53 +0000
Subject: [pkgdb] texinfo: pertusus has requested commit
Message-ID: <20080925091654.02682208DA9@bastion.fedora.phx.redhat.com>

pertusus has requested the commit acl on texinfo (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/texinfo



From alexlan at fedoraproject.org  Thu Sep 25 09:17:36 2008
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Thu, 25 Sep 2008 09:17:36 +0000 (UTC)
Subject: rpms/perl-bioperl/devel bioperl-1.5.2_102-paths.patch, 1.1,
	1.2 perl-bioperl.spec, 1.13, 1.14
Message-ID: <20080925091736.682967010A@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-bioperl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13363

Modified Files:
	bioperl-1.5.2_102-paths.patch perl-bioperl.spec 
Log Message:
* Thu Sep 25 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.5.2_102-13
- Fix patch fuzz


bioperl-1.5.2_102-paths.patch:

Index: bioperl-1.5.2_102-paths.patch
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/devel/bioperl-1.5.2_102-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bioperl-1.5.2_102-paths.patch	5 Apr 2007 11:02:34 -0000	1.1
+++ bioperl-1.5.2_102-paths.patch	25 Sep 2008 09:17:06 -0000	1.2
@@ -1,6 +1,19 @@
-diff -u bioperl-1.5.2_102.orig/Build.PL bioperl-1.5.2_102/Build.PL
---- bioperl-1.5.2_102.orig/Build.PL        2007-03-14 03:46:30.000000000 -0700
-+++ bioperl-1.5.2_102/Build.PL    2007-03-14 03:46:40.000000000 -0700
+diff -u -r bioperl-1.5.2_102/Bio/Variation/IO.pm bioperl-1.5.2_102.mod/Bio/Variation/IO.pm
+--- bioperl-1.5.2_102/Bio/Variation/IO.pm	2007-02-14 04:37:48.000000000 -0700
++++ bioperl-1.5.2_102.mod/Bio/Variation/IO.pm	2008-09-25 02:03:26.000000000 -0700
+@@ -86,7 +86,7 @@
+ 
+ This makes the simplest ever reformatter
+ 
+-    #!/usr/local/bin/perl
++    #!/usr/bin/perl
+ 
+     $format1 = shift;
+     $format2 = shift;
+Only in bioperl-1.5.2_102.mod/Bio/Variation: IO.pm.orig
+diff -u -r bioperl-1.5.2_102/Build.PL bioperl-1.5.2_102.mod/Build.PL
+--- bioperl-1.5.2_102/Build.PL	2007-02-14 04:37:47.000000000 -0700
++++ bioperl-1.5.2_102.mod/Build.PL	2008-09-25 02:03:26.000000000 -0700
 @@ -31,8 +31,8 @@
      build_requires      => {
                              'Test::More'                => 0,
@@ -21,21 +34,9 @@
                              'XML::SAX::Writer'          => '0/writing xml/Bio::SeqIO::tigrxml',
                              'XML::Twig'                 => '0/parsing xml/Bio::Variation::IO::xml,Bio::DB::Taxonomy::entrez,Bio::DB::Biblio::eutils,Bio::Graph::IO::psi_xml',
                              'XML::Writer'               => '0.4/parsing and writing xml/Bio::SeqIO::agave,Bio::SeqIO::game::gameWriter,Bio::SeqIO::chadoxml,Bio::SeqIO::tinyseq,Bio::Variation::IO::xml,Bio::SearchIO::Writer::BSMLResultWriter'
-diff -ru bioperl-1.5.2_102.orig/Bio/Variation/IO.pm bioperl-1.5.2_102/Bio/Variation/IO.pm
---- bioperl-1.5.2_102.orig/Bio/Variation/IO.pm	2003-06-04 04:36:44.000000000 -0400
-+++ bioperl-1.5.2_102/Bio/Variation/IO.pm	2005-03-21 20:21:54.000000000 -0500
-@@ -83,7 +83,7 @@
- 
- This makes the simplest ever reformatter
- 
--    #!/usr/local/bin/perl
-+    #!/usr/bin/perl
- 
-     $format1 = shift;
-     $format2 = shift || die "Usage: reformat format1 format2 < input > output";
-diff -ru bioperl-1.5.2_102.orig/examples/align/align_on_codons.pl bioperl-1.5.2_102/examples/align/align_on_codons.pl
---- bioperl-1.5.2_102.orig/examples/align/align_on_codons.pl	2003-07-07 14:20:58.000000000 -0400
-+++ bioperl-1.5.2_102/examples/align/align_on_codons.pl	2005-03-21 20:24:44.000000000 -0500
+diff -u -r bioperl-1.5.2_102/examples/align/align_on_codons.pl bioperl-1.5.2_102.mod/examples/align/align_on_codons.pl
+--- bioperl-1.5.2_102/examples/align/align_on_codons.pl	2007-02-14 04:37:47.000000000 -0700
++++ bioperl-1.5.2_102.mod/examples/align/align_on_codons.pl	2008-09-25 02:03:26.000000000 -0700
 @@ -13,10 +13,10 @@
  BEGIN {
      $CODONSIZE = 3; # parametrize everything like a good little programmer
@@ -49,99 +50,99 @@
      }
      $USAGE = 
  qq{align_on_codons.pl < file.fa
-diff -ru bioperl-1.5.2_102.orig/examples/db/dbfetch bioperl-1.5.2_102/examples/db/dbfetch
---- bioperl-1.5.2_102.orig/examples/db/dbfetch	2003-07-15 12:12:16.000000000 -0400
-+++ bioperl-1.5.2_102/examples/db/dbfetch	2005-03-21 20:25:01.000000000 -0500
+diff -u -r bioperl-1.5.2_102/examples/db/dbfetch bioperl-1.5.2_102.mod/examples/db/dbfetch
+--- bioperl-1.5.2_102/examples/db/dbfetch	2007-02-14 04:37:48.000000000 -0700
++++ bioperl-1.5.2_102.mod/examples/db/dbfetch	2008-09-25 02:03:26.000000000 -0700
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl -- # -*-Perl-*-
 +#!/usr/bin/perl -- # -*-Perl-*-
  
  =head1 NAME
  
-diff -ru bioperl-1.5.2_102.orig/examples/db/getGenBank.pl bioperl-1.5.2_102/examples/db/getGenBank.pl
---- bioperl-1.5.2_102.orig/examples/db/getGenBank.pl	2003-07-07 14:20:59.000000000 -0400
-+++ bioperl-1.5.2_102/examples/db/getGenBank.pl	2005-03-21 20:24:57.000000000 -0500
+diff -u -r bioperl-1.5.2_102/examples/db/getGenBank.pl bioperl-1.5.2_102.mod/examples/db/getGenBank.pl
+--- bioperl-1.5.2_102/examples/db/getGenBank.pl	2007-02-14 04:37:47.000000000 -0700
++++ bioperl-1.5.2_102.mod/examples/db/getGenBank.pl	2008-09-25 02:03:26.000000000 -0700
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl -w
 +#!/usr/bin/perl -w
  #
  # How to retrieve GenBank entries over the Web
  #
-diff -ru bioperl-1.5.2_102.orig/examples/db/get_seqs.pl bioperl-1.5.2_102/examples/db/get_seqs.pl
---- bioperl-1.5.2_102.orig/examples/db/get_seqs.pl	2003-07-07 14:20:59.000000000 -0400
-+++ bioperl-1.5.2_102/examples/db/get_seqs.pl	2005-03-21 20:24:53.000000000 -0500
+diff -u -r bioperl-1.5.2_102/examples/db/get_seqs.pl bioperl-1.5.2_102.mod/examples/db/get_seqs.pl
+--- bioperl-1.5.2_102/examples/db/get_seqs.pl	2007-02-14 04:37:48.000000000 -0700
++++ bioperl-1.5.2_102.mod/examples/db/get_seqs.pl	2008-09-25 02:03:26.000000000 -0700
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl -w
 +#!/usr/bin/perl -w
  use strict;
  use vars qw($USAGE);
  use Carp;
-diff -ru bioperl-1.5.2_102.orig/examples/generate_random_seq.pl bioperl-1.5.2_102/examples/generate_random_seq.pl
---- bioperl-1.5.2_102.orig/examples/generate_random_seq.pl	2004-11-01 16:09:08.000000000 -0500
-+++ bioperl-1.5.2_102/examples/generate_random_seq.pl	2005-03-21 20:27:23.000000000 -0500
+diff -u -r bioperl-1.5.2_102/examples/generate_random_seq.pl bioperl-1.5.2_102.mod/examples/generate_random_seq.pl
+--- bioperl-1.5.2_102/examples/generate_random_seq.pl	2007-02-14 04:37:47.000000000 -0700
++++ bioperl-1.5.2_102.mod/examples/generate_random_seq.pl	2008-09-25 02:03:26.000000000 -0700
 @@ -1,4 +1,4 @@
 -#!/bin/perl -w
 +#!/usr/bin/perl -w
  use strict;
  use vars qw($USAGE);
  
-diff -ru bioperl-1.5.2_102.orig/examples/searchio/psiblast_features.pl bioperl-1.5.2_102/examples/searchio/psiblast_features.pl
---- bioperl-1.5.2_102.orig/examples/searchio/psiblast_features.pl	2004-02-21 05:50:34.000000000 -0500
-+++ bioperl-1.5.2_102/examples/searchio/psiblast_features.pl	2005-03-21 20:24:30.000000000 -0500
+diff -u -r bioperl-1.5.2_102/examples/searchio/psiblast_features.pl bioperl-1.5.2_102.mod/examples/searchio/psiblast_features.pl
+--- bioperl-1.5.2_102/examples/searchio/psiblast_features.pl	2007-02-14 04:37:48.000000000 -0700
++++ bioperl-1.5.2_102.mod/examples/searchio/psiblast_features.pl	2008-09-25 02:03:26.000000000 -0700
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl 
 +#!/usr/bin/perl 
  
  # Example usage of a SearchIO::psiblast parser of traditional format Blast 
  # and PSI-Blast reports.
-diff -ru bioperl-1.5.2_102.orig/examples/structure/structure-io.pl bioperl-1.5.2_102/examples/structure/structure-io.pl
---- bioperl-1.5.2_102.orig/examples/structure/structure-io.pl	2004-11-01 16:09:33.000000000 -0500
-+++ bioperl-1.5.2_102/examples/structure/structure-io.pl	2005-03-21 20:27:17.000000000 -0500
+diff -u -r bioperl-1.5.2_102/examples/structure/structure-io.pl bioperl-1.5.2_102.mod/examples/structure/structure-io.pl
+--- bioperl-1.5.2_102/examples/structure/structure-io.pl	2007-02-14 04:37:48.000000000 -0700
++++ bioperl-1.5.2_102.mod/examples/structure/structure-io.pl	2008-09-25 02:03:26.000000000 -0700
 @@ -1,4 +1,4 @@
 -#!/bin/perl -w
 +#!/usr/bin/perl -w
  # Getting  Entry, Chain, Residue, and Atom objects given a PDB file
  
  use Bio::Structure::IO;
-diff -ru bioperl-1.5.2_102.orig/examples/tk/hitdisplay.pl bioperl-1.5.2_102/examples/tk/hitdisplay.pl
---- bioperl-1.5.2_102.orig/examples/tk/hitdisplay.pl	2003-07-07 14:20:59.000000000 -0400
-+++ bioperl-1.5.2_102/examples/tk/hitdisplay.pl	2005-03-21 20:24:26.000000000 -0500
+diff -u -r bioperl-1.5.2_102/examples/tk/hitdisplay.pl bioperl-1.5.2_102.mod/examples/tk/hitdisplay.pl
+--- bioperl-1.5.2_102/examples/tk/hitdisplay.pl	2007-02-14 04:37:47.000000000 -0700
++++ bioperl-1.5.2_102.mod/examples/tk/hitdisplay.pl	2008-09-25 02:03:26.000000000 -0700
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl -w
 +#!/usr/bin/perl -w
  #
  # PROGRAM  : hitdisplay.pl
  # PURPOSE  : Demonstrate Bio::Tk::HitDisplay
-diff -ru bioperl-1.5.2_102.orig/examples/tools/gb_to_gff.pl bioperl-1.5.2_102/examples/tools/gb_to_gff.pl
---- bioperl-1.5.2_102.orig/examples/tools/gb_to_gff.pl	2003-07-07 14:20:59.000000000 -0400
-+++ bioperl-1.5.2_102/examples/tools/gb_to_gff.pl	2005-03-21 20:24:21.000000000 -0500
+diff -u -r bioperl-1.5.2_102/examples/tools/gb_to_gff.pl bioperl-1.5.2_102.mod/examples/tools/gb_to_gff.pl
+--- bioperl-1.5.2_102/examples/tools/gb_to_gff.pl	2007-02-14 04:37:47.000000000 -0700
++++ bioperl-1.5.2_102.mod/examples/tools/gb_to_gff.pl	2008-09-25 02:03:26.000000000 -0700
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl -w
 +#!/usr/bin/perl -w
  use strict;
  
  use Bio::Tools::GFF;
-diff -ru bioperl-1.5.2_102.orig/examples/tools/gff2ps.pl bioperl-1.5.2_102/examples/tools/gff2ps.pl
---- bioperl-1.5.2_102.orig/examples/tools/gff2ps.pl	2003-07-07 14:20:59.000000000 -0400
-+++ bioperl-1.5.2_102/examples/tools/gff2ps.pl	2005-03-21 20:24:17.000000000 -0500
+diff -u -r bioperl-1.5.2_102/examples/tools/gff2ps.pl bioperl-1.5.2_102.mod/examples/tools/gff2ps.pl
+--- bioperl-1.5.2_102/examples/tools/gff2ps.pl	2007-02-14 04:37:47.000000000 -0700
++++ bioperl-1.5.2_102.mod/examples/tools/gff2ps.pl	2008-09-25 02:03:26.000000000 -0700
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  
  =head1 NAME
-diff -ru bioperl-1.5.2_102.orig/t/Promoterwise.t bioperl-1.5.2_102/t/Promoterwise.t
---- bioperl-1.5.2_102.orig/t/Promoterwise.t	2003-03-10 13:21:03.000000000 -0500
-+++ bioperl-1.5.2_102/t/Promoterwise.t	2005-03-21 20:24:04.000000000 -0500
+diff -u -r bioperl-1.5.2_102/t/Promoterwise.t bioperl-1.5.2_102.mod/t/Promoterwise.t
+--- bioperl-1.5.2_102/t/Promoterwise.t	2007-02-14 04:37:47.000000000 -0700
++++ bioperl-1.5.2_102.mod/t/Promoterwise.t	2008-09-25 02:03:26.000000000 -0700
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  # -*-Perl-*-
  ## Bioperl Test Harness Script for Modules
  
-diff -ru bioperl-1.5.2_102.orig/t/testformats.pl bioperl-1.5.2_102/t/testformats.pl
---- bioperl-1.5.2_102.orig/t/testformats.pl	2001-06-29 17:17:02.000000000 -0400
-+++ bioperl-1.5.2_102/t/testformats.pl	2005-03-21 20:24:00.000000000 -0500
+diff -u -r bioperl-1.5.2_102/t/testformats.pl bioperl-1.5.2_102.mod/t/testformats.pl
+--- bioperl-1.5.2_102/t/testformats.pl	2007-02-14 04:37:47.000000000 -0700
++++ bioperl-1.5.2_102.mod/t/testformats.pl	2008-09-25 02:03:26.000000000 -0700
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl -w
 +#!/usr/bin/perl -w


Index: perl-bioperl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/devel/perl-bioperl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-bioperl.spec	5 Mar 2008 12:32:54 -0000	1.13
+++ perl-bioperl.spec	25 Sep 2008 09:17:06 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-bioperl
 Version:        1.5.2_102
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Perl tools for computational molecular biology
 
 Group:          Development/Libraries
@@ -117,6 +117,9 @@
 %{_mandir}/man3/*.3*    
 
 %changelog
+* Thu Sep 25 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.5.2_102-13
+- Fix patch fuzz
+
 * Wed Mar  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.5.2_102-12
 - bootstrapping done, building normally
 



From fabbione at fedoraproject.org  Thu Sep 25 09:24:07 2008
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Thu, 25 Sep 2008 09:24:07 +0000 (UTC)
Subject: rpms/cluster/devel cluster.spec, 1.17,
	1.18 0001-Changes-needed-to-stay-compatible-with-libvolume_id.patch, 
	1.1, NONE 0002-Changes-needed-to-stay-current-with-libvolume_id.patch,
	1.1, NONE
Message-ID: <20080925092407.2DBE17010A@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14818

Modified Files:
	cluster.spec 
Removed Files:
	0001-Changes-needed-to-stay-compatible-with-libvolume_id.patch 
	0002-Changes-needed-to-stay-current-with-libvolume_id.patch 
Log Message:
New upstream release



Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cluster.spec	19 Sep 2008 09:59:30 -0000	1.17
+++ cluster.spec	25 Sep 2008 09:23:36 -0000	1.18
@@ -18,21 +18,19 @@
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 2.99.08
-Release: 3%{?alphatag:.%{alphatag}}%{?dist}
+Version: 2.99.10
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
 Source0: ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz
-Patch1: 0001-Changes-needed-to-stay-compatible-with-libvolume_id.patch
-Patch2: 0002-Changes-needed-to-stay-current-with-libvolume_id.patch
 
 ## Setup/build bits
 
-# build support for xen
-%define buildxen 0
+# build support for virtualization
+%define buildvirt 0
 %ifarch i386 x86_64 ia64
-%define buildxen 1
+%define buildvirt 1
 %endif
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,16 +39,15 @@
 BuildRequires: perl python
 BuildRequires: glibc-kernheaders glibc-devel
 BuildRequires: libxml2-devel ncurses-devel slang-devel libvolume_id-devel
-BuildRequires: openais-devel >= 0.84-2 openais < 0.85 openldap-devel
-BuildRequires: perl(ExtUtils::MakeMaker)
-%if %{buildxen}
+BuildRequires: corosync-devel >= 0.92 corosync-devel < 0.93
+BuildRequires: openais-devel >= 0.91 openais < 0.92
+BuildRequires: openldap-devel perl(ExtUtils::MakeMaker)
+%if %{buildvirt}
 BuildRequires: nss-devel nspr-devel libvirt-devel xen-libs
 %endif
 
 %prep
 %setup -q -n cluster-%{version}
-%patch1 -p1
-%patch2 -p1
 
 %build
 # for legacy reasons, all binaries have always been installed in /sbin
@@ -58,9 +55,10 @@
   --sbindir=/sbin \
   --initddir=%{_sysconfdir}/rc.d/init.d \
   --libdir=%{_libdir} \
-%if %{buildxen}
-  --enable_xen \
+%if %{buildvirt}
+  --enable_virt \
 %endif
+  --corosynclibdir=%{_libdir}/corosync \
   --openaislibdir=%{_libdir}/openais \
   --without_kernel_modules \
   --disable_kernel_check
@@ -88,8 +86,6 @@
 # fix libfence permissions
 chmod 0755 $RPM_BUILD_ROOT%{_datadir}/fence/*.py
 chmod 0755 $RPM_BUILD_ROOT%{_datadir}/fence/telnet_ssl
-# do not ship fence_vmware for now
-find $RPM_BUILD_ROOT -name "fence_vmware" -exec rm {} \;
 # remove docs
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/cluster
 # cleanup perl bindings bits
@@ -115,7 +111,8 @@
 Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
-Requires: openais >= 0.84-2 openais < 0.85 sg3_utils
+Requires: corosync >= 0.92 corosync < 0.93
+Requires: openais >= 0.91 openais < 0.92
 Requires: sg3_utils OpenIPMI telnet openssh-clients
 Requires: pexpect net-snmp-utils pyOpenSSL
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -304,6 +301,11 @@
 %{_mandir}/man8/gnbd*
 
 %changelog
+* Thu Sep 25 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.10-1
+- New upstream release.
+- Build against new corosync and openais.
+- specfile cleanup: rename buildxen to buildvirt.
+
 * Wed Sep 03 2008 Jesse Keating <jkeating at redhat.com> - 2.99.08-3
 - Rebuild for broken deps.
 - Pull in upstream patches for libvolume_id changes


--- 0001-Changes-needed-to-stay-compatible-with-libvolume_id.patch DELETED ---


--- 0002-Changes-needed-to-stay-current-with-libvolume_id.patch DELETED ---



From fabbione at fedoraproject.org  Thu Sep 25 09:28:18 2008
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Thu, 25 Sep 2008 09:28:18 +0000 (UTC)
Subject: rpms/cluster/devel cluster.spec,1.18,1.19
Message-ID: <20080925092818.8463F7010A@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15618

Modified Files:
	cluster.spec 
Log Message:
Something went wrong with previous tagging..



Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cluster.spec	25 Sep 2008 09:23:36 -0000	1.18
+++ cluster.spec	25 Sep 2008 09:27:48 -0000	1.19
@@ -19,7 +19,7 @@
 Name: cluster
 Summary: Red Hat Cluster
 Version: 2.99.10
-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/
@@ -301,6 +301,12 @@
 %{_mandir}/man8/gnbd*
 
 %changelog
+* Thu Sep 25 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.10-2
+- Retag release.
+- New upstream release.
+- Build against new corosync and openais.
+- specfile cleanup: rename buildxen to buildvirt.
+
 * Thu Sep 25 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.10-1
 - New upstream release.
 - Build against new corosync and openais.



From fabbione at fedoraproject.org  Thu Sep 25 09:31:17 2008
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Thu, 25 Sep 2008 09:31:17 +0000 (UTC)
Subject: rpms/ricci/devel ricci.spec,1.5,1.6
Message-ID: <20080925093118.058227010A@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/ricci/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16365

Modified Files:
	ricci.spec 
Log Message:
No change rebuild on newer cman



Index: ricci.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/devel/ricci.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ricci.spec	9 Sep 2008 19:55:52 -0000	1.5
+++ ricci.spec	25 Sep 2008 09:30:47 -0000	1.6
@@ -10,7 +10,7 @@
 
 Name: ricci
 Version: 0.15.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga/
 Group: System Environment/Base
@@ -21,7 +21,7 @@
 
 BuildRequires: python-devel >= 2.4.1
 BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
-BuildRequires: cman-devel libcap-devel
+BuildRequires: cman-devel >= 2.99.10 libcap-devel
 BuildRequires: cyrus-sasl-devel >= 2.1
 BuildRequires: openssl-devel dbus-devel pkgconfig file-devel
 BuildRequires: nss-devel
@@ -135,6 +135,9 @@
 exit 0
 
 %changelog
+* Thu Sep 09 2008 Fabio M. Di Nitto <fdinitto at redhat.com> 0.15.0-3
+- Add versioned BR on cman-devel
+
 * Tue Sep 09 2008 Ryan McCabe <rmccabe at redhat.com> 0.15.0-2
  - Add nss-devel to BuildDepends
 



From fabbione at fedoraproject.org  Thu Sep 25 09:42:49 2008
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Thu, 25 Sep 2008 09:42:49 +0000 (UTC)
Subject: rpms/cluster/devel .cvsignore, 1.10, 1.11 cluster.spec, 1.19,
	1.20 sources, 1.10, 1.11
Message-ID: <20080925094249.A8E337010A@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18449

Modified Files:
	.cvsignore cluster.spec sources 
Log Message:
Import AGAIN new upstream tarball and bump version for new tag/release...



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Sep 2008 15:57:27 -0000	1.10
+++ .cvsignore	25 Sep 2008 09:42:19 -0000	1.11
@@ -1 +1 @@
-cluster-2.99.08.tar.gz
+cluster-2.99.10.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- cluster.spec	25 Sep 2008 09:27:48 -0000	1.19
+++ cluster.spec	25 Sep 2008 09:42:19 -0000	1.20
@@ -19,7 +19,7 @@
 Name: cluster
 Summary: Red Hat Cluster
 Version: 2.99.10
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Release: 3%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -301,6 +301,12 @@
 %{_mandir}/man8/gnbd*
 
 %changelog
+* Thu Sep 25 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.10-3
+- The "CVS HATES ME" release.
+- New upstream release.
+- Build against new corosync and openais.
+- specfile cleanup: rename buildxen to buildvirt.
+
 * Thu Sep 25 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.10-2
 - Retag release.
 - New upstream release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Sep 2008 15:57:27 -0000	1.10
+++ sources	25 Sep 2008 09:42:19 -0000	1.11
@@ -1 +1 @@
-fda11d6fd53c169016166a1df0a8d847  cluster-2.99.08.tar.gz
+0dcfd170acf90afcdd56fb9f183afccf  cluster-2.99.10.tar.gz



From pkgdb at fedoraproject.org  Thu Sep 25 10:10:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 10:10:17 +0000
Subject: [pkgdb] texinfo had acl change status
Message-ID: <20080925101017.B162F208DA0@bastion.fedora.phx.redhat.com>

vcrhonek has set the approveacls acl on texinfo (Fedora devel) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/texinfo



From pkgdb at fedoraproject.org  Thu Sep 25 10:10:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 10:10:30 +0000
Subject: [pkgdb] texinfo had acl change status
Message-ID: <20080925101031.03DF0208DA4@bastion.fedora.phx.redhat.com>

vcrhonek has set the approveacls acl on texinfo (Fedora 8) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/texinfo



From pkgdb at fedoraproject.org  Thu Sep 25 10:10:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 10:10:38 +0000
Subject: [pkgdb] texinfo had acl change status
Message-ID: <20080925101038.91D00208DA7@bastion.fedora.phx.redhat.com>

vcrhonek has set the approveacls acl on texinfo (Fedora 9) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/texinfo



From fabbione at fedoraproject.org  Thu Sep 25 10:14:04 2008
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Thu, 25 Sep 2008 10:14:04 +0000 (UTC)
Subject: rpms/clustermon/devel clustermon.spec,1.3,1.4
Message-ID: <20080925101404.11F7A7010A@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/clustermon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24361

Modified Files:
	clustermon.spec 
Log Message:
Rebuild against new cman



Index: clustermon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clustermon/devel/clustermon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- clustermon.spec	9 Sep 2008 19:37:15 -0000	1.3
+++ clustermon.spec	25 Sep 2008 10:13:33 -0000	1.4
@@ -17,7 +17,7 @@
 
 Name: clustermon
 Version: 0.15.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga
 
@@ -27,7 +27,7 @@
 Source0: %{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: cman-devel
+BuildRequires: cman-devel >= 2.99.10
 BuildRequires: glibc-devel gcc-c++ libxml2-devel
 BuildRequires: openssl-devel dbus-devel pam-devel pkgconfig
 BuildRequires: net-snmp-devel tog-pegasus-devel
@@ -182,6 +182,9 @@
 
 
 %changelog
+* Thu Sep 25 2008 Fabio M. Di Nitto <fdinitto at redhat.com> 0.15.0-2
+ - Add versioned BR on cman-devel
+
 * Tue Sep 09 2008 Ryan McCabe <rmccabe at redhat.com> 0.15.0-1
  - Restore missing XVM.cpp file for modcluster
 



From jreznik at fedoraproject.org  Thu Sep 25 10:33:13 2008
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Thu, 25 Sep 2008 10:33:13 +0000 (UTC)
Subject: rpms/arora/devel arora-0.3-double-click-selects-all.patch, NONE,
	1.1 arora.spec, 1.1, 1.2
Message-ID: <20080925103313.57BA47010A@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/arora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28427

Modified Files:
	arora.spec 
Added Files:
	arora-0.3-double-click-selects-all.patch 
Log Message:
* Thu Sep 25 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-2
- Location bar's double click selects all



arora-0.3-double-click-selects-all.patch:

--- NEW FILE arora-0.3-double-click-selects-all.patch ---
diff -up arora-0.3/src/locationbar.cpp.double-click-selects-all arora-0.3/src/locationbar.cpp
--- arora-0.3/src/locationbar.cpp.double-click-selects-all	2008-08-04 22:21:54.000000000 +0200
+++ arora-0.3/src/locationbar.cpp	2008-09-25 10:43:30.000000000 +0200
@@ -186,3 +186,15 @@ void LocationBar::focusOutEvent(QFocusEv
         webViewUrlChanged(m_webView->url());
     QLineEdit::focusOutEvent(event);
 }
+
+void LocationBar::mouseDoubleClickEvent(QMouseEvent *event)
+{
+    if(event->button() == Qt::LeftButton)
+    {
+        selectAll();
+    }
+    else
+    {
+        QLineEdit::mouseDoubleClickEvent(event);
+    }
+}
diff -up arora-0.3/src/locationbar.h.double-click-selects-all arora-0.3/src/locationbar.h
--- arora-0.3/src/locationbar.h.double-click-selects-all	2008-08-04 22:21:54.000000000 +0200
+++ arora-0.3/src/locationbar.h	2008-09-25 10:41:04.000000000 +0200
@@ -38,7 +38,7 @@ public:
 protected:
     void paintEvent(QPaintEvent *event);
     void focusOutEvent(QFocusEvent *event);
-
+    void mouseDoubleClickEvent(QMouseEvent *event);
 private slots:
     void webViewUrlChanged(const QUrl &url);
 


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/arora.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- arora.spec	17 Sep 2008 07:04:30 -0000	1.1
+++ arora.spec	25 Sep 2008 10:32:43 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           arora
 Version:        0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A cross platform web browser
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://code.google.com/p/arora/
 Source0:        http://arora.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0:		arora-0.3-double-click-selects-all.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .double-click-selects-all
 
 %build
 qmake-qt4 PREFIX=%{_prefix}
@@ -58,5 +60,7 @@
 %{_datadir}/man/man1/arora.1.gz
 
 %changelog
+* Thu Sep 25 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-2
+- Location bar's double click selects all
 * Wed Aug 13 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-1  
 - Initial spec file 
\ No newline at end of file



From jreznik at fedoraproject.org  Thu Sep 25 10:40:52 2008
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Thu, 25 Sep 2008 10:40:52 +0000 (UTC)
Subject: rpms/arora/F-9 arora-0.3-double-click-selects-all.patch, NONE,
	1.1 arora.spec, 1.1, 1.2
Message-ID: <20080925104052.58A057010A@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/arora/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29813

Modified Files:
	arora.spec 
Added Files:
	arora-0.3-double-click-selects-all.patch 
Log Message:
* Thu Sep 25 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-2
- Location bar's double click selects all



arora-0.3-double-click-selects-all.patch:

--- NEW FILE arora-0.3-double-click-selects-all.patch ---
diff -up arora-0.3/src/locationbar.cpp.double-click-selects-all arora-0.3/src/locationbar.cpp
--- arora-0.3/src/locationbar.cpp.double-click-selects-all	2008-08-04 22:21:54.000000000 +0200
+++ arora-0.3/src/locationbar.cpp	2008-09-25 10:43:30.000000000 +0200
@@ -186,3 +186,15 @@ void LocationBar::focusOutEvent(QFocusEv
         webViewUrlChanged(m_webView->url());
     QLineEdit::focusOutEvent(event);
 }
+
+void LocationBar::mouseDoubleClickEvent(QMouseEvent *event)
+{
+    if(event->button() == Qt::LeftButton)
+    {
+        selectAll();
+    }
+    else
+    {
+        QLineEdit::mouseDoubleClickEvent(event);
+    }
+}
diff -up arora-0.3/src/locationbar.h.double-click-selects-all arora-0.3/src/locationbar.h
--- arora-0.3/src/locationbar.h.double-click-selects-all	2008-08-04 22:21:54.000000000 +0200
+++ arora-0.3/src/locationbar.h	2008-09-25 10:41:04.000000000 +0200
@@ -38,7 +38,7 @@ public:
 protected:
     void paintEvent(QPaintEvent *event);
     void focusOutEvent(QFocusEvent *event);
-
+    void mouseDoubleClickEvent(QMouseEvent *event);
 private slots:
     void webViewUrlChanged(const QUrl &url);
 


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-9/arora.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- arora.spec	17 Sep 2008 07:21:56 -0000	1.1
+++ arora.spec	25 Sep 2008 10:40:22 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           arora
 Version:        0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A cross platform web browser
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://code.google.com/p/arora/
 Source0:        http://arora.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0:		arora-0.3-double-click-selects-all.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .double-click-selects-all
 
 %build
 qmake-qt4 PREFIX=%{_prefix}
@@ -58,5 +60,7 @@
 %{_datadir}/man/man1/arora.1.gz
 
 %changelog
+* Thu Sep 25 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-2
+- Location bar's double click selects all
 * Wed Aug 13 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-1  
 - Initial spec file 
\ No newline at end of file



From vcrhonek at fedoraproject.org  Thu Sep 25 10:45:40 2008
From: vcrhonek at fedoraproject.org (Vitezslav Crhonek)
Date: Thu, 25 Sep 2008 10:45:40 +0000 (UTC)
Subject: rpms/expect/devel expect-5.32.2-random.patch, 1.1,
	1.2 expect-5.38.0-lib-spec.patch, 1.2,
	1.3 expect-5.38.0-spawn-43310.patch, 1.1,
	1.2 expect-5.39.0-libdir.patch, 1.1,
	1.2 expect-5.43.0-h-comments.patch, 1.1,
	1.2 expect-5.43.0-log_file.patch, 1.1,
	1.2 expect-5.43.0-pkgIndex-x.patch, 1.1,
	1.2 expect-5.43.0-pkgpath.patch, 1.1,
	1.2 expect-5.43.0-tcl8.5.patch, 1.2, 1.3 expect.spec, 1.25,
	1.26 unbuffer-child-flush-143963.patch, 1.1, 1.2
Message-ID: <20080925104540.2148B7010A@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/expect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30706

Modified Files:
	expect-5.32.2-random.patch expect-5.38.0-lib-spec.patch 
	expect-5.38.0-spawn-43310.patch expect-5.39.0-libdir.patch 
	expect-5.43.0-h-comments.patch expect-5.43.0-log_file.patch 
	expect-5.43.0-pkgIndex-x.patch expect-5.43.0-pkgpath.patch 
	expect-5.43.0-tcl8.5.patch expect.spec 
	unbuffer-child-flush-143963.patch 
Log Message:
Rediff all patches to work with patch --fuzz=0

expect-5.32.2-random.patch:

Index: expect-5.32.2-random.patch
===================================================================
RCS file: /cvs/extras/rpms/expect/devel/expect-5.32.2-random.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- expect-5.32.2-random.patch	9 Sep 2004 04:37:26 -0000	1.1
+++ expect-5.32.2-random.patch	25 Sep 2008 10:45:08 -0000	1.2
@@ -1,6 +1,7 @@
---- expect5.32/example/mkpasswd.random	Mon Jul 23 10:42:04 2001
-+++ expect5.32/example/mkpasswd	Mon Jul 23 11:50:56 2001
-@@ -92,7 +92,14 @@
+diff -up expect-5.43/example/mkpasswd.random expect-5.43/example/mkpasswd
+--- expect-5.43/example/mkpasswd.random	2004-12-07 00:38:21.000000000 +0100
++++ expect-5.43/example/mkpasswd	2008-09-25 12:27:19.000000000 +0200
+@@ -92,7 +92,14 @@ proc insert {pvar char} {
  }
  
  proc rand {m} {

expect-5.38.0-lib-spec.patch:

Index: expect-5.38.0-lib-spec.patch
===================================================================
RCS file: /cvs/extras/rpms/expect/devel/expect-5.38.0-lib-spec.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- expect-5.38.0-lib-spec.patch	17 Jan 2008 12:14:14 -0000	1.2
+++ expect-5.38.0-lib-spec.patch	25 Sep 2008 10:45:09 -0000	1.3
@@ -1,6 +1,7 @@
---- expect-5.38/configure.in.orig	2002-07-19 00:51:06.000000000 +0900
-+++ expect-5.38/configure.in	2002-12-05 18:28:05.000000000 +0900
-@@ -1132,7 +1132,7 @@
+diff -up expect-5.43/configure.in.lib-spec expect-5.43/configure.in
+--- expect-5.43/configure.in.lib-spec	2005-02-08 02:45:06.000000000 +0100
++++ expect-5.43/configure.in	2008-09-25 12:23:26.000000000 +0200
+@@ -1141,7 +1141,7 @@ if test $ac_cv_sys_long_file_names = no;
  fi
  
  EXP_BUILD_LIB_SPEC="-L`pwd` -lexpect${EXP_LIB_VERSION}${DBGX}"

expect-5.38.0-spawn-43310.patch:

Index: expect-5.38.0-spawn-43310.patch
===================================================================
RCS file: /cvs/extras/rpms/expect/devel/expect-5.38.0-spawn-43310.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- expect-5.38.0-spawn-43310.patch	9 Sep 2004 04:37:26 -0000	1.1
+++ expect-5.38.0-spawn-43310.patch	25 Sep 2008 10:45:09 -0000	1.2
@@ -1,6 +1,7 @@
---- tcltk-8.3.1/expect5.31/exp_chan.c.read	Fri Nov 16 00:14:15 2001
-+++ tcltk-8.3.1/expect5.31/exp_chan.c	Fri Nov 16 00:14:15 2001
-@@ -519,6 +519,7 @@ expCreateChannel(interp,fdin,fdout,pid)
+diff -up expect-5.43/exp_chan.c.spawn expect-5.43/exp_chan.c
+--- expect-5.43/exp_chan.c.spawn	2005-02-08 03:01:20.000000000 +0100
++++ expect-5.43/exp_chan.c	2008-09-25 12:22:14.000000000 +0200
+@@ -622,6 +622,7 @@ expCreateChannel(interp,fdin,fdout,pid)
      esPtr->buffer = Tcl_NewStringObj("",0);
      Tcl_IncrRefCount(esPtr->buffer);
      esPtr->umsize = exp_default_match_max;
@@ -8,17 +9,18 @@
      /* this will reallocate object with an appropriate sized buffer */
      expAdjust(esPtr);
  
---- tcltk-8.3.1/expect5.31/exp_command.h.read	Fri Nov 16 00:14:15 2001
-+++ tcltk-8.3.1/expect5.31/exp_command.h	Fri Nov 16 00:14:15 2001
-@@ -25,6 +25,7 @@ would appreciate credit if this program 
+diff -up expect-5.43/exp_command.h.spawn expect-5.43/exp_command.h
+--- expect-5.43/exp_command.h.spawn	2004-07-30 17:35:28.000000000 +0200
++++ expect-5.43/exp_command.h	2008-09-25 12:22:14.000000000 +0200
+@@ -30,6 +30,7 @@ would appreciate credit if this program 
  EXTERN char *		exp_get_var _ANSI_ARGS_((Tcl_Interp *,char *));
  
  EXTERN int exp_default_match_max;
 +EXTERN int exp_default_match_max_changed;
  EXTERN int exp_default_parity;
  EXTERN int exp_default_rm_nulls;
- 
-@@ -97,6 +98,7 @@ typedef struct ExpState {
+ EXTERN int exp_default_close_on_eof;
+@@ -103,6 +104,7 @@ typedef struct ExpState {
      int msize;	        /* # of bytes that buffer can hold (max) */
      int umsize;	        /* # of bytes (min) that is guaranteed to match */
  			/* this comes from match_max command */
@@ -26,8 +28,9 @@
      int printed;	/* # of bytes written to stdout (if logging on) */
                          /* but not actually returned via a match yet */
      int echoed;	        /* additional # of bytes (beyond "printed" above) */
---- tcltk-8.3.1/expect5.31/expect.c.read	Fri Nov 16 00:14:15 2001
-+++ tcltk-8.3.1/expect5.31/expect.c	Fri Nov 16 11:09:59 2001
+diff -up expect-5.43/expect.c.spawn expect-5.43/expect.c
+--- expect-5.43/expect.c.spawn	2004-07-07 01:26:02.000000000 +0200
++++ expect-5.43/expect.c	2008-09-25 12:22:14.000000000 +0200
 @@ -41,8 +41,17 @@ would appreciate credit if this program 
  #include "tcldbg.h"
  #endif
@@ -47,8 +50,8 @@
  #define INIT_EXPECT_TIMEOUT_LIT	"10"	/* seconds */
  #define INIT_EXPECT_TIMEOUT	10	/* seconds */
  int exp_default_parity =	TRUE;
-@@ -1557,6 +1566,76 @@ expNullStrip(obj,offsetBytes)
-     Tcl_SetObjLength(obj,offsetBytes + (dest - src2));
+@@ -1619,6 +1628,76 @@ expNullStrip(obj,offsetBytes)
+     return newsize;
  }
  
 +/* returns # of bytes until we see a newline at the end or EOF.  */
@@ -124,7 +127,7 @@
  /* returns # of bytes read or (non-positive) error of form EXP_XXX */
  /* returns 0 for end of file */
  /* If timeout is non-zero, set an alarm before doing the read, else assume */
-@@ -1571,6 +1650,8 @@ int save_flags;
+@@ -1633,6 +1712,8 @@ int save_flags;
  {
      int cc = EXP_TIMEOUT;
      int size = expSizeGet(esPtr);
@@ -133,7 +136,7 @@
  
      if (size + TCL_UTF_MAX >= esPtr->msize) 
  	exp_buffer_shuffle(interp,esPtr,save_flags,EXPECT_OUT,"expect");
-@@ -1587,11 +1668,43 @@ int save_flags;
+@@ -1649,11 +1730,43 @@ int save_flags;
      }
  #endif
  
@@ -181,7 +184,7 @@
      i_read_errno = errno;
  
  #ifdef SIMPLE_EVENT
-@@ -1612,7 +1725,7 @@ int save_flags;
+@@ -1674,7 +1787,7 @@ int save_flags;
  	}
      }
  #endif
@@ -190,7 +193,7 @@
  }
  
  /*
-@@ -2667,8 +2780,14 @@ char **argv;
+@@ -2751,8 +2864,14 @@ char **argv;
  	return(TCL_ERROR);
      }
  

expect-5.39.0-libdir.patch:

Index: expect-5.39.0-libdir.patch
===================================================================
RCS file: /cvs/extras/rpms/expect/devel/expect-5.39.0-libdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- expect-5.39.0-libdir.patch	9 Sep 2004 04:37:26 -0000	1.1
+++ expect-5.39.0-libdir.patch	25 Sep 2008 10:45:09 -0000	1.2
@@ -1,6 +1,7 @@
---- expect-5.39/Makefile.in.libdir	2003-07-30 00:46:51.000000000 +0200
-+++ expect-5.39/Makefile.in	2003-11-17 17:54:52.000000000 +0100
-@@ -316,7 +316,7 @@
+diff -up expect-5.43/Makefile.in.libdir expect-5.43/Makefile.in
+--- expect-5.43/Makefile.in.libdir	2004-05-07 20:10:30.000000000 +0200
++++ expect-5.43/Makefile.in	2008-09-25 12:24:08.000000000 +0200
+@@ -317,7 +317,7 @@ EXP_AND_TK_LIBS = $(LDFLAGS) @EXP_AND_TK
  CFLAGS_INT = $(MH_CFLAGS) $(CPPFLAGS) $(XCFLAGS)
  
  LIB_INSTALL_DIR = $(tcl_libdir)

expect-5.43.0-h-comments.patch:

Index: expect-5.43.0-h-comments.patch
===================================================================
RCS file: /cvs/extras/rpms/expect/devel/expect-5.43.0-h-comments.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- expect-5.43.0-h-comments.patch	8 Feb 2007 04:39:05 -0000	1.1
+++ expect-5.43.0-h-comments.patch	25 Sep 2008 10:45:09 -0000	1.2
@@ -1,5 +1,6 @@
---- expect-5.43/expect_cf.h.in.h-comments	2007-02-08 05:11:43.000000000 +0100
-+++ expect-5.43/expect_cf.h.in	2007-02-08 05:14:05.000000000 +0100
+diff -up expect-5.43/expect_cf.h.in.h-comments expect-5.43/expect_cf.h.in
+--- expect-5.43/expect_cf.h.in.h-comments	2004-05-07 19:48:02.000000000 +0200
++++ expect-5.43/expect_cf.h.in	2008-09-25 12:22:37.000000000 +0200
 @@ -4,7 +4,8 @@
  #ifndef __EXPECT_CF_H__
  #define __EXPECT_CF_H__
@@ -58,8 +59,9 @@
  #undef HAVE_SIGLONGJMP
  #undef HAVE_STRCHR
  
---- expect-5.43/tcldbgcf.h.in.h-comments	2007-02-08 05:11:43.000000000 +0100
-+++ expect-5.43/tcldbgcf.h.in	2007-02-08 05:12:17.000000000 +0100
+diff -up expect-5.43/tcldbgcf.h.in.h-comments expect-5.43/tcldbgcf.h.in
+--- expect-5.43/tcldbgcf.h.in.h-comments	2002-02-12 03:00:56.000000000 +0100
++++ expect-5.43/tcldbgcf.h.in	2008-09-25 12:22:37.000000000 +0200
 @@ -7,7 +7,8 @@
  #ifndef __NIST_DBG_CF_H__
  #define __NIST_DBG_CF_H__

expect-5.43.0-log_file.patch:

Index: expect-5.43.0-log_file.patch
===================================================================
RCS file: /cvs/extras/rpms/expect/devel/expect-5.43.0-log_file.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- expect-5.43.0-log_file.patch	22 Mar 2006 18:24:01 -0000	1.1
+++ expect-5.43.0-log_file.patch	25 Sep 2008 10:45:09 -0000	1.2
@@ -1,6 +1,7 @@
---- expect-5.43/exp_log.c.log_file	2004-08-18 16:54:35.000000000 -0400
-+++ expect-5.43/exp_log.c	2006-02-24 12:39:58.000000000 -0500
-@@ -471,7 +471,7 @@
+diff -up expect-5.43/exp_log.c.log_file expect-5.43/exp_log.c
+--- expect-5.43/exp_log.c.log_file	2004-08-18 22:54:35.000000000 +0200
++++ expect-5.43/exp_log.c	2008-09-25 12:24:42.000000000 +0200
+@@ -471,7 +471,7 @@ expLogChannelOpen(interp,filename,append
  	Tcl_DStringAppend(&tsdPtr->logFilename,filename,-1);
      }
  

expect-5.43.0-pkgIndex-x.patch:

Index: expect-5.43.0-pkgIndex-x.patch
===================================================================
RCS file: /cvs/extras/rpms/expect/devel/expect-5.43.0-pkgIndex-x.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- expect-5.43.0-pkgIndex-x.patch	8 Feb 2007 04:39:05 -0000	1.1
+++ expect-5.43.0-pkgIndex-x.patch	25 Sep 2008 10:45:09 -0000	1.2
@@ -1,6 +1,7 @@
---- expect-5.43/Makefile.in.pkgIndex-x	2007-02-07 15:21:14.000000000 +0100
-+++ expect-5.43/Makefile.in	2007-02-07 15:21:55.000000000 +0100
-@@ -368,7 +368,7 @@
+diff -up expect-5.43/Makefile.in.pkgIndex-x expect-5.43/Makefile.in
+--- expect-5.43/Makefile.in.pkgIndex-x	2008-09-25 12:26:26.000000000 +0200
++++ expect-5.43/Makefile.in	2008-09-25 12:26:26.000000000 +0200
+@@ -368,7 +368,7 @@ install_shared_lib: $(EXP_LIB_FILES)
  	else true; fi
  	if [ -s $(EXP_SHARED_LIB_FILE) ] ; then \
  	  $(INSTALL_PROGRAM) $(EXP_SHARED_LIB_FILE) $(tcl_libdir)/$(EXP_SHARED_LIB_FILE) ; \

expect-5.43.0-pkgpath.patch:

Index: expect-5.43.0-pkgpath.patch
===================================================================
RCS file: /cvs/extras/rpms/expect/devel/expect-5.43.0-pkgpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- expect-5.43.0-pkgpath.patch	17 Jan 2008 12:14:14 -0000	1.1
+++ expect-5.43.0-pkgpath.patch	25 Sep 2008 10:45:09 -0000	1.2
@@ -1,14 +1,7 @@
---- pkgIndex.in.orig	2007-02-10 21:07:34.000000000 -0800
-+++ pkgIndex.in	2007-02-10 21:07:43.000000000 -0800
-@@ -7,4 +7,4 @@
- # script is sourced, the variable $dir must contain the
- # full path name of this file's directory.
- 
--package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join $dir .. @EXP_SHARED_LIB_FILE@]]
-+package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join $dir .. .. @EXP_SHARED_LIB_FILE@]]
---- configure.in.orig	2007-02-10 21:30:13.000000000 -0800
-+++ configure.in	2007-02-10 21:30:23.000000000 -0800
-@@ -1260,6 +1260,7 @@
+diff -up expect-5.43/configure.in.pkgpath expect-5.43/configure.in
+--- expect-5.43/configure.in.pkgpath	2008-09-25 12:28:28.000000000 +0200
++++ expect-5.43/configure.in	2008-09-25 12:28:28.000000000 +0200
+@@ -1260,6 +1260,7 @@ AC_SUBST(SETUID)
  AC_SUBST(UNSHARED_RANLIB)
  AC_SUBST(DEFAULT_STTY_ARGS)
  AC_SUBST(STTY_BIN)
@@ -16,9 +9,10 @@
  AC_OUTPUT([Makefile \
  	pkgIndex],
  	chmod +x ${srcdir}/install-sh ${srcdir}/mkinstalldirs)
---- Makefile.in.orig	2007-02-10 21:34:28.000000000 -0800
-+++ Makefile.in	2007-02-10 22:23:14.000000000 -0800
-@@ -173,8 +173,8 @@
+diff -up expect-5.43/Makefile.in.pkgpath expect-5.43/Makefile.in
+--- expect-5.43/Makefile.in.pkgpath	2008-09-25 12:28:28.000000000 +0200
++++ expect-5.43/Makefile.in	2008-09-25 12:28:28.000000000 +0200
+@@ -173,8 +173,8 @@ STTY = -DDFLT_STTY="\"@DEFAULT_STTY_ARGS
  bindir            = $(INSTALL_ROOT)@bindir@
  bindir_arch_indep = $(INSTALL_ROOT)$(prefix)/bin
  tcl_libdir        = $(INSTALL_ROOT)@libdir@
@@ -29,3 +23,12 @@
  
  mandir 	= $(INSTALL_ROOT)@mandir@
  man1dir = $(mandir)/man1
+diff -up expect-5.43/pkgIndex.in.pkgpath expect-5.43/pkgIndex.in
+--- expect-5.43/pkgIndex.in.pkgpath	2002-02-12 03:00:56.000000000 +0100
++++ expect-5.43/pkgIndex.in	2008-09-25 12:28:28.000000000 +0200
+@@ -7,4 +7,4 @@
+ # script is sourced, the variable $dir must contain the
+ # full path name of this file's directory.
+ 
+-package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join $dir .. @EXP_SHARED_LIB_FILE@]]
++package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join $dir .. .. @EXP_SHARED_LIB_FILE@]]

expect-5.43.0-tcl8.5.patch:

Index: expect-5.43.0-tcl8.5.patch
===================================================================
RCS file: /cvs/extras/rpms/expect/devel/expect-5.43.0-tcl8.5.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- expect-5.43.0-tcl8.5.patch	7 Jan 2008 09:42:59 -0000	1.2
+++ expect-5.43.0-tcl8.5.patch	25 Sep 2008 10:45:09 -0000	1.3
@@ -1,7 +1,6 @@
-diff -up expect-5.43/tests/all.tcl expect-5.43/tests/all
-diff -up expect-5.43/Dbg.c.tcl expect-5.43/Dbg.c
---- expect-5.43/Dbg.c.tcl	2008-01-04 19:25:02.000000000 +0100
-+++ expect-5.43/Dbg.c	2008-01-04 19:25:25.000000000 +0100
+diff -up expect-5.43/Dbg.c.tcl8.5 expect-5.43/Dbg.c
+--- expect-5.43/Dbg.c.tcl8.5	2002-03-23 05:11:54.000000000 +0100
++++ expect-5.43/Dbg.c	2008-09-25 12:25:40.000000000 +0200
 @@ -10,6 +10,7 @@ would appreciate credit if this program 
  
  #include <stdio.h>
@@ -10,9 +9,9 @@
  #include "tcldbgcf.h"
  #if 0
  /* tclInt.h drags in stdlib.  By claiming no-stdlib, force it to drag in */
-diff -up expect-5.43/exp_inter.c.tcl expect-5.43/exp_inter.c
---- expect-5.43/exp_inter.c.tcl	2008-01-04 19:23:47.000000000 +0100
-+++ expect-5.43/exp_inter.c	2008-01-04 19:24:24.000000000 +0100
+diff -up expect-5.43/exp_inter.c.tcl8.5 expect-5.43/exp_inter.c
+--- expect-5.43/exp_inter.c.tcl8.5	2004-08-18 04:03:00.000000000 +0200
++++ expect-5.43/exp_inter.c	2008-09-25 12:25:40.000000000 +0200
 @@ -36,6 +36,7 @@ would appreciate credit if this program 
  #include <ctype.h>
  


Index: expect.spec
===================================================================
RCS file: /cvs/extras/rpms/expect/devel/expect.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- expect.spec	9 Jun 2008 12:33:00 -0000	1.25
+++ expect.spec	25 Sep 2008 10:45:09 -0000	1.26
@@ -5,7 +5,7 @@
 Summary: A program-script interaction and testing utility
 Name: expect
 Version: %{majorver}.0
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: Public Domain
 Group: Development/Languages
 URL: http://expect.nist.gov/
@@ -62,7 +62,7 @@
 
 %prep
 %setup -q -n expect-%{majorver}
-%patch0 -p2 -b .spawn
+%patch0 -p1 -b .spawn
 %patch1 -p1 -b .h-comments
 %patch2 -p1 -b .lib-spec
 %patch3 -p1 -b .libdir
@@ -72,7 +72,7 @@
 # examples fixes
 %patch100 -p1 -b .random
 %patch101 -p1 -b .unbuffer
-%patch200 -p0 -b .pkgpath
+%patch200 -p1 -b .pkgpath
 # *-lib-spec.patch and *-tcl8.5.patch and -pkgpath.patch touch configure.in
 aclocal
 autoconf
@@ -155,6 +155,9 @@
 %{_mandir}/man1/tknewsbiff.1*
 
 %changelog
+* Thu Sep 25 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 5:43.0-15
+- Rediff all patches to work with patch --fuzz=0
+
 * Mon Jun  9 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 5:43.0-14
 - Use latest config.sub file for package build
   Resolves: #449560

unbuffer-child-flush-143963.patch:

Index: unbuffer-child-flush-143963.patch
===================================================================
RCS file: /cvs/extras/rpms/expect/devel/unbuffer-child-flush-143963.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unbuffer-child-flush-143963.patch	31 May 2005 02:20:40 -0000	1.1
+++ unbuffer-child-flush-143963.patch	25 Sep 2008 10:45:09 -0000	1.2
@@ -1,6 +1,7 @@
---- expect-5.43/example/unbuffer.orig	2004-01-25 10:37:49.000000000 +0900
-+++ expect-5.43/example/unbuffer	2005-05-31 10:37:19.000000000 +0900
-@@ -6,10 +6,17 @@
+diff -up expect-5.43/example/unbuffer.unbuffer expect-5.43/example/unbuffer
+--- expect-5.43/example/unbuffer.unbuffer	2004-01-25 02:37:49.000000000 +0100
++++ expect-5.43/example/unbuffer	2008-09-25 12:27:48.000000000 +0200
+@@ -6,10 +6,17 @@ if {[string compare [lindex $argv 0] "-p
      # pipeline
      set stty_init "-echo"
      eval spawn -noecho [lrange $argv 1 end]



From jreznik at fedoraproject.org  Thu Sep 25 10:48:22 2008
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Thu, 25 Sep 2008 10:48:22 +0000 (UTC)
Subject: rpms/arora/F-8 arora-0.3-double-click-selects-all.patch, NONE,
	1.1 arora.spec, 1.1, 1.2
Message-ID: <20080925104822.B30707013D@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/arora/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31323

Modified Files:
	arora.spec 
Added Files:
	arora-0.3-double-click-selects-all.patch 
Log Message:
* Thu Sep 25 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-2
- Location bar's double click selects all



arora-0.3-double-click-selects-all.patch:

--- NEW FILE arora-0.3-double-click-selects-all.patch ---
diff -up arora-0.3/src/locationbar.cpp.double-click-selects-all arora-0.3/src/locationbar.cpp
--- arora-0.3/src/locationbar.cpp.double-click-selects-all	2008-08-04 22:21:54.000000000 +0200
+++ arora-0.3/src/locationbar.cpp	2008-09-25 10:43:30.000000000 +0200
@@ -186,3 +186,15 @@ void LocationBar::focusOutEvent(QFocusEv
         webViewUrlChanged(m_webView->url());
     QLineEdit::focusOutEvent(event);
 }
+
+void LocationBar::mouseDoubleClickEvent(QMouseEvent *event)
+{
+    if(event->button() == Qt::LeftButton)
+    {
+        selectAll();
+    }
+    else
+    {
+        QLineEdit::mouseDoubleClickEvent(event);
+    }
+}
diff -up arora-0.3/src/locationbar.h.double-click-selects-all arora-0.3/src/locationbar.h
--- arora-0.3/src/locationbar.h.double-click-selects-all	2008-08-04 22:21:54.000000000 +0200
+++ arora-0.3/src/locationbar.h	2008-09-25 10:41:04.000000000 +0200
@@ -38,7 +38,7 @@ public:
 protected:
     void paintEvent(QPaintEvent *event);
     void focusOutEvent(QFocusEvent *event);
-
+    void mouseDoubleClickEvent(QMouseEvent *event);
 private slots:
     void webViewUrlChanged(const QUrl &url);
 


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-8/arora.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- arora.spec	17 Sep 2008 07:24:05 -0000	1.1
+++ arora.spec	25 Sep 2008 10:47:52 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           arora
 Version:        0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A cross platform web browser
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://code.google.com/p/arora/
 Source0:        http://arora.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0:		arora-0.3-double-click-selects-all.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .double-click-selects-all
 
 %build
 qmake-qt4 PREFIX=%{_prefix}
@@ -58,5 +60,7 @@
 %{_datadir}/man/man1/arora.1.gz
 
 %changelog
+* Thu Sep 25 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-2
+- Location bar's double click selects all
 * Wed Aug 13 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-1  
 - Initial spec file 
\ No newline at end of file



From pkgdb at fedoraproject.org  Thu Sep 25 10:52:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 10:52:44 +0000
Subject: [pkgdb] lvm2: fabbione has requested commit
Message-ID: <20080925105244.59BCD208DA4@bastion.fedora.phx.redhat.com>

fabbione has requested the commit acl on lvm2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lvm2



From pkgdb at fedoraproject.org  Thu Sep 25 10:52:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 10:52:52 +0000
Subject: [pkgdb] lvm2: fabbione has requested watchcommits
Message-ID: <20080925105252.55687208DA8@bastion.fedora.phx.redhat.com>

fabbione has requested the watchcommits acl on lvm2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lvm2



From caolanm at fedoraproject.org  Thu Sep 25 10:57:23 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 25 Sep 2008 10:57:23 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.0.ooo94318.greekmenu.crash, NONE,
	1.1 openoffice.org.spec, 1.1658, 1.1659
Message-ID: <20080925105723.58B1A7010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv945

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo94318.greekmenu.crash 
Log Message:
Resolves: rhbz#463884 openoffice.org-3.0.0.ooo94318.greekmenu.crash


--- NEW FILE openoffice.org-3.0.0.ooo94318.greekmenu.crash ---
Index: source/gdi/outdev3.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/outdev3.cxx,v
retrieving revision 1.242.2.1
diff -u -r1.242.2.1 outdev3.cxx
--- openoffice.org.orig/vcl/source/gdi/outdev3.cxx	26 Aug 2008 12:25:34 -0000	1.242.2.1
+++ openoffice.org/vcl/source/gdi/outdev3.cxx	25 Sep 2008 10:24:27 -0000
@@ -7083,20 +7084,23 @@
                 nMnemonicPos = nLen-1;
             }
 
-            sal_Int32* pCaretXArray = (sal_Int32*)alloca( 2 * sizeof(sal_Int32) * nLen );
-            /*BOOL bRet =*/ GetCaretPositions( aStr, pCaretXArray, nIndex, nLen );
-            long lc_x1 = pCaretXArray[ 2*(nMnemonicPos - nIndex) ];
-            long lc_x2 = pCaretXArray[ 2*(nMnemonicPos - nIndex)+1 ];
-            nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2));
-
-            Point aTempPos( Min(lc_x1,lc_x2), GetFontMetric().GetAscent() );
-            if( bInvalidPos )  // #106952#, place behind the (last) character
-                aTempPos = Point( Max(lc_x1,lc_x2), GetFontMetric().GetAscent() );
-
-			aTempPos += rPos;
-            aTempPos = LogicToPixel( aTempPos );
-            nMnemonicX = mnOutOffX + aTempPos.X();
-            nMnemonicY = mnOutOffY + aTempPos.Y();
+            if ( nMnemonicPos != STRING_NOTFOUND )
+            {
+                sal_Int32* pCaretXArray = (sal_Int32*)alloca( 2 * sizeof(sal_Int32) * nLen );
+                /*BOOL bRet =*/ GetCaretPositions( aStr, pCaretXArray, nIndex, nLen );
+                long lc_x1 = pCaretXArray[ 2*(nMnemonicPos - nIndex) ];
+                long lc_x2 = pCaretXArray[ 2*(nMnemonicPos - nIndex)+1 ];
+                nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2));
+
+                Point aTempPos( Min(lc_x1,lc_x2), GetFontMetric().GetAscent() );
+                if( bInvalidPos )  // #106952#, place behind the (last) character
+                    aTempPos = Point( Max(lc_x1,lc_x2), GetFontMetric().GetAscent() );
+    
+    			aTempPos += rPos;
+                aTempPos = LogicToPixel( aTempPos );
+                nMnemonicX = mnOutOffX + aTempPos.X();
+                nMnemonicY = mnOutOffY + aTempPos.Y();
+            }
         }
     }
 
Index: localize.sdf
===================================================================
RCS file: /cvs/util/officecfg/registry/data/org/openoffice/Office/UI/localize.sdf,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- openoffice.org.orig/officecfg/registry/data/org/openoffice/Office/UI/localize.sdf	11 Apr 2008 13:44:48 -0000	1.45
+++ openoffice.org/officecfg/registry/data/org/openoffice/Office/UI/localize.sdf	16 Apr 2008 13:29:11 -0000	1.46
@@ -143041,7 +144325,7 @@
 officecfg	registry\data\org\openoffice\Office\UI\GenericCommands.xcu	0	value	..GenericCommands.UserInterface.Popups..uno:EditMenu	Label			0	da	~Rediger				2002-02-02 02:02:02
 officecfg	registry\data\org\openoffice\Office\UI\GenericCommands.xcu	0	value	..GenericCommands.UserInterface.Popups..uno:EditMenu	Label			0	de	~Bearbeiten				2002-02-02 02:02:02
 officecfg	registry\data\org\openoffice\Office\UI\GenericCommands.xcu	0	value	..GenericCommands.UserInterface.Popups..uno:EditMenu	Label			0	dz	??????????????????(~E)				2002-02-02 02:02:02
-officecfg	registry\data\org\openoffice\Office\UI\GenericCommands.xcu	0	value	..GenericCommands.UserInterface.Popups..uno:EditMenu	Label			0	el	~				2002-02-02 02:02:02
+officecfg	registry\data\org\openoffice\Office\UI\GenericCommands.xcu	0	value	..GenericCommands.UserInterface.Popups..uno:EditMenu	Label			0	el	??~????????????????????				2002-02-02 02:02:02
 officecfg	registry\data\org\openoffice\Office\UI\GenericCommands.xcu	0	value	..GenericCommands.UserInterface.Popups..uno:EditMenu	Label			0	en-GB	~Edit				2002-02-02 02:02:02
 officecfg	registry\data\org\openoffice\Office\UI\GenericCommands.xcu	0	value	..GenericCommands.UserInterface.Popups..uno:EditMenu	Label			0	en-ZA	~Edit				2002-02-02 02:02:02
 officecfg	registry\data\org\openoffice\Office\UI\GenericCommands.xcu	0	value	..GenericCommands.UserInterface.Popups..uno:EditMenu	Label			0	eo	Redakti				2002-02-02 02:02:02


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1658
retrieving revision 1.1659
diff -u -r1.1658 -r1.1659
--- openoffice.org.spec	24 Sep 2008 07:39:55 -0000	1.1658
+++ openoffice.org.spec	25 Sep 2008 10:56:52 -0000	1.1659
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 7
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -115,6 +115,7 @@
 Patch44: openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch
 Patch45: openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch
 Patch46: workspace.vcl94.patch
+Patch47: openoffice.org-3.0.0.ooo94318.greekmenu.crash
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1315,6 +1316,7 @@
 %patch44 -p1 -b .ooo93942.svx.accessibity-loops.patch
 %patch45 -p1 -b .ooo93949.sw.better_rtf_encodings.patch
 %patch46 -p1 -b .workspace.vcl94.patch
+%patch47 -p1 -b .ooo94318.greekmenu.crash
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3679,6 +3681,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Sep 25 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-7.2
+- Resolves: rhbz#463884 openoffice.org-3.0.0.ooo94318.greekmenu.crash
+
 * Sun Sep 21 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-7.1
 - Tswana, Ukrainian, Urdu spellcheckers
 - Resolves: rhbz#462833 openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch



From pkgdb at fedoraproject.org  Thu Sep 25 11:06:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 11:06:00 +0000
Subject: [pkgdb] lvm2 had acl change status
Message-ID: <20080925110600.44880208DA0@bastion.fedora.phx.redhat.com>

agk has set the watchcommits acl on lvm2 (Fedora devel) to Approved for fabbione

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lvm2



From pkgdb at fedoraproject.org  Thu Sep 25 11:06:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 11:06:03 +0000
Subject: [pkgdb] lvm2 had acl change status
Message-ID: <20080925110603.AF450208DA7@bastion.fedora.phx.redhat.com>

agk has set the commit acl on lvm2 (Fedora devel) to Approved for fabbione

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lvm2



From vcrhonek at fedoraproject.org  Thu Sep 25 11:21:58 2008
From: vcrhonek at fedoraproject.org (Vitezslav Crhonek)
Date: Thu, 25 Sep 2008 11:21:58 +0000 (UTC)
Subject: rpms/ypserv/devel ypserv-2.11-iface-binding3.patch, 1.3,
	1.4 ypserv-2.11-nomap.patch, 1.1, 1.2 ypserv-2.11-path.patch,
	1.1, 1.2 ypserv-2.13-nonedomain.patch, 1.2,
	1.3 ypserv-2.13-yplib-memleak.patch, 1.1,
	1.2 ypserv-2.13-ypxfr-zeroresp.patch, 1.1,
	1.2 ypserv-2.19-debuginfo.patch, 1.1,
	1.2 ypserv-2.19-inval-ports.patch, 1.1,
	1.2 ypserv-2.19-quieter.patch, 1.1,
	1.2 ypserv-2.19-slp-warning.patch, 1.1,
	1.2 ypserv-2.5-nfsnobody2.patch, 1.1,
	1.2 ypserv-2.5-redhat.patch, 1.1, 1.2 ypserv.spec, 1.40, 1.41
Message-ID: <20080925112158.4558A7010A@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/ypserv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5922

Modified Files:
	ypserv-2.11-iface-binding3.patch ypserv-2.11-nomap.patch 
	ypserv-2.11-path.patch ypserv-2.13-nonedomain.patch 
	ypserv-2.13-yplib-memleak.patch 
	ypserv-2.13-ypxfr-zeroresp.patch ypserv-2.19-debuginfo.patch 
	ypserv-2.19-inval-ports.patch ypserv-2.19-quieter.patch 
	ypserv-2.19-slp-warning.patch ypserv-2.5-nfsnobody2.patch 
	ypserv-2.5-redhat.patch ypserv.spec 
Log Message:
Rediff all patches to work with patch --fuzz=0

ypserv-2.11-iface-binding3.patch:

Index: ypserv-2.11-iface-binding3.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.11-iface-binding3.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ypserv-2.11-iface-binding3.patch	13 Feb 2006 16:28:40 -0000	1.3
+++ ypserv-2.11-iface-binding3.patch	25 Sep 2008 11:21:56 -0000	1.4
@@ -1,6 +1,7 @@
---- ypserv-2.11/ypserv/ypserv.8.in.iface	2003-01-17 22:57:35.000000000 +0100
-+++ ypserv-2.11/ypserv/ypserv.8.in	2004-01-19 16:23:11.464352153 +0100
-@@ -12,6 +12,9 @@
+diff -up ypserv-2.19/ypserv/ypserv.8.in.iface ypserv-2.19/ypserv/ypserv.8.in
+--- ypserv-2.19/ypserv/ypserv.8.in.iface	2003-01-17 22:57:35.000000000 +0100
++++ ypserv-2.19/ypserv/ypserv.8.in	2008-09-25 13:09:39.000000000 +0200
+@@ -12,6 +12,9 @@ ypserv \- NIS server
  [
  .B \-p port
  ]
@@ -10,7 +11,7 @@
  .LP
  .SH DESCRIPTION
  .IX  "ypserv"  ""  "\fLypserv\fP \(em NIS server process"
-@@ -59,12 +62,23 @@
+@@ -59,12 +62,23 @@ Causes the server to run in debugging mo
  reports only errors (access violations, dbm failures)
  using the syslog(3) facility. In debug mode, the server does not
  background itself and prints extra status messages to stderr for
@@ -35,8 +36,9 @@
  .B "\-p" "--port"  port
  .B ypserv
  will bind itself to this port.
---- ypserv-2.11/ypserv/ypserv.c.iface	2003-11-24 11:26:53.000000000 +0100
-+++ ypserv-2.11/ypserv/ypserv.c	2004-01-19 17:02:25.354924063 +0100
+diff -up ypserv-2.19/ypserv/ypserv.c.iface ypserv-2.19/ypserv/ypserv.c
+--- ypserv-2.19/ypserv/ypserv.c.iface	2006-01-10 20:22:20.000000000 +0100
++++ ypserv-2.19/ypserv/ypserv.c	2008-09-25 13:09:39.000000000 +0200
 @@ -33,11 +33,15 @@
  #include <getopt.h>
  #endif
@@ -53,7 +55,7 @@
  #if defined(HAVE_RPC_SVC_SOC_H)
  #include <rpc/svc_soc.h> /* for svcudp_create() */
  #endif /* HAVE_RPC_SVC_SOC_H */
-@@ -60,6 +64,8 @@
+@@ -63,6 +67,8 @@
  #define YPOLDVERS 1
  #endif
  
@@ -62,7 +64,7 @@
  static char *path_ypdb = YPMAPDIR;
  
  static void
-@@ -92,7 +98,25 @@
+@@ -95,7 +101,25 @@ ypprog_2 (struct svc_req *rqstp, registe
    bool_t retval;
    xdrproc_t _xdr_argument, _xdr_result;
    bool_t (*local) (char *, void *, struct svc_req *);
@@ -88,7 +90,7 @@
    switch (rqstp->rq_proc)
      {
      case YPPROC_NULL:
-@@ -242,6 +266,36 @@
+@@ -245,6 +269,36 @@ mysvc_run (void)
  }
  #endif
  
@@ -125,7 +127,7 @@
  /* Create a pidfile on startup */
  static void
  create_pidfile (void)
-@@ -390,7 +444,7 @@
+@@ -394,7 +448,7 @@ sig_child (int sig UNUSED)
  static void
  Usage (int exitcode)
  {
@@ -134,7 +136,7 @@
    fputs ("       ypserv --version\n", stderr);
  
    exit (exitcode);
-@@ -401,6 +455,7 @@
+@@ -405,6 +459,7 @@ main (int argc, char **argv)
  {
    SVCXPRT *transp;
    int my_port = -1, my_socket, result;
@@ -142,7 +144,7 @@
    struct sockaddr_in s_in;
  
    openlog ("ypserv", LOG_PID, LOG_DAEMON);
-@@ -413,12 +468,13 @@
+@@ -417,12 +472,13 @@ main (int argc, char **argv)
  	{"version", no_argument, NULL, 'v'},
  	{"debug", no_argument, NULL, 'd'},
  	{"port", required_argument, NULL, 'p'},
@@ -157,7 +159,7 @@
        if (c == -1)
  	break;
        switch (c)
-@@ -435,6 +491,11 @@
+@@ -439,6 +495,11 @@ main (int argc, char **argv)
  	  if (debug_flag)
  	    log_msg ("Using port %d\n", my_port);
  	  break;
@@ -169,7 +171,7 @@
  	case 'u':
  	case 'h':
  	  Usage (0);
-@@ -533,6 +594,11 @@
+@@ -545,6 +606,11 @@ main (int argc, char **argv)
    pmap_unset (YPPROG, YPVERS);
    pmap_unset (YPPROG, YPOLDVERS);
  
@@ -181,7 +183,7 @@
    if (my_port >= 0)
      {
        my_socket = socket (AF_INET, SOCK_DGRAM, 0);
-@@ -544,7 +610,7 @@
+@@ -556,7 +622,7 @@ main (int argc, char **argv)
  
        memset ((char *) &s_in, 0, sizeof (s_in));
        s_in.sin_family = AF_INET;
@@ -190,7 +192,7 @@
        s_in.sin_port = htons (my_port);
  
        result = bind (my_socket, (struct sockaddr *) &s_in,
-@@ -589,7 +655,7 @@
+@@ -601,7 +667,7 @@ main (int argc, char **argv)
  
        memset (&s_in, 0, sizeof (s_in));
        s_in.sin_family = AF_INET;
@@ -199,8 +201,9 @@
        s_in.sin_port = htons (my_port);
  
        result = bind (my_socket, (struct sockaddr *) &s_in,
---- /dev/null	2003-09-15 15:40:47.000000000 +0200
-+++ ypserv-2.11/ypserv/ypserv.c.iface_binding	2004-01-19 16:23:11.475350680 +0100
+diff -up /dev/null ypserv-2.19/ypserv/ypserv.c.iface_binding
+--- /dev/null	2008-09-23 12:26:29.886003537 +0200
++++ ypserv-2.19/ypserv/ypserv.c.iface_binding	2008-09-25 13:09:39.000000000 +0200
 @@ -0,0 +1,635 @@
 +/* Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Thorsten Kukuk
 +   Author: Thorsten Kukuk <kukuk at suse.de>

ypserv-2.11-nomap.patch:

Index: ypserv-2.11-nomap.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.11-nomap.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.11-nomap.patch	9 Sep 2004 15:21:19 -0000	1.1
+++ ypserv-2.11-nomap.patch	25 Sep 2008 11:21:56 -0000	1.2
@@ -1,6 +1,7 @@
---- ypserv-2.11/lib/access.c.nomap	2003-06-13 14:09:14.000000000 +0200
-+++ ypserv-2.11/lib/access.c	2004-01-19 16:22:12.732217226 +0100
-@@ -190,6 +190,8 @@
+diff -up ypserv-2.19/lib/access.c.nomap ypserv-2.19/lib/access.c
+--- ypserv-2.19/lib/access.c.nomap	2005-05-31 15:37:43.000000000 +0200
++++ ypserv-2.19/lib/access.c	2008-09-25 13:09:06.000000000 +0200
+@@ -189,6 +189,8 @@ is_valid (struct svc_req *rqstp, const c
  		  status = -1;
  	      ypdb_close (dbp);
  	    }
@@ -9,11 +10,12 @@
  	}
      }
  
---- ypserv-2.11/ypserv/server.c.nomap	2003-08-15 10:55:05.000000000 +0200
-+++ ypserv-2.11/ypserv/server.c	2004-01-19 16:05:10.347198033 +0100
-@@ -177,6 +177,11 @@
- 	    log_msg ("\t-> Ignored (not a valid domain)");
- 	  result->stat = YP_NODOM;
+diff -up ypserv-2.19/ypserv/server.c.nomap ypserv-2.19/ypserv/server.c
+--- ypserv-2.19/ypserv/server.c.nomap	2006-01-10 20:22:20.000000000 +0100
++++ ypserv-2.19/ypserv/server.c	2008-09-25 13:09:06.000000000 +0200
+@@ -190,6 +190,11 @@ ypproc_match_2_svc (ypreq_key *argp, ypr
+ 	    log_msg ("\t-> Ignored (forbidden by securenets)");
+ 	  result->stat = YP_NOMAP;
  	  break;
 +	case -4:
 +	  if (debug_flag)

ypserv-2.11-path.patch:

Index: ypserv-2.11-path.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.11-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.11-path.patch	9 Sep 2004 15:21:19 -0000	1.1
+++ ypserv-2.11-path.patch	25 Sep 2008 11:21:56 -0000	1.2
@@ -1,6 +1,7 @@
---- ypserv-2.11/scripts/Makefile.in.path	2004-01-09 15:36:21.000000000 +0100
-+++ ypserv-2.11/scripts/Makefile.in	2004-01-19 16:04:11.440094847 +0100
-@@ -153,7 +153,7 @@
+diff -up ypserv-2.19/scripts/Makefile.in.path ypserv-2.19/scripts/Makefile.in
+--- ypserv-2.19/scripts/Makefile.in.path	2006-01-10 20:22:31.000000000 +0100
++++ ypserv-2.19/scripts/Makefile.in	2008-09-25 13:07:53.000000000 +0200
+@@ -158,7 +158,7 @@ AUTOMAKE_OPTIONS = 1.7 gnits
  MAINT_CHARSET = latin1
  CLEANFILES = *~ ${SCRIPTS}
  EXTRA_DIST = $(addsuffix .in,$(MANS)) $(addsuffix .in,$(SCRIPTS))

ypserv-2.13-nonedomain.patch:

Index: ypserv-2.13-nonedomain.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.13-nonedomain.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ypserv-2.13-nonedomain.patch	4 Feb 2008 14:44:27 -0000	1.2
+++ ypserv-2.13-nonedomain.patch	25 Sep 2008 11:21:56 -0000	1.3
@@ -1,6 +1,6 @@
-diff -up ypserv-2.19/scripts/ypMakefile.in_old ypserv-2.19/scripts/ypMakefile.in
---- ypserv-2.19/scripts/ypMakefile.in_old	2008-02-04 15:26:47.000000000 +0100
-+++ ypserv-2.19/scripts/ypMakefile.in	2008-02-04 15:27:12.000000000 +0100
+diff -up ypserv-2.19/scripts/ypMakefile.in.nonedomain ypserv-2.19/scripts/ypMakefile.in
+--- ypserv-2.19/scripts/ypMakefile.in.nonedomain	2008-09-25 13:11:50.000000000 +0200
++++ ypserv-2.19/scripts/ypMakefile.in	2008-09-25 13:11:50.000000000 +0200
 @@ -98,10 +98,18 @@ NETMASKS    = $(YPSRCDIR)/netmasks
  YPSERVERS = $(YPDIR)/ypservers	# List of all NIS servers for a domain
  

ypserv-2.13-yplib-memleak.patch:

Index: ypserv-2.13-yplib-memleak.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.13-yplib-memleak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.13-yplib-memleak.patch	9 Sep 2004 15:21:45 -0000	1.1
+++ ypserv-2.13-yplib-memleak.patch	25 Sep 2008 11:21:57 -0000	1.2
@@ -1,5 +1,6 @@
---- ypserv-2.13/lib/yp_db.c.org	2004-04-14 07:47:02.000000000 -0400
-+++ ypserv-2.13/lib/yp_db.c	2004-06-19 08:48:33.000000000 -0400
+diff -up ypserv-2.19/lib/yp_db.c.memleak ypserv-2.19/lib/yp_db.c
+--- ypserv-2.19/lib/yp_db.c.memleak	2004-04-14 13:47:02.000000000 +0200
++++ ypserv-2.19/lib/yp_db.c	2008-09-25 13:10:10.000000000 +0200
 @@ -200,6 +200,7 @@ ypdb_close_all (void)
  			 fast_open_files[i].map, i);
  	      free (fast_open_files[i].domain);

ypserv-2.13-ypxfr-zeroresp.patch:

Index: ypserv-2.13-ypxfr-zeroresp.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.13-ypxfr-zeroresp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.13-ypxfr-zeroresp.patch	9 Sep 2004 15:21:45 -0000	1.1
+++ ypserv-2.13-ypxfr-zeroresp.patch	25 Sep 2008 11:21:57 -0000	1.2
@@ -1,6 +1,7 @@
---- ypserv-2.13/ypxfr/ypxfr.c.orig	2004-01-12 08:12:15.000000000 -0500
-+++ ypserv-2.13/ypxfr/ypxfr.c	2004-08-31 13:17:30.000000000 -0400
-@@ -361,6 +361,7 @@ ypxfr (char *map, char *source_host, cha
+diff -up ypserv-2.19/ypxfr/ypxfr.c.respzero ypserv-2.19/ypxfr/ypxfr.c
+--- ypserv-2.19/ypxfr/ypxfr.c.respzero	2005-09-02 16:22:11.000000000 +0200
++++ ypserv-2.19/ypxfr/ypxfr.c	2008-09-25 13:10:39.000000000 +0200
+@@ -364,6 +364,7 @@ ypxfr (char *map, char *source_host, cha
    struct hostent *h;
    int sock, result;
  

ypserv-2.19-debuginfo.patch:

Index: ypserv-2.19-debuginfo.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.19-debuginfo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.19-debuginfo.patch	8 Jan 2008 16:21:37 -0000	1.1
+++ ypserv-2.19-debuginfo.patch	25 Sep 2008 11:21:57 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up ypserv-2.19/revnetgroup/Makefile.in.orig ypserv-2.19/revnetgroup/Makefile.in
---- ypserv-2.19/revnetgroup/Makefile.in.orig	2006-01-10 14:22:31.000000000 -0500
-+++ ypserv-2.19/revnetgroup/Makefile.in	2008-01-08 11:07:22.000000000 -0500
-@@ -98,7 +98,7 @@ EGREP = @EGREP@
+diff -up ypserv-2.19/makedbm/Makefile.in.debuginfo ypserv-2.19/makedbm/Makefile.in
+--- ypserv-2.19/makedbm/Makefile.in.debuginfo	2006-01-10 20:22:30.000000000 +0100
++++ ypserv-2.19/makedbm/Makefile.in	2008-09-25 13:12:39.000000000 +0200
+@@ -96,7 +96,7 @@ EGREP = @EGREP@
  EXEEXT = @EXEEXT@
  INSTALL_DATA = @INSTALL_DATA@
  #
@@ -10,10 +10,10 @@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
-diff -up ypserv-2.19/rpc.yppasswdd/Makefile.in.orig ypserv-2.19/rpc.yppasswdd/Makefile.in
---- ypserv-2.19/rpc.yppasswdd/Makefile.in.orig	2006-01-10 14:22:31.000000000 -0500
-+++ ypserv-2.19/rpc.yppasswdd/Makefile.in	2008-01-08 11:07:22.000000000 -0500
-@@ -103,7 +103,7 @@ EGREP = @EGREP@
+diff -up ypserv-2.19/mknetid/Makefile.in.debuginfo ypserv-2.19/mknetid/Makefile.in
+--- ypserv-2.19/mknetid/Makefile.in.debuginfo	2006-01-10 20:22:31.000000000 +0100
++++ ypserv-2.19/mknetid/Makefile.in	2008-09-25 13:12:39.000000000 +0200
+@@ -97,7 +97,7 @@ EGREP = @EGREP@
  EXEEXT = @EXEEXT@
  INSTALL_DATA = @INSTALL_DATA@
  #
@@ -22,10 +22,10 @@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
-diff -up ypserv-2.19/yppush/Makefile.in.orig ypserv-2.19/yppush/Makefile.in
---- ypserv-2.19/yppush/Makefile.in.orig	2006-01-10 14:22:32.000000000 -0500
-+++ ypserv-2.19/yppush/Makefile.in	2008-01-08 11:07:22.000000000 -0500
-@@ -96,7 +96,7 @@ EGREP = @EGREP@
+diff -up ypserv-2.19/revnetgroup/Makefile.in.debuginfo ypserv-2.19/revnetgroup/Makefile.in
+--- ypserv-2.19/revnetgroup/Makefile.in.debuginfo	2006-01-10 20:22:31.000000000 +0100
++++ ypserv-2.19/revnetgroup/Makefile.in	2008-09-25 13:12:39.000000000 +0200
+@@ -98,7 +98,7 @@ EGREP = @EGREP@
  EXEEXT = @EXEEXT@
  INSTALL_DATA = @INSTALL_DATA@
  #
@@ -34,10 +34,10 @@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
-diff -up ypserv-2.19/ypserv/Makefile.in.orig ypserv-2.19/ypserv/Makefile.in
---- ypserv-2.19/ypserv/Makefile.in.orig	2006-01-10 14:22:32.000000000 -0500
-+++ ypserv-2.19/ypserv/Makefile.in	2008-01-08 11:07:22.000000000 -0500
-@@ -98,7 +98,7 @@ EGREP = @EGREP@
+diff -up ypserv-2.19/rpc.yppasswdd/Makefile.in.debuginfo ypserv-2.19/rpc.yppasswdd/Makefile.in
+--- ypserv-2.19/rpc.yppasswdd/Makefile.in.debuginfo	2006-01-10 20:22:31.000000000 +0100
++++ ypserv-2.19/rpc.yppasswdd/Makefile.in	2008-09-25 13:12:39.000000000 +0200
+@@ -103,7 +103,7 @@ EGREP = @EGREP@
  EXEEXT = @EXEEXT@
  INSTALL_DATA = @INSTALL_DATA@
  #
@@ -46,9 +46,9 @@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
-diff -up ypserv-2.19/rpc.ypxfrd/Makefile.in.orig ypserv-2.19/rpc.ypxfrd/Makefile.in
---- ypserv-2.19/rpc.ypxfrd/Makefile.in.orig	2006-01-10 14:22:31.000000000 -0500
-+++ ypserv-2.19/rpc.ypxfrd/Makefile.in	2008-01-08 11:07:22.000000000 -0500
+diff -up ypserv-2.19/rpc.ypxfrd/Makefile.in.debuginfo ypserv-2.19/rpc.ypxfrd/Makefile.in
+--- ypserv-2.19/rpc.ypxfrd/Makefile.in.debuginfo	2006-01-10 20:22:31.000000000 +0100
++++ ypserv-2.19/rpc.ypxfrd/Makefile.in	2008-09-25 13:12:39.000000000 +0200
 @@ -98,7 +98,7 @@ EGREP = @EGREP@
  EXEEXT = @EXEEXT@
  INSTALL_DATA = @INSTALL_DATA@
@@ -58,10 +58,10 @@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
-diff -up ypserv-2.19/makedbm/Makefile.in.orig ypserv-2.19/makedbm/Makefile.in
---- ypserv-2.19/makedbm/Makefile.in.orig	2006-01-10 14:22:30.000000000 -0500
-+++ ypserv-2.19/makedbm/Makefile.in	2008-01-08 11:07:22.000000000 -0500
-@@ -96,7 +96,7 @@ EGREP = @EGREP@
+diff -up ypserv-2.19/yphelper/Makefile.in.debuginfo ypserv-2.19/yphelper/Makefile.in
+--- ypserv-2.19/yphelper/Makefile.in.debuginfo	2006-01-10 20:22:32.000000000 +0100
++++ ypserv-2.19/yphelper/Makefile.in	2008-09-25 13:12:39.000000000 +0200
+@@ -95,7 +95,7 @@ EGREP = @EGREP@
  EXEEXT = @EXEEXT@
  INSTALL_DATA = @INSTALL_DATA@
  #
@@ -70,10 +70,10 @@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
-diff -up ypserv-2.19/mknetid/Makefile.in.orig ypserv-2.19/mknetid/Makefile.in
---- ypserv-2.19/mknetid/Makefile.in.orig	2006-01-10 14:22:31.000000000 -0500
-+++ ypserv-2.19/mknetid/Makefile.in	2008-01-08 11:07:22.000000000 -0500
-@@ -97,7 +97,7 @@ EGREP = @EGREP@
+diff -up ypserv-2.19/yppush/Makefile.in.debuginfo ypserv-2.19/yppush/Makefile.in
+--- ypserv-2.19/yppush/Makefile.in.debuginfo	2006-01-10 20:22:32.000000000 +0100
++++ ypserv-2.19/yppush/Makefile.in	2008-09-25 13:12:39.000000000 +0200
+@@ -96,7 +96,7 @@ EGREP = @EGREP@
  EXEEXT = @EXEEXT@
  INSTALL_DATA = @INSTALL_DATA@
  #
@@ -82,10 +82,10 @@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
-diff -up ypserv-2.19/yphelper/Makefile.in.orig ypserv-2.19/yphelper/Makefile.in
---- ypserv-2.19/yphelper/Makefile.in.orig	2006-01-10 14:22:32.000000000 -0500
-+++ ypserv-2.19/yphelper/Makefile.in	2008-01-08 11:07:22.000000000 -0500
-@@ -95,7 +95,7 @@ EGREP = @EGREP@
+diff -up ypserv-2.19/ypserv/Makefile.in.debuginfo ypserv-2.19/ypserv/Makefile.in
+--- ypserv-2.19/ypserv/Makefile.in.debuginfo	2006-01-10 20:22:32.000000000 +0100
++++ ypserv-2.19/ypserv/Makefile.in	2008-09-25 13:12:39.000000000 +0200
+@@ -98,7 +98,7 @@ EGREP = @EGREP@
  EXEEXT = @EXEEXT@
  INSTALL_DATA = @INSTALL_DATA@
  #

ypserv-2.19-inval-ports.patch:

Index: ypserv-2.19-inval-ports.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.19-inval-ports.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.19-inval-ports.patch	13 Sep 2006 13:30:49 -0000	1.1
+++ ypserv-2.19-inval-ports.patch	25 Sep 2008 11:21:57 -0000	1.2
@@ -1,6 +1,7 @@
---- ypserv-2.19/rpc.yppasswdd/yppasswdd.c.orig	2006-01-10 14:22:20.000000000 -0500
-+++ ypserv-2.19/rpc.yppasswdd/yppasswdd.c	2006-09-13 09:26:02.000000000 -0400
-@@ -333,6 +333,12 @@
+diff -up ypserv-2.19/rpc.yppasswdd/yppasswdd.c.ports ypserv-2.19/rpc.yppasswdd/yppasswdd.c
+--- ypserv-2.19/rpc.yppasswdd/yppasswdd.c.ports	2006-01-10 20:22:20.000000000 +0100
++++ ypserv-2.19/rpc.yppasswdd/yppasswdd.c	2008-09-25 13:11:23.000000000 +0200
+@@ -333,6 +333,12 @@ main (int argc, char **argv)
  	  break;
  	case '\253':
            my_port = atoi (optarg);
@@ -13,9 +14,10 @@
            if (debug_flag)
              log_msg ("Using port %d\n", my_port);
            break;
---- ypserv-2.19/rpc.ypxfrd/ypxfrd.c.orig	2006-01-10 14:22:20.000000000 -0500
-+++ ypserv-2.19/rpc.ypxfrd/ypxfrd.c	2006-09-13 09:26:09.000000000 -0400
-@@ -199,6 +199,12 @@
+diff -up ypserv-2.19/rpc.ypxfrd/ypxfrd.c.ports ypserv-2.19/rpc.ypxfrd/ypxfrd.c
+--- ypserv-2.19/rpc.ypxfrd/ypxfrd.c.ports	2006-01-10 20:22:20.000000000 +0100
++++ ypserv-2.19/rpc.ypxfrd/ypxfrd.c	2008-09-25 13:11:23.000000000 +0200
+@@ -199,6 +199,12 @@ main (int argc, char **argv)
  	  break;
  	case 'p':
  	  my_port = atoi(optarg);
@@ -28,9 +30,10 @@
  	  if (debug_flag)
  	    log_msg("Using port %d\n", my_port);
  	  break;
---- ypserv-2.19/yppush/yppush.c.orig	2005-05-31 05:14:40.000000000 -0400
-+++ ypserv-2.19/yppush/yppush.c	2006-09-13 09:26:17.000000000 -0400
-@@ -649,6 +649,12 @@
+diff -up ypserv-2.19/yppush/yppush.c.ports ypserv-2.19/yppush/yppush.c
+--- ypserv-2.19/yppush/yppush.c.ports	2005-05-31 11:14:40.000000000 +0200
++++ ypserv-2.19/yppush/yppush.c	2008-09-25 13:11:23.000000000 +0200
+@@ -649,6 +649,12 @@ main (int argc, char **argv)
  	      log_msg ("yppush cannot run in parallel with a fixed port");
  	      return 1;
  	    }
@@ -43,9 +46,10 @@
  	  break;
  	default:
  	  Usage (1);
---- ypserv-2.19/ypserv/ypserv.c.orig	2006-09-13 09:00:40.000000000 -0400
-+++ ypserv-2.19/ypserv/ypserv.c	2006-09-13 09:26:32.000000000 -0400
-@@ -492,6 +492,12 @@
+diff -up ypserv-2.19/ypserv/ypserv.c.ports ypserv-2.19/ypserv/ypserv.c
+--- ypserv-2.19/ypserv/ypserv.c.ports	2008-09-25 13:11:23.000000000 +0200
++++ ypserv-2.19/ypserv/ypserv.c	2008-09-25 13:11:23.000000000 +0200
+@@ -492,6 +492,12 @@ main (int argc, char **argv)
  	  break;
  	case 'p':
  	  my_port = atoi (optarg);

ypserv-2.19-quieter.patch:

Index: ypserv-2.19-quieter.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.19-quieter.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.19-quieter.patch	22 Dec 2006 17:17:37 -0000	1.1
+++ ypserv-2.19-quieter.patch	25 Sep 2008 11:21:57 -0000	1.2
@@ -1,5 +1,6 @@
---- ypserv-2.19/lib/access.c.orig	2006-12-22 11:48:28.080930000 -0500
-+++ ypserv-2.19/lib/access.c	2006-12-22 11:49:35.560015000 -0500
+diff -up ypserv-2.19/lib/access.c.quieter ypserv-2.19/lib/access.c
+--- ypserv-2.19/lib/access.c.quieter	2008-09-25 13:12:17.000000000 +0200
++++ ypserv-2.19/lib/access.c	2008-09-25 13:12:17.000000000 +0200
 @@ -201,8 +201,8 @@ is_valid (struct svc_req *rqstp, const c
      }
    else

ypserv-2.19-slp-warning.patch:

Index: ypserv-2.19-slp-warning.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.19-slp-warning.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.19-slp-warning.patch	13 Feb 2008 12:18:16 -0000	1.1
+++ ypserv-2.19-slp-warning.patch	25 Sep 2008 11:21:57 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up ypserv-2.19/etc/ypserv.conf_old ypserv-2.19/etc/ypserv.conf
---- ypserv-2.19/etc/ypserv.conf_old	2004-04-01 12:06:38.000000000 +0200
-+++ ypserv-2.19/etc/ypserv.conf	2008-02-13 11:43:06.000000000 +0100
+diff -up ypserv-2.19/etc/ypserv.conf.slp-warning ypserv-2.19/etc/ypserv.conf
+--- ypserv-2.19/etc/ypserv.conf.slp-warning	2004-04-01 12:06:38.000000000 +0200
++++ ypserv-2.19/etc/ypserv.conf	2008-09-25 13:12:59.000000000 +0200
 @@ -17,9 +17,9 @@ dns: no
  files: 30
  

ypserv-2.5-nfsnobody2.patch:

Index: ypserv-2.5-nfsnobody2.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.5-nfsnobody2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.5-nfsnobody2.patch	9 Sep 2004 15:18:27 -0000	1.1
+++ ypserv-2.5-nfsnobody2.patch	25 Sep 2008 11:21:57 -0000	1.2
@@ -1,6 +1,7 @@
---- ypserv-2.5/scripts/ypMakefile.in.redhat	Mon May 27 09:00:27 2002
-+++ ypserv-2.5/scripts/ypMakefile.in	Thu Aug 15 14:39:31 2002
-@@ -32,6 +32,11 @@
+diff -up ypserv-2.19/scripts/ypMakefile.in.nfsnobody ypserv-2.19/scripts/ypMakefile.in
+--- ypserv-2.19/scripts/ypMakefile.in.nfsnobody	2008-09-25 13:08:19.000000000 +0200
++++ ypserv-2.19/scripts/ypMakefile.in	2008-09-25 13:08:19.000000000 +0200
+@@ -32,6 +32,11 @@ NOPUSH=true
  MINUID=500
  MINGID=500
  
@@ -12,7 +13,7 @@
  # Should we merge the passwd file with the shadow file ?
  # MERGE_PASSWD=true|false
  MERGE_PASSWD=true
-@@ -284,7 +287,7 @@
+@@ -286,7 +291,7 @@ passwd.byname: $(PASSWD) $(SHADOW) $(YPD
  	@echo "Updating $@..."
  	@$(UMASK); \
  	$(MERGER) -p $(PASSWD) $(SHADOW) | \
@@ -21,7 +22,7 @@
  	   print $$1"\t"$$0 }' | $(DBLOAD) -i $(PASSWD) \
  		-o $(YPMAPDIR)/$@ - $@
  	-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -293,7 +296,7 @@
+@@ -295,7 +300,7 @@ passwd.byuid: $(PASSWD) $(SHADOW) $(YPDI
  	@echo "Updating $@..."
  	@$(UMASK); \
  	$(MERGER) -p $(PASSWD) $(SHADOW) | \
@@ -30,7 +31,7 @@
  	   print $$3"\t"$$0 }' | $(DBLOAD) -i $(PASSWD) \
  		 -o $(YPMAPDIR)/$@ - $@
  	-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -307,7 +310,7 @@
+@@ -309,7 +314,7 @@ else
  passwd.byname: $(PASSWD) $(YPDIR)/Makefile
  	@echo "Updating $@..."
  	@$(UMASK); \
@@ -39,7 +40,7 @@
  	   print $$1"\t"$$0 }' $(PASSWD) | $(DBLOAD) -i $(PASSWD) \
  		-o $(YPMAPDIR)/$@ - $@
  	-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -315,7 +318,7 @@
+@@ -317,7 +322,7 @@ passwd.byname: $(PASSWD) $(YPDIR)/Makefi
  passwd.byuid: $(PASSWD) $(YPDIR)/Makefile
  	@echo "Updating $@..."
  	@$(UMASK); \
@@ -48,7 +49,7 @@
  	   print $$3"\t"$$0 }' $(PASSWD) | $(DBLOAD) -i $(PASSWD) \
  		 -o $(YPMAPDIR)/$@ - $@
  	-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -324,7 +327,7 @@
+@@ -326,7 +331,7 @@ shadow.byname: $(SHADOW) $(YPDIR)/Makefi
  	@echo "Updating $@..."
  	@$(UMASK); \
  	$(AWK) -F: '{ if (FILENAME ~ /shadow$$/) { \
@@ -57,7 +58,7 @@
  			} else UID[$$1] = $$3; }' $(PASSWD) $(SHADOW) \
  		| $(DBLOAD) -s -i $(SHADOW) -o $(YPMAPDIR)/$@ - $@
  	-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -343,7 +346,7 @@
+@@ -345,7 +350,7 @@ group.byname: $(GROUP) $(GSHADOW) $(YPDI
  	@echo "Updating $@..."
  	@$(UMASK); \
  	$(MERGER) -g $(GROUP) $(GSHADOW) | \
@@ -66,7 +67,7 @@
  	print $$1"\t"$$0 }' | $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@
  	-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
  
-@@ -351,7 +354,7 @@
+@@ -353,7 +358,7 @@ group.bygid: $(GROUP) $(GSHADOW) $(YPDIR
  	@echo "Updating $@..."
  	@$(UMASK); \
  	$(MERGER) -g $(GROUP) $(GSHADOW) | \
@@ -75,7 +76,7 @@
  	print $$3"\t"$$0 }' | $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@
  	-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
  
-@@ -360,7 +363,7 @@
+@@ -362,7 +367,7 @@ else
  group.byname: $(GROUP) $(YPDIR)/Makefile
  	@echo "Updating $@..."
  	@$(UMASK); \
@@ -84,7 +85,7 @@
  					print $$1"\t"$$0 }' $(GROUP) \
  		| $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@
  	-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -368,7 +371,7 @@
+@@ -370,7 +375,7 @@ group.byname: $(GROUP) $(YPDIR)/Makefile
  group.bygid: $(GROUP) $(YPDIR)/Makefile
  	@echo "Updating $@..."
  	@$(UMASK); \

ypserv-2.5-redhat.patch:

Index: ypserv-2.5-redhat.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.5-redhat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.5-redhat.patch	9 Sep 2004 15:16:13 -0000	1.1
+++ ypserv-2.5-redhat.patch	25 Sep 2008 11:21:57 -0000	1.2
@@ -1,6 +1,7 @@
---- ypserv-2.5/scripts/ypMakefile.in.redhat	Mon May 27 09:00:27 2002
-+++ ypserv-2.5/scripts/ypMakefile.in	Thu Aug 15 14:39:31 2002
-@@ -101,8 +104,8 @@
+diff -up ypserv-2.19/scripts/ypMakefile.in.redhat ypserv-2.19/scripts/ypMakefile.in
+--- ypserv-2.19/scripts/ypMakefile.in.redhat	2004-04-14 14:08:25.000000000 +0200
++++ ypserv-2.19/scripts/ypMakefile.in	2008-09-25 13:07:19.000000000 +0200
+@@ -101,8 +101,8 @@ target: Makefile
  # If you don't want some of these maps built, feel free to comment
  # them out from this list.
  


Index: ypserv.spec
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ypserv.spec	13 Feb 2008 12:18:16 -0000	1.40
+++ ypserv.spec	25 Sep 2008 11:21:57 -0000	1.41
@@ -4,7 +4,7 @@
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
 Version: 2.19
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
@@ -145,6 +145,9 @@
 %{_includedir}/*/*
 
 %changelog
+* Thu Sep 25 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.19-10
+- Rediff all patches to work with patch --fuzz=0
+
 * Wed Feb 13 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.19-9
 - Mark /var/yp/Makefile as %%config(noreplace)
   Resolves: #432582



From rezso at fedoraproject.org  Thu Sep 25 11:28:17 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Thu, 25 Sep 2008 11:28:17 +0000 (UTC)
Subject: rpms/mapnik/devel import.log,1.4,1.5 mapnik.spec,1.4,1.5
Message-ID: <20080925112817.605C37010A@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/mapnik/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7145/devel

Modified Files:
	import.log mapnik.spec 
Log Message:
- use relative path in a demo file
- enable mapnik.pc
 ----------------------------------------------------------------------
 Modified Files:
 	devel/import.log devel/mapnik.spec 
 ----------------------------------------------------------------------



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	12 Sep 2008 07:41:58 -0000	1.4
+++ import.log	25 Sep 2008 11:27:47 -0000	1.5
@@ -2,3 +2,4 @@
 mapnik-0_5_2-0_1_svn738_fc10:HEAD:mapnik-0.5.2-0.1.svn738.fc10.src.rpm:1221201860
 mapnik-0_5_2-0_2_svn738_fc10:HEAD:mapnik-0.5.2-0.2.svn738.fc10.src.rpm:1221204521
 mapnik-0_5_2-0_3_svn738_fc10:HEAD:mapnik-0.5.2-0.3.svn738.fc10.src.rpm:1221205271
+mapnik-0_5_2-0_4_svn738_fc10:HEAD:mapnik-0.5.2-0.4.svn738.fc10.src.rpm:1222342000


Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/mapnik.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mapnik.spec	12 Sep 2008 07:41:58 -0000	1.4
+++ mapnik.spec	25 Sep 2008 11:27:47 -0000	1.5
@@ -1,6 +1,6 @@
 Name:      mapnik
 Version:   0.5.2
-Release:   0.3.svn738%{?dist}
+Release:   0.4.svn738%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
@@ -86,6 +86,7 @@
 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
@@ -122,6 +123,9 @@
 chmod -x demo/data/test/regenerate.sh
 find . -type d -perm /g+s -exec chmod -s '{}' \;
 
+# fix wrong path in a demo file
+sed -i -e 's|/lib/mapnik/input/|/%{name}/input/|g' demo/c++/rundemo.cpp
+
 %build
 
 # linkage errors
@@ -168,6 +172,22 @@
 install -p -m 755 utils/stats/mapdef_stats.py %{buildroot}%{_bindir}/
 install -p -m 644 %{SOURCE1} demo/data/
 
+# install pkgconfig file
+cat > %{name}.pc <<EOF
+prefix=%{_prefix}
+exec_prefix=%{_prefix}
+includedir=%{_includedir}
+
+Name: %{name}
+Description: Free Toolkit for developing mapping applications
+Version: %{version}
+Libs: -lmapnik
+Cflags: -I${includedir}/%{name} -I${includedir}/agg
+EOF
+
+mkdir -p %{buildroot}%{_datadir}/pkgconfig/
+install -p -m 644 %{name}.pc %{buildroot}%{_datadir}/pkgconfig/
+
 %check
 
 # export test enviroment
@@ -200,6 +220,7 @@
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*
 %{_libdir}/lib%{name}.so
+%{_datadir}/pkgconfig/%{name}.pc
 
 %files python
 %defattr(-,root,root,-)
@@ -219,6 +240,10 @@
 %doc demo/python demo/test
 
 %changelog
+* Wed Sep 24 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.4.svn738
+- use relative path in a demo file
+- enable mapnik.pc
+
 * Fri Sep 12 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.3.svn738
 - enable libicu wrap
 



From rezso at fedoraproject.org  Thu Sep 25 11:31:34 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Thu, 25 Sep 2008 11:31:34 +0000 (UTC)
Subject: rpms/mapnik/F-9 import.log,1.2,1.3 mapnik.spec,1.2,1.3
Message-ID: <20080925113134.7507C7010A@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/mapnik/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7945/F-9

Modified Files:
	import.log mapnik.spec 
Log Message:
- use relative path in a demo file
- enable mapnik.pc
 ----------------------------------------------------------------------
 Modified Files:
 	F-9/import.log F-9/mapnik.spec 
 ----------------------------------------------------------------------



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	12 Sep 2008 08:06:20 -0000	1.2
+++ import.log	25 Sep 2008 11:31:04 -0000	1.3
@@ -1,2 +1,3 @@
 mapnik-0_5_1-4_fc9:F-9:mapnik-0.5.1-4.fc9.src.rpm:1219679751
 mapnik-0_5_2-0_3_svn738_fc10:F-9:mapnik-0.5.2-0.3.svn738.fc10.src.rpm:1221206719
+mapnik-0_5_2-0_4_svn738_fc10:F-9:mapnik-0.5.2-0.4.svn738.fc10.src.rpm:1222342232


Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/F-9/mapnik.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mapnik.spec	12 Sep 2008 08:06:20 -0000	1.2
+++ mapnik.spec	25 Sep 2008 11:31:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:      mapnik
 Version:   0.5.2
-Release:   0.3.svn738%{?dist}
+Release:   0.4.svn738%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
@@ -86,6 +86,7 @@
 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
@@ -122,6 +123,9 @@
 chmod -x demo/data/test/regenerate.sh
 find . -type d -perm /g+s -exec chmod -s '{}' \;
 
+# fix wrong path in a demo file
+sed -i -e 's|/lib/mapnik/input/|/%{name}/input/|g' demo/c++/rundemo.cpp
+
 %build
 
 # linkage errors
@@ -168,6 +172,22 @@
 install -p -m 755 utils/stats/mapdef_stats.py %{buildroot}%{_bindir}/
 install -p -m 644 %{SOURCE1} demo/data/
 
+# install pkgconfig file
+cat > %{name}.pc <<EOF
+prefix=%{_prefix}
+exec_prefix=%{_prefix}
+includedir=%{_includedir}
+
+Name: %{name}
+Description: Free Toolkit for developing mapping applications
+Version: %{version}
+Libs: -lmapnik
+Cflags: -I${includedir}/%{name} -I${includedir}/agg
+EOF
+
+mkdir -p %{buildroot}%{_datadir}/pkgconfig/
+install -p -m 644 %{name}.pc %{buildroot}%{_datadir}/pkgconfig/
+
 %check
 
 # export test enviroment
@@ -200,6 +220,7 @@
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*
 %{_libdir}/lib%{name}.so
+%{_datadir}/pkgconfig/%{name}.pc
 
 %files python
 %defattr(-,root,root,-)
@@ -219,6 +240,10 @@
 %doc demo/python demo/test
 
 %changelog
+* Wed Sep 24 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.4.svn738
+- use relative path in a demo file
+- enable mapnik.pc
+
 * Fri Sep 12 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.3.svn738
 - enable libicu wrap
 



From rezso at fedoraproject.org  Thu Sep 25 11:33:54 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Thu, 25 Sep 2008 11:33:54 +0000 (UTC)
Subject: rpms/mapnik/F-8 import.log,1.2,1.3 mapnik.spec,1.2,1.3
Message-ID: <20080925113354.6505D7010A@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/mapnik/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8549/F-8

Modified Files:
	import.log mapnik.spec 
Log Message:
- use relative path in a demo file
- enable mapnik.pc
 ----------------------------------------------------------------------
 Modified Files:
 	F-8/import.log F-8/mapnik.spec 
 ----------------------------------------------------------------------



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/F-8/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	12 Sep 2008 08:43:06 -0000	1.2
+++ import.log	25 Sep 2008 11:33:24 -0000	1.3
@@ -1,2 +1,3 @@
 mapnik-0_5_1-4_fc9:F-8:mapnik-0.5.1-4.fc9.src.rpm:1219680658
 mapnik-0_5_2-0_3_svn738_fc10:F-8:mapnik-0.5.2-0.3.svn738.fc10.src.rpm:1221208908
+mapnik-0_5_2-0_4_svn738_fc10:F-8:mapnik-0.5.2-0.4.svn738.fc10.src.rpm:1222342368


Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/F-8/mapnik.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mapnik.spec	12 Sep 2008 08:43:06 -0000	1.2
+++ mapnik.spec	25 Sep 2008 11:33:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:      mapnik
 Version:   0.5.2
-Release:   0.3.svn738%{?dist}
+Release:   0.4.svn738%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
@@ -86,6 +86,7 @@
 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
@@ -122,6 +123,9 @@
 chmod -x demo/data/test/regenerate.sh
 find . -type d -perm /g+s -exec chmod -s '{}' \;
 
+# fix wrong path in a demo file
+sed -i -e 's|/lib/mapnik/input/|/%{name}/input/|g' demo/c++/rundemo.cpp
+
 %build
 
 # linkage errors
@@ -168,6 +172,22 @@
 install -p -m 755 utils/stats/mapdef_stats.py %{buildroot}%{_bindir}/
 install -p -m 644 %{SOURCE1} demo/data/
 
+# install pkgconfig file
+cat > %{name}.pc <<EOF
+prefix=%{_prefix}
+exec_prefix=%{_prefix}
+includedir=%{_includedir}
+
+Name: %{name}
+Description: Free Toolkit for developing mapping applications
+Version: %{version}
+Libs: -lmapnik
+Cflags: -I${includedir}/%{name} -I${includedir}/agg
+EOF
+
+mkdir -p %{buildroot}%{_datadir}/pkgconfig/
+install -p -m 644 %{name}.pc %{buildroot}%{_datadir}/pkgconfig/
+
 %check
 
 # export test enviroment
@@ -200,6 +220,7 @@
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*
 %{_libdir}/lib%{name}.so
+%{_datadir}/pkgconfig/%{name}.pc
 
 %files python
 %defattr(-,root,root,-)
@@ -219,6 +240,10 @@
 %doc demo/python demo/test
 
 %changelog
+* Wed Sep 24 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.4.svn738
+- use relative path in a demo file
+- enable mapnik.pc
+
 * Fri Sep 12 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.3.svn738
 - enable libicu wrap
 



From fabbione at fedoraproject.org  Thu Sep 25 12:08:42 2008
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Thu, 25 Sep 2008 12:08:42 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2.spec,1.140,1.141
Message-ID: <20080925120842.18D187010A@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15003

Modified Files:
	lvm2.spec 
Log Message:
Add versioned BuildRequires on cman-devel



Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- lvm2.spec	23 Sep 2008 23:11:42 -0000	1.140
+++ lvm2.spec	25 Sep 2008 12:08:11 -0000	1.141
@@ -20,7 +20,7 @@
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
-BuildRequires: cman-devel
+BuildRequires: cman-devel >= 2.99.10
 BuildRequires: module-init-tools
 Requires: device-mapper >= %{device_mapper_version}-%{release}
 Requires: module-init-tools
@@ -274,6 +274,9 @@
 * Wed Sep 24 2008 Alasdair Kergon <agk at redhat.com>> - 2.02.39-5
 - Explicitly create /sbin in the build root.
 
+* Thu Sep 25 2008 Fabio M. Di Nitto <fdinitto at redhat.cm> - 2.02.39-5
+- Add versioned BuildRequires on new cman-devel.
+
 * Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 2.02.39-5
 - Change %%patch to %%patch0 to match Patch0 as required by RPM package update.
 



From berrange at fedoraproject.org  Thu Sep 25 12:14:57 2008
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Thu, 25 Sep 2008 12:14:57 +0000 (UTC)
Subject: rpms/gtk-vnc/devel gtk-vnc-0.3.7-abs-ungrab.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 gtk-vnc.spec, 1.21, 1.22
Message-ID: <20080925121457.9A95C7010A@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/gtk-vnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16219

Modified Files:
	.cvsignore gtk-vnc.spec 
Added Files:
	gtk-vnc-0.3.7-abs-ungrab.patch 
Log Message:
Fix ungrab when in absolute pointer mode

gtk-vnc-0.3.7-abs-ungrab.patch:

--- NEW FILE gtk-vnc-0.3.7-abs-ungrab.patch ---
diff -r cf0e849385e0 src/vncdisplay.c
--- a/src/vncdisplay.c	Thu Sep 11 17:07:42 2008 +0100
+++ b/src/vncdisplay.c	Thu Sep 25 12:57:31 2008 +0100
@@ -703,13 +703,12 @@
 		}
 	}
 
-	if ((!priv->grab_keyboard || !priv->absolute) &&
-	    key->type == GDK_KEY_PRESS &&
+	if (key->type == GDK_KEY_PRESS &&
 	    ((keyval == GDK_Control_L && (key->state & GDK_MOD1_MASK)) ||
 	     (keyval == GDK_Alt_L && (key->state & GDK_CONTROL_MASK)))) {
 		if (priv->in_pointer_grab)
 			do_pointer_ungrab(VNC_DISPLAY(widget), FALSE);
-		else
+		else if (!priv->grab_keyboard || !priv->absolute)
 			do_pointer_grab(VNC_DISPLAY(widget), FALSE);
 	}
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Sep 2008 15:08:41 -0000	1.7
+++ .cvsignore	25 Sep 2008 12:14:27 -0000	1.8
@@ -1 +1,3 @@
 gtk-vnc-0.3.7.tar.gz
+.build*.log
+*.rpm


Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/gtk-vnc.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gtk-vnc.spec	5 Sep 2008 15:08:41 -0000	1.21
+++ gtk-vnc.spec	25 Sep 2008 12:14:27 -0000	1.22
@@ -7,10 +7,11 @@
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
 Version: 0.3.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch1: %{name}-%{version}-abs-ungrab.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gtk-vnc.sf.net/
 BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel
@@ -32,7 +33,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}
 Requires: pkgconfig
-Requires: pygtk2-devel gtk2-devel gnutls-devel
+Requires: gtk2-devel gnutls-devel
 
 %description devel
 gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines
@@ -67,6 +68,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %if %{with_plugin}
@@ -120,10 +122,13 @@
 %endif
 
 %changelog
+* Thu Sep 25 2008 Daniel P. Berrange <berrange at redhat.com> - 0.3.7-2.fc10
+- Allow pointer ungrab keysequence if already grabbed (rhbz #463729)
+
 * Fri Sep  5 2008 Matthias Clasen  <mclasen at redhat.com> - 0.3.7-1
 - Update to 0.3.7
 
-* Thu Aug 28 2008 Daniel P. Berrange <berrange at redhat.com> - 0.3.6-4.fc9
+* Thu Aug 28 2008 Daniel P. Berrange <berrange at redhat.com> - 0.3.6-4.fc10
 - Fix key/mouse event propagation (rhbz #454627)
 
 * Mon Jul  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.6-3



From berrange at fedoraproject.org  Thu Sep 25 12:21:09 2008
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Thu, 25 Sep 2008 12:21:09 +0000 (UTC)
Subject: rpms/gtk-vnc/F-9 gtk-vnc-0.3.7-abs-ungrab.patch, NONE,
	1.1 gtk-vnc.spec, 1.20, 1.21
Message-ID: <20080925122109.0FE737010A@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/gtk-vnc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17404

Modified Files:
	gtk-vnc.spec 
Added Files:
	gtk-vnc-0.3.7-abs-ungrab.patch 
Log Message:
Fix ungrab when in absolute pointer mode

gtk-vnc-0.3.7-abs-ungrab.patch:

--- NEW FILE gtk-vnc-0.3.7-abs-ungrab.patch ---
diff -r cf0e849385e0 src/vncdisplay.c
--- a/src/vncdisplay.c	Thu Sep 11 17:07:42 2008 +0100
+++ b/src/vncdisplay.c	Thu Sep 25 12:57:31 2008 +0100
@@ -703,13 +703,12 @@
 		}
 	}
 
-	if ((!priv->grab_keyboard || !priv->absolute) &&
-	    key->type == GDK_KEY_PRESS &&
+	if (key->type == GDK_KEY_PRESS &&
 	    ((keyval == GDK_Control_L && (key->state & GDK_MOD1_MASK)) ||
 	     (keyval == GDK_Alt_L && (key->state & GDK_CONTROL_MASK)))) {
 		if (priv->in_pointer_grab)
 			do_pointer_ungrab(VNC_DISPLAY(widget), FALSE);
-		else
+		else if (!priv->grab_keyboard || !priv->absolute)
 			do_pointer_grab(VNC_DISPLAY(widget), FALSE);
 	}
 


Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-9/gtk-vnc.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gtk-vnc.spec	8 Sep 2008 13:02:35 -0000	1.20
+++ gtk-vnc.spec	25 Sep 2008 12:20:38 -0000	1.21
@@ -7,10 +7,11 @@
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
 Version: 0.3.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch1: %{name}-%{version}-abs-ungrab.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gtk-vnc.sf.net/
 BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel
@@ -32,7 +33,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}
 Requires: pkgconfig
-Requires: pygtk2-devel gtk2-devel gnutls-devel
+Requires: gtk2-devel gnutls-devel
 
 %description devel
 gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines
@@ -67,6 +68,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %if %{with_plugin}
@@ -120,6 +122,9 @@
 %endif
 
 %changelog
+* Thu Sep 25 2008 Daniel P. Berrange <berrange at redhat.com> - 0.3.7-2.fc9
+- Allow pointer ungrab keysequence if already grabbed (rhbz #463729)
+
 * Mon Sep  8 2008 Daniel P. Berrange <berrange at redhat.com> - 0.3.7-1.fc9
 - Update to 0.3.7 release for crash fix (rhbz #461359)
 



From tgl at fedoraproject.org  Thu Sep 25 12:49:25 2008
From: tgl at fedoraproject.org (Tom Lane)
Date: Thu, 25 Sep 2008 12:49:25 +0000 (UTC)
Subject: rpms/libjpeg/devel .cvsignore, 1.3, 1.4 libjpeg.spec, 1.25,
	1.26 sources, 1.3, 1.4
Message-ID: <20080925124925.99F6A7010A@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/libjpeg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23282

Modified Files:
	.cvsignore libjpeg.spec sources 
Log Message:
Revert to using .gz instead of .bz2 tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libjpeg/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2004 07:34:55 -0000	1.3
+++ .cvsignore	25 Sep 2008 12:48:55 -0000	1.4
@@ -1 +1 @@
-jpegsrc.v6b.tar.bz2
+jpegsrc.v6b.tar.gz


Index: libjpeg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libjpeg/devel/libjpeg.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libjpeg.spec	20 Jun 2008 01:40:48 -0000	1.25
+++ libjpeg.spec	25 Sep 2008 12:48:55 -0000	1.26
@@ -1,12 +1,12 @@
 Summary: A library for manipulating JPEG image format files
 Name: libjpeg
 Version: 6b
-Release: 42%{?dist}
+Release: 43%{?dist}
 License: IJG
 Group: System Environment/Libraries
 URL: http://www.ijg.org/
 
-Source0: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.bz2
+Source0: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz
 Source1: configure.in
 
 Patch1: jpeg-c++.patch
@@ -118,6 +118,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Sep 25 2008 Tom Lane <tgl at redhat.com> - 6b-43
+- Revert to using .gz instead of .bz2 tarball
+Resolves: #463903
+
 * Thu Jun 19 2008 Tom Lane <tgl at redhat.com> - 6b-42
 - Work around autoconf 2.62 breakage
 Resolves: #449471


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libjpeg/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2004 07:34:55 -0000	1.3
+++ sources	25 Sep 2008 12:48:55 -0000	1.4
@@ -1 +1 @@
-a3e1af1e7958d563626dc62c6f8a50af  jpegsrc.v6b.tar.bz2
+dbd5f3b47ed13132f04c685d608a7547  jpegsrc.v6b.tar.gz



From mmaslano at fedoraproject.org  Thu Sep 25 12:49:30 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 25 Sep 2008 12:49:30 +0000 (UTC)
Subject: rpms/cronie/devel cronie.spec,1.11,1.12
Message-ID: <20080925124930.44A967010A@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/cronie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23337

Modified Files:
	cronie.spec 
Log Message:
* Thu Sep 25 2008 Marcela Maslanova <mmaslano at redhat.com> - 1.2-3
- add sendmail file into requirement, cause it's needed some MTA



Index: cronie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/cronie.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cronie.spec	18 Sep 2008 11:08:25 -0000	1.11
+++ cronie.spec	25 Sep 2008 12:49:00 -0000	1.12
@@ -6,7 +6,7 @@
 Summary: Cron daemon for executing programs at set times
 Name: cronie
 Version: 1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT and BSD
 Group: System Environment/Base
 URL: https://fedorahosted.org/cronie
@@ -16,6 +16,7 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: syslog, bash >= 2.0
+Requires: /usr/sbin/sendmail
 Conflicts: sysklogd < 1.4.1
 Provides: vixie-cron = 4:4.4
 Obsoletes: vixie-cron <= 4:4.3
@@ -125,6 +126,9 @@
 %config(noreplace) %{_sysconfdir}/cron.deny
 
 %changelog
+* Thu Sep 25 2008 Marcela Maslanova <mmaslano at redhat.com> - 1.2-3
+- add sendmail file into requirement, cause it's needed some MTA
+
 * Thu Sep 18 2008 Marcela Maslanova <mmaslano at redhat.com> - 1.2-2
 - 462252  /etc/sysconfig/crond does not need to be executable 
 



From mpg at fedoraproject.org  Thu Sep 25 12:50:20 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Thu, 25 Sep 2008 12:50:20 +0000 (UTC)
Subject: rpms/sugar/OLPC-3 threads.patch,NONE,1.1 sugar.spec,1.24,1.25
Message-ID: <20080925125020.A73547010A@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23681

Modified Files:
	sugar.spec 
Added Files:
	threads.patch 
Log Message:
* Thu Sep 25 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-2
- Properly initialize dbus threads, hopefully fixes #8234


threads.patch:

--- NEW FILE threads.patch ---
diff --git a/src/main.py b/src/main.py
index 1bb91af..890002e 100644
--- a/src/main.py
+++ b/src/main.py
@@ -21,8 +21,10 @@ import pygtk
 pygtk.require('2.0')
 import gtk
 import gobject
+import dbus.glib
 
 gtk.gdk.threads_init()
+dbus.glib.threads_init()
 
 from sugar import logger
 from sugar.profile import get_profile


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sugar.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sugar.spec	20 Sep 2008 10:27:07 -0000	1.24
+++ sugar.spec	25 Sep 2008 12:49:50 -0000	1.25
@@ -4,7 +4,7 @@
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.82.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/sugar
@@ -16,6 +16,8 @@
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: threads.patch
+
 BuildRequires: pkgconfig
 BuildRequires: perl-XML-Parser
 BuildRequires: gettext
@@ -49,6 +51,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .threads
+
 %build
 %configure
 make
@@ -93,6 +97,9 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Thu Sep 25 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-2
+- Properly initialize dbus threads, hopefully fixes #8234
+
 * Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-1
 - #8554 Indicate connected AP in Neighborhood view.
 - #7987 Home view XO icon palette for Control Panel has wrong icon



From jmoskovc at fedoraproject.org  Thu Sep 25 12:53:46 2008
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Thu, 25 Sep 2008 12:53:46 +0000 (UTC)
Subject: rpms/libmirage/devel import.log, NONE, 1.1 libmirage.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080925125346.E43F67013E@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/libmirage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24548/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libmirage.spec 
Log Message:
New package



--- NEW FILE import.log ---
libmirage-1_1_0-3_fc10:HEAD:libmirage-1.1.0-3.fc10.src.rpm:1222346936


--- NEW FILE libmirage.spec ---
Summary: A CD-ROM image access library
Name: libmirage
Version: 1.1.0
Release: 3%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://cdemu.sourceforge.net/pkg_libmirage.php
Source: http://downloads.sourceforge.net/cdemu/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: flex, bison
BuildRequires: libsndfile-devel
BuildRequires: glib2-devel
BuildRequires: gtk-doc
BuildRequires: zlib-devel

%description
This is libMirage library, a CD-ROM image access library, and part of the 
userspace-cdemu suite, a free, GPL CD/DVD-ROM device emulator for linux. It is
written in C and based on GLib.

The aim of libMirage is to provide uniform access to the data stored in 
different image formats, by creating a representation of disc stored in image 
file, which is based on GObjects.

%package devel
Summary: A CD-ROM image access library
Group: Development/Libraries
Requires: pkgconfig
Requires: %{name} = %{version}-%{release}
Requires: gtk-doc

%description devel
This is libMirage library, a CD-ROM image access library, and part of the 
userspace-cdemu suite, a free, GPL CD/DVD-ROM device emulator for linux. It is
written in C and based on GLib.

This package contains files needed to develop with libMirage.

%prep
%setup -q

%build
%configure --enable-gtk-doc --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libmirage/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%post 
/sbin/ldconfig
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun
/sbin/ldconfig
update-mime-database %{_datadir}/mime &> /dev/null || :

%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING README ChangeLog
%{_libdir}/libmirage.so.*
%{_libdir}/libmirage/*.so
%{_datadir}/mime/packages/*

%files devel
%defattr(-, root, root, -)
%{_libdir}/lib*.so
%{_includedir}/*
%{_libdir}/pkgconfig/*
%doc %{_datadir}/gtk-doc/html/*

%changelog
* Mon Aug 25 2008 Jiri Moskovcak <jmoskovc at redhat.com> 1.1.0-3
- fixed post and postun in spec file

* Mon Aug 11 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 1.1.0-2
- more spec file fixes:
    - added "-p" to install to preserve timestamps
    - removed shared-mime-info from Requires since it's not needed
    - added zlib-devel do BuildRequires

* Thu Aug  7 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 1.1.0-1
- updated to latest version
- dropped ppc patch
- spec file cleanups:
    - fixed Source url
    - removed pkgconfig from BuildRequires
    - added shared-mime-info to Requires

* Mon Jul 28 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 1.0.0-3
- spec file cleanups:
    - corrected URL
    - fixed versioned dependecies on pkgconfig
    - removed empty files from rpm
    - added gtk-doc to BuildRequires & Requires
    - license changed to GPLv2+

* Mon Jun 23 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 1.0.0-2
- Initial Fedora release
- fixed issue with compiling on ppc

* Thu Dec 20 2007 Rok Mandeljc <rok.mandeljc at email.si> - 1.0.0-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmirage/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2008 23:48:28 -0000	1.1
+++ .cvsignore	25 Sep 2008 12:53:16 -0000	1.2
@@ -0,0 +1 @@
+libmirage-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmirage/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2008 23:48:28 -0000	1.1
+++ sources	25 Sep 2008 12:53:16 -0000	1.2
@@ -0,0 +1 @@
+47969d13bfa81344dfe6f5c4f24ad10d  libmirage-1.1.0.tar.bz2



From jmoskovc at fedoraproject.org  Thu Sep 25 12:58:46 2008
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Thu, 25 Sep 2008 12:58:46 +0000 (UTC)
Subject: rpms/libmirage/F-9 libmirage.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080925125846.201F67010A@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/libmirage/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26051

Modified Files:
	.cvsignore sources 
Added Files:
	libmirage.spec 
Log Message:
New package



--- NEW FILE libmirage.spec ---
Summary: A CD-ROM image access library
Name: libmirage
Version: 1.1.0
Release: 3%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://cdemu.sourceforge.net/pkg_libmirage.php
Source: http://downloads.sourceforge.net/cdemu/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: flex, bison
BuildRequires: libsndfile-devel
BuildRequires: glib2-devel
BuildRequires: gtk-doc
BuildRequires: zlib-devel

%description
This is libMirage library, a CD-ROM image access library, and part of the 
userspace-cdemu suite, a free, GPL CD/DVD-ROM device emulator for linux. It is
written in C and based on GLib.

The aim of libMirage is to provide uniform access to the data stored in 
different image formats, by creating a representation of disc stored in image 
file, which is based on GObjects.

%package devel
Summary: A CD-ROM image access library
Group: Development/Libraries
Requires: pkgconfig
Requires: %{name} = %{version}-%{release}
Requires: gtk-doc

%description devel
This is libMirage library, a CD-ROM image access library, and part of the 
userspace-cdemu suite, a free, GPL CD/DVD-ROM device emulator for linux. It is
written in C and based on GLib.

This package contains files needed to develop with libMirage.

%prep
%setup -q

%build
%configure --enable-gtk-doc --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libmirage/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%post 
/sbin/ldconfig
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun
/sbin/ldconfig
update-mime-database %{_datadir}/mime &> /dev/null || :

%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING README ChangeLog
%{_libdir}/libmirage.so.*
%{_libdir}/libmirage/*.so
%{_datadir}/mime/packages/*

%files devel
%defattr(-, root, root, -)
%{_libdir}/lib*.so
%{_includedir}/*
%{_libdir}/pkgconfig/*
%doc %{_datadir}/gtk-doc/html/*

%changelog
* Mon Aug 25 2008 Jiri Moskovcak <jmoskovc at redhat.com> 1.1.0-3
- fixed post and postun in spec file

* Mon Aug 11 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 1.1.0-2
- more spec file fixes:
    - added "-p" to install to preserve timestamps
    - removed shared-mime-info from Requires since it's not needed
    - added zlib-devel do BuildRequires

* Thu Aug  7 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 1.1.0-1
- updated to latest version
- dropped ppc patch
- spec file cleanups:
    - fixed Source url
    - removed pkgconfig from BuildRequires
    - added shared-mime-info to Requires

* Mon Jul 28 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 1.0.0-3
- spec file cleanups:
    - corrected URL
    - fixed versioned dependecies on pkgconfig
    - removed empty files from rpm
    - added gtk-doc to BuildRequires & Requires
    - license changed to GPLv2+

* Mon Jun 23 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 1.0.0-2
- Initial Fedora release
- fixed issue with compiling on ppc

* Thu Dec 20 2007 Rok Mandeljc <rok.mandeljc at email.si> - 1.0.0-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmirage/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2008 23:48:28 -0000	1.1
+++ .cvsignore	25 Sep 2008 12:58:15 -0000	1.2
@@ -0,0 +1 @@
+libmirage-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmirage/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2008 23:48:28 -0000	1.1
+++ sources	25 Sep 2008 12:58:15 -0000	1.2
@@ -0,0 +1 @@
+47969d13bfa81344dfe6f5c4f24ad10d  libmirage-1.1.0.tar.bz2



From bonii at fedoraproject.org  Thu Sep 25 13:02:53 2008
From: bonii at fedoraproject.org (Vivek Shah)
Date: Thu, 25 Sep 2008 13:02:53 +0000 (UTC)
Subject: rpms/moe/devel import.log, NONE, 1.1 moe.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080925130253.9DBB17010A@cvs1.fedora.phx.redhat.com>

Author: bonii

Update of /cvs/pkgs/rpms/moe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27010/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log moe.spec 
Log Message:

Initial Package import into CVS



--- NEW FILE import.log ---
moe-1_0-2_fc9:HEAD:moe-1.0-2.fc9.src.rpm:1222367716


--- NEW FILE moe.spec ---
Name:		moe
Version:	1.0
Release:	2%{?dist}
Summary:	A powerful clean text editor

Group:		Applications/Editors
License:	GPLv3+
URL:		http://www.gnu.org/software/moe/moe.html
Source0:	http://ftp.gnu.org/gnu/moe/%{name}-%{version}.tar.bz2

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	ncurses-devel
Requires(post): info
Requires(preun): info

%description
GNU Moe is a powerful, 8-bit clean, text editor for ISO-8859 and ASCII 
character encodings. It has a modeless, user-friendly interface, online 
help, multiple windows, unlimited undo/redo capability, unlimited line 
length, global search/replace (on all buffers at once), block operations, 
automatic indentation, word wrapping, filename completion, directory 
browser, duplicate removal from prompt histories, delimiter matching, etc.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
%{__install} -p -d $RPM_BUILD_ROOT%{_mandir}/man1 
%{__install} -p -m 644 ./doc/moe.1 $RPM_BUILD_ROOT%{_mandir}/man1/
rm -f $RPM_BUILD_ROOT%{_infodir}/dir

%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 $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README NEWS ChangeLog
%{_datadir}/info/%{name}.info*
%config(noreplace) %{_sysconfdir}/%{name}rc
%{_bindir}/%{name}
%{_mandir}/man1/%{name}*

%changelog
* Wed Sep 10 2008 Vivek Shah <boni.vivek at gmail.com> 1.0-2
- Fixed build dependencies
- Added removal of infodir/dir to avoid overwriting
- Added target for manpage 

* Sat Aug 23 2008 Vivek Shah <boni.vivek at gmail.com> 1.0-1
- Initial Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moe/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2008 09:31:26 -0000	1.1
+++ .cvsignore	25 Sep 2008 13:02:23 -0000	1.2
@@ -0,0 +1 @@
+moe-1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moe/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2008 09:31:26 -0000	1.1
+++ sources	25 Sep 2008 13:02:23 -0000	1.2
@@ -0,0 +1 @@
+49bf36a529dc14f750f37bdc1cc4c40c  moe-1.0.tar.bz2



From bonii at fedoraproject.org  Thu Sep 25 13:05:34 2008
From: bonii at fedoraproject.org (Vivek Shah)
Date: Thu, 25 Sep 2008 13:05:34 +0000 (UTC)
Subject: rpms/moe/F-9 import.log, NONE, 1.1 moe.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080925130534.AE00B7010A@cvs1.fedora.phx.redhat.com>

Author: bonii

Update of /cvs/pkgs/rpms/moe/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27786/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log moe.spec 
Log Message:

Initial Package import into CVS



--- NEW FILE import.log ---
moe-1_0-2_fc9:F-9:moe-1.0-2.fc9.src.rpm:1222367878


--- NEW FILE moe.spec ---
Name:		moe
Version:	1.0
Release:	2%{?dist}
Summary:	A powerful clean text editor

Group:		Applications/Editors
License:	GPLv3+
URL:		http://www.gnu.org/software/moe/moe.html
Source0:	http://ftp.gnu.org/gnu/moe/%{name}-%{version}.tar.bz2

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	ncurses-devel
Requires(post): info
Requires(preun): info

%description
GNU Moe is a powerful, 8-bit clean, text editor for ISO-8859 and ASCII 
character encodings. It has a modeless, user-friendly interface, online 
help, multiple windows, unlimited undo/redo capability, unlimited line 
length, global search/replace (on all buffers at once), block operations, 
automatic indentation, word wrapping, filename completion, directory 
browser, duplicate removal from prompt histories, delimiter matching, etc.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
%{__install} -p -d $RPM_BUILD_ROOT%{_mandir}/man1 
%{__install} -p -m 644 ./doc/moe.1 $RPM_BUILD_ROOT%{_mandir}/man1/
rm -f $RPM_BUILD_ROOT%{_infodir}/dir

%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 $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README NEWS ChangeLog
%{_datadir}/info/%{name}.info*
%config(noreplace) %{_sysconfdir}/%{name}rc
%{_bindir}/%{name}
%{_mandir}/man1/%{name}*

%changelog
* Wed Sep 10 2008 Vivek Shah <boni.vivek at gmail.com> 1.0-2
- Fixed build dependencies
- Added removal of infodir/dir to avoid overwriting
- Added target for manpage 

* Sat Aug 23 2008 Vivek Shah <boni.vivek at gmail.com> 1.0-1
- Initial Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moe/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2008 09:31:26 -0000	1.1
+++ .cvsignore	25 Sep 2008 13:05:04 -0000	1.2
@@ -0,0 +1 @@
+moe-1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moe/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2008 09:31:26 -0000	1.1
+++ sources	25 Sep 2008 13:05:04 -0000	1.2
@@ -0,0 +1 @@
+49bf36a529dc14f750f37bdc1cc4c40c  moe-1.0.tar.bz2



From bonii at fedoraproject.org  Thu Sep 25 13:06:10 2008
From: bonii at fedoraproject.org (Vivek Shah)
Date: Thu, 25 Sep 2008 13:06:10 +0000 (UTC)
Subject: rpms/moe/F-8 import.log, NONE, 1.1 moe.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080925130610.D8AEB7010A@cvs1.fedora.phx.redhat.com>

Author: bonii

Update of /cvs/pkgs/rpms/moe/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27998/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log moe.spec 
Log Message:

Initial Package import into CVS



--- NEW FILE import.log ---
moe-1_0-2_fc9:F-8:moe-1.0-2.fc9.src.rpm:1222367916


--- NEW FILE moe.spec ---
Name:		moe
Version:	1.0
Release:	2%{?dist}
Summary:	A powerful clean text editor

Group:		Applications/Editors
License:	GPLv3+
URL:		http://www.gnu.org/software/moe/moe.html
Source0:	http://ftp.gnu.org/gnu/moe/%{name}-%{version}.tar.bz2

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	ncurses-devel
Requires(post): info
Requires(preun): info

%description
GNU Moe is a powerful, 8-bit clean, text editor for ISO-8859 and ASCII 
character encodings. It has a modeless, user-friendly interface, online 
help, multiple windows, unlimited undo/redo capability, unlimited line 
length, global search/replace (on all buffers at once), block operations, 
automatic indentation, word wrapping, filename completion, directory 
browser, duplicate removal from prompt histories, delimiter matching, etc.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
%{__install} -p -d $RPM_BUILD_ROOT%{_mandir}/man1 
%{__install} -p -m 644 ./doc/moe.1 $RPM_BUILD_ROOT%{_mandir}/man1/
rm -f $RPM_BUILD_ROOT%{_infodir}/dir

%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 $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README NEWS ChangeLog
%{_datadir}/info/%{name}.info*
%config(noreplace) %{_sysconfdir}/%{name}rc
%{_bindir}/%{name}
%{_mandir}/man1/%{name}*

%changelog
* Wed Sep 10 2008 Vivek Shah <boni.vivek at gmail.com> 1.0-2
- Fixed build dependencies
- Added removal of infodir/dir to avoid overwriting
- Added target for manpage 

* Sat Aug 23 2008 Vivek Shah <boni.vivek at gmail.com> 1.0-1
- Initial Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moe/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2008 09:31:26 -0000	1.1
+++ .cvsignore	25 Sep 2008 13:05:40 -0000	1.2
@@ -0,0 +1 @@
+moe-1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moe/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2008 09:31:26 -0000	1.1
+++ sources	25 Sep 2008 13:05:40 -0000	1.2
@@ -0,0 +1 @@
+49bf36a529dc14f750f37bdc1cc4c40c  moe-1.0.tar.bz2



From mnowak at fedoraproject.org  Thu Sep 25 13:11:22 2008
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Thu, 25 Sep 2008 13:11:22 +0000 (UTC)
Subject: rpms/eclipse/devel import.log, NONE, 1.1 .cvsignore, 1.50,
	1.51 eclipse-memorypermsizeandjvmcrash.patch, 1.5,
	1.6 eclipse.spec, 1.588, 1.589 sources, 1.67,
	1.68 eclipse-17vmgenerate16bytecode.patch, 1.1,
	NONE eclipse-build.patch, 1.8,
	NONE eclipse-buildagainstxulrunner.patch, 1.2,
	NONE eclipse-ecj-rpmdebuginfo.patch, 1.1,
	NONE eclipse-idreplace.patch, 1.1,
	NONE eclipse-launcher-double-free-bug.patch, 1.1,
	NONE eclipse-launcher-set-install-dir-and-shared-config.patch,
	1.4, NONE eclipse-libupdatebuild2.patch, 1.2,
	NONE eclipse-swt-mozprofile.patch, 1.1,
	NONE eclipse-swttools.patch, 1.6,
	NONE eclipse-tomcat55-build.patch, 1.19,
	NONE eclipse-tomcat55.patch, 1.14, NONE eclipse.in, 1.5,
	NONE pre320changelog.txt, 1.1, NONE
Message-ID: <20080925131122.43EFA7010A@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28525/devel

Modified Files:
	.cvsignore eclipse-memorypermsizeandjvmcrash.patch 
	eclipse.spec sources 
Added Files:
	import.log 
Removed Files:
	eclipse-17vmgenerate16bytecode.patch eclipse-build.patch 
	eclipse-buildagainstxulrunner.patch 
	eclipse-ecj-rpmdebuginfo.patch eclipse-idreplace.patch 
	eclipse-launcher-double-free-bug.patch 
	eclipse-launcher-set-install-dir-and-shared-config.patch 
	eclipse-libupdatebuild2.patch eclipse-swt-mozprofile.patch 
	eclipse-swttools.patch eclipse-tomcat55-build.patch 
	eclipse-tomcat55.patch eclipse.in pre320changelog.txt 
Log Message:
- resolves bug 461860
- CVS is going to remove unused, but packed, patches (I kept them localy)



--- NEW FILE import.log ---
eclipse-3_4_0-24_fc10:HEAD:eclipse-3.4.0-24.fc10.src.rpm:1222346507


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	27 Aug 2008 20:12:34 -0000	1.50
+++ .cvsignore	25 Sep 2008 13:10:51 -0000	1.51
@@ -1,7 +1,7 @@
-eclipse-fileinitializerapp.tar.bz2
-org.fedoraproject.ide.feature-1.0.0.zip
 ecf-filetransfer-v20080611-1715.tar.bz2
+eclipse-3.4.0-testframework.tar.bz2
+eclipse-ecj-gcj.tar.bz2
+eclipse-fileinitializerapp.tar.bz2
 eclipse-sourceBuild-srcIncluded-3.4.zip
+org.fedoraproject.ide.feature-1.0.0.zip
 org.fedoraproject.ide.platform-3.4.0-1.zip
-eclipse-ecj-gcj.tar.bz2
-eclipse-3.4.0-testframework.tar.bz2

eclipse-memorypermsizeandjvmcrash.patch:

Index: eclipse-memorypermsizeandjvmcrash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-memorypermsizeandjvmcrash.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-memorypermsizeandjvmcrash.patch	5 Aug 2008 22:21:54 -0000	1.5
+++ eclipse-memorypermsizeandjvmcrash.patch	25 Sep 2008 13:10:51 -0000	1.6
@@ -1,13 +1,6 @@
-### Eclipse Workspace Patch 1.0
-#P org.eclipse.platform-feature
-Index: gtk/eclipse.ini
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.platform-feature/gtk/eclipse.ini,v
-retrieving revision 1.3
-diff -u -r1.3 eclipse.ini
---- gtk/eclipse.ini	3 Jun 2008 20:55:37 -0000	1.3
-+++ gtk/eclipse.ini	31 Jul 2008 00:28:29 -0000
-@@ -4,4 +4,10 @@
+--- gtk/eclipse.ini	2008-06-18 02:52:18.000000000 +0200
++++ gtk/eclipse.ini.patched	2008-09-25 13:38:03.000000000 +0200
+@@ -4,4 +4,12 @@ org.eclipse.platform
  256m
  -vmargs
  -Xms40m
@@ -18,4 +11,6 @@
 +-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


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.588
retrieving revision 1.589
diff -u -r1.588 -r1.589
--- eclipse.spec	3 Sep 2008 18:01:27 -0000	1.588
+++ eclipse.spec	25 Sep 2008 13:10:51 -0000	1.589
@@ -22,7 +22,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        23%{?dist} 
+Release:        24%{?dist} 
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -119,6 +119,7 @@
 # JVM crash:
 # http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6614100
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=214092
+# https://bugzilla.redhat.com/show_bug.cgi?id=461860 (mnowak)
 Patch29:        %{name}-memorypermsizeandjvmcrash.patch
 
 Patch31:	%{name}-ia64-packaging.patch
@@ -1515,6 +1516,10 @@
 %{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Thu Sep 25 2008 Michal Nowak <mnowak at redhat.com> 3.4.0-24
+- exclude parts of eclipse-pydev from JIT compilation
+- Resolves: bug 461860
+
 * Tue Sep 02 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-23
 - Use icu4j in its new place.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	27 Aug 2008 20:12:35 -0000	1.67
+++ sources	25 Sep 2008 13:10:51 -0000	1.68
@@ -1,7 +1,7 @@
-e1313563c7e36aa46e33789a1386b815  eclipse-fileinitializerapp.tar.bz2
-28c8d625ea1af348cfc592369d52284c  org.fedoraproject.ide.feature-1.0.0.zip
 611d3dc63e9e4246e325848d32773132  ecf-filetransfer-v20080611-1715.tar.bz2
+26ef7c2af793ec8b4ecffb62616483d1  eclipse-3.4.0-testframework.tar.bz2
+43c2aa722a815c61706549d28786d134  eclipse-ecj-gcj.tar.bz2
+e1313563c7e36aa46e33789a1386b815  eclipse-fileinitializerapp.tar.bz2
 555c99aee06fc52d2ec03995b5ac0710  eclipse-sourceBuild-srcIncluded-3.4.zip
+28c8d625ea1af348cfc592369d52284c  org.fedoraproject.ide.feature-1.0.0.zip
 372361ae6f1355ec5cfb9a301ad690f5  org.fedoraproject.ide.platform-3.4.0-1.zip
-43c2aa722a815c61706549d28786d134  eclipse-ecj-gcj.tar.bz2
-26ef7c2af793ec8b4ecffb62616483d1  eclipse-3.4.0-testframework.tar.bz2


--- eclipse-17vmgenerate16bytecode.patch DELETED ---


--- eclipse-build.patch DELETED ---


--- eclipse-buildagainstxulrunner.patch DELETED ---


--- eclipse-ecj-rpmdebuginfo.patch DELETED ---


--- eclipse-idreplace.patch DELETED ---


--- eclipse-launcher-double-free-bug.patch DELETED ---


--- eclipse-launcher-set-install-dir-and-shared-config.patch DELETED ---


--- eclipse-libupdatebuild2.patch DELETED ---


--- eclipse-swt-mozprofile.patch DELETED ---


--- eclipse-swttools.patch DELETED ---


--- eclipse-tomcat55-build.patch DELETED ---


--- eclipse-tomcat55.patch DELETED ---


--- eclipse.in DELETED ---


--- pre320changelog.txt DELETED ---



From ovasik at fedoraproject.org  Thu Sep 25 13:12:28 2008
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 25 Sep 2008 13:12:28 +0000 (UTC)
Subject: rpms/docbook-dtds/devel docbook-dtds.spec,1.25,1.26
Message-ID: <20080925131228.59B337010A@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-dtds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29574

Modified Files:
	docbook-dtds.spec 
Log Message:
Removed openjade requirement - registration reworked to trigger(#234345)


Index: docbook-dtds.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-dtds/devel/docbook-dtds.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- docbook-dtds.spec	24 Sep 2008 14:49:00 -0000	1.25
+++ docbook-dtds.spec	25 Sep 2008 13:11:57 -0000	1.26
@@ -1,6 +1,8 @@
+%define openjadever 1.3.2
+
 Name: docbook-dtds
 Version: 1.0
-Release: 40%{?dist}
+Release: 41%{?dist}
 Group: Applications/Text
 
 Summary: SGML and XML document type definitions for DocBook
@@ -69,9 +71,6 @@
 Patch6: docbook-dtds-ents.patch
 BuildRequires: unzip
 
-%define openjadever 1.3.2
-Requires: openjade = %{openjadever}
-
 %description
 The DocBook Document Type Definition (DTD) describes the syntax of
 technical documentation texts (articles, books and manual pages).
@@ -512,105 +511,66 @@
     # DocBook V3.0
     /usr/bin/xmlcatalog --sgml --noout --add \
     /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
 
     # DocBook V3.1
     /usr/bin/xmlcatalog --sgml --noout --add \
     /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
 
     # DocBook V4.0
     /usr/bin/xmlcatalog --sgml --noout --add \
     /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
 
     # DocBook V4.1
     /usr/bin/xmlcatalog --sgml --noout --add \
     /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
 
     # DocBook XML V4.1.2
     /usr/bin/xmlcatalog --sgml --noout --add \
     /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
 
     # DocBook V4.2
     /usr/bin/xmlcatalog --sgml --noout --add \
     /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
 
     # DocBook XML V4.2
     /usr/bin/xmlcatalog --sgml --noout --add \
     /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
 
     # DocBook V4.3
     /usr/bin/xmlcatalog --sgml --noout --add \
     /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
 
     # DocBook XML V4.3
     /usr/bin/xmlcatalog --sgml --noout --add \
     /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
 
     # DocBook V4.4
     /usr/bin/xmlcatalog --sgml --noout --add \
     /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
 
     # DocBook XML V4.4
     /usr/bin/xmlcatalog --sgml --noout --add \
     /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
 
    # DocBook V4.5
     /usr/bin/xmlcatalog --sgml --noout --add \
     /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
 
     # DocBook XML V4.5
     /usr/bin/xmlcatalog --sgml --noout --add \
     /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
 
 fi
@@ -1092,6 +1052,144 @@
 # Finally, make sure everything in /etc/sgml is readable!
 /bin/chmod a+r /etc/sgml/*
 
+%triggerin -- openjade >= %{?openjadever}
+#openjade catalog registration
+  # DocBook V3.0
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook V3.1
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook V4.0
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+ 
+  # DocBook V4.1
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook XML V4.1.2
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook V4.2
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook XML V4.2
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook V4.3
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook XML V4.3
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook V4.4
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook XML V4.4
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+ 
+  # DocBook V4.5
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook XML V4.5
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+#openjade registration trigger end
+
+%triggerun -- openjade >= %{?openjadever}
+  [ $2 = 0 ] || exit 0
+  #openjade catalog unregistration
+  # DocBook V3.0
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook V3.1
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook V4.0
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+ 
+  # DocBook V4.1
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook XML V4.1.2
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook V4.2
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook XML V4.2
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook V4.3
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook XML V4.3
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook V4.4
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook XML V4.4
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+ 
+  # DocBook V4.5
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook XML V4.5
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+#openjade unregistration trigger end
+
+ 
 %postun
 ##
 ## SGML catalog
@@ -1483,6 +1581,10 @@
 fi
 
 %changelog
+* Fri Sep 26 2008 Ondrej Vasik <ovasik at redhat.com> - 1.0-41
+- Removed openjade requirement - registration reworked to 
+  triggers(#234345)
+
 * Wed Sep 24 2008 Ondrej Vasik <ovasik at redhat.com> - 1.0-40
 - Fix wrong filenames for xml-dtd-4.4 and xml-dtd-4.5 
   iso entities(#461206)



From mtasaka at fedoraproject.org  Thu Sep 25 13:22:48 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 25 Sep 2008 13:22:48 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.65, 1.66 cairo-dock.spec, 1.82, 
	1.83 sources, 1.65, 1.66
Message-ID: <20080925132248.16A0E7010A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31765

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Thu Sep 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1319



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	22 Sep 2008 07:11:50 -0000	1.65
+++ .cvsignore	25 Sep 2008 13:22:17 -0000	1.66
@@ -1 +1 @@
-cairo-dock-sources-svn1317_trunk.tar.bz2
+cairo-dock-sources-svn1319_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- cairo-dock.spec	22 Sep 2008 07:11:50 -0000	1.82
+++ cairo-dock.spec	25 Sep 2008 13:22:17 -0000	1.83
@@ -7,7 +7,7 @@
 # For now build only stable plugin
 %define		build_other	1
 
-%define		tarballver	svn1317_trunk
+%define		tarballver	svn1319_trunk
 %define		mainver		1.6.3
 %undefine		betaver
 %define		build_gecko	1
@@ -608,8 +608,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Mon Sep 22 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1317
+* Thu Sep 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1319
 
 * Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.3-1
 - 1.6.2.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	22 Sep 2008 07:11:50 -0000	1.65
+++ sources	25 Sep 2008 13:22:17 -0000	1.66
@@ -1 +1 @@
-1058e16e095585ec8f4074293d16590f  cairo-dock-sources-svn1317_trunk.tar.bz2
+3ebccb009e3140caa1f39fded8e19b3d  cairo-dock-sources-svn1319_trunk.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep 25 13:25:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:25:14 +0000
Subject: [pkgdb] dmraid: mauelsha has requested commit
Message-ID: <20080925132514.EF39C208DA5@bastion.fedora.phx.redhat.com>

mauelsha has requested the commit acl on dmraid (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmraid



From pkgdb at fedoraproject.org  Thu Sep 25 13:25:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:25:50 +0000
Subject: [pkgdb] dmraid: mauelsha has requested approveacls
Message-ID: <20080925132550.4AE1D208DA8@bastion.fedora.phx.redhat.com>

mauelsha has requested the approveacls acl on dmraid (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmraid



From pkgdb at fedoraproject.org  Thu Sep 25 13:25:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:25:58 +0000
Subject: [pkgdb] dmraid: mauelsha has given up approveacls
Message-ID: <20080925132558.E5F7B208DAF@bastion.fedora.phx.redhat.com>

mauelsha has given up the approveacls acl on dmraid (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmraid



From pkgdb at fedoraproject.org  Thu Sep 25 13:27:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:27:37 +0000
Subject: [pkgdb] device-mapper: mauelsha has requested watchbugzilla
Message-ID: <20080925132737.12429208DA2@bastion.fedora.phx.redhat.com>

mauelsha has requested the watchbugzilla acl on device-mapper (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From pkgdb at fedoraproject.org  Thu Sep 25 13:27:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:27:42 +0000
Subject: [pkgdb] device-mapper: mauelsha has requested watchcommits
Message-ID: <20080925132742.DF45E208DA7@bastion.fedora.phx.redhat.com>

mauelsha has requested the watchcommits acl on device-mapper (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From pkgdb at fedoraproject.org  Thu Sep 25 13:27:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:27:47 +0000
Subject: [pkgdb] device-mapper: mauelsha has requested commit
Message-ID: <20080925132747.A4C1D208DAC@bastion.fedora.phx.redhat.com>

mauelsha has requested the commit acl on device-mapper (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From pkgdb at fedoraproject.org  Thu Sep 25 13:28:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:28:34 +0000
Subject: [pkgdb] device-mapper-multipath: mauelsha has requested
	watchbugzilla
Message-ID: <20080925132834.9DD15208D9F@bastion.fedora.phx.redhat.com>

mauelsha has requested the watchbugzilla acl on device-mapper-multipath (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Thu Sep 25 13:28:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:28:37 +0000
Subject: [pkgdb] device-mapper-multipath: mauelsha has requested watchcommits
Message-ID: <20080925132837.A469A208DA7@bastion.fedora.phx.redhat.com>

mauelsha has requested the watchcommits acl on device-mapper-multipath (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Thu Sep 25 13:28:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:28:38 +0000
Subject: [pkgdb] device-mapper-multipath: mauelsha has requested commit
Message-ID: <20080925132838.5970F208DAD@bastion.fedora.phx.redhat.com>

mauelsha has requested the commit acl on device-mapper-multipath (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From spot at fedoraproject.org  Thu Sep 25 13:28:44 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 25 Sep 2008 13:28:44 +0000 (UTC)
Subject: rpms/pcmanx-gtk2/devel pcmanx-gtk2.spec,1.5,1.6
Message-ID: <20080925132844.0F22D7010A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pcmanx-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv860

Modified Files:
	pcmanx-gtk2.spec 
Log Message:
rebuild against xulrunner 1.9.0.2


Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcmanx-gtk2/devel/pcmanx-gtk2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pcmanx-gtk2.spec	27 Aug 2008 23:10:20 -0000	1.5
+++ pcmanx-gtk2.spec	25 Sep 2008 13:28:13 -0000	1.6
@@ -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 %{xulmajorver}.0.1
+%define xulver %{xulmajorver}.0.2
 
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
 Version:   0.3.8
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 Group:     Applications/Internet
 Source0:   http://pcmanx.csie.net/release/%{name}-%{version}.tar.bz2
@@ -124,6 +124,9 @@
 %{_libdir}/mozilla/plugins/
 
 %changelog
+* Thu Sep 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.8-2
+- rebuild against xulrunner 1.9.0.2
+
 * Wed Aug 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.8-1
 - update to 0.3.8
 - build and package mozilla/firefox/xulrunner plugin



From pkgdb at fedoraproject.org  Thu Sep 25 13:29:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:29:41 +0000
Subject: [pkgdb] lvm2: mauelsha has requested watchbugzilla
Message-ID: <20080925132941.9F42A208DA4@bastion.fedora.phx.redhat.com>

mauelsha has requested the watchbugzilla acl on lvm2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lvm2



From pkgdb at fedoraproject.org  Thu Sep 25 13:29:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:29:42 +0000
Subject: [pkgdb] lvm2: mauelsha has requested watchcommits
Message-ID: <20080925132943.04E63208DA8@bastion.fedora.phx.redhat.com>

mauelsha has requested the watchcommits acl on lvm2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lvm2



From pkgdb at fedoraproject.org  Thu Sep 25 13:29:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:29:44 +0000
Subject: [pkgdb] lvm2: mauelsha has requested commit
Message-ID: <20080925132944.681D2208DAD@bastion.fedora.phx.redhat.com>

mauelsha has requested the commit acl on lvm2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lvm2



From pkgdb at fedoraproject.org  Thu Sep 25 13:32:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:32:48 +0000
Subject: [pkgdb] dmraid: mauelsha has requested approveacls
Message-ID: <20080925133248.C0448208DA2@bastion.fedora.phx.redhat.com>

mauelsha has requested the approveacls acl on dmraid (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmraid



From pkgdb at fedoraproject.org  Thu Sep 25 13:34:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:34:34 +0000
Subject: [pkgdb] dmraid had acl change status
Message-ID: <20080925133434.AB508208DA5@bastion.fedora.phx.redhat.com>

mbroz has set the commit acl on dmraid (Fedora devel) to Approved for mauelsha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmraid



From pkgdb at fedoraproject.org  Thu Sep 25 13:34:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:34:38 +0000
Subject: [pkgdb] dmraid had acl change status
Message-ID: <20080925133438.F0392208DA9@bastion.fedora.phx.redhat.com>

mbroz has set the approveacls acl on dmraid (Fedora devel) to Approved for mauelsha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmraid



From pkgdb at fedoraproject.org  Thu Sep 25 13:35:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:35:43 +0000
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <20080925133543.3933B208DA2@bastion.fedora.phx.redhat.com>

mbroz has set the watchbugzilla acl on device-mapper (Fedora devel) to Approved for mauelsha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From pkgdb at fedoraproject.org  Thu Sep 25 13:35:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:35:50 +0000
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <20080925133550.B42E8208DA8@bastion.fedora.phx.redhat.com>

mbroz has set the watchcommits acl on device-mapper (Fedora devel) to Approved for mauelsha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From pkgdb at fedoraproject.org  Thu Sep 25 13:35:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:35:53 +0000
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <20080925133553.77344208DAC@bastion.fedora.phx.redhat.com>

mbroz has set the commit acl on device-mapper (Fedora devel) to Approved for mauelsha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From pkgdb at fedoraproject.org  Thu Sep 25 13:35:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:35:58 +0000
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <20080925133558.852B7208DB0@bastion.fedora.phx.redhat.com>

agk has set the commit acl on device-mapper-multipath (Fedora devel) to Obsolete for laroche

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Thu Sep 25 13:36:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:36:01 +0000
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <20080925133601.A816E208DA5@bastion.fedora.phx.redhat.com>

agk has set the commit acl on device-mapper-multipath (Fedora devel) to Approved for mauelsha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Thu Sep 25 13:36:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:36:04 +0000
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <20080925133604.BC52F208DBB@bastion.fedora.phx.redhat.com>

agk has set the watchcommits acl on device-mapper-multipath (Fedora devel) to Approved for mauelsha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Thu Sep 25 13:36:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:36:10 +0000
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <20080925133610.C3928208DA2@bastion.fedora.phx.redhat.com>

agk has set the watchbugzilla acl on device-mapper-multipath (Fedora devel) to Approved for mauelsha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Thu Sep 25 13:36:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:36:34 +0000
Subject: [pkgdb] lvm2 had acl change status
Message-ID: <20080925133634.C9CC8208DAB@bastion.fedora.phx.redhat.com>

mbroz has set the watchbugzilla acl on lvm2 (Fedora devel) to Approved for mauelsha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lvm2



From pkgdb at fedoraproject.org  Thu Sep 25 13:36:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:36:38 +0000
Subject: [pkgdb] lvm2 had acl change status
Message-ID: <20080925133638.3F144208DC4@bastion.fedora.phx.redhat.com>

mbroz has set the watchcommits acl on lvm2 (Fedora devel) to Approved for mauelsha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lvm2



From pkgdb at fedoraproject.org  Thu Sep 25 13:36:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:36:41 +0000
Subject: [pkgdb] lvm2 had acl change status
Message-ID: <20080925133641.EBC46208DB4@bastion.fedora.phx.redhat.com>

mbroz has set the commit acl on lvm2 (Fedora devel) to Approved for mauelsha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lvm2



From pkgdb at fedoraproject.org  Thu Sep 25 13:36:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:36:56 +0000
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <20080925133656.BBC57208DB7@bastion.fedora.phx.redhat.com>

agk has set the watchcommits acl on device-mapper (Fedora devel) to Approved for mauelsha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From pkgdb at fedoraproject.org  Thu Sep 25 13:36:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:36:56 +0000
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <20080925133656.BEA5A208DC9@bastion.fedora.phx.redhat.com>

agk has set the watchbugzilla acl on device-mapper (Fedora devel) to Approved for mauelsha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From pkgdb at fedoraproject.org  Thu Sep 25 13:37:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:37:02 +0000
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <20080925133702.84A57208DBE@bastion.fedora.phx.redhat.com>

agk has set the commit acl on device-mapper (Fedora devel) to Approved for mauelsha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From pkgdb at fedoraproject.org  Thu Sep 25 13:37:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:37:04 +0000
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <20080925133704.E0F97208DD0@bastion.fedora.phx.redhat.com>

agk has set the commit acl on device-mapper (Fedora devel) to Obsolete for laroche

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From pkgdb at fedoraproject.org  Thu Sep 25 13:37:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:37:17 +0000
Subject: [pkgdb] dmraid had acl change status
Message-ID: <20080925133717.43067208DBF@bastion.fedora.phx.redhat.com>

agk has set the commit acl on dmraid (Fedora devel) to Obsolete for laroche

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmraid



From pkgdb at fedoraproject.org  Thu Sep 25 13:37:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:37:55 +0000
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <20080925133755.499C2208DA9@bastion.fedora.phx.redhat.com>

agk has set the commit acl on device-mapper-multipath (Fedora 7) to Obsolete for laroche

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Thu Sep 25 13:38:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:38:07 +0000
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <20080925133808.19292208DC0@bastion.fedora.phx.redhat.com>

agk has set the commit acl on device-mapper-multipath (Fedora 8) to Obsolete for laroche

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Thu Sep 25 13:38:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:38:19 +0000
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <20080925133819.2BAC6208DB4@bastion.fedora.phx.redhat.com>

agk has set the commit acl on device-mapper-multipath (Fedora 9) to Obsolete for laroche

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Thu Sep 25 13:38:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:38:35 +0000
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <20080925133835.5E22A208DB7@bastion.fedora.phx.redhat.com>

agk has set the commit acl on device-mapper (Fedora 7) to Obsolete for laroche

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From pkgdb at fedoraproject.org  Thu Sep 25 13:38:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:38:58 +0000
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <20080925133858.80907208DBB@bastion.fedora.phx.redhat.com>

agk has set the commit acl on device-mapper (Fedora 8) to Obsolete for laroche

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From pkgdb at fedoraproject.org  Thu Sep 25 13:39:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:39:09 +0000
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <20080925133909.6B053208DCD@bastion.fedora.phx.redhat.com>

agk has set the commit acl on device-mapper (Fedora 9) to Obsolete for laroche

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From pkgdb at fedoraproject.org  Thu Sep 25 13:51:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:51:22 +0000
Subject: [pkgdb] dmraid had acl change status
Message-ID: <20080925135122.2868E208D6F@bastion.fedora.phx.redhat.com>

agk has set the commit acl on dmraid (Fedora 7) to Obsolete for laroche

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmraid



From pkgdb at fedoraproject.org  Thu Sep 25 13:51:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:51:29 +0000
Subject: [pkgdb] dmraid had acl change status
Message-ID: <20080925135129.8A0FE208DA6@bastion.fedora.phx.redhat.com>

agk has set the commit acl on dmraid (Fedora 8) to Obsolete for laroche

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmraid



From pkgdb at fedoraproject.org  Thu Sep 25 13:51:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:51:39 +0000
Subject: [pkgdb] dmraid had acl change status
Message-ID: <20080925135139.378B6208DA9@bastion.fedora.phx.redhat.com>

agk has set the commit acl on dmraid (Fedora 9) to Obsolete for laroche

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmraid



From pkgdb at fedoraproject.org  Thu Sep 25 13:52:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:52:41 +0000
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <20080925135241.5E9FB208DA0@bastion.fedora.phx.redhat.com>

agk has set the commit acl on device-mapper (Fedora devel) to Obsolete for bmarzins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From pkgdb at fedoraproject.org  Thu Sep 25 13:52:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:52:47 +0000
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <20080925135247.4CC7E208DA7@bastion.fedora.phx.redhat.com>

agk has set the commit acl on device-mapper (Fedora devel) to Obsolete for cfeist

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From pkgdb at fedoraproject.org  Thu Sep 25 13:52:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:52:54 +0000
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <20080925135254.E40FF208DA2@bastion.fedora.phx.redhat.com>

agk has set the commit acl on device-mapper (Fedora devel) to Obsolete for kzak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From pkgdb at fedoraproject.org  Thu Sep 25 13:53:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:53:07 +0000
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <20080925135307.E827E208DA5@bastion.fedora.phx.redhat.com>

agk has set the commit acl on device-mapper (Fedora devel) to Obsolete for mauelsha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From pkgdb at fedoraproject.org  Thu Sep 25 13:53:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:53:14 +0000
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <20080925135314.806C0208DA9@bastion.fedora.phx.redhat.com>

agk has set the commit acl on device-mapper (Fedora devel) to Obsolete for pjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From pkgdb at fedoraproject.org  Thu Sep 25 13:53:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:53:18 +0000
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <20080925135318.0EE9F208D6B@bastion.fedora.phx.redhat.com>

agk has set the commit acl on device-mapper (Fedora devel) to Obsolete for twaugh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From pkgdb at fedoraproject.org  Thu Sep 25 13:53:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 13:53:22 +0000
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <20080925135322.D873F208DB3@bastion.fedora.phx.redhat.com>

agk has set the commit acl on device-mapper (Fedora devel) to Obsolete for mornfall

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From rhughes at fedoraproject.org  Thu Sep 25 14:00:35 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Thu, 25 Sep 2008 14:00:35 +0000 (UTC)
Subject: rpms/PackageKit/devel pk-dont-hang-when-cache-deep.patch, NONE,
	1.1 PackageKit.spec, 1.60, 1.61
Message-ID: <20080925140035.5CAD17010A@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7737

Modified Files:
	PackageKit.spec 
Added Files:
	pk-dont-hang-when-cache-deep.patch 
Log Message:
* Thu Sep 25 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-5
- When returning results from a cache we should always return finished in an
  idle loop so we can block and wait for a response
- This fixes the bug where if you have two GetUpdates in the queue the second
  would hang waiting for the first, even though it had already finished.


pk-dont-hang-when-cache-deep.patch:

--- NEW FILE pk-dont-hang-when-cache-deep.patch ---
commit 58955c21674e37d43d7353d30ab1da3163699e94
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Sep 25 14:32:25 2008 +0100

    bugfix: finish a cached transaction in an idle loop
    
    When returning results from a cache we should always return finished in an idle
    loop so we can block and wait for a response without having to know if we need
    to wait for ::Finished()

diff --git a/src/pk-transaction.c b/src/pk-transaction.c
index db68d4d..73f86dc 100644
--- a/src/pk-transaction.c
+++ b/src/pk-transaction.c
@@ -1093,6 +1093,19 @@ pk_transaction_commit (PkTransaction *transaction)
 }
 
 /**
+ * pk_transaction_finished_idle_cb:
+ **/
+static gboolean
+pk_transaction_finished_idle_cb (PkTransaction *transaction)
+{
+	const gchar *exit_text;
+	exit_text = pk_exit_enum_to_text (PK_EXIT_ENUM_SUCCESS);
+	egg_debug ("emitting finished '%s'", exit_text);
+	g_signal_emit (transaction, signals [PK_TRANSACTION_FINISHED], 0, exit_text, 0);
+	return FALSE;
+}
+
+/**
  * pk_transaction_search_check:
  **/
 static gboolean
@@ -1236,7 +1249,6 @@ pk_transaction_accept_eula (PkTransaction *transaction, const gchar *eula_id, DB
 {
 	gboolean ret;
 	GError *error;
-	const gchar *exit_text;
 	gchar *sender;
 
 	g_return_if_fail (PK_IS_TRANSACTION (transaction));
@@ -1275,10 +1287,7 @@ pk_transaction_accept_eula (PkTransaction *transaction, const gchar *eula_id, DB
 		return;
 	}
 
-	exit_text = pk_exit_enum_to_text (PK_EXIT_ENUM_SUCCESS);
-	egg_debug ("emitting finished transaction '%s', %i", exit_text, 0);
-	g_signal_emit (transaction, signals [PK_TRANSACTION_FINISHED], 0, exit_text, 0);
-
+	g_idle_add ((GSourceFunc) pk_transaction_finished_idle_cb, transaction);
 	dbus_g_method_return (context);
 }
 
@@ -1746,18 +1755,13 @@ pk_transaction_get_packages (PkTransaction *transaction, const gchar *filter, DB
 gboolean
 pk_transaction_get_old_transactions (PkTransaction *transaction, guint number, GError **error)
 {
-	const gchar *exit_text;
-
 	g_return_val_if_fail (PK_IS_TRANSACTION (transaction), FALSE);
 	g_return_val_if_fail (transaction->priv->tid != NULL, FALSE);
 
 	egg_debug ("GetOldTransactions method called");
 
 	pk_transaction_db_get_list (transaction->priv->transaction_db, number);
-
-	exit_text = pk_exit_enum_to_text (PK_EXIT_ENUM_SUCCESS);
-	egg_debug ("emitting finished transaction '%s', %i", exit_text, 0);
-	g_signal_emit (transaction, signals [PK_TRANSACTION_FINISHED], 0, exit_text, 0);
+	g_idle_add ((GSourceFunc) pk_transaction_finished_idle_cb, transaction);
 
 	return TRUE;
 }
@@ -2071,10 +2075,7 @@ pk_transaction_get_update_detail (PkTransaction *transaction, gchar **package_id
 
 	/* if we have nothing to do, i.e. everything was in the cache */
 	if (array->len == 0) {
-		const gchar *exit_text;
-		exit_text = pk_exit_enum_to_text (PK_EXIT_ENUM_SUCCESS);
-		egg_debug ("emitting finished '%s' as no more to process", exit_text);
-		g_signal_emit (transaction, signals [PK_TRANSACTION_FINISHED], 0, exit_text, 0);
+		g_idle_add ((GSourceFunc) pk_transaction_finished_idle_cb, transaction);
 		goto out;
 	}
 
@@ -2152,7 +2153,6 @@ pk_transaction_get_updates (PkTransaction *transaction, const gchar *filter, DBu
 	if (updates_cache != NULL) {
 		const PkPackageObj *obj;
 		const gchar *info_text;
-		const gchar *exit_text;
 		guint i;
 		guint length;
 
@@ -2169,10 +2169,7 @@ pk_transaction_get_updates (PkTransaction *transaction, const gchar *filter, DBu
 			g_free (package_id);
 		}
 
-		/* we are done */
-		exit_text = pk_exit_enum_to_text (PK_EXIT_ENUM_SUCCESS);
-		egg_debug ("emitting finished '%s'", exit_text);
-		g_signal_emit (transaction, signals [PK_TRANSACTION_FINISHED], 0, exit_text, 0);
+		g_idle_add ((GSourceFunc) pk_transaction_finished_idle_cb, transaction);
 
 		dbus_g_method_return (context);
 		return;


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- PackageKit.spec	23 Sep 2008 13:50:10 -0000	1.60
+++ PackageKit.spec	25 Sep 2008 14:00:04 -0000	1.61
@@ -8,7 +8,7 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.4
-Release:   4%{?dist}
+Release:   5%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -24,6 +24,9 @@
 # upstream: 16bea44b16fd8b1ac36cc5939caf1017eece12eb
 Patch2:    pk-fix-yum-error-name.patch
 
+# upstream: 58955c21674e37d43d7353d30ab1da3163699e94
+Patch3:    pk-dont-hang-when-cache-deep.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-libs = %{version}-%{release}
@@ -151,6 +154,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -281,6 +285,12 @@
 %{_includedir}/*
 
 %changelog
+* Thu Sep 25 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-5
+- When returning results from a cache we should always return finished in an
+  idle loop so we can block and wait for a response
+- This fixes the bug where if you have two GetUpdates in the queue the second
+  would hang waiting for the first, even though it had already finished.
+
 * Tue Sep 23 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-4
 - Fix the error dialog when no mirrors are found
 



From mauelsha at fedoraproject.org  Thu Sep 25 14:17:42 2008
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Thu, 25 Sep 2008 14:17:42 +0000 (UTC)
Subject: rpms/dmraid/devel .cvsignore, 1.12, 1.13 dmraid.spec, 1.88,
	1.89 sources, 1.22, 1.23
Message-ID: <20080925141742.ADF1B7010A@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10933

Modified Files:
	.cvsignore dmraid.spec sources 
Log Message:
Update to version 1.0.0.rc15


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	8 Nov 2006 16:58:59 -0000	1.12
+++ .cvsignore	25 Sep 2008 14:17:12 -0000	1.13
@@ -1 +1,2 @@
 dmraid-1.0.0.rc14.tar.bz2
+dmraid-1.0.0.rc15.tar.bz2


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- dmraid.spec	3 Jul 2008 20:11:04 -0000	1.88
+++ dmraid.spec	25 Sep 2008 14:17:12 -0000	1.89
@@ -1,7 +1,7 @@
 Summary: Device-mapper RAID tool and library
 Name: dmraid
-Version: 1.0.0.rc14
-Release: 8%{?dist}
+Version: 1.0.0.rc15
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -12,15 +12,11 @@
 Requires(postun): ldconfig
 Requires(post): ldconfig
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
-Patch0: dmraid-1.0.0.rc14-jmicron-name.patch
-Patch1: dmraid-1.0.0.rc14-solitary-meta-block.patch
-Patch2: dmraid-1.0.0.rc14-UUID.patch
-Patch3: dmraid-1.0.0.rc14-ERROR.patch
-Patch4: dmraid-1.0.0.rc14-UUID-Subsystemprefix.patch
 
 %description
-DMRAID supports RAID device discovery, RAID set activation and display of
-properties for ATARAID on Linux >= 2.4 using device-mapper.
+DMRAID supports RAID device discovery, RAID set activation, creation,
+removal, rebuild and display of properties for ATARAID/DDF1 metadata on
+Linux >= 2.4 using device-mapper.
 
 %package devel
 Summary: Development libraries and headers for dmraid
@@ -31,7 +27,8 @@
 
 %description devel
 dmraid-devel provides a library interface for RAID device discovery,
-RAID set activation and display of properties for ATARAID volumes.
+RAID set activation, creation, removal, rebuild and display of
+properties for ATARAID/DDF1 metadata.
 
 %package libs
 Summary: Shared library for RAID device discovery
@@ -43,11 +40,6 @@
 
 %prep
 %setup -q -n dmraid/%{version}
-%patch0 -p1 -b .jmicron-name
-%patch1 -p1 -b .solitary-meta-block
-%patch2 -p1 -b .UUID
-%patch3 -p1 -b .ERROR
-%patch4 -p1 -b .UUID-Subsystemprefix
 
 %build
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link
@@ -93,6 +85,9 @@
 %attr(755,root,root) %{_libdir}/libdmraid.so.*
 
 %changelog
+* Thu Sep 25 2008 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc15-1
+- Update to version 1.0.0.rc15
+
 * Thu Jul 03 2008 Alasdair Kergon <agk at redhat.com> - 1.0.0.rc14-8
 - Move library into libs subpackage.
 - Fix summary and licence tags.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	8 Nov 2006 17:30:55 -0000	1.22
+++ sources	25 Sep 2008 14:17:12 -0000	1.23
@@ -1 +1 @@
-4f25d6fd1016cd5a822c042b89c78d53  dmraid-1.0.0.rc14.tar.bz2
+2602887205a35f89b59eeba3a868150f  dmraid-1.0.0.rc15.tar.bz2



From pkgdb at fedoraproject.org  Thu Sep 25 14:22:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 14:22:53 +0000
Subject: [pkgdb] dmraid had acl change status
Message-ID: <20080925142254.259B1208DA8@bastion.fedora.phx.redhat.com>

mbroz has set the commit acl on dmraid (Fedora 8) to Approved for mauelsha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmraid



From pkgdb at fedoraproject.org  Thu Sep 25 14:23:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 14:23:00 +0000
Subject: [pkgdb] dmraid had acl change status
Message-ID: <20080925142300.E6C48208DAD@bastion.fedora.phx.redhat.com>

mbroz has set the commit acl on dmraid (Fedora 9) to Approved for mauelsha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmraid



From mbarnes at fedoraproject.org  Thu Sep 25 14:36:37 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 25 Sep 2008 14:36:37 +0000 (UTC)
Subject: rpms/evolution-sharp/devel .cvsignore, 1.23,
	1.24 evolution-sharp-0.12.1-fix-assembly-dir.patch, 1.3,
	1.4 evolution-sharp.spec, 1.56, 1.57 sources, 1.23, 1.24
Message-ID: <20080925143637.B063C7010A@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15024

Modified Files:
	.cvsignore evolution-sharp-0.12.1-fix-assembly-dir.patch 
	evolution-sharp.spec sources 
Log Message:

* Thu Sep 25 2008 Matthew Barnes <mbarnes at redhat.com> - 0.18.0-1.fc10
- Update to 0.18.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	10 Sep 2008 19:51:53 -0000	1.23
+++ .cvsignore	25 Sep 2008 14:36:07 -0000	1.24
@@ -1 +1 @@
-evolution-sharp-0.17.5.tar.bz2
+evolution-sharp-0.18.0.tar.bz2

evolution-sharp-0.12.1-fix-assembly-dir.patch:

Index: evolution-sharp-0.12.1-fix-assembly-dir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/evolution-sharp-0.12.1-fix-assembly-dir.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evolution-sharp-0.12.1-fix-assembly-dir.patch	8 Apr 2008 12:41:58 -0000	1.3
+++ evolution-sharp-0.12.1-fix-assembly-dir.patch	25 Sep 2008 14:36:07 -0000	1.4
@@ -1,6 +1,7 @@
---- evolution-sharp-0.12.1/evolution/Makefile.am.fix-assembly-dir	2007-01-03 12:12:08.000000000 -0500
-+++ evolution-sharp-0.12.1/evolution/Makefile.am	2007-01-05 10:01:22.000000000 -0500
-@@ -74,14 +74,14 @@
+diff -up evolution-sharp-0.18.0/evolution/Makefile.am.fix-assembly-dir evolution-sharp-0.18.0/evolution/Makefile.am
+--- evolution-sharp-0.18.0/evolution/Makefile.am.fix-assembly-dir	2008-09-23 01:45:41.000000000 -0400
++++ evolution-sharp-0.18.0/evolution/Makefile.am	2008-09-25 10:32:59.000000000 -0400
+@@ -92,14 +92,14 @@ all: $(ASSEMBLY) $(TEST_TARGETS)
  
  install-data-local:
  	@if test -n '$(TARGET)'; then									\
@@ -18,4 +19,4 @@
 +	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
  	fi
  
- evolution-sharp.pub: $(top_srcdir)/evolution-sharp.pub
+ evolution-sharp.snk: $(top_srcdir)/evolution-sharp.snk


Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- evolution-sharp.spec	10 Sep 2008 19:51:53 -0000	1.56
+++ evolution-sharp.spec	25 Sep 2008 14:36:07 -0000	1.57
@@ -1,7 +1,7 @@
 ### Abstract ###
 
 Name: evolution-sharp
-Version: 0.17.5
+Version: 0.18.0
 Release: 1%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
@@ -86,6 +86,9 @@
 # sonames may need to be updated in evolution-sharp's configure.in.
 
 %changelog
+* Thu Sep 25 2008 Matthew Barnes <mbarnes at redhat.com> - 0.18.0-1.fc10
+- Update to 0.18.0
+
 * Wed Sep 10 2008 Matthew Barnes <mbarnes at redhat.com> - 0.17.5-1.fc10
 - Update to 0.17.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	10 Sep 2008 19:51:53 -0000	1.23
+++ sources	25 Sep 2008 14:36:07 -0000	1.24
@@ -1 +1 @@
-e54646198b2affc77e0c62fa96938859  evolution-sharp-0.17.5.tar.bz2
+705d355b205e147e95a30e8e431db3bf  evolution-sharp-0.18.0.tar.bz2



From mgarski at fedoraproject.org  Thu Sep 25 14:37:02 2008
From: mgarski at fedoraproject.org (Marcin Garski)
Date: Thu, 25 Sep 2008 14:37:02 +0000 (UTC)
Subject: rpms/linuxdcpp/devel linuxdcpp-1.0.2-xdg.patch, NONE,
	1.1 linuxdcpp.spec, 1.7, 1.8
Message-ID: <20080925143702.D6A677010A@cvs1.fedora.phx.redhat.com>

Author: mgarski

Update of /cvs/pkgs/rpms/linuxdcpp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15166

Modified Files:
	linuxdcpp.spec 
Added Files:
	linuxdcpp-1.0.2-xdg.patch 
Log Message:
- Use XDG Downloads directory (#460749)


linuxdcpp-1.0.2-xdg.patch:

--- NEW FILE linuxdcpp-1.0.2-xdg.patch ---
diff -ur linuxdcpp-1.0.2-orig/client/SConstruct linuxdcpp-1.0.2/client/SConstruct
--- linuxdcpp-1.0.2-orig/client/SConstruct	2008-05-04 20:55:24.000000000 +0200
+++ linuxdcpp-1.0.2/client/SConstruct	2008-09-21 22:37:32.000000000 +0200
@@ -45,7 +45,10 @@
 
 Import('env')
 
+env_client = env.Clone()
+env_client.ParseConfig('pkg-config --cflags glib-2.0')
+
 # Build the client_files
-clientObjs = env.Object(client_files)
+clientObjs = env_client.Object(client_files)
 
 Return('clientObjs')
diff -ur linuxdcpp-1.0.2-orig/client/SettingsManager.cpp linuxdcpp-1.0.2/client/SettingsManager.cpp
--- linuxdcpp-1.0.2-orig/client/SettingsManager.cpp	2008-05-04 20:55:25.000000000 +0200
+++ linuxdcpp-1.0.2/client/SettingsManager.cpp	2008-09-21 22:38:17.000000000 +0200
@@ -16,6 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <glib.h>
+
 #include "stdinc.h"
 #include "DCPlusPlus.h"
 
@@ -112,7 +114,10 @@
 		int64Settings[k] = 0;
 	}
 
-	setDefault(DOWNLOAD_DIRECTORY, Util::getConfigPath() + "Downloads" PATH_SEPARATOR_STR);
+	const char* xdgDir = g_get_user_special_dir(G_USER_DIRECTORY_DOWNLOAD);
+	const string downloadDir = xdgDir ? string(xdgDir) + PATH_SEPARATOR_STR : Util::getConfigPath() + "Downloads" PATH_SEPARATOR_STR;
+
+	setDefault(DOWNLOAD_DIRECTORY, downloadDir);
 	setDefault(TEMP_DOWNLOAD_DIRECTORY, Util::getConfigPath() + "Incomplete" PATH_SEPARATOR_STR);
 	setDefault(SLOTS, 1);
 	setDefault(TCP_PORT, 0);
diff -ur linuxdcpp-1.0.2-orig/SConstruct linuxdcpp-1.0.2/SConstruct
--- linuxdcpp-1.0.2-orig/SConstruct	2008-07-03 05:54:11.000000000 +0200
+++ linuxdcpp-1.0.2/SConstruct	2008-09-21 22:37:32.000000000 +0200
@@ -126,6 +126,11 @@
 		print '\tNote: You might have the lib but not the headers'
 		Exit(1)
 
+	if not conf.CheckPKG('glib-2.0 >= 2.14'):
+		print '\tglib >= 2.14 not found.'
+		print '\tNote: You might have the lib but not the headers'
+		Exit(1)
+
 	if not conf.CheckHeader('time.h'):
 		Exit(1)
 


Index: linuxdcpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxdcpp/devel/linuxdcpp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linuxdcpp.spec	6 Jul 2008 00:29:57 -0000	1.7
+++ linuxdcpp.spec	25 Sep 2008 14:36:32 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		linuxdcpp
 Version:	1.0.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Direct Connect client
 
 Group:		Applications/Internet
@@ -8,9 +8,10 @@
 URL:		http://linuxdcpp.berlios.de/
 Source0:	ftp://ftp.berlios.de/pub/linuxdcpp/linuxdcpp-%{version}.tar.bz2
 Source1:	%{name}.desktop
+Patch0:		linuxdcpp-1.0.2-xdg.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	scons gtk2-devel >= 2.8.0 glib2-devel >= 2.4.0 pkgconfig
+BuildRequires:	scons gtk2-devel >= 2.8.0 glib2-devel >= 2.14.0 pkgconfig
 BuildRequires:	libglade2-devel >= 2.4.0 zlib-devel bzip2-devel openssl-devel
 BuildRequires:	desktop-file-utils
 
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 CXXFLAGS="$RPM_OPT_FLAGS" scons %{?_smp_mflags} PREFIX="%{_prefix}"
@@ -58,6 +60,9 @@
 %{_datadir}/pixmaps/linuxdcpp.png
 
 %changelog
+* Thu Sep 25 2008 Marcin Garski <mgarski[AT]post.pl> 1.0.2-2
+- Use XDG Downloads directory (#460749)
+
 * Sun Jul 06 2008 Marcin Garski <mgarski[AT]post.pl> 1.0.2-1
 - Update to 1.0.2
 - Drop all patches (all upstream now)



From mcepl at fedoraproject.org  Thu Sep 25 15:23:48 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Thu, 25 Sep 2008 15:23:48 +0000 (UTC)
Subject: rpms/purple-facebookchat/devel purple-facebookchat-MC-build.patch, 
	NONE, 1.1 purple-facebookchat-Makefile, NONE,
	1.1 purple-facebookchat.spec, NONE, 1.1
Message-ID: <20080925152348.E985B7010A@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/purple-facebookchat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24877

Added Files:
	purple-facebookchat-MC-build.patch 
	purple-facebookchat-Makefile purple-facebookchat.spec 
Log Message:
Initial commit

purple-facebookchat-MC-build.patch:

--- NEW FILE purple-facebookchat-MC-build.patch ---
diff -up pidgin-facebook-1.35/libfacebook.c.RH-build pidgin-facebook-1.35/libfacebook.c
--- pidgin-facebook-1.35/libfacebook.c.RH-build	2008-09-22 21:36:56.000000000 +0200
+++ pidgin-facebook-1.35/libfacebook.c	2008-09-22 21:39:50.000000000 +0200
@@ -2591,7 +2591,7 @@ static PurplePluginProtocolInfo prpl_inf
 	NULL,                   /* unregister_user */
 	NULL,                   /* send_attention */
 	NULL,                   /* attention_types */
-	(gpointer)sizeof(PurplePluginProtocolInfo) /* struct_size */
+	sizeof(PurplePluginProtocolInfo) /* struct_size */
 };
 
 static PurplePluginInfo info = {


--- NEW FILE purple-facebookchat-Makefile ---
PREFIX=/usr
LIBDIR=$(PREFIX)/lib
ICONDIR=$(PREFIX)/share/pixmaps/pidgin/protocols

PURPLE_CFLAGS := $(shell pkg-config --cflags --libs purple)
PURPLE_CFLAGS += -DPURPLE_PLUGINS -DENABLE_NLS -fPIC -DPIC -shared $(CFLAGS)
CC=gcc

#Standard stuff here
.PHONY:	all clean install sourcepackage

all:	libfacebook.so

install: libfacebook.so
	mkdir -p $(DESTDIR)$(LIBDIR)/purple-2
	cp libfacebook.so $(DESTDIR)$(LIBDIR)/purple-2
	mkdir -p $(DESTDIR)$(ICONDIR)/{16,22,48}
	cp facebook16.png $(DESTDIR)$(ICONDIR)/16/facebook.png
	cp facebook22.png $(DESTDIR)$(ICONDIR)/22/facebook.png
	cp facebook48.png $(DESTDIR)$(ICONDIR)/48/facebook.png

clean:
	rm -f *.so *~

libfacebook.so:	libfacebook.c
	${CC} ${PURPLE_CFLAGS} -I. libfacebook.c -o libfacebook.so

sourcepackage:	libfacebook.c Makefile facebook16.png facebook22.png facebook48.png COPYING facebook.nsi
	tar --bzip2 -cf pidgin-facebookchat-source.tar.bz2 $^


--- NEW FILE purple-facebookchat.spec ---
Name:           purple-facebookchat
Version:        1.35
Release:        4%{?dist}
Summary:        Libpurple plug-in supporting facebook IM
Group:          Applications/Internet
License:        GPLv3+
URL:            http://code.google.com/p/facebook-purple/
Source0:        http://pidgin-facebookchat.googlecode.com/files/pidgin-facebookchat-source-1.35.tar.bz2
Source3:        %{name}-Makefile
Patch0:         %{name}-MC-build.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libpurple-devel

%description
This is a Facebook chat plugin for Pidgin and libpurple
messengers. It connects to the new Facebook Chat IM service
without the need for an API key.

Currently the plugin can log into the Facebook servers, grab the
buddy list, send/receive messages, add/remove friends, receive
notifications, search for Facebook friends and set your Facebook
status.

%prep
%setup -q -c
%patch0 -p1 -b .RH-build
mv Makefile Makefile.orig
install -p %{SOURCE3} Makefile

%build
export CFLAGS="$RPM_OPT_FLAGS"
make LIBDIR=%{_libdir}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
chmod 0755 $RPM_BUILD_ROOT%{_libdir}/purple-2/libfacebook.so

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/purple-2/*.so
%{_datadir}/pixmaps/pidgin/protocols/*/facebook.png

%changelog
* Wed Sep 24 2008 Matej Cepl <mcepl at redhat.com> 1.35-4
- Makefile is not compressed anymore and it shouldn't create
  source tarball anymore in all target.

* Tue Sep 23 2008 Matej Cepl <mcepl at redhat.com> 1.35-3
- Some changes from Dan Hor??k

* Mon Sep 22 2008 Mat??j Cepl <mcepl at redhat.com> 1.35-1
- Initial build.



From mclasen at fedoraproject.org  Thu Sep 25 15:12:01 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 25 Sep 2008 15:12:01 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus.spec,1.229,1.230
Message-ID: <20080925151201.5BF447010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21501

Modified Files:
	nautilus.spec 
Log Message:
save space



Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- nautilus.spec	22 Sep 2008 00:35:43 -0000	1.229
+++ nautilus.spec	25 Sep 2008 15:11:30 -0000	1.230
@@ -19,7 +19,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
 Version: 	2.24.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.24/%{name}-%{version}.tar.bz2
@@ -158,6 +158,16 @@
 export tagname=CC
 LANG=en_US make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
 
+# strip unneeded translations from .mo files
+cd po
+grep -v ".*[.]desktop[.]in.*\|.*[.]server[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+mv POTFILES.keep POTFILES.in
+intltool-update --pot
+for p in *.po; do
+  msgmerge $p nautilus.pot > $p.out
+  msgfmt -o `basename $p .po`.gmo $p.out
+done
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -264,6 +274,9 @@
 
 
 %changelog
+* Thu Sep 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-2
+- Save some space
+
 * Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
 - Update to 2.24.0
 



From tgl at fedoraproject.org  Thu Sep 25 14:51:20 2008
From: tgl at fedoraproject.org (Tom Lane)
Date: Thu, 25 Sep 2008 14:51:20 +0000 (UTC)
Subject: rpms/postgresql/F-9 .cvsignore, 1.42,
	1.43 postgresql-ac-version.patch, 
	1.2, 1.3 postgresql.spec, 1.96, 1.97 sources, 1.43, 1.44
Message-ID: <20080925145120.3996D7010A@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18184

Modified Files:
	.cvsignore postgresql-ac-version.patch postgresql.spec sources 
Log Message:
Update to PostgreSQL 8.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-9/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	11 Jun 2008 16:33:03 -0000	1.42
+++ .cvsignore	25 Sep 2008 14:50:49 -0000	1.43
@@ -1,5 +1,5 @@
-postgresql-8.3.3.tar.bz2
+postgresql-8.3.4.tar.bz2
 PyGreSQL-3.8.1.tgz
 pgtcl1.6.2.tar.gz
 pgtcldocs-20070115.zip
-postgresql-8.3.3-US.pdf
+postgresql-8.3.4-US.pdf

postgresql-ac-version.patch:

Index: postgresql-ac-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-9/postgresql-ac-version.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- postgresql-ac-version.patch	18 Jan 2008 20:48:56 -0000	1.2
+++ postgresql-ac-version.patch	25 Sep 2008 14:50:49 -0000	1.3
@@ -4,12 +4,12 @@
 Dike out the check.
 
 
-diff -Naur postgresql-8.3RC2.orig/configure.in postgresql-8.3RC2/configure.in
---- postgresql-8.3RC2.orig/configure.in	2008-01-17 23:47:32.000000000 -0500
-+++ postgresql-8.3RC2/configure.in	2008-01-18 11:39:58.000000000 -0500
+diff -Naur postgresql-8.3.4.orig/configure.in postgresql-8.3.4/configure.in
+--- postgresql-8.3.4.orig/configure.in	2008-09-18 23:04:12.000000000 -0400
++++ postgresql-8.3.4/configure.in	2008-09-25 10:26:10.000000000 -0400
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [8.3RC2], [pgsql-bugs at postgresql.org])
+ AC_INIT([PostgreSQL], [8.3.4], [pgsql-bugs at postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-9/postgresql.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- postgresql.spec	20 Jun 2008 17:27:56 -0000	1.96
+++ postgresql.spec	25 Sep 2008 14:50:49 -0000	1.97
@@ -82,8 +82,8 @@
 
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
-Version: 8.3.3
-Release: 2%{?dist}
+Version: 8.3.4
+Release: 1%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -97,7 +97,7 @@
 Source14: postgresql.pam
 Source15: postgresql-bashprofile
 Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.3-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.4-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
@@ -859,6 +859,9 @@
 %endif
 
 %changelog
+* Thu Sep 25 2008 Tom Lane <tgl at redhat.com> 8.3.4-1
+- Update to PostgreSQL 8.3.4.
+
 * Fri Jun 20 2008 Tom Lane <tgl at redhat.com> 8.3.3-2
 - Install Pgtcl in /usr/lib/tcl$TCL_VERSION, not directly in /usr/lib.
   Needed because tcl 8.5 no longer puts /usr/lib into its package search path.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-9/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	11 Jun 2008 16:33:03 -0000	1.43
+++ sources	25 Sep 2008 14:50:49 -0000	1.44
@@ -1,5 +1,5 @@
-0ae4bd9620e84d3e08dcf923808d14d0  postgresql-8.3.3.tar.bz2
+c339b9d3c0c4add64c7a76640fc93744  postgresql-8.3.4.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
 abf26e3cd7f8229f468045ed1fb7e748  pgtcl1.6.2.tar.gz
 8ce98e93b238c3329d0fe43810442c44  pgtcldocs-20070115.zip
-62043e967e738d93e6f0402ba152f6de  postgresql-8.3.3-US.pdf
+cbe2df6b07791aa5050b065c1ae2a132  postgresql-8.3.4-US.pdf



From tgl at fedoraproject.org  Thu Sep 25 14:40:44 2008
From: tgl at fedoraproject.org (Tom Lane)
Date: Thu, 25 Sep 2008 14:40:44 +0000 (UTC)
Subject: rpms/postgresql/devel .cvsignore, 1.42,
	1.43 postgresql-ac-version.patch, 1.3, 1.4 postgresql.spec,
	1.100, 1.101 sources, 1.43, 1.44
Message-ID: <20080925144044.AF5307010A@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16092

Modified Files:
	.cvsignore postgresql-ac-version.patch postgresql.spec sources 
Log Message:
Update to PostgreSQL 8.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	11 Jun 2008 16:18:40 -0000	1.42
+++ .cvsignore	25 Sep 2008 14:40:14 -0000	1.43
@@ -1,5 +1,5 @@
-postgresql-8.3.3.tar.bz2
+postgresql-8.3.4.tar.bz2
 PyGreSQL-3.8.1.tgz
 pgtcl1.6.2.tar.gz
 pgtcldocs-20070115.zip
-postgresql-8.3.3-US.pdf
+postgresql-8.3.4-US.pdf

postgresql-ac-version.patch:

Index: postgresql-ac-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql-ac-version.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- postgresql-ac-version.patch	29 Jul 2008 01:50:10 -0000	1.3
+++ postgresql-ac-version.patch	25 Sep 2008 14:40:14 -0000	1.4
@@ -4,12 +4,12 @@
 Dike out the check.
 
 
-diff -Naur postgresql-8.3.3.orig/configure.in postgresql-8.3.3/configure.in
---- postgresql-8.3.3.orig/configure.in	2008-06-08 20:38:40.000000000 -0400
-+++ postgresql-8.3.3/configure.in	2008-07-28 21:45:08.000000000 -0400
+diff -Naur postgresql-8.3.4.orig/configure.in postgresql-8.3.4/configure.in
+--- postgresql-8.3.4.orig/configure.in	2008-09-18 23:04:12.000000000 -0400
++++ postgresql-8.3.4/configure.in	2008-09-25 10:26:10.000000000 -0400
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [8.3.3], [pgsql-bugs at postgresql.org])
+ AC_INIT([PostgreSQL], [8.3.4], [pgsql-bugs at postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- postgresql.spec	29 Jul 2008 01:50:10 -0000	1.100
+++ postgresql.spec	25 Sep 2008 14:40:14 -0000	1.101
@@ -82,8 +82,8 @@
 
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
-Version: 8.3.3
-Release: 3%{?dist}
+Version: 8.3.4
+Release: 1%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -97,7 +97,7 @@
 Source14: postgresql.pam
 Source15: postgresql-bashprofile
 Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.3-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.4-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
@@ -859,6 +859,9 @@
 %endif
 
 %changelog
+* Thu Sep 25 2008 Tom Lane <tgl at redhat.com> 8.3.4-1
+- Update to PostgreSQL 8.3.4.
+
 * Mon Jul 28 2008 Tom Lane <tgl at redhat.com> 8.3.3-3
 - Fix build failure caused by new default patch fuzz = 0 policy in rawhide.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	11 Jun 2008 16:18:40 -0000	1.43
+++ sources	25 Sep 2008 14:40:14 -0000	1.44
@@ -1,5 +1,5 @@
-0ae4bd9620e84d3e08dcf923808d14d0  postgresql-8.3.3.tar.bz2
+c339b9d3c0c4add64c7a76640fc93744  postgresql-8.3.4.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
 abf26e3cd7f8229f468045ed1fb7e748  pgtcl1.6.2.tar.gz
 8ce98e93b238c3329d0fe43810442c44  pgtcldocs-20070115.zip
-62043e967e738d93e6f0402ba152f6de  postgresql-8.3.3-US.pdf
+cbe2df6b07791aa5050b065c1ae2a132  postgresql-8.3.4-US.pdf



From rdieter at fedoraproject.org  Thu Sep 25 14:50:42 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 25 Sep 2008 14:50:42 +0000 (UTC)
Subject: rpms/libdvdread/EL-5 .cvsignore, 1.2, 1.3 libdvdread.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20080925145042.6CA137010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libdvdread/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18031

Modified Files:
	.cvsignore libdvdread.spec sources 
Log Message:
* Tue Sep 09 2008 Dominik Mierzejewski <rpm at greysector.net> 4.1.3-1
- update to 4.1.3 final



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Nov 2006 22:22:27 -0000	1.2
+++ .cvsignore	25 Sep 2008 14:50:12 -0000	1.3
@@ -1 +1 @@
-libdvdread-0.9.7.tar.gz
+libdvdread-4.1.3.tar.bz2


Index: libdvdread.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/EL-5/libdvdread.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libdvdread.spec	29 Nov 2006 21:33:17 -0000	1.2
+++ libdvdread.spec	25 Sep 2008 14:50:12 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           libdvdread
-Version:        0.9.7
-Release:        2%{?dist}
-Summary:        Simple foundation for reading DVD video disks
+Version:        4.1.3
+Release:        1%{?dist}
+Summary:        A library for reading DVD video discs based on Ogle code
 
 Group:          System Environment/Libraries
-License:        GPL
-URL:            http://www.dtek.chalmers.se/groups/dvd/
-Source0:        http://www.dtek.chalmers.se/groups/dvd/dist/%{name}-%{version}.tar.gz
+License:        GPLv2+
+Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdread-%{version}.tar.bz2
+# svn export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread
+#Source:         %{name}-4.1.3rc1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -17,6 +18,7 @@
 Summary:        Development files for libdvdread
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 
 %description    devel
 libdvdread provides a simple foundation for reading DVD video disks.
@@ -24,46 +26,61 @@
 
 This package contains development files for libdvdread.
 
-
 %prep
 %setup -q
-for f in AUTHORS NEWS ; do
-    iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-done
-
 
 %build
-%configure --disable-dependency-tracking --disable-static --without-libdvdcss
-make %{?_smp_mflags}
+./configure2 \
+ --disable-opts \
+ --disable-static \
+ --disable-strip \
+ --extra-cflags="%{optflags}" \
+ --libdir=%{_libdir} \
+ --prefix=%{_prefix} \
+ --shlibdir=%{_libdir} \
 
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
 
+%clean
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README TODO
-%{_libdir}/libdvdread.so.*
+%{_libdir}/libdvdread.so.4
 
 %files devel
 %defattr(-,root,root,-)
+%{_bindir}/dvdread-config
 %{_includedir}/dvdread
 %{_libdir}/libdvdread.so
-
+%{_libdir}/pkgconfig/dvdread.pc
 
 %changelog
+* Tue Sep 09 2008 Dominik Mierzejewski <rpm at greysector.net> 4.1.3-1
+- update to 4.1.3 final
+
+* Sun Aug 31 2008 Dominik Mierzejewski <rpm at greysector.net> 4.1.3-0.3.rc1
+- update to 4.1.3rc1
+- fix include path
+
+* Thu Jul 17 2008 Dominik Mierzejewski <rpm at greysector.net> 4.1.3-0.2
+- resurrect package from new upstream
+
+* Sun Jan 27 2008 Dominik Mierzejewski <rpm at greysector.net> 0.9.7-4
+- fix missing <inttypes.h> include (bug 428910)
+
+* Wed Aug 29 2007 Dominik Mierzejewski <rpm at greysector.net> 0.9.7-3
+- rebuild for BuildID
+- update license tag
+
 * Wed Nov 26 2006 Dominik Mierzejewski <rpm at greysector.net> 0.9.7-2
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Nov 2006 22:22:27 -0000	1.2
+++ sources	25 Sep 2008 14:50:12 -0000	1.3
@@ -1 +1 @@
-078788c9241ae16763529e1235502337  libdvdread-0.9.7.tar.gz
+6dc068d442c85a3cdd5ad3da75f6c6e8  libdvdread-4.1.3.tar.bz2



From mcepl at fedoraproject.org  Thu Sep 25 15:47:49 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Thu, 25 Sep 2008 15:47:49 +0000 (UTC)
Subject: rpms/purple-facebookchat/F-9 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20080925154749.5CDBB7010A@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/purple-facebookchat/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30817

Modified Files:
	.cvsignore sources 
Log Message:
Initial commit


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2008 06:07:27 -0000	1.1
+++ .cvsignore	25 Sep 2008 15:47:18 -0000	1.2
@@ -0,0 +1 @@
+pidgin-facebookchat-source-1.35.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2008 06:07:27 -0000	1.1
+++ sources	25 Sep 2008 15:47:18 -0000	1.2
@@ -0,0 +1 @@
+80d8e91a094e67377cd816c5af8fcdec  pidgin-facebookchat-source-1.35.tar.bz2



From mclasen at fedoraproject.org  Thu Sep 25 15:49:30 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 25 Sep 2008 15:49:30 +0000 (UTC)
Subject: rpms/metacity/devel metacity.spec,1.165,1.166
Message-ID: <20080925154930.9C7837010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31132

Modified Files:
	metacity.spec 
Log Message:
save space



Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- metacity.spec	22 Sep 2008 18:44:54 -0000	1.165
+++ metacity.spec	25 Sep 2008 15:49:00 -0000	1.166
@@ -1,7 +1,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.24/metacity-%{version}.tar.bz2
 Patch0: default-theme.patch
@@ -96,6 +96,17 @@
 
 make CPPFLAGS="$CPPFLAGS" LIBS="$LIBS"
 
+# strip unneeded translations from .mo files
+cd po
+grep -v ".*[.]desktop[.]in$\|.*[.]server[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+mv POTFILES.keep POTFILES.in
+intltool-update --pot
+for p in *.po; do
+  msgmerge $p metacity.pot > $p.out
+  msgfmt -o `basename $p .po`.gmo $p.out
+done
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -161,6 +172,9 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Thu Sep 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-2
+- Save some space
+
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
 - Update to 2.24.0
 



From mcepl at fedoraproject.org  Thu Sep 25 15:50:21 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Thu, 25 Sep 2008 15:50:21 +0000 (UTC)
Subject: rpms/purple-facebookchat/F-9 purple-facebookchat-MC-build.patch,
	NONE, 1.1 purple-facebookchat-Makefile, NONE,
	1.1 purple-facebookchat.spec, NONE, 1.1
Message-ID: <20080925155021.2E4357010A@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/purple-facebookchat/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31570

Added Files:
	purple-facebookchat-MC-build.patch 
	purple-facebookchat-Makefile purple-facebookchat.spec 
Log Message:
Initial commit -- forgot purple*

purple-facebookchat-MC-build.patch:

--- NEW FILE purple-facebookchat-MC-build.patch ---
diff -up pidgin-facebook-1.35/libfacebook.c.RH-build pidgin-facebook-1.35/libfacebook.c
--- pidgin-facebook-1.35/libfacebook.c.RH-build	2008-09-22 21:36:56.000000000 +0200
+++ pidgin-facebook-1.35/libfacebook.c	2008-09-22 21:39:50.000000000 +0200
@@ -2591,7 +2591,7 @@ static PurplePluginProtocolInfo prpl_inf
 	NULL,                   /* unregister_user */
 	NULL,                   /* send_attention */
 	NULL,                   /* attention_types */
-	(gpointer)sizeof(PurplePluginProtocolInfo) /* struct_size */
+	sizeof(PurplePluginProtocolInfo) /* struct_size */
 };
 
 static PurplePluginInfo info = {


--- NEW FILE purple-facebookchat-Makefile ---
PREFIX=/usr
LIBDIR=$(PREFIX)/lib
ICONDIR=$(PREFIX)/share/pixmaps/pidgin/protocols

PURPLE_CFLAGS := $(shell pkg-config --cflags --libs purple)
PURPLE_CFLAGS += -DPURPLE_PLUGINS -DENABLE_NLS -fPIC -DPIC -shared $(CFLAGS)
CC=gcc

#Standard stuff here
.PHONY:	all clean install sourcepackage

all:	libfacebook.so

install: libfacebook.so
	mkdir -p $(DESTDIR)$(LIBDIR)/purple-2
	cp libfacebook.so $(DESTDIR)$(LIBDIR)/purple-2
	mkdir -p $(DESTDIR)$(ICONDIR)/{16,22,48}
	cp facebook16.png $(DESTDIR)$(ICONDIR)/16/facebook.png
	cp facebook22.png $(DESTDIR)$(ICONDIR)/22/facebook.png
	cp facebook48.png $(DESTDIR)$(ICONDIR)/48/facebook.png

clean:
	rm -f *.so *~

libfacebook.so:	libfacebook.c
	${CC} ${PURPLE_CFLAGS} -I. libfacebook.c -o libfacebook.so

sourcepackage:	libfacebook.c Makefile facebook16.png facebook22.png facebook48.png COPYING facebook.nsi
	tar --bzip2 -cf pidgin-facebookchat-source.tar.bz2 $^


--- NEW FILE purple-facebookchat.spec ---
Name:           purple-facebookchat
Version:        1.35
Release:        4%{?dist}
Summary:        Libpurple plug-in supporting facebook IM
Group:          Applications/Internet
License:        GPLv3+
URL:            http://code.google.com/p/facebook-purple/
Source0:        http://pidgin-facebookchat.googlecode.com/files/pidgin-facebookchat-source-1.35.tar.bz2
Source3:        %{name}-Makefile
Patch0:         %{name}-MC-build.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libpurple-devel

%description
This is a Facebook chat plugin for Pidgin and libpurple
messengers. It connects to the new Facebook Chat IM service
without the need for an API key.

Currently the plugin can log into the Facebook servers, grab the
buddy list, send/receive messages, add/remove friends, receive
notifications, search for Facebook friends and set your Facebook
status.

%prep
%setup -q -c
%patch0 -p1 -b .RH-build
mv Makefile Makefile.orig
install -p %{SOURCE3} Makefile

%build
export CFLAGS="$RPM_OPT_FLAGS"
make LIBDIR=%{_libdir}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
chmod 0755 $RPM_BUILD_ROOT%{_libdir}/purple-2/libfacebook.so

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/purple-2/*.so
%{_datadir}/pixmaps/pidgin/protocols/*/facebook.png

%changelog
* Wed Sep 24 2008 Matej Cepl <mcepl at redhat.com> 1.35-4
- Makefile is not compressed anymore and it shouldn't create
  source tarball anymore in all target.

* Tue Sep 23 2008 Matej Cepl <mcepl at redhat.com> 1.35-3
- Some changes from Dan Hor??k

* Mon Sep 22 2008 Mat??j Cepl <mcepl at redhat.com> 1.35-1
- Initial build.



From caillon at fedoraproject.org  Thu Sep 25 15:53:09 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Thu, 25 Sep 2008 15:53:09 +0000 (UTC)
Subject: rpms/seamonkey/F-8 .cvsignore, 1.20, 1.21 seamonkey.spec, 1.35,
	1.36 sources, 1.22, 1.23
Message-ID: <20080925155309.DC37F7010A@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/seamonkey/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32290

Modified Files:
	.cvsignore seamonkey.spec sources 
Log Message:
* Thu Sep 25 2008 Christopher Aillon <caillon at redhat.com> - 1.1.12-1
- Update to 1.1.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/F-8/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	16 Jul 2008 17:12:52 -0000	1.20
+++ .cvsignore	25 Sep 2008 15:52:39 -0000	1.21
@@ -1 +1 @@
-seamonkey-1.1.11.source.tar.bz2
+seamonkey-1.1.12.source.tar.bz2


Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/F-8/seamonkey.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- seamonkey.spec	16 Jul 2008 17:12:52 -0000	1.35
+++ seamonkey.spec	25 Sep 2008 15:52:39 -0000	1.36
@@ -10,7 +10,7 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        1.1.11
+Version:        1.1.12
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
@@ -433,6 +433,9 @@
 
 
 %changelog
+* Thu Sep 25 2008 Christopher Aillon <caillon at redhat.com> - 1.1.12-1
+- Update to 1.1.12
+
 * Tue Jul 15 2008 Christopher Aillon <caillon at redhat.com> - 1.1.11-1
 - Update to 1.1.11
 * Tue Jul 08 2008 Christopher Aillon <caillon at redhat.com> - 1.1.10-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/F-8/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	16 Jul 2008 17:12:52 -0000	1.22
+++ sources	25 Sep 2008 15:52:39 -0000	1.23
@@ -1 +1 @@
-a1bde0923cb1eaef48e61c67676ad18f  seamonkey-1.1.11.source.tar.bz2
+95c09bd1a3d10791d482f284473253f3  seamonkey-1.1.12.source.tar.bz2



From caillon at fedoraproject.org  Thu Sep 25 15:54:14 2008
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Thu, 25 Sep 2008 15:54:14 +0000 (UTC)
Subject: rpms/seamonkey/F-9 .cvsignore, 1.20, 1.21 seamonkey.spec, 1.46,
	1.47 sources, 1.21, 1.22
Message-ID: <20080925155414.148847010A@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/seamonkey/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32658

Modified Files:
	.cvsignore seamonkey.spec sources 
Log Message:
* Thu Sep 25 2008 Christopher Aillon <caillon at redhat.com> - 1.1.12-1
- Update to 1.1.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/F-9/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	16 Jul 2008 17:14:01 -0000	1.20
+++ .cvsignore	25 Sep 2008 15:53:43 -0000	1.21
@@ -1 +1 @@
-seamonkey-1.1.11.source.tar.bz2
+seamonkey-1.1.12.source.tar.bz2


Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/F-9/seamonkey.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- seamonkey.spec	16 Jul 2008 17:14:01 -0000	1.46
+++ seamonkey.spec	25 Sep 2008 15:53:43 -0000	1.47
@@ -11,7 +11,7 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        1.1.11
+Version:        1.1.12
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
@@ -433,6 +433,9 @@
 
 
 %changelog
+* Thu Sep 25 2008 Christopher Aillon <caillon at redhat.com> - 1.1.12-1
+- Update to 1.1.12
+
 * Tue Jul 15 2008 Christopher Aillon <caillon at redhat.com> - 1.1.11-1
 - Update to 1.1.11
 * Sat Jul  6 2008 Christopher Aillon <caillon at redhat.com> - 1.1.10-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/F-9/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	16 Jul 2008 17:14:01 -0000	1.21
+++ sources	25 Sep 2008 15:53:43 -0000	1.22
@@ -1 +1 @@
-a1bde0923cb1eaef48e61c67676ad18f  seamonkey-1.1.11.source.tar.bz2
+95c09bd1a3d10791d482f284473253f3  seamonkey-1.1.12.source.tar.bz2



From mbarnes at fedoraproject.org  Thu Sep 25 15:56:55 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 25 Sep 2008 15:56:55 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.355,1.356
Message-ID: <20080925155655.9AF5D7010A@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv641

Modified Files:
	evolution.spec 
Log Message:

* Thu Sep 25 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.0-2.fc10
- Strip unneeded translations from .mo files (RH bug #463887).
- Split Perl-based utilities into a "perl" subpackage (RH bug #462345).



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- evolution.spec	22 Sep 2008 11:18:23 -0000	1.355
+++ evolution.spec	25 Sep 2008 15:56:25 -0000	1.356
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and GFDL
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -216,6 +216,14 @@
 %description spamassassin
 This package contains the plugin to filter junk mail using SpamAssassin.
 
+%package perl
+Group: Applications/Productivity
+Summary: Supplemental utilities that require Perl
+Requires: %{name} = %{version}-%{release}
+
+%description perl
+This package contains supplemental utilities for %{name} that require Perl.
+
 %prep
 %setup -q -n evolution-%{version}
 %patch10 -p1 -b .ldaphack
@@ -308,15 +316,28 @@
 %endif
 
 %configure \
-  --enable-gtk-doc \
-  --enable-ipv6 \
-  --with-sub-version=" (%{version}-%{release})" \
-  --with-kde-applnk-path=no \
-  %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags %exchange_flags \
-  --enable-plugins=all
+	--enable-gtk-doc \
+	--enable-ipv6 \
+	--with-sub-version=" (%{version}-%{release})" \
+	--with-kde-applnk-path=no \
+	%ldap_flags %pilot_flags %krb5_flags \
+	%nntp_flags %ssl_flags %exchange_flags \
+	--enable-plugins=all
 export tagname=CC
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED -fno-strict-aliasing"
 
+# Strip unneeded translations from .mo files.
+# This reduces the RPM size by several megabytes.
+cd po
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+mv POTFILES.keep POTFILES.in
+intltool-update --pot
+for p in *.po; do
+	msgmerge $p evolution-%{evo_major}.pot > $p.out
+	msgfmt -o `basename $p .po`.gmo $p.out
+done
+cd -
+
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
@@ -458,8 +479,6 @@
 # Various libexec programs:
 %dir %{_libexecdir}/evolution
 %dir %{_libexecdir}/evolution/%{evo_major}
-%{_libexecdir}/evolution/%{evo_major}/csv2vcard
-%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export
 %{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify
 %{_libexecdir}/evolution/%{evo_major}/evolution-backup
@@ -651,7 +670,18 @@
 %{evo_plugin_dir}/org-gnome-sa-junk-plugin.eplug
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
+%files perl
+%defattr(-, root, root)
+%dir %{_libexecdir}/evolution
+%dir %{_libexecdir}/evolution/%{evo_major}
+%{_libexecdir}/evolution/%{evo_major}/csv2vcard
+%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
+
 %changelog
+* Thu Sep 25 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.0-2.fc10
+- Strip unneeded translations from .mo files (RH bug #463887).
+- Split Perl-based utilities into a "perl" subpackage (RH bug #462345).
+
 * Mon Sep 22 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.0-1.fc10
 - Update to 2.24.0
 



From mclasen at fedoraproject.org  Thu Sep 25 15:29:05 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 25 Sep 2008 15:29:05 +0000 (UTC)
Subject: rpms/gnome-terminal/devel gnome-terminal.spec,1.105,1.106
Message-ID: <20080925152905.2E4BD7010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25962

Modified Files:
	gnome-terminal.spec 
Log Message:
Save some space



Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- gnome-terminal.spec	22 Sep 2008 15:43:09 -0000	1.105
+++ gnome-terminal.spec	25 Sep 2008 15:28:34 -0000	1.106
@@ -11,7 +11,7 @@
 Summary: GNOME Terminal
 Name: gnome-terminal
 Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org/
 Source0: http://download.gnome.org/sources/gnome-terminal/2.24/gnome-terminal-%{version}.tar.bz2
 # Fix gnome.org Bug 338913 ??? Terminal resized when switching tabs
@@ -61,6 +61,16 @@
 %configure --with-widget=vte --disable-scrollkeeper
 make %{?_smp_mflags}
 
+# strip unneeded translations from .mo files
+cd po
+grep -v ".*[.]desktop[.]in.*\|.*[.]server[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+mv POTFILES.keep POTFILES.in
+intltool-update --pot
+for p in *.po; do
+  msgmerge $p %{gettext_package}.pot > $p.out
+  msgfmt -o `basename $p .po`.gmo $p.out
+done
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -121,6 +131,9 @@
 %{_libdir}/bonobo/servers/gnome-terminal.server
 
 %changelog
+* Thu Sep 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-2
+- Save some space
+
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
 - Update to 2.24.0
 



From mcepl at fedoraproject.org  Thu Sep 25 15:43:07 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Thu, 25 Sep 2008 15:43:07 +0000 (UTC)
Subject: rpms/purple-facebookchat/F-8 import.log, NONE,
	1.1 purple-facebookchat-MC-build.patch, NONE,
	1.1 purple-facebookchat-Makefile, NONE,
	1.1 purple-facebookchat.spec, NONE, 1.1
Message-ID: <20080925154307.F362D7010A@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/purple-facebookchat/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29606/F-8

Added Files:
	import.log purple-facebookchat-MC-build.patch 
	purple-facebookchat-Makefile purple-facebookchat.spec 
Log Message:
Once more initial commit.



--- NEW FILE import.log ---
purple-facebookchat-1_35-4_fc10:F-8:purple-facebookchat-1.35-4.fc10.src.rpm:1222357312

purple-facebookchat-MC-build.patch:

--- NEW FILE purple-facebookchat-MC-build.patch ---
diff -up pidgin-facebook-1.35/libfacebook.c.RH-build pidgin-facebook-1.35/libfacebook.c
--- pidgin-facebook-1.35/libfacebook.c.RH-build	2008-09-22 21:36:56.000000000 +0200
+++ pidgin-facebook-1.35/libfacebook.c	2008-09-22 21:39:50.000000000 +0200
@@ -2591,7 +2591,7 @@ static PurplePluginProtocolInfo prpl_inf
 	NULL,                   /* unregister_user */
 	NULL,                   /* send_attention */
 	NULL,                   /* attention_types */
-	(gpointer)sizeof(PurplePluginProtocolInfo) /* struct_size */
+	sizeof(PurplePluginProtocolInfo) /* struct_size */
 };
 
 static PurplePluginInfo info = {


--- NEW FILE purple-facebookchat-Makefile ---
PREFIX=/usr
LIBDIR=$(PREFIX)/lib
ICONDIR=$(PREFIX)/share/pixmaps/pidgin/protocols

PURPLE_CFLAGS := $(shell pkg-config --cflags --libs purple)
PURPLE_CFLAGS += -DPURPLE_PLUGINS -DENABLE_NLS -fPIC -DPIC -shared $(CFLAGS)
CC=gcc

#Standard stuff here
.PHONY:	all clean install sourcepackage

all:	libfacebook.so

install: libfacebook.so
	mkdir -p $(DESTDIR)$(LIBDIR)/purple-2
	cp libfacebook.so $(DESTDIR)$(LIBDIR)/purple-2
	mkdir -p $(DESTDIR)$(ICONDIR)/{16,22,48}
	cp facebook16.png $(DESTDIR)$(ICONDIR)/16/facebook.png
	cp facebook22.png $(DESTDIR)$(ICONDIR)/22/facebook.png
	cp facebook48.png $(DESTDIR)$(ICONDIR)/48/facebook.png

clean:
	rm -f *.so *~

libfacebook.so:	libfacebook.c
	${CC} ${PURPLE_CFLAGS} -I. libfacebook.c -o libfacebook.so

sourcepackage:	libfacebook.c Makefile facebook16.png facebook22.png facebook48.png COPYING facebook.nsi
	tar --bzip2 -cf pidgin-facebookchat-source.tar.bz2 $^


--- NEW FILE purple-facebookchat.spec ---
Name:           purple-facebookchat
Version:        1.35
Release:        4%{?dist}
Summary:        Libpurple plug-in supporting facebook IM
Group:          Applications/Internet
License:        GPLv3+
URL:            http://code.google.com/p/facebook-purple/
Source0:        http://pidgin-facebookchat.googlecode.com/files/pidgin-facebookchat-source-1.35.tar.bz2
Source3:        %{name}-Makefile
Patch0:         %{name}-MC-build.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libpurple-devel

%description
This is a Facebook chat plugin for Pidgin and libpurple
messengers. It connects to the new Facebook Chat IM service
without the need for an API key.

Currently the plugin can log into the Facebook servers, grab the
buddy list, send/receive messages, add/remove friends, receive
notifications, search for Facebook friends and set your Facebook
status.

%prep
%setup -q -c
%patch0 -p1 -b .RH-build
mv Makefile Makefile.orig
install -p %{SOURCE3} Makefile

%build
export CFLAGS="$RPM_OPT_FLAGS"
make LIBDIR=%{_libdir}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
chmod 0755 $RPM_BUILD_ROOT%{_libdir}/purple-2/libfacebook.so

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/purple-2/*.so
%{_datadir}/pixmaps/pidgin/protocols/*/facebook.png

%changelog
* Wed Sep 24 2008 Matej Cepl <mcepl at redhat.com> 1.35-4
- Makefile is not compressed anymore and it shouldn't create
  source tarball anymore in all target.

* Tue Sep 23 2008 Matej Cepl <mcepl at redhat.com> 1.35-3
- Some changes from Dan Hor??k

* Mon Sep 22 2008 Mat??j Cepl <mcepl at redhat.com> 1.35-1
- Initial build.



From mcepl at fedoraproject.org  Thu Sep 25 15:39:00 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Thu, 25 Sep 2008 15:39:00 +0000 (UTC)
Subject: rpms/purple-facebookchat/F-8 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20080925153900.B41617010A@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/purple-facebookchat/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28284

Modified Files:
	.cvsignore sources 
Log Message:
Initial commit


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2008 06:07:27 -0000	1.1
+++ .cvsignore	25 Sep 2008 15:38:30 -0000	1.2
@@ -0,0 +1 @@
+pidgin-facebookchat-source-1.35.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2008 06:07:27 -0000	1.1
+++ sources	25 Sep 2008 15:38:30 -0000	1.2
@@ -0,0 +1 @@
+80d8e91a094e67377cd816c5af8fcdec  pidgin-facebookchat-source-1.35.tar.bz2



From mcepl at fedoraproject.org  Thu Sep 25 15:29:57 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Thu, 25 Sep 2008 15:29:57 +0000 (UTC)
Subject: rpms/purple-facebookchat/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20080925152957.37E437013D@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/purple-facebookchat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26262

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2008 06:07:27 -0000	1.1
+++ .cvsignore	25 Sep 2008 15:29:26 -0000	1.2
@@ -0,0 +1 @@
+pidgin-facebookchat-source-1.35.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2008 06:07:27 -0000	1.1
+++ sources	25 Sep 2008 15:29:26 -0000	1.2
@@ -0,0 +1 @@
+80d8e91a094e67377cd816c5af8fcdec  pidgin-facebookchat-source-1.35.tar.bz2



From tgl at fedoraproject.org  Thu Sep 25 16:09:41 2008
From: tgl at fedoraproject.org (Tom Lane)
Date: Thu, 25 Sep 2008 16:09:41 +0000 (UTC)
Subject: rpms/postgresql/F-8 .cvsignore, 1.40,
	1.41 postgresql-ac-version.patch, 
	1.1, 1.2 postgresql.spec, 1.88, 1.89 sources, 1.41, 1.42
Message-ID: <20080925160942.069D47010A@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3684

Modified Files:
	.cvsignore postgresql-ac-version.patch postgresql.spec sources 
Log Message:
Update to PostgreSQL 8.2.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-8/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	11 Jun 2008 17:01:25 -0000	1.40
+++ .cvsignore	25 Sep 2008 16:09:11 -0000	1.41
@@ -1,4 +1,4 @@
-postgresql-8.2.9.tar.bz2
+postgresql-8.2.10.tar.bz2
 PyGreSQL-3.8.1.tgz
 pgtcl1.6.0.tar.gz
 pgtcldocs-20070115.zip

postgresql-ac-version.patch:

Index: postgresql-ac-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-8/postgresql-ac-version.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postgresql-ac-version.patch	7 Jan 2008 19:15:27 -0000	1.1
+++ postgresql-ac-version.patch	25 Sep 2008 16:09:11 -0000	1.2
@@ -4,12 +4,12 @@
 Dike out the check.
 
 
-diff -Naur postgresql-8.2.6.orig/configure.in postgresql-8.2.6/configure.in
---- postgresql-8.2.6.orig/configure.in	2008-01-03 16:40:50.000000000 -0500
-+++ postgresql-8.2.6/configure.in	2008-01-04 11:25:42.000000000 -0500
+diff -Naur postgresql-8.2.10.orig/configure.in postgresql-8.2.10/configure.in
+--- postgresql-8.2.10.orig/configure.in	2008-01-03 16:40:50.000000000 -0500
++++ postgresql-8.2.10/configure.in	2008-01-04 11:25:42.000000000 -0500
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [8.2.6], [pgsql-bugs at postgresql.org])
+ AC_INIT([PostgreSQL], [8.2.10], [pgsql-bugs at postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-8/postgresql.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- postgresql.spec	11 Jun 2008 17:01:25 -0000	1.88
+++ postgresql.spec	25 Sep 2008 16:09:11 -0000	1.89
@@ -80,7 +80,7 @@
 
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
-Version: 8.2.9
+Version: 8.2.10
 Release: 1%{?dist}
 License: BSD
 Group: Applications/Databases
@@ -818,6 +818,9 @@
 %endif
 
 %changelog
+* Thu Sep 25 2008 Tom Lane <tgl at redhat.com> 8.2.10-1
+- Update to PostgreSQL 8.2.10
+
 * Wed Jun 11 2008 Tom Lane <tgl at redhat.com> 8.2.9-1
 - Update to PostgreSQL 8.2.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-8/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	11 Jun 2008 17:01:25 -0000	1.41
+++ sources	25 Sep 2008 16:09:11 -0000	1.42
@@ -1,4 +1,4 @@
-579506cf91881f6ede67e3be98a47c37  postgresql-8.2.9.tar.bz2
+dd054a111bd76938a96a81b029d3e527  postgresql-8.2.10.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
 25eda4bb40fb3d4ec9b205a1fdc1bbbc  pgtcl1.6.0.tar.gz
 8ce98e93b238c3329d0fe43810442c44  pgtcldocs-20070115.zip



From mclasen at fedoraproject.org  Thu Sep 25 16:11:54 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 25 Sep 2008 16:11:54 +0000 (UTC)
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec, 1.127,
	1.128
Message-ID: <20080925161154.A1ED57010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4071

Modified Files:
	gnome-power-manager.spec 
Log Message:
Save some space



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- gnome-power-manager.spec	23 Sep 2008 00:47:23 -0000	1.127
+++ gnome-power-manager.spec	25 Sep 2008 16:11:24 -0000	1.128
@@ -5,7 +5,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.24.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.24/gnome-power-manager-%{version}.tar.bz2
@@ -58,6 +58,19 @@
         --disable-policykit
 make
 
+# strip unneeded translations from .mo files
+# ideally intltool (ha!) would do that for us
+# http://bugzilla.gnome.org/show_bug.cgi?id=474987
+cd po
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+mv POTFILES.keep POTFILES.in
+intltool-update --pot
+for p in *.po; do
+  msgmerge $p %{name}.pot > $p.out
+  msgfmt -o `basename $p .po`.gmo $p.out
+done
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
@@ -124,6 +137,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Thu Sep 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-3
+- Save some space
+
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-2
 - Update to 2.24.0
 



From mclasen at fedoraproject.org  Thu Sep 25 16:19:00 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 25 Sep 2008 16:19:00 +0000 (UTC)
Subject: rpms/gdm/devel gdm.spec,1.423,1.424
Message-ID: <20080925161900.73CEE7010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6134

Modified Files:
	gdm.spec 
Log Message:
require gnome-session



Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -r1.423 -r1.424
--- gdm.spec	23 Sep 2008 18:56:36 -0000	1.423
+++ gdm.spec	25 Sep 2008 16:18:30 -0000	1.424
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.24.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -43,6 +43,7 @@
 Requires: PolicyKit-gnome >= %{polkit_version}
 Requires: gnome-settings-daemon >= 2.21.92
 Requires: iso-codes
+Requires: gnome-session
 # since we use it, and pam spams the log if the module is missing
 Requires: gnome-keyring-pam
 Requires: plymouth-gdm-hooks
@@ -324,6 +325,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Thu Sep 25 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-5
+- Require gnome-session
+
 * Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-4
 - Let /var/lib/gdm be owned by gdm, to make pulseaudio happy
 



From davidz at fedoraproject.org  Thu Sep 25 16:19:36 2008
From: davidz at fedoraproject.org (David Zeuthen)
Date: Thu, 25 Sep 2008 16:19:36 +0000 (UTC)
Subject: rpms/dbus/devel dbus.spec,1.150,1.151
Message-ID: <20080925161936.6D6827010A@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/dbus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6410

Modified Files:
	dbus.spec 
Log Message:
* Thu Sep 25 2008 David Zeuthen <davidz at redhat.com> - 1.2.3-2%{?dist}
- Avoid using noreplace for files that aren't really config files




Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- dbus.spec	6 Aug 2008 20:24:23 -0000	1.150
+++ dbus.spec	25 Sep 2008 16:19:06 -0000	1.151
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
@@ -175,7 +175,7 @@
 %doc COPYING
 
 %dir %{_sysconfdir}/dbus-1
-%config(noreplace) %{_sysconfdir}/dbus-1/*.conf
+%config %{_sysconfdir}/dbus-1/*.conf
 %{_sysconfdir}/rc.d/init.d/*
 %dir %{_sysconfdir}/dbus-1/system.d
 %dir %{_sysconfdir}/dbus-1/session.d
@@ -227,6 +227,9 @@
 %{_includedir}/*
 
 %changelog
+* Thu Sep 25 2008 David Zeuthen <davidz at redhat.com> - 1.2.3-2%{?dist}
+- Avoid using noreplace for files that aren't really config files
+
 * Wed Aug 06 2008 Colin Walters <walters at redhat.com> - 1.2.3-1
 - New upstream 1.2.2
 - Drop patches that were upstreamed



From mclasen at fedoraproject.org  Thu Sep 25 16:38:40 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 25 Sep 2008 16:38:40 +0000 (UTC)
Subject: rpms/gok/devel gok.spec,1.61,1.62
Message-ID: <20080925163840.6BABA7010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10463

Modified Files:
	gok.spec 
Log Message:
save some space



Index: gok.spec
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/gok.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- gok.spec	23 Sep 2008 15:00:00 -0000	1.61
+++ gok.spec	25 Sep 2008 16:38:10 -0000	1.62
@@ -3,7 +3,7 @@
 Summary: GNOME Onscreen Keyboard
 Name: gok
 Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
 URL: http://www.gok.ca/
@@ -68,6 +68,19 @@
 %configure
 make
 
+# strip unneeded translations from .mo files
+# ideally intltool (ha!) would do that for us
+# http://bugzilla.gnome.org/show_bug.cgi?id=474987
+cd po
+grep -v ".*[.]desktop[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+mv POTFILES.keep POTFILES.in
+intltool-update --pot
+for p in *.po; do
+  msgmerge $p %{name}.pot > $p.out
+  msgfmt -o `basename $p .po`.gmo $p.out
+done
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -123,6 +136,9 @@
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Thu Sep 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-2
+- Save some space
+
 * Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
 - Update to 2.24.0
 



From davidz at fedoraproject.org  Thu Sep 25 16:21:08 2008
From: davidz at fedoraproject.org (David Zeuthen)
Date: Thu, 25 Sep 2008 16:21:08 +0000 (UTC)
Subject: rpms/dbus/F-9 dbus.spec,1.144,1.145
Message-ID: <20080925162108.306B27010A@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/dbus/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7005

Modified Files:
	dbus.spec 
Log Message:
* Thu Sep 25 2008 David Zeuthen <davidz at redhat.com> - 1.2.1-3%{?dist}
- Avoid using noreplace for files that aren't really config files




Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/F-9/dbus.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- dbus.spec	5 May 2008 18:36:23 -0000	1.144
+++ dbus.spec	25 Sep 2008 16:20:38 -0000	1.145
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
@@ -172,7 +172,7 @@
 %doc COPYING ChangeLog NEWS
 
 %dir %{_sysconfdir}/dbus-1
-%config(noreplace) %{_sysconfdir}/dbus-1/*.conf
+%config %{_sysconfdir}/dbus-1/*.conf
 %{_sysconfdir}/rc.d/init.d/*
 %dir %{_sysconfdir}/dbus-1/system.d
 %dir %{_sysconfdir}/dbus-1/session.d
@@ -223,6 +223,9 @@
 %{_includedir}/*
 
 %changelog
+* Thu Sep 25 2008 David Zeuthen <davidz at redhat.com> - 1.2.1-3%{?dist}
+- Avoid using noreplace for files that aren't really config files
+
 * Fri May 05 2008 John (J5) Palmieri <johnp at redhat.com> - 1.2.1-2
 - patch to enable dbus userdb caching as was the default in 1.0.x
 - previous upstream commit had accidentally disabled it because



From mclasen at fedoraproject.org  Thu Sep 25 16:22:10 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 25 Sep 2008 16:22:10 +0000 (UTC)
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec, 1.128,
	1.129
Message-ID: <20080925162210.041ED7010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7275

Modified Files:
	gnome-power-manager.spec 
Log Message:
add intltool BR



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- gnome-power-manager.spec	25 Sep 2008 16:11:24 -0000	1.128
+++ gnome-power-manager.spec	25 Sep 2008 16:21:39 -0000	1.129
@@ -5,7 +5,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.24.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.24/gnome-power-manager-%{version}.tar.bz2
@@ -29,6 +29,7 @@
 BuildRequires: gstreamer-devel
 BuildRequires: unique-devel
 BuildRequires: PolicyKit-gnome-devel
+BuildRequires: intltool
 Requires: gnome-icon-theme
 Requires: hal >= %{hal_version}
 Requires: dbus-glib >= %{dbus_version}
@@ -137,7 +138,7 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
-* Thu Sep 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-3
+* Thu Sep 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-4
 - Save some space
 
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-2



From pertusus at fedoraproject.org  Thu Sep 25 16:54:19 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Thu, 25 Sep 2008 16:54:19 +0000 (UTC)
Subject: rpms/pmount/devel pmount-0.9.17-nosetuid.patch, NONE,
	1.1 pmount.spec, 1.4, 1.5 pmount-0.9.13-nosetuid.patch, 1.1, NONE
Message-ID: <20080925165419.F0FD47010A@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/pmount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13584

Modified Files:
	pmount.spec 
Added Files:
	pmount-0.9.17-nosetuid.patch 
Removed Files:
	pmount-0.9.13-nosetuid.patch 
Log Message:
* Thu Sep 25 2008 Patrice Dumas <pertusus at free.fr> 0.9.17-3
- rediff nosetuid patch


pmount-0.9.17-nosetuid.patch:

--- NEW FILE pmount-0.9.17-nosetuid.patch ---
diff -up pmount-0.9.17/src/Makefile.in.nosetuid pmount-0.9.17/src/Makefile.in
--- pmount-0.9.17/src/Makefile.in.nosetuid	2007-12-29 21:43:20.000000000 +0100
+++ pmount-0.9.17/src/Makefile.in	2008-09-25 18:27:55.000000000 +0200
@@ -262,7 +262,7 @@ EXTRA_DIST = \
 	utils.h  \
 	realpath.h
 
-INSTALL_DIR = $(DESTDIR)/$(prefix)/bin
+INSTALL_DIR = $(DESTDIR)/$(bindir)
 INSTALL_SRC = $(top_builddir)/src
 all: all-am
 
@@ -573,8 +573,8 @@ uninstall-am: uninstall-binPROGRAMS unin
 
 install-data-hook:
 	test -z $(INSTALL_DIR) || mkdir -p -- $(INSTALL_DIR)
-	$(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount
-	$(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount
+	$(INSTALL_DATA) -m 755 -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount
+	$(INSTALL_DATA) -m 755 -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount
 
 uninstall-hook:
 	rm -f $(INSTALL_DIR)/pmount


Index: pmount.spec
===================================================================
RCS file: /cvs/extras/rpms/pmount/devel/pmount.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pmount.spec	1 Mar 2008 22:48:39 -0000	1.4
+++ pmount.spec	25 Sep 2008 16:53:49 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           pmount
 Version:        0.9.17
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Enable normal user mount
 
 Group:          System Environment/Base
@@ -9,7 +9,7 @@
 URL:            http://pmount.alioth.debian.org/
 Source0:        http://alioth.debian.org/frs/download.php/2247/pmount-%{version}.tar.gz
 # don't set the setuid bits during make install
-Patch0:         pmount-0.9.13-nosetuid.patch
+Patch0:         pmount-0.9.17-nosetuid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  intltool gettext pkgconfig
@@ -60,6 +60,9 @@
 %{_mandir}/man1/p*mount*.1*
 
 %changelog
+* Thu Sep 25 2008 Patrice Dumas <pertusus at free.fr> 0.9.17-3
+- rediff nosetuid patch
+
 * Sat Mar  1 2008 Patrice Dumas <pertusus at free.fr> 0.9.17-2
 - update to 0.9.17
 - remove pmount-0.9.13-keeppublic.patch now that dbus connection is private


--- pmount-0.9.13-nosetuid.patch DELETED ---



From mbarnes at fedoraproject.org  Thu Sep 25 17:03:22 2008
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 25 Sep 2008 17:03:22 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.116,1.117
Message-ID: <20080925170322.D1C747010A@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15258

Modified Files:
	comps-f10.xml.in 
Log Message:
Install new "evolution-perl" subpackage by default.



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- comps-f10.xml.in	23 Sep 2008 22:53:38 -0000	1.116
+++ comps-f10.xml.in	25 Sep 2008 17:02:52 -0000	1.117
@@ -2027,6 +2027,7 @@
       <packagereq type="default">empathy</packagereq>
       <packagereq type="default">evolution</packagereq>
       <packagereq type="default">evolution-help</packagereq>
+      <packagereq type="default">evolution-perl</packagereq>
       <packagereq type="default">evolution-webcal</packagereq>
       <packagereq type="default">firefox</packagereq>
       <packagereq type="default">nspluginwrapper</packagereq>



From jnovy at fedoraproject.org  Thu Sep 25 17:06:30 2008
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Thu, 25 Sep 2008 17:06:30 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.5.90-patch-P.patch, NONE, 1.1 rpm.spec, 1.296, 
	1.297
Message-ID: <20080925170630.7796F7010A@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16088

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.5.90-patch-P.patch 
Log Message:
* Thu Sep 25 2008 Jindrich Novy <jnovy at redhat.com>
- don't treat %patch numberless if -P parameter is present (#463942)


rpm-4.5.90-patch-P.patch:

--- NEW FILE rpm-4.5.90-patch-P.patch ---
commit c4fa73c573f63d2e2b53e75d25feafbf65ebf671
Author: Jindrich Novy <jnovy at redhat.com>
Date:   Wed Sep 24 18:39:43 2008 +0200

    Don't treat %patch numberless if -P parameter is present

diff --git a/build/parsePrep.c b/build/parsePrep.c
index 2be0693..bfef325 100644
--- a/build/parsePrep.c
+++ b/build/parsePrep.c
@@ -431,7 +431,10 @@ static rpmRC doPatchMacro(rpmSpec spec, const char *line)
     if (! strchr(" \t\n", line[6])) {
 	rasprintf(&buf, "%%patch -P %s", line + 6);
     } else {
-	rasprintf(&buf, "%%patch -P %d %s", INT_MAX, line + 6); /* INT_MAX denotes not numbered %patch */
+	if (strstr(line+6, " -P") == NULL)
+	    rasprintf(&buf, "%%patch -P %d %s", INT_MAX, line + 6); /* INT_MAX denotes not numbered %patch */
+	else
+	    buf = strdup(line); /* it is not numberless patch because -P is present */
     }
     poptParseArgvString(buf, &argc, &argv);
     free(buf);


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- rpm.spec	11 Sep 2008 12:02:10 -0000	1.296
+++ rpm.spec	25 Sep 2008 17:06:00 -0000	1.297
@@ -18,7 +18,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.7
+Release: 0.%{snapver}.8
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -42,6 +42,7 @@
 Patch206: rpm-4.5.90-rpmbuild-dirs.patch
 Patch207: rpm-4.5.90-cpio-hardlink.patch
 Patch208: rpm-4.5.90-macro-args.patch
+Patch209: rpm-4.5.90-patch-P.patch
 
 # These are not yet upstream
 Patch300: rpm-4.5.90-posttrans.patch
@@ -182,6 +183,7 @@
 %patch206 -p1 -b .rpmbuild-dirs
 %patch207 -p1 -b .cpio-hardlink
 %patch208 -p1 -b .macro-args
+%patch209 -p1 -b .patch-P
 
 # needs a bit of upstream love first...
 #%patch300 -p1 -b .posttrans
@@ -360,6 +362,9 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Sep 25 2008 Jindrich Novy <jnovy at redhat.com>
+- don't treat %patch numberless if -P parameter is present (#463942)
+
 * Thu Sep 11 2008 Panu Matilainen <pmatilai at redhat.com>
 - add hack to support extracting gstreamer plugin provides (#438225)
 - fix another macro argument handling regression (#461180)



From konradm at fedoraproject.org  Thu Sep 25 17:38:00 2008
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Thu, 25 Sep 2008 17:38:00 +0000 (UTC)
Subject: rpms/glpk/devel glpk.spec,1.18,1.19
Message-ID: <20080925173800.BF1227010A@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/glpk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22183

Modified Files:
	glpk.spec 
Log Message:
Bump to 4.31


Index: glpk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glpk/devel/glpk.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- glpk.spec	6 May 2008 18:48:18 -0000	1.18
+++ glpk.spec	25 Sep 2008 17:37:30 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           glpk
-Version:        4.28
+Version:        4.31
 Release:        1%{?dist}
 Summary:        GNU Linear Programming Kit
 
@@ -104,6 +104,9 @@
 
 
 %changelog
+* Thu Sep 25 2008 Conrad Meyer <konrad at tylerc.org> 4.31-1
+- Update to 4.31.
+
 * Tue May  6 2008 Quentin Spencer <qspencer at users.sf.net> 4.28-1
 - Update to release 4.28.
 - Add LIBS definition to configure step so it compiles correctly.



From mclasen at fedoraproject.org  Thu Sep 25 17:41:01 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 25 Sep 2008 17:41:01 +0000 (UTC)
Subject: rpms/gtk2/devel gtk2.spec,1.327,1.328
Message-ID: <20080925174101.D9C8B7010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22709

Modified Files:
	gtk2.spec 
Log Message:
Save some space



Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- gtk2.spec	24 Sep 2008 14:20:05 -0000	1.327
+++ gtk2.spec	25 Sep 2008 17:40:31 -0000	1.328
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
@@ -181,8 +181,6 @@
 %find_lang gtk20
 %find_lang gtk20-properties
 
-cat gtk20.lang gtk20-properties.lang > all.lang
-
 ./mkinstalldirs $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0
 #
 # Make cleaned-up versions of tutorials, examples, and faq for installation
@@ -241,9 +239,9 @@
 # We need the substitution of $host so we use an external
 # file list
 #
-echo %dir %{_sysconfdir}/gtk-2.0/$host >> all.lang
-echo %ghost %{_sysconfdir}/gtk-2.0/$host/gtk.immodules >> all.lang
-echo %ghost %{_sysconfdir}/gtk-2.0/$host/gdk-pixbuf.loaders >> all.lang
+echo %dir %{_sysconfdir}/gtk-2.0/$host >> gtk20.lang
+echo %ghost %{_sysconfdir}/gtk-2.0/$host/gtk.immodules >> gtk20.lang
+echo %ghost %{_sysconfdir}/gtk-2.0/$host/gdk-pixbuf.loaders >> gtk20.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -256,7 +254,7 @@
 %postun
 /sbin/ldconfig
 
-%files -f all.lang
+%files -f gtk20.lang
 %defattr(-, root, root)
 
 %doc AUTHORS COPYING NEWS README
@@ -280,7 +278,7 @@
 %dir %{_sysconfdir}/gtk-2.0
 %{_sysconfdir}/gtk-2.0/im-multipress.conf
 
-%files devel
+%files devel -f gtk20-properties.lang
 %defattr(-, root, root)
 
 %{_libdir}/lib*.so
@@ -299,6 +297,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Thu Sep 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.3-2
+- Move message catalogs for properties to the -devel package
+
 * Wed Sep 24 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1
 - Update to 2.14.3
 



From mtasaka at fedoraproject.org  Thu Sep 25 16:43:45 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 25 Sep 2008 16:43:45 +0000 (UTC)
Subject: rpms/mfiler3/F-8 mfiler3-2.0.8a-upgrade-compat.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 mfiler3.spec, 1.9, 1.10 sources, 1.9, 1.10
Message-ID: <20080925164345.367507010A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mfiler3/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11640/F-8

Modified Files:
	.cvsignore mfiler3.spec sources 
Added Files:
	mfiler3-2.0.8a-upgrade-compat.patch 
Log Message:
* Fri Sep 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-1
- 2.0.8a
- More better upgrade compat patch


mfiler3-2.0.8a-upgrade-compat.patch:

--- NEW FILE mfiler3-2.0.8a-upgrade-compat.patch ---
--- src/etc/.mfiler3.rb.debug	2008-09-25 09:17:44.000000000 +0900
+++ src/etc/.mfiler3.rb	2008-09-26 01:29:38.000000000 +0900
@@ -758,7 +758,28 @@
     f.close
 end
 
+##############################################################################
+# upgrade??????.mf3info?????????????????????
+##############################################################################
+def upgrade_mf3info
+	needed_line = 40
+	num_line = 0
+	f = open ENV['INFO_FNAME'], "r+"
+
+	while num_line < needed_line
+		str = f.gets
+		if ! str
+			f.puts ""
+		end
+		num_line += 1
+    	end
+	f.close
+end
+
+
 if File.exist?(ENV['INFO_FNAME'])
+    upgrade_mf3info
+
     f = open ENV['INFO_FNAME'], "r"
 
     ENV['VIEW_PERMISSION'] = f.gets.chomp!


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	13 Sep 2008 17:14:08 -0000	1.9
+++ .cvsignore	25 Sep 2008 16:43:14 -0000	1.10
@@ -1 +1 @@
-mfiler3-2.0.7.tgz
+mfiler3-2.0.8a.tgz


Index: mfiler3.spec
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-8/mfiler3.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mfiler3.spec	13 Sep 2008 17:14:09 -0000	1.9
+++ mfiler3.spec	25 Sep 2008 16:43:14 -0000	1.10
@@ -2,8 +2,8 @@
 %define			rubyabi			1.8
 
 Name:		mfiler3
-Version:	2.0.7
-Release:	2%{?dist}
+Version:	2.0.8a
+Release:	1%{?dist}
 Summary:	Two pane file manager under UNIX console
 
 Group:		Applications/Editors
@@ -12,7 +12,7 @@
 Source0:	http://www.geocities.jp/daisuke530221jp/%{name}-%{version}.tgz
 Source10:	mfiler3.sh
 Patch0:		mfiler3-2.0.5-use-external.patch
-Patch1:		mfiler3-2.0.7-upgrade-compat.patch
+Patch1:		mfiler3-2.0.8a-upgrade-compat.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmigemo-devel
@@ -97,6 +97,10 @@
 
 
 %changelog
+* Fri Sep 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-1
+- 2.0.8a
+- More better upgrade compat patch
+
 * Mon Sep 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.7-2
 - 2.0.7
 - Workaround patch to deal with segv after upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	13 Sep 2008 17:14:09 -0000	1.9
+++ sources	25 Sep 2008 16:43:14 -0000	1.10
@@ -1 +1 @@
-ada5c7ea7dc58840113e5958f89cf16c  mfiler3-2.0.7.tgz
+813e1a9b0b7873e75b11b1552d570594  mfiler3-2.0.8a.tgz



From mtasaka at fedoraproject.org  Thu Sep 25 16:43:45 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 25 Sep 2008 16:43:45 +0000 (UTC)
Subject: rpms/mfiler3/devel mfiler3-2.0.8a-upgrade-compat.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 mfiler3.spec, 1.9, 1.10 sources, 1.9, 1.10
Message-ID: <20080925164345.ABC867010A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mfiler3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11640/devel

Modified Files:
	.cvsignore mfiler3.spec sources 
Added Files:
	mfiler3-2.0.8a-upgrade-compat.patch 
Log Message:
* Fri Sep 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-1
- 2.0.8a
- More better upgrade compat patch


mfiler3-2.0.8a-upgrade-compat.patch:

--- NEW FILE mfiler3-2.0.8a-upgrade-compat.patch ---
--- src/etc/.mfiler3.rb.debug	2008-09-25 09:17:44.000000000 +0900
+++ src/etc/.mfiler3.rb	2008-09-26 01:29:38.000000000 +0900
@@ -758,7 +758,28 @@
     f.close
 end
 
+##############################################################################
+# upgrade??????.mf3info?????????????????????
+##############################################################################
+def upgrade_mf3info
+	needed_line = 40
+	num_line = 0
+	f = open ENV['INFO_FNAME'], "r+"
+
+	while num_line < needed_line
+		str = f.gets
+		if ! str
+			f.puts ""
+		end
+		num_line += 1
+    	end
+	f.close
+end
+
+
 if File.exist?(ENV['INFO_FNAME'])
+    upgrade_mf3info
+
     f = open ENV['INFO_FNAME'], "r"
 
     ENV['VIEW_PERMISSION'] = f.gets.chomp!


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	13 Sep 2008 17:14:09 -0000	1.9
+++ .cvsignore	25 Sep 2008 16:43:15 -0000	1.10
@@ -1 +1 @@
-mfiler3-2.0.7.tgz
+mfiler3-2.0.8a.tgz


Index: mfiler3.spec
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/devel/mfiler3.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mfiler3.spec	13 Sep 2008 17:14:09 -0000	1.9
+++ mfiler3.spec	25 Sep 2008 16:43:15 -0000	1.10
@@ -2,8 +2,8 @@
 %define			rubyabi			1.8
 
 Name:		mfiler3
-Version:	2.0.7
-Release:	2%{?dist}
+Version:	2.0.8a
+Release:	1%{?dist}
 Summary:	Two pane file manager under UNIX console
 
 Group:		Applications/Editors
@@ -12,7 +12,7 @@
 Source0:	http://www.geocities.jp/daisuke530221jp/%{name}-%{version}.tgz
 Source10:	mfiler3.sh
 Patch0:		mfiler3-2.0.5-use-external.patch
-Patch1:		mfiler3-2.0.7-upgrade-compat.patch
+Patch1:		mfiler3-2.0.8a-upgrade-compat.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmigemo-devel
@@ -97,6 +97,10 @@
 
 
 %changelog
+* Fri Sep 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-1
+- 2.0.8a
+- More better upgrade compat patch
+
 * Mon Sep 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.7-2
 - 2.0.7
 - Workaround patch to deal with segv after upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	13 Sep 2008 17:14:09 -0000	1.9
+++ sources	25 Sep 2008 16:43:15 -0000	1.10
@@ -1 +1 @@
-ada5c7ea7dc58840113e5958f89cf16c  mfiler3-2.0.7.tgz
+813e1a9b0b7873e75b11b1552d570594  mfiler3-2.0.8a.tgz



From mtasaka at fedoraproject.org  Thu Sep 25 16:43:45 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 25 Sep 2008 16:43:45 +0000 (UTC)
Subject: rpms/mfiler3/F-9 mfiler3-2.0.8a-upgrade-compat.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 mfiler3.spec, 1.9, 1.10 sources, 1.9, 1.10
Message-ID: <20080925164345.666217010A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mfiler3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11640/F-9

Modified Files:
	.cvsignore mfiler3.spec sources 
Added Files:
	mfiler3-2.0.8a-upgrade-compat.patch 
Log Message:
* Fri Sep 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-1
- 2.0.8a
- More better upgrade compat patch


mfiler3-2.0.8a-upgrade-compat.patch:

--- NEW FILE mfiler3-2.0.8a-upgrade-compat.patch ---
--- src/etc/.mfiler3.rb.debug	2008-09-25 09:17:44.000000000 +0900
+++ src/etc/.mfiler3.rb	2008-09-26 01:29:38.000000000 +0900
@@ -758,7 +758,28 @@
     f.close
 end
 
+##############################################################################
+# upgrade??????.mf3info?????????????????????
+##############################################################################
+def upgrade_mf3info
+	needed_line = 40
+	num_line = 0
+	f = open ENV['INFO_FNAME'], "r+"
+
+	while num_line < needed_line
+		str = f.gets
+		if ! str
+			f.puts ""
+		end
+		num_line += 1
+    	end
+	f.close
+end
+
+
 if File.exist?(ENV['INFO_FNAME'])
+    upgrade_mf3info
+
     f = open ENV['INFO_FNAME'], "r"
 
     ENV['VIEW_PERMISSION'] = f.gets.chomp!


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	13 Sep 2008 17:14:09 -0000	1.9
+++ .cvsignore	25 Sep 2008 16:43:15 -0000	1.10
@@ -1 +1 @@
-mfiler3-2.0.7.tgz
+mfiler3-2.0.8a.tgz


Index: mfiler3.spec
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-9/mfiler3.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mfiler3.spec	13 Sep 2008 17:14:09 -0000	1.9
+++ mfiler3.spec	25 Sep 2008 16:43:15 -0000	1.10
@@ -2,8 +2,8 @@
 %define			rubyabi			1.8
 
 Name:		mfiler3
-Version:	2.0.7
-Release:	2%{?dist}
+Version:	2.0.8a
+Release:	1%{?dist}
 Summary:	Two pane file manager under UNIX console
 
 Group:		Applications/Editors
@@ -12,7 +12,7 @@
 Source0:	http://www.geocities.jp/daisuke530221jp/%{name}-%{version}.tgz
 Source10:	mfiler3.sh
 Patch0:		mfiler3-2.0.5-use-external.patch
-Patch1:		mfiler3-2.0.7-upgrade-compat.patch
+Patch1:		mfiler3-2.0.8a-upgrade-compat.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmigemo-devel
@@ -97,6 +97,10 @@
 
 
 %changelog
+* Fri Sep 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-1
+- 2.0.8a
+- More better upgrade compat patch
+
 * Mon Sep 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.7-2
 - 2.0.7
 - Workaround patch to deal with segv after upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	13 Sep 2008 17:14:09 -0000	1.9
+++ sources	25 Sep 2008 16:43:15 -0000	1.10
@@ -1 +1 @@
-ada5c7ea7dc58840113e5958f89cf16c  mfiler3-2.0.7.tgz
+813e1a9b0b7873e75b11b1552d570594  mfiler3-2.0.8a.tgz



From mclasen at fedoraproject.org  Thu Sep 25 17:18:05 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 25 Sep 2008 17:18:05 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec,1.185,1.186
Message-ID: <20080925171805.32E447010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18113

Modified Files:
	gnome-games.spec 
Log Message:
save some space



Index: gnome-games.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- gnome-games.spec	22 Sep 2008 02:52:18 -0000	1.185
+++ gnome-games.spec	25 Sep 2008 17:17:34 -0000	1.186
@@ -44,7 +44,7 @@
 Summary: GNOME games
 Name: gnome-games
 Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: Amusements/Games
@@ -142,6 +142,18 @@
 %configure --localstatedir=/var/lib --disable-gnuchess %{omitgames}
 make 
 
+# strip unneeded translations from .mo files
+# ideally intltool (ha!) would do that for us
+# http://bugzilla.gnome.org/show_bug.cgi?id=474987
+cd po
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+mv POTFILES.keep POTFILES.in
+intltool-update --pot
+for p in *.po; do
+  msgmerge $p %{gettext_package}.pot > $p.out
+  msgfmt -o `basename $p .po`.gmo $p.out
+done
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -348,6 +360,9 @@
 %{_datadir}/omf/*
 
 %changelog
+* Thu Sep 25 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-2
+- Save some space
+
 * Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-1
 - Update to 2.24.0
 



From katzj at fedoraproject.org  Thu Sep 25 17:12:32 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Thu, 25 Sep 2008 17:12:32 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.117,1.118
Message-ID: <20080925171232.4A7B87010A@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17214

Modified Files:
	comps-f10.xml.in 
Log Message:
add some sugar bits


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- comps-f10.xml.in	25 Sep 2008 17:02:52 -0000	1.117
+++ comps-f10.xml.in	25 Sep 2008 17:12:02 -0000	1.118
@@ -4017,7 +4017,10 @@
       <packagereq type="mandatory">sugar-journal</packagereq>
       <packagereq type="mandatory">telepathy-gabble</packagereq>
       <packagereq type="mandatory">telepathy-salut</packagereq>
+      <packagereq type="default">sugar-calculator</packagereq>
+      <packagereq type="default">sugar-chat</packagereq>
       <packagereq type="default">sugar-terminal</packagereq>
+      <packagereq type="default">sugar-write</packagereq>
     </packagelist>
   </group>
   <group>



From mclasen at fedoraproject.org  Thu Sep 25 17:18:31 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 25 Sep 2008 17:18:31 +0000 (UTC)
Subject: rpms/libgnome/devel libgnome.spec,1.127,1.128
Message-ID: <20080925171831.2BA1C7010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18231

Modified Files:
	libgnome.spec 
Log Message:
save some space



Index: libgnome.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- libgnome.spec	22 Sep 2008 22:19:11 -0000	1.127
+++ libgnome.spec	25 Sep 2008 17:18:00 -0000	1.128
@@ -14,7 +14,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.24.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnome/2.24/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -127,6 +127,19 @@
 export tagname=CC
 make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
+# strip unneeded translations from .mo files
+# ideally intltool (ha!) would do that for us
+# http://bugzilla.gnome.org/show_bug.cgi?id=474987
+cd po
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+mv POTFILES.keep POTFILES.in
+intltool-update --pot
+for p in *.po; do
+  msgmerge $p %{po_package}.pot > $p.out
+  msgfmt -o `basename $p .po`.gmo $p.out
+done
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
@@ -195,6 +208,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Sep 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-2
+- Save some space
+
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-1
 - Update to 2.24.1
 



From konradm at fedoraproject.org  Thu Sep 25 17:42:24 2008
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Thu, 25 Sep 2008 17:42:24 +0000 (UTC)
Subject: rpms/glpk/devel .cvsignore,1.12,1.13 sources,1.12,1.13
Message-ID: <20080925174224.19DD47010A@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/glpk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22999

Modified Files:
	.cvsignore sources 
Log Message:
New sources for 4.31.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glpk/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	6 May 2008 18:48:18 -0000	1.12
+++ .cvsignore	25 Sep 2008 17:41:53 -0000	1.13
@@ -1 +1 @@
-glpk-4.28.tar.gz
+glpk-4.31.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glpk/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	6 May 2008 18:48:18 -0000	1.12
+++ sources	25 Sep 2008 17:41:53 -0000	1.13
@@ -1 +1 @@
-6e4f30c37fb189aec6c71b27f0a57449  glpk-4.28.tar.gz
+3f927e94d88151b1330da360d20d4caf  glpk-4.31.tar.gz



From rdieter at fedoraproject.org  Thu Sep 25 17:52:13 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 25 Sep 2008 17:52:13 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.142,1.143
Message-ID: <20080925175213.AFC957010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24665

Modified Files:
	kdebindings.spec 
Log Message:
* Thu Sep 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-2
- respin (for qscintilla)



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- kdebindings.spec	29 Aug 2008 13:51:29 -0000	1.142
+++ kdebindings.spec	25 Sep 2008 17:51:43 -0000	1.143
@@ -22,7 +22,7 @@
 
 Name: kdebindings
 Version: 4.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
@@ -164,6 +164,9 @@
 
 
 %changelog
+* Thu Sep 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-2
+- respin (for qscintilla)
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 



From mauelsha at fedoraproject.org  Thu Sep 25 14:42:03 2008
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Thu, 25 Sep 2008 14:42:03 +0000 (UTC)
Subject: rpms/dmraid/F-9 dmraid.spec,1.87,1.88 sources,1.22,1.23
Message-ID: <20080925144203.031897010A@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16326

Modified Files:
	dmraid.spec sources 
Log Message:
Update to version 1.0.0.rc15


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-9/dmraid.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- dmraid.spec	3 Jul 2008 18:05:16 -0000	1.87
+++ dmraid.spec	25 Sep 2008 14:41:32 -0000	1.88
@@ -6,8 +6,8 @@
 
 Summary: Device-mapper RAID tool and library.
 Name: dmraid
-Version: 1.0.0.rc14
-Release: 8%{?dist}
+Version: 1.0.0.rc15
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -18,15 +18,11 @@
 Requires(postun): ldconfig
 Requires(post): ldconfig
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
-Patch0: dmraid-1.0.0.rc14-jmicron-name.patch
-Patch1: dmraid-1.0.0.rc14-solitary-meta-block.patch
-Patch2: dmraid-1.0.0.rc14-UUID.patch
-Patch3: dmraid-1.0.0.rc14-ERROR.patch
-Patch4: dmraid-1.0.0.rc14-UUID-Subsystemprefix.patch
 
 %description
-DMRAID supports RAID device discovery, RAID set activation and display of
-properties for ATARAID on Linux >= 2.4 using device-mapper.
+DMRAID supports RAID device discovery, RAID set activation, creation,
+removal, rebuild  and display of properties for ATARAID/DDF1 metadata
+on Linux >= 2.4 using device-mapper.
 
 %package -n dmraid-devel
 Summary: Development libraries and headers for dmraid.
@@ -34,15 +30,11 @@
 
 %description -n dmraid-devel
 dmraid-devel provides a library interface for RAID device discovery,
-RAID set activation and display of properties for ATARAID volumes.
+RAID set activation, creation, removal, rebuild and display of
+properties for ATARAID/DDF1 metadata.
 
 %prep
 %setup -q -n dmraid/%{version}
-%patch0 -p1 -b .jmicron-name
-%patch1 -p1 -b .solitary-meta-block
-%patch2 -p1 -b .UUID
-%patch3 -p1 -b .ERROR
-%patch4 -p1 -b .UUID-Subsystemprefix
 
 %build
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link
@@ -85,6 +77,9 @@
 %{_libdir}/libdmraid.so
 
 %changelog
+* Thu Sep 25 2008 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc15-1
+- Update to version 1.0.0.rc15
+
 * Thu Jul 03 2008 Alasdair Kergon <agk at redhat.com> - 1.0.0.rc14-8
 - Replace static build with symlink.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-9/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	8 Nov 2006 17:30:55 -0000	1.22
+++ sources	25 Sep 2008 14:41:32 -0000	1.23
@@ -1 +1 @@
-4f25d6fd1016cd5a822c042b89c78d53  dmraid-1.0.0.rc14.tar.bz2
+2602887205a35f89b59eeba3a868150f  dmraid-1.0.0.rc15.tar.bz2



From davej at fedoraproject.org  Thu Sep 25 18:04:58 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Thu, 25 Sep 2008 18:04:58 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.977,
	1.978 linux-2.6-sata-eeepc-faster.patch, 1.3, NONE
Message-ID: <20080925180458.8247E7010A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27207

Modified Files:
	kernel.spec 
Removed Files:
	linux-2.6-sata-eeepc-faster.patch 
Log Message:
Drop duplicated eeepc sata patch.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.977
retrieving revision 1.978
diff -u -r1.977 -r1.978
--- kernel.spec	25 Sep 2008 00:58:49 -0000	1.977
+++ kernel.spec	25 Sep 2008 18:04:28 -0000	1.978
@@ -618,9 +618,6 @@
 Patch2002: linux-2.6-e1000e-add-support-for-82567LM-3-and-82567LF-3-ICH10D-parts.patch
 Patch2003: linux-2.6-e1000e-add-support-for-new-82574L-part.patch
 
-# Make Eee disk faster.
-Patch2010: linux-2.6-sata-eeepc-faster.patch
-
 # Make Eee laptop driver suck less
 Patch2011: linux-2.6-eeepc-laptop-update.patch
 
@@ -1154,7 +1151,6 @@
 ApplyPatch linux-2.6-e1000e-add-support-for-82567LM-3-and-82567LF-3-ICH10D-parts.patch
 ApplyPatch linux-2.6-e1000e-add-support-for-new-82574L-part.patch
 
-ApplyPatch linux-2.6-sata-eeepc-faster.patch
 ApplyPatch linux-2.6-eeepc-laptop-update.patch
 
 # atl1e & atl2 network drivers
@@ -1755,6 +1751,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Sep 25 2008 Dave Jones <davej at redhat.com>
+- Drop duplicated eeepc sata patch.
+
 * Wed Sep 24 2008 Dave Jones <davej at redhat.com>
 - 2.6.27-rc7-git3
 


--- linux-2.6-sata-eeepc-faster.patch DELETED ---



From davej at fedoraproject.org  Thu Sep 25 18:18:09 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Thu, 25 Sep 2008 18:18:09 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.978,
	1.979 linux-2.6-selinux-mprotect-checks.patch, 1.6,
	1.7 linux-2.6-compile-fix-gcc-43.patch, 1.6,
	NONE linux-2.6-cve-2008-0600.patch, 1.1,
	NONE linux-2.6-debug-acpi-os-write-port.patch, 1.2,
	NONE linux-2.6-debug-softlockup-modules-list.patch, 1.1,
	NONE linux-2.6-e1000-corrupt-eeprom-checksum.patch, 1.3,
	NONE linux-2.6-fix-lirc-ppc64.patch, 1.1,
	NONE linux-2.6-mmconfig-stfu.patch, 1.1,
	NONE linux-2.6-ms-wireless-receiver.patch, 1.2,
	NONE linux-2.6-netdev-e1000-disable-alpm.patch, 1.1,
	NONE linux-2.6-scsi-mpt-vmware-fix.patch, 1.1,
	NONE linux-2.6-smarter-relatime.patch, 1.5, NONE
Message-ID: <20080925181809.ED0637010A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30129

Modified Files:
	kernel.spec linux-2.6-selinux-mprotect-checks.patch 
Removed Files:
	linux-2.6-compile-fix-gcc-43.patch 
	linux-2.6-cve-2008-0600.patch 
	linux-2.6-debug-acpi-os-write-port.patch 
	linux-2.6-debug-softlockup-modules-list.patch 
	linux-2.6-e1000-corrupt-eeprom-checksum.patch 
	linux-2.6-fix-lirc-ppc64.patch linux-2.6-mmconfig-stfu.patch 
	linux-2.6-ms-wireless-receiver.patch 
	linux-2.6-netdev-e1000-disable-alpm.patch 
	linux-2.6-scsi-mpt-vmware-fix.patch 
	linux-2.6-smarter-relatime.patch 
Log Message:
Drop a bunch of unused/old patches.
  Rediff & Reapply PPC32/Sparc SELinux mprotect patches.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.978
retrieving revision 1.979
diff -u -r1.978 -r1.979
--- kernel.spec	25 Sep 2008 18:04:28 -0000	1.978
+++ kernel.spec	25 Sep 2008 18:17:39 -0000	1.979
@@ -543,7 +543,6 @@
 
 # we also need compile fixes for -vanilla
 Patch07: linux-2.6-compile-fixes.patch
-#Patch08: linux-2.6-compile-fix-gcc-43.patch
 
 %if !%{nopatches}
 
@@ -580,7 +579,6 @@
 Patch391: linux-2.6-acpi-video-dos.patch
 Patch392: linux-2.6-acpi-clear-wake-status.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
-Patch402: linux-2.6-scsi-mpt-vmware-fix.patch
 Patch420: linux-2.6-squashfs.patch
 Patch430: linux-2.6-net-silence-noisy-printks.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
@@ -602,7 +600,6 @@
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
 
 Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch
-Patch1400: linux-2.6-smarter-relatime.patch
 Patch1515: linux-2.6-lirc.patch
 
 # nouveau + drm fixes
@@ -629,8 +626,6 @@
 
 # make USB EHCI driver respect "nousb" parameter
 Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch
-# Fix HID usage descriptor on MS wireless desktop receiver
-Patch2301: linux-2.6-ms-wireless-receiver.patch
 
 # get rid of imacfb and make efifb work everywhere it was used
 Patch2600: linux-2.6-merge-efifb-imacfb.patch
@@ -990,9 +985,6 @@
 ApplyPatch linux-2.6-compile-fixes.patch
 fi
 
-# build with gcc43
-#ApplyPatch linux-2.6-compile-fix-gcc-43.patch
-
 %if !%{nopatches}
 
 ApplyPatch linux-2.6-hotfixes.patch
@@ -1015,8 +1007,6 @@
 ### NOT (YET) UPSTREAM:
 # The EHCI ISO patch isn't yet upstream but is needed to fix reboot
 #ApplyPatch linux-2.6-ps3-ehci-iso.patch
-# Fixes some wireless optical mice
-#ApplyPatch linux-2.6-ms-wireless-receiver.patch
 # The storage alias patch is Fedora-local, and allows the old 'ps3_storage'
 # module name to work on upgrades. Otherwise, I believe mkinitrd will fail
 # to pull the module in,
@@ -1081,8 +1071,6 @@
 #
 # fix cpqarray pci enable
 ApplyPatch linux-2.6-scsi-cpqarray-set-master.patch
-# fix vmware emulated scsi controller
-#ApplyPatch linux-2.6-scsi-mpt-vmware-fix.patch
 
 # ALSA
 
@@ -1109,9 +1097,9 @@
 ApplyPatch linux-2.6-silence-fbcon-logo.patch
 
 # Fix the SELinux mprotect checks on executable mappings
-#ApplyPatch linux-2.6-selinux-mprotect-checks.patch
+ApplyPatch linux-2.6-selinux-mprotect-checks.patch
 # Fix SELinux for sparc
-#ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch
+ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch
 
 # Changes to upstream defaults.
 # Use UTF-8 by default on VFAT.
@@ -1133,9 +1121,6 @@
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 
-# implement smarter atime updates support.
-#ApplyPatch linux-2.6-smarter-relatime.patch
-
 # NFS Client mounts hang when exported directory do not exist
 ApplyPatch linux-2.6-nfs-client-mounts-hang.patch
 
@@ -1752,6 +1737,10 @@
 
 %changelog
 * Thu Sep 25 2008 Dave Jones <davej at redhat.com>
+- Drop a bunch of unused/old patches.
+  Rediff & Reapply PPC32/Sparc SELinux mprotect patches.
+
+* Thu Sep 25 2008 Dave Jones <davej at redhat.com>
 - Drop duplicated eeepc sata patch.
 
 * Wed Sep 24 2008 Dave Jones <davej at redhat.com>

linux-2.6-selinux-mprotect-checks.patch:

Index: linux-2.6-selinux-mprotect-checks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-selinux-mprotect-checks.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-selinux-mprotect-checks.patch	30 Oct 2007 01:57:49 -0000	1.6
+++ linux-2.6-selinux-mprotect-checks.patch	25 Sep 2008 18:17:39 -0000	1.7
@@ -1,9 +1,13 @@
 This needs a fixed toolchain, and a userspace rebuild to work.
-For this reason, it's had difficulty getting upstream.
+For these reasons, it's had difficulty getting upstream.
 
---- linux-2.6.16-rc3/security/selinux/hooks.c	2006-02-13 13:19:09.000000000 -0500
-+++ linux-2.6.16-rc3-x/security/selinux/hooks.c	2006-02-14 14:44:48.000000000 -0500
-@@ -2365,7 +2365,6 @@ static int selinux_file_ioctl(struct fil
+ie, Fedora has a new enough toolchain, and has been rebuilt, so we don't need
+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
+@@ -2962,7 +2962,6 @@ static int selinux_file_ioctl(struct fil
  
  static int file_map_prot_check(struct file *file, unsigned long prot, int shared)
  {
@@ -11,7 +15,7 @@
  	if ((prot & PROT_EXEC) && (!file || (!shared && (prot & PROT_WRITE)))) {
  		/*
  		 * We are making executable an anonymous mapping or a
-@@ -2376,7 +2375,6 @@ static int file_map_prot_check(struct fi
+@@ -2973,7 +2972,6 @@ static int file_map_prot_check(struct fi
  		if (rc)
  			return rc;
  	}
@@ -19,7 +23,7 @@
  
  	if (file) {
  		/* read access is always possible with a mapping */
-@@ -2423,7 +2421,6 @@ static int selinux_file_mprotect(struct 
+@@ -3024,7 +3022,6 @@ static int selinux_file_mprotect(struct 
  	if (selinux_checkreqprot)
  		prot = reqprot;
  
@@ -27,7 +31,7 @@
  	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) {
  		rc = 0;
  		if (vma->vm_start >= vma->vm_mm->start_brk &&
-@@ -2448,7 +2445,6 @@ static int selinux_file_mprotect(struct 
+@@ -3049,7 +3046,6 @@ static int selinux_file_mprotect(struct 
  		if (rc)
  			return rc;
  	}


--- linux-2.6-compile-fix-gcc-43.patch DELETED ---


--- linux-2.6-cve-2008-0600.patch DELETED ---


--- linux-2.6-debug-acpi-os-write-port.patch DELETED ---


--- linux-2.6-debug-softlockup-modules-list.patch DELETED ---


--- linux-2.6-e1000-corrupt-eeprom-checksum.patch DELETED ---


--- linux-2.6-fix-lirc-ppc64.patch DELETED ---


--- linux-2.6-mmconfig-stfu.patch DELETED ---


--- linux-2.6-ms-wireless-receiver.patch DELETED ---


--- linux-2.6-netdev-e1000-disable-alpm.patch DELETED ---


--- linux-2.6-scsi-mpt-vmware-fix.patch DELETED ---


--- linux-2.6-smarter-relatime.patch DELETED ---



From rstrode at fedoraproject.org  Thu Sep 25 18:18:52 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Thu, 25 Sep 2008 18:18:52 +0000 (UTC)
Subject: rpms/gnome-session/devel gnome-session.spec,1.196,1.197
Message-ID: <20080925181852.3B9417010A@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30267

Modified Files:
	gnome-session.spec 
Log Message:
- Split gnome-session.desktop off into subpackage



Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- gnome-session.spec	23 Sep 2008 04:08:29 -0000	1.196
+++ gnome-session.spec	25 Sep 2008 18:18:22 -0000	1.197
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.24.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.24/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -69,10 +69,17 @@
 Patch6: startup_id-leak.patch
 
 %description
-
-gnome-session manages a GNOME desktop session. It starts up the other core
+gnome-session manages a GNOME desktop or GDM login session. It starts up the other core
 GNOME components and handles logout and saving the session.
 
+%package file
+Summary: gnome-session desktop file
+Group: User Interface/Desktop
+Requires: gnome-session
+
+%description file
+Desktop file to add GNOME to display manager session menu.
+
 %prep
 %setup -q
 %patch5 -p1 -b .xml-leak
@@ -149,6 +156,10 @@
 %postun
 /sbin/ldconfig
 
+%files file
+%defattr(-,root,root)
+%{_datadir}/xsessions/*
+
 %files -f %{po_package}.lang
 %defattr(-,root,root)
 %doc %dir %{_datadir}/doc/%{name}-%{version}
@@ -161,7 +172,6 @@
 %doc %{_mandir}/man*/*
 %{_datadir}/gnome
 %{_datadir}/applications/gnome-session-properties.desktop
-%{_datadir}/xsessions/*
 %dir %{_datadir}/gnome-session
 %{_datadir}/gnome-session/session-properties.glade
 %{_datadir}/gnome-session/gsm-inhibit-dialog.glade
@@ -175,6 +185,9 @@
 
 
 %changelog
+* Thu Sep 25 2008 Ray Strode  <rstrode at redhat.com> - 2.24.0-3
+- Split gnome-session.desktop off into subpackage
+
 * Mon Sep 22 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-2
 - Update to 2.24.0
 - Drop upstreamed patches



From rstrode at fedoraproject.org  Thu Sep 25 18:20:37 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Thu, 25 Sep 2008 18:20:37 +0000 (UTC)
Subject: rpms/gnome-session/devel gnome-session.spec,1.197,1.198
Message-ID: <20080925182037.3206F7010A@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30656

Modified Files:
	gnome-session.spec 
Log Message:
Update subpackage name to be more sensible



Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- gnome-session.spec	25 Sep 2008 18:18:22 -0000	1.197
+++ gnome-session.spec	25 Sep 2008 18:20:06 -0000	1.198
@@ -72,12 +72,12 @@
 gnome-session manages a GNOME desktop or GDM login session. It starts up the other core
 GNOME components and handles logout and saving the session.
 
-%package file
+%package xsession
 Summary: gnome-session desktop file
 Group: User Interface/Desktop
 Requires: gnome-session
 
-%description file
+%description xsession
 Desktop file to add GNOME to display manager session menu.
 
 %prep



From huff at fedoraproject.org  Thu Sep 25 18:21:04 2008
From: huff at fedoraproject.org (David Huff)
Date: Thu, 25 Sep 2008 18:21:04 +0000 (UTC)
Subject: rpms/appliance-tools/F-9 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20080925182104.E198A7010A@cvs1.fedora.phx.redhat.com>

Author: huff

Update of /cvs/pkgs/rpms/appliance-tools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30794

Modified Files:
	.cvsignore sources 
Log Message:
* Wed Sep 24 2008 David Huff <dhuff at redhat.com> 002-2
- refactored code to match upsteaem project
- backported new features from upsteam version 003-4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/appliance-tools/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Aug 2008 20:54:04 -0000	1.1
+++ .cvsignore	25 Sep 2008 18:20:34 -0000	1.2
@@ -0,0 +1 @@
+appliance-tools-002.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/appliance-tools/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Aug 2008 20:54:04 -0000	1.1
+++ sources	25 Sep 2008 18:20:34 -0000	1.2
@@ -0,0 +1 @@
+aa16259a7ec4f752f60d1b752eb75047  appliance-tools-002.tar.bz2



From ajax at fedoraproject.org  Thu Sep 25 18:39:01 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 25 Sep 2008 18:39:01 +0000 (UTC)
Subject: rpms/libxcb/devel libxcb-1.1-xreply-leak.patch, NONE,
	1.1 libxcb.spec, 1.9, 1.10
Message-ID: <20080925183901.F28DA7013D@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libxcb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2613

Modified Files:
	libxcb.spec 
Added Files:
	libxcb-1.1-xreply-leak.patch 
Log Message:
* Wed Sep 17 2008 Adam Jackson <ajax at redhat.com> 1.1.91-3
- libxcb-1.1-xreply-leak.patch: Plug a memory leak in _XReply when the
  caller has a non-fatal error handler. (mclasen, fdo #17616)


libxcb-1.1-xreply-leak.patch:

--- NEW FILE libxcb-1.1-xreply-leak.patch ---
--- libX11-1.1.4/src/xcb_io.c	2008-03-06 15:45:06.000000000 -0500
+++ hacked/src/xcb_io.c	2008-09-17 00:40:57.000000000 -0400
@@ -396,15 +396,18 @@
 				{
 					case X_LookupColor:
 					case X_AllocNamedColor:
+						free(error);
 						return 0;
 				}
 				break;
 			case BadFont:
 				if(err->majorCode == X_QueryFont)
+					free(error);
 					return 0;
 				break;
 			case BadAlloc:
 			case BadAccess:
+				free(error);
 				return 0;
 		}
 
@@ -413,10 +416,13 @@
 		 * want to suppress the error.
 		 */
 		for(ext = dpy->ext_procs; ext; ext = ext->next)
-			if(ext->error && ext->error(dpy, err, &ext->codes, &ret_code))
+			if(ext->error && ext->error(dpy, err, &ext->codes, &ret_code)) {
+				free(error);
 				return ret_code;
+			}
 
-		_XError(dpy, (xError *) error);
+		_XError(dpy, err);
+		free(error);
 		return 0;
 	}
 


Index: libxcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/libxcb.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libxcb.spec	11 Sep 2008 19:11:18 -0000	1.9
+++ libxcb.spec	25 Sep 2008 18:38:31 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           libxcb
 Version:        1.1.91
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A C binding to the X11 protocol
 
 Group:          System Environment/Libraries
@@ -12,6 +12,7 @@
 Patch0:         libxcb-1.1-no-pthread-stubs.patch
 Patch1:		libxcb-1.1-abstract-socket.patch
 Patch2:		libxcb-1.1-sloppy-lock.patch
+Patch3:		libxcb-1.1-xreply-leak.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig
 BuildRequires:  doxygen
@@ -50,6 +51,7 @@
 %patch0 -p1 -b .pthread-stubs
 %patch1 -p1 -b .abstract
 %patch2 -p1 -b .sloppier
+%patch3 -p1 -b .xreply-leak
 
 %build
 autoreconf -v --install
@@ -84,6 +86,10 @@
 %{_datadir}/doc/%{name}-%{version}
 
 %changelog
+* Wed Sep 17 2008 Adam Jackson <ajax at redhat.com> 1.1.91-3
+- libxcb-1.1-xreply-leak.patch: Plug a memory leak in _XReply when the
+  caller has a non-fatal error handler. (mclasen, fdo #17616)
+
 * Thu Sep 11 2008 Adam Jackson <ajax at redhat.com> 1.1.91-2
 - Enable x-selinux bindings.
 



From davej at fedoraproject.org  Thu Sep 25 18:30:12 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Thu, 25 Sep 2008 18:30:12 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-acpi-video-dos.patch,1.1,1.2
Message-ID: <20080925183012.BA7E67010A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv655

Modified Files:
	linux-2.6-acpi-video-dos.patch 
Log Message:
Add changelog

linux-2.6-acpi-video-dos.patch:

Index: linux-2.6-acpi-video-dos.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-acpi-video-dos.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-acpi-video-dos.patch	4 Aug 2008 19:55:58 -0000	1.1
+++ linux-2.6-acpi-video-dos.patch	25 Sep 2008 18:30:12 -0000	1.2
@@ -1,3 +1,7 @@
+Disable ACPI video display switching by default
+
+-- mjg59
+
 diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
 index bac2901..93b1a9e 100644
 --- a/drivers/acpi/video.c



From rstrode at fedoraproject.org  Thu Sep 25 18:21:57 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Thu, 25 Sep 2008 18:21:57 +0000 (UTC)
Subject: rpms/gnome-session/devel gnome-session.spec,1.198,1.199
Message-ID: <20080925182157.EB3B97010A@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30989

Modified Files:
	gnome-session.spec 
Log Message:
complete the subpackage rename



Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- gnome-session.spec	25 Sep 2008 18:20:06 -0000	1.198
+++ gnome-session.spec	25 Sep 2008 18:21:27 -0000	1.199
@@ -156,7 +156,7 @@
 %postun
 /sbin/ldconfig
 
-%files file
+%files xsession
 %defattr(-,root,root)
 %{_datadir}/xsessions/*
 



From huff at fedoraproject.org  Thu Sep 25 18:25:46 2008
From: huff at fedoraproject.org (David Huff)
Date: Thu, 25 Sep 2008 18:25:46 +0000 (UTC)
Subject: rpms/appliance-tools/F-9 appliance-tools.spec,NONE,1.1
Message-ID: <20080925182546.09CDD7010A@cvs1.fedora.phx.redhat.com>

Author: huff

Update of /cvs/pkgs/rpms/appliance-tools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32069

Added Files:
	appliance-tools.spec 
Log Message:
* Wed Sep 24 2008 David Huff <dhuff at redhat.com> 002-2
- refactored code to match upsteaem project
- backported new features from upsteam version 003-4



--- NEW FILE appliance-tools.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "import distutils.sysconfig as d; print d.get_python_lib()")}

%define debug_package %{nil}

Summary: Tools for building Appliances
Name: appliance-tools
Version: 002
Release: 3%{?dist}
License: GPLv2
Group: System Environment/Base
URL: http://thincrust.net
Source0: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: livecd-tools >= 017.1
Requires: zlib
Requires: qemu-img
BuildRequires: python
BuildArch: noarch


%description
Tools for generating appliance images on Fedora based systems including
derived distributions such as RHEL, CentOS and others. See
http://thincrust.net for more details.

%prep
%setup -q

%build
make

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README COPYING
%doc config/fedora9-aos.ks
%{_mandir}/man*/*
%{_bindir}/appliance-creator
%{_bindir}/image-minimizer
%dir %{python_sitelib}/appcreate
%{python_sitelib}/appcreate/*.py
%{python_sitelib}/appcreate/*.pyo
%{python_sitelib}/appcreate/*.pyc

%changelog
* Wed Sep 24 2008 David Huff <dhuff at redhat.com> 002-2
- refactored code to match upsteaem project
- backported new features from upsteam version 003-4

* Wed Jul 09 2008 Alan Pevec <apevec at redhat.com> 002-1
- import imgcreate.fs refactoring and other changes
  to make it work with Fedora-9 livecd-tools-0.17.1 w/o Thincrust patches

* Wed Jun 11 2008 David Huff <dhuff at redhat.com> - 001-3
- fixed dependancys

* Tue Jun 10 2008 David Huff <dhuff at redhat.com> - 001-2
- Undated opt parser
- fixed grub issue
- build aginsted newer livecd-tools for selinux issues

* Wed May 14 2008 David Huff <dhuff at redhat.com> - 001
- Initial build.




From rstrode at fedoraproject.org  Thu Sep 25 18:23:29 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Thu, 25 Sep 2008 18:23:29 +0000 (UTC)
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.318,1.319
Message-ID: <20080925182329.91B627010A@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31323

Modified Files:
	gnome-panel.spec 
Log Message:
- Requires: gnome-session-xsession so it gets pulled in for
  typical GNOME installs.



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- gnome-panel.spec	23 Sep 2008 04:12:38 -0000	1.318
+++ gnome-panel.spec	25 Sep 2008 18:22:59 -0000	1.319
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar.bz2
 
@@ -42,6 +42,7 @@
 Requires: evolution-data-server >= %{evolution_data_server_version}
 %endif
 Requires: PolicyKit-gnome
+Requires: gnome-session-xsession
 
 Requires(post): GConf2 >= %{gconf_version}
 Requires(post): scrollkeeper
@@ -346,6 +347,10 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Sep 25 2008 Ray Strode  <rstrode at redhat.com> - 2.24.0-2
+- Requires: gnome-session-xsession so it gets pulled in for
+  typical GNOME installs.
+
 * Tue Sep 23 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-1
 - Update to 2.24.0
 



From davej at fedoraproject.org  Thu Sep 25 18:50:54 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Thu, 25 Sep 2008 18:50:54 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.979,
	1.980 linux-2.6-libata-force-hardreset-in-sleep-mode.patch, 1.1, NONE
Message-ID: <20080925185054.19DA27010A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5111

Modified Files:
	kernel.spec 
Removed Files:
	linux-2.6-libata-force-hardreset-in-sleep-mode.patch 
Log Message:
Should be no longer needed.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.979
retrieving revision 1.980
diff -u -r1.979 -r1.980
--- kernel.spec	25 Sep 2008 18:17:39 -0000	1.979
+++ kernel.spec	25 Sep 2008 18:50:23 -0000	1.980
@@ -590,7 +590,6 @@
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
 Patch610: linux-2.6-defaults-fat-utf8.patch
 Patch670: linux-2.6-ata-quirk.patch
-Patch671: linux-2.6-libata-force-hardreset-in-sleep-mode.patch
 
 Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
@@ -1107,8 +1106,6 @@
 
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
-# wake up links that have been put to sleep by BIOS (#436099)
-ApplyPatch linux-2.6-libata-force-hardreset-in-sleep-mode.patch
 
 # wireless patches headed for 2.6.27
 #ApplyPatch linux-2.6-wireless.patch


--- linux-2.6-libata-force-hardreset-in-sleep-mode.patch DELETED ---



From davej at fedoraproject.org  Thu Sep 25 18:52:23 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Thu, 25 Sep 2008 18:52:23 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.980,
	1.981 linux-2.6-x86-debug-boot.patch, 1.4, NONE
Message-ID: <20080925185223.BDD9C7010A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5446

Modified Files:
	kernel.spec 
Removed Files:
	linux-2.6-x86-debug-boot.patch 
Log Message:
dead patch


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.980
retrieving revision 1.981
diff -u -r1.980 -r1.981
--- kernel.spec	25 Sep 2008 18:50:23 -0000	1.980
+++ kernel.spec	25 Sep 2008 18:51:53 -0000	1.981
@@ -553,7 +553,6 @@
 
 Patch41: linux-2.6-sysrq-c.patch
 Patch42: linux-2.6-x86-tune-generic.patch
-Patch75: linux-2.6-x86-debug-boot.patch
 
 Patch140: linux-2.6-ps3-ehci-iso.patch
 Patch141: linux-2.6-ps3-storage-alias.patch


--- linux-2.6-x86-debug-boot.patch DELETED ---



From davej at fedoraproject.org  Thu Sep 25 18:53:59 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Thu, 25 Sep 2008 18:53:59 +0000 (UTC)
Subject: rpms/kernel/devel TODO,NONE,1.1
Message-ID: <20080925185359.E486D7010A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5889

Added Files:
	TODO 
Log Message:
Add a TODO file to keep track of what we have, and why


--- NEW FILE TODO ---
drm-modesetting-i915.patch
drm-modesetting-radeon.patch
linux-2.6-export-shmem-bits-for-gem.patch
	Intel/Radeon kernel mode-setting.
	Won't go upstream for a while.

drm-nouveau.patch
	Nouveau DRM driver.
	Won't go upstream until ABI confirmed.

linux-2.6-acpi-clear-wake-status.patch
linux-2.6-acpi-video-dos.patch
linux-2.6-defaults-acpi-video.patch
linux-2.6-input-dell-keyboard-keyup.patch
linux-2.6-eeepc-laptop-update.patch
	mjg59 ACPI/laptop bits.
	Upstreamable for 2.6.28 ?

linux-2.6-at76.patch
linux-2.6-iwlwifi-use-dma_alloc_coherent.patch
linux-2.6-wireless.patch
linux-2.6-wireless-pending.patch
	Linville.  Wireless bits.
	Most should be upstream for 2.6.28

linux-2.6-ata-quirk.patch
	IA64 oddness. Query sent to f-k-l

linux-2.6-build-nonintconfig.patch
linux-2.6-debug-nmi-timeout.patch
linux-2.6-debug-spinlock-taint.patch
linux-2.6-debug-taint-vm.patch
linux-2.6-debug-vm-would-have-oomkilled.patch
linux-2.6-scsi-cpqarray-set-master.patch
linux-2.6-usb-ehci-hcd-respect-nousb.patch
	Push for 2.6.28

linux-2.6-compile-fixes.patch
linux-2.6-hotfixes.patch
	Empty

linux-2.6-crash-driver.patch
	Not upstreamable.

linux-2.6-debug-always-inline-kzalloc.patch
	Sent upstream Sep 25 2008

linux-2.6-debug-sizeof-structs.patch
	Fedora local debug stuff.

linux-2.6-default-mmf_dump_elf_headers.patch
linux-2.6-utrace.patch
linux-2.6-x86-tracehook.patch
	Roland magick & utrace

linux-2.6-defaults-fat-utf8.patch
	Drop?

linux-2.6-defaults-pci_no_msi.patch
linux-2.6-input-kill-stupid-messages.patch
linux-2.6-x86-tune-generic.patch
	Fedora local choices uninteresting to upstream

linux-2.6-e1000e-add-support-for-82567LM-3-and-82567LF-3-ICH10D-parts.patch
linux-2.6-e1000e-add-support-for-new-82574L-part.patch
linux-2.6-e1000e-add-support-for-the-82567LM-4-device.patch
linux-2.6-e1000-ich9.patch
linux-2.6-firewire-git-update.patch
linux-2.6-netdev-atl2.patch
	Should go upstream for .28

linux-2.6-efika-not-chrp.patch
linux-2.6-g5-therm-shutdown.patch
linux-2.6-imac-transparent-bridge.patch
linux-2.6-ps3-ehci-iso.patch
linux-2.6-ps3-legacy-bootloader-hack.patch
linux-2.6-ps3-storage-alias.patch
linux-2.6-vio-modalias.patch
	ppc bits. dwmw2.

linux-2.6-execshield.patch
linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch
linux-2.6-xen-execshield-fix-endless-gpf-fault-loop.patch
linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch	Not interesting to upstream.

linux-2.6-lirc.patch
	jarod working on upstreaming

linux-2.6-merge-efifb-imacfb.patch
	pjones.  merge for 2.6.28 ?

linux-2.6-nfs-client-mounts-hang.patch
	SteveD.
	Sent ping on Sep 25 to find out status.

linux-2.6-net-silence-noisy-printks.patch
linux-2.6-piix3-silence-quirk.patch
linux-2.6-quiet-iommu.patch
linux-2.6-silence-acpi-blacklist.patch
linux-2.6-silence-fbcon-logo.patch
linux-2.6-silence-noise.patch
	Fedora local 'hush' patches.

linux-2.6-selinux-mprotect-checks.patch
linux-2.6-sparc-selinux-mprotect-checks.patch
	Not upstreamable.

linux-2.6-serial-460800.patch
	Probably not upstreamable.
	http://marc.theaimsgroup.com/?l=linux-kernel&m=112687270832687&w=2
	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=126403
	http://lkml.org/lkml/2006/8/2/208

linux-2.6-squashfs.patch
	Sigh.  Who the hell knows when this will go upstream.

linux-2.6-sysrq-c.patch
	Que?




From dwalsh at fedoraproject.org  Thu Sep 25 18:54:17 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 25 Sep 2008 18:54:17 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20080710.patch, 1.45,
	1.46 selinux-policy.spec, 1.712, 1.713
Message-ID: <20080925185417.4A3707010A@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5966

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
* Wed Sep 24 2008 Dan Walsh <dwalsh at redhat.com> 3.5.9-1
- Upgrade to upstream


policy-20080710.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.45 -r 1.46 policy-20080710.patch
Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- policy-20080710.patch	23 Sep 2008 20:14:47 -0000	1.45
+++ policy-20080710.patch	25 Sep 2008 18:54:16 -0000	1.46
@@ -1,6 +1,6 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.8/Makefile
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.9/Makefile
 --- nsaserefpolicy/Makefile	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.5.8/Makefile	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.9/Makefile	2008-09-25 08:33:18.000000000 -0400
 @@ -311,20 +311,22 @@
  
  # parse-rolemap modulename,outputfile
@@ -45,9 +45,9 @@
  $(appdir)/%: $(appconf)/%
  	@mkdir -p $(appdir)
  	$(verbose) $(INSTALL) -m 644 $< $@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.8/Rules.modular
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.9/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.5.8/Rules.modular	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.9/Rules.modular	2008-09-25 08:33:18.000000000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -77,9 +77,9 @@
  
  $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy
  $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.8/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.5.9/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/default_contexts	2008-09-22 15:25:07.000000000 -0400
++++ serefpolicy-3.5.9/config/appconfig-mcs/default_contexts	2008-09-25 08:33:18.000000000 -0400
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -101,15 +101,15 @@
 -user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
 +system_r:xdm_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.8/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.5.9/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/failsafe_context	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.9/config/appconfig-mcs/failsafe_context	2008-09-25 08:33:18.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/guest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.9/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-mcs/guest_u_default_contexts	2008-09-22 15:33:55.000000000 -0400
++++ serefpolicy-3.5.9/config/appconfig-mcs/guest_u_default_contexts	2008-09-25 08:33:18.000000000 -0400
 @@ -0,0 +1,6 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -117,9 +117,9 @@
 +system_r:crond_t:s0		guest_r:guest_t:s0
 +system_r:initrc_su_t:s0		guest_r:guest_t:s0
 +guest_r:guest_t:s0		guest_r:guest_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.5.8/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.5.9/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/root_default_contexts	2008-09-22 15:36:05.000000000 -0400
++++ serefpolicy-3.5.9/config/appconfig-mcs/root_default_contexts	2008-09-25 08:33:18.000000000 -0400
 @@ -1,11 +1,7 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -134,9 +134,9 @@
  #
 -#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 +system_r:sshd_t:s0		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/staff_u_default_contexts serefpolicy-3.5.8/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.5.9/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/staff_u_default_contexts	2008-09-22 15:33:36.000000000 -0400
++++ serefpolicy-3.5.9/config/appconfig-mcs/staff_u_default_contexts	2008-09-25 08:33:18.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
@@ -151,9 +151,9 @@
  sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
  sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.8/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.5.9/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.9/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-25 08:33:18.000000000 -0400
 @@ -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
@@ -161,9 +161,9 @@
 +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/user_u_default_contexts serefpolicy-3.5.8/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.5.9/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/user_u_default_contexts	2008-09-22 15:33:49.000000000 -0400
++++ serefpolicy-3.5.9/config/appconfig-mcs/user_u_default_contexts	2008-09-25 08:33:18.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
@@ -176,15 +176,15 @@
 -
 +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/userhelper_context serefpolicy-3.5.8/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.5.9/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/userhelper_context	2008-09-17 08:49:08.000000000 -0400
++++ serefpolicy-3.5.9/config/appconfig-mcs/userhelper_context	2008-09-25 08:33:18.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/xguest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/xguest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.9/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-mcs/xguest_u_default_contexts	2008-09-22 15:34:01.000000000 -0400
++++ serefpolicy-3.5.9/config/appconfig-mcs/xguest_u_default_contexts	2008-09-25 08:33:18.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -193,9 +193,9 @@
 +system_r:xdm_t		xguest_r:xguest_t:s0
 +system_r:initrc_su_t:s0	xguest_r:xguest_t:s0
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.5.8/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.5.9/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mls/default_contexts	2008-09-22 15:37:18.000000000 -0400
++++ serefpolicy-3.5.9/config/appconfig-mls/default_contexts	2008-09-25 08:33:18.000000000 -0400
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -217,17 +217,17 @@
 -user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
 +system_r:xdm_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mls/guest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.9/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-mls/guest_u_default_contexts	2008-09-22 15:34:31.000000000 -0400
++++ serefpolicy-3.5.9/config/appconfig-mls/guest_u_default_contexts	2008-09-25 08:33:18.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
 +system_r:sshd_t:s0		guest_r:guest_t:s0
 +system_r:crond_t:s0		guest_r:guest_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.5.8/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.5.9/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mls/root_default_contexts	2008-09-22 15:47:13.000000000 -0400
++++ serefpolicy-3.5.9/config/appconfig-mls/root_default_contexts	2008-09-25 08:33:18.000000000 -0400
 @@ -1,11 +1,11 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
 -system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -246,9 +246,9 @@
  #
 -#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.5.8/config/appconfig-mls/staff_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.5.9/config/appconfig-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mls/staff_u_default_contexts	2008-09-22 15:34:13.000000000 -0400
++++ serefpolicy-3.5.9/config/appconfig-mls/staff_u_default_contexts	2008-09-25 08:33:18.000000000 -0400
 @@ -1,7 +1,7 @@
  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
@@ -258,9 +258,9 @@
  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
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.5.8/config/appconfig-mls/user_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.5.9/config/appconfig-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mls/user_u_default_contexts	2008-09-22 15:34:21.000000000 -0400
++++ serefpolicy-3.5.9/config/appconfig-mls/user_u_default_contexts	2008-09-25 08:33:18.000000000 -0400
 @@ -1,7 +1,7 @@
  system_r:local_login_t:s0	user_r:user_t:s0
  system_r:remote_login_t:s0	user_r:user_t:s0
@@ -270,9 +270,9 @@
  system_r:xdm_t:s0		user_r:user_t:s0
  user_r:user_su_t:s0		user_r:user_t:s0
  user_r:user_sudo_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mls/xguest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.5.9/config/appconfig-mls/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-mls/xguest_u_default_contexts	2008-09-22 15:37:37.000000000 -0400
++++ serefpolicy-3.5.9/config/appconfig-mls/xguest_u_default_contexts	2008-09-25 08:33:18.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -281,17 +281,17 @@
[...12630 lines suppressed...]
-+	netutils_domtrans(dhcpc_t)
- ')
- 
- optional_policy(`
--	netutils_domtrans(dhcpc_t)
-+	ipsec_write_pid(ifconfig_t)
- ')
- 
- optional_policy(`
-@@ -336,6 +352,14 @@
+@@ -336,6 +351,14 @@
  ')
  
  optional_policy(`
@@ -32767,9 +30940,9 @@
  	kernel_read_xen_state(ifconfig_t)
  	kernel_write_xen_state(ifconfig_t)
  	xen_append_log(ifconfig_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.8/policy/modules/system/udev.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.9/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/udev.if	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/system/udev.if	2008-09-25 08:33:18.000000000 -0400
 @@ -96,6 +96,24 @@
  
  ########################################
@@ -32823,9 +30996,9 @@
 -	allow $1 udev_tdb_t:file rw_file_perms;
 +	allow $1 udev_tbl_t:file rw_file_perms;
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.8/policy/modules/system/udev.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.9/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/udev.te	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/system/udev.te	2008-09-25 08:33:18.000000000 -0400
 @@ -83,6 +83,7 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
@@ -32881,9 +31054,9 @@
 +optional_policy(`
  	xserver_read_xdm_pid(udev_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.8/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.5.9/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/unconfined.fc	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/system/unconfined.fc	2008-09-25 08:33:18.000000000 -0400
 @@ -2,15 +2,11 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -32922,9 +31095,9 @@
 +/usr/libexec/ghc-[^/]+/ghc-.*  --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 +
 +/opt/real/(.*/)?realplay\.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.5.8/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.5.9/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/unconfined.if	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/system/unconfined.if	2008-09-25 08:33:18.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -33253,9 +31426,9 @@
 +	userdom_role_change_template(unconfined, $1)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.8/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.5.9/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/unconfined.te	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/system/unconfined.te	2008-09-25 08:33:18.000000000 -0400
 @@ -1,40 +1,80 @@
  
 -policy_module(unconfined, 2.3.1)
@@ -33548,7 +31721,7 @@
  optional_policy(`
 -	xserver_domtrans_xdm_xserver(unconfined_t)
 +	xserver_run_xdm_xserver(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t })
-+	xserver_xdm_rw_shm(unconfined_t)
++	xserver_rw_xdm_xserver_shm(unconfined_t)
  ')
  
  ########################################
@@ -33576,7 +31749,7 @@
  	')
 +
 +optional_policy(`
-+	xserver_xdm_rw_shm(unconfined_execmem_t)
++	xserver_rw_xdm_xserver_shm(unconfined_execmem_t)
  ')
 +
 +########################################
@@ -33590,9 +31763,9 @@
 +# Allow SELinux aware applications to request rpm_script execution
 +rpm_transition_script(unconfined_notrans_t)
 +domain_ptrace_all_domains(unconfined_notrans_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.8/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.5.9/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/userdomain.fc	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/system/userdomain.fc	2008-09-25 08:33:18.000000000 -0400
 @@ -1,4 +1,5 @@
 -HOME_DIR	-d	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
 -HOME_DIR/.+		gen_context(system_u:object_r:ROLE_home_t,s0)
@@ -33603,9 +31776,9 @@
 +HOME_DIR/.+		gen_context(system_u:object_r:user_home_t,s0)
 +/tmp/gconfd-USER -d	gen_context(system_u:object_r:user_tmp_t,s0)
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.5.8/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.5.9/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/userdomain.if	2008-09-21 07:04:00.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/system/userdomain.if	2008-09-25 08:33:18.000000000 -0400
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -36244,9 +34417,9 @@
 +
 +	dontaudit $1 user_home_t:file unlink;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.8/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.5.9/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/userdomain.te	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/system/userdomain.te	2008-09-25 08:33:18.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -36361,9 +34534,9 @@
 +	manage_fifo_files_pattern(privhome, cifs_t, cifs_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.8/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.5.9/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/xen.fc	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/system/xen.fc	2008-09-25 08:33:18.000000000 -0400
 @@ -20,6 +20,7 @@
  /var/run/xenconsoled\.pid --	gen_context(system_u:object_r:xenconsoled_var_run_t,s0)
  /var/run/xend(/.*)?		gen_context(system_u:object_r:xend_var_run_t,s0)
@@ -36372,9 +34545,9 @@
  /var/run/xenstore\.pid	--	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  /var/run/xenstored(/.*)?	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.8/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.5.9/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/xen.if	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/system/xen.if	2008-09-25 08:33:18.000000000 -0400
 @@ -167,11 +167,14 @@
  #
  interface(`xen_stream_connect',`
@@ -36416,9 +34589,9 @@
 +	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.5.8/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.5.9/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/xen.te	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/system/xen.te	2008-09-25 08:33:18.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -36655,9 +34828,9 @@
 +optional_policy(`
 +	unconfined_domain(xend_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.8/policy/support/file_patterns.spt
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.9/policy/support/file_patterns.spt
 --- nsaserefpolicy/policy/support/file_patterns.spt	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/support/file_patterns.spt	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.9/policy/support/file_patterns.spt	2008-09-25 08:33:18.000000000 -0400
 @@ -537,3 +537,18 @@
  	allow $1 $2:dir rw_dir_perms;
  	type_transition $1 $2:$4 $3;
@@ -36677,9 +34850,9 @@
 +        relabel_sock_files_pattern($1,$2,$2)
 +
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.8/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.5.9/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/support/obj_perm_sets.spt	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.9/policy/support/obj_perm_sets.spt	2008-09-25 08:33:18.000000000 -0400
 @@ -316,3 +316,13 @@
  #
  define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }')
@@ -36694,9 +34867,9 @@
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
 +
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.8/policy/users
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.9/policy/users
 --- nsaserefpolicy/policy/users	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/users	2008-09-17 08:49:09.000000000 -0400
++++ serefpolicy-3.5.9/policy/users	2008-09-25 08:33:18.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.712
retrieving revision 1.713
diff -u -r1.712 -r1.713
--- selinux-policy.spec	23 Sep 2008 20:14:47 -0000	1.712
+++ selinux-policy.spec	25 Sep 2008 18:54:16 -0000	1.713
@@ -16,8 +16,8 @@
 %define CHECKPOLICYVER 2.0.16-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.5.8
-Release: 7%{?dist}
+Version: 3.5.9
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -160,7 +160,7 @@
 
 %description
 SELinux Reference Policy - modular.
-Based off of reference policy: Checked out revision  2797.
+Based off of reference policy: Checked out revision  2820.
 
 %build
 
@@ -381,6 +381,9 @@
 %endif
 
 %changelog
+* Wed Sep 24 2008 Dan Walsh <dwalsh at redhat.com> 3.5.9-1
+- Upgrade to upstream
+
 * Tue Sep 23 2008 Dan Walsh <dwalsh at redhat.com> 3.5.8-7
 - Allow confined users to login with dbus
 



From konradm at fedoraproject.org  Thu Sep 25 18:58:34 2008
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Thu, 25 Sep 2008 18:58:34 +0000 (UTC)
Subject: rpms/glpk/F-8 .cvsignore, 1.10, 1.11 glpk.spec, 1.15, 1.16 sources, 
	1.10, 1.11
Message-ID: <20080925185834.9A1A87010A@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/glpk/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6805

Modified Files:
	.cvsignore glpk.spec sources 
Log Message:
Bump to 4.31


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glpk/F-8/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	14 Sep 2007 13:23:14 -0000	1.10
+++ .cvsignore	25 Sep 2008 18:58:04 -0000	1.11
@@ -1 +1 @@
-glpk-4.21.tar.gz
+glpk-4.31.tar.gz


Index: glpk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glpk/F-8/glpk.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- glpk.spec	14 Sep 2007 13:23:14 -0000	1.15
+++ glpk.spec	25 Sep 2008 18:58:04 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           glpk
-Version:        4.21
+Version:        4.31
 Release:        1%{?dist}
 Summary:        GNU Linear Programming Kit
 
@@ -62,6 +62,7 @@
 %setup -q
 
 %build
+export LIBS=-ldl
 %configure
 make %{?_smp_mflags}
 
@@ -103,6 +104,19 @@
 
 
 %changelog
+* Thu Sep 25 2008 Conrad Meyer <konrad at tylerc.org> 4.31-1
+- Update to 4.31.
+
+* Tue May  6 2008 Quentin Spencer <qspencer at users.sf.net> 4.28-1
+- Update to release 4.28.
+- Add LIBS definition to configure step so it compiles correctly.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 4.25-2
+- Autorebuild for GCC 4.3
+
+* Wed Jan  2 2008 Quentin Spencer <qspencer at users.sf.net> 4.25-1
+- Update to release 4.25.
+
 * Fri Sep 14 2007 Quentin Spencer <qspencer at users.sf.net> 4.21-1
 - New release. Update license tag to GPLv3.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glpk/F-8/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	14 Sep 2007 13:23:14 -0000	1.10
+++ sources	25 Sep 2008 18:58:04 -0000	1.11
@@ -1 +1 @@
-a41df71415c97fc5c541d19547ced10a  glpk-4.21.tar.gz
+3f927e94d88151b1330da360d20d4caf  glpk-4.31.tar.gz



From davej at fedoraproject.org  Thu Sep 25 19:00:11 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Thu, 25 Sep 2008 19:00:11 +0000 (UTC)
Subject: rpms/kernel/devel TODO,1.1,1.2
Message-ID: <20080925190011.5B7B07010A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7182

Modified Files:
	TODO 
Log Message:
note xen-execshield might be droppable


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/TODO,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TODO	25 Sep 2008 18:53:59 -0000	1.1
+++ TODO	25 Sep 2008 18:59:41 -0000	1.2
@@ -79,9 +79,13 @@
 	ppc bits. dwmw2.
 
 linux-2.6-execshield.patch
+	Not interesting to upstream.
 linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch
 linux-2.6-xen-execshield-fix-endless-gpf-fault-loop.patch
-linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch	Not interesting to upstream.
+linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch
+	The xen port of execshield.
+	Is this really worth keeping?  Hopefully most (all?) people
+	running Xen are using a CPU with NX by now.
 
 linux-2.6-lirc.patch
 	jarod working on upstreaming



From konradm at fedoraproject.org  Thu Sep 25 18:37:15 2008
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Thu, 25 Sep 2008 18:37:15 +0000 (UTC)
Subject: rpms/glpk/F-9 .cvsignore, 1.11, 1.12 glpk.spec, 1.17, 1.18 sources, 
	1.11, 1.12
Message-ID: <20080925183715.590EF7010A@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/glpk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1999

Modified Files:
	.cvsignore glpk.spec sources 
Log Message:
Bump to 4.31


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glpk/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	2 Jan 2008 20:31:25 -0000	1.11
+++ .cvsignore	25 Sep 2008 18:36:45 -0000	1.12
@@ -1 +1 @@
-glpk-4.25.tar.gz
+glpk-4.31.tar.gz


Index: glpk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glpk/F-9/glpk.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- glpk.spec	19 Feb 2008 20:25:47 -0000	1.17
+++ glpk.spec	25 Sep 2008 18:36:45 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           glpk
-Version:        4.25
-Release:        2%{?dist}
+Version:        4.31
+Release:        1%{?dist}
 Summary:        GNU Linear Programming Kit
 
 Group:          System Environment/Libraries
@@ -62,6 +62,7 @@
 %setup -q
 
 %build
+export LIBS=-ldl
 %configure
 make %{?_smp_mflags}
 
@@ -103,6 +104,13 @@
 
 
 %changelog
+* Thu Sep 25 2008 Conrad Meyer <konrad at tylerc.org> 4.31-1
+- Update to 4.31.
+
+* Tue May  6 2008 Quentin Spencer <qspencer at users.sf.net> 4.28-1
+- Update to release 4.28.
+- Add LIBS definition to configure step so it compiles correctly.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 4.25-2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glpk/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	2 Jan 2008 20:31:25 -0000	1.11
+++ sources	25 Sep 2008 18:36:45 -0000	1.12
@@ -1 +1 @@
-3bd85385acb1123a2b62420af45bcc39  glpk-4.25.tar.gz
+3f927e94d88151b1330da360d20d4caf  glpk-4.31.tar.gz



From davej at fedoraproject.org  Thu Sep 25 19:13:00 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Thu, 25 Sep 2008 19:13:00 +0000 (UTC)
Subject: rpms/kernel/devel TODO,1.2,1.3
Message-ID: <20080925191300.B93137010A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9790

Modified Files:
	TODO 
Log Message:
Jarod took responsibility for this one.


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/TODO,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TODO	25 Sep 2008 18:59:41 -0000	1.2
+++ TODO	25 Sep 2008 19:12:30 -0000	1.3
@@ -88,6 +88,7 @@
 	running Xen are using a CPU with NX by now.
 
 linux-2.6-lirc.patch
+linux-2.6-sysrq-c.patch
 	jarod working on upstreaming
 
 linux-2.6-merge-efifb-imacfb.patch
@@ -118,6 +119,3 @@
 linux-2.6-squashfs.patch
 	Sigh.  Who the hell knows when this will go upstream.
 
-linux-2.6-sysrq-c.patch
-	Que?
-



From mpg at fedoraproject.org  Thu Sep 25 19:16:06 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Thu, 25 Sep 2008 19:16:06 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.20, 1.21 sources, 1.21,
	1.22 sugar.spec, 1.28, 1.29
Message-ID: <20080925191606.242657010A@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10496

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Thu Sep 25 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.9-1
- #7969 Accidental searches lead to a "blank" Home screen
- #8662 xo man jumps around while zooming
- #8642 Bug in WPA key dialog prevents certain passwords from being accepted
- #8657 Help activity doesn't show up on a clean install.
- #8234 Software update (in Control Panel) crashes X-server.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	20 Sep 2008 10:24:46 -0000	1.20
+++ .cvsignore	25 Sep 2008 19:15:35 -0000	1.21
@@ -1 +1 @@
-sugar-0.82.8.tar.bz2
+sugar-0.82.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	20 Sep 2008 10:24:46 -0000	1.21
+++ sources	25 Sep 2008 19:15:35 -0000	1.22
@@ -1 +1 @@
-f435efa9be7ca520b86322ee19a878e4  sugar-0.82.8.tar.bz2
+71af6b9632f441259e7ea5608db2ae5f  sugar-0.82.9.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sugar.spec	20 Sep 2008 10:24:46 -0000	1.28
+++ sugar.spec	25 Sep 2008 19:15:35 -0000	1.29
@@ -3,7 +3,7 @@
 
 Summary: OLPC desktop environment
 Name: sugar
-Version: 0.82.8
+Version: 0.82.9
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
@@ -93,6 +93,13 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Thu Sep 25 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.9-1
+- #7969 Accidental searches lead to a "blank" Home screen
+- #8662 xo man jumps around while zooming
+- #8642 Bug in WPA key dialog prevents certain passwords from being accepted
+- #8657 Help activity doesn't show up on a clean install.
+- #8234 Software update (in Control Panel) crashes X-server.
+
 * Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-1
 - #8554 Indicate connected AP in Neighborhood view.
 - #7987 Home view XO icon palette for Control Panel has wrong icon



From davej at fedoraproject.org  Thu Sep 25 19:18:00 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Thu, 25 Sep 2008 19:18:00 +0000 (UTC)
Subject: rpms/kernel/devel Makefile.config, 1.66, 1.67 config-ia64-generic, 
	1.17, 1.18 config-ia64, 1.3, NONE
Message-ID: <20080925191800.93D067010A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11145

Modified Files:
	Makefile.config config-ia64-generic 
Removed Files:
	config-ia64 
Log Message:
one ia64 config to rule them all


Index: Makefile.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- Makefile.config	24 Jul 2008 16:33:56 -0000	1.66
+++ Makefile.config	25 Sep 2008 19:17:30 -0000	1.67
@@ -101,5 +101,5 @@
 kernel-$(VERSION)-ppc-smp.config: config-powerpc32-smp temp-powerpc32-generic
 	perl merge.pl $^ powerpc > $@
 
-kernel-$(VERSION)-ia64.config: config-ia64 temp-ia64-generic
+kernel-$(VERSION)-ia64.config: /dev/null temp-ia64-generic
 	perl merge.pl $^ ia64 > $@


Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64-generic,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- config-ia64-generic	26 Aug 2008 14:21:34 -0000	1.17
+++ config-ia64-generic	25 Sep 2008 19:17:30 -0000	1.18
@@ -182,7 +182,6 @@
 
 CONFIG_HW_RANDOM_INTEL=m
 
-#temporary until ia64 kexec/kdump is fixed (breaks xen)
 CONFIG_CRASH_DUMP=y
 CONFIG_PROC_VMCORE=y
 


--- config-ia64 DELETED ---



From mpg at fedoraproject.org  Thu Sep 25 19:18:37 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Thu, 25 Sep 2008 19:18:37 +0000 (UTC)
Subject: rpms/sugar/OLPC-3 .cvsignore, 1.19, 1.20 sources, 1.21,
	1.22 sugar.spec, 1.25, 1.26 threads.patch, 1.1, NONE
Message-ID: <20080925191837.161EB7010A@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11402

Modified Files:
	.cvsignore sources sugar.spec 
Removed Files:
	threads.patch 
Log Message:
* Thu Sep 25 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.9-1
- #7969 Accidental searches lead to a "blank" Home screen
- #8662 xo man jumps around while zooming
- #8642 Bug in WPA key dialog prevents certain passwords from being accepted
- #8657 Help activity doesn't show up on a clean install.
- #8234 Software update (in Control Panel) crashes X-server.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	16 Sep 2008 19:26:53 -0000	1.19
+++ .cvsignore	25 Sep 2008 19:18:06 -0000	1.20
@@ -1 +1 @@
-sugar-0.82.7.tar.bz2
+sugar-0.82.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	20 Sep 2008 10:27:07 -0000	1.21
+++ sources	25 Sep 2008 19:18:06 -0000	1.22
@@ -1 +1 @@
-f435efa9be7ca520b86322ee19a878e4  sugar-0.82.8.tar.bz2
+71af6b9632f441259e7ea5608db2ae5f  sugar-0.82.9.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sugar.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sugar.spec	25 Sep 2008 12:49:50 -0000	1.25
+++ sugar.spec	25 Sep 2008 19:18:06 -0000	1.26
@@ -3,8 +3,8 @@
 
 Summary: OLPC desktop environment
 Name: sugar
-Version: 0.82.8
-Release: 2%{?dist}
+Version: 0.82.9
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/sugar
@@ -16,8 +16,6 @@
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: threads.patch
-
 BuildRequires: pkgconfig
 BuildRequires: perl-XML-Parser
 BuildRequires: gettext
@@ -51,8 +49,6 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .threads
-
 %build
 %configure
 make
@@ -97,6 +93,13 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Thu Sep 25 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.9-1
+- #7969 Accidental searches lead to a "blank" Home screen
+- #8662 xo man jumps around while zooming
+- #8642 Bug in WPA key dialog prevents certain passwords from being accepted
+- #8657 Help activity doesn't show up on a clean install.
+- #8234 Software update (in Control Panel) crashes X-server.
+
 * Thu Sep 25 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-2
 - Properly initialize dbus threads, hopefully fixes #8234
 


--- threads.patch DELETED ---



From mclasen at fedoraproject.org  Thu Sep 25 19:22:33 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 25 Sep 2008 19:22:33 +0000 (UTC)
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.319,1.320
Message-ID: <20080925192233.9B36B7010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12179

Modified Files:
	gnome-panel.spec 
Log Message:
save some space



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -r1.319 -r1.320
--- gnome-panel.spec	25 Sep 2008 18:22:59 -0000	1.319
+++ gnome-panel.spec	25 Sep 2008 19:22:03 -0000	1.320
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.24.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar.bz2
 
@@ -168,6 +168,19 @@
 cp -f %{SOURCE4} m4
 cp -f %{SOURCE5} gnome-panel/panel-compatibility.schemas
 
+# strip unneeded translations from .mo files
+# ideally intltool (ha!) would do that for us
+# http://bugzilla.gnome.org/show_bug.cgi?id=474987
+cd po
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$\|.*[.]policy[.]in$" POTFILES.in > POTFILES.keep
+mv POTFILES.keep POTFILES.in
+intltool-update --pot
+for p in *.po; do
+  msgmerge $p %{gettext_package}.pot > $p.out
+  msgfmt -o `basename $p .po`.gmo $p.out
+done
+
+
 %build
 # gpm-integration patches Makefile.am and configure.in
 aclocal -I m4
@@ -347,6 +360,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Sep 25 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-3
+- Save some space
+
 * Thu Sep 25 2008 Ray Strode  <rstrode at redhat.com> - 2.24.0-2
 - Requires: gnome-session-xsession so it gets pulled in for
   typical GNOME installs.



From pkgdb at fedoraproject.org  Thu Sep 25 19:34:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 19:34:41 +0000
Subject: [pkgdb] subversion had acl change status
Message-ID: <20080925193441.A9C2C208DA6@bastion.fedora.phx.redhat.com>

toshio has set the watchbugzilla acl on subversion (Fedora devel) to Obsolete for endo69

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From davej at fedoraproject.org  Thu Sep 25 19:35:14 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Thu, 25 Sep 2008 19:35:14 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.981,1.982
Message-ID: <20080925193514.F15A97010A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14533

Modified Files:
	kernel.spec 
Log Message:
Disable building kdump kernels for ppc64 for now.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.981
retrieving revision 1.982
diff -u -r1.981 -r1.982
--- kernel.spec	25 Sep 2008 18:51:53 -0000	1.981
+++ kernel.spec	25 Sep 2008 19:34:44 -0000	1.982
@@ -215,9 +215,10 @@
 
 # only build kernel-kdump on ppc64
 # (no relocatable kernel support upstream yet)
-%ifnarch ppc64
+#FIXME: Temporarily disabled to speed up builds.
+#ifnarch ppc64
 %define with_kdump 0
-%endif
+#endif
 
 # don't do debug builds on anything but i686 and x86_64
 %ifnarch i686 x86_64
@@ -1733,6 +1734,9 @@
 
 %changelog
 * Thu Sep 25 2008 Dave Jones <davej at redhat.com>
+- Disable building kdump kernels for ppc64 for now.
+
+* Thu Sep 25 2008 Dave Jones <davej at redhat.com>
 - Drop a bunch of unused/old patches.
   Rediff & Reapply PPC32/Sparc SELinux mprotect patches.
 



From jdennis at fedoraproject.org  Thu Sep 25 19:36:36 2008
From: jdennis at fedoraproject.org (John Dennis)
Date: Thu, 25 Sep 2008 19:36:36 +0000 (UTC)
Subject: rpms/freeradius/devel .cvsignore, 1.18, 1.19 freeradius.spec, 1.66, 
	1.67 sources, 1.19, 1.20
Message-ID: <20080925193636.EC0EE7010A@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14760

Modified Files:
	.cvsignore freeradius.spec sources 
Log Message:
upgrade to new upstream 2.1.1 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	17 Apr 2008 16:29:01 -0000	1.18
+++ .cvsignore	25 Sep 2008 19:36:06 -0000	1.19
@@ -1 +1 @@
-freeradius-server-2.0.3.tar.bz2
+freeradius-server-2.1.1.tar.bz2


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- freeradius.spec	30 Jul 2008 14:38:14 -0000	1.66
+++ freeradius.spec	25 Sep 2008 19:36:06 -0000	1.67
@@ -3,8 +3,8 @@
 # FIXME: check each former patch, do we still need any?
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
-Version: 2.0.5
-Release: 2%{?dist}
+Version: 2.1.1
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -268,6 +268,8 @@
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/dialup_admin/lib/sql/oracle
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/dialup_admin/lib/sql/drivers/oracle
 
+# create links in /etc/raddb/sites-enabled to /etc/raddb/sites-available
+ln -s ../sites-available/control-socket $RADDB/sites-enabled/control-socket
 
 # remove unsupported config files
 rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/experimental.conf
@@ -278,8 +280,9 @@
 
 
 %pre
-/usr/sbin/useradd -M -o -r -d / -u 95 -c "radiusd user" -s /bin/false radiusd > /dev/null 2>&1 || :
-
+getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
+getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
+exit 0
 
 %post
 /sbin/ldconfig
@@ -324,7 +327,6 @@
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/preproxy_users
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/proxy.conf
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/radiusd.conf
-%attr(640,root,radiusd) %config(noreplace) /etc/raddb/snmp.conf
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/sql.conf
 %dir %attr(640,root,radiusd) /etc/raddb/sql
 #%attr(640,root,radiusd) %config(noreplace) /etc/raddb/sql/oracle/*
@@ -351,6 +353,7 @@
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/checkval
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/counter
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/detail
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/detail.example.com
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/detail.log
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/digest
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/echo
@@ -359,8 +362,10 @@
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/expiration
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/expr
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/files
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/inner-eap
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/ippool
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/logintime
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/linelog
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/mac2ip
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/mac2vlan
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/mschap
@@ -375,12 +380,14 @@
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/sql_log
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/sradutmp
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/unix
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/wimax
 %attr(700,radiusd,radiusd) %dir /var/run/radiusd/
 # binaries
 %defattr(-,root,root)
 /usr/sbin/checkrad
 /usr/sbin/radiusd
 /usr/sbin/radwatch
+/usr/sbin/radmin
 # man-pages
 %doc %{_mandir}/man1/*
 %doc %{_mandir}/man5/*
@@ -421,6 +428,8 @@
 %{_libdir}/freeradius/rlm_detail-%{version}.so
 %{_libdir}/freeradius/rlm_digest.so
 %{_libdir}/freeradius/rlm_digest-%{version}.so
+%{_libdir}/freeradius/rlm_dynamic_clients.so
+%{_libdir}/freeradius/rlm_dynamic_clients-%{version}.so
 %{_libdir}/freeradius/rlm_eap.so
 %{_libdir}/freeradius/rlm_eap-%{version}.so
 %{_libdir}/freeradius/rlm_eap_gtc.so
@@ -451,6 +460,8 @@
 %{_libdir}/freeradius/rlm_files-%{version}.so
 %{_libdir}/freeradius/rlm_ippool.so
 %{_libdir}/freeradius/rlm_ippool-%{version}.so
+%{_libdir}/freeradius/rlm_linelog.so
+%{_libdir}/freeradius/rlm_linelog-%{version}.so
 %{_libdir}/freeradius/rlm_logintime.so
 %{_libdir}/freeradius/rlm_logintime-%{version}.so
 %{_libdir}/freeradius/rlm_mschap.so


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	26 Jun 2008 15:53:47 -0000	1.19
+++ sources	25 Sep 2008 19:36:06 -0000	1.20
@@ -1 +1 @@
-3f7f3491d619542baa72746cbd6a7ed2  freeradius-server-2.0.5.tar.bz2
+4ccf748ef9851d90844d085647351ca4  freeradius-server-2.1.1.tar.bz2



From jdennis at fedoraproject.org  Thu Sep 25 19:49:40 2008
From: jdennis at fedoraproject.org (John Dennis)
Date: Thu, 25 Sep 2008 19:49:40 +0000 (UTC)
Subject: rpms/freeradius/devel freeradius.spec,1.67,1.68
Message-ID: <20080925194940.F3DCC7010A@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17630

Modified Files:
	freeradius.spec 
Log Message:
add change log entry



Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- freeradius.spec	25 Sep 2008 19:36:06 -0000	1.67
+++ freeradius.spec	25 Sep 2008 19:49:10 -0000	1.68
@@ -585,6 +585,9 @@
 %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so
 
 %changelog
+* Thu Sep 25 2008 John Dennis <jdennis at redhat.com> - 2.1.1-1
+- upgrade to new upstream 2.1.1 release
+
 * Wed Jul 30 2008 John Dennis <jdennis at redhat.com> - 2.0.5-2
 - Resolves: bug #453761: FreeRADIUS %%post should not include chown -R
   specify file attributes for /etc/raddb/ldap.attrmap



From jdennis at fedoraproject.org  Thu Sep 25 19:57:41 2008
From: jdennis at fedoraproject.org (John Dennis)
Date: Thu, 25 Sep 2008 19:57:41 +0000 (UTC)
Subject: rpms/freeradius/devel freeradius-radiusd-conf.patch,1.2,1.3
Message-ID: <20080925195741.AC1FC7010A@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19447

Modified Files:
	freeradius-radiusd-conf.patch 
Log Message:
fix patch so there isn't any fuzz


freeradius-radiusd-conf.patch:

Index: freeradius-radiusd-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius-radiusd-conf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freeradius-radiusd-conf.patch	30 Jul 2008 16:55:41 -0000	1.2
+++ freeradius-radiusd-conf.patch	25 Sep 2008 19:57:41 -0000	1.3
@@ -1,15 +1,15 @@
---- freeradius-server-2.0.5/raddb/radiusd.conf.in.conf	2008-05-30 05:18:43.000000000 -0400
-+++ freeradius-server-2.0.5/raddb/radiusd.conf.in	2008-07-30 12:44:54.000000000 -0400
-@@ -627,7 +627,7 @@
+--- freeradius-server-2.1.1/raddb/radiusd.conf.in.orig	2008-09-25 15:54:05.000000000 -0400
++++ freeradius-server-2.1.1/raddb/radiusd.conf.in	2008-09-25 15:54:28.000000000 -0400
+@@ -657,7 +657,7 @@
  	#  Include another file that has the SQL-related configuration.
  	#  This is another file only because it tends to be big.
  	#
 -	$INCLUDE sql.conf
 +	#$INCLUDE sql.conf
  
- 
- 	#  For Cisco VoIP specific accounting with Postgresql,
-@@ -648,7 +648,7 @@
+ 	#
+ 	#  This module is an SQL enabled version of the counter module.
+@@ -669,7 +669,7 @@
  	#  totally dependent on the SQL module to process Accounting
  	#  packets.
  	#
@@ -17,4 +17,4 @@
 +	#$INCLUDE sql/mysql/counter.conf
  	#$INCLUDE sql/postgresql/counter.conf
  
- 	# $INCLUDE sqlippool.conf
+ 	#



From davej at fedoraproject.org  Thu Sep 25 19:58:44 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Thu, 25 Sep 2008 19:58:44 +0000 (UTC)
Subject: rpms/kernel/devel Makefile, 1.80, 1.81 config-debug, 1.17,
	1.18 config-generic, 1.169, 1.170 config-nodebug, 1.19,
	1.20 kernel.spec, 1.982, 1.983
Message-ID: <20080925195844.15D5F7010A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19837

Modified Files:
	Makefile config-debug config-generic config-nodebug 
	kernel.spec 
Log Message:
Disable noisy ALSA debug spew.


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- Makefile	24 Sep 2008 01:57:20 -0000	1.80
+++ Makefile	25 Sep 2008 19:58:13 -0000	1.81
@@ -62,7 +62,6 @@
 	@perl -pi -e 's/# CONFIG_DEBUG_OBJECTS_TIMERS is not set/CONFIG_DEBUG_OBJECTS_TIMERS=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_X86_PTDUMP is not set/CONFIG_X86_PTDUMP=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_CAN_DEBUG_DEVICES is not set/CONFIG_CAN_DEBUG_DEVICES=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_SND_DEBUG_VERBOSE is not set/CONFIG_SND_DEBUG_VERBOSE=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_MODULE_FORCE_UNLOAD is not set/CONFIG_MODULE_FORCE_UNLOAD=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_SYSCTL_SYSCALL_CHECK is not set/CONFIG_SYSCTL_SYSCALL_CHECK=y/' config-nodebug
 
@@ -100,7 +99,6 @@
 	@perl -pi -e 's/CONFIG_DEBUG_OBJECTS_TIMERS=y/# CONFIG_DEBUG_OBJECTS_TIMERS is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_X86_PTDUMP=y/# CONFIG_X86_PTDUMP is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_CAN_DEBUG_DEVICES=y/# CONFIG_CAN_DEBUG_DEVICES is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_SND_DEBUG_VERBOSE=y/# CONFIG_SND_DEBUG_VERBOSE is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_MODULE_FORCE_UNLOAD=y/# CONFIG_MODULE_FORCE_UNLOAD is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_SYSCTL_SYSCALL_CHECK=y/# CONFIG_SYSCTL_SYSCALL_CHECK is not set/' config-nodebug
 


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- config-debug	20 Aug 2008 20:11:09 -0000	1.17
+++ config-debug	25 Sep 2008 19:58:13 -0000	1.18
@@ -1,7 +1,5 @@
 CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SND_DEBUG=y
-CONFIG_SND_DEBUG_DETECT=y
-CONFIG_SND_DEBUG_VERBOSE=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 
 CONFIG_DEBUG_MUTEXES=y


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- config-generic	23 Sep 2008 23:01:38 -0000	1.169
+++ config-generic	25 Sep 2008 19:58:13 -0000	1.170
@@ -2464,6 +2464,7 @@
 # Advanced Linux Sound Architecture
 #
 CONFIG_SND=y
+# CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_VERBOSE_PROCFS=y
 CONFIG_SND_SEQUENCER=y
 CONFIG_SND_SEQ_DUMMY=m


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- config-nodebug	20 Aug 2008 20:11:09 -0000	1.19
+++ config-nodebug	25 Sep 2008 19:58:13 -0000	1.20
@@ -1,7 +1,5 @@
 CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SND_DEBUG=y
-CONFIG_SND_DEBUG_DETECT=y
-CONFIG_SND_DEBUG_VERBOSE=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 
 CONFIG_DEBUG_MUTEXES=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.982
retrieving revision 1.983
diff -u -r1.982 -r1.983
--- kernel.spec	25 Sep 2008 19:34:44 -0000	1.982
+++ kernel.spec	25 Sep 2008 19:58:13 -0000	1.983
@@ -1734,6 +1734,9 @@
 
 %changelog
 * Thu Sep 25 2008 Dave Jones <davej at redhat.com>
+- Disable noisy ALSA debug spew.
+
+* Thu Sep 25 2008 Dave Jones <davej at redhat.com>
 - Disable building kdump kernels for ppc64 for now.
 
 * Thu Sep 25 2008 Dave Jones <davej at redhat.com>



From transif at fedoraproject.org  Thu Sep 25 20:06:23 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 25 Sep 2008 20:06:23 +0000 (UTC)
Subject: comps/po et.po,1.12,1.13
Message-ID: <20080925200623.338EF7010A@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21357/po

Modified Files:
	et.po 
Log Message:
    2008-09-25  T??ivo Leedj??rv <toivol at gmail.com> (via toivol at fedoraproject.org)
    
      * po/et.po: Updated Estonian translation.
    



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.12 -r 1.13 et.po
Index: et.po
===================================================================
RCS file: /cvs/pkgs/comps/po/et.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- et.po	17 Sep 2008 22:44:34 -0000	1.12
+++ et.po	25 Sep 2008 20:05:52 -0000	1.13
@@ -1,5467 +1,1718 @@
-#
-#
-# translation of et.po to Estonian
-#
-#
-#
-#
-#
+# translation of comps to Estonian
 #
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 # Allan Sims <allsi at eau.ee>, 2004.
 # Antti Markus <antti.markus at starman.ee>, 2004.
+# T??ivo Leedj??rv <toivol at gmail.com>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: et\n"
+"Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2005-07-27 13:42+0200\n"
-"Last-Translator: Allan Sims <allan.sims at eau.ee>\n"
+"POT-Creation-Date: 2008-09-22 09:26+0000\n"
+"PO-Revision-Date: 2008-09-25 23:02+0300\n"
+"Last-Translator: T??ivo Leedj??rv <toivol at gmail.com>\n"
 "Language-Team: Estonian <Eesti>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.2\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.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
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr "Kergekaaluline t????laua keskkond, mis t????tab h??sti low end masinates."
+msgstr "V??ikese ressursivajadusega t????lauakeskkond, mis sobib v??iksema v??imsusega arvutitesse."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../comps-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:2
+#: ../comps-el4.xml.in.h:1
+#: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
-msgstr "Administratiivsed vahendid"
+msgstr "Haldusvahendid"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
+#: ../comps-f7.xml.in.h:3
+#: ../comps-f8.xml.in.h:3
+#: ../comps-f9.xml.in.h:3
 #: ../comps-f10.xml.in.h:3
 msgid "Afrikaans Support"
-msgstr "afrikaansi keele toetus"
+msgstr "Afrikaani keele tugi"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
+#: ../comps-f7.xml.in.h:4
+#: ../comps-f8.xml.in.h:4
+#: ../comps-f9.xml.in.h:4
 #: ../comps-f10.xml.in.h:4
-#, fuzzy
 msgid "Albanian Support"
-msgstr "rumeenia keele toetus"
+msgstr "Albaania keele tugi"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../comps-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:5
+#: ../comps-el4.xml.in.h:2
+#: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Rakendused"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
+#: ../comps-f7.xml.in.h:6
+#: ../comps-f8.xml.in.h:6
+#: ../comps-f9.xml.in.h:6
 #: ../comps-f10.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
-msgstr ""
+msgstr "Rakendused k??iksuguste ??lesannete t??itmiseks"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../comps-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:7
+#: ../comps-el4.xml.in.h:4
+#: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
-msgstr "araabia keele toetus"
+msgstr "Araabia keele tugi"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
-#, fuzzy
+#: ../comps-f7.xml.in.h:8
+#: ../comps-f8.xml.in.h:8
+#: ../comps-f9.xml.in.h:8
+#: ../comps-f10.xml.in.h:8
+#: ../comps-el4.xml.in.h:5
+#: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
-msgstr "rumeenia keele toetus"
+msgstr "Armeenia keele tugi"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
+#: ../comps-f7.xml.in.h:9
+#: ../comps-f8.xml.in.h:9
+#: ../comps-f9.xml.in.h:9
 #: ../comps-f10.xml.in.h:9
 msgid "Assamese Support"
-msgstr "assamese keele toetus"
+msgstr "Assami keele tugi"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../comps-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:10
+#: ../comps-el4.xml.in.h:6
+#: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
-msgstr "Loomine ja avaldamine"
+msgstr "Loometegevus ja kirjastamine"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
+#: ../comps-f7.xml.in.h:11
+#: ../comps-f8.xml.in.h:11
+#: ../comps-f9.xml.in.h:11
 #: ../comps-f10.xml.in.h:11
 msgid "Base"
-msgstr "Baas"
+msgstr "Aluss??steem"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7
-#, fuzzy
+#: ../comps-f7.xml.in.h:12
+#: ../comps-f8.xml.in.h:12
+#: ../comps-f9.xml.in.h:12
+#: ../comps-f10.xml.in.h:12
+#: ../comps-el4.xml.in.h:7
+#: ../comps-el5.xml.in.h:7
 msgid "Base System"
-msgstr "S??steem"
+msgstr "P??his??steem"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
+#: ../comps-f7.xml.in.h:13
+#: ../comps-f8.xml.in.h:13
+#: ../comps-f9.xml.in.h:13
 #: ../comps-f10.xml.in.h:13
 msgid "Basic support for the Ruby programming language."
-msgstr "Baastoetus Ruby programmeerimiskeelele."
+msgstr "Vajalik tugi Ruby programmeerimiskeele kasutamiseks."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
+#: ../comps-f7.xml.in.h:14
+#: ../comps-f8.xml.in.h:14
+#: ../comps-f9.xml.in.h:14
 #: ../comps-f10.xml.in.h:14
 msgid "Basque Support"
-msgstr "baski keele toetus"
+msgstr "Baski keele tugi"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
+#: ../comps-f7.xml.in.h:15
+#: ../comps-f8.xml.in.h:15
+#: ../comps-f9.xml.in.h:15
 #: ../comps-f10.xml.in.h:15
-#, fuzzy
 msgid "Belarusian Support"
-msgstr "bulgaaria keele toetus"
+msgstr "Valgevene keele tugi"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
+#: ../comps-f7.xml.in.h:16
[...6181 lines suppressed...]
-#~ "<grouplist> <groupreq>admin-tools</groupreq> <groupreq>base</groupreq> "
-#~ "<groupreq>base-x</groupreq> <groupreq>dialup</groupreq> "
-#~ "<groupreq>editors</groupreq> <groupreq>games</groupreq> "
-#~ "<groupreq>graphical-internet</groupreq> <groupreq>graphics</groupreq> "
-#~ "<groupreq>office</groupreq> <groupreq>printing</groupreq> <groupreq>sound-"
-#~ "and-video</groupreq> <groupreq>text-internet</groupreq> </grouplist> </"
-#~ "group> <group> <id>x-software-development</id> <_name>X Tarkvara arendus</"
-#~ "_name> <_description>Need rakendused lubavad sul arendada rakendusi X "
-#~ "Akna S??steemile."
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<grouplist> <groupreq>admin-tools</groupreq> <groupreq>base</groupreq> "
-#~ "<groupreq>dialup</groupreq> <groupreq>printing</groupreq> "
-#~ "<groupreq>server-cfg</groupreq> <groupreq>smb-server</groupreq> "
-#~ "<groupreq>text-internet</groupreq> <groupreq>web-server</groupreq> </"
-#~ "grouplist> </group> <group> <id>server-cfg</id> <_name>Server "
-#~ "Configuration Tools</_name> <_description>This group contains all of Red "
-#~ "Hat's custom server configuration tools."
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<grouplist> <groupreq>admin-tools</groupreq> <groupreq>base</groupreq> "
-#~ "<groupreq>dialup</groupreq> <groupreq>printing</groupreq> "
-#~ "<groupreq>server-cfg</groupreq> <groupreq>smb-server</groupreq> "
-#~ "<groupreq>text-internet</groupreq> <groupreq>web-server</groupreq> </"
-#~ "grouplist> </group> <group> <id>server-cfg</id> <_name>Server "
-#~ "Seadistamise Vahendid</_name> <_description>See grupp sisaldab k??iki Red "
-#~ "Hat serveri seadistamise vahendeid."
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<grouplist> <groupreq>gnome-desktop</groupreq> </grouplist> </group> "
-#~ "<group> <id>gnome-desktop</id> <_name>GNOME Desktop Environment</_name> "
-#~ "<_description>GNOME is a powerful, graphical user interface which "
-#~ "includes a panel, desktop, system icons, and a graphical file manager."
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<grouplist> <groupreq>gnome-desktop</groupreq> </grouplist> </group> "
-#~ "<group> <id>gnome-desktop</id> <_name>GNOME T????laua Keskkond</_name> "
-#~ "<_description>GNOME on tugev graafiline kasutajaliides, mis sisaldab nii "
-#~ "paneeli, t????lauda, s??steemi ikoone kui ka graafilist failihaldurit."
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<grouplist> <groupreq>kde-desktop</groupreq> </grouplist> </group> "
-#~ "<group> <id>kde-desktop</id> <_name>KDE (K Desktop Environment)</_name> "
-#~ "<_description>KDE is a powerful, graphical user interface which includes "
-#~ "a panel, desktop, system icons, and a graphical file manager."
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<grouplist> <groupreq>kde-desktop</groupreq> </grouplist> </group> "
-#~ "<group> <id>kde-desktop</id> <_name>KDE (K T????laua Keskkond)</_name> "
-#~ "<_description>KDE on tugev graafiline kasutajaliides, mis sisaldab nii "
-#~ "paneeli, t????lauda, s??steemi ikoone kui ka graafilist failihaldurit."
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>ar</langonly> <packagelist> <packagereq type=\"mandatory"
-#~ "\">fonts-arabic</packagereq> </packagelist> </group> <group> <id>assamese-"
-#~ "support</id> <_name>Assamese Support</_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>ar</langonly> <packagelist> <packagereq type=\"mandatory"
-#~ "\">fonts-arabic</packagereq> </packagelist> </group> <group> <id>assamese-"
-#~ "support</id> <_name>Assamese Toetus</_name> <_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>bn</langonly> <packagelist> <packagereq type=\"default\">fonts-"
-#~ "bengali</packagereq> <packagereq type=\"default\">iiimf-le-unit</"
-#~ "packagereq> <packagereq type=\"default\">ttfonts-bn</packagereq> </"
-#~ "packagelist> </group> <group> <id>brazilian-support</id> <_name>Brazilian "
-#~ "Portuguese Support</_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>bn</langonly> <packagelist> <packagereq type=\"default\">fonts-"
-#~ "bengali</packagereq> <packagereq type=\"default\">iiimf-le-unit</"
-#~ "packagereq> <packagereq type=\"default\">ttfonts-bn</packagereq> </"
-#~ "packagelist> </group> <group> <id>brazilian-support</id> <_name>brasiilia "
-#~ "portugali keele toetus</_name> <_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>et</langonly> <grouplist> <groupreq>ISO8859-2-support</"
-#~ "groupreq> </grouplist> <packagelist> <packagereq type=\"optional\" "
-#~ "requires=\"kdelibs\">kde-i18n-Estonian</packagereq> </packagelist> </"
-#~ "group> <group> <id>ftp-server</id> <_name>FTP Server</_name> "
-#~ "<_description>These tools allow you to run an FTP server on the system."
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>et</langonly> <grouplist> <groupreq>ISO8859-2-support</"
-#~ "groupreq> </grouplist> <packagelist> <packagereq type=\"optional\" "
-#~ "requires=\"kdelibs\">kde-i18n-Estonian</packagereq> </packagelist> </"
-#~ "group> <group> <id>ftp-server</id> <_name>FTP Server</_name> "
-#~ "<_description>Need vahendid aitavad sul jooksutada FTP serverit."
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>hu</langonly> <grouplist> <groupreq>ISO8859-2-support</"
-#~ "groupreq> </grouplist> <packagelist> <packagereq type=\"optional\" "
-#~ "requires=\"kdelibs\">kde-i18n-Hungarian</packagereq> </packagelist> </"
-#~ "group> <group> <id>ISO8859-2-support</id> <_name>ISO8859-2 Support</"
-#~ "_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>hu</langonly> <grouplist> <groupreq>ISO8859-2-support</"
-#~ "groupreq> </grouplist> <packagelist> <packagereq type=\"optional\" "
-#~ "requires=\"kdelibs\">kde-i18n-Hungarian</packagereq> </packagelist> </"
-#~ "group> <group> <id>ISO8859-2-support</id> <_name>ISO8859-2 toetus</_name> "
-#~ "<_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>pa</langonly> <packagelist> <packagereq type=\"default\">iiimf-"
-#~ "le-unit</packagereq> <packagereq type=\"default\">ttfonts-pa</packagereq> "
-#~ "</packagelist> </group> <group> <id>romanian-support</id> <_name>Romanian "
-#~ "Support</_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>pa</langonly> <packagelist> <packagereq type=\"default\">iiimf-"
-#~ "le-unit</packagereq> <packagereq type=\"default\">ttfonts-pa</packagereq> "
-#~ "</packagelist> </group> <group> <id>romanian-support</id> <_name>rumeenia "
-#~ "keele toetus</_name> <_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>ru</langonly> <grouplist> <groupreq>cyrillic-support</groupreq> "
-#~ "</grouplist> <packagelist> <packagereq type=\"optional\" requires="
-#~ "\"kdelibs\">kde-i18n-Russian</packagereq> <packagereq type=\"optional\" "
-#~ "requires=\"man-pages\">man-pages-ru</packagereq> </packagelist> </group> "
-#~ "<group> <id>serbian-support</id> <_name>Serbian Support</_name> "
-#~ "<_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>ru</langonly> <grouplist> <groupreq>cyrillic-support</groupreq> "
-#~ "</grouplist> <packagelist> <packagereq type=\"optional\" requires="
-#~ "\"kdelibs\">kde-i18n-Russian</packagereq> <packagereq type=\"optional\" "
-#~ "requires=\"man-pages\">man-pages-ru</packagereq> </packagelist> </group> "
-#~ "<group> <id>serbian-support</id> <_name>serbia keele toetus</_name> "
-#~ "<_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>sk</langonly> <grouplist> <groupreq>ISO8859-2-support</"
-#~ "groupreq> </grouplist> <packagelist> <packagereq type=\"optional\" "
-#~ "requires=\"kdelibs\">kde-i18n-Slovak</packagereq> </packagelist> </group> "
-#~ "<group> <id>slovenian-support</id> <_name>Slovenian Support</_name> "
-#~ "<_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>sk</langonly> <grouplist> <groupreq>ISO8859-2-support</"
-#~ "groupreq> </grouplist> <packagelist> <packagereq type=\"optional\" "
-#~ "requires=\"kdelibs\">kde-i18n-Slovak</packagereq> </packagelist> </group> "
-#~ "<group> <id>slovenian-support</id> <_name>sloveenia keele toetus</_name> "
-#~ "<_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>ta</langonly> <packagelist> <packagereq type=\"default\">iiimf-"
-#~ "le-unit</packagereq> <packagereq type=\"default\">ttfonts-ta</packagereq> "
-#~ "</packagelist> </group> <group> <id>text-internet</id> <_name>Text-based "
-#~ "Internet</_name> <_description>This group includes text-based email, Web, "
-#~ "and chat clients. These applications do not require the X Window System."
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>ta</langonly> <packagelist> <packagereq type=\"default\">iiimf-"
-#~ "le-unit</packagereq> <packagereq type=\"default\">ttfonts-ta</packagereq> "
-#~ "</packagelist> </group> <group> <id>text-internet</id> <_name>Text-based "
-#~ "Internet</_name> <_description>This group includes text-based email, Web, "
-#~ "and chat clients. These applications do not require the X Window System."
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>tr</langonly> <grouplist> <groupreq>ISO8859-9-support</"
-#~ "groupreq> </grouplist> <packagelist> <packagereq type=\"optional\" "
-#~ "requires=\"kdelibs\">kde-i18n-Turkish</packagereq> </packagelist> </"
-#~ "group> <group> <id>ukrainian-support</id> <_name>Ukrainian Support</"
-#~ "_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>tr</langonly> <grouplist> <groupreq>ISO8859-9-support</"
-#~ "groupreq> </grouplist> <packagelist> <packagereq type=\"optional\" "
-#~ "requires=\"kdelibs\">kde-i18n-Turkish</packagereq> </packagelist> </"
-#~ "group> <group> <id>ukrainian-support</id> <_name>ukraina keele toetus</"
-#~ "_name> <_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<packagelist> <packagereq type=\"mandatory\">fonts-KOI8-R</packagereq> "
-#~ "<packagereq type=\"mandatory\">fonts-KOI8-R-100dpi</packagereq> "
-#~ "<packagereq type=\"optional\" requires=\"xorg-x11\">fonts-xorg-cyrillic</"
-#~ "packagereq> </packagelist> </group> <group> <id>czech-support</id> "
-#~ "<_name>Czech Support</_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<packagelist> <packagereq type=\"mandatory\">fonts-KOI8-R</packagereq> "
-#~ "<packagereq type=\"mandatory\">fonts-KOI8-R-100dpi</packagereq> "
-#~ "<packagereq type=\"optional\" requires=\"xorg-x11\">fonts-xorg-cyrillic</"
-#~ "packagereq> </packagelist> </group> <group> <id>czech-support</id> "
-#~ "<_name>t??ehhi keele toetus</_name> <_description>"



From rdieter at fedoraproject.org  Thu Sep 25 20:11:08 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 25 Sep 2008 20:11:08 +0000 (UTC)
Subject: rpms/eigen2/F-9 .cvsignore, 1.2, 1.3 eigen2.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <20080925201108.5865C7010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/eigen2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22290

Modified Files:
	.cvsignore eigen2.spec sources 
Log Message:
* Mon Sep 22 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.4.beta1
- eigen-2.0-beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Sep 2008 16:42:12 -0000	1.2
+++ .cvsignore	25 Sep 2008 20:10:37 -0000	1.3
@@ -1 +1 @@
-eigen-2.0-alpha7.tar.bz2
+eigen-2.0-beta1.tar.bz2


Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-9/eigen2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eigen2.spec	12 Sep 2008 16:42:12 -0000	1.1
+++ eigen2.spec	25 Sep 2008 20:10:37 -0000	1.2
@@ -3,12 +3,12 @@
 # http://bugzilla.redhat.com/459705
 
 #define _with_check -DBUILD_TESTS=ON 
-%define pre alpha7
+%define pre beta1 
 
 Name:    eigen2
 Summary: A lightweight C++ template library for vector and matrix math
 Version: 2.0 
-Release: 0.3.%{pre}%{?dist} 
+Release: 0.4.%{pre}%{?dist} 
 Group:   System Environment/Libraries
 License: GPLv2+ or LGPLv3+
 URL:     http://eigen.tuxfamily.org/
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.4.beta1
+- eigen-2.0-beta1
+
 * Mon Aug 25 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.3.alpha7
 - disable buildtime tests, which tickle gcc bugs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Sep 2008 16:42:12 -0000	1.2
+++ sources	25 Sep 2008 20:10:37 -0000	1.3
@@ -1 +1 @@
-97f0d655dd020df6fa9d40dcdf967ef2  eigen-2.0-alpha7.tar.bz2
+6631f3fb3145b2f9a980cd64431104aa  eigen-2.0-beta1.tar.bz2



From scop at fedoraproject.org  Thu Sep 25 20:28:30 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 25 Sep 2008 20:28:30 +0000 (UTC)
Subject: rpms/vdr/devel vdr.spec,1.29,1.30 vdr-README.package,1.6,1.7
Message-ID: <20080925202830.5BB8C7010A@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25867

Modified Files:
	vdr.spec vdr-README.package 
Log Message:
* Thu Sep 25 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-6
- README.package updates.
- Specfile micro-cleanups.



Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- vdr.spec	7 Sep 2008 16:22:09 -0000	1.29
+++ vdr.spec	25 Sep 2008 20:27:59 -0000	1.30
@@ -21,7 +21,7 @@
 
 Name:           vdr
 Version:        1.6.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -193,7 +193,6 @@
   iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
 done
 
-# TODO: all
 cp -p %{SOURCE5} reccmds.conf
 cp -p %{SOURCE13} timercmds.conf
 sed -e 's|/srv/audio|%{audiodir}|' %{SOURCE6} > commands.conf
@@ -298,7 +297,6 @@
 sed -i \
   -e 's|/usr/sbin/|%{_sbindir}/|'  \
   -e 's|/etc/vdr/|%{configdir}/|g' \
-  -e 's|/var/lib/vdr/|%{vardir}/|' \
   -e 's|VDR_USER|%{vdr_user}|'     \
   -e 's|VDR_GROUP|%{vdr_group}|'   \
   $RPM_BUILD_ROOT%{_initrddir}/vdr
@@ -496,6 +494,10 @@
 %endif # plugins
 
 %changelog
+* Thu Sep 25 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-6
+- README.package updates.
+- Specfile micro-cleanups.
+
 * Sun Sep  7 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-5
 - Work around Fedora buildsys not coping with "%%patch -F" (infrastructure
   ticket #817).


Index: vdr-README.package
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr-README.package,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vdr-README.package	7 Sep 2008 15:18:36 -0000	1.6
+++ vdr-README.package	25 Sep 2008 20:28:00 -0000	1.7
@@ -69,19 +69,19 @@
 /usr/lib*/vdr/bin directory and enabled in the default vdr command
 line built by the init script.  The script writes a time some time
 before the next configured timer (given by VDR, see the file INSTALL)
-to /var/lib/vdr/acpi-wakeup in a format suitable for catting to
-/proc/acpi/alarm, and shuts down the machine.  See commentary in the
-script for how to enable it and how to grant the required permissions
-to the vdr user so it can carry out these tasks.
+as a number of seconds to /var/lib/vdr/next-wakeup, and shuts down the
+machine.  See commentary in the script for how to enable it and how to
+grant the required permissions to the vdr user so it can carry out
+these tasks.
 
 To use the ACPI alarm feature present in many recent systems, adding a
-script like the supplied halt.local (see same directory as this file)
-to /sbin/halt.local (remember to make it executable!)  will cause the
-system to wake up at the time set by the above vdr-shutdown.sh,
-allowing one to shut down the system without having to manually start
-it for the next timed recording.  /sbin/halt.local, if it exists, is
-automatically executed by the system shutdown/reboot scripts at
-appropriate time.
+script like the supplied vdr-halt.local.sh (see same directory as this
+file) to /sbin/halt.local (remember to make it executable by the vdr
+user!)  will cause the system to wake up at the time set by the above
+vdr-shutdown.sh, allowing one to shut down the system without having
+to manually start it for the next timed recording.  /sbin/halt.local,
+if it exists, is automatically executed by the system shutdown/reboot
+scripts at appropriate time.
 
 Organizing recordings
 ---------------------



From pjones at fedoraproject.org  Thu Sep 25 20:36:52 2008
From: pjones at fedoraproject.org (Peter Jones)
Date: Thu, 25 Sep 2008 20:36:52 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.983,
	1.984 linux-2.6-silence-noise.patch, 1.20, 1.21
Message-ID: <20080925203652.34DB67010A@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27574

Modified Files:
	kernel.spec linux-2.6-silence-noise.patch 
Log Message:
* Thu Sep 25 2008 Peter Jones <pjones at redhat.com>
- Remove i8042 "No controller found." noise.



Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.983
retrieving revision 1.984
diff -u -r1.983 -r1.984
--- kernel.spec	25 Sep 2008 19:58:13 -0000	1.983
+++ kernel.spec	25 Sep 2008 20:36:21 -0000	1.984
@@ -1733,6 +1733,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Sep 25 2008 Peter Jones <pjones at redhat.com>
+- Remove i8042 "No controller found." noise.
+
 * Thu Sep 25 2008 Dave Jones <davej at redhat.com>
 - Disable noisy ALSA debug spew.
 

linux-2.6-silence-noise.patch:

Index: linux-2.6-silence-noise.patch
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/linux-2.6-silence-noise.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- linux-2.6-silence-noise.patch	23 Aug 2008 01:01:21 -0000	1.20
+++ linux-2.6-silence-noise.patch	25 Sep 2008 20:36:21 -0000	1.21
@@ -10,3 +10,34 @@
  	mutex_lock(&dpm_list_mtx);
  	if (dev->parent) {
  		if (dev->parent->power.status >= DPM_SUSPENDING)
+From b4e96f34c17e5a79cd28774cc722bb33e7e02c6e Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones at redhat.com>
+Date: Thu, 25 Sep 2008 16:23:33 -0400
+Subject: [PATCH] Don't print an error message just because there's no i8042 chip.
+
+Some systems, such as EFI-based Apple systems, won't necessarily have an
+i8042 to initialize.  We shouldn't be printing an error message in this
+case, since not detecting the chip is the correct behavior.
+---
+ drivers/input/serio/i8042.c |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
+index 170f71e..4f3e632 100644
+--- a/drivers/input/serio/i8042.c
++++ b/drivers/input/serio/i8042.c
+@@ -701,10 +701,8 @@ static int __devinit i8042_check_aux(void)
+ 
+ static int i8042_controller_check(void)
+ {
+-	if (i8042_flush() == I8042_BUFFER_SIZE) {
+-		printk(KERN_ERR "i8042.c: No controller found.\n");
++	if (i8042_flush() == I8042_BUFFER_SIZE)
+ 		return -ENODEV;
+-	}
+ 
+ 	return 0;
+ }
+-- 
+1.6.0.1
+



From spot at fedoraproject.org  Thu Sep 25 20:39:30 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 25 Sep 2008 20:39:30 +0000 (UTC)
Subject: rpms/lincity-ng/F-9 lincity-ng-1.92.beta-fix-f9-crash.patch, NONE, 
	1.1 lincity-ng.spec, 1.16, 1.17
Message-ID: <20080925203930.27C5D7010A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28136/F-9

Modified Files:
	lincity-ng.spec 
Added Files:
	lincity-ng-1.92.beta-fix-f9-crash.patch 
Log Message:
fix crash in f9 due to PHYSFS_getRealDir(file) trying to assign NULL to a std::string

lincity-ng-1.92.beta-fix-f9-crash.patch:

--- NEW FILE lincity-ng-1.92.beta-fix-f9-crash.patch ---
diff -up lincity-ng-1.92.beta/src/lincity-ng/MainLincity.cpp.BAD lincity-ng-1.92.beta/src/lincity-ng/MainLincity.cpp
--- lincity-ng-1.92.beta/src/lincity-ng/MainLincity.cpp.BAD	2008-09-25 15:39:36.000000000 -0400
+++ lincity-ng-1.92.beta/src/lincity-ng/MainLincity.cpp	2008-09-25 16:27:46.000000000 -0400
@@ -110,8 +110,15 @@ void saveCityNG( std::string newFilename
  * Load City and do setup for Lincity NG.
  */
 bool loadCityNG( std::string filename ){
+    std::string dir = "";
     /* FIXME crash on debian etch when 9_currentGameNG.scn does not exist */
-    std::string dir = PHYSFS_getRealDir(filename.c_str());
+    /* If PHYSFS_getRealDir doesn't find the file, it returns NULL. */
+    /* This causes a crash when trying to assign NULL to a std::string. */
+    if ( ! PHYSFS_getRealDir(filename.c_str()) ) {
+	return false;
+    } else {
+	dir = PHYSFS_getRealDir(filename.c_str());
+    }
     filename = dir + PHYSFS_getDirSeparator() + filename;
     if( file_exists( const_cast<char*>( filename.c_str()) ) ){
         load_city_2(const_cast<char*>(filename.c_str()));


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/F-9/lincity-ng.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lincity-ng.spec	23 Sep 2008 15:28:03 -0000	1.16
+++ lincity-ng.spec	25 Sep 2008 20:38:59 -0000	1.17
@@ -1,11 +1,12 @@
 Name:		lincity-ng
 Version:	1.92
-Release:	0.2.beta%{?dist}
+Release:	0.3.beta%{?dist}
 License:	GPLv2+
 Group:		Amusements/Games
 Summary:	City Simulation Game
 URL:		http://lincity-ng.berlios.de/
 Source0:	http://download.berlios.de/lincity-ng/lincity-ng-%{version}.beta.tar.bz2
+Patch0:		lincity-ng-1.92.beta-fix-f9-crash.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	jam, physfs-devel, zlib-devel, libxml2-devel
 BuildRequires:	SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_gfx-devel
@@ -31,6 +32,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}.beta
+%patch0 -p1 -b .fix-f9-crash
 sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules
 sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules
 sed -i 's|lincity-ng.png|lincity-ng|g' lincity-ng.desktop
@@ -65,6 +67,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Thu Sep 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.92-0.3.beta
+- fix f9 crash (upstream bug #14544)
+
 * Tue Sep 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.92-0.2.beta
 - fix typo in spec file
 



From spot at fedoraproject.org  Thu Sep 25 20:39:30 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 25 Sep 2008 20:39:30 +0000 (UTC)
Subject: rpms/lincity-ng/devel lincity-ng-1.92.beta-fix-f9-crash.patch, NONE,
	1.1 lincity-ng.spec, 1.16, 1.17
Message-ID: <20080925203930.47B777010A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28136/devel

Modified Files:
	lincity-ng.spec 
Added Files:
	lincity-ng-1.92.beta-fix-f9-crash.patch 
Log Message:
fix crash in f9 due to PHYSFS_getRealDir(file) trying to assign NULL to a std::string

lincity-ng-1.92.beta-fix-f9-crash.patch:

--- NEW FILE lincity-ng-1.92.beta-fix-f9-crash.patch ---
diff -up lincity-ng-1.92.beta/src/lincity-ng/MainLincity.cpp.BAD lincity-ng-1.92.beta/src/lincity-ng/MainLincity.cpp
--- lincity-ng-1.92.beta/src/lincity-ng/MainLincity.cpp.BAD	2008-09-25 15:39:36.000000000 -0400
+++ lincity-ng-1.92.beta/src/lincity-ng/MainLincity.cpp	2008-09-25 16:27:46.000000000 -0400
@@ -110,8 +110,15 @@ void saveCityNG( std::string newFilename
  * Load City and do setup for Lincity NG.
  */
 bool loadCityNG( std::string filename ){
+    std::string dir = "";
     /* FIXME crash on debian etch when 9_currentGameNG.scn does not exist */
-    std::string dir = PHYSFS_getRealDir(filename.c_str());
+    /* If PHYSFS_getRealDir doesn't find the file, it returns NULL. */
+    /* This causes a crash when trying to assign NULL to a std::string. */
+    if ( ! PHYSFS_getRealDir(filename.c_str()) ) {
+	return false;
+    } else {
+	dir = PHYSFS_getRealDir(filename.c_str());
+    }
     filename = dir + PHYSFS_getDirSeparator() + filename;
     if( file_exists( const_cast<char*>( filename.c_str()) ) ){
         load_city_2(const_cast<char*>(filename.c_str()));


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/lincity-ng.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lincity-ng.spec	23 Sep 2008 15:28:03 -0000	1.16
+++ lincity-ng.spec	25 Sep 2008 20:39:00 -0000	1.17
@@ -1,11 +1,12 @@
 Name:		lincity-ng
 Version:	1.92
-Release:	0.2.beta%{?dist}
+Release:	0.3.beta%{?dist}
 License:	GPLv2+
 Group:		Amusements/Games
 Summary:	City Simulation Game
 URL:		http://lincity-ng.berlios.de/
 Source0:	http://download.berlios.de/lincity-ng/lincity-ng-%{version}.beta.tar.bz2
+Patch0:		lincity-ng-1.92.beta-fix-f9-crash.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	jam, physfs-devel, zlib-devel, libxml2-devel
 BuildRequires:	SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_gfx-devel
@@ -31,6 +32,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}.beta
+%patch0 -p1 -b .fix-f9-crash
 sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules
 sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules
 sed -i 's|lincity-ng.png|lincity-ng|g' lincity-ng.desktop
@@ -65,6 +67,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Thu Sep 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.92-0.3.beta
+- fix f9 crash (upstream bug #14544)
+
 * Tue Sep 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.92-0.2.beta
 - fix typo in spec file
 



From athimm at fedoraproject.org  Thu Sep 25 20:40:11 2008
From: athimm at fedoraproject.org (Axel Thimm)
Date: Thu, 25 Sep 2008 20:40:11 +0000 (UTC)
Subject: rpms/arpack/devel arpack-etime.patch,NONE,1.1 arpack.spec,1.3,1.4
Message-ID: <20080925204011.107647010A@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/arpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28302/devel

Modified Files:
	arpack.spec 
Added Files:
	arpack-etime.patch 
Log Message:
etime_ fix for second.f

arpack-etime.patch:

--- NEW FILE arpack-etime.patch ---
diff -up ARPACK/UTIL/second.f.etime ARPACK/UTIL/second.f
--- ARPACK/UTIL/second.f.etime	2008-09-24 22:40:53.000000000 +0200
+++ ARPACK/UTIL/second.f	2008-09-24 22:42:03.000000000 +0200
@@ -21,7 +21,6 @@
 *     ..
 *     .. External Functions ..
       REAL               ETIME
-      EXTERNAL           ETIME
 *     ..
 *     .. Executable Statements ..
 *


Index: arpack.spec
===================================================================
RCS file: /cvs/extras/rpms/arpack/devel/arpack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- arpack.spec	25 Aug 2008 09:13:40 -0000	1.3
+++ arpack.spec	25 Sep 2008 20:39:40 -0000	1.4
@@ -3,7 +3,7 @@
 Summary: Fortran77 subroutines for solving large scale eigenvalue problems
 Name: arpack
 Version: 2.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: RiceBSD
 Group: Development/Libraries
 URL: http://www.caam.rice.edu/software/ARPACK/
@@ -16,6 +16,7 @@
 Patch0: arpack-2.1-redhat.patch
 # see http://www.ann.jussieu.fr/pipermail/freefempp/2006/000213.html
 Patch1: arpack-second-bug.patch
+Patch2: arpack-etime.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: %{?with_gfortran:gcc-gfortran}%{!?with_gfortran:/usr/bin/f77}
 # The correct dependency would be the following, but it doesn't exist on RHEL4/3
@@ -58,6 +59,7 @@
 %setup -q -b 1 -n ARPACK
 %patch0 -p1 -b .rh
 %patch1 -p1 -b .sb
+%patch2 -p1 -b .etime
 mkdir static shared
 
 %build
@@ -109,6 +111,9 @@
 %{_libdir}/libarpack.a
 
 %changelog
+* Wed Sep 24 2008 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 2.1-10
+- fix libarpack.so: undefined reference to `etime_' with recent gfortran
+
 * Mon Aug 25 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.1-9
 - Patch0 and %%patch make recent rpm silenty fail.
 



From davej at fedoraproject.org  Thu Sep 25 20:58:16 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Thu, 25 Sep 2008 20:58:16 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.170, 1.171 kernel.spec, 1.984,
	1.985
Message-ID: <20080925205816.C16537010A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32468

Modified Files:
	config-generic kernel.spec 
Log Message:
Change some more netfilter bits we always load to be built-ins.


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- config-generic	25 Sep 2008 19:58:13 -0000	1.170
+++ config-generic	25 Sep 2008 20:57:46 -0000	1.171
@@ -786,7 +786,7 @@
 CONFIG_BRIDGE=m
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_ADVANCED=y
-CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK=y
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
@@ -828,7 +828,7 @@
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATE=y
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
@@ -883,7 +883,7 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_REJECT=y
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
@@ -891,8 +891,9 @@
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_FILTER=m
+
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
 
 #
 # IPv6: Netfilter Configuration


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.984
retrieving revision 1.985
diff -u -r1.984 -r1.985
--- kernel.spec	25 Sep 2008 20:36:21 -0000	1.984
+++ kernel.spec	25 Sep 2008 20:57:46 -0000	1.985
@@ -1733,6 +1733,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Sep 25 2008 Dave Jones <davej at redhat.com>
+- Change some more netfilter bits we always load to be built-ins.
+
 * Thu Sep 25 2008 Peter Jones <pjones at redhat.com>
 - Remove i8042 "No controller found." noise.
 



From pkgdb at fedoraproject.org  Thu Sep 25 21:12:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 21:12:13 +0000
Subject: [pkgdb] livecd-tools had acl change status
Message-ID: <20080925211213.D0CFE208DA0@bastion.fedora.phx.redhat.com>

kanarip has set the watchbugzilla acl on livecd-tools (Fedora EPEL 5) to Approved for apevec

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/livecd-tools



From pkgdb at fedoraproject.org  Thu Sep 25 21:12:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 25 Sep 2008 21:12:16 +0000
Subject: [pkgdb] livecd-tools had acl change status
Message-ID: <20080925211216.D88FA208DA6@bastion.fedora.phx.redhat.com>

kanarip has set the watchcommits acl on livecd-tools (Fedora EPEL 5) to Approved for apevec

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/livecd-tools



From davej at fedoraproject.org  Thu Sep 25 21:19:52 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Thu, 25 Sep 2008 21:19:52 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.171, 1.172 kernel.spec, 1.985,
	1.986
Message-ID: <20080925211952.51D167010A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4107

Modified Files:
	config-generic kernel.spec 
Log Message:
Disable the BT_HCIUSB driver.
  It sucks more power than BT_HCIBTUSB which has the same functionality.


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- config-generic	25 Sep 2008 20:57:46 -0000	1.171
+++ config-generic	25 Sep 2008 21:19:21 -0000	1.172
@@ -1523,7 +1523,9 @@
 # Bluetooth device drivers
 #
 CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIUSB=m
+# Disable the BT_HCIUSB driver.
+# It sucks more power than BT_HCIBTUSB which has the same functionality.
+# CONFIG_BT_HCIUSB is not set
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.985
retrieving revision 1.986
diff -u -r1.985 -r1.986
--- kernel.spec	25 Sep 2008 20:57:46 -0000	1.985
+++ kernel.spec	25 Sep 2008 21:19:21 -0000	1.986
@@ -1734,6 +1734,10 @@
 
 %changelog
 * Thu Sep 25 2008 Dave Jones <davej at redhat.com>
+- Disable the BT_HCIUSB driver.
+  It sucks more power than BT_HCIBTUSB which has the same functionality.
+
+* Thu Sep 25 2008 Dave Jones <davej at redhat.com>
 - Change some more netfilter bits we always load to be built-ins.
 
 * Thu Sep 25 2008 Peter Jones <pjones at redhat.com>



From rathann at fedoraproject.org  Thu Sep 25 21:25:44 2008
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Thu, 25 Sep 2008 21:25:44 +0000 (UTC)
Subject: rpms/gabedit/devel gabedit-gl2ps.patch, NONE, 1.1 .cvsignore, 1.3, 
	1.4 gabedit.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20080925212544.1B5667010A@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/gabedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5217

Modified Files:
	.cvsignore gabedit.spec sources 
Added Files:
	gabedit-gl2ps.patch 
Log Message:
* 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
- use system gl2ps


gabedit-gl2ps.patch:

--- NEW FILE gabedit-gl2ps.patch ---
diff -up Gabedit218Src/Makefile.gl2ps Gabedit218Src/Makefile
--- Gabedit218Src/Makefile.gl2ps	2008-09-25 23:00:34.000000000 +0200
+++ Gabedit218Src/Makefile	2008-09-25 23:00:21.000000000 +0200
@@ -44,6 +44,8 @@ ifneq ($(external_gl2ps),1)
 GL2PS     = gl2ps/*.o
 OBJECTS  += $(GL2PS)
 SUBDIRS  += gl2ps
+else
+OBJECTS  += -lgl2ps
 endif
  
 TARGETS = all clean dep


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jun 2008 09:40:00 -0000	1.3
+++ .cvsignore	25 Sep 2008 21:25:13 -0000	1.4
@@ -1 +1 @@
-GabeditSrc217.tar.gz
+Gabedit218Src.tar.gz


Index: gabedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/devel/gabedit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gabedit.spec	13 Jun 2008 09:40:00 -0000	1.2
+++ gabedit.spec	25 Sep 2008 21:25:13 -0000	1.3
@@ -1,13 +1,14 @@
-%define version	2.1.7
-%define tarver	217
+%define version	2.1.8
+%define tarver	218
 
 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://lasim.univ-lyon1.fr/perso/allouche/gabedit/GabeditSrc%{tarver}.tar.gz
+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
 Patch2:		%{name}-csh.patch
 URL:		http://gabedit.sourceforge.net/home.html
@@ -15,6 +16,7 @@
 Group:		Applications/Engineering
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:	desktop-file-utils
+BuildRequires:	gl2ps-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	gtkglarea2-devel
 BuildRequires:	libGLU-devel
@@ -59,7 +61,8 @@
 (vibration, geometry convergence, rotation, contours, planes colorcoded).
 
 %prep
-%setup -q -n GabeditSrc%{tarver}
+%setup -q -n Gabedit%{tarver}Src
+%patch0 -p1 -b .gl2ps
 %patch1 -p1 -b .gtkgl
 %patch2 -p1
 # remove bundled pre-built binaries
@@ -68,6 +71,16 @@
 %{__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"
@@ -111,6 +124,11 @@
 %{_datadir}/icons/hicolor/*/apps/*.png
 
 %changelog
+* 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
+- use system gl2ps
+
 * Fri Jun 13 2008 Dominik Mierzejewski <rpm at greysector.net> 2.1.7-1
 - updated to latest development version (2.1.7)
 - dropped obsolete patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Jun 2008 09:40:00 -0000	1.3
+++ sources	25 Sep 2008 21:25:13 -0000	1.4
@@ -1 +1 @@
-f77dbc90d92dc7f8fc4e52da58b53bac  GabeditSrc217.tar.gz
+d7cd7ff686773d608ce2bdc517eba2d4  Gabedit218Src.tar.gz



From mcepl at fedoraproject.org  Thu Sep 25 21:29:39 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Thu, 25 Sep 2008 21:29:39 +0000 (UTC)
Subject: rpms/pspp/devel pspp.spec,1.3,1.4
Message-ID: <20080925212939.0EB6E7010A@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/pspp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5885

Modified Files:
	pspp.spec 
Log Message:
Fix CFLAGS for the current gcc


Index: pspp.spec
===================================================================
RCS file: /cvs/extras/rpms/pspp/devel/pspp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pspp.spec	7 Jul 2008 08:34:09 -0000	1.3
+++ pspp.spec	25 Sep 2008 21:29:08 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           pspp
 Version:        0.6.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A program for statistical analysis of sampled data
 
 Group:          Applications/Engineering
@@ -36,7 +36,8 @@
 mv $TMPTHANKS THANKS
 
 %build
-%configure --disable-static --disable-rpath
+%configure CFLAGS="${CFLAGS:-%optflags} -fgnu89-inline" \
+    --disable-static --disable-rpath
 make %{?_smp_mflags}
 cp -p %{SOURCE1} psppire.desktop
 
@@ -86,6 +87,9 @@
 %{_datadir}/applications/fedora-psppire.desktop
 
 %changelog
+* Thu Sep 25 2008 Mat??j Cepl <mcepl at redhat.com> - 0.6.0-8
+- Fix wrong CFLAGS -- add -fgnu89-inline
+
 * Mon Jul 07 2008 Matej Cepl <mcepl at redhat.com> 0.6.0-7
 - Fix BuildRequires.
 



From mpg at fedoraproject.org  Thu Sep 25 21:43:56 2008
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Thu, 25 Sep 2008 21:43:56 +0000 (UTC)
Subject: rpms/xulrunner/OLPC-3 mozilla-pkgconfig.patch, 1.10, 1.11 sources, 
	1.51, 1.52 xulrunner-version.patch, 1.1, 1.2 xulrunner.spec,
	1.132, 1.133
Message-ID: <20080925214356.B15AE7010A@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/xulrunner/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8814

Modified Files:
	mozilla-pkgconfig.patch sources xulrunner-version.patch 
	xulrunner.spec 
Log Message:
* Thu Sep 25 2008 Marco Pesenti Gritti <mpg at redhat.com> - 1.9.0.2-1
- Update to 1.9.0.2



mozilla-pkgconfig.patch:

Index: mozilla-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-3/mozilla-pkgconfig.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mozilla-pkgconfig.patch	29 Jan 2008 16:25:09 -0000	1.10
+++ mozilla-pkgconfig.patch	25 Sep 2008 21:43:56 -0000	1.11
@@ -1,6 +1,6 @@
 diff -up mozilla/config/autoconf.mk.in.pk mozilla/config/autoconf.mk.in
---- mozilla/config/autoconf.mk.in.pk	2008-01-22 03:50:04.000000000 +0100
-+++ mozilla/config/autoconf.mk.in	2008-01-29 17:18:01.000000000 +0100
+--- mozilla/config/autoconf.mk.in.pk	2008-05-05 23:08:14.000000000 +0200
++++ mozilla/config/autoconf.mk.in	2008-06-26 13:38:41.000000000 +0200
 @@ -58,14 +58,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
@@ -19,19 +19,46 @@
  
  DIST		= $(DEPTH)/dist
  LIBXUL_SDK      = @LIBXUL_SDK@
-diff -up mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in
---- mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk	2008-01-10 10:17:49.000000000 +0100
-+++ mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in	2008-01-29 17:19:25.000000000 +0100
-@@ -1,5 +1,6 @@
+diff -up mozilla/xulrunner/installer/libxul-embedding.pc.in.pk mozilla/xulrunner/installer/libxul-embedding.pc.in
+--- mozilla/xulrunner/installer/libxul-embedding.pc.in.pk	2007-08-03 16:46:28.000000000 +0200
++++ mozilla/xulrunner/installer/libxul-embedding.pc.in	2008-06-26 13:41:12.000000000 +0200
+@@ -1,7 +1,7 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
-+libdir=%libdir%
  includedir=%includedir%
+-idldir=%idldir%
++idldir=%idldir%/stable
+ includetype=stable
  
- Name: mozilla-gtkembedmoz
+ # Note: the default pkg-config cflags will only list include directories
+@@ -11,5 +11,6 @@ includetype=stable
+ Name: libxul-embedding
+ Description: Static library for version-independent embedding of the Mozilla runtime
+ Version: %MOZILLA_VERSION%
+-Libs: -L${sdkdir}/lib -lxpcomglue
++Requires: %NSPR_NAME% >= %NSPR_VERSION%
++Libs: -L${sdkdir}/sdk/lib -lxpcomglue
+ Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
+diff -up mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in
+--- mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk	2008-01-05 07:50:34.000000000 +0100
++++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in	2008-06-26 13:41:25.000000000 +0200
+@@ -1,11 +1,12 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
+-idldir=%idldir%
++idldir=%idldir%/unstable
+ includetype=unstable
+ 
+ Name: libxul-embedding-unstable
+ Description: Static library for version-independent embedding of the Mozilla runtime (unstable API)
+ Version: %MOZILLA_VERSION%
++Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${sdkdir}/lib -lxpcomglue
+ Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
 diff -up mozilla/xulrunner/installer/libxul.pc.in.pk mozilla/xulrunner/installer/libxul.pc.in
 --- mozilla/xulrunner/installer/libxul.pc.in.pk	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul.pc.in	2008-01-29 17:18:01.000000000 +0100
++++ mozilla/xulrunner/installer/libxul.pc.in	2008-06-26 13:38:41.000000000 +0200
 @@ -1,7 +1,8 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
@@ -50,20 +77,9 @@
 +Libs: -L${sdkdir}/sdk/lib -lxpcomglue_s -lxul -lxpcom
  Cflags: -I${includedir}/${includetype} -fshort-wchar
 \ No newline at end of file
-diff -up mozilla/xulrunner/installer/Makefile.in.pk mozilla/xulrunner/installer/Makefile.in
---- mozilla/xulrunner/installer/Makefile.in.pk	2008-01-29 17:18:01.000000000 +0100
-+++ mozilla/xulrunner/installer/Makefile.in	2008-01-29 17:18:01.000000000 +0100
-@@ -117,6 +117,7 @@ endif
- 	-e "s|%includedir%|$(includedir)|" \
- 	-e "s|%idldir%|$(idldir)|" \
- 	-e "s|%sdkdir%|$(sdkdir)|" \
-+	-e "s|%libdir%|$(installdir)|" \
- 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
- 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
- 	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
 diff -up mozilla/xulrunner/installer/libxul-unstable.pc.in.pk mozilla/xulrunner/installer/libxul-unstable.pc.in
 --- mozilla/xulrunner/installer/libxul-unstable.pc.in.pk	2008-01-05 07:50:34.000000000 +0100
-+++ mozilla/xulrunner/installer/libxul-unstable.pc.in	2008-01-29 17:18:01.000000000 +0100
++++ mozilla/xulrunner/installer/libxul-unstable.pc.in	2008-06-26 13:38:41.000000000 +0200
 @@ -1,7 +1,8 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
@@ -74,40 +90,40 @@
  includetype=unstable
  
  Name: libxul
-diff -up mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in
---- mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk	2008-01-05 07:50:34.000000000 +0100
-+++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in	2008-01-29 17:18:01.000000000 +0100
-@@ -1,7 +1,7 @@
+diff -up mozilla/xulrunner/installer/Makefile.in.pk mozilla/xulrunner/installer/Makefile.in
+--- mozilla/xulrunner/installer/Makefile.in.pk	2008-04-10 16:50:48.000000000 +0200
++++ mozilla/xulrunner/installer/Makefile.in	2008-06-26 13:38:41.000000000 +0200
+@@ -116,6 +116,7 @@ endif
+ 	-e "s|%includedir%|$(includedir)|" \
+ 	-e "s|%idldir%|$(idldir)|" \
+ 	-e "s|%sdkdir%|$(sdkdir)|" \
++	-e "s|%libdir%|$(installdir)|" \
+ 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
+ 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
+ 	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
+diff -up mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
+--- mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk	2008-01-10 10:17:49.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	2008-06-26 13:38:41.000000000 +0200
+@@ -1,5 +1,6 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
++libdir=%libdir%
  includedir=%includedir%
--idldir=%idldir%
-+idldir=%idldir%/unstable
- includetype=unstable
  
- Name: libxul-embedding-unstable
-diff -up mozilla/xulrunner/installer/libxul-embedding.pc.in.pk mozilla/xulrunner/installer/libxul-embedding.pc.in
---- mozilla/xulrunner/installer/libxul-embedding.pc.in.pk	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul-embedding.pc.in	2008-01-29 17:18:01.000000000 +0100
-@@ -1,7 +1,7 @@
+ Name: mozilla-gtkembedmoz
+diff -up mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in
+--- mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk	2008-01-10 10:17:49.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in	2008-06-26 13:38:41.000000000 +0200
+@@ -1,5 +1,6 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
++libdir=%libdir%
  includedir=%includedir%
--idldir=%idldir%
-+idldir=%idldir%/stable
- includetype=stable
  
- # Note: the default pkg-config cflags will only list include directories
-@@ -11,5 +11,5 @@ includetype=stable
- Name: libxul-embedding
- Description: Static library for version-independent embedding of the Mozilla runtime
- Version: %MOZILLA_VERSION%
--Libs: -L${sdkdir}/lib -lxpcomglue
-+Libs: -L${sdkdir}/sdk/lib -lxpcomglue
- Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
+ Name: mozilla-gtkembedmoz
 diff -up mozilla/xulrunner/installer/mozilla-js.pc.in.pk mozilla/xulrunner/installer/mozilla-js.pc.in
 --- mozilla/xulrunner/installer/mozilla-js.pc.in.pk	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/mozilla-js.pc.in	2008-01-29 17:18:01.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-js.pc.in	2008-06-26 13:38:41.000000000 +0200
 @@ -6,5 +6,5 @@ Name: JavaScript
  Description: The Mozilla JavaScript Library
  Version: %MOZILLA_VERSION%
@@ -116,19 +132,9 @@
 -Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
 +Libs: -L${sdkdir}/sdk/lib -lmozjs
 +Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
-diff -up mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
---- mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk	2008-01-10 10:17:49.000000000 +0100
-+++ mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	2008-01-29 17:19:04.000000000 +0100
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
- 
- Name: mozilla-gtkembedmoz
 diff -up mozilla/xulrunner/installer/mozilla-plugin.pc.in.pk mozilla/xulrunner/installer/mozilla-plugin.pc.in
 --- mozilla/xulrunner/installer/mozilla-plugin.pc.in.pk	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/mozilla-plugin.pc.in	2008-01-29 17:18:01.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-plugin.pc.in	2008-06-26 13:38:41.000000000 +0200
 @@ -6,4 +6,4 @@ Name: Mozilla Plug-In API
  Description: Mozilla Plug-In API
  Version: %MOZILLA_VERSION%


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-3/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	20 Jun 2008 12:18:07 -0000	1.51
+++ sources	25 Sep 2008 21:43:56 -0000	1.52
@@ -1 +1 @@
-b514375509fd439e44def1e4a7873af4  xulrunner-1.9-source.tar.bz2
+0a6c68a5ab5b065fef221b586b8a3b8a  xulrunner-1.9.0.2-source.tar.bz2

xulrunner-version.patch:

Index: xulrunner-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-3/xulrunner-version.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xulrunner-version.patch	14 Dec 2007 10:24:02 -0000	1.1
+++ xulrunner-version.patch	25 Sep 2008 21:43:56 -0000	1.2
@@ -6,7 +6,7 @@
  
  include $(DEPTH)/config/autoconf.mk
  
-+MOZ_APP_VERSION="1.9pre"
++MOZ_APP_VERSION="1.9"
 +
  NO_PKG_FILES = \
  	xulrunner-config \


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-3/xulrunner.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- xulrunner.spec	25 Aug 2008 13:44:08 -0000	1.132
+++ xulrunner.spec	25 Sep 2008 21:43:56 -0000	1.133
@@ -1,5 +1,5 @@
-%define nspr_version 4.6.99
-%define nss_version 3.11.99.5
+%define nspr_version 4.7.1
+%define nss_version 3.12.1.1
 %define cairo_version 0.5
 
 %define version_internal  1.9
@@ -7,12 +7,12 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9
-Release:        1%{?dist}.4
-URL:            http://www.mozilla.org/projects/xulrunner/
+Version:        1.9.0.2
+Release:        1%{?dist}
+URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
-Source0:        xulrunner-1.9-source.tar.bz2
+Source0:        xulrunner-%{version}-source.tar.bz2
 Source10:       %{name}-mozconfig
 Source12:       %{name}-redhat-default-prefs.js
 Source21:       %{name}.sh.in
@@ -21,6 +21,7 @@
 # build patches
 Patch1:         mozilla-build.patch
 Patch2:         xulrunner-path.patch
+Patch3:         xulrunner-version.patch
 Patch4:         mozilla-sqlite.patch
 Patch5:         mozilla-mochitest.patch
 
@@ -119,6 +120,7 @@
 cd mozilla
 %patch1  -p1 -b .build
 %patch2  -p1 -b .path
+%patch3  -p1 -b .version
 %patch4  -p1 -b .sqlite
 autoconf-2.13
 %patch5  -p1 -b .mochitest
@@ -126,7 +128,7 @@
 %patch10 -p1 -b .pk
 
 %patch26 -p1 -b .ps-pdf-simplify-operators
-%patch27 -p1 -b .ssl-exception
+#%patch27 -p1 -b .ssl-exception
 
 %patch201 -p0 -b .no-native-theme
 %patch202 -p0 -b .dpi
@@ -213,7 +215,7 @@
   $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}
 
 # Fix multilib devel conflicts...
-%ifarch x86_64 ia64 s390x ppc64
+%ifarch x86_64 ia64 s390x ppc64 sparc64
 %define mozbits 64
 %else
 %define mozbits 32
@@ -224,7 +226,7 @@
 mv ${genheader}.h ${genheader}%{mozbits}.h
 cat > ${genheader}.h << EOF
 // This file exists to fix multilib conflicts
-#if defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__powerpc64__)
+#if defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__powerpc64__) ||defined(__sparc__) && defined(__arch64__)
 #include "${genheader}64.h"
 #else
 #include "${genheader}32.h"
@@ -282,7 +284,7 @@
 popd
 
 # GRE stuff
-%ifarch x86_64 ia64 ppc64 s390x
+%ifarch x86_64 ia64 ppc64 s390x sparc64
 %define gre_conf_file gre64.conf
 %else
 %define gre_conf_file gre.conf
@@ -294,7 +296,7 @@
 chmod 644 $RPM_BUILD_ROOT/etc/gre.d/%{gre_conf_file}
 
 # Library path
-%ifarch x86_64 ia64 ppc64 s390x
+%ifarch x86_64 ia64 ppc64 s390x sparc64
 %define ld_conf_file xulrunner-64.conf
 %else
 %define ld_conf_file xulrunner-32.conf
@@ -417,6 +419,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Sep 25 2008 Marco Pesenti Gritti <mpg at redhat.com> - 1.9.0.2-1
+- Update to 1.9.0.2
+
 * Mon Aug 25 2008 Simon Schampijer <simon at laptop.org> - 1.9-1.4
 - make the theme fill in trough for horizontal scrollbar 7871
 



From rstrode at fedoraproject.org  Thu Sep 25 21:57:59 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Thu, 25 Sep 2008 21:57:59 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec,1.55,1.56 sources,1.23,1.24
Message-ID: <20080925215759.297497010A@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11924

Modified Files:
	plymouth.spec sources 
Log Message:
- Add new snapshot to fold in Will Woods progress bar, and
  move ajax's splash upstream



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- plymouth.spec	23 Sep 2008 13:31:12 -0000	1.55
+++ plymouth.spec	25 Sep 2008 21:57:28 -0000	1.56
@@ -1,15 +1,13 @@
 Summary: Plymouth Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.6.0
-Release: 0.2008.09.23.1%{?dist}
+Release: 0.2008.09.25.1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
 URL: http://freedesktop.org/software/plymouth/releases
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: plymouth-0.5.0-textbar-hotness.patch
-
 Obsoletes: rhgb < 1:10.0.0
 Provides: rhgb = 1:10.0.0
 
@@ -105,7 +103,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .textbar
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -182,6 +179,7 @@
 %{_libdir}/plymouth/text.so
 %{_localstatedir}/run/plymouth
 %{_localstatedir}/spool/plymouth
+%{_localstatedir}/lib/plymouth
 
 %files devel
 %defattr(-, root, root)
@@ -227,6 +225,10 @@
 %{_libdir}/plymouth/spinfinity.so
 
 %changelog
+* Thu Sep 25 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.25.1
+- Add new snapshot to fold in Will Woods progress bar, and
+  move ajax's splash upstream
+
 * Tue Sep 23 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.23.1
 - Last snapshot was broken
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	23 Sep 2008 13:31:12 -0000	1.23
+++ sources	25 Sep 2008 21:57:28 -0000	1.24
@@ -1 +1 @@
-f0ac92c8b0b21c36d625c8c1f765e065  plymouth-0.6.0.tar.bz2
+990bb4a0d7fb09e64e6f2bd940e90508  plymouth-0.6.0.tar.bz2



From snirkel at fedoraproject.org  Thu Sep 25 22:13:30 2008
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Thu, 25 Sep 2008 22:13:30 +0000 (UTC)
Subject: rpms/libmtp/devel .cvsignore, 1.18, 1.19 libmtp.spec, 1.24,
	1.25 sources, 1.18, 1.19
Message-ID: <20080925221330.40C6B7010A@cvs1.fedora.phx.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libmtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15335

Modified Files:
	.cvsignore libmtp.spec sources 
Log Message:
New upstream bugfixing version.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	19 Sep 2008 22:16:58 -0000	1.18
+++ .cvsignore	25 Sep 2008 22:12:58 -0000	1.19
@@ -1 +1 @@
-libmtp-0.3.2.tar.gz
+libmtp-0.3.3.tar.gz


Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/libmtp.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libmtp.spec	19 Sep 2008 22:16:58 -0000	1.24
+++ libmtp.spec	25 Sep 2008 22:12:58 -0000	1.25
@@ -2,7 +2,7 @@
 # RPM repository.
 
 Name:           libmtp
-Version:        0.3.2
+Version:        0.3.3
 Release:        1%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Linus Walleij <triad at df.lth.se> 0.3.3-1
+- New upstream bugfix release.
+
 * Sat Sep 20 2008 Linus Walleij <triad at df.lth.se> 0.3.2-1
 - New upstream version. (API and ABI compatible.) Fixes
   bugs on Creative devices.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	19 Sep 2008 22:16:58 -0000	1.18
+++ sources	25 Sep 2008 22:12:58 -0000	1.19
@@ -1 +1 @@
-2cb1007a384fdc3dd7e29c2d5c2ba729  libmtp-0.3.2.tar.gz
+c2231df50d1755876bdfa7f3fdead7a2  libmtp-0.3.3.tar.gz



From toshio at fedoraproject.org  Thu Sep 25 22:28:52 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 25 Sep 2008 22:28:52 +0000 (UTC)
Subject: rpms/bzr/devel .cvsignore, 1.28, 1.29 bzr.spec, 1.41, 1.42 sources, 
	1.28, 1.29
Message-ID: <20080925222852.E450D7010A@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18766

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:

* Thu Sep 25 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.7-1
- 1.7 Final



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	18 Sep 2008 18:57:14 -0000	1.28
+++ .cvsignore	25 Sep 2008 22:28:22 -0000	1.29
@@ -1 +1 @@
-bzr-1.7rc2.tar.gz
+bzr-1.7.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- bzr.spec	18 Sep 2008 18:57:14 -0000	1.41
+++ bzr.spec	25 Sep 2008 22:28:22 -0000	1.42
@@ -2,13 +2,13 @@
 
 Name:           bzr
 Version:        1.7
-Release:        0.1.rc2%{?dist}
+Release:        1%{?dist}
 Summary:        Friendly distributed version control system
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://www.bazaar-vcs.org/
-Source0:        https://launchpad.net/%{name}/1.7/%{version}rc2/+download/%{name}-%{version}rc2.tar.gz
+Source0:        https://launchpad.net/%{name}/1.7/%{version}/+download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}rc2
+%setup -q -n %{name}-%{version}
 
 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/_patiencediff_py.py
 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/weave.py
@@ -76,6 +76,9 @@
 %endif
 
 %changelog
+* Thu Sep 25 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.7-1
+- 1.7 Final
+
 * Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.7-0.1.rc2
 - 1.7rc2
 - Remove executable permission from a %%doc file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	18 Sep 2008 18:57:14 -0000	1.28
+++ sources	25 Sep 2008 22:28:22 -0000	1.29
@@ -1 +1 @@
-f4280510121d143d170b04a80f70272b  bzr-1.7rc2.tar.gz
+54b8d060f8579907f6e0d0acf6c008c9  bzr-1.7.tar.gz



From toshio at fedoraproject.org  Thu Sep 25 22:31:42 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 25 Sep 2008 22:31:42 +0000 (UTC)
Subject: rpms/bzrtools/F-9 .cvsignore, 1.21, 1.22 bzrtools.spec, 1.31,
	1.32 sources, 1.21, 1.22
Message-ID: <20080925223142.7076D7010A@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzrtools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19748

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
* Thu Sep 18 2008 Toshio Kuratomi <toshio at fedoraproject.org> 1.7.0-1
- Update to 1.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/F-9/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	4 Sep 2008 02:59:49 -0000	1.21
+++ .cvsignore	25 Sep 2008 22:31:12 -0000	1.22
@@ -1 +1 @@
-bzrtools-1.6.0.tar.gz
+bzrtools-1.7.0.tar.gz


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/F-9/bzrtools.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- bzrtools.spec	4 Sep 2008 02:59:49 -0000	1.31
+++ bzrtools.spec	25 Sep 2008 22:31:12 -0000	1.32
@@ -5,8 +5,8 @@
 # (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
 %define debug_package %{nil}
 
-%define bzrver 1.6
-%define bzrnextver 1.7
+%define bzrver 1.7
+%define bzrnextver 1.8
 
 Name:           bzrtools
 Version:        %{bzrver}.0
@@ -71,6 +71,9 @@
 %endif
 
 %changelog
+* Thu Sep 18 2008 Toshio Kuratomi <toshio at fedoraproject.org> 1.7.0-1
+- Update to 1.7.0
+
 * Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> 1.6.0-1
 - Update to 1.6.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/F-9/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	4 Sep 2008 02:59:49 -0000	1.21
+++ sources	25 Sep 2008 22:31:12 -0000	1.22
@@ -1 +1 @@
-82c5b96fd996bede6ed92759ef28a108  bzrtools-1.6.0.tar.gz
+4af1f288433f1ebc916ddc5dda5eead8  bzrtools-1.7.0.tar.gz



From toshio at fedoraproject.org  Thu Sep 25 22:45:10 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 25 Sep 2008 22:45:10 +0000 (UTC)
Subject: rpms/bzr/F-9 .cvsignore, 1.27, 1.28 bzr.spec, 1.36, 1.37 sources,
	1.27, 1.28
Message-ID: <20080925224510.3A91A7010A@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23543

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:

* Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.7-1
- 1.7
- Remove executable permission from a %doc file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-9/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	4 Sep 2008 02:46:18 -0000	1.27
+++ .cvsignore	25 Sep 2008 22:44:39 -0000	1.28
@@ -1 +1 @@
-bzr-1.6.1rc2.tar.gz
+bzr-1.7.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-9/bzr.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- bzr.spec	4 Sep 2008 02:46:18 -0000	1.36
+++ bzr.spec	25 Sep 2008 22:44:39 -0000	1.37
@@ -1,14 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bzr
-Version:        1.6.1
-Release:        0.1.rc2%{?dist}
+Version:        1.7
+Release:        1%{?dist}
 Summary:        Friendly distributed version control system
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://www.bazaar-vcs.org/
-Source0:        https://launchpad.net/%{name}/1.6/%{version}rc2/+download/%{name}-%{version}rc2.tar.gz
+Source0:        https://launchpad.net/%{name}/1.7/%{version}/+download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}rc2
+%setup -q -n %{name}-%{version}
 
 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/_patiencediff_py.py
 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/weave.py
@@ -41,6 +41,7 @@
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
+chmod a-x contrib/bash/bzrbashprompt.sh
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -75,6 +76,13 @@
 %endif
 
 %changelog
+* Thu Sep 25 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.7-1
+- 1.7 Final
+
+* Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.7-0.1.rc2
+- 1.7rc2
+- Remove executable permission from a %%doc file
+
 * Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.6.1-0.1.rc2
 - New upstream bugfix release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-9/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	4 Sep 2008 02:46:18 -0000	1.27
+++ sources	25 Sep 2008 22:44:39 -0000	1.28
@@ -1 +1 @@
-112ba4410323383b8b20e1522483bbeb  bzr-1.6.1rc2.tar.gz
+54b8d060f8579907f6e0d0acf6c008c9  bzr-1.7.tar.gz



From mccann at fedoraproject.org  Thu Sep 25 23:14:32 2008
From: mccann at fedoraproject.org (William Jon McCann)
Date: Thu, 25 Sep 2008 23:14:32 +0000 (UTC)
Subject: rpms/compiz/devel compiz-gtk, NONE, 1.1 compiz-gtk.desktop, NONE,
	1.1 .cvsignore, 1.37, 1.38 compiz.spec, 1.134, 1.135 sources,
	1.39, 1.40 desktop-effects-0.7.17-ignore-hints.patch, 1.1, NONE
Message-ID: <20080925231432.4C37C7010A@cvs1.fedora.phx.redhat.com>

Author: mccann

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30871

Modified Files:
	.cvsignore compiz.spec sources 
Added Files:
	compiz-gtk compiz-gtk.desktop 
Removed Files:
	desktop-effects-0.7.17-ignore-hints.patch 
Log Message:
- Add compiz-gtk driver script and desktop file
- New desktop effects release





--- NEW FILE compiz-gtk ---
#!/bin/sh

export LIBGL_ALWAYS_INDIRECT=1
gtk-window-decorator &
exec compiz --ignore-desktop-hints glib gconf $@


--- NEW FILE compiz-gtk.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=Compiz
TryExec=compiz-gtk
Exec=compiz-gtk
NoDisplay=true


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	5 Jun 2008 18:32:19 -0000	1.37
+++ .cvsignore	25 Sep 2008 23:14:01 -0000	1.38
@@ -1,3 +1,3 @@
 compiz-0.7.6.tar.bz2
+desktop-effects-0.7.18.tar.bz2
 kde-desktop-effects-0.0.5.tar.bz2
-desktop-effects-0.7.17.tar.bz2


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- compiz.spec	26 Aug 2008 19:12:15 -0000	1.134
+++ compiz.spec	25 Sep 2008 23:14:01 -0000	1.135
@@ -1,4 +1,4 @@
-%define		dialogversion	0.7.17
+%define		dialogversion	0.7.18
 %define 	kde_dialogversion 0.0.5
 
 %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
@@ -14,7 +14,7 @@
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.7.6
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,13 +46,14 @@
 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
 
 # Make sure that former beryl users still have bling
 Obsoletes: beryl-core
 
 
 # Patches that are not upstream
-Patch101: desktop-effects-0.7.17-ignore-hints.patch
 Patch102: desktop-effects-0.7.17-wall-plugin.patch
 Patch103: composite-cube-logo.patch
 Patch105: fedora-logo.patch
@@ -119,10 +120,9 @@
 %prep
 %setup -q -T -b1 -n desktop-effects-%{dialogversion}
 %setup -q -T -b2 -n kde-desktop-effects-%{kde_dialogversion}
-%setup -q 
+%setup -q
 
 pushd ../desktop-effects-%{dialogversion}
-%patch101 -p1 -b .ignore-hints
 %patch102 -p1 -b .wall-plugin
 popd
 
@@ -163,7 +163,7 @@
 
 # desktop-effects
 cd ../desktop-effects-%{dialogversion}
-%configure 
+%configure
 make %{?_smp_mflags}
 
 
@@ -181,6 +181,12 @@
   $RPM_BUILD_ROOT%{_datadir}/applications/desktop-effects.desktop
 popd
 
+install %SOURCE3 $RPM_BUILD_ROOT%{_bindir}
+
+desktop-file-install --vendor="" \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  %SOURCE4
+
 # kde-desktop-effects
 echo INSTALLING KDE DESKTOP EFFECTS
 pushd ../kde-desktop-effects-%{kde_dialogversion}
@@ -230,9 +236,9 @@
 
 export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source`
 
-for p in %{core_plugins} %{gnome_plugins} core; 
+for p in %{core_plugins} %{gnome_plugins} core;
 	do echo %{_sysconfdir}/gconf/schemas/compiz-${p}.schemas ; done \
-	| xargs %{_bindir}/gconftool-2 --makefile-install-rule >& /dev/null || : 
+	| xargs %{_bindir}/gconftool-2 --makefile-install-rule >& /dev/null || :
 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gwd.schemas >& /dev/null || :
 
@@ -246,7 +252,7 @@
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 
-  for p in %{core_plugins} %{gnome_plugins} core; 
+  for p in %{core_plugins} %{gnome_plugins} core;
 	do echo %{_sysconfdir}/gconf/schemas/compiz-${p}.schemas ; done \
 	| xargs %{_bindir}/gconftool-2 --makefile-uninstall-rule >& /dev/null || :
 
@@ -258,7 +264,7 @@
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 
-  for p in %{core_plugins} %{gnome_plugins} core; 
+  for p in %{core_plugins} %{gnome_plugins} core;
 	do echo %{_sysconfdir}/gconf/schemas/compiz-${p}.schemas ; done \
 	| xargs %{_bindir}/gconftool-2 --makefile-uninstall-rule >& /dev/null || :
 
@@ -298,6 +304,7 @@
 
 %files gnome -f gnome-files.txt
 %defattr(-, root, root)
+%{_bindir}/compiz-gtk
 %{_bindir}/gtk-window-decorator
 %{_bindir}/desktop-effects
 %{_libdir}/window-manager-settings/libcompiz.so
@@ -305,6 +312,7 @@
 %{_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
 %{_datadir}/applications/redhat-desktop-effects.desktop
 %{_datadir}/icons/hicolor/16x16/apps/desktop-effects.png
 %{_datadir}/icons/hicolor/24x24/apps/desktop-effects.png
@@ -337,6 +345,10 @@
 
 
 %changelog
+* Thu Sep 25 2008 Jon McCann <jmccann at redhat.com> - 0.7.6-11
+- Add compiz-gtk driver script and desktop file
+- New desktop effects release
+
 * Tue Aug 26 2008 Adam Jackson <ajax at redhat.com> 0.7.6-10
 - Fixed Requires: Xorg >= foo to Conflicts: Xorg < foo.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	5 Jun 2008 18:32:19 -0000	1.39
+++ sources	25 Sep 2008 23:14:02 -0000	1.40
@@ -1,3 +1,3 @@
 75fe52ce6374174df6dccd4b6c13ee55  compiz-0.7.6.tar.bz2
+d56f2f6456fc89b06e1e0d21cab74f55  desktop-effects-0.7.18.tar.bz2
 7a7766f43797239ca0a4a0881d91f646  kde-desktop-effects-0.0.5.tar.bz2
-de07dcb5bfc47a0634acc1701f3b5831  desktop-effects-0.7.17.tar.bz2


--- desktop-effects-0.7.17-ignore-hints.patch DELETED ---



From behdad at fedoraproject.org  Thu Sep 25 23:25:12 2008
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu, 25 Sep 2008 23:25:12 +0000 (UTC)
Subject: rpms/cairo/devel .cvsignore, 1.45, 1.46 cairo.spec, 1.93,
	1.94 sources, 1.45, 1.46
Message-ID: <20080925232512.CE96C7010A@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1198

Modified Files:
	.cvsignore cairo.spec sources 
Log Message:
* Thu Sep 25 2008 Behdad Esfahbod <besfahbo at redhat.com> 1.8.0-1
- Update to 1.8.0
- Update dep versions



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cairo/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	23 Sep 2008 02:41:51 -0000	1.45
+++ .cvsignore	25 Sep 2008 23:24:42 -0000	1.46
@@ -1 +1 @@
-cairo-1.7.6.tar.gz
+cairo-1.8.0.tar.gz


Index: cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- cairo.spec	23 Sep 2008 02:41:51 -0000	1.93
+++ cairo.spec	25 Sep 2008 23:24:42 -0000	1.94
@@ -1,10 +1,10 @@
-%define pixman_version 0.10.0
-%define freetype_version 2.1.3-3
+%define pixman_version 0.12.0
+%define freetype_version 2.1.9
 %define fontconfig_version 2.0
 
 Summary:	A vector graphics library
 Name:		cairo
-Version:	1.7.6
+Version:	1.8.0
 Release:	1%{?dist}
 URL:		http://cairographics.org
 Source0:	http://cairographics.org/releases/%{name}-%{version}.tar.gz
@@ -85,6 +85,10 @@
 %{_datadir}/gtk-doc/html/cairo
 
 %changelog
+* Thu Sep 25 2008 Behdad Esfahbod <besfahbo at redhat.com> 1.8.0-1
+- Update to 1.8.0
+- Update dep versions
+
 * Mon Sep 22 2008 Behdad Esfahbod <besfahbo at redhat.com> 1.7.6-1
 - Update to 1.7.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cairo/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	23 Sep 2008 02:41:51 -0000	1.45
+++ sources	25 Sep 2008 23:24:42 -0000	1.46
@@ -1 +1 @@
-c612f581b18903b0751a171685fc38dd  cairo-1.7.6.tar.gz
+4ea70ea87b47e92d318d4e7f5b940f47  cairo-1.8.0.tar.gz



From toshio at fedoraproject.org  Thu Sep 25 23:33:18 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 25 Sep 2008 23:33:18 +0000 (UTC)
Subject: rpms/bzr-gtk/devel bzr-gtk.spec,1.36,1.37
Message-ID: <20080925233318.F1D5B7010A@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2511

Modified Files:
	bzr-gtk.spec 
Log Message:

* Thu Sep 25 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.95.0-2
- Update for fixed nautilus-python package.



Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- bzr-gtk.spec	4 Sep 2008 03:52:03 -0000	1.36
+++ bzr-gtk.spec	25 Sep 2008 23:32:48 -0000	1.37
@@ -8,7 +8,7 @@
 
 Name:           bzr-gtk
 Version:        0.95.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
 Group:          Development/Tools
@@ -51,7 +51,11 @@
 Summary: Nautilus plugin for the bazaar revision control system
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
+%if 0%{?fedora} >= 9
+Requires:       nautilus-python >= 0.5.0
+%else
 Requires:       nautilus-python >= 0.4.3-4
+%endif
 
 %description -n nautilus-bzr
 nautilus-bzr is an extension for Nautilus, the GNOME file manager.  It
@@ -113,10 +117,17 @@
 # RHEL, exclude the files.
 %files -n nautilus-bzr
 %defattr(-,root,root,-)
+%if 0%{?fedora} >= 9
+%{_libdir}/nautilus/extensions-2.0/python/*
+%else
 %{_libdir}/nautilus/extensions-1.0/python/*
 %endif
+%endif
 
 %changelog
+* Thu Sep 25 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.95.0-2
+- Update for fixed nautilus-python package.
+
 * Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.95.0-1
 - New Upstream release for use with bzr >= 1.6.
 



From toshio at fedoraproject.org  Fri Sep 26 00:08:39 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri, 26 Sep 2008 00:08:39 +0000 (UTC)
Subject: rpms/bzr-gtk/F-9 bzr-gtk.spec,1.22,1.23
Message-ID: <20080926000839.6AA817010C@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8900

Modified Files:
	bzr-gtk.spec 
Log Message:

* Thu Sep 25 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.95.0-2
- Update for fixed nautilus-python package.



Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-9/bzr-gtk.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- bzr-gtk.spec	4 Sep 2008 03:55:35 -0000	1.22
+++ bzr-gtk.spec	26 Sep 2008 00:08:09 -0000	1.23
@@ -8,7 +8,7 @@
 
 Name:           bzr-gtk
 Version:        0.95.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
 Group:          Development/Tools
@@ -51,7 +51,11 @@
 Summary: Nautilus plugin for the bazaar revision control system
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
+%if 0%{?fedora} >= 9
+Requires:       nautilus-python >= 0.5.0
+%else
 Requires:       nautilus-python >= 0.4.3-4
+%endif
 
 %description -n nautilus-bzr
 nautilus-bzr is an extension for Nautilus, the GNOME file manager.  It
@@ -113,10 +117,17 @@
 # RHEL, exclude the files.
 %files -n nautilus-bzr
 %defattr(-,root,root,-)
+%if 0%{?fedora} >= 9
+%{_libdir}/nautilus/extensions-2.0/python/*
+%else
 %{_libdir}/nautilus/extensions-1.0/python/*
 %endif
+%endif
 
 %changelog
+* Thu Sep 25 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.95.0-2
+- Update for fixed nautilus-python package.
+
 * Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.95.0-1
 - New Upstream release for use with bzr >= 1.6.
 



From toshio at fedoraproject.org  Fri Sep 26 00:43:30 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri, 26 Sep 2008 00:43:30 +0000 (UTC)
Subject: rpms/trac-bazaar-plugin/devel sources, 1.3,
	1.4 trac-bazaar-extra-return.patch, 1.1,
	1.2 trac-bazaar-plugin.spec, 1.4, 1.5 trac-bazaar-escape.patch,
	1.1, NONE trac-bazaar-timestamp.patch, 1.1, NONE
Message-ID: <20080926004330.C9BA57010C@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/trac-bazaar-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15561

Modified Files:
	sources trac-bazaar-extra-return.patch trac-bazaar-plugin.spec 
Removed Files:
	trac-bazaar-escape.patch trac-bazaar-timestamp.patch 
Log Message:

* Thu Sep 25 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.2-6.20080925bzr49
- New upstream snapshot that includes our patches, fixes for bzr-1.6+ and
  trac-0.11.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Aug 2007 22:58:23 -0000	1.3
+++ sources	26 Sep 2008 00:42:59 -0000	1.4
@@ -1 +1 @@
-ee40f6f28c64aee420a798c1543b1bca  TracBzr-0.2.tar.gz
+d3d98e6166e3b0b8562883793992c48e  TracBzr-0.2.tar.gz

trac-bazaar-extra-return.patch:

Index: trac-bazaar-extra-return.patch
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/devel/trac-bazaar-extra-return.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trac-bazaar-extra-return.patch	22 Sep 2007 19:37:24 -0000	1.1
+++ trac-bazaar-extra-return.patch	26 Sep 2008 00:42:59 -0000	1.2
@@ -1,7 +1,9 @@
 === modified file 'tracbzr/backend.py'
---- tracbzr/backend.py	2007-09-22 17:26:55 +0000
-+++ tracbzr/backend.py	2007-09-22 17:48:32 +0000
-@@ -231,7 +231,6 @@
+Index: tracbzr/backend.py
+===================================================================
+--- tracbzr/backend.py.orig
++++ tracbzr/backend.py
+@@ -237,7 +237,6 @@ class BzrRepository(versioncontrol.Repos
          revid = urllib.unquote(rev)
          if revid in ('current:', 'null:'):
              return None, revid
@@ -9,4 +11,3 @@
          if self.repo.has_revision(revid):
              return None, revid
  
-


Index: trac-bazaar-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/devel/trac-bazaar-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- trac-bazaar-plugin.spec	22 Sep 2007 19:37:24 -0000	1.4
+++ trac-bazaar-plugin.spec	26 Sep 2008 00:42:59 -0000	1.5
@@ -1,26 +1,23 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define bzrrev 182
+%define bzrrev 49
 
 Name:           trac-bazaar-plugin
 Version:        0.2
-Release:        5.20070829bzr%{bzrrev}%{?dist}
+Release:        6.20080925bzr%{bzrrev}%{?dist}
 Summary:        Bazaar plugin for Trac
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://bazaar-vcs.org/TracBzr
 # Source comes from a bazaar repository:
-#   bzr checkout --lightweight -r 182 http://panoramicfeedback.com/opensource/trac+bzr/
-#   cd trac+bzr
+#   bzr checkout --lightweight -r 49 lp:trac-bzr
+#   cd trac-bzr
 #   python setup.py sdist --formats gztar
-# tarball lands in trac+bzr/dist/
+# tarball lands in trac-bzr/dist/
 Source0:        TracBzr-%{version}.tar.gz
-# These two are part of https://bugs.launchpad.net/trac-bzr/+bug/116659
-Patch0: trac-bazaar-timestamp.patch
-Patch1: trac-bazaar-escape.patch
-# Communicated this directly with author
-Patch2: trac-bazaar-extra-return.patch
+# https://bugs.launchpad.net/trac-bzr/+bug/274609
+Patch0: trac-bazaar-extra-return.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -40,8 +37,6 @@
 %prep
 %setup -n TracBzr-%{version} -q
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
 
 %build
 %{__python} setup.py build
@@ -49,9 +44,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# skip-build doesn't work on el4
-%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT
- 
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -62,6 +56,10 @@
 %{python_sitelib}/*
 
 %changelog
+* Thu Sep 25 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.2-6.20080925bzr49
+- New upstream snapshot that includes our patches, fixes for bzr-1.6+ and
+  trac-0.11.
+
 * Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
 - Patches to fix RSS feed in timeline view.
 


--- trac-bazaar-escape.patch DELETED ---


--- trac-bazaar-timestamp.patch DELETED ---



From toshio at fedoraproject.org  Fri Sep 26 00:50:13 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri, 26 Sep 2008 00:50:13 +0000 (UTC)
Subject: rpms/trac-bazaar-plugin/F-9 sources, 1.3,
	1.4 trac-bazaar-extra-return.patch, 1.1,
	1.2 trac-bazaar-plugin.spec, 1.4, 1.5 trac-bazaar-escape.patch,
	1.1, NONE trac-bazaar-timestamp.patch, 1.1, NONE
Message-ID: <20080926005013.AB1637010C@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/trac-bazaar-plugin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16178

Modified Files:
	sources trac-bazaar-extra-return.patch trac-bazaar-plugin.spec 
Removed Files:
	trac-bazaar-escape.patch trac-bazaar-timestamp.patch 
Log Message:

* Thu Sep 25 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.2-6.20080925bzr49
- New upstream snapshot that includes our patches, fixes for bzr-1.6+ and
  trac-0.11.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Aug 2007 22:58:23 -0000	1.3
+++ sources	26 Sep 2008 00:49:43 -0000	1.4
@@ -1 +1 @@
-ee40f6f28c64aee420a798c1543b1bca  TracBzr-0.2.tar.gz
+d3d98e6166e3b0b8562883793992c48e  TracBzr-0.2.tar.gz

trac-bazaar-extra-return.patch:

Index: trac-bazaar-extra-return.patch
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/F-9/trac-bazaar-extra-return.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trac-bazaar-extra-return.patch	22 Sep 2007 19:37:24 -0000	1.1
+++ trac-bazaar-extra-return.patch	26 Sep 2008 00:49:43 -0000	1.2
@@ -1,7 +1,9 @@
 === modified file 'tracbzr/backend.py'
---- tracbzr/backend.py	2007-09-22 17:26:55 +0000
-+++ tracbzr/backend.py	2007-09-22 17:48:32 +0000
-@@ -231,7 +231,6 @@
+Index: tracbzr/backend.py
+===================================================================
+--- tracbzr/backend.py.orig
++++ tracbzr/backend.py
+@@ -237,7 +237,6 @@ class BzrRepository(versioncontrol.Repos
          revid = urllib.unquote(rev)
          if revid in ('current:', 'null:'):
              return None, revid
@@ -9,4 +11,3 @@
          if self.repo.has_revision(revid):
              return None, revid
  
-


Index: trac-bazaar-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/F-9/trac-bazaar-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- trac-bazaar-plugin.spec	22 Sep 2007 19:37:24 -0000	1.4
+++ trac-bazaar-plugin.spec	26 Sep 2008 00:49:43 -0000	1.5
@@ -1,26 +1,23 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define bzrrev 182
+%define bzrrev 49
 
 Name:           trac-bazaar-plugin
 Version:        0.2
-Release:        5.20070829bzr%{bzrrev}%{?dist}
+Release:        6.20080925bzr%{bzrrev}%{?dist}
 Summary:        Bazaar plugin for Trac
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://bazaar-vcs.org/TracBzr
 # Source comes from a bazaar repository:
-#   bzr checkout --lightweight -r 182 http://panoramicfeedback.com/opensource/trac+bzr/
-#   cd trac+bzr
+#   bzr checkout --lightweight -r 49 lp:trac-bzr
+#   cd trac-bzr
 #   python setup.py sdist --formats gztar
-# tarball lands in trac+bzr/dist/
+# tarball lands in trac-bzr/dist/
 Source0:        TracBzr-%{version}.tar.gz
-# These two are part of https://bugs.launchpad.net/trac-bzr/+bug/116659
-Patch0: trac-bazaar-timestamp.patch
-Patch1: trac-bazaar-escape.patch
-# Communicated this directly with author
-Patch2: trac-bazaar-extra-return.patch
+# https://bugs.launchpad.net/trac-bzr/+bug/274609
+Patch0: trac-bazaar-extra-return.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -40,8 +37,6 @@
 %prep
 %setup -n TracBzr-%{version} -q
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
 
 %build
 %{__python} setup.py build
@@ -49,9 +44,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# skip-build doesn't work on el4
-%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT
- 
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -62,6 +56,10 @@
 %{python_sitelib}/*
 
 %changelog
+* Thu Sep 25 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.2-6.20080925bzr49
+- New upstream snapshot that includes our patches, fixes for bzr-1.6+ and
+  trac-0.11.
+
 * Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
 - Patches to fix RSS feed in timeline view.
 


--- trac-bazaar-escape.patch DELETED ---


--- trac-bazaar-timestamp.patch DELETED ---



From airlied at fedoraproject.org  Fri Sep 26 00:53:39 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 26 Sep 2008 00:53:39 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel copy-fb-contents.patch, 1.1,
	1.2 radeon-6.9.0-to-git.patch, 1.3, 1.4 radeon-modeset.patch,
	1.13, 1.14 xorg-x11-drv-ati.spec, 1.115,
	1.116 radeon-fix-pipe-config.patch, 1.1,
	NONE radeon-suspend-fix.patch, 1.1, NONE
Message-ID: <20080926005339.F03327010C@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-serv16741

Modified Files:
	copy-fb-contents.patch radeon-6.9.0-to-git.patch 
	radeon-modeset.patch xorg-x11-drv-ati.spec 
Removed Files:
	radeon-fix-pipe-config.patch radeon-suspend-fix.patch 
Log Message:
* Fri Sep 26 2008 Dave Airlie <airlied at redhat.com> 6.9.0-16
- rebase to a later tree - still not fully up to git master
- add some fixes to the resize stuff - not fully done


copy-fb-contents.patch:

Index: copy-fb-contents.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/copy-fb-contents.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- copy-fb-contents.patch	22 Sep 2008 19:01:10 -0000	1.1
+++ copy-fb-contents.patch	26 Sep 2008 00:53:39 -0000	1.2
@@ -1,6 +1,7 @@
-diff -up xf86-video-ati-6.9.0/src/drmmode_display.c.copy-fb-contents xf86-video-ati-6.9.0/src/drmmode_display.c
---- xf86-video-ati-6.9.0/src/drmmode_display.c.copy-fb-contents	2008-09-19 15:46:48.000000000 -0400
-+++ xf86-video-ati-6.9.0/src/drmmode_display.c	2008-09-22 14:05:15.000000000 -0400
+diff --git a/src/drmmode_display.c b/src/drmmode_display.c
+index 25e6183..a22cd62 100644
+--- a/src/drmmode_display.c
++++ b/src/drmmode_display.c
 @@ -31,8 +31,11 @@
  
  #ifdef XF86DRM_MODE
@@ -13,7 +14,7 @@
  static Bool drmmode_resize_fb(ScrnInfoPtr scrn, drmmode_ptr drmmode, int width, int height);
  
  static Bool
-@@ -119,6 +122,76 @@ drmmode_crtc_dpms(xf86CrtcPtr drmmode_cr
+@@ -119,6 +122,76 @@ drmmode_crtc_dpms(xf86CrtcPtr drmmode_crtc, int mode)
  
  }
  
@@ -90,28 +91,34 @@
  static Bool
  drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  		     Rotation rotation, int x, int y)
-@@ -170,15 +243,14 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
- 
- 	drmmode_ConvertToKMode(crtc->scrn, &kmode, mode);
- 
--
+@@ -174,7 +247,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  	fb_id = drmmode->fb_id;
  	if (drmmode_crtc->rotate_fb_id)
  		fb_id = drmmode_crtc->rotate_fb_id;
 -	ErrorF("fb id is %d\n", fb_id);
-+	copy_fb_contents (drmmode, crtc->scrn, fb_id, x, y,
-+			  drmmode_crtc->mode_crtc->buffer_id);
++ 	copy_fb_contents (drmmode, crtc->scrn, fb_id, x, y,
++ 			  drmmode_crtc->mode_crtc->buffer_id);
  	drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
  		       fb_id, x, y, output_ids, output_count, &kmode);
  
--
- done:
- 	if (!ret) {
- 		crtc->x = saved_x;
-diff -up xf86-video-ati-6.9.0/src/radeon_bufmgr_gem.c.copy-fb-contents xf86-video-ati-6.9.0/src/radeon_bufmgr_gem.c
---- xf86-video-ati-6.9.0/src/radeon_bufmgr_gem.c.copy-fb-contents	2008-09-19 15:46:48.000000000 -0400
-+++ xf86-video-ati-6.9.0/src/radeon_bufmgr_gem.c	2008-09-19 15:46:48.000000000 -0400
-@@ -353,6 +353,27 @@ void radeon_bufmgr_gem_wait_rendering(dr
+diff --git a/src/radeon_bufmgr.h b/src/radeon_bufmgr.h
+index a16ad9a..b3034d7 100644
+--- a/src/radeon_bufmgr.h
++++ b/src/radeon_bufmgr.h
+@@ -16,6 +16,8 @@ struct radeon_bufmgr {
+ dri_bufmgr *radeon_bufmgr_gem_init(int fd);
+ dri_bo *radeon_bo_gem_create_from_name(dri_bufmgr *bufmgr, const char *name,
+ 				       unsigned int handle);
++dri_bo *radeon_bo_gem_create_from_handle(dri_bufmgr *bufmgr,
++					 uint32_t handle, unsigned long size);
+ 
+ void radeon_bufmgr_emit_reloc(dri_bo *buf, uint32_t *head, uint32_t *count_p, uint32_t read_domains, uint32_t write_domain);
+ 
+diff --git a/src/radeon_bufmgr_gem.c b/src/radeon_bufmgr_gem.c
+index db28edc..75cff8e 100644
+--- a/src/radeon_bufmgr_gem.c
++++ b/src/radeon_bufmgr_gem.c
+@@ -353,6 +353,27 @@ void radeon_bufmgr_gem_wait_rendering(dri_bo *buf)
  	return;
  }
  
@@ -139,7 +146,7 @@
  /**
   * Returns a dri_bo wrapping the given buffer object handle.
   *
-@@ -364,32 +385,20 @@ radeon_bo_gem_create_from_name(dri_bufmg
+@@ -364,32 +385,20 @@ radeon_bo_gem_create_from_name(dri_bufmgr *bufmgr, const char *name,
  			       unsigned int handle)
  {
      dri_bufmgr_gem *bufmgr_gem = (dri_bufmgr_gem *)bufmgr;
@@ -174,23 +181,11 @@
  }
  
  #define BUF_OUT_RING(x)	 do {			\
-diff -up xf86-video-ati-6.9.0/src/radeon_bufmgr_gem.h.copy-fb-contents xf86-video-ati-6.9.0/src/radeon_bufmgr_gem.h
-diff -up xf86-video-ati-6.9.0/src/radeon_bufmgr.h.copy-fb-contents xf86-video-ati-6.9.0/src/radeon_bufmgr.h
---- xf86-video-ati-6.9.0/src/radeon_bufmgr.h.copy-fb-contents	2008-09-19 15:46:48.000000000 -0400
-+++ xf86-video-ati-6.9.0/src/radeon_bufmgr.h	2008-09-19 15:46:48.000000000 -0400
-@@ -16,6 +16,8 @@ struct radeon_bufmgr {
- dri_bufmgr *radeon_bufmgr_gem_init(int fd);
- dri_bo *radeon_bo_gem_create_from_name(dri_bufmgr *bufmgr, const char *name,
- 				       unsigned int handle);
-+dri_bo *radeon_bo_gem_create_from_handle(dri_bufmgr *bufmgr,
-+					 uint32_t handle, unsigned long size);
- 
- void radeon_bufmgr_emit_reloc(dri_bo *buf, uint32_t *head, uint32_t *count_p, uint32_t read_domains, uint32_t write_domain);
- 
-diff -up xf86-video-ati-6.9.0/src/radeon_driver.c.copy-fb-contents xf86-video-ati-6.9.0/src/radeon_driver.c
---- xf86-video-ati-6.9.0/src/radeon_driver.c.copy-fb-contents	2008-09-19 15:46:48.000000000 -0400
-+++ xf86-video-ati-6.9.0/src/radeon_driver.c	2008-09-19 15:46:48.000000000 -0400
-@@ -3644,6 +3644,24 @@ Bool RADEONScreenInit(int scrnIndex, Scr
+diff --git a/src/radeon_driver.c b/src/radeon_driver.c
+index d5bb24d..070cc56 100644
+--- a/src/radeon_driver.c
++++ b/src/radeon_driver.c
+@@ -3640,6 +3640,24 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      /* xf86CrtcRotate() accesses pScrn->pScreen */
      pScrn->pScreen = pScreen;
  
@@ -215,7 +210,7 @@
      if (!xf86SetDesiredModes (pScrn))
  	return FALSE;
  
-@@ -3714,25 +3732,6 @@ Bool RADEONScreenInit(int scrnIndex, Scr
+@@ -3710,25 +3728,6 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
          RADEONChangeSurfaces(pScrn);
      }
  

radeon-6.9.0-to-git.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.3 -r 1.4 radeon-6.9.0-to-git.patch
Index: radeon-6.9.0-to-git.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-6.9.0-to-git.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- radeon-6.9.0-to-git.patch	15 Aug 2008 03:16:09 -0000	1.3
+++ radeon-6.9.0-to-git.patch	26 Sep 2008 00:53:39 -0000	1.4
@@ -1149,6 +1149,736 @@
  	if (radeon_output->DACType == DAC_PRIMARY)
  	    dac_data.sDacload.ucDacType = ATOM_DAC_A;
  	else if (radeon_output->DACType == DAC_TVDAC)
+diff --git a/src/bicubic_table.h b/src/bicubic_table.h
+new file mode 100644
+index 0000000..765cfff
+--- /dev/null
++++ b/src/bicubic_table.h
+@@ -0,0 +1,646 @@
++static const uint16_t bicubic_tex_512[] = {
++	0xb266, 0x3c00, 0x3aaa, 0x3155,
++	0xb287, 0x3bf0, 0x3aa2, 0x3175,
++	0xb2a9, 0x3be0, 0x3a9a, 0x3196,
++	0xb2cc, 0x3bd0, 0x3a92, 0x31b7,
++	0xb2ee, 0x3bc0, 0x3a89, 0x31d9,
++	0xb312, 0x3bb0, 0x3a81, 0x31fb,
++	0xb335, 0x3ba0, 0x3a78, 0x321e,
++	0xb359, 0x3b90, 0x3a6f, 0x3241,
++	0xb37d, 0x3b80, 0x3a66, 0x3264,
++	0xb3a2, 0x3b70, 0x3a5d, 0x3288,
++	0xb3c7, 0x3b60, 0x3a54, 0x32ad,
++	0xb3ed, 0x3b51, 0x3a4b, 0x32d1,
++	0xb409, 0x3b41, 0x3a42, 0x32f7,
++	0xb41c, 0x3b31, 0x3a38, 0x331c,
++	0xb42f, 0x3b21, 0x3a2f, 0x3342,
++	0xb443, 0x3b12, 0x3a25, 0x3369,
++	0xb456, 0x3b02, 0x3a1c, 0x3390,
++	0xb46a, 0x3af3, 0x3a12, 0x33b7,
++	0xb47e, 0x3ae3, 0x3a08, 0x33de,
++	0xb492, 0x3ad4, 0x39fe, 0x3403,
++	0xb4a6, 0x3ac5, 0x39f4, 0x3417,
++	0xb4bb, 0x3ab5, 0x39ea, 0x342b,
++	0xb4cf, 0x3aa6, 0x39df, 0x3440,
++	0xb4e4, 0x3a97, 0x39d5, 0x3454,
++	0xb4f9, 0x3a88, 0x39cb, 0x3469,
++	0xb50e, 0x3a79, 0x39c0, 0x347e,
++	0xb523, 0x3a6a, 0x39b6, 0x3493,
++	0xb539, 0x3a5a, 0x39ab, 0x34a8,
++	0xb54e, 0x3a4c, 0x39a0, 0x34be,
++	0xb564, 0x3a3d, 0x3996, 0x34d3,
++	0xb57a, 0x3a2e, 0x398b, 0x34e9,
++	0xb590, 0x3a1f, 0x3980, 0x34ff,
++	0xb5a6, 0x3a10, 0x3975, 0x3515,
++	0xb5bc, 0x3a02, 0x396a, 0x352b,
++	0xb5d2, 0x39f3, 0x395f, 0x3541,
++	0xb5e9, 0x39e4, 0x3954, 0x3557,
++	0xb5ff, 0x39d6, 0x3948, 0x356e,
++	0xb616, 0x39c7, 0x393d, 0x3584,
++	0xb62d, 0x39b9, 0x3932, 0x359b,
++	0xb644, 0x39ab, 0x3926, 0x35b2,
++	0xb65b, 0x399c, 0x391b, 0x35c9,
++	0xb672, 0x398e, 0x3910, 0x35df,
++	0xb68a, 0x3980, 0x3904, 0x35f6,
++	0xb6a1, 0x3972, 0x38f8, 0x360e,
++	0xb6b9, 0x3964, 0x38ed, 0x3625,
++	0xb6d1, 0x3956, 0x38e1, 0x363c,
++	0xb6e8, 0x3948, 0x38d6, 0x3653,
++	0xb700, 0x393a, 0x38ca, 0x366b,
++	0xb719, 0x392c, 0x38be, 0x3682,
++	0xb731, 0x391e, 0x38b2, 0x369a,
++	0xb749, 0x3910, 0x38a7, 0x36b1,
++	0xb762, 0x3902, 0x389b, 0x36c9,
++	0xb77a, 0x38f5, 0x388f, 0x36e1,
++	0xb793, 0x38e7, 0x3883, 0x36f8,
++	0xb7ac, 0x38da, 0x3877, 0x3710,
++	0xb7c5, 0x38cc, 0x386b, 0x3728,
++	0xb7de, 0x38bf, 0x385f, 0x3740,
++	0xb7f7, 0x38b1, 0x3853, 0x3758,
++	0xb808, 0x38a4, 0x3847, 0x3770,
++	0xb815, 0x3897, 0x383b, 0x3788,
++	0xb821, 0x3889, 0x382f, 0x37a0,
++	0xb82e, 0x387c, 0x3823, 0x37b8,
++	0xb83b, 0x386f, 0x3817, 0x37d0,
++	0xb848, 0x3862, 0x380b, 0x37e8,
++	0xb855, 0x3855, 0x3800, 0x3800,
++	0xb862, 0x3848, 0x37e8, 0x380b,
++	0xb86f, 0x383b, 0x37d0, 0x3817,
++	0xb87c, 0x382e, 0x37b8, 0x3823,
++	0xb889, 0x3821, 0x37a0, 0x382f,
++	0xb897, 0x3815, 0x3788, 0x383b,
++	0xb8a4, 0x3808, 0x3770, 0x3847,
++	0xb8b1, 0x37f7, 0x3758, 0x3853,
++	0xb8bf, 0x37de, 0x3740, 0x385f,
++	0xb8cc, 0x37c5, 0x3728, 0x386b,
++	0xb8da, 0x37ac, 0x3710, 0x3877,
++	0xb8e7, 0x3793, 0x36f8, 0x3883,
++	0xb8f5, 0x377a, 0x36e1, 0x388f,
++	0xb902, 0x3762, 0x36c9, 0x389b,
++	0xb910, 0x3749, 0x36b1, 0x38a7,
++	0xb91e, 0x3731, 0x369a, 0x38b2,
++	0xb92c, 0x3719, 0x3682, 0x38be,
++	0xb93a, 0x3700, 0x366b, 0x38ca,
++	0xb948, 0x36e8, 0x3653, 0x38d6,
++	0xb956, 0x36d1, 0x363c, 0x38e1,
++	0xb964, 0x36b9, 0x3625, 0x38ed,
++	0xb972, 0x36a1, 0x360e, 0x38f8,
++	0xb980, 0x368a, 0x35f6, 0x3904,
++	0xb98e, 0x3672, 0x35df, 0x3910,
++	0xb99c, 0x365b, 0x35c9, 0x391b,
++	0xb9ab, 0x3644, 0x35b2, 0x3926,
++	0xb9b9, 0x362d, 0x359b, 0x3932,
++	0xb9c7, 0x3616, 0x3584, 0x393d,
++	0xb9d6, 0x35ff, 0x356e, 0x3948,
++	0xb9e4, 0x35e9, 0x3557, 0x3954,
++	0xb9f3, 0x35d2, 0x3541, 0x395f,
++	0xba02, 0x35bc, 0x352b, 0x396a,
++	0xba10, 0x35a6, 0x3515, 0x3975,
++	0xba1f, 0x3590, 0x34ff, 0x3980,
++	0xba2e, 0x357a, 0x34e9, 0x398b,
++	0xba3d, 0x3564, 0x34d3, 0x3996,
++	0xba4c, 0x354e, 0x34be, 0x39a0,
++	0xba5a, 0x3539, 0x34a8, 0x39ab,
++	0xba6a, 0x3523, 0x3493, 0x39b6,
++	0xba79, 0x350e, 0x347e, 0x39c0,
++	0xba88, 0x34f9, 0x3469, 0x39cb,
++	0xba97, 0x34e4, 0x3454, 0x39d5,
++	0xbaa6, 0x34cf, 0x3440, 0x39df,
++	0xbab5, 0x34bb, 0x342b, 0x39ea,
++	0xbac5, 0x34a6, 0x3417, 0x39f4,
++	0xbad4, 0x3492, 0x3403, 0x39fe,
++	0xbae3, 0x347e, 0x33de, 0x3a08,
++	0xbaf3, 0x346a, 0x33b7, 0x3a12,
++	0xbb02, 0x3456, 0x3390, 0x3a1c,
++	0xbb12, 0x3443, 0x3369, 0x3a25,
++	0xbb21, 0x342f, 0x3342, 0x3a2f,
++	0xbb31, 0x341c, 0x331c, 0x3a38,
++	0xbb41, 0x3409, 0x32f7, 0x3a42,
++	0xbb51, 0x33ed, 0x32d1, 0x3a4b,
++	0xbb60, 0x33c7, 0x32ad, 0x3a54,
++	0xbb70, 0x33a2, 0x3288, 0x3a5d,
++	0xbb80, 0x337d, 0x3264, 0x3a66,
++	0xbb90, 0x3359, 0x3241, 0x3a6f,
++	0xbba0, 0x3335, 0x321e, 0x3a78,
++	0xbbb0, 0x3312, 0x31fb, 0x3a81,
++	0xbbc0, 0x32ee, 0x31d9, 0x3a89,
++	0xbbd0, 0x32cc, 0x31b7, 0x3a92,
++	0xbbe0, 0x32a9, 0x3196, 0x3a9a,
++	0xbbf0, 0x3287, 0x3175, 0x3aa2,
++	0 };
++
++static const uint16_t bicubic_tex_2048[] = {
++	0xb266, 0x3c00, 0x3aaa, 0x3155,
++	0xb26e, 0x3bfc, 0x3aa8, 0x315d,
++	0xb277, 0x3bf8, 0x3aa6, 0x3165,
++	0xb27f, 0x3bf4, 0x3aa4, 0x316d,
++	0xb287, 0x3bf0, 0x3aa2, 0x3175,
++	0xb290, 0x3bec, 0x3aa0, 0x317d,
++	0xb298, 0x3be8, 0x3a9e, 0x3185,
++	0xb2a1, 0x3be4, 0x3a9c, 0x318e,
++	0xb2a9, 0x3be0, 0x3a9a, 0x3196,
++	0xb2b2, 0x3bdc, 0x3a98, 0x319e,
++	0xb2ba, 0x3bd8, 0x3a96, 0x31a6,
++	0xb2c3, 0x3bd4, 0x3a94, 0x31af,
++	0xb2cc, 0x3bd0, 0x3a92, 0x31b7,
++	0xb2d4, 0x3bcc, 0x3a90, 0x31bf,
++	0xb2dd, 0x3bc8, 0x3a8d, 0x31c8,
++	0xb2e6, 0x3bc4, 0x3a8b, 0x31d0,
++	0xb2ee, 0x3bc0, 0x3a89, 0x31d9,
++	0xb2f7, 0x3bbc, 0x3a87, 0x31e1,
++	0xb300, 0x3bb8, 0x3a85, 0x31ea,
++	0xb309, 0x3bb4, 0x3a83, 0x31f2,
++	0xb312, 0x3bb0, 0x3a81, 0x31fb,
++	0xb31a, 0x3bac, 0x3a7e, 0x3204,
++	0xb323, 0x3ba8, 0x3a7c, 0x320c,
++	0xb32c, 0x3ba4, 0x3a7a, 0x3215,
++	0xb335, 0x3ba0, 0x3a78, 0x321e,
++	0xb33e, 0x3b9c, 0x3a76, 0x3226,
++	0xb347, 0x3b98, 0x3a74, 0x322f,
++	0xb350, 0x3b94, 0x3a71, 0x3238,
++	0xb359, 0x3b90, 0x3a6f, 0x3241,
++	0xb362, 0x3b8c, 0x3a6d, 0x3249,
++	0xb36b, 0x3b88, 0x3a6b, 0x3252,
++	0xb374, 0x3b84, 0x3a69, 0x325b,
++	0xb37d, 0x3b80, 0x3a66, 0x3264,
++	0xb387, 0x3b7c, 0x3a64, 0x326d,
++	0xb390, 0x3b78, 0x3a62, 0x3276,
++	0xb399, 0x3b74, 0x3a60, 0x327f,
++	0xb3a2, 0x3b70, 0x3a5d, 0x3288,
++	0xb3ab, 0x3b6c, 0x3a5b, 0x3291,
++	0xb3b5, 0x3b68, 0x3a59, 0x329a,
++	0xb3be, 0x3b64, 0x3a57, 0x32a3,
++	0xb3c7, 0x3b60, 0x3a54, 0x32ad,
++	0xb3d0, 0x3b5c, 0x3a52, 0x32b6,
++	0xb3da, 0x3b58, 0x3a50, 0x32bf,
++	0xb3e3, 0x3b54, 0x3a4d, 0x32c8,
++	0xb3ed, 0x3b51, 0x3a4b, 0x32d1,
++	0xb3f6, 0x3b4d, 0x3a49, 0x32db,
++	0xb3ff, 0x3b49, 0x3a46, 0x32e4,
++	0xb404, 0x3b45, 0x3a44, 0x32ed,
++	0xb409, 0x3b41, 0x3a42, 0x32f7,
++	0xb40e, 0x3b3d, 0x3a3f, 0x3300,
[...2240 lines suppressed...]
++		xFixedToFloat(srcBottomRight.x) / info->texW[0],  xFixedToFloat(srcBottomRight.y) / info->texH[0],
++		xFixedToFloat(srcBottomRight.x) + 0.5,            xFixedToFloat(srcBottomRight.y) + 0.5);
++		VTX_OUT_FILTER((float)(dstX + dstw),              (float)dstY,
++		xFixedToFloat(srcTopRight.x) / info->texW[0],     xFixedToFloat(srcTopRight.y) / info->texH[0],
++		xFixedToFloat(srcTopRight.x) + 0.5,               xFixedToFloat(srcTopRight.y) + 0.5);
++	} else {
++		if (info->ChipFamily >= CHIP_FAMILY_R200) {
++			VTX_OUT((float)dstX,                              (float)dstY,
++			xFixedToFloat(srcTopLeft.x) / info->texW[0],      xFixedToFloat(srcTopLeft.y) / info->texH[0]);
++		}
++		VTX_OUT((float)dstX,                              (float)(dstY + dsth),
  		xFixedToFloat(srcBottomLeft.x) / info->texW[0],   xFixedToFloat(srcBottomLeft.y) / info->texH[0]);
- 	VTX_OUT((float)(dstX + dstw),                                (float)(dstY + dsth),
+-	VTX_OUT((float)(dstX + dstw),                                (float)(dstY + dsth),
++		VTX_OUT((float)(dstX + dstw),                     (float)(dstY + dsth),
+ 		xFixedToFloat(srcBottomRight.x) / info->texW[0],  xFixedToFloat(srcBottomRight.y) / info->texH[0]);
+-	VTX_OUT((float)(dstX + dstw),                                (float)dstY,
++		VTX_OUT((float)(dstX + dstw),                     (float)dstY,
+ 		xFixedToFloat(srcTopRight.x) / info->texW[0],     xFixedToFloat(srcTopRight.y) / info->texH[0]);
++	}
+ 
+ 	if (IS_R300_3D || IS_R500_3D)
+ 	    /* flushing is pipelined, free/finish is not */
+@@ -655,4 +1248,5 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ }
+ 
+ #undef VTX_OUT
++#undef VTX_OUT_FILTER
+ #undef FUNC_NAME
 diff --git a/src/radeon_tv.c b/src/radeon_tv.c
 index 90020b3..90d1ac9 100644
 --- a/src/radeon_tv.c
@@ -4395,10 +6626,69 @@
  #ifndef RADEON_VERSION_EXTRA
  #define RADEON_VERSION_EXTRA ""
 diff --git a/src/radeon_video.c b/src/radeon_video.c
-index ac60166..57dcd8a 100644
+index ac60166..e71f0f8 100644
 --- a/src/radeon_video.c
 +++ b/src/radeon_video.c
-@@ -2586,6 +2586,7 @@ RADEONDisplayVideo(
+@@ -89,10 +89,6 @@ static void RADEON_MSP_SetEncoding(RADEONPortPrivPtr pPriv);
+ static void RADEON_TDA9885_SetEncoding(RADEONPortPrivPtr pPriv);
+ static void RADEON_FI1236_SetEncoding(RADEONPortPrivPtr pPriv);
+ 
+-
+-
+-#define ClipValue(v,min,max) ((v) < (min) ? (min) : (v) > (max) ? (max) : (v))
+-
+ static Atom xvBrightness, xvColorKey, xvSaturation, xvDoubleBuffer;
+ static Atom xvRedIntensity, xvGreenIntensity, xvBlueIntensity;
+ static Atom xvContrast, xvHue, xvColor, xvAutopaintColorkey, xvSetDefaults;
+@@ -106,7 +102,6 @@ static Atom xvEncoding, xvFrequency, xvVolume, xvMute,
+ 	     
+ static Atom xvOvAlpha, xvGrAlpha, xvAlphaMode;
+ 
+-
+ #define GET_PORT_PRIVATE(pScrn) \
+    (RADEONPortPrivPtr)((RADEONPTR(pScrn))->adaptor->pPortPrivates[0].ptr)
+ 
+@@ -1678,6 +1673,10 @@ RADEONStopVideo(ScrnInfoPtr pScrn, pointer data, Bool cleanup)
+ 	 RADEONFreeMemory(pScrn, pPriv->video_memory);
+ 	 pPriv->video_memory = NULL;
+      }
++     if (pPriv->bicubic_memory != NULL) {
++	 RADEONFreeMemory(pScrn, pPriv->bicubic_memory);
++	 pPriv->bicubic_memory = NULL;
++     }
+      pPriv->videoStatus = 0;
+   } else {
+      if(pPriv->videoStatus & CLIENT_VIDEO_ON) {
+@@ -1699,9 +1698,6 @@ RADEONSetPortAttribute(ScrnInfoPtr  pScrn,
+     Bool		setAlpha = FALSE;
+     unsigned char *RADEONMMIO = info->MMIO;
+ 
+-    if (pPriv->textured)
+-	return BadMatch;
+-
+     RADEON_SYNC(info, pScrn);
+ 
+ #define RTFSaturation(a)   (1.0 + ((a)*1.0)/1000.0)
+@@ -1928,7 +1924,7 @@ RADEONSetPortAttribute(ScrnInfoPtr  pScrn,
+ 	if(pPriv->fi1236!=NULL){
+ 		xf86_fi1236_dump_status(pPriv->fi1236);
+ 		}
+-   } 
++   }
+    else if(attribute == xvAdjustment) 
+    {
+   	pPriv->adjustment=value;
+@@ -1973,9 +1969,6 @@ RADEONGetPortAttribute(ScrnInfoPtr  pScrn,
+     RADEONInfoPtr	info = RADEONPTR(pScrn);
+     RADEONPortPrivPtr	pPriv = (RADEONPortPrivPtr)data;
+ 
+-    if (pPriv->textured)
+-	return BadMatch;
+-
+     if (info->accelOn) RADEON_SYNC(info, pScrn);
+ 
+     if(attribute == xvAutopaintColorkey)
+@@ -2586,6 +2579,7 @@ RADEONDisplayVideo(
      RADEONOutputPrivatePtr radeon_output;
      xf86OutputPtr output;
      RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
@@ -4406,7 +6696,7 @@
  
      is_rgb=0; is_planar=0;
      switch(id){
-@@ -2715,6 +2716,22 @@ RADEONDisplayVideo(
+@@ -2715,6 +2709,22 @@ RADEONDisplayVideo(
          }
  #endif
  
@@ -4429,7 +6719,7 @@
      /* keep everything in 16.16 */
  
      if (is_planar) {
-@@ -2846,6 +2863,10 @@ RADEONDisplayVideo(
+@@ -2846,6 +2856,10 @@ RADEONDisplayVideo(
  	src_w >>= 1;
      OUTREG(RADEON_OV0_P2_X_START_END, (src_w + leftuv - 1) | (leftuv << 16));
      OUTREG(RADEON_OV0_P3_X_START_END, (src_w + leftuv - 1) | (leftuv << 16));
@@ -4440,3 +6730,77 @@
      OUTREG(RADEON_OV0_VID_BUF0_BASE_ADRS, offset1);
      OUTREG(RADEON_OV0_VID_BUF1_BASE_ADRS, offset2);
      OUTREG(RADEON_OV0_VID_BUF2_BASE_ADRS, offset3);
+@@ -3236,6 +3250,10 @@ RADEONVideoTimerCallback(ScrnInfoPtr pScrn, Time now)
+ 		    RADEONFreeMemory(pScrn, pPriv->video_memory);
+ 		    pPriv->video_memory = NULL;
+ 		}
++		if (pPriv->bicubic_memory != NULL) {
++		    RADEONFreeMemory(pScrn, pPriv->bicubic_memory);
++		    pPriv->bicubic_memory = NULL;
++		}
+ 		pPriv->videoStatus = 0;
+ 		info->VideoTimerCallback = NULL;
+ 	    }
+diff --git a/src/radeon_video.h b/src/radeon_video.h
+index 096de37..b9d900d 100644
+--- a/src/radeon_video.h
++++ b/src/radeon_video.h
+@@ -13,6 +13,10 @@
+ 
+ #include "xf86Crtc.h"
+ 
++#include "bicubic_table.h"
++
++#define ClipValue(v,min,max) ((v) < (min) ? (min) : (v) > (max) ? (max) : (v))
++
+ /* Xvideo port struct */
+ typedef struct {
+    uint32_t	 transform_index;
+@@ -37,7 +41,7 @@ typedef struct {
+    uint32_t      radeon_N;
+    uint32_t      i2c_status;
+    uint32_t      i2c_cntl;
+-   
++
+    FI1236Ptr     fi1236;
+    uint8_t       tuner_type;
+    MSP3430Ptr    msp3430;
+@@ -46,7 +50,7 @@ typedef struct {
+ 
+    /* VIP bus and devices */
+    GENERIC_BUS_Ptr  VIP;
+-   TheatrePtr       theatre;   
++   TheatrePtr       theatre;
+ 
+    Bool          video_stream_active;
+    int           encoding;
+@@ -56,7 +60,7 @@ typedef struct {
+    int           sap_channel;
+    int           v;
+    uint32_t      adjustment; /* general purpose variable */
+-   
++
+ #define METHOD_BOB      0
+ #define METHOD_SINGLE   1
+ #define METHOD_WEAVE    2
+@@ -89,6 +93,12 @@ typedef struct {
+    void         *video_memory;
+    int           video_offset;
+ 
++   /* bicubic filtering */
++   void         *bicubic_memory;
++   int           bicubic_offset;
++   Bool          bicubic_enabled;
++   uint32_t      bicubic_src_offset;
++
+    Atom          device_id, location_id, instance_id;
+ 
+     /* textured video */
+@@ -106,7 +116,6 @@ typedef struct {
+     int drw_x, drw_y;
+ } RADEONPortPrivRec, *RADEONPortPrivPtr;
+ 
+-
+ void RADEONInitI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);
+ void RADEONResetI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);
+ 

radeon-modeset.patch:

Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- radeon-modeset.patch	9 Sep 2008 19:20:18 -0000	1.13
+++ radeon-modeset.patch	26 Sep 2008 00:53:39 -0000	1.14
@@ -2,7 +2,7 @@
 index b8c18a6..a7e954d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -115,6 +115,15 @@ if test "$DRI" = yes; then
+@@ -115,6 +115,14 @@ if test "$DRI" = yes; then
  	if test "$have_damage_h" = yes; then
  		AC_DEFINE(DAMAGE,1,[Use Damage extension])
  	fi
@@ -14,7 +14,6 @@
 +        if test "x$DRM_MODE" = xyes; then
 +                AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting])
 +        fi
-+        CFLAGS="$save_CFLAGS"
  fi
  
  save_CFLAGS="$CFLAGS"
@@ -47,10 +46,10 @@
 +	drmmode_display.h
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
 new file mode 100644
-index 0000000..97762ce
+index 0000000..25e6183
 --- /dev/null
 +++ b/src/drmmode_display.c
-@@ -0,0 +1,681 @@
+@@ -0,0 +1,685 @@
 +/*
 + * Copyright ?? 2007 Red Hat, Inc.
 + *
@@ -100,7 +99,7 @@
 +	ret = drmmode_resize_fb(scrn, drmmode, width, height);
 +	scrn->virtualX = width;
 +	scrn->virtualY = height;
-+	return ret;
++	return TRUE;
 +}
 +
 +static void
@@ -184,7 +183,7 @@
 +	DisplayModeRec saved_mode;
 +	uint32_t *output_ids;
 +	int output_count = 0;
-+	int ret = TRUE;
++	Bool ret = TRUE;
 +	int i;
 +	int fb_id;
 +	struct drm_mode_modeinfo kmode;
@@ -231,6 +230,9 @@
 +	drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
 +		       fb_id, x, y, output_ids, output_count, &kmode);
 +
++	if (crtc->scrn->pScreen)
++		xf86CrtcSetScreenSubpixelOrder(crtc->scrn->pScreen);
++
 +
 +done:
 +	if (!ret) {
@@ -583,6 +585,7 @@
 +
 +	output->possible_crtcs = kencoder->possible_crtcs;
 +	output->possible_clones = kencoder->possible_clones;
++
 +	return;
 +}
 +
@@ -1029,7 +1032,7 @@
  do {									\
      if (RADEON_VERBOSE)							\
 diff --git a/src/radeon_accel.c b/src/radeon_accel.c
-index e617fd5..09aa7f6 100644
+index e617fd5..dfb88a6 100644
 --- a/src/radeon_accel.c
 +++ b/src/radeon_accel.c
 @@ -313,6 +313,9 @@ void RADEONEngineRestore(ScrnInfoPtr pScrn)
@@ -1051,7 +1054,7 @@
  	drmRadeonGetParam np;
  	int num_pipes;
  
-@@ -391,60 +394,62 @@ void RADEONEngineInit(ScrnInfoPtr pScrn)
+@@ -391,60 +394,63 @@ void RADEONEngineInit(ScrnInfoPtr pScrn)
      }
  #endif
  
@@ -1125,7 +1128,8 @@
 +	    
 +	    OUTREG(R300_GB_TILE_CONFIG, gb_tile_config);
 +	    OUTREG(RADEON_WAIT_UNTIL, RADEON_WAIT_2D_IDLECLEAN | RADEON_WAIT_3D_IDLECLEAN);
-+	    OUTREG(R300_DST_PIPE_CONFIG, INREG(R300_DST_PIPE_CONFIG) | R300_PIPE_AUTO_CONFIG);
++	    if (info->ChipFamily >= CHIP_FAMILY_R420)
++	    	OUTREG(R300_DST_PIPE_CONFIG, INREG(R300_DST_PIPE_CONFIG) | R300_PIPE_AUTO_CONFIG);
 +	    OUTREG(R300_RB2D_DSTCACHE_MODE, (INREG(R300_RB2D_DSTCACHE_MODE) |
 +					     R300_DC_AUTOFLUSH_ENABLE |
 +					     R300_DC_DC_DISABLE_IGNORE_PE));
@@ -1164,7 +1168,7 @@
      switch (info->CurrentLayout.pixel_code) {
      case 8:  info->datatype = 2; break;
      case 15: info->datatype = 3; break;
-@@ -556,6 +561,149 @@ int RADEONCPStop(ScrnInfoPtr pScrn, RADEONInfoPtr info)
+@@ -556,6 +562,149 @@ int RADEONCPStop(ScrnInfoPtr pScrn, RADEONInfoPtr info)
      }
  }
  
@@ -1314,7 +1318,7 @@
  /* Get an indirect buffer for the CP 2D acceleration commands  */
  drmBufPtr RADEONCPGetBuffer(ScrnInfoPtr pScrn)
  {
-@@ -566,6 +714,9 @@ drmBufPtr RADEONCPGetBuffer(ScrnInfoPtr pScrn)
+@@ -566,6 +715,9 @@ drmBufPtr RADEONCPGetBuffer(ScrnInfoPtr pScrn)
      int            size = 0;
      int            i = 0;
      int            ret;
@@ -1324,7 +1328,7 @@
  
  #if 0
      /* FIXME: pScrn->pScreen has not been initialized when this is first
-@@ -631,6 +782,11 @@ void RADEONCPFlushIndirect(ScrnInfoPtr pScrn, int discard)
+@@ -631,6 +783,11 @@ void RADEONCPFlushIndirect(ScrnInfoPtr pScrn, int discard)
      if (!buffer) return;
      if (start == buffer->used && !discard) return;
  
@@ -1336,7 +1340,7 @@
      if (RADEON_VERBOSE) {
  	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Flushing buffer %d\n",
  		   buffer->idx);
-@@ -665,10 +821,17 @@ void RADEONCPReleaseIndirect(ScrnInfoPtr pScrn)
+@@ -665,10 +822,17 @@ void RADEONCPReleaseIndirect(ScrnInfoPtr pScrn)
      int                start  = info->indirectStart;
      drmRadeonIndirect  indirect;
  
@@ -1354,7 +1358,7 @@
  
      if (RADEON_VERBOSE) {
  	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Releasing buffer %d\n",
-@@ -795,6 +958,7 @@ RADEONHostDataBlit(
+@@ -795,6 +959,7 @@ RADEONHostDataBlit(
      ret = ( uint8_t* )&__head[__count];
  
      __count += dwords;
@@ -1362,7 +1366,7 @@
      ADVANCE_RING();
  
      *y += *hpass;
-@@ -932,7 +1096,7 @@ Bool RADEONAccelInit(ScreenPtr pScreen)
+@@ -932,7 +1097,7 @@ Bool RADEONAccelInit(ScreenPtr pScreen)
  #ifdef USE_EXA
      if (info->useEXA) {
  # ifdef XF86DRI
@@ -1371,7 +1375,7 @@
  	    if (!RADEONDrawInitCP(pScreen))
  		return FALSE;
  	} else
-@@ -953,7 +1117,7 @@ Bool RADEONAccelInit(ScreenPtr pScreen)
+@@ -953,7 +1118,7 @@ Bool RADEONAccelInit(ScreenPtr pScreen)
  	}
  
  #ifdef XF86DRI
@@ -1380,7 +1384,7 @@
  	    RADEONAccelInitCP(pScreen, a);
  	else
  #endif /* XF86DRI */
-@@ -975,11 +1139,13 @@ void RADEONInit3DEngine(ScrnInfoPtr pScrn)
+@@ -975,11 +1140,13 @@ void RADEONInit3DEngine(ScrnInfoPtr pScrn)
      RADEONInfoPtr info = RADEONPTR (pScrn);
  
  #ifdef XF86DRI
@@ -2370,12 +2374,14 @@
 +typedef drm_radeon_setparam_t drmRadeonSetParam;
 +#endif
 diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
-index d0c5229..15a3beb 100644
+index 1de6bf8..6ead191 100644
 --- a/src/radeon_commonfuncs.c
 +++ b/src/radeon_commonfuncs.c
-@@ -62,11 +62,13 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
+@@ -61,12 +61,15 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
+     info->texW[0] = info->texH[0] = info->texW[1] = info->texH[1] = 1;
  
      if (IS_R300_3D || IS_R500_3D) {
++	int size;
  
 -	BEGIN_ACCEL(3);
 -	OUT_ACCEL_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_DC_FLUSH_3D | R300_DC_FREE_3D);
@@ -2392,7 +2398,22 @@
  
  	gb_tile_config = (R300_ENABLE_TILING | R300_TILE_SIZE_16 | R300_SUBPIXEL_1_16);
  
-@@ -688,7 +690,7 @@ void FUNC_NAME(RADEONWaitForIdle)(ScrnInfoPtr pScrn)
+@@ -78,10 +81,12 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
+ 	case 1: gb_tile_config |= R300_PIPE_COUNT_RV350; break;
+ 	}
+ 
+-	BEGIN_ACCEL(5);
++	size = (info->ChipFamily >= CHIP_FAMILY_R420) ? 5 : 4;
++	BEGIN_ACCEL(size);
+ 	OUT_ACCEL_REG(R300_GB_TILE_CONFIG, gb_tile_config);
+ 	OUT_ACCEL_REG(RADEON_WAIT_UNTIL, RADEON_WAIT_2D_IDLECLEAN | RADEON_WAIT_3D_IDLECLEAN);
+-	OUT_ACCEL_REG(R300_DST_PIPE_CONFIG, R300_PIPE_AUTO_CONFIG);
++	if (info->ChipFamily >= CHIP_FAMILY_R420)
++	    OUT_ACCEL_REG(R300_DST_PIPE_CONFIG, R300_PIPE_AUTO_CONFIG);
+ 	OUT_ACCEL_REG(R300_GB_SELECT, 0);
+ 	OUT_ACCEL_REG(R300_GB_ENABLE, 0);
+ 	FINISH_ACCEL();
+@@ -686,7 +691,7 @@ void FUNC_NAME(RADEONWaitForIdle)(ScrnInfoPtr pScrn)
  
  #ifdef ACCEL_CP
      /* Make sure the CP is idle first */
@@ -2490,7 +2511,7 @@
  	FBAreaPtr          fbarea;
  
 diff --git a/src/radeon_dri.c b/src/radeon_dri.c
-index a192811..9fa0add 100644
+index a192811..45414b4 100644
 --- a/src/radeon_dri.c
 +++ b/src/radeon_dri.c
 @@ -40,6 +40,8 @@
@@ -2545,7 +2566,7 @@
  static void RADEONDRIClipNotify(ScreenPtr pScreen, WindowPtr *ppWin, int num);
  #endif
  #endif
-@@ -345,6 +363,120 @@ static void RADEONDestroyContext(ScreenPtr pScreen, drm_context_t hwContext,
+@@ -345,6 +363,125 @@ static void RADEONDestroyContext(ScreenPtr pScreen, drm_context_t hwContext,
  #endif
  }
  
@@ -2629,6 +2650,7 @@
 +    if (!info->drm_mm)
 +	return TRUE;
 +
++
 +    fb_addr = info->mm.front_buffer->offset + info->LinearAddr;
 +    fb_size = ROUND_TO_PAGE(pScrn->displayWidth * pScrn->virtualY * info->CurrentLayout.pixel_bytes);
 +
@@ -2653,6 +2675,10 @@
 +    RADEONInfoPtr  info  = RADEONPTR(pScrn);
 +    Bool success;
 +    RADEONSAREAPrivPtr sarea = DRIGetSAREAPrivate(pScrn->pScreen);
++
++    if (info->ChipFamily >= CHIP_FAMILY_R600)
++	return TRUE;
++
 +    success = radeon_update_dri_mappings(pScrn, sarea);
 +
 +    if (!success)
@@ -2666,7 +2692,7 @@
  /* Called when the X server is woken up to allow the last client's
   * context to be saved and the X server's context to be loaded.  This is
   * not necessary for the Radeon since the client detects when it's
-@@ -362,7 +494,7 @@ static void RADEONEnterServer(ScreenPtr pScreen)
+@@ -362,7 +499,7 @@ static void RADEONEnterServer(ScreenPtr pScreen)
      RADEON_MARK_SYNC(info, pScrn);
  
      pSAREAPriv = DRIGetSAREAPrivate(pScrn->pScreen);
@@ -2675,7 +2701,7 @@
  	info->XInited3D = FALSE;
  	info->needCacheFlush = (info->ChipFamily >= CHIP_FAMILY_R300);
      }
-@@ -694,25 +826,37 @@ static void RADEONDRIInitGARTValues(RADEONInfoPtr info)
+@@ -694,25 +831,37 @@ static void RADEONDRIInitGARTValues(RADEONInfoPtr info)
  
      info->gartOffset = 0;
  
@@ -2729,7 +2755,7 @@
  }
  
  /* Set AGP transfer mode according to requests and constraints */
-@@ -884,6 +1028,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -884,6 +1033,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
      xf86DrvMsg(pScreen->myNum, X_INFO,
  	       "[agp] ring handle = 0x%08x\n", info->ringHandle);
  
@@ -2737,7 +2763,7 @@
      if (drmMap(info->drmFD, info->ringHandle, info->ringMapSize,
  	       &info->ring) < 0) {
  	xf86DrvMsg(pScreen->myNum, X_ERROR, "[agp] Could not map ring\n");
-@@ -892,7 +1037,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -892,7 +1042,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
      xf86DrvMsg(pScreen->myNum, X_INFO,
  	       "[agp] Ring mapped at 0x%08lx\n",
  	       (unsigned long)info->ring);
@@ -2746,7 +2772,7 @@
      if (drmAddMap(info->drmFD, info->ringReadOffset, info->ringReadMapSize,
  		  DRM_AGP, DRM_READ_ONLY, &info->ringReadPtrHandle) < 0) {
  	xf86DrvMsg(pScreen->myNum, X_ERROR,
-@@ -903,6 +1048,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -903,6 +1053,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
   	       "[agp] ring read ptr handle = 0x%08x\n",
  	       info->ringReadPtrHandle);
  
@@ -2754,7 +2780,7 @@
      if (drmMap(info->drmFD, info->ringReadPtrHandle, info->ringReadMapSize,
  	       &info->ringReadPtr) < 0) {
  	xf86DrvMsg(pScreen->myNum, X_ERROR,
-@@ -912,7 +1058,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -912,7 +1063,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
      xf86DrvMsg(pScreen->myNum, X_INFO,
  	       "[agp] Ring read ptr mapped at 0x%08lx\n",
  	       (unsigned long)info->ringReadPtr);
@@ -2763,7 +2789,7 @@
      if (drmAddMap(info->drmFD, info->bufStart, info->bufMapSize,
  		  DRM_AGP, 0, &info->bufHandle) < 0) {
  	xf86DrvMsg(pScreen->myNum, X_ERROR,
-@@ -986,7 +1132,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -986,7 +1137,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
      }
      xf86DrvMsg(pScreen->myNum, X_INFO,
  	       "[pci] ring handle = 0x%08x\n", info->ringHandle);
@@ -2772,7 +2798,7 @@
      if (drmMap(info->drmFD, info->ringHandle, info->ringMapSize,
  	       &info->ring) < 0) {
  	xf86DrvMsg(pScreen->myNum, X_ERROR, "[pci] Could not map ring\n");
-@@ -998,6 +1144,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -998,6 +1149,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
      xf86DrvMsg(pScreen->myNum, X_INFO,
  	       "[pci] Ring contents 0x%08lx\n",
  	       *(unsigned long *)(pointer)info->ring);
@@ -2780,7 +2806,7 @@
  
      if (drmAddMap(info->drmFD, info->ringReadOffset, info->ringReadMapSize,
  		  DRM_SCATTER_GATHER, flags, &info->ringReadPtrHandle) < 0) {
-@@ -1008,7 +1155,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1008,7 +1160,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
      xf86DrvMsg(pScreen->myNum, X_INFO,
   	       "[pci] ring read ptr handle = 0x%08x\n",
  	       info->ringReadPtrHandle);
@@ -2789,7 +2815,7 @@
      if (drmMap(info->drmFD, info->ringReadPtrHandle, info->ringReadMapSize,
  	       &info->ringReadPtr) < 0) {
  	xf86DrvMsg(pScreen->myNum, X_ERROR,
-@@ -1021,6 +1168,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1021,6 +1173,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
      xf86DrvMsg(pScreen->myNum, X_INFO,
  	       "[pci] Ring read ptr contents 0x%08lx\n",
  	       *(unsigned long *)(pointer)info->ringReadPtr);
@@ -2797,7 +2823,7 @@
  
      if (drmAddMap(info->drmFD, info->bufStart, info->bufMapSize,
  		  DRM_SCATTER_GATHER, 0, &info->bufHandle) < 0) {
-@@ -1073,6 +1221,9 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1073,6 +1226,9 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
   */
  static Bool RADEONDRIMapInit(RADEONInfoPtr info, ScreenPtr pScreen)
  {
@@ -2807,7 +2833,7 @@
  				/* Map registers */
      info->registerSize = info->MMIOSize;
      if (drmAddMap(info->drmFD, info->MMIOAddr, info->registerSize,
-@@ -1094,12 +1245,12 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1094,12 +1250,12 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen)
  
      memset(&drmInfo, 0, sizeof(drmRadeonInit));
      if ( info->ChipFamily >= CHIP_FAMILY_R300 )
@@ -2823,7 +2849,7 @@
  
      drmInfo.sarea_priv_offset   = sizeof(XF86DRISAREARec);
      drmInfo.is_pci              = (info->cardType!=CARD_AGP);
-@@ -1111,19 +1262,22 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1111,19 +1267,22 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen)
      drmInfo.fb_bpp              = info->CurrentLayout.pixel_code;
      drmInfo.depth_bpp           = (info->depthBits - 8) * 2;
  
@@ -2859,7 +2885,7 @@
  
      if (drmCommandWrite(info->drmFD, DRM_RADEON_CP_INIT,
  			&drmInfo, sizeof(drmRadeonInit)) < 0)
-@@ -1133,7 +1287,8 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1133,7 +1292,8 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen)
       * registers back to their default values, so we need to restore
       * those engine register here.
       */
@@ -2869,7 +2895,7 @@
  
      return TRUE;
  }
-@@ -1329,12 +1484,11 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn)
+@@ -1329,12 +1489,11 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn)
  
      /* Get DRM version & close DRM */
      info->pKernelDRMVersion = drmGetVersion(fd);
@@ -2883,7 +2909,7 @@
      }
  
      /* Now check if we qualify */
-@@ -1368,10 +1522,29 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn)
+@@ -1368,10 +1527,29 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn)
  		   req_patch);
  	drmFreeVersion(info->pKernelDRMVersion);
  	info->pKernelDRMVersion = NULL;
@@ -2914,7 +2940,7 @@
  }
  
  Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on)
-@@ -1380,6 +1553,9 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on)
+@@ -1380,6 +1558,9 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on)
      xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
      int value = 0;
  
@@ -2924,7 +2950,7 @@
      if (!info->want_vblank_interrupts)
          on = FALSE;
  
-@@ -1399,6 +1575,44 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on)
+@@ -1399,6 +1580,48 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on)
      return TRUE;
  }
  
@@ -2937,6 +2963,10 @@
 +				 * common mappings.  Add additional
 +				 * mappings here.
 +				 */
++
++    if (info->ChipFamily >= CHIP_FAMILY_R600)
++	return TRUE;
++
 +    if (!RADEONDRIMapInit(info, pScreen)) {
 +	RADEONDRICloseScreen(pScreen);
 +	return FALSE;
@@ -2969,7 +2999,7 @@
  
  /* Initialize the screen-specific data structures for the DRI and the
   * Radeon.  This is the main entry point to the device-specific
-@@ -1462,10 +1676,23 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
+@@ -1462,10 +1685,23 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
      pDRIInfo->ddxDriverMajorVersion      = info->allowColorTiling ? 5 : 4;
      pDRIInfo->ddxDriverMinorVersion      = 3;
      pDRIInfo->ddxDriverPatchVersion      = 0;
@@ -2997,7 +3027,7 @@
      pDRIInfo->ddxDrawableTableEntry      = RADEON_MAX_DRAWABLES;
      pDRIInfo->maxDrawableTableEntry      = (SAREA_MAX_DRAWABLES
  					    < RADEON_MAX_DRAWABLES
-@@ -1518,9 +1745,7 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
+@@ -1518,9 +1754,7 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
      pDRIInfo->TransitionTo3d = RADEONDRITransitionTo3d;
      pDRIInfo->TransitionSingleToMulti3D = RADEONDRITransitionSingleToMulti3d;
      pDRIInfo->TransitionMultiToSingle3D = RADEONDRITransitionMultiToSingle3d;
@@ -3008,7 +3038,7 @@
      pDRIInfo->ClipNotify     = RADEONDRIClipNotify;
  #endif
  
-@@ -1552,57 +1777,61 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
+@@ -1552,57 +1786,61 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
  	pDRIInfo = NULL;
  	return FALSE;
      }
@@ -3113,7 +3143,7 @@
  static Bool RADEONDRIDoCloseScreen(int scrnIndex, ScreenPtr pScreen)
  {
      ScrnInfoPtr    pScrn = xf86Screens[pScreen->myNum];
-@@ -1644,14 +1873,18 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen)
+@@ -1644,14 +1882,18 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen)
  	return FALSE;
      }
  
@@ -3138,7 +3168,7 @@
  
      /* Initialize kernel GART memory manager */
      RADEONDRIGartHeapInit(info, pScreen);
-@@ -1663,6 +1896,10 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen)
+@@ -1663,6 +1905,10 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen)
      pSAREAPriv = (RADEONSAREAPrivPtr)DRIGetSAREAPrivate(pScreen);
      memset(pSAREAPriv, 0, sizeof(*pSAREAPriv));
  
@@ -3149,7 +3179,7 @@
      pRADEONDRI                    = (RADEONDRIPtr)info->pDRIInfo->devPrivate;
  
      pRADEONDRI->deviceID          = info->Chipset;
-@@ -1806,7 +2043,7 @@ void RADEONDRICloseScreen(ScreenPtr pScreen)
+@@ -1806,7 +2052,7 @@ void RADEONDRICloseScreen(ScreenPtr pScreen)
  
      /* De-allocate all kernel resources */
      memset(&drmInfo, 0, sizeof(drmRadeonInit));
@@ -3158,7 +3188,7 @@
      drmCommandWrite(info->drmFD, DRM_RADEON_CP_INIT,
  		    &drmInfo, sizeof(drmRadeonInit));
  
-@@ -1819,6 +2056,7 @@ void RADEONDRICloseScreen(ScreenPtr pScreen)
+@@ -1819,6 +2065,7 @@ void RADEONDRICloseScreen(ScreenPtr pScreen)
  	drmUnmap(info->buf, info->bufMapSize);
  	info->buf = NULL;
      }
@@ -3166,7 +3196,7 @@
      if (info->ringReadPtr) {
  	drmUnmap(info->ringReadPtr, info->ringReadMapSize);
  	info->ringReadPtr = NULL;
-@@ -1827,6 +2065,7 @@ void RADEONDRICloseScreen(ScreenPtr pScreen)
+@@ -1827,6 +2074,7 @@ void RADEONDRICloseScreen(ScreenPtr pScreen)
  	drmUnmap(info->ring, info->ringMapSize);
  	info->ring = NULL;
      }
@@ -3174,7 +3204,7 @@
      if (info->agpMemHandle != DRM_AGP_NO_HANDLE) {
  	drmAgpUnbind(info->drmFD, info->agpMemHandle);
  	drmAgpFree(info->drmFD, info->agpMemHandle);
-@@ -1903,7 +2142,7 @@ static void RADEONDRIRefreshArea(ScrnInfoPtr pScrn, RegionPtr pReg)
+@@ -1903,7 +2151,7 @@ static void RADEONDRIRefreshArea(ScrnInfoPtr pScrn, RegionPtr pReg)
      /* Don't want to do this when no 3d is active and pages are
       * right-way-round
       */
@@ -3183,7 +3213,7 @@
  	return;
  
      REGION_NULL(pScreen, &region);
-@@ -1992,7 +2231,7 @@ static void RADEONEnablePageFlip(ScreenPtr pScreen)
+@@ -1992,7 +2240,7 @@ static void RADEONEnablePageFlip(ScreenPtr pScreen)
  		       .y2 = pScrn->virtualY - 1 };
  	RegionPtr pReg = REGION_CREATE(pScreen, &box, 1);
  
@@ -3192,7 +3222,7 @@
  	RADEONDRIRefreshArea(pScrn, pReg);
  	REGION_DESTROY(pScreen, pReg);
      }
-@@ -2007,7 +2246,7 @@ static void RADEONDisablePageFlip(ScreenPtr pScreen)
+@@ -2007,7 +2255,7 @@ static void RADEONDisablePageFlip(ScreenPtr pScreen)
       */
      RADEONSAREAPrivPtr  pSAREAPriv = DRIGetSAREAPrivate(pScreen);
  
@@ -3201,7 +3231,7 @@
  }
  
  static void RADEONDRITransitionSingleToMulti3d(ScreenPtr pScreen)
-@@ -2232,3 +2471,16 @@ int RADEONDRISetParam(ScrnInfoPtr pScrn, unsigned int param, int64_t value)
+@@ -2232,3 +2480,16 @@ int RADEONDRISetParam(ScrnInfoPtr pScrn, unsigned int param, int64_t value)
  			  &radeonsetparam, sizeof(drmRadeonSetParam));
      return ret;
  }
@@ -3219,10 +3249,22 @@
 +
 +}
 diff --git a/src/radeon_driver.c b/src/radeon_driver.c
-index 45d2c2f..8fa32ab 100644
+index 45d2c2f..d5bb24d 100644
 --- a/src/radeon_driver.c
 +++ b/src/radeon_driver.c
-@@ -1621,6 +1621,7 @@ static Bool RADEONPreInitVRAM(ScrnInfoPtr pScrn)
+@@ -224,7 +224,10 @@ radeonShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode,
+     stride = (pScrn->displayWidth * pScrn->bitsPerPixel) / 8;
+     *size = stride;
+ 
+-    return ((uint8_t *)info->FB + row * stride + offset);
++    if (info->drm_mm)
++        return ((uint8_t *)info->mm.front_buffer->map + row * stride + offset);
++    else
++        return ((uint8_t *)info->FB + row * stride + offset);
+ }
+ static Bool
+ RADEONCreateScreenResources (ScreenPtr pScreen)
+@@ -1621,6 +1624,7 @@ static Bool RADEONPreInitVRAM(ScrnInfoPtr pScrn)
      }
  
      pScrn->videoRam  &= ~1023;
@@ -3230,7 +3272,7 @@
      info->FbMapSize  = pScrn->videoRam * 1024;
  
      /* if the card is PCI Express reserve the last 32k for the gart table */
-@@ -1748,56 +1749,62 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn)
+@@ -1748,56 +1752,62 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn)
      from               = X_PROBED;
      info->LinearAddr   = PCI_REGION_BASE(info->PciInfo, 0, REGION_MEM) & ~0x1ffffffUL;
      pScrn->memPhysBase = info->LinearAddr;
@@ -3335,7 +3377,7 @@
  
  #ifdef XF86DRI
  				/* AGP/PCI */
-@@ -1985,6 +1992,9 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
+@@ -1985,6 +1995,9 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
      if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
  	int errmaj = 0, errmin = 0;
  
@@ -3345,7 +3387,7 @@
  	from = X_DEFAULT;
  #if defined(USE_EXA)
  #if defined(USE_XAA)
-@@ -1995,6 +2005,7 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
+@@ -1995,6 +2008,7 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
  		info->useEXA = TRUE;
  	    } else if (xf86NameCmp(optstr, "XAA") == 0) {
  		from = X_CONFIG;
@@ -3353,7 +3395,7 @@
  	    }
  	}
  #else /* USE_XAA */
-@@ -2664,6 +2675,37 @@ static const xf86CrtcConfigFuncsRec RADEONCRTCResizeFuncs = {
+@@ -2664,6 +2678,37 @@ static const xf86CrtcConfigFuncsRec RADEONCRTCResizeFuncs = {
      RADEONCRTCResize
  };
  
@@ -3391,7 +3433,7 @@
  Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
  {
      xf86CrtcConfigPtr   xf86_config;
-@@ -2684,6 +2726,8 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2684,6 +2729,8 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
      info               = RADEONPTR(pScrn);
      info->MMIO         = NULL;
  
@@ -3400,7 +3442,7 @@
      info->IsSecondary  = FALSE;
      info->IsPrimary = FALSE;
  
-@@ -2718,59 +2762,63 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2718,59 +2765,63 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
      }
  
      info->PciInfo = xf86GetPciInfoForEntity(info->pEnt->index);
@@ -3508,7 +3550,7 @@
  
      if (xf86RegisterResources(info->pEnt->index, 0, ResExclusive))
  	goto fail;
-@@ -2780,10 +2828,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2780,10 +2831,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
      pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_VIEWPORT | RAC_CURSOR;
      pScrn->monitor     = pScrn->confScreen->monitor;
  
@@ -3525,7 +3567,7 @@
  
      if (!RADEONPreInitVisual(pScrn))
  	goto fail;
-@@ -2797,136 +2847,192 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2797,136 +2850,194 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
      memcpy(info->Options, RADEONOptions, sizeof(RADEONOptions));
      xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, info->Options);
  
@@ -3806,10 +3848,12 @@
 +			info->fbLocation = (value & 0xffff) << 16;
 +	    }
 +        }
-+	info->useEXA = TRUE;
-+	info->drm_mm = TRUE;
-+	info->directRenderingEnabled = TRUE;
++	if (info->ChipFamily < CHIP_FAMILY_R600) {
++		info->useEXA = TRUE;
++		info->directRenderingEnabled = TRUE;
++	}
 +	info->new_cs = TRUE;
++	info->drm_mm = TRUE;
 +	//	info->directRenderingDisabled = FALSE;
 +#endif
 +    }
@@ -3823,7 +3867,7 @@
  
  	/* Get ScreenInit function */
      if (!xf86LoadSubModule(pScrn, "fb")) return FALSE;
-@@ -2941,10 +3047,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2941,10 +3052,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
  	if (!RADEONPreInitXv(pScrn))                 goto fail;
      }
  
@@ -3840,7 +3884,7 @@
      }
  
      if (pScrn->modes == NULL) {
-@@ -3185,7 +3293,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3185,7 +3298,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      int            subPixelOrder = SubPixelUnknown;
      char*          s;
  #endif
@@ -3849,7 +3893,7 @@
  
      info->accelOn      = FALSE;
  #ifdef USE_XAA
-@@ -3205,52 +3313,55 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3205,52 +3318,55 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  		   "RADEONScreenInit %lx %ld\n",
  		   pScrn->memPhysBase, pScrn->fbOffset);
  #endif
@@ -3939,7 +3983,7 @@
      /* Visual setup */
      miClearVisualTypes();
      if (!miSetVisualTypes(pScrn->depth,
-@@ -3284,19 +3395,21 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3284,19 +3400,21 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      hasDRI = info->directRenderingEnabled;
  #endif /* XF86DRI */
  
@@ -3973,7 +4017,7 @@
  	}
      }
  
-@@ -3341,6 +3454,9 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3341,6 +3459,9 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  		from = X_CONFIG;
  	    }
  
@@ -3983,7 +4027,25 @@
  	    /* Reserve approx. half of offscreen memory for local textures by
  	     * default, can be overridden with Option "FBTexPercent".
  	     * Round down to a whole number of texture regions.
-@@ -3407,7 +3523,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3369,7 +3490,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+ #endif
+ 
+ #if defined(XF86DRI) && defined(USE_XAA)
+-    if (!info->useEXA && hasDRI) {
++    if (!info->useEXA && hasDRI && !info->drm_mm) {
+ 	info->textureSize = -1;
+ 	if (xf86GetOptValInteger(info->Options, OPTION_FBTEX_PERCENT,
+ 				 &(info->textureSize))) {
+@@ -3387,7 +3508,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+ #endif
+ 
+ #ifdef USE_XAA
+-    if (!info->useEXA && !hasDRI && !RADEONSetupMemXAA(scrnIndex, pScreen))
++    if (!info->useEXA && !hasDRI && !info->drm_mm && !RADEONSetupMemXAA(scrnIndex, pScreen))
+ 	return FALSE;
+ #endif
+ 
+@@ -3407,7 +3528,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  			    info->CurrentLayout.pixel_bytes);
  	int  maxy        = info->FbMapSize / width_bytes;
  
@@ -3992,7 +4054,7 @@
  	    xf86DrvMsg(scrnIndex, X_ERROR,
  		       "Static buffer allocation failed.  Disabling DRI.\n");
  	    xf86DrvMsg(scrnIndex, X_ERROR,
-@@ -3421,15 +3537,39 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3421,15 +3542,39 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  	}
      }
  
@@ -4035,7 +4097,7 @@
  #endif
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "Initializing fb layer\n");
-@@ -3453,7 +3593,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3453,7 +3598,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  
      if (info->r600_shadow_fb == FALSE) {
  	/* Init fb layer */
@@ -4044,7 +4106,7 @@
  			  pScrn->virtualX, pScrn->virtualY,
  			  pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth,
  			  pScrn->bitsPerPixel))
-@@ -3508,7 +3648,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3508,7 +3653,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  
      /* DRI finalisation */
  #ifdef XF86DRI
@@ -4053,7 +4115,7 @@
          info->pKernelDRMVersion->version_minor >= 19)
      {
        if (RADEONDRISetParam(pScrn, RADEON_SETPARAM_PCIGART_LOCATION, info->pciGartOffset) < 0)
-@@ -3527,15 +3667,21 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3527,15 +3672,21 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  	info->directRenderingEnabled = RADEONDRIFinishScreenInit(pScreen);
      }
      if (info->directRenderingEnabled) {
@@ -4079,7 +4141,7 @@
  	}
  	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct rendering enabled\n");
  
-@@ -5355,6 +5501,11 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags)
+@@ -5355,6 +5506,11 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags)
      xf86OutputPtr  output = config->output[config->compat_output];
      xf86CrtcPtr	crtc = output->crtc;
  
@@ -4091,7 +4153,7 @@
  #ifdef XF86DRI
      if (info->CPStarted && pScrn->pScreen) DRILock(pScrn->pScreen, 0);
  #endif
-@@ -5390,67 +5541,76 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
+@@ -5390,67 +5546,80 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "RADEONEnterVT\n");
  
@@ -4100,37 +4162,53 @@
 -	    rhdAtomASICInit(info->atomBIOS);
 -	} else {
 -	    xf86Int10InfoPtr pInt;
--
--	    pInt = xf86InitInt10 (info->pEnt->index);
--	    if (pInt) {
--		pInt->num = 0xe6;
--		xf86ExecX86int10 (pInt);
--		xf86FreeInt10 (pInt);
 +    if (!info->drm_mode_setting) {
 +        if (!radeon_card_posted(pScrn)) { /* Softboot V_BIOS */
-+ 	    if (info->IsAtomBios) {
++	    if (info->IsAtomBios) {
 +	        rhdAtomASICInit(info->atomBIOS);
- 	    } else {
--		RADEONGetBIOSInitTableOffsets(pScrn);
--		RADEONPostCardFromBIOSTables(pScrn);
-+		xf86Int10InfoPtr pInt;
-+		pInt = xf86InitInt10 (info->pEnt->index);
-+		if (pInt) {
++	    } else {
++	        xf86Int10InfoPtr pInt;
++
++	        pInt = xf86InitInt10 (info->pEnt->index);
++	        if (pInt) {
 +		    pInt->num = 0xe6;
 +		    xf86ExecX86int10 (pInt);
 +		    xf86FreeInt10 (pInt);
-+		} else {
++	        } else {
 +		    RADEONGetBIOSInitTableOffsets(pScrn);
 +		    RADEONPostCardFromBIOSTables(pScrn);
-+		}
++	        }
++	    }
++        }
++	/* Makes sure the engine is idle before doing anything */
++	RADEONWaitForIdleMMIO(pScrn);
+ 
+-	    pInt = xf86InitInt10 (info->pEnt->index);
+-	    if (pInt) {
+-		pInt->num = 0xe6;
+-		xf86ExecX86int10 (pInt);
+-		xf86FreeInt10 (pInt);
++	if (info->IsMobility && !IS_AVIVO_VARIANT) {
++	    if (xf86ReturnOptValBool(info->Options, OPTION_DYNAMIC_CLOCKS, FALSE)) {
++		RADEONSetDynamicClock(pScrn, 1);
+ 	    } else {
+-		RADEONGetBIOSInitTableOffsets(pScrn);
+-		RADEONPostCardFromBIOSTables(pScrn);
++		RADEONSetDynamicClock(pScrn, 0);
++	    }
++	} else if (IS_AVIVO_VARIANT) {
++	    if (xf86ReturnOptValBool(info->Options, OPTION_DYNAMIC_CLOCKS, FALSE)) {
++		atombios_static_pwrmgt_setup(pScrn, 1);
++		atombios_dyn_clk_setup(pScrn, 1);
  	    }
  	}
 -    }
 -
 -    /* Makes sure the engine is idle before doing anything */
 -    RADEONWaitForIdleMMIO(pScrn);
-+	/* Makes sure the engine is idle before doing anything */
-+	RADEONWaitForIdleMMIO(pScrn);
++	
++	if (IS_R300_VARIANT || IS_RV100_VARIANT)
++	    RADEONForceSomeClocks(pScrn);
  
 -    if (info->IsMobility && !IS_AVIVO_VARIANT) {
 -	if (xf86ReturnOptValBool(info->Options, OPTION_DYNAMIC_CLOCKS, FALSE)) {
@@ -4142,28 +4220,16 @@
 -	if (xf86ReturnOptValBool(info->Options, OPTION_DYNAMIC_CLOCKS, FALSE)) {
 -	    atombios_static_pwrmgt_setup(pScrn, 1);
 -	    atombios_dyn_clk_setup(pScrn, 1);
-+	if (info->IsMobility && !IS_AVIVO_VARIANT) {
-+	    if (xf86ReturnOptValBool(info->Options, OPTION_DYNAMIC_CLOCKS, FALSE)) {
-+		RADEONSetDynamicClock(pScrn, 1);
-+	    } else {
-+		RADEONSetDynamicClock(pScrn, 0);
-+	    }
-+	} else if (IS_AVIVO_VARIANT) {
-+	    if (xf86ReturnOptValBool(info->Options, OPTION_DYNAMIC_CLOCKS, FALSE)) {
-+		atombios_static_pwrmgt_setup(pScrn, 1);
-+		atombios_dyn_clk_setup(pScrn, 1);
-+	    }
- 	}
-+	
-+	if (IS_R300_VARIANT || IS_RV100_VARIANT)
-+	    RADEONForceSomeClocks(pScrn);
-+
+-	}
      }
  
 -    if (IS_R300_VARIANT || IS_RV100_VARIANT)
 -	RADEONForceSomeClocks(pScrn);
-+    if (info->drm_mm)
++    if (info->drm_mm) {
 +	radeon_bind_all_memory(pScrn);
++	info->XInited3D = FALSE;
++	info->engineMode = EXA_ENGINEMODE_UNKNOWN;
++    }
  
 -    for (i = 0; i < config->num_crtc; i++)
 -	radeon_crtc_modeset_ioctl(config->crtc[i], TRUE);
@@ -4214,7 +4280,7 @@
      }
  #endif
      /* this will get XVideo going again, but only if XVideo was initialised
-@@ -5462,7 +5622,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
+@@ -5462,7 +5631,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
  	RADEONEngineRestore(pScrn);
  
  #ifdef XF86DRI
@@ -4223,7 +4289,7 @@
  	RADEONCP_START(pScrn, info);
  	DRIUnlock(pScrn->pScreen);
      }
-@@ -5485,24 +5645,26 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5485,24 +5654,26 @@ void RADEONLeaveVT(int scrnIndex, int flags)
  		   "RADEONLeaveVT\n");
  #ifdef XF86DRI
      if (RADEONPTR(pScrn)->directRenderingInited) {
@@ -4263,7 +4329,7 @@
  
  	    i = 0;
  
-@@ -5531,10 +5693,15 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5531,10 +5702,15 @@ void RADEONLeaveVT(int scrnIndex, int flags)
  
      xf86_hide_cursors (pScrn);
  
@@ -4282,7 +4348,7 @@
  
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "Ok, leaving now...\n");
-@@ -5579,7 +5746,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
+@@ -5579,7 +5755,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
  #endif /* USE_XAA */
  
      if (pScrn->vtSema) {
@@ -4292,7 +4358,7 @@
      }
  
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
-@@ -5614,6 +5782,12 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
+@@ -5614,6 +5791,12 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
      info->DGAModes = NULL;
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "Unmapping memory\n");
@@ -4820,10 +4886,10 @@
  }
  #endif
 diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
-index 56de23e..628d2c7 100644
+index 56de23e..b8b6602 100644
 --- a/src/radeon_exa_funcs.c
 +++ b/src/radeon_exa_funcs.c
-@@ -74,21 +74,69 @@ FUNC_NAME(RADEONSync)(ScreenPtr pScreen, int marker)
+@@ -74,21 +74,78 @@ FUNC_NAME(RADEONSync)(ScreenPtr pScreen, int marker)
      ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
      RADEONInfoPtr info = RADEONPTR(pScrn);
  
@@ -4856,8 +4922,17 @@
 +
 +    qwords = info->new_cs ? 11 : 9;
 +    qwords += (has_src ? (info->new_cs ?  3 : 1) : 0);
++    qwords += (info->ChipFamily <= CHIP_FAMILY_RV280 ? 3 : 2);
 +
 +    BEGIN_ACCEL(qwords);
++    if (info->ChipFamily <= CHIP_FAMILY_RV280) {
++	OUT_ACCEL_REG(RADEON_RE_TOP_LEFT,     0);
++	OUT_ACCEL_REG(RADEON_RE_WIDTH_HEIGHT, 0x7ff07ff);
++	OUT_ACCEL_REG(RADEON_AUX_SC_CNTL,     0);
++    } else {
++	OUT_ACCEL_REG(R300_SC_SCISSOR0, 0);
++	OUT_ACCEL_REG(R300_SC_SCISSOR1, 0x7ff07ff);
++    }
 +    OUT_ACCEL_REG(RADEON_DEFAULT_SC_BOTTOM_RIGHT, info->state_2d.default_sc_bottom_right);
 +    OUT_ACCEL_REG(RADEON_DP_GUI_MASTER_CNTL, info->state_2d.dp_gui_master_cntl);
 +    OUT_ACCEL_REG(RADEON_DP_BRUSH_FRGD_CLR, info->state_2d.dp_brush_frgd_clr);
@@ -4894,7 +4969,7 @@
      ACCEL_PREAMBLE();
  
      TRACE;
-@@ -97,25 +145,35 @@ FUNC_NAME(RADEONPrepareSolid)(PixmapPtr pPix, int alu, Pixel pm, Pixel fg)
+@@ -97,25 +154,35 @@ FUNC_NAME(RADEONPrepareSolid)(PixmapPtr pPix, int alu, Pixel pm, Pixel fg)
  	RADEON_FALLBACK(("24bpp unsupported\n"));
      if (!RADEONGetDatatypeBpp(pPix->drawable.bitsPerPixel, &datatype))
  	RADEON_FALLBACK(("RADEONGetDatatypeBpp failed\n"));
@@ -4945,7 +5020,7 @@
  
      return TRUE;
  }
-@@ -148,8 +206,10 @@ FUNC_NAME(RADEONDoneSolid)(PixmapPtr pPix)
+@@ -148,8 +215,10 @@ FUNC_NAME(RADEONDoneSolid)(PixmapPtr pPix)
      OUT_ACCEL_REG(RADEON_WAIT_UNTIL,
                    RADEON_WAIT_2D_IDLECLEAN | RADEON_WAIT_DMA_GUI_IDLE);
      FINISH_ACCEL();
@@ -4956,7 +5031,7 @@
  void
  FUNC_NAME(RADEONDoPrepareCopy)(ScrnInfoPtr pScrn, uint32_t src_pitch_offset,
  			       uint32_t dst_pitch_offset, uint32_t datatype, int rop,
-@@ -160,23 +220,28 @@ FUNC_NAME(RADEONDoPrepareCopy)(ScrnInfoPtr pScrn, uint32_t src_pitch_offset,
+@@ -160,23 +229,28 @@ FUNC_NAME(RADEONDoPrepareCopy)(ScrnInfoPtr pScrn, uint32_t src_pitch_offset,
  
      RADEON_SWITCH_TO_2D();
  
@@ -5002,7 +5077,7 @@
  }
  
  static Bool
-@@ -187,7 +252,7 @@ FUNC_NAME(RADEONPrepareCopy)(PixmapPtr pSrc,   PixmapPtr pDst,
+@@ -187,7 +261,7 @@ FUNC_NAME(RADEONPrepareCopy)(PixmapPtr pSrc,   PixmapPtr pDst,
  {
      RINFO_FROM_SCREEN(pDst->drawable.pScreen);
      uint32_t datatype, src_pitch_offset, dst_pitch_offset;
@@ -5011,7 +5086,7 @@
      TRACE;
  
      info->xdir = xdir;
-@@ -197,10 +262,19 @@ FUNC_NAME(RADEONPrepareCopy)(PixmapPtr pSrc,   PixmapPtr pDst,
+@@ -197,10 +271,19 @@ FUNC_NAME(RADEONPrepareCopy)(PixmapPtr pSrc,   PixmapPtr pDst,
  	RADEON_FALLBACK(("24bpp unsupported"));
      if (!RADEONGetDatatypeBpp(pDst->drawable.bitsPerPixel, &datatype))
  	RADEON_FALLBACK(("RADEONGetDatatypeBpp failed\n"));
@@ -5033,7 +5108,7 @@
  
      FUNC_NAME(RADEONDoPrepareCopy)(pScrn, src_pitch_offset, dst_pitch_offset,
  				   datatype, rop, planemask);
-@@ -250,6 +324,8 @@ FUNC_NAME(RADEONDoneCopy)(PixmapPtr pDst)
+@@ -250,6 +333,8 @@ FUNC_NAME(RADEONDoneCopy)(PixmapPtr pDst)
      OUT_ACCEL_REG(RADEON_WAIT_UNTIL,
                    RADEON_WAIT_2D_IDLECLEAN | RADEON_WAIT_DMA_GUI_IDLE);
      FINISH_ACCEL();
@@ -5042,7 +5117,7 @@
  }
  
  static Bool
-@@ -260,6 +336,8 @@ FUNC_NAME(RADEONUploadToScreen)(PixmapPtr pDst, int x, int y, int w, int h,
+@@ -260,6 +345,8 @@ FUNC_NAME(RADEONUploadToScreen)(PixmapPtr pDst, int x, int y, int w, int h,
      uint8_t	   *dst	     = info->FB + exaGetPixmapOffset(pDst);
      unsigned int   dst_pitch = exaGetPixmapPitch(pDst);
      unsigned int   bpp	     = pDst->drawable.bitsPerPixel;
@@ -5051,7 +5126,7 @@
  #ifdef ACCEL_CP
      unsigned int   hpass;
      uint32_t	   buf_pitch, dst_pitch_off;
-@@ -276,10 +354,47 @@ FUNC_NAME(RADEONUploadToScreen)(PixmapPtr pDst, int x, int y, int w, int h,
+@@ -276,10 +363,47 @@ FUNC_NAME(RADEONUploadToScreen)(PixmapPtr pDst, int x, int y, int w, int h,
      if (bpp < 8)
  	return FALSE;
  
@@ -5102,7 +5177,7 @@
  	int cpp = bpp / 8;
  	ACCEL_PREAMBLE();
  
-@@ -294,9 +409,10 @@ FUNC_NAME(RADEONUploadToScreen)(PixmapPtr pDst, int x, int y, int w, int h,
+@@ -294,9 +418,10 @@ FUNC_NAME(RADEONUploadToScreen)(PixmapPtr pDst, int x, int y, int w, int h,
  
  	exaMarkSync(pDst->drawable.pScreen);
  	return TRUE;
@@ -5115,7 +5190,7 @@
      /* Do we need that sync here ? probably not .... */
      exaWaitSync(pDst->drawable.pScreen);
  
-@@ -388,13 +504,17 @@ FUNC_NAME(RADEONDownloadFromScreen)(PixmapPtr pSrc, int x, int y, int w, int h,
+@@ -388,13 +513,17 @@ FUNC_NAME(RADEONDownloadFromScreen)(PixmapPtr pSrc, int x, int y, int w, int h,
  
      TRACE;
  
@@ -5134,7 +5209,7 @@
  	RADEONGetPixmapOffsetPitch(pSrc, &src_pitch_offset) &&
  	(scratch = RADEONCPGetBuffer(pScrn)))
      {
-@@ -540,17 +660,23 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
+@@ -540,17 +669,23 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
  
      info->exa->MarkSync = FUNC_NAME(RADEONMarkSync);
      info->exa->WaitMarker = FUNC_NAME(RADEONSync);
@@ -5162,7 +5237,7 @@
  
  #ifdef RENDER
      if (info->RenderAccel) {
-@@ -560,7 +686,7 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
+@@ -560,7 +695,7 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
  	else if (IS_R300_3D || IS_R500_3D) {
  	    if ((info->ChipFamily < CHIP_FAMILY_RS400)
  #ifdef XF86DRI
@@ -5171,7 +5246,7 @@
  #endif
  		) {
  		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Render acceleration "
-@@ -595,6 +721,16 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
+@@ -595,6 +730,16 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
      }
  #endif
  
@@ -5189,7 +5264,7 @@
      xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Setting EXA maxPitchBytes\n");
  
 diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
-index 5d28d80..6426736 100644
+index 043b0d4..456cefe 100644
 --- a/src/radeon_exa_render.c
 +++ b/src/radeon_exa_render.c
 @@ -410,19 +410,22 @@ static Bool FUNC_NAME(R100TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
@@ -5295,7 +5370,7 @@
      dst_pitch = exaGetPixmapPitch(pDst);
      colorpitch = dst_pitch >> pixel_shift;
  
-@@ -1830,9 +1851,18 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
+@@ -1832,9 +1853,18 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
  	FINISH_ACCEL();
      }
  
@@ -5318,10 +5393,10 @@
      blendcntl = RADEONGetBlendCntl(op, pMaskPicture, pDstPicture->format);
 diff --git a/src/radeon_memory.c b/src/radeon_memory.c
 new file mode 100644
-index 0000000..ccc3bb8
+index 0000000..8a23ccd
 --- /dev/null
 +++ b/src/radeon_memory.c
-@@ -0,0 +1,424 @@
+@@ -0,0 +1,428 @@
 +
 +#include <errno.h>
 +#include <sys/ioctl.h>
@@ -5345,6 +5420,10 @@
 +
 +		int ret;
 +
++    		if (mem->pool == RADEON_POOL_VRAM)
++		    pin.pin_domain = RADEON_GEM_DOMAIN_VRAM;
++    		else
++      		    pin.pin_domain = RADEON_GEM_DOMAIN_GTT;
 +		pin.handle = mem->kernel_bo_handle;
 +		pin.alignment = mem->alignment;
 +
@@ -5807,7 +5886,7 @@
 +typedef drm_radeon_sarea_t RADEONSAREAPriv, *RADEONSAREAPrivPtr;
 +#endif
 diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
-index cfa349d..ef05c72 100644
+index da1d60f..9682ad8 100644
 --- a/src/radeon_textured_video.c
 +++ b/src/radeon_textured_video.c
 @@ -85,6 +85,7 @@ static __inline__ uint32_t F_TO_DW(float val)
@@ -5818,23 +5897,23 @@
  #define FINISH_VIDEO()
  
  #include "radeon_textured_videofuncs.c"
-@@ -93,6 +94,7 @@ static __inline__ uint32_t F_TO_DW(float val)
- #undef VIDEO_PREAMBLE
+@@ -94,6 +95,7 @@ static __inline__ uint32_t F_TO_DW(float val)
  #undef BEGIN_VIDEO
  #undef OUT_VIDEO_REG
+ #undef OUT_VIDEO_REG_F
 +#undef OUT_RELOC
  #undef FINISH_VIDEO
  
  #ifdef XF86DRI
-@@ -105,6 +107,7 @@ static __inline__ uint32_t F_TO_DW(float val)
- #define OUT_VIDEO_REG(reg, val)	OUT_RING_REG(reg, val)
+@@ -107,6 +109,7 @@ static __inline__ uint32_t F_TO_DW(float val)
+ #define OUT_VIDEO_REG_F(reg, val)	OUT_VIDEO_REG(reg, F_TO_DW(val))
  #define FINISH_VIDEO()		ADVANCE_RING()
  #define OUT_VIDEO_RING_F(x) OUT_RING(F_TO_DW(x))
 +#define OUT_RELOC(x, read, write) OUT_RING_RELOC(x, read, write)
  
  #include "radeon_textured_videofuncs.c"
  
-@@ -179,7 +182,8 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -181,7 +184,8 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
      }
  
  #ifdef XF86DRI
@@ -5844,7 +5923,7 @@
         /* The upload blit only supports multiples of 64 bytes */
         dstPitch = (dstPitch + 63) & ~63;
     else
-@@ -226,8 +230,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -240,8 +244,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
      left = (x1 >> 16) & ~1;
      npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left;
  
@@ -5859,7 +5938,7 @@
      pPriv->src_pitch = dstPitch;
      pPriv->size = size;
      pPriv->pDraw = pDraw;
-@@ -283,7 +291,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -301,7 +309,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
      pPriv->h = height;
  
  #ifdef XF86DRI
@@ -5869,11 +5948,11 @@
      else
  #endif
 diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
-index d39f74d..56d71b1 100644
+index b53e114..1e9f3b1 100644
 --- a/src/radeon_textured_videofuncs.c
 +++ b/src/radeon_textured_videofuncs.c
-@@ -82,19 +82,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
-     int dstxoff, dstyoff, pixel_shift;
+@@ -103,19 +103,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+     int dstxoff, dstyoff, pixel_shift, vtx_count;
      BoxPtr pBox = REGION_RECTS(&pPriv->clip);
      int nBox = REGION_NUM_RECTS(&pPriv->clip);
 +    int qwords;
@@ -5895,7 +5974,7 @@
  	    dst_pitch = pPixmap->devKind;
  	}
  
-@@ -183,13 +183,21 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -210,13 +210,21 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  
  	txoffset = pPriv->src_offset;
  
@@ -5919,12 +5998,12 @@
  	FINISH_VIDEO();
  
  	txenable = R300_TEX_0_ENABLE;
-@@ -408,11 +416,18 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
- 	    FINISH_VIDEO();
+@@ -980,11 +988,18 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 	    }
  	}
  
--	BEGIN_VIDEO(5);
-+	qwords = info->new_cs ? 7 : 5;
+-	BEGIN_VIDEO(6);
++	qwords = info->new_cs ? 8 : 6;
 +	BEGIN_VIDEO(qwords);
  	OUT_VIDEO_REG(R300_TX_INVALTAGS, 0);
  	OUT_VIDEO_REG(R300_TX_ENABLE, txenable);
@@ -5940,16 +6019,16 @@
  	OUT_VIDEO_REG(R300_RB3D_COLORPITCH0, colorpitch);
  
  	blendcntl = RADEON_SRC_BLEND_GL_ONE | RADEON_DST_BLEND_GL_ZERO;
-@@ -459,6 +474,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
- 		    RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
+@@ -1029,6 +1044,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 		      RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
  	OUT_VIDEO_REG(RADEON_RB3D_CNTL,
- 		    dst_format | RADEON_ALPHA_BLEND_ENABLE);
+ 		      dst_format | RADEON_ALPHA_BLEND_ENABLE);
 +	dst_offset += info->fbLocation + pScrn->fbOffset;
  	OUT_VIDEO_REG(RADEON_RB3D_COLOROFFSET, dst_offset);
  
  	OUT_VIDEO_REG(RADEON_RB3D_COLORPITCH, colorpitch);
-@@ -496,7 +512,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
- 			((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
+@@ -1066,7 +1082,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 			  ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
  	    OUT_VIDEO_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
  
 -	    OUT_VIDEO_REG(R200_PP_TXOFFSET_0, pPriv->src_offset);
@@ -5957,22 +6036,22 @@
 +			  info->fbLocation + pScrn->fbOffset);
  
  	    OUT_VIDEO_REG(R200_PP_TXCBLEND_0,
- 			R200_TXC_ARG_A_ZERO |
-@@ -530,7 +547,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
- 			RADEON_CLAMP_T_CLAMP_LAST |
- 			RADEON_YUV_TO_RGB);
+ 			  R200_TXC_ARG_A_ZERO |
+@@ -1100,7 +1117,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 			  RADEON_CLAMP_T_CLAMP_LAST |
+ 			  RADEON_YUV_TO_RGB);
  	    OUT_VIDEO_REG(RADEON_PP_TXFORMAT_0, txformat);
 -	    OUT_VIDEO_REG(RADEON_PP_TXOFFSET_0, pPriv->src_offset);
 +	    OUT_VIDEO_REG(RADEON_PP_TXOFFSET_0, pPriv->src_offset +
 +			  info->fbLocation + pScrn->fbOffset);
  	    OUT_VIDEO_REG(RADEON_PP_TXCBLEND_0,
- 			RADEON_COLOR_ARG_A_ZERO |
- 			RADEON_COLOR_ARG_B_ZERO |
+ 			  RADEON_COLOR_ARG_A_ZERO |
+ 			  RADEON_COLOR_ARG_B_ZERO |
 diff --git a/src/radeon_video.c b/src/radeon_video.c
-index 57dcd8a..ecd34a1 100644
+index e71f0f8..a7ea788 100644
 --- a/src/radeon_video.c
 +++ b/src/radeon_video.c
-@@ -275,7 +275,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
+@@ -270,7 +270,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
      memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
      adaptors = newAdaptors;
  
@@ -5981,7 +6060,7 @@
  	overlayAdaptor = RADEONSetupImageVideo(pScreen);
  	if (overlayAdaptor != NULL) {
  	    adaptors[num_adaptors++] = overlayAdaptor;
-@@ -288,7 +288,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
+@@ -283,7 +283,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
      if (info->ChipFamily != CHIP_FAMILY_RV250) {
  	if ((info->ChipFamily < CHIP_FAMILY_RS400)
  #ifdef XF86DRI


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.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- xorg-x11-drv-ati.spec	22 Sep 2008 19:01:10 -0000	1.115
+++ xorg-x11-drv-ati.spec	26 Sep 2008 00:53:39 -0000	1.116
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   15%{?dist}
+Release:   16%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -16,8 +16,6 @@
 
 Patch0:	    radeon-6.9.0-to-git.patch
 Patch1:     radeon-modeset.patch
-Patch2:     radeon-suspend-fix.patch
-Patch3:	    radeon-fix-pipe-config.patch
 Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     copy-fb-contents.patch
@@ -41,8 +39,6 @@
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1 -b .git
 %patch1 -p1 -b .modeset
-%patch2 -p1 -b .suspend
-%patch3 -p1 -b .pipe-config
 %patch4 -p1 -b .remove-limit-heuristics
 %patch5 -p1 -b .panel-size
 %patch6 -p1 -b .copy-fb-contents
@@ -77,6 +73,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Sep 26 2008 Dave Airlie <airlied at redhat.com> 6.9.0-16
+- rebase to a later tree - still not fully up to git master
+- add some fixes to the resize stuff - not fully done
+
 * Fri Sep 19 2008 Kristian H??gsberg <krh at redhat.com> - 6.9.0-15
 - Add copy-fb-contents.patch to initialize the root window contents
   with the fbdev contents for slick startup.


--- radeon-fix-pipe-config.patch DELETED ---


--- radeon-suspend-fix.patch DELETED ---



From davej at fedoraproject.org  Fri Sep 26 00:59:28 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 26 Sep 2008 00:59:28 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc7-git4.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.931, 1.932 kernel.spec, 1.986, 1.987 sources, 1.893,
	1.894 upstream, 1.805, 1.806 patch-2.6.27-rc7-git3.bz2.sign, 1.1, NONE
Message-ID: <20080926005928.1ECF97010C@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17597

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.27-rc7-git4.bz2.sign 
Removed Files:
	patch-2.6.27-rc7-git3.bz2.sign 
Log Message:
2.6.27-rc7-git4


--- NEW FILE patch-2.6.27-rc7-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBI3Ca4yGugalF9Dw4RAj8uAJ4rVa8J2KE8zyZxG852Efmqm0shlgCeOztO
EvhQoghufdhPoYw8CK5ltQ0=
=P6MQ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.931
retrieving revision 1.932
diff -u -r1.931 -r1.932
--- .cvsignore	25 Sep 2008 00:58:49 -0000	1.931
+++ .cvsignore	26 Sep 2008 00:58:57 -0000	1.932
@@ -5,4 +5,4 @@
 kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc7.bz2
-patch-2.6.27-rc7-git3.bz2
+patch-2.6.27-rc7-git4.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.986
retrieving revision 1.987
diff -u -r1.986 -r1.987
--- kernel.spec	25 Sep 2008 21:19:21 -0000	1.986
+++ kernel.spec	26 Sep 2008 00:58:57 -0000	1.987
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1734,6 +1734,9 @@
 
 %changelog
 * Thu Sep 25 2008 Dave Jones <davej at redhat.com>
+- 2.6.27-rc7-git4
+
+* Thu Sep 25 2008 Dave Jones <davej at redhat.com>
 - Disable the BT_HCIUSB driver.
   It sucks more power than BT_HCIBTUSB which has the same functionality.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.893
retrieving revision 1.894
diff -u -r1.893 -r1.894
--- sources	25 Sep 2008 00:58:49 -0000	1.893
+++ sources	26 Sep 2008 00:58:57 -0000	1.894
@@ -1,3 +1,3 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 711e4624185c1e229e9aa4c736b57e05  patch-2.6.27-rc7.bz2
-7b2aa1f4f0f82effc25155e01eef8380  patch-2.6.27-rc7-git3.bz2
+f228cc1c2ddcbbfe025ce2a73cd0d6e2  patch-2.6.27-rc7-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.805
retrieving revision 1.806
diff -u -r1.805 -r1.806
--- upstream	25 Sep 2008 00:58:49 -0000	1.805
+++ upstream	26 Sep 2008 00:58:57 -0000	1.806
@@ -1,3 +1,3 @@
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc7.bz2
-patch-2.6.27-rc7-git3.bz2
+patch-2.6.27-rc7-git4.bz2


--- patch-2.6.27-rc7-git3.bz2.sign DELETED ---



From rstrode at fedoraproject.org  Fri Sep 26 01:11:51 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 26 Sep 2008 01:11:51 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec,1.56,1.57
Message-ID: <20080926011151.65D137010C@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18558

Modified Files:
	plymouth.spec 
Log Message:
Package some unpackaged files



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- plymouth.spec	25 Sep 2008 21:57:28 -0000	1.56
+++ plymouth.spec	26 Sep 2008 01:11:21 -0000	1.57
@@ -87,6 +87,18 @@
 Plymouth. It features a centered logo that fades in and out
 while stars twinkle around the logo during system boot up.
 
+%package plugin-pulser
+Summary: Plymouth "Pulser" plugin
+Group: System Environment/Base
+Requires: %{name} = %{version}-%{release}
+Requires(post): %{name}
+BuildRequires: libpng-devel
+
+%description plugin-pulser
+This package contains the "Pulser" boot splash plugin for
+Plymouth. It features a pulsing text progress indicator
+centered in the screen during system boot up.
+
 %package plugin-spinfinity
 Summary: Plymouth "Spinfinity" plugin
 Group: System Environment/Base
@@ -214,6 +226,10 @@
 %{_datadir}/plymouth/fade-in/star.png
 %{_libdir}/plymouth/fade-in.so
 
+%files plugin-pulser
+%defattr(-, root, root)
+%{_libdir}/plymouth/pulser.so
+
 %files plugin-spinfinity
 %defattr(-, root, root)
 %dir %{_datadir}/plymouth/spinfinity
@@ -227,7 +243,8 @@
 %changelog
 * Thu Sep 25 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.25.1
 - Add new snapshot to fold in Will Woods progress bar, and
-  move ajax's splash upstream
+  move ajax's splash upstream, putting the old text splash
+  in a "pulser" subpackage
 
 * Tue Sep 23 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.23.1
 - Last snapshot was broken



From airlied at fedoraproject.org  Fri Sep 26 01:42:12 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 26 Sep 2008 01:42:12 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-exa-fixes.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.116, 1.117
Message-ID: <20080926014212.DCA067010C@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-serv20565

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-exa-fixes.patch 
Log Message:
- exa offset fixes for changes in X server


radeon-exa-fixes.patch:

--- NEW FILE radeon-exa-fixes.patch ---
commit 05f489fc270f3af78189b6f5d1f0ed46a99dbf1b
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Sep 26 11:38:36 2008 +1000

    radeon: fix the offset checks for command submission
    
    since we are relocating in the kernel we don't need these

diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 456cefe..8f98e92 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -1016,8 +1016,10 @@ static Bool FUNC_NAME(R300TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
     txpitch = exaGetPixmapPitch(pPix);
     txoffset = exaGetPixmapOffset(pPix);
 
-    if ((txoffset & 0x1f) != 0)
-	RADEON_FALLBACK(("Bad texture offset 0x%x\n", (int)txoffset));
+    if (!info->new_cs) {
+    	if ((txoffset & 0x1f) != 0)
+		RADEON_FALLBACK(("Bad texture offset 0x%x\n", (int)txoffset));
+    }
     if ((txpitch & 0x1f) != 0)
 	RADEON_FALLBACK(("Bad texture pitch 0x%x\n", (int)txpitch));
 
@@ -1234,7 +1236,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
 
     colorpitch |= dst_format;
 
-    if ((dst_offset & 0x0f) != 0)
+    if (!info->new_cs && ((dst_offset & 0x0f) != 0))
 	RADEON_FALLBACK(("Bad destination offset 0x%x\n", (int)dst_offset));
     if (((dst_pitch >> pixel_shift) & 0x7) != 0)
 	RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch));


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.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- xorg-x11-drv-ati.spec	26 Sep 2008 00:53:39 -0000	1.116
+++ xorg-x11-drv-ati.spec	26 Sep 2008 01:41:42 -0000	1.117
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   16%{?dist}
+Release:   17%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -16,6 +16,7 @@
 
 Patch0:	    radeon-6.9.0-to-git.patch
 Patch1:     radeon-modeset.patch
+Patch3:     radeon-exa-fixes.patch
 Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     copy-fb-contents.patch
@@ -39,6 +40,7 @@
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1 -b .git
 %patch1 -p1 -b .modeset
+%patch3 -p1 -b .exa-fixes
 %patch4 -p1 -b .remove-limit-heuristics
 %patch5 -p1 -b .panel-size
 %patch6 -p1 -b .copy-fb-contents
@@ -73,6 +75,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Sep 26 2008 Dave Airlie <airlied at redhat.com> 6.9.0-17
+- exa offset fixes for changes in X server
+
 * Fri Sep 26 2008 Dave Airlie <airlied at redhat.com> 6.9.0-16
 - rebase to a later tree - still not fully up to git master
 - add some fixes to the resize stuff - not fully done



From mclasen at fedoraproject.org  Fri Sep 26 02:08:35 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 26 Sep 2008 02:08:35 +0000 (UTC)
Subject: rpms/gedit/devel gedit.spec,1.169,1.170
Message-ID: <20080926020835.B23D47010C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21856

Modified Files:
	gedit.spec 
Log Message:
save some space



Index: gedit.spec
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- gedit.spec	22 Sep 2008 15:33:31 -0000	1.169
+++ gedit.spec	26 Sep 2008 02:08:05 -0000	1.170
@@ -18,7 +18,7 @@
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
 Version: 	2.24.0
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -112,6 +112,19 @@
 	--enable-python 
 make
 
+# strip unneeded translations from .mo files
+# ideally intltool (ha!) would do that for us
+# http://bugzilla.gnome.org/show_bug.cgi?id=474987
+cd po
+grep -v ".*[.]desktop[.]in.*\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+mv POTFILES.keep POTFILES.in
+intltool-update --pot
+for p in *.po; do
+  msgmerge $p %{name}.pot > $p.out
+  msgfmt -o `basename $p .po`.gmo $p.out
+done
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -189,6 +202,9 @@
 
 
 %changelog
+* Thu Sep 25 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-3
+- Save some space
+
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-2
 - Update to 2.24.0
 



From mclasen at fedoraproject.org  Fri Sep 26 02:24:05 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 26 Sep 2008 02:24:05 +0000 (UTC)
Subject: rpms/epiphany/devel epiphany.spec,1.200,1.201
Message-ID: <20080926022405.08F3C7010C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22686

Modified Files:
	epiphany.spec 
Log Message:
save some space



Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- epiphany.spec	24 Sep 2008 04:15:25 -0000	1.200
+++ epiphany.spec	26 Sep 2008 02:23:34 -0000	1.201
@@ -8,7 +8,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.24.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -117,6 +117,19 @@
 	%{enable_nm}
 make %{?_smp_mflags}
 
+# strip unneeded translations from .mo files
+# ideally intltool (ha!) would do that for us
+# http://bugzilla.gnome.org/show_bug.cgi?id=474987
+cd po
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+mv POTFILES.keep POTFILES.in
+intltool-update --pot
+for p in *.po; do
+  msgmerge $p %{name}.pot > $p.out
+  msgfmt -o `basename $p .po`.gmo $p.out
+done
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
@@ -212,6 +225,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Thu Sep 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-3
+- Save some space
+
 * Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-2
 - Update to 2.24.0.1
 



From mclasen at fedoraproject.org  Fri Sep 26 03:10:31 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 26 Sep 2008 03:10:31 +0000 (UTC)
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.185,1.186
Message-ID: <20080926031031.1E9EE7010C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-vfs2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26193

Modified Files:
	gnome-vfs2.spec 
Log Message:
save some space



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- gnome-vfs2.spec	22 Sep 2008 15:56:32 -0000	1.185
+++ gnome-vfs2.spec	26 Sep 2008 03:10:00 -0000	1.186
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.24.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+ 
@@ -137,6 +137,19 @@
 export tagname=CC
 make LIBTOOL=/usr/bin/libtool
 
+# strip unneeded translations from .mo files
+# ideally intltool (ha!) would do that for us
+# http://bugzilla.gnome.org/show_bug.cgi?id=474987
+cd po
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+mv POTFILES.keep POTFILES.in
+intltool-update --pot
+for p in *.po; do
+  msgmerge $p %{po_package}.pot > $p.out
+  msgfmt -o `basename $p .po`.gmo $p.out
+done
+
+
 %install
 rm -fr $RPM_BUILD_ROOT
 
@@ -226,6 +239,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Thu Sep 25 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-3
+- Save some space
+
 * Mon Sep 22 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-2
 - Update to 2.24.0
 - Drop upstreamed patches



From cweyl at fedoraproject.org  Fri Sep 26 04:10:39 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 04:10:39 +0000 (UTC)
Subject: rpms/cpan-upload/F-9 cpan-upload.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20080926041039.1BC067010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/cpan-upload/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31417

Modified Files:
	sources 
Added Files:
	cpan-upload.spec 
Log Message:
* Mon Sep 22 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.2-3
- bump



--- NEW FILE cpan-upload.spec ---
Name:           cpan-upload
Version:        2.2       
Release:        3%{?dist}
Summary:        Automate the uploading of files to the CPAN (PAUSE)

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/src/NEILB/cpan-upload-2.2/ 
Source0:        http://search.cpan.org/pub/CPAN/authors/id/N/NE/NEILB/scripts/cpan-upload-%{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(AppConfig::Std)  
BuildRequires:  perl(File::Basename)  
BuildRequires:  perl(HTTP::Request::Common)  
BuildRequires:  perl(HTTP::Status)  
BuildRequires:  perl(LWP::UserAgent)  
BuildRequires:  perl(Net::FTP)  
BuildRequires:  perl(Term::ReadKey)

# not automagically picked up ("require" construct)
Requires:       perl(Term::ReadKey)

%description
cpan-upload is a script which automates the process of uploading a file to
CPAN using PAUSE, the Perl Authors Upload Server.  For example, to upload a
recent version of the Net::Dict module I ran: 

    % cpan-upload -verbose Net-Dict-1.07.tar.gz

If everything went OK, you???ll get two mail messages from the PAUSE monitor: 
one to acknowledge the upload, and one to let you know if your upload made 
it through to CPAN.

%prep
%setup -q


%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 ChangeLog README
%{_bindir}/*
%{_mandir}/man1/*.1*


%changelog
* Mon Sep 22 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.2-3
- bump

* Mon Sep 22 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.2-2
- update source/url

* Sat Sep 20 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.2-1
- initial Fedora packaging


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpan-upload/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Sep 2008 09:40:51 -0000	1.1
+++ sources	26 Sep 2008 04:10:08 -0000	1.2
@@ -0,0 +1 @@
+e900a0b3e78f9f2a4dabc1d1b5e1cdb6  cpan-upload-2.2.tar.gz



From cweyl at fedoraproject.org  Fri Sep 26 04:15:26 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 04:15:26 +0000 (UTC)
Subject: comps comps-f8.xml.in,1.264,1.265 comps-f9.xml.in,1.391,1.392
Message-ID: <20080926041526.741617010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31884

Modified Files:
	comps-f8.xml.in comps-f9.xml.in 
Log Message:
add cpan-upload


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- comps-f8.xml.in	23 Sep 2008 15:24:17 -0000	1.264
+++ comps-f8.xml.in	26 Sep 2008 04:14:56 -0000	1.265
@@ -829,6 +829,7 @@
       <packagereq type="optional">colordiff</packagereq>
       <packagereq type="optional">cpan2rpm</packagereq>
       <packagereq type="optional">cpanspec</packagereq>
+      <packagereq type="optional">cpan-upload</packagereq>
       <packagereq type="optional">cppunit</packagereq>
       <packagereq type="optional">cproto</packagereq>
       <packagereq type="optional">crossvc</packagereq>


Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f9.xml.in,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- comps-f9.xml.in	23 Sep 2008 15:24:17 -0000	1.391
+++ comps-f9.xml.in	26 Sep 2008 04:14:56 -0000	1.392
@@ -835,6 +835,7 @@
       <packagereq type="optional">colordiff</packagereq>
       <packagereq type="optional">cpan2rpm</packagereq>
       <packagereq type="optional">cpanspec</packagereq>
+      <packagereq type="optional">cpan-upload</packagereq>
       <packagereq type="optional">cppunit</packagereq>
       <packagereq type="optional">cproto</packagereq>
       <packagereq type="optional">crossvc</packagereq>



From cweyl at fedoraproject.org  Fri Sep 26 04:57:04 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 04:57:04 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authentication/devel .cvsignore, 1.2,
	1.3 perl-Catalyst-Plugin-Authentication.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20080926045704.A51337010C@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-serv3429

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Authentication.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.10007-1
- update to 0.10007



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jun 2008 17:49:36 -0000	1.2
+++ .cvsignore	26 Sep 2008 04:56:34 -0000	1.3
@@ -1 +1 @@
-Catalyst-Plugin-Authentication-0.10006.tar.gz
+Catalyst-Plugin-Authentication-0.10007.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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Catalyst-Plugin-Authentication.spec	17 Jun 2008 17:50:29 -0000	1.2
+++ perl-Catalyst-Plugin-Authentication.spec	26 Sep 2008 04:56:34 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Authentication
-Version:        0.10006
-Release:        4%{?dist}
+Version:        0.10007
+Release:        1%{?dist}
 Summary:        Infrastructure plugin for the Catalyst authentication framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -83,6 +83,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.10007-1
+- update to 0.10007
+
 * Tue Jun 17 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.10006-4
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jun 2008 17:49:36 -0000	1.2
+++ sources	26 Sep 2008 04:56:34 -0000	1.3
@@ -1 +1 @@
-dbc176a55ba2b7ef2bfd0980f1772c50  Catalyst-Plugin-Authentication-0.10006.tar.gz
+538032bb9f77ebe072143371198c07ee  Catalyst-Plugin-Authentication-0.10007.tar.gz



From cweyl at fedoraproject.org  Fri Sep 26 04:58:08 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 04:58:08 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authentication/F-9
	perl-Catalyst-Plugin-Authentication.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080926045808.98DB47010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3686

Modified Files:
	perl-Catalyst-Plugin-Authentication.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.10007-1
- update to 0.10007



Index: perl-Catalyst-Plugin-Authentication.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/F-9/perl-Catalyst-Plugin-Authentication.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Catalyst-Plugin-Authentication.spec	17 Jun 2008 17:51:20 -0000	1.1
+++ perl-Catalyst-Plugin-Authentication.spec	26 Sep 2008 04:57:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Authentication
-Version:        0.10006
-Release:        4%{?dist}
+Version:        0.10007
+Release:        1%{?dist}
 Summary:        Infrastructure plugin for the Catalyst authentication framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -83,6 +83,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.10007-1
+- update to 0.10007
+
 * Tue Jun 17 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.10006-4
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jun 2008 17:51:20 -0000	1.2
+++ sources	26 Sep 2008 04:57:38 -0000	1.3
@@ -1 +1 @@
-dbc176a55ba2b7ef2bfd0980f1772c50  Catalyst-Plugin-Authentication-0.10006.tar.gz
+538032bb9f77ebe072143371198c07ee  Catalyst-Plugin-Authentication-0.10007.tar.gz



From cweyl at fedoraproject.org  Fri Sep 26 05:02:07 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 05:02:07 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authentication/F-8
	perl-Catalyst-Plugin-Authentication.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080926050207.8761D7010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4185

Modified Files:
	perl-Catalyst-Plugin-Authentication.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.10007-1
- update to 0.10007



Index: perl-Catalyst-Plugin-Authentication.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/F-8/perl-Catalyst-Plugin-Authentication.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Catalyst-Plugin-Authentication.spec	17 Jun 2008 20:26:26 -0000	1.1
+++ perl-Catalyst-Plugin-Authentication.spec	26 Sep 2008 05:01:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Authentication
-Version:        0.10006
-Release:        4%{?dist}
+Version:        0.10007
+Release:        1%{?dist}
 Summary:        Infrastructure plugin for the Catalyst authentication framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -83,6 +83,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.10007-1
+- update to 0.10007
+
 * Tue Jun 17 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.10006-4
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jun 2008 20:26:26 -0000	1.2
+++ sources	26 Sep 2008 05:01:37 -0000	1.3
@@ -1 +1 @@
-dbc176a55ba2b7ef2bfd0980f1772c50  Catalyst-Plugin-Authentication-0.10006.tar.gz
+538032bb9f77ebe072143371198c07ee  Catalyst-Plugin-Authentication-0.10007.tar.gz



From cweyl at fedoraproject.org  Fri Sep 26 05:10:32 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 05:10:32 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-ConfigLoader/devel .cvsignore, 1.3,
	1.4 perl-Catalyst-Plugin-ConfigLoader.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20080926051032.8DE197010C@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-serv5501

Modified Files:
	.cvsignore perl-Catalyst-Plugin-ConfigLoader.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
- update to 0.21



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 May 2008 17:40:35 -0000	1.3
+++ .cvsignore	26 Sep 2008 05:10:01 -0000	1.4
@@ -1 +1 @@
-Catalyst-Plugin-ConfigLoader-0.20.tar.gz
+Catalyst-Plugin-ConfigLoader-0.21.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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Catalyst-Plugin-ConfigLoader.spec	10 May 2008 17:40:36 -0000	1.4
+++ perl-Catalyst-Plugin-ConfigLoader.spec	26 Sep 2008 05:10:01 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Catalyst-Plugin-ConfigLoader
-Version:        0.20
+Version:        0.21
 Release:        1%{?dist}
 Summary:        Load config files of various types
 License:        GPL+ or Artistic
@@ -59,6 +59,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
+- update to 0.21
+
 * Sat May 10 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
 - update to 0.20
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 May 2008 17:40:36 -0000	1.3
+++ sources	26 Sep 2008 05:10:01 -0000	1.4
@@ -1 +1 @@
-caf54295dc488e1e5c246ece24bfe0cd  Catalyst-Plugin-ConfigLoader-0.20.tar.gz
+64f68d04c8ae102a1e424324e02f1fb0  Catalyst-Plugin-ConfigLoader-0.21.tar.gz



From cweyl at fedoraproject.org  Fri Sep 26 05:11:44 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 05:11:44 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-ConfigLoader/F-9
	perl-Catalyst-Plugin-ConfigLoader.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20080926051144.6EB4D7010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5712

Modified Files:
	perl-Catalyst-Plugin-ConfigLoader.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
- update to 0.21



Index: perl-Catalyst-Plugin-ConfigLoader.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/F-9/perl-Catalyst-Plugin-ConfigLoader.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Catalyst-Plugin-ConfigLoader.spec	10 May 2008 19:25:06 -0000	1.4
+++ perl-Catalyst-Plugin-ConfigLoader.spec	26 Sep 2008 05:11:14 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Catalyst-Plugin-ConfigLoader
-Version:        0.20
+Version:        0.21
 Release:        1%{?dist}
 Summary:        Load config files of various types
 License:        GPL+ or Artistic
@@ -59,6 +59,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
+- update to 0.21
+
 * Sat May 10 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
 - update to 0.20
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 May 2008 19:25:06 -0000	1.3
+++ sources	26 Sep 2008 05:11:14 -0000	1.4
@@ -1 +1 @@
-caf54295dc488e1e5c246ece24bfe0cd  Catalyst-Plugin-ConfigLoader-0.20.tar.gz
+64f68d04c8ae102a1e424324e02f1fb0  Catalyst-Plugin-ConfigLoader-0.21.tar.gz



From cweyl at fedoraproject.org  Fri Sep 26 05:12:13 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 05:12:13 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-ConfigLoader/F-8
	perl-Catalyst-Plugin-ConfigLoader.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20080926051213.C2DC97010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5839

Modified Files:
	perl-Catalyst-Plugin-ConfigLoader.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
- update to 0.21



Index: perl-Catalyst-Plugin-ConfigLoader.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/F-8/perl-Catalyst-Plugin-ConfigLoader.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Catalyst-Plugin-ConfigLoader.spec	26 Jun 2008 02:51:22 -0000	1.3
+++ perl-Catalyst-Plugin-ConfigLoader.spec	26 Sep 2008 05:11:43 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-Catalyst-Plugin-ConfigLoader
-Version:        0.20
+Version:        0.21
 Release:        1%{?dist}
 Summary:        Load config files of various types
 License:        GPL+ or Artistic
@@ -59,6 +59,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
+- update to 0.21
+
 * Sat May 10 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
 - update to 0.20
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Jun 2008 02:51:22 -0000	1.3
+++ sources	26 Sep 2008 05:11:43 -0000	1.4
@@ -1 +1 @@
-caf54295dc488e1e5c246ece24bfe0cd  Catalyst-Plugin-ConfigLoader-0.20.tar.gz
+64f68d04c8ae102a1e424324e02f1fb0  Catalyst-Plugin-ConfigLoader-0.21.tar.gz



From cweyl at fedoraproject.org  Fri Sep 26 05:26:38 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 05:26:38 +0000 (UTC)
Subject: rpms/perl-Class-Data-Accessor/devel .cvsignore, 1.5,
	1.6 perl-Class-Data-Accessor.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20080926052638.C94137010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-Data-Accessor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7392

Modified Files:
	.cvsignore perl-Class-Data-Accessor.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04004-1
- update to 0.04004



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Accessor/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Aug 2008 17:38:45 -0000	1.5
+++ .cvsignore	26 Sep 2008 05:26:07 -0000	1.6
@@ -1 +1 @@
-Class-Data-Accessor-0.04003.tar.gz
+Class-Data-Accessor-0.04004.tar.gz


Index: perl-Class-Data-Accessor.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Accessor/devel/perl-Class-Data-Accessor.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Class-Data-Accessor.spec	8 Aug 2008 17:38:45 -0000	1.7
+++ perl-Class-Data-Accessor.spec	26 Sep 2008 05:26:08 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Class-Data-Accessor
-Version:        0.04003
+Version:        0.04004
 Release:        1%{?dist}
 Summary:        Inheritable, overridable class and instance data accessor creation
 License:        GPL+ or Artistic
@@ -63,6 +63,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04004-1
+- update to 0.04004
+
 * Fri Aug 08 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.04003-1
 - update to 0.04003
 - license fixed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Accessor/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Aug 2008 17:38:45 -0000	1.5
+++ sources	26 Sep 2008 05:26:08 -0000	1.6
@@ -1 +1 @@
-3c33dfef241f61cd38d75e81e507999c  Class-Data-Accessor-0.04003.tar.gz
+b5ea49ad12041ac8a7c1c0e111ed67d1  Class-Data-Accessor-0.04004.tar.gz



From cweyl at fedoraproject.org  Fri Sep 26 05:27:25 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 05:27:25 +0000 (UTC)
Subject: rpms/perl-Class-Data-Accessor/F-8 perl-Class-Data-Accessor.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20080926052725.C19E67010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-Data-Accessor/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7563

Modified Files:
	perl-Class-Data-Accessor.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04004-1
- update to 0.04004



Index: perl-Class-Data-Accessor.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Accessor/F-8/perl-Class-Data-Accessor.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Class-Data-Accessor.spec	31 May 2007 23:26:36 -0000	1.5
+++ perl-Class-Data-Accessor.spec	26 Sep 2008 05:26:55 -0000	1.6
@@ -1,8 +1,8 @@
 Name:           perl-Class-Data-Accessor
-Version:        0.04001
+Version:        0.04004
 Release:        1%{?dist}
 Summary:        Inheritable, overridable class and instance data accessor creation
-License:        Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Class-Data-Accessor/
 Source0:        http://www.cpan.org/authors/id/C/CL/CLACO/Class-Data-Accessor-%{version}.tar.gz
@@ -63,6 +63,16 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04004-1
+- update to 0.04004
+
+* Fri Aug 08 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.04003-1
+- update to 0.04003
+- license fixed
+
+* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.04001-2
+Rebuild for new perl
+
 * Thu May 31 2007 Chris Weyl <cweyl at alumni.drew.edu> 0.04001-1
 - update -- 0.40001 clarifies conflicting license statements
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Accessor/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 May 2007 23:26:36 -0000	1.4
+++ sources	26 Sep 2008 05:26:55 -0000	1.5
@@ -1 +1 @@
-b5abdc508aaa600a82eaf4c1235a780c  Class-Data-Accessor-0.04001.tar.gz
+b5ea49ad12041ac8a7c1c0e111ed67d1  Class-Data-Accessor-0.04004.tar.gz



From cweyl at fedoraproject.org  Fri Sep 26 05:27:41 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 05:27:41 +0000 (UTC)
Subject: rpms/perl-Class-Data-Accessor/F-9 perl-Class-Data-Accessor.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20080926052741.A18F37010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-Data-Accessor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7655

Modified Files:
	perl-Class-Data-Accessor.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04004-1
- update to 0.04004



Index: perl-Class-Data-Accessor.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Accessor/F-9/perl-Class-Data-Accessor.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Class-Data-Accessor.spec	7 Mar 2008 01:56:16 -0000	1.6
+++ perl-Class-Data-Accessor.spec	26 Sep 2008 05:27:11 -0000	1.7
@@ -1,8 +1,8 @@
 Name:           perl-Class-Data-Accessor
-Version:        0.04001
-Release:        2%{?dist}
+Version:        0.04004
+Release:        1%{?dist}
 Summary:        Inheritable, overridable class and instance data accessor creation
-License:        Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Class-Data-Accessor/
 Source0:        http://www.cpan.org/authors/id/C/CL/CLACO/Class-Data-Accessor-%{version}.tar.gz
@@ -63,6 +63,13 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04004-1
+- update to 0.04004
+
+* Fri Aug 08 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.04003-1
+- update to 0.04003
+- license fixed
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.04001-2
 Rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Accessor/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 May 2007 23:26:36 -0000	1.4
+++ sources	26 Sep 2008 05:27:11 -0000	1.5
@@ -1 +1 @@
-b5abdc508aaa600a82eaf4c1235a780c  Class-Data-Accessor-0.04001.tar.gz
+b5ea49ad12041ac8a7c1c0e111ed67d1  Class-Data-Accessor-0.04004.tar.gz



From cweyl at fedoraproject.org  Fri Sep 26 05:49:24 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 05:49:24 +0000 (UTC)
Subject: rpms/perl-Class-Factory/devel .cvsignore, 1.2,
	1.3 perl-Class-Factory.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20080926054924.333E27010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-Factory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10058

Modified Files:
	.cvsignore perl-Class-Factory.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.06-1
- update to 1.06



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Factory/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Mar 2007 15:17:22 -0000	1.2
+++ .cvsignore	26 Sep 2008 05:48:53 -0000	1.3
@@ -1 +1 @@
-Class-Factory-1.05.tar.gz
+Class-Factory-1.06.tar.gz


Index: perl-Class-Factory.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Factory/devel/perl-Class-Factory.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Class-Factory.spec	6 Mar 2008 18:31:54 -0000	1.3
+++ perl-Class-Factory.spec	26 Sep 2008 05:48:53 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Class-Factory
-Version:        1.05
-Release:        3%{?dist}
+Version:        1.06
+Release:        1%{?dist}
 Summary:        Base class for dynamic factory classes
 # see lib/Class/Factory.pm
 License:        GPL+ or Artistic
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.06-1
+- update to 1.06
+
 * Thu Mar  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.05-3
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Factory/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Mar 2007 15:17:22 -0000	1.2
+++ sources	26 Sep 2008 05:48:53 -0000	1.3
@@ -1 +1 @@
-26f71de57a277e53922f637dc0854bb1  Class-Factory-1.05.tar.gz
+c366a4540ef75266f2daaeb72df50b22  Class-Factory-1.06.tar.gz



From cweyl at fedoraproject.org  Fri Sep 26 05:50:03 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 05:50:03 +0000 (UTC)
Subject: rpms/perl-Class-Factory/F-9 perl-Class-Factory.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20080926055003.E53407010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-Factory/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10235

Modified Files:
	perl-Class-Factory.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.06-1
- update to 1.06



Index: perl-Class-Factory.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Factory/F-9/perl-Class-Factory.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Class-Factory.spec	6 Mar 2008 18:31:54 -0000	1.3
+++ perl-Class-Factory.spec	26 Sep 2008 05:49:33 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Class-Factory
-Version:        1.05
-Release:        3%{?dist}
+Version:        1.06
+Release:        1%{?dist}
 Summary:        Base class for dynamic factory classes
 # see lib/Class/Factory.pm
 License:        GPL+ or Artistic
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.06-1
+- update to 1.06
+
 * Thu Mar  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.05-3
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Factory/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Mar 2007 15:17:22 -0000	1.2
+++ sources	26 Sep 2008 05:49:33 -0000	1.3
@@ -1 +1 @@
-26f71de57a277e53922f637dc0854bb1  Class-Factory-1.05.tar.gz
+c366a4540ef75266f2daaeb72df50b22  Class-Factory-1.06.tar.gz



From jskala at fedoraproject.org  Fri Sep 26 05:50:05 2008
From: jskala at fedoraproject.org (Jiri Skala)
Date: Fri, 26 Sep 2008 05:50:05 +0000 (UTC)
Subject: rpms/iputils/F-9 iputils.spec,1.61,1.62
Message-ID: <20080926055005.5BC277010C@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/iputils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10279

Modified Files:
	iputils.spec 
Log Message:
* Thu Sep 25 2008 Jiri Skala <jskala at redhat.com> - 20071127-4
- #455713 not accepted - suid is back



Index: iputils.spec
===================================================================
RCS file: /cvs/extras/rpms/iputils/F-9/iputils.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- iputils.spec	5 Sep 2008 06:17:39 -0000	1.61
+++ iputils.spec	26 Sep 2008 05:49:35 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping
 Name: iputils
 Version: 20071127
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 URL: http://www.skbuff.net/iputils
 Group: System Environment/Daemons
@@ -29,7 +29,6 @@
 BuildRequires: glibc-kernheaders >= 2.4-8.19
 BuildRequires: libidn-devel
 Requires(post): /sbin/chkconfig
-Requires(post): /usr/sbin/setcap
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
@@ -115,9 +114,6 @@
 %post
 /sbin/chkconfig --add rdisc
 
-/usr/sbin/setcap cap_net_raw=ep /bin/ping
-/usr/sbin/setcap cap_net_raw=ep /bin/ping6
-
 %preun
 if [ $1 = 0 ]; then
    service rdisc stop >/dev/null 2>&1
@@ -143,10 +139,10 @@
 %ifos linux
 /sbin/arping
 %{_sbindir}/arping
-%attr(0755,root,root) /bin/ping
+%attr(4755,root,root) /bin/ping
 /sbin/ifenslave
 %else
-%attr(0755,root,root) %{_sbindir}/ping
+%attr(4755,root,root) %{_sbindir}/ping
 %{_sbindir}/arping
 %{_sbindir}/ifenslave
 %endif
@@ -161,6 +157,9 @@
 %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Thu Sep 25 2008 Jiri Skala <jskala at redhat.com> - 20071127-4
+- #455713 not accepted - suid is back
+
 * Thu Sep 04 2008 Jiri Skala <jskala at redhat.com> - 20071127-3
 - removed a dependency on libsysfs library in arping
 - Resolves: #455713 remove suid from ping



From cweyl at fedoraproject.org  Fri Sep 26 05:51:14 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 05:51:14 +0000 (UTC)
Subject: rpms/perl-Class-Factory/F-8 perl-Class-Factory.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20080926055114.E234E7010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-Factory/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10443

Modified Files:
	perl-Class-Factory.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.06-1
- update to 1.06



Index: perl-Class-Factory.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Factory/F-8/perl-Class-Factory.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-Factory.spec	19 Mar 2007 15:18:15 -0000	1.2
+++ perl-Class-Factory.spec	26 Sep 2008 05:50:44 -0000	1.3
@@ -1,15 +1,15 @@
 Name:           perl-Class-Factory
-Version:        1.05
-Release:        2%{?dist}
+Version:        1.06
+Release:        1%{?dist}
 Summary:        Base class for dynamic factory classes
 # see lib/Class/Factory.pm
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Class-Factory/
 Source0:        http://www.cpan.org/authors/id/P/PH/PHRED/Class-Factory-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl, perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -47,6 +47,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.06-1
+- update to 1.06
+
+* Thu Mar  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.05-3
+- rebuild for new perl
+
 * Mon Mar 19 2007 Chris Weyl <cweyl at alumni.drew.edu> 1.05-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Factory/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Mar 2007 15:17:22 -0000	1.2
+++ sources	26 Sep 2008 05:50:44 -0000	1.3
@@ -1 +1 @@
-26f71de57a277e53922f637dc0854bb1  Class-Factory-1.05.tar.gz
+c366a4540ef75266f2daaeb72df50b22  Class-Factory-1.06.tar.gz



From jskala at fedoraproject.org  Fri Sep 26 05:54:51 2008
From: jskala at fedoraproject.org (Jiri Skala)
Date: Fri, 26 Sep 2008 05:54:51 +0000 (UTC)
Subject: rpms/iputils/F-9 iputils.spec,1.62,1.63
Message-ID: <20080926055451.6DF6E7010C@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/iputils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10757

Modified Files:
	iputils.spec 
Log Message:
* Thu Sep 25 2008 Jiri Skala <jskala at redhat.com> - 20071127-4
- #455713 not accepted - suid is back



Index: iputils.spec
===================================================================
RCS file: /cvs/extras/rpms/iputils/F-9/iputils.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- iputils.spec	26 Sep 2008 05:49:35 -0000	1.62
+++ iputils.spec	26 Sep 2008 05:54:21 -0000	1.63
@@ -147,7 +147,7 @@
 %{_sbindir}/ifenslave
 %endif
 /sbin/rdisc
-%attr(0755,root,root) /bin/ping6
+%attr(4755,root,root) /bin/ping6
 /bin/tracepath
 /bin/tracepath6
 %{_sbindir}/ping6



From jskala at fedoraproject.org  Fri Sep 26 05:58:47 2008
From: jskala at fedoraproject.org (Jiri Skala)
Date: Fri, 26 Sep 2008 05:58:47 +0000 (UTC)
Subject: rpms/iputils/devel iputils.spec,1.62,1.63
Message-ID: <20080926055847.AB6937010C@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/iputils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11109

Modified Files:
	iputils.spec 
Log Message:
* Fri Sep 26 2008 Jiri Skala <jskala at redhat.com> - 20071127-6
- #455713 not accepted - suid is back



Index: iputils.spec
===================================================================
RCS file: /cvs/extras/rpms/iputils/devel/iputils.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- iputils.spec	20 Aug 2008 07:59:20 -0000	1.62
+++ iputils.spec	26 Sep 2008 05:58:17 -0000	1.63
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping
 Name: iputils
 Version: 20071127
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 URL: http://www.skbuff.net/iputils
 Group: System Environment/Daemons
@@ -31,7 +31,6 @@
 BuildRequires: glibc-kernheaders >= 2.4-8.19
 BuildRequires: libidn-devel
 Requires(post): /sbin/chkconfig
-Requires(post): /usr/sbin/setcap
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
@@ -112,9 +111,6 @@
 %post
 /sbin/chkconfig --add rdisc
 
-/usr/sbin/setcap cap_net_raw=ep /bin/ping
-/usr/sbin/setcap cap_net_raw=ep /bin/ping6
-
 %preun
 if [ $1 = 0 ]; then
 	service rdisc stop >/dev/null 2>&1
@@ -139,10 +135,10 @@
 %{_sbindir}/clockdiff
 /sbin/arping
 %{_sbindir}/arping
-%attr(0755,root,root) /bin/ping
+%attr(4755,root,root) /bin/ping
 /sbin/ifenslave
 /sbin/rdisc
-%attr(0755,root,root) /bin/ping6
+%attr(4755,root,root) /bin/ping6
 /bin/tracepath
 /bin/tracepath6
 %{_sbindir}/ping6
@@ -152,6 +148,9 @@
 %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Fri Sep 26 2008 Jiri Skala <jskala at redhat.com> - 20071127-6
+- #455713 not accepted - suid is back
+
 * Fri Aug 15 2008 Jiri Skala <jskala at redhat.com> - 20071127-5
 - removed a dependency on libsysfs library in arping
 



From cweyl at fedoraproject.org  Fri Sep 26 06:02:04 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 06:02:04 +0000 (UTC)
Subject: rpms/perl-Data-Dump/devel .cvsignore, 1.2, 1.3 perl-Data-Dump.spec, 
	1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20080926060204.BCF0B7010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Data-Dump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11709

Modified Files:
	.cvsignore perl-Data-Dump.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.11-1
- update to 1.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Dump/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Apr 2007 15:41:08 -0000	1.2
+++ .cvsignore	26 Sep 2008 06:01:34 -0000	1.3
@@ -1 +1 @@
-Data-Dump-1.08.tar.gz
+Data-Dump-1.11.tar.gz


Index: perl-Data-Dump.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Dump/devel/perl-Data-Dump.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Data-Dump.spec	5 Mar 2008 15:17:25 -0000	1.4
+++ perl-Data-Dump.spec	26 Sep 2008 06:01:34 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Data-Dump
-Version:        1.08
-Release:        4%{?dist}
+Version:        1.11
+Release:        1%{?dist}
 Summary:        Pretty printing of data structures
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.11-1
+- update to 1.11
+
 * Wed Mar 05 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.08-4
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Dump/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Apr 2007 15:41:08 -0000	1.2
+++ sources	26 Sep 2008 06:01:34 -0000	1.3
@@ -1 +1 @@
-a61c1537bdb484b909cfb9a514853838  Data-Dump-1.08.tar.gz
+5100e724eafd98c49a276f5c150a922a  Data-Dump-1.11.tar.gz



From cweyl at fedoraproject.org  Fri Sep 26 06:03:13 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 06:03:13 +0000 (UTC)
Subject: rpms/perl-Data-Dump/F-9 perl-Data-Dump.spec, 1.4, 1.5 sources, 1.2,
	1.3
Message-ID: <20080926060313.C56F17010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Data-Dump/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11914

Modified Files:
	perl-Data-Dump.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.11-1
- update to 1.11



Index: perl-Data-Dump.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Dump/F-9/perl-Data-Dump.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Data-Dump.spec	5 Mar 2008 15:17:25 -0000	1.4
+++ perl-Data-Dump.spec	26 Sep 2008 06:02:43 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Data-Dump
-Version:        1.08
-Release:        4%{?dist}
+Version:        1.11
+Release:        1%{?dist}
 Summary:        Pretty printing of data structures
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.11-1
+- update to 1.11
+
 * Wed Mar 05 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.08-4
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Dump/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Apr 2007 15:41:08 -0000	1.2
+++ sources	26 Sep 2008 06:02:43 -0000	1.3
@@ -1 +1 @@
-a61c1537bdb484b909cfb9a514853838  Data-Dump-1.08.tar.gz
+5100e724eafd98c49a276f5c150a922a  Data-Dump-1.11.tar.gz



From cweyl at fedoraproject.org  Fri Sep 26 06:04:16 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 06:04:16 +0000 (UTC)
Subject: rpms/perl-Data-Dump/F-8 perl-Data-Dump.spec, 1.2, 1.3 sources, 1.2,
	1.3
Message-ID: <20080926060416.54C517010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Data-Dump/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12115

Modified Files:
	perl-Data-Dump.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.11-1
- update to 1.11



Index: perl-Data-Dump.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Dump/F-8/perl-Data-Dump.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Data-Dump.spec	30 Apr 2007 16:04:15 -0000	1.2
+++ perl-Data-Dump.spec	26 Sep 2008 06:03:46 -0000	1.3
@@ -1,20 +1,19 @@
 Name:           perl-Data-Dump
-Version:        1.08
-Release:        2%{?dist}
+Version:        1.11
+Release:        1%{?dist}
 Summary:        Pretty printing of data structures
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Data-Dump/
 Source0:        http://www.cpan.org/authors/id/G/GA/GAAS/Data-Dump-%{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)
 
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
 %description
 This module provides a single function called dump() that takes a list of
 values as its argument and produces a string as its result. The string
@@ -54,6 +53,15 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.11-1
+- update to 1.11
+
+* Wed Mar 05 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.08-4
+- rebuild for new perl
+
+* Mon Oct 22 2007 Chris Weyl <cweyl at alumni.drew.edu> 1.08-3
+- update license tag: GPL -> GPL+
+
 * Mon Apr 30 2007 Chris Weyl <cweyl at alumni.drew.edu> 1.08-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Dump/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Apr 2007 15:41:08 -0000	1.2
+++ sources	26 Sep 2008 06:03:46 -0000	1.3
@@ -1 +1 @@
-a61c1537bdb484b909cfb9a514853838  Data-Dump-1.08.tar.gz
+5100e724eafd98c49a276f5c150a922a  Data-Dump-1.11.tar.gz



From iankent at fedoraproject.org  Fri Sep 26 06:07:30 2008
From: iankent at fedoraproject.org (Ian Kent)
Date: Fri, 26 Sep 2008 06:07:30 +0000 (UTC)
Subject: rpms/autofs/devel
	autofs-5.0.3-fix-fd-leak-at-multi-mount-fail.patch, 
	NONE, 1.1 autofs-5.0.3-fix-incorrect-multi-mount-mountpoint.patch,
	NONE, 1.1 autofs.spec, 1.251, 1.252
Message-ID: <20080926060731.011EF7013E@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12686

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.3-fix-fd-leak-at-multi-mount-fail.patch 
	autofs-5.0.3-fix-incorrect-multi-mount-mountpoint.patch 
Log Message:
* Fri Sep 26 2008 Ian Kent <ikent at redhat.com> - 5.0.3-25
- fix fd leak at multi-mount non-fatal mount fail.
- fix incorrect multi-mount mountpoint calcualtion.


autofs-5.0.3-fix-fd-leak-at-multi-mount-fail.patch:

--- NEW FILE autofs-5.0.3-fix-fd-leak-at-multi-mount-fail.patch ---
autofs-5.0.3 - fix fd leak at multi-mount fail

From: Ian Kent <raven at themaw.net>

Fix file handle being left open following a multi-mount non-fatal mount
fail.
---

 daemon/direct.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)


diff --git a/daemon/direct.c b/daemon/direct.c
index 13f572c..b94601a 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -1303,12 +1303,20 @@ static void *do_mount_direct(void *arg)
 	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &state);
 	if (status) {
 		struct mapent *me;
+		struct statfs fs;
+		unsigned int close_fd = 0;
+
+		if (statfs(mt.name, &fs) == -1 ||
+		   (fs.f_type == AUTOFS_SUPER_MAGIC &&
+		    !master_find_submount(ap, mt.name)))
+			close_fd = 1;
 		cache_writelock(mt.mc);
-		me = cache_lookup_distinct(mt.mc, mt.name);
-		if (me)
+		if (!close_fd && (me = cache_lookup_distinct(mt.mc, mt.name)))
 			me->ioctlfd = mt.ioctlfd;
 		send_ready(ap->logopt, mt.ioctlfd, mt.wait_queue_token);
 		cache_unlock(mt.mc);
+		if (close_fd)
+			close(mt.ioctlfd);
 		info(ap->logopt, "mounted %s", mt.name);
 	} else {
 		send_fail(ap->logopt, mt.ioctlfd, mt.wait_queue_token);

autofs-5.0.3-fix-incorrect-multi-mount-mountpoint.patch:

--- NEW FILE autofs-5.0.3-fix-incorrect-multi-mount-mountpoint.patch ---
autofs-5.0.3 - fix incorrect multi-mount mountpoint

From: Ian Kent <raven at themaw.net>

Fix case where an incorrect mount point path was being used when
mounting a multi-mount component.
---

 modules/parse_sun.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 333f8a5..5a39113 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -1248,8 +1248,14 @@ static int mount_subtree(struct autofs_point *ap, struct mapent *me,
 				return 1;
 			}
 		} else if (rv < 0) {
+			char *mm_root_base = alloca(strlen(mm_root) + strlen(mm_base) + 1);
+	
 			move = MOUNT_MOVE_NONE;
-			ret = mount_multi_triggers(ap, me->multi, mm_root, start, mm_base);
+
+			strcpy(mm_root_base, mm_root);
+			strcat(mm_root_base, mm_base);
+
+			ret = mount_multi_triggers(ap, me->multi, mm_root_base, start, mm_base);
 			if (ret == -1) {
 				error(ap->logopt, MODPREFIX
 					 "failed to mount offset triggers");


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- autofs.spec	19 Sep 2008 09:00:03 -0000	1.251
+++ autofs.spec	26 Sep 2008 06:07:00 -0000	1.252
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.3
-Release: 23
+Release: 25
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -57,6 +57,8 @@
 Patch45: autofs-5.0.3-handle-zero-length-nis-key-update.patch
 Patch46: autofs-5.0.3-fix-ifc-buff-size-fix-2.patch
 Patch47: autofs-5.0.3-check-for-kernel-automount-fix.patch
+Patch48: autofs-5.0.3-fix-fd-leak-at-multi-mount-fail.patch
+Patch49: autofs-5.0.3-fix-incorrect-multi-mount-mountpoint.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs
 Requires: kernel >= 2.6.17
@@ -145,6 +147,8 @@
 %patch45 -p1
 %patch46 -p1
 %patch47 -p1
+%patch48 -p1
+%patch49 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -197,6 +201,10 @@
 %{_libdir}/autofs/
 
 %changelog
+* Fri Sep 26 2008 Ian Kent <ikent at redhat.com> - 5.0.3-25
+- fix fd leak at multi-mount non-fatal mount fail.
+- fix incorrect multi-mount mountpoint calcualtion.
+
 * Fri Sep 19 2008 Ian Kent <ikent at redhat.com> - 5.0.3-23
 - add upstream bug fixes
   - bug fix for mtab check.



From cweyl at fedoraproject.org  Fri Sep 26 06:10:05 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 06:10:05 +0000 (UTC)
Subject: rpms/perl-Config-Any/devel .cvsignore, 1.4, 1.5 perl-Config-Any.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20080926061005.BE9627010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Config-Any/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13421

Modified Files:
	.cvsignore perl-Config-Any.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
- update to 0.14
- add XML::LibXML to br's



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Any/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 May 2008 05:56:45 -0000	1.4
+++ .cvsignore	26 Sep 2008 06:09:35 -0000	1.5
@@ -1 +1 @@
-Config-Any-0.12.tar.gz
+Config-Any-0.14.tar.gz


Index: perl-Config-Any.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Any/devel/perl-Config-Any.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Config-Any.spec	22 May 2008 05:56:45 -0000	1.5
+++ perl-Config-Any.spec	26 Sep 2008 06:09:35 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Config-Any
-Version:        0.12
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Load configuration from different file formats, transparently
 License:        GPL+ or Artistic
@@ -22,6 +22,7 @@
 # tests
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Scalar::Util)
+BuildRequires:  perl(XML::LibXML)
 
 # optional tests
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
@@ -95,6 +96,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
+- update to 0.14
+- add XML::LibXML to br's
+
 * Wed May 21 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.12-1
 - update to 0.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Any/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 May 2008 05:56:45 -0000	1.4
+++ sources	26 Sep 2008 06:09:35 -0000	1.5
@@ -1 +1 @@
-a726dd522e9d61503f090a18e6e7ce72  Config-Any-0.12.tar.gz
+b5d1197763edb350b1bc1e65febb598f  Config-Any-0.14.tar.gz



From cweyl at fedoraproject.org  Fri Sep 26 06:10:35 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 06:10:35 +0000 (UTC)
Subject: rpms/perl-Config-Any/F-9 perl-Config-Any.spec, 1.5, 1.6 sources, 1.4,
	1.5
Message-ID: <20080926061035.8CA787010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Config-Any/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13526

Modified Files:
	perl-Config-Any.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
- update to 0.14
- add XML::LibXML to br's



Index: perl-Config-Any.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Any/F-9/perl-Config-Any.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Config-Any.spec	22 May 2008 06:01:23 -0000	1.5
+++ perl-Config-Any.spec	26 Sep 2008 06:10:05 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Config-Any
-Version:        0.12
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Load configuration from different file formats, transparently
 License:        GPL+ or Artistic
@@ -22,6 +22,7 @@
 # tests
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Scalar::Util)
+BuildRequires:  perl(XML::LibXML)
 
 # optional tests
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
@@ -95,6 +96,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
+- update to 0.14
+- add XML::LibXML to br's
+
 * Wed May 21 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.12-1
 - update to 0.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Any/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 May 2008 06:01:23 -0000	1.4
+++ sources	26 Sep 2008 06:10:05 -0000	1.5
@@ -1 +1 @@
-a726dd522e9d61503f090a18e6e7ce72  Config-Any-0.12.tar.gz
+b5d1197763edb350b1bc1e65febb598f  Config-Any-0.14.tar.gz



From cweyl at fedoraproject.org  Fri Sep 26 06:10:46 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 06:10:46 +0000 (UTC)
Subject: rpms/perl-Config-Any/F-8 perl-Config-Any.spec, 1.4, 1.5 sources, 1.4,
	1.5
Message-ID: <20080926061046.1A66A7010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Config-Any/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13589

Modified Files:
	perl-Config-Any.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
- update to 0.14
- add XML::LibXML to br's



Index: perl-Config-Any.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Any/F-8/perl-Config-Any.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Config-Any.spec	22 May 2008 06:06:12 -0000	1.4
+++ perl-Config-Any.spec	26 Sep 2008 06:10:15 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Config-Any
-Version:        0.12
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Load configuration from different file formats, transparently
 License:        GPL+ or Artistic
@@ -22,6 +22,7 @@
 # tests
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Scalar::Util)
+BuildRequires:  perl(XML::LibXML)
 
 # optional tests
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
@@ -95,6 +96,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
+- update to 0.14
+- add XML::LibXML to br's
+
 * Wed May 21 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.12-1
 - update to 0.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Any/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 May 2008 06:06:12 -0000	1.4
+++ sources	26 Sep 2008 06:10:15 -0000	1.5
@@ -1 +1 @@
-a726dd522e9d61503f090a18e6e7ce72  Config-Any-0.12.tar.gz
+b5d1197763edb350b1bc1e65febb598f  Config-Any-0.14.tar.gz



From cweyl at fedoraproject.org  Fri Sep 26 06:18:59 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 06:18:59 +0000 (UTC)
Subject: rpms/perl-GraphViz/devel .cvsignore, 1.2, 1.3 perl-GraphViz.spec,
	1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20080926061859.29D3B7010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-GraphViz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14502

Modified Files:
	.cvsignore perl-GraphViz.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.03-1
- update to 2.03



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-GraphViz/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Apr 2007 18:33:24 -0000	1.2
+++ .cvsignore	26 Sep 2008 06:18:28 -0000	1.3
@@ -1 +1 @@
-GraphViz-2.02.tar.gz
+GraphViz-2.03.tar.gz


Index: perl-GraphViz.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GraphViz/devel/perl-GraphViz.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-GraphViz.spec	5 Mar 2008 19:38:18 -0000	1.4
+++ perl-GraphViz.spec	26 Sep 2008 06:18:28 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-GraphViz
-Version:        2.02
-Release:        3%{?dist}
+Version:        2.03
+Release:        1%{?dist}
 Summary:        Interface to the GraphViz graphing tool
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.03-1
+- update to 2.03
+
 * Wed Mar 05 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.02-3
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GraphViz/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Apr 2007 18:33:24 -0000	1.2
+++ sources	26 Sep 2008 06:18:28 -0000	1.3
@@ -1 +1 @@
-bb89286643e01631d1b7b0179ef120d6  GraphViz-2.02.tar.gz
+da8efe38152c983d9de63c9f8da5b852  GraphViz-2.03.tar.gz



From cweyl at fedoraproject.org  Fri Sep 26 06:19:19 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 06:19:19 +0000 (UTC)
Subject: rpms/perl-GraphViz/F-9 perl-GraphViz.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <20080926061919.9795E7010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-GraphViz/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14557

Modified Files:
	perl-GraphViz.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.03-1
- update to 2.03



Index: perl-GraphViz.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GraphViz/F-9/perl-GraphViz.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-GraphViz.spec	5 Mar 2008 19:38:18 -0000	1.4
+++ perl-GraphViz.spec	26 Sep 2008 06:18:49 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-GraphViz
-Version:        2.02
-Release:        3%{?dist}
+Version:        2.03
+Release:        1%{?dist}
 Summary:        Interface to the GraphViz graphing tool
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.03-1
+- update to 2.03
+
 * Wed Mar 05 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.02-3
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GraphViz/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Apr 2007 18:33:24 -0000	1.2
+++ sources	26 Sep 2008 06:18:49 -0000	1.3
@@ -1 +1 @@
-bb89286643e01631d1b7b0179ef120d6  GraphViz-2.02.tar.gz
+da8efe38152c983d9de63c9f8da5b852  GraphViz-2.03.tar.gz



From cweyl at fedoraproject.org  Fri Sep 26 06:19:41 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 26 Sep 2008 06:19:41 +0000 (UTC)
Subject: rpms/perl-GraphViz/F-8 perl-GraphViz.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20080926061941.32E197010C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-GraphViz/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14664

Modified Files:
	perl-GraphViz.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.03-1
- update to 2.03



Index: perl-GraphViz.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GraphViz/F-8/perl-GraphViz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-GraphViz.spec	19 Apr 2007 18:48:30 -0000	1.3
+++ perl-GraphViz.spec	26 Sep 2008 06:19:11 -0000	1.4
@@ -1,8 +1,8 @@
 Name:           perl-GraphViz
-Version:        2.02
-Release:        2%{?dist}
+Version:        2.03
+Release:        1%{?dist}
 Summary:        Interface to the GraphViz graphing tool
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/GraphViz/
 Source0:        http://www.cpan.org/authors/id/L/LB/LBROCARD/GraphViz-%{version}.tar.gz
@@ -59,6 +59,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.03-1
+- update to 2.03
+
+* Wed Mar 05 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.02-3
+- rebuild for new perl
+
 * Thu Apr 19 2007 Chris Weyl <cweyl at alumni.drew.edu> 2.02-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GraphViz/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Apr 2007 18:33:24 -0000	1.2
+++ sources	26 Sep 2008 06:19:11 -0000	1.3
@@ -1 +1 @@
-bb89286643e01631d1b7b0179ef120d6  GraphViz-2.02.tar.gz
+da8efe38152c983d9de63c9f8da5b852  GraphViz-2.03.tar.gz



From transif at fedoraproject.org  Fri Sep 26 06:47:52 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Fri, 26 Sep 2008 06:47:52 +0000 (UTC)
Subject: comps/po sq.po,1.13,1.14
Message-ID: <20080926064752.7EA627010C@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17537/po

Modified Files:
	sq.po 
Log Message:
    2008-09-26  Besnik Bleta <besnik at programeshqip.org> (via
besnik at fedoraproject.org)
    
      * po/sq.po: more strings translated
    



Index: sq.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sq.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sq.po	25 Sep 2008 07:38:41 -0000	1.13
+++ sq.po	26 Sep 2008 06:47:21 -0000	1.14
@@ -8,7 +8,7 @@
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-02-05 09:53-0500\n"
-"PO-Revision-Date: 2008-09-25 10:41+0200\n"
+"PO-Revision-Date: 2008-09-26 09:49+0200\n"
 "Last-Translator: Besnik Bleta <besnik at programeshqip.org>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -316,7 +316,7 @@
 #: ../comps-rhel5-client-core.xml.in.h:42
 #: ../comps-rhel5-server-core.xml.in.h:38
 msgid "From CD recording to playing audio CDs and multimedia files, this package group allows you to work with sound and video on the system."
-msgstr ""
+msgstr "Ky grup paketash ju lejon t?? punoni me z?? dhe pamje n?? sistem, q?? nga regjistrim CD-sh deri te lojtja e CD-ve audio dhe kartelave multimedia."
 
 #: ../comps-taroon.xml.in.h:34
 #: ../comps-rhel4.xml.in.h:20
@@ -426,24 +426,20 @@
 msgstr "Suport SSL jo i mundsh??m"
 
 #: ../comps-taroon.xml.in.h:45
-#, fuzzy
 msgid "ISO8859-14 Support"
-msgstr "Suport SSL jo i mundsh??m"
+msgstr "Mbulim i  ISO8859-14"
 
 #: ../comps-taroon.xml.in.h:46
-#, fuzzy
 msgid "ISO8859-15 Support"
-msgstr "Suport SSL jo i mundsh??m"
+msgstr "Mbulim i ISO8859-15"
 
 #: ../comps-taroon.xml.in.h:47
-#, fuzzy
 msgid "ISO8859-2 Support"
-msgstr "Suport SSL jo i mundsh??m"
+msgstr "Mbulim i ISO8859-2"
 
 #: ../comps-taroon.xml.in.h:48
-#, fuzzy
 msgid "ISO8859-9 Support"
-msgstr "Suport SSL jo i mundsh??m"
+msgstr "Mbulim i ISO8859-9"
 
 #: ../comps-taroon.xml.in.h:49
 #: ../comps-fc6.xml.in.h:58
@@ -821,7 +817,7 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:35
 #: ../comps-rhel5-server-core.xml.in.h:102
 msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi."
-msgstr "Ngandonj??her?? t?? quajtur p??rpunuesa teksti, k??to jan?? programe q?? ju lejojn?? t?? krijoni dhe p??rpunoni kartela. P??rfshijn?? Emacs dhe Vi."
+msgstr "Ngandonj??her?? t?? quajtur edhe p??rpunuesa teksti, k??to jan?? programe q?? ju lejojn?? t?? krijoni dhe p??rpunoni kartela. K??tu p??rfshihen Emacs dhe Vi."
 
 #: ../comps-taroon.xml.in.h:90
 #: ../comps-rhel4.xml.in.h:52
@@ -917,7 +913,7 @@
 #: ../comps-rhel5-client-core.xml.in.h:119
 #: ../comps-rhel5-server-core.xml.in.h:113
 msgid "The applications include office suites, PDF viewers, and more."
-msgstr ""
+msgstr "Zbatime p??rfshijn?? suita zyre, par??sa PDF-sh, dhe t?? tjera."
 
 #: ../comps-taroon.xml.in.h:101
 #: ../comps-rhel4.xml.in.h:60
@@ -928,13 +924,13 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:41
 #: ../comps-rhel5-server-core.xml.in.h:114
 msgid "The packages in this group are core libraries needed to develop applications."
-msgstr ""
+msgstr "Paketat n?? k??t?? gruo jan?? librari baz?? t?? domosdoshme p??r zhvillim zbatimesh."
 
 #: ../comps-taroon.xml.in.h:102
 #: ../comps-rhel4.xml.in.h:61
 #: ../comps-rhel4-u5.xml.in.h:61
 msgid "These packages allow you to configure an IMAP or Postfix mail server."
-msgstr ""
+msgstr "K??to paketa ju lejojn?? t?? form??soni nj?? sh??rbyes poste IMAP ose Postfix."
 
 #: ../comps-taroon.xml.in.h:103
 #: ../comps-rhel4.xml.in.h:62
@@ -945,7 +941,7 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:43
 #: ../comps-rhel5-server-core.xml.in.h:116
 msgid "These packages allow you to develop applications for the X Window System."
-msgstr ""
+msgstr "h"
 
 #: ../comps-taroon.xml.in.h:104
 #: ../comps-rhel4.xml.in.h:63
@@ -956,7 +952,7 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:44
 #: ../comps-rhel5-server-core.xml.in.h:117
 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
-msgstr ""
+msgstr "K??to paketa p??rfshijn?? sh??rbyesa me baz?? rrjeti, t?? till?? si DHCP, Kerberos dhe NIS."
 
 #: ../comps-taroon.xml.in.h:105
 #: ../comps-rhel4.xml.in.h:64
@@ -967,13 +963,13 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:45
 #: ../comps-rhel5-server-core.xml.in.h:118
 msgid "These packages include servers for old network protocols such as rsh and telnet."
-msgstr ""
+msgstr "K??to paketa p??rfshijn?? sh??rbyesa p??r protokolle rrjeti t?? vjet??r, t?? till?? si rsh dhe telnet."
 
 #: ../comps-taroon.xml.in.h:106
 #: ../comps-rhel4.xml.in.h:65
 #: ../comps-rhel4-u5.xml.in.h:65
 msgid "These packages provide compatibility support for previous releases of Red Hat Enterprise Linux."
-msgstr ""
+msgstr "K??to paketa ofrojn?? mbulim p??r versione t?? dikursh??m t?? Red Hat Enterprise Linux-it."
 
 #: ../comps-taroon.xml.in.h:107
 #: ../comps-rhel4.xml.in.h:66
@@ -981,7 +977,7 @@
 #: ../comps-rhel5-client-core.xml.in.h:127
 #: ../comps-rhel5-server-core.xml.in.h:121
 msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text."
-msgstr ""
+msgstr "K??to mjete ju lejojn?? t?? krijoni dokumentim n?? formatin DocBook dhe shnd??rrimin e tyre n?? HTML, PDF, Postscript, apo tekst."
 
 #: ../comps-taroon.xml.in.h:108
 #: ../comps-rhel4.xml.in.h:67
@@ -992,7 +988,7 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:47
 #: ../comps-rhel5-server-core.xml.in.h:122
 msgid "These tools allow you to run a Web server on the system."
-msgstr ""
+msgstr "K??to mjete ju lejojn?? t?? xhironi n?? sistem nj?? sh??rbyes Web."
 
 #: ../comps-taroon.xml.in.h:109
 #: ../comps-rhel4.xml.in.h:68
@@ -1014,7 +1010,7 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:49
 #: ../comps-rhel5-server-core.xml.in.h:124
 msgid "These tools include core development tools such as automake, gcc, perl, python, and debuggers."
-msgstr ""
+msgstr "K??to mjete p??rfshijn?? mjete baz?? zhvillimi si automake, gcc, perl, python, dhe diagnostikuesa."
 
 #: ../comps-taroon.xml.in.h:111
 #: ../comps-rhel4.xml.in.h:70
@@ -1025,7 +1021,7 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:50
 #: ../comps-rhel5-server-core.xml.in.h:125
 msgid "This group allows you to configure the system as a news server."
-msgstr ""
+msgstr "Ky grup ju lejon ta form??soni sistemin si sh??rbyes lajmesh."
 
 #: ../comps-taroon.xml.in.h:112
 #: ../comps-rhel4.xml.in.h:71
@@ -1036,7 +1032,7 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:51
 #: ../comps-rhel5-server-core.xml.in.h:126
 msgid "This group contains all of Red Hat's custom server configuration tools."
-msgstr ""
+msgstr "Ky grup p??rmban t??r?? mjetet Red Hat p??r form??sim t?? p??rshtatur t?? nj?? sh??rbyesi."
 
 #: ../comps-taroon.xml.in.h:113
 #: ../comps-rhel4.xml.in.h:73
@@ -1047,7 +1043,7 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:53
 #: ../comps-rhel5-server-core.xml.in.h:128
 msgid "This group includes graphical email, Web, and chat clients."
-msgstr ""
+msgstr "Ky grup p??rfshin klient?? grafik?? p??r email, Web, dhe fjalosje."
 
 #: ../comps-taroon.xml.in.h:114
 #: ../comps-rhel4.xml.in.h:74
@@ -1058,7 +1054,7 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:54
 #: ../comps-rhel5-server-core.xml.in.h:129
 msgid "This group includes packages for performing mathematical and scientific computations and plotting, as well as unit conversion."
-msgstr ""
+msgstr "Ky grup p??rfshin paketa p??r kryerje llogaritjesh matematike dhe shkencore, nd??rtim grafik??sh, si edhe shnd??rrime nj??sish."
 
 #: ../comps-taroon.xml.in.h:115
 #: ../comps-rhel4.xml.in.h:75
@@ -1068,7 +1064,7 @@
 #: ../comps-rhel5-client-core.xml.in.h:136
 #: ../comps-rhel5-server-core.xml.in.h:130
 msgid "This group includes packages to help you manipulate and scan images."
-msgstr ""
+msgstr "Ky grup p??rfshin paketa p??r t'ju ndihmuar t?? manipuloni dhe skanoni pamje."
 
 #: ../comps-taroon.xml.in.h:116
 #: ../comps-rhel4.xml.in.h:76
@@ -1079,7 +1075,7 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:55
 #: ../comps-rhel5-server-core.xml.in.h:131
 msgid "This group includes text-based email, Web, and chat clients. These applications do not require the X Window System."
-msgstr ""
+msgstr "Ky grup p??rfshin klient?? me baz?? tekst p??r email, Web, dhe fjalosje. K??to zbatime nuk e kan?? t?? domosdosh??m Sistemin X t?? Dritareve."
 
 #: ../comps-taroon.xml.in.h:117
 #: ../comps-rhel4.xml.in.h:77
@@ -1090,7 +1086,7 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:56
 #: ../comps-rhel5-server-core.xml.in.h:132
 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 "Ky grup ??sht?? nj?? koleksion mjetesh grafike administrimi t?? sistemit, t?? till?? si ata p??r administrimin e llogarive t?? p??rdoruesve dhe form??simin e hardware-it t?? sistemit."
 
 #: ../comps-taroon.xml.in.h:118
 #: ../comps-rhel4.xml.in.h:78
@@ -1101,7 +1097,7 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:57
 #: ../comps-rhel5-server-core.xml.in.h:133
 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 ""
+msgstr "Ky grup ??sht?? nj?? koleksion mjetesh t?? ndryshme p??r sistemin, si klienti p??r t'u lidhur me ndarje SMB dhe mjete p??r mbikqyrje trafiku rrjetesh."
 
 #: ../comps-taroon.xml.in.h:119
 #: ../comps-rhel4.xml.in.h:79
@@ -1112,7 +1108,7 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:58
 #: ../comps-rhel5-server-core.xml.in.h:134
 msgid "This package group allows you to run a DNS name server (BIND) on the system."
-msgstr ""
+msgstr "Ky grup paketash ju lejon t?? xhironi n?? sistem nj?? sh??rbyes emrash DNS (BIND)."
 
 #: ../comps-taroon.xml.in.h:120
 #: ../comps-rhel4.xml.in.h:80
@@ -1122,7 +1118,7 @@
 #: ../comps-rhel5-client-core.xml.in.h:141
 #: ../comps-rhel5-server-core.xml.in.h:135
 msgid "This package group allows you to share files between Linux and MS Windows(tm) systems."
-msgstr ""
+msgstr "Ky grup paketash ju lejon t?? shk??mbeni kartela nd??rmjet sistemesh Linux dhe MS Windows(tm)."
 
 #: ../comps-taroon.xml.in.h:121
 #: ../comps-rhel4.xml.in.h:81
@@ -1133,7 +1129,7 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:59
 #: ../comps-rhel5-server-core.xml.in.h:136
 msgid "This package group contains packages useful for use with MySQL."
-msgstr ""
+msgstr "Ky grup paketash p??rmban paketa t?? dobishme p??r p??rdorim me MySQL-in."
 
 #: ../comps-taroon.xml.in.h:122
 #: ../comps-rhel4.xml.in.h:82
@@ -1144,7 +1140,7 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:60
 #: ../comps-rhel5-server-core.xml.in.h:137
 msgid "This package group includes packages useful for use with Postgresql."
-msgstr ""
+msgstr "Ky grup paketash p??rfshin paketa t?? dobishme p??r p??rdorim me Postgresql."
 
 #: ../comps-taroon.xml.in.h:123
 #: ../comps-fc6.xml.in.h:151
@@ -1296,33 +1292,33 @@
 #: ../comps-taroon-docs-emea.xml.in.h:8
 #: ../comps-rhel4-docs-dvd.xml.in.h:17
 msgid "This group contains the Red Hat Enterprise Linux documentation in the Brazilian Portuguese language."
-msgstr ""
+msgstr "Ky grup p??rmban dokumentimin e Red Hat Enterprise Linux-it n?? gjuh??n Portugeze Braziliane."
 
 #: ../comps-taroon-docs-emea.xml.in.h:9
 #: ../comps-taroon-docs-apac.xml.in.h:6
 #: ../comps-rhel4-docs-dvd.xml.in.h:18
 msgid "This group contains the Red Hat Enterprise Linux documentation in the English language."
-msgstr ""
+msgstr "Ky grup p??rmban dokumentimin e Red Hat Enterprise Linux-it n?? gjuh??n Angleze."
 
 #: ../comps-taroon-docs-emea.xml.in.h:10
 #: ../comps-rhel4-docs-dvd.xml.in.h:19
 msgid "This group contains the Red Hat Enterprise Linux documentation in the French language."
-msgstr ""
+msgstr "Ky grup p??rmban dokumentimin e Red Hat Enterprise Linux-it n?? gjuh??n Fr??nge."
 
 #: ../comps-taroon-docs-emea.xml.in.h:11
 #: ../comps-rhel4-docs-dvd.xml.in.h:20
 msgid "This group contains the Red Hat Enterprise Linux documentation in the German language."
-msgstr ""
+msgstr "Ky grup p??rmban dokumentimin e Red Hat Enterprise Linux-it n?? gjuh??n Gjermane."
 
 #: ../comps-taroon-docs-emea.xml.in.h:12
 #: ../comps-rhel4-docs-dvd.xml.in.h:23
 msgid "This group contains the Red Hat Enterprise Linux documentation in the Italian language."
-msgstr ""
+msgstr "Ky grup p??rmban dokumentimin e Red Hat Enterprise Linux-it n?? gjuh??n Italiane."
 
 #: ../comps-taroon-docs-emea.xml.in.h:13
 #: ../comps-rhel4-docs-dvd.xml.in.h:28
 msgid "This group contains the Red Hat Enterprise Linux documentation in the Spanish language."
-msgstr ""
+msgstr "Ky grup p??rmban dokumentimin e Red Hat Enterprise Linux-it n?? gjuh??n Spanjolle."
 
 #: ../comps-taroon-docs-apac.xml.in.h:2
 #: ../comps-rhel4-docs-dvd.xml.in.h:9
@@ -1345,26 +1341,25 @@
 #: ../comps-taroon-docs-apac.xml.in.h:7
 #: ../comps-rhel4-docs-dvd.xml.in.h:24
 msgid "This group contains the Red Hat Enterprise Linux documentation in the Japanese language."
-msgstr ""
+msgstr "Ky grup p??rmban dokumentimin e Red Hat Enterprise Linux-it n?? gjuh??n Japoneze"
 
 #: ../comps-taroon-docs-apac.xml.in.h:8
 #: ../comps-rhel4-docs-dvd.xml.in.h:25
 msgid "This group contains the Red Hat Enterprise Linux documentation in the Korean language."
-msgstr ""
+msgstr "Ky grup p??rmban dokumentimin e Red Hat Enterprise Linux-it n?? gjuh??n Koreane"
 
 #: ../comps-taroon-docs-apac.xml.in.h:9
 #: ../comps-rhel4-docs-dvd.xml.in.h:27
 msgid "This group contains the Red Hat Enterprise Linux documentation in the Simplified Chinese language."
-msgstr ""
+msgstr "Ky grup p??rmban dokumentimin e Red Hat Enterprise Linux-it n?? gjuh??n Kineze t?? Thjeshtuar."
 
 #: ../comps-taroon-docs-apac.xml.in.h:10
 #: ../comps-rhel4-docs-dvd.xml.in.h:30
 msgid "This group contains the Red Hat Enterprise Linux documentation in the Traditional Chinese language."
-msgstr ""
+msgstr "Ky grup p??rmban dokumentimin e Red Hat Enterprise Linux-it n?? gjuh??n Kineze Tradicionale."
 
 #: ../comps-taroon-docs-apac.xml.in.h:11
 #: ../comps-rhel4-docs-dvd.xml.in.h:31
-#, fuzzy
 msgid "Traditional Chinese"
 msgstr "Kineze Tradicionale"
 
@@ -1374,9 +1369,8 @@
 #: ../comps-fc7.xml.in.h:75
 #: ../comps-rhel5-client-core.xml.in.h:68
 #: ../comps-rhel5-server-core.xml.in.h:64
-#, fuzzy
 msgid "KDE (K Desktop Environment)"
-msgstr "Mjedisi Desktop Xfce"
+msgstr "KDE (Mjedisi Desktop K)"
 
 #: ../comps-rhel4.xml.in.h:44
 #: ../comps-rhel4-u5.xml.in.h:44
@@ -1385,9 +1379,8 @@
 #: ../comps-rhel5-client-core.xml.in.h:93
 #: ../comps-rhel5-client-workstation.xml.in.h:30
 #: ../comps-rhel5-server-core.xml.in.h:87
-#, fuzzy
 msgid "PostgreSQL Database"
-msgstr "Baz?? t?? dh??nash Proceduriale"
+msgstr "Baz?? t?? dh??nash PostgreSQL"
 
 #: ../comps-rhel4.xml.in.h:72
 #: ../comps-rhel4-u5.xml.in.h:72
@@ -1397,7 +1390,7 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:52
 #: ../comps-rhel5-server-core.xml.in.h:127
 msgid "This group includes a minimal set of packages. Useful for creating small router/firewall boxes, for example."
-msgstr ""
+msgstr "Ky grup p??rfshin nj?? minimum paketash. I dobish??m p??r krijimin router-ash/firewall-esh t?? vegj??l, fjala vjen."
 
 #: ../comps-rhel4.xml.in.h:90
 #: ../comps-rhel4-u5.xml.in.h:90
@@ -1432,9 +1425,8 @@
 #: ../comps-fc7.xml.in.h:11
 #: ../comps-rhel5-client-core.xml.in.h:9
 #: ../comps-rhel5-server-core.xml.in.h:9
-#, fuzzy
 msgid "Base System"
-msgstr "Regjistrim Sistemi"
+msgstr "Sistem Baz??"
 
 #: ../comps-fc6.xml.in.h:11
 #: ../comps-fc7.xml.in.h:13
@@ -1519,7 +1511,7 @@
 #: ../comps-fc6.xml.in.h:30
 #: ../comps-fc7.xml.in.h:32
 msgid "Dial-up Networking Support"
-msgstr ""
+msgstr "Mbulim Punimi n?? Rrjet Dial-up"
 
 #: ../comps-fc6.xml.in.h:32
 #: ../comps-fc7.xml.in.h:34
@@ -1707,7 +1699,7 @@
 #: ../comps-rhel5-client-core.xml.in.h:88
 #: ../comps-rhel5-server-core.xml.in.h:83
 msgid "Packages which provide functionality for developing and building applications."
-msgstr ""
+msgstr "Paketa q?? ofrojn?? funksione p??r zhvillim dhe nd??rtim zbatimesh."
 
 #: ../comps-fc6.xml.in.h:95
 #: ../comps-fc7.xml.in.h:101
@@ -1741,7 +1733,7 @@
 #: ../comps-fc6.xml.in.h:107
 #: ../comps-fc7.xml.in.h:114
 msgid "Sometimes called text editors, these are programs that allow you to create and edit text files. This includes Emacs and Vi."
-msgstr ""
+msgstr "Ngadonj??her?? t?? quajtur edhe p??rpunuesa teksti, k??to jan?? programe q?? ju lejojn?? t?? krijoni dhe p??rpunoni kartela tekst. K??tu p??rfshihen Emacs dhe Vi."
 
 #: ../comps-fc6.xml.in.h:109
 #: ../comps-fc7.xml.in.h:116
@@ -1761,7 +1753,7 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:36
 #: ../comps-rhel5-server-core.xml.in.h:105
 msgid "Support for developing programs in the Java programming language."
-msgstr ""
+msgstr "Asistenc?? p??r zhvillim programesh n?? gjuh??n e programimeve Java."
 
 #: ../comps-fc6.xml.in.h:113
 #: ../comps-fc7.xml.in.h:120
@@ -1769,7 +1761,7 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:37
 #: ../comps-rhel5-server-core.xml.in.h:106
 msgid "Support for running programs written in the Java programming language."
-msgstr ""
+msgstr "Asistenc?? p??r xhirim programesh t?? shkruajtur n?? gjuh??n e programimeve Java."
 
 #: ../comps-fc6.xml.in.h:114
 #: ../comps-fc7.xml.in.h:121
@@ -1811,7 +1803,7 @@
 #: ../comps-fc7.xml.in.h:128
 #: ../comps-rhel5-client-workstation.xml.in.h:40
 msgid "The Eclipse Integrated Development Environment."
-msgstr ""
+msgstr "Mjedisi i Integruar Zhvillimesh Eclipse."
 
 #: ../comps-fc6.xml.in.h:125
 #: ../comps-fc7.xml.in.h:133
@@ -1819,12 +1811,12 @@
 #: ../comps-rhel5-client-workstation.xml.in.h:42
 #: ../comps-rhel5-server-core.xml.in.h:115
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
-msgstr ""
+msgstr "K??to paketa ju lejojn?? t?? form??soni nj?? sh??rbyes poste IMAP ose SMTP."
 
 #: ../comps-fc6.xml.in.h:129
 #: ../comps-fc7.xml.in.h:138
 msgid "These packages provide a virtualization environment."
-msgstr ""
+msgstr "k??to paketa ofrojn?? nj?? mjedis virtualizimesh."
 
 #: ../comps-fc6.xml.in.h:130
 #: ../comps-fc7.xml.in.h:139
@@ -1836,12 +1828,12 @@
 #: ../comps-rhel5-client-core.xml.in.h:126
 #: ../comps-rhel5-server-core.xml.in.h:120
 msgid "These packages provide support for various locales including fonts and input methods."
-msgstr ""
+msgstr "K??to paketa ofrjn?? asistenc?? p??r vendore t?? ndryshme, p??rfshi g??rma dhe metoda dh??niesh teksti."
 
 #: ../comps-fc6.xml.in.h:132
 #: ../comps-fc7.xml.in.h:141
 msgid "These tools allow you to create documents in the DocBook format and convert them into HTML, PDF, Postscript, and text."
-msgstr ""
+msgstr "These tools allow you to create documents in the DocBook format and convert them into HTML, PDF, Postscript, and text.K??to mjete ju lejojn?? t?? krijoni dokumenta n?? formatin DocBook dhe shnd??rrimin e tyre n?? HTML, PDF, Postscript, apo tekst."
 
 #: ../comps-fc6.xml.in.h:149
 #: ../comps-fc7.xml.in.h:160
@@ -1860,7 +1852,7 @@
 #: ../comps-rhel5-client-core.xml.in.h:146
 #: ../comps-rhel5-server-core.xml.in.h:140
 msgid "Various core pieces of the system."
-msgstr ""
+msgstr "Pjes?? t?? ndryshme baz?? t?? sistemit."
 
 #: ../comps-fc6.xml.in.h:155
 #: ../comps-fc7.xml.in.h:166
@@ -1919,15 +1911,15 @@
 
 #: ../comps-fc7.xml.in.h:66
 msgid "Install these packages in order to develop GTK+ and XFCE graphical applications."
-msgstr ""
+msgstr "Instalojini k??to paketa p??r t?? mundur t?? zhvilloni zbatime grafike GTK+ dhe XFCE."
 
 #: ../comps-fc7.xml.in.h:108
 msgid "Simple window managers that aren't part of a larger desktop environment."
-msgstr ""
+msgstr "P??rgjegj??sa t?? thjesht?? dritaresh, q?? nuk jan?? pjes?? e ndonj?? mjedisi desktop m?? t?? gjer??."
 
 #: ../comps-fc7.xml.in.h:135
 msgid "These packages are helpful when developing web applications or web pages."
-msgstr ""
+msgstr "K??to paketa hyjn?? n?? pun?? kur zhvillohen zbatime web ose faqe web."
 
 #: ../comps-fc7.xml.in.h:153
 msgid "This group is a collection of tools and resources of Armenian environments."
@@ -1984,23 +1976,23 @@
 
 #: ../comps-rhel4-docs-dvd.xml.in.h:16
 msgid "This group contains the Red Hat Enterprise Linux documentation in the Bengali language."
-msgstr ""
+msgstr "Ky grup p??rmban dokumentimin e Red Hat Enterprise Linux-it n?? gjuh??n Bengale."
 
 #: ../comps-rhel4-docs-dvd.xml.in.h:21
 msgid "This group contains the Red Hat Enterprise Linux documentation in the Gujarati language."
-msgstr ""
+msgstr "Ky grup p??rmban dokumentimin e Red Hat Enterprise Linux-it n?? gjuh??n Gujarati."
 
 #: ../comps-rhel4-docs-dvd.xml.in.h:22
 msgid "This group contains the Red Hat Enterprise Linux documentation in the Hindi language."
-msgstr ""
+msgstr "Ky grup p??rmban dokumentimin e Red Hat Enterprise Linux-it n?? gjuh??n Hindi."
 
 #: ../comps-rhel4-docs-dvd.xml.in.h:26
 msgid "This group contains the Red Hat Enterprise Linux documentation in the Punjabi language."
-msgstr ""
+msgstr "Ky grup p??rmban dokumentimin e Red Hat Enterprise Linux-it n?? gjuh??n Punxhabe."
 
 #: ../comps-rhel4-docs-dvd.xml.in.h:29
 msgid "This group contains the Red Hat Enterprise Linux documentation in the Tamil language."
-msgstr ""
+msgstr "Ky grup p??rmban dokumentimin e Red Hat Enterprise Linux-it n?? gjuh??n Tamile."
 
 #: ../comps-rhel5-client-core.xml.in.h:4
 #: ../comps-rhel5-server-core.xml.in.h:4
@@ -2069,7 +2061,7 @@
 #: ../comps-rhel5-client-supplementary.xml.in.h:8
 #: ../comps-rhel5-server-supplementary.xml.in.h:8
 msgid "Packages which provide additional functionality for Red Hat Enterprise Linux"
-msgstr ""
+msgstr "Paketa q?? ofrojn?? funksione shtes?? p??r Red Hat Enterprise Linux-in"
 
 #: ../comps-rhel5-client-supplementary.xml.in.h:9
 #: ../comps-rhel5-server-supplementary.xml.in.h:9



From petersen at fedoraproject.org  Fri Sep 26 06:50:26 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 26 Sep 2008 06:50:26 +0000 (UTC)
Subject: rpms/emacspeak/devel emacspeak.spec,1.25,1.26
Message-ID: <20080926065026.150607010C@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/emacspeak/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17743

Modified Files:
	emacspeak.spec 
Log Message:
- fix broken generated deps reported by mtasaka (#463899)
- script the replacement of tcl with tclsh to fix missing dtk-soft
- replace python2.4 with python in HTTPSpeaker.py



Index: emacspeak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/devel/emacspeak.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- emacspeak.spec	25 Sep 2008 02:32:02 -0000	1.25
+++ emacspeak.spec	26 Sep 2008 06:49:55 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: emacspeak -- The Complete Audio Desktop
 Name: emacspeak
 Version: 28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 # main lisp files are GPL2+
 # lisp/atom-blogger and lisp/g-client are BSD
 License: GPLv2+ and BSD
@@ -35,9 +35,11 @@
 %patch0 -p1 -b .0-infodir
 %patch1 -p1 -b .1-httpd
 
+for i in `find . -type f -exec grep -q /usr/bin/tcl$ '{}' ';' -print` ; do
+  sed -i -e "s%#!/usr/bin/tcl$%#!/usr/bin/tclsh\npackage require Tclx%" $i
+done
 
-sed -i -e "s%#!/usr/bin/tcl$%#!/usr/bin/tclsh\npackage require Tclx%" \
-  servers/{dtk-exp,espeak,outloud,speech-server,ssh-dtk-exp,ssh-outloud}
+sed -i -e "s%#!/usr/bin/python2.4$%#!/usr/bin/python%" servers/python/HTTPSpeaker.py
 
 %build
 make  config SRC=`pwd`
@@ -73,6 +75,11 @@
 %{_infodir}/*
 
 %changelog
+* Fri Sep 26 2008 Jens Petersen <petersen at redhat.com> - 28.0-2
+- fix broken deps reported by mtasaka (#463899)
+- script the replacement of tcl with tclsh to fix missing dtk-soft
+- replace python2.4 with python in HTTPSpeaker.py
+
 * Thu Sep 25 2008 Jens Petersen <petersen at redhat.com> - 28.0-1
 - update to 28.0 with emacspeak-28.0-no-httpd.patch
 - replace emacspeak-tcl-pkgreq-tclx.patch with sed



From petersen at fedoraproject.org  Fri Sep 26 07:05:32 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 26 Sep 2008 07:05:32 +0000 (UTC)
Subject: rpms/emacspeak/devel emacspeak.spec,1.26,1.27
Message-ID: <20080926070532.E18777010C@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/emacspeak/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19579

Modified Files:
	emacspeak.spec 
Log Message:
improve last changelog text


Index: emacspeak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/devel/emacspeak.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- emacspeak.spec	26 Sep 2008 06:49:55 -0000	1.26
+++ emacspeak.spec	26 Sep 2008 07:05:02 -0000	1.27
@@ -76,7 +76,7 @@
 
 %changelog
 * Fri Sep 26 2008 Jens Petersen <petersen at redhat.com> - 28.0-2
-- fix broken deps reported by mtasaka (#463899)
+- fix broken generated deps reported by mtasaka (#463899)
 - script the replacement of tcl with tclsh to fix missing dtk-soft
 - replace python2.4 with python in HTTPSpeaker.py
 



From petersen at fedoraproject.org  Fri Sep 26 07:14:44 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 26 Sep 2008 07:14:44 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.45,1.46
Message-ID: <20080926071444.716507010C@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20774

Modified Files:
	ghc.spec 
Log Message:
bring back %package_debugging for bos since it does "more" than --short-circuit



Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ghc.spec	24 Sep 2008 08:03:22 -0000	1.45
+++ ghc.spec	26 Sep 2008 07:14:14 -0000	1.46
@@ -2,6 +2,18 @@
 %define build_prof 1
 %define build_doc 1
 
+# Fixing packaging problems can be a tremendous pain because it
+# generally requires a complete rebuild, which takes hours.  To offset
+# the misery, do a complete build once using "rpmbuild -bc", then copy
+# your built tree to a directory of the same name suffixed with
+# ".built", using "cp -al".  Finally, set this variable, and it will
+# copy the already-built tree into place during build instead of
+# actually doing the build.
+#
+# Obviously, this can only work if you leave the build section
+# completely untouched between builds.
+%define package_debugging 0
+
 Name:		ghc
 Version:	6.8.3
 Release:	5%{?dist}
@@ -69,6 +81,15 @@
 %patch0 -p1 -b .0-haddock~
 
 %build
+# hack for building a local test package quickly from a prebuilt tree 
+%if %{package_debugging}
+pushd ..
+rm -rf %{name}-%{version}
+cp -al %{name}-%{version}.built %{name}-%{version}
+popd
+exit 0
+%endif
+
 %if !%{build_prof}
 echo "GhcLibWays=" >> mk/build.mk
 echo "GhcRTSWays=thr debug" >> mk/build.mk



From jnovy at fedoraproject.org  Fri Sep 26 07:40:26 2008
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 26 Sep 2008 07:40:26 +0000 (UTC)
Subject: rpms/nedit/devel nedit-5.5-security.patch, NONE, 1.1 nedit.spec,
	1.18, 1.19 nedit-5.4-security.patch, 1.1, NONE
Message-ID: <20080926074026.2FEB87010C@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/nedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23502

Modified Files:
	nedit.spec 
Added Files:
	nedit-5.5-security.patch 
Removed Files:
	nedit-5.4-security.patch 
Log Message:
* Fri Sep 26 2008 Jindrich Novy <jnovy at redhat.com> 5.5-19
- rediff security patch to be applicable with zero fuzz


nedit-5.5-security.patch:

--- NEW FILE nedit-5.5-security.patch ---
diff -up nedit-5.5/source/file.c.orig nedit-5.5/source/file.c
--- nedit-5.5/source/file.c.orig	2004-08-24 11:37:24.000000000 +0200
+++ nedit-5.5/source/file.c	2008-09-26 09:33:53.000000000 +0200
@@ -1314,7 +1314,7 @@ void PrintWindow(WindowInfo *window, int
 */
 void PrintString(const char *string, int length, Widget parent, const char *jobName)
 {
-    char tmpFileName[L_tmpnam];    /* L_tmpnam defined in stdio.h */
+    char *tmpFileName=strdup("/tmp/neditXXXXXX");
     FILE *fp;
     int fd;
 
@@ -1325,14 +1325,10 @@ void PrintString(const char *string, int
 	    1. Create a filename
 	    2. Open the file with the O_CREAT|O_EXCL flags
 	So all an attacker can do is a DoS on the print function. */
-    tmpnam(tmpFileName);
+    fd = mkstemp(tmpFileName);
 
     /* open the temporary file */
-#ifdef VMS
-    if ((fp = fopen(tmpFileName, "w", "rfm = stmlf")) == NULL)
-#else
-    if ((fd = open(tmpFileName, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR | S_IWUSR)) < 0 || (fp = fdopen(fd, "w")) == NULL)
-#endif /* VMS */
+    if ((fp = fdopen(fd, "w")) == NULL)
     {
         DialogF(DF_WARN, parent, 1, "Error while Printing",
                 "Unable to write file for printing:\n%s", "OK",
@@ -1346,7 +1342,7 @@ void PrintString(const char *string, int
     
     /* write to the file */
 #ifdef IBM_FWRITE_BUG
-    write(fileno(fp), string, length);
+    write(fd, string, length);
 #else
     fwrite(string, sizeof(char), length, fp);
 #endif
@@ -1356,6 +1352,7 @@ void PrintString(const char *string, int
                 "%s not printed:\n%s", "OK", jobName, errorString());
         fclose(fp); /* should call close(fd) in turn! */
         remove(tmpFileName);
+	free(tmpFileName);
         return;
     }
     
@@ -1366,6 +1363,7 @@ void PrintString(const char *string, int
                 "Error closing temp. print file:\n%s", "OK",
                 errorString());
         remove(tmpFileName);
+	free(tmpFileName);
         return;
     }
 
@@ -1377,6 +1375,7 @@ void PrintString(const char *string, int
     PrintFile(parent, tmpFileName, jobName);
     remove(tmpFileName);
 #endif /*VMS*/
+    free(tmpFileName);
     return;
 }
 


Index: nedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nedit/devel/nedit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nedit.spec	25 Feb 2008 06:16:55 -0000	1.18
+++ nedit.spec	26 Sep 2008 07:39:55 -0000	1.19
@@ -1,11 +1,11 @@
 Summary: A GUI text editor for systems with X
 Name: nedit
 Version: 5.5
-Release: 18%{?dist}
+Release: 19%{?dist}
 Source: http://nedit.org/ftp/v5_5/nedit-%{version}-src.tar.bz2
 Source1: nedit.desktop
 Source2: nedit-icon.png
-Patch0: nedit-5.4-security.patch
+Patch0: nedit-5.5-security.patch
 Patch1: nedit-5.4-makefiles.patch
 Patch2: nedit-5.5-utf8.patch
 Patch3: nedit-5.5-motif223.patch
@@ -86,6 +86,9 @@
 %{_datadir}/icons/hicolor/
 
 %changelog
+* Fri Sep 26 2008 Jindrich Novy <jnovy at redhat.com> 5.5-19
+- rediff security patch to be applicable with zero fuzz
+
 * Mon Feb 25 2008 Jindrich Novy <jnovy at redhat.com> 5.5-18
 - manual rebuild because of gcc-4.3 (#434192)
 


--- nedit-5.4-security.patch DELETED ---



From petersen at fedoraproject.org  Fri Sep 26 08:28:57 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 26 Sep 2008 08:28:57 +0000 (UTC)
Subject: rpms/emacspeak/devel emacspeak-28.0-tmpfile.patch, NONE,
	1.1 emacspeak.spec, 1.27, 1.28
Message-ID: <20080926082857.6E31D7010C@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/emacspeak/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28007

Modified Files:
	emacspeak.spec 
Added Files:
	emacspeak-28.0-tmpfile.patch 
Log Message:
- (CVE-2008-4191) fix tmpfile vulnerability in extract-table.pl with
  emacspeak-28.0-tmpfile.patch from upstream svn (#463821)


emacspeak-28.0-tmpfile.patch:

--- NEW FILE emacspeak-28.0-tmpfile.patch ---
diff -up emacspeak-28.0/etc/extract-table.pl.tmpfile emacspeak-28.0/etc/extract-table.pl
--- emacspeak-28.0/etc/extract-table.pl.tmpfile	2007-05-04 11:08:59.000000000 +1000
+++ emacspeak-28.0/etc/extract-table.pl	2008-09-26 17:50:05.000000000 +1000
@@ -1,36 +1,36 @@
 #!/usr/bin/perl -w
-#$Id: extract-table.pl 4047 2006-08-11 19:11:17Z tv.raman.tv $
+#$Id: extract-table.pl 5842 2008-08-25 18:54:14Z tv.raman.tv $
 # Accepts a URI and table spec
-#returns a csv file
+#returns csv output on STDOUT 
 use strict;
 use FileHandle;
 use LWP::UserAgent;
 use HTML::TableExtract;
 use IO::File;
+use File::Temp qw(tempfile);
 use Getopt::Long;
 use vars qw (%options);
-my ($url, $file, $task, $depth, $count, $cols);
+my ($url, $file, $depth, $count, $cols);
 
-my %options = (task => \$task,
-           url => \$url,
-file => \$file,
-           depth => \$depth,
-count => \$count,
-headers => \$cols);
+my %options = (
+    url => \$url,
+    file => \$file,
+    depth => \$depth,
+    count => \$count,
+    headers => \$cols);
 GetOptions (\%options,
             'file=s',
             'url=s',
-            'task=s',
             'depth=i',
             'count=i',
             'headers=s');
-$task ||= "extract-table";
-my $input;
+
+my ($input, $inputname);
 if (defined ($file)) {
   $input = $file;
 } else {
-  $input="/tmp/$options{task}.html";
-  RetrieveURLToFile($url, $input);
+    ($input, $inputname) = tempfile(suffix=>'.html');
+  RetrieveURLToFile($url, $inputname);
 }
 
 my $te;
@@ -41,8 +41,9 @@ if ( defined ($cols)) {
  $te = new HTML::TableExtract( depth => $depth, count=>$count); 
 }
 $te->parse_file($input);
-my $output = new FileHandle (">  /tmp/$task.csv");
+
 my ($ts,$row);
+my $output =\*STDOUT;
 foreach $ts ($te->table_states) {
           foreach $row ($ts->rows) {
              $output->print ( join(',', @$row), "\n");
@@ -52,7 +53,7 @@ foreach $ts ($te->table_states) {
 $output->close();
 
 if (defined ($url)) {
-  unlink ($input);
+  unlink ($inputname);
 }
 # {{{  retrieve URL to file
 
@@ -64,9 +65,8 @@ sub RetrieveURLToFile {
   # Pass request to the user agent and get a response back
   my $res = $ua->request($req, $filename);
   if ($res->is_success()) {
-    warn"table: Retrieved $url to $filename\n";
   } elsif ($res->is_error()) {
-    exit ("Retrieval for $url failed\n");
+      die ("Retrieval failed  for $url");
   }
 }
 


Index: emacspeak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/devel/emacspeak.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- emacspeak.spec	26 Sep 2008 07:05:02 -0000	1.27
+++ emacspeak.spec	26 Sep 2008 08:28:27 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: emacspeak -- The Complete Audio Desktop
 Name: emacspeak
 Version: 28.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 # main lisp files are GPL2+
 # lisp/atom-blogger and lisp/g-client are BSD
 License: GPLv2+ and BSD
@@ -18,6 +18,7 @@
 Requires: emacs, tclx
 Patch0: emacspeak-15.0-fixpref.patch
 Patch1: emacspeak-28.0-no-httpd.patch
+Patch2: emacspeak-28.0-tmpfile.patch
 
 %description 
 Emacspeak is a speech interface that allows visually impaired users to
@@ -34,6 +35,7 @@
 %setup -q
 %patch0 -p1 -b .0-infodir
 %patch1 -p1 -b .1-httpd
+%patch2 -p1 -b .tmpfile
 
 for i in `find . -type f -exec grep -q /usr/bin/tcl$ '{}' ';' -print` ; do
   sed -i -e "s%#!/usr/bin/tcl$%#!/usr/bin/tclsh\npackage require Tclx%" $i
@@ -75,6 +77,10 @@
 %{_infodir}/*
 
 %changelog
+* Fri Sep 26 2008 Jens Petersen <petersen at redhat.com> - 28.0-3
+- (CVE-2008-4191) fix tmpfile vulnerability in extract-table.pl with
+  emacspeak-28.0-tmpfile.patch from upstream svn (#463821)
+
 * Fri Sep 26 2008 Jens Petersen <petersen at redhat.com> - 28.0-2
 - fix broken generated deps reported by mtasaka (#463899)
 - script the replacement of tcl with tclsh to fix missing dtk-soft



From petersen at fedoraproject.org  Fri Sep 26 09:22:36 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 26 Sep 2008 09:22:36 +0000 (UTC)
Subject: rpms/emacspeak/F-9 .cvsignore, 1.8, 1.9 emacspeak-15.0-fixpref.patch,
	1.1, 1.2 emacspeak.spec, 1.23, 1.24 sources, 1.8, 1.9
Message-ID: <20080926092236.E95337010C@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/emacspeak/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv603

Modified Files:
	.cvsignore emacspeak-15.0-fixpref.patch emacspeak.spec sources 
Log Message:
Backport from devel branch:

- (CVE-2008-4191) fix tmpfile vulnerability in extract-table.pl with
  emacspeak-28.0-tmpfile.patch from upstream svn (#463820)

* Fri Sep 26 2008 Jens Petersen <petersen at redhat.com> - 28.0-2
- fix broken generated deps reported by mtasaka (#463899)
- script the replacement of tcl with tclsh to fix missing dtk-soft
- replace python2.4 with python in HTTPSpeaker.py

* Thu Sep 25 2008 Jens Petersen <petersen at redhat.com> - 28.0-1
- update to 28.0 with emacspeak-28.0-no-httpd.patch
- replace emacspeak-tcl-pkgreq-tclx.patch with sed
- emacspeak-no-linux-espeak.patch no longer needed
- update emacspeak-15.0-fixpref.patch for patch fuzz




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 May 2007 03:56:49 -0000	1.8
+++ .cvsignore	26 Sep 2008 09:22:06 -0000	1.9
@@ -1,2 +1 @@
-emacspeak-25.tar.bz2
-emacspeak-26.tar.bz2
+emacspeak-28.0.tar.bz2

emacspeak-15.0-fixpref.patch:

Index: emacspeak-15.0-fixpref.patch
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/F-9/emacspeak-15.0-fixpref.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacspeak-15.0-fixpref.patch	9 Sep 2004 04:30:41 -0000	1.1
+++ emacspeak-15.0-fixpref.patch	26 Sep 2008 09:22:06 -0000	1.2
@@ -1,11 +1,12 @@
---- emacspeak-15.0/info/Makefile.fixpref	Tue Mar  5 12:33:18 2002
-+++ emacspeak-15.0/info/Makefile	Tue Mar  5 12:34:00 2002
-@@ -11,7 +11,7 @@
+diff -up emacspeak-28.0/info/Makefile.orig emacspeak-28.0/info/Makefile
+--- emacspeak-28.0/info/Makefile.orig	2007-05-04 11:08:58.000000000 +1000
++++ emacspeak-28.0/info/Makefile	2008-09-25 09:47:25.000000000 +1000
+@@ -28,7 +28,7 @@ options.texi:  
  
  install: emacspeak.info
  	if test  -x /sbin/install-info ; then \
 -		install-info emacspeak.info /etc/info-dir; \
 +		install-info emacspeak.info $(infodir)/info-dir; \
  	fi
- 	$(INSTALL)  -m 644 emacspeak.info* $(infodir)
+ 	$(INSTALL)  -m 644 *.info* $(infodir)
  


Index: emacspeak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/F-9/emacspeak.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- emacspeak.spec	4 Oct 2007 06:35:09 -0000	1.23
+++ emacspeak.spec	26 Sep 2008 09:22:06 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: emacspeak -- The Complete Audio Desktop
 Name: emacspeak
-Version: 26
+Version: 28.0
 Release: 3%{?dist}
 # main lisp files are GPL2+
 # lisp/atom-blogger and lisp/g-client are BSD
@@ -17,8 +17,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: emacs, tclx
 Patch0: emacspeak-15.0-fixpref.patch
-Patch1: emacspeak-tcl-pkgreq-tclx.patch
-Patch2: emacspeak-no-linux-espeak.patch
+Patch1: emacspeak-28.0-no-httpd.patch
+Patch2: emacspeak-28.0-tmpfile.patch
 
 %description 
 Emacspeak is a speech interface that allows visually impaired users to
@@ -32,31 +32,30 @@
 opens up the Internet to visually impaired users around the world.
 
 %prep
-%setup -q -n %{name}-%{version}.0
-%patch0 -p1
-%patch1 -p1 -b .1-tclx
-%patch2 -p1 -b .2-espeak
+%setup -q
+%patch0 -p1 -b .0-infodir
+%patch1 -p1 -b .1-httpd
+%patch2 -p1 -b .tmpfile
+
+for i in `find . -type f -exec grep -q /usr/bin/tcl$ '{}' ';' -print` ; do
+  sed -i -e "s%#!/usr/bin/tcl$%#!/usr/bin/tclsh\npackage require Tclx%" $i
+done
 
+sed -i -e "s%#!/usr/bin/python2.4$%#!/usr/bin/python%" servers/python/HTTPSpeaker.py
 
 %build
 make  config SRC=`pwd`
 make
 
-
 %install
 rm -rf %{buildroot}
-# make sure install-info is in path
-export PATH=$PATH:/sbin
-#mkdir -p %{buildroot}%{_infodir}
 make install prefix=%{buildroot}%{_prefix} infodir=%{buildroot}%{_infodir}
 rm -f %{buildroot}%{_infodir}/*dir
-#rm %{buildroot}%{_infodir}/*.gz
-perl -pi -e "s|%{buildroot}||g" %{buildroot}%{_bindir}/emacspeak
+sed -i -e "s|%{buildroot}||g" %{buildroot}%{_bindir}/emacspeak
  
 rm %{buildroot}%{_datadir}/emacs/site-lisp/emacspeak/{.nosearch,sounds/emacspeak.mp3}
 rm -r %{buildroot}%{_datadir}/emacs/site-lisp/emacspeak/{realaudio,shoutcast}
 
-
 %post
 /sbin/install-info %{_infodir}/emacspeak.info.gz %{_infodir}/dir --section "Accessibility" || :
 
@@ -78,7 +77,22 @@
 %{_infodir}/*
 
 %changelog
-* Thu Oct  4 2007 Jens Petersen <petersen at redhat.com> - 26-3
+* Fri Sep 26 2008 Jens Petersen <petersen at redhat.com> - 28.0-3
+- (CVE-2008-4191) fix tmpfile vulnerability in extract-table.pl with
+  emacspeak-28.0-tmpfile.patch from upstream svn (#463820)
+
+* Fri Sep 26 2008 Jens Petersen <petersen at redhat.com> - 28.0-2
+- fix broken generated deps reported by mtasaka (#463899)
+- script the replacement of tcl with tclsh to fix missing dtk-soft
+- replace python2.4 with python in HTTPSpeaker.py
+
+* Thu Sep 25 2008 Jens Petersen <petersen at redhat.com> - 28.0-1
+- update to 28.0 with emacspeak-28.0-no-httpd.patch
+- replace emacspeak-tcl-pkgreq-tclx.patch with sed
+- emacspeak-no-linux-espeak.patch no longer needed
+- update emacspeak-15.0-fixpref.patch for patch fuzz
+
+* Thu Oct  4 2007 Jens Petersen <petersen at redhat.com> - 26-3.fc8
 - use requires instead of prereq for post and preun install-info
 
 * Mon Aug 13 2007 Jens Petersen <petersen at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 May 2007 03:56:49 -0000	1.8
+++ sources	26 Sep 2008 09:22:06 -0000	1.9
@@ -1 +1 @@
-808f7a96bdfaed769b987774f5201669  emacspeak-26.tar.bz2
+c64e3894b7d7b4eeffa12a896bd68f7c  emacspeak-28.0.tar.bz2



From petersen at fedoraproject.org  Fri Sep 26 09:26:41 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 26 Sep 2008 09:26:41 +0000 (UTC)
Subject: rpms/emacspeak/F-9 emacspeak-28.0-no-httpd.patch, NONE,
	1.1 emacspeak-28.0-tmpfile.patch, NONE, 1.1
Message-ID: <20080926092641.4B23C7010C@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/emacspeak/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1394

Added Files:
	emacspeak-28.0-no-httpd.patch emacspeak-28.0-tmpfile.patch 
Log Message:
add patches

emacspeak-28.0-no-httpd.patch:

--- NEW FILE emacspeak-28.0-no-httpd.patch ---
diff -u emacspeak-28.0/Makefile\~ emacspeak-28.0/Makefile
--- emacspeak-28.0/Makefile~	2008-01-28 11:13:27.000000000 +1000
+++ emacspeak-28.0/Makefile	2008-09-25 12:12:45.000000000 +1000
@@ -285,8 +285,6 @@
 	$(INSTALL)  -m 644 ${JS}  $(libdir)/js
 	$(INSTALL) -d $(libdir)/servers
 	$(INSTALL) -d $(libdir)/servers/python
-	$(INSTALL) -d $(libdir)/servers/httpd
-	$(INSTALL)  -m 644 ${TCLHTTPD}  $(libdir)/servers/tts.tcl
 	$(INSTALL) -d $(libdir)/servers/linux-outloud
 	$(INSTALL)  -m 755 ${OUTLOUD}  $(libdir)/servers/linux-outloud
 	cp   ${PYFILES}  $(libdir)/servers/python

emacspeak-28.0-tmpfile.patch:

--- NEW FILE emacspeak-28.0-tmpfile.patch ---
diff -up emacspeak-28.0/etc/extract-table.pl.tmpfile emacspeak-28.0/etc/extract-table.pl
--- emacspeak-28.0/etc/extract-table.pl.tmpfile	2007-05-04 11:08:59.000000000 +1000
+++ emacspeak-28.0/etc/extract-table.pl	2008-09-26 17:50:05.000000000 +1000
@@ -1,36 +1,36 @@
 #!/usr/bin/perl -w
-#$Id: extract-table.pl 4047 2006-08-11 19:11:17Z tv.raman.tv $
+#$Id: extract-table.pl 5842 2008-08-25 18:54:14Z tv.raman.tv $
 # Accepts a URI and table spec
-#returns a csv file
+#returns csv output on STDOUT 
 use strict;
 use FileHandle;
 use LWP::UserAgent;
 use HTML::TableExtract;
 use IO::File;
+use File::Temp qw(tempfile);
 use Getopt::Long;
 use vars qw (%options);
-my ($url, $file, $task, $depth, $count, $cols);
+my ($url, $file, $depth, $count, $cols);
 
-my %options = (task => \$task,
-           url => \$url,
-file => \$file,
-           depth => \$depth,
-count => \$count,
-headers => \$cols);
+my %options = (
+    url => \$url,
+    file => \$file,
+    depth => \$depth,
+    count => \$count,
+    headers => \$cols);
 GetOptions (\%options,
             'file=s',
             'url=s',
-            'task=s',
             'depth=i',
             'count=i',
             'headers=s');
-$task ||= "extract-table";
-my $input;
+
+my ($input, $inputname);
 if (defined ($file)) {
   $input = $file;
 } else {
-  $input="/tmp/$options{task}.html";
-  RetrieveURLToFile($url, $input);
+    ($input, $inputname) = tempfile(suffix=>'.html');
+  RetrieveURLToFile($url, $inputname);
 }
 
 my $te;
@@ -41,8 +41,9 @@ if ( defined ($cols)) {
  $te = new HTML::TableExtract( depth => $depth, count=>$count); 
 }
 $te->parse_file($input);
-my $output = new FileHandle (">  /tmp/$task.csv");
+
 my ($ts,$row);
+my $output =\*STDOUT;
 foreach $ts ($te->table_states) {
           foreach $row ($ts->rows) {
              $output->print ( join(',', @$row), "\n");
@@ -52,7 +53,7 @@ foreach $ts ($te->table_states) {
 $output->close();
 
 if (defined ($url)) {
-  unlink ($input);
+  unlink ($inputname);
 }
 # {{{  retrieve URL to file
 
@@ -64,9 +65,8 @@ sub RetrieveURLToFile {
   # Pass request to the user agent and get a response back
   my $res = $ua->request($req, $filename);
   if ($res->is_success()) {
-    warn"table: Retrieved $url to $filename\n";
   } elsif ($res->is_error()) {
-    exit ("Retrieval for $url failed\n");
+      die ("Retrieval failed  for $url");
   }
 }
 



From transif at fedoraproject.org  Fri Sep 26 09:32:16 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Fri, 26 Sep 2008 09:32:16 +0000 (UTC)
Subject: comps/po tg.po,1.8,1.9
Message-ID: <20080926093216.702947010C@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2009/po

Modified Files:
	tg.po 
Log Message:
    2008-09-26  Victor Ibragimov <victor.ibragimov at gmail.com> (via
tajikfedora at fedoraproject.org)
    
      * po/tg.po: Tajik Translation completed
    



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.8 -r 1.9 tg.po
Index: tg.po
===================================================================
RCS file: /cvs/pkgs/comps/po/tg.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tg.po	17 Sep 2008 22:44:37 -0000	1.8
+++ tg.po	26 Sep 2008 09:31:46 -0000	1.9
@@ -2,11 +2,10 @@
 msgstr ""
 "Project-Id-Version: Fedora Localization Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
+"POT-Creation-Date: 2008-09-24 03:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Victor Ibragimov <victor.ibragimov at gmail.com>\n"
-"Language-Team: Tajik Fedora & Software Localization Team <victor."
-"ibragimov at gmail.com>\n"
+"Language-Team: Tajik Fedora & Software Localization Team <victor.ibragimov at gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -15,187 +14,282 @@
 "X-Poedit-Country: TAJIKISTAN\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
+#: ../comps-f7.xml.in.h:1
+#: ../comps-f8.xml.in.h:1
+#: ../comps-f9.xml.in.h:1
 #: ../comps-f10.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:2 ../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:2
+#: ../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-f7.xml.in.h:3
+#: ../comps-f8.xml.in.h:3
+#: ../comps-f9.xml.in.h:3
 #: ../comps-f10.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "???????????????????? ???????????? ??????????????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
+#: ../comps-f7.xml.in.h:4
+#: ../comps-f8.xml.in.h:4
+#: ../comps-f9.xml.in.h:4
 #: ../comps-f10.xml.in.h:4
 msgid "Albanian Support"
 msgstr "???????????????????? ???????????? ??????????????????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../comps-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:5
+#: ../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-f7.xml.in.h:6
+#: ../comps-f8.xml.in.h:6
+#: ../comps-f9.xml.in.h:6
 #: ../comps-f10.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
 msgstr "?????????????????? ?????????? ???????????????? ???????????????????? ??????????????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../comps-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:7
+#: ../comps-el4.xml.in.h:4
+#: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "???????????????????? ???????????? ??????????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../comps-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:8
+#: ../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-f7.xml.in.h:9
+#: ../comps-f8.xml.in.h:9
+#: ../comps-f9.xml.in.h:9
 #: ../comps-f10.xml.in.h:9
 msgid "Assamese Support"
 msgstr "???????????????????? ???????????? ????????????????"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../comps-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:10
+#: ../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-f7.xml.in.h:11
+#: ../comps-f8.xml.in.h:11
+#: ../comps-f9.xml.in.h:11
 #: ../comps-f10.xml.in.h:11
 msgid "Base"
 msgstr "????????????"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-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:12
+#: ../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-f7.xml.in.h:13
+#: ../comps-f8.xml.in.h:13
+#: ../comps-f9.xml.in.h:13
 #: ../comps-f10.xml.in.h:13
 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-f7.xml.in.h:14
+#: ../comps-f8.xml.in.h:14
+#: ../comps-f9.xml.in.h:14
 #: ../comps-f10.xml.in.h:14
 msgid "Basque Support"
 msgstr "???????????????????? ???????????? ??????????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
+#: ../comps-f7.xml.in.h:15
+#: ../comps-f8.xml.in.h:15
+#: ../comps-f9.xml.in.h:15
 #: ../comps-f10.xml.in.h:15
 msgid "Belarusian Support"
 msgstr "???????????????????? ???????????? ????????????????"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
+#: ../comps-f7.xml.in.h:16
+#: ../comps-f8.xml.in.h:16
+#: ../comps-f9.xml.in.h:16
 #: ../comps-f10.xml.in.h:16
 msgid "Bengali Support"
 msgstr "???????????????????? ???????????? ??????????????"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
+#: ../comps-f7.xml.in.h:17
+#: ../comps-f8.xml.in.h:17
+#: ../comps-f9.xml.in.h:17
 #: ../comps-f10.xml.in.h:17
 msgid "Bhutanese Support"
 msgstr "???????????????????? ???????????? ????????????????"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
+#: ../comps-f7.xml.in.h:18
+#: ../comps-f8.xml.in.h:18
+#: ../comps-f9.xml.in.h:18
 #: ../comps-f10.xml.in.h:18
 msgid "Bosnian Support"
 msgstr "???????????????????? ???????????? ????????????????"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
+#: ../comps-f7.xml.in.h:19
+#: ../comps-f8.xml.in.h:19
+#: ../comps-f9.xml.in.h:19
 #: ../comps-f10.xml.in.h:19
 msgid "Brazilian Portuguese Support"
 msgstr "???????????????????? ???????????? ?????????????????????? ??????????????????"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
+#: ../comps-f7.xml.in.h:20
+#: ../comps-f8.xml.in.h:20
+#: ../comps-f9.xml.in.h:20
[...1846 lines suppressed...]
+#: ../comps-f10.xml.in.h:137
 msgid "SUGAR Desktop Environment"
 msgstr "???????????? ???????? ?????????? SUGAR"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:138
+#: ../comps-f9.xml.in.h:131
+#: ../comps-f10.xml.in.h:138
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR ???? ???????????? ???????? ??????????, ???? ?????????? OLPC XO ?????????? ?????????? ??????."
 
-#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:211
+#: ../comps-f9.xml.in.h:200
+#: ../comps-f10.xml.in.h:211
 msgid "Walloon Support"
 msgstr "???????????????????? ???????????? ????????????"
 
 #: ../comps-f10.xml.in.h:70
-#, fuzzy
 msgid "Haskell Development"
-msgstr "???????????????????????????? ?????????????????? ????????????????"
+msgstr "???????????????????????????? Haskell"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
@@ -1177,122 +1617,101 @@
 msgstr "???????????????????? ???????????? ???????????????? ?????????? ???????????? ?????????????? ??????????????????????."
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "???????????????????? ???????????? ??????????"
+msgstr "???????????????????? ???????????? ??????????????"
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "???????????????????? ???????????? ??????????????"
+msgstr "???????????????????? ???????????? ??????????????"
 
 #: ../comps-f10.xml.in.h:110
-#, fuzzy
 msgid "Maithili Support"
-msgstr "???????????????????? ???????????? ????????????"
+msgstr "???????????????????? ???????????? ??????????????"
 
 #: ../comps-f10.xml.in.h:117
-#, fuzzy
 msgid "Myanmar (Burmese) Support"
-msgstr "???????????????????? ???????????? ??????????????"
+msgstr "???????????????????? ???????????? ???????????? (??????????????)"
 
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "???????????????????? ???????????? ??????????"
+msgstr "???????????????????? ???????????? ????????????"
 
 #: ../comps-f10.xml.in.h:156
-#, fuzzy
 msgid "Support for developing programs in the Haskell programming language."
-msgstr "?????????????????? ?????????? ?????????????????? ???????????????????? Java."
+msgstr "?????????????????? ?????????? ?????????????????? ?????????????????? ?????? ?????????? Haskell."
 
 #: ../comps-f10.xml.in.h:163
 msgid "Tajik Support"
 msgstr "???????????????????? ???????????? ????????????"
 
 #: ../comps-f10.xml.in.h:205
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "???????????????????? ???????????? ????????"
+msgstr "???????????????????? ???????????? ????????????"
 
-#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
+#: ../comps-el4.xml.in.h:3
+#: ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "???????????????????? ?????????? ?????????????????? ??????????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12
+#: ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "???????????????????? ?????????????? 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 ""
-"GNOME ???? ???????????????????? ???????????????? ?????????????? ???????????????? ??????????????, ???? ?????????????????????? ???????????? "
-"??????????, ???????? ????????, ?????????????????? ?????????????????? ???? ???????????? ?????????????? ?????????????????? ?????? ?????? "
-"??????????????."
-
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
-msgid ""
-"KDE is a powerful, graphical user interface which includes a panel, desktop, "
-"system icons, and a graphical file manager."
-msgstr ""
-"KDE ???? ???????????????????? ???????????????? ?????????????? ???????????????? ??????????????, ???? ?????????????????????? ???????????? "
-"??????????, ???????? ????????, ?????????????????? ?????????????????? ???? ???????????? ?????????????? ?????????????????? ?????? ?????? "
-"??????????????."
-
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
-msgid ""
-"Sometimes called text editors, these are programs that allow you to create "
-"and edit files. These include Emacs and Vi."
-msgstr ""
-"???????????????????? ?????????? Emacs ???? Vi. ???????????????????? ?????????????? ????????. ???? ?????????????????? ???????????? "
-"????????????????, ?????????????? ?????????????? ???????? ???? ???????????? ??????????."
+#: ../comps-el4.xml.in.h:22
+#: ../comps-el5.xml.in.h:23
+msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "GNOME ???? ???????????????????? ???????????????? ?????????????? ???????????????? ??????????????, ???? ?????????????????????? ???????????? ??????????, ???????? ????????, ?????????????????? ?????????????????? ???? ???????????? ?????????????? ?????????????????? ?????? ?????? ??????????????."
+
+#: ../comps-el4.xml.in.h:35
+#: ../comps-el5.xml.in.h:35
+msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "KDE ???? ???????????????????? ???????????????? ?????????????? ???????????????? ??????????????, ???? ?????????????????????? ???????????? ??????????, ???????? ????????, ?????????????????? ?????????????????? ???? ???????????? ?????????????? ?????????????????? ?????? ?????? ??????????????."
+
+#: ../comps-el4.xml.in.h:44
+#: ../comps-el5.xml.in.h:44
+msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi."
+msgstr "???????????????????? ?????????? Emacs ???? Vi. ???????????????????? ?????????????? ????????. ???? ?????????????????? ???????????? ????????????????, ?????????????? ?????????????? ???????? ???? ???????????? ??????????."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50
+#: ../comps-el5.xml.in.h:48
 msgid "The XEmacs text editor."
 msgstr "???????????????????? ???????????? XEmacs"
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
-msgid ""
-"These tools allow you to create documentation in the DocBook format and "
-"convert them to HTML, PDF, Postscript, and text."
-msgstr ""
-"???? ?????????????????? ???????????? ????????????????, ???????????????? ?????? ?????????????? DocBook ???????? ?????????? ???? "
-"???????? ???? ?????????????????? HTML, PDF, Postscript, ???? ?????????? ???????? ???????????? ??????????."
+#: ../comps-el4.xml.in.h:54
+#: ../comps-el5.xml.in.h:52
+msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text."
+msgstr "???? ?????????????????? ???????????? ????????????????, ???????????????? ?????? ?????????????? DocBook ???????? ?????????? ???? ???????? ???? ?????????????????? HTML, PDF, Postscript, ???? ?????????? ???????? ???????????? ??????????."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64
+#: ../comps-el5.xml.in.h:62
 msgid "This group is a collection of network servers for specific purposes"
-msgstr ""
-"???? ?????????? ?????????? ?????????????? ???????????????????????? ???????????????? ?????????? ?????????????????? ???????????? ??????????????."
+msgstr "???? ?????????? ?????????? ?????????????? ???????????????????????? ???????????????? ?????????? ?????????????????? ???????????? ??????????????."
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
-msgstr ""
-"???? ?????????? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ?????????? ??????????????."
-
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
-msgstr ""
-"???? ?????????? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ?????????? ??????????????."
-
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
-msgstr ""
-"???? ?????????? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ?????????? ??????????????."
+#: ../comps-el4.xml.in.h:65
+#: ../comps-el5.xml.in.h:63
+msgid "This group is a collection of tools and resources of Arabic environments."
+msgstr "???? ?????????? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ?????????? ??????????????."
+
+#: ../comps-el4.xml.in.h:67
+#: ../comps-el5.xml.in.h:66
+msgid "This group is a collection of tools and resources of Hebrew environments."
+msgstr "???? ?????????? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ?????????? ??????????????."
+
+#: ../comps-el4.xml.in.h:68
+#: ../comps-el5.xml.in.h:67
+msgid "This group is a collection of tools and resources of Japanese environments."
+msgstr "???? ?????????? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ?????????? ??????????????."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77
+#: ../comps-el5.xml.in.h:77
 msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
-msgstr ""
-"???? ?????????? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ???????? ??????????????."
+msgid "This group is a collection of tools and resources of Czech environments."
+msgstr "???? ?????????? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ???????? ??????????????."
 
 #~ msgid "Haskell"
 #~ msgstr "Haskell"
+



From petersen at fedoraproject.org  Fri Sep 26 09:32:54 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 26 Sep 2008 09:32:54 +0000 (UTC)
Subject: rpms/emacspeak/F-9 emacspeak-no-linux-espeak.patch, 1.1,
	NONE emacspeak-tcl-pkgreq-tclx.patch, 1.5, NONE
Message-ID: <20080926093254.2C8607010C@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/emacspeak/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2160

Removed Files:
	emacspeak-no-linux-espeak.patch 
	emacspeak-tcl-pkgreq-tclx.patch 
Log Message:
remove old patches


--- emacspeak-no-linux-espeak.patch DELETED ---


--- emacspeak-tcl-pkgreq-tclx.patch DELETED ---



From petersen at fedoraproject.org  Fri Sep 26 09:36:20 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 26 Sep 2008 09:36:20 +0000 (UTC)
Subject: rpms/emacspeak/F-8 emacspeak-28.0-no-httpd.patch, NONE,
	1.1 emacspeak-28.0-tmpfile.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 emacspeak-15.0-fixpref.patch, 1.1, 1.2 emacspeak.spec, 1.23,
	1.24 sources, 1.8, 1.9 emacspeak-no-linux-espeak.patch, 1.1,
	NONE emacspeak-tcl-pkgreq-tclx.patch, 1.5, NONE
Message-ID: <20080926093620.9556A7010C@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/emacspeak/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2337

Modified Files:
	.cvsignore emacspeak-15.0-fixpref.patch emacspeak.spec sources 
Added Files:
	emacspeak-28.0-no-httpd.patch emacspeak-28.0-tmpfile.patch 
Removed Files:
	emacspeak-no-linux-espeak.patch 
	emacspeak-tcl-pkgreq-tclx.patch 
Log Message:
Backport from devel:

* Fri Sep 26 2008 Jens Petersen <petersen at redhat.com> - 28.0-3
- (CVE-2008-4191) fix tmpfile vulnerability in extract-table.pl with
  emacspeak-28.0-tmpfile.patch from upstream svn (#463819)

* Fri Sep 26 2008 Jens Petersen <petersen at redhat.com> - 28.0-2
- fix broken generated deps reported by mtasaka (#463899)
- script the replacement of tcl with tclsh to fix missing dtk-soft
- replace python2.4 with python in HTTPSpeaker.py

* Thu Sep 25 2008 Jens Petersen <petersen at redhat.com> - 28.0-1
- update to 28.0 with emacspeak-28.0-no-httpd.patch
- replace emacspeak-tcl-pkgreq-tclx.patch with sed
- emacspeak-no-linux-espeak.patch no longer needed
- update emacspeak-15.0-fixpref.patch for patch fuzz



emacspeak-28.0-no-httpd.patch:

--- NEW FILE emacspeak-28.0-no-httpd.patch ---
diff -u emacspeak-28.0/Makefile\~ emacspeak-28.0/Makefile
--- emacspeak-28.0/Makefile~	2008-01-28 11:13:27.000000000 +1000
+++ emacspeak-28.0/Makefile	2008-09-25 12:12:45.000000000 +1000
@@ -285,8 +285,6 @@
 	$(INSTALL)  -m 644 ${JS}  $(libdir)/js
 	$(INSTALL) -d $(libdir)/servers
 	$(INSTALL) -d $(libdir)/servers/python
-	$(INSTALL) -d $(libdir)/servers/httpd
-	$(INSTALL)  -m 644 ${TCLHTTPD}  $(libdir)/servers/tts.tcl
 	$(INSTALL) -d $(libdir)/servers/linux-outloud
 	$(INSTALL)  -m 755 ${OUTLOUD}  $(libdir)/servers/linux-outloud
 	cp   ${PYFILES}  $(libdir)/servers/python

emacspeak-28.0-tmpfile.patch:

--- NEW FILE emacspeak-28.0-tmpfile.patch ---
diff -up emacspeak-28.0/etc/extract-table.pl.tmpfile emacspeak-28.0/etc/extract-table.pl
--- emacspeak-28.0/etc/extract-table.pl.tmpfile	2007-05-04 11:08:59.000000000 +1000
+++ emacspeak-28.0/etc/extract-table.pl	2008-09-26 17:50:05.000000000 +1000
@@ -1,36 +1,36 @@
 #!/usr/bin/perl -w
-#$Id: extract-table.pl 4047 2006-08-11 19:11:17Z tv.raman.tv $
+#$Id: extract-table.pl 5842 2008-08-25 18:54:14Z tv.raman.tv $
 # Accepts a URI and table spec
-#returns a csv file
+#returns csv output on STDOUT 
 use strict;
 use FileHandle;
 use LWP::UserAgent;
 use HTML::TableExtract;
 use IO::File;
+use File::Temp qw(tempfile);
 use Getopt::Long;
 use vars qw (%options);
-my ($url, $file, $task, $depth, $count, $cols);
+my ($url, $file, $depth, $count, $cols);
 
-my %options = (task => \$task,
-           url => \$url,
-file => \$file,
-           depth => \$depth,
-count => \$count,
-headers => \$cols);
+my %options = (
+    url => \$url,
+    file => \$file,
+    depth => \$depth,
+    count => \$count,
+    headers => \$cols);
 GetOptions (\%options,
             'file=s',
             'url=s',
-            'task=s',
             'depth=i',
             'count=i',
             'headers=s');
-$task ||= "extract-table";
-my $input;
+
+my ($input, $inputname);
 if (defined ($file)) {
   $input = $file;
 } else {
-  $input="/tmp/$options{task}.html";
-  RetrieveURLToFile($url, $input);
+    ($input, $inputname) = tempfile(suffix=>'.html');
+  RetrieveURLToFile($url, $inputname);
 }
 
 my $te;
@@ -41,8 +41,9 @@ if ( defined ($cols)) {
  $te = new HTML::TableExtract( depth => $depth, count=>$count); 
 }
 $te->parse_file($input);
-my $output = new FileHandle (">  /tmp/$task.csv");
+
 my ($ts,$row);
+my $output =\*STDOUT;
 foreach $ts ($te->table_states) {
           foreach $row ($ts->rows) {
              $output->print ( join(',', @$row), "\n");
@@ -52,7 +53,7 @@ foreach $ts ($te->table_states) {
 $output->close();
 
 if (defined ($url)) {
-  unlink ($input);
+  unlink ($inputname);
 }
 # {{{  retrieve URL to file
 
@@ -64,9 +65,8 @@ sub RetrieveURLToFile {
   # Pass request to the user agent and get a response back
   my $res = $ua->request($req, $filename);
   if ($res->is_success()) {
-    warn"table: Retrieved $url to $filename\n";
   } elsif ($res->is_error()) {
-    exit ("Retrieval for $url failed\n");
+      die ("Retrieval failed  for $url");
   }
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/F-8/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 May 2007 03:56:49 -0000	1.8
+++ .cvsignore	26 Sep 2008 09:35:50 -0000	1.9
@@ -1,2 +1 @@
-emacspeak-25.tar.bz2
-emacspeak-26.tar.bz2
+emacspeak-28.0.tar.bz2

emacspeak-15.0-fixpref.patch:

Index: emacspeak-15.0-fixpref.patch
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/F-8/emacspeak-15.0-fixpref.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacspeak-15.0-fixpref.patch	9 Sep 2004 04:30:41 -0000	1.1
+++ emacspeak-15.0-fixpref.patch	26 Sep 2008 09:35:50 -0000	1.2
@@ -1,11 +1,12 @@
---- emacspeak-15.0/info/Makefile.fixpref	Tue Mar  5 12:33:18 2002
-+++ emacspeak-15.0/info/Makefile	Tue Mar  5 12:34:00 2002
-@@ -11,7 +11,7 @@
+diff -up emacspeak-28.0/info/Makefile.orig emacspeak-28.0/info/Makefile
+--- emacspeak-28.0/info/Makefile.orig	2007-05-04 11:08:58.000000000 +1000
++++ emacspeak-28.0/info/Makefile	2008-09-25 09:47:25.000000000 +1000
+@@ -28,7 +28,7 @@ options.texi:  
  
  install: emacspeak.info
  	if test  -x /sbin/install-info ; then \
 -		install-info emacspeak.info /etc/info-dir; \
 +		install-info emacspeak.info $(infodir)/info-dir; \
  	fi
- 	$(INSTALL)  -m 644 emacspeak.info* $(infodir)
+ 	$(INSTALL)  -m 644 *.info* $(infodir)
  


Index: emacspeak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/F-8/emacspeak.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- emacspeak.spec	4 Oct 2007 06:35:09 -0000	1.23
+++ emacspeak.spec	26 Sep 2008 09:35:50 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: emacspeak -- The Complete Audio Desktop
 Name: emacspeak
-Version: 26
+Version: 28.0
 Release: 3%{?dist}
 # main lisp files are GPL2+
 # lisp/atom-blogger and lisp/g-client are BSD
@@ -17,8 +17,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: emacs, tclx
 Patch0: emacspeak-15.0-fixpref.patch
-Patch1: emacspeak-tcl-pkgreq-tclx.patch
-Patch2: emacspeak-no-linux-espeak.patch
+Patch1: emacspeak-28.0-no-httpd.patch
+Patch2: emacspeak-28.0-tmpfile.patch
 
 %description 
 Emacspeak is a speech interface that allows visually impaired users to
@@ -32,31 +32,30 @@
 opens up the Internet to visually impaired users around the world.
 
 %prep
-%setup -q -n %{name}-%{version}.0
-%patch0 -p1
-%patch1 -p1 -b .1-tclx
-%patch2 -p1 -b .2-espeak
+%setup -q
+%patch0 -p1 -b .0-infodir
+%patch1 -p1 -b .1-httpd
+%patch2 -p1 -b .tmpfile
+
+for i in `find . -type f -exec grep -q /usr/bin/tcl$ '{}' ';' -print` ; do
+  sed -i -e "s%#!/usr/bin/tcl$%#!/usr/bin/tclsh\npackage require Tclx%" $i
+done
 
+sed -i -e "s%#!/usr/bin/python2.4$%#!/usr/bin/python%" servers/python/HTTPSpeaker.py
 
 %build
 make  config SRC=`pwd`
 make
 
-
 %install
 rm -rf %{buildroot}
-# make sure install-info is in path
-export PATH=$PATH:/sbin
-#mkdir -p %{buildroot}%{_infodir}
 make install prefix=%{buildroot}%{_prefix} infodir=%{buildroot}%{_infodir}
 rm -f %{buildroot}%{_infodir}/*dir
-#rm %{buildroot}%{_infodir}/*.gz
-perl -pi -e "s|%{buildroot}||g" %{buildroot}%{_bindir}/emacspeak
+sed -i -e "s|%{buildroot}||g" %{buildroot}%{_bindir}/emacspeak
  
 rm %{buildroot}%{_datadir}/emacs/site-lisp/emacspeak/{.nosearch,sounds/emacspeak.mp3}
 rm -r %{buildroot}%{_datadir}/emacs/site-lisp/emacspeak/{realaudio,shoutcast}
 
-
 %post
 /sbin/install-info %{_infodir}/emacspeak.info.gz %{_infodir}/dir --section "Accessibility" || :
 
@@ -78,7 +77,22 @@
 %{_infodir}/*
 
 %changelog
-* Thu Oct  4 2007 Jens Petersen <petersen at redhat.com> - 26-3
+* Fri Sep 26 2008 Jens Petersen <petersen at redhat.com> - 28.0-3
+- (CVE-2008-4191) fix tmpfile vulnerability in extract-table.pl with
+  emacspeak-28.0-tmpfile.patch from upstream svn (#463819)
+
+* Fri Sep 26 2008 Jens Petersen <petersen at redhat.com> - 28.0-2
+- fix broken generated deps reported by mtasaka (#463899)
+- script the replacement of tcl with tclsh to fix missing dtk-soft
+- replace python2.4 with python in HTTPSpeaker.py
+
+* Thu Sep 25 2008 Jens Petersen <petersen at redhat.com> - 28.0-1
+- update to 28.0 with emacspeak-28.0-no-httpd.patch
+- replace emacspeak-tcl-pkgreq-tclx.patch with sed
+- emacspeak-no-linux-espeak.patch no longer needed
+- update emacspeak-15.0-fixpref.patch for patch fuzz
+
+* Thu Oct  4 2007 Jens Petersen <petersen at redhat.com> - 26-3.fc8
 - use requires instead of prereq for post and preun install-info
 
 * Mon Aug 13 2007 Jens Petersen <petersen at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/F-8/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 May 2007 03:56:49 -0000	1.8
+++ sources	26 Sep 2008 09:35:50 -0000	1.9
@@ -1 +1 @@
-808f7a96bdfaed769b987774f5201669  emacspeak-26.tar.bz2
+c64e3894b7d7b4eeffa12a896bd68f7c  emacspeak-28.0.tar.bz2


--- emacspeak-no-linux-espeak.patch DELETED ---


--- emacspeak-tcl-pkgreq-tclx.patch DELETED ---



From transif at fedoraproject.org  Fri Sep 26 10:06:06 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Fri, 26 Sep 2008 10:06:06 +0000 (UTC)
Subject: comps/po mr.po,1.14,1.15
Message-ID: <20080926100606.D36617010C@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4878/po

Modified Files:
	mr.po 
Log Message:
    2008-09-26  Sandeep Sheshrao Shedmake <sshedmak at redhat.com> (via
sandeeps at fedoraproject.org)
    
      * po/mr.po: Updated Marathi Translations.
    



Index: mr.po
===================================================================
RCS file: /cvs/pkgs/comps/po/mr.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mr.po	17 Sep 2008 22:44:36 -0000	1.14
+++ mr.po	26 Sep 2008 10:05:36 -0000	1.15
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: comps.HEAD.mr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-04-14 12:20+0530\n"
+"POT-Creation-Date: 2008-09-23 01:23+0000\n"
+"PO-Revision-Date: 2008-09-24 15:55+0530\n"
 "Last-Translator: Sandeep Shedmake <sandeep.shedmake at gmail.com>\n"
 "Language-Team: marathi\n"
 "MIME-Version: 1.0\n"
@@ -397,16 +397,14 @@
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:81
-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:82 ../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
@@ -642,8 +640,7 @@
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
 #: ../comps-f10.xml.in.h:143 ../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:137
@@ -766,8 +763,7 @@
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
 #: ../comps-f10.xml.in.h:169
-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:160
@@ -777,20 +773,17 @@
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
 #: ../comps-f10.xml.in.h:171
-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:162
 #: ../comps-f10.xml.in.h:172 ../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:163
 #: ../comps-f10.xml.in.h:173
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "?????? ???????????????????????????????????? ???????????????-?????????????????? ???????????? ????????? DHCP, ???????????????????????? ????????? NIS ??????????????? ?????????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:164
@@ -903,14 +896,12 @@
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
 #: ../comps-f10.xml.in.h:190 ../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:181
 #: ../comps-f10.xml.in.h:191 ../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:182
@@ -924,8 +915,7 @@
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
 #: ../comps-f10.xml.in.h:193
-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:184
@@ -1108,91 +1098,76 @@
 msgstr "???????????? ?????????????????? ??? ?????????????????? ???????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44
-#, fuzzy
 msgid "Esperanto Support"
-msgstr "??????????????? ??????????????????"
+msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95
-#, fuzzy
 msgid "Kashubian Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:108
-#, fuzzy
 msgid "Macedonian Support"
-msgstr "???????????????????????? ??????????????????"
+msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:121
-#, fuzzy
 msgid "Northern Sami Support"
-msgstr "????????????????????? ???????????? ??????????????????"
+msgstr "????????????????????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:137
-#, fuzzy
 msgid "SUGAR Desktop Environment"
-msgstr "??????????????????????????? ????????????????????????"
+msgstr "SUGAR ???????????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:138
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
-msgstr ""
+msgstr "SUGAR ?????? OLPC XO ??????????????? ????????????????????? ???????????????????????? ????????????????????? ?????????."
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:211
-#, fuzzy
 msgid "Walloon Support"
-msgstr "????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:70
-#, fuzzy
 msgid "Haskell Development"
-msgstr "????????? ???????????????"
+msgstr "??????????????????????????? ???????????????"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
-msgstr ""
+msgstr "??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:77
 msgid "Input method packages for the input of international text."
-msgstr ""
+msgstr "?????????????????????????????????????????? ??????????????? ???????????????????????? ????????????????????????????????? ?????????????????? ?????????????????? ???????????????."
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "??????????????? ??????????????????"
+msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "?????????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:110
-#, fuzzy
 msgid "Maithili Support"
-msgstr "??????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:117
-#, fuzzy
 msgid "Myanmar (Burmese) Support"
-msgstr "??????????????????????????? ??????????????????"
+msgstr "???????????????????????? (??????????????????) ??????????????????"
 
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "??????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:156
-#, fuzzy
 msgid "Support for developing programs in the Haskell programming language."
-msgstr "???????????? ?????? ????????????????????????????????????(???????????????????????????) ??????????????? ??????????????????????????? ?????????????????? ????????????????????? ??????????????????."
+msgstr "????????????????????? ???????????????????????????????????? (???????????????????????????) ???????????? ????????????????????? ??????????????????????????? ?????????????????? ????????????????????????????????? ??????????????????."
 
 #: ../comps-f10.xml.in.h:163
-#, fuzzy
 msgid "Tajik Support"
-msgstr "????????? ??????????????????"
+msgstr "??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:205
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1243,18 +1218,15 @@
 msgstr "?????? ???????????? ????????????????????? ??????????????????????????? ??????????????? ????????????????????? ?????? ?????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????? ???????????? ?????????????????? ??????????????????????????????????????? ???????????? ??? ????????????????????????????????? ?????? ?????????."
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????? ???????????? ?????????????????? ??????????????????????????????????????? ???????????? ??? ????????????????????????????????? ?????? ?????????."
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????? ???????????? ?????????????????? ??????????????????????????????????????? ???????????? ??? ????????????????????????????????? ?????? ?????????."
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1262,69 +1234,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "?????? ???????????? ????????? ??????????????????????????????????????? ???????????? ??? ????????????????????????????????? ?????? ?????????."
 
-#~ msgid "British Support"
-#~ msgstr "????????????????????? ??????????????????"
-
-#~ msgid "Cluster Storage"
-#~ msgstr "????????????????????? ???????????????"
-
-#~ msgid "Clustering Support."
-#~ msgstr "?????????????????????????????? ??????????????????."
-
-#~ msgid "Libraries for applications built on older releases."
-#~ msgstr "?????????????????? ????????????????????? ???????????? ??????????????????????????? ??????????????? ????????????????????????."
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "??????????????? ?????????????????????????????? ???????????????"
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "??????????????? ?????? ????????????????????? ??????????????? ??????????????? ??????????????? ?????????????????????."
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "??????????????? ?????? ?????? ?????????????????????-????????? GFS ??????????????? ?????????????????? ?????????????????????."
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "??????????????????????????? ????????? GFS ??????????????????"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "?????? ??????????????? ?????????????????????????????? ??????????????????????????? ???????????????????????? ?????????????????? ?????????????????????."
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "Java ?????????????????? ????????????????????? ??? ?????????????????? ???????????????"
-
-#~ msgid "Misc"
-#~ msgstr "???????????????"
-
-#~ msgid "Misc packages"
-#~ msgstr "??????????????? ???????????????"
-
-#~ msgid "Multimedia"
-#~ msgstr "?????????????????????????????????"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "????????????????????????????????? ???????????????????????????"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr "??????????????? ?????? Red Hat Enterprise Linux ??????????????? ???????????? ????????????????????????????????? ?????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux Supplementary"
-#~ msgstr "Red Hat Enterprise Linux ??????????????? ??????????????????"
-
-#~ msgid ""
-#~ "Components used for high performance networking and clustering, such as "
-#~ "Infiniband and RDMA."
-#~ msgstr ""
-#~ "???????????? ????????????????????????????????? ?????????????????????????????? ??? ?????????????????????????????? ??????????????? ???????????????????????????????????? ?????????, ????????? ?????? Infiniband "
-#~ "??? RDMA."
-
-#~ msgid "OpenFabrics Enterprise Distribution"
-#~ msgstr "OpenFabrics Enterprise ?????????????????????"
-
-#~ msgid "Virtualization Support."
-#~ msgstr "???????????????????????? ??????????????????."



From tmraz at fedoraproject.org  Fri Sep 26 10:06:10 2008
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 26 Sep 2008 10:06:10 +0000 (UTC)
Subject: rpms/cyrus-sasl/devel cyrus-sasl-2.1.22-current-db.patch, NONE,
	1.1 cyrus-sasl.spec, 1.73, 1.74
Message-ID: <20080926100610.53E787010C@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4903

Modified Files:
	cyrus-sasl.spec 
Added Files:
	cyrus-sasl-2.1.22-current-db.patch 
Log Message:
* Fri Sep 26 2008 Tomas Mraz <tmraz at redhat.com> - 2.1.22-19
- always use the current external db4 when linking,
  thanks to Dan Horak for the original patch (#464098)


cyrus-sasl-2.1.22-current-db.patch:

--- NEW FILE cyrus-sasl-2.1.22-current-db.patch ---
Always use current db when linking. (libdb.so is symlink to the current db4)
diff -up cyrus-sasl-2.1.22/cmulocal/berkdb.m4.current-db cyrus-sasl-2.1.22/cmulocal/berkdb.m4
--- cyrus-sasl-2.1.22/cmulocal/berkdb.m4.current-db	2005-04-26 21:14:07.000000000 +0200
+++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4	2008-09-26 11:49:34.000000000 +0200
@@ -213,10 +213,11 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
 	fi
 
 	saved_LIBS=$LIBS
-        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+        for dbname in db db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3
           do
 	    LIBS="$saved_LIBS -l$dbname"
-	    AC_TRY_LINK([#include <db.h>],
+	    AC_TRY_LINK([#include <stdio.h>
+#include <db.h>],
 	    [db_create(NULL, NULL, 0);],
 	    BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
             dblib="no")
@@ -224,7 +225,8 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
           done
         if test "$dblib" = "no"; then
 	    LIBS="$saved_LIBS -ldb"
-	    AC_TRY_LINK([#include <db.h>],
+	    AC_TRY_LINK([#include <stdio.h>
+#include <db.h>],
 	    [db_open(NULL, 0, 0, 0, NULL, NULL, NULL);],
 	    BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db,
             dblib="no")


Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- cyrus-sasl.spec	10 Sep 2008 13:52:00 -0000	1.73
+++ cyrus-sasl.spec	26 Sep 2008 10:05:40 -0000	1.74
@@ -4,7 +4,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.22
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -28,6 +28,7 @@
 Patch30: cyrus-sasl-2.1.22-rimap.patch
 Patch31: cyrus-sasl-2.1.22-kerberos4.patch
 Patch32: cyrus-sasl-2.1.22-warnings.patch
+Patch33: cyrus-sasl-2.1.22-current-db.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
@@ -145,6 +146,7 @@
 %patch30 -p1 -b .rimap
 %patch31 -p1 -b .krb4
 %patch32 -p1 -b .warnings
+%patch33 -p1 -b .current-db
 
 # 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.
@@ -379,7 +381,11 @@
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
-* Wed Sep 29 2008 Tomas Mraz <tmraz at redhat.com> - 2.1.22-18
+* Fri Sep 26 2008 Tomas Mraz <tmraz at redhat.com> - 2.1.22-19
+- always use the current external db4 when linking,
+  thanks to Dan Horak for the original patch (#464098)
+
+* Wed Sep 10 2008 Tomas Mraz <tmraz at redhat.com> - 2.1.22-18
 - fix most critical build warnings (#433583)
 - use external db4
 



From jsafrane at fedoraproject.org  Fri Sep 26 10:47:27 2008
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Fri, 26 Sep 2008 10:47:27 +0000 (UTC)
Subject: rpms/net-snmp/devel net-snmp.spec,1.159,1.160
Message-ID: <20080926104727.6FAED7010C@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8175

Modified Files:
	net-snmp.spec 
Log Message:
redistribute the perl scripts to the net-snmp package, net-snmp-utils doesn't depend on perl now
Resolves: #462484


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- net-snmp.spec	18 Sep 2008 06:44:51 -0000	1.159
+++ net-snmp.spec	26 Sep 2008 10:46:57 -0000	1.160
@@ -312,6 +312,9 @@
 do
 	rm $file
 done
+rm $RPM_BUILD_ROOT/%{_bindir}/fixproc
+rm $RPM_BUILD_ROOT/%{_mandir}/man1/fixproc*
+
 # trim down massive ChangeLog
 dd bs=1024 count=250 if=ChangeLog of=ChangeLog.trimmed
 
@@ -345,32 +348,30 @@
 
 %files
 %defattr(-,root,root,-)
-%doc	AGENT.txt COPYING ChangeLog.trimmed EXAMPLE.conf FAQ NEWS PORTING README* TODO
-%doc	local/passtest local/README.mib2c local/ipf-mod.pl
-%dir	%{_sysconfdir}/snmp
+%doc	COPYING ChangeLog.trimmed EXAMPLE.conf FAQ NEWS TODO
+%doc	README README.agent-mibs README.agentx README.krb5 README.snmpv3
+%doc	local/passtest
+%doc README.thread AGENT.txt PORTING local/README.mib2c local/ipf-mod.pl
 %{_initrddir}/snmpd
 %{_initrddir}/snmptrapd
 %config(noreplace) %{_sysconfdir}/logrotate.d/snmpd
 %config(noreplace,missingok) %{_sysconfdir}/sysconfig/snmpd
 %config(noreplace,missingok) %{_sysconfdir}/snmp/snmpd.conf
 %config(noreplace,missingok) %{_sysconfdir}/snmp/snmptrapd.conf
-%{_datadir}/snmp
 %{_bindir}/ucd5820stat
+%{_bindir}/ipf-mod.pl
+%{_bindir}/snmpconf
 %{_sbindir}/*
-%attr(0644,root,root)	%{_mandir}/man[58]/*
+%attr(0644,root,root)	%{_mandir}/man[58]/snmp*
+%attr(0644,root,root)	%{_mandir}/man5/variables*
+%{_datadir}/snmp/snmpconf-data
 
 %files utils
 %defattr(-,root,root,-)
-
-%{_bindir}/fixproc
-%{_bindir}/ipf-mod.pl
 %{_bindir}/encode_keychange
-%{_bindir}/snmp*
-%{_bindir}/traptoemail
+%{_bindir}/snmp[^c]*
 %attr(0644,root,root)	%{_mandir}/man1/snmp*.1*
-%attr(0644,root,root)	%{_mandir}/man1/traptoemail*.1*
 %attr(0644,root,root)	%{_mandir}/man1/encode_keychange*.1*
-%attr(0644,root,root)	%{_mandir}/man1/fixproc*.1*
 
 
 %files devel
@@ -386,9 +387,12 @@
 %defattr(-,root,root)
 %{_bindir}/mib2c-update
 %{_bindir}/mib2c
-%attr(0644,root,root)	%{_mandir}/man1/mib2c-update*.1*
-%attr(0644,root,root)	%{_mandir}/man1/mib2c.1*
+%{_datadir}/snmp/mib2c*
+%{_datadir}/snmp/*.pl
+%{_bindir}/traptoemail
+%attr(0644,root,root)	%{_mandir}/man[15]/mib2c*
 %attr(0644,root,root)   %{_mandir}/man3/*.3pm.*
+%attr(0644,root,root)	%{_mandir}/man1/traptoemail*.1*
 
 %files python
 %defattr(-,root,root,-)
@@ -403,8 +407,13 @@
 %files libs
 %defattr(-,root,root)
 %{_libdir}/lib*.so.*
+%{_datadir}/snmp/mibs
 
 %changelog
+* Fri Sep 26 2008 Jan Safranek <jsafranek at redhat.com> 5.4.2-2
+- redistribute the perl scripts to the net-snmp package,
+  net-snmp-utils doesn't depend on perl now (#462484)
+
 * Wed Sep 17 2008 Jan Safranek <jsafranek at redhat.com> 5.4.2-1
 - update to net-snmp-5.4.2
 



From jsafrane at fedoraproject.org  Fri Sep 26 10:48:34 2008
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Fri, 26 Sep 2008 10:48:34 +0000 (UTC)
Subject: rpms/net-snmp/devel net-snmp.spec,1.160,1.161
Message-ID: <20080926104834.BAE2B7010C@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8328

Modified Files:
	net-snmp.spec 
Log Message:
version++


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- net-snmp.spec	26 Sep 2008 10:46:57 -0000	1.160
+++ net-snmp.spec	26 Sep 2008 10:48:04 -0000	1.161
@@ -8,7 +8,7 @@
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: %{major_ver}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 
 License: BSD and MIT



From caolanm at fedoraproject.org  Fri Sep 26 11:08:36 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 26 Sep 2008 11:08:36 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1659,1.1660
Message-ID: <20080926110836.7F1A97010C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10764

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#464109 lohit-fonts-marathi


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1659
retrieving revision 1.1660
diff -u -r1.1659 -r1.1660
--- openoffice.org.spec	25 Sep 2008 10:56:52 -0000	1.1659
+++ openoffice.org.spec	26 Sep 2008 11:08:04 -0000	1.1660
@@ -1179,7 +1179,7 @@
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-mr
-Requires: lohit-fonts-hindi
+Requires: lohit-fonts-marathi
 Obsoletes: openoffice.org2-langpack-mr_IN
 
 %description langpack-mr_IN
@@ -3681,8 +3681,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Thu Sep 25 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-7.2
+* Fri Sep 26 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-7.2
 - Resolves: rhbz#463884 openoffice.org-3.0.0.ooo94318.greekmenu.crash
+- Resolves: rhbz#464109 lohit-fonts-marathi
 
 * Sun Sep 21 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-7.1
 - Tswana, Ukrainian, Urdu spellcheckers



From twaugh at fedoraproject.org  Fri Sep 26 11:35:46 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 26 Sep 2008 11:35:46 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec,1.185,1.186
Message-ID: <20080926113546.E6DA47010C@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13826

Modified Files:
	hplip.spec 
Log Message:
* Fri Sep 26 2008 Tim Waugh <twaugh at redhat.com> 2.8.7-2
- Moved Python extension into libs sub-package (bug #461236).



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- hplip.spec	4 Aug 2008 17:16:20 -0000	1.185
+++ hplip.spec	26 Sep 2008 11:35:16 -0000	1.186
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.8.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -212,8 +212,6 @@
 # CUPS serverbin directory.
 /usr/lib/cups/backend/hp
 /usr/lib/cups/backend/hpfax
-# Python extension
-%{_libdir}/python*/site-packages/*
 # Files
 %dir %{_datadir}/hplip
 %{_datadir}/hplip/align.py*
@@ -255,6 +253,8 @@
 %defattr(-,root,root)
 %{_libdir}/libhpip.so*
 %{_libdir}/libhpmud.so*
+# Python extension
+%{_libdir}/python*/site-packages/*
 
 %files gui
 %{_bindir}/hp-check
@@ -307,6 +307,9 @@
 exit 0
 
 %changelog
+* Fri Sep 26 2008 Tim Waugh <twaugh at redhat.com> 2.8.7-2
+- Moved Python extension into libs sub-package (bug #461236).
+
 * Mon Aug  4 2008 Tim Waugh <twaugh at redhat.com> 2.8.7-1
 - 2.8.7.
 - Avoid hard-coded rpaths.



From sharkcz at fedoraproject.org  Fri Sep 26 11:39:32 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 26 Sep 2008 11:39:32 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel cyrus-imapd-2.3.12p2-current-db.patch, NONE, 
	1.1 cyrus-imapd.spec, 1.43,
	1.44 cyrus-imapd-2.3.12p2-db4.7.patch, 1.1, NONE
Message-ID: <20080926113932.975237010C@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14319

Modified Files:
	cyrus-imapd.spec 
Added Files:
	cyrus-imapd-2.3.12p2-current-db.patch 
Removed Files:
	cyrus-imapd-2.3.12p2-db4.7.patch 
Log Message:
* Fri Sep 26 2008 Dan Hor??k <dan[at]danny.cz - 2.3.12p2-3
- better fix for linking with recent db4.x


cyrus-imapd-2.3.12p2-current-db.patch:

--- NEW FILE cyrus-imapd-2.3.12p2-current-db.patch ---
--- cyrus-imapd-2.3.12p2/cmulocal/berkdb.m4.orig	2008-09-12 07:46:46.000000000 +0200
+++ cyrus-imapd-2.3.12p2/cmulocal/berkdb.m4	2008-09-12 07:47:10.000000000 +0200
@@ -213,7 +213,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
 	fi
 
 	saved_LIBS=$LIBS
-        for dbname in ${with_bdb} db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+        for dbname in ${with_bdb} db db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3
           do
 	    LIBS="$saved_LIBS -l$dbname"
 	    AC_TRY_LINK([#include <stdio.h>


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- cyrus-imapd.spec	12 Sep 2008 07:09:30 -0000	1.43
+++ cyrus-imapd.spec	26 Sep 2008 11:39:02 -0000	1.44
@@ -1,7 +1,7 @@
 %define upstream_ver 2.3.12p2
 Name: cyrus-imapd
 Version: 2.3.12p2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -142,7 +142,8 @@
 Patch14: cyrus-imapd-2.3.1-authid_normalize.patch
 Patch15: cyrus-imapd-2.3.1-make_md5_defaults.patch
 Patch18: cyrus-imapd-2.3.7-krb4.patch
-Patch19: cyrus-imapd-2.3.12p2-db4.7.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=461875
+Patch19: cyrus-imapd-2.3.12p2-current-db.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf >= 2.59
 BuildRequires: cyrus-sasl-devel >= 2.1.15-1, perl-devel, tcp_wrappers
@@ -784,7 +785,10 @@
 %{_mandir}/man1/*
 
 %changelog
-* Fri Sep 14 2008 Dan Hor??k <dan[at]danny.cz - 2.3.12p2-2
+* Fri Sep 26 2008 Dan Hor??k <dan[at]danny.cz - 2.3.12p2-3
+- better fix for linking with recent db4.x
+
+* Fri Sep 12 2008 Dan Hor??k <dan[at]danny.cz - 2.3.12p2-2
 - fix linking with db4.7 (Resolves: #461875)
 - patch cleanup
 


--- cyrus-imapd-2.3.12p2-db4.7.patch DELETED ---



From lkundrak at fedoraproject.org  Fri Sep 26 12:10:28 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 26 Sep 2008 12:10:28 +0000 (UTC)
Subject: rpms/s3cmd/devel s3cmd-0.9.8.3-uri_escape.patch, NONE,
	1.1 s3cmd.spec, 1.4, 1.5
Message-ID: <20080926121028.4DAA77010C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/s3cmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17903

Modified Files:
	s3cmd.spec 
Added Files:
	s3cmd-0.9.8.3-uri_escape.patch 
Log Message:
* Fri Sep 26 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.9.8.3-2
- Fix listing of directories with special characters in names


s3cmd-0.9.8.3-uri_escape.patch:

--- NEW FILE s3cmd-0.9.8.3-uri_escape.patch ---
Escape parameters in strings. Fixes sync to and ls of directories with spaces.

Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com>

diff -up s3cmd-0.9.8.3/S3/S3.py.uri_escape s3cmd-0.9.8.3/S3/S3.py
--- s3cmd-0.9.8.3/S3/S3.py.uri_escape	2008-07-03 14:33:39.000000000 +0200
+++ s3cmd-0.9.8.3/S3/S3.py	2008-09-26 14:05:52.000000000 +0200
@@ -291,7 +291,7 @@ class S3(object):
 			else:
 				param_str += "&%s" % param
 		if param_str != "":
-			resource['uri'] += "?" + param_str[1:]
+			resource['uri'] += "?" + self.urlencode_string(param_str[1:])
 		debug("CreateRequest: resource[uri]=" + resource['uri'])
 		return (method_string, resource, headers)
 	


Index: s3cmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s3cmd/devel/s3cmd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- s3cmd.spec	31 Jul 2008 14:41:53 -0000	1.4
+++ s3cmd.spec	26 Sep 2008 12:09:57 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           s3cmd
 Version:        0.9.8.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tool for accessing Amazon Simple Storage Service
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@
 URL:            http://s3tools.logix.cz/s3cmd
 Source0:        http://download.sourceforge.net/s3tools/%{name}-%{version}.tar.gz
 Patch0:         s3cmd-0.9.8.1-noet.patch
+Patch1:         s3cmd-0.9.8.3-uri_escape.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -56,6 +57,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.9.8.3-2
+- Fix listing of directories with special characters in names
+
 * Thu Jul 31 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.9.8.3-1
 - New upstream release: Avoid running out-of-memory in MD5'ing large files.
 



From lkundrak at fedoraproject.org  Fri Sep 26 12:16:37 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 26 Sep 2008 12:16:37 +0000 (UTC)
Subject: rpms/s3cmd/devel s3cmd.spec,1.5,1.6
Message-ID: <20080926121637.679147010C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/s3cmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18539

Modified Files:
	s3cmd.spec 
Log Message:
* Fri Sep 26 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.9.8.3-3
- Whoops, forgot to actually apply the patch.



Index: s3cmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s3cmd/devel/s3cmd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- s3cmd.spec	26 Sep 2008 12:09:57 -0000	1.5
+++ s3cmd.spec	26 Sep 2008 12:16:07 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           s3cmd
 Version:        0.9.8.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tool for accessing Amazon Simple Storage Service
 
 Group:          Applications/Internet
@@ -29,6 +29,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .noet
+%patch1 -p1 -b .uri_escape
 
 
 %build
@@ -57,6 +58,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.9.8.3-3
+- Whoops, forgot to actually apply the patch.
+
 * Fri Sep 26 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.9.8.3-2
 - Fix listing of directories with special characters in names
 



From dwalsh at fedoraproject.org  Fri Sep 26 12:39:26 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 26 Sep 2008 12:39:26 +0000 (UTC)
Subject: rpms/selinux-policy/devel .cvsignore, 1.148,
	1.149 policy-20080710.patch, 1.46, 1.47 sources, 1.164, 1.165
Message-ID: <20080926123927.002FE7010C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21117

Modified Files:
	.cvsignore policy-20080710.patch sources 
Log Message:
* Wed Sep 24 2008 Dan Walsh <dwalsh at redhat.com> 3.5.9-1
- Upgrade to upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- .cvsignore	12 Sep 2008 20:36:20 -0000	1.148
+++ .cvsignore	26 Sep 2008 12:38:56 -0000	1.149
@@ -150,3 +150,4 @@
 serefpolicy-3.5.6.tgz
 serefpolicy-3.5.7.tgz
 serefpolicy-3.5.8.tgz
+serefpolicy-3.5.9.tgz

policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- policy-20080710.patch	25 Sep 2008 18:54:16 -0000	1.46
+++ policy-20080710.patch	26 Sep 2008 12:38:56 -0000	1.47
@@ -431,7 +431,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-3.5.9/policy/modules/admin/amanda.te
 --- nsaserefpolicy/policy/modules/admin/amanda.te	2008-08-14 10:07:05.000000000 -0400
-+++ serefpolicy-3.5.9/policy/modules/admin/amanda.te	2008-09-25 08:33:18.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/admin/amanda.te	2008-09-25 15:03:17.000000000 -0400
 @@ -129,6 +129,8 @@
  corenet_tcp_bind_all_nodes(amanda_t)
  corenet_udp_bind_all_nodes(amanda_t)
@@ -541,22 +541,31 @@
 -') dnl end TODO
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.5.9/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.9/policy/modules/admin/kismet.te	2008-09-25 08:33:18.000000000 -0400
-@@ -26,7 +26,10 @@
++++ serefpolicy-3.5.9/policy/modules/admin/kismet.te	2008-09-25 15:06:28.000000000 -0400
+@@ -26,7 +26,11 @@
  #
  
  allow kismet_t self:capability { net_admin net_raw setuid setgid };
 +allow kismet_t self:fifo_file rw_file_perms;
  allow kismet_t self:packet_socket create_socket_perms;
-+allow kismet_t self:unix_dgram_socket create_socket_perms;
++allow kismet_t self:unix_dgram_socket { create_socket_perms sendto };
 +allow kismet_t self:unix_stream_socket create_stream_socket_perms;
++allow kismet_t self:tcp_socket create_stream_socket_perms;
  
  manage_files_pattern(kismet_t, kismet_log_t, kismet_log_t)
  allow kismet_t kismet_log_t:dir setattr;
-@@ -42,6 +45,8 @@
+@@ -42,6 +46,16 @@
  
  corecmd_exec_bin(kismet_t)
  
++corenet_all_recvfrom_unlabeled(kismet_t)
++corenet_all_recvfrom_netlabel(kismet_t)
++corenet_tcp_sendrecv_all_if(kismet_t)
++corenet_tcp_sendrecv_all_nodes(kismet_t)
++corenet_tcp_sendrecv_all_ports(kismet_t)
++corenet_tcp_bind_all_nodes(kismet_t)
++corenet_tcp_bind_all_kismet_port(kismet_t)
++
 +kernel_search_debugfs(kismet_t)
 +
  auth_use_nsswitch(kismet_t)
@@ -6482,7 +6491,7 @@
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.5.9/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2008-09-24 09:07:27.000000000 -0400
-+++ serefpolicy-3.5.9/policy/modules/kernel/corenetwork.te.in	2008-09-25 08:33:18.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/kernel/corenetwork.te.in	2008-09-25 15:05:47.000000000 -0400
 @@ -75,6 +75,7 @@
  network_port(aol, udp,5190,s0, tcp,5190,s0, udp,5191,s0, tcp,5191,s0, udp,5192,s0, tcp,5192,s0, udp,5193,s0, tcp,5193,s0) 
  network_port(apcupsd, tcp,3551,s0, udp,3551,s0)
@@ -6499,10 +6508,11 @@
  network_port(ftp_data, tcp,20,s0)
  network_port(ftp, tcp,21,s0)
  network_port(gatekeeper, udp,1718,s0, udp,1719,s0, tcp,1721,s0, tcp,7000,s0)
-@@ -116,14 +118,17 @@
+@@ -116,14 +118,18 @@
  network_port(kerberos_admin, tcp,464,s0, udp,464,s0, tcp,749,s0)
  network_port(kerberos_master, tcp,4444,s0, udp,4444,s0)
  network_port(kerberos, tcp,88,s0, udp,88,s0, tcp,750,s0, udp,750,s0)
++network_port(kismet, tcp,2501,s0)
 +network_port(kprop, tcp,754,s0)
  network_port(ktalkd, udp,517,s0, udp,518,s0)
  network_port(ldap, tcp,389,s0, udp,389,s0, tcp,636,s0, udp,636,s0, tcp,3268,s0)
@@ -6517,7 +6527,7 @@
  network_port(mysqld, tcp,1186,s0, tcp,3306,s0)
  portcon tcp 63132-63163 gen_context(system_u:object_r:mysqld_port_t, s0)
  network_port(nessus, tcp,1241,s0)
-@@ -135,11 +140,13 @@
+@@ -135,11 +141,13 @@
  network_port(pegasus_http, tcp,5988,s0)
  network_port(pegasus_https, tcp,5989,s0)
  network_port(postfix_policyd, tcp,10031,s0)
@@ -6531,7 +6541,7 @@
  network_port(printer, tcp,515,s0)
  network_port(ptal, tcp,5703,s0)
  network_port(pxe, udp,4011,s0)
-@@ -157,7 +164,7 @@
+@@ -157,7 +165,7 @@
  network_port(rwho, udp,513,s0)
  network_port(smbd, tcp,137-139,s0, tcp,445,s0)
  network_port(smtp, tcp,25,s0, tcp,465,s0, tcp,587,s0)
@@ -6540,7 +6550,7 @@
  network_port(spamd, tcp,783,s0)
  network_port(ssh, tcp,22,s0)
  network_port(soundd, tcp,8000,s0, tcp,9433,s0, tcp, 16001, s0)
-@@ -168,13 +175,16 @@
+@@ -168,13 +176,16 @@
  network_port(syslogd, udp,514,s0)
  network_port(telnetd, tcp,23,s0)
  network_port(tftp, udp,69,s0)
@@ -7261,7 +7271,7 @@
  ##	all protocols (TCP, UDP, etc)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.5.9/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.9/policy/modules/kernel/domain.te	2008-09-25 08:33:18.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/kernel/domain.te	2008-09-25 15:20:04.000000000 -0400
 @@ -5,6 +5,13 @@
  #
  # Declarations
@@ -14248,7 +14258,7 @@
  /var/run/dbus(/.*)?		gen_context(system_u:object_r:system_dbusd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.5.9/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.9/policy/modules/services/dbus.if	2008-09-25 08:33:18.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/services/dbus.if	2008-09-25 15:21:22.000000000 -0400
 @@ -53,6 +53,7 @@
  	gen_require(`
  		type system_dbusd_exec_t, system_dbusd_t, dbusd_etc_t;
@@ -18661,7 +18671,7 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.5.9/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2008-09-24 09:07:28.000000000 -0400
-+++ serefpolicy-3.5.9/policy/modules/services/networkmanager.te	2008-09-25 08:33:18.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/services/networkmanager.te	2008-09-25 15:14:50.000000000 -0400
 @@ -33,9 +33,9 @@
  
  # networkmanager will ptrace itself if gdb is installed
@@ -18720,7 +18730,13 @@
  libs_use_ld_so(NetworkManager_t)
  libs_use_shared_libs(NetworkManager_t)
  
-@@ -133,9 +141,12 @@
+@@ -128,14 +136,18 @@
+ # in /etc created by NetworkManager will be labelled net_conf_t.
+ sysnet_manage_config(NetworkManager_t)
+ sysnet_etc_filetrans_config(NetworkManager_t)
++sysnet_read_dhcp_config(NetworkManager_t)
+ 
+ userdom_dontaudit_use_unpriv_user_fds(NetworkManager_t)
  userdom_dontaudit_use_unpriv_users_ttys(NetworkManager_t)
  # Read gnome-keyring
  userdom_read_unpriv_users_home_content_files(NetworkManager_t)
@@ -18733,7 +18749,7 @@
  optional_policy(`
  	bind_domtrans(NetworkManager_t)
  	bind_manage_cache(NetworkManager_t)
-@@ -151,21 +162,26 @@
+@@ -151,21 +163,26 @@
  ')
  
  optional_policy(`
@@ -18765,7 +18781,7 @@
  ')
  
  optional_policy(`
-@@ -174,9 +190,17 @@
+@@ -174,9 +191,17 @@
  ')
  
  optional_policy(`
@@ -31056,36 +31072,37 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.9/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.5.9/policy/modules/system/unconfined.fc	2008-09-25 08:33:18.000000000 -0400
-@@ -2,15 +2,11 @@
++++ serefpolicy-3.5.9/policy/modules/system/unconfined.fc	2008-09-25 14:37:47.000000000 -0400
+@@ -2,15 +2,29 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
  # For the time being until someone writes a sane policy, we need initrc to transition to unconfined_t
 -/usr/bin/qemu.*			--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
- /usr/bin/valgrind 		--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+-/usr/bin/valgrind 		--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 -/usr/bin/vncserver		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
-+/usr/bin/vncserver		--	gen_context(system_u:object_r:unconfined_notrans_exec_t,s0)
- 
- /usr/lib/ia32el/ia32x_loader 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
--/usr/lib/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 -
- /usr/local/RealPlayer/realplay\.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+-/usr/lib/ia32el/ia32x_loader 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+-/usr/lib/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 -
+-/usr/local/RealPlayer/realplay\.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++/usr/bin/valgrind 		--	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/bin/vncserver		--	gen_context(system_u:object_r:unconfined_notrans_exec_t,s0)
+ 
++/usr/lib/ia32el/ia32x_loader 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/local/RealPlayer/realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
  ifdef(`distro_gentoo',`
- /usr/lib32/openoffice/program/[^/]+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
- ')
-@@ -14,3 +10,20 @@
- ifdef(`distro_gentoo',`
- /usr/lib32/openoffice/program/[^/]+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+-/usr/lib32/openoffice/program/[^/]+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++/usr/lib32/openoffice/program/[^/]+\.bin -- gen_context(system_u:object_r:execmem_exec_t,s0)
  ')
-+/usr/bin/rhythmbox		    --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
-+/usr/bin/sbcl			    --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++/usr/bin/totem.*	            --	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/bin/rhythmbox		    --	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/bin/sbcl			    --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +
 +/usr/sbin/mock			    --	gen_context(system_u:object_r:unconfined_notrans_exec_t,s0)
 +/usr/sbin/sysreport	 	    --	gen_context(system_u:object_r:unconfined_notrans_exec_t,s0)
 +
-+/usr/lib64/erlang/erts-[^/]+/bin/beam.smp --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
-+/usr/lib/erlang/erts-[^/]+/bin/beam.smp --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++/usr/lib64/erlang/erts-[^/]+/bin/beam.smp --	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib/erlang/erts-[^/]+/bin/beam.smp --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +
 +/usr/bin/haddock.*  --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 +/usr/bin/hasktags  --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
@@ -31097,7 +31114,7 @@
 +/opt/real/(.*/)?realplay\.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.5.9/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.5.9/policy/modules/system/unconfined.if	2008-09-25 08:33:18.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/system/unconfined.if	2008-09-25 14:28:00.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -31249,10 +31266,10 @@
 +interface(`unconfined_execmem_domtrans',`
 +
 +	gen_require(`
-+		type unconfined_execmem_t, unconfined_execmem_exec_t;
++		type unconfined_execmem_t, execmem_exec_t;
 +	')
 +
-+	domtrans_pattern($1, unconfined_execmem_exec_t, unconfined_execmem_t)
++	domtrans_pattern($1, execmem_exec_t, unconfined_execmem_t)
 +')
 +
 +########################################
@@ -31428,8 +31445,8 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.9/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.5.9/policy/modules/system/unconfined.te	2008-09-25 08:33:18.000000000 -0400
-@@ -1,40 +1,80 @@
++++ serefpolicy-3.5.9/policy/modules/system/unconfined.te	2008-09-25 14:27:15.000000000 -0400
+@@ -1,40 +1,81 @@
  
 -policy_module(unconfined, 2.3.1)
 +policy_module(unconfined, 2.3.0)
@@ -31482,26 +31499,30 @@
 +role system_r types unconfined_t;
  
  type unconfined_execmem_t;
- type unconfined_execmem_exec_t;
- init_system_domain(unconfined_execmem_t, unconfined_execmem_exec_t)
+-type unconfined_execmem_exec_t;
+-init_system_domain(unconfined_execmem_t, unconfined_execmem_exec_t)
++type execmem_exec_t;
++init_system_domain(unconfined_execmem_t, execmem_exec_t)
  role unconfined_r types unconfined_execmem_t;
- 
++type execmem_exec_t alias unconfined_execmem_exec_t;
++
 +type unconfined_notrans_t;
 +type unconfined_notrans_exec_t;
 +init_system_domain(unconfined_notrans_t, unconfined_notrans_exec_t)
 +role unconfined_r types unconfined_notrans_t;
-+
+ 
  ########################################
  #
  # Local policy
  #
  
+-domtrans_pattern(unconfined_t, unconfined_execmem_exec_t, unconfined_execmem_t)
 +dontaudit unconfined_t self:dir write;
 +
 +allow unconfined_t self:system syslog_read;
 +dontaudit unconfined_t self:capability sys_module;
 +
- domtrans_pattern(unconfined_t, unconfined_execmem_exec_t, unconfined_execmem_t)
++domtrans_pattern(unconfined_t, execmem_exec_t, unconfined_execmem_t)
  
  files_create_boot_flag(unconfined_t)
 +files_create_default_dir(unconfined_t)
@@ -31515,7 +31536,7 @@
  
  libs_run_ldconfig(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t })
  
-@@ -42,28 +82,37 @@
+@@ -42,28 +83,37 @@
  logging_run_auditctl(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t })
  
  mount_run_unconfined(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t })
@@ -31557,7 +31578,7 @@
  ')
  
  optional_policy(`
-@@ -75,12 +124,6 @@
+@@ -75,12 +125,6 @@
  ')
  
  optional_policy(`
@@ -31570,7 +31591,7 @@
  	init_dbus_chat_script(unconfined_t)
  
  	dbus_stub(unconfined_t)
-@@ -106,12 +149,24 @@
+@@ -106,12 +150,24 @@
  	')
  
  	optional_policy(`
@@ -31595,7 +31616,7 @@
  ')
  
  optional_policy(`
-@@ -123,31 +178,33 @@
+@@ -123,31 +179,33 @@
  ')
  
  optional_policy(`
@@ -31636,7 +31657,7 @@
  ')
  
  optional_policy(`
-@@ -159,43 +216,48 @@
+@@ -159,43 +217,48 @@
  ')
  
  optional_policy(`
@@ -31701,7 +31722,7 @@
  ')
  
  optional_policy(`
-@@ -203,7 +265,7 @@
+@@ -203,7 +266,7 @@
  ')
  
  optional_policy(`
@@ -31710,7 +31731,7 @@
  ')
  
  optional_policy(`
-@@ -215,11 +277,12 @@
+@@ -215,11 +278,12 @@
  ')
  
  optional_policy(`
@@ -31725,7 +31746,7 @@
  ')
  
  ########################################
-@@ -229,14 +292,35 @@
+@@ -229,14 +293,35 @@
  
  allow unconfined_execmem_t self:process { execstack execmem };
  unconfined_domain_noaudit(unconfined_execmem_t)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- sources	16 Sep 2008 13:57:15 -0000	1.164
+++ sources	26 Sep 2008 12:38:56 -0000	1.165
@@ -1 +1 @@
-dcacf4cddcb4232564044e8d33c4d28e  serefpolicy-3.5.8.tgz
+1fc530b9656edfe96053b028274f6658  serefpolicy-3.5.9.tgz



From kraxel at fedoraproject.org  Fri Sep 26 13:03:43 2008
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Fri, 26 Sep 2008 13:03:43 +0000 (UTC)
Subject: rpms/xenner/devel .cvsignore, 1.22, 1.23 sources, 1.21,
	1.22 xenner.spec, 1.34, 1.35
Message-ID: <20080926130343.52F857010C@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xenner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24957

Modified Files:
	.cvsignore sources xenner.spec 
Log Message:
- update to version 0.46


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	24 Sep 2008 14:27:22 -0000	1.22
+++ .cvsignore	26 Sep 2008 13:03:12 -0000	1.23
@@ -1 +1 @@
-xenner-0.45.tar.gz
+xenner-0.46.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	24 Sep 2008 14:27:22 -0000	1.21
+++ sources	26 Sep 2008 13:03:13 -0000	1.22
@@ -1 +1 @@
-371789ce3ae650a60964a7f25968b9ba  xenner-0.45.tar.gz
+81438375b78665d3bc13f0d67eea3add  xenner-0.46.tar.gz


Index: xenner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/devel/xenner.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xenner.spec	24 Sep 2008 14:27:22 -0000	1.34
+++ xenner.spec	26 Sep 2008 13:03:13 -0000	1.35
@@ -1,6 +1,6 @@
 Name:         xenner
 License:      GPLv2+
-Version:      0.45
+Version:      0.46
 Release:      1%{?dist}
 Summary:      Xen emulator for kvm
 Group:        Applications/Emulators
@@ -57,6 +57,8 @@
 rm -rf %{buildroot}
 
 %changelog
+* Fri Sep 26 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.46-1.fc10
+- update to version 0.46
 * Thu Sep 24 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.45-1.fc10
 - update to version 0.45
 * Thu Sep 4 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.44-1.fc10



From hadess at fedoraproject.org  Fri Sep 26 13:04:24 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 26 Sep 2008 13:04:24 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.4, 1.5 bluez.spec, 1.9, 1.10 sources,
	1.4, 1.5 bluez-bluetoothd-crasher.patch, 1.1, NONE
Message-ID: <20080926130424.2D81A7010C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25035

Modified Files:
	.cvsignore bluez.spec sources 
Removed Files:
	bluez-bluetoothd-crasher.patch 
Log Message:
* Fri Sep 26 2008 - Bastien Nocera <bnocera at redhat.com> - 4.7-1
- Update to 4.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Sep 2008 21:11:24 -0000	1.4
+++ .cvsignore	26 Sep 2008 13:03:53 -0000	1.5
@@ -1 +1 @@
-bluez-4.6.tar.gz
+bluez-4.7.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bluez.spec	25 Sep 2008 03:04:45 -0000	1.9
+++ bluez.spec	26 Sep 2008 13:03:53 -0000	1.10
@@ -1,16 +1,13 @@
-%define _default_patch_fuzz 2
-
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.6
-Release: 4%{?dist}
+Version: 4.7
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
 Source1: bluetooth.init
 Source2: bluetooth.conf
 Patch1: bluez-utils-oui-usage.patch
-Patch2: bluez-bluetoothd-crasher.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -99,7 +96,6 @@
 
 %setup -q
 %patch1 -p0 -b .oui
-%patch2 -p1 -b .security
 
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
@@ -185,6 +181,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Fri Sep 26 2008 - Bastien Nocera <bnocera at redhat.com> - 4.7-1
+- Update to 4.7
+
 * Wed Sep 24 2008 - Bastien Nocera <bnocera at redhat.com> - 4.6-4
 - Fix patch application
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Sep 2008 21:11:24 -0000	1.4
+++ sources	26 Sep 2008 13:03:53 -0000	1.5
@@ -1 +1 @@
-c10774d08fb04af4b4a6d148ffcb820a  bluez-4.6.tar.gz
+2aa806940d2c841e57a9b2ab7302b750  bluez-4.7.tar.gz


--- bluez-bluetoothd-crasher.patch DELETED ---



From timj at fedoraproject.org  Fri Sep 26 13:33:18 2008
From: timj at fedoraproject.org (Tim Jackson)
Date: Fri, 26 Sep 2008 13:33:18 +0000 (UTC)
Subject: rpms/php-manual-en/devel php-manual-en.spec, 1.7, 1.8 sources, 1.8, 
	1.9 dead.package, 1.1, NONE
Message-ID: <20080926133318.25F9C7010C@cvs1.fedora.phx.redhat.com>

Author: timj

Update of /cvs/extras/rpms/php-manual-en/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29282

Added Files:
	php-manual-en.spec sources 
Removed Files:
	dead.package 
Log Message:
Re-add php-manual-en; upstream license has now changed to be acceptable



Index: php-manual-en.spec
===================================================================
RCS file: php-manual-en.spec
diff -N php-manual-en.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ php-manual-en.spec	26 Sep 2008 13:32:47 -0000	1.8
@@ -0,0 +1,80 @@
+Name:           php-manual-en
+Version:        20080919
+Release:        1%{?dist}
+Summary:        Documentation for the PHP programming language
+
+Group:          Documentation
+License:        CC-BY
+URL:            http://www.php.net/download-docs.php
+Source0:        http://us2.php.net/distributions/manual/php_manual_en.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
+Provides:       php-manual-en-us = %{version}
+
+%description
+English-language documentation for the PHP programming language.
+
+%prep
+%setup -q -c
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_defaultdocdir}/php-manual/en
+cp -pr html %{buildroot}%{_defaultdocdir}/php-manual/en/
+
+cat >LICENSE <<EOF
+For licensing information please see:
+
+%{_defaultdocdir}/php-manual/en/html/copyright.html
+EOF
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%{_defaultdocdir}/php-manual
+%doc LICENSE
+
+%changelog
+* Wed Sep 24 2008 Tim Jackson <rpm at timj.co.uk> 20080919-1
+- Update to 2008-09-19 version
+- License is now Creative Commons Attribution License
+
+* Thu Nov 15 2007 Tim Jackson <rpm at timj.co.uk> 20070617-1
+- Update to 2007-06-17 version
+- Rename license to "Open Publication"
+- Add versioning on php-manual-en-us Provide
+
+* Sat Dec 09 2006 Tim Jackson <rpm at timj.co.uk> 20061119-1
+- Update to 2006-11-19 version
+
+* Sat Oct 28 2006 Tim Jackson <rpm at timj.co.uk> 20061026-1
+- Update to 2006-10-26 version
+
+* Mon Sep 25 2006 Tim Jackson <rpm at timj.co.uk> 20060920-1
+- Update to 2006-09-20 version
+
+* Sat Sep 09 2006 Tim Jackson <rpm at timj.co.uk> 20060906-1
+- Update to 2006-09-06 version
+
+* Sat Aug 19 2006 Tim Jackson <rpm at timj.co.uk> 20060813-1
+- Update to 2006-08-13 version
+- Add LICENSE as pointer to licensing information
+
+* Sun Aug 06 2006 Tim Jackson <rpm at timj.co.uk> 20060725-1
+- Update to 2006-07-25 version
+- Own defaultdocdir/php-manual
+- Macro change: datadir/docs -> defaultdocdir
+- Rename License tag to stop rpmlint whinging
+
+* Mon Jun 26 2006 Tim Jackson <rpm at timj.co.uk> 20060527-2
+- Update Source to an absolute URL
+- Provide php-manual-en-us (in case of a future split into en-gb etc.)
+
+* Thu Jun 22 2006 Tim Jackson <rpm at timj.co.uk> 20060527-1
+- Update to 2006-05-27 version of the manual
+
+* Tue May 09 2006 Tim Jackson <rpm at timj.co.uk> 20060421-1
+- Initial RPM build


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	26 Sep 2008 13:32:47 -0000	1.9
@@ -0,0 +1 @@
+f1c6e434222cca7b7628eddd28fd6f02  php_manual_en.tar.gz


--- dead.package DELETED ---



From jsafrane at fedoraproject.org  Fri Sep 26 13:40:33 2008
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Fri, 26 Sep 2008 13:40:33 +0000 (UTC)
Subject: rpms/net-snmp/devel net-snmp.spec,1.161,1.162
Message-ID: <20080926134033.1D2427010C@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30366

Modified Files:
	net-snmp.spec 
Log Message:
further tune up the distribution of files among subpackages and dependencies
Resolves: #462484


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- net-snmp.spec	26 Sep 2008 10:48:04 -0000	1.161
+++ net-snmp.spec	26 Sep 2008 13:40:02 -0000	1.162
@@ -8,7 +8,7 @@
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: %{major_ver}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 
 License: BSD and MIT
@@ -79,7 +79,7 @@
 %package utils
 Group: Applications/System
 Summary: Network management utilities using SNMP, from the NET-SNMP project
-Requires: %{name} = %{epoch}:%{version}
+Requires: %{name}-libs = %{epoch}:%{version}
 
 %description utils
 The net-snmp-utils package contains various utilities for use with the
@@ -92,7 +92,7 @@
 %package devel
 Group: Development/Libraries
 Summary: The development environment for the NET-SNMP project
-Requires: %{name} = %{epoch}:%{version}
+Requires: %{name}-libs = %{epoch}:%{version}
 Requires: elfutils-devel, rpm-devel, elfutils-libelf-devel, openssl-devel
 %if %{tcp_wrappers}
 Requires: tcp_wrappers-devel
@@ -114,7 +114,7 @@
 %package perl
 Group: Development/Libraries
 Summary: The perl NET-SNMP module and the mib2c tool
-Requires: %{name} = %{epoch}:%{version}, perl >= 5
+Requires: %{name}-libs = %{epoch}:%{version}, perl >= 5
 BuildRequires: perl >= 5
 
 %description perl
@@ -362,7 +362,8 @@
 %{_bindir}/ipf-mod.pl
 %{_bindir}/snmpconf
 %{_sbindir}/*
-%attr(0644,root,root)	%{_mandir}/man[58]/snmp*
+%attr(0644,root,root)	%{_mandir}/man[58]/snmp*d*
+%attr(0644,root,root)	%{_mandir}/man5/snmp_config.5.gz
 %attr(0644,root,root)	%{_mandir}/man5/variables*
 %{_datadir}/snmp/snmpconf-data
 
@@ -372,6 +373,8 @@
 %{_bindir}/snmp[^c]*
 %attr(0644,root,root)	%{_mandir}/man1/snmp*.1*
 %attr(0644,root,root)	%{_mandir}/man1/encode_keychange*.1*
+%attr(0644,root,root)	%{_mandir}/man5/snmp.conf.5.gz
+%attr(0644,root,root)	%{_mandir}/man5/variables.5.gz
 
 
 %files devel
@@ -410,6 +413,10 @@
 %{_datadir}/snmp/mibs
 
 %changelog
+* Fri Sep 26 2008 Jan Safranek <jsafranek at redhat.com> 5.4.2-3
+- further tune up the distribution of files among subpackages
+  and dependencies
+
 * Fri Sep 26 2008 Jan Safranek <jsafranek at redhat.com> 5.4.2-2
 - redistribute the perl scripts to the net-snmp package,
   net-snmp-utils doesn't depend on perl now (#462484)



From kraxel at fedoraproject.org  Fri Sep 26 13:45:57 2008
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Fri, 26 Sep 2008 13:45:57 +0000 (UTC)
Subject: rpms/xenner/F-9 .cvsignore, 1.13, 1.14 sources, 1.12,
	1.13 xenner.spec, 1.21, 1.22
Message-ID: <20080926134558.049417010C@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xenner/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31160

Modified Files:
	.cvsignore sources xenner.spec 
Log Message:
- update to version 0.46


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	24 Sep 2008 15:22:34 -0000	1.13
+++ .cvsignore	26 Sep 2008 13:45:27 -0000	1.14
@@ -1 +1 @@
-xenner-0.45.tar.gz
+xenner-0.46.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	24 Sep 2008 15:22:34 -0000	1.12
+++ sources	26 Sep 2008 13:45:27 -0000	1.13
@@ -1 +1 @@
-371789ce3ae650a60964a7f25968b9ba  xenner-0.45.tar.gz
+81438375b78665d3bc13f0d67eea3add  xenner-0.46.tar.gz


Index: xenner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/F-9/xenner.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xenner.spec	24 Sep 2008 15:22:34 -0000	1.21
+++ xenner.spec	26 Sep 2008 13:45:27 -0000	1.22
@@ -1,6 +1,6 @@
 Name:         xenner
 License:      GPLv2+
-Version:      0.45
+Version:      0.46
 Release:      1%{?dist}
 Summary:      Xen emulator for kvm
 Group:        Applications/Emulators
@@ -57,6 +57,8 @@
 rm -rf %{buildroot}
 
 %changelog
+* Fri Sep 26 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.46-1.fc9
+- update to version 0.46
 * Wed Sep 24 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.45-1.fc9
 - update to version 0.45
 * Mon Jul 21 2008 Gerd Hoffmann <kraxel at redhat.com> - 0.41-1.fc9



From dwalsh at fedoraproject.org  Fri Sep 26 13:59:46 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 26 Sep 2008 13:59:46 +0000 (UTC)
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.165,
	1.166 libselinux.spec, 1.342, 1.343
Message-ID: <20080926135946.34CB37013E@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1125

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Fri Sep 26 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.71-6
- Fix matchpathcon -V call 


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- libselinux-rhat.patch	22 Sep 2008 17:52:29 -0000	1.165
+++ libselinux-rhat.patch	26 Sep 2008 13:59:44 -0000	1.166
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/av_permissions.h libselinux-2.0.71/include/selinux/av_permissions.h
 --- nsalibselinux/include/selinux/av_permissions.h	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/include/selinux/av_permissions.h	2008-09-22 13:27:27.000000000 -0400
++++ libselinux-2.0.71/include/selinux/av_permissions.h	2008-09-24 07:41:57.000000000 -0400
 @@ -85,6 +85,7 @@
  #define DIR__REPARENT                             0x00080000UL
  #define DIR__SEARCH                               0x00100000UL
@@ -246,7 +246,7 @@
 +#define X_APPLICATION_DATA__COPY                  0x00000004UL
 diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/flask.h libselinux-2.0.71/include/selinux/flask.h
 --- nsalibselinux/include/selinux/flask.h	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/include/selinux/flask.h	2008-09-22 13:28:05.000000000 -0400
++++ libselinux-2.0.71/include/selinux/flask.h	2008-09-24 07:41:57.000000000 -0400
 @@ -35,18 +35,18 @@
  #define SECCLASS_SHM                                     28
  #define SECCLASS_IPC                                     29
@@ -289,14 +289,24 @@
  
  /*
   * Security identifier indices for initial entities
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/avc_get_initial_sid.3 libselinux-2.0.71/man/man3/avc_get_initial_sid.3
+--- nsalibselinux/man/man3/avc_get_initial_sid.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/avc_get_initial_sid.3	2008-09-24 08:44:16.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/avc_context_to_sid.3
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/fgetfilecon.3 libselinux-2.0.71/man/man3/fgetfilecon.3
 --- nsalibselinux/man/man3/fgetfilecon.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/fgetfilecon.3	2008-09-22 13:25:36.000000000 -0400
++++ libselinux-2.0.71/man/man3/fgetfilecon.3	2008-09-24 07:41:57.000000000 -0400
 @@ -0,0 +1 @@
 +.so man3/getfilecon.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/get_default_type.3 libselinux-2.0.71/man/man3/get_default_type.3
+--- nsalibselinux/man/man3/get_default_type.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/get_default_type.3	2008-09-24 08:40:51.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/get_ordered_context_list.3
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/getkeycreatecon.3 libselinux-2.0.71/man/man3/getkeycreatecon.3
 --- nsalibselinux/man/man3/getkeycreatecon.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/getkeycreatecon.3	2008-09-22 13:25:36.000000000 -0400
++++ libselinux-2.0.71/man/man3/getkeycreatecon.3	2008-09-24 07:41:57.000000000 -0400
 @@ -0,0 +1,38 @@
 +.TH "getkeycreatecon" "3" "9 September 2008" "dwalsh at redhat.com from russell at coker.com.au" "SELinux API documentation"
 +.SH "NAME"
@@ -336,19 +346,286 @@
 +
 +.SH "SEE ALSO"
 +.BR selinux "(8), " freecon "(3), " getcon "(3), " getexeccon "(3)"
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/getsockcreatecon.3 libselinux-2.0.71/man/man3/getsockcreatecon.3
+--- nsalibselinux/man/man3/getsockcreatecon.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/getsockcreatecon.3	2008-09-24 08:49:48.000000000 -0400
+@@ -0,0 +1,38 @@
++.TH "getsockcreatecon" "3" "24 September 2008" "dwalsh at redhat.com from russell at coker.com.au" "SELinux API documentation"
++.SH "NAME"
++getsockcreatecon, setsockcreatecon \- get or set the SELinux security context used for creating a new labeled sockets.
++
++.SH "SYNOPSIS"
++.B #include <selinux/selinux.h>
++.sp
++.BI "int getsockcreatecon(security_context_t *" con );
++
++.BI "int setsockcreatecon(security_context_t "context );
++
++.SH "DESCRIPTION"
++.B getsockcreatecon
++retrieves the context used for creating a new labeled network socket.
++This returned context should be freed with freecon if non-NULL.  
++getsockcreatecon sets *con to NULL if no sockcreate context has been explicitly 
++set by the program (i.e. using the default policy behavior).
++
++.B setsockcreatecon
++sets the context used for creating a new labeled network sockets
++NULL can be passed to
++setsockcreatecon to reset to the default policy behavior.  
++The sockcreate context is automatically reset after the next execve, so a
++program doesn't need to explicitly sanitize it upon startup.  
++
++setsockcreatecon can be applied prior to library
++functions that internally perform an file creation,
++in order to set an file context on the objects.
++
++
++Note: Signal handlers that perform an setsockcreate must take care to
++save, reset, and restore the sockcreate context to avoid unexpected behavior.
++.SH "RETURN VALUE"
++On error -1 is returned.
++On success 0 is returned.
++
++.SH "SEE ALSO"
++.BR selinux "(8), " freecon "(3), " getcon "(3)
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/is_selinux_enabled.3 libselinux-2.0.71/man/man3/is_selinux_enabled.3
+--- nsalibselinux/man/man3/is_selinux_enabled.3	2008-08-28 09:34:24.000000000 -0400
++++ libselinux-2.0.71/man/man3/is_selinux_enabled.3	2008-09-24 07:48:20.000000000 -0400
+@@ -1,14 +1,22 @@
+ .TH "is_selinux_enabled" "3" "1 January 2004" "russell at coker.com.au" "SELinux API documentation"
+ .SH "NAME"
+ is_selinux_enabled \- check whether SELinux is enabled
++
++.SH "NAME"
++is_selinux_mls_enabled \- check whether SELinux is enabled for (Multi Level Securty) MLS 
+ .SH "SYNOPSIS"
+ .B #include <selinux/selinux.h>
+ .sp
+ .B int is_selinux_enabled();
+ 
++.B int is_selinux_mls_enabled();
++
+ .SH "DESCRIPTION"
+ .B is_selinux_enabled
+-returns 1 if SELinux is running or 0 if it is not.  May change soon.
++returns 1 if SELinux is running or 0 if it is not. 
++
++.B is_selinux_mls_enabled
++returns 1 if SELinux is running in MLS mode or 0 if it is not. 
+ 
+ .SH "SEE ALSO"
+ .BR selinux "(8)"
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/is_selinux_mls_enabled.3 libselinux-2.0.71/man/man3/is_selinux_mls_enabled.3
+--- nsalibselinux/man/man3/is_selinux_mls_enabled.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/is_selinux_mls_enabled.3	2008-09-24 07:47:56.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/is_selinux_enabled.3
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/lgetfilecon.3 libselinux-2.0.71/man/man3/lgetfilecon.3
 --- nsalibselinux/man/man3/lgetfilecon.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/lgetfilecon.3	2008-09-22 13:25:36.000000000 -0400
++++ libselinux-2.0.71/man/man3/lgetfilecon.3	2008-09-24 07:41:57.000000000 -0400
 @@ -0,0 +1 @@
 +.so man3/getfilecon.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/matchpathcon.3 libselinux-2.0.71/man/man3/matchpathcon.3
+--- nsalibselinux/man/man3/matchpathcon.3	2008-08-28 09:34:24.000000000 -0400
++++ libselinux-2.0.71/man/man3/matchpathcon.3	2008-09-26 09:56:50.000000000 -0400
+@@ -18,6 +18,11 @@
+ 
+ .BI "void set_matchpathcon_flags(unsigned int " flags ");"
+ 
++.BI "int selinux_file_context_cmp(const security_context_t a,
++				     const security_context_t b);"
++
++.BI "int selinux_file_context_verify(const char *path, mode_t mode);"
++
+ .SH "DESCRIPTION"
+ .B matchpathcon_init
+ loads the file contexts configuration specified by
+@@ -111,6 +116,12 @@
+ .B MATCHPATHCON_BASEONLY
+ flag is set, then only the base file contexts configuration file
+ will be processed, not any dynamically generated entries or local customizations.
++.sp
++.B selinux_file_context_cmp
++compares two file contexts to see if their differences are "significant", the function runs the strcmp function ignoring the user componant of the file context.  
++.sp
++.B selinux_file_context_verify
++compares the file context on disk to the system default.
+ 
+ .sp
+ .SH "RETURN VALUE"
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/matchpathcon_fini.3 libselinux-2.0.71/man/man3/matchpathcon_fini.3
+--- nsalibselinux/man/man3/matchpathcon_fini.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/matchpathcon_fini.3	2008-09-24 08:38:17.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/matchpathcon.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/matchpathcon_init.3 libselinux-2.0.71/man/man3/matchpathcon_init.3
+--- nsalibselinux/man/man3/matchpathcon_init.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/matchpathcon_init.3	2008-09-24 08:38:00.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/matchpathcon.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_binary_policy_path.3 libselinux-2.0.71/man/man3/selinux_binary_policy_path.3
+--- nsalibselinux/man/man3/selinux_binary_policy_path.3	2008-08-28 09:34:24.000000000 -0400
++++ libselinux-2.0.71/man/man3/selinux_binary_policy_path.3	2008-09-24 08:18:47.000000000 -0400
+@@ -1,6 +1,6 @@
+ .TH "selinux_binary_policy_path" "3" "15 November 2004" "dwalsh at redhat.com" "SELinux API Documentation"
+ .SH "NAME"
+-selinux_policy_root, selinux_binary_policy_path,
++selinux_path, selinux_policy_root, selinux_binary_policy_path,
+ selinux_failsafe_context_path, selinux_removable_context_path,
+ selinux_default_context_path, selinux_user_contexts_path,
+ selinux_file_context_path, selinux_media_context_path,
+@@ -11,6 +11,8 @@
+ .B #include <selinux/selinux.h>
+ .sp
+ 
++extern const char *selinux_path(void);
++
+ extern const char *selinux_policy_root(void);
+ 
+ extern const char *selinux_binary_policy_path(void);
+@@ -23,6 +25,10 @@
+ 
+ extern const char *selinux_user_contexts_path(void);
+ 
++extern const char *selinux_usersconf_path(void);
++
++extern const char *selinux_x_context_path(void);
++
+ extern const char *selinux_file_context_path(void);
+ 
+ extern const char *selinux_media_context_path(void);
+@@ -40,10 +46,14 @@
+ directories and files based on the settings in /etc/selinux/config.
+ 
+ .sp
++selinux_path() - top-level SELinux configuration directory
++.sp
+ selinux_policy_root() - top-level policy directory 
+ .sp
+ selinux_binary_policy_path() - binary policy file loaded into kernel
+ .sp
++selinux_default_type_path - context file mapping roles to default types.
++.sp
+ selinux_failsafe_context_path() - failsafe context for emergency logins
+ .sp
+ selinux_removable_context_path() - filesystem context for removable media
+@@ -52,7 +62,17 @@
+ .sp
+ selinux_user_contexts_path() - directory containing per-user default contexts
+ .sp
+-selinux_file_context_path() - file contexts configuration
++selinux_usersconf_path() - file containing mapping between Linux Users and SELinux users
++.sp
++selinux_x_context_path() - file containing configuration for XSELinux extension
++.sp
++selinux_netfilter_context_path - default netfilter context 
++.sp
++selinux_file_context_path() - default sysstem file contexts configuration
++.sp
++selinux_file_context_local_path() - local customization file contexts configuration
++.sp
++selinux_file_context_homedir_path() - home directory file contexts configuration
+ .sp
+ selinux_media_context_path() - file contexts for media device nodes
+ .sp
+@@ -67,4 +87,3 @@
+ 
+ .SH "SEE ALSO"
+ .BR selinux "(8)"
+-
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_default_type_path.3 libselinux-2.0.71/man/man3/selinux_default_type_path.3
+--- nsalibselinux/man/man3/selinux_default_type_path.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/selinux_default_type_path.3	2008-09-24 08:19:09.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/selinux_binary_policy_path.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_file_context_cmp.3 libselinux-2.0.71/man/man3/selinux_file_context_cmp.3
+--- nsalibselinux/man/man3/selinux_file_context_cmp.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/selinux_file_context_cmp.3	2008-09-26 09:57:51.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/matchpathcon.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_file_context_homedir_path.3 libselinux-2.0.71/man/man3/selinux_file_context_homedir_path.3
+--- nsalibselinux/man/man3/selinux_file_context_homedir_path.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/selinux_file_context_homedir_path.3	2008-09-24 08:17:07.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/selinux_binary_policy_path.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_file_context_local_path.3 libselinux-2.0.71/man/man3/selinux_file_context_local_path.3
+--- nsalibselinux/man/man3/selinux_file_context_local_path.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/selinux_file_context_local_path.3	2008-09-24 08:17:14.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/selinux_binary_policy_path.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_file_context_verify.3 libselinux-2.0.71/man/man3/selinux_file_context_verify.3
+--- nsalibselinux/man/man3/selinux_file_context_verify.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/selinux_file_context_verify.3	2008-09-26 09:57:30.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/matchpathcon.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_getpolicytype.3 libselinux-2.0.71/man/man3/selinux_getpolicytype.3
+--- nsalibselinux/man/man3/selinux_getpolicytype.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/selinux_getpolicytype.3	2008-09-24 07:42:23.000000000 -0400
+@@ -0,0 +1,21 @@
++.TH "selinux_getpolicytype" "3" "24 Sep 2008" "dwalsh at redhat.com" "SELinux API documentation"
++.SH "NAME"
++selinux_getpolicytype \- get the type of SELinux policy running on the system
++.SH "SYNOPSIS"
++.B #include <selinux/selinux.h>
++.sp
++.B int selinux_getpolicytype();
++
++
++.SH "DESCRIPTION"
++.B selinux_getpolicytype
++Reads the contents of the /etc/selinux/config file to determine the SELinux policy used on the system.
++
++.SH "RETURN VALUE"
++On success, zero is returned.
++On failure, -1 is returned.
++
++.SH "SEE ALSO"
++.BR selinux "(8)"
++
++
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_homedir_context_path.3 libselinux-2.0.71/man/man3/selinux_homedir_context_path.3
+--- nsalibselinux/man/man3/selinux_homedir_context_path.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/selinux_homedir_context_path.3	2008-09-24 08:36:35.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/selinux_binary_policy_path.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_netfilter_context_path.3 libselinux-2.0.71/man/man3/selinux_netfilter_context_path.3
+--- nsalibselinux/man/man3/selinux_netfilter_context_path.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/selinux_netfilter_context_path.3	2008-09-24 08:36:44.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/selinux_binary_policy_path.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_path.3 libselinux-2.0.71/man/man3/selinux_path.3
+--- nsalibselinux/man/man3/selinux_path.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/selinux_path.3	2008-09-24 08:02:28.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/selinux_binary_policy_path.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_usersconf_path.3 libselinux-2.0.71/man/man3/selinux_usersconf_path.3
+--- nsalibselinux/man/man3/selinux_usersconf_path.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/selinux_usersconf_path.3	2008-09-24 08:36:00.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/selinux_binary_policy_path.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_x_context_path.3 libselinux-2.0.71/man/man3/selinux_x_context_path.3
+--- nsalibselinux/man/man3/selinux_x_context_path.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/selinux_x_context_path.3	2008-09-24 08:36:08.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/selinux_binary_policy_path.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/set_matchpathcon_flags.3 libselinux-2.0.71/man/man3/set_matchpathcon_flags.3
+--- nsalibselinux/man/man3/set_matchpathcon_flags.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/set_matchpathcon_flags.3	2008-09-24 08:42:03.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/matchpathcon.3
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/setkeycreatecon.3 libselinux-2.0.71/man/man3/setkeycreatecon.3
 --- nsalibselinux/man/man3/setkeycreatecon.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/setkeycreatecon.3	2008-09-22 13:25:36.000000000 -0400
++++ libselinux-2.0.71/man/man3/setkeycreatecon.3	2008-09-24 07:41:57.000000000 -0400
 @@ -0,0 +1 @@
 +.so man3/getkeycreatecon.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/setsockcreatecon.3 libselinux-2.0.71/man/man3/setsockcreatecon.3
+--- nsalibselinux/man/man3/setsockcreatecon.3	1969-12-31 19:00:00.000000000 -0500
++++ libselinux-2.0.71/man/man3/setsockcreatecon.3	2008-09-24 08:46:55.000000000 -0400
+@@ -0,0 +1 @@
++.so man3/getsockcreatecon.3
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.71/man/man8/selinuxconlist.8
 --- nsalibselinux/man/man8/selinuxconlist.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man8/selinuxconlist.8	2008-09-22 13:25:36.000000000 -0400
++++ libselinux-2.0.71/man/man8/selinuxconlist.8	2008-09-24 07:41:57.000000000 -0400
 @@ -0,0 +1,18 @@
 +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -370,7 +647,7 @@
 +secon(8), selinuxdefcon(8)
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.71/man/man8/selinuxdefcon.8
 --- nsalibselinux/man/man8/selinuxdefcon.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man8/selinuxdefcon.8	2008-09-22 13:25:36.000000000 -0400
++++ libselinux-2.0.71/man/man8/selinuxdefcon.8	2008-09-24 07:41:57.000000000 -0400
 @@ -0,0 +1,19 @@
 +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -393,7 +670,7 @@
 +secon(8), selinuxconlist(8)
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/av_perm_to_string.h libselinux-2.0.71/src/av_perm_to_string.h
 --- nsalibselinux/src/av_perm_to_string.h	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/src/av_perm_to_string.h	2008-09-22 13:42:50.000000000 -0400
++++ libselinux-2.0.71/src/av_perm_to_string.h	2008-09-24 07:41:57.000000000 -0400
 @@ -14,12 +14,17 @@
     S_(SECCLASS_DIR, DIR__REPARENT, "reparent")
     S_(SECCLASS_DIR, DIR__SEARCH, "search")
@@ -617,7 +894,7 @@
 +   S_(SECCLASS_X_APPLICATION_DATA, X_APPLICATION_DATA__COPY, "copy")
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.71/src/callbacks.c
 --- nsalibselinux/src/callbacks.c	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/src/callbacks.c	2008-09-22 13:25:36.000000000 -0400
++++ libselinux-2.0.71/src/callbacks.c	2008-09-24 07:41:57.000000000 -0400
 @@ -16,6 +16,7 @@
  {
  	int rc;
@@ -628,7 +905,7 @@
  	va_end(ap);
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/class_to_string.h libselinux-2.0.71/src/class_to_string.h
 --- nsalibselinux/src/class_to_string.h	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/src/class_to_string.h	2008-09-22 13:43:02.000000000 -0400
++++ libselinux-2.0.71/src/class_to_string.h	2008-09-24 07:41:57.000000000 -0400
 @@ -33,18 +33,18 @@
      S_("shm")
      S_("ipc")
@@ -670,7 +947,7 @@
 +    S_("x_application_data")
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.71/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/src/matchpathcon.c	2008-09-22 13:25:36.000000000 -0400
++++ libselinux-2.0.71/src/matchpathcon.c	2008-09-24 07:41:57.000000000 -0400
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>
@@ -688,3 +965,38 @@
  	va_end(ap);
  }
  
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_config.c libselinux-2.0.71/src/selinux_config.c
+--- nsalibselinux/src/selinux_config.c	2008-08-28 09:34:24.000000000 -0400
++++ libselinux-2.0.71/src/selinux_config.c	2008-09-24 08:06:37.000000000 -0400
+@@ -335,13 +335,6 @@
+ 
+ hidden_def(selinux_booleans_path)
+ 
+-const char *selinux_users_path()
+-{
+-	return get_path(USERS_DIR);
+-}
+-
+-hidden_def(selinux_users_path)
+-
+ const char *selinux_usersconf_path()
+ {
+ 	return get_path(SEUSERS);
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.71/utils/matchpathcon.c
+--- nsalibselinux/utils/matchpathcon.c	2008-08-28 09:34:24.000000000 -0400
++++ libselinux-2.0.71/utils/matchpathcon.c	2008-09-26 09:42:51.000000000 -0400
+@@ -106,12 +106,12 @@
+ 
+ 		if (verify) {
+ 			if (quiet) {
+-				if (selinux_file_context_verify(argv[i], 0))
++				if (selinux_file_context_verify(argv[i], mode))
+ 					continue;
+ 				else
+ 					exit(1);
+ 			}
+-			if (selinux_file_context_verify(argv[i], 0)) {
++			if (selinux_file_context_verify(argv[i], mode)) {
+ 				printf("%s verified.\n", argv[i]);
+ 			} else {
+ 				security_context_t con;


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- libselinux.spec	22 Sep 2008 17:52:30 -0000	1.342
+++ libselinux.spec	26 Sep 2008 13:59:45 -0000	1.343
@@ -5,7 +5,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.71
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -163,6 +163,9 @@
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Fri Sep 26 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.71-6
+- Fix matchpathcon -V call 
+
 * Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.71-5
 - Add flask definitions for open, X and nlmsg_tty_audit
 



From dwalsh at fedoraproject.org  Fri Sep 26 14:02:50 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 26 Sep 2008 14:02:50 +0000 (UTC)
Subject: rpms/selinux-policy/F-8 policy-20070703.patch, 1.224,
	1.225 selinux-policy.spec, 1.644, 1.645
Message-ID: <20080926140250.A4B7D7010C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1632

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Thu Sep 25 2008 Dan Walsh <dwalsh at redhat.com> 3.0.8-117
- Update networkmanager to latest upstream version


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-8/policy-20070703.patch,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- policy-20070703.patch	23 Sep 2008 20:09:04 -0000	1.224
+++ policy-20070703.patch	26 Sep 2008 14:02:49 -0000	1.225
@@ -5326,7 +5326,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.0.8/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2008-06-12 23:37:56.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/domain.te	2008-06-12 23:37:59.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/domain.te	2008-09-25 15:20:35.000000000 -0400
 @@ -6,6 +6,22 @@
  # Declarations
  #
@@ -5374,7 +5374,7 @@
  
  tunable_policy(`global_ssp',`
  	# enable reading of urandom for all domains:
-@@ -129,8 +152,46 @@
+@@ -129,8 +152,50 @@
  
  # For /proc/pid
  allow unconfined_domain_type domain:dir r_dir_perms;
@@ -5422,6 +5422,10 @@
 +	rhgb_dontaudit_use_ptys(domain)
 +')
 +
++ifdef(`hide_broken_symptoms',`
++        dbus_dontaudit_system_bus_rw_tcp_sockets(domain)
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-3.0.8/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2008-06-12 23:37:56.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/kernel/files.fc	2008-06-12 23:37:59.000000000 -0400
@@ -9693,7 +9697,7 @@
  ifdef(`distro_redhat',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.0.8/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2008-06-12 23:37:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2008-07-02 17:15:03.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2008-09-25 15:21:28.000000000 -0400
 @@ -50,6 +50,12 @@
  ## </param>
  #
@@ -9864,7 +9868,7 @@
  	allow $1 dbusd_etc_t:file read_file_perms;
  ')
  
-@@ -346,3 +430,57 @@
+@@ -346,3 +430,75 @@
  
  	allow $1 system_dbusd_t:dbus *;
  ')
@@ -9922,6 +9926,24 @@
 +	dbus_connect_system_bus($1)
 +')
 +
++########################################
++## <summary>
++##	Dontaudit Read, and write system dbus TCP sockets.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dbus_dontaudit_system_bus_rw_tcp_sockets',`
++	gen_require(`
++		type system_dbusd_t;
++	')
++
++	allow $1 system_dbusd_t:tcp_socket { read write };
++	allow $1 system_dbusd_t:fd use;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.0.8/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2008-06-12 23:37:57.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/dbus.te	2008-09-23 15:30:42.000000000 -0400
@@ -12883,7 +12905,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.0.8/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2008-06-12 23:37:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te	2008-09-23 16:05:47.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te	2008-09-25 15:15:35.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(networkmanager,1.7.1)
@@ -12974,8 +12996,11 @@
  libs_use_ld_so(NetworkManager_t)
  libs_use_shared_libs(NetworkManager_t)
  
-@@ -109,10 +132,14 @@
+@@ -107,12 +130,17 @@
+ # in /etc created by NetworkManager will be labelled net_conf_t.
+ sysnet_manage_config(NetworkManager_t)
  sysnet_etc_filetrans_config(NetworkManager_t)
++sysnet_read_dhcp_config(NetworkManager_t)
  
  userdom_dontaudit_use_unpriv_user_fds(NetworkManager_t)
 -userdom_dontaudit_search_sysadm_home_dirs(NetworkManager_t)
@@ -12990,7 +13015,7 @@
  
  optional_policy(`
  	bind_domtrans(NetworkManager_t)
-@@ -129,28 +156,26 @@
+@@ -129,28 +157,26 @@
  ')
  
  optional_policy(`
@@ -13029,7 +13054,7 @@
  ')
  
  optional_policy(`
-@@ -159,9 +184,17 @@
+@@ -159,22 +185,25 @@
  ')
  
  optional_policy(`
@@ -13039,15 +13064,27 @@
  	ppp_signal(NetworkManager_t)
 +	ppp_signull(NetworkManager_t)
 +	ppp_read_config(NetworkManager_t)
-+')
-+
-+optional_policy(`
+ ')
+ 
+ optional_policy(`
+-	seutil_sigchld_newrole(NetworkManager_t)
 +	rpm_exec(NetworkManager_t)
 +	rpm_read_db(NetworkManager_t)
 +	rpm_dontaudit_manage_db(NetworkManager_t)
  ')
  
  optional_policy(`
+-	udev_read_db(NetworkManager_t)
++	seutil_sigchld_newrole(NetworkManager_t)
+ ')
+ 
+ optional_policy(`
+-	# Read gnome-keyring
+-	unconfined_read_home_content_files(NetworkManager_t)
++	udev_read_db(NetworkManager_t)
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-3.0.8/policy/modules/services/nis.fc
 --- nsaserefpolicy/policy/modules/services/nis.fc	2008-06-12 23:37:57.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/nis.fc	2008-06-12 23:37:58.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-8/selinux-policy.spec,v
retrieving revision 1.644
retrieving revision 1.645
diff -u -r1.644 -r1.645
--- selinux-policy.spec	23 Sep 2008 20:09:05 -0000	1.644
+++ selinux-policy.spec	26 Sep 2008 14:02:50 -0000	1.645
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 116%{?dist}
+Release: 117%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -381,6 +381,9 @@
 %endif
 
 %changelog
+* Thu Sep 25 2008 Dan Walsh <dwalsh at redhat.com> 3.0.8-117
+- Update networkmanager to latest upstream version
+
 * Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> 3.0.8-116
 - add mimedefang to spamd
 



From dwalsh at fedoraproject.org  Fri Sep 26 14:04:18 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 26 Sep 2008 14:04:18 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.216,
	1.217 selinux-policy.spec, 1.711, 1.712
Message-ID: <20080926140418.3879E7010C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1904

Modified Files:
	policy-20071130.patch selinux-policy.spec 
Log Message:
* Tue Sep 25 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-95
- Allow kismet to bind to port 2501


policy-20071130.patch:

Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- policy-20071130.patch	23 Sep 2008 20:48:11 -0000	1.216
+++ policy-20071130.patch	26 Sep 2008 14:04:16 -0000	1.217
@@ -2083,8 +2083,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.3.1/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/admin/kismet.te	2008-09-08 11:45:12.000000000 -0400
-@@ -0,0 +1,57 @@
++++ serefpolicy-3.3.1/policy/modules/admin/kismet.te	2008-09-25 15:06:31.000000000 -0400
+@@ -0,0 +1,66 @@
 +
 +policy_module(kismet, 1.0.2)
 +
@@ -2115,8 +2115,9 @@
 +allow kismet_t self:capability { net_admin net_raw setuid setgid };
 +allow kismet_t self:fifo_file rw_file_perms;
 +allow kismet_t self:packet_socket create_socket_perms;
-+allow kismet_t self:unix_dgram_socket create_socket_perms;
++allow kismet_t self:unix_dgram_socket { create_socket_perms sendto };
 +allow kismet_t self:unix_stream_socket create_stream_socket_perms;
++allow kismet_t self:tcp_socket create_stream_socket_perms;
 +
 +manage_files_pattern(kismet_t, kismet_log_t, kismet_log_t)
 +allow kismet_t kismet_log_t:dir setattr;
@@ -2132,6 +2133,14 @@
 +
 +corecmd_exec_bin(kismet_t)
 +
++corenet_all_recvfrom_unlabeled(kismet_t)
++corenet_all_recvfrom_netlabel(kismet_t)
++corenet_tcp_sendrecv_all_if(kismet_t)
++corenet_tcp_sendrecv_all_nodes(kismet_t)
++corenet_tcp_sendrecv_all_ports(kismet_t)
++corenet_tcp_bind_all_nodes(kismet_t)
++corenet_tcp_bind_all_kismet_port(kismet_t)
++
 +kernel_search_debugfs(kismet_t)
 +
 +auth_use_nsswitch(kismet_t)
@@ -7581,7 +7590,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.3.1/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/kernel/corenetwork.te.in	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/kernel/corenetwork.te.in	2008-09-25 15:05:52.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(corenetwork,1.2.15)
@@ -7615,7 +7624,7 @@
  network_port(ftp_data, tcp,20,s0)
  network_port(ftp, tcp,21,s0)
  network_port(gatekeeper, udp,1718,s0, udp,1719,s0, tcp,1721,s0, tcp,7000,s0)
-@@ -109,11 +113,13 @@
+@@ -109,11 +113,14 @@
  network_port(ircd, tcp,6667,s0)
  network_port(isakmp, udp,500,s0)
  network_port(iscsi, tcp,3260,s0)
@@ -7625,11 +7634,12 @@
  network_port(kerberos_admin, tcp,464,s0, udp,464,s0, tcp,749,s0)
  network_port(kerberos_master, tcp,4444,s0, udp,4444,s0)
  network_port(kerberos, tcp,88,s0, udp,88,s0, tcp,750,s0, udp,750,s0)
++network_port(kismet, tcp,2501,s0)
 +network_port(kprop, tcp,754,s0)
  network_port(ktalkd, udp,517,s0, udp,518,s0)
  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
-@@ -122,6 +128,8 @@
+@@ -122,6 +129,8 @@
  network_port(mmcc, tcp,5050,s0, udp,5050,s0)
  network_port(monopd, tcp,1234,s0)
  network_port(msnp, tcp,1863,s0, udp,1863,s0)
@@ -7638,7 +7648,7 @@
  network_port(mysqld, tcp,1186,s0, tcp,3306,s0)
  portcon tcp 63132-63163 gen_context(system_u:object_r:mysqld_port_t, s0)
  network_port(nessus, tcp,1241,s0)
-@@ -133,10 +141,13 @@
+@@ -133,10 +142,13 @@
  network_port(pegasus_http, tcp,5988,s0)
  network_port(pegasus_https, tcp,5989,s0)
  network_port(postfix_policyd, tcp,10031,s0)
@@ -7652,7 +7662,7 @@
  network_port(printer, tcp,515,s0)
  network_port(ptal, tcp,5703,s0)
  network_port(pxe, udp,4011,s0)
-@@ -148,11 +159,11 @@
+@@ -148,11 +160,11 @@
  network_port(ricci_modcluster, tcp,16851,s0, udp,16851,s0)
  network_port(rlogind, tcp,513,s0)
  network_port(rndc, tcp,953,s0)
@@ -7666,7 +7676,7 @@
  network_port(smtp, tcp,25,s0, tcp,465,s0, tcp,587,s0)
  network_port(snmp, udp,161,s0, udp,162,s0, tcp,199,s0)
  network_port(spamd, tcp,783,s0)
-@@ -165,12 +176,18 @@
+@@ -165,12 +177,18 @@
  network_port(syslogd, udp,514,s0)
  network_port(telnetd, tcp,23,s0)
  network_port(tftp, udp,69,s0)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v
retrieving revision 1.711
retrieving revision 1.712
diff -u -r1.711 -r1.712
--- selinux-policy.spec	23 Sep 2008 20:09:58 -0000	1.711
+++ selinux-policy.spec	26 Sep 2008 14:04:17 -0000	1.712
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.3.1
-Release: 94%{?dist}
+Release: 95%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -386,6 +386,9 @@
 %endif
 
 %changelog
+* Tue Sep 25 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-95
+- Allow kismet to bind to port 2501
+
 * Tue Sep 23 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-94
 - Update to latest policy for NetworkManager 
 



From jdennis at fedoraproject.org  Fri Sep 26 14:13:15 2008
From: jdennis at fedoraproject.org (John Dennis)
Date: Fri, 26 Sep 2008 14:13:15 +0000 (UTC)
Subject: rpms/freeradius/devel freeradius.spec,1.68,1.69
Message-ID: <20080926141315.F2D9A7010C@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3014

Modified Files:
	freeradius.spec 
Log Message:
Resolves: bug #464119 bootstrap code could not create initial certs in /etc/raddb/certs because
permissions were 750, radiusd running as euid radiusd could not write there, permissions now 770



Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- freeradius.spec	25 Sep 2008 19:49:10 -0000	1.68
+++ freeradius.spec	26 Sep 2008 14:12:45 -0000	1.69
@@ -4,7 +4,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 2.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -332,7 +332,7 @@
 #%attr(640,root,radiusd) %config(noreplace) /etc/raddb/sql/oracle/*
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/users
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/otp.conf
-%dir %attr(750,root,radiusd) /etc/raddb/certs
+%dir %attr(770,root,radiusd) /etc/raddb/certs
 /etc/raddb/certs/Makefile
 /etc/raddb/certs/README
 /etc/raddb/certs/xpextensions
@@ -585,6 +585,10 @@
 %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so
 
 %changelog
+* Fri Sep 26 2008 John Dennis <jdennis at redhat.com> - 2.1.1-1
+- Resolves: bug #464119 bootstrap code could not create initial certs in /etc/raddb/certs because
+  permissions were 750, radiusd running as euid radiusd could not write there, permissions now 770
+
 * Thu Sep 25 2008 John Dennis <jdennis at redhat.com> - 2.1.1-1
 - upgrade to new upstream 2.1.1 release
 



From ausil at fedoraproject.org  Fri Sep 26 14:21:43 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 26 Sep 2008 14:21:43 +0000 (UTC)
Subject: rpms/knetworkmanager/devel .cvsignore, 1.14,
	1.15 knetworkmanager.spec, 1.22, 1.23 sources, 1.14, 1.15
Message-ID: <20080926142143.4D6AA7010C@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/knetworkmanager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4453

Modified Files:
	.cvsignore knetworkmanager.spec sources 
Log Message:
update to new snapshot.  worsk with the current nm api



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	15 Jul 2008 18:32:38 -0000	1.14
+++ .cvsignore	26 Sep 2008 14:21:12 -0000	1.15
@@ -1 +1 @@
-knetworkmanager-0.7-20080715svn.tar.bz2
+knetworkmanager-0.7-20080926svn.tar.bz2


Index: knetworkmanager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/knetworkmanager.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- knetworkmanager.spec	15 Jul 2008 18:32:38 -0000	1.22
+++ knetworkmanager.spec	26 Sep 2008 14:21:12 -0000	1.23
@@ -1,8 +1,8 @@
-%define         svn 20080715svn
+%define         svn 20080926svn
 
 Name:           knetworkmanager
 Version:        0.7
-Release:        0.5.%{svn}%{?dist}
+Release:        0.6.%{svn}%{?dist}
 Summary:        KDE applet for Network Manager
 
 Group:          Applications/Internet
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Dennis Gilmore <dennis at ausil.us> - 0.7-0.6.20080926svn
+- update to 20080926 snapshot 
+
 * Tue Jul 15 2008 Dennis Gilmore <dennis at ausil.us> - 0.7-0.5.20080715svn
 - update to latest snapshot
 - renable all sub-packages


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	15 Jul 2008 18:32:38 -0000	1.14
+++ sources	26 Sep 2008 14:21:12 -0000	1.15
@@ -1 +1 @@
-6fd9dcad8e3d0ac07fe3e0c6f662fdee  knetworkmanager-0.7-20080715svn.tar.bz2
+06ec3a627c14d384918361197b2b6a77  knetworkmanager-0.7-20080926svn.tar.bz2



From dwalsh at fedoraproject.org  Fri Sep 26 14:22:15 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 26 Sep 2008 14:22:15 +0000 (UTC)
Subject: rpms/libselinux/devel libselinux-rhat.patch,1.166,1.167
Message-ID: <20080926142215.240D17010C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4725

Modified Files:
	libselinux-rhat.patch 
Log Message:
* Fri Sep 26 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.71-6
- Fix matchpathcon -V call 


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- libselinux-rhat.patch	26 Sep 2008 13:59:44 -0000	1.166
+++ libselinux-rhat.patch	26 Sep 2008 14:22:14 -0000	1.167
@@ -965,23 +965,6 @@
  	va_end(ap);
  }
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_config.c libselinux-2.0.71/src/selinux_config.c
---- nsalibselinux/src/selinux_config.c	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/src/selinux_config.c	2008-09-24 08:06:37.000000000 -0400
-@@ -335,13 +335,6 @@
- 
- hidden_def(selinux_booleans_path)
- 
--const char *selinux_users_path()
--{
--	return get_path(USERS_DIR);
--}
--
--hidden_def(selinux_users_path)
--
- const char *selinux_usersconf_path()
- {
- 	return get_path(SEUSERS);
 diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.71/utils/matchpathcon.c
 --- nsalibselinux/utils/matchpathcon.c	2008-08-28 09:34:24.000000000 -0400
 +++ libselinux-2.0.71/utils/matchpathcon.c	2008-09-26 09:42:51.000000000 -0400



From jdennis at fedoraproject.org  Fri Sep 26 14:23:11 2008
From: jdennis at fedoraproject.org (John Dennis)
Date: Fri, 26 Sep 2008 14:23:11 +0000 (UTC)
Subject: rpms/freeradius/devel freeradius-0.9.0-com_err.patch, 1.1,
	NONE freeradius-0.9.0-pam-multilib.patch, 1.2,
	NONE freeradius-1.0.0-ltdl_no_la.patch, 1.1,
	NONE freeradius-1.0.0-samba3.patch, 1.1,
	NONE freeradius-1.1.2-no_sql_inc.patch, 1.1,
	NONE freeradius-1.1.3-build.patch, 1.1,
	NONE freeradius-1.1.7-db_dir.patch, 1.1,
	NONE freeradius-1.1.7-ldap.patch, 1.1,
	NONE freeradius-1.1.7-lsb.patch, 1.3, NONE
Message-ID: <20080926142311.37E7D7010C@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5064

Removed Files:
	freeradius-0.9.0-com_err.patch 
	freeradius-0.9.0-pam-multilib.patch 
	freeradius-1.0.0-ltdl_no_la.patch 
	freeradius-1.0.0-samba3.patch 
	freeradius-1.1.2-no_sql_inc.patch freeradius-1.1.3-build.patch 
	freeradius-1.1.7-db_dir.patch freeradius-1.1.7-ldap.patch 
	freeradius-1.1.7-lsb.patch 
Log Message:
get rid of old patches



--- freeradius-0.9.0-com_err.patch DELETED ---


--- freeradius-0.9.0-pam-multilib.patch DELETED ---


--- freeradius-1.0.0-ltdl_no_la.patch DELETED ---


--- freeradius-1.0.0-samba3.patch DELETED ---


--- freeradius-1.1.2-no_sql_inc.patch DELETED ---


--- freeradius-1.1.3-build.patch DELETED ---


--- freeradius-1.1.7-db_dir.patch DELETED ---


--- freeradius-1.1.7-ldap.patch DELETED ---


--- freeradius-1.1.7-lsb.patch DELETED ---



From dwalsh at fedoraproject.org  Fri Sep 26 14:27:44 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 26 Sep 2008 14:27:44 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch,1.217,1.218
Message-ID: <20080926142744.3377F7010C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5718

Modified Files:
	policy-20071130.patch 
Log Message:
* Tue Sep 25 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-95
- Allow kismet to bind to port 2501


policy-20071130.patch:

Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- policy-20071130.patch	26 Sep 2008 14:04:16 -0000	1.217
+++ policy-20071130.patch	26 Sep 2008 14:27:43 -0000	1.218
@@ -20433,7 +20433,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.3.1/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/networkmanager.te	2008-09-23 16:14:12.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/networkmanager.te	2008-09-25 15:15:06.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(networkmanager,1.9.0)
@@ -20524,8 +20524,11 @@
  libs_use_ld_so(NetworkManager_t)
  libs_use_shared_libs(NetworkManager_t)
  
-@@ -109,10 +132,14 @@
+@@ -107,12 +130,17 @@
+ # in /etc created by NetworkManager will be labelled net_conf_t.
+ sysnet_manage_config(NetworkManager_t)
  sysnet_etc_filetrans_config(NetworkManager_t)
++sysnet_read_dhcp_config(NetworkManager_t)
  
  userdom_dontaudit_use_unpriv_user_fds(NetworkManager_t)
 -userdom_dontaudit_search_sysadm_home_dirs(NetworkManager_t)
@@ -20540,7 +20543,7 @@
  
  optional_policy(`
  	bind_domtrans(NetworkManager_t)
-@@ -129,21 +156,26 @@
+@@ -129,21 +157,26 @@
  ')
  
  optional_policy(`
@@ -20572,7 +20575,7 @@
  ')
  
  optional_policy(`
-@@ -152,22 +184,25 @@
+@@ -152,22 +185,25 @@
  ')
  
  optional_policy(`
@@ -33537,7 +33540,7 @@
 +/opt/novell/groupwise/client/lib/libgwapijni\.so\.1	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.3.1/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/libraries.te	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/system/libraries.te	2008-09-26 10:26:45.000000000 -0400
 @@ -23,6 +23,9 @@
  init_system_domain(ldconfig_t,ldconfig_exec_t)
  role system_r types ldconfig_t;
@@ -33548,7 +33551,17 @@
  type ldconfig_tmp_t;
  files_tmp_file(ldconfig_tmp_t)
  
-@@ -44,9 +47,11 @@
+@@ -39,14 +42,21 @@
+ type textrel_shlib_t alias texrel_shlib_t;
+ files_type(textrel_shlib_t)
+ 
++optional_policy(`
++	postgresql_loadable_module(lib_t)
++	postgresql_loadable_module(textrel_shlib_t)
++')
++
+ ########################################
+ #
  # ldconfig local policy
  #
  
@@ -33562,7 +33575,7 @@
  files_etc_filetrans(ldconfig_t,ld_so_cache_t,file)
  
  manage_dirs_pattern(ldconfig_t,ldconfig_tmp_t,ldconfig_tmp_t)
-@@ -60,8 +65,11 @@
+@@ -60,8 +70,11 @@
  
  fs_getattr_xattr_fs(ldconfig_t)
  
@@ -33574,7 +33587,7 @@
  files_search_var_lib(ldconfig_t)
  files_read_etc_files(ldconfig_t)
  files_search_tmp(ldconfig_t)
-@@ -70,6 +78,7 @@
+@@ -70,6 +83,7 @@
  files_delete_etc_files(ldconfig_t)
  
  init_use_script_ptys(ldconfig_t)
@@ -33582,7 +33595,7 @@
  
  libs_use_ld_so(ldconfig_t)
  libs_use_shared_libs(ldconfig_t)
-@@ -86,6 +95,10 @@
+@@ -86,6 +100,10 @@
  	')
  ')
  
@@ -33593,7 +33606,7 @@
  ifdef(`hide_broken_symptoms',`
  	optional_policy(`
  		unconfined_dontaudit_rw_tcp_sockets(ldconfig_t)
-@@ -102,4 +115,10 @@
+@@ -102,4 +120,10 @@
  	# and executes ldconfig on it.  If you dont allow this kernel installs 
  	# blow up.
  	rpm_manage_script_tmp_files(ldconfig_t)



From lkundrak at fedoraproject.org  Fri Sep 26 14:30:38 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 26 Sep 2008 14:30:38 +0000 (UTC)
Subject: rpms/s3cmd/devel s3cmd-0.9.8.3-uri_escape.patch, 1.1, 1.2 s3cmd.spec,
	1.6, 1.7
Message-ID: <20080926143038.1B9F97013F@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/s3cmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6486

Modified Files:
	s3cmd-0.9.8.3-uri_escape.patch s3cmd.spec 
Log Message:
* Fri Sep 26 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.9.8.3-4
- Try 3/65536


s3cmd-0.9.8.3-uri_escape.patch:

Index: s3cmd-0.9.8.3-uri_escape.patch
===================================================================
RCS file: /cvs/pkgs/rpms/s3cmd/devel/s3cmd-0.9.8.3-uri_escape.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- s3cmd-0.9.8.3-uri_escape.patch	26 Sep 2008 12:09:57 -0000	1.1
+++ s3cmd-0.9.8.3-uri_escape.patch	26 Sep 2008 14:30:37 -0000	1.2
@@ -4,13 +4,12 @@
 
 diff -up s3cmd-0.9.8.3/S3/S3.py.uri_escape s3cmd-0.9.8.3/S3/S3.py
 --- s3cmd-0.9.8.3/S3/S3.py.uri_escape	2008-07-03 14:33:39.000000000 +0200
-+++ s3cmd-0.9.8.3/S3/S3.py	2008-09-26 14:05:52.000000000 +0200
-@@ -291,7 +291,7 @@ class S3(object):
- 			else:
- 				param_str += "&%s" % param
- 		if param_str != "":
--			resource['uri'] += "?" + param_str[1:]
-+			resource['uri'] += "?" + self.urlencode_string(param_str[1:])
- 		debug("CreateRequest: resource[uri]=" + resource['uri'])
- 		return (method_string, resource, headers)
- 	
++++ s3cmd-0.9.8.3/S3/S3.py	2008-09-26 16:28:28.000000000 +0200
+@@ -108,6 +108,7 @@ class S3(object):
+ 		def _get_contents(data):
+ 			return getListFromXml(data, "Contents")
+ 
++		prefix = self.urlencode_string(prefix)
+ 		request = self.create_request("BUCKET_LIST", bucket = bucket, prefix = prefix)
+ 		response = self.send_request(request)
+ 		#debug(response)


Index: s3cmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s3cmd/devel/s3cmd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- s3cmd.spec	26 Sep 2008 12:16:07 -0000	1.6
+++ s3cmd.spec	26 Sep 2008 14:30:37 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           s3cmd
 Version:        0.9.8.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tool for accessing Amazon Simple Storage Service
 
 Group:          Applications/Internet
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.9.8.3-4
+- Try 3/65536
+
 * Fri Sep 26 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.9.8.3-3
 - Whoops, forgot to actually apply the patch.
 



From dwalsh at fedoraproject.org  Fri Sep 26 14:30:42 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 26 Sep 2008 14:30:42 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20080710.patch,1.47,1.48
Message-ID: <20080926143042.05D6F7013F@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6393

Modified Files:
	policy-20080710.patch 
Log Message:
* Wed Sep 24 2008 Dan Walsh <dwalsh at redhat.com> 3.5.9-1
- Upgrade to upstream


policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- policy-20080710.patch	26 Sep 2008 12:38:56 -0000	1.47
+++ policy-20080710.patch	26 Sep 2008 14:30:41 -0000	1.48
@@ -541,7 +541,7 @@
 -') dnl end TODO
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.5.9/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.9/policy/modules/admin/kismet.te	2008-09-25 15:06:28.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/admin/kismet.te	2008-09-26 10:29:57.000000000 -0400
 @@ -26,7 +26,11 @@
  #
  
@@ -564,7 +564,7 @@
 +corenet_tcp_sendrecv_all_nodes(kismet_t)
 +corenet_tcp_sendrecv_all_ports(kismet_t)
 +corenet_tcp_bind_all_nodes(kismet_t)
-+corenet_tcp_bind_all_kismet_port(kismet_t)
++corenet_tcp_bind_kismet_port(kismet_t)
 +
 +kernel_search_debugfs(kismet_t)
 +
@@ -22488,7 +22488,7 @@
  /sbin/rpcbind		--	gen_context(system_u:object_r:rpcbind_exec_t,s0)
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.if serefpolicy-3.5.9/policy/modules/services/rpcbind.if
---- nsaserefpolicy/policy/modules/services/rpcbind.if	2008-09-24 09:07:28.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/rpcbind.if	2008-09-26 08:36:03.000000000 -0400
 +++ serefpolicy-3.5.9/policy/modules/services/rpcbind.if	2008-09-25 08:33:18.000000000 -0400
 @@ -122,7 +122,7 @@
  	allow $1 rpcbind_t:process { ptrace signal_perms };



From buc at fedoraproject.org  Fri Sep 26 14:40:56 2008
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Fri, 26 Sep 2008 14:40:56 +0000 (UTC)
Subject: rpms/gtk-gnutella/devel gtk-gnutella.spec,1.18,1.19
Message-ID: <20080926144056.CAD797010C@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7828

Modified Files:
	gtk-gnutella.spec 
Log Message:
pass compiler correctly for Configure script



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/gtk-gnutella.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gtk-gnutella.spec	25 Jun 2008 07:39:45 -0000	1.18
+++ gtk-gnutella.spec	26 Sep 2008 14:40:26 -0000	1.19
@@ -1,7 +1,7 @@
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
 Version: 0.96.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 URL: http://gtk-gnutella.sourceforge.net
@@ -36,7 +36,7 @@
 ./Configure -O -Dprefix=%{_prefix} -Dbindir=%{_bindir} \
 	-Dglibpth="/%{_lib} %{_libdir}" \
 	-Dprivlib=%{_datadir}/%{name} -Dsysman=%{_mandir}/man1 \
-	-Dccflags="%{optflags} -Wall" -Dcc=%{__cc} -Doptimize=" " \
+	-Dccflags="%{optflags} -Wall" -Dcc="%{__cc}" -Doptimize=" " \
 	-Dyacc="byacc" -Dgtkversion=%{?_with_gtk1:1}%{!?_with_gtk1:2} \
 	-Dofficial=true -ders
 make %{?_smp_mflags}
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96.5-3
+- pass compiler correctly for Configure script
+
 * Wed Jun 25 2008 Tomas Mraz <tmraz at redhat.com> - 0.96.5-2
 - rebuild with new gnutls
 



From dwalsh at fedoraproject.org  Fri Sep 26 14:45:10 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 26 Sep 2008 14:45:10 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch,1.218,1.219
Message-ID: <20080926144510.10AB37010C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8535

Modified Files:
	policy-20071130.patch 
Log Message:
* Tue Sep 25 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-95
- Allow kismet to bind to port 2501


policy-20071130.patch:

Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- policy-20071130.patch	26 Sep 2008 14:27:43 -0000	1.218
+++ policy-20071130.patch	26 Sep 2008 14:45:09 -0000	1.219
@@ -2083,7 +2083,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.3.1/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/admin/kismet.te	2008-09-25 15:06:31.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/admin/kismet.te	2008-09-26 10:40:44.000000000 -0400
 @@ -0,0 +1,66 @@
 +
 +policy_module(kismet, 1.0.2)
@@ -2139,7 +2139,7 @@
 +corenet_tcp_sendrecv_all_nodes(kismet_t)
 +corenet_tcp_sendrecv_all_ports(kismet_t)
 +corenet_tcp_bind_all_nodes(kismet_t)
-+corenet_tcp_bind_all_kismet_port(kismet_t)
++corenet_tcp_bind_kismet_port(kismet_t)
 +
 +kernel_search_debugfs(kismet_t)
 +
@@ -35347,7 +35347,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-3.3.1/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/selinuxutil.fc	2008-09-12 09:58:16.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/system/selinuxutil.fc	2008-09-26 10:36:15.000000000 -0400
 @@ -38,7 +38,7 @@
  /usr/sbin/restorecond		--	gen_context(system_u:object_r:restorecond_exec_t,s0)
  /usr/sbin/run_init		--	gen_context(system_u:object_r:run_init_exec_t,s0)



From dwalsh at fedoraproject.org  Fri Sep 26 14:46:59 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 26 Sep 2008 14:46:59 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20080710.patch,1.48,1.49
Message-ID: <20080926144659.7B4CA7010C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8893

Modified Files:
	policy-20080710.patch 
Log Message:
* Wed Sep 24 2008 Dan Walsh <dwalsh at redhat.com> 3.5.9-1
- Upgrade to upstream


policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- policy-20080710.patch	26 Sep 2008 14:30:41 -0000	1.48
+++ policy-20080710.patch	26 Sep 2008 14:46:58 -0000	1.49
@@ -29823,7 +29823,7 @@
  fs_dontaudit_list_tmpfs(mdadm_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-3.5.9/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.9/policy/modules/system/selinuxutil.fc	2008-09-25 08:33:18.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/system/selinuxutil.fc	2008-09-26 10:36:40.000000000 -0400
 @@ -38,7 +38,7 @@
  /usr/sbin/restorecond		--	gen_context(system_u:object_r:restorecond_exec_t,s0)
  /usr/sbin/run_init		--	gen_context(system_u:object_r:run_init_exec_t,s0)
@@ -29833,7 +29833,7 @@
  /usr/sbin/semanage		--	gen_context(system_u:object_r:semanage_exec_t,s0)
  /usr/sbin/semodule		--	gen_context(system_u:object_r:semanage_exec_t,s0)
  
-@@ -46,3 +46,8 @@
+@@ -46,3 +46,11 @@
  # /var/run
  #
  /var/run/restorecond\.pid	--	gen_context(system_u:object_r:restorecond_var_run_t,s0)
@@ -29842,6 +29842,9 @@
 +# /var/lib
 +#
 +/var/lib/selinux(/.*)?			gen_context(system_u:object_r:selinux_var_lib_t,s0)
++
++/etc/share/selinux/targeted(/.*)?	gen_context(system_u:object_r:semanage_store_t,s0)
++/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.5.9/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2008-08-07 11:15:12.000000000 -0400
 +++ serefpolicy-3.5.9/policy/modules/system/selinuxutil.if	2008-09-25 08:33:18.000000000 -0400
@@ -31445,7 +31448,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.9/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.5.9/policy/modules/system/unconfined.te	2008-09-25 14:27:15.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/system/unconfined.te	2008-09-26 10:37:37.000000000 -0400
 @@ -1,40 +1,81 @@
  
 -policy_module(unconfined, 2.3.1)
@@ -31504,7 +31507,7 @@
 +type execmem_exec_t;
 +init_system_domain(unconfined_execmem_t, execmem_exec_t)
  role unconfined_r types unconfined_execmem_t;
-+type execmem_exec_t alias unconfined_execmem_exec_t;
++typealias execmem_exec_t alias unconfined_execmem_exec_t;
 +
 +type unconfined_notrans_t;
 +type unconfined_notrans_exec_t;



From pcheung at fedoraproject.org  Fri Sep 26 14:57:16 2008
From: pcheung at fedoraproject.org (Permaine Cheung)
Date: Fri, 26 Sep 2008 14:57:16 +0000 (UTC)
Subject: rpms/ant/devel ant-1.7.1.pom, NONE, 1.1 ant-antlr-1.7.1.pom, NONE, 
	1.1 ant-apache-bcel-1.7.1.pom, NONE,
	1.1 ant-apache-bsf-1.7.1.pom, NONE,
	1.1 ant-apache-log4j-1.7.1.pom, NONE,
	1.1 ant-apache-oro-1.7.1.pom, NONE,
	1.1 ant-apache-regexp-1.7.1.pom, NONE,
	1.1 ant-apache-resolver-1.7.1.pom, NONE,
	1.1 ant-commons-logging-1.7.1.pom, NONE,
	1.1 ant-commons-net-1.7.1.pom, NONE, 1.1 ant-javamail-1.7.1.pom,
	NONE, 1.1 ant-jdepend-1.7.1.pom, NONE, 1.1 ant-jmf-1.7.1.pom,
	NONE, 1.1 ant-jsch-1.7.1.pom, NONE, 1.1 ant-junit-1.7.1.pom,
	NONE, 1.1 ant-launcher-1.7.1.pom, NONE,
	1.1 ant-netrexx-1.7.1.pom, NONE, 1.1 ant-nodeps-1.7.1.pom, NONE,
	1.1 ant-parent-1.7.1.pom, NONE, 1.1 ant-starteam-1.7.1.pom, NONE,
	1.1 ant-stylebook-1.7.1.pom, NONE, 1.1 ant-swing-1.7.1.pom, NONE,
	1.1 ant-trax-1.7.1.pom, NONE, 1.1 ant-weblogic-1.7.1.pom, NONE,
	1.1 apache-ant-class-path-in-manifest.patch, NONE,
	1.1 apache-ant-gnu-classpath.patch, NONE,
	1.1 apache-ant-no-test-jar.patch, NONE, 1.1 .cvsignore, 1.16,
	1.17 ant.spec, 1.93, 1.94 apache-ant-1.7.ant.conf, 1.1,
	1.2 apache-ant-bz163689.patch, 1.1, 1.2 apache-ant-jars.patch,
	1.2, 1.3 sources, 1.14, 1.15
Message-ID: <20080926145716.65D757010C@cvs1.fedora.phx.redhat.com>

Author: pcheung

Update of /cvs/extras/rpms/ant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10140

Modified Files:
	.cvsignore ant.spec apache-ant-1.7.ant.conf 
	apache-ant-bz163689.patch apache-ant-jars.patch sources 
Added Files:
	ant-1.7.1.pom ant-antlr-1.7.1.pom ant-apache-bcel-1.7.1.pom 
	ant-apache-bsf-1.7.1.pom ant-apache-log4j-1.7.1.pom 
	ant-apache-oro-1.7.1.pom ant-apache-regexp-1.7.1.pom 
	ant-apache-resolver-1.7.1.pom ant-commons-logging-1.7.1.pom 
	ant-commons-net-1.7.1.pom ant-javamail-1.7.1.pom 
	ant-jdepend-1.7.1.pom ant-jmf-1.7.1.pom ant-jsch-1.7.1.pom 
	ant-junit-1.7.1.pom ant-launcher-1.7.1.pom 
	ant-netrexx-1.7.1.pom ant-nodeps-1.7.1.pom 
	ant-parent-1.7.1.pom ant-starteam-1.7.1.pom 
	ant-stylebook-1.7.1.pom ant-swing-1.7.1.pom ant-trax-1.7.1.pom 
	ant-weblogic-1.7.1.pom apache-ant-class-path-in-manifest.patch 
	apache-ant-gnu-classpath.patch apache-ant-no-test-jar.patch 
Log Message:
Upgrade to 1.7.1


--- NEW FILE ant-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant</artifactId>
  <version>1.7.1</version>
  <name>org.apache.tools.ant</name>
  <description>Apache Ant</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant-launcher</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <!-- the implementation jar of the xerces jar will be used by ant to parse
      XML files, particularly the build files, if the JDK does not provide a parser
        xercesImpl.jar is provided with ant -->
      <groupId>xerces</groupId>
      <artifactId>xercesImpl</artifactId>
      <version>2.9.0</version>
      <optional>true</optional>
      <scope>runtime</scope>
    </dependency>
    <dependency>
      <!-- xml-apis contains the org.w3c.dom package 
      since ant is using DOM APIS to parse the XML build file and do other XML related activities
      xml-apis is a compile time dependency
      a version of xml-apis.jar is delivered with ant -->
      <groupId>xml-apis</groupId>
      <artifactId>xml-apis</artifactId>
      <version>1.3.04</version>
      <optional>true</optional>
      <scope>compile</scope>
    </dependency>
  </dependencies>
  <build>
    <filters>
      <filter>../../../../target/ant/.build.timestamp.properties</filter>
    </filters>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-jar-plugin</artifactId>
        <configuration> </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-antrun-plugin</artifactId>
        <executions>
          <execution>
            <id>create-timestamp-file</id>
            <phase>generate-resources</phase>
            <goals>
              <goal>run</goal>
            </goals>
            <configuration>
              <tasks>
                <tstamp/>
                <mkdir dir="${project.build.directory}"/>
                <touch file="${project.build.directory}/.build.timestamp.properties"/>
                <echo file="${project.build.directory}/.build.timestamp.properties" append="false"
                  message="TODAY=${TODAY}"/>
              </tasks>
            </configuration>
          </execution>
          <execution>
            <id>delete-timestamp-file</id>
            <phase>clean</phase>
            <goals>
              <goal>run</goal>
            </goals>
            <configuration>
              <tasks>
                <delete file="${project.build.directory}/.build.timestamp.properties"/>
              </tasks>
            </configuration>
          </execution>
        </executions>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <excludes>
            <exclude>org/apache/tools/ant/taskdefs/optional/**</exclude>
            <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
            <exclude>org/apache/tools/ant/types/optional/**</exclude>
            <exclude>org/apache/tools/ant/types/resolver/**</exclude>
            <exclude>org/apache/tools/ant/util/depend/**</exclude>
            <exclude>org/apache/tools/ant/util/optional/**</exclude>
            <exclude>org/apache/tools/ant/util/Script*</exclude>
            <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
            <exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
            <exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
            <exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
            <exclude>org/apache/tools/ant/util/regexp/Jdk14Regexp*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
            <exclude>org/apache/tools/ant/launch/**</exclude>
          </excludes>
          <testExcludes>
            <exclude>org/apache/tools/ant/taskdefs/optional/**</exclude>
            <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
            <exclude>org/apache/tools/ant/types/optional/**</exclude>
            <exclude>org/apache/tools/ant/types/resolver/**</exclude>
            <exclude>org/apache/tools/ant/util/depend/**</exclude>
            <exclude>org/apache/tools/ant/util/optional/**</exclude>
            <exclude>org/apache/tools/ant/util/Script*</exclude>
            <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
            <exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
            <exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
            <exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
            <exclude>org/apache/tools/ant/util/regexp/Jdk14Regexp*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
            <exclude>org/apache/tools/ant/launch/**</exclude>
            <exclude>org/apache/tools/ant/taskdefs/StyleTest*</exclude>
          </testExcludes>
        </configuration>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-surefire-plugin</artifactId>
        <configuration>
          <omitBasedir>true</omitBasedir>
          <systemProperties>
            <property>
              <name>ant.home</name>
              <value>${env.ANT_HOME}</value>
            </property>
            <property>
              <name>build.tests</name>
              <value>../../../../target/ant/testcases</value>
            </property>
            <property>
              <name>build.tests.value</name>
              <value>../../../../target/ant/testcases</value>
            </property>
            <property>
              <name>offline</name>
              <value>true</value>
            </property>
            <property>
              <name>root</name>
              <value>../../../..</value>
            </property>
          </systemProperties>
        </configuration>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-surefire-report-plugin</artifactId>
      </plugin>
    </plugins>
    <resources>
      <resource>
        <directory>../../../../src/main</directory>
        <filtering>true</filtering>
        <includes>
          <include>org/apache/tools/ant/taskdefs/default.properties</include>
          <include>org/apache/tools/ant/types/default.properties</include>
          <include>org/apache/tools/ant/taskdefs/default.properties</include>
          <include>org/apache/tools/ant/types/conditions/antlib.xml</include>
          <include>org/apache/tools/ant/defaultManifest.mf</include>
          <include>org/apache/tools/ant/version.txt</include>
        </includes>
      </resource>
      <resource>
        <directory>../../../../src/resources</directory>
        <filtering>true</filtering>
        <includes>
          <include>**/antlib.xml</include>
        </includes>
      </resource>
      <resource>
        <directory>../../../../docs</directory>
        <filtering>false</filtering>
        <includes>
          <include>images/ant_logo_large.gif</include>
        </includes>
      </resource>
    </resources>
    <testResources>
      <testResource>
        <directory>../../../../src/etc/testcases</directory>
        <filtering>true</filtering>
      </testResource>
      <testResource>
        <directory>../../../../src/main</directory>
        <filtering>true</filtering>
        <excludes>
          <exclude>**/*.java</exclude>
        </excludes>
      </testResource>
    </testResources>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
    <outputDirectory>../../../../target/ant/classes</outputDirectory>
    <testOutputDirectory>../../../../target/ant/testcases</testOutputDirectory>
    <directory>../../../../target/ant</directory>
  </build>
</project>


--- NEW FILE ant-antlr-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-antlr</artifactId>
  <version>1.7.1</version>
  <description>antlr specific task.
    The implementation forks a java process, therefore the antlr jar file is only needed at runtime</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <optional>true</optional>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <!-- add a dependency with antlr 2.7.2 consistent with libraries.properties antlr 2.7.6 is also available on ibiblio-->
      <groupId>antlr</groupId>
      <artifactId>antlr</artifactId>
      <version>2.7.2</version>
      <optional>true</optional>
      <scope>runtime</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant/taskdefs/optional/ANTLR*</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
</project>


--- NEW FILE ant-apache-bcel-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-apache-bcel</artifactId>
  <version>1.7.1</version>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>bcel</groupId>
      <artifactId>bcel</artifactId>
      <version>5.1</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant/tfilters/util/JavaClassHelper*</include>
            <include>org/apache/tools/ant/tutil/depend/bcel/*</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
</project>


--- NEW FILE ant-apache-bsf-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-apache-bsf</artifactId>
  <version>1.7.1</version>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>bsf</groupId>
      <artifactId>bsf</artifactId>
      <version>2.4.0</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant/taskdefs/optional/Script*</include>
            <include>org/apache/tools/ant/taskdefs/optional/script/**</include>
            <include>org/apache/tools/ant/types/optional/*Script*</include>
            <include>org/apache/tools/ant/util/Script*</include>
            <include>org/apache/tools/ant/util/optional/Script*</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
</project>


--- NEW FILE ant-apache-log4j-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-apache-log4j</artifactId>
  <version>1.7.1</version>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>log4j</groupId>
      <artifactId>log4j</artifactId>
      <version>1.2.13</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant/listener/Log4jListener*</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
</project>


--- NEW FILE ant-apache-oro-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-apache-oro</artifactId>
  <version>1.7.1</version>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>oro</groupId>
      <artifactId>oro</artifactId>
      <version>2.0.8</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant/util/regexp/JakartaOro*</include>
            <include>org/apache/tools/ant/taskdefs/optional/perforce/*</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
</project>


--- NEW FILE ant-apache-regexp-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-apache-regexp</artifactId>
  <version>1.7.1</version>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>regexp</groupId>
      <artifactId>regexp</artifactId>
      <version>1.3</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant/util/regexp/JakartaRegexp*</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
  
</project>


--- NEW FILE ant-apache-resolver-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-apache-resolver</artifactId>
  <version>1.7.1</version>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>xml-resolver</groupId>
      <artifactId>xml-resolver</artifactId>
      <version>1.1</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant/types/resolver/**</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
</project>


--- NEW FILE ant-commons-logging-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-commons-logging</artifactId>
  <version>1.7.1</version>
  <description>Ant Listener based on commons-logging</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>commons-logging</groupId>
      <artifactId>commons-logging-api</artifactId>
      <version>1.0.4</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant/tlistener/CommonsLoggingListener*</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
</project>


--- NEW FILE ant-commons-net-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-commons-net</artifactId>
  <version>1.7.1</version>
  <description>ftp, rexec and telnet tasks</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>commons-net</groupId>
      <artifactId>commons-net</artifactId>
      <version>1.4.0</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant/taskdefs/optional/net/FTP*</include>
            <include>org/apache/tools/ant/taskdefs/optional/net/RExec*</include>
            <include>org/apache/tools/ant/taskdefs/optional/net/TelnetTask*</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
</project>


--- NEW FILE ant-javamail-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-javamail</artifactId>
  <version>1.7.1</version>
  <description>implementation of the mail task based on javamail.
    Required to send emails to SMTP servers using user/password combinations
  or to send mail over SSL</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>javax.mail</groupId>
      <artifactId>mail</artifactId>
      <version>1.4</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>javax.activation</groupId>
      <artifactId>activation</artifactId>
      <version>1.1</version>
      <scope>compile</scope>
    </dependency>
  </dependencies> 
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant//taskdefs/email/MimeMailer*</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
</project>


--- NEW FILE ant-jdepend-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-jdepend</artifactId>
  <version>1.7.1</version>
  <description>task jdepend invoking the jdepend parser. There is also a version 2.9.1 of the
    jdepend parser available on the maven repository</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>jdepend</groupId>
      <artifactId>jdepend</artifactId>
      <version>2.7</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant//taskdefs/optional/jdepend/*</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
</project>


--- NEW FILE ant-jmf-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-jmf</artifactId>
  <version>1.7.1</version>
  <description>contains the sound task and a soundplayer listener
    download the dependency from http://java.sun.com/products/java-media/jmf/</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>javax.media</groupId>
      <artifactId>jmf</artifactId>
      <version>2.1.1e</version>
      <scope>provided</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant//taskdefs/optional/sound/*</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
  </project>


--- NEW FILE ant-jsch-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-jsch</artifactId>
  <version>1.7.1</version>
  <description>contains the sshexec and scp tasks
  jsch 0.1.29 might not be available from maven</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>com.jcraft</groupId>
      <artifactId>jsch</artifactId>
      <version>0.1.29</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant//taskdefs/optional/ssh/*</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
</project>


--- NEW FILE ant-junit-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-junit</artifactId>
  <version>1.7.1</version>
  <description>contains the junit and junirreport tasks</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>3.8.2</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <artifactId>maven-antrun-plugin</artifactId>
        <executions>
          <execution>
            <id>create-timestamp-file</id>
            <phase>generate-resources</phase>
            <goals>
              <goal>run</goal>
            </goals>
            <configuration>
              <tasks>
                <mkdir dir="${project.build.outputDirectory}"/>
                <copy todir="${project.build.outputDirectory}/org/apache/tools/ant/taskdefs/optional/junit/xsl">
                  <fileset dir="${project.build.sourceDirectory}/../etc">
                    <include name="junit-frames.xsl"/>
                    <include name="junit-noframes.xsl"/>
                  </fileset>
                </copy>              
              </tasks>
            </configuration>
          </execution>

        </executions>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant//taskdefs/optional/junit/*</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
</project>


--- NEW FILE ant-launcher-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-launcher</artifactId>
  <version>1.7.1</version>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant/launch/*.java</include>
          </includes>

        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/ant-launcher/classes</outputDirectory>
    <testOutputDirectory>../../../../target/ant-launcher/testcases</testOutputDirectory>
    <directory>../../../../target/ant-launcher</directory>
  </build>
</project>


--- NEW FILE ant-netrexx-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-netrexx</artifactId>
  <version>1.7.1</version>
  <description>NetRexxC task
    dependency can be downloaded from http://www.ibm.com/software/awdtools/netrexx/download.html</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>com.ibm.netrexx</groupId>
      <artifactId>netrexx</artifactId>
      <version>2.0.5</version>
      <scope>provided</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant//taskdefs/optional/NetRexxC*</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
</project>


--- NEW FILE ant-nodeps-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-nodeps</artifactId>
  <version>1.7.1</version>
  <description>contains all the optional tasks and types which do not have particular dependencies</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <!-- the implementation jar of the xerces jar will be used by ant to parse
      XML files, particularly the build files, if the JDK does not provide a parser
      xercesImpl.jar is provided with ant -->
      <groupId>xerces</groupId>
      <artifactId>xercesImpl</artifactId>
      <version>2.9.0</version>
      <optional>true</optional>
      <scope>runtime</scope>
    </dependency>
    <dependency>
      <!-- xml-apis contains the org.w3c.dom package 
        since ant is using DOM APIS to parse the XML build file and do other XML related activities
        xml-apis is a compile time dependency
        a version of xml-apis.jar is delivered with ant -->
      <groupId>xml-apis</groupId>
      <artifactId>xml-apis</artifactId>
      <version>1.3.04</version>
      <optional>true</optional>
      <scope>compile</scope>
    </dependency>

  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant/taskdefs/optional/**</include>
            <include>org/apache/tools/ant/types/optional/**</include>
            <include>org/apache/tools/ant/util/depend/*</include>
            <include>org/apache/tools/ant/util/optional/**</include>
            <include>org/apache/tools/ant/util/java15/**</include>
            <include>org/apache/tools/ant/util/regexp/Jdk14Regexp*</include>
          </includes>
          <excludes>
            <exclude>org/apache/tools/ant/taskdefs/optional/TraXLiaison*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/junit/**</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/perforce/**</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/Script*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/script/**</exclude>
            <exclude>org/apache/tools/ant/util/optional/Script*</exclude>
            <exclude>org/apache/tools/ant/types/optional/*Script*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/StyleBook*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/NetRexxC*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/ejb/Ejbc*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/ejb/DDCreator*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/ejb/WLRun*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/ejb/WLStop*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/net/Telnet*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/net/FTP*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/net/RExec*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/scm/AntStarTeam*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/starteam/*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/ANTLR*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/sound/*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/image/*</exclude>
            <exclude>org/apache/tools/ant/types/optional/image/*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/jdepend/*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/splash/*</exclude>
            <exclude>org/apache/tools/ant/taskdefs/optional/ssh/*</exclude>
            
          </excludes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/ant-nodeps/classes</outputDirectory>
    <testOutputDirectory>../../../../target/ant-nodeps/testcases</testOutputDirectory>
    <directory>../../../../target/ant-nodeps</directory>
  </build>
</project>


--- NEW FILE ant-parent-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-parent</artifactId>
  <version>1.7.1</version>
  <packaging>pom</packaging>
  <description>master POM</description>
  <name>Apache Ant</name>
  <url>http://ant.apache.org/</url>
  <inceptionYear>2000</inceptionYear>
  <organization>
    <name>Apache Software Foundation</name>
  </organization>
  <distributionManagement>
    <!-- Null out inherited apache distribution repo by default -->
    <repository>
      <id>dummy</id>
      <name>Dummy to avoid accidental deploys</name>
      <url></url>
    </repository>
  </distributionManagement>
  <scm>
    <connection>scm:svn:http://svn.apache.org/repos/asf/ant/core/trunk</connection>
    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jant/core/trunk</developerConnection>
    <url>http://svn.apache.org/repos/asf/ant/core/trunk</url>
  </scm>
  <mailingLists>
    <mailingList>
      <name>Ant Developers List</name>
      <subscribe>dev-subscribe at ant.apache.org</subscribe>
      <unsubscribe>dev-unsubscribe at ant.apache.org</unsubscribe>
      <post>dev at ant.apache.org</post>
      <archive>http://mail-archives.apache.org/mod_mbox/ant-dev</archive>
    </mailingList>
    <mailingList>
      <name>Ant Users List</name>
      <subscribe>user-subscribe at ant.apache.org</subscribe>
      <unsubscribe>user-unsubscribe at ant.apache.org</unsubscribe>
      <post>user at ant.apache.org</post>
      <archive>http://mail-archives.apache.org/mod_mbox/ant-user</archive>
    </mailingList>
  </mailingLists>
  <issueManagement>
    <system>bugzilla</system>
    <url>http://issues.apache.org/bugzilla/</url>
  </issueManagement>
  <modules>
    <module>ant</module>
    <module>ant-antlr</module>
    <module>ant-apache-bcel</module>
    <module>ant-apache-bsf</module>
    <module>ant-apache-log4j</module>
    <module>ant-apache-oro</module>
    <module>ant-apache-regexp</module>
    <module>ant-apache-resolver</module>
    <module>ant-commons-logging</module>
    <module>ant-commons-net</module>
    <module>ant-jai</module>
    <module>ant-javamail</module>
    <module>ant-jdepend</module>
    <module>ant-jmf</module>
    <module>ant-jsch</module>
    <module>ant-junit</module>
    <module>ant-launcher</module>
    <module>ant-netrexx</module>
    <module>ant-nodeps</module>
    <module>ant-starteam</module>
    <module>ant-stylebook</module>
    <module>ant-swing</module>
    <module>ant-testutil</module>
    <module>ant-trax</module>
    <module>ant-weblogic</module>
  </modules>
  <dependencies>
     <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>3.8.2</version>
      <scope>test</scope>
    </dependency>
  </dependencies>
  <build>
    <sourceDirectory>../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../target/classes</outputDirectory>
    <testOutputDirectory>../../../target/testcases</testOutputDirectory>
  </build>
</project>


--- NEW FILE ant-starteam-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-starteam</artifactId>
  <description>Starteam SDK tasks</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>com.starteam</groupId>
      <artifactId>starteam-sdk</artifactId>
      <version>5.2</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant//taskdefs/optional/scm/AntStarTeam*</include>
            <include>org/apache/tools/ant//taskdefs/optional/scm/starteam/*</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
</project>


--- NEW FILE ant-stylebook-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-stylebook</artifactId>
  <version>1.7.1</version>
  <description>executes the Apache Stylebook document generator. Deprecated since Ant 1.7</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>stylebook</groupId>
      <artifactId>stylebook</artifactId>
      <version>1.0-b2</version>
      <scope>provided</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant//taskdefs/optional/StyleBook*</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
  
</project>


--- NEW FILE ant-swing-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-swing</artifactId>
  <version>1.7.1</version>
  <description>a listener and a splash task based on Swing</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant//taskdefs/optional/splash/*</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
  
</project>


--- NEW FILE ant-trax-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-trax</artifactId>
  <version>1.7.1</version>
  <description>contains particularly one class necessary for the execution of the xslt task</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <!-- the implementation jar of the xerces jar will be used by ant to parse
      XML files, particularly the build files, if the JDK does not provide a parser
      xercesImpl.jar is provided with ant -->
      <groupId>xerces</groupId>
      <artifactId>xercesImpl</artifactId>
      <version>2.9.0</version>
      <optional>true</optional>
      <scope>runtime</scope>
    </dependency>
    <dependency>
      <!-- xml-apis contains the org.w3c.dom package 
        since ant is using DOM APIS to parse the XML build file and do other XML related activities
        xml-apis is a compile time dependency
        a version of xml-apis.jar is delivered with ant -->
      <groupId>xml-apis</groupId>
      <artifactId>xml-apis</artifactId>
      <version>1.3.04</version>
      <optional>true</optional>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <!-- xalan contains a TRAX compliant implementation -->
      <groupId>xalan</groupId>
      <artifactId>xalan</artifactId>
      <version>2.7.0</version>
      <optional>true</optional>
      <scope>runtime</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant//taskdefs/optional/TraXLiaison*</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
  </project>


--- NEW FILE ant-weblogic-1.7.1.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
   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.
-->
<!--
  This POM has been created manually by the Ant Development Team.
  Please contact us if you are not satisfied with the data contained in this POM.
  URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.ant</groupId>
    <artifactId>ant-parent</artifactId>
    <relativePath>../pom.xml</relativePath>
    <version>1.7.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.ant</groupId>
  <artifactId>ant-weblogic</artifactId>
  <version>1.7.1</version>
  <dependencies>
    <dependency>
      <groupId>org.apache.ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.7.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>com.bea</groupId>
      <artifactId>weblogicclasses</artifactId>
      <version>5.1</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>com.bea</groupId>
      <artifactId>weblogic</artifactId>
      <version>8.1.3.0</version>
      <scope>provided</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <source>1.2</source>
          <target>1.2</target>
          <includes>
            <include>org/apache/tools/ant//taskdefs/optional/ejb/Ejbc*</include>
            <include>org/apache/tools/ant//taskdefs/optional/ejb/DDCreator*</include>
            <include>org/apache/tools/ant//taskdefs/optional/ejb/WLRun*</include>
            <include>org/apache/tools/ant//taskdefs/optional/ejb/WLStop*</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
    <sourceDirectory>../../../../src/main</sourceDirectory>
    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
    <directory>../../../../target/${project.artifactId}</directory>
  </build>
</project>

apache-ant-class-path-in-manifest.patch:

--- NEW FILE apache-ant-class-path-in-manifest.patch ---
--- build.xml.orig	2008-09-25 09:14:02.000000000 -0400
+++ build.xml	2008-09-25 09:14:16.000000000 -0400
@@ -811,10 +811,10 @@
         <include name="LICENSE.txt"/>
         <include name="NOTICE.txt"/>
       </metainf>
-      <manifest>
+      <!--  <manifest>
         <attribute name="Class-Path"
           value="ant.jar xml-apis.jar xercesImpl.jar xalan.jar"/>
-      </manifest>
+      </manifest> -->
     </jar>
 
     <jar destfile="${build.lib}/ant-nodeps.jar"

apache-ant-gnu-classpath.patch:

--- NEW FILE apache-ant-gnu-classpath.patch ---
--- apache-ant-1.7.1/src/main/org/apache/tools/ant/util/JavaEnvUtils.java.orig	2008-06-27 01:05:20.000000000 -0400
+++ apache-ant-1.7.1/src/main/org/apache/tools/ant/util/JavaEnvUtils.java	2008-07-10 17:08:05.793449901 -0400
@@ -134,7 +134,7 @@
         }
         kaffeDetected = false;
         try {
-            Class.forName("kaffe.util.NotImplemented");
+            Class.forName("gnu.classpath.Configuration");
             kaffeDetected = true;
         } catch (Throwable t) {
             // swallow as this simply doesn't seem to be Kaffe
--- apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java.orig	2008-06-27 01:05:20.000000000 -0400
+++ apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java	2008-07-10 17:08:05.801530455 -0400
@@ -56,7 +56,7 @@
 
     private Commandline setupKaffehCommand(Javah javah) {
         Commandline cmd = new Commandline();
-        cmd.setExecutable(JavaEnvUtils.getJdkExecutable("kaffeh"));
+        cmd.setExecutable(JavaEnvUtils.getJdkExecutable("javah"));
 
         if (javah.getDestdir() != null) {
             cmd.createArgument().setValue("-d");
--- apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java.orig	2008-06-27 01:05:21.000000000 -0400
+++ apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java	2008-07-10 17:10:47.081449425 -0400
@@ -32,9 +32,7 @@
 
     // sorted by newest Kaffe version first
     private static final String[] N2A_CLASSNAMES = new String[] {
-        "gnu.classpath.tools.native2ascii.Native2Ascii",
-        // pre Kaffe 1.1.5
-        "kaffe.tools.native2ascii.Native2Ascii",
+        "gnu.classpath.tools.native2ascii.Native2ASCII",
     };
 
     /**

apache-ant-no-test-jar.patch:

--- NEW FILE apache-ant-no-test-jar.patch ---
--- apache-ant-1.7.1/build.xml.orig	2008-07-15 15:34:52.748697343 -0400
+++ apache-ant-1.7.1/build.xml	2008-07-15 15:35:20.247215410 -0400
@@ -925,7 +925,7 @@
        ===================================================================
   -->
   <target name="dist-lite"
-    depends="jars,test-jar"
+    depends="jars"
     description="--> creates a minimum distribution to run Apache Ant">
 
     <mkdir dir="${dist.dir}"/>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ant/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	20 Jul 2007 20:57:49 -0000	1.16
+++ .cvsignore	26 Sep 2008 14:56:45 -0000	1.17
@@ -1 +1 @@
-apache-ant-1.7.0-src.tar.gz
+apache-ant-1.7.1-src.tar.bz2


Index: ant.spec
===================================================================
RCS file: /cvs/extras/rpms/ant/devel/ant.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- ant.spec	9 Jul 2008 17:00:49 -0000	1.93
+++ ant.spec	26 Sep 2008 14:56:45 -0000	1.94
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2007, JPackage Project
+# Copyright (c) 2000-2008, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,33 +28,32 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-%define with_manifest_only 0
+%define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
+%define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
+%define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
+%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
+
+%bcond_with bootstrap
+
+%if %with bootstrap
+%define build_javadoc        0
+%else
+%define build_javadoc        1
+%endif
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
-# Bootstrap sequence is
-# 1) rpmbuild ant --with bootstrap1 and install
-# 2) build xml-commons-apis and install
-# 3) build some jaxp_parser_impl (crimson) and install
-# 4) rpmbuild ant --with bootstrap2 and force update
-# 5) build rest of full ant BRs and install them
-# 6) rpmbuild ant (no special option) and force update
-
-# build while still no jaxp_parser_impl nor xml-commons-apis available
-%define bootstrap1 %{?_with_bootstrap1:1}%{!?_with_bootstrap1:%{?_without_bootstrap1:0}%{!?_without_bootstrap1:%{?_bootstrap1:%{_bootstrap1}}%{!?_bootstrap1:0}}}
-# build core packages when xml-commons-apis and some jaxp_parser_impl available
-%define bootstrap2 %{?_with_bootstrap2:1}%{!?_with_bootstrap2:%{?_without_bootstrap2:0}%{!?_without_bootstrap2:%{?_bootstrap2:%{_bootstrap2}}%{!?_bootstrap2:0}}}
+%define with_manifest_only 0
 
 %define ant_home %{_datadir}/ant
 %define section  free
 
 %define major_version 1.7
-%define cvs_version 1.7.0
+%define cvs_version 1.7.1
 
 Name:           ant
-Version:        1.7.0
-Release:        2%{?dist}
+Version:        1.7.1
+Release:        7%{?dist}
 Epoch:          0
 Summary:        Ant build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -62,57 +61,84 @@
 License:        ASL 2.0
 URL:            http://ant.apache.org/
 Group:          Development/Build Tools
-Source0:        http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.gz
+Source0:        http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.bz2
 Source2:        apache-ant-%{major_version}.ant.conf
-# javah: BZ 157750
-# https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008781.html
-# https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008785.html
-# Message-ID: <432A8E37.8050101 at zarb.org>
-Patch2:         apache-ant-1.7.0-javah.patch
+Source1:        http://repo1.maven.org/maven2/org/apache/ant/ant/1.7.1/ant-1.7.1.pom
+Source3:        http://repo1.maven.org/maven2/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.pom
+Source4:        http://repo1.maven.org/maven2/org/apache/ant/ant-netrexx/1.7.1/ant-netrexx-1.7.1.pom
+Source5:        http://repo1.maven.org/maven2/org/apache/ant/ant-starteam/1.7.1/ant-starteam-1.7.1.pom
+Source6:        http://repo1.maven.org/maven2/org/apache/ant/ant-stylebook/1.7.1/ant-stylebook-1.7.1.pom
+Source7:        http://repo1.maven.org/maven2/org/apache/ant/ant-weblogic/1.7.1/ant-weblogic-1.7.1.pom
+Source8:        http://repo1.maven.org/maven2/org/apache/ant/ant-antlr/1.7.1/ant-antlr-1.7.1.pom
+Source9:        http://repo1.maven.org/maven2/org/apache/ant/ant-apache-bsf/1.7.1/ant-apache-bsf-1.7.1.pom
+Source10:       http://repo1.maven.org/maven2/org/apache/ant/ant-apache-resolver/1.7.1/ant-apache-resolver-1.7.1.pom
+Source11:       http://repo1.maven.org/maven2/org/apache/ant/ant-commons-logging/1.7.1/ant-commons-logging-1.7.1.pom
+Source12:       http://repo1.maven.org/maven2/org/apache/ant/ant-commons-net/1.7.1/ant-commons-net-1.7.1.pom
+#Source13:       http://repo1.maven.org/maven2/org/apache/ant/ant-jai/1.7.1/ant-jai-1.7.1.pom
+Source14:       http://repo1.maven.org/maven2/org/apache/ant/ant-apache-bcel/1.7.1/ant-apache-bcel-1.7.1.pom
+Source15:       http://repo1.maven.org/maven2/org/apache/ant/ant-apache-log4j/1.7.1/ant-apache-log4j-1.7.1.pom
+Source16:       http://repo1.maven.org/maven2/org/apache/ant/ant-apache-oro/1.7.1/ant-apache-oro-1.7.1.pom
+Source17:       http://repo1.maven.org/maven2/org/apache/ant/ant-apache-regexp/1.7.1/ant-apache-regexp-1.7.1.pom
+Source18:       http://repo1.maven.org/maven2/org/apache/ant/ant-javamail/1.7.1/ant-javamail-1.7.1.pom
+Source19:       http://repo1.maven.org/maven2/org/apache/ant/ant-jdepend/1.7.1/ant-jdepend-1.7.1.pom
+Source20:       http://repo1.maven.org/maven2/org/apache/ant/ant-jmf/1.7.1/ant-jmf-1.7.1.pom
+Source21:       http://repo1.maven.org/maven2/org/apache/ant/ant-jsch/1.7.1/ant-jsch-1.7.1.pom
+Source22:       http://repo1.maven.org/maven2/org/apache/ant/ant-junit/1.7.1/ant-junit-1.7.1.pom
+Source23:       http://repo1.maven.org/maven2/org/apache/ant/ant-nodeps/1.7.1/ant-nodeps-1.7.1.pom
+Source24:       http://repo1.maven.org/maven2/org/apache/ant/ant-swing/1.7.1/ant-swing-1.7.1.pom
+Source25:       http://repo1.maven.org/maven2/org/apache/ant/ant-trax/1.7.1/ant-trax-1.7.1.pom
+Source26:       http://repo1.maven.org/maven2/org/apache/ant/ant-parent/1.7.1/ant-parent-1.7.1.pom
+
 # Fix some places where copies of classes are included in the wrong jarfiles
-Patch4:         apache-ant-jars.patch
-Patch5:         apache-ant-bz163689.patch
-Patch6:         apache-ant-r529855.patch
-
-Requires:       jaxp_parser_impl
-Requires:       jpackage-utils >= 0:1.6
-Requires(pre):     jpackage-utils >= 0:1.6
-Requires(postun):  jpackage-utils >= 0:1.6
-Requires:       java-devel
-%if ! %{bootstrap1}
-Requires:       xerces-j2
-Requires:       xml-commons-apis
+Patch1:         apache-ant-bz163689.patch
+Patch2:         apache-ant-gnu-classpath.patch
+Patch3:         apache-ant-no-test-jar.patch
+Patch4:         apache-ant-class-path-in-manifest.patch
+
+BuildRequires:  jpackage-utils >= 0:1.7.5
+BuildRequires:  java-devel >= 0:1.5.0
+BuildRequires:  jaxp_transform_impl
+%if %without bootstrap
+BuildRequires:  ant
+BuildRequires:  junit
+BuildRequires:  xml-commons-jaxp-1.3-apis
+BuildRequires:  xerces-j2
 %endif
-BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:  java-devel >= 0:1.5
-BuildRequires:	coreutils
-%if ! %{bootstrap1}
-BuildRequires:  jaxp_parser_impl
-BuildRequires:	xml-commons-apis
+
+Requires:       jpackage-utils >= 0:1.7.5
+Requires:       java-devel >= 0:1.5.0
+%if %without bootstrap
+Requires:       xerces-j2
+Requires:       xml-commons-jaxp-1.3-apis
 %endif
 
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Obsoletes:      ant-optional < %{epoch}:%{version}-%{release}
+Provides:       ant-optional = %{epoch}:%{version}-%{release}
 Obsoletes:      ant-optional-full < %{epoch}:%{version}-%{release}
-# Allow subpackages not in Fedora to be installed from JPackage
+Provides:       ant-optional-full = %{epoch}:%{version}-%{release}
+# Allow subpackages not in RHEL to be installed from JPackage
 Provides:       %{name} = %{epoch}:%{version}-%{release}
+# RHUG
+Obsoletes:      ant-devel < %{epoch}:%{version}-%{release}
+Provides:       ant-devel = %{epoch}:%{version}-%{release}
+# Mandriva
+Conflicts:      j2sdk-ant
 # RHEL3 and FC2
-Obsoletes:      %{name}-libs <= 0:1.5.2, %{name}-core <= 0:1.5.2
+Obsoletes:      %{name}-libs < %{epoch}:%{version}-%{release}
 Provides:       %{name}-libs = %{epoch}:%{version}-%{release}
+Obsoletes:      %{name}-core < %{epoch}:%{version}-%{release}
 Provides:       %{name}-core = %{epoch}:%{version}-%{release}
-# FC4
-Obsoletes:      %{name}-jmf <= 1.6.2-3jpp_12fc
-Provides:       %{name}-jmf = %{epoch}:%{version}-%{release}
-
 %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.5
+Requires(postun): jpackage-utils >= 0:1.7.5
+
 %description
 Ant is a platform-independent build tool for java. It's used by apache
 jakarta and xml projects.
@@ -127,11 +153,67 @@
 Allo stato attuale viene utilizzato dai progetti apache jakarta ed
 apache xml.
 
+%package jmf
+Summary:        Optional jmf tasks for %{name}
+Group:          Development/Build Tools
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-nodeps = %{epoch}:%{version}-%{release}
+Provides:       ant-jmf = %{epoch}:%{version}-%{release}
+
+%description jmf
+Optional jmf tasks for %{name}.
+
+%description jmf -l fr
+Taches jmf optionelles pour %{name}.
+
+%package nodeps
+Summary:        Optional tasks for %{name}
+Group:          Development/Build Tools
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Provides:       ant-nodeps = %{epoch}:%{version}-%{release}
+
+%description nodeps
+Optional tasks for %{name}.
+
+%description nodeps -l fr
+Taches optionelles pour %{name}.
+
+%package swing
+Summary:        Optional swing tasks for %{name}
+Group:          Development/Build Tools
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Provides:       ant-swing = %{epoch}:%{version}-%{release}
+
+%description swing
+Optional swing tasks for %{name}.
+
+%description swing -l fr
+Taches swing optionelles pour %{name}.
+
+%package trax
+Summary:        Optional trax tasks for %{name}
+Group:          Development/Build Tools
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       jaxp_transform_impl
+Requires:       %{name}-nodeps = %{epoch}:%{version}-%{release}
+Provides:       ant-trax = %{epoch}:%{version}-%{release}
+# The ant-xalan jar has been merged into the ant-trax one
+Obsoletes:      ant-xalan2 < %{epoch}:%{version}-%{release}
+Provides:       ant-xalan2 = %{epoch}:%{version}-%{release}
+
+%description trax
+Optional trax tasks for %{name}.
+
+%description trax -l fr
+Taches trax optionelles pour %{name}.
+
+%if %without bootstrap
 %if %{with_manifest_only}
 %package manifest-only
 Summary:        Manifest-only jars for %{name}
 Group:          Development/Build Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-nodeps = %{epoch}:%{version}-%{release}
 Provides:       %{name}-icontract = %{epoch}:%{version}-%{release}
 Provides:       %{name}-netrexx = %{epoch}:%{version}-%{release}
 Provides:       %{name}-starteam = %{epoch}:%{version}-%{release}
@@ -141,130 +223,84 @@
 Provides:       %{name}-xalan1 = %{epoch}:%{version}-%{release}
 Provides:       %{name}-xslp = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 %description  manifest-only
 Manifest-only jars for %{name}.
 %endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %package antlr
 Summary:        Optional antlr tasks for %{name}
 Group:          Development/Build Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-nodeps = %{epoch}:%{version}-%{release}
 Requires:       antlr
 BuildRequires:  antlr
 Provides:       ant-antlr = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
 
 %description antlr
 Optional antlr tasks for %{name}.
 
 %description antlr -l fr
 Taches antlr optionelles pour %{name}.
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %package apache-bsf
 Summary:        Optional apache bsf tasks for %{name}
 Group:          Development/Build Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-nodeps = %{epoch}:%{version}-%{release}
 Requires:       bsf
 BuildRequires:  bsf
 Provides:       ant-apache-bsf = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
 
 %description apache-bsf
 Optional apache bsf tasks for %{name}.
 
 %description apache-bsf -l fr
 Taches apache bsf optionelles pour %{name}.
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %package apache-resolver
 Summary:        Optional apache resolver tasks for %{name}
 Group:          Development/Build Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-nodeps = %{epoch}:%{version}-%{release}
 Requires:       xml-commons-resolver
 BuildRequires:  xml-commons-resolver
 Provides:       ant-apache-resolver = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
 
 %description apache-resolver
 Optional apache resolver tasks for %{name}.
 
 %description apache-resolver -l fr
 Taches apache resolver optionelles pour %{name}.
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %package commons-logging
 Summary:        Optional commons logging tasks for %{name}
 Group:          Development/Build Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-nodeps = %{epoch}:%{version}-%{release}
 Requires:       jakarta-commons-logging
 BuildRequires:  jakarta-commons-logging
 Provides:       ant-commons-logging = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
 
 %description commons-logging
 Optional commons logging tasks for %{name}.
 
 %description commons-logging -l fr
 Taches commons logging optionelles pour %{name}.
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %package commons-net
 Summary:        Optional commons net tasks for %{name}
 Group:          Development/Build Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-nodeps = %{epoch}:%{version}-%{release}
 Requires:       jakarta-commons-net
 BuildRequires:  jakarta-commons-net
 Provides:       ant-commons-net = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
 
 %description commons-net
 Optional commons net tasks for %{name}.
 
 %description commons-net -l fr
 Taches commons net optionelles pour %{name}.
-%endif
 
 # Disable because we don't ship the dependencies
 %if 0
@@ -272,16 +308,10 @@
 Summary:        Optional jai tasks for %{name}
 Group:          Development/Build Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-nodeps = %{epoch}:%{version}-%{release}
 Requires:       jai
 BuildRequires:  jai
 Provides:       ant-jai = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
 
 %description jai
 Optional jai tasks for %{name}.
@@ -290,286 +320,142 @@
 Taches jai optionelles pour %{name}.
 %endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %package apache-bcel
 Summary:        Optional apache bcel tasks for %{name}
 Group:          Development/Build Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-nodeps = %{epoch}:%{version}-%{release}
 Requires:       bcel
 BuildRequires:  bcel
 Provides:       ant-apache-bcel = %{epoch}:%{version}-%{release}
 Provides:       ant-jakarta-bcel = %{epoch}:%{version}-%{release}
 Obsoletes:      ant-jakarta-bcel < %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
 
 %description apache-bcel
 Optional apache bcel tasks for %{name}.
 
 %description apache-bcel -l fr
 Taches apache bcel optionelles pour %{name}.
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %package apache-log4j
 Summary:        Optional apache log4j tasks for %{name}
 Group:          Development/Build Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-nodeps = %{epoch}:%{version}-%{release}
 Requires:       log4j
 BuildRequires:  log4j
 Provides:       ant-apache-log4j = %{epoch}:%{version}-%{release}
 Provides:       ant-jakarta-log4j = %{epoch}:%{version}-%{release}
 Obsoletes:      ant-jakarta-log4j < %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
 
 %description apache-log4j
 Optional apache log4j tasks for %{name}.
 
 %description apache-log4j -l fr
 Taches apache log4j optionelles pour %{name}.
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %package apache-oro
 Summary:        Optional apache oro tasks for %{name}
 Group:          Development/Build Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-nodeps = %{epoch}:%{version}-%{release}
 Requires:       oro
 BuildRequires:  oro
 Provides:       ant-apache-oro = %{epoch}:%{version}-%{release}
 Provides:       ant-jakarta-oro = %{epoch}:%{version}-%{release}
 Obsoletes:      ant-jakarta-oro < %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
 
 %description apache-oro
 Optional apache oro tasks for %{name}.
 
 %description apache-oro -l fr
 Taches apache oro optionelles pour %{name}.
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %package apache-regexp
 Summary:        Optional apache regexp tasks for %{name}
 Group:          Development/Build Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-nodeps = %{epoch}:%{version}-%{release}
 Requires:       regexp
 BuildRequires:  regexp
 Provides:       ant-apache-regexp = %{epoch}:%{version}-%{release}
 Provides:       ant-jakarta-regexp = %{epoch}:%{version}-%{release}
 Obsoletes:      ant-jakarta-regexp < %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
 
 %description apache-regexp
 Optional apache regexp tasks for %{name}.
 
 %description apache-regexp -l fr
 Taches apache regexp optionelles pour %{name}.
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %package javamail
 Summary:        Optional javamail tasks for %{name}
 Group:          Development/Build Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-nodeps = %{epoch}:%{version}-%{release}
 Requires:       javamail >= 0:1.2-5jpp
 Requires:       jaf >= 0:1.0.1-5jpp
 BuildRequires:  javamail >= 0:1.2-5jpp
 BuildRequires:  jaf >= 0:1.0.1-5jpp
 Provides:       ant-javamail = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
 
 %description javamail
 Optional javamail tasks for %{name}.
 
 %description javamail -l fr
 Taches javamail optionelles pour %{name}.
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %package jdepend
 Summary:        Optional jdepend tasks for %{name}
 Group:          Development/Build Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-nodeps = %{epoch}:%{version}-%{release}
 Requires:       jdepend
 BuildRequires:  jdepend
 Provides:       ant-jdepend = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
 
 %description jdepend
 Optional jdepend tasks for %{name}.
 
 %description jdepend -l fr
 Taches jdepend optionelles pour %{name}.
-%endif
-
-%package jmf
-Summary:        Optional jmf tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Provides:       ant-jmf = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
-%description jmf
-Optional jmf tasks for %{name}.
-
-%description jmf -l fr
-Taches jmf optionelles pour %{name}.
-
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %package jsch
 Summary:        Optional jsch tasks for %{name}
 Group:          Development/Build Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-nodeps = %{epoch}:%{version}-%{release}
 Requires:       jsch
 BuildRequires:  jsch
 Provides:       ant-jsch = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
 
 %description jsch
 Optional jsch tasks for %{name}.
 
 %description jsch -l fr
 Taches jsch optionelles pour %{name}.
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %package junit
 Summary:        Optional junit tasks for %{name}
 Group:          Development/Build Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-nodeps = %{epoch}:%{version}-%{release}
 Requires:       junit
-BuildRequires:  junit
 Provides:       ant-junit = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
 
 %description junit
 Optional junit tasks for %{name}.
 
 %description junit -l fr
 Taches junit optionelles pour %{name}.
-%endif
-
-%package nodeps
-Summary:        Optional tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Provides:       ant-nodeps = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
-%description nodeps
-Optional tasks for %{name}.
-
-%description nodeps -l fr
-Taches optionelles pour %{name}.
-
-%package swing
-Summary:        Optional swing tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Provides:       ant-swing = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
-%description swing
-Optional swing tasks for %{name}.
-
-%description swing -l fr
-Taches swing optionelles pour %{name}.
-
-%package trax
-Summary:        Optional trax tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       jaxp_transform_impl
-Provides:       ant-trax = %{epoch}:%{version}-%{release}
-# The ant-xalan jar has been merged into the ant-trax one
-Obsoletes:      ant-xalan2 < %{epoch}:%{version}-%{release}
-Provides:       ant-xalan2 = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
-%description trax
-Optional trax tasks for %{name}.
-
-%description trax -l fr
-Taches trax optionelles pour %{name}.
 
 %package scripts
 Summary:        Additional scripts for %{name}
 Group:          Development/Build Tools
 AutoReqProv:    no
 Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       /usr/bin/python
+Requires:       %{_bindir}/perl
+Requires:       %{_bindir}/python
 
 %description scripts
 Additional Perl and Python scripts for %{name}.
@@ -599,45 +485,51 @@
 
 %description javadoc -l fr
 Javadoc pour %{name}.
+%endif
 
 # -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n apache-ant-%{cvs_version}
 
-# #157750: make the javah task work with java-gcj-compat
-%patch2 -p0
+# Disable the style and xmlvalidate tasks on ppc64 and s390x (#163689).
+%ifarch ppc64 s390x
+%patch1 -p1
+%endif
 
-# Fix some places where copies of classes are included in the wrong jarfiles
-%patch4 -p1 -b .orig
+# Update ant to work with recent versions of GNU Classpath
+%patch2 -p1
 
-# Disable the style and xmlvalidate tasks on ppc64 and s390x (#163689).
-#%ifarch ppc64 s390x
-#%patch5 -p1 -b .orig
-#%endif
+# When bootstrapping, we don't have junit
+%patch3 -p1
 
-# Patch to make Java 6's javac understand -source 1.2
-%patch6 -p0
+# Fix class-path-in-manifest rpmlint warning
+%patch4 -p0
 
 # clean jar files
-find . -name "*.jar" -exec rm -f {} \;
+find . -name "*.jar" | %{_bindir}/xargs -t rm
+
+# Fix file-not-utf8 rpmlint warning
+iconv KEYS -f iso-8859-1 -t utf-8 -o KEYS.utf8
+mv KEYS.utf8 KEYS
+iconv LICENSE -f iso-8859-1 -t utf-8 -o LICENSE.utf8
+mv LICENSE.utf8 LICENSE
 
 # -----------------------------------------------------------------------------
 
 %build
-# classpath selects optional components to build
-#export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-net commons-logging jai/jai_codec jai/jai_core jsch bsf xml-commons-resolver)
-export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-net commons-logging jsch bsf xml-commons-resolver)
-
-# perform bootstrap and build without jjp or user configs,
-# (except JAVA_HOME as required by build script)
-[ -n "$JAVA_HOME" ] && unset JAVA_HOME
-[ -r %{_sysconfdir}/java/java.conf ] && . %{_sysconfdir}/java/java.conf
-[ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
-export JAVA_HOME
-export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=/tmp"
-sh build.sh --noconfig jars javadocs
-unset GCJ_PROPERTIES
+export OPT_JAR_LIST=:
+%if %without bootstrap
+export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xml-commons-resolver)
+%{ant} jars
+%if %{build_javadoc}
+%{ant} javadocs
+%endif
+%else
+export JAVA_HOME=%{java_home}
+export CLASSPATH=$JAVA_HOME/lib/tools.jar
+sh ./build.sh --noconfig jars
+%endif
 
 # -----------------------------------------------------------------------------
 
@@ -648,46 +540,99 @@
 mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc}
 
 # jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-cp -p build/lib/%{name}-launcher.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-launcher-%{version}.jar
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -m 644 build/lib/ant.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -m 644 build/lib/ant-bootstrap.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-bootstrap-%{version}.jar
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+%add_to_maven_depmap org.apache.ant %{name} %{version} JPP %{name}
+install -m 644 build/lib/ant-launcher.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-launcher-%{version}.jar
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-launcher.pom
+%add_to_maven_depmap org.apache.ant %{name}-launcher %{version} JPP %{name}-launcher
+
+install -m 644 build/lib/ant-jmf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jmf-%{version}.jar
+install -m 644 %{SOURCE20} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-jmf.pom
+%add_to_maven_depmap org.apache.ant %{name}-jmf %{version} JPP/%{name} %{name}-jmf
+install -m 644 build/lib/ant-nodeps.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
+install -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-nodeps.pom
+%add_to_maven_depmap org.apache.ant %{name}-nodeps %{version} JPP/%{name} %{name}-nodeps
+install -m 644 build/lib/ant-swing.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-swing-%{version}.jar
+install -m 644 %{SOURCE24} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-swing.pom
+%add_to_maven_depmap org.apache.ant %{name}-swing %{version} JPP/%{name} %{name}-swing
+install -m 644 build/lib/ant-trax.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-trax-%{version}.jar
+install -m 644 %{SOURCE25} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-trax.pom
+%add_to_maven_depmap org.apache.ant %{name}-trax %{version} JPP/%{name} %{name}-trax
 
 # optional jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
+%if %without bootstrap
 %if %{with_manifest_only}
-cp -p build/lib/%{name}-icontract.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-icontract-%{version}.jar
-cp -p build/lib/%{name}-netrexx.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-netrexx-%{version}.jar
-cp -p build/lib/%{name}-starteam.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-starteam-%{version}.jar
-cp -p build/lib/%{name}-stylebook.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-stylebook-%{version}.jar
-cp -p build/lib/%{name}-vaj.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-vaj-%{version}.jar
-cp -p build/lib/%{name}-weblogic.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-weblogic-%{version}.jar
-cp -p build/lib/%{name}-xalan1.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-xalan1-%{version}.jar
-cp -p build/lib/%{name}-xslp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-xslp-%{version}.jar
-%endif
-%if ! %{bootstrap1} && ! %{bootstrap2}
-cp -p build/lib/%{name}-antlr.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-antlr-%{version}.jar
-cp -p build/lib/%{name}-apache-bsf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
-cp -p build/lib/%{name}-commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar
-cp -p build/lib/%{name}-commons-net.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
-#cp -p build/lib/%{name}-jai.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jai-%{version}.jar
-cp -p build/lib/%{name}-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
-cp -p build/lib/%{name}-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
-cp -p build/lib/%{name}-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar
-cp -p build/lib/%{name}-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar
-cp -p build/lib/%{name}-apache-resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar
+install -m 644 build/lib/ant-icontract.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-icontract-%{version}.jar
+install -m 644 build/lib/ant-netrexx.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-netrexx-%{version}.jar
+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-netrexx.pom
+%add_to_maven_depmap org.apache.ant %{name}-netrexx %{version} JPP/%{name} %{name}-netrexx
+install -m 644 build/lib/ant-starteam.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-starteam-%{version}.jar
+install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-starteam.pom
+%add_to_maven_depmap org.apache.ant %{name}-starteam %{version} JPP/%{name} %{name}-starteam
+install -m 644 build/lib/ant-stylebook.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-stylebook-%{version}.jar
+install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-stylebook.pom
+%add_to_maven_depmap org.apache.ant %{name}-stylebook %{version} JPP/%{name} %{name}-stylebook
+install -m 644 build/lib/ant-vaj.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-vaj-%{version}.jar
+install -m 644 build/lib/ant-weblogic.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-weblogic-%{version}.jar
+install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-weblogic.pom
+%add_to_maven_depmap org.apache.ant %{name}-weblogic %{version} JPP/%{name} %{name}-weblogic
+install -m 644 build/lib/ant-xalan1.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-xalan1-%{version}.jar
+install -m 644 build/lib/ant-xslp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-xslp-%{version}.jar
+%endif
+install -m 644 build/lib/ant-antlr.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-antlr-%{version}.jar
+install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-antlr.pom
+%add_to_maven_depmap org.apache.ant %{name}-antlr %{version} JPP/%{name} %{name}-antlr
+install -m 644 build/lib/ant-apache-bsf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
+install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-apache-bsf.pom
+%add_to_maven_depmap org.apache.ant %{name}-apache-bsf %{version} JPP/%{name} %{name}-apache-bsf
+install -m 644 build/lib/ant-apache-resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar
+install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-apache-resolver.pom
+%add_to_maven_depmap org.apache.ant %{name}-apache-resolver %{version} JPP/%{name} %{name}-apache-resolver
+install -m 644 build/lib/ant-commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar
+install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-commons-logging.pom
+%add_to_maven_depmap org.apache.ant %{name}-commons-logging %{version} JPP/%{name} %{name}-commons-logging
+install -m 644 build/lib/ant-commons-net.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
+install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-commons-net.pom
+%add_to_maven_depmap org.apache.ant %{name}-commons-net %{version} JPP/%{name} %{name}-commons-net
+#install -m 644 build/lib/ant-jai.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jai-%{version}.jar
+#install -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-jai.pom
+#%add_to_maven_depmap org.apache.ant %{name}-jai %{version} JPP/%{name} %{name}-jai
+install -m 644 build/lib/ant-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
+install -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-apache-bcel.pom
+%add_to_maven_depmap org.apache.ant %{name}-apache-bcel %{version} JPP/%{name} %{name}-apache-bcel
+install -m 644 build/lib/ant-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
+install -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-apache-log4j.pom
+%add_to_maven_depmap org.apache.ant %{name}-apache-log4j %{version} JPP/%{name} %{name}-apache-log4j
+install -m 644 build/lib/ant-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar
+install -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-apache-oro.pom
+%add_to_maven_depmap org.apache.ant %{name}-apache-oro %{version} JPP/%{name} %{name}-apache-oro
+install -m 644 build/lib/ant-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar
+install -m 644 %{SOURCE17} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-apache-regexp.pom
+%add_to_maven_depmap org.apache.ant %{name}-apache-regexp %{version} JPP/%{name} %{name}-apache-regexp
 ln -sf %{name}-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-bcel.jar
 ln -sf %{name}-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-log4j.jar
 ln -sf %{name}-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-oro.jar
 ln -sf %{name}-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-regexp.jar
-cp -p build/lib/%{name}-javamail.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-javamail-%{version}.jar
-cp -p build/lib/%{name}-jdepend.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jdepend-%{version}.jar
-cp -p build/lib/%{name}-jmf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jmf-%{version}.jar
-cp -p build/lib/%{name}-jsch.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jsch-%{version}.jar
-cp -p build/lib/%{name}-junit.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-junit-%{version}.jar
-%endif
-cp -p build/lib/%{name}-nodeps.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
-cp -p build/lib/%{name}-swing.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-swing-%{version}.jar
-cp -p build/lib/%{name}-trax.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-trax-%{version}.jar
+install -m 644 build/lib/ant-javamail.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-javamail-%{version}.jar
+install -m 644 %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-javamail.pom
+%add_to_maven_depmap org.apache.ant %{name}-javamail %{version} JPP/%{name} %{name}-javamail
+install -m 644 build/lib/ant-jdepend.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jdepend-%{version}.jar
+install -m 644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-jdepend.pom
+%add_to_maven_depmap org.apache.ant %{name}-jdepend %{version} JPP/%{name} %{name}-jdepend
+install -m 644 build/lib/ant-jsch.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jsch-%{version}.jar
+install -m 644 %{SOURCE21} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-jsch.pom
+%add_to_maven_depmap org.apache.ant %{name}-jsch %{version} JPP/%{name} %{name}-jsch
+install -m 644 build/lib/ant-junit.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-junit-%{version}.jar
+install -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-junit.pom
+%add_to_maven_depmap org.apache.ant %{name}-junit %{version} JPP/%{name} %{name}-junit
+install -m 644 %{SOURCE26} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-parent.pom
+%add_to_maven_depmap org.apache.ant %{name}-parent %{version} JPP %{name}-parent
+%endif
 
 # jar aliases
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
@@ -699,17 +644,14 @@
 
 # XSLs
 cp -p src/etc/*.xsl $RPM_BUILD_ROOT%{ant_home}/etc
-%if %{bootstrap1} || %{bootstrap2}
-rm -f $RPM_BUILD_ROOT%{ant_home}/etc/jdepend-frames.xsl
-rm -f $RPM_BUILD_ROOT%{ant_home}/etc/jdepend.xsl
-rm -f $RPM_BUILD_ROOT%{ant_home}/etc/junit-frames.xsl
-rm -f $RPM_BUILD_ROOT%{ant_home}/etc/junit-noframes.xsl
-rm -f $RPM_BUILD_ROOT%{ant_home}/etc/maudit-frames.xsl
-%endif
 
 # install everything else
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
+%if %without bootstrap
 cp -p src/script/* $RPM_BUILD_ROOT%{_bindir}
+%else
+cp -p src/script/ant{,Run} $RPM_BUILD_ROOT%{_bindir}
+%endif
 
 # default ant.conf
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
@@ -717,9 +659,14 @@
 
 # OPT_JAR_LIST fragments
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d
-%if ! %{bootstrap1} && ! %{bootstrap2}
+echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jmf
+echo "ant/ant-nodeps" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/nodeps
+echo "ant/ant-swing" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/swing
+echo "jaxp_transform_impl ant/ant-trax xalan-j2-serializer" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/trax
+%if %without bootstrap
 echo "antlr ant/ant-antlr" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/antlr
 echo "bsf ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bsf
+echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-resolver
 echo "jakarta-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-logging
 echo "jakarta-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net
 #echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jai
@@ -731,21 +678,29 @@
 echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend
 echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch
 echo "junit ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit
-echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-resolver
 %endif
-echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jmf
-echo "ant/ant-nodeps" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/nodeps
-echo "ant/ant-swing" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/swing
-echo "jaxp_transform_impl ant/ant-trax" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/trax
 
+%if %{build_javadoc}
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%endif
 
 # fix link between manual and javadoc
 (cd docs/manual; ln -sf %{_javadocdir}/%{name}-%{version} api)
 
+%if %with bootstrap
+find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
+                                                 -a ! -name ant-update.xsl \
+                                                 -a ! -name changelog.xsl \
+                                                 -a ! -name coverage-frames.xsl \
+                                                 -a ! -name junit-frames-xalan1.xsl \
+                                                 -a ! -name log.xsl \
+                                                 -a ! -name mmetrics-frames.xsl \
+                                                 -a ! -name tagdiff.xsl \
+                                                 | xargs -t rm
+%endif
+
 # -----------------------------------------------------------------------------
 
 %if %{gcj_support}
@@ -757,16 +712,18 @@
 
 # -----------------------------------------------------------------------------
 
-%if %{gcj_support}
 %post
+%update_maven_depmap
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%if %{gcj_support}
 %postun
+%update_maven_depmap
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -774,7 +731,7 @@
 %endif
 
 %if %{gcj_support}
-%post commons-net
+%post jmf
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -782,17 +739,15 @@
 %endif
 
 %if %{gcj_support}
-%postun commons-net
+%postun jmf
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-# We do not ship dependencies for these, so they are disabled.
-%if 0
 %if %{gcj_support}
-%post jai
+%post nodeps
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -800,16 +755,15 @@
 %endif
 
 %if %{gcj_support}
-%postun jai
+%postun nodeps
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
-%endif
 
 %if %{gcj_support}
-%post antlr
+%post swing
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -817,7 +771,7 @@
 %endif
 
 %if %{gcj_support}
-%postun antlr
+%postun swing
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -825,7 +779,7 @@
 %endif
 
 %if %{gcj_support}
-%post apache-bcel
+%post trax
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -833,15 +787,16 @@
 %endif
 
 %if %{gcj_support}
-%postun apache-bcel
+%postun trax
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
+%if %without bootstrap
 %if %{gcj_support}
-%post jmf
+%post commons-net
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -849,15 +804,17 @@
 %endif
 
 %if %{gcj_support}
-%postun jmf
+%postun commons-net
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
+# We do not ship dependencies for these, so they are disabled.
+%if 0
 %if %{gcj_support}
-%post trax
+%post jai
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -865,15 +822,16 @@
 %endif
 
 %if %{gcj_support}
-%postun trax
+%postun jai
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
+%endif
 
 %if %{gcj_support}
-%post apache-log4j
+%post antlr
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -881,7 +839,7 @@
 %endif
 
 %if %{gcj_support}
-%postun apache-log4j
+%postun antlr
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -889,7 +847,7 @@
 %endif
 
 %if %{gcj_support}
-%post swing
+%post apache-bcel
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -897,7 +855,7 @@
 %endif
 
 %if %{gcj_support}
-%postun swing
+%postun apache-bcel
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -905,7 +863,7 @@
 %endif
 
 %if %{gcj_support}
-%post nodeps
+%post apache-log4j
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -913,7 +871,7 @@
 %endif
 
 %if %{gcj_support}
-%postun nodeps
+%postun apache-log4j
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -1063,6 +1021,7 @@
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
+%endif
 
 %files
 %defattr(0644,root,root,0755)
@@ -1071,9 +1030,11 @@
 %attr(0755,root,root) %{_bindir}/ant
 %attr(0755,root,root) %{_bindir}/antRun
 %{_javadir}/%{name}.jar
-%{_javadir}/%{name}-launcher.jar
 %{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}-launcher.jar
 %{_javadir}/%{name}-launcher-%{version}.jar
+%{_javadir}/%{name}-bootstrap.jar
+%{_javadir}/%{name}-bootstrap-%{version}.jar
 %dir %{_javadir}/%{name}
 %dir %{ant_home}
 %dir %{ant_home}/etc
@@ -1082,16 +1043,58 @@
 %{ant_home}/etc/log.xsl
 %{ant_home}/etc/tagdiff.xsl
 %{ant_home}/etc/junit-frames-xalan1.xsl
+%if %without bootstrap
 %{ant_home}/etc/common2master.xsl
+%endif
 %dir %{ant_home}/lib
 %dir %{_sysconfdir}/%{name}.d
-
+%{_datadir}/maven2/poms/*
+%{_mavendepmapfragdir}/*
 %if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-%{version}.jar.*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-launcher-%{version}.jar.*
 %endif
 
+%files jmf
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/%{name}-jmf.jar
+%{_javadir}/%{name}/%{name}-jmf-%{version}.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/jmf
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jmf-%{version}.jar.*
+%endif
+
+%files nodeps
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/%{name}-nodeps.jar
+%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/nodeps
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-nodeps-%{version}.jar.*
+%endif
+
+%files swing
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/%{name}-swing.jar
+%{_javadir}/%{name}/%{name}-swing-%{version}.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/swing
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-swing-%{version}.jar.*
+%endif
+
+%files trax
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/%{name}-trax.jar
+%{_javadir}/%{name}/%{name}-trax-%{version}.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/trax
+%{ant_home}/etc/mmetrics-frames.xsl
+%{ant_home}/etc/coverage-frames.xsl
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-trax-%{version}.jar.*
+%endif
+
+%if %without bootstrap
 %if %{with_manifest_only}
 %files manifest-only
 %defattr(0644,root,root,0755)
@@ -1113,70 +1116,50 @@
 %{_javadir}/%{name}/ant-xslp.jar
 %endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %files antlr
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-antlr.jar
 %{_javadir}/%{name}/%{name}-antlr-%{version}.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/antlr
-
 %if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-antlr-%{version}.jar.*
 %endif
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %files apache-bsf
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-apache-bsf.jar
 %{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-bsf
-
 %if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bsf-%{version}.jar.*
 %endif
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %files apache-resolver
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-apache-resolver.jar
 %{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-resolver
-
 %if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-resolver-%{version}.jar.*
 %endif
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %files commons-logging
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-commons-logging.jar
 %{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/commons-logging
-
 %if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-logging-%{version}.jar.*
 %endif
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %files commons-net
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-commons-net.jar
 %{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/commons-net
-
 %if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-net-%{version}.jar.*
 %endif
-%endif
 
 # Disable as we dont ship the dependencies
 %if 0
@@ -1185,42 +1168,31 @@
 %{_javadir}/%{name}/%{name}-jai.jar
 %{_javadir}/%{name}/%{name}-jai-%{version}.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/jai
-
 %if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jai-%{version}.jar.*
 %endif
 %endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %files apache-bcel
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-apache-bcel.jar
 %{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
 %{_javadir}/%{name}/%{name}-jakarta-bcel.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-bcel
-
 %if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bcel-%{version}.jar.*
 %endif
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %files apache-log4j
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-apache-log4j.jar
 %{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
 %{_javadir}/%{name}/%{name}-jakarta-log4j.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-log4j
-
 %if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-log4j-%{version}.jar.*
 %endif
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %files apache-oro
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-apache-oro.jar
@@ -1228,41 +1200,29 @@
 %{_javadir}/%{name}/%{name}-jakarta-oro.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-oro
 %{ant_home}/etc/maudit-frames.xsl
-
 %if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-oro-%{version}.jar.*
 %endif
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %files apache-regexp
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-apache-regexp.jar
 %{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar
 %{_javadir}/%{name}/%{name}-jakarta-regexp.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-regexp
-
 %if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-regexp-%{version}.jar.*
 %endif
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %files javamail
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-javamail.jar
 %{_javadir}/%{name}/%{name}-javamail-%{version}.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/javamail
-
 %if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-javamail-%{version}.jar.*
 %endif
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %files jdepend
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-jdepend.jar
@@ -1270,38 +1230,19 @@
 %config(noreplace) %{_sysconfdir}/%{name}.d/jdepend
 %{ant_home}/etc/jdepend.xsl
 %{ant_home}/etc/jdepend-frames.xsl
-
 %if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jdepend-%{version}.jar.*
 %endif
-%endif
-
-%files jmf
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-jmf.jar
-%{_javadir}/%{name}/%{name}-jmf-%{version}.jar
-%config(noreplace) %{_sysconfdir}/%{name}.d/jmf
-
-%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jmf-%{version}.jar.*
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %files jsch
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-jsch.jar
 %{_javadir}/%{name}/%{name}-jsch-%{version}.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/jsch
-
 %if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jsch-%{version}.jar.*
 %endif
-%endif
 
-%if ! %{bootstrap1} && ! %{bootstrap2}
 %files junit
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-junit.jar
@@ -1309,47 +1250,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}.d/junit
 %{ant_home}/etc/junit-frames.xsl
 %{ant_home}/etc/junit-noframes.xsl
-
 %if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-junit-%{version}.jar.*
 %endif
-%endif
-
-%files nodeps
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-nodeps.jar
-%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
-%config(noreplace) %{_sysconfdir}/%{name}.d/nodeps
-
-%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-nodeps-%{version}.jar.*
-%endif
-
-%files swing
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-swing.jar
-%{_javadir}/%{name}/%{name}-swing-%{version}.jar
-%config(noreplace) %{_sysconfdir}/%{name}.d/swing
-
-%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-swing-%{version}.jar.*
-%endif
-
-%files trax
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-trax.jar
-%{_javadir}/%{name}/%{name}-trax-%{version}.jar
-%config(noreplace) %{_sysconfdir}/%{name}.d/trax
-%{ant_home}/etc/mmetrics-frames.xsl
-%{ant_home}/etc/coverage-frames.xsl
-
-%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-trax-%{version}.jar.*
-%endif
 
 %files scripts
 %defattr(0755,root,root,0755)
@@ -1360,106 +1263,77 @@
 %defattr(0644,root,root,0755)
 %doc docs/*
 
+%if %{build_javadoc}
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}
+%endif
+%endif
 
 # -----------------------------------------------------------------------------
 
 %changelog
-* Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7.0-2
-- drop repotag
-- fix license tag
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0:1.7.0-1jpp.4
-- Autorebuild for GCC 4.3
-
-* Wed Jan 09 2008 Permaine Cheung <pcheung at redhat.com> - 0:1.7.0-1jpp.3
-- make Java 6's javac understand -source 1.1 as well (patch from bodewig 
-  on the ant mailing list)
+* Tue Sep 23 2008 Permaine Cheung <pcheung at redhat.com> 0:1.7.1-7
+- Update to 1.7.1
+- Fix some rpmlint issues
 
-* Tue Aug 14 2007 Permaine Cheung <pcheung at redhat.com> - 0:1.7.0-1jpp.2
-- Enable building commons-net subpackage
+* Tue Jul 15 2008 David Walluck <dwalluck at redhat.com> 0:1.7.1-7
+- enable non-bootstrap
 
-* Fri Jul 27 2007 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-1jpp.1
-- Merge with upstream for upgrade
+* Tue Jul 15 2008 David Walluck <dwalluck at redhat.com> 0:1.7.1-6
+- add ant-bootstrap jar if bootstrap is enabled
+- enable jmf, swing, trax if bootstrap is enabled
+- BuildRequires: jaxp_transform_impl
+- BuildRequires: junit for non-bootstrap
+
+* Tue Jul 15 2008 David Walluck <dwalluck at redhat.com> 0:1.7.1-5
+- enable ant-nodeps in bootstrap mode
+
+* Tue Jul 15 2008 David Walluck <dwalluck at redhat.com> 0:1.7.1-4
+- remove junit for bootstrap
+
+* Tue Jul 15 2008 David Walluck <dwalluck at redhat.com> 0:1.7.1-3
+- build as bootstrap
+
+* Tue Jul 15 2008 David Walluck <dwalluck at redhat.com> 0:1.7.1-2
+- set rpm_mode=false by default
+
+* Thu Jul 10 2008 David Walluck <dwalluck at redhat.com> 0:1.7.1-1
+- 1.7.1
+- update maven pom files
+- rediff apache-ant-jars.patch
+- rediff apache-ant-bz163689.patch
+- add apache-ant-gnu-classpath.patch
+- set rpm_mode=true in conf since the ant script handles the rest
+
+* Thu Jul 10 2008 David Walluck <dwalluck at redhat.com> 0:1.7.0-3
+- add bootstrap mode
+- replace some alternatives/virtual requires by explicit requires
+- remove javadoc scriptlets
+- fix GCJ support
+- add workaround for xalan-j2 in %%{_sysconfdir}/%%{name}.d/trax
+- version Obsoletes and add Provides
+- remove Conflicts
+- mark files in %%{_sysconfdir} as %%config(noreplace)
+
+* Thu Jul 03 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.7.0-2.jpp5
+- Add poms and depmap frags
+- (B)R jpackage-utils >= 0:1.7.5
+- BR java-devel = 0:1.5.0
+- R java >= 0:1.5.0
 
 * Wed Jun 20 2007 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-1jpp
 - Upgrade to the final 1.7.0
 
-* Wed Apr 25 2007 Permaine Cheung <pcheung at redhat.com> 0:1.6.5-4jpp.3
-- Update spec file as per fedora review.
-
-* Mon Mar 19 2007 Permaine Cheung <pcheung at redhat.com> 1.6.5-4jpp.2
-- Get rid of the Provides for ant-optional and ant-optional-full.
-
-* Fri Mar 16 2007 Permaine Cheung <pcheung at redhat.com> 1.6.5-4jpp.1
-- Merge with upstream, get rid of the endorsed patch
-
-* Tue Feb 20 2007 Permaine Cheung <pcheung at redhat.com> 1.6.5-2jpp.3
-- Add endorsed dir and create symlinks for xml-commons-apis and 
-  jaxp_parser_impl there, and add the option when running ant.
-- Add missing BR
-- Fix some rpmlint issues
-
-* Fri Feb 09 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.6.5-4jpp
-- Must skip release 3 because Youri::Bugzilla::_add_version doesn't
-  distinguish between JPP-1.6 and JPP-1.7 and we have 1.6.5-3 in 1.6
-
-* Fri Feb 09 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.6.5-3jpp
-- Added option "bootstrap1" for building core while no jaxp_parser_impl
-  nor xml-commons-apis available
-- Added option "bootstrap2" for building core when some jaxp_parser_impl
-  and xml-commons-apis available
-
 * Thu Sep 21 2006 Will Tatam <will.tatam at red61.com> - 0:1.7.0-0.Beta1.1jpp
 - Upgraded to 1.7.0Beta1
 - removed the apache-ant-1.6.5-jvm1.5-detect.patch as merged upstream
 
-* Wed Aug 30 2006 Deepak Bhole <dbhole at redhat.com> 1.6.5-2jpp.2
-- Re-enabling style and xmlvalidate task on ppc64 and s390x.
-
-* Fri Aug 11 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.6.5-2jpp.1
+* Fri Aug 11 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.6.5-2jpp
 - Added conditional native compilation
-- Add missing requirements
-- Synch with JPackage spec
-
-* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.6.5-1jpp_11fc
-- Rebuilt
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.6.5-1jpp_10fc
-- rebuild
-
-* Thu Jun 1 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.6.5-1jpp_9fc
-- actually apply the patch added in 8fc!
-
-* Thu Jun 1 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.6.5-1jpp_8fc
 - Added patch to fix jvm version detection
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.6.5-1jpp_7fc
-- stop scriptlet spew
-
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.6.5-1jpp_6fc
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.6.5-1jpp_5fc
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Thu Feb  2 2006 Archit Shah <ashah at redhat.com> - 0:1.6.5-1jpp_4fc
-- build ant without using native code
-
-* Mon Jan  9 2006 Jesse Keating <jkeating at redhat.com> - 0:1.6.5-1jpp_3fc
-- bump again for another gcj fix
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.6.5-1jpp_2fc
-- rebuilt again
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Fri Dec  9 2005 Jesse Keating <jkeating at redhat.com> - 0:1.6.5-1jpp_1fc
-- rebuild for gcc-4.1.0-0.6
+- Add missing requirements
+- Synch with Fedora spec
 
 * Wed Nov 09 2005 Fernando Nasser <fnasser at redhat.com> - 0:1.6.5-1jpp
 - Upgrade to 1.6.5
@@ -1474,97 +1348,9 @@
 - Add manifest-only package (mainly for eclipse)
 - Add conflicts on j2sdk for Mandriva
 
-* Tue Nov  8 2005 Vadim Nasardinov <vadimn at redhat.com> - 0:1.6.5-0jpp_1fc
-- Converted from ISO-8859-1 to UTF-8. (The correct encoding was
-  somehow lost in going from version 1.58 to 1.59.)
-
-* Thu Nov  3 2005 Vadim Nasardinov <vadimn at redhat.com> - 0:1.6.5-0jpp_1fc
-- Changed the Release from 2fc to 0jpp_1fc on the assumption that we
-  are going to want to resync this package with JPackage if/when the
-  latter releases ant-1.6.5-1jpp.
-
-* Tue Nov  1 2005 Vadim Nasardinov <vadimn at redhat.com> - 0:1.6.5-2fc
-- Removed .jar files from upstream source
-
-* Mon Oct 31 2005 Vadim Nasardinov <vadimn at redhat.com> - 0:1.6.5-1fc
-- Upgraded to 1.6.5
-- Removed apache-ant-1.6.2.patch.  It was no longer relevant due to the
-  following change upstream:
-  src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v1.41.2.8
-- Updated apache-ant-1.6.2-rpm.patch to apache-ant-1.6.5-rpm.patch
-- Replaced apache-ant-bz157750.patch with apache-ant-1.6.5-javah.patch
-- Converted this spec file from iso-8859-1 to utf-8. (#159586)
-
-* Wed Aug  3 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_14fc
-- Allow subpackages not in Fedora to be installed from JPackage.
-- Obsolete the jmf subpackage (#164389).
-
-* Thu Jul 21 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_13fc
-- Disable the style and xmlvalidate tasks on ppc64 and s390x (#163689).
-
-* Mon Jul 18 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_12fc
-- Built on ia64, ppc64, s390 and s390x.
-- Switch to aot-compile-rpm (also BC-compiles subpackages).
-- Remove the jmf subpackage since it wasn't being built anyway.
-
-* Fri Jul 15 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_11fc
-- Bootstrap onto ia64, ppc64, s390 and s390x.
-
-* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_10fc
-- Add the bsf subpackage since we now ship bsf.
-- Remove gcj workaround (not correct, so assume not necessary).
-- Remove jarfiles from the tarball.
-
-* Mon Jun  6 2005 Gary Benson <gbenson at redhat.com>
-- Make the javah task fall back to executing javah if
-  com.sun.tools.javah.Main cannot be found.
-
-* Tue May 25 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_9fc
-- Rearrange how BC-compiled stuff is built and installed.
-
-* Mon May 23 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_8fc
-- Use absolute paths for rebuild-gcj-db.
-
-* Mon May 23 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_7fc
-- Build the javah task (#157750).
-- Add alpha to the list of build architectures (#157522).
-
-* Thu May  5 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_6fc
-- Add dependencies for post and postun scriptlets (#156901).
-
-* Fri Apr 29 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_5fc
-- BC-compile the two core jars.
-- Own /usr/share/java/ant.
-
-* Fri Apr 08 2005 Andrew Overholt <overholt at redhat.com> 0:1.6.2-3jpp_4fc
-- Replace gcj workarounds removed in previous commit.
-
-* Tue Mar 29 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_3fc
-- Add NOTICE file as per Apache License version 2.0.
-- Remove some now unnecessary gcj workarounds.
-- Add the jsch subpackage since we now ship jsch.
-
-* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_2fc
-- Use jdtcore.jar instead of ecj.jar when running under libgcj.
-
-* Wed Jan 12 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_1fc
-- Upgrade to latest version.
-
-* Wed Jan 12 2005 Gary Benson <gbenson at redhat.com> 0:1.6.1-1jpp_7fc
-- Explicitly require java-devel to make beehive play nice.
-
 * Mon Nov  8 2004 Gary Benson <gbenson at redhat.com> - 0:1.6.2-3jpp
 - Build OPT_JAR_LIST from files in /etc/ant.d.
 
-* Thu Nov  4 2004 Gary Benson <gbenson at redhat.com> 0:1.6.1-1jpp_6fc
-- Build into Fedora.
-
-* Mon Nov  1 2004 Gary Benson <gbenson at redhat.com> 0:1.6.1-1jpp_5fc
-- Explicitly require xerces-j2 to make beehive play nice.
-
-* Mon Nov  1 2004 Gary Benson <gbenson at redhat.com> 0:1.6.1-1jpp_4fc
-- Bootstrap into Fedora.
-
 * Mon Sep 06 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6.2-2jpp
 - Fix to backward compatibility symbolic links.
 
@@ -1583,7 +1369,7 @@
 * Tue Mar 23 2004 Randy Watler <rwatler at finali.com> - 0:1.6.1-1jpp
 - Update to Ant 1.6.1
 - Change ant launch script to source instead of patch
-- Move optional components to ant subdirectory: {_javadir}/{name}
+- Move optional components to ant subdirectory: %%{_javadir}/%%{name}
 - Remove os/2 scripts and set JAVA_HOME for build
 
 * Wed Feb 11 2004 Randy Watler <rwatler at finali.com> - 0:1.6.0-1jpp
@@ -1728,7 +1514,7 @@
   matching package
 - added jdepend 2.2
 - remove require oro, since ant could works without it
-- ant lib is now in {_javadir}/{name}, put external jars here
+- ant lib is now in %%{_javadir}/%%{name}, put external jars here
 
 * Tue May 07 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.4.1-12jpp
 - hardcoded distribution and vendor tag
@@ -1869,3 +1655,4 @@
 * 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>
+


Index: apache-ant-1.7.ant.conf
===================================================================
RCS file: /cvs/extras/rpms/ant/devel/apache-ant-1.7.ant.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apache-ant-1.7.ant.conf	20 Jul 2007 20:57:49 -0000	1.1
+++ apache-ant-1.7.ant.conf	26 Sep 2008 14:56:45 -0000	1.2
@@ -1,7 +1,5 @@
-#
-# ant.conf (Ant 1.6.x)
+# ant.conf (Ant 1.7.x)
 # JPackage Project <http://www.jpackage.org/>
-#
 
 # Validate --noconfig setting in case being invoked
 # from pre Ant 1.6.x environment

apache-ant-bz163689.patch:

Index: apache-ant-bz163689.patch
===================================================================
RCS file: /cvs/extras/rpms/ant/devel/apache-ant-bz163689.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apache-ant-bz163689.patch	21 Jul 2005 17:13:26 -0000	1.1
+++ apache-ant-bz163689.patch	26 Sep 2008 14:56:45 -0000	1.2
@@ -1,87 +1,100 @@
---- apache-ant-1.6.2/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java~	2004-07-16 08:57:36.000000000 +0100
-+++ apache-ant-1.6.2/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java	2005-07-21 17:05:18.000000000 +0100
-@@ -119,39 +119,12 @@
-     }
- 
-     public void transform(File infile, File outfile) throws Exception {
--        if (transformer == null) {
--            createTransformer();
--        }
--
--        InputStream fis = null;
--        OutputStream fos = null;
--        try {
--            fis = new BufferedInputStream(new FileInputStream(infile));
--            fos = new BufferedOutputStream(new FileOutputStream(outfile));
--            StreamResult res = new StreamResult(fos);
--            // not sure what could be the need of this...
--            res.setSystemId(JAXPUtils.getSystemId(outfile));
--            Source src = getSource(fis, infile);
--            transformer.transform(src, res);
--        } finally {
--            // make sure to close all handles, otherwise the garbage
--            // collector will close them...whenever possible and
--            // Windows may complain about not being able to delete files.
--            try {
--                if (fis != null) {
--                    fis.close();
--                }
--            } catch (IOException ignored) {
--                // ignore
--            }
--            try {
--                if (fos != null) {
--                    fos.close();
--                }
--            } catch (IOException ignored) {
--                // ignore
--            }
-+        if (logger != null) {
-+            logger.log("The style task is disabled on this platform");
-+            logger.log(
-+                "http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=163689");
-         }
-+        new FileOutputStream(outfile).close();
-     }
- 
-     /**
---- apache-ant-1.6.2/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java~	2004-07-16 08:57:36.000000000 +0100
-+++ apache-ant-1.6.2/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java	2005-07-21 17:37:23.000000000 +0100
-@@ -272,35 +272,8 @@
-                 "Specify at least one source - " + "a file or a fileset.");
-         }
- 
--        initValidator();
--
--        if (file != null) {
--            if (file.exists() && file.canRead() && file.isFile()) {
--                doValidate(file);
--                fileProcessed++;
--            } else {
--                String errorMsg = "File " + file + " cannot be read";
--                if (failOnError) {
--                    throw new BuildException(errorMsg);
--                } else {
--                    log(errorMsg, Project.MSG_ERR);
--                }
--            }
--        }
--
--        for (int i = 0; i < filesets.size(); i++) {
--
--            FileSet fs = (FileSet) filesets.elementAt(i);
--            DirectoryScanner ds = fs.getDirectoryScanner(getProject());
--            String[] files = ds.getIncludedFiles();
--
--            for (int j = 0; j < files.length; j++) {
--                File srcFile = new File(fs.getDir(getProject()), files[j]);
--                doValidate(srcFile);
--                fileProcessed++;
--            }
--        }
--        log(fileProcessed + " file(s) have been successfully validated.");
-+        log("The xmlvalidate task is disabled on this platform");
-+        log("http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=163689");
-     }
- 
-     /**
+--- apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java.orig	2008-06-27 01:05:16.000000000 -0400
++++ apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java	2008-07-10 16:41:47.456449617 -0400
+@@ -166,44 +166,12 @@
+      * @throws Exception on error
+      */
+     public void transform(File infile, File outfile) throws Exception {
+-        if (transformer == null) {
+-            createTransformer();
+-        }
+-
+-        InputStream fis = null;
+-        OutputStream fos = null;
+-        try {
+-            fis = new BufferedInputStream(new FileInputStream(infile));
+-            fos = new BufferedOutputStream(new FileOutputStream(outfile));
+-            StreamResult res = new StreamResult(fos);
+-            // not sure what could be the need of this...
+-            res.setSystemId(JAXPUtils.getSystemId(outfile));
+-            Source src = getSource(fis, infile);
+-
+-            // set parameters on each transformation, maybe something has changed
+-            //(e.g. value of file name parameter)
+-            setTransformationParameters();
+-
+-            transformer.transform(src, res);
+-        } finally {
+-            // make sure to close all handles, otherwise the garbage
+-            // collector will close them...whenever possible and
+-            // Windows may complain about not being able to delete files.
+-            try {
+-                if (fis != null) {
+-                    fis.close();
+-                }
+-            } catch (IOException ignored) {
+-                // ignore
+-            }
+-            try {
+-                if (fos != null) {
+-                    fos.close();
+-                }
+-            } catch (IOException ignored) {
+-                // ignore
+-            }
+-        }
++         if (logger != null) {
++             logger.log("The style task is disabled on this platform");
++             logger.log(
++                 "http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=163689");
++         }
++         new FileOutputStream(outfile).close();
+     }
+ 
+     /**
+--- apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java.orig	2008-06-27 01:05:22.000000000 -0400
++++ apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java	2008-07-10 16:42:09.270573847 -0400
+@@ -285,42 +285,8 @@
+      * @throws BuildException if <code>failonerror</code> is true and an error happens
+      */
+     public void execute() throws BuildException {
+-
+-        int fileProcessed = 0;
+-        if (file == null && (filesets.size() == 0)) {
+-            throw new BuildException(
+-                "Specify at least one source - " + "a file or a fileset.");
+-        }
+-
+-
+-
+-        if (file != null) {
+-            if (file.exists() && file.canRead() && file.isFile()) {
+-                doValidate(file);
+-                fileProcessed++;
+-            } else {
+-                String errorMsg = "File " + file + " cannot be read";
+-                if (failOnError) {
+-                    throw new BuildException(errorMsg);
+-                } else {
+-                    log(errorMsg, Project.MSG_ERR);
+-                }
+-            }
+-        }
+-
+-        for (int i = 0; i < filesets.size(); i++) {
+-
+-            FileSet fs = (FileSet) filesets.elementAt(i);
+-            DirectoryScanner ds = fs.getDirectoryScanner(getProject());
+-            String[] files = ds.getIncludedFiles();
+-
+-            for (int j = 0; j < files.length; j++) {
+-                File srcFile = new File(fs.getDir(getProject()), files[j]);
+-                doValidate(srcFile);
+-                fileProcessed++;
+-            }
+-        }
+-        onSuccessfulValidation(fileProcessed);
++         log("The xmlvalidate task is disabled on this platform");
++         log("http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=163689");
+     }
+ 
+     /**

apache-ant-jars.patch:

Index: apache-ant-jars.patch
===================================================================
RCS file: /cvs/extras/rpms/ant/devel/apache-ant-jars.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apache-ant-jars.patch	20 Jul 2007 20:57:49 -0000	1.2
+++ apache-ant-jars.patch	26 Sep 2008 14:56:45 -0000	1.3
@@ -1,6 +1,6 @@
---- apache-ant-1.7.0/build.xml.orig	2007-06-20 14:17:16.000000000 -0400
-+++ apache-ant-1.7.0/build.xml	2007-06-20 14:17:39.000000000 -0400
-@@ -769,6 +769,7 @@
+--- apache-ant-1.7.1/build.xml.orig	2008-06-27 01:05:23.000000000 -0400
++++ apache-ant-1.7.1/build.xml	2008-07-10 16:40:11.318448411 -0400
+@@ -770,6 +770,7 @@
              <selector refid="needs.jdk1.5+"/>
              <selector refid="needs.javamail"/>
              <selector refid="ant.launcher"/>
@@ -8,7 +8,7 @@
            </or>
          </selector>
        </not>
-@@ -848,6 +849,7 @@
+@@ -849,6 +850,7 @@
              <selector refid="needs.jdepend"/>
              <selector refid="needs.swing"/>
              <selector refid="needs.jsch"/>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ant/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	20 Jul 2007 20:57:49 -0000	1.14
+++ sources	26 Sep 2008 14:56:45 -0000	1.15
@@ -1 +1 @@
-769e022280e6bb1c9615adf336366e9f  apache-ant-1.7.0-src.tar.gz
+0d68db4a1ada5c91bcbf53cefd0c2fd7  apache-ant-1.7.1-src.tar.bz2



From rdieter at fedoraproject.org  Fri Sep 26 15:06:11 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 26 Sep 2008 15:06:11 +0000 (UTC)
Subject: rpms/lyx/devel .cvsignore, 1.31, 1.32 lyx.spec, 1.77, 1.78 sources, 
	1.29, 1.30
Message-ID: <20080926150612.003D97010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11849

Modified Files:
	.cvsignore lyx.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-0.8.rc3
- lyx-1.6.0rc3-svn26576



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	12 Sep 2008 13:32:05 -0000	1.31
+++ .cvsignore	26 Sep 2008 15:05:41 -0000	1.32
@@ -1 +1 @@
-lyx-1.6.0rc2.tar.bz2
+lyx-1.6.0rc3-svn26576.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- lyx.spec	12 Sep 2008 13:32:05 -0000	1.77
+++ lyx.spec	26 Sep 2008 15:05:41 -0000	1.78
@@ -2,8 +2,8 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.6.0
-%define  pre rc2
-Release: 0.7.%{pre}%{?dist}
+%define  pre rc3
+Release: 0.8.%{pre}%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -11,7 +11,9 @@
 # For stable releases
 #Source0: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
 # For pre-releases
-Source0: ftp://ftp.devel.lyx.org/pub/lyx/devel/lyx-%{version}%{pre}.tar.bz2
+#Source0: ftp://ftp.devel.lyx.org/pub/lyx/devel/lyx-%{version}%{pre}.tar.bz2
+# pre-release candidate
+Source0: http://www.lyx.org/~jamatos/lyx-1.6/lyx-1.6.0rc3-svn26576.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: lyx-1.5.4-xdg_open.patch
@@ -184,6 +186,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-0.8.rc3
+- lyx-1.6.0rc3-svn26576
+
 * Fri Sep 12 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-0.7.rc2
 - lyx-1.6.0rc2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	12 Sep 2008 13:32:05 -0000	1.29
+++ sources	26 Sep 2008 15:05:41 -0000	1.30
@@ -1 +1 @@
-359825f1c873b23d1693b1afe8342165  lyx-1.6.0rc2.tar.bz2
+8392769fed01b9087c80c83e3a8c59d7  lyx-1.6.0rc3-svn26576.tar.bz2



From buc at fedoraproject.org  Fri Sep 26 15:02:43 2008
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Fri, 26 Sep 2008 15:02:43 +0000 (UTC)
Subject: rpms/phpldapadmin/devel phpldapadmin-1.1.0.5-config.patch, NONE,
	1.1 phpldapadmin.spec, 1.15,
	1.16 phpldapadmin-1.0.1-config.patch, 1.1, NONE
Message-ID: <20080926150243.567F87013D@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/phpldapadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11070

Modified Files:
	phpldapadmin.spec 
Added Files:
	phpldapadmin-1.1.0.5-config.patch 
Removed Files:
	phpldapadmin-1.0.1-config.patch 
Log Message:
update config patch


phpldapadmin-1.1.0.5-config.patch:

--- NEW FILE phpldapadmin-1.1.0.5-config.patch ---
diff -Nrbu phpldapadmin-1.1.0.5/config/config.php phpldapadmin-1.1.0.5-OK/config/config.php
--- phpldapadmin-1.1.0.5/config/config.php	2008-09-26 18:55:09.000000000 +0400
+++ phpldapadmin-1.1.0.5-OK/config/config.php	2008-09-26 18:53:47.000000000 +0400
@@ -72,6 +72,11 @@
    30 seconds or the setting of max_exection_time if this is null. */
 // $config->custom->session['timelimit'] = 30;
 
+// $config->custom->appearance['show_clear_password'] = false;
+
+// $config->custom->search['size_limit'] = 50;
+#  $config->custom->search['size_limit'] = 1000;
+
 /*********************************************/
 /* Commands                                  */
 /*********************************************/
@@ -153,7 +158,7 @@
 
 /* A convenient name that will appear in the tree viewer and throughout
    phpLDAPadmin to identify this LDAP server to users. */
-$ldapservers->SetValue($i,'server','name','My LDAP Server');
+$ldapservers->SetValue($i,'server','name','Local LDAP Server');
 
 /* Examples:
    'ldap.example.com',
@@ -184,6 +189,7 @@
    encrypted using blowfish and the secret your specify above as
    session['blowfish']. */
 // $ldapservers->SetValue($i,'server','auth_type','cookie');
+$ldapservers->SetValue($i,'server','auth_type','session');
 
 /* The DN of the user for phpLDAPadmin to bind with. For anonymous binds or
    'cookie' or 'session' auth_types, LEAVE THE LOGIN_DN AND LOGIN_PASS BLANK. If
@@ -253,6 +259,7 @@
 /* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5,
    blowfish, crypt or leave blank for now default algorithm. */
 // $ldapservers->SetValue($i,'appearance','password_hash','md5');
+$ldapservers->SetValue($i,'appearance','password_hash','');
 
 /* If you specified 'cookie' or 'session' as the auth_type above, you can
    optionally specify here an attribute to use when logging in. If you enter
@@ -264,6 +271,7 @@
    specify 'string', in which case you can provide a string to use for logging
    users in. See 'login_string' directly below. */
 // $ldapservers->SetValue($i,'login','attr','dn');
+$ldapservers->SetValue($i,'login','attr','uid');
 
 /* If you specified something different from 'dn', for example 'uid', as the
    login_attr above, you can optionally specify here to fall back to


Index: phpldapadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/devel/phpldapadmin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- phpldapadmin.spec	13 Feb 2008 16:06:30 -0000	1.15
+++ phpldapadmin.spec	26 Sep 2008 15:02:13 -0000	1.16
@@ -1,12 +1,12 @@
 Name: phpldapadmin
 Summary: Web-based tool for managing LDAP servers
 Version: 1.1.0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 URL: http://phpldapadmin.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}.tar.gz
-Patch0: phpldapadmin-1.0.1-config.patch
+Patch0: phpldapadmin-1.1.0.5-config.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -115,6 +115,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.1.0.5-2
+- update config patch
+
 * Wed Feb 13 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.1.0.5-1
 - upgrade to 1.1.0.5
 


--- phpldapadmin-1.0.1-config.patch DELETED ---



From pcheung at fedoraproject.org  Fri Sep 26 15:24:01 2008
From: pcheung at fedoraproject.org (Permaine Cheung)
Date: Fri, 26 Sep 2008 15:24:01 +0000 (UTC)
Subject: rpms/ant/devel ant.spec,1.94,1.95
Message-ID: <20080926152401.911777010C@cvs1.fedora.phx.redhat.com>

Author: pcheung

Update of /cvs/extras/rpms/ant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13965

Modified Files:
	ant.spec 
Log Message:
define _with_gcj_support


Index: ant.spec
===================================================================
RCS file: /cvs/extras/rpms/ant/devel/ant.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- ant.spec	26 Sep 2008 14:56:45 -0000	1.94
+++ ant.spec	26 Sep 2008 15:23:31 -0000	1.95
@@ -41,6 +41,8 @@
 %define build_javadoc        1
 %endif
 
+%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_manifest_only 0



From pcheung at fedoraproject.org  Fri Sep 26 15:28:49 2008
From: pcheung at fedoraproject.org (Permaine Cheung)
Date: Fri, 26 Sep 2008 15:28:49 +0000 (UTC)
Subject: rpms/ant/devel ant.spec,1.95,1.96
Message-ID: <20080926152849.D0CD17010C@cvs1.fedora.phx.redhat.com>

Author: pcheung

Update of /cvs/extras/rpms/ant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14531

Modified Files:
	ant.spec 
Log Message:
Define with_gcj_support


Index: ant.spec
===================================================================
RCS file: /cvs/extras/rpms/ant/devel/ant.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- ant.spec	26 Sep 2008 15:23:31 -0000	1.95
+++ ant.spec	26 Sep 2008 15:28:19 -0000	1.96
@@ -55,7 +55,7 @@
 
 Name:           ant
 Version:        1.7.1
-Release:        7%{?dist}
+Release:        7.1%{?dist}
 Epoch:          0
 Summary:        Ant build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -1275,6 +1275,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Sep 26 2008 Permaine Cheung <pcheung at redhat.com> 0:1.7.1-7.1
+- Define with_gcj_support
+
 * Tue Sep 23 2008 Permaine Cheung <pcheung at redhat.com> 0:1.7.1-7
 - Update to 1.7.1
 - Fix some rpmlint issues



From mdehaan at fedoraproject.org  Fri Sep 26 15:35:47 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri, 26 Sep 2008 15:35:47 +0000 (UTC)
Subject: rpms/cobbler/EL-4 .cvsignore, 1.42, 1.43 cobbler.spec, 1.52,
	1.53 sources, 1.51, 1.52
Message-ID: <20080926153547.7153B7010C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15665/EL-4

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	8 Sep 2008 14:19:03 -0000	1.42
+++ .cvsignore	26 Sep 2008 15:35:17 -0000	1.43
@@ -39,3 +39,4 @@
 cobbler-1.2.2.tar.gz
 cobbler-1.2.3.tar.gz
 cobbler-1.2.4.tar.gz
+cobbler-1.2.5.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- cobbler.spec	8 Sep 2008 14:19:03 -0000	1.52
+++ cobbler.spec	26 Sep 2008 15:35:17 -0000	1.53
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.4
+Version: 1.2.5
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -217,6 +217,9 @@
 
 %changelog
 
+* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.5-1
+- Upstream changes (see CHANGELOG)
+
 * Mon Sep 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.4-1
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	8 Sep 2008 14:49:57 -0000	1.51
+++ sources	26 Sep 2008 15:35:17 -0000	1.52
@@ -1 +1,2 @@
 4586e811e587c929edfc5675d8c018c8  cobbler-1.2.4.tar.gz
+fa79d869848aa29d36f7eec951ab4c42  cobbler-1.2.5.tar.gz



From mdehaan at fedoraproject.org  Fri Sep 26 15:35:47 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri, 26 Sep 2008 15:35:47 +0000 (UTC)
Subject: rpms/cobbler/F-7 .cvsignore, 1.42, 1.43 cobbler.spec, 1.52,
	1.53 sources, 1.51, 1.52
Message-ID: <20080926153547.E60657010C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15665/F-7

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	8 Sep 2008 14:19:03 -0000	1.42
+++ .cvsignore	26 Sep 2008 15:35:17 -0000	1.43
@@ -39,3 +39,4 @@
 cobbler-1.2.2.tar.gz
 cobbler-1.2.3.tar.gz
 cobbler-1.2.4.tar.gz
+cobbler-1.2.5.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/cobbler.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- cobbler.spec	8 Sep 2008 14:19:03 -0000	1.52
+++ cobbler.spec	26 Sep 2008 15:35:17 -0000	1.53
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.4
+Version: 1.2.5
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -217,6 +217,9 @@
 
 %changelog
 
+* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.5-1
+- Upstream changes (see CHANGELOG)
+
 * Mon Sep 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.4-1
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	8 Sep 2008 14:49:58 -0000	1.51
+++ sources	26 Sep 2008 15:35:17 -0000	1.52
@@ -1 +1,2 @@
 4586e811e587c929edfc5675d8c018c8  cobbler-1.2.4.tar.gz
+fa79d869848aa29d36f7eec951ab4c42  cobbler-1.2.5.tar.gz



From mdehaan at fedoraproject.org  Fri Sep 26 15:35:47 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri, 26 Sep 2008 15:35:47 +0000 (UTC)
Subject: rpms/cobbler/EL-5 .cvsignore, 1.46, 1.47 cobbler.spec, 1.54,
	1.55 sources, 1.54, 1.55
Message-ID: <20080926153547.ACCA47010C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15665/EL-5

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	8 Sep 2008 14:19:03 -0000	1.46
+++ .cvsignore	26 Sep 2008 15:35:17 -0000	1.47
@@ -43,3 +43,4 @@
 cobbler-1.2.2.tar.gz
 cobbler-1.2.3.tar.gz
 cobbler-1.2.4.tar.gz
+cobbler-1.2.5.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- cobbler.spec	8 Sep 2008 14:19:03 -0000	1.54
+++ cobbler.spec	26 Sep 2008 15:35:17 -0000	1.55
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.4
+Version: 1.2.5
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -217,6 +217,9 @@
 
 %changelog
 
+* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.5-1
+- Upstream changes (see CHANGELOG)
+
 * Mon Sep 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.4-1
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	8 Sep 2008 14:49:58 -0000	1.54
+++ sources	26 Sep 2008 15:35:17 -0000	1.55
@@ -1 +1,2 @@
 4586e811e587c929edfc5675d8c018c8  cobbler-1.2.4.tar.gz
+fa79d869848aa29d36f7eec951ab4c42  cobbler-1.2.5.tar.gz



From mdehaan at fedoraproject.org  Fri Sep 26 15:35:48 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri, 26 Sep 2008 15:35:48 +0000 (UTC)
Subject: rpms/cobbler/devel .cvsignore, 1.42, 1.43 cobbler.spec, 1.56,
	1.57 sources, 1.52, 1.53
Message-ID: <20080926153548.A39017010C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15665/devel

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	8 Sep 2008 14:19:05 -0000	1.42
+++ .cvsignore	26 Sep 2008 15:35:18 -0000	1.43
@@ -39,3 +39,4 @@
 cobbler-1.2.2.tar.gz
 cobbler-1.2.3.tar.gz
 cobbler-1.2.4.tar.gz
+cobbler-1.2.5.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- cobbler.spec	8 Sep 2008 14:19:05 -0000	1.56
+++ cobbler.spec	26 Sep 2008 15:35:18 -0000	1.57
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.4
+Version: 1.2.5
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -217,6 +217,9 @@
 
 %changelog
 
+* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.5-1
+- Upstream changes (see CHANGELOG)
+
 * Mon Sep 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.4-1
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	8 Sep 2008 14:50:00 -0000	1.52
+++ sources	26 Sep 2008 15:35:18 -0000	1.53
@@ -1 +1,2 @@
 4586e811e587c929edfc5675d8c018c8  cobbler-1.2.4.tar.gz
+fa79d869848aa29d36f7eec951ab4c42  cobbler-1.2.5.tar.gz



From mdehaan at fedoraproject.org  Fri Sep 26 15:35:48 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri, 26 Sep 2008 15:35:48 +0000 (UTC)
Subject: rpms/cobbler/F-9 .cvsignore, 1.42, 1.43 cobbler.spec, 1.54,
	1.55 sources, 1.50, 1.51
Message-ID: <20080926153548.607737013D@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15665/F-9

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	8 Sep 2008 14:19:04 -0000	1.42
+++ .cvsignore	26 Sep 2008 15:35:18 -0000	1.43
@@ -39,3 +39,4 @@
 cobbler-1.2.2.tar.gz
 cobbler-1.2.3.tar.gz
 cobbler-1.2.4.tar.gz
+cobbler-1.2.5.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/cobbler.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- cobbler.spec	8 Sep 2008 14:19:04 -0000	1.54
+++ cobbler.spec	26 Sep 2008 15:35:18 -0000	1.55
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.4
+Version: 1.2.5
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -217,6 +217,9 @@
 
 %changelog
 
+* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.5-1
+- Upstream changes (see CHANGELOG)
+
 * Mon Sep 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.4-1
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	8 Sep 2008 14:49:59 -0000	1.50
+++ sources	26 Sep 2008 15:35:18 -0000	1.51
@@ -1 +1,2 @@
 4586e811e587c929edfc5675d8c018c8  cobbler-1.2.4.tar.gz
+fa79d869848aa29d36f7eec951ab4c42  cobbler-1.2.5.tar.gz



From mdehaan at fedoraproject.org  Fri Sep 26 15:35:48 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri, 26 Sep 2008 15:35:48 +0000 (UTC)
Subject: rpms/cobbler/F-8 .cvsignore, 1.42, 1.43 cobbler.spec, 1.51,
	1.52 sources, 1.51, 1.52
Message-ID: <20080926153548.2B0557010C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15665/F-8

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	8 Sep 2008 14:19:04 -0000	1.42
+++ .cvsignore	26 Sep 2008 15:35:17 -0000	1.43
@@ -39,3 +39,4 @@
 cobbler-1.2.2.tar.gz
 cobbler-1.2.3.tar.gz
 cobbler-1.2.4.tar.gz
+cobbler-1.2.5.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/cobbler.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- cobbler.spec	8 Sep 2008 14:19:04 -0000	1.51
+++ cobbler.spec	26 Sep 2008 15:35:17 -0000	1.52
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.4
+Version: 1.2.5
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -217,6 +217,9 @@
 
 %changelog
 
+* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.5-1
+- Upstream changes (see CHANGELOG)
+
 * Mon Sep 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.4-1
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	8 Sep 2008 14:49:59 -0000	1.51
+++ sources	26 Sep 2008 15:35:17 -0000	1.52
@@ -1 +1,2 @@
 4586e811e587c929edfc5675d8c018c8  cobbler-1.2.4.tar.gz
+fa79d869848aa29d36f7eec951ab4c42  cobbler-1.2.5.tar.gz



From mdehaan at fedoraproject.org  Fri Sep 26 15:57:44 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri, 26 Sep 2008 15:57:44 +0000 (UTC)
Subject: rpms/koan/EL-4 .cvsignore, 1.22, 1.23 koan.spec, 1.27, 1.28 sources,
	1.26, 1.27
Message-ID: <20080926155744.1CAEE7010C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16966/EL-4

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
This is 1.2.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-4/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	29 Aug 2008 21:05:08 -0000	1.22
+++ .cvsignore	26 Sep 2008 15:57:13 -0000	1.23
@@ -19,3 +19,4 @@
 koan-1.0.0.tar.gz
 koan-1.0.1.tar.gz
 koan-1.2.0.tar.gz
+koan-1.2.5.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-4/koan.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- koan.spec	29 Aug 2008 21:05:08 -0000	1.27
+++ koan.spec	26 Sep 2008 15:57:13 -0000	1.28
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 1.2.0
+Version: 1.2.5
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -57,6 +57,9 @@
 
 %changelog
 
+* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.5-1
+- Upstream changes (see CHANGELOG)
+
 * Wed Aug 29 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.0-1
 - Upstream changes (see CHANGELOG)
 
@@ -66,42 +69,3 @@
 * Fri Jun 06 2008 Michael DeHaan <mdehaan at redhat.com> - 1.0.1-1
 - Upstream changes (see CHANGELOG)
 
-* Fri May 16 2008 Michael DeHaan <mdehaan at redhat.com> - 0.9.2-2
-- Upstream changes (see CHANGELOG)
-
-* Fri May 09 2008 Michael DeHaan <mdehaan at redhat.com> - 0.9.0-1
-- Upstream changes (see CHANGELOG)
-- truncate changelog (see git for history)
-
-* Thu Jan 31 2008 Michael DeHaan <mdehaan at redhat.com> - 0.6.5-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Jan 10 2008 Michael DeHaan <mdehaan at redhat.com> - 0.6.4-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Nov 15 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.3-3
-- Upstream changes (see CHANGELOG)
-
-* Wed Nov 07 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.3-3
-- Release bump to appease the build system.
-
-* Wed Nov 07 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.3-2
-- Upstream changes (see CHANGELOG)
-
-* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
-- Upstream changes (see CHANGELOG)
-
-* Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
-- Upstream changes (see CHANGELOG)
-
-* Thu Aug 09 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.0-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Jul 26 2007 Michael DeHaan <mdehaan at redhat.com> - 0.5.2-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Jul 20 2007 Michael DeHaan <mdehaan at redhat.com> - 0.5.1-1
-- Upstream changes (see CHANGELOG)
-
-* Wed Jun 27 2007 Michael DeHaan <mdehaan at redhat.com> - 0.5.0-1
-- Upstream changes (see CHANGELOG)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-4/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	29 Aug 2008 21:05:08 -0000	1.26
+++ sources	26 Sep 2008 15:57:13 -0000	1.27
@@ -1,3 +1,4 @@
 2062dc3d16cdc61e4e1698282724e449  koan-1.0.0.tar.gz
 3af64da1fbe6cc14299b29703cd97163  koan-1.0.1.tar.gz
 91b1a21042e0937b2ca8cb771bde3503  koan-1.2.0.tar.gz
+7fe17776b089550df83bf0f1245c0697  koan-1.2.5.tar.gz



From mdehaan at fedoraproject.org  Fri Sep 26 15:57:44 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri, 26 Sep 2008 15:57:44 +0000 (UTC)
Subject: rpms/koan/F-7 .cvsignore, 1.22, 1.23 koan.spec, 1.28, 1.29 sources, 
	1.26, 1.27
Message-ID: <20080926155744.7373C7010C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16966/F-7

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
This is 1.2.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/F-7/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	29 Aug 2008 21:05:09 -0000	1.22
+++ .cvsignore	26 Sep 2008 15:57:14 -0000	1.23
@@ -19,3 +19,4 @@
 koan-1.0.0.tar.gz
 koan-1.0.1.tar.gz
 koan-1.2.0.tar.gz
+koan-1.2.5.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/F-7/koan.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- koan.spec	29 Aug 2008 21:05:09 -0000	1.28
+++ koan.spec	26 Sep 2008 15:57:14 -0000	1.29
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 1.2.0
+Version: 1.2.5
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -57,6 +57,9 @@
 
 %changelog
 
+* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.5-1
+- Upstream changes (see CHANGELOG)
+
 * Wed Aug 29 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.0-1
 - Upstream changes (see CHANGELOG)
 
@@ -66,42 +69,3 @@
 * Fri Jun 06 2008 Michael DeHaan <mdehaan at redhat.com> - 1.0.1-1
 - Upstream changes (see CHANGELOG)
 
-* Fri May 16 2008 Michael DeHaan <mdehaan at redhat.com> - 0.9.2-2
-- Upstream changes (see CHANGELOG)
-
-* Fri May 09 2008 Michael DeHaan <mdehaan at redhat.com> - 0.9.0-1
-- Upstream changes (see CHANGELOG)
-- truncate changelog (see git for history)
-
-* Thu Jan 31 2008 Michael DeHaan <mdehaan at redhat.com> - 0.6.5-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Jan 10 2008 Michael DeHaan <mdehaan at redhat.com> - 0.6.4-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Nov 15 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.3-3
-- Upstream changes (see CHANGELOG)
-
-* Wed Nov 07 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.3-3
-- Release bump to appease the build system.
-
-* Wed Nov 07 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.3-2
-- Upstream changes (see CHANGELOG)
-
-* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
-- Upstream changes (see CHANGELOG)
-
-* Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
-- Upstream changes (see CHANGELOG)
-
-* Thu Aug 09 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.0-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Jul 26 2007 Michael DeHaan <mdehaan at redhat.com> - 0.5.2-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Jul 20 2007 Michael DeHaan <mdehaan at redhat.com> - 0.5.1-1
-- Upstream changes (see CHANGELOG)
-
-* Wed Jun 27 2007 Michael DeHaan <mdehaan at redhat.com> - 0.5.0-1
-- Upstream changes (see CHANGELOG)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/F-7/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	29 Aug 2008 21:05:09 -0000	1.26
+++ sources	26 Sep 2008 15:57:14 -0000	1.27
@@ -1,3 +1,4 @@
 2062dc3d16cdc61e4e1698282724e449  koan-1.0.0.tar.gz
 3af64da1fbe6cc14299b29703cd97163  koan-1.0.1.tar.gz
 91b1a21042e0937b2ca8cb771bde3503  koan-1.2.0.tar.gz
+7fe17776b089550df83bf0f1245c0697  koan-1.2.5.tar.gz



From mdehaan at fedoraproject.org  Fri Sep 26 15:57:44 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri, 26 Sep 2008 15:57:44 +0000 (UTC)
Subject: rpms/koan/F-8 .cvsignore, 1.22, 1.23 koan.spec, 1.30, 1.31 sources, 
	1.26, 1.27
Message-ID: <20080926155744.C035A7010C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16966/F-8

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
This is 1.2.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/F-8/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	29 Aug 2008 21:05:09 -0000	1.22
+++ .cvsignore	26 Sep 2008 15:57:14 -0000	1.23
@@ -19,3 +19,4 @@
 koan-1.0.0.tar.gz
 koan-1.0.1.tar.gz
 koan-1.2.0.tar.gz
+koan-1.2.5.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/F-8/koan.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- koan.spec	29 Aug 2008 21:05:09 -0000	1.30
+++ koan.spec	26 Sep 2008 15:57:14 -0000	1.31
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 1.2.0
+Version: 1.2.5
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -57,6 +57,9 @@
 
 %changelog
 
+* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.5-1
+- Upstream changes (see CHANGELOG)
+
 * Wed Aug 29 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.0-1
 - Upstream changes (see CHANGELOG)
 
@@ -66,42 +69,3 @@
 * Fri Jun 06 2008 Michael DeHaan <mdehaan at redhat.com> - 1.0.1-1
 - Upstream changes (see CHANGELOG)
 
-* Fri May 16 2008 Michael DeHaan <mdehaan at redhat.com> - 0.9.2-2
-- Upstream changes (see CHANGELOG)
-
-* Fri May 09 2008 Michael DeHaan <mdehaan at redhat.com> - 0.9.0-1
-- Upstream changes (see CHANGELOG)
-- truncate changelog (see git for history)
-
-* Thu Jan 31 2008 Michael DeHaan <mdehaan at redhat.com> - 0.6.5-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Jan 10 2008 Michael DeHaan <mdehaan at redhat.com> - 0.6.4-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Nov 15 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.3-3
-- Upstream changes (see CHANGELOG)
-
-* Wed Nov 07 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.3-3
-- Release bump to appease the build system.
-
-* Wed Nov 07 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.3-2
-- Upstream changes (see CHANGELOG)
-
-* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
-- Upstream changes (see CHANGELOG)
-
-* Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
-- Upstream changes (see CHANGELOG)
-
-* Thu Aug 09 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.0-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Jul 26 2007 Michael DeHaan <mdehaan at redhat.com> - 0.5.2-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Jul 20 2007 Michael DeHaan <mdehaan at redhat.com> - 0.5.1-1
-- Upstream changes (see CHANGELOG)
-
-* Wed Jun 27 2007 Michael DeHaan <mdehaan at redhat.com> - 0.5.0-1
-- Upstream changes (see CHANGELOG)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/F-8/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	29 Aug 2008 21:05:09 -0000	1.26
+++ sources	26 Sep 2008 15:57:14 -0000	1.27
@@ -1,3 +1,4 @@
 2062dc3d16cdc61e4e1698282724e449  koan-1.0.0.tar.gz
 3af64da1fbe6cc14299b29703cd97163  koan-1.0.1.tar.gz
 91b1a21042e0937b2ca8cb771bde3503  koan-1.2.0.tar.gz
+7fe17776b089550df83bf0f1245c0697  koan-1.2.5.tar.gz



From mdehaan at fedoraproject.org  Fri Sep 26 15:57:44 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri, 26 Sep 2008 15:57:44 +0000 (UTC)
Subject: rpms/koan/EL-5 .cvsignore, 1.24, 1.25 koan.spec, 1.30, 1.31 sources,
	1.27, 1.28
Message-ID: <20080926155744.3F0AF7010C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16966/EL-5

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
This is 1.2.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-5/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	29 Aug 2008 21:05:09 -0000	1.24
+++ .cvsignore	26 Sep 2008 15:57:13 -0000	1.25
@@ -21,3 +21,4 @@
 koan-1.0.0.tar.gz
 koan-1.0.1.tar.gz
 koan-1.2.0.tar.gz
+koan-1.2.5.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-5/koan.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- koan.spec	29 Aug 2008 21:05:09 -0000	1.30
+++ koan.spec	26 Sep 2008 15:57:14 -0000	1.31
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 1.2.0
+Version: 1.2.5
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -57,6 +57,9 @@
 
 %changelog
 
+* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.5-1
+- Upstream changes (see CHANGELOG)
+
 * Wed Aug 29 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.0-1
 - Upstream changes (see CHANGELOG)
 
@@ -66,42 +69,3 @@
 * Fri Jun 06 2008 Michael DeHaan <mdehaan at redhat.com> - 1.0.1-1
 - Upstream changes (see CHANGELOG)
 
-* Fri May 16 2008 Michael DeHaan <mdehaan at redhat.com> - 0.9.2-2
-- Upstream changes (see CHANGELOG)
-
-* Fri May 09 2008 Michael DeHaan <mdehaan at redhat.com> - 0.9.0-1
-- Upstream changes (see CHANGELOG)
-- truncate changelog (see git for history)
-
-* Thu Jan 31 2008 Michael DeHaan <mdehaan at redhat.com> - 0.6.5-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Jan 10 2008 Michael DeHaan <mdehaan at redhat.com> - 0.6.4-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Nov 15 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.3-3
-- Upstream changes (see CHANGELOG)
-
-* Wed Nov 07 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.3-3
-- Release bump to appease the build system.
-
-* Wed Nov 07 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.3-2
-- Upstream changes (see CHANGELOG)
-
-* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
-- Upstream changes (see CHANGELOG)
-
-* Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
-- Upstream changes (see CHANGELOG)
-
-* Thu Aug 09 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.0-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Jul 26 2007 Michael DeHaan <mdehaan at redhat.com> - 0.5.2-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Jul 20 2007 Michael DeHaan <mdehaan at redhat.com> - 0.5.1-1
-- Upstream changes (see CHANGELOG)
-
-* Wed Jun 27 2007 Michael DeHaan <mdehaan at redhat.com> - 0.5.0-1
-- Upstream changes (see CHANGELOG)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-5/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	29 Aug 2008 21:05:09 -0000	1.27
+++ sources	26 Sep 2008 15:57:14 -0000	1.28
@@ -1,3 +1,4 @@
 2062dc3d16cdc61e4e1698282724e449  koan-1.0.0.tar.gz
 3af64da1fbe6cc14299b29703cd97163  koan-1.0.1.tar.gz
 91b1a21042e0937b2ca8cb771bde3503  koan-1.2.0.tar.gz
+7fe17776b089550df83bf0f1245c0697  koan-1.2.5.tar.gz



From mdehaan at fedoraproject.org  Fri Sep 26 15:57:45 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri, 26 Sep 2008 15:57:45 +0000 (UTC)
Subject: rpms/koan/F-9 .cvsignore, 1.22, 1.23 koan.spec, 1.31, 1.32 sources, 
	1.26, 1.27
Message-ID: <20080926155745.003BF7010C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16966/F-9

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
This is 1.2.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/F-9/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	29 Aug 2008 21:05:09 -0000	1.22
+++ .cvsignore	26 Sep 2008 15:57:14 -0000	1.23
@@ -19,3 +19,4 @@
 koan-1.0.0.tar.gz
 koan-1.0.1.tar.gz
 koan-1.2.0.tar.gz
+koan-1.2.5.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/F-9/koan.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- koan.spec	29 Aug 2008 21:05:09 -0000	1.31
+++ koan.spec	26 Sep 2008 15:57:14 -0000	1.32
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 1.2.0
+Version: 1.2.5
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -57,6 +57,9 @@
 
 %changelog
 
+* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.5-1
+- Upstream changes (see CHANGELOG)
+
 * Wed Aug 29 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.0-1
 - Upstream changes (see CHANGELOG)
 
@@ -66,42 +69,3 @@
 * Fri Jun 06 2008 Michael DeHaan <mdehaan at redhat.com> - 1.0.1-1
 - Upstream changes (see CHANGELOG)
 
-* Fri May 16 2008 Michael DeHaan <mdehaan at redhat.com> - 0.9.2-2
-- Upstream changes (see CHANGELOG)
-
-* Fri May 09 2008 Michael DeHaan <mdehaan at redhat.com> - 0.9.0-1
-- Upstream changes (see CHANGELOG)
-- truncate changelog (see git for history)
-
-* Thu Jan 31 2008 Michael DeHaan <mdehaan at redhat.com> - 0.6.5-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Jan 10 2008 Michael DeHaan <mdehaan at redhat.com> - 0.6.4-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Nov 15 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.3-3
-- Upstream changes (see CHANGELOG)
-
-* Wed Nov 07 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.3-3
-- Release bump to appease the build system.
-
-* Wed Nov 07 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.3-2
-- Upstream changes (see CHANGELOG)
-
-* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
-- Upstream changes (see CHANGELOG)
-
-* Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
-- Upstream changes (see CHANGELOG)
-
-* Thu Aug 09 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.0-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Jul 26 2007 Michael DeHaan <mdehaan at redhat.com> - 0.5.2-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Jul 20 2007 Michael DeHaan <mdehaan at redhat.com> - 0.5.1-1
-- Upstream changes (see CHANGELOG)
-
-* Wed Jun 27 2007 Michael DeHaan <mdehaan at redhat.com> - 0.5.0-1
-- Upstream changes (see CHANGELOG)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/F-9/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	29 Aug 2008 21:05:09 -0000	1.26
+++ sources	26 Sep 2008 15:57:14 -0000	1.27
@@ -1,3 +1,4 @@
 2062dc3d16cdc61e4e1698282724e449  koan-1.0.0.tar.gz
 3af64da1fbe6cc14299b29703cd97163  koan-1.0.1.tar.gz
 91b1a21042e0937b2ca8cb771bde3503  koan-1.2.0.tar.gz
+7fe17776b089550df83bf0f1245c0697  koan-1.2.5.tar.gz



From mdehaan at fedoraproject.org  Fri Sep 26 15:57:45 2008
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri, 26 Sep 2008 15:57:45 +0000 (UTC)
Subject: rpms/koan/devel .cvsignore, 1.22, 1.23 koan.spec, 1.32, 1.33 sources,
	1.26, 1.27
Message-ID: <20080926155745.364297010C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16966/devel

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
This is 1.2.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	29 Aug 2008 21:05:10 -0000	1.22
+++ .cvsignore	26 Sep 2008 15:57:14 -0000	1.23
@@ -19,3 +19,4 @@
 koan-1.0.0.tar.gz
 koan-1.0.1.tar.gz
 koan-1.2.0.tar.gz
+koan-1.2.5.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/koan.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- koan.spec	29 Aug 2008 21:05:10 -0000	1.32
+++ koan.spec	26 Sep 2008 15:57:15 -0000	1.33
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 1.2.0
+Version: 1.2.5
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -57,6 +57,9 @@
 
 %changelog
 
+* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.5-1
+- Upstream changes (see CHANGELOG)
+
 * Wed Aug 29 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.0-1
 - Upstream changes (see CHANGELOG)
 
@@ -66,42 +69,3 @@
 * Fri Jun 06 2008 Michael DeHaan <mdehaan at redhat.com> - 1.0.1-1
 - Upstream changes (see CHANGELOG)
 
-* Fri May 16 2008 Michael DeHaan <mdehaan at redhat.com> - 0.9.2-2
-- Upstream changes (see CHANGELOG)
-
-* Fri May 09 2008 Michael DeHaan <mdehaan at redhat.com> - 0.9.0-1
-- Upstream changes (see CHANGELOG)
-- truncate changelog (see git for history)
-
-* Thu Jan 31 2008 Michael DeHaan <mdehaan at redhat.com> - 0.6.5-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Jan 10 2008 Michael DeHaan <mdehaan at redhat.com> - 0.6.4-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Nov 15 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.3-3
-- Upstream changes (see CHANGELOG)
-
-* Wed Nov 07 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.3-3
-- Release bump to appease the build system.
-
-* Wed Nov 07 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.3-2
-- Upstream changes (see CHANGELOG)
-
-* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
-- Upstream changes (see CHANGELOG)
-
-* Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
-- Upstream changes (see CHANGELOG)
-
-* Thu Aug 09 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.0-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Jul 26 2007 Michael DeHaan <mdehaan at redhat.com> - 0.5.2-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Jul 20 2007 Michael DeHaan <mdehaan at redhat.com> - 0.5.1-1
-- Upstream changes (see CHANGELOG)
-
-* Wed Jun 27 2007 Michael DeHaan <mdehaan at redhat.com> - 0.5.0-1
-- Upstream changes (see CHANGELOG)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	29 Aug 2008 21:05:10 -0000	1.26
+++ sources	26 Sep 2008 15:57:15 -0000	1.27
@@ -1,3 +1,4 @@
 2062dc3d16cdc61e4e1698282724e449  koan-1.0.0.tar.gz
 3af64da1fbe6cc14299b29703cd97163  koan-1.0.1.tar.gz
 91b1a21042e0937b2ca8cb771bde3503  koan-1.2.0.tar.gz
+7fe17776b089550df83bf0f1245c0697  koan-1.2.5.tar.gz



From mtasaka at fedoraproject.org  Fri Sep 26 16:04:47 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 26 Sep 2008 16:04:47 +0000 (UTC)
Subject: rpms/mfiler3/F-9 mfiler3-2.0.8a-signal-define.patch, NONE,
	1.1 mfiler3.spec, 1.10, 1.11
Message-ID: <20080926160447.62C797013F@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mfiler3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20852/F-9

Modified Files:
	mfiler3.spec 
Added Files:
	mfiler3-2.0.8a-signal-define.patch 
Log Message:
* Sat Sep 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-2
- Fix sparc64 build error


mfiler3-2.0.8a-signal-define.patch:

--- NEW FILE mfiler3-2.0.8a-signal-define.patch ---
--- src/main.c.arch	2008-09-23 15:54:32.000000000 +0900
+++ src/main.c	2008-09-27 00:45:51.000000000 +0900
@@ -285,7 +285,7 @@
     signal(SIGXFSZ, SIG_DFL);
     signal(SIGVTALRM, SIG_DFL);
     signal(SIGSYS, SIG_DFL);
-#if !defined __CYGWIN__
+#ifdef SIGUNUSED
     signal(SIGUNUSED, SIG_DFL);
 #endif
 }


Index: mfiler3.spec
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-9/mfiler3.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mfiler3.spec	25 Sep 2008 16:43:15 -0000	1.10
+++ mfiler3.spec	26 Sep 2008 16:04:17 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:		mfiler3
 Version:	2.0.8a
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Two pane file manager under UNIX console
 
 Group:		Applications/Editors
@@ -13,6 +13,7 @@
 Source10:	mfiler3.sh
 Patch0:		mfiler3-2.0.5-use-external.patch
 Patch1:		mfiler3-2.0.8a-upgrade-compat.patch
+Patch2:		mfiler3-2.0.8a-signal-define.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmigemo-devel
@@ -48,6 +49,7 @@
 
 %patch0 -p1 -b .ext
 %patch1 -p0 -b .upcompat
+%patch2 -p0 -b .arch
 # Remove unneeded internal directories to make it sure that
 # we are using external libraries
 %{__rm} -rf \
@@ -97,6 +99,9 @@
 
 
 %changelog
+* Sat Sep 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-2
+- Fix sparc64 build error
+
 * Fri Sep 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-1
 - 2.0.8a
 - More better upgrade compat patch



From mtasaka at fedoraproject.org  Fri Sep 26 16:04:47 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 26 Sep 2008 16:04:47 +0000 (UTC)
Subject: rpms/mfiler3/devel mfiler3-2.0.8a-signal-define.patch, NONE,
	1.1 mfiler3.spec, 1.10, 1.11
Message-ID: <20080926160447.876827013F@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mfiler3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20852/devel

Modified Files:
	mfiler3.spec 
Added Files:
	mfiler3-2.0.8a-signal-define.patch 
Log Message:
* Sat Sep 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-2
- Fix sparc64 build error


mfiler3-2.0.8a-signal-define.patch:

--- NEW FILE mfiler3-2.0.8a-signal-define.patch ---
--- src/main.c.arch	2008-09-23 15:54:32.000000000 +0900
+++ src/main.c	2008-09-27 00:45:51.000000000 +0900
@@ -285,7 +285,7 @@
     signal(SIGXFSZ, SIG_DFL);
     signal(SIGVTALRM, SIG_DFL);
     signal(SIGSYS, SIG_DFL);
-#if !defined __CYGWIN__
+#ifdef SIGUNUSED
     signal(SIGUNUSED, SIG_DFL);
 #endif
 }


Index: mfiler3.spec
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/devel/mfiler3.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mfiler3.spec	25 Sep 2008 16:43:15 -0000	1.10
+++ mfiler3.spec	26 Sep 2008 16:04:17 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:		mfiler3
 Version:	2.0.8a
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Two pane file manager under UNIX console
 
 Group:		Applications/Editors
@@ -13,6 +13,7 @@
 Source10:	mfiler3.sh
 Patch0:		mfiler3-2.0.5-use-external.patch
 Patch1:		mfiler3-2.0.8a-upgrade-compat.patch
+Patch2:		mfiler3-2.0.8a-signal-define.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmigemo-devel
@@ -48,6 +49,7 @@
 
 %patch0 -p1 -b .ext
 %patch1 -p0 -b .upcompat
+%patch2 -p0 -b .arch
 # Remove unneeded internal directories to make it sure that
 # we are using external libraries
 %{__rm} -rf \
@@ -97,6 +99,9 @@
 
 
 %changelog
+* Sat Sep 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-2
+- Fix sparc64 build error
+
 * Fri Sep 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-1
 - 2.0.8a
 - More better upgrade compat patch



From davej at fedoraproject.org  Fri Sep 26 16:43:58 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 26 Sep 2008 16:43:58 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc7-git5.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.932, 1.933 kernel.spec, 1.987, 1.988 sources, 1.894,
	1.895 upstream, 1.806, 1.807
Message-ID: <20080926164358.E14787010C@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26135

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.27-rc7-git5.bz2.sign 
Log Message:
2.6.27-rc7-git5


--- NEW FILE patch-2.6.27-rc7-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBI3M94yGugalF9Dw4RAklTAJ0b/OuwcKnbJnSn8aZBVIsFsztg8gCgkTuc
JBpMQqmmtiFyHkdKNDn4nr8=
=xywq
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.932
retrieving revision 1.933
diff -u -r1.932 -r1.933
--- .cvsignore	26 Sep 2008 00:58:57 -0000	1.932
+++ .cvsignore	26 Sep 2008 16:43:28 -0000	1.933
@@ -5,4 +5,4 @@
 kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc7.bz2
-patch-2.6.27-rc7-git4.bz2
+patch-2.6.27-rc7-git5.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.987
retrieving revision 1.988
diff -u -r1.987 -r1.988
--- kernel.spec	26 Sep 2008 00:58:57 -0000	1.987
+++ kernel.spec	26 Sep 2008 16:43:28 -0000	1.988
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 4
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1733,6 +1733,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Sep 26 2008 Dave Jones <davej at redhat.com>
+- 2.6.27-rc7-git5
+
 * Thu Sep 25 2008 Dave Jones <davej at redhat.com>
 - 2.6.27-rc7-git4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.894
retrieving revision 1.895
diff -u -r1.894 -r1.895
--- sources	26 Sep 2008 00:58:57 -0000	1.894
+++ sources	26 Sep 2008 16:43:28 -0000	1.895
@@ -1,3 +1,3 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 711e4624185c1e229e9aa4c736b57e05  patch-2.6.27-rc7.bz2
-f228cc1c2ddcbbfe025ce2a73cd0d6e2  patch-2.6.27-rc7-git4.bz2
+6edf7e62ca492245dd2e36286bb3636d  patch-2.6.27-rc7-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.806
retrieving revision 1.807
diff -u -r1.806 -r1.807
--- upstream	26 Sep 2008 00:58:57 -0000	1.806
+++ upstream	26 Sep 2008 16:43:28 -0000	1.807
@@ -1,3 +1,3 @@
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc7.bz2
-patch-2.6.27-rc7-git4.bz2
+patch-2.6.27-rc7-git5.bz2



From rathann at fedoraproject.org  Fri Sep 26 17:17:49 2008
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Fri, 26 Sep 2008 17:17:49 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.118,1.119
Message-ID: <20080926171749.E3BBF7010C@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29847

Modified Files:
	comps-f10.xml.in 
Log Message:
add missing packages that I maintain



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- comps-f10.xml.in	25 Sep 2008 17:12:02 -0000	1.118
+++ comps-f10.xml.in	26 Sep 2008 17:17:19 -0000	1.119
@@ -1117,10 +1117,13 @@
       <packagereq type="optional">blas</packagereq>
       <packagereq type="optional">cdo</packagereq>
       <packagereq type="optional">cernlib-utils</packagereq>
+      <packagereq type="optional">chemtool</packagereq>
       <packagereq type="optional">drawtiming</packagereq>
       <packagereq type="optional">dx</packagereq>
       <packagereq type="optional">dx-samples</packagereq>
+      <packagereq type="optional">freefem++</packagereq>
       <packagereq type="optional">funtools</packagereq>
+      <packagereq type="optional">gabedit</packagereq>
       <packagereq type="optional">galculator</packagereq>
       <packagereq type="optional">gchempaint</packagereq>
       <packagereq type="optional">gdl</packagereq>
@@ -1223,6 +1226,7 @@
       <packagereq type="optional">tgif</packagereq>
       <packagereq type="optional">tideEditor</packagereq>
       <packagereq type="optional">toped</packagereq>
+      <packagereq type="optional">vaspview</packagereq>
       <packagereq type="optional">veusz</packagereq>
       <packagereq type="optional">wcstools</packagereq>
       <packagereq type="optional">wgrib</packagereq>
@@ -2167,6 +2171,7 @@
       <packagereq type="optional">sane-frontends</packagereq>
       <packagereq type="optional">scanbuttond</packagereq>
       <packagereq type="optional">showimg</packagereq>
+      <packagereq type="optional">tachyon</packagereq>
       <packagereq type="optional">tuxpaint</packagereq>
       <packagereq type="optional">tzclock</packagereq>
       <packagereq type="optional">ufraw</packagereq>
@@ -3382,6 +3387,7 @@
       <packagereq type="optional">cleanfeed</packagereq>
       <packagereq type="optional">leafnode</packagereq>
       <packagereq type="optional">newscache</packagereq>
+      <packagereq type="optional">newsx</packagereq>
       <packagereq type="optional">suck</packagereq>
     </packagelist>
   </group>
@@ -3892,6 +3898,7 @@
       <packagereq type="optional">kid3</packagereq>
       <packagereq type="optional">kover</packagereq>
       <packagereq type="optional">mikmod</packagereq>
+      <packagereq type="optional">mkvtoolnix-gui</packagereq>
       <packagereq type="optional">Miro</packagereq>
       <packagereq type="optional">muine</packagereq>
       <packagereq type="optional">mybashburn</packagereq>
@@ -4179,6 +4186,8 @@
       <packagereq type="optional">nomarch</packagereq>
       <packagereq type="optional">nut</packagereq>
       <packagereq type="optional">nx</packagereq>
+      <packagereq type="optional">obexfs</packagereq>
+      <packagereq type="optional">obexftp</packagereq>
       <packagereq type="optional">oddjob</packagereq>
       <packagereq type="optional">p0f</packagereq>
       <packagereq type="optional">p7zip</packagereq>
@@ -4316,6 +4325,7 @@
       <packagereq type="optional">cone</packagereq>
       <packagereq type="optional">ctorrent</packagereq>
       <packagereq type="optional">ekg</packagereq>
+      <packagereq type="optional">ekg2</packagereq>
       <packagereq type="optional">epic</packagereq>
       <packagereq type="optional">iperf</packagereq>
       <packagereq type="optional">irssi</packagereq>



From rathann at fedoraproject.org  Fri Sep 26 17:21:10 2008
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Fri, 26 Sep 2008 17:21:10 +0000 (UTC)
Subject: comps comps-f9.xml.in,1.392,1.393
Message-ID: <20080926172110.D62917010C@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30253

Modified Files:
	comps-f9.xml.in 
Log Message:
add some missing packages of mine


Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- comps-f9.xml.in	26 Sep 2008 04:14:56 -0000	1.392
+++ comps-f9.xml.in	26 Sep 2008 17:20:40 -0000	1.393
@@ -1107,10 +1107,13 @@
       <packagereq type="optional">blas</packagereq>
       <packagereq type="optional">cdo</packagereq>
       <packagereq type="optional">cernlib-utils</packagereq>
+      <packagereq type="optional">chemtool</packagereq>
       <packagereq type="optional">drawtiming</packagereq>
       <packagereq type="optional">dx</packagereq>
       <packagereq type="optional">dx-samples</packagereq>
+      <packagereq type="optional">freefem++</packagereq>
       <packagereq type="optional">funtools</packagereq>
+      <packagereq type="optional">gabedit</packagereq>
       <packagereq type="optional">galculator</packagereq>
       <packagereq type="optional">gchempaint</packagereq>
       <packagereq type="optional">gdl</packagereq>
@@ -1208,6 +1211,7 @@
       <packagereq type="optional">tgif</packagereq>
       <packagereq type="optional">tideEditor</packagereq>
       <packagereq type="optional">toped</packagereq>
+      <packagereq type="optional">vaspview</packagereq>
       <packagereq type="optional">veusz</packagereq>
       <packagereq type="optional">wcstools</packagereq>
       <packagereq type="optional">wgrib</packagereq>
@@ -2115,6 +2119,7 @@
       <packagereq type="optional">sane-frontends</packagereq>
       <packagereq type="optional">scanbuttond</packagereq>
       <packagereq type="optional">showimg</packagereq>
+      <packagereq type="optional">tachyon</packagereq>
       <packagereq type="optional">tuxpaint</packagereq>
       <packagereq type="optional">tzclock</packagereq>
       <packagereq type="optional">ufraw</packagereq>
@@ -3122,6 +3127,7 @@
       <packagereq type="optional">cleanfeed</packagereq>
       <packagereq type="optional">leafnode</packagereq>
       <packagereq type="optional">newscache</packagereq>
+      <packagereq type="optional">newsx</packagereq>
       <packagereq type="optional">suck</packagereq>
     </packagelist>
   </group>
@@ -3618,6 +3624,7 @@
       <packagereq type="optional">kid3</packagereq>
       <packagereq type="optional">kover</packagereq>
       <packagereq type="optional">mikmod</packagereq>
+      <packagereq type="optional">mkvtoolnix-gui</packagereq>
       <packagereq type="optional">Miro</packagereq>
       <packagereq type="optional">muine</packagereq>
       <packagereq type="optional">mybashburn</packagereq>
@@ -3899,6 +3906,8 @@
       <packagereq type="optional">nomarch</packagereq>
       <packagereq type="optional">nut</packagereq>
       <packagereq type="optional">nx</packagereq>
+      <packagereq type="optional">obexfs</packagereq>
+      <packagereq type="optional">obexftp</packagereq>
       <packagereq type="optional">oddjob</packagereq>
       <packagereq type="optional">p0f</packagereq>
       <packagereq type="optional">p7zip</packagereq>
@@ -4023,6 +4032,7 @@
       <packagereq type="optional">cone</packagereq>
       <packagereq type="optional">ctorrent</packagereq>
       <packagereq type="optional">ekg</packagereq>
+      <packagereq type="optional">ekg2</packagereq>
       <packagereq type="optional">epic</packagereq>
       <packagereq type="optional">iperf</packagereq>
       <packagereq type="optional">irssi</packagereq>



From rathann at fedoraproject.org  Fri Sep 26 17:23:48 2008
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Fri, 26 Sep 2008 17:23:48 +0000 (UTC)
Subject: comps comps-f8.xml.in,1.265,1.266
Message-ID: <20080926172348.BB32C7010C@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30580

Modified Files:
	comps-f8.xml.in 
Log Message:
add some missing packages of mine


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- comps-f8.xml.in	26 Sep 2008 04:14:56 -0000	1.265
+++ comps-f8.xml.in	26 Sep 2008 17:23:18 -0000	1.266
@@ -1100,10 +1100,13 @@
       <packagereq type="optional">blas</packagereq>
       <packagereq type="optional">cdo</packagereq>
       <packagereq type="optional">cernlib-utils</packagereq>
+      <packagereq type="optional">chemtool</packagereq>
       <packagereq type="optional">drawtiming</packagereq>
       <packagereq type="optional">dx</packagereq>
       <packagereq type="optional">dx-samples</packagereq>
+      <packagereq type="optional">freefem++</packagereq>
       <packagereq type="optional">funtools</packagereq>
+      <packagereq type="optional">gabedit</packagereq>
       <packagereq type="optional">galculator</packagereq>
       <packagereq type="optional">gchempaint</packagereq>
       <packagereq type="optional">gdl</packagereq>
@@ -1200,6 +1203,7 @@
       <packagereq type="optional">tgif</packagereq>
       <packagereq type="optional">tideEditor</packagereq>
       <packagereq type="optional">toped</packagereq>
+      <packagereq type="optional">vaspview</packagereq>
       <packagereq type="optional">veusz</packagereq>
       <packagereq type="optional">wcstools</packagereq>
       <packagereq type="optional">wgrib</packagereq>
@@ -2053,6 +2057,7 @@
       <packagereq type="optional">scanbuttond</packagereq>
       <packagereq type="optional">showimg</packagereq>
       <packagereq type="optional">skencil</packagereq>
+      <packagereq type="optional">tachyon</packagereq>
       <packagereq type="optional">tuxpaint</packagereq>
       <packagereq type="optional">tzclock</packagereq>
       <packagereq type="optional">ufraw</packagereq>
@@ -2997,6 +3002,7 @@
       <packagereq type="optional">cleanfeed</packagereq>
       <packagereq type="optional">leafnode</packagereq>
       <packagereq type="optional">newscache</packagereq>
+      <packagereq type="optional">newsx</packagereq>
       <packagereq type="optional">suck</packagereq>
     </packagelist>
   </group>
@@ -3468,6 +3474,7 @@
       <packagereq type="optional">kid3</packagereq>
       <packagereq type="optional">kover</packagereq>
       <packagereq type="optional">mikmod</packagereq>
+      <packagereq type="optional">mkvtoolnix-gui</packagereq>
       <packagereq type="optional">Miro</packagereq>
       <packagereq type="optional">muine</packagereq>
       <packagereq type="optional">mybashburn</packagereq>
@@ -3727,6 +3734,8 @@
       <packagereq type="optional">nomarch</packagereq>
       <packagereq type="optional">nut</packagereq>
       <packagereq type="optional">nx</packagereq>
+      <packagereq type="optional">obexfs</packagereq>
+      <packagereq type="optional">obexftp</packagereq>
       <packagereq type="optional">oddjob</packagereq>
       <packagereq type="optional">p0f</packagereq>
       <packagereq type="optional">p7zip</packagereq>
@@ -3847,6 +3856,7 @@
       <packagereq type="optional">cone</packagereq>
       <packagereq type="optional">ctorrent</packagereq>
       <packagereq type="optional">ekg</packagereq>
+      <packagereq type="optional">ekg2</packagereq>
       <packagereq type="optional">epic</packagereq>
       <packagereq type="optional">iperf</packagereq>
       <packagereq type="optional">irssi</packagereq>



From spot at fedoraproject.org  Fri Sep 26 17:29:32 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 26 Sep 2008 17:29:32 +0000 (UTC)
Subject: rpms/aide/devel aide-0.12-selcon.patch,1.1,1.2 aide.spec,1.22,1.23
Message-ID: <20080926172932.2AD077010C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/aide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31217

Modified Files:
	aide-0.12-selcon.patch aide.spec 
Log Message:
fix selcon patch to apply without fuzz

aide-0.12-selcon.patch:

Index: aide-0.12-selcon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aide/devel/aide-0.12-selcon.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aide-0.12-selcon.patch	22 Jul 2007 15:13:14 -0000	1.1
+++ aide-0.12-selcon.patch	26 Sep 2008 17:29:01 -0000	1.2
@@ -1,16 +1,17 @@
 From: Steve Conklin <sconklin at redhat.com>
 To: aide-devel at lists.sourceforge.net
 
-Only the first 32 characters of the selinux context was displayed, which 
+Only the first 32 characters of the selinux context was displayed, which
 often isn't enough to see what changed.
-This patch increases the displayed length to 128 characters for selinux 
+This patch increases the displayed length to 128 characters for selinux
 contexts and also for link names.
 
---- aide-0.12-orig/src/compare_db.c     2007-05-28 13:30:31.000000000 -0500
-+++ aide-0.12/src/compare_db.c  2007-05-28 13:31:09.000000000 -0500
-@@ -54,9 +54,10 @@
- const int old_col  = 12;  
- const int new_col  = 40;  
+diff -up aide-0.13.1/src/compare_db.c.selcon aide-0.13.1/src/compare_db.c
+--- aide-0.13.1/src/compare_db.c.selcon	2006-11-30 14:06:56.000000000 -0500
++++ aide-0.13.1/src/compare_db.c	2008-09-26 13:23:25.000000000 -0400
+@@ -53,9 +53,10 @@
+ const int old_col  = 12;   
+ const int new_col  = 40;   
  
 -const int part_len = 33; /* usable length of line[] */
 -char      oline[33];
@@ -22,7 +23,7 @@
  const char* entry_format=        "  %-9s: %-33s, %s\n";
  const char* entry_format_justnew="  %-9s: %-33c  %s\n";
  /*************/
-@@ -383,17 +384,17 @@ void print_str_changes(char*old,char*new
+@@ -379,17 +380,17 @@ void print_str_changes(char*old,char*new
  
    if(old==NULL){
      if(new!=NULL){
@@ -46,5 +47,3 @@
          ok = 1;
    }
     if(ok)
-
-


Index: aide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aide/devel/aide.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- aide.spec	15 Feb 2008 15:08:29 -0000	1.22
+++ aide.spec	26 Sep 2008 17:29:01 -0000	1.23
@@ -7,7 +7,7 @@
 Summary: Intrusion detection environment
 Name: aide
 Version: 0.13.1
-Release: 4
+Release: 5%{?dist}
 URL: http://sourceforge.net/projects/aide
 License: GPLv2+
 Group: Applications/System
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.13.1-5
+- fix selcon patch to apply without fuzz
+
 * Fri Feb 15 2008 Steve Conklin <sconklin at redhat.com>
 - rebuild for gcc4.3
 



From spot at fedoraproject.org  Fri Sep 26 17:34:17 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 26 Sep 2008 17:34:17 +0000 (UTC)
Subject: rpms/abiword/devel abiword.spec,1.68,1.69
Message-ID: <20080926173417.CC6997010C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/abiword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31847

Modified Files:
	abiword.spec 
Log Message:
add t1lib-devel to BuildRequires


Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- abiword.spec	21 Jul 2008 21:37:56 -0000	1.68
+++ abiword.spec	26 Sep 2008 17:33:47 -0000	1.69
@@ -7,7 +7,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -41,7 +41,7 @@
 BuildRequires: fribidi-devel, enchant-devel, wv-devel
 BuildRequires: zlib-devel, popt-devel, libpng-devel
 BuildRequires: gtk2-devel, libgsf-devel, libglade2-devel
-BuildRequires: boost-devel
+BuildRequires: boost-devel, t1lib-devel
 %if %{olpc_build}
 BuildRequires: dbus-glib-devel >= 0.70
 %else
@@ -216,6 +216,9 @@
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Fri Sep 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.6.4-8
+- add t1lib-devel to BuildRequires, fixes FTBFS
+
 * Mon Jul 21 2008 Marc Maurer <uwog at abisource.com> - 1:2.6.4-7
 - Fix libabiword-devel requires
 



From rathann at fedoraproject.org  Fri Sep 26 17:43:07 2008
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Fri, 26 Sep 2008 17:43:07 +0000 (UTC)
Subject: rpms/tachyon/devel tachyon.spec,1.9,1.10
Message-ID: <20080926174307.924747010C@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/tachyon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv788

Modified Files:
	tachyon.spec 
Log Message:
* Fri Sep 26 2008 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.98-0.7.20070319
- fix build with new lam package
- use generic BR for libGLU-devel
- move tree cleanup to %prep to fix short-circuit builds



Index: tachyon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/devel/tachyon.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tachyon.spec	19 Feb 2008 20:52:48 -0000	1.9
+++ tachyon.spec	26 Sep 2008 17:42:37 -0000	1.10
@@ -13,14 +13,15 @@
 Summary: Parallel / Multiprocessor Ray Tracing System
 Name: tachyon
 Version: 0.98
-Release: 0.6.20070319%{?dist}
+Release: 0.7.20070319%{?dist}
 URL: http://jedi.ks.uiuc.edu/~johns/raytracer/
 Group: Applications/Engineering
 Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.98/tachyon20070319.tar.gz
 Patch0: %{name}-rpm.patch
 License: BSD with advertising
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-BuildRequires: mesa-libGLU-devel
+BuildRequires: environment-modules
+BuildRequires: libGLU-devel
 BuildRequires: libpng-devel
 BuildRequires: libjpeg-devel
 BuildRequires: lam-devel
@@ -92,8 +93,11 @@
 chmod 644 src/hash.*
 chmod 644 demosrc/trackball.c
 chmod 644 scenes/imaps/*
+%{__rm} docs/tachyon/images.idx
 
 %build
+. /etc/profile.d/modules.sh
+module load %{_libdir}/lam/lam.module
 pushd unix
 for variant in %{variants} ; do
   %{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-$variant
@@ -107,7 +111,6 @@
   install -pm755 compile/%{target}-$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon-$variant
 done
 rename -thr "" $RPM_BUILD_ROOT%{_bindir}/*
-%{__rm} docs/tachyon/images.idx
 %{__mv} docs/tachyon docs/html
 %{__cp} -pr scenes $RPM_BUILD_ROOT%{_datadir}/tachyon/
 
@@ -140,6 +143,11 @@
 %{_datadir}/tachyon
 
 %changelog
+* Fri Sep 26 2008 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.98-0.7.20070319
+- fix build with new lam package
+- use generic BR for libGLU-devel
+- move tree cleanup to %%prep to fix short-circuit builds
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.98-0.6.20070319
 - Autorebuild for GCC 4.3
 



From nsantos at fedoraproject.org  Fri Sep 26 17:52:51 2008
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 26 Sep 2008 17:52:51 +0000 (UTC)
Subject: rpms/amqp/F-8 .cvsignore,1.4,1.5 amqp.spec,1.4,1.5 sources,1.5,1.6
Message-ID: <20080926175251.E463C7010C@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/amqp/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1927

Modified Files:
	.cvsignore amqp.spec sources 
Log Message:
rebased to svn rev 693140


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Jun 2008 17:10:42 -0000	1.4
+++ .cvsignore	26 Sep 2008 17:52:21 -0000	1.5
@@ -1 +1 @@
-amqp-1.0.666398.tar.gz
+amqp-1.0.693140.tar.gz


Index: amqp.spec
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-8/amqp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- amqp.spec	18 Jun 2008 17:10:42 -0000	1.4
+++ amqp.spec	26 Sep 2008 17:52:21 -0000	1.5
@@ -1,11 +1,13 @@
 Name:           amqp
-Version:        1.0.666398
-Release:        5%{?dist}
+Version:        1.0.693140
+Release:        1%{?dist}
 Epoch:          0
 Summary:        The AMQP specification
 
 Group:          Development
-License:        AMQP
+# Fedora treats these files as content, not code.
+# The AMQP license does not give the right to modify.
+License:        Freely redistributable without restriction
 
 URL:            http://www.amqp.org
 Source0:        %{name}-%{version}.tar.gz
@@ -37,6 +39,12 @@
 
 
 %changelog
+* Mon Sep  8 2008 Nuno Santos <nsantos at redhat.com> - 0:1.0.693140-1
+- Update for Fedora 10
+
+* Mon Jul 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0:1.0.666398-6
+- fix license tag
+
 * Tue Jun 10 2008 Rafael Schloming <rafaels at redhat.com> - 0:1.0.666398-5
 - Source update for MRG RC1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Jun 2008 17:10:42 -0000	1.5
+++ sources	26 Sep 2008 17:52:21 -0000	1.6
@@ -1 +1 @@
-57672c3da1d1c8dc4f3cc72ca15dc1a1  amqp-1.0.666398.tar.gz
+d520dad6a7270aa04aaaadfb95dfc446  amqp-1.0.693140.tar.gz



From nsantos at fedoraproject.org  Fri Sep 26 17:57:52 2008
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 26 Sep 2008 17:57:52 +0000 (UTC)
Subject: rpms/amqp/F-9 .cvsignore,1.4,1.5 amqp.spec,1.7,1.8 sources,1.7,1.8
Message-ID: <20080926175752.E64F47010C@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/amqp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2578

Modified Files:
	.cvsignore amqp.spec sources 
Log Message:
rebased to svn rev 693140


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Jun 2008 17:15:16 -0000	1.4
+++ .cvsignore	26 Sep 2008 17:57:22 -0000	1.5
@@ -1 +1 @@
-amqp-1.0.666398.tar.gz
+amqp-1.0.693140.tar.gz


Index: amqp.spec
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-9/amqp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- amqp.spec	18 Jun 2008 17:15:16 -0000	1.7
+++ amqp.spec	26 Sep 2008 17:57:22 -0000	1.8
@@ -1,11 +1,13 @@
 Name:           amqp
-Version:        1.0.666398
-Release:        5%{?dist}
+Version:        1.0.693140
+Release:        1%{?dist}
 Epoch:          0
 Summary:        The AMQP specification
 
 Group:          Development
-License:        AMQP
+# Fedora treats these files as content, not code.
+# The AMQP license does not give the right to modify.
+License:        Freely redistributable without restriction
 
 URL:            http://www.amqp.org
 Source0:        %{name}-%{version}.tar.gz
@@ -37,6 +39,12 @@
 
 
 %changelog
+* Mon Sep  8 2008 Nuno Santos <nsantos at redhat.com> - 0:1.0.693140-1
+- Update for Fedora 10
+
+* Mon Jul 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0:1.0.666398-6
+- fix license tag
+
 * Tue Jun 10 2008 Rafael Schloming <rafaels at redhat.com> - 0:1.0.666398-5
 - Source update for MRG RC1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jun 2008 17:15:16 -0000	1.7
+++ sources	26 Sep 2008 17:57:22 -0000	1.8
@@ -1 +1 @@
-57672c3da1d1c8dc4f3cc72ca15dc1a1  amqp-1.0.666398.tar.gz
+d520dad6a7270aa04aaaadfb95dfc446  amqp-1.0.693140.tar.gz



From somlo at fedoraproject.org  Fri Sep 26 18:05:31 2008
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Fri, 26 Sep 2008 18:05:31 +0000 (UTC)
Subject: rpms/aumix/F-8 aumix-2.8-bug-115869.patch, 1.1,
	1.2 aumix-2.8-include-signal_h.patch, 1.1,
	1.2 aumix-2.8-save_load.patch, 1.1,
	1.2 aumix-fix-crackrock.patch, 1.2,
	1.3 aumix-fix-cursor-color-on-exit.patch, 1.1, 1.2 aumix.spec,
	1.7, 1.8 curses-cleanup.patch, 1.2, 1.3
Message-ID: <20080926180531.86D207010C@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/aumix/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3710

Modified Files:
	aumix-2.8-bug-115869.patch aumix-2.8-include-signal_h.patch 
	aumix-2.8-save_load.patch aumix-fix-crackrock.patch 
	aumix-fix-cursor-color-on-exit.patch aumix.spec 
	curses-cleanup.patch 
Log Message:
re-based patches to eliminate fuzz

aumix-2.8-bug-115869.patch:

Index: aumix-2.8-bug-115869.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-8/aumix-2.8-bug-115869.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix-2.8-bug-115869.patch	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix-2.8-bug-115869.patch	26 Sep 2008 18:05:30 -0000	1.2
@@ -1,10 +1,9 @@
-Patch by mharris to fix bug:
-
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=115869
-
---- src/mute.bug-115869	Thu Dec 23 11:56:42 2004
-+++ src/mute	Thu Dec 23 11:56:55 2004
-@@ -8,7 +8,8 @@
+diff -NarU5 aumix-2.8.orig/src/mute aumix-2.8/src/mute
+--- aumix-2.8.orig/src/mute	2002-03-18 20:09:18.000000000 -0500
++++ aumix-2.8/src/mute	2008-09-26 13:52:40.000000000 -0400
+@@ -6,9 +6,10 @@
+ # Note:  it will clobber your saved settings.
+ #
  volumes=$(aumix -vq |tr -d ,)
  if [ $(echo $volumes | awk '{print $2}') -ne 0 -o \
  	$(echo $volumes | awk '{print $3}') -ne 0 ]; then

aumix-2.8-include-signal_h.patch:

Index: aumix-2.8-include-signal_h.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-8/aumix-2.8-include-signal_h.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix-2.8-include-signal_h.patch	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix-2.8-include-signal_h.patch	26 Sep 2008 18:05:30 -0000	1.2
@@ -1,6 +1,9 @@
---- src/common.h.include-signal_h	Sun May 18 01:40:04 2003
-+++ src/common.h	Sun May 18 01:38:55 2003
-@@ -37,6 +37,7 @@
+diff -NarU5 aumix-2.8.orig/src/common.h aumix-2.8/src/common.h
+--- aumix-2.8.orig/src/common.h	2002-10-29 16:27:51.000000000 -0500
++++ aumix-2.8/src/common.h	2008-09-26 13:41:59.000000000 -0400
+@@ -35,10 +35,11 @@
+ #endif				/* FALSE */
+ #include <stdio.h>
  #include <stdlib.h>		/* getenv() */
  #include <string.h>
  #include <sys/types.h>
@@ -8,3 +11,5 @@
  #include <sys/stat.h>
  #include <unistd.h>
  #include <fcntl.h>
+ #include <sys/ioctl.h>
+ 

aumix-2.8-save_load.patch:

Index: aumix-2.8-save_load.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-8/aumix-2.8-save_load.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix-2.8-save_load.patch	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix-2.8-save_load.patch	26 Sep 2008 18:05:30 -0000	1.2
@@ -1,6 +1,9 @@
---- aumix-2.7/src/common.c.save_load	Mon Jun 25 22:08:22 2001
-+++ aumix-2.7/src/common.c	Mon Jun 25 22:16:30 2001
-@@ -114,6 +114,7 @@
+diff -NarU5 aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
+--- aumix-2.8.orig/src/common.c	2002-10-29 16:27:51.000000000 -0500
++++ aumix-2.8/src/common.c	2008-09-26 13:39:07.000000000 -0400
+@@ -114,10 +114,11 @@
+ int             usage_ok = 1;
+ 
  int             main(int argc, char *argv[])
  {
  	int             optn, ii;
@@ -8,7 +11,11 @@
  #ifdef HAVE_CURSES
  	int             setcolors = FALSE;
  #endif				/* HAVE_CURSES */
-@@ -169,14 +170,10 @@
+ 	/* Internationalization */
+ #ifdef HAVE_NLS
+@@ -166,18 +167,14 @@
+ 				setcolors = TRUE;
+ 				interactive = IN_CURSES;
  				break;
  #endif				/* HAVE_CURSES */
  			case 'S':	/* Save to file. */
@@ -23,9 +30,13 @@
 -				ErrorExitWarn(LoadSettings(), 'e');
 +				load = 1;
  				break;
- #if defined (HAVE_CURSES) || defined (HAVE_GTK)
+ #if defined (HAVE_CURSES) || defined (HAVE_GTK) || defined (HAVE_GTK1)
  			case 'I':	/* User asked for interactive mode. */
-@@ -192,6 +189,17 @@
+ 				if (!interactive)
+ 					interactive = IN_ANY;
+@@ -189,10 +186,21 @@
+ 			default:	/* Show help. */
+ 				Usage(EXIT_FAILURE);
  			}
  		}
  	}
@@ -43,3 +54,5 @@
  #if defined (HAVE_CURSES) || defined (HAVE_GTK) || defined (HAVE_GTK1)
  /* Be interactive if no options were given. */
  	if (!interactive && argc <= 1)
+ 		interactive = IN_ANY;
+ /* By now we've decided whether to go interactive.

aumix-fix-crackrock.patch:

Index: aumix-fix-crackrock.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-8/aumix-fix-crackrock.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aumix-fix-crackrock.patch	15 Dec 2006 19:18:11 -0000	1.2
+++ aumix-fix-crackrock.patch	26 Sep 2008 18:05:30 -0000	1.3
@@ -1,6 +1,6 @@
 diff -NarU5 aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
---- aumix-2.8.orig/src/common.c	2006-12-15 12:47:06.000000000 -0500
-+++ aumix-2.8/src/common.c	2006-12-15 14:17:06.000000000 -0500
+--- aumix-2.8.orig/src/common.c	2008-09-26 13:50:32.000000000 -0400
++++ aumix-2.8/src/common.c	2008-09-26 13:51:16.000000000 -0400
 @@ -17,10 +17,11 @@
   * You should have received a copy of the GNU General Public License along with
   * aumix; if not, write to the Free Software Foundation, Inc., 59 Temple Place,

aumix-fix-cursor-color-on-exit.patch:

Index: aumix-fix-cursor-color-on-exit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-8/aumix-fix-cursor-color-on-exit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix-fix-cursor-color-on-exit.patch	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix-fix-cursor-color-on-exit.patch	26 Sep 2008 18:05:30 -0000	1.2
@@ -1,11 +1,9 @@
-michael at yohe.net - this fixes the blue cursor that appears on some terminals
-as - CloseScreen() resets the color to default, but nothing ever gets printed
-so the cursor was never updated.  Simply adding a carriage return does not
-change the behavior, and will reset the cursor properly.
-
---- src/common.c	2002-11-25 10:07:08.000000000 -0600
-+++ src/common.c	2002-11-25 10:06:50.000000000 -0600
-@@ -251,6 +251,9 @@
+diff -NarU5 aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
+--- aumix-2.8.orig/src/common.c	2008-09-26 13:45:15.000000000 -0400
++++ aumix-2.8/src/common.c	2008-09-26 13:49:45.000000000 -0400
+@@ -256,10 +256,13 @@
+ 		Gpm_Close();
+ #endif				/* HAVE_CURSES */
  		close(mixer_fd);
  #if HAVE_CURSES
  		CloseScreen();
@@ -15,3 +13,5 @@
  	}
  #endif				/* HAVE_CURSES */
  	exit(EXIT_SUCCESS);
+ }
+ 


Index: aumix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-8/aumix.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aumix.spec	16 Aug 2007 12:42:47 -0000	1.7
+++ aumix.spec	26 Sep 2008 18:05:30 -0000	1.8
@@ -1,6 +1,6 @@
 Name: aumix
 Version: 2.8
-Release: 16%{?dist}
+Release: 18%{?dist}
 Summary: Audio mixer based on ncurses
 License: GPLv2+
 Group: Applications/Multimedia
@@ -21,10 +21,10 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
-%patch2 -p0
+%patch1 -p1
+%patch2 -p1
 %patch3 -p1
-%patch4 -p0
+%patch4 -p1
 %patch5 -p1
 
 %build
@@ -50,6 +50,12 @@
 %{_datadir}/aumix
 
 %changelog
+* Fri Sep 26 2008 Gabriel L. Somlo <somlo at cmu.edu> 2.8-18
+- re-based patches to eliminate fuzz
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.8-17
+- Autorebuild for GCC 4.3
+
 * Thu Aug 16 2007 Gabriel L. Somlo <somlo at cmu.edu> 2.8-16
 - fixed license
 

curses-cleanup.patch:

Index: curses-cleanup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-8/curses-cleanup.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- curses-cleanup.patch	29 Mar 2007 01:49:39 -0000	1.2
+++ curses-cleanup.patch	26 Sep 2008 18:05:30 -0000	1.3
@@ -1,6 +1,6 @@
 diff -NarU5 aumix-2.8.orig/config.h.in aumix-2.8/config.h.in
 --- aumix-2.8.orig/config.h.in	2002-11-24 20:35:41.000000000 -0500
-+++ aumix-2.8/config.h.in	2007-03-21 14:34:23.000000000 -0400
++++ aumix-2.8/config.h.in	2008-09-26 13:53:42.000000000 -0400
 @@ -160,13 +160,10 @@
  #undef HAVE_SYS_TIME_H
  
@@ -42,7 +42,7 @@
  
 diff -NarU5 aumix-2.8.orig/configure aumix-2.8/configure
 --- aumix-2.8.orig/configure	2002-11-24 20:35:48.000000000 -0500
-+++ aumix-2.8/configure	2007-03-21 14:39:52.000000000 -0400
++++ aumix-2.8/configure	2008-09-26 13:53:42.000000000 -0400
 @@ -1,71 +1,344 @@
  #! /bin/sh
 -
@@ -10364,7 +10364,7 @@
  
 diff -NarU5 aumix-2.8.orig/configure.in aumix-2.8/configure.in
 --- aumix-2.8.orig/configure.in	2002-11-24 20:04:16.000000000 -0500
-+++ aumix-2.8/configure.in	2007-03-21 14:52:37.000000000 -0400
++++ aumix-2.8/configure.in	2008-09-26 13:53:42.000000000 -0400
 @@ -72,39 +72,10 @@
        AC_DEFINE(HAVE_USEKEYPAD, 1,
  	[Define this if your ncurses library has the member _use_keypad
@@ -10486,7 +10486,7 @@
  AC_MSG_RESULT($dummy_mixer)
 diff -NarU5 aumix-2.8.orig/data/Makefile.in aumix-2.8/data/Makefile.in
 --- aumix-2.8.orig/data/Makefile.in	2002-11-24 20:35:44.000000000 -0500
-+++ aumix-2.8/data/Makefile.in	2007-03-21 14:43:17.000000000 -0400
++++ aumix-2.8/data/Makefile.in	2008-09-26 13:53:42.000000000 -0400
 @@ -60,12 +60,10 @@
  AWK = @AWK@
  CATALOGS = @CATALOGS@
@@ -10502,7 +10502,7 @@
  GTK_LIBS = @GTK_LIBS@
 diff -NarU5 aumix-2.8.orig/doc/Makefile.in aumix-2.8/doc/Makefile.in
 --- aumix-2.8.orig/doc/Makefile.in	2002-11-24 20:35:44.000000000 -0500
-+++ aumix-2.8/doc/Makefile.in	2007-03-21 14:43:25.000000000 -0400
++++ aumix-2.8/doc/Makefile.in	2008-09-26 13:53:42.000000000 -0400
 @@ -60,12 +60,10 @@
  AWK = @AWK@
  CATALOGS = @CATALOGS@
@@ -10518,7 +10518,7 @@
  GTK_LIBS = @GTK_LIBS@
 diff -NarU5 aumix-2.8.orig/Makefile.in aumix-2.8/Makefile.in
 --- aumix-2.8.orig/Makefile.in	2002-11-24 20:35:46.000000000 -0500
-+++ aumix-2.8/Makefile.in	2007-03-21 14:42:55.000000000 -0400
++++ aumix-2.8/Makefile.in	2008-09-26 13:53:42.000000000 -0400
 @@ -60,12 +60,10 @@
  AWK = @AWK@
  CATALOGS = @CATALOGS@
@@ -10534,7 +10534,7 @@
  GTK_LIBS = @GTK_LIBS@
 diff -NarU5 aumix-2.8.orig/po/POTFILES.in aumix-2.8/po/POTFILES.in
 --- aumix-2.8.orig/po/POTFILES.in	2000-06-27 01:51:42.000000000 -0400
-+++ aumix-2.8/po/POTFILES.in	2007-03-21 14:26:03.000000000 -0400
++++ aumix-2.8/po/POTFILES.in	2008-09-26 13:53:42.000000000 -0400
 @@ -2,6 +2,6 @@
  
  # Package source files
@@ -10544,8 +10544,8 @@
 -src/gtk.c
 +#src/gtk.c
 diff -NarU5 aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
---- aumix-2.8.orig/src/common.c	2007-03-20 16:22:56.000000000 -0400
-+++ aumix-2.8/src/common.c	2007-03-28 21:32:56.000000000 -0400
+--- aumix-2.8.orig/src/common.c	2008-09-26 13:51:46.000000000 -0400
++++ aumix-2.8/src/common.c	2008-09-26 13:53:42.000000000 -0400
 @@ -21,15 +21,11 @@
  
  #include <errno.h>
@@ -10725,8 +10725,8 @@
    S:  save settings\n"));
  	exit(status);
 diff -NarU5 aumix-2.8.orig/src/common.h aumix-2.8/src/common.h
---- aumix-2.8.orig/src/common.h	2007-03-20 16:22:18.000000000 -0400
-+++ aumix-2.8/src/common.h	2007-03-20 16:26:05.000000000 -0400
+--- aumix-2.8.orig/src/common.h	2008-09-26 13:48:53.000000000 -0400
++++ aumix-2.8/src/common.h	2008-09-26 13:53:42.000000000 -0400
 @@ -20,15 +20,14 @@
  #ifndef AUMIX_H
  #define AUMIX_H
@@ -10747,7 +10747,7 @@
  #define FALSE 0
 diff -NarU5 aumix-2.8.orig/src/curses.c aumix-2.8/src/curses.c
 --- aumix-2.8.orig/src/curses.c	2002-10-23 11:07:40.000000000 -0400
-+++ aumix-2.8/src/curses.c	2007-03-28 21:13:19.000000000 -0400
++++ aumix-2.8/src/curses.c	2008-09-26 13:53:42.000000000 -0400
 @@ -150,14 +150,10 @@
  	PlaceCursor();
  }
@@ -10944,7 +10944,7 @@
  void            DrawLevelBalModeCurses(int dev, int mode)
 diff -NarU5 aumix-2.8.orig/src/curses.h aumix-2.8/src/curses.h
 --- aumix-2.8.orig/src/curses.h	2002-05-06 02:23:29.000000000 -0400
-+++ aumix-2.8/src/curses.h	2007-03-28 18:04:51.000000000 -0400
++++ aumix-2.8/src/curses.h	2008-09-26 13:53:42.000000000 -0400
 @@ -18,11 +18,10 @@
   */
  
@@ -11895,7 +11895,7 @@
 -#endif				/* AUMIX_GTK_H */
 diff -NarU5 aumix-2.8.orig/src/interactive.c aumix-2.8/src/interactive.c
 --- aumix-2.8.orig/src/interactive.c	2002-10-29 16:27:52.000000000 -0500
-+++ aumix-2.8/src/interactive.c	2007-03-22 13:52:57.000000000 -0400
++++ aumix-2.8/src/interactive.c	2008-09-26 13:53:42.000000000 -0400
 @@ -17,56 +17,13 @@
   * aumix; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
   * Suite 330, Boston, MA 02111-1307, USA.
@@ -12060,7 +12060,7 @@
 +#endif				/* HAVE_CURSES */
 diff -NarU5 aumix-2.8.orig/src/interactive.h aumix-2.8/src/interactive.h
 --- aumix-2.8.orig/src/interactive.h	2000-04-12 11:02:04.000000000 -0400
-+++ aumix-2.8/src/interactive.h	2007-03-22 13:53:07.000000000 -0400
++++ aumix-2.8/src/interactive.h	2008-09-26 13:53:42.000000000 -0400
 @@ -2,16 +2,12 @@
  #define INTERACTIVE_H
  #define MUTE_NO_DEVICE -1
@@ -12089,7 +12089,7 @@
  #endif				/* INTERACTIVE_H */
 diff -NarU5 aumix-2.8.orig/src/Makefile.am aumix-2.8/src/Makefile.am
 --- aumix-2.8.orig/src/Makefile.am	2002-03-18 20:09:17.000000000 -0500
-+++ aumix-2.8/src/Makefile.am	2007-03-21 14:42:44.000000000 -0400
++++ aumix-2.8/src/Makefile.am	2008-09-26 13:53:42.000000000 -0400
 @@ -1,17 +1,17 @@
  # $Aumix: aumix/src/Makefile.am,v 1.2 2002/03/19 01:09:17 trevor Exp $
  bin_PROGRAMS	= aumix
@@ -12114,7 +12114,7 @@
  	$(COMPILE) -DDATADIR=\"$(datadir)/aumix\" -c $<
 diff -NarU5 aumix-2.8.orig/src/Makefile.in aumix-2.8/src/Makefile.in
 --- aumix-2.8.orig/src/Makefile.in	2002-11-24 20:35:45.000000000 -0500
-+++ aumix-2.8/src/Makefile.in	2007-03-21 14:42:38.000000000 -0400
++++ aumix-2.8/src/Makefile.in	2008-09-26 13:53:42.000000000 -0400
 @@ -62,17 +62,12 @@
  AWK = @AWK@
  CATALOGS = @CATALOGS@
@@ -12166,7 +12166,7 @@
  SCRIPTS =  $(bin_SCRIPTS)
 diff -NarU5 aumix-2.8.orig/src/mouse.c aumix-2.8/src/mouse.c
 --- aumix-2.8.orig/src/mouse.c	2002-05-07 04:41:38.000000000 -0400
-+++ aumix-2.8/src/mouse.c	2007-03-22 13:52:43.000000000 -0400
++++ aumix-2.8/src/mouse.c	2008-09-26 13:53:42.000000000 -0400
 @@ -17,155 +17,32 @@
   * Suite 330, Boston, MA 02111-1307, USA.
   */
@@ -12327,7 +12327,7 @@
  		case 7:	/* only */
 diff -NarU5 aumix-2.8.orig/src/mouse.h aumix-2.8/src/mouse.h
 --- aumix-2.8.orig/src/mouse.h	2002-03-28 04:37:27.000000000 -0500
-+++ aumix-2.8/src/mouse.h	2007-03-20 16:26:05.000000000 -0400
++++ aumix-2.8/src/mouse.h	2008-09-26 13:53:42.000000000 -0400
 @@ -17,30 +17,17 @@
   * Suite 330, Boston, MA 02111-1307, USA.
   */



From somlo at fedoraproject.org  Fri Sep 26 18:10:35 2008
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Fri, 26 Sep 2008 18:10:35 +0000 (UTC)
Subject: rpms/aumix/F-9 aumix-2.8-bug-115869.patch, 1.1,
	1.2 aumix-2.8-include-signal_h.patch, 1.1,
	1.2 aumix-2.8-save_load.patch, 1.1,
	1.2 aumix-fix-crackrock.patch, 1.2,
	1.3 aumix-fix-cursor-color-on-exit.patch, 1.1, 1.2 aumix.spec,
	1.8, 1.9 curses-cleanup.patch, 1.2, 1.3
Message-ID: <20080926181035.AEC537013D@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/aumix/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4726

Modified Files:
	aumix-2.8-bug-115869.patch aumix-2.8-include-signal_h.patch 
	aumix-2.8-save_load.patch aumix-fix-crackrock.patch 
	aumix-fix-cursor-color-on-exit.patch aumix.spec 
	curses-cleanup.patch 
Log Message:
re-based patches to eliminate fuzz

aumix-2.8-bug-115869.patch:

Index: aumix-2.8-bug-115869.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-9/aumix-2.8-bug-115869.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix-2.8-bug-115869.patch	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix-2.8-bug-115869.patch	26 Sep 2008 18:10:34 -0000	1.2
@@ -1,10 +1,9 @@
-Patch by mharris to fix bug:
-
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=115869
-
---- src/mute.bug-115869	Thu Dec 23 11:56:42 2004
-+++ src/mute	Thu Dec 23 11:56:55 2004
-@@ -8,7 +8,8 @@
+diff -NarU5 aumix-2.8.orig/src/mute aumix-2.8/src/mute
+--- aumix-2.8.orig/src/mute	2002-03-18 20:09:18.000000000 -0500
++++ aumix-2.8/src/mute	2008-09-26 13:52:40.000000000 -0400
+@@ -6,9 +6,10 @@
+ # Note:  it will clobber your saved settings.
+ #
  volumes=$(aumix -vq |tr -d ,)
  if [ $(echo $volumes | awk '{print $2}') -ne 0 -o \
  	$(echo $volumes | awk '{print $3}') -ne 0 ]; then

aumix-2.8-include-signal_h.patch:

Index: aumix-2.8-include-signal_h.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-9/aumix-2.8-include-signal_h.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix-2.8-include-signal_h.patch	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix-2.8-include-signal_h.patch	26 Sep 2008 18:10:34 -0000	1.2
@@ -1,6 +1,9 @@
---- src/common.h.include-signal_h	Sun May 18 01:40:04 2003
-+++ src/common.h	Sun May 18 01:38:55 2003
-@@ -37,6 +37,7 @@
+diff -NarU5 aumix-2.8.orig/src/common.h aumix-2.8/src/common.h
+--- aumix-2.8.orig/src/common.h	2002-10-29 16:27:51.000000000 -0500
++++ aumix-2.8/src/common.h	2008-09-26 13:41:59.000000000 -0400
+@@ -35,10 +35,11 @@
+ #endif				/* FALSE */
+ #include <stdio.h>
  #include <stdlib.h>		/* getenv() */
  #include <string.h>
  #include <sys/types.h>
@@ -8,3 +11,5 @@
  #include <sys/stat.h>
  #include <unistd.h>
  #include <fcntl.h>
+ #include <sys/ioctl.h>
+ 

aumix-2.8-save_load.patch:

Index: aumix-2.8-save_load.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-9/aumix-2.8-save_load.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix-2.8-save_load.patch	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix-2.8-save_load.patch	26 Sep 2008 18:10:34 -0000	1.2
@@ -1,6 +1,9 @@
---- aumix-2.7/src/common.c.save_load	Mon Jun 25 22:08:22 2001
-+++ aumix-2.7/src/common.c	Mon Jun 25 22:16:30 2001
-@@ -114,6 +114,7 @@
+diff -NarU5 aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
+--- aumix-2.8.orig/src/common.c	2002-10-29 16:27:51.000000000 -0500
++++ aumix-2.8/src/common.c	2008-09-26 13:39:07.000000000 -0400
+@@ -114,10 +114,11 @@
+ int             usage_ok = 1;
+ 
  int             main(int argc, char *argv[])
  {
  	int             optn, ii;
@@ -8,7 +11,11 @@
  #ifdef HAVE_CURSES
  	int             setcolors = FALSE;
  #endif				/* HAVE_CURSES */
-@@ -169,14 +170,10 @@
+ 	/* Internationalization */
+ #ifdef HAVE_NLS
+@@ -166,18 +167,14 @@
+ 				setcolors = TRUE;
+ 				interactive = IN_CURSES;
  				break;
  #endif				/* HAVE_CURSES */
  			case 'S':	/* Save to file. */
@@ -23,9 +30,13 @@
 -				ErrorExitWarn(LoadSettings(), 'e');
 +				load = 1;
  				break;
- #if defined (HAVE_CURSES) || defined (HAVE_GTK)
+ #if defined (HAVE_CURSES) || defined (HAVE_GTK) || defined (HAVE_GTK1)
  			case 'I':	/* User asked for interactive mode. */
-@@ -192,6 +189,17 @@
+ 				if (!interactive)
+ 					interactive = IN_ANY;
+@@ -189,10 +186,21 @@
+ 			default:	/* Show help. */
+ 				Usage(EXIT_FAILURE);
  			}
  		}
  	}
@@ -43,3 +54,5 @@
  #if defined (HAVE_CURSES) || defined (HAVE_GTK) || defined (HAVE_GTK1)
  /* Be interactive if no options were given. */
  	if (!interactive && argc <= 1)
+ 		interactive = IN_ANY;
+ /* By now we've decided whether to go interactive.

aumix-fix-crackrock.patch:

Index: aumix-fix-crackrock.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-9/aumix-fix-crackrock.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aumix-fix-crackrock.patch	15 Dec 2006 19:18:11 -0000	1.2
+++ aumix-fix-crackrock.patch	26 Sep 2008 18:10:34 -0000	1.3
@@ -1,6 +1,6 @@
 diff -NarU5 aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
---- aumix-2.8.orig/src/common.c	2006-12-15 12:47:06.000000000 -0500
-+++ aumix-2.8/src/common.c	2006-12-15 14:17:06.000000000 -0500
+--- aumix-2.8.orig/src/common.c	2008-09-26 13:50:32.000000000 -0400
++++ aumix-2.8/src/common.c	2008-09-26 13:51:16.000000000 -0400
 @@ -17,10 +17,11 @@
   * You should have received a copy of the GNU General Public License along with
   * aumix; if not, write to the Free Software Foundation, Inc., 59 Temple Place,

aumix-fix-cursor-color-on-exit.patch:

Index: aumix-fix-cursor-color-on-exit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-9/aumix-fix-cursor-color-on-exit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix-fix-cursor-color-on-exit.patch	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix-fix-cursor-color-on-exit.patch	26 Sep 2008 18:10:34 -0000	1.2
@@ -1,11 +1,9 @@
-michael at yohe.net - this fixes the blue cursor that appears on some terminals
-as - CloseScreen() resets the color to default, but nothing ever gets printed
-so the cursor was never updated.  Simply adding a carriage return does not
-change the behavior, and will reset the cursor properly.
-
---- src/common.c	2002-11-25 10:07:08.000000000 -0600
-+++ src/common.c	2002-11-25 10:06:50.000000000 -0600
-@@ -251,6 +251,9 @@
+diff -NarU5 aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
+--- aumix-2.8.orig/src/common.c	2008-09-26 13:45:15.000000000 -0400
++++ aumix-2.8/src/common.c	2008-09-26 13:49:45.000000000 -0400
+@@ -256,10 +256,13 @@
+ 		Gpm_Close();
+ #endif				/* HAVE_CURSES */
  		close(mixer_fd);
  #if HAVE_CURSES
  		CloseScreen();
@@ -15,3 +13,5 @@
  	}
  #endif				/* HAVE_CURSES */
  	exit(EXIT_SUCCESS);
+ }
+ 


Index: aumix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-9/aumix.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- aumix.spec	20 Feb 2008 00:39:59 -0000	1.8
+++ aumix.spec	26 Sep 2008 18:10:35 -0000	1.9
@@ -1,6 +1,6 @@
 Name: aumix
 Version: 2.8
-Release: 17%{?dist}
+Release: 18%{?dist}
 Summary: Audio mixer based on ncurses
 License: GPLv2+
 Group: Applications/Multimedia
@@ -21,10 +21,10 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
-%patch2 -p0
+%patch1 -p1
+%patch2 -p1
 %patch3 -p1
-%patch4 -p0
+%patch4 -p1
 %patch5 -p1
 
 %build
@@ -50,6 +50,9 @@
 %{_datadir}/aumix
 
 %changelog
+* Fri Sep 26 2008 Gabriel L. Somlo <somlo at cmu.edu> 2.8-18
+- re-based patches to eliminate fuzz
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.8-17
 - Autorebuild for GCC 4.3
 

curses-cleanup.patch:

Index: curses-cleanup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-9/curses-cleanup.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- curses-cleanup.patch	29 Mar 2007 01:49:39 -0000	1.2
+++ curses-cleanup.patch	26 Sep 2008 18:10:35 -0000	1.3
@@ -1,6 +1,6 @@
 diff -NarU5 aumix-2.8.orig/config.h.in aumix-2.8/config.h.in
 --- aumix-2.8.orig/config.h.in	2002-11-24 20:35:41.000000000 -0500
-+++ aumix-2.8/config.h.in	2007-03-21 14:34:23.000000000 -0400
++++ aumix-2.8/config.h.in	2008-09-26 13:53:42.000000000 -0400
 @@ -160,13 +160,10 @@
  #undef HAVE_SYS_TIME_H
  
@@ -42,7 +42,7 @@
  
 diff -NarU5 aumix-2.8.orig/configure aumix-2.8/configure
 --- aumix-2.8.orig/configure	2002-11-24 20:35:48.000000000 -0500
-+++ aumix-2.8/configure	2007-03-21 14:39:52.000000000 -0400
++++ aumix-2.8/configure	2008-09-26 13:53:42.000000000 -0400
 @@ -1,71 +1,344 @@
  #! /bin/sh
 -
@@ -10364,7 +10364,7 @@
  
 diff -NarU5 aumix-2.8.orig/configure.in aumix-2.8/configure.in
 --- aumix-2.8.orig/configure.in	2002-11-24 20:04:16.000000000 -0500
-+++ aumix-2.8/configure.in	2007-03-21 14:52:37.000000000 -0400
++++ aumix-2.8/configure.in	2008-09-26 13:53:42.000000000 -0400
 @@ -72,39 +72,10 @@
        AC_DEFINE(HAVE_USEKEYPAD, 1,
  	[Define this if your ncurses library has the member _use_keypad
@@ -10486,7 +10486,7 @@
  AC_MSG_RESULT($dummy_mixer)
 diff -NarU5 aumix-2.8.orig/data/Makefile.in aumix-2.8/data/Makefile.in
 --- aumix-2.8.orig/data/Makefile.in	2002-11-24 20:35:44.000000000 -0500
-+++ aumix-2.8/data/Makefile.in	2007-03-21 14:43:17.000000000 -0400
++++ aumix-2.8/data/Makefile.in	2008-09-26 13:53:42.000000000 -0400
 @@ -60,12 +60,10 @@
  AWK = @AWK@
  CATALOGS = @CATALOGS@
@@ -10502,7 +10502,7 @@
  GTK_LIBS = @GTK_LIBS@
 diff -NarU5 aumix-2.8.orig/doc/Makefile.in aumix-2.8/doc/Makefile.in
 --- aumix-2.8.orig/doc/Makefile.in	2002-11-24 20:35:44.000000000 -0500
-+++ aumix-2.8/doc/Makefile.in	2007-03-21 14:43:25.000000000 -0400
++++ aumix-2.8/doc/Makefile.in	2008-09-26 13:53:42.000000000 -0400
 @@ -60,12 +60,10 @@
  AWK = @AWK@
  CATALOGS = @CATALOGS@
@@ -10518,7 +10518,7 @@
  GTK_LIBS = @GTK_LIBS@
 diff -NarU5 aumix-2.8.orig/Makefile.in aumix-2.8/Makefile.in
 --- aumix-2.8.orig/Makefile.in	2002-11-24 20:35:46.000000000 -0500
-+++ aumix-2.8/Makefile.in	2007-03-21 14:42:55.000000000 -0400
++++ aumix-2.8/Makefile.in	2008-09-26 13:53:42.000000000 -0400
 @@ -60,12 +60,10 @@
  AWK = @AWK@
  CATALOGS = @CATALOGS@
@@ -10534,7 +10534,7 @@
  GTK_LIBS = @GTK_LIBS@
 diff -NarU5 aumix-2.8.orig/po/POTFILES.in aumix-2.8/po/POTFILES.in
 --- aumix-2.8.orig/po/POTFILES.in	2000-06-27 01:51:42.000000000 -0400
-+++ aumix-2.8/po/POTFILES.in	2007-03-21 14:26:03.000000000 -0400
++++ aumix-2.8/po/POTFILES.in	2008-09-26 13:53:42.000000000 -0400
 @@ -2,6 +2,6 @@
  
  # Package source files
@@ -10544,8 +10544,8 @@
 -src/gtk.c
 +#src/gtk.c
 diff -NarU5 aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
---- aumix-2.8.orig/src/common.c	2007-03-20 16:22:56.000000000 -0400
-+++ aumix-2.8/src/common.c	2007-03-28 21:32:56.000000000 -0400
+--- aumix-2.8.orig/src/common.c	2008-09-26 13:51:46.000000000 -0400
++++ aumix-2.8/src/common.c	2008-09-26 13:53:42.000000000 -0400
 @@ -21,15 +21,11 @@
  
  #include <errno.h>
@@ -10725,8 +10725,8 @@
    S:  save settings\n"));
  	exit(status);
 diff -NarU5 aumix-2.8.orig/src/common.h aumix-2.8/src/common.h
---- aumix-2.8.orig/src/common.h	2007-03-20 16:22:18.000000000 -0400
-+++ aumix-2.8/src/common.h	2007-03-20 16:26:05.000000000 -0400
+--- aumix-2.8.orig/src/common.h	2008-09-26 13:48:53.000000000 -0400
++++ aumix-2.8/src/common.h	2008-09-26 13:53:42.000000000 -0400
 @@ -20,15 +20,14 @@
  #ifndef AUMIX_H
  #define AUMIX_H
@@ -10747,7 +10747,7 @@
  #define FALSE 0
 diff -NarU5 aumix-2.8.orig/src/curses.c aumix-2.8/src/curses.c
 --- aumix-2.8.orig/src/curses.c	2002-10-23 11:07:40.000000000 -0400
-+++ aumix-2.8/src/curses.c	2007-03-28 21:13:19.000000000 -0400
++++ aumix-2.8/src/curses.c	2008-09-26 13:53:42.000000000 -0400
 @@ -150,14 +150,10 @@
  	PlaceCursor();
  }
@@ -10944,7 +10944,7 @@
  void            DrawLevelBalModeCurses(int dev, int mode)
 diff -NarU5 aumix-2.8.orig/src/curses.h aumix-2.8/src/curses.h
 --- aumix-2.8.orig/src/curses.h	2002-05-06 02:23:29.000000000 -0400
-+++ aumix-2.8/src/curses.h	2007-03-28 18:04:51.000000000 -0400
++++ aumix-2.8/src/curses.h	2008-09-26 13:53:42.000000000 -0400
 @@ -18,11 +18,10 @@
   */
  
@@ -11895,7 +11895,7 @@
 -#endif				/* AUMIX_GTK_H */
 diff -NarU5 aumix-2.8.orig/src/interactive.c aumix-2.8/src/interactive.c
 --- aumix-2.8.orig/src/interactive.c	2002-10-29 16:27:52.000000000 -0500
-+++ aumix-2.8/src/interactive.c	2007-03-22 13:52:57.000000000 -0400
++++ aumix-2.8/src/interactive.c	2008-09-26 13:53:42.000000000 -0400
 @@ -17,56 +17,13 @@
   * aumix; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
   * Suite 330, Boston, MA 02111-1307, USA.
@@ -12060,7 +12060,7 @@
 +#endif				/* HAVE_CURSES */
 diff -NarU5 aumix-2.8.orig/src/interactive.h aumix-2.8/src/interactive.h
 --- aumix-2.8.orig/src/interactive.h	2000-04-12 11:02:04.000000000 -0400
-+++ aumix-2.8/src/interactive.h	2007-03-22 13:53:07.000000000 -0400
++++ aumix-2.8/src/interactive.h	2008-09-26 13:53:42.000000000 -0400
 @@ -2,16 +2,12 @@
  #define INTERACTIVE_H
  #define MUTE_NO_DEVICE -1
@@ -12089,7 +12089,7 @@
  #endif				/* INTERACTIVE_H */
 diff -NarU5 aumix-2.8.orig/src/Makefile.am aumix-2.8/src/Makefile.am
 --- aumix-2.8.orig/src/Makefile.am	2002-03-18 20:09:17.000000000 -0500
-+++ aumix-2.8/src/Makefile.am	2007-03-21 14:42:44.000000000 -0400
++++ aumix-2.8/src/Makefile.am	2008-09-26 13:53:42.000000000 -0400
 @@ -1,17 +1,17 @@
  # $Aumix: aumix/src/Makefile.am,v 1.2 2002/03/19 01:09:17 trevor Exp $
  bin_PROGRAMS	= aumix
@@ -12114,7 +12114,7 @@
  	$(COMPILE) -DDATADIR=\"$(datadir)/aumix\" -c $<
 diff -NarU5 aumix-2.8.orig/src/Makefile.in aumix-2.8/src/Makefile.in
 --- aumix-2.8.orig/src/Makefile.in	2002-11-24 20:35:45.000000000 -0500
-+++ aumix-2.8/src/Makefile.in	2007-03-21 14:42:38.000000000 -0400
++++ aumix-2.8/src/Makefile.in	2008-09-26 13:53:42.000000000 -0400
 @@ -62,17 +62,12 @@
  AWK = @AWK@
  CATALOGS = @CATALOGS@
@@ -12166,7 +12166,7 @@
  SCRIPTS =  $(bin_SCRIPTS)
 diff -NarU5 aumix-2.8.orig/src/mouse.c aumix-2.8/src/mouse.c
 --- aumix-2.8.orig/src/mouse.c	2002-05-07 04:41:38.000000000 -0400
-+++ aumix-2.8/src/mouse.c	2007-03-22 13:52:43.000000000 -0400
++++ aumix-2.8/src/mouse.c	2008-09-26 13:53:42.000000000 -0400
 @@ -17,155 +17,32 @@
   * Suite 330, Boston, MA 02111-1307, USA.
   */
@@ -12327,7 +12327,7 @@
  		case 7:	/* only */
 diff -NarU5 aumix-2.8.orig/src/mouse.h aumix-2.8/src/mouse.h
 --- aumix-2.8.orig/src/mouse.h	2002-03-28 04:37:27.000000000 -0500
-+++ aumix-2.8/src/mouse.h	2007-03-20 16:26:05.000000000 -0400
++++ aumix-2.8/src/mouse.h	2008-09-26 13:53:42.000000000 -0400
 @@ -17,30 +17,17 @@
   * Suite 330, Boston, MA 02111-1307, USA.
   */



From somlo at fedoraproject.org  Fri Sep 26 18:12:07 2008
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Fri, 26 Sep 2008 18:12:07 +0000 (UTC)
Subject: rpms/aumix/devel aumix-2.8-bug-115869.patch, 1.1,
	1.2 aumix-2.8-include-signal_h.patch, 1.1,
	1.2 aumix-2.8-save_load.patch, 1.1,
	1.2 aumix-fix-crackrock.patch, 1.2,
	1.3 aumix-fix-cursor-color-on-exit.patch, 1.1, 1.2 aumix.spec,
	1.8, 1.9 curses-cleanup.patch, 1.2, 1.3
Message-ID: <20080926181207.96E137010C@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/aumix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5120

Modified Files:
	aumix-2.8-bug-115869.patch aumix-2.8-include-signal_h.patch 
	aumix-2.8-save_load.patch aumix-fix-crackrock.patch 
	aumix-fix-cursor-color-on-exit.patch aumix.spec 
	curses-cleanup.patch 
Log Message:
re-based patches to eliminate fuzz

aumix-2.8-bug-115869.patch:

Index: aumix-2.8-bug-115869.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/devel/aumix-2.8-bug-115869.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix-2.8-bug-115869.patch	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix-2.8-bug-115869.patch	26 Sep 2008 18:11:36 -0000	1.2
@@ -1,10 +1,9 @@
-Patch by mharris to fix bug:
-
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=115869
-
---- src/mute.bug-115869	Thu Dec 23 11:56:42 2004
-+++ src/mute	Thu Dec 23 11:56:55 2004
-@@ -8,7 +8,8 @@
+diff -NarU5 aumix-2.8.orig/src/mute aumix-2.8/src/mute
+--- aumix-2.8.orig/src/mute	2002-03-18 20:09:18.000000000 -0500
++++ aumix-2.8/src/mute	2008-09-26 13:52:40.000000000 -0400
+@@ -6,9 +6,10 @@
+ # Note:  it will clobber your saved settings.
+ #
  volumes=$(aumix -vq |tr -d ,)
  if [ $(echo $volumes | awk '{print $2}') -ne 0 -o \
  	$(echo $volumes | awk '{print $3}') -ne 0 ]; then

aumix-2.8-include-signal_h.patch:

Index: aumix-2.8-include-signal_h.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/devel/aumix-2.8-include-signal_h.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix-2.8-include-signal_h.patch	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix-2.8-include-signal_h.patch	26 Sep 2008 18:11:36 -0000	1.2
@@ -1,6 +1,9 @@
---- src/common.h.include-signal_h	Sun May 18 01:40:04 2003
-+++ src/common.h	Sun May 18 01:38:55 2003
-@@ -37,6 +37,7 @@
+diff -NarU5 aumix-2.8.orig/src/common.h aumix-2.8/src/common.h
+--- aumix-2.8.orig/src/common.h	2002-10-29 16:27:51.000000000 -0500
++++ aumix-2.8/src/common.h	2008-09-26 13:41:59.000000000 -0400
+@@ -35,10 +35,11 @@
+ #endif				/* FALSE */
+ #include <stdio.h>
  #include <stdlib.h>		/* getenv() */
  #include <string.h>
  #include <sys/types.h>
@@ -8,3 +11,5 @@
  #include <sys/stat.h>
  #include <unistd.h>
  #include <fcntl.h>
+ #include <sys/ioctl.h>
+ 

aumix-2.8-save_load.patch:

Index: aumix-2.8-save_load.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/devel/aumix-2.8-save_load.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix-2.8-save_load.patch	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix-2.8-save_load.patch	26 Sep 2008 18:11:36 -0000	1.2
@@ -1,6 +1,9 @@
---- aumix-2.7/src/common.c.save_load	Mon Jun 25 22:08:22 2001
-+++ aumix-2.7/src/common.c	Mon Jun 25 22:16:30 2001
-@@ -114,6 +114,7 @@
+diff -NarU5 aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
+--- aumix-2.8.orig/src/common.c	2002-10-29 16:27:51.000000000 -0500
++++ aumix-2.8/src/common.c	2008-09-26 13:39:07.000000000 -0400
+@@ -114,10 +114,11 @@
+ int             usage_ok = 1;
+ 
  int             main(int argc, char *argv[])
  {
  	int             optn, ii;
@@ -8,7 +11,11 @@
  #ifdef HAVE_CURSES
  	int             setcolors = FALSE;
  #endif				/* HAVE_CURSES */
-@@ -169,14 +170,10 @@
+ 	/* Internationalization */
+ #ifdef HAVE_NLS
+@@ -166,18 +167,14 @@
+ 				setcolors = TRUE;
+ 				interactive = IN_CURSES;
  				break;
  #endif				/* HAVE_CURSES */
  			case 'S':	/* Save to file. */
@@ -23,9 +30,13 @@
 -				ErrorExitWarn(LoadSettings(), 'e');
 +				load = 1;
  				break;
- #if defined (HAVE_CURSES) || defined (HAVE_GTK)
+ #if defined (HAVE_CURSES) || defined (HAVE_GTK) || defined (HAVE_GTK1)
  			case 'I':	/* User asked for interactive mode. */
-@@ -192,6 +189,17 @@
+ 				if (!interactive)
+ 					interactive = IN_ANY;
+@@ -189,10 +186,21 @@
+ 			default:	/* Show help. */
+ 				Usage(EXIT_FAILURE);
  			}
  		}
  	}
@@ -43,3 +54,5 @@
  #if defined (HAVE_CURSES) || defined (HAVE_GTK) || defined (HAVE_GTK1)
  /* Be interactive if no options were given. */
  	if (!interactive && argc <= 1)
+ 		interactive = IN_ANY;
+ /* By now we've decided whether to go interactive.

aumix-fix-crackrock.patch:

Index: aumix-fix-crackrock.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/devel/aumix-fix-crackrock.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aumix-fix-crackrock.patch	15 Dec 2006 19:18:11 -0000	1.2
+++ aumix-fix-crackrock.patch	26 Sep 2008 18:11:36 -0000	1.3
@@ -1,6 +1,6 @@
 diff -NarU5 aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
---- aumix-2.8.orig/src/common.c	2006-12-15 12:47:06.000000000 -0500
-+++ aumix-2.8/src/common.c	2006-12-15 14:17:06.000000000 -0500
+--- aumix-2.8.orig/src/common.c	2008-09-26 13:50:32.000000000 -0400
++++ aumix-2.8/src/common.c	2008-09-26 13:51:16.000000000 -0400
 @@ -17,10 +17,11 @@
   * You should have received a copy of the GNU General Public License along with
   * aumix; if not, write to the Free Software Foundation, Inc., 59 Temple Place,

aumix-fix-cursor-color-on-exit.patch:

Index: aumix-fix-cursor-color-on-exit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/devel/aumix-fix-cursor-color-on-exit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix-fix-cursor-color-on-exit.patch	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix-fix-cursor-color-on-exit.patch	26 Sep 2008 18:11:36 -0000	1.2
@@ -1,11 +1,9 @@
-michael at yohe.net - this fixes the blue cursor that appears on some terminals
-as - CloseScreen() resets the color to default, but nothing ever gets printed
-so the cursor was never updated.  Simply adding a carriage return does not
-change the behavior, and will reset the cursor properly.
-
---- src/common.c	2002-11-25 10:07:08.000000000 -0600
-+++ src/common.c	2002-11-25 10:06:50.000000000 -0600
-@@ -251,6 +251,9 @@
+diff -NarU5 aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
+--- aumix-2.8.orig/src/common.c	2008-09-26 13:45:15.000000000 -0400
++++ aumix-2.8/src/common.c	2008-09-26 13:49:45.000000000 -0400
+@@ -256,10 +256,13 @@
+ 		Gpm_Close();
+ #endif				/* HAVE_CURSES */
  		close(mixer_fd);
  #if HAVE_CURSES
  		CloseScreen();
@@ -15,3 +13,5 @@
  	}
  #endif				/* HAVE_CURSES */
  	exit(EXIT_SUCCESS);
+ }
+ 


Index: aumix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/devel/aumix.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- aumix.spec	20 Feb 2008 00:39:59 -0000	1.8
+++ aumix.spec	26 Sep 2008 18:11:36 -0000	1.9
@@ -1,6 +1,6 @@
 Name: aumix
 Version: 2.8
-Release: 17%{?dist}
+Release: 18%{?dist}
 Summary: Audio mixer based on ncurses
 License: GPLv2+
 Group: Applications/Multimedia
@@ -21,10 +21,10 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
-%patch2 -p0
+%patch1 -p1
+%patch2 -p1
 %patch3 -p1
-%patch4 -p0
+%patch4 -p1
 %patch5 -p1
 
 %build
@@ -50,6 +50,9 @@
 %{_datadir}/aumix
 
 %changelog
+* Fri Sep 26 2008 Gabriel L. Somlo <somlo at cmu.edu> 2.8-18
+- re-based patches to eliminate fuzz
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.8-17
 - Autorebuild for GCC 4.3
 

curses-cleanup.patch:

Index: curses-cleanup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/devel/curses-cleanup.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- curses-cleanup.patch	29 Mar 2007 01:49:39 -0000	1.2
+++ curses-cleanup.patch	26 Sep 2008 18:11:36 -0000	1.3
@@ -1,6 +1,6 @@
 diff -NarU5 aumix-2.8.orig/config.h.in aumix-2.8/config.h.in
 --- aumix-2.8.orig/config.h.in	2002-11-24 20:35:41.000000000 -0500
-+++ aumix-2.8/config.h.in	2007-03-21 14:34:23.000000000 -0400
++++ aumix-2.8/config.h.in	2008-09-26 13:53:42.000000000 -0400
 @@ -160,13 +160,10 @@
  #undef HAVE_SYS_TIME_H
  
@@ -42,7 +42,7 @@
  
 diff -NarU5 aumix-2.8.orig/configure aumix-2.8/configure
 --- aumix-2.8.orig/configure	2002-11-24 20:35:48.000000000 -0500
-+++ aumix-2.8/configure	2007-03-21 14:39:52.000000000 -0400
++++ aumix-2.8/configure	2008-09-26 13:53:42.000000000 -0400
 @@ -1,71 +1,344 @@
  #! /bin/sh
 -
@@ -10364,7 +10364,7 @@
  
 diff -NarU5 aumix-2.8.orig/configure.in aumix-2.8/configure.in
 --- aumix-2.8.orig/configure.in	2002-11-24 20:04:16.000000000 -0500
-+++ aumix-2.8/configure.in	2007-03-21 14:52:37.000000000 -0400
++++ aumix-2.8/configure.in	2008-09-26 13:53:42.000000000 -0400
 @@ -72,39 +72,10 @@
        AC_DEFINE(HAVE_USEKEYPAD, 1,
  	[Define this if your ncurses library has the member _use_keypad
@@ -10486,7 +10486,7 @@
  AC_MSG_RESULT($dummy_mixer)
 diff -NarU5 aumix-2.8.orig/data/Makefile.in aumix-2.8/data/Makefile.in
 --- aumix-2.8.orig/data/Makefile.in	2002-11-24 20:35:44.000000000 -0500
-+++ aumix-2.8/data/Makefile.in	2007-03-21 14:43:17.000000000 -0400
++++ aumix-2.8/data/Makefile.in	2008-09-26 13:53:42.000000000 -0400
 @@ -60,12 +60,10 @@
  AWK = @AWK@
  CATALOGS = @CATALOGS@
@@ -10502,7 +10502,7 @@
  GTK_LIBS = @GTK_LIBS@
 diff -NarU5 aumix-2.8.orig/doc/Makefile.in aumix-2.8/doc/Makefile.in
 --- aumix-2.8.orig/doc/Makefile.in	2002-11-24 20:35:44.000000000 -0500
-+++ aumix-2.8/doc/Makefile.in	2007-03-21 14:43:25.000000000 -0400
++++ aumix-2.8/doc/Makefile.in	2008-09-26 13:53:42.000000000 -0400
 @@ -60,12 +60,10 @@
  AWK = @AWK@
  CATALOGS = @CATALOGS@
@@ -10518,7 +10518,7 @@
  GTK_LIBS = @GTK_LIBS@
 diff -NarU5 aumix-2.8.orig/Makefile.in aumix-2.8/Makefile.in
 --- aumix-2.8.orig/Makefile.in	2002-11-24 20:35:46.000000000 -0500
-+++ aumix-2.8/Makefile.in	2007-03-21 14:42:55.000000000 -0400
++++ aumix-2.8/Makefile.in	2008-09-26 13:53:42.000000000 -0400
 @@ -60,12 +60,10 @@
  AWK = @AWK@
  CATALOGS = @CATALOGS@
@@ -10534,7 +10534,7 @@
  GTK_LIBS = @GTK_LIBS@
 diff -NarU5 aumix-2.8.orig/po/POTFILES.in aumix-2.8/po/POTFILES.in
 --- aumix-2.8.orig/po/POTFILES.in	2000-06-27 01:51:42.000000000 -0400
-+++ aumix-2.8/po/POTFILES.in	2007-03-21 14:26:03.000000000 -0400
++++ aumix-2.8/po/POTFILES.in	2008-09-26 13:53:42.000000000 -0400
 @@ -2,6 +2,6 @@
  
  # Package source files
@@ -10544,8 +10544,8 @@
 -src/gtk.c
 +#src/gtk.c
 diff -NarU5 aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
---- aumix-2.8.orig/src/common.c	2007-03-20 16:22:56.000000000 -0400
-+++ aumix-2.8/src/common.c	2007-03-28 21:32:56.000000000 -0400
+--- aumix-2.8.orig/src/common.c	2008-09-26 13:51:46.000000000 -0400
++++ aumix-2.8/src/common.c	2008-09-26 13:53:42.000000000 -0400
 @@ -21,15 +21,11 @@
  
  #include <errno.h>
@@ -10725,8 +10725,8 @@
    S:  save settings\n"));
  	exit(status);
 diff -NarU5 aumix-2.8.orig/src/common.h aumix-2.8/src/common.h
---- aumix-2.8.orig/src/common.h	2007-03-20 16:22:18.000000000 -0400
-+++ aumix-2.8/src/common.h	2007-03-20 16:26:05.000000000 -0400
+--- aumix-2.8.orig/src/common.h	2008-09-26 13:48:53.000000000 -0400
++++ aumix-2.8/src/common.h	2008-09-26 13:53:42.000000000 -0400
 @@ -20,15 +20,14 @@
  #ifndef AUMIX_H
  #define AUMIX_H
@@ -10747,7 +10747,7 @@
  #define FALSE 0
 diff -NarU5 aumix-2.8.orig/src/curses.c aumix-2.8/src/curses.c
 --- aumix-2.8.orig/src/curses.c	2002-10-23 11:07:40.000000000 -0400
-+++ aumix-2.8/src/curses.c	2007-03-28 21:13:19.000000000 -0400
++++ aumix-2.8/src/curses.c	2008-09-26 13:53:42.000000000 -0400
 @@ -150,14 +150,10 @@
  	PlaceCursor();
  }
@@ -10944,7 +10944,7 @@
  void            DrawLevelBalModeCurses(int dev, int mode)
 diff -NarU5 aumix-2.8.orig/src/curses.h aumix-2.8/src/curses.h
 --- aumix-2.8.orig/src/curses.h	2002-05-06 02:23:29.000000000 -0400
-+++ aumix-2.8/src/curses.h	2007-03-28 18:04:51.000000000 -0400
++++ aumix-2.8/src/curses.h	2008-09-26 13:53:42.000000000 -0400
 @@ -18,11 +18,10 @@
   */
  
@@ -11895,7 +11895,7 @@
 -#endif				/* AUMIX_GTK_H */
 diff -NarU5 aumix-2.8.orig/src/interactive.c aumix-2.8/src/interactive.c
 --- aumix-2.8.orig/src/interactive.c	2002-10-29 16:27:52.000000000 -0500
-+++ aumix-2.8/src/interactive.c	2007-03-22 13:52:57.000000000 -0400
++++ aumix-2.8/src/interactive.c	2008-09-26 13:53:42.000000000 -0400
 @@ -17,56 +17,13 @@
   * aumix; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
   * Suite 330, Boston, MA 02111-1307, USA.
@@ -12060,7 +12060,7 @@
 +#endif				/* HAVE_CURSES */
 diff -NarU5 aumix-2.8.orig/src/interactive.h aumix-2.8/src/interactive.h
 --- aumix-2.8.orig/src/interactive.h	2000-04-12 11:02:04.000000000 -0400
-+++ aumix-2.8/src/interactive.h	2007-03-22 13:53:07.000000000 -0400
++++ aumix-2.8/src/interactive.h	2008-09-26 13:53:42.000000000 -0400
 @@ -2,16 +2,12 @@
  #define INTERACTIVE_H
  #define MUTE_NO_DEVICE -1
@@ -12089,7 +12089,7 @@
  #endif				/* INTERACTIVE_H */
 diff -NarU5 aumix-2.8.orig/src/Makefile.am aumix-2.8/src/Makefile.am
 --- aumix-2.8.orig/src/Makefile.am	2002-03-18 20:09:17.000000000 -0500
-+++ aumix-2.8/src/Makefile.am	2007-03-21 14:42:44.000000000 -0400
++++ aumix-2.8/src/Makefile.am	2008-09-26 13:53:42.000000000 -0400
 @@ -1,17 +1,17 @@
  # $Aumix: aumix/src/Makefile.am,v 1.2 2002/03/19 01:09:17 trevor Exp $
  bin_PROGRAMS	= aumix
@@ -12114,7 +12114,7 @@
  	$(COMPILE) -DDATADIR=\"$(datadir)/aumix\" -c $<
 diff -NarU5 aumix-2.8.orig/src/Makefile.in aumix-2.8/src/Makefile.in
 --- aumix-2.8.orig/src/Makefile.in	2002-11-24 20:35:45.000000000 -0500
-+++ aumix-2.8/src/Makefile.in	2007-03-21 14:42:38.000000000 -0400
++++ aumix-2.8/src/Makefile.in	2008-09-26 13:53:42.000000000 -0400
 @@ -62,17 +62,12 @@
  AWK = @AWK@
  CATALOGS = @CATALOGS@
@@ -12166,7 +12166,7 @@
  SCRIPTS =  $(bin_SCRIPTS)
 diff -NarU5 aumix-2.8.orig/src/mouse.c aumix-2.8/src/mouse.c
 --- aumix-2.8.orig/src/mouse.c	2002-05-07 04:41:38.000000000 -0400
-+++ aumix-2.8/src/mouse.c	2007-03-22 13:52:43.000000000 -0400
++++ aumix-2.8/src/mouse.c	2008-09-26 13:53:42.000000000 -0400
 @@ -17,155 +17,32 @@
   * Suite 330, Boston, MA 02111-1307, USA.
   */
@@ -12327,7 +12327,7 @@
  		case 7:	/* only */
 diff -NarU5 aumix-2.8.orig/src/mouse.h aumix-2.8/src/mouse.h
 --- aumix-2.8.orig/src/mouse.h	2002-03-28 04:37:27.000000000 -0500
-+++ aumix-2.8/src/mouse.h	2007-03-20 16:26:05.000000000 -0400
++++ aumix-2.8/src/mouse.h	2008-09-26 13:53:42.000000000 -0400
 @@ -17,30 +17,17 @@
   * Suite 330, Boston, MA 02111-1307, USA.
   */



From nsantos at fedoraproject.org  Fri Sep 26 18:14:43 2008
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 26 Sep 2008 18:14:43 +0000 (UTC)
Subject: rpms/python-qpid/F-8 .cvsignore, 1.4, 1.5 python-qpid.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20080926181443.444677010C@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/python-qpid/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5554

Modified Files:
	.cvsignore python-qpid.spec sources 
Log Message:
rebased to svn rev 693140


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Jun 2008 17:28:46 -0000	1.4
+++ .cvsignore	26 Sep 2008 18:14:12 -0000	1.5
@@ -1 +1 @@
-python-qpid-0.2.668378.tar.gz
+python-qpid-0.3.693140.tar.gz


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-8/python-qpid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-qpid.spec	18 Jun 2008 17:28:46 -0000	1.5
+++ python-qpid.spec	26 Sep 2008 18:14:12 -0000	1.6
@@ -1,14 +1,14 @@
 Name:           python-qpid
-Version:        0.2.668378
+Version:        0.3.693140
 Release:        1%{?dist}
 Summary:        Python language client for AMQP
 
 Group:          Development/Python
-License:        Apache Software License
+License:        ASL 2.0
 URL:            http://incubator.apache.org/qpid
 Source0:        %{name}-%{version}.tar.gz
-# svn export -r<rev> http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/python python-qpid-0.2.<rev>
-# tar czf python-qpid-0.2.<rev>.tar.gz python-qpid-0.2.<rev>
+# svn export -r<rev> http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/python python-qpid-0.3.<rev>
+# tar czf python-qpid-0.3.<rev>.tar.gz python-qpid-0.3.<rev>
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -16,7 +16,7 @@
 BuildRequires:  python-devel
 
 Requires:       python
-Requires:       amqp >= 1.0.666398-5
+Requires:       amqp >= 1.0.693140-1
 
 %description
 The Apache Qpid project's Python language client for AMQP.
@@ -69,6 +69,12 @@
 %doc LICENSE.txt NOTICE.txt README.txt doc/test-requirements.txt
 
 %changelog
+* Mon Sep  8 2008 Nuno Santos <nsantos at redhat.com> - 0.3.693140-1
+- Update for Fedora 10
+
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.668378-2
+- fix license tag
+
 * Mon Jun 16 2008 Rafael Schloming <rafaels at redhat.com> - 0.2.668378-1
 - Source update for MRG RC1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Jun 2008 17:28:46 -0000	1.6
+++ sources	26 Sep 2008 18:14:12 -0000	1.7
@@ -1 +1 @@
-353510fe956b293cc2da59ae761e18be  python-qpid-0.2.668378.tar.gz
+cea9170f05b27141eb98544ed3d7a225  python-qpid-0.3.693140.tar.gz



From nsantos at fedoraproject.org  Fri Sep 26 18:23:01 2008
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 26 Sep 2008 18:23:01 +0000 (UTC)
Subject: rpms/python-qpid/F-9 .cvsignore, 1.4, 1.5 python-qpid.spec, 1.7,
	1.8 sources, 1.8, 1.9
Message-ID: <20080926182301.EAB737010C@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/python-qpid/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7126

Modified Files:
	.cvsignore python-qpid.spec sources 
Log Message:
rebased to svn rev 693140


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Jun 2008 17:34:02 -0000	1.4
+++ .cvsignore	26 Sep 2008 18:22:31 -0000	1.5
@@ -1 +1 @@
-python-qpid-0.2.668378.tar.gz
+python-qpid-0.3.693140.tar.gz


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-9/python-qpid.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-qpid.spec	18 Jun 2008 17:34:02 -0000	1.7
+++ python-qpid.spec	26 Sep 2008 18:22:31 -0000	1.8
@@ -1,14 +1,14 @@
 Name:           python-qpid
-Version:        0.2.668378
+Version:        0.3.693140
 Release:        1%{?dist}
 Summary:        Python language client for AMQP
 
 Group:          Development/Python
-License:        Apache Software License
+License:        ASL 2.0
 URL:            http://incubator.apache.org/qpid
 Source0:        %{name}-%{version}.tar.gz
-# svn export -r<rev> http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/python python-qpid-0.2.<rev>
-# tar czf python-qpid-0.2.<rev>.tar.gz python-qpid-0.2.<rev>
+# svn export -r<rev> http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/python python-qpid-0.3.<rev>
+# tar czf python-qpid-0.3.<rev>.tar.gz python-qpid-0.3.<rev>
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -16,7 +16,7 @@
 BuildRequires:  python-devel
 
 Requires:       python
-Requires:       amqp >= 1.0.666398-5
+Requires:       amqp >= 1.0.693140-1
 
 %description
 The Apache Qpid project's Python language client for AMQP.
@@ -69,6 +69,12 @@
 %doc LICENSE.txt NOTICE.txt README.txt doc/test-requirements.txt
 
 %changelog
+* Mon Sep  8 2008 Nuno Santos <nsantos at redhat.com> - 0.3.693140-1
+- Update for Fedora 10
+
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.668378-2
+- fix license tag
+
 * Mon Jun 16 2008 Rafael Schloming <rafaels at redhat.com> - 0.2.668378-1
 - Source update for MRG RC1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Jun 2008 17:34:02 -0000	1.8
+++ sources	26 Sep 2008 18:22:31 -0000	1.9
@@ -1 +1 @@
-353510fe956b293cc2da59ae761e18be  python-qpid-0.2.668378.tar.gz
+cea9170f05b27141eb98544ed3d7a225  python-qpid-0.3.693140.tar.gz



From fabbione at fedoraproject.org  Fri Sep 26 18:24:27 2008
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri, 26 Sep 2008 18:24:27 +0000 (UTC)
Subject: rpms/cluster/devel cluster.spec,1.20,1.21
Message-ID: <20080926182427.C5EAE7010C@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7411

Modified Files:
	cluster.spec 
Log Message:
Split libcman out of cman into cmanlib (and -devel)



Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cluster.spec	25 Sep 2008 09:42:19 -0000	1.20
+++ cluster.spec	26 Sep 2008 18:23:57 -0000	1.21
@@ -19,7 +19,7 @@
 Name: cluster
 Summary: Red Hat Cluster
 Version: 2.99.10
-Release: 3%{?alphatag:.%{alphatag}}%{?dist}
+Release: 4%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -157,7 +157,9 @@
 /sbin/gfs_control*
 /sbin/group*
 /sbin/*qdisk*
-%{_libdir}/*.so.*
+%{_libdir}/libccs*.so.*
+%{_libdir}/libdlm*.so.*
+%{_libdir}/libfence*.so.*
 %{_datadir}/fence*
 %{_datadir}/snmp/mibs/*
 /usr/libexec/*
@@ -182,13 +184,47 @@
 
 %files -n cman-devel
 %defattr(-,root,root,-)
-%{_libdir}/*.so
-%{_includedir}/*
+%{_libdir}/libccs*.so
+%{_libdir}/libdlm*.so
+%{_libdir}/libfence*.so
+%{_includedir}/ccs.h
+%{_includedir}/libdlm*.h
+%{_includedir}/libfence.h
 %{_mandir}/man3/*3.gz
 
 %description -n cman-devel
 The Cluster Manager development package
 
+%package -n cmanlib
+Group: System Environment/Libraries
+Summary: The Cluster Manager library
+Conflicts: cman <= 2.99.10-3
+
+%files -n cmanlib
+%defattr(-,root,root,-)
+%{_libdir}/libcman.so.*
+
+%description -n cmanlib
+The Cluster Manager library package
+
+%post -n cmanlib -p /sbin/ldconfig
+
+%postun -n cmanlib -p /sbin/ldconfig
+
+%package -n cmanlib-devel
+Group: Development/Libraries
+Summary: The Cluster Manager library development package
+Conflicts: cman-devel <= 2.99.10-3
+Requires: cmanlib = %{version}-%{release}
+
+%files -n cmanlib-devel
+%defattr(-,root,root,-)
+%{_includedir}/libcman.h
+%{_libdir}/libcman.so
+
+%description -n cmanlib-devel
+The Cluster Manager library development package
+
 %package -n rgmanager
 Group: System Environment/Base
 Summary: Open Source HA Resource Group Failover for Red Hat Cluster
@@ -301,6 +337,10 @@
 %{_mandir}/man8/gnbd*
 
 %changelog
+* Thu Sep 26 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.10-4
+- Split libcman.so* from cman and cman-devel into  cmanlib and cmanlib-devel
+  to break a very annoying circular dependency.
+
 * Thu Sep 25 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.10-3
 - The "CVS HATES ME" release.
 - New upstream release.



From fabbione at fedoraproject.org  Fri Sep 26 18:30:35 2008
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri, 26 Sep 2008 18:30:35 +0000 (UTC)
Subject: rpms/ricci/devel ricci.spec,1.6,1.7
Message-ID: <20080926183035.6BBCC7010C@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/ricci/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8681

Modified Files:
	ricci.spec 
Log Message:
Drop BuildRequire on cman-devel



Index: ricci.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/devel/ricci.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ricci.spec	25 Sep 2008 09:30:47 -0000	1.6
+++ ricci.spec	26 Sep 2008 18:30:05 -0000	1.7
@@ -10,7 +10,7 @@
 
 Name: ricci
 Version: 0.15.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga/
 Group: System Environment/Base
@@ -21,7 +21,7 @@
 
 BuildRequires: python-devel >= 2.4.1
 BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
-BuildRequires: cman-devel >= 2.99.10 libcap-devel
+BuildRequires: libcap-devel
 BuildRequires: cyrus-sasl-devel >= 2.1
 BuildRequires: openssl-devel dbus-devel pkgconfig file-devel
 BuildRequires: nss-devel
@@ -135,7 +135,10 @@
 exit 0
 
 %changelog
-* Thu Sep 09 2008 Fabio M. Di Nitto <fdinitto at redhat.com> 0.15.0-3
+* Thu Sep 26 2008 Fabio M. Di Nitto <fdinitto at redhat.com> 0.15.0-4
+- Drop BuildRequires on cman-devel as it's not required.
+
+* Thu Sep 26 2008 Fabio M. Di Nitto <fdinitto at redhat.com> 0.15.0-3
 - Add versioned BR on cman-devel
 
 * Tue Sep 09 2008 Ryan McCabe <rmccabe at redhat.com> 0.15.0-2



From fabbione at fedoraproject.org  Fri Sep 26 18:36:38 2008
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri, 26 Sep 2008 18:36:38 +0000 (UTC)
Subject: rpms/clustermon/devel clustermon.spec,1.4,1.5
Message-ID: <20080926183638.54EC97010C@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/clustermon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9896

Modified Files:
	clustermon.spec 
Log Message:
Change BuildRequires to cmanlib-devel



Index: clustermon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clustermon/devel/clustermon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- clustermon.spec	25 Sep 2008 10:13:33 -0000	1.4
+++ clustermon.spec	26 Sep 2008 18:36:08 -0000	1.5
@@ -17,7 +17,7 @@
 
 Name: clustermon
 Version: 0.15.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga
 
@@ -27,7 +27,7 @@
 Source0: %{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: cman-devel >= 2.99.10
+BuildRequires: cmanlib-devel >= 2.99.10-4
 BuildRequires: glibc-devel gcc-c++ libxml2-devel
 BuildRequires: openssl-devel dbus-devel pam-devel pkgconfig
 BuildRequires: net-snmp-devel tog-pegasus-devel
@@ -182,6 +182,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Fabio M. Di Nitto <fdinitto at redhat.com> 0.15.0-3
+ - Change BuildRequires from cman-devel to cmanlib-devel
+
 * Thu Sep 25 2008 Fabio M. Di Nitto <fdinitto at redhat.com> 0.15.0-2
  - Add versioned BR on cman-devel
 



From fabbione at fedoraproject.org  Fri Sep 26 18:38:18 2008
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri, 26 Sep 2008 18:38:18 +0000 (UTC)
Subject: rpms/ricci/devel ricci.spec,1.7,1.8
Message-ID: <20080926183818.7384F7010C@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/ricci/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10203

Modified Files:
	ricci.spec 
Log Message:
Fix date in changelog entry



Index: ricci.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/devel/ricci.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ricci.spec	26 Sep 2008 18:30:05 -0000	1.7
+++ ricci.spec	26 Sep 2008 18:37:48 -0000	1.8
@@ -135,7 +135,7 @@
 exit 0
 
 %changelog
-* Thu Sep 26 2008 Fabio M. Di Nitto <fdinitto at redhat.com> 0.15.0-4
+* Fri Sep 26 2008 Fabio M. Di Nitto <fdinitto at redhat.com> 0.15.0-4
 - Drop BuildRequires on cman-devel as it's not required.
 
 * Thu Sep 26 2008 Fabio M. Di Nitto <fdinitto at redhat.com> 0.15.0-3



From rdieter at fedoraproject.org  Fri Sep 26 18:43:55 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 26 Sep 2008 18:43:55 +0000 (UTC)
Subject: rpms/sbcl/F-9 sbcl.spec,1.89,1.90
Message-ID: <20080926184355.D2B347010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/sbcl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11205/F-9

Modified Files:
	sbcl.spec 
Log Message:
s/sparc/sparcv9/



Index: sbcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/F-9/sbcl.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- sbcl.spec	17 Jun 2008 00:20:43 -0000	1.89
+++ sbcl.spec	26 Sep 2008 18:43:25 -0000	1.90
@@ -22,9 +22,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if 0%{?fedora} > 8
 # reinclude ppc when fixed: http://bugzilla.redhat.com/448734 
-ExclusiveArch: i386 x86_64 sparc
+ExclusiveArch: i386 x86_64 sparcv9
 %else
-ExclusiveArch: i386 x86_64 ppc sparc
+ExclusiveArch: i386 x86_64 ppc sparcv9
 %endif
 
 # Pre-generated html docs (not used)
@@ -62,8 +62,8 @@
 
 ## sparc section
 #Source40: http://downloads.sourceforge.net/sourceforge/sbcl/sbcl-0.9.17-sparc-linux-binary.tar.bz2
-%ifarch sparc 
-%define sbcl_arch sparc 
+%ifarch sparcv9
+%define sbcl_arch sparc
 BuildRequires: sbcl
 # or
 #define sbcl_bootstrap_src -a 40 



From rdieter at fedoraproject.org  Fri Sep 26 18:43:55 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 26 Sep 2008 18:43:55 +0000 (UTC)
Subject: rpms/sbcl/devel sbcl.spec,1.96,1.97
Message-ID: <20080926184355.E90347013D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/sbcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11205/devel

Modified Files:
	sbcl.spec 
Log Message:
s/sparc/sparcv9/



Index: sbcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- sbcl.spec	22 Sep 2008 16:22:53 -0000	1.96
+++ sbcl.spec	26 Sep 2008 18:43:25 -0000	1.97
@@ -22,9 +22,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if 0%{?fedora} > 8
 # reinclude ppc when fixed: http://bugzilla.redhat.com/448734 
-ExclusiveArch: i386 x86_64 sparc
+ExclusiveArch: i386 x86_64 sparcv9
 %else
-ExclusiveArch: i386 x86_64 ppc sparc
+ExclusiveArch: i386 x86_64 ppc sparcv9
 %endif
 
 BuildRequires: common-lisp-controller
@@ -65,7 +65,7 @@
 
 ## sparc section
 #Source40: http://downloads.sourceforge.net/sourceforge/sbcl/sbcl-0.9.17-sparc-linux-binary.tar.bz2
-%ifarch sparc 
+%ifarch sparcv9
 %define sbcl_arch sparc 
 BuildRequires: sbcl
 # or



From davej at fedoraproject.org  Fri Sep 26 18:48:03 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 26 Sep 2008 18:48:03 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc7-git4.bz2.sign,1.1,NONE
Message-ID: <20080926184803.965CF7010C@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11946

Removed Files:
	patch-2.6.27-rc7-git4.bz2.sign 
Log Message:
2.6.27-rc7-git5


--- patch-2.6.27-rc7-git4.bz2.sign DELETED ---



From fabbione at fedoraproject.org  Fri Sep 26 18:49:59 2008
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri, 26 Sep 2008 18:49:59 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2.spec,1.141,1.142
Message-ID: <20080926184959.777997010C@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12164

Modified Files:
	lvm2.spec 
Log Message:
Add BuildRequires on cmanlib-devel. This is required after libcman split
from cman and cman-devel into cmanlib and cmanlib-devel.

Make versioned BuildRequires on cman-devel and cmanlib-devel more strict
to guarantee to get the right version.




Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- lvm2.spec	25 Sep 2008 12:08:11 -0000	1.141
+++ lvm2.spec	26 Sep 2008 18:49:29 -0000	1.142
@@ -20,7 +20,7 @@
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
-BuildRequires: cman-devel >= 2.99.10
+BuildRequires: cman-devel >= 2.99.10-4 cmanlib-devel >= 2.99.10-4
 BuildRequires: module-init-tools
 Requires: device-mapper >= %{device_mapper_version}-%{release}
 Requires: module-init-tools
@@ -274,6 +274,12 @@
 * Wed Sep 24 2008 Alasdair Kergon <agk at redhat.com>> - 2.02.39-5
 - Explicitly create /sbin in the build root.
 
+* Fri Sep 26 2008 Fabio M. Di Nitto <fdinitto at redhat.cm> - 2.02.39-5
+- Add BuildRequires on cmanlib-devel. This is required after libcman split
+  from cman and cman-devel into cmanlib and cmanlib-devel.
+- Make versioned BuildRequires on cman-devel and cmanlib-devel more strict
+  to guarantee to get the right version.
+
 * Thu Sep 25 2008 Fabio M. Di Nitto <fdinitto at redhat.cm> - 2.02.39-5
 - Add versioned BuildRequires on new cman-devel.
 



From fabbione at fedoraproject.org  Fri Sep 26 19:10:51 2008
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri, 26 Sep 2008 19:10:51 +0000 (UTC)
Subject: rpms/cluster/devel cluster.spec,1.21,1.22
Message-ID: <20080926191051.51EF57010C@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14710

Modified Files:
	cluster.spec 
Log Message:
cman can now depend on ricci and modcluster without circular depends



Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cluster.spec	26 Sep 2008 18:23:57 -0000	1.21
+++ cluster.spec	26 Sep 2008 19:10:21 -0000	1.22
@@ -19,7 +19,7 @@
 Name: cluster
 Summary: Red Hat Cluster
 Version: 2.99.10
-Release: 4%{?alphatag:.%{alphatag}}%{?dist}
+Release: 5%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -116,7 +116,7 @@
 Requires: sg3_utils OpenIPMI telnet openssh-clients
 Requires: pexpect net-snmp-utils pyOpenSSL
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires: ricci
+Requires: ricci >= 0.15.0-4 modcluster >= 0.15.0-3
 
 %description -n cman
 Red Hat Cluster Manager
@@ -337,7 +337,10 @@
 %{_mandir}/man8/gnbd*
 
 %changelog
-* Thu Sep 26 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.10-4
+* Fri Sep 26 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.10-5
+- cman now Requires: ricci and modcluster.
+
+* Fri Sep 26 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.10-4
 - Split libcman.so* from cman and cman-devel into  cmanlib and cmanlib-devel
   to break a very annoying circular dependency.
 



From spot at fedoraproject.org  Fri Sep 26 19:25:39 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 26 Sep 2008 19:25:39 +0000 (UTC)
Subject: rpms/akode/devel akode-pulseaudio.patch, 1.1, 1.2 akode.spec, 1.21,
	1.22
Message-ID: <20080926192539.BC8C57010C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/akode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17169

Modified Files:
	akode-pulseaudio.patch akode.spec 
Log Message:
fix pulseaudio patch to apply without fuzz

akode-pulseaudio.patch:

Index: akode-pulseaudio.patch
===================================================================
RCS file: /cvs/pkgs/rpms/akode/devel/akode-pulseaudio.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- akode-pulseaudio.patch	12 Feb 2007 16:36:47 -0000	1.1
+++ akode-pulseaudio.patch	26 Sep 2008 19:25:09 -0000	1.2
@@ -1,7 +1,7 @@
-diff -urN akode-2.0.1.orig/Makefile.in akode-2.0.1/Makefile.in
---- akode-2.0.1.orig/Makefile.in	2006-07-23 00:17:11.000000000 +0200
-+++ akode-2.0.1/Makefile.in	2006-09-06 14:38:04.000000000 +0200
-@@ -169,9 +169,9 @@
+diff -up akode-2.0.2/akode/akodeplay/Makefile.in.pulseaudio akode-2.0.2/akode/akodeplay/Makefile.in
+--- akode-2.0.2/akode/akodeplay/Makefile.in.pulseaudio	2007-04-06 09:23:30.000000000 -0400
++++ akode-2.0.2/akode/akodeplay/Makefile.in	2008-09-26 13:32:59.000000000 -0400
+@@ -172,9 +172,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
@@ -14,42 +14,10 @@
  RANLIB = @RANLIB@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-diff -urN akode-2.0.1.orig/akode/Makefile.in akode-2.0.1/akode/Makefile.in
---- akode-2.0.1.orig/akode/Makefile.in	2006-07-23 00:17:11.000000000 +0200
-+++ akode-2.0.1/akode/Makefile.in	2006-09-06 14:38:04.000000000 +0200
-@@ -158,9 +158,9 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--POLYP_CFLAGS = @POLYP_CFLAGS@
--POLYP_LDFLAGS = @POLYP_LDFLAGS@
--POLYP_LIBADD = @POLYP_LIBADD@
-+PULSE_CFLAGS = @PULSE_CFLAGS@
-+PULSE_LDFLAGS = @PULSE_LDFLAGS@
-+PULSE_LIBADD = @PULSE_LIBADD@
- RANLIB = @RANLIB@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-diff -urN akode-2.0.1.orig/akode/akodeplay/Makefile.in akode-2.0.1/akode/akodeplay/Makefile.in
---- akode-2.0.1.orig/akode/akodeplay/Makefile.in	2006-07-23 00:17:11.000000000 +0200
-+++ akode-2.0.1/akode/akodeplay/Makefile.in	2006-09-06 14:38:04.000000000 +0200
-@@ -170,9 +170,9 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--POLYP_CFLAGS = @POLYP_CFLAGS@
--POLYP_LDFLAGS = @POLYP_LDFLAGS@
--POLYP_LIBADD = @POLYP_LIBADD@
-+PULSE_CFLAGS = @PULSE_CFLAGS@
-+PULSE_LDFLAGS = @PULSE_LDFLAGS@
-+PULSE_LIBADD = @PULSE_LIBADD@
- RANLIB = @RANLIB@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-diff -urN akode-2.0.1.orig/akode/configure.in.in akode-2.0.1/akode/configure.in.in
---- akode-2.0.1.orig/akode/configure.in.in	2005-10-27 17:12:36.000000000 +0200
-+++ akode-2.0.1/akode/configure.in.in	2006-09-06 14:45:46.000000000 +0200
-@@ -295,24 +295,24 @@
+diff -up akode-2.0.2/akode/configure.in.in.pulseaudio akode-2.0.2/akode/configure.in.in
+--- akode-2.0.2/akode/configure.in.in.pulseaudio	2007-02-06 16:47:43.000000000 -0500
++++ akode-2.0.2/akode/configure.in.in	2008-09-26 13:35:25.000000000 -0400
+@@ -270,24 +270,24 @@ AC_SUBST(JACK_LIBADD)
  AC_SUBST(JACK_LDFLAGS)
  fi
  
@@ -86,8 +54,8 @@
 +AC_SUBST(PULSE_LDFLAGS)
  fi
  
- AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=no@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="no"])
-@@ -507,7 +507,7 @@
+ AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"])
+@@ -482,7 +482,7 @@ AM_CONDITIONAL(include_alsa_sink, test x
  AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes)
  AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes)
  AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes)
@@ -96,10 +64,10 @@
  AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes)
  
  AC_MSG_CHECKING(for compilable aKode)
-diff -urN akode-2.0.1.orig/akode/lib/Makefile.in akode-2.0.1/akode/lib/Makefile.in
---- akode-2.0.1.orig/akode/lib/Makefile.in	2006-07-23 00:17:11.000000000 +0200
-+++ akode-2.0.1/akode/lib/Makefile.in	2006-09-06 14:38:04.000000000 +0200
-@@ -194,9 +194,9 @@
+diff -up akode-2.0.2/akode/lib/Makefile.in.pulseaudio akode-2.0.2/akode/lib/Makefile.in
+--- akode-2.0.2/akode/lib/Makefile.in.pulseaudio	2007-04-06 09:23:30.000000000 -0400
++++ akode-2.0.2/akode/lib/Makefile.in	2008-09-26 13:32:59.000000000 -0400
+@@ -196,9 +196,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
@@ -112,10 +80,10 @@
  RANLIB = @RANLIB@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-diff -urN akode-2.0.1.orig/akode/plugins/Makefile.in akode-2.0.1/akode/plugins/Makefile.in
---- akode-2.0.1.orig/akode/plugins/Makefile.in	2006-07-23 00:17:11.000000000 +0200
-+++ akode-2.0.1/akode/plugins/Makefile.in	2006-09-06 14:38:04.000000000 +0200
-@@ -154,9 +154,9 @@
+diff -up akode-2.0.2/akode/Makefile.in.pulseaudio akode-2.0.2/akode/Makefile.in
+--- akode-2.0.2/akode/Makefile.in.pulseaudio	2007-04-06 09:23:30.000000000 -0400
++++ akode-2.0.2/akode/Makefile.in	2008-09-26 13:32:59.000000000 -0400
+@@ -160,9 +160,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
@@ -128,24 +96,10 @@
  RANLIB = @RANLIB@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-@@ -251,11 +251,11 @@
- @include_oss_sink_TRUE at AKODE_OSS_SINK = oss_sink
- @include_sun_sink_TRUE at AKODE_SUN_SINK = sun_sink
- @include_jack_sink_TRUE at AKODE_JACK_SINK = jack_sink
-- at include_polyp_sink_TRUE@AKODE_POLYP_SINK = polyp_sink
-+ at include_polyp_sink_TRUE@AKODE_PULSE_SINK = polyp_sink
- SUBDIRS = $(AKODE_MPC_DECODER) $(AKODE_XIPH_DECODER) \
-          $(AKODE_MPEG_DECODER) $(AKODE_FFMPEG_DECODER) \
-          $(AKODE_ALSA_SINK) $(AKODE_OSS_SINK) $(AKODE_SUN_SINK) \
--         $(AKODE_JACK_SINK) $(AKODE_POLYP_SINK) \
-+         $(AKODE_JACK_SINK) $(AKODE_PULSE_SINK) \
-          $(AKODE_SRC_RESAMPLER)
- 
- #>- all: all-recursive
-diff -urN akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.in akode-2.0.1/akode/plugins/alsa_sink/Makefile.in
---- akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.in	2006-07-23 00:17:11.000000000 +0200
-+++ akode-2.0.1/akode/plugins/alsa_sink/Makefile.in	2006-09-06 14:38:04.000000000 +0200
-@@ -177,9 +177,9 @@
+diff -up akode-2.0.2/akode/plugins/alsa_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/alsa_sink/Makefile.in
+--- akode-2.0.2/akode/plugins/alsa_sink/Makefile.in.pulseaudio	2007-04-06 09:23:30.000000000 -0400
++++ akode-2.0.2/akode/plugins/alsa_sink/Makefile.in	2008-09-26 13:32:59.000000000 -0400
+@@ -179,9 +179,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
@@ -158,10 +112,10 @@
  RANLIB = @RANLIB@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-diff -urN akode-2.0.1.orig/akode/plugins/ffmpeg_decoder/Makefile.in akode-2.0.1/akode/plugins/ffmpeg_decoder/Makefile.in
---- akode-2.0.1.orig/akode/plugins/ffmpeg_decoder/Makefile.in	2006-07-23 00:17:11.000000000 +0200
-+++ akode-2.0.1/akode/plugins/ffmpeg_decoder/Makefile.in	2006-09-06 14:38:04.000000000 +0200
-@@ -178,9 +178,9 @@
+diff -up akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.in
+--- akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.in.pulseaudio	2007-04-06 09:23:30.000000000 -0400
++++ akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.in	2008-09-26 13:32:59.000000000 -0400
+@@ -180,9 +180,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
@@ -174,10 +128,10 @@
  RANLIB = @RANLIB@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-diff -urN akode-2.0.1.orig/akode/plugins/jack_sink/Makefile.in akode-2.0.1/akode/plugins/jack_sink/Makefile.in
---- akode-2.0.1.orig/akode/plugins/jack_sink/Makefile.in	2006-07-23 00:17:11.000000000 +0200
-+++ akode-2.0.1/akode/plugins/jack_sink/Makefile.in	2006-09-06 14:38:04.000000000 +0200
-@@ -177,9 +177,9 @@
+diff -up akode-2.0.2/akode/plugins/jack_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/jack_sink/Makefile.in
+--- akode-2.0.2/akode/plugins/jack_sink/Makefile.in.pulseaudio	2007-04-06 09:23:30.000000000 -0400
++++ akode-2.0.2/akode/plugins/jack_sink/Makefile.in	2008-09-26 13:32:59.000000000 -0400
+@@ -179,9 +179,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
@@ -190,10 +144,10 @@
  RANLIB = @RANLIB@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-diff -urN akode-2.0.1.orig/akode/plugins/mpc_decoder/Makefile.in akode-2.0.1/akode/plugins/mpc_decoder/Makefile.in
---- akode-2.0.1.orig/akode/plugins/mpc_decoder/Makefile.in	2006-07-23 00:17:11.000000000 +0200
-+++ akode-2.0.1/akode/plugins/mpc_decoder/Makefile.in	2006-09-06 14:38:04.000000000 +0200
-@@ -191,9 +191,9 @@
+diff -up akode-2.0.2/akode/plugins/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/Makefile.in
+--- akode-2.0.2/akode/plugins/Makefile.in.pulseaudio	2007-04-06 09:23:30.000000000 -0400
++++ akode-2.0.2/akode/plugins/Makefile.in	2008-09-26 13:32:59.000000000 -0400
+@@ -156,9 +156,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
@@ -206,10 +160,24 @@
  RANLIB = @RANLIB@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-diff -urN akode-2.0.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in akode-2.0.1/akode/plugins/mpc_decoder/mppdec/Makefile.in
---- akode-2.0.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in	2006-07-23 00:17:11.000000000 +0200
-+++ akode-2.0.1/akode/plugins/mpc_decoder/mppdec/Makefile.in	2006-09-06 14:38:04.000000000 +0200
-@@ -169,9 +169,9 @@
+@@ -257,11 +257,11 @@ AKODE_MPC_DECODER = mpc_decoder
+ @include_oss_sink_TRUE at AKODE_OSS_SINK = oss_sink
+ @include_sun_sink_TRUE at AKODE_SUN_SINK = sun_sink
+ @include_jack_sink_TRUE at AKODE_JACK_SINK = jack_sink
+- at include_polyp_sink_TRUE@AKODE_POLYP_SINK = polyp_sink
++ at include_polyp_sink_TRUE@AKODE_PULSE_SINK = polyp_sink
+ SUBDIRS = $(AKODE_MPC_DECODER) $(AKODE_XIPH_DECODER) \
+          $(AKODE_MPEG_DECODER) $(AKODE_FFMPEG_DECODER) \
+          $(AKODE_ALSA_SINK) $(AKODE_OSS_SINK) $(AKODE_SUN_SINK) \
+-         $(AKODE_JACK_SINK) $(AKODE_POLYP_SINK) \
++         $(AKODE_JACK_SINK) $(AKODE_PULSE_SINK) \
+          $(AKODE_SRC_RESAMPLER)
+ 
+ #>- all: all-recursive
+diff -up akode-2.0.2/akode/plugins/mpc_decoder/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/mpc_decoder/Makefile.in
+--- akode-2.0.2/akode/plugins/mpc_decoder/Makefile.in.pulseaudio	2007-04-06 09:23:30.000000000 -0400
++++ akode-2.0.2/akode/plugins/mpc_decoder/Makefile.in	2008-09-26 13:32:59.000000000 -0400
+@@ -193,9 +193,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
@@ -222,10 +190,10 @@
  RANLIB = @RANLIB@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-diff -urN akode-2.0.1.orig/akode/plugins/mpeg_decoder/Makefile.in akode-2.0.1/akode/plugins/mpeg_decoder/Makefile.in
---- akode-2.0.1.orig/akode/plugins/mpeg_decoder/Makefile.in	2006-07-23 00:17:11.000000000 +0200
-+++ akode-2.0.1/akode/plugins/mpeg_decoder/Makefile.in	2006-09-06 14:38:04.000000000 +0200
-@@ -178,9 +178,9 @@
+diff -up akode-2.0.2/akode/plugins/mpc_decoder/mppdec/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/mpc_decoder/mppdec/Makefile.in
+--- akode-2.0.2/akode/plugins/mpc_decoder/mppdec/Makefile.in.pulseaudio	2007-04-06 09:23:30.000000000 -0400
++++ akode-2.0.2/akode/plugins/mpc_decoder/mppdec/Makefile.in	2008-09-26 13:32:59.000000000 -0400
+@@ -171,9 +171,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
@@ -238,10 +206,10 @@
  RANLIB = @RANLIB@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-diff -urN akode-2.0.1.orig/akode/plugins/oss_sink/Makefile.in akode-2.0.1/akode/plugins/oss_sink/Makefile.in
---- akode-2.0.1.orig/akode/plugins/oss_sink/Makefile.in	2006-07-23 00:17:11.000000000 +0200
-+++ akode-2.0.1/akode/plugins/oss_sink/Makefile.in	2006-09-06 14:38:04.000000000 +0200
-@@ -177,9 +177,9 @@
+diff -up akode-2.0.2/akode/plugins/mpeg_decoder/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/mpeg_decoder/Makefile.in
+--- akode-2.0.2/akode/plugins/mpeg_decoder/Makefile.in.pulseaudio	2007-04-06 09:23:30.000000000 -0400
++++ akode-2.0.2/akode/plugins/mpeg_decoder/Makefile.in	2008-09-26 13:32:59.000000000 -0400
+@@ -180,9 +180,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
@@ -254,9 +222,25 @@
  RANLIB = @RANLIB@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.am akode-2.0.1/akode/plugins/polyp_sink/Makefile.am
---- akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.am	2005-07-15 13:20:03.000000000 +0200
-+++ akode-2.0.1/akode/plugins/polyp_sink/Makefile.am	2006-09-06 14:38:04.000000000 +0200
+diff -up akode-2.0.2/akode/plugins/oss_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/oss_sink/Makefile.in
+--- akode-2.0.2/akode/plugins/oss_sink/Makefile.in.pulseaudio	2007-04-06 09:23:30.000000000 -0400
++++ akode-2.0.2/akode/plugins/oss_sink/Makefile.in	2008-09-26 13:32:59.000000000 -0400
+@@ -179,9 +179,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-POLYP_CFLAGS = @POLYP_CFLAGS@
+-POLYP_LDFLAGS = @POLYP_LDFLAGS@
+-POLYP_LIBADD = @POLYP_LIBADD@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LDFLAGS = @PULSE_LDFLAGS@
++PULSE_LIBADD = @PULSE_LIBADD@
+ RANLIB = @RANLIB@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+diff -up akode-2.0.2/akode/plugins/polyp_sink/Makefile.am.pulseaudio akode-2.0.2/akode/plugins/polyp_sink/Makefile.am
+--- akode-2.0.2/akode/plugins/polyp_sink/Makefile.am.pulseaudio	2005-07-15 07:20:03.000000000 -0400
++++ akode-2.0.2/akode/plugins/polyp_sink/Makefile.am	2008-09-26 13:32:59.000000000 -0400
 @@ -1,7 +1,7 @@
 -INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(POLYP_CFLAGS) $(all_includes)
 +INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes)
@@ -268,10 +252,10 @@
 -libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(POLYP_LIBADD)
 +libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS)
 +libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD)
-diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in akode-2.0.1/akode/plugins/polyp_sink/Makefile.in
---- akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in	2006-07-23 00:17:11.000000000 +0200
-+++ akode-2.0.1/akode/plugins/polyp_sink/Makefile.in	2006-09-06 14:38:04.000000000 +0200
-@@ -177,9 +177,9 @@
+diff -up akode-2.0.2/akode/plugins/polyp_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/polyp_sink/Makefile.in
+--- akode-2.0.2/akode/plugins/polyp_sink/Makefile.in.pulseaudio	2007-04-06 09:23:30.000000000 -0400
++++ akode-2.0.2/akode/plugins/polyp_sink/Makefile.in	2008-09-26 13:32:59.000000000 -0400
+@@ -179,9 +179,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
@@ -284,7 +268,7 @@
  RANLIB = @RANLIB@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-@@ -265,13 +265,13 @@
+@@ -271,13 +271,13 @@ target_os = @target_os@
  target_vendor = @target_vendor@
  unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
  unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
@@ -302,9 +286,9 @@
  #>- all: all-am
  #>+ 1
  all: docs-am  all-am
-diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp akode-2.0.1/akode/plugins/polyp_sink/polyp_sink.cpp
---- akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp	2005-10-20 22:54:12.000000000 +0200
-+++ akode-2.0.1/akode/plugins/polyp_sink/polyp_sink.cpp	2006-09-06 15:14:52.000000000 +0200
+diff -up akode-2.0.2/akode/plugins/polyp_sink/polyp_sink.cpp.pulseaudio akode-2.0.2/akode/plugins/polyp_sink/polyp_sink.cpp
+--- akode-2.0.2/akode/plugins/polyp_sink/polyp_sink.cpp.pulseaudio	2005-10-20 16:54:12.000000000 -0400
++++ akode-2.0.2/akode/plugins/polyp_sink/polyp_sink.cpp	2008-09-26 13:32:59.000000000 -0400
 @@ -25,7 +25,7 @@
  #elif defined(HAVE_INTTYPES_H)
  #include <inttypes.h>
@@ -314,7 +298,7 @@
  
  #include "audioframe.h"
  #include "audiobuffer.h"
-@@ -59,7 +59,7 @@
+@@ -59,7 +59,7 @@ PolypSink::PolypSink()
  
  bool PolypSink::open() {
      int error = 0;
@@ -323,10 +307,10 @@
      if (!m_data->server || error != 0) {
          m_data->error = true;
          close();
-diff -urN akode-2.0.1.orig/akode/plugins/src_resampler/Makefile.in akode-2.0.1/akode/plugins/src_resampler/Makefile.in
---- akode-2.0.1.orig/akode/plugins/src_resampler/Makefile.in	2006-07-23 00:17:11.000000000 +0200
-+++ akode-2.0.1/akode/plugins/src_resampler/Makefile.in	2006-09-06 14:38:04.000000000 +0200
-@@ -178,9 +178,9 @@
+diff -up akode-2.0.2/akode/plugins/src_resampler/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/src_resampler/Makefile.in
+--- akode-2.0.2/akode/plugins/src_resampler/Makefile.in.pulseaudio	2007-04-06 09:23:30.000000000 -0400
++++ akode-2.0.2/akode/plugins/src_resampler/Makefile.in	2008-09-26 13:32:59.000000000 -0400
+@@ -180,9 +180,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
@@ -339,10 +323,10 @@
  RANLIB = @RANLIB@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-diff -urN akode-2.0.1.orig/akode/plugins/sun_sink/Makefile.in akode-2.0.1/akode/plugins/sun_sink/Makefile.in
---- akode-2.0.1.orig/akode/plugins/sun_sink/Makefile.in	2006-07-23 00:17:11.000000000 +0200
-+++ akode-2.0.1/akode/plugins/sun_sink/Makefile.in	2006-09-06 14:38:04.000000000 +0200
-@@ -175,9 +175,9 @@
+diff -up akode-2.0.2/akode/plugins/sun_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/sun_sink/Makefile.in
+--- akode-2.0.2/akode/plugins/sun_sink/Makefile.in.pulseaudio	2007-04-06 09:23:30.000000000 -0400
++++ akode-2.0.2/akode/plugins/sun_sink/Makefile.in	2008-09-26 13:32:59.000000000 -0400
+@@ -177,9 +177,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
@@ -355,10 +339,10 @@
  RANLIB = @RANLIB@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-diff -urN akode-2.0.1.orig/akode/plugins/xiph_decoder/Makefile.in akode-2.0.1/akode/plugins/xiph_decoder/Makefile.in
---- akode-2.0.1.orig/akode/plugins/xiph_decoder/Makefile.in	2006-07-23 00:17:11.000000000 +0200
-+++ akode-2.0.1/akode/plugins/xiph_decoder/Makefile.in	2006-09-06 14:38:04.000000000 +0200
-@@ -185,9 +185,9 @@
+diff -up akode-2.0.2/akode/plugins/xiph_decoder/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/xiph_decoder/Makefile.in
+--- akode-2.0.2/akode/plugins/xiph_decoder/Makefile.in.pulseaudio	2007-04-06 09:23:30.000000000 -0400
++++ akode-2.0.2/akode/plugins/xiph_decoder/Makefile.in	2008-09-26 13:32:59.000000000 -0400
+@@ -189,9 +189,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
@@ -371,9 +355,9 @@
  RANLIB = @RANLIB@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-diff -urN akode-2.0.1.orig/config.h.in akode-2.0.1/config.h.in
---- akode-2.0.1.orig/config.h.in	2006-07-23 00:17:04.000000000 +0200
-+++ akode-2.0.1/config.h.in	2006-09-06 14:44:55.000000000 +0200
+diff -up akode-2.0.2/config.h.in.pulseaudio akode-2.0.2/config.h.in
+--- akode-2.0.2/config.h.in.pulseaudio	2007-04-06 09:23:23.000000000 -0400
++++ akode-2.0.2/config.h.in	2008-09-26 13:32:59.000000000 -0400
 @@ -43,9 +43,9 @@
  /* Define if you have libOggFLAC (required for loading OggFLAC files) */
  #undef HAVE_LIBOGGFLAC
@@ -386,10 +370,10 @@
  
  /* defined if you have libsamplerate library and header */
  #undef HAVE_LIBSAMPLERATE
-diff -urN akode-2.0.1.orig/configure.in akode-2.0.1/configure.in
---- akode-2.0.1.orig/configure.in	2006-07-23 00:16:52.000000000 +0200
-+++ akode-2.0.1/configure.in	2006-09-06 14:45:21.000000000 +0200
-@@ -400,24 +400,24 @@
+diff -up akode-2.0.2/configure.in.pulseaudio akode-2.0.2/configure.in
+--- akode-2.0.2/configure.in.pulseaudio	2007-04-06 09:23:11.000000000 -0400
++++ akode-2.0.2/configure.in	2008-09-26 13:37:25.000000000 -0400
+@@ -375,24 +375,24 @@ AC_SUBST(JACK_LIBADD)
  AC_SUBST(JACK_LDFLAGS)
  fi
  
@@ -426,8 +410,8 @@
 +AC_SUBST(PULSE_LDFLAGS)
  fi
  
- AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=no@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="no"])
-@@ -612,7 +612,7 @@
+ AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"])
+@@ -587,7 +587,7 @@ AM_CONDITIONAL(include_alsa_sink, test x
  AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes)
  AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes)
  AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes)
@@ -436,3 +420,19 @@
  AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes)
  
  AC_MSG_CHECKING(for compilable aKode)
+diff -up akode-2.0.2/Makefile.in.pulseaudio akode-2.0.2/Makefile.in
+--- akode-2.0.2/Makefile.in.pulseaudio	2007-04-06 09:23:30.000000000 -0400
++++ akode-2.0.2/Makefile.in	2008-09-26 13:32:59.000000000 -0400
+@@ -171,9 +171,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-POLYP_CFLAGS = @POLYP_CFLAGS@
+-POLYP_LDFLAGS = @POLYP_LDFLAGS@
+-POLYP_LIBADD = @POLYP_LIBADD@
++PULSE_CFLAGS = @PULSE_CFLAGS@
++PULSE_LDFLAGS = @PULSE_LDFLAGS@
++PULSE_LIBADD = @PULSE_LIBADD@
+ RANLIB = @RANLIB@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@


Index: akode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akode/devel/akode.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- akode.spec	12 Feb 2008 23:32:02 -0000	1.21
+++ akode.spec	26 Sep 2008 19:25:09 -0000	1.22
@@ -2,7 +2,7 @@
 Summary: Audio-decoding framework 
 Name:	 akode 
 Version: 2.0.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: LGPLv2+
 Group: 	 System Environment/Libraries
@@ -85,11 +85,10 @@
 %patch3 -p4 -b .flac113_portable
 %patch4 -p1 -b .gcc43
 
+%build
 #[ ! -f configure ] && \
 make -f Makefile.cvs
 
-
-%build
 %configure \
   --disable-static \
   --disable-debug --disable-warnings --disable-dependency-tracking \
@@ -169,6 +168,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.2-6
+- fix pulseaudio patch to apply without fuzz
+
 * Tue Feb 12 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-5 
 - gcc43 patch 
 



From nsantos at fedoraproject.org  Fri Sep 26 19:27:24 2008
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 26 Sep 2008 19:27:24 +0000 (UTC)
Subject: rpms/qpidc/F-8 .cvsignore, 1.6, 1.7 qpidc.spec, 1.15, 1.16 sources, 
	1.13, 1.14
Message-ID: <20080926192724.AE4E27010C@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17602

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
rebased to svn rev 693548


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-8/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Jul 2008 18:47:12 -0000	1.6
+++ .cvsignore	26 Sep 2008 19:26:54 -0000	1.7
@@ -1 +1 @@
-qpidc-0.2.667603.tar.gz
+qpidc-0.3.693548.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-8/qpidc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qpidc.spec	7 Jul 2008 15:57:58 -0000	1.15
+++ qpidc.spec	26 Sep 2008 19:26:54 -0000	1.16
@@ -4,14 +4,17 @@
 # svn revision: $Rev: 654927 $
 #
 %define qpidd qpidd
-%define svnrev 667603
+%define qmf qmf
+%define svnrev 693548
+
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           qpidc
-Version:        0.2.%{svnrev}
-Release:        2%{?dist}
+Version: 	0.3.%{?svnrev}
+Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
-License:        Apache Software License
+License:        ASL 2.0
 URL:            http://rhm.et.redhat.com/qpidc
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,12 +22,12 @@
 ExclusiveArch: i386 i686 x86_64
 
 BuildRequires: boost-devel
-BuildRequires: cppunit-devel
 BuildRequires: doxygen
 BuildRequires: e2fsprogs-devel
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: ruby
+BuildRequires: python
 
 Requires: boost
 
@@ -82,6 +85,22 @@
 Libraries and header files for developing extensions to the
 Qpid broker daemon.
 
+%package -n %{qmf}
+Summary: The QPID Management Framework
+Group: System Environment/Daemons
+Requires: %name = %version-%release
+
+%description -n %{qmf}
+An extensible managememt framework layered on QPID messaging.
+
+%package -n %{qmf}-devel
+Summary: Header files and tools for developing QMF extensions
+Group: Development/System
+Requires: %{qmf} = %version-%release
+
+%description -n %{qmf}-devel
+Header files and code-generation tools needed for developers of QMF-managed components.
+
 %package perftest
 Summary: Simple benchmarking tools
 Group: System Environment/Tools
@@ -93,13 +112,18 @@
 %pre
 getent group qpidd >/dev/null || groupadd -r qpidd
 getent passwd qpidd >/dev/null || \
-  useradd -r -m -g qpidd -d %{_localstatedir}/lib/qpidd -s /sbin/nologin \
+  useradd -r -M -g qpidd -d %{_localstatedir}/lib/qpidd -s /sbin/nologin \
     -c "Owner of Qpidd Daemons" qpidd
 exit 0
 
 %prep
 %setup -q
 
+%define perftests "perftest topic_listener topic_publisher latencytest \
+  client_test fanout_perftest multiq_perftest python_tests quick_perftest \
+  quick_topictest run_federation_tests run_perftest run_test run-unit-tests \
+  shared_perftest start_broker stop_broker topic_perftest topictest txtest"
+
 %build
 CXXFLAGS="%{optflags} -DNDEBUG -O3" \
 %configure --disable-static --without-cpg --without-graphviz --without-help2man
@@ -108,7 +132,9 @@
 rm docs/api/html/installdox
 # Make perftest utilities
 pushd src/tests
-make perftest topic_listener topic_publisher latencytest
+for ptest in %{perftests}; do
+  make $ptest
+done
 popd
 
 %install
@@ -121,10 +147,9 @@
 install -d -m0755 %{buildroot}/var/run/qpidd
 # Install perftest utilities
 pushd %{_builddir}/%{name}-%{version}/src/tests/
-libtool --mode=install install -m755 perftest %{buildroot}/%_bindir
-libtool --mode=install install -m755 topic_listener %{buildroot}/%_bindir
-libtool --mode=install install -m755 topic_publisher %{buildroot}/%_bindir
-libtool --mode=install install -m755 latencytest %{buildroot}/%_bindir
+for ptest in %{perftests}; do
+  libtool --mode=install install -m755 $ptest %{buildroot}/%_bindir
+done
 popd
 rm -f %{buildroot}%_libdir/*.a
 rm -f %{buildroot}%_libdir/*.l
@@ -155,10 +180,9 @@
 %_includedir/qpid/sys
 %_includedir/qpid/log
 %_includedir/qpid/management
+%_includedir/qpid/agent
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
-%_bindir/managementgen
-%_datadir/managementgen
 %doc docs/api/html
 
 %files -n %{qpidd}
@@ -167,6 +191,8 @@
 %_libdir/libqpidbroker.so.0.1.0
 %_libdir/libqpidcluster.so.0
 %_libdir/libqpidcluster.so.0.1.0
+%_libdir/libqpidacl.so.0
+%_libdir/libqpidacl.so.0.1.0
 %_sbindir/%{qpidd}
 %config(noreplace) %_sysconfdir/qpidd.conf
 %config(noreplace) %_sysconfdir/sasl2/qpidd.conf
@@ -179,17 +205,46 @@
 
 %files -n %{qpidd}-devel
 %defattr(-,root,root,-)
-%doc rpm/README.qpidd-devel
+#%doc rpm/README.qpidd-devel
 %defattr(-,root,root,-)
 %_libdir/libqpidbroker.so
 %_libdir/libqpidcluster.so
+%_libdir/libqpidacl.so
 %_includedir/qpid/broker
 
+%files -n %{qmf}
+%defattr(-,root,root,-)
+%_libdir/libqmfagent.so.0
+%_libdir/libqmfagent.so.0.1.0
+
+%files -n %{qmf}-devel
+%defattr(-,root,root,-)
+%_libdir/libqmfagent.so
+%_bindir/qmf-gen
+%{python_sitelib}/qmf
+
 %files perftest
+%defattr(755,root,root,-)
 %_bindir/perftest
 %_bindir/topic_listener
 %_bindir/topic_publisher
 %_bindir/latencytest
+%_bindir/client_test
+%_bindir/fanout_perftest
+%_bindir/multiq_perftest
+%_bindir/python_tests
+%_bindir/quick_perftest
+%_bindir/quick_topictest
+%_bindir/run-unit-tests
+%_bindir/run_federation_tests
+%_bindir/run_perftest
+%_bindir/run_test
+%_bindir/shared_perftest
+%_bindir/start_broker
+%_bindir/stop_broker
+%_bindir/topic_perftest
+%_bindir/topictest
+%_bindir/txtest
 
 %post -p /sbin/ldconfig
 
@@ -214,8 +269,28 @@
 /sbin/ldconfig
 
 %changelog
-* Tue Jul  7 2008 Nuno Santos <nsantos at redhat.com> - 0.2.667603-2
-- MRG GA release
+* Tue Sep  9 2008 Nuno Santos <nsantos at redhat.com> - 0.3.693548-1
+- Include latest changes to qmf
+
+* Mon Sep  8 2008 Nuno Santos <nsantos at redhat.com> - 0.3.693140-1
+- Update for Fedora 10
+
+* Wed Aug 21 2008 Justin Ross <jross at redhat.com> - 0.2.687156-1
+- Update to source revision 687156 of the qpid.0-10 branch
+
+* Wed Aug 14 2008 Justin Ross <jross at redhat.com> - 0.2.685273-1
+- Update to source revision 685273 of the qpid.0-10 branch
+
+* Wed Aug  6 2008 Justin Ross <jross at redhat.com> - 0.2.683301-1
+- Update to source revision 683301 of the qpid.0-10 branch
+
+* Thu Jul 15 2008 Justin Ross <jross at redhat.com> - 0.2.676581-1
+- Update to source revision 676581 of the qpid.0-10 branch
+- Work around home dir creation problem
+- Use a license string that rpmlint likes
+
+* Thu Jul 10 2008 Nuno Santos <nsantos at redhat.com> - 0.2.667603-3
+- BZ453818: added additional tests to -perftest
 
 * Thu Jun 13 2008 Justin Ross <jross at redhat.com> - 0.2.667603-1
 - Update to source revision 667603


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-8/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	1 Jul 2008 18:47:12 -0000	1.13
+++ sources	26 Sep 2008 19:26:54 -0000	1.14
@@ -1 +1 @@
-74a880e77e1b59bea07519a1601affb4  qpidc-0.2.667603.tar.gz
+ec77ffb74ed8ac0e26ddb7b5017e17e5  qpidc-0.3.693548.tar.gz



From spot at fedoraproject.org  Fri Sep 26 19:36:12 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 26 Sep 2008 19:36:12 +0000 (UTC)
Subject: rpms/alienarena/devel alienarena.spec,1.3,1.4
Message-ID: <20080926193612.E0A9C7010C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/alienarena/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18944

Modified Files:
	alienarena.spec 
Log Message:
dont apply fhs patch, use DATADIR


Index: alienarena.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alienarena/devel/alienarena.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- alienarena.spec	2 Jul 2008 19:10:05 -0000	1.3
+++ alienarena.spec	26 Sep 2008 19:35:42 -0000	1.4
@@ -1,7 +1,7 @@
 Name:		alienarena
 Summary: 	Multiplayer retro sci-fi deathmatch game
 Version:	7.10
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Amusements/Games
 Source0:	http://cor.planetquake.gamespy.com/codered/files/alienarena710src.zip
@@ -9,7 +9,6 @@
 Source2:	alienarena.desktop
 Source3:	GPL.acebot.txt
 Patch0:		alienarena-7.10-noSGIglext.patch
-Patch1:		alienarena-7.10-fhs.patch
 Patch2:		alienarena-7.10-dont-search-dll-in-data-path.patch
 Patch3:		alienarena-7.10-genericoptflagsonly.patch
 URL:		http://red.planetarena.org/
@@ -27,7 +26,6 @@
 %prep
 %setup -q -c -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p1 -b .fhs
 %patch2 -p1
 %patch3 -p1
 cp -p %{SOURCE3} .
@@ -35,7 +33,7 @@
 
 %build
 cd source/
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_DATADIR=yes DATADIR=%{_datadir}/%{name}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -72,6 +70,9 @@
 %{_libexecdir}/crx.sdl
 
 %changelog
+* Fri Sep 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 7.10-2
+- drop fhs patch, use Makefile DATADIR options instead
+
 * Wed Jul  2 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 7.10-1
 - update to 7.10 (2008)
 



From rdieter at fedoraproject.org  Fri Sep 26 19:39:32 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 26 Sep 2008 19:39:32 +0000 (UTC)
Subject: rpms/kdelibs/devel .cvsignore, 1.58, 1.59 kdelibs.spec, 1.380,
	1.381 sources, 1.70, 1.71 kdelibs-4.1.0-#455130.patch, 1.1,
	NONE kdelibs-4.1.1-kde#157789.patch, 1.2,
	NONE kdelibs-4.1.1-kde#169447-khtml-regression.patch, 1.1,
	NONE kdelibs-4.1.1-kde#856379-cookiejar.patch, 1.1,
	NONE kdelibs-4.1.1-kde#856403-urlnav.patch, 1.1,
	NONE kdelibs-4.1.1-kde#858795-mimeassoc.patch, 1.1,
	NONE kdelibs-4.1.1-kde#860005-emoticons.patch, 1.1,
	NONE kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch, 1.1,
	NONE kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch,
	1.1, NONE kdelibs-4.1.1-kutils-fixes.patch, 1.1, NONE
Message-ID: <20080926193932.627837010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19542

Modified Files:
	.cvsignore kdelibs.spec sources 
Removed Files:
	kdelibs-4.1.0-#455130.patch kdelibs-4.1.1-kde#157789.patch 
	kdelibs-4.1.1-kde#169447-khtml-regression.patch 
	kdelibs-4.1.1-kde#856379-cookiejar.patch 
	kdelibs-4.1.1-kde#856403-urlnav.patch 
	kdelibs-4.1.1-kde#858795-mimeassoc.patch 
	kdelibs-4.1.1-kde#860005-emoticons.patch 
	kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch 
	kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch 
	kdelibs-4.1.1-kutils-fixes.patch 
Log Message:
* Thu Sep 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- kde-4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	29 Aug 2008 12:46:19 -0000	1.58
+++ .cvsignore	26 Sep 2008 19:39:01 -0000	1.59
@@ -1,3 +1 @@
-kdelibs-4.0.99.tar.bz2
-kdelibs-4.1.0.tar.bz2
-kdelibs-4.1.1.tar.bz2
+kdelibs-4.1.2.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- kdelibs.spec	19 Sep 2008 00:42:56 -0000	1.380
+++ kdelibs.spec	26 Sep 2008 19:39:02 -0000	1.381
@@ -1,8 +1,8 @@
 %define _default_patch_fuzz 2
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.1.1
-Release: 12%{?dist}
+Version: 4.1.2
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -75,24 +75,9 @@
 Patch14: kdelibs-4.0.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.0-kstandarddirs.patch
-# fix running commands in kglobalconfig before KComponentData init (#455130)
-Patch19: kdelibs-4.1.0-#455130.patch
 Patch20: kdelibs-4.1.1-cmake.patch
 
 ## upstream patches
-Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
-Patch101: kdelibs-4.1.1-kde#856379-cookiejar.patch
-Patch102: kdelibs-4.1.1-kde#856403-urlnav.patch
-Patch103: kdelibs-4.1.1-kutils-fixes.patch
-Patch104: kdelibs-4.1.1-kdeui-widgets-fixes.patch
-Patch105: kdelibs-4.1.1-kde#858795-mimeassoc.patch
-Patch106: kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch
-Patch107: kdelibs-4.1.1-kde#860005-emoticons.patch
-Patch108: kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch
-# make "Stop Animations" work again in Konqueror
-# https://bugs.kde.org/show_bug.cgi?id=157789
-# submitted upstream (attached to above bug report)
-Patch109: kdelibs-4.1.1-kde#157789.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -215,20 +200,9 @@
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
-%patch19 -p1 -b .#455130
 %patch20 -p1 -b .cmake
 
 ## upstream patches
-%patch100 -p0 -b .kde#169447-khtml-regression
-%patch101 -p0 -b .kde#856379-cookiejar
-%patch102 -p0 -b .kde#856403-urlnav
-%patch103 -p0 -b .kutils-fixes
-%patch104 -p0 -b .kdeui-widgets-fixes
-%patch105 -p0 -b .kde#858795-mimeassoc
-%patch106 -p0 -b .kde#860095-khtml-scroll-crash
-%patch107 -p0 -b .kde#860005-emoticons
-%patch108 -p0 -b .kde#170461-khtml-regression
-%patch109 -p1 -b .kde#157789
 
 %build
 
@@ -389,6 +363,9 @@
 
 
 %changelog
+* Thu Sep 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- kde-4.1.2
+
 * Fri Sep 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-12
 - make "Stop Animations" work again in Konqueror (KDE 4 regression kde#157789)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	1 Sep 2008 09:22:37 -0000	1.70
+++ sources	26 Sep 2008 19:39:02 -0000	1.71
@@ -1 +1 @@
-d75ec557cd864e3f9150059c3e58ed61  kdelibs-4.1.1.tar.bz2
+cb5f43d2b11669fb17b0a1ecf3736c17  kdelibs-4.1.2.tar.bz2


--- kdelibs-4.1.0-#455130.patch DELETED ---


--- kdelibs-4.1.1-kde#157789.patch DELETED ---


--- kdelibs-4.1.1-kde#169447-khtml-regression.patch DELETED ---


--- kdelibs-4.1.1-kde#856379-cookiejar.patch DELETED ---


--- kdelibs-4.1.1-kde#856403-urlnav.patch DELETED ---


--- kdelibs-4.1.1-kde#858795-mimeassoc.patch DELETED ---


--- kdelibs-4.1.1-kde#860005-emoticons.patch DELETED ---


--- kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch DELETED ---


--- kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch DELETED ---


--- kdelibs-4.1.1-kutils-fixes.patch DELETED ---



From rstrode at fedoraproject.org  Fri Sep 26 19:39:44 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 26 Sep 2008 19:39:44 +0000 (UTC)
Subject: rpms/gnome-panel/devel gnome-panel-2.24.0-smoother-slide-in.patch, 
	NONE, 1.1 gnome-panel.spec, 1.320, 1.321
Message-ID: <20080926193944.2E4837010C@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19576

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.24.0-smoother-slide-in.patch 
Log Message:
- Try to make initial panel slide-in animation be smooth


gnome-panel-2.24.0-smoother-slide-in.patch:

--- NEW FILE gnome-panel-2.24.0-smoother-slide-in.patch ---
--- gnome-panel-2.24.0/gnome-panel/applet.c
+++ gnome-panel-2.24.0/gnome-panel/applet.c
@@ -792,6 +792,7 @@ typedef struct {
 } PanelAppletToLoad;
 
 static GSList  *panel_applets_to_load = NULL;
+static GSList  *panel_applets_loading = NULL;
 static gboolean panel_applet_have_load_idle = FALSE;
 
 static void
@@ -818,8 +819,40 @@ panel_applet_on_load_queue (const char *id)
 	return FALSE;
 }
 
+static void
+on_applet_loaded (const char *id,
+                  gpointer    user_data)
+{
+	PanelAppletToLoad *applet;
+	GSList *l, *applet_link;
+
+	GClosure *closure = (GClosure *) user_data;
+
+	applet_link = NULL;
+	for (l = panel_applets_loading; l; l = l->next) {
+		applet = l->data;
+
+		if (strcmp (applet->id, id) == 0) {
+			break;
+		}
+	}
+
+	if (l == NULL)
+		return;
+
+	panel_applets_loading = g_slist_delete_link (panel_applets_loading, l);
+	free_applet_to_load (applet);
+
+	if (panel_applets_loading == NULL && closure != NULL) {
+		GValue param = { 0 };
+		g_value_init (&param, G_TYPE_POINTER);
+		g_value_set_instance (&param, NULL);
+		g_cclosure_marshal_VOID__VOID (closure, NULL, 1, &param, 0, NULL);
+	}
+}
+
 static gboolean
-panel_applet_load_idle_handler (gpointer dummy)
+panel_applet_load_idle_handler (GClosure *closure)
 {
 	PanelAppletToLoad *applet = NULL;
 	PanelToplevel     *toplevel = NULL;
@@ -848,8 +881,8 @@ panel_applet_load_idle_handler (gpointer dummy)
 		panel_applet_have_load_idle = FALSE;
 		return FALSE;
 	}
-
 	panel_applets_to_load = g_slist_delete_link (panel_applets_to_load, l);
+	panel_applets_loading = g_slist_append (panel_applets_loading, applet);
 
 	panel_widget = panel_toplevel_get_panel_widget (toplevel);
 
@@ -866,13 +900,16 @@ panel_applet_load_idle_handler (gpointer dummy)
 					panel_widget,
 					applet->locked,
 					applet->position,
-					applet->id);
+					applet->id,
+					on_applet_loaded,
+					closure);
 		break;
 	case PANEL_OBJECT_DRAWER:
 		drawer_load_from_gconf (panel_widget,
 					applet->locked,
 					applet->position,
 					applet->id);
+		on_applet_loaded (applet->id, closure);
 		break;
 	case PANEL_OBJECT_MENU:
 		panel_menu_button_load_from_gconf (panel_widget,
@@ -880,12 +917,14 @@ panel_applet_load_idle_handler (gpointer dummy)
 						   applet->position,
 						   TRUE,
 						   applet->id);
+		on_applet_loaded (applet->id, closure);
 		break;
 	case PANEL_OBJECT_LAUNCHER:
 		launcher_load_from_gconf (panel_widget,
 					  applet->locked,
 					  applet->position,
 					  applet->id);
+		on_applet_loaded (applet->id, closure);
 		break;
 	case PANEL_OBJECT_LOGOUT:
 	case PANEL_OBJECT_LOCK:
@@ -896,6 +935,7 @@ panel_applet_load_idle_handler (gpointer dummy)
 				applet->position,
 				TRUE,
 				applet->id);
+		on_applet_loaded (applet->id, closure);
 		break;
 	case PANEL_OBJECT_ACTION:
 		panel_action_button_load_from_gconf (
@@ -904,6 +944,7 @@ panel_applet_load_idle_handler (gpointer dummy)
 				applet->position,
 				TRUE,
 				applet->id);
+		on_applet_loaded (applet->id, closure);
 		break;
 	case PANEL_OBJECT_MENU_BAR:
 		panel_menu_bar_load_from_gconf (
@@ -912,18 +953,18 @@ panel_applet_load_idle_handler (gpointer dummy)
 				applet->position,
 				TRUE,
 				applet->id);
+		on_applet_loaded (applet->id, closure);
 		break;
 	case PANEL_OBJECT_SEPARATOR:
 		panel_separator_load_from_gconf (panel_widget,
 						 applet->locked,
 						 applet->position,
 						 applet->id);
+		on_applet_loaded (applet->id, closure);
 	default:
 		break;
 	}
 
-	free_applet_to_load (applet);
-
 	return TRUE;
 }
 
@@ -969,8 +1010,11 @@ panel_applet_compare (const PanelAppletToLoad *a,
 }
 
 void
-panel_applet_load_queued_applets (void)
+panel_applet_load_queued_applets (GFunc    queue_empty_func,
+				  gpointer user_data)
 {
+	GClosure *closure;
+
 	if (!panel_applets_to_load)
 		return;
 
@@ -978,7 +1022,11 @@ panel_applet_load_queued_applets (void)
 					      (GCompareFunc) panel_applet_compare);
 
 	if ( ! panel_applet_have_load_idle) {
-		g_idle_add (panel_applet_load_idle_handler, NULL);
+		if (queue_empty_func != NULL)
+			closure = g_cclosure_new_swap (G_CALLBACK (queue_empty_func), user_data, NULL);
+		else
+			closure = NULL;
+		g_idle_add ((GSourceFunc) panel_applet_load_idle_handler, closure);
 		panel_applet_have_load_idle = TRUE;
 	}
 }
--- gnome-panel-2.24.0/gnome-panel/applet.h
+++ gnome-panel-2.24.0/gnome-panel/applet.h
@@ -28,6 +28,7 @@ typedef struct {
 	char            *id;
 } AppletInfo;
 
+typedef void (* AppletLoadingDoneFunc) (const char *id, gpointer data);
 typedef gboolean (* CallbackEnabledFunc) (void);
 
 typedef struct {
@@ -69,7 +70,8 @@ void panel_applet_queue_applet_to_load (const char      *id,
 					int              position,
 					gboolean         right_stick,
 					gboolean         locked);
-void panel_applet_load_queued_applets  (void);
+void panel_applet_load_queued_applets  (GFunc    queue_empty_func,
+					gpointer user_data);
 gboolean panel_applet_on_load_queue    (const char *id);
 
 
--- gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c
+++ gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c
@@ -80,6 +80,8 @@ typedef struct {
 	int               position;
 	gboolean          exactpos;
 	char             *id;
+	AppletLoadingDoneFunc done_func;
+	gpointer          user_data;
 } PanelAppletFrameActivating;
 
 /* Keep in sync with panel-applet.h. Uggh.
@@ -326,7 +328,9 @@ panel_applet_frame_load (const gchar *iid,
 			 gboolean     locked,
 			 int          position,
 			 gboolean     exactpos,
-			 const char  *id)
+			 const char  *id,
+			 AppletLoadingDoneFunc done_func,
+			 gpointer      user_data)
 {
 	PanelAppletFrame           *frame;
 	CORBA_Environment           ev;
@@ -337,11 +341,17 @@ panel_applet_frame_load (const gchar *iid,
 	g_return_if_fail (id != NULL);
 
 	if (g_slist_find_custom (no_reload_applets, id,
-				 (GCompareFunc) strcmp))
+				 (GCompareFunc) strcmp)) {
+		if (done_func)
+			done_func (id, user_data);
 		return;
+        }
 
-	if (panel_lockdown_is_applet_disabled (iid))
+	if (panel_lockdown_is_applet_disabled (iid)) {
+		if (done_func)
+			done_func (id, user_data);
 		return;
+        }
 
 	frame = g_object_new (PANEL_TYPE_APPLET_FRAME, NULL);
 	frame->priv->panel = panel;
@@ -353,6 +363,8 @@ panel_applet_frame_load (const gchar *iid,
 	frame_act->position = position;
 	frame_act->exactpos = exactpos;
 	frame_act->id       = g_strdup (id);
+	frame_act->done_func = done_func;
+	frame_act->user_data = user_data;
 
 	CORBA_exception_init (&ev);
 
@@ -367,7 +379,9 @@ void
 panel_applet_frame_load_from_gconf (PanelWidget *panel_widget,
 				    gboolean     locked,
 				    int          position,
-				    const char  *id)
+				    const char  *id,
+				    AppletLoadingDoneFunc done_func,
+				    gpointer     user_data)
 {
 	const char  *key;
 	char        *applet_iid;
@@ -379,11 +393,14 @@ panel_applet_frame_load_from_gconf (PanelWidget *panel_widget,
 	applet_iid = gconf_client_get_string (panel_gconf_get_client (),
 					      key, NULL);
 
-	if (!applet_iid || !applet_iid[0])
+	if (!applet_iid || !applet_iid[0]) {
+		done_func (id, user_data);
 		return;
+	}
 
 	panel_applet_frame_load (applet_iid, panel_widget,
-				 locked, position, TRUE, id);
+				 locked, position, TRUE, id,
+				 done_func, user_data);
 
 	g_free (applet_iid);
 }
@@ -890,7 +907,7 @@ panel_applet_frame_reload_response (GtkWidget        *dialog,
 		}
 
 		panel_applet_frame_load (iid, panel, locked,
-					 position, TRUE, id);
+					 position, TRUE, id, NULL, NULL);
 
 		g_free (iid);
 		g_free (id);
@@ -1286,6 +1303,8 @@ panel_applet_frame_activated (CORBA_Object  object,
 		if (!in_default_panel_config (frame_act->id)) {
 			panel_applet_frame_loading_failed (frame, frame_act->id);
 		}
+		if (frame_act->done_func)
+			frame_act->done_func (frame_act->id, frame_act->user_data);
 		g_free (frame_act->id);
 		g_free (frame_act);
 		return;
@@ -1328,6 +1347,8 @@ panel_applet_frame_activated (CORBA_Object  object,
 		panel_applet_frame_loading_failed (frame, frame_act->id);
 		CORBA_exception_free (&corba_ev);
 		bonobo_object_release_unref (object, NULL);
+		if (frame_act->done_func)
+			frame_act->done_func (frame_act->id, frame_act->user_data);
                 g_free (frame_act->id);
 		g_free (frame_act);
 		g_free (error);
@@ -1344,6 +1365,8 @@ panel_applet_frame_activated (CORBA_Object  object,
 		g_warning (G_STRLOC ": failed to load applet %s",
 			   frame->priv->iid);
 		panel_applet_frame_loading_failed (frame, frame_act->id);
+		if (frame_act->done_func)
+			frame_act->done_func (frame_act->id, frame_act->user_data);
 		g_free (frame_act->id);
 		g_free (frame_act);
 		return;
@@ -1355,6 +1378,8 @@ panel_applet_frame_activated (CORBA_Object  object,
 			   "(cannot get control frame)", frame->priv->iid);
 		panel_applet_frame_loading_failed (frame, frame_act->id);
 		gtk_object_sink (GTK_OBJECT (widget));
+		if (frame_act->done_func)
+			frame_act->done_func (frame_act->id, frame_act->user_data);
 		g_free (frame_act->id);
 		g_free (frame_act);
 		return;
@@ -1371,6 +1396,8 @@ panel_applet_frame_activated (CORBA_Object  object,
 			   frame->priv->iid, error);
 		panel_applet_frame_loading_failed (frame, frame_act->id);
 		gtk_object_sink (GTK_OBJECT (widget));
+		if (frame_act->done_func)
+			frame_act->done_func (frame_act->id, frame_act->user_data);
 		g_free (frame_act->id);
 		g_free (frame_act);
 		g_free (error);
@@ -1394,6 +1421,8 @@ panel_applet_frame_activated (CORBA_Object  object,
 			   frame->priv->iid, error);
 		panel_applet_frame_loading_failed (frame, frame_act->id);
 		gtk_object_sink (GTK_OBJECT (widget));
+		if (frame_act->done_func)
+			frame_act->done_func (frame_act->id, frame_act->user_data);
 		g_free (frame_act->id);
 		g_free (frame_act);
 		g_free (error);
@@ -1418,6 +1447,8 @@ panel_applet_frame_activated (CORBA_Object  object,
 			   "(cannot get control)", frame->priv->iid);
 		panel_applet_frame_loading_failed (frame, frame_act->id);
 		gtk_object_sink (GTK_OBJECT (widget));
+		if (frame_act->done_func)
+			frame_act->done_func (frame_act->id, frame_act->user_data);
 		g_free (frame_act->id);
 		g_free (frame_act);
 		return;
@@ -1430,6 +1461,8 @@ panel_applet_frame_activated (CORBA_Object  object,
 			   "(cannot get applet shell)", frame->priv->iid);
 		panel_applet_frame_loading_failed (frame, frame_act->id);
 		gtk_object_sink (GTK_OBJECT (widget));
+		if (frame_act->done_func)
+			frame_act->done_func (frame_act->id, frame_act->user_data);
 		g_free (frame_act->id);
 		g_free (frame_act);
 		return;
@@ -1461,6 +1494,8 @@ panel_applet_frame_activated (CORBA_Object  object,
 	panel_lockdown_notify_add (G_CALLBACK (panel_applet_frame_sync_menu_state),
 				   frame);
 
+	if (frame_act->done_func)
+		frame_act->done_func (frame_act->id, frame_act->user_data);
 	g_free (frame_act->id);
 	g_free (frame_act);
 }
--- gnome-panel-2.24.0/gnome-panel/panel-applet-frame.h
+++ gnome-panel-2.24.0/gnome-panel/panel-applet-frame.h
@@ -73,7 +73,9 @@ void       panel_applet_frame_change_background (PanelAppletFrame    *frame,
 void       panel_applet_frame_load_from_gconf   (PanelWidget *panel_widget,
 						 gboolean     locked,
 						 int          position,
-						 const char  *id);
+						 const char  *id,
+						 AppletLoadingDoneFunc done_func,
+						 gpointer user_data);
 
 void            panel_applet_frame_set_panel (PanelAppletFrame *frame,
 					      PanelWidget      *panel);
--- gnome-panel-2.24.0/gnome-panel/panel-profile.c
+++ gnome-panel-2.24.0/gnome-panel/panel-profile.c
@@ -2195,7 +2195,7 @@ panel_profile_object_id_list_notify (GConfClient *client,
 	g_slist_free (sublist);
 	g_slist_free (object_ids);
 
-	panel_applet_load_queued_applets ();
+	panel_applet_load_queued_applets (NULL, NULL);
 }
 
 static void
@@ -2446,6 +2446,22 @@ panel_profile_ensure_toplevel_per_screen (GConfClient *client,
 	g_slist_free (empty_screens);
 }
 
+static void
+panel_profile_on_loaded (void)
+{
+	GSList     *toplevels;
+	GSList     *l;
+
+	toplevels = panel_toplevel_list_toplevels ();
+
+	for (l = toplevels; l; l = l->next) {
+		PanelToplevel *toplevel;
+
+		toplevel = PANEL_TOPLEVEL (l->data);
+		panel_toplevel_queue_initial_unhide (toplevel);
+	}
+}
+
 void
 panel_profile_load (void)
 {
@@ -2477,7 +2493,7 @@ panel_profile_load (void)
 
 	panel_profile_ensure_toplevel_per_screen (client, PANEL_CONFIG_DIR);
 
-	panel_applet_load_queued_applets ();
+	panel_applet_load_queued_applets ((GFunc) panel_profile_on_loaded, NULL);
 }
 
 static gboolean
--- gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
+++ gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
@@ -2898,12 +2899,15 @@ static void
 panel_toplevel_initially_hide (PanelToplevel *toplevel)
 {
 	if (!toplevel->priv->attached) {
+
+		/* We start the panel off hidden until all the
+		 * applets are loaded, and then finally slide it
+		 * down when it's ready to be used
+		 */
 		toplevel->priv->initial_animation_done = FALSE;
 
 		toplevel->priv->state = PANEL_STATE_AUTO_HIDDEN;
 		gtk_widget_queue_resize (GTK_WIDGET (toplevel));
-
-		panel_toplevel_queue_auto_unhide (toplevel);
 	} else
 		toplevel->priv->initial_animation_done = TRUE;
 
@@ -3638,6 +3642,17 @@ panel_toplevel_queue_auto_unhide (PanelToplevel *toplevel)
 				    toplevel);
 }
 
+void
+panel_toplevel_queue_initial_unhide (PanelToplevel *toplevel)
+{
+	if (toplevel->priv->initial_animation_done)
+		return;
+       /* Give the applets a second or so to frob after registering */
+	toplevel->priv->unhide_timeout =
+		g_timeout_add_seconds (1, (GSourceFunc) panel_toplevel_auto_unhide_timeout_handler,
+			toplevel);
+}
+
 static gboolean
 panel_toplevel_enter_notify_event (GtkWidget        *widget,
 				   GdkEventCrossing *event)
--- gnome-panel-2.24.0/gnome-panel/panel-toplevel.h
+++ gnome-panel-2.24.0/gnome-panel/panel-toplevel.h
@@ -136,6 +136,7 @@ void                 panel_toplevel_hide                   (PanelToplevel
 void                 panel_toplevel_unhide                 (PanelToplevel       *toplevel);
 void                 panel_toplevel_queue_auto_hide        (PanelToplevel       *toplevel);
 void                 panel_toplevel_queue_auto_unhide      (PanelToplevel       *toplevel);
+void                 panel_toplevel_queue_initial_unhide   (PanelToplevel       *toplevel);
 void                 panel_toplevel_push_autohide_disabler (PanelToplevel       *toplevel);
 void                 panel_toplevel_pop_autohide_disabler  (PanelToplevel       *toplevel);
 


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- gnome-panel.spec	25 Sep 2008 19:22:03 -0000	1.320
+++ gnome-panel.spec	26 Sep 2008 19:39:13 -0000	1.321
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.24.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar.bz2
 
@@ -113,6 +113,8 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=520111
 Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
 
+Patch25: gnome-panel-2.24.0-smoother-slide-in.patch
+
 Patch35: clock-wakeups.patch
 
 Conflicts: gnome-power-manager < 2.15.3
@@ -160,6 +162,7 @@
 %patch10 -p1 -b .preferred-apps
 %patch11 -p1 -b .applet-error
 %patch24 -p1 -b .allow-spurious-view-done-signals
+%patch25 -p1 -b .smoother-slide-in
 %patch35 -p1 -b .clock-wakeups
 
 . %{SOURCE6}
@@ -360,6 +363,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Sep 26 2008 Ray Strode  <rstrode at redhat.com> - 2.24.0-4
+- Try to make initial panel slide-in animation be smooth
+
 * Thu Sep 25 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-3
 - Save some space
 



From rdieter at fedoraproject.org  Fri Sep 26 19:40:03 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 26 Sep 2008 19:40:03 +0000 (UTC)
Subject: rpms/kdepimlibs/devel .cvsignore, 1.26, 1.27 kdepimlibs.spec, 1.49, 
	1.50 sources, 1.26, 1.27 fix-invitations.diff, 1.1, NONE
Message-ID: <20080926194003.EFDB17010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19701

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Removed Files:
	fix-invitations.diff 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	29 Aug 2008 16:08:20 -0000	1.26
+++ .cvsignore	26 Sep 2008 19:39:33 -0000	1.27
@@ -1,3 +1 @@
-kdepimlibs-4.0.99.tar.bz2
-kdepimlibs-4.1.0.tar.bz2
-kdepimlibs-4.1.1.tar.bz2
+kdepimlibs-4.1.2.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kdepimlibs.spec	15 Sep 2008 16:18:29 -0000	1.49
+++ kdepimlibs.spec	26 Sep 2008 19:39:33 -0000	1.50
@@ -13,8 +13,8 @@
 
 Name: kdepimlibs
 
-Version: 4.1.1
-Release: 2%{?dist}
+Version: 4.1.2
+Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -41,8 +41,6 @@
 #BuildRequires: phonon-backend-gstreamer
 
 ## upstream patches
-# http://bugs.kde.org/170203
-Patch100: fix-invitations.diff
 
 %if 0%{?apidocs}
 BuildRequires: doxygen
@@ -79,8 +77,6 @@
 %prep
 %setup -q -n kdepimlibs-%{version}
 
-%patch100 -p4 -b .invitations
-
 
 %build
 
@@ -171,6 +167,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Sep 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-2
 - invitations crasher/regression (kde #170203, rh#462103)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	29 Aug 2008 16:08:20 -0000	1.26
+++ sources	26 Sep 2008 19:39:33 -0000	1.27
@@ -1 +1 @@
-36316f5fc5b2e0ec123a8e00a522dd80  kdepimlibs-4.1.1.tar.bz2
+c5896119ce4aef2dd9d11495dd0dea6e  kdepimlibs-4.1.2.tar.bz2


--- fix-invitations.diff DELETED ---



From rathann at fedoraproject.org  Fri Sep 26 19:40:18 2008
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Fri, 26 Sep 2008 19:40:18 +0000 (UTC)
Subject: rpms/tachyon/EL-5 tachyon-rpm.patch,1.2,1.3 tachyon.spec,1.3,1.4
Message-ID: <20080926194018.A36BA7010C@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/tachyon/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19822

Modified Files:
	tachyon-rpm.patch tachyon.spec 
Log Message:
* Fri Sep 26 2008 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.97-7
- bump release to fix upgrade path from EL-4
- backport changes from rawhide
- fix build with current lam (use mpi-selector)


tachyon-rpm.patch:

Index: tachyon-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/EL-5/tachyon-rpm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tachyon-rpm.patch	16 Jul 2007 19:11:24 -0000	1.2
+++ tachyon-rpm.patch	26 Sep 2008 19:39:48 -0000	1.3
@@ -1,6 +1,7 @@
---- tachyon/unix/Make-arch.r	2005-03-18 16:28:05.000000000 +0100
-+++ tachyon/unix/Make-arch	2006-11-29 19:54:45.000000000 +0100
-@@ -15,7 +15,7 @@
+diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch
+--- tachyon/unix/Make-arch.r	2007-02-13 10:00:36.000000000 +0100
++++ tachyon/unix/Make-arch	2007-12-13 22:08:06.000000000 +0100
+@@ -15,7 +15,7 @@ MPILIB=$(MPIDIR)/lib
  
  MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX)
  MISCINC=$(JPEGINC) $(PNGINC) $(SPACEBALLINC)
@@ -9,7 +10,7 @@
  MISCLIB=$(JPEGLIB) $(PNGLIB) $(SPACEBALLLIB)
  
  default:
-@@ -915,7 +915,7 @@
+@@ -983,7 +983,7 @@ linux:
  	"CFLAGS = -m32 -Wall -O6 -g -ffast-math -DLinux $(MISCFLAGS)" \
  	"AR = ar" \
  	"ARFLAGS = r" \
@@ -18,7 +19,7 @@
  	"RANLIB = ranlib" \
  	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
  
-@@ -927,7 +927,7 @@
+@@ -1007,7 +1007,7 @@ linux-64:
  	"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DLP64 $(MISCFLAGS)" \
  	"AR = ar" \
  	"ARFLAGS = r" \
@@ -27,7 +28,7 @@
  	"RANLIB = ranlib" \
  	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
  
-@@ -936,10 +936,10 @@
+@@ -1029,10 +1029,10 @@ linux-64-thr:
  	$(MAKE) all \
  	"ARCH = linux-64-thr" \
  	"CC = gcc" \
@@ -40,7 +41,7 @@
  	"RANLIB = ranlib" \
  	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
  
-@@ -1035,10 +1035,10 @@
+@@ -1128,10 +1128,10 @@ linux-thr:
  	$(MAKE) all \
  	"ARCH = linux-thr" \
  	"CC = gcc" \
@@ -53,7 +54,7 @@
  	"RANLIB = ranlib" \
  	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
  
-@@ -1047,7 +1047,7 @@
+@@ -1140,7 +1140,7 @@ linux-thr-ogl:
  	$(MAKE) all \
  	"ARCH = linux-thr-ogl" \
  	"CC = cc" \
@@ -62,33 +63,33 @@
  	"AR = ar" \
  	"ARFLAGS = r" \
  	"STRIP = touch" \
-@@ -1081,37 +1081,61 @@
+@@ -1174,44 +1174,68 @@ linux-beowulf-mpi:
  linux-lam:
  	$(MAKE) all \
  	"ARCH = linux-lam" \
 -	"CC = hcc" \
 -	"CFLAGS = -m486 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
 +	"CC = mpicc" \
-+	"CFLAGS = -m32 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
++	"CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
  	"AR = ar" \
  	"ARFLAGS = r" \
 -	"STRIP = strip" \
 +	"STRIP = touch" \
 +	"RANLIB = ranlib" \
-+	"LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
++	"LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
 +
 +# Linux x86 using LAM MPI, with OpenGL display
 +linux-lam-ogl:
 +	$(MAKE) all \
 +	"ARCH = linux-lam-ogl" \
 +	"CC = mpicc" \
-+	"CFLAGS = -m32 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++	"CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
 +	"AR = ar" \
 +	"ARFLAGS = r" \
 +	"STRIP = touch" \
  	"RANLIB = ranlib" \
 -	"LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
-+	"LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
++	"LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
  
  # Linux AMD64/EM64T using LAM MPI
 -linux-lam-64:
@@ -99,14 +100,14 @@
 -	"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
 +	"ARCH = linux-64-lam" \
 +	"CC = mpicc" \
-+	"CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
++	"CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
  	"AR = ar" \
  	"ARFLAGS = r" \
 -	"STRIP = strip" \
 +	"STRIP = touch" \
  	"RANLIB = ranlib" \
 -	"LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
-+	"LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
++	"LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
  
  # Linux AMD64/EM64T using LAM MPI, with OpenGL display
 -linux-lam-64-ogl:
@@ -117,13 +118,14 @@
 -	"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
 +	"ARCH = linux-64-lam-ogl" \
 +	"CC = mpicc" \
-+	"CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++	"CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
  	"AR = ar" \
  	"ARFLAGS = r" \
 -	"STRIP = strip" \
 +	"STRIP = touch" \
-+	"RANLIB = ranlib" \
-+	"LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+ 	"RANLIB = ranlib" \
+-	"LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
++	"LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
 +
 +# Linux AMD64/EM64T using threads with OpenGL display
 +linux-64-thr-ogl:
@@ -134,13 +136,20 @@
 +	"AR = ar" \
 +	"ARFLAGS = r" \
 +	"STRIP = touch" \
- 	"RANLIB = ranlib" \
--	"LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
++	"RANLIB = ranlib" \
 +	"LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
  
  # Linux x86 using LAM MPI and threads
  linux-lam-thr:
-@@ -1149,6 +1173,54 @@
+ 	$(MAKE) all \
+ 	"ARCH = linux-lam-thr" \
+ 	"CC = hcc" \
+-	"CFLAGS = -m486 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DTHR -D_REENTRANT $(MISCFLAGS)" \
++	"CFLAGS = -m486 -Wall -O6 -fomit-frame-pointer -ffast-math $(LAMFLAGS) -DLinux -DMPI -DTHR -D_REENTRANT $(MISCFLAGS)" \
+ 	"AR = ar" \
+ 	"ARFLAGS = r" \
+ 	"STRIP = strip" \
+@@ -1242,6 +1266,234 @@ linux-ppc:
  	"RANLIB = ranlib" \
  	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
  
@@ -173,31 +182,275 @@
 +	$(MAKE) all \
 +	"ARCH = linux-ppc-lam" \
 +	"CC = mpicc" \
-+	"CFLAGS = -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
++	"CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
 +	"AR = ar" \
 +	"ARFLAGS = r" \
 +	"STRIP = touch" \
 +	"RANLIB = ranlib" \
-+	"LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
++	"LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
 +
 +# Linux PPC using LAM MPI, with OpenGL display
 +linux-ppc-lam-ogl:
 +	$(MAKE) all \
 +	"ARCH = linux-ppc-lam-ogl" \
 +	"CC = mpicc" \
-+	"CFLAGS = -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++	"CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = touch" \
++	"RANLIB = ranlib" \
++	"LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
++
++# Linux PPC64 using gcc 
++linux-ppc64:
++	$(MAKE) all \
++	"ARCH = linux-ppc64" \
++	"CC = gcc" \
++	"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = strip" \
++	"RANLIB = ranlib" \
++	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
++
++# Linux PPC64 using gcc and threads
++linux-ppc64-thr:
++	$(MAKE) all \
++	"ARCH = linux-ppc64-thr" \
++	"CC = gcc" \
++	"CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = touch" \
++	"RANLIB = ranlib" \
++	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
++
++# Linux PPC64 using threads with OpenGL display
++linux-ppc64-thr-ogl:
++	$(MAKE) all \
++	"ARCH = linux-ppc64-thr-ogl" \
++	"CC = gcc" \
++	"CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = touch" \
++	"RANLIB = ranlib" \
++	"LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
++
++# Linux PPC64 using LAM MPI
++linux-ppc64-lam:
++	$(MAKE) all \
++	"ARCH = linux-ppc64-lam" \
++	"CC = mpicc" \
++	"CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = touch" \
++	"RANLIB = ranlib" \
++	"LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
++
++# Linux PPC64 using LAM MPI, with OpenGL display
++linux-ppc64-lam-ogl:
++	$(MAKE) all \
++	"ARCH = linux-ppc64-lam-ogl" \
++	"CC = mpicc" \
++	"CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = touch" \
++	"RANLIB = ranlib" \
++	"LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
++
++# Linux SPARC using gcc 
++linux-sparc:
++	$(MAKE) all \
++	"ARCH = linux-sparc" \
++	"CC = gcc" \
++	"CFLAGS = -m32 -Wall -O2 -DLinux $(MISCFLAGS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = strip" \
++	"RANLIB = ranlib" \
++	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
++
++# Linux SPARC using gcc and threads
++linux-sparc-thr:
++	$(MAKE) all \
++	"ARCH = linux-sparc-thr" \
++	"CC = gcc" \
++	"CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = touch" \
++	"RANLIB = ranlib" \
++	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
++
++# Linux SPARC using threads with OpenGL display
++linux-sparc-thr-ogl:
++	$(MAKE) all \
++	"ARCH = linux-sparc-thr-ogl" \
++	"CC = gcc" \
++	"CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = touch" \
++	"RANLIB = ranlib" \
++	"LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
++
++# Linux SPARC using LAM MPI
++linux-sparc-lam:
++	$(MAKE) all \
++	"ARCH = linux-sparc-lam" \
++	"CC = mpicc" \
++	"CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = touch" \
++	"RANLIB = ranlib" \
++	"LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
++
++# Linux SPARC using LAM MPI, with OpenGL display
++linux-sparc-lam-ogl:
++	$(MAKE) all \
++	"ARCH = linux-sparc-lam-ogl" \
++	"CC = mpicc" \
++	"CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = touch" \
++	"RANLIB = ranlib" \
++	"LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
++
++# Linux SPARC64 using gcc 
++linux-sparc64:
++	$(MAKE) all \
++	"ARCH = linux-sparc64" \
++	"CC = gcc" \
++	"CFLAGS = -m64 -Wall -O2 -DLinux $(MISCFLAGS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = strip" \
++	"RANLIB = ranlib" \
++	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
++
++# Linux SPARC64 using gcc and threads
++linux-sparc64-thr:
++	$(MAKE) all \
++	"ARCH = linux-sparc64-thr" \
++	"CC = gcc" \
++	"CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = touch" \
++	"RANLIB = ranlib" \
++	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
++
++# Linux SPARC64 using threads with OpenGL display
++linux-sparc64-thr-ogl:
++	$(MAKE) all \
++	"ARCH = linux-sparc64-thr-ogl" \
++	"CC = gcc" \
++	"CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = touch" \
++	"RANLIB = ranlib" \
++	"LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
++
++# Linux SPARC64 using LAM MPI
++linux-sparc64-lam:
++	$(MAKE) all \
++	"ARCH = linux-sparc64-lam" \
++	"CC = mpicc" \
++	"CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
 +	"AR = ar" \
 +	"ARFLAGS = r" \
 +	"STRIP = touch" \
 +	"RANLIB = ranlib" \
-+	"LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
++	"LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
++
++# Linux SPARC64 using LAM MPI, with OpenGL display
++linux-sparc64-lam-ogl:
++	$(MAKE) all \
++	"ARCH = linux-sparc64-lam-ogl" \
++	"CC = mpicc" \
++	"CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = touch" \
++	"RANLIB = ranlib" \
++	"LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
 +
  # Linux PPC using gcc 
  linux-ps2:
  	$(MAKE) all \
---- tachyon/unix/Make-config.r	2004-03-05 20:41:03.000000000 +0100
-+++ tachyon/unix/Make-config	2006-11-29 19:51:01.000000000 +0100
-@@ -57,7 +57,7 @@
+@@ -1259,13 +1511,61 @@ linux-alpha:
+ 	$(MAKE) all \
+ 	"ARCH = linux-alpha" \
+ 	"CC = gcc" \
+-	"CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \
++	"CFLAGS = -Wall -O2 -DLinux $(MISCFLAGS)" \
+ 	"AR = ar" \
+ 	"ARFLAGS = r" \
+ 	"STRIP = strip" \
+ 	"RANLIB = ranlib" \
+ 	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
+ 
++# Linux Alpha using gcc and threads
++linux-alpha-thr:
++	$(MAKE) all \
++	"ARCH = linux-alpha-thr" \
++	"CC = gcc" \
++	"CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = touch" \
++	"RANLIB = ranlib" \
++	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
++
++# Linux Alpha using threads with OpenGL display
++linux-alpha-thr-ogl:
++	$(MAKE) all \
++	"ARCH = linux-alpha-thr-ogl" \
++	"CC = gcc" \
++	"CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = touch" \
++	"RANLIB = ranlib" \
++	"LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
++
++# Linux Alpha using LAM MPI
++linux-alpha-lam:
++	$(MAKE) all \
++	"ARCH = linux-alpha-lam" \
++	"CC = mpicc" \
++	"CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = touch" \
++	"RANLIB = ranlib" \
++	"LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
++
++# Linux Alpha using LAM MPI, with OpenGL display
++linux-alpha-lam-ogl:
++	$(MAKE) all \
++	"ARCH = linux-alpha-lam-ogl" \
++	"CC = mpicc" \
++	"CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++	"AR = ar" \
++	"ARFLAGS = r" \
++	"STRIP = touch" \
++	"RANLIB = ranlib" \
++	"LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
++
+ # Linux Alpha using Compaq's compilers
+ linux-alpha-ccc:
+ 	$(MAKE) all \
+diff -up tachyon/unix/Make-config.r tachyon/unix/Make-config
+--- tachyon/unix/Make-config.r	2007-01-24 09:35:44.000000000 +0100
++++ tachyon/unix/Make-config	2007-12-13 22:08:20.000000000 +0100
+@@ -57,7 +57,7 @@ X11LIB= -lX11
  ##########################################################################
  
  # Standard MPICH installation location
@@ -206,7 +459,18 @@
  
  # UMR CS Dept
  #MPIDIR=/software/all/mpi
-@@ -108,14 +108,14 @@
+@@ -68,6 +68,10 @@ MPIDIR=/usr/local/mpi
+ # Cornell Theory Center SP-2  splogin.tc.cornell.edu
+ #MPIDIR=/usr/local/app/mpich
+ 
++# LAM
++LAMFLAGS=`pkg-config --cflags lam`
++LAMLIBS=`pkg-config --libs lam`
++
+ 
+ ##########################################################################
+ # Floating point configuration:
+@@ -108,14 +112,14 @@ MBOX=
  #   http://www.ijg.org/files/
  ##########################################################################
  # Uncomment the following lines to disable JPEG support
@@ -227,7 +491,7 @@
  
  
  ##########################################################################
-@@ -128,14 +128,14 @@
+@@ -128,14 +132,14 @@ JPEGLIB=
  #   http://www.libpng.org/
  ##########################################################################
  # Uncomment the following lines to disable PNG support
@@ -248,16 +512,28 @@
  
  
  ##########################################################################
---- tachyon/unix/Make-opengl.r	2004-02-04 07:36:06.000000000 +0100
-+++ tachyon/unix/Make-opengl	2006-11-29 19:51:01.000000000 +0100
-@@ -37,8 +37,8 @@
+diff -up tachyon/unix/Make-opengl.r tachyon/unix/Make-opengl
+--- tachyon/unix/Make-opengl.r	2007-01-24 09:35:44.000000000 +0100
++++ tachyon/unix/Make-opengl	2007-12-13 21:54:04.000000000 +0100
+@@ -9,8 +9,8 @@
+ #
+ # Generic Mesa OpenGL / GLX include and link specs, for most platforms
+ #
+-MESA_GLX_INCS = -I/usr/local/include
+-MESA_GLX_LIBS = -L/usr/local/lib -lMesaGL -lMesaGLU
++MESA_GLX_INCS = 
++MESA_GLX_LIBS = -lGL -lGLU -lX11
+ 
+ 
+ #
+@@ -37,8 +37,8 @@ HP_GLX_LIBS = -L/usr/lib/X11R6 -L/opt/gr
  #
  # Linux OpenGL / GLX include and link specs
  #
 -LINUX_GLX_INCS = -I/usr/X11R6/include
 -LINUX_GLX_LIBS = -L/usr/X11R6/lib -lGL -lGLU -lX11
-+LINUX_GLX_INCS = -I/usr/X11R6/include
-+LINUX_GLX_LIBS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lGL -lGLU -lX11
++LINUX_GLX_INCS = 
++LINUX_GLX_LIBS = -lGL -lGLU -lX11
  
  
  #


Index: tachyon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/EL-5/tachyon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tachyon.spec	16 Jul 2007 19:19:47 -0000	1.3
+++ tachyon.spec	26 Sep 2008 19:39:48 -0000	1.4
@@ -4,21 +4,23 @@
 %ifarch x86_64
 %define target linux-64
 %endif
-%ifarch ppc
-%define target linux-ppc
+%ifarch ppc ppc64 sparc sparc64 alpha
+%define target linux-%{_target_cpu}
 %endif
 
+%define variants thr thr-ogl lam lam-ogl
+
 Summary: Parallel / Multiprocessor Ray Tracing System
 Name: tachyon
 Version: 0.97
-Release: 2%{?dist}
+Release: 7%{?dist}
 URL: http://jedi.ks.uiuc.edu/~johns/raytracer/
 Group: Applications/Engineering
 Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.97/tachyon-0.97.tar.gz
 Patch0: %{name}-rpm.patch
-License: BSD
+License: BSD with advertising
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-BuildRequires: mesa-libGLU-devel
+BuildRequires: libGLU-devel
 BuildRequires: libpng-devel
 BuildRequires: libjpeg-devel
 BuildRequires: lam-devel
@@ -90,23 +92,24 @@
 chmod 644 src/hash.*
 chmod 644 demosrc/trackball.c
 chmod 644 scenes/imaps/*
+%{__rm} docs/tachyon/images.idx
 
 %build
+mpi-selector --yes --set lam-%{_arch}
+. /etc/profile.d/mpi-selector.sh
 pushd unix
-%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-thr
-%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-thr-ogl
-%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" LAMHOME=%{_libdir}/lam %{target}-lam
-%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" LAMHOME=%{_libdir}/lam %{target}-lam-ogl
+for variant in %{variants} ; do
+  %{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-$variant
+done
 popd
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/tachyon}
-for variant in -thr -thr-ogl -lam -lam-ogl ; do
-  install -pm755 compile/%{target}$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon$variant
+for variant in %{variants} ; do
+  install -pm755 compile/%{target}-$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon-$variant
 done
 rename -thr "" $RPM_BUILD_ROOT%{_bindir}/*
-%{__rm} docs/tachyon/images.idx
 %{__mv} docs/tachyon docs/html
 %{__cp} -pr scenes $RPM_BUILD_ROOT%{_datadir}/tachyon/
 
@@ -139,6 +142,11 @@
 %{_datadir}/tachyon
 
 %changelog
+* Fri Sep 26 2008 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.97-7
+- bump release to fix upgrade path from EL-4
+- backport changes from rawhide
+- fix build with current lam (use mpi-selector)
+
 * Wed Nov 29 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.97-2
 - use only kosher CFLAGS
 - fix target setting



From rdieter at fedoraproject.org  Fri Sep 26 19:40:31 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 26 Sep 2008 19:40:31 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel .cvsignore, 1.20,
	1.21 kdebase-runtime.spec, 1.68, 1.69 sources, 1.20, 1.21
Message-ID: <20080926194031.D9DE17010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19914

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org. 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	29 Aug 2008 13:34:38 -0000	1.20
+++ .cvsignore	26 Sep 2008 19:40:01 -0000	1.21
@@ -1,3 +1 @@
-kdebase-runtime-4.0.99.tar.bz2
-kdebase-runtime-4.1.0.tar.bz2
-kdebase-runtime-4.1.1.tar.bz2
+kdebase-runtime-4.1.2.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- kdebase-runtime.spec	16 Sep 2008 13:39:54 -0000	1.68
+++ kdebase-runtime.spec	26 Sep 2008 19:40:01 -0000	1.69
@@ -9,8 +9,8 @@
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
-Version:       4.1.1
-Release:       3%{?dist}
+Version:       4.1.2
+Release:       1%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -340,6 +340,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org. 4.1.2-1
+- 4.1.2
+
 * Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.1.1-3
 - fix inherit issue in iconthemes, preview icons
   do not show


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	29 Aug 2008 13:34:38 -0000	1.20
+++ sources	26 Sep 2008 19:40:01 -0000	1.21
@@ -1 +1 @@
-f03488d19c3bd95634b797229ac55127  kdebase-runtime-4.1.1.tar.bz2
+1f17bdfa4bee4bf1c7afc2bd5bdbae59  kdebase-runtime-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Fri Sep 26 19:40:51 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 26 Sep 2008 19:40:51 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel .cvsignore, 1.19,
	1.20 kdebase-workspace.spec, 1.123, 1.124 sources, 1.22, 1.23
Message-ID: <20080926194051.2A54E7010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20168

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	29 Aug 2008 13:42:05 -0000	1.19
+++ .cvsignore	26 Sep 2008 19:40:20 -0000	1.20
@@ -1,2 +1 @@
-kdebase-workspace-4.1.0.tar.bz2
-kdebase-workspace-4.1.1.tar.bz2
+kdebase-workspace-4.1.2.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- kdebase-workspace.spec	1 Sep 2008 22:27:41 -0000	1.123
+++ kdebase-workspace.spec	26 Sep 2008 19:40:20 -0000	1.124
@@ -2,9 +2,9 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.1.1
+Version: 4.1.2
 
-Release: 2%{?dist}
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -309,6 +309,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Mon Sep 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
 - show KCM icon in rootprivs patch (thanks to Harald Sitter "apachelogger")
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	29 Aug 2008 13:42:05 -0000	1.22
+++ sources	26 Sep 2008 19:40:20 -0000	1.23
@@ -1 +1 @@
-53805b96727db2fe30773a3fa9f78b73  kdebase-workspace-4.1.1.tar.bz2
+b1f72c7c4e597e993669d625b26b4470  kdebase-workspace-4.1.2.tar.bz2



From orion at fedoraproject.org  Fri Sep 26 19:41:02 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 26 Sep 2008 19:41:02 +0000 (UTC)
Subject: rpms/gridengine/devel gridengine.spec,1.4,1.5 sgemaster,1.1,1.2
Message-ID: <20080926194102.8875C7010C@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gridengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20243

Modified Files:
	gridengine.spec sgemaster 
Log Message:
* Fri Sep 26 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2-2
- No more sge_schedd in 6.2, remove from startup script



Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gridengine.spec	11 Aug 2008 16:41:50 -0000	1.4
+++ gridengine.spec	26 Sep 2008 19:40:32 -0000	1.5
@@ -6,7 +6,7 @@
 
 Name:    gridengine
 Version: 6.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Grid Engine - Distributed Computing Management software
 
 Group:   Applications/System
@@ -495,6 +495,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2-2
+- No more sge_schedd in 6.2, remove from startup script
+
 * Mon Aug 11 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2-1
 - Update to 6.2 final
 


Index: sgemaster
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/sgemaster,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sgemaster	8 Feb 2008 21:57:24 -0000	1.1
+++ sgemaster	26 Sep 2008 19:40:32 -0000	1.2
@@ -6,7 +6,7 @@
 # description: The gridengine master daemon and scheduler
 
 ### BEGIN INIT INFO
-# Provides: sge_qmaster sge_schedd
+# Provides: sge_qmaster
 # Required-Start: $network $local_fs $remote_fs
 # Required-Stop: $network $local_fs $remote_fs
 # Should-Start: 
@@ -22,13 +22,10 @@
 
 master_exec="/usr/bin/sge_qmaster"
 master_prog="sge_qmaster"
-schedd_exec="/usr/bin/sge_schedd"
-schedd_prog="sge_schedd"
 SGE_ROOT=/usr/share/gridengine; export SGE_ROOT
 SGE_CELL=default; export SGE_CELL
 qmaster_spool_dir=`awk '$1 == "qmaster_spool_dir" { print $2 }' $SGE_ROOT/$SGE_CELL/common/bootstrap`
 master_pidfile=$qmaster_spool_dir/qmaster.pid
-schedd_pidfile=$qmaster_spool_dir/schedd/schedd.pid
 
 #---------------------------------------------------------------------------
 # CheckIfQmasterHost
@@ -153,11 +150,11 @@
 {
    echo "Grid Engine start/stop script. Valid parameters are:"
    echo ""
-   echo "   \"start\"        start qmaster and schedd daemon if applicable"
-   echo "   \"stop\"         shutdown qmaster and schedd daemon if applicable"
-   echo "   \"-qmaster\"     only start/stop qmaster and scheduler (if applicable)"
+   echo "   \"start\"        start qmaster daemon"
+   echo "   \"stop\"         shutdown qmaster daemon"
+   echo "   \"-qmaster\"     only start/stop qmaster (if applicable)"
    echo "   \"-shadowd\"     only start/stop shadowd (if applicable)"   
-   echo "   \"-migrate\"     shutdown qmaster/scheduler if it's running on another"
+   echo "   \"-migrate\"     shutdown qmaster if it's running on another"
    echo "                    host and restart it on this host"
    echo "                    Migration only works if this host is an admin host"
    echo ""
@@ -217,7 +214,6 @@
     fi
 
     [ -x $master_exec ] || exit 5
-    [ -x $schedd_exec ] || exit 5
 
     if [ $qmaster = true -a $qmaster_host = false -a  \
          \( $primary_qmaster_host = true -o $migrate_qmaster = true \) ]; then
@@ -278,10 +274,6 @@
         daemon --check $master_prog --pidfile=$master_pidfile $master_exec
         retval=$?
         CheckRunningQmaster
-        echo
-        echo -n $"Starting $schedd_prog: "
-        daemon --check $schedd_prog --pidfile=$schedd_pidfile $schedd_exec
-        retval=`expr $retval + $?`
     elif [ $qmaster = true -a $qmaster_host = false ]; then
         echo
         echo "sge_qmaster didn't start!"
@@ -318,12 +310,6 @@
 
     if [ $qmaster = true ]; then
         if [ `CheckIfQmasterHost $HOST` = true ]; then
-            # Send SIGTERM to scheduler
-            echo -n $"Stopping $schedd_prog: "
-            killproc -p $schedd_pidfile $schedd_prog
-            retval=$?
-            echo
-
             # Send SIGTERM to qmaster
             echo -n $"Stopping $master_prog: "
             killproc -p $master_pidfile $master_prog
@@ -352,7 +338,6 @@
 rh_status() {
     # run checks to determine if the service is running or use generic status
     status $master_prog
-    status $schedd_prog
 }
 
 rh_status_q() {



From rdieter at fedoraproject.org  Fri Sep 26 19:44:17 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 26 Sep 2008 19:44:17 +0000 (UTC)
Subject: rpms/kdegraphics/devel kdegraphics.spec, 1.167, 1.168 sources, 1.55,
	1.56
Message-ID: <20080926194417.42F657010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21075

Modified Files:
	kdegraphics.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- kdegraphics.spec	18 Sep 2008 12:31:58 -0000	1.167
+++ kdegraphics.spec	26 Sep 2008 19:43:46 -0000	1.168
@@ -1,10 +1,11 @@
+
 %if 0%{?fedora} < 10
 %define omit_kde3_conflicts 1
 %endif
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.1.1
+Version:        4.1.2
 Release:        1%{?dist}
 
 Name:           kdegraphics
@@ -184,6 +185,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	29 Aug 2008 15:55:13 -0000	1.55
+++ sources	26 Sep 2008 19:43:46 -0000	1.56
@@ -1 +0,0 @@
-e5475d37dc0a12b6ce7e6dbebceb9340  kdegraphics-4.1.1.tar.bz2



From rdieter at fedoraproject.org  Fri Sep 26 19:44:40 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 26 Sep 2008 19:44:40 +0000 (UTC)
Subject: rpms/kdebase/devel .cvsignore, 1.78, 1.79 kdebase.spec, 1.341,
	1.342 sources, 1.101, 1.102 kdebase-4.1.1-bookmark-silent.patch,
	1.1, NONE
Message-ID: <20080926194440.C6C6B7013D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21149

Modified Files:
	.cvsignore kdebase.spec sources 
Removed Files:
	kdebase-4.1.1-bookmark-silent.patch 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- .cvsignore	29 Aug 2008 13:11:37 -0000	1.78
+++ .cvsignore	26 Sep 2008 19:44:10 -0000	1.79
@@ -1,3 +1 @@
-kdebase-4.0.99.tar.bz2
-kdebase-4.1.0.tar.bz2
-kdebase-4.1.1.tar.bz2
+kdebase-4.1.2.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- kdebase.spec	18 Sep 2008 15:18:25 -0000	1.341
+++ kdebase.spec	26 Sep 2008 19:44:10 -0000	1.342
@@ -1,6 +1,7 @@
+
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.1.1
-Release: 2%{?dist}
+Version: 4.1.2
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -26,7 +27,6 @@
 
 # fedora specific nsplugins paths
 Patch1:   kdebase-nsplugins-paths.patch
-Patch2:   kdebase-4.1.1-bookmark-silent.patch
 
 ## upstream patches
 
@@ -125,7 +125,6 @@
 %prep
 %setup -q -n kdebase-%{version}
 %patch1 -p0 -b .nsplugins-paths
-%patch2 -p1 -b .silent
 
 # 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
@@ -306,6 +305,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Thu Sep 18 2008 Than Ngo <than at redhat.com> 4.1.1-2
 - make bookmark silent
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- sources	29 Aug 2008 13:11:37 -0000	1.101
+++ sources	26 Sep 2008 19:44:10 -0000	1.102
@@ -1 +1 @@
-33ab20f61aa33ed473fec710ad250ac7  kdebase-4.1.1.tar.bz2
+705dc8a416cf472d04b9dc39d44652c6  kdebase-4.1.2.tar.bz2


--- kdebase-4.1.1-bookmark-silent.patch DELETED ---



From mclasen at fedoraproject.org  Fri Sep 26 19:53:15 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 26 Sep 2008 19:53:15 +0000 (UTC)
Subject: rpms/gnome-applets/devel mount-auth.patch, NONE,
	1.1 gnome-applets.spec, 1.300, 1.301
Message-ID: <20080926195316.0272D7010C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22992

Modified Files:
	gnome-applets.spec 
Added Files:
	mount-auth.patch 
Log Message:
small improvement to the drive mount applet


mount-auth.patch:

--- NEW FILE mount-auth.patch ---
diff -up gnome-applets-2.24.0.1/drivemount/drive-button.c.mount-auth gnome-applets-2.24.0.1/drivemount/drive-button.c
--- gnome-applets-2.24.0.1/drivemount/drive-button.c.mount-auth	2008-09-26 15:37:51.000000000 -0400
+++ gnome-applets-2.24.0.1/drivemount/drive-button.c	2008-09-26 15:39:15.000000000 -0400
@@ -748,8 +748,10 @@ static void
 mount_drive (DriveButton *self, GtkWidget *item)
 {
     if (self->volume) {
+        GMountOperation *mount_op = gtk_mount_operation_new (NULL);
 	g_volume_mount (self->volume, G_MOUNT_MOUNT_NONE,
-			NULL, NULL, NULL, NULL);
+			mount_op, NULL, NULL, NULL);
+        g_object_unref (mount_op);
     } else {
 	g_return_if_reached();
     }


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- gnome-applets.spec	24 Sep 2008 20:31:07 -0000	1.300
+++ gnome-applets.spec	26 Sep 2008 19:52:45 -0000	1.301
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.24.0.1
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -64,6 +64,9 @@
 # do the nullapplet dance for battstat
 Patch40:	gnome-applets-null-battstat.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=553996
+Patch41:        mount-auth.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -149,6 +152,7 @@
 %patch33 -p1 -b .node-leak
 %patch39 -p1 -b .gweather-network
 %patch40 -p1 -b .battstat-null
+%patch41 -p1 -b .mount-auth
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -308,6 +312,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Fri Sep 26 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0.1-3
+- Small improvement to the drivemount applet
+
 * Wed Sep 24 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0.1-2
 - Update to 2.24.0.1
 



From spot at fedoraproject.org  Fri Sep 26 20:04:48 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 26 Sep 2008 20:04:48 +0000 (UTC)
Subject: rpms/amanith/devel amanith-0.3-nothirdpartystatic.patch, 1.1,
	1.2 amanith-0.3-system-freetype.patch, 1.1, 1.2
Message-ID: <20080926200448.2E53A7010C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/amanith/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24585

Modified Files:
	amanith-0.3-nothirdpartystatic.patch 
	amanith-0.3-system-freetype.patch 
Log Message:
fix patches to apply cleanly

amanith-0.3-nothirdpartystatic.patch:

Index: amanith-0.3-nothirdpartystatic.patch
===================================================================
RCS file: /cvs/pkgs/rpms/amanith/devel/amanith-0.3-nothirdpartystatic.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amanith-0.3-nothirdpartystatic.patch	20 Dec 2007 19:48:24 -0000	1.1
+++ amanith-0.3-nothirdpartystatic.patch	26 Sep 2008 20:04:17 -0000	1.2
@@ -30,11 +30,10 @@
  win32: {
  
      !contains(DEFINES, WIN32_MINGW) {
---- amanith/plugins/fonts/build.conf.BAD	2007-05-26 18:04:44.000000000 -0500
-+++ amanith/plugins/fonts/build.conf	2007-05-26 18:05:08.000000000 -0500
-@@ -38,9 +38,9 @@ contains(DEFINES, _FONTS_PLUGIN) {
- # take into account compilation mode (debug or release)
- DEFINES -= FT_DEBUG_LEVEL_ERROR FT_DEBUG_LEVEL_TRACE
+diff -up amanith/plugins/fonts/build.conf.orig amanith/plugins/fonts/build.conf
+--- amanith/plugins/fonts/build.conf.orig	2005-09-26 04:18:52.000000000 -0400
++++ amanith/plugins/fonts/build.conf	2008-09-26 15:52:14.000000000 -0400
+@@ -40,7 +40,7 @@ DEFINES -= FT_DEBUG_LEVEL_ERROR FT_DEBUG
  
  INCLUDEPATH += $$(AMANITHDIR)/3rdpart/freetype2/include
  
@@ -43,3 +42,10 @@
  win32: {
  
      !contains(DEFINES, WIN32_MINGW) {
+@@ -51,4 +51,4 @@ win32: {
+     contains(DEFINES, WIN32_MINGW) {
+         LIBS += $$(AMANITHDIR)/lib/libfreetype2.a $$(AMANITHDIR)/lib/libzlib.a
+     }
+-}
+\ No newline at end of file
++}

amanith-0.3-system-freetype.patch:

Index: amanith-0.3-system-freetype.patch
===================================================================
RCS file: /cvs/pkgs/rpms/amanith/devel/amanith-0.3-system-freetype.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amanith-0.3-system-freetype.patch	20 Dec 2007 19:48:24 -0000	1.1
+++ amanith-0.3-system-freetype.patch	26 Sep 2008 20:04:17 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up amanith/plugins/fonts/build.conf.BAD amanith/plugins/fonts/build.conf
---- amanith/plugins/fonts/build.conf.BAD	2007-11-15 10:18:43.000000000 -0500
-+++ amanith/plugins/fonts/build.conf	2007-11-15 10:19:10.000000000 -0500
+diff -up amanith/plugins/fonts/build.conf.orig amanith/plugins/fonts/build.conf
+--- amanith/plugins/fonts/build.conf.orig	2008-09-26 15:53:06.000000000 -0400
++++ amanith/plugins/fonts/build.conf	2008-09-26 15:54:22.000000000 -0400
 @@ -38,7 +38,7 @@ contains(DEFINES, _FONTS_PLUGIN) {
  # take into account compilation mode (debug or release)
  DEFINES -= FT_DEBUG_LEVEL_ERROR FT_DEBUG_LEVEL_TRACE
@@ -10,10 +10,3 @@
  
  unix: LIBS += -lfreetype -lz
  win32: {
-@@ -51,4 +51,4 @@ win32: {
-     contains(DEFINES, WIN32_MINGW) {
-         LIBS += $$(AMANITHDIR)/lib/libfreetype2.a $$(AMANITHDIR)/lib/libzlib.a
-     }
--}
-\ No newline at end of file
-+}



From nsantos at fedoraproject.org  Fri Sep 26 20:09:29 2008
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 26 Sep 2008 20:09:29 +0000 (UTC)
Subject: rpms/qpidc/F-9 .cvsignore, 1.6, 1.7 qpidc.spec, 1.32, 1.33 sources, 
	1.20, 1.21
Message-ID: <20080926200929.5C6B17010C@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25263

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
rebased to svn rev 693548


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Jul 2008 18:28:13 -0000	1.6
+++ .cvsignore	26 Sep 2008 20:08:59 -0000	1.7
@@ -1 +1 @@
-qpidc-0.2.667603.tar.gz
+qpidc-0.3.693548.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-9/qpidc.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- qpidc.spec	7 Jul 2008 15:38:53 -0000	1.32
+++ qpidc.spec	26 Sep 2008 20:08:59 -0000	1.33
@@ -4,14 +4,17 @@
 # svn revision: $Rev: 654927 $
 #
 %define qpidd qpidd
-%define svnrev 667603
+%define qmf qmf
+%define svnrev 693548
+
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           qpidc
-Version:        0.2.%{svnrev}
-Release:        2%{?dist}
+Version: 	0.3.%{?svnrev}
+Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
-License:        Apache Software License
+License:        ASL 2.0
 URL:            http://rhm.et.redhat.com/qpidc
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,12 +22,12 @@
 ExclusiveArch: i386 i686 x86_64
 
 BuildRequires: boost-devel
-BuildRequires: cppunit-devel
 BuildRequires: doxygen
 BuildRequires: e2fsprogs-devel
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: ruby
+BuildRequires: python
 
 Requires: boost
 
@@ -82,6 +85,22 @@
 Libraries and header files for developing extensions to the
 Qpid broker daemon.
 
+%package -n %{qmf}
+Summary: The QPID Management Framework
+Group: System Environment/Daemons
+Requires: %name = %version-%release
+
+%description -n %{qmf}
+An extensible managememt framework layered on QPID messaging.
+
+%package -n %{qmf}-devel
+Summary: Header files and tools for developing QMF extensions
+Group: Development/System
+Requires: %{qmf} = %version-%release
+
+%description -n %{qmf}-devel
+Header files and code-generation tools needed for developers of QMF-managed components.
+
 %package perftest
 Summary: Simple benchmarking tools
 Group: System Environment/Tools
@@ -93,13 +112,18 @@
 %pre
 getent group qpidd >/dev/null || groupadd -r qpidd
 getent passwd qpidd >/dev/null || \
-  useradd -r -m -g qpidd -d %{_localstatedir}/lib/qpidd -s /sbin/nologin \
+  useradd -r -M -g qpidd -d %{_localstatedir}/lib/qpidd -s /sbin/nologin \
     -c "Owner of Qpidd Daemons" qpidd
 exit 0
 
 %prep
 %setup -q
 
+%define perftests "perftest topic_listener topic_publisher latencytest \
+  client_test fanout_perftest multiq_perftest python_tests quick_perftest \
+  quick_topictest run_federation_tests run_perftest run_test run-unit-tests \
+  shared_perftest start_broker stop_broker topic_perftest topictest txtest"
+
 %build
 CXXFLAGS="%{optflags} -DNDEBUG -O3" \
 %configure --disable-static --without-cpg --without-graphviz --without-help2man
@@ -108,7 +132,9 @@
 rm docs/api/html/installdox
 # Make perftest utilities
 pushd src/tests
-make perftest topic_listener topic_publisher latencytest
+for ptest in %{perftests}; do
+  make $ptest
+done
 popd
 
 %install
@@ -121,10 +147,9 @@
 install -d -m0755 %{buildroot}/var/run/qpidd
 # Install perftest utilities
 pushd %{_builddir}/%{name}-%{version}/src/tests/
-libtool --mode=install install -m755 perftest %{buildroot}/%_bindir
-libtool --mode=install install -m755 topic_listener %{buildroot}/%_bindir
-libtool --mode=install install -m755 topic_publisher %{buildroot}/%_bindir
-libtool --mode=install install -m755 latencytest %{buildroot}/%_bindir
+for ptest in %{perftests}; do
+  libtool --mode=install install -m755 $ptest %{buildroot}/%_bindir
+done
 popd
 rm -f %{buildroot}%_libdir/*.a
 rm -f %{buildroot}%_libdir/*.l
@@ -155,10 +180,9 @@
 %_includedir/qpid/sys
 %_includedir/qpid/log
 %_includedir/qpid/management
+%_includedir/qpid/agent
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
-%_bindir/managementgen
-%_datadir/managementgen
 %doc docs/api/html
 
 %files -n %{qpidd}
@@ -167,6 +191,8 @@
 %_libdir/libqpidbroker.so.0.1.0
 %_libdir/libqpidcluster.so.0
 %_libdir/libqpidcluster.so.0.1.0
+%_libdir/libqpidacl.so.0
+%_libdir/libqpidacl.so.0.1.0
 %_sbindir/%{qpidd}
 %config(noreplace) %_sysconfdir/qpidd.conf
 %config(noreplace) %_sysconfdir/sasl2/qpidd.conf
@@ -179,17 +205,46 @@
 
 %files -n %{qpidd}-devel
 %defattr(-,root,root,-)
-%doc rpm/README.qpidd-devel
+#%doc rpm/README.qpidd-devel
 %defattr(-,root,root,-)
 %_libdir/libqpidbroker.so
 %_libdir/libqpidcluster.so
+%_libdir/libqpidacl.so
 %_includedir/qpid/broker
 
+%files -n %{qmf}
+%defattr(-,root,root,-)
+%_libdir/libqmfagent.so.0
+%_libdir/libqmfagent.so.0.1.0
+
+%files -n %{qmf}-devel
+%defattr(-,root,root,-)
+%_libdir/libqmfagent.so
+%_bindir/qmf-gen
+%{python_sitelib}/qmf
+
 %files perftest
+%defattr(755,root,root,-)
 %_bindir/perftest
 %_bindir/topic_listener
 %_bindir/topic_publisher
 %_bindir/latencytest
+%_bindir/client_test
+%_bindir/fanout_perftest
+%_bindir/multiq_perftest
+%_bindir/python_tests
+%_bindir/quick_perftest
+%_bindir/quick_topictest
+%_bindir/run-unit-tests
+%_bindir/run_federation_tests
+%_bindir/run_perftest
+%_bindir/run_test
+%_bindir/shared_perftest
+%_bindir/start_broker
+%_bindir/stop_broker
+%_bindir/topic_perftest
+%_bindir/topictest
+%_bindir/txtest
 
 %post -p /sbin/ldconfig
 
@@ -214,8 +269,28 @@
 /sbin/ldconfig
 
 %changelog
-* Tue Jul  7 2008 Nuno Santos <nsantos at redhat.com> - 0.2.667603-2
-- MRG GA release
+* Tue Sep  9 2008 Nuno Santos <nsantos at redhat.com> - 0.3.693548-1
+- Include latest changes to qmf
+
+* Mon Sep  8 2008 Nuno Santos <nsantos at redhat.com> - 0.3.693140-1
+- Update for Fedora 10
+
+* Wed Aug 21 2008 Justin Ross <jross at redhat.com> - 0.2.687156-1
+- Update to source revision 687156 of the qpid.0-10 branch
+
+* Wed Aug 14 2008 Justin Ross <jross at redhat.com> - 0.2.685273-1
+- Update to source revision 685273 of the qpid.0-10 branch
+
+* Wed Aug  6 2008 Justin Ross <jross at redhat.com> - 0.2.683301-1
+- Update to source revision 683301 of the qpid.0-10 branch
+
+* Thu Jul 15 2008 Justin Ross <jross at redhat.com> - 0.2.676581-1
+- Update to source revision 676581 of the qpid.0-10 branch
+- Work around home dir creation problem
+- Use a license string that rpmlint likes
+
+* Thu Jul 10 2008 Nuno Santos <nsantos at redhat.com> - 0.2.667603-3
+- BZ453818: added additional tests to -perftest
 
 * Thu Jun 13 2008 Justin Ross <jross at redhat.com> - 0.2.667603-1
 - Update to source revision 667603


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	1 Jul 2008 18:28:13 -0000	1.20
+++ sources	26 Sep 2008 20:08:59 -0000	1.21
@@ -1 +1 @@
-74a880e77e1b59bea07519a1601affb4  qpidc-0.2.667603.tar.gz
+ec77ffb74ed8ac0e26ddb7b5017e17e5  qpidc-0.3.693548.tar.gz



From rstrode at fedoraproject.org  Fri Sep 26 20:12:29 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 26 Sep 2008 20:12:29 +0000 (UTC)
Subject: rpms/gnome-session/devel gnome-session.spec,1.199,1.200
Message-ID: <20080926201229.DF91D7010C@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25736

Modified Files:
	gnome-session.spec 
Log Message:
- Make the new xsession subpackage require the version of
  gnome-session it's built against



Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- gnome-session.spec	25 Sep 2008 18:21:27 -0000	1.199
+++ gnome-session.spec	26 Sep 2008 20:11:59 -0000	1.200
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.24.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.24/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -75,7 +75,7 @@
 %package xsession
 Summary: gnome-session desktop file
 Group: User Interface/Desktop
-Requires: gnome-session
+Requires: gnome-session = %{version}-%{release}
 
 %description xsession
 Desktop file to add GNOME to display manager session menu.
@@ -185,6 +185,10 @@
 
 
 %changelog
+* Fri Sep 26 2008 Ray Strode  <rstrode at redhat.com> - 2.24.0-4
+- Make the new xsession subpackage require the version of
+  gnome-session it's built against
+
 * Thu Sep 25 2008 Ray Strode  <rstrode at redhat.com> - 2.24.0-3
 - Split gnome-session.desktop off into subpackage
 



From andyp at fedoraproject.org  Fri Sep 26 20:15:03 2008
From: andyp at fedoraproject.org (Andrew Price)
Date: Fri, 26 Sep 2008 20:15:03 +0000 (UTC)
Subject: rpms/pybackpack/devel .cvsignore, 1.4, 1.5 import.log, 1.1,
	1.2 pybackpack.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20080926201503.7074D7010C@cvs1.fedora.phx.redhat.com>

Author: andyp

Update of /cvs/pkgs/rpms/pybackpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26167/devel

Modified Files:
	.cvsignore import.log pybackpack.spec sources 
Log Message:
Import new release 0.5.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pybackpack/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Sep 2008 00:16:34 -0000	1.4
+++ .cvsignore	26 Sep 2008 20:14:32 -0000	1.5
@@ -1 +1 @@
-pybackpack-0.5.5.tar.gz
+pybackpack-0.5.6.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pybackpack/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Sep 2008 00:16:35 -0000	1.1
+++ import.log	26 Sep 2008 20:14:33 -0000	1.2
@@ -1 +1,2 @@
 pybackpack-0_5_5-1_fc9:HEAD:pybackpack-0.5.5-1.fc9.src.rpm:1221005806
+pybackpack-0_5_6-1_fc9:HEAD:pybackpack-0.5.6-1.fc9.src.rpm:1222459966


Index: pybackpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pybackpack/devel/pybackpack.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pybackpack.spec	10 Sep 2008 00:16:35 -0000	1.5
+++ pybackpack.spec	26 Sep 2008 20:14:33 -0000	1.6
@@ -3,7 +3,7 @@
 
 Summary: User oriented backup and restore application
 Name: pybackpack
-Version: 0.5.5
+Version: 0.5.6
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Archiving
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel
 BuildRequires: desktop-file-utils
+BuildRequires: gettext
 Requires: pygtk2 >= %{pygtk2_version}
 Requires: gnome-python2-nautilus-cd-burner
 Requires: rdiff-backup >= 1.0
@@ -34,6 +35,7 @@
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --delete-original \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -42,8 +44,7 @@
 
 #%postun
 
-#%files -f %{name}.lang
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING CHANGELOG INSTALL
 %dir %{python_sitelib}/pybackpack
@@ -57,6 +58,9 @@
 %endif
 
 %changelog
+* Fri Sep 26 2008 Andy Price <andy at andrewprice.me.uk> - 0.5.6-1
+- Updated RPM to 0.5.6
+- Spec updated to handle installation of translations
 * Wed Sep 10 2008 Andy Price <andy at andrewprice.me.uk> - 0.5.5-1
 - Updated RPM to 0.5.5
 * Tue Jan 01 2008 Andy Price <andy at andrewprice.me.uk> - 0.5.4-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pybackpack/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Sep 2008 00:16:35 -0000	1.4
+++ sources	26 Sep 2008 20:14:33 -0000	1.5
@@ -1 +1 @@
-e7f8409a82c49071fc11d611347de910  pybackpack-0.5.5.tar.gz
+63d787dd207b150e0c258f7fe50f0477  pybackpack-0.5.6.tar.gz



From ehabkost at fedoraproject.org  Fri Sep 26 20:43:11 2008
From: ehabkost at fedoraproject.org (Eduardo Habkost)
Date: Fri, 26 Sep 2008 20:43:11 +0000 (UTC)
Subject: rpms/kvm/F-8 kvm.spec,1.35,1.35.2.1
Message-ID: <20080926204311.AADB07010C@cvs1.fedora.phx.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kvm/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30010

Modified Files:
      Tag: private-ehabkost-no_pcbios_binaries-branch
	kvm.spec 
Log Message:
Build _all_ qemu/pc-bios binaries from source




Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/F-8/kvm.spec,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -u -r1.35 -r1.35.2.1
--- kvm.spec	27 May 2008 13:28:11 -0000	1.35
+++ kvm.spec	26 Sep 2008 20:42:41 -0000	1.35.2.1
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 60
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://%{name}.sf.net
@@ -30,6 +30,9 @@
 ExclusiveArch: %{ix86} x86_64
 Requires: initscripts >= 8.08-1
 
+# We use the roms on /usr/share/etherboot
+Requires: etherboot-roms-kvm
+
 %description
 KVM (for Kernel-based Virtual Machine) is a full virtualization solution
 for Linux on x86 hardware.
@@ -45,12 +48,23 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+# we must not use any of the binaries from the qemu/pc-bios/ directory,
+# as they don't have the corresponding sources shipped with them
+rm -f qemu/pc-bios/*
+
 
 %build
 # we need to install the data bits in a different path
 sed -i 's/datasuffix=\"\/share\/qemu\"/datasuffix=\"\/share\/kvm\"/' qemu/configure
 ./configure --with-patched-kernel --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix} --qemu-ldflags="-Wl,--build-id" --enable-alsa
 
+# build the bios, and fix it's makefile
+sed -i 's/gcc -m32/gcc/' bios/Makefile
+make bios
+
+# build the vgabios
+make vgabios
+
 # we can't use RPM_OPT_FLAGS for the same reasons as qemu (#208026) for the
 # qemu bits.  so let's set it for the other pieces.  this requires some
 # manual keeping up of what is in the kvm tree.
@@ -58,10 +72,6 @@
 echo "CFLAGS=$RPM_OPT_FLAGS" >> user/config.mak
 make %{?_smp_mflags}
 
-# build the bios, and fix it's makefile
-sed -i 's/gcc -m32/gcc/' bios/Makefile
-make bios
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -87,6 +97,20 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules
 install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules
 
+
+# the pxe etherboot images will be symlinks to the images on
+# /usr/share/etherboot
+
+pxe_link() {
+  ln -s ../etherboot/$2.rom %{buildroot}/usr/share/kvm/pxe-$1.bin
+}
+
+pxe_link e1000 e1000-82542
+pxe_link ne2k_pci ne
+pxe_link pcnet pcnet32
+pxe_link rtl8139 rtl8139
+pxe_link virtio-net virtio-net
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -99,6 +123,9 @@
 %{_sysconfdir}/sysconfig/modules/%{name}.modules
 
 %changelog
+* Fri Sep 26 2008 Eduardo Habkost <ehabkost at redhat.com> - 60.7.fc10
+- Build _all_ qemu/pc-bios/ binaries from source
+
 * Tue May 27 2008 Glauber Costa <gcosta at redhat.com> - 60-6.fc8
 - Fix Cirrus heap overflow vulnerability (#448524)
 



From ehabkost at fedoraproject.org  Fri Sep 26 20:50:59 2008
From: ehabkost at fedoraproject.org (Eduardo Habkost)
Date: Fri, 26 Sep 2008 20:50:59 +0000 (UTC)
Subject: rpms/kvm/F-8 kvm.spec,1.35.2.1,1.35.2.2
Message-ID: <20080926205059.3C0407010C@cvs1.fedora.phx.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kvm/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31003

Modified Files:
      Tag: private-ehabkost-no_pcbios_binaries-branch
	kvm.spec 
Log Message:
Add suffix to release




Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/F-8/kvm.spec,v
retrieving revision 1.35.2.1
retrieving revision 1.35.2.2
diff -u -r1.35.2.1 -r1.35.2.2
--- kvm.spec	26 Sep 2008 20:42:41 -0000	1.35.2.1
+++ kvm.spec	26 Sep 2008 20:50:28 -0000	1.35.2.2
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 60
-Release: 7%{?dist}
+Release: 7%{?dist}.test_nobinaries
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://%{name}.sf.net



From orion at fedoraproject.org  Fri Sep 26 20:51:54 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 26 Sep 2008 20:51:54 +0000 (UTC)
Subject: rpms/hdf5/devel hdf5-1.8.1-filter-as-option.patch, NONE,
	1.1 hdf5.spec, 1.31, 1.32
Message-ID: <20080926205154.A7E187010C@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/hdf5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31189

Modified Files:
	hdf5.spec 
Added Files:
	hdf5-1.8.1-filter-as-option.patch 
Log Message:
* Fri Sep 26 2008 Orion Poplawski <orion at cora.nwra.com> 1.8.1-2
- Add patch to filter -little as option used on sh arch (#464052)
 
* Thu Jun 5 2008 Orion Poplawski <orion at cora.nwra.com> 1.8.1-1
- Update to 1.8.1


hdf5-1.8.1-filter-as-option.patch:

--- NEW FILE hdf5-1.8.1-filter-as-option.patch ---
--- hdf5-1.8.1/configure.filter-as-option	2008-05-29 10:39:04.000000000 -0600
+++ hdf5-1.8.1/configure	2008-09-26 14:49:26.000000000 -0600
@@ -4929,7 +4929,7 @@
 
           ;;
           # Ignore these flags.
-        -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*)
+        -little | -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*)
           ;;
         -lkernel32)
           test x"$CYGWIN" != xyes && ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg"


Index: hdf5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/devel/hdf5.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- hdf5.spec	5 Jun 2008 20:36:55 -0000	1.31
+++ hdf5.spec	26 Sep 2008 20:51:24 -0000	1.32
@@ -1,6 +1,6 @@
 Name: hdf5
 Version: 1.8.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
@@ -13,6 +13,7 @@
 Patch3: hdf5-1.8.0-multiarch.patch
 Patch4: hdf5-1.8.0-scaleoffset.patch
 Patch5: hdf5-1.8.0-longdouble.patch
+Patch6: hdf5-1.8.1-filter-as-option.patch
 Patch10: hdf5-1.6.5-open.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
@@ -54,6 +55,7 @@
 %ifarch ppc64
 %patch5 -p1 -b .longdouble
 %endif
+%patch6 -p1 -b .filter-as-option
 %patch10 -p1 -b .open
 
 
@@ -160,6 +162,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Orion Poplawski <orion at cora.nwra.com> 1.8.1-2
+- Add patch to filter -little as option used on sh arch (#464052)
+ 
 * Thu Jun 5 2008 Orion Poplawski <orion at cora.nwra.com> 1.8.1-1
 - Update to 1.8.1
 



From nsantos at fedoraproject.org  Fri Sep 26 20:52:41 2008
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 26 Sep 2008 20:52:41 +0000 (UTC)
Subject: rpms/rhm/F-8 .cvsignore,1.5,1.6 rhm.spec,1.12,1.13 sources,1.8,1.9
Message-ID: <20080926205241.737617010C@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/rhm/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31493

Modified Files:
	.cvsignore rhm.spec sources 
Log Message:
rebase to svn rev 2432


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rhm/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Jul 2008 19:50:50 -0000	1.5
+++ .cvsignore	26 Sep 2008 20:52:11 -0000	1.6
@@ -1 +1 @@
-rhm-0.2.2153.tar.gz
+rhm-0.2.2432.tar.gz


Index: rhm.spec
===================================================================
RCS file: /cvs/extras/rpms/rhm/F-8/rhm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rhm.spec	15 Jul 2008 21:21:36 -0000	1.12
+++ rhm.spec	26 Sep 2008 20:52:11 -0000	1.13
@@ -2,15 +2,16 @@
 # Spec file for Red Hat Messaging package rhm.
 #
 
-%define svnrev 2153
-# built against qpidc svn rev 667603
+%define svnrev 2432
+# built against qpidc svn rev 693140
+%define svnrev_qpid 693140
 
 Name:           rhm
 Version:        0.2.%{svnrev}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Red Hat persistence extension to the Qpid messaging system
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2+
 URL:            http://rhm.et.redhat.com
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,7 +25,7 @@
 BuildRequires: python
 BuildRequires: libtool
 
-Requires: qpidd >= 0.2.667603
+Requires: qpidd >= 0.3.%{svnrev_qpid}
 Requires: db4
 Requires: libaio
 
@@ -64,6 +65,12 @@
 
 
 %changelog
+* Tue Sep  9 2008 Nuno Santos <nsantos at redhat.com> - 0.2.2432-1
+- Update for Fedora 10
+
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.2153-3
+- fix license tag
+
 * Tue Jul 15 2008 Nuno Santos <nsantos at redhat.com> - 0.2.2153-2
 - BZ359461: fix package URL
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rhm/F-8/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Jul 2008 19:50:50 -0000	1.8
+++ sources	26 Sep 2008 20:52:11 -0000	1.9
@@ -1 +1 @@
-d7210b111bde8a0ddba10a09d9be5966  rhm-0.2.2153.tar.gz
+4a1d09e59c357a84d7b2d07ad08c2d99  rhm-0.2.2432.tar.gz



From pkgdb at fedoraproject.org  Fri Sep 26 20:54:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 26 Sep 2008 20:54:36 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20080926205437.0A225208D6F@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on kvm (Fedora devel) to Obsolete for katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Fri Sep 26 20:54:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 26 Sep 2008 20:54:38 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20080926205438.78289208DA4@bastion.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on kvm (Fedora devel) to Obsolete for katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Fri Sep 26 20:54:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 26 Sep 2008 20:54:41 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20080926205441.EA91E208DA8@bastion.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on kvm (Fedora 7) to Obsolete for katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Fri Sep 26 20:54:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 26 Sep 2008 20:54:47 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20080926205447.B699D208DAC@bastion.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on kvm (Fedora 8) to Obsolete for katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Fri Sep 26 20:54:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 26 Sep 2008 20:54:48 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20080926205448.8E71F208DAF@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on kvm (Fedora 8) to Obsolete for katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Fri Sep 26 20:54:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 26 Sep 2008 20:54:53 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20080926205453.A2593208DB3@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on kvm (Fedora 9) to Obsolete for katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Fri Sep 26 20:55:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 26 Sep 2008 20:55:25 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20080926205526.3B15E208DA2@bastion.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on kvm (Fedora 9) to Obsolete for katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Fri Sep 26 20:55:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 26 Sep 2008 20:55:28 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20080926205528.5DAED208DA7@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on kvm (Fedora 7) to Obsolete for katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Fri Sep 26 20:55:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 26 Sep 2008 20:55:53 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20080926205553.DD3F0208D6D@bastion.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on kvm (Fedora 9) to Obsolete for katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Fri Sep 26 20:55:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 26 Sep 2008 20:55:57 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20080926205557.E04D9208DA2@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on kvm (Fedora 7) to Obsolete for katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From sdake at fedoraproject.org  Fri Sep 26 21:02:45 2008
From: sdake at fedoraproject.org (Steven Dake)
Date: Fri, 26 Sep 2008 21:02:45 +0000 (UTC)
Subject: rpms/corosync/devel corosync.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20080926210245.1F92C7010C@cvs1.fedora.phx.redhat.com>

Author: sdake

Update of /cvs/pkgs/rpms/corosync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32473/devel

Modified Files:
	corosync.spec import.log 
Log Message:
Add conflicts so corosync wont conflict with older openais versions.



Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/corosync.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- corosync.spec	25 Sep 2008 06:16:38 -0000	1.1
+++ corosync.spec	26 Sep 2008 21:02:14 -0000	1.2
@@ -1,7 +1,7 @@
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
 Version: 0.92
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.openais.org
@@ -12,6 +12,7 @@
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
+Conflicts: openais <= 0.89, openais-devel <= 0.89
 
 %define ais_user_uid 39
 
@@ -148,6 +149,9 @@
 %{_mandir}/man8/logsys_overview.8*
 
 %changelog
+* Fri Sep 24 2008 Steven Dake <sdake at redhat.com> - 0.92-2
+- Add conflicts for openais and openais-devel packages older then 0.90.
+
 * Wed Sep 24 2008 Steven Dake <sdake at redhat.com> - 0.92-1
 - New upstream release corosync-0.92.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Sep 2008 06:16:38 -0000	1.1
+++ import.log	26 Sep 2008 21:02:14 -0000	1.2
@@ -1 +1,2 @@
 corosync-0_92-1_fc10:HEAD:corosync-0.92-1.fc10.src.rpm:1222323286
+corosync-0_92-2_fc10:HEAD:corosync-0.92-2.fc10.src.rpm:1222462910



From toshio at fedoraproject.org  Fri Sep 26 21:08:53 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri, 26 Sep 2008 21:08:53 +0000 (UTC)
Subject: rpms/trac-bazaar-plugin/devel trac-bzr-get-ancestry.patch, NONE,
	1.1 trac-bzr-no-repo.patch, NONE, 1.1 trac-bazaar-plugin.spec,
	1.5, 1.6 trac-bazaar-extra-return.patch, 1.2, NONE
Message-ID: <20080926210853.95BF27010C@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/trac-bazaar-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv928

Modified Files:
	trac-bazaar-plugin.spec 
Added Files:
	trac-bzr-get-ancestry.patch trac-bzr-no-repo.patch 
Removed Files:
	trac-bazaar-extra-return.patch 
Log Message:

* Fri Sep 26 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.2-7.20080925bzr49
- Patches to fix: lp:274609, lp:263300, lp:267700


trac-bzr-get-ancestry.patch:

--- NEW FILE trac-bzr-get-ancestry.patch ---
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: toshio at fedoraproject.org-20080926194447-\
#   p1clsut84zvu2kfo
# target_branch: bzr+ssh://toshio at bazaar.launchpad.net/%7Etrac-bzr-\
#   team/trac-bzr/trunk/
# testament_sha1: 53b461068e37868f49da2b65cedc34da8e8d5208
# timestamp: 2008-09-26 13:56:31 -0700
# base_revision_id: toshio at fedoraproject.org-20080926193207-\
#   a1bosfhjpm7hgpgw
# 
# Begin patch
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2008-09-26 17:34:32 +0000
+++ tracbzr/backend.py	2008-09-26 19:44:47 +0000
@@ -693,13 +693,12 @@
 
     def _merging_history(self):
         """Iterate through history revisions that merged changes to this node
-        
+
         This includes all revisions in which the revision_id changed.
         It may also include a few revisions in which the revision_id did not
         change, if the modification was subsequently undone.
         """
-        weave = self.tree._get_weave(self.entry.file_id)
-        file_ancestry = weave.get_ancestry(self.entry.revision)
+        file_ancestry = self.repo.get_ancestry(self.entry.revision)
         # Can't use None here, because it's a legitimate revision id.
         last_yielded = 'bogus:'
         for num, revision_id, depth, revno, eom in \

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQrz0HIAA/9fgAQQUWP//14I
FAC//9/wYAdcH3ypQaDY2bGAaDbZtsYaGgAAA0AAAAAYaGgAAA0AAAAAYaGgAAA0AAAAAJEhATJo
CnqPU9Jk/UmIGmmQ/VNAioQU2ESe0J6Yqn6aNqNDTUZRpp6mCSgCZNMkankp6mNJkam0g9QAaQX7
NmOufI1MtiPLQ0KiRbucjaq0EIaRamF3DCT1OCiODEuMeFcPkUUanPGldvruFaeK18RfQ3DGwbPS
gGkplQZQsmSJQQDhwcoywYbfF+My/OVTxTmyze/PYrVXcWSmuTIRpKmlC/U7PKHM1pjYa9KSB4Va
TF+qY21y/enw7O3tyPqui95yLDOfN3Pind/bbPnKXQAjCOS7+4YRQluvRXgxrOXtxdo64d5QGgVw
dp5LRTywbwnHZAfES6fjtmnNXDsoZeFgZDBUmGg1w929vHGvsfd6oGNXjGMIRv0DugMYLY7MTdvh
ukgbBiJepAa7xCJGB37QKCilIayQrMtSQVKpkqjEkc5jaNtXUiLSQqiSNChA6e84CsamhDVaK3X5
xymvYsUYzIJoboJiwDSRzGmgin5VCR2oRQqXMyEEOGJfYUipceFtMBNNTtBCJJadcHa0ETMdpxDc
V0uZ9CKllukjyLXJkB97oPQoLnVmVfAHPzJjTIUurIiJpXOpIudCQjUqPEwzuMqLge0gczqUMyBM
sSBjpMb8TIIFhqJkgiFTQhDJwhwrFRpS4oibcYZqpnATZPLH2CYNRM5WMDTAniGisQw1vgJ9TTOp
kdtA1HLBO5UgUJlZne2cym8fDjM1G4uLjImMg2HQW4Ve8gZIzYDDmkjhjR5DSS4GxqXwUXAtkUO7
jW8i+EnCYK0Occyo2qUSbRpIvcQ5ZHM1KSLHLQ1AeONjgPxSvjlgTigknmZBzWClM6CpIjrQeWOT
FEHrI1GGDQgRC/0B5riYxIWlUJtmxGjSzCo8iWMGo081SbAzVWAxGwDiqNaE86XD7oXa4Z5zIHVg
hvO11eTUMiVLAiWkQiEdzQ2dDMbWpb1JVKFIZN1JqZRsMRCuuFMwYwabGenXryKqSUWquwvgggRC
Bov7J4tjOplpnZzE60QNHyS7CZ1GGfeFWZ3hI+/yNvI8ztgUmrQ5Ovd5uKiD6iI7ZwF0S3U/07NA
WwRdmoAvvgMe6doPRqs5+JyMS0yImJpGg3nIg4UGBibzItXX2JocSJfN3qfbtIBoMy87zh82B1YQ
uVskxZCwF8KJCh8a4Ku5qQsrCo3PiKAoARGrc4KFhJxMj9TMg7sjxmIULdvb5YNmnaLh5g9Pd/Uz
IEDEY9TzPAkbDjc4X0MJcxTNGKqwnoMjqdCG20teX/CF8Pvv0aXELg36hiQwHgFYyrIfgYNiHSKB
/8A147XEe2ysAquGdC4MMmDKxR8K1k8eAQwDI4nA7zIpMTI4n3IGZen6Eadyb1+DyP93Jv8BiB9+
rNigFY3BZN3K/BnV0D2Xon6fJc0ymGO4TkGvQskXes07ad3sJmxAn3B5wDY3i5e2NI+qdmlfeYby
hCz5l+fBmZOKLtUbPq1R9tk6QF1MSXQR+TEMK16eIkgwgPqNuCFdgH9vQfNfr1CwlmyGwebU3c17
I9qxGMFmGxxa3CDQ3p1iIRmGNy5I4CLKgc4QUYk7UukTA2pwNCFD6MSb/F56NIfgZyjQDCCsEO98
t0JOMZnXPH4CNAjxxMNJAFqqcpwpUfloLiABQhmIyQDDStrOL8L+2IjJPteW7t+8Yt2xgcHg8AJT
p+ahDevRcXE7YppyEbW0CCa3AS4LxokYmgjBCBRpQ7gixEa2bMLinKoAqcQUbpr/JNMJgh4ZoA9w
roZPAbyELvL6SAMtwqywTYh2NJpptNcSTWwVakpjBhtHqOHT51xlWsE0pFF3qMEiaANtOosFJibN
A9wN9RdIMpL5mpPyWrEkNTzYWyqqCvEzPELOqo5DKEU+auFEwJ5WE5BkpINFmmDF6rmfYHtTIUEE
J4Lvs4EiySbvu3zFgwMZnk6icTAT0HnyTxHi0tun9uqI0nmtYaBIt8IKUZ0SF68hHqLslvLuEMiI
ipAdwG6LkJg0QhhfRUXgI2LQfmL/i7kinChIBXnoOQA=

trac-bzr-no-repo.patch:

--- NEW FILE trac-bzr-no-repo.patch ---
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: toshio at fedoraproject.org-20080926193207-\
#   a1bosfhjpm7hgpgw
# target_branch: bzr+ssh://toshio at bazaar.launchpad.net/%7Etrac-bzr-\
#   team/trac-bzr/trunk/
# testament_sha1: 0fc78cc950867e4ff69212179ba985319da19ccc
# timestamp: 2008-09-26 13:55:31 -0700
# base_revision_id: jelmer at samba.org-20080831143707-uh5nrs0ld4eg235t
# 
# Begin patch
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2008-08-21 10:24:43 +0000
+++ tracbzr/backend.py	2008-09-26 17:34:32 +0000
@@ -133,6 +133,7 @@
     def __init__(self, location, log):
         versioncontrol.Repository.__init__(self, location, None, log)
         self.root_transport = transport.get_transport(location)
+        self.repo = bzrdir.BzrDir.open_from_transport(self.root_transport).open_repository()
         self._tree_cache = {}
         self._locked_branches = []
         self._branch_cache = {}
@@ -237,7 +238,6 @@
         revid = urllib.unquote(rev)
         if revid in ('current:', 'null:'):
             return None, revid
-        return None, revid
         if self.repo.has_revision(revid):
             return None, revid
 

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUYC7ksAAoFfgAQQUWP//14I
FAC//9/wUAV4vWwCpaIhoKpCSSnqeqemRHqbBoptCehNNGgDQYYaGgAAA0AAAAAJEhDSYkxT2qY1
A9QeoPU0NPUb1T0hhoaAAADQAAAAAkoCNNNBMgamTJlPEk2JAHqekbMcu29n60NDbv3RtLRQmlkN
b3jqcTW9gZ/S3tmRg5U67lZ+DHMPtsba6UDSU7FjCxZJtZhrPDIr75UeA5u7Z+9ZUvtkpLTSVdVn
5n4phpZA8oCKy/nl3+2Y4FZX2w0PraT7bDHsuEPf1E9pjEHI1mZp/HK7Kd0CoEbTV1CPPaazjAXd
BjDJz6chnbBcxMQnrmfgiWBdA8zikd9uDnRkVbDMUa2HUUoE9xDdcOxXlhZBcpBMVZAiaVyaFbNW
xBy2i++CCbcYWDzZ8XQFbiUORcX/Z8CZYxkTRNoJl42Iwmgt/H3PORAJXEyEEplhicrRGyszSQ0c
GNRmM6i4mZfA+UFdhkhcaObMXMxj5Daiu8W3GCCoLo3ZkUFo4TC0nIWY9pjskbSq0sGG6Q4taoki
JQfNqBoqFarIlTISPuHYGrUsBSQY23NbwChfOrpQxHEdRW9xDoSyM9cSJqMxhkcBYi1MITYMwQmD
ybpFpmF5Iw1U2W0ETwmSSgwpRBEjsKTLzZbghprPkKXX3A4rBEx7UquRUQkYTJherTAkTDDkY5Yg
GF4Q5sLiDMyGcSliuL2AxakOJLIUIG8PYWF/RyR7jBbrz3KwbfUOKxCgOTD1cWzkegkWEEmTsIJl
Fkkr7xTxYxjb6cdfYWUkRU1XVhKBMNXHKjfB17hUTGvsHEsJ9PBDefWG+aYW2czEIi9UD/HKAtYZ
EKlkYQbJhFVTA55jN5u1FBtJBYiOti2BUVngYBSpVm0bo/zFnWdTub/Vi0m00rcMViPJ4A1mcWwG
q3AgbhPB6GGoyK5oHGZZ4O5B3BcK0lCnp68sM+MWuwPR3oTePvh1OAwzNZ1oGARmwrKPFuMMH5v9
JVc6WmSWm2KuGiK8lFKP9ExaJkj+ZT2VFguyaURnB4omRAapAeWqs0l5cXkSBYcTSYFC5JKGdUh6
7KFUyOfAsEjIKchSI8jaG9fhoDuG14m4i4l0gcgNYQPjLsg5DQlkLEzQbu3aIdVRf24NCAp/1wGj
zegMkBZ8+qA75QBgK4a72SXwaBvmHjmgct7FbuFZNH5PYXZfPcmO6DhdiR2COV6GiawHimaFgQNg
eaBoehWZrcgtoOcIyYh8Acl2DhUFQ6ET8Q+V2J4CgSAqYgYLjn1cb24/wQgkuBuQFVRo9QQH5Imo
YIiLoknCRuoiagI9w+hqScF+0pu1mzoM4nE4odBfzIFuD7hoaF7Qp5JKhRDFib0Go2qLtCQ1gDCN
wtiampKY/qsqvKwRPlAjeeB2AxJytEj3J3FbxN1JLhbBwjDIVRWDGCYIuM1sFaUJgx7w5i7+vOLw
axUIDuQDCLka87y0KmFYns2wZKPUwORgxCsHmo7kgun5lthTeVKFprKjLsQgVxUWS1DYdTgcwe0Z
BaeK9Y4rlm0KMRc86lxAWiDv0XoLkRM7/ouqOyVhJA0vFwQHbBBxC3FAx6B5BGKMlNrBkJnZQofN
BkeQ/+LuSKcKEgjAXclg


Index: trac-bazaar-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/devel/trac-bazaar-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- trac-bazaar-plugin.spec	26 Sep 2008 00:42:59 -0000	1.5
+++ trac-bazaar-plugin.spec	26 Sep 2008 21:08:23 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           trac-bazaar-plugin
 Version:        0.2
-Release:        6.20080925bzr%{bzrrev}%{?dist}
+Release:        7.20080925bzr%{bzrrev}%{?dist}
 Summary:        Bazaar plugin for Trac
 
 Group:          Applications/Internet
@@ -17,7 +17,11 @@
 # tarball lands in trac-bzr/dist/
 Source0:        TracBzr-%{version}.tar.gz
 # https://bugs.launchpad.net/trac-bzr/+bug/274609
-Patch0: trac-bazaar-extra-return.patch
+# and
+# https://bugs.launchpad.net/trac-bzr/+bug/267700
+Patch0: trac-bzr-no-repo.patch
+# https://bugs.launchpad.net/trac-bzr/+bug/263300
+Patch1: trac-bzr-get-ancestry.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -36,7 +40,8 @@
 
 %prep
 %setup -n TracBzr-%{version} -q
-%patch0 -p0
+%patch0 -p0 -b .norepo
+%patch1 -p0 -b .ancestor
 
 %build
 %{__python} setup.py build
@@ -56,6 +61,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Fri Sep 26 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.2-7.20080925bzr49
+- Patches to fix: lp:274609, lp:263300, lp:267700
+
 * Thu Sep 25 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.2-6.20080925bzr49
 - New upstream snapshot that includes our patches, fixes for bzr-1.6+ and
   trac-0.11.


--- trac-bazaar-extra-return.patch DELETED ---



From airlied at fedoraproject.org  Fri Sep 26 21:14:01 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 26 Sep 2008 21:14:01 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel copy-fb-contents.patch,1.2,1.3
Message-ID: <20080926211401.E02D97010C@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-serv1590

Modified Files:
	copy-fb-contents.patch 
Log Message:
oops missing CFLAGS


copy-fb-contents.patch:

Index: copy-fb-contents.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/copy-fb-contents.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- copy-fb-contents.patch	26 Sep 2008 00:53:39 -0000	1.2
+++ copy-fb-contents.patch	26 Sep 2008 21:13:31 -0000	1.3
@@ -1,3 +1,15 @@
+diff --git a/configure.ac b/configure.ac
+index a7e954d..8b126b5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -123,6 +123,7 @@ if test "$DRI" = yes; then
+         if test "x$DRM_MODE" = xyes; then
+                 AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting])
+         fi
++	CFLAGS="$save_CFLAGS"
+ fi
+ 
+ save_CFLAGS="$CFLAGS"
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
 index 25e6183..a22cd62 100644
 --- a/src/drmmode_display.c



From airlied at fedoraproject.org  Fri Sep 26 21:16:32 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 26 Sep 2008 21:16:32 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-dont-flush-new-pixmaps.patch,
	NONE, 1.1 xorg-x11-drv-ati.spec, 1.117, 1.118
Message-ID: <20080926211632.2F9C07010C@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-serv2045

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-dont-flush-new-pixmaps.patch 
Log Message:
- fix fb contents patch
- EXA speedup from otaylor.


radeon-dont-flush-new-pixmaps.patch:

--- NEW FILE radeon-dont-flush-new-pixmaps.patch ---
>From 2ea53929c2e0ed0d9a184680812d8bdacb9d51f2 Mon Sep 17 00:00:00 2001
From: Owen Taylor <otaylor at localhost.localdomain>
Date: Fri, 26 Sep 2008 16:17:49 -0400
Subject: [PATCH] Don't flush when mapping a newly created pixmap into system ram
 If we have a pixmap that has never been mapped into vram (and thus
 never written to by the GPU), there is no need to flush the graphics
 pipeline and wait for idle before starting to write to it.

---
 src/radeon_bufmgr_gem.c |    7 +++++++
 src/radeon_bufmgr_gem.h |    1 +
 src/radeon_exa.c        |    3 ++-
 3 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/radeon_bufmgr_gem.c b/src/radeon_bufmgr_gem.c
index db28edc..d7b5644 100644
--- a/src/radeon_bufmgr_gem.c
+++ b/src/radeon_bufmgr_gem.c
@@ -528,3 +528,10 @@ void radeon_bufmgr_emit_reloc(dri_bo *buf, uint32_t *head, uint32_t *count_p, ui
 	radeon_bufmgr = (struct radeon_bufmgr *)(buf->bufmgr + 1);
 	radeon_bufmgr->emit_reloc(buf, head, count_p, read_domains, write_domain);
 }
+
+int radeon_bufmgr_gem_in_vram(dri_bo *buf)
+{
+	dri_bo_gem *gem_bo = (dri_bo_gem *)buf;
+	
+	return gem_bo->in_vram;
+}
diff --git a/src/radeon_bufmgr_gem.h b/src/radeon_bufmgr_gem.h
index e2f1ca6..d67ddf6 100644
--- a/src/radeon_bufmgr_gem.h
+++ b/src/radeon_bufmgr_gem.h
@@ -11,4 +11,5 @@ void radeon_bufmgr_post_submit(dri_bufmgr *bufmgr);
 void radeon_bufmgr_pin(dri_bo *buf);
 void radeon_bufmgr_unpin(dri_bo *buf);
 uint32_t radeon_bufmgr_get_handle(dri_bo *buf);
+int radeon_bufmgr_gem_in_vram(dir_bo *buf);
 #endif
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index 555ae16..dee537c 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -235,7 +235,8 @@ static Bool RADEONPrepareAccess(PixmapPtr pPix, int index)
 	if (driver_priv->bo) {
 	    int ret;
 
-	    RADEONCPFlushIndirect(pScrn, 0);
+	    if (radeon_bufmgr_gem_in_vram (driver_priv->bo))
+		RADEONCPFlushIndirect(pScrn, 0);
 
 	    //radeon_bufmgr_gem_wait_rendering(driver_priv->bo);
 
-- 
1.6.0.1



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.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- xorg-x11-drv-ati.spec	26 Sep 2008 01:41:42 -0000	1.117
+++ xorg-x11-drv-ati.spec	26 Sep 2008 21:16:01 -0000	1.118
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   17%{?dist}
+Release:   18%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -20,6 +20,7 @@
 Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     copy-fb-contents.patch
+Patch7:     radeon-dont-flush-new-pixmaps.patch
 
 ExcludeArch: s390 s390x
 
@@ -44,6 +45,7 @@
 %patch4 -p1 -b .remove-limit-heuristics
 %patch5 -p1 -b .panel-size
 %patch6 -p1 -b .copy-fb-contents
+%patch7 -p1 -b .dont-flush
 
 %build
 autoreconf
@@ -75,6 +77,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Sat Sep 27 2008 Dave Airlie <airlied at redhat.com> 6.9.0-18
+- fix fb contents patch
+- EXA speedup from otaylor.
+
 * Fri Sep 26 2008 Dave Airlie <airlied at redhat.com> 6.9.0-17
 - exa offset fixes for changes in X server
 



From jwilson at fedoraproject.org  Fri Sep 26 21:24:02 2008
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Fri, 26 Sep 2008 21:24:02 +0000 (UTC)
Subject: rpms/cpuspeed/devel cpuspeed-1.2.1-multicore-support.patch, NONE,
	1.1 cpuspeed-1.2.1-no-affected_cpus-fallback.patch, NONE,
	1.1 cpuspeed.init, 1.39, 1.40 cpuspeed.spec, 1.68,
	1.69 cpuspeed-1.2.1-multicore-workaround.patch, 1.1,
	NONE cpuspeed.patch, 1.1, NONE idlenice.diff, 1.2,
	NONE warning.diff, 1.1, NONE
Message-ID: <20080926212402.2CCF87010C@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/cpuspeed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3585

Modified Files:
	cpuspeed.init cpuspeed.spec 
Added Files:
	cpuspeed-1.2.1-multicore-support.patch 
	cpuspeed-1.2.1-no-affected_cpus-fallback.patch 
Removed Files:
	cpuspeed-1.2.1-multicore-workaround.patch cpuspeed.patch 
	idlenice.diff warning.diff 
Log Message:
* Fri Sep 26 2008 Jarod Wilson <jarod at redhat.com> 1.2.1-9
- backport proper multicore support for userspace governor
  (cpuspeed daemon) case from v1.5 cpuspeed snapshot


cpuspeed-1.2.1-multicore-support.patch:

--- NEW FILE cpuspeed-1.2.1-multicore-support.patch ---
diff -Naurp cpuspeed-1.2.1/cpuspeed.cc cpuspeed-1.2.1.mc/cpuspeed.cc
--- cpuspeed-1.2.1/cpuspeed.cc	2008-09-26 11:41:47.000000000 -0400
+++ cpuspeed-1.2.1.mc/cpuspeed.cc	2008-09-26 12:33:09.000000000 -0400
@@ -1,7 +1,7 @@
 /*
-    $Id: $
+    $Id: cpuspeed.cc 7 2007-02-06 01:20:52Z carl $
 
-    Copyright 2002 - 2005
+    Copyright 2002 - 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
@@ -19,14 +19,17 @@
     This program is only for computers with Linux kernels compiled with
     CPUFreq.  You must have a CPU that supports frequency and/or voltage
     scaling via CPUFreq to use this program.  Your kernel must be compiled to
-    support the "userspace" CPUFreq governor and the "sysfs" interface on
-    Linux 2.6 or the "proc" interface on Linux 2.4.
+    support the "userspace" CPUFreq governor and the "sysfs" interface used
+    by Linux 2.6.
 
-    I use this program on my eMachines M5305 and Acer Ferrari 3200 laptops to
-    increase battery life and control performance.
+    CPUSpeed no longer supports the "proc" interface used by Linux 2.4.
+
+    I use this program on my Dell Inspiron 1420, HP Pavilion DV-9500 and
+    Toshiba laptops to increase battery life and control performance.
 */
 
-const char VERSION[] = "1.2.1";
+const char VERSION[] = "1.2.1-rh";
+const char AUTHOR[] = "Carl E. Thompson - cet [at] carlthompson.net (Copyright 2002 - 2008)";
 
 #include <unistd.h>
 #include <stdio.h>
@@ -50,6 +53,13 @@ const unsigned MAX_SPEEDS  = 15;
 // Minimum speed step supported in KHz
 const unsigned MIN_STEP = 25000;
 
+// Maximimum number of processor cores that can be controlled simultaneously
+// by one CPUSpeed process
+const unsigned MAX_TIED_CORES = 8;
+
+const char SYSFS_CPUFREQ_DIR[] =
+    "/sys/devices/system/cpu/cpu%u/cpufreq";
+
 const char SYSFS_MIN_SPEED_FILE[] =
     "/sys/devices/system/cpu/cpu%u/cpufreq/scaling_min_freq";
 
@@ -62,33 +72,22 @@ const char SYSFS_CURRENT_SPEED_FILE[] =
 const char SYSFS_GOVERNOR_FILE[] =
      "/sys/devices/system/cpu/cpu%u/cpufreq/scaling_governor";
 
+const char SYSFS_AFFECTED_CPUS_FILE[] =
+     "/sys/devices/system/cpu/cpu%u/cpufreq/affected_cpus";
+
 const char SYSFS_USERSPACE[] =
     "userspace";
 
 const char * PROC_STAT_FILE =
     "/proc/stat";
 
-#ifdef WITH_PROC
-const char PROC_MIN_SPEED_FILE[] =
-    "/proc/sys/cpu/%u/speed-min";
-
-const char PROC_MAX_SPEED_FILE[] =
-    "/proc/sys/cpu/%u/speed-max";
-
-const char PROC_CURRENT_SPEED_FILE[] =
-    "/proc/sys/cpu/%u/speed";
-
-const char PROC_GOVERNOR_FILE[] =
-    "/proc/cpufreq";
-
-const char PROC_USERSPACE[] =
-    "0%0%100%userspace";
-#endif
-
 #ifdef DEBUG
 const char * FAKE_STAT_FILE =
     "/tmp/cpuspeed/stat";
 
+const char FAKE_CPUFREQ_DIR[] =
+    "/tmp/cpuspeed/%u";
+
 const char FAKE_MIN_SPEED_FILE[] =
     "/tmp/cpuspeed/%u/speed-min";
 
@@ -101,6 +100,9 @@ const char FAKE_CURRENT_SPEED_FILE[] =
 const char FAKE_GOVERNOR_FILE[] =
     "/tmp/cpuspeed/%u/governor";
 
+const char FAKE_AFFECTED_CPUS_FILE[] =
+    "/tmp/cpuspeed/%u/affected_cores";
+
 const char FAKE_USERSPACE[] =
     "userspace";
 #endif
@@ -109,11 +111,42 @@ const char * MIN_SPEED_FILE;
 const char * MAX_SPEED_FILE;
 const char * CURRENT_SPEED_FILE;
 const char * GOVERNOR_FILE;
+const char * AFFECTED_CPUS_FILE;
 const char * USERSPACE;
 const char * STAT_FILE;
 
+// if CPU idle percentage is below this, CPU will be set to fastest speed
+unsigned clock_up_idle_fast= 10;
+
+// if CPU idle percentage is below this, CPU will be set to next higher speed
+// if CPU idle percentage is above this, CPU will be set to next lower speed
+unsigned idle_threshold = 25;
+
+// if this is set (via command line) throttle down CPU to minimum if
+// temperature is too high
+const char * temperature_filename = 0;
+unsigned max_temperature;
+
+// if this is set (via command line) throttle down CPU to minimum if
+// AC power is disconnected
+const char * ac_filename = 0;
+
+// if this is true then maximize speed when AC connected
+bool max_speed_on_ac = false;
+
+// if this is true then minimize speed when AC disconnected
+bool min_speed_on_battery = true;
+
+// if this is true then NICE time does not count as utilized time
+bool nice_counts_as_idle = true;
+
+// if this is true then IO wait time does not count as utilized time
+bool io_counts_as_idle = true;
+
+bool check_cpu = false, check_therm = false, check_ac = false;
+
 // defines what info we care about for each speed step
-struct
+static struct
 {
     unsigned khz;
     //unsigned volts;
@@ -122,8 +155,9 @@ struct
 unsigned current_speed; // current speed step
 unsigned last_step; // lowest speed step
 
-// which CPU are we controlling
-unsigned cpu = 0;
+// which CPU cores are we controlling
+unsigned tied_cpu_cores[MAX_TIED_CORES];
+unsigned num_tied_cores = 0;
 
 // display an error message and exit the program
 void
@@ -140,7 +174,9 @@ die(bool system_error, const char *fmt, 
 
     fprintf(stderr, "\n");
     if (system_error)
+    {
         fprintf(stderr, "Error: %s\n", strerror(errno));
+    }
 
     exit(1);
 }
@@ -151,10 +187,19 @@ read_line(const char * filename, char * 
 {
     FILE * fp = fopen(filename, "r");
     if (!fp)
+    {
         die(true, "Could not open file for reading: %s", filename);
+    }
     if ( (!fgets(line, len, fp)) )
-        die(true, "Could not read from file: %s", filename);
+    {
+        die(false, "Could not read from file: %s", filename);
+    }
     fclose(fp);
+    char * p = strchr(line, '\n');
+    if (p)
+    {
+        *p = 0;
+    }
 }
 
 // write a line to a file
@@ -163,23 +208,83 @@ write_line(const char * filename, const 
 {
     FILE * fp = fopen(filename, "w+");
     if (!fp)
+    {
         die(true, "Could not open file for writing: %s", filename);
+    }
     va_list ap;
     // get variable argument list passed
     va_start(ap, fmt);
     if (vfprintf(fp, fmt, ap) < 0)
+    {
         die(true, "Could not write to file: %s", filename);
+    }
     va_end(ap);
     fclose(fp);
 }
 
+long
+get_int(const char * s)
+{
+    char * end;
+    long r = strtol(s, &end, 10);
+    if (*end != '\0')
+    {
+        die(false, "Not an integer: [%s]", s);
+    }
+    if (errno == ERANGE)
+    {
+        die(false, "Number is out of range: %s", s);
+    }
+    return r;
+}
+
 // read an integer value from a file
 unsigned
 read_value(const char * filename)
 {
     char line[256];
     read_line(filename, line, sizeof line);
-    return atoi(line);
+    return (unsigned) get_int(line);
+}
+
+// Read multiple integer values from a string. Returns them in the array
+// reference pointed to by "values" . Returns the number of values read.
+unsigned
+parse_values(const char * string, unsigned *  values, unsigned len)
+{
+    char line[256];
+    char * svalue;
+    unsigned num_found = 0;
+    strncpy(line, string, sizeof line);
+    line[sizeof line - 1] = '\0';
+    for (
+            svalue = strtok(line, " \t\n");
+            svalue;
+            svalue = strtok(NULL, " \t\n"), num_found++
+        )
+    {
+        if (num_found == len)
+        {
+            die(
+                false,
+                "More than the maximum allowed %u values found in input: [%s]",
+                len, string
+             );
+        }
+        values[num_found] = (unsigned) get_int(svalue);
+    }
+
+    return num_found;
+}
+
+// Read multiple integer values from a file. Returns them in the array
+// reference pointed to by "values" . Returns the number of values read.
+unsigned
+read_values(const char * filename, unsigned *  values, unsigned len)
+{
+    char line[256];
+    read_line(filename, line, sizeof line);
+    return parse_values(line, values, len);
 }
 
 // get the current CPU speed
@@ -192,7 +297,9 @@ unsigned get_speed()
 void set_speed(unsigned value)
 {
 #ifdef DEBUG
-    fprintf(stderr, "[cpu%u] Setting speed to: %uKHz\n", cpu, value);
+    fprintf(
+        stderr, "[core%u] Setting speed to: %uKHz\n", tied_cpu_cores[0], value
+    );
 #endif
     write_line(CURRENT_SPEED_FILE, "%u\n", value);
     // give CPU / chipset voltage time to settle down
@@ -205,19 +312,22 @@ void set_speed(unsigned value)
 void set_speed(unsigned current, unsigned target)
 {
     if (current == target)
+    {
         return;
+    }
     int delta = (current > target) ? -1 : 1;
     do
     {
         current += delta;
         set_speed(speeds[current].khz);
-    }
-    while (current != target);
+    } while (current != target);
 }
 
-
+// comparison functions
 inline unsigned MIN(unsigned a, unsigned b) { return a > b ? b : a; }
 inline unsigned MAX(unsigned a, unsigned b) { return a > b ? a : b; }
+inline int icomp(const void * a, const void * b)
+    { return *((int *)a) - *((int *)b); }
 
 // the minimum and maximum speed that we are allowed to set
 unsigned min_speed = 0, max_speed = UINT_MAX;
@@ -230,8 +340,14 @@ get_supported_speeds()
     unsigned max = read_value(MAX_SPEED_FILE);
 
 #ifdef DEBUG
-    fprintf(stderr, "[cpu%u] Mimimum speed supported: %uKHz\n", cpu, min);
-    fprintf(stderr, "[cpu%u] Maximum speed supported: %uKHz\n", cpu, max);
+    fprintf(
+        stderr, "[core%u] Mimimum speed supported: %uKHz\n",
+        tied_cpu_cores[0], min
+    );
+    fprintf(
+        stderr, "[core%u] Maximum speed supported: %uKHz\n",
+        tied_cpu_cores[0], max
+    );
 #endif
     min = MAX(min, min_speed);
     max = MIN(max, max_speed);
@@ -242,35 +358,47 @@ get_supported_speeds()
     {
         min = MAX(min, step);
         if (max <= min)
+        {
             die(false, "No speed steps could be determined!");
+        }
 
-        // Go to max speed if we are not already there
-        for (unsigned current = get_speed(); current <= max; current += step)
-                set_speed(current);
+        // go to max speed if we are not already there
+        for (unsigned current = get_speed(); current < max; current += step)
+        {
+            set_speed(MIN(current, max));
+        }
         set_speed(max);
 
         // this code is a hack to get the various speed steps supported by the
-        // CPU by looping from the maximum speed to the minimum speed and trying
-        // to set every possible speed divisible by step!
-        speeds[0].khz = max;
+        // CPU by looping from the maximum speed to the minimum speed and
+        // trying to set every possible speed divisible by step!
+
+        // speed is set to max above so returns real maximum that can be set
+        speeds[0].khz = get_speed();
         current_speed = 0;
-        for (unsigned current = max - step; current > min - step; current -= step)
+        for (unsigned current = max-step; current > min-step; current -= step)
         {
-                current = MAX(current, min);
-                set_speed(current);
-                unsigned real = get_speed();
-                if (real != speeds[current_speed].khz)
-                {
+            current = MAX(current, min);
+            set_speed(current);
+            unsigned real = get_speed();
+            if (real != speeds[current_speed].khz)
+            {
                 speeds[++current_speed].khz = real;
                 if (current_speed + 1 == MAX_SPEEDS)
-                        break;
+                {
+                    break;
                 }
+            }
         }
         if (current_speed + 1 != MAX_SPEEDS)
-                break;
+        {
+            break;
+        }
     }
     if (step > MAX_STEP)
+    {
         die(false, "Detected more speed steps than this program can handle?!");
+    }
 
     speeds[current_speed + 1].khz = 0;
 
@@ -278,41 +406,69 @@ get_supported_speeds()
     last_step = current_speed;
 
 #ifdef DEBUG
-    fprintf(stderr, "[cpu%u] Available speeds:\n", cpu);
+    fprintf(stderr, "[core%u] Available speeds:\n", tied_cpu_cores[0]);
     for (unsigned speed = 0; speeds[speed].khz; speed++)
-        fprintf(stderr, "[cpu%u]  %2u: %9uKHz\n", cpu, speed, speeds[speed].khz);
+    {
+        fprintf(
+            stderr, "[core%u]  %2u: %9uKHz\n",
+            tied_cpu_cores[0], speed, speeds[speed].khz
+        );
+    }
 #endif
 }
 
+// are we currently dynamically scaling the CPU or at min or max?
+enum Mode { SPEED_DYNAMIC, SPEED_MIN, SPEED_MAX } mode;
+
 // gets the elapsed total time and elapsed idle time since it was last called
 void
-get_times(unsigned long & total_elapsed, unsigned long & idle_elapsed)
+get_times(
+    unsigned tied_core_index, unsigned long & total_elapsed,
+    unsigned long & idle_elapsed
+)
 {
     FILE * fp = fopen(STAT_FILE, "r");
     if (!fp)
+    {
         die(true, "Could not open %s for reading!", STAT_FILE);
+    }
 
-    static char search[8];
-    static size_t searchlen = 0;
-    if (!searchlen)
+    static char search[MAX_TIED_CORES][8];
+    static size_t searchlen[MAX_TIED_CORES];
+    if (!searchlen[tied_core_index])
     {
-        snprintf(search, sizeof search, "cpu%u ", cpu);
-        searchlen = strlen(search);
+        searchlen[tied_core_index] =
+            snprintf(
+                search[tied_core_index], sizeof search[tied_core_index],
+                "cpu%u ", tied_cpu_cores[tied_core_index]
+            );
 #ifdef DEBUG
-        fprintf(stderr, "[cpu%u] Looking for CPU line starting with: \"%s\"\n", cpu, search);
+        fprintf(
+            stderr, "[core%u] Looking for CPU line starting with: \"%s\"\n",
+            tied_cpu_cores[tied_core_index], search[tied_core_index]
+        );
 #endif
     }
-    bool found;
+    bool found = false;
     char line[256];
-    while ( (found = fgets(line, sizeof line, fp)) && strncmp(line, search, searchlen) )
-    ;
+    while (fgets(line, sizeof line, fp))
+    {
+        if (!strncmp(line, search[tied_core_index], searchlen[tied_core_index]))
+        {
+            found = true;
+            break;
+        }
+    }
 
     fclose(fp);
 
     if (!found)
     {
 #ifdef DEBUG
-        fprintf(stderr, "[cpu%u] Could not find \'%s\' line in %s.\n", cpu, search, STAT_FILE);
+        fprintf(
+            stderr, "[core%u] Could not find \'%s\' line in file: %s.\n",
+            tied_cpu_cores[tied_core_index], search[tied_core_index], STAT_FILE
+        );
 #endif
         return;
     }
@@ -325,20 +481,31 @@ get_times(unsigned long & total_elapsed,
     );
 
     // count nice time as idle time
-    idle_time += nice_time;
+    if (nice_counts_as_idle)
+    {
+        idle_time += nice_time;
+    }
 
     // count IO wait time as idle time
-    idle_time += wait_time;
+    if (io_counts_as_idle)
+    {
+        idle_time += wait_time;
+    }
 
     unsigned long total_time = user_time + system_time + idle_time;
-    static unsigned long last_total_time = 0, last_idle_time = 0;
-    total_elapsed = total_time - last_total_time;
-    last_total_time = total_time;
-    idle_elapsed = idle_time - last_idle_time;
-    last_idle_time = idle_time;
+    static unsigned long last_total_time[MAX_TIED_CORES],
+        last_idle_time[MAX_TIED_CORES];
+
+    total_elapsed = total_time - last_total_time[tied_core_index];
+    last_total_time[tied_core_index] = total_time;
+    idle_elapsed = idle_time - last_idle_time[tied_core_index];
+    last_idle_time[tied_core_index] = idle_time;
 
 #ifdef DEBUG
-    fprintf(stderr, "[cpu%u] time: %lu    idle: %lu\n", cpu, total_elapsed, idle_elapsed);
+    fprintf(
+        stderr, "[core%u] time: %lu    idle: %lu\n",
+        tied_cpu_cores[tied_core_index], total_elapsed, idle_elapsed
+    );
 #endif
 }
 
@@ -346,36 +513,12 @@ get_times(unsigned long & total_elapsed,
 void reset_times()
 {
     unsigned long dummy1, dummy2;
-    get_times(dummy1, dummy2);
+    for (unsigned u = 0; u < num_tied_cores; u++)
+    {
+        get_times(u, dummy1, dummy2);
+    }
 }
 
-// are we currently dynamically scaling the CPU or at min or max?
-enum Mode { SPEED_DYNAMIC, SPEED_MIN, SPEED_MAX } mode;
-
-// if CPU idle percentage is below this, CPU will be set to fastest speed
-unsigned clock_up_idle_fast= 10;
-
-// if CPU idle percentage is below this, CPU will be set to next higher speed
-// if CPU idle percentage is above this, CPU will be set to next lower speed
-unsigned idle_threshold = 25;
-
-// if this is set (via command line) throttle down CPU to minimum if
-// temperature is too high
-const char * temperature_filename = 0;
-unsigned max_temperature;
-
-// if this is set (via command line) throttle down CPU to minimum if
-// AC power is disconnected
-const char * ac_filename = 0;
-
-// if this is true then maximize speed when AC connected
-bool max_speed_on_ac = false;
-
-// if this is true then minimize speed when AC disconnected
-bool min_speed_on_battery = true;
-
-bool check_cpu = false, check_therm = false, check_ac = false;
-
 // handles the periodic check of idle and setting CPU speed
 void
 alarm_handler(int)
@@ -399,22 +542,26 @@ alarm_handler(int)
             {
                 on_ac = false;
 #ifdef DEBUG
-                fprintf(stderr, "[cpu%u] AC is off-line\n", cpu);
+                fprintf(stderr, "[core%u] AC is off-line\n", tied_cpu_cores[0]);
 #endif
             }
             else
             {
                 on_ac = true;
 #ifdef DEBUG
-                fprintf(stderr, "[cpu%u] AC is on-line\n", cpu);
+                fprintf(stderr, "[core%u] AC is on-line\n", tied_cpu_cores[0]);
 #endif
             }
         }
 
         if (max_speed_on_ac && on_ac)
+        {
             state = SPEED_MAX;
+        }
         else if (!on_ac && min_speed_on_battery)
+        {
             state = SPEED_MIN;
+        }
 
         // check that we are not getting too hot
         if (temperature_filename && check_therm && state != SPEED_MIN)
@@ -422,12 +569,22 @@ alarm_handler(int)
             read_line(temperature_filename, line, sizeof line);
             p = strpbrk(line, "0123456789");
             if (!p)
-                die(false, "Could not find temperature in file: %s", temperature_filename);
+            {
+                die(
+                    false, "Could not find temperature in file: %s",
+                    temperature_filename
+                );
+            }
 #ifdef DEBUG
-        fprintf(stderr, "[cpu%u] temp: %ld\n", cpu, strtol(p, 0, 10));
+            fprintf(
+                stderr, "[core%u] temp: %ld\n", tied_cpu_cores[0],
+                strtol(p, 0, 10)
+            );
 #endif
             if (strtol(p, 0, 10) > (long)max_temperature)
+            {
                 state = SPEED_MIN;
+            }
         }
     }
 
@@ -438,28 +595,59 @@ alarm_handler(int)
         {
             // if it's not yet time to check CPU then don't
             if (!check_cpu)
+            {
                 break;
+            }
 
-            unsigned long elapsed_time, idle_time;
-            unsigned idle_percent;
+            unsigned wanted_speed[MAX_TIED_CORES];
+            for (unsigned i = 0; i < num_tied_cores; i++)
+            {
+                unsigned long elapsed_time, idle_time;
+                unsigned idle_percent;
 
-            // get the elapsed and idle times since we last checked
-            get_times(elapsed_time, idle_time);
+                // get the elapsed and idle times since we last checked
+                get_times(i, elapsed_time, idle_time);
 
-            if (elapsed_time > 0)
-            {
-                idle_percent = idle_time * 100 / elapsed_time;
+                wanted_speed[i] = current_speed;
+                if (elapsed_time > 0)
+                {
+                    idle_percent = idle_time * 100 / elapsed_time;
 
-                if (idle_percent <= clock_up_idle_fast)
-                    current_speed = 0;
-                else if (idle_percent < idle_threshold && current_speed > 0)
-                    current_speed--;
-                else if (idle_percent > idle_threshold && speeds[current_speed + 1].khz != 0)
-                    current_speed++;
-#ifdef DEBUG
-                fprintf(stderr, "[cpu%u] Idle percent: %.2u\n", cpu, idle_percent);
+                    if (idle_percent <= clock_up_idle_fast)
+                    {
+                        wanted_speed[i] = 0;
+                    }
+                    else if (idle_percent < idle_threshold && current_speed > 0)
+                    {
+                        wanted_speed[i] = current_speed - 1;
+                    }
+                    else if (
+                        idle_percent > idle_threshold
+                        && speeds[current_speed + 1].khz != 0
+                    )
+                    {
+                        wanted_speed[i] = current_speed + 1;
+                    }
+#ifdef DEBUG
+                    fprintf(
+                        stderr, "[core%u] idle percent: %.2u\n",
+                        tied_cpu_cores[i], idle_percent
+                    );
+                    fprintf(
+                        stderr, "[core%u] wanted speed: %u\n",
+                        tied_cpu_cores[i], wanted_speed[i]
+                    );
 #endif
+                }
             }
+            qsort(wanted_speed, num_tied_cores, sizeof(unsigned), icomp);
+            current_speed = wanted_speed[0];
+#ifdef DEBUG
+            fprintf(
+                stderr, "[core%u] winning speed: %u\n",
+                tied_cpu_cores[0], wanted_speed[0]
+            );
+#endif
             break;
         }
 
@@ -476,9 +664,10 @@ alarm_handler(int)
     if (current_speed != old_speed)
     {
 #ifdef DEBUG
+fprintf(stderr, "Current: %u\n", current_speed);
         fprintf(
-            stderr, "[cpu%u] old speed: %uKHz     new speed: %uKHz\n",
-            cpu, speeds[old_speed].khz, speeds[current_speed].khz
+            stderr, "[core%u] old speed: %uKHz     new speed: %uKHz\n",
+            tied_cpu_cores[0], speeds[old_speed].khz, speeds[current_speed].khz
         );
 #endif
         set_speed(old_speed, current_speed);
@@ -516,12 +705,11 @@ hup_handler(int)
     raise(SIGALRM);
 }
 
-unsigned num_cpus = 0; // how many CPUs are we managing? 0 = autodetect
+unsigned num_cores = 0; // how many CPU cores are we managing? 0 = autodetect
 
 // restore  initial speed on program exit
 unsigned saved_speed = 0;
 char saved_governor[32];
-pid_t * saved_pids;
 
 void
 term_handler(int which)
@@ -532,33 +720,14 @@ term_handler(int which)
         write_line(GOVERNOR_FILE, "%s\n", saved_governor);
     }
 
-    if (cpu == 0)
-    {
-        for (unsigned i = 1; i < num_cpus; i++)
-            kill(saved_pids[i], which);
-    }
-
     raise(which);
 }
 
-long
-get_int(const char * s)
-{
-    char * end;
-    long r = strtol(s, &end, 10);
-    if (*end != '\0')
-        die(false, "Not an integer: %s", s);
-    if (errno == ERANGE)
-        die(false, "Number is out of range: %s", s);
-
-    return r;
-}
-
 char *
 dup_cpu_str(const char *s)
 {
     char buf[256];
-    snprintf(buf, sizeof buf, s, cpu);
+    snprintf(buf, sizeof buf, s, tied_cpu_cores[0]);
     return strdup(buf);
 }
 
@@ -579,106 +748,157 @@ main(int argc, char * argv[])
 #endif
 
     // parse argv
-    for(int i = 1; i < argc; i++)
+    for (int i = 1; i < argc; i++)
     {
-        if(!strcmp(argv[i], "-d"))
+        if (!strcmp(argv[i], "-d"))
             daemonize = true;
-        else if(!strcmp(argv[i], "-r"))
+        else if (!strcmp(argv[i], "-r"))
             save_state = true;
-        else if(!strcmp(argv[i], "-C"))
+        else if (!strcmp(argv[i], "-C"))
             max_speed_on_ac = true;
-        else if(!strcmp(argv[i], "-D"))
+        else if (!strcmp(argv[i], "-D"))
             min_speed_on_battery = false;
-        else if(!strcmp(argv[i], "-i"))
+        else if (!strcmp(argv[i], "-n"))
+            nice_counts_as_idle = false;
+        else if (!strcmp(argv[i], "-w"))
+            io_counts_as_idle = false;
+        else if (!strcmp(argv[i], "-i"))
         {
             if (argc <= i + 1)
-                die(false, "The \'-i\' option must be followed by an interval in tenths of a second");
+            {
+                die(
+                    false, "The \'-i\' option must be followed by an interval "
+                    "in tenths of a second"
+                );
+            }
             interval = get_int(argv[++i]);
 #ifdef DEBUG
             fprintf(stderr, "CPU interval is %u\n", interval);
 #endif
         }
-        else if(!strcmp(argv[i], "-p"))
+        else if (!strcmp(argv[i], "-p"))
         {
             if (argc <= i + 2)
+            {
                 die(false, "The \'-p\' option must be followed by 2 integers");
+            }
             clock_up_idle_fast = get_int(argv[++i]);
             idle_threshold = get_int(argv[++i]);
 #ifdef DEBUG
-            fprintf(stderr, "Triggers are %u %u\n",clock_up_idle_fast, idle_threshold);
+            fprintf(
+                stderr, "Triggers are %u %u\n",
+                clock_up_idle_fast, idle_threshold
+            );
 #endif
         }
         else if (!strcmp(argv[i], "-t"))
         {
             if (argc <= i + 2)
-                die(false, "The \'-t\' option must be followed by a filename and a temperature");
+            {
+                die(
+                    false, "The \'-t\' option must be followed by a filename "
+                    "and a temperature"
+                );
+            }
             temperature_filename = argv[++i];
             max_temperature = get_int(argv[++i]);
         }
         else if (!strcmp(argv[i], "-a"))
         {
             if (argc <= i + 1)
+            {
                 die(false, "The \'-a\' option must be followed by a filename");
+            }
             ac_filename = argv[++i];
         }
-        else if(!strcmp(argv[i], "-m"))
+        else if (!strcmp(argv[i], "-m"))
         {
             if (argc <= i + 1)
-                die(false, "The \'-m\' option must be followed by a minimum speed in KHz");
+            {
+                die(
+                    false, "The \'-m\' option must be followed by a minimum "
+                    "speed in KHz"
+                );
+            }
             min_speed = get_int(argv[++i]);
 #ifdef DEBUG
-            fprintf(stderr, "Minimum speed allowed by user: %uKHz\n", min_speed);
+            fprintf(
+                stderr, "Minimum speed allowed by user: %uKHz\n", min_speed
+            );
 #endif
         }
-        else if(!strcmp(argv[i], "-M"))
+        else if (!strcmp(argv[i], "-M"))
         {
             if (argc <= i + 1)
-                die(false, "The \'-M\' option must be followed by a maximum speed in KHz");
+            {
+                die(
+                    false, "The \'-M\' option must be followed by a maximum "
+                    "speed in KHz"
+                );
+            }
             max_speed = get_int(argv[++i]);
 #ifdef DEBUG
-            fprintf(stderr, "Maximum speed allowed by user: %uKHz\n", max_speed);
+            fprintf(
+                stderr, "Maximum speed allowed by user: %uKHz\n", max_speed
+            );
 #endif
         }
-        else if(!strcmp(argv[i], "-T"))
+        else if (!strcmp(argv[i], "-T"))
         {
             if (argc <= i + 1)
-                die(false, "The \'-T\' option must be followed by an interval in tenths of a second");
+            {
+                die(
+                    false, "The \'-T\' option must be followed by an interval "
+                    "in tenths of a second"
+                );
+            }
             therm_interval = get_int(argv[++i]);
 #ifdef DEBUG
             fprintf(stderr, "Thermal interval is %u\n", therm_interval);
 #endif
         }
-        else if(!strcmp(argv[i], "-A"))
+        else if (!strcmp(argv[i], "-A"))
         {
             if (argc <= i + 1)
-                die(false, "The \'-A\' option must be followed by an interval in tenths of a second");
+            {
+                die(
+                    false, "The \'-A\' option must be followed by an interval "
+                    "in tenths of a second"
+                );
+            }
             ac_interval = get_int(argv[++i]);
 #ifdef DEBUG
             fprintf(stderr, "AC interval is %u\n", ac_interval);
 #endif
         }
-        else if(!strcmp(argv[i], "-s"))
+        else if (!strcmp(argv[i], "-S"))
         {
             if (argc <= i + 1)
-                die(false, "The \'-s\' option must be followed by a CPU number");
-            cpu = get_int(argv[++i]);
-            num_cpus = 1;
+            {
+                die(
+                    false, "The \'-S\' option must be followed by a list of "
+                    "CPU cores"
+                );
+            }
+            num_tied_cores = parse_values(argv[++i], tied_cpu_cores, MAX_TIED_CORES);
+
 #ifdef DEBUG
-            fprintf(stderr, "Managing only CPU #%u\n", cpu);
+            fprintf(stderr, "Managing only CPU core(s): %s\n", argv[i]);
 #endif
         }
 #ifdef DEBUG
-        else if(!strcmp(argv[i], "-f"))
+        else if (!strcmp(argv[i], "-f"))
         {
             if (argc <= i + 1)
-                die(false, "The \'-f\' option must be followed by the number of fake CPUs");
-            if (fake_cpu)
-                die(false, "The \'-f\' option may only be used once");
-            if (num_cpus)
-                die(false, "The \'-f\' option must come before the \'-s\' option");
-            num_cpus = get_int(argv[++i]);
+            {
+                die(
+                    false, "The \'-f\' option must be followed by the number "
+                    "of fake CPU cores"
+                );
+            }
+            num_cores = get_int(argv[++i]);
             fake_cpu = true;
-            fprintf(stderr, "%u fake CPU(s) detected\n", num_cpus);
+            fprintf(stderr, "%u fake CPU core(s) detected\n", num_cores);
         }
 #endif
         else
@@ -688,15 +908,15 @@ main(int argc, char * argv[])
                 "%s v%s\n"
                 "\n"
                 "This program monitors the system's idle percentage and reduces or raises the\n"
-                "CPUs\' clock speeds and voltages accordingly to minimize power consumption\n"
-                "when idle and maximize performance when needed.  This is the default.\n"
+                "CPU cores\' clock speeds accordingly to minimize power usage when idle and\n"
+                "maximize performance when needed. By default the program counts time used by\n"
+                "nice()d programs and time used waiting for IO as idle time.\n"
                 "\n"
-                "The program may also optionally be configured to reduce the CPUs\' clock\n"
-                "speeds if the temperature gets too high, NOT minimize their speeds if the\n"
-                "computer's AC adapter is disconnected or maximize their speeds when the AC\n"
-                "adapter is connected.\n"
+                "The program may also optionally be configured to reduce the CPU cores\' clock\n"
+                "speeds if the temperature gets too high or minimize their speeds if the\n"
+                "computer's AC adapter is disconnected.\n"
                 "\n"
-                "By default this program will manage every CPU found in the system.\n"
+                "By default this program will manage every CPU core found in the system.\n"
                 "\n"
                 "Usage: %s [Options]\n"
                 "\n"
@@ -709,21 +929,27 @@ main(int argc, char * argv[])
                 "            changes in tenths of a second (default is 20).\n"
                 "\n"
                 "        -p <fast up> <threshold>\n"
-                "            Sets the CPU idle percentage thresholds.  <fast up> is the idle\n"
+                "            Sets the CPU core idle percentage thresholds. <fast up> is the idle\n"
                 "            percentage below which a CPU will be set to the highest possible\n"
-                "            speed.  <threshold> is the idle percentage above which a CPU's\n"
+                "            speed. <threshold> is the idle percentage above which a CPU's\n"
                 "            speed will be decreased and below which a CPU's speed will be\n"
                 "            increased (defaults are 10 and 25).\n"
                 "\n"
                 "        -m <minimum speed>\n"
-                "            Sets the minimum speed in KHz below which a CPU will not be set.\n"
+                "            Sets the minimum speed in KHz below which a CPU core won't be set.\n"
                 "\n"
                 "        -M <maximum speed>\n"
-                "            Sets the maximum speed in KHz above which a CPU will not be set.\n"
+                "            Sets the maximum speed in KHz above which a CPU core won't be set.\n"
+                "\n"
+                "        -n\n"
+                "            Do not treat niced programs as idle time.\n"
+                "\n"
+                "        -w\n"
+                "            Do not treat time waiting for IO as idle time.\n"
                 "\n"
                 "        -t <temp file> <maxtemp>\n"
-                "            Sets the ACPI temperature file and the temperature at which CPUs\n"
-                "            will be set to minimum speed.\n"
+                "            Sets the ACPI temperature file and the temperature at which CPU\n"
+                "            cores will be set to minimum speed.\n"
                 "\n"
                 "        -T <interval>\n"
                 "            Sets the interval at which the temperature will be polled in\n"
@@ -732,7 +958,7 @@ main(int argc, char * argv[])
                 "\n"
                 "        -a <AC file>\n"
                 "            Sets the ACPI AC adapter state file and tells the program to set\n"
-                "            the CPUs to minimum speed when the AC adapter is disconnected.\n"
+                "            the CPU cores to minimum speed when the AC adapter is disconnected.\n"
                 "            (This is the default but is changeable by the \'-D\' option below).\n"
                 "\n"
                 "        -A <interval>\n"
@@ -751,25 +977,32 @@ main(int argc, char * argv[])
                 "        -r\n"
                 "            Restores previous speed on program exit.\n"
                 "\n"
-                "        -s <CPU>\n"
-                "            Manage only a single CPU.  <CPU> specifies the number of the CPU\n"
-                "            to manage and is in the range 0 to (n-1) where \'n\' is the number\n"
-                "            of CPUs in the system.  Without this option the program creates\n"
-                "            copies of itself to manage every CPU in the system.\n"
+                "        -S \"<CPU core 1> [[<CPU core 2>] ...]\"\n"
+                "            Manage only a single group of CPU cores.  All of the specified\n"
+                "            cores will controlled as a single group (locked to the same speed)\n"
+                "            and are in the range 0 to n-1 where \'n\' is the total number of CPU\n"
+                "            cores in the system.  Note that when specifying multiple cores the\n"
+                "            list must be enclosed in quotes.  Without this option the program\n"
+                "            creates copies of itself to manage every core of every CPU in the\n"
+                "            system and automatically determines core groups. If you are running\n"
+                "            on an old kernel and get an error message about not being able to\n"
+                "            open an \"affected_cpus\" file then you must run this program\n"
+                "            separately for each group of cores that must be controlled together\n"
+                "            (which probably means for each physical CPU) and use this option.\n"
                 "\n"
-                "    To have a CPU stay at the highest clock speed to maximize performance send\n"
-                "    the process controlling that CPU the SIGUSR1 signal.\n"
+                "    To have a CPU core stay at the highest clock speed to maximize performance\n"
+                "    send the process controlling that CPU core the SIGUSR1 signal.\n"
                  "\n"
-                "    To have a CPU stay at the lowest clock speed to maximize battery life send\n"
-                "    the process controlling that CPU the SIGUSR2 signal.\n"
+                "    To have a CPU core stay at the lowest clock speed to maximize battery life\n"
+                "    send the process controlling that CPU core the SIGUSR2 signal.\n"
                  "\n"
-                "    To resume having a CPU\'s clock speed dynamically scaled send the process\n"
-                "    controlling that CPU the SIGHUP signal.\n"
+                "    To resume having a CPU core's clock speed dynamically scaled send the\n"
+                "    process controlling that CPU core the SIGHUP signal.\n"
                  "\n"
                 "Author:\n"
-                "    Carl Thompson - cet [at] carlthompson.net  (copyright 2002 - 2005)\n"
+                "    %s\n"
                 "\n"
-                , NAME, VERSION, NAME, NAME
+                , NAME, VERSION, NAME, AUTHOR
             );
             exit(0);
         }
@@ -784,64 +1017,122 @@ main(int argc, char * argv[])
 //     child_action.sa_handler = SIG_IGN;
 //     sigaction(SIGCHLD, &child_action, 0);
 
-    // get number of CPUs
-    if (!num_cpus)
+    // get number of CPU cores
+    if (!num_cores)
     {
-        num_cpus = get_nprocs_conf();
+        num_cores = sysconf(_SC_NPROCESSORS_CONF);
+
 #ifdef DEBUG
-        fprintf(stderr, "%u CPU(s) detected.\n", num_cpus);
+        fprintf(stderr, "%u CPU core(s) detected.\n", num_cores);
 #endif
     }
 
-    saved_pids = (pid_t *)calloc(num_cpus, sizeof(pid_t));
-
-    // run in background if requested
-    if (daemonize)
-        daemon(0, 0);
-
-    // fork() a process to handle each CPU
-    for (unsigned i = 1; i < num_cpus; i++)
+    // if cpu cores to control were not specified by the -S option then figure
+    // out what cores to control by looking at the affected_cpus file in the
+    //  cpufreq dir for each core
+    if (!num_tied_cores)
     {
-        if ( !(saved_pids[i] = fork()) )
+        // iterate through all cpu cores in main process
+        for (unsigned i = 0, forked = 0; i < num_cores && !forked; i++)
         {
-            cpu = i;
-            break;
+            // does this core do cpufreq?
+            char cpufreq_dir[256];
+            snprintf(cpufreq_dir, sizeof cpufreq_dir, SYSFS_CPUFREQ_DIR, i);
+#ifdef DEBUG
+            if (fake_cpu)
+            {
+                snprintf(cpufreq_dir, sizeof cpufreq_dir, FAKE_CPUFREQ_DIR, i);
+            }
+#endif
+            if ( access(cpufreq_dir, F_OK) != 0 )
+            {
+                // this core does not have a cpufreq dir so doesn't do cpufreq
+#ifdef DEBUG
+                fprintf(
+                    stderr, "[core%u] WARNING: Skipping core because CPUFreq "
+                    "directory (%s) not found\n", i, cpufreq_dir
+                );
+#endif
+                continue;
+            }
+
+            // get list of affected cpu cores that this core belongs to
+            char acfn[256];
+            snprintf(acfn, sizeof acfn, SYSFS_AFFECTED_CPUS_FILE, i);
+#ifdef DEBUG
+            if (fake_cpu)
+            {
+                snprintf(acfn, sizeof acfn, FAKE_AFFECTED_CPUS_FILE, i);
+            }
+#endif
+            unsigned cores[MAX_TIED_CORES];
+            int n = read_values(acfn, cores, MAX_TIED_CORES);
+
+            // if we can't figure out the affected cores
+            if (n == 0)
+            {
+                die(
+                    false, "[core%u] Could not read affected cores from: %s",
+                    i, acfn
+                );
+            }
+
+            // if this cpu core is the master of a group of tied cores then
+            // fork() a process to handle this core group
+            if (cores[0] == i)
+            {
+#ifdef DEBUG
+                fprintf(
+                    stderr, "[core%u] This core is controlled by me.\n", i
+                );
+#endif
+                // if this is not the first cpu core then fork()
+                if ((i == 0) || (forked = !fork()))
+                {
+                    memcpy(tied_cpu_cores, cores, sizeof tied_cpu_cores);
+                    num_tied_cores = n;
+                }
+            }
+            else
+            {
+#ifdef DEBUG
+                fprintf(
+                    stderr, "[core%u] This core is controlled by core #%u\n",
+                    i, cores[0]
+                );
+#endif
+            }
         }
     }
 
-    // if possible, set the proccess title to a more descriptive version
-    if (num_cpus > 1)
+
+#ifdef DEBUG
+    fprintf(
+        stderr, "[core%u] Cores controlled by this core:",
+        tied_cpu_cores[0]
+    );
+    for (unsigned i = 0; i < num_tied_cores; i++)
+    {
+        fprintf(stderr, " %u", tied_cpu_cores[i]);
+    }
+    fprintf(stderr, "\n");
+#endif
+
+    if (num_tied_cores == 0)
     {
-        char tmp[32];
-        if ((size_t)snprintf(tmp, sizeof tmp, "%s#%u", NAME, cpu) <= strlen(argv[0]))
-            strcpy(argv[0], tmp);
+        die(false, "Could not find any CPUFreq controlled CPU cores to manage");
     }
 
     STAT_FILE = PROC_STAT_FILE;
-#ifdef WITH_PROC
-    struct utsname un;
-    uname(&un);
-    if (!strncmp(un.release, "2.4", 3))
-    {
-        MIN_SPEED_FILE = dup_cpu_str(PROC_MIN_SPEED_FILE);
-        MAX_SPEED_FILE = dup_cpu_str(PROC_MAX_SPEED_FILE);
-        CURRENT_SPEED_FILE = dup_cpu_str(PROC_CURRENT_SPEED_FILE);
-        GOVERNOR_FILE = PROC_GOVERNOR_FILE;
-        USERSPACE = PROC_USERSPACE;
-    }
-    else
-#endif
-    {
-        MIN_SPEED_FILE = dup_cpu_str(SYSFS_MIN_SPEED_FILE);
-        MAX_SPEED_FILE = dup_cpu_str(SYSFS_MAX_SPEED_FILE);
-        CURRENT_SPEED_FILE = dup_cpu_str(SYSFS_CURRENT_SPEED_FILE);
-        GOVERNOR_FILE = dup_cpu_str(SYSFS_GOVERNOR_FILE);
-        USERSPACE = SYSFS_USERSPACE;
-    }
+    MIN_SPEED_FILE = dup_cpu_str(SYSFS_MIN_SPEED_FILE);
+    MAX_SPEED_FILE = dup_cpu_str(SYSFS_MAX_SPEED_FILE);
+    CURRENT_SPEED_FILE = dup_cpu_str(SYSFS_CURRENT_SPEED_FILE);
+    GOVERNOR_FILE = dup_cpu_str(SYSFS_GOVERNOR_FILE);
+    USERSPACE = SYSFS_USERSPACE;
 #ifdef DEBUG
     if (fake_cpu)
     {
-         STAT_FILE = FAKE_STAT_FILE;
+        STAT_FILE = FAKE_STAT_FILE;
         MIN_SPEED_FILE = dup_cpu_str(FAKE_MIN_SPEED_FILE);
         MAX_SPEED_FILE = dup_cpu_str(FAKE_MAX_SPEED_FILE);
         CURRENT_SPEED_FILE = dup_cpu_str(FAKE_CURRENT_SPEED_FILE);
@@ -861,7 +1152,9 @@ main(int argc, char * argv[])
     write_line(GOVERNOR_FILE, "%s\n", USERSPACE);
 
     if (access(CURRENT_SPEED_FILE, W_OK) < 0)
+    {
         die(true, "Cannot write to speed control file: %s", CURRENT_SPEED_FILE);
+    }
 
     // set up signal handling
     struct sigaction signal_action;
@@ -929,6 +1222,13 @@ main(int argc, char * argv[])
     unsigned ac_interval_timeout = 0;
     unsigned next_timeout, d;
     timespec timeout;
+
+    // run in background if requested - CET - FIXME
+    if (daemonize)
+    {
+        daemon(0, 0);
+    }
+
     // main loop
     while (1)
     {
@@ -960,13 +1260,15 @@ main(int argc, char * argv[])
         }
 
         if (check_cpu || check_ac || check_therm)
+        {
             raise(SIGALRM);
+        }
 
         d = next_timeout - counter;
         timeout.tv_sec = d / 10;
         timeout.tv_nsec = (d % 10) * 100000000LU;
         while (nanosleep(&timeout, &timeout) == -1 && errno == EINTR)
-            ;
+        {} // loop just makes sure all of timeout has passed
 
         counter = next_timeout;
     }
@@ -975,4 +1277,4 @@ main(int argc, char * argv[])
     return 0;
 }
 
-/* $Id: $ */
+/* $Id: cpuspeed.cc 7 2007-02-06 01:20:52Z carl $ */

cpuspeed-1.2.1-no-affected_cpus-fallback.patch:

--- NEW FILE cpuspeed-1.2.1-no-affected_cpus-fallback.patch ---
--- cpuspeed-1.2.1/cpuspeed.cc~	2008-09-26 17:16:19.000000000 -0400
+++ cpuspeed-1.2.1/cpuspeed.cc	2008-09-26 17:16:38.000000000 -0400
@@ -158,6 +158,8 @@ unsigned last_step; // lowest speed step
 // which CPU cores are we controlling
 unsigned tied_cpu_cores[MAX_TIED_CORES];
 unsigned num_tied_cores = 0;
+unsigned cpu = 0;
+bool no_affected_cpus_attr = false;
 
 // display an error message and exit the program
 void
@@ -484,12 +486,16 @@ get_times(
     if (nice_counts_as_idle)
     {
         idle_time += nice_time;
+    } else {
+        user_time += nice_time;
     }
 
     // count IO wait time as idle time
     if (io_counts_as_idle)
     {
         idle_time += wait_time;
+    } else {
+        user_time += wait_time;
     }
 
     unsigned long total_time = user_time + system_time + idle_time;
@@ -710,6 +716,7 @@ unsigned num_cores = 0; // how many CPU 
 // restore  initial speed on program exit
 unsigned saved_speed = 0;
 char saved_governor[32];
+pid_t * saved_pids;
 
 void
 term_handler(int which)
@@ -720,6 +727,12 @@ term_handler(int which)
         write_line(GOVERNOR_FILE, "%s\n", saved_governor);
     }
 
+    if (cpu == 0 && no_affected_cpus_attr)
+    {
+        for (unsigned i = 1; i < num_cores; i++)
+            kill(saved_pids[i], which);
+    }
+
     raise(which);
 }
 
@@ -1032,9 +1045,11 @@ main(int argc, char * argv[])
     //  cpufreq dir for each core
     if (!num_tied_cores)
     {
+        fprintf(stderr, "No cores spec'd, trying to figure it out...\n");
         // iterate through all cpu cores in main process
         for (unsigned i = 0, forked = 0; i < num_cores && !forked; i++)
         {
+	    int n;
             // does this core do cpufreq?
             char cpufreq_dir[256];
             snprintf(cpufreq_dir, sizeof cpufreq_dir, SYSFS_CPUFREQ_DIR, i);
@@ -1066,7 +1081,14 @@ main(int argc, char * argv[])
             }
 #endif
             unsigned cores[MAX_TIED_CORES];
-            int n = read_values(acfn, cores, MAX_TIED_CORES);
+            if (access(acfn, F_OK) != 0)
+            {
+                // fall back to the old 1.2.x method of forking for each core
+                no_affected_cpus_attr = true;
+                n = 1;
+            }
+            else
+                n = read_values(acfn, cores, MAX_TIED_CORES);
 
             // if we can't figure out the affected cores
             if (n == 0)
@@ -1101,8 +1123,22 @@ main(int argc, char * argv[])
                     i, cores[0]
                 );
 #endif
+            if (no_affected_cpus_attr)
+                break;
             }
         }
+
+        if (no_affected_cpus_attr)
+        {
+            saved_pids = (pid_t *)calloc(num_cores, sizeof(pid_t));
+
+            // fork() a process to handle each core
+            for (unsigned i = 1; i < num_cores; i++)
+                if ( !(saved_pids[i] = fork())) {
+                    cpu = i;
+                    break;
+                }
+        }
     }
 
 


Index: cpuspeed.init
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- cpuspeed.init	13 Mar 2008 02:10:30 -0000	1.39
+++ cpuspeed.init	26 Sep 2008 21:23:31 -0000	1.40
@@ -88,7 +88,7 @@
   if [ -n "$MAX_SPEED" ]; then
     OPTS="$OPTS -M $MAX_SPEED"
   fi
-  if [ "$IGNORE_NICE" -eq 0 ]; then
+  if [ "$IGNORE_NICE" -eq 1 ]; then
     OPTS="$OPTS -n"
   fi
   daemon $prog -d $OPTS
@@ -135,14 +135,14 @@
           [ -d ${cpu0freqd} ] || /sbin/modprobe -r acpi-cpufreq 2> /dev/null
         else
           # No scaling. Just exit.
-          return 0
+          return 6
         fi
       fi
     fi
 
     # If we get this far with no driver, we must have no scaling.
     # We're doomed.
-    [ ! -f ${cpu0freqd}/scaling_driver ] && return 0
+    [ ! -f ${cpu0freqd}/scaling_driver ] && return 6
 
     # Okay, we have a driver, carry on...
     drv=`cat ${cpu0freqd}/scaling_driver`


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- cpuspeed.spec	15 Jul 2008 19:03:36 -0000	1.68
+++ cpuspeed.spec	26 Sep 2008 21:23:31 -0000	1.69
@@ -1,7 +1,7 @@
 Summary:        CPU frequency adjusting daemon
 Name:           cpuspeed
 Version:        1.2.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -17,14 +17,13 @@
 Requires(preun): /sbin/service
 
 BuildRequires:  automake util-linux groff gettext
-ExclusiveArch:	i386 x86_64 ppc ppc64 ia64 sparcv9 sparc64 
+ExclusiveArch:	i386 x86_64 ppc ppc64 ia64 sparcv9 sparc64
 Obsoletes:	kernel-utils
 
-Patch1:         warning.diff
-Patch2:         idlenice.diff
-Patch3:         cpuspeed-1.2.1-make.patch
-Patch4:         cpuspeed-1.2.1-make-gcc43-happy.patch
-Patch5:         cpuspeed-1.2.1-multicore-workaround.patch
+Patch1:         cpuspeed-1.2.1-make.patch
+Patch2:         cpuspeed-1.2.1-make-gcc43-happy.patch
+Patch3:         cpuspeed-1.2.1-multicore-support.patch
+Patch4:         cpuspeed-1.2.1-no-affected_cpus-fallback.patch
 
 %description
 cpuspeed is a daemon that dynamically changes the speed
@@ -38,14 +37,11 @@
 
 %prep
 %setup -q
-
 cp %{SOURCE1} .
-
-%patch1 -p1 -b .warn
-%patch2 -p1 -b .idle
-%patch3 -p1 -b .make
-%patch4 -p1 -b .gcc43
-%patch5 -p1 -b .multicore
+%patch1 -p1 -b .make
+%patch2 -p1 -b .gcc43
+%patch3 -p1 -b .mc
+%patch4 -p1 -b .ac
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -89,6 +85,10 @@
 exit 0
 
 %changelog
+* Fri Sep 26 2008 Jarod Wilson <jarod at redhat.com> 1.2.1-9
+- backport proper multicore support for userspace governor
+  (cpuspeed daemon) case from v1.5 cpuspeed snapshot
+
 * Tue Jul 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.1-8
 - fix license tag
 
@@ -108,7 +108,7 @@
 * Wed Aug 29 2007 Jarod Wilson <jwilson at redhat.com> 1.2.1-3
 - Bump and rebuild, due to busted ppc32
 
-* Sat Jul 07 2007 Jarod Wilson <jwilson at redhat.com>
+* Sat Jul 07 2007 Jarod Wilson <jwilson at redhat.com> 1.2.1-2
 - Account for the cpuidle feature in rawhide kernels,
   slated for release in kernel 2.6.23 (#247352)
 
@@ -176,8 +176,8 @@
 - Don't start on xen kernels (freq scaling not supported)
 
 * Thu Dec 14 2006 Jarod Wilson <jwilson at redhat.com>
-- Set lock file for centrino/powernow-k8 so status 
-  indicates we do have scaling working 
+- Set lock file for centrino/powernow-k8 so status
+  indicates we do have scaling working
 - Fix up centrino/powernow-k8 stop function (#213999)
 
 * Wed Nov 29 2006 Jarod Wilson <jwilson at redhat.com>


--- cpuspeed-1.2.1-multicore-workaround.patch DELETED ---


--- cpuspeed.patch DELETED ---


--- idlenice.diff DELETED ---


--- warning.diff DELETED ---



From ausil at fedoraproject.org  Fri Sep 26 21:29:56 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 26 Sep 2008 21:29:56 +0000 (UTC)
Subject: rpms/compat-gcc-34/F-9 compat-gcc-34.spec,1.9,1.10
Message-ID: <20080926212956.86D527010C@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/compat-gcc-34/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4427

Modified Files:
	compat-gcc-34.spec 
Log Message:
allow building as sparcv9



Index: compat-gcc-34.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compat-gcc-34/F-9/compat-gcc-34.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- compat-gcc-34.spec	1 Feb 2008 22:52:51 -0000	1.9
+++ compat-gcc-34.spec	26 Sep 2008 21:29:26 -0000	1.10
@@ -16,7 +16,7 @@
 Summary: Compatibility GNU Compiler Collection
 Name: compat-gcc-34
 Version: 3.4.6
-Release: 9
+Release: 10
 # libgcc and crtstuff have an exception which allows
 # linking it into any kind of programs or shared libraries without
 # restrictions.
@@ -45,7 +45,7 @@
 Requires: glibc-devel >= 2.2.90-12
 Requires: libgcc >= 4.1.0
 BuildRequires: elfutils-devel >= 0.72
-%ifarch %{multilib_64_archs} sparc ppc
+%ifarch %{multilib_64_archs} sparc sparcv9 ppc
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
 %endif
@@ -117,13 +117,13 @@
 Patch101: gcc34-makeinfo.patch
 
 %define _gnu %{nil}
-%ifarch sparc
+%ifarch sparc sparcv9
 %define gcc_target_platform sparc64-%{_vendor}-linux
 %endif
 %ifarch ppc
 %define gcc_target_platform ppc64-%{_vendor}-linux
 %endif
-%ifnarch sparc ppc
+%ifnarch sparc sparcv9 ppc
 %define gcc_target_platform %{_target_cpu}-%{_vendor}-linux
 %endif
 
@@ -171,7 +171,7 @@
 
 %prep
 %setup -q -n gcc-%{version}-%{DATE}
-%ifarch sparc ppc
+%ifarch sparc sparcv9 ppc
 %patch1 -p0 -b .multi32-hack~
 %endif
 %patch2 -p0 -b .ice-hack~
@@ -275,7 +275,7 @@
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mtune=nocona//g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mtune=generic//g'`
 %endif
-%ifarch sparc sparc64
+%ifarch sparc sparcv9 sparc64
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g'`
 %endif
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-Wall//g' -e 's/-Wp,-D_FORTIFY_SOURCE=2//g'`
@@ -305,13 +305,13 @@
 	--enable-shared --enable-threads=posix --disable-checking \
 	--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
 	--enable-languages=c,c++,f77 --disable-libgcj \
-%ifarch sparc
+%ifarch sparc sparcv9
 	--host=%{gcc_target_platform} --build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=v7
 %endif
 %ifarch ppc
 	--host=%{gcc_target_platform} --build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=default32
 %endif
-%ifnarch sparc ppc
+%ifnarch sparc sparcv9 ppc
 	--host=%{gcc_target_platform}
 %endif
 
@@ -400,7 +400,7 @@
 chmod 755 $RPM_BUILD_ROOT/%{_lib}/libgcc_s-%{version}-%{DATE}.so.1
 ln -sf libgcc_s-%{version}-%{DATE}.so.1 $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so.1
 ln -sf /%{_lib}/libgcc_s.so.1 $FULLPATH/libgcc_s.so
-%ifarch sparc ppc
+%ifarch sparc sparcv9 ppc
 ln -sf /lib64/libgcc_s.so.1 $FULLPATH/libgcc_s_64.so
 %endif
 %ifarch %{multilib_64_archs}
@@ -426,7 +426,7 @@
   $RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{gcc_target_platform}/%{version}/specs
 %endif
 
-%ifarch sparc ppc
+%ifarch sparc sparcv9 ppc
 ln -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target_platform}-gcc \
   $RPM_BUILD_ROOT%{_prefix}/bin/%{_target_platform}-gcc
 %endif
@@ -458,7 +458,7 @@
 else
 ln -sf ../../../../%{_lib}/libg2c.so.0.* libg2c.so
 fi
-%ifarch sparc ppc
+%ifarch sparc sparcv9 ppc
 mkdir -p 64
 ln -sf ../`echo ../../../../lib/libg2c.so.0.* | sed s~/lib/~/lib64/~` 64/libg2c.so
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libg2c.*a 64/
@@ -496,7 +496,7 @@
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib/lib*.so*
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib/lib*.a
 %else
-%ifarch sparc ppc
+%ifarch sparc sparcv9 ppc
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/lib*.so*
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/lib*.a
 %endif
@@ -526,7 +526,7 @@
 %defattr(-,root,root)
 %{_prefix}/bin/gcc34
 %{_prefix}/bin/gcov34
-%ifarch sparc ppc
+%ifarch sparc sparcv9 ppc
 %{_prefix}/bin/%{_target_platform}-gcc34
 %endif
 %ifarch sparc64
@@ -574,7 +574,7 @@
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{version}/libgcov.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{version}/libgcc_eh.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{version}/libgcc_s.so
-%ifarch sparc ppc
+%ifarch sparc sparcv9 ppc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{version}/64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{version}/64/crt*.o
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{version}/64/libgcc.a
@@ -604,7 +604,7 @@
 %dir %{_prefix}/libexec/gcc/%{gcc_target_platform}
 %dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{version}
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{version}/cc1plus
-%ifarch sparc ppc
+%ifarch sparc sparcv9 ppc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{version}/64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{version}/64/libstdc++.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{version}/64/libstdc++_shared.so
@@ -646,7 +646,7 @@
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{version}/libfrtbegin.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{version}/libg2c.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{version}/libg2c.so
-%ifarch sparc ppc
+%ifarch sparc sparcv9 ppc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{version}/64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{version}/64/libfrtbegin.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{version}/64/libg2c.a
@@ -666,6 +666,9 @@
 %{_prefix}/%{_lib}/libg2c.so.0*
 
 %changelog
+* Fri Sep 26 2008 Dennis Gilmore <dennis at ausil.us> 3.4.6-10
+- setup to allow builing on sparcv9
+
 * Fri Feb  1 2008 Jakub Jelinek  <jakub at redhat.com> 3.4.6-9
 - rebuild with gcc 4.3, allow libstdc++ 4.1.0 ... 4.3.x
 



From spot at fedoraproject.org  Fri Sep 26 22:01:05 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 26 Sep 2008 22:01:05 +0000 (UTC)
Subject: rpms/asylum/devel asylum-0.2.4-makefile.patch, NONE, 1.1 asylum.spec,
	1.7, 1.8 asylum-0.2.2-makefile.patch, 1.1, NONE
Message-ID: <20080926220106.0498D7010C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/asylum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8221

Modified Files:
	asylum.spec 
Added Files:
	asylum-0.2.4-makefile.patch 
Removed Files:
	asylum-0.2.2-makefile.patch 
Log Message:
fix makefile patch

asylum-0.2.4-makefile.patch:

--- NEW FILE asylum-0.2.4-makefile.patch ---
diff -up asylum-0.2.4/Makefile.BAD asylum-0.2.4/Makefile
--- asylum-0.2.4/Makefile.BAD	2008-09-26 17:44:11.000000000 -0400
+++ asylum-0.2.4/Makefile	2008-09-26 17:45:07.000000000 -0400
@@ -4,7 +4,8 @@ HOST=generic
 
 CC=g++
 RM=rm
-CFLAGS= -O3 -funsigned-char \
+RPMFLAGS =
+CFLAGS= $(RPMFLAGS) -funsigned-char \
 	-DRESOURCEPATH=\"$(INSTALLRESOURCEPATH)\" \
 	-DSCOREPATH=\"$(INSTALLHISCORES)\"
 LIBS= -lm -lSDL -lSDL_mixer
@@ -44,8 +45,8 @@ ifeq ($(HOST),mingw)
 	LIBS=-lm -lmingw32 -lSDL_mixer -lSDLmain -lSDL -mwindows
 endif
 ifeq ($(HOST),generic)
-	INSTALLBIN=/usr/games/asylum
-	INSTALLRESOURCEPATH=/usr/share/games/asylum
+	INSTALLBIN=/usr/bin/asylum
+	INSTALLRESOURCEPATH=/usr/share/asylum
 	INSTALLHISCORES=/var/games/asylum
 endif
 


Index: asylum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asylum/devel/asylum.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- asylum.spec	29 Aug 2008 03:51:15 -0000	1.7
+++ asylum.spec	26 Sep 2008 22:00:35 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           asylum
 Version:        0.2.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        SDL port of the game Asylum, originally for the Archimedes
 Group:          Amusements/Games
 # For detailed licensing, see the README
@@ -8,7 +8,7 @@
 URL:            http://sdl-asylum.sourceforge.net
 Source0:        http://downloads.sourceforge.net/sdl-%{name}/%{name}-%{version}.tar.gz
 Source1:        %{name}.png
-Patch:          asylum-0.2.2-makefile.patch
+Patch:          asylum-0.2.4-makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
 BuildRequires:  SDL_mixer-devel
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.4-3
+- fix makefile patch to apply properly
+
 * Fri Aug 29 2008 Michael Fleming <mfleming+rpm at enlartenment.com> - 0.2.4-2
 - New builders don't like Patch0 declaration, adjust make it happy
 


--- asylum-0.2.2-makefile.patch DELETED ---



From toshio at fedoraproject.org  Fri Sep 26 22:28:05 2008
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri, 26 Sep 2008 22:28:05 +0000 (UTC)
Subject: rpms/trac-bazaar-plugin/F-9 trac-bzr-get-ancestry.patch, NONE,
	1.1 trac-bzr-no-repo.patch, NONE, 1.1 trac-bazaar-plugin.spec,
	1.5, 1.6 trac-bazaar-extra-return.patch, 1.2, NONE
Message-ID: <20080926222806.021267010C@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/trac-bazaar-plugin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11691

Modified Files:
	trac-bazaar-plugin.spec 
Added Files:
	trac-bzr-get-ancestry.patch trac-bzr-no-repo.patch 
Removed Files:
	trac-bazaar-extra-return.patch 
Log Message:

* Fri Sep 26 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.2-7.20080925bzr49
- Patches to fix: lp:274609, lp:263300, lp:267700


trac-bzr-get-ancestry.patch:

--- NEW FILE trac-bzr-get-ancestry.patch ---
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: toshio at fedoraproject.org-20080926194447-\
#   p1clsut84zvu2kfo
# target_branch: bzr+ssh://toshio at bazaar.launchpad.net/%7Etrac-bzr-\
#   team/trac-bzr/trunk/
# testament_sha1: 53b461068e37868f49da2b65cedc34da8e8d5208
# timestamp: 2008-09-26 13:56:31 -0700
# base_revision_id: toshio at fedoraproject.org-20080926193207-\
#   a1bosfhjpm7hgpgw
# 
# Begin patch
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2008-09-26 17:34:32 +0000
+++ tracbzr/backend.py	2008-09-26 19:44:47 +0000
@@ -693,13 +693,12 @@
 
     def _merging_history(self):
         """Iterate through history revisions that merged changes to this node
-        
+
         This includes all revisions in which the revision_id changed.
         It may also include a few revisions in which the revision_id did not
         change, if the modification was subsequently undone.
         """
-        weave = self.tree._get_weave(self.entry.file_id)
-        file_ancestry = weave.get_ancestry(self.entry.revision)
+        file_ancestry = self.repo.get_ancestry(self.entry.revision)
         # Can't use None here, because it's a legitimate revision id.
         last_yielded = 'bogus:'
         for num, revision_id, depth, revno, eom in \

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQrz0HIAA/9fgAQQUWP//14I
FAC//9/wYAdcH3ypQaDY2bGAaDbZtsYaGgAAA0AAAAAYaGgAAA0AAAAAYaGgAAA0AAAAAJEhATJo
CnqPU9Jk/UmIGmmQ/VNAioQU2ESe0J6Yqn6aNqNDTUZRpp6mCSgCZNMkankp6mNJkam0g9QAaQX7
NmOufI1MtiPLQ0KiRbucjaq0EIaRamF3DCT1OCiODEuMeFcPkUUanPGldvruFaeK18RfQ3DGwbPS
gGkplQZQsmSJQQDhwcoywYbfF+My/OVTxTmyze/PYrVXcWSmuTIRpKmlC/U7PKHM1pjYa9KSB4Va
TF+qY21y/enw7O3tyPqui95yLDOfN3Pind/bbPnKXQAjCOS7+4YRQluvRXgxrOXtxdo64d5QGgVw
dp5LRTywbwnHZAfES6fjtmnNXDsoZeFgZDBUmGg1w929vHGvsfd6oGNXjGMIRv0DugMYLY7MTdvh
ukgbBiJepAa7xCJGB37QKCilIayQrMtSQVKpkqjEkc5jaNtXUiLSQqiSNChA6e84CsamhDVaK3X5
xymvYsUYzIJoboJiwDSRzGmgin5VCR2oRQqXMyEEOGJfYUipceFtMBNNTtBCJJadcHa0ETMdpxDc
V0uZ9CKllukjyLXJkB97oPQoLnVmVfAHPzJjTIUurIiJpXOpIudCQjUqPEwzuMqLge0gczqUMyBM
sSBjpMb8TIIFhqJkgiFTQhDJwhwrFRpS4oibcYZqpnATZPLH2CYNRM5WMDTAniGisQw1vgJ9TTOp
kdtA1HLBO5UgUJlZne2cym8fDjM1G4uLjImMg2HQW4Ve8gZIzYDDmkjhjR5DSS4GxqXwUXAtkUO7
jW8i+EnCYK0Occyo2qUSbRpIvcQ5ZHM1KSLHLQ1AeONjgPxSvjlgTigknmZBzWClM6CpIjrQeWOT
FEHrI1GGDQgRC/0B5riYxIWlUJtmxGjSzCo8iWMGo081SbAzVWAxGwDiqNaE86XD7oXa4Z5zIHVg
hvO11eTUMiVLAiWkQiEdzQ2dDMbWpb1JVKFIZN1JqZRsMRCuuFMwYwabGenXryKqSUWquwvgggRC
Bov7J4tjOplpnZzE60QNHyS7CZ1GGfeFWZ3hI+/yNvI8ztgUmrQ5Ovd5uKiD6iI7ZwF0S3U/07NA
WwRdmoAvvgMe6doPRqs5+JyMS0yImJpGg3nIg4UGBibzItXX2JocSJfN3qfbtIBoMy87zh82B1YQ
uVskxZCwF8KJCh8a4Ku5qQsrCo3PiKAoARGrc4KFhJxMj9TMg7sjxmIULdvb5YNmnaLh5g9Pd/Uz
IEDEY9TzPAkbDjc4X0MJcxTNGKqwnoMjqdCG20teX/CF8Pvv0aXELg36hiQwHgFYyrIfgYNiHSKB
/8A147XEe2ysAquGdC4MMmDKxR8K1k8eAQwDI4nA7zIpMTI4n3IGZen6Eadyb1+DyP93Jv8BiB9+
rNigFY3BZN3K/BnV0D2Xon6fJc0ymGO4TkGvQskXes07ad3sJmxAn3B5wDY3i5e2NI+qdmlfeYby
hCz5l+fBmZOKLtUbPq1R9tk6QF1MSXQR+TEMK16eIkgwgPqNuCFdgH9vQfNfr1CwlmyGwebU3c17
I9qxGMFmGxxa3CDQ3p1iIRmGNy5I4CLKgc4QUYk7UukTA2pwNCFD6MSb/F56NIfgZyjQDCCsEO98
t0JOMZnXPH4CNAjxxMNJAFqqcpwpUfloLiABQhmIyQDDStrOL8L+2IjJPteW7t+8Yt2xgcHg8AJT
p+ahDevRcXE7YppyEbW0CCa3AS4LxokYmgjBCBRpQ7gixEa2bMLinKoAqcQUbpr/JNMJgh4ZoA9w
roZPAbyELvL6SAMtwqywTYh2NJpptNcSTWwVakpjBhtHqOHT51xlWsE0pFF3qMEiaANtOosFJibN
A9wN9RdIMpL5mpPyWrEkNTzYWyqqCvEzPELOqo5DKEU+auFEwJ5WE5BkpINFmmDF6rmfYHtTIUEE
J4Lvs4EiySbvu3zFgwMZnk6icTAT0HnyTxHi0tun9uqI0nmtYaBIt8IKUZ0SF68hHqLslvLuEMiI
ipAdwG6LkJg0QhhfRUXgI2LQfmL/i7kinChIBXnoOQA=

trac-bzr-no-repo.patch:

--- NEW FILE trac-bzr-no-repo.patch ---
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: toshio at fedoraproject.org-20080926193207-\
#   a1bosfhjpm7hgpgw
# target_branch: bzr+ssh://toshio at bazaar.launchpad.net/%7Etrac-bzr-\
#   team/trac-bzr/trunk/
# testament_sha1: 0fc78cc950867e4ff69212179ba985319da19ccc
# timestamp: 2008-09-26 13:55:31 -0700
# base_revision_id: jelmer at samba.org-20080831143707-uh5nrs0ld4eg235t
# 
# Begin patch
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2008-08-21 10:24:43 +0000
+++ tracbzr/backend.py	2008-09-26 17:34:32 +0000
@@ -133,6 +133,7 @@
     def __init__(self, location, log):
         versioncontrol.Repository.__init__(self, location, None, log)
         self.root_transport = transport.get_transport(location)
+        self.repo = bzrdir.BzrDir.open_from_transport(self.root_transport).open_repository()
         self._tree_cache = {}
         self._locked_branches = []
         self._branch_cache = {}
@@ -237,7 +238,6 @@
         revid = urllib.unquote(rev)
         if revid in ('current:', 'null:'):
             return None, revid
-        return None, revid
         if self.repo.has_revision(revid):
             return None, revid
 

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUYC7ksAAoFfgAQQUWP//14I
FAC//9/wUAV4vWwCpaIhoKpCSSnqeqemRHqbBoptCehNNGgDQYYaGgAAA0AAAAAJEhDSYkxT2qY1
A9QeoPU0NPUb1T0hhoaAAADQAAAAAkoCNNNBMgamTJlPEk2JAHqekbMcu29n60NDbv3RtLRQmlkN
b3jqcTW9gZ/S3tmRg5U67lZ+DHMPtsba6UDSU7FjCxZJtZhrPDIr75UeA5u7Z+9ZUvtkpLTSVdVn
5n4phpZA8oCKy/nl3+2Y4FZX2w0PraT7bDHsuEPf1E9pjEHI1mZp/HK7Kd0CoEbTV1CPPaazjAXd
BjDJz6chnbBcxMQnrmfgiWBdA8zikd9uDnRkVbDMUa2HUUoE9xDdcOxXlhZBcpBMVZAiaVyaFbNW
xBy2i++CCbcYWDzZ8XQFbiUORcX/Z8CZYxkTRNoJl42Iwmgt/H3PORAJXEyEEplhicrRGyszSQ0c
GNRmM6i4mZfA+UFdhkhcaObMXMxj5Daiu8W3GCCoLo3ZkUFo4TC0nIWY9pjskbSq0sGG6Q4taoki
JQfNqBoqFarIlTISPuHYGrUsBSQY23NbwChfOrpQxHEdRW9xDoSyM9cSJqMxhkcBYi1MITYMwQmD
ybpFpmF5Iw1U2W0ETwmSSgwpRBEjsKTLzZbghprPkKXX3A4rBEx7UquRUQkYTJherTAkTDDkY5Yg
GF4Q5sLiDMyGcSliuL2AxakOJLIUIG8PYWF/RyR7jBbrz3KwbfUOKxCgOTD1cWzkegkWEEmTsIJl
Fkkr7xTxYxjb6cdfYWUkRU1XVhKBMNXHKjfB17hUTGvsHEsJ9PBDefWG+aYW2czEIi9UD/HKAtYZ
EKlkYQbJhFVTA55jN5u1FBtJBYiOti2BUVngYBSpVm0bo/zFnWdTub/Vi0m00rcMViPJ4A1mcWwG
q3AgbhPB6GGoyK5oHGZZ4O5B3BcK0lCnp68sM+MWuwPR3oTePvh1OAwzNZ1oGARmwrKPFuMMH5v9
JVc6WmSWm2KuGiK8lFKP9ExaJkj+ZT2VFguyaURnB4omRAapAeWqs0l5cXkSBYcTSYFC5JKGdUh6
7KFUyOfAsEjIKchSI8jaG9fhoDuG14m4i4l0gcgNYQPjLsg5DQlkLEzQbu3aIdVRf24NCAp/1wGj
zegMkBZ8+qA75QBgK4a72SXwaBvmHjmgct7FbuFZNH5PYXZfPcmO6DhdiR2COV6GiawHimaFgQNg
eaBoehWZrcgtoOcIyYh8Acl2DhUFQ6ET8Q+V2J4CgSAqYgYLjn1cb24/wQgkuBuQFVRo9QQH5Imo
YIiLoknCRuoiagI9w+hqScF+0pu1mzoM4nE4odBfzIFuD7hoaF7Qp5JKhRDFib0Go2qLtCQ1gDCN
wtiampKY/qsqvKwRPlAjeeB2AxJytEj3J3FbxN1JLhbBwjDIVRWDGCYIuM1sFaUJgx7w5i7+vOLw
axUIDuQDCLka87y0KmFYns2wZKPUwORgxCsHmo7kgun5lthTeVKFprKjLsQgVxUWS1DYdTgcwe0Z
BaeK9Y4rlm0KMRc86lxAWiDv0XoLkRM7/ouqOyVhJA0vFwQHbBBxC3FAx6B5BGKMlNrBkJnZQofN
BkeQ/+LuSKcKEgjAXclg


Index: trac-bazaar-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/F-9/trac-bazaar-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- trac-bazaar-plugin.spec	26 Sep 2008 00:49:43 -0000	1.5
+++ trac-bazaar-plugin.spec	26 Sep 2008 22:27:35 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           trac-bazaar-plugin
 Version:        0.2
-Release:        6.20080925bzr%{bzrrev}%{?dist}
+Release:        7.20080925bzr%{bzrrev}%{?dist}
 Summary:        Bazaar plugin for Trac
 
 Group:          Applications/Internet
@@ -17,7 +17,11 @@
 # tarball lands in trac-bzr/dist/
 Source0:        TracBzr-%{version}.tar.gz
 # https://bugs.launchpad.net/trac-bzr/+bug/274609
-Patch0: trac-bazaar-extra-return.patch
+# and
+# https://bugs.launchpad.net/trac-bzr/+bug/267700
+Patch0: trac-bzr-no-repo.patch
+# https://bugs.launchpad.net/trac-bzr/+bug/263300
+Patch1: trac-bzr-get-ancestry.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -36,7 +40,8 @@
 
 %prep
 %setup -n TracBzr-%{version} -q
-%patch0 -p0
+%patch0 -p0 -b .norepo
+%patch1 -p0 -b .ancestor
 
 %build
 %{__python} setup.py build
@@ -56,6 +61,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Fri Sep 26 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.2-7.20080925bzr49
+- Patches to fix: lp:274609, lp:263300, lp:267700
+
 * Thu Sep 25 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.2-6.20080925bzr49
 - New upstream snapshot that includes our patches, fixes for bzr-1.6+ and
   trac-0.11.


--- trac-bazaar-extra-return.patch DELETED ---



From bpepple at fedoraproject.org  Fri Sep 26 22:45:22 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Fri, 26 Sep 2008 22:45:22 +0000 (UTC)
Subject: rpms/telepathy-glib/devel .cvsignore, 1.16, 1.17 sources, 1.16,
	1.17 telepathy-glib.spec, 1.23, 1.24
Message-ID: <20080926224522.5C36E7010C@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13368

Modified Files:
	.cvsignore sources telepathy-glib.spec 
Log Message:
* Fri Sep 26 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.16-1
- Update to 0.7.16.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	19 Sep 2008 20:38:02 -0000	1.16
+++ .cvsignore	26 Sep 2008 22:44:51 -0000	1.17
@@ -1 +1 @@
-telepathy-glib-0.7.15.tar.gz
+telepathy-glib-0.7.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	19 Sep 2008 20:38:02 -0000	1.16
+++ sources	26 Sep 2008 22:44:51 -0000	1.17
@@ -1 +1 @@
-fdf836e1c4d4c7b6e0b4cfb7be2f0e3e  telepathy-glib-0.7.15.tar.gz
+c35a51feb27ef123f0895596f8de2455  telepathy-glib-0.7.16.tar.gz


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- telepathy-glib.spec	19 Sep 2008 20:38:02 -0000	1.23
+++ telepathy-glib.spec	26 Sep 2008 22:44:51 -0000	1.24
@@ -3,7 +3,7 @@
 %define	glib_ver	2.16
 
 Name:           telepathy-glib
-Version:        0.7.15
+Version:        0.7.16
 Release:        1%{?dist}
 Summary:        GLib bindings for Telepathy
 
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.16-1
+- Update to 0.7.16.
+
 * Fri Sep 19 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.15-1
 - Update to 0.7.15.
 - Bump min version of glib needed.



From bmarzins at fedoraproject.org  Fri Sep 26 23:28:36 2008
From: bmarzins at fedoraproject.org (Benjamin Marzinski)
Date: Fri, 26 Sep 2008 23:28:36 +0000 (UTC)
Subject: rpms/device-mapper-multipath/devel binding_error.patch, NONE,
	1.1 directio_message_cleanup.patch, NONE,
	1.1 config_space_fix.patch, 1.1,
	1.2 device-mapper-multipath.spec, 1.51,
	1.52 linking_change.patch, 1.3, 1.4 multipath_rules.patch, 1.1,
	1.2 redhatification.patch, 1.1, 1.2 uevent_fix.patch, 1.1,
	1.2 directio_fix.patch, 1.1, NONE static_libaio.patch, 1.1, NONE
Message-ID: <20080926232836.942327010C@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-serv17271

Modified Files:
	config_space_fix.patch device-mapper-multipath.spec 
	linking_change.patch multipath_rules.patch 
	redhatification.patch uevent_fix.patch 
Added Files:
	binding_error.patch directio_message_cleanup.patch 
Removed Files:
	directio_fix.patch static_libaio.patch 
Log Message:
Since libaio is now in /lib, not /usr/lib, multipath no longer needs to
statically link against it. Fixed an error with binding file and WWIDs
that include spaces. Cleaned up the messages from the directio checker
function.  Fixed the udev rules. Fixed a regression in multipath.conf
parsing
Fixed 457530, 457589


binding_error.patch:

--- NEW FILE binding_error.patch ---
Index: multipath-tools/libmultipath/alias.c
===================================================================
--- multipath-tools.orig/libmultipath/alias.c
+++ multipath-tools/libmultipath/alias.c
@@ -243,7 +243,7 @@ lookup_binding(FILE *f, char *map_wwid, 
 		curr_id = scan_devname(alias);
 		if (curr_id >= id)
 			id = curr_id + 1;
-		wwid = strtok(NULL, " \t");
+		wwid = strtok(NULL, "");
 		if (!wwid){
 			condlog(3,
 				"Ignoring malformed line %u in bindings file",

directio_message_cleanup.patch:

--- NEW FILE directio_message_cleanup.patch ---
Index: multipath-tools/libmultipath/checkers/directio.c
===================================================================
--- multipath-tools.orig/libmultipath/checkers/directio.c
+++ multipath-tools/libmultipath/checkers/directio.c
@@ -148,8 +148,9 @@ check_state(int fd, struct directio_cont
 	}
 	ct->running++;
 
+	errno = 0;
 	r = io_getevents(ct->ioctx, 1L, 1L, &event, &timeout);
-	LOG(3, "async io getevents returns %li (errno=%s)", r, strerror(errno));
+	LOG(3, "async io_getevents returns %li (%s)", r, strerror(errno));
 
 	if (r < 1L) {
 		if (ct->running > ASYNC_TIMEOUT_SEC || sync) {

config_space_fix.patch:

Index: config_space_fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/config_space_fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config_space_fix.patch	20 Aug 2008 21:48:41 -0000	1.1
+++ config_space_fix.patch	26 Sep 2008 23:28:35 -0000	1.2
@@ -7,14 +7,14 @@
  			else
  				in_string = 1;
 +		} else if (!in_string && (*cp == '{' || *cp == '}')) {
-+			cp++;
 +			token = MALLOC(2);
-+
+ 
 +			if (!token)
 +				goto out;
- 
++
 +			*(token) = *cp;
 +			*(token + 1) = '\0';
++			cp++;
  		} else {
  			while ((in_string ||
  				(!isspace((int) *cp) && isascii((int) *cp) &&


Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- device-mapper-multipath.spec	20 Aug 2008 21:48:41 -0000	1.51
+++ device-mapper-multipath.spec	26 Sep 2008 23:28:35 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
 Version: 0.4.8
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -9,16 +9,16 @@
 Patch0: linking_change.patch
 Patch1: uevent_fix.patch
 Patch2: sparc64fix.patch
-Patch3: directio_fix.patch
-Patch4: config_files.patch
-Patch5: redhatification.patch
-Patch6: mpath_wait.patch
-Patch7: multipath_rules.patch
-Patch8: cciss_id.patch
-Patch9: scsi_id_change.patch
-Patch10: static_libaio.patch
-Patch11: config_space_fix.patch
-Patch12: fix_devt.patch
+Patch3: config_files.patch
+Patch4: redhatification.patch
+Patch5: mpath_wait.patch
+Patch6: multipath_rules.patch
+Patch7: cciss_id.patch
+Patch8: scsi_id_change.patch
+Patch9: config_space_fix.patch
+Patch10: fix_devt.patch
+Patch11: directio_message_cleanup.patch
+Patch12: binding_error.patch
 Requires: kpartx = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): chkconfig
@@ -48,16 +48,16 @@
 %patch0 -p1 -b .linking_change
 %patch1 -p1 -b .uevent_fix
 %patch2 -p1 -b .sparc64fix
-%patch3 -p1 -b .directio_fix
-%patch4 -p1 -b .config_files
-%patch5 -p1 -b .redhatification
-%patch6 -p1 -b .mpath_wait
-%patch7 -p1 -b .multipath_rules
-%patch8 -p1 -b .cciss_id
-%patch9 -p1 -b .scsi_id_change
-%patch10 -p1 -b .static_libaio
-%patch11 -p1 -b .config_space_fix
-%patch12 -p1 -b .fix_devt
+%patch3 -p1 -b .config_files
+%patch4 -p1 -b .redhatification
+%patch5 -p1 -b .mpath_wait
+%patch6 -p1 -b .multipath_rules
+%patch7 -p1 -b .cciss_id
+%patch8 -p1 -b .scsi_id_change
+%patch9 -p1 -b .config_space_fix
+%patch10 -p1 -b .fix_devt
+%patch11 -p1 -b .directio_message
+%patch12 -p1 -b .binding_error
 
 %build
 make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT
@@ -109,6 +109,14 @@
 %{_mandir}/man8/kpartx.8.gz
 
 %changelog
+* Fri Sep 26 2008 Benjamin Marzinski <bmarzins at redhat.com> 0.4.8-7
+- Since libaio is now in /lib, not /usr/lib, multipath no longer needs to
+  statically link against it. Fixed an error with binding file and WWIDs
+  that include spaces. Cleaned up the messages from the directio checker
+  function.  Fixed the udev rules. Fixed a regression in multipath.conf
+  parsing
+- Fixed 457530, 457589
+
 * Wed Aug 20 2008 Benjamin Marzinski <bmarzins at redhat.com> 0.4.8-6
 - Updated to latest upstream 0.4.8 code: multipath-tools-080804.tgz
   (git commit id: eb87cbd0df8adf61d1c74c025f7326d833350f78)

linking_change.patch:

Index: linking_change.patch
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/linking_change.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linking_change.patch	20 May 2008 06:30:55 -0000	1.3
+++ linking_change.patch	26 Sep 2008 23:28:35 -0000	1.4
@@ -1,7 +1,7 @@
-Index: multipath-tools-080519/libmultipath/Makefile
+Index: multipath-tools/libmultipath/Makefile
 ===================================================================
---- multipath-tools-080519.orig/libmultipath/Makefile
-+++ multipath-tools-080519/libmultipath/Makefile
+--- multipath-tools.orig/libmultipath/Makefile
++++ multipath-tools/libmultipath/Makefile
 @@ -23,14 +23,15 @@ endif
  all: $(LIBS)
  
@@ -21,29 +21,48 @@
  
  clean:
  	rm -f core *.a *.o *.gz *.so
-Index: multipath-tools-080519/multipath/Makefile
+Index: multipath-tools/multipath/Makefile
 ===================================================================
---- multipath-tools-080519.orig/multipath/Makefile
-+++ multipath-tools-080519/multipath/Makefile
-@@ -6,7 +6,7 @@ include ../Makefile.inc
+--- multipath-tools.orig/multipath/Makefile
++++ multipath-tools/multipath/Makefile
+@@ -6,9 +6,8 @@ include ../Makefile.inc
  
  OBJS = main.o
  
 -CFLAGS += -I$(multipathdir) -Wl,-rpath,$(libdir)
+-LDFLAGS += -lpthread -ldevmapper -laio -ldl \
+-	   -lmultipath -L$(multipathdir)
 +CFLAGS += -I$(multipathdir)
- LDFLAGS += -lpthread -ldevmapper -laio -ldl \
- 	   -lmultipath -L$(multipathdir)
++LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir)
+ 
+ EXEC = multipath
  
-Index: multipath-tools-080519/multipathd/Makefile
+Index: multipath-tools/multipathd/Makefile
 ===================================================================
---- multipath-tools-080519.orig/multipathd/Makefile
-+++ multipath-tools-080519/multipathd/Makefile
-@@ -5,7 +5,7 @@ include ../Makefile.inc
+--- multipath-tools.orig/multipathd/Makefile
++++ multipath-tools/multipathd/Makefile
+@@ -5,8 +5,8 @@ include ../Makefile.inc
  #
  # basic flags setting
  #
 -CFLAGS += -I$(multipathdir) -Wl,-rpath,$(libdir)
+-LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -laio -ldl \
 +CFLAGS += -I$(multipathdir)
- LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -laio -ldl \
++LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \
  	   -lmultipath -L$(multipathdir)
  
+ #
+Index: multipath-tools/libmultipath/checkers/Makefile
+===================================================================
+--- multipath-tools.orig/libmultipath/checkers/Makefile
++++ multipath-tools/libmultipath/checkers/Makefile
+@@ -17,6 +17,9 @@ CFLAGS += -I..
+ 
+ all: $(LIBS)
+ 
++libcheckdirectio.so: libsg.o directio.o
++	$(CC) $(SHARED_FLAGS) -o $@ $^ -laio
++
+ libcheck%.so: libsg.o %.o
+ 	$(CC) $(SHARED_FLAGS) -o $@ $^
+ 

multipath_rules.patch:

Index: multipath_rules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/multipath_rules.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multipath_rules.patch	20 May 2008 04:37:41 -0000	1.1
+++ multipath_rules.patch	26 Sep 2008 23:28:36 -0000	1.2
@@ -1,7 +1,7 @@
-Index: multipath-tools-080515/multipath/Makefile
+Index: multipath-tools/multipath/Makefile
 ===================================================================
---- multipath-tools-080515.orig/multipath/Makefile
-+++ multipath-tools-080515/multipath/Makefile
+--- multipath-tools.orig/multipath/Makefile
++++ multipath-tools/multipath/Makefile
 @@ -23,7 +23,7 @@ install:
  	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
  	$(INSTALL_PROGRAM) -m 755 $(EXEC) mpath_wait $(DESTDIR)$(bindir)/
@@ -20,24 +20,22 @@
  	rm $(DESTDIR)$(bindir)/$(EXEC)
  	rm $(DESTDIR)$(bindir)/mpath_wait
  	rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
-Index: multipath-tools-080515/multipath/multipath.rules
+Index: multipath-tools/multipath/multipath.rules
 ===================================================================
---- multipath-tools-080515.orig/multipath/multipath.rules
-+++ multipath-tools-080515/multipath/multipath.rules
-@@ -1,7 +1,9 @@
+--- multipath-tools.orig/multipath/multipath.rules
++++ multipath-tools/multipath/multipath.rules
+@@ -1,7 +1,8 @@
 -#
 -# udev rules for multipathing.
 -# The persistent symlinks are created with the kpartx rules
 -#
 -
 -# socket for uevents
--RUN+="socket:/org/kernel/dm/multipath_event"
 +# multipath wants the devmaps presented as meaninglful device names
 +# so name them after their devmap name
 +SUBSYSTEM!="block", GOTO="end_mpath"
-+KERNEL!="dm-[0-9]*", ACTION=="add", PROGRAM=="/bin/bash -c '/sbin/lsmod | /bin/grep ^dm_multipath'", RUN+="/sbin/multipath -v0 %M:%m"
+ RUN+="socket:/org/kernel/dm/multipath_event"
 +KERNEL!="dm-[0-9]*", 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"
-+PROGRAM!="/bin/bash -c '/sbin/dmsetup info -c --noheadings -j %M -m %m | /bin/grep -q .*:.*:.*:.*:.*:.*:.*:part[0-9]*-mpath-'", GOTO="end_mpath"
 +LABEL="end_mpath"

redhatification.patch:

Index: redhatification.patch
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/redhatification.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- redhatification.patch	20 May 2008 04:37:41 -0000	1.1
+++ redhatification.patch	26 Sep 2008 23:28:36 -0000	1.2
@@ -1,17 +1,17 @@
-Index: multipath-tools-080519/libmultipath/defaults.h
+Index: multipath-tools/libmultipath/defaults.h
 ===================================================================
---- multipath-tools-080519.orig/libmultipath/defaults.h
-+++ multipath-tools-080519/libmultipath/defaults.h
+--- multipath-tools.orig/libmultipath/defaults.h
++++ multipath-tools/libmultipath/defaults.h
 @@ -1,4 +1,4 @@
 -#define DEFAULT_GETUID		"/lib/udev/scsi_id -g -u -s /block/%n"
 +#define DEFAULT_GETUID		"/sbin/scsi_id -g -u -s /block/%n"
  #define DEFAULT_UDEVDIR		"/dev"
  #define DEFAULT_MULTIPATHDIR	"/lib/multipath"
  #define DEFAULT_SELECTOR	"round-robin 0"
-Index: multipath-tools-080519/libmultipath/hwtable.c
+Index: multipath-tools/libmultipath/hwtable.c
 ===================================================================
---- multipath-tools-080519.orig/libmultipath/hwtable.c
-+++ multipath-tools-080519/libmultipath/hwtable.c
+--- multipath-tools.orig/libmultipath/hwtable.c
++++ multipath-tools/libmultipath/hwtable.c
 @@ -172,7 +172,7 @@ static struct hwentry default_hw[] = {
  		/* HP Smart Array */
  		.vendor        = "HP",
@@ -39,7 +39,7 @@
  		.features      = "1 queue_if_no_path",
  		.hwhandler     = DEFAULT_HWHANDLER,
  		.selector      = DEFAULT_SELECTOR,
-@@ -705,6 +705,22 @@ static struct hwentry default_hw[] = {
+@@ -722,6 +722,22 @@ static struct hwentry default_hw[] = {
  		.checker_name  = RDAC,
  		.prio_name     = PRIO_RDAC,
  	},
@@ -62,10 +62,10 @@
  	/*
  	 * EOL
  	 */
-Index: multipath-tools-080519/multipath.conf.annotated
+Index: multipath-tools/multipath.conf.annotated
 ===================================================================
---- multipath-tools-080519.orig/multipath.conf.annotated
-+++ multipath-tools-080519/multipath.conf.annotated
+--- multipath-tools.orig/multipath.conf.annotated
++++ multipath-tools/multipath.conf.annotated
 @@ -55,9 +55,9 @@
  #	# scope   : multipath
  #	# desc    : the default program and args to callout to obtain a unique 
@@ -87,10 +87,10 @@
  #
  #		#
  #		# name    : path_selector
-Index: multipath-tools-080519/multipath.conf.defaults
+Index: multipath-tools/multipath.conf.defaults
 ===================================================================
---- multipath-tools-080519.orig/multipath.conf.defaults
-+++ multipath-tools-080519/multipath.conf.defaults
+--- multipath-tools.orig/multipath.conf.defaults
++++ multipath-tools/multipath.conf.defaults
 @@ -6,7 +6,7 @@
  #	polling_interval	5
  #	selector		"round-robin 0"
@@ -452,10 +452,10 @@
 +#		prio			rdac
 +#	}
  #}
-Index: multipath-tools-080519/multipath.conf.synthetic
+Index: multipath-tools/multipath.conf.synthetic
 ===================================================================
---- multipath-tools-080519.orig/multipath.conf.synthetic
-+++ multipath-tools-080519/multipath.conf.synthetic
+--- multipath-tools.orig/multipath.conf.synthetic
++++ multipath-tools/multipath.conf.synthetic
 @@ -7,7 +7,7 @@
  #	polling_interval 	10
  #	selector		"round-robin 0"
@@ -474,10 +474,10 @@
  #		path_checker		directio
  #		path_selector		"round-robin 0"
  #		hardware_handler	"0"
-Index: multipath-tools-080519/Makefile.inc
+Index: multipath-tools/Makefile.inc
 ===================================================================
---- multipath-tools-080519.orig/Makefile.inc
-+++ multipath-tools-080519/Makefile.inc
+--- multipath-tools.orig/Makefile.inc
++++ multipath-tools/Makefile.inc
 @@ -20,7 +20,7 @@ libudevdir  = ${prefix}/lib/udev
  multipathdir = $(TOPDIR)/libmultipath
  mandir      = $(prefix)/usr/share/man/man8
@@ -487,10 +487,10 @@
  libdir	    = $(prefix)/lib/multipath
  
  GZIP        = /bin/gzip -9 -c
-Index: multipath-tools-080519/multipathd/Makefile
+Index: multipath-tools/multipathd/Makefile
 ===================================================================
---- multipath-tools-080519.orig/multipathd/Makefile
-+++ multipath-tools-080519/multipathd/Makefile
+--- multipath-tools.orig/multipathd/Makefile
++++ multipath-tools/multipathd/Makefile
 @@ -35,6 +35,7 @@ install:
  	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
  	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)
@@ -499,10 +499,10 @@
  	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
  	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
  
-Index: multipath-tools-080519/multipathd/multipathd.init.redhat
+Index: multipath-tools/multipathd/multipathd.init.redhat
 ===================================================================
---- multipath-tools-080519.orig/multipathd/multipathd.init.redhat
-+++ multipath-tools-080519/multipathd/multipathd.init.redhat
+--- multipath-tools.orig/multipathd/multipathd.init.redhat
++++ multipath-tools/multipathd/multipathd.init.redhat
 @@ -1,13 +1,9 @@
  #!/bin/bash
 -
@@ -561,10 +561,10 @@
  esac
  
  exit $RETVAL
-Index: multipath-tools-080519/multipath/Makefile
+Index: multipath-tools/multipath/Makefile
 ===================================================================
---- multipath-tools-080519.orig/multipath/Makefile
-+++ multipath-tools-080519/multipath/Makefile
+--- multipath-tools.orig/multipath/Makefile
++++ multipath-tools/multipath/Makefile
 @@ -28,6 +28,10 @@ install:
  	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
  	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
@@ -576,10 +576,10 @@
  
  uninstall:
  	rm $(DESTDIR)/etc/udev/rules.d/multipath.rules
-Index: multipath-tools-080519/multipath/multipath.conf.redhat
+Index: multipath-tools/multipath/multipath.conf.redhat
 ===================================================================
 --- /dev/null
-+++ multipath-tools-080519/multipath/multipath.conf.redhat
++++ multipath-tools/multipath/multipath.conf.redhat
 @@ -0,0 +1,97 @@
 +# This is a basic configuration file with some examples, for device mapper
 +# multipath.
@@ -678,10 +678,10 @@
 +#		path_grouping_policy	multibus
 +#	}
 +#}
-Index: multipath-tools-080519/kpartx/Makefile
+Index: multipath-tools/kpartx/Makefile
 ===================================================================
---- multipath-tools-080519.orig/kpartx/Makefile
-+++ multipath-tools-080519/kpartx/Makefile
+--- multipath-tools.orig/kpartx/Makefile
++++ multipath-tools/kpartx/Makefile
 @@ -20,10 +20,10 @@ $(EXEC): $(OBJS)
  install: $(EXEC) $(EXEC).8
  	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)

uevent_fix.patch:

Index: uevent_fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/uevent_fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- uevent_fix.patch	20 May 2008 04:37:41 -0000	1.1
+++ uevent_fix.patch	26 Sep 2008 23:28:36 -0000	1.2
@@ -1,8 +1,8 @@
-Index: multipath-tools-080515/multipathd/main.c
+Index: multipath-tools/multipathd/main.c
 ===================================================================
---- multipath-tools-080515.orig/multipathd/main.c
-+++ multipath-tools-080515/multipathd/main.c
-@@ -619,14 +619,20 @@ uxsock_trigger (char * str, char ** repl
+--- multipath-tools.orig/multipathd/main.c
++++ multipath-tools/multipathd/main.c
+@@ -602,14 +602,20 @@ uxsock_trigger (char * str, char ** repl
  static int
  uev_discard(char * devpath)
  {


--- directio_fix.patch DELETED ---


--- static_libaio.patch DELETED ---



From lmacken at fedoraproject.org  Fri Sep 26 23:33:51 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 26 Sep 2008 23:33:51 +0000 (UTC)
Subject: rpms/deskbar-applet/devel .cvsignore, 1.42, 1.43 deskbar-applet.spec,
	1.70, 1.71 sources, 1.42, 1.43
Message-ID: <20080926233351.921DF7010C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/deskbar-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18045

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Log Message:
* Fri Sep 26 2008 Luke Macken <lmacken at redhat.com> - 2.24.0-1
- Latest upstrem release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	30 Jul 2008 23:18:12 -0000	1.42
+++ .cvsignore	26 Sep 2008 23:33:21 -0000	1.43
@@ -1 +1 @@
-deskbar-applet-2.23.5.tar.bz2
+deskbar-applet-2.24.0.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- deskbar-applet.spec	30 Jul 2008 23:18:13 -0000	1.70
+++ deskbar-applet.spec	26 Sep 2008 23:33:21 -0000	1.71
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        2.23.5
+Version:        2.24.0
 Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Luke Macken <lmacken at redhat.com> - 2.24.0-1
+- Latest upstrem release
+
 * Wed Jul 30 2008 Luke Macken <lmacken at redhat.com> - 2.23.5-1
 - Latest upstream release of the 2.23.x branch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	30 Jul 2008 23:18:13 -0000	1.42
+++ sources	26 Sep 2008 23:33:21 -0000	1.43
@@ -1 +1 @@
-1809207b84af16174880cf8664c107e4  deskbar-applet-2.23.5.tar.bz2
+5d77c384ecbe993113fe553e327ad819  deskbar-applet-2.24.0.tar.bz2



From rdieter at fedoraproject.org  Fri Sep 26 23:41:49 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 26 Sep 2008 23:41:49 +0000 (UTC)
Subject: rpms/maxima/F-9 maxima.spec,1.101,1.102
Message-ID: <20080926234149.987557010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19503/F-9

Modified Files:
	maxima.spec 
Log Message:
s/sparc/sparcv9/



Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/F-9/maxima.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- maxima.spec	17 Jun 2008 14:16:07 -0000	1.101
+++ maxima.spec	26 Sep 2008 23:41:19 -0000	1.102
@@ -13,9 +13,9 @@
 %if 0%{?fedora} > 8
 
 # reinclude ppc when fixed: http://bugzilla.redhat.com/448734
-ExclusiveArch: i386 x86_64 sparc
+ExclusiveArch: i386 x86_64 sparcv9
 %else
-ExclusiveArch: i386 x86_64 ppc sparc
+ExclusiveArch: i386 x86_64 ppc sparcv9
 %endif
 
 %define maxima_ver %{version}%{?beta}
@@ -55,7 +55,7 @@
 %define _enable_sbcl --enable-sbcl 
 %endif
 
-%ifarch sparc
+%ifarch sparcv9
 %define default_lisp sbcl
 %define _enable_sbcl --enable-sbcl
 %endif



From rdieter at fedoraproject.org  Fri Sep 26 23:41:49 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 26 Sep 2008 23:41:49 +0000 (UTC)
Subject: rpms/maxima/devel maxima.spec,1.116,1.117
Message-ID: <20080926234149.CF72B7010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19503/devel

Modified Files:
	maxima.spec 
Log Message:
s/sparc/sparcv9/



Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- maxima.spec	2 Sep 2008 14:26:45 -0000	1.116
+++ maxima.spec	26 Sep 2008 23:41:19 -0000	1.117
@@ -13,9 +13,9 @@
 %if 0%{?fedora} > 8
 
 # reinclude ppc when fixed: http://bugzilla.redhat.com/448734
-ExclusiveArch: i386 x86_64 sparc
+ExclusiveArch: i386 x86_64 sparcv9
 %else
-ExclusiveArch: i386 x86_64 ppc sparc
+ExclusiveArch: i386 x86_64 ppc sparcv9
 %endif
 
 %define maxima_ver %{version}%{?beta}
@@ -55,7 +55,7 @@
 %define _enable_sbcl --enable-sbcl 
 %endif
 
-%ifarch sparc
+%ifarch sparcv9
 %define default_lisp sbcl
 %define _enable_sbcl --enable-sbcl
 %endif



From rdieter at fedoraproject.org  Fri Sep 26 23:49:15 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 26 Sep 2008 23:49:15 +0000 (UTC)
Subject: rpms/kdegraphics/devel .cvsignore,1.50,1.51 sources,1.56,1.57
Message-ID: <20080926234915.E7A197010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20712

Modified Files:
	.cvsignore sources 
Log Message:
update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	29 Aug 2008 15:55:13 -0000	1.50
+++ .cvsignore	26 Sep 2008 23:48:45 -0000	1.51
@@ -1,3 +1 @@
-kdegraphics-4.0.99.tar.bz2
-kdegraphics-4.1.0.tar.bz2
-kdegraphics-4.1.1.tar.bz2
+kdegraphics-4.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	26 Sep 2008 19:43:46 -0000	1.56
+++ sources	26 Sep 2008 23:48:45 -0000	1.57
@@ -0,0 +1 @@
+210e3a98485c2da91aaab69b9047837b  kdegraphics-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Fri Sep 26 23:55:58 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 26 Sep 2008 23:55:58 +0000 (UTC)
Subject: rpms/digikam/devel .cvsignore, 1.23, 1.24 digikam.spec, 1.66,
	1.67 sources, 1.23, 1.24 digikam-0.10.0-beta2-man1.patch, 1.1, NONE
Message-ID: <20080926235558.608F77010D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21627

Modified Files:
	.cvsignore digikam.spec sources 
Removed Files:
	digikam-0.10.0-beta2-man1.patch 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.4.beta3
- digikam-0.10.0-beta3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	31 Jul 2008 18:37:55 -0000	1.23
+++ .cvsignore	26 Sep 2008 23:55:27 -0000	1.24
@@ -1 +1 @@
-digikam-0.10.0-beta2.tar.bz2
+digikam-0.10.0-beta3.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- digikam.spec	5 Aug 2008 03:20:54 -0000	1.66
+++ digikam.spec	26 Sep 2008 23:55:28 -0000	1.67
@@ -1,8 +1,8 @@
-%define beta beta2
+%define beta beta3
 
 Name:	 digikam
 Version: 0.10.0
-Release: 0.3.%{beta}%{?dist}
+Release: 0.4.%{beta}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -11,20 +11,18 @@
 Source0: http://downloads.sourceforge.net/digikam/digikam-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: digikam-0.10.0-beta2-man1.patch
-
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: gphoto2-devel
 ## switch to this when kdegraphics is ready -- Rex
-#BuildRequires: libkdcraw-devel >= 0.2.0
-#BuildRequires: libkexiv2-devel >= 0.2.0
-#BuildRequires: libkipi-devel >= 0.2.0
+BuildRequires: libkdcraw-devel >= 0.2.0
+BuildRequires: libkexiv2-devel >= 0.2.0
+BuildRequires: libkipi-devel >= 0.2.0
 BuildRequires: jasper-devel
 # marble integraiton, not ready yet (crashes)
 #BuildRequires: kdeedu4-devel
-BuildRequires: kdegraphics4-devel >= 4.1.0
+BuildRequires: kdegraphics4-devel >= 4.1.2
 BuildRequires: kdelibs4-devel
 BuildRequires: kdepimlibs-devel
 BuildRequires: lcms-devel
@@ -73,8 +71,6 @@
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
-%patch1 -p1 -b .man1
-
 
 %build
 
@@ -150,6 +146,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.4.beta3
+- digikam-0.10.0-beta3
+
 * Mon Aug 04 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.3.beta2
 - disable marble integration
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	31 Jul 2008 18:37:55 -0000	1.23
+++ sources	26 Sep 2008 23:55:28 -0000	1.24
@@ -1 +1 @@
-40b6b9164438c320f9d4b9869ed8ea5e  digikam-0.10.0-beta2.tar.bz2
+b74386084d80be6facf587c4df607b8e  digikam-0.10.0-beta3.tar.bz2


--- digikam-0.10.0-beta2-man1.patch DELETED ---



From rdieter at fedoraproject.org  Sat Sep 27 00:07:15 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 00:07:15 +0000 (UTC)
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.168,1.169
Message-ID: <20080927000715.080197013E@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23263

Modified Files:
	kdegraphics.spec 
Log Message:
fix %files



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- kdegraphics.spec	26 Sep 2008 19:43:46 -0000	1.168
+++ kdegraphics.spec	27 Sep 2008 00:06:44 -0000	1.169
@@ -164,7 +164,7 @@
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/kipi/
 %{_kde4_appsdir}/libkdcraw/
-%{_kde4_libdir}/libkdcraw5/
+%{_kde4_libdir}/libkdcraw6/
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/kde4/*
 %{_kde4_libdir}/strigi/*



From rdieter at fedoraproject.org  Sat Sep 27 01:55:17 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 01:55:17 +0000 (UTC)
Subject: rpms/kdeadmin/devel .cvsignore, 1.52, 1.53 kdeadmin.spec, 1.107,
	1.108 sources, 1.54, 1.55
Message-ID: <20080927015517.AD86170117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1125

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	29 Aug 2008 12:55:55 -0000	1.52
+++ .cvsignore	27 Sep 2008 01:54:45 -0000	1.53
@@ -1,3 +1 @@
-kdeadmin-4.0.99.tar.bz2
-kdeadmin-4.1.0.tar.bz2
-kdeadmin-4.1.1.tar.bz2
+kdeadmin-4.1.2.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- kdeadmin.spec	29 Aug 2008 12:55:55 -0000	1.107
+++ kdeadmin.spec	27 Sep 2008 01:54:45 -0000	1.108
@@ -1,6 +1,6 @@
 Name:           kdeadmin
 Epoch:          7
-Version:        4.1.1
+Version:        4.1.2
 Release:        1%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	29 Aug 2008 12:55:55 -0000	1.54
+++ sources	27 Sep 2008 01:54:45 -0000	1.55
@@ -1 +1 @@
-e6693bcbe96bb9453e79bd3201d8f757  kdeadmin-4.1.1.tar.bz2
+97a94526af42072da9e6aa959ca09afb  kdeadmin-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Sat Sep 27 01:57:53 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 01:57:53 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel .cvsignore, 1.31,
	1.32 kdeaccessibility.spec, 1.57, 1.58 sources, 1.32, 1.33
Message-ID: <20080927015753.914A070117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeaccessibility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1685

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	29 Aug 2008 12:49:13 -0000	1.31
+++ .cvsignore	27 Sep 2008 01:57:23 -0000	1.32
@@ -1,3 +1 @@
-kdeaccessibility-4.0.99.tar.bz2
-kdeaccessibility-4.1.0.tar.bz2
-kdeaccessibility-4.1.1.tar.bz2
+kdeaccessibility-4.1.2.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kdeaccessibility.spec	29 Aug 2008 12:51:34 -0000	1.57
+++ kdeaccessibility.spec	27 Sep 2008 01:57:23 -0000	1.58
@@ -1,7 +1,7 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.1.1
+Version:        4.1.2
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	29 Aug 2008 12:49:13 -0000	1.32
+++ sources	27 Sep 2008 01:57:23 -0000	1.33
@@ -1 +1 @@
-2e81aad070229a802630721cc6a4c44a  kdeaccessibility-4.1.1.tar.bz2
+41eee5a40d87c4b0917d28956a19f48a  kdeaccessibility-4.1.2.tar.bz2



From bpepple at fedoraproject.org  Sat Sep 27 01:59:45 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 27 Sep 2008 01:59:45 +0000 (UTC)
Subject: rpms/telepathy-mission-control/devel telepathy-mission-control.spec,
	1.13, 1.14
Message-ID: <20080927015945.31C0670117@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-serv2202

Modified Files:
	telepathy-mission-control.spec 
Log Message:
* Fri Sep 26 2008 Brian Pepple <bpepple at fedoraproject.org> - 4.65-3
- Enable gnome-keyring support.



Index: telepathy-mission-control.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/telepathy-mission-control.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- telepathy-mission-control.spec	29 May 2008 12:34:05 -0000	1.13
+++ telepathy-mission-control.spec	27 Sep 2008 01:59:14 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           telepathy-mission-control
 Version:        4.65
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Central control for Telepathy connection manager
 
 Group:          System Environment/Libraries
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtelepathy-devel, libxslt-devel, GConf2-devel 
-BuildRequires:  telepathy-glib-devel
+BuildRequires:  telepathy-glib-devel, gnome-keyring-devel
 
 %description
 Mission Control, or MC, is a Telepathy component providing a way for
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Brian Pepple <bpepple at fedoraproject.org> - 4.65-3
+- Enable gnome-keyring support.
+
 * Tue May 29 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 4.65-2
 - Update to new upstream release (4.65)
 



From rdieter at fedoraproject.org  Sat Sep 27 01:59:45 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 01:59:45 +0000 (UTC)
Subject: rpms/kdebindings/devel .cvsignore, 1.48, 1.49 kdebindings.spec,
	1.143, 1.144 sources, 1.54, 1.55
Message-ID: <20080927015945.B579E70117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2185

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	29 Aug 2008 13:51:29 -0000	1.48
+++ .cvsignore	27 Sep 2008 01:59:15 -0000	1.49
@@ -1,3 +1 @@
-kdebindings-4.0.99.tar.bz2
-kdebindings-4.1.0.tar.bz2
-kdebindings-4.1.1.tar.bz2
+kdebindings-4.1.2.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- kdebindings.spec	25 Sep 2008 17:51:43 -0000	1.143
+++ kdebindings.spec	27 Sep 2008 01:59:15 -0000	1.144
@@ -21,8 +21,8 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.1.1
-Release: 2%{?dist}
+Version: 4.1.2
+Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
@@ -164,6 +164,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Thu Sep 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-2
 - respin (for qscintilla)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	29 Aug 2008 13:51:29 -0000	1.54
+++ sources	27 Sep 2008 01:59:15 -0000	1.55
@@ -1 +1 @@
-4b9d6b9b3980327ccef34a44180824df  kdebindings-4.1.1.tar.bz2
+f99b1fe747d6b4b9f444c1ca2f853172  kdebindings-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Sat Sep 27 02:06:28 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 02:06:28 +0000 (UTC)
Subject: rpms/kdeartwork/devel .cvsignore, 1.49, 1.50 kdeartwork.spec, 1.88, 
	1.89 sources, 1.51, 1.52
Message-ID: <20080927020628.9FA8270117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3481

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	29 Aug 2008 13:06:20 -0000	1.49
+++ .cvsignore	27 Sep 2008 02:05:58 -0000	1.50
@@ -1,3 +1,4 @@
 kdeartwork-4.0.99.tar.bz2
 kdeartwork-4.1.0.tar.bz2
 kdeartwork-4.1.1.tar.bz2
+kdeartwork-4.1.2.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- kdeartwork.spec	29 Aug 2008 13:06:20 -0000	1.88
+++ kdeartwork.spec	27 Sep 2008 02:05:58 -0000	1.89
@@ -1,5 +1,6 @@
+
 Name:           kdeartwork
-Version:        4.1.1
+Version:        4.1.2
 Release:        1%{?dist}
 Summary:        Additional artwork (themes, sound themes, ...) for KDE
 
@@ -196,6 +197,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	29 Aug 2008 13:06:20 -0000	1.51
+++ sources	27 Sep 2008 02:05:58 -0000	1.52
@@ -1 +1,2 @@
 6e5ed770d7203f0c789512317d743e95  kdeartwork-4.1.1.tar.bz2
+43d2e6caa8796f70ecc49fe449a1f0aa  kdeartwork-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Sat Sep 27 02:07:22 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 02:07:22 +0000 (UTC)
Subject: rpms/kdemultimedia/devel .cvsignore, 1.54, 1.55 kdemultimedia.spec, 
	1.120, 1.121 sources, 1.56,
	1.57 kdemultimedia-4.1.1-kde#170941-dragon.patch, 1.1, NONE
Message-ID: <20080927020722.4394470117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3701

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Removed Files:
	kdemultimedia-4.1.1-kde#170941-dragon.patch 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	29 Aug 2008 15:57:45 -0000	1.54
+++ .cvsignore	27 Sep 2008 02:06:51 -0000	1.55
@@ -1,3 +1 @@
-kdemultimedia-4.0.99.tar.bz2
-kdemultimedia-4.1.0.tar.bz2
-kdemultimedia-4.1.1.tar.bz2
+kdemultimedia-4.1.2.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- kdemultimedia.spec	16 Sep 2008 22:21:32 -0000	1.120
+++ kdemultimedia.spec	27 Sep 2008 02:06:51 -0000	1.121
@@ -1,7 +1,8 @@
+
 Name: kdemultimedia
 Epoch: 6
-Version: 4.1.1
-Release: 2%{?dist}
+Version: 4.1.2
+Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:     Applications/Multimedia
@@ -9,8 +10,6 @@
 License:   GPLv2+
 URL:       http://www.kde.org/
 Source0:   ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}.tar.bz2
-# upstream patches
-Patch100:  kdemultimedia-4.1.1-kde#170941-dragon.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # This one is normal, FLAC_OGG_LIBRARY is not actually used anyway:
@@ -22,8 +21,8 @@
 BuildRequires: flac-devel
 BuildRequires: giflib-devel
 BuildRequires: kde-filesystem >= 4
-BuildRequires: kdelibs4-devel >= %{version}
-BuildRequires: kdebase-workspace-devel >= %{version}
+#BuildRequires: kdelibs4-devel >= %{version}
+#BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: libmusicbrainz-devel
 BuildRequires: libtheora-devel
 BuildRequires: libtunepimp-devel
@@ -77,8 +76,6 @@
 %prep
 %setup -q -n kdemultimedia-%{version}
 
-# upstream patches
-%patch100 -p1 -b .kde#170941-dragon
 
 %build
 
@@ -152,6 +149,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Wed Sep 17 2008 Than Ngo <than at redhat.com> 4.1.1-2
 - backport from trunk to fix dragon kpart crash in the embedding application 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	29 Aug 2008 15:57:45 -0000	1.56
+++ sources	27 Sep 2008 02:06:51 -0000	1.57
@@ -1 +1 @@
-efbf12cf33aafb13848fda258d001322  kdemultimedia-4.1.1.tar.bz2
+232001bb20ad40d039c99a86360705db  kdemultimedia-4.1.2.tar.bz2


--- kdemultimedia-4.1.1-kde#170941-dragon.patch DELETED ---



From rdieter at fedoraproject.org  Sat Sep 27 02:14:13 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 02:14:13 +0000 (UTC)
Subject: rpms/kdenetwork/devel .cvsignore, 1.57, 1.58 kdenetwork.spec, 1.154,
	1.155 sources, 1.64, 1.65
Message-ID: <20080927021413.9E5E470117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4492

Modified Files:
	.cvsignore kdenetwork.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	29 Aug 2008 16:01:52 -0000	1.57
+++ .cvsignore	27 Sep 2008 02:13:43 -0000	1.58
@@ -1,3 +1 @@
-kdenetwork-4.0.99.tar.bz2
-kdenetwork-4.1.0.tar.bz2
-kdenetwork-4.1.1.tar.bz2
+kdenetwork-4.1.2.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- kdenetwork.spec	29 Aug 2008 16:01:52 -0000	1.154
+++ kdenetwork.spec	27 Sep 2008 02:13:43 -0000	1.155
@@ -4,7 +4,7 @@
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.1.1
+Version: 4.1.2
 Release: 1%{?dist}
 
 License: GPLv2
@@ -164,6 +164,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	29 Aug 2008 16:01:52 -0000	1.64
+++ sources	27 Sep 2008 02:13:43 -0000	1.65
@@ -1 +1 @@
-e90ef5d3feccb4a2aade798ded81af28  kdenetwork-4.1.1.tar.bz2
+f1ba745dd89447904d5c1d567937627f  kdenetwork-4.1.2.tar.bz2



From mikep at fedoraproject.org  Sat Sep 27 02:15:42 2008
From: mikep at fedoraproject.org (W. Michael Petullo)
Date: Sat, 27 Sep 2008 02:15:42 +0000 (UTC)
Subject: rpms/mt-daapd/devel mt-daapd-0.2.4.2-fedora.patch, 1.1,
	1.2 mt-daapd.spec, 1.12, 1.13
Message-ID: <20080927021542.9523570117@cvs1.fedora.phx.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/mt-daapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4736

Modified Files:
	mt-daapd-0.2.4.2-fedora.patch mt-daapd.spec 
Log Message:
Fix init script.


mt-daapd-0.2.4.2-fedora.patch:

Index: mt-daapd-0.2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/mt-daapd/devel/mt-daapd-0.2.4.2-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mt-daapd-0.2.4.2-fedora.patch	15 May 2008 01:39:54 -0000	1.1
+++ mt-daapd-0.2.4.2-fedora.patch	27 Sep 2008 02:15:12 -0000	1.2
@@ -1,6 +1,6 @@
 diff -u --recursive mt-daapd-0.2.4.2-vanilla/contrib/mt-daapd mt-daapd-0.2.4.2/contrib/mt-daapd
---- mt-daapd-0.2.4.2-vanilla/contrib/mt-daapd	2008-05-14 21:20:00.000000000 -0400
-+++ mt-daapd-0.2.4.2/contrib/mt-daapd	2008-05-14 21:30:07.000000000 -0400
+--- mt-daapd-0.2.4.2-vanilla/contrib/mt-daapd	2008-09-26 22:00:47.000000000 -0400
++++ mt-daapd-0.2.4.2/contrib/mt-daapd	2008-09-26 22:11:16.000000000 -0400
 @@ -1,6 +1,6 @@
  #!/bin/bash
  #
@@ -9,3 +9,36 @@
  # description: mt-daapd is a multi-threaded DAAP server for iTunes
  # processname: mt-daapd
  # pidfile: /var/run/mt-daapd
+@@ -10,25 +10,26 @@
+ . /etc/init.d/functions
+ [ -e /etc/daapd.conf ]
+ 
++mtdaapd=/usr/sbin/mt-daapd
++pidfile=/var/run/mt-daapd.pid
++lockfile=/var/lock/subsys/mt-daapd
+ RETVAL=0
+ 
+ start() {
+ 	echo -n $"Starting DAAP server: "
+-	daemon mt-daapd 
++	daemon --pidfile=${pidfile} $mtdaapd 
+ 	RETVAL=$?
+ 	echo
+-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/mt-daapd
++	[ $RETVAL -eq 0 ] && touch ${lockfile}
+ }
+ 
+ stop() {
+ 	echo -n $"Shutting down DAAP server: "
+-	# This is broken.
+-	killall -INT mt-daapd
+-#	killproc mt-daapd
++	killproc -p ${pidfile} $mtdaapd
+ 	RETVAL=$?
+ 
+ 	echo
+-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/mt-daapd
++	[ $RETVAL -eq 0 ] && rm -f ${lockfile} ${pidfile}
+ }
+ 
+ case "$1" in


Index: mt-daapd.spec
===================================================================
RCS file: /cvs/extras/rpms/mt-daapd/devel/mt-daapd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mt-daapd.spec	16 May 2008 00:43:44 -0000	1.12
+++ mt-daapd.spec	27 Sep 2008 02:15:12 -0000	1.13
@@ -11,7 +11,7 @@
 Name: mt-daapd
 Epoch: 1
 Version: 0.2.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -86,6 +86,9 @@
 %doc AUTHORS COPYING CREDITS INSTALL NEWS README TODO
 
 %changelog
+* Fri Sep 26 2008 W. Michael Petullo <mike[at]flyn.org> - 0.2.4.2-3
+   - Update init script, fix Fedora Bugzilla #461719.
+
 * Thu May 15 2008 W. Michael Petullo <mike[at]flyn.org> - 0.2.4.2-2
    - Bump epoch.
 



From rdieter at fedoraproject.org  Sat Sep 27 02:18:08 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 02:18:08 +0000 (UTC)
Subject: rpms/kdegames/devel .cvsignore, 1.57, 1.58 kdegames.spec, 1.103,
	1.104 sources, 1.60, 1.61
Message-ID: <20080927021808.229F970117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5176

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	29 Aug 2008 15:51:02 -0000	1.57
+++ .cvsignore	27 Sep 2008 02:17:37 -0000	1.58
@@ -1,3 +1 @@
-kdegames-4.0.99.tar.bz2
-kdegames-4.1.0.tar.bz2
-kdegames-4.1.1.tar.bz2
+kdegames-4.1.2.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- kdegames.spec	18 Sep 2008 16:16:55 -0000	1.103
+++ kdegames.spec	27 Sep 2008 02:17:37 -0000	1.104
@@ -4,8 +4,8 @@
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games 
 Epoch:   6
-Version: 4.1.1
-Release: 2%{?dist}
+Version: 4.1.2
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -175,6 +175,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Thu Sep 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
 - drop no longer needed devel symlink hacks
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	29 Aug 2008 15:51:02 -0000	1.60
+++ sources	27 Sep 2008 02:17:37 -0000	1.61
@@ -1 +1 @@
-2d32f53d36016107cbeae01ee5e103c5  kdegames-4.1.1.tar.bz2
+acb20df949ae44a55b72870a5640a629  kdegames-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Sat Sep 27 02:18:25 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 02:18:25 +0000 (UTC)
Subject: rpms/kdepim/devel .cvsignore, 1.52, 1.53 kdepim.spec, 1.188,
	1.189 sources, 1.61, 1.62
Message-ID: <20080927021825.724D770117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5311

Modified Files:
	.cvsignore kdepim.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	29 Aug 2008 16:05:29 -0000	1.52
+++ .cvsignore	27 Sep 2008 02:17:55 -0000	1.53
@@ -1,3 +1 @@
-kdepim-4.0.99.tar.bz2
-kdepim-4.1.0.tar.bz2
-kdepim-4.1.1.tar.bz2
+kdepim-4.1.2.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- kdepim.spec	2 Sep 2008 13:11:25 -0000	1.188
+++ kdepim.spec	27 Sep 2008 02:17:55 -0000	1.189
@@ -6,7 +6,7 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.1.1
+Version: 4.1.2
 Release: 1%{?dist}
 
 License: GPLv2
@@ -175,8 +175,10 @@
 #exclude %{_kde4_libdir}/libkpilot_conduit_base.so
 
 
-
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	2 Sep 2008 13:11:25 -0000	1.61
+++ sources	27 Sep 2008 02:17:55 -0000	1.62
@@ -1 +1 @@
-792ddf463a7ade5b4dbade0f8b7c3085  kdepim-4.1.1.tar.bz2
+484b3b9685ecd258d0c562c5b0fce297  kdepim-4.1.2.tar.bz2



From mikep at fedoraproject.org  Sat Sep 27 02:18:21 2008
From: mikep at fedoraproject.org (W. Michael Petullo)
Date: Sat, 27 Sep 2008 02:18:21 +0000 (UTC)
Subject: rpms/mt-daapd/EL-5 mt-daapd-0.2.4.2-fedora.patch, 1.1,
	1.2 mt-daapd.spec, 1.11, 1.12
Message-ID: <20080927021821.5809070117@cvs1.fedora.phx.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/mt-daapd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5247

Modified Files:
	mt-daapd-0.2.4.2-fedora.patch mt-daapd.spec 
Log Message:
Fix init script.


mt-daapd-0.2.4.2-fedora.patch:

Index: mt-daapd-0.2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/mt-daapd/EL-5/mt-daapd-0.2.4.2-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mt-daapd-0.2.4.2-fedora.patch	15 May 2008 01:59:41 -0000	1.1
+++ mt-daapd-0.2.4.2-fedora.patch	27 Sep 2008 02:17:50 -0000	1.2
@@ -1,6 +1,6 @@
 diff -u --recursive mt-daapd-0.2.4.2-vanilla/contrib/mt-daapd mt-daapd-0.2.4.2/contrib/mt-daapd
---- mt-daapd-0.2.4.2-vanilla/contrib/mt-daapd	2008-05-14 21:20:00.000000000 -0400
-+++ mt-daapd-0.2.4.2/contrib/mt-daapd	2008-05-14 21:30:07.000000000 -0400
+--- mt-daapd-0.2.4.2-vanilla/contrib/mt-daapd	2008-09-26 22:00:47.000000000 -0400
++++ mt-daapd-0.2.4.2/contrib/mt-daapd	2008-09-26 22:11:16.000000000 -0400
 @@ -1,6 +1,6 @@
  #!/bin/bash
  #
@@ -9,3 +9,36 @@
  # description: mt-daapd is a multi-threaded DAAP server for iTunes
  # processname: mt-daapd
  # pidfile: /var/run/mt-daapd
+@@ -10,25 +10,26 @@
+ . /etc/init.d/functions
+ [ -e /etc/daapd.conf ]
+ 
++mtdaapd=/usr/sbin/mt-daapd
++pidfile=/var/run/mt-daapd.pid
++lockfile=/var/lock/subsys/mt-daapd
+ RETVAL=0
+ 
+ start() {
+ 	echo -n $"Starting DAAP server: "
+-	daemon mt-daapd 
++	daemon --pidfile=${pidfile} $mtdaapd 
+ 	RETVAL=$?
+ 	echo
+-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/mt-daapd
++	[ $RETVAL -eq 0 ] && touch ${lockfile}
+ }
+ 
+ stop() {
+ 	echo -n $"Shutting down DAAP server: "
+-	# This is broken.
+-	killall -INT mt-daapd
+-#	killproc mt-daapd
++	killproc -p ${pidfile} $mtdaapd
+ 	RETVAL=$?
+ 
+ 	echo
+-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/mt-daapd
++	[ $RETVAL -eq 0 ] && rm -f ${lockfile} ${pidfile}
+ }
+ 
+ case "$1" in


Index: mt-daapd.spec
===================================================================
RCS file: /cvs/extras/rpms/mt-daapd/EL-5/mt-daapd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mt-daapd.spec	16 May 2008 01:10:03 -0000	1.11
+++ mt-daapd.spec	27 Sep 2008 02:17:50 -0000	1.12
@@ -11,7 +11,7 @@
 Name: mt-daapd
 Epoch: 1
 Version: 0.2.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -86,6 +86,9 @@
 %doc AUTHORS COPYING CREDITS INSTALL NEWS README TODO
 
 %changelog
+* Fri Sep 26 2008 W. Michael Petullo <mike[at]flyn.org> - 0.2.4.2-3
+   - Update init script, fix Fedora Bugzilla #461719.
+
 * Thu May 15 2008 W. Michael Petullo <mike[at]flyn.org> - 0.2.4.2-2
    - Bump epoch.
 



From rdieter at fedoraproject.org  Sat Sep 27 02:18:38 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 02:18:38 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel .cvsignore, 1.5,
	1.6 kdeplasma-addons.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20080927021838.01D5370117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5389

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Aug 2008 16:11:53 -0000	1.5
+++ .cvsignore	27 Sep 2008 02:18:07 -0000	1.6
@@ -1,3 +1 @@
-kdeplasma-addons-4.0.99.tar.bz2
-kdeplasma-addons-4.1.0.tar.bz2
-kdeplasma-addons-4.1.1.tar.bz2
+kdeplasma-addons-4.1.2.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kdeplasma-addons.spec	29 Aug 2008 16:11:53 -0000	1.6
+++ kdeplasma-addons.spec	27 Sep 2008 02:18:07 -0000	1.7
@@ -1,5 +1,6 @@
+
 Name:           kdeplasma-addons
-Version:        4.1.1
+Version:        4.1.2
 Release:        1%{?dist}
 Summary:        Additional plasmoids for KDE
 
@@ -89,6 +90,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Aug 2008 16:11:53 -0000	1.5
+++ sources	27 Sep 2008 02:18:07 -0000	1.6
@@ -1 +1 @@
-c36f023c799175927b260c78b9150810  kdeplasma-addons-4.1.1.tar.bz2
+84dc8f919d0a1e9bb1e1e2e499d80156  kdeplasma-addons-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Sat Sep 27 02:25:32 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 02:25:32 +0000 (UTC)
Subject: rpms/kdesdk/devel .cvsignore, 1.49, 1.50 kdesdk.spec, 1.114,
	1.115 sources, 1.51, 1.52
Message-ID: <20080927022532.ED69170117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6550

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	29 Aug 2008 16:16:01 -0000	1.49
+++ .cvsignore	27 Sep 2008 02:25:02 -0000	1.50
@@ -1,3 +1 @@
-kdesdk-4.0.99.tar.bz2
-kdesdk-4.1.0.tar.bz2
-kdesdk-4.1.1.tar.bz2
+kdesdk-4.1.2.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- kdesdk.spec	24 Sep 2008 11:50:23 -0000	1.114
+++ kdesdk.spec	27 Sep 2008 02:25:02 -0000	1.115
@@ -1,7 +1,7 @@
 
 Name:           kdesdk
-Version:        4.1.1
-Release:        2%{?dist}
+Version:        4.1.2
+Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -220,6 +220,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Wed Sep 24 2008 Than Ngo <than at redhat.com> 4.1.1-2
 - show quit in the menu
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	29 Aug 2008 16:16:01 -0000	1.51
+++ sources	27 Sep 2008 02:25:02 -0000	1.52
@@ -1 +1 @@
-268ea539de7cd5b07dc24d24f593dde1  kdesdk-4.1.1.tar.bz2
+29b29ed131db84a9abb2b4bf4d81c56e  kdesdk-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Sat Sep 27 02:25:45 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 02:25:45 +0000 (UTC)
Subject: rpms/kdeedu/devel .cvsignore, 1.52, 1.53 kdeedu.spec, 1.130,
	1.131 sources, 1.56, 1.57
Message-ID: <20080927022545.D502870117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6621

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	29 Aug 2008 14:07:38 -0000	1.52
+++ .cvsignore	27 Sep 2008 02:25:15 -0000	1.53
@@ -1,3 +1 @@
-kdeedu-4.0.99.tar.bz2
-kdeedu-4.1.0.tar.bz2
-kdeedu-4.1.1.tar.bz2
+kdeedu-4.1.2.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- kdeedu.spec	29 Aug 2008 14:08:08 -0000	1.130
+++ kdeedu.spec	27 Sep 2008 02:25:15 -0000	1.131
@@ -13,7 +13,7 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications 
-Version: 4.1.1
+Version: 4.1.2
 Release: 1%{?dist}
 
 License: GPLv2
@@ -393,6 +393,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	29 Aug 2008 14:07:38 -0000	1.56
+++ sources	27 Sep 2008 02:25:15 -0000	1.57
@@ -1 +1 @@
-f819cf9ae9c887f5787b5546de186604  kdeedu-4.1.1.tar.bz2
+7319ea65180451d1ecfed158714a4fd3  kdeedu-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Sat Sep 27 02:25:56 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 02:25:56 +0000 (UTC)
Subject: rpms/kdemultimedia/devel kdemultimedia.spec,1.121,1.122
Message-ID: <20080927022556.535CE70117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6661

Modified Files:
	kdemultimedia.spec 
Log Message:
fix BR's



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- kdemultimedia.spec	27 Sep 2008 02:06:51 -0000	1.121
+++ kdemultimedia.spec	27 Sep 2008 02:25:26 -0000	1.122
@@ -21,8 +21,8 @@
 BuildRequires: flac-devel
 BuildRequires: giflib-devel
 BuildRequires: kde-filesystem >= 4
-#BuildRequires: kdelibs4-devel >= %{version}
-#BuildRequires: kdebase-workspace-devel >= %{version}
+BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: libmusicbrainz-devel
 BuildRequires: libtheora-devel
 BuildRequires: libtunepimp-devel



From mikep at fedoraproject.org  Sat Sep 27 02:26:01 2008
From: mikep at fedoraproject.org (W. Michael Petullo)
Date: Sat, 27 Sep 2008 02:26:01 +0000 (UTC)
Subject: rpms/mt-daapd/F-8 mt-daapd-0.2.4.2-fedora.patch, 1.1,
	1.2 mt-daapd.spec, 1.7, 1.8
Message-ID: <20080927022601.0650E70117@cvs1.fedora.phx.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/mt-daapd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6679

Modified Files:
	mt-daapd-0.2.4.2-fedora.patch mt-daapd.spec 
Log Message:
Update init script.


mt-daapd-0.2.4.2-fedora.patch:

Index: mt-daapd-0.2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/mt-daapd/F-8/mt-daapd-0.2.4.2-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mt-daapd-0.2.4.2-fedora.patch	15 May 2008 01:54:15 -0000	1.1
+++ mt-daapd-0.2.4.2-fedora.patch	27 Sep 2008 02:25:30 -0000	1.2
@@ -1,6 +1,6 @@
 diff -u --recursive mt-daapd-0.2.4.2-vanilla/contrib/mt-daapd mt-daapd-0.2.4.2/contrib/mt-daapd
---- mt-daapd-0.2.4.2-vanilla/contrib/mt-daapd	2008-05-14 21:20:00.000000000 -0400
-+++ mt-daapd-0.2.4.2/contrib/mt-daapd	2008-05-14 21:30:07.000000000 -0400
+--- mt-daapd-0.2.4.2-vanilla/contrib/mt-daapd	2008-09-26 22:00:47.000000000 -0400
++++ mt-daapd-0.2.4.2/contrib/mt-daapd	2008-09-26 22:11:16.000000000 -0400
 @@ -1,6 +1,6 @@
  #!/bin/bash
  #
@@ -9,3 +9,36 @@
  # description: mt-daapd is a multi-threaded DAAP server for iTunes
  # processname: mt-daapd
  # pidfile: /var/run/mt-daapd
+@@ -10,25 +10,26 @@
+ . /etc/init.d/functions
+ [ -e /etc/daapd.conf ]
+ 
++mtdaapd=/usr/sbin/mt-daapd
++pidfile=/var/run/mt-daapd.pid
++lockfile=/var/lock/subsys/mt-daapd
+ RETVAL=0
+ 
+ start() {
+ 	echo -n $"Starting DAAP server: "
+-	daemon mt-daapd 
++	daemon --pidfile=${pidfile} $mtdaapd 
+ 	RETVAL=$?
+ 	echo
+-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/mt-daapd
++	[ $RETVAL -eq 0 ] && touch ${lockfile}
+ }
+ 
+ stop() {
+ 	echo -n $"Shutting down DAAP server: "
+-	# This is broken.
+-	killall -INT mt-daapd
+-#	killproc mt-daapd
++	killproc -p ${pidfile} $mtdaapd
+ 	RETVAL=$?
+ 
+ 	echo
+-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/mt-daapd
++	[ $RETVAL -eq 0 ] && rm -f ${lockfile} ${pidfile}
+ }
+ 
+ case "$1" in


Index: mt-daapd.spec
===================================================================
RCS file: /cvs/extras/rpms/mt-daapd/F-8/mt-daapd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mt-daapd.spec	16 May 2008 01:02:37 -0000	1.7
+++ mt-daapd.spec	27 Sep 2008 02:25:30 -0000	1.8
@@ -11,7 +11,7 @@
 Name: mt-daapd
 Epoch: 1
 Version: 0.2.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -86,6 +86,9 @@
 %doc AUTHORS COPYING CREDITS INSTALL NEWS README TODO
 
 %changelog
+* Fri Sep 26 2008 W. Michael Petullo <mike[at]flyn.org> - 0.2.4.2-3
+   - Update init script, fix Fedora Bugzilla #461719.
+
 * Thu May 15 2008 W. Michael Petullo <mike[at]flyn.org> - 0.2.4.2-2
    - Bump epoch.
 



From rdieter at fedoraproject.org  Sat Sep 27 02:29:07 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 02:29:07 +0000 (UTC)
Subject: rpms/kdetoys/devel .cvsignore, 1.26, 1.27 kdetoys.spec, 1.33,
	1.34 sources, 1.24, 1.25
Message-ID: <20080927022907.657A070117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdetoys/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7587

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	29 Aug 2008 16:28:19 -0000	1.26
+++ .cvsignore	27 Sep 2008 02:28:36 -0000	1.27
@@ -1,3 +1 @@
-kdetoys-4.0.99.tar.bz2
-kdetoys-4.1.0.tar.bz2
-kdetoys-4.1.1.tar.bz2
+kdetoys-4.1.2.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/devel/kdetoys.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- kdetoys.spec	29 Aug 2008 16:28:19 -0000	1.33
+++ kdetoys.spec	27 Sep 2008 02:28:36 -0000	1.34
@@ -1,7 +1,8 @@
+
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.1.1
+Version:        4.1.2
 Release:        1%{?dist}
 
 License:        GPLv2
@@ -95,6 +96,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	29 Aug 2008 16:28:19 -0000	1.24
+++ sources	27 Sep 2008 02:28:36 -0000	1.25
@@ -1 +1 @@
-6150f3daa22bce44f777579f2c13038b  kdetoys-4.1.1.tar.bz2
+370d9469e3c6b087a7b7520f106c3d02  kdetoys-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Sat Sep 27 02:29:57 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 02:29:57 +0000 (UTC)
Subject: rpms/kdeutils/devel .cvsignore, 1.53, 1.54 kdeutils.spec, 1.139,
	1.140 sources, 1.55, 1.56
Message-ID: <20080927022957.9C51F70117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7893

Modified Files:
	.cvsignore kdeutils.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	29 Aug 2008 16:36:07 -0000	1.53
+++ .cvsignore	27 Sep 2008 02:29:27 -0000	1.54
@@ -1,3 +1 @@
-kdeutils-4.1.0.tar.bz2
-kdepim-4.1.0.tar.bz2
-kdeutils-4.1.1.tar.bz2
+kdeutils-4.1.2.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- kdeutils.spec	29 Aug 2008 16:36:07 -0000	1.139
+++ kdeutils.spec	27 Sep 2008 02:29:27 -0000	1.140
@@ -1,8 +1,8 @@
 
-%if 0%{?fedora} > 9
+#if 0%{?fedora} > 9
 # include new PyKDE4 printer applet
 %define printer_applet 1
-%endif
+#endif
 
 %if 0%{?fedora} == 9
 # continue including kjots here (as in 4.0) for F9 (we don't have kdepim 4.1 there)
@@ -11,7 +11,7 @@
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.1.1
+Version:        4.1.2
 Release:        1%{?dist}
 Summary:        K Desktop Environment - Utilities
 
@@ -210,6 +210,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	29 Aug 2008 16:36:07 -0000	1.55
+++ sources	27 Sep 2008 02:29:27 -0000	1.56
@@ -1 +1 @@
-ba8d72606f71afcb649d2b9871815359  kdeutils-4.1.1.tar.bz2
+cab195ea3a60d136706d00d66b504aa8  kdeutils-4.1.2.tar.bz2



From mikep at fedoraproject.org  Sat Sep 27 02:32:49 2008
From: mikep at fedoraproject.org (W. Michael Petullo)
Date: Sat, 27 Sep 2008 02:32:49 +0000 (UTC)
Subject: rpms/mt-daapd/F-9 mt-daapd-0.2.4.2-fedora.patch, 1.1,
	1.2 mt-daapd.spec, 1.11, 1.12
Message-ID: <20080927023249.818C970117@cvs1.fedora.phx.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/mt-daapd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8375

Modified Files:
	mt-daapd-0.2.4.2-fedora.patch mt-daapd.spec 
Log Message:
Update init script.


mt-daapd-0.2.4.2-fedora.patch:

Index: mt-daapd-0.2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/mt-daapd/F-9/mt-daapd-0.2.4.2-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mt-daapd-0.2.4.2-fedora.patch	15 May 2008 01:49:57 -0000	1.1
+++ mt-daapd-0.2.4.2-fedora.patch	27 Sep 2008 02:32:19 -0000	1.2
@@ -1,6 +1,6 @@
 diff -u --recursive mt-daapd-0.2.4.2-vanilla/contrib/mt-daapd mt-daapd-0.2.4.2/contrib/mt-daapd
---- mt-daapd-0.2.4.2-vanilla/contrib/mt-daapd	2008-05-14 21:20:00.000000000 -0400
-+++ mt-daapd-0.2.4.2/contrib/mt-daapd	2008-05-14 21:30:07.000000000 -0400
+--- mt-daapd-0.2.4.2-vanilla/contrib/mt-daapd	2008-09-26 22:00:47.000000000 -0400
++++ mt-daapd-0.2.4.2/contrib/mt-daapd	2008-09-26 22:11:16.000000000 -0400
 @@ -1,6 +1,6 @@
  #!/bin/bash
  #
@@ -9,3 +9,36 @@
  # description: mt-daapd is a multi-threaded DAAP server for iTunes
  # processname: mt-daapd
  # pidfile: /var/run/mt-daapd
+@@ -10,25 +10,26 @@
+ . /etc/init.d/functions
+ [ -e /etc/daapd.conf ]
+ 
++mtdaapd=/usr/sbin/mt-daapd
++pidfile=/var/run/mt-daapd.pid
++lockfile=/var/lock/subsys/mt-daapd
+ RETVAL=0
+ 
+ start() {
+ 	echo -n $"Starting DAAP server: "
+-	daemon mt-daapd 
++	daemon --pidfile=${pidfile} $mtdaapd 
+ 	RETVAL=$?
+ 	echo
+-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/mt-daapd
++	[ $RETVAL -eq 0 ] && touch ${lockfile}
+ }
+ 
+ stop() {
+ 	echo -n $"Shutting down DAAP server: "
+-	# This is broken.
+-	killall -INT mt-daapd
+-#	killproc mt-daapd
++	killproc -p ${pidfile} $mtdaapd
+ 	RETVAL=$?
+ 
+ 	echo
+-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/mt-daapd
++	[ $RETVAL -eq 0 ] && rm -f ${lockfile} ${pidfile}
+ }
+ 
+ case "$1" in


Index: mt-daapd.spec
===================================================================
RCS file: /cvs/extras/rpms/mt-daapd/F-9/mt-daapd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mt-daapd.spec	16 May 2008 00:46:43 -0000	1.11
+++ mt-daapd.spec	27 Sep 2008 02:32:19 -0000	1.12
@@ -11,7 +11,7 @@
 Name: mt-daapd
 Epoch: 1
 Version: 0.2.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -86,6 +86,9 @@
 %doc AUTHORS COPYING CREDITS INSTALL NEWS README TODO
 
 %changelog
+* Fri Sep 26 2008 W. Michael Petullo <mike[at]flyn.org> - 0.2.4.2-3
+   - Update init script, fix Fedora Bugzilla #461719.
+
 * Thu May 15 2008 W. Michael Petullo <mike[at]flyn.org> - 0.2.4.2-2
    - Bump epoch.
 



From rdieter at fedoraproject.org  Sat Sep 27 03:36:20 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 03:36:20 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.144,1.145
Message-ID: <20080927033620.9FC7470117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14078

Modified Files:
	kdebindings.spec 
Log Message:
fix %files



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- kdebindings.spec	27 Sep 2008 01:59:15 -0000	1.144
+++ kdebindings.spec	27 Sep 2008 03:35:50 -0000	1.145
@@ -128,6 +128,10 @@
 %{_kde4_libdir}/kde4/krosspython.so
 %if 0%{?ruby}
 %{_kde4_bindir}/*
+%{_kde4_appsdir}/plasma_ruby_web_applet/
+%{_kde4_appsdir}/plasma_scriptengine_ruby/
+%{_kde4_datadir}/kde4/services/plasma-ruby-applet-web.desktop
+%{_kde4_datadir}/kde4/services/plasma-scriptengine-ruby-*.desktop
 %{_kde4_libdir}/libqtruby4shared.so
 %{_kde4_libdir}/kde4/krossruby.so
 %{_kde4_libdir}/kde4/krubypluginfactory.so



From rdieter at fedoraproject.org  Sat Sep 27 03:40:09 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 03:40:09 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.140,1.141
Message-ID: <20080927034009.C0B1170117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14761

Modified Files:
	kdeutils.spec 
Log Message:
unpackaged files



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- kdeutils.spec	27 Sep 2008 02:29:27 -0000	1.140
+++ kdeutils.spec	27 Sep 2008 03:39:39 -0000	1.141
@@ -131,6 +131,8 @@
 rm -f %{buildroot}%{_kde4_libdir}/libkerfuffle.so
 rm -f %{buildroot}%{_kde4_libdir}/libkmilo.so
 rm -f %{buildroot}%{_kde4_libdir}/libsuperkaramba.so
+# wtf? -- Rex
+rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kcontrol/
 
 
 %clean



From rdieter at fedoraproject.org  Sat Sep 27 03:44:54 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 03:44:54 +0000 (UTC)
Subject: rpms/kde-l10n/devel .cvsignore, 1.13, 1.14 kde-l10n.spec, 1.44,
	1.45 sources, 1.14, 1.15 subdirs-kde-l10n, 1.10, 1.11
Message-ID: <20080927034454.9969570117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15658

Modified Files:
	.cvsignore kde-l10n.spec sources subdirs-kde-l10n 
Log Message:
fyi, build fails on -de

* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2
- reenable Kurdish, Lithuanian, Malayalam




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	10 Sep 2008 06:34:59 -0000	1.13
+++ .cvsignore	27 Sep 2008 03:44:24 -0000	1.14
@@ -1,44 +1,47 @@
-kde-l10n-bg-4.1.1.tar.bz2
-kde-l10n-ca-4.1.1.tar.bz2
-kde-l10n-cs-4.1.1.tar.bz2
-kde-l10n-csb-4.1.1.tar.bz2
-kde-l10n-da-4.1.1.tar.bz2
-kde-l10n-de-4.1.1.tar.bz2
-kde-l10n-el-4.1.1.tar.bz2
-kde-l10n-en_GB-4.1.1.tar.bz2
-kde-l10n-eo-4.1.1.tar.bz2
-kde-l10n-es-4.1.1.tar.bz2
-kde-l10n-et-4.1.1.tar.bz2
-kde-l10n-fi-4.1.1.tar.bz2
-kde-l10n-fr-4.1.1.tar.bz2
-kde-l10n-ga-4.1.1.tar.bz2
-kde-l10n-gl-4.1.1.tar.bz2
-kde-l10n-hi-4.1.1.tar.bz2
-kde-l10n-hu-4.1.1.tar.bz2
-kde-l10n-it-4.1.1.tar.bz2
-kde-l10n-ja-4.1.1.tar.bz2
-kde-l10n-km-4.1.1.tar.bz2
-kde-l10n-ko-4.1.1.tar.bz2
-kde-l10n-mk-4.1.1.tar.bz2
-kde-l10n-lv-4.1.1.tar.bz2
-kde-l10n-nb-4.1.1.tar.bz2
-kde-l10n-nds-4.1.1.tar.bz2
-kde-l10n-nl-4.1.1.tar.bz2
-kde-l10n-nn-4.1.1.tar.bz2
-kde-l10n-pa-4.1.1.tar.bz2
-kde-l10n-pl-4.1.1.tar.bz2
-kde-l10n-pt-4.1.1.tar.bz2
-kde-l10n-pt_BR-4.1.1.tar.bz2
-kde-l10n-ru-4.1.1.tar.bz2
-kde-l10n-sl-4.1.1.tar.bz2
-kde-l10n-sr-4.1.1.tar.bz2
-kde-l10n-sv-4.1.1.tar.bz2
-kde-l10n-ta-4.1.1.tar.bz2
-kde-l10n-th-4.1.1.tar.bz2
-kde-l10n-tr-4.1.1.tar.bz2
-kde-l10n-uk-4.1.1.tar.bz2
-kde-l10n-wa-4.1.1.tar.bz2
-kde-l10n-zh_CN-4.1.1.tar.bz2
-kde-l10n-zh_TW-4.1.1.tar.bz2
-kde-l10n-fy-4.1.1.tar.bz2
-kde-l10n-kk-4.1.1.tar.bz2
+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


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kde-l10n.spec	10 Sep 2008 06:35:00 -0000	1.44
+++ kde-l10n.spec	27 Sep 2008 03:44:24 -0000	1.45
@@ -1,8 +1,8 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.1.1
-Release: 2%{dist}
+Version: 4.1.2
+Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -33,32 +33,35 @@
 Source21: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ja-%{version}.tar.bz2
 Source22: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-km-%{version}.tar.bz2
 Source23: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ko-%{version}.tar.bz2
+Source23: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ku-%{version}.tar.bz2
 Source24: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lv-%{version}.tar.bz2
-Source25: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-mk-%{version}.tar.bz2
-Source26: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nb-%{version}.tar.bz2
-Source27: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nds-%{version}.tar.bz2
-#Source28: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ne-%{version}.tar.bz2
-Source29: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nl-%{version}.tar.bz2
-Source30: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nn-%{version}.tar.bz2
-Source31: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pa-%{version}.tar.bz2
-Source32: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pl-%{version}.tar.bz2
-Source33: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt-%{version}.tar.bz2
-Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt_BR-%{version}.tar.bz2
-Source35: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ru-%{version}.tar.bz2
-#Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-se-%{version}.tar.bz2
-#Source37: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sk-%{version}.tar.bz2
-Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sl-%{version}.tar.bz2
-Source39: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sv-%{version}.tar.bz2
-Source40: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ta-%{version}.tar.bz2
-Source41: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-th-%{version}.tar.bz2
-Source42: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-tr-%{version}.tar.bz2
-Source43: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-uk-%{version}.tar.bz2
-Source44: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-wa-%{version}.tar.bz2
-Source45: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2
-Source46: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2
-Source47: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sr-%{version}.tar.bz2
-Source48: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2
-Source49: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kk-%{version}.tar.bz2
+Source25: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lt-%{version}.tar.bz2
+Source26: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-mk-%{version}.tar.bz2
+Source27: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ml-%{version}.tar.bz2
+Source28: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nb-%{version}.tar.bz2
+Source29: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nds-%{version}.tar.bz2
+#Source30: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ne-%{version}.tar.bz2
+Source31: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nl-%{version}.tar.bz2
+Source32: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nn-%{version}.tar.bz2
+Source33: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pa-%{version}.tar.bz2
+Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pl-%{version}.tar.bz2
+Source35: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt-%{version}.tar.bz2
+Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt_BR-%{version}.tar.bz2
+Source37: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ru-%{version}.tar.bz2
+#Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-se-%{version}.tar.bz2
+#Source39: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sk-%{version}.tar.bz2
+Source40: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sl-%{version}.tar.bz2
+Source41: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sv-%{version}.tar.bz2
+Source42: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ta-%{version}.tar.bz2
+Source43: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-th-%{version}.tar.bz2
+Source44: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-tr-%{version}.tar.bz2
+Source45: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-uk-%{version}.tar.bz2
+Source46: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-wa-%{version}.tar.bz2
+Source47: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2
+Source48: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2
+Source49: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sr-%{version}.tar.bz2
+Source50: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2
+Source51: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kk-%{version}.tar.bz2
 
 Source1000: subdirs-kde-l10n
 
@@ -490,6 +493,15 @@
 %description Macedonian
 Macedonian language support for KDE
 
+%package Malayalam
+Summary: Malayalam language support for KDE
+Group: User Interface/Desktops
+Requires: kde-filesystem
+Provides: %{name}-ml = %{version}-%{release}
+
+%description Malayalam
+Malayalam language support for KDE
+
 %package Maltese
 Summary: Maltese language support for KDE
 Group: User Interface/Desktops
@@ -1056,13 +1068,11 @@
 %files Korean
 %defattr(-,root,root)
 %lang(ko) %{_datadir}/locale/ko/*
-%lang(ko) %{_kde4_docdir}/HTML/ko
+%lang(ko) %{_kde4_docdir}/HTML/ko/
 
-%if %{buildall}
 %files Kurdish
 %defattr(-,root,root)
 %lang(ku) %{_datadir}/locale/ku/*
-%endif
 
 %if %{buildall}
 %files Lao
@@ -1070,11 +1080,10 @@
 %lang(lo) %{_datadir}/locale/lo/*
 %endif
 
-%if %{buildall}
 %files Lithuanian
 %defattr(-,root,root)
 %lang(lt) %{_datadir}/locale/lt/*
-%endif
+%lang(lt) %{_kde4_docdir}/HTML/lt/
 
 %files LowSaxon
 %defattr(-,root,root)
@@ -1293,6 +1302,10 @@
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+- reenable Kurdish, Lithuanian, Malayalam 
+
 * Wed Sep 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
 - reenable Frisian and Kazakh
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	10 Sep 2008 06:35:00 -0000	1.14
+++ sources	27 Sep 2008 03:44:24 -0000	1.15
@@ -1,44 +1,47 @@
-2ab87283b4d19d2757aa94d399e5ed41  kde-l10n-bg-4.1.1.tar.bz2
-770f1affd26538fa8ab656a977c63ae2  kde-l10n-ca-4.1.1.tar.bz2
-1cc38671b47519b688cb340b73a07327  kde-l10n-cs-4.1.1.tar.bz2
-8bf5955d5973b125c9beecc95278e2f8  kde-l10n-csb-4.1.1.tar.bz2
-98e31b3e3210efbf6452f2f6e211ca91  kde-l10n-da-4.1.1.tar.bz2
-0591df80e995c0327cd2ae001bb0fad1  kde-l10n-de-4.1.1.tar.bz2
-c234b1c16dbc33bda93eb1dae1c10a0d  kde-l10n-el-4.1.1.tar.bz2
-ce7736b393ada3ea11eea1570a9803d9  kde-l10n-en_GB-4.1.1.tar.bz2
-4d5da5133143848f822b5e1dc7cf734b  kde-l10n-eo-4.1.1.tar.bz2
-396e19841b971cf2d43ba9a5f737c1c2  kde-l10n-es-4.1.1.tar.bz2
-ccd584c03059ccc664f0fd1fcab07d09  kde-l10n-et-4.1.1.tar.bz2
-9e28e836e308d998b934308cc62b9db0  kde-l10n-fi-4.1.1.tar.bz2
-44cc1732acba917244843edf248e8de9  kde-l10n-fr-4.1.1.tar.bz2
-c0e69ba86aae673ad7a8da80702778df  kde-l10n-ga-4.1.1.tar.bz2
-bce5d61e617001b52166c9f0ae232586  kde-l10n-gl-4.1.1.tar.bz2
-812c9ddb40c25bd486380bdf6e2b0fea  kde-l10n-hi-4.1.1.tar.bz2
-b47eade7252e65962e5986da9abbab67  kde-l10n-hu-4.1.1.tar.bz2
-75268d5cf444706066197f64c6ce0f86  kde-l10n-it-4.1.1.tar.bz2
-cd9a6b97968f6bea740394206913e794  kde-l10n-ja-4.1.1.tar.bz2
-1cb3ae6d2df2b98750f8ac374173de71  kde-l10n-km-4.1.1.tar.bz2
-c6d5f55794a7b8ae6b29f38a3be17b58  kde-l10n-ko-4.1.1.tar.bz2
-87d8544833a668bdd63d2ebc93790d2a  kde-l10n-mk-4.1.1.tar.bz2
-a5cd5d5f88daa3c35a5caeda5e7398c4  kde-l10n-lv-4.1.1.tar.bz2
-a174238791d14c5c22b33f8bb58ecbd3  kde-l10n-nb-4.1.1.tar.bz2
-10d3f8f6fa61d949e127b97b129a3e56  kde-l10n-nds-4.1.1.tar.bz2
-0afcbddef0516e99fa7dc8037e736864  kde-l10n-nl-4.1.1.tar.bz2
-692223cbf474759d84ff0956b922d7c8  kde-l10n-nn-4.1.1.tar.bz2
-4367dd18f84a0265e87c78f4a0adcaba  kde-l10n-pa-4.1.1.tar.bz2
-7ddf979828a386f02383e672aea1ee65  kde-l10n-pl-4.1.1.tar.bz2
-423b863663061cc05260bd6136c839f6  kde-l10n-pt-4.1.1.tar.bz2
-034491ae5db90a0861a76b704d32fe1c  kde-l10n-pt_BR-4.1.1.tar.bz2
-d5e265a13c772e93b31a6d7c147ccfe9  kde-l10n-ru-4.1.1.tar.bz2
-a37237cea98b434d1f5ac01259b0453f  kde-l10n-sl-4.1.1.tar.bz2
-0aed3d7ef74f1a6bbf34425dbe229ae5  kde-l10n-sv-4.1.1.tar.bz2
-87bb1c1762964e01a60ef9347b5e0af3  kde-l10n-ta-4.1.1.tar.bz2
-bfe292d8623a25a02501ded7f032d5a7  kde-l10n-th-4.1.1.tar.bz2
-ea6e15c587e2f4d2533353815cd4ed8a  kde-l10n-tr-4.1.1.tar.bz2
-4faf1d7c7817697c3c76541706166078  kde-l10n-uk-4.1.1.tar.bz2
-6bee00ed5512c5c7123cd40e8bc27c9e  kde-l10n-wa-4.1.1.tar.bz2
-134cd3d65db7352e88f05df547af04db  kde-l10n-zh_CN-4.1.1.tar.bz2
-4ec74453141d23c503123e788a491c98  kde-l10n-zh_TW-4.1.1.tar.bz2
-b29bc82068ac7d3443fffe924356a7fd  kde-l10n-sr-4.1.1.tar.bz2
-d8482cd920425ca38174ee9dec21c606  kde-l10n-fy-4.1.1.tar.bz2
-a58a0bc175b711da8b36d57e17719f5c  kde-l10n-kk-4.1.1.tar.bz2
+fb20c0f72e96a9ee8a0518ef034aac2e  kde-l10n-bg-4.1.2.tar.bz2
+8813ec33ca3a37af68252acf0c6a4d4b  kde-l10n-ca-4.1.2.tar.bz2
+2d63225bbf4574e148693e97634b2c4e  kde-l10n-cs-4.1.2.tar.bz2
+d90fec294e551c989421d289cd6f450b  kde-l10n-csb-4.1.2.tar.bz2
+671917a9d301cb8e3ca420b8f4e71bb0  kde-l10n-da-4.1.2.tar.bz2
+df38290c533134a23c11034b4c4ee3dc  kde-l10n-de-4.1.2.tar.bz2
+51516ee60b9dfe630550a695c566cd06  kde-l10n-el-4.1.2.tar.bz2
+13b3519d2545d4e4c598956856a0e439  kde-l10n-en_GB-4.1.2.tar.bz2
+a397ef93af130380102e46e545338e6b  kde-l10n-eo-4.1.2.tar.bz2
+4121a524dc90bb59732918f677c9b4da  kde-l10n-es-4.1.2.tar.bz2
+e63beb0d0ff83000f1a7d843e3de4575  kde-l10n-et-4.1.2.tar.bz2
+c8023a2d0935c5c59f283dab7ae14b2f  kde-l10n-fi-4.1.2.tar.bz2
+8aaf7e16939f58e7ed580332b7527244  kde-l10n-fr-4.1.2.tar.bz2
+2578ef10c76b68616ae3ab820267d58e  kde-l10n-fy-4.1.2.tar.bz2
+6989457d6cdf8d30f95e2613ff59afb6  kde-l10n-ga-4.1.2.tar.bz2
+d710608870a93f4dd4a33132c885600a  kde-l10n-gl-4.1.2.tar.bz2
+7edd676ffa20bea726cbbe73edadb916  kde-l10n-hi-4.1.2.tar.bz2
+ebf79d8b6a5adda4f459f023e0be1b35  kde-l10n-hu-4.1.2.tar.bz2
+5c4f961e60e5ef14a2f4b2885113b1ab  kde-l10n-it-4.1.2.tar.bz2
+b79ec78ca7da15be8d0a7828d17295b4  kde-l10n-ja-4.1.2.tar.bz2
+9c96380025594a64f967a92ca2ee4d78  kde-l10n-kk-4.1.2.tar.bz2
+496b7ed959f6b66745102465b41ca7ed  kde-l10n-km-4.1.2.tar.bz2
+f2867745a599624c926fe0207dc3d014  kde-l10n-ko-4.1.2.tar.bz2
+1bc36ded91f347522458adea9f711722  kde-l10n-ku-4.1.2.tar.bz2
+99c4501906f5f684e33fcf091ee39136  kde-l10n-lt-4.1.2.tar.bz2
+78f6f316f23c8ceaec7fd37af243d954  kde-l10n-lv-4.1.2.tar.bz2
+e25560c1efa4adf16561c4dedca579b3  kde-l10n-mk-4.1.2.tar.bz2
+c706c0f68cddac130178469fe746ebfb  kde-l10n-ml-4.1.2.tar.bz2
+d6e8916732f0da5b135dcc0ff6dd465f  kde-l10n-nb-4.1.2.tar.bz2
+72d56df2e9d047648383ee041bafbf15  kde-l10n-nds-4.1.2.tar.bz2
+cf59f4fb0699c6ec1722a06efadffda7  kde-l10n-nl-4.1.2.tar.bz2
+e0f7088112c2097bfa902fa679599e0c  kde-l10n-nn-4.1.2.tar.bz2
+6d5323a863cab8a54511a9e19ef7f81a  kde-l10n-pa-4.1.2.tar.bz2
+c7455a4693c2344f80ba3434d916c946  kde-l10n-pl-4.1.2.tar.bz2
+448c772994a18a85b0b64ce76b536928  kde-l10n-pt-4.1.2.tar.bz2
+f1d7a3996e8ad7d50b0cab312f2d51b6  kde-l10n-pt_BR-4.1.2.tar.bz2
+6af70080c4b014327f35327a20166d7c  kde-l10n-ru-4.1.2.tar.bz2
+4cb55017d272a27e6f9a686cc8db8219  kde-l10n-sl-4.1.2.tar.bz2
+c2d94a42f0fbcad786949feebe5bda65  kde-l10n-sr-4.1.2.tar.bz2
+4ccfa63f4b09c1ddc94a062fe6cc0792  kde-l10n-sv-4.1.2.tar.bz2
+11a614853a358362600f790d69f59317  kde-l10n-ta-4.1.2.tar.bz2
+85949c0e5e240c4002fe38baa22e2cbc  kde-l10n-th-4.1.2.tar.bz2
+e77421da874e74c2d59ea72e8bf81f82  kde-l10n-tr-4.1.2.tar.bz2
+37afe81b119d9e43bb8a7758070988be  kde-l10n-uk-4.1.2.tar.bz2
+8e5da9214047a77f0272594c0939f470  kde-l10n-wa-4.1.2.tar.bz2
+4b04dc9d027017d75367a82d8434eba6  kde-l10n-zh_CN-4.1.2.tar.bz2
+8f41ed9dfe1f02a12b0a0e1106966817  kde-l10n-zh_TW-4.1.2.tar.bz2


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/devel/subdirs-kde-l10n,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- subdirs-kde-l10n	10 Sep 2008 06:35:00 -0000	1.10
+++ subdirs-kde-l10n	27 Sep 2008 03:44:24 -0000	1.11
@@ -21,8 +21,11 @@
 kk
 km
 ko
-mk
+ku
+lt
 lv
+mk
+ml
 nb
 nds
 nl



From rdieter at fedoraproject.org  Sat Sep 27 03:48:54 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 03:48:54 +0000 (UTC)
Subject: rpms/kdeadmin/devel kdeadmin.spec,1.108,1.109
Message-ID: <20080927034854.28C9470117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16134

Modified Files:
	kdeadmin.spec 
Log Message:
unpackaged files



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- kdeadmin.spec	27 Sep 2008 01:54:45 -0000	1.108
+++ kdeadmin.spec	27 Sep 2008 03:48:23 -0000	1.109
@@ -67,6 +67,8 @@
 
 # remove broken .pc file which has no business to be in a non-devel pkg anyway
 rm -rf %{buildroot}%{_libdir}/pkgconfig
+# wtf? -- Rex
+rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kcontrol
 
 
 %clean



From rdieter at fedoraproject.org  Sat Sep 27 04:03:56 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 04:03:56 +0000 (UTC)
Subject: rpms/kdeadmin/devel kdeadmin.spec,1.109,1.110
Message-ID: <20080927040356.58E5270117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17659

Modified Files:
	kdeadmin.spec 
Log Message:
fix %files



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- kdeadmin.spec	27 Sep 2008 03:48:23 -0000	1.109
+++ kdeadmin.spec	27 Sep 2008 04:03:26 -0000	1.110
@@ -103,7 +103,7 @@
 %{_kde4_datadir}/config.kcfg/kuser.kcfg
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_docdir}/HTML/en/kcron/
-%{_kde4_docdir}/HTML/en/knetworkconf/
+#{_kde4_docdir}/HTML/en/knetworkconf/
 %{_kde4_docdir}/HTML/en/ksystemlog/
 %{_kde4_docdir}/HTML/en/kuser/
 %{_kde4_iconsdir}/hicolor/*/*/*



From kkofler at fedoraproject.org  Sat Sep 27 05:50:03 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 27 Sep 2008 05:50:03 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.141,1.142
Message-ID: <20080927055003.21ECE70117@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26894/devel

Modified Files:
	kdeutils.spec 
Log Message:
Don't enable the printer-applet in F9 yet.
And we may have to disable it for F10 too unless we can get https://bugzilla.redhat.com/show_bug.cgi?id=453331 sorted out soon.


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- kdeutils.spec	27 Sep 2008 03:39:39 -0000	1.141
+++ kdeutils.spec	27 Sep 2008 05:49:32 -0000	1.142
@@ -1,8 +1,8 @@
 
-#if 0%{?fedora} > 9
+%if 0%{?fedora} > 9
 # include new PyKDE4 printer applet
 %define printer_applet 1
-#endif
+%endif
 
 %if 0%{?fedora} == 9
 # continue including kjots here (as in 4.0) for F9 (we don't have kdepim 4.1 there)



From thl at fedoraproject.org  Sat Sep 27 07:38:46 2008
From: thl at fedoraproject.org (Thorsten Leemhuis)
Date: Sat, 27 Sep 2008 07:38:46 +0000 (UTC)
Subject: rpms/python-html2text/devel .cvsignore, 1.7,
	1.8 python-html2text.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <20080927073846.D7D8070117@cvs1.fedora.phx.redhat.com>

Author: thl

Update of /cvs/pkgs/rpms/python-html2text/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4534

Modified Files:
	.cvsignore python-html2text.spec sources 
Log Message:
* Sat Sep 27 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.33-1
- update to 2.33



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-html2text/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Aug 2008 16:42:55 -0000	1.7
+++ .cvsignore	27 Sep 2008 07:38:16 -0000	1.8
@@ -1 +1 @@
-html2text-2.32.py
+html2text-2.33.py


Index: python-html2text.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-html2text/devel/python-html2text.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-html2text.spec	1 Aug 2008 16:42:55 -0000	1.11
+++ python-html2text.spec	27 Sep 2008 07:38:16 -0000	1.12
@@ -2,14 +2,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-html2text
-Version:        2.32
+Version:        2.33
 Release:        1.1
 Summary:        Converts a page of HTML into clean, easy-to-read plain ASCII text
 
 Group:          Development/Languages
 License:        GPLv3
 URL:            http://www.aaronsw.com/2002/html2text/
-Source0:        http://www.aaronsw.com/2002/html2text/html2text-2.32.py
+Source0:        http://www.aaronsw.com/2002/html2text/html2text-%{version}.py
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Sat Sep 27 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.33-1
+- update to 2.33
+
 * Fri Aug 01 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.32-1
 - update to 2.32
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-html2text/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Aug 2008 16:42:55 -0000	1.7
+++ sources	27 Sep 2008 07:38:16 -0000	1.8
@@ -1 +1 @@
-842c9173554c033816e0b0da306c2aae  html2text-2.32.py
+5892f98437ae9516261bb0221fb152bc  html2text-2.33.py



From pkgdb at fedoraproject.org  Sat Sep 27 07:46:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 07:46:47 +0000
Subject: [pkgdb] wormux: kahrik has requested watchcommits
Message-ID: <20080927074647.93E20208D73@bastion.fedora.phx.redhat.com>

kahrik has requested the watchcommits acl on wormux (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wormux



From pkgdb at fedoraproject.org  Sat Sep 27 07:46:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 07:46:52 +0000
Subject: [pkgdb] wormux: kahrik has requested watchbugzilla
Message-ID: <20080927074652.8431D208DA0@bastion.fedora.phx.redhat.com>

kahrik has requested the watchbugzilla acl on wormux (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wormux



From pkgdb at fedoraproject.org  Sat Sep 27 07:46:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 07:46:59 +0000
Subject: [pkgdb] wormux: kahrik has given up watchcommits
Message-ID: <20080927074659.65755208DA4@bastion.fedora.phx.redhat.com>

kahrik has given up the watchcommits acl on wormux (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wormux



From pkgdb at fedoraproject.org  Sat Sep 27 07:47:01 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 07:47:01 +0000
Subject: [pkgdb] wormux: kahrik has given up watchbugzilla
Message-ID: <20080927074702.280BF208D9F@bastion.fedora.phx.redhat.com>

kahrik has given up the watchbugzilla acl on wormux (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wormux



From mtasaka at fedoraproject.org  Sat Sep 27 08:26:43 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 27 Sep 2008 08:26:43 +0000 (UTC)
Subject: rpms/mfiler3/devel mfiler3-2.0.8a-use-external.patch, NONE,
	1.1 mfiler3.spec, 1.11, 1.12
Message-ID: <20080927082643.6C54370117@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mfiler3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8399/devel

Modified Files:
	mfiler3.spec 
Added Files:
	mfiler3-2.0.8a-use-external.patch 
Log Message:
* Sat Sep 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-3
- Better system-wide cmigemo patch


mfiler3-2.0.8a-use-external.patch:

--- NEW FILE mfiler3-2.0.8a-use-external.patch ---
--- mfiler3/Makefile.in.cmigemo	2008-09-27 15:52:38.000000000 +0900
+++ mfiler3/Makefile.in	2008-09-27 17:09:26.000000000 +0900
@@ -19,6 +19,7 @@
 COMPILED_INCONIG=@COMPILED_INCONIG@
 
 LIBMIGEMO=@LIBMIGEMO@
+SYSTEM_MIGEMODIR=@SYSTEM_MIGEMODIR@
 
 RUBY=@RUBY@
 LIBRUBY=@LIBRUBY@
@@ -122,7 +123,16 @@
 ###############################################################################
 # ??????????????????
 ###############################################################################
-install:
+ifdef SYSTEM_MIGEMODIR
+migemodir = $(SYSTEM_MIGEMODIR)
+else
+INSTALL_MIGEMO = install_migemo
+migemodir = $(datadir)/mfiler
+endif
+
+install: install_mf3 $(INSTALL_MIGEMO)
+
+install_mf3:
 	mkdir -p $(bindir)
 	mkdir -p $(sysconfdir)
 	mkdir -p $(datadir)/mfiler/cp932
@@ -135,17 +145,19 @@
 	$(INSTALL) -m 644 src/etc/.mfiler3 "$(sysconfdir)"
 	$(INSTALL) -m 644 src/etc/.mfiler3.rb "$(sysconfdir)"
 	$(INSTALL) -m 644 src/etc/completion.rb "$(sysconfdir)"
-	$(INSTALL) -m 644 migemo-dic/cp932/han2zen.dat "$(datadir)/mfiler/cp932"
-	$(INSTALL) -m 644 migemo-dic/cp932/hira2kata.dat "$(datadir)/mfiler/cp932"
-	$(INSTALL) -m 644 migemo-dic/cp932/migemo-dict "$(datadir)/mfiler/cp932"
-	$(INSTALL) -m 644 migemo-dic/cp932/roma2hira.dat "$(datadir)/mfiler/cp932"
-	$(INSTALL) -m 644 migemo-dic/euc-jp/han2zen.dat "$(datadir)/mfiler/euc-jp"
-	$(INSTALL) -m 644 migemo-dic/euc-jp/hira2kata.dat "$(datadir)/mfiler/euc-jp"
-	$(INSTALL) -m 644 migemo-dic/euc-jp/migemo-dict "$(datadir)/mfiler/euc-jp"
-	$(INSTALL) -m 644 migemo-dic/euc-jp/roma2hira.dat "$(datadir)/mfiler/euc-jp"
-	$(INSTALL) -m 644 migemo-dic/utf-8/han2zen.dat "$(datadir)/mfiler/utf-8"
-	$(INSTALL) -m 644 migemo-dic/utf-8/hira2kata.dat "$(datadir)/mfiler/utf-8"
-	$(INSTALL) -m 644 migemo-dic/utf-8/migemo-dict "$(datadir)/mfiler/utf-8"
-	$(INSTALL) -m 644 migemo-dic/utf-8/roma2hira.dat "$(datadir)/mfiler/utf-8"
+
+install_migemo:
+	$(INSTALL) -m 644 migemo-dic/cp932/han2zen.dat "$(migemodir)/cp932"
+	$(INSTALL) -m 644 migemo-dic/cp932/hira2kata.dat "$(migemodir)/cp932"
+	$(INSTALL) -m 644 migemo-dic/cp932/migemo-dict "$(migemodir)/cp932"
+	$(INSTALL) -m 644 migemo-dic/cp932/roma2hira.dat "$(migemodir)/cp932"
+	$(INSTALL) -m 644 migemo-dic/euc-jp/han2zen.dat "$(migemodir)/euc-jp"
+	$(INSTALL) -m 644 migemo-dic/euc-jp/hira2kata.dat "$(migemodir)/euc-jp"
+	$(INSTALL) -m 644 migemo-dic/euc-jp/migemo-dict "$(migemodir)/euc-jp"
+	$(INSTALL) -m 644 migemo-dic/euc-jp/roma2hira.dat "$(migemodir)/euc-jp"
+	$(INSTALL) -m 644 migemo-dic/utf-8/han2zen.dat "$(migemodir)/utf-8"
+	$(INSTALL) -m 644 migemo-dic/utf-8/hira2kata.dat "$(migemodir)/utf-8"
+	$(INSTALL) -m 644 migemo-dic/utf-8/migemo-dict "$(migemodir)/utf-8"
+	$(INSTALL) -m 644 migemo-dic/utf-8/roma2hira.dat "$(migemodir)/utf-8"
 
 
--- mfiler3/config.h.in.cmigemo	2008-06-19 17:21:59.000000000 +0900
+++ mfiler3/config.h.in	2008-09-27 16:40:34.000000000 +0900
@@ -6,6 +6,7 @@
 #undef HAVE_BOEHMGC_H
 #undef HAVE_BOEHMGC2_H
 #undef HAVE_MIGEMO_H
+#undef SYSTEM_MIGEMODIR
 #undef HAVE_CURSES_H
 #undef HAVE_NCURSES_H
 #undef HAVE_ICONV_H
--- mfiler3/configure.in.cmigemo	2008-07-07 11:59:46.000000000 +0900
+++ mfiler3/configure.in	2008-09-27 17:16:12.000000000 +0900
@@ -140,6 +140,19 @@
 AC_SUBST(LIBMIGEMO)
 
 ###############################################################################
+# system wide???migemo???????????????
+###############################################################################
+AC_ARG_WITH(system-migemodir,[ --with-system-migemodir    
+	(specify the directory of system migemo dictionary. /usr/share/migemo, for example)],
+	[ if test "$withval" && test -n $LIBMIGEMO ; then
+		echo "system-migemodir = $withval"
+		SYSTEM_MIGEMODIR="$withval"
+		AC_DEFINE_UNQUOTED(SYSTEM_MIGEMODIR, "$withval")
+       fi ])
+
+AC_SUBST(SYSTEM_MIGEMODIR)
+
+###############################################################################
 # ????????????
 ###############################################################################
 AC_CHECK_LIB(ncurses, initscr, [NCURSES_LIB="yes"], [NCURSES_LIB="no"])
--- mfiler3/src/isearch.c.cmigemo	2008-06-30 18:10:03.000000000 +0900
+++ mfiler3/src/isearch.c	2008-09-27 17:11:09.000000000 +0900
@@ -273,71 +273,78 @@
 {
 #if defined(HAVE_MIGEMO_H)
     char buf[PATH_MAX];
+    char migemodir[PATH_MAX];
     gMigemo = migemo_open(NULL);
 
     char* datadir = getenv("MFILER3_DATADIR");
 
+#ifdef SYSTEM_MIGEMODIR
+    sprintf(migemodir,"%s", SYSTEM_MIGEMODIR);
+#else
+    sprintf(migemodir, "%s/%s", datadir, "mfiler");
+#endif
+
     if(gKanjiCode == kUtf8) {
-        sprintf(buf, "%s/mfiler/utf-8/migemo-dict", datadir);
+        sprintf(buf, "%s/utf-8/migemo-dict", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_MIGEMO, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/utf-8/roma2hira.dat", datadir);
+        sprintf(buf, "%s/utf-8/roma2hira.dat", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_ROMA2HIRA, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/utf-8/hira2kata.dat", datadir);
+        sprintf(buf, "%s/utf-8/hira2kata.dat", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_HIRA2KATA, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/utf-8/han2zen.dat", datadir);
+        sprintf(buf, "%s/utf-8/han2zen.dat", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_HAN2ZEN, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
     }
     else if(gKanjiCode == kEucjp) {
-        sprintf(buf, "%s/mfiler/euc-jp/migemo-dict", datadir);
+        sprintf(buf, "%s/euc-jp/migemo-dict", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_MIGEMO, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/euc-jp/roma2hira.dat", datadir);
+        sprintf(buf, "%s/euc-jp/roma2hira.dat", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_ROMA2HIRA, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/euc-jp/hira2kata.dat", datadir);
+        sprintf(buf, "%s/euc-jp/hira2kata.dat", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_HIRA2KATA, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/euc-jp/han2zen.dat", datadir);
+        sprintf(buf, "%s/euc-jp/han2zen.dat", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_HAN2ZEN, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
     }
     else {
-        sprintf(buf, "%s/mfiler/cp932/migemo-dict", datadir);
+        sprintf(buf, "%s/cp932/migemo-dict", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_MIGEMO, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/cp932/roma2hira.dat", datadir);
+        sprintf(buf, "%s/cp932/roma2hira.dat", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_ROMA2HIRA, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/cp932/hira2kata.dat", datadir);
+        sprintf(buf, "%s/cp932/hira2kata.dat", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_HIRA2KATA, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/cp932/han2zen.dat", datadir);
+        sprintf(buf, "%s/cp932/han2zen.dat", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_HAN2ZEN, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);


Index: mfiler3.spec
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/devel/mfiler3.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mfiler3.spec	26 Sep 2008 16:04:17 -0000	1.11
+++ mfiler3.spec	27 Sep 2008 08:26:13 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:		mfiler3
 Version:	2.0.8a
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Two pane file manager under UNIX console
 
 Group:		Applications/Editors
@@ -11,7 +11,7 @@
 URL:		http://www.geocities.jp/daisuke530221jp/index3.html
 Source0:	http://www.geocities.jp/daisuke530221jp/%{name}-%{version}.tgz
 Source10:	mfiler3.sh
-Patch0:		mfiler3-2.0.5-use-external.patch
+Patch0:		mfiler3-2.0.8a-use-external.patch
 Patch1:		mfiler3-2.0.8a-upgrade-compat.patch
 Patch2:		mfiler3-2.0.8a-signal-define.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,6 +21,8 @@
 BuildRequires:	ncurses-devel
 BuildRequires:	oniguruma-devel
 
+BuildRequires:	autoconf
+
 # ruby-devel requires ruby-libs but does not require ruby
 BuildRequires:	ruby
 BuildRequires:	ruby-devel
@@ -50,6 +52,8 @@
 %patch0 -p1 -b .ext
 %patch1 -p0 -b .upcompat
 %patch2 -p0 -b .arch
+
+autoconf
 # Remove unneeded internal directories to make it sure that
 # we are using external libraries
 %{__rm} -rf \
@@ -62,7 +66,8 @@
 %build
 %configure \
 	--sysconfdir=%{_sysconfdir}/%{name} \
-	--bindir=%{_libexecdir}/%{name}
+	--bindir=%{_libexecdir}/%{name} \
+	--with-system-migemodir=%{_datadir}/cmigemo
 %{__make} %{?_smp_mflags} -k \
 	CC="%{__cc} $RPM_OPT_FLAGS"
 
@@ -99,6 +104,9 @@
 
 
 %changelog
+* Sat Sep 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-3
+- Better system-wide cmigemo patch
+
 * Sat Sep 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-2
 - Fix sparc64 build error
 



From mtasaka at fedoraproject.org  Sat Sep 27 08:26:43 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 27 Sep 2008 08:26:43 +0000 (UTC)
Subject: rpms/mfiler3/F-9 mfiler3-2.0.8a-use-external.patch, NONE,
	1.1 mfiler3.spec, 1.11, 1.12
Message-ID: <20080927082643.36F1B70117@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mfiler3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8399/F-9

Modified Files:
	mfiler3.spec 
Added Files:
	mfiler3-2.0.8a-use-external.patch 
Log Message:
* Sat Sep 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-3
- Better system-wide cmigemo patch


mfiler3-2.0.8a-use-external.patch:

--- NEW FILE mfiler3-2.0.8a-use-external.patch ---
--- mfiler3/Makefile.in.cmigemo	2008-09-27 15:52:38.000000000 +0900
+++ mfiler3/Makefile.in	2008-09-27 17:09:26.000000000 +0900
@@ -19,6 +19,7 @@
 COMPILED_INCONIG=@COMPILED_INCONIG@
 
 LIBMIGEMO=@LIBMIGEMO@
+SYSTEM_MIGEMODIR=@SYSTEM_MIGEMODIR@
 
 RUBY=@RUBY@
 LIBRUBY=@LIBRUBY@
@@ -122,7 +123,16 @@
 ###############################################################################
 # ??????????????????
 ###############################################################################
-install:
+ifdef SYSTEM_MIGEMODIR
+migemodir = $(SYSTEM_MIGEMODIR)
+else
+INSTALL_MIGEMO = install_migemo
+migemodir = $(datadir)/mfiler
+endif
+
+install: install_mf3 $(INSTALL_MIGEMO)
+
+install_mf3:
 	mkdir -p $(bindir)
 	mkdir -p $(sysconfdir)
 	mkdir -p $(datadir)/mfiler/cp932
@@ -135,17 +145,19 @@
 	$(INSTALL) -m 644 src/etc/.mfiler3 "$(sysconfdir)"
 	$(INSTALL) -m 644 src/etc/.mfiler3.rb "$(sysconfdir)"
 	$(INSTALL) -m 644 src/etc/completion.rb "$(sysconfdir)"
-	$(INSTALL) -m 644 migemo-dic/cp932/han2zen.dat "$(datadir)/mfiler/cp932"
-	$(INSTALL) -m 644 migemo-dic/cp932/hira2kata.dat "$(datadir)/mfiler/cp932"
-	$(INSTALL) -m 644 migemo-dic/cp932/migemo-dict "$(datadir)/mfiler/cp932"
-	$(INSTALL) -m 644 migemo-dic/cp932/roma2hira.dat "$(datadir)/mfiler/cp932"
-	$(INSTALL) -m 644 migemo-dic/euc-jp/han2zen.dat "$(datadir)/mfiler/euc-jp"
-	$(INSTALL) -m 644 migemo-dic/euc-jp/hira2kata.dat "$(datadir)/mfiler/euc-jp"
-	$(INSTALL) -m 644 migemo-dic/euc-jp/migemo-dict "$(datadir)/mfiler/euc-jp"
-	$(INSTALL) -m 644 migemo-dic/euc-jp/roma2hira.dat "$(datadir)/mfiler/euc-jp"
-	$(INSTALL) -m 644 migemo-dic/utf-8/han2zen.dat "$(datadir)/mfiler/utf-8"
-	$(INSTALL) -m 644 migemo-dic/utf-8/hira2kata.dat "$(datadir)/mfiler/utf-8"
-	$(INSTALL) -m 644 migemo-dic/utf-8/migemo-dict "$(datadir)/mfiler/utf-8"
-	$(INSTALL) -m 644 migemo-dic/utf-8/roma2hira.dat "$(datadir)/mfiler/utf-8"
+
+install_migemo:
+	$(INSTALL) -m 644 migemo-dic/cp932/han2zen.dat "$(migemodir)/cp932"
+	$(INSTALL) -m 644 migemo-dic/cp932/hira2kata.dat "$(migemodir)/cp932"
+	$(INSTALL) -m 644 migemo-dic/cp932/migemo-dict "$(migemodir)/cp932"
+	$(INSTALL) -m 644 migemo-dic/cp932/roma2hira.dat "$(migemodir)/cp932"
+	$(INSTALL) -m 644 migemo-dic/euc-jp/han2zen.dat "$(migemodir)/euc-jp"
+	$(INSTALL) -m 644 migemo-dic/euc-jp/hira2kata.dat "$(migemodir)/euc-jp"
+	$(INSTALL) -m 644 migemo-dic/euc-jp/migemo-dict "$(migemodir)/euc-jp"
+	$(INSTALL) -m 644 migemo-dic/euc-jp/roma2hira.dat "$(migemodir)/euc-jp"
+	$(INSTALL) -m 644 migemo-dic/utf-8/han2zen.dat "$(migemodir)/utf-8"
+	$(INSTALL) -m 644 migemo-dic/utf-8/hira2kata.dat "$(migemodir)/utf-8"
+	$(INSTALL) -m 644 migemo-dic/utf-8/migemo-dict "$(migemodir)/utf-8"
+	$(INSTALL) -m 644 migemo-dic/utf-8/roma2hira.dat "$(migemodir)/utf-8"
 
 
--- mfiler3/config.h.in.cmigemo	2008-06-19 17:21:59.000000000 +0900
+++ mfiler3/config.h.in	2008-09-27 16:40:34.000000000 +0900
@@ -6,6 +6,7 @@
 #undef HAVE_BOEHMGC_H
 #undef HAVE_BOEHMGC2_H
 #undef HAVE_MIGEMO_H
+#undef SYSTEM_MIGEMODIR
 #undef HAVE_CURSES_H
 #undef HAVE_NCURSES_H
 #undef HAVE_ICONV_H
--- mfiler3/configure.in.cmigemo	2008-07-07 11:59:46.000000000 +0900
+++ mfiler3/configure.in	2008-09-27 17:16:12.000000000 +0900
@@ -140,6 +140,19 @@
 AC_SUBST(LIBMIGEMO)
 
 ###############################################################################
+# system wide???migemo???????????????
+###############################################################################
+AC_ARG_WITH(system-migemodir,[ --with-system-migemodir    
+	(specify the directory of system migemo dictionary. /usr/share/migemo, for example)],
+	[ if test "$withval" && test -n $LIBMIGEMO ; then
+		echo "system-migemodir = $withval"
+		SYSTEM_MIGEMODIR="$withval"
+		AC_DEFINE_UNQUOTED(SYSTEM_MIGEMODIR, "$withval")
+       fi ])
+
+AC_SUBST(SYSTEM_MIGEMODIR)
+
+###############################################################################
 # ????????????
 ###############################################################################
 AC_CHECK_LIB(ncurses, initscr, [NCURSES_LIB="yes"], [NCURSES_LIB="no"])
--- mfiler3/src/isearch.c.cmigemo	2008-06-30 18:10:03.000000000 +0900
+++ mfiler3/src/isearch.c	2008-09-27 17:11:09.000000000 +0900
@@ -273,71 +273,78 @@
 {
 #if defined(HAVE_MIGEMO_H)
     char buf[PATH_MAX];
+    char migemodir[PATH_MAX];
     gMigemo = migemo_open(NULL);
 
     char* datadir = getenv("MFILER3_DATADIR");
 
+#ifdef SYSTEM_MIGEMODIR
+    sprintf(migemodir,"%s", SYSTEM_MIGEMODIR);
+#else
+    sprintf(migemodir, "%s/%s", datadir, "mfiler");
+#endif
+
     if(gKanjiCode == kUtf8) {
-        sprintf(buf, "%s/mfiler/utf-8/migemo-dict", datadir);
+        sprintf(buf, "%s/utf-8/migemo-dict", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_MIGEMO, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/utf-8/roma2hira.dat", datadir);
+        sprintf(buf, "%s/utf-8/roma2hira.dat", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_ROMA2HIRA, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/utf-8/hira2kata.dat", datadir);
+        sprintf(buf, "%s/utf-8/hira2kata.dat", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_HIRA2KATA, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/utf-8/han2zen.dat", datadir);
+        sprintf(buf, "%s/utf-8/han2zen.dat", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_HAN2ZEN, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
     }
     else if(gKanjiCode == kEucjp) {
-        sprintf(buf, "%s/mfiler/euc-jp/migemo-dict", datadir);
+        sprintf(buf, "%s/euc-jp/migemo-dict", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_MIGEMO, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/euc-jp/roma2hira.dat", datadir);
+        sprintf(buf, "%s/euc-jp/roma2hira.dat", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_ROMA2HIRA, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/euc-jp/hira2kata.dat", datadir);
+        sprintf(buf, "%s/euc-jp/hira2kata.dat", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_HIRA2KATA, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/euc-jp/han2zen.dat", datadir);
+        sprintf(buf, "%s/euc-jp/han2zen.dat", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_HAN2ZEN, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
     }
     else {
-        sprintf(buf, "%s/mfiler/cp932/migemo-dict", datadir);
+        sprintf(buf, "%s/cp932/migemo-dict", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_MIGEMO, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/cp932/roma2hira.dat", datadir);
+        sprintf(buf, "%s/cp932/roma2hira.dat", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_ROMA2HIRA, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/cp932/hira2kata.dat", datadir);
+        sprintf(buf, "%s/cp932/hira2kata.dat", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_HIRA2KATA, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/cp932/han2zen.dat", datadir);
+        sprintf(buf, "%s/cp932/han2zen.dat", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_HAN2ZEN, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);


Index: mfiler3.spec
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-9/mfiler3.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mfiler3.spec	26 Sep 2008 16:04:17 -0000	1.11
+++ mfiler3.spec	27 Sep 2008 08:26:12 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:		mfiler3
 Version:	2.0.8a
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Two pane file manager under UNIX console
 
 Group:		Applications/Editors
@@ -11,7 +11,7 @@
 URL:		http://www.geocities.jp/daisuke530221jp/index3.html
 Source0:	http://www.geocities.jp/daisuke530221jp/%{name}-%{version}.tgz
 Source10:	mfiler3.sh
-Patch0:		mfiler3-2.0.5-use-external.patch
+Patch0:		mfiler3-2.0.8a-use-external.patch
 Patch1:		mfiler3-2.0.8a-upgrade-compat.patch
 Patch2:		mfiler3-2.0.8a-signal-define.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,6 +21,8 @@
 BuildRequires:	ncurses-devel
 BuildRequires:	oniguruma-devel
 
+BuildRequires:	autoconf
+
 # ruby-devel requires ruby-libs but does not require ruby
 BuildRequires:	ruby
 BuildRequires:	ruby-devel
@@ -50,6 +52,8 @@
 %patch0 -p1 -b .ext
 %patch1 -p0 -b .upcompat
 %patch2 -p0 -b .arch
+
+autoconf
 # Remove unneeded internal directories to make it sure that
 # we are using external libraries
 %{__rm} -rf \
@@ -62,7 +66,8 @@
 %build
 %configure \
 	--sysconfdir=%{_sysconfdir}/%{name} \
-	--bindir=%{_libexecdir}/%{name}
+	--bindir=%{_libexecdir}/%{name} \
+	--with-system-migemodir=%{_datadir}/cmigemo
 %{__make} %{?_smp_mflags} -k \
 	CC="%{__cc} $RPM_OPT_FLAGS"
 
@@ -99,6 +104,9 @@
 
 
 %changelog
+* Sat Sep 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-3
+- Better system-wide cmigemo patch
+
 * Sat Sep 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-2
 - Fix sparc64 build error
 



From kkofler at fedoraproject.org  Sat Sep 27 09:18:39 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 27 Sep 2008 09:18:39 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.40, 1.41 kde-settings.spec,
	1.56, 1.57 sources, 1.39, 1.40
Message-ID: <20080927091839.557E970117@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10706/devel

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Sat Sep 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0-28
- kxkbrc: set default keyboard model to evdev (matches F10+ X11 setup, #464101)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	16 Sep 2008 13:48:11 -0000	1.40
+++ .cvsignore	27 Sep 2008 09:18:09 -0000	1.41
@@ -1,3 +1 @@
-kde-settings-4.0-25.tar.bz2
-kde-settings-4.0-26.tar.bz2
-kde-settings-4.0-27.tar.bz2
+kde-settings-4.0-28.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kde-settings.spec	16 Sep 2008 13:48:11 -0000	1.56
+++ kde-settings.spec	27 Sep 2008 09:18:09 -0000	1.57
@@ -1,7 +1,9 @@
 # THIS SPECFILE IS FOR F9+ ONLY!
 # Sorry, it is just too different for conditionals to be worth it.
+# The actuall tarball DIFFERS between F9 and F10+!
+# Use kde-settings trunk for F10+, F-9 branch for F9.
 
-%define rel 27
+%define rel 28
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -153,6 +155,9 @@
 
 
 %changelog
+* Sat Sep 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0-28
+- kxkbrc: set default keyboard model to evdev (matches F10+ X11 setup, #464101)
+
 * Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.0-27
 - remove unneeded symlinks in Fedora-KDE icon theme
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	16 Sep 2008 13:48:11 -0000	1.39
+++ sources	27 Sep 2008 09:18:09 -0000	1.40
@@ -1 +1 @@
-3f4d5a966401bc107039d2d553a4156c  kde-settings-4.0-27.tar.bz2
+383a66fc9e98257994772c79e90ee01b  kde-settings-4.0-28.tar.bz2



From jnovy at fedoraproject.org  Sat Sep 27 09:29:10 2008
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Sat, 27 Sep 2008 09:29:10 +0000 (UTC)
Subject: rpms/netpbm/devel .cvsignore, 1.43, 1.44 netpbm.spec, 1.119,
	1.120 sources, 1.47, 1.48
Message-ID: <20080927092910.99B3970117@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11559

Modified Files:
	.cvsignore netpbm.spec sources 
Log Message:
* Sat Sep 27 2008 Jindrich Novy <jnovy at redhat.com> 10.35.52-1
- update to 10.35.52
- fixes crash of libppmd/ppmdraw when line is completely out of frame



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	18 Sep 2008 12:35:02 -0000	1.43
+++ .cvsignore	27 Sep 2008 09:28:39 -0000	1.44
@@ -1 +1 @@
-netpbm-10.35.51.tar.bz2
+netpbm-10.35.52.tar.bz2


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- netpbm.spec	18 Sep 2008 12:35:02 -0000	1.119
+++ netpbm.spec	27 Sep 2008 09:28:40 -0000	1.120
@@ -1,6 +1,6 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.51
+Version: 10.35.52
 Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -219,6 +219,10 @@
 %{_datadir}/netpbm/
 
 %changelog
+* Sat Sep 27 2008 Jindrich Novy <jnovy at redhat.com> 10.35.52-1
+- update to 10.35.52
+- fixes crash of libppmd/ppmdraw when line is completely out of frame
+
 * Thu Sep 18 2008 Jindrich Novy <jnovy at redhat.com> 10.35.51-1
 - update to netpbm-10.35.51
 - make it actually compilable by removing duplicated function


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	18 Sep 2008 12:35:02 -0000	1.47
+++ sources	27 Sep 2008 09:28:40 -0000	1.48
@@ -1 +1 @@
-f07e2e4a669fff8ea8192e7b4834d9de  netpbm-10.35.51.tar.bz2
+e0b37dabb421e51fc8e85dc29ce2a89f  netpbm-10.35.52.tar.bz2



From kkofler at fedoraproject.org  Sat Sep 27 09:37:40 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 27 Sep 2008 09:37:40 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.41, 1.42 kde-settings.spec,
	1.57, 1.58 sources, 1.40, 1.41
Message-ID: <20080927093740.4B5FF70117@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12187/devel

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Sat Sep 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0-29
- remove /etc/kde/env/pulseaudio.sh, no longer needed in F10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	27 Sep 2008 09:18:09 -0000	1.41
+++ .cvsignore	27 Sep 2008 09:37:09 -0000	1.42
@@ -1 +1 @@
-kde-settings-4.0-28.tar.bz2
+kde-settings-4.0-29.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kde-settings.spec	27 Sep 2008 09:18:09 -0000	1.57
+++ kde-settings.spec	27 Sep 2008 09:37:09 -0000	1.58
@@ -1,9 +1,9 @@
-# THIS SPECFILE IS FOR F9+ ONLY!
+# THIS SPECFILE IS FOR F10+ ONLY!
 # Sorry, it is just too different for conditionals to be worth it.
-# The actuall tarball DIFFERS between F9 and F10+!
-# Use kde-settings trunk for F10+, F-9 branch for F9.
+# The actuall tarball also DIFFERS between releases!
+# Use kde-settings trunk for F10+, F-9 branch for F9, F-8 branch for F8.
 
-%define rel 28
+%define rel 29
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -151,10 +151,13 @@
 
 %files pulseaudio
 %defattr(-,root,root,-)
-%{_sysconfdir}/kde/env/pulseaudio.sh
+# nothing, this is a metapackage
 
 
 %changelog
+* Sat Sep 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0-29
+- remove /etc/kde/env/pulseaudio.sh, no longer needed in F10
+
 * Sat Sep 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0-28
 - kxkbrc: set default keyboard model to evdev (matches F10+ X11 setup, #464101)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	27 Sep 2008 09:18:09 -0000	1.40
+++ sources	27 Sep 2008 09:37:09 -0000	1.41
@@ -1 +1 @@
-383a66fc9e98257994772c79e90ee01b  kde-settings-4.0-28.tar.bz2
+5abb37a2c04a527abb8cca566f5eab73  kde-settings-4.0-29.tar.bz2



From kkofler at fedoraproject.org  Sat Sep 27 09:38:28 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 27 Sep 2008 09:38:28 +0000 (UTC)
Subject: rpms/kde-settings/devel kde-settings.spec,1.58,1.59
Message-ID: <20080927093828.CB8E170117@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12241/devel

Modified Files:
	kde-settings.spec 
Log Message:
Note BZ ID (#448477).


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kde-settings.spec	27 Sep 2008 09:37:09 -0000	1.58
+++ kde-settings.spec	27 Sep 2008 09:37:58 -0000	1.59
@@ -156,7 +156,7 @@
 
 %changelog
 * Sat Sep 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0-29
-- remove /etc/kde/env/pulseaudio.sh, no longer needed in F10
+- remove /etc/kde/env/pulseaudio.sh, no longer needed in F10 (#448477)
 
 * Sat Sep 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0-28
 - kxkbrc: set default keyboard model to evdev (matches F10+ X11 setup, #464101)



From kkofler at fedoraproject.org  Sat Sep 27 09:47:35 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 27 Sep 2008 09:47:35 +0000 (UTC)
Subject: rpms/kde-settings/devel sources,1.41,1.42
Message-ID: <20080927094735.7645D70117@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12919/devel

Modified Files:
	sources 
Log Message:
Fix tarball.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	27 Sep 2008 09:37:09 -0000	1.41
+++ sources	27 Sep 2008 09:47:05 -0000	1.42
@@ -1 +1 @@
-5abb37a2c04a527abb8cca566f5eab73  kde-settings-4.0-29.tar.bz2
+67123b690162fb1b50884c1197a65888  kde-settings-4.0-29.tar.bz2



From hadess at fedoraproject.org  Sat Sep 27 10:43:51 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat, 27 Sep 2008 10:43:51 +0000 (UTC)
Subject: rpms/bluez-gnome/devel .cvsignore, 1.25, 1.26 bluez-gnome.spec, 1.58,
	1.59 sources, 1.25,
	1.26 0001-Fix-getting-names-of-remote-devices.patch, 1.1, NONE
Message-ID: <20080927104352.0377970117@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15930

Modified Files:
	.cvsignore bluez-gnome.spec sources 
Removed Files:
	0001-Fix-getting-names-of-remote-devices.patch 
Log Message:
* Sat Sep 27 2008 - Bastien Nocera <bnocera at redhat.com> - 1.5-1
- Update to 1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	13 Sep 2008 19:25:27 -0000	1.25
+++ .cvsignore	27 Sep 2008 10:43:21 -0000	1.26
@@ -1 +1 @@
-bluez-gnome-1.4.tar.gz
+bluez-gnome-1.5.tar.gz


Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- bluez-gnome.spec	24 Sep 2008 01:06:12 -0000	1.58
+++ bluez-gnome.spec	27 Sep 2008 10:43:21 -0000	1.59
@@ -1,6 +1,6 @@
 Name:		bluez-gnome
-Version:	1.4
-Release:	4%{?dist}
+Version:	1.5
+Release:	1%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
@@ -8,8 +8,7 @@
 URL:		http://www.bluez.org/
 Source0:	http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
 
-Patch0:		0001-Fix-getting-names-of-remote-devices.patch
-Patch1:		bluetooth-sendto-ods-svn.patch
+Patch0:		bluetooth-sendto-ods-svn.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -47,8 +46,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .bluez4
-%patch1 -p1 -b .ods-svn
+%patch0 -p1 -b .ods-svn
 
 %build
 %configure --disable-mime-update --disable-desktop-update --disable-icon-update
@@ -141,6 +139,9 @@
 %{_mandir}/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Sat Sep 27 2008 - Bastien Nocera <bnocera at redhat.com> - 1.5-1
+- Update to 1.5
+
 * Tue Sep 23 2008 - Bastien Nocera <bnocera at redhat.com> - 1.4-4
 - Update bluetooth-sendto to the BlueZ 4.x API, and obex-data-server
   SVN APIs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	13 Sep 2008 19:25:27 -0000	1.25
+++ sources	27 Sep 2008 10:43:21 -0000	1.26
@@ -1 +1 @@
-998dd07436f77bf4ab360f5185fe6224  bluez-gnome-1.4.tar.gz
+d50b0b236015e49578bc43bb3512505a  bluez-gnome-1.5.tar.gz


--- 0001-Fix-getting-names-of-remote-devices.patch DELETED ---



From sereinit at fedoraproject.org  Sat Sep 27 10:58:32 2008
From: sereinit at fedoraproject.org (=?utf-8?q?Marcelin_Beno=C3=AEt?=)
Date: Sat, 27 Sep 2008 10:58:32 +0000 (UTC)
Subject: rpms/gbrainy/devel .cvsignore, 1.3, 1.4 gbrainy.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20080927105832.4D66770117@cvs1.fedora.phx.redhat.com>

Author: sereinit

Update of /cvs/pkgs/rpms/gbrainy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16945

Modified Files:
	.cvsignore gbrainy.spec sources 
Log Message:
Update to 1.00 and fix 460353 issue



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Jun 2008 20:14:43 -0000	1.3
+++ .cvsignore	27 Sep 2008 10:58:01 -0000	1.4
@@ -1 +1 @@
-gbrainy-0.70.tar.gz
+gbrainy-1.00.tar.gz


Index: gbrainy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/devel/gbrainy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gbrainy.spec	1 Aug 2008 21:46:16 -0000	1.5
+++ gbrainy.spec	27 Sep 2008 10:58:02 -0000	1.6
@@ -1,6 +1,10 @@
+# %define debug_package %{nil}
+# Because it's a Mono package and generate an empty debuginfo
+# http://fedoraproject.org/wiki/Packaging/Debuginfo#head-29573c4f61c3a4698b2d07c7e73cfa194785f257
+
 Name:		gbrainy
-Version:	0.70
-Release:	4%{?dist}
+Version:	1.00
+Release:	1%{?dist}
 Summary:	Gbrainy is a brain teaser game and trainer to keep your brain trained
 
 Group:		Amusements/Games
@@ -9,8 +13,8 @@
 Source0:	http://www.softcatala.org/~jmas/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	mono-devel intltool
-BuildRequires:  gnome-sharp-devel libglade2-devel gtk-sharp2-devel
+BuildRequires:	mono-devel intltool librsvg2-devel
+BuildRequires:	gtk-sharp2-devel gnome-sharp-devel
 BuildRequires:  /usr/bin/desktop-file-install
 
 # Mono only availible on these:
@@ -30,6 +34,9 @@
 
 %prep
 %setup -q
+# To fix 460353 :
+sed 's#share/games#share#' src/Defines.cs.in -i
+sed 's#^images = $(datadir)/games/gbrainy$#images = $(datadir)/gbrainy#' data/Makefile.in -i
 
 %build
 %configure
@@ -44,6 +51,9 @@
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
+# To fix a rpmlint issue
+chmod a-x $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}.exe.config
+
 %find_lang %{name}
 
 %clean
@@ -67,20 +77,21 @@
 %{_bindir}/%{name}
 %{_libdir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/games/%{name}
+%{_datadir}/%{name}
 %{_datadir}/icons/hicolor/*/apps/%{name}*
 %{_mandir}/man6/%{name}.6.gz
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
-* Fri Aug 01 2008 Beno??t Marcelin <sereinity at online.fr> 0.70-4
-- Increase release to fix an EVR problem
-
-* Sat Jul 05 2008 Beno??t Marcelin <sereinity at online.fr> 0.70-3
-- Rebuild with gnome-sharp-2.20 .pc fix
-
-* Fri Jul 04 2008 Beno??t Marcelin <sereinity at online.fr> 0.70-2
-- Rebuild for new gnome-sharp
+* Thu Sep 25 2008 Beno??t Marcelin <sereinity at online.fr> 1.00-1
+- Clean Build Requires
+- Fix bug 460353
+- Upate to 1.00
+- 1 new logic puzzle, 1 new memory puzzle
+- Better look and feel (new background)
+- Switch font drawing to Pango
+- Better I18N support
+- Bug fixes 
 
 * Tue Jun 03 2008 Beno??t Marcelin <sereinity at online.fr> 0.70-1
 - Update to 0.70


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Jun 2008 20:14:43 -0000	1.3
+++ sources	27 Sep 2008 10:58:02 -0000	1.4
@@ -1 +1 @@
-5eee76e379fc7db9ec05d2e577ecc10d  gbrainy-0.70.tar.gz
+adff790db643e846cb15c6142f2411ae  gbrainy-1.00.tar.gz



From sereinit at fedoraproject.org  Sat Sep 27 11:30:57 2008
From: sereinit at fedoraproject.org (=?utf-8?q?Marcelin_Beno=C3=AEt?=)
Date: Sat, 27 Sep 2008 11:30:57 +0000 (UTC)
Subject: rpms/gbrainy/F-9 .cvsignore, 1.3, 1.4 gbrainy.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <20080927113057.7107470117@cvs1.fedora.phx.redhat.com>

Author: sereinit

Update of /cvs/pkgs/rpms/gbrainy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18894

Modified Files:
	.cvsignore gbrainy.spec sources 
Log Message:
Update to 1.00 and fix 460353 issue



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Jun 2008 20:11:00 -0000	1.3
+++ .cvsignore	27 Sep 2008 11:30:26 -0000	1.4
@@ -1 +1 @@
-gbrainy-0.70.tar.gz
+gbrainy-1.00.tar.gz


Index: gbrainy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/F-9/gbrainy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gbrainy.spec	25 Jul 2008 10:43:16 -0000	1.4
+++ gbrainy.spec	27 Sep 2008 11:30:26 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		gbrainy
-Version:	0.70
-Release:	4%{?dist}
+Version:	1.00
+Release:	1%{?dist}
 Summary:	Gbrainy is a brain teaser game and trainer to keep your brain trained
 
 Group:		Amusements/Games
@@ -9,8 +9,8 @@
 Source0:	http://www.softcatala.org/~jmas/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	mono-devel intltool
-BuildRequires:  gnome-sharp-devel libglade2-devel gtk-sharp2-devel
+BuildRequires:	mono-devel intltool librsvg2-devel
+BuildRequires:	gtk-sharp2-devel gnome-sharp-devel
 BuildRequires:  /usr/bin/desktop-file-install
 
 # Mono only availible on these:
@@ -30,6 +30,9 @@
 
 %prep
 %setup -q
+# To fix 460353 :
+sed 's#share/games#share#' src/Defines.cs.in -i
+sed 's#^images = $(datadir)/games/gbrainy$#images = $(datadir)/gbrainy#' data/Makefile.in -i
 
 %build
 %configure
@@ -44,6 +47,9 @@
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
+# To fix a rpmlint issue
+chmod a-x $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}.exe.config
+
 %find_lang %{name}
 
 %clean
@@ -67,17 +73,21 @@
 %{_bindir}/%{name}
 %{_libdir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/games/%{name}
+%{_datadir}/%{name}
 %{_datadir}/icons/hicolor/*/apps/%{name}*
 %{_mandir}/man6/%{name}.6.gz
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
-* Fri Jul 25 2008 Beno??t Marcelin <sereinity at online.fr> 0.70-4
-- Increase release to fix a bug
-
-* Thu Jul 24 2008 Beno??t Marcelin <sereinity at online.fr> 0.70-2
-- Rebuild for dependencies
+* Thu Sep 25 2008 Beno??t Marcelin <sereinity at online.fr> 1.00-1
+- Clean Build Requires
+- Fix bug 460353
+- Upate to 1.00
+- 1 new logic puzzle, 1 new memory puzzle
+- Better look and feel (new background)
+- Switch font drawing to Pango
+- Better I18N support
+- Bug fixes 
 
 * Tue Jun 03 2008 Beno??t Marcelin <sereinity at online.fr> 0.70-1
 - Update to 0.70


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Jun 2008 20:11:00 -0000	1.3
+++ sources	27 Sep 2008 11:30:26 -0000	1.4
@@ -1 +1 @@
-5eee76e379fc7db9ec05d2e577ecc10d  gbrainy-0.70.tar.gz
+adff790db643e846cb15c6142f2411ae  gbrainy-1.00.tar.gz



From jgu at fedoraproject.org  Sat Sep 27 11:40:11 2008
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sat, 27 Sep 2008 11:40:11 +0000 (UTC)
Subject: rpms/emacs-vm/devel .cvsignore, 1.14, 1.15 emacs-vm.spec, 1.29,
	1.30 sources, 1.14, 1.15
Message-ID: <20080927114011.2B7F070117@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19486

Modified Files:
	.cvsignore emacs-vm.spec sources 
Log Message:
* Sat Sep 27 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.11.581-1
- Update to 8.0.11-581



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	30 Jul 2008 11:01:37 -0000	1.14
+++ .cvsignore	27 Sep 2008 11:39:40 -0000	1.15
@@ -1,2 +1,2 @@
-vm-8.0.10-575.tgz
+vm-8.0.11-581.tgz
 u-vm-color.el


Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- emacs-vm.spec	30 Jul 2008 10:35:31 -0000	1.29
+++ emacs-vm.spec	27 Sep 2008 11:39:40 -0000	1.30
@@ -4,8 +4,8 @@
 # Upstream used rather odd versioning: there is a version number, and then a
 # "devo" number which is the BZR tree revision, separated with a hypen. However,
 # rpm doesn't allow a hyphen in the versoion number.
-%define vmversion 8.0.10
-%define devoversion 575
+%define vmversion 8.0.11
+%define devoversion 581
 
 # Note on building VM with support for bbdb: if support for VM in BBDB is
 # required, then the source elisp for VM must be installed at build time. If
@@ -145,6 +145,9 @@
 %{pkgdir}/*.el
 
 %changelog
+* Sat Sep 27 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.11.581-1
+- Update to 8.0.11-581
+
 * Wed Jul 30 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.10.575-1
 - Update to version 8.0.10-575
 - Update BuildRoot to preferred mktemp variant


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	30 Jul 2008 11:01:37 -0000	1.14
+++ sources	27 Sep 2008 11:39:40 -0000	1.15
@@ -1,2 +1,2 @@
-4c02f3acf9a25afc5941802693277f7b  vm-8.0.10-575.tgz
+a66fb12d5bf02179fa053da4a0570129  vm-8.0.11-581.tgz
 fa145ca291d5717072349d055512559c  u-vm-color.el



From sereinit at fedoraproject.org  Sat Sep 27 11:48:13 2008
From: sereinit at fedoraproject.org (=?utf-8?q?Marcelin_Beno=C3=AEt?=)
Date: Sat, 27 Sep 2008 11:48:13 +0000 (UTC)
Subject: rpms/gbrainy/F-9 gbrainy.spec,1.5,1.6
Message-ID: <20080927114813.3243470117@cvs1.fedora.phx.redhat.com>

Author: sereinit

Update of /cvs/pkgs/rpms/gbrainy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19901

Modified Files:
	gbrainy.spec 
Log Message:
Fix Build Requires



Index: gbrainy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/F-9/gbrainy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gbrainy.spec	27 Sep 2008 11:30:26 -0000	1.5
+++ gbrainy.spec	27 Sep 2008 11:47:42 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		gbrainy
 Version:	1.00
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Gbrainy is a brain teaser game and trainer to keep your brain trained
 
 Group:		Amusements/Games
@@ -10,7 +10,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	mono-devel intltool librsvg2-devel
-BuildRequires:	gtk-sharp2-devel gnome-sharp-devel
+BuildRequires:	gtk-sharp2-devel gnome-sharp-devel gtk-sharp2-devel
 BuildRequires:  /usr/bin/desktop-file-install
 
 # Mono only availible on these:
@@ -79,6 +79,9 @@
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
+* Sat Sep 27 2008 Beno??t Marcelin <sereinity at online.fr> 1.00-2
+- Fix Build Requires
+
 * Thu Sep 25 2008 Beno??t Marcelin <sereinity at online.fr> 1.00-1
 - Clean Build Requires
 - Fix bug 460353



From jgu at fedoraproject.org  Sat Sep 27 12:17:06 2008
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sat, 27 Sep 2008 12:17:06 +0000 (UTC)
Subject: rpms/emacs-vm/F-9 emacs-vm.spec,1.29,1.30 sources,1.13,1.14
Message-ID: <20080927121707.04E1B70117@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21557

Modified Files:
	emacs-vm.spec sources 
Log Message:
* Sat Sep 27 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.11.581-1
- Update to 8.0.11-581



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/F-9/emacs-vm.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- emacs-vm.spec	30 Jul 2008 11:27:33 -0000	1.29
+++ emacs-vm.spec	27 Sep 2008 12:16:36 -0000	1.30
@@ -4,8 +4,8 @@
 # Upstream used rather odd versioning: there is a version number, and then a
 # "devo" number which is the BZR tree revision, separated with a hypen. However,
 # rpm doesn't allow a hyphen in the versoion number.
-%define vmversion 8.0.10
-%define devoversion 575
+%define vmversion 8.0.11
+%define devoversion 581
 
 # Note on building VM with support for bbdb: if support for VM in BBDB is
 # required, then the source elisp for VM must be installed at build time. If
@@ -145,6 +145,9 @@
 %{pkgdir}/*.el
 
 %changelog
+* Sat Sep 27 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.11.581-1
+- Update to 8.0.11-581
+
 * Wed Jul 30 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.10.575-1
 - Update to version 8.0.10-575
 - Update BuildRoot to preferred mktemp variant


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	30 Jul 2008 11:27:33 -0000	1.13
+++ sources	27 Sep 2008 12:16:36 -0000	1.14
@@ -1,2 +1,2 @@
-4c02f3acf9a25afc5941802693277f7b  vm-8.0.10-575.tgz
+a66fb12d5bf02179fa053da4a0570129  vm-8.0.11-581.tgz
 fa145ca291d5717072349d055512559c  u-vm-color.el



From jgu at fedoraproject.org  Sat Sep 27 12:18:08 2008
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sat, 27 Sep 2008 12:18:08 +0000 (UTC)
Subject: rpms/emacs-vm/F-8 emacs-vm.spec,1.29,1.30 sources,1.13,1.14
Message-ID: <20080927121808.331AF70117@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21718

Modified Files:
	emacs-vm.spec sources 
Log Message:
* Sat Sep 27 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.11.581-1
- Update to 8.0.11-581



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/F-8/emacs-vm.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- emacs-vm.spec	30 Jul 2008 11:28:45 -0000	1.29
+++ emacs-vm.spec	27 Sep 2008 12:17:38 -0000	1.30
@@ -4,8 +4,8 @@
 # Upstream used rather odd versioning: there is a version number, and then a
 # "devo" number which is the BZR tree revision, separated with a hypen. However,
 # rpm doesn't allow a hyphen in the versoion number.
-%define vmversion 8.0.10
-%define devoversion 575
+%define vmversion 8.0.11
+%define devoversion 581
 
 # Note on building VM with support for bbdb: if support for VM in BBDB is
 # required, then the source elisp for VM must be installed at build time. If
@@ -145,6 +145,9 @@
 %{pkgdir}/*.el
 
 %changelog
+* Sat Sep 27 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.11.581-1
+- Update to 8.0.11-581
+
 * Wed Jul 30 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.10.575-1
 - Update to version 8.0.10-575
 - Update BuildRoot to preferred mktemp variant


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/F-8/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	30 Jul 2008 11:28:45 -0000	1.13
+++ sources	27 Sep 2008 12:17:38 -0000	1.14
@@ -1,2 +1,2 @@
-4c02f3acf9a25afc5941802693277f7b  vm-8.0.10-575.tgz
+a66fb12d5bf02179fa053da4a0570129  vm-8.0.11-581.tgz
 fa145ca291d5717072349d055512559c  u-vm-color.el



From rdieter at fedoraproject.org  Sat Sep 27 12:35:59 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 12:35:59 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.45,1.46
Message-ID: <20080927123559.56F8B70117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22814

Modified Files:
	kde-l10n.spec 
Log Message:
tighted BR



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kde-l10n.spec	27 Sep 2008 03:44:24 -0000	1.45
+++ kde-l10n.spec	27 Sep 2008 12:35:29 -0000	1.46
@@ -67,7 +67,7 @@
 
 Requires: kde-filesystem
 
-BuildRequires: kdelibs4-devel
+BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: findutils
 BuildRequires: gettext
 BuildRequires: kde-filesystem >= 4



From rathann at fedoraproject.org  Sat Sep 27 13:12:51 2008
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 27 Sep 2008 13:12:51 +0000 (UTC)
Subject: rpms/freefem++/devel .cvsignore, 1.3, 1.4 freefem++.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <20080927131251.F2A4570117@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/freefem++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24922

Modified Files:
	.cvsignore freefem++.spec sources 
Log Message:
* Wed Sep 24 2008 Dominik Mierzejewski <rpm at greysector.net> 2.24-3.2
- updated to 2.24-2
- fixed build in rawhide
- re-enable testsuite



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Feb 2008 23:25:40 -0000	1.3
+++ .cvsignore	27 Sep 2008 13:12:21 -0000	1.4
@@ -1,2 +1,2 @@
 FreeFem++.1
-freefem++-2.24.tar.gz
+freefem++-2.24-2.tar.gz


Index: freefem++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- freefem++.spec	22 Feb 2008 12:33:58 -0000	1.9
+++ freefem++.spec	27 Sep 2008 13:12:21 -0000	1.10
@@ -1,10 +1,13 @@
+%define dotpl .2
+%define dashpl -2
+
 Summary: PDE solving tool
 Name: freefem++
 Version: 2.24
-Release: 2%{?dist}
+Release: 3%{dotpl}%{?dist}
 URL: http://www.freefem.org/ff++/index.htm
 Group: Applications/Engineering
-Source0: http://www.freefem.org/ff++/ftp/%{name}-%{version}.tar.gz
+Source0: http://www.freefem.org/ff++/ftp/%{name}-%{version}%{dashpl}.tar.gz
 Source1: FreeFem++.1
 Patch0: %{name}-rpm.patch
 Patch1: %{name}-gcc43.patch
@@ -14,6 +17,7 @@
 BuildRequires:	atlas-devel
 BuildRequires:	automake
 BuildRequires:	bison
+BuildRequires:	environment-modules
 BuildRequires:	fftw-devel
 BuildRequires:	flex
 BuildRequires:	fltk-devel
@@ -60,17 +64,16 @@
 This package contains the MPI version of FreeFem++.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}%{dashpl}
 %patch0 -p1 -b .r
 %patch1 -p1 -b .gcc43
 chmod -x src/fflib/mt19937ar.cpp
 chmod -x src/lglib/mymain.cpp
 
 %build
+. /etc/profile.d/modules.sh
+module load %{_libdir}/lam/lam.module
 autoreconf
-#sed -i -e 's/^\(\s*hardcode_libdir_flag_spec\s*=\).*/\1/' configure
-#CPPFLAGS="`pkg-config --cflags lam`"
-#export CPPFLAGS
 %configure \
 	--with-x \
 	--with-blas="-L%{_libdir}/atlas -llapack -lf77blas -lcblas -latlas" \
@@ -88,8 +91,10 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#%%check
-#%{__make} check
+%check
+. /etc/profile.d/modules.sh
+module load %{_libdir}/lam/lam.module
+%{__make} check
 
 %files
 %defattr(-,root,root,-)
@@ -116,6 +121,11 @@
 %{_bindir}/FreeFem++-mpi
 
 %changelog
+* Wed Sep 24 2008 Dominik Mierzejewski <rpm at greysector.net> 2.24-3.2
+- updated to 2.24-2
+- fixed build in rawhide
+- re-enable testsuite
+
 * Fri Feb 22 2008 Dominik Mierzejewski <rpm at greysector.net> 2.24-2
 - fix build on ppc64
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Feb 2008 23:25:40 -0000	1.3
+++ sources	27 Sep 2008 13:12:21 -0000	1.4
@@ -1,2 +1,2 @@
 f1accc292794bbafb66e963080f9d15b  FreeFem++.1
-3acf5bf86d2156d7aa53be86b6413e7c  freefem++-2.24.tar.gz
+1b83214422a4d81717a8ce6e0be7ecca  freefem++-2.24-2.tar.gz



From denis at fedoraproject.org  Sat Sep 27 13:24:57 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Sat, 27 Sep 2008 13:24:57 +0000 (UTC)
Subject: rpms/galeon/F-9 galeon-2.0.7-plugins.patch, NONE, 1.1 .cvsignore,
	1.11, 1.12 galeon.spec, 1.51, 1.52 sources, 1.12,
	1.13 galeon-2.0.3-plugin-wrapper.patch, 1.3,
	NONE galeon-2.0.3-plugins.patch, 1.1,
	NONE galeon-2.0.5-build-fix.patch, 1.1,
	NONE galeon-2.0.5-xulrunner.patch, 1.1, NONE
Message-ID: <20080927132457.7D06770117@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/galeon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25636

Modified Files:
	.cvsignore galeon.spec sources 
Added Files:
	galeon-2.0.7-plugins.patch 
Removed Files:
	galeon-2.0.3-plugin-wrapper.patch galeon-2.0.3-plugins.patch 
	galeon-2.0.5-build-fix.patch galeon-2.0.5-xulrunner.patch 
Log Message:
Update to upstream 2.0.7, plugin patch cleanup, other patches upstreamed

galeon-2.0.7-plugins.patch:

--- NEW FILE galeon-2.0.7-plugins.patch ---
--- galeon-2.0.7/mozilla/Makefile.in.orig	2008-09-27 15:08:28.000000000 +0200
+++ galeon-2.0.7/mozilla/Makefile.in	2008-09-27 15:08:43.000000000 +0200
@@ -401,7 +401,7 @@
 	-I$(MOZILLA_INCLUDE_ROOT)/xpcom \
 	-I$(MOZILLA_INCLUDE_ROOT)/xpconnect \
 	-I$(MOZILLA_INCLUDE_ROOT)/xulapp $(GCONF_CFLAGS) \
-	$(GALEON_DEPENDENCY_CFLAGS) -DLIB_DIR=\"$(pkglibdir)\" \
+	$(GALEON_DEPENDENCY_CFLAGS) -DTOP_LIB_DIR=\"$(libdir)\" -DLIB_DIR=\"$(pkglibdir)\" \
 	-DSHARE_DIR=\"$(pkgdatadir)\" -D_GNU_SOURCE=1 -include \
 	mozilla-config.h $(am__append_1)
 noinst_LTLIBRARIES = libmozillaembed.la
--- galeon-2.0.7/mozilla/mozilla-embed-shell.cpp.orig	2008-09-03 06:58:17.000000000 +0200
+++ galeon-2.0.7/mozilla/mozilla-embed-shell.cpp	2008-09-27 15:11:01.000000000 +0200
@@ -230,6 +230,19 @@
 #endif
 }
 
+static int
+mozilla_setup_wrapped_plugin (void)
+{
+	char 	*p_viewer = "/usr/bin/mozilla-plugin-config";
+	gboolean  ret;
+
+	if(g_file_test(p_viewer, G_FILE_TEST_EXISTS) == FALSE)
+		return(FALSE);
+
+	ret = g_spawn_command_line_sync(p_viewer,NULL,NULL,NULL,NULL);
+	return(ret); 
+}
+
 static void
 mozilla_init_plugin_path ()
 {
@@ -248,7 +261,12 @@
 	g_string_append (new_path, "/.mozilla/plugins");
 
 	/* Add /usr/lib/mozilla/plugins (bug 149812) */
-	g_string_append (new_path, ":/usr/lib/mozilla/plugins");
+	if(mozilla_setup_wrapped_plugin()) {
+		g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins-wrapped");
+	}
+	else {
+		g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins");
+	}
 
 #ifdef GALEON_MOZILLA_HOME
 	/* Add the current mozilla build's plugins dir */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	4 Apr 2008 23:23:49 -0000	1.11
+++ .cvsignore	27 Sep 2008 13:24:26 -0000	1.12
@@ -1 +1 @@
-galeon-2.0.5.tar.bz2
+galeon-2.0.7.tar.bz2


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-9/galeon.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- galeon.spec	24 Sep 2008 06:11:35 -0000	1.51
+++ galeon.spec	27 Sep 2008 13:24:27 -0000	1.52
@@ -2,16 +2,14 @@
 
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
-Version:	2.0.5
-Release:	3%{?dist}
+Version:	2.0.7
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
-Patch0:		galeon-2.0.3-plugins.patch
-Patch1:		galeon-2.0.3-plugin-wrapper.patch
-Patch2:		galeon-2.0.5-xulrunner.patch
-Patch3:		galeon-2.0.5-build-fix.patch
+Patch0:		galeon-2.0.7-plugins.patch
+Patch4:		galeon-2.0.7-confignspr.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -42,9 +40,7 @@
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
 %patch0 -p1 -b .plugins
-%patch1 -p1 -b .wrapper
-%patch2 -p1 -b .xulrunner
-%patch3 -p1 -b .buildfix
+%patch4 -p1 -b .confignspr
 
 
 %build
@@ -53,7 +49,7 @@
 	--disable-werror                        \
 	--disable-schemas-install		\
 	--disable-dependency-tracking		\
-	--with-mozilla=xulrunner
+	--with-mozilla=libxul-embedding-unstable
 make %{?_smp_mflags}
 
 
@@ -119,6 +115,11 @@
 
 
 %changelog
+* Sat Sep 27 2008 Denis Leroy <denis at poolshark.org> - 2.0.7-1
+- Update to upstream 2.0.7, support for libxul-unstable
+- Plugin patch cleanup
+- Other patches upstreamed
+
 * Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 2.0.5-3
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	4 Apr 2008 23:23:49 -0000	1.12
+++ sources	27 Sep 2008 13:24:27 -0000	1.13
@@ -1 +1 @@
-bbddb89ad1ba08a62e03bceab5a38d93  galeon-2.0.5.tar.bz2
+2eede1f43e3f6f2ac4ce7d4db99b15b2  galeon-2.0.7.tar.bz2


--- galeon-2.0.3-plugin-wrapper.patch DELETED ---


--- galeon-2.0.3-plugins.patch DELETED ---


--- galeon-2.0.5-build-fix.patch DELETED ---


--- galeon-2.0.5-xulrunner.patch DELETED ---



From denis at fedoraproject.org  Sat Sep 27 13:31:01 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Sat, 27 Sep 2008 13:31:01 +0000 (UTC)
Subject: rpms/galeon/F-9 galeon.spec,1.52,1.53
Message-ID: <20080927133101.6AC6770117@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/galeon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26013

Modified Files:
	galeon.spec 
Log Message:
Need unstable BR


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-9/galeon.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- galeon.spec	27 Sep 2008 13:24:27 -0000	1.52
+++ galeon.spec	27 Sep 2008 13:30:30 -0000	1.53
@@ -16,6 +16,7 @@
 BuildRequires:	gtk2-devel >= 2.4.0
 BuildRequires:	gnome-desktop-devel
 BuildRequires:	gecko-devel >= %{gecko_ver}
+BuildRequires:	gecko-devel-unstable >= %{gecko_ver}
 BuildRequires:	libgnomeui-devel >= 2.5.2
 BuildRequires:  perl(XML::Parser) scrollkeeper
 BuildRequires:  intltool



From denis at fedoraproject.org  Sat Sep 27 13:33:39 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Sat, 27 Sep 2008 13:33:39 +0000 (UTC)
Subject: rpms/galeon/F-9 galeon-2.0.7-confignspr.patch,NONE,1.1
Message-ID: <20080927133339.A312A70117@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/galeon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26568

Added Files:
	galeon-2.0.7-confignspr.patch 
Log Message:
nspr test build patch

galeon-2.0.7-confignspr.patch:

--- NEW FILE galeon-2.0.7-confignspr.patch ---
--- galeon-2.0.7/configure~	2008-09-27 05:16:12.000000000 +0200
+++ galeon-2.0.7/configure	2008-09-27 14:48:41.000000000 +0200
@@ -23802,7 +23802,7 @@
 for i in $TEST_MOZILLA_INCLUDE_DIRS ; do
    CXXFLAGS="$CXXFLAGS -I$MOZILLA_INCLUDE_ROOT/$i"
 done
-CXXFLAGS="$CXXFLAGS -DMOZILLA_STRICT_API=1"
+CXXFLAGS="$CXXFLAGS -DMOZILLA_STRICT_API=1 `pkg-config --cflags nspr`"
 
 
 { echo "$as_me:$LINENO: checking whether we have a mozilla debug build" >&5



From mtasaka at fedoraproject.org  Sat Sep 27 14:56:18 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 27 Sep 2008 14:56:18 +0000 (UTC)
Subject: rpms/mfiler3/devel mfiler3-2.0.8a-use-external.patch,1.1,1.2
Message-ID: <20080927145618.3692C70117@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mfiler3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30989/devel

Modified Files:
	mfiler3-2.0.8a-use-external.patch 
Log Message:
a bit fix for cmigemo patch

mfiler3-2.0.8a-use-external.patch:

Index: mfiler3-2.0.8a-use-external.patch
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/devel/mfiler3-2.0.8a-use-external.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mfiler3-2.0.8a-use-external.patch	27 Sep 2008 08:26:13 -0000	1.1
+++ mfiler3-2.0.8a-use-external.patch	27 Sep 2008 14:55:48 -0000	1.2
@@ -1,5 +1,5 @@
---- mfiler3/Makefile.in.cmigemo	2008-09-27 15:52:38.000000000 +0900
-+++ mfiler3/Makefile.in	2008-09-27 17:09:26.000000000 +0900
+--- mfiler3/Makefile.in.cmigemo	2008-09-11 04:46:29.000000000 +0900
++++ mfiler3/Makefile.in	2008-09-27 23:52:57.000000000 +0900
 @@ -19,6 +19,7 @@
  COMPILED_INCONIG=@COMPILED_INCONIG@
  
@@ -69,7 +69,7 @@
  #undef HAVE_NCURSES_H
  #undef HAVE_ICONV_H
 --- mfiler3/configure.in.cmigemo	2008-07-07 11:59:46.000000000 +0900
-+++ mfiler3/configure.in	2008-09-27 17:16:12.000000000 +0900
++++ mfiler3/configure.in	2008-09-27 23:53:02.000000000 +0900
 @@ -140,6 +140,19 @@
  AC_SUBST(LIBMIGEMO)
  
@@ -78,7 +78,7 @@
 +###############################################################################
 +AC_ARG_WITH(system-migemodir,[ --with-system-migemodir    
 +	(specify the directory of system migemo dictionary. /usr/share/migemo, for example)],
-+	[ if test "$withval" && test -n $LIBMIGEMO ; then
++	[ if test -n "$withval" && test -n $LIBMIGEMO ; then
 +		echo "system-migemodir = $withval"
 +		SYSTEM_MIGEMODIR="$withval"
 +		AC_DEFINE_UNQUOTED(SYSTEM_MIGEMODIR, "$withval")



From mtasaka at fedoraproject.org  Sat Sep 27 14:56:18 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 27 Sep 2008 14:56:18 +0000 (UTC)
Subject: rpms/mfiler3/F-9 mfiler3-2.0.8a-use-external.patch,1.1,1.2
Message-ID: <20080927145618.19B0070117@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mfiler3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30989/F-9

Modified Files:
	mfiler3-2.0.8a-use-external.patch 
Log Message:
a bit fix for cmigemo patch

mfiler3-2.0.8a-use-external.patch:

Index: mfiler3-2.0.8a-use-external.patch
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-9/mfiler3-2.0.8a-use-external.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mfiler3-2.0.8a-use-external.patch	27 Sep 2008 08:26:12 -0000	1.1
+++ mfiler3-2.0.8a-use-external.patch	27 Sep 2008 14:55:47 -0000	1.2
@@ -1,5 +1,5 @@
---- mfiler3/Makefile.in.cmigemo	2008-09-27 15:52:38.000000000 +0900
-+++ mfiler3/Makefile.in	2008-09-27 17:09:26.000000000 +0900
+--- mfiler3/Makefile.in.cmigemo	2008-09-11 04:46:29.000000000 +0900
++++ mfiler3/Makefile.in	2008-09-27 23:52:57.000000000 +0900
 @@ -19,6 +19,7 @@
  COMPILED_INCONIG=@COMPILED_INCONIG@
  
@@ -69,7 +69,7 @@
  #undef HAVE_NCURSES_H
  #undef HAVE_ICONV_H
 --- mfiler3/configure.in.cmigemo	2008-07-07 11:59:46.000000000 +0900
-+++ mfiler3/configure.in	2008-09-27 17:16:12.000000000 +0900
++++ mfiler3/configure.in	2008-09-27 23:53:02.000000000 +0900
 @@ -140,6 +140,19 @@
  AC_SUBST(LIBMIGEMO)
  
@@ -78,7 +78,7 @@
 +###############################################################################
 +AC_ARG_WITH(system-migemodir,[ --with-system-migemodir    
 +	(specify the directory of system migemo dictionary. /usr/share/migemo, for example)],
-+	[ if test "$withval" && test -n $LIBMIGEMO ; then
++	[ if test -n "$withval" && test -n $LIBMIGEMO ; then
 +		echo "system-migemodir = $withval"
 +		SYSTEM_MIGEMODIR="$withval"
 +		AC_DEFINE_UNQUOTED(SYSTEM_MIGEMODIR, "$withval")



From rdieter at fedoraproject.org  Sat Sep 27 14:57:39 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 14:57:39 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.46,1.47
Message-ID: <20080927145739.A8BFF70117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31070

Modified Files:
	kde-l10n.spec 
Log Message:
fix source #'s



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kde-l10n.spec	27 Sep 2008 12:35:29 -0000	1.46
+++ kde-l10n.spec	27 Sep 2008 14:57:09 -0000	1.47
@@ -33,35 +33,35 @@
 Source21: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ja-%{version}.tar.bz2
 Source22: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-km-%{version}.tar.bz2
 Source23: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ko-%{version}.tar.bz2
-Source23: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ku-%{version}.tar.bz2
-Source24: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lv-%{version}.tar.bz2
-Source25: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lt-%{version}.tar.bz2
-Source26: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-mk-%{version}.tar.bz2
-Source27: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ml-%{version}.tar.bz2
-Source28: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nb-%{version}.tar.bz2
-Source29: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nds-%{version}.tar.bz2
-#Source30: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ne-%{version}.tar.bz2
-Source31: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nl-%{version}.tar.bz2
-Source32: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nn-%{version}.tar.bz2
-Source33: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pa-%{version}.tar.bz2
-Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pl-%{version}.tar.bz2
-Source35: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt-%{version}.tar.bz2
-Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt_BR-%{version}.tar.bz2
-Source37: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ru-%{version}.tar.bz2
-#Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-se-%{version}.tar.bz2
-#Source39: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sk-%{version}.tar.bz2
-Source40: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sl-%{version}.tar.bz2
-Source41: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sv-%{version}.tar.bz2
-Source42: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ta-%{version}.tar.bz2
-Source43: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-th-%{version}.tar.bz2
-Source44: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-tr-%{version}.tar.bz2
-Source45: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-uk-%{version}.tar.bz2
-Source46: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-wa-%{version}.tar.bz2
-Source47: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2
-Source48: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2
-Source49: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sr-%{version}.tar.bz2
-Source50: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2
-Source51: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kk-%{version}.tar.bz2
+Source24: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ku-%{version}.tar.bz2
+Source25: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lv-%{version}.tar.bz2
+Source26: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lt-%{version}.tar.bz2
+Source27: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-mk-%{version}.tar.bz2
+Source28: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ml-%{version}.tar.bz2
+Source29: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nb-%{version}.tar.bz2
+Source30: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nds-%{version}.tar.bz2
+#Source31: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ne-%{version}.tar.bz2
+Source32: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nl-%{version}.tar.bz2
+Source33: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nn-%{version}.tar.bz2
+Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pa-%{version}.tar.bz2
+Source35: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pl-%{version}.tar.bz2
+Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt-%{version}.tar.bz2
+Source37: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt_BR-%{version}.tar.bz2
+Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ru-%{version}.tar.bz2
+#Source39: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-se-%{version}.tar.bz2
+#Source40: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sk-%{version}.tar.bz2
+Source41: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sl-%{version}.tar.bz2
+Source42: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sv-%{version}.tar.bz2
+Source43: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ta-%{version}.tar.bz2
+Source44: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-th-%{version}.tar.bz2
+Source45: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-tr-%{version}.tar.bz2
+Source46: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-uk-%{version}.tar.bz2
+Source47: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-wa-%{version}.tar.bz2
+Source48: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2
+Source49: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2
+Source50: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sr-%{version}.tar.bz2
+Source51: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2
+Source52: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kk-%{version}.tar.bz2
 
 Source1000: subdirs-kde-l10n
 



From lucilanga at fedoraproject.org  Sat Sep 27 15:49:07 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sat, 27 Sep 2008 15:49:07 +0000 (UTC)
Subject: rpms/evolution-rss/devel evolution-rss.spec, 1.18, 1.19 sources, 1.5,
	1.6
Message-ID: <20080927154907.BE87F70117@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1582

Modified Files:
	evolution-rss.spec sources 
Log Message:
* Sat Sep 27 2008 Lucian Langa <cooly at gnome.eu.org> - 0.1.1-3
- new upstream snapshot for 0.1.1


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/devel/evolution-rss.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- evolution-rss.spec	23 Aug 2008 07:37:19 -0000	1.18
+++ evolution-rss.spec	27 Sep 2008 15:48:37 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Evolution RSS Reader
 Name: evolution-rss
 Version: 0.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Internet
 License: GPLv2 and GPLv2+
 Source: http://gnome.eu.org/%{name}-%{version}.tar.gz
@@ -86,8 +86,11 @@
 %doc TODO
 
 %changelog
+* Sat Sep 27 2008 Lucian Langa <cooly at gnome.eu.org> - 0.1.1-3
+- new upstream snapshot for 0.1.1
+
 * Sat Aug 23 2008 Lucian Langa <cooly at gnome.eu.org> - 0.1.1-2
-fix for #458818
+- fix for #458818
 
 * Thu Jul 29 2008 Lucian Langa <cooly at gnome.eu.org> - 0.1.1-1
 - remove patches for RH #452322 (fixed upstream)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Jul 2008 18:19:50 -0000	1.5
+++ sources	27 Sep 2008 15:48:37 -0000	1.6
@@ -1 +1 @@
-fb724a60a10fc8def7968d16b48ada16  evolution-rss-0.1.1.tar.gz
+94e3ce3a44f8ae4249df974a8d2a3ed3  evolution-rss-0.1.1.tar.gz



From sheltren at fedoraproject.org  Sat Sep 27 16:02:01 2008
From: sheltren at fedoraproject.org (Jeff Sheltren)
Date: Sat, 27 Sep 2008 16:02:01 +0000 (UTC)
Subject: rpms/cfengine/devel cfengine-2.2.8-db47.patch, NONE,
	1.1 cfengine.spec, 1.36, 1.37
Message-ID: <20080927160201.804DB70117@cvs1.fedora.phx.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/cfengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2382

Modified Files:
	cfengine.spec 
Added Files:
	cfengine-2.2.8-db47.patch 
Log Message:
Add patch to detect db 4.7


cfengine-2.2.8-db47.patch:

--- NEW FILE cfengine-2.2.8-db47.patch ---
--- cfengine-2.2.8/configure.db47	2008-09-27 15:25:37.000000000 +0000
+++ cfengine-2.2.8/configure	2008-09-27 15:25:43.000000000 +0000
@@ -24093,7 +24093,7 @@
    { (exit 1); exit 1; }; }
 else
     if test "x$BERKELEY_DB_DIR" = "xdefault" ; then
-        for v in BerkeleyDB.4.2 BerkeleyDB.4.3 BerkeleyDB.4.4 BerkeleyDB.4.5 BerkeleyDB.4.6; do
+        for v in BerkeleyDB.4.2 BerkeleyDB.4.3 BerkeleyDB.4.4 BerkeleyDB.4.5 BerkeleyDB.4.6 BerkelyDB.4.7; do
             for d in $prefix /opt /usr/local /usr; do
                 test -d "$d/$v" && BERKELEY_DB_DIR="$d/$v"
             done
@@ -24146,7 +24146,7 @@
   return 0;
 }
 _ACEOF
-for ac_lib in '' db-4 db4 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0; do
+for ac_lib in '' db-4 db4 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -24254,7 +24254,7 @@
     elif test -d "$BERKELEY_DB_DIR"; then
 
         BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include"
-        for v in . db46 db45 db44 db43 db42 db41 db40 db4 db33 db32 db3 db; do
+        for v in . db47 db46 db45 db44 db43 db42 db41 db40 db4 db33 db32 db3 db; do
             if test -f "$BERKELEY_DB_DIR/include/$v/db.h"; then
                 BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include/$v"
 		break
@@ -24262,7 +24262,7 @@
         done
 
         BERKELEY_DB_LIB="-ldb"
-        for v in db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44; do
+        for v in db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44; do
             if test -f "$BERKELEY_DB_DIR/lib/lib$v.so"; then
                 BERKELEY_DB_LIB="-l$v"
 		break


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- cfengine.spec	8 Aug 2008 17:48:48 -0000	1.36
+++ cfengine.spec	27 Sep 2008 16:01:31 -0000	1.37
@@ -1,13 +1,14 @@
 Summary: A systems administration tool for networks
 Name: cfengine
 Version: 2.2.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.2.8.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
+Patch0: cfengine-2.2.8-db47.patch
 URL: http://www.cfengine.org/
 BuildRequires: db4-devel,openssl-devel,bison,flex,m4,libacl-devel
 BuildRequires: libselinux-devel,tetex-dvips,texinfo-tex
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .db47
 
 
 %build
@@ -128,6 +130,9 @@
 
 
 %changelog
+* Sat Sep 27 2008 Jeff Sheltren <jeff at osuosl.org> 2.2.8-2
+- Patch configure to detect db-4.7 (#461942)
+
 * Fri Aug  8 2008 Jeff Sheltren <jeff at osuosl.org> 2.2.8-1
 - Update to upstream 2.2.8
 - Release now includes full documentation again



From pkgdb at fedoraproject.org  Sat Sep 27 16:10:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:10:51 +0000
Subject: [pkgdb] amarok: maurys has requested watchbugzilla
Message-ID: <20080927161052.5298D208D73@bastion.fedora.phx.redhat.com>

maurys has requested the watchbugzilla acl on amarok (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From pkgdb at fedoraproject.org  Sat Sep 27 16:10:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:10:56 +0000
Subject: [pkgdb] amarok: maurys has given up watchbugzilla
Message-ID: <20080927161056.97EA0208D9F@bastion.fedora.phx.redhat.com>

maurys has given up the watchbugzilla acl on amarok (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From pkgdb at fedoraproject.org  Sat Sep 27 16:11:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:11:02 +0000
Subject: [pkgdb] amarok: maurys has given up watchbugzilla
Message-ID: <20080927161103.049F3208DAA@bastion.fedora.phx.redhat.com>

maurys has given up the watchbugzilla acl on amarok (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From pkgdb at fedoraproject.org  Sat Sep 27 16:10:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:10:58 +0000
Subject: [pkgdb] amarok: maurys has requested watchbugzilla
Message-ID: <20080927161058.CED46208DA7@bastion.fedora.phx.redhat.com>

maurys has requested the watchbugzilla acl on amarok (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From pkgdb at fedoraproject.org  Sat Sep 27 16:11:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:11:05 +0000
Subject: [pkgdb] amarok: maurys has requested watchbugzilla
Message-ID: <20080927161105.DADAE208DAB@bastion.fedora.phx.redhat.com>

maurys has requested the watchbugzilla acl on amarok (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From pkgdb at fedoraproject.org  Sat Sep 27 16:11:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:11:07 +0000
Subject: [pkgdb] amarok: maurys has given up watchbugzilla
Message-ID: <20080927161107.A83E3208DB0@bastion.fedora.phx.redhat.com>

maurys has given up the watchbugzilla acl on amarok (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From pkgdb at fedoraproject.org  Sat Sep 27 16:27:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:27:53 +0000
Subject: [pkgdb] jabberd: bernie has requested watchcommits
Message-ID: <20080927162753.7B7F2208D6E@bastion.fedora.phx.redhat.com>

bernie has requested the watchcommits acl on jabberd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabberd



From pkgdb at fedoraproject.org  Sat Sep 27 16:27:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:27:54 +0000
Subject: [pkgdb] jabberd: bernie has requested watchbugzilla
Message-ID: <20080927162754.2B732208DA0@bastion.fedora.phx.redhat.com>

bernie has requested the watchbugzilla acl on jabberd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabberd



From pkgdb at fedoraproject.org  Sat Sep 27 16:27:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:27:54 +0000
Subject: [pkgdb] jabberd: bernie has requested commit
Message-ID: <20080927162754.A6D7F208DA5@bastion.fedora.phx.redhat.com>

bernie has requested the commit acl on jabberd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabberd



From pkgdb at fedoraproject.org  Sat Sep 27 16:27:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:27:57 +0000
Subject: [pkgdb] jabberd: bernie has requested approveacls
Message-ID: <20080927162757.8175A208DA9@bastion.fedora.phx.redhat.com>

bernie has requested the approveacls acl on jabberd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabberd



From pkgdb at fedoraproject.org  Sat Sep 27 16:28:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:28:07 +0000
Subject: [pkgdb] jabberd: bernie has requested watchbugzilla
Message-ID: <20080927162808.0785A208D6E@bastion.fedora.phx.redhat.com>

bernie has requested the watchbugzilla acl on jabberd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabberd



From pkgdb at fedoraproject.org  Sat Sep 27 16:28:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:28:09 +0000
Subject: [pkgdb] jabberd: bernie has requested watchcommits
Message-ID: <20080927162809.864D6208DAD@bastion.fedora.phx.redhat.com>

bernie has requested the watchcommits acl on jabberd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabberd



From pkgdb at fedoraproject.org  Sat Sep 27 16:28:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:28:11 +0000
Subject: [pkgdb] jabberd: bernie has requested commit
Message-ID: <20080927162811.577B0208DB2@bastion.fedora.phx.redhat.com>

bernie has requested the commit acl on jabberd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabberd



From pkgdb at fedoraproject.org  Sat Sep 27 16:28:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:28:12 +0000
Subject: [pkgdb] jabberd: bernie has requested approveacls
Message-ID: <20080927162813.019EF208DB4@bastion.fedora.phx.redhat.com>

bernie has requested the approveacls acl on jabberd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabberd



From pkgdb at fedoraproject.org  Sat Sep 27 16:37:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:37:34 +0000
Subject: [pkgdb] jabberd had acl change status
Message-ID: <20080927163734.E81BC208D73@bastion.fedora.phx.redhat.com>

adrian has set the watchbugzilla acl on jabberd (Fedora devel) to Approved for bernie

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabberd



From pkgdb at fedoraproject.org  Sat Sep 27 16:37:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:37:39 +0000
Subject: [pkgdb] jabberd had acl change status
Message-ID: <20080927163739.D34EF208DA2@bastion.fedora.phx.redhat.com>

adrian has set the watchcommits acl on jabberd (Fedora devel) to Approved for bernie

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabberd



From pkgdb at fedoraproject.org  Sat Sep 27 16:37:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:37:40 +0000
Subject: [pkgdb] jabberd had acl change status
Message-ID: <20080927163740.7245F208DA7@bastion.fedora.phx.redhat.com>

adrian has set the commit acl on jabberd (Fedora devel) to Approved for bernie

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabberd



From pkgdb at fedoraproject.org  Sat Sep 27 16:37:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:37:41 +0000
Subject: [pkgdb] jabberd had acl change status
Message-ID: <20080927163741.741E1208DAA@bastion.fedora.phx.redhat.com>

adrian has set the approveacls acl on jabberd (Fedora devel) to Approved for bernie

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabberd



From pkgdb at fedoraproject.org  Sat Sep 27 16:37:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:37:47 +0000
Subject: [pkgdb] jabberd had acl change status
Message-ID: <20080927163747.51610208DAC@bastion.fedora.phx.redhat.com>

adrian has set the watchbugzilla acl on jabberd (Fedora 9) to Approved for bernie

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabberd



From pkgdb at fedoraproject.org  Sat Sep 27 16:37:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:37:48 +0000
Subject: [pkgdb] jabberd had acl change status
Message-ID: <20080927163748.A5701208DAF@bastion.fedora.phx.redhat.com>

adrian has set the watchcommits acl on jabberd (Fedora 9) to Approved for bernie

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabberd



From pkgdb at fedoraproject.org  Sat Sep 27 16:37:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:37:52 +0000
Subject: [pkgdb] jabberd had acl change status
Message-ID: <20080927163752.638BF208D9F@bastion.fedora.phx.redhat.com>

adrian has set the commit acl on jabberd (Fedora 9) to Approved for bernie

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabberd



From pkgdb at fedoraproject.org  Sat Sep 27 16:37:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 16:37:53 +0000
Subject: [pkgdb] jabberd had acl change status
Message-ID: <20080927163753.AFDBC208DB2@bastion.fedora.phx.redhat.com>

adrian has set the approveacls acl on jabberd (Fedora 9) to Approved for bernie

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jabberd



From rdieter at fedoraproject.org  Sat Sep 27 16:55:41 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 27 Sep 2008 16:55:41 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.47,1.48
Message-ID: <20080927165541.0DE4770117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5527

Modified Files:
	kde-l10n.spec 
Log Message:
add ml locale to %files



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kde-l10n.spec	27 Sep 2008 14:57:09 -0000	1.47
+++ kde-l10n.spec	27 Sep 2008 16:55:10 -0000	1.48
@@ -1110,6 +1110,10 @@
 %defattr(-,root,root)
 %lang(mk) %{_datadir}/locale/mk/*
 
+%files Malayalam
+%defattr(-,root,root)
+%lang(ml) %{_datadir}/locale/ml/*
+
 %if %{buildall}
 %files Maltese
 %defattr(-,root,root)



From denis at fedoraproject.org  Sat Sep 27 17:22:27 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Sat, 27 Sep 2008 17:22:27 +0000 (UTC)
Subject: rpms/galeon/devel galeon-2.0.7-confignspr.patch, NONE,
	1.1 galeon-2.0.7-plugins.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 galeon.spec, 1.51, 1.52 sources, 1.13,
	1.14 galeon-2.0.5-xulrunner.patch, 1.2,
	NONE galeon-2.0.6-plugins.patch, 1.1, NONE
Message-ID: <20080927172227.4538370117@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7383

Modified Files:
	.cvsignore galeon.spec sources 
Added Files:
	galeon-2.0.7-confignspr.patch galeon-2.0.7-plugins.patch 
Removed Files:
	galeon-2.0.5-xulrunner.patch galeon-2.0.6-plugins.patch 
Log Message:
- Update to 2.0.7
- Reworked plugins patch, added nspr test config patch
- Other patches upstreamed


galeon-2.0.7-confignspr.patch:

--- NEW FILE galeon-2.0.7-confignspr.patch ---
--- galeon-2.0.7/configure~	2008-09-27 05:16:12.000000000 +0200
+++ galeon-2.0.7/configure	2008-09-27 14:48:41.000000000 +0200
@@ -23802,7 +23802,7 @@
 for i in $TEST_MOZILLA_INCLUDE_DIRS ; do
    CXXFLAGS="$CXXFLAGS -I$MOZILLA_INCLUDE_ROOT/$i"
 done
-CXXFLAGS="$CXXFLAGS -DMOZILLA_STRICT_API=1"
+CXXFLAGS="$CXXFLAGS -DMOZILLA_STRICT_API=1 `pkg-config --cflags nspr`"
 
 
 { echo "$as_me:$LINENO: checking whether we have a mozilla debug build" >&5

galeon-2.0.7-plugins.patch:

--- NEW FILE galeon-2.0.7-plugins.patch ---
--- galeon-2.0.7/mozilla/Makefile.in.orig	2008-09-27 15:08:28.000000000 +0200
+++ galeon-2.0.7/mozilla/Makefile.in	2008-09-27 15:08:43.000000000 +0200
@@ -401,7 +401,7 @@
 	-I$(MOZILLA_INCLUDE_ROOT)/xpcom \
 	-I$(MOZILLA_INCLUDE_ROOT)/xpconnect \
 	-I$(MOZILLA_INCLUDE_ROOT)/xulapp $(GCONF_CFLAGS) \
-	$(GALEON_DEPENDENCY_CFLAGS) -DLIB_DIR=\"$(pkglibdir)\" \
+	$(GALEON_DEPENDENCY_CFLAGS) -DTOP_LIB_DIR=\"$(libdir)\" -DLIB_DIR=\"$(pkglibdir)\" \
 	-DSHARE_DIR=\"$(pkgdatadir)\" -D_GNU_SOURCE=1 -include \
 	mozilla-config.h $(am__append_1)
 noinst_LTLIBRARIES = libmozillaembed.la
--- galeon-2.0.7/mozilla/mozilla-embed-shell.cpp.orig	2008-09-03 06:58:17.000000000 +0200
+++ galeon-2.0.7/mozilla/mozilla-embed-shell.cpp	2008-09-27 15:11:01.000000000 +0200
@@ -230,6 +230,19 @@
 #endif
 }
 
+static int
+mozilla_setup_wrapped_plugin (void)
+{
+	char 	*p_viewer = "/usr/bin/mozilla-plugin-config";
+	gboolean  ret;
+
+	if(g_file_test(p_viewer, G_FILE_TEST_EXISTS) == FALSE)
+		return(FALSE);
+
+	ret = g_spawn_command_line_sync(p_viewer,NULL,NULL,NULL,NULL);
+	return(ret); 
+}
+
 static void
 mozilla_init_plugin_path ()
 {
@@ -248,7 +261,12 @@
 	g_string_append (new_path, "/.mozilla/plugins");
 
 	/* Add /usr/lib/mozilla/plugins (bug 149812) */
-	g_string_append (new_path, ":/usr/lib/mozilla/plugins");
+	if(mozilla_setup_wrapped_plugin()) {
+		g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins-wrapped");
+	}
+	else {
+		g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins");
+	}
 
 #ifdef GALEON_MOZILLA_HOME
 	/* Add the current mozilla build's plugins dir */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	10 Jul 2008 21:13:57 -0000	1.12
+++ .cvsignore	27 Sep 2008 17:21:56 -0000	1.13
@@ -1 +1 @@
-galeon-2.0.6.tar.bz2
+galeon-2.0.7.tar.bz2


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- galeon.spec	10 Jul 2008 21:13:57 -0000	1.51
+++ galeon.spec	27 Sep 2008 17:21:56 -0000	1.52
@@ -2,20 +2,21 @@
 
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
-Version:	2.0.6
+Version:	2.0.7
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
-Patch0:		galeon-2.0.6-plugins.patch
-Patch2:		galeon-2.0.5-xulrunner.patch
+Patch0:		galeon-2.0.7-plugins.patch
+Patch1:		galeon-2.0.7-confignspr.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
 BuildRequires:	gtk2-devel >= 2.4.0
 BuildRequires:	gnome-desktop-devel
 BuildRequires:	gecko-devel >= %{gecko_ver}
+BuildRequires:	gecko-devel-unstable >= %{gecko_ver}
 BuildRequires:	libgnomeui-devel >= 2.5.2
 BuildRequires:  perl(XML::Parser) scrollkeeper
 BuildRequires:  intltool
@@ -41,7 +42,7 @@
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
 %patch0 -p1 -b .plugins
-%patch2 -p1 -b .xulrunner
+%patch1 -p1 -b .confignspr
 
 
 %build
@@ -116,6 +117,11 @@
 
 
 %changelog
+* Sat Sep 27 2008 Denis Leroy <denis at poolshark.org> - 2.0.7-1
+- Update to 2.0.7
+- Reworked plugins patch, added nspr test config patch
+- Other patches upstreamed
+
 * Thu Jul 10 2008 Denis Leroy <denis at poolshark.org> - 2.0.6-1
 - Update to upstraem 2.0.6
 - Reworked configure patch for libxul-embedding


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	10 Jul 2008 21:13:57 -0000	1.13
+++ sources	27 Sep 2008 17:21:56 -0000	1.14
@@ -1 +1 @@
-7723816d29edac94945e5fd9a2a402f8  galeon-2.0.6.tar.bz2
+2eede1f43e3f6f2ac4ce7d4db99b15b2  galeon-2.0.7.tar.bz2


--- galeon-2.0.5-xulrunner.patch DELETED ---


--- galeon-2.0.6-plugins.patch DELETED ---



From peter at fedoraproject.org  Sat Sep 27 21:01:44 2008
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat, 27 Sep 2008 21:01:44 +0000 (UTC)
Subject: rpms/flashrom/devel .cvsignore, 1.9, 1.10 flashrom.spec, 1.11,
	1.12 import.log, 1.1, 1.2 sources, 1.9, 1.10
Message-ID: <20080927210144.AE79C70117@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/extras/rpms/flashrom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27035/devel

Modified Files:
	.cvsignore flashrom.spec import.log sources 
Log Message:
svn ver. 3602


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flashrom/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Jul 2008 17:38:19 -0000	1.9
+++ .cvsignore	27 Sep 2008 21:01:14 -0000	1.10
@@ -1 +1 @@
-flashrom-3418.tar.bz2
+flashrom-3602.tar.bz2


Index: flashrom.spec
===================================================================
RCS file: /cvs/extras/rpms/flashrom/devel/flashrom.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- flashrom.spec	7 Jul 2008 17:38:19 -0000	1.11
+++ flashrom.spec	27 Sep 2008 21:01:14 -0000	1.12
@@ -1,12 +1,13 @@
+%define svnver 3602
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
 Version:	0
-Release:	0.11.20080607svn3418%{?dist}
+Release:	0.12.20080928svn%{svnver}%{?dist}
 License:	GPLv2+
 Group:		Applications/System
-# svn -r 3418 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom
-# tar -cjvf flashrom-3418.tar.bz2 flashrom
-Source0:	flashrom-3418.tar.bz2
+# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom
+# tar -cjvf flashrom-%{svnver}.tar.bz2 flashrom
+Source0:	flashrom-%{svnver}.tar.bz2
 Patch0:		flashrom--Makefile_cleanup.diff
 URL:		http://linuxbios.org/Flashrom
 BuildRequires:	pciutils-devel
@@ -26,7 +27,7 @@
 
 %build
 # currently disabling DiscOnChip due to instability
-CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"3418\"'" %{__make} %{?_smp_mflags}
+CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"%{svnver}\"'" %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -44,6 +45,12 @@
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Sun Sep 28 2008 Peter Lemenkov <lemenkov at gmail.com> 0-0.12.20080928svn3602
+- Proper support for EN29F002(A)(N)[BT]
+- Recognize the Intel EP80579 LPC flash interface
+- Add support for MSI KT4V
+- Support for Winbond W39V040C and MSI K8T Neo2-F
+
 * Sun Jul  6 2008 Peter Lemenkov <lemenkov at gmail.com> 0-0.11.20080607svn3418
 - AMIC A29002
 - flashing system with Nvidia MCP67


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/flashrom/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Jul 2008 17:38:19 -0000	1.1
+++ import.log	27 Sep 2008 21:01:14 -0000	1.2
@@ -1 +1,2 @@
 flashrom-0-0_11_20080607svn3418_fc8:HEAD:flashrom-0-0.11.20080607svn3418.fc8.src.rpm:1215452254
+flashrom-0-0_12_20080928svn3602_fc9:HEAD:flashrom-0-0.12.20080928svn3602.fc9.src.rpm:1222549235


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flashrom/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Jul 2008 17:38:19 -0000	1.9
+++ sources	27 Sep 2008 21:01:14 -0000	1.10
@@ -1 +1 @@
-9e5ab291f764f2c54748f5e1bde48dc1  flashrom-3418.tar.bz2
+a29f702042ac8780742d924c5eca153c  flashrom-3602.tar.bz2



From peter at fedoraproject.org  Sat Sep 27 21:09:00 2008
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat, 27 Sep 2008 21:09:00 +0000 (UTC)
Subject: rpms/flashrom/F-9 .cvsignore, 1.9, 1.10 flashrom.spec, 1.10,
	1.11 import.log, 1.1, 1.2 sources, 1.9, 1.10
Message-ID: <20080927210900.1B64370117@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/extras/rpms/flashrom/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28048/F-9

Modified Files:
	.cvsignore flashrom.spec import.log sources 
Log Message:
svn ver. 3602


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Jul 2008 17:40:21 -0000	1.9
+++ .cvsignore	27 Sep 2008 21:08:29 -0000	1.10
@@ -1 +1 @@
-flashrom-3418.tar.bz2
+flashrom-3602.tar.bz2


Index: flashrom.spec
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-9/flashrom.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- flashrom.spec	7 Jul 2008 17:40:21 -0000	1.10
+++ flashrom.spec	27 Sep 2008 21:08:29 -0000	1.11
@@ -1,12 +1,13 @@
+%define svnver 3602
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
 Version:	0
-Release:	0.11.20080607svn3418%{?dist}
+Release:	0.12.20080928svn%{svnver}%{?dist}
 License:	GPLv2+
 Group:		Applications/System
-# svn -r 3418 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom
-# tar -cjvf flashrom-3418.tar.bz2 flashrom
-Source0:	flashrom-3418.tar.bz2
+# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom
+# tar -cjvf flashrom-%{svnver}.tar.bz2 flashrom
+Source0:	flashrom-%{svnver}.tar.bz2
 Patch0:		flashrom--Makefile_cleanup.diff
 URL:		http://linuxbios.org/Flashrom
 BuildRequires:	pciutils-devel
@@ -26,7 +27,7 @@
 
 %build
 # currently disabling DiscOnChip due to instability
-CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"3418\"'" %{__make} %{?_smp_mflags}
+CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"%{svnver}\"'" %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -44,6 +45,12 @@
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Sun Sep 28 2008 Peter Lemenkov <lemenkov at gmail.com> 0-0.12.20080928svn3602
+- Proper support for EN29F002(A)(N)[BT]
+- Recognize the Intel EP80579 LPC flash interface
+- Add support for MSI KT4V
+- Support for Winbond W39V040C and MSI K8T Neo2-F
+
 * Sun Jul  6 2008 Peter Lemenkov <lemenkov at gmail.com> 0-0.11.20080607svn3418
 - AMIC A29002
 - flashing system with Nvidia MCP67


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Jul 2008 17:40:21 -0000	1.1
+++ import.log	27 Sep 2008 21:08:29 -0000	1.2
@@ -1 +1,2 @@
 flashrom-0-0_11_20080607svn3418_fc8:F-9:flashrom-0-0.11.20080607svn3418.fc8.src.rpm:1215452397
+flashrom-0-0_12_20080928svn3602_fc9:F-9:flashrom-0-0.12.20080928svn3602.fc9.src.rpm:1222549672


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Jul 2008 17:40:21 -0000	1.9
+++ sources	27 Sep 2008 21:08:29 -0000	1.10
@@ -1 +1 @@
-9e5ab291f764f2c54748f5e1bde48dc1  flashrom-3418.tar.bz2
+a29f702042ac8780742d924c5eca153c  flashrom-3602.tar.bz2



From peter at fedoraproject.org  Sat Sep 27 21:10:46 2008
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat, 27 Sep 2008 21:10:46 +0000 (UTC)
Subject: rpms/flashrom/F-8 .cvsignore, 1.9, 1.10 flashrom.spec, 1.10,
	1.11 import.log, 1.1, 1.2 sources, 1.9, 1.10
Message-ID: <20080927211046.3A80E70117@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/extras/rpms/flashrom/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28337/F-8

Modified Files:
	.cvsignore flashrom.spec import.log sources 
Log Message:
svn ver. 3602


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Jul 2008 17:42:08 -0000	1.9
+++ .cvsignore	27 Sep 2008 21:10:15 -0000	1.10
@@ -1 +1 @@
-flashrom-3418.tar.bz2
+flashrom-3602.tar.bz2


Index: flashrom.spec
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-8/flashrom.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- flashrom.spec	7 Jul 2008 17:42:08 -0000	1.10
+++ flashrom.spec	27 Sep 2008 21:10:15 -0000	1.11
@@ -1,12 +1,13 @@
+%define svnver 3602
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
 Version:	0
-Release:	0.11.20080607svn3418%{?dist}
+Release:	0.12.20080928svn%{svnver}%{?dist}
 License:	GPLv2+
 Group:		Applications/System
-# svn -r 3418 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom
-# tar -cjvf flashrom-3418.tar.bz2 flashrom
-Source0:	flashrom-3418.tar.bz2
+# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom
+# tar -cjvf flashrom-%{svnver}.tar.bz2 flashrom
+Source0:	flashrom-%{svnver}.tar.bz2
 Patch0:		flashrom--Makefile_cleanup.diff
 URL:		http://linuxbios.org/Flashrom
 BuildRequires:	pciutils-devel
@@ -26,7 +27,7 @@
 
 %build
 # currently disabling DiscOnChip due to instability
-CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"3418\"'" %{__make} %{?_smp_mflags}
+CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"%{svnver}\"'" %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -44,6 +45,12 @@
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Sun Sep 28 2008 Peter Lemenkov <lemenkov at gmail.com> 0-0.12.20080928svn3602
+- Proper support for EN29F002(A)(N)[BT]
+- Recognize the Intel EP80579 LPC flash interface
+- Add support for MSI KT4V
+- Support for Winbond W39V040C and MSI K8T Neo2-F
+
 * Sun Jul  6 2008 Peter Lemenkov <lemenkov at gmail.com> 0-0.11.20080607svn3418
 - AMIC A29002
 - flashing system with Nvidia MCP67


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-8/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Jul 2008 17:42:08 -0000	1.1
+++ import.log	27 Sep 2008 21:10:15 -0000	1.2
@@ -1 +1,2 @@
 flashrom-0-0_11_20080607svn3418_fc8:F-8:flashrom-0-0.11.20080607svn3418.fc8.src.rpm:1215452504
+flashrom-0-0_12_20080928svn3602_fc9:F-8:flashrom-0-0.12.20080928svn3602.fc9.src.rpm:1222549791


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Jul 2008 17:42:08 -0000	1.9
+++ sources	27 Sep 2008 21:10:15 -0000	1.10
@@ -1 +1 @@
-9e5ab291f764f2c54748f5e1bde48dc1  flashrom-3418.tar.bz2
+a29f702042ac8780742d924c5eca153c  flashrom-3602.tar.bz2



From peter at fedoraproject.org  Sat Sep 27 21:14:40 2008
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat, 27 Sep 2008 21:14:40 +0000 (UTC)
Subject: rpms/flashrom/EL-5 .cvsignore, 1.9, 1.10 flashrom.spec, 1.10,
	1.11 import.log, 1.1, 1.2 sources, 1.9, 1.10
Message-ID: <20080927211440.1BBB370117@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/extras/rpms/flashrom/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28825/EL-5

Modified Files:
	.cvsignore flashrom.spec import.log sources 
Log Message:
svn ver. 3602


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flashrom/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Jul 2008 17:46:03 -0000	1.9
+++ .cvsignore	27 Sep 2008 21:14:09 -0000	1.10
@@ -1 +1 @@
-flashrom-3418.tar.bz2
+flashrom-3602.tar.bz2


Index: flashrom.spec
===================================================================
RCS file: /cvs/extras/rpms/flashrom/EL-5/flashrom.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- flashrom.spec	7 Jul 2008 17:46:03 -0000	1.10
+++ flashrom.spec	27 Sep 2008 21:14:09 -0000	1.11
@@ -1,12 +1,13 @@
+%define svnver 3602
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
 Version:	0
-Release:	0.11.20080607svn3418%{?dist}
+Release:	0.12.20080928svn%{svnver}%{?dist}
 License:	GPLv2+
 Group:		Applications/System
-# svn -r 3418 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom
-# tar -cjvf flashrom-3418.tar.bz2 flashrom
-Source0:	flashrom-3418.tar.bz2
+# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom
+# tar -cjvf flashrom-%{svnver}.tar.bz2 flashrom
+Source0:	flashrom-%{svnver}.tar.bz2
 Patch0:		flashrom--Makefile_cleanup.diff
 URL:		http://linuxbios.org/Flashrom
 BuildRequires:	pciutils-devel
@@ -26,7 +27,7 @@
 
 %build
 # currently disabling DiscOnChip due to instability
-CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"3418\"'" %{__make} %{?_smp_mflags}
+CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"%{svnver}\"'" %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -44,6 +45,12 @@
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Sun Sep 28 2008 Peter Lemenkov <lemenkov at gmail.com> 0-0.12.20080928svn3602
+- Proper support for EN29F002(A)(N)[BT]
+- Recognize the Intel EP80579 LPC flash interface
+- Add support for MSI KT4V
+- Support for Winbond W39V040C and MSI K8T Neo2-F
+
 * Sun Jul  6 2008 Peter Lemenkov <lemenkov at gmail.com> 0-0.11.20080607svn3418
 - AMIC A29002
 - flashing system with Nvidia MCP67


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/flashrom/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Jul 2008 17:46:03 -0000	1.1
+++ import.log	27 Sep 2008 21:14:09 -0000	1.2
@@ -1 +1,2 @@
 flashrom-0-0_11_20080607svn3418_fc8:EL-5:flashrom-0-0.11.20080607svn3418.fc8.src.rpm:1215452702
+flashrom-0-0_12_20080928svn3602_fc9:EL-5:flashrom-0-0.12.20080928svn3602.fc9.src.rpm:1222549972


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flashrom/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Jul 2008 17:46:03 -0000	1.9
+++ sources	27 Sep 2008 21:14:09 -0000	1.10
@@ -1 +1 @@
-9e5ab291f764f2c54748f5e1bde48dc1  flashrom-3418.tar.bz2
+a29f702042ac8780742d924c5eca153c  flashrom-3602.tar.bz2



From peter at fedoraproject.org  Sat Sep 27 21:16:50 2008
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat, 27 Sep 2008 21:16:50 +0000 (UTC)
Subject: rpms/flashrom/EL-4 .cvsignore, 1.9, 1.10 flashrom.spec, 1.10,
	1.11 import.log, 1.1, 1.2 sources, 1.9, 1.10
Message-ID: <20080927211650.D143670117@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/extras/rpms/flashrom/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29191/EL-4

Modified Files:
	.cvsignore flashrom.spec import.log sources 
Log Message:
svn ver. 3602


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flashrom/EL-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Jul 2008 17:48:02 -0000	1.9
+++ .cvsignore	27 Sep 2008 21:16:20 -0000	1.10
@@ -1 +1 @@
-flashrom-3418.tar.bz2
+flashrom-3602.tar.bz2


Index: flashrom.spec
===================================================================
RCS file: /cvs/extras/rpms/flashrom/EL-4/flashrom.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- flashrom.spec	7 Jul 2008 17:48:02 -0000	1.10
+++ flashrom.spec	27 Sep 2008 21:16:20 -0000	1.11
@@ -1,12 +1,13 @@
+%define svnver 3602
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
 Version:	0
-Release:	0.11.20080607svn3418%{?dist}
+Release:	0.12.20080928svn%{svnver}%{?dist}
 License:	GPLv2+
 Group:		Applications/System
-# svn -r 3418 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom
-# tar -cjvf flashrom-3418.tar.bz2 flashrom
-Source0:	flashrom-3418.tar.bz2
+# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom
+# tar -cjvf flashrom-%{svnver}.tar.bz2 flashrom
+Source0:	flashrom-%{svnver}.tar.bz2
 Patch0:		flashrom--Makefile_cleanup.diff
 URL:		http://linuxbios.org/Flashrom
 BuildRequires:	pciutils-devel
@@ -26,7 +27,7 @@
 
 %build
 # currently disabling DiscOnChip due to instability
-CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"3418\"'" %{__make} %{?_smp_mflags}
+CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"%{svnver}\"'" %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -44,6 +45,12 @@
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Sun Sep 28 2008 Peter Lemenkov <lemenkov at gmail.com> 0-0.12.20080928svn3602
+- Proper support for EN29F002(A)(N)[BT]
+- Recognize the Intel EP80579 LPC flash interface
+- Add support for MSI KT4V
+- Support for Winbond W39V040C and MSI K8T Neo2-F
+
 * Sun Jul  6 2008 Peter Lemenkov <lemenkov at gmail.com> 0-0.11.20080607svn3418
 - AMIC A29002
 - flashing system with Nvidia MCP67


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/flashrom/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Jul 2008 17:48:02 -0000	1.1
+++ import.log	27 Sep 2008 21:16:20 -0000	1.2
@@ -1 +1,2 @@
 flashrom-0-0_11_20080607svn3418_fc8:EL-4:flashrom-0-0.11.20080607svn3418.fc8.src.rpm:1215452840
+flashrom-0-0_12_20080928svn3602_fc9:EL-4:flashrom-0-0.12.20080928svn3602.fc9.src.rpm:1222550130


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flashrom/EL-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Jul 2008 17:48:02 -0000	1.9
+++ sources	27 Sep 2008 21:16:20 -0000	1.10
@@ -1 +1 @@
-9e5ab291f764f2c54748f5e1bde48dc1  flashrom-3418.tar.bz2
+a29f702042ac8780742d924c5eca153c  flashrom-3602.tar.bz2



From cweyl at fedoraproject.org  Sat Sep 27 21:57:59 2008
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 27 Sep 2008 21:57:59 +0000 (UTC)
Subject: rpms/Zim/devel .cvsignore, 1.7, 1.8 Zim.spec, 1.10, 1.11 sources,
	1.7, 1.8
Message-ID: <20080927215759.1AB3770117@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/Zim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1558

Modified Files:
	.cvsignore Zim.spec sources 
Log Message:
* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.26-1
- update to 0.26



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Zim/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Aug 2008 02:13:19 -0000	1.7
+++ .cvsignore	27 Sep 2008 21:57:28 -0000	1.8
@@ -1 +1 @@
-Zim-0.25.tar.gz
+Zim-0.26.tar.gz


Index: Zim.spec
===================================================================
RCS file: /cvs/extras/rpms/Zim/devel/Zim.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Zim.spec	6 Aug 2008 02:19:28 -0000	1.10
+++ Zim.spec	27 Sep 2008 21:57:28 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           Zim
-Version:        0.25
-Release:        2%{?dist}
+Version:        0.26
+Release:        1%{?dist}
 Summary:        Desktop wiki & notekeeper
 
 Group:          Applications/Editors
 License:        GPL+ or Artistic
-URL:            http://www.pardus.nl/projects/zim/ 
-Source0: http://pardus-larus.student.utwente.nl/~pardus/downloads/Zim/Zim-%{version}.tar.gz 
+URL:            http://zim-wiki.org/ 
+Source0:        http://www.zim-wiki.org/downloads/Zim-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -28,6 +28,8 @@
 # test
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
+# non-perl req for tests
+BuildRequires:  bzr, gettext, man
 
 # not picked up automatically
 Requires:       perl(Gtk2::TrayIcon)
@@ -50,7 +52,7 @@
 %setup -q
 
 find . -type f -exec chmod -c -x {} +
-sed -i 's/\r//' share/zim/plugins/Subversion.pl
+#sed -i 's/\r//' share/zim/plugins/Subversion.pl
 
 # We're not running on Win32.  Really :)
 rm -f ./lib/Zim/OS/Win32.pm
@@ -76,8 +78,9 @@
 
 
 %check
-#rm t/71*.t
-#./Build test
+# _still_ borked *sigh*
+%{?!_with_display_tests: rm t/[78][01]*.t }
+./Build test
 
 
 %clean
@@ -97,6 +100,9 @@
 
 
 %changelog
+* Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.26-1
+- update to 0.26
+
 * Tue Aug 05 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.25-2
 - drop tests entirely for the moment.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Zim/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Aug 2008 02:13:19 -0000	1.7
+++ sources	27 Sep 2008 21:57:28 -0000	1.8
@@ -1 +1 @@
-cdac6dbd0503cd5c771f64f41fcd6e31  Zim-0.25.tar.gz
+4d9f11b752427ea69762b26dc4cf1edf  Zim-0.26.tar.gz



From kwizart at fedoraproject.org  Sat Sep 27 22:14:08 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Sat, 27 Sep 2008 22:14:08 +0000 (UTC)
Subject: rpms/dirac/devel dirac.spec,1.11,1.12
Message-ID: <20080927221409.057AB70117@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/dirac/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3726

Modified Files:
	dirac.spec 
Log Message:
- Update to 1.0.0



Index: dirac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dirac/devel/dirac.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dirac.spec	7 Jul 2008 17:10:58 -0000	1.11
+++ dirac.spec	27 Sep 2008 22:13:38 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           dirac
-Version:        0.10.0
-Release:        2%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        Dirac is an open source video codec 
 
 Group:          System Environment/Libraries
@@ -56,13 +56,6 @@
 find doc unit_tests util libdirac_encoder libdirac_byteio -type f -name \* -exec chmod 644 {} \;
 
 
-# Only update the doxygen file before generated with make
-pushd doc/documentation/code/api/
-%{_bindir}/doxygen -u dirac_api.doxygen
-popd
-
-
-
 %build
 %configure \
   --program-prefix=dirac_ \
@@ -129,6 +122,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 kwizart < kwizart at gmail.com > - 1.0.0-1
+- Update to 1.0.0
+
 * Mon Jul  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.10.0-2
 - fix conditional comparison
 



From pkgdb at fedoraproject.org  Sat Sep 27 22:14:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 22:14:25 +0000
Subject: [pkgdb] weechat had group_acl changed
Message-ID: <20080927221425.7A27C208D6F@bastion.fedora.phx.redhat.com>

stingray has set the commit acl on weechat (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/weechat



From pkgdb at fedoraproject.org  Sat Sep 27 22:14:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 22:14:30 +0000
Subject: [pkgdb] weechat had group_acl changed
Message-ID: <20080927221431.44641208DA2@bastion.fedora.phx.redhat.com>

stingray has set the commit acl on weechat (Fedora 6) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/weechat



From pkgdb at fedoraproject.org  Sat Sep 27 22:14:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 22:14:28 +0000
Subject: [pkgdb] weechat had group_acl changed
Message-ID: <20080927221428.B1AAA208D9F@bastion.fedora.phx.redhat.com>

stingray has set the commit acl on weechat (Fedora 7) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/weechat



From pkgdb at fedoraproject.org  Sat Sep 27 22:14:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 22:14:36 +0000
Subject: [pkgdb] weechat had group_acl changed
Message-ID: <20080927221436.A4D88208DA8@bastion.fedora.phx.redhat.com>

stingray has set the commit acl on weechat (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/weechat



From pkgdb at fedoraproject.org  Sat Sep 27 22:14:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 22:14:34 +0000
Subject: [pkgdb] weechat had group_acl changed
Message-ID: <20080927221434.706E0208DA5@bastion.fedora.phx.redhat.com>

stingray has set the commit acl on weechat (Fedora 8) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/weechat



From kwizart at fedoraproject.org  Sat Sep 27 22:15:34 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Sat, 27 Sep 2008 22:15:34 +0000 (UTC)
Subject: rpms/dirac/devel sources,1.6,1.7 .cvsignore,1.6,1.7
Message-ID: <20080927221534.CD21E70117@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/dirac/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4046

Modified Files:
	sources .cvsignore 
Log Message:
- Update to 1.0.0



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dirac/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Jun 2008 00:31:52 -0000	1.6
+++ sources	27 Sep 2008 22:15:04 -0000	1.7
@@ -1 +1 @@
-82615435ae77cdf0a7e1ab6b4c30cb11  dirac-0.10.0.tar.gz
+017b8d7d54caf9400ef72dcaee34a9d6  dirac-1.0.0.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dirac/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Jun 2008 00:31:52 -0000	1.6
+++ .cvsignore	27 Sep 2008 22:15:04 -0000	1.7
@@ -1 +1 @@
-dirac-0.10.0.tar.gz
+dirac-1.0.0.tar.gz



From tmz at fedoraproject.org  Sat Sep 27 22:18:25 2008
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sat, 27 Sep 2008 22:18:25 +0000 (UTC)
Subject: rpms/tig/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 tig.spec, 1.11,
	1.12
Message-ID: <20080927221825.18FBF70117@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/tig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4604

Modified Files:
	.cvsignore sources tig.spec 
Log Message:
* Sat Sep 27 2008 Todd Zullinger <tmz at pobox.com> 0.12-1
- tig-0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tig/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Apr 2008 20:32:33 -0000	1.8
+++ .cvsignore	27 Sep 2008 22:17:54 -0000	1.9
@@ -1 +1 @@
-tig-0.11.tar.gz
+tig-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tig/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Apr 2008 20:32:33 -0000	1.8
+++ sources	27 Sep 2008 22:17:54 -0000	1.9
@@ -1 +1 @@
-5d136ae97ed27ec8e343624fcc97ee4a  tig-0.11.tar.gz
+78bfec8dc5357e390b6d04d66bf99ee1  tig-0.12.tar.gz


Index: tig.spec
===================================================================
RCS file: /cvs/extras/rpms/tig/devel/tig.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tig.spec	6 Apr 2008 20:32:33 -0000	1.11
+++ tig.spec	27 Sep 2008 22:17:54 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           tig
-Version:        0.11
+Version:        0.12
 Release:        1%{?dist}
 Summary:        Text-mode interface for the git revision control system
 
@@ -50,7 +50,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README SITES BUGS manual.txt *.html
+%doc COPYING NEWS README SITES BUGS manual.txt *.html
 
 %{_bindir}/tig
 
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Sat Sep 27 2008 Todd Zullinger <tmz at pobox.com> 0.12-1
+- tig-0.12
+
 * Sun Apr 06 2008 James Bowes <jbowes at redhat.com> 0.11-1
 - tig-0.11
 



From kwizart at fedoraproject.org  Sat Sep 27 22:32:20 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Sat, 27 Sep 2008 22:32:20 +0000 (UTC)
Subject: rpms/oyranos/devel oyranos.spec,1.2,1.3
Message-ID: <20080927223220.E8FB970117@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/oyranos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6728

Modified Files:
	oyranos.spec 
Log Message:
Fix patch



Index: oyranos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oyranos/devel/oyranos.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- oyranos.spec	7 Mar 2008 19:02:04 -0000	1.2
+++ oyranos.spec	27 Sep 2008 22:31:50 -0000	1.3
@@ -1,6 +1,8 @@
+%define _default_patch_fuzz 2
+
 Name:           oyranos
 Version:        0.1.7
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        The Oyranos Colour Management System (CMS) 
 
 Group:          Applications/Multimedia
@@ -216,6 +218,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 kwizart < kwizart at gmail.com > - 0.1.7-12
+- Fix patch fuzz
+
 * Thu Mar  6 2008 kwizart < kwizart at gmail.com > - 0.1.7-11
 - Make oyranos-config a wrapper for pkgconfig
 



From belegdol at fedoraproject.org  Sat Sep 27 22:40:15 2008
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Sat, 27 Sep 2008 22:40:15 +0000 (UTC)
Subject: rpms/gnome-applet-netspeed/F-9 .cvsignore, 1.4,
	1.5 gnome-applet-netspeed.spec, 1.13, 1.14 sources, 1.4, 1.5
Message-ID: <20080927224015.A604070117@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/gnome-applet-netspeed/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7973

Modified Files:
	.cvsignore gnome-applet-netspeed.spec sources 
Log Message:
* Sun Sep 28 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.15-1
- Updated to 0.15
- Added hicolor-icon-theme to Requires



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-netspeed/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Aug 2007 15:39:51 -0000	1.4
+++ .cvsignore	27 Sep 2008 22:39:45 -0000	1.5
@@ -1 +1 @@
-netspeed_applet-0.14.tar.gz
+netspeed_applet-0.15.tar.gz


Index: gnome-applet-netspeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-netspeed/F-9/gnome-applet-netspeed.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-applet-netspeed.spec	12 Feb 2008 10:23:21 -0000	1.13
+++ gnome-applet-netspeed.spec	27 Sep 2008 22:39:45 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gnome-applet-netspeed    
-Version:        0.14
-Release:        3%{?dist}
+Version:        0.15
+Release:        1%{?dist}
 Summary:        GNOME applet that shows traffic on a network device
 
 Group:          Applications/Internet
@@ -15,6 +15,8 @@
 BuildRequires:  gnome-panel-devel >= 2.8, libnotify-devel
 BuildRequires:  gnome-doc-utils
 
+Requires:       hicolor-icon-theme
+
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -39,9 +41,17 @@
 %find_lang netspeed_applet
 
 %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
 scrollkeeper-update -q -o %{_datadir}/omf/netspeed_applet || : 
 
 %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
 scrollkeeper-update -q || :
 
 %clean
@@ -54,10 +64,26 @@
 %doc %{_datadir}/gnome/help/netspeed_applet/
 %{_libexecdir}/*
 %{_libdir}/bonobo/servers/*
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/16x16/apps/netspeed-applet.png
+%{_datadir}/icons/hicolor/16x16/devices/netspeed-loopback.png
+%{_datadir}/icons/hicolor/16x16/devices/netspeed-plip.png
+%{_datadir}/icons/hicolor/16x16/devices/netspeed-ppp.png
+%{_datadir}/icons/hicolor/22x22/apps/netspeed-applet.png
+%{_datadir}/icons/hicolor/24x24/apps/netspeed-applet.png
+%{_datadir}/icons/hicolor/24x24/status/netspeed-wireless-100.png
+%{_datadir}/icons/hicolor/24x24/status/netspeed-wireless-25.png
+%{_datadir}/icons/hicolor/24x24/status/netspeed-wireless-50.png
+%{_datadir}/icons/hicolor/24x24/status/netspeed-wireless-75.png
+%{_datadir}/icons/hicolor/32x32/apps/netspeed-applet.png
+%{_datadir}/icons/hicolor/48x48/apps/netspeed-applet.png
+%{_datadir}/icons/hicolor/scalable/apps/netspeed-applet.svg
 %{_datadir}/omf/netspeed_applet/
 
 %changelog
+* Sun Sep 28 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.15-1
+- Updated to 0.15
+- Added hicolor-icon-theme to Requires
+
 * Tue Feb 12 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.14-3
 - Rebuilt for gcc-4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-netspeed/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Aug 2007 15:39:52 -0000	1.4
+++ sources	27 Sep 2008 22:39:45 -0000	1.5
@@ -1 +1 @@
-e542f9b4a42f13833b9972520dfe0ac9  netspeed_applet-0.14.tar.gz
+6aacaac946b17b3a95a0b366c6dbe850  netspeed_applet-0.15.tar.gz



From tmz at fedoraproject.org  Sat Sep 27 22:43:19 2008
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sat, 27 Sep 2008 22:43:19 +0000 (UTC)
Subject: rpms/tig/F-9 .cvsignore,1.8,1.9 sources,1.8,1.9 tig.spec,1.11,1.12
Message-ID: <20080927224319.BFA3570117@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/tig/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8416

Modified Files:
	.cvsignore sources tig.spec 
Log Message:
* Sat Sep 27 2008 Todd Zullinger <tmz at pobox.com> 0.12-1
- tig-0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tig/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Apr 2008 20:32:33 -0000	1.8
+++ .cvsignore	27 Sep 2008 22:42:49 -0000	1.9
@@ -1 +1 @@
-tig-0.11.tar.gz
+tig-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tig/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Apr 2008 20:32:33 -0000	1.8
+++ sources	27 Sep 2008 22:42:49 -0000	1.9
@@ -1 +1 @@
-5d136ae97ed27ec8e343624fcc97ee4a  tig-0.11.tar.gz
+78bfec8dc5357e390b6d04d66bf99ee1  tig-0.12.tar.gz


Index: tig.spec
===================================================================
RCS file: /cvs/extras/rpms/tig/F-9/tig.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tig.spec	6 Apr 2008 20:32:33 -0000	1.11
+++ tig.spec	27 Sep 2008 22:42:49 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           tig
-Version:        0.11
+Version:        0.12
 Release:        1%{?dist}
 Summary:        Text-mode interface for the git revision control system
 
@@ -50,7 +50,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README SITES BUGS manual.txt *.html
+%doc COPYING NEWS README SITES BUGS manual.txt *.html
 
 %{_bindir}/tig
 
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Sat Sep 27 2008 Todd Zullinger <tmz at pobox.com> 0.12-1
+- tig-0.12
+
 * Sun Apr 06 2008 James Bowes <jbowes at redhat.com> 0.11-1
 - tig-0.11
 



From belegdol at fedoraproject.org  Sat Sep 27 22:43:52 2008
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Sat, 27 Sep 2008 22:43:52 +0000 (UTC)
Subject: rpms/gnome-applet-netspeed/devel .cvsignore, 1.4,
	1.5 gnome-applet-netspeed.spec, 1.13, 1.14 sources, 1.4, 1.5
Message-ID: <20080927224352.CE69570117@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/gnome-applet-netspeed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8523

Modified Files:
	.cvsignore gnome-applet-netspeed.spec sources 
Log Message:
* Sun Sep 28 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.15-1
- Updated to 0.15
- Added hicolor-icon-theme to Requires



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-netspeed/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Aug 2007 15:39:51 -0000	1.4
+++ .cvsignore	27 Sep 2008 22:43:22 -0000	1.5
@@ -1 +1 @@
-netspeed_applet-0.14.tar.gz
+netspeed_applet-0.15.tar.gz


Index: gnome-applet-netspeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-netspeed/devel/gnome-applet-netspeed.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-applet-netspeed.spec	12 Feb 2008 10:23:21 -0000	1.13
+++ gnome-applet-netspeed.spec	27 Sep 2008 22:43:22 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gnome-applet-netspeed    
-Version:        0.14
-Release:        3%{?dist}
+Version:        0.15
+Release:        1%{?dist}
 Summary:        GNOME applet that shows traffic on a network device
 
 Group:          Applications/Internet
@@ -15,6 +15,8 @@
 BuildRequires:  gnome-panel-devel >= 2.8, libnotify-devel
 BuildRequires:  gnome-doc-utils
 
+Requires:       hicolor-icon-theme
+
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -39,9 +41,17 @@
 %find_lang netspeed_applet
 
 %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
 scrollkeeper-update -q -o %{_datadir}/omf/netspeed_applet || : 
 
 %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
 scrollkeeper-update -q || :
 
 %clean
@@ -54,10 +64,26 @@
 %doc %{_datadir}/gnome/help/netspeed_applet/
 %{_libexecdir}/*
 %{_libdir}/bonobo/servers/*
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/16x16/apps/netspeed-applet.png
+%{_datadir}/icons/hicolor/16x16/devices/netspeed-loopback.png
+%{_datadir}/icons/hicolor/16x16/devices/netspeed-plip.png
+%{_datadir}/icons/hicolor/16x16/devices/netspeed-ppp.png
+%{_datadir}/icons/hicolor/22x22/apps/netspeed-applet.png
+%{_datadir}/icons/hicolor/24x24/apps/netspeed-applet.png
+%{_datadir}/icons/hicolor/24x24/status/netspeed-wireless-100.png
+%{_datadir}/icons/hicolor/24x24/status/netspeed-wireless-25.png
+%{_datadir}/icons/hicolor/24x24/status/netspeed-wireless-50.png
+%{_datadir}/icons/hicolor/24x24/status/netspeed-wireless-75.png
+%{_datadir}/icons/hicolor/32x32/apps/netspeed-applet.png
+%{_datadir}/icons/hicolor/48x48/apps/netspeed-applet.png
+%{_datadir}/icons/hicolor/scalable/apps/netspeed-applet.svg
 %{_datadir}/omf/netspeed_applet/
 
 %changelog
+* Sun Sep 28 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.15-1
+- Updated to 0.15
+- Added hicolor-icon-theme to Requires
+
 * Tue Feb 12 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.14-3
 - Rebuilt for gcc-4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-netspeed/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Aug 2007 15:39:52 -0000	1.4
+++ sources	27 Sep 2008 22:43:22 -0000	1.5
@@ -1 +1 @@
-e542f9b4a42f13833b9972520dfe0ac9  netspeed_applet-0.14.tar.gz
+6aacaac946b17b3a95a0b366c6dbe850  netspeed_applet-0.15.tar.gz



From belegdol at fedoraproject.org  Sat Sep 27 22:44:39 2008
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Sat, 27 Sep 2008 22:44:39 +0000 (UTC)
Subject: rpms/gnome-applet-netspeed/F-8 .cvsignore, 1.4,
	1.5 gnome-applet-netspeed.spec, 1.12, 1.13 sources, 1.4, 1.5
Message-ID: <20080927224439.9BF5870117@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/gnome-applet-netspeed/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8683

Modified Files:
	.cvsignore gnome-applet-netspeed.spec sources 
Log Message:
* Sun Sep 28 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.15-1
- Updated to 0.15
- Added hicolor-icon-theme to Requires



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-netspeed/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Aug 2007 15:39:51 -0000	1.4
+++ .cvsignore	27 Sep 2008 22:44:09 -0000	1.5
@@ -1 +1 @@
-netspeed_applet-0.14.tar.gz
+netspeed_applet-0.15.tar.gz


Index: gnome-applet-netspeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-netspeed/F-8/gnome-applet-netspeed.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-applet-netspeed.spec	26 Aug 2007 07:38:04 -0000	1.12
+++ gnome-applet-netspeed.spec	27 Sep 2008 22:44:09 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gnome-applet-netspeed    
-Version:        0.14
-Release:        2%{?dist}
+Version:        0.15
+Release:        1%{?dist}
 Summary:        GNOME applet that shows traffic on a network device
 
 Group:          Applications/Internet
@@ -15,6 +15,8 @@
 BuildRequires:  gnome-panel-devel >= 2.8, libnotify-devel
 BuildRequires:  gnome-doc-utils
 
+Requires:       hicolor-icon-theme
+
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -39,9 +41,17 @@
 %find_lang netspeed_applet
 
 %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
 scrollkeeper-update -q -o %{_datadir}/omf/netspeed_applet || : 
 
 %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
 scrollkeeper-update -q || :
 
 %clean
@@ -54,10 +64,29 @@
 %doc %{_datadir}/gnome/help/netspeed_applet/
 %{_libexecdir}/*
 %{_libdir}/bonobo/servers/*
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/16x16/apps/netspeed-applet.png
+%{_datadir}/icons/hicolor/16x16/devices/netspeed-loopback.png
+%{_datadir}/icons/hicolor/16x16/devices/netspeed-plip.png
+%{_datadir}/icons/hicolor/16x16/devices/netspeed-ppp.png
+%{_datadir}/icons/hicolor/22x22/apps/netspeed-applet.png
+%{_datadir}/icons/hicolor/24x24/apps/netspeed-applet.png
+%{_datadir}/icons/hicolor/24x24/status/netspeed-wireless-100.png
+%{_datadir}/icons/hicolor/24x24/status/netspeed-wireless-25.png
+%{_datadir}/icons/hicolor/24x24/status/netspeed-wireless-50.png
+%{_datadir}/icons/hicolor/24x24/status/netspeed-wireless-75.png
+%{_datadir}/icons/hicolor/32x32/apps/netspeed-applet.png
+%{_datadir}/icons/hicolor/48x48/apps/netspeed-applet.png
+%{_datadir}/icons/hicolor/scalable/apps/netspeed-applet.svg
 %{_datadir}/omf/netspeed_applet/
 
 %changelog
+* Sun Sep 28 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.15-1
+- Updated to 0.15
+- Added hicolor-icon-theme to Requires
+
+* Tue Feb 12 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.14-3
+- Rebuilt for gcc-4.3
+
 * Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.14-2
 - Adjusted License tag as per latest guidelines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-netspeed/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Aug 2007 15:39:52 -0000	1.4
+++ sources	27 Sep 2008 22:44:09 -0000	1.5
@@ -1 +1 @@
-e542f9b4a42f13833b9972520dfe0ac9  netspeed_applet-0.14.tar.gz
+6aacaac946b17b3a95a0b366c6dbe850  netspeed_applet-0.15.tar.gz



From pkgdb at fedoraproject.org  Sat Sep 27 23:01:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 27 Sep 2008 23:01:36 +0000
Subject: [pkgdb] libgii ownership updated
Message-ID: <20080927230136.3C699208D6F@bastion.fedora.phx.redhat.com>

Package libgii in Fedora devel was orphaned by kwizart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgii



From kkofler at fedoraproject.org  Sun Sep 28 00:52:17 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 28 Sep 2008 00:52:17 +0000 (UTC)
Subject: rpms/soprano/devel .cvsignore, 1.11, 1.12 soprano.spec, 1.21,
	1.22 sources, 1.11, 1.12
Message-ID: <20080928005217.A30277013D@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/soprano/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23825/devel

Modified Files:
	.cvsignore soprano.spec sources 
Log Message:
* Sun Sep 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.1.1-1
- update to 2.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	22 Jul 2008 21:00:55 -0000	1.11
+++ .cvsignore	28 Sep 2008 00:51:47 -0000	1.12
@@ -1 +1 @@
-soprano-2.1.tar.bz2
+soprano-2.1.1.tar.bz2


Index: soprano.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/soprano.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- soprano.spec	22 Jul 2008 21:18:42 -0000	1.21
+++ soprano.spec	28 Sep 2008 00:51:47 -0000	1.22
@@ -6,7 +6,7 @@
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.1
+Version: 2.1.1
 Release: 1%{?dist}
 
 Group:   System Environment/Libraries
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.1.1-1
+- update to 2.1.1
+
 * Tue Jul 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.1-1
 - update to 2.1
 - BR graphviz for apidocs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	22 Jul 2008 21:00:55 -0000	1.11
+++ sources	28 Sep 2008 00:51:47 -0000	1.12
@@ -1 +1 @@
-c89c04931db14eb7f5801eb3d4e5c742  soprano-2.1.tar.bz2
+dc590aa42d832cea5ed13145d359c9f2  soprano-2.1.1.tar.bz2



From kkofler at fedoraproject.org  Sun Sep 28 01:35:04 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 28 Sep 2008 01:35:04 +0000 (UTC)
Subject: rpms/kile/devel .cvsignore, 1.10, 1.11 kile.spec, 1.42, 1.43 sources,
	1.11, 1.12
Message-ID: <20080928013504.7A35270118@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27686/devel

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Sun Sep 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.0.2-1
- update to 2.0.2 (#464320)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kile/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	12 May 2008 14:39:39 -0000	1.10
+++ .cvsignore	28 Sep 2008 01:34:34 -0000	1.11
@@ -1 +1 @@
-kile-2.0.1.tar.bz2
+kile-2.0.2.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kile/devel/kile.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- kile.spec	22 Jun 2008 03:36:36 -0000	1.42
+++ kile.spec	28 Sep 2008 01:34:34 -0000	1.43
@@ -1,8 +1,8 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 2.0.1
-Release: 2%{?dist}
+Version: 2.0.2
+Release: 1%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -136,6 +136,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.0.2-1
+- update to 2.0.2 (#464320)
+
 * Sun Jun 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.0.1-2
 - also change QuickPreview to use xdg-open (#445934 reloaded)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kile/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 May 2008 14:39:39 -0000	1.11
+++ sources	28 Sep 2008 01:34:34 -0000	1.12
@@ -1 +1 @@
-1d18762b6c62fb58123b1a89bdd39fb1  kile-2.0.1.tar.bz2
+0599b546e49029f9e42835494892a04c  kile-2.0.2.tar.bz2



From pkgdb at fedoraproject.org  Sun Sep 28 02:21:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 02:21:32 +0000
Subject: [pkgdb] fusecompress: lmacken has requested commit
Message-ID: <20080928022132.550C7208D74@bastion.fedora.phx.redhat.com>

lmacken has requested the commit acl on fusecompress (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fusecompress



From pkgdb at fedoraproject.org  Sun Sep 28 02:21:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 02:21:36 +0000
Subject: [pkgdb] fusecompress: lmacken has requested watchcommits
Message-ID: <20080928022136.309EE208DA2@bastion.fedora.phx.redhat.com>

lmacken has requested the watchcommits acl on fusecompress (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fusecompress



From pkgdb at fedoraproject.org  Sun Sep 28 02:21:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 02:21:41 +0000
Subject: [pkgdb] fusecompress: lmacken has requested watchbugzilla
Message-ID: <20080928022141.B6E49208DA8@bastion.fedora.phx.redhat.com>

lmacken has requested the watchbugzilla acl on fusecompress (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fusecompress



From pkgdb at fedoraproject.org  Sun Sep 28 02:21:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 02:21:42 +0000
Subject: [pkgdb] fusecompress: lmacken has requested approveacls
Message-ID: <20080928022142.65464208DAB@bastion.fedora.phx.redhat.com>

lmacken has requested the approveacls acl on fusecompress (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fusecompress



From lmacken at fedoraproject.org  Sun Sep 28 02:23:16 2008
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sun, 28 Sep 2008 02:23:16 +0000 (UTC)
Subject: rpms/fusecompress/devel .cvsignore, 1.5, 1.6 fusecompress.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20080928022316.A256A70118@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/fusecompress/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv469

Modified Files:
	.cvsignore fusecompress.spec sources 
Log Message:
* Sat Sep 27 2008 Luke Macken <lmacken at redhat.com> - 1.99.19-1
- Update to 1.99.19
- Remove fusecompress-1.99.17-attr.patch and fusecompress-1.99.17-gcc43.patch, as they are now upstream in this release.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Aug 2008 07:30:10 -0000	1.5
+++ .cvsignore	28 Sep 2008 02:22:46 -0000	1.6
@@ -1 +1 @@
-fusecompress-1.99.18.tar.gz
+fusecompress-1.99.19.tar.gz


Index: fusecompress.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress/devel/fusecompress.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fusecompress.spec	10 Aug 2008 07:30:10 -0000	1.7
+++ fusecompress.spec	28 Sep 2008 02:22:46 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           fusecompress
-Version:        1.99.18
+Version:        1.99.19
 Release:        1%{?dist}
 Summary:        FUSE based compressed filesystem implementation
 
@@ -8,9 +8,6 @@
 URL:            http://miio.net/fusecompress/
 Source0:        http://miio.net/files/%{name}-%{version}.tar.gz
 Source1:        mount.fusecompress
-# Both patches were mailed upstream, got a response
-Patch0:         fusecompress-1.99.17-attr.patch
-Patch1:         fusecompress-1.99.17-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  rlog-devel fuse-devel zlib-devel bzip2-devel file-devel
@@ -27,8 +24,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .attr
-%patch1 -p1 -b .gcc43
 cp %{SOURCE1} mount.fusecompress
 
 
@@ -60,6 +55,11 @@
 
 
 %changelog
+* Sat Sep 27 2008 Luke Macken <lmacken at redhat.com> - 1.99.19-1
+- Update to 1.99.19
+- Remove fusecompress-1.99.17-attr.patch and fusecompress-1.99.17-gcc43.patch,
+  as they are now upstream in this release.
+
 * Sun Aug 10 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.99.18-1
 - New upstream release, bugfix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Aug 2008 07:30:10 -0000	1.5
+++ sources	28 Sep 2008 02:22:46 -0000	1.6
@@ -1 +1 @@
-573e97184ebc6e445ffe2bee81e01e4a  fusecompress-1.99.18.tar.gz
+2d1e10397f888ac46697070790a06ddc  fusecompress-1.99.19.tar.gz



From pgordon at fedoraproject.org  Sun Sep 28 05:17:48 2008
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Sun, 28 Sep 2008 05:17:48 +0000 (UTC)
Subject: rpms/deluge/devel deluge-mt-boost-fix.patch, NONE, 1.1 deluge.spec, 
	1.65, 1.66
Message-ID: <20080928051748.DFCE970118@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22990

Modified Files:
	deluge.spec 
Added Files:
	deluge-mt-boost-fix.patch 
Log Message:
Apply compilation fix from Mamoru Tasaka

deluge-mt-boost-fix.patch:

--- NEW FILE deluge-mt-boost-fix.patch ---
--- deluge-1.0.0/setup.py.debug	2008-09-22 04:22:24.000000000 +0900
+++ deluge-1.0.0/setup.py	2008-09-26 22:44:27.000000000 +0900
@@ -145,8 +145,20 @@
         ]
 
     # Modify the libs if necessary for systems with only -mt boost libs    
+    #
+    # See rh#250802, boost threads lib does not have "single thread" variant,
+    # so here the existence of libboost_thread.so must be checked.
+    #
+    # Also the directory where libraries are installed should be able
+    # to be specified
+    #
+    libdir = os.path.join(sysconfig.PREFIX, "lib")
+    _libdir = sysconfig.get_config_vars()["LIBDIR"]
+    if _libdir:
+        libdir = _libdir
+
     if not os.path.exists(
-        os.path.join(sysconfig.PREFIX, "lib", "libboost_filesystem.so")):
+        os.path.join(libdir, "libboost_thread.so")):
         # It's likely that this system doesn't have symlinks setup
         # So add '-mt' to the libraries
         for lib in _libraries:


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- deluge.spec	23 Sep 2008 05:23:46 -0000	1.65
+++ deluge.spec	28 Sep 2008 05:17:18 -0000	1.66
@@ -14,6 +14,8 @@
 ## rb_libtorrent. See below for more details. 
 # Source1:	%{name}-fixed-setup.py
 
+Patch0: 	%{name}-mt-boost-fix.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	boost-devel
@@ -59,6 +61,7 @@
 %setup -q
 ## Not building against system rb_libtorrent - see above.
 # install -m 0755 %{SOURCE1} ./setup.py
+%patch0 -p1 -b .mt-boost-fix
 
 
 %build
@@ -114,8 +117,12 @@
 
 
 %changelog
-* Mon Sep 22 2008 Peter Gordon <peter at thecodergeek.com> - 1.0.0-1
+* Sat Sep 27 2008 Peter Gordon <peter at thecodergeek.com> - 1.0.0-1
 - Update to new upstream release (1.0.0 Final)
+- Apply patch from Mamoru Tasaka to build against the multi-threaded Boost
+  libraries once more:
+  + mt-boost-fix.patch
+- Resolves: #464151 (About 1.0.0 build failure)
 
 * Tue Sep 16 2008 Peter Gordon <peter at thecodergeek.com> - 0.9.09-1
 - Update to new upstream release candidate (1.0.0 RC9)



From phuang at fedoraproject.org  Sun Sep 28 05:53:30 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Sun, 28 Sep 2008 05:53:30 +0000 (UTC)
Subject: rpms/scim-bridge/F-9 scim-bridge-0.4.15-hotkey-help.patch, 1.1,
	1.2 scim-bridge.spec, 1.63, 1.64
Message-ID: <20080928055330.6B0BE70118@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/scim-bridge/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27299

Modified Files:
	scim-bridge-0.4.15-hotkey-help.patch scim-bridge.spec 
Log Message:
Back port from devel branch

scim-bridge-0.4.15-hotkey-help.patch:

Index: scim-bridge-0.4.15-hotkey-help.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scim-bridge/F-9/scim-bridge-0.4.15-hotkey-help.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-bridge-0.4.15-hotkey-help.patch	7 Mar 2008 07:27:27 -0000	1.1
+++ scim-bridge-0.4.15-hotkey-help.patch	28 Sep 2008 05:53:00 -0000	1.2
@@ -1,6 +1,37 @@
-diff -up scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp.hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp
---- scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp.hotkey-help	2007-11-07 18:48:45.000000000 +0800
-+++ scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp	2008-03-07 15:21:25.000000000 +0800
+diff -up scim-bridge-0.4.15/agent/scim-bridge-agent.cpp.1-hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent.cpp
+--- scim-bridge-0.4.15/agent/scim-bridge-agent.cpp.1-hotkey-help	2008-02-24 10:08:43.000000000 +1000
++++ scim-bridge-0.4.15/agent/scim-bridge-agent.cpp	2008-06-23 10:55:39.000000000 +1000
+@@ -529,6 +529,27 @@ void ScimBridgeAgentImpl::slot_reload_co
+     scim_global_config_flush ();
+ 
+     scim_keyboard_layout = scim_get_default_keyboard_layout ();
++
++    // Hot key name, hot key config key.
++    // ! Update hotkey_list_length according to updated list length.
++    int hotkey_list_length = 6;
++    String hotkey_list[][2] = {
++        { _("Toggle on/off - "), "/Hotkeys/FrontEnd/Trigger" },
++        { _("Turn on - "), "/Hotkeys/FrontEnd/On" },
++        { _("Turn off - "), "/Hotkeys/FrontEnd/Off" },
++        { _("Next input method - "), "/Hotkeys/FrontEnd/NextFactory" },
++        { _("Previous input method - "), "/Hotkeys/FrontEnd/PreviousFactory" },
++        { _("Show input method menu - "), "/Hotkeys/FrontEnd/ShowFactoryMenu" }
++    };
++                           
++    // Undefined hot keys are hidden from help window.
++    String help_hotkeys = "\nGlobal Hotkeys:";
++    for ( int i = 0; i < hotkey_list_length; i++ ) {
++        String tmp_hotkeys = scim_config->read (String (hotkey_list[i][1]), String (""));
++        if ( tmp_hotkeys != "" )
++            help_hotkeys += "\n" + hotkey_list[i][0] + "<" + tmp_hotkeys + ">";
++    }
++    ScimBridgeAgentIMContext::set_help_hotkeys (help_hotkeys);
+ }
+ 
+ 
+diff -up scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp.1-hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp
+--- scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp.1-hotkey-help	2007-11-07 20:48:45.000000000 +1000
++++ scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp	2008-06-23 09:44:58.000000000 +1000
 @@ -60,6 +60,8 @@ static unsigned int imengine_id = 0;
  
  static bool on_the_spot_enabled = true;
@@ -10,15 +41,7 @@
  /* Class definition */
  class ScimBridgeAgentIMContextImpl: public ScimBridgeAgentIMContext
  {
-@@ -137,6 +139,7 @@ class ScimBridgeAgentIMContextImpl: publ
-         void alloc_imengine ();
-         void free_imengine ();
- 
-+
-     private:
- 
-         scim_bridge_imcontext_id_t id;
-@@ -273,6 +276,17 @@ void ScimBridgeAgentIMContext::set_on_th
+@@ -273,6 +275,12 @@ void ScimBridgeAgentIMContext::set_on_th
  }
  
  
@@ -27,29 +50,28 @@
 +    help_hotkeys = hotkey_str;
 +}
 +
-+String ScimBridgeAgentIMContext::get_help_hotkeys ()
-+{
-+    return help_hotkeys;
-+}
-+
 +
  ScimBridgeAgentIMContextImpl::ScimBridgeAgentIMContextImpl (ScimBridgeAgentClientListener *new_client_listener):
  client_listener (new_client_listener), imengine (NULL), enabled (false), preedit_mode (PREEDIT_ANY),
  preedit_shown (false), preedit_cursor_position (0)
-@@ -917,7 +931,9 @@ void ScimBridgeAgentIMContextImpl::panel
+@@ -915,9 +923,11 @@ void ScimBridgeAgentIMContextImpl::panel
+ 
+ void ScimBridgeAgentIMContextImpl::panel_request_help ()
  {
-     String help =  String (_ ("Smart Common Input Method platform ")) +
-         String (SCIM_VERSION) +
+-    String help =  String (_ ("Smart Common Input Method platform ")) +
+-        String (SCIM_VERSION) +
 -        String (_ ("\n(C) 2002-2005 James Su <suzhe at tsinghua.org.cn>\n\n"));
-+        String (_ ("\n(C) 2002-2005 James Su <suzhe at tsinghua.org.cn>\n\n")) +
++    String help =  String (_ ("SCIM Bridge")) + 
++        String (VERSION) +
++        String (_ ("\n(C) 2006-2008 Ryo Dairiki <ryo-dairiki at users.sourceforge.net>\n")) +
 +        help_hotkeys +
 +        String ("\n\n");
  
          IMEngineFactoryPointer factory = scim_backend->get_factory (get_imengine ()->get_factory_uuid ());
          if (factory.null ()) factory = fallback_imengine_factory;
-diff -up scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h.hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h
---- scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h.hotkey-help	2007-06-02 11:33:48.000000000 +0800
-+++ scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h	2008-03-07 15:19:12.000000000 +0800
+diff -up scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h.1-hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h
+--- scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h.1-hotkey-help	2007-06-02 13:33:48.000000000 +1000
++++ scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h	2008-06-23 09:44:58.000000000 +1000
 @@ -130,6 +130,21 @@ class ScimBridgeAgentIMContext
          static void set_enabled_by_default (bool enabled);
  
@@ -72,30 +94,3 @@
           * Destructor.
           */
          virtual ~ScimBridgeAgentIMContext () {}
-diff -up scim-bridge-0.4.15/agent/scim-bridge-agent.cpp.hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent.cpp
---- scim-bridge-0.4.15/agent/scim-bridge-agent.cpp.hotkey-help	2008-02-24 08:08:43.000000000 +0800
-+++ scim-bridge-0.4.15/agent/scim-bridge-agent.cpp	2008-03-07 15:22:27.000000000 +0800
-@@ -529,6 +529,23 @@ void ScimBridgeAgentImpl::slot_reload_co
-     scim_global_config_flush ();
- 
-     scim_keyboard_layout = scim_get_default_keyboard_layout ();
-+
-+    String help_hotkeys;
-+
-+    help_hotkeys = String (_ ("\nGlobal Hotkeys:")) +
-+        String (_ ("\n\nTrigger: ")) +
-+        scim_config->read (String ("/Hotkeys/FrontEnd/Trigger"), String ("Unable to be loaded.")) +
-+        String (_ ("\n\nTurn on: ")) +
-+        scim_config->read (String ("/Hotkeys/FrontEnd/On"), String ("Unable to be loaded.")) +
-+        String (_ ("\n\nTurn off: ")) +
-+        scim_config->read (String ("/Hotkeys/FrontEnd/Off"), String ("Unable to be loaded.")) +
-+        String (_ ("\n\nNext input method: ")) +
-+        scim_config->read (String ("/Hotkeys/FrontEnd/NextFactory"), String ("Unable to be loaded.")) +
-+        String (_ ("\n\nPrevious input method: ")) +
-+        scim_config->read (String ("/Hotkeys/FrontEnd/PreviousFactory"), String ("Unable to be loaded."));
-+        String (_ ("\n\nShow input method menu: ")) +
-+        scim_config->read (String ("/Hotkeys/FrontEnd/ShowFactoryMenu"), String ("Unable to be loaded."));
-+        ScimBridgeAgentIMContext::set_help_hotkeys (help_hotkeys);
- }
- 
- 


Index: scim-bridge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-bridge/F-9/scim-bridge.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- scim-bridge.spec	3 Apr 2008 06:52:30 -0000	1.63
+++ scim-bridge.spec	28 Sep 2008 05:53:00 -0000	1.64
@@ -6,7 +6,7 @@
 Name:           scim-bridge
 
 Version:        0.4.15
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        SCIM Bridge Gtk IM module
 
 Group:          System Environment/Libraries
@@ -25,6 +25,7 @@
 Requires:       scim >= 1.4.6
 Patch0:         scim-bridge-0.4.15-fix-gdm.patch
 Patch1:         scim-bridge-0.4.15-hotkey-help.patch
+Patch2:			scim-bridge-0.4.15-bz461373.patch
 
 
 %description
@@ -77,6 +78,7 @@
 %setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}}
 %patch0 -p1 -b .0-fix-gdm
 %patch1 -p1 -b .1-hotkey-help
+%patch2 -p1 -b .2-bz461373
 
 %if %{snapshot}
 mkdir m4
@@ -147,6 +149,12 @@
 
 
 %changelog
+* Tue Sep 16 2008 Huang Peng <phuang at redhat.com> - 0.4.15-7
+- Resolves: bug 461373 (Focus switch causes selected text to be deleted)
+
+* Mon Apr 21 2008 Caius Chance <cchance at redhat.com> - 0.4.15-6
+- Resolves: rhbz#199389 (Add global hotkey list in help window.)
+
 * Thu Apr 03 2008 Huang Peng <phuang at redhat.com> -0.4.15-5
 - Updated Obsoletes in spec file to fix some potential problems.
 



From phuang at fedoraproject.org  Sun Sep 28 05:58:00 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Sun, 28 Sep 2008 05:58:00 +0000 (UTC)
Subject: rpms/scim-bridge/F-9 scim-bridge.spec,1.64,1.65
Message-ID: <20080928055800.8A1F270118@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/scim-bridge/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28073

Modified Files:
	scim-bridge.spec 
Log Message:
Bump the version


Index: scim-bridge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-bridge/F-9/scim-bridge.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- scim-bridge.spec	28 Sep 2008 05:53:00 -0000	1.64
+++ scim-bridge.spec	28 Sep 2008 05:57:30 -0000	1.65
@@ -6,7 +6,7 @@
 Name:           scim-bridge
 
 Version:        0.4.15
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        SCIM Bridge Gtk IM module
 
 Group:          System Environment/Libraries
@@ -149,6 +149,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Huang Peng <phuang at redhat.com> - 0.4.15-8
+- Change release version to 8 for rebuilding rpms.
+
 * Tue Sep 16 2008 Huang Peng <phuang at redhat.com> - 0.4.15-7
 - Resolves: bug 461373 (Focus switch causes selected text to be deleted)
 



From phuang at fedoraproject.org  Sun Sep 28 05:59:28 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Sun, 28 Sep 2008 05:59:28 +0000 (UTC)
Subject: rpms/scim-bridge/F-9 scim-bridge-0.4.15-bz461373.patch,NONE,1.1
Message-ID: <20080928055928.AB24070118@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/scim-bridge/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28420

Added Files:
	scim-bridge-0.4.15-bz461373.patch 
Log Message:
Add patch to fix bug 461373

scim-bridge-0.4.15-bz461373.patch:

--- NEW FILE scim-bridge-0.4.15-bz461373.patch ---
diff -up scim-bridge-0.4.15/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp.bz461373 scim-bridge-0.4.15/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp
--- scim-bridge-0.4.15/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp.bz461373	2008-09-16 09:54:29.000000000 +0800
+++ scim-bridge-0.4.15/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp	2008-09-16 09:58:47.000000000 +0800
@@ -220,7 +220,12 @@ void ScimBridgeClientIMContextImpl::setF
 {
     scim_bridge_pdebugln (4, "ScimBridgeClientIMContextImpl::setFocusWidget ()");
     QInputContext::setFocusWidget (widget);
-    focus_in ();
+	if (widget == NULL) {
+    	focus_out ();
+	}
+	else {
+    	focus_in ();
+	}
     update ();
 }
 
@@ -442,8 +447,10 @@ void ScimBridgeClientIMContextImpl::focu
         }
     }
 
-    set_preedit_shown (false);
-    update_preedit ();
+	if (preedit_shown) {
+    	set_preedit_shown (false);
+    	update_preedit ();
+	}
 
     focused_imcontext = NULL;
 }



From scop at fedoraproject.org  Sun Sep 28 06:30:23 2008
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 28 Sep 2008 06:30:23 +0000 (UTC)
Subject: rpms/vdr-sudoku/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 vdr-sudoku.spec, 1.12, 1.13
Message-ID: <20080928063024.067AA70118@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-sudoku/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32386

Modified Files:
	.cvsignore sources vdr-sudoku.spec 
Log Message:
* Sun Sep 28 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.3.2-1
- 0.3.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-sudoku/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Aug 2008 05:53:10 -0000	1.7
+++ .cvsignore	28 Sep 2008 06:29:53 -0000	1.8
@@ -1 +1 @@
-vdr-sudoku-0.3.1.tgz
+vdr-sudoku-0.3.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-sudoku/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Aug 2008 05:53:10 -0000	1.7
+++ sources	28 Sep 2008 06:29:53 -0000	1.8
@@ -1 +1 @@
-d066c050e579169c8f271271dedc2c5d  vdr-sudoku-0.3.1.tgz
+5e64609d3e4951dccc2327ee95313b63  vdr-sudoku-0.3.2.tgz


Index: vdr-sudoku.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-sudoku/devel/vdr-sudoku.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vdr-sudoku.spec	30 Aug 2008 05:53:10 -0000	1.12
+++ vdr-sudoku.spec	28 Sep 2008 06:29:53 -0000	1.13
@@ -5,7 +5,7 @@
 %define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 
 Name:           vdr-%{pname}
-Version:        0.3.1
+Version:        0.3.2
 Release:        1%{?dist}
 Summary:        Sudoku plugin for VDR
 
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.3.2-1
+- 0.3.2.
+
 * Sat Aug 30 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.3.1-1
 - 0.3.1, Finnish patch applied upstream.
 



From atorkhov at fedoraproject.org  Sun Sep 28 07:35:41 2008
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Sun, 28 Sep 2008 07:35:41 +0000 (UTC)
Subject: rpms/ogre/devel ogre-1.6.0rc1-glew.patch, NONE, 1.1 ogre.spec, 1.35,
	1.36 sources, 1.14, 1.15
Message-ID: <20080928073541.F07C370118@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/ogre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7968

Modified Files:
	ogre.spec sources 
Added Files:
	ogre-1.6.0rc1-glew.patch 
Log Message:
Updated private GLEW sources due to license issues and added upstream GLEW patch.

ogre-1.6.0rc1-glew.patch:

--- NEW FILE ogre-1.6.0rc1-glew.patch ---
diff -ur ogre/RenderSystems/GL/src/glew.cpp ogre.new/RenderSystems/GL/src/glew.cpp
--- ogre/RenderSystems/GL/src/glew.cpp	2008-09-28 11:10:34.000000000 +0400
+++ ogre.new/RenderSystems/GL/src/glew.cpp	2008-09-28 11:12:46.000000000 +0400
@@ -29,6 +29,10 @@
 ** THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+// SJS
+#include "OgreGLSupport.h"
+// SJS
+
 #include <GL/glew.h>
 #if defined(_WIN32)
 #  include <GL/wglew.h>
@@ -56,13 +60,13 @@
 #  endif /* _WIN32 */
 #  define GLEW_CONTEXT_ARG_DEF_LIST GLEWContext* ctx
 #else /* GLEW_MX */
-#  define GLEW_CONTEXT_ARG_DEF_INIT void
-#  define GLEW_CONTEXT_ARG_VAR_INIT
-#  define GLEW_CONTEXT_ARG_DEF_LIST void
-#  define WGLEW_CONTEXT_ARG_DEF_INIT void
-#  define WGLEW_CONTEXT_ARG_DEF_LIST void
-#  define GLXEW_CONTEXT_ARG_DEF_INIT void
-#  define GLXEW_CONTEXT_ARG_DEF_LIST void
+#  define GLEW_CONTEXT_ARG_DEF_INIT Ogre::GLSupport *glSupport
+#  define GLEW_CONTEXT_ARG_VAR_INIT glSupport
+#  define GLEW_CONTEXT_ARG_DEF_LIST Ogre::GLSupport *glSupport
+#  define WGLEW_CONTEXT_ARG_DEF_INIT Ogre::GLSupport *glSupport
+#  define WGLEW_CONTEXT_ARG_DEF_LIST Ogre::GLSupport *glSupport
+#  define GLXEW_CONTEXT_ARG_DEF_INIT Ogre::GLSupport *glSupport
+#  define GLXEW_CONTEXT_ARG_DEF_LIST Ogre::GLSupport *glSupport
 #endif /* GLEW_MX */
 
 #if defined(__APPLE__)
@@ -80,7 +84,7 @@
     image = NSAddImage("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", NSADDIMAGE_OPTION_RETURN_ON_ERROR);
   }
   /* prepend a '_' for the Unix C symbol mangling convention */
-  symbolName = malloc(strlen((const char*)name) + 2);
+  symbolName = (char*)malloc(strlen((const char*)name) + 2);
   strcpy(symbolName+1, (const char*)name);
   symbolName[0] = '_';
   symbol = NULL;
@@ -5326,9 +5330,11 @@
 
 /* ------------------------------------------------------------------------- */
 
-#ifndef GLEW_MX
-static
-#endif
+// SJS
+//#ifndef GLEW_MX
+//static
+//#endif
+// SJS
 GLenum glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST)
 {
   const GLubyte* s;
@@ -7299,11 +7305,15 @@
 
 #ifdef GLX_VERSION_1_2
 
+// FB: Patched to allow Ogre to overload glXGetCurrentDisplay
 static GLboolean _glewInit_GLX_VERSION_1_2 (GLXEW_CONTEXT_ARG_DEF_INIT)
 {
   GLboolean r = GL_FALSE;
 
-  r = ((glXGetCurrentDisplay = (PFNGLXGETCURRENTDISPLAYPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentDisplay")) == NULL) || r;
+  if (glXGetCurrentDisplay == NULL) 
+  {
+      r = ((glXGetCurrentDisplay = (PFNGLXGETCURRENTDISPLAYPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentDisplay")) == NULL) || r;
+  }
 
   return r;
 }
@@ -7976,18 +7986,20 @@
 extern GLenum glxewContextInit (void);
 #endif /* _WIN32 */
 
-GLenum glewInit ()
-{
-  GLenum r;
-  if ( (r = glewContextInit()) ) return r;
-#if defined(_WIN32)
-  return wglewContextInit();
-#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) /* _UNIX */
-  return glxewContextInit();
-#else
-  return r;
-#endif /* _WIN32 */
-}
+// SJS
+//GLenum glewInit ()
+//{
+//  GLenum r;
+//  if ( (r = glewContextInit()) ) return r;
+//#if defined(_WIN32)
+//  return wglewContextInit();
+//#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) /* _UNIX */
+//  return glxewContextInit();
+//#else
+//  return r;
+//#endif /* _WIN32 */
+//}
+// End SJS
 
 #endif /* !GLEW_MX */
 #ifdef GLEW_MX


Index: ogre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ogre.spec	20 Sep 2008 08:32:42 -0000	1.35
+++ ogre.spec	28 Sep 2008 07:35:11 -0000	1.36
@@ -7,16 +7,19 @@
 URL:            http://www.ogre3d.org/
 # This is http://downloads.sourceforge.net/ogre/ogre-v%(echo %{version} | tr . -).tar.bz2
 # With the non free licensed headers under RenderSystems/GL/include/GL removed
+# And GLEW sources updated to 1.5.0 - upstream notified http://www.ogre3d.org/phpBB2/viewtopic.php?t=44558
 Source0:        ogre-1.6.0rc1-clean.tar.bz2
 Source1:        ogre-samples.sh
 Patch0:         ogre-1.2.1-rpath.patch
 #Patch1:         ogre-1.6.0-system-glew.patch
+# Upstream patch to GLEW applied to new version
+Patch1:         ogre-1.6.0rc1-glew.patch
 Patch2:         ogre-1.4.7-system-tinyxml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cegui-devel zziplib-devel freetype-devel gtk2-devel
 BuildRequires:  libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel
 BuildRequires:  ois-devel freeimage-devel
-#BuildRequires:  glew-devel
+#BuildRequires:  openexr-devel glew-devel
 BuildRequires:  tinyxml-devel
 
 %description
@@ -65,7 +68,7 @@
 %prep
 %setup -q -n ogre
 %patch0 -p1 -z .rpath
-#%patch1 -p1 -z .glew
+%patch1 -p1 -z .glew
 %patch2 -p1 -z .sys-tinyxml
 # remove execute bits from src-files for -debuginfo package
 chmod -x `find RenderSystems/GL -type f` \
@@ -176,10 +179,12 @@
 
 
 %changelog
-* Sat Sep 13 2008 Alexey Torkhov <atorkhov at gmail.com> 1.6.0-0.1.rc1
+* Sat Sep 21 2008 Alexey Torkhov <atorkhov at gmail.com> 1.6.0-0.1.rc1
 - New upstream release 1.6.0rc1
-- Removing broken OpenEXR plugin, it is not updated for long time and doesn't
+- Disabling broken OpenEXR plugin, it is not updated for long time and doesn't
   compile. FreeImage now have EXR support
+- Updated private GLEW sources to 1.5.0 due to license issues and compiling
+  against it instead of system ones, as it is patched by upstream
 
 * Fri Jul 11 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.9-2
 - Rebuild for new cegui


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	14 Sep 2008 09:25:14 -0000	1.14
+++ sources	28 Sep 2008 07:35:11 -0000	1.15
@@ -1 +1 @@
-6befec25a9ac9c84aa1ccd1256522fc9  ogre-1.6.0rc1-clean.tar.bz2
+4a3ec51765880a682f8c9846839ea901  ogre-1.6.0rc1-clean.tar.bz2



From lkundrak at fedoraproject.org  Sun Sep 28 08:43:00 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 28 Sep 2008 08:43:00 +0000 (UTC)
Subject: rpms/fusecompress/devel fusecompress-1.99.19-types.patch, NONE,
	1.1 fusecompress.spec, 1.8, 1.9 fusecompress-1.99.17-attr.patch,
	1.1, NONE fusecompress-1.99.17-gcc43.patch, 1.1, NONE
Message-ID: <20080928084300.AA9EC70118@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/fusecompress/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17471

Modified Files:
	fusecompress.spec 
Added Files:
	fusecompress-1.99.19-types.patch 
Removed Files:
	fusecompress-1.99.17-attr.patch 
	fusecompress-1.99.17-gcc43.patch 
Log Message:
* Sun Sep 28 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.99.19-2
- Fix build
- Drop silly mount wrapper


fusecompress-1.99.19-types.patch:

--- NEW FILE fusecompress-1.99.19-types.patch ---
For some reason this is required on i386, but not on x86_64.

Lubomir Rintel <lkundrak at v3.sk>

diff -up fusecompress-1.99.19/src/Memory.cpp.types fusecompress-1.99.19/src/Memory.cpp
--- fusecompress-1.99.19/src/Memory.cpp.types	2008-09-28 10:37:28.000000000 +0200
+++ fusecompress-1.99.19/src/Memory.cpp	2008-09-28 10:37:35.000000000 +0200
@@ -181,11 +181,11 @@ ssize_t Memory::read(char *buf, size_t s
 		{
 			// m_FileSize, offset, size, block_offset
 			//
-			cs = min(block_offset - offset, len);
+			cs = min((ssize_t) (block_offset - offset), len);
 			cs = Parent::read(buf, cs, offset);
 			if (cs == 0)
 			{
-				cs = min(block_offset - offset, len);
+				cs = min((ssize_t) (block_offset - offset), len);
 				memset(buf, 0, cs);
 			}
 		}


Index: fusecompress.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress/devel/fusecompress.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fusecompress.spec	28 Sep 2008 02:22:46 -0000	1.8
+++ fusecompress.spec	28 Sep 2008 08:42:30 -0000	1.9
@@ -1,13 +1,13 @@
 Name:           fusecompress
 Version:        1.99.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        FUSE based compressed filesystem implementation
 
 Group:          System Environment/Libraries
 License:        GPLv2
 URL:            http://miio.net/fusecompress/
 Source0:        http://miio.net/files/%{name}-%{version}.tar.gz
-Source1:        mount.fusecompress
+Patch0:         fusecompress-1.99.19-types.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  rlog-devel fuse-devel zlib-devel bzip2-devel file-devel
@@ -24,7 +24,7 @@
 
 %prep
 %setup -q
-cp %{SOURCE1} mount.fusecompress
+%patch0 -p1 -b .types
 
 
 %build
@@ -51,10 +51,13 @@
 %{_mandir}/man1/fusecompress.1*
 %{_mandir}/man1/fusecompress_offline.1*
 %doc ChangeLog README AUTHORS COPYING NEWS TODO
-%doc mount.fusecompress
 
 
 %changelog
+* Sun Sep 28 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.99.19-2
+- Fix build
+- Drop silly mount wrapper
+
 * Sat Sep 27 2008 Luke Macken <lmacken at redhat.com> - 1.99.19-1
 - Update to 1.99.19
 - Remove fusecompress-1.99.17-attr.patch and fusecompress-1.99.17-gcc43.patch,


--- fusecompress-1.99.17-attr.patch DELETED ---


--- fusecompress-1.99.17-gcc43.patch DELETED ---



From peter at fedoraproject.org  Sun Sep 28 10:33:27 2008
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sun, 28 Sep 2008 10:33:27 +0000 (UTC)
Subject: rpms/fuse/devel .cvsignore, 1.13, 1.14 fuse.spec, 1.33,
	1.34 import.log, 1.1, 1.2 sources, 1.13, 1.14
Message-ID: <20080928103327.6BBC070118@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31288/devel

Modified Files:
	.cvsignore fuse.spec import.log sources 
Log Message:
Ver. 2.7.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	20 Feb 2008 21:38:16 -0000	1.13
+++ .cvsignore	28 Sep 2008 10:32:57 -0000	1.14
@@ -1 +1 @@
-fuse-2.7.3.tar.gz
+fuse-2.7.4.tar.gz


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- fuse.spec	12 Jul 2008 06:04:30 -0000	1.33
+++ fuse.spec	28 Sep 2008 10:32:57 -0000	1.34
@@ -1,6 +1,6 @@
 Name:           fuse
-Version:        2.7.3
-Release:        3%{?dist}
+Version:        2.7.4
+Release:        1%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -144,6 +144,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Sat Aug 23 2008 Peter Lemenkov <lemenkov at gmail.com> 2.7.4-1
+- Ver. 2.7.4
+
 * Sat Jul 12 2008 Peter Lemenkov <lemenkov at gmail.com> 2.7.3-3
 - Fixed initscripts (BZ#441284)
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Jul 2008 06:04:30 -0000	1.1
+++ import.log	28 Sep 2008 10:32:57 -0000	1.2
@@ -1 +1,2 @@
 fuse-2_7_3-3_fc9:HEAD:fuse-2.7.3-3.fc9.src.rpm:1215842579
+fuse-2_7_4-1_fc9:HEAD:fuse-2.7.4-1.fc9.src.rpm:1222597934


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	20 Feb 2008 21:38:16 -0000	1.13
+++ sources	28 Sep 2008 10:32:57 -0000	1.14
@@ -1 +1 @@
-98563fc7b265b7479a3178181cbcf59a  fuse-2.7.3.tar.gz
+4879f06570d2225667534c37fea04213  fuse-2.7.4.tar.gz



From peter at fedoraproject.org  Sun Sep 28 10:36:00 2008
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sun, 28 Sep 2008 10:36:00 +0000 (UTC)
Subject: rpms/fuse/F-9 .cvsignore, 1.13, 1.14 fuse.spec, 1.33,
	1.34 import.log, 1.1, 1.2 sources, 1.13, 1.14
Message-ID: <20080928103600.BA28A70118@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31802/F-9

Modified Files:
	.cvsignore fuse.spec import.log sources 
Log Message:
Ver. 2.7.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	20 Feb 2008 21:38:16 -0000	1.13
+++ .cvsignore	28 Sep 2008 10:35:30 -0000	1.14
@@ -1 +1 @@
-fuse-2.7.3.tar.gz
+fuse-2.7.4.tar.gz


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/F-9/fuse.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- fuse.spec	12 Jul 2008 06:06:26 -0000	1.33
+++ fuse.spec	28 Sep 2008 10:35:30 -0000	1.34
@@ -1,6 +1,6 @@
 Name:           fuse
-Version:        2.7.3
-Release:        3%{?dist}
+Version:        2.7.4
+Release:        1%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -144,6 +144,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Sat Aug 23 2008 Peter Lemenkov <lemenkov at gmail.com> 2.7.4-1
+- Ver. 2.7.4
+
 * Sat Jul 12 2008 Peter Lemenkov <lemenkov at gmail.com> 2.7.3-3
 - Fixed initscripts (BZ#441284)
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Jul 2008 06:06:26 -0000	1.1
+++ import.log	28 Sep 2008 10:35:30 -0000	1.2
@@ -1 +1,2 @@
 fuse-2_7_3-3_fc9:F-9:fuse-2.7.3-3.fc9.src.rpm:1215842753
+fuse-2_7_4-1_fc9:F-9:fuse-2.7.4-1.fc9.src.rpm:1222598060


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	20 Feb 2008 21:38:16 -0000	1.13
+++ sources	28 Sep 2008 10:35:30 -0000	1.14
@@ -1 +1 @@
-98563fc7b265b7479a3178181cbcf59a  fuse-2.7.3.tar.gz
+4879f06570d2225667534c37fea04213  fuse-2.7.4.tar.gz



From peter at fedoraproject.org  Sun Sep 28 10:38:50 2008
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sun, 28 Sep 2008 10:38:50 +0000 (UTC)
Subject: rpms/fuse/F-8 .cvsignore, 1.12, 1.13 fuse.spec, 1.31,
	1.32 import.log, 1.1, 1.2 sources, 1.12, 1.13
Message-ID: <20080928103850.3FE5870118@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32288/F-8

Modified Files:
	.cvsignore fuse.spec import.log sources 
Log Message:
Ver. 2.7.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse/F-8/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	20 Feb 2008 21:41:14 -0000	1.12
+++ .cvsignore	28 Sep 2008 10:38:19 -0000	1.13
@@ -1 +1 @@
-fuse-2.7.3.tar.gz
+fuse-2.7.4.tar.gz


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/F-8/fuse.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- fuse.spec	12 Jul 2008 06:16:00 -0000	1.31
+++ fuse.spec	28 Sep 2008 10:38:19 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           fuse
-Version:        2.7.3
-Release:        3%{?dist}
+Version:        2.7.4
+Release:        1%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -144,6 +144,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Sat Aug 23 2008 Peter Lemenkov <lemenkov at gmail.com> 2.7.4-1
+- Ver. 2.7.4
+
 * Sat Jul 12 2008 Peter Lemenkov <lemenkov at gmail.com> 2.7.3-3
 - Fixed initscripts (BZ#441284)
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse/F-8/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Jul 2008 06:16:00 -0000	1.1
+++ import.log	28 Sep 2008 10:38:19 -0000	1.2
@@ -1 +1,2 @@
 fuse-2_7_3-3_fc9:F-8:fuse-2.7.3-3.fc9.src.rpm:1215843325
+fuse-2_7_4-1_fc9:F-8:fuse-2.7.4-1.fc9.src.rpm:1222598255


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse/F-8/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	20 Feb 2008 21:41:14 -0000	1.12
+++ sources	28 Sep 2008 10:38:19 -0000	1.13
@@ -1 +1 @@
-98563fc7b265b7479a3178181cbcf59a  fuse-2.7.3.tar.gz
+4879f06570d2225667534c37fea04213  fuse-2.7.4.tar.gz



From peter at fedoraproject.org  Sun Sep 28 10:44:56 2008
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sun, 28 Sep 2008 10:44:56 +0000 (UTC)
Subject: rpms/fuse-sshfs/devel import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 fuse-sshfs.spec, 1.12, 1.13 sources, 1.7, 1.8
Message-ID: <20080928104456.1153C70118@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-sshfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv891/devel

Modified Files:
	.cvsignore fuse-sshfs.spec sources 
Added Files:
	import.log 
Log Message:
Ver. 2.1


--- NEW FILE import.log ---
fuse-sshfs-2_1-1_fc9:HEAD:fuse-sshfs-2.1-1.fc9.src.rpm:1222598620


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse-sshfs/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 May 2008 11:21:10 -0000	1.7
+++ .cvsignore	28 Sep 2008 10:44:25 -0000	1.8
@@ -1 +1 @@
-sshfs-fuse-2.0.tar.gz
+sshfs-fuse-2.1.tar.gz


Index: fuse-sshfs.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse-sshfs/devel/fuse-sshfs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fuse-sshfs.spec	19 May 2008 11:21:10 -0000	1.12
+++ fuse-sshfs.spec	28 Sep 2008 10:44:25 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           fuse-sshfs
-Version:        2.0
+Version:        2.1
 Release:        1%{?dist}
 Summary:        FUSE-Filesystem to access remote filesystems via SSH
 
@@ -18,7 +18,7 @@
 %description
 This is a FUSE-filesystem client based on the SSH File Transfer Protocol.
 Since most SSH servers already support this protocol it is very easy to set
-up: i.e. on the server side there's nothing to do.  On the client side 
+up: i.e. on the server side there's nothing to do.  On the client side
 mounting the filesystem is as easy as logging into the server with ssh.
 
 %prep
@@ -37,11 +37,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS ChangeLog COPYING FAQ.txt NEWS README
 %{_bindir}/sshfs
 %{_mandir}/man1/sshfs.1.gz
 
 %changelog
+* Sun Sep 28 2008 Peter Lemenkov <lemenkov at gmail.com> 2.1-1
+- Ver. 2.1
+
 * Mon May 19 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0-1
 - Ver. 2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse-sshfs/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 May 2008 11:21:10 -0000	1.7
+++ sources	28 Sep 2008 10:44:25 -0000	1.8
@@ -1 +1 @@
-62ec074ba31e6275f43366b900a0cdc0  sshfs-fuse-2.0.tar.gz
+997a419b6d0ad32a516823f8746b75c7  sshfs-fuse-2.1.tar.gz



From peter at fedoraproject.org  Sun Sep 28 10:48:03 2008
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sun, 28 Sep 2008 10:48:03 +0000 (UTC)
Subject: rpms/fuse-sshfs/F-9 import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 fuse-sshfs.spec, 1.12, 1.13 sources, 1.7, 1.8
Message-ID: <20080928104803.441B670118@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-sshfs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1437/F-9

Modified Files:
	.cvsignore fuse-sshfs.spec sources 
Added Files:
	import.log 
Log Message:
Ver. 2.1


--- NEW FILE import.log ---
fuse-sshfs-2_1-1_fc9:F-9:fuse-sshfs-2.1-1.fc9.src.rpm:1222598809


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse-sshfs/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 May 2008 11:24:52 -0000	1.7
+++ .cvsignore	28 Sep 2008 10:47:32 -0000	1.8
@@ -1 +1 @@
-sshfs-fuse-2.0.tar.gz
+sshfs-fuse-2.1.tar.gz


Index: fuse-sshfs.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse-sshfs/F-9/fuse-sshfs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fuse-sshfs.spec	19 May 2008 11:24:52 -0000	1.12
+++ fuse-sshfs.spec	28 Sep 2008 10:47:32 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           fuse-sshfs
-Version:        2.0
+Version:        2.1
 Release:        1%{?dist}
 Summary:        FUSE-Filesystem to access remote filesystems via SSH
 
@@ -18,7 +18,7 @@
 %description
 This is a FUSE-filesystem client based on the SSH File Transfer Protocol.
 Since most SSH servers already support this protocol it is very easy to set
-up: i.e. on the server side there's nothing to do.  On the client side 
+up: i.e. on the server side there's nothing to do.  On the client side
 mounting the filesystem is as easy as logging into the server with ssh.
 
 %prep
@@ -37,11 +37,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS ChangeLog COPYING FAQ.txt NEWS README
 %{_bindir}/sshfs
 %{_mandir}/man1/sshfs.1.gz
 
 %changelog
+* Sun Sep 28 2008 Peter Lemenkov <lemenkov at gmail.com> 2.1-1
+- Ver. 2.1
+
 * Mon May 19 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0-1
 - Ver. 2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse-sshfs/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 May 2008 11:24:52 -0000	1.7
+++ sources	28 Sep 2008 10:47:32 -0000	1.8
@@ -1 +1 @@
-62ec074ba31e6275f43366b900a0cdc0  sshfs-fuse-2.0.tar.gz
+997a419b6d0ad32a516823f8746b75c7  sshfs-fuse-2.1.tar.gz



From peter at fedoraproject.org  Sun Sep 28 10:51:02 2008
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sun, 28 Sep 2008 10:51:02 +0000 (UTC)
Subject: rpms/fuse-sshfs/F-8 import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 fuse-sshfs.spec, 1.12, 1.13 sources, 1.7, 1.8
Message-ID: <20080928105102.CE7F570118@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-sshfs/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2057/F-8

Modified Files:
	.cvsignore fuse-sshfs.spec sources 
Added Files:
	import.log 
Log Message:
Ver. 2.1


--- NEW FILE import.log ---
fuse-sshfs-2_1-1_fc9:F-8:fuse-sshfs-2.1-1.fc9.src.rpm:1222598949


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse-sshfs/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 May 2008 11:27:26 -0000	1.7
+++ .cvsignore	28 Sep 2008 10:50:32 -0000	1.8
@@ -1 +1 @@
-sshfs-fuse-2.0.tar.gz
+sshfs-fuse-2.1.tar.gz


Index: fuse-sshfs.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse-sshfs/F-8/fuse-sshfs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fuse-sshfs.spec	19 May 2008 11:27:26 -0000	1.12
+++ fuse-sshfs.spec	28 Sep 2008 10:50:32 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           fuse-sshfs
-Version:        2.0
+Version:        2.1
 Release:        1%{?dist}
 Summary:        FUSE-Filesystem to access remote filesystems via SSH
 
@@ -18,7 +18,7 @@
 %description
 This is a FUSE-filesystem client based on the SSH File Transfer Protocol.
 Since most SSH servers already support this protocol it is very easy to set
-up: i.e. on the server side there's nothing to do.  On the client side 
+up: i.e. on the server side there's nothing to do.  On the client side
 mounting the filesystem is as easy as logging into the server with ssh.
 
 %prep
@@ -37,11 +37,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS ChangeLog COPYING FAQ.txt NEWS README
 %{_bindir}/sshfs
 %{_mandir}/man1/sshfs.1.gz
 
 %changelog
+* Sun Sep 28 2008 Peter Lemenkov <lemenkov at gmail.com> 2.1-1
+- Ver. 2.1
+
 * Mon May 19 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0-1
 - Ver. 2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse-sshfs/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 May 2008 11:27:26 -0000	1.7
+++ sources	28 Sep 2008 10:50:32 -0000	1.8
@@ -1 +1 @@
-62ec074ba31e6275f43366b900a0cdc0  sshfs-fuse-2.0.tar.gz
+997a419b6d0ad32a516823f8746b75c7  sshfs-fuse-2.1.tar.gz



From olea at fedoraproject.org  Sun Sep 28 12:03:56 2008
From: olea at fedoraproject.org (Ismael Olea)
Date: Sun, 28 Sep 2008 12:03:56 +0000 (UTC)
Subject: rpms/xhtml2fo-style-xsl/devel AntennaHouse-COPYRIGHT, NONE,
	1.1 import.log, NONE, 1.1 xhtml2fo-style-xsl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080928120356.5FBF070118@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/xhtml2fo-style-xsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9763/devel

Modified Files:
	.cvsignore sources 
Added Files:
	AntennaHouse-COPYRIGHT import.log xhtml2fo-style-xsl.spec 
Log Message:
First commit




--- NEW FILE AntennaHouse-COPYRIGHT ---

From: 	Kobayashi <koba at antenna.co.jp>
To: 	ismael at olea.org
Cc: 	hiraide at antenna.co.jp, mike at antennahouse.net
Subject: 	Re: FW: About licensing your xhtml2fo samples
Date: 	Wed, 15 Dec 2004 10:25:48 +0900  (02:25 CET)

Hello,

I have attached the updated sample-xsl-xhtml2fo-200201.zip.
The new Stylesheets contains copyright notice, you may distribute
it with the copyright notice portion.

Best regards,

Tokushige Kobayashi

--- NEW FILE import.log ---
xhtml2fo-style-xsl-20051222-1:HEAD:xhtml2fo-style-xsl-20051222-1.src.rpm:1222603337


--- NEW FILE xhtml2fo-style-xsl.spec ---
Name: xhtml2fo-style-xsl
Version: 20051222
Release: 1
Group: Applications/Text

Summary: Antenna House, Inc. XHTML to XSL:FO stylesheets
License: Copyright only
URL: http://www.antennahouse.com/XSLsample/XSLsample.htm

Requires(pre): xhtml1-dtds
Requires(pre): xml-common >= 0.6.3-8
#Requires(post): libxml2
#Requires(postun): libxml2

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch
Source0: http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo.zip
Source1: AntennaHouse-COPYRIGHT

%description
These XSL stylesheets allow you to transform any XHTML document to FO.
With a XSL:FO processor you could create PDF versions of XHTML documents.


%prep
%setup -q -c -n %{name}-%{version} -T -b 0
%__cp %{SOURCE1} .
%build


%install
%__rm -Rf $RPM_BUILD_ROOT
%__mkdir -p $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/xhtml1/xhtml2fo-stylesheets
%__mkdir -p $DESTDIR
%__cp *xsl $DESTDIR/

%clean
%__rm -Rf $RPM_BUILD_ROOT


%files
%defattr (-,root,root)
%doc AntennaHouse-COPYRIGHT
/usr/share/sgml/xhtml1/xhtml2fo-stylesheets


%post
CATALOG=%{_sysconfdir}/xml/catalog
%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
 "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" \
 "file:///usr/share/sgml/xhtml1/xhtml2fo-stylesheets/xhtml2fo.xsl" $CATALOG
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
 "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" \
 "file:///usr/share/sgml/xhtml1/xhtml2fo-stylesheets/xhtml2fo.xsl" $CATALOG

%postun
# remove entries only on removal of package
if [ "$1" = 0 ]; then
  CATALOG=%{_sysconfdir}/xml/catalog
  %{_bindir}/xmlcatalog --noout --del \
  "file://%{_datadir}/sgml/xhtml1/xhtml2fo-stylesheets/xhtml2fo.xsl" $CATALOG
fi


%changelog

* Thu Jan 17 2008 Ismael Olea <ismael at olea.org> 20051222-1
- updating to last version of sample-xsl-xhtml2fo.zip
- fixing spec for contributing to Fedora and rpmlinting with 0.82																																		

* Mon Jan 10 2005 Ismael Olea <ismael at olea.org> 20050106-1
- First version (based on docbook-xsl-stylesheets.spec by Tim Waugh.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xhtml2fo-style-xsl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2008 04:03:03 -0000	1.1
+++ .cvsignore	28 Sep 2008 12:03:25 -0000	1.2
@@ -0,0 +1 @@
+sample-xsl-xhtml2fo.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xhtml2fo-style-xsl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2008 04:03:03 -0000	1.1
+++ sources	28 Sep 2008 12:03:25 -0000	1.2
@@ -0,0 +1 @@
+f1c436aa16bf3f040048d2f05f2ebcc7  sample-xsl-xhtml2fo.zip



From olea at fedoraproject.org  Sun Sep 28 12:07:32 2008
From: olea at fedoraproject.org (Ismael Olea)
Date: Sun, 28 Sep 2008 12:07:32 +0000 (UTC)
Subject: rpms/xhtml2fo-style-xsl/F-8 AntennaHouse-COPYRIGHT, NONE,
	1.1 import.log, NONE, 1.1 xhtml2fo-style-xsl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080928120732.E607670118@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/xhtml2fo-style-xsl/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10323/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	AntennaHouse-COPYRIGHT import.log xhtml2fo-style-xsl.spec 
Log Message:
importing




--- NEW FILE AntennaHouse-COPYRIGHT ---

From: 	Kobayashi <koba at antenna.co.jp>
To: 	ismael at olea.org
Cc: 	hiraide at antenna.co.jp, mike at antennahouse.net
Subject: 	Re: FW: About licensing your xhtml2fo samples
Date: 	Wed, 15 Dec 2004 10:25:48 +0900  (02:25 CET)

Hello,

I have attached the updated sample-xsl-xhtml2fo-200201.zip.
The new Stylesheets contains copyright notice, you may distribute
it with the copyright notice portion.

Best regards,

Tokushige Kobayashi

--- NEW FILE import.log ---
xhtml2fo-style-xsl-20051222-1:F-8:xhtml2fo-style-xsl-20051222-1.src.rpm:1222603527


--- NEW FILE xhtml2fo-style-xsl.spec ---
Name: xhtml2fo-style-xsl
Version: 20051222
Release: 1
Group: Applications/Text

Summary: Antenna House, Inc. XHTML to XSL:FO stylesheets
License: Copyright only
URL: http://www.antennahouse.com/XSLsample/XSLsample.htm

Requires(pre): xhtml1-dtds
Requires(pre): xml-common >= 0.6.3-8
#Requires(post): libxml2
#Requires(postun): libxml2

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch
Source0: http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo.zip
Source1: AntennaHouse-COPYRIGHT

%description
These XSL stylesheets allow you to transform any XHTML document to FO.
With a XSL:FO processor you could create PDF versions of XHTML documents.


%prep
%setup -q -c -n %{name}-%{version} -T -b 0
%__cp %{SOURCE1} .
%build


%install
%__rm -Rf $RPM_BUILD_ROOT
%__mkdir -p $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/xhtml1/xhtml2fo-stylesheets
%__mkdir -p $DESTDIR
%__cp *xsl $DESTDIR/

%clean
%__rm -Rf $RPM_BUILD_ROOT


%files
%defattr (-,root,root)
%doc AntennaHouse-COPYRIGHT
/usr/share/sgml/xhtml1/xhtml2fo-stylesheets


%post
CATALOG=%{_sysconfdir}/xml/catalog
%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
 "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" \
 "file:///usr/share/sgml/xhtml1/xhtml2fo-stylesheets/xhtml2fo.xsl" $CATALOG
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
 "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" \
 "file:///usr/share/sgml/xhtml1/xhtml2fo-stylesheets/xhtml2fo.xsl" $CATALOG

%postun
# remove entries only on removal of package
if [ "$1" = 0 ]; then
  CATALOG=%{_sysconfdir}/xml/catalog
  %{_bindir}/xmlcatalog --noout --del \
  "file://%{_datadir}/sgml/xhtml1/xhtml2fo-stylesheets/xhtml2fo.xsl" $CATALOG
fi


%changelog

* Thu Jan 17 2008 Ismael Olea <ismael at olea.org> 20051222-1
- updating to last version of sample-xsl-xhtml2fo.zip
- fixing spec for contributing to Fedora and rpmlinting with 0.82																																		

* Mon Jan 10 2005 Ismael Olea <ismael at olea.org> 20050106-1
- First version (based on docbook-xsl-stylesheets.spec by Tim Waugh.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xhtml2fo-style-xsl/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2008 04:03:03 -0000	1.1
+++ .cvsignore	28 Sep 2008 12:07:02 -0000	1.2
@@ -0,0 +1 @@
+sample-xsl-xhtml2fo.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xhtml2fo-style-xsl/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2008 04:03:03 -0000	1.1
+++ sources	28 Sep 2008 12:07:02 -0000	1.2
@@ -0,0 +1 @@
+f1c436aa16bf3f040048d2f05f2ebcc7  sample-xsl-xhtml2fo.zip



From olea at fedoraproject.org  Sun Sep 28 12:14:12 2008
From: olea at fedoraproject.org (Ismael Olea)
Date: Sun, 28 Sep 2008 12:14:12 +0000 (UTC)
Subject: rpms/xhtml2fo-style-xsl/F-9 AntennaHouse-COPYRIGHT, NONE,
	1.1 import.log, NONE, 1.1 xhtml2fo-style-xsl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080928121412.6E4FC70118@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/xhtml2fo-style-xsl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11552/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	AntennaHouse-COPYRIGHT import.log xhtml2fo-style-xsl.spec 
Log Message:

Importing




--- NEW FILE AntennaHouse-COPYRIGHT ---

From: 	Kobayashi <koba at antenna.co.jp>
To: 	ismael at olea.org
Cc: 	hiraide at antenna.co.jp, mike at antennahouse.net
Subject: 	Re: FW: About licensing your xhtml2fo samples
Date: 	Wed, 15 Dec 2004 10:25:48 +0900  (02:25 CET)

Hello,

I have attached the updated sample-xsl-xhtml2fo-200201.zip.
The new Stylesheets contains copyright notice, you may distribute
it with the copyright notice portion.

Best regards,

Tokushige Kobayashi

--- NEW FILE import.log ---
xhtml2fo-style-xsl-20051222-1:F-9:xhtml2fo-style-xsl-20051222-1.src.rpm:1222604001


--- NEW FILE xhtml2fo-style-xsl.spec ---
Name: xhtml2fo-style-xsl
Version: 20051222
Release: 1
Group: Applications/Text

Summary: Antenna House, Inc. XHTML to XSL:FO stylesheets
License: Copyright only
URL: http://www.antennahouse.com/XSLsample/XSLsample.htm

Requires(pre): xhtml1-dtds
Requires(pre): xml-common >= 0.6.3-8
#Requires(post): libxml2
#Requires(postun): libxml2

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch
Source0: http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo.zip
Source1: AntennaHouse-COPYRIGHT

%description
These XSL stylesheets allow you to transform any XHTML document to FO.
With a XSL:FO processor you could create PDF versions of XHTML documents.


%prep
%setup -q -c -n %{name}-%{version} -T -b 0
%__cp %{SOURCE1} .
%build


%install
%__rm -Rf $RPM_BUILD_ROOT
%__mkdir -p $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/xhtml1/xhtml2fo-stylesheets
%__mkdir -p $DESTDIR
%__cp *xsl $DESTDIR/

%clean
%__rm -Rf $RPM_BUILD_ROOT


%files
%defattr (-,root,root)
%doc AntennaHouse-COPYRIGHT
/usr/share/sgml/xhtml1/xhtml2fo-stylesheets


%post
CATALOG=%{_sysconfdir}/xml/catalog
%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
 "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" \
 "file:///usr/share/sgml/xhtml1/xhtml2fo-stylesheets/xhtml2fo.xsl" $CATALOG
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
 "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" \
 "file:///usr/share/sgml/xhtml1/xhtml2fo-stylesheets/xhtml2fo.xsl" $CATALOG

%postun
# remove entries only on removal of package
if [ "$1" = 0 ]; then
  CATALOG=%{_sysconfdir}/xml/catalog
  %{_bindir}/xmlcatalog --noout --del \
  "file://%{_datadir}/sgml/xhtml1/xhtml2fo-stylesheets/xhtml2fo.xsl" $CATALOG
fi


%changelog

* Thu Jan 17 2008 Ismael Olea <ismael at olea.org> 20051222-1
- updating to last version of sample-xsl-xhtml2fo.zip
- fixing spec for contributing to Fedora and rpmlinting with 0.82																																		

* Mon Jan 10 2005 Ismael Olea <ismael at olea.org> 20050106-1
- First version (based on docbook-xsl-stylesheets.spec by Tim Waugh.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xhtml2fo-style-xsl/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2008 04:03:03 -0000	1.1
+++ .cvsignore	28 Sep 2008 12:13:42 -0000	1.2
@@ -0,0 +1 @@
+sample-xsl-xhtml2fo.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xhtml2fo-style-xsl/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2008 04:03:03 -0000	1.1
+++ sources	28 Sep 2008 12:13:42 -0000	1.2
@@ -0,0 +1 @@
+f1c436aa16bf3f040048d2f05f2ebcc7  sample-xsl-xhtml2fo.zip



From pertusus at fedoraproject.org  Sun Sep 28 12:55:59 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Sun, 28 Sep 2008 12:55:59 +0000 (UTC)
Subject: rpms/wmctrl/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wmctrl.spec,
	1.3, 1.4
Message-ID: <20080928125559.8963370118@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/wmctrl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17364

Modified Files:
	.cvsignore sources wmctrl.spec 
Log Message:
* Sun Sep 28 2008 Patrice Dumas <pertusus at free.fr> - 1.07-5
- apply debian patcheset, to fix #426383



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wmctrl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Oct 2006 05:16:02 -0000	1.2
+++ .cvsignore	28 Sep 2008 12:55:29 -0000	1.3
@@ -1 +1,2 @@
 wmctrl-1.07.tar.gz
+wmctrl_1.07-6.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wmctrl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Oct 2006 05:16:02 -0000	1.2
+++ sources	28 Sep 2008 12:55:29 -0000	1.3
@@ -1 +1,2 @@
 1fe3c7a2caa6071e071ba34f587e1555  wmctrl-1.07.tar.gz
+7ddf2aadc48f4300c16160b3c9a7e141  wmctrl_1.07-6.diff.gz


Index: wmctrl.spec
===================================================================
RCS file: /cvs/extras/rpms/wmctrl/devel/wmctrl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wmctrl.spec	6 Sep 2008 21:20:58 -0000	1.3
+++ wmctrl.spec	28 Sep 2008 12:55:29 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           wmctrl
 Version:        1.07
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A command line tool to interact with an X Window Manager
 
 Group:          User Interface/X
 License:        GPLv2+
 URL:            http://sweb.cz/tripie/utils/wmctrl
 Source0:        http://sweb.cz/tripie/utils/wmctrl/dist/%{name}-%{version}.tar.gz
+Patch0:         http://ftp.de.debian.org/debian/pool/main/w/wmctrl/wmctrl_1.07-6.diff.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xorg-x11-proto-devel, libXmu-devel, glib2-devel
@@ -25,6 +26,10 @@
 
 %prep
 %setup -q 
+%patch0 -p1
+iconv -f latin1 -t utf8 ChangeLog > ChangeLog.utf8
+touch -c -r ChangeLog ChangeLog.utf8
+mv ChangeLog.utf8 ChangeLog
 
 %build
 %configure 
@@ -48,6 +53,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Patrice Dumas <pertusus at free.fr> - 1.07-5
+- apply debian patcheset, to fix #426383
+
 * Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.07-4
 - fix license tag
 



From pertusus at fedoraproject.org  Sun Sep 28 13:05:22 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Sun, 28 Sep 2008 13:05:22 +0000 (UTC)
Subject: rpms/wmctrl/F-9 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wmctrl.spec, 
	1.2, 1.3
Message-ID: <20080928130522.AF17A70118@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/wmctrl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19020

Modified Files:
	.cvsignore sources wmctrl.spec 
Log Message:
* Sun Sep 28 2008 Patrice Dumas <pertusus at free.fr> - 1.07-5
- apply debian patcheset, to fix #426383



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wmctrl/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Oct 2006 05:16:02 -0000	1.2
+++ .cvsignore	28 Sep 2008 13:04:52 -0000	1.3
@@ -1 +1,2 @@
 wmctrl-1.07.tar.gz
+wmctrl_1.07-6.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wmctrl/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Oct 2006 05:16:02 -0000	1.2
+++ sources	28 Sep 2008 13:04:52 -0000	1.3
@@ -1 +1,2 @@
 1fe3c7a2caa6071e071ba34f587e1555  wmctrl-1.07.tar.gz
+7ddf2aadc48f4300c16160b3c9a7e141  wmctrl_1.07-6.diff.gz


Index: wmctrl.spec
===================================================================
RCS file: /cvs/extras/rpms/wmctrl/F-9/wmctrl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wmctrl.spec	19 Feb 2008 02:47:23 -0000	1.2
+++ wmctrl.spec	28 Sep 2008 13:04:52 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           wmctrl
 Version:        1.07
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        A command line tool to interact with an X Window Manager
 
 Group:          User Interface/X
-License:        GPL
+License:        GPLv2+
 URL:            http://sweb.cz/tripie/utils/wmctrl
 Source0:        http://sweb.cz/tripie/utils/wmctrl/dist/%{name}-%{version}.tar.gz
+Patch0:         http://ftp.de.debian.org/debian/pool/main/w/wmctrl/wmctrl_1.07-6.diff.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xorg-x11-proto-devel, libXmu-devel, glib2-devel
@@ -25,6 +26,10 @@
 
 %prep
 %setup -q 
+%patch0 -p1
+iconv -f latin1 -t utf8 ChangeLog > ChangeLog.utf8
+touch -c -r ChangeLog ChangeLog.utf8
+mv ChangeLog.utf8 ChangeLog
 
 %build
 %configure 
@@ -48,6 +53,12 @@
 
 
 %changelog
+* Sun Sep 28 2008 Patrice Dumas <pertusus at free.fr> - 1.07-5
+- apply debian patcheset, to fix #426383
+
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.07-4
+- fix license tag
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.07-3
 - Autorebuild for GCC 4.3
 



From drago01 at fedoraproject.org  Sun Sep 28 13:11:40 2008
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Sun, 28 Sep 2008 13:11:40 +0000 (UTC)
Subject: rpms/iw/devel .cvsignore,1.2,1.3 iw.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20080928131140.D78BA70118@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/iw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19952

Modified Files:
	.cvsignore iw.spec sources 
Log Message:
update to 0.9.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Jul 2008 17:21:23 -0000	1.2
+++ .cvsignore	28 Sep 2008 13:11:10 -0000	1.3
@@ -1 +1 @@
-iw-0.0.20080703gitf6fc7dc.tar.bz2
+iw-0.9.5.tar.bz2


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/iw.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iw.spec	22 Jul 2008 17:21:23 -0000	1.1
+++ iw.spec	28 Sep 2008 13:11:10 -0000	1.2
@@ -1,8 +1,6 @@
-%define git_date 20080703
-%define git_version f6fc7dc
 Name:           iw
-Version:        0.0
-Release:        0.3.%{git_date}git%{git_version}%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
 Group:          System Environment/Base
@@ -11,8 +9,8 @@
 # Generate tarball:
 # git clone http://git.sipsolutions.net/iw.git
 # cd iw
-# git-archive --format=tar --prefix=iw/ %{git_version} | bzip2 > iw-0.0.`date +%Y%m%d`git%{git_version}.tar.bz2
-Source0:        iw-0.0.%{git_date}git%{git_version}.tar.bz2
+# git-archive --format=tar --prefix=iw-%{version}/ v%{version} | bzip2 > iw-%{version}.tar.bz2
+Source0:        iw-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: kernel-devel >= 2.6.24 
@@ -25,7 +23,7 @@
 only because most new wireless devices being sold are now SoftMAC.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 
 %build
@@ -48,6 +46,9 @@
 %doc COPYING
 
 %changelog
+* Sun Sep 28 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.9.5-1
+- Update to 0.9.5
+
 * Tue Jul 22 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.0-0.3.20080703gitf6fc7dc
 - Add commitid to version
 - Use versioned buildrequires for kernel-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Jul 2008 17:21:23 -0000	1.2
+++ sources	28 Sep 2008 13:11:10 -0000	1.3
@@ -1 +1 @@
-afb357f3eb058c72385e7256a36660a2  iw-0.0.20080703gitf6fc7dc.tar.bz2
+65582a45f016f0e699f1816265a222d2  iw-0.9.5.tar.bz2



From drago01 at fedoraproject.org  Sun Sep 28 13:15:41 2008
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Sun, 28 Sep 2008 13:15:41 +0000 (UTC)
Subject: rpms/iw/devel iw.spec,1.2,1.3
Message-ID: <20080928131541.7D66D70118@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/iw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20522

Modified Files:
	iw.spec 
Log Message:
fix br


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/iw.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iw.spec	28 Sep 2008 13:11:10 -0000	1.2
+++ iw.spec	28 Sep 2008 13:15:10 -0000	1.3
@@ -14,7 +14,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: kernel-devel >= 2.6.24 
-BuildRequires: libnl-devel      
+BuildRequires: libnl-devel
+BuildRequires: pkgconfig      
 
 %description
 iw is a new nl80211 based CLI configuration utility for wireless devices.



From drago01 at fedoraproject.org  Sun Sep 28 13:18:48 2008
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Sun, 28 Sep 2008 13:18:48 +0000 (UTC)
Subject: rpms/iw/devel iw.spec,1.3,1.4
Message-ID: <20080928131848.53A1F70118@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/iw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20976

Modified Files:
	iw.spec 
Log Message:
fix br


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/iw.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iw.spec	28 Sep 2008 13:15:10 -0000	1.3
+++ iw.spec	28 Sep 2008 13:18:18 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           iw
 Version:        0.9.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
 Group:          System Environment/Base
@@ -47,6 +47,9 @@
 %doc COPYING
 
 %changelog
+* Sun Sep 28 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.9.5-2
+- Fix BuildRequires
+
 * Sun Sep 28 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.9.5-1
 - Update to 0.9.5
 



From drago01 at fedoraproject.org  Sun Sep 28 13:24:08 2008
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Sun, 28 Sep 2008 13:24:08 +0000 (UTC)
Subject: rpms/iw/devel iw.spec,1.4,1.5
Message-ID: <20080928132408.BBF9F70118@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/iw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21746

Modified Files:
	iw.spec 
Log Message:
use upstream provided tarball


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/iw.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- iw.spec	28 Sep 2008 13:18:18 -0000	1.4
+++ iw.spec	28 Sep 2008 13:23:38 -0000	1.5
@@ -1,16 +1,12 @@
 Name:           iw
 Version:        0.9.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
 Group:          System Environment/Base
 License:        BSD
-URL:            http://www.linuxwireless.org/en/users/Documentation/iw
-# Generate tarball:
-# git clone http://git.sipsolutions.net/iw.git
-# cd iw
-# git-archive --format=tar --prefix=iw-%{version}/ v%{version} | bzip2 > iw-%{version}.tar.bz2
-Source0:        iw-%{version}.tar.bz2
+URL:		 http://www.linuxwireless.org/en/users/Documentation/iw
+Source0:	 http://wireless.kernel.org/download/iw/iw-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: kernel-devel >= 2.6.24 
@@ -47,6 +43,9 @@
 %doc COPYING
 
 %changelog
+* Sun Sep 28 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.9.5-3
+- Use offical tarball
+
 * Sun Sep 28 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.9.5-2
 - Fix BuildRequires
 



From pkgdb at fedoraproject.org  Sun Sep 28 13:35:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:35:31 +0000
Subject: [pkgdb] pidgin-facebookchat ownership updated
Message-ID: <20080928133532.297D1208D73@bastion.fedora.phx.redhat.com>

Package pidgin-facebookchat in Fedora 8 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-facebookchat



From pkgdb at fedoraproject.org  Sun Sep 28 13:35:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:35:34 +0000
Subject: [pkgdb] pidgin-facebookchat ownership updated
Message-ID: <20080928133534.D167E208DA8@bastion.fedora.phx.redhat.com>

Package pidgin-facebookchat in Fedora 9 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-facebookchat



From pkgdb at fedoraproject.org  Sun Sep 28 13:35:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:35:26 +0000
Subject: [pkgdb] pidgin-facebookchat ownership updated
Message-ID: <20080928133526.28810208DA5@bastion.fedora.phx.redhat.com>

Package pidgin-facebookchat in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-facebookchat



From denis at fedoraproject.org  Sun Sep 28 13:39:57 2008
From: denis at fedoraproject.org (Denis Leroy)
Date: Sun, 28 Sep 2008 13:39:57 +0000 (UTC)
Subject: rpms/transmission/devel transmission-1.34-libevent.patch, NONE,
	1.1 .cvsignore, 1.22, 1.23 sources, 1.22, 1.23 transmission.spec,
	1.26, 1.27
Message-ID: <20080928133957.5DA5D70118@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/transmission/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23950

Modified Files:
	.cvsignore sources transmission.spec 
Added Files:
	transmission-1.34-libevent.patch 
Log Message:
- Update to upstream 1.34
- Added patch to link with distributed libevent library


transmission-1.34-libevent.patch:

--- NEW FILE transmission-1.34-libevent.patch ---
diff -u -r transmission-1.34.orig/configure transmission-1.34/configure
--- transmission-1.34.orig/configure	2008-09-17 03:38:32.000000000 +0200
+++ transmission-1.34/configure	2008-09-28 11:42:58.000000000 +0200
@@ -996,7 +996,6 @@
 LIBNOTIFY_LIBS
 DBUS_GLIB_CFLAGS
 DBUS_GLIB_LIBS'
-ac_subdirs_all='third-party/libevent'
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -23190,15 +23189,6 @@
 
 
 
-subdirs="$subdirs third-party/libevent"
-
-{ echo "$as_me:$LINENO: invoking libevent's configure script" >&5
-echo "$as_me: invoking libevent's configure script" >&6;}
-LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent"
-
-
-
-
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for GTK" >&5
diff -u -r transmission-1.34.orig/daemon/remote.c transmission-1.34/daemon/remote.c
--- transmission-1.34.orig/daemon/remote.c	2008-09-17 03:37:40.000000000 +0200
+++ transmission-1.34/daemon/remote.c	2008-09-28 11:45:48.000000000 +0200
@@ -17,7 +17,7 @@
 
 #include <unistd.h> /* getcwd */
 
-#include <libevent/event.h>
+#include <event.h>
 #include <curl/curl.h>
 
 #include <libtransmission/transmission.h>
diff -u -r transmission-1.34.orig/gtk/tr-io.c transmission-1.34/gtk/tr-io.c
--- transmission-1.34.orig/gtk/tr-io.c	2008-09-17 03:37:35.000000000 +0200
+++ transmission-1.34/gtk/tr-io.c	2008-09-28 11:45:59.000000000 +0200
@@ -30,7 +30,7 @@
 
 #include <glib.h>
 
-#include <libevent/evutil.h> /* evutil_make_socket_nonblocking */
+#include <evutil.h> /* evutil_make_socket_nonblocking */
 
 #include "tr-io.h"
 #include "util.h"
diff -u -r transmission-1.34.orig/gtk/util.c transmission-1.34/gtk/util.c
--- transmission-1.34.orig/gtk/util.c	2008-09-17 03:37:35.000000000 +0200
+++ transmission-1.34/gtk/util.c	2008-09-28 11:46:07.000000000 +0200
@@ -37,7 +37,7 @@
 #include <dbus/dbus-glib.h>
 #endif
 
-#include <libevent/evhttp.h>
+#include <evhttp.h>
 
 #include <libtransmission/transmission.h> /* TR_RATIO_NA, TR_RATIO_INF */
 #include <libtransmission/utils.h> /* tr_inf */
diff -u -r transmission-1.34.orig/libtransmission/clients.c transmission-1.34/libtransmission/clients.c
--- transmission-1.34.orig/libtransmission/clients.c	2008-09-17 03:37:35.000000000 +0200
+++ transmission-1.34/libtransmission/clients.c	2008-09-28 11:46:20.000000000 +0200
@@ -17,7 +17,7 @@
 #include <stdlib.h> /* strtol */
 #include <string.h>
 
-#include <libevent/event.h> /* evbuffer */
+#include <event.h> /* evbuffer */
 
 #include "transmission.h"
 #include "clients.h"
diff -u -r transmission-1.34.orig/libtransmission/rpc-server.c transmission-1.34/libtransmission/rpc-server.c
--- transmission-1.34.orig/libtransmission/rpc-server.c	2008-09-17 03:37:35.000000000 +0200
+++ transmission-1.34/libtransmission/rpc-server.c	2008-09-28 11:46:28.000000000 +0200
@@ -18,7 +18,7 @@
 
 #include <unistd.h> /* unlink */
 
-#include <libevent/event.h>
+#include <event.h>
 #include <shttpd/defs.h> /* edit_passwords */
 #include <shttpd/shttpd.h>
 
diff -u -r transmission-1.34.orig/third-party/Makefile.in transmission-1.34/third-party/Makefile.in
--- transmission-1.34.orig/third-party/Makefile.in	2008-09-17 03:38:34.000000000 +0200
+++ transmission-1.34/third-party/Makefile.in	2008-09-28 11:43:13.000000000 +0200
@@ -246,7 +246,6 @@
 top_srcdir = @top_srcdir@
 transmissionlocaledir = @transmissionlocaledir@
 SUBDIRS = \
-    libevent \
     libnatpmp \
     miniupnp \
     shttpd
diff -u -r transmission-1.34.orig/libtransmission/net.c transmission-1.34/libtransmission/net.c
--- transmission-1.34.orig/libtransmission/net.c	2008-09-17 03:37:35.000000000 +0200
+++ transmission-1.34/libtransmission/net.c	2008-09-28 12:05:39.000000000 +0200
@@ -37,6 +37,7 @@
 #include <fcntl.h>
 #endif
 
+#include <stdarg.h>
 #include <evutil.h>
 
 #include "transmission.h"
diff -u -r transmission-1.34.orig/cli/Makefile.in transmission-1.34/cli/Makefile.in
--- transmission-1.34.orig/cli/Makefile.in	2008-09-17 03:38:34.000000000 +0200
+++ transmission-1.34/cli/Makefile.in	2008-09-28 15:07:43.000000000 +0200
@@ -53,7 +53,6 @@
 am__DEPENDENCIES_1 =
 transmissioncli_DEPENDENCIES =  \
 	$(top_builddir)/libtransmission/libtransmission.a \
-	$(top_builddir)/third-party/libevent/libevent_core.la \
 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
 	$(top_builddir)/third-party/shttpd/libshttpd.a \
@@ -273,7 +272,7 @@
 transmissioncli_SOURCES = cli.c
 transmissioncli_LDADD = \
   $(top_builddir)/libtransmission/libtransmission.a \
-  $(top_builddir)/third-party/libevent/libevent_core.la \
+  -levent -levent_core \
   $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
   $(top_builddir)/third-party/miniupnp/libminiupnp.a \
   $(top_builddir)/third-party/shttpd/libshttpd.a \
diff -u -r transmission-1.34.orig/daemon/Makefile.in transmission-1.34/daemon/Makefile.in
--- transmission-1.34.orig/daemon/Makefile.in	2008-09-17 03:38:34.000000000 +0200
+++ transmission-1.34/daemon/Makefile.in	2008-09-28 15:07:01.000000000 +0200
@@ -58,7 +58,6 @@
 	$(top_builddir)/third-party/shttpd/libshttpd.a \
 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-	$(top_builddir)/third-party/libevent/libevent_core.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_transmission_remote_OBJECTS = remote.$(OBJEXT)
@@ -69,7 +68,6 @@
 	$(top_builddir)/third-party/shttpd/libshttpd.a \
 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-	$(top_builddir)/third-party/libevent/libevent_core.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. at am__isrc@
@@ -293,7 +291,7 @@
     $(top_builddir)/third-party/shttpd/libshttpd.a \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-    $(top_builddir)/third-party/libevent/libevent_core.la \
+    -levent -levent_core \
     $(INTLLIBS) \
     $(OPENSSL_LIBS) \
     $(LIBCURL_LIBS) \
diff -u -r transmission-1.34.orig/gtk/Makefile.in transmission-1.34/gtk/Makefile.in
--- transmission-1.34.orig/gtk/Makefile.in	2008-09-17 03:38:34.000000000 +0200
+++ transmission-1.34/gtk/Makefile.in	2008-09-28 15:08:03.000000000 +0200
@@ -64,7 +64,6 @@
 am__DEPENDENCIES_1 =
 transmission_DEPENDENCIES =  \
 	$(top_builddir)/libtransmission/libtransmission.a \
-	$(top_builddir)/third-party/libevent/libevent_core.la \
 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
 	$(top_builddir)/third-party/shttpd/libshttpd.a \
@@ -370,7 +369,7 @@
 dist_man_MANS = transmission.1
 transmission_LDADD = \
     $(top_builddir)/libtransmission/libtransmission.a \
-    $(top_builddir)/third-party/libevent/libevent_core.la \
+    -levent -levent_core \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     $(top_builddir)/third-party/shttpd/libshttpd.a \
diff -u -r transmission-1.34.orig/libtransmission/Makefile.in transmission-1.34/libtransmission/Makefile.in
--- transmission-1.34.orig/libtransmission/Makefile.in	2008-09-17 03:38:34.000000000 +0200
+++ transmission-1.34/libtransmission/Makefile.in	2008-09-28 15:05:47.000000000 +0200
@@ -83,7 +83,6 @@
 	$(top_builddir)/third-party/shttpd/libshttpd.a \
 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-	$(top_builddir)/third-party/libevent/libevent.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 bencode_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -420,7 +419,7 @@
     $(top_builddir)/third-party/shttpd/libshttpd.a \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-    $(top_builddir)/third-party/libevent/libevent.la \
+    -levent -levent_core \
     $(INTLLIBS) \
     $(LIBCURL_LIBS) \
     $(OPENSSL_LIBS) \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	24 Aug 2008 13:16:58 -0000	1.22
+++ .cvsignore	28 Sep 2008 13:39:27 -0000	1.23
@@ -1 +1 @@
-transmission-1.33.tar.bz2
+transmission-1.34.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	24 Aug 2008 13:16:58 -0000	1.22
+++ sources	28 Sep 2008 13:39:27 -0000	1.23
@@ -1 +1 @@
-097a538a10e41c9e631ef23b11a2ddfa  transmission-1.33.tar.bz2
+c4ef93639bcb895c1b3d279b2f4e27b3  transmission-1.34.tar.bz2


Index: transmission.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/devel/transmission.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- transmission.spec	8 Sep 2008 21:41:22 -0000	1.26
+++ transmission.spec	28 Sep 2008 13:39:27 -0000	1.27
@@ -1,7 +1,7 @@
 
 Name:           transmission
-Version:        1.33
-Release:        2%{?dist}
+Version:        1.34
+Release:        1%{?dist}
 Summary:        A lightweight GTK+ BitTorrent client
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@
 URL:            http://www.transmissionbt.com/
 Source0:        http://download.m0k.org/transmission/files/transmission-%{version}.tar.bz2
 Patch2:         transmission-1.11-copt.patch
+Patch3:         transmission-1.34-libevent.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel >= 0.9.4
@@ -18,6 +19,7 @@
 BuildRequires:  libnotify-devel >= 0.4.4
 BuildRequires:  curl-devel >= 7.15.0
 BuildRequires:  dbus-glib-devel >= 0.70
+BuildRequires:  libevent-devel >= 1.4.5
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext intltool
 
@@ -31,6 +33,7 @@
 %prep
 %setup -q
 %patch2 -p1 -b .copt
+%patch3 -p1 -b .libevent
 
 
 %build
@@ -73,6 +76,10 @@
 
 
 %changelog
+* Sun Sep 28 2008 Denis Leroy <denis at poolshark.org> - 1.34-1
+- Update to upstream 1.34
+- Added patch to link with distributed libevent library
+
 * Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.33-2
 - fix license tag
 



From pkgdb at fedoraproject.org  Sun Sep 28 13:41:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:41:52 +0000
Subject: [pkgdb] pidgin-facebookchat ownership updated
Message-ID: <20080928134152.C4D95208DA0@bastion.fedora.phx.redhat.com>

Package pidgin-facebookchat in Fedora devel is now owned by mcepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-facebookchat



From pkgdb at fedoraproject.org  Sun Sep 28 13:41:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:41:58 +0000
Subject: [pkgdb] pidgin-facebookchat ownership updated
Message-ID: <20080928134159.00847208D73@bastion.fedora.phx.redhat.com>

Package pidgin-facebookchat in Fedora 8 is now owned by mcepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-facebookchat



From pkgdb at fedoraproject.org  Sun Sep 28 13:42:03 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:42:03 +0000
Subject: [pkgdb] pidgin-facebookchat ownership updated
Message-ID: <20080928134203.19576208DA2@bastion.fedora.phx.redhat.com>

Package pidgin-facebookchat in Fedora 9 is now owned by mcepl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-facebookchat



From pkgdb at fedoraproject.org  Sun Sep 28 13:56:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:56:06 +0000
Subject: [pkgdb] conky ownership updated
Message-ID: <20080928135606.1F529208D73@bastion.fedora.phx.redhat.com>

Package conky in Fedora devel was orphaned by errr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/conky



From pkgdb at fedoraproject.org  Sun Sep 28 13:56:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:56:10 +0000
Subject: [pkgdb] conky ownership updated
Message-ID: <20080928135610.44CFE208DA2@bastion.fedora.phx.redhat.com>

Package conky in Fedora 7 was orphaned by errr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/conky



From pkgdb at fedoraproject.org  Sun Sep 28 13:56:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:56:15 +0000
Subject: [pkgdb] conky ownership updated
Message-ID: <20080928135615.71CF3208DAB@bastion.fedora.phx.redhat.com>

Package conky in Fedora 6 was orphaned by errr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/conky



From pkgdb at fedoraproject.org  Sun Sep 28 13:56:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:56:18 +0000
Subject: [pkgdb] conky ownership updated
Message-ID: <20080928135618.878E6208DAF@bastion.fedora.phx.redhat.com>

Package conky in Fedora 8 was orphaned by errr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/conky



From pkgdb at fedoraproject.org  Sun Sep 28 13:56:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:56:24 +0000
Subject: [pkgdb] conky ownership updated
Message-ID: <20080928135624.DD8CE208DB4@bastion.fedora.phx.redhat.com>

Package conky in Fedora 9 was orphaned by errr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/conky



From pkgdb at fedoraproject.org  Sun Sep 28 13:57:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:57:23 +0000
Subject: [pkgdb] fluxstyle ownership updated
Message-ID: <20080928135723.A61EC208D73@bastion.fedora.phx.redhat.com>

Package fluxstyle in Fedora 9 was orphaned by errr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fluxstyle



From pkgdb at fedoraproject.org  Sun Sep 28 13:57:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:57:28 +0000
Subject: [pkgdb] fluxstyle ownership updated
Message-ID: <20080928135728.7B777208D9F@bastion.fedora.phx.redhat.com>

Package fluxstyle in Fedora 8 was orphaned by errr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fluxstyle



From pkgdb at fedoraproject.org  Sun Sep 28 13:57:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:57:32 +0000
Subject: [pkgdb] fluxstyle ownership updated
Message-ID: <20080928135732.5BCBC208DA7@bastion.fedora.phx.redhat.com>

Package fluxstyle in Fedora 6 was orphaned by errr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fluxstyle



From pkgdb at fedoraproject.org  Sun Sep 28 13:57:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:57:36 +0000
Subject: [pkgdb] fluxstyle ownership updated
Message-ID: <20080928135736.EF5E3208D6F@bastion.fedora.phx.redhat.com>

Package fluxstyle in Fedora 5 was orphaned by errr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fluxstyle



From pkgdb at fedoraproject.org  Sun Sep 28 13:57:43 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:57:43 +0000
Subject: [pkgdb] fluxstyle ownership updated
Message-ID: <20080928135743.A3C28208DA2@bastion.fedora.phx.redhat.com>

Package fluxstyle in Fedora 7 was orphaned by errr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fluxstyle



From pkgdb at fedoraproject.org  Sun Sep 28 13:57:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:57:45 +0000
Subject: [pkgdb] fluxstyle ownership updated
Message-ID: <20080928135745.6B180208DA8@bastion.fedora.phx.redhat.com>

Package fluxstyle in Fedora devel was orphaned by errr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fluxstyle



From pkgdb at fedoraproject.org  Sun Sep 28 13:58:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:58:27 +0000
Subject: [pkgdb] pekwm ownership updated
Message-ID: <20080928135827.C6921208D6F@bastion.fedora.phx.redhat.com>

Package pekwm in Fedora devel was orphaned by errr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pekwm



From pkgdb at fedoraproject.org  Sun Sep 28 13:58:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:58:32 +0000
Subject: [pkgdb] pekwm ownership updated
Message-ID: <20080928135832.68F79208D75@bastion.fedora.phx.redhat.com>

Package pekwm in Fedora 7 was orphaned by errr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pekwm



From pkgdb at fedoraproject.org  Sun Sep 28 13:58:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:58:35 +0000
Subject: [pkgdb] pekwm ownership updated
Message-ID: <20080928135835.9AC14208DA0@bastion.fedora.phx.redhat.com>

Package pekwm in Fedora 5 was orphaned by errr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pekwm



From pkgdb at fedoraproject.org  Sun Sep 28 13:58:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:58:38 +0000
Subject: [pkgdb] pekwm ownership updated
Message-ID: <20080928135838.C9B8F208DA9@bastion.fedora.phx.redhat.com>

Package pekwm in Fedora 6 was orphaned by errr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pekwm



From pkgdb at fedoraproject.org  Sun Sep 28 13:58:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:58:42 +0000
Subject: [pkgdb] pekwm ownership updated
Message-ID: <20080928135842.23593208D6F@bastion.fedora.phx.redhat.com>

Package pekwm in Fedora 8 was orphaned by errr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pekwm



From pkgdb at fedoraproject.org  Sun Sep 28 13:58:45 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 13:58:45 +0000
Subject: [pkgdb] pekwm ownership updated
Message-ID: <20080928135845.950DB208DAA@bastion.fedora.phx.redhat.com>

Package pekwm in Fedora 9 was orphaned by errr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pekwm



From transif at fedoraproject.org  Sun Sep 28 14:30:59 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Sun, 28 Sep 2008 14:30:59 +0000 (UTC)
Subject: comps/po sv.po,1.13,1.14
Message-ID: <20080928143059.481F170118@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30886/po

Modified Files:
	sv.po 
Log Message:
    2008-09-28  G??ran Uddeborg <goeran at uddeborg.se> (via
goeran at fedoraproject.org)
    
      * po/sv.po: Swedish translation updated.
    



Index: sv.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sv.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sv.po	17 Sep 2008 22:44:37 -0000	1.13
+++ sv.po	28 Sep 2008 14:30:28 -0000	1.14
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-04-08 11:47+0200\n"
+"POT-Creation-Date: 2008-09-28 11:40+0000\n"
+"PO-Revision-Date: 2008-09-28 16:27+0200\n"
 "Last-Translator: G??ran Uddeborg <goeran at uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -1139,91 +1139,76 @@
 msgstr "Paket med ??ldre bildpunkts- och vektortypsnitt"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44
-#, fuzzy
 msgid "Esperanto Support"
-msgstr "St??d f??r tyska"
+msgstr "St??d f??r esperanto"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95
-#, fuzzy
 msgid "Kashubian Support"
-msgstr "St??d f??r bosniska"
+msgstr "St??d f??r kasjubiska"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:108
-#, fuzzy
 msgid "Macedonian Support"
-msgstr "St??d f??r mongoliska"
+msgstr "St??d f??r makedonska"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:121
-#, fuzzy
 msgid "Northern Sami Support"
-msgstr "St??d f??r norra sotho"
+msgstr "St??d f??r nordsamiska"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:137
-#, fuzzy
 msgid "SUGAR Desktop Environment"
-msgstr "Skrivbordsmilj??er"
+msgstr "Skrivbordsmilj??n SUGAR"
 
 #: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:138
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
-msgstr ""
+msgstr "SUGAR ??r skrivbordsmilj??n som ??r utvecklad f??r OLPC XO."
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:211
-#, fuzzy
 msgid "Walloon Support"
-msgstr "St??d f??r laotiska"
+msgstr "St??d f??r vallonska"
 
 #: ../comps-f10.xml.in.h:70
-#, fuzzy
 msgid "Haskell Development"
-msgstr "Webbutveckling"
+msgstr "Haskellutveckling"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
-msgstr ""
+msgstr "Inmatningsmetoder"
 
 #: ../comps-f10.xml.in.h:77
 msgid "Input method packages for the input of international text."
-msgstr ""
+msgstr "Paket med inmatningsmetoder f??r inmatning av internationell text."
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "St??d f??r kambodjanska"
+msgstr "St??d f??r kashmiri"
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "St??d f??r koreanska"
+msgstr "St??d f??r konkani"
 
 #: ../comps-f10.xml.in.h:110
-#, fuzzy
 msgid "Maithili Support"
-msgstr "St??d f??r marati"
+msgstr "St??d f??r maithili"
 
 #: ../comps-f10.xml.in.h:117
-#, fuzzy
 msgid "Myanmar (Burmese) Support"
-msgstr "St??d f??r vietnamesiska"
+msgstr "St??d f??r burmesiska"
 
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "St??d f??r hindi"
+msgstr "St??d f??r sindhi"
 
 #: ../comps-f10.xml.in.h:156
-#, fuzzy
 msgid "Support for developing programs in the Haskell programming language."
-msgstr "St??d f??r utveckling av program i programmeringsspr??ket Java."
+msgstr "St??d f??r utveckling av program i programmeringsspr??ket Haskell."
 
 #: ../comps-f10.xml.in.h:163
-#, fuzzy
 msgid "Tajik Support"
-msgstr "St??d f??r thail??ndska"
+msgstr "St??d f??r tajik"
 
 #: ../comps-f10.xml.in.h:205
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "St??d f??r tjeckiska"
+msgstr "St??d f??r uzbekiska"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1300,39 +1285,3 @@
 "This group is a collection of tools and resources of Czech environments."
 msgstr ""
 "Denna grupp ??r en samling av verktyg och resurser f??r tjeckiska milj??er."
-
-#, fuzzy
-#~ msgid "British Support"
-#~ msgstr "St??d f??r iriska"
-
-#, fuzzy
-#~ msgid "Cluster Storage"
-#~ msgstr "Klusterst??d."
-
-#, fuzzy
-#~ msgid "Clustering Support."
-#~ msgstr "Klusterst??d."
-
-#, fuzzy
-#~ msgid "Single Node GFS Support"
-#~ msgstr "St??d f??r kinesiska"
-
-#, fuzzy
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "Dessa paket ger kompatibilitet med tidigare utg??vor."
-
-#, fuzzy
-#~ msgid "Multimedia applications"
-#~ msgstr "Program"
-
-#, fuzzy
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr ""
-#~ "Paket som tillhandah??ller funktionalitet f??r utveckling och skapande av "
-#~ "applikationer."
-
-#, fuzzy
-#~ msgid "Virtualization Support."
-#~ msgstr "Virtualisering"



From pkgdb at fedoraproject.org  Sun Sep 28 15:15:02 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 15:15:02 +0000
Subject: [pkgdb] conky ownership updated
Message-ID: <20080928151502.C646D208D74@bastion.fedora.phx.redhat.com>

Package conky in Fedora devel is now owned by mlichvar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/conky



From pkgdb at fedoraproject.org  Sun Sep 28 15:15:10 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 15:15:10 +0000
Subject: [pkgdb] conky ownership updated
Message-ID: <20080928151511.11CE1208DA0@bastion.fedora.phx.redhat.com>

Package conky in Fedora 8 is now owned by mlichvar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/conky



From pkgdb at fedoraproject.org  Sun Sep 28 15:15:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 15:15:15 +0000
Subject: [pkgdb] conky ownership updated
Message-ID: <20080928151515.32528208DA2@bastion.fedora.phx.redhat.com>

Package conky in Fedora 9 is now owned by mlichvar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/conky



From cebbert at fedoraproject.org  Sun Sep 28 15:26:09 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun, 28 Sep 2008 15:26:09 +0000 (UTC)
Subject: rpms/kernel/devel config-ia64,1.4,1.5
Message-ID: <20080928152609.6B1CC70118@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5298

Added Files:
	config-ia64 
Log Message:
restore missing config to fix make srpm


Index: config-ia64
===================================================================
RCS file: config-ia64
diff -N config-ia64
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ config-ia64	28 Sep 2008 15:25:39 -0000	1.5
@@ -0,0 +1,2 @@
+CONFIG_CRASH_DUMP=y
+CONFIG_PROC_VMCORE=y



From rmyers at fedoraproject.org  Sun Sep 28 17:33:28 2008
From: rmyers at fedoraproject.org (Rob Myers)
Date: Sun, 28 Sep 2008 17:33:28 +0000 (UTC)
Subject: rpms/eclipse-egit/devel eclipse-egit.spec,1.13,1.14
Message-ID: <20080928173328.5BBEE70118@cvs1.fedora.phx.redhat.com>

Author: rmyers

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22617

Modified Files:
	eclipse-egit.spec 
Log Message:
Move files and update build for Eclipse SDK 3.4 (patch from overholt, thanks)


Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- eclipse-egit.spec	17 Jul 2008 15:11:03 -0000	1.13
+++ eclipse-egit.spec	28 Sep 2008 17:32:58 -0000	1.14
@@ -4,7 +4,7 @@
 Summary:          Eclipse Git plug-in
 Name:             eclipse-egit
 Version:          0.3.1
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          EPL and GPLv2 and LGPLv2
 URL:              http://repo.or.cz/w/egit.git
 Group:            Development/Tools
@@ -40,35 +40,16 @@
 %setup -q -c 
 
 %build
-# Copy the SDK for build
-/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{_datadir}/eclipse
-SDK=$(cd SDK > /dev/null && pwd)
-
-# Eclipse may try to write to the home directory.
-mkdir home
-homedir=$(cd home > /dev/null && pwd)
-
-# build the main egit feature
-java -cp $SDK/startup.jar                              \
-     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration  \
-     org.eclipse.core.launcher.Main                    \
-     -application org.eclipse.ant.core.antRunner       \
-     -Dtype=feature                                    \
-     -Did=org.spearce.egit                             \
-     -DbaseLocation=$SDK                               \
-     -DjavacSource=1.5  -DjavacTarget=1.5              \
-     -DsourceDirectory=$(pwd)                          \
-     -DbuildDirectory=$(pwd)/build                     \
-     -Dbuilder=%{_datadir}/eclipse/plugins/org.eclipse.pde.build/templates/package-build \
-     -f %{_datadir}/eclipse/plugins/org.eclipse.pde.build/scripts/build.xml \
-     -vmargs -Duser.home=$homedir
+%{_libdir}/eclipse/buildscripts/pdebuild \
+   -a "-DjavacSource=1.5 -DjavacTarget=1.5"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d -m755 $RPM_BUILD_ROOT/%{_datadir}/eclipse
+installDir=$RPM_BUILD_ROOT/%{_datadir}/eclipse/dropins/egit
+install -d -m755 $installDir
 
 # egit main feature
-unzip -q -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \
+unzip -q -d $installDir/ \
             build/rpmBuild/org.spearce.egit.zip
 
 %if %{gcj_support}
@@ -85,16 +66,16 @@
 
 %files
 %defattr(-,root,root,-)
-%{_datadir}/eclipse/features/org.spearce.egit*
-%{_datadir}/eclipse/plugins/org.spearce.egit*
-%{_datadir}/eclipse/plugins/org.spearce.egit.core*
-%{_datadir}/eclipse/plugins/org.spearce.egit.ui*
-%{_datadir}/eclipse/plugins/org.spearce.jgit*
+%{_datadir}/eclipse/dropins/egit
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt at redhat.com> 0.3.1-2
+- Move files and update build for Eclipse SDK 3.4
+- Use pdebuild
+
 * Thu Jul 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.1-1
 - fix license tag
 



From remi at fedoraproject.org  Sun Sep 28 17:47:13 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 28 Sep 2008 17:47:13 +0000 (UTC)
Subject: rpms/glpi/EL-4 glpi-rev7340.patch,NONE,1.1 glpi.spec,1.6,1.7
Message-ID: <20080928174713.60E2A70118@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25460

Modified Files:
	glpi.spec 
Added Files:
	glpi-rev7340.patch 
Log Message:
mysql 4.1 fix

glpi-rev7340.patch:

--- NEW FILE glpi-rev7340.patch ---
Index: inc/ocsng.function.php
===================================================================
--- inc/ocsng.function.php	(r??vision 7334)
+++ inc/ocsng.function.php	(copie de travail)
@@ -1249,7 +1249,7 @@
 			
 		// workaround to avoid duplicate when synchro occurs during an inventory 
 		// "after" insert in ocsweb.hardware  and "before" insert in ocsweb.deleted_equiv 
-		$query_ocs .= " AND LASTDATE < TIMESTAMPADD(MINUTE,-3,now()) ";
+		$query_ocs .= " AND TIMESTAMP(LASTDATE) < (NOW()-180) ";
 		
 		
 		if (!empty ($cfg_ocs["tag_limit"])) {


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-4/glpi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- glpi.spec	15 Sep 2008 18:26:53 -0000	1.6
+++ glpi.spec	28 Sep 2008 17:46:43 -0000	1.7
@@ -6,7 +6,7 @@
 
 Name:           glpi
 Version:        0.71.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
@@ -22,6 +22,9 @@
 # Avoid SELinux AVC when testing write access to log file.
 Patch0:         glpi-check.patch
 
+# MySQL 4.1 bug https://dev.indepnet.net/glpi/ticket/1148
+Patch1:         glpi-rev7340.patch
+
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -66,6 +69,7 @@
 %setup -q -n glpi
 
 %patch0 -p0
+%patch1 -p0
 
 %if 0%{?rhel} == 4
 
@@ -228,6 +232,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.2-1.el4.1
+- Fix MySQL 4.1 compatibility issue
+
 * Mon Sep 15 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.2-1
 - update to 0.71.2 bugfix
 



From eponyme at fedoraproject.org  Sun Sep 28 17:48:57 2008
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 28 Sep 2008 17:48:57 +0000 (UTC)
Subject: rpms/trustyrc/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 trustyrc.spec, 1.1, 1.2
Message-ID: <20080928174857.0E04E70118@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/trustyrc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25960

Modified Files:
	.cvsignore sources trustyrc.spec 
Log Message:
Update to 0.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jul 2008 19:47:41 -0000	1.2
+++ .cvsignore	28 Sep 2008 17:48:26 -0000	1.3
@@ -1 +1 @@
-trustyrc-0.1.1.tar.gz
+trustyrc-0.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jul 2008 19:47:41 -0000	1.2
+++ sources	28 Sep 2008 17:48:26 -0000	1.3
@@ -1 +1 @@
-1cc0dfef27d2cfa48c3511f01ba4d78a  trustyrc-0.1.1.tar.gz
+883da45fa4a1aa52e49cf408ad4b13ff  trustyrc-0.1.2.tar.gz


Index: trustyrc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/devel/trustyrc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trustyrc.spec	6 Jul 2008 19:47:41 -0000	1.1
+++ trustyrc.spec	28 Sep 2008 17:48:26 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           trustyrc
-Version:        0.1.1        
-Release:        2%{?dist}
+Version:        0.1.2        
+Release:        1%{?dist}
 Summary:        Fully modular IRC robot
 
 Group:          Applications/Internet
@@ -49,22 +49,15 @@
 
 %prep
 %setup -q
-# LIGNE PLUS NECESSAIRE EN 0.1.2 (chmod fait sur les sources upstream)
-chmod 0644 src/*.{cpp,h} src/plugins/*.{cpp,h} src/plugins/base_plugin/*.{cpp,h}
-sed -i -e s@"CXXFLAGS=.*"@"CXXFLAGS+=-W -ansi -pedantic -fPIC"@  Makefile
 
 %build
 CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
-make %{?_smp_mflags} HAVE_TINYXML=yes
+make %{?_smp_mflags} HAVE_TINYXML=yes PARANOID=no
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# sed because of /lib/
-sed -i -e s@"LIBDIR=\$(DESTDIR).*"@"LIBDIR=$RPM_BUILD_ROOT%{_libdir}/%{name}"@ Makefile
-# sed to don't use RPM_BUID_ROOT in configuration file
-sed -i -e s@"\$(LIBDIR)\@"@"%{_libdir}/%{name}\@"@ Makefile
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} HAVE_TINYXML=yes
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir}  HAVE_TINYXML=yes PARANOID=no
 
 
 %clean
@@ -79,7 +72,9 @@
 
 %files plugins
 %defattr(-,root,root,-)
+%doc HOWTO.plugins
 %dir %{_libdir}/%{name}
+%{_libdir}/%{name}/antiflood.so
 %{_libdir}/%{name}/ping.so
 %{_libdir}/%{name}/postconnect.so
 %{_libdir}/%{name}/moderation.so
@@ -109,6 +104,8 @@
 %{_libdir}/%{name}/trad.so
 
 %changelog
+* Sun Sep 28 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.2-1
+- rebuild for 0.1.2
 * Fri Jun 27 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.1-2
 - Change buildrequires for curl (only on plugins-extras)
 - Licence update



From mtasaka at fedoraproject.org  Sun Sep 28 17:49:35 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 28 Sep 2008 17:49:35 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.66, 1.67 cairo-dock.spec, 1.83, 
	1.84 sources, 1.66, 1.67
Message-ID: <20080928174935.A323E70118@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26221

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Mon Sep 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1323



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore	25 Sep 2008 13:22:17 -0000	1.66
+++ .cvsignore	28 Sep 2008 17:49:05 -0000	1.67
@@ -1 +1 @@
-cairo-dock-sources-svn1319_trunk.tar.bz2
+cairo-dock-sources-svn1323_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- cairo-dock.spec	25 Sep 2008 13:22:17 -0000	1.83
+++ cairo-dock.spec	28 Sep 2008 17:49:05 -0000	1.84
@@ -7,7 +7,7 @@
 # For now build only stable plugin
 %define		build_other	1
 
-%define		tarballver	svn1319_trunk
+%define		tarballver	svn1323_trunk
 %define		mainver		1.6.3
 %undefine		betaver
 %define		build_gecko	1
@@ -608,8 +608,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Thu Sep 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1319
+* Mon Sep 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1323
 
 * Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.3-1
 - 1.6.2.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	25 Sep 2008 13:22:17 -0000	1.66
+++ sources	28 Sep 2008 17:49:05 -0000	1.67
@@ -1 +1 @@
-3ebccb009e3140caa1f39fded8e19b3d  cairo-dock-sources-svn1319_trunk.tar.bz2
+d2945901736b6c94573e41b2b73f3748  cairo-dock-sources-svn1323_trunk.tar.bz2



From remi at fedoraproject.org  Sun Sep 28 17:50:47 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 28 Sep 2008 17:50:47 +0000 (UTC)
Subject: rpms/glpi-mass-ocs-import/EL-4 glpi-rev7301.patch, NONE,
	1.1 glpi-mass-ocs-import.spec, 1.2, 1.3
Message-ID: <20080928175047.5E53E70118@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-mass-ocs-import/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26707

Modified Files:
	glpi-mass-ocs-import.spec 
Added Files:
	glpi-rev7301.patch 
Log Message:
mysql 4.1 fix

glpi-rev7301.patch:

--- NEW FILE glpi-rev7301.patch ---
Index: scripts/ocsng_fullsync.php
===================================================================
--- scripts/ocsng_fullsync.php	(r??vision 7200)
+++ scripts/ocsng_fullsync.php	(copie de travail)
@@ -268,7 +268,7 @@
 		
 	$query_ocs = "SELECT ID FROM hardware INNER JOIN accountinfo ON (hardware.ID = accountinfo.HARDWARE_ID) "
 		." WHERE ((CHECKSUM&".intval($cfg_ocs["checksum"]).")>0 OR LASTDATE > '".$server->fields["max_glpi_date"]."') "
-		." AND LASTDATE < TIMESTAMPADD(MINUTE,-3,now())"
+		." AND TIMESTAMP(LASTDATE) < (NOW()-180)"
 		." AND ID<=".intval($server->fields["max_ocs_id"])." $where_multi_thread $where_limit";
 
 	if (!empty ($cfg_ocs["tag_limit"])) {


Index: glpi-mass-ocs-import.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/EL-4/glpi-mass-ocs-import.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glpi-mass-ocs-import.spec	15 Sep 2008 18:40:02 -0000	1.2
+++ glpi-mass-ocs-import.spec	28 Sep 2008 17:50:17 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           glpi-mass-ocs-import
 Version:        1.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        GLPI Plugin for OCS Massive import
 Summary(fr):    Extension GLPI d'import en masse OCS
 
@@ -14,6 +14,9 @@
 Source0:        http://www.glpi-project.org/IMG/gz/glpi-%{pluginname}-%{version}.tar.gz
 Source1:        %{name}.conf
 
+# MySQL 4.1 bug https://dev.indepnet.net/glpi/ticket/1148
+Patch0:         glpi-rev7301.patch
+
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -36,6 +39,10 @@
 %prep
 %setup -q -c 
 
+cd %{pluginname}
+%patch0 -p0
+cd ..
+
 cat >README.fedora <<EOF
 
 Remember to Install this extension in the Application.
@@ -111,6 +118,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Remi Collet <Fedora at FamilleCollet.com> - 1.2-1.el4.1
+- Fix MySQL 4.1 compatibility issue
+
 * Sat Jul 12 2008 Remi Collet <Fedora at FamilleCollet.com> - 1.2-1
 - update to 1.2 for glpi 0.71
 



From eponyme at fedoraproject.org  Sun Sep 28 17:52:20 2008
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 28 Sep 2008 17:52:20 +0000 (UTC)
Subject: rpms/trustyrc/F-8 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 trustyrc.spec, 1.1, 1.2
Message-ID: <20080928175220.63A1870118@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/trustyrc/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27102

Modified Files:
	.cvsignore sources trustyrc.spec 
Log Message:
Update to 0.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jul 2008 19:50:38 -0000	1.2
+++ .cvsignore	28 Sep 2008 17:51:50 -0000	1.3
@@ -1 +1 @@
-trustyrc-0.1.1.tar.gz
+trustyrc-0.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jul 2008 19:50:38 -0000	1.2
+++ sources	28 Sep 2008 17:51:50 -0000	1.3
@@ -1 +1 @@
-1cc0dfef27d2cfa48c3511f01ba4d78a  trustyrc-0.1.1.tar.gz
+883da45fa4a1aa52e49cf408ad4b13ff  trustyrc-0.1.2.tar.gz


Index: trustyrc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-8/trustyrc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trustyrc.spec	6 Jul 2008 19:50:38 -0000	1.1
+++ trustyrc.spec	28 Sep 2008 17:51:50 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           trustyrc
-Version:        0.1.1        
-Release:        2%{?dist}
+Version:        0.1.2        
+Release:        1%{?dist}
 Summary:        Fully modular IRC robot
 
 Group:          Applications/Internet
@@ -49,22 +49,15 @@
 
 %prep
 %setup -q
-# LIGNE PLUS NECESSAIRE EN 0.1.2 (chmod fait sur les sources upstream)
-chmod 0644 src/*.{cpp,h} src/plugins/*.{cpp,h} src/plugins/base_plugin/*.{cpp,h}
-sed -i -e s@"CXXFLAGS=.*"@"CXXFLAGS+=-W -ansi -pedantic -fPIC"@  Makefile
 
 %build
 CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
-make %{?_smp_mflags} HAVE_TINYXML=yes
+make %{?_smp_mflags} HAVE_TINYXML=yes PARANOID=no
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# sed because of /lib/
-sed -i -e s@"LIBDIR=\$(DESTDIR).*"@"LIBDIR=$RPM_BUILD_ROOT%{_libdir}/%{name}"@ Makefile
-# sed to don't use RPM_BUID_ROOT in configuration file
-sed -i -e s@"\$(LIBDIR)\@"@"%{_libdir}/%{name}\@"@ Makefile
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} HAVE_TINYXML=yes
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir}  HAVE_TINYXML=yes PARANOID=no
 
 
 %clean
@@ -79,7 +72,9 @@
 
 %files plugins
 %defattr(-,root,root,-)
+%doc HOWTO.plugins
 %dir %{_libdir}/%{name}
+%{_libdir}/%{name}/antiflood.so
 %{_libdir}/%{name}/ping.so
 %{_libdir}/%{name}/postconnect.so
 %{_libdir}/%{name}/moderation.so
@@ -109,6 +104,8 @@
 %{_libdir}/%{name}/trad.so
 
 %changelog
+* Sun Sep 28 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.2-1
+- rebuild for 0.1.2
 * Fri Jun 27 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.1-2
 - Change buildrequires for curl (only on plugins-extras)
 - Licence update



From eponyme at fedoraproject.org  Sun Sep 28 17:54:22 2008
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 28 Sep 2008 17:54:22 +0000 (UTC)
Subject: rpms/trustyrc/F-9 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 trustyrc.spec, 1.1, 1.2
Message-ID: <20080928175422.D18AC70118@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/trustyrc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27495

Modified Files:
	.cvsignore sources trustyrc.spec 
Log Message:
Update to 0.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jul 2008 19:52:43 -0000	1.2
+++ .cvsignore	28 Sep 2008 17:53:52 -0000	1.3
@@ -1 +1 @@
-trustyrc-0.1.1.tar.gz
+trustyrc-0.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jul 2008 19:52:43 -0000	1.2
+++ sources	28 Sep 2008 17:53:52 -0000	1.3
@@ -1 +1 @@
-1cc0dfef27d2cfa48c3511f01ba4d78a  trustyrc-0.1.1.tar.gz
+883da45fa4a1aa52e49cf408ad4b13ff  trustyrc-0.1.2.tar.gz


Index: trustyrc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-9/trustyrc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trustyrc.spec	6 Jul 2008 19:52:43 -0000	1.1
+++ trustyrc.spec	28 Sep 2008 17:53:52 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           trustyrc
-Version:        0.1.1        
-Release:        2%{?dist}
+Version:        0.1.2        
+Release:        1%{?dist}
 Summary:        Fully modular IRC robot
 
 Group:          Applications/Internet
@@ -49,22 +49,15 @@
 
 %prep
 %setup -q
-# LIGNE PLUS NECESSAIRE EN 0.1.2 (chmod fait sur les sources upstream)
-chmod 0644 src/*.{cpp,h} src/plugins/*.{cpp,h} src/plugins/base_plugin/*.{cpp,h}
-sed -i -e s@"CXXFLAGS=.*"@"CXXFLAGS+=-W -ansi -pedantic -fPIC"@  Makefile
 
 %build
 CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
-make %{?_smp_mflags} HAVE_TINYXML=yes
+make %{?_smp_mflags} HAVE_TINYXML=yes PARANOID=no
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# sed because of /lib/
-sed -i -e s@"LIBDIR=\$(DESTDIR).*"@"LIBDIR=$RPM_BUILD_ROOT%{_libdir}/%{name}"@ Makefile
-# sed to don't use RPM_BUID_ROOT in configuration file
-sed -i -e s@"\$(LIBDIR)\@"@"%{_libdir}/%{name}\@"@ Makefile
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} HAVE_TINYXML=yes
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir}  HAVE_TINYXML=yes PARANOID=no
 
 
 %clean
@@ -79,7 +72,9 @@
 
 %files plugins
 %defattr(-,root,root,-)
+%doc HOWTO.plugins
 %dir %{_libdir}/%{name}
+%{_libdir}/%{name}/antiflood.so
 %{_libdir}/%{name}/ping.so
 %{_libdir}/%{name}/postconnect.so
 %{_libdir}/%{name}/moderation.so
@@ -109,6 +104,8 @@
 %{_libdir}/%{name}/trad.so
 
 %changelog
+* Sun Sep 28 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.2-1
+- rebuild for 0.1.2
 * Fri Jun 27 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.1-2
 - Change buildrequires for curl (only on plugins-extras)
 - Licence update



From ausil at fedoraproject.org  Sun Sep 28 18:16:23 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sun, 28 Sep 2008 18:16:23 +0000 (UTC)
Subject: rpms/piggyback - New directory
Message-ID: <20080928181623.3B90270118@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/piggyback
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsp30735/rpms/piggyback

Log Message:
Directory /cvs/extras/rpms/piggyback added to the repository




From pkgdb at fedoraproject.org  Sun Sep 28 18:16:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 18:16:13 +0000
Subject: [pkgdb] piggyback was added for spot
Message-ID: <20080928181613.B77A0208D74@bastion.fedora.phx.redhat.com>

ausil has added Package piggyback with summary Utility for making net-bootable sparc kernel image files
ausil has approved Package piggyback
ausil has added a Fedora devel branch for piggyback with an owner of spot
ausil has approved piggyback in Fedora devel
ausil has approved Package piggyback
ausil has set commit to Approved for packager on piggyback (Fedora devel)
ausil has set build to Approved for packager on piggyback (Fedora devel)
ausil has set checkout to Approved for packager on piggyback (Fedora devel)
ausil has set commit to Approved for uberpackager on piggyback (Fedora devel)
ausil has set build to Approved for uberpackager on piggyback (Fedora devel)
ausil has set checkout to Approved for uberpackager on piggyback (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piggyback



From pkgdb at fedoraproject.org  Sun Sep 28 18:16:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 18:16:14 +0000
Subject: [pkgdb] piggyback (Fedora, 9) updated by ausil
Message-ID: <20080928181614.98758208DA0@bastion.fedora.phx.redhat.com>

ausil added a Fedora 9 branch for piggyback
ausil has set commit to Approved for uberpackager on piggyback (Fedora 9)
ausil has set build to Approved for uberpackager on piggyback (Fedora 9)
ausil has set checkout to Approved for uberpackager on piggyback (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/piggyback



From ausil at fedoraproject.org  Sun Sep 28 18:16:23 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sun, 28 Sep 2008 18:16:23 +0000 (UTC)
Subject: rpms/piggyback/devel - New directory
Message-ID: <20080928181623.93A7970141@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/piggyback/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsp30735/rpms/piggyback/devel

Log Message:
Directory /cvs/extras/rpms/piggyback/devel added to the repository




From ausil at fedoraproject.org  Sun Sep 28 18:16:24 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sun, 28 Sep 2008 18:16:24 +0000 (UTC)
Subject: rpms/piggyback Makefile,NONE,1.1
Message-ID: <20080928181624.9432370118@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/piggyback
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsp30735/rpms/piggyback

Added Files:
	Makefile 
Log Message:
Setup of module piggyback


--- NEW FILE Makefile ---
# Top level Makefile for module piggyback
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Sun Sep 28 18:16:24 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sun, 28 Sep 2008 18:16:24 +0000 (UTC)
Subject: rpms/piggyback/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080928181624.E4BF870118@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/piggyback/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsp30735/rpms/piggyback/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module piggyback


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: piggyback
# $Id: Makefile,v 1.1 2008/09/28 18:16:24 ausil Exp $
NAME := piggyback
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sun Sep 28 18:22:43 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sun, 28 Sep 2008 18:22:43 +0000 (UTC)
Subject: common Makefile.common,1.114,1.115
Message-ID: <20080928182243.528BF70118@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31346

Modified Files:
	Makefile.common 
Log Message:
add piggyback to sparc specific packages 
add s390-utils to s390 specific patckages



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- Makefile.common	17 Sep 2008 19:51:54 -0000	1.114
+++ Makefile.common	28 Sep 2008 18:22:12 -0000	1.115
@@ -113,9 +113,12 @@
 ## for secondary arch only packages we cant build on the primary hub
 ## we need to go direct to the secondary arch hub
 define secondary-arch 
-for name in silo prtconf lssbus afbinit xorg-x11-drv-sunbw2 xorg-x11-drv-suncg14 xorg-x11-drv-suncg3 xorg-x11-drv-suncg6 xorg-x11-drv-sunffb xorg-x11-drv-sunleo xorg-x11-drv-suntcx ; \
+for name in silo prtconf lssbus afbinit piggyback xorg-x11-drv-sunbw2 xorg-x11-drv-suncg14 xorg-x11-drv-suncg3 xorg-x11-drv-suncg6 xorg-x11-drv-sunffb xorg-x11-drv-sunleo xorg-x11-drv-suntcx ; \
 do if [ "$$name" = "$(NAME)" ]; then echo "-c ~/.koji/sparc-config"; fi \
 done 
+for name in s390-utils ; \
+do if [ "$$name" = "$(NAME)" ]; then echo "-c ~/.koji/s390-config"; fi \
+done
 endef
 # if we have defineded SECONDARY_CONFIG trust the user is doing it for a reason
 ifndef SECONDARY_CONFIG



From belegdol at fedoraproject.org  Sun Sep 28 18:37:25 2008
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Sun, 28 Sep 2008 18:37:25 +0000 (UTC)
Subject: rpms/gnome-applet-netspeed/F-9 gnome-applet-netspeed.spec, 1.14,
	1.15
Message-ID: <20080928183725.405D070118@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/gnome-applet-netspeed/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv812

Modified Files:
	gnome-applet-netspeed.spec 
Log Message:
* Sun Sep 28 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.15-2
- Removed libgnomeui-devel from BuildRequires, added wireless-tools-devel
- Updated URL



Index: gnome-applet-netspeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-netspeed/F-9/gnome-applet-netspeed.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnome-applet-netspeed.spec	27 Sep 2008 22:39:45 -0000	1.14
+++ gnome-applet-netspeed.spec	28 Sep 2008 18:36:54 -0000	1.15
@@ -1,19 +1,20 @@
 Name:           gnome-applet-netspeed    
 Version:        0.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME applet that shows traffic on a network device
 
 Group:          Applications/Internet
 License:        GPLv2+
-URL:            http://www.wh-hms.uni-ulm.de/~mfcn/netspeed/
+URL:            http://www.gnome.org/projects/netspeed/
 Source0:        http://www.wh-hms.uni-ulm.de/~mfcn/netspeed/packages/netspeed_applet-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig, gettext, scrollkeeper, intltool
 BuildRequires:  perl(XML::Parser)
-BuildRequires:  libgnomeui-devel >= 2.8, libgtop2-devel
+BuildRequires:  libgtop2-devel
 BuildRequires:  gnome-panel-devel >= 2.8, libnotify-devel
 BuildRequires:  gnome-doc-utils
+BuildRequires:  wireless-tools-devel
 
 Requires:       hicolor-icon-theme
 
@@ -80,6 +81,10 @@
 %{_datadir}/omf/netspeed_applet/
 
 %changelog
+* Sun Sep 28 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.15-2
+- Removed libgnomeui-devel from BuildRequires, added wireless-tools-devel
+- Updated URL
+
 * Sun Sep 28 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.15-1
 - Updated to 0.15
 - Added hicolor-icon-theme to Requires



From belegdol at fedoraproject.org  Sun Sep 28 18:38:13 2008
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Sun, 28 Sep 2008 18:38:13 +0000 (UTC)
Subject: rpms/gnome-applet-netspeed/devel gnome-applet-netspeed.spec, 1.14, 
	1.15
Message-ID: <20080928183813.31D0870118@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/gnome-applet-netspeed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1030

Modified Files:
	gnome-applet-netspeed.spec 
Log Message:
* Sun Sep 28 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.15-2
- Removed libgnomeui-devel from BuildRequires, added wireless-tools-devel
- Updated URL



Index: gnome-applet-netspeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-netspeed/devel/gnome-applet-netspeed.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnome-applet-netspeed.spec	27 Sep 2008 22:43:22 -0000	1.14
+++ gnome-applet-netspeed.spec	28 Sep 2008 18:37:43 -0000	1.15
@@ -1,19 +1,20 @@
 Name:           gnome-applet-netspeed    
 Version:        0.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME applet that shows traffic on a network device
 
 Group:          Applications/Internet
 License:        GPLv2+
-URL:            http://www.wh-hms.uni-ulm.de/~mfcn/netspeed/
+URL:            http://www.gnome.org/projects/netspeed/
 Source0:        http://www.wh-hms.uni-ulm.de/~mfcn/netspeed/packages/netspeed_applet-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig, gettext, scrollkeeper, intltool
 BuildRequires:  perl(XML::Parser)
-BuildRequires:  libgnomeui-devel >= 2.8, libgtop2-devel
+BuildRequires:  libgtop2-devel
 BuildRequires:  gnome-panel-devel >= 2.8, libnotify-devel
 BuildRequires:  gnome-doc-utils
+BuildRequires:  wireless-tools-devel
 
 Requires:       hicolor-icon-theme
 
@@ -80,6 +81,10 @@
 %{_datadir}/omf/netspeed_applet/
 
 %changelog
+* Sun Sep 28 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.15-2
+- Removed libgnomeui-devel from BuildRequires, added wireless-tools-devel
+- Updated URL
+
 * Sun Sep 28 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.15-1
 - Updated to 0.15
 - Added hicolor-icon-theme to Requires



From belegdol at fedoraproject.org  Sun Sep 28 18:39:00 2008
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Sun, 28 Sep 2008 18:39:00 +0000 (UTC)
Subject: rpms/gnome-applet-netspeed/F-8 gnome-applet-netspeed.spec, 1.13,
	1.14
Message-ID: <20080928183900.9B7B570118@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/gnome-applet-netspeed/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1289

Modified Files:
	gnome-applet-netspeed.spec 
Log Message:
* Sun Sep 28 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.15-2
- Removed libgnomeui-devel from BuildRequires, added wireless-tools-devel
- Updated URL



Index: gnome-applet-netspeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-netspeed/F-8/gnome-applet-netspeed.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-applet-netspeed.spec	27 Sep 2008 22:44:09 -0000	1.13
+++ gnome-applet-netspeed.spec	28 Sep 2008 18:38:30 -0000	1.14
@@ -1,19 +1,20 @@
 Name:           gnome-applet-netspeed    
 Version:        0.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME applet that shows traffic on a network device
 
 Group:          Applications/Internet
 License:        GPLv2+
-URL:            http://www.wh-hms.uni-ulm.de/~mfcn/netspeed/
+URL:            http://www.gnome.org/projects/netspeed/
 Source0:        http://www.wh-hms.uni-ulm.de/~mfcn/netspeed/packages/netspeed_applet-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig, gettext, scrollkeeper, intltool
 BuildRequires:  perl(XML::Parser)
-BuildRequires:  libgnomeui-devel >= 2.8, libgtop2-devel
+BuildRequires:  libgtop2-devel
 BuildRequires:  gnome-panel-devel >= 2.8, libnotify-devel
 BuildRequires:  gnome-doc-utils
+BuildRequires:  wireless-tools-devel
 
 Requires:       hicolor-icon-theme
 
@@ -80,6 +81,10 @@
 %{_datadir}/omf/netspeed_applet/
 
 %changelog
+* Sun Sep 28 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.15-2
+- Removed libgnomeui-devel from BuildRequires, added wireless-tools-devel
+- Updated URL
+
 * Sun Sep 28 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.15-1
 - Updated to 0.15
 - Added hicolor-icon-theme to Requires



From mcepl at fedoraproject.org  Sun Sep 28 18:49:03 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Sun, 28 Sep 2008 18:49:03 +0000 (UTC)
Subject: rpms/purple-facebookchat/devel purple-facebookchat.spec,1.1,1.2
Message-ID: <20080928184903.A197670118@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/purple-facebookchat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3086

Modified Files:
	purple-facebookchat.spec 
Log Message:
Bump release to eliminate pidgin-facebookchat duplicate package.


Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/extras/rpms/purple-facebookchat/devel/purple-facebookchat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- purple-facebookchat.spec	25 Sep 2008 15:23:48 -0000	1.1
+++ purple-facebookchat.spec	28 Sep 2008 18:48:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           purple-facebookchat
 Version:        1.35
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Libpurple plug-in supporting facebook IM
 Group:          Applications/Internet
 License:        GPLv3+
@@ -8,6 +8,8 @@
 Source0:        http://pidgin-facebookchat.googlecode.com/files/pidgin-facebookchat-source-1.35.tar.bz2
 Source3:        %{name}-Makefile
 Patch0:         %{name}-MC-build.patch
+Provides:       pidgin-facebookchat = %{version}-%{release} 
+Obsoletes:      pidgin-facebookchat < 1.35-3
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libpurple-devel
@@ -25,6 +27,7 @@
 %prep
 %setup -q -c
 %patch0 -p1 -b .RH-build
+# Upstream Makefile is totally horrible, use our own instead.
 mv Makefile Makefile.orig
 install -p %{SOURCE3} Makefile
 
@@ -47,6 +50,10 @@
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
+* Sun Sep 28 2008 Mat??j Cepl <mcepl at redhat.com> - 1.35-5
+- Bump release to eliminate pidgin-facebookchat duplicate
+  package.
+
 * Wed Sep 24 2008 Matej Cepl <mcepl at redhat.com> 1.35-4
 - Makefile is not compressed anymore and it shouldn't create
   source tarball anymore in all target.



From pkgdb at fedoraproject.org  Sun Sep 28 18:51:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 18:51:28 +0000
Subject: [pkgdb] mediawiki-Cite was added for nigelj
Message-ID: <20080928185128.BC434208D73@bastion.fedora.phx.redhat.com>

kevin has added Package mediawiki-Cite with summary An extension to provide Citation tools for Mediawiki
kevin has approved Package mediawiki-Cite
kevin has added a Fedora devel branch for mediawiki-Cite with an owner of nigelj
kevin has approved mediawiki-Cite in Fedora devel
kevin has approved Package mediawiki-Cite
kevin has set commit to Approved for packager on mediawiki-Cite (Fedora devel)
kevin has set build to Approved for packager on mediawiki-Cite (Fedora devel)
kevin has set checkout to Approved for packager on mediawiki-Cite (Fedora devel)
kevin has set commit to Approved for uberpackager on mediawiki-Cite (Fedora devel)
kevin has set build to Approved for uberpackager on mediawiki-Cite (Fedora devel)
kevin has set checkout to Approved for uberpackager on mediawiki-Cite (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-Cite



From pkgdb at fedoraproject.org  Sun Sep 28 18:51:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 18:51:30 +0000
Subject: [pkgdb] mediawiki-Cite (Fedora, 8) updated by kevin
Message-ID: <20080928185130.9DD53208DA7@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for mediawiki-Cite
kevin has set commit to Approved for uberpackager on mediawiki-Cite (Fedora 8)
kevin has set build to Approved for uberpackager on mediawiki-Cite (Fedora 8)
kevin has set checkout to Approved for uberpackager on mediawiki-Cite (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-Cite



From pkgdb at fedoraproject.org  Sun Sep 28 18:51:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 18:51:30 +0000
Subject: [pkgdb] mediawiki-Cite (Fedora, 9) updated by kevin
Message-ID: <20080928185130.A8F57208DAF@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for mediawiki-Cite
kevin has set commit to Approved for uberpackager on mediawiki-Cite (Fedora 9)
kevin has set build to Approved for uberpackager on mediawiki-Cite (Fedora 9)
kevin has set checkout to Approved for uberpackager on mediawiki-Cite (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-Cite



From pkgdb at fedoraproject.org  Sun Sep 28 18:51:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 18:51:30 +0000
Subject: [pkgdb] mediawiki-Cite (Fedora EPEL, 5) updated by kevin
Message-ID: <20080928185130.BCFAB208DB4@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mediawiki-Cite
kevin has set commit to Approved for uberpackager on mediawiki-Cite (Fedora EPEL 5)
kevin has set build to Approved for uberpackager on mediawiki-Cite (Fedora EPEL 5)
kevin has set checkout to Approved for uberpackager on mediawiki-Cite (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-Cite



From kevin at fedoraproject.org  Sun Sep 28 18:51:46 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 18:51:46 +0000 (UTC)
Subject: rpms/mediawiki-Cite - New directory
Message-ID: <20080928185146.2306370118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mediawiki-Cite
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLS3801/rpms/mediawiki-Cite

Log Message:
Directory /cvs/extras/rpms/mediawiki-Cite added to the repository




From kevin at fedoraproject.org  Sun Sep 28 18:51:46 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 18:51:46 +0000 (UTC)
Subject: rpms/mediawiki-Cite/devel - New directory
Message-ID: <20080928185146.55F5970118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mediawiki-Cite/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLS3801/rpms/mediawiki-Cite/devel

Log Message:
Directory /cvs/extras/rpms/mediawiki-Cite/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 28 18:51:47 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 18:51:47 +0000 (UTC)
Subject: rpms/mediawiki-Cite Makefile,NONE,1.1
Message-ID: <20080928185147.2D29070118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mediawiki-Cite
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLS3801/rpms/mediawiki-Cite

Added Files:
	Makefile 
Log Message:
Setup of module mediawiki-Cite


--- NEW FILE Makefile ---
# Top level Makefile for module mediawiki-Cite
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 28 18:51:47 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 18:51:47 +0000 (UTC)
Subject: rpms/mediawiki-Cite/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080928185147.666E370118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mediawiki-Cite/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLS3801/rpms/mediawiki-Cite/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mediawiki-Cite


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mediawiki-Cite
# $Id: Makefile,v 1.1 2008/09/28 18:51:47 kevin Exp $
NAME := mediawiki-Cite
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From mcepl at fedoraproject.org  Sun Sep 28 18:52:18 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Sun, 28 Sep 2008 18:52:18 +0000 (UTC)
Subject: rpms/purple-facebookchat/F-9 purple-facebookchat.spec,1.1,1.2
Message-ID: <20080928185218.7850970118@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/purple-facebookchat/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3850

Modified Files:
	purple-facebookchat.spec 
Log Message:
Bump release to eliminate pidgin-facebookchat duplicate package.


Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/extras/rpms/purple-facebookchat/F-9/purple-facebookchat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- purple-facebookchat.spec	25 Sep 2008 15:50:21 -0000	1.1
+++ purple-facebookchat.spec	28 Sep 2008 18:51:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           purple-facebookchat
 Version:        1.35
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Libpurple plug-in supporting facebook IM
 Group:          Applications/Internet
 License:        GPLv3+
@@ -8,6 +8,8 @@
 Source0:        http://pidgin-facebookchat.googlecode.com/files/pidgin-facebookchat-source-1.35.tar.bz2
 Source3:        %{name}-Makefile
 Patch0:         %{name}-MC-build.patch
+Provides:       pidgin-facebookchat = %{version}-%{release} 
+Obsoletes:      pidgin-facebookchat < 1.35-3
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libpurple-devel
@@ -25,6 +27,7 @@
 %prep
 %setup -q -c
 %patch0 -p1 -b .RH-build
+# Upstream Makefile is totally horrible, use our own instead.
 mv Makefile Makefile.orig
 install -p %{SOURCE3} Makefile
 
@@ -47,6 +50,10 @@
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
+* Sun Sep 28 2008 Mat??j Cepl <mcepl at redhat.com> - 1.35-5
+- Bump release to eliminate pidgin-facebookchat duplicate
+  package.
+
 * Wed Sep 24 2008 Matej Cepl <mcepl at redhat.com> 1.35-4
 - Makefile is not compressed anymore and it shouldn't create
   source tarball anymore in all target.



From mcepl at fedoraproject.org  Sun Sep 28 18:55:10 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Sun, 28 Sep 2008 18:55:10 +0000 (UTC)
Subject: rpms/purple-facebookchat/F-8 purple-facebookchat.spec,1.1,1.2
Message-ID: <20080928185510.296B670118@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/purple-facebookchat/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4524

Modified Files:
	purple-facebookchat.spec 
Log Message:
Bump release to eliminate pidgin-facebookchat duplicate package.


Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/extras/rpms/purple-facebookchat/F-8/purple-facebookchat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- purple-facebookchat.spec	25 Sep 2008 15:43:07 -0000	1.1
+++ purple-facebookchat.spec	28 Sep 2008 18:54:39 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           purple-facebookchat
 Version:        1.35
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Libpurple plug-in supporting facebook IM
 Group:          Applications/Internet
 License:        GPLv3+
@@ -8,6 +8,8 @@
 Source0:        http://pidgin-facebookchat.googlecode.com/files/pidgin-facebookchat-source-1.35.tar.bz2
 Source3:        %{name}-Makefile
 Patch0:         %{name}-MC-build.patch
+Provides:       pidgin-facebookchat = %{version}-%{release} 
+Obsoletes:      pidgin-facebookchat < 1.35-3
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libpurple-devel
@@ -25,6 +27,7 @@
 %prep
 %setup -q -c
 %patch0 -p1 -b .RH-build
+# Upstream Makefile is totally horrible, use our own instead.
 mv Makefile Makefile.orig
 install -p %{SOURCE3} Makefile
 
@@ -47,6 +50,10 @@
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
+* Sun Sep 28 2008 Mat??j Cepl <mcepl at redhat.com> - 1.35-5
+- Bump release to eliminate pidgin-facebookchat duplicate
+  package.
+
 * Wed Sep 24 2008 Matej Cepl <mcepl at redhat.com> 1.35-4
 - Makefile is not compressed anymore and it shouldn't create
   source tarball anymore in all target.



From pkgdb at fedoraproject.org  Sun Sep 28 18:56:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 18:56:28 +0000
Subject: [pkgdb] ksplice was added for s4504kr
Message-ID: <20080928185628.D34BD208D74@bastion.fedora.phx.redhat.com>

kevin has added Package ksplice with summary Patching a Linux kernel without reboot
kevin has approved Package ksplice
kevin has added a Fedora devel branch for ksplice with an owner of s4504kr
kevin has approved ksplice in Fedora devel
kevin has approved Package ksplice
kevin has set commit to Approved for packager on ksplice (Fedora devel)
kevin has set build to Approved for packager on ksplice (Fedora devel)
kevin has set checkout to Approved for packager on ksplice (Fedora devel)
kevin has set commit to Approved for uberpackager on ksplice (Fedora devel)
kevin has set build to Approved for uberpackager on ksplice (Fedora devel)
kevin has set checkout to Approved for uberpackager on ksplice (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksplice



From pkgdb at fedoraproject.org  Sun Sep 28 18:56:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 18:56:30 +0000
Subject: [pkgdb] ksplice (Fedora, 8) updated by kevin
Message-ID: <20080928185630.64B74208DA0@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for ksplice
kevin has set commit to Approved for uberpackager on ksplice (Fedora 8)
kevin has set build to Approved for uberpackager on ksplice (Fedora 8)
kevin has set checkout to Approved for uberpackager on ksplice (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksplice



From kevin at fedoraproject.org  Sun Sep 28 18:56:48 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 18:56:48 +0000 (UTC)
Subject: rpms/ksplice - New directory
Message-ID: <20080928185648.206B170118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ksplice
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVP4702/rpms/ksplice

Log Message:
Directory /cvs/extras/rpms/ksplice added to the repository




From pkgdb at fedoraproject.org  Sun Sep 28 18:56:30 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 18:56:30 +0000
Subject: [pkgdb] ksplice (Fedora, 9) updated by kevin
Message-ID: <20080928185630.71E63208DA7@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for ksplice
kevin has set commit to Approved for uberpackager on ksplice (Fedora 9)
kevin has set build to Approved for uberpackager on ksplice (Fedora 9)
kevin has set checkout to Approved for uberpackager on ksplice (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksplice



From kevin at fedoraproject.org  Sun Sep 28 18:56:48 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 18:56:48 +0000 (UTC)
Subject: rpms/ksplice/devel - New directory
Message-ID: <20080928185648.52C8F70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ksplice/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVP4702/rpms/ksplice/devel

Log Message:
Directory /cvs/extras/rpms/ksplice/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 28 18:56:49 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 18:56:49 +0000 (UTC)
Subject: rpms/ksplice Makefile,NONE,1.1
Message-ID: <20080928185649.2979E70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ksplice
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVP4702/rpms/ksplice

Added Files:
	Makefile 
Log Message:
Setup of module ksplice


--- NEW FILE Makefile ---
# Top level Makefile for module ksplice
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 28 18:56:49 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 18:56:49 +0000 (UTC)
Subject: rpms/ksplice/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080928185649.5F44970118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ksplice/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVP4702/rpms/ksplice/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ksplice


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ksplice
# $Id: Makefile,v 1.1 2008/09/28 18:56:49 kevin Exp $
NAME := ksplice
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 28 18:59:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 18:59:44 +0000
Subject: [pkgdb] perl-PAR (Fedora, devel) updated by kevin
Message-ID: <20080928185944.244FD208DA0@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-PAR (Fedora devel) for perl-sig
kevin approved watchcommits on perl-PAR (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-PAR



From pkgdb at fedoraproject.org  Sun Sep 28 18:59:42 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 18:59:42 +0000
Subject: [pkgdb] perl-PAR was added for mmaslano
Message-ID: <20080928185942.7AA60208D74@bastion.fedora.phx.redhat.com>

kevin has added Package perl-PAR with summary Perl Archives - special zip files
kevin has approved Package perl-PAR
kevin has added a Fedora devel branch for perl-PAR with an owner of mmaslano
kevin has approved perl-PAR in Fedora devel
kevin has approved Package perl-PAR
kevin has set commit to Approved for packager on perl-PAR (Fedora devel)
kevin has set build to Approved for packager on perl-PAR (Fedora devel)
kevin has set checkout to Approved for packager on perl-PAR (Fedora devel)
kevin has set commit to Approved for uberpackager on perl-PAR (Fedora devel)
kevin has set build to Approved for uberpackager on perl-PAR (Fedora devel)
kevin has set checkout to Approved for uberpackager on perl-PAR (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-PAR



From kevin at fedoraproject.org  Sun Sep 28 18:59:52 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 18:59:52 +0000 (UTC)
Subject: rpms/perl-PAR - New directory
Message-ID: <20080928185952.2327E70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-PAR
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsjT5101/rpms/perl-PAR

Log Message:
Directory /cvs/extras/rpms/perl-PAR added to the repository




From kevin at fedoraproject.org  Sun Sep 28 18:59:52 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 18:59:52 +0000 (UTC)
Subject: rpms/perl-PAR/devel - New directory
Message-ID: <20080928185952.5A8A370118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-PAR/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsjT5101/rpms/perl-PAR/devel

Log Message:
Directory /cvs/extras/rpms/perl-PAR/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 28 18:59:53 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 18:59:53 +0000 (UTC)
Subject: rpms/perl-PAR Makefile,NONE,1.1
Message-ID: <20080928185953.4021A70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-PAR
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsjT5101/rpms/perl-PAR

Added Files:
	Makefile 
Log Message:
Setup of module perl-PAR


--- NEW FILE Makefile ---
# Top level Makefile for module perl-PAR
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 28 18:59:53 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 18:59:53 +0000 (UTC)
Subject: rpms/perl-PAR/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080928185953.7B81170118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-PAR/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsjT5101/rpms/perl-PAR/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-PAR


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-PAR
# $Id: Makefile,v 1.1 2008/09/28 18:59:53 kevin Exp $
NAME := perl-PAR
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 28 19:00:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:00:52 +0000
Subject: [pkgdb] perl-Probe-Perl was added for mmaslano
Message-ID: <20080928190052.1E406208D74@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Probe-Perl with summary obtain information about perl interpreter
kevin has approved Package perl-Probe-Perl
kevin has added a Fedora devel branch for perl-Probe-Perl with an owner of mmaslano
kevin has approved perl-Probe-Perl in Fedora devel
kevin has approved Package perl-Probe-Perl
kevin has set commit to Approved for packager on perl-Probe-Perl (Fedora devel)
kevin has set build to Approved for packager on perl-Probe-Perl (Fedora devel)
kevin has set checkout to Approved for packager on perl-Probe-Perl (Fedora devel)
kevin has set commit to Approved for uberpackager on perl-Probe-Perl (Fedora devel)
kevin has set build to Approved for uberpackager on perl-Probe-Perl (Fedora devel)
kevin has set checkout to Approved for uberpackager on perl-Probe-Perl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Probe-Perl



From kevin at fedoraproject.org  Sun Sep 28 19:00:59 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:00:59 +0000 (UTC)
Subject: rpms/perl-Probe-Perl - New directory
Message-ID: <20080928190059.2163C70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Probe-Perl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEZ5333/rpms/perl-Probe-Perl

Log Message:
Directory /cvs/extras/rpms/perl-Probe-Perl added to the repository




From pkgdb at fedoraproject.org  Sun Sep 28 19:00:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:00:53 +0000
Subject: [pkgdb] perl-Probe-Perl (Fedora, devel) updated by kevin
Message-ID: <20080928190053.300A0208DA7@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Probe-Perl (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Probe-Perl (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Probe-Perl



From kevin at fedoraproject.org  Sun Sep 28 19:00:59 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:00:59 +0000 (UTC)
Subject: rpms/perl-Probe-Perl/devel - New directory
Message-ID: <20080928190059.5427B70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Probe-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEZ5333/rpms/perl-Probe-Perl/devel

Log Message:
Directory /cvs/extras/rpms/perl-Probe-Perl/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:01:00 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:01:00 +0000 (UTC)
Subject: rpms/perl-Probe-Perl Makefile,NONE,1.1
Message-ID: <20080928190100.2F06C70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Probe-Perl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEZ5333/rpms/perl-Probe-Perl

Added Files:
	Makefile 
Log Message:
Setup of module perl-Probe-Perl


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Probe-Perl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 28 19:01:00 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:01:00 +0000 (UTC)
Subject: rpms/perl-Probe-Perl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080928190100.6243070118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Probe-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEZ5333/rpms/perl-Probe-Perl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Probe-Perl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Probe-Perl
# $Id: Makefile,v 1.1 2008/09/28 19:01:00 kevin Exp $
NAME := perl-Probe-Perl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 28 19:02:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:02:28 +0000
Subject: [pkgdb] rssh was added for sundaram
Message-ID: <20080928190228.3812A208D75@bastion.fedora.phx.redhat.com>

kevin has added Package rssh with summary Restricted shell for use with OpenSSH, allowing only scp and/or sftp
kevin has approved Package rssh
kevin has added a Fedora devel branch for rssh with an owner of sundaram
kevin has approved rssh in Fedora devel
kevin has approved Package rssh
kevin has set commit to Approved for packager on rssh (Fedora devel)
kevin has set build to Approved for packager on rssh (Fedora devel)
kevin has set checkout to Approved for packager on rssh (Fedora devel)
kevin has set commit to Approved for uberpackager on rssh (Fedora devel)
kevin has set build to Approved for uberpackager on rssh (Fedora devel)
kevin has set checkout to Approved for uberpackager on rssh (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rssh



From pkgdb at fedoraproject.org  Sun Sep 28 19:02:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:02:29 +0000
Subject: [pkgdb] rssh (Fedora, 8) updated by kevin
Message-ID: <20080928190230.12259208DA2@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for rssh
kevin has set commit to Approved for uberpackager on rssh (Fedora 8)
kevin has set build to Approved for uberpackager on rssh (Fedora 8)
kevin has set checkout to Approved for uberpackager on rssh (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rssh



From pkgdb at fedoraproject.org  Sun Sep 28 19:02:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:02:29 +0000
Subject: [pkgdb] rssh (Fedora, 9) updated by kevin
Message-ID: <20080928190230.40934208DA8@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for rssh
kevin has set commit to Approved for uberpackager on rssh (Fedora 9)
kevin has set build to Approved for uberpackager on rssh (Fedora 9)
kevin has set checkout to Approved for uberpackager on rssh (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rssh



From kevin at fedoraproject.org  Sun Sep 28 19:02:49 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:02:49 +0000 (UTC)
Subject: rpms/rssh - New directory
Message-ID: <20080928190249.228B070118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rssh
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBx5509/rpms/rssh

Log Message:
Directory /cvs/extras/rpms/rssh added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:02:50 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:02:50 +0000 (UTC)
Subject: rpms/rssh Makefile,NONE,1.1
Message-ID: <20080928190250.33AD070118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rssh
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBx5509/rpms/rssh

Added Files:
	Makefile 
Log Message:
Setup of module rssh


--- NEW FILE Makefile ---
# Top level Makefile for module rssh
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 28 19:02:49 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:02:49 +0000 (UTC)
Subject: rpms/rssh/devel - New directory
Message-ID: <20080928190249.5CC8970118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rssh/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBx5509/rpms/rssh/devel

Log Message:
Directory /cvs/extras/rpms/rssh/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:02:50 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:02:50 +0000 (UTC)
Subject: rpms/rssh/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20080928190250.6705370140@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rssh/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBx5509/rpms/rssh/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rssh


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rssh
# $Id: Makefile,v 1.1 2008/09/28 19:02:50 kevin Exp $
NAME := rssh
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sun Sep 28 19:06:03 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 28 Sep 2008 19:06:03 +0000 (UTC)
Subject: rpms/gnome-session/devel gnome-session.spec,1.200,1.201
Message-ID: <20080928190603.4BCF870118@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6034

Modified Files:
	gnome-session.spec 
Log Message:
don't listen on tcp sockets



Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- gnome-session.spec	26 Sep 2008 20:11:59 -0000	1.200
+++ gnome-session.spec	28 Sep 2008 19:05:33 -0000	1.201
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.24.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.24/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -47,6 +47,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: libXau-devel
 BuildRequires: libXrandr-devel
+BuildRequires: xorg-x11-xtrans-devel
 
 # this is so the configure checks find /usr/bin/halt etc.
 BuildRequires: usermode
@@ -185,6 +186,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-5
+- BR xorg-x11-xtrans-devel (#464316)
+
 * Fri Sep 26 2008 Ray Strode  <rstrode at redhat.com> - 2.24.0-4
 - Make the new xsession subpackage require the version of
   gnome-session it's built against



From s4504kr at fedoraproject.org  Sun Sep 28 19:06:20 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Sun, 28 Sep 2008 19:06:20 +0000 (UTC)
Subject: rpms/ksplice/devel import.log, NONE,
	1.1 ksplice-0.9.0-zlib-configure.patch, NONE, 1.1 ksplice.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080928190620.DEC6570118@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/ksplice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6059/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ksplice-0.9.0-zlib-configure.patch ksplice.spec 
Log Message:

Initional inport



--- NEW FILE import.log ---
ksplice-0_9_0-3_fc9:HEAD:ksplice-0.9.0-3.fc9.src.rpm:1222628718

ksplice-0.9.0-zlib-configure.patch:

--- NEW FILE ksplice-0.9.0-zlib-configure.patch ---
(1) Recent binutils include support for compressed sections which requires zlib.

(2) Fedora provides only static libbfd.a (not libbfd.so) for 3rd party
    applications linking.

    (2a) libbfd does not keep API/ABI compatibility.

    (2b) Version-bumping the library on each change would create either a lot
         of multiply installed versions of libfd or breaking dependencies of
         the built packages against libbfd.so

(3) Fedora does not provide libtool scripts in general (libbfd.la in this case).

As .a libraries cannot provide their depdendency list on themselves it needs to
be cared of by the application using them.  Patch attached.

Signed-off-by: Jan Kratochvil <jan.kratochvil at redhat.com>

--- ksplice-0.9.0/configure.ac	2008-09-13 05:41:52.000000000 +0200
+++ ksplice-0.9.0-src-patched/configure.ac	2008-09-21 21:29:13.000000000 +0200
@@ -15,6 +15,12 @@ AC_ARG_WITH(libiberty,
   [ ac_libiberty=NONE ]
 )
 
+AC_ARG_WITH(libz,
+  [  --with-libz=FILE         path to libz.a ],
+  [ ac_libz=$withval ],
+  [ ac_libz=NONE ]
+)
+
 AC_ARG_WITH(bfd-include-dir,
   [  --with-bfd-include-dir=DIR
                           path to directory containing bfd.h ],
@@ -25,6 +31,12 @@ AC_ARG_WITH(bfd-include-dir,
 AC_PROG_CC
 AC_CHECK_HEADERS(bfd.h,, BFD_H="no")
 
+if test "$ac_libz" = "yes"; then
+  AC_CHECK_LIB(z, zlibVersion)
+  ac_libz=auto
+else
+  LIBS="$ac_libz $LIBS"
+fi
 if test "$ac_libiberty" = "NONE"; then
   AC_CHECK_LIB(iberty, objalloc_create)
   ac_libiberty=auto
@@ -63,6 +75,10 @@ if ! test -e "objdiff-static" || ! test 
     echo
     echo "  ./configure --with-libbfd=<libbfd.a> --with-libiberty=<libiberty.a>"
     echo
+    echo "Depending on the host system you may also need to provide zlib:"
+    echo
+    echo "  ./configure ... --with-libz=<libz.a>"
+    echo
     exit 1
   fi
 


--- NEW FILE ksplice.spec ---
Name:		ksplice
Version:	0.9.0
Release:	3%{?dist}
Summary:	Patching a Linux kernel without reboot

Group:		System Environment/Kernel
License:	GPLv2
URL:		http://web.mit.edu/ksplice
Source0:	http://web.mit.edu/ksplice/dist/ksplice-%{version}-src.tar.gz
#
# bin-utils maintainer has sent the patch to upstream
#
Patch0:		ksplice-0.9.0-zlib-configure.patch

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

ExcludeArch:	ppc64, ppc

BuildRequires:	autoconf
BuildRequires:	binutils-devel, perl
BuildRequires:	zlib-devel

Requires:	gcc >= 3.4.2
Requires:	patch >= 2.5.4
Requires:	module-init-tools
Requires:	binutils >= 2.12
Requires:	bash >= 2.03
Requires:	make >= 3.78
Requires:	sh-utils, m4,
Requires:	findutils, diffutils, tar, gzip, bzip2, perl, gawk
Requires:	util-linux-ng

%description
Ksplice allows system administrators to apply security patches to the 
Linux kernel without having to reboot. Ksplice takes as input a source 
code change in unified diff format and the kernel source code to be 
patched, and it applies the patch to the corresponding running kernel. 
The running kernel does not need to have been prepared in advance in 
any way.

%prep
%setup -q
%patch0 -p1 -b .zlib

# Filter ksplce as a provide

cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* |\
sed -e '/perl(Ksplice)/d'
EOF

%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
chmod +x %{__perl_provides}

cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(Ksplice)/d'
EOF

%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
chmod +x %{__perl_requires}

%build
autoconf
%configure  --with-libz
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,-)
%{_bindir}/ksplice-*
%{_sbindir}/ksplice-*
%{_libexecdir}/ksplice-*
%{_datadir}/ksplice/
%{_mandir}/man8/ksplice-*

%doc COPYING README

%changelog
* Wed Sep 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-3
- Comment about upstream status of the zlib patch
- Remove rsync Req./BR.
- Filtering perl(Ksplice)

* Mon Sep 22 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-2
- Add ksplice-zlib-configure patch (BZ #463101)

* Sun Sep 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-1
- New upstream release

* Tue Sep  9 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-12
- Spin off of fedora-ksplice out of this package

* Mon Aug  4 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-11
- Correcting some typos
- Add trap in fedora-ksplice-prepare

* Sun Aug  3 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-10
- Add fedora-ksplice-create script

* Sun Aug  3 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-9
- Rename fedora specific subpackage

* Thu Jul 31 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-8
- Add copyright notice in kspliceprep
- Create ksplice dir and content in kernel sources

* Thu Jul 31 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-7
- Enhanced version of kspliceprep which needs no kernel compilation

* Thu Jul 31 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-6
- Add more kernel-releate Requires
- Add script for prepare fedora sources for ksplice

* Thu Jul 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-5
- Filtering perl provides
- Using 'ExcludeArch' instead of 'ExclusiveArch'

* Wed Jul 23 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-3
- Add some new Reqs. and BRs
- Rescrict Arch on %%{x86} and x86_64

* Mon Jul 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-2
- Fix broken upstream URI

* Tue Jul  8 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-1
- Initional Package



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksplice/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2008 18:56:49 -0000	1.1
+++ .cvsignore	28 Sep 2008 19:05:50 -0000	1.2
@@ -0,0 +1 @@
+ksplice-0.9.0-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksplice/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 18:56:49 -0000	1.1
+++ sources	28 Sep 2008 19:05:50 -0000	1.2
@@ -0,0 +1 @@
+33934d125cdc050cd68f8ea34f1f4f23  ksplice-0.9.0-src.tar.gz



From mcepl at fedoraproject.org  Sun Sep 28 19:08:01 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Sun, 28 Sep 2008 19:08:01 +0000 (UTC)
Subject: rpms/pidgin-facebookchat/devel dead.package,NONE,1.1
Message-ID: <20080928190801.696E770118@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/pidgin-facebookchat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6505

Added Files:
	dead.package 
Log Message:
Death to this package!


--- NEW FILE dead.package ---
Replaced by the duplicate package purple-facebookchat.



From mcepl at fedoraproject.org  Sun Sep 28 19:09:58 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Sun, 28 Sep 2008 19:09:58 +0000 (UTC)
Subject: rpms/pidgin-facebookchat/devel Makefile, 1.1, NONE import.log, 1.1, 
	NONE pidgin-facebookchat.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <20080928190958.AE8C470118@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/pidgin-facebookchat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6693

Removed Files:
	Makefile import.log pidgin-facebookchat.spec sources 
Log Message:
Fighting with cvs rm


--- Makefile DELETED ---


--- import.log DELETED ---


--- pidgin-facebookchat.spec DELETED ---


--- sources DELETED ---



From pkgdb at fedoraproject.org  Sun Sep 28 19:10:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:10:04 +0000
Subject: [pkgdb] perl-File-Find-Rule-VCS was added for mmaslano
Message-ID: <20080928191004.E86C3208D74@bastion.fedora.phx.redhat.com>

kevin has added Package perl-File-Find-Rule-VCS with summary check out files from VCS
kevin has approved Package perl-File-Find-Rule-VCS
kevin has added a Fedora devel branch for perl-File-Find-Rule-VCS with an owner of mmaslano
kevin has approved perl-File-Find-Rule-VCS in Fedora devel
kevin has approved Package perl-File-Find-Rule-VCS
kevin has set commit to Approved for packager on perl-File-Find-Rule-VCS (Fedora devel)
kevin has set build to Approved for packager on perl-File-Find-Rule-VCS (Fedora devel)
kevin has set checkout to Approved for packager on perl-File-Find-Rule-VCS (Fedora devel)
kevin has set commit to Approved for uberpackager on perl-File-Find-Rule-VCS (Fedora devel)
kevin has set build to Approved for uberpackager on perl-File-Find-Rule-VCS (Fedora devel)
kevin has set checkout to Approved for uberpackager on perl-File-Find-Rule-VCS (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-Find-Rule-VCS



From kevin at fedoraproject.org  Sun Sep 28 19:10:13 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:10:13 +0000 (UTC)
Subject: rpms/perl-File-Find-Rule-VCS/devel - New directory
Message-ID: <20080928191013.55FE870140@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-File-Find-Rule-VCS/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvI6751/rpms/perl-File-Find-Rule-VCS/devel

Log Message:
Directory /cvs/extras/rpms/perl-File-Find-Rule-VCS/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:10:13 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:10:13 +0000 (UTC)
Subject: rpms/perl-File-Find-Rule-VCS - New directory
Message-ID: <20080928191013.208BB70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-File-Find-Rule-VCS
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvI6751/rpms/perl-File-Find-Rule-VCS

Log Message:
Directory /cvs/extras/rpms/perl-File-Find-Rule-VCS added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:10:14 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:10:14 +0000 (UTC)
Subject: rpms/perl-File-Find-Rule-VCS Makefile,NONE,1.1
Message-ID: <20080928191014.302787013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-File-Find-Rule-VCS
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvI6751/rpms/perl-File-Find-Rule-VCS

Added Files:
	Makefile 
Log Message:
Setup of module perl-File-Find-Rule-VCS


--- NEW FILE Makefile ---
# Top level Makefile for module perl-File-Find-Rule-VCS
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 28 19:10:14 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:10:14 +0000 (UTC)
Subject: rpms/perl-File-Find-Rule-VCS/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080928191014.63B7E70140@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-File-Find-Rule-VCS/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvI6751/rpms/perl-File-Find-Rule-VCS/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-File-Find-Rule-VCS


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-File-Find-Rule-VCS
# $Id: Makefile,v 1.1 2008/09/28 19:10:14 kevin Exp $
NAME := perl-File-Find-Rule-VCS
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 28 19:10:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:10:06 +0000
Subject: [pkgdb] perl-File-Find-Rule-VCS (Fedora, devel) updated by kevin
Message-ID: <20080928191006.CA16D208D75@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-File-Find-Rule-VCS (Fedora devel) for perl-sig
kevin approved watchcommits on perl-File-Find-Rule-VCS (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-Find-Rule-VCS



From mcepl at fedoraproject.org  Sun Sep 28 19:10:47 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Sun, 28 Sep 2008 19:10:47 +0000 (UTC)
Subject: rpms/pidgin-facebookchat/devel .cvsignore,1.2,NONE
Message-ID: <20080928191047.C3F3270118@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/pidgin-facebookchat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6847

Removed Files:
	.cvsignore 
Log Message:
Forgot to eliminate .cvsignore


--- .cvsignore DELETED ---



From mcepl at fedoraproject.org  Sun Sep 28 19:12:00 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Sun, 28 Sep 2008 19:12:00 +0000 (UTC)
Subject: rpms/pidgin-facebookchat/F-8 dead.package, NONE, 1.1 .cvsignore, 1.1,
	NONE Makefile, 1.1, NONE branch, 1.1,
	NONE pidgin-facebookchat.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <20080928191200.D8DF570118@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/pidgin-facebookchat/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7037

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile branch pidgin-facebookchat.spec sources 
Log Message:
Death to this package!


--- NEW FILE dead.package ---
Replaced by the duplicate package purple-facebookchat.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- pidgin-facebookchat.spec DELETED ---


--- sources DELETED ---



From rathann at fedoraproject.org  Sun Sep 28 19:12:32 2008
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 28 Sep 2008 19:12:32 +0000 (UTC)
Subject: rpms/freefem++/devel freefem++.spec,1.10,1.11
Message-ID: <20080928191232.5A1C370118@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/freefem++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7062

Modified Files:
	freefem++.spec 
Log Message:
* Sun Sep 28 2008 Dominik Mierzejewski <rpm at greysector.net> 2.24-4.2
- disabled testsuite on ppc64
- kill lamd processes upon completing make check



Index: freefem++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- freefem++.spec	27 Sep 2008 13:12:21 -0000	1.10
+++ freefem++.spec	28 Sep 2008 19:12:02 -0000	1.11
@@ -4,7 +4,7 @@
 Summary: PDE solving tool
 Name: freefem++
 Version: 2.24
-Release: 3%{dotpl}%{?dist}
+Release: 4%{dotpl}%{?dist}
 URL: http://www.freefem.org/ff++/index.htm
 Group: Applications/Engineering
 Source0: http://www.freefem.org/ff++/ftp/%{name}-%{version}%{dashpl}.tar.gz
@@ -91,10 +91,13 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%ifnarch ppc64
 %check
 . /etc/profile.d/modules.sh
 module load %{_libdir}/lam/lam.module
 %{__make} check
+pkill lamd
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -121,6 +124,10 @@
 %{_bindir}/FreeFem++-mpi
 
 %changelog
+* Sun Sep 28 2008 Dominik Mierzejewski <rpm at greysector.net> 2.24-4.2
+- disabled testsuite on ppc64
+- kill lamd processes upon completing make check
+
 * Wed Sep 24 2008 Dominik Mierzejewski <rpm at greysector.net> 2.24-3.2
 - updated to 2.24-2
 - fixed build in rawhide



From mcepl at fedoraproject.org  Sun Sep 28 19:12:43 2008
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Sun, 28 Sep 2008 19:12:43 +0000 (UTC)
Subject: rpms/pidgin-facebookchat/F-9 dead.package, NONE, 1.1 .cvsignore, 1.1,
	NONE Makefile, 1.1, NONE branch, 1.1,
	NONE pidgin-facebookchat.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <20080928191243.9954F70118@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/pidgin-facebookchat/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7201

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile branch pidgin-facebookchat.spec sources 
Log Message:
Death to this package!


--- NEW FILE dead.package ---
Replaced by the duplicate package purple-facebookchat.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- pidgin-facebookchat.spec DELETED ---


--- sources DELETED ---



From kevin at fedoraproject.org  Sun Sep 28 19:13:45 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:13:45 +0000 (UTC)
Subject: rpms/perl-Module-Extract Makefile,NONE,1.1
Message-ID: <20080928191345.2F7AE70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Module-Extract
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMO7460/rpms/perl-Module-Extract

Added Files:
	Makefile 
Log Message:
Setup of module perl-Module-Extract


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Module-Extract
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 28 19:13:44 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:13:44 +0000 (UTC)
Subject: rpms/perl-Module-Extract - New directory
Message-ID: <20080928191344.1FDDF70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Module-Extract
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMO7460/rpms/perl-Module-Extract

Log Message:
Directory /cvs/extras/rpms/perl-Module-Extract added to the repository




From pkgdb at fedoraproject.org  Sun Sep 28 19:13:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:13:37 +0000
Subject: [pkgdb] perl-Module-Extract (Fedora, devel) updated by kevin
Message-ID: <20080928191337.68539208DA0@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Module-Extract (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Module-Extract (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Extract



From kevin at fedoraproject.org  Sun Sep 28 19:13:44 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:13:44 +0000 (UTC)
Subject: rpms/perl-Module-Extract/devel - New directory
Message-ID: <20080928191344.5996270118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Module-Extract/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMO7460/rpms/perl-Module-Extract/devel

Log Message:
Directory /cvs/extras/rpms/perl-Module-Extract/devel added to the repository




From pkgdb at fedoraproject.org  Sun Sep 28 19:13:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:13:36 +0000
Subject: [pkgdb] perl-Module-Extract was added for mmaslano
Message-ID: <20080928191336.63776208D74@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Module-Extract with summary base class for creating module for Perl
kevin has approved Package perl-Module-Extract
kevin has added a Fedora devel branch for perl-Module-Extract with an owner of mmaslano
kevin has approved perl-Module-Extract in Fedora devel
kevin has approved Package perl-Module-Extract
kevin has set commit to Approved for packager on perl-Module-Extract (Fedora devel)
kevin has set build to Approved for packager on perl-Module-Extract (Fedora devel)
kevin has set checkout to Approved for packager on perl-Module-Extract (Fedora devel)
kevin has set commit to Approved for uberpackager on perl-Module-Extract (Fedora devel)
kevin has set build to Approved for uberpackager on perl-Module-Extract (Fedora devel)
kevin has set checkout to Approved for uberpackager on perl-Module-Extract (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Extract



From kevin at fedoraproject.org  Sun Sep 28 19:13:45 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:13:45 +0000 (UTC)
Subject: rpms/perl-Module-Extract/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080928191345.6B61D70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Module-Extract/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMO7460/rpms/perl-Module-Extract/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Module-Extract


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Module-Extract
# $Id: Makefile,v 1.1 2008/09/28 19:13:45 kevin Exp $
NAME := perl-Module-Extract
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 28 19:14:31 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:14:31 +0000
Subject: [pkgdb] perl-Module-Inspector was added for mmaslano
Message-ID: <20080928191431.F20D8208D75@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Module-Inspector with summary parsers and object models for various files
kevin has approved Package perl-Module-Inspector
kevin has added a Fedora devel branch for perl-Module-Inspector with an owner of mmaslano
kevin has approved perl-Module-Inspector in Fedora devel
kevin has approved Package perl-Module-Inspector
kevin has set commit to Approved for packager on perl-Module-Inspector (Fedora devel)
kevin has set build to Approved for packager on perl-Module-Inspector (Fedora devel)
kevin has set checkout to Approved for packager on perl-Module-Inspector (Fedora devel)
kevin has set commit to Approved for uberpackager on perl-Module-Inspector (Fedora devel)
kevin has set build to Approved for uberpackager on perl-Module-Inspector (Fedora devel)
kevin has set checkout to Approved for uberpackager on perl-Module-Inspector (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Inspector



From pkgdb at fedoraproject.org  Sun Sep 28 19:14:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:14:33 +0000
Subject: [pkgdb] perl-Module-Inspector (Fedora, devel) updated by kevin
Message-ID: <20080928191433.D46ED208DA0@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Module-Inspector (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Module-Inspector (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Inspector



From kevin at fedoraproject.org  Sun Sep 28 19:14:42 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:14:42 +0000 (UTC)
Subject: rpms/perl-Module-Inspector - New directory
Message-ID: <20080928191442.1E8E570118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Module-Inspector
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVH7560/rpms/perl-Module-Inspector

Log Message:
Directory /cvs/extras/rpms/perl-Module-Inspector added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:14:42 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:14:42 +0000 (UTC)
Subject: rpms/perl-Module-Inspector/devel - New directory
Message-ID: <20080928191442.5199B70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Module-Inspector/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVH7560/rpms/perl-Module-Inspector/devel

Log Message:
Directory /cvs/extras/rpms/perl-Module-Inspector/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:14:43 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:14:43 +0000 (UTC)
Subject: rpms/perl-Module-Inspector Makefile,NONE,1.1
Message-ID: <20080928191443.1F9FD70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Module-Inspector
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVH7560/rpms/perl-Module-Inspector

Added Files:
	Makefile 
Log Message:
Setup of module perl-Module-Inspector


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Module-Inspector
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 28 19:14:43 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:14:43 +0000 (UTC)
Subject: rpms/perl-Module-Inspector/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20080928191443.5E2D870118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Module-Inspector/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVH7560/rpms/perl-Module-Inspector/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Module-Inspector


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Module-Inspector
# $Id: Makefile,v 1.1 2008/09/28 19:14:43 kevin Exp $
NAME := perl-Module-Inspector
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Sun Sep 28 19:15:26 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:15:26 +0000 (UTC)
Subject: rpms/perl-Module-Manifest - New directory
Message-ID: <20080928191526.277C67013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Module-Manifest
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZe7751/rpms/perl-Module-Manifest

Log Message:
Directory /cvs/extras/rpms/perl-Module-Manifest added to the repository




From pkgdb at fedoraproject.org  Sun Sep 28 19:15:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:15:17 +0000
Subject: [pkgdb] perl-Module-Manifest was added for mmaslano
Message-ID: <20080928191518.15170208D74@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Module-Manifest with summary simple utility module for Module::Inspector
kevin has approved Package perl-Module-Manifest
kevin has added a Fedora devel branch for perl-Module-Manifest with an owner of mmaslano
kevin has approved perl-Module-Manifest in Fedora devel
kevin has approved Package perl-Module-Manifest
kevin has set commit to Approved for packager on perl-Module-Manifest (Fedora devel)
kevin has set build to Approved for packager on perl-Module-Manifest (Fedora devel)
kevin has set checkout to Approved for packager on perl-Module-Manifest (Fedora devel)
kevin has set commit to Approved for uberpackager on perl-Module-Manifest (Fedora devel)
kevin has set build to Approved for uberpackager on perl-Module-Manifest (Fedora devel)
kevin has set checkout to Approved for uberpackager on perl-Module-Manifest (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Manifest



From pkgdb at fedoraproject.org  Sun Sep 28 19:15:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:15:19 +0000
Subject: [pkgdb] perl-Module-Manifest (Fedora, devel) updated by kevin
Message-ID: <20080928191519.9645F208DA0@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Module-Manifest (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Module-Manifest (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Manifest



From kevin at fedoraproject.org  Sun Sep 28 19:15:26 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:15:26 +0000 (UTC)
Subject: rpms/perl-Module-Manifest/devel - New directory
Message-ID: <20080928191526.6E5E07013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Module-Manifest/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZe7751/rpms/perl-Module-Manifest/devel

Log Message:
Directory /cvs/extras/rpms/perl-Module-Manifest/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:15:27 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:15:27 +0000 (UTC)
Subject: rpms/perl-Module-Manifest Makefile,NONE,1.1
Message-ID: <20080928191527.8535F7013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Module-Manifest
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZe7751/rpms/perl-Module-Manifest

Added Files:
	Makefile 
Log Message:
Setup of module perl-Module-Manifest


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Module-Manifest
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 28 19:15:27 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:15:27 +0000 (UTC)
Subject: rpms/perl-Module-Manifest/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080928191527.E8DAE7013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Module-Manifest/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZe7751/rpms/perl-Module-Manifest/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Module-Manifest


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Module-Manifest
# $Id: Makefile,v 1.1 2008/09/28 19:15:27 kevin Exp $
NAME := perl-Module-Manifest
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From s4504kr at fedoraproject.org  Sun Sep 28 19:19:10 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Sun, 28 Sep 2008 19:19:10 +0000 (UTC)
Subject: rpms/ksplice/F-9 ksplice-0.9.0-zlib-configure.patch, NONE,
	1.1 ksplice.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080928191910.46E0970118@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/ksplice/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8120

Modified Files:
	sources 
Added Files:
	ksplice-0.9.0-zlib-configure.patch ksplice.spec 
Log Message:
Initional import

ksplice-0.9.0-zlib-configure.patch:

--- NEW FILE ksplice-0.9.0-zlib-configure.patch ---
(1) Recent binutils include support for compressed sections which requires zlib.

(2) Fedora provides only static libbfd.a (not libbfd.so) for 3rd party
    applications linking.

    (2a) libbfd does not keep API/ABI compatibility.

    (2b) Version-bumping the library on each change would create either a lot
         of multiply installed versions of libfd or breaking dependencies of
         the built packages against libbfd.so

(3) Fedora does not provide libtool scripts in general (libbfd.la in this case).

As .a libraries cannot provide their depdendency list on themselves it needs to
be cared of by the application using them.  Patch attached.

Signed-off-by: Jan Kratochvil <jan.kratochvil at redhat.com>

--- ksplice-0.9.0/configure.ac	2008-09-13 05:41:52.000000000 +0200
+++ ksplice-0.9.0-src-patched/configure.ac	2008-09-21 21:29:13.000000000 +0200
@@ -15,6 +15,12 @@ AC_ARG_WITH(libiberty,
   [ ac_libiberty=NONE ]
 )
 
+AC_ARG_WITH(libz,
+  [  --with-libz=FILE         path to libz.a ],
+  [ ac_libz=$withval ],
+  [ ac_libz=NONE ]
+)
+
 AC_ARG_WITH(bfd-include-dir,
   [  --with-bfd-include-dir=DIR
                           path to directory containing bfd.h ],
@@ -25,6 +31,12 @@ AC_ARG_WITH(bfd-include-dir,
 AC_PROG_CC
 AC_CHECK_HEADERS(bfd.h,, BFD_H="no")
 
+if test "$ac_libz" = "yes"; then
+  AC_CHECK_LIB(z, zlibVersion)
+  ac_libz=auto
+else
+  LIBS="$ac_libz $LIBS"
+fi
 if test "$ac_libiberty" = "NONE"; then
   AC_CHECK_LIB(iberty, objalloc_create)
   ac_libiberty=auto
@@ -63,6 +75,10 @@ if ! test -e "objdiff-static" || ! test 
     echo
     echo "  ./configure --with-libbfd=<libbfd.a> --with-libiberty=<libiberty.a>"
     echo
+    echo "Depending on the host system you may also need to provide zlib:"
+    echo
+    echo "  ./configure ... --with-libz=<libz.a>"
+    echo
     exit 1
   fi
 


--- NEW FILE ksplice.spec ---
Name:		ksplice
Version:	0.9.0
Release:	3%{?dist}
Summary:	Patching a Linux kernel without reboot

Group:		System Environment/Kernel
License:	GPLv2
URL:		http://web.mit.edu/ksplice
Source0:	http://web.mit.edu/ksplice/dist/ksplice-%{version}-src.tar.gz
#
# bin-utils maintainer has sent the patch to upstream
#
Patch0:		ksplice-0.9.0-zlib-configure.patch

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

ExcludeArch:	ppc64, ppc

BuildRequires:	autoconf
BuildRequires:	binutils-devel, perl
BuildRequires:	zlib-devel

Requires:	gcc >= 3.4.2
Requires:	patch >= 2.5.4
Requires:	module-init-tools
Requires:	binutils >= 2.12
Requires:	bash >= 2.03
Requires:	make >= 3.78
Requires:	sh-utils, m4,
Requires:	findutils, diffutils, tar, gzip, bzip2, perl, gawk
Requires:	util-linux-ng

%description
Ksplice allows system administrators to apply security patches to the 
Linux kernel without having to reboot. Ksplice takes as input a source 
code change in unified diff format and the kernel source code to be 
patched, and it applies the patch to the corresponding running kernel. 
The running kernel does not need to have been prepared in advance in 
any way.

%prep
%setup -q
%patch0 -p1 -b .zlib

# Filter ksplce as a provide

cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* |\
sed -e '/perl(Ksplice)/d'
EOF

%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
chmod +x %{__perl_provides}

cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(Ksplice)/d'
EOF

%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
chmod +x %{__perl_requires}

%build
autoconf
%configure  --with-libz
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,-)
%{_bindir}/ksplice-*
%{_sbindir}/ksplice-*
%{_libexecdir}/ksplice-*
%{_datadir}/ksplice/
%{_mandir}/man8/ksplice-*

%doc COPYING README

%changelog
* Wed Sep 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-3
- Comment about upstream status of the zlib patch
- Remove rsync Req./BR.
- Filtering perl(Ksplice)

* Mon Sep 22 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-2
- Add ksplice-zlib-configure patch (BZ #463101)

* Sun Sep 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-1
- New upstream release

* Tue Sep  9 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-12
- Spin off of fedora-ksplice out of this package

* Mon Aug  4 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-11
- Correcting some typos
- Add trap in fedora-ksplice-prepare

* Sun Aug  3 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-10
- Add fedora-ksplice-create script

* Sun Aug  3 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-9
- Rename fedora specific subpackage

* Thu Jul 31 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-8
- Add copyright notice in kspliceprep
- Create ksplice dir and content in kernel sources

* Thu Jul 31 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-7
- Enhanced version of kspliceprep which needs no kernel compilation

* Thu Jul 31 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-6
- Add more kernel-releate Requires
- Add script for prepare fedora sources for ksplice

* Thu Jul 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-5
- Filtering perl provides
- Using 'ExcludeArch' instead of 'ExclusiveArch'

* Wed Jul 23 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-3
- Add some new Reqs. and BRs
- Rescrict Arch on %%{x86} and x86_64

* Mon Jul 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-2
- Fix broken upstream URI

* Tue Jul  8 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-1
- Initional Package



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksplice/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 18:56:49 -0000	1.1
+++ sources	28 Sep 2008 19:18:39 -0000	1.2
@@ -0,0 +1 @@
+33934d125cdc050cd68f8ea34f1f4f23  ksplice-0.9.0-src.tar.gz



From s4504kr at fedoraproject.org  Sun Sep 28 19:20:47 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Sun, 28 Sep 2008 19:20:47 +0000 (UTC)
Subject: rpms/ksplice/F-8 ksplice-0.9.0-zlib-configure.patch, NONE,
	1.1 ksplice.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20080928192047.1797270118@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/ksplice/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8266

Modified Files:
	sources 
Added Files:
	ksplice-0.9.0-zlib-configure.patch ksplice.spec 
Log Message:
Initional import

ksplice-0.9.0-zlib-configure.patch:

--- NEW FILE ksplice-0.9.0-zlib-configure.patch ---
(1) Recent binutils include support for compressed sections which requires zlib.

(2) Fedora provides only static libbfd.a (not libbfd.so) for 3rd party
    applications linking.

    (2a) libbfd does not keep API/ABI compatibility.

    (2b) Version-bumping the library on each change would create either a lot
         of multiply installed versions of libfd or breaking dependencies of
         the built packages against libbfd.so

(3) Fedora does not provide libtool scripts in general (libbfd.la in this case).

As .a libraries cannot provide their depdendency list on themselves it needs to
be cared of by the application using them.  Patch attached.

Signed-off-by: Jan Kratochvil <jan.kratochvil at redhat.com>

--- ksplice-0.9.0/configure.ac	2008-09-13 05:41:52.000000000 +0200
+++ ksplice-0.9.0-src-patched/configure.ac	2008-09-21 21:29:13.000000000 +0200
@@ -15,6 +15,12 @@ AC_ARG_WITH(libiberty,
   [ ac_libiberty=NONE ]
 )
 
+AC_ARG_WITH(libz,
+  [  --with-libz=FILE         path to libz.a ],
+  [ ac_libz=$withval ],
+  [ ac_libz=NONE ]
+)
+
 AC_ARG_WITH(bfd-include-dir,
   [  --with-bfd-include-dir=DIR
                           path to directory containing bfd.h ],
@@ -25,6 +31,12 @@ AC_ARG_WITH(bfd-include-dir,
 AC_PROG_CC
 AC_CHECK_HEADERS(bfd.h,, BFD_H="no")
 
+if test "$ac_libz" = "yes"; then
+  AC_CHECK_LIB(z, zlibVersion)
+  ac_libz=auto
+else
+  LIBS="$ac_libz $LIBS"
+fi
 if test "$ac_libiberty" = "NONE"; then
   AC_CHECK_LIB(iberty, objalloc_create)
   ac_libiberty=auto
@@ -63,6 +75,10 @@ if ! test -e "objdiff-static" || ! test 
     echo
     echo "  ./configure --with-libbfd=<libbfd.a> --with-libiberty=<libiberty.a>"
     echo
+    echo "Depending on the host system you may also need to provide zlib:"
+    echo
+    echo "  ./configure ... --with-libz=<libz.a>"
+    echo
     exit 1
   fi
 


--- NEW FILE ksplice.spec ---
Name:		ksplice
Version:	0.9.0
Release:	3%{?dist}
Summary:	Patching a Linux kernel without reboot

Group:		System Environment/Kernel
License:	GPLv2
URL:		http://web.mit.edu/ksplice
Source0:	http://web.mit.edu/ksplice/dist/ksplice-%{version}-src.tar.gz
#
# bin-utils maintainer has sent the patch to upstream
#
Patch0:		ksplice-0.9.0-zlib-configure.patch

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

ExcludeArch:	ppc64, ppc

BuildRequires:	autoconf
BuildRequires:	binutils-devel, perl
BuildRequires:	zlib-devel

Requires:	gcc >= 3.4.2
Requires:	patch >= 2.5.4
Requires:	module-init-tools
Requires:	binutils >= 2.12
Requires:	bash >= 2.03
Requires:	make >= 3.78
Requires:	sh-utils, m4,
Requires:	findutils, diffutils, tar, gzip, bzip2, perl, gawk
Requires:	util-linux-ng

%description
Ksplice allows system administrators to apply security patches to the 
Linux kernel without having to reboot. Ksplice takes as input a source 
code change in unified diff format and the kernel source code to be 
patched, and it applies the patch to the corresponding running kernel. 
The running kernel does not need to have been prepared in advance in 
any way.

%prep
%setup -q
%patch0 -p1 -b .zlib

# Filter ksplce as a provide

cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* |\
sed -e '/perl(Ksplice)/d'
EOF

%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
chmod +x %{__perl_provides}

cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(Ksplice)/d'
EOF

%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
chmod +x %{__perl_requires}

%build
autoconf
%configure  --with-libz
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,-)
%{_bindir}/ksplice-*
%{_sbindir}/ksplice-*
%{_libexecdir}/ksplice-*
%{_datadir}/ksplice/
%{_mandir}/man8/ksplice-*

%doc COPYING README

%changelog
* Wed Sep 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-3
- Comment about upstream status of the zlib patch
- Remove rsync Req./BR.
- Filtering perl(Ksplice)

* Mon Sep 22 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-2
- Add ksplice-zlib-configure patch (BZ #463101)

* Sun Sep 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-1
- New upstream release

* Tue Sep  9 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-12
- Spin off of fedora-ksplice out of this package

* Mon Aug  4 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-11
- Correcting some typos
- Add trap in fedora-ksplice-prepare

* Sun Aug  3 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-10
- Add fedora-ksplice-create script

* Sun Aug  3 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-9
- Rename fedora specific subpackage

* Thu Jul 31 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-8
- Add copyright notice in kspliceprep
- Create ksplice dir and content in kernel sources

* Thu Jul 31 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-7
- Enhanced version of kspliceprep which needs no kernel compilation

* Thu Jul 31 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-6
- Add more kernel-releate Requires
- Add script for prepare fedora sources for ksplice

* Thu Jul 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-5
- Filtering perl provides
- Using 'ExcludeArch' instead of 'ExclusiveArch'

* Wed Jul 23 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-3
- Add some new Reqs. and BRs
- Rescrict Arch on %%{x86} and x86_64

* Mon Jul 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-2
- Fix broken upstream URI

* Tue Jul  8 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.8.7-1
- Initional Package



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksplice/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 18:56:49 -0000	1.1
+++ sources	28 Sep 2008 19:20:16 -0000	1.2
@@ -0,0 +1 @@
+33934d125cdc050cd68f8ea34f1f4f23  ksplice-0.9.0-src.tar.gz



From pkgdb at fedoraproject.org  Sun Sep 28 19:21:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:21:14 +0000
Subject: [pkgdb] freedink (Fedora, 8) updated by kevin
Message-ID: <20080928192114.8503D208DA2@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for freedink
kevin has set commit to Approved for uberpackager on freedink (Fedora 8)
kevin has set build to Approved for uberpackager on freedink (Fedora 8)
kevin has set checkout to Approved for uberpackager on freedink (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freedink



From pkgdb at fedoraproject.org  Sun Sep 28 19:21:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:21:12 +0000
Subject: [pkgdb] freedink was added for beuc
Message-ID: <20080928192112.6294E208D75@bastion.fedora.phx.redhat.com>

kevin has added Package freedink with summary Adventure and role-playing game
kevin has approved Package freedink
kevin has added a Fedora devel branch for freedink with an owner of beuc
kevin has approved freedink in Fedora devel
kevin has approved Package freedink
kevin has set commit to Approved for packager on freedink (Fedora devel)
kevin has set build to Approved for packager on freedink (Fedora devel)
kevin has set checkout to Approved for packager on freedink (Fedora devel)
kevin has set commit to Approved for uberpackager on freedink (Fedora devel)
kevin has set build to Approved for uberpackager on freedink (Fedora devel)
kevin has set checkout to Approved for uberpackager on freedink (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freedink



From kevin at fedoraproject.org  Sun Sep 28 19:21:26 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:21:26 +0000 (UTC)
Subject: rpms/freedink - New directory
Message-ID: <20080928192126.24AF070118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/freedink
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLT8348/rpms/freedink

Log Message:
Directory /cvs/extras/rpms/freedink added to the repository




From pkgdb at fedoraproject.org  Sun Sep 28 19:21:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:21:14 +0000
Subject: [pkgdb] freedink (Fedora, 9) updated by kevin
Message-ID: <20080928192114.90503208DA8@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for freedink
kevin has set commit to Approved for uberpackager on freedink (Fedora 9)
kevin has set build to Approved for uberpackager on freedink (Fedora 9)
kevin has set checkout to Approved for uberpackager on freedink (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freedink



From kevin at fedoraproject.org  Sun Sep 28 19:21:26 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:21:26 +0000 (UTC)
Subject: rpms/freedink/devel - New directory
Message-ID: <20080928192126.5E06D70141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/freedink/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLT8348/rpms/freedink/devel

Log Message:
Directory /cvs/extras/rpms/freedink/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:21:27 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:21:27 +0000 (UTC)
Subject: rpms/freedink Makefile,NONE,1.1
Message-ID: <20080928192127.4A1D070118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/freedink
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLT8348/rpms/freedink

Added Files:
	Makefile 
Log Message:
Setup of module freedink


--- NEW FILE Makefile ---
# Top level Makefile for module freedink
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 28 19:21:27 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:21:27 +0000 (UTC)
Subject: rpms/freedink/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080928192127.8710370118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/freedink/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLT8348/rpms/freedink/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module freedink


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: freedink
# $Id: Makefile,v 1.1 2008/09/28 19:21:27 kevin Exp $
NAME := freedink
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 28 19:21:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:21:51 +0000
Subject: [pkgdb] freedink-data was added for beuc
Message-ID: <20080928192151.CC0E9208D9F@bastion.fedora.phx.redhat.com>

kevin has added Package freedink-data with summary Adventure and role-playing game (game data)
kevin has approved Package freedink-data
kevin has added a Fedora devel branch for freedink-data with an owner of beuc
kevin has approved freedink-data in Fedora devel
kevin has approved Package freedink-data
kevin has set commit to Approved for packager on freedink-data (Fedora devel)
kevin has set build to Approved for packager on freedink-data (Fedora devel)
kevin has set checkout to Approved for packager on freedink-data (Fedora devel)
kevin has set commit to Approved for uberpackager on freedink-data (Fedora devel)
kevin has set build to Approved for uberpackager on freedink-data (Fedora devel)
kevin has set checkout to Approved for uberpackager on freedink-data (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freedink-data



From pkgdb at fedoraproject.org  Sun Sep 28 19:21:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:21:53 +0000
Subject: [pkgdb] freedink-data (Fedora, 8) updated by kevin
Message-ID: <20080928192153.4B5AE208DA5@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for freedink-data
kevin has set commit to Approved for uberpackager on freedink-data (Fedora 8)
kevin has set build to Approved for uberpackager on freedink-data (Fedora 8)
kevin has set checkout to Approved for uberpackager on freedink-data (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freedink-data



From pkgdb at fedoraproject.org  Sun Sep 28 19:21:53 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:21:53 +0000
Subject: [pkgdb] freedink-data (Fedora, 9) updated by kevin
Message-ID: <20080928192153.5F381208DA9@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for freedink-data
kevin has set commit to Approved for uberpackager on freedink-data (Fedora 9)
kevin has set build to Approved for uberpackager on freedink-data (Fedora 9)
kevin has set checkout to Approved for uberpackager on freedink-data (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freedink-data



From kevin at fedoraproject.org  Sun Sep 28 19:22:09 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:22:09 +0000 (UTC)
Subject: rpms/freedink-data - New directory
Message-ID: <20080928192209.2DC6F70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/freedink-data
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLK8514/rpms/freedink-data

Log Message:
Directory /cvs/extras/rpms/freedink-data added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:22:09 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:22:09 +0000 (UTC)
Subject: rpms/freedink-data/devel - New directory
Message-ID: <20080928192209.68B8270118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/freedink-data/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLK8514/rpms/freedink-data/devel

Log Message:
Directory /cvs/extras/rpms/freedink-data/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:22:10 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:22:10 +0000 (UTC)
Subject: rpms/freedink-data Makefile,NONE,1.1
Message-ID: <20080928192210.6B6DC70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/freedink-data
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLK8514/rpms/freedink-data

Added Files:
	Makefile 
Log Message:
Setup of module freedink-data


--- NEW FILE Makefile ---
# Top level Makefile for module freedink-data
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 28 19:22:10 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:22:10 +0000 (UTC)
Subject: rpms/freedink-data/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080928192210.A816C70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/freedink-data/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLK8514/rpms/freedink-data/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module freedink-data


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: freedink-data
# $Id: Makefile,v 1.1 2008/09/28 19:22:10 kevin Exp $
NAME := freedink-data
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 28 19:22:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:22:44 +0000
Subject: [pkgdb] freedink-dfarc was added for beuc
Message-ID: <20080928192244.5DEAB208D74@bastion.fedora.phx.redhat.com>

kevin has added Package freedink-dfarc with summary Frontend and .dmod installer for GNU FreeDink
kevin has approved Package freedink-dfarc
kevin has added a Fedora devel branch for freedink-dfarc with an owner of beuc
kevin has approved freedink-dfarc in Fedora devel
kevin has approved Package freedink-dfarc
kevin has set commit to Approved for packager on freedink-dfarc (Fedora devel)
kevin has set build to Approved for packager on freedink-dfarc (Fedora devel)
kevin has set checkout to Approved for packager on freedink-dfarc (Fedora devel)
kevin has set commit to Approved for uberpackager on freedink-dfarc (Fedora devel)
kevin has set build to Approved for uberpackager on freedink-dfarc (Fedora devel)
kevin has set checkout to Approved for uberpackager on freedink-dfarc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freedink-dfarc



From pkgdb at fedoraproject.org  Sun Sep 28 19:22:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:22:46 +0000
Subject: [pkgdb] freedink-dfarc (Fedora, 8) updated by kevin
Message-ID: <20080928192246.62471208DA0@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for freedink-dfarc
kevin has set commit to Approved for uberpackager on freedink-dfarc (Fedora 8)
kevin has set build to Approved for uberpackager on freedink-dfarc (Fedora 8)
kevin has set checkout to Approved for uberpackager on freedink-dfarc (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freedink-dfarc



From pkgdb at fedoraproject.org  Sun Sep 28 19:22:46 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:22:46 +0000
Subject: [pkgdb] freedink-dfarc (Fedora, 9) updated by kevin
Message-ID: <20080928192246.73455208DA7@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for freedink-dfarc
kevin has set commit to Approved for uberpackager on freedink-dfarc (Fedora 9)
kevin has set build to Approved for uberpackager on freedink-dfarc (Fedora 9)
kevin has set checkout to Approved for uberpackager on freedink-dfarc (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freedink-dfarc



From kevin at fedoraproject.org  Sun Sep 28 19:22:57 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:22:57 +0000 (UTC)
Subject: rpms/freedink-dfarc - New directory
Message-ID: <20080928192257.2163A70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/freedink-dfarc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsty8691/rpms/freedink-dfarc

Log Message:
Directory /cvs/extras/rpms/freedink-dfarc added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:22:57 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:22:57 +0000 (UTC)
Subject: rpms/freedink-dfarc/devel - New directory
Message-ID: <20080928192257.57CD670118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/freedink-dfarc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsty8691/rpms/freedink-dfarc/devel

Log Message:
Directory /cvs/extras/rpms/freedink-dfarc/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:22:58 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:22:58 +0000 (UTC)
Subject: rpms/freedink-dfarc Makefile,NONE,1.1
Message-ID: <20080928192258.3CCE370118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/freedink-dfarc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsty8691/rpms/freedink-dfarc

Added Files:
	Makefile 
Log Message:
Setup of module freedink-dfarc


--- NEW FILE Makefile ---
# Top level Makefile for module freedink-dfarc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 28 19:22:58 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:22:58 +0000 (UTC)
Subject: rpms/freedink-dfarc/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080928192258.72C5470118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/freedink-dfarc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsty8691/rpms/freedink-dfarc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module freedink-dfarc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: freedink-dfarc
# $Id: Makefile,v 1.1 2008/09/28 19:22:58 kevin Exp $
NAME := freedink-dfarc
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From s4504kr at fedoraproject.org  Sun Sep 28 19:23:47 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Sun, 28 Sep 2008 19:23:47 +0000 (UTC)
Subject: rpms/ksplice/devel ksplice.spec,1.1,1.2
Message-ID: <20080928192347.0DAD570118@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/ksplice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8852

Modified Files:
	ksplice.spec 
Log Message:
Rebuild


Index: ksplice.spec
===================================================================
RCS file: /cvs/extras/rpms/ksplice/devel/ksplice.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ksplice.spec	28 Sep 2008 19:05:50 -0000	1.1
+++ ksplice.spec	28 Sep 2008 19:23:16 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		ksplice
 Version:	0.9.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Patching a Linux kernel without reboot
 
 Group:		System Environment/Kernel
@@ -85,6 +85,9 @@
 %doc COPYING README
 
 %changelog
+* Sun Sep 28 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-4
+- Rebuild
+
 * Wed Sep 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-3
 - Comment about upstream status of the zlib patch
 - Remove rsync Req./BR.



From pkgdb at fedoraproject.org  Sun Sep 28 19:24:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:24:22 +0000
Subject: [pkgdb] xmmsctrl was added for oget
Message-ID: <20080928192422.E987C208DA0@bastion.fedora.phx.redhat.com>

kevin has added Package xmmsctrl with summary Command line control utility for xmms
kevin has approved Package xmmsctrl
kevin has added a Fedora devel branch for xmmsctrl with an owner of oget
kevin has approved xmmsctrl in Fedora devel
kevin has approved Package xmmsctrl
kevin has set commit to Approved for packager on xmmsctrl (Fedora devel)
kevin has set build to Approved for packager on xmmsctrl (Fedora devel)
kevin has set checkout to Approved for packager on xmmsctrl (Fedora devel)
kevin has set commit to Approved for uberpackager on xmmsctrl (Fedora devel)
kevin has set build to Approved for uberpackager on xmmsctrl (Fedora devel)
kevin has set checkout to Approved for uberpackager on xmmsctrl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmmsctrl



From kevin at fedoraproject.org  Sun Sep 28 19:25:01 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:25:01 +0000 (UTC)
Subject: rpms/xmmsctrl - New directory
Message-ID: <20080928192501.25CBA70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xmmsctrl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXy9060/rpms/xmmsctrl

Log Message:
Directory /cvs/extras/rpms/xmmsctrl added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:25:01 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:25:01 +0000 (UTC)
Subject: rpms/xmmsctrl/devel - New directory
Message-ID: <20080928192501.56A1270118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xmmsctrl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXy9060/rpms/xmmsctrl/devel

Log Message:
Directory /cvs/extras/rpms/xmmsctrl/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:25:02 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:25:02 +0000 (UTC)
Subject: rpms/xmmsctrl Makefile,NONE,1.1
Message-ID: <20080928192502.3E61970118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xmmsctrl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXy9060/rpms/xmmsctrl

Added Files:
	Makefile 
Log Message:
Setup of module xmmsctrl


--- NEW FILE Makefile ---
# Top level Makefile for module xmmsctrl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 28 19:25:02 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:25:02 +0000 (UTC)
Subject: rpms/xmmsctrl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080928192502.763C670118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xmmsctrl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXy9060/rpms/xmmsctrl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xmmsctrl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xmmsctrl
# $Id: Makefile,v 1.1 2008/09/28 19:25:02 kevin Exp $
NAME := xmmsctrl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 28 19:26:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:26:27 +0000
Subject: [pkgdb] openoffice-lv was added for caolanm
Message-ID: <20080928192627.768DF208D75@bastion.fedora.phx.redhat.com>

kevin has added Package openoffice-lv with summary Latvian hunspell and hyphen dictionaries
kevin has approved Package openoffice-lv
kevin has added a Fedora devel branch for openoffice-lv with an owner of caolanm
kevin has approved openoffice-lv in Fedora devel
kevin has approved Package openoffice-lv
kevin has set commit to Approved for packager on openoffice-lv (Fedora devel)
kevin has set build to Approved for packager on openoffice-lv (Fedora devel)
kevin has set checkout to Approved for packager on openoffice-lv (Fedora devel)
kevin has set commit to Approved for uberpackager on openoffice-lv (Fedora devel)
kevin has set build to Approved for uberpackager on openoffice-lv (Fedora devel)
kevin has set checkout to Approved for uberpackager on openoffice-lv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openoffice-lv



From kevin at fedoraproject.org  Sun Sep 28 19:26:37 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:26:37 +0000 (UTC)
Subject: rpms/openoffice-lv - New directory
Message-ID: <20080928192637.2DC4670118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/openoffice-lv
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXk9324/rpms/openoffice-lv

Log Message:
Directory /cvs/extras/rpms/openoffice-lv added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:26:37 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:26:37 +0000 (UTC)
Subject: rpms/openoffice-lv/devel - New directory
Message-ID: <20080928192637.68BC570118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/openoffice-lv/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXk9324/rpms/openoffice-lv/devel

Log Message:
Directory /cvs/extras/rpms/openoffice-lv/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:26:38 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:26:38 +0000 (UTC)
Subject: rpms/openoffice-lv Makefile,NONE,1.1
Message-ID: <20080928192638.6C47B70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/openoffice-lv
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXk9324/rpms/openoffice-lv

Added Files:
	Makefile 
Log Message:
Setup of module openoffice-lv


--- NEW FILE Makefile ---
# Top level Makefile for module openoffice-lv
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 28 19:26:38 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:26:38 +0000 (UTC)
Subject: rpms/openoffice-lv/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080928192638.A5C7C70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/openoffice-lv/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXk9324/rpms/openoffice-lv/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module openoffice-lv


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: openoffice-lv
# $Id: Makefile,v 1.1 2008/09/28 19:26:38 kevin Exp $
NAME := openoffice-lv
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 28 19:30:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:30:04 +0000
Subject: [pkgdb] hunspell-ku was added for caolanm
Message-ID: <20080928193004.3F8B1208D74@bastion.fedora.phx.redhat.com>

kevin has added Package hunspell-ku with summary Kurdish hunspell dictionary
kevin has approved Package hunspell-ku
kevin has added a Fedora devel branch for hunspell-ku with an owner of caolanm
kevin has approved hunspell-ku in Fedora devel
kevin has approved Package hunspell-ku
kevin has set commit to Approved for packager on hunspell-ku (Fedora devel)
kevin has set build to Approved for packager on hunspell-ku (Fedora devel)
kevin has set checkout to Approved for packager on hunspell-ku (Fedora devel)
kevin has set commit to Approved for uberpackager on hunspell-ku (Fedora devel)
kevin has set build to Approved for uberpackager on hunspell-ku (Fedora devel)
kevin has set checkout to Approved for uberpackager on hunspell-ku (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-ku



From kevin at fedoraproject.org  Sun Sep 28 19:30:48 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:30:48 +0000 (UTC)
Subject: rpms/hunspell-ku - New directory
Message-ID: <20080928193048.20CC870118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-ku
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscy9646/rpms/hunspell-ku

Log Message:
Directory /cvs/extras/rpms/hunspell-ku added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:30:48 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:30:48 +0000 (UTC)
Subject: rpms/hunspell-ku/devel - New directory
Message-ID: <20080928193048.578D570118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-ku/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscy9646/rpms/hunspell-ku/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-ku/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:30:49 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:30:49 +0000 (UTC)
Subject: rpms/hunspell-ku Makefile,NONE,1.1
Message-ID: <20080928193049.3674C70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-ku
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscy9646/rpms/hunspell-ku

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-ku


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-ku
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 28 19:30:49 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:30:49 +0000 (UTC)
Subject: rpms/hunspell-ku/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080928193049.80CCD70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hunspell-ku/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscy9646/rpms/hunspell-ku/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-ku


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-ku
# $Id: Makefile,v 1.1 2008/09/28 19:30:49 kevin Exp $
NAME := hunspell-ku
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 28 19:31:41 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:31:41 +0000
Subject: [pkgdb] libftdi was added for lucilanga
Message-ID: <20080928193142.2EB08208D74@bastion.fedora.phx.redhat.com>

kevin has added Package libftdi with summary Library to program and control the FTDI USB controller
kevin has approved Package libftdi
kevin has added a Fedora devel branch for libftdi with an owner of lucilanga
kevin has approved libftdi in Fedora devel
kevin has approved Package libftdi
kevin has set commit to Approved for packager on libftdi (Fedora devel)
kevin has set build to Approved for packager on libftdi (Fedora devel)
kevin has set checkout to Approved for packager on libftdi (Fedora devel)
kevin has set commit to Approved for uberpackager on libftdi (Fedora devel)
kevin has set build to Approved for uberpackager on libftdi (Fedora devel)
kevin has set checkout to Approved for uberpackager on libftdi (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libftdi



From pkgdb at fedoraproject.org  Sun Sep 28 19:31:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:31:44 +0000
Subject: [pkgdb] libftdi (Fedora, 8) updated by kevin
Message-ID: <20080928193144.0E683208DA0@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for libftdi
kevin has set commit to Approved for uberpackager on libftdi (Fedora 8)
kevin has set build to Approved for uberpackager on libftdi (Fedora 8)
kevin has set checkout to Approved for uberpackager on libftdi (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libftdi



From kevin at fedoraproject.org  Sun Sep 28 19:31:57 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:31:57 +0000 (UTC)
Subject: rpms/libftdi - New directory
Message-ID: <20080928193157.2AC7870118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libftdi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDb9888/rpms/libftdi

Log Message:
Directory /cvs/extras/rpms/libftdi added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:31:57 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:31:57 +0000 (UTC)
Subject: rpms/libftdi/devel - New directory
Message-ID: <20080928193157.6DD2670118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libftdi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDb9888/rpms/libftdi/devel

Log Message:
Directory /cvs/extras/rpms/libftdi/devel added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:31:58 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:31:58 +0000 (UTC)
Subject: rpms/libftdi Makefile,NONE,1.1
Message-ID: <20080928193158.78B5770118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libftdi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDb9888/rpms/libftdi

Added Files:
	Makefile 
Log Message:
Setup of module libftdi


--- NEW FILE Makefile ---
# Top level Makefile for module libftdi
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Sun Sep 28 19:31:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:31:44 +0000
Subject: [pkgdb] libftdi (Fedora, 9) updated by kevin
Message-ID: <20080928193144.175DF208DA7@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for libftdi
kevin has set commit to Approved for uberpackager on libftdi (Fedora 9)
kevin has set build to Approved for uberpackager on libftdi (Fedora 9)
kevin has set checkout to Approved for uberpackager on libftdi (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libftdi



From kevin at fedoraproject.org  Sun Sep 28 19:31:58 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:31:58 +0000 (UTC)
Subject: rpms/libftdi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080928193158.B745470118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libftdi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDb9888/rpms/libftdi/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libftdi


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libftdi
# $Id: Makefile,v 1.1 2008/09/28 19:31:58 kevin Exp $
NAME := libftdi
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 28 19:33:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:33:08 +0000
Subject: [pkgdb] expendable (Fedora, 8) updated by kevin
Message-ID: <20080928193308.4CF49208DA0@bastion.fedora.phx.redhat.com>

kevin added a Fedora 8 branch for expendable
kevin has set commit to Approved for uberpackager on expendable (Fedora 8)
kevin has set build to Approved for uberpackager on expendable (Fedora 8)
kevin has set checkout to Approved for uberpackager on expendable (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/expendable



From pkgdb at fedoraproject.org  Sun Sep 28 19:33:06 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:33:06 +0000
Subject: [pkgdb] expendable was added for twaugh
Message-ID: <20080928193306.B64FB208D74@bastion.fedora.phx.redhat.com>

kevin has added Package expendable with summary Home finances modeling program
kevin has approved Package expendable
kevin has added a Fedora devel branch for expendable with an owner of twaugh
kevin has approved expendable in Fedora devel
kevin has approved Package expendable
kevin has set commit to Approved for packager on expendable (Fedora devel)
kevin has set build to Approved for packager on expendable (Fedora devel)
kevin has set checkout to Approved for packager on expendable (Fedora devel)
kevin has set commit to Approved for uberpackager on expendable (Fedora devel)
kevin has set build to Approved for uberpackager on expendable (Fedora devel)
kevin has set checkout to Approved for uberpackager on expendable (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/expendable



From kevin at fedoraproject.org  Sun Sep 28 19:33:21 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:33:21 +0000 (UTC)
Subject: rpms/expendable - New directory
Message-ID: <20080928193321.263CE70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/expendable
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc10125/rpms/expendable

Log Message:
Directory /cvs/extras/rpms/expendable added to the repository




From kevin at fedoraproject.org  Sun Sep 28 19:33:21 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:33:21 +0000 (UTC)
Subject: rpms/expendable/devel - New directory
Message-ID: <20080928193321.63D3670118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/expendable/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc10125/rpms/expendable/devel

Log Message:
Directory /cvs/extras/rpms/expendable/devel added to the repository




From pkgdb at fedoraproject.org  Sun Sep 28 19:33:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:33:08 +0000
Subject: [pkgdb] expendable (Fedora, 9) updated by kevin
Message-ID: <20080928193308.564E9208DA7@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for expendable
kevin has set commit to Approved for uberpackager on expendable (Fedora 9)
kevin has set build to Approved for uberpackager on expendable (Fedora 9)
kevin has set checkout to Approved for uberpackager on expendable (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/expendable



From kevin at fedoraproject.org  Sun Sep 28 19:33:22 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:33:22 +0000 (UTC)
Subject: rpms/expendable Makefile,NONE,1.1
Message-ID: <20080928193322.4FE2A70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/expendable
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc10125/rpms/expendable

Added Files:
	Makefile 
Log Message:
Setup of module expendable


--- NEW FILE Makefile ---
# Top level Makefile for module expendable
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Sep 28 19:33:22 2008
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 28 Sep 2008 19:33:22 +0000 (UTC)
Subject: rpms/expendable/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080928193322.8E72E70118@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/expendable/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc10125/rpms/expendable/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module expendable


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: expendable
# $Id: Makefile,v 1.1 2008/09/28 19:33:22 kevin Exp $
NAME := expendable
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Sep 28 19:33:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:33:28 +0000
Subject: [pkgdb] pidgin-facebookchat had group_acl changed
Message-ID: <20080928193328.22B5F208DB2@bastion.fedora.phx.redhat.com>

mcepl has set the commit acl on pidgin-facebookchat (Fedora devel) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-facebookchat



From pkgdb at fedoraproject.org  Sun Sep 28 19:33:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:33:29 +0000
Subject: [pkgdb] pidgin-facebookchat had group_acl changed
Message-ID: <20080928193329.AF4A8208DA0@bastion.fedora.phx.redhat.com>

mcepl has set the commit acl on pidgin-facebookchat (Fedora devel) to Denied for uberpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-facebookchat



From pkgdb at fedoraproject.org  Sun Sep 28 19:33:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:33:32 +0000
Subject: [pkgdb] pidgin-facebookchat had group_acl changed
Message-ID: <20080928193332.576E5208D9F@bastion.fedora.phx.redhat.com>

mcepl has set the commit acl on pidgin-facebookchat (Fedora 8) to Denied for uberpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-facebookchat



From pkgdb at fedoraproject.org  Sun Sep 28 19:33:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:33:33 +0000
Subject: [pkgdb] pidgin-facebookchat had group_acl changed
Message-ID: <20080928193333.A9006208DA2@bastion.fedora.phx.redhat.com>

mcepl has set the commit acl on pidgin-facebookchat (Fedora 8) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-facebookchat



From pkgdb at fedoraproject.org  Sun Sep 28 19:33:34 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:33:34 +0000
Subject: [pkgdb] pidgin-facebookchat had group_acl changed
Message-ID: <20080928193334.ABC51208DB3@bastion.fedora.phx.redhat.com>

mcepl has set the commit acl on pidgin-facebookchat (Fedora 9) to Denied for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-facebookchat



From pkgdb at fedoraproject.org  Sun Sep 28 19:33:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 19:33:35 +0000
Subject: [pkgdb] pidgin-facebookchat had group_acl changed
Message-ID: <20080928193336.04C10208DB5@bastion.fedora.phx.redhat.com>

mcepl has set the commit acl on pidgin-facebookchat (Fedora 9) to Denied for uberpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-facebookchat



From oget at fedoraproject.org  Sun Sep 28 19:44:45 2008
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 28 Sep 2008 19:44:45 +0000 (UTC)
Subject: rpms/xmmsctrl/devel import.log, NONE, 1.1 xmmsctrl-no-strip.patch, 
	NONE, 1.1 xmmsctrl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20080928194445.E04C470118@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/xmmsctrl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10469/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xmmsctrl-no-strip.patch xmmsctrl.spec 
Log Message:
* Sat Sep 28 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-4
- Changed the type of RPM_OPT_FLAGS from CFLAGS to WARN

* Sat Sep 27 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-3
- Added DistTag
- Removed ExclusiveArch
- Changed 0444 file permissions to 0644
- Changed %%defattr to (-,root,root,-)
- Honored Fedora specific compilation flags
- Support parallel make

* Mon Sep 22 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-2
- Repack for Fedora
- Don't strip the binary patch

* Mon Feb 18 2002 Jan IVEN <jan.iven at cern.ch> - 1.8-1
- Initial build.




--- NEW FILE import.log ---
xmmsctrl-1_8-4_fc9:HEAD:xmmsctrl-1.8-4.fc9.src.rpm:1222630517

xmmsctrl-no-strip.patch:

--- NEW FILE xmmsctrl-no-strip.patch ---
diff -rupN old/xmmsctrl-1.8/Makefile new/xmmsctrl-1.8/Makefile
--- old/xmmsctrl-1.8/Makefile	2004-04-02 08:00:12.000000000 -0500
+++ new/xmmsctrl-1.8/Makefile	2008-09-23 00:48:36.000000000 -0400
@@ -16,7 +16,6 @@ all : $(TARGET) HELP
 
 $(TARGET) : xmmsctrl.c removefile.c
 	$(CC) -o $(TARGET) xmmsctrl.c removefile.c $(CFLAGS) $(LDFLAGS)
-	strip xmmsctrl
 
 HELP : xmmsctrl
 	./xmmsctrl > HELP || true


--- NEW FILE xmmsctrl.spec ---
Summary: Command line control utility for xmms
Name: xmmsctrl
Version: 1.8
Release: 4%{?dist}
URL: http://www.docs.uu.se/~adavid
Source0: http://user.it.uu.se/~adavid/utils/%{name}-%{version}.tar.gz
Patch0: xmmsctrl-no-strip.patch
License: GPLv2
Group: Applications/Multimedia
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: xmms
BuildRequires: xmms-devel

%description
xmmsctrl is a small utility to control xmms from the command line. Its
goal is to be used coupled with sh to test xmms state and perform an
appropriate action, e.g. if playing then pause else play. The interest
of this is to bind keys in a window manager to have control over xmms
with keys that do play/next/pause, prev, control sound...

%prep
%setup -q
%patch0 -p2 -b .nostrip
chmod 0644 samples/*

%build
make %{?_smp_mflags} WARN="${RPM_OPT_FLAGS}"

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p ${RPM_BUILD_ROOT}/%{_bindir}
install -m 755  %{name} ${RPM_BUILD_ROOT}/%{_bindir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changelog README HELP samples
%{_bindir}/xmmsctrl

%changelog
* Sat Sep 28 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-4
- Changed the type of RPM_OPT_FLAGS from CFLAGS to WARN

* Sat Sep 27 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-3
- Added DistTag
- Removed ExclusiveArch
- Changed 0444 file permissions to 0644
- Changed %%defattr to (-,root,root,-)
- Honored Fedora specific compilation flags
- Support parallel make

* Mon Sep 22 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-2
- Repack for Fedora
- Don't strip the binary patch

* Mon Feb 18 2002 Jan IVEN <jan.iven at cern.ch> - 1.8-1
- Initial build.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmmsctrl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2008 19:25:02 -0000	1.1
+++ .cvsignore	28 Sep 2008 19:44:15 -0000	1.2
@@ -0,0 +1 @@
+xmmsctrl-1.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmmsctrl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 19:25:02 -0000	1.1
+++ sources	28 Sep 2008 19:44:15 -0000	1.2
@@ -0,0 +1 @@
+0774f3e61cfc89c1fd3f0526c48b35db  xmmsctrl-1.8.tar.gz



From rdieter at fedoraproject.org  Sun Sep 28 19:45:54 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 28 Sep 2008 19:45:54 +0000 (UTC)
Subject: rpms/qt/devel .cvsignore, 1.39, 1.40 qt.spec, 1.210, 1.211 sources, 
	1.40, 1.41
Message-ID: <20080928194554.105A570118@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11222

Modified Files:
	.cvsignore qt.spec sources 
Log Message:
* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.3-1
- 4.4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	21 Sep 2008 22:16:59 -0000	1.39
+++ .cvsignore	28 Sep 2008 19:45:23 -0000	1.40
@@ -1,6 +1,4 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
-qt-x11-opensource-src-4.4.1.tar.bz2
-qt-copy-patches-20080908svn.tar.bz2
-qt-x11-opensource-src-4.4.2.tar.bz2
 qt-copy-patches-20080920svn.tar.bz2
+qt-x11-opensource-src-4.4.3.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- qt.spec	24 Sep 2008 18:30:02 -0000	1.210
+++ qt.spec	28 Sep 2008 19:45:23 -0000	1.211
@@ -8,8 +8,8 @@
 %else
 Name:    qt4
 %endif
-Version: 4.4.2
-Release: 2%{?dist}
+Version: 4.4.3
+Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -731,6 +731,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.3-1
+- 4.4.3
+
 * Wed Sep 24 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.2-2
 - omit systray patch (for now)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	21 Sep 2008 22:17:00 -0000	1.40
+++ sources	28 Sep 2008 19:45:23 -0000	1.41
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-200faca22f861cd09f108df9924f195c  qt-x11-opensource-src-4.4.2.tar.bz2
 d77a7d864375b44b3e9dd3afa53017fa  qt-copy-patches-20080920svn.tar.bz2
+00e00c6324d342a7b0d8653112b4f08c  qt-x11-opensource-src-4.4.3.tar.bz2



From oget at fedoraproject.org  Sun Sep 28 19:48:37 2008
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 28 Sep 2008 19:48:37 +0000 (UTC)
Subject: rpms/xmmsctrl/F-9 import.log, NONE, 1.1 xmmsctrl-no-strip.patch,
	NONE, 
	1.1 xmmsctrl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080928194837.698C370118@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/xmmsctrl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11759/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xmmsctrl-no-strip.patch xmmsctrl.spec 
Log Message:
* Sat Sep 28 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-4
- Changed the type of RPM_OPT_FLAGS from CFLAGS to WARN

* Sat Sep 27 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-3
- Added DistTag
- Removed ExclusiveArch
- Changed 0444 file permissions to 0644
- Changed %%defattr to (-,root,root,-)
- Honored Fedora specific compilation flags
- Support parallel make

* Mon Sep 22 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-2
- Repack for Fedora
- Don't strip the binary patch

* Mon Feb 18 2002 Jan IVEN <jan.iven at cern.ch> - 1.8-1
- Initial build.




--- NEW FILE import.log ---
xmmsctrl-1_8-4_fc9:F-9:xmmsctrl-1.8-4.fc9.src.rpm:1222631279

xmmsctrl-no-strip.patch:

--- NEW FILE xmmsctrl-no-strip.patch ---
diff -rupN old/xmmsctrl-1.8/Makefile new/xmmsctrl-1.8/Makefile
--- old/xmmsctrl-1.8/Makefile	2004-04-02 08:00:12.000000000 -0500
+++ new/xmmsctrl-1.8/Makefile	2008-09-23 00:48:36.000000000 -0400
@@ -16,7 +16,6 @@ all : $(TARGET) HELP
 
 $(TARGET) : xmmsctrl.c removefile.c
 	$(CC) -o $(TARGET) xmmsctrl.c removefile.c $(CFLAGS) $(LDFLAGS)
-	strip xmmsctrl
 
 HELP : xmmsctrl
 	./xmmsctrl > HELP || true


--- NEW FILE xmmsctrl.spec ---
Summary: Command line control utility for xmms
Name: xmmsctrl
Version: 1.8
Release: 4%{?dist}
URL: http://www.docs.uu.se/~adavid
Source0: http://user.it.uu.se/~adavid/utils/%{name}-%{version}.tar.gz
Patch0: xmmsctrl-no-strip.patch
License: GPLv2
Group: Applications/Multimedia
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: xmms
BuildRequires: xmms-devel

%description
xmmsctrl is a small utility to control xmms from the command line. Its
goal is to be used coupled with sh to test xmms state and perform an
appropriate action, e.g. if playing then pause else play. The interest
of this is to bind keys in a window manager to have control over xmms
with keys that do play/next/pause, prev, control sound...

%prep
%setup -q
%patch0 -p2 -b .nostrip
chmod 0644 samples/*

%build
make %{?_smp_mflags} WARN="${RPM_OPT_FLAGS}"

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p ${RPM_BUILD_ROOT}/%{_bindir}
install -m 755  %{name} ${RPM_BUILD_ROOT}/%{_bindir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changelog README HELP samples
%{_bindir}/xmmsctrl

%changelog
* Sat Sep 28 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-4
- Changed the type of RPM_OPT_FLAGS from CFLAGS to WARN

* Sat Sep 27 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-3
- Added DistTag
- Removed ExclusiveArch
- Changed 0444 file permissions to 0644
- Changed %%defattr to (-,root,root,-)
- Honored Fedora specific compilation flags
- Support parallel make

* Mon Sep 22 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-2
- Repack for Fedora
- Don't strip the binary patch

* Mon Feb 18 2002 Jan IVEN <jan.iven at cern.ch> - 1.8-1
- Initial build.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmmsctrl/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2008 19:25:02 -0000	1.1
+++ .cvsignore	28 Sep 2008 19:48:07 -0000	1.2
@@ -0,0 +1 @@
+xmmsctrl-1.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmmsctrl/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 19:25:02 -0000	1.1
+++ sources	28 Sep 2008 19:48:07 -0000	1.2
@@ -0,0 +1 @@
+0774f3e61cfc89c1fd3f0526c48b35db  xmmsctrl-1.8.tar.gz



From oget at fedoraproject.org  Sun Sep 28 19:50:19 2008
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 28 Sep 2008 19:50:19 +0000 (UTC)
Subject: rpms/xmmsctrl/F-8 import.log, NONE, 1.1 xmmsctrl-no-strip.patch,
	NONE, 
	1.1 xmmsctrl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080928195019.DAEC970118@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/xmmsctrl/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12196/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xmmsctrl-no-strip.patch xmmsctrl.spec 
Log Message:
* Sat Sep 28 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-4
- Changed the type of RPM_OPT_FLAGS from CFLAGS to WARN

* Sat Sep 27 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-3
- Added DistTag
- Removed ExclusiveArch
- Changed 0444 file permissions to 0644
- Changed %%defattr to (-,root,root,-)
- Honored Fedora specific compilation flags
- Support parallel make

* Mon Sep 22 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-2
- Repack for Fedora
- Don't strip the binary patch

* Mon Feb 18 2002 Jan IVEN <jan.iven at cern.ch> - 1.8-1
- Initial build.




--- NEW FILE import.log ---
xmmsctrl-1_8-4_fc9:F-8:xmmsctrl-1.8-4.fc9.src.rpm:1222631430

xmmsctrl-no-strip.patch:

--- NEW FILE xmmsctrl-no-strip.patch ---
diff -rupN old/xmmsctrl-1.8/Makefile new/xmmsctrl-1.8/Makefile
--- old/xmmsctrl-1.8/Makefile	2004-04-02 08:00:12.000000000 -0500
+++ new/xmmsctrl-1.8/Makefile	2008-09-23 00:48:36.000000000 -0400
@@ -16,7 +16,6 @@ all : $(TARGET) HELP
 
 $(TARGET) : xmmsctrl.c removefile.c
 	$(CC) -o $(TARGET) xmmsctrl.c removefile.c $(CFLAGS) $(LDFLAGS)
-	strip xmmsctrl
 
 HELP : xmmsctrl
 	./xmmsctrl > HELP || true


--- NEW FILE xmmsctrl.spec ---
Summary: Command line control utility for xmms
Name: xmmsctrl
Version: 1.8
Release: 4%{?dist}
URL: http://www.docs.uu.se/~adavid
Source0: http://user.it.uu.se/~adavid/utils/%{name}-%{version}.tar.gz
Patch0: xmmsctrl-no-strip.patch
License: GPLv2
Group: Applications/Multimedia
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: xmms
BuildRequires: xmms-devel

%description
xmmsctrl is a small utility to control xmms from the command line. Its
goal is to be used coupled with sh to test xmms state and perform an
appropriate action, e.g. if playing then pause else play. The interest
of this is to bind keys in a window manager to have control over xmms
with keys that do play/next/pause, prev, control sound...

%prep
%setup -q
%patch0 -p2 -b .nostrip
chmod 0644 samples/*

%build
make %{?_smp_mflags} WARN="${RPM_OPT_FLAGS}"

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p ${RPM_BUILD_ROOT}/%{_bindir}
install -m 755  %{name} ${RPM_BUILD_ROOT}/%{_bindir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changelog README HELP samples
%{_bindir}/xmmsctrl

%changelog
* Sat Sep 28 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-4
- Changed the type of RPM_OPT_FLAGS from CFLAGS to WARN

* Sat Sep 27 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-3
- Added DistTag
- Removed ExclusiveArch
- Changed 0444 file permissions to 0644
- Changed %%defattr to (-,root,root,-)
- Honored Fedora specific compilation flags
- Support parallel make

* Mon Sep 22 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-2
- Repack for Fedora
- Don't strip the binary patch

* Mon Feb 18 2002 Jan IVEN <jan.iven at cern.ch> - 1.8-1
- Initial build.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmmsctrl/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2008 19:25:02 -0000	1.1
+++ .cvsignore	28 Sep 2008 19:49:49 -0000	1.2
@@ -0,0 +1 @@
+xmmsctrl-1.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmmsctrl/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 19:25:02 -0000	1.1
+++ sources	28 Sep 2008 19:49:49 -0000	1.2
@@ -0,0 +1 @@
+0774f3e61cfc89c1fd3f0526c48b35db  xmmsctrl-1.8.tar.gz



From gemi at fedoraproject.org  Sun Sep 28 19:55:07 2008
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sun, 28 Sep 2008 19:55:07 +0000 (UTC)
Subject: rpms/abcm2ps/devel .cvsignore, 1.43, 1.44 abcm2ps.spec, 1.46,
	1.47 sources, 1.43, 1.44
Message-ID: <20080928195507.615C870118@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/abcm2ps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13059

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new release 5.9.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	13 Feb 2008 20:45:04 -0000	1.43
+++ .cvsignore	28 Sep 2008 19:54:37 -0000	1.44
@@ -1,2 +1,2 @@
-abcm2ps-5.8.0.tar.gz
 abcplus_en-1.1.0.zip
+abcm2ps-5.9.0.tar.gz


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- abcm2ps.spec	13 Feb 2008 20:45:04 -0000	1.46
+++ abcm2ps.spec	28 Sep 2008 19:54:37 -0000	1.47
@@ -1,5 +1,5 @@
 Name:           abcm2ps
-Version:        5.8.0
+Version:        5.9.0
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
@@ -46,12 +46,15 @@
 %files 
 %defattr(-,root,root,-)
 %doc abcplus_en*/*
-%doc *.abc License README features.txt format.txt options.txt Changes
+%doc *.abc *.eps License README features.txt format.txt options.txt Changes
 %{_bindir}/abcm2ps
 %{_datadir}/abcm2ps
 
 
 %changelog
+* Sun Sep 28 2008 Gerard Milmeister <gemi at bluewin.ch> - 5.9.0-1
+- new release 5.9.0
+
 * Wed Feb 13 2008 Gerard Milmeister <gemi at bluewin.ch> - 5.8.0-1
 - new release 5.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abcm2ps/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	13 Feb 2008 20:45:04 -0000	1.43
+++ sources	28 Sep 2008 19:54:37 -0000	1.44
@@ -1,2 +1,2 @@
-0612f9b6e95be3cc3525645bcd5c5016  abcm2ps-5.8.0.tar.gz
 bf8d8ad90ba520f6a9872d2142efbda9  abcplus_en-1.1.0.zip
+7b2652b88c791160129096b976f8123d  abcm2ps-5.9.0.tar.gz



From gemi at fedoraproject.org  Sun Sep 28 19:59:36 2008
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sun, 28 Sep 2008 19:59:36 +0000 (UTC)
Subject: rpms/abcm2ps/F-8 .cvsignore, 1.43, 1.44 abcm2ps.spec, 1.46,
	1.47 sources, 1.43, 1.44
Message-ID: <20080928195936.344F970118@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/abcm2ps/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13448/F-8

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new release 5.9.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abcm2ps/F-8/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	13 Feb 2008 20:44:56 -0000	1.43
+++ .cvsignore	28 Sep 2008 19:59:05 -0000	1.44
@@ -1,2 +1,2 @@
-abcm2ps-5.8.0.tar.gz
 abcplus_en-1.1.0.zip
+abcm2ps-5.9.0.tar.gz


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcm2ps/F-8/abcm2ps.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- abcm2ps.spec	13 Feb 2008 20:44:56 -0000	1.46
+++ abcm2ps.spec	28 Sep 2008 19:59:05 -0000	1.47
@@ -1,5 +1,5 @@
 Name:           abcm2ps
-Version:        5.8.0
+Version:        5.9.0
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
@@ -46,12 +46,15 @@
 %files 
 %defattr(-,root,root,-)
 %doc abcplus_en*/*
-%doc *.abc License README features.txt format.txt options.txt Changes
+%doc *.abc *.eps License README features.txt format.txt options.txt Changes
 %{_bindir}/abcm2ps
 %{_datadir}/abcm2ps
 
 
 %changelog
+* Sun Sep 28 2008 Gerard Milmeister <gemi at bluewin.ch> - 5.9.0-1
+- new release 5.9.0
+
 * Wed Feb 13 2008 Gerard Milmeister <gemi at bluewin.ch> - 5.8.0-1
 - new release 5.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abcm2ps/F-8/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	13 Feb 2008 20:44:56 -0000	1.43
+++ sources	28 Sep 2008 19:59:05 -0000	1.44
@@ -1,2 +1,2 @@
-0612f9b6e95be3cc3525645bcd5c5016  abcm2ps-5.8.0.tar.gz
 bf8d8ad90ba520f6a9872d2142efbda9  abcplus_en-1.1.0.zip
+7b2652b88c791160129096b976f8123d  abcm2ps-5.9.0.tar.gz



From gemi at fedoraproject.org  Sun Sep 28 19:59:36 2008
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sun, 28 Sep 2008 19:59:36 +0000 (UTC)
Subject: rpms/abcm2ps/F-9 .cvsignore, 1.43, 1.44 abcm2ps.spec, 1.46,
	1.47 sources, 1.43, 1.44
Message-ID: <20080928195936.63E2270118@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/abcm2ps/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13448/F-9

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new release 5.9.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abcm2ps/F-9/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	13 Feb 2008 20:45:04 -0000	1.43
+++ .cvsignore	28 Sep 2008 19:59:06 -0000	1.44
@@ -1,2 +1,2 @@
-abcm2ps-5.8.0.tar.gz
 abcplus_en-1.1.0.zip
+abcm2ps-5.9.0.tar.gz


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcm2ps/F-9/abcm2ps.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- abcm2ps.spec	13 Feb 2008 20:45:04 -0000	1.46
+++ abcm2ps.spec	28 Sep 2008 19:59:06 -0000	1.47
@@ -1,5 +1,5 @@
 Name:           abcm2ps
-Version:        5.8.0
+Version:        5.9.0
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
@@ -46,12 +46,15 @@
 %files 
 %defattr(-,root,root,-)
 %doc abcplus_en*/*
-%doc *.abc License README features.txt format.txt options.txt Changes
+%doc *.abc *.eps License README features.txt format.txt options.txt Changes
 %{_bindir}/abcm2ps
 %{_datadir}/abcm2ps
 
 
 %changelog
+* Sun Sep 28 2008 Gerard Milmeister <gemi at bluewin.ch> - 5.9.0-1
+- new release 5.9.0
+
 * Wed Feb 13 2008 Gerard Milmeister <gemi at bluewin.ch> - 5.8.0-1
 - new release 5.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abcm2ps/F-9/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	13 Feb 2008 20:45:04 -0000	1.43
+++ sources	28 Sep 2008 19:59:06 -0000	1.44
@@ -1,2 +1,2 @@
-0612f9b6e95be3cc3525645bcd5c5016  abcm2ps-5.8.0.tar.gz
 bf8d8ad90ba520f6a9872d2142efbda9  abcplus_en-1.1.0.zip
+7b2652b88c791160129096b976f8123d  abcm2ps-5.9.0.tar.gz



From rdieter at fedoraproject.org  Sun Sep 28 20:04:12 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 28 Sep 2008 20:04:12 +0000 (UTC)
Subject: rpms/qt/F-9 .cvsignore, 1.34, 1.35 qt.spec, 1.184, 1.185 sources,
	1.36, 1.37
Message-ID: <20080928200412.B559A70118@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14231

Modified Files:
	.cvsignore qt.spec sources 
Log Message:
* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.3-1
- 4.4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	6 Aug 2008 13:16:13 -0000	1.34
+++ .cvsignore	28 Sep 2008 20:03:42 -0000	1.35
@@ -1,4 +1,4 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
-qt-x11-opensource-src-4.4.1.tar.bz2
-qt-copy-patches-20080805svn.tar.bz2
+qt-copy-patches-20080920svn.tar.bz2
+qt-x11-opensource-src-4.4.3.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- qt.spec	22 Sep 2008 10:25:28 -0000	1.184
+++ qt.spec	28 Sep 2008 20:03:42 -0000	1.185
@@ -8,7 +8,7 @@
 %else
 Name:    qt4
 %endif
-Version: 4.4.2
+Version: 4.4.3
 Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
@@ -731,6 +731,12 @@
 
 
 %changelog
+* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.3-1
+- 4.4.3
+
+* Wed Sep 24 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.2-2
+- omit systray patch (for now)
+
 * Sat Sep 20 2008 Than Ngo <than at redhat.com> 4.4.2-1
 - 4.4.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	22 Sep 2008 10:25:28 -0000	1.36
+++ sources	28 Sep 2008 20:03:42 -0000	1.37
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-200faca22f861cd09f108df9924f195c  qt-x11-opensource-src-4.4.2.tar.bz2
 d77a7d864375b44b3e9dd3afa53017fa  qt-copy-patches-20080920svn.tar.bz2
+00e00c6324d342a7b0d8653112b4f08c  qt-x11-opensource-src-4.4.3.tar.bz2



From s4504kr at fedoraproject.org  Sun Sep 28 20:05:13 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Sun, 28 Sep 2008 20:05:13 +0000 (UTC)
Subject: rpms/lightning/devel lightning-1.2c-execstack.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 lightning.spec, 1.14, 1.15 sources, 1.4,
	1.5 lightning-1.2-execstack.patch, 1.1, NONE
Message-ID: <20080928200513.938E070118@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/lightning/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14450

Modified Files:
	.cvsignore lightning.spec sources 
Added Files:
	lightning-1.2c-execstack.patch 
Removed Files:
	lightning-1.2-execstack.patch 
Log Message:
New upstream release

lightning-1.2c-execstack.patch:

--- NEW FILE lightning-1.2c-execstack.patch ---
diff -up lightning-1.2c/tests/run-test.exec lightning-1.2c/tests/run-test
--- lightning-1.2c/tests/run-test.exec	2008-09-28 21:45:01.000000000 +0200
+++ lightning-1.2c/tests/run-test	2008-09-28 21:45:24.000000000 +0200
@@ -1,5 +1,7 @@
 #! /bin/sh
 
+execstack -s $1
+
 ./$1 > $1.log
 if test $? = 77; then
   exit 77


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lightning/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Jun 2007 15:52:22 -0000	1.4
+++ .cvsignore	28 Sep 2008 20:04:43 -0000	1.5
@@ -1 +1 @@
-lightning-1.2.tar.gz
+lightning-1.2c.tar.gz


Index: lightning.spec
===================================================================
RCS file: /cvs/extras/rpms/lightning/devel/lightning.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- lightning.spec	7 Aug 2008 17:28:57 -0000	1.14
+++ lightning.spec	28 Sep 2008 20:04:43 -0000	1.15
@@ -1,13 +1,13 @@
 Name:           lightning
-Version:        1.2
-Release:        14%{?dist}
+Version:        1.2c
+Release:        1%{?dist}
 Summary:        Library for generating assembly code on run time
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://www.gnu.org/software/lightning/lightning.html
-Source0:        ftp://alpha.gnu.org/pub/gnu/lightning/lightning-%{version}.tar.gz
-Patch1:		lightning-1.2-execstack.patch
+Source0:        ftp://alpha.gnu.org/gnu/lightning/lightning-%{version}.tar.gz
+Patch1:		lightning-1.2c-execstack.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:	%{ix86} ppc sparc
@@ -52,6 +52,7 @@
 %defattr(-,root,root,-)
 %{_bindir}/lightningize
 %{_includedir}/lightning/
+%{_includedir}/lightning.h
 %{_datadir}/aclocal/lightning.m4
 %dir %{_datadir}/lightning
 %{_datadir}/lightning/Makefile.am
@@ -62,6 +63,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Jochen Schmitt <Jochen herr-schmitt de> 1.2c-1
+- New upstream release
+
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.2-14
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lightning/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Jun 2007 15:52:22 -0000	1.4
+++ sources	28 Sep 2008 20:04:43 -0000	1.5
@@ -1 +1 @@
-dcd2c46ee4dd5d99edd9930022ad2153  lightning-1.2.tar.gz
+b6b9862b436f6006cb10d35dd4ae8a32  lightning-1.2c.tar.gz


--- lightning-1.2-execstack.patch DELETED ---



From s4504kr at fedoraproject.org  Sun Sep 28 20:09:27 2008
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Sun, 28 Sep 2008 20:09:27 +0000 (UTC)
Subject: rpms/gnu-smalltalk/F-9 gnu-smalltlak-3.0.2-am.patch,1.1,NONE
Message-ID: <20080928200927.2375170118@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/gnu-smalltalk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15168

Removed Files:
	gnu-smalltlak-3.0.2-am.patch 
Log Message:
New upstream release


--- gnu-smalltlak-3.0.2-am.patch DELETED ---



From bpepple at fedoraproject.org  Sun Sep 28 20:26:40 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sun, 28 Sep 2008 20:26:40 +0000 (UTC)
Subject: rpms/telepathy-mission-control/devel .cvsignore, 1.10, 1.11 sources,
	1.10, 1.11 telepathy-mission-control.spec, 1.14, 1.15
Message-ID: <20080928202640.5124B70118@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-serv17274

Modified Files:
	.cvsignore sources telepathy-mission-control.spec 
Log Message:
* Sat Sep 27 2008 Brian Pepple <bpepple at fedoraproject.org> - 4.67-1
- Update to 4.67.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	29 May 2008 12:30:18 -0000	1.10
+++ .cvsignore	28 Sep 2008 20:26:09 -0000	1.11
@@ -1 +1 @@
-telepathy-mission-control-4.65.tar.gz
+telepathy-mission-control-4.67.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	29 May 2008 12:30:18 -0000	1.10
+++ sources	28 Sep 2008 20:26:09 -0000	1.11
@@ -1 +1 @@
-67cf4089cc60278c1dc1341c8e05f12b  telepathy-mission-control-4.65.tar.gz
+0a547e7af4a33355bac3638dd2e40859  telepathy-mission-control-4.67.tar.gz


Index: telepathy-mission-control.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/telepathy-mission-control.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- telepathy-mission-control.spec	27 Sep 2008 01:59:14 -0000	1.14
+++ telepathy-mission-control.spec	28 Sep 2008 20:26:09 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           telepathy-mission-control
-Version:        4.65
-Release:        3%{?dist}
+Version:        4.67
+Release:        1%{?dist}
 Summary:        Central control for Telepathy connection manager
 
 Group:          System Environment/Libraries
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Sat Sep 27 2008 Brian Pepple <bpepple at fedoraproject.org> - 4.67-1
+- Update to 4.67.
+
 * Fri Sep 26 2008 Brian Pepple <bpepple at fedoraproject.org> - 4.65-3
 - Enable gnome-keyring support.
 



From rdieter at fedoraproject.org  Sun Sep 28 20:33:39 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 28 Sep 2008 20:33:39 +0000 (UTC)
Subject: rpms/kdelibs/F-9 .cvsignore, 1.52, 1.53 kdelibs.spec, 1.356,
	1.357 sources, 1.64, 1.65 kdelibs-4.0.5-fedora-buildtype.patch,
	1.3, NONE kdelibs-4.1.0-#455130.patch, 1.1,
	NONE kdelibs-4.1.1-kde#157789.patch, 1.2,
	NONE kdelibs-4.1.1-kde#169447-khtml-regression.patch, 1.1,
	NONE kdelibs-4.1.1-kde#856379-cookiejar.patch, 1.1,
	NONE kdelibs-4.1.1-kde#856403-urlnav.patch, 1.1,
	NONE kdelibs-4.1.1-kde#858795-mimeassoc.patch, 1.1,
	NONE kdelibs-4.1.1-kde#860005-emoticons.patch, 1.1,
	NONE kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch, 1.1,
	NONE kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch,
	1.1, NONE kdelibs-4.1.1-kutils-fixes.patch, 1.1, NONE
Message-ID: <20080928203339.7175970118@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18213

Modified Files:
	.cvsignore kdelibs.spec sources 
Removed Files:
	kdelibs-4.0.5-fedora-buildtype.patch 
	kdelibs-4.1.0-#455130.patch kdelibs-4.1.1-kde#157789.patch 
	kdelibs-4.1.1-kde#169447-khtml-regression.patch 
	kdelibs-4.1.1-kde#856379-cookiejar.patch 
	kdelibs-4.1.1-kde#856403-urlnav.patch 
	kdelibs-4.1.1-kde#858795-mimeassoc.patch 
	kdelibs-4.1.1-kde#860005-emoticons.patch 
	kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch 
	kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch 
	kdelibs-4.1.1-kutils-fixes.patch 
Log Message:
* Thu Sep 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- kde-4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	24 Jul 2008 21:04:15 -0000	1.52
+++ .cvsignore	28 Sep 2008 20:33:08 -0000	1.53
@@ -1,2 +1 @@
-kdelibs-4.0.99.tar.bz2
-kdelibs-4.1.0.tar.bz2
+kdelibs-4.1.2.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- kdelibs.spec	19 Sep 2008 00:42:56 -0000	1.356
+++ kdelibs.spec	28 Sep 2008 20:33:09 -0000	1.357
@@ -1,8 +1,8 @@
 %define _default_patch_fuzz 2
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.1.1
-Release: 12%{?dist}
+Version: 4.1.2
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -71,30 +71,13 @@
 # workaround for policykit
 Patch11: kdelibs-4.0.2-policykit-workaround.patch
 Patch12: kdelibs-4.1.0-xdg-menu.patch
-# Fedora build type - adds -DNDEBUG -DQT_NO_DEBUG, removes -O2 -g (already in RPM_OPT_FLAGS)
-Patch13: kdelibs-4.0.5-fedora-buildtype.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
 Patch14: kdelibs-4.0.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.0-kstandarddirs.patch
-# fix running commands in kglobalconfig before KComponentData init (#455130)
-Patch19: kdelibs-4.1.0-#455130.patch
 Patch20: kdelibs-4.1.1-cmake.patch
 
 ## upstream patches
-Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
-Patch101: kdelibs-4.1.1-kde#856379-cookiejar.patch
-Patch102: kdelibs-4.1.1-kde#856403-urlnav.patch
-Patch103: kdelibs-4.1.1-kutils-fixes.patch
-Patch104: kdelibs-4.1.1-kdeui-widgets-fixes.patch
-Patch105: kdelibs-4.1.1-kde#858795-mimeassoc.patch
-Patch106: kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch
-Patch107: kdelibs-4.1.1-kde#860005-emoticons.patch
-Patch108: kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch
-# make "Stop Animations" work again in Konqueror
-# https://bugs.kde.org/show_bug.cgi?id=157789
-# submitted upstream (attached to above bug report)
-Patch109: kdelibs-4.1.1-kde#157789.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -215,23 +198,11 @@
 %patch10 -p1 -b .no-cache-kdeglobals-paths
 %patch11 -p1 -b .policykit
 %patch12 -p1 -b .Administration-menu
-%patch13 -p1 -b .fedora-buildtype
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
-%patch19 -p1 -b .#455130
 %patch20 -p1 -b .cmake
 
 ## upstream patches
-%patch100 -p0 -b .kde#169447-khtml-regression
-%patch101 -p0 -b .kde#856379-cookiejar
-%patch102 -p0 -b .kde#856403-urlnav
-%patch103 -p0 -b .kutils-fixes
-%patch104 -p0 -b .kdeui-widgets-fixes
-%patch105 -p0 -b .kde#858795-mimeassoc
-%patch106 -p0 -b .kde#860095-khtml-scroll-crash
-%patch107 -p0 -b .kde#860005-emoticons
-%patch108 -p0 -b .kde#170461-khtml-regression
-%patch109 -p1 -b .kde#157789
 
 %build
 
@@ -392,6 +363,9 @@
 
 
 %changelog
+* Thu Sep 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- kde-4.1.2
+
 * Fri Sep 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-12
 - make "Stop Animations" work again in Konqueror (KDE 4 regression kde#157789)
 
@@ -407,13 +381,14 @@
   mail text not being displayed in KMail when kdebase-runtime wasn't
   installed.
 
-* Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.1.1-9
+* Wed Sep 17 2008 Than Ngo <than at redhat.com> 4.1.1-9
 - #461725, revert the patch to fix the regression
 
 * Sat Sep 13 2008 Than Ngo <than at redhat.com> 4.1.1-8
 - fix kdelibs-4.1.1-kdeui-widgets-fixes.patch
 
 * Sat Sep 13 2008 Than Ngo <than at redhat.com> 4.1.1-7
+- remove redundant FEDORA, use CMAKE_BUILD_TYPE=release
 - fix install problem with cmake > 2.5
 
 * Mon Sep 08 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-6


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	1 Sep 2008 09:24:18 -0000	1.64
+++ sources	28 Sep 2008 20:33:09 -0000	1.65
@@ -1 +1 @@
-d75ec557cd864e3f9150059c3e58ed61  kdelibs-4.1.1.tar.bz2
+cb5f43d2b11669fb17b0a1ecf3736c17  kdelibs-4.1.2.tar.bz2


--- kdelibs-4.0.5-fedora-buildtype.patch DELETED ---


--- kdelibs-4.1.0-#455130.patch DELETED ---


--- kdelibs-4.1.1-kde#157789.patch DELETED ---


--- kdelibs-4.1.1-kde#169447-khtml-regression.patch DELETED ---


--- kdelibs-4.1.1-kde#856379-cookiejar.patch DELETED ---


--- kdelibs-4.1.1-kde#856403-urlnav.patch DELETED ---


--- kdelibs-4.1.1-kde#858795-mimeassoc.patch DELETED ---


--- kdelibs-4.1.1-kde#860005-emoticons.patch DELETED ---


--- kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch DELETED ---


--- kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch DELETED ---


--- kdelibs-4.1.1-kutils-fixes.patch DELETED ---



From rdieter at fedoraproject.org  Sun Sep 28 20:42:55 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 28 Sep 2008 20:42:55 +0000 (UTC)
Subject: rpms/kdepimlibs/F-9 .cvsignore, 1.21, 1.22 kdepimlibs.spec, 1.39,
	1.40 sources, 1.20, 1.21
Message-ID: <20080928204255.E890370118@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19230

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	5 Sep 2008 14:45:49 -0000	1.21
+++ .cvsignore	28 Sep 2008 20:42:25 -0000	1.22
@@ -1,3 +1 @@
-kdepimlibs-4.0.99.tar.bz2
-kdepimlibs-4.1.0.tar.bz2
-kdepimlibs-4.1.1.tar.bz2
+kdepimlibs-4.1.2.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/kdepimlibs.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kdepimlibs.spec	5 Sep 2008 14:45:49 -0000	1.39
+++ kdepimlibs.spec	28 Sep 2008 20:42:25 -0000	1.40
@@ -13,8 +13,8 @@
 
 Name: kdepimlibs
 
-Version: 4.1.1
-Release: 2%{?dist}
+Version: 4.1.2
+Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -41,8 +41,6 @@
 #BuildRequires: phonon-backend-gstreamer
 
 ## upstream patches
-# http://bugs.kde.org/170203
-Patch100: fix-invitations.diff
 
 %if 0%{?apidocs}
 BuildRequires: doxygen
@@ -79,8 +77,6 @@
 %prep
 %setup -q -n kdepimlibs-%{version}
 
-%patch100 -p4 -b .invitations
-
 
 %build
 
@@ -171,8 +167,11 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Sep 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-2
-- invitations crasher/regression (kde #170203)
+- invitations crasher/regression (kde #170203, rh#462103)
 
 * Thu Aug 28 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	29 Aug 2008 19:25:40 -0000	1.20
+++ sources	28 Sep 2008 20:42:25 -0000	1.21
@@ -1 +1 @@
-36316f5fc5b2e0ec123a8e00a522dd80  kdepimlibs-4.1.1.tar.bz2
+c5896119ce4aef2dd9d11495dd0dea6e  kdepimlibs-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Sun Sep 28 20:44:51 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 28 Sep 2008 20:44:51 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-9
	kdebase-runtime-4.1.1-iconthemes-inherit.patch, NONE,
	1.1 .cvsignore, 1.14, 1.15 kdebase-runtime.spec, 1.54,
	1.55 sources, 1.15, 1.16
Message-ID: <20080928204451.8AAAD70118@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19575

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Added Files:
	kdebase-runtime-4.1.1-iconthemes-inherit.patch 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org. 4.1.2-1
- 4.1.2


kdebase-runtime-4.1.1-iconthemes-inherit.patch:

--- NEW FILE kdebase-runtime-4.1.1-iconthemes-inherit.patch ---
diff -up kdebase-runtime-4.1.1/kcontrol/icons/iconthemes.cpp.orig kdebase-runtime-4.1.1/kcontrol/icons/iconthemes.cpp
--- kdebase-runtime-4.1.1/kcontrol/icons/iconthemes.cpp.orig	2008-09-16 13:24:43.000000000 +0200
+++ kdebase-runtime-4.1.1/kcontrol/icons/iconthemes.cpp	2008-09-16 15:30:14.000000000 +0200
@@ -415,15 +415,16 @@ void loadPreview(QLabel *label, KIconThe
 {
     const int size = qMin(48, icontheme.defaultSize(KIconLoader::Desktop));
     KSvgRenderer renderer;
-    foreach(const QString &name, iconnames) {
-        K3Icon icon = icontheme.iconPath(QString("%1.png").arg(name), size, KIconLoader::MatchBest);
+    foreach(const QString &iconthemename, QStringList() << icontheme.internalName() << icontheme.inherits()) {
+      foreach(const QString &name, iconnames) {
+        K3Icon icon = KIconTheme(iconthemename).iconPath(QString("%1.png").arg(name), size, KIconLoader::MatchBest);
         if (icon.isValid()) {
             label->setPixmap(QPixmap(icon.path).scaled(size, size));
             return;
         }
-        icon = icontheme.iconPath(QString("%1.svg").arg(name), size, KIconLoader::MatchBest);
+        icon = KIconTheme(iconthemename).iconPath(QString("%1.svg").arg(name), size, KIconLoader::MatchBest);
         if( ! icon.isValid() ) {
-            icon = icontheme.iconPath(QString("%1.svgz").arg(name), size, KIconLoader::MatchBest);
+            icon = KIconTheme(iconthemename).iconPath(QString("%1.svgz").arg(name), size, KIconLoader::MatchBest);
             if( ! icon.isValid() ) {
                 continue;
             }
@@ -437,6 +438,7 @@ void loadPreview(QLabel *label, KIconThe
             label->setPixmap(pix.scaled(size, size));
             return;
         }
+      }
     }
     label->setPixmap(QPixmap());
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	25 Jul 2008 13:55:54 -0000	1.14
+++ .cvsignore	28 Sep 2008 20:44:21 -0000	1.15
@@ -1,2 +1 @@
-kdebase-runtime-4.0.99.tar.bz2
-kdebase-runtime-4.1.0.tar.bz2
+kdebase-runtime-4.1.2.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kdebase-runtime.spec	1 Sep 2008 16:57:55 -0000	1.54
+++ kdebase-runtime.spec	28 Sep 2008 20:44:21 -0000	1.55
@@ -9,8 +9,8 @@
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
-Version:       4.1.1
-Release:       2%{?dist}
+Version:       4.1.2
+Release:       1%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -20,6 +20,7 @@
 Patch0:        kdebase-runtime-4.1.0-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.1.1-knetattach.patch
+Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %ifarch noarch
@@ -102,6 +103,7 @@
 %patch0 -p1 -b .pulseaudio
 %patch1 -p1 -b .searchproviders-shortcuts
 %patch2 -p1 -b .knetattach
+%patch3 -p1 -b .iconthemes-inherit
 
 # upstream patches
 
@@ -338,6 +340,13 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org. 4.1.2-1
+- 4.1.2
+
+* Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.1.1-3
+- fix inherit issue in iconthemes, preview icons
+  do not show
+
 * Mon Sep 01 2008 Than Ngo <than at redhat.com> 4.1.1-2
 - fix #460710, knetattach is kio_remote's wizard program, don't show
   it in the menu.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	29 Aug 2008 18:47:11 -0000	1.15
+++ sources	28 Sep 2008 20:44:21 -0000	1.16
@@ -1 +1 @@
-f03488d19c3bd95634b797229ac55127  kdebase-runtime-4.1.1.tar.bz2
+1f17bdfa4bee4bf1c7afc2bd5bdbae59  kdebase-runtime-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Sun Sep 28 20:46:38 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 28 Sep 2008 20:46:38 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-9 .cvsignore, 1.13,
	1.14 kdebase-workspace-4.0.72-rootprivs.patch, 1.2,
	1.3 kdebase-workspace.spec, 1.103, 1.104 sources, 1.16, 1.17
Message-ID: <20080928204638.3468570118@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19837

Modified Files:
	.cvsignore kdebase-workspace-4.0.72-rootprivs.patch 
	kdebase-workspace.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	28 Jul 2008 19:04:32 -0000	1.13
+++ .cvsignore	28 Sep 2008 20:46:07 -0000	1.14
@@ -1 +1 @@
-kdebase-workspace-4.1.0.tar.bz2
+kdebase-workspace-4.1.2.tar.bz2

kdebase-workspace-4.0.72-rootprivs.patch:

Index: kdebase-workspace-4.0.72-rootprivs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace-4.0.72-rootprivs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdebase-workspace-4.0.72-rootprivs.patch	1 Aug 2008 14:54:58 -0000	1.2
+++ kdebase-workspace-4.0.72-rootprivs.patch	28 Sep 2008 20:46:07 -0000	1.3
@@ -71,7 +71,7 @@
 +            cmd = cmd.remove(0,9).trimmed();
 +
 +        QStringList args;
-+        args << "-c" << QString( "%1 %2 --lang %3" ).arg( KStandardDirs::locate("exe", "kcmshell4") ).arg( cmd ).arg( KGlobal::locale()->language() );
++        args << "-i" << QString( mItem->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::execute( kdesu, args );


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- kdebase-workspace.spec	29 Aug 2008 18:49:53 -0000	1.103
+++ kdebase-workspace.spec	28 Sep 2008 20:46:07 -0000	1.104
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.1.1
+Version: 4.1.2
 
 Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
@@ -309,6 +309,12 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
+* Mon Sep 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
+- show KCM icon in rootprivs patch (thanks to Harald Sitter "apachelogger")
+
 * Thu Aug 28 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	29 Aug 2008 18:49:53 -0000	1.16
+++ sources	28 Sep 2008 20:46:07 -0000	1.17
@@ -1 +1 @@
-53805b96727db2fe30773a3fa9f78b73  kdebase-workspace-4.1.1.tar.bz2
+b1f72c7c4e597e993669d625b26b4470  kdebase-workspace-4.1.2.tar.bz2



From cebbert at fedoraproject.org  Sun Sep 28 21:02:34 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun, 28 Sep 2008 21:02:34 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-x86-xen-add-dependencies.patch, NONE,
	1.1 kernel.spec, 1.988, 1.989
Message-ID: <20080928210234.5790D70118@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21502

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-xen-add-dependencies.patch 
Log Message:
make XEN__SAVE_RESTORE denpend on XEN

linux-2.6-x86-xen-add-dependencies.patch:

--- NEW FILE linux-2.6-x86-xen-add-dependencies.patch ---
From: Chuck Ebbert <cebbert at redhat.com>

XEN options need to depend on XEN.
Also, add newline at end of file.

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

Index: linux-2.6.26.noarch/arch/x86/xen/Kconfig
===================================================================
--- linux-2.6.26.noarch.orig/arch/x86/xen/Kconfig
+++ linux-2.6.26.noarch/arch/x86/xen/Kconfig
@@ -26,5 +26,5 @@ config XEN_MAX_DOMAIN_MEMORY
 
 config XEN_SAVE_RESTORE
        bool
-       depends on PM
-       default y
\ No newline at end of file
+       depends on XEN && PM
+       default y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.988
retrieving revision 1.989
diff -u -r1.988 -r1.989
--- kernel.spec	26 Sep 2008 16:43:28 -0000	1.988
+++ kernel.spec	28 Sep 2008 21:02:03 -0000	1.989
@@ -551,6 +551,7 @@
 
 Patch21: linux-2.6-utrace.patch
 Patch22: linux-2.6-x86-tracehook.patch
+Patch23: linux-2.6-x86-xen-add-dependencies.patch
 
 Patch41: linux-2.6-sysrq-c.patch
 Patch42: linux-2.6-x86-tune-generic.patch
@@ -992,6 +993,8 @@
 ApplyPatch linux-2.6-utrace.patch
 ApplyPatch linux-2.6-x86-tracehook.patch
 
+ApplyPatch linux-2.6-x86-xen-add-dependencies.patch
+
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
 
@@ -1733,6 +1736,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sun Sep 28 2008 Chuck Ebbert <cebbert at redhat.com>
+- make XEN__SAVE_RESTORE denpend on XEN
+
 * Fri Sep 26 2008 Dave Jones <davej at redhat.com>
 - 2.6.27-rc7-git5
 



From caolanm at fedoraproject.org  Sun Sep 28 21:02:35 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 28 Sep 2008 21:02:35 +0000 (UTC)
Subject: rpms/openoffice.org/devel .cvsignore, 1.189, 1.190 sources, 1.318,
	1.319
Message-ID: <20080928210235.9BC3770118@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21535

Modified Files:
	.cvsignore sources 
Log Message:
new sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- .cvsignore	22 Sep 2008 06:57:58 -0000	1.189
+++ .cvsignore	28 Sep 2008 21:02:05 -0000	1.190
@@ -5,4 +5,4 @@
 redhat-templates.tar.gz
 redhat-registry.tar.gz
 redhat-langpacks.tar.gz
-OOO300_m7.tar.bz2
+OOO300_m8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- sources	22 Sep 2008 06:57:59 -0000	1.318
+++ sources	28 Sep 2008 21:02:05 -0000	1.319
@@ -5,4 +5,4 @@
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 5ff04a5d754f6770f07e679856d682f3  redhat-registry.tar.gz
 3a53d26158236a7a6a23fe836de721a8  redhat-langpacks.tar.gz
-bc8d246b62f5909864392ca6583e7da1  OOO300_m7.tar.bz2
+5dd547d653e1b3d1dee5668b8929fdd0  OOO300_m8.tar.bz2



From caolanm at fedoraproject.org  Sun Sep 28 21:05:10 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 28 Sep 2008 21:05:10 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.0.ooo94318.greekmenu.crash, 1.1,
	1.2 openoffice.org.spec, 1.1660, 1.1661
Message-ID: <20080928210510.556D570118@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21840

Modified Files:
	openoffice.org-3.0.0.ooo94318.greekmenu.crash 
	openoffice.org.spec 
Log Message:
next candidate


Index: openoffice.org-3.0.0.ooo94318.greekmenu.crash
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo94318.greekmenu.crash,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo94318.greekmenu.crash	25 Sep 2008 10:56:52 -0000	1.1
+++ openoffice.org-3.0.0.ooo94318.greekmenu.crash	28 Sep 2008 21:04:39 -0000	1.2
@@ -51,7 +51,7 @@
 diff -u -r1.45 -r1.46
 --- openoffice.org.orig/officecfg/registry/data/org/openoffice/Office/UI/localize.sdf	11 Apr 2008 13:44:48 -0000	1.45
 +++ openoffice.org/officecfg/registry/data/org/openoffice/Office/UI/localize.sdf	16 Apr 2008 13:29:11 -0000	1.46
-@@ -143041,7 +144325,7 @@
+@@ -150021,7 +150021,7 @@
  officecfg	registry\data\org\openoffice\Office\UI\GenericCommands.xcu	0	value	..GenericCommands.UserInterface.Popups..uno:EditMenu	Label			0	da	~Rediger				2002-02-02 02:02:02
  officecfg	registry\data\org\openoffice\Office\UI\GenericCommands.xcu	0	value	..GenericCommands.UserInterface.Popups..uno:EditMenu	Label			0	de	~Bearbeiten				2002-02-02 02:02:02
  officecfg	registry\data\org\openoffice\Office\UI\GenericCommands.xcu	0	value	..GenericCommands.UserInterface.Popups..uno:EditMenu	Label			0	dz	??????????????????(~E)				2002-02-02 02:02:02


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1660
retrieving revision 1.1661
diff -u -r1.1660 -r1.1661
--- openoffice.org.spec	26 Sep 2008 11:08:04 -0000	1.1660
+++ openoffice.org.spec	28 Sep 2008 21:04:39 -0000	1.1661
@@ -1,6 +1,6 @@
 %define oootag OOO300
-%define ooomilestone 7
-%define rh_rpm_release 2
+%define ooomilestone 8
+%define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -3681,7 +3681,8 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Sep 26 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-7.2
+* Sun Sep 28 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-8.1
+- next candidate
 - Resolves: rhbz#463884 openoffice.org-3.0.0.ooo94318.greekmenu.crash
 - Resolves: rhbz#464109 lohit-fonts-marathi
 



From caolanm at fedoraproject.org  Sun Sep 28 21:11:41 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 28 Sep 2008 21:11:41 +0000 (UTC)
Subject: rpms/hunspell-ku/devel hunspell-ku.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080928211141.2C08970118@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ku/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22664/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-ku.spec import.log 
Log Message:



--- NEW FILE hunspell-ku.spec ---
Name: hunspell-ku
Summary: Kurdish hunspell dictionaries
Version: 0.21
Release: 1%{?dist}
Source0: http://downloads.sourceforge.net/myspellkurdish/ku_TR-021.zip
Group: Applications/Text
URL: https://sourceforge.net/projects/myspellkurdish/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv3 or LGPLv3 or MPLv1.1
BuildArch: noarch

Requires: hunspell

%description
Kurdish hunspell dictionaries.

%prep
%setup -q -n ku_TR

%build
tr -d '\r' < README_ku_TR.txt > README_ku_TR.txt.new
iconv -f ISO-8859-1 -t UTF-8 README_ku_TR.txt.new > README_ku_TR.txt

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p ku_TR.* $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_ku_TR.txt gpl-3.0.txt lgpl-3.0.txt MPL-1.1.txt
%{_datadir}/myspell/*

%changelog
* Wed Sep 24 2008 Caolan McNamara <caolanm at redhat.com> - 0.21-1
- initial version


--- NEW FILE import.log ---
hunspell-ku-0_21-1_fc9:HEAD:hunspell-ku-0.21-1.fc9.src.rpm:1222636358


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ku/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2008 19:30:49 -0000	1.1
+++ .cvsignore	28 Sep 2008 21:11:10 -0000	1.2
@@ -0,0 +1 @@
+ku_TR-021.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ku/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 19:30:49 -0000	1.1
+++ sources	28 Sep 2008 21:11:10 -0000	1.2
@@ -0,0 +1 @@
+89e6405ed58dbd752ba0e764987de43e  ku_TR-021.zip



From caolanm at fedoraproject.org  Sun Sep 28 21:14:47 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 28 Sep 2008 21:14:47 +0000 (UTC)
Subject: rpms/openoffice-lv/devel import.log, NONE, 1.1 openoffice-lv.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080928211447.72E8670118@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice-lv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23210/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log openoffice-lv.spec 
Log Message:



--- NEW FILE import.log ---
openoffice-lv-0_7_3-1_fc9:HEAD:openoffice-lv-0.7.3-1.fc9.src.rpm:1222636531


--- NEW FILE openoffice-lv.spec ---
Name: openoffice-lv
Summary: Latvian linguistic dictionaries
Version: 0.7.3
Release: 1%{?dist}
Source: http://downloads.sourceforge.net/%{name}/lv_LV-%{version}.zip
Group: Applications/Text
URL: http://sourceforge.net/projects/openoffice-lv/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv2+
BuildArch: noarch

%description
Latvian linguistic dictionaries.

%package -n hyphen-lv
Summary: Latvian hyphenation rules
Group: Applications/Text
Requires: hyphen

%description -n hyphen-lv
Latvian hyphenation rules.

%package -n hunspell-lv
Summary: Latvian hunspell dictionaries
Group: Applications/Text
Requires: hunspell

%description -n hunspell-lv
Latvian hunspell dictionaries.

%prep
%setup -q -c

%build
for i in README_lv_LV.txt README_hyph_lv_LV.txt changelog.txt; do
    tr -d '\r' < $i > $i.new
    iconv -f ISO-8859-4 -t UTF-8 $i.new > $i
done

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p lv_LV.dic lv_LV.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p hyph_lv_LV.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files -n hyphen-lv
%defattr(-,root,root,-)
%doc README_hyph_lv_LV.txt
%{_datadir}/hyphen/*

%files -n hunspell-lv
%defattr(-,root,root,-)
%doc README_lv_LV.txt changelog.txt
%{_datadir}/myspell/*

%changelog
* Sat Sep 20 2008 Caolan McNamara <caolanm at redhat.com> - 0.7.3-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice-lv/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2008 19:26:38 -0000	1.1
+++ .cvsignore	28 Sep 2008 21:14:17 -0000	1.2
@@ -0,0 +1 @@
+lv_LV-0.7.3.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice-lv/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 19:26:38 -0000	1.1
+++ sources	28 Sep 2008 21:14:17 -0000	1.2
@@ -0,0 +1 @@
+e61446d480db0b31ceb20dc547c57d36  lv_LV-0.7.3.zip



From pkgdb at fedoraproject.org  Sun Sep 28 21:16:33 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 21:16:33 +0000
Subject: [pkgdb] wmctrl: pertusus has requested watchbugzilla
Message-ID: <20080928211633.3E29E208D75@bastion.fedora.phx.redhat.com>

pertusus has requested the watchbugzilla acl on wmctrl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wmctrl



From pkgdb at fedoraproject.org  Sun Sep 28 21:16:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 21:16:36 +0000
Subject: [pkgdb] wmctrl: pertusus has requested watchcommits
Message-ID: <20080928211636.DC6CE208DA0@bastion.fedora.phx.redhat.com>

pertusus has requested the watchcommits acl on wmctrl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wmctrl



From pkgdb at fedoraproject.org  Sun Sep 28 21:16:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 21:16:44 +0000
Subject: [pkgdb] wmctrl: pertusus has requested watchbugzilla
Message-ID: <20080928211645.A7373208D6E@bastion.fedora.phx.redhat.com>

pertusus has requested the watchbugzilla acl on wmctrl (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wmctrl



From pkgdb at fedoraproject.org  Sun Sep 28 21:16:48 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 21:16:48 +0000
Subject: [pkgdb] wmctrl: pertusus has requested watchcommits
Message-ID: <20080928211648.628C8208D75@bastion.fedora.phx.redhat.com>

pertusus has requested the watchcommits acl on wmctrl (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wmctrl



From pkgdb at fedoraproject.org  Sun Sep 28 21:16:50 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 21:16:50 +0000
Subject: [pkgdb] wmctrl: pertusus has requested watchbugzilla
Message-ID: <20080928211651.055CC208DA8@bastion.fedora.phx.redhat.com>

pertusus has requested the watchbugzilla acl on wmctrl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wmctrl



From pkgdb at fedoraproject.org  Sun Sep 28 21:16:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 28 Sep 2008 21:16:54 +0000
Subject: [pkgdb] wmctrl: pertusus has requested watchcommits
Message-ID: <20080928211654.1D5D2208DAC@bastion.fedora.phx.redhat.com>

pertusus has requested the watchcommits acl on wmctrl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wmctrl



From caolanm at fedoraproject.org  Sun Sep 28 21:40:36 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 28 Sep 2008 21:40:36 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.vcl95.patch, NONE,
	1.1 openoffice.org.spec, 1.1661,
	1.1662 openoffice.org-3.0.0.ooo94318.greekmenu.crash, 1.2, NONE
Message-ID: <20080928214036.1486C70118@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25850

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.vcl95.patch 
Removed Files:
	openoffice.org-3.0.0.ooo94318.greekmenu.crash 
Log Message:
resync patch

workspace.vcl95.patch:

--- NEW FILE workspace.vcl95.patch ---
Index: source/gdi/outdev3.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/outdev3.cxx,v
retrieving revision 1.242.2.1
diff -u -r1.242.2.1 outdev3.cxx
--- openoffice.org.orig/vcl/source/gdi/outdev3.cxx	26 Aug 2008 12:25:34 -0000	1.242.2.1
+++ openoffice.org/vcl/source/gdi/outdev3.cxx	25 Sep 2008 10:24:27 -0000
@@ -7083,20 +7084,23 @@
                 nMnemonicPos = nLen-1;
             }
 
-            sal_Int32* pCaretXArray = (sal_Int32*)alloca( 2 * sizeof(sal_Int32) * nLen );
-            /*BOOL bRet =*/ GetCaretPositions( aStr, pCaretXArray, nIndex, nLen );
-            long lc_x1 = pCaretXArray[ 2*(nMnemonicPos - nIndex) ];
-            long lc_x2 = pCaretXArray[ 2*(nMnemonicPos - nIndex)+1 ];
-            nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2));
-
-            Point aTempPos( Min(lc_x1,lc_x2), GetFontMetric().GetAscent() );
-            if( bInvalidPos )  // #106952#, place behind the (last) character
-                aTempPos = Point( Max(lc_x1,lc_x2), GetFontMetric().GetAscent() );
-
-			aTempPos += rPos;
-            aTempPos = LogicToPixel( aTempPos );
-            nMnemonicX = mnOutOffX + aTempPos.X();
-            nMnemonicY = mnOutOffY + aTempPos.Y();
+            if ( nMnemonicPos != STRING_NOTFOUND )
+            {
+                sal_Int32* pCaretXArray = (sal_Int32*)alloca( 2 * sizeof(sal_Int32) * nLen );
+                /*BOOL bRet =*/ GetCaretPositions( aStr, pCaretXArray, nIndex, nLen );
+                long lc_x1 = pCaretXArray[ 2*(nMnemonicPos - nIndex) ];
+                long lc_x2 = pCaretXArray[ 2*(nMnemonicPos - nIndex)+1 ];
+                nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2));
+
+                Point aTempPos( Min(lc_x1,lc_x2), GetFontMetric().GetAscent() );
+                if( bInvalidPos )  // #106952#, place behind the (last) character
+                    aTempPos = Point( Max(lc_x1,lc_x2), GetFontMetric().GetAscent() );
+    
+    			aTempPos += rPos;
+                aTempPos = LogicToPixel( aTempPos );
+                nMnemonicX = mnOutOffX + aTempPos.X();
+                nMnemonicY = mnOutOffY + aTempPos.Y();
+            }
         }
     }
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1661
retrieving revision 1.1662
diff -u -r1.1661 -r1.1662
--- openoffice.org.spec	28 Sep 2008 21:04:39 -0000	1.1661
+++ openoffice.org.spec	28 Sep 2008 21:40:05 -0000	1.1662
@@ -115,7 +115,7 @@
 Patch44: openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch
 Patch45: openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch
 Patch46: workspace.vcl94.patch
-Patch47: openoffice.org-3.0.0.ooo94318.greekmenu.crash
+Patch47: workspace.vcl95.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1316,7 +1316,7 @@
 %patch44 -p1 -b .ooo93942.svx.accessibity-loops.patch
 %patch45 -p1 -b .ooo93949.sw.better_rtf_encodings.patch
 %patch46 -p1 -b .workspace.vcl94.patch
-%patch47 -p1 -b .ooo94318.greekmenu.crash
+%patch47 -p1 -b .workspace.vcl95.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`


--- openoffice.org-3.0.0.ooo94318.greekmenu.crash DELETED ---



From spot at fedoraproject.org  Sun Sep 28 21:41:54 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun, 28 Sep 2008 21:41:54 +0000 (UTC)
Subject: rpms/piggyback/devel import.log, NONE, 1.1 piggyback-man.patch, NONE,
	1.1 piggyback-startendcheck.patch, NONE, 1.1 piggyback.c, NONE,
	1.1 piggyback.spec, NONE, 1.1 piggyback64.c, NONE, 1.1
Message-ID: <20080928214154.7DC5D70118@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/piggyback/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25823/devel

Added Files:
	import.log piggyback-man.patch piggyback-startendcheck.patch 
	piggyback.c piggyback.spec piggyback64.c 
Log Message:

initial commit



--- NEW FILE import.log ---
piggyback-2_6_26-2_fc10:HEAD:piggyback-2.6.26-2.fc10.src.rpm:1222637903

piggyback-man.patch:

--- NEW FILE piggyback-man.patch ---
--- piggyback-2.6.16/piggyback.1
+++ piggyback-2.6.16/piggyback.1
@@ -0,0 +1,50 @@
+.\" -*- nroff -*-
+.\" 
+.TH PIGGYBACK 1 "March 1998" "piggyback"
+.SH NAME
+piggyback \- add initial ramdisk to a tftpboot kernel image
+.SH SYNOPSIS
+.B piggyback
+.I vmlinux
+.I System.map
+.I ramdisk
+.P
+.B piggyback64
+.I vmlinux
+.I System.map
+.I ramdisk
+.SH DESCRIPTION
+.BI piggyback
+is a simple utility to make a single-image install kernel with initial
+ramdisk for Sparc tftpbooting without need to set up nfs.
+.P
+.BI piggyback64
+is the same for Ultra-Sparc workstations (those using a 64 bit kernel).
+.PP
+.SH OPTIONS
+.TP
+.I vmlinux
+the kernel on which the ramdisk will be appended.  It must be an
+.B a.out
+kernel (use elftoaout for it), as PROM looks for
+.B a.out
+image only.
+.TP
+.I System.map
+the kernel map.
+.TP
+.I ramdisk
+the initial ramdisk image to append to the kernel image.  It could be
+compressed as well.
+.SH AUTHOR
+.B piggyback
+has been written by Jakub Jelinek <jj at ultra.linux.cz>.
+.SH AVAILABILITY
+.B piggyback
+and
+.B piggyback64
+are available in kernel-source-2.2.x package, under arch/sparc/boot and
+arch/sparc64/boot.
+.SH SEE ALSO
+.BR elftoaout (1),
+.BR tilo (1)
--- piggyback-2.6.16/piggyback64.1
+++ piggyback-2.6.16/piggyback64.1
@@ -0,0 +1,3 @@
+.\" -*- nroff -*-
+.\" 
+.so man1/piggyback.1

piggyback-startendcheck.patch:

--- NEW FILE piggyback-startendcheck.patch ---
--- piggyback-2.6.16/piggyback64.c.BAD	2006-04-12 17:49:52.000000000 -0400
+++ piggyback-2.6.16/piggyback64.c	2006-04-12 17:53:28.000000000 -0400
@@ -56,6 +56,10 @@
 		end = strtoul (buffer + 8, NULL, 16);
 	}
 	fclose (map);
+	if (!start || !end) {
+		fprintf (stderr, "Could not determine start and end from System.map\n");
+		exit(1);
+	}
 	if ((image = open(argv[1],O_RDWR)) < 0) die(argv[1]);
 	if (read(image,buffer,512) != 512) die(argv[1]);
 	if (!memcmp (buffer, "\177ELF", 4)) {


--- NEW FILE piggyback.c ---
/*
   Simple utility to make a single-image install kernel with initial ramdisk
   for Sparc tftpbooting without need to set up nfs.

   Copyright (C) 1996 Jakub Jelinek (jj at sunsite.mff.cuni.cz)
   Pete Zaitcev <zaitcev at yahoo.com> endian fixes for cross-compiles, 2000.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
   
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
   
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <dirent.h>
#include <unistd.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>

/*
 * Note: run this on an a.out kernel (use elftoaout for it),
 * as PROM looks for a.out image only.
 */

unsigned short ld2(char *p)
{
	return (p[0] << 8) | p[1];
}

unsigned int ld4(char *p)
{
	return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
}

void st4(char *p, unsigned int x)
{
	p[0] = x >> 24;
	p[1] = x >> 16;
	p[2] = x >> 8;
	p[3] = x;
}

void usage(void)
{
	/* fs_img.gz is an image of initial ramdisk. */
	fprintf(stderr, "Usage: piggyback vmlinux.aout System.map fs_img.gz\n");
	fprintf(stderr, "\tKernel image will be modified in place.\n");
	exit(1);
}

void die(char *str)
{
	perror (str);
	exit(1);
}

int main(int argc,char **argv)
{
	static char aout_magic[] = { 0x01, 0x03, 0x01, 0x07 };
	unsigned char buffer[1024], *q, *r;
	unsigned int i, j, k, start, end, offset;
	FILE *map;
	struct stat s;
	int image, tail;

	if (argc != 4) usage();
	start = end = 0;
	if (stat (argv[3], &s) < 0) die (argv[3]);
	map = fopen (argv[2], "r");
	if (!map) die(argv[2]);
	while (fgets (buffer, 1024, map)) {
		if (!strcmp (buffer + 8, " T start\n") || !strcmp (buffer + 16, " T start\n"))
			start = strtoul (buffer, NULL, 16);
		else if (!strcmp (buffer + 8, " A end\n") || !strcmp (buffer + 16, " A end\n"))
			end = strtoul (buffer, NULL, 16);
	}
	fclose (map);
	if (!start || !end) {
		fprintf (stderr, "Could not determine start and end from System.map\n");
		exit(1);
	}
	if ((image = open(argv[1],O_RDWR)) < 0) die(argv[1]);
	if (read(image,buffer,512) != 512) die(argv[1]);
	if (memcmp (buffer, "\177ELF", 4) == 0) {
		q = buffer + ld4(buffer + 28);
		i = ld4(q + 4) + ld4(buffer + 24) - ld4(q + 8);
		if (lseek(image,i,0) < 0) die("lseek");
		if (read(image,buffer,512) != 512) die(argv[1]);
		j = 0;
	} else if (memcmp(buffer, aout_magic, 4) == 0) {
		i = j = 32;
	} else {
		fprintf (stderr, "Not ELF nor a.out. Don't blame me.\n");
		exit(1);
	}
	k = i;
	i += (ld2(buffer + j + 2)<<2) - 512;
	if (lseek(image,i,0) < 0) die("lseek");
	if (read(image,buffer,1024) != 1024) die(argv[1]);
	for (q = buffer, r = q + 512; q < r; q += 4) {
		if (*q == 'H' && q[1] == 'd' && q[2] == 'r' && q[3] == 'S')
			break;
	}
	if (q == r) {
		fprintf (stderr, "Couldn't find headers signature in the kernel.\n");
		exit(1);
	}
	offset = i + (q - buffer) + 10;
	if (lseek(image, offset, 0) < 0) die ("lseek");

	st4(buffer, 0);
	st4(buffer + 4, 0x01000000);
	st4(buffer + 8, (end + 32 + 4095) & ~4095);
	st4(buffer + 12, s.st_size);

	if (write(image,buffer+2,14) != 14) die (argv[1]);
	if (lseek(image, k - start + ((end + 32 + 4095) & ~4095), 0) < 0) die ("lseek");
	if ((tail = open(argv[3],O_RDONLY)) < 0) die(argv[3]);
	while ((i = read (tail,buffer,1024)) > 0)
		if (write(image,buffer,i) != i) die (argv[1]);
	if (close(image) < 0) die("close");
	if (close(tail) < 0) die("close");
    	return 0;
}


--- NEW FILE piggyback.spec ---
Summary: Utility for making net-bootable sparc kernel image files
Name: piggyback
Version: 2.6.26
Release: 2%{?dist}
ExclusiveArch: sparcv9
License: GPLv2+
Group: System Environment/Kernel
URL: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git
# Downloaded Sun Sep 28, 2008
Source0: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=arch/sparc/boot/piggyback.c
# From: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=arch/sparc64/boot/piggyback.c
Source1: piggyback64.c
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: piggyback-startendcheck.patch
Patch1: piggyback-man.patch

%description
The piggyback utilities are designed to attach an initial ramdisk to an a.out 
format kernel image. Syntax: piggyback kernel.aout System.map initrd.img

%prep
%setup -q -T -c %{name}-%{version}
cp %{SOURCE0} %{SOURCE1} . 
%patch0 -p1
%patch1 -p1

%build
gcc $RPM_OPT_FLAGS -o piggyback piggyback.c
gcc $RPM_OPT_FLAGS -o piggyback64 piggyback64.c

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m 0755 piggyback $RPM_BUILD_ROOT%{_bindir}/piggyback
install -m 0755 piggyback64 $RPM_BUILD_ROOT%{_bindir}/piggyback64
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
install -m 0644 piggyback.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
install -m 0644 piggyback64.1 $RPM_BUILD_ROOT/%{_mandir}/man1/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_bindir}/piggyback
%{_bindir}/piggyback64
%{_mandir}/man1/piggyback*

%changelog
* Sun Sep 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.26-2
- don't strip the binaries

* Sun Sep 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.26-1
- initial package for Fedora, update to 2.6.26 source

* Sun Dec 24 2006 Tom "spot" Callaway <tcallawa at redhat.com>
- rebuild for aurora3

* Wed Apr 12 2006 Tom "spot" Callaway <tcallawa at redhat.com>
- initial package from 2.6.16 kernel source


--- NEW FILE piggyback64.c ---
/*
   Simple utility to make a single-image install kernel with initial ramdisk
   for Sparc64 tftpbooting without need to set up nfs.
   
   Copyright (C) 1997 Jakub Jelinek (jj at sunsite.mff.cuni.cz)
   
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
   
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
   
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <dirent.h>
#include <unistd.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>

/* Note: run this on an a.out kernel (use elftoaout for it), as PROM looks for a.out image onlly
   usage: piggyback vmlinux System.map tail, where tail is gzipped fs of the initial ramdisk */

void die(char *str)
{
	perror (str);
	exit(1);
}

int main(int argc,char **argv)
{
	char buffer [1024], *q, *r;
	unsigned int i, j, k, start, end, offset;
	FILE *map;
	struct stat s;
	int image, tail;
	
	if (stat (argv[3], &s) < 0) die (argv[3]);
	map = fopen (argv[2], "r");
	if (!map) die(argv[2]);
	while (fgets (buffer, 1024, map)) {
		if (!strcmp (buffer + 19, "_start\n"))
		start = strtoul (buffer + 8, NULL, 16);
		else if (!strcmp (buffer + 19, "_end\n"))
		end = strtoul (buffer + 8, NULL, 16);
	}
	fclose (map);
	if ((image = open(argv[1],O_RDWR)) < 0) die(argv[1]);
	if (read(image,buffer,512) != 512) die(argv[1]);
	if (!memcmp (buffer, "\177ELF", 4)) {
		unsigned int *p = (unsigned int *)(buffer + *(unsigned int *)(buffer + 28));
		
		i = p[1] + *(unsigned int *)(buffer + 24) - p[2];
		if (lseek(image,i,0) < 0) die("lseek");
		if (read(image,buffer,512) != 512) die(argv[1]);
		j = 0;
	} else if (*(unsigned int *)buffer == 0x01030107) {
		i = j = 32;
	} else {
		fprintf (stderr, "Not ELF nor a.out. Don't blame me.\n");
		exit(1);
	}
	k = i;
	if (j == 32 && buffer[40] == 'H' && buffer[41] == 'd' && buffer[42] == 'r' && buffer[43] == 'S') {
		offset = 40 + 10;
	} else {
		i += ((*(unsigned short *)(buffer + j + 2))<<2) - 512;
		if (lseek(image,i,0) < 0) die("lseek");
		if (read(image,buffer,1024) != 1024) die(argv[1]);
		for (q = buffer, r = q + 512; q < r; q += 4) {
			if (*q == 'H' && q[1] == 'd' && q[2] == 'r' && q[3] == 'S')
				break;
		}
		if (q == r) {
			fprintf (stderr, "Couldn't find headers signature in the kernel.\n");
			exit(1);
		}
		offset = i + (q - buffer) + 10;
	}
	if (lseek(image, offset, 0) < 0) die ("lseek");
	*(unsigned *)buffer = 0;
	*(unsigned *)(buffer + 4) = 0x01000000;
	*(unsigned *)(buffer + 8) = ((end + 32 + 8191) & ~8191);
	*(unsigned *)(buffer + 12) = s.st_size;
	if (write(image,buffer+2,14) != 14) die (argv[1]);
	if (lseek(image, 4, 0) < 0) die ("lseek");
	*(unsigned *)buffer = ((end + 32 + 8191) & ~8191) - (start & ~0x3fffffUL) + s.st_size;
	*(unsigned *)(buffer + 4) = 0;
	*(unsigned *)(buffer + 8) = 0;
	if (write(image,buffer,12) != 12) die (argv[1]);
	if (lseek(image, k - start + ((end + 32 + 8191) & ~8191), 0) < 0) die ("lseek");
	if ((tail = open(argv[3],O_RDONLY)) < 0) die(argv[3]);
	while ((i = read (tail,buffer,1024)) > 0)
		if (write(image,buffer,i) != i) die (argv[1]);
	if (close(image) < 0) die("close");
	if (close(tail) < 0) die("close");
    	return 0;
}



From spot at fedoraproject.org  Sun Sep 28 21:46:29 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun, 28 Sep 2008 21:46:29 +0000 (UTC)
Subject: rpms/piggyback/F-9 piggyback-man.patch, NONE,
	1.1 piggyback-startendcheck.patch, NONE, 1.1 piggyback.c, NONE,
	1.1 piggyback.spec, NONE, 1.1 piggyback64.c, NONE, 1.1
Message-ID: <20080928214629.141FD70118@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/piggyback/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26613/F-9

Added Files:
	piggyback-man.patch piggyback-startendcheck.patch piggyback.c 
	piggyback.spec piggyback64.c 
Log Message:
initial branching

piggyback-man.patch:

--- NEW FILE piggyback-man.patch ---
--- piggyback-2.6.16/piggyback.1
+++ piggyback-2.6.16/piggyback.1
@@ -0,0 +1,50 @@
+.\" -*- nroff -*-
+.\" 
+.TH PIGGYBACK 1 "March 1998" "piggyback"
+.SH NAME
+piggyback \- add initial ramdisk to a tftpboot kernel image
+.SH SYNOPSIS
+.B piggyback
+.I vmlinux
+.I System.map
+.I ramdisk
+.P
+.B piggyback64
+.I vmlinux
+.I System.map
+.I ramdisk
+.SH DESCRIPTION
+.BI piggyback
+is a simple utility to make a single-image install kernel with initial
+ramdisk for Sparc tftpbooting without need to set up nfs.
+.P
+.BI piggyback64
+is the same for Ultra-Sparc workstations (those using a 64 bit kernel).
+.PP
+.SH OPTIONS
+.TP
+.I vmlinux
+the kernel on which the ramdisk will be appended.  It must be an
+.B a.out
+kernel (use elftoaout for it), as PROM looks for
+.B a.out
+image only.
+.TP
+.I System.map
+the kernel map.
+.TP
+.I ramdisk
+the initial ramdisk image to append to the kernel image.  It could be
+compressed as well.
+.SH AUTHOR
+.B piggyback
+has been written by Jakub Jelinek <jj at ultra.linux.cz>.
+.SH AVAILABILITY
+.B piggyback
+and
+.B piggyback64
+are available in kernel-source-2.2.x package, under arch/sparc/boot and
+arch/sparc64/boot.
+.SH SEE ALSO
+.BR elftoaout (1),
+.BR tilo (1)
--- piggyback-2.6.16/piggyback64.1
+++ piggyback-2.6.16/piggyback64.1
@@ -0,0 +1,3 @@
+.\" -*- nroff -*-
+.\" 
+.so man1/piggyback.1

piggyback-startendcheck.patch:

--- NEW FILE piggyback-startendcheck.patch ---
--- piggyback-2.6.16/piggyback64.c.BAD	2006-04-12 17:49:52.000000000 -0400
+++ piggyback-2.6.16/piggyback64.c	2006-04-12 17:53:28.000000000 -0400
@@ -56,6 +56,10 @@
 		end = strtoul (buffer + 8, NULL, 16);
 	}
 	fclose (map);
+	if (!start || !end) {
+		fprintf (stderr, "Could not determine start and end from System.map\n");
+		exit(1);
+	}
 	if ((image = open(argv[1],O_RDWR)) < 0) die(argv[1]);
 	if (read(image,buffer,512) != 512) die(argv[1]);
 	if (!memcmp (buffer, "\177ELF", 4)) {


--- NEW FILE piggyback.c ---
/*
   Simple utility to make a single-image install kernel with initial ramdisk
   for Sparc tftpbooting without need to set up nfs.

   Copyright (C) 1996 Jakub Jelinek (jj at sunsite.mff.cuni.cz)
   Pete Zaitcev <zaitcev at yahoo.com> endian fixes for cross-compiles, 2000.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
   
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
   
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <dirent.h>
#include <unistd.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>

/*
 * Note: run this on an a.out kernel (use elftoaout for it),
 * as PROM looks for a.out image only.
 */

unsigned short ld2(char *p)
{
	return (p[0] << 8) | p[1];
}

unsigned int ld4(char *p)
{
	return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
}

void st4(char *p, unsigned int x)
{
	p[0] = x >> 24;
	p[1] = x >> 16;
	p[2] = x >> 8;
	p[3] = x;
}

void usage(void)
{
	/* fs_img.gz is an image of initial ramdisk. */
	fprintf(stderr, "Usage: piggyback vmlinux.aout System.map fs_img.gz\n");
	fprintf(stderr, "\tKernel image will be modified in place.\n");
	exit(1);
}

void die(char *str)
{
	perror (str);
	exit(1);
}

int main(int argc,char **argv)
{
	static char aout_magic[] = { 0x01, 0x03, 0x01, 0x07 };
	unsigned char buffer[1024], *q, *r;
	unsigned int i, j, k, start, end, offset;
	FILE *map;
	struct stat s;
	int image, tail;

	if (argc != 4) usage();
	start = end = 0;
	if (stat (argv[3], &s) < 0) die (argv[3]);
	map = fopen (argv[2], "r");
	if (!map) die(argv[2]);
	while (fgets (buffer, 1024, map)) {
		if (!strcmp (buffer + 8, " T start\n") || !strcmp (buffer + 16, " T start\n"))
			start = strtoul (buffer, NULL, 16);
		else if (!strcmp (buffer + 8, " A end\n") || !strcmp (buffer + 16, " A end\n"))
			end = strtoul (buffer, NULL, 16);
	}
	fclose (map);
	if (!start || !end) {
		fprintf (stderr, "Could not determine start and end from System.map\n");
		exit(1);
	}
	if ((image = open(argv[1],O_RDWR)) < 0) die(argv[1]);
	if (read(image,buffer,512) != 512) die(argv[1]);
	if (memcmp (buffer, "\177ELF", 4) == 0) {
		q = buffer + ld4(buffer + 28);
		i = ld4(q + 4) + ld4(buffer + 24) - ld4(q + 8);
		if (lseek(image,i,0) < 0) die("lseek");
		if (read(image,buffer,512) != 512) die(argv[1]);
		j = 0;
	} else if (memcmp(buffer, aout_magic, 4) == 0) {
		i = j = 32;
	} else {
		fprintf (stderr, "Not ELF nor a.out. Don't blame me.\n");
		exit(1);
	}
	k = i;
	i += (ld2(buffer + j + 2)<<2) - 512;
	if (lseek(image,i,0) < 0) die("lseek");
	if (read(image,buffer,1024) != 1024) die(argv[1]);
	for (q = buffer, r = q + 512; q < r; q += 4) {
		if (*q == 'H' && q[1] == 'd' && q[2] == 'r' && q[3] == 'S')
			break;
	}
	if (q == r) {
		fprintf (stderr, "Couldn't find headers signature in the kernel.\n");
		exit(1);
	}
	offset = i + (q - buffer) + 10;
	if (lseek(image, offset, 0) < 0) die ("lseek");

	st4(buffer, 0);
	st4(buffer + 4, 0x01000000);
	st4(buffer + 8, (end + 32 + 4095) & ~4095);
	st4(buffer + 12, s.st_size);

	if (write(image,buffer+2,14) != 14) die (argv[1]);
	if (lseek(image, k - start + ((end + 32 + 4095) & ~4095), 0) < 0) die ("lseek");
	if ((tail = open(argv[3],O_RDONLY)) < 0) die(argv[3]);
	while ((i = read (tail,buffer,1024)) > 0)
		if (write(image,buffer,i) != i) die (argv[1]);
	if (close(image) < 0) die("close");
	if (close(tail) < 0) die("close");
    	return 0;
}


--- NEW FILE piggyback.spec ---
Summary: Utility for making net-bootable sparc kernel image files
Name: piggyback
Version: 2.6.26
Release: 2%{?dist}
ExclusiveArch: sparcv9
License: GPLv2+
Group: System Environment/Kernel
URL: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git
# Downloaded Sun Sep 28, 2008
Source0: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=arch/sparc/boot/piggyback.c
# From: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=arch/sparc64/boot/piggyback.c
Source1: piggyback64.c
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: piggyback-startendcheck.patch
Patch1: piggyback-man.patch

%description
The piggyback utilities are designed to attach an initial ramdisk to an a.out 
format kernel image. Syntax: piggyback kernel.aout System.map initrd.img

%prep
%setup -q -T -c %{name}-%{version}
cp %{SOURCE0} %{SOURCE1} . 
%patch0 -p1
%patch1 -p1

%build
gcc $RPM_OPT_FLAGS -o piggyback piggyback.c
gcc $RPM_OPT_FLAGS -o piggyback64 piggyback64.c

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m 0755 piggyback $RPM_BUILD_ROOT%{_bindir}/piggyback
install -m 0755 piggyback64 $RPM_BUILD_ROOT%{_bindir}/piggyback64
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
install -m 0644 piggyback.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
install -m 0644 piggyback64.1 $RPM_BUILD_ROOT/%{_mandir}/man1/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_bindir}/piggyback
%{_bindir}/piggyback64
%{_mandir}/man1/piggyback*

%changelog
* Sun Sep 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.26-2
- don't strip the binaries

* Sun Sep 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.26-1
- initial package for Fedora, update to 2.6.26 source

* Sun Dec 24 2006 Tom "spot" Callaway <tcallawa at redhat.com>
- rebuild for aurora3

* Wed Apr 12 2006 Tom "spot" Callaway <tcallawa at redhat.com>
- initial package from 2.6.16 kernel source


--- NEW FILE piggyback64.c ---
/*
   Simple utility to make a single-image install kernel with initial ramdisk
   for Sparc64 tftpbooting without need to set up nfs.
   
   Copyright (C) 1997 Jakub Jelinek (jj at sunsite.mff.cuni.cz)
   
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
   
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
   
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <dirent.h>
#include <unistd.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>

/* Note: run this on an a.out kernel (use elftoaout for it), as PROM looks for a.out image onlly
   usage: piggyback vmlinux System.map tail, where tail is gzipped fs of the initial ramdisk */

void die(char *str)
{
	perror (str);
	exit(1);
}

int main(int argc,char **argv)
{
	char buffer [1024], *q, *r;
	unsigned int i, j, k, start, end, offset;
	FILE *map;
	struct stat s;
	int image, tail;
	
	if (stat (argv[3], &s) < 0) die (argv[3]);
	map = fopen (argv[2], "r");
	if (!map) die(argv[2]);
	while (fgets (buffer, 1024, map)) {
		if (!strcmp (buffer + 19, "_start\n"))
		start = strtoul (buffer + 8, NULL, 16);
		else if (!strcmp (buffer + 19, "_end\n"))
		end = strtoul (buffer + 8, NULL, 16);
	}
	fclose (map);
	if ((image = open(argv[1],O_RDWR)) < 0) die(argv[1]);
	if (read(image,buffer,512) != 512) die(argv[1]);
	if (!memcmp (buffer, "\177ELF", 4)) {
		unsigned int *p = (unsigned int *)(buffer + *(unsigned int *)(buffer + 28));
		
		i = p[1] + *(unsigned int *)(buffer + 24) - p[2];
		if (lseek(image,i,0) < 0) die("lseek");
		if (read(image,buffer,512) != 512) die(argv[1]);
		j = 0;
	} else if (*(unsigned int *)buffer == 0x01030107) {
		i = j = 32;
	} else {
		fprintf (stderr, "Not ELF nor a.out. Don't blame me.\n");
		exit(1);
	}
	k = i;
	if (j == 32 && buffer[40] == 'H' && buffer[41] == 'd' && buffer[42] == 'r' && buffer[43] == 'S') {
		offset = 40 + 10;
	} else {
		i += ((*(unsigned short *)(buffer + j + 2))<<2) - 512;
		if (lseek(image,i,0) < 0) die("lseek");
		if (read(image,buffer,1024) != 1024) die(argv[1]);
		for (q = buffer, r = q + 512; q < r; q += 4) {
			if (*q == 'H' && q[1] == 'd' && q[2] == 'r' && q[3] == 'S')
				break;
		}
		if (q == r) {
			fprintf (stderr, "Couldn't find headers signature in the kernel.\n");
			exit(1);
		}
		offset = i + (q - buffer) + 10;
	}
	if (lseek(image, offset, 0) < 0) die ("lseek");
	*(unsigned *)buffer = 0;
	*(unsigned *)(buffer + 4) = 0x01000000;
	*(unsigned *)(buffer + 8) = ((end + 32 + 8191) & ~8191);
	*(unsigned *)(buffer + 12) = s.st_size;
	if (write(image,buffer+2,14) != 14) die (argv[1]);
	if (lseek(image, 4, 0) < 0) die ("lseek");
	*(unsigned *)buffer = ((end + 32 + 8191) & ~8191) - (start & ~0x3fffffUL) + s.st_size;
	*(unsigned *)(buffer + 4) = 0;
	*(unsigned *)(buffer + 8) = 0;
	if (write(image,buffer,12) != 12) die (argv[1]);
	if (lseek(image, k - start + ((end + 32 + 8191) & ~8191), 0) < 0) die ("lseek");
	if ((tail = open(argv[3],O_RDONLY)) < 0) die(argv[3]);
	while ((i = read (tail,buffer,1024)) > 0)
		if (write(image,buffer,i) != i) die (argv[1]);
	if (close(image) < 0) die("close");
	if (close(tail) < 0) die("close");
    	return 0;
}



From pgordon at fedoraproject.org  Sun Sep 28 21:55:07 2008
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Sun, 28 Sep 2008 21:55:07 +0000 (UTC)
Subject: rpms/nemiver/devel .cvsignore, 1.10, 1.11 nemiver.spec, 1.17,
	1.18 sources, 1.10, 1.11
Message-ID: <20080928215507.8C5C170118@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/nemiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27709

Modified Files:
	.cvsignore nemiver.spec sources 
Log Message:
Update to 0.6.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	14 Sep 2008 05:51:56 -0000	1.10
+++ .cvsignore	28 Sep 2008 21:54:37 -0000	1.11
@@ -1 +1 @@
-nemiver-0.6.2.tar.bz2
+nemiver-0.6.3.tar.bz2


Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/nemiver.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nemiver.spec	14 Sep 2008 05:51:56 -0000	1.17
+++ nemiver.spec	28 Sep 2008 21:54:37 -0000	1.18
@@ -1,7 +1,7 @@
 Name:		nemiver
-Version:	0.6.2
+Version:	0.6.3
 Release:	1%{?dist}
-Summary:	A C/C++ Debugger for GNOME - point, click, debug!
+Summary:	A GNOME C/C++ Debugger
 
 Group:		Development/Debuggers
 License:	GPLv2+
@@ -14,12 +14,16 @@
 ## The glibmm bits would normally be part of the dependency tree for
 ## gtksourceviewmm; but we're using GIO here (F9+) so we need to ensure that the
 ## the Glib/glibmm we're depending on also includes it (e.g., 2.16+)
+##
+## We specify the minimum version of gtkmm24 because we are now using
+## the tooltip and treeview APIs of gtkmm 2.12.7.
 BuildRequires:	boost-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gdb
 BuildRequires:	gettext
 BuildRequires:	ghex-devel >= 2.21.4
 BuildRequires:	glibmm24-devel >= 2.16
+BuildRequires:	gtkmm24-devel >= 2.12.7
 BuildRequires:	gnome-doc-utils >= 0.3.2
 BuildRequires:	libglademm24-devel >= 2.6.0
 BuildRequires:	libgnome-devel >= 2.0
@@ -152,6 +156,13 @@
 
 
 %changelog
+* Sun Sep 28 2008 Peter Gordon <peter at thecodergeek.com> - 0.6.3-1
+- Update to new upstream release (0.6.3).
+- Set the minimum required version of gtkmm-24 to 2.12.7; and update the
+  Summary field to reflect the current state of upstream, as recommended by
+  Dodji Seketeli.
+- Resolves: #464413 (Nemiver 0.6.3 has been released upstream)
+
 * Sat Sep 13 2008 Peter Gordon <peter at thecodergeek.com> - 0.6.2-1
 - Update to new upstream release (0.6.2).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	14 Sep 2008 05:51:56 -0000	1.10
+++ sources	28 Sep 2008 21:54:37 -0000	1.11
@@ -1 +1 @@
-30e5710b0ab2907e0095ab16ee202a27  nemiver-0.6.2.tar.bz2
+0b420acf4695188c8da675926011169a  nemiver-0.6.3.tar.bz2



From rdieter at fedoraproject.org  Sun Sep 28 21:57:01 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 28 Sep 2008 21:57:01 +0000 (UTC)
Subject: rpms/kdepimlibs/F-9 fix-invitations.diff,1.1,NONE
Message-ID: <20080928215701.5B78D70118@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27999

Removed Files:
	fix-invitations.diff 
Log Message:
old patch



--- fix-invitations.diff DELETED ---



From ausil at fedoraproject.org  Sun Sep 28 21:57:59 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sun, 28 Sep 2008 21:57:59 +0000 (UTC)
Subject: common Makefile.common,1.115,1.116
Message-ID: <20080928215759.2528370118@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28059

Modified Files:
	Makefile.common 
Log Message:
remove s390 for now



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- Makefile.common	28 Sep 2008 18:22:12 -0000	1.115
+++ Makefile.common	28 Sep 2008 21:57:28 -0000	1.116
@@ -116,9 +116,6 @@
 for name in silo prtconf lssbus afbinit piggyback xorg-x11-drv-sunbw2 xorg-x11-drv-suncg14 xorg-x11-drv-suncg3 xorg-x11-drv-suncg6 xorg-x11-drv-sunffb xorg-x11-drv-sunleo xorg-x11-drv-suntcx ; \
 do if [ "$$name" = "$(NAME)" ]; then echo "-c ~/.koji/sparc-config"; fi \
 done 
-for name in s390-utils ; \
-do if [ "$$name" = "$(NAME)" ]; then echo "-c ~/.koji/s390-config"; fi \
-done
 endef
 # if we have defineded SECONDARY_CONFIG trust the user is doing it for a reason
 ifndef SECONDARY_CONFIG



From jgu at fedoraproject.org  Sun Sep 28 23:21:42 2008
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sun, 28 Sep 2008 23:21:42 +0000 (UTC)
Subject: rpms/emacs-bbdb/devel .cvsignore, 1.2, 1.3 emacs-bbdb.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20080928232142.E364070118@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-bbdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2818

Modified Files:
	.cvsignore emacs-bbdb.spec sources 
Log Message:
* Sat Sep 28 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.35-9.20080928cvs
- Update to current CVS snapshot, fixing several bugs
- Ensure that bbdb-vm.elc is built and installed (BZ 462875)
- Add --enable-developer to configure for more verbose build info



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emacs-bbdb/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Oct 2007 19:19:31 -0000	1.2
+++ .cvsignore	28 Sep 2008 23:21:11 -0000	1.3
@@ -1 +1 @@
-bbdb-2.35.tar.gz
+bbdb-2.35.20080928cvs.tar.gz


Index: emacs-bbdb.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-bbdb/devel/emacs-bbdb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacs-bbdb.spec	12 Oct 2007 19:19:31 -0000	1.1
+++ emacs-bbdb.spec	28 Sep 2008 23:21:11 -0000	1.2
@@ -10,9 +10,14 @@
 %define emacs_startdir %(pkg-config emacs --variable sitestartdir)
 %endif
 
-%define lispdir %{emacs_lispdir}/bbdb
-%define texdir %{_datadir}/texmf/tex/generic/bbdb
-	
+# Note on CVS snapshot: we now package a post 2.35 release CVS snapshot of
+# upstream development leading to 2.36. Tarball produced by:
+# 1. cvs -d :pserver:anonymous at bbdb.cvs.sourceforge.net:/cvsroot/bbdb login
+# 2. cvs -d :pserver:anonymous at bbdb.cvs.sourceforge.net:/cvsroot/bbdb checkout bbdb
+# 3. cd bbdb ; autonconf ; ./configure ; make tar
+# 4. mv bbdb-2.36 bbdb-2.35.YYYYMMDDcvs.tar.gz
+%define cvs_ver 20080928cvs
+ 
 # Note on building bbdb with support for VM: if support for VM in bbdb is
 # required, then the source elisp for VM must be installed at build time. If
 # support for BBDB is required in VM, then the BBDB source elisp must be present
@@ -22,16 +27,20 @@
 # rebuild emacs-vm with BuildRequires: emacs-bbdb-el. Or vice versa.
 %define vmsupport 1
 
+%define lispdir %{emacs_lispdir}/bbdb
+%define texdir %{_datadir}/texmf/tex/generic/bbdb
+	
+
 Name:           emacs-bbdb
 Version:        2.35
-Release:        8%{?dist}
+Release:        9.%{cvs_ver}%{?dist}
 Summary:        A contact management utility for use with Emacs
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://bbdb.sourceforge.net/
 Requires:       emacs(bin) >= %{emacs_version}
 
-Source0:        http://bbdb.sourceforge.net/bbdb-2.35.tar.gz
+Source0:        bbdb-2.35.%{cvs_ver}.tar.gz
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  emacs emacs-el texinfo-tex
@@ -66,7 +75,7 @@
 This package contains the Emacs lisp source files for %{name}. 
 
 %prep 
-%setup -q -n bbdb-%{version}
+%setup -q -n bbdb-2.36
 
 # Correct encoding of info file and ChangeLog
 for i in texinfo/bbdb.texinfo ChangeLog ; do
@@ -75,9 +84,15 @@
 done
 
 %build
-%configure
+# Note --enable-developer simply gives more verbose output during building,
+# handy for debugging
+%if %{vmsupport}
+%configure --with-vm-dir=%{emacs_lispdir}/vm --enable-developer
+%else
+%configure --enable-developer
+%endif
 
-# Note: make %{?_smp_mflags} all fails.
+# Note: make %{?_smp_mflags} fails.
 make all
 
 %install
@@ -131,6 +146,11 @@
 %{lispdir}/*.el
 
 %changelog
+* Sat Sep 28 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.35-9.20080928cvs
+- Update to current CVS snapshot, fixing several bugs
+- Ensure that bbdb-vm.elc is built and installed (BZ 462875)
+- Add --enable-developer to configure for more verbose build info
+
 * Fri Sep 28 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.35-8
 - Correct encoding of ChangeLog and info files
 - Correct hash bang in perl scripts which are installed as docs


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-bbdb/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Oct 2007 19:19:31 -0000	1.2
+++ sources	28 Sep 2008 23:21:11 -0000	1.3
@@ -1 +1 @@
-5c4e7f2b2a6a8e25ff77351f533f3910  bbdb-2.35.tar.gz
+3edf3378898af66f7505f64f2ec2eddc  bbdb-2.35.20080928cvs.tar.gz



From jgu at fedoraproject.org  Sun Sep 28 23:22:55 2008
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sun, 28 Sep 2008 23:22:55 +0000 (UTC)
Subject: rpms/emacs-bbdb/F-9 emacs-bbdb.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20080928232255.F053470118@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-bbdb/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3060

Modified Files:
	emacs-bbdb.spec sources 
Log Message:
* Sat Sep 28 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.35-9.20080928cvs
- Update to current CVS snapshot, fixing several bugs
- Ensure that bbdb-vm.elc is built and installed (BZ 462875)
- Add --enable-developer to configure for more verbose build info



Index: emacs-bbdb.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-bbdb/F-9/emacs-bbdb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacs-bbdb.spec	12 Oct 2007 19:19:31 -0000	1.1
+++ emacs-bbdb.spec	28 Sep 2008 23:22:25 -0000	1.2
@@ -10,9 +10,14 @@
 %define emacs_startdir %(pkg-config emacs --variable sitestartdir)
 %endif
 
-%define lispdir %{emacs_lispdir}/bbdb
-%define texdir %{_datadir}/texmf/tex/generic/bbdb
-	
+# Note on CVS snapshot: we now package a post 2.35 release CVS snapshot of
+# upstream development leading to 2.36. Tarball produced by:
+# 1. cvs -d :pserver:anonymous at bbdb.cvs.sourceforge.net:/cvsroot/bbdb login
+# 2. cvs -d :pserver:anonymous at bbdb.cvs.sourceforge.net:/cvsroot/bbdb checkout bbdb
+# 3. cd bbdb ; autonconf ; ./configure ; make tar
+# 4. mv bbdb-2.36 bbdb-2.35.YYYYMMDDcvs.tar.gz
+%define cvs_ver 20080928cvs
+ 
 # Note on building bbdb with support for VM: if support for VM in bbdb is
 # required, then the source elisp for VM must be installed at build time. If
 # support for BBDB is required in VM, then the BBDB source elisp must be present
@@ -22,16 +27,20 @@
 # rebuild emacs-vm with BuildRequires: emacs-bbdb-el. Or vice versa.
 %define vmsupport 1
 
+%define lispdir %{emacs_lispdir}/bbdb
+%define texdir %{_datadir}/texmf/tex/generic/bbdb
+	
+
 Name:           emacs-bbdb
 Version:        2.35
-Release:        8%{?dist}
+Release:        9.%{cvs_ver}%{?dist}
 Summary:        A contact management utility for use with Emacs
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://bbdb.sourceforge.net/
 Requires:       emacs(bin) >= %{emacs_version}
 
-Source0:        http://bbdb.sourceforge.net/bbdb-2.35.tar.gz
+Source0:        bbdb-2.35.%{cvs_ver}.tar.gz
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  emacs emacs-el texinfo-tex
@@ -66,7 +75,7 @@
 This package contains the Emacs lisp source files for %{name}. 
 
 %prep 
-%setup -q -n bbdb-%{version}
+%setup -q -n bbdb-2.36
 
 # Correct encoding of info file and ChangeLog
 for i in texinfo/bbdb.texinfo ChangeLog ; do
@@ -75,9 +84,15 @@
 done
 
 %build
-%configure
+# Note --enable-developer simply gives more verbose output during building,
+# handy for debugging
+%if %{vmsupport}
+%configure --with-vm-dir=%{emacs_lispdir}/vm --enable-developer
+%else
+%configure --enable-developer
+%endif
 
-# Note: make %{?_smp_mflags} all fails.
+# Note: make %{?_smp_mflags} fails.
 make all
 
 %install
@@ -131,6 +146,11 @@
 %{lispdir}/*.el
 
 %changelog
+* Sat Sep 28 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.35-9.20080928cvs
+- Update to current CVS snapshot, fixing several bugs
+- Ensure that bbdb-vm.elc is built and installed (BZ 462875)
+- Add --enable-developer to configure for more verbose build info
+
 * Fri Sep 28 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.35-8
 - Correct encoding of ChangeLog and info files
 - Correct hash bang in perl scripts which are installed as docs


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-bbdb/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Oct 2007 19:19:31 -0000	1.2
+++ sources	28 Sep 2008 23:22:25 -0000	1.3
@@ -1 +1 @@
-5c4e7f2b2a6a8e25ff77351f533f3910  bbdb-2.35.tar.gz
+3edf3378898af66f7505f64f2ec2eddc  bbdb-2.35.20080928cvs.tar.gz



From jgu at fedoraproject.org  Sun Sep 28 23:23:58 2008
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sun, 28 Sep 2008 23:23:58 +0000 (UTC)
Subject: rpms/emacs-bbdb/F-8 emacs-bbdb.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20080928232358.E82D270118@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-bbdb/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3253

Modified Files:
	emacs-bbdb.spec sources 
Log Message:
* Sat Sep 28 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.35-9.20080928cvs
- Update to current CVS snapshot, fixing several bugs
- Ensure that bbdb-vm.elc is built and installed (BZ 462875)
- Add --enable-developer to configure for more verbose build info



Index: emacs-bbdb.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-bbdb/F-8/emacs-bbdb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacs-bbdb.spec	12 Oct 2007 19:19:31 -0000	1.1
+++ emacs-bbdb.spec	28 Sep 2008 23:23:28 -0000	1.2
@@ -10,9 +10,14 @@
 %define emacs_startdir %(pkg-config emacs --variable sitestartdir)
 %endif
 
-%define lispdir %{emacs_lispdir}/bbdb
-%define texdir %{_datadir}/texmf/tex/generic/bbdb
-	
+# Note on CVS snapshot: we now package a post 2.35 release CVS snapshot of
+# upstream development leading to 2.36. Tarball produced by:
+# 1. cvs -d :pserver:anonymous at bbdb.cvs.sourceforge.net:/cvsroot/bbdb login
+# 2. cvs -d :pserver:anonymous at bbdb.cvs.sourceforge.net:/cvsroot/bbdb checkout bbdb
+# 3. cd bbdb ; autonconf ; ./configure ; make tar
+# 4. mv bbdb-2.36 bbdb-2.35.YYYYMMDDcvs.tar.gz
+%define cvs_ver 20080928cvs
+ 
 # Note on building bbdb with support for VM: if support for VM in bbdb is
 # required, then the source elisp for VM must be installed at build time. If
 # support for BBDB is required in VM, then the BBDB source elisp must be present
@@ -22,16 +27,20 @@
 # rebuild emacs-vm with BuildRequires: emacs-bbdb-el. Or vice versa.
 %define vmsupport 1
 
+%define lispdir %{emacs_lispdir}/bbdb
+%define texdir %{_datadir}/texmf/tex/generic/bbdb
+	
+
 Name:           emacs-bbdb
 Version:        2.35
-Release:        8%{?dist}
+Release:        9.%{cvs_ver}%{?dist}
 Summary:        A contact management utility for use with Emacs
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://bbdb.sourceforge.net/
 Requires:       emacs(bin) >= %{emacs_version}
 
-Source0:        http://bbdb.sourceforge.net/bbdb-2.35.tar.gz
+Source0:        bbdb-2.35.%{cvs_ver}.tar.gz
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  emacs emacs-el texinfo-tex
@@ -66,7 +75,7 @@
 This package contains the Emacs lisp source files for %{name}. 
 
 %prep 
-%setup -q -n bbdb-%{version}
+%setup -q -n bbdb-2.36
 
 # Correct encoding of info file and ChangeLog
 for i in texinfo/bbdb.texinfo ChangeLog ; do
@@ -75,9 +84,15 @@
 done
 
 %build
-%configure
+# Note --enable-developer simply gives more verbose output during building,
+# handy for debugging
+%if %{vmsupport}
+%configure --with-vm-dir=%{emacs_lispdir}/vm --enable-developer
+%else
+%configure --enable-developer
+%endif
 
-# Note: make %{?_smp_mflags} all fails.
+# Note: make %{?_smp_mflags} fails.
 make all
 
 %install
@@ -131,6 +146,11 @@
 %{lispdir}/*.el
 
 %changelog
+* Sat Sep 28 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.35-9.20080928cvs
+- Update to current CVS snapshot, fixing several bugs
+- Ensure that bbdb-vm.elc is built and installed (BZ 462875)
+- Add --enable-developer to configure for more verbose build info
+
 * Fri Sep 28 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.35-8
 - Correct encoding of ChangeLog and info files
 - Correct hash bang in perl scripts which are installed as docs


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-bbdb/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Oct 2007 19:19:31 -0000	1.2
+++ sources	28 Sep 2008 23:23:28 -0000	1.3
@@ -1 +1 @@
-5c4e7f2b2a6a8e25ff77351f533f3910  bbdb-2.35.tar.gz
+3edf3378898af66f7505f64f2ec2eddc  bbdb-2.35.20080928cvs.tar.gz



From jgu at fedoraproject.org  Sun Sep 28 23:34:40 2008
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sun, 28 Sep 2008 23:34:40 +0000 (UTC)
Subject: rpms/shorewall/devel .cvsignore, 1.39, 1.40 shorewall.spec, 1.57,
	1.58 sources, 1.39, 1.40
Message-ID: <20080928233440.721A970118@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4544

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
* Sun Sep 28 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.14-1
- Update to version 4.0.14



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	30 Jul 2008 00:06:45 -0000	1.39
+++ .cvsignore	28 Sep 2008 23:34:10 -0000	1.40
@@ -1,4 +1,4 @@
-shorewall-common-4.0.13.tar.bz2
-shorewall-shell-4.0.13.tar.bz2
-shorewall-perl-4.0.13.tar.bz2
-shorewall-lite-4.0.13.tar.bz2
+shorewall-common-4.0.14.tar.bz2
+shorewall-shell-4.0.14.tar.bz2
+shorewall-perl-4.0.14.tar.bz2
+shorewall-lite-4.0.14.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- shorewall.spec	30 Jul 2008 00:06:45 -0000	1.57
+++ shorewall.spec	28 Sep 2008 23:34:10 -0000	1.58
@@ -10,7 +10,7 @@
 # patchlevel. However, these should not be used for distro packaging.
 
 Name:           shorewall
-Version:	4.0.13
+Version:	4.0.14
 Release:	1%{?dist}
 Summary:	An iptables front end for firewall configuration
 Group:		Applications/System
@@ -263,6 +263,9 @@
 %{_mandir}/man8/shorewall-lite.8.gz
 
 %changelog
+* Sun Sep 28 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.14-1
+- Update to version 4.0.14
+
 * Tue Jul 29 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.13-1
 - Update to version 4.0.13
 - Remove patch-perl-4.0.12.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	30 Jul 2008 00:06:45 -0000	1.39
+++ sources	28 Sep 2008 23:34:10 -0000	1.40
@@ -1,4 +1,4 @@
-b14dcfcfd9fab234f401e32ecdb2b368  shorewall-common-4.0.13.tar.bz2
-938f12b6f9345bd1ff820185548a86c3  shorewall-shell-4.0.13.tar.bz2
-bc07ecbf2b4b37d4f6b831058e8085df  shorewall-perl-4.0.13.tar.bz2
-83797718ddcb14e7171a4a9a05a5477c  shorewall-lite-4.0.13.tar.bz2
+f8d545a52da01b340405f39464d4d64a  shorewall-common-4.0.14.tar.bz2
+878b016480b967fd861722ffa27a18ee  shorewall-shell-4.0.14.tar.bz2
+42baaf5bbcdf073a0e030e3c541c4e67  shorewall-perl-4.0.14.tar.bz2
+6c6aa18831ffc8f0e87f2ce8fac2d1d0  shorewall-lite-4.0.14.tar.bz2



From jgu at fedoraproject.org  Sun Sep 28 23:35:50 2008
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sun, 28 Sep 2008 23:35:50 +0000 (UTC)
Subject: rpms/shorewall/F-9 shorewall.spec,1.57,1.58 sources,1.39,1.40
Message-ID: <20080928233550.5E1FC70118@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4797

Modified Files:
	shorewall.spec sources 
Log Message:
* Sun Sep 28 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.14-1
- Update to version 4.0.14



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-9/shorewall.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- shorewall.spec	30 Jul 2008 00:07:46 -0000	1.57
+++ shorewall.spec	28 Sep 2008 23:35:20 -0000	1.58
@@ -10,7 +10,7 @@
 # patchlevel. However, these should not be used for distro packaging.
 
 Name:           shorewall
-Version:	4.0.13
+Version:	4.0.14
 Release:	1%{?dist}
 Summary:	An iptables front end for firewall configuration
 Group:		Applications/System
@@ -263,6 +263,9 @@
 %{_mandir}/man8/shorewall-lite.8.gz
 
 %changelog
+* Sun Sep 28 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.14-1
+- Update to version 4.0.14
+
 * Tue Jul 29 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.13-1
 - Update to version 4.0.13
 - Remove patch-perl-4.0.12.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-9/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	30 Jul 2008 00:07:46 -0000	1.39
+++ sources	28 Sep 2008 23:35:20 -0000	1.40
@@ -1,4 +1,4 @@
-b14dcfcfd9fab234f401e32ecdb2b368  shorewall-common-4.0.13.tar.bz2
-938f12b6f9345bd1ff820185548a86c3  shorewall-shell-4.0.13.tar.bz2
-bc07ecbf2b4b37d4f6b831058e8085df  shorewall-perl-4.0.13.tar.bz2
-83797718ddcb14e7171a4a9a05a5477c  shorewall-lite-4.0.13.tar.bz2
+f8d545a52da01b340405f39464d4d64a  shorewall-common-4.0.14.tar.bz2
+878b016480b967fd861722ffa27a18ee  shorewall-shell-4.0.14.tar.bz2
+42baaf5bbcdf073a0e030e3c541c4e67  shorewall-perl-4.0.14.tar.bz2
+6c6aa18831ffc8f0e87f2ce8fac2d1d0  shorewall-lite-4.0.14.tar.bz2



From jgu at fedoraproject.org  Sun Sep 28 23:36:49 2008
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sun, 28 Sep 2008 23:36:49 +0000 (UTC)
Subject: rpms/shorewall/F-8 shorewall.spec,1.53,1.54 sources,1.39,1.40
Message-ID: <20080928233649.8B04E70118@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4984

Modified Files:
	shorewall.spec sources 
Log Message:
* Sun Sep 28 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.14-1
- Update to version 4.0.14



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-8/shorewall.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- shorewall.spec	30 Jul 2008 00:08:38 -0000	1.53
+++ shorewall.spec	28 Sep 2008 23:36:19 -0000	1.54
@@ -10,7 +10,7 @@
 # patchlevel. However, these should not be used for distro packaging.
 
 Name:           shorewall
-Version:	4.0.13
+Version:	4.0.14
 Release:	1%{?dist}
 Summary:	An iptables front end for firewall configuration
 Group:		Applications/System
@@ -263,6 +263,9 @@
 %{_mandir}/man8/shorewall-lite.8.gz
 
 %changelog
+* Sun Sep 28 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.14-1
+- Update to version 4.0.14
+
 * Tue Jul 29 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.13-1
 - Update to version 4.0.13
 - Remove patch-perl-4.0.12.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-8/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	30 Jul 2008 00:08:38 -0000	1.39
+++ sources	28 Sep 2008 23:36:19 -0000	1.40
@@ -1,4 +1,4 @@
-b14dcfcfd9fab234f401e32ecdb2b368  shorewall-common-4.0.13.tar.bz2
-938f12b6f9345bd1ff820185548a86c3  shorewall-shell-4.0.13.tar.bz2
-bc07ecbf2b4b37d4f6b831058e8085df  shorewall-perl-4.0.13.tar.bz2
-83797718ddcb14e7171a4a9a05a5477c  shorewall-lite-4.0.13.tar.bz2
+f8d545a52da01b340405f39464d4d64a  shorewall-common-4.0.14.tar.bz2
+878b016480b967fd861722ffa27a18ee  shorewall-shell-4.0.14.tar.bz2
+42baaf5bbcdf073a0e030e3c541c4e67  shorewall-perl-4.0.14.tar.bz2
+6c6aa18831ffc8f0e87f2ce8fac2d1d0  shorewall-lite-4.0.14.tar.bz2



From jgu at fedoraproject.org  Sun Sep 28 23:37:47 2008
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sun, 28 Sep 2008 23:37:47 +0000 (UTC)
Subject: rpms/shorewall/EL-4 shorewall.spec,1.19,1.20 sources,1.10,1.11
Message-ID: <20080928233747.3E9F470118@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5147

Modified Files:
	shorewall.spec sources 
Log Message:
* Sun Sep 28 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.14-1
- Update to version 4.0.14



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/EL-4/shorewall.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- shorewall.spec	30 Jul 2008 00:10:19 -0000	1.19
+++ shorewall.spec	28 Sep 2008 23:37:17 -0000	1.20
@@ -10,7 +10,7 @@
 # patchlevel. However, these should not be used for distro packaging.
 
 Name:           shorewall
-Version:	4.0.13
+Version:	4.0.14
 Release:	1%{?dist}
 Summary:	An iptables front end for firewall configuration
 Group:		Applications/System
@@ -263,6 +263,9 @@
 %{_mandir}/man8/shorewall-lite.8.gz
 
 %changelog
+* Sun Sep 28 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.14-1
+- Update to version 4.0.14
+
 * Tue Jul 29 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.13-1
 - Update to version 4.0.13
 - Remove patch-perl-4.0.12.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/EL-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Jul 2008 00:10:19 -0000	1.10
+++ sources	28 Sep 2008 23:37:17 -0000	1.11
@@ -1,4 +1,4 @@
-b14dcfcfd9fab234f401e32ecdb2b368  shorewall-common-4.0.13.tar.bz2
-938f12b6f9345bd1ff820185548a86c3  shorewall-shell-4.0.13.tar.bz2
-bc07ecbf2b4b37d4f6b831058e8085df  shorewall-perl-4.0.13.tar.bz2
-83797718ddcb14e7171a4a9a05a5477c  shorewall-lite-4.0.13.tar.bz2
+f8d545a52da01b340405f39464d4d64a  shorewall-common-4.0.14.tar.bz2
+878b016480b967fd861722ffa27a18ee  shorewall-shell-4.0.14.tar.bz2
+42baaf5bbcdf073a0e030e3c541c4e67  shorewall-perl-4.0.14.tar.bz2
+6c6aa18831ffc8f0e87f2ce8fac2d1d0  shorewall-lite-4.0.14.tar.bz2



From jgu at fedoraproject.org  Sun Sep 28 23:38:32 2008
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sun, 28 Sep 2008 23:38:32 +0000 (UTC)
Subject: rpms/shorewall/EL-5 shorewall.spec,1.50,1.51 sources,1.38,1.39
Message-ID: <20080928233832.8A15F70118@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5308

Modified Files:
	shorewall.spec sources 
Log Message:
* Sun Sep 28 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.14-1
- Update to version 4.0.14



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/EL-5/shorewall.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- shorewall.spec	30 Jul 2008 00:11:05 -0000	1.50
+++ shorewall.spec	28 Sep 2008 23:38:02 -0000	1.51
@@ -10,7 +10,7 @@
 # patchlevel. However, these should not be used for distro packaging.
 
 Name:           shorewall
-Version:	4.0.13
+Version:	4.0.14
 Release:	1%{?dist}
 Summary:	An iptables front end for firewall configuration
 Group:		Applications/System
@@ -263,6 +263,9 @@
 %{_mandir}/man8/shorewall-lite.8.gz
 
 %changelog
+* Sun Sep 28 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.14-1
+- Update to version 4.0.14
+
 * Tue Jul 29 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.13-1
 - Update to version 4.0.13
 - Remove patch-perl-4.0.12.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/EL-5/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	30 Jul 2008 00:11:05 -0000	1.38
+++ sources	28 Sep 2008 23:38:02 -0000	1.39
@@ -1,4 +1,4 @@
-b14dcfcfd9fab234f401e32ecdb2b368  shorewall-common-4.0.13.tar.bz2
-938f12b6f9345bd1ff820185548a86c3  shorewall-shell-4.0.13.tar.bz2
-bc07ecbf2b4b37d4f6b831058e8085df  shorewall-perl-4.0.13.tar.bz2
-83797718ddcb14e7171a4a9a05a5477c  shorewall-lite-4.0.13.tar.bz2
+f8d545a52da01b340405f39464d4d64a  shorewall-common-4.0.14.tar.bz2
+878b016480b967fd861722ffa27a18ee  shorewall-shell-4.0.14.tar.bz2
+42baaf5bbcdf073a0e030e3c541c4e67  shorewall-perl-4.0.14.tar.bz2
+6c6aa18831ffc8f0e87f2ce8fac2d1d0  shorewall-lite-4.0.14.tar.bz2



From whot at fedoraproject.org  Sun Sep 28 23:49:53 2008
From: whot at fedoraproject.org (Peter Hutterer)
Date: Sun, 28 Sep 2008 23:49:53 +0000 (UTC)
Subject: rpms/xkeyboard-config/F-9
	xkeyboard-config-1.2-AC11-mapping-is.patch, 
	NONE, 1.1 xkeyboard-config.spec, 1.18, 1.19
Message-ID: <20080928234953.8B06870118@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xkeyboard-config/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6281

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-1.2-AC11-mapping-is.patch 
Log Message:
* Mon Sep 29 2008 Peter Hutterer  <peter.hutterer at redhat.com> - 1.2-4
- xkeyboard-config-1.2-AC11-mapping-is.patch: fix AC11 mapping for icelandic
  keyboard layout (#241564)



xkeyboard-config-1.2-AC11-mapping-is.patch:

--- NEW FILE xkeyboard-config-1.2-AC11-mapping-is.patch ---
diff --git a/symbols/is b/symbols/is
index ce03b3b..d68ae95 100644
--- a/symbols/is
+++ b/symbols/is
@@ -22,7 +22,7 @@ xkb_symbols "basic" {
     key <AD12>	{ [apostrophe,   question,   asciitilde,  dead_macron ]	};
 
     key <AC10>	{ [        ae,         AE,  asciicircum, dead_doubleacute ] };
-    key <AC11>	{ [dead_acute, Adiaeresis, dead_circumflex, dead_caron]	};
+    key <AC11>	{ [dead_acute, dead_circumflex, dead_circumflex ] };
     key <TLDE>	{ [    degree,  diaeresis,      notsign,      notsign ]	};
 
     key <BKSL>	{ [      plus,   asterisk,        grave,   dead_breve ]	};


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/F-9/xkeyboard-config.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xkeyboard-config.spec	15 Apr 2008 02:50:37 -0000	1.18
+++ xkeyboard-config.spec	28 Sep 2008 23:49:23 -0000	1.19
@@ -4,7 +4,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -13,6 +13,8 @@
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
 Patch1: olpc-xkeyboard-config-kz-group.patch
 Patch2: usinet.patch
+# Bug 241564, FDO bug 17786 (resolved, fixed)
+Patch3: xkeyboard-config-1.2-AC11-mapping-is.patch
 
 BuildArch: noarch
 
@@ -43,6 +45,7 @@
 %setup -q
 %patch1 -p1 -b .kzgroup
 %patch2 -p1 -b .usinet
+%patch3 -p1 -b .AC11-mapping-is
 
 %build
 %configure \
@@ -82,6 +85,10 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Mon Sep 29 2008 Peter Hutterer  <peter.hutterer at redhat.com> - 1.2-4
+- xkeyboard-config-1.2-AC11-mapping-is.patch: fix AC11 mapping for icelandic
+  keyboard layout (#241564)
+
 * Mon Apr 14 2008 Matthias Clasen  <mclasen at redhat.com> - 1.2-3
 - Also add back and forward keys to pc105 (#441398)
 



From whot at fedoraproject.org  Mon Sep 29 00:11:10 2008
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon, 29 Sep 2008 00:11:10 +0000 (UTC)
Subject: rpms/xkeyboard-config/devel
	xkeyboard-config-1.3-AC11-mapping-is.patch, NONE,
	1.1 xkeyboard-config.spec, 1.19, 1.20
Message-ID: <20080929001110.DEFC57013E@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xkeyboard-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8179

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-1.3-AC11-mapping-is.patch 
Log Message:
* Mon Sep 29 2008 Peter Hutterer  <peter.hutterer at redhat.com> - 1.3-2
- xkeyboard-config-1.3-AC11-mapping-is.patch: fix AC11 mapping for icelandic
  keyboard layout (#241564)



xkeyboard-config-1.3-AC11-mapping-is.patch:

--- NEW FILE xkeyboard-config-1.3-AC11-mapping-is.patch ---
diff --git a/symbols/is b/symbols/is
index ce03b3b..d68ae95 100644
--- a/symbols/is
+++ b/symbols/is
@@ -22,7 +22,7 @@ xkb_symbols "basic" {
     key <AD12>	{ [apostrophe,   question,   asciitilde,  dead_macron ]	};
 
     key <AC10>	{ [        ae,         AE,  asciicircum, dead_doubleacute ] };
-    key <AC11>	{ [dead_acute, Adiaeresis, dead_circumflex, dead_caron]	};
+    key <AC11>	{ [dead_acute, dead_circumflex, dead_circumflex ] };
     key <TLDE>	{ [    degree,  diaeresis,      notsign,      notsign ]	};
 
     key <BKSL>	{ [      plus,   asterisk,        grave,   dead_breve ]	};


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xkeyboard-config.spec	28 May 2008 17:25:53 -0000	1.19
+++ xkeyboard-config.spec	29 Sep 2008 00:10:40 -0000	1.20
@@ -4,7 +4,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -13,6 +13,8 @@
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
 Patch1: olpc-xkeyboard-config-kz-group.patch
 Patch2: usinet.patch
+# Bug 241564, FDO bug 17786 (resolved, fixed)
+Patch3: xkeyboard-config-1.3-AC11-mapping-is.patch
 
 BuildArch: noarch
 
@@ -43,6 +45,7 @@
 %setup -q
 %patch1 -p1 -b .kzgroup
 %patch2 -p1 -b .usinet
+%patch3 -p1 -b .AC11-mapping-is
 
 %build
 %configure \
@@ -82,6 +85,10 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Mon Sep 29 2008 Peter Hutterer  <peter.hutterer at redhat.com> - 1.3-2
+- xkeyboard-config-1.3-AC11-mapping-is.patch: fix AC11 mapping for icelandic
+  keyboard layout (#241564)
+
 * Wed May 28 2008 Matthias Clasen  <mclasen at redhat.com> - 1.3-1
 - Update to 1.3
 



From mjakubicek at fedoraproject.org  Mon Sep 29 00:11:44 2008
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 29 Sep 2008 00:11:44 +0000 (UTC)
Subject: rpms/ext3grep/devel .cvsignore, 1.4, 1.5 ext3grep.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20080929001144.CA6B97013E@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/ext3grep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8391

Modified Files:
	.cvsignore ext3grep.spec sources 
Log Message:
- Upstream 0.9.0




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ext3grep/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Aug 2008 22:11:33 -0000	1.4
+++ .cvsignore	29 Sep 2008 00:11:14 -0000	1.5
@@ -1 +1 @@
-ext3grep-0.8.0.tar.gz
+ext3grep-0.9.0.tar.gz


Index: ext3grep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ext3grep/devel/ext3grep.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ext3grep.spec	4 Aug 2008 22:08:14 -0000	1.3
+++ ext3grep.spec	29 Sep 2008 00:11:14 -0000	1.4
@@ -1,5 +1,5 @@
 Name:			ext3grep
-Version:		0.8.0
+Version:		0.9.0
 Release:		1%{?dist}
 Summary:		Recovery tool for ext3 filesystems
 
@@ -36,6 +36,9 @@
 
 %changelog
 
+* Mon Sep 29 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 0.9.0-1
+- Upstream version 0.9.0
+
 * Tue Aug 05 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 0.8.0-1
 - Upstream version 0.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ext3grep/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Aug 2008 22:11:33 -0000	1.4
+++ sources	29 Sep 2008 00:11:14 -0000	1.5
@@ -1 +1 @@
-d2f875ca8b44efb5642d18bcabaa0952  ext3grep-0.8.0.tar.gz
+41beef42e76a53f4706c33787932358f  ext3grep-0.9.0.tar.gz



From rdieter at fedoraproject.org  Mon Sep 29 00:35:08 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 00:35:08 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-9 .cvsignore, 1.25,
	1.26 kdeaccessibility.spec, 1.52, 1.53 sources, 1.27, 1.28
Message-ID: <20080929003508.B02117013D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeaccessibility/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10724

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-9/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	25 Jul 2008 16:50:59 -0000	1.25
+++ .cvsignore	29 Sep 2008 00:34:37 -0000	1.26
@@ -1,2 +1 @@
-kdeaccessibility-4.0.99.tar.bz2
-kdeaccessibility-4.1.0.tar.bz2
+kdeaccessibility-4.1.2.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-9/kdeaccessibility.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kdeaccessibility.spec	29 Aug 2008 18:35:31 -0000	1.52
+++ kdeaccessibility.spec	29 Sep 2008 00:34:37 -0000	1.53
@@ -1,7 +1,7 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.1.1
+Version:        4.1.2
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-9/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	29 Aug 2008 18:35:31 -0000	1.27
+++ sources	29 Sep 2008 00:34:37 -0000	1.28
@@ -1 +1 @@
-2e81aad070229a802630721cc6a4c44a  kdeaccessibility-4.1.1.tar.bz2
+41eee5a40d87c4b0917d28956a19f48a  kdeaccessibility-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Mon Sep 29 00:35:54 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 00:35:54 +0000 (UTC)
Subject: rpms/kdeadmin/F-9 .cvsignore, 1.46, 1.47 kdeadmin.spec, 1.95,
	1.96 sources, 1.49, 1.50
Message-ID: <20080929003554.C83A27013D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10902

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-9/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	25 Jul 2008 16:52:30 -0000	1.46
+++ .cvsignore	29 Sep 2008 00:35:24 -0000	1.47
@@ -1,2 +1 @@
-kdeadmin-4.0.99.tar.bz2
-kdeadmin-4.1.0.tar.bz2
+kdeadmin-4.1.2.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-9/kdeadmin.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- kdeadmin.spec	29 Aug 2008 18:38:00 -0000	1.95
+++ kdeadmin.spec	29 Sep 2008 00:35:24 -0000	1.96
@@ -1,6 +1,6 @@
 Name:           kdeadmin
 Epoch:          7
-Version:        4.1.1
+Version:        4.1.2
 Release:        1%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
@@ -67,6 +67,8 @@
 
 # remove broken .pc file which has no business to be in a non-devel pkg anyway
 rm -rf %{buildroot}%{_libdir}/pkgconfig
+# wtf? -- Rex
+rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kcontrol
 
 
 %clean
@@ -101,7 +103,7 @@
 %{_kde4_datadir}/config.kcfg/kuser.kcfg
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_docdir}/HTML/en/kcron/
-%{_kde4_docdir}/HTML/en/knetworkconf/
+#{_kde4_docdir}/HTML/en/knetworkconf/
 %{_kde4_docdir}/HTML/en/ksystemlog/
 %{_kde4_docdir}/HTML/en/kuser/
 %{_kde4_iconsdir}/hicolor/*/*/*
@@ -120,6 +122,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-9/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	29 Aug 2008 18:38:00 -0000	1.49
+++ sources	29 Sep 2008 00:35:24 -0000	1.50
@@ -1 +1 @@
-e6693bcbe96bb9453e79bd3201d8f757  kdeadmin-4.1.1.tar.bz2
+97a94526af42072da9e6aa959ca09afb  kdeadmin-4.1.2.tar.bz2



From mjakubicek at fedoraproject.org  Mon Sep 29 00:36:42 2008
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 29 Sep 2008 00:36:42 +0000 (UTC)
Subject: rpms/ext3grep/devel ext3grep.spec,1.4,1.5
Message-ID: <20080929003642.555C67013D@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/ext3grep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10997

Modified Files:
	ext3grep.spec 
Log Message:
- ExcludeArch: ppc ppc64, see BZ#464436 




Index: ext3grep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ext3grep/devel/ext3grep.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ext3grep.spec	29 Sep 2008 00:11:14 -0000	1.4
+++ ext3grep.spec	29 Sep 2008 00:36:12 -0000	1.5
@@ -8,6 +8,8 @@
 URL:			http://code.google.com/p/ext3grep/
 Source0:		http://ext3grep.googlecode.com/files/%{name}-%{version}.tar.gz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:	ppc ppc64 
+#see BZ#464436
 
 BuildRequires:	e2fsprogs-devel
 
@@ -38,6 +40,7 @@
 
 * Mon Sep 29 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 0.9.0-1
 - Upstream version 0.9.0
+- Marked as ExcludeArch: ppc ppc64, see BZ#464436
 
 * Tue Aug 05 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 0.8.0-1
 - Upstream version 0.8.0



From rdieter at fedoraproject.org  Mon Sep 29 00:38:45 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 00:38:45 +0000 (UTC)
Subject: rpms/kdebase/F-9 .cvsignore, 1.71, 1.72 kdebase.spec, 1.332,
	1.333 sources, 1.96, 1.97
Message-ID: <20080929003845.6E7F07013D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11336

Modified Files:
	.cvsignore kdebase.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-9/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- .cvsignore	25 Jul 2008 16:20:11 -0000	1.71
+++ .cvsignore	29 Sep 2008 00:38:14 -0000	1.72
@@ -1,2 +1 @@
-kdebase-4.0.99.tar.bz2
-kdebase-4.1.0.tar.bz2
+kdebase-4.1.2.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-9/kdebase.spec,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -r1.332 -r1.333
--- kdebase.spec	22 Sep 2008 08:20:11 -0000	1.332
+++ kdebase.spec	29 Sep 2008 00:38:15 -0000	1.333
@@ -1,6 +1,7 @@
+
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.1.1
-Release: 2%{?dist}
+Version: 4.1.2
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -28,7 +29,6 @@
 Patch1:   kdebase-nsplugins-paths.patch
 
 ## upstream patches
-Patch100: kdebase-4.1.1-kde#863180-fileassoc.patch
 
 BuildRequires: kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -124,8 +124,8 @@
 
 %prep
 %setup -q -n kdebase-%{version}
-%patch1   -p0 -b .nsplugins-paths
-%patch100 -p0 -b .kde#863180-fileassoc
+%patch1 -p0 -b .nsplugins-paths
+
 # 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
 
@@ -305,9 +305,11 @@
 
 
 %changelog
-* Mon Sep 22 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.1-2
-- Fix crash if you delete all file associations and then add a new one
-  (kdebug:171395)
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
+* Thu Sep 18 2008 Than Ngo <than at redhat.com> 4.1.1-2
+- make bookmark silent
 
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-9/sources,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- sources	29 Aug 2008 18:42:09 -0000	1.96
+++ sources	29 Sep 2008 00:38:15 -0000	1.97
@@ -1 +1 @@
-33ab20f61aa33ed473fec710ad250ac7  kdebase-4.1.1.tar.bz2
+705dc8a416cf472d04b9dc39d44652c6  kdebase-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Mon Sep 29 00:39:06 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 00:39:06 +0000 (UTC)
Subject: rpms/kdebindings/F-9 .cvsignore, 1.42, 1.43 kdebindings.spec, 1.106,
	1.107 sources, 1.49, 1.50
Message-ID: <20080929003906.41CE87013D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11390

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-9/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	25 Jul 2008 18:39:47 -0000	1.42
+++ .cvsignore	29 Sep 2008 00:38:36 -0000	1.43
@@ -1,2 +1 @@
-kdebindings-4.0.99.tar.bz2
-kdebindings-4.1.0.tar.bz2
+kdebindings-4.1.2.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-9/kdebindings.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- kdebindings.spec	29 Aug 2008 18:54:43 -0000	1.106
+++ kdebindings.spec	29 Sep 2008 00:38:36 -0000	1.107
@@ -21,7 +21,7 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.1.1
+Version: 4.1.2
 Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
@@ -128,6 +128,10 @@
 %{_kde4_libdir}/kde4/krosspython.so
 %if 0%{?ruby}
 %{_kde4_bindir}/*
+%{_kde4_appsdir}/plasma_ruby_web_applet/
+%{_kde4_appsdir}/plasma_scriptengine_ruby/
+%{_kde4_datadir}/kde4/services/plasma-ruby-applet-web.desktop
+%{_kde4_datadir}/kde4/services/plasma-scriptengine-ruby-*.desktop
 %{_kde4_libdir}/libqtruby4shared.so
 %{_kde4_libdir}/kde4/krossruby.so
 %{_kde4_libdir}/kde4/krubypluginfactory.so
@@ -164,6 +168,12 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
+* Thu Sep 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-2
+- respin (for qscintilla)
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-9/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	29 Aug 2008 18:54:43 -0000	1.49
+++ sources	29 Sep 2008 00:38:36 -0000	1.50
@@ -1 +1 @@
-4b9d6b9b3980327ccef34a44180824df  kdebindings-4.1.1.tar.bz2
+f99b1fe747d6b4b9f444c1ca2f853172  kdebindings-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Mon Sep 29 00:39:50 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 00:39:50 +0000 (UTC)
Subject: rpms/kdeedu/F-9 .cvsignore, 1.46, 1.47 kdeedu.spec, 1.107,
	1.108 sources, 1.51, 1.52
Message-ID: <20080929003950.0B3FA7013D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11618

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-9/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	25 Jul 2008 17:04:16 -0000	1.46
+++ .cvsignore	29 Sep 2008 00:39:19 -0000	1.47
@@ -1,2 +1 @@
-kdeedu-4.0.99.tar.bz2
-kdeedu-4.1.0.tar.bz2
+kdeedu-4.1.2.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-9/kdeedu.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- kdeedu.spec	29 Aug 2008 18:57:57 -0000	1.107
+++ kdeedu.spec	29 Sep 2008 00:39:19 -0000	1.108
@@ -13,7 +13,7 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications 
-Version: 4.1.1
+Version: 4.1.2
 Release: 1%{?dist}
 
 License: GPLv2
@@ -393,6 +393,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-9/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	29 Aug 2008 18:57:57 -0000	1.51
+++ sources	29 Sep 2008 00:39:19 -0000	1.52
@@ -1 +1 @@
-f819cf9ae9c887f5787b5546de186604  kdeedu-4.1.1.tar.bz2
+7319ea65180451d1ecfed158714a4fd3  kdeedu-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Mon Sep 29 00:40:34 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 00:40:34 +0000 (UTC)
Subject: rpms/kdegames/F-9 .cvsignore, 1.51, 1.52 kdegames.spec, 1.93,
	1.94 sources, 1.55, 1.56 kdegames-3.97.0-parallel_devel.patch,
	1.1, NONE
Message-ID: <20080929004034.BEE347013D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11845

Modified Files:
	.cvsignore kdegames.spec sources 
Removed Files:
	kdegames-3.97.0-parallel_devel.patch 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-9/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	25 Jul 2008 17:04:41 -0000	1.51
+++ .cvsignore	29 Sep 2008 00:40:04 -0000	1.52
@@ -1,2 +1 @@
-kdegames-4.0.99.tar.bz2
-kdegames-4.1.0.tar.bz2
+kdegames-4.1.2.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-9/kdegames.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- kdegames.spec	3 Sep 2008 09:50:16 -0000	1.93
+++ kdegames.spec	29 Sep 2008 00:40:04 -0000	1.94
@@ -4,7 +4,7 @@
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games 
 Epoch:   6
-Version: 4.1.1
+Version: 4.1.2
 Release: 1%{?dist}
 
 License: GPLv2
@@ -13,9 +13,6 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegames-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Invert the search order for libkdegames to make sure the KDE 4 version is always found first
-Patch0:  kdegames-3.97.0-parallel_devel.patch
-
 Obsoletes: kdegames4 < %{version}-%{release}
 Provides:  kdegames4 = %{version}-%{release}
 
@@ -91,7 +88,6 @@
 
 %prep
 %setup -q -n kdegames-%{version}
-%patch0 -p1 -b .parallel_devel
 
 
 %build
@@ -109,14 +105,6 @@
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-# move conflicting devel symlink
-mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
-pushd %{buildroot}%{_kde4_libdir}
-linktarget=`readlink "libkdegames.so"`
-rm -f "libkdegames.so"
-ln -sf "../../$linktarget" "kde4/devel/libkdegames.so"
-popd
-
 # HACK, FIXME
 install -m644 -p -D ./kbattleship/src/module.dsc %{buildroot}%{_ggz_datadir}/kbattleship.dsc
 install -m644 -p -D ./kreversi/module.dsc %{buildroot}%{_ggz_datadir}/kreversi.dsc
@@ -184,10 +172,15 @@
 %{_kde4_appsdir}/cmake/modules/*
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
-%{_kde4_libdir}/kde4/devel/libkdegames.so
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
+* Thu Sep 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
+- drop no longer needed devel symlink hacks
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-9/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	29 Aug 2008 19:00:38 -0000	1.55
+++ sources	29 Sep 2008 00:40:04 -0000	1.56
@@ -1 +1 @@
-2d32f53d36016107cbeae01ee5e103c5  kdegames-4.1.1.tar.bz2
+acb20df949ae44a55b72870a5640a629  kdegames-4.1.2.tar.bz2


--- kdegames-3.97.0-parallel_devel.patch DELETED ---



From rdieter at fedoraproject.org  Mon Sep 29 00:41:10 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 00:41:10 +0000 (UTC)
Subject: rpms/kdegraphics/F-9 .cvsignore, 1.44, 1.45 kdegraphics.spec, 1.153,
	1.154 sources, 1.49, 1.50
Message-ID: <20080929004110.4DAAC7013D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11967

Modified Files:
	.cvsignore kdegraphics.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-9/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	25 Jul 2008 16:51:50 -0000	1.44
+++ .cvsignore	29 Sep 2008 00:40:39 -0000	1.45
@@ -1,2 +1 @@
-kdegraphics-4.0.99.tar.bz2
-kdegraphics-4.1.0.tar.bz2
+kdegraphics-4.1.2.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-9/kdegraphics.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- kdegraphics.spec	29 Aug 2008 19:07:16 -0000	1.153
+++ kdegraphics.spec	29 Sep 2008 00:40:39 -0000	1.154
@@ -1,10 +1,11 @@
+
 %if 0%{?fedora} < 10
 %define omit_kde3_conflicts 1
 %endif
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.1.1
+Version:        4.1.2
 Release:        1%{?dist}
 
 Name:           kdegraphics
@@ -81,10 +82,6 @@
 Requires: kdelibs4-devel
 Requires: pkgconfig
 %if ! 0%{?omit_kde3_conflicts}
-## FIXME: handle upgrade path for F-10 -- Rex 
-# remaining apps depending on these: kipi-plugins (me), kphotoalbum (me), 
-# showimg (mailed)
-#Conflicts: libkdcraw-devel < 0.2.0, libkexiv2-devel < 0.2.0, libkipi-devel < 0.2.0 
 Obsoletes: libkdcraw-devel < 0.2.0, libkexiv2-devel < 0.2.0, libkipi-devel < 0.2.0 
 Provides:  libkdcraw-devel = 0.2.0, libkexiv2-devel = 0.2.0, libkipi-devel = 0.2.0
 %endif
@@ -167,7 +164,7 @@
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/kipi/
 %{_kde4_appsdir}/libkdcraw/
-%{_kde4_libdir}/libkdcraw5/
+%{_kde4_libdir}/libkdcraw6/
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/kde4/*
 %{_kde4_libdir}/strigi/*
@@ -188,6 +185,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-9/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	29 Aug 2008 19:07:16 -0000	1.49
+++ sources	29 Sep 2008 00:40:39 -0000	1.50
@@ -1 +1 @@
-e5475d37dc0a12b6ce7e6dbebceb9340  kdegraphics-4.1.1.tar.bz2
+210e3a98485c2da91aaab69b9047837b  kdegraphics-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Mon Sep 29 00:42:40 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 00:42:40 +0000 (UTC)
Subject: rpms/kdemultimedia/F-9 .cvsignore, 1.48, 1.49 kdemultimedia.spec,
	1.114, 1.115 sources, 1.51,
	1.52 kdemultimedia-4.1.1-kde#170941-dragon.patch, 1.1, NONE
Message-ID: <20080929004240.007127013D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12216

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Removed Files:
	kdemultimedia-4.1.1-kde#170941-dragon.patch 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-9/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	25 Jul 2008 17:05:20 -0000	1.48
+++ .cvsignore	29 Sep 2008 00:42:09 -0000	1.49
@@ -1,2 +1 @@
-kdemultimedia-4.0.99.tar.bz2
-kdemultimedia-4.1.0.tar.bz2
+kdemultimedia-4.1.2.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-9/kdemultimedia.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- kdemultimedia.spec	18 Sep 2008 09:28:20 -0000	1.114
+++ kdemultimedia.spec	29 Sep 2008 00:42:09 -0000	1.115
@@ -1,7 +1,8 @@
+
 Name: kdemultimedia
 Epoch: 6
-Version: 4.1.1
-Release: 2%{?dist}
+Version: 4.1.2
+Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:     Applications/Multimedia
@@ -9,8 +10,6 @@
 License:   GPLv2+
 URL:       http://www.kde.org/
 Source0:   ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}.tar.bz2
-# upstream patches
-Patch100:  kdemultimedia-4.1.1-kde#170941-dragon.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # This one is normal, FLAC_OGG_LIBRARY is not actually used anyway:
@@ -77,8 +76,6 @@
 %prep
 %setup -q -n kdemultimedia-%{version}
 
-# upstream patches
-%patch100 -p1 -b .kde#170941-dragon
 
 %build
 
@@ -152,6 +149,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Wed Sep 17 2008 Than Ngo <than at redhat.com> 4.1.1-2
 - backport from trunk to fix dragon kpart crash in the embedding application 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-9/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	29 Aug 2008 19:20:33 -0000	1.51
+++ sources	29 Sep 2008 00:42:09 -0000	1.52
@@ -1 +1 @@
-efbf12cf33aafb13848fda258d001322  kdemultimedia-4.1.1.tar.bz2
+232001bb20ad40d039c99a86360705db  kdemultimedia-4.1.2.tar.bz2


--- kdemultimedia-4.1.1-kde#170941-dragon.patch DELETED ---



From rdieter at fedoraproject.org  Mon Sep 29 00:43:00 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 00:43:00 +0000 (UTC)
Subject: rpms/kdenetwork/F-9 .cvsignore, 1.51, 1.52 kdenetwork.spec, 1.152, 
	1.153 sources, 1.58, 1.59
Message-ID: <20080929004300.47A1A7013D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12260

Modified Files:
	.cvsignore kdenetwork.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-9/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	25 Jul 2008 17:05:36 -0000	1.51
+++ .cvsignore	29 Sep 2008 00:42:30 -0000	1.52
@@ -1,2 +1 @@
-kdenetwork-4.0.99.tar.bz2
-kdenetwork-4.1.0.tar.bz2
+kdenetwork-4.1.2.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-9/kdenetwork.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- kdenetwork.spec	29 Aug 2008 19:22:22 -0000	1.152
+++ kdenetwork.spec	29 Sep 2008 00:42:30 -0000	1.153
@@ -4,7 +4,7 @@
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.1.1
+Version: 4.1.2
 Release: 1%{?dist}
 
 License: GPLv2
@@ -164,6 +164,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-9/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	29 Aug 2008 19:22:22 -0000	1.58
+++ sources	29 Sep 2008 00:42:30 -0000	1.59
@@ -1 +1 @@
-e90ef5d3feccb4a2aade798ded81af28  kdenetwork-4.1.1.tar.bz2
+f1ba745dd89447904d5c1d567937627f  kdenetwork-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Mon Sep 29 00:43:52 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 00:43:52 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-9 .cvsignore, 1.3, 1.4 kdeplasma-addons.spec,
	1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20080929004352.1E3757013D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12480

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Jul 2008 17:06:26 -0000	1.3
+++ .cvsignore	29 Sep 2008 00:43:21 -0000	1.4
@@ -1,2 +1 @@
-kdeplasma-addons-4.0.99.tar.bz2
-kdeplasma-addons-4.1.0.tar.bz2
+kdeplasma-addons-4.1.2.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-9/kdeplasma-addons.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdeplasma-addons.spec	29 Aug 2008 19:27:10 -0000	1.3
+++ kdeplasma-addons.spec	29 Sep 2008 00:43:21 -0000	1.4
@@ -1,5 +1,6 @@
+
 Name:           kdeplasma-addons
-Version:        4.1.1
+Version:        4.1.2
 Release:        1%{?dist}
 Summary:        Additional plasmoids for KDE
 
@@ -89,6 +90,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Aug 2008 19:27:10 -0000	1.4
+++ sources	29 Sep 2008 00:43:21 -0000	1.5
@@ -1 +1 @@
-c36f023c799175927b260c78b9150810  kdeplasma-addons-4.1.1.tar.bz2
+84dc8f919d0a1e9bb1e1e2e499d80156  kdeplasma-addons-4.1.2.tar.bz2



From mjakubicek at fedoraproject.org  Mon Sep 29 00:44:17 2008
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 29 Sep 2008 00:44:17 +0000 (UTC)
Subject: rpms/ext3grep/F-9 .cvsignore, 1.4, 1.5 ext3grep.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20080929004417.974437013D@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/ext3grep/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12537

Modified Files:
	.cvsignore ext3grep.spec sources 
Log Message:
- Upstream 0.9.0
- ExcludeArch: ppc ppc64



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ext3grep/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Aug 2008 22:11:33 -0000	1.4
+++ .cvsignore	29 Sep 2008 00:43:47 -0000	1.5
@@ -1 +1 @@
-ext3grep-0.8.0.tar.gz
+ext3grep-0.9.0.tar.gz


Index: ext3grep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ext3grep/F-9/ext3grep.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ext3grep.spec	4 Aug 2008 22:08:14 -0000	1.3
+++ ext3grep.spec	29 Sep 2008 00:43:47 -0000	1.4
@@ -1,5 +1,5 @@
 Name:			ext3grep
-Version:		0.8.0
+Version:		0.9.0
 Release:		1%{?dist}
 Summary:		Recovery tool for ext3 filesystems
 
@@ -8,6 +8,8 @@
 URL:			http://code.google.com/p/ext3grep/
 Source0:		http://ext3grep.googlecode.com/files/%{name}-%{version}.tar.gz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:	ppc ppc64 
+#see BZ#464436
 
 BuildRequires:	e2fsprogs-devel
 
@@ -36,6 +38,10 @@
 
 %changelog
 
+* Mon Sep 29 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 0.9.0-1
+- Upstream version 0.9.0
+- Marked as ExcludeArch: ppc ppc64, see BZ#464436
+
 * Tue Aug 05 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 0.8.0-1
 - Upstream version 0.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ext3grep/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Aug 2008 22:11:33 -0000	1.4
+++ sources	29 Sep 2008 00:43:47 -0000	1.5
@@ -1 +1 @@
-d2f875ca8b44efb5642d18bcabaa0952  ext3grep-0.8.0.tar.gz
+41beef42e76a53f4706c33787932358f  ext3grep-0.9.0.tar.gz



From rdieter at fedoraproject.org  Mon Sep 29 00:44:43 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 00:44:43 +0000 (UTC)
Subject: rpms/kdeartwork/F-9 .cvsignore, 1.43, 1.44 kdeartwork.spec, 1.82,
	1.83 sources, 1.46, 1.47
Message-ID: <20080929004443.AE5B97013D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12717

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-9/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	25 Jul 2008 16:54:35 -0000	1.43
+++ .cvsignore	29 Sep 2008 00:44:13 -0000	1.44
@@ -1,2 +1,4 @@
 kdeartwork-4.0.99.tar.bz2
 kdeartwork-4.1.0.tar.bz2
+kdeartwork-4.1.1.tar.bz2
+kdeartwork-4.1.2.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-9/kdeartwork.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- kdeartwork.spec	29 Aug 2008 18:40:30 -0000	1.82
+++ kdeartwork.spec	29 Sep 2008 00:44:13 -0000	1.83
@@ -1,5 +1,6 @@
+
 Name:           kdeartwork
-Version:        4.1.1
+Version:        4.1.2
 Release:        1%{?dist}
 Summary:        Additional artwork (themes, sound themes, ...) for KDE
 
@@ -196,6 +197,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-9/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	29 Aug 2008 18:40:30 -0000	1.46
+++ sources	29 Sep 2008 00:44:13 -0000	1.47
@@ -1 +1,2 @@
 6e5ed770d7203f0c789512317d743e95  kdeartwork-4.1.1.tar.bz2
+43d2e6caa8796f70ecc49fe449a1f0aa  kdeartwork-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Mon Sep 29 00:45:12 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 00:45:12 +0000 (UTC)
Subject: rpms/kdesdk/F-9 .cvsignore, 1.43, 1.44 kdesdk.spec, 1.104,
	1.105 sources, 1.46, 1.47
Message-ID: <20080929004512.1BF777013D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12849

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-9/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	25 Jul 2008 17:06:51 -0000	1.43
+++ .cvsignore	29 Sep 2008 00:44:41 -0000	1.44
@@ -1,2 +1 @@
-kdesdk-4.0.99.tar.bz2
-kdesdk-4.1.0.tar.bz2
+kdesdk-4.1.2.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-9/kdesdk.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- kdesdk.spec	24 Sep 2008 12:19:05 -0000	1.104
+++ kdesdk.spec	29 Sep 2008 00:44:41 -0000	1.105
@@ -1,7 +1,7 @@
 
 Name:           kdesdk
-Version:        4.1.1
-Release:        2%{?dist}
+Version:        4.1.2
+Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -220,6 +220,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Wed Sep 24 2008 Than Ngo <than at redhat.com> 4.1.1-2
 - show quit in the menu
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-9/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	29 Aug 2008 19:32:29 -0000	1.46
+++ sources	29 Sep 2008 00:44:41 -0000	1.47
@@ -1 +1 @@
-268ea539de7cd5b07dc24d24f593dde1  kdesdk-4.1.1.tar.bz2
+29b29ed131db84a9abb2b4bf4d81c56e  kdesdk-4.1.2.tar.bz2



From mjakubicek at fedoraproject.org  Mon Sep 29 00:47:16 2008
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 29 Sep 2008 00:47:16 +0000 (UTC)
Subject: rpms/ext3grep/F-8 .cvsignore, 1.4, 1.5 ext3grep.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20080929004716.60BE57013D@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/ext3grep/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13269

Modified Files:
	.cvsignore ext3grep.spec sources 
Log Message:
- Upstream 0.9.0
- ExcludeArch: ppc ppc64



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ext3grep/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Aug 2008 22:11:32 -0000	1.4
+++ .cvsignore	29 Sep 2008 00:46:45 -0000	1.5
@@ -1 +1 @@
-ext3grep-0.8.0.tar.gz
+ext3grep-0.9.0.tar.gz


Index: ext3grep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ext3grep/F-8/ext3grep.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ext3grep.spec	4 Aug 2008 22:08:13 -0000	1.3
+++ ext3grep.spec	29 Sep 2008 00:46:46 -0000	1.4
@@ -1,5 +1,5 @@
 Name:			ext3grep
-Version:		0.8.0
+Version:		0.9.0
 Release:		1%{?dist}
 Summary:		Recovery tool for ext3 filesystems
 
@@ -8,6 +8,8 @@
 URL:			http://code.google.com/p/ext3grep/
 Source0:		http://ext3grep.googlecode.com/files/%{name}-%{version}.tar.gz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:	ppc ppc64 
+#see BZ#464436
 
 BuildRequires:	e2fsprogs-devel
 
@@ -36,6 +38,10 @@
 
 %changelog
 
+* Mon Sep 29 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 0.9.0-1
+- Upstream version 0.9.0
+- Marked as ExcludeArch: ppc ppc64, see BZ#464436
+
 * Tue Aug 05 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 0.8.0-1
 - Upstream version 0.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ext3grep/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Aug 2008 22:11:32 -0000	1.4
+++ sources	29 Sep 2008 00:46:46 -0000	1.5
@@ -1 +1 @@
-d2f875ca8b44efb5642d18bcabaa0952  ext3grep-0.8.0.tar.gz
+41beef42e76a53f4706c33787932358f  ext3grep-0.9.0.tar.gz



From rdieter at fedoraproject.org  Mon Sep 29 00:48:07 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 00:48:07 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.142,1.143
Message-ID: <20080929004807.164AD7013D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13482

Modified Files:
	kdeutils.spec 
Log Message:
fix Source URLs



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- kdeutils.spec	27 Sep 2008 05:49:32 -0000	1.142
+++ kdeutils.spec	29 Sep 2008 00:47:36 -0000	1.143
@@ -19,9 +19,9 @@
 # FIXME/TODO: Check license
 License:        GPLv2
 URL:            http://www.kde.org
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+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/unstable/%{version}/src/kdepim-%{version}.tar.bz2
+Source1:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
 Patch0:         kdeutils-4.0.99-kjots-without-kdepim.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From rdieter at fedoraproject.org  Mon Sep 29 00:48:35 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 00:48:35 +0000 (UTC)
Subject: rpms/kdeutils/F-9 .cvsignore, 1.49, 1.50 kdeutils.spec, 1.129,
	1.130 sources, 1.55, 1.56
Message-ID: <20080929004835.D2CD67013D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13558

Modified Files:
	.cvsignore kdeutils.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	30 Aug 2008 00:11:28 -0000	1.49
+++ .cvsignore	29 Sep 2008 00:48:05 -0000	1.50
@@ -1,2 +1,2 @@
-kdeutils-4.1.1.tar.bz2
-kdepim-4.1.1.tar.bz2
+kdeutils-4.1.2.tar.bz2
+kdepim-4.1.2.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/kdeutils.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- kdeutils.spec	4 Sep 2008 22:30:59 -0000	1.129
+++ kdeutils.spec	29 Sep 2008 00:48:05 -0000	1.130
@@ -11,7 +11,7 @@
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.1.1
+Version:        4.1.2
 Release:        1%{?dist}
 Summary:        K Desktop Environment - Utilities
 
@@ -131,6 +131,8 @@
 rm -f %{buildroot}%{_kde4_libdir}/libkerfuffle.so
 rm -f %{buildroot}%{_kde4_libdir}/libkmilo.so
 rm -f %{buildroot}%{_kde4_libdir}/libsuperkaramba.so
+# wtf? -- Rex
+rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kcontrol/
 
 
 %clean
@@ -210,6 +212,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	4 Sep 2008 22:38:19 -0000	1.55
+++ sources	29 Sep 2008 00:48:05 -0000	1.56
@@ -1,2 +1,2 @@
-ba8d72606f71afcb649d2b9871815359  kdeutils-4.1.1.tar.bz2
-fdb80cc1bfa78047d2793e1d6c3fde41  kdepim-4.1.1.tar.bz2
+cab195ea3a60d136706d00d66b504aa8  kdeutils-4.1.2.tar.bz2
+484b3b9685ecd258d0c562c5b0fce297  kdepim-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Mon Sep 29 00:49:37 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 00:49:37 +0000 (UTC)
Subject: rpms/kdetoys/F-9 .cvsignore, 1.20, 1.21 kdetoys.spec, 1.25,
	1.26 sources, 1.19, 1.20
Message-ID: <20080929004937.1AC477013D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdetoys/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13767

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-9/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	25 Jul 2008 17:07:28 -0000	1.20
+++ .cvsignore	29 Sep 2008 00:49:06 -0000	1.21
@@ -1,2 +1 @@
-kdetoys-4.0.99.tar.bz2
-kdetoys-4.1.0.tar.bz2
+kdetoys-4.1.2.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-9/kdetoys.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- kdetoys.spec	29 Aug 2008 19:36:05 -0000	1.25
+++ kdetoys.spec	29 Sep 2008 00:49:06 -0000	1.26
@@ -1,7 +1,8 @@
+
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.1.1
+Version:        4.1.2
 Release:        1%{?dist}
 
 License:        GPLv2
@@ -95,6 +96,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-9/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	29 Aug 2008 19:36:05 -0000	1.19
+++ sources	29 Sep 2008 00:49:06 -0000	1.20
@@ -1 +1 @@
-6150f3daa22bce44f777579f2c13038b  kdetoys-4.1.1.tar.bz2
+370d9469e3c6b087a7b7520f106c3d02  kdetoys-4.1.2.tar.bz2



From rdieter at fedoraproject.org  Mon Sep 29 00:50:39 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 00:50:39 +0000 (UTC)
Subject: rpms/kde-l10n/F-9 .cvsignore, 1.11, 1.12 kde-l10n.spec, 1.36,
	1.37 sources, 1.13, 1.14 subdirs-kde-l10n, 1.7, 1.8
Message-ID: <20080929005039.2A5277013D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-l10n/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13972

Modified Files:
	.cvsignore kde-l10n.spec sources subdirs-kde-l10n 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
- 4.1.2
- reenable Kurdish, Lithuanian, Malayalam 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Sep 2008 19:52:50 -0000	1.11
+++ .cvsignore	29 Sep 2008 00:50:08 -0000	1.12
@@ -1,44 +1,47 @@
-kde-l10n-bg-4.1.1.tar.bz2
-kde-l10n-ca-4.1.1.tar.bz2
-kde-l10n-cs-4.1.1.tar.bz2
-kde-l10n-csb-4.1.1.tar.bz2
-kde-l10n-da-4.1.1.tar.bz2
-kde-l10n-de-4.1.1.tar.bz2
-kde-l10n-el-4.1.1.tar.bz2
-kde-l10n-en_GB-4.1.1.tar.bz2
-kde-l10n-eo-4.1.1.tar.bz2
-kde-l10n-es-4.1.1.tar.bz2
-kde-l10n-et-4.1.1.tar.bz2
-kde-l10n-fi-4.1.1.tar.bz2
-kde-l10n-fr-4.1.1.tar.bz2
-kde-l10n-ga-4.1.1.tar.bz2
-kde-l10n-gl-4.1.1.tar.bz2
-kde-l10n-hi-4.1.1.tar.bz2
-kde-l10n-hu-4.1.1.tar.bz2
-kde-l10n-it-4.1.1.tar.bz2
-kde-l10n-ja-4.1.1.tar.bz2
-kde-l10n-km-4.1.1.tar.bz2
-kde-l10n-ko-4.1.1.tar.bz2
-kde-l10n-mk-4.1.1.tar.bz2
-kde-l10n-lv-4.1.1.tar.bz2
-kde-l10n-nb-4.1.1.tar.bz2
-kde-l10n-nds-4.1.1.tar.bz2
-kde-l10n-nl-4.1.1.tar.bz2
-kde-l10n-nn-4.1.1.tar.bz2
-kde-l10n-pa-4.1.1.tar.bz2
-kde-l10n-pl-4.1.1.tar.bz2
-kde-l10n-pt-4.1.1.tar.bz2
-kde-l10n-pt_BR-4.1.1.tar.bz2
-kde-l10n-ru-4.1.1.tar.bz2
-kde-l10n-sl-4.1.1.tar.bz2
-kde-l10n-sr-4.1.1.tar.bz2
-kde-l10n-sv-4.1.1.tar.bz2
-kde-l10n-ta-4.1.1.tar.bz2
-kde-l10n-th-4.1.1.tar.bz2
-kde-l10n-tr-4.1.1.tar.bz2
-kde-l10n-uk-4.1.1.tar.bz2
-kde-l10n-wa-4.1.1.tar.bz2
-kde-l10n-zh_CN-4.1.1.tar.bz2
-kde-l10n-zh_TW-4.1.1.tar.bz2
-kde-l10n-fy-4.1.1.tar.bz2
-kde-l10n-kk-4.1.1.tar.bz2
+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


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/kde-l10n.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- kde-l10n.spec	12 Sep 2008 19:52:50 -0000	1.36
+++ kde-l10n.spec	29 Sep 2008 00:50:08 -0000	1.37
@@ -1,8 +1,8 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.1.1
-Release: 2%{dist}
+Version: 4.1.2
+Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -33,38 +33,41 @@
 Source21: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ja-%{version}.tar.bz2
 Source22: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-km-%{version}.tar.bz2
 Source23: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ko-%{version}.tar.bz2
-Source24: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lv-%{version}.tar.bz2
-Source25: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-mk-%{version}.tar.bz2
-Source26: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nb-%{version}.tar.bz2
-Source27: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nds-%{version}.tar.bz2
-#Source28: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ne-%{version}.tar.bz2
-Source29: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nl-%{version}.tar.bz2
-Source30: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nn-%{version}.tar.bz2
-Source31: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pa-%{version}.tar.bz2
-Source32: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pl-%{version}.tar.bz2
-Source33: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt-%{version}.tar.bz2
-Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt_BR-%{version}.tar.bz2
-Source35: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ru-%{version}.tar.bz2
-#Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-se-%{version}.tar.bz2
-#Source37: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sk-%{version}.tar.bz2
-Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sl-%{version}.tar.bz2
-Source39: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sv-%{version}.tar.bz2
-Source40: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ta-%{version}.tar.bz2
-Source41: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-th-%{version}.tar.bz2
-Source42: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-tr-%{version}.tar.bz2
-Source43: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-uk-%{version}.tar.bz2
-Source44: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-wa-%{version}.tar.bz2
-Source45: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2
-Source46: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2
-Source47: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sr-%{version}.tar.bz2
-Source48: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2
-Source49: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kk-%{version}.tar.bz2
+Source24: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ku-%{version}.tar.bz2
+Source25: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lv-%{version}.tar.bz2
+Source26: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lt-%{version}.tar.bz2
+Source27: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-mk-%{version}.tar.bz2
+Source28: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ml-%{version}.tar.bz2
+Source29: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nb-%{version}.tar.bz2
+Source30: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nds-%{version}.tar.bz2
+#Source31: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ne-%{version}.tar.bz2
+Source32: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nl-%{version}.tar.bz2
+Source33: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nn-%{version}.tar.bz2
+Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pa-%{version}.tar.bz2
+Source35: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pl-%{version}.tar.bz2
+Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt-%{version}.tar.bz2
+Source37: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt_BR-%{version}.tar.bz2
+Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ru-%{version}.tar.bz2
+#Source39: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-se-%{version}.tar.bz2
+#Source40: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sk-%{version}.tar.bz2
+Source41: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sl-%{version}.tar.bz2
+Source42: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sv-%{version}.tar.bz2
+Source43: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ta-%{version}.tar.bz2
+Source44: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-th-%{version}.tar.bz2
+Source45: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-tr-%{version}.tar.bz2
+Source46: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-uk-%{version}.tar.bz2
+Source47: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-wa-%{version}.tar.bz2
+Source48: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2
+Source49: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2
+Source50: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sr-%{version}.tar.bz2
+Source51: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2
+Source52: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kk-%{version}.tar.bz2
 
 Source1000: subdirs-kde-l10n
 
 Requires: kde-filesystem
 
-BuildRequires: kdelibs4-devel
+BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: findutils
 BuildRequires: gettext
 BuildRequires: kde-filesystem >= 4
@@ -490,6 +493,15 @@
 %description Macedonian
 Macedonian language support for KDE
 
+%package Malayalam
+Summary: Malayalam language support for KDE
+Group: User Interface/Desktops
+Requires: kde-filesystem
+Provides: %{name}-ml = %{version}-%{release}
+
+%description Malayalam
+Malayalam language support for KDE
+
 %package Maltese
 Summary: Maltese language support for KDE
 Group: User Interface/Desktops
@@ -1056,13 +1068,11 @@
 %files Korean
 %defattr(-,root,root)
 %lang(ko) %{_datadir}/locale/ko/*
-%lang(ko) %{_kde4_docdir}/HTML/ko
+%lang(ko) %{_kde4_docdir}/HTML/ko/
 
-%if %{buildall}
 %files Kurdish
 %defattr(-,root,root)
 %lang(ku) %{_datadir}/locale/ku/*
-%endif
 
 %if %{buildall}
 %files Lao
@@ -1070,11 +1080,10 @@
 %lang(lo) %{_datadir}/locale/lo/*
 %endif
 
-%if %{buildall}
 %files Lithuanian
 %defattr(-,root,root)
 %lang(lt) %{_datadir}/locale/lt/*
-%endif
+%lang(lt) %{_kde4_docdir}/HTML/lt/
 
 %files LowSaxon
 %defattr(-,root,root)
@@ -1101,6 +1110,10 @@
 %defattr(-,root,root)
 %lang(mk) %{_datadir}/locale/mk/*
 
+%files Malayalam
+%defattr(-,root,root)
+%lang(ml) %{_datadir}/locale/ml/*
+
 %if %{buildall}
 %files Maltese
 %defattr(-,root,root)
@@ -1293,6 +1306,10 @@
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
+- 4.1.2
+- reenable Kurdish, Lithuanian, Malayalam 
+
 * Wed Sep 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
 - reenable Frisian and Kazakh
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	12 Sep 2008 19:52:50 -0000	1.13
+++ sources	29 Sep 2008 00:50:08 -0000	1.14
@@ -1,44 +1,47 @@
-2ab87283b4d19d2757aa94d399e5ed41  kde-l10n-bg-4.1.1.tar.bz2
-770f1affd26538fa8ab656a977c63ae2  kde-l10n-ca-4.1.1.tar.bz2
-1cc38671b47519b688cb340b73a07327  kde-l10n-cs-4.1.1.tar.bz2
-8bf5955d5973b125c9beecc95278e2f8  kde-l10n-csb-4.1.1.tar.bz2
-98e31b3e3210efbf6452f2f6e211ca91  kde-l10n-da-4.1.1.tar.bz2
-0591df80e995c0327cd2ae001bb0fad1  kde-l10n-de-4.1.1.tar.bz2
-c234b1c16dbc33bda93eb1dae1c10a0d  kde-l10n-el-4.1.1.tar.bz2
-ce7736b393ada3ea11eea1570a9803d9  kde-l10n-en_GB-4.1.1.tar.bz2
-4d5da5133143848f822b5e1dc7cf734b  kde-l10n-eo-4.1.1.tar.bz2
-396e19841b971cf2d43ba9a5f737c1c2  kde-l10n-es-4.1.1.tar.bz2
-ccd584c03059ccc664f0fd1fcab07d09  kde-l10n-et-4.1.1.tar.bz2
-9e28e836e308d998b934308cc62b9db0  kde-l10n-fi-4.1.1.tar.bz2
-44cc1732acba917244843edf248e8de9  kde-l10n-fr-4.1.1.tar.bz2
-c0e69ba86aae673ad7a8da80702778df  kde-l10n-ga-4.1.1.tar.bz2
-bce5d61e617001b52166c9f0ae232586  kde-l10n-gl-4.1.1.tar.bz2
-812c9ddb40c25bd486380bdf6e2b0fea  kde-l10n-hi-4.1.1.tar.bz2
-b47eade7252e65962e5986da9abbab67  kde-l10n-hu-4.1.1.tar.bz2
-75268d5cf444706066197f64c6ce0f86  kde-l10n-it-4.1.1.tar.bz2
-cd9a6b97968f6bea740394206913e794  kde-l10n-ja-4.1.1.tar.bz2
-1cb3ae6d2df2b98750f8ac374173de71  kde-l10n-km-4.1.1.tar.bz2
-c6d5f55794a7b8ae6b29f38a3be17b58  kde-l10n-ko-4.1.1.tar.bz2
-87d8544833a668bdd63d2ebc93790d2a  kde-l10n-mk-4.1.1.tar.bz2
-a5cd5d5f88daa3c35a5caeda5e7398c4  kde-l10n-lv-4.1.1.tar.bz2
-a174238791d14c5c22b33f8bb58ecbd3  kde-l10n-nb-4.1.1.tar.bz2
-10d3f8f6fa61d949e127b97b129a3e56  kde-l10n-nds-4.1.1.tar.bz2
-0afcbddef0516e99fa7dc8037e736864  kde-l10n-nl-4.1.1.tar.bz2
-692223cbf474759d84ff0956b922d7c8  kde-l10n-nn-4.1.1.tar.bz2
-4367dd18f84a0265e87c78f4a0adcaba  kde-l10n-pa-4.1.1.tar.bz2
-7ddf979828a386f02383e672aea1ee65  kde-l10n-pl-4.1.1.tar.bz2
-423b863663061cc05260bd6136c839f6  kde-l10n-pt-4.1.1.tar.bz2
-034491ae5db90a0861a76b704d32fe1c  kde-l10n-pt_BR-4.1.1.tar.bz2
-d5e265a13c772e93b31a6d7c147ccfe9  kde-l10n-ru-4.1.1.tar.bz2
-a37237cea98b434d1f5ac01259b0453f  kde-l10n-sl-4.1.1.tar.bz2
-0aed3d7ef74f1a6bbf34425dbe229ae5  kde-l10n-sv-4.1.1.tar.bz2
-87bb1c1762964e01a60ef9347b5e0af3  kde-l10n-ta-4.1.1.tar.bz2
-bfe292d8623a25a02501ded7f032d5a7  kde-l10n-th-4.1.1.tar.bz2
-ea6e15c587e2f4d2533353815cd4ed8a  kde-l10n-tr-4.1.1.tar.bz2
-4faf1d7c7817697c3c76541706166078  kde-l10n-uk-4.1.1.tar.bz2
-6bee00ed5512c5c7123cd40e8bc27c9e  kde-l10n-wa-4.1.1.tar.bz2
-134cd3d65db7352e88f05df547af04db  kde-l10n-zh_CN-4.1.1.tar.bz2
-4ec74453141d23c503123e788a491c98  kde-l10n-zh_TW-4.1.1.tar.bz2
-b29bc82068ac7d3443fffe924356a7fd  kde-l10n-sr-4.1.1.tar.bz2
-d8482cd920425ca38174ee9dec21c606  kde-l10n-fy-4.1.1.tar.bz2
-a58a0bc175b711da8b36d57e17719f5c  kde-l10n-kk-4.1.1.tar.bz2
+fb20c0f72e96a9ee8a0518ef034aac2e  kde-l10n-bg-4.1.2.tar.bz2
+8813ec33ca3a37af68252acf0c6a4d4b  kde-l10n-ca-4.1.2.tar.bz2
+2d63225bbf4574e148693e97634b2c4e  kde-l10n-cs-4.1.2.tar.bz2
+d90fec294e551c989421d289cd6f450b  kde-l10n-csb-4.1.2.tar.bz2
+671917a9d301cb8e3ca420b8f4e71bb0  kde-l10n-da-4.1.2.tar.bz2
+df38290c533134a23c11034b4c4ee3dc  kde-l10n-de-4.1.2.tar.bz2
+51516ee60b9dfe630550a695c566cd06  kde-l10n-el-4.1.2.tar.bz2
+13b3519d2545d4e4c598956856a0e439  kde-l10n-en_GB-4.1.2.tar.bz2
+a397ef93af130380102e46e545338e6b  kde-l10n-eo-4.1.2.tar.bz2
+4121a524dc90bb59732918f677c9b4da  kde-l10n-es-4.1.2.tar.bz2
+e63beb0d0ff83000f1a7d843e3de4575  kde-l10n-et-4.1.2.tar.bz2
+c8023a2d0935c5c59f283dab7ae14b2f  kde-l10n-fi-4.1.2.tar.bz2
+8aaf7e16939f58e7ed580332b7527244  kde-l10n-fr-4.1.2.tar.bz2
+2578ef10c76b68616ae3ab820267d58e  kde-l10n-fy-4.1.2.tar.bz2
+6989457d6cdf8d30f95e2613ff59afb6  kde-l10n-ga-4.1.2.tar.bz2
+d710608870a93f4dd4a33132c885600a  kde-l10n-gl-4.1.2.tar.bz2
+7edd676ffa20bea726cbbe73edadb916  kde-l10n-hi-4.1.2.tar.bz2
+ebf79d8b6a5adda4f459f023e0be1b35  kde-l10n-hu-4.1.2.tar.bz2
+5c4f961e60e5ef14a2f4b2885113b1ab  kde-l10n-it-4.1.2.tar.bz2
+b79ec78ca7da15be8d0a7828d17295b4  kde-l10n-ja-4.1.2.tar.bz2
+9c96380025594a64f967a92ca2ee4d78  kde-l10n-kk-4.1.2.tar.bz2
+496b7ed959f6b66745102465b41ca7ed  kde-l10n-km-4.1.2.tar.bz2
+f2867745a599624c926fe0207dc3d014  kde-l10n-ko-4.1.2.tar.bz2
+1bc36ded91f347522458adea9f711722  kde-l10n-ku-4.1.2.tar.bz2
+99c4501906f5f684e33fcf091ee39136  kde-l10n-lt-4.1.2.tar.bz2
+78f6f316f23c8ceaec7fd37af243d954  kde-l10n-lv-4.1.2.tar.bz2
+e25560c1efa4adf16561c4dedca579b3  kde-l10n-mk-4.1.2.tar.bz2
+c706c0f68cddac130178469fe746ebfb  kde-l10n-ml-4.1.2.tar.bz2
+d6e8916732f0da5b135dcc0ff6dd465f  kde-l10n-nb-4.1.2.tar.bz2
+72d56df2e9d047648383ee041bafbf15  kde-l10n-nds-4.1.2.tar.bz2
+cf59f4fb0699c6ec1722a06efadffda7  kde-l10n-nl-4.1.2.tar.bz2
+e0f7088112c2097bfa902fa679599e0c  kde-l10n-nn-4.1.2.tar.bz2
+6d5323a863cab8a54511a9e19ef7f81a  kde-l10n-pa-4.1.2.tar.bz2
+c7455a4693c2344f80ba3434d916c946  kde-l10n-pl-4.1.2.tar.bz2
+448c772994a18a85b0b64ce76b536928  kde-l10n-pt-4.1.2.tar.bz2
+f1d7a3996e8ad7d50b0cab312f2d51b6  kde-l10n-pt_BR-4.1.2.tar.bz2
+6af70080c4b014327f35327a20166d7c  kde-l10n-ru-4.1.2.tar.bz2
+4cb55017d272a27e6f9a686cc8db8219  kde-l10n-sl-4.1.2.tar.bz2
+c2d94a42f0fbcad786949feebe5bda65  kde-l10n-sr-4.1.2.tar.bz2
+4ccfa63f4b09c1ddc94a062fe6cc0792  kde-l10n-sv-4.1.2.tar.bz2
+11a614853a358362600f790d69f59317  kde-l10n-ta-4.1.2.tar.bz2
+85949c0e5e240c4002fe38baa22e2cbc  kde-l10n-th-4.1.2.tar.bz2
+e77421da874e74c2d59ea72e8bf81f82  kde-l10n-tr-4.1.2.tar.bz2
+37afe81b119d9e43bb8a7758070988be  kde-l10n-uk-4.1.2.tar.bz2
+8e5da9214047a77f0272594c0939f470  kde-l10n-wa-4.1.2.tar.bz2
+4b04dc9d027017d75367a82d8434eba6  kde-l10n-zh_CN-4.1.2.tar.bz2
+8f41ed9dfe1f02a12b0a0e1106966817  kde-l10n-zh_TW-4.1.2.tar.bz2


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/subdirs-kde-l10n,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- subdirs-kde-l10n	12 Sep 2008 19:52:50 -0000	1.7
+++ subdirs-kde-l10n	29 Sep 2008 00:50:08 -0000	1.8
@@ -21,8 +21,11 @@
 kk
 km
 ko
-mk
+ku
+lt
 lv
+mk
+ml
 nb
 nds
 nl



From smilner at fedoraproject.org  Mon Sep 29 01:11:36 2008
From: smilner at fedoraproject.org (Steve Milner)
Date: Mon, 29 Sep 2008 01:11:36 +0000 (UTC)
Subject: rpms/python-virtualenv/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 
	1.2 python-virtualenv.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080929011136.8ABD070110@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-virtualenv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15975/devel

Modified Files:
	.cvsignore import.log python-virtualenv.spec sources 
Log Message:
New upstream release for virtualenv.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2008 21:21:41 -0000	1.2
+++ .cvsignore	29 Sep 2008 01:11:05 -0000	1.3
@@ -1 +1 @@
-virtualenv-1.2.tar.gz
+virtualenv-1.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2008 21:21:41 -0000	1.1
+++ import.log	29 Sep 2008 01:11:05 -0000	1.2
@@ -1 +1,2 @@
 python-virtualenv-1_2-1_fc9:HEAD:python-virtualenv-1.2-1.fc9.src.rpm:1220822452
+python-virtualenv-1_3-1_fc9:HEAD:python-virtualenv-1.3-1.fc9.src.rpm:1222650637


Index: python-virtualenv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/devel/python-virtualenv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-virtualenv.spec	7 Sep 2008 21:21:42 -0000	1.1
+++ python-virtualenv.spec	29 Sep 2008 01:11:05 -0000	1.2
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-virtualenv
-Version:        1.2
+Version:        1.3
 Release:        1%{?dist}
 Summary:        Tool to create isolated Python environments
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.3-1
+- Updated for upstream release
+
 * Sat Aug 30 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.2-1
 - Updated for upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2008 21:21:42 -0000	1.2
+++ sources	29 Sep 2008 01:11:05 -0000	1.3
@@ -1 +1 @@
-7ad454e52f025cad631d03331ade4aaf  virtualenv-1.2.tar.gz
+36b766604542f2c34d8dffdb21ba14a9  virtualenv-1.3.tar.gz



From smilner at fedoraproject.org  Mon Sep 29 01:16:50 2008
From: smilner at fedoraproject.org (Steve Milner)
Date: Mon, 29 Sep 2008 01:16:50 +0000 (UTC)
Subject: rpms/python-virtualenv/F-9 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-virtualenv.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080929011650.41B5D70110@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-virtualenv/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16509/F-9

Modified Files:
	.cvsignore import.log python-virtualenv.spec sources 
Log Message:
Update for upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Sep 2008 00:42:19 -0000	1.2
+++ .cvsignore	29 Sep 2008 01:16:19 -0000	1.3
@@ -1 +1 @@
-virtualenv-1.2.tar.gz
+virtualenv-1.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Sep 2008 00:42:19 -0000	1.1
+++ import.log	29 Sep 2008 01:16:19 -0000	1.2
@@ -1 +1,2 @@
 python-virtualenv-1_2-1_fc10:F-9:python-virtualenv-1.2-1.fc10.src.rpm:1221352884
+python-virtualenv-1_3-1_fc9:F-9:python-virtualenv-1.3-1.fc9.src.rpm:1222650954


Index: python-virtualenv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/F-9/python-virtualenv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-virtualenv.spec	14 Sep 2008 00:42:19 -0000	1.1
+++ python-virtualenv.spec	29 Sep 2008 01:16:19 -0000	1.2
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-virtualenv
-Version:        1.2
+Version:        1.3
 Release:        1%{?dist}
 Summary:        Tool to create isolated Python environments
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.3-1
+- Updated for upstream release
+
 * Sat Aug 30 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.2-1
 - Updated for upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2008 00:42:19 -0000	1.2
+++ sources	29 Sep 2008 01:16:19 -0000	1.3
@@ -1 +1 @@
-7ad454e52f025cad631d03331ade4aaf  virtualenv-1.2.tar.gz
+36b766604542f2c34d8dffdb21ba14a9  virtualenv-1.3.tar.gz



From smilner at fedoraproject.org  Mon Sep 29 01:21:21 2008
From: smilner at fedoraproject.org (Steve Milner)
Date: Mon, 29 Sep 2008 01:21:21 +0000 (UTC)
Subject: rpms/python-virtualenv/EL-5 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-virtualenv.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080929012121.0A32F70110@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-virtualenv/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16927/EL-5

Modified Files:
	.cvsignore import.log python-virtualenv.spec sources 
Log Message:
Update for upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Sep 2008 00:48:35 -0000	1.2
+++ .cvsignore	29 Sep 2008 01:20:50 -0000	1.3
@@ -1 +1 @@
-virtualenv-1.2.tar.gz
+virtualenv-1.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Sep 2008 00:48:35 -0000	1.1
+++ import.log	29 Sep 2008 01:20:50 -0000	1.2
@@ -1 +1,2 @@
 python-virtualenv-1_2-1_fc10:EL-5:python-virtualenv-1.2-1.fc10.src.rpm:1221353277
+python-virtualenv-1_3-1_fc9:EL-5:python-virtualenv-1.3-1.fc9.src.rpm:1222651238


Index: python-virtualenv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/EL-5/python-virtualenv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-virtualenv.spec	14 Sep 2008 00:48:35 -0000	1.1
+++ python-virtualenv.spec	29 Sep 2008 01:20:50 -0000	1.2
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-virtualenv
-Version:        1.2
+Version:        1.3
 Release:        1%{?dist}
 Summary:        Tool to create isolated Python environments
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.3-1
+- Updated for upstream release
+
 * Sat Aug 30 2008 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.2-1
 - Updated for upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2008 00:48:35 -0000	1.2
+++ sources	29 Sep 2008 01:20:50 -0000	1.3
@@ -1 +1 @@
-7ad454e52f025cad631d03331ade4aaf  virtualenv-1.2.tar.gz
+36b766604542f2c34d8dffdb21ba14a9  virtualenv-1.3.tar.gz



From deebs at fedoraproject.org  Mon Sep 29 01:26:43 2008
From: deebs at fedoraproject.org (Marc Bradshaw)
Date: Mon, 29 Sep 2008 01:26:43 +0000 (UTC)
Subject: rpms/moreutils/devel import.log,1.1,1.2
Message-ID: <20080929012643.442D370110@cvs1.fedora.phx.redhat.com>

Author: deebs

Update of /cvs/pkgs/rpms/moreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17295/devel

Modified Files:
	import.log 
Log Message:
new upstream version



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Aug 2008 04:21:30 -0000	1.1
+++ import.log	29 Sep 2008 01:26:12 -0000	1.2
@@ -1 +1,2 @@
 moreutils-0_31-1_fc9:HEAD:moreutils-0.31-1.fc9.src.rpm:1219810852
+moreutils-0_31-1_fc9:HEAD:moreutils-0.31-1.fc9.src.rpm:1222651523



From rdieter at fedoraproject.org  Mon Sep 29 01:30:46 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 01:30:46 +0000 (UTC)
Subject: rpms/kdeadmin/devel kdeadmin.spec,1.110,1.111
Message-ID: <20080929013046.822E270110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17744

Modified Files:
	kdeadmin.spec 
Log Message:
* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- (re)add unpackaged HTML/en/kcontrol/ files



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- kdeadmin.spec	27 Sep 2008 04:03:26 -0000	1.110
+++ kdeadmin.spec	29 Sep 2008 01:30:15 -0000	1.111
@@ -1,7 +1,7 @@
 Name:           kdeadmin
 Epoch:          7
 Version:        4.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
@@ -67,8 +67,6 @@
 
 # remove broken .pc file which has no business to be in a non-devel pkg anyway
 rm -rf %{buildroot}%{_libdir}/pkgconfig
-# wtf? -- Rex
-rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kcontrol
 
 
 %clean
@@ -102,6 +100,7 @@
 %{_kde4_datadir}/applications/kde4/ksystemlog.desktop
 %{_kde4_datadir}/config.kcfg/kuser.kcfg
 %{_kde4_datadir}/kde4/services/*
+%{_kde4_docdir}/HTML/en/kcontrol/
 %{_kde4_docdir}/HTML/en/kcron/
 #{_kde4_docdir}/HTML/en/knetworkconf/
 %{_kde4_docdir}/HTML/en/ksystemlog/
@@ -122,6 +121,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- (re)add unpackaged HTML/en/kcontrol/ files
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 01:34:44 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 01:34:44 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.143,1.144
Message-ID: <20080929013444.4504A70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18286

Modified Files:
	kdeutils.spec 
Log Message:
* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- (re)add unpackaged HTML/en/kcontrol/ files



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- kdeutils.spec	29 Sep 2008 00:47:36 -0000	1.143
+++ kdeutils.spec	29 Sep 2008 01:34:13 -0000	1.144
@@ -12,7 +12,7 @@
 Name:           kdeutils
 Epoch:          6
 Version:        4.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -131,8 +131,6 @@
 rm -f %{buildroot}%{_kde4_libdir}/libkerfuffle.so
 rm -f %{buildroot}%{_kde4_libdir}/libkmilo.so
 rm -f %{buildroot}%{_kde4_libdir}/libsuperkaramba.so
-# wtf? -- Rex
-rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kcontrol/
 
 
 %clean
@@ -176,6 +174,7 @@
 %{_kde4_docdir}/HTML/en/ark/
 %{_kde4_docdir}/HTML/en/kcalc/
 %{_kde4_docdir}/HTML/en/kcharselect/
+%{_kde4_docdir}/HEML/en/kcontrol/
 %{_kde4_docdir}/HTML/en/kdf/
 %{_kde4_docdir}/HTML/en/kfloppy/
 %{_kde4_docdir}/HTML/en/kgpg/
@@ -212,6 +211,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- (re)add unpackaged HTML/en/kcontrol/ files
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 01:43:53 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 01:43:53 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.144,1.145
Message-ID: <20080929014353.8F43B70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18791

Modified Files:
	kdeutils.spec 
Log Message:
typo



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- kdeutils.spec	29 Sep 2008 01:34:13 -0000	1.144
+++ kdeutils.spec	29 Sep 2008 01:43:23 -0000	1.145
@@ -174,7 +174,7 @@
 %{_kde4_docdir}/HTML/en/ark/
 %{_kde4_docdir}/HTML/en/kcalc/
 %{_kde4_docdir}/HTML/en/kcharselect/
-%{_kde4_docdir}/HEML/en/kcontrol/
+%{_kde4_docdir}/HTML/en/kcontrol/
 %{_kde4_docdir}/HTML/en/kdf/
 %{_kde4_docdir}/HTML/en/kfloppy/
 %{_kde4_docdir}/HTML/en/kgpg/



From rdieter at fedoraproject.org  Mon Sep 29 01:45:12 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 01:45:12 +0000 (UTC)
Subject: rpms/kdeutils/F-9 kdeutils.spec,1.130,1.131
Message-ID: <20080929014512.CE1CE70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19087

Modified Files:
	kdeutils.spec 
Log Message:
* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- (re)add unpackaged HTML/en/kcontrol/ files



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/kdeutils.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- kdeutils.spec	29 Sep 2008 00:48:05 -0000	1.130
+++ kdeutils.spec	29 Sep 2008 01:44:42 -0000	1.131
@@ -12,7 +12,7 @@
 Name:           kdeutils
 Epoch:          6
 Version:        4.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -131,8 +131,6 @@
 rm -f %{buildroot}%{_kde4_libdir}/libkerfuffle.so
 rm -f %{buildroot}%{_kde4_libdir}/libkmilo.so
 rm -f %{buildroot}%{_kde4_libdir}/libsuperkaramba.so
-# wtf? -- Rex
-rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kcontrol/
 
 
 %clean
@@ -176,6 +174,7 @@
 %{_kde4_docdir}/HTML/en/ark/
 %{_kde4_docdir}/HTML/en/kcalc/
 %{_kde4_docdir}/HTML/en/kcharselect/
+%{_kde4_docdir}/HTML/en/kcontrol/
 %{_kde4_docdir}/HTML/en/kdf/
 %{_kde4_docdir}/HTML/en/kfloppy/
 %{_kde4_docdir}/HTML/en/kgpg/
@@ -212,6 +211,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- (re)add unpackaged HTML/en/kcontrol/ files
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 01:45:32 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 01:45:32 +0000 (UTC)
Subject: rpms/kdeadmin/F-9 kdeadmin.spec,1.96,1.97
Message-ID: <20080929014532.943BA70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19156

Modified Files:
	kdeadmin.spec 
Log Message:
* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- (re)add unpackaged HTML/en/kcontrol/ files



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-9/kdeadmin.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- kdeadmin.spec	29 Sep 2008 00:35:24 -0000	1.96
+++ kdeadmin.spec	29 Sep 2008 01:45:02 -0000	1.97
@@ -1,7 +1,7 @@
 Name:           kdeadmin
 Epoch:          7
 Version:        4.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
@@ -67,8 +67,6 @@
 
 # remove broken .pc file which has no business to be in a non-devel pkg anyway
 rm -rf %{buildroot}%{_libdir}/pkgconfig
-# wtf? -- Rex
-rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kcontrol
 
 
 %clean
@@ -102,6 +100,7 @@
 %{_kde4_datadir}/applications/kde4/ksystemlog.desktop
 %{_kde4_datadir}/config.kcfg/kuser.kcfg
 %{_kde4_datadir}/kde4/services/*
+%{_kde4_docdir}/HTML/en/kcontrol/
 %{_kde4_docdir}/HTML/en/kcron/
 #{_kde4_docdir}/HTML/en/knetworkconf/
 %{_kde4_docdir}/HTML/en/ksystemlog/
@@ -122,6 +121,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- (re)add unpackaged HTML/en/kcontrol/ files
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From petersen at fedoraproject.org  Mon Sep 29 01:54:26 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 29 Sep 2008 01:54:26 +0000 (UTC)
Subject: rpms/gcin/devel gcin.spec,1.35,1.36 im-client.patch,1.11,1.12
Message-ID: <20080929015426.B18DA70110@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/gcin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20122

Modified Files:
	gcin.spec im-client.patch 
Log Message:
update im-client.patch to fix patch fuzz


Index: gcin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gcin.spec	27 Jun 2008 08:09:44 -0000	1.35
+++ gcin.spec	29 Sep 2008 01:53:56 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           gcin
 Version:        1.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -112,6 +112,9 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Mon Sep 29 2008 Jens Petersen <petersen at redhat.com> - 1.4.2-3
+- update im-client.patch to fix patch fuzz
+
 * Fri Jun 27 2008 Chung-Yen Chang <candyz0416 at gmail.com> - 1.4.2-2
 - update gcin.conf (change gcin to /usr/bin/gcin)
 - add imsettings to Requires

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/devel/im-client.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- im-client.patch	30 Jan 2008 14:42:23 -0000	1.11
+++ im-client.patch	29 Sep 2008 01:53:56 -0000	1.12
@@ -1,16 +1,45 @@
-diff -urN gcin-1.3.9.orig/Makefile gcin-1.3.9/Makefile
---- gcin-1.3.9.orig/Makefile	2008-01-27 15:30:17.000000000 +0800
-+++ gcin-1.3.9/Makefile	2008-01-30 22:34:11.000000000 +0800
-@@ -8,7 +8,7 @@
+diff -up gcin-1.4.2/gtk-im/Makefile.im-client gcin-1.4.2/gtk-im/Makefile
+--- gcin-1.4.2/gtk-im/Makefile.im-client	2007-03-01 12:04:07.000000000 +1000
++++ gcin-1.4.2/gtk-im/Makefile	2008-09-29 11:46:33.000000000 +1000
+@@ -24,8 +24,7 @@ endif
+ .c.E:
+ 	$(CC) -E $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.2
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 
+diff -up gcin-1.4.2/im-client/Makefile.im-client gcin-1.4.2/im-client/Makefile
+--- gcin-1.4.2/im-client/Makefile.im-client	2007-03-01 12:04:36.000000000 +1000
++++ gcin-1.4.2/im-client/Makefile	2008-09-29 11:46:33.000000000 +1000
+@@ -27,9 +27,9 @@ $(SOFILEVER):   $(OBJS)
+ LOCALLIB=/usr/local/$(LIB)
+ 
+ install:
+-	install -d $(gcinlibdir)
+-	install -m 755 $(SOFILEVER) $(gcinlibdir)
+-	cd $(gcinlibdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
++	install -d $(libdir)
++	install -m 755 $(SOFILEVER) $(libdir)
++	cd $(libdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
+ 	ln -sf $(SOFILEVER) $(SOFILE).1
+ 	install -d $(includedir)
+ 	install -m 444 gcin-im-client.h $(includedir)
+diff -up gcin-1.4.2/Makefile.im-client gcin-1.4.2/Makefile
+--- gcin-1.4.2/Makefile.im-client	2008-05-31 14:19:16.000000000 +1000
++++ gcin-1.4.2/Makefile	2008-09-29 11:46:33.000000000 +1000
+@@ -8,7 +8,7 @@ gcin_tsin_o = tsin.o tsin-util.o win0.o 
  gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
- gcin_gtab_o = gtab.o win-gtab.o gtab-util.o gtab-list.o
+ gcin_gtab_o = gtab.o win-gtab.o gtab-util.o gtab-list.o gtab-buf.o
  
 -GCIN_SO= gcin1.so gcin2.so
 +GCIN_SO= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o win-kbm.o t2s-lookup.o
  
  OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
       gcin-switch.o gcin-exec-script.o $(GCIN_SO) pho-play.o \
-@@ -18,7 +18,7 @@
+@@ -18,7 +18,7 @@ OBJS_TSLEARN=tslearn.o util.o gcin-conf.
               table-update.o locale.o gcin-settings.o gcin-common.o
  OBJS_JUYIN_LEARN=juyin-learn.o locale.o util.o pho-util.o pho-sym.o \
                   gcin-settings.o gcin-conf.o table-update.o pinyin.o
@@ -19,7 +48,7 @@
  OBJS_phod2a=phod2a.o pho-util.o gcin-conf.o pho-sym.o table-update.o pho-dbg.o locale.o \
               gcin-settings.o util.o
  OBJS_tsa2d32=tsa2d32.o gcin-send.o util.o pho-sym.o gcin-conf.o locale.o pho-lookup.o
-@@ -95,8 +95,7 @@
+@@ -95,8 +95,7 @@ endif
  	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
  
  gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
@@ -29,7 +58,7 @@
  	rm -f core.*
  	ln -sf $@ $@.test
  
-@@ -107,7 +106,6 @@
+@@ -107,7 +106,6 @@ juyin-learn:        $(OBJS_JUYIN_LEARN)
  	$(CC) -o $@ $(OBJS_JUYIN_LEARN) $(LDFLAGS)
  	rm -f core.*
  sim2trad:        $(OBJS_sim2trad)
@@ -37,7 +66,7 @@
  	$(CC) -o $@ $(OBJS_sim2trad) $(LDFLAGS)
  	rm -f core.*
  trad2sim:	sim2trad
-@@ -161,13 +159,13 @@
+@@ -161,13 +159,13 @@ gcin-message:	$(OBJS_gcin_message)
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
@@ -58,7 +87,7 @@
  
  ### making the following as .so actuall makes the RSS larger
  gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
-@@ -192,14 +190,11 @@
+@@ -192,14 +190,11 @@ $(im-srv):
  ibin:
  	install $(PROGS) $(bindir); \
  	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -73,7 +102,7 @@
  	install -d $(bindir)
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
-@@ -207,13 +202,9 @@
+@@ -207,13 +202,9 @@ install:
  	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im install; fi
  	if [ $(prefix) = /usr/local ]; then \
  	   install -m 644 gcin.png /usr/share/icons; \
@@ -87,7 +116,7 @@
  	   install -s $(PROGS) $(bindir); \
  	   rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
  	fi
-@@ -233,7 +224,7 @@
+@@ -233,7 +224,7 @@ clean:
  	$(MAKE) -C qt-im clean
  	$(MAKE) -C man clean
  	$(MAKE) -C menu clean
@@ -96,32 +125,3 @@
  	rm -f *.o *.E *.db *.pico *.so config.mak tags $(PROGS) $(PROGS_CV) \
  	$(DATA) .depend gcin.spec trad2sim gcin.spec.tmp gcin.log
  	find . '(' -name '.ted*' -o -name '*~' -o -name 'core.*' -o -name 'vgcore.*' ')' -exec rm {} \;
-diff -urN gcin-1.3.9.orig/gtk-im/Makefile gcin-1.3.9/gtk-im/Makefile
---- gcin-1.3.9.orig/gtk-im/Makefile	2007-03-01 10:04:07.000000000 +0800
-+++ gcin-1.3.9/gtk-im/Makefile	2008-01-30 22:33:56.000000000 +0800
-@@ -24,8 +24,7 @@
- .c.E:
- 	$(CC) -E $(CFLAGS) -o $@ $<
- 
--im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
--	export LD_RUN_PATH=$(gcinlibdir) ;\
-+im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.2
- 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
- 	rm -f core.*
- 
-diff -urN gcin-1.3.9.orig/im-client/Makefile gcin-1.3.9/im-client/Makefile
---- gcin-1.3.9.orig/im-client/Makefile	2007-03-01 10:04:36.000000000 +0800
-+++ gcin-1.3.9/im-client/Makefile	2008-01-30 22:33:56.000000000 +0800
-@@ -27,9 +27,9 @@
- LOCALLIB=/usr/local/$(LIB)
- 
- install:
--	install -d $(gcinlibdir)
--	install -m 755 $(SOFILEVER) $(gcinlibdir)
--	cd $(gcinlibdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
-+	install -d $(libdir)
-+	install -m 755 $(SOFILEVER) $(libdir)
-+	cd $(libdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
- 	ln -sf $(SOFILEVER) $(SOFILE).1
- 	install -d $(includedir)
- 	install -m 444 gcin-im-client.h $(includedir)



From ausil at fedoraproject.org  Mon Sep 29 02:04:37 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 29 Sep 2008 02:04:37 +0000 (UTC)
Subject: rpms/listen/F-9 listen.spec,1.34,1.35
Message-ID: <20080929020437.704DB70110@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/listen/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21236

Modified Files:
	listen.spec 
Log Message:
setup for sparc64



Index: listen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/listen/F-9/listen.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- listen.spec	19 Feb 2008 04:55:36 -0000	1.34
+++ listen.spec	29 Sep 2008 02:04:07 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL
@@ -61,7 +61,7 @@
 # the workaround requires this
 Requires: gecko-libs >= 1.9
 
-%ifarch x86_64 ia64 ppc64 s390x
+%ifarch x86_64 ia64 ppc64 s390x sparc64
 %define gre_conf_file gre64.conf
 %else
 %define gre_conf_file gre.conf
@@ -99,7 +99,7 @@
 %patch1 -p0
 %{__sed} -i 's at GRE_CONF_FILE@/etc/gre.d/%{gre_conf_file}@' src/widget/mozembed_wrap.py
 # correct path issue on x86_64 box
-%ifarch x86_64 ppc64
+%ifarch x86_64 ppc64 sparc64
 %{__sed} -i 's#/lib/#/lib64/#' Makefile
 %endif
 
@@ -156,6 +156,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Dennis Gilmore <dennis at ausil.us> - 0.5-19
+- setup for sparc64
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5-18
 - Autorebuild for GCC 4.3
 



From kkofler at fedoraproject.org  Mon Sep 29 02:06:09 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 29 Sep 2008 02:06:09 +0000 (UTC)
Subject: rpms/kdegames3/F-9 kdegames3.spec,1.7,1.8
Message-ID: <20080929020609.D809770110@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21459/F-9

Modified Files:
	kdegames3.spec 
Log Message:
Sync from devel:

* Wed Sep 17 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-2
- remove no longer used libkdegames development files

This has to go out together with the kdegames-4.1.2 update (unless we want to restore the devel symlink hacks there for F9).


Index: kdegames3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames3/F-9/kdegames3.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdegames3.spec	4 Sep 2008 08:58:21 -0000	1.7
+++ kdegames3.spec	29 Sep 2008 02:05:39 -0000	1.8
@@ -9,7 +9,7 @@
 Name:    kdegames3
 Summary: K Desktop Environment 3 - Games not ported to KDE 4
 Version: 3.5.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Amusements/Games
@@ -45,9 +45,7 @@
 Requires: kdelibs3-devel >= %{version}
 
 %description devel
-Development files for the KDE 3 gaming libraries.
-Install kdegames-devel if you wish to develop or compile games for the
-KDE 3 desktop.
+Development files for Atlantik, required to build the Atlantik Designer.
 
 %package libs
 Summary: %{name} runtime libraries
@@ -139,6 +137,9 @@
   esac
 done
 
+# remove libkdegames devel stuff, not used by anything and conflicts with KDE 4
+rm -rf %{buildroot}%{_includedir}/kde/k* %{buildroot}%{_libdir}/libkdegames.so
+
 
 %clean
 rm -rf %{buildroot}
@@ -183,12 +184,14 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc libkdegames/README libkdegames/TODO
 %{_includedir}/kde/*
 %{_libdir}/lib*.so
 
 
 %changelog
+* Wed Sep 17 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-2
+- remove no longer used libkdegames development files
+
 * Fri Aug 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-1
 - update to 3.5.10
 - update trademarks patch



From ausil at fedoraproject.org  Mon Sep 29 02:17:55 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 29 Sep 2008 02:17:55 +0000 (UTC)
Subject: rpms/listen/devel listen.spec,1.35,1.36
Message-ID: <20080929021755.94AE070110@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/listen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22423

Modified Files:
	listen.spec 
Log Message:
fix up for sparc64



Index: listen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/listen/devel/listen.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- listen.spec	7 Aug 2008 17:41:51 -0000	1.35
+++ listen.spec	29 Sep 2008 02:17:25 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -61,7 +61,7 @@
 # the workaround requires this
 Requires: gecko-libs >= 1.9
 
-%ifarch x86_64 ia64 ppc64 s390x
+%ifarch x86_64 ia64 ppc64 s390x sparc64
 %define gre_conf_file gre64.conf
 %else
 %define gre_conf_file gre.conf
@@ -99,7 +99,7 @@
 %patch1 -p0
 %{__sed} -i 's at GRE_CONF_FILE@/etc/gre.d/%{gre_conf_file}@' src/widget/mozembed_wrap.py
 # correct path issue on x86_64 box
-%ifarch x86_64 ppc64
+%ifarch x86_64 ppc64 sparc64
 %{__sed} -i 's#/lib/#/lib64/#' Makefile
 %endif
 
@@ -156,6 +156,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Dennis Gilmore <dennis at ausil.us> - 0.5-20
+- fix up for sparc64
+
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5-19
 - fix license tag
 



From mmcgrath at fedoraproject.org  Mon Sep 29 02:22:18 2008
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 29 Sep 2008 02:22:18 +0000 (UTC)
Subject: rpms/nagios/F-8 nagios.spec,1.39,1.40
Message-ID: <20080929022218.EB1807013E@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/nagios/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22892/F-8

Modified Files:
	nagios.spec 
Log Message:
release bump for Fedora and license fix


Index: nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/F-8/nagios.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- nagios.spec	19 Mar 2008 00:53:31 -0000	1.39
+++ nagios.spec	29 Sep 2008 02:21:48 -0000	1.40
@@ -1,12 +1,12 @@
 
 Name: nagios
 
-Version: 2.11
+Version: 2.12
 Release: 3%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
-License: GPLv2+
+License: GPLv2
 URL: http://www.nagios.org/
 Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
 Source1: nagios.logrotate
@@ -169,6 +169,16 @@
 %{_includedir}/%{name}
 
 %changelog
+* Sun Sep 28 2008 Mike McGrath <mmcgrath at redhat.com> 2.12-3
+- License fix for #452689
+
+* Sat Aug 23 2008 Mike McGrath <mmcgrath at redhat.com> 2.12-2
+- Release bump for buildsys test
+
+* Fri May 23 2008 Shawn Starr <shawn.starr at rogers.com> 2.12-1
+- Upstream released 2.12
+- Fixes CVE-2007-5803 XSS issues, Bugzilla #445512
+
 * Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.11-3
 - add Requires for versioned perl (libperl.so)
 - get rid of pointless file Requires



From mmcgrath at fedoraproject.org  Mon Sep 29 02:22:18 2008
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 29 Sep 2008 02:22:18 +0000 (UTC)
Subject: rpms/nagios/EL-5 nagios.spec,1.34,1.35
Message-ID: <20080929022218.BDC3E70110@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/nagios/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22892/EL-5

Modified Files:
	nagios.spec 
Log Message:
release bump for Fedora and license fix


Index: nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/EL-5/nagios.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- nagios.spec	24 Aug 2008 01:48:14 -0000	1.34
+++ nagios.spec	29 Sep 2008 02:21:48 -0000	1.35
@@ -2,11 +2,11 @@
 Name: nagios
 
 Version: 2.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
-License: GPLv2+
+License: GPLv2
 URL: http://www.nagios.org/
 Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
 Source1: nagios.logrotate
@@ -169,6 +169,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Sun Sep 28 2008 Mike McGrath <mmcgrath at redhat.com> 2.12-3
+- License fix for #452689
+
 * Sat Aug 23 2008 Mike McGrath <mmcgrath at redhat.com> 2.12-2
 - Release bump for buildsys test
 



From mmcgrath at fedoraproject.org  Mon Sep 29 02:22:19 2008
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 29 Sep 2008 02:22:19 +0000 (UTC)
Subject: rpms/nagios/F-9 nagios.spec,1.44,1.45
Message-ID: <20080929022219.250FF70110@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/nagios/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22892/F-9

Modified Files:
	nagios.spec 
Log Message:
release bump for Fedora and license fix


Index: nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/F-9/nagios.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- nagios.spec	18 Mar 2008 18:23:37 -0000	1.44
+++ nagios.spec	29 Sep 2008 02:21:48 -0000	1.45
@@ -1,12 +1,12 @@
 
 Name: nagios
 
-Version: 2.11
+Version: 2.12
 Release: 3%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
-License: GPLv2+
+License: GPLv2
 URL: http://www.nagios.org/
 Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
 Source1: nagios.logrotate
@@ -169,6 +169,16 @@
 %{_includedir}/%{name}
 
 %changelog
+* Sun Sep 28 2008 Mike McGrath <mmcgrath at redhat.com> 2.12-3
+- License fix for #452689
+
+* Sat Aug 23 2008 Mike McGrath <mmcgrath at redhat.com> 2.12-2
+- Release bump for buildsys test
+
+* Fri May 23 2008 Shawn Starr <shawn.starr at rogers.com> 2.12-1
+- Upstream released 2.12
+- Fixes CVE-2007-5803 XSS issues, Bugzilla #445512
+
 * Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.11-3
 - add Requires for versioned perl (libperl.so)
 - get rid of pointless file Requires



From mmcgrath at fedoraproject.org  Mon Sep 29 02:22:19 2008
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 29 Sep 2008 02:22:19 +0000 (UTC)
Subject: rpms/nagios/devel nagios.spec,1.58,1.59
Message-ID: <20080929022219.5A7B070110@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/nagios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22892/devel

Modified Files:
	nagios.spec 
Log Message:
release bump for Fedora and license fix


Index: nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- nagios.spec	23 Jul 2008 16:34:49 -0000	1.58
+++ nagios.spec	29 Sep 2008 02:21:49 -0000	1.59
@@ -1,11 +1,11 @@
 Name: nagios
 
 Version: 3.0.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
-License: GPLv2+
+License: GPLv2
 URL: http://www.nagios.org/
 Source0: http://downloads.sourceforge.net/nagios/%{name}-%{version}.tar.gz
 Source1: nagios.logrotate
@@ -202,6 +202,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Sun Sep 28 2008 Mike McGrath <mmcgrath at redhat.com> 3.0.3-9
+- License fix
+
 * Mon Jul 23 2008 Robert M. Albrecht <romal at gmx.de> 3.0.3-8
 - Matthew Jurgens provided a script and Readme for upgrading your config to Release 3
 



From rdieter at fedoraproject.org  Mon Sep 29 02:31:46 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 02:31:46 +0000 (UTC)
Subject: rpms/kde-filesystem/F-9 kde-filesystem.spec,1.29,1.30
Message-ID: <20080929023147.0AF6F70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-filesystem/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23925

Modified Files:
	kde-filesystem.spec 
Log Message:
* Sat Sep 13 2008 Than Ngo <than at redhat.com> 4-19
- it's not needed to bump _kde4_macros_api
- use macro



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/F-9/kde-filesystem.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kde-filesystem.spec	24 Jul 2008 19:51:53 -0000	1.29
+++ kde-filesystem.spec	29 Sep 2008 02:31:16 -0000	1.30
@@ -11,13 +11,13 @@
 %define _kde4_bindir %_kde4_prefix/bin
 %define _kde4_sbindir %_kde4_prefix/sbin
 %define _kde4_includedir %_kde4_prefix/include/kde4
-%define _kde4_buildtype FEDORA 
+%define _kde4_buildtype release
 %define _kde4_macros_api 2
 
 Summary: KDE filesystem layout
 Name: kde-filesystem
 Version: 4
-Release: 17%{?dist}
+Release: 19%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
@@ -126,8 +126,8 @@
 %%_kde4_bindir %%_kde4_prefix/bin
 %%_kde4_sbindir %%_kde4_prefix/sbin
 %%_kde4_includedir %%_kde4_prefix/include/kde4
-%%_kde4_buildtype FEDORA
-%%_kde4_macros_api 2
+%%_kde4_buildtype %_kde4_buildtype
+%%_kde4_macros_api %_kde4_macros_api
 EOF
 cat %{SOURCE2} >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4
 
@@ -179,6 +179,13 @@
 
 
 %changelog
+* Sat Sep 13 2008 Than Ngo <than at redhat.com> 4-19
+- it's not needed to bump _kde4_macros_api
+- use macro
+
+* Sat Sep 13 2008 Than Ngo <than at redhat.com> 4-18
+- remove redundant FEDORA, use CMAKE_BUILD_TYPE=release
+
 * Mon Jul 14 2008 Rex Dieter <rdieter at fedoraproject.org> 4-17
 - + %%_kde4_sharedir/kde4
 



From rdieter at fedoraproject.org  Mon Sep 29 02:39:10 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 02:39:10 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.381,1.382
Message-ID: <20080929023910.8D76570110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24819

Modified Files:
	kdelibs.spec 
Log Message:
* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -r1.381 -r1.382
--- kdelibs.spec	26 Sep 2008 19:39:02 -0000	1.381
+++ kdelibs.spec	29 Sep 2008 02:38:40 -0000	1.382
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -212,7 +212,7 @@
 popd
 
 %if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 %endif
 
 # build apidocs
@@ -363,6 +363,10 @@
 
 
 %changelog
+* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Thu Sep 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - kde-4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 02:40:43 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 02:40:43 +0000 (UTC)
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.50,1.51
Message-ID: <20080929024043.62A1370110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25084

Modified Files:
	kdepimlibs.spec 
Log Message:
* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kdepimlibs.spec	26 Sep 2008 19:39:33 -0000	1.50
+++ kdepimlibs.spec	29 Sep 2008 02:40:13 -0000	1.51
@@ -14,7 +14,7 @@
 Name: kdepimlibs
 
 Version: 4.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -86,7 +86,7 @@
 popd
 
 %if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 %endif
 
 # build apidocs
@@ -167,6 +167,10 @@
 
 
 %changelog
+* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 02:41:59 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 02:41:59 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.124,1.125
Message-ID: <20080929024159.D3A6B70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25308

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- kdebase-workspace.spec	26 Sep 2008 19:40:20 -0000	1.124
+++ kdebase-workspace.spec	29 Sep 2008 02:41:29 -0000	1.125
@@ -4,7 +4,7 @@
 Name: kdebase-workspace
 Version: 4.1.2
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -184,7 +184,7 @@
   -DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -309,6 +309,10 @@
 
 
 %changelog
+* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 03:29:39 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 03:29:39 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs.spec,1.357,1.358
Message-ID: <20080929032939.89C5370110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28826

Modified Files:
	kdelibs.spec 
Log Message:
* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- kdelibs.spec	28 Sep 2008 20:33:09 -0000	1.357
+++ kdelibs.spec	29 Sep 2008 03:29:08 -0000	1.358
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -212,7 +212,7 @@
 popd
 
 %if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 %endif
 
 # build apidocs
@@ -363,6 +363,10 @@
 
 
 %changelog
+* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Thu Sep 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - kde-4.1.2
 



From mmcgrath at fedoraproject.org  Mon Sep 29 03:42:47 2008
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 29 Sep 2008 03:42:47 +0000 (UTC)
Subject: rpms/nagios-plugins/devel nagios-plugins-1.4.13-linux_raid.patch,
	NONE, 1.1 .cvsignore, 1.11, 1.12 nagios-plugins.spec, 1.43,
	1.44 sources, 1.11, 1.12
Message-ID: <20080929034247.9567B70110@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/nagios-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30507

Modified Files:
	.cvsignore nagios-plugins.spec sources 
Added Files:
	nagios-plugins-1.4.13-linux_raid.patch 
Log Message:
numerous bug fixes and additional patch and upstream source

nagios-plugins-1.4.13-linux_raid.patch:

--- NEW FILE nagios-plugins-1.4.13-linux_raid.patch ---
--- contrib/check_linux_raid.pl.orig    2008-09-28 22:03:43.000000000 -0500
+++ contrib/check_linux_raid.pl 2008-09-28 22:03:54.000000000 -0500
@@ -23,7 +23,7 @@
 #        WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min

 use strict;
-use lib "/usr/local/nagios/libexec";
+use lib utils.pm
 use utils qw(%ERRORS);



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	10 Jul 2008 21:17:15 -0000	1.11
+++ .cvsignore	29 Sep 2008 03:42:16 -0000	1.12
@@ -1 +1 @@
-nagios-plugins-1.4.12.tar.gz
+nagios-plugins-1.4.13.tar.gz


Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/devel/nagios-plugins.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- nagios-plugins.spec	10 Jul 2008 21:17:15 -0000	1.43
+++ nagios-plugins.spec	29 Sep 2008 03:42:16 -0000	1.44
@@ -1,6 +1,6 @@
 Name: nagios-plugins
-Version: 1.4.12
-Release: 3%{?dist}
+Version: 1.4.13
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -11,6 +11,7 @@
 Patch0: nagios-plugins-1.4.3-subst.patch
 Patch1: nagios-plugins-1.4.3-ntpd.patch
 Patch2: nagios-plugins-check_log-path.patch
+Patch3: nagios-plugins-1.4.13-linux_raid.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -345,6 +346,7 @@
 Summary: Nagios plugins perl dep.
 Group: Applications/System
 Requires: nagios-plugins = %{version}-%{release}
+Provides: perl(Nagios::Plugins)
 
 %description perl
 Perl dep for nagios plugins.  This is *NOT* an actual plugin it simply provides
@@ -512,6 +514,7 @@
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1
+%patch3 -p0
 
 %build
 %configure \
@@ -522,7 +525,12 @@
 	PATH_TO_NTPQ=%{_sbindir}/ntpq \
 	PATH_TO_NTPDC=%{_sbindir}/ntpdc \
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
-	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
+	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo \
+	--with-ps-command="`which ps` -eo 's uid pid ppid vsz rss pcpu etime comm args'" \
+	--with-ps-format='%s %d %d %d %d %d %f %s %s %n' \
+	--with-ps-cols=10 \
+	--with-ps-varlist='procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos'
+
 make %{?_smp_mflags}
 cd plugins
 make check_ide_smart
@@ -799,6 +807,14 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Sun Sep 28 2008 Mike McGrath <mmcgrath at redhat.com> 1.4.13-1
+- Upstream released new version #464419
+- Added patch fix for check_linux_raid #253898
+- Upstream releases fix for #451015 - check_ntp_peers
+- Upstream released fix for #459309 - check_ntp
+- Added Provides Nagios::Plugins for #457404
+- Fixed configure line for #458985 check_procs
+
 * Tue Jul 10 2008 Robert M. Albrecht <romal at gmx.de> 1.4.12-3
 - Removed --with-extra-opts, does not build in Koji
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	10 Jul 2008 21:17:15 -0000	1.11
+++ sources	29 Sep 2008 03:42:16 -0000	1.12
@@ -1 +1 @@
-af68d00bbe2c39de02803d23e5eecca3  nagios-plugins-1.4.12.tar.gz
+be6cc7699fff3ee29d1fd4d562377386  nagios-plugins-1.4.13.tar.gz



From mmcgrath at fedoraproject.org  Mon Sep 29 03:45:37 2008
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 29 Sep 2008 03:45:37 +0000 (UTC)
Subject: rpms/nagios-plugins/devel nagios-plugins.spec,1.44,1.45
Message-ID: <20080929034537.2503170110@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/nagios-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31003

Modified Files:
	nagios-plugins.spec 
Log Message:
release bump


Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/devel/nagios-plugins.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- nagios-plugins.spec	29 Sep 2008 03:42:16 -0000	1.44
+++ nagios-plugins.spec	29 Sep 2008 03:45:06 -0000	1.45
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -807,7 +807,7 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
-* Sun Sep 28 2008 Mike McGrath <mmcgrath at redhat.com> 1.4.13-1
+* Sun Sep 28 2008 Mike McGrath <mmcgrath at redhat.com> 1.4.13-2
 - Upstream released new version #464419
 - Added patch fix for check_linux_raid #253898
 - Upstream releases fix for #451015 - check_ntp_peers



From mmcgrath at fedoraproject.org  Mon Sep 29 04:14:10 2008
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 29 Sep 2008 04:14:10 +0000 (UTC)
Subject: rpms/nagios-plugins/devel nagios-plugins-1.4.13-linux_raid.patch,
	1.1, 1.2
Message-ID: <20080929041410.5B7EE70110@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/nagios-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1780

Modified Files:
	nagios-plugins-1.4.13-linux_raid.patch 
Log Message:
updated patch

nagios-plugins-1.4.13-linux_raid.patch:

Index: nagios-plugins-1.4.13-linux_raid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/devel/nagios-plugins-1.4.13-linux_raid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nagios-plugins-1.4.13-linux_raid.patch	29 Sep 2008 03:42:16 -0000	1.1
+++ nagios-plugins-1.4.13-linux_raid.patch	29 Sep 2008 04:13:39 -0000	1.2
@@ -1,10 +1,11 @@
---- contrib/check_linux_raid.pl.orig    2008-09-28 22:03:43.000000000 -0500
-+++ contrib/check_linux_raid.pl 2008-09-28 22:03:54.000000000 -0500
+--- contrib/check_linux_raid.pl.orig	2008-09-28 23:11:13.000000000 -0500
++++ contrib/check_linux_raid.pl	2008-09-28 23:12:22.000000000 -0500
 @@ -23,7 +23,7 @@
- #        WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min
-
+ #	  WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min
+ 
  use strict;
 -use lib "/usr/local/nagios/libexec";
 +use lib utils.pm
  use utils qw(%ERRORS);
-
+ 
+ # die with an error if we're not on Linux



From mmcgrath at fedoraproject.org  Mon Sep 29 04:18:13 2008
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 29 Sep 2008 04:18:13 +0000 (UTC)
Subject: rpms/nagios-plugins/devel nagios-plugins.spec,1.45,1.46
Message-ID: <20080929041813.4338F70110@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/nagios-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2193

Modified Files:
	nagios-plugins.spec 
Log Message:
release bump for new patch


Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/devel/nagios-plugins.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- nagios-plugins.spec	29 Sep 2008 03:45:06 -0000	1.45
+++ nagios-plugins.spec	29 Sep 2008 04:17:42 -0000	1.46
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -807,7 +807,7 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
-* Sun Sep 28 2008 Mike McGrath <mmcgrath at redhat.com> 1.4.13-2
+* Sun Sep 28 2008 Mike McGrath <mmcgrath at redhat.com> 1.4.13-3
 - Upstream released new version #464419
 - Added patch fix for check_linux_raid #253898
 - Upstream releases fix for #451015 - check_ntp_peers



From mmcgrath at fedoraproject.org  Mon Sep 29 04:19:40 2008
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 29 Sep 2008 04:19:40 +0000 (UTC)
Subject: rpms/nagios-plugins/devel nagios-plugins.spec,1.46,1.47
Message-ID: <20080929041940.435A970110@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/nagios-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2439

Modified Files:
	nagios-plugins.spec 
Log Message:
release bump


Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/devel/nagios-plugins.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- nagios-plugins.spec	29 Sep 2008 04:17:42 -0000	1.46
+++ nagios-plugins.spec	29 Sep 2008 04:19:10 -0000	1.47
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.13
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -807,7 +807,7 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
-* Sun Sep 28 2008 Mike McGrath <mmcgrath at redhat.com> 1.4.13-3
+* Sun Sep 28 2008 Mike McGrath <mmcgrath at redhat.com> 1.4.13-4
 - Upstream released new version #464419
 - Added patch fix for check_linux_raid #253898
 - Upstream releases fix for #451015 - check_ntp_peers



From lucilanga at fedoraproject.org  Mon Sep 29 04:25:36 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 29 Sep 2008 04:25:36 +0000 (UTC)
Subject: rpms/libftdi/devel libftdi.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080929042536.1AB6A70110@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/libftdi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3133

Modified Files:
	.cvsignore sources 
Added Files:
	libftdi.spec 
Log Message:
initial import


--- NEW FILE libftdi.spec ---
Name:		libftdi
Version:	0.14
Release:	2%{?dist}
Summary:	Library to program and control the FTDI USB controller

Group:		System Environment/Libraries
License:	LGPLv2
URL:		http://www.intra2net.com/de/produkte/opensource/ftdi/
Source0:	http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libusb-devel, doxygen
Requires:	pkgconfig

%package devel
Summary:	Header files and static libraries for libftdi
Group:		Development/Libraries
Requires:	libftdi = %{version}-%{release}

%description
A library (using libusb) to talk to FTDI's FT2232C,
FT232BM and FT245BM type chips including the popular bitbang mode.

%description devel
Header files and static libraries for libftdi


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find %{buildroot} -name \*\.la -print | xargs rm -f
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
#no man install
install -p -m 644 doc/man/man3/*.3 $RPM_BUILD_ROOT%{_mandir}/man3


# Cleanup examples
rm -f $RPM_BUILD_ROOT/%{_bindir}/simple
rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang
rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang2
rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang_ft2232
rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang_cbus
rm -f $RPM_BUILD_ROOT/%{_bindir}/find_all

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING.LIB README
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%doc doc/html
%{_bindir}/libftdi-config
%{_libdir}/libftdi.a
%{_libdir}/*.so
%{_includedir}/*.h
%{_libdir}/pkgconfig/*.pc
%{_mandir}/man3/*


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%changelog
* Fri Sep 26 2008 Lucian Langa <cooly at gnome.eu.org> - 0.14-2
- require pkgconfig for devel

* Tue Sep 23 2008 Lucian Langa <cooly at gnome.eu.org> - 0.14-1
- new upstream

* Wed Sep 03 2008 Lucian Langa <cooly at gnome.eu.org> - 0.13-1
- initial specfile


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libftdi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2008 19:31:58 -0000	1.1
+++ .cvsignore	29 Sep 2008 04:25:05 -0000	1.2
@@ -0,0 +1 @@
+libftdi-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libftdi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 19:31:58 -0000	1.1
+++ sources	29 Sep 2008 04:25:05 -0000	1.2
@@ -0,0 +1 @@
+43f20478e725aa5ba6cdae311ca0593d  libftdi-0.14.tar.gz



From mmcgrath at fedoraproject.org  Mon Sep 29 04:31:00 2008
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 29 Sep 2008 04:31:00 +0000 (UTC)
Subject: rpms/nagios-plugins/F-8 nagios-plugins.spec, 1.34, 1.35 sources,
	1.10, 1.11
Message-ID: <20080929043100.2D58170110@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/nagios-plugins/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3587/F-8

Modified Files:
	nagios-plugins.spec sources 
Log Message:
upstream released new version


Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/F-8/nagios-plugins.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- nagios-plugins.spec	10 Apr 2008 14:49:06 -0000	1.34
+++ nagios-plugins.spec	29 Sep 2008 04:30:29 -0000	1.35
@@ -1,6 +1,6 @@
 Name: nagios-plugins
-Version: 1.4.11
-Release: 2%{?dist}
+Version: 1.4.13
+Release: 4%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -11,7 +11,7 @@
 Patch0: nagios-plugins-1.4.3-subst.patch
 Patch1: nagios-plugins-1.4.3-ntpd.patch
 Patch2: nagios-plugins-check_log-path.patch
-Patch3: nagios-plugins-1.4.11-ping_timeout.patch
+Patch3: nagios-plugins-1.4.13-linux_raid.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -346,6 +346,7 @@
 Summary: Nagios plugins perl dep.
 Group: Applications/System
 Requires: nagios-plugins = %{version}-%{release}
+Provides: perl(Nagios::Plugins)
 
 %description perl
 Perl dep for nagios plugins.  This is *NOT* an actual plugin it simply provides
@@ -513,7 +514,7 @@
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1
-%patch3 -p1
+%patch3 -p0
 
 %build
 %configure \
@@ -524,7 +525,12 @@
 	PATH_TO_NTPQ=%{_sbindir}/ntpq \
 	PATH_TO_NTPDC=%{_sbindir}/ntpdc \
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
-	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
+	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo \
+	--with-ps-command="`which ps` -eo 's uid pid ppid vsz rss pcpu etime comm args'" \
+	--with-ps-format='%s %d %d %d %d %d %f %s %s %n' \
+	--with-ps-cols=10 \
+	--with-ps-varlist='procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos'
+
 make %{?_smp_mflags}
 cd plugins
 make check_ide_smart
@@ -801,6 +807,27 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Sun Sep 28 2008 Mike McGrath <mmcgrath at redhat.com> 1.4.13-4
+- Upstream released new version #464419
+- Added patch fix for check_linux_raid #253898
+- Upstream releases fix for #451015 - check_ntp_peers
+- Upstream released fix for #459309 - check_ntp
+- Added Provides Nagios::Plugins for #457404
+- Fixed configure line for #458985 check_procs
+
+* Tue Jul 10 2008 Robert M. Albrecht <romal at gmx.de> 1.4.12-3
+- Removed --with-extra-opts, does not build in Koji
+
+* Mon Jun 30 2008 Robert M. Albrecht <romal at gmx.de> 1.4.12-2
+- Enabled --with-extra-opts
+
+* Sun Jun 29 2008 Robert M. Albrecht <romal at gmx.de> 1.4.12-1
+- Upstream released version 1.4.12
+- Removed patches ping_timeout.patch and pgsql-fix.patch
+
+* Wed Apr 30 2008 Mike McGrath <mmcgrath at redhat.com> 1.4.11-4
+- added patch for check_pgsql
+
 * Wed Apr 09 2008 Mike McGrath <mmcgrath at redhat.com> 1.4.11-2
 - Fix for 250588
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/F-8/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Apr 2008 14:49:06 -0000	1.10
+++ sources	29 Sep 2008 04:30:29 -0000	1.11
@@ -1 +1 @@
-042783a2180a6987e0b403870b3d01f7  nagios-plugins-1.4.11.tar.gz
+be6cc7699fff3ee29d1fd4d562377386  nagios-plugins-1.4.13.tar.gz



From mmcgrath at fedoraproject.org  Mon Sep 29 04:31:00 2008
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 29 Sep 2008 04:31:00 +0000 (UTC)
Subject: rpms/nagios-plugins/F-9 nagios-plugins.spec, 1.40, 1.41 sources,
	1.10, 1.11
Message-ID: <20080929043100.5A9CC70110@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/nagios-plugins/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3587/F-9

Modified Files:
	nagios-plugins.spec sources 
Log Message:
upstream released new version


Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/F-9/nagios-plugins.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- nagios-plugins.spec	30 Apr 2008 21:58:27 -0000	1.40
+++ nagios-plugins.spec	29 Sep 2008 04:30:30 -0000	1.41
@@ -1,5 +1,5 @@
 Name: nagios-plugins
-Version: 1.4.11
+Version: 1.4.13
 Release: 4%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
@@ -11,8 +11,7 @@
 Patch0: nagios-plugins-1.4.3-subst.patch
 Patch1: nagios-plugins-1.4.3-ntpd.patch
 Patch2: nagios-plugins-check_log-path.patch
-Patch3: nagios-plugins-1.4.11-ping_timeout.patch
-Patch4: nagios-plugins-1.4.11-pgsql-fix.patch
+Patch3: nagios-plugins-1.4.13-linux_raid.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -347,6 +346,7 @@
 Summary: Nagios plugins perl dep.
 Group: Applications/System
 Requires: nagios-plugins = %{version}-%{release}
+Provides: perl(Nagios::Plugins)
 
 %description perl
 Perl dep for nagios plugins.  This is *NOT* an actual plugin it simply provides
@@ -514,8 +514,7 @@
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1
-%patch3 -p1
-%patch4 -p0
+%patch3 -p0
 
 %build
 %configure \
@@ -526,7 +525,12 @@
 	PATH_TO_NTPQ=%{_sbindir}/ntpq \
 	PATH_TO_NTPDC=%{_sbindir}/ntpdc \
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
-	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
+	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo \
+	--with-ps-command="`which ps` -eo 's uid pid ppid vsz rss pcpu etime comm args'" \
+	--with-ps-format='%s %d %d %d %d %d %f %s %s %n' \
+	--with-ps-cols=10 \
+	--with-ps-varlist='procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos'
+
 make %{?_smp_mflags}
 cd plugins
 make check_ide_smart
@@ -803,6 +807,24 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Sun Sep 28 2008 Mike McGrath <mmcgrath at redhat.com> 1.4.13-4
+- Upstream released new version #464419
+- Added patch fix for check_linux_raid #253898
+- Upstream releases fix for #451015 - check_ntp_peers
+- Upstream released fix for #459309 - check_ntp
+- Added Provides Nagios::Plugins for #457404
+- Fixed configure line for #458985 check_procs
+
+* Tue Jul 10 2008 Robert M. Albrecht <romal at gmx.de> 1.4.12-3
+- Removed --with-extra-opts, does not build in Koji
+
+* Mon Jun 30 2008 Robert M. Albrecht <romal at gmx.de> 1.4.12-2
+- Enabled --with-extra-opts
+
+* Sun Jun 29 2008 Robert M. Albrecht <romal at gmx.de> 1.4.12-1
+- Upstream released version 1.4.12
+- Removed patches ping_timeout.patch and pgsql-fix.patch
+
 * Wed Apr 30 2008 Mike McGrath <mmcgrath at redhat.com> 1.4.11-4
 - added patch for check_pgsql
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	29 Feb 2008 04:22:02 -0000	1.10
+++ sources	29 Sep 2008 04:30:30 -0000	1.11
@@ -1 +1 @@
-042783a2180a6987e0b403870b3d01f7  nagios-plugins-1.4.11.tar.gz
+be6cc7699fff3ee29d1fd4d562377386  nagios-plugins-1.4.13.tar.gz



From mmcgrath at fedoraproject.org  Mon Sep 29 04:31:48 2008
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 29 Sep 2008 04:31:48 +0000 (UTC)
Subject: rpms/nagios-plugins/F-8 nagios-plugins-1.4.13-linux_raid.patch, NONE,
	1.1
Message-ID: <20080929043148.7744370110@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/nagios-plugins/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3751/F-8

Added Files:
	nagios-plugins-1.4.13-linux_raid.patch 
Log Message:
added patch

nagios-plugins-1.4.13-linux_raid.patch:

--- NEW FILE nagios-plugins-1.4.13-linux_raid.patch ---
--- contrib/check_linux_raid.pl.orig	2008-09-28 23:11:13.000000000 -0500
+++ contrib/check_linux_raid.pl	2008-09-28 23:12:22.000000000 -0500
@@ -23,7 +23,7 @@
 #	  WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min
 
 use strict;
-use lib "/usr/local/nagios/libexec";
+use lib utils.pm
 use utils qw(%ERRORS);
 
 # die with an error if we're not on Linux



From mmcgrath at fedoraproject.org  Mon Sep 29 04:31:48 2008
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 29 Sep 2008 04:31:48 +0000 (UTC)
Subject: rpms/nagios-plugins/F-9 nagios-plugins-1.4.13-linux_raid.patch, NONE,
	1.1
Message-ID: <20080929043148.B2CE570110@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/nagios-plugins/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3751/F-9

Added Files:
	nagios-plugins-1.4.13-linux_raid.patch 
Log Message:
added patch

nagios-plugins-1.4.13-linux_raid.patch:

--- NEW FILE nagios-plugins-1.4.13-linux_raid.patch ---
--- contrib/check_linux_raid.pl.orig	2008-09-28 23:11:13.000000000 -0500
+++ contrib/check_linux_raid.pl	2008-09-28 23:12:22.000000000 -0500
@@ -23,7 +23,7 @@
 #	  WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min
 
 use strict;
-use lib "/usr/local/nagios/libexec";
+use lib utils.pm
 use utils qw(%ERRORS);
 
 # die with an error if we're not on Linux



From lucilanga at fedoraproject.org  Mon Sep 29 04:32:23 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 29 Sep 2008 04:32:23 +0000 (UTC)
Subject: rpms/libftdi/F-8 libftdi.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080929043223.80DA770110@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/libftdi/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3790

Modified Files:
	.cvsignore sources 
Added Files:
	libftdi.spec 
Log Message:
initial import


--- NEW FILE libftdi.spec ---
Name:		libftdi
Version:	0.14
Release:	2%{?dist}
Summary:	Library to program and control the FTDI USB controller

Group:		System Environment/Libraries
License:	LGPLv2
URL:		http://www.intra2net.com/de/produkte/opensource/ftdi/
Source0:	http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libusb-devel, doxygen
Requires:	pkgconfig

%package devel
Summary:	Header files and static libraries for libftdi
Group:		Development/Libraries
Requires:	libftdi = %{version}-%{release}

%description
A library (using libusb) to talk to FTDI's FT2232C,
FT232BM and FT245BM type chips including the popular bitbang mode.

%description devel
Header files and static libraries for libftdi


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find %{buildroot} -name \*\.la -print | xargs rm -f
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
#no man install
install -p -m 644 doc/man/man3/*.3 $RPM_BUILD_ROOT%{_mandir}/man3


# Cleanup examples
rm -f $RPM_BUILD_ROOT/%{_bindir}/simple
rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang
rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang2
rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang_ft2232
rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang_cbus
rm -f $RPM_BUILD_ROOT/%{_bindir}/find_all

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING.LIB README
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%doc doc/html
%{_bindir}/libftdi-config
%{_libdir}/libftdi.a
%{_libdir}/*.so
%{_includedir}/*.h
%{_libdir}/pkgconfig/*.pc
%{_mandir}/man3/*


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%changelog
* Fri Sep 26 2008 Lucian Langa <cooly at gnome.eu.org> - 0.14-2
- require pkgconfig for devel

* Tue Sep 23 2008 Lucian Langa <cooly at gnome.eu.org> - 0.14-1
- new upstream

* Wed Sep 03 2008 Lucian Langa <cooly at gnome.eu.org> - 0.13-1
- initial specfile


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libftdi/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2008 19:31:58 -0000	1.1
+++ .cvsignore	29 Sep 2008 04:31:53 -0000	1.2
@@ -0,0 +1 @@
+libftdi-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libftdi/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 19:31:58 -0000	1.1
+++ sources	29 Sep 2008 04:31:53 -0000	1.2
@@ -0,0 +1 @@
+43f20478e725aa5ba6cdae311ca0593d  libftdi-0.14.tar.gz



From lucilanga at fedoraproject.org  Mon Sep 29 04:33:45 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 29 Sep 2008 04:33:45 +0000 (UTC)
Subject: rpms/libftdi/F-9 libftdi.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080929043345.8B74470110@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/libftdi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4147

Modified Files:
	.cvsignore sources 
Added Files:
	libftdi.spec 
Log Message:
initial import


--- NEW FILE libftdi.spec ---
Name:		libftdi
Version:	0.14
Release:	2%{?dist}
Summary:	Library to program and control the FTDI USB controller

Group:		System Environment/Libraries
License:	LGPLv2
URL:		http://www.intra2net.com/de/produkte/opensource/ftdi/
Source0:	http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libusb-devel, doxygen
Requires:	pkgconfig

%package devel
Summary:	Header files and static libraries for libftdi
Group:		Development/Libraries
Requires:	libftdi = %{version}-%{release}

%description
A library (using libusb) to talk to FTDI's FT2232C,
FT232BM and FT245BM type chips including the popular bitbang mode.

%description devel
Header files and static libraries for libftdi


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find %{buildroot} -name \*\.la -print | xargs rm -f
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
#no man install
install -p -m 644 doc/man/man3/*.3 $RPM_BUILD_ROOT%{_mandir}/man3


# Cleanup examples
rm -f $RPM_BUILD_ROOT/%{_bindir}/simple
rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang
rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang2
rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang_ft2232
rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang_cbus
rm -f $RPM_BUILD_ROOT/%{_bindir}/find_all

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING.LIB README
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%doc doc/html
%{_bindir}/libftdi-config
%{_libdir}/libftdi.a
%{_libdir}/*.so
%{_includedir}/*.h
%{_libdir}/pkgconfig/*.pc
%{_mandir}/man3/*


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%changelog
* Fri Sep 26 2008 Lucian Langa <cooly at gnome.eu.org> - 0.14-2
- require pkgconfig for devel

* Tue Sep 23 2008 Lucian Langa <cooly at gnome.eu.org> - 0.14-1
- new upstream

* Wed Sep 03 2008 Lucian Langa <cooly at gnome.eu.org> - 0.13-1
- initial specfile


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libftdi/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2008 19:31:58 -0000	1.1
+++ .cvsignore	29 Sep 2008 04:33:15 -0000	1.2
@@ -0,0 +1 @@
+libftdi-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libftdi/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 19:31:58 -0000	1.1
+++ sources	29 Sep 2008 04:33:15 -0000	1.2
@@ -0,0 +1 @@
+43f20478e725aa5ba6cdae311ca0593d  libftdi-0.14.tar.gz



From mmcgrath at fedoraproject.org  Mon Sep 29 04:38:16 2008
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 29 Sep 2008 04:38:16 +0000 (UTC)
Subject: rpms/nagios-plugins/EL-5 nagios-plugins-1.4.13-linux_raid.patch,
	NONE, 1.1 nagios-plugins.spec, 1.33, 1.34 sources, 1.12, 1.13
Message-ID: <20080929043816.244DA70110@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/nagios-plugins/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4559

Modified Files:
	nagios-plugins.spec sources 
Added Files:
	nagios-plugins-1.4.13-linux_raid.patch 
Log Message:
upstream released new version

nagios-plugins-1.4.13-linux_raid.patch:

--- NEW FILE nagios-plugins-1.4.13-linux_raid.patch ---
--- contrib/check_linux_raid.pl.orig	2008-09-28 23:11:13.000000000 -0500
+++ contrib/check_linux_raid.pl	2008-09-28 23:12:22.000000000 -0500
@@ -23,7 +23,7 @@
 #	  WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min
 
 use strict;
-use lib "/usr/local/nagios/libexec";
+use lib utils.pm
 use utils qw(%ERRORS);
 
 # die with an error if we're not on Linux


Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/EL-5/nagios-plugins.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- nagios-plugins.spec	10 Apr 2008 14:48:42 -0000	1.33
+++ nagios-plugins.spec	29 Sep 2008 04:37:45 -0000	1.34
@@ -1,6 +1,6 @@
 Name: nagios-plugins
-Version: 1.4.11
-Release: 2%{?dist}
+Version: 1.4.13
+Release: 4%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -11,7 +11,7 @@
 Patch0: nagios-plugins-1.4.3-subst.patch
 Patch1: nagios-plugins-1.4.3-ntpd.patch
 Patch2: nagios-plugins-check_log-path.patch
-Patch3: nagios-plugins-1.4.11-ping_timeout.patch
+Patch3: nagios-plugins-1.4.13-linux_raid.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -346,6 +346,7 @@
 Summary: Nagios plugins perl dep.
 Group: Applications/System
 Requires: nagios-plugins = %{version}-%{release}
+Provides: perl(Nagios::Plugins)
 
 %description perl
 Perl dep for nagios plugins.  This is *NOT* an actual plugin it simply provides
@@ -513,7 +514,7 @@
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1
-%patch3 -p1
+%patch3 -p0
 
 %build
 %configure \
@@ -524,7 +525,12 @@
 	PATH_TO_NTPQ=%{_sbindir}/ntpq \
 	PATH_TO_NTPDC=%{_sbindir}/ntpdc \
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
-	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
+	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo \
+	--with-ps-command="`which ps` -eo 's uid pid ppid vsz rss pcpu etime comm args'" \
+	--with-ps-format='%s %d %d %d %d %d %f %s %s %n' \
+	--with-ps-cols=10 \
+	--with-ps-varlist='procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos'
+
 make %{?_smp_mflags}
 cd plugins
 make check_ide_smart
@@ -801,6 +807,27 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Sun Sep 28 2008 Mike McGrath <mmcgrath at redhat.com> 1.4.13-4
+- Upstream released new version #464419
+- Added patch fix for check_linux_raid #253898
+- Upstream releases fix for #451015 - check_ntp_peers
+- Upstream released fix for #459309 - check_ntp
+- Added Provides Nagios::Plugins for #457404
+- Fixed configure line for #458985 check_procs
+
+* Tue Jul 10 2008 Robert M. Albrecht <romal at gmx.de> 1.4.12-3
+- Removed --with-extra-opts, does not build in Koji
+
+* Mon Jun 30 2008 Robert M. Albrecht <romal at gmx.de> 1.4.12-2
+- Enabled --with-extra-opts
+
+* Sun Jun 29 2008 Robert M. Albrecht <romal at gmx.de> 1.4.12-1
+- Upstream released version 1.4.12
+- Removed patches ping_timeout.patch and pgsql-fix.patch
+
+* Wed Apr 30 2008 Mike McGrath <mmcgrath at redhat.com> 1.4.11-4
+- added patch for check_pgsql
+
 * Wed Apr 09 2008 Mike McGrath <mmcgrath at redhat.com> 1.4.11-2
 - Fix for 250588
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	10 Apr 2008 14:48:42 -0000	1.12
+++ sources	29 Sep 2008 04:37:45 -0000	1.13
@@ -1 +1 @@
-042783a2180a6987e0b403870b3d01f7  nagios-plugins-1.4.11.tar.gz
+be6cc7699fff3ee29d1fd4d562377386  nagios-plugins-1.4.13.tar.gz



From alexlan at fedoraproject.org  Mon Sep 29 04:40:29 2008
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Mon, 29 Sep 2008 04:40:29 +0000 (UTC)
Subject: rpms/blam/devel blam.spec,1.23,1.24
Message-ID: <20080929044029.BAB267013E@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/blam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4782

Modified Files:
	blam.spec 
Log Message:
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blam/devel/blam.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- blam.spec	21 Jul 2008 13:57:57 -0000	1.23
+++ blam.spec	29 Sep 2008 04:39:59 -0000	1.24
@@ -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.1
+%define	gecko_version		1.9.0.2
 
 Name:		blam
 Version:	1.8.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -135,9 +135,12 @@
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 1.8.5-2
+- Rebuild against newer gecko
+
 * Mon Jul 21 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.8.5-1
 - Update to upstream (1.8.5), fixes FTBS (#434382)
-- Set gecko version to new xulrunner: 1.9.0.1
+- Set gecko version to new xulrunner: 1.9.0.2
 - BR: gecko-devel-unstable
 - Drop a number of patches which no longer apply
 - Add new icons to file list.



From cscott at fedoraproject.org  Mon Sep 29 04:44:15 2008
From: cscott at fedoraproject.org (C. Scott Ananian)
Date: Mon, 29 Sep 2008 04:44:15 +0000 (UTC)
Subject: rpms/sugar-toolkit/OLPC-3 8674.patch, NONE, 1.1 sugar-toolkit.spec, 
	1.25, 1.26
Message-ID: <20080929044415.518EB70110@cvs1.fedora.phx.redhat.com>

Author: cscott

Update of /cvs/pkgs/rpms/sugar-toolkit/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5345

Modified Files:
	sugar-toolkit.spec 
Added Files:
	8674.patch 
Log Message:
Rebuild with fix for #8674.


8674.patch:

--- NEW FILE 8674.patch ---
commit 2a10f318e393ba97cb2341bbde0015b7483fbc6d
Author: C. Scott Ananian <cscott at laptop.org>
Date:   Fri Sep 26 00:47:35 2008 -0400

    Trac #8674: sanity-check bundle root; don't delete install_root on failure.
    
    The software updater was deleting ~/Activities when it encountered a bad
    bundle.  Two separate issues:  we didn't sanity check the bundle root to
    ensure it wasn't '.' or '..' or something crazy like that, and our "clean
    up on failure" code was deleting the install_root instead of the activity
    root (!).  This was a regression introduced by the fix for #7733 in
    commit db2d1c42e2481d6dbc15405840ac23e46eab7318 (0.82.2).

diff --git a/src/sugar/bundle/bundle.py b/src/sugar/bundle/bundle.py
index 0319b9e..e9bd9f8 100644
--- a/src/sugar/bundle/bundle.py
+++ b/src/sugar/bundle/bundle.py
@@ -86,6 +86,9 @@ class Bundle:
             del file_names[0]
 
         self._zip_root_dir = file_names[0].split('/')[0]
+        if self._zip_root_dir.startswith('.'):
+            raise MalformedBundleException(
+                'root directory starts with .')
         if self._unzipped_extension is not None:
             (name_, ext) = os.path.splitext(self._zip_root_dir)
             if ext != self._unzipped_extension:
@@ -162,7 +165,8 @@ class Bundle:
         if os.spawnlp(os.P_WAIT, 'unzip', 'unzip', '-o', self._path,
                       '-x', 'mimetype', '-d', install_dir):
             # clean up install dir after failure
-            shutil.rmtree(install_dir, ignore_errors=True)
+            shutil.rmtree(os.path.join(install_dir, self._zip_root_dir),
+                          ignore_errors=True)
             # indicate failure.
             raise ZipExtractException
 


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sugar-toolkit.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sugar-toolkit.spec	24 Sep 2008 22:53:16 -0000	1.25
+++ sugar-toolkit.spec	29 Sep 2008 04:43:44 -0000	1.26
@@ -6,7 +6,7 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.82.11
-Release: 3%{?dist}
+Release: 4%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -20,6 +20,7 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: localedir.patch
+Patch2: 8674.patch
 
 BuildRequires: pkgconfig
 BuildRequires: pygtk2-devel
@@ -47,6 +48,7 @@
 %setup -q
 
 %patch1 -p1 -b .localedir
+%patch2 -p1 -b .8674
 
 %build
 %configure
@@ -70,6 +72,9 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Mon Sep 29 2008 C. Scott Ananian <cscott at laptop.org> - 0.82.11-4
+- #8674 don't delete ~/Activities on bundle install failure
+
 * Wed Sep 24 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.11-3
 - Apply the patch with -p1
 



From alexlan at fedoraproject.org  Mon Sep 29 04:56:01 2008
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Mon, 29 Sep 2008 04:56:01 +0000 (UTC)
Subject: rpms/Miro/devel sources, 1.12, 1.13 Miro.spec, 1.39, 1.40 .cvsignore,
	1.12, 1.13
Message-ID: <20080929045601.7ACFB70110@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/Miro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6069

Modified Files:
	sources Miro.spec .cvsignore 
Log Message:
- Update to 1.2.7
- Rebuild against gecko-libs 1.9.0.2 (#464205)



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Aug 2008 00:36:59 -0000	1.12
+++ sources	29 Sep 2008 04:55:29 -0000	1.13
@@ -1 +1 @@
-7425284e553a41a52b173f748391f3d5  Miro-1.2.6.tar.gz
+b213dda4a347c9b648a28ea26c60f851  Miro-1.2.7.tar.gz


Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Miro.spec	23 Aug 2008 02:08:27 -0000	1.39
+++ Miro.spec	29 Sep 2008 04:55:30 -0000	1.40
@@ -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.1
+%define gecko_ver 1.9.0.2
 
 Name:           Miro
-Version:        1.2.6
-Release:        3%{?dist}
+Version:        1.2.7
+Release:        1%{?dist}
 Summary:        Miro - Internet TV Player
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -85,6 +85,10 @@
 
 
 %changelog
+* Sun Sep 28 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.7-1
+- Update to 1.2.7
+- Rebuild against gecko-libs 1.9.0.2 (#464205)
+
 * Fri Aug 22 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 1.2.6-3
 - Do not create backup files when patching; the backup files get re-added during the build process
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Aug 2008 00:36:59 -0000	1.12
+++ .cvsignore	29 Sep 2008 04:55:30 -0000	1.13
@@ -1 +1 @@
-Miro-1.2.6.tar.gz
+Miro-1.2.7.tar.gz



From alexlan at fedoraproject.org  Mon Sep 29 05:51:37 2008
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Mon, 29 Sep 2008 05:51:37 +0000 (UTC)
Subject: rpms/Miro/F-9 Miro-1.2.6-boost.patch, NONE, 1.1 sources, 1.11,
	1.12 Miro.spec, 1.34, 1.35 .cvsignore, 1.11, 1.12
Message-ID: <20080929055137.D5AF570110@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/Miro/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9266

Modified Files:
	sources Miro.spec .cvsignore 
Added Files:
	Miro-1.2.6-boost.patch 
Log Message:
- Update to 1.2.7
- Sync .spec file with rawhide branch.


Miro-1.2.6-boost.patch:

--- NEW FILE Miro-1.2.6-boost.patch ---
--- Miro-1.2.6/portable/libtorrent/include/libtorrent/disk_io_thread.hpp.boost	2008-08-15 00:50:40.000000000 -0400
+++ Miro-1.2.6/portable/libtorrent/include/libtorrent/disk_io_thread.hpp	2008-08-22 18:52:56.000000000 -0400
@@ -37,6 +37,7 @@
 #include "libtorrent/storage.hpp"
 #include <boost/thread/thread.hpp>
 #include <boost/function.hpp>
+#include <boost/thread/condition.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/bind.hpp>
 #include <boost/pool/pool.hpp>
--- Miro-1.2.6/portable/libtorrent/src/torrent_info.cpp.boost	2008-08-15 00:50:41.000000000 -0400
+++ Miro-1.2.6/portable/libtorrent/src/torrent_info.cpp	2008-08-22 18:06:31.000000000 -0400
@@ -352,7 +352,7 @@
 		fs::path tmp = m_name;
 		if (tmp.is_complete()) throw std::runtime_error("torrent contains "
 			"a file with an absolute path: '" + m_name + "'");
-		if (tmp.has_branch_path()) throw std::runtime_error(
+		if (tmp.has_parent_path()) throw std::runtime_error(
 			"torrent contains name with directories: '" + m_name + "'");
 	
 		// extract file list
@@ -556,7 +556,7 @@
 	{
 //		TORRENT_ASSERT(file.begin() != file.end());
 
-		if (!file.has_branch_path())
+		if (!file.has_parent_path())
 		{
 			// you have already added at least one file with a
 			// path to the file (branch_path), which means that
@@ -644,7 +644,7 @@
 					fs::path const* file_path;
 					if (i->orig_path) file_path = &(*i->orig_path);
 					else file_path = &i->path;
-					TORRENT_ASSERT(file_path->has_branch_path());
+					TORRENT_ASSERT(file_path->has_parent_path());
 					TORRENT_ASSERT(*file_path->begin() == m_name);
 
 					for (fs::path::iterator j = boost::next(file_path->begin());


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	18 Jun 2008 04:27:45 -0000	1.11
+++ sources	29 Sep 2008 05:51:06 -0000	1.12
@@ -1 +1 @@
-0bb345164b1b6f79ed60f5aab891385f  Miro-1.2.4.tar.gz
+b213dda4a347c9b648a28ea26c60f851  Miro-1.2.7.tar.gz


Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-9/Miro.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Miro.spec	24 Sep 2008 06:17:19 -0000	1.34
+++ Miro.spec	29 Sep 2008 05:51:06 -0000	1.35
@@ -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
+%define gecko_ver 1.9.0.2
 
 Name:           Miro
-Version:        1.2.4
-Release:        3%{?dist}
+Version:        1.2.7
+Release:        1%{?dist}
 Summary:        Miro - Internet TV Player
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -14,12 +14,13 @@
 Patch0:         %{name}-1.1-utf8.patch
 Patch1:		%{name}-xulrunner.patch
 Patch2:		%{name}-gcc43.patch
+Patch3:         %{name}-1.2.6-boost.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel xine-lib-devel Pyrex 
 BuildRequires:  boost-devel pygtk2-devel libXv-devel openssl-devel
-BuildRequires:  gecko-devel-unstable >= %{gecko_ver} gettext gtk2-devel
+BuildRequires:  gecko-devel-unstable = %{gecko_ver} gettext gtk2-devel
 
-Requires:       gecko-libs >= %{gecko_ver} gnome-python2-gtkmozembed 
+Requires:       gecko-libs = %{gecko_ver} gnome-python2-gtkmozembed 
 Requires:       gnome-python2-gconf dbus-python 
 Provides:       Democracy = %{version}-%{release}
 Obsoletes:      Democracy < 1.0
@@ -32,9 +33,14 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+# Intentionally not using -b .<descr> :
+# Otherwise, the unpatched files get re-added into Miro
+# (and '.' breaks Python imports)
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+# Enable this once Boost 1.36 enters, post-F10
+#patch3 -p1
 
 %build
 cd platform/gtk-x11 && CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -79,11 +85,31 @@
 
 
 %changelog
-* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 1.2.4-3
-- Rebuild against newer gecko
+* Sun Sep 28 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.7-1
+- Update to 1.2.7
+- Rebuild against gecko-libs 1.9.0.2 (#464205)
+
+* Fri Aug 22 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 1.2.6-3
+- Do not create backup files when patching; the backup files get re-added during the build process
+
+* Fri Aug 22 2008 Michel Salim <salimma at fedoraproject.org> - 1.2.6-2
+- Unapply boost patch; boost-1.36 has been backed out for F10
+
+* Fri Aug 22 2008 Michel Salim <salimma at fedoraproject.org> - 1.2.6-1
+- Update to 1.2.6
+- Patch for boost API change
+
+* Tue Aug 12 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-4
+- Rebuild for new boost (fixes broken deps).
+
+* Sat Jul 19 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-3
+- Rebuild for xulrunner-1.9.0.1
+- Unfortunately we probably need to make this an exact match because
+  Miro uses the unstable API, so a rebuild may need to be done on every
+  package update to be sure that it will work with new xulrunner updates
 
-* Fri Jul 18 2008 Paul W. Frields <stickster at gmail.com> - 1.2.4-2
-- Rebuild against xulrunner and fix dependencies
+* Wed Jun 18 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-2
+- Rebuild for xulrunner-1.9 final.
 
 * Sun Jun 15 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-1
 - Update to latest upstream (1.2.4)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	18 Jun 2008 04:27:45 -0000	1.11
+++ .cvsignore	29 Sep 2008 05:51:06 -0000	1.12
@@ -1 +1 @@
-Miro-1.2.4.tar.gz
+Miro-1.2.7.tar.gz



From mintojoseph at fedoraproject.org  Mon Sep 29 06:08:57 2008
From: mintojoseph at fedoraproject.org (Minto Joseph)
Date: Mon, 29 Sep 2008 06:08:57 +0000 (UTC)
Subject: rpms/myanmar3-unicode-fonts/devel import.log, NONE,
	1.1 myanmar3-unicode-fonts-fontconfig.conf, NONE,
	1.1 myanmar3-unicode-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080929060857.8E1D470110@cvs1.fedora.phx.redhat.com>

Author: mintojoseph

Update of /cvs/pkgs/rpms/myanmar3-unicode-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10648/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log myanmar3-unicode-fonts-fontconfig.conf 
	myanmar3-unicode-fonts.spec 
Log Message:

Added Files:
	devel/import.log devel/myanmar3-unicode-fonts-fontconfig.conf 
	devel/myanmar3-unicode-fonts.spec 



--- NEW FILE import.log ---
myanmar3-unicode-fonts-3_00-1_fc8:HEAD:myanmar3-unicode-fonts-3.00-1.fc8.src.rpm:1222667484


--- NEW FILE myanmar3-unicode-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>myanmar3-unicode</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>myanmar3-unicode</family>
    </prefer>
  </alias>
</fontconfig>


--- NEW FILE myanmar3-unicode-fonts.spec ---
%define fontname    myanmar3-unicode
%define fontdir     %{_datadir}/fonts/%{fontname}
%define fontconfdir %{_sysconfdir}/fonts/conf.d

%define archivename Myanmar3_Unicode 


Name:    %{fontname}-fonts
Version: 3.00
Release: 1%{?dist}
Summary: Myanmar3 unicode font

Group:   User Interface/X
License: LGPLv2+
URL:    http://www.myanmarnlp.net.mm 
Source0: http://www.myanmarnlp.net.mm/downloads/%{archivename}.zip
Source1: %{name}-fontconfig.conf

BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch

%description
Myanmar3 unicode font from 
Myanmar Unicode & NLP Research Center

%prep
%setup -q -c
unzip -j -L -q %{SOURCE0}


%build
# Nothing there


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{fontdir}
install -m 0644 -p *.ttf %{buildroot}%{fontdir}

install -m 0755 -d %{buildroot}%{fontconfdir}
install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/65-%{fontname}.conf


%clean
rm -fr %{buildroot}


%post
if [ -x %{_bindir}/fc-cache ] ; then
    %{_bindir}/fc-cache %{fontdir} || :
fi


%postun
if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
    %{_bindir}/fc-cache %{fontdir} || :
fi


%files
%defattr(0644,root,root,0755)

%config(noreplace) %{fontconfdir}/65-%{fontname}.conf

%dir %{fontdir}/
%{fontdir}/*.ttf


%changelog

* Fri Aug 01 2008 Minto Joseph <mvaliyav at redhat.com> - 3.00-1 
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/myanmar3-unicode-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Aug 2008 17:28:25 -0000	1.1
+++ .cvsignore	29 Sep 2008 06:08:26 -0000	1.2
@@ -0,0 +1 @@
+Myanmar3_Unicode.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/myanmar3-unicode-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Aug 2008 17:28:25 -0000	1.1
+++ sources	29 Sep 2008 06:08:26 -0000	1.2
@@ -0,0 +1 @@
+1cae8ab0ea5c5a369b73cb70a24fe9dd  Myanmar3_Unicode.zip



From mintojoseph at fedoraproject.org  Mon Sep 29 06:37:36 2008
From: mintojoseph at fedoraproject.org (Minto Joseph)
Date: Mon, 29 Sep 2008 06:37:36 +0000 (UTC)
Subject: rpms/myanmar3-unicode-fonts/F-8 import.log, NONE,
	1.1 myanmar3-unicode-fonts-fontconfig.conf, NONE,
	1.1 myanmar3-unicode-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080929063736.C87FF70110@cvs1.fedora.phx.redhat.com>

Author: mintojoseph

Update of /cvs/pkgs/rpms/myanmar3-unicode-fonts/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14196/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log myanmar3-unicode-fonts-fontconfig.conf 
	myanmar3-unicode-fonts.spec 
Log Message:

Modified Files:
 	F-8/.cvsignore F-8/sources 
 Added Files:
 	F-8/import.log F-8/myanmar3-unicode-fonts-fontconfig.conf 
 	F-8/myanmar3-unicode-fonts.spec 



--- NEW FILE import.log ---
myanmar3-unicode-fonts-3_00-1_fc8:F-8:myanmar3-unicode-fonts-3.00-1.fc8.src.rpm:1222669287


--- NEW FILE myanmar3-unicode-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>myanmar3-unicode</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>myanmar3-unicode</family>
    </prefer>
  </alias>
</fontconfig>


--- NEW FILE myanmar3-unicode-fonts.spec ---
%define fontname    myanmar3-unicode
%define fontdir     %{_datadir}/fonts/%{fontname}
%define fontconfdir %{_sysconfdir}/fonts/conf.d

%define archivename Myanmar3_Unicode 


Name:    %{fontname}-fonts
Version: 3.00
Release: 1%{?dist}
Summary: Myanmar3 unicode font

Group:   User Interface/X
License: LGPLv2+
URL:    http://www.myanmarnlp.net.mm 
Source0: http://www.myanmarnlp.net.mm/downloads/%{archivename}.zip
Source1: %{name}-fontconfig.conf

BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch

%description
Myanmar3 unicode font from 
Myanmar Unicode & NLP Research Center

%prep
%setup -q -c
unzip -j -L -q %{SOURCE0}


%build
# Nothing there


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{fontdir}
install -m 0644 -p *.ttf %{buildroot}%{fontdir}

install -m 0755 -d %{buildroot}%{fontconfdir}
install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/65-%{fontname}.conf


%clean
rm -fr %{buildroot}


%post
if [ -x %{_bindir}/fc-cache ] ; then
    %{_bindir}/fc-cache %{fontdir} || :
fi


%postun
if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
    %{_bindir}/fc-cache %{fontdir} || :
fi


%files
%defattr(0644,root,root,0755)

%config(noreplace) %{fontconfdir}/65-%{fontname}.conf

%dir %{fontdir}/
%{fontdir}/*.ttf


%changelog

* Fri Aug 01 2008 Minto Joseph <mvaliyav at redhat.com> - 3.00-1 
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/myanmar3-unicode-fonts/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Aug 2008 17:28:25 -0000	1.1
+++ .cvsignore	29 Sep 2008 06:37:04 -0000	1.2
@@ -0,0 +1 @@
+Myanmar3_Unicode.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/myanmar3-unicode-fonts/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Aug 2008 17:28:25 -0000	1.1
+++ sources	29 Sep 2008 06:37:04 -0000	1.2
@@ -0,0 +1 @@
+1cae8ab0ea5c5a369b73cb70a24fe9dd  Myanmar3_Unicode.zip



From transif at fedoraproject.org  Mon Sep 29 06:44:49 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Mon, 29 Sep 2008 06:44:49 +0000 (UTC)
Subject: comps/po te.po,1.14,1.15
Message-ID: <20080929064449.2C37670110@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15116/po

Modified Files:
	te.po 
Log Message:
    2008-09-29  KrishnaBabu K <kkrothap at redhat.com> (via
kkrothap at fedoraproject.org)
    
      * po/te.po: Updated Telugu Translation.
    



Index: te.po
===================================================================
RCS file: /cvs/pkgs/comps/po/te.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- te.po	17 Sep 2008 22:44:37 -0000	1.14
+++ te.po	29 Sep 2008 06:44:18 -0000	1.15
@@ -1,4 +1,4 @@
-# translation of comps.HEAD.te.po to Telugu
+# translation of te.po to Telugu
 # translation of te.po to
 # translation of te.po to
 # translation of te.po to
@@ -12,17 +12,17 @@
 # Krishna Babu K <kkrothap at redhat.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: comps.HEAD.te\n"
+"Project-Id-Version: te\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-04-14 13:49+0530\n"
+"POT-Creation-Date: 2008-09-29 01:29+0000\n"
+"PO-Revision-Date: 2008-09-29 12:11+0530\n"
 "Last-Translator: Krishna Babu K <kkrothap at redhat.com>\n"
 "Language-Team: Telugu <en at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
 "\n"
 "\n"
 
@@ -404,16 +404,13 @@
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:81
-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:82 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31
-msgid ""
-"Install this group of packages to use the base graphical (X) user interface."
-msgstr ""
-"??? package ??????????????????????????? ???????????????????????????????????????????????? ????????? graphical (X) ??????????????????????????????????????? interface?????? ?????????????????????????????????."
+msgid "Install this group of packages to use the base graphical (X) user interface."
+msgstr "??? package ??????????????????????????? ???????????????????????????????????????????????? ????????? graphical (X) ??????????????????????????????????????? interface?????? ?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
 #: ../comps-f10.xml.in.h:84
@@ -648,8 +645,7 @@
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
 #: ../comps-f10.xml.in.h:143 ../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:137
@@ -772,8 +768,7 @@
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
 #: ../comps-f10.xml.in.h:169
-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 "??? ????????????????????? ???????????? packages ?????????????????????????????? ????????????????????????????????? ????????????????????? ???????????? libraries."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:160
@@ -783,20 +778,17 @@
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
 #: ../comps-f10.xml.in.h:171
-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 Window ?????????????????????????????? ?????????????????????????????? ??????????????????????????? ??? package?????? ????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:162
 #: ../comps-f10.xml.in.h:172 ../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:163
 #: ../comps-f10.xml.in.h:173
-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 "??? package?????? network ?????????????????? ???????????????????????? - DHCP, Kerberos ??????????????? NIS??????. ??????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:164
@@ -909,14 +901,12 @@
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
 #: ../comps-f10.xml.in.h:190 ../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:181
 #: ../comps-f10.xml.in.h:191 ../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:182
@@ -930,18 +920,15 @@
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
 #: ../comps-f10.xml.in.h:193
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
-msgstr ""
-"DNS ?????????????????? ???????????????????????? (BIND) ?????? ????????????????????????????????? ?????????????????????????????????????????? ??? ?????????????????????????????? ??????????????? ???????????????????????????????????????."
+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:184
 #: ../comps-f10.xml.in.h:194
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
-msgstr ""
-"Linux and MS Windows (tm) ????????????????????????????????? ??????????????? ??????????????????????????? ??? ?????????????????????????????? ??????????????? ???????????????????????????????????????."
+msgstr "Linux and MS Windows (tm) ????????????????????????????????? ??????????????? ??????????????????????????? ??? ?????????????????????????????? ??????????????? ???????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:185
 #: ../comps-f10.xml.in.h:195
@@ -1114,91 +1101,76 @@
 msgstr "????????? ???????????????????????????????????? ??????????????? ???????????? ???????????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44
-#, fuzzy
 msgid "Esperanto Support"
-msgstr "?????????????????? ??????????????????"
+msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95
-#, fuzzy
 msgid "Kashubian Support"
-msgstr "??????????????????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:108
-#, fuzzy
 msgid "Macedonian Support"
-msgstr "??????????????????????????? ??????????????????"
+msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:121
-#, fuzzy
 msgid "Northern Sami Support"
-msgstr "??????????????????????????? ???????????? ??????????????????"
+msgstr "??????????????????????????? ????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:137
-#, fuzzy
 msgid "SUGAR Desktop Environment"
-msgstr "???????????????????????????????????? ?????????????????????????????????"
+msgstr "SUGAR ?????????????????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:138
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
-msgstr ""
+msgstr "SUGAR ?????????????????? OLPC XO ??????????????? ?????????????????????????????????????????? ?????????????????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:211
-#, fuzzy
 msgid "Walloon Support"
-msgstr "Lao ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:70
-#, fuzzy
 msgid "Haskell Development"
-msgstr "???????????? ???????????????????????????"
+msgstr "??????????????????????????? ???????????????????????????"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
-msgstr ""
+msgstr "???????????????????????? ????????????????????????"
 
 #: ../comps-f10.xml.in.h:77
 msgid "Input method packages for the input of international text."
-msgstr ""
+msgstr "?????????????????????????????? ????????????????????? ???????????????????????? ????????????????????? ???????????????????????? ?????????????????? ????????????????????????."
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "?????????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:110
-#, fuzzy
 msgid "Maithili Support"
-msgstr "??????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:117
-#, fuzzy
 msgid "Myanmar (Burmese) Support"
-msgstr "?????????????????????????????? ??????????????????"
+msgstr "???????????????????????? (?????????????????????) ??????????????????"
 
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "??????????????? ??????????????????"
+msgstr "??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:156
-#, fuzzy
 msgid "Support for developing programs in the Haskell programming language."
-msgstr "Java ????????????????????? ??????????????? ????????????????????? ????????????????????????????????? ??????????????????."
+msgstr "??????????????????????????? ??????????????????????????????????????? ??????????????? ??????????????????????????????????????? ???????????????????????????????????????????????? ??????????????????."
 
 #: ../comps-f10.xml.in.h:163
-#, fuzzy
 msgid "Tajik Support"
-msgstr "???????????? ??????????????????"
+msgstr "??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:205
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "???????????? ??????????????????"
+msgstr "????????????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1250,18 +1222,15 @@
 msgstr "??? ??????????????? ????????????????????? ??????????????????????????? ??????????????? ?????????????????????????????? ?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????????????????? ????????????????????????????????? ??? ??????????????? ??????????????????????????? ??????????????? ????????????????????? ??????????????? ????????????."
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????????????????? ????????????????????????????????? ??? ??????????????? ??????????????????????????? ??????????????? ????????????????????? ??????????????? ????????????."
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????????????????? ????????????????????????????????? ??? ??????????????? ??????????????????????????? ??????????????? ????????????????????? ??????????????? ????????????."
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1269,69 +1238,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "???????????? ????????????????????????????????? ??? ??????????????? ??????????????????????????? ??????????????? ????????????????????? ??????????????? ????????????."
 
-#~ msgid "British Support"
-#~ msgstr "???????????????????????? ??????????????????"
-
-#~ msgid "Cluster Storage"
-#~ msgstr "???????????????????????? ???????????????"
-
-#~ msgid "Clustering Support."
-#~ msgstr "????????????????????????????????? ??????????????????."
-
-#~ msgid "Libraries for applications built on older releases."
-#~ msgstr "????????? ????????????????????????????????? ?????????????????????????????? ????????????????????????????????? ??????????????? ???????????????????????????."
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "??????????????? ????????????????????? ????????????????????????"
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "????????????????????? ??????????????? ??????????????? ?????????????????????????????? ?????????????????????????????????."
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "single-node GFS ??????????????? ?????????????????????????????? ?????????????????????????????????."
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "????????????????????? ???????????? GFS ??????????????????"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "?????????????????? ??????????????????????????? ??? ???????????????????????? ????????????????????? ??????????????????????????????????????????."
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "Java ??????????????????????????? ???????????????????????? ??????????????? ??????????????????????????? ??????????????????"
-
-#~ msgid "Misc"
-#~ msgstr "Misc"
-
-#~ msgid "Misc packages"
-#~ msgstr "Misc ????????????????????????"
-
-#~ msgid "Multimedia"
-#~ msgstr "?????????????????????????????????"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "????????????????????????????????? ?????????????????????????????????"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr "Red Hat Enterprise Linux ??????????????? ??????????????? ??????????????????????????? ???????????????????????? ????????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux Supplementary"
-#~ msgstr "Red Hat Enterprise Linux ?????????????????????????????????"
-
-#~ msgid ""
-#~ "Components used for high performance networking and clustering, such as "
-#~ "Infiniband and RDMA."
-#~ msgstr ""
-#~ "???????????????????????? ????????????????????? ???????????????????????????????????? ??????????????? ????????????????????????????????? ??????????????? ?????????????????????????????? ?????????????????????, Infiniband ??????????????? "
-#~ "RDMA ??????????????????."
-
-#~ msgid "OpenFabrics Enterprise Distribution"
-#~ msgstr "??????????????????????????????????????????????????? ???????????????????????? ??????????????????"
-
-#~ msgid "Virtualization Support."
-#~ msgstr "?????????????????????????????????????????? ??????????????????."



From airlied at fedoraproject.org  Mon Sep 29 06:46:07 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 29 Sep 2008 06:46:07 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-exa-fixes.patch, 1.1,
	1.2 xorg-x11-drv-ati.spec, 1.118,
	1.119 radeon-dont-flush-new-pixmaps.patch, 1.1, NONE
Message-ID: <20080929064607.A2EC27013F@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-serv15424

Modified Files:
	radeon-exa-fixes.patch xorg-x11-drv-ati.spec 
Removed Files:
	radeon-dont-flush-new-pixmaps.patch 
Log Message:
- fix textured video + merge otaylor fix into exa fixes patch


radeon-exa-fixes.patch:

Index: radeon-exa-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-exa-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- radeon-exa-fixes.patch	26 Sep 2008 01:41:42 -0000	1.1
+++ radeon-exa-fixes.patch	29 Sep 2008 06:45:37 -0000	1.2
@@ -1,11 +1,69 @@
-commit 05f489fc270f3af78189b6f5d1f0ed46a99dbf1b
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Sep 26 11:38:36 2008 +1000
-
-    radeon: fix the offset checks for command submission
-    
-    since we are relocating in the kernel we don't need these
-
+diff --git a/src/radeon.h b/src/radeon.h
+index 32bfa4e..aeea221 100644
+--- a/src/radeon.h
++++ b/src/radeon.h
+@@ -408,6 +408,11 @@ typedef struct _atomBiosHandle *atomBiosHandlePtr;
+ 
+ #define RADEON_POOL_GART 0
+ #define RADEON_POOL_VRAM 1
++
++struct radeon_exa_pixmap_priv {
++    dri_bo *bo;
++    int flags;
++};
+     
+ typedef struct {
+     uint32_t pci_device_id;
+diff --git a/src/radeon_bufmgr_gem.c b/src/radeon_bufmgr_gem.c
+index db28edc..d7b5644 100644
+--- a/src/radeon_bufmgr_gem.c
++++ b/src/radeon_bufmgr_gem.c
+@@ -528,3 +528,10 @@ void radeon_bufmgr_emit_reloc(dri_bo *buf, uint32_t *head, uint32_t *count_p, ui
+ 	radeon_bufmgr = (struct radeon_bufmgr *)(buf->bufmgr + 1);
+ 	radeon_bufmgr->emit_reloc(buf, head, count_p, read_domains, write_domain);
+ }
++
++int radeon_bufmgr_gem_in_vram(dri_bo *buf)
++{
++	dri_bo_gem *gem_bo = (dri_bo_gem *)buf;
++	
++	return gem_bo->in_vram;
++}
+diff --git a/src/radeon_bufmgr_gem.h b/src/radeon_bufmgr_gem.h
+index e2f1ca6..d67ddf6 100644
+--- a/src/radeon_bufmgr_gem.h
++++ b/src/radeon_bufmgr_gem.h
+@@ -11,4 +11,5 @@ void radeon_bufmgr_post_submit(dri_bufmgr *bufmgr);
+ void radeon_bufmgr_pin(dri_bo *buf);
+ void radeon_bufmgr_unpin(dri_bo *buf);
+ uint32_t radeon_bufmgr_get_handle(dri_bo *buf);
++int radeon_bufmgr_gem_in_vram(dir_bo *buf);
+ #endif
+diff --git a/src/radeon_exa.c b/src/radeon_exa.c
+index 555ae16..4d0a582 100644
+--- a/src/radeon_exa.c
++++ b/src/radeon_exa.c
+@@ -50,10 +50,6 @@
+ #define RADEON_PIXMAP_IS_FRONTBUFFER 1
+ 
+ /* quick hacks lolz */
+-struct radeon_exa_pixmap_priv {
+-    dri_bo *bo;
+-    int flags;
+-};
+ 
+ /***********************************************************************/
+ #define RINFO_FROM_SCREEN(pScr) ScrnInfoPtr pScrn =  xf86Screens[pScr->myNum]; \
+@@ -235,7 +231,8 @@ static Bool RADEONPrepareAccess(PixmapPtr pPix, int index)
+ 	if (driver_priv->bo) {
+ 	    int ret;
+ 
+-	    RADEONCPFlushIndirect(pScrn, 0);
++	    if (radeon_bufmgr_gem_in_vram (driver_priv->bo))
++		RADEONCPFlushIndirect(pScrn, 0);
+ 
+ 	    //radeon_bufmgr_gem_wait_rendering(driver_priv->bo);
+ 
 diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
 index 456cefe..8f98e92 100644
 --- a/src/radeon_exa_render.c
@@ -32,3 +90,218 @@
  	RADEON_FALLBACK(("Bad destination offset 0x%x\n", (int)dst_offset));
      if (((dst_pitch >> pixel_shift) & 0x7) != 0)
  	RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch));
+diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
+index 9682ad8..f93cded 100644
+--- a/src/radeon_textured_video.c
++++ b/src/radeon_textured_video.c
+@@ -199,10 +199,13 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+ 
+     if (pPriv->video_memory == NULL) {
+ 	pPriv->video_offset = RADEONAllocateMemory(pScrn,
+-						       &pPriv->video_memory,
+-						       size * 2);
++						   &pPriv->video_memory,
++						   size * 2);
+ 	if (pPriv->video_offset == 0)
+ 	    return BadAlloc;
++
++	if (info->new_cs)
++	    pPriv->src_bo = pPriv->video_memory;
+     }
+ 
+     /* Bicubic filter loading */
+@@ -215,6 +218,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+ 	pPriv->bicubic_src_offset = pPriv->bicubic_offset + info->fbLocation + pScrn->fbOffset;
+ 	if (pPriv->bicubic_offset == 0)
+ 		pPriv->bicubic_enabled = FALSE;
++
++	if (info->new_cs)
++	    pPriv->bicubic_bo = pPriv->bicubic_memory;
+     }
+ 
+     if (pDraw->type == DRAWABLE_WINDOW)
+@@ -245,7 +251,14 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+     npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left;
+ 
+     pPriv->src_offset = pPriv->video_offset;
+-    if (info->drm_mm) {
++    if (info->new_cs) {
++	int ret;
++	ret = dri_bo_map(pPriv->src_bo, 1);
++	if (ret) 
++	    return BadAlloc;
++      
++	pPriv->src_addr = pPriv->src_bo->virtual;
++    } else if (info->drm_mm) {
+         pPriv->src_addr = (uint8_t *)(info->mm.front_buffer->map + pPriv->video_offset + (top * dstPitch));
+     } else {
+         pPriv->src_addr = (uint8_t *)(info->FB + pPriv->video_offset + (top * dstPitch));
+@@ -290,8 +303,24 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+     }
+ 
+     /* Upload bicubic filter tex */
+-    if (pPriv->bicubic_enabled)
+-	RADEONCopyData(pScrn, (uint8_t *)bicubic_tex_512, (uint8_t *)(info->FB + pPriv->bicubic_offset), 1024, 1024, 1, 512, 2);
++    if (pPriv->bicubic_enabled) {
++	uint8_t *bicubic_addr;
++	int ret;
++
++	if (info->new_cs) {
++	    ret = dri_bo_map(pPriv->bicubic_bo, 1);
++	    if (ret)
++		return BadAlloc;
++
++	    bicubic_addr = pPriv->bicubic_bo->virtual;
++	} else
++	    bicubic_addr = (uint8_t *)(info->FB + pPriv->bicubic_offset);
++	
++	RADEONCopyData(pScrn, (uint8_t *)bicubic_tex_512, bicubic_addr, 1024, 1024, 1, 512, 2);
++	
++	if (info->new_cs)
++	    dri_bo_unmap(pPriv->bicubic_bo);
++    }
+ 
+     /* update cliplist */
+     if (!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) {
+@@ -308,6 +337,8 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+     pPriv->w = width;
+     pPriv->h = height;
+ 
++    if (info->new_cs)
++	dri_bo_unmap(pPriv->src_bo);
+ #ifdef XF86DRI
+     if (info->directRenderingEnabled || info->drm_mode_setting)
+ 	RADEONDisplayTexturedVideoCP(pScrn, pPriv);
+diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
+index 1e9f3b1..d3574f4 100644
+--- a/src/radeon_textured_videofuncs.c
++++ b/src/radeon_textured_videofuncs.c
+@@ -95,6 +95,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ {
+     RADEONInfoPtr info = RADEONPTR(pScrn);
+     PixmapPtr pPixmap = pPriv->pPixmap;
++    struct radeon_exa_pixmap_priv *driver_priv;
++    dri_bo *dst_bo;
+     uint32_t txformat;
+     uint32_t txfilter, txformat0, txformat1, txoffset, txpitch;
+     uint32_t dst_offset, dst_pitch, dst_format;
+@@ -110,7 +112,13 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 
+ #ifdef USE_EXA
+     if (info->useEXA) {
+-	dst_offset = exaGetPixmapOffset(pPixmap);
++	if (info->new_cs) {
++	    driver_priv = exaGetPixmapDriverPrivate(pPixmap);
++	    if (driver_priv)
++		dst_bo = driver_priv->bo;
++	} else {
++	    dst_offset = exaGetPixmapOffset(pPixmap);
++	}
+ 	dst_pitch = exaGetPixmapPitch(pPixmap);
+     } else
+ #endif
+@@ -219,8 +227,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 	OUT_VIDEO_REG(R300_TX_FORMAT2_0, txpitch);
+ 
+ 	if (info->new_cs) {
+-	    OUT_VIDEO_REG(R300_TX_OFFSET_0, txoffset);
+-	    OUT_RELOC(info->mm.front_buffer->kernel_bo_handle, RADEON_GEM_DOMAIN_VRAM | RADEON_GEM_DOMAIN_GTT, 0);
++	    OUT_VIDEO_REG(R300_TX_OFFSET_0, 0);
++	    OUT_RELOC(pPriv->src_bo, RADEON_GEM_DOMAIN_VRAM | RADEON_GEM_DOMAIN_GTT, 0);
+ 	} else {
+ 	    txoffset += info->fbLocation + pScrn->fbOffset;
+ 	    OUT_VIDEO_REG(R300_TX_OFFSET_0, txoffset);
+@@ -245,13 +253,20 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 			    R300_TX_MAG_FILTER_NEAREST |
+ 			    (1 << R300_TX_ID_SHIFT));
+ 
+-		BEGIN_VIDEO(6);
++		qwords = info->new_cs ? 8 : 6;
++		BEGIN_VIDEO(qwords);
+ 		OUT_VIDEO_REG(R300_TX_FILTER0_1, txfilter);
+ 		OUT_VIDEO_REG(R300_TX_FILTER1_1, 0);
+ 		OUT_VIDEO_REG(R300_TX_FORMAT0_1, txformat0);
+ 		OUT_VIDEO_REG(R300_TX_FORMAT1_1, txformat1);
+ 		OUT_VIDEO_REG(R300_TX_FORMAT2_1, txpitch);
+-		OUT_VIDEO_REG(R300_TX_OFFSET_1, pPriv->bicubic_src_offset);
++
++		if (info->new_cs) {
++		    OUT_VIDEO_REG(R300_TX_OFFSET_1, 0);
++		    OUT_RELOC(pPriv->bicubic_bo, RADEON_GEM_DOMAIN_VRAM | RADEON_GEM_DOMAIN_GTT, 0);
++		} else {
++		    OUT_VIDEO_REG(R300_TX_OFFSET_1, pPriv->bicubic_src_offset);
++		}
+ 		FINISH_VIDEO();
+ 
+ 		/* Enable tex 1 */
+@@ -994,8 +1009,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 	OUT_VIDEO_REG(R300_TX_ENABLE, txenable);
+ 
+ 	if (info->new_cs) {
+-	    OUT_VIDEO_REG(R300_RB3D_COLOROFFSET0, dst_offset);
+-	    OUT_RELOC(info->mm.front_buffer->kernel_bo_handle, 0, RADEON_GEM_DOMAIN_VRAM);
++	    OUT_VIDEO_REG(R300_RB3D_COLOROFFSET0, 0);
++	    OUT_RELOC(dst_bo, 0, RADEON_GEM_DOMAIN_VRAM);
+ 	} else {
+ 	    dst_offset += info->fbLocation + pScrn->fbOffset;
+ 	    OUT_VIDEO_REG(R300_RB3D_COLOROFFSET0, dst_offset);
+diff --git a/src/radeon_video.c b/src/radeon_video.c
+index a7ea788..d708bf8 100644
+--- a/src/radeon_video.c
++++ b/src/radeon_video.c
+@@ -2180,7 +2180,7 @@ RADEONCopyData(
+ 
+ #ifdef XF86DRI
+ 
+-    if ( info->directRenderingEnabled && info->DMAForXv )
++    if ( info->directRenderingEnabled && info->DMAForXv && !info->new_cs )
+     {
+ 	uint8_t *buf;
+ 	uint32_t bufPitch, dstPitchOff;
+@@ -2443,6 +2443,20 @@ RADEONAllocateMemory(
+     int offset = 0;
+ 
+     pScreen = screenInfo.screens[pScrn->scrnIndex];
++
++    if (info->new_cs) {
++	dri_bo *video_bo;
++
++	video_bo = dri_bo_alloc(info->bufmgr, "xv pixmap", size, 4096);
++
++	*mem_struct = video_bo;
++
++	if (!video_bo)
++	    return 0;
++	
++	return (uint32_t)-1;
++
++    }
+ #ifdef USE_EXA
+     if (info->useEXA) {
+ 	ExaOffscreenArea *area = *mem_struct;
+@@ -2516,6 +2530,11 @@ RADEONFreeMemory(
+ ){
+     RADEONInfoPtr info = RADEONPTR(pScrn);
+ 
++    if (info->new_cs) {
++	struct dri_bo *bo = mem_struct;
++	dri_bo_free(bo);
++	return;
++    }
+ #ifdef USE_EXA
+     if (info->useEXA) {
+ 	ExaOffscreenArea *area = mem_struct;
+diff --git a/src/radeon_video.h b/src/radeon_video.h
+index b9d900d..0687969 100644
+--- a/src/radeon_video.h
++++ b/src/radeon_video.h
+@@ -114,6 +114,9 @@ typedef struct {
+     int src_w, src_h, dst_w, dst_h;
+     int w, h;
+     int drw_x, drw_y;
++
++    dri_bo *src_bo;
++    dri_bo *bicubic_bo;
+ } RADEONPortPrivRec, *RADEONPortPrivPtr;
+ 
+ void RADEONInitI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);


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.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- xorg-x11-drv-ati.spec	26 Sep 2008 21:16:01 -0000	1.118
+++ xorg-x11-drv-ati.spec	29 Sep 2008 06:45:37 -0000	1.119
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   18%{?dist}
+Release:   19%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -20,7 +20,6 @@
 Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     copy-fb-contents.patch
-Patch7:     radeon-dont-flush-new-pixmaps.patch
 
 ExcludeArch: s390 s390x
 
@@ -45,7 +44,6 @@
 %patch4 -p1 -b .remove-limit-heuristics
 %patch5 -p1 -b .panel-size
 %patch6 -p1 -b .copy-fb-contents
-%patch7 -p1 -b .dont-flush
 
 %build
 autoreconf
@@ -77,6 +75,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Mon Sep 29 2008 Dave Airlie <airlied at redhat.com> 6.9.0-19
+- fix textured video + merge otaylor fix into exa fixes patch
+
 * Sat Sep 27 2008 Dave Airlie <airlied at redhat.com> 6.9.0-18
 - fix fb contents patch
 - EXA speedup from otaylor.


--- radeon-dont-flush-new-pixmaps.patch DELETED ---



From mintojoseph at fedoraproject.org  Mon Sep 29 06:50:52 2008
From: mintojoseph at fedoraproject.org (Minto Joseph)
Date: Mon, 29 Sep 2008 06:50:52 +0000 (UTC)
Subject: rpms/myanmar3-unicode-fonts/F-9 import.log, NONE,
	1.1 myanmar3-unicode-fonts-fontconfig.conf, NONE,
	1.1 myanmar3-unicode-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20080929065052.7A9F170110@cvs1.fedora.phx.redhat.com>

Author: mintojoseph

Update of /cvs/pkgs/rpms/myanmar3-unicode-fonts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16226/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log myanmar3-unicode-fonts-fontconfig.conf 
	myanmar3-unicode-fonts.spec 
Log Message:

 Modified Files:
 	F-9/.cvsignore F-9/sources 
 Added Files:
 	F-9/import.log F-9/myanmar3-unicode-fonts-fontconfig.conf 
 	F-9/myanmar3-unicode-fonts.spec 



--- NEW FILE import.log ---
myanmar3-unicode-fonts-3_00-1_fc8:F-9:myanmar3-unicode-fonts-3.00-1.fc8.src.rpm:1222669827


--- NEW FILE myanmar3-unicode-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>myanmar3-unicode</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>myanmar3-unicode</family>
    </prefer>
  </alias>
</fontconfig>


--- NEW FILE myanmar3-unicode-fonts.spec ---
%define fontname    myanmar3-unicode
%define fontdir     %{_datadir}/fonts/%{fontname}
%define fontconfdir %{_sysconfdir}/fonts/conf.d

%define archivename Myanmar3_Unicode 


Name:    %{fontname}-fonts
Version: 3.00
Release: 1%{?dist}
Summary: Myanmar3 unicode font

Group:   User Interface/X
License: LGPLv2+
URL:    http://www.myanmarnlp.net.mm 
Source0: http://www.myanmarnlp.net.mm/downloads/%{archivename}.zip
Source1: %{name}-fontconfig.conf

BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch

%description
Myanmar3 unicode font from 
Myanmar Unicode & NLP Research Center

%prep
%setup -q -c
unzip -j -L -q %{SOURCE0}


%build
# Nothing there


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{fontdir}
install -m 0644 -p *.ttf %{buildroot}%{fontdir}

install -m 0755 -d %{buildroot}%{fontconfdir}
install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/65-%{fontname}.conf


%clean
rm -fr %{buildroot}


%post
if [ -x %{_bindir}/fc-cache ] ; then
    %{_bindir}/fc-cache %{fontdir} || :
fi


%postun
if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
    %{_bindir}/fc-cache %{fontdir} || :
fi


%files
%defattr(0644,root,root,0755)

%config(noreplace) %{fontconfdir}/65-%{fontname}.conf

%dir %{fontdir}/
%{fontdir}/*.ttf


%changelog

* Fri Aug 01 2008 Minto Joseph <mvaliyav at redhat.com> - 3.00-1 
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/myanmar3-unicode-fonts/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Aug 2008 17:28:25 -0000	1.1
+++ .cvsignore	29 Sep 2008 06:50:21 -0000	1.2
@@ -0,0 +1 @@
+Myanmar3_Unicode.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/myanmar3-unicode-fonts/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Aug 2008 17:28:25 -0000	1.1
+++ sources	29 Sep 2008 06:50:22 -0000	1.2
@@ -0,0 +1 @@
+1cae8ab0ea5c5a369b73cb70a24fe9dd  Myanmar3_Unicode.zip



From cscott at fedoraproject.org  Mon Sep 29 06:54:56 2008
From: cscott at fedoraproject.org (C. Scott Ananian)
Date: Mon, 29 Sep 2008 06:54:56 +0000 (UTC)
Subject: rpms/sugar/OLPC-3 cpuleak.patch,NONE,1.1 sugar.spec,1.26,1.27
Message-ID: <20080929065456.9893C70110@cvs1.fedora.phx.redhat.com>

Author: cscott

Update of /cvs/pkgs/rpms/sugar/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16838

Modified Files:
	sugar.spec 
Added Files:
	cpuleak.patch 
Log Message:
dlo trac #8711:  fix CPU leak (1-2% with each activity launched)


cpuleak.patch:

--- NEW FILE cpuleak.patch ---
diff --git a/src/view/launchwindow.py b/src/view/launchwindow.py
index d954abc..e44b998 100644
--- a/src/view/launchwindow.py
+++ b/src/view/launchwindow.py
@@ -82,6 +82,7 @@ class LaunchBox(hippo.CanvasBox):
         self.connect('destroy', self.__destroy_cb)
 
     def __destroy_cb(self, box):
+        self._activity_icon.props.pulsing = False
         self._home.disconnect_by_func(self.__active_activity_changed_cb)
 
     def zoom_in(self):


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sugar.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sugar.spec	25 Sep 2008 19:18:06 -0000	1.26
+++ sugar.spec	29 Sep 2008 06:54:26 -0000	1.27
@@ -4,7 +4,7 @@
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.82.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/sugar
@@ -16,6 +16,8 @@
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: cpuleak.patch
+
 BuildRequires: pkgconfig
 BuildRequires: perl-XML-Parser
 BuildRequires: gettext
@@ -49,6 +51,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .cpuleak
+
 %build
 %configure
 make
@@ -93,6 +97,9 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Mon Sep 29 2008 C. Scott Ananian <cscott at laptop.org> - 0.82.9-2
+- #8711 fix CPU leak (1-2% with each activity launched)
+
 * Thu Sep 25 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.9-1
 - #7969 Accidental searches lead to a "blank" Home screen
 - #8662 xo man jumps around while zooming



From sharkcz at fedoraproject.org  Mon Sep 29 06:54:57 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 29 Sep 2008 06:54:57 +0000 (UTC)
Subject: rpms/wxPython/devel .cvsignore, 1.12, 1.13 sources, 1.10,
	1.11 wxPython.spec, 1.27,
	1.28 wxPython-src-2.8.7.1-bug450073.patch, 1.2, NONE
Message-ID: <20080929065457.28D7670110@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxPython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17044

Modified Files:
	.cvsignore sources wxPython.spec 
Removed Files:
	wxPython-src-2.8.7.1-bug450073.patch 
Log Message:
* Mon Sep 29 2008 Dan Horak <dan[at]danny.cz> - 2.8.9.0-1
- update to 2.8.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	31 Jul 2008 18:15:34 -0000	1.12
+++ .cvsignore	29 Sep 2008 06:54:26 -0000	1.13
@@ -1 +1 @@
-wxPython-src-2.8.8.0.tar.bz2
+wxPython-src-2.8.9.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	31 Jul 2008 18:15:34 -0000	1.10
+++ sources	29 Sep 2008 06:54:26 -0000	1.11
@@ -1 +1 @@
-87b974dda37e7ae4ac25a0d0c94ec8a5  wxPython-src-2.8.8.0.tar.bz2
+0e5f5a61c171e33c29de6582e422b481  wxPython-src-2.8.9.0.tar.bz2


Index: wxPython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/devel/wxPython.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- wxPython.spec	6 Sep 2008 21:32:51 -0000	1.27
+++ wxPython.spec	29 Sep 2008 06:54:26 -0000	1.28
@@ -4,8 +4,8 @@
 %define buildflags WXPORT=gtk2 UNICODE=1
 
 Name:           wxPython
-Version:        2.8.8.0
-Release:        2%{?dist}
+Version:        2.8.9.0
+Release:        1%{?dist}
 
 Summary:        GUI toolkit for the Python programming language
 
@@ -15,7 +15,7 @@
 Source0:        http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # make sure to keep this updated as appropriate
-BuildRequires:  wxGTK-devel >= 2.8.8
+BuildRequires:  wxGTK-devel >= 2.8.9
 BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
 BuildRequires:  libGL-devel, libGLU-devel
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Dan Horak <dan[at]danny.cz> - 2.8.9.0-1
+- update to 2.8.9.0
+
 * Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.8.0-2
 - fix license tag
 


--- wxPython-src-2.8.7.1-bug450073.patch DELETED ---



From airlied at fedoraproject.org  Mon Sep 29 06:55:39 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 29 Sep 2008 06:55:39 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel copy-fb-contents.patch, 1.3,
	1.4 xorg-x11-drv-ati.spec, 1.119, 1.120
Message-ID: <20080929065539.87ABA70110@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-serv17207

Modified Files:
	copy-fb-contents.patch xorg-x11-drv-ati.spec 
Log Message:
- fix collision with copy fb contents patch


copy-fb-contents.patch:

Index: copy-fb-contents.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/copy-fb-contents.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- copy-fb-contents.patch	26 Sep 2008 21:13:31 -0000	1.3
+++ copy-fb-contents.patch	29 Sep 2008 06:55:09 -0000	1.4
@@ -26,15 +26,10 @@
  static Bool drmmode_resize_fb(ScrnInfoPtr scrn, drmmode_ptr drmmode, int width, int height);
  
  static Bool
-@@ -119,6 +122,76 @@ drmmode_crtc_dpms(xf86CrtcPtr drmmode_crtc, int mode)
+@@ -119,6 +122,71 @@ drmmode_crtc_dpms(xf86CrtcPtr drmmode_crtc, int mode)
  
  }
  
-+struct radeon_exa_pixmap_priv {
-+    dri_bo *bo;
-+    int flags;
-+};
-+
 +static PixmapPtr
 +create_pixmap_for_fb(drmmode_ptr drmmode, ScrnInfoPtr pScrn, drmModeFBPtr fb)
 +{
@@ -103,7 +98,7 @@
  static Bool
  drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  		     Rotation rotation, int x, int y)
-@@ -174,7 +247,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -174,7 +242,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  	fb_id = drmmode->fb_id;
  	if (drmmode_crtc->rotate_fb_id)
  		fb_id = drmmode_crtc->rotate_fb_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.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- xorg-x11-drv-ati.spec	29 Sep 2008 06:45:37 -0000	1.119
+++ xorg-x11-drv-ati.spec	29 Sep 2008 06:55:09 -0000	1.120
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   19%{?dist}
+Release:   20%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -75,6 +75,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Mon Sep 29 2008 Dave Airlie <airlied at redhat.com> 6.9.0-20
+- fix collision with copy fb contents patch
+
 * Mon Sep 29 2008 Dave Airlie <airlied at redhat.com> 6.9.0-19
 - fix textured video + merge otaylor fix into exa fixes patch
 



From petersen at fedoraproject.org  Mon Sep 29 07:09:27 2008
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 29 Sep 2008 07:09:27 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.119,1.120
Message-ID: <20080929070927.39C9070110@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18699

Modified Files:
	comps-f10.xml.in 
Log Message:
add eclipse-nls langpacks


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- comps-f10.xml.in	26 Sep 2008 17:17:19 -0000	1.119
+++ comps-f10.xml.in	29 Sep 2008 07:08:54 -0000	1.120
@@ -70,6 +70,7 @@
     <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>
@@ -435,6 +436,7 @@
     <langonly>pt_BR</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-pt</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-pt_BR</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-pt</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Brazil</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Brazil</packagereq>
@@ -509,6 +511,7 @@
     <langonly>bg</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-bg</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-bg</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-bg</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Bulgarian</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Bulgarian</packagereq>
@@ -559,6 +562,8 @@
     <packagelist>
       <packagereq type="mandatory">cjkunifonts-ukai</packagereq>
       <packagereq type="mandatory">cjkunifonts-uming</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-zh</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-zh_TW</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Chinese</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Chinese-Big5</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Chinese</packagereq>
@@ -687,6 +692,7 @@
     <langonly>cs</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-cs</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-cs</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-cs</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-cs</packagereq>
       <packagereq type="conditional" requires="hyphen">hyphen-cs</packagereq>
@@ -710,6 +716,7 @@
     <langonly>da</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-da</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-da</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-da</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-da</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Danish</packagereq>
@@ -1010,6 +1017,7 @@
     <langonly>nl</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-nl</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-nl</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-nl</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-nl</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Dutch</packagereq>
@@ -1337,6 +1345,7 @@
     <uservisible>false</uservisible>
     <langonly>fi</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-fi</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-fi</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Finnish</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Finnish</packagereq>
@@ -1487,6 +1496,7 @@
     <langonly>fr</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-fr</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-fr</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-fr</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-fr</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-French</packagereq>
@@ -1802,6 +1812,7 @@
     <langonly>de</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-de</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-de</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-de</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-de</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-German</packagereq>
@@ -2191,6 +2202,7 @@
     <langonly>el</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-el</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-el</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-el</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-el</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Greek</packagereq>
@@ -2320,6 +2332,7 @@
     <packagelist>
       <packagereq type="mandatory">dejavu-fonts</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-he</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-he</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-he</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Hebrew</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-he</packagereq>
@@ -2363,6 +2376,7 @@
     <langonly>hu</langonly>
     <packagelist>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-hu</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-hu</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-hu</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Hungarian</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Hungarian</packagereq>
@@ -2564,6 +2578,7 @@
     <langonly>it</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-it</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-it</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-it</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-it</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Italian</packagereq>
@@ -2585,6 +2600,7 @@
     <langonly>ja</langonly>
     <packagelist>
       <packagereq type="mandatory">VLGothic-fonts</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-ja</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Japanese</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Japanese</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-ja</packagereq>
@@ -2974,6 +2990,7 @@
     <langonly>ko</langonly>
     <packagelist>
       <packagereq type="mandatory">un-core-fonts-dotum</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-ko</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Korean</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Korean</packagereq>
       <packagereq type="conditional" requires="man-pages">man-pages-ko</packagereq>
@@ -3422,6 +3439,7 @@
     <langonly>nb</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-no</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-no</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-nb</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-nb</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-nn</packagereq>
@@ -3551,6 +3569,7 @@
     <langonly>pl</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-pl</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-pl</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-pl</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Polish</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Polish</packagereq>
@@ -3573,6 +3592,7 @@
     <langonly>pt</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-pt</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-pt</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-pt</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-pt</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Portuguese</packagereq>
@@ -3632,6 +3652,7 @@
     <langonly>ro</langonly>
     <packagelist>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Romanian</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-ro</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ro</packagereq>
       <packagereq type="optional">fonts-ISO8859-2</packagereq>
       <packagereq type="optional">fonts-ISO8859-2-100dpi</packagereq>
@@ -3661,6 +3682,7 @@
     <langonly>ru</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-ru</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-ru</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-ru</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ru</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Russian</packagereq>
@@ -3975,6 +3997,7 @@
     <langonly>es</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-es</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-es</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-es</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-es</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Spanish</packagereq>
@@ -4050,6 +4073,7 @@
     <langonly>sv</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-sv</packagereq>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-sv</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-sv</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-sv</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Swedish</packagereq>
@@ -4423,6 +4447,7 @@
     <uservisible>false</uservisible>
     <langonly>tr</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-tr</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-tr</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Turkish</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Turkish</packagereq>
@@ -4441,6 +4466,7 @@
     <uservisible>false</uservisible>
     <langonly>uk</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-uk</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Ukrainian</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Ukrainian</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-uk</packagereq>



From pkgdb at fedoraproject.org  Mon Sep 29 07:40:59 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 29 Sep 2008 07:40:59 +0000
Subject: [pkgdb] time had acl change status
Message-ID: <20080929074100.0F0B3208D72@bastion.fedora.phx.redhat.com>

rrakus has set the commit acl on time (Fedora devel) to Approved for kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/time



From sereinit at fedoraproject.org  Mon Sep 29 07:42:24 2008
From: sereinit at fedoraproject.org (=?utf-8?q?Marcelin_Beno=C3=AEt?=)
Date: Mon, 29 Sep 2008 07:42:24 +0000 (UTC)
Subject: rpms/gbrainy/F-8 .cvsignore, 1.3, 1.4 gbrainy.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <20080929074225.174E970110@cvs1.fedora.phx.redhat.com>

Author: sereinit

Update of /cvs/pkgs/rpms/gbrainy/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21714

Modified Files:
	.cvsignore gbrainy.spec sources 
Log Message:
Update to 1.00



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Jun 2008 20:45:19 -0000	1.3
+++ .cvsignore	29 Sep 2008 07:41:52 -0000	1.4
@@ -1 +1 @@
-gbrainy-0.70.tar.gz
+gbrainy-1.00.tar.gz


Index: gbrainy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/F-8/gbrainy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gbrainy.spec	24 Jul 2008 18:08:53 -0000	1.5
+++ gbrainy.spec	29 Sep 2008 07:41:52 -0000	1.6
@@ -3,8 +3,8 @@
 # http://fedoraproject.org/wiki/Packaging/Debuginfo#head-29573c4f61c3a4698b2d07c7e73cfa194785f257
 
 Name:		gbrainy
-Version:	0.70
-Release:	4%{?dist}
+Version:	1.00
+Release:	1%{?dist}
 Summary:	Gbrainy is a brain teaser game and trainer to keep your brain trained
 
 Group:		Amusements/Games
@@ -13,8 +13,8 @@
 Source0:	http://www.softcatala.org/~jmas/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	mono-devel intltool gettext
-BuildRequires:  gnome-sharp-devel libglade2-devel gtk-sharp2-devel
+BuildRequires:	mono-devel intltool librsvg2-devel
+BuildRequires:	gtk-sharp2-devel gnome-sharp-devel
 BuildRequires:  /usr/bin/desktop-file-install
 
 # Mono only availible on these:
@@ -34,6 +34,9 @@
 
 %prep
 %setup -q
+# To fix 460353 :
+sed 's#share/games#share#' src/Defines.cs.in -i
+sed 's#^images = $(datadir)/games/gbrainy$#images = $(datadir)/gbrainy#' data/Makefile.in -i
 
 %build
 %configure
@@ -48,6 +51,9 @@
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
+# To fix a rpmlint issue
+chmod a-x $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}.exe.config
+
 %find_lang %{name}
 
 %clean
@@ -71,20 +77,21 @@
 %{_bindir}/%{name}
 %{_libdir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/games/%{name}
+%{_datadir}/%{name}
 %{_datadir}/icons/hicolor/*/apps/%{name}*
 %{_mandir}/man6/%{name}.6.gz
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
-* Tue Jul 24 2008 Beno??t Marcelin <sereinity at online.fr> 0.70-4
-- Rebuild for dependencies
-
-* Tue Jun 03 2008 Beno??t Marcelin <sereinity at online.fr> 0.70-3
-- Don't generate empty debuginfo in Fedora <= 8
-
-* Tue Jun 03 2008 Beno??t Marcelin <sereinity at online.fr> 0.70-2
-- Fix BuildRequires for Fedora <= 8
+* Thu Sep 25 2008 Beno??t Marcelin <sereinity at online.fr> 1.00-1
+- Clean Build Requires
+- Fix bug 460353
+- Upate to 1.00
+- 1 new logic puzzle, 1 new memory puzzle
+- Better look and feel (new background)
+- Switch font drawing to Pango
+- Better I18N support
+- Bug fixes 
 
 * Tue Jun 03 2008 Beno??t Marcelin <sereinity at online.fr> 0.70-1
 - Update to 0.70


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Jun 2008 20:45:19 -0000	1.3
+++ sources	29 Sep 2008 07:41:52 -0000	1.4
@@ -1 +1 @@
-5eee76e379fc7db9ec05d2e577ecc10d  gbrainy-0.70.tar.gz
+adff790db643e846cb15c6142f2411ae  gbrainy-1.00.tar.gz



From alexlan at fedoraproject.org  Mon Sep 29 07:46:43 2008
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Mon, 29 Sep 2008 07:46:43 +0000 (UTC)
Subject: rpms/Miro/F-8 sources, 1.9, 1.10 Miro.spec, 1.19, 1.20 .cvsignore,
	1.9, 1.10
Message-ID: <20080929074643.6F75B70110@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/Miro/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22134

Modified Files:
	sources Miro.spec .cvsignore 
Log Message:
- Update to latest upstream (1.2.7)



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Apr 2008 04:32:26 -0000	1.9
+++ sources	29 Sep 2008 07:46:12 -0000	1.10
@@ -1 +1 @@
-a617324bee59ff83549ed44d9e96eed5  Miro-1.2.3.tar.gz
+b213dda4a347c9b648a28ea26c60f851  Miro-1.2.7.tar.gz


Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-8/Miro.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Miro.spec	24 Sep 2008 02:15:07 -0000	1.19
+++ Miro.spec	29 Sep 2008 07:46:12 -0000	1.20
@@ -4,8 +4,8 @@
 %define gecko_ver 1.8.1.17
 
 Name:           Miro
-Version:        1.2.3
-Release:        4%{?dist}
+Version:        1.2.7
+Release:        1%{?dist}
 Summary:        Miro - Internet TV Player
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.7-1
+- Update to latest upstream (1.2.7)
+
 * Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> - 1.2.3-4
 - Rebuild against newer gecko
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Apr 2008 04:32:26 -0000	1.9
+++ .cvsignore	29 Sep 2008 07:46:12 -0000	1.10
@@ -1 +1 @@
-Miro-1.2.3.tar.gz
+Miro-1.2.7.tar.gz



From sereinit at fedoraproject.org  Mon Sep 29 07:50:34 2008
From: sereinit at fedoraproject.org (=?utf-8?q?Marcelin_Beno=C3=AEt?=)
Date: Mon, 29 Sep 2008 07:50:34 +0000 (UTC)
Subject: rpms/gbrainy/F-8 gbrainy.spec,1.6,1.7
Message-ID: <20080929075034.3A8D77013E@cvs1.fedora.phx.redhat.com>

Author: sereinit

Update of /cvs/pkgs/rpms/gbrainy/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22633

Modified Files:
	gbrainy.spec 
Log Message:
Fix Build Requires



Index: gbrainy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/F-8/gbrainy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gbrainy.spec	29 Sep 2008 07:41:52 -0000	1.6
+++ gbrainy.spec	29 Sep 2008 07:50:03 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:		gbrainy
 Version:	1.00
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Gbrainy is a brain teaser game and trainer to keep your brain trained
 
 Group:		Amusements/Games
@@ -13,7 +13,7 @@
 Source0:	http://www.softcatala.org/~jmas/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	mono-devel intltool librsvg2-devel
+BuildRequires:	mono-devel intltool librsvg2-devel gettext
 BuildRequires:	gtk-sharp2-devel gnome-sharp-devel
 BuildRequires:  /usr/bin/desktop-file-install
 
@@ -83,6 +83,9 @@
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
+* Mon Sep 29 2008 Beno??t Marcelin <sereinity at online.fr> 1.00-2
+- Fix Build Requires
+
 * Thu Sep 25 2008 Beno??t Marcelin <sereinity at online.fr> 1.00-1
 - Clean Build Requires
 - Fix bug 460353



From rrakus at fedoraproject.org  Mon Sep 29 07:53:57 2008
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Mon, 29 Sep 2008 07:53:57 +0000 (UTC)
Subject: rpms/time/devel time.spec,1.23,1.24
Message-ID: <20080929075357.6442270110@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/time/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23427

Modified Files:
	time.spec 
Log Message:
Fix Patch:/%%patch0 mismatch. Resolves: #463067


Index: time.spec
===================================================================
RCS file: /cvs/extras/rpms/time/devel/time.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- time.spec	4 Mar 2008 13:04:13 -0000	1.23
+++ time.spec	29 Sep 2008 07:53:26 -0000	1.24
@@ -1,12 +1,12 @@
 Summary: A GNU utility for monitoring a program's use of system resources
 Name: time
 Version: 1.7
-Release: 33%{?dist}
+Release: 34%{?dist}
 License: GPLv2+
 Group: Applications/System
 Url: http://www.gnu.org/software/time/
 Source: ftp://prep.ai.mit.edu/pub/gnu/%{name}/%{name}-%{version}.tar.gz
-Patch:  time-1.7-destdir.patch
+Patch0: time-1.7-destdir.patch
 Patch1: time-1.7-verbose.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
@@ -51,6 +51,10 @@
 %{_infodir}/time.info*
 
 %changelog
+* Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.7-34
+- Fix Patch:/%%patch0 mismatch.
+  Resolves: #463067
+
 * Tue Mar  4 2008 Roman Rakus <rrakus at redhat.cz> - 1.7-33
 - Added patch from JW (redhat at zacglen.com), less nonverbose output
 



From rakesh at fedoraproject.org  Mon Sep 29 08:05:52 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 29 Sep 2008 08:05:52 +0000 (UTC)
Subject: rpms/gflags/devel gflags.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080929080552.52ECD70110@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gflags/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25166/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gflags.spec import.log 
Log Message:
initial package import



--- NEW FILE gflags.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           gflags
Version:        0.9
Release:        6%{?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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-setuptools-devel

%description
The gflags package contains a library that implements commandline
flags processing. As such it's a replacement for getopt(). It has
increased flexibility, including built-in support for C++ types like
string, and the ability to define flags in the source file in which
they're used.

%package devel
Summary:        Development files for %{name}
Group:          Development/Libraries

Requires:       %{name} = %{version}-%{release}

%description devel
This package contains development files for %{name}.

%prep
%setup -q -n %{name}-%{version}

%build
%configure --disable-static

# Omit unused direct shared library dependencies.
sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool

make %{?_smp_mflags}

# build python module
cd python
CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

find $RPM_BUILD_ROOT -type f -name "*.la" -delete

# install python module
cd python
%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT

# executable permission for script
chmod 755 $RPM_BUILD_ROOT%{python_sitelib}/gflags.py

%check
# 2 out of 17 tests fail on x86_64
# disable test suite
cd python
#%{__python} %{name}_unittest.py

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc ChangeLog README COPYING
%{_bindir}/gflags_completions.sh
%{_bindir}/gflags2man.py
%{_libdir}/libgflags.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
%dir %{_includedir}/google
%{_includedir}/google/*.h

%changelog
* Thu Sep 04 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-6
- fixed for F-8 provide eggs for non setuptools package

* Thu Sep 04 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-5
- disable test suite because it failed on x86_64 (2/17)

* Thu Aug 26 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-4
- fixed %%{includedir}

* Thu Aug 14 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-3
- fixed documentation, timestamp saving
- removed chrpath & cleaned some unwanted commands
- included python module

* Sat Aug 09 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-2
- remove automake and corrected configure option

* Thu Aug 07 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-1
- Initial build


--- NEW FILE import.log ---
gflags-0_9-6_fc10:HEAD:gflags-0.9-6.fc10.src.rpm:1222674675


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 00:03:34 -0000	1.1
+++ .cvsignore	29 Sep 2008 08:05:21 -0000	1.2
@@ -0,0 +1 @@
+gflags-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 00:03:34 -0000	1.1
+++ sources	29 Sep 2008 08:05:21 -0000	1.2
@@ -0,0 +1 @@
+bd4871398e9019b241d89cc21fb62def  gflags-0.9.tar.gz



From rakesh at fedoraproject.org  Mon Sep 29 08:06:05 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 29 Sep 2008 08:06:05 +0000 (UTC)
Subject: rpms/gflags/F-9 gflags.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080929080605.1692170110@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gflags/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25267/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	gflags.spec import.log 
Log Message:
initial package import



--- NEW FILE gflags.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           gflags
Version:        0.9
Release:        6%{?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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-setuptools-devel

%description
The gflags package contains a library that implements commandline
flags processing. As such it's a replacement for getopt(). It has
increased flexibility, including built-in support for C++ types like
string, and the ability to define flags in the source file in which
they're used.

%package devel
Summary:        Development files for %{name}
Group:          Development/Libraries

Requires:       %{name} = %{version}-%{release}

%description devel
This package contains development files for %{name}.

%prep
%setup -q -n %{name}-%{version}

%build
%configure --disable-static

# Omit unused direct shared library dependencies.
sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool

make %{?_smp_mflags}

# build python module
cd python
CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

find $RPM_BUILD_ROOT -type f -name "*.la" -delete

# install python module
cd python
%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT

# executable permission for script
chmod 755 $RPM_BUILD_ROOT%{python_sitelib}/gflags.py

%check
# 2 out of 17 tests fail on x86_64
# disable test suite
cd python
#%{__python} %{name}_unittest.py

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc ChangeLog README COPYING
%{_bindir}/gflags_completions.sh
%{_bindir}/gflags2man.py
%{_libdir}/libgflags.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
%dir %{_includedir}/google
%{_includedir}/google/*.h

%changelog
* Thu Sep 04 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-6
- fixed for F-8 provide eggs for non setuptools package

* Thu Sep 04 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-5
- disable test suite because it failed on x86_64 (2/17)

* Thu Aug 26 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-4
- fixed %%{includedir}

* Thu Aug 14 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-3
- fixed documentation, timestamp saving
- removed chrpath & cleaned some unwanted commands
- included python module

* Sat Aug 09 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-2
- remove automake and corrected configure option

* Thu Aug 07 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-1
- Initial build


--- NEW FILE import.log ---
gflags-0_9-6_fc10:F-9:gflags-0.9-6.fc10.src.rpm:1222674687


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 00:03:34 -0000	1.1
+++ .cvsignore	29 Sep 2008 08:05:34 -0000	1.2
@@ -0,0 +1 @@
+gflags-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 00:03:34 -0000	1.1
+++ sources	29 Sep 2008 08:05:34 -0000	1.2
@@ -0,0 +1 @@
+bd4871398e9019b241d89cc21fb62def  gflags-0.9.tar.gz



From alexlan at fedoraproject.org  Mon Sep 29 08:07:56 2008
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Mon, 29 Sep 2008 08:07:56 +0000 (UTC)
Subject: rpms/python-biopython/devel sources, 1.5, 1.6 python-biopython.spec,
	1.10, 1.11 .cvsignore, 1.5, 1.6
Message-ID: <20080929080756.35A9D70110@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/python-biopython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25553

Modified Files:
	sources python-biopython.spec .cvsignore 
Log Message:
- Update to latest upstream (1.48)



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Jul 2008 02:40:55 -0000	1.5
+++ sources	29 Sep 2008 08:07:25 -0000	1.6
@@ -1 +1 @@
-d4906278f7f0d0054f20ea73565fdf43  biopython-1.47.tar.gz
+b049e3af8128bea68e4e86b55c6d0996  biopython-1.48.tar.gz


Index: python-biopython.spec
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/devel/python-biopython.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-biopython.spec	6 Jul 2008 02:40:55 -0000	1.10
+++ python-biopython.spec	29 Sep 2008 08:07:25 -0000	1.11
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:             python-biopython
-Version:          1.47
+Version:          1.48
 Release:          1%{?dist}
 Summary:          Python tools for computational molecular biology
 Source0:          http://biopython.org/DIST/biopython-%{version}.tar.gz
@@ -74,6 +74,9 @@
 %{python_sitearch}/BioSQL/*
 
 %changelog
+* Mon Sep 29 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.48-1
+- Update to latest upstream (1.48)
+
 * Fri Jul  4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.47-1
 - Update to latest upstream (1.47)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Jul 2008 02:40:55 -0000	1.5
+++ .cvsignore	29 Sep 2008 08:07:25 -0000	1.6
@@ -1 +1 @@
-biopython-1.47.tar.gz
+biopython-1.48.tar.gz



From alexlan at fedoraproject.org  Mon Sep 29 08:13:54 2008
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Mon, 29 Sep 2008 08:13:54 +0000 (UTC)
Subject: rpms/python-biopython/F-9 .cvsignore, 1.5, 1.6 python-biopython.spec,
	1.10, 1.11 sources, 1.5, 1.6
Message-ID: <20080929081354.DF81070110@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/python-biopython/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26613

Modified Files:
	.cvsignore python-biopython.spec sources 
Log Message:
Updating to 1.48.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Jul 2008 05:08:44 -0000	1.5
+++ .cvsignore	29 Sep 2008 08:13:24 -0000	1.6
@@ -1 +1 @@
-biopython-1.47.tar.gz
+biopython-1.48.tar.gz


Index: python-biopython.spec
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-9/python-biopython.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-biopython.spec	6 Jul 2008 05:08:44 -0000	1.10
+++ python-biopython.spec	29 Sep 2008 08:13:24 -0000	1.11
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:             python-biopython
-Version:          1.47
+Version:          1.48
 Release:          1%{?dist}
 Summary:          Python tools for computational molecular biology
 Source0:          http://biopython.org/DIST/biopython-%{version}.tar.gz
@@ -74,6 +74,9 @@
 %{python_sitearch}/BioSQL/*
 
 %changelog
+* Mon Sep 29 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.48-1
+- Update to latest upstream (1.48)
+
 * Fri Jul  4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.47-1
 - Update to latest upstream (1.47)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Jul 2008 05:08:44 -0000	1.5
+++ sources	29 Sep 2008 08:13:24 -0000	1.6
@@ -1 +1 @@
-d4906278f7f0d0054f20ea73565fdf43  biopython-1.47.tar.gz
+b049e3af8128bea68e4e86b55c6d0996  biopython-1.48.tar.gz



From alexlan at fedoraproject.org  Mon Sep 29 08:17:34 2008
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Mon, 29 Sep 2008 08:17:34 +0000 (UTC)
Subject: rpms/python-biopython/F-8 .cvsignore, 1.5, 1.6 python-biopython.spec,
	1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20080929081734.B944B70110@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/python-biopython/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27166

Modified Files:
	.cvsignore python-biopython.spec sources 
Log Message:
Update to 1.48.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Jul 2008 05:08:24 -0000	1.5
+++ .cvsignore	29 Sep 2008 08:17:04 -0000	1.6
@@ -1 +1 @@
-biopython-1.47.tar.gz
+biopython-1.48.tar.gz


Index: python-biopython.spec
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-8/python-biopython.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-biopython.spec	6 Jul 2008 05:08:24 -0000	1.8
+++ python-biopython.spec	29 Sep 2008 08:17:04 -0000	1.9
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:             python-biopython
-Version:          1.47
+Version:          1.48
 Release:          1%{?dist}
 Summary:          Python tools for computational molecular biology
 Source0:          http://biopython.org/DIST/biopython-%{version}.tar.gz
@@ -74,6 +74,9 @@
 %{python_sitearch}/BioSQL/*
 
 %changelog
+* Mon Sep 29 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.48-1
+- Update to latest upstream (1.48)
+
 * Fri Jul  4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.47-1
 - Update to latest upstream (1.47)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Jul 2008 05:08:24 -0000	1.5
+++ sources	29 Sep 2008 08:17:04 -0000	1.6
@@ -1 +1 @@
-d4906278f7f0d0054f20ea73565fdf43  biopython-1.47.tar.gz
+b049e3af8128bea68e4e86b55c6d0996  biopython-1.48.tar.gz



From mmaslano at fedoraproject.org  Mon Sep 29 08:17:56 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 29 Sep 2008 08:17:56 +0000 (UTC)
Subject: rpms/perl-PAR/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20080929081756.9C93A70110@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-PAR/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27288

Modified Files:
	.cvsignore sources 
Log Message:
* Wed Sep 24 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.983-1
- Specfile autogenerated by cpanspec 1.77.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PAR/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2008 18:59:53 -0000	1.1
+++ .cvsignore	29 Sep 2008 08:17:26 -0000	1.2
@@ -0,0 +1 @@
+PAR-0.983.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PAR/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 18:59:53 -0000	1.1
+++ sources	29 Sep 2008 08:17:26 -0000	1.2
@@ -0,0 +1 @@
+8580a7d810606b64ca22ba7b3c595866  PAR-0.983.tar.gz



From mmaslano at fedoraproject.org  Mon Sep 29 08:19:45 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 29 Sep 2008 08:19:45 +0000 (UTC)
Subject: rpms/perl-PAR/devel perl-PAR.spec,NONE,1.1
Message-ID: <20080929081945.26A6A70110@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-PAR/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27810

Added Files:
	perl-PAR.spec 
Log Message:
* Wed Sep 24 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.983-1
- Specfile autogenerated by cpanspec 1.77.



--- NEW FILE perl-PAR.spec ---
Name:           perl-PAR
Version:        0.983
Release:        1%{?dist}
Summary:        Perl Archive Toolkit
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/PAR/
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)
BuildRequires:  perl(PAR::Dist) >= 0.32
Requires:       perl(Archive::Zip) >= 1
Requires:       perl(Compress::Zlib) >= 1.3
Requires:       perl(PAR::Dist) >= 0.32
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module lets you use special zip files, called Perl Archives, as
libraries from which Perl modules can be loaded.

%prep
%setup -q -n PAR-%{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 AUTHORS ChangeLog README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Sep 24 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.983-1
- Specfile autogenerated by cpanspec 1.77.



From mmaslano at fedoraproject.org  Mon Sep 29 08:21:32 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 29 Sep 2008 08:21:32 +0000 (UTC)
Subject: rpms/perl-PAR/devel perl-PAR.spec,1.1,1.2
Message-ID: <20080929082132.E804C70110@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-PAR/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28064

Modified Files:
	perl-PAR.spec 
Log Message:
* Wed Sep 24 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.983-1
- Specfile autogenerated by cpanspec 1.77.



Index: perl-PAR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PAR/devel/perl-PAR.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-PAR.spec	29 Sep 2008 08:19:44 -0000	1.1
+++ perl-PAR.spec	29 Sep 2008 08:21:02 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-PAR
 Version:        0.983
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl Archive Toolkit
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,5 +52,5 @@
 %{_mandir}/man3/*
 
 %changelog
-* Wed Sep 24 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.983-1
+* Wed Sep 24 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.983-2
 - Specfile autogenerated by cpanspec 1.77.



From rakesh at fedoraproject.org  Mon Sep 29 08:30:03 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 29 Sep 2008 08:30:03 +0000 (UTC)
Subject: rpms/gflags/F-8 gflags.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080929083003.5F40D70110@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gflags/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29643/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	gflags.spec import.log 
Log Message:
initial package import



--- NEW FILE gflags.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           gflags
Version:        0.9
Release:        6%{?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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-setuptools-devel

%description
The gflags package contains a library that implements commandline
flags processing. As such it's a replacement for getopt(). It has
increased flexibility, including built-in support for C++ types like
string, and the ability to define flags in the source file in which
they're used.

%package devel
Summary:        Development files for %{name}
Group:          Development/Libraries

Requires:       %{name} = %{version}-%{release}

%description devel
This package contains development files for %{name}.

%prep
%setup -q -n %{name}-%{version}

%build
%configure --disable-static

# Omit unused direct shared library dependencies.
sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool

make %{?_smp_mflags}

# build python module
cd python
CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

find $RPM_BUILD_ROOT -type f -name "*.la" -delete

# install python module
cd python
%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT

# executable permission for script
chmod 755 $RPM_BUILD_ROOT%{python_sitelib}/gflags.py

%check
# 2 out of 17 tests fail on x86_64
# disable test suite
cd python
#%{__python} %{name}_unittest.py

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc ChangeLog README COPYING
%{_bindir}/gflags_completions.sh
%{_bindir}/gflags2man.py
%{_libdir}/libgflags.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
%dir %{_includedir}/google
%{_includedir}/google/*.h

%changelog
* Thu Sep 04 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-6
- fixed for F-8 provide eggs for non setuptools package

* Thu Sep 04 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-5
- disable test suite because it failed on x86_64 (2/17)

* Thu Aug 26 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-4
- fixed %%{includedir}

* Thu Aug 14 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-3
- fixed documentation, timestamp saving
- removed chrpath & cleaned some unwanted commands
- included python module

* Sat Aug 09 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-2
- remove automake and corrected configure option

* Thu Aug 07 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-1
- Initial build


--- NEW FILE import.log ---
gflags-0_9-6_fc10:F-8:gflags-0.9-6.fc10.src.rpm:1222675203


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2008 00:03:34 -0000	1.1
+++ .cvsignore	29 Sep 2008 08:29:32 -0000	1.2
@@ -0,0 +1 @@
+gflags-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2008 00:03:34 -0000	1.1
+++ sources	29 Sep 2008 08:29:32 -0000	1.2
@@ -0,0 +1 @@
+bd4871398e9019b241d89cc21fb62def  gflags-0.9.tar.gz



From hadess at fedoraproject.org  Mon Sep 29 08:47:21 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 29 Sep 2008 08:47:21 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.5, 1.6 bluez.spec, 1.10, 1.11 sources,
	1.5, 1.6
Message-ID: <20080929084722.250E870110@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31875

Modified Files:
	.cvsignore bluez.spec sources 
Log Message:
* Mon Sep 29 2008 - Bastien Nocera <bnocera at redhat.com> - 4.8-1
- Update to 4.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Sep 2008 13:03:53 -0000	1.5
+++ .cvsignore	29 Sep 2008 08:46:49 -0000	1.6
@@ -1 +1 @@
-bluez-4.7.tar.gz
+bluez-4.8.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bluez.spec	26 Sep 2008 13:03:53 -0000	1.10
+++ bluez.spec	29 Sep 2008 08:46:49 -0000	1.11
@@ -1,6 +1,6 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.7
+Version: 4.8
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -181,6 +181,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Mon Sep 29 2008 - Bastien Nocera <bnocera at redhat.com> - 4.8-1
+- Update to 4.8
+
 * Fri Sep 26 2008 - Bastien Nocera <bnocera at redhat.com> - 4.7-1
 - Update to 4.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Sep 2008 13:03:53 -0000	1.5
+++ sources	29 Sep 2008 08:46:49 -0000	1.6
@@ -1 +1 @@
-2aa806940d2c841e57a9b2ab7302b750  bluez-4.7.tar.gz
+dd7d48ae21a65767bb5eba3cc0209842  bluez-4.8.tar.gz



From zprikryl at fedoraproject.org  Mon Sep 29 08:49:06 2008
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Mon, 29 Sep 2008 08:49:06 +0000 (UTC)
Subject: rpms/net-tools/devel net-tools-1.60-metric-tunnel-man.patch, NONE, 
	1.1 net-tools.spec, 1.95, 1.96
Message-ID: <20080929084906.720B570110@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/net-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32131

Modified Files:
	net-tools.spec 
Added Files:
	net-tools-1.60-metric-tunnel-man.patch 
Log Message:
fixed ifconfig's man page (#454271, #432328)


net-tools-1.60-metric-tunnel-man.patch:

--- NEW FILE net-tools-1.60-metric-tunnel-man.patch ---
diff -up net-tools-1.60/man/en_US/ifconfig.8.metric-tunnel-man net-tools-1.60/man/en_US/ifconfig.8
--- net-tools-1.60/man/en_US/ifconfig.8.metric-tunnel-man	2008-09-18 09:20:49.000000000 +0200
+++ net-tools-1.60/man/en_US/ifconfig.8	2008-09-18 09:26:41.000000000 +0200
@@ -70,7 +70,7 @@ mode.  If selected, all multicast packet
 received by the interface.
 .TP
 .B "metric N"
-This parameter sets the interface metric.
+This parameter sets the interface metric. It is not available under GNU/Linux.
 .TP
 .B "mtu N"
 This parameter sets the Maximum Transfer Unit (MTU) of an interface.
@@ -92,7 +92,7 @@ Add an IPv6 address to an interface. 
 .B "del addr/prefixlen"
 Remove an IPv6 address from an interface.
 .TP
-.B "tunnel aa.bb.cc.dd"
+.B "tunnel ::aa.bb.cc.dd"
 Create a new SIT (IPv6-in-IPv4) device, tunnelling to the given destination.
 .TP
 .B "irq addr"


Index: net-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/net-tools/devel/net-tools.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- net-tools.spec	15 Jul 2008 10:35:42 -0000	1.95
+++ net-tools.spec	29 Sep 2008 08:48:36 -0000	1.96
@@ -3,7 +3,7 @@
 Summary: Basic networking tools
 Name: net-tools
 Version: 1.60
-Release: 89%{?dist}
+Release: 90%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://www.tazenda.demon.co.uk/phil/net-tools/
@@ -80,6 +80,7 @@
 Patch67: net-tools-1.60-i-option.patch
 Patch68: net-tools-1.60-a-option.patch
 Patch69: net-tools-1.60-clear-flag.patch
+Patch70: net-tools-1.60-metric-tunnel-man.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/chkconfig
@@ -160,6 +161,7 @@
 %patch67 -p1 -b .i-option
 %patch68 -p1 -b .a-option
 %patch69 -p1 -b .clear-flag
+%patch70 -p1 -b .metric-tunnel-man
 
 cp %SOURCE2 ./config.h
 cp %SOURCE3 ./config.make
@@ -275,6 +277,9 @@
 %{_sysconfdir}/rc.d/init.d/netplugd
 
 %changelog
+* Thu Sep 25 2008 Zdenek Prikryl <zprikryl at redhat.com> - 1.60-90
+- fixed ifconfig's man page (#454271, #432328)
+
 * Tue Jul 15 2008 Zdenek Prikryl <zprikryl at redhat.com> - 1.60-89
 - fixed man pages for arp (#446195)
 - fixed netstat --interfaces option (#446187)



From rakesh at fedoraproject.org  Mon Sep 29 09:21:35 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 29 Sep 2008 09:21:35 +0000 (UTC)
Subject: rpms/gedit-plugins/devel gedit-plugins.spec,1.3,1.4
Message-ID: <20080929092135.3250A70110@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gedit-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3336

Modified Files:
	gedit-plugins.spec 
Log Message:
bumped to pick latest gucharmap



Index: gedit-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/devel/gedit-plugins.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gedit-plugins.spec	18 Mar 2008 22:15:54 -0000	1.3
+++ gedit-plugins.spec	29 Sep 2008 09:21:03 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gedit-plugins
 Version:        2.22.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Plugins for gedit
 
 Group:          Applications/Editors
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 2.22.0-2
+- rebuild to pick latest gucharmap
+
 * Tue Mar 18 2008 Trond Danielsen <trond.danielsen at gmail.com> - 2.22.0-1
 - Updated.
 



From hadess at fedoraproject.org  Mon Sep 29 09:21:59 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 29 Sep 2008 09:21:59 +0000 (UTC)
Subject: rpms/bluez-gnome/devel 05_bluetooth_sendto_dbus-snd.patch, NONE,
	1.1 bluez-gnome.spec, 1.59, 1.60
Message-ID: <20080929092159.0AA1D70110@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3453

Modified Files:
	bluez-gnome.spec 
Added Files:
	05_bluetooth_sendto_dbus-snd.patch 
Log Message:
* Mon Sep 29 2008 - Bastien Nocera <bnocera at redhat.com> - 1.5-2
- Add another patch for Bluetooth sendto support for BlueZ 4.x


05_bluetooth_sendto_dbus-snd.patch:

--- NEW FILE 05_bluetooth_sendto_dbus-snd.patch ---
diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.5/common/marshal.list bluez-gnome-1.5.new/common/marshal.list
--- bluez-gnome-1.5/common/marshal.list	2008-08-24 16:14:24.000000000 -0500
+++ bluez-gnome-1.5.new/common/marshal.list	2008-09-27 20:17:37.000000000 -0500
@@ -3,3 +3,4 @@
 VOID:STRING,STRING
 VOID:STRING,STRING,UINT64
 VOID:UINT64
+VOID:STRING,STRING,STRING
diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.5/sendto/main.c bluez-gnome-1.5.new/sendto/main.c
--- bluez-gnome-1.5/sendto/main.c	2008-09-27 20:17:30.000000000 -0500
+++ bluez-gnome-1.5.new/sendto/main.c	2008-09-27 20:17:35.000000000 -0500
@@ -60,6 +60,8 @@
 static gint64 first_update = 0;
 static gint64 last_update = 0;
 
+static DBusGProxy *session_proxy = NULL;
+
 static gchar *filename_to_path(const gchar *filename)
 {
 	GFile *file;
@@ -350,7 +352,16 @@
 static void error_occurred(DBusGProxy *proxy, const gchar *name,
 				const gchar *message, gpointer user_data)
 {
-	transfer_completed(proxy, user_data);
+	gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress),
+							_("Error Occurred"));
+							
+	gchar *text = g_strdup_printf("<span foreground=\"red\">%s</span>",
+								message);
+	gtk_label_set_markup(GTK_LABEL(label_status), text);
+	g_free(text);
+
+	gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
+						GTK_RESPONSE_CLOSE, TRUE);
 }
 
 static void session_connected(DBusGProxy *proxy, gpointer user_data)
@@ -359,7 +370,7 @@
 
 	first_update = get_system_time();
 
-	send_file(proxy);
+	send_file(session_proxy);
 }
 
 #define OPENOBEX_CONNECTION_FAILED "org.openobex.Error.ConnectionAttemptFailed"
@@ -403,60 +414,41 @@
 	if (dbus_g_proxy_end_call(proxy, call, &error,
 					DBUS_TYPE_G_OBJECT_PATH, &path,
 						G_TYPE_INVALID) == FALSE) {
-		gchar *text, *message;
+		gchar *message;
 
 		message = get_error_message(error);
 
-		text = g_strdup_printf("<span foreground=\"red\">%s</span>",
-								message);
-		gtk_label_set_markup(GTK_LABEL(label_status), text);
-		g_free(text);
+		error_occurred(proxy,NULL,message,NULL);
 
 		g_free(message);
 
-		gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
-						GTK_RESPONSE_CLOSE, TRUE);
 		return;
 	}
-
-	proxy = dbus_g_proxy_new_for_name(conn, "org.openobex",
+	session_proxy = dbus_g_proxy_new_for_name(conn, "org.openobex",
 						path, "org.openobex.Session");
 
-	dbus_g_proxy_add_signal(proxy, "Connected", G_TYPE_INVALID);
-
-	dbus_g_proxy_connect_signal(proxy, "Connected",
-				G_CALLBACK(session_connected), NULL, NULL);
+	dbus_g_proxy_add_signal(session_proxy, "Cancelled", G_TYPE_INVALID);
 
-	dbus_g_proxy_add_signal(proxy, "ErrorOccurred",
-				G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-
-	dbus_g_proxy_connect_signal(proxy, "ErrorOccurred",
-				G_CALLBACK(error_occurred), NULL, NULL);
-
-	dbus_g_proxy_add_signal(proxy, "Cancelled", G_TYPE_INVALID);
-
-	dbus_g_proxy_connect_signal(proxy, "Cancelled",
+	dbus_g_proxy_connect_signal(session_proxy, "Cancelled",
 				G_CALLBACK(transfer_cancelled), NULL, NULL);
 
-	dbus_g_proxy_add_signal(proxy, "TransferStarted", G_TYPE_STRING,
+	dbus_g_proxy_add_signal(session_proxy, "TransferStarted", G_TYPE_STRING,
 				G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_INVALID);
 
-	dbus_g_proxy_connect_signal(proxy, "TransferStarted",
+	dbus_g_proxy_connect_signal(session_proxy, "TransferStarted",
 				G_CALLBACK(transfer_started), NULL, NULL);
 
-	dbus_g_proxy_add_signal(proxy, "TransferProgress",
+	dbus_g_proxy_add_signal(session_proxy, "TransferProgress",
 						G_TYPE_UINT64, G_TYPE_INVALID);
 
-	dbus_g_proxy_connect_signal(proxy, "TransferProgress",
+	dbus_g_proxy_connect_signal(session_proxy, "TransferProgress",
 				G_CALLBACK(transfer_progress), NULL, NULL);
 
-	dbus_g_proxy_add_signal(proxy, "TransferCompleted", G_TYPE_INVALID);
+	dbus_g_proxy_add_signal(session_proxy, "TransferCompleted", G_TYPE_INVALID);
 
-	dbus_g_proxy_connect_signal(proxy, "TransferCompleted",
+	dbus_g_proxy_connect_signal(session_proxy, "TransferCompleted",
 				G_CALLBACK(transfer_completed), NULL, NULL);
 
-	dbus_g_proxy_call(proxy, "Connect", NULL, G_TYPE_INVALID,
-							G_TYPE_INVALID);
 }
 
 static gchar *get_name(DBusGProxy *device)
@@ -645,6 +637,14 @@
 
 	dbus_g_object_register_marshaller(marshal_VOID__UINT64,
 				G_TYPE_NONE, G_TYPE_UINT64, G_TYPE_INVALID);
+				
+	dbus_g_object_register_marshaller(marshal_VOID__STRING_STRING_STRING,
+                                       G_TYPE_NONE,
+                                       DBUS_TYPE_G_OBJECT_PATH,
+                                       G_TYPE_STRING,
+                                       G_TYPE_STRING,
+                                       G_TYPE_INVALID);
+
 
 	device_name = get_device_name(option_device);
 	if (device_name == NULL)
@@ -661,6 +661,18 @@
 	dbus_g_proxy_connect_signal(proxy, "NameOwnerChanged",
 				G_CALLBACK(name_owner_changed), NULL, NULL);
 
+	dbus_g_proxy_add_signal(proxy, "SessionConnected", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
+
+	dbus_g_proxy_connect_signal(proxy, "SessionConnected",
+				G_CALLBACK(session_connected), NULL, NULL);
+
+	dbus_g_proxy_add_signal(proxy, "SessionConnectError",
+				DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
+
+	dbus_g_proxy_connect_signal(proxy, "SessionConnectError",
+				G_CALLBACK(error_occurred), NULL, NULL);
+
+
 	dbus_g_proxy_begin_call(proxy, "CreateBluetoothSession",
 				create_notify, NULL, NULL,
 				G_TYPE_STRING, option_device,


Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- bluez-gnome.spec	27 Sep 2008 10:43:21 -0000	1.59
+++ bluez-gnome.spec	29 Sep 2008 09:21:28 -0000	1.60
@@ -1,6 +1,6 @@
 Name:		bluez-gnome
 Version:	1.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
@@ -9,6 +9,7 @@
 Source0:	http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
 
 Patch0:		bluetooth-sendto-ods-svn.patch
+Patch1:		05_bluetooth_sendto_dbus-snd.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -47,6 +48,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .ods-svn
+%patch1 -p1 -b .bluez4
 
 %build
 %configure --disable-mime-update --disable-desktop-update --disable-icon-update
@@ -139,6 +141,9 @@
 %{_mandir}/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Mon Sep 29 2008 - Bastien Nocera <bnocera at redhat.com> - 1.5-2
+- Add another patch for Bluetooth sendto support for BlueZ 4.x
+
 * Sat Sep 27 2008 - Bastien Nocera <bnocera at redhat.com> - 1.5-1
 - Update to 1.5
 



From mmaslano at fedoraproject.org  Mon Sep 29 09:23:45 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 29 Sep 2008 09:23:45 +0000 (UTC)
Subject: rpms/perl-File-Find-Rule-VCS/devel perl-File-Find-Rule-VCS.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080929092345.B5A3E70110@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-File-Find-Rule-VCS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3998

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-Find-Rule-VCS.spec 
Log Message:
Add this package into cvs.



--- NEW FILE perl-File-Find-Rule-VCS.spec ---
Name:           perl-File-Find-Rule-VCS
Version:        1.04
Release:        2%{?dist}
Summary:        Exclude files/directories for Version Control Systems
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/File-Find-Rule-VCS/
Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/File-Find-Rule-VCS-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 0:5.005
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(File::Find::Rule) >= 0.20
BuildRequires:  perl(Test::More) >= 0.47
Requires:       perl(File::Find::Rule) >= 0.20
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Many tools need to be equally useful both on ordinary files, and on code
that has been checked out from revision control systems.

%prep
%setup -q -n File-Find-Rule-VCS-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Sep 25 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.04-2
- add email

* Wed Sep 24 2008 Marcela Ma??l????ov?? 1.04-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule-VCS/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2008 19:10:14 -0000	1.1
+++ .cvsignore	29 Sep 2008 09:23:15 -0000	1.2
@@ -0,0 +1 @@
+File-Find-Rule-VCS-1.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule-VCS/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 19:10:14 -0000	1.1
+++ sources	29 Sep 2008 09:23:15 -0000	1.2
@@ -0,0 +1 @@
+f2014b4076f5e9cc9addcf29f662f344  File-Find-Rule-VCS-1.04.tar.gz



From hadess at fedoraproject.org  Mon Sep 29 09:25:49 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 29 Sep 2008 09:25:49 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs-obexftp-updated-apis-3.patch, NONE,
	1.1 gvfs.spec, 
	1.83, 1.84 gvfs-obexftp-updated-apis-2.patch, 1.2, NONE
Message-ID: <20080929092549.BD34770110@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4422

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-obexftp-updated-apis-3.patch 
Removed Files:
	gvfs-obexftp-updated-apis-2.patch 
Log Message:
* Mon Sep 29 2008 - Bastien Nocera <bnocera at redhat.com> - 1.0.1-2
- Update obexftp patch from upstream


gvfs-obexftp-updated-apis-3.patch:

--- NEW FILE gvfs-obexftp-updated-apis-3.patch ---
Index: daemon/obexftp-marshal.list
===================================================================
--- daemon/obexftp-marshal.list	(revision 2022)
+++ daemon/obexftp-marshal.list	(working copy)
@@ -1,2 +1,4 @@
+VOID:STRING
 VOID:STRING,STRING
+VOID:STRING,STRING,STRING
 VOID:STRING,STRING,UINT64
Index: daemon/daemon-main.c
===================================================================
--- daemon/daemon-main.c	(revision 2022)
+++ daemon/daemon-main.c	(working copy)
@@ -65,6 +65,12 @@
       dbus_error_free (&derror);
       exit (1);
     }
+
+  GLogLevelFlags fatal_mask;
+
+  fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
+  fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
+  g_log_set_always_fatal (fatal_mask);
 }
 
 void
Index: daemon/gvfsbackendobexftp.c
===================================================================
--- daemon/gvfsbackendobexftp.c	(revision 2022)
+++ daemon/gvfsbackendobexftp.c	(working copy)
@@ -69,7 +69,7 @@
 
   char *display_name;
   char *bdaddr;
-  guint type;
+  char *icon_name;
 
   DBusGConnection *connection;
   DBusGProxy *manager_proxy;
@@ -96,177 +96,106 @@
 
 G_DEFINE_TYPE (GVfsBackendObexftp, g_vfs_backend_obexftp, G_VFS_TYPE_BACKEND);
 
-/* This should all live in bluez-gnome, and we
- * should depend on it */
-enum {
-    BLUETOOTH_TYPE_ANY        = 1,
-    BLUETOOTH_TYPE_PHONE      = 1 << 1,
-    BLUETOOTH_TYPE_MODEM      = 1 << 2,
-    BLUETOOTH_TYPE_COMPUTER   = 1 << 3,
-    BLUETOOTH_TYPE_NETWORK    = 1 << 4,
-    BLUETOOTH_TYPE_HEADSET    = 1 << 5,
-    BLUETOOTH_TYPE_KEYBOARD   = 1 << 6,
-    BLUETOOTH_TYPE_MOUSE      = 1 << 7,
-    BLUETOOTH_TYPE_CAMERA     = 1 << 8,
-    BLUETOOTH_TYPE_PRINTER    = 1 << 9 
-};
+static void session_connect_error_cb (DBusGProxy *proxy,
+                                      const char *session_object,
+                                      const gchar *error_name,
+                                      const gchar *error_message,
+                                      gpointer user_data);
+static void session_connected_cb (DBusGProxy *proxy,
+                                  const char *session_object,
+                                  gpointer user_data);
 
-static const char *
-_get_icon_from_type (guint type)
+/* Used to detect broken listings from
+ * old Nokia 3650s */
+static gboolean
+_is_nokia_3650 (const char *bdaddr)
 {
-  switch (type)
-    {
-    case BLUETOOTH_TYPE_PHONE:
-      return "phone";
-      break;
-    case BLUETOOTH_TYPE_MODEM:
-      return "modem";
-      break;
-    case BLUETOOTH_TYPE_COMPUTER:
-      return "network-server";
-      break;
-    case BLUETOOTH_TYPE_NETWORK:
-      return "network-wireless";
-      break;
-    case BLUETOOTH_TYPE_HEADSET:
-      return "stock_headphones";
-      break;
-    case BLUETOOTH_TYPE_KEYBOARD:
-      return "input-keyboard";
-      break;
-    case BLUETOOTH_TYPE_MOUSE:
-      return "input-mouse";
-      break;
-    case BLUETOOTH_TYPE_CAMERA:
-      return "camera-photo";
-      break;
-    case BLUETOOTH_TYPE_PRINTER:
-      return "printer";
-      break;
-    default:
-      return "bluetooth";
-      break;
-    }
+  /* Don't ask, Nokia seem to use a Bluetooth
+   * HCI from Murata */
+  return g_str_has_prefix(bdaddr, "00:60:57");
 }
 
-static int
-_get_type_from_class (guint class)
+static char *
+get_name_and_icon (DBusGProxy *device, char **icon_name)
 {
-  switch ((class & 0x1f00) >> 8)
+  GHashTable *hash;
+
+  if (dbus_g_proxy_call (device, "GetProperties", NULL,
+                         G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE),
+                         &hash, G_TYPE_INVALID) != FALSE)
     {
-    case 0x01:
-      return BLUETOOTH_TYPE_COMPUTER;
-    case 0x02:
-      switch ((class & 0xfc) >> 2)
+      GValue *value;
+      char *name;
+
+      value = g_hash_table_lookup (hash, "Name");
+      name = value ? g_value_dup_string(value) : NULL;
+
+      value = g_hash_table_lookup (hash, "Icon");
+      if (value)
         {
-        case 0x01:
-        case 0x02:
-        case 0x03:
-        case 0x05:
-          return BLUETOOTH_TYPE_PHONE;
-        case 0x04:
-          return BLUETOOTH_TYPE_MODEM;
+          *icon_name = g_value_dup_string (value);
         }
-      break;
-    case 0x03:
-      return BLUETOOTH_TYPE_NETWORK;
-    case 0x04:
-      switch ((class & 0xfc) >> 2)
+      else
         {
-        case 0x01:
-          return BLUETOOTH_TYPE_HEADSET;
+          *icon_name = g_strdup ("bluetooth");
         }
-      break;
-    case 0x05:
-      switch ((class & 0xc0) >> 6)
-        {
-        case 0x01:
-          return BLUETOOTH_TYPE_KEYBOARD;
-        case 0x02:
-          return BLUETOOTH_TYPE_MOUSE;
-        }
-      break;
-    case 0x06:
-      if (class & 0x80)
-            return BLUETOOTH_TYPE_PRINTER;
-      if (class & 0x20)
-            return BLUETOOTH_TYPE_CAMERA;
-      break;
+      g_hash_table_destroy (hash);
+      return name;
     }
 
-  return BLUETOOTH_TYPE_ANY;
+  return NULL;
 }
 
-/* Used to detect broken listings from
- * old Nokia 3650s */
-static gboolean
-_is_nokia_3650 (const char *bdaddr)
-{
-  /* Don't ask, Nokia seem to use a Bluetooth
-   * HCI from Murata */
-  return g_str_has_prefix(bdaddr, "00:60:57");
-}
-
 static gchar *
-_get_device_properties (const char *bdaddr, guint32 *type)
+_get_device_properties (const char *bdaddr, char **icon_name)
 {
   DBusGConnection *connection;
   DBusGProxy *manager;
-  gchar *name, **adapters;
+  GPtrArray *adapters;
+  gchar *name;
   guint i;
 
   name = NULL;
 
   connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
   if (connection == NULL)
-        return NULL;
+        return name;
 
   manager = dbus_g_proxy_new_for_name (connection, "org.bluez",
-                                       "/org/bluez", "org.bluez.Manager");
+                                       "/", "org.bluez.Manager");
   if (manager == NULL)
     {
       dbus_g_connection_unref (connection);
-      return NULL;
+      return name;
     }
 
-  if (dbus_g_proxy_call (manager, "ListAdapters", NULL, G_TYPE_INVALID, G_TYPE_STRV, &adapters, G_TYPE_INVALID) == FALSE)
+  if (dbus_g_proxy_call (manager, "ListAdapters", NULL, G_TYPE_INVALID, dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &adapters, G_TYPE_INVALID) == FALSE)
     {
       g_object_unref (manager);
       dbus_g_connection_unref (connection);
-      return NULL;
+      return name;
     }
 
-  for (i = 0; adapters[i] != NULL; i++)
+  for (i = 0; i < adapters->len && name == NULL; i++)
     {
       DBusGProxy *adapter;
+      char *device_path;
 
       adapter = dbus_g_proxy_new_for_name (connection, "org.bluez",
-                                           adapters[i], "org.bluez.Adapter");
-      if (dbus_g_proxy_call (adapter, "GetRemoteName", NULL,
+                                           g_ptr_array_index (adapters, i), "org.bluez.Adapter");
+      if (dbus_g_proxy_call (adapter, "FindDevice", NULL,
                              G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
-                             G_TYPE_STRING, &name, G_TYPE_INVALID) != FALSE)
+                             DBUS_TYPE_G_OBJECT_PATH, &device_path, G_TYPE_INVALID) != FALSE)
         {
-          if (name != NULL && name[0] != '\0')
-            {
-              guint32 class;
-
-              if (dbus_g_proxy_call(adapter, "GetRemoteClass", NULL,
-                                    G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
-                                    G_TYPE_UINT, &class, G_TYPE_INVALID) != FALSE)
-                {
-                  *type = _get_type_from_class (class);
-                }
-              else
-                {
-                  *type = BLUETOOTH_TYPE_ANY;
-                }
-              g_object_unref (adapter);
-              break;
-            }
+          DBusGProxy *device;
+          device = dbus_g_proxy_new_for_name (connection, "org.bluez", device_path, "org.bluez.Device");
+          name = get_name_and_icon (device, icon_name);
+          g_object_unref (device);
         }
       g_object_unref (adapter);
     }
 
+  g_ptr_array_free (adapters, TRUE);
   g_object_unref (manager);
   dbus_g_connection_unref (connection);
 
@@ -282,6 +211,7 @@
 
   g_free (backend->display_name);
   g_free (backend->bdaddr);
+  g_free (backend->icon_name);
   g_free (backend->files_listing);
   g_free (backend->directory);
 
@@ -312,6 +242,15 @@
                                                       "org.openobex",
                                                       "/org/openobex",
                                                       "org.openobex.Manager");
+
+  dbus_g_proxy_add_signal(backend->manager_proxy, "SessionConnectError",
+                          DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(backend->manager_proxy, "SessionConnectError",
+                              G_CALLBACK(session_connect_error_cb), backend, NULL);
+  dbus_g_proxy_add_signal(backend->manager_proxy, "SessionConnected",
+                          DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(backend->manager_proxy, "SessionConnected",
+                              G_CALLBACK(session_connected_cb), backend, NULL);
 }
 
 static gboolean
@@ -437,8 +376,7 @@
       g_file_info_set_file_type (info, G_FILE_TYPE_DIRECTORY);
       g_file_info_set_content_type (info, "inode/directory");
       g_file_info_set_name (info, "/");
-      g_vfs_backend_set_icon_name (backend,
-                                   _get_icon_from_type (op_backend->type));
+      g_vfs_backend_set_icon_name (backend, op_backend->icon_name);
       display = g_strdup_printf (_("%s on %s"), "/", op_backend->display_name);
       g_file_info_set_display_name (info, display);
       g_free (display);
@@ -531,6 +469,37 @@
 }
 
 static void
+session_connect_error_cb (DBusGProxy *proxy,
+                          const char *session_object,
+                          const gchar *error_name,
+                          const gchar *error_message,
+                          gpointer user_data)
+{
+  GVfsBackendObexftp *op_backend = G_VFS_BACKEND_OBEXFTP (user_data);
+
+  g_mutex_lock (op_backend->mutex);
+  op_backend->status = ASYNC_ERROR;
+  op_backend->error = g_error_new_literal (DBUS_GERROR,
+                                           DBUS_GERROR_REMOTE_EXCEPTION,
+                                           error_message);
+  g_cond_signal (op_backend->cond);
+  g_mutex_unlock (op_backend->mutex);
+}
+
+static void
+session_connected_cb (DBusGProxy *proxy,
+                      const char *session_object,
+                      gpointer user_data)
+{
+  GVfsBackendObexftp *op_backend = G_VFS_BACKEND_OBEXFTP (user_data);
+
+  g_mutex_lock (op_backend->mutex);
+  op_backend->status = ASYNC_SUCCESS;
+  g_cond_signal (op_backend->cond);
+  g_mutex_unlock (op_backend->mutex);
+}
+
+static void
 cancelled_cb (DBusGProxy *proxy, gpointer user_data)
 {
   GVfsBackendObexftp *op_backend = G_VFS_BACKEND_OBEXFTP (user_data);
@@ -559,24 +528,6 @@
   _exit (1);
 }
 
-static int
-is_connected (DBusGProxy *session_proxy, GVfsJob *job)
-{
-  GError *error = NULL;
-  gboolean connected;
-
-  if (dbus_g_proxy_call (session_proxy, "IsConnected", &error,
-                         G_TYPE_INVALID,
-                         G_TYPE_BOOLEAN, &connected, G_TYPE_INVALID) == FALSE)
-    {
-      g_vfs_job_failed_from_error (job, error);
-      g_error_free (error);
-      return -1;
-    }
-
-  return connected;
-}
-
 static void
 do_mount (GVfsBackend *backend,
           GVfsJobMount *job,
@@ -590,7 +541,7 @@
   const gchar *path = NULL;
   char *server;
   GMountSpec *obexftp_mount_spec;
-  gboolean connected;
+  guint count;
 
   g_print ("+ do_mount\n");
 
@@ -616,10 +567,11 @@
     }
 
   /* FIXME, Have a way for the mount to be cancelled, see:
-   * http://bugs.muiline.com/view.php?id=51 */
+   * Use CancelSessionConnect */
+  op_backend->status = ASYNC_PENDING;
 
   if (dbus_g_proxy_call (op_backend->manager_proxy, "CreateBluetoothSession", &error,
-                         G_TYPE_STRING, op_backend->bdaddr, G_TYPE_STRING, "ftp", G_TYPE_INVALID,
+                         G_TYPE_STRING, op_backend->bdaddr, G_TYPE_STRING, "00:00:00:00:00:00", G_TYPE_STRING, "ftp", G_TYPE_INVALID,
                          DBUS_TYPE_G_OBJECT_PATH, &path, G_TYPE_INVALID) == FALSE)
     {
       g_free (op_backend->bdaddr);
@@ -636,14 +588,13 @@
                                                          path,
                                                          "org.openobex.Session");
 
-  op_backend->display_name = _get_device_properties (op_backend->bdaddr, &op_backend->type);
+  op_backend->display_name = _get_device_properties (op_backend->bdaddr, &op_backend->icon_name);
   if (!op_backend->display_name)
         op_backend->display_name = g_strdup (op_backend->bdaddr);
 
   g_vfs_backend_set_display_name (G_VFS_BACKEND  (op_backend),
                                   op_backend->display_name);
-  g_vfs_backend_set_icon_name (G_VFS_BACKEND (op_backend),
-                               _get_icon_from_type (op_backend->type));
+  g_vfs_backend_set_icon_name (G_VFS_BACKEND (op_backend), op_backend->icon_name);
 
   obexftp_mount_spec = g_mount_spec_new ("obex");
   server = g_strdup_printf ("[%s]", op_backend->bdaddr);
@@ -676,14 +627,20 @@
                           G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_INVALID);
 
   /* Now wait until the device is connected */
-  connected = is_connected (op_backend->session_proxy, G_VFS_JOB (job));
-  while (connected == FALSE)
-    {
-      g_usleep (G_USEC_PER_SEC / 100);
-      connected = is_connected (op_backend->session_proxy, G_VFS_JOB (job));
-    }
+  count = 0;
+  g_mutex_lock (op_backend->mutex);
 
-  if (connected < 0)
+  while (op_backend->status == ASYNC_PENDING && count < 100) {
+      GTimeVal val;
+      g_get_current_time (&val);
+      g_time_val_add (&val, 100000);
+      count++;
+      if (g_cond_timed_wait (op_backend->cond, op_backend->mutex, &val) != FALSE)
+            break;
+  }
+  g_mutex_unlock (op_backend->mutex);
+
+  if (op_backend->status == ASYNC_ERROR || op_backend->status == ASYNC_PENDING)
     {
       g_message ("mount failed, didn't connect");
 
@@ -694,12 +651,17 @@
       g_object_unref (op_backend->session_proxy);
       op_backend->session_proxy = NULL;
 
-      g_vfs_job_failed (G_VFS_JOB (job),
-                        G_IO_ERROR, G_IO_ERROR_BUSY,
-                        _("Connection to the device lost"));
+      if (op_backend->status != ASYNC_PENDING)
+            g_vfs_job_failed_from_error (G_VFS_JOB (job), op_backend->error);
+      else
+            g_vfs_job_failed (G_VFS_JOB (job),
+                              G_IO_ERROR, G_IO_ERROR_BUSY,
+                              _("Connection to the device lost"));
       return;
     }
 
+  op_backend->status = ASYNC_PENDING;
+
   g_vfs_job_succeeded (G_VFS_JOB (job));
 
   g_print ("- do_mount\n");
@@ -1482,6 +1444,12 @@
   /* TransferStarted */
   dbus_g_object_register_marshaller(obexftp_marshal_VOID__STRING_STRING_UINT64,
                                     G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_INVALID);
+  /* SessionConnected */
+  dbus_g_object_register_marshaller(obexftp_marshal_VOID__STRING,
+                                    G_TYPE_NONE, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
+  /* SessionConnectError */
+  dbus_g_object_register_marshaller (obexftp_marshal_VOID__STRING_STRING_STRING,
+                                     G_TYPE_NONE, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
 }
 
 /*


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- gvfs.spec	24 Sep 2008 14:16:48 -0000	1.83
+++ gvfs.spec	29 Sep 2008 09:25:19 -0000	1.84
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -30,7 +30,7 @@
 BuildRequires: libtool
 Patch1: gvfs-0.99.2-archive-integration.patch
 
-Patch2: gvfs-obexftp-updated-apis-2.patch
+Patch2: gvfs-obexftp-updated-apis-3.patch
 
 %description
 The gvfs package provides backend implementations for the gio 
@@ -251,6 +251,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 - Bastien Nocera <bnocera at redhat.com> - 1.0.1-2
+- Update obexftp patch from upstream
+
 * Wed Sep 24 2008 Matthias Clasen <mclasen at redhat.com>  - 1.0.1-1
 - Update to 1.0.1
 


--- gvfs-obexftp-updated-apis-2.patch DELETED ---



From twaugh at fedoraproject.org  Mon Sep 29 09:29:01 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 29 Sep 2008 09:29:01 +0000 (UTC)
Subject: rpms/expendable/devel expendable.spec, NONE, 1.1 import.log, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080929092901.73FFA70110@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/expendable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5348/devel

Modified Files:
	.cvsignore sources 
Added Files:
	expendable.spec import.log 
Log Message:
Initial import.



--- NEW FILE expendable.spec ---
Summary: Home finances modeling program
Name: expendable
Version: 0.0.2
Release: 2
License: GPLv2+
Group: Applications/System
URL: https://fedorahosted.org/expendable/
# Add "?format=raw" to the following URL to download file:
Source0: https://fedorahosted.org/expendable/attachment/wiki/ProjectReleases/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python
BuildRequires: desktop-file-utils >= 0.2.92
Requires: numpy

%description
This is a program for modelling home finances. In particular, it can
be used to work how long it will take to pay back a mortgage if a
linked "offset" facility is available.  Offset accounts are like
savings accounts, but instead of accruing interest they reduce the
amount of interest charged for the mortgage by offsetting the loan
amount.

%prep
%setup -q

%build
%configure
make

%check
make check

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
rm -f %{buildroot}%{_datadir}/applications/%{name}.desktop
desktop-file-install					\
	--dir %{buildroot}%{_datadir}/applications	\
	--vendor fedora					\
	--add-category GTK				\
	--add-category Office				\
	--add-category Finance				\
	%{name}.desktop

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc AUTHORS README COPYING
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/*.desktop

%changelog
* Sun Sep 28 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-2
- Re-install desktop file with fedora as the vendor.

* Fri Sep 26 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-1
- Initial spec file.


--- NEW FILE import.log ---
expendable-0_0_2-2:HEAD:expendable-0.0.2-2.src.rpm:1222680451


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2008 19:33:22 -0000	1.1
+++ .cvsignore	29 Sep 2008 09:28:30 -0000	1.2
@@ -0,0 +1 @@
+expendable-0.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 19:33:22 -0000	1.1
+++ sources	29 Sep 2008 09:28:31 -0000	1.2
@@ -0,0 +1 @@
+b43f6e674ce06ac6e5ca55e2c50ecc40  expendable-0.0.2.tar.bz2



From mmaslano at fedoraproject.org  Mon Sep 29 09:45:37 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 29 Sep 2008 09:45:37 +0000 (UTC)
Subject: rpms/perl-Probe-Perl/devel perl-Probe-Perl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080929094537.B5AF170110@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Probe-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8272

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Probe-Perl.spec 
Log Message:
* Wed Sep 24 2008 Marcela Ma??l????ov?? 0.01-1
- Specfile autogenerated by cpanspec 1.77.



--- NEW FILE perl-Probe-Perl.spec ---
Name:           perl-Probe-Perl
Version:        0.01
Release:        1%{?dist}
Summary:        Information about the currently running perl
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Probe-Perl/
Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Probe-Perl-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Config)
BuildRequires:  perl(Module::Build)
Requires:       perl(Config)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides methods for obtaining information about the currently
running perl interpreter. It originally began life as code in the
Module::Build project, but has been externalized here for general use.

%prep
%setup -q -n Probe-Perl-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Sep 24 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.01-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Probe-Perl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2008 19:01:00 -0000	1.1
+++ .cvsignore	29 Sep 2008 09:45:05 -0000	1.2
@@ -0,0 +1 @@
+Probe-Perl-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Probe-Perl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 19:01:00 -0000	1.1
+++ sources	29 Sep 2008 09:45:06 -0000	1.2
@@ -0,0 +1 @@
+b6f613a7d07dde568a0d4b9570de47c3  Probe-Perl-0.01.tar.gz



From twaugh at fedoraproject.org  Mon Sep 29 09:46:01 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 29 Sep 2008 09:46:01 +0000 (UTC)
Subject: rpms/expendable/devel expendable-0.0.2.tar.bz2.sig, NONE,
	1.1 upstream-key.gpg, NONE, 1.1
Message-ID: <20080929094601.3582570110@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/expendable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8459

Added Files:
	expendable-0.0.2.tar.bz2.sig upstream-key.gpg 
Log Message:
Signature and key.


--- NEW FILE expendable-0.0.2.tar.bz2.sig ---
??

--- NEW FILE upstream-key.gpg ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.7 (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
-----END PGP PUBLIC KEY BLOCK-----



From twaugh at fedoraproject.org  Mon Sep 29 09:49:53 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 29 Sep 2008 09:49:53 +0000 (UTC)
Subject: rpms/expendable/F-9 expendable-0.0.2.tar.bz2.sig, NONE,
	1.1 expendable.spec, NONE, 1.1 upstream-key.gpg, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20080929094953.699A270110@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/expendable/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9064

Modified Files:
	sources 
Added Files:
	expendable-0.0.2.tar.bz2.sig expendable.spec upstream-key.gpg 
Log Message:
Initial import.


--- NEW FILE expendable-0.0.2.tar.bz2.sig ---
??

--- NEW FILE expendable.spec ---
Summary: Home finances modeling program
Name: expendable
Version: 0.0.2
Release: 2
License: GPLv2+
Group: Applications/System
URL: https://fedorahosted.org/expendable/
# Add "?format=raw" to the following URL to download file:
Source0: https://fedorahosted.org/expendable/attachment/wiki/ProjectReleases/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python
BuildRequires: desktop-file-utils >= 0.2.92
Requires: numpy

%description
This is a program for modelling home finances. In particular, it can
be used to work how long it will take to pay back a mortgage if a
linked "offset" facility is available.  Offset accounts are like
savings accounts, but instead of accruing interest they reduce the
amount of interest charged for the mortgage by offsetting the loan
amount.

%prep
%setup -q

%build
%configure
make

%check
make check

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
rm -f %{buildroot}%{_datadir}/applications/%{name}.desktop
desktop-file-install					\
	--dir %{buildroot}%{_datadir}/applications	\
	--vendor fedora					\
	--add-category GTK				\
	--add-category Office				\
	--add-category Finance				\
	%{name}.desktop

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc AUTHORS README COPYING
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/*.desktop

%changelog
* Sun Sep 28 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-2
- Re-install desktop file with fedora as the vendor.

* Fri Sep 26 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-1
- Initial spec file.


--- NEW FILE upstream-key.gpg ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.7 (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
-----END PGP PUBLIC KEY BLOCK-----


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 19:33:22 -0000	1.1
+++ sources	29 Sep 2008 09:49:23 -0000	1.2
@@ -0,0 +1 @@
+b43f6e674ce06ac6e5ca55e2c50ecc40  expendable-0.0.2.tar.bz2



From twaugh at fedoraproject.org  Mon Sep 29 09:50:53 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 29 Sep 2008 09:50:53 +0000 (UTC)
Subject: rpms/expendable/F-9 expendable.spec,1.1,1.2
Message-ID: <20080929095053.A645870110@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/expendable/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9263

Modified Files:
	expendable.spec 
Log Message:
Use dist tag.


Index: expendable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-9/expendable.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- expendable.spec	29 Sep 2008 09:49:23 -0000	1.1
+++ expendable.spec	29 Sep 2008 09:50:23 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Home finances modeling program
 Name: expendable
 Version: 0.0.2
-Release: 2
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/expendable/



From mmaslano at fedoraproject.org  Mon Sep 29 10:01:15 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 29 Sep 2008 10:01:15 +0000 (UTC)
Subject: rpms/perl-Module-Manifest/devel perl-Module-Manifest.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080929100115.737AC70110@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Module-Manifest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10620

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Module-Manifest.spec 
Log Message:
* Wed Sep 24 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.03-1
- Specfile autogenerated by cpanspec 1.77.



--- NEW FILE perl-Module-Manifest.spec ---
Name:           perl-Module-Manifest
Version:        0.03
Release:        1%{?dist}
Summary:        Parse and examine a Perl distribution MANIFEST file
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Module-Manifest/
Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Module-Manifest-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 0:5.005
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Params::Util) >= 0.10
BuildRequires:  perl(Test::More) >= 0.42
Requires:       perl(Params::Util) >= 0.10
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Module::Manifest is a simple utility module created originally for use in
Module::Inspector.

%prep
%setup -q -n Module-Manifest-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Sep 24 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.03-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Manifest/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2008 19:15:27 -0000	1.1
+++ .cvsignore	29 Sep 2008 10:00:45 -0000	1.2
@@ -0,0 +1 @@
+Module-Manifest-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Manifest/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 19:15:27 -0000	1.1
+++ sources	29 Sep 2008 10:00:45 -0000	1.2
@@ -0,0 +1 @@
+3612558b4f285315d7c36668df96f254  Module-Manifest-0.03.tar.gz



From mmaslano at fedoraproject.org  Mon Sep 29 10:05:43 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 29 Sep 2008 10:05:43 +0000 (UTC)
Subject: rpms/perl-Module-Extract/devel perl-Module-Extract.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080929100543.2094070110@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Module-Extract/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11278

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Module-Extract.spec 
Log Message:
* Wed Sep 24 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.01-2
- add email



--- NEW FILE perl-Module-Extract.spec ---
Name:           perl-Module-Extract
Version:        0.01
Release:        2%{?dist}
Summary:        Base class for working with Perl distributions
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Module-Extract/
Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Module-Extract-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Archive::Extract) >= 0.12
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More) >= 0.42
Requires:       perl(Archive::Extract) >= 0.12
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Module::Extract is a convenience base class for creating module that work
with Perl distributions.

%prep
%setup -q -n Module-Extract-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Sep 24 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.01-2
- add email

* Wed Sep 24 2008 Marcela Ma??l????ov?? 0.01-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Extract/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2008 19:13:45 -0000	1.1
+++ .cvsignore	29 Sep 2008 10:05:12 -0000	1.2
@@ -0,0 +1 @@
+Module-Extract-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Extract/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 19:13:45 -0000	1.1
+++ sources	29 Sep 2008 10:05:12 -0000	1.2
@@ -0,0 +1 @@
+e75fc18af9686da49c2ee24cc555cb89  Module-Extract-0.01.tar.gz



From mmaslano at fedoraproject.org  Mon Sep 29 10:09:57 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 29 Sep 2008 10:09:57 +0000 (UTC)
Subject: rpms/perl-Module-Inspector/devel perl-Module-Inspector.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080929100957.5704770110@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Module-Inspector/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11920

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Module-Inspector.spec 
Log Message:
* Thu Sep 25 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.05-2
- add my email



--- NEW FILE perl-Module-Inspector.spec ---
Name:           perl-Module-Inspector
Version:        1.05
Release:        2%{?dist}
Summary:        Integrated API for inspecting Perl distributions
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Module-Inspector/
Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Module-Inspector-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 0:5.005
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(File::Find::Rule)
BuildRequires:  perl(File::Find::Rule::Perl)
BuildRequires:  perl(File::Find::Rule::VCS) >= 1.02
BuildRequires:  perl(Module::Extract) >= 0.01
BuildRequires:  perl(Module::Manifest) >= 0.01
BuildRequires:  perl(Module::Math::Depends) >= 0.02
BuildRequires:  perl(Params::Util) >= 0.17
BuildRequires:  perl(PPI) >= 1.118
BuildRequires:  perl(Test::More) >= 0.47
BuildRequires:  perl(version) >= 0.74
BuildRequires:  perl(YAML::Tiny) >= 1.00
Requires:       perl(File::Find::Rule)
Requires:       perl(File::Find::Rule::Perl)
Requires:       perl(File::Find::Rule::VCS) >= 1.02
Requires:       perl(Module::Extract) >= 0.01
Requires:       perl(Module::Manifest) >= 0.01
Requires:       perl(Module::Math::Depends) >= 0.02
Requires:       perl(Params::Util) >= 0.17
Requires:       perl(PPI) >= 1.118
Requires:       perl(version) >= 0.74
Requires:       perl(YAML::Tiny) >= 1.00
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
An entire ecosystem of CPAN modules exist around the files and formats
relating to the CPAN itself. Parsers and object models for various
different types of files have been created over the years by various people
for various projects.

%prep
%setup -q -n Module-Inspector-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Sep 25 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.05-2
- add my email

* Tue Sep 23 2008 Marcela Ma??l????ov?? 1.05-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Inspector/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2008 19:14:43 -0000	1.1
+++ .cvsignore	29 Sep 2008 10:09:26 -0000	1.2
@@ -0,0 +1 @@
+Module-Inspector-1.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Inspector/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 19:14:43 -0000	1.1
+++ sources	29 Sep 2008 10:09:26 -0000	1.2
@@ -0,0 +1 @@
+3c433283d048cc7d4dd005e7db033700  Module-Inspector-1.05.tar.gz



From twaugh at fedoraproject.org  Mon Sep 29 10:13:20 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 29 Sep 2008 10:13:20 +0000 (UTC)
Subject: rpms/expendable/devel expendable.spec,1.1,1.2
Message-ID: <20080929101320.865E170110@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/expendable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12481

Modified Files:
	expendable.spec 
Log Message:
* Mon Sep 29 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-3
- Use dist in release tag.



Index: expendable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/devel/expendable.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- expendable.spec	29 Sep 2008 09:28:30 -0000	1.1
+++ expendable.spec	29 Sep 2008 10:12:50 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Home finances modeling program
 Name: expendable
 Version: 0.0.2
-Release: 2
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/expendable/
@@ -54,6 +54,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Mon Sep 29 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-3
+- Use dist in release tag.
+
 * Sun Sep 28 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-2
 - Re-install desktop file with fedora as the vendor.
 



From twaugh at fedoraproject.org  Mon Sep 29 10:13:37 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 29 Sep 2008 10:13:37 +0000 (UTC)
Subject: rpms/expendable/F-9 expendable.spec,1.2,1.3
Message-ID: <20080929101337.2D69870110@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/expendable/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12550

Modified Files:
	expendable.spec 
Log Message:
* Mon Sep 29 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-3
- Use dist in release tag.



Index: expendable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-9/expendable.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- expendable.spec	29 Sep 2008 09:50:23 -0000	1.2
+++ expendable.spec	29 Sep 2008 10:13:06 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Home finances modeling program
 Name: expendable
 Version: 0.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/expendable/
@@ -54,6 +54,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Mon Sep 29 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-3
+- Use dist in release tag.
+
 * Sun Sep 28 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-2
 - Re-install desktop file with fedora as the vendor.
 



From twaugh at fedoraproject.org  Mon Sep 29 10:14:40 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 29 Sep 2008 10:14:40 +0000 (UTC)
Subject: rpms/expendable/F-8 expendable-0.0.2.tar.bz2.sig, NONE,
	1.1 expendable.spec, NONE, 1.1 upstream-key.gpg, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20080929101440.6F3A770110@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/expendable/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12975

Modified Files:
	sources 
Added Files:
	expendable-0.0.2.tar.bz2.sig expendable.spec upstream-key.gpg 
Log Message:
Initial import.


--- NEW FILE expendable-0.0.2.tar.bz2.sig ---
??

--- NEW FILE expendable.spec ---
Summary: Home finances modeling program
Name: expendable
Version: 0.0.2
Release: 3%{?dist}
License: GPLv2+
Group: Applications/System
URL: https://fedorahosted.org/expendable/
# Add "?format=raw" to the following URL to download file:
Source0: https://fedorahosted.org/expendable/attachment/wiki/ProjectReleases/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python
BuildRequires: desktop-file-utils >= 0.2.92
Requires: numpy

%description
This is a program for modelling home finances. In particular, it can
be used to work how long it will take to pay back a mortgage if a
linked "offset" facility is available.  Offset accounts are like
savings accounts, but instead of accruing interest they reduce the
amount of interest charged for the mortgage by offsetting the loan
amount.

%prep
%setup -q

%build
%configure
make

%check
make check

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
rm -f %{buildroot}%{_datadir}/applications/%{name}.desktop
desktop-file-install					\
	--dir %{buildroot}%{_datadir}/applications	\
	--vendor fedora					\
	--add-category GTK				\
	--add-category Office				\
	--add-category Finance				\
	%{name}.desktop

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc AUTHORS README COPYING
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/*.desktop

%changelog
* Mon Sep 29 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-3
- Use dist in release tag.

* Sun Sep 28 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-2
- Re-install desktop file with fedora as the vendor.

* Fri Sep 26 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-1
- Initial spec file.


--- NEW FILE upstream-key.gpg ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.7 (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
-----END PGP PUBLIC KEY BLOCK-----


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 19:33:22 -0000	1.1
+++ sources	29 Sep 2008 10:14:10 -0000	1.2
@@ -0,0 +1 @@
+b43f6e674ce06ac6e5ca55e2c50ecc40  expendable-0.0.2.tar.bz2



From kasal at fedoraproject.org  Mon Sep 29 10:18:04 2008
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 29 Sep 2008 10:18:04 +0000 (UTC)
Subject: rpms/groff/devel groff-1.18-gzip.patch, 1.3, 1.4 groff.spec, 1.61, 
	1.62 groff-1.18-nohtml.patch, 1.3, NONE
Message-ID: <20080929101804.6AFA670110@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/groff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13436

Modified Files:
	groff-1.18-gzip.patch groff.spec 
Removed Files:
	groff-1.18-nohtml.patch 
Log Message:
- Replace groff-1.18-nohtml.patch by a code in spec file
- fix groff-1.18-gzip.patch to apply cleanly
- simplify the code for symlinking in %install

groff-1.18-gzip.patch:

Index: groff-1.18-gzip.patch
===================================================================
RCS file: /cvs/extras/rpms/groff/devel/groff-1.18-gzip.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- groff-1.18-gzip.patch	5 Jan 2006 14:49:14 -0000	1.3
+++ groff-1.18-gzip.patch	29 Sep 2008 10:18:03 -0000	1.4
@@ -7,7 +7,7 @@
 +XLIBS=-lz $(LIBGROFF)
  MLIB=$(LIBM)
  OBJS=\
-   env.o \
+   env.$(OBJEXT) \
 --- groff-1.18/src/roff/troff/input.cc.hugo	2002-11-04 21:30:09.000000000 +0100
 +++ groff-1.18/src/roff/troff/input.cc	2002-11-04 21:36:13.000000000 +0100
 @@ -42,6 +42,8 @@


Index: groff.spec
===================================================================
RCS file: /cvs/extras/rpms/groff/devel/groff.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- groff.spec	26 Mar 2008 13:47:06 -0000	1.61
+++ groff.spec	29 Sep 2008 10:18:04 -0000	1.62
@@ -3,7 +3,7 @@
 Summary: A document formatting system
 Name:	groff
 Version: 1.18.1.4
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2 and GFDL
 Group: Applications/Publishing
 URL: http://groff.ffii.org
@@ -15,7 +15,6 @@
 Patch1: groff-1.16-safer.patch
 Patch3: groff_1.18.1-15.diff
 Patch4: groff-1.18-info.patch
-Patch5: groff-1.18-nohtml.patch
 Patch6: groff-1.18-pfbtops_cpp.patch
 Patch7: groff-1.18-gzip.patch
 Patch9: groff-1.18.1-fixminus.patch
@@ -83,7 +82,7 @@
 %patch1 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
+#%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch9 -p1
@@ -114,7 +113,8 @@
 #PATH=$PATH:%{_prefix}/X11R6/bin
 #autoconf
 %configure --enable-multibyte
-make
+# no html docs
+make make_html=
 (cd doc && makeinfo groff.texinfo)
 %if %{with_x}
 cd src/xditview
@@ -124,8 +124,12 @@
 %install
 rm -rf ${RPM_BUILD_ROOT}
 #PATH=$PATH:%{_prefix}/X11R6/bin
-mkdir -p ${RPM_BUILD_ROOT}%{_prefix} ${RPM_BUILD_ROOT}%{_infodir}
-make install manroot=${RPM_BUILD_ROOT}%{_mandir} \
+mkdir -p ${RPM_BUILD_ROOT}%{_infodir}
+# 1) no html docs
+# 2) the list could be shorter if configure parameters were not expanded;
+#    %%configure should be fixed!
+make install make_html= make_install_html= \
+			manroot=${RPM_BUILD_ROOT}%{_mandir} \
 			bindir=%{buildroot}%{_bindir} \
 			mandir=%{buildroot}%{_mandir} \
 			prefix=%{buildroot}/usr \
@@ -148,33 +152,14 @@
 make install DESTDIR=${RPM_BUILD_ROOT}
 cd ../..
 %endif
-#mv $RPM_BUILD_ROOT%{_prefix}/man $RPM_BUILD_ROOT%{_prefix}/share
-ln -s s.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gs.tmac
-ln -s mse.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gmse.tmac
-ln -s m.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gm.tmac
-ln -s troff	${RPM_BUILD_ROOT}%{_bindir}/gtroff
-ln -s tbl ${RPM_BUILD_ROOT}%{_bindir}/gtbl
-ln -s pic ${RPM_BUILD_ROOT}%{_bindir}/gpic
-ln -s eqn ${RPM_BUILD_ROOT}%{_bindir}/geqn
-ln -s neqn ${RPM_BUILD_ROOT}%{_bindir}/gneqn
-ln -s refer ${RPM_BUILD_ROOT}%{_bindir}/grefer
-ln -s lookbib ${RPM_BUILD_ROOT}%{_bindir}/glookbib
-ln -s indxbib ${RPM_BUILD_ROOT}%{_bindir}/gindxbib
-ln -s soelim ${RPM_BUILD_ROOT}%{_bindir}/gsoelim
-ln -s soelim ${RPM_BUILD_ROOT}%{_bindir}/zsoelim
-ln -s nroff	${RPM_BUILD_ROOT}%{_bindir}/gnroff
-
-# Build system is compressing man-pages
-ln -s eqn.1.gz		${RPM_BUILD_ROOT}%{_mandir}/man1/geqn.1.gz
-ln -s indxbib.1.gz	${RPM_BUILD_ROOT}%{_mandir}/man1/gindxbib.1.gz
-ln -s lookbib.1.gz	${RPM_BUILD_ROOT}%{_mandir}/man1/glookbib.1.gz
-ln -s nroff.1.gz 	${RPM_BUILD_ROOT}%{_mandir}/man1/gnroff.1.gz
-ln -s pic.1.gz		${RPM_BUILD_ROOT}%{_mandir}/man1/gpic.1.gz
-ln -s refer.1.gz 	${RPM_BUILD_ROOT}%{_mandir}/man1/grefer.1.gz
-ln -s soelim.1.gz	${RPM_BUILD_ROOT}%{_mandir}/man1/gsoelim.1.gz
-ln -s soelim.1.gz	${RPM_BUILD_ROOT}%{_mandir}/man1/zsoelim.1.gz
-ln -s tbl.1.gz		${RPM_BUILD_ROOT}%{_mandir}/man1/gtbl.1.gz
-ln -s troff.1.gz 	${RPM_BUILD_ROOT}%{_mandir}/man1/gtroff.1.gz
+
+for file in {s,mse,m}.tmac; do
+	ln -s $file ${RPM_BUILD_ROOT}%{_datadir}/groff/%{version}/tmac/g$file
+done
+for file in g{{n,t}roff,tbl,pic,{,n}eqn,refer,{look,indx}bib} {g,z}soelim; do
+	ln -s ${file#?} ${RPM_BUILD_ROOT}%{_bindir}/$file
+	ln -s {${file#?},${RPM_BUILD_ROOT}%{_bindir}/$file}.1.gz
+done
 
 ln -s devnippon ${RPM_BUILD_ROOT}%{_datadir}/groff/%{version}/font/devkorean
 
@@ -182,10 +167,8 @@
 cat debian/mandoc.local >> ${RPM_BUILD_ROOT}%{_datadir}/groff/site-tmac/man.local
 
 find ${RPM_BUILD_ROOT}%{_bindir} ${RPM_BUILD_ROOT}%{_mandir} -type f -o -type l | \
-	grep -v afmtodit | grep -v grog | grep -v mdoc.samples |\
-	grep -v mmroff |\
-	grep -v gxditview |\
-	sed "s|${RPM_BUILD_ROOT}||g" | sed "s|\.[0-9]|\.*|g" > groff-files
+	sed "/afmtodit/d;/grog/d;/mdoc\.samples/d;/mmroff/d;/gxditview/d
+		s|${RPM_BUILD_ROOT}||g; s|\.[0-9]|\.*|g" > groff-files
 
 install -pm 644 %SOURCE6 $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/hyphen.cs
 
@@ -241,6 +224,11 @@
 %endif
 
 %changelog
+* Mon Sep 29 2008 Stepan Kasal <skasal at redhat.com> - 1.18.1.14-15
+- Replace groff-1.18-nohtml.patch by a code in spec file
+- fix groff-1.18-gzip.patch to apply cleanly
+- simplify the code for symlinking in %%install
+
 * Wed Mar 26 2008 Marcela Maslanova <mmaslano at redhat.com> - 1.18.1.4-14
 - 175459 warning goes on stderr
 


--- groff-1.18-nohtml.patch DELETED ---



From twaugh at fedoraproject.org  Mon Sep 29 10:18:15 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 29 Sep 2008 10:18:15 +0000 (UTC)
Subject: rpms/expendable/F-8 expendable.spec,1.1,1.2
Message-ID: <20080929101815.8530B70110@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/expendable/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13388

Modified Files:
	expendable.spec 
Log Message:
Bumped release.


Index: expendable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-8/expendable.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- expendable.spec	29 Sep 2008 10:14:10 -0000	1.1
+++ expendable.spec	29 Sep 2008 10:17:45 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Home finances modeling program
 Name: expendable
 Version: 0.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/expendable/
@@ -54,7 +54,7 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
-* Mon Sep 29 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-3
+* Mon Sep 29 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-4
 - Use dist in release tag.
 
 * Sun Sep 28 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-2



From twaugh at fedoraproject.org  Mon Sep 29 10:19:20 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 29 Sep 2008 10:19:20 +0000 (UTC)
Subject: rpms/expendable/F-9 expendable.spec,1.3,1.4
Message-ID: <20080929101920.B127A70110@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/expendable/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13764

Modified Files:
	expendable.spec 
Log Message:
Bump release.


Index: expendable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-9/expendable.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- expendable.spec	29 Sep 2008 10:13:06 -0000	1.3
+++ expendable.spec	29 Sep 2008 10:18:50 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Home finances modeling program
 Name: expendable
 Version: 0.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/expendable/
@@ -54,7 +54,7 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
-* Mon Sep 29 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-3
+* Mon Sep 29 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-4
 - Use dist in release tag.
 
 * Sun Sep 28 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-2



From twaugh at fedoraproject.org  Mon Sep 29 10:19:50 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 29 Sep 2008 10:19:50 +0000 (UTC)
Subject: rpms/expendable/devel expendable.spec,1.2,1.3
Message-ID: <20080929101950.2017870110@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/expendable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13904

Modified Files:
	expendable.spec 
Log Message:
Bump release.


Index: expendable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/devel/expendable.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- expendable.spec	29 Sep 2008 10:12:50 -0000	1.2
+++ expendable.spec	29 Sep 2008 10:19:19 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Home finances modeling program
 Name: expendable
 Version: 0.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/expendable/
@@ -54,7 +54,7 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
-* Mon Sep 29 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-3
+* Mon Sep 29 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-4
 - Use dist in release tag.
 
 * Sun Sep 28 2008 Tim Waugh <twaugh at redhat.com> 0.0.2-2



From hadess at fedoraproject.org  Mon Sep 29 10:37:47 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 29 Sep 2008 10:37:47 +0000 (UTC)
Subject: rpms/obex-data-server/devel .cvsignore, 1.9,
	1.10 obex-data-server.spec, 1.14, 1.15 sources, 1.9,
	1.10 obex-data-server-0.4-bluez4.patch, 1.1, NONE
Message-ID: <20080929103747.B971D70110@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/obex-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16085

Modified Files:
	.cvsignore obex-data-server.spec sources 
Removed Files:
	obex-data-server-0.4-bluez4.patch 
Log Message:
* Mon Sep 29 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.99-1
- Update to rev 1977



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obex-data-server/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	15 Sep 2008 14:46:00 -0000	1.9
+++ .cvsignore	29 Sep 2008 10:37:15 -0000	1.10
@@ -1 +1 @@
-obex-data-server-0.4svn-r1881.tar.gz
+obex-data-server-0.4svn-r1977.tar.gz


Index: obex-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obex-data-server/devel/obex-data-server.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- obex-data-server.spec	15 Sep 2008 15:02:39 -0000	1.14
+++ obex-data-server.spec	29 Sep 2008 10:37:15 -0000	1.15
@@ -1,13 +1,13 @@
 Name:		obex-data-server
-Version:	0.3.4
-Release:	8%{?dist}
+Version:	0.3.99
+Release:	1%{?dist}
 Epoch:		1
 Summary:	D-Bus service for Obex access
 
 Group:		System Environment/Daemons
 License:	GPLv2+
 #Source0:	http://tadas.dailyda.com/software/%{name}-%{version}.tar.gz
-Source0:	obex-data-server-0.4svn-r1881.tar.gz
+Source0:	obex-data-server-0.4svn-r1977.tar.gz
 Url:		http://tadas.dailyda.com/blog
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,8 +18,6 @@
 BuildRequires:	glib2-devel
 BuildRequires:	libtool
 
-Patch0:		obex-data-server-0.4-bluez4.patch
-
 %description
 obex-data-server is a D-Bus service to allow sending and receiving files
 using the ObexFTP and Obex Push protocols, common on mobile phones and
@@ -27,7 +25,6 @@
 
 %prep
 %setup -q -n obex-data-server-0.4svn
-%patch0 -p0 -b .bluez4
 
 %build
 %configure
@@ -66,6 +63,9 @@
 %{_mandir}/man1/obex-data-server.1.gz
 
 %changelog
+* Mon Sep 29 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.99-1
+- Update to rev 1977
+
 * Mon Sep 15 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-8
 - Add ImageMagic BR
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/obex-data-server/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Sep 2008 14:46:00 -0000	1.9
+++ sources	29 Sep 2008 10:37:15 -0000	1.10
@@ -1 +1 @@
-7fbc9c57752d01267432b1b82d21241a  obex-data-server-0.4svn-r1881.tar.gz
+c615ffb4ee4534af8ab83930bbedb401  obex-data-server-0.4svn-r1977.tar.gz


--- obex-data-server-0.4-bluez4.patch DELETED ---



From mschwendt at fedoraproject.org  Mon Sep 29 10:44:16 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 29 Sep 2008 10:44:16 +0000 (UTC)
Subject: extras-buildsys/server Repo.py,1.16.2.3.4.4,1.16.2.3.4.5
Message-ID: <20080929104416.4231870110@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/server
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16839

Modified Files:
      Tag: Plague-0_4_5
	Repo.py 
Log Message:
use try...finally in _update_repo_with_pushlock


Index: Repo.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v
retrieving revision 1.16.2.3.4.4
retrieving revision 1.16.2.3.4.5
diff -u -r1.16.2.3.4.4 -r1.16.2.3.4.5
--- Repo.py	4 Sep 2008 20:24:55 -0000	1.16.2.3.4.4
+++ Repo.py	29 Sep 2008 10:44:15 -0000	1.16.2.3.4.5
@@ -102,14 +102,10 @@
 
         try:
             self._update_repo()
-        except:
+        finally:
             if lockfile:
                 fcntl.flock(lockfile, fcntl.LOCK_UN)
                 lockfile.close()
-            raise
-        if lockfile:
-            fcntl.flock(lockfile, fcntl.LOCK_UN)
-            lockfile.close()
 
     def _update_repo(self):
         """ Copy new RPMS to each repo, and update each repo at the end """



From pkgdb at fedoraproject.org  Mon Sep 29 10:59:55 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 29 Sep 2008 10:59:55 +0000
Subject: [pkgdb] fusecompress had acl change status
Message-ID: <20080929105955.98CD4208D6F@bastion.fedora.phx.redhat.com>

lkundrak has set the watchbugzilla acl on fusecompress (Fedora devel) to Approved for lmacken

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fusecompress



From pkgdb at fedoraproject.org  Mon Sep 29 10:59:56 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 29 Sep 2008 10:59:56 +0000
Subject: [pkgdb] fusecompress had acl change status
Message-ID: <20080929105956.E430C208DA0@bastion.fedora.phx.redhat.com>

lkundrak has set the watchcommits acl on fusecompress (Fedora devel) to Approved for lmacken

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fusecompress



From pkgdb at fedoraproject.org  Mon Sep 29 10:59:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 29 Sep 2008 10:59:57 +0000
Subject: [pkgdb] fusecompress had acl change status
Message-ID: <20080929105957.6D843208DA7@bastion.fedora.phx.redhat.com>

lkundrak has set the commit acl on fusecompress (Fedora devel) to Approved for lmacken

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fusecompress



From pkgdb at fedoraproject.org  Mon Sep 29 10:59:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 29 Sep 2008 10:59:58 +0000
Subject: [pkgdb] fusecompress had acl change status
Message-ID: <20080929105958.354E7208DAB@bastion.fedora.phx.redhat.com>

lkundrak has set the approveacls acl on fusecompress (Fedora devel) to Approved for lmacken

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fusecompress



From timn at fedoraproject.org  Mon Sep 29 11:03:51 2008
From: timn at fedoraproject.org (Tim Niemueller)
Date: Mon, 29 Sep 2008 11:03:51 +0000 (UTC)
Subject: rpms/player/F-9 player-2.1.1-pkgconfig.patch, NONE, 1.1 player.spec,
	1.3, 1.4
Message-ID: <20080929110352.11EDC7013E@cvs1.fedora.phx.redhat.com>

Author: timn

Update of /cvs/pkgs/rpms/player/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18724

Modified Files:
	player.spec 
Added Files:
	player-2.1.1-pkgconfig.patch 
Log Message:
Added pkgconfig patch fixing .pc files on x86_64 (hardcoded libdir path)

Tim


player-2.1.1-pkgconfig.patch:

--- NEW FILE player-2.1.1-pkgconfig.patch ---
diff -urN player-2.1.1/client_libs/libplayerc/playerc.pc.in player-2.1.1-pkgconfig/client_libs/libplayerc/playerc.pc.in
--- player-2.1.1/client_libs/libplayerc/playerc.pc.in	2008-04-13 00:16:35.000000000 +0200
+++ player-2.1.1-pkgconfig/client_libs/libplayerc/playerc.pc.in	2008-09-29 12:41:10.000000000 +0200
@@ -1,8 +1,10 @@
 prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 Name: playerc
 Description: Andrew Howard's Player C client library - part of the Player/Stage Project
 Version: @VERSION@
 Requires: playerxdr playererror
-Libs: -L${prefix}/lib -lplayerc -lm
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
+Libs: -L${libdir} -lplayerc -lm
+Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
diff -urN player-2.1.1/client_libs/libplayerc++/playerc++.pc.in player-2.1.1-pkgconfig/client_libs/libplayerc++/playerc++.pc.in
--- player-2.1.1/client_libs/libplayerc++/playerc++.pc.in	2008-04-13 00:16:42.000000000 +0200
+++ player-2.1.1-pkgconfig/client_libs/libplayerc++/playerc++.pc.in	2008-09-29 12:41:32.000000000 +0200
@@ -1,4 +1,6 @@
 prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 # this gives access to the player header files for compiling plugins
 
@@ -6,5 +8,5 @@
 Description: C++ wrapper for libplayerc
 Version: @VERSION@
 Requires: playerxdr playerc
-Libs: -L${prefix}/lib -lplayerc++ @PLAYERCC_LIB@
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@ @PLAYERCC_EXTRA_CFLAGS@
+Libs: -L${libdir} -lplayerc++ @PLAYERCC_LIB@
+Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@ @PLAYERCC_EXTRA_CFLAGS@
diff -urN player-2.1.1/libplayercore/playercore.pc.in player-2.1.1-pkgconfig/libplayercore/playercore.pc.in
--- player-2.1.1/libplayercore/playercore.pc.in	2008-04-13 00:16:48.000000000 +0200
+++ player-2.1.1-pkgconfig/libplayercore/playercore.pc.in	2008-09-29 12:42:05.000000000 +0200
@@ -1,6 +1,8 @@
 # DO NOT edit playercore.pc; edit playercore.pc.in instead
 
 prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 # this gives access to the player header files for compiling plugins
 
@@ -8,5 +10,5 @@
 Description: Player robot interface library - part of the Player Project
 Version: @VERSION@
 Requires: playererror
-Libs: -L${prefix}/lib -lplayercore @LIBLTDL_FLAG@ -lpthread
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
+Libs: -L${libdir} -lplayercore @LIBLTDL_FLAG@ -lpthread
+Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
diff -urN player-2.1.1/libplayercore/playererror.pc.in player-2.1.1-pkgconfig/libplayercore/playererror.pc.in
--- player-2.1.1/libplayercore/playererror.pc.in	2008-04-13 00:16:48.000000000 +0200
+++ player-2.1.1-pkgconfig/libplayercore/playererror.pc.in	2008-09-29 12:41:51.000000000 +0200
@@ -1,6 +1,8 @@
 # DO NOT edit playererror.pc; edit playererror.pc.in instead
 
 prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 # this gives access to the player header files for compiling plugins
 
@@ -8,5 +10,5 @@
 Description: Player error reporting library - part of the Player Project
 Version: @VERSION@
 Requires: 
-Libs: -L${prefix}/lib -lplayererror
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
+Libs: -L${libdir} -lplayererror
+Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
diff -urN player-2.1.1/libplayercore/playerutils.pc.in player-2.1.1-pkgconfig/libplayercore/playerutils.pc.in
--- player-2.1.1/libplayercore/playerutils.pc.in	2008-04-13 00:16:48.000000000 +0200
+++ player-2.1.1-pkgconfig/libplayercore/playerutils.pc.in	2008-09-29 12:42:23.000000000 +0200
@@ -1,6 +1,8 @@
 # DO NOT edit playerutils.pc; edit playerutils.pc.in instead
 
 prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 # this gives access to the player header files for compiling plugins
 
@@ -8,5 +10,5 @@
 Description: Player utilities library - part of the Player Project
 Version: @VERSION@
 Requires: 
-Libs: -L${prefix}/lib -lplayerutils
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
+Libs: -L${libdir} -lplayerutils
+Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
diff -urN player-2.1.1/libplayersd/playersd.pc.in player-2.1.1-pkgconfig/libplayersd/playersd.pc.in
--- player-2.1.1/libplayersd/playersd.pc.in	2008-04-13 00:16:22.000000000 +0200
+++ player-2.1.1-pkgconfig/libplayersd/playersd.pc.in	2008-09-29 12:38:11.000000000 +0200
@@ -6,5 +6,5 @@
 Description: Player service discovery library - part of the Player Project
 Version: @VERSION@
 Requires: playererror playerutils
-Libs: -L${prefix}/lib -lplayersd @EXTRA_DNS_SD_LIBS@ -lpthread
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
+Libs: -L at libdir@ -lplayersd @EXTRA_DNS_SD_LIBS@ -lpthread
+Cflags: -I at includedir@/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
diff -urN player-2.1.1/libplayertcp/playertcp.pc.in player-2.1.1-pkgconfig/libplayertcp/playertcp.pc.in
--- player-2.1.1/libplayertcp/playertcp.pc.in	2008-04-13 00:15:28.000000000 +0200
+++ player-2.1.1-pkgconfig/libplayertcp/playertcp.pc.in	2008-09-29 12:40:16.000000000 +0200
@@ -1,10 +1,12 @@
 # DO NOT edit playertcp.pc; edit playertcp.pc.in instead
 
 prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 Name: playertcp
 Description: Player TCP messaging library - part of the Player/Stage Project
 Version: @VERSION@
 Requires: playererror playercore
-Libs: -L${prefix}/lib -lplayertcp
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
+Libs: -L${libdir} -lplayertcp
+Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
diff -urN player-2.1.1/libplayertcp/playerudp.pc.in player-2.1.1-pkgconfig/libplayertcp/playerudp.pc.in
--- player-2.1.1/libplayertcp/playerudp.pc.in	2008-04-13 00:15:28.000000000 +0200
+++ player-2.1.1-pkgconfig/libplayertcp/playerudp.pc.in	2008-09-29 12:40:32.000000000 +0200
@@ -1,10 +1,12 @@
 # DO NOT edit playerudp.pc; edit playerudp.pc.in instead
 
 prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 Name: playerudp
 Description: Player UDP messaging library - part of the Player/Stage Project
 Version: @VERSION@
 Requires: playererror playercore
-Libs: -L${prefix}/lib -lplayerudp
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
+Libs: -L${libdir} -lplayerudp
+Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
diff -urN player-2.1.1/libplayerxdr/playerxdr.pc.in player-2.1.1-pkgconfig/libplayerxdr/playerxdr.pc.in
--- player-2.1.1/libplayerxdr/playerxdr.pc.in	2008-04-13 00:16:56.000000000 +0200
+++ player-2.1.1-pkgconfig/libplayerxdr/playerxdr.pc.in	2008-09-29 12:42:41.000000000 +0200
@@ -1,10 +1,12 @@
 # DO NOT edit playerxdr.pc; edit playerxdr.pc.in instead
 
 prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 Name: playerxdr
 Description: Player XDR messaging library - part of the Player/Stage Project
 Version: @VERSION@
 Requires:
-Libs: -L${prefix}/lib -lplayerxdr
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
+Libs: -L${libdir} -lplayerxdr
+Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
diff -urN player-2.1.1/server/libplayerdrivers/playerdrivers.pc.in player-2.1.1-pkgconfig/server/libplayerdrivers/playerdrivers.pc.in
--- player-2.1.1/server/libplayerdrivers/playerdrivers.pc.in	2008-04-13 00:15:31.000000000 +0200
+++ player-2.1.1-pkgconfig/server/libplayerdrivers/playerdrivers.pc.in	2008-09-29 12:40:54.000000000 +0200
@@ -1,6 +1,8 @@
 # DO NOT edit playerdrivers.pc; edit playerdrivers.pc.in instead
 
 prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 # this gives access to the player header files for compiling plugins
 
@@ -8,5 +10,5 @@
 Description: Player driver library - part of the Player/Stage Project
 Version: @VERSION@
 Requires: playercore
-Libs: -L${prefix}/lib -lplayerdrivers -lpthread
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
+Libs: -L${libdir} -lplayerdrivers -lpthread
+Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@


Index: player.spec
===================================================================
RCS file: /cvs/pkgs/rpms/player/F-9/player.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- player.spec	2 Sep 2008 18:09:48 -0000	1.3
+++ player.spec	29 Sep 2008 11:03:21 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           player
 Version:        2.1.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Cross-platform robot device interface and server
 
 Group:          Applications/System
@@ -16,6 +16,7 @@
 Patch1:         %{name}-2.1.1-norpath.patch
 Patch2:         %{name}-2.1.0rc2-paths.patch
 Patch3:         %{name}-2.1.1-plugindir.patch
+Patch4:         %{name}-2.1.1-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  autoconf, automake
@@ -102,6 +103,7 @@
 %patch1 -p1 -b .norpath
 %patch2 -p1 -b .paths
 %patch3 -p1 -b .plugindir
+%patch4 -p1 -b .pkgconfig
 
 
 %build
@@ -196,6 +198,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Sep 29 2008 Tim Niemueller <tim at niemueller.de> - 2.1.1-6
+- Added pkgconfig patch
+
 * Tue Sep 02 2008 Tim Niemueller <tim at niemueller.de> - 2.1.1-5
 - Added plugindir patch
 



From rbhalera at fedoraproject.org  Mon Sep 29 11:06:16 2008
From: rbhalera at fedoraproject.org (Rahul Bhalerao)
Date: Mon, 29 Sep 2008 11:06:16 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.120,1.121
Message-ID: <20080929110616.C56F470110@cvs1.fedora.phx.redhat.com>

Author: rbhalera

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19239

Modified Files:
	comps-f10.xml.in 
Log Message:
Updated language support groups


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- comps-f10.xml.in	29 Sep 2008 07:08:54 -0000	1.120
+++ comps-f10.xml.in	29 Sep 2008 11:05:46 -0000	1.121
@@ -2812,6 +2812,9 @@
     <langonly>ks</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-fonts-kashmiri</packagereq>
+      <packagereq type="default">m17n-contrib-hindi</packagereq>
+      <packagereq type="default">m17n-db-hindi</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-hindi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2979,6 +2982,9 @@
     <langonly>kok</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-fonts-konkani</packagereq>
+      <packagereq type="default">m17n-contrib-hindi</packagereq>
+      <packagereq type="default">m17n-db-hindi</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-hindi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3222,6 +3228,9 @@
     <langonly>mai</langonly>
     <packagelist>
       <packagereq type="default">lohit-fonts-maithili</packagereq>
+      <packagereq type="default">m17n-contrib-hindi</packagereq>
+      <packagereq type="default">m17n-db-hindi</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-hindi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3284,7 +3293,7 @@
     <uservisible>false</uservisible>
     <langonly>mr</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-fonts-hindi</packagereq>
+      <packagereq type="mandatory">lohit-fonts-marathi</packagereq>
       <packagereq type="mandatory">m17n-contrib-marathi</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-mr</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-mr</packagereq>



From tagoh at fedoraproject.org  Mon Sep 29 11:52:32 2008
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Mon, 29 Sep 2008 11:52:32 +0000 (UTC)
Subject: rpms/imsettings/devel imsettings.spec,1.12,1.13
Message-ID: <20080929115232.BB9DB70110@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23560

Modified Files:
	imsettings.spec 
Log Message:
* Mon Sep 29 2008 Akira TAGOH <tagoh at redhat.com> - 0.104.1-2
- Fix a gconf error in %%pre. (#464453)


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- imsettings.spec	25 Sep 2008 03:52:10 -0000	1.12
+++ imsettings.spec	29 Sep 2008 11:52:00 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.104.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)
@@ -113,7 +113,9 @@
 %pre
 if [ "$1" -gt 1 ]; then
 	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas > /dev/null || :
+	if [ -f %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas ]; then
+		gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas > /dev/null || :
+	fi
 fi
 
 %post
@@ -178,6 +180,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Akira TAGOH <tagoh at redhat.com> - 0.104.1-2
+- Fix a gconf error in %%pre. (#464453)
+
 * Thu Sep 25 2008 Akira TAGOH <tagoh at redhat.com> - 0.104.1-1
 - New upstream release.
   - Fix a segfault issue. (#462899)



From hadess at fedoraproject.org  Mon Sep 29 12:15:24 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 29 Sep 2008 12:15:24 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.6, 1.7 bluez.spec, 1.11, 1.12 sources,
	1.6, 1.7
Message-ID: <20080929121524.8CC0370110@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26049

Modified Files:
	.cvsignore bluez.spec sources 
Log Message:
* Mon Sep 29 2008 - Bastien Nocera <bnocera at redhat.com> - 4.9-1
- Update to 4.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Sep 2008 08:46:49 -0000	1.6
+++ .cvsignore	29 Sep 2008 12:14:52 -0000	1.7
@@ -1 +1 @@
-bluez-4.8.tar.gz
+bluez-4.9.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bluez.spec	29 Sep 2008 08:46:49 -0000	1.11
+++ bluez.spec	29 Sep 2008 12:14:52 -0000	1.12
@@ -1,6 +1,6 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.8
+Version: 4.9
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -181,6 +181,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Mon Sep 29 2008 - Bastien Nocera <bnocera at redhat.com> - 4.9-1
+- Update to 4.9
+
 * Mon Sep 29 2008 - Bastien Nocera <bnocera at redhat.com> - 4.8-1
 - Update to 4.8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Sep 2008 08:46:49 -0000	1.6
+++ sources	29 Sep 2008 12:14:52 -0000	1.7
@@ -1 +1 @@
-dd7d48ae21a65767bb5eba3cc0209842  bluez-4.8.tar.gz
+064668b1d2895d1c13f33e14a3ebeb91  bluez-4.9.tar.gz



From hadess at fedoraproject.org  Mon Sep 29 12:17:59 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 29 Sep 2008 12:17:59 +0000 (UTC)
Subject: rpms/bluez-gnome/devel .cvsignore, 1.26, 1.27 bluez-gnome.spec, 1.60,
	1.61 sources, 1.26, 1.27
Message-ID: <20080929121759.0C26F70110@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26520

Modified Files:
	.cvsignore bluez-gnome.spec sources 
Log Message:
* Mon Sep 29 2008 - Bastien Nocera <bnocera at redhat.com> - 1.6-1
- Update to 1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	27 Sep 2008 10:43:21 -0000	1.26
+++ .cvsignore	29 Sep 2008 12:17:28 -0000	1.27
@@ -1 +1 @@
-bluez-gnome-1.5.tar.gz
+bluez-gnome-1.6.tar.gz


Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- bluez-gnome.spec	29 Sep 2008 09:21:28 -0000	1.60
+++ bluez-gnome.spec	29 Sep 2008 12:17:28 -0000	1.61
@@ -1,6 +1,6 @@
 Name:		bluez-gnome
-Version:	1.5
-Release:	2%{?dist}
+Version:	1.6
+Release:	1%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
@@ -141,6 +141,9 @@
 %{_mandir}/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Mon Sep 29 2008 - Bastien Nocera <bnocera at redhat.com> - 1.6-1
+- Update to 1.6
+
 * Mon Sep 29 2008 - Bastien Nocera <bnocera at redhat.com> - 1.5-2
 - Add another patch for Bluetooth sendto support for BlueZ 4.x
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	27 Sep 2008 10:43:21 -0000	1.26
+++ sources	29 Sep 2008 12:17:28 -0000	1.27
@@ -1 +1 @@
-d50b0b236015e49578bc43bb3512505a  bluez-gnome-1.5.tar.gz
+9c1d0be77152f2cffe1a2df94fb407b6  bluez-gnome-1.6.tar.gz



From belegdol at fedoraproject.org  Mon Sep 29 12:51:01 2008
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Mon, 29 Sep 2008 12:51:01 +0000 (UTC)
Subject: rpms/gnome-chemistry-utils/devel .cvsignore, 1.12,
	1.13 gnome-chemistry-utils.spec, 1.25, 1.26 sources, 1.12, 1.13
Message-ID: <20080929125101.B676670110@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31003

Modified Files:
	.cvsignore gnome-chemistry-utils.spec sources 
Log Message:
* Mon Sep 29 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.92-1
- Updated to 0.9.92
- Added hicolor-icon-theme to Requires



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	14 Sep 2008 08:32:17 -0000	1.12
+++ .cvsignore	29 Sep 2008 12:50:30 -0000	1.13
@@ -1 +1 @@
-gnome-chemistry-utils-0.9.91.tar.bz2
+gnome-chemistry-utils-0.9.92.tar.bz2


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/gnome-chemistry-utils.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnome-chemistry-utils.spec	15 Sep 2008 13:37:36 -0000	1.25
+++ gnome-chemistry-utils.spec	29 Sep 2008 12:50:30 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           gnome-chemistry-utils
-Version:        0.9.91
-Release:        2%{?dist}
+Version:        0.9.92
+Release:        1%{?dist}
 Summary:        A set of chemical utilities
 
 Group:          Applications/Engineering
@@ -29,6 +29,7 @@
 
 Requires:       bodr
 Requires:       chemical-mime-data
+Requires:       hicolor-icon-theme
 
 Requires(pre):  GConf2
 Requires(post): GConf2
@@ -217,6 +218,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.92-1
+- Updated to 0.9.92
+- Added hicolor-icon-theme to Requires
+
 * Mon Sep 15 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.91-2
 - Added bodr to Requires
 - Added chrpath to BuildRequires


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	14 Sep 2008 08:32:17 -0000	1.12
+++ sources	29 Sep 2008 12:50:30 -0000	1.13
@@ -1 +1 @@
-d35d8a1321715bc0d41493c5d7b04c3a  gnome-chemistry-utils-0.9.91.tar.bz2
+bcb702e88e677ddacd991e81ac373620  gnome-chemistry-utils-0.9.92.tar.bz2



From mmaslano at fedoraproject.org  Mon Sep 29 12:55:51 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 29 Sep 2008 12:55:51 +0000 (UTC)
Subject: rpms/tclx/devel tclx.spec,1.22,1.23
Message-ID: <20080929125552.087FD70110@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/tclx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31697

Modified Files:
	tclx.spec 
Log Message:
* Tue Sep 29 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 8.4.0-12
- review, thanks for help to Patrice Dumas



Index: tclx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tclx/devel/tclx.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- tclx.spec	4 Mar 2008 13:07:38 -0000	1.22
+++ tclx.spec	29 Sep 2008 12:55:21 -0000	1.23
@@ -1,20 +1,21 @@
+%bcond_without wcheck
+
 %{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
+
 %define major_ver 8.4
+%define upversion 8.5
 %define tcltk_ver 8.4.13
 #define for 8.4 is needed, tclx wasn't updated on higher version
 
-# Disable 'make test' for now since the unit tests are broken
-%define _without_check 1
-
 Summary: Extensions for Tcl and Tk
 Name: tclx
 Version: %{major_ver}.0
-Release: 10%{?dist}
+Release: 12%{?dist}
 License: BSD
 Group: Development/Languages
 URL: http://tclx.sourceforge.net/
-Source: http://prdownloads.sourceforge.net/tclx/tclx%{major_ver}.tar.bz2
+Source: http://downloads.sourceforge.net/%{name}/%{name}%{major_ver}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: tcl >= %{tcltk_ver}, tk >= %{tcltk_ver}
 BuildRequires: tcl-devel >= %{tcltk_ver}, tk-devel >= %{tcltk_ver}
@@ -29,7 +30,6 @@
 application development. TclX provides additional interfaces to the
 operating system, and adds many new programming constructs, text manipulation
 and debugging tools.
-This package contains the tclx documentation.
 
 %package devel
 Summary: Extended Tcl development files
@@ -37,14 +37,8 @@
 Requires: tclx = %{version}-%{release}
 
 %description devel
-Extended Tcl (TclX) is a set of extensions to the Tcl programming language.
-Extended Tcl is oriented towards system programming tasks and large
-application development.  TclX provides additional interfaces to the
-operating system, and adds many new programming constructs, text manipulation
-and debugging tools.
-
 This package contains the tclx development files needed for building
-tix applications.
+applications embedding tclx.
 
 %prep
 %setup -q -n tclx%{major_ver}
@@ -69,39 +63,42 @@
 
 %check
 # run "make test" by default
-%{?_without_check: %define _without_check 1}
-%{!?_without_check: %define _without_check 0}
-
-%if ! %{_without_check}
+%if %{without wcheck}
    make test
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# utf-8 locale needed to avoid truncating help files
-# it's easy way to change encoding on utf8
-LANG=en_US.UTF-8 make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README
-%{tcl_sitearch}/%{name}%{major_ver}
+%{_libdir}/tcl8.5/tclx8.4/
+%exclude %{_mandir}/man3/CmdWrite.*
+%exclude %{_mandir}/man3/Handles.*
+%exclude %{_mandir}/man3/TclXInit.3*
+%exclude %{_mandir}/man3/Keylist.3*
 %{_mandir}/mann/*
 %{_mandir}/man3/*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
+%{_mandir}/man3/TclXInit.3*
+%{_mandir}/man3/Keylist.3*
 
 %changelog
+* Tue Sep 29 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 8.4.0-12
+- review, thanks for help to Patrice Dumas
+
+* Tue Sep 23 2008 Marcela Maslanova <mmaslano at redhat.com> - 8.4.0-11
+- change macros
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 8.4.0-10
 - Autorebuild for GCC 4.3
 



From cscott at fedoraproject.org  Mon Sep 29 13:08:16 2008
From: cscott at fedoraproject.org (C. Scott Ananian)
Date: Mon, 29 Sep 2008 13:08:16 +0000 (UTC)
Subject: rpms/olpc-utils/OLPC-3 diskspace.patch, NONE, 1.1 olpc-utils.spec, 
	1.20, 1.21
Message-ID: <20080929130816.66E3970110@cvs1.fedora.phx.redhat.com>

Author: cscott

Update of /cvs/pkgs/rpms/olpc-utils/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv945

Modified Files:
	olpc-utils.spec 
Added Files:
	diskspace.patch 
Log Message:
dlo#7932: Fix failsafe script in the presence of pretty-boot.


diskspace.patch:

--- NEW FILE diskspace.patch ---
commit fc768d34a543ca40cd4d84e38da522bcccf9ebe3
Author: Chris Ball <cjb at laptop.org>
Date:   Sat Sep 27 20:50:43 2008 -0400

    dlo#7932: Fix failsafe script in the presence of pretty-boot.
    
    This is more complicated than I'd hoped.  In the presence of pretty-boot
    we're started with input coming in on tty2 but output happening on tty1.
    The resolution is to have one script that checks to see whether we're
    in pretty-boot and switches to VT2 if we are, and to move the script
    that actually does input/output to "diskspacerecover".  On ugly-boot
    it'll run on tty1 as normal, on pretty-boot it'll run on tty2.
    
    A long-term fix is to have /etc/init.d/z-boot-anim-stop return us to
    a more sane environment than this; it should set the controlling
    terminal back to tty1 and chvt 1, but I wasn't able to make this work.

diff --git a/etc/rc.d/init.d/diskspacecheck b/etc/rc.d/init.d/diskspacecheck
index c4411a5..7095fa2 100755
--- a/etc/rc.d/init.d/diskspacecheck
+++ b/etc/rc.d/init.d/diskspacecheck
@@ -2,110 +2,38 @@
 # -*- coding: utf-8 -*-
 #
 # chkconfig: 345 02 02
-# description: If the NAND doesn't have enough free space, delete datastore\
-#              objects until it does.  This doesn't modify the datastore's\
-#              index.
+# description: If the NAND doesn't have enough free space, set up a VT for\
+#              diskspacerecover.
 # processname: diskspacecheck
 
 # Author:      Chris Ball <cjb at laptop.org>
 
-import os, sys, statvfs, subprocess, shutil
+import os, sys, statvfs, pyvt, time
 
 THRESHOLD = 1024 * 20  # 20MB
 DATASTORE_PATH = "/home/olpc/.sugar/default/datastore/store/*-*"
 ACTIVITY_PATH  = "/home/olpc/Activities/*"
 
-def main():
-    # First, check to see whether we have enough free space.
-    if find_freespace() < THRESHOLD:
-        print "Not enough disk space."
-
-        # Per Trac #5637, delete orphaned leaks in .sugar/default/data.
-        # This is safe on any build.
-        try:
-            shutil.rmtree("/home/olpc/.sugar/default/data")
-        except OSError:
-            pass
-        
-        if find_freespace() >= THRESHOLD:
-            # The above gained enough free space.
-            return
-
-        # Okay, we'll have to delete some real data.
-        # Add datastore files to filelist string
-        lines = os.popen("du -s %s" % DATASTORE_PATH).readlines()
-        
-        # Add activities to filelist
-        lines += (os.popen("du -s %s" % ACTIVITY_PATH).readlines())
-        
-        filesizes = [line.split('\t') for line in lines]
-        for file in filesizes:
-           file[0] = int(file[0])     # size
-           file[1] = file[1].rstrip() # path
-        filesizes.sort()
-        filelist = [file[1] for file in filesizes]
-        
-        # Unfreeze the DCON, print a message.
-        unfreeze_dcon()
-
-        # The below string is in latin-1, because Unicode isn't present
-        # in the environment when this script runs.
-        string = u"""
-Your disk is nearly full.  The system cannot operate with a full disk.
-To create free space, some of the entries in your Journal will now be
-deleted.  If you wish to avoid having items deleted, power down your
-XO and bring it to an expert for backup and recovery.
-
-Error code:  DISKFULL
-
-Press the return key to delete some Journal entries, or the 'c' key 
-and then return key to attempt to boot anyway.
-
-
-Su disco est?? casi lleno.  El sistema no puede funcionar si el disco
-est?? lleno.  Para liberar espacio, se deben borrar algunas entradas de
-su Diario ahora.  Si prefiere no tener que borrar datos, apague su XO y
-ll??velo a un experto para que haga una copia de seguridad y
-recuperaci??n de datos.
-
-C??digo del error:  DISKFULL
-
-Pulse retorno tecla para borrar algunas entradas del Diario, o presiona 
-'c' y retorno para iniciar de cualquier manera.
-"""
-
-        key = raw_input(string.encode('utf-8'))
-
-        if key is 'c':
-           return
-            
-        # Now, delete files/directories one at a time.
-        while find_freespace() < THRESHOLD and len(filelist) > 0:
-            delete_entry(filelist.pop())
-
-def find_freespace():
-    # Determine free space on /.
-    stat = os.statvfs("/")
-    freebytes  = stat[statvfs.F_BSIZE] * stat[statvfs.F_BAVAIL]
-    freekbytes = freebytes / 1024
-    return freekbytes
-
-def delete_entry(entry):
-    # Delete a single file from the datastore, or an activity directory
-    print "Deleting " + entry
-    try:
-        if os.path.isdir(entry):
-            shutil.rmtree(entry)
-        else:
-            os.remove(entry)                
-    except OSError:
-        print "Couldn't delete " + entry
-
-def unfreeze_dcon():
-    # Don't think there's anything useful I can do if this write fails.
-    dcon = open('/sys/class/backlight/dcon-bl/device/freeze', 'w')
-    dcon.write('0')
-    dcon.close()
-    os.system("/sbin/setsysfont")
-    os.system("/bin/unicode_start sun12x22")
-main()
+# Determine free space on /.
+stat = os.statvfs("/")
+freebytes  = stat[statvfs.F_BSIZE] * stat[statvfs.F_BAVAIL]
+freekbytes = freebytes / 1024
+
+# If we have enough disk space, exit.
+if freekbytes > THRESHOLD:
+    exit
+
+# Disable pretty-boot.
+if os.system("ps awux | grep 0-boot-anim-start | grep -v grep") == 0:
+    # Pretty-boot is running.  Kill it, and set up a new VT for the next script.
+    os.system("/etc/init.d/z-boot-anim-stop start")
+    pyvt.chcon("/dev/tty1")
+    pyvt.chcon("/dev/console")
+    pyvt.chvt(2)
+
+# Don't think there's anything useful I can do if this write fails.
+dcon = open('/sys/class/backlight/dcon-bl/device/freeze', 'w')
+dcon.write('0')
+dcon.close()
+os.system("/sbin/setsysfont")
+os.system("/bin/unicode_start sun12x22")
diff --git a/etc/rc.d/init.d/diskspacerecover b/etc/rc.d/init.d/diskspacerecover
new file mode 100755
index 0000000..050a051
--- /dev/null
+++ b/etc/rc.d/init.d/diskspacerecover
@@ -0,0 +1,101 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# chkconfig: 345 03 03
+# description: If the NAND doesn't have enough free space, delete datastore\
+#              objects until it does.  This doesn't modify the datastore's\
+#              index.
+# processname: diskspacerecover
+
+# Author:      Chris Ball <cjb at laptop.org>
+
+import os, sys, statvfs, subprocess, shutil, fcntl
+
+THRESHOLD = 1024 * 600  # 20MB
+DATASTORE_PATH = "/home/olpc/.sugar/default/datastore/store/*-*"
+ACTIVITY_PATH  = "/home/olpc/Activities/*"
+
+def main():
+    # First, check to see whether we have enough free space.
+    if find_freespace() < THRESHOLD:
+        print "Not enough disk space."
+
+        # Per Trac #5637, delete orphaned leaks in .sugar/default/data.
+        # This is safe on any build.
+        try:
+            shutil.rmtree("/home/olpc/.sugar/default/data")
+        except OSError:
+            pass
+        
+        if find_freespace() >= THRESHOLD:
+            # The above gained enough free space.
+            return
+
+        # Okay, we'll have to delete some real data.
+        # Add datastore files to filelist string
+        lines = os.popen("du -s %s" % DATASTORE_PATH).readlines()
+        
+        # Add activities to filelist
+        lines += (os.popen("du -s %s" % ACTIVITY_PATH).readlines())
+        
+        filesizes = [line.split('\t') for line in lines]
+        for file in filesizes:
+           file[0] = int(file[0])     # size
+           file[1] = file[1].rstrip() # path
+        filesizes.sort()
+        filelist = [file[1] for file in filesizes]
+        
+        # The below string is in latin-1, because Unicode isn't present
+        # in the environment when this script runs.
+        string = u"""
+Your disk is nearly full.  The system cannot operate with a full disk.
+To create free space, some of the entries in your Journal will now be
+deleted.  If you wish to avoid having items deleted, power down your
+XO and bring it to an expert for backup and recovery.
+
+Error code:  DISKFULL
+
+Press the return key to delete some Journal entries, or the 'c' key 
+and then return key to attempt to boot anyway.
+
+
+Su disco est?? casi lleno.  El sistema no puede funcionar si el disco
+est?? lleno.  Para liberar espacio, se deben borrar algunas entradas de
+su Diario ahora.  Si prefiere no tener que borrar datos, apague su XO y
+ll??velo a un experto para que haga una copia de seguridad y
+recuperaci??n de datos.
+
+C??digo del error:  DISKFULL
+
+Pulse retorno tecla para borrar algunas entradas del Diario, o presiona 
+'c' y retorno para iniciar de cualquier manera.
+"""
+
+        key = raw_input(string.encode('utf-8'))
+
+        if key is 'c':
+           return
+            
+        # Now, delete files/directories one at a time.
+        while find_freespace() < THRESHOLD and len(filelist) > 0:
+            delete_entry(filelist.pop())
+
+def find_freespace():
+    # Determine free space on /.
+    stat = os.statvfs("/")
+    freebytes  = stat[statvfs.F_BSIZE] * stat[statvfs.F_BAVAIL]
+    freekbytes = freebytes / 1024
+    return freekbytes
+
+def delete_entry(entry):
+    # Delete a single file from the datastore, or an activity directory
+    print "Deleting " + entry
+    try:
+        if os.path.isdir(entry):
+            shutil.rmtree(entry)
+        else:
+            os.remove(entry)                
+    except OSError:
+        print "Couldn't delete " + entry
+
+main()


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/olpc-utils.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- olpc-utils.spec	23 Sep 2008 20:22:47 -0000	1.20
+++ olpc-utils.spec	29 Sep 2008 13:07:46 -0000	1.21
@@ -1,6 +1,6 @@
 Name:       olpc-utils
 Version:    0.87
-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 @@
 Source0:    %{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:     diskspace.patch
+
 # for olpc-dm
 BuildRequires:  pam-devel
 Requires:       pam
@@ -28,7 +30,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 make -f Makefile.build %{?_smp_mflags}
@@ -42,12 +44,14 @@
 %post
 /sbin/chkconfig --add olpc-configure
 /sbin/chkconfig --add diskspacecheck
+/sbin/chkconfig --add diskspacerecover
 
 
 %preun
 if [ $1 = 0 ]; then
     /sbin/chkconfig --del olpc-configure
     /sbin/chkconfig --del diskspacecheck
+    /sbin/chkconfig --del diskspacerecover
 fi
 
 
@@ -73,6 +77,7 @@
 %{_sysconfdir}/cron.d/olpc-pwr-prof.cron
 %{_sysconfdir}/rc.d/init.d/olpc-configure
 %{_sysconfdir}/rc.d/init.d/diskspacecheck
+%{_sysconfdir}/rc.d/init.d/diskspacerecover
 %config(noreplace) %{_sysconfdir}/hal/fdi/policy/x11-input.fdi
 %config(noreplace) %{_sysconfdir}/motd.olpc
 %config(noreplace) %{_sysconfdir}/X11/xorg-dcon.conf
@@ -85,6 +90,10 @@
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-foreground-compat.ck
 
 %changelog
+* Mon Sep 29 2008 C. Scott Ananian <cscott at laptop.org> 0.87-2
+- Chris Ball (1):
+    dlo#7932: Fix failsafe script in the presence of pretty-boot.
+
 * Tue Sep 23 2008 Michael Stone <michael at laptop.org> 0.87-1
 - Chris Ball (1):
     dlo#7932: Set up utf8 environment, and display a UTF-8 string.



From tmraz at fedoraproject.org  Mon Sep 29 13:14:36 2008
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 29 Sep 2008 13:14:36 +0000 (UTC)
Subject: rpms/workrave/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 workrave.spec, 1.16, 1.17 workrave-1.8.5-gcc43.patch, 1.1,
	NONE workrave-1.8.5-lock.patch, 1.1,
	NONE workrave-1.8.5-sigc.patch, 1.2, NONE workrave.desktop, 1.2, NONE
Message-ID: <20080929131436.9026A70110@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/workrave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2243

Modified Files:
	.cvsignore sources workrave.spec 
Removed Files:
	workrave-1.8.5-gcc43.patch workrave-1.8.5-lock.patch 
	workrave-1.8.5-sigc.patch workrave.desktop 
Log Message:
* Fri Sep 26 2008 Tomas Mraz <tmraz at redhat.com> - 1.9.0-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Jan 2008 13:28:05 -0000	1.6
+++ .cvsignore	29 Sep 2008 13:14:06 -0000	1.7
@@ -1 +1 @@
-workrave-1.8.5.tar.gz
+workrave-1.9.0-3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Jan 2008 13:28:05 -0000	1.6
+++ sources	29 Sep 2008 13:14:06 -0000	1.7
@@ -1 +1 @@
-3df48ab5600256fadc11a976f15bcc7a  workrave-1.8.5.tar.gz
+aaf7371db1200d65b255d95abd5d1fd1  workrave-1.9.0-3.tar.gz


Index: workrave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/devel/workrave.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- workrave.spec	4 Apr 2008 13:06:22 -0000	1.16
+++ workrave.spec	29 Sep 2008 13:14:06 -0000	1.17
@@ -1,18 +1,13 @@
 Name: workrave
-Version: 1.8.5
-Release: 4%{?dist}
+Version: 1.9.0
+Release: 1%{?dist}
 Summary: Program that assists in the recovery and prevention of RSI
 # Based on older packages by Dag Wieers <dag at wieers.com> and Steve Ratcliffe
 License: GPLv2+
 Group: Applications/Productivity
 URL: http://workrave.sourceforge.net/
-# For some reason the upstream tarball contains the -2 added to the version.
-Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz
-Source1: workrave.desktop
-
-Patch1: workrave-1.8.5-gcc43.patch
-Patch2: workrave-1.8.5-lock.patch
-Patch3: workrave-1.8.5-sigc.patch
+# For some reason the upstream tarball contains the -3 added to the version.
+Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}-3.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext
@@ -22,6 +17,10 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  libXmu-devel
 BuildRequires:  libXt-devel
+BuildRequires:  gdome2-devel
+BuildRequires:  dbus-devel
+
+Requires: dbus
 
 %description
 Workrave is a program that assists in the recovery and prevention of
@@ -30,28 +29,29 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .gcc43
-%patch2 -p1 -b .lock
-%patch3 -p1 -b .sigc
 
 %build
 if [ ! -x configure ]; then
   ### Needed for snapshot releases.
   CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%{_prefix} --localstatedir=%{_localstatedir} --sysconfdir=%{_sysconfdir}
 else
-  %configure
+  %configure --enable-dbus
 fi
 %{__make}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
+
 %find_lang %{name}
 
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category X-Fedora                               \
-  %{SOURCE1}
+  --remove-category GTK                                 \
+  --delete-original					\
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
 %clean
@@ -65,14 +65,16 @@
 %{_datadir}/sounds/workrave
 %{_sysconfdir}/sound/events/workrave.soundlist
 %{_libdir}/bonobo/servers/Workrave-Applet.server
-%{_libdir}/bonobo/servers/Workrave-Control.server
 %{_libexecdir}/workrave-applet
 %{_datadir}/gnome-2.0/ui/GNOME_WorkraveApplet.xml
-%dir %{_datadir}/pixmaps/workrave
-%{_datadir}/pixmaps/workrave/workrave-icon-huge.png
+%{_datadir}/pixmaps/workrave
 %{_datadir}/applications/fedora-workrave.desktop
+%{_datadir}/dbus-1/services/org.workrave.Workrave.service
 
 %changelog
+* Fri Sep 26 2008 Tomas Mraz <tmraz at redhat.com> - 1.9.0-1
+- new upstream version
+
 * Fri Apr  4 2008 Tomas Mraz <tmraz at redhat.com> - 1.8.5-4
 - fix locking/unlocking with gnome-screensaver (#207058)
 - make it build with current libsigc++


--- workrave-1.8.5-gcc43.patch DELETED ---


--- workrave-1.8.5-lock.patch DELETED ---


--- workrave-1.8.5-sigc.patch DELETED ---


--- workrave.desktop DELETED ---



From jbowes at fedoraproject.org  Mon Sep 29 13:21:15 2008
From: jbowes at fedoraproject.org (James Bowes)
Date: Mon, 29 Sep 2008 13:21:15 +0000 (UTC)
Subject: rpms/mod_wsgi/devel mod_wsgi.spec,1.6,1.7
Message-ID: <20080929132115.3CC3C70110@cvs1.fedora.phx.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/mod_wsgi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3208

Modified Files:
	mod_wsgi.spec 
Log Message:
remove requires on httpd-devel


Index: mod_wsgi.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_wsgi/devel/mod_wsgi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mod_wsgi.spec	3 Jul 2008 00:58:36 -0000	1.6
+++ mod_wsgi.spec	29 Sep 2008 13:20:44 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           mod_wsgi
 Version:        2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A WSGI interface for Python web applications in Apache
 
 Group:          System Environment/Libraries
@@ -10,8 +10,6 @@
 Source1:        wsgi.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       httpd-devel
-
 BuildRequires:  httpd-devel
 BuildRequires:  python-devel
 
@@ -53,6 +51,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 James Bowes <jbowes at redhat.com> 2.1-2
+- Remove requires on httpd-devel
+
 * Wed Jul 02 2008 James Bowes <jbowes at redhat.com> 2.1-1
 - Update to 2.1
 



From rdieter at fedoraproject.org  Mon Sep 29 13:24:03 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 13:24:03 +0000 (UTC)
Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.61,1.62
Message-ID: <20080929132403.A816C70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3685

Modified Files:
	kipi-plugins.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 0.2.0-0.2.beta1
- respin (against newer kdegraphics)



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kipi-plugins.spec	21 Sep 2008 22:37:30 -0000	1.61
+++ kipi-plugins.spec	29 Sep 2008 13:23:33 -0000	1.62
@@ -6,7 +6,7 @@
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 0.2.0
-Release: 0.1.%{beta}%{?dist}
+Release: 0.2.%{beta}%{?dist}
 
 License: GPLv2+
 Group:   Applications/Multimedia
@@ -16,7 +16,7 @@
 
 BuildRequires: gettext
 BuildRequires: giflib-devel pcre-devel
-BuildRequires: kdegraphics4-devel
+BuildRequires: kdegraphics4-devel >= 4.1.2
 # Until when/if libksane goes a dep on sane-backends-devel
 BuildRequires: sane-backends-devel 
 BuildRequires: libkipi-devel >= 0.2.0
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 0.2.0-0.2.beta1
+- respin (against newer kdegraphics)
+
 * Thu Sep 04 2008 Rex Dieter <rdieter at fedoraproject.org> 0.2.0-0.1.beta1
 - kipi-plugins-0.2.0-beta1, kde4
 



From jbowes at fedoraproject.org  Mon Sep 29 13:26:30 2008
From: jbowes at fedoraproject.org (James Bowes)
Date: Mon, 29 Sep 2008 13:26:30 +0000 (UTC)
Subject: rpms/mod_wsgi/F-9 mod_wsgi.spec,1.6,1.7
Message-ID: <20080929132630.9BEBB70110@cvs1.fedora.phx.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/mod_wsgi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4128

Modified Files:
	mod_wsgi.spec 
Log Message:
remove requires on httpd-devel


Index: mod_wsgi.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_wsgi/F-9/mod_wsgi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mod_wsgi.spec	3 Jul 2008 13:01:56 -0000	1.6
+++ mod_wsgi.spec	29 Sep 2008 13:26:00 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           mod_wsgi
 Version:        2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A WSGI interface for Python web applications in Apache
 
 Group:          System Environment/Libraries
@@ -10,8 +10,6 @@
 Source1:        wsgi.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       httpd-devel
-
 BuildRequires:  httpd-devel
 BuildRequires:  python-devel
 
@@ -53,6 +51,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 James Bowes <jbowes at redhat.com> 2.1-2
+- Remove requires on httpd-devel
+
 * Wed Jul 02 2008 James Bowes <jbowes at redhat.com> 2.1-1
 - Update to 2.1
 



From rdieter at fedoraproject.org  Mon Sep 29 13:27:12 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 13:27:12 +0000 (UTC)
Subject: rpms/phonon/F-9 phonon.spec,1.5,1.6
Message-ID: <20080929132712.8155670110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4279

Modified Files:
	phonon.spec 
Log Message:
temporary bootstrap for sparc



Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-9/phonon.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- phonon.spec	17 Sep 2008 17:47:15 -0000	1.5
+++ phonon.spec	29 Sep 2008 13:26:42 -0000	1.6
@@ -2,7 +2,7 @@
 Summary: Multimedia framework api
 Name:    phonon 
 Version: 4.2.0
-Release: 5%{?dist}
+Release: 5%{?dist}.1
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -27,8 +27,8 @@
 BuildRequires: qt4-devel >= 4.4.0
 
 ## hard-code phonon-backend-xine, for now, so yum doesn't choose -gstreamer by default
-Requires: phonon-backend-xine
-#Requires: phonon-backend
+#Requires: phonon-backend-xine
+Requires: phonon-backend
 
 %description
 %{summary}.



From tmraz at fedoraproject.org  Mon Sep 29 13:28:58 2008
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 29 Sep 2008 13:28:58 +0000 (UTC)
Subject: rpms/workrave/devel workrave.spec,1.17,1.18
Message-ID: <20080929132858.444A470110@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/workrave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4635

Modified Files:
	workrave.spec 
Log Message:
- buildrequires gstreamer-devel



Index: workrave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/devel/workrave.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- workrave.spec	29 Sep 2008 13:14:06 -0000	1.17
+++ workrave.spec	29 Sep 2008 13:28:27 -0000	1.18
@@ -19,6 +19,7 @@
 BuildRequires:  libXt-devel
 BuildRequires:  gdome2-devel
 BuildRequires:  dbus-devel
+BuildRequires:  gstreamer-devel
 
 Requires: dbus
 



From jbowes at fedoraproject.org  Mon Sep 29 13:37:22 2008
From: jbowes at fedoraproject.org (James Bowes)
Date: Mon, 29 Sep 2008 13:37:22 +0000 (UTC)
Subject: rpms/mod_wsgi/EL-4 mod_wsgi.spec,1.4,1.5
Message-ID: <20080929133722.A157F70110@cvs1.fedora.phx.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/mod_wsgi/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5640

Modified Files:
	mod_wsgi.spec 
Log Message:
remove requires on httpd-devel


Index: mod_wsgi.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_wsgi/EL-4/mod_wsgi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_wsgi.spec	16 Jun 2008 23:24:15 -0000	1.4
+++ mod_wsgi.spec	29 Sep 2008 13:36:52 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           mod_wsgi
 Version:        1.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A WSGI interface for Python web applications in Apache
 
 Group:          System Environment/Libraries
@@ -10,8 +10,6 @@
 Source1:        wsgi.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       httpd-devel
-
 BuildRequires:  httpd-devel
 BuildRequires:  python-devel
 
@@ -53,6 +51,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 James Bowes <jbowes at redhat.com> 1.3-4
+- Remove requires on httpd-devel
+
 * Mon Jun 16 2008 Ricky Zhou <ricky at fedoraproject.org> 1.3-3
 - Build against the shared python lib.
 



From rdieter at fedoraproject.org  Mon Sep 29 13:38:59 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 13:38:59 +0000 (UTC)
Subject: rpms/kphotoalbum/devel .cvsignore, 1.9, 1.10 kphotoalbum.spec, 1.24,
	1.25 sources, 1.8, 1.9 kphotoalbum-i18n.patch, 1.1, NONE
Message-ID: <20080929133859.5DD0670110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kphotoalbum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5993

Modified Files:
	.cvsignore kphotoalbum.spec sources 
Removed Files:
	kphotoalbum-i18n.patch 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 3.2-0.2.20080929svn
- respin against newer kdegraphics
- kphotoalbum-20080929svn snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	5 Aug 2008 00:47:44 -0000	1.9
+++ .cvsignore	29 Sep 2008 13:38:29 -0000	1.10
@@ -1 +1 @@
-kphotoalbum-20080802svn.tar.bz2
+kphotoalbum-20080929svn.tar.bz2


Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/devel/kphotoalbum.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kphotoalbum.spec	5 Aug 2008 02:35:45 -0000	1.24
+++ kphotoalbum.spec	29 Sep 2008 13:38:29 -0000	1.25
@@ -1,10 +1,10 @@
 
-%define beta 20080802svn
+%define beta 20080929svn
 
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
 Version: 3.2
-Release: 0.1.%{beta}%{?dist}
+Release: 0.2.%{beta}%{?dist}
 
 License: GPLv2+
 Group:   Applications/Multimedia 
@@ -20,11 +20,10 @@
 BuildRequires: exiv2-devel
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel
-BuildRequires: kdegraphics4-devel >= 4.1
-## switch to this when kdegraphics is ready -- Rex
-#BuildRequires: libkdcraw-devel >= 0.2.0
-#BuildRequires: libkexiv2-devel >= 0.2.0
-#BuildRequires: libkipi-devel >= 0.2.0
+BuildRequires: kdegraphics4-devel >= 4.1.2
+BuildRequires: libkdcraw-devel >= 0.2.0
+BuildRequires: libkexiv2-devel >= 0.2.0
+BuildRequires: libkipi-devel >= 0.2.0
 
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
@@ -107,6 +106,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 3.2-0.2.20080929svn
+- respin against newer kdegraphics
+- kphotoalbum-20080929svn snapshot
+
 * Sat Aug 02 2008 Rex Dieter <rdieter at fedoraproject.org> 3.2-0.1.20080802svn
 - kphotoalbum-20080802svn snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Aug 2008 00:47:44 -0000	1.8
+++ sources	29 Sep 2008 13:38:29 -0000	1.9
@@ -1 +1 @@
-7065fe54a5d490a8478b8c1dcb68b26a  kphotoalbum-20080802svn.tar.bz2
+a7a05e96df757fc5b559d5283deb17bd  kphotoalbum-20080929svn.tar.bz2


--- kphotoalbum-i18n.patch DELETED ---



From tmraz at fedoraproject.org  Mon Sep 29 13:41:03 2008
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 29 Sep 2008 13:41:03 +0000 (UTC)
Subject: rpms/workrave/devel workrave.spec,1.18,1.19
Message-ID: <20080929134103.EA40870110@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/workrave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6290

Modified Files:
	workrave.spec 
Log Message:
- buildrequires intltool



Index: workrave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/devel/workrave.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- workrave.spec	29 Sep 2008 13:28:27 -0000	1.18
+++ workrave.spec	29 Sep 2008 13:40:33 -0000	1.19
@@ -20,6 +20,7 @@
 BuildRequires:  gdome2-devel
 BuildRequires:  dbus-devel
 BuildRequires:  gstreamer-devel
+BuildRequires:  intltool
 
 Requires: dbus
 



From rdieter at fedoraproject.org  Mon Sep 29 13:49:12 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 13:49:12 +0000 (UTC)
Subject: rpms/kdepimlibs/F-9 kdepimlibs.spec,1.40,1.41
Message-ID: <20080929134912.C506570110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7423

Modified Files:
	kdepimlibs.spec 
Log Message:
Release++



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/kdepimlibs.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kdepimlibs.spec	28 Sep 2008 20:42:25 -0000	1.40
+++ kdepimlibs.spec	29 Sep 2008 13:48:42 -0000	1.41
@@ -14,7 +14,7 @@
 Name: kdepimlibs
 
 Version: 4.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}.1
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -86,7 +86,7 @@
 popd
 
 %if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 %endif
 
 # build apidocs
@@ -167,6 +167,10 @@
 
 
 %changelog
+* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From pkgdb at fedoraproject.org  Mon Sep 29 13:49:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 29 Sep 2008 13:49:47 +0000
Subject: [pkgdb] cdparanoia: kkofler has requested commit
Message-ID: <20080929134947.85B53208DA0@bastion.fedora.phx.redhat.com>

kkofler has requested the commit acl on cdparanoia (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdparanoia



From rdieter at fedoraproject.org  Mon Sep 29 13:51:02 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 13:51:02 +0000 (UTC)
Subject: rpms/kphotoalbum/devel kphotoalbum.spec,1.25,1.26
Message-ID: <20080929135102.2A00870110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kphotoalbum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7712

Modified Files:
	kphotoalbum.spec 
Log Message:
drop patch



Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/devel/kphotoalbum.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- kphotoalbum.spec	29 Sep 2008 13:38:29 -0000	1.25
+++ kphotoalbum.spec	29 Sep 2008 13:50:31 -0000	1.26
@@ -14,8 +14,6 @@
 Source1: kphotoalbum-svn_checkout.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: kphotoalbum-i18n.patch
-
 BuildRequires: desktop-file-utils
 BuildRequires: exiv2-devel
 BuildRequires: gettext
@@ -38,8 +36,6 @@
 %prep
 %setup -q -n %{name}
 
-%patch1 -p1 -b .i18n
-
 
 %build
 mkdir -p %{_target_platform}



From rdieter at fedoraproject.org  Mon Sep 29 13:52:48 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 13:52:48 +0000 (UTC)
Subject: rpms/kdepimlibs/F-9 kdepimlibs.spec,1.41,1.42
Message-ID: <20080929135248.5893B70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7997

Modified Files:
	kdepimlibs.spec 
Log Message:
one last try



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/kdepimlibs.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- kdepimlibs.spec	29 Sep 2008 13:48:42 -0000	1.41
+++ kdepimlibs.spec	29 Sep 2008 13:52:18 -0000	1.42
@@ -14,7 +14,7 @@
 Name: kdepimlibs
 
 Version: 4.1.2
-Release: 2%{?dist}.1
+Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2



From tmraz at fedoraproject.org  Mon Sep 29 14:00:34 2008
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 29 Sep 2008 14:00:34 +0000 (UTC)
Subject: rpms/workrave/F-8 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 workrave.spec, 
	1.10, 1.11 workrave-1.8.4-applet-crash.patch, 1.1,
	NONE workrave-1.8.4-applet-fix.patch, 1.1, NONE workrave.desktop,
	1.1, NONE
Message-ID: <20080929140034.297EF70110@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/workrave/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9087

Modified Files:
	.cvsignore sources workrave.spec 
Removed Files:
	workrave-1.8.4-applet-crash.patch 
	workrave-1.8.4-applet-fix.patch workrave.desktop 
Log Message:
* Fri Sep 26 2008 Tomas Mraz <tmraz at redhat.com> - 1.9.0-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Mar 2007 08:08:25 -0000	1.5
+++ .cvsignore	29 Sep 2008 14:00:03 -0000	1.6
@@ -1 +1 @@
-workrave-1.8.4-2.tar.gz
+workrave-1.9.0-3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Mar 2007 08:08:25 -0000	1.5
+++ sources	29 Sep 2008 14:00:03 -0000	1.6
@@ -1 +1 @@
-ddb2d1d86b4adbe00fe662f0015bc6b4  workrave-1.8.4-2.tar.gz
+aaf7371db1200d65b255d95abd5d1fd1  workrave-1.9.0-3.tar.gz


Index: workrave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/F-8/workrave.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- workrave.spec	22 Aug 2007 21:22:10 -0000	1.10
+++ workrave.spec	29 Sep 2008 14:00:03 -0000	1.11
@@ -1,16 +1,13 @@
 Name: workrave
-Version: 1.8.4
-Release: 4%{?dist}
+Version: 1.9.0
+Release: 1%{?dist}
 Summary: Program that assists in the recovery and prevention of RSI
 # Based on older packages by Dag Wieers <dag at wieers.com> and Steve Ratcliffe
 License: GPLv2+
 Group: Applications/Productivity
 URL: http://workrave.sourceforge.net/
-# For some reason the upstream tarball contains the -2 added to the version.
-Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}-2.tar.gz
-Source1: workrave.desktop
-Patch1: workrave-1.8.4-applet-crash.patch
-Patch2: workrave-1.8.4-applet-fix.patch
+# For some reason the upstream tarball contains the -3 added to the version.
+Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}-3.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext
@@ -20,6 +17,12 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  libXmu-devel
 BuildRequires:  libXt-devel
+BuildRequires:  gdome2-devel
+BuildRequires:  dbus-devel
+BuildRequires:  gstreamer-devel
+BuildRequires:  intltool
+
+Requires: dbus
 
 %description
 Workrave is a program that assists in the recovery and prevention of
@@ -28,27 +31,29 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p2 -b .crash
-%patch2 -p2 -b .appletfix
 
 %build
 if [ ! -x configure ]; then
   ### Needed for snapshot releases.
   CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%{_prefix} --localstatedir=%{_localstatedir} --sysconfdir=%{_sysconfdir}
 else
-  %configure
+  %configure --enable-dbus
 fi
 %{__make}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
+
 %find_lang %{name}
 
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category X-Fedora                               \
-  %{SOURCE1}
+  --remove-category GTK                                 \
+  --delete-original					\
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
 %clean
@@ -56,20 +61,35 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS COPYING NEWS README
 %{_bindir}/*
 %{_datadir}/workrave/
 %{_datadir}/sounds/workrave
 %{_sysconfdir}/sound/events/workrave.soundlist
 %{_libdir}/bonobo/servers/Workrave-Applet.server
-%{_libdir}/bonobo/servers/Workrave-Control.server
 %{_libexecdir}/workrave-applet
 %{_datadir}/gnome-2.0/ui/GNOME_WorkraveApplet.xml
-%dir %{_datadir}/pixmaps/workrave
-%{_datadir}/pixmaps/workrave/workrave-icon-huge.png
+%{_datadir}/pixmaps/workrave
 %{_datadir}/applications/fedora-workrave.desktop
+%{_datadir}/dbus-1/services/org.workrave.Workrave.service
 
 %changelog
+* Fri Sep 26 2008 Tomas Mraz <tmraz at redhat.com> - 1.9.0-1
+- new upstream version
+
+* Fri Apr  4 2008 Tomas Mraz <tmraz at redhat.com> - 1.8.5-4
+- fix locking/unlocking with gnome-screensaver (#207058)
+- make it build with current libsigc++
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.8.5-3
+- Autorebuild for GCC 4.3
+
+* Tue Feb 19 2008 Tomas Mraz <tmraz at redhat.com> - 1.8.5-2
+- make it build on gcc-4.3
+
+* Mon Jan  7 2008 Tomas Mraz <tmraz at redhat.com> - 1.8.5-1
+- upgrade to latest upstream version
+
 * Wed Aug 22 2007 Tomas Mraz <tmraz at redhat.com> - 1.8.4-4
 - applet counters don't start properly
 - license tag fix


--- workrave-1.8.4-applet-crash.patch DELETED ---


--- workrave-1.8.4-applet-fix.patch DELETED ---


--- workrave.desktop DELETED ---



From dwalsh at fedoraproject.org  Mon Sep 29 14:10:55 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 29 Sep 2008 14:10:55 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 booleans-targeted.conf, 1.42,
	1.43 policy-20071130.patch, 1.219, 1.220 selinux-policy.spec,
	1.712, 1.713
Message-ID: <20080929141055.B9B1070110@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10303

Modified Files:
	booleans-targeted.conf policy-20071130.patch 
	selinux-policy.spec 
Log Message:
* Mon Sep 29 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-96
- Add postgresql patch from KaiGai Kohei



Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/booleans-targeted.conf,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- booleans-targeted.conf	28 Apr 2008 21:29:35 -0000	1.42
+++ booleans-targeted.conf	29 Sep 2008 14:10:23 -0000	1.43
@@ -242,3 +242,8 @@
 # Allow unconfined domains mmap low kernel memory
 # 
 allow_unconfined_mmap_low = true
+
+# Allow mount command to read/mount on any file
+# 
+allow_mount_anyfile = true
+

policy-20071130.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.219 -r 1.220 policy-20071130.patch
Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- policy-20071130.patch	26 Sep 2008 14:45:09 -0000	1.219
+++ policy-20071130.patch	29 Sep 2008 14:10:23 -0000	1.220
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.3.1/Makefile
---- nsaserefpolicy/Makefile	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/Makefile	2008-09-08 11:45:12.000000000 -0400
+--- nsaserefpolicy/Makefile	2008-02-26 08:23:09.000000000 -0500
++++ serefpolicy-3.3.1/Makefile	2008-09-29 10:04:05.280844000 -0400
 @@ -235,7 +235,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -55,8 +55,8 @@
  	@mkdir -p $(appdir)
  	$(verbose) $(INSTALL) -m 644 $< $@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.3.1/Rules.modular
---- nsaserefpolicy/Rules.modular	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/Rules.modular	2008-09-08 11:45:12.000000000 -0400
+--- nsaserefpolicy/Rules.modular	2008-02-26 08:23:12.000000000 -0500
++++ serefpolicy-3.3.1/Rules.modular	2008-09-29 10:04:05.288836000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -87,8 +87,8 @@
  $(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 --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.monolithic serefpolicy-3.3.1/Rules.monolithic
---- nsaserefpolicy/Rules.monolithic	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/Rules.monolithic	2008-09-08 11:45:12.000000000 -0400
+--- nsaserefpolicy/Rules.monolithic	2008-02-26 08:23:13.000000000 -0500
++++ serefpolicy-3.3.1/Rules.monolithic	2008-09-29 10:04:05.292832000 -0400
 @@ -96,7 +96,7 @@
  #
  # Load the binary policy
@@ -99,14 +99,14 @@
  	$(verbose) $(LOADPOLICY) -q $(loadpath)
  	@touch $(tmpdir)/load
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context
---- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context	2008-09-08 11:45:12.000000000 -0400
+--- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-02-26 08:23:12.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context	2008-09-29 10:04:05.297827000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts	2008-09-29 10:04:05.302822000 -0400
 @@ -0,0 +1,6 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -115,8 +115,8 @@
 +system_r:initrc_su_t:s0		guest_r:guest_t:s0
 +guest_r:guest_t:s0		guest_r:guest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts
---- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts	2008-09-08 11:45:12.000000000 -0400
+--- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-02-26 08:23:12.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts	2008-09-29 10:04:05.305819000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
  system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -131,8 +131,8 @@
 -#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 --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/staff_u_default_contexts
---- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-mcs/staff_u_default_contexts	2008-09-08 11:45:12.000000000 -0400
+--- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-02-26 08:23:12.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/staff_u_default_contexts	2008-09-29 10:04:05.309815000 -0400
 @@ -5,6 +5,8 @@
  system_r:xdm_t:s0		staff_r:staff_t:s0
  staff_r:staff_su_t:s0		staff_r:staff_t:s0
@@ -144,7 +144,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-29 10:04:05.313811000 -0400
 @@ -0,0 +1,11 @@
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0
 +system_r:initrc_t:s0		unconfined_r:unconfined_t:s0
@@ -158,8 +158,8 @@
 +unconfined_r:unconfined_t:s0	unconfined_r:unconfined_t:s0
 +system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts
---- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts	2008-09-08 11:45:12.000000000 -0400
+--- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-02-26 08:23:12.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts	2008-09-29 10:04:05.316808000 -0400
 @@ -5,4 +5,5 @@
  system_r:xdm_t:s0		user_r:user_t:s0
  user_r:user_su_t:s0		user_r:user_t:s0
@@ -168,14 +168,14 @@
 +system_r:initrc_su_t:s0		user_r:user_t:s0
 +user_r:user_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context
---- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context	2008-09-08 11:45:12.000000000 -0400
+--- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-02-26 08:23:12.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context	2008-09-29 10:04:05.321803000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/x_contexts serefpolicy-3.3.1/config/appconfig-mcs/x_contexts
 --- nsaserefpolicy/config/appconfig-mcs/x_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts	2008-09-29 10:04:05.326798000 -0400
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -367,7 +367,7 @@
 +event *					system_u:object_r:default_xevent_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts	2008-09-29 10:04:05.330794000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -378,7 +378,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts	2008-09-29 10:04:05.333793000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -386,7 +386,7 @@
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/x_contexts serefpolicy-3.3.1/config/appconfig-mls/x_contexts
 --- nsaserefpolicy/config/appconfig-mls/x_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts	2008-09-29 10:04:05.336788000 -0400
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -578,15 +578,15 @@
 +event *					system_u:object_r:default_xevent_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts	2008-09-29 10:04:05.350774000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
 +system_r:sshd_t		guest_r:guest_t
 +system_r:crond_t	guest_r:guest_crond_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts
---- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts	2008-09-08 11:45:12.000000000 -0400
+--- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-02-26 08:23:12.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts	2008-09-29 10:04:05.353771000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t	unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t
  system_r:local_login_t  unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
@@ -602,7 +602,7 @@
 +system_r:sshd_t	unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/x_contexts serefpolicy-3.3.1/config/appconfig-standard/x_contexts
 --- nsaserefpolicy/config/appconfig-standard/x_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts	2008-09-29 10:04:05.358766000 -0400
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -794,7 +794,7 @@
 +event *					system_u:object_r:default_xevent_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts	2008-09-08 11:45:12.000000000 -0400
++++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts	2008-09-29 10:04:05.361763000 -0400
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -802,8 +802,8 @@
 +system_r:crond_t	xguest_r:xguest_crond_t
 +system_r:xdm_t		xguest_r:xguest_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-3.3.1/man/man8/ftpd_selinux.8
---- nsaserefpolicy/man/man8/ftpd_selinux.8	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/man/man8/ftpd_selinux.8	2008-09-08 11:45:12.000000000 -0400
+--- nsaserefpolicy/man/man8/ftpd_selinux.8	2008-02-26 08:23:12.000000000 -0500
++++ serefpolicy-3.3.1/man/man8/ftpd_selinux.8	2008-09-29 10:04:05.364760000 -0400
 @@ -1,52 +1,65 @@
 -.TH  "ftpd_selinux"  "8"  "17 Jan 2005" "dwalsh at redhat.com" "ftpd Selinux Policy documentation"
 +.TH  "ftpd_selinux"  "8"  "17 Jan 2005" "dwalsh at redhat.com" "ftpd SELinux policy documentation"
@@ -910,8 +910,8 @@
  
 +selinux(8), ftpd(8), setsebool(8), semanage(8), restorecon(8)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.3.1/man/man8/httpd_selinux.8
---- nsaserefpolicy/man/man8/httpd_selinux.8	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/man/man8/httpd_selinux.8	2008-09-08 11:45:12.000000000 -0400
+--- nsaserefpolicy/man/man8/httpd_selinux.8	2008-02-26 08:23:12.000000000 -0500
++++ serefpolicy-3.3.1/man/man8/httpd_selinux.8	2008-09-29 10:04:05.369755000 -0400
[...6257 lines suppressed...]
 +# No auditadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/auditadm.if serefpolicy-3.3.1/policy/modules/users/auditadm.if
 --- nsaserefpolicy/policy/modules/users/auditadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/auditadm.if	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/auditadm.if	2008-09-29 10:04:07.537862000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for auditadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/auditadm.te serefpolicy-3.3.1/policy/modules/users/auditadm.te
 --- nsaserefpolicy/policy/modules/users/auditadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/auditadm.te	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/auditadm.te	2008-09-29 10:04:07.540858000 -0400
 @@ -0,0 +1,25 @@
 +policy_module(auditadm,1.0.1)
 +gen_require(`
@@ -41810,17 +41823,17 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.3.1/policy/modules/users/guest.fc
 --- nsaserefpolicy/policy/modules/users/guest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/guest.fc	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/guest.fc	2008-09-29 10:04:07.543855000 -0400
 @@ -0,0 +1 @@
 +# No guest file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.3.1/policy/modules/users/guest.if
 --- nsaserefpolicy/policy/modules/users/guest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/guest.if	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/guest.if	2008-09-29 10:04:07.546852000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for guest user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.3.1/policy/modules/users/guest.te
 --- nsaserefpolicy/policy/modules/users/guest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/guest.te	2008-09-17 09:08:26.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/guest.te	2008-09-29 10:04:07.549849000 -0400
 @@ -0,0 +1,33 @@
 +policy_module(guest,1.0.1)
 +userdom_restricted_user_template(guest)
@@ -41857,17 +41870,17 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.3.1/policy/modules/users/logadm.fc
 --- nsaserefpolicy/policy/modules/users/logadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.fc	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/logadm.fc	2008-09-29 10:04:07.552846000 -0400
 @@ -0,0 +1 @@
 +# No logadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.3.1/policy/modules/users/logadm.if
 --- nsaserefpolicy/policy/modules/users/logadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.if	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/logadm.if	2008-09-29 10:04:07.555843000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for logadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.3.1/policy/modules/users/logadm.te
 --- nsaserefpolicy/policy/modules/users/logadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.te	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/logadm.te	2008-09-29 10:04:07.558840000 -0400
 @@ -0,0 +1,11 @@
 +policy_module(logadm,1.0.0)
 +
@@ -41882,22 +41895,22 @@
 +logging_admin(logadm_t, logadm_r, { logadm_devpts_t logadm_tty_device_t })
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.3.1/policy/modules/users/metadata.xml
 --- nsaserefpolicy/policy/modules/users/metadata.xml	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/metadata.xml	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/metadata.xml	2008-09-29 10:04:07.562840000 -0400
 @@ -0,0 +1 @@
 +<summary>Policy modules for users</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.fc serefpolicy-3.3.1/policy/modules/users/secadm.fc
 --- nsaserefpolicy/policy/modules/users/secadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.fc	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/secadm.fc	2008-09-29 10:04:07.565840000 -0400
 @@ -0,0 +1 @@
 +# No secadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.if serefpolicy-3.3.1/policy/modules/users/secadm.if
 --- nsaserefpolicy/policy/modules/users/secadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.if	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/secadm.if	2008-09-29 10:04:07.568840000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for secadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.te serefpolicy-3.3.1/policy/modules/users/secadm.te
 --- nsaserefpolicy/policy/modules/users/secadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.te	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/secadm.te	2008-09-29 10:04:07.576840000 -0400
 @@ -0,0 +1,39 @@
 +policy_module(secadm,1.0.1)
 +gen_require(`
@@ -41940,17 +41953,17 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.fc serefpolicy-3.3.1/policy/modules/users/staff.fc
 --- nsaserefpolicy/policy/modules/users/staff.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/staff.fc	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/staff.fc	2008-09-29 10:04:07.579840000 -0400
 @@ -0,0 +1 @@
 +# No staff file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.if serefpolicy-3.3.1/policy/modules/users/staff.if
 --- nsaserefpolicy/policy/modules/users/staff.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/staff.if	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/staff.if	2008-09-29 10:04:07.582840000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for staff user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.te serefpolicy-3.3.1/policy/modules/users/staff.te
 --- nsaserefpolicy/policy/modules/users/staff.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/staff.te	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/staff.te	2008-09-29 10:04:07.585840000 -0400
 @@ -0,0 +1,30 @@
 +policy_module(staff,1.0.1)
 +userdom_admin_login_user_template(staff)
@@ -41984,17 +41997,17 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.fc serefpolicy-3.3.1/policy/modules/users/user.fc
 --- nsaserefpolicy/policy/modules/users/user.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/user.fc	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/user.fc	2008-09-29 10:04:07.588840000 -0400
 @@ -0,0 +1 @@
 +# No user file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.if serefpolicy-3.3.1/policy/modules/users/user.if
 --- nsaserefpolicy/policy/modules/users/user.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/user.if	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/user.if	2008-09-29 10:04:07.591840000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for user user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.te serefpolicy-3.3.1/policy/modules/users/user.te
 --- nsaserefpolicy/policy/modules/users/user.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/user.te	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/user.te	2008-09-29 10:04:07.594840000 -0400
 @@ -0,0 +1,18 @@
 +policy_module(user,1.0.1)
 +userdom_unpriv_user_template(user)
@@ -42016,17 +42029,17 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.3.1/policy/modules/users/webadm.fc
 --- nsaserefpolicy/policy/modules/users/webadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.fc	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/webadm.fc	2008-09-29 10:04:07.597840000 -0400
 @@ -0,0 +1 @@
 +# No webadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.3.1/policy/modules/users/webadm.if
 --- nsaserefpolicy/policy/modules/users/webadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.if	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/webadm.if	2008-09-29 10:04:07.601840000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for webadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.3.1/policy/modules/users/webadm.te
 --- nsaserefpolicy/policy/modules/users/webadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.te	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/webadm.te	2008-09-29 10:04:07.604840000 -0400
 @@ -0,0 +1,41 @@
 +policy_module(webadm,1.0.0)
 +
@@ -42071,17 +42084,17 @@
 +userdom_role_change_template(staff, webadm)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.fc serefpolicy-3.3.1/policy/modules/users/xguest.fc
 --- nsaserefpolicy/policy/modules/users/xguest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.fc	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/xguest.fc	2008-09-29 10:04:07.607840000 -0400
 @@ -0,0 +1 @@
 +# No xguest file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.if serefpolicy-3.3.1/policy/modules/users/xguest.if
 --- nsaserefpolicy/policy/modules/users/xguest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.if	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/xguest.if	2008-09-29 10:04:07.611840000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for xguest user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.te serefpolicy-3.3.1/policy/modules/users/xguest.te
 --- nsaserefpolicy/policy/modules/users/xguest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.te	2008-09-08 11:45:13.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/users/xguest.te	2008-09-29 10:04:07.615840000 -0400
 @@ -0,0 +1,69 @@
 +policy_module(xguest,1.0.1)
 +
@@ -42153,8 +42166,8 @@
 +	')
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.3.1/policy/support/file_patterns.spt
---- nsaserefpolicy/policy/support/file_patterns.spt	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/support/file_patterns.spt	2008-09-08 11:45:13.000000000 -0400
+--- nsaserefpolicy/policy/support/file_patterns.spt	2008-02-26 08:23:09.000000000 -0500
++++ serefpolicy-3.3.1/policy/support/file_patterns.spt	2008-09-29 10:04:07.619840000 -0400
 @@ -537,3 +537,23 @@
  	allow $1 $2:dir rw_dir_perms;
  	type_transition $1 $2:$4 $3;
@@ -42180,8 +42193,8 @@
 +        relabelfrom_sock_files_pattern($1,$2,$2)
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.3.1/policy/support/obj_perm_sets.spt
---- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-06-12 23:38:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt	2008-09-12 10:31:36.000000000 -0400
+--- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-02-26 08:23:09.000000000 -0500
++++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt	2008-09-29 10:04:07.626840000 -0400
 @@ -193,7 +193,7 @@
  define(`create_dir_perms',`{ getattr create }')
  define(`rename_dir_perms',`{ getattr rename }')
@@ -42260,8 +42273,8 @@
 +
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.3.1/policy/users
---- nsaserefpolicy/policy/users	2008-06-12 23:38:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/users	2008-09-08 11:45:13.000000000 -0400
+--- nsaserefpolicy/policy/users	2008-02-26 08:23:12.000000000 -0500
++++ serefpolicy-3.3.1/policy/users	2008-09-29 10:04:07.630840000 -0400
 @@ -16,7 +16,7 @@
  # and a user process should never be assigned the system user
  # identity.


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v
retrieving revision 1.712
retrieving revision 1.713
diff -u -r1.712 -r1.713
--- selinux-policy.spec	26 Sep 2008 14:04:17 -0000	1.712
+++ selinux-policy.spec	29 Sep 2008 14:10:25 -0000	1.713
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.3.1
-Release: 95%{?dist}
+Release: 96%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -386,6 +386,9 @@
 %endif
 
 %changelog
+* Mon Sep 29 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-96
+- Add postgresql patch from KaiGai Kohei
+
 * Tue Sep 25 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-95
 - Allow kismet to bind to port 2501
 



From tmraz at fedoraproject.org  Mon Sep 29 14:15:27 2008
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 29 Sep 2008 14:15:27 +0000 (UTC)
Subject: rpms/workrave/F-9 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 workrave.spec, 1.16, 1.17 workrave-1.8.5-gcc43.patch, 1.1,
	NONE workrave-1.8.5-lock.patch, 1.1,
	NONE workrave-1.8.5-sigc.patch, 1.2, NONE workrave.desktop, 1.2, NONE
Message-ID: <20080929141527.8AE1C70110@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/workrave/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11063

Modified Files:
	.cvsignore sources workrave.spec 
Removed Files:
	workrave-1.8.5-gcc43.patch workrave-1.8.5-lock.patch 
	workrave-1.8.5-sigc.patch workrave.desktop 
Log Message:
* Fri Sep 26 2008 Tomas Mraz <tmraz at redhat.com> - 1.9.0-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Jan 2008 13:28:05 -0000	1.6
+++ .cvsignore	29 Sep 2008 14:14:57 -0000	1.7
@@ -1 +1 @@
-workrave-1.8.5.tar.gz
+workrave-1.9.0-3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Jan 2008 13:28:05 -0000	1.6
+++ sources	29 Sep 2008 14:14:57 -0000	1.7
@@ -1 +1 @@
-3df48ab5600256fadc11a976f15bcc7a  workrave-1.8.5.tar.gz
+aaf7371db1200d65b255d95abd5d1fd1  workrave-1.9.0-3.tar.gz


Index: workrave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/F-9/workrave.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- workrave.spec	4 Apr 2008 13:06:22 -0000	1.16
+++ workrave.spec	29 Sep 2008 14:14:57 -0000	1.17
@@ -1,18 +1,13 @@
 Name: workrave
-Version: 1.8.5
-Release: 4%{?dist}
+Version: 1.9.0
+Release: 1%{?dist}
 Summary: Program that assists in the recovery and prevention of RSI
 # Based on older packages by Dag Wieers <dag at wieers.com> and Steve Ratcliffe
 License: GPLv2+
 Group: Applications/Productivity
 URL: http://workrave.sourceforge.net/
-# For some reason the upstream tarball contains the -2 added to the version.
-Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz
-Source1: workrave.desktop
-
-Patch1: workrave-1.8.5-gcc43.patch
-Patch2: workrave-1.8.5-lock.patch
-Patch3: workrave-1.8.5-sigc.patch
+# For some reason the upstream tarball contains the -3 added to the version.
+Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}-3.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext
@@ -22,6 +17,12 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  libXmu-devel
 BuildRequires:  libXt-devel
+BuildRequires:  gdome2-devel
+BuildRequires:  dbus-devel
+BuildRequires:  gstreamer-devel
+BuildRequires:  intltool
+
+Requires: dbus
 
 %description
 Workrave is a program that assists in the recovery and prevention of
@@ -30,28 +31,29 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .gcc43
-%patch2 -p1 -b .lock
-%patch3 -p1 -b .sigc
 
 %build
 if [ ! -x configure ]; then
   ### Needed for snapshot releases.
   CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%{_prefix} --localstatedir=%{_localstatedir} --sysconfdir=%{_sysconfdir}
 else
-  %configure
+  %configure --enable-dbus
 fi
 %{__make}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
+
 %find_lang %{name}
 
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category X-Fedora                               \
-  %{SOURCE1}
+  --remove-category GTK                                 \
+  --delete-original					\
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
 %clean
@@ -65,14 +67,16 @@
 %{_datadir}/sounds/workrave
 %{_sysconfdir}/sound/events/workrave.soundlist
 %{_libdir}/bonobo/servers/Workrave-Applet.server
-%{_libdir}/bonobo/servers/Workrave-Control.server
 %{_libexecdir}/workrave-applet
 %{_datadir}/gnome-2.0/ui/GNOME_WorkraveApplet.xml
-%dir %{_datadir}/pixmaps/workrave
-%{_datadir}/pixmaps/workrave/workrave-icon-huge.png
+%{_datadir}/pixmaps/workrave
 %{_datadir}/applications/fedora-workrave.desktop
+%{_datadir}/dbus-1/services/org.workrave.Workrave.service
 
 %changelog
+* Fri Sep 26 2008 Tomas Mraz <tmraz at redhat.com> - 1.9.0-1
+- new upstream version
+
 * Fri Apr  4 2008 Tomas Mraz <tmraz at redhat.com> - 1.8.5-4
 - fix locking/unlocking with gnome-screensaver (#207058)
 - make it build with current libsigc++


--- workrave-1.8.5-gcc43.patch DELETED ---


--- workrave-1.8.5-lock.patch DELETED ---


--- workrave-1.8.5-sigc.patch DELETED ---


--- workrave.desktop DELETED ---



From kasal at fedoraproject.org  Mon Sep 29 14:27:48 2008
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 29 Sep 2008 14:27:48 +0000 (UTC)
Subject: rpms/perl-XML-Grove/devel perl-XML-Grove-test.patch, NONE,
	1.1 perl-XML-Grove.spec, 1.19, 1.20 test.patch, 1.1, NONE
Message-ID: <20080929142748.2DF9F70110@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-XML-Grove/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12586

Modified Files:
	perl-XML-Grove.spec 
Added Files:
	perl-XML-Grove-test.patch 
Removed Files:
	test.patch 
Log Message:
- cleaned up universe vs. tab conflict
- added an explanation why the Version tag does not conform to the rules

perl-XML-Grove-test.patch:

--- NEW FILE perl-XML-Grove-test.patch ---
diff -up XML-Grove-0.46alpha/t/grove.t.old XML-Grove-0.46alpha/t/grove.t
--- XML-Grove-0.46alpha/t/grove.t.old	2008-07-22 14:47:27.000000000 +0200
+++ XML-Grove-0.46alpha/t/grove.t	2008-07-22 14:46:42.000000000 +0200
@@ -13,6 +13,7 @@ use XML::Parser::PerlSAX;
 use XML::Grove::Builder;
 use XML::Grove::AsString;
 use XML::Grove::AsCanonXML;
+use utf8;
 
 $loaded = 1;
 print "ok 1\n";


Index: perl-XML-Grove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Grove/devel/perl-XML-Grove.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- perl-XML-Grove.spec	23 Jul 2008 06:23:29 -0000	1.19
+++ perl-XML-Grove.spec	29 Sep 2008 14:27:17 -0000	1.20
@@ -1,19 +1,23 @@
 Name:           perl-XML-Grove
+###### rpmlint error: E: invalid-version 0.46alpha
+# We use the version tag "0.46alpha" -- the traditional version number of
+# this module since Sep 1999, immutable through the ages, no matter what the
+# current Package Naming Guidelines say.
 Version:        0.46alpha
-Release:        33%{?dist}
+Release:        34%{?dist}
 Summary:        Simple access to infoset of parsed XML, HTML, or SGML instances
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/XML-Grove/
 Source0:        http://www.cpan.org/authors/id/K/KM/KMACLEOD/XML-Grove-%{version}.tar.bz2
-Patch1:			test.patch
+Patch1:         perl-XML-Grove-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl-libxml-perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
-Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 XML::Grove is a tree-based object model for accessing the information
@@ -55,6 +59,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Stepan Kasal <skasal at redhat.com> - 0.46alpha-34
+- cleaned up universe vs. tab conflict
+- added an explanation why the Version tag does not conform to the rules
+
 * Tue Jul 22 2008 Marcela Maslanova <mmaslano at redhat.com> - 0.46alpha-33
 - use utf8 in test -> all are passing
 


--- test.patch DELETED ---



From cebbert at fedoraproject.org  Mon Sep 29 14:40:58 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 29 Sep 2008 14:40:58 +0000 (UTC)
Subject: rpms/kernel/F-9
	linux-2.6-net-print-module-name-as-part-of-the-message.patch, NONE,
	1.1 linux-2.6-warn-Turn-the-netdev-timeout-WARN_ON-into-WARN.patch,
	NONE, 1.1 kernel.spec, 1.774, 1.775
Message-ID: <20080929144058.462E870110@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14165

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-net-print-module-name-as-part-of-the-message.patch 
	linux-2.6-warn-Turn-the-netdev-timeout-WARN_ON-into-WARN.patch 
Log Message:
Two patches to help make kerneloops bug reports more useful.
  (requested by Arjan)

linux-2.6-net-print-module-name-as-part-of-the-message.patch:

--- NEW FILE linux-2.6-net-print-module-name-as-part-of-the-message.patch ---
From: Arjan van de Ven <arjan at linux.intel.com>
Date: Mon, 21 Jul 2008 20:31:48 +0000 (-0700)
Subject: net: Print the module name as part of the watchdog message
X-Git-Tag: v2.6.27-rc1~860^2~20
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6579e57b31d79d31d9b806e41ba48774e73257dc

net: Print the module name as part of the watchdog message

As suggested by Dave:

This patch adds a function to get the driver name from a struct net_device,
and consequently uses this in the watchdog timeout handler to print as
part of the message.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Backport: Chuck Ebbert <cebbert at redhat.com>
---

Index: linux-2.6.26.noarch/include/linux/netdevice.h
===================================================================
--- linux-2.6.26.noarch.orig/include/linux/netdevice.h
+++ linux-2.6.26.noarch/include/linux/netdevice.h
@@ -1509,6 +1509,8 @@ extern void *dev_seq_next(struct seq_fil
 extern void dev_seq_stop(struct seq_file *seq, void *v);
 #endif
 
+extern char *netdev_drivername(struct net_device *dev, char *buffer, int len);
+
 extern void linkwatch_run_queue(void);
 
 extern int netdev_compute_features(unsigned long all, unsigned long one);
Index: linux-2.6.26.noarch/net/core/dev.c
===================================================================
--- linux-2.6.26.noarch.orig/net/core/dev.c
+++ linux-2.6.26.noarch/net/core/dev.c
@@ -4489,6 +4489,26 @@ err_name:
 	return -ENOMEM;
 }
 
+char *netdev_drivername(struct net_device *dev, char *buffer, int len)
+{
+	struct device_driver *driver;
+	struct device *parent;
+
+	if (len <= 0 || !buffer)
+		return buffer;
+	buffer[0] = 0;
+
+	parent = dev->dev.parent;
+
+	if (!parent)
+		return buffer;
+
+	driver = parent->driver;
+	if (driver && driver->name)
+		strlcpy(buffer, driver->name, len);
+	return buffer;
+}
+
 static void __net_exit netdev_exit(struct net *net)
 {
 	kfree(net->dev_name_head);
Index: linux-2.6.26.noarch/net/sched/sch_generic.c
===================================================================
--- linux-2.6.26.noarch.orig/net/sched/sch_generic.c
+++ linux-2.6.26.noarch/net/sched/sch_generic.c
@@ -215,9 +215,9 @@ static void dev_watchdog(unsigned long a
 		    netif_carrier_ok(dev)) {
 			if (netif_queue_stopped(dev) &&
 			    time_after(jiffies, dev->trans_start + dev->watchdog_timeo)) {
-
-				printk(KERN_INFO "NETDEV WATCHDOG: %s: transmit timed out\n",
-				       dev->name);
+				char drivername[64];
+				printk(KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit timed out\n",
+				       dev->name, netdev_drivername(dev, drivername, 64));
 				dev->tx_timeout(dev);
 				WARN_ON_ONCE(1);
 			}

linux-2.6-warn-Turn-the-netdev-timeout-WARN_ON-into-WARN.patch:

--- NEW FILE linux-2.6-warn-Turn-the-netdev-timeout-WARN_ON-into-WARN.patch ---
From: Arjan van de Ven <arjan at linux.intel.com>
Date: Mon, 15 Sep 2008 23:43:18 +0000 (-0700)
Subject: warn: Turn the netdev timeout WARN_ON() into a WARN()
X-Git-Tag: v2.6.27-rc7~19
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=45e9c0de

warn: Turn the netdev timeout WARN_ON() into a WARN()

this patch turns the netdev timeout WARN_ON_ONCE() into a WARN_ONCE(),
so that the device and driver names are inside the warning message.
This helps automated tools like kerneloops.org to collect the data
and do statistics, as well as making it more likely that humans
cut-n-paste the important message as part of a bugreport.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
Backport: Chuck Ebbert <cebbert at redhat.com>
---

diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index a3f738c..edc6ba8 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -75,6 +75,16 @@ extern void warn_slowpath(const char *file, const int line,
 	unlikely(__ret_warn_once);				\
 })
 
+#define WARN_ONCE(condition, format...)	({			\
+	static int __warned;					\
+	int __ret_warn_once = !!(condition);			\
+								\
+	if (unlikely(__ret_warn_once))				\
+		if (WARN(!__warned, format)) 			\
+			__warned = 1;				\
+	unlikely(__ret_warn_once);				\
+})
+ 
 #ifdef CONFIG_SMP
 # define WARN_ON_SMP(x)			WARN_ON(x)
 #else
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 9634091..ec0a083 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -216,10 +216,9 @@ static void dev_watchdog(unsigned long arg)
 			if (netif_queue_stopped(dev) &&
 			    time_after(jiffies, dev->trans_start + dev->watchdog_timeo)) {
 				char drivername[64];
-				printk(KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit timed out\n",
+				WARN_ONCE(1, KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit timed out\n",
 				       dev->name, netdev_drivername(dev, drivername, 64));
 				dev->tx_timeout(dev);
-				WARN_ON_ONCE(1);
 			}
 			if (!mod_timer(&dev->watchdog_timer, round_jiffies(jiffies + dev->watchdog_timeo)))
 				dev_hold(dev);
		}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.774
retrieving revision 1.775
diff -u -r1.774 -r1.775
--- kernel.spec	23 Sep 2008 17:32:24 -0000	1.774
+++ kernel.spec	29 Sep 2008 14:40:27 -0000	1.775
@@ -703,6 +703,10 @@
 Patch2700: linux-2.6-intel-msr-backport.patch
 Patch2701: linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch
 Patch2703: linux-2.6-pcmcia-fix-broken-abuse-of-dev-driver_data.patch
+
+# for kerneloops reports
+Patch2800: linux-2.6-net-print-module-name-as-part-of-the-message.patch
+Patch2801: linux-2.6-warn-Turn-the-netdev-timeout-WARN_ON-into-WARN.patch
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1301,7 +1305,10 @@
 ApplyPatch linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch
 # fix subtle but annoying PCMCIA bug
 ApplyPatch linux-2.6-pcmcia-fix-broken-abuse-of-dev-driver_data.patch
-# ---------- below all scheduled for 2.6.24 -----------------
+
+# for kerneloops reports
+ApplyPatch linux-2.6-net-print-module-name-as-part-of-the-message.patch
+ApplyPatch linux-2.6-warn-Turn-the-netdev-timeout-WARN_ON-into-WARN.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1892,6 +1899,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Mon Sep 29 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-48
+- Two patches to help make kerneloops bug reports more useful.
+  (requested by Arjan)
+
 * Tue Sep 23 2008 Kyle McMartin <kyle at redhat.com> 2.6.26.5-47
 - two more wireless fixes from John
    p54: Fix regression due to "net: Delete NETDEVICES_MULTIQUEUE kconfig option



From rstrode at fedoraproject.org  Mon Sep 29 14:44:17 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 29 Sep 2008 14:44:17 +0000 (UTC)
Subject: rpms/gdm/F-9 gdm-2.22.0-fedora-logo.patch, NONE,
	1.1 gdm-2.22.0-fix-homedir-crash.patch, NONE,
	1.1 gdm-2.22.0-fix-icon-scale.patch, NONE, 1.1 gdm.spec, 1.391,
	1.392 gdm-2.21.8-fedora-logo.patch, 1.2, NONE
Message-ID: <20080929144417.182057013D@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14596

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.22.0-fedora-logo.patch 
	gdm-2.22.0-fix-homedir-crash.patch 
	gdm-2.22.0-fix-icon-scale.patch 
Removed Files:
	gdm-2.21.8-fedora-logo.patch 
Log Message:
- Add patch from Danny Baumann/Avi Kivity to fix crasher when
  homedir is on unknown filesystem (bug 449987)
- Make icon scale with font size (patch from upstream)
- update logo patch to use some new gconf paths


gdm-2.22.0-fedora-logo.patch:

--- NEW FILE gdm-2.22.0-fedora-logo.patch ---
diff -up gdm-2.22.0/gui/simple-greeter/gdm-simple-greeter.schemas.in.fedora-logo gdm-2.22.0/gui/simple-greeter/gdm-simple-greeter.schemas.in
--- gdm-2.22.0/gui/simple-greeter/gdm-simple-greeter.schemas.in.fedora-logo	2008-05-01 18:35:35.000000000 -0400
+++ gdm-2.22.0/gui/simple-greeter/gdm-simple-greeter.schemas.in	2008-09-29 10:41:47.000000000 -0400
@@ -39,7 +39,7 @@
       <applyto>/apps/gdm/simple-greeter/logo_icon_name</applyto>
       <owner>gdm-simple-greeter</owner>
       <type>string</type>
-      <default>computer</default>
+      <default>start-here</default>
       <locale name="C">
         <short>Icon name to use for greeter logo</short>
         <long>Set to the themed icon name to use for the greeter logo.</long>

gdm-2.22.0-fix-homedir-crash.patch:

--- NEW FILE gdm-2.22.0-fix-homedir-crash.patch ---
--- gdm/gui/simple-greeter/gdm-user.c.orig  2008-06-04 17:56:57.000000000 +0200
+++ gdm/gui/simple-greeter/gdm-user.c       2008-06-04 18:00:05.000000000 +0200
@@ -750,7 +750,8 @@
                 }
                 filesystem_type = g_file_info_get_attribute_string (file_info,
                                                                     G_FILE_ATTRIBUTE_FILESYSTEM_TYPE);
-                is_local = ((strcmp (filesystem_type, "nfs") != 0) &&
+                is_local = ((filesystem_type != NULL) &&
+                           (strcmp (filesystem_type, "nfs") != 0) &&
                             (strcmp (filesystem_type, "afs") != 0) &&
                             (strcmp (filesystem_type, "autofs") != 0) &&
                             (strcmp (filesystem_type, "unknown") != 0) &&


gdm-2.22.0-fix-icon-scale.patch:

--- NEW FILE gdm-2.22.0-fix-icon-scale.patch ---
diff -up gdm-2.22.0/gui/simple-greeter/gdm-user-chooser-widget.c.fix-icon-scale gdm-2.22.0/gui/simple-greeter/gdm-user-chooser-widget.c
--- gdm-2.22.0/gui/simple-greeter/gdm-user-chooser-widget.c.fix-icon-scale	2008-05-01 18:35:35.000000000 -0400
+++ gdm-2.22.0/gui/simple-greeter/gdm-user-chooser-widget.c	2008-09-29 10:36:44.000000000 -0400
@@ -46,7 +46,7 @@ enum {
 
 #define GDM_USER_CHOOSER_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_USER_CHOOSER_WIDGET, GdmUserChooserWidgetPrivate))
 
-#define ICON_SIZE 64
+#define MAX_ICON_SIZE 128
 
 struct GdmUserChooserWidgetPrivate
 {
@@ -71,6 +71,45 @@ static void     gdm_user_chooser_widget_
 
 G_DEFINE_TYPE (GdmUserChooserWidget, gdm_user_chooser_widget, GDM_TYPE_CHOOSER_WIDGET)
 
+static int
+get_font_height_for_widget (GtkWidget *widget)
+{
+        PangoFontMetrics *metrics;
+        PangoContext     *context;
+        int               ascent;
+        int               descent;
+        int               height;
+
+        gtk_widget_ensure_style (widget);
+        context = gtk_widget_get_pango_context (widget);
+        metrics = pango_context_get_metrics (context,
+                                             widget->style->font_desc,
+                                             pango_context_get_language (context));
+
+        ascent = pango_font_metrics_get_ascent (metrics);
+        descent = pango_font_metrics_get_descent (metrics);
+        height = PANGO_PIXELS (ascent + descent);
+        pango_font_metrics_unref (metrics);
+        return height;
+}
+
+static int
+get_icon_height_for_widget (GtkWidget *widget)
+{
+        int font_height;
+        int height;
+
+        font_height = get_font_height_for_widget (widget);
+        height = 3 * font_height;
+        if (height > MAX_ICON_SIZE) {
+                height = MAX_ICON_SIZE;
+        }
+
+        g_debug ("GdmUserChooserWidget: font height %d; using icon size %d", font_height, height);
+
+        return height;
+}
+
 static void
 add_user_other (GdmUserChooserWidget *widget)
 {
@@ -287,10 +326,13 @@ static GdkPixbuf *
 get_stock_person_pixbuf (GdmUserChooserWidget *widget)
 {
         GdkPixbuf *pixbuf;
+        int        size;
+
+        size = get_icon_height_for_widget (widget);
 
         pixbuf = gtk_icon_theme_load_icon (widget->priv->icon_theme,
                                            DEFAULT_USER_ICON,
-                                           ICON_SIZE,
+                                           size,
                                            0,
                                            NULL);
 
@@ -301,10 +343,13 @@ static GdkPixbuf *
 get_logged_in_pixbuf (GdmUserChooserWidget *widget)
 {
         GdkPixbuf *pixbuf;
+        int        size;
+
+        size = get_icon_height_for_widget (widget);
 
         pixbuf = gtk_icon_theme_load_icon (widget->priv->icon_theme,
                                            "emblem-default",
-                                           ICON_SIZE / 3,
+                                           size / 3,
                                            0,
                                            NULL);
 
@@ -402,8 +447,11 @@ on_user_added (GdmUserManager       *man
         GdkPixbuf    *pixbuf;
         char         *tooltip;
         gboolean      is_logged_in;
+        int           size;
+
+        size = get_icon_height_for_widget (widget);
+        pixbuf = gdm_user_render_icon (user, size);
 
-        pixbuf = gdm_user_render_icon (user, ICON_SIZE);
         if (pixbuf == NULL && widget->priv->stock_person_pixbuf != NULL) {
                 pixbuf = g_object_ref (widget->priv->stock_person_pixbuf);
         }


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-9/gdm.spec,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- gdm.spec	23 Sep 2008 18:27:06 -0000	1.391
+++ gdm.spec	29 Sep 2008 14:43:46 -0000	1.392
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.22.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -88,7 +88,14 @@
 Patch7: gdm-2.22.0-fix-auto-login.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=446224
 Patch8: gdm-2.22.0-fix-xdmcp.patch
-Patch99: gdm-2.21.8-fedora-logo.patch
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=449987
+Patch9: gdm-2.22.0-fix-homedir-crash.patch
+
+# Fix pulled from upstream, no bug number
+Patch10: gdm-2.22.0-fix-icon-scale.patch
+
+Patch99: gdm-2.22.0-fedora-logo.patch
 
 %package user-switch-applet
 Summary:   GDM User Switcher Panel Applet
@@ -115,6 +122,8 @@
 %patch6 -p1 -b .enable-tcp
 %patch7 -p1 -b .fix-auto-login
 %patch8 -p1 -b .fix-xdmcp
+%patch9 -p1 -b .fix-homedir-crash
+%patch10 -p1 -b .fix-icon-scale
 %patch99 -p1 -b .fedora-logo
 
 %build
@@ -280,7 +289,6 @@
 %{_libexecdir}/gdm-product-slave
 %{_libexecdir}/gdm-session-worker
 %{_libexecdir}/gdm-simple-chooser
-%{_libexecdir}/gdm-simple-greeter
 %{_libexecdir}/gdm-simple-slave
 %{_libexecdir}/gdm-xdmcp-chooser-slave
 %{_sbindir}/gdm
@@ -312,6 +320,12 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Mon Sep 29 2008 Ray Strode <rstrode at redhat.com> - 1:2.22.0-10
+- Add patch from Danny Baumann/Avi Kivity to fix crasher when
+  homedir is on unknown filesystem (bug 449987)
+- Make icon scale with font size (patch from upstream)
+- update logo patch to use some new gconf paths
+
 * Tue Sep 23 2008 Lubomir Rintel <lkundrak at v3.sk> - 1:2.22.0-9
 - Fix XDMCP, thanks to Michael Young (bug 446224)
 


--- gdm-2.21.8-fedora-logo.patch DELETED ---



From rdieter at fedoraproject.org  Mon Sep 29 14:51:25 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 14:51:25 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.69,1.70
Message-ID: <20080929145125.81D4C70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15998

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem
- grow -libs, kde4 styles are unavailable for i386 applications (#456826)



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- kdebase-runtime.spec	26 Sep 2008 19:40:01 -0000	1.69
+++ kdebase-runtime.spec	29 Sep 2008 14:50:54 -0000	1.70
@@ -1,4 +1,4 @@
-%define _default_patch_fuzz 2
+define _default_patch_fuzz 2
 
 %if 0%{?fedora} < 9
 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
@@ -10,7 +10,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
 Version:       4.1.2
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -30,14 +30,15 @@
 %define rest 1
 %endif
 
+Requires: %{name}-libs = %{version}-%{release}
+
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 Provides:  kdebase4-runtime = %{version}-%{release}
 
 BuildRequires: kde-filesystem
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
-Requires: kdelibs4 >= %{version}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 Requires: kdepimlibs >= %{version}
 %ifnarch s390 s390x
 Requires: eject
@@ -74,6 +75,14 @@
 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: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
 %package -n oxygen-icon-theme
 Summary: Oxygen icon theme
 Group: User Interface/Desktops
@@ -246,17 +255,19 @@
 
 
 %post
-/sbin/ldconfig ||:
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : }
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
-/sbin/ldconfig ||:
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : }
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 %if 0%{?icons}
 %post -n oxygen-icon-theme
 xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
@@ -289,14 +300,16 @@
 %{_kde4_datadir}/sounds/*
 %{_kde4_libdir}/kconf_update_bin/*
 %{_kde4_libdir}/libkdeinit4_*.so
-%{_kde4_libdir}/libkaudiodevicelist.so.*
-%{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/kde4/plugins/phonon_platform/
+%{_kde4_libdir}/kde4/kcm_*.so
+%{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libexecdir}/*
-%{_kde4_libdir}/kde4/plugins/styles/
 %{_libdir}/strigi/*
 %{_mandir}/man1/*
 
+%exclude %{_kde4_libdir}/kde4/kcm_phononxine.so
+%exclude %{_kde4_datadir}/kde4/services/kcm_phononxine.desktop
+%exclude %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
+
 %if ! 0%{?kde3_desktop}
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_docdir}/HTML/en/*
@@ -312,10 +325,15 @@
 %{_datadir}/services/khelpcenter.desktop
 %endif
 
-%exclude %{_kde4_libdir}/kde4/kcm_phononxine.so
-%exclude %{_kde4_datadir}/kde4/services/kcm_phononxine.desktop
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libkaudiodevicelist.so.*
+%{_kde4_libdir}/kde4/*.so
+%{_kde4_libdir}/kde4/plugins/phonon_platform/
+%{_kde4_libdir}/kde4/plugins/styles/
+%exclude %{_kde4_libdir}/kde4/kcm_*.so
+%exclude %{_kde4_libdir}/kde4/kded_*.so
 %exclude %{_kde4_libdir}/kde4/phonon_xine.so
-%exclude %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
 
 %files -n phonon-backend-xine
 %defattr(-,root,root,-)
@@ -340,6 +358,11 @@
 
 
 %changelog
+* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+- grow -libs, kde4 styles are unavailable for i386 applications (#456826)
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org. 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 14:54:25 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 14:54:25 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.70,1.71
Message-ID: <20080929145425.54BB270110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16524

Modified Files:
	kdebase-runtime.spec 
Log Message:
typo



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kdebase-runtime.spec	29 Sep 2008 14:50:54 -0000	1.70
+++ kdebase-runtime.spec	29 Sep 2008 14:53:54 -0000	1.71
@@ -1,4 +1,4 @@
-define _default_patch_fuzz 2
+%define _default_patch_fuzz 2
 
 %if 0%{?fedora} < 9
 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here



From kwizart at fedoraproject.org  Mon Sep 29 14:58:07 2008
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon, 29 Sep 2008 14:58:07 +0000 (UTC)
Subject: rpms/filezilla/devel sources, 1.20, 1.21 .cvsignore, 1.16,
	1.17 filezilla.spec, 1.21, 1.22
Message-ID: <20080929145807.F364570110@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/filezilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17131

Modified Files:
	sources .cvsignore filezilla.spec 
Log Message:
- Update to 3.1.3.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	23 Sep 2008 15:06:02 -0000	1.20
+++ sources	29 Sep 2008 14:57:37 -0000	1.21
@@ -1 +1 @@
-1f4dba6912441f478deac8c585203581  FileZilla_3.1.3_src.tar.bz2
+61a43e5b9de1dece49b9acc7b0323aae  FileZilla_3.1.3.1_src.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	23 Sep 2008 15:06:02 -0000	1.16
+++ .cvsignore	29 Sep 2008 14:57:37 -0000	1.17
@@ -1 +1 @@
-FileZilla_3.1.3_src.tar.bz2
+FileZilla_3.1.3.1_src.tar.bz2


Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- filezilla.spec	23 Sep 2008 15:06:02 -0000	1.21
+++ filezilla.spec	29 Sep 2008 14:57:37 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           filezilla
-Version:        3.1.3
+Version:        3.1.3.1
 Release:        1%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
@@ -117,6 +117,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 kwizart < kwizart at gmail.com > - 3.1.3.1-1
+- Update to 3.1.3.1
+
 * Tue Sep 23 2008 kwizart < kwizart at gmail.com > - 3.1.3-1
 - Update to 3.1.3
 



From rstrode at fedoraproject.org  Mon Sep 29 14:58:39 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 29 Sep 2008 14:58:39 +0000 (UTC)
Subject: rpms/gdm/F-9 gdm.spec,1.392,1.393
Message-ID: <20080929145839.D02E070110@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17237

Modified Files:
	gdm.spec 
Log Message:
fix spec file mess up



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-9/gdm.spec,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- gdm.spec	29 Sep 2008 14:43:46 -0000	1.392
+++ gdm.spec	29 Sep 2008 14:58:09 -0000	1.393
@@ -289,6 +289,7 @@
 %{_libexecdir}/gdm-product-slave
 %{_libexecdir}/gdm-session-worker
 %{_libexecdir}/gdm-simple-chooser
+%{_libexecdir}/gdm-simple-greeter
 %{_libexecdir}/gdm-simple-slave
 %{_libexecdir}/gdm-xdmcp-chooser-slave
 %{_sbindir}/gdm



From pkgdb at fedoraproject.org  Mon Sep 29 15:09:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 29 Sep 2008 15:09:32 +0000
Subject: [pkgdb] python-pyblock had acl change status
Message-ID: <20080929150933.37B3F208DA2@bastion.fedora.phx.redhat.com>

clumens has set the watchbugzilla acl on python-pyblock (Fedora 7) to Obsolete for clumens

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyblock



From pkgdb at fedoraproject.org  Mon Sep 29 15:09:29 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 29 Sep 2008 15:09:29 +0000
Subject: [pkgdb] python-pyblock had acl change status
Message-ID: <20080929150929.843B6208D75@bastion.fedora.phx.redhat.com>

clumens has set the watchbugzilla acl on python-pyblock (Fedora devel) to Obsolete for clumens

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyblock



From pkgdb at fedoraproject.org  Mon Sep 29 15:09:35 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 29 Sep 2008 15:09:35 +0000
Subject: [pkgdb] python-pyblock had acl change status
Message-ID: <20080929150935.95FA4208DA7@bastion.fedora.phx.redhat.com>

clumens has set the watchbugzilla acl on python-pyblock (Fedora 8) to Obsolete for clumens

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyblock



From pkgdb at fedoraproject.org  Mon Sep 29 15:09:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 29 Sep 2008 15:09:36 +0000
Subject: [pkgdb] python-pyblock had acl change status
Message-ID: <20080929150936.16BEA208DAB@bastion.fedora.phx.redhat.com>

clumens has set the watchbugzilla acl on python-pyblock (Fedora 9) to Obsolete for clumens

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyblock



From silfreed at fedoraproject.org  Mon Sep 29 15:20:06 2008
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Mon, 29 Sep 2008 15:20:06 +0000 (UTC)
Subject: rpms/pytrainer/devel pytrainer.spec,1.7,1.8
Message-ID: <20080929152006.1C8A270110@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/pytrainer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20052

Modified Files:
	pytrainer.spec 
Log Message:
* Mon Sep 29 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-3
- fixing gecko-libs requirement



Index: pytrainer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/devel/pytrainer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pytrainer.spec	24 Sep 2008 15:14:38 -0000	1.7
+++ pytrainer.spec	29 Sep 2008 15:19:35 -0000	1.8
@@ -1,12 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %define firefox_ver 2.0.0.14
-%define xulrunner_ver 1.9
-%define xulrunner_pkgver %{xulrunner_ver}.0.1
+%define gecko_ver 1.9
 
 Name: pytrainer
 Version: 1.6.0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A tool to log all your sport excursions
 
 Group: Development/Languages
@@ -28,7 +27,7 @@
 Requires: firefox = %{firefox_ver}
 %endif
 %if 0%{fedora} >= 9
-Requires: xulrunner = %{xulrunner_pkgver}
+Requires: gecko-libs >= %{gecko_ver}
 %endif
 BuildRequires: python-devel
 BuildRequires: desktop-file-utils
@@ -48,7 +47,7 @@
 %{__sed} -i 's|MOZLIBLOC|/usr/lib/firefox-%{firefox_ver}|' %{SOURCE1}
 %endif
 %if 0%{fedora} >= 9
-%{__sed} -i 's|MOZLIBLOC|%{_libdir}/xulrunner-%{xulrunner_ver}|' %{SOURCE1}
+%{__sed} -i 's|MOZLIBLOC|%{_libdir}/xulrunner-%{gecko_ver}|' %{SOURCE1}
 %endif
 
 # fix non-exacutable scripts
@@ -89,6 +88,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-3
+- fixing gecko-libs requirement
+
 * Wed Sep 23 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-2
 - replacing environ hack patch with shell script
 - adding patch to clean up desktop file



From silfreed at fedoraproject.org  Mon Sep 29 15:21:22 2008
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Mon, 29 Sep 2008 15:21:22 +0000 (UTC)
Subject: rpms/pytrainer/F-9 pytrainer.spec,1.6,1.7
Message-ID: <20080929152122.4909F70110@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/pytrainer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20295

Modified Files:
	pytrainer.spec 
Log Message:
* Mon Sep 29 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-3
- fixing gecko-libs requirement



Index: pytrainer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/F-9/pytrainer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pytrainer.spec	24 Sep 2008 15:19:27 -0000	1.6
+++ pytrainer.spec	29 Sep 2008 15:20:52 -0000	1.7
@@ -1,12 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %define firefox_ver 2.0.0.14
-%define xulrunner_ver 1.9
-%define xulrunner_pkgver %{xulrunner_ver}.0.1
+%define gecko_ver 1.9
 
 Name: pytrainer
 Version: 1.6.0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A tool to log all your sport excursions
 
 Group: Development/Languages
@@ -28,7 +27,7 @@
 Requires: firefox = %{firefox_ver}
 %endif
 %if 0%{fedora} >= 9
-Requires: xulrunner = %{xulrunner_pkgver}
+Requires: gecko-libs >= %{gecko_ver}
 %endif
 BuildRequires: python-devel
 BuildRequires: desktop-file-utils
@@ -48,7 +47,7 @@
 %{__sed} -i 's|MOZLIBLOC|/usr/lib/firefox-%{firefox_ver}|' %{SOURCE1}
 %endif
 %if 0%{fedora} >= 9
-%{__sed} -i 's|MOZLIBLOC|%{_libdir}/xulrunner-%{xulrunner_ver}|' %{SOURCE1}
+%{__sed} -i 's|MOZLIBLOC|%{_libdir}/xulrunner-%{gecko_ver}|' %{SOURCE1}
 %endif
 
 # fix non-exacutable scripts
@@ -89,6 +88,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-3
+- fixing gecko-libs requirement
+
 * Wed Sep 23 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-2
 - replacing environ hack patch with shell script
 - adding patch to clean up desktop file



From silfreed at fedoraproject.org  Mon Sep 29 15:22:42 2008
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Mon, 29 Sep 2008 15:22:42 +0000 (UTC)
Subject: rpms/pytrainer/F-8 pytrainer.spec,1.6,1.7
Message-ID: <20080929152242.E2A0A70110@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/pytrainer/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20510

Modified Files:
	pytrainer.spec 
Log Message:
* Mon Sep 29 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-3
- fixing gecko-libs requirement



Index: pytrainer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/F-8/pytrainer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pytrainer.spec	24 Sep 2008 15:21:34 -0000	1.6
+++ pytrainer.spec	29 Sep 2008 15:22:12 -0000	1.7
@@ -1,12 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %define firefox_ver 2.0.0.14
-%define xulrunner_ver 1.9
-%define xulrunner_pkgver %{xulrunner_ver}.0.1
+%define gecko_ver 1.9
 
 Name: pytrainer
 Version: 1.6.0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A tool to log all your sport excursions
 
 Group: Development/Languages
@@ -28,7 +27,7 @@
 Requires: firefox = %{firefox_ver}
 %endif
 %if 0%{fedora} >= 9
-Requires: xulrunner = %{xulrunner_pkgver}
+Requires: gecko-libs >= %{gecko_ver}
 %endif
 BuildRequires: python-devel
 BuildRequires: desktop-file-utils
@@ -48,7 +47,7 @@
 %{__sed} -i 's|MOZLIBLOC|/usr/lib/firefox-%{firefox_ver}|' %{SOURCE1}
 %endif
 %if 0%{fedora} >= 9
-%{__sed} -i 's|MOZLIBLOC|%{_libdir}/xulrunner-%{xulrunner_ver}|' %{SOURCE1}
+%{__sed} -i 's|MOZLIBLOC|%{_libdir}/xulrunner-%{gecko_ver}|' %{SOURCE1}
 %endif
 
 # fix non-exacutable scripts
@@ -89,6 +88,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-3
+- fixing gecko-libs requirement
+
 * Wed Sep 23 2008 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.5-2
 - replacing environ hack patch with shell script
 - adding patch to clean up desktop file



From rdieter at fedoraproject.org  Mon Sep 29 15:25:15 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 15:25:15 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.71,1.72
Message-ID: <20080929152515.776F170110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20839

Modified Files:
	kdebase-runtime.spec 
Log Message:
really do VERBOSE



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- kdebase-runtime.spec	29 Sep 2008 14:53:54 -0000	1.71
+++ kdebase-runtime.spec	29 Sep 2008 15:24:45 -0000	1.72
@@ -124,7 +124,7 @@
 popd
 
 %if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 %endif
 
 



From rdieter at fedoraproject.org  Mon Sep 29 15:25:52 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 15:25:52 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-9 kdebase-runtime.spec,1.55,1.56
Message-ID: <20080929152552.0C87C70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21039

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem
- grow -libs, kde4 styles are unavailable for i386 applications (#456826)



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kdebase-runtime.spec	28 Sep 2008 20:44:21 -0000	1.55
+++ kdebase-runtime.spec	29 Sep 2008 15:25:21 -0000	1.56
@@ -10,7 +10,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
 Version:       4.1.2
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -30,14 +30,15 @@
 %define rest 1
 %endif
 
+Requires: %{name}-libs = %{version}-%{release}
+
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 Provides:  kdebase4-runtime = %{version}-%{release}
 
 BuildRequires: kde-filesystem
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
-Requires: kdelibs4 >= %{version}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 Requires: kdepimlibs >= %{version}
 %ifnarch s390 s390x
 Requires: eject
@@ -74,6 +75,14 @@
 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: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
 %package -n oxygen-icon-theme
 Summary: Oxygen icon theme
 Group: User Interface/Desktops
@@ -115,7 +124,7 @@
 popd
 
 %if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 %endif
 
 
@@ -246,17 +255,19 @@
 
 
 %post
-/sbin/ldconfig ||:
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : }
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
-/sbin/ldconfig ||:
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : }
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 %if 0%{?icons}
 %post -n oxygen-icon-theme
 xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
@@ -289,14 +300,16 @@
 %{_kde4_datadir}/sounds/*
 %{_kde4_libdir}/kconf_update_bin/*
 %{_kde4_libdir}/libkdeinit4_*.so
-%{_kde4_libdir}/libkaudiodevicelist.so.*
-%{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/kde4/plugins/phonon_platform/
+%{_kde4_libdir}/kde4/kcm_*.so
+%{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libexecdir}/*
-%{_kde4_libdir}/kde4/plugins/styles/
 %{_libdir}/strigi/*
 %{_mandir}/man1/*
 
+%exclude %{_kde4_libdir}/kde4/kcm_phononxine.so
+%exclude %{_kde4_datadir}/kde4/services/kcm_phononxine.desktop
+%exclude %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
+
 %if ! 0%{?kde3_desktop}
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_docdir}/HTML/en/*
@@ -312,10 +325,15 @@
 %{_datadir}/services/khelpcenter.desktop
 %endif
 
-%exclude %{_kde4_libdir}/kde4/kcm_phononxine.so
-%exclude %{_kde4_datadir}/kde4/services/kcm_phononxine.desktop
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libkaudiodevicelist.so.*
+%{_kde4_libdir}/kde4/*.so
+%{_kde4_libdir}/kde4/plugins/phonon_platform/
+%{_kde4_libdir}/kde4/plugins/styles/
+%exclude %{_kde4_libdir}/kde4/kcm_*.so
+%exclude %{_kde4_libdir}/kde4/kded_*.so
 %exclude %{_kde4_libdir}/kde4/phonon_xine.so
-%exclude %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
 
 %files -n phonon-backend-xine
 %defattr(-,root,root,-)
@@ -340,6 +358,11 @@
 
 
 %changelog
+* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+- grow -libs, kde4 styles are unavailable for i386 applications (#456826)
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org. 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 15:26:38 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 15:26:38 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-9 kdebase-workspace.spec,1.104,1.105
Message-ID: <20080929152638.64FA970110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21275

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- kdebase-workspace.spec	28 Sep 2008 20:46:07 -0000	1.104
+++ kdebase-workspace.spec	29 Sep 2008 15:26:08 -0000	1.105
@@ -4,7 +4,7 @@
 Name: kdebase-workspace
 Version: 4.1.2
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -184,7 +184,7 @@
   -DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -309,6 +309,10 @@
 
 
 %changelog
+* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From caolanm at fedoraproject.org  Mon Sep 29 15:27:10 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 29 Sep 2008 15:27:10 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.0.ooo94435.nospanishmodern.patch, NONE,
	1.1 openoffice.org.spec, 1.1662, 1.1663
Message-ID: <20080929152710.2B98D70110@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21328

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo94435.nospanishmodern.patch 
Log Message:
add openoffice.org-3.0.0.ooo94435.nospanishmodern.patch

openoffice.org-3.0.0.ooo94435.nospanishmodern.patch:

--- NEW FILE openoffice.org-3.0.0.ooo94435.nospanishmodern.patch ---
Index: source/misc/langtab.src
===================================================================
RCS file: /cvs/util/svtools/source/misc/langtab.src,v
retrieving revision 1.6
diff -u -r1.6 langtab.src
--- openoffice.org.orig/svtools/source/misc/langtab.src	10 Apr 2008 21:34:34 -0000	1.6
+++ openoffice.org/svtools/source/misc/langtab.src	29 Sep 2008 15:22:57 -0000
@@ -159,7 +159,6 @@
         < "Slovenian" ; LANGUAGE_SLOVENIAN ; > ;
         < "Spanish (Spain)" ; LANGUAGE_SPANISH ; > ;
         < "Spanish (Mexico)" ; LANGUAGE_SPANISH_MEXICAN ; > ;
-        < "Spanish, Modern (Spain)" ; LANGUAGE_SPANISH_MODERN ; > ;
         < "Spanish (Guatemala)" ; LANGUAGE_SPANISH_GUATEMALA ; > ;
         < "Spanish (Costa Rica)" ; LANGUAGE_SPANISH_COSTARICA ; > ;
         < "Spanish (Panama)" ; LANGUAGE_SPANISH_PANAMA ; > ;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1662
retrieving revision 1.1663
diff -u -r1.1662 -r1.1663
--- openoffice.org.spec	28 Sep 2008 21:40:05 -0000	1.1662
+++ openoffice.org.spec	29 Sep 2008 15:26:39 -0000	1.1663
@@ -116,6 +116,7 @@
 Patch45: openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch
 Patch46: workspace.vcl94.patch
 Patch47: workspace.vcl95.patch
+Patch48: openoffice.org-3.0.0.ooo94435.nospanishmodern.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -777,7 +778,7 @@
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-he
-Requires: dejavu-fonts
+Requires: culmus-fonts
 Obsoletes: openoffice.org-langpack-he
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-he_IL
@@ -1317,6 +1318,7 @@
 %patch45 -p1 -b .ooo93949.sw.better_rtf_encodings.patch
 %patch46 -p1 -b .workspace.vcl94.patch
 %patch47 -p1 -b .workspace.vcl95.patch
+%patch48 -p1 -b .ooo94435.nospanishmodern.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3681,6 +3683,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Sep 29 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-8.2
+- add openoffice.org-3.0.0.ooo94435.nospanishmodern.patch
+
 * Sun Sep 28 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-8.1
 - next candidate
 - Resolves: rhbz#463884 openoffice.org-3.0.0.ooo94318.greekmenu.crash



From spot at fedoraproject.org  Mon Sep 29 15:30:59 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 29 Sep 2008 15:30:59 +0000 (UTC)
Subject: rpms/audio-entropyd/devel audio-entropyd.conf, NONE, 1.1 .cvsignore,
	1.3, 1.4 audio-entropyd, 1.1, 1.2 audio-entropyd.spec, 1.11,
	1.12 sources, 1.3, 1.4 audio-entropyd-1.0.1-xtra_debug.patch,
	1.1, NONE
Message-ID: <20080929153059.58BF970110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/audio-entropyd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21910

Modified Files:
	.cvsignore audio-entropyd audio-entropyd.spec sources 
Added Files:
	audio-entropyd.conf 
Removed Files:
	audio-entropyd-1.0.1-xtra_debug.patch 
Log Message:
1.0.5


--- NEW FILE audio-entropyd.conf ---
# This is the configuration file for audio-entropyd's initscript.
# The only valid setting for this file is OPTIONS.

# Uncomment the OPTIONS line and include any options that you wish to 
# pass to the audio-entropyd daemon on startup. See audio-entropyd --help
# for a list of valid flags.

# OPTIONS=""


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audio-entropyd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Feb 2008 16:08:52 -0000	1.3
+++ .cvsignore	29 Sep 2008 15:30:28 -0000	1.4
@@ -1 +1 @@
-audio-entropyd-1.0.1.tgz
+audio-entropyd-1.0.5.tgz


Index: audio-entropyd
===================================================================
RCS file: /cvs/pkgs/rpms/audio-entropyd/devel/audio-entropyd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audio-entropyd	5 Jun 2007 19:19:18 -0000	1.1
+++ audio-entropyd	29 Sep 2008 15:30:28 -0000	1.2
@@ -6,7 +6,9 @@
 # description: This is a daemon which runs on client machines to generate entropy
 #              from the system soundcard (if present and active).
 # processname: audio-entropyd
-# config:
+# config: /etc/sysconfig/audio-entropyd
+
+confdir=/etc/sysconfig
 
 # Source function library.
 . /etc/init.d/functions
@@ -16,10 +18,14 @@
 
 LOCKFILE=/var/lock/subsys/audio-entropyd
 
+if [ -r $confdir/audio-entropyd ]; then
+    . $confdir/audio-entropyd
+fi
+
 case "$1" in
    start)
        echo -n $"Starting Audio Entropy daemon... "
-       daemon $AED_BIN
+       daemon $AED_BIN $OPTIONS
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch $LOCKFILE


Index: audio-entropyd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audio-entropyd/devel/audio-entropyd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- audio-entropyd.spec	7 Aug 2008 20:46:58 -0000	1.11
+++ audio-entropyd.spec	29 Sep 2008 15:30:28 -0000	1.12
@@ -1,13 +1,13 @@
 Name:           audio-entropyd
-Version:        1.0.1
-Release:        5%{?dist}
+Version:        1.0.5
+Release:        1%{?dist}
 License:        GPLv2
 Group:          System Environment/Daemons
 Summary:        Generate entropy from audio output
 URL:            http://www.vanheusden.com/aed/
 Source0:        http://www.vanheusden.com/aed/audio-entropyd-%{version}.tgz
 Source1:        audio-entropyd
-Patch0:		audio-entropyd-1.0.1-xtra_debug.patch
+Source2:	audio-entropyd.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post):   chkconfig
 Requires(preun):  chkconfig, initscripts
@@ -18,7 +18,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .xtra_debug
 
 %build
 make OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -29,6 +28,8 @@
 install -m0755 audio-entropyd $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 install -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/audio-entropyd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -52,8 +53,14 @@
 %doc COPYING README README.2 TODO
 %{_initrddir}/audio-entropyd
 %{_sbindir}/audio-entropyd
+%config(noreplace) %{_sysconfdir}/sysconfig/audio-entropyd
 
 %changelog
+* Sun Sep 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.5-1
+- update to 1.0.5
+- drop debug patch, upstream fixed the problem in a different manner
+- add config file and fix initscript to use it (bz 463904)
+
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-5
 - random rawhide appeasement
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audio-entropyd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Feb 2008 16:08:52 -0000	1.3
+++ sources	29 Sep 2008 15:30:28 -0000	1.4
@@ -1 +1 @@
-486f7d46ffc999830e550ccb07abfe61  audio-entropyd-1.0.1.tgz
+9f1f85872c9e6cee20d55da14c840079  audio-entropyd-1.0.5.tgz


--- audio-entropyd-1.0.1-xtra_debug.patch DELETED ---



From rhughes at fedoraproject.org  Mon Sep 29 15:33:52 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 29 Sep 2008 15:33:52 +0000 (UTC)
Subject: rpms/gnome-packagekit/devel .cvsignore, 1.28,
	1.29 gnome-packagekit.spec, 1.47, 1.48 sources, 1.28,
	1.29 pk-use-different-gpk-clients.patch, 1.1, NONE
Message-ID: <20080929153352.2136170110@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22424

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Removed Files:
	pk-use-different-gpk-clients.patch 
Log Message:
* Mon Sep 22 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.5-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	22 Sep 2008 15:13:47 -0000	1.28
+++ .cvsignore	29 Sep 2008 15:33:21 -0000	1.29
@@ -1 +1 @@
-gnome-packagekit-0.3.4.tar.gz
+gnome-packagekit-0.3.5.tar.gz


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gnome-packagekit.spec	22 Sep 2008 15:13:47 -0000	1.47
+++ gnome-packagekit.spec	29 Sep 2008 15:33:21 -0000	1.48
@@ -1,9 +1,9 @@
 %define dbus_version            0.61
-%define packagekit_version      0.3.4
+%define packagekit_version      0.3.5
 
 Summary:   GNOME PackageKit Client
 Name:      gnome-packagekit
-Version:   0.3.4
+Version:   0.3.5
 Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
@@ -54,9 +54,10 @@
 BuildRequires: PolicyKit-gnome-devel
 BuildRequires: unique-devel
 BuildRequires: intltool
+BuildRequires: xorg-x11-proto-devel
 
 %description
-packagekit-gnome provides session applications for the PackageKit API.
+gnome-packagekit provides session applications for the PackageKit API.
 There are several utilities designed for installing, updating and
 removing packages on your system.
 
@@ -147,6 +148,9 @@
 %{_datadir}/applications/gpk-*.desktop
 
 %changelog
+* Mon Sep 22 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.5-1
+- New upstream version
+
 * Mon Sep 22 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	22 Sep 2008 15:13:47 -0000	1.28
+++ sources	29 Sep 2008 15:33:21 -0000	1.29
@@ -1 +1 @@
-0815795f1bfa275161edc722d7566002  gnome-packagekit-0.3.4.tar.gz
+a23b6f5d8a0a088a0c669eabc9e0f302  gnome-packagekit-0.3.5.tar.gz


--- pk-use-different-gpk-clients.patch DELETED ---



From rhughes at fedoraproject.org  Mon Sep 29 15:33:48 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 29 Sep 2008 15:33:48 +0000 (UTC)
Subject: rpms/PackageKit/devel .cvsignore, 1.29, 1.30 PackageKit.spec, 1.61, 
	1.62 sources, 1.30, 1.31 pk-dont-hang-when-cache-deep.patch, 1.1,
	NONE pk-dont-schedule-the-whole-queue.patch, 1.1,
	NONE pk-dont-send-finished-from-dispatcher.patch, 1.1,
	NONE pk-fix-yum-error-name.patch, 1.1, NONE
Message-ID: <20080929153348.8853270110@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22394

Modified Files:
	.cvsignore PackageKit.spec sources 
Removed Files:
	pk-dont-hang-when-cache-deep.patch 
	pk-dont-schedule-the-whole-queue.patch 
	pk-dont-send-finished-from-dispatcher.patch 
	pk-fix-yum-error-name.patch 
Log Message:
* Mon Sep 29 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.5-1
- New upstream version
- Add a helper which can be used by GStreamer to install codecs.
 
* Thu Sep 25 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-5
- When returning results from a cache we should always return finished in an
  idle loop so we can block and wait for a response
- This fixes the bug where if you have two GetUpdates in the queue the second
  would hang waiting for the first, even though it had already finished.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	22 Sep 2008 15:13:45 -0000	1.29
+++ .cvsignore	29 Sep 2008 15:33:17 -0000	1.30
@@ -1 +1 @@
-PackageKit-0.3.4.tar.gz
+PackageKit-0.3.5.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- PackageKit.spec	25 Sep 2008 14:00:04 -0000	1.61
+++ PackageKit.spec	29 Sep 2008 15:33:18 -0000	1.62
@@ -7,8 +7,8 @@
 
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
-Version:   0.3.4
-Release:   5%{?dist}
+Version:   0.3.5
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -16,16 +16,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # upstream: c9a01198d494f06ae9e0b3e2a002f941da118f00
-Patch0:    pk-dont-send-finished-from-dispatcher.patch
-
-# upstream: 95a2dcf78ba0e2ae6262bfae897a16b0e26408c8
-Patch1:    pk-dont-schedule-the-whole-queue.patch
-
-# upstream: 16bea44b16fd8b1ac36cc5939caf1017eece12eb
-Patch2:    pk-fix-yum-error-name.patch
-
-# upstream: 58955c21674e37d43d7353d30ab1da3163699e94
-Patch3:    pk-dont-hang-when-cache-deep.patch
+#Patch0:    pk-dont-send-finished-from-dispatcher.patch
 
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
@@ -55,6 +46,7 @@
 BuildRequires: gettext
 BuildRequires: xulrunner-devel
 BuildRequires: libarchive-devel
+BuildRequires: gstreamer-devel
 
 %description
 PackageKit is a D-Bus abstraction layer that allows the session user
@@ -149,12 +141,21 @@
 users to install and update packages from configured repositories
 using PackageKit.
 
+%package gstreamer-plugin
+Summary: Install GStreamer codecs using PackageKit
+Group: Development/Libraries
+Requires: gstreamer
+Requires: PackageKit-libs = %{version}-%{release}
+Obsoletes: codeina < 0.10.1-8
+Provides:  codeina = 0.10.1-8
+
+%description gstreamer-plugin
+The PackageKit GStreamer plugin allows any Gstreamer application to install
+codecs from configured repositories using PackageKit.
+
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+#%patch0 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -173,6 +174,11 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/packagekit-plugin.la
 chmod 755 $RPM_BUILD_ROOT%{_libexecdir}/PackageKitDbusTest.py
 
+# create a link that GStreamer will recognise
+pushd ${RPM_BUILD_ROOT}%{_libexecdir} > /dev/null
+ln -s pk-gstreamer-install gst-install-plugins-helper
+popd > /dev/null
+
 %find_lang %name
 
 %clean
@@ -217,7 +223,6 @@
 %{_bindir}/pkgenpack
 %{_bindir}/packagekit-bugreport.sh
 %{_libexecdir}/pk-import-*
-%{_libexecdir}/pk-generate-*
 %exclude %{_libdir}/libpackagekit*.so.*
 %{_libdir}/packagekit-backend/libpk_backend_dummy.so
 %{_libdir}/packagekit-backend/libpk_backend_test_*.so
@@ -277,6 +282,12 @@
 %dir %{_libdir}/mozilla/plugins
 %{_libdir}/mozilla/plugins/packagekit-plugin.so
 
+%files gstreamer-plugin
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_libexecdir}/pk-gstreamer-install
+%{_libexecdir}/gst-install-plugins-helper
+
 %files devel
 %defattr(-,root,root,-)
 %doc README AUTHORS NEWS COPYING
@@ -285,6 +296,10 @@
 %{_includedir}/*
 
 %changelog
+* Mon Sep 29 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.5-1
+- New upstream version
+- Add a helper which can be used by GStreamer to install codecs.
+ 
 * Thu Sep 25 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-5
 - When returning results from a cache we should always return finished in an
   idle loop so we can block and wait for a response


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	22 Sep 2008 15:13:45 -0000	1.30
+++ sources	29 Sep 2008 15:33:18 -0000	1.31
@@ -1 +1 @@
-5b02713b8b1a18508f64d3db746d710f  PackageKit-0.3.4.tar.gz
+42581b30335e527f3fa03ff2e6ceea86  PackageKit-0.3.5.tar.gz


--- pk-dont-hang-when-cache-deep.patch DELETED ---


--- pk-dont-schedule-the-whole-queue.patch DELETED ---


--- pk-dont-send-finished-from-dispatcher.patch DELETED ---


--- pk-fix-yum-error-name.patch DELETED ---



From spot at fedoraproject.org  Mon Sep 29 15:34:21 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 29 Sep 2008 15:34:21 +0000 (UTC)
Subject: rpms/audio-entropyd/F-8 audio-entropyd.conf, NONE,
	1.1 audio-entropyd, 
	1.1, 1.2 audio-entropyd.spec, 1.8, 1.9 sources, 1.3,
	1.4 audio-entropyd-1.0.1-xtra_debug.patch, 1.1, NONE
Message-ID: <20080929153421.B1DCA70110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/audio-entropyd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22574/F-8

Modified Files:
	audio-entropyd audio-entropyd.spec sources 
Added Files:
	audio-entropyd.conf 
Removed Files:
	audio-entropyd-1.0.1-xtra_debug.patch 
Log Message:
1.0.5


--- NEW FILE audio-entropyd.conf ---
# This is the configuration file for audio-entropyd's initscript.
# The only valid setting for this file is OPTIONS.

# Uncomment the OPTIONS line and include any options that you wish to 
# pass to the audio-entropyd daemon on startup. See audio-entropyd --help
# for a list of valid flags.

# OPTIONS=""


Index: audio-entropyd
===================================================================
RCS file: /cvs/pkgs/rpms/audio-entropyd/F-8/audio-entropyd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audio-entropyd	5 Jun 2007 19:19:18 -0000	1.1
+++ audio-entropyd	29 Sep 2008 15:33:51 -0000	1.2
@@ -6,7 +6,9 @@
 # description: This is a daemon which runs on client machines to generate entropy
 #              from the system soundcard (if present and active).
 # processname: audio-entropyd
-# config:
+# config: /etc/sysconfig/audio-entropyd
+
+confdir=/etc/sysconfig
 
 # Source function library.
 . /etc/init.d/functions
@@ -16,10 +18,14 @@
 
 LOCKFILE=/var/lock/subsys/audio-entropyd
 
+if [ -r $confdir/audio-entropyd ]; then
+    . $confdir/audio-entropyd
+fi
+
 case "$1" in
    start)
        echo -n $"Starting Audio Entropy daemon... "
-       daemon $AED_BIN
+       daemon $AED_BIN $OPTIONS
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch $LOCKFILE


Index: audio-entropyd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audio-entropyd/F-8/audio-entropyd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- audio-entropyd.spec	7 Aug 2008 19:31:54 -0000	1.8
+++ audio-entropyd.spec	29 Sep 2008 15:33:51 -0000	1.9
@@ -1,13 +1,13 @@
 Name:           audio-entropyd
-Version:        1.0.1
-Release:        4%{?dist}
+Version:        1.0.5
+Release:        1%{?dist}
 License:        GPLv2
 Group:          System Environment/Daemons
 Summary:        Generate entropy from audio output
 URL:            http://www.vanheusden.com/aed/
 Source0:        http://www.vanheusden.com/aed/audio-entropyd-%{version}.tgz
 Source1:        audio-entropyd
-Patch0:		audio-entropyd-1.0.1-xtra_debug.patch
+Source2:	audio-entropyd.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post):   chkconfig
 Requires(preun):  chkconfig, initscripts
@@ -18,18 +18,18 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .xtra_debug
 
 %build
 make OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 install -m0755 audio-entropyd $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 install -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/audio-entropyd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -53,8 +53,17 @@
 %doc COPYING README README.2 TODO
 %{_initrddir}/audio-entropyd
 %{_sbindir}/audio-entropyd
+%config(noreplace) %{_sysconfdir}/sysconfig/audio-entropyd
 
 %changelog
+* Sun Sep 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.5-1
+- update to 1.0.5
+- drop debug patch, upstream fixed the problem in a different manner
+- add config file and fix initscript to use it (bz 463904)
+
+* Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-5
+- random rawhide appeasement
+
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-4
 - add xtra-debug option
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audio-entropyd/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Aug 2008 19:16:46 -0000	1.3
+++ sources	29 Sep 2008 15:33:51 -0000	1.4
@@ -1 +1 @@
-486f7d46ffc999830e550ccb07abfe61  audio-entropyd-1.0.1.tgz
+9f1f85872c9e6cee20d55da14c840079  audio-entropyd-1.0.5.tgz


--- audio-entropyd-1.0.1-xtra_debug.patch DELETED ---



From spot at fedoraproject.org  Mon Sep 29 15:34:22 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 29 Sep 2008 15:34:22 +0000 (UTC)
Subject: rpms/audio-entropyd/F-9 audio-entropyd.conf, NONE,
	1.1 audio-entropyd, 
	1.1, 1.2 audio-entropyd.spec, 1.10, 1.11 sources, 1.3,
	1.4 audio-entropyd-1.0.1-xtra_debug.patch, 1.1, NONE
Message-ID: <20080929153422.0C3087013D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/audio-entropyd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22574/F-9

Modified Files:
	audio-entropyd audio-entropyd.spec sources 
Added Files:
	audio-entropyd.conf 
Removed Files:
	audio-entropyd-1.0.1-xtra_debug.patch 
Log Message:
1.0.5


--- NEW FILE audio-entropyd.conf ---
# This is the configuration file for audio-entropyd's initscript.
# The only valid setting for this file is OPTIONS.

# Uncomment the OPTIONS line and include any options that you wish to 
# pass to the audio-entropyd daemon on startup. See audio-entropyd --help
# for a list of valid flags.

# OPTIONS=""


Index: audio-entropyd
===================================================================
RCS file: /cvs/pkgs/rpms/audio-entropyd/F-9/audio-entropyd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audio-entropyd	5 Jun 2007 19:19:18 -0000	1.1
+++ audio-entropyd	29 Sep 2008 15:33:51 -0000	1.2
@@ -6,7 +6,9 @@
 # description: This is a daemon which runs on client machines to generate entropy
 #              from the system soundcard (if present and active).
 # processname: audio-entropyd
-# config:
+# config: /etc/sysconfig/audio-entropyd
+
+confdir=/etc/sysconfig
 
 # Source function library.
 . /etc/init.d/functions
@@ -16,10 +18,14 @@
 
 LOCKFILE=/var/lock/subsys/audio-entropyd
 
+if [ -r $confdir/audio-entropyd ]; then
+    . $confdir/audio-entropyd
+fi
+
 case "$1" in
    start)
        echo -n $"Starting Audio Entropy daemon... "
-       daemon $AED_BIN
+       daemon $AED_BIN $OPTIONS
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch $LOCKFILE


Index: audio-entropyd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audio-entropyd/F-9/audio-entropyd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- audio-entropyd.spec	7 Aug 2008 19:31:54 -0000	1.10
+++ audio-entropyd.spec	29 Sep 2008 15:33:51 -0000	1.11
@@ -1,13 +1,13 @@
 Name:           audio-entropyd
-Version:        1.0.1
-Release:        4%{?dist}
+Version:        1.0.5
+Release:        1%{?dist}
 License:        GPLv2
 Group:          System Environment/Daemons
 Summary:        Generate entropy from audio output
 URL:            http://www.vanheusden.com/aed/
 Source0:        http://www.vanheusden.com/aed/audio-entropyd-%{version}.tgz
 Source1:        audio-entropyd
-Patch0:		audio-entropyd-1.0.1-xtra_debug.patch
+Source2:	audio-entropyd.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post):   chkconfig
 Requires(preun):  chkconfig, initscripts
@@ -18,18 +18,18 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .xtra_debug
 
 %build
 make OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 install -m0755 audio-entropyd $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 install -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/audio-entropyd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -53,8 +53,17 @@
 %doc COPYING README README.2 TODO
 %{_initrddir}/audio-entropyd
 %{_sbindir}/audio-entropyd
+%config(noreplace) %{_sysconfdir}/sysconfig/audio-entropyd
 
 %changelog
+* Sun Sep 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.5-1
+- update to 1.0.5
+- drop debug patch, upstream fixed the problem in a different manner
+- add config file and fix initscript to use it (bz 463904)
+
+* Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-5
+- random rawhide appeasement
+
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-4
 - add xtra-debug option
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audio-entropyd/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Feb 2008 16:08:52 -0000	1.3
+++ sources	29 Sep 2008 15:33:51 -0000	1.4
@@ -1 +1 @@
-486f7d46ffc999830e550ccb07abfe61  audio-entropyd-1.0.1.tgz
+9f1f85872c9e6cee20d55da14c840079  audio-entropyd-1.0.5.tgz


--- audio-entropyd-1.0.1-xtra_debug.patch DELETED ---



From caolanm at fedoraproject.org  Mon Sep 29 15:35:35 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 29 Sep 2008 15:35:35 +0000 (UTC)
Subject: rpms/hunspell-es/devel hunspell-es.spec,1.5,1.6
Message-ID: <20080929153535.1069D70110@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-es/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22956

Modified Files:
	hunspell-es.spec 
Log Message:
add es_CU as Cuba for OOo


Index: hunspell-es.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-es/devel/hunspell-es.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hunspell-es.spec	8 Jul 2008 14:17:43 -0000	1.5
+++ hunspell-es.spec	29 Sep 2008 15:35:04 -0000	1.6
@@ -2,7 +2,7 @@
 Summary: Spanish hunspell dictionaries
 %define upstreamid 20051031
 Version: 0.%{upstreamid}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: http://es.openoffice.org/files/documents/73/3001/es_ANY.zip
 Group: Applications/Text
 URL: http://es.openoffice.org/programa/diccionario.html
@@ -28,7 +28,7 @@
 cp -p es_ANY.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/es_ES.aff
 
 pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/
-es_ES_aliases="es_AR es_BO es_CL es_CO es_CR es_DO es_EC es_GT es_HN es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE"
+es_ES_aliases="es_AR es_BO es_CL es_CO es_CR es_CU es_DO es_EC es_GT es_HN es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE"
 
 for lang in $es_ES_aliases; do
 	ln -s es_ES.aff $lang.aff
@@ -45,6 +45,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Mon Sep 29 2008 Caolan McNamara <caolanm at redhat.com> - 0.20051031-3
+- add es_CU as Cuba for OOo
+
 * Tue Jul 08 2008 Caolan McNamara <caolanm at redhat.com> - 0.20051031-2
 - add es_US
 



From ajax at fedoraproject.org  Mon Sep 29 15:51:37 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 29 Sep 2008 15:51:37 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-amd64-yes-i-know-you-live.patch, NONE, 
	1.1 kernel.spec, 1.989, 1.990
Message-ID: <20080929155137.E280F70110@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25433

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-amd64-yes-i-know-you-live.patch 
Log Message:
* Mon Sep 29 2008 Adam Jackson <ajax at redhat.com>
- Kill the useless "Kernel alive" early_printk()'s


linux-2.6-amd64-yes-i-know-you-live.patch:

--- NEW FILE linux-2.6-amd64-yes-i-know-you-live.patch ---
diff -up linux-2.6.26.noarch/arch/x86/kernel/head64.c.jx linux-2.6.26.noarch/arch/x86/kernel/head64.c
--- linux-2.6.26.noarch/arch/x86/kernel/head64.c.jx	2008-09-29 11:40:37.000000000 -0400
+++ linux-2.6.26.noarch/arch/x86/kernel/head64.c	2008-09-29 11:45:52.000000000 -0400
@@ -108,12 +108,8 @@ void __init x86_64_start_kernel(char * r
 	}
 	load_idt((const struct desc_ptr *)&idt_descr);
 
-	early_printk("Kernel alive\n");
-
 	x86_64_init_pda();
 
-	early_printk("Kernel really alive\n");
-
 	x86_64_start_reservations(real_mode_data);
 }
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.989
retrieving revision 1.990
diff -u -r1.989 -r1.990
--- kernel.spec	28 Sep 2008 21:02:03 -0000	1.989
+++ kernel.spec	29 Sep 2008 15:51:07 -0000	1.990
@@ -637,6 +637,8 @@
 Patch2801: linux-2.6-quiet-iommu.patch
 # silence the ACPI blacklist code
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
+# it's... it's ALIVE!
+Patch2803: linux-2.6-amd64-yes-i-know-you-live.patch
 
 %endif
 
@@ -1162,6 +1164,8 @@
 ApplyPatch linux-2.6-quiet-iommu.patch
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
+# it's... it's ALIVE!
+ApplyPatch linux-2.6-amd64-yes-i-know-you-live.patch
 
 
 # END OF PATCH APPLICATIONS
@@ -1736,6 +1740,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Sep 29 2008 Adam Jackson <ajax at redhat.com>
+- Kill the useless "Kernel alive" early_printk()'s
+
 * Sun Sep 28 2008 Chuck Ebbert <cebbert at redhat.com>
 - make XEN__SAVE_RESTORE denpend on XEN
 



From rdieter at fedoraproject.org  Mon Sep 29 15:52:11 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 15:52:11 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.211,1.212
Message-ID: <20080929155211.A0B3A70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25512

Modified Files:
	qt.spec 
Log Message:
s/sparc/sparcv9/



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- qt.spec	28 Sep 2008 19:45:23 -0000	1.211
+++ qt.spec	29 Sep 2008 15:51:41 -0000	1.212
@@ -26,7 +26,7 @@
 Source4: Trolltech.conf
 
 # See http://bugzilla.redhat.com/223663
-%define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparc
+%define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9
 Source5: qconfig-multilib.h
 
 # multilib hacks 



From mschwendt at fedoraproject.org  Mon Sep 29 15:53:05 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 29 Sep 2008 15:53:05 +0000 (UTC)
Subject: extras-buildsys/utils/pushscript LockFile.py,1.2,1.3
Message-ID: <20080929155305.BB74D70110@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25913

Modified Files:
	LockFile.py 
Log Message:
switch to a later implementation that adds optional POSIX fcntl() write-lock support


Index: LockFile.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/LockFile.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LockFile.py	8 Feb 2007 18:52:32 -0000	1.2
+++ LockFile.py	29 Sep 2008 15:53:05 -0000	1.3
@@ -14,27 +14,34 @@
 # 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: Michael Schwendt <mschwendt at fedoraproject.org>
+
+import errno, fcntl, os, struct, sys
 
-import os, sys
-import errno, fcntl
 
 class LockFileLocked(Exception):
+    """Exception thrown if a conflicting lock is found in non-blocking mode"""
     pass
 
 
-class LockFile:
+class SimplePosixLock:
+    """An exclusive lock on a file via fcntl()"""
 
     def __init__(self, name, blocking=False):
-        self.name = name
-        self.mode = fcntl.LOCK_EX
-        if not blocking:
-            self.mode |= fcntl.LOCK_NB
+        self._fname = name
+        self._lock = struct.pack('hhqqhh', fcntl.F_WRLCK, os.SEEK_SET, 0, 0, 0, 0)
+        self._unlock = struct.pack('hhqqhh', fcntl.F_UNLCK, os.SEEK_SET, 0, 0, 0, 0)
+        if blocking:
+            self._l_cmd = fcntl.F_SETLKW
+        else:
+            self._l_cmd = fcntl.F_SETLK
 
 
     def lock(self):
         try:
-            self.file = open(self.name,'w')
-            self.rc = fcntl.flock(self.file, self.mode)
+            self._file = open(self._fname,'w')
+            rv = fcntl.fcntl(self._file.fileno(), self._l_cmd, self._lock)
         except IOError, (err, strerr):
             if ( err == errno.EAGAIN ):
                 raise LockFileLocked
@@ -43,44 +50,53 @@
 
 
     def unlock(self):
-        fcntl.flock(self.file, fcntl.LOCK_UN)
-        self.file.close()
-        os.remove(self.name)
+        rv = fcntl.fcntl(self._file.fileno(), self._l_cmd, self._unlock)
+        self._file.close()
 
-## Main
 
-import unittest
+class SimpleFlock:
+    """An exclusive lock on a file via flock()"""
+
+    def __init__(self, name, blocking=False):
+        self._fname = name
+        self._mode = fcntl.LOCK_EX
+        if not blocking:
+            self._mode |= fcntl.LOCK_NB
 
-class TestSequenceFunctions(unittest.TestCase):
 
-    def testnonblocking(self):
-        name = '.test.lock'
-        l1 = LockFile(name,False)
-        l1.lock()
-        l2 = LockFile(name,False)
+    def lock(self):
         try:
-            l2.lock()
-            self.assert_(False)
-        except LockFileLocked:
-            self.assert_(True)
-        l1.unlock()
+            self._file = open(self._fname,'w')
+            rc = fcntl.flock(self._file, self._mode)
+        except IOError, (err, strerr):
+            if ( err == errno.EAGAIN ):
+                raise LockFileLocked
+            else:
+                raise
 
 
-    def testseries(self):
-        name = '.test.lock'
-        l1 = LockFile(name,False)
-        l1.lock()
-        l2 = LockFile(name,False)
-        try:
-            l1.unlock()
-            l2.lock()
-            l2.unlock()
-            l1.lock()
-            l1.unlock()
-            self.assert_(True)
-        except LockFileLocked:
-            self.assert_(False)
+    def unlock(self):
+        fcntl.flock(self._file, fcntl.LOCK_UN)
+        self._file.close()
+
+
+class LockFile:
+
+    def __init__(self, name, blocking=False, type='flock'):
+        if type == 'flock':
+            self._base = SimpleFlock(name,blocking)
+        elif type == 'posix':
+            self._base = SimplePosixLock(name,blocking)
+        else:
+            sys.stderr.write("Invalid LockFile type!\n")
+            self._base = SimpleFlock(name,blocking)
+
+            
+    def lock(self):
+        self._base.lock()
+
+
+    def unlock(self):
+        self._base.unlock()
 
 
-if __name__ == '__main__':
-    unittest.main()



From rdieter at fedoraproject.org  Mon Sep 29 15:54:00 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 15:54:00 +0000 (UTC)
Subject: rpms/qt/F-9 qt.spec,1.185,1.186
Message-ID: <20080929155400.7C1F770110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26017

Modified Files:
	qt.spec 
Log Message:
sparc fix



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- qt.spec	28 Sep 2008 20:03:42 -0000	1.185
+++ qt.spec	29 Sep 2008 15:53:30 -0000	1.186
@@ -26,7 +26,7 @@
 Source4: Trolltech.conf
 
 # See http://bugzilla.redhat.com/223663
-%define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparc
+%define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9
 Source5: qconfig-multilib.h
 
 # multilib hacks 



From mschwendt at fedoraproject.org  Mon Sep 29 15:54:07 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 29 Sep 2008 15:54:07 +0000 (UTC)
Subject: extras-buildsys/utils/pushscript PushPackage.py, 1.3,
	1.4 ToStable.py, 1.7, 1.8 Push.py, 1.53, 1.54
Message-ID: <20080929155407.8227A70110@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26161

Modified Files:
	PushPackage.py ToStable.py Push.py 
Log Message:
use newer LockFile module here


Index: PushPackage.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/PushPackage.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PushPackage.py	23 Aug 2007 12:04:13 -0000	1.3
+++ PushPackage.py	29 Sep 2008 15:54:07 -0000	1.4
@@ -18,7 +18,10 @@
 import errno, os, sys
 
 import Utils, Push
-from LockFile import LockFile
+try:
+    from plague.LockFile import LockFile, LockFileLocked
+except:
+    from LockFile import LockFile, LockFileLocked
 
 
 def main(cfg,args):


Index: ToStable.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/ToStable.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ToStable.py	19 Jan 2008 15:36:35 -0000	1.7
+++ ToStable.py	29 Sep 2008 15:54:07 -0000	1.8
@@ -20,7 +20,10 @@
 import rpmUtils.transaction, rpmUtils.miscutils
 
 import Utils, WhatsNew
-from LockFile import LockFile
+try:
+    from plague.LockFile import LockFile, LockFileLocked
+except:
+    from LockFile import LockFile, LockFileLocked
 from BuildReport import *
 
 ts = rpmUtils.transaction.initReadOnlyTransaction()


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Push.py	20 Aug 2008 13:47:23 -0000	1.53
+++ Push.py	29 Sep 2008 15:54:07 -0000	1.54
@@ -27,7 +27,10 @@
 
 import Utils, MultiLib, Comps, WhatsNew, BlackList
 import RepoBuild, RepoPrune, RepoView
-from LockFile import LockFile, LockFileLocked
+try:
+    from plague.LockFile import LockFile, LockFileLocked
+except:
+    from LockFile import LockFile, LockFileLocked
 from BuildSys import LocalPlague
 from BuildReport import *
 
@@ -222,7 +225,10 @@
     Utils.make_std_repodirs(cfg,dist,destroot)
     
     repolockname = os.path.join(needsignroot,REPO_LOCKFILE_NAME)
-    repolock = LockFile(name=repolockname,blocking=True)
+    locktype = 'flock'
+    if cfg.opts.hasattr('locktype'):
+        locktype = cfg.opts.locktype
+    repolock = LockFile(name=repolockname,blocking=True,type=locktype)
     try:
         print 'Waiting for repository lock on %s:' % needsignroot,
         sys.stdout.flush()



From rdieter at fedoraproject.org  Mon Sep 29 15:59:14 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 15:59:14 +0000 (UTC)
Subject: rpms/factory/F-9 factory.spec,1.23,1.24 factoryconf.h,1.1,1.2
Message-ID: <20080929155914.14DF070110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/factory/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27062/F-9

Modified Files:
	factory.spec factoryconf.h 
Log Message:
sparc fixes



Index: factory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/factory/F-9/factory.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- factory.spec	3 Apr 2008 13:52:05 -0000	1.23
+++ factory.spec	29 Sep 2008 15:58:43 -0000	1.24
@@ -3,7 +3,7 @@
 # experimental, off, for now -- Rex
 #define _with_NTL --with-NTL
 
-%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparc sparc64
+%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
 
 Summary: C++ class library for multivariate polynomial data
 Name:    factory


Index: factoryconf.h
===================================================================
RCS file: /cvs/pkgs/rpms/factory/F-9/factoryconf.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- factoryconf.h	3 Apr 2008 13:52:05 -0000	1.1
+++ factoryconf.h	29 Sep 2008 15:58:43 -0000	1.2
@@ -15,7 +15,7 @@
 #include "factoryconf-s390x.h"
 #elif defined(__s390__)
 #include "factoryconf-s390.h"
-#elif defined(__sparc64__)
+#elif defined(__sparc__) && defined (__arch64__)
 #include "factoryconf-sparc64.h"
 #elif defined(__sparc__)
 #include "factoryconf-sparc.h"



From rdieter at fedoraproject.org  Mon Sep 29 15:59:14 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 15:59:14 +0000 (UTC)
Subject: rpms/factory/devel factory.spec,1.23,1.24 factoryconf.h,1.1,1.2
Message-ID: <20080929155914.3C51F7013F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/factory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27062/devel

Modified Files:
	factory.spec factoryconf.h 
Log Message:
sparc fixes



Index: factory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/factory/devel/factory.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- factory.spec	3 Apr 2008 13:52:05 -0000	1.23
+++ factory.spec	29 Sep 2008 15:58:43 -0000	1.24
@@ -3,7 +3,7 @@
 # experimental, off, for now -- Rex
 #define _with_NTL --with-NTL
 
-%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparc sparc64
+%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
 
 Summary: C++ class library for multivariate polynomial data
 Name:    factory


Index: factoryconf.h
===================================================================
RCS file: /cvs/pkgs/rpms/factory/devel/factoryconf.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- factoryconf.h	3 Apr 2008 13:52:05 -0000	1.1
+++ factoryconf.h	29 Sep 2008 15:58:43 -0000	1.2
@@ -15,7 +15,7 @@
 #include "factoryconf-s390x.h"
 #elif defined(__s390__)
 #include "factoryconf-s390.h"
-#elif defined(__sparc64__)
+#elif defined(__sparc__) && defined (__arch64__)
 #include "factoryconf-sparc64.h"
 #elif defined(__sparc__)
 #include "factoryconf-sparc.h"



From rdieter at fedoraproject.org  Mon Sep 29 16:01:35 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:01:35 +0000 (UTC)
Subject: rpms/factory/devel factory.spec,1.24,1.25
Message-ID: <20080929160135.C03A570110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/factory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27589

Modified Files:
	factory.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.3-4
- multiarch fix (sparc)



Index: factory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/factory/devel/factory.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- factory.spec	29 Sep 2008 15:58:43 -0000	1.24
+++ factory.spec	29 Sep 2008 16:01:05 -0000	1.25
@@ -8,7 +8,7 @@
 Summary: C++ class library for multivariate polynomial data
 Name:    factory
 Version: 3.0.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 URL:	 http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Factory/
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.3-4
+- multiarch fix (sparc)
+
 * Thu Apr 03 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.3-3
 - multiarch conflicts (#341091)
 



From rdieter at fedoraproject.org  Mon Sep 29 16:02:20 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:02:20 +0000 (UTC)
Subject: rpms/factory/F-9 factory.spec,1.24,1.25
Message-ID: <20080929160220.085C870110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/factory/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27855

Modified Files:
	factory.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.3-4
- multiarch fix (sparc)



Index: factory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/factory/F-9/factory.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- factory.spec	29 Sep 2008 15:58:43 -0000	1.24
+++ factory.spec	29 Sep 2008 16:01:49 -0000	1.25
@@ -8,7 +8,7 @@
 Summary: C++ class library for multivariate polynomial data
 Name:    factory
 Version: 3.0.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 URL:	 http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Factory/
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.3-4
+- multiarch fix (sparc)
+
 * Thu Apr 03 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.3-3
 - multiarch conflicts (#341091)
 



From mschwendt at fedoraproject.org  Mon Sep 29 16:05:54 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 29 Sep 2008 16:05:54 +0000 (UTC)
Subject: extras-buildsys/server Repo.py,1.16.2.3.4.5,1.16.2.3.4.6
Message-ID: <20080929160554.7D19970110@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/server
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28463/server

Modified Files:
      Tag: Plague-0_4_5
	Repo.py 
Log Message:
- add and use LockFile module with optional POSIX locking-style
- pushscript reuses this module



Index: Repo.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v
retrieving revision 1.16.2.3.4.5
retrieving revision 1.16.2.3.4.6
diff -u -r1.16.2.3.4.5 -r1.16.2.3.4.6
--- Repo.py	29 Sep 2008 10:44:15 -0000	1.16.2.3.4.5
+++ Repo.py	29 Sep 2008 16:05:54 -0000	1.16.2.3.4.6
@@ -6,7 +6,7 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -24,6 +24,7 @@
 import stat
 import EmailUtils
 from plague import DebugUtils
+from plague.LockFile import LockFile, LockFileLocked
 
 # Lockfile used by external scripts to ensure mutual exclusion
 # from concurrent access to the repository's directory
@@ -68,6 +69,11 @@
         if len(script):
             self._repo_script = script
 
+        if parent_cfg.has_option('General','locktype'):
+            self._locktype = parent_cfg.get_str('General','locktype')
+        else:
+            self._locktype = 'flock'
+
         threading.Thread.__init__(self)
         self.setName("Repo: %s" % target_str)
 
@@ -92,20 +98,17 @@
         return False
 
     def _update_repo_with_pushlock(self):
-        lockfile = None
+        lockfile = LockFile(name=self._lockfile_path,blocking=True,type=self._locktype)
         try:
-            lockfile = open(self._lockfile_path, 'w')
-            rc = fcntl.flock(lockfile, fcntl.LOCK_EX)
+            lockfile.lock()
         except IOError, (errno, strerr):
             target_str = self._target_cfg.target_string()
             print "Repo Error (%s): opening lockfile %s failed.  Output: (errno %d) '%s'" % (target_str, self._lockfile_path, errno, strerr)
-
         try:
             self._update_repo()
         finally:
-            if lockfile:
-                fcntl.flock(lockfile, fcntl.LOCK_UN)
-                lockfile.close()
+            lockfile.unlock()
+
 
     def _update_repo(self):
         """ Copy new RPMS to each repo, and update each repo at the end """



From mschwendt at fedoraproject.org  Mon Sep 29 16:05:54 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 29 Sep 2008 16:05:54 +0000 (UTC)
Subject: extras-buildsys/common LockFile.py,NONE,1.1.2.1
Message-ID: <20080929160554.3844170110@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28463/common

Added Files:
      Tag: Plague-0_4_5
	LockFile.py 
Log Message:
- add and use LockFile module with optional POSIX locking-style
- pushscript reuses this module



--- NEW FILE LockFile.py ---
#!/usr/bin/python -t
# -*- mode: Python; indent-tabs-mode: nil; -*-
#
# 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
#
# Author: Michael Schwendt <mschwendt at fedoraproject.org>

import errno, fcntl, os, struct, sys


class LockFileLocked(Exception):
    """Exception thrown if a conflicting lock is found in non-blocking mode"""
    pass


class SimplePosixLock:
    """An exclusive lock on a file via fcntl()"""

    def __init__(self, name, blocking=False):
        self._fname = name
        self._lock = struct.pack('hhqqhh', fcntl.F_WRLCK, os.SEEK_SET, 0, 0, 0, 0)
        self._unlock = struct.pack('hhqqhh', fcntl.F_UNLCK, os.SEEK_SET, 0, 0, 0, 0)
        if blocking:
            self._l_cmd = fcntl.F_SETLKW
        else:
            self._l_cmd = fcntl.F_SETLK


    def lock(self):
        try:
            self._file = open(self._fname,'w')
            rv = fcntl.fcntl(self._file.fileno(), self._l_cmd, self._lock)
        except IOError, (err, strerr):
            if ( err == errno.EAGAIN ):
                raise LockFileLocked
            else:
                raise


    def unlock(self):
        rv = fcntl.fcntl(self._file.fileno(), self._l_cmd, self._unlock)
        self._file.close()


class SimpleFlock:
    """An exclusive lock on a file via flock()"""

    def __init__(self, name, blocking=False):
        self._fname = name
        self._mode = fcntl.LOCK_EX
        if not blocking:
            self._mode |= fcntl.LOCK_NB


    def lock(self):
        try:
            self._file = open(self._fname,'w')
            rc = fcntl.flock(self._file, self._mode)
        except IOError, (err, strerr):
            if ( err == errno.EAGAIN ):
                raise LockFileLocked
            else:
                raise


    def unlock(self):
        fcntl.flock(self._file, fcntl.LOCK_UN)
        self._file.close()


class LockFile:

    def __init__(self, name, blocking=False, type='flock'):
        if type == 'flock':
            self._base = SimpleFlock(name,blocking)
        elif type == 'posix':
            self._base = SimplePosixLock(name,blocking)
        else:
            sys.stderr.write("Invalid LockFile type!\n")
            self._base = SimpleFlock(name,blocking)

            
    def lock(self):
        self._base.lock()


    def unlock(self):
        self._base.unlock()





From mschwendt at fedoraproject.org  Mon Sep 29 16:06:23 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 29 Sep 2008 16:06:23 +0000 (UTC)
Subject: extras-buildsys ChangeLog,1.126.2.44.2.1.2.29,1.126.2.44.2.1.2.30
Message-ID: <20080929160623.EDDAB70110@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28463

Modified Files:
      Tag: Plague-0_4_5
	ChangeLog 
Log Message:
- add and use LockFile module with optional POSIX locking-style
- pushscript reuses this module



Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.44.2.1.2.29
retrieving revision 1.126.2.44.2.1.2.30
diff -u -r1.126.2.44.2.1.2.29 -r1.126.2.44.2.1.2.30
--- ChangeLog	21 Sep 2008 13:36:36 -0000	1.126.2.44.2.1.2.29
+++ ChangeLog	29 Sep 2008 16:05:53 -0000	1.126.2.44.2.1.2.30
@@ -1,3 +1,14 @@
+2008-09-29  Michael Schwendt <mschwendt at fedoraproject.org>
+
+	* server/Repo.py
+	  - Replace the repository write-lock with the LockFile module.
+	  - Add server option "locktype" in section "General".
+	    Can be set to "posix" or "flock" (the default).
+
+	* common/LockFile.py
+	  - Add this based on an older version used by the pushscript.
+	    It adds POSIX fcntl() write-lock support.
+
 2008-09-20  Michael Schwendt <mschwendt at fedoraproject.org>
 
 	* Release of 0.4.5.6



From mschwendt at fedoraproject.org  Mon Sep 29 16:08:07 2008
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 29 Sep 2008 16:08:07 +0000 (UTC)
Subject: extras-buildsys/common Makefile,1.9.2.1,1.9.2.1.4.1
Message-ID: <20080929160807.C9BB870110@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28869

Modified Files:
      Tag: Plague-0_4_5
	Makefile 
Log Message:
add LockFile.py


Index: Makefile
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/Makefile,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.1.4.1
diff -u -r1.9.2.1 -r1.9.2.1.4.1
--- Makefile	29 Nov 2005 06:36:38 -0000	1.9.2.1
+++ Makefile	29 Sep 2008 16:08:07 -0000	1.9.2.1.4.1
@@ -16,6 +16,7 @@
 	FileDownloader.py \
 	HTTPSURLopener.py \
 	HTTPServer.py \
+    LockFile.py \
 	AuthedXMLRPCServer.py \
 	SSLCommon.py \
 	SSLConnection.py \



From davej at fedoraproject.org  Mon Sep 29 16:13:34 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Mon, 29 Sep 2008 16:13:34 +0000 (UTC)
Subject: rpms/kernel/devel TODO, 1.3, 1.4 kernel.spec, 1.990,
	1.991 config-ia64, 1.5, NONE
Message-ID: <20080929161334.0A19F70110@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29555

Modified Files:
	TODO kernel.spec 
Removed Files:
	config-ia64 
Log Message:
Kill of config-ia64. for real this time.


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/TODO,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TODO	25 Sep 2008 19:12:30 -0000	1.3
+++ TODO	29 Sep 2008 16:13:03 -0000	1.4
@@ -9,8 +9,6 @@
 	Won't go upstream until ABI confirmed.
 
 linux-2.6-acpi-clear-wake-status.patch
-linux-2.6-acpi-video-dos.patch
-linux-2.6-defaults-acpi-video.patch
 linux-2.6-input-dell-keyboard-keyup.patch
 linux-2.6-eeepc-laptop-update.patch
 	mjg59 ACPI/laptop bits.
@@ -53,6 +51,10 @@
 linux-2.6-x86-tracehook.patch
 	Roland magick & utrace
 
+linux-2.6-acpi-video-dos.patch
+linux-2.6-defaults-acpi-video.patch
+	Fedora policy decisions unlikely to go upstream.
+
 linux-2.6-defaults-fat-utf8.patch
 	Drop?
 
@@ -104,7 +106,8 @@
 linux-2.6-silence-acpi-blacklist.patch
 linux-2.6-silence-fbcon-logo.patch
 linux-2.6-silence-noise.patch
-	Fedora local 'hush' patches.
+linux-2.6-amd64-yes-i-know-you-live.patch
+	Fedora local 'hush' patches.  (Some will go upstream next time)
 
 linux-2.6-selinux-mprotect-checks.patch
 linux-2.6-sparc-selinux-mprotect-checks.patch


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.990
retrieving revision 1.991
diff -u -r1.990 -r1.991
--- kernel.spec	29 Sep 2008 15:51:07 -0000	1.990
+++ kernel.spec	29 Sep 2008 16:13:03 -0000	1.991
@@ -503,7 +503,6 @@
 Source54: config-powerpc64-kdump
 
 Source60: config-ia64-generic
-Source61: config-ia64
 
 Source70: config-s390x
 
@@ -1740,6 +1739,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Sep 29 2008 Dave Jones <davej at redhat.com>
+- Kill of config-ia64. for real this time.
+
 * Mon Sep 29 2008 Adam Jackson <ajax at redhat.com>
 - Kill the useless "Kernel alive" early_printk()'s
 


--- config-ia64 DELETED ---



From rdieter at fedoraproject.org  Mon Sep 29 16:28:19 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:28:19 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec,1.58,1.59
Message-ID: <20080929162819.B283670110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeaccessibility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30991

Modified Files:
	kdeaccessibility.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kdeaccessibility.spec	27 Sep 2008 01:57:23 -0000	1.58
+++ kdeaccessibility.spec	29 Sep 2008 16:27:49 -0000	1.59
@@ -2,7 +2,7 @@
 Name:           kdeaccessibility
 Epoch:          1
 Version:        4.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -46,7 +46,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -95,6 +95,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 16:29:03 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:29:03 +0000 (UTC)
Subject: rpms/kdeadmin/devel kdeadmin.spec,1.111,1.112
Message-ID: <20080929162903.1243B70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31174

Modified Files:
	kdeadmin.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-3
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- kdeadmin.spec	29 Sep 2008 01:30:15 -0000	1.111
+++ kdeadmin.spec	29 Sep 2008 16:28:32 -0000	1.112
@@ -1,7 +1,7 @@
 Name:           kdeadmin
 Epoch:          7
 Version:        4.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
@@ -57,7 +57,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -121,6 +121,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-3
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
 - (re)add unpackaged HTML/en/kcontrol/ files
 



From rdieter at fedoraproject.org  Mon Sep 29 16:29:49 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:29:49 +0000 (UTC)
Subject: rpms/kdeartwork/devel kdeartwork.spec,1.89,1.90
Message-ID: <20080929162949.11C7370110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31354

Modified Files:
	kdeartwork.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- kdeartwork.spec	27 Sep 2008 02:05:58 -0000	1.89
+++ kdeartwork.spec	29 Sep 2008 16:29:18 -0000	1.90
@@ -1,7 +1,7 @@
 
 Name:           kdeartwork
 Version:        4.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional artwork (themes, sound themes, ...) for KDE
 
 License:        GPLv2
@@ -99,7 +99,7 @@
 popd
 
 %if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 %endif
 
 %if 0%{?icons}
@@ -197,6 +197,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 16:30:25 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:30:25 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.145,1.146
Message-ID: <20080929163025.E4F7B70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31459

Modified Files:
	kdebindings.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- kdebindings.spec	27 Sep 2008 03:35:50 -0000	1.145
+++ kdebindings.spec	29 Sep 2008 16:29:55 -0000	1.146
@@ -22,7 +22,7 @@
 
 Name: kdebindings
 Version: 4.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
@@ -100,7 +100,7 @@
 popd
 
 # smp build not recommended (upstream)
-make -C %{_target_platform}
+make -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -168,6 +168,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 16:31:06 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:31:06 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase.spec,1.342,1.343
Message-ID: <20080929163106.2DFB670110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31738

Modified Files:
	kdebase.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- kdebase.spec	26 Sep 2008 19:44:10 -0000	1.342
+++ kdebase.spec	29 Sep 2008 16:30:35 -0000	1.343
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -135,7 +135,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -305,6 +305,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 16:32:28 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:32:28 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.131,1.132
Message-ID: <20080929163228.C20BF70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31977

Modified Files:
	kdeedu.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- kdeedu.spec	27 Sep 2008 02:25:15 -0000	1.131
+++ kdeedu.spec	29 Sep 2008 16:31:58 -0000	1.132
@@ -14,7 +14,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications 
 Version: 4.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -150,7 +150,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} 
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -393,6 +393,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 16:32:58 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:32:58 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames.spec,1.104,1.105
Message-ID: <20080929163258.8593A70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32064

Modified Files:
	kdegames.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- kdegames.spec	27 Sep 2008 02:17:37 -0000	1.104
+++ kdegames.spec	29 Sep 2008 16:32:28 -0000	1.105
@@ -5,7 +5,7 @@
 Summary: K Desktop Environment 4 - Games 
 Epoch:   6
 Version: 4.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -97,7 +97,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -175,6 +175,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 16:33:44 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:33:44 +0000 (UTC)
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.169,1.170
Message-ID: <20080929163344.2717670110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32346

Modified Files:
	kdegraphics.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- kdegraphics.spec	27 Sep 2008 00:06:44 -0000	1.169
+++ kdegraphics.spec	29 Sep 2008 16:33:13 -0000	1.170
@@ -6,7 +6,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -101,8 +101,7 @@
 %{cmake_kde4} ..
 popd
 
-
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -185,6 +184,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 16:34:13 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:34:13 +0000 (UTC)
Subject: rpms/kdemultimedia/devel kdemultimedia.spec,1.122,1.123
Message-ID: <20080929163413.D64C870110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32429

Modified Files:
	kdemultimedia.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- kdemultimedia.spec	27 Sep 2008 02:25:26 -0000	1.122
+++ kdemultimedia.spec	29 Sep 2008 16:33:43 -0000	1.123
@@ -2,7 +2,7 @@
 Name: kdemultimedia
 Epoch: 6
 Version: 4.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:     Applications/Multimedia
@@ -84,7 +84,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -149,6 +149,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 16:34:58 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:34:58 +0000 (UTC)
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.155,1.156
Message-ID: <20080929163458.3C28070110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32703

Modified Files:
	kdenetwork.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- kdenetwork.spec	27 Sep 2008 02:13:43 -0000	1.155
+++ kdenetwork.spec	29 Sep 2008 16:34:28 -0000	1.156
@@ -5,7 +5,7 @@
 Name: kdenetwork
 Epoch: 7
 Version: 4.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -97,7 +97,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -164,6 +164,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 16:35:30 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:35:30 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.7,1.8
Message-ID: <20080929163530.EC2F270110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv334

Modified Files:
	kdeplasma-addons.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdeplasma-addons.spec	27 Sep 2008 02:18:07 -0000	1.7
+++ kdeplasma-addons.spec	29 Sep 2008 16:35:00 -0000	1.8
@@ -1,7 +1,7 @@
 
 Name:           kdeplasma-addons
 Version:        4.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -48,7 +48,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -90,6 +90,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 16:36:20 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:36:20 +0000 (UTC)
Subject: rpms/kdesdk/devel kdesdk.spec,1.115,1.116
Message-ID: <20080929163620.AA67D70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv734

Modified Files:
	kdesdk.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- kdesdk.spec	27 Sep 2008 02:25:02 -0000	1.115
+++ kdesdk.spec	29 Sep 2008 16:35:50 -0000	1.116
@@ -1,7 +1,7 @@
 
 Name:           kdesdk
 Version:        4.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -98,7 +98,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -220,6 +220,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 16:36:51 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:36:51 +0000 (UTC)
Subject: rpms/kdetoys/devel kdetoys.spec,1.34,1.35
Message-ID: <20080929163651.674C870110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdetoys/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv867

Modified Files:
	kdetoys.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/devel/kdetoys.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- kdetoys.spec	27 Sep 2008 02:28:36 -0000	1.34
+++ kdetoys.spec	29 Sep 2008 16:36:21 -0000	1.35
@@ -3,7 +3,7 @@
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
 Version:        4.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 License:        GPLv2
 Group:          Amusements/Graphics
@@ -55,7 +55,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -96,6 +96,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From davej at fedoraproject.org  Mon Sep 29 16:37:16 2008
From: davej at fedoraproject.org (Dave Jones)
Date: Mon, 29 Sep 2008 16:37:16 +0000 (UTC)
Subject: rpms/kernel/devel Makefile, 1.81, 1.82 config-debug, 1.18,
	1.19 config-generic, 1.172, 1.173 config-nodebug, 1.20,
	1.21 kernel.spec, 1.991, 1.992
Message-ID: <20080929163716.2589A70110@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1080

Modified Files:
	Makefile config-debug config-generic config-nodebug 
	kernel.spec 
Log Message:
Turn off CONFIG_USB_DEBUG. It's noisy, and of no real value right now.


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- Makefile	25 Sep 2008 19:58:13 -0000	1.81
+++ Makefile	29 Sep 2008 16:36:45 -0000	1.82
@@ -55,7 +55,6 @@
 	@perl -pi -e 's/# CONFIG_FAULT_INJECTION_DEBUG_FS is not set/CONFIG_FAULT_INJECTION_DEBUG_FS=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_SG is not set/CONFIG_DEBUG_SG=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_USB_DEBUG is not set/CONFIG_USB_DEBUG=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_WRITECOUNT is not set/CONFIG_DEBUG_WRITECOUNT=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_OBJECTS is not set/CONFIG_DEBUG_OBJECTS=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_OBJECTS_FREE is not set/CONFIG_DEBUG_OBJECTS_FREE=y/' config-nodebug
@@ -92,7 +91,6 @@
 	@perl -pi -e 's/CONFIG_FAULT_INJECTION_DEBUG_FS=y/# CONFIG_FAULT_INJECTION_DEBUG_FS is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y/# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_SG=y/# CONFIG_DEBUG_SG is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_USB_DEBUG=y/# CONFIG_USB_DEBUG is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_WRITECOUNT=y/# CONFIG_DEBUG_WRITECOUNT is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_OBJECTS=y/# CONFIG_DEBUG_OBJECTS is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_OBJECTS_FREE=y/# CONFIG_DEBUG_OBJECTS_FREE is not set/' config-nodebug


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- config-debug	25 Sep 2008 19:58:13 -0000	1.18
+++ config-debug	29 Sep 2008 16:36:45 -0000	1.19
@@ -29,8 +29,6 @@
 
 CONFIG_DEBUG_PAGEALLOC=y
 
-CONFIG_USB_DEBUG=y
-
 CONFIG_DEBUG_WRITECOUNT=y
 CONFIG_DEBUG_OBJECTS=y
 # CONFIG_DEBUG_OBJECTS_SELFTEST is not set


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- config-generic	25 Sep 2008 21:19:21 -0000	1.172
+++ config-generic	29 Sep 2008 16:36:45 -0000	1.173
@@ -2604,6 +2604,7 @@
 #
 CONFIG_USB=y
 CONFIG_USB_SUPPORT=y
+# CONFIG_USB_DEBUG is not set
 
 # DEPRECATED: See bug 362221. Fix udev.
 # CONFIG_USB_DEVICE_CLASS is not set


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- config-nodebug	25 Sep 2008 19:58:13 -0000	1.20
+++ config-nodebug	29 Sep 2008 16:36:45 -0000	1.21
@@ -28,8 +28,6 @@
 
 CONFIG_DEBUG_PAGEALLOC=y
 
-CONFIG_USB_DEBUG=y
-
 CONFIG_DEBUG_WRITECOUNT=y
 CONFIG_DEBUG_OBJECTS=y
 # CONFIG_DEBUG_OBJECTS_SELFTEST is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.991
retrieving revision 1.992
diff -u -r1.991 -r1.992
--- kernel.spec	29 Sep 2008 16:13:03 -0000	1.991
+++ kernel.spec	29 Sep 2008 16:36:45 -0000	1.992
@@ -1740,6 +1740,9 @@
 
 %changelog
 * Mon Sep 29 2008 Dave Jones <davej at redhat.com>
+- Turn off CONFIG_USB_DEBUG. It's noisy, and of no real value right now.
+
+* Mon Sep 29 2008 Dave Jones <davej at redhat.com>
 - Kill of config-ia64. for real this time.
 
 * Mon Sep 29 2008 Adam Jackson <ajax at redhat.com>



From rdieter at fedoraproject.org  Mon Sep 29 16:37:44 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:37:44 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.145,1.146
Message-ID: <20080929163744.B903B70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1310

Modified Files:
	kdeutils.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-3
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- kdeutils.spec	29 Sep 2008 01:43:23 -0000	1.145
+++ kdeutils.spec	29 Sep 2008 16:37:14 -0000	1.146
@@ -12,7 +12,7 @@
 Name:           kdeutils
 Epoch:          6
 Version:        4.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -117,7 +117,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -211,6 +211,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-3
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
 - (re)add unpackaged HTML/en/kcontrol/ files
 



From cebbert at fedoraproject.org  Mon Sep 29 16:38:34 2008
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 29 Sep 2008 16:38:34 +0000 (UTC)
Subject: rpms/kernel/F-9 linux-2.6-x86-check-for-null-irq-context.patch, NONE,
	1.1 kernel.spec, 1.775, 1.776
Message-ID: <20080929163834.CFAC270110@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1591

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-check-for-null-irq-context.patch 
Log Message:
Don't oops if no IRQ stack is available (#461846)

linux-2.6-x86-check-for-null-irq-context.patch:

--- NEW FILE linux-2.6-x86-check-for-null-irq-context.patch ---
From: Chuck Ebbert <cebbert at redhat.com>

x86: check for null IRQ context before switching stacks

Sometimes during hibernate an unexpected interrupt fires on a disabled CPU.
The CPU's irq context is NULL and this causes a null pointer dereference.
Paper over this problem by checking for NULL and making the handler execute
on the current stack when that happens.

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

Index: linux-2.6.26.noarch/arch/x86/kernel/irq_32.c
===================================================================
--- linux-2.6.26.noarch.orig/arch/x86/kernel/irq_32.c
+++ linux-2.6.26.noarch/arch/x86/kernel/irq_32.c
@@ -115,6 +115,10 @@ execute_on_irq_stack(int overflow, struc
 	curctx = (union irq_ctx *) current_thread_info();
 	irqctx = hardirq_ctx[smp_processor_id()];
 
+	if (WARN_ONCE(!irqctx, KERN_ERR "No stack for IRQ %d on CPU %d\n",
+			irq, smp_processor_id()))
+		return 0;
+
 	/*
 	 * this is where we switch to the IRQ stack. However, if we are
 	 * already using the IRQ stack (because we interrupted a hardirq


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.775
retrieving revision 1.776
diff -u -r1.775 -r1.776
--- kernel.spec	29 Sep 2008 14:40:27 -0000	1.775
+++ kernel.spec	29 Sep 2008 16:38:04 -0000	1.776
@@ -594,6 +594,7 @@
 Patch97: linux-2.6-x86-hpet-04-workaround-sb700-bios.patch
 Patch98: linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch
 Patch100: linux-2.6-x86-pci-detect-end_bus_number.patch
+Patch101: linux-2.6-x86-check-for-null-irq-context.patch
 
 Patch120: linux-2.6-pci-disable-aspm-per-acpi-fadt-setting.patch
 Patch121: linux-2.6-pci-disable-aspm-on-pre-1.1-devices.patch
@@ -1083,6 +1084,8 @@
 ApplyPatch linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch
 # fix e820 reservation checking
 ApplyPatch linux-2.6-x86-pci-detect-end_bus_number.patch
+# don't oops if there's no IRQ stack available
+ApplyPatch linux-2.6-x86-check-for-null-irq-context.patch
 
 # disable ASPM on devices that don't support it
 ApplyPatch linux-2.6-pci-disable-aspm-per-acpi-fadt-setting.patch
@@ -1899,6 +1902,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Mon Sep 29 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-49
+- Don't oops if no IRQ stack is available (#461846)
+
 * Mon Sep 29 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-48
 - Two patches to help make kerneloops bug reports more useful.
   (requested by Arjan)



From rdieter at fedoraproject.org  Mon Sep 29 16:39:54 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:39:54 +0000 (UTC)
Subject: rpms/arts/devel arts.spec,1.89,1.90 gslconfig-wrapper.h,1.2,1.3
Message-ID: <20080929163954.E7E8C70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/arts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1888

Modified Files:
	arts.spec gslconfig-wrapper.h 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 8:1.5.10-2
- multilib (sparc) fixes



Index: arts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arts/devel/arts.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- arts.spec	2 Sep 2008 17:36:05 -0000	1.89
+++ arts.spec	29 Sep 2008 16:39:24 -0000	1.90
@@ -1,7 +1,7 @@
 
 %define _default_patch_fuzz 2
 
-%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparc sparc64
+%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
 
 %define final 1 
 %define make_cvs 1
@@ -27,7 +27,7 @@
 Group:   System Environment/Daemons
 Epoch:   8
 Version: 1.5.10
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 
 License: LGPLv2+
 Url: http://www.kde.org
@@ -207,6 +207,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 8:1.5.10-2
+- multilib (sparc) fixes
+
 * Tue Sep 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 8:1.5.10-1.1
 - fix qt-devel dependency on F8
 


Index: gslconfig-wrapper.h
===================================================================
RCS file: /cvs/pkgs/rpms/arts/devel/gslconfig-wrapper.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gslconfig-wrapper.h	14 Jun 2007 16:46:35 -0000	1.2
+++ gslconfig-wrapper.h	29 Sep 2008 16:39:24 -0000	1.3
@@ -15,7 +15,7 @@
 #include "gslconfig-s390x.h"
 #elif defined(__s390__)
 #include "gslconfig-s390.h"
-#elif defined(__sparc64__)
+#elif defined(__sparc__) && defined (__arch64__)
 #include "gslconfig-sparc64.h"
 #elif defined(__sparc__)
 #include "gslconfig-sparc.h"



From rdieter at fedoraproject.org  Mon Sep 29 16:40:45 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:40:45 +0000 (UTC)
Subject: rpms/arts/F-9 arts.spec,1.88,1.89 gslconfig-wrapper.h,1.2,1.3
Message-ID: <20080929164045.3E12870110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/arts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2198

Modified Files:
	arts.spec gslconfig-wrapper.h 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 8:1.5.10-2
- multilib (sparc) fixes



Index: arts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arts/F-9/arts.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- arts.spec	2 Sep 2008 17:36:04 -0000	1.88
+++ arts.spec	29 Sep 2008 16:40:15 -0000	1.89
@@ -1,7 +1,7 @@
 
 %define _default_patch_fuzz 2
 
-%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparc sparc64
+%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
 
 %define final 1 
 %define make_cvs 1
@@ -27,7 +27,7 @@
 Group:   System Environment/Daemons
 Epoch:   8
 Version: 1.5.10
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 
 License: LGPLv2+
 Url: http://www.kde.org
@@ -207,6 +207,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 8:1.5.10-2
+- multilib (sparc) fixes
+
 * Tue Sep 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 8:1.5.10-1.1
 - fix qt-devel dependency on F8
 


Index: gslconfig-wrapper.h
===================================================================
RCS file: /cvs/pkgs/rpms/arts/F-9/gslconfig-wrapper.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gslconfig-wrapper.h	14 Jun 2007 16:46:35 -0000	1.2
+++ gslconfig-wrapper.h	29 Sep 2008 16:40:15 -0000	1.3
@@ -15,7 +15,7 @@
 #include "gslconfig-s390x.h"
 #elif defined(__s390__)
 #include "gslconfig-s390.h"
-#elif defined(__sparc64__)
+#elif defined(__sparc__) && defined (__arch64__)
 #include "gslconfig-sparc64.h"
 #elif defined(__sparc__)
 #include "gslconfig-sparc.h"



From kanarip at fedoraproject.org  Mon Sep 29 16:44:52 2008
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Mon, 29 Sep 2008 16:44:52 +0000 (UTC)
Subject: rpms/revisor/devel import.log, 1.2, 1.3 revisor.spec, 1.41,
	1.42 sources, 1.44, 1.45
Message-ID: <20080929164452.BC5D170110@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/revisor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3167/devel

Modified Files:
	import.log revisor.spec sources 
Log Message:
2.1.1-7


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	10 Jul 2008 12:14:05 -0000	1.2
+++ import.log	29 Sep 2008 16:44:22 -0000	1.3
@@ -1,2 +1,3 @@
 revisor-2_1_1-5_fc10:HEAD:revisor-2.1.1-5.fc10.src.rpm:1214847971
 revisor-2_1_1-6_fc10:HEAD:revisor-2.1.1-6.fc10.src.rpm:1215692013
+revisor-2_1_1-7_fc9:HEAD:revisor-2.1.1-7.fc9.src.rpm:1222706608


Index: revisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/revisor.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- revisor.spec	10 Jul 2008 12:14:05 -0000	1.41
+++ revisor.spec	29 Sep 2008 16:44:22 -0000	1.42
@@ -3,6 +3,7 @@
 %define pkg_cobbler 1
 %define pkg_comps 1
 %define pkg_delta 0
+%define pkg_isolinux 0
 %define pkg_jigdo 0
 %define pkg_rebrand 0
 %define pkg_reuseinstaller 0
@@ -14,7 +15,7 @@
 Summary:        Fedora "Spin" Graphical User Interface
 Name:           revisor
 Version:        2.1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        GPLv2
 Group:          Applications/System
 URL:            http://fedorahosted.org/revisor
@@ -68,6 +69,9 @@
 %if ! %{pkg_delta}
 Obsoletes:       revisor-delta
 %endif
+%if ! %{pkg_isolinux}
+Obsoletes:       revisor-isolinux
+%endif
 %if ! %{pkg_jigdo}
 Obsoletes:       revisor-jigdo
 %endif
@@ -150,6 +154,19 @@
 This is the Revisor GUI package
 
 ##
+## Revisor customize isolinux.cfg
+##
+%if %{pkg_isolinux}
+%package isolinux
+Summary:    Revisor plugin for supplying a custom isolinux.cfg
+Group:      Applications/System
+Requires:   revisor-cli = %{version}-%{release}
+
+%description isolinux
+Supply a custom isolinux.cfg to Revisor to incorporate in the installation media
+%endif
+
+##
 ## Revisor Jigdo integration
 ##
 %if %{pkg_jigdo}
@@ -269,6 +286,10 @@
     rm -rf %{buildroot}/%{python_sitelib}/revisor/moddelta
 %endif
 
+%if ! %{pkg_isolinux}
+    rm -rf %{buildroot}/%{python_sitelib}/revisor/modisolinux
+%endif
+
 %if ! %{pkg_jigdo}
     rm -rf %{buildroot}/%{python_sitelib}/revisor/modjigdo
 %endif
@@ -369,6 +390,15 @@
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*.desktop
 
+%if %{pkg_isolinux}
+%files isolinux
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/revisor/modisolinux
+%{python_sitelib}/revisor/modisolinux/*.py
+%{python_sitelib}/revisor/modisolinux/*.pyc
+%{python_sitelib}/revisor/modisolinux/*.pyo
+%endif
+
 %if %{pkg_jigdo}
 %files jigdo
 %defattr(-,root,root,-)
@@ -433,7 +463,7 @@
 %endif
 
 %changelog
-* Thu Jul 10 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.1-6
+* Mon Sep 29 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.1-7
 - Latest rebuild
 - Minor bugfixes (#344 pkgorder traceback)
 - Add SELinux Check


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	10 Jul 2008 12:14:05 -0000	1.44
+++ sources	29 Sep 2008 16:44:22 -0000	1.45
@@ -1 +1 @@
-263d8f828d0c146f1e5349ae298b8815  revisor-2.1.1.tar.gz
+130f6e31def7212cf56b1422f346f05f  revisor-2.1.1.tar.gz



From kanarip at fedoraproject.org  Mon Sep 29 16:46:16 2008
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Mon, 29 Sep 2008 16:46:16 +0000 (UTC)
Subject: rpms/revisor/F-9 import.log, 1.2, 1.3 revisor.spec, 1.42,
	1.43 sources, 1.45, 1.46
Message-ID: <20080929164616.BFCA870110@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/revisor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3605/F-9

Modified Files:
	import.log revisor.spec sources 
Log Message:
2.1.1-7


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	10 Jul 2008 12:34:22 -0000	1.2
+++ import.log	29 Sep 2008 16:45:46 -0000	1.3
@@ -1,2 +1,3 @@
 revisor-2_1_1-5_fc10:F-9:revisor-2.1.1-5.fc10.src.rpm:1214848084
 revisor-2_1_1-6_fc10:F-9:revisor-2.1.1-6.fc10.src.rpm:1215693247
+revisor-2_1_1-7_fc9:F-9:revisor-2.1.1-7.fc9.src.rpm:1222706727


Index: revisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-9/revisor.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- revisor.spec	10 Jul 2008 12:34:22 -0000	1.42
+++ revisor.spec	29 Sep 2008 16:45:46 -0000	1.43
@@ -3,6 +3,7 @@
 %define pkg_cobbler 1
 %define pkg_comps 1
 %define pkg_delta 0
+%define pkg_isolinux 0
 %define pkg_jigdo 0
 %define pkg_rebrand 0
 %define pkg_reuseinstaller 0
@@ -14,7 +15,7 @@
 Summary:        Fedora "Spin" Graphical User Interface
 Name:           revisor
 Version:        2.1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        GPLv2
 Group:          Applications/System
 URL:            http://fedorahosted.org/revisor
@@ -68,6 +69,9 @@
 %if ! %{pkg_delta}
 Obsoletes:       revisor-delta
 %endif
+%if ! %{pkg_isolinux}
+Obsoletes:       revisor-isolinux
+%endif
 %if ! %{pkg_jigdo}
 Obsoletes:       revisor-jigdo
 %endif
@@ -150,6 +154,19 @@
 This is the Revisor GUI package
 
 ##
+## Revisor customize isolinux.cfg
+##
+%if %{pkg_isolinux}
+%package isolinux
+Summary:    Revisor plugin for supplying a custom isolinux.cfg
+Group:      Applications/System
+Requires:   revisor-cli = %{version}-%{release}
+
+%description isolinux
+Supply a custom isolinux.cfg to Revisor to incorporate in the installation media
+%endif
+
+##
 ## Revisor Jigdo integration
 ##
 %if %{pkg_jigdo}
@@ -269,6 +286,10 @@
     rm -rf %{buildroot}/%{python_sitelib}/revisor/moddelta
 %endif
 
+%if ! %{pkg_isolinux}
+    rm -rf %{buildroot}/%{python_sitelib}/revisor/modisolinux
+%endif
+
 %if ! %{pkg_jigdo}
     rm -rf %{buildroot}/%{python_sitelib}/revisor/modjigdo
 %endif
@@ -369,6 +390,15 @@
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*.desktop
 
+%if %{pkg_isolinux}
+%files isolinux
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/revisor/modisolinux
+%{python_sitelib}/revisor/modisolinux/*.py
+%{python_sitelib}/revisor/modisolinux/*.pyc
+%{python_sitelib}/revisor/modisolinux/*.pyo
+%endif
+
 %if %{pkg_jigdo}
 %files jigdo
 %defattr(-,root,root,-)
@@ -433,7 +463,7 @@
 %endif
 
 %changelog
-* Thu Jul 10 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.1-6
+* Mon Sep 29 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.1-7
 - Latest rebuild
 - Minor bugfixes (#344 pkgorder traceback)
 - Add SELinux Check


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-9/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	10 Jul 2008 12:34:22 -0000	1.45
+++ sources	29 Sep 2008 16:45:46 -0000	1.46
@@ -1 +1 @@
-263d8f828d0c146f1e5349ae298b8815  revisor-2.1.1.tar.gz
+130f6e31def7212cf56b1422f346f05f  revisor-2.1.1.tar.gz



From pkgdb at fedoraproject.org  Mon Sep 29 16:51:36 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 29 Sep 2008 16:51:36 +0000
Subject: [pkgdb] avr-binutils: jkratoch has requested watchcommits
Message-ID: <20080929165136.4F424208611@bastion.fedora.phx.redhat.com>

jkratoch has requested the watchcommits acl on avr-binutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/avr-binutils



From rdieter at fedoraproject.org  Mon Sep 29 16:56:23 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:56:23 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-9 kdeaccessibility.spec,1.53,1.54
Message-ID: <20080929165623.11BAE70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeaccessibility/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4987

Modified Files:
	kdeaccessibility.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-9/kdeaccessibility.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kdeaccessibility.spec	29 Sep 2008 00:34:37 -0000	1.53
+++ kdeaccessibility.spec	29 Sep 2008 16:55:52 -0000	1.54
@@ -2,7 +2,7 @@
 Name:           kdeaccessibility
 Epoch:          1
 Version:        4.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -46,7 +46,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -95,6 +95,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 16:56:39 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 16:56:39 +0000 (UTC)
Subject: rpms/kdeadmin/F-9 kdeadmin.spec,1.97,1.98
Message-ID: <20080929165639.064FE70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5056

Modified Files:
	kdeadmin.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-3
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-9/kdeadmin.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- kdeadmin.spec	29 Sep 2008 01:45:02 -0000	1.97
+++ kdeadmin.spec	29 Sep 2008 16:56:08 -0000	1.98
@@ -1,7 +1,7 @@
 Name:           kdeadmin
 Epoch:          7
 Version:        4.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
@@ -57,7 +57,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -121,6 +121,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-3
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
 - (re)add unpackaged HTML/en/kcontrol/ files
 



From twaugh at fedoraproject.org  Mon Sep 29 16:59:43 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 29 Sep 2008 16:59:43 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-1.0.8.tar.bz2.sig, NONE,
	1.1 system-config-printer.spec, 1.216,
	1.217 system-config-printer-1.0.7.tar.bz2.sig, 1.1, NONE
Message-ID: <20080929165943.C831470110@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-serv5549

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-1.0.8.tar.bz2.sig 
Removed Files:
	system-config-printer-1.0.7.tar.bz2.sig 
Log Message:
* Mon Sep 29 2008 Tim Waugh <twaugh at redhat.com> 1.0.8-1
- 1.0.8:
  - Use modelName from custom PPD to suggest name for new printer
    (trac #97).
  - Avoid display problem with installable options.
  - Better matching for Lexmark printers.
  - Catch exceptions from advanced server settings dialog (Ubuntu
    #267557).
  - Added some missing OpenPrinting query fields.
  - Jockey support added.
  - Lots of translations updated.



--- NEW FILE system-config-printer-1.0.8.tar.bz2.sig ---
??
?R{?????<

Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- system-config-printer.spec	30 Aug 2008 09:43:26 -0000	1.216
+++ system-config-printer.spec	29 Sep 2008 16:59:13 -0000	1.217
@@ -6,8 +6,8 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.0.7
-Release: 2%{?dist}
+Version: 1.0.8
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -152,6 +152,18 @@
 exit 0
 
 %changelog
+* Mon Sep 29 2008 Tim Waugh <twaugh at redhat.com> 1.0.8-1
+- 1.0.8:
+  - Use modelName from custom PPD to suggest name for new printer
+    (trac #97).
+  - Avoid display problem with installable options.
+  - Better matching for Lexmark printers.
+  - Catch exceptions from advanced server settings dialog (Ubuntu
+    #267557).
+  - Added some missing OpenPrinting query fields.
+  - Jockey support added.
+  - Lots of translations updated.
+
 * Sat Aug 30 2008 Tim Waugh <twaugh at redhat.com> 1.0.7-2
 - Handle IPP_FORBIDDEN (bug #460670).
 


--- system-config-printer-1.0.7.tar.bz2.sig DELETED ---



From twaugh at fedoraproject.org  Mon Sep 29 17:01:29 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 29 Sep 2008 17:01:29 +0000 (UTC)
Subject: rpms/system-config-printer/devel .cvsignore, 1.185, 1.186 sources, 
	1.191, 1.192
Message-ID: <20080929170129.35F9C70110@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-serv5814

Modified Files:
	.cvsignore sources 
Log Message:
Upload new tarball.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- .cvsignore	29 Aug 2008 10:41:42 -0000	1.185
+++ .cvsignore	29 Sep 2008 17:00:58 -0000	1.186
@@ -182,3 +182,4 @@
 pycups-1.9.42.tar.bz2
 pysmbc-1.0.5.tar.bz2
 system-config-printer-1.0.7.tar.bz2
+system-config-printer-1.0.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- sources	29 Aug 2008 10:41:42 -0000	1.191
+++ sources	29 Sep 2008 17:00:58 -0000	1.192
@@ -1,3 +1,3 @@
 030379d4accc18c402cd1ec367524a3b  pycups-1.9.42.tar.bz2
 fb77befa25ad919f532e24ea8f9cdd36  pysmbc-1.0.5.tar.bz2
-faeb285dc61457ad1633bc48e7670a9f  system-config-printer-1.0.7.tar.bz2
+7cd1662e1ee658cd7815b1732c7fc604  system-config-printer-1.0.8.tar.bz2



From mhlavink at fedoraproject.org  Mon Sep 29 17:03:51 2008
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 29 Sep 2008 17:03:51 +0000 (UTC)
Subject: rpms/squirrelmail/devel .cvsignore, 1.22, 1.23 sources, 1.22,
	1.23 squirrelmail.spec, 1.57, 1.58
Message-ID: <20080929170351.B305170110@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/squirrelmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6109

Modified Files:
	.cvsignore sources squirrelmail.spec 
Log Message:
update to 1.4.16 (fixes CVE-2008-3663)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	5 Sep 2008 18:01:30 -0000	1.22
+++ .cvsignore	29 Sep 2008 17:03:21 -0000	1.23
@@ -1,2 +1,2 @@
-squirrelmail-1.4.15.tar.bz2
+squirrelmail-1.4.16.tar.bz2
 all_locales-1.4.13-20071220.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	5 Sep 2008 18:01:30 -0000	1.22
+++ sources	29 Sep 2008 17:03:21 -0000	1.23
@@ -1,2 +1,2 @@
-22164ce827edafd0afd65763d2a0f096  squirrelmail-1.4.15.tar.bz2
+22dcf999941e644edc3ea467ed3b9e24  squirrelmail-1.4.16.tar.bz2
 c6463312afcd602ae60fd8f388dfb8c2  all_locales-1.4.13-20071220.tar.bz2


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- squirrelmail.spec	5 Sep 2008 18:01:30 -0000	1.57
+++ squirrelmail.spec	29 Sep 2008 17:03:21 -0000	1.58
@@ -5,7 +5,7 @@
 
 Summary: SquirrelMail webmail client
 Name: squirrelmail
-Version: 1.4.15
+Version: 1.4.16
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.squirrelmail.org/
@@ -261,6 +261,9 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Mon Sep 29 2008 Michal Hlavinka <mhlavink at redhat.com> - 1.4.16-1
+* updates to 1.4.16 (fixes CVE-2008-3663)
+
 * Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4.15-1
 - fix license tag
 - update to 1.4.15



From rdieter at fedoraproject.org  Mon Sep 29 17:05:48 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 17:05:48 +0000 (UTC)
Subject: rpms/kdeartwork/F-9 kdeartwork.spec,1.83,1.84
Message-ID: <20080929170548.D288A70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6310

Modified Files:
	kdeartwork.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-9/kdeartwork.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- kdeartwork.spec	29 Sep 2008 00:44:13 -0000	1.83
+++ kdeartwork.spec	29 Sep 2008 17:05:18 -0000	1.84
@@ -1,7 +1,7 @@
 
 Name:           kdeartwork
 Version:        4.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional artwork (themes, sound themes, ...) for KDE
 
 License:        GPLv2
@@ -99,7 +99,7 @@
 popd
 
 %if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 %endif
 
 %if 0%{?icons}
@@ -197,6 +197,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From twaugh at fedoraproject.org  Mon Sep 29 17:07:41 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 29 Sep 2008 17:07:41 +0000 (UTC)
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.217, 
	1.218 system-config-printer-forbidden.patch, 1.3, NONE
Message-ID: <20080929170741.3E09270110@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-serv6632

Modified Files:
	system-config-printer.spec 
Removed Files:
	system-config-printer-forbidden.patch 
Log Message:
Removed patch.


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- system-config-printer.spec	29 Sep 2008 16:59:13 -0000	1.217
+++ system-config-printer.spec	29 Sep 2008 17:07:10 -0000	1.218
@@ -15,8 +15,6 @@
 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-forbidden.patch
-
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -62,7 +60,6 @@
 
 %prep
 %setup -q -a 1 -a 2
-%patch1 -p1 -b .forbidden
 
 %build
 %configure


--- system-config-printer-forbidden.patch DELETED ---



From rdieter at fedoraproject.org  Mon Sep 29 17:08:25 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 17:08:25 +0000 (UTC)
Subject: rpms/kdebase/F-9 kdebase.spec,1.333,1.334
Message-ID: <20080929170825.07A7570110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6743

Modified Files:
	kdebase.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-9/kdebase.spec,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -r1.333 -r1.334
--- kdebase.spec	29 Sep 2008 00:38:15 -0000	1.333
+++ kdebase.spec	29 Sep 2008 17:07:54 -0000	1.334
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -135,7 +135,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -305,6 +305,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 17:08:35 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 17:08:35 +0000 (UTC)
Subject: rpms/kdebindings/F-9 kdebindings.spec,1.107,1.108
Message-ID: <20080929170835.19DB570110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6782

Modified Files:
	kdebindings.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-9/kdebindings.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- kdebindings.spec	29 Sep 2008 00:38:36 -0000	1.107
+++ kdebindings.spec	29 Sep 2008 17:08:04 -0000	1.108
@@ -22,7 +22,7 @@
 
 Name: kdebindings
 Version: 4.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
@@ -100,7 +100,7 @@
 popd
 
 # smp build not recommended (upstream)
-make -C %{_target_platform}
+make -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -168,6 +168,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From twaugh at fedoraproject.org  Mon Sep 29 17:08:51 2008
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 29 Sep 2008 17:08:51 +0000 (UTC)
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.218, 
	1.219
Message-ID: <20080929170851.46CF970110@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-serv6854

Modified Files:
	system-config-printer.spec 
Log Message:
* Mon Sep 29 2008 Tim Waugh <twaugh at redhat.com> 1.0.8-2
- Removed patch (no longer needed).



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- system-config-printer.spec	29 Sep 2008 17:07:10 -0000	1.218
+++ system-config-printer.spec	29 Sep 2008 17:08:21 -0000	1.219
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.0.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -149,6 +149,9 @@
 exit 0
 
 %changelog
+* Mon Sep 29 2008 Tim Waugh <twaugh at redhat.com> 1.0.8-2
+- Removed patch (no longer needed).
+
 * Mon Sep 29 2008 Tim Waugh <twaugh at redhat.com> 1.0.8-1
 - 1.0.8:
   - Use modelName from custom PPD to suggest name for new printer



From pkgdb at fedoraproject.org  Mon Sep 29 17:09:14 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 29 Sep 2008 17:09:14 +0000
Subject: [pkgdb] cdparanoia had group_acl changed
Message-ID: <20080929170914.929AD2084BB@bastion.fedora.phx.redhat.com>

pjones has set the commit acl on cdparanoia (Fedora devel) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdparanoia



From rdieter at fedoraproject.org  Mon Sep 29 17:11:40 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 17:11:40 +0000 (UTC)
Subject: rpms/kdeedu/F-9 kdeedu.spec,1.108,1.109
Message-ID: <20080929171140.594E170110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7349

Modified Files:
	kdeedu.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-9/kdeedu.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- kdeedu.spec	29 Sep 2008 00:39:19 -0000	1.108
+++ kdeedu.spec	29 Sep 2008 17:11:09 -0000	1.109
@@ -14,7 +14,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications 
 Version: 4.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -150,7 +150,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} 
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -393,6 +393,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 17:11:48 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 17:11:48 +0000 (UTC)
Subject: rpms/kdegraphics/F-9 kdegraphics.spec,1.154,1.155
Message-ID: <20080929171148.4E62270110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7387

Modified Files:
	kdegraphics.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-9/kdegraphics.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- kdegraphics.spec	29 Sep 2008 00:40:39 -0000	1.154
+++ kdegraphics.spec	29 Sep 2008 17:11:18 -0000	1.155
@@ -6,7 +6,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -101,8 +101,7 @@
 %{cmake_kde4} ..
 popd
 
-
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -185,6 +184,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 17:14:15 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 17:14:15 +0000 (UTC)
Subject: rpms/kdegames/F-9 kdegames.spec,1.94,1.95
Message-ID: <20080929171415.21C8370110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7938

Modified Files:
	kdegames.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-9/kdegames.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- kdegames.spec	29 Sep 2008 00:40:04 -0000	1.94
+++ kdegames.spec	29 Sep 2008 17:13:44 -0000	1.95
@@ -5,7 +5,7 @@
 Summary: K Desktop Environment 4 - Games 
 Epoch:   6
 Version: 4.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -97,7 +97,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -175,6 +175,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 17:14:28 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 17:14:28 +0000 (UTC)
Subject: rpms/kdemultimedia/F-9 kdemultimedia.spec,1.115,1.116
Message-ID: <20080929171428.715E170110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7980

Modified Files:
	kdemultimedia.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-9/kdemultimedia.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- kdemultimedia.spec	29 Sep 2008 00:42:09 -0000	1.115
+++ kdemultimedia.spec	29 Sep 2008 17:13:58 -0000	1.116
@@ -2,7 +2,7 @@
 Name: kdemultimedia
 Epoch: 6
 Version: 4.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:     Applications/Multimedia
@@ -84,7 +84,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -149,6 +149,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From bpepple at fedoraproject.org  Mon Sep 29 17:15:32 2008
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 29 Sep 2008 17:15:32 +0000 (UTC)
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.30, 1.31 sources, 1.30,
	1.31 telepathy-gabble.spec, 1.39, 1.40
Message-ID: <20080929171532.5789970110@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8279

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Mon Sep 29 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.9-1
- Update to 0.7.9.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	23 Aug 2008 20:09:26 -0000	1.30
+++ .cvsignore	29 Sep 2008 17:15:02 -0000	1.31
@@ -1 +1 @@
-telepathy-gabble-0.7.8.tar.gz
+telepathy-gabble-0.7.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	23 Aug 2008 20:09:26 -0000	1.30
+++ sources	29 Sep 2008 17:15:02 -0000	1.31
@@ -1 +1 @@
-c6fbf9e97f327de6e8737c619bbad738  telepathy-gabble-0.7.8.tar.gz
+35c755968c423683483545a8065e6c96  telepathy-gabble-0.7.9.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- telepathy-gabble.spec	23 Aug 2008 20:09:26 -0000	1.39
+++ telepathy-gabble.spec	29 Sep 2008 17:15:02 -0000	1.40
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.7.8
+Version:        0.7.9
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -13,7 +13,8 @@
 BuildRequires:  dbus-devel >= 1.1.0
 BuildRequires:  dbus-glib-devel >= 0.72
 BuildRequires:  loudmouth-devel >= 1.3.2
-BuildRequires:  telepathy-glib-devel >= 0.7.14
+BuildRequires:  telepathy-glib-devel >= 0.7.16
+BuildRequires:  glib2-devel >= 2.16
 BuildRequires:  libxslt
 BuildRequires:  python
 
@@ -56,6 +57,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.9-1
+- Update to 0.7.9.
+
 * Sat Aug 23 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.8-1
 - Update to 0.7.8.
 - Drop assertion patch.  Fixed upstream.



From rdieter at fedoraproject.org  Mon Sep 29 17:16:28 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 17:16:28 +0000 (UTC)
Subject: rpms/kdenetwork/F-9 kdenetwork.spec,1.153,1.154
Message-ID: <20080929171628.C474370110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8453

Modified Files:
	kdenetwork.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-9/kdenetwork.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- kdenetwork.spec	29 Sep 2008 00:42:30 -0000	1.153
+++ kdenetwork.spec	29 Sep 2008 17:15:58 -0000	1.154
@@ -5,7 +5,7 @@
 Name: kdenetwork
 Epoch: 7
 Version: 4.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -97,7 +97,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -164,6 +164,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 17:16:41 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 17:16:41 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-9 kdeplasma-addons.spec,1.4,1.5
Message-ID: <20080929171641.548FE70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8500

Modified Files:
	kdeplasma-addons.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-9/kdeplasma-addons.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdeplasma-addons.spec	29 Sep 2008 00:43:21 -0000	1.4
+++ kdeplasma-addons.spec	29 Sep 2008 17:16:11 -0000	1.5
@@ -1,7 +1,7 @@
 
 Name:           kdeplasma-addons
 Version:        4.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -48,7 +48,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -90,6 +90,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 17:18:37 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 17:18:37 +0000 (UTC)
Subject: rpms/kdesdk/F-9 kdesdk.spec,1.105,1.106
Message-ID: <20080929171837.6F2EF70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8782

Modified Files:
	kdesdk.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-9/kdesdk.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- kdesdk.spec	29 Sep 2008 00:44:41 -0000	1.105
+++ kdesdk.spec	29 Sep 2008 17:18:07 -0000	1.106
@@ -1,7 +1,7 @@
 
 Name:           kdesdk
 Version:        4.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -98,7 +98,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -220,6 +220,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From rdieter at fedoraproject.org  Mon Sep 29 17:18:45 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 17:18:45 +0000 (UTC)
Subject: rpms/kdetoys/F-9 kdetoys.spec,1.26,1.27
Message-ID: <20080929171845.5006C70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdetoys/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8817

Modified Files:
	kdetoys.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-9/kdetoys.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- kdetoys.spec	29 Sep 2008 00:49:06 -0000	1.26
+++ kdetoys.spec	29 Sep 2008 17:18:15 -0000	1.27
@@ -3,7 +3,7 @@
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
 Version:        4.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 License:        GPLv2
 Group:          Amusements/Graphics
@@ -55,7 +55,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -96,6 +96,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2
 



From atorkhov at fedoraproject.org  Mon Sep 29 17:20:15 2008
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon, 29 Sep 2008 17:20:15 +0000 (UTC)
Subject: rpms/chess/devel chess-ogre16.patch,1.1,1.2
Message-ID: <20080929172015.0D53470110@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/chess/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9059

Modified Files:
	chess-ogre16.patch 
Log Message:
Fixing ogre1.6 patch.

chess-ogre16.patch:

Index: chess-ogre16.patch
===================================================================
RCS file: /cvs/pkgs/rpms/chess/devel/chess-ogre16.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chess-ogre16.patch	19 Sep 2008 07:37:06 -0000	1.1
+++ chess-ogre16.patch	29 Sep 2008 17:19:44 -0000	1.2
@@ -1,6 +1,7 @@
-diff -urp chess.orig/include/stdafx.h chess/include/stdafx.h
---- chess.orig/include/stdafx.h	2008-09-14 14:18:19.000000000 +0400
-+++ chess/include/stdafx.h	2008-09-14 14:18:34.000000000 +0400
+diff --git a/include/stdafx.h b/include/stdafx.h
+index 2f079ac..b951581 100644
+--- a/include/stdafx.h
++++ b/include/stdafx.h
 @@ -18,8 +18,6 @@
  #ifndef STDAFX_H
  #define STDAFX_H
@@ -19,10 +20,11 @@
  #include <Ogre.h>
  
  using namespace Ogre;
-diff -urp chess.orig/src/CaptureState.cpp chess/src/CaptureState.cpp
---- chess.orig/src/CaptureState.cpp	2008-09-14 14:18:15.000000000 +0400
-+++ chess/src/CaptureState.cpp	2008-09-14 14:56:33.000000000 +0400
-@@ -48,7 +48,7 @@ void CaptureState::CreateMovementTrack(c
+diff --git a/src/CaptureState.cpp b/src/CaptureState.cpp
+index 1b23194..eb0afe5 100644
+--- a/src/CaptureState.cpp
++++ b/src/CaptureState.cpp
+@@ -48,7 +48,7 @@ void CaptureState::CreateMovementTrack(const int Type)
  
      // make sure the scene node's rotation is taken into account
      Ogre::Matrix3 nodeRot;      
@@ -31,31 +33,35 @@
      mOffset = mOffset * nodeRot;
  
      // tweak the position according to the offsets
-diff -urp chess.orig/src/ChessApplication.cpp chess/src/ChessApplication.cpp
---- chess.orig/src/ChessApplication.cpp	2008-09-14 14:18:19.000000000 +0400
-+++ chess/src/ChessApplication.cpp	2008-09-14 15:09:29.000000000 +0400
-@@ -118,7 +118,7 @@ void ChessApplication::createScene()
+diff --git a/src/ChessApplication.cpp b/src/ChessApplication.cpp
+index 64f44e7..58da946 100644
+--- a/src/ChessApplication.cpp
++++ b/src/ChessApplication.cpp
+@@ -118,7 +118,8 @@ void ChessApplication::createScene()
    plane.d = 0;
    MeshManager::getSingleton().createPlane("board", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, plane, 160,160,1,1,true,1,1,1,Vector3::UNIT_Z);
  
 -  RenderTexture* rttTex = mRoot->getRenderSystem()->createRenderTexture( "RttTex", 1024, 1024, TEX_TYPE_2D, PF_R8G8B8 );  
-+  RenderTexture* rttTex = (RenderTexture*) TextureManager::getSingleton().createManual("RttTex", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, TEX_TYPE_2D, 1024, 1024, MIP_DEFAULT, PF_R8G8B8, TU_RENDERTARGET).get();
++  Ogre::TexturePtr rttTexPtr = TextureManager::getSingleton().createManual("RttTex", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, TEX_TYPE_2D, 1024, 1024, MIP_DEFAULT, PF_R8G8B8, TU_RENDERTARGET);
++  RenderTexture* rttTex = rttTexPtr->getBuffer()->getRenderTarget();
    Viewport *v = rttTex->addViewport(mReflectCamera);
    v->setClearEveryFrame(true);
    v->setBackgroundColour(ColourValue::Black);
-@@ -159,7 +159,7 @@ void ChessApplication::createScene()
+@@ -159,7 +160,8 @@ void ChessApplication::createScene()
    mPlaneNode->attachObject(mPlane);
    mPlaneNode->translate(0, -15, 0);  
  
 -  RenderTexture* rttTexa = mRoot->getRenderSystem()->createRenderTexture("RttTexa", 1024, 1024, TEX_TYPE_2D, PF_R8G8B8 );
-+  RenderTexture* rttTexa = (RenderTexture*) TextureManager::getSingleton().createManual("RttTexa", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, TEX_TYPE_2D, 1024, 1024, MIP_DEFAULT, PF_R8G8B8, TU_RENDERTARGET).get();
++  Ogre::TexturePtr rttTexaPtr = TextureManager::getSingleton().createManual("RttTexa", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, TEX_TYPE_2D, 1024, 1024, MIP_DEFAULT, PF_R8G8B8, TU_RENDERTARGET);
++  RenderTexture* rttTexa = rttTexaPtr->getBuffer()->getRenderTarget();
    {
        Viewport *va = rttTexa->addViewport( mReflectCameraGround );
        va->setClearEveryFrame( true );
-diff -urp chess.orig/src/HandState.cpp chess/src/HandState.cpp
---- chess.orig/src/HandState.cpp	2008-09-14 14:18:15.000000000 +0400
-+++ chess/src/HandState.cpp	2008-09-14 15:17:09.000000000 +0400
-@@ -69,16 +69,16 @@ void HandState::AttachPiece(const String
+diff --git a/src/HandState.cpp b/src/HandState.cpp
+index 0922c6b..9b8c831 100644
+--- a/src/HandState.cpp
++++ b/src/HandState.cpp
+@@ -69,16 +69,16 @@ void HandState::AttachPiece(const String bonename, Piece* piece, SceneNode*& pie
    Bone* bone = mHandEntity->getSkeleton()->getBone(bonename);     
  
    // work out the offset orientation
@@ -75,7 +81,7 @@
    mHandNode->getOrientation().ToRotationMatrix(nodeRot);
  
    Vector3 offsetPosition = (nodePos - (handPos + (nodeRot * bonePos))); 
-@@ -102,7 +102,7 @@ void HandState::BaseCreateMovementTrack(
+@@ -102,7 +102,7 @@ void HandState::BaseCreateMovementTrack(void)
  {
    // make sure the scene node's rotation is taken into account
    Ogre::Matrix3 nodeRot;      
@@ -84,10 +90,11 @@
  
    mTargetPosition = (mStartingPosition * nodeRot);  
  
-diff -urp chess.orig/src/MovePieceState.cpp chess/src/MovePieceState.cpp
---- chess.orig/src/MovePieceState.cpp	2008-09-14 14:18:15.000000000 +0400
-+++ chess/src/MovePieceState.cpp	2008-09-14 15:18:31.000000000 +0400
-@@ -61,7 +61,7 @@ void MovePieceState::CreateMovementTrack
+diff --git a/src/MovePieceState.cpp b/src/MovePieceState.cpp
+index dac48f8..e5bc3fc 100644
+--- a/src/MovePieceState.cpp
++++ b/src/MovePieceState.cpp
+@@ -61,7 +61,7 @@ void MovePieceState::CreateMovementTrack()
  
    // make sure the scene node's rotation is taken into account
    Ogre::Matrix3 nodeRot;      
@@ -96,17 +103,18 @@
    mOffset = mOffset * nodeRot;
  
    // tweak the position according to the offsets
-@@ -148,4 +148,4 @@ HandState::StateType MovePieceState::Upd
+@@ -148,4 +148,4 @@ HandState::StateType MovePieceState::Update(Real dt)
    }
    else    
      return mStateType;  
 -}
-\ ?? ?????????? ?????????? ?????? ?????????? ????????????
+\ No newline at end of file
 +}
-diff -urp chess.orig/src/PickupState.cpp chess/src/PickupState.cpp
---- chess.orig/src/PickupState.cpp	2008-09-14 14:18:15.000000000 +0400
-+++ chess/src/PickupState.cpp	2008-09-14 15:19:24.000000000 +0400
-@@ -70,7 +70,7 @@ void PickupState::CreateMovementTrack()
+diff --git a/src/PickupState.cpp b/src/PickupState.cpp
+index cb0da54..8d1931e 100644
+--- a/src/PickupState.cpp
++++ b/src/PickupState.cpp
+@@ -70,7 +70,7 @@ void PickupState::CreateMovementTrack()
  
    // make sure the scene node's rotation is taken into account
    Ogre::Matrix3 nodeRot;      
@@ -115,17 +123,18 @@
    mOffset = mOffset * nodeRot;
  
    // tweak the position according to the offsets
-@@ -140,4 +140,4 @@ HandState::StateType PickupState::Update
+@@ -140,4 +140,4 @@ HandState::StateType PickupState::Update(Real dt)
    }
    else    
      return mStateType;
 -}
-\ ?? ?????????? ?????????? ?????? ?????????? ????????????
+\ No newline at end of file
 +}
-diff -urp chess.orig/src/RemoveState.cpp chess/src/RemoveState.cpp
---- chess.orig/src/RemoveState.cpp	2008-09-14 14:18:15.000000000 +0400
-+++ chess/src/RemoveState.cpp	2008-09-14 15:26:24.000000000 +0400
-@@ -49,7 +49,7 @@ void RemoveState::CreateMovementTrack()
+diff --git a/src/RemoveState.cpp b/src/RemoveState.cpp
+index 5558b3f..930361c 100644
+--- a/src/RemoveState.cpp
++++ b/src/RemoveState.cpp
+@@ -49,7 +49,7 @@ void RemoveState::CreateMovementTrack()
  
    // make sure the scene node's rotation is taken into account
    Ogre::Matrix3 nodeRot;      
@@ -134,17 +143,18 @@
    
    // tweak the position according to the offsets
    mTargetPosition += mOffset;  
-@@ -115,4 +115,4 @@ HandState::StateType RemoveState::Update
+@@ -115,4 +115,4 @@ HandState::StateType RemoveState::Update(Real dt)
    }
    else    
      return HandState::Remove;
 -}
-\ ?? ?????????? ?????????? ?????? ?????????? ????????????
+\ No newline at end of file
 +}
-diff -urp chess.orig/src/StaticState.cpp chess/src/StaticState.cpp
---- chess.orig/src/StaticState.cpp	2008-09-14 14:18:15.000000000 +0400
-+++ chess/src/StaticState.cpp	2008-09-14 15:28:13.000000000 +0400
-@@ -33,7 +33,7 @@ void StaticState::Initialise(void)
+diff --git a/src/StaticState.cpp b/src/StaticState.cpp
+index 951bf1e..de8deae 100644
+--- a/src/StaticState.cpp
++++ b/src/StaticState.cpp
+@@ -33,7 +33,7 @@ void StaticState::Initialise(void)
    // put the hand in it's starting position
    // - make sure the scene node's rotation is taken into account
    Ogre::Matrix3 nodeRot;      



From rdieter at fedoraproject.org  Mon Sep 29 17:21:35 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 17:21:35 +0000 (UTC)
Subject: rpms/kdeutils/F-9 kdeutils.spec,1.131,1.132
Message-ID: <20080929172135.731627013E@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9171

Modified Files:
	kdeutils.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-3
- make VERBOSE=1
- respin against new(er) kde-filesystem



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/kdeutils.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- kdeutils.spec	29 Sep 2008 01:44:42 -0000	1.131
+++ kdeutils.spec	29 Sep 2008 17:21:05 -0000	1.132
@@ -12,7 +12,7 @@
 Name:           kdeutils
 Epoch:          6
 Version:        4.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -117,7 +117,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -211,6 +211,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-3
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
 * Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
 - (re)add unpackaged HTML/en/kcontrol/ files
 



From mclasen at fedoraproject.org  Mon Sep 29 17:33:58 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 29 Sep 2008 17:33:58 +0000 (UTC)
Subject: rpms/gvfs/devel fix-mounting.patch,NONE,1.1 gvfs.spec,1.84,1.85
Message-ID: <20080929173358.CD35E70110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10861

Modified Files:
	gvfs.spec 
Added Files:
	fix-mounting.patch 
Log Message:
fix mounting problems


fix-mounting.patch:

--- NEW FILE fix-mounting.patch ---
diff -up gvfs-1.0.1/monitor/hal/ghalvolume.c.fix-mounting gvfs-1.0.1/monitor/hal/ghalvolume.c
--- gvfs-1.0.1/monitor/hal/ghalvolume.c.fix-mounting	2008-09-10 11:51:23.000000000 -0400
+++ gvfs-1.0.1/monitor/hal/ghalvolume.c	2008-09-29 12:16:02.000000000 -0400
@@ -760,9 +760,10 @@ spawn_cb (GPid pid, gint status, gpointe
   GSimpleAsyncResult *simple;
 
   /* ensure that the #GHalMount corrosponding to the #GHalVolume we've
-   * mounted is made available before returning to the user
+   * mounted is made available before returning to the user (make sure
+   * we don't emit the signals in idle; see #552168).
    */
-  g_hal_volume_monitor_force_update (G_HAL_VOLUME_MONITOR (G_HAL_VOLUME (data->object)->volume_monitor));
+  g_hal_volume_monitor_force_update (G_HAL_VOLUME_MONITOR (G_HAL_VOLUME (data->object)->volume_monitor), FALSE);
 
   if (WEXITSTATUS (status) != 0)
     {
diff -up gvfs-1.0.1/monitor/hal/ghalvolumemonitor.c.fix-mounting gvfs-1.0.1/monitor/hal/ghalvolumemonitor.c
--- gvfs-1.0.1/monitor/hal/ghalvolumemonitor.c.fix-mounting	2008-09-10 11:51:13.000000000 -0400
+++ gvfs-1.0.1/monitor/hal/ghalvolumemonitor.c	2008-09-29 12:16:02.000000000 -0400
@@ -82,7 +82,8 @@ static void hal_changed              (Ha
                                       HalDevice  *device,
                                       gpointer    user_data);
 static void update_all               (GHalVolumeMonitor *monitor,
-                                      gboolean emit_changes);
+                                      gboolean emit_changes,
+                                      gboolean emit_in_idle);
 static void update_drives            (GHalVolumeMonitor *monitor,
                                       GList **added_drives,
                                       GList **removed_drives);
@@ -367,7 +368,7 @@ mountpoints_changed (GUnixMountMonitor *
 {
   GHalVolumeMonitor *monitor = G_HAL_VOLUME_MONITOR (user_data);
 
-  update_all (monitor, TRUE);
+  update_all (monitor, TRUE, TRUE);
 }
 
 static void
@@ -376,13 +377,13 @@ mounts_changed (GUnixMountMonitor *mount
 {
   GHalVolumeMonitor *monitor = G_HAL_VOLUME_MONITOR (user_data);
 
-  update_all (monitor, TRUE);
+  update_all (monitor, TRUE, TRUE);
 }
 
 void 
-g_hal_volume_monitor_force_update (GHalVolumeMonitor *monitor)
+g_hal_volume_monitor_force_update (GHalVolumeMonitor *monitor, gboolean emit_in_idle)
 {
-  update_all (monitor, TRUE);
+  update_all (monitor, TRUE, emit_in_idle);
 }
 
 static void
@@ -394,7 +395,7 @@ hal_changed (HalPool    *pool,
   
   /*g_warning ("hal changed");*/
   
-  update_all (monitor, TRUE);
+  update_all (monitor, TRUE, TRUE);
 }
 
 static GObject *
@@ -448,7 +449,7 @@ g_hal_volume_monitor_constructor (GType 
                     "device_removed", G_CALLBACK (hal_changed),
                     monitor);
 		    
-  update_all (monitor, FALSE);
+  update_all (monitor, FALSE, TRUE);
 
   G_LOCK (hal_vm);
   the_volume_monitor = monitor;
@@ -973,7 +974,8 @@ emit_lists_in_idle (gpointer data)
 /* Must be called from idle if emit_changes, with no locks held */
 static void
 update_all (GHalVolumeMonitor *monitor,
-            gboolean emit_changes)
+            gboolean emit_changes,
+            gboolean emit_in_idle)
 {
   ChangedLists *lists;
   GList *added_drives, *removed_drives;
@@ -1007,7 +1009,10 @@ update_all (GHalVolumeMonitor *monitor,
       lists->added_mounts = added_mounts;
       lists->removed_mounts = removed_mounts;
       
-      g_idle_add (emit_lists_in_idle, lists);
+      if (emit_in_idle)
+        g_idle_add (emit_lists_in_idle, lists);
+      else
+        emit_lists_in_idle (lists);
     }
   else
     {
diff -up gvfs-1.0.1/monitor/hal/ghalvolumemonitor.h.fix-mounting gvfs-1.0.1/monitor/hal/ghalvolumemonitor.h
--- gvfs-1.0.1/monitor/hal/ghalvolumemonitor.h.fix-mounting	2008-09-10 11:51:13.000000000 -0400
+++ gvfs-1.0.1/monitor/hal/ghalvolumemonitor.h	2008-09-29 12:16:02.000000000 -0400
@@ -51,7 +51,8 @@ struct _GHalVolumeMonitorClass {
 GType g_hal_volume_monitor_get_type (void) G_GNUC_CONST;
 
 GVolumeMonitor *g_hal_volume_monitor_new                          (void);
-void            g_hal_volume_monitor_force_update                 (GHalVolumeMonitor *monitor);
+void            g_hal_volume_monitor_force_update                 (GHalVolumeMonitor *monitor,
+                                                                   gboolean emit_in_idle);
 
 G_END_DECLS
 
diff -up gvfs-1.0.1/monitor/proxy/gproxyvolume.c.fix-mounting gvfs-1.0.1/monitor/proxy/gproxyvolume.c
--- gvfs-1.0.1/monitor/proxy/gproxyvolume.c.fix-mounting	2008-09-29 13:26:28.000000000 -0400
+++ gvfs-1.0.1/monitor/proxy/gproxyvolume.c	2008-09-29 13:26:44.000000000 -0400
@@ -539,7 +539,7 @@ mount_cb (DBusMessage *reply,
                                         data->callback,
                                         data->user_data,
                                         NULL);
-  g_simple_async_result_complete (simple);
+  g_simple_async_result_complete_in_idle (simple);
   g_object_unref (simple);
 
   g_object_unref (data->object);


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- gvfs.spec	29 Sep 2008 09:25:19 -0000	1.84
+++ gvfs.spec	29 Sep 2008 17:33:28 -0000	1.85
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -32,6 +32,9 @@
 
 Patch2: gvfs-obexftp-updated-apis-3.patch
 
+# From upstream svn
+Patch3: fix-mounting.patch
+
 %description
 The gvfs package provides backend implementations for the gio 
 framework in GLib. It includes ftp, sftp, cifs. 
@@ -114,6 +117,7 @@
 %setup -q
 %patch1 -p0 -b .archive-integration
 %patch2 -p0 -b .bluez-ods
+%patch3 -p1 -b .fix-mounting
 
 %build
 
@@ -251,6 +255,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Matthias Clasen <mclasen at redhat.com>  - 1.0.1-3
+- Fix mounting
+
 * Mon Sep 29 2008 - Bastien Nocera <bnocera at redhat.com> - 1.0.1-2
 - Update obexftp patch from upstream
 



From pkgdb at fedoraproject.org  Mon Sep 29 17:49:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 29 Sep 2008 17:49:40 +0000
Subject: [pkgdb] avr-binutils had acl change status
Message-ID: <20080929174941.0BCF72084B8@bastion.fedora.phx.redhat.com>

tnorth has set the watchcommits acl on avr-binutils (Fedora devel) to Approved for jkratoch

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/avr-binutils



From rakesh at fedoraproject.org  Mon Sep 29 17:59:07 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 29 Sep 2008 17:59:07 +0000 (UTC)
Subject: rpms/gedit-plugins/devel import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 gedit-plugins.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20080929175907.1C9AB70110@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gedit-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13025/devel

Modified Files:
	.cvsignore gedit-plugins.spec sources 
Added Files:
	import.log 
Log Message:
updated to 2.22.3



--- NEW FILE import.log ---
gedit-plugins-2_22_3-1_fc9:HEAD:gedit-plugins-2.22.3-1.fc9.src.rpm:1222710398


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Mar 2008 22:15:54 -0000	1.3
+++ .cvsignore	29 Sep 2008 17:58:36 -0000	1.4
@@ -1 +1 @@
-gedit-plugins-2.22.0.tar.gz
+gedit-plugins-2.22.3.tar.gz


Index: gedit-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/devel/gedit-plugins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gedit-plugins.spec	29 Sep 2008 09:21:03 -0000	1.4
+++ gedit-plugins.spec	29 Sep 2008 17:58:36 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gedit-plugins
-Version:        2.22.0
-Release:        2%{?dist}
+Version:        2.22.3
+Release:        1%{?dist}
 Summary:        Plugins for gedit
 
 Group:          Applications/Editors
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 2.22.3-1
+- Updated to 2.22.3
+
 * Mon Sep 29 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 2.22.0-2
 - rebuild to pick latest gucharmap
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Mar 2008 22:15:54 -0000	1.3
+++ sources	29 Sep 2008 17:58:36 -0000	1.4
@@ -1 +1 @@
-b9741bd759722ac0249b7b3d489bf5f4  gedit-plugins-2.22.0.tar.gz
+6e6ab57f47e15167381a86e7865d6d59  gedit-plugins-2.22.3.tar.gz



From rakesh at fedoraproject.org  Mon Sep 29 18:00:44 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 29 Sep 2008 18:00:44 +0000 (UTC)
Subject: rpms/gedit-plugins/F-9 import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 gedit-plugins.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20080929180044.1913A70110@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gedit-plugins/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13662/F-9

Modified Files:
	.cvsignore gedit-plugins.spec sources 
Added Files:
	import.log 
Log Message:
updated to 2.22.3



--- NEW FILE import.log ---
gedit-plugins-2_22_3-1_fc9:F-9:gedit-plugins-2.22.3-1.fc9.src.rpm:1222710500


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Mar 2008 22:15:54 -0000	1.3
+++ .cvsignore	29 Sep 2008 18:00:13 -0000	1.4
@@ -1 +1 @@
-gedit-plugins-2.22.0.tar.gz
+gedit-plugins-2.22.3.tar.gz


Index: gedit-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/F-9/gedit-plugins.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gedit-plugins.spec	18 Mar 2008 22:15:54 -0000	1.3
+++ gedit-plugins.spec	29 Sep 2008 18:00:13 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           gedit-plugins
-Version:        2.22.0
+Version:        2.22.3
 Release:        1%{?dist}
 Summary:        Plugins for gedit
 
@@ -91,6 +91,12 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 2.22.3-1
+- Updated to 2.22.3
+
+* Mon Sep 29 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 2.22.0-2
+- rebuild to pick latest gucharmap
+
 * Tue Mar 18 2008 Trond Danielsen <trond.danielsen at gmail.com> - 2.22.0-1
 - Updated.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Mar 2008 22:15:54 -0000	1.3
+++ sources	29 Sep 2008 18:00:13 -0000	1.4
@@ -1 +1 @@
-b9741bd759722ac0249b7b3d489bf5f4  gedit-plugins-2.22.0.tar.gz
+6e6ab57f47e15167381a86e7865d6d59  gedit-plugins-2.22.3.tar.gz



From rakesh at fedoraproject.org  Mon Sep 29 18:01:32 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 29 Sep 2008 18:01:32 +0000 (UTC)
Subject: rpms/gedit-plugins/F-8 import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 gedit-plugins.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20080929180132.C6D3A70110@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gedit-plugins/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13790/F-8

Modified Files:
	.cvsignore gedit-plugins.spec sources 
Added Files:
	import.log 
Log Message:
updated to 2.22.3



--- NEW FILE import.log ---
gedit-plugins-2_22_3-1_fc9:F-8:gedit-plugins-2.22.3-1.fc9.src.rpm:1222710519


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Mar 2008 07:20:33 -0000	1.3
+++ .cvsignore	29 Sep 2008 18:01:02 -0000	1.4
@@ -1 +1 @@
-gedit-plugins-2.20.0.tar.gz
+gedit-plugins-2.22.3.tar.gz


Index: gedit-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/F-8/gedit-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gedit-plugins.spec	12 Mar 2008 07:20:33 -0000	1.2
+++ gedit-plugins.spec	29 Sep 2008 18:01:02 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           gedit-plugins
-Version:        2.20.0
+Version:        2.22.3
 Release:        1%{?dist}
 Summary:        Plugins for gedit
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://live.gnome.org/GeditPlugins 
-Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/2.20/%{name}-%{version}.tar.gz
+Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/2.22/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gedit-devel
@@ -91,7 +91,13 @@
 
 
 %changelog
-* Wed Mar 12 2008 Trond Danielsen <trond.danielsen at gmail.com> - 2.20.0-1
+* Mon Sep 29 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 2.22.3-1
+- Updated to 2.22.3
+
+* Mon Sep 29 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 2.22.0-2
+- rebuild to pick latest gucharmap
+
+* Tue Mar 18 2008 Trond Danielsen <trond.danielsen at gmail.com> - 2.22.0-1
 - Updated.
 
 * Mon Apr 30 2007 Trond Danielsen <trond.danielsen at gmail.com> - 2.18.0-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Mar 2008 07:20:33 -0000	1.3
+++ sources	29 Sep 2008 18:01:02 -0000	1.4
@@ -1 +1 @@
-a93dbd184733434f6c7ce7f1ef3df53e  gedit-plugins-2.20.0.tar.gz
+6e6ab57f47e15167381a86e7865d6d59  gedit-plugins-2.22.3.tar.gz



From mtasaka at fedoraproject.org  Mon Sep 29 18:01:45 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 29 Sep 2008 18:01:45 +0000 (UTC)
Subject: rpms/jd/F-8 .cvsignore, 1.291, 1.292 jd.spec, 1.327, 1.328 sources, 
	1.292, 1.293
Message-ID: <20080929180145.83F1D70110@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13957/F-8

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2378



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- .cvsignore	22 Sep 2008 17:42:51 -0000	1.291
+++ .cvsignore	29 Sep 2008 18:01:14 -0000	1.292
@@ -1 +1 @@
-jd-2.0.3-svn2361_trunk.tgz
+jd-2.0.3-svn2378_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- jd.spec	22 Sep 2008 17:42:51 -0000	1.327
+++ jd.spec	29 Sep 2008 18:01:15 -0000	1.328
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.3
-%define         strtag        svn2361_trunk
+%define         strtag        svn2378_trunk
 %define         repoid        32951
 # Define this if this is pre-version
 %define         pre_release   1
@@ -136,8 +136,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Tue Sep 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2361
+* Tue Sep 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2378
 
 * Sat Sep 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.2-1
 - 2.0.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/sources,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- sources	22 Sep 2008 17:42:51 -0000	1.292
+++ sources	29 Sep 2008 18:01:15 -0000	1.293
@@ -1 +1 @@
-0fa8ceddd2f63c457c80a7e2ba231e29  jd-2.0.3-svn2361_trunk.tgz
+fe6ad5cc41335d828f737ba08a15bf16  jd-2.0.3-svn2378_trunk.tgz



From mtasaka at fedoraproject.org  Mon Sep 29 18:01:45 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 29 Sep 2008 18:01:45 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.298, 1.299 jd.spec, 1.338, 1.339 sources, 
	1.299, 1.300
Message-ID: <20080929180145.C7F3270110@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13957/F-9

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2378



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- .cvsignore	22 Sep 2008 17:42:51 -0000	1.298
+++ .cvsignore	29 Sep 2008 18:01:15 -0000	1.299
@@ -1 +1 @@
-jd-2.0.3-svn2361_trunk.tgz
+jd-2.0.3-svn2378_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- jd.spec	22 Sep 2008 17:42:51 -0000	1.338
+++ jd.spec	29 Sep 2008 18:01:15 -0000	1.339
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.3
-%define         strtag        svn2361_trunk
+%define         strtag        svn2378_trunk
 %define         repoid        32951
 # Define this if this is pre-version
 %define         pre_release   1
@@ -136,8 +136,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Tue Sep 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2361
+* Tue Sep 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2378
 
 * Sat Sep 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.2-1
 - 2.0.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- sources	22 Sep 2008 17:42:51 -0000	1.299
+++ sources	29 Sep 2008 18:01:15 -0000	1.300
@@ -1 +1 @@
-0fa8ceddd2f63c457c80a7e2ba231e29  jd-2.0.3-svn2361_trunk.tgz
+fe6ad5cc41335d828f737ba08a15bf16  jd-2.0.3-svn2378_trunk.tgz



From mtasaka at fedoraproject.org  Mon Sep 29 18:01:46 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 29 Sep 2008 18:01:46 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.298, 1.299 jd.spec, 1.348, 1.349 sources,
	1.299, 1.300
Message-ID: <20080929180146.2F50470110@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13957/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2378



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- .cvsignore	22 Sep 2008 17:42:51 -0000	1.298
+++ .cvsignore	29 Sep 2008 18:01:15 -0000	1.299
@@ -1 +1 @@
-jd-2.0.3-svn2361_trunk.tgz
+jd-2.0.3-svn2378_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- jd.spec	22 Sep 2008 17:42:51 -0000	1.348
+++ jd.spec	29 Sep 2008 18:01:15 -0000	1.349
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.0.3
-%define         strtag        svn2361_trunk
+%define         strtag        svn2378_trunk
 %define         repoid        32951
 # Define this if this is pre-version
 %define         pre_release   1
@@ -136,8 +136,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Tue Sep 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2361
+* Tue Sep 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2378
 
 * Sat Sep 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.2-1
 - 2.0.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- sources	22 Sep 2008 17:42:51 -0000	1.299
+++ sources	29 Sep 2008 18:01:15 -0000	1.300
@@ -1 +1 @@
-0fa8ceddd2f63c457c80a7e2ba231e29  jd-2.0.3-svn2361_trunk.tgz
+fe6ad5cc41335d828f737ba08a15bf16  jd-2.0.3-svn2378_trunk.tgz



From mtasaka at fedoraproject.org  Mon Sep 29 18:01:58 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 29 Sep 2008 18:01:58 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.67, 1.68 cairo-dock.spec, 1.84, 
	1.85 sources, 1.67, 1.68
Message-ID: <20080929180158.50C5270110@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14058

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Mon Sep 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1323



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	28 Sep 2008 17:49:05 -0000	1.67
+++ .cvsignore	29 Sep 2008 18:01:28 -0000	1.68
@@ -1 +1 @@
-cairo-dock-sources-svn1323_trunk.tar.bz2
+cairo-dock-sources-svn1325_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- cairo-dock.spec	28 Sep 2008 17:49:05 -0000	1.84
+++ cairo-dock.spec	29 Sep 2008 18:01:28 -0000	1.85
@@ -7,7 +7,7 @@
 # For now build only stable plugin
 %define		build_other	1
 
-%define		tarballver	svn1323_trunk
+%define		tarballver	svn1325_trunk
 %define		mainver		1.6.3
 %undefine		betaver
 %define		build_gecko	1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	28 Sep 2008 17:49:05 -0000	1.67
+++ sources	29 Sep 2008 18:01:28 -0000	1.68
@@ -1 +1 @@
-d2945901736b6c94573e41b2b73f3748  cairo-dock-sources-svn1323_trunk.tar.bz2
+af658a6282f15b50380b1a6368ecd1ab  cairo-dock-sources-svn1325_trunk.tar.bz2



From mtasaka at fedoraproject.org  Mon Sep 29 18:05:03 2008
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 29 Sep 2008 18:05:03 +0000 (UTC)
Subject: rpms/cairo-dock/devel cairo-dock.spec,1.85,1.86
Message-ID: <20080929180503.3CE1870110@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14669

Modified Files:
	cairo-dock.spec 
Log Message:
orz


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- cairo-dock.spec	29 Sep 2008 18:01:28 -0000	1.85
+++ cairo-dock.spec	29 Sep 2008 18:04:32 -0000	1.86
@@ -608,8 +608,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Mon Sep 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1323
+* Tue Sep 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1325
 
 * Tue Sep  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.2.3-1
 - 1.6.2.3



From anyremote at fedoraproject.org  Mon Sep 29 18:11:59 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Mon, 29 Sep 2008 18:11:59 +0000 (UTC)
Subject: rpms/anyremote/F-8 .cvsignore, 1.7, 1.8 anyremote.spec, 1.6,
	1.7 import.log, 1.1, 1.2 sources, 1.7, 1.8
Message-ID: <20080929181159.82A2E70110@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15527/F-8

Modified Files:
	.cvsignore anyremote.spec import.log sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Sep 2008 17:16:54 -0000	1.7
+++ .cvsignore	29 Sep 2008 18:11:29 -0000	1.8
@@ -1 +1 @@
-anyremote-4.8.1.tar.gz
+anyremote-4.9.tar.gz


Index: anyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-8/anyremote.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- anyremote.spec	9 Sep 2008 17:16:55 -0000	1.6
+++ anyremote.spec	29 Sep 2008 18:11:29 -0000	1.7
@@ -1,12 +1,12 @@
 Summary: Remote control through bluetooth or IR connection
 Name: anyremote
-Version: 4.8.1
+Version: 4.9
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
 URL: http://anyremote.sourceforge.net/
-Requires: bc,anyremote-data >= 4.2
+Requires: bc,anyremote-data >= 4.9
 BuildRequires:bluez-libs-devel, libX11-devel, libXtst-devel, xorg-x11-proto-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,6 +60,10 @@
 
 %changelog
 
+* Mon Sep 29 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.9-1
+- Get(version) command was introduced. Added possibility to create 
+  user-specific phone initialization.
+
 * Tue Sep 9 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.8.1-1
 - Small corrections.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-8/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Sep 2008 17:16:55 -0000	1.1
+++ import.log	29 Sep 2008 18:11:29 -0000	1.2
@@ -1 +1,2 @@
 anyremote-4_8_1-1_fc9:F-8:anyremote-4.8.1-1.fc9.src.rpm:1220980552
+anyremote-4_9-1_fc9:F-8:anyremote-4.9-1.fc9.src.rpm:1222711756


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Sep 2008 17:16:55 -0000	1.7
+++ sources	29 Sep 2008 18:11:29 -0000	1.8
@@ -1 +1 @@
-1cb017bce0775da5bb8e71abf819e01b  anyremote-4.8.1.tar.gz
+86e985234ec1b6a40fdacb6b40621764  anyremote-4.9.tar.gz



From anyremote at fedoraproject.org  Mon Sep 29 18:12:05 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Mon, 29 Sep 2008 18:12:05 +0000 (UTC)
Subject: rpms/anyremote/F-9 .cvsignore, 1.7, 1.8 anyremote.spec, 1.6,
	1.7 import.log, 1.1, 1.2 sources, 1.7, 1.8
Message-ID: <20080929181205.1331270110@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15556/F-9

Modified Files:
	.cvsignore anyremote.spec import.log sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Sep 2008 17:08:25 -0000	1.7
+++ .cvsignore	29 Sep 2008 18:11:34 -0000	1.8
@@ -1 +1 @@
-anyremote-4.8.1.tar.gz
+anyremote-4.9.tar.gz


Index: anyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-9/anyremote.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- anyremote.spec	9 Sep 2008 17:08:25 -0000	1.6
+++ anyremote.spec	29 Sep 2008 18:11:34 -0000	1.7
@@ -1,12 +1,12 @@
 Summary: Remote control through bluetooth or IR connection
 Name: anyremote
-Version: 4.8.1
+Version: 4.9
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
 URL: http://anyremote.sourceforge.net/
-Requires: bc,anyremote-data >= 4.2
+Requires: bc,anyremote-data >= 4.9
 BuildRequires:bluez-libs-devel, libX11-devel, libXtst-devel, xorg-x11-proto-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,6 +60,10 @@
 
 %changelog
 
+* Mon Sep 29 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.9-1
+- Get(version) command was introduced. Added possibility to create 
+  user-specific phone initialization.
+
 * Tue Sep 9 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.8.1-1
 - Small corrections.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Sep 2008 17:08:25 -0000	1.1
+++ import.log	29 Sep 2008 18:11:34 -0000	1.2
@@ -1 +1,2 @@
 anyremote-4_8_1-1_fc9:F-9:anyremote-4.8.1-1.fc9.src.rpm:1220980093
+anyremote-4_9-1_fc9:F-9:anyremote-4.9-1.fc9.src.rpm:1222711725


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Sep 2008 17:08:25 -0000	1.7
+++ sources	29 Sep 2008 18:11:34 -0000	1.8
@@ -1 +1 @@
-1cb017bce0775da5bb8e71abf819e01b  anyremote-4.8.1.tar.gz
+86e985234ec1b6a40fdacb6b40621764  anyremote-4.9.tar.gz



From anyremote at fedoraproject.org  Mon Sep 29 18:12:08 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Mon, 29 Sep 2008 18:12:08 +0000 (UTC)
Subject: rpms/anyremote/devel .cvsignore, 1.7, 1.8 anyremote.spec, 1.7,
	1.8 import.log, 1.1, 1.2 sources, 1.7, 1.8
Message-ID: <20080929181208.4084E70110@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15581/devel

Modified Files:
	.cvsignore anyremote.spec import.log sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Sep 2008 17:08:03 -0000	1.7
+++ .cvsignore	29 Sep 2008 18:11:38 -0000	1.8
@@ -1 +1 @@
-anyremote-4.8.1.tar.gz
+anyremote-4.9.tar.gz


Index: anyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/anyremote.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- anyremote.spec	11 Sep 2008 05:23:19 -0000	1.7
+++ anyremote.spec	29 Sep 2008 18:11:38 -0000	1.8
@@ -1,12 +1,12 @@
 Summary: Remote control through bluetooth or IR connection
 Name: anyremote
-Version: 4.8.1
-Release: 2%{?dist}
+Version: 4.9
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
 URL: http://anyremote.sourceforge.net/
-Requires: bc,anyremote-data >= 4.2
+Requires: bc,anyremote-data >= 4.9
 BuildRequires:bluez-libs-devel, libX11-devel, libXtst-devel, xorg-x11-proto-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -59,8 +59,10 @@
 
 
 %changelog
-* Thu Sep 11 2008 Mamoru Tasaka <mtasaka at ioa.s.u-toky.ac.jp> - 4.8.1-2
-- F-10: rebuild against new bluez
+
+* Mon Sep 29 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.9-1
+- Get(version) command was introduced. Added possibility to create 
+  user-specific phone initialization.
 
 * Tue Sep 9 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.8.1-1
 - Small corrections.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Sep 2008 17:08:03 -0000	1.1
+++ import.log	29 Sep 2008 18:11:38 -0000	1.2
@@ -1 +1,2 @@
 anyremote-4_8_1-1_fc9:HEAD:anyremote-4.8.1-1.fc9.src.rpm:1220980089
+anyremote-4_9-1_fc9:HEAD:anyremote-4.9-1.fc9.src.rpm:1222711841


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Sep 2008 17:08:03 -0000	1.7
+++ sources	29 Sep 2008 18:11:38 -0000	1.8
@@ -1 +1 @@
-1cb017bce0775da5bb8e71abf819e01b  anyremote-4.8.1.tar.gz
+86e985234ec1b6a40fdacb6b40621764  anyremote-4.9.tar.gz



From jamatos at fedoraproject.org  Mon Sep 29 18:16:03 2008
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Mon, 29 Sep 2008 18:16:03 +0000 (UTC)
Subject: rpms/grace/devel .cvsignore, 1.6, 1.7 grace.spec, 1.23, 1.24 sources,
	1.6, 1.7
Message-ID: <20080929181603.9CF6C70110@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/grace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16002

Modified Files:
	.cvsignore grace.spec sources 
Log Message:
* Mon Sep 29 2008 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.22-1
- new upstream release (5.1.22)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grace/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Jan 2008 09:26:08 -0000	1.6
+++ .cvsignore	29 Sep 2008 18:15:33 -0000	1.7
@@ -1,2 +1,2 @@
-grace_5.1.21-2.diff.gz
-grace-5.1.21.tar.gz
+grace-5.1.22.tar.gz
+grace_5.1.22-1.diff.gz


Index: grace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grace/devel/grace.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- grace.spec	14 Feb 2008 16:03:23 -0000	1.23
+++ grace.spec	29 Sep 2008 18:15:33 -0000	1.24
@@ -2,8 +2,8 @@
 %define type1fontdir fonts/default/Type1
 
 Name:           grace
-Version:        5.1.21
-Release:        9%{?dist}
+Version:        5.1.22
+Release:        1%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPLv2+
@@ -16,7 +16,7 @@
 Source4:        LICENSE.cephes
 Patch0:         %{name}-gracerc-no_auxiliary.diff
 Patch1:         %{name}-detect-netcdf.diff
-Patch2:         http://ftp.de.debian.org/debian/pool/main/g/grace/grace_5.1.21-2.diff.gz
+Patch2:         http://ftp.de.debian.org/debian/pool/main/g/grace/grace_5.1.22-1.diff.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group:          Applications/Engineering
 
@@ -225,6 +225,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.22-1
+- new upstream release (5.1.22)
+
 * Thu Feb 14 2008 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-9
 - Rebuild for gcc 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grace/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jan 2008 09:26:08 -0000	1.6
+++ sources	29 Sep 2008 18:15:33 -0000	1.7
@@ -1,2 +1,2 @@
-b82590debb07fc229ae7b003b503959b  grace_5.1.21-2.diff.gz
-db02dee3c68179c41452e652bd469bb9  grace-5.1.21.tar.gz
+672356466f18fe59ed21a8fb44f9851d  grace-5.1.22.tar.gz
+d487c80094180c187a41b196eb45827d  grace_5.1.22-1.diff.gz



From rakesh at fedoraproject.org  Mon Sep 29 18:21:53 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 29 Sep 2008 18:21:53 +0000 (UTC)
Subject: rpms/gedit-plugins/devel gedit-plugins.spec,1.5,1.6
Message-ID: <20080929182153.ACA3270110@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gedit-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16405

Modified Files:
	gedit-plugins.spec 
Log Message:
fixed buildrequires



Index: gedit-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/devel/gedit-plugins.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gedit-plugins.spec	29 Sep 2008 17:58:36 -0000	1.5
+++ gedit-plugins.spec	29 Sep 2008 18:21:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gedit-plugins
 Version:        2.22.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Plugins for gedit
 
 Group:          Applications/Editors
@@ -21,6 +21,7 @@
 BuildRequires:  pygtk2-devel
 BuildRequires:  pygtksourceview-devel
 BuildRequires:  pygobject2-devel
+BuildRequires:  intltool
 Requires:       gedit
 Requires:       pygtk2
 Requires:  	pygtksourceview
@@ -91,6 +92,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 2.22.3-2
+- Fixed buildrequires
+
 * Mon Sep 29 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 2.22.3-1
 - Updated to 2.22.3
 



From rakesh at fedoraproject.org  Mon Sep 29 18:22:07 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 29 Sep 2008 18:22:07 +0000 (UTC)
Subject: rpms/gedit-plugins/F-9 gedit-plugins.spec,1.4,1.5
Message-ID: <20080929182207.9D45070110@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gedit-plugins/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16428

Modified Files:
	gedit-plugins.spec 
Log Message:
fixed buildrequires



Index: gedit-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/F-9/gedit-plugins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gedit-plugins.spec	29 Sep 2008 18:00:13 -0000	1.4
+++ gedit-plugins.spec	29 Sep 2008 18:21:37 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gedit-plugins
 Version:        2.22.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Plugins for gedit
 
 Group:          Applications/Editors
@@ -21,6 +21,7 @@
 BuildRequires:  pygtk2-devel
 BuildRequires:  pygtksourceview-devel
 BuildRequires:  pygobject2-devel
+BuildRequires:  intltool
 Requires:       gedit
 Requires:       pygtk2
 Requires:  	pygtksourceview
@@ -91,6 +92,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 2.22.3-2
+- Fixed buildrequires
+
 * Mon Sep 29 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 2.22.3-1
 - Updated to 2.22.3
 



From rakesh at fedoraproject.org  Mon Sep 29 18:22:21 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 29 Sep 2008 18:22:21 +0000 (UTC)
Subject: rpms/gedit-plugins/F-8 gedit-plugins.spec,1.3,1.4
Message-ID: <20080929182221.36E3970110@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gedit-plugins/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16475

Modified Files:
	gedit-plugins.spec 
Log Message:
fixed buildrequires



Index: gedit-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/F-8/gedit-plugins.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gedit-plugins.spec	29 Sep 2008 18:01:02 -0000	1.3
+++ gedit-plugins.spec	29 Sep 2008 18:21:51 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gedit-plugins
 Version:        2.22.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Plugins for gedit
 
 Group:          Applications/Editors
@@ -21,6 +21,7 @@
 BuildRequires:  pygtk2-devel
 BuildRequires:  pygtksourceview-devel
 BuildRequires:  pygobject2-devel
+BuildRequires:  intltool
 Requires:       gedit
 Requires:       pygtk2
 Requires:  	pygtksourceview
@@ -91,6 +92,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 2.22.3-2
+- Fixed buildrequires
+
 * Mon Sep 29 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 2.22.3-1
 - Updated to 2.22.3
 



From rdieter at fedoraproject.org  Mon Sep 29 18:31:17 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 18:31:17 +0000 (UTC)
Subject: rpms/libsigsegv/devel libsigsegv.spec, 1.17, 1.18 sigsegv-wrapper.h,
	1.1, 1.2
Message-ID: <20080929183117.0F37170110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libsigsegv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17518

Modified Files:
	libsigsegv.spec sigsegv-wrapper.h 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 2.4-7
- multilib (sparc) fixes



Index: libsigsegv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsigsegv/devel/libsigsegv.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libsigsegv.spec	4 Aug 2008 14:30:52 -0000	1.17
+++ libsigsegv.spec	29 Sep 2008 18:30:46 -0000	1.18
@@ -1,10 +1,10 @@
 
-%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparc sparc64
+%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
 
 Summary: Library for handling page faults in user mode
 Name:    libsigsegv
 Version: 2.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPLv2+
 URL:     http://libsigsegv.sourceforge.net/
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 2.4-7
+- multilib (sparc) fixes
+
 * Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 2.4-6
 - multiarch conflicts (#342391)
 - -static subpkg


Index: sigsegv-wrapper.h
===================================================================
RCS file: /cvs/pkgs/rpms/libsigsegv/devel/sigsegv-wrapper.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sigsegv-wrapper.h	22 Feb 2008 20:12:19 -0000	1.1
+++ sigsegv-wrapper.h	29 Sep 2008 18:30:46 -0000	1.2
@@ -15,7 +15,7 @@
 #include "sigsegv-s390x.h"
 #elif defined(__s390__)
 #include "sigsegv-s390.h"
-#elif defined(__sparc64__)
+#elif defined(__sparc__) && defined (__arch64__)
 #include "sigsegv-sparc64.h"
 #elif defined(__sparc__)
 #include "sigsegv-sparc.h"



From ausil at fedoraproject.org  Mon Sep 29 18:31:22 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 29 Sep 2008 18:31:22 +0000 (UTC)
Subject: rpms/oprofile/F-9 oprofile.spec,1.69,1.70
Message-ID: <20080929183122.92D3170110@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/oprofile/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17478

Modified Files:
	oprofile.spec 
Log Message:
build for sparcv9 not sparc



Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-9/oprofile.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- oprofile.spec	23 Jun 2008 19:45:56 -0000	1.69
+++ oprofile.spec	29 Sep 2008 18:30:52 -0000	1.70
@@ -3,7 +3,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.3
-Release: 18%{?dist}
+Release: 18%{?dist}.1
 License: GPL
 Group: Development/System
 #
@@ -21,7 +21,7 @@
 Patch100: oprofile-gcc43.patch
 URL: http://oprofile.sf.net
 
-ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparc sparc64
+ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparcv9 sparc64
 BuildRequires: qt3-devel
 BuildRequires: libxslt
 BuildRequires: docbook-style-xsl
@@ -192,6 +192,9 @@
 %{_bindir}/oprof_start
 
 %changelog
+* Mon Sep 29 2008 Dennis Gilmore <dennis at ausil.us> - 0.9.3-18.1
+- build for sparcv9 not sparc
+
 * Mon Jun 23 2008 Will Cohen <wcohen at redhat.com> - 0.9.3-18
 - Fix default location for vmlinux. rhbz #451539
 



From rdieter at fedoraproject.org  Mon Sep 29 18:33:05 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 18:33:05 +0000 (UTC)
Subject: rpms/libsigsegv/F-9 .cvsignore, 1.5, 1.6 libsigsegv.spec, 1.16,
	1.17 sigsegv-wrapper.h, 1.1, 1.2
Message-ID: <20080929183305.CD2DC70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libsigsegv/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17912

Modified Files:
	.cvsignore libsigsegv.spec sigsegv-wrapper.h 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 2.4-7
- multilib (sparc) fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsigsegv/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Jul 2006 11:34:31 -0000	1.5
+++ .cvsignore	29 Sep 2008 18:32:35 -0000	1.6
@@ -1,2 +1 @@
-libsigsegv-2.3.tar.gz
 libsigsegv-2.4.tar.gz


Index: libsigsegv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsigsegv/F-9/libsigsegv.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libsigsegv.spec	22 Feb 2008 20:12:19 -0000	1.16
+++ libsigsegv.spec	29 Sep 2008 18:32:35 -0000	1.17
@@ -1,10 +1,10 @@
 
-%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparc sparc64
+%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
 
 Summary: Library for handling page faults in user mode
 Name:    libsigsegv
 Version: 2.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPLv2+
 URL:     http://libsigsegv.sourceforge.net/
@@ -53,9 +53,9 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot} 
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 %ifarch %{multilib_arches}
 # hack to allow parallel installation on 32-bit and 64-bit
@@ -64,10 +64,10 @@
   install -p -m644 %{SOURCE1}  %{buildroot}%{_includedir}/sigsegv.h
 %endif
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f %{buildroot}%{_libdir}/lib*.la
 
 
-%check || :
+%check
 make check
 
 
@@ -77,7 +77,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot} 
 
 
 %files
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 2.4-7
+- multilib (sparc) fixes
+
 * Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 2.4-6
 - multiarch conflicts (#342391)
 - -static subpkg


Index: sigsegv-wrapper.h
===================================================================
RCS file: /cvs/pkgs/rpms/libsigsegv/F-9/sigsegv-wrapper.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sigsegv-wrapper.h	22 Feb 2008 20:12:19 -0000	1.1
+++ sigsegv-wrapper.h	29 Sep 2008 18:32:35 -0000	1.2
@@ -15,7 +15,7 @@
 #include "sigsegv-s390x.h"
 #elif defined(__s390__)
 #include "sigsegv-s390.h"
-#elif defined(__sparc64__)
+#elif defined(__sparc__) && defined (__arch64__)
 #include "sigsegv-sparc64.h"
 #elif defined(__sparc__)
 #include "sigsegv-sparc.h"



From ausil at fedoraproject.org  Mon Sep 29 18:38:19 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 29 Sep 2008 18:38:19 +0000 (UTC)
Subject: rpms/oprofile/devel oprofile.spec,1.71,1.72
Message-ID: <20080929183819.93AE170110@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/oprofile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18702

Modified Files:
	oprofile.spec 
Log Message:
build for sparcv9 not sparc



Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- oprofile.spec	21 Jul 2008 18:45:24 -0000	1.71
+++ oprofile.spec	29 Sep 2008 18:37:49 -0000	1.72
@@ -3,7 +3,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -16,7 +16,7 @@
 #Patch100: oprofile-gcc43.patch
 URL: http://oprofile.sf.net
 
-ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparc sparc64
+ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparcv9 sparc64
 BuildRequires: qt3-devel
 BuildRequires: libxslt
 BuildRequires: docbook-style-xsl
@@ -223,6 +223,9 @@
 /etc/ld.so.conf.d/*
 
 %changelog
+* Mon Sep 29 2008 Dennis Gilmore <dennis at ausil.us> - 0.9.4-3
+- build sparcv9 not sparc
+
 * Mon Jul 21 2008 Will Cohen <wcohen at redhat.com> - 0.9.4-2
 - Correct oprofile.spec.
 



From anyremote at fedoraproject.org  Mon Sep 29 18:39:10 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Mon, 29 Sep 2008 18:39:10 +0000 (UTC)
Subject: rpms/anyremote2html/F-8 .cvsignore, 1.2, 1.3 anyremote2html.spec,
	1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080929183910.D8A5770110@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote2html/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19105/F-8

Modified Files:
	.cvsignore anyremote2html.spec import.log sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Sep 2008 20:02:43 -0000	1.2
+++ .cvsignore	29 Sep 2008 18:38:40 -0000	1.3
@@ -1 +1 @@
-anyremote2html-0.5.2.2.tar.gz
+anyremote2html-0.6.tar.gz


Index: anyremote2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/F-8/anyremote2html.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anyremote2html.spec	14 Sep 2008 20:02:43 -0000	1.1
+++ anyremote2html.spec	29 Sep 2008 18:38:40 -0000	1.2
@@ -1,11 +1,11 @@
 Summary: WEB interface for anyRemote
 Name: anyremote2html
-Version: 0.5.2.2
-Release: 1
+Version: 0.6
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
-Requires:python >= 2.4, anyremote >= 4.5 
+Requires:python >= 2.4, anyremote >= 4.9 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://anyremote.sourceforge.net/
 BuildArch: noarch
@@ -23,11 +23,46 @@
 
 %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
+
+%changelog
+
+* Mon Sep 29 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.6  
+- New icon set.
+
+* Fri Sep 11 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.2.2-1  
+- Corrected autotools issue.  
+
+* Fri Sep 5 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.2.1-1  
+- Corrected spec file.  
+
+* Thu Sep 4 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.2-3  
+- Corrected spec file.  
+
+* Sun Aug 24 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.2-2  
+- Corrected files permissions and specs.  
+
+* Wed Aug 20 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.2  
+- Corrected files permissions and specs.  
+
+* Sun May 25 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.1  
+- Change default web port to 5550.   
+  
+* Mon May 19 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5  
+- Better integration with anyRemote.  
   
+* Tue Apr 08 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.4  
+- Minor bugfix  
+  
+* Tue Mar 04 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.3  
+- Several icons were added. Use autotools to create makefile.  
+  
+* Thu Aug 23 2007 Mikhail Fedotov <anyremote at mail.ru> - 0.2  
+- Initial release
+
 %files
 %defattr(-,root,root,-)
 %{_datadir}/pixmaps/%{name}


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/F-8/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Sep 2008 20:02:43 -0000	1.1
+++ import.log	29 Sep 2008 18:38:40 -0000	1.2
@@ -1 +1,2 @@
 anyremote2html-0_5_2_2-1:F-8:anyremote2html-0.5.2.2-1.src.rpm:1221422516
+anyremote2html-0_6-1_fc9:F-8:anyremote2html-0.6-1.fc9.src.rpm:1222713271


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2008 20:02:43 -0000	1.2
+++ sources	29 Sep 2008 18:38:40 -0000	1.3
@@ -1 +1 @@
-3daa03b6bbe423839498163ac86f075c  anyremote2html-0.5.2.2.tar.gz
+23916c00c39b16f749a65adec2bdcced  anyremote2html-0.6.tar.gz



From anyremote at fedoraproject.org  Mon Sep 29 18:38:59 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Mon, 29 Sep 2008 18:38:59 +0000 (UTC)
Subject: rpms/anyremote2html/F-9 .cvsignore, 1.2, 1.3 anyremote2html.spec,
	1.2, 1.3 import.log, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20080929183859.4DCDD70110@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote2html/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19026/F-9

Modified Files:
	.cvsignore anyremote2html.spec import.log sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Sep 2008 20:03:35 -0000	1.2
+++ .cvsignore	29 Sep 2008 18:38:29 -0000	1.3
@@ -1 +1 @@
-anyremote2html-0.5.2.2.tar.gz
+anyremote2html-0.6.tar.gz


Index: anyremote2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/F-9/anyremote2html.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- anyremote2html.spec	14 Sep 2008 20:08:44 -0000	1.2
+++ anyremote2html.spec	29 Sep 2008 18:38:29 -0000	1.3
@@ -1,11 +1,11 @@
 Summary: WEB interface for anyRemote
 Name: anyremote2html
-Version: 0.5.2.2
-Release: 2%{?dist}
+Version: 0.6
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
-Requires:python >= 2.4, anyremote >= 4.5 
+Requires:python >= 2.4, anyremote >= 4.9 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://anyremote.sourceforge.net/
 BuildArch: noarch
@@ -30,6 +30,9 @@
 
 %changelog
 
+* Mon Sep 29 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.6  
+- New icon set.
+
 * Fri Sep 11 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.2.2-1  
 - Corrected autotools issue.  
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	14 Sep 2008 20:08:44 -0000	1.2
+++ import.log	29 Sep 2008 18:38:29 -0000	1.3
@@ -1,2 +1,3 @@
 anyremote2html-0_5_2_2-1:F-9:anyremote2html-0.5.2.2-1.src.rpm:1221422534
 anyremote2html-0_5_2_2-2_fc9:F-9:anyremote2html-0.5.2.2-2.fc9.src.rpm:1221422875
+anyremote2html-0_6-1_fc9:F-9:anyremote2html-0.6-1.fc9.src.rpm:1222713305


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Sep 2008 20:08:44 -0000	1.3
+++ sources	29 Sep 2008 18:38:29 -0000	1.4
@@ -1 +1 @@
-73b189accc4bd494fa356a5eb56cfc9b  anyremote2html-0.5.2.2.tar.gz
+23916c00c39b16f749a65adec2bdcced  anyremote2html-0.6.tar.gz



From anyremote at fedoraproject.org  Mon Sep 29 18:39:08 2008
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Mon, 29 Sep 2008 18:39:08 +0000 (UTC)
Subject: rpms/anyremote2html/devel .cvsignore, 1.2, 1.3 anyremote2html.spec, 
	1.2, 1.3 import.log, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20080929183908.86A9370110@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote2html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19080/devel

Modified Files:
	.cvsignore anyremote2html.spec import.log sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Sep 2008 20:02:30 -0000	1.2
+++ .cvsignore	29 Sep 2008 18:38:38 -0000	1.3
@@ -1 +1 @@
-anyremote2html-0.5.2.2.tar.gz
+anyremote2html-0.6.tar.gz


Index: anyremote2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/devel/anyremote2html.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- anyremote2html.spec	14 Sep 2008 20:08:51 -0000	1.2
+++ anyremote2html.spec	29 Sep 2008 18:38:38 -0000	1.3
@@ -1,11 +1,11 @@
 Summary: WEB interface for anyRemote
 Name: anyremote2html
-Version: 0.5.2.2
-Release: 2%{?dist}
+Version: 0.6
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
-Requires:python >= 2.4, anyremote >= 4.5 
+Requires:python >= 2.4, anyremote >= 4.9 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://anyremote.sourceforge.net/
 BuildArch: noarch
@@ -30,6 +30,9 @@
 
 %changelog
 
+* Mon Sep 29 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.6  
+- New icon set.
+
 * Fri Sep 11 2008 Mikhail Fedotov <anyremote at mail.ru> - 0.5.2.2-1  
 - Corrected autotools issue.  
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	14 Sep 2008 20:08:51 -0000	1.2
+++ import.log	29 Sep 2008 18:38:38 -0000	1.3
@@ -1,2 +1,3 @@
 anyremote2html-0_5_2_2-1:HEAD:anyremote2html-0.5.2.2-1.src.rpm:1221422490
 anyremote2html-0_5_2_2-2_fc9:HEAD:anyremote2html-0.5.2.2-2.fc9.src.rpm:1221422858
+anyremote2html-0_6-1_fc9:HEAD:anyremote2html-0.6-1.fc9.src.rpm:1222713285


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote2html/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Sep 2008 20:08:51 -0000	1.3
+++ sources	29 Sep 2008 18:38:38 -0000	1.4
@@ -1 +1 @@
-73b189accc4bd494fa356a5eb56cfc9b  anyremote2html-0.5.2.2.tar.gz
+23916c00c39b16f749a65adec2bdcced  anyremote2html-0.6.tar.gz



From rstrode at fedoraproject.org  Mon Sep 29 18:39:42 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 29 Sep 2008 18:39:42 +0000 (UTC)
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.321,1.322
Message-ID: <20080929183942.DD4CA70110@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19180

Modified Files:
	gnome-panel.spec 
Log Message:
add bug line to patch



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -r1.321 -r1.322
--- gnome-panel.spec	26 Sep 2008 19:39:13 -0000	1.321
+++ gnome-panel.spec	29 Sep 2008 18:39:12 -0000	1.322
@@ -113,6 +113,7 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=520111
 Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=554343
 Patch25: gnome-panel-2.24.0-smoother-slide-in.patch
 
 Patch35: clock-wakeups.patch



From rdieter at fedoraproject.org  Mon Sep 29 18:43:51 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 18:43:51 +0000 (UTC)
Subject: rpms/ntl/devel multilib_template.h,1.1,1.2 ntl.spec,1.11,1.12
Message-ID: <20080929184351.E922570110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ntl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19807

Modified Files:
	multilib_template.h ntl.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 5.4.2-3
- multilib fixes



Index: multilib_template.h
===================================================================
RCS file: /cvs/pkgs/rpms/ntl/devel/multilib_template.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multilib_template.h	3 Apr 2008 14:34:04 -0000	1.1
+++ multilib_template.h	29 Sep 2008 18:43:21 -0000	1.2
@@ -15,7 +15,7 @@
 #include "@@INCLUDE@@-s390x.h"
 #elif defined(__s390__)
 #include "@@INCLUDE@@-s390.h"
-#elif defined(__sparc64__)
+#elif defined(__sparc__) && defined (__arch64__)
 #include "@@INCLUDE@@-sparc64.h"
 #elif defined(__sparc__)
 #include "@@INCLUDE@@-sparc.h"


Index: ntl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntl/devel/ntl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ntl.spec	4 Aug 2008 14:37:28 -0000	1.11
+++ ntl.spec	29 Sep 2008 18:43:21 -0000	1.12
@@ -1,10 +1,10 @@
 
-%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparc sparc64
+%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
 
 Summary: High-performance algorithms for vectors, matrices, and polynomials 
 Name:    ntl 
 Version: 5.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 URL:     http://shoup.net/ntl/ 
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 5.4.2-3
+- multilib fixes
+
 * Thu Apr 03 2008 Rex Dieter <rdieter at fedoraproject.org> 5.4.2-2
 - multiarch conflicts (#342711)
 



From rdieter at fedoraproject.org  Mon Sep 29 18:45:12 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 29 Sep 2008 18:45:12 +0000 (UTC)
Subject: rpms/ntl/F-9 multilib_template.h,1.1,1.2 ntl.spec,1.10,1.11
Message-ID: <20080929184512.1DEBA70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ntl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20004

Modified Files:
	multilib_template.h ntl.spec 
Log Message:
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 5.4.2-3
- multilib fixes



Index: multilib_template.h
===================================================================
RCS file: /cvs/pkgs/rpms/ntl/F-9/multilib_template.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multilib_template.h	3 Apr 2008 14:34:04 -0000	1.1
+++ multilib_template.h	29 Sep 2008 18:44:41 -0000	1.2
@@ -15,7 +15,7 @@
 #include "@@INCLUDE@@-s390x.h"
 #elif defined(__s390__)
 #include "@@INCLUDE@@-s390.h"
-#elif defined(__sparc64__)
+#elif defined(__sparc__) && defined (__arch64__)
 #include "@@INCLUDE@@-sparc64.h"
 #elif defined(__sparc__)
 #include "@@INCLUDE@@-sparc.h"


Index: ntl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntl/F-9/ntl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ntl.spec	3 Apr 2008 14:34:04 -0000	1.10
+++ ntl.spec	29 Sep 2008 18:44:41 -0000	1.11
@@ -1,10 +1,10 @@
 
-%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparc sparc64
+%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
 
 Summary: High-performance algorithms for vectors, matrices, and polynomials 
 Name:    ntl 
 Version: 5.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 URL:     http://shoup.net/ntl/ 
@@ -83,7 +83,7 @@
 make -C src 
 
 
-%check ||:
+%check
 # skip by default, takes a *long, long, long* (days?) time -- Rex
 %{?_with_check:make -C src check}
 
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 5.4.2-3
+- multilib fixes
+
 * Thu Apr 03 2008 Rex Dieter <rdieter at fedoraproject.org> 5.4.2-2
 - multiarch conflicts (#342711)
 



From jamatos at fedoraproject.org  Mon Sep 29 19:02:02 2008
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Mon, 29 Sep 2008 19:02:02 +0000 (UTC)
Subject: rpms/grace/devel grace.spec,1.24,1.25
Message-ID: <20080929190202.55E1670110@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/grace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21309

Modified Files:
	grace.spec 
Log Message:
* Mon Sep 29 2008 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.22-1
- new upstream release (5.1.22)
- apply debian patches with -p1



Index: grace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grace/devel/grace.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- grace.spec	29 Sep 2008 18:15:33 -0000	1.24
+++ grace.spec	29 Sep 2008 19:01:29 -0000	1.25
@@ -65,7 +65,7 @@
 
 # avoid duplicating debian patch
 %patch2 -p1
-patch -p0 < debian/patches/tmpnam_to_mkstemp.diff
+patch -p1 < debian/patches/tmpnam_to_mkstemp.diff
 
 # remove stripping option to have meaningfull debuginfo packages
 sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' */Makefile
@@ -227,6 +227,7 @@
 %changelog
 * Mon Sep 29 2008 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.22-1
 - new upstream release (5.1.22)
+- apply debian patches with -p1
 
 * Thu Feb 14 2008 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-9
 - Rebuild for gcc 4.3



From dcantrel at fedoraproject.org  Mon Sep 29 19:09:31 2008
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Mon, 29 Sep 2008 19:09:31 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp-4.0.0-ldap-configuration.patch, 1.7,
	1.8 dhcp.spec, 1.220, 1.221
Message-ID: <20080929190931.64D1170110@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22131

Modified Files:
	dhcp-4.0.0-ldap-configuration.patch dhcp.spec 
Log Message:
* Mon Sep 29 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-24
- 'server' -> 'service' in dhclient-script (#462343)
- Fix dhcpd so it can find configuration data via LDAP (#452985)


dhcp-4.0.0-ldap-configuration.patch:

Index: dhcp-4.0.0-ldap-configuration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp-4.0.0-ldap-configuration.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dhcp-4.0.0-ldap-configuration.patch	7 Feb 2008 00:47:26 -0000	1.7
+++ dhcp-4.0.0-ldap-configuration.patch	29 Sep 2008 19:09:29 -0000	1.8
@@ -1073,8 +1073,8 @@
 +      creds.bv_val = strdup(ldap_password);
 +      creds.bv_len = strlen(ldap_password);
 +
-+      if ((ret == ldap_sasl_bind_s (ld, ldap_username, LDAP_SASL_SIMPLE,
-+                                    &creds, NULL, NULL, NULL)) != LDAP_SUCCESS)
++      if ((ret = ldap_sasl_bind_s (ld, ldap_username, LDAP_SASL_SIMPLE,
++                                   &creds, NULL, NULL, NULL)) != LDAP_SUCCESS)
 +        {
 +          log_error ("Error: Cannot login into ldap server %s:%d: %s",
 +                     ldap_server, ldap_port, ldap_err2string (ret));
@@ -1478,7 +1478,7 @@
 +    return (EOF);
 +
 +  cfile->bufix = 1;
-+  cfile->buflen = strlen (cfile->inbuf);
++  cfile->buflen = strlen (cfile->inbuf) - 1;
 +  if (cfile->buflen > 0)
 +    ldap_write_debug (cfile->inbuf, cfile->buflen);
 +


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- dhcp.spec	17 Sep 2008 00:42:00 -0000	1.220
+++ dhcp.spec	29 Sep 2008 19:09:29 -0000	1.221
@@ -440,8 +440,9 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
-* Tue Sep 16 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-24
+* Mon Sep 29 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-24
 - 'server' -> 'service' in dhclient-script (#462343)
+- Fix dhcpd so it can find configuration data via LDAP (#452985)
 
 * Fri Aug 29 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-23
 - Prevent $metric from being set to '' (#460640)



From jamatos at fedoraproject.org  Mon Sep 29 19:19:24 2008
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Mon, 29 Sep 2008 19:19:24 +0000 (UTC)
Subject: rpms/grace/F-9 .cvsignore, 1.6, 1.7 grace.spec, 1.23, 1.24 sources, 
	1.6, 1.7
Message-ID: <20080929191924.A28EF70110@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/grace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23012

Modified Files:
	.cvsignore grace.spec sources 
Log Message:
* Mon Sep 29 2008 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.22-1
- new upstream release (5.1.22)
- apply debian patches with -p1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grace/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Jan 2008 09:26:08 -0000	1.6
+++ .cvsignore	29 Sep 2008 19:18:54 -0000	1.7
@@ -1,2 +1,2 @@
-grace_5.1.21-2.diff.gz
-grace-5.1.21.tar.gz
+grace-5.1.22.tar.gz
+grace_5.1.22-1.diff.gz


Index: grace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grace/F-9/grace.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- grace.spec	14 Feb 2008 16:03:23 -0000	1.23
+++ grace.spec	29 Sep 2008 19:18:54 -0000	1.24
@@ -2,8 +2,8 @@
 %define type1fontdir fonts/default/Type1
 
 Name:           grace
-Version:        5.1.21
-Release:        9%{?dist}
+Version:        5.1.22
+Release:        1%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPLv2+
@@ -16,7 +16,7 @@
 Source4:        LICENSE.cephes
 Patch0:         %{name}-gracerc-no_auxiliary.diff
 Patch1:         %{name}-detect-netcdf.diff
-Patch2:         http://ftp.de.debian.org/debian/pool/main/g/grace/grace_5.1.21-2.diff.gz
+Patch2:         http://ftp.de.debian.org/debian/pool/main/g/grace/grace_5.1.22-1.diff.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group:          Applications/Engineering
 
@@ -65,7 +65,7 @@
 
 # avoid duplicating debian patch
 %patch2 -p1
-patch -p0 < debian/patches/tmpnam_to_mkstemp.diff
+patch -p1 < debian/patches/tmpnam_to_mkstemp.diff
 
 # remove stripping option to have meaningfull debuginfo packages
 sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' */Makefile
@@ -225,6 +225,10 @@
 
 
 %changelog
+* Mon Sep 29 2008 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.22-1
+- new upstream release (5.1.22)
+- apply debian patches with -p1
+
 * Thu Feb 14 2008 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-9
 - Rebuild for gcc 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grace/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jan 2008 09:26:08 -0000	1.6
+++ sources	29 Sep 2008 19:18:54 -0000	1.7
@@ -1,2 +1,2 @@
-b82590debb07fc229ae7b003b503959b  grace_5.1.21-2.diff.gz
-db02dee3c68179c41452e652bd469bb9  grace-5.1.21.tar.gz
+672356466f18fe59ed21a8fb44f9851d  grace-5.1.22.tar.gz
+d487c80094180c187a41b196eb45827d  grace_5.1.22-1.diff.gz



From notting at fedoraproject.org  Mon Sep 29 19:30:14 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon, 29 Sep 2008 19:30:14 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.121,1.122
Message-ID: <20080929193014.D8A5170110@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23773

Modified Files:
	comps-f10.xml.in 
Log Message:
make libsane-hpaio default (#444016)


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- comps-f10.xml.in	29 Sep 2008 11:05:46 -0000	1.121
+++ comps-f10.xml.in	29 Sep 2008 19:29:43 -0000	1.122
@@ -2137,6 +2137,7 @@
       <packagereq type="default">f-spot</packagereq>
       <packagereq type="default">gimp</packagereq>
       <packagereq type="default">gimp-help</packagereq>
+      <packagereq type="default">libsane-hpaio</packagereq>
       <packagereq type="default">xsane</packagereq>
       <packagereq type="default">xsane-gimp</packagereq>
       <packagereq type="optional">agave</packagereq>
@@ -2169,7 +2170,6 @@
       <packagereq type="optional">kipi-plugins</packagereq>
       <packagereq type="optional">koffice-krita</packagereq>
       <packagereq type="optional">kphotoalbum</packagereq>
-      <packagereq type="optional">libsane-hpaio</packagereq>
       <packagereq type="optional">mirage</packagereq>
       <packagereq type="optional">netpbm-progs</packagereq>
       <packagereq type="optional">nip2</packagereq>



From hedayat at fedoraproject.org  Mon Sep 29 19:32:44 2008
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Mon, 29 Sep 2008 19:32:44 +0000 (UTC)
Subject: rpms/rcssserver3d/devel rcssserver3d.desktop, 1.1,
	1.2 rcssserver3d.spec, 1.2, 1.3
Message-ID: <20080929193244.E1F3770110@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23927

Modified Files:
	rcssserver3d.desktop rcssserver3d.spec 
Log Message:
Fixed .desktop file
Updated to build against ODE 0.10



Index: rcssserver3d.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver3d/devel/rcssserver3d.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rcssserver3d.desktop	4 Aug 2008 20:01:36 -0000	1.1
+++ rcssserver3d.desktop	29 Sep 2008 19:32:13 -0000	1.2
@@ -6,5 +6,5 @@
 Icon=rcssserver3d
 Terminal=false
 Type=Application
-Categories=Education;Science;Robotics
+Categories=Education;Science;Robotics;
 


Index: rcssserver3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver3d/devel/rcssserver3d.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rcssserver3d.spec	13 Aug 2008 21:36:00 -0000	1.2
+++ rcssserver3d.spec	29 Sep 2008 19:32:13 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           rcssserver3d
 Version:        0.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Robocup 3D Soccer Simulation Server
 
 Group:          Applications/System
@@ -13,6 +13,7 @@
 Source2:        %{name}.desktop
 Source3:        %{name}-rsgedit.desktop
 Patch0:         %{name}-0.6-libnamefix.patch
+Patch1:         %{name}-0.6-odefix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  automake autoconf gcc-c++ boost-devel slang-devel
@@ -81,6 +82,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .libnamefix
+%patch1 -p1 -b .odefix
 autoreconf --install
 chmod a-x app/simspark/rsg/agent/nao/*
 find -name "*.cpp" -exec chmod a-x {} \;
@@ -164,6 +166,10 @@
 %endif
 
 %changelog
+* Mon Sep 29 2008 Hedayat Vatankhah <hedayat at grad.com> 0.6-5
+- Rebuilding the package to use ODE 0.10.
+- Added dInitODE patch for physicsserver.cpp
+
 * Thu Aug 14 2008 Hedayat Vatankhah <hedayat at grad.com> 0.6-4
 - Rebuilding the package because of new boost libraries.
 



From kkofler at fedoraproject.org  Mon Sep 29 19:33:29 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 29 Sep 2008 19:33:29 +0000 (UTC)
Subject: rpms/kdepim/F-8 kdepim-3.5.10-kabcdistlistupdater.patch, NONE,
	1.1 kdepim.spec, 1.150, 1.151
Message-ID: <20080929193329.E907C70110@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24159/F-8

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-3.5.10-kabcdistlistupdater.patch 
Log Message:
* Mon Sep 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-2
- add converter for old kabc distribution lists (#464622)

kdepim-3.5.10-kabcdistlistupdater.patch:

--- NEW FILE kdepim-3.5.10-kabcdistlistupdater.patch ---
Index: kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
===================================================================
--- kabc/kabcdistlistupdater/kabcdistlistupdater.cpp	(revision 0)
+++ kabc/kabcdistlistupdater/kabcdistlistupdater.cpp	(revision 856958)
@@ -0,0 +1,95 @@
+/*
+    This file is part of libkabc.
+    Copyright (c) 2008 Tobias Koenig <tokoe at kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#include <kaboutdata.h>
+#include <kapplication.h>
+#include <kcmdlineargs.h>
+#include <ksimpleconfig.h>
+#include <kdebug.h>
+#include <kglobal.h>
+#include <klocale.h>
+#include <kstandarddirs.h>
+
+#include <kabc/stdaddressbook.h>
+#include <libkdepim/distributionlist.h>
+
+static const KCmdLineOptions options[] =
+{
+  { "disable-autostart", "Disable automatic startup on login", 0 },
+  KCmdLineLastOption
+};
+
+void convertDistributionLists()
+{
+  KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) );
+  const QMap<QString, QString> entryMap = cfg.entryMap( "DistributionLists" );
+
+  if ( entryMap.isEmpty() ) // nothing to convert
+    return;
+
+  QMapConstIterator<QString, QString> it;
+  for ( it = entryMap.begin(); it != entryMap.end(); ++it ) {
+    const QString listName = it.key();
+    const QStringList entries = QStringList::split( ',', it.data(), true );
+
+    KPIM::DistributionList distList;
+    distList.setUid( KApplication::randomString( 10 ) );
+    distList.setName( listName );
+
+    if ( entries.count() > 1 ) {
+      for ( uint i = 0; i < entries.count(); i += 2 ) {
+        const QString uid = entries[ i ];
+        const QString preferredEMail = entries[ i + 1 ];
+
+        distList.insertEntry( uid, preferredEMail );
+      }
+    }
+
+    KABC::StdAddressBook::self()->insertAddressee( distList );
+  }
+
+  KABC::StdAddressBook::self()->save();
+}
+
+int main( int argc, char **argv )
+{
+  KApplication::disableAutoDcopRegistration();
+
+  KAboutData aboutData( "kabcdistlistupdater", "Converter tool for distribution lists", "0.1" );
+  aboutData.addAuthor( "Tobias Koenig", 0, "tokoe at kde.org" );
+
+  KCmdLineArgs::init( argc, argv, &aboutData );
+  KCmdLineArgs::addCmdLineOptions( options );
+
+  KApplication app( false, false );
+
+  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+
+  if ( args->isSet( "disable-autostart" ) ) {
+    kdDebug() << "Disable autostart." << endl;
+
+    KConfig *config = app.config();
+    config->setGroup( "Startup" );
+    config->writeEntry( "EnableAutostart", false );
+  }
+
+  convertDistributionLists();
+}
+
Index: kabc/kabcdistlistupdater/Makefile.am
===================================================================
--- kabc/kabcdistlistupdater/Makefile.am	(revision 0)
+++ kabc/kabcdistlistupdater/Makefile.am	(revision 856958)
@@ -0,0 +1,12 @@
+INCLUDES = -I$(includedir)/kabc -I$(top_srcdir) $(all_includes)
+
+METASOURCES = AUTO
+
+bin_PROGRAMS = kabcdistlistupdater
+
+kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kabcdistlistupdater_LDADD = $(LIB_KABC) $(top_builddir)/libkdepim/libkdepim.la
+kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp
+
+autostart_DATA = kabcdistlistupdater.desktop
+autostartdir = $(datadir)/autostart
Index: kabc/kabcdistlistupdater/kabcdistlistupdater.desktop
===================================================================
--- kabc/kabcdistlistupdater/kabcdistlistupdater.desktop	(revision 0)
+++ kabc/kabcdistlistupdater/kabcdistlistupdater.desktop	(revision 856958)
@@ -0,0 +1,11 @@
+# KDE Config File
+[Desktop Entry]
+Name=kabcdistlistupdater
+Exec=kabcdistlistupdater --disable-autostart
+Icon=misc
+Type=Application
+Comment=Tool to update the old distribution lists to the new ones.
+Terminal=false
+NoDisplay=true
+X-KDE-autostart-condition=kabcdistlistupdaterrc:Startup:EnableAutostart:true
+OnlyShowIn=KDE;
Index: kabc/Makefile.am
===================================================================
--- kabc/Makefile.am	(revision 856957)
+++ kabc/Makefile.am	(revision 856958)
@@ -1 +1,5 @@
-SUBDIRS = kabc2mutt
+if compile_newdistrlists
+KABCDISTLISTUPDATER=kabcdistlistupdater
+endif
+
+SUBDIRS = kabc2mutt $(KABCDISTLISTUPDATER)


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-8/kdepim.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- kdepim.spec	4 Sep 2008 09:18:47 -0000	1.150
+++ kdepim.spec	29 Sep 2008 19:32:59 -0000	1.151
@@ -17,12 +17,12 @@
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 3.5.10
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:	 http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
 Source10: cr48-app-kandy.png
@@ -40,6 +40,11 @@
 # LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.9/kdepim/kitchensync at 774532 \
 # svn://anonsvn.kde.org/home/kde/branches/work/kitchensync-OpenSync0.30API at 774532 >kdepim-3.5.9-opensync03.patch
 Patch3: kdepim-3.5.9-opensync03.patch
+# add converter for old kabc distribution lists
+# http://websvn.kde.org/?view=rev&revision=856958
+# http://bugs.kde.org/show_bug.cgi?id=170259
+# https://bugzilla.redhat.com/show_bug.cgi?id=464622
+Patch100: kdepim-3.5.10-kabcdistlistupdater.patch
 
 Provides: kdepim3 = %{version}-%{release}
 
@@ -141,6 +146,7 @@
 %patch2 -p1 -b .xdg_open
 %patch6 -p0 -b .gnokii
 %patch7 -p1 -b .metakit_sparc64
+%patch100 -p0 -b .kabcdistlistupdater
 
 %if 0%{?fedora} > 8
 pushd kitchensync
@@ -271,7 +277,10 @@
 
 
 %changelog
-* Mon Sep 01 2008 Than Ngo <than at redhat.com> 3.5.10-1
+* Mon Sep 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-2
+- add converter for old kabc distribution lists (#464622)
+
+* Mon Sep 01 2008 Than Ngo <than at redhat.com> - 6:3.5.10-1
 - 3.5.10
 
 * Thu Jun 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-10.1



From kkofler at fedoraproject.org  Mon Sep 29 19:33:30 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 29 Sep 2008 19:33:30 +0000 (UTC)
Subject: rpms/kdepim/F-9 kdepim-3.5.10-kabcdistlistupdater.patch, NONE,
	1.1 kdepim.spec, 1.172, 1.173
Message-ID: <20080929193330.3C64770110@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24159/F-9

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-3.5.10-kabcdistlistupdater.patch 
Log Message:
* Mon Sep 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-2
- add converter for old kabc distribution lists (#464622)

kdepim-3.5.10-kabcdistlistupdater.patch:

--- NEW FILE kdepim-3.5.10-kabcdistlistupdater.patch ---
Index: kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
===================================================================
--- kabc/kabcdistlistupdater/kabcdistlistupdater.cpp	(revision 0)
+++ kabc/kabcdistlistupdater/kabcdistlistupdater.cpp	(revision 856958)
@@ -0,0 +1,95 @@
+/*
+    This file is part of libkabc.
+    Copyright (c) 2008 Tobias Koenig <tokoe at kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#include <kaboutdata.h>
+#include <kapplication.h>
+#include <kcmdlineargs.h>
+#include <ksimpleconfig.h>
+#include <kdebug.h>
+#include <kglobal.h>
+#include <klocale.h>
+#include <kstandarddirs.h>
+
+#include <kabc/stdaddressbook.h>
+#include <libkdepim/distributionlist.h>
+
+static const KCmdLineOptions options[] =
+{
+  { "disable-autostart", "Disable automatic startup on login", 0 },
+  KCmdLineLastOption
+};
+
+void convertDistributionLists()
+{
+  KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) );
+  const QMap<QString, QString> entryMap = cfg.entryMap( "DistributionLists" );
+
+  if ( entryMap.isEmpty() ) // nothing to convert
+    return;
+
+  QMapConstIterator<QString, QString> it;
+  for ( it = entryMap.begin(); it != entryMap.end(); ++it ) {
+    const QString listName = it.key();
+    const QStringList entries = QStringList::split( ',', it.data(), true );
+
+    KPIM::DistributionList distList;
+    distList.setUid( KApplication::randomString( 10 ) );
+    distList.setName( listName );
+
+    if ( entries.count() > 1 ) {
+      for ( uint i = 0; i < entries.count(); i += 2 ) {
+        const QString uid = entries[ i ];
+        const QString preferredEMail = entries[ i + 1 ];
+
+        distList.insertEntry( uid, preferredEMail );
+      }
+    }
+
+    KABC::StdAddressBook::self()->insertAddressee( distList );
+  }
+
+  KABC::StdAddressBook::self()->save();
+}
+
+int main( int argc, char **argv )
+{
+  KApplication::disableAutoDcopRegistration();
+
+  KAboutData aboutData( "kabcdistlistupdater", "Converter tool for distribution lists", "0.1" );
+  aboutData.addAuthor( "Tobias Koenig", 0, "tokoe at kde.org" );
+
+  KCmdLineArgs::init( argc, argv, &aboutData );
+  KCmdLineArgs::addCmdLineOptions( options );
+
+  KApplication app( false, false );
+
+  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+
+  if ( args->isSet( "disable-autostart" ) ) {
+    kdDebug() << "Disable autostart." << endl;
+
+    KConfig *config = app.config();
+    config->setGroup( "Startup" );
+    config->writeEntry( "EnableAutostart", false );
+  }
+
+  convertDistributionLists();
+}
+
Index: kabc/kabcdistlistupdater/Makefile.am
===================================================================
--- kabc/kabcdistlistupdater/Makefile.am	(revision 0)
+++ kabc/kabcdistlistupdater/Makefile.am	(revision 856958)
@@ -0,0 +1,12 @@
+INCLUDES = -I$(includedir)/kabc -I$(top_srcdir) $(all_includes)
+
+METASOURCES = AUTO
+
+bin_PROGRAMS = kabcdistlistupdater
+
+kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kabcdistlistupdater_LDADD = $(LIB_KABC) $(top_builddir)/libkdepim/libkdepim.la
+kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp
+
+autostart_DATA = kabcdistlistupdater.desktop
+autostartdir = $(datadir)/autostart
Index: kabc/kabcdistlistupdater/kabcdistlistupdater.desktop
===================================================================
--- kabc/kabcdistlistupdater/kabcdistlistupdater.desktop	(revision 0)
+++ kabc/kabcdistlistupdater/kabcdistlistupdater.desktop	(revision 856958)
@@ -0,0 +1,11 @@
+# KDE Config File
+[Desktop Entry]
+Name=kabcdistlistupdater
+Exec=kabcdistlistupdater --disable-autostart
+Icon=misc
+Type=Application
+Comment=Tool to update the old distribution lists to the new ones.
+Terminal=false
+NoDisplay=true
+X-KDE-autostart-condition=kabcdistlistupdaterrc:Startup:EnableAutostart:true
+OnlyShowIn=KDE;
Index: kabc/Makefile.am
===================================================================
--- kabc/Makefile.am	(revision 856957)
+++ kabc/Makefile.am	(revision 856958)
@@ -1 +1,5 @@
-SUBDIRS = kabc2mutt
+if compile_newdistrlists
+KABCDISTLISTUPDATER=kabcdistlistupdater
+endif
+
+SUBDIRS = kabc2mutt $(KABCDISTLISTUPDATER)


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-9/kdepim.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- kdepim.spec	4 Sep 2008 09:14:38 -0000	1.172
+++ kdepim.spec	29 Sep 2008 19:33:00 -0000	1.173
@@ -17,12 +17,12 @@
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 3.5.10
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:	 http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
 Source10: cr48-app-kandy.png
@@ -40,6 +40,11 @@
 # LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.9/kdepim/kitchensync at 774532 \
 # svn://anonsvn.kde.org/home/kde/branches/work/kitchensync-OpenSync0.30API at 774532 >kdepim-3.5.9-opensync03.patch
 Patch3: kdepim-3.5.9-opensync03.patch
+# add converter for old kabc distribution lists
+# http://websvn.kde.org/?view=rev&revision=856958
+# http://bugs.kde.org/show_bug.cgi?id=170259
+# https://bugzilla.redhat.com/show_bug.cgi?id=464622
+Patch100: kdepim-3.5.10-kabcdistlistupdater.patch
 
 Provides: kdepim3 = %{version}-%{release}
 
@@ -141,6 +146,7 @@
 %patch2 -p1 -b .xdg_open
 %patch6 -p0 -b .gnokii
 %patch7 -p1 -b .metakit_sparc64
+%patch100 -p0 -b .kabcdistlistupdater
 
 %if 0%{?fedora} > 8
 pushd kitchensync
@@ -271,7 +277,10 @@
 
 
 %changelog
-* Mon Sep 01 2008 Than Ngo <than at redhat.com> 3.5.10-1
+* Mon Sep 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-2
+- add converter for old kabc distribution lists (#464622)
+
+* Mon Sep 01 2008 Than Ngo <than at redhat.com> - 6:3.5.10-1
 - 3.5.10
 
 * Thu Jun 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-10.1



From hedayat at fedoraproject.org  Mon Sep 29 19:35:39 2008
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Mon, 29 Sep 2008 19:35:39 +0000 (UTC)
Subject: rpms/rcssserver3d/devel rcssserver3d-0.6-odefix.patch,NONE,1.1
Message-ID: <20080929193539.14A7870110@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24464

Added Files:
	rcssserver3d-0.6-odefix.patch 
Log Message:
added odefix patch

rcssserver3d-0.6-odefix.patch:

--- NEW FILE rcssserver3d-0.6-odefix.patch ---
diff -up rcssserver3d-0.6/lib/oxygen/physicsserver/physicsserver.cpp.odefix rcssserver3d-0.6/lib/oxygen/physicsserver/physicsserver.cpp
--- rcssserver3d-0.6/lib/oxygen/physicsserver/physicsserver.cpp.odefix	2008-02-24 13:47:31.000000000 +0330
+++ rcssserver3d-0.6/lib/oxygen/physicsserver/physicsserver.cpp	2008-09-29 22:45:33.000000000 +0330
@@ -26,6 +26,7 @@ using namespace oxygen;
 PhysicsServer::PhysicsServer()
     : Leaf()
 {
+    dInitODE();
 }
 
 PhysicsServer::~PhysicsServer()



From nhorman at fedoraproject.org  Mon Sep 29 19:46:09 2008
From: nhorman at fedoraproject.org (Neil Horman)
Date: Mon, 29 Sep 2008 19:46:09 +0000 (UTC)
Subject: rpms/numactl/devel .cvsignore, 1.6, 1.7 numactl.spec, 1.53,
	1.54 sources, 1.6, 1.7
Message-ID: <20080929194610.04B2070110@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/numactl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25292

Modified Files:
	.cvsignore numactl.spec sources 
Log Message:
Updating numactl to 2.0.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/numactl/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 May 2008 13:12:38 -0000	1.6
+++ .cvsignore	29 Sep 2008 19:45:39 -0000	1.7
@@ -1,5 +1 @@
-numactl-0.6.4.tar.gz
-numactl-0.6.4
-numactl-0.9.8.tar.gz
-numactl-1.0.2.tar.gz
-numactl-2.0.0.tar.gz
+numactl-2.0.2.tar.gz


Index: numactl.spec
===================================================================
RCS file: /cvs/extras/rpms/numactl/devel/numactl.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- numactl.spec	11 Aug 2008 20:33:40 -0000	1.53
+++ numactl.spec	29 Sep 2008 19:45:39 -0000	1.54
@@ -1,11 +1,11 @@
 Name:		numactl
 Summary:	Library for tuning for Non Uniform Memory Access machines
-Version:	2.0.0
-Release:	2%{dist} 
-License:	LGPLv2 and GPLv2
+Version:	2.0.2
+Release:	1%{dist} 
+License:	LGPLv2/GPLv2
 Group: 		System Environment/Base
-URL: 		ftp://ftp.suse.com/pub/people/ak/numa/
-Source0: 	ftp://ftp.suse.com/pub/people/ak/numa/numactl-%{version}.tar.gz 
+URL:		ftp://oss.sgi.com/www/projects/libnuma/download
+Source0: 	ftp://oss.sgi.com/www/projects/libnuma/download/numactl-%{version}.tar.gz 
 Buildroot:	%{_tmppath}/%{name}-buildroot
 
 ExcludeArch: s390 s390x
@@ -54,25 +54,23 @@
 %{_bindir}/numademo
 %{_bindir}/numastat
 %{_bindir}/memhog
-%{_bindir}/migratepages
 %{_bindir}/migspeed
+%{_bindir}/migratepages
 %{_mandir}/man5/*.5*
 %{_mandir}/man8/*.8*
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libnuma.so
+%{_libdir}/libnuma.a
 %{_includedir}/numa.h
 %{_includedir}/numaif.h
 %{_includedir}/numacompat1.h
 %{_mandir}/man3/*.3*
 
 %changelog
-* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.0-2
-- fix license tag
-
-* Thu May 08 2008 Neil Horman <nhorman at redhat.com> - 2.0.0-1
-- Move to numactl 2.0.0
+* Mon Sep 29 2008 Neil Horman <nhorman at redhat.com> - 2.0.2-1
+- Update rawhide to version 2.0.2 of numactl
 
 * Fri Apr 25 2008 Neil Horman <nhorman at redhat.com> - 1.0.2-6
 - Fix buffer size passing and arg sanity check for physcpubind (bz 442521)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/numactl/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 May 2008 13:12:38 -0000	1.6
+++ sources	29 Sep 2008 19:45:39 -0000	1.7
@@ -1 +1 @@
-0186d5b5bc443cd7cb179014a4a216c0  numactl-2.0.0.tar.gz
+82fe5bba94368850c8f5ffd0752b500b  numactl-2.0.2.tar.gz



From dcantrel at fedoraproject.org  Mon Sep 29 19:14:01 2008
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Mon, 29 Sep 2008 19:14:01 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp.spec,1.221,1.222
Message-ID: <20080929191401.E2A2270110@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22525

Modified Files:
	dhcp.spec 
Log Message:
* Mon Sep 29 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-25
- Fix dhcpd so it can find configuration data via LDAP (#452985)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- dhcp.spec	29 Sep 2008 19:09:29 -0000	1.221
+++ dhcp.spec	29 Sep 2008 19:13:30 -0000	1.222
@@ -4,7 +4,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  4.0.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.
@@ -440,10 +440,12 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
-* Mon Sep 29 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-24
-- 'server' -> 'service' in dhclient-script (#462343)
+* Mon Sep 29 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-25
 - Fix dhcpd so it can find configuration data via LDAP (#452985)
 
+* Tue Sep 16 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-24
+- 'server' -> 'service' in dhclient-script (#462343)
+
 * Fri Aug 29 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-23
 - Prevent $metric from being set to '' (#460640)
 - Remove unnecessary warning messages



From orion at fedoraproject.org  Mon Sep 29 19:46:19 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 29 Sep 2008 19:46:19 +0000 (UTC)
Subject: rpms/kdesvn/devel .cvsignore, 1.21, 1.22 kdesvn.spec, 1.43,
	1.44 sources, 1.21, 1.22
Message-ID: <20080929194619.5355C70110@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/kdesvn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25330

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
* Mon Sep 29 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.0.2-1
- Update to 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	11 Aug 2008 16:04:40 -0000	1.21
+++ .cvsignore	29 Sep 2008 19:45:48 -0000	1.22
@@ -1 +1 @@
-kdesvn-1.0.0.tar.bz2
+kdesvn-1.0.2.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kdesvn.spec	11 Aug 2008 16:37:09 -0000	1.43
+++ kdesvn.spec	29 Sep 2008 19:45:49 -0000	1.44
@@ -1,12 +1,12 @@
 Name:           kdesvn
-Version:        1.0.0
+Version:        1.0.2
 Release:        1%{?dist}
 Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
 License:        GPLv2+
-URL:            http://kdesvn.alwins-world.de/trac.fcgi
-Source0:        http://kdesvn.alwins-world.de/trac.fcgi/downloads/kdesvn-%{version}.tar.bz2
+URL:            http://kdesvn.alwins-world.de/
+Source0:        http://kdesvn.alwins-world.de/downloads/kdesvn-%{version}.tar.bz2
 #Reported upstream: http://kdesvn.alwins-world.de/trac.fcgi/ticket/246
 Patch0:         kdesvn-1.0.0-asneeded.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.0.2-1
+- Update to 1.0.2
+
 * Thu Aug 7 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.0.0-1
 - Update to 1.0.0
 - Drop png patch applied upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	11 Aug 2008 16:04:40 -0000	1.21
+++ sources	29 Sep 2008 19:45:49 -0000	1.22
@@ -1 +1 @@
-169c7d012757447908a920b767adb720  kdesvn-1.0.0.tar.bz2
+b33a98229444a3e81d0335e59927f4cb  kdesvn-1.0.2.tar.bz2



From kkofler at fedoraproject.org  Mon Sep 29 19:50:38 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 29 Sep 2008 19:50:38 +0000 (UTC)
Subject: rpms/kdepim/F-9 kdepim-3.5.10-kabcdistlistupdater.patch, 1.1,
	1.2 kdepim.spec, 1.173, 1.174
Message-ID: <20080929195038.07F2F70110@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25981/F-9

Modified Files:
	kdepim-3.5.10-kabcdistlistupdater.patch kdepim.spec 
Log Message:
Fix build.

kdepim-3.5.10-kabcdistlistupdater.patch:

Index: kdepim-3.5.10-kabcdistlistupdater.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-9/kdepim-3.5.10-kabcdistlistupdater.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdepim-3.5.10-kabcdistlistupdater.patch	29 Sep 2008 19:33:00 -0000	1.1
+++ kdepim-3.5.10-kabcdistlistupdater.patch	29 Sep 2008 19:50:37 -0000	1.2
@@ -142,3 +142,15 @@
 +endif
 +
 +SUBDIRS = kabc2mutt $(KABCDISTLISTUPDATER)
+Index: Makefile.am.in
+===================================================================
+--- Makefile.am.in	(revision 858692)
++++ Makefile.am.in	(revision 858693)
+@@ -38,6 +38,7 @@
+ COMPILE_BEFORE_akregator = libkdepim
+ COMPILE_BEFORE_knotes = libkdepim
+ COMPILE_BEFORE_konsolekalendar = libkdepim
++COMPILE_BEFORE_kabc = libkdepim
+ 
+ AUTOMAKE_OPTIONS = foreign 1.6.1
+ DISTCLEANFILES = inst-apps


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-9/kdepim.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- kdepim.spec	29 Sep 2008 19:33:00 -0000	1.173
+++ kdepim.spec	29 Sep 2008 19:50:37 -0000	1.174
@@ -42,6 +42,7 @@
 Patch3: kdepim-3.5.9-opensync03.patch
 # add converter for old kabc distribution lists
 # http://websvn.kde.org/?view=rev&revision=856958
+# build fix for the above: http://websvn.kde.org/?view=rev&revision=858693
 # http://bugs.kde.org/show_bug.cgi?id=170259
 # https://bugzilla.redhat.com/show_bug.cgi?id=464622
 Patch100: kdepim-3.5.10-kabcdistlistupdater.patch



From kkofler at fedoraproject.org  Mon Sep 29 19:51:07 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 29 Sep 2008 19:51:07 +0000 (UTC)
Subject: rpms/kdepim/F-8 kdepim-3.5.10-kabcdistlistupdater.patch, 1.1,
	1.2 kdepim.spec, 1.151, 1.152
Message-ID: <20080929195107.ADFCB70110@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25981/F-8

Modified Files:
	kdepim-3.5.10-kabcdistlistupdater.patch kdepim.spec 
Log Message:
Fix build.

kdepim-3.5.10-kabcdistlistupdater.patch:

Index: kdepim-3.5.10-kabcdistlistupdater.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-8/kdepim-3.5.10-kabcdistlistupdater.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdepim-3.5.10-kabcdistlistupdater.patch	29 Sep 2008 19:32:59 -0000	1.1
+++ kdepim-3.5.10-kabcdistlistupdater.patch	29 Sep 2008 19:50:37 -0000	1.2
@@ -142,3 +142,15 @@
 +endif
 +
 +SUBDIRS = kabc2mutt $(KABCDISTLISTUPDATER)
+Index: Makefile.am.in
+===================================================================
+--- Makefile.am.in	(revision 858692)
++++ Makefile.am.in	(revision 858693)
+@@ -38,6 +38,7 @@
+ COMPILE_BEFORE_akregator = libkdepim
+ COMPILE_BEFORE_knotes = libkdepim
+ COMPILE_BEFORE_konsolekalendar = libkdepim
++COMPILE_BEFORE_kabc = libkdepim
+ 
+ AUTOMAKE_OPTIONS = foreign 1.6.1
+ DISTCLEANFILES = inst-apps


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-8/kdepim.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- kdepim.spec	29 Sep 2008 19:32:59 -0000	1.151
+++ kdepim.spec	29 Sep 2008 19:50:37 -0000	1.152
@@ -42,6 +42,7 @@
 Patch3: kdepim-3.5.9-opensync03.patch
 # add converter for old kabc distribution lists
 # http://websvn.kde.org/?view=rev&revision=856958
+# build fix for the above: http://websvn.kde.org/?view=rev&revision=858693
 # http://bugs.kde.org/show_bug.cgi?id=170259
 # https://bugzilla.redhat.com/show_bug.cgi?id=464622
 Patch100: kdepim-3.5.10-kabcdistlistupdater.patch



From orion at fedoraproject.org  Mon Sep 29 19:56:55 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 29 Sep 2008 19:56:55 +0000 (UTC)
Subject: rpms/kdesvn/devel kdesvn.spec,1.44,1.45
Message-ID: <20080929195655.857E370110@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/kdesvn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26304

Modified Files:
	kdesvn.spec 
Log Message:
- Add BR sqlite-devel needed for Qt3 build



Index: kdesvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kdesvn.spec	29 Sep 2008 19:45:49 -0000	1.44
+++ kdesvn.spec	29 Sep 2008 19:56:25 -0000	1.45
@@ -12,6 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  subversion-devel, kdelibs3-devel, neon-devel, cmake, gettext
+BuildRequires:  sqlite-devel
 BuildRequires:  desktop-file-utils
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -125,6 +126,7 @@
 %changelog
 * Mon Sep 29 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.0.2-1
 - Update to 1.0.2
+- Add BR sqlite-devel needed for Qt3 build
 
 * Thu Aug 7 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.0.0-1
 - Update to 1.0.0



From orion at fedoraproject.org  Mon Sep 29 20:09:13 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 29 Sep 2008 20:09:13 +0000 (UTC)
Subject: rpms/kdesvn/F-9 kdesvn-1.0.0-asneeded.patch, NONE, 1.1 .cvsignore, 
	1.18, 1.19 kdesvn.spec, 1.38, 1.39 sources, 1.18,
	1.19 kdesvn-0.14.1-asneeded.patch, 1.1,
	NONE kdesvn-0.14.1-png.patch, 1.1, NONE
Message-ID: <20080929200913.7CE9170110@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/kdesvn/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27518

Modified Files:
	.cvsignore kdesvn.spec sources 
Added Files:
	kdesvn-1.0.0-asneeded.patch 
Removed Files:
	kdesvn-0.14.1-asneeded.patch kdesvn-0.14.1-png.patch 
Log Message:
* Mon Sep 29 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.0.2-1
- Update to 1.0.2
- Add BR sqlite-devel needed for Qt3 build
- Drop png patch applied upstream
- Update asneeded patch
- Handle multiple languages


kdesvn-1.0.0-asneeded.patch:

--- NEW FILE kdesvn-1.0.0-asneeded.patch ---
--- kdesvn-1.0.0/src/CMakeLists.txt.asneeded	2008-06-20 16:27:30.000000000 -0600
+++ kdesvn-1.0.0/src/CMakeLists.txt	2008-08-07 09:16:09.000000000 -0600
@@ -37,7 +37,7 @@
     ${QT_AND_KDECORE_LIBS} ${KDE3_KIO_LIBRARY} ${KDE3_PART_LIBRARY} ${KDE3_UI_LIBRARY} ${KDE3_WALLET_LIBRARY} )
 SET_TARGET_PROPERTIES(kdesvnpart
     PROPERTIES
-    LINK_FLAGS "${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} ${LINK_NO_UNDEFINED}")
+    LINK_FLAGS "${_BASE_LDADD} ${APR_EXTRA_LDFLAGS} ${APU_EXTRA_LDFLAGS} ${LINK_NO_UNDEFINED}")
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src/svnqt)
 
--- kdesvn-1.0.0/src/svnqt/CMakeLists.txt.asneeded	2008-06-06 08:48:44.000000000 -0600
+++ kdesvn-1.0.0/src/svnqt/CMakeLists.txt	2008-08-07 09:16:09.000000000 -0600
@@ -177,9 +177,8 @@
     SOVERSION ${LIB_MAJOR}
     VERSION ${_soversion})
 
-SET(ALL_LINKFLAGS ${APR_EXTRA_LIBFLAGS})
-SET(ALL_LINKFLAGS "${ALL_LINKFLAGS} ${APU_EXTRA_LIBFLAGS}")
-SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
+SET(ALL_LINKFLAGS "${APR_EXTRA_LDFLAGS} ${APU_EXTRA_LDFLAGS}")
+SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "-Wl,--as-needed ${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
 TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_LIBRARIES} ${SUBVERSION_ALL_LIBS})
 
 IF (SQLITE_FOUND AND NOT QT4_FOUND)
--- kdesvn-1.0.0/src/svnqt/cmakemodules/FindSubversion.cmake.asneeded	2008-07-21 14:32:32.000000000 -0600
+++ kdesvn-1.0.0/src/svnqt/cmakemodules/FindSubversion.cmake	2008-08-07 09:16:09.000000000 -0600
@@ -58,14 +58,29 @@
     MESSAGE(SEND_ERROR "Error: no apu-config found")
   endif(NOT APU_CONFIG)
 
-  EXEC_PROGRAM(${APR_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR)
-  EXEC_PROGRAM(${APU_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR)
+  EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apr include: ${APR_INCLUDE_DIR}")
+  EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apu include: ${APU_INCLUDE_DIR}")
+
+  EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--cppflags" OUTPUT_VARIABLE APR_CPP_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apr cppflags: ${APR_CPP_FLAGS}")
+  EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--cppflags" OUTPUT_VARIABLE APU_CPP_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apu cppflags: ${APU_CPP_FLAGS}")
+
+  EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--link-ld" "--libs" OUTPUT_VARIABLE APR_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apr libs: ${APR_LIBS}")
+  SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIBS})
+
+  EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--ldflags" OUTPUT_VARIABLE APR_EXTRA_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apr extra ldflags: ${APR_EXTRA_LDFLAGS}")
+
+  EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--link-ld" "--libs" OUTPUT_VARIABLE APU_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apu libs: ${APU_LIBS}")
+  SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIBS})
 
-  EXEC_PROGRAM(${APR_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APR_CPP_FLAGS)
-  EXEC_PROGRAM(${APU_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APU_CPP_FLAGS)
-
-  EXEC_PROGRAM(${APR_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APR_EXTRA_LIBFLAGS)
-  EXEC_PROGRAM(${APU_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APU_EXTRA_LIBFLAGS)
+  EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--ldflags" OUTPUT_VARIABLE APU_EXTRA_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apu extra ldflags: ${APU_EXTRA_LIBS}")
 
   CHECK_INCLUDE_FILES(execinfo.h HAS_BACKTRACE_H)
 
@@ -180,8 +195,10 @@
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  SET(APR_EXTRA_LIBFLAGS )
-  SET(APU_EXTRA_LIBFLAGS )
+  SET(APR_EXTRA_LIBS )
+  SET(APR_EXTRA_LDFLAGS )
+  SET(APU_EXTRA_LIBS )
+  SET(APU_EXTRA_LDFLAGS )
 
 
   # check found libraries
@@ -189,7 +206,7 @@
     MESSAGE(SEND_ERROR "No apr lib found!")
   ELSE (NOT APR_LIB)
     MESSAGE(STATUS "Found apr lib: ${APR_LIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIB})
+    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIB} ${APR_EXTRA_LIBS})
   endif(NOT APR_LIB)
 
   if (NOT APRICONV_LIB)
@@ -203,7 +220,7 @@
     MESSAGE(SEND_ERROR "No aprutil lib found!")
   ELSE (NOT APU_LIB)
     MESSAGE(STATUS "Found aprutil lib: ${APU_LIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIB})
+    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIB} ${APU_EXTRA_LIBS})
   endif(NOT APU_LIB)
 
   if (NOT APU_XMLLIB)
--- kdesvn-1.0.0/src/kdesvnd/CMakeLists.txt.asneeded	2007-06-10 15:23:29.000000000 -0600
+++ kdesvn-1.0.0/src/kdesvnd/CMakeLists.txt	2008-08-07 09:16:09.000000000 -0600
@@ -23,7 +23,7 @@
 
 SET_TARGET_PROPERTIES(kded_kdesvnd
     PROPERTIES
-    LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} -avoid-version -module")
+    LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LDFLAGS} ${APU_EXTRA_LDFLAGS} -avoid-version -module")
 
 INSTALL(TARGETS kded_kdesvnd
     RUNTIME DESTINATION ${BIN_INSTALL_DIR}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-9/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	19 May 2008 18:03:01 -0000	1.18
+++ .cvsignore	29 Sep 2008 20:08:43 -0000	1.19
@@ -1 +1 @@
-kdesvn-0.14.4.tar.bz2
+kdesvn-1.0.2.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-9/kdesvn.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- kdesvn.spec	19 May 2008 18:03:01 -0000	1.38
+++ kdesvn.spec	29 Sep 2008 20:08:43 -0000	1.39
@@ -1,17 +1,18 @@
 Name:           kdesvn
-Version:        0.14.4
+Version:        1.0.2
 Release:        1%{?dist}
 Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
 License:        GPLv2+
-URL:            http://kdesvn.alwins-world.de/trac.fcgi
-Source0:        http://kdesvn.alwins-world.de/trac.fcgi/downloads/kdesvn-%{version}.tar.bz2
-Patch0:         kdesvn-0.14.1-asneeded.patch
-Patch1:         kdesvn-0.14.1-png.patch
+URL:            http://kdesvn.alwins-world.de/
+Source0:        http://kdesvn.alwins-world.de/downloads/kdesvn-%{version}.tar.bz2
+#Reported upstream: http://kdesvn.alwins-world.de/trac.fcgi/ticket/246
+Patch0:         kdesvn-1.0.0-asneeded.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  subversion-devel, kdelibs3-devel, neon-devel, cmake, gettext
+BuildRequires:  sqlite-devel
 BuildRequires:  desktop-file-utils
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -40,8 +41,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b .asneeded
-%patch1 -p1 -b .png
+%patch0 -p1 -b .asneeded
 
 
 %build
@@ -109,7 +109,7 @@
 %{_datadir}/apps/kdesvnpart/
 %{_datadir}/apps/konqueror/servicemenus/kdesvn*.desktop
 %{_datadir}/config.kcfg/kdesvn_part.kcfg
-%{_datadir}/doc/HTML/en/kdesvn/
+%{_datadir}/doc/HTML/*/kdesvn/
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/icons/hicolor/*/*/*.svgz
 %{_datadir}/services/kded/kdesvnd.desktop
@@ -124,6 +124,19 @@
 
 
 %changelog
+* Mon Sep 29 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.0.2-1
+- Update to 1.0.2
+- Add BR sqlite-devel needed for Qt3 build
+
+* Thu Aug 7 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.0.0-1
+- Update to 1.0.0
+- Drop png patch applied upstream
+- Update asneeded patch
+- Handle multiple languages
+
+* Tue Jul 15 2008 - Orion Poplawski <orion at cora.nwra.com> - 0.14.6-1
+- Update to 0.14.6
+
 * Mon May 19 2008 - Orion Poplawski <orion at cora.nwra.com> - 0.14.4-1
 - Update to 0.14.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	19 May 2008 18:03:01 -0000	1.18
+++ sources	29 Sep 2008 20:08:43 -0000	1.19
@@ -1 +1 @@
-70901a2450f74702dff99f7c0fe00a8c  kdesvn-0.14.4.tar.bz2
+b33a98229444a3e81d0335e59927f4cb  kdesvn-1.0.2.tar.bz2


--- kdesvn-0.14.1-asneeded.patch DELETED ---


--- kdesvn-0.14.1-png.patch DELETED ---



From nhorman at fedoraproject.org  Mon Sep 29 20:10:53 2008
From: nhorman at fedoraproject.org (Neil Horman)
Date: Mon, 29 Sep 2008 20:10:53 +0000 (UTC)
Subject: rpms/numactl/devel numactl-2.0.2-clearcache-fix.patch, NONE,
	1.1 numactl.spec, 1.54, 1.55
Message-ID: <20080929201053.D399B70110@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/numactl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27756

Modified Files:
	numactl.spec 
Added Files:
	numactl-2.0.2-clearcache-fix.patch 
Log Message:
Fixing build break

numactl-2.0.2-clearcache-fix.patch:

--- NEW FILE numactl-2.0.2-clearcache-fix.patch ---
diff -up numactl-2.0.2/clearcache.c.orig numactl-2.0.2/clearcache.c
--- numactl-2.0.2/clearcache.c.orig	2008-09-29 16:08:38.000000000 -0400
+++ numactl-2.0.2/clearcache.c	2008-09-29 16:08:49.000000000 -0400
@@ -57,7 +57,7 @@ void clearcache(unsigned char *mem, unsi
 #if defined(__i386__) || defined(__x86_64__)
 	unsigned i, cl, eax, feat;
 	/* get clflush unit and feature */
-	asm("cpuid" : "=a" (eax), "=b" (cl), "=d" (feat) : "0" (1) : "cx");
+	asm("cpuid" : "=a" (eax), "=r" (cl), "=d" (feat) : "0" (1) : "cx");
 	if (!(feat & (1 << 19)))
 		fallback_clearcache();
 	cl = ((cl >> 8) & 0xff) * 8;


Index: numactl.spec
===================================================================
RCS file: /cvs/extras/rpms/numactl/devel/numactl.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- numactl.spec	29 Sep 2008 19:45:39 -0000	1.54
+++ numactl.spec	29 Sep 2008 20:10:23 -0000	1.55
@@ -1,13 +1,15 @@
 Name:		numactl
 Summary:	Library for tuning for Non Uniform Memory Access machines
 Version:	2.0.2
-Release:	1%{dist} 
+Release:	2%{dist} 
 License:	LGPLv2/GPLv2
 Group: 		System Environment/Base
 URL:		ftp://oss.sgi.com/www/projects/libnuma/download
 Source0: 	ftp://oss.sgi.com/www/projects/libnuma/download/numactl-%{version}.tar.gz 
 Buildroot:	%{_tmppath}/%{name}-buildroot
 
+Patch0: numactl-2.0.2-clearcache-fix.patch
+
 ExcludeArch: s390 s390x
 
 %description
@@ -25,6 +27,7 @@
 
 %prep
 %setup -q 
+%patch0 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS -I. -fPIC"
@@ -69,6 +72,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 29 2008 Neil Horman <nhorman at redhat.com> - 2.0.2-2
+- Fix build break due to register selection in asm
+
 * Mon Sep 29 2008 Neil Horman <nhorman at redhat.com> - 2.0.2-1
 - Update rawhide to version 2.0.2 of numactl
 



From vpv at fedoraproject.org  Mon Sep 29 20:32:24 2008
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Mon, 29 Sep 2008 20:32:24 +0000 (UTC)
Subject: rpms/mozvoikko/devel mozvoikko.spec,1.2,1.3
Message-ID: <20080929203224.C5A5970110@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/mozvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29185

Modified Files:
	mozvoikko.spec 
Log Message:
* Mon Sep 29 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.5-3
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/devel/mozvoikko.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mozvoikko.spec	30 Aug 2008 16:56:58 -0000	1.2
+++ mozvoikko.spec	29 Sep 2008 20:31:54 -0000	1.3
@@ -1,5 +1,5 @@
 # For the xulrunner unstable requires
-%define gecko_ver 1.9.0.1
+%define gecko_ver 1.9.0.2
 # 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:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.5-3
+- Rebuild against newer gecko
+
 * Sat Aug 30 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.5-2
 - Fix the xulrunner requires:
   - Add define gecko_ver 1.9.0.1



From jgu at fedoraproject.org  Mon Sep 29 20:37:59 2008
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Mon, 29 Sep 2008 20:37:59 +0000 (UTC)
Subject: rpms/emacs-vm/devel emacs-vm.spec,1.30,1.31
Message-ID: <20080929203759.6A64170110@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29680

Modified Files:
	emacs-vm.spec 
Log Message:
* Mon Sep 29 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.11.581-2
- Add vm-revno.el to lisp files



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- emacs-vm.spec	27 Sep 2008 11:39:40 -0000	1.30
+++ emacs-vm.spec	29 Sep 2008 20:37:29 -0000	1.31
@@ -35,7 +35,7 @@
 Summary: Emacs VM mailreader
 Name: emacs-vm
 Version: %{vmversion}.%{devoversion}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.nongnu.org/viewmail/
@@ -77,9 +77,10 @@
 
 # Add u-vm-color.el and patch Makefile.in to byte compile u-vm-color.el
 cp %{SOURCE1} lisp
-(cd lisp
-mv Makefile.in Makefile.in.bak
-sed -e '/SOURCES =/ a SOURCES += u-vm-color.el' Makefile.in.bak > Makefile.in)
+sed -i -e '/SOURCES =/ a SOURCES += u-vm-color.el' lisp/Makefile.in
+
+# Add vm-revno.el to sources - this is missing in 8.0.11
+sed -i -e '/SOURCES =/ a SOURCES += vm-revno.el' lisp/Makefile.in
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -145,6 +146,9 @@
 %{pkgdir}/*.el
 
 %changelog
+* Mon Sep 29 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.11.581-2
+- Add vm-revno.el to lisp files
+
 * Sat Sep 27 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.11.581-1
 - Update to 8.0.11-581
 



From ovasik at fedoraproject.org  Mon Sep 29 20:38:28 2008
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 29 Sep 2008 20:38:28 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-6.12-seqdecimalutf8.patch, NONE,
	1.1 coreutils.spec, 1.225, 1.226
Message-ID: <20080929203828.7DAB570110@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29743

Modified Files:
	coreutils.spec 
Added Files:
	coreutils-6.12-seqdecimalutf8.patch 
Log Message:
seq should no longer fail to display final number of some float sequences with utf8 locales(#463556)

coreutils-6.12-seqdecimalutf8.patch:

--- NEW FILE coreutils-6.12-seqdecimalutf8.patch ---
diff -urNp coreutils-6.12-orig/src/seq.c coreutils-6.12/src/seq.c
--- coreutils-6.12-orig/src/seq.c	2008-05-26 08:40:32.000000000 +0200
+++ coreutils-6.12/src/seq.c	2008-09-29 22:09:21.000000000 +0200
@@ -304,7 +304,10 @@ print_numbers (char const *fmt, struct l
 	      bool print_extra_number = false;
 	      long double x_val;
 	      char *x_str;
-	      int x_strlen = asprintf (&x_str, fmt, x);
+	      int x_strlen;
+	      setlocale (LC_NUMERIC, "C");
+	      x_strlen = asprintf (&x_str, fmt, x);
+	      setlocale (LC_NUMERIC, ""); 
 	      if (x_strlen < 0)
 		xalloc_die ();
 	      x_str[x_strlen - layout.suffix_len] = '\0';


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- coreutils.spec	13 Aug 2008 12:59:58 -0000	1.225
+++ coreutils.spec	29 Sep 2008 20:37:58 -0000	1.226
@@ -21,6 +21,8 @@
 Patch1: coreutils-futimensatkoji.patch
 Patch2: coreutils-authors.patch
 Patch3: coreutils-who_texinfo.patch
+#Patch4: coreutils-6.12-date_timerelsnumber.patch
+Patch5: coreutils-6.12-seqdecimalutf8.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch
@@ -54,7 +56,6 @@
 #(upstream did some SELinux implementation unlike with RedHat patch)
 Patch950: coreutils-selinux.patch
 Patch951: coreutils-selinuxmanpages.patch
-Patch952: coreutils-6.11-matchpathconinstall.patch
 
 # ls enhancements (must be applied after SELINUX patches)
 Patch954: coreutils-6.12-ls-libcap.patch
@@ -69,7 +70,7 @@
 #dist-lzma required
 BuildRequires: automake >= 1.10.1 
 %{?!nopam:BuildRequires: pam-devel}
-BuildRequires: libcap-devel >= 2.0.6
+#BuildRequires: libcap-devel >= 2.0.6
 
 Requires(post): libselinux >= 1.25.6-1
 Requires(pre): /sbin/install-info
@@ -111,6 +112,8 @@
 %patch1 -p1 -b .kojifutimensat
 %patch2 -p1 -b .authors
 %patch3 -p1 -b .whotexinfo
+#%patch4 -p1 -b .getdate
+%patch5 -p1 -b .sequtf8
 
 # Our patches
 %patch100 -p1 -b .configure
@@ -329,6 +332,10 @@
 /sbin/runuser
 
 %changelog
+* Mon Sep 29 2008 Ondrej Vasik <ovasik at redhat.com> - 6.12-10
+- seq should no longer fail to display final number of some
+  float usages of seq with utf8 locales(#463556)
+
 * Wed Aug 13 2008 Ondrej Vasik <ovasik at redhat.com> - 6.12-9
 - mention that DISPLAY and XAUTHORITY envvars are preserved
   for pam_xauth in su -l (#450505)



From jgu at fedoraproject.org  Mon Sep 29 20:39:27 2008
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Mon, 29 Sep 2008 20:39:27 +0000 (UTC)
Subject: rpms/emacs-vm/F-9 emacs-vm.spec,1.30,1.31
Message-ID: <20080929203927.5995570110@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29958

Modified Files:
	emacs-vm.spec 
Log Message:
* Mon Sep 29 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.11.581-2
- Add vm-revno.el to lisp files



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/F-9/emacs-vm.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- emacs-vm.spec	27 Sep 2008 12:16:36 -0000	1.30
+++ emacs-vm.spec	29 Sep 2008 20:38:57 -0000	1.31
@@ -35,7 +35,7 @@
 Summary: Emacs VM mailreader
 Name: emacs-vm
 Version: %{vmversion}.%{devoversion}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.nongnu.org/viewmail/
@@ -77,9 +77,10 @@
 
 # Add u-vm-color.el and patch Makefile.in to byte compile u-vm-color.el
 cp %{SOURCE1} lisp
-(cd lisp
-mv Makefile.in Makefile.in.bak
-sed -e '/SOURCES =/ a SOURCES += u-vm-color.el' Makefile.in.bak > Makefile.in)
+sed -i -e '/SOURCES =/ a SOURCES += u-vm-color.el' lisp/Makefile.in
+
+# Add vm-revno.el to sources - this is missing in 8.0.11
+sed -i -e '/SOURCES =/ a SOURCES += vm-revno.el' lisp/Makefile.in
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -145,6 +146,9 @@
 %{pkgdir}/*.el
 
 %changelog
+* Mon Sep 29 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.11.581-2
+- Add vm-revno.el to lisp files
+
 * Sat Sep 27 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.11.581-1
 - Update to 8.0.11-581
 



From ovasik at fedoraproject.org  Mon Sep 29 20:39:52 2008
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 29 Sep 2008 20:39:52 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils.spec,1.226,1.227
Message-ID: <20080929203952.C65C570110@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30013

Modified Files:
	coreutils.spec 
Log Message:
readded localy disabled build requires :(


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- coreutils.spec	29 Sep 2008 20:37:58 -0000	1.226
+++ coreutils.spec	29 Sep 2008 20:39:22 -0000	1.227
@@ -70,7 +70,7 @@
 #dist-lzma required
 BuildRequires: automake >= 1.10.1 
 %{?!nopam:BuildRequires: pam-devel}
-#BuildRequires: libcap-devel >= 2.0.6
+BuildRequires: libcap-devel >= 2.0.6
 
 Requires(post): libselinux >= 1.25.6-1
 Requires(pre): /sbin/install-info



From jgu at fedoraproject.org  Mon Sep 29 20:40:33 2008
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Mon, 29 Sep 2008 20:40:33 +0000 (UTC)
Subject: rpms/emacs-vm/F-8 emacs-vm.spec,1.30,1.31
Message-ID: <20080929204033.A2C8070110@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30192

Modified Files:
	emacs-vm.spec 
Log Message:
* Mon Sep 29 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.11.581-2
- Add vm-revno.el to lisp files



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/F-8/emacs-vm.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- emacs-vm.spec	27 Sep 2008 12:17:38 -0000	1.30
+++ emacs-vm.spec	29 Sep 2008 20:40:03 -0000	1.31
@@ -35,7 +35,7 @@
 Summary: Emacs VM mailreader
 Name: emacs-vm
 Version: %{vmversion}.%{devoversion}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.nongnu.org/viewmail/
@@ -77,9 +77,10 @@
 
 # Add u-vm-color.el and patch Makefile.in to byte compile u-vm-color.el
 cp %{SOURCE1} lisp
-(cd lisp
-mv Makefile.in Makefile.in.bak
-sed -e '/SOURCES =/ a SOURCES += u-vm-color.el' Makefile.in.bak > Makefile.in)
+sed -i -e '/SOURCES =/ a SOURCES += u-vm-color.el' lisp/Makefile.in
+
+# Add vm-revno.el to sources - this is missing in 8.0.11
+sed -i -e '/SOURCES =/ a SOURCES += vm-revno.el' lisp/Makefile.in
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -145,6 +146,9 @@
 %{pkgdir}/*.el
 
 %changelog
+* Mon Sep 29 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.11.581-2
+- Add vm-revno.el to lisp files
+
 * Sat Sep 27 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.11.581-1
 - Update to 8.0.11-581
 



From ovasik at fedoraproject.org  Mon Sep 29 20:41:17 2008
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 29 Sep 2008 20:41:17 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils.spec,1.227,1.228
Message-ID: <20080929204117.332C370110@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30371

Modified Files:
	coreutils.spec 
Log Message:
release++ :(


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- coreutils.spec	29 Sep 2008 20:39:22 -0000	1.227
+++ coreutils.spec	29 Sep 2008 20:40:46 -0000	1.228
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 6.12
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/



From ovasik at fedoraproject.org  Mon Sep 29 20:43:58 2008
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 29 Sep 2008 20:43:58 +0000 (UTC)
Subject: rpms/elinks/devel .cvsignore, 1.24, 1.25 elinks.spec, 1.58,
	1.59 sources, 1.24, 1.25 elinks-0.12-bittorrent.patch, 1.1,
	NONE elinks-0.12pre1-tabreload.patch, 1.1, NONE
Message-ID: <20080929204358.8896070110@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/elinks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30744

Modified Files:
	.cvsignore elinks.spec sources 
Removed Files:
	elinks-0.12-bittorrent.patch elinks-0.12pre1-tabreload.patch 
Log Message:
New upstream bugfix only prerelease, removed already applied patches


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	2 Jul 2008 08:48:38 -0000	1.24
+++ .cvsignore	29 Sep 2008 20:43:28 -0000	1.25
@@ -1 +1 @@
-elinks-0.12pre1.tar.bz2
+elinks-0.12pre2.tar.bz2


Index: elinks.spec
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- elinks.spec	1 Sep 2008 10:51:01 -0000	1.58
+++ elinks.spec	29 Sep 2008 20:43:28 -0000	1.59
@@ -1,11 +1,11 @@
 Name:      elinks
 Summary:   A text-mode Web browser
 Version:   0.12
-Release:   0.4.pre1%{?dist}
+Release:   0.5.pre2%{?dist}
 License:   GPLv2
 URL:       http://elinks.or.cz
 Group:     Applications/Internet
-Source:    http://elinks.or.cz/download/elinks-%{version}pre1.tar.bz2
+Source:    http://elinks.or.cz/download/elinks-%{version}pre2.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: automake
@@ -28,9 +28,7 @@
 Patch5: elinks-0.10.1-xterm.patch
 Patch6: elinks-0.11.0-union.patch
 Patch7: elinks-0.11.3-macropen.patch
-Patch8: elinks-0.12pre1-tabreload.patch
-Patch9: elinks-0.12-bittorrent.patch
-Patch10: elinks-scroll.patch
+Patch8: elinks-scroll.patch
 
 %description
 Links is a text-based Web browser. Links does not display any images,
@@ -39,7 +37,7 @@
 quickly and swiftly displays Web pages.
 
 %prep
-%setup -q -n %{name}-%{version}pre1
+%setup -q -n %{name}-%{version}pre2
 
 # Prevent crash when HOME is unset (bug #90663).
 %patch0 -p1
@@ -56,12 +54,8 @@
 %patch6 -p1
 # fix for open macro in new glibc 
 %patch7 -p1
-# upstream fix for opening tab during reload
-%patch8 -p1
-#upstream fix for bittorrent
-%patch9 -p1
 #upstream fix for out of screen dialogs
-%patch10 -p1
+%patch8 -p1
 
 %build
 ./autogen.sh
@@ -92,6 +86,10 @@
 %{_mandir}/man5/*
 
 %changelog
+* Mon Sep 29 2008 Ondrej Vasik <ovasik at redhat.com> 0.12-0.5.pre2
+- new upstream bugfix prerelease
+- Removed already applied patches for tabreload and bittorrent
+
 * Mon Sep  1 2008 Ondrej Vasik <ovasik at redhat.com> 0.12-0.4.pre1
 - upstream fix for bittorrent protocol
 - upstream fix for out of screen bittorrent dialog texts


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	2 Jul 2008 08:48:38 -0000	1.24
+++ sources	29 Sep 2008 20:43:28 -0000	1.25
@@ -1 +1 @@
-23f745c33ea91f91ef5b2db385efdfff  elinks-0.12pre1.tar.bz2
+bfc2a531f633c9e25e108e5ce2d864ea  elinks-0.12pre2.tar.bz2


--- elinks-0.12-bittorrent.patch DELETED ---


--- elinks-0.12pre1-tabreload.patch DELETED ---



From lkundrak at fedoraproject.org  Mon Sep 29 20:48:09 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 29 Sep 2008 20:48:09 +0000 (UTC)
Subject: rpms/crystalspace/devel crystalspace.spec,1.7,1.8
Message-ID: <20080929204809.2D65C70110@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/crystalspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31201

Modified Files:
	crystalspace.spec 
Log Message:
* Mon Sep 29 2008 Lubomir Rintel <lkundrak at v3.sk> 1.2-8
- Rebuild for new libode



Index: crystalspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crystalspace/devel/crystalspace.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- crystalspace.spec	11 Jul 2008 06:42:06 -0000	1.7
+++ crystalspace.spec	29 Sep 2008 20:47:38 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           crystalspace
 Version:        1.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Crystal Space a free 3D engine
 Group:          System Environment/Libraries
 # most of crystalspace is LGPLv2+, but the sndsys class (and its plugins) and
@@ -210,6 +210,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Lubomir Rintel <lkundrak at v3.sk> 1.2-8
+- Rebuild for new libode
+
 * Fri Jul 11 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-7
 - Rebuild for new cegui
 



From rmeggins at fedoraproject.org  Mon Sep 29 20:57:55 2008
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Mon, 29 Sep 2008 20:57:55 +0000 (UTC)
Subject: rpms/fedora-ds-base/devel bug463991-bdb47.patch, NONE,
	1.1 fedora-ds-base.spec, 1.20, 1.21 bug439829.patch, 1.1, NONE
Message-ID: <20080929205755.6CF6F70110@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32431

Modified Files:
	fedora-ds-base.spec 
Added Files:
	bug463991-bdb47.patch 
Removed Files:
	bug439829.patch 
Log Message:
add patch to allow building on rawhide with bdb 4.7 - remove obsolete patch file

bug463991-bdb47.patch:

--- NEW FILE bug463991-bdb47.patch ---
Index: ldap/servers/slapd/back-ldbm/back-ldbm.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/back-ldbm.h,v
retrieving revision 1.15
diff -u -8 -r1.15 back-ldbm.h
--- ldap/servers/slapd/back-ldbm/back-ldbm.h	5 Aug 2008 21:03:42 -0000	1.15
+++ ldap/servers/slapd/back-ldbm/back-ldbm.h	29 Sep 2008 20:31:48 -0000
@@ -109,16 +109,25 @@
 #define ID2ENTRY "id2entry"	/* main db file name: ID2ENTRY+LDBM_SUFFIX */
 
 #define LDBM_SUFFIX_OLD	".db3"
 #define LDBM_SUFFIX	".db4"
 
 #define MEGABYTE (1024 * 1024)
 #define GIGABYTE (1024 * MEGABYTE)
 
+#define DB_USES_LOCKING(env) \
+    (DB_INIT_LOCK & ((env)->get_open_flags((env), NULL)))
+#define DB_USES_TRANSACTIONS(env) \
+    (DB_INIT_TXN & ((env)->get_open_flags((env), NULL)))
+#define DB_USES_MPOOL(env) \
+    (DB_INIT_MPOOL & ((env)->get_open_flags((env), NULL)))
+#define DB_USES_LOGGING(env) \
+    (DB_INIT_LOG & ((env)->get_open_flags((env), NULL)))
+
 
 /* include NSPR header files */
 #include "nspr.h"
 #include "plhash.h"
 
 #include "slap.h"
 #include "slapi-plugin.h"
 #include "slapi-private.h"
Index: ldap/servers/slapd/back-ldbm/dblayer.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c,v
retrieving revision 1.27
diff -u -8 -r1.27 dblayer.c
--- ldap/servers/slapd/back-ldbm/dblayer.c	3 Apr 2008 16:52:47 -0000	1.27
+++ ldap/servers/slapd/back-ldbm/dblayer.c	29 Sep 2008 20:31:48 -0000
@@ -3444,17 +3444,17 @@
 
     INCR_THREAD_COUNT(priv);
 
     interval = PR_MillisecondsToInterval(100);
     while (!priv->dblayer_stop_threads)
     {
         if (priv->dblayer_enable_transactions) 
         {
-            if (NULL != priv->dblayer_env->dblayer_DB_ENV->lk_handle) {
+            if (DB_USES_LOCKING(priv->dblayer_env->dblayer_DB_ENV)) {
                 int aborted;
                 if ((rval = LOCK_DETECT(priv->dblayer_env->dblayer_DB_ENV,
                             0,
                             DB_LOCK_YOUNGEST,
                             &aborted))
                     != 0) {
                     LDAPDebug(LDAP_DEBUG_ANY,
                       "Serious Error---Failed in deadlock detect (aborted at 0x%x), err=%d (%s)\n",
@@ -3614,17 +3614,17 @@
         checkpoint_interval = priv->dblayer_checkpoint_interval;
         PR_Unlock(li->li_config_mutex);
 
         /* Check to see if the checkpoint interval has elapsed */
         if (current_time() - time_of_last_checkpoint_completion <
                                                checkpoint_interval) 
             continue;
 
-        if (NULL == priv->dblayer_env->dblayer_DB_ENV->tx_handle)
+        if (!DB_USES_TRANSACTIONS(priv->dblayer_env->dblayer_DB_ENV))
             continue;
 
         /* now checkpoint */
         checkpoint_debug_message(debug_checkpointing,
                                  "Starting checkpoint\n", 0, 0, 0);
         rval = dblayer_txn_checkpoint(li, priv->dblayer_env, PR_TRUE, PR_TRUE);
 #if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR < 4100
         if (DB_INCOMPLETE == rval) 
@@ -3772,17 +3772,17 @@
 
     interval = PR_MillisecondsToInterval(DBLAYER_SLEEP_INTERVAL);
     debug_checkpointing = priv->db_debug_checkpointing;
     while (!priv->dblayer_stop_threads)
     {
         DS_Sleep(interval);   /* 622855: wait for other threads fully started */
         if (priv->dblayer_enable_transactions) 
         {
-            if ( (NULL != priv->dblayer_env->dblayer_DB_ENV->mp_handle) &&
+            if ( DB_USES_MPOOL(priv->dblayer_env->dblayer_DB_ENV) &&
                  (0 != priv->dblayer_trickle_percentage) )
             {
                 int pages_written = 0;
                 if ((rval = MEMP_TRICKLE(
                                       priv->dblayer_env->dblayer_DB_ENV,
                                       priv->dblayer_trickle_percentage,
                                       &pages_written)) != 0)
                 {
Index: ldap/servers/slapd/back-ldbm/perfctrs.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/perfctrs.c,v
retrieving revision 1.9
diff -u -8 -r1.9 perfctrs.c
--- ldap/servers/slapd/back-ldbm/perfctrs.c	26 Sep 2007 17:32:41 -0000	1.9
+++ ldap/servers/slapd/back-ldbm/perfctrs.c	29 Sep 2008 20:31:49 -0000
@@ -291,41 +291,41 @@
 	if (NULL == db_env) {
 		return;
 	}
         perf = (performance_counters*)priv->memory;
 	if (NULL == perf) {
 		return;
 	}
 	/* Call libdb to get the various stats */
-	if (NULL != db_env->lg_handle)
+	if (DB_USES_LOGGING(db_env))
 	{
 		DB_LOG_STAT *logstat = NULL;
 		ret = LOG_STAT(db_env,&logstat,0,malloc);
 		if (0 == ret) {
 			perf->log_region_wait_rate = logstat->st_region_wait;
 			perf->log_write_rate = 1024*1024*logstat->st_w_mbytes + logstat->st_w_bytes;
 			perf->log_bytes_since_checkpoint = 1024*1024*logstat->st_wc_mbytes + logstat->st_wc_bytes;
 		}
 		free(logstat);
 	}
-	if (NULL != db_env->tx_handle)
+	if (DB_USES_TRANSACTIONS(db_env))
 	{
 		DB_TXN_STAT *txnstat = NULL;
 		ret = TXN_STAT(db_env, &txnstat, 0, malloc);
 		if (0 == ret) {
 			perf->active_txns = txnstat->st_nactive;
 			perf->commit_rate = txnstat->st_ncommits;
 			perf->abort_rate = txnstat->st_naborts;
 			perf->txn_region_wait_rate = txnstat->st_region_wait;
 		}
 		if (txnstat)
 			free(txnstat);
 	}
-	if (NULL != db_env->lk_handle)
+	if (DB_USES_LOCKING(db_env))
 	{
 		DB_LOCK_STAT *lockstat = NULL;
 		ret = LOCK_STAT(db_env,&lockstat,0,malloc);
 		if (0 == ret) {
 			perf->lock_region_wait_rate = lockstat->st_region_wait;	
 			perf->deadlock_rate = lockstat->st_ndeadlocks;
 			perf->configured_locks = lockstat->st_maxlocks;
 			perf->current_locks = lockstat->st_nlocks;
@@ -333,17 +333,17 @@
 			perf->lockers = lockstat->st_nlockers;
 			perf->lock_conflicts = GET_N_LOCK_WAITS(lockstat);
 			perf->lock_request_rate = lockstat->st_nrequests;			
 			perf->current_lock_objects = lockstat->st_nobjects;
 			perf->max_lock_objects = lockstat->st_maxnobjects;
 		}
 		free(lockstat);
 	}
-	if (NULL != db_env->mp_handle)
+	if (DB_USES_MPOOL(db_env))
 	{
 		DB_MPOOL_STAT	*mpstat = NULL;
 		ret = MEMP_STAT(db_env,&mpstat,NULL,0,malloc);
 		if (0 == ret) {
 #define ONEG  1073741824
 			perf->cache_size_bytes = mpstat->st_gbytes * ONEG + mpstat->st_bytes;
 			perf->page_access_rate = mpstat->st_cache_hit + mpstat->st_cache_miss;			
 			perf->cache_hit = mpstat->st_cache_hit;			


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/fedora-ds-base.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- fedora-ds-base.spec	25 Sep 2008 02:04:09 -0000	1.20
+++ fedora-ds-base.spec	29 Sep 2008 20:57:25 -0000	1.21
@@ -5,7 +5,7 @@
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
 Version:          1.1.3
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -57,6 +57,7 @@
 # fedora-ds-cvs.sh should be used to generate the source tarball from CVS
 Source1:          %{name}-cvs.sh
 Source2:          %{name}-devel.README
+Patch0:           bug463991-bdb47.patch
 
 %description
 Fedora Directory Server is an LDAPv3 compliant server.  The base package includes
@@ -72,6 +73,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0
 cp %{SOURCE2} README.devel
 
 %build
@@ -156,6 +158,10 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Mon Sep 29 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.3-3
+- added patch bug463991-bdb47.patch
+- make ds work with bdb 4.7
+
 * Wed Sep 24 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.3-2
 - rolled back bogus winsync memory leak fix
 


--- bug439829.patch DELETED ---



From ajax at fedoraproject.org  Mon Sep 29 21:19:53 2008
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 29 Sep 2008 21:19:53 +0000 (UTC)
Subject: rpms/mesa/devel import.log, NONE, 1.1 .cvsignore, 1.28,
	1.29 mesa.spec, 1.193, 1.194 sources, 1.28, 1.29
Message-ID: <20080929211953.3894270110@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2814/devel

Modified Files:
	.cvsignore mesa.spec sources 
Added Files:
	import.log 
Log Message:
add xdriinfo



--- NEW FILE import.log ---
mesa-7_2-0_3_fc10:HEAD:mesa-7.2-0.3.fc10.src.rpm:1222723005


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	5 Sep 2008 05:48:02 -0000	1.28
+++ .cvsignore	29 Sep 2008 21:19:22 -0000	1.29
@@ -1,2 +1,3 @@
 gl-manpages-1.0.1.tar.bz2
 mesa-20080905.tar.bz2
+xdriinfo-1.0.2.tar.bz2


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- mesa.spec	12 Sep 2008 07:24:14 -0000	1.193
+++ mesa.spec	29 Sep 2008 21:19:22 -0000	1.194
@@ -12,12 +12,13 @@
 %define _default_patch_fuzz 2
 
 %define manpages gl-manpages-1.0.1
+%define xdriinfo xdriinfo-1.0.2
 %define gitdate 20080905
 
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.2
-Release: 0.2%{?dist}
+Release: 0.3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -29,6 +30,8 @@
 Source2: %{manpages}.tar.bz2
 Source3: make-git-snapshot.sh
 
+Source5: http://www.x.org/pub/individual/app/%{xdriinfo}.tar.bz2
+
 Patch0: mesa-7.1-osmesa-version.patch
 Patch2: mesa-7.1-nukeglthread-debug.patch
 Patch3: mesa-no-mach64.patch
@@ -165,7 +168,7 @@
 
 %prep
 #%setup -q -n Mesa-%{version}pre -b1 -b2
-%setup -q -n mesa-%{gitdate} -b2
+%setup -q -n mesa-%{gitdate} -b2 -b5
 %patch0 -p1 -b .osmesa
 %patch2 -p1 -b .intel-glthread
 %patch3 -p0 -b .no-mach64
@@ -230,6 +233,11 @@
 make -C progs/xdemos glxgears glxinfo
 make %{?_smp_mflags} -C progs/demos
 
+pushd ../%{xdriinfo}
+%configure
+make %{?_smp_mflags}
+popd
+
 pushd ../%{manpages}
 %configure
 make %{?_smp_mflags}
@@ -271,6 +279,10 @@
 # and osmesa
 mv osmesa*/* $RPM_BUILD_ROOT%{_libdir}
 
+pushd ../%{xdriinfo}
+make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT
+popd
+
 # man pages
 pushd ../%{manpages}
 make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT
@@ -349,6 +361,8 @@
 %defattr(-,root,root,-)
 %{_bindir}/glxgears
 %{_bindir}/glxinfo
+%{_bindir}/xdriinfo
+%{_datadir}/man/man1/xdriinfo.1*
 
 %files demos
 %defattr(-,root,root,-)
@@ -408,6 +422,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Mon Sep 29 2008 Adam Jackson <ajax at redhat.com> 7.2-0.3
+- Add xdriinfo. (#464388)
+
 * Fri Sep 12 2008 Dave Airlie <airlied at redhat.com> 7.2-0.2
 - intel stop vbl default for now
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	5 Sep 2008 05:48:02 -0000	1.28
+++ sources	29 Sep 2008 21:19:22 -0000	1.29
@@ -1,2 +1,3 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
 d5e2a6d63b4611ec38aaab19b8f68117  mesa-20080905.tar.bz2
+a5ec51ed9f0a55dc3462d90d52ff899c  xdriinfo-1.0.2.tar.bz2



From orion at fedoraproject.org  Mon Sep 29 21:24:14 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 29 Sep 2008 21:24:14 +0000 (UTC)
Subject: rpms/cmake/devel cmake.spec,1.42,1.43
Message-ID: <20080929212414.E921370110@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3399

Modified Files:
	cmake.spec 
Log Message:
* Mon Sep 29 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-1
- Uupdate to 2.6.2



Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- cmake.spec	8 Sep 2008 14:39:53 -0000	1.42
+++ cmake.spec	29 Sep 2008 21:23:44 -0000	1.43
@@ -2,11 +2,11 @@
 # or architecture
 %bcond_with bootstrap
 # Set to RC version if building RC, else %{nil}
-%define rcver -RC-3
+%define rcver %{nil}
 
 Name:           cmake
 Version:        2.6.2
-Release:        0.rc3.1%{?dist}
+Release:        1%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-1
+- Uupdate to 2.6.2
+
 * Mon Sep 8 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-0.rc3.1
 - Update to 2.6.2-RC-2
 - Drop parens patch fixed upstream



From orion at fedoraproject.org  Mon Sep 29 21:25:09 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 29 Sep 2008 21:25:09 +0000 (UTC)
Subject: rpms/cmake/devel .cvsignore,1.22,1.23 sources,1.22,1.23
Message-ID: <20080929212509.E17B470110@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3544

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Sep 29 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-1
- Uupdate to 2.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	8 Sep 2008 14:54:32 -0000	1.22
+++ .cvsignore	29 Sep 2008 21:24:39 -0000	1.23
@@ -1 +1 @@
-cmake-2.6.2-RC-3.tar.gz
+cmake-2.6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	8 Sep 2008 14:54:33 -0000	1.22
+++ sources	29 Sep 2008 21:24:39 -0000	1.23
@@ -1 +1 @@
-336aab65ac95b5a3b15a6e0becbbbb65  cmake-2.6.2-RC-3.tar.gz
+9e82aa3beb991aa8e5797cf330618d42  cmake-2.6.2.tar.gz



From orion at fedoraproject.org  Mon Sep 29 21:37:15 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 29 Sep 2008 21:37:15 +0000 (UTC)
Subject: rpms/cmake/devel cmake.spec,1.43,1.44
Message-ID: <20080929213715.2081770110@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4725

Modified Files:
	cmake.spec 
Log Message:
Typo



Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- cmake.spec	29 Sep 2008 21:23:44 -0000	1.43
+++ cmake.spec	29 Sep 2008 21:36:44 -0000	1.44
@@ -114,7 +114,7 @@
 
 %changelog
 * Mon Sep 29 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-1
-- Uupdate to 2.6.2
+- Update to 2.6.2
 
 * Mon Sep 8 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-0.rc3.1
 - Update to 2.6.2-RC-2



From lkundrak at fedoraproject.org  Mon Sep 29 21:47:34 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 29 Sep 2008 21:47:34 +0000 (UTC)
Subject: rpms/crystalspace/devel crystalspace.spec,1.8,1.9
Message-ID: <20080929214734.99CC870110@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/crystalspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5838

Modified Files:
	crystalspace.spec 
Log Message:
* Mon Sep 29 2008 Lubomir Rintel <lkundrak at v3.sk> 1.2.1-1
- Bump to next upstream release



Index: crystalspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crystalspace/devel/crystalspace.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- crystalspace.spec	29 Sep 2008 20:47:38 -0000	1.8
+++ crystalspace.spec	29 Sep 2008 21:47:04 -0000	1.9
@@ -1,8 +1,8 @@
 %define csprefix %{name}-%{version}
 
 Name:           crystalspace
-Version:        1.2
-Release:        8%{?dist}
+Version:        1.2.1
+Release:        1%{?dist}
 Summary:        Crystal Space a free 3D engine
 Group:          System Environment/Libraries
 # most of crystalspace is LGPLv2+, but the sndsys class (and its plugins) and
@@ -210,6 +210,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Lubomir Rintel <lkundrak at v3.sk> 1.2.1-1
+- Bump to next upstream release
+
 * Mon Sep 29 2008 Lubomir Rintel <lkundrak at v3.sk> 1.2-8
 - Rebuild for new libode
 



From mstone at fedoraproject.org  Mon Sep 29 21:59:17 2008
From: mstone at fedoraproject.org (Michael Stone)
Date: Mon, 29 Sep 2008 21:59:17 +0000 (UTC)
Subject: rpms/olpc-utils/OLPC-3 .cvsignore, 1.14, 1.15 olpc-utils.spec, 1.21,
	1.22 sources, 1.15, 1.16
Message-ID: <20080929215917.D510D70110@cvs1.fedora.phx.redhat.com>

Author: mstone

Update of /cvs/pkgs/rpms/olpc-utils/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6788

Modified Files:
	.cvsignore olpc-utils.spec sources 
Log Message:
Require 20 MB of free-space, not 600 MB.
Properly skip cleanup logic when space is available.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	23 Sep 2008 20:22:47 -0000	1.14
+++ .cvsignore	29 Sep 2008 21:58:47 -0000	1.15
@@ -1 +1 @@
-olpc-utils-0.87.tar.bz2
+olpc-utils-0.89.tar.bz2


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/olpc-utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- olpc-utils.spec	29 Sep 2008 13:07:46 -0000	1.21
+++ olpc-utils.spec	29 Sep 2008 21:58:47 -0000	1.22
@@ -1,6 +1,6 @@
 Name:       olpc-utils
-Version:    0.87
-Release:    2%{?dist}
+Version:    0.89
+Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
 Group:      System Environment/Base
@@ -8,8 +8,6 @@
 Source0:    %{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:     diskspace.patch
-
 # for olpc-dm
 BuildRequires:  pam-devel
 Requires:       pam
@@ -30,7 +28,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+
 
 %build
 make -f Makefile.build %{?_smp_mflags}
@@ -90,7 +88,12 @@
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-foreground-compat.ck
 
 %changelog
-* Mon Sep 29 2008 C. Scott Ananian <cscott at laptop.org> 0.87-2
+* Mon Sep 29 2008 Michael Stone <michael at laptop.org> 0.89-1
+- Chris Ball (2):
+    Require 20 MB of free-space, not 600 MB.
+    Properly skip cleanup logic when space is available.
+
+* Mon Sep 29 2008 Michael Stone <michael at laptop.org> 0.88-1
 - Chris Ball (1):
     dlo#7932: Fix failsafe script in the presence of pretty-boot.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	23 Sep 2008 20:22:47 -0000	1.15
+++ sources	29 Sep 2008 21:58:47 -0000	1.16
@@ -1 +1 @@
-ed673848ec9073df68533b0bf80612c0  olpc-utils-0.87.tar.bz2
+fc7e0f8bcdd10f858eae4aef521b769d  olpc-utils-0.89.tar.bz2



From orion at fedoraproject.org  Mon Sep 29 21:59:16 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 29 Sep 2008 21:59:16 +0000 (UTC)
Subject: rpms/cmake/F-9 .cvsignore, 1.14, 1.15 cmake.spec, 1.31, 1.32 sources,
	1.15, 1.16
Message-ID: <20080929215916.9B8FB70110@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/cmake/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6823

Modified Files:
	.cvsignore cmake.spec sources 
Log Message:
* Mon Sep 29 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-1
- Update to 2.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	22 Jan 2008 22:47:30 -0000	1.14
+++ .cvsignore	29 Sep 2008 21:58:46 -0000	1.15
@@ -1 +1 @@
-cmake-2.4.8.tar.gz
+cmake-2.6.2.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-9/cmake.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cmake.spec	2 Sep 2008 21:57:09 -0000	1.31
+++ cmake.spec	29 Sep 2008 21:58:46 -0000	1.32
@@ -1,20 +1,20 @@
 # Set to bcond_without or use --with bootstrap if bootstrapping a new release
 # or architecture
 %bcond_with bootstrap
+# Set to RC version if building RC, else %{nil}
+%define rcver %{nil}
 
 Name:           cmake
-Version:        2.6.1
-Release:        3%{?dist}
+Version:        2.6.2
+Release:        1%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://www.cmake.org
-Source0:        http://www.cmake.org/files/v2.6/cmake-%{version}.tar.gz
+Source0:        http://www.cmake.org/files/v2.6/cmake-%{version}%{rcver}.tar.gz
 Source2:        macros.cmake
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#See http://public.kitware.com/Bug/view.php?id=7392
-Patch1:         cmake-2.6.1-parens.patch   
 
 BuildRequires:  ncurses-devel, libX11-devel
 BuildRequires:  qt4-devel, desktop-file-utils
@@ -42,8 +42,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch1 -p1 -b .parens
+%setup -q -n %{name}-%{version}%{rcver}
 # Fixup permissions
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
@@ -114,6 +113,13 @@
 
 
 %changelog
+* Mon Sep 29 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-1
+- Update to 2.6.2
+
+* Mon Sep 8 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-0.rc3.1
+- Update to 2.6.2-RC-2
+- Drop parens patch fixed upstream
+
 * Tue Sep 2 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.1-3
 - Drop jni patch, applied upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	2 Sep 2008 21:57:09 -0000	1.15
+++ sources	29 Sep 2008 21:58:46 -0000	1.16
@@ -1 +1 @@
-6717f4bc3cfcced4172ad98660ce7599  cmake-2.6.1.tar.gz
+9e82aa3beb991aa8e5797cf330618d42  cmake-2.6.2.tar.gz



From cwickert at fedoraproject.org  Mon Sep 29 22:13:11 2008
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 29 Sep 2008 22:13:11 +0000 (UTC)
Subject: rpms/xfce4-dict/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-dict.spec, 1.1, 1.2
Message-ID: <20080929221311.71C2A70110@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-dict/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8126

Modified Files:
	.cvsignore sources xfce4-dict.spec 
Log Message:
* Tue Sep 30 2008 Christoph Wickert <fedora christoph-wickert de> - 0.4.1-1
- Update to 0.4.1
- Require xdg-utils as xdg-open is the preferred command to open URLs now



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dict/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 May 2008 08:10:50 -0000	1.2
+++ .cvsignore	29 Sep 2008 22:12:40 -0000	1.3
@@ -1 +1 @@
-xfce4-dict-0.4.0.tar.gz
+xfce4-dict-0.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dict/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 May 2008 08:10:50 -0000	1.2
+++ sources	29 Sep 2008 22:12:40 -0000	1.3
@@ -1 +1 @@
-dbe99b8dbf918e401be41613b3012797  xfce4-dict-0.4.0.tar.gz
+feb18f7314e465c969418b074f40e5ab  xfce4-dict-0.4.1.tar.bz2


Index: xfce4-dict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dict/devel/xfce4-dict.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-dict.spec	26 May 2008 08:10:50 -0000	1.1
+++ xfce4-dict.spec	29 Sep 2008 22:12:40 -0000	1.2
@@ -1,17 +1,17 @@
 Name:           xfce4-dict
-Version:        0.4.0
+Version:        0.4.1
 Release:        1%{?dist}
 Summary:        A Dictionary Client for the Xfce desktop environment
 Summary(de):    Ein W??rterbuch-Client f??r die Xfce Desktop-Umgebung
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
-Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfcegui4-devel >= 4.4.0
 BuildRequires:  gettext, perl(XML::Parser), desktop-file-utils
-Requires:       aspell
+Requires:       aspell, xdg-utils
 
 
 %description
@@ -82,6 +82,10 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Tue Sep 30 2008 Christoph Wickert <fedora christoph-wickert de> - 0.4.1-1
+- Update to 0.4.1
+- Require xdg-utils as xdg-open is the preferred command to open URLs now
+
 * Sat May 24 2008 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-1
 - Update to 0.4.0
 - Rename to xfce4-dict because we now have a standalone application



From cchance at fedoraproject.org  Mon Sep 29 22:36:21 2008
From: cchance at fedoraproject.org (Caius Chance)
Date: Mon, 29 Sep 2008 22:36:21 +0000 (UTC)
Subject: rpms/cjkunifonts/devel 25-ttf-arphic-uming-bitmaps.conf, NONE,
	1.1 cjkunifonts.spec, 1.8, 1.9
Message-ID: <20080929223621.B3C657013D@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkunifonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9831

Modified Files:
	cjkunifonts.spec 
Added Files:
	25-ttf-arphic-uming-bitmaps.conf 
Log Message:
* Mon Sep 29 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-2.fc10
- Resolves: rhbz#459680 (qt/kde: font antialiasing was disabled by uming
  fontconfig file.)




--- NEW FILE 25-ttf-arphic-uming-bitmaps.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>

	<match target="font">
	  <test name="family" compare="eq">
	  <string>AR PL UMing CN</string>
	  <string>AR PL UMing HK</string>
	  <string>AR PL UMing TW</string>
	  <string>AR PL UMing TW MBE</string>
	  </test>
	  <edit name="hinting" mode="assign"><bool>false</bool></edit>
	</match>

</fontconfig>


Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cjkunifonts.spec	5 Aug 2008 04:48:26 -0000	1.8
+++ cjkunifonts.spec	29 Sep 2008 22:35:50 -0000	1.9
@@ -9,7 +9,7 @@
 
 Name:        cjkunifonts
 Version:     0.2.20080216.1
-Release:     1%{?dist}
+Release:     2%{?dist}
 Summary:     Chinese TrueType Fonts -- Simplified and Traditional Chinese Ming and Kai Face
 License:     Arphic
 Group:       User Interface/X
@@ -23,6 +23,7 @@
 Source6:    cidfmap.zh_CN
 Source7:    CIDFnmap.zh_TW
 Source8:    CIDFnmap.zh_CN
+Source9:    25-ttf-arphic-uming-bitmaps.conf
 
 BuildRequires:    xorg-x11-font-utils, ttmkfdir
 BuildArch:        noarch
@@ -60,6 +61,8 @@
 %prep
 %setup -q -c -T -a1 -n %{name}-uming-%{version}
 %setup -q -c -T -a2 -n %{name}-ukai-%{version}
+# .conf file for unhinting uming is too global power.
+%{__cp} %{SOURCE9} %{_builddir}/%{name}-uming-%{version}/
 
 %build
 %{nil}
@@ -194,8 +197,12 @@
 %{catalogue}/%{name}-ukai
 
 %changelog
+* Mon Sep 29 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-2.fc10
+- Resolves: rhbz#459680 (qt/kde: font antialiasing was disabled by uming 
+  fontconfig file.)
+
 * Tue Aug 05 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-1.fc10
-- Resolves: rhbz#123456 (Update latest release fro upstream.)
+- Resolves: rhbz#457868 (Update latest release fro upstream.)
 
 * Mon Jun 30 2008 Caius Chance <cchance at redhat.com> - 0.1.20060928-6.fc10
 - Refined obsoletes of fonts-chinese to be more ver-rel specific.



From cwickert at fedoraproject.org  Mon Sep 29 22:51:23 2008
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 29 Sep 2008 22:51:23 +0000 (UTC)
Subject: rpms/xfce4-dict/devel xfce4-dict.spec,1.2,1.3
Message-ID: <20080929225123.776FE70110@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-dict/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11011

Modified Files:
	xfce4-dict.spec 
Log Message:
* Tue Sep 30 2008 Christoph Wickert <fedora christoph-wickert de> - 0.4.1-2
- BuildRequire intltool



Index: xfce4-dict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dict/devel/xfce4-dict.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-dict.spec	29 Sep 2008 22:12:40 -0000	1.2
+++ xfce4-dict.spec	29 Sep 2008 22:50:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           xfce4-dict
 Version:        0.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Dictionary Client for the Xfce desktop environment
 Summary(de):    Ein W??rterbuch-Client f??r die Xfce Desktop-Umgebung
 Group:          User Interface/Desktops
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfcegui4-devel >= 4.4.0
-BuildRequires:  gettext, perl(XML::Parser), desktop-file-utils
+BuildRequires:  gettext, perl(XML::Parser), desktop-file-utils, intltool
 Requires:       aspell, xdg-utils
 
 
@@ -82,6 +82,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Tue Sep 30 2008 Christoph Wickert <fedora christoph-wickert de> - 0.4.1-2
+- BuildRequire intltool
+
 * Tue Sep 30 2008 Christoph Wickert <fedora christoph-wickert de> - 0.4.1-1
 - Update to 0.4.1
 - Require xdg-utils as xdg-open is the preferred command to open URLs now



From pfj at fedoraproject.org  Mon Sep 29 22:51:25 2008
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Mon, 29 Sep 2008 22:51:25 +0000 (UTC)
Subject: rpms/libgdiplus/devel import.log,1.2,1.3 libgdiplus.spec,1.31,1.32
Message-ID: <20080929225125.87C2F70110@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/libgdiplus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10984/devel

Modified Files:
	import.log libgdiplus.spec 
Log Message:

Bump to RC3 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	10 Sep 2008 19:29:28 -0000	1.2
+++ import.log	29 Sep 2008 22:50:55 -0000	1.3
@@ -1,2 +1,3 @@
 libgdiplus-2_0-1_fc10:HEAD:libgdiplus-2.0-1.fc10.src.rpm:1219744526
 libgdiplus-2_0-2_fc10:HEAD:libgdiplus-2.0-2.fc10.src.rpm:1221074944
+libgdiplus-2_0-3_fc10:HEAD:libgdiplus-2.0-3.fc10.src.rpm:1222728609


Index: libgdiplus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/devel/libgdiplus.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libgdiplus.spec	10 Sep 2008 19:29:28 -0000	1.31
+++ libgdiplus.spec	29 Sep 2008 22:50:55 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           libgdiplus
 Version:        2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        libgdiplus: An Open Source implementation of the GDI+ API
 
 Group:          System Environment/Libraries
@@ -59,6 +59,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Mon Sep 29 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-3
+- Bump to RC3
+
 * Tue Sep 09 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-2
 - Bump to RC1
 



From orion at fedoraproject.org  Mon Sep 29 23:12:45 2008
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 29 Sep 2008 23:12:45 +0000 (UTC)
Subject: rpms/kdesvn/devel kdesvn-1.2.0-asneeded.patch, NONE, 1.1 .cvsignore,
	1.22, 1.23 kdesvn.spec, 1.45, 1.46 sources, 1.22,
	1.23 kdesvn-1.0.0-asneeded.patch, 1.1, NONE
Message-ID: <20080929231246.151EE70110@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/kdesvn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12564

Modified Files:
	.cvsignore kdesvn.spec sources 
Added Files:
	kdesvn-1.2.0-asneeded.patch 
Removed Files:
	kdesvn-1.0.0-asneeded.patch 
Log Message:
* Mon Sep 29 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.0.2-1
- Update to 1.0.2


kdesvn-1.2.0-asneeded.patch:

--- NEW FILE kdesvn-1.2.0-asneeded.patch ---
--- kdesvn-kde4-1.2.0.20080926/src/CMakeLists.txt.asneeded	2008-09-25 00:58:23.000000000 -0600
+++ kdesvn-kde4-1.2.0.20080926/src/CMakeLists.txt	2008-09-29 16:30:31.000000000 -0600
@@ -54,7 +54,7 @@
     )
 SET_TARGET_PROPERTIES(kdesvnpart
     PROPERTIES
-    LINK_FLAGS "${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} ${LINK_NO_UNDEFINED}")
+    LINK_FLAGS "${_BASE_LDADD} ${APR_EXTRA_LDFLAGS} ${APU_EXTRA_LDFLAGS} ${LINK_NO_UNDEFINED}")
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src/svnqt)
 
--- kdesvn-kde4-1.2.0.20080926/src/svnqt/CMakeLists.txt.asneeded	2008-09-24 09:40:31.000000000 -0600
+++ kdesvn-kde4-1.2.0.20080926/src/svnqt/CMakeLists.txt	2008-09-29 16:30:31.000000000 -0600
@@ -145,7 +145,7 @@
 
 SET(ALL_LINKFLAGS ${APR_EXTRA_LIBFLAGS})
 SET(ALL_LINKFLAGS "${ALL_LINKFLAGS} ${APU_EXTRA_LIBFLAGS}")
-SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
+SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "-Wl,--as-needed ${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
 TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_LIBRARIES} ${SUBVERSION_ALL_LIBS} ${QT_QTSQL_LIBRARY})
 
 IF (WIN32)
--- kdesvn-kde4-1.2.0.20080926/src/svnqt/cmakemodules/FindSubversion.cmake.asneeded	2008-07-27 16:30:51.000000000 -0600
+++ kdesvn-kde4-1.2.0.20080926/src/svnqt/cmakemodules/FindSubversion.cmake	2008-09-29 16:30:31.000000000 -0600
@@ -58,14 +58,29 @@
     MESSAGE(SEND_ERROR "Error: no apu-config found")
   endif(NOT APU_CONFIG)
 
-  EXEC_PROGRAM(${APR_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR)
-  EXEC_PROGRAM(${APU_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR)
+  EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apr include: ${APR_INCLUDE_DIR}")
+  EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apu include: ${APU_INCLUDE_DIR}")
+
+  EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--cppflags" OUTPUT_VARIABLE APR_CPP_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apr cppflags: ${APR_CPP_FLAGS}")
+  EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--cppflags" OUTPUT_VARIABLE APU_CPP_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apu cppflags: ${APU_CPP_FLAGS}")
+
+  EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--link-ld" "--libs" OUTPUT_VARIABLE APR_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apr libs: ${APR_LIBS}")
+  SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIBS})
+
+  EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--ldflags" OUTPUT_VARIABLE APR_EXTRA_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apr extra ldflags: ${APR_EXTRA_LDFLAGS}")
+
+  EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--link-ld" "--libs" OUTPUT_VARIABLE APU_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apu libs: ${APU_LIBS}")
+  SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIBS})
 
-  EXEC_PROGRAM(${APR_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APR_CPP_FLAGS)
-  EXEC_PROGRAM(${APU_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APU_CPP_FLAGS)
-
-  EXEC_PROGRAM(${APR_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APR_EXTRA_LIBFLAGS)
-  EXEC_PROGRAM(${APU_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APU_EXTRA_LIBFLAGS)
+  EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--ldflags" OUTPUT_VARIABLE APU_EXTRA_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apu extra ldflags: ${APU_EXTRA_LIBS}")
 
   CHECK_INCLUDE_FILES(execinfo.h HAS_BACKTRACE_H)
 
@@ -180,8 +195,10 @@
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  SET(APR_EXTRA_LIBFLAGS )
-  SET(APU_EXTRA_LIBFLAGS )
+  SET(APR_EXTRA_LIBS )
+  SET(APR_EXTRA_LDFLAGS )
+  SET(APU_EXTRA_LIBS )
+  SET(APU_EXTRA_LDFLAGS )
 
 
   # check found libraries
@@ -189,7 +206,7 @@
     MESSAGE(SEND_ERROR "No apr lib found!")
   ELSE (NOT APR_LIB)
     MESSAGE(STATUS "Found apr lib: ${APR_LIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIB})
+    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIB} ${APR_EXTRA_LIBS})
   endif(NOT APR_LIB)
 
   if (NOT APRICONV_LIB)
@@ -203,7 +220,7 @@
     MESSAGE(SEND_ERROR "No aprutil lib found!")
   ELSE (NOT APU_LIB)
     MESSAGE(STATUS "Found aprutil lib: ${APU_LIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIB})
+    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIB} ${APU_EXTRA_LIBS})
   endif(NOT APU_LIB)
 
   if (NOT APU_XMLLIB)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	29 Sep 2008 19:45:48 -0000	1.22
+++ .cvsignore	29 Sep 2008 23:12:13 -0000	1.23
@@ -1 +1 @@
-kdesvn-1.0.2.tar.bz2
+kdesvn-kde4-1.2.0.20080926.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kdesvn.spec	29 Sep 2008 19:56:25 -0000	1.45
+++ kdesvn.spec	29 Sep 2008 23:12:14 -0000	1.46
@@ -1,18 +1,17 @@
 Name:           kdesvn
-Version:        1.0.2
-Release:        1%{?dist}
+Version:        1.2.0
+Release:        0.20080926.1%{?dist}
 Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://kdesvn.alwins-world.de/
-Source0:        http://kdesvn.alwins-world.de/downloads/kdesvn-%{version}.tar.bz2
+Source0:        http://www.alwins-world.de/programs/download/kdesvn/kde4/kdesvn-kde4-1.2.0.20080926.tar.bz2
 #Reported upstream: http://kdesvn.alwins-world.de/trac.fcgi/ticket/246
-Patch0:         kdesvn-1.0.0-asneeded.patch
+Patch0:         kdesvn-1.2.0-asneeded.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  subversion-devel, kdelibs3-devel, neon-devel, cmake, gettext
-BuildRequires:  sqlite-devel
+BuildRequires:  subversion-devel, kdelibs-devel, neon-devel, cmake, gettext
 BuildRequires:  desktop-file-utils
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -40,39 +39,35 @@
 
 
 %prep
-%setup -q
+%setup -q -n kdesvn-kde4-1.2.0.20080926
 %patch0 -p1 -b .asneeded
 
 
 %build
-mkdir kdesvn-build
-cd kdesvn-build
+mkdir -p %{_target_platform}
+cd %{_target_platform}
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
-%cmake .. \
+%{cmake_kde4} .. \
        -DCMAKE_BUILD_TYPE=Release
 make VERBOSE=1 %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd kdesvn-build
+pushd %{_target_platform}
 make install VERBOSE=1 DESTDIR=$RPM_BUILD_ROOT
+popd
 
 # Desktop file
-cd ..
 desktop-file-install --vendor=fedora \
-       --add-category=Qt \
-       --add-category=KDE \
        --add-category=Application \
-       --add-category=Development \
-       --add-category=X-Fedora \
-       --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-       $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
+       --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde4 \
+       $RPM_BUILD_ROOT%{_datadir}/applications/kde4/%{name}.desktop
 %find_lang %{name} || touch %{name}.lang
 
-#Don't conflict with kdebase
-rm $RPM_BUILD_ROOT%{_datadir}/services/svn*.protocol
+#Don't conflict with kdesdk
+rm $RPM_BUILD_ROOT%{_datadir}/kde4/services/svn*.protocol
 
 
 %clean
@@ -81,19 +76,11 @@
 
 %post
 /sbin/ldconfig
-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
+xdg-icon-resource forceupdate --theme hicolor
 
 %postun
 /sbin/ldconfig
-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
+xdg-icon-resource forceupdate --theme hicolor
 
 
 %files -f %{name}.lang
@@ -101,29 +88,31 @@
 %doc AUTHORS ChangeLog COPYING GPL.txt
 %{_bindir}/kdesvn
 %{_bindir}/kdesvnaskpass
-%{_libdir}/kde3/*
-%{_libdir}/libsvnqt.so.*
-%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/apps/kconf_update/
-%{_datadir}/apps/kdesvn/
-%{_datadir}/apps/kdesvnpart/
-%{_datadir}/apps/konqueror/servicemenus/kdesvn*.desktop
+%{_libdir}/kde4/*
+%{_libdir}/libsvnqt4.so.*
+%{_datadir}/applications/kde4/fedora-%{name}.desktop
+%{_datadir}/kde4/apps/kconf_update/
+%{_datadir}/kde4/apps/kdesvn/
+%{_datadir}/kde4/apps/kdesvnpart/
 %{_datadir}/config.kcfg/kdesvn_part.kcfg
+%{_datadir}/dbus-1/interfaces/org.kde.kdesvnd.xml
 %{_datadir}/doc/HTML/*/kdesvn/
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/icons/hicolor/*/*/*.svgz
-%{_datadir}/services/kded/kdesvnd.desktop
-%{_datadir}/services/ksvn*.protocol
+%{_datadir}/kde4/services/*
 %{_mandir}/man1/kdesvn*.1*
 
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/svnqt/
-%{_libdir}/libsvnqt.so
+%{_includedir}/svnqt4/
+%{_libdir}/libsvnqt4.so
 
 
 %changelog
+* Mon Sep 29 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.2.0-0.20080926.1
+- Update to 1.2.0.20080926, KDE4 version
+
 * Mon Sep 29 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.0.2-1
 - Update to 1.0.2
 - Add BR sqlite-devel needed for Qt3 build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	29 Sep 2008 19:45:49 -0000	1.22
+++ sources	29 Sep 2008 23:12:14 -0000	1.23
@@ -1 +1 @@
-b33a98229444a3e81d0335e59927f4cb  kdesvn-1.0.2.tar.bz2
+c8534228406325ff8652e126af13a6b0  kdesvn-kde4-1.2.0.20080926.tar.bz2


--- kdesvn-1.0.0-asneeded.patch DELETED ---



From cwickert at fedoraproject.org  Mon Sep 29 23:24:34 2008
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 29 Sep 2008 23:24:34 +0000 (UTC)
Subject: rpms/xfce4-dict/F-9 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-dict.spec, 1.1, 1.2
Message-ID: <20080929232434.5A71270110@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-dict/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13458

Modified Files:
	.cvsignore sources xfce4-dict.spec 
Log Message:
* Tue Sep 30 2008 Christoph Wickert <fedora christoph-wickert de> - 0.4.1-2
- BuildRequire intltool



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dict/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 May 2008 09:02:04 -0000	1.2
+++ .cvsignore	29 Sep 2008 23:24:04 -0000	1.3
@@ -1 +1 @@
-xfce4-dict-0.4.0.tar.gz
+xfce4-dict-0.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dict/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 May 2008 09:02:04 -0000	1.2
+++ sources	29 Sep 2008 23:24:04 -0000	1.3
@@ -1 +1 @@
-dbe99b8dbf918e401be41613b3012797  xfce4-dict-0.4.0.tar.gz
+feb18f7314e465c969418b074f40e5ab  xfce4-dict-0.4.1.tar.bz2


Index: xfce4-dict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dict/F-9/xfce4-dict.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-dict.spec	26 May 2008 09:02:04 -0000	1.1
+++ xfce4-dict.spec	29 Sep 2008 23:24:04 -0000	1.2
@@ -1,17 +1,17 @@
 Name:           xfce4-dict
-Version:        0.4.0
-Release:        1%{?dist}
+Version:        0.4.1
+Release:        2%{?dist}
 Summary:        A Dictionary Client for the Xfce desktop environment
 Summary(de):    Ein W??rterbuch-Client f??r die Xfce Desktop-Umgebung
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
-Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfcegui4-devel >= 4.4.0
-BuildRequires:  gettext, perl(XML::Parser), desktop-file-utils
-Requires:       aspell
+BuildRequires:  gettext, perl(XML::Parser), desktop-file-utils, intltool
+Requires:       aspell, xdg-utils
 
 
 %description
@@ -82,6 +82,13 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Tue Sep 30 2008 Christoph Wickert <fedora christoph-wickert de> - 0.4.1-2
+- BuildRequire intltool
+
+* Tue Sep 30 2008 Christoph Wickert <fedora christoph-wickert de> - 0.4.1-1
+- Update to 0.4.1
+- Require xdg-utils as xdg-open is the preferred command to open URLs now
+
 * Sat May 24 2008 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-1
 - Update to 0.4.0
 - Rename to xfce4-dict because we now have a standalone application



From pertusus at fedoraproject.org  Mon Sep 29 23:27:34 2008
From: pertusus at fedoraproject.org (Patrice Dumas)
Date: Mon, 29 Sep 2008 23:27:34 +0000 (UTC)
Subject: rpms/grib_api/devel grib_api.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080929232734.CD6F570110@cvs1.fedora.phx.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grib_api/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12764/devel

Modified Files:
	.cvsignore sources 
Added Files:
	grib_api.spec import.log 
Log Message:
initial import



--- NEW FILE grib_api.spec ---
Name:           grib_api
Version:        1.6.1
Release:        1%{?dist}
Summary:        ECMWF encoding/decoding GRIB software

Group:          System Environment/Libraries
License:        LGPLv3
URL:            http://www.ecmwf.int/products/data/software/grib_api.html
Source0:        http://www.ecmwf.int/products/data/software/download/software_files/grib_api-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gcc-gfortran jasper-devel libpng-devel perl bison flex
#Requires:       

%description
Command line tools for interactive and batch processing 
of GRIB (GRIdded Binary) data.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Provides:       %{name}-static = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
chmod a-x AUTHORS README INSTALL LICENSE
# remove empty unused Makefile.am
rm html/Makefile.am
find . -name '*.c' -exec chmod -x {} \;
find . -name 'Makefile*' -exec chmod -x {} \;
rm -rf __dist_doc
mkdir __dist_doc
cp -a examples __dist_doc
rm __dist_doc/examples/*/Makefile*
sed -i -e 's/.*GRIB_DEFINITION_PATH.*//' -e 's/.*GRIB_TEMPLATES_PATH.*//' \
  __dist_doc/examples/*/include.sh


%build
# perl module build doesn't works
%configure F77=gfortran FCFLAGS="$RPM_OPT_FLAGS"
# parallel build seems to be broken %{?_smp_mflags}
make 


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
#find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
mv $RPM_BUILD_ROOT%{_bindir}/parser $RPM_BUILD_ROOT%{_bindir}/grib_parser
mv $RPM_BUILD_ROOT%{_bindir}/points $RPM_BUILD_ROOT%{_bindir}/grib_points
mkdir -p $RPM_BUILD_ROOT%{_fmoddir}
mv $RPM_BUILD_ROOT%{_includedir}/*.mod $RPM_BUILD_ROOT%{_fmoddir}

%clean
rm -rf $RPM_BUILD_ROOT


%check
make check


#%post -p /sbin/ldconfig

#%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS README LICENSE ChangeLog gpl-3.0.txt html
#%{_libdir}/*.so.*
%{_bindir}/*grib*
%{_bindir}/tigge_*
%{_datadir}/grib_api/

%files devel
%defattr(-,root,root,-)
%doc __dist_doc/examples data
%{_includedir}/grib_api.h
%{_includedir}/grib_api_f77.h
%{_fmoddir}/*.mod
#%{_libdir}/*.so
%{_libdir}/libgrib_api.a
%{_libdir}/libgrib_api_f77.a
%{_libdir}/libgrib_api_f90.a


%changelog
* Tue Sep 30 2008 Patrice Dumas <pertusus at free.fr> 1.6.1-1
- update to 1.6.1

* Sat Feb 23 2008 Patrice Dumas <pertusus at free.fr> 1.4.0-1
- update to 1.4.0

* Sat Dec 29 2007 Patrice Dumas <pertusus at free.fr> 1.3.0-1
- initial release


--- NEW FILE import.log ---
grib_api-1_6_1-1_fc10:HEAD:grib_api-1.6.1-1.fc10.src.rpm:1222729912


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grib_api/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Mar 2008 20:03:58 -0000	1.1
+++ .cvsignore	29 Sep 2008 23:27:04 -0000	1.2
@@ -0,0 +1 @@
+grib_api-1.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grib_api/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Mar 2008 20:03:58 -0000	1.1
+++ sources	29 Sep 2008 23:27:04 -0000	1.2
@@ -0,0 +1 @@
+101e946373738ea21a1c538ed78741fc  grib_api-1.6.1.tar.gz



From phuang at fedoraproject.org  Tue Sep 30 00:26:28 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 30 Sep 2008 00:26:28 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.13, 1.14 ibus.spec, 1.18, 1.19 sources,
	1.16, 1.17
Message-ID: <20080930002628.AC55F70119@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21644

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to -0.1.1.20080930


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	23 Sep 2008 02:25:33 -0000	1.13
+++ .cvsignore	30 Sep 2008 00:25:58 -0000	1.14
@@ -1 +1 @@
-ibus-0.1.1.20080923.tar.gz
+ibus-0.1.1.20080930.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ibus.spec	23 Sep 2008 02:39:31 -0000	1.18
+++ ibus.spec	30 Sep 2008 00:25:58 -0000	1.19
@@ -1,7 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?gtk_binary_version: %define gtk_binary_version %(pkg-config  --variable=gtk_binary_version gtk+-2.0)}
 %define mod_path ibus-0.1
 Name:       ibus
-Version:    0.1.1.20080923
+Version:    0.1.1.20080930
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -62,7 +63,7 @@
 make DESTDIR=${RPM_BUILD_ROOT} install
 rm -f $RPM_BUILD_ROOT%{_libdir}/libibus-gtk.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libibus-gtk.so
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/immodules/im-ibus.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.la
 
 # install xinput config file
 mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d
@@ -114,7 +115,7 @@
 %files gtk
 %defattr(-,root,root,-)
 %doc
-%{_libdir}/gtk-2.0/immodules/im-ibus.so
+%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.so
 
 %files qt
 %defattr(-,root,root,-)
@@ -122,6 +123,9 @@
 %{_libdir}/qt4/plugins/inputmethods/libibus.so
 
 %changelog
+* Tue Sep 30 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080930-1
+- Update to 0.1.1.20080930.
+
 * Tue Sep 23 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080923-1
 - Update to 0.1.1.20080923.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	23 Sep 2008 02:25:33 -0000	1.16
+++ sources	30 Sep 2008 00:25:58 -0000	1.17
@@ -1 +1 @@
-6ffdfc6779d709b75b382dbe948288a4  ibus-0.1.1.20080923.tar.gz
+07964c208db3138a39bb8f1e12c172f5  ibus-0.1.1.20080930.tar.gz



From phuang at fedoraproject.org  Tue Sep 30 00:30:57 2008
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 30 Sep 2008 00:30:57 +0000 (UTC)
Subject: rpms/ibus/F-9 .cvsignore, 1.10, 1.11 ibus.spec, 1.12, 1.13 sources, 
	1.13, 1.14
Message-ID: <20080930003057.A9C7070119@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22419

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to -0.1.1.20080930


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	23 Sep 2008 02:40:43 -0000	1.10
+++ .cvsignore	30 Sep 2008 00:30:27 -0000	1.11
@@ -1 +1 @@
-ibus-0.1.1.20080923.tar.gz
+ibus-0.1.1.20080930.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/ibus.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ibus.spec	23 Sep 2008 02:40:43 -0000	1.12
+++ ibus.spec	30 Sep 2008 00:30:27 -0000	1.13
@@ -1,7 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?gtk_binary_version: %define gtk_binary_version %(pkg-config  --variable=gtk_binary_version gtk+-2.0)}
 %define mod_path ibus-0.1
 Name:       ibus
-Version:    0.1.1.20080923
+Version:    0.1.1.20080930
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -62,7 +63,7 @@
 make DESTDIR=${RPM_BUILD_ROOT} install
 rm -f $RPM_BUILD_ROOT%{_libdir}/libibus-gtk.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libibus-gtk.so
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/immodules/im-ibus.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.la
 
 # install xinput config file
 mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d
@@ -114,7 +115,7 @@
 %files gtk
 %defattr(-,root,root,-)
 %doc
-%{_libdir}/gtk-2.0/immodules/im-ibus.so
+%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.so
 
 %files qt
 %defattr(-,root,root,-)
@@ -122,6 +123,9 @@
 %{_libdir}/qt4/plugins/inputmethods/libibus.so
 
 %changelog
+* Tue Sep 30 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080930-1
+- Update to 0.1.1.20080930.
+
 * Tue Sep 23 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080923-1
 - Update to 0.1.1.20080923.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	23 Sep 2008 02:40:43 -0000	1.13
+++ sources	30 Sep 2008 00:30:27 -0000	1.14
@@ -1 +1 @@
-6ffdfc6779d709b75b382dbe948288a4  ibus-0.1.1.20080923.tar.gz
+07964c208db3138a39bb8f1e12c172f5  ibus-0.1.1.20080930.tar.gz



From kaigai at fedoraproject.org  Tue Sep 30 03:12:35 2008
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Tue, 30 Sep 2008 03:12:35 +0000 (UTC)
Subject: rpms/sepostgresql/F-9 sepostgresql-pg_dump-8.3.4-2.patch, NONE,
	1.1 sepostgresql-policy-8.3.4-2.patch, NONE,
	1.1 sepostgresql-sepgsql-8.3.4-2.patch, NONE, 1.1 .cvsignore,
	1.10, 1.11 sepostgresql.8, 1.1, 1.2 sepostgresql.init, 1.23,
	1.24 sepostgresql.spec, 1.25, 1.26 sources, 1.7,
	1.8 sepostgresql-pg_dump-8.3.3-2.patch, 1.2,
	NONE sepostgresql-policy-8.3.3-2.patch, 1.2,
	NONE sepostgresql-sepgsql-8.3.3-2.patch, 1.2, NONE
Message-ID: <20080930031235.D2D3C70119@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv684

Modified Files:
	.cvsignore sepostgresql.8 sepostgresql.init sepostgresql.spec 
	sources 
Added Files:
	sepostgresql-pg_dump-8.3.4-2.patch 
	sepostgresql-policy-8.3.4-2.patch 
	sepostgresql-sepgsql-8.3.4-2.patch 
Removed Files:
	sepostgresql-pg_dump-8.3.3-2.patch 
	sepostgresql-policy-8.3.3-2.patch 
	sepostgresql-sepgsql-8.3.3-2.patch 
Log Message:
update base version to 8.3.4


sepostgresql-pg_dump-8.3.4-2.patch:

--- NEW FILE sepostgresql-pg_dump-8.3.4-2.patch ---
diff -rpNU3 base/src/bin/pg_dump/pg_ace_dump.h sepgsql/src/bin/pg_dump/pg_ace_dump.h
--- base/src/bin/pg_dump/pg_ace_dump.h	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/bin/pg_dump/pg_ace_dump.h	2008-07-11 14:10:51.000000000 +0900
@@ -0,0 +1,279 @@
+#ifndef PG_ACE_DUMP_H
+#define PG_ACE_DUMP_H
+
+#include "pg_backup.h"
+#include "pg_dump.h"
+
+#define PG_ACE_FEATURE_NOTHING		0
+#define PG_ACE_FEATURE_SELINUX		1
+
+#define SELINUX_SYSATTR_NAME		"security_context"
+
+/*
+ * pg_ace_dumpCheckServerFeature
+ *
+ * This hook checks whether the server has required feature, or not.
+ */
+static inline void
+pg_ace_dumpCheckServerFeature(int feature, PGconn *conn)
+{
+	const char *serv_feature;
+
+	if (feature == PG_ACE_FEATURE_NOTHING)
+		return;
+
+	serv_feature = PQparameterStatus(conn, "pgace_security_feature");
+	if (!serv_feature)
+	{
+		fprintf(stderr, "could not get pgace_feature parameter.\n");
+		exit(1);
+	}
+
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		if (strcmp(serv_feature, "selinux") != 0)
+		{
+			fprintf(stderr, "server does not have SELinux feature\n");
+			exit(1);
+		}
+	}
+}
+
+/*
+ * pg_ace_dumpDatabaseXXXX
+ *
+ * These hooks gives a chance to inject a security system column
+ * on dumping pg_database system catalog.
+ * A modified part must have ",d.<security column>" style, and
+ * its result should be printed to buf.
+ */
+static inline const char *
+pg_ace_dumpDatabaseQuery(int feature)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+		return (",d." SELINUX_SYSATTR_NAME);
+
+	return "";
+}
+
+static inline void
+pg_ace_dumpDatabasePrint(int feature, PQExpBuffer buf,
+						 PGresult *res, int index)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		int i_security = PQfnumber(res, SELINUX_SYSATTR_NAME);
+		char *dbsecurity = PQgetvalue(res, index, i_security);
+
+		if (dbsecurity)
+			appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", dbsecurity);
+	}
+}
+
+/*
+ * pg_ace_dumpClassXXXX
+ *
+ * These hooks give a chance to inject a security system column
+ * on dumping pg_class system catalog. The modified part has to
+ * be formalized to ",c.<security column>" style. The result
+ * should be preserved at TableInfo->relsecurity to print later,
+ * if exist.
+ */
+static inline const char *
+pg_ace_dumpClassQuery(int feature)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+		return (",c." SELINUX_SYSATTR_NAME);
+
+	return "";
+}
+
+static inline char *
+pg_ace_dumpClassPreserve(int feature, PGresult *res, int index)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		int		attno = PQfnumber(res, SELINUX_SYSATTR_NAME);
+		char   *relcontext;
+
+		if (attno < 0)
+			return NULL;
+
+		relcontext = PQgetvalue(res, index, attno);
+
+		return !relcontext ? NULL : strdup(relcontext);
+	}
+
+	return NULL;
+}
+
+static inline void
+pg_ace_dumpClassPrint(int feature, PQExpBuffer buf, TableInfo *tbinfo)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		char   *relcontext = tbinfo->relsecurity;
+
+		if (relcontext)
+			appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", relcontext);
+
+		return;
+	}
+}
+
+/*
+ * pg_ace_dumpAttributeXXXX
+ *
+ * These hooks give a chance to inject a security system column
+ * on dumping pg_attribute system catalog. The modified part has
+ * to be formalized to ",a.<security conlumn>" style. The result
+ * should be preserved at TableInfo->attsecurity[index] to print
+ * later, if exist.
+ */
+static inline const char *
+pg_ace_dumpAttributeQuery(int feature)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+		return (",a." SELINUX_SYSATTR_NAME);
+
+	return "";
+}
+
+static inline char *
+pg_ace_dumpAttributePreserve(int feature, PGresult *res, int index)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		int		attno = PQfnumber(res, SELINUX_SYSATTR_NAME);
+		char   *attcontext;
+
+		if (attno < 0)
+			return NULL;
+
+		attcontext = PQgetvalue(res, index, attno);
+
+		return !attcontext ? NULL : strdup(attcontext);
+	}
+
+	return NULL;
+}
+
+static inline void
+pg_ace_dumpAttributePrint(int feature, PQExpBuffer buf,
+						  TableInfo *tbinfo, int index)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		char   *relcontext = tbinfo->relsecurity;
+		char   *attcontext = tbinfo->attsecurity[index];
+
+		if (attcontext)
+		{
+			if (relcontext && strcmp(relcontext, attcontext) == 0)
+				return;
+
+			appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", attcontext);
+		}
+		return;
+	}
+}
+
+/*
+ * pg_ace_dumpProcXXXX
+ *
+ * These hooks give a chance to inject a security system column
+ * on dumping pg_proc system catalog. The modified part has to be
+ * formalized to "<security conlumn>" style. The result should be
+ * printed later, if exist.
+ */
+static inline const char *
+pg_ace_dumpProcQuery(int feature)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+		return ("," SELINUX_SYSATTR_NAME);
+
+	return "";
+}
+
+static inline void
+pg_ace_dumpProcPrint(int feature, PQExpBuffer buf,
+					 PGresult *res, int index)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		int		i_selinux = PQfnumber(res, SELINUX_SYSATTR_NAME);
+		char   *prosecurity;
+
+		if (i_selinux < 0)
+			return;
+
+		prosecurity = PQgetvalue(res, index, i_selinux);
+		if (prosecurity)
+			appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", prosecurity);
+	}
+}
+
+/*
+ * pg_ace_dumpTableDataQuery
+ *
+ * This hook gives a chance to inject a security attribute system column
+ * on dumping of user's table.
+ * It must have ",<security column>" style.
+ */
+static inline const char *
+pg_ace_dumpTableDataQuery(int feature)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+		return ("," SELINUX_SYSATTR_NAME);
+
+	return "";
+}
+
+/*
+ * pg_ace_dumpCopyColumnList
+ *
+ * This hook gives a chance to inject a security attribute column within
+ * COPY statement. When a column is added, you have to return true. It
+ * enables to set needComma 'true', otherwise 'false'.
+ */
+static inline bool
+pg_ace_dumpCopyColumnList(int feature, PQExpBuffer buf)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		appendPQExpBuffer(buf, SELINUX_SYSATTR_NAME);
+		return true;
+	}
+
+	return false;
+}
+
+/*
+ * pg_ace_dumpBlobComments
+ *
+ * This hook gives a chance to inject a query to restore a security
+ * attribute of binary large object.
+ */
+static inline void
+pg_ace_dumpBlobComments(int feature, Archive *AH, PGconn *conn, Oid blobOid)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		PGresult   *res;
+		char		query[256];
+
+		snprintf(query, sizeof(query),
+				 "SELECT lo_get_security(%u)", blobOid);
+		res = PQexec(conn, query);
+		if (!res)
+			return;
+
+		if (PQresultStatus(res) == PGRES_TUPLES_OK && PQntuples(res) == 1)
+			archprintf(AH, "SELECT lo_set_security(%u, '%s');\n",
+					   blobOid, PQgetvalue(res, 0, 0));
+
+		PQclear(res);
+	}
+}
+
+#endif
diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
--- base/src/bin/pg_dump/pg_dump.c	2008-02-03 01:11:28.000000000 +0900
+++ sepgsql/src/bin/pg_dump/pg_dump.c	2008-07-11 14:10:51.000000000 +0900
@@ -50,6 +50,7 @@ int			optreset;
 
 #include "pg_backup_archiver.h"
 #include "dumputils.h"
+#include "pg_ace_dump.h"
 
 extern char *optarg;
 extern int	optind,
@@ -118,6 +119,8 @@ static int	g_numNamespaces;
 /* flag to turn on/off dollar quoting */
 static int	disable_dollar_quoting = 0;
 
+/* flag to turn on/off security attribute support */
+static int pg_ace_feature = PG_ACE_FEATURE_NOTHING;
 
 static void help(const char *progname);
 static void expand_schema_name_patterns(SimpleStringList *patterns,
@@ -267,6 +270,7 @@ main(int argc, char **argv)
 		{"disable-dollar-quoting", no_argument, &disable_dollar_quoting, 1},
 		{"disable-triggers", no_argument, &disable_triggers, 1},
 		{"use-set-session-authorization", no_argument, &use_setsessauth, 1},
+		{"security-context", no_argument, &pg_ace_feature, PG_ACE_FEATURE_SELINUX},
 
 		{NULL, 0, NULL, 0}
 	};
@@ -419,6 +423,8 @@ main(int argc, char **argv)
 					disable_triggers = 1;
 				else if (strcmp(optarg, "use-set-session-authorization") == 0)
 					use_setsessauth = 1;
+				else if (strcmp(optarg, "security-context") == 0)
+					pg_ace_feature = PG_ACE_FEATURE_SELINUX;
 				else
 				{
 					fprintf(stderr,
@@ -549,6 +555,8 @@ main(int argc, char **argv)
 	std_strings = PQparameterStatus(g_conn, "standard_conforming_strings");
 	g_fout->std_strings = (std_strings && strcmp(std_strings, "on") == 0);
 
+	pg_ace_dumpCheckServerFeature(pg_ace_feature, g_conn);
+
 	/* Set the datestyle to ISO to ensure the dump's portability */
 	do_sql_command(g_conn, "SET DATESTYLE = ISO");
 
@@ -771,6 +779,7 @@ help(const char *progname)
 	printf(_("  --use-set-session-authorization\n"
 			 "                              use SESSION AUTHORIZATION commands instead of\n"
 	"                              ALTER OWNER commands to set ownership\n"));
+	printf(_("  --security-context          enable to dump security context of SE-PostgreSQL\n"));
 
 	printf(_("\nConnection options:\n"));
 	printf(_("  -h, --host=HOSTNAME      database server host or socket directory\n"));
@@ -1160,7 +1169,8 @@ dumpTableData_insert(Archive *fout, void
 	if (fout->remoteVersion >= 70100)
 	{
 		appendPQExpBuffer(q, "DECLARE _pg_dump_cursor CURSOR FOR "
-						  "SELECT * FROM ONLY %s",
+						  "SELECT * %s FROM ONLY %s",
+						  pg_ace_dumpTableDataQuery(pg_ace_feature),
 						  fmtQualifiedId(tbinfo->dobj.namespace->dobj.name,
 										 classname));
 	}
@@ -1774,11 +1784,14 @@ dumpBlobComments(Archive *AH, void *arg)
 			Oid			blobOid;
 			char	   *comment;
 
+			blobOid = atooid(PQgetvalue(res, i, 0));
+
+			pg_ace_dumpBlobComments(pg_ace_feature, AH, g_conn, blobOid);
+
 			/* ignore blobs without comments */
 			if (PQgetisnull(res, i, 1))
 				continue;
 
-			blobOid = atooid(PQgetvalue(res, i, 0));
 			comment = PQgetvalue(res, i, 1);
 
 			printfPQExpBuffer(commentcmd, "COMMENT ON LARGE OBJECT %u IS ",
@@ -2926,6 +2939,7 @@ getTables(int *numTables)
 						  "d.refobjsubid as owning_col, "
 						  "(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, "
 						  "array_to_string(c.reloptions, ', ') as reloptions "
+						  "%s "
 						  "from pg_class c "
 						  "left join pg_depend d on "
 						  "(c.relkind = '%c' and "
@@ -2935,6 +2949,7 @@ getTables(int *numTables)
 						  "where relkind in ('%c', '%c', '%c', '%c') "
 						  "order by c.oid",
 						  username_subquery,
+						  pg_ace_dumpClassQuery(pg_ace_feature),
 						  RELKIND_SEQUENCE,
 						  RELKIND_RELATION, RELKIND_SEQUENCE,
 						  RELKIND_VIEW, RELKIND_COMPOSITE_TYPE);
@@ -3131,6 +3146,7 @@ getTables(int *numTables)
 		}
 		tblinfo[i].reltablespace = strdup(PQgetvalue(res, i, i_reltablespace));
 		tblinfo[i].reloptions = strdup(PQgetvalue(res, i, i_reloptions));
+		tblinfo[i].relsecurity = pg_ace_dumpClassPreserve(pg_ace_feature, res, i);
 
 		/* other fields were zeroed above */
 
@@ -4362,11 +4378,13 @@ getTableAttrs(TableInfo *tblinfo, int nu
 			appendPQExpBuffer(q, "SELECT a.attnum, a.attname, a.atttypmod, a.attstattarget, a.attstorage, t.typstorage, "
 				  "a.attnotnull, a.atthasdef, a.attisdropped, a.attislocal, "
 				   "pg_catalog.format_type(t.oid,a.atttypmod) as atttypname "
+							  "%s "		/* security context, if required */
 			 "from pg_catalog.pg_attribute a left join pg_catalog.pg_type t "
 							  "on a.atttypid = t.oid "
 							  "where a.attrelid = '%u'::pg_catalog.oid "
 							  "and a.attnum > 0::pg_catalog.int2 "
 							  "order by a.attrelid, a.attnum",
+							  pg_ace_dumpAttributeQuery(pg_ace_feature),
 							  tbinfo->dobj.catId.oid);
 		}
 		else if (g_fout->remoteVersion >= 70100)
@@ -4425,6 +4443,7 @@ getTableAttrs(TableInfo *tblinfo, int nu
 		tbinfo->typstorage = (char *) malloc(ntups * sizeof(char));
 		tbinfo->attisdropped = (bool *) malloc(ntups * sizeof(bool));
 		tbinfo->attislocal = (bool *) malloc(ntups * sizeof(bool));
+		tbinfo->attsecurity = (char **) malloc(ntups * sizeof(char *));
 		tbinfo->notnull = (bool *) malloc(ntups * sizeof(bool));
 		tbinfo->attrdefs = (AttrDefInfo **) malloc(ntups * sizeof(AttrDefInfo *));
 		tbinfo->inhAttrs = (bool *) malloc(ntups * sizeof(bool));
@@ -4456,6 +4475,8 @@ getTableAttrs(TableInfo *tblinfo, int nu
 			tbinfo->inhAttrs[j] = false;
 			tbinfo->inhAttrDef[j] = false;
 			tbinfo->inhNotNull[j] = false;
+
+			tbinfo->attsecurity[j] = pg_ace_dumpAttributePreserve(pg_ace_feature, res, j);
 		}
 
 		PQclear(res);
@@ -6459,8 +6480,10 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 						  "provolatile, proisstrict, prosecdef, "
 						  "proconfig, procost, prorows, "
 						  "(SELECT lanname FROM pg_catalog.pg_language WHERE oid = prolang) as lanname "
+						  "%s "		/* security context, if required */
 						  "FROM pg_catalog.pg_proc "
 						  "WHERE oid = '%u'::pg_catalog.oid",
+						  pg_ace_dumpProcQuery(pg_ace_feature),
 						  finfo->dobj.catId.oid);
 	}
 	else if (g_fout->remoteVersion >= 80100)
@@ -6698,6 +6721,8 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 	if (prosecdef[0] == 't')
 		appendPQExpBuffer(q, " SECURITY DEFINER");
 
+	pg_ace_dumpProcPrint(pg_ace_feature, q, res, 0);
+
 	/*
 	 * COST and ROWS are emitted only if present and not default, so as not to
 	 * break backwards-compatibility of the dump without need.	Keep this code
@@ -8779,6 +8804,8 @@ dumpTableSchema(Archive *fout, TableInfo
 				if (tbinfo->notnull[j] && !tbinfo->inhNotNull[j])
 					appendPQExpBuffer(q, " NOT NULL");
 
+				pg_ace_dumpAttributePrint(pg_ace_feature, q, tbinfo, j);
+
 				actual_atts++;
 			}
 		}
@@ -8826,6 +8853,8 @@ dumpTableSchema(Archive *fout, TableInfo
 		if (tbinfo->reloptions && strlen(tbinfo->reloptions) > 0)
 			appendPQExpBuffer(q, "\nWITH (%s)", tbinfo->reloptions);
 
+		pg_ace_dumpClassPrint(pg_ace_feature, q, tbinfo);
+
 		appendPQExpBuffer(q, ";\n");
 
 		/* Loop dumping statistics and storage statements */
@@ -10243,6 +10272,10 @@ fmtCopyColumnList(const TableInfo *ti)
 
 	appendPQExpBuffer(q, "(");
 	needComma = false;
+
+	if (pg_ace_dumpCopyColumnList(pg_ace_feature, q))
+		needComma = true;
+
 	for (i = 0; i < numatts; i++)
 	{
 		if (attisdropped[i])
diff -rpNU3 base/src/bin/pg_dump/pg_dump.h sepgsql/src/bin/pg_dump/pg_dump.h
--- base/src/bin/pg_dump/pg_dump.h	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/bin/pg_dump/pg_dump.h	2008-06-15 22:27:55.000000000 +0900
@@ -238,6 +238,7 @@ typedef struct _tableInfo
 	char		relkind;
 	char	   *reltablespace;	/* relation tablespace */
 	char	   *reloptions;		/* options specified by WITH (...) */
+	char	   *relsecurity;	/* security attribute of the relation */
 	bool		hasindex;		/* does it have any indexes? */
 	bool		hasrules;		/* does it have any rules? */
 	bool		hasoids;		/* does it have OIDs? */
@@ -262,6 +263,7 @@ typedef struct _tableInfo
 	char	   *typstorage;		/* type storage scheme */
 	bool	   *attisdropped;	/* true if attr is dropped; don't dump it */
 	bool	   *attislocal;		/* true if attr has local definition */
+	char	  **attsecurity;	/* security attribute of attribute (column) */
 
 	/*
 	 * Note: we need to store per-attribute notnull, default, and constraint
diff -rpNU3 base/src/bin/pg_dump/pg_dumpall.c sepgsql/src/bin/pg_dump/pg_dumpall.c
--- base/src/bin/pg_dump/pg_dumpall.c	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/bin/pg_dump/pg_dumpall.c	2008-07-11 14:10:51.000000000 +0900
@@ -27,6 +27,7 @@ int			optreset;
 #endif
 
 #include "dumputils.h"
+#include "pg_ace_dump.h"
 
 
 /* version string we expect back from pg_dump */
@@ -67,6 +68,9 @@ static int	disable_triggers = 0;
 static int	use_setsessauth = 0;
 static int	server_version;
 
+/* flag to turn on/off security attribute support */
+static int	pg_ace_feature = PG_ACE_FEATURE_NOTHING;
+
 static FILE *OPF;
 static char *filename = NULL;
 
@@ -119,6 +123,7 @@ main(int argc, char *argv[])
 		{"disable-dollar-quoting", no_argument, &disable_dollar_quoting, 1},
 		{"disable-triggers", no_argument, &disable_triggers, 1},
 		{"use-set-session-authorization", no_argument, &use_setsessauth, 1},
+		{"security-context", no_argument, &pg_ace_feature, PG_ACE_FEATURE_SELINUX},
 
 		{NULL, 0, NULL, 0}
 	};
@@ -290,6 +295,8 @@ main(int argc, char *argv[])
 					appendPQExpBuffer(pgdumpopts, " --disable-triggers");
 				else if (strcmp(optarg, "use-set-session-authorization") == 0)
 					 /* no-op, still allowed for compatibility */ ;
+				else if (strcmp(optarg, "security-context") == 0)
+					pg_ace_feature = PG_ACE_FEATURE_SELINUX;
 				else
 				{
 					fprintf(stderr,
@@ -316,6 +323,8 @@ main(int argc, char *argv[])
 		appendPQExpBuffer(pgdumpopts, " --disable-triggers");
 	if (use_setsessauth)
 		appendPQExpBuffer(pgdumpopts, " --use-set-session-authorization");
+	if (pg_ace_feature == PG_ACE_FEATURE_SELINUX)
+		appendPQExpBuffer(pgdumpopts, " --security-context");
 
 	if (optind < argc)
 	{
@@ -391,6 +400,8 @@ main(int argc, char *argv[])
 		}
 	}
 
+	pg_ace_dumpCheckServerFeature(pg_ace_feature, conn);
+
 	/*
 	 * Open the output file if required, otherwise use stdout
 	 */
@@ -505,6 +516,7 @@ help(void)
 	printf(_("  --use-set-session-authorization\n"
 			 "                           use SESSION AUTHORIZATION commands instead of\n"
 			 "                           OWNER TO commands\n"));
+	printf(_("  --security-context       enables to dump security context of SE-PostgreSQL\n"));
 
 	printf(_("\nConnection options:\n"));
 	printf(_("  -h, --host=HOSTNAME      database server host or socket directory\n"));
@@ -915,16 +927,18 @@ dumpCreateDB(PGconn *conn)
 	fprintf(OPF, "--\n-- Database creation\n--\n\n");
 
 	if (server_version >= 80100)
-		res = executeQuery(conn,
+		appendPQExpBuffer(buf,
 						   "SELECT datname, "
 						   "coalesce(rolname, (select rolname from pg_authid where oid=(select datdba from pg_database where datname='template0'))), "
 						   "pg_encoding_to_char(d.encoding), "
 						   "datistemplate, datacl, datconnlimit, "
 						   "(SELECT spcname FROM pg_tablespace t WHERE t.oid = d.dattablespace) AS dattablespace "
+						   "%s "
 			  "FROM pg_database d LEFT JOIN pg_authid u ON (datdba = u.oid) "
-						   "WHERE datallowconn ORDER BY 1");
+						   "WHERE datallowconn ORDER BY 1",
+						   pg_ace_dumpDatabaseQuery(pg_ace_feature));
 	else if (server_version >= 80000)
-		res = executeQuery(conn,
+		appendPQExpBuffer(buf,
 						   "SELECT datname, "
 						   "coalesce(usename, (select usename from pg_shadow where usesysid=(select datdba from pg_database where datname='template0'))), "
 						   "pg_encoding_to_char(d.encoding), "
@@ -933,7 +947,7 @@ dumpCreateDB(PGconn *conn)
 		   "FROM pg_database d LEFT JOIN pg_shadow u ON (datdba = usesysid) "
 						   "WHERE datallowconn ORDER BY 1");
 	else if (server_version >= 70300)
-		res = executeQuery(conn,
+		appendPQExpBuffer(buf,
 						   "SELECT datname, "
 						   "coalesce(usename, (select usename from pg_shadow where usesysid=(select datdba from pg_database where datname='template0'))), "
 						   "pg_encoding_to_char(d.encoding), "
@@ -942,7 +956,7 @@ dumpCreateDB(PGconn *conn)
 		   "FROM pg_database d LEFT JOIN pg_shadow u ON (datdba = usesysid) "
 						   "WHERE datallowconn ORDER BY 1");
 	else if (server_version >= 70100)
-		res = executeQuery(conn,
+		appendPQExpBuffer(buf,
 						   "SELECT datname, "
 						   "coalesce("
 					"(select usename from pg_shadow where usesysid=datdba), "
@@ -958,7 +972,7 @@ dumpCreateDB(PGconn *conn)
 		 * Note: 7.0 fails to cope with sub-select in COALESCE, so just deal
 		 * with getting a NULL by not printing any OWNER clause.
 		 */
-		res = executeQuery(conn,
+		appendPQExpBuffer(buf,
 						   "SELECT datname, "
 					"(select usename from pg_shadow where usesysid=datdba), "
 						   "pg_encoding_to_char(d.encoding), "
@@ -968,6 +982,7 @@ dumpCreateDB(PGconn *conn)
 						   "FROM pg_database d "
 						   "ORDER BY 1");
 	}
+	res = executeQuery(conn, buf->data);
 
 	for (i = 0; i < PQntuples(res); i++)
 	{
@@ -1021,6 +1036,8 @@ dumpCreateDB(PGconn *conn)
 				appendPQExpBuffer(buf, " CONNECTION LIMIT = %s",
 								  dbconnlimit);
 
+			pg_ace_dumpDatabasePrint(pg_ace_feature, buf, res, i);
+
 			appendPQExpBuffer(buf, ";\n");
 
 			if (strcmp(dbistemplate, "t") == 0)

sepostgresql-policy-8.3.4-2.patch:

--- NEW FILE sepostgresql-policy-8.3.4-2.patch ---
diff -rpNU3 base/src/backend/security/sepgsql/policy/Makefile sepgsql/src/backend/security/sepgsql/policy/Makefile
--- base/src/backend/security/sepgsql/policy/Makefile	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/Makefile	2008-07-11 14:10:51.000000000 +0900
@@ -0,0 +1,41 @@
+#
+# contrib/sepgsql_policy/Makefile
+#   Makefile of security policy module for SE-PostgreSQL
+#
+top_builddir = ../../../../..
+include $(top_builddir)/src/Makefile.global
+
+policy_basedir	:= /usr/share/selinux
+policy_makefile	:= $(policy_basedir)/devel/Makefile
+policy_types	:= targeted mls
+policy		:= $(strip $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config))
+package_names	:= sepostgresql sepostgresql-devel
+prefix_ptn	:= "s/%%__prefix__%%/$(shell echo $(prefix)|sed 's/\//\\\//g')/g"
+bindir_ptn	:= "s/%%__bindir__%%/$(shell echo $(bindir)|sed 's/\//\\\//g')/g"
+libdir_ptn	:= "s/%%__libdir__%%/$(shell echo $(pkglibdir)|sed 's/\//\\\//g')/g"
+
+all:
+	$(foreach pkg, $(package_names), $(foreach p, $(policy_types), $(MAKE) $(MAKEOVERRIDES) policy=$(p) $(pkg).pp;))
+	$(foreach pkg, $(package_names), test -e $(pkg).pp.$(policy) && ln -sf $(pkg).pp.$(policy) $(pkg).pp;)
+
+.install-policy:
+	test -d $(DESTDIR)$(policy_basedir)/$(policy) || install -d $(DESTDIR)$(policy_basedir)/$(policy)
+	$(foreach pkg, $(package_names), install -p -m 644 $(pkg).pp.$(policy) $(DESTDIR)$(policy_basedir)/$(policy)/$(pkg).pp;)
+
+install: all
+	$(foreach p, $(policy_types), $(MAKE) $(MAKEOVERRIDES) policy=$(p) .install-policy;)
+
+%.pp: %.te %.if %.fc
+	rm -f $@
+	$(MAKE) NAME=$(policy) -f $(policy_makefile) $@
+	mv $@ $@.$(policy)
+
+sepostgresql-devel.fc: sepostgresql.fc.template
+	cat $< | grep -v ^/var | sed -e $(prefix_ptn) -e $(bindir_ptn) -e $(libdir_ptn) > $@
+
+sepostgresql.fc: sepostgresql.fc.template
+	cat $< | sed -e $(prefix_ptn) -e $(bindir_ptn) -e $(libdir_ptn) > $@
+
+clean:
+	$(MAKE) -f $(policy_makefile) clean
+	rm -f *.pp.* *.fc
diff -rpNU3 base/src/backend/security/sepgsql/policy/README sepgsql/src/backend/security/sepgsql/policy/README
--- base/src/backend/security/sepgsql/policy/README	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/README	2008-07-11 14:10:51.000000000 +0900
@@ -0,0 +1,49 @@
+The security policy module of SE-PostgreSQL
+-------------------------------------------
+
+o Introduction
+
+  We provide two kind of security policy modules.
+
+  One is "sepostgresql.pp" which contains full-set of security policy
+  and suitable for legacy base policy (selinux-policy-3.4.1, or prior).
+
+  The other is "sepostgresql-devel.pp" which provides several booleans
+  for developers, and suitable for newer base policy (selinux-policy-3.4.2,
+  or later).
+
+  In the selinux-policy-3.4.2, most part of the policy got upstreamed.
+  So, we don't need to install "sepostgresql.pp" explicitly on the newer
+  base security policy.
+
+  If you need to run regression test, or (don't) want to generate access
+  logs, install "sepostgresql-devel.pp" and turn on/off booleans.
+
+o Build & Installation
+
+  $ cd src/backend/security/sepgsql/policy
+  $ make
+  $ su
+  # /usr/sbin/semodule -i sepostgresql-devel.pp
+      or
+  #  /usr/sbin/semodule -i sepostgresql.pp
+
+o Booleans
+
+- sepgsql_enable_users_ddl (default: on)
+  This boolean enables to control to execute DDL statement come from
+  confined users.
+
+- sepgsql_enable_auditallow (default: off)
+  This boolean enables to generate access allow logs except for tuple
+  level.
+
+- sepgsql_enable_auditdeny (default: on)
+  This boolean enables to generata access denied logs except for tuple
+  level.
+
+- sepgsql_regression_test_mode (default: off)
+  This boolean provides several permission to run regression test on
+  your home directory. It enables to load shared library files deployed
+  on home directory.
+  However, we don't recommend it to turn on in the operation phase.
diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql-devel.if sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.if
--- base/src/backend/security/sepgsql/policy/sepostgresql-devel.if	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.if	2008-07-11 14:10:51.000000000 +0900
@@ -0,0 +1 @@
+## There are no interface declaration
diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql-devel.te sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.te
--- base/src/backend/security/sepgsql/policy/sepostgresql-devel.te	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.te	2008-09-29 22:58:43.000000000 +0900
@@ -0,0 +1,127 @@
+policy_module(sepostgresql-devel, 3.14)
+
+gen_require(`
+	class db_database all_db_database_perms;
+	class db_table all_db_table_perms;
+	class db_procedure all_db_procedure_perms;
+	class db_column all_db_column_perms;
+	class db_tuple all_db_tuple_perms;
+	class db_blob all_db_blob_perms;
+
+	attribute domain, home_type, tmpfile;
+	attribute sepgsql_client_type;
+	attribute sepgsql_unconfined_type;
+
+	attribute sepgsql_database_type;
+	attribute sepgsql_table_type;
+	attribute sepgsql_sysobj_table_type;
+	attribute sepgsql_procedure_type;
+	attribute sepgsql_blob_type;
+	attribute sepgsql_module_type;
+
+	type sepgsql_trusted_proc_t;
+')
+
+#################################
+#
+# Domain for Testcases
+#
+
+type sepgsql_test_t;
+domain_type(sepgsql_test_t)
+
+optional_policy(`
+	gen_require(`
+		role unconfined_r;
+		type unconfined_t;
+	')
+	allow unconfined_t sepgsql_test_t : process transition;
+	role unconfined_r types sepgsql_test_t;
+	role unconfined_r types sepgsql_trusted_proc_t;
+')
+
+corecmd_exec_bin(sepgsql_test_t)
+allow sepgsql_test_t bin_t : file { entrypoint };
+
+files_read_usr_files(sepgsql_test_t)
+files_read_etc_files(sepgsql_test_t)
+libs_use_ld_so(sepgsql_test_t)
+libs_use_shared_libs(sepgsql_test_t)
+
+term_use_all_terms(sepgsql_test_t)
+
+files_search_home(sepgsql_test_t)
+allow sepgsql_test_t home_type : file rw_file_perms;
+allow sepgsql_test_t home_type : dir search_dir_perms;
+miscfiles_read_localization(sepgsql_test_t)
+
+allow sepgsql_test_t tmpfile : dir search_dir_perms;
+allow sepgsql_test_t tmpfile : file rw_file_perms;
+
+postgresql_stream_connect(sepgsql_test_t)
+postgresql_unpriv_client(sepgsql_test_t)
+
+optional_policy(`
+	nscd_shm_use(sepgsql_test_t)
+')
+
+#################################
+#
+# SE-PostgreSQL Declarations
+#
+
+## <desc>
+## <p>
+## Allow to generate auditallow logs
+## </p>
+## </desc>
+gen_tunable(sepgsql_enable_auditallow, false)
+
+## <desc>
+## <p>
+## Allow to generate auditdeny logs
+## </p>
+## </desc>
+gen_tunable(sepgsql_enable_auditdeny,  true)
+
+## <desc>
+## <p>
+## Allow widespread permissions for regression test
+## Don't set TRUE on operation phase
+## </p>
+## </desc>
+gen_tunable(sepgsql_regression_test_mode, false)
+
+########################################
+#
+# SE-PostgreSQL audit switch for debugging
+#
+tunable_policy(`sepgsql_enable_auditallow',`
+	auditallow domain sepgsql_database_type  : db_database *;
+	auditallow domain sepgsql_table_type     : db_table *;
+	auditallow domain sepgsql_table_type     : db_column *;
+	auditallow domain sepgsql_procedure_type : db_procedure *;
+	auditallow domain sepgsql_blob_type      : db_blob *;
+	auditallow domain sepgsql_module_type    : db_database { install_module };
+	auditallow sepgsql_database_type sepgsql_module_type : db_database { load_module };
+')
+
+tunable_policy(`! sepgsql_enable_auditdeny',`
+	dontaudit domain sepgsql_database_type   : db_database *;
+	dontaudit domain sepgsql_table_type      : db_table *;
+	dontaudit domain sepgsql_table_type      : db_column *;
+	dontaudit domain sepgsql_procedure_type  : db_procedure *;
+	dontaudit domain sepgsql_blob_type       : db_blob *;
+	dontaudit domain sepgsql_module_type     : db_database { install_module };
+	dontaudit sepgsql_database_type sepgsql_module_type : db_database { load_module };
+')
+
+########################################
+#
+# SE-PostgreSQL regression test mode switch
+#
+tunable_policy(`sepgsql_regression_test_mode',`
+	allow sepgsql_client_type       home_type : db_database { install_module };
+	allow sepgsql_unconfined_type   home_type : db_database { install_module };
+	allow sepgsql_database_type     home_type : db_database { load_module };
+')
diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql.fc.template sepgsql/src/backend/security/sepgsql/policy/sepostgresql.fc.template
--- base/src/backend/security/sepgsql/policy/sepostgresql.fc.template	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql.fc.template	2008-07-11 14:10:51.000000000 +0900
@@ -0,0 +1,15 @@
+#
+# SE-PostgreSQL install path
+#
+%%__prefix__%%(/.*)?			--	gen_context(system_u:object_r:usr_t,s0)
+
+%%__bindir__%%/(se)?postgres		--	gen_context(system_u:object_r:postgresql_exec_t,s0)
+%%__bindir__%%/(se)?pg_ctl		--	gen_context(system_u:object_r:initrc_exec_t,s0)
+%%__bindir__%%/initdb(\.sepgsql)?	--	gen_context(system_u:object_r:postgresql_exec_t,s0)
+%%__bindir__%%(/.*)?			--	gen_context(system_u:object_r:bin_t,s0)
+
+%%__libdir__%%(/.*)?			--	gen_context(system_u:object_r:lib_t,s0)
+
+/var/lib/sepgsql(/.*)?				gen_context(system_u:object_r:postgresql_db_t,s0)
+/var/lib/sepgsql/pgstartup\.log			gen_context(system_u:object_r:postgresql_log_t,s0)
+/var/log/sepostgresql\.log.*		--	gen_context(system_u:object_r:postgresql_log_t,s0)
diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql.if sepgsql/src/backend/security/sepgsql/policy/sepostgresql.if
--- base/src/backend/security/sepgsql/policy/sepostgresql.if	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql.if	2008-07-11 17:12:06.000000000 +0900
@@ -0,0 +1,259 @@
+#######################################
+## <summary>
+##      The userdomain template for the SE-PostgreSQL.
+## </summary>
+## <desc>
+##      This template creates a delivered types which are used
+##     for given userdomains.
+## </desc>
+## <param name="userdomain_prefix">
+##      <summary>
+##      The prefix of the user domain (e.g., user
+##      is the prefix for user_t).
+##      </summary>
+## </param>
+## <param name="user_domain">
+##     <summary>
+##      The type of the user domain.
+##      </summary>
+## </param>
+## <param name="user_role">
+##      <summary>
+##      The role associated with the user domain.
+##      </summary>
+## </param>
+#
+template(`sepgsql_userdom_template',`
+	gen_require(`
+		class db_database all_db_database_perms;
+		class db_table all_db_table_perms;
+		class db_procedure all_db_procedure_perms;
+		class db_column all_db_column_perms;
+		class db_tuple all_db_tuple_perms;
+		class db_blob all_db_blob_perms;
+
+		attribute sepgsql_client_type;
+		attribute sepgsql_database_type;
+		attribute sepgsql_sysobj_table_type;
+
+		type sepgsql_trusted_proc_t;
+		type sepgsql_trusted_proc_exec_t;
+	')
+
+	########################################
+	#
+	# Declarations
+	#
+
+	typeattribute $2 sepgsql_client_type;
+
+	type $1_sepgsql_blob_t;
+	sepgsql_blob_object($1_sepgsql_blob_t)
+
+	type $1_sepgsql_proc_exec_t;
+	sepgsql_procedure_object($1_sepgsql_proc_exec_t)
+
+	type $1_sepgsql_sysobj_t;
+	sepgsql_system_table_object($1_sepgsql_sysobj_t)
+
+	type $1_sepgsql_table_t;
+	sepgsql_table_object($1_sepgsql_table_t)
+
+	role $3 types sepgsql_trusted_proc_t;
+
+	##############################
+	#
+	# Client local policy
+	#
+
+	tunable_policy(`sepgsql_enable_users_ddl',`
+		allow $2 $1_sepgsql_table_t  : db_table { create drop };
+		type_transition $2 sepgsql_database_type:db_table $1_sepgsql_table_t;
+
+		allow $2 $1_sepgsql_table_t  : db_column { create drop };
+
+		allow $2 $1_sepgsql_sysobj_t : db_tuple { update insert delete };
+		type_transition $2 sepgsql_sysobj_table_type:db_tuple $1_sepgsql_sysobj_t;
+	')
+
+	allow $2 $1_sepgsql_table_t  : db_table  { getattr setattr use select update insert delete };
+	allow $2 $1_sepgsql_table_t  : db_column { getattr setattr use select update insert };
+	allow $2 $1_sepgsql_table_t  : db_tuple  { use select update insert delete };
+	allow $2 $1_sepgsql_sysobj_t : db_tuple  { use select };
+
+	allow $2 $1_sepgsql_proc_exec_t : db_procedure { create drop getattr setattr execute };
+	type_transition $2 sepgsql_database_type:db_procedure $1_sepgsql_proc_exec_t;
+
+	allow $2 $1_sepgsql_blob_t : db_blob { create drop getattr setattr read write };
+	type_transition $2 sepgsql_database_type:db_blob $1_sepgsql_blob_t;
+
+	allow $2 sepgsql_trusted_proc_t:process transition;
+	type_transition $2 sepgsql_trusted_proc_exec_t:process sepgsql_trusted_proc_t;
+')
+
+########################################
+## <summary>
+##     Marks as a SE-PostgreSQL loadable shared library module
+## </summary>
+## <param name="type">
+##     <summary>
+##     Type marked as a database object type.
+##     </summary>
+## </param>
+#
+interface(`sepgsql_loadable_module',`
+	gen_require(`
+		attribute sepgsql_module_type;
+	')
+
+	typeattribute $1 sepgsql_module_type;
+')
+
+########################################
+## <summary>
+##     Marks as a SE-PostgreSQL database object type
+## </summary>
+## <param name="type">
+##     <summary>
+##     Type marked as a database object type.
+##     </summary>
+## </param>
+#
+interface(`sepgsql_database_object',`
+	gen_require(`
+		attribute sepgsql_database_type;
+	')
+
+	typeattribute $1 sepgsql_database_type;
+')
+
+########################################
+## <summary>
+##     Marks as a SE-PostgreSQL table/column/tuple object type
+## </summary>
+## <param name="type">
+##     <summary>
+##     Type marked as a table/column/tuple object type.
+##     </summary>
+## </param>
+#
+interface(`sepgsql_table_object',`
+	gen_require(`
+		attribute sepgsql_table_type;
+	')
+
+	typeattribute $1 sepgsql_table_type;
+')
+
+########################################
+## <summary>
+##     Marks as a SE-PostgreSQL system table/column/tuple object type
+## </summary>
+## <param name="type">
+##     <summary>
+##     Type marked as a table/column/tuple object type.
+##     </summary>
+## </param>
+#
+interface(`sepgsql_system_table_object',`
+	gen_require(`
+		attribute sepgsql_table_type;
+		attribute sepgsql_sysobj_table_type;
+	')
+
+	typeattribute $1 sepgsql_table_type;
+	typeattribute $1 sepgsql_sysobj_table_type;
+')
+
+########################################
+## <summary>
+##     Marks as a SE-PostgreSQL procedure object type
+## </summary>
+## <param name="type">
+##     <summary>
+##     Type marked as a database object type.
+##     </summary>
+## </param>
+#
+interface(`sepgsql_procedure_object',`
+	gen_require(`
+		attribute sepgsql_procedure_type;
+	')
+
+	typeattribute $1 sepgsql_procedure_type;
+')
+
+########################################
+## <summary>
+##     Marks as a SE-PostgreSQL binary large object type
+## </summary>
+## <param name="type">
+##     <summary>
+##     Type marked as a database binary large object type.
+##     </summary>
+## </param>
+#
+interface(`sepgsql_blob_object',`
+	gen_require(`
+		attribute sepgsql_blob_type;
+	')
+
+	typeattribute $1 sepgsql_blob_type;
+')
+
+########################################
+## <summary>
+##      Allow the specified domain unprivileged accesses to unifined database objects
+##     managed by SE-PostgreSQL,
+## </summary>
+## <param name="domain">
+##      <summary>
+##      Domain allowed access.
+##      </summary>
+## </param>
+#
+interface(`sepgsql_unpriv_client',`
+	gen_require(`
+		class db_table all_db_table_perms;
+		class db_procedure all_db_procedure_perms;
+		class db_blob all_db_blob_perms;
+
+		attribute sepgsql_client_type;
+		attribute sepgsql_database_type;
+
+		type sepgsql_table_t;
+		type sepgsql_proc_t;
+		type sepgsql_blob_t;
+
+		type sepgsql_trusted_proc_t;
+		type sepgsql_trusted_proc_exec_t;
+	')
+
+	typeattribute $1 sepgsql_client_type;
+
+	type_transition $1 sepgsql_database_type:db_table sepgsql_table_t;
+	type_transition $1 sepgsql_database_type:db_procedure sepgsql_proc_t;
+	type_transition $1 sepgsql_database_type:db_blob sepgsql_blob_t;
+
+	type_transition $1 sepgsql_trusted_proc_exec_t:process sepgsql_trusted_proc_t;
+	allow $1 sepgsql_trusted_proc_t:process transition;
+')
+
+########################################
+## <summary>
+##      Allow the specified domain unconfined accesses to any database objects
+##     managed by SE-PostgreSQL,
+## </summary>
+## <param name="domain">
+##      <summary>
+##      Domain allowed access.
+##      </summary>
+## </param>
+#
+interface(`sepgsql_unconfined',`
+	gen_require(`
+		attribute sepgsql_unconfined_type;
+	')
+
+	typeattribute $1 sepgsql_unconfined_type;
+')
diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql.te sepgsql/src/backend/security/sepgsql/policy/sepostgresql.te
--- base/src/backend/security/sepgsql/policy/sepostgresql.te	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql.te	2008-07-11 17:12:06.000000000 +0900
@@ -0,0 +1,308 @@
+policy_module(sepostgresql, 3.11)
+
+gen_require(`
+	class db_database all_db_database_perms;
+	class db_table all_db_table_perms;
+	class db_procedure all_db_procedure_perms;
+	class db_column all_db_column_perms;
+	class db_tuple all_db_tuple_perms;
+	class db_blob all_db_blob_perms;
+
+	attribute domain, home_type;
+	type postgresql_t, unlabeled_t;
+
+	role system_r;
+')
+
+#################################
+#
+# SE-PostgreSQL Declarations
+#
+
+## <desc>
+## <p>
+## Allow to generate auditallow logs
+## </p>
+## </desc>
+gen_tunable(sepgsql_enable_auditallow, false)
+
+## <desc>
+## <p>
+## Allow to generate auditdeny logs
+## </p>
+## </desc>
+gen_tunable(sepgsql_enable_auditdeny,  true)
+
+## <desc>
+## <p>
+## Allow unprivileged users to execute DDL statement
+## </p>
+## </desc>
+gen_tunable(sepgsql_enable_users_ddl,  true)
+
+## <desc>
+## <p>
+## Allow widespread permissions for regression test
+## Don't set TRUE on operation phase
+## </p>
+## </desc>
+gen_tunable(sepgsql_regression_test_mode, false)
+
+# database clients attribute
+attribute sepgsql_client_type;
+attribute sepgsql_unconfined_type;
+
+# database objects attribute
+attribute sepgsql_database_type;
+attribute sepgsql_table_type;
+attribute sepgsql_sysobj_table_type;
+attribute sepgsql_procedure_type;
+attribute sepgsql_blob_type;
+attribute sepgsql_module_type;
+
+# database object types
+type sepgsql_blob_t;
+sepgsql_blob_object(sepgsql_blob_t)
+
+type sepgsql_db_t;
+sepgsql_database_object(sepgsql_db_t)
+
+type sepgsql_fixed_table_t;
+sepgsql_table_object(sepgsql_fixed_table_t)
+
+type sepgsql_proc_t;
+sepgsql_procedure_object(sepgsql_proc_t)
+
+type sepgsql_ro_blob_t;
+sepgsql_blob_object(sepgsql_ro_blob_t)
+
+type sepgsql_ro_table_t;
+sepgsql_table_object(sepgsql_ro_table_t)
+
+type sepgsql_secret_blob_t;
+sepgsql_blob_object(sepgsql_secret_blob_t)
+
+type sepgsql_secret_table_t;
+sepgsql_table_object(sepgsql_secret_table_t)
+
+type sepgsql_sysobj_t;
+sepgsql_system_table_object(sepgsql_sysobj_t)
+
+type sepgsql_table_t;
+sepgsql_table_object(sepgsql_table_t)
+
+type sepgsql_trusted_proc_exec_t;
+sepgsql_procedure_object(sepgsql_trusted_proc_exec_t)
+
+# Trusted Procedure Domain
+type sepgsql_trusted_proc_t;
+domain_type(sepgsql_trusted_proc_t)
+sepgsql_unconfined(sepgsql_trusted_proc_t)
+role system_r types sepgsql_trusted_proc_t;
+
+########################################
+#
+# SE-PostgreSQL Local Policy
+#
+allow postgresql_t self:netlink_selinux_socket create_socket_perms;
+selinux_get_enforce_mode(postgresql_t)
+selinux_validate_context(postgresql_t)
+selinux_compute_access_vector(postgresql_t)
+selinux_compute_create_context(postgresql_t)
+selinux_compute_relabel_context(postgresql_t)
+seutil_libselinux_linked(postgresql_t)
+
+allow postgresql_t sepgsql_database_type:db_database *;
+type_transition postgresql_t postgresql_t:db_database sepgsql_db_t;
+
+allow postgresql_t sepgsql_module_type:db_database install_module;
+allow postgresql_t sepgsql_table_type:{ db_table db_column db_tuple } *;
+allow postgresql_t sepgsql_procedure_type:db_procedure *;
+allow postgresql_t sepgsql_blob_type:db_blob *;
+
+# server specific type transitions
+type_transition postgresql_t sepgsql_database_type:db_table sepgsql_sysobj_t;
+type_transition postgresql_t sepgsql_database_type:db_procedure sepgsql_proc_t;
+type_transition postgresql_t sepgsql_database_type:db_blob sepgsql_blob_t;
+
+# Database/Loadable module
+allow sepgsql_database_type sepgsql_module_type:db_database load_module;
+
+########################################
+#
+# Rules common to all clients
+#
+
+# Client domain constraint
+allow sepgsql_client_type sepgsql_db_t:db_database { getattr access get_param set_param };
+type_transition sepgsql_client_type sepgsql_client_type:db_database sepgsql_db_t;
+
+allow sepgsql_client_type sepgsql_fixed_table_t:db_table { getattr use select insert };
+allow sepgsql_client_type sepgsql_fixed_table_t:db_column { getattr use select insert };
+allow sepgsql_client_type sepgsql_fixed_table_t:db_tuple { use select insert };
+
+allow sepgsql_client_type sepgsql_table_t:db_table { getattr use select update insert delete };
+allow sepgsql_client_type sepgsql_table_t:db_column { getattr use select update insert };
+allow sepgsql_client_type sepgsql_table_t:db_tuple { use select update insert delete };
+
+allow sepgsql_client_type sepgsql_ro_table_t:db_table { getattr use select };
+allow sepgsql_client_type sepgsql_ro_table_t:db_column { getattr use select };
+allow sepgsql_client_type sepgsql_ro_table_t:db_tuple { use select };
+
+allow sepgsql_client_type sepgsql_secret_table_t:db_table getattr;
+allow sepgsql_client_type sepgsql_secret_table_t:db_column getattr;
+
+allow sepgsql_client_type sepgsql_sysobj_t:db_table { getattr use select };
+allow sepgsql_client_type sepgsql_sysobj_t:db_column { getattr use select };
+allow sepgsql_client_type sepgsql_sysobj_t:db_tuple { use select };
+
+allow sepgsql_client_type sepgsql_proc_t:db_procedure { getattr execute };
+allow sepgsql_client_type sepgsql_trusted_proc_t:db_procedure { getattr execute entrypoint };
+
+allow sepgsql_client_type sepgsql_blob_t:db_blob { create drop getattr setattr read write };
+allow sepgsql_client_type sepgsql_ro_blob_t:db_blob { getattr read };
+allow sepgsql_client_type sepgsql_secret_blob_t:db_blob getattr;
+
+tunable_policy(`sepgsql_enable_users_ddl',`
+	allow sepgsql_client_type sepgsql_table_t:db_table { create drop setattr };
+	allow sepgsql_client_type sepgsql_table_t:db_column { create drop setattr };
+	allow sepgsql_client_type sepgsql_sysobj_t:db_tuple { update insert delete };
+')
+
+########################################
+#
+# Unconfined access to this module
+#
+
+allow sepgsql_unconfined_type sepgsql_database_type:db_database *;
+allow sepgsql_unconfined_type sepgsql_table_type:{ db_table db_column db_tuple } *;
+allow sepgsql_unconfined_type sepgsql_blob_type:db_blob *;
+allow sepgsql_unconfined_type { sepgsql_proc_t sepgsql_trusted_proc_t }:db_procedure *;
+allow sepgsql_unconfined_type sepgsql_procedure_type:db_procedure { create drop getattr setattr relabelfrom relabelto };
+allow sepgsql_unconfined_type sepgsql_module_type:db_database install_module;
+
+type_transition sepgsql_unconfined_type sepgsql_unconfined_type:db_database sepgsql_db_t;
+type_transition sepgsql_unconfined_type sepgsql_database_type:db_table sepgsql_table_t;
+type_transition sepgsql_unconfined_type sepgsql_database_type:db_procedure sepgsql_proc_t;
+type_transition sepgsql_unconfined_type sepgsql_database_type:db_blob sepgsql_blob_t;
+
+
+########################################
+#
+# Allow permission to external domains
+#
+
+# relabelfrom for invalid security context
+allow sepgsql_unconfined_type unlabeled_t:db_database { setattr relabelfrom };
+allow sepgsql_unconfined_type unlabeled_t:db_table { setattr relabelfrom };
+allow sepgsql_unconfined_type unlabeled_t:db_procedure { setattr relabelfrom };
+allow sepgsql_unconfined_type unlabeled_t:db_column { setattr relabelfrom };
+allow sepgsql_unconfined_type unlabeled_t:db_tuple { update relabelfrom };
+allow sepgsql_unconfined_type unlabeled_t:db_blob { setattr relabelfrom };
+
+# administrative client domain
+optional_policy(`
+	gen_require(`
+		type unconfined_t;
+	')
+	sepgsql_unconfined(unconfined_t)
+')
+
+optional_policy(`
+	gen_require(`
+		type sysadm_t;
+	')
+	sepgsql_unconfined(sysadm_t)
+')
+
+# unprivilleged client domain
+optional_policy(`
+	gen_require(`
+		type user_t;
+		role user_r;
+	')
+	sepgsql_userdom_template(user,user_t,user_r)
+')
+
+optional_policy(`
+	gen_require(`
+		type staff_t;
+		role staff_r;
+	')
+	sepgsql_userdom_template(staff,staff_t,staff_r)
+')
+
+optional_policy(`
+	gen_require(`
+		type guest_t;
+		role guest_r;
+	')
+	sepgsql_userdom_template(guest,guest_t,guest_r)
+')
+
+optional_policy(`
+	gen_require(`
+		type xguest_t;
+		role xguest_r;
+	')
+	sepgsql_userdom_template(xguest,xguest_t,xguest_r)
+')
+
+optional_policy(`
+	gen_require(`
+		type httpd_t;
+	')
+	sepgsql_unpriv_client(httpd_t)
+')
+
+optional_policy(`
+	gen_require(`
+		type httpd_sys_script_t;
+	')
+	sepgsql_unpriv_client(httpd_sys_script_t)
+')
+
+# SE-PostgreSQL loadable modules
+optional_policy(`
+	gen_require(`
+		type lib_t, textrel_shlib_t;
+	')
+	sepgsql_loadable_module(lib_t)
+	sepgsql_loadable_module(textrel_shlib_t)
+')
+
+########################################
+#
+# SE-PostgreSQL audit switch for debugging
+#
+tunable_policy(`sepgsql_enable_auditallow',`
+	auditallow domain sepgsql_database_type  : db_database *;
+	auditallow domain sepgsql_table_type     : db_table *;
+	auditallow domain sepgsql_table_type     : db_column *;
+	auditallow domain sepgsql_procedure_type : db_procedure *;
+	auditallow domain sepgsql_blob_type      : db_blob *;
+	auditallow domain sepgsql_module_type    : db_database { install_module };
+	auditallow sepgsql_database_type sepgsql_module_type : db_database { load_module };
+')
+
+tunable_policy(`! sepgsql_enable_auditdeny',`
+	dontaudit domain sepgsql_database_type   : db_database *;
+	dontaudit domain sepgsql_table_type      : db_table *;
+	dontaudit domain sepgsql_table_type      : db_column *;
+	dontaudit domain sepgsql_procedure_type  : db_procedure *;
+	dontaudit domain sepgsql_blob_type       : db_blob *;
+	dontaudit domain sepgsql_module_type     : db_database { install_module };
+	dontaudit sepgsql_database_type sepgsql_module_type : db_database { load_module };
+')
+
+dontaudit domain { sepgsql_table_type - sepgsql_sysobj_table_type } : db_tuple { use select update insert delete };
+
+########################################
+#
+# SE-PostgreSQL regression test mode switch
+#
+tunable_policy(`sepgsql_regression_test_mode',`
+	allow sepgsql_client_type       home_type : db_database { install_module };
+	allow sepgsql_unconfined_type   home_type : db_database { install_module };
+	allow sepgsql_database_type     home_type : db_database { load_module };
+')

sepostgresql-sepgsql-8.3.4-2.patch:

--- NEW FILE sepostgresql-sepgsql-8.3.4-2.patch ---
diff -rpNU3 base/configure sepgsql/configure
--- base/configure	2008-09-25 15:09:40.000000000 +0900
+++ sepgsql/configure	2008-09-25 15:22:04.000000000 +0900
@@ -314,7 +314,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configure_args build build_cpu build_vendor build_os host host_cpu host_vendor host_os PORTNAME docdir enable_nls WANTED_LANGUAGES default_port enable_shared enable_rpath enable_debug enable_profiling DTRACE DTRACEFLAGS enable_dtrace CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP GCC TAS autodepend INCLUDES enable_thread_safety with_tcl with_perl with_python with_gssapi with_krb5 krb_srvtab with_pam with_ldap with_bonjour with_openssl with_ossp_uuid XML2_CONFIG with_libxml with_libxslt with_system_tzdata with_zlib EGREP ELF_SYS LDFLAGS_SL LD with_gnu_ld ld_R_works RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP STRIP_STATIC_LIB STRIP_SHARED
 _LIB TAR LN_S AWK YACC YFLAGS FLEX FLEXFLAGS PERL perl_archlibexp perl_privlibexp perl_useshrplib perl_embed_ldflags PYTHON python_version python_configdir python_includespec python_libdir python_libspec python_additional_libs OSSP_UUID_LIBS HAVE_IPV6 LIBOBJS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS LDAP_LIBS_FE LDAP_LIBS_BE HAVE_POSIX_SIGNALS MSGFMT MSGMERGE XGETTEXT localedir TCLSH TCL_CONFIG_SH TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIBS TCL_LIB_SPEC TCL_SHARED_BUILD TCL_SHLIB_LD_LIBS NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL vpath_build 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 configure_args build build_cpu build_vendor build_os host host_cpu host_vendor host_os PORTNAME docdir enable_nls WANTED_LANGUAGES default_port enable_shared enable_rpath enable_debug enable_profiling DTRACE DTRACEFLAGS enable_dtrace CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP GCC TAS autodepend INCLUDES enable_thread_safety with_tcl with_perl with_python with_gssapi with_krb5 krb_srvtab with_pam with_ldap with_bonjour with_openssl with_ossp_uuid XML2_CONFIG with_libxml with_libxslt with_system_tzdata with_zlib enable_selinux EGREP ELF_SYS LDFLAGS_SL LD with_gnu_ld ld_R_works RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP STRIP_STATIC_L
 IB STRIP_SHARED_LIB TAR LN_S AWK YACC YFLAGS FLEX FLEXFLAGS PERL perl_archlibexp perl_privlibexp perl_useshrplib perl_embed_ldflags PYTHON python_version python_configdir python_includespec python_libdir python_libspec python_additional_libs OSSP_UUID_LIBS HAVE_IPV6 LIBOBJS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS LDAP_LIBS_FE LDAP_LIBS_BE HAVE_POSIX_SIGNALS MSGFMT MSGMERGE XGETTEXT localedir TCLSH TCL_CONFIG_SH TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIBS TCL_LIB_SPEC TCL_SHARED_BUILD TCL_SHLIB_LD_LIBS NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL vpath_build LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -871,6 +871,7 @@ Optional Features:
   --enable-cassert        enable assertion checks (for debugging)
   --enable-thread-safety  make client libraries thread-safe
   --enable-thread-safety-force  force thread-safety despite thread test failure
+  --enable-selinux        build with NSA SELinux support
   --disable-largefile     omit support for large files
 
 Optional Packages:
@@ -4619,6 +4620,120 @@ fi;
 
 
 #
+# NSA SELinux support
+#
+
+pgac_args="$pgac_args enable_selinux"
+
+# Check whether --enable-selinux or --disable-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 getpeercon in -lselinux" >&5
+echo $ECHO_N "checking for getpeercon in -lselinux... $ECHO_C" >&6
+if test "${ac_cv_lib_selinux_getpeercon+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 gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char getpeercon ();
+int
+main ()
+{
+getpeercon ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_selinux_getpeercon=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_selinux_getpeercon=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_getpeercon" >&5
+echo "${ECHO_T}$ac_cv_lib_selinux_getpeercon" >&6
+if test $ac_cv_lib_selinux_getpeercon = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define SECURITY_SYSATTR_NAME "security_context"
+_ACEOF
+
+
+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
 #
 
@@ -26006,6 +26121,7 @@ s, at with_libxml@,$with_libxml,;t t
 s, at with_libxslt@,$with_libxslt,;t t
 s, at with_system_tzdata@,$with_system_tzdata,;t t
 s, at with_zlib@,$with_zlib,;t t
+s, at enable_selinux@,$enable_selinux,;t t
 s, at EGREP@,$EGREP,;t t
 s, at ELF_SYS@,$ELF_SYS,;t t
 s, at LDFLAGS_SL@,$LDFLAGS_SL,;t t
diff -rpNU3 base/configure.in sepgsql/configure.in
--- base/configure.in	2008-09-25 15:09:40.000000000 +0900
+++ sepgsql/configure.in	2008-09-25 15:22:04.000000000 +0900
@@ -626,6 +626,21 @@ PGAC_ARG_BOOL(with, zlib, yes,
 AC_SUBST(with_zlib)
 
 #
+# NSA SELinux support
+#
+PGAC_ARG_BOOL(enable, selinux, no,
+              [  --enable-selinux        build with NSA SELinux support])
+if test "$enable_selinux" = yes; then
+	AC_CHECK_LIB(selinux, getpeercon,
+		     AC_DEFINE(SECURITY_SYSATTR_NAME, "security_context",
+		     	       [Enables system column for security attribute support])
+		     AC_DEFINE_UNQUOTED(HAVE_SELINUX, 1,
+					[Enables SE-PostgreSQL feature])
+		     AC_SUBST(enable_selinux),
+		     AC_MSG_ERROR("--enable-selinux requires libselinux."))
+fi
+
+#
 # Elf
 #
 
diff -rpNU3 base/contrib/sepgsql_policy/Makefile sepgsql/contrib/sepgsql_policy/Makefile
--- base/contrib/sepgsql_policy/Makefile	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/contrib/sepgsql_policy/Makefile	2008-06-26 11:44:44.000000000 +0900
@@ -0,0 +1,40 @@
+#
+# contrib/sepgsql_policy/Makefile
+#   Makefile of security policy module for SE-PostgreSQL
+#
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+
+policy_basedir	:= /usr/share/selinux
+policy_makefile	:= $(policy_basedir)/devel/Makefile
+policy_types	:= targeted mls
+policy		:= $(strip $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config))
+package_names	:= sepostgresql sepostgresql-devel
+prefix_ptn	:= "s/%%__prefix__%%/$(shell echo $(prefix)|sed 's/\//\\\//g')/g"
+bindir_ptn	:= "s/%%__bindir__%%/$(shell echo $(bindir)|sed 's/\//\\\//g')/g"
+libdir_ptn	:= "s/%%__libdir__%%/$(shell echo $(pkglibdir)|sed 's/\//\\\//g')/g"
+
+all:
+	$(foreach pkg, $(package_names), $(foreach p, $(policy_types), $(MAKE) $(MAKEOVERRIDES) policy=$(p) $(pkg).pp;))
+	$(foreach pkg, $(package_names), test -e $(pkg).pp.$(policy) && ln -sf $(pkg).pp.$(policy) $(pkg).pp;)
+
+.install-policy:
[...11096 lines suppressed...]
+extern void sepgsqlGramCreateDatabase(Relation rel, HeapTuple tuple,
+									  DefElem *defel);
+extern void sepgsqlGramAlterDatabase(Relation rel, HeapTuple tuple,
+									 DefElem *defel);
+extern void sepgsqlGramCreateFunction(Relation rel, HeapTuple tuple,
+									  DefElem *defel);
+extern void sepgsqlGramAlterFunction(Relation rel, HeapTuple tuple,
+									 DefElem *defel);
+
+/* DATABASE related hooks */
+extern void sepgsqlSetDatabaseParam(const char *name, char *argstring);
+
+extern void sepgsqlGetDatabaseParam(const char *name);
+
+/* FUNCTION related hooks */
+extern void sepgsqlCallFunction(FmgrInfo *finfo, bool with_perm_check);
+
+extern bool sepgsqlCallFunctionTrigger(FmgrInfo *finfo, TriggerData *tgdata);
+
+extern void sepgsqlBeginPerformCheckFK(Relation rel, bool rel_is_primary, Datum *save_pgace);
+
+extern void sepgsqlEndPerformCheckFK(Relation rel, bool rel_is_primary, Datum save_pgace);
+
+/* TABLE related hooks */
+extern void sepgsqlLockTable(Oid relid);
+
+extern bool sepgsqlAlterTable(Relation rel, AlterTableCmd *cmd);
+
+/* COPY TO/COPY FROM statement hooks */
+extern void sepgsqlCopyTable(Relation rel, List *attnumlist, bool is_from);
+
+extern bool sepgsqlCopyToTuple(Relation rel, List *attnumlist,
+							   HeapTuple tuple);
+
+/* Loadable shared library module hooks */
+extern void sepgsqlLoadSharedModule(const char *filename);
+
+/* Binary Large Object (BLOB) hooks */
+extern void sepgsqlLargeObjectCreate(Relation rel, HeapTuple tuple);
+
+extern void sepgsqlLargeObjectDrop(Relation rel, HeapTuple tuple, void **pgaceItem);
+
+extern void sepgsqlLargeObjectRead(LargeObjectDesc *lodesc, int length);
+
+extern void sepgsqlLargeObjectWrite(LargeObjectDesc *lodesc, int length);
+
+extern void sepgsqlLargeObjectTruncate(LargeObjectDesc *lodesc, int offset);
+
+extern void sepgsqlLargeObjectImport(Oid loid, int fdesc, const char *filename);
+
+extern void sepgsqlLargeObjectExport(Oid loid, int fdesc, const char *filename);
+
+extern void sepgsqlLargeObjectGetSecurity(Relation rel, HeapTuple tuple);
+
+extern void sepgsqlLargeObjectSetSecurity(Relation rel, HeapTuple newtup, HeapTuple oldtup);
+
+/* Security Label hooks */
+extern char *sepgsqlTranslateSecurityLabelIn(const char *context);
+
+extern char *sepgsqlTranslateSecurityLabelOut(const char *context);
+
+extern char *sepgsqlValidateSecurityLabel(char *context);
+
+extern char *sepgsqlSecurityLabelOfLabel(void);
+
+/*
+ * SE-PostgreSQL core functions
+ *	 src/backend/security/sepgsql/core.c
+ */
+extern bool sepgsqlIsEnabled(void);
+
+extern const security_context_t sepgsqlGetServerContext(void);
+
+extern const security_context_t sepgsqlGetClientContext(void);
+
+extern const security_context_t sepgsqlGetDatabaseContext(void);
+
+extern const security_context_t sepgsqlGetUnlabeledContext(void);
+
+extern const security_context_t sepgsqlSwitchClientContext(security_context_t newcon);
+
+extern Oid sepgsqlGetDatabaseSecurityId(void);
+
+/*
+ * SE-PostgreSQL userspace avc functions
+ *   src/backend/security/sepgsql/avc.c
+ */
+extern void sepgsqlAvcInit(void);
+
+extern void sepgsqlAvcSwitchClientContext(security_context_t context);
+
+extern void sepgsqlClientHasPermission(Oid target_security_id,
+									   security_class_t tclass,
+									   access_vector_t perms,
+									   const char *objname);
+
+extern bool sepgsqlClientHasPermissionNoAbort(Oid target_security_id,
+											  security_class_t tclass,
+											  access_vector_t perms,
+											  const char *objname);
+
+extern Oid sepgsqlClientCreateSid(Oid target_security_id,
+								  security_class_t tclass);
+
+extern security_context_t
+sepgsqlClientCreateContext(Oid target_security_id,
+						   security_class_t tclass);
+
+extern bool sepgsqlComputePermission(const security_context_t scontext,
+									 const security_context_t tcontext,
+									 security_class_t tclass,
+									 access_vector_t perms,
+									 const char *objname);
+
+extern security_context_t
+sepgsqlComputeCreateContext(const security_context_t scontext,
+							const security_context_t tcontext,
+							security_class_t tclass);
+
+/*
+ * SE-PostgreSQL permission evaluation related
+ *	 src/backend/security/sepgsql/permission.c
+ */
+extern const char *sepgsqlTupleName(Oid relid, HeapTuple tuple);
+
+extern void sepgsqlSetDefaultContext(Relation rel, HeapTuple tuple);
+
+extern bool sepgsqlCheckTuplePerms(Relation rel, HeapTuple tuple,
+								   HeapTuple oldtup, uint32 perms, bool abort);
+#endif   /* SEPGSQL_H */
diff -rpNU3 base/src/include/storage/fd.h sepgsql/src/include/storage/fd.h
--- base/src/include/storage/fd.h	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/include/storage/fd.h	2008-06-14 02:36:58.000000000 +0900
@@ -67,6 +67,7 @@ extern int	FileWrite(File file, char *bu
 extern int	FileSync(File file);
 extern long FileSeek(File file, long offset, int whence);
 extern int	FileTruncate(File file, long 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 -rpNU3 base/src/include/storage/lwlock.h sepgsql/src/include/storage/lwlock.h
--- base/src/include/storage/lwlock.h	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/include/storage/lwlock.h	2008-06-14 02:36:58.000000000 +0900
@@ -63,6 +63,7 @@ typedef enum LWLockId
 	AutovacuumLock,
 	AutovacuumScheduleLock,
 	SyncScanLock,
+	SepgsqlAvcLock,
 	/* Individual lock IDs end here */
 	FirstBufMappingLock,
 	FirstLockMgrLock = FirstBufMappingLock + NUM_BUFFER_PARTITIONS,
diff -rpNU3 base/src/include/utils/catcache.h sepgsql/src/include/utils/catcache.h
--- base/src/include/utils/catcache.h	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/include/utils/catcache.h	2008-06-14 02:36:58.000000000 +0900
@@ -172,6 +172,7 @@ extern HeapTuple SearchCatCache(CatCache
 			   Datum v1, Datum v2,
 			   Datum v3, Datum v4);
 extern void ReleaseCatCache(HeapTuple tuple);
+extern void InsertCatCache(CatCache *cache, HeapTuple tuple);
 
 extern CatCList *SearchCatCacheList(CatCache *cache, int nkeys,
 				   Datum v1, Datum v2,
diff -rpNU3 base/src/include/utils/errcodes.h sepgsql/src/include/utils/errcodes.h
--- base/src/include/utils/errcodes.h	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/include/utils/errcodes.h	2008-06-14 02:36:58.000000000 +0900
@@ -339,6 +339,12 @@
 #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 - Security Error (PGACE/SE-PostgreSQL error class) */
+#define ERRCODE_PGACE_ERROR					MAKE_SQLSTATE('S','E', '0','0','0')
+#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 -rpNU3 base/src/include/utils/syscache.h sepgsql/src/include/utils/syscache.h
--- base/src/include/utils/syscache.h	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/include/utils/syscache.h	2008-06-14 02:36:58.000000000 +0900
@@ -76,6 +76,8 @@
 #define TSTEMPLATEOID		45
 #define TYPENAMENSP			46
 #define TYPEOID				47
+#define SECURITYOID			48
+#define SECURITYLABEL		49
 
 extern void InitCatalogCache(void);
 extern void InitCatalogCachePhase2(void);
@@ -84,6 +86,8 @@ extern HeapTuple SearchSysCache(int cach
 			   Datum key1, Datum key2, Datum key3, Datum key4);
 extern void ReleaseSysCache(HeapTuple tuple);
 
+extern void InsertSysCache(Oid relid, HeapTuple tuple);
+
 /* convenience routines */
 extern HeapTuple SearchSysCacheCopy(int cacheId,
 				   Datum key1, Datum key2, Datum key3, Datum key4);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Jun 2008 03:57:01 -0000	1.10
+++ .cvsignore	30 Sep 2008 03:12:05 -0000	1.11
@@ -1 +1 @@
-postgresql-8.3.3.tar.bz2
+postgresql-8.3.4.tar.bz2


Index: sepostgresql.8
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sepostgresql.8,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sepostgresql.8	1 Sep 2007 13:07:32 -0000	1.1
+++ sepostgresql.8	30 Sep 2008 03:12:05 -0000	1.2
@@ -4,47 +4,67 @@
 sepostgresql \- Security-Enhances PostgreSQL
 
 .SH "DESCRIPTION"
-Security-Enhanced PostgreSQL (SE-PostgreSQL) is an enhancement of PostgreSQL, to apply fine grained mandatory access control for database objects based on the security policy of SELinux. 
-These features enable to apply flexible integrated access control policy between operating system and database management system, during all stages of the life of the information.
+Security-Enhanced PostgreSQL (SE-PostgreSQL) is an enhancement of PostgreSQL,
+to apply fine grained mandatory access control for database objects based on
+the security policy of SELinux. 
+These features enable to apply flexible integrated access control policy
+on both of operating system and database management system, during all
+stages of the life of the information.
 .PP
-This document describes the way to customize SE-PostgreSQL on the default security policy.
+This document describes the way to customize SE-PostgreSQL on the default
+security policy.
 
 .SH "BOOLEANS"
-The SELinux policy is customizable via BOOLEAN variable. This variable has two states, 1 (on) or 0 (off). A part of the policy is enabled or disabled depending on related boolean variables.
-
-\fBsepgsql_enable_unconfined\fP toggles whether \fIunconfined_t\fP and \fIsysadm_t\fP domains are allowed to access database objects without any restruction on type enforcement, or not.
-When \fIsepgsql_enable_unconfined\fP is off, those domains are also restricted its operation as other domains begin applied. In the default, it is set to on.
-You can set it as follows:
+The SELinux policy is customizable via BOOLEAN variable. This variable has
+two states, 1 (on) or 0 (off). We can validate or invalidate a part of the
+security policy depending on the state of boolean variables.
+
+\fBsepgsql_enable_users_ddl\fP enables to toggle permissions of confined
+users/applications to invoke DDL statement, like CREATE TABLE. It is set to
+\fBon\fP in the default.
+In most cases, DDL statements are used to set up initial database structure,
+and permissions to invoke them are not necessary on operation phase.
+You can turn off this boolean as follows:
 
 .EX
-setsebool -P sepgsql_enable_unconfined ( \fBon\fP | off )
+setsebool -P sepgsql_enable_users_ddl ( \fBon\fP | off )
 .EE
 
-\fBsepgsql_enable_users_ddl\fP toggles whether non-administrative domain is allowed to use DDL statement like CREATE TABLE and so on.
-In the default, it is set to on. You can set it as follows:
+Rest of booleans are provided by \fBselinux-devel.pp\fP policy module.
+It provides developments/debugs related permissions.
+You can install it as follows:
 
 .EX
-setsebool -P sepgsql_enable_users_ddl ( \fBon\fP | off )
+semodule -i /usr/share/selinux/targeted/sepostgresql-devel.pp
 .EE
 
-\fBsepgsql_enable_auditallow\fP toggles output of audit messages in the case when required permission checks are allowed. In the default, it is set to off. You can set it as follows:
+\fBsepgsql_enable_auditallow\fP toggles output of audit messages in the case
+when required permission checks are allowed, except for tuples because it
+easily make a flood of audit logs.
+In the default, it is set to off. You can set it as follows:
 
 .EX
 setsebool -P sepgsql_enable_auditallow ( on | \fBoff\fP )
 .EE
 
-\fBsepgsql_enable_auditdeny\fP toggles output of audit messages in the case when required permission checks are denied. In the default, it is set to on. You can set it as follows:
+\fBsepgsql_enable_auditdeny\fP toggles output of audit messages in the case
+when required permission checks are denied, except for tuples because it
+easily make a flood of audit logs.
+In the default, it is set to on. You can set it as follows:
 
 .EX
 setsebool -P sepgsql_enable_auditdeny ( \fBon\fP | off )
 .EE
 
-\fBsepgsql_enable_audittuple\fP toggles output of audit messages for any tuple. Because audit messages for tuples in a large size table can cause flood of messages, we can set \fIsepgsql_enable_audittuple\fP independently from any other object classes.
-Audit messages for tuples are generated in the only case when \fIsepgsql_enable_audittuple\fP and either \fIsepgsql_enable_auditallow\fP or \fIsepgsql_enable_auditdeny\fP are enabled.
+\fBsepgsql_regression_test_mode\fP allows to load shared libraries deployed
+on user's home directory. We recommend you to keep \fBoff\fP in operation
+phase to prevent to load malicious libraries.
+However, typical PostgreSQL regression test requires to load it, so we
+have to reduce several restriction during the test.
 In the default, it is set to off. You can set it as follows:
 
 .EX
-setsebool -P sepgsql_enable_audittuple ( on | \fBoff\fP )
+setsebool -P sepgsql_regression_test_mode ( on | \fBoff\fP )
 .EE
 
 .SH "TYPES"
@@ -53,29 +73,46 @@
 It is attched for newly created databases in the default.
 
 \fBsepgsql_table_t\fP is a type for tables, columns and tuples.
-It is attached for newly created the objects in the default.
-Non-administrative clients can do any kinds of operations except for relabeling.
+It is the default type of newly created tables by unconfined or
+non-roled domain. It allows confined clietns to access with any
+kind of operations except for relabeling, so we can use this type
+for compatible purpose.
 
 \fBsepgsql_secret_table_t\fP is a type for tables, columns and tuples.
-Non-administrative clients cannot access the objects with this type.
+It never allows confined clients to access, so we can use this type
+to store sensitive information. We reccomend to apply trusted procedures
+to access tables/columns/tuples with this type under safe operation.
 
 \fBsepgsql_ro_table_t\fP is a type for read-only tables, columns and tuples.
-Non-administrative clients cannot modify the objects with this type.
+It does not allow confined clients to modify any objects with this type.
 
-\fBsepgsql_fixed_table_t\fP is a type for non-manupulatable tables, columns and tuples.
-Non-administrative clients cannot update or delete the objects with this type.
+\fBsepgsql_fixed_table_t\fP is a type for non-manupulatable tables, columns
+and tuples. It does not allow confined clients to update or delete any
+objects with this type.
+
+\fBsepgsql_ROLE_table_t\fP is a type for a role specific tables, columns
+and tuples. It allows confined clients with its role to access with any
+kind of operations except for relabeling.
+It is the default type of newly created tables by confined clients with
+its role, and we can use this type to describe role level separation.
 
 \fBsepgsql_proc_t\fP is a type for procedures.
-It is attached for newly created procedures by adminictrative domain.
-Any client can call these procedures with this type.
-
-\fBsepgsql_userproc_t\fP is a type for procedures.
-It is attached for newly created procedures by non-administrative domain.
-Administrative domains cannot call the procedure for safety. He have to relabel it into \fIsepgsql_proc_t\fP at first. It is a policy to avoid to execute doubtful code under administrative domain.
-
-\fBsepgsql_trusted_proc_t\fP is a type for trusted procedures.
-Calling procedures with this type invokes domain transition.
-Then the function works as an administrative domain, so database administrator can provide limited path to access protected object.
+It is attached for newly created procedures by unconfined clients.
+It allows any clients to invoke procedures with this type.
+All of PostgreSQL built-in functions are labeled as this type in the default.
+
+\fBsepgsql_ROLE_proc_t\fP is a type for a role specific procedure.
+It is attached for newly created procedures by confined clients with its role.
+It allows clients with same role to invoke procedure with this type.
+Note that unconfined clients cannot invoke this type to avoid to execute
+dangerous functions with unconfined authorities. They have to confirm its
+contains and relabel to \fBsepgsql_proc_t\fP for its invocation.
+
+\fBsepgsql_trusted_proc_exec_t\fP is a type for trusted procedures.
+To call procedures with this type invokes domain transition to
+unconfined domain, so it can access any kind of database objects.
+We can use this type to provide a secure method to access sensitive
+information.
 
 \fBsepgsql_blob_t\fP is a type for binary large objects (blob).
 It is attached for newly created blob in the default.


Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sepostgresql.init,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sepostgresql.init	11 Jul 2008 08:18:50 -0000	1.23
+++ sepostgresql.init	30 Sep 2008 03:12:05 -0000	1.24
@@ -7,9 +7,9 @@
 # pidfile: /var/run/postmaster.pid
 #---------------------------------------------------------------------
 
-PGVERSION="8.3.3"
+PGVERSION="8.3.4"
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'`
-SEPGVERSION="2.952"
+SEPGVERSION="2.1067"
 
 # source function library
 . /etc/rc.d/init.d/functions


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sepostgresql.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sepostgresql.spec	11 Jul 2008 08:18:50 -0000	1.25
+++ sepostgresql.spec	30 Sep 2008 03:12:05 -0000	1.26
@@ -7,24 +7,20 @@
 # SE-PostgreSQL status extension
 %define selinux_policy_stores targeted mls
 
-# check policy dependency
-%define fullset_policy %(rpm -E '%{dist}' | grep -cE '^\.fc[1-9]$')
-%if %{fullset_policy}
-%define required_policy_version    3.0.6
-%define policy_module_name         sepostgresql
+# Check required policy version
+%define fedora9 %(rpm -E '%{dist}' | grep -cE '^\.fc[1-9]$')
+%if %{fedora9}
+%define required_policy_version    3.3.1
 %else
 %define required_policy_version    3.4.2
-%define policy_module_name         sepostgresql-devel
 %endif
 
-
-
 %{!?ssl:%define ssl 1}
 
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
-Version: 8.3.3
-Release: 2.952%{?sepgsql_extension}%{?dist}
+Version: 8.3.4
+Release: 2.1067%{?sepgsql_extension}%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -33,13 +29,16 @@
 Source1: sepostgresql.init
 Source2: sepostgresql.8
 Source3: sepostgresql.logrotate
-Patch0: sepostgresql-sepgsql-8.3.3-2.patch
-Patch1: sepostgresql-policy-8.3.3-2.patch
-Patch2: sepostgresql-pg_dump-8.3.3-2.patch
+Patch0: sepostgresql-sepgsql-8.3.4-2.patch
+Patch1: sepostgresql-policy-8.3.4-2.patch
+Patch2: sepostgresql-pg_dump-8.3.4-2.patch
 Patch3: sepostgresql-fedora-prefix.patch
 BuildRequires: perl glibc-devel bison flex readline-devel zlib-devel >= 1.0.4
-BuildRequires: checkpolicy libselinux-devel >= 2.0.43 selinux-policy-devel
+BuildRequires: checkpolicy libselinux-devel >= 2.0.43
 BuildRequires: selinux-policy >= %{required_policy_version}
+%if %{fedora9}
+BuildRequires: selinux-policy-devel
+%endif
 %if %{ssl}
 BuildRequires: openssl-devel
 %endif
@@ -88,7 +87,7 @@
 # parallel build, if possible
 make %{?_smp_mflags}
 # to create empty .fc file
-touch src/backend/security/sepgsql/policy/%{policy_module_name}.fc
+touch src/backend/security/sepgsql/policy/sepostgresql-devel.fc
 make -C src/backend/security/sepgsql/policy
 
 %install
@@ -99,8 +98,8 @@
 for store in %{selinux_policy_stores}
 do
     install -d %{buildroot}%{_datadir}/selinux/${store}
-    install -p -m 644 src/backend/security/sepgsql/policy/%{policy_module_name}.pp.${store} \
-               %{buildroot}%{_datadir}/selinux/${store}/%{policy_module_name}.pp
+    install -p -m 644 src/backend/security/sepgsql/policy/sepostgresql-devel.pp.${store} \
+               %{buildroot}%{_datadir}/selinux/${store}/sepostgresql-devel.pp
 done
 
 # avoid to conflict with native postgresql package
@@ -153,16 +152,11 @@
 
 for store in %{selinux_policy_stores}
 do
-%if %{fullset_policy}
-    %{_sbindir}/semodule -s ${store} -r %{policy_module_name} >& /dev/null || :
-    %{_sbindir}/semodule -s ${store}    \
-        -i %{_datadir}/selinux/${store}/%{policy_module_name}.pp >& /dev/null || :
-%else
-    if %{_sbindir}/semodule -s ${store} -l | grep -Eq "^%{policy_module_name}"; then
+    %{_sbindir}/semodule -s ${store} -r sepostgresql >& /dev/null || :
+    if %{_sbindir}/semodule -s ${store} -l | grep -Eq "^sepostgresql-devel"; then
         %{_sbindir}/semodule -s ${store}    \
-            -u %{_datadir}/selinux/${store}/%{policy_module_name}.pp >& /dev/null || :
+            -i %{_datadir}/selinux/${store}/sepostgresql-devel.pp >& /dev/null || :
     fi
-%endif
 done
 
 # Fix up non-standard file contexts
@@ -183,7 +177,7 @@
 if [ $1 -eq 0 ]; then           # rpm -e case
     for store in %{selinux_policy_stores}
     do
-        %{_sbindir}/semodule -s ${store} -r %{policy_module_name} >& /dev/null || :
+        %{_sbindir}/semodule -s ${store} -r sepostgresql-devel >& /dev/null || :
     done
     /sbin/fixfiles -R %{name} restore || :
     test -d %{_localstatedir}/lib/sepgsql && /sbin/restorecon -R %{_localstatedir}/lib/sepgsql || :
@@ -212,12 +206,22 @@
 %{_datadir}/sepgsql/conversion_create.sql
 %{_datadir}/sepgsql/information_schema.sql
 %{_datadir}/sepgsql/sql_features.txt
-%attr(644,root,root) %{_datadir}/selinux/*/%{policy_module_name}.pp
+%attr(644,root,root) %{_datadir}/selinux/*/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
+* Sat Sep 27 2008 <kaigai at kaigai.gr.jp> - 8.3.3-2.1066
+- update base version to 8.3.4
+- sepostgresql.pp was marked as obsolute
+
+* Tue Sep 23 2008 <kaigai at kaigai.gr.jp> - 8.3.3-2.1043
+- bugfix: a case when INSERT a FK reference to invisible PK
+
+* Wed Aug 13 2008 <kaigai at kaigai.gr.jp> - 8.3.3-2.964
+- bugfix: trusted procedure invokation
+
 * Fri Jul 11 2008 <kaigai at kaigai.gr.jp> - 8.3.3-2.952
 - Security policy module updates
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	13 Jun 2008 03:57:01 -0000	1.7
+++ sources	30 Sep 2008 03:12:05 -0000	1.8
@@ -1 +1 @@
-0ae4bd9620e84d3e08dcf923808d14d0  postgresql-8.3.3.tar.bz2
+c339b9d3c0c4add64c7a76640fc93744  postgresql-8.3.4.tar.bz2


--- sepostgresql-pg_dump-8.3.3-2.patch DELETED ---


--- sepostgresql-policy-8.3.3-2.patch DELETED ---


--- sepostgresql-sepgsql-8.3.3-2.patch DELETED ---



From roland at fedoraproject.org  Tue Sep 30 03:25:01 2008
From: roland at fedoraproject.org (Roland McGrath)
Date: Tue, 30 Sep 2008 03:25:01 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.27-rc8.bz2.sign, NONE, 1.1 .cvsignore, 
	1.933, 1.934 kernel.spec, 1.992,
	1.993 linux-2.6-build-nonintconfig.patch, 1.14,
	1.15 linux-2.6-utrace.patch, 1.98, 1.99 sources, 1.895,
	1.896 upstream, 1.807, 1.808 patch-2.6.27-rc7-git5.bz2.sign, 1.1,
	NONE patch-2.6.27-rc7.bz2.sign, 1.1, NONE
Message-ID: <20080930032501.71ED670119@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1821

Modified Files:
	.cvsignore kernel.spec linux-2.6-build-nonintconfig.patch 
	linux-2.6-utrace.patch sources upstream 
Added Files:
	patch-2.6.27-rc8.bz2.sign 
Removed Files:
	patch-2.6.27-rc7-git5.bz2.sign patch-2.6.27-rc7.bz2.sign 
Log Message:
2.6.27-rc8


--- NEW FILE patch-2.6.27-rc8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBI4V0KyGugalF9Dw4RAmHuAKCIEEDOfw6IJNJKsgBOY/CCBAw82wCfaipc
of3ykvEaHo5XH+QnfwgFh9c=
=kSk3
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.933
retrieving revision 1.934
diff -u -r1.933 -r1.934
--- .cvsignore	26 Sep 2008 16:43:28 -0000	1.933
+++ .cvsignore	30 Sep 2008 03:24:30 -0000	1.934
@@ -4,5 +4,4 @@
 temp-*
 kernel-2.6.26
 linux-2.6.26.tar.bz2
-patch-2.6.27-rc7.bz2
-patch-2.6.27-rc7-git5.bz2
+patch-2.6.27-rc8.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.992
retrieving revision 1.993
diff -u -r1.992 -r1.993
--- kernel.spec	29 Sep 2008 16:36:45 -0000	1.992
+++ kernel.spec	30 Sep 2008 03:24:30 -0000	1.993
@@ -43,9 +43,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 7
+%define rcrev 8
 # The git snapshot level
-%define gitrev 5
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1739,6 +1739,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Sep 29 2008 Roland McGrath <roland at redhat.com>
+- 2.6.27-rc8
+
 * Mon Sep 29 2008 Dave Jones <davej at redhat.com>
 - Turn off CONFIG_USB_DEBUG. It's noisy, and of no real value right now.
 

linux-2.6-build-nonintconfig.patch:

Index: linux-2.6-build-nonintconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-build-nonintconfig.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linux-2.6-build-nonintconfig.patch	28 Jul 2008 02:08:36 -0000	1.14
+++ linux-2.6-build-nonintconfig.patch	30 Sep 2008 03:24:30 -0000	1.15
@@ -18,7 +18,7 @@
 index fda6313..ed33b66 100644
 --- a/scripts/kconfig/conf.c
 +++ b/scripts/kconfig/conf.c
-@@ -22,6 +22,8 @@ enum {
+@@ -22,6 +22,8 @@
  	ask_all,
  	ask_new,
  	ask_silent,
@@ -27,7 +27,7 @@
  	set_default,
  	set_yes,
  	set_mod,
-@@ -38,6 +40,8 @@ static struct menu *rootEntry;
+@@ -39,6 +41,8 @@
  
  static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n");
  
@@ -36,7 +36,7 @@
  static const char *get_help(struct menu *menu)
  {
  	if (menu_has_help(menu))
-@@ -358,7 +362,10 @@ static void conf(struct menu *menu)
+@@ -359,7 +363,10 @@
  
  		switch (prop->type) {
  		case P_MENU:
@@ -48,7 +48,7 @@
  				check_conf(menu);
  				return;
  			}
-@@ -416,12 +423,21 @@ static void check_conf(struct menu *menu
+@@ -417,12 +424,21 @@
  	if (sym && !sym_has_value(sym)) {
  		if (sym_is_changable(sym) ||
  		    (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {
@@ -70,25 +70,18 @@
  
  	for (child = menu->list; child; child = child->next)
  		check_conf(child);
-@@ -433,7 +449,8 @@ static void conf_do_update(void)
- 	do {
- 		conf_cnt = 0;
- 		check_conf(&rootmenu);
--	} while (conf_cnt);
-+	} while (conf_cnt &&
-+		 (input_mode != dont_ask && input_mode != dont_ask_dont_tell));
- }
- 
- static int conf_silent_update(void)
-@@ -474,11 +491,17 @@ int main(int ac, char **av)
+@@ -438,7 +454,7 @@
  	bindtextdomain(PACKAGE, LOCALEDIR);
  	textdomain(PACKAGE);
  
 -	while ((opt = getopt(ac, av, "osdD:nmyrh")) != -1) {
-+	while ((opt = getopt(ac, av, "osbBdD:nmyrh")) != -1) {
++ 	while ((opt = getopt(ac, av, "osbBdD:nmyrh")) != -1) {
  		switch (opt) {
  		case 'o':
- 			input_mode = ask_new;
+ 			input_mode = ask_silent;
+@@ -447,6 +463,12 @@
+ 			input_mode = ask_silent;
+ 			sync_kconfig = 1;
  			break;
 +		case 'b':
 +			input_mode = dont_ask;
@@ -96,11 +89,11 @@
 +		case 'B':
 +			input_mode = dont_ask_dont_tell;
 +			break;
- 		case 's':
- 			input_mode = ask_silent;
- 			valid_stdin = isatty(0) && isatty(1) && isatty(2);
-@@ -543,6 +566,8 @@ int main(int ac, char **av)
- 		}
+ 		case 'd':
+ 			input_mode = set_default;
+ 			break;
+@@ -510,6 +532,8 @@
+ 	case ask_silent:
  	case ask_all:
  	case ask_new:
 +	case dont_ask:
@@ -108,18 +101,27 @@
  		conf_read(NULL);
  		break;
  	case set_no:
-@@ -585,6 +610,8 @@ int main(int ac, char **av)
- 	case set_default:
- 		conf_set_all_new_symbols(def_default);
- 		break;
+@@ -571,12 +595,16 @@
+ 		conf(&rootmenu);
+ 		input_mode = ask_silent;
+ 		/* fall through */
 +	case dont_ask:
 +	case dont_ask_dont_tell:
  	case ask_silent:
- 	case ask_new:
- 		if (conf_silent_update())
-@@ -607,5 +634,5 @@ int main(int ac, char **av)
- 		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
- 		return 1;
+ 		/* Update until a loop caused no more changes */
+ 		do {
+ 			conf_cnt = 0;
+ 			check_conf(&rootmenu);
+-		} while (conf_cnt);
++		} while (conf_cnt &&
++			 (input_mode != dont_ask &&
++			  input_mode != dont_ask_dont_tell));
+ 		break;
+ 	}
+ 
+@@ -598,5 +626,5 @@
+ 			exit(1);
+ 		}
  	}
 -	return 0;
 +	return return_value;

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- linux-2.6-utrace.patch	22 Sep 2008 20:10:55 -0000	1.98
+++ linux-2.6-utrace.patch	30 Sep 2008 03:24:30 -0000	1.99
@@ -4,13 +4,13 @@
  include/linux/ptrace.h            |   21 +
  include/linux/sched.h             |    6 +
  include/linux/tracehook.h         |   65 +-
- include/linux/utrace.h            |  706 +++++++++++
+ include/linux/utrace.h            |  705 ++++++++++
  init/Kconfig                      |   26 +
  kernel/Makefile                   |    1 +
  kernel/ptrace.c                   |  605 +++++++++-
  kernel/signal.c                   |   14 +-
  kernel/utrace.c                   | 2538 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 4545 insertions(+), 8 deletions(-)
+ 12 files changed, 4544 insertions(+), 8 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
 index 1615350..92ca631 100644  
@@ -906,10 +906,10 @@
  
 diff --git a/include/linux/utrace.h b/include/linux/utrace.h
 new file mode 100644
-index ...6c9c536 100644  
+index ...61ba640 100644  
 --- /dev/null
 +++ b/include/linux/utrace.h
-@@ -0,0 +1,706 @@
+@@ -0,0 +1,705 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -1512,14 +1512,13 @@
 +
 +/**
 + * struct utrace_examiner - private state for using utrace_prepare_examine()
-+ * @state:		task's &struct task_struct.state value
-+ * @ncsw:		return value from wait_task_inactive()
 + *
 + * The members of &struct utrace_examiner are private to the implementation.
 + * This data type holds the state from a call to utrace_prepare_examine()
 + * to be used by a call to utrace_finish_examine().
 + */
 +struct utrace_examiner {
++/* private: */
 +	long state;
 +	unsigned long ncsw;
 +};


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.895
retrieving revision 1.896
diff -u -r1.895 -r1.896
--- sources	26 Sep 2008 16:43:28 -0000	1.895
+++ sources	30 Sep 2008 03:24:31 -0000	1.896
@@ -1,3 +1,2 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
-711e4624185c1e229e9aa4c736b57e05  patch-2.6.27-rc7.bz2
-6edf7e62ca492245dd2e36286bb3636d  patch-2.6.27-rc7-git5.bz2
+47c60f9a78aa6bc36bb0fdaa1a0966fc  patch-2.6.27-rc8.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.807
retrieving revision 1.808
diff -u -r1.807 -r1.808
--- upstream	26 Sep 2008 16:43:28 -0000	1.807
+++ upstream	30 Sep 2008 03:24:31 -0000	1.808
@@ -1,3 +1,2 @@
 linux-2.6.26.tar.bz2
-patch-2.6.27-rc7.bz2
-patch-2.6.27-rc7-git5.bz2
+patch-2.6.27-rc8.bz2


--- patch-2.6.27-rc7-git5.bz2.sign DELETED ---


--- patch-2.6.27-rc7.bz2.sign DELETED ---



From kaigai at fedoraproject.org  Tue Sep 30 03:39:36 2008
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Tue, 30 Sep 2008 03:39:36 +0000 (UTC)
Subject: rpms/sepostgresql/devel sepostgresql-pg_dump-8.3.4-2.patch, NONE,
	1.1 sepostgresql-policy-8.3.4-2.patch, NONE,
	1.1 sepostgresql-sepgsql-8.3.4-2.patch, NONE,
	1.1 sepostgresql.init, 1.23, 1.24 sepostgresql.spec, 1.24,
	1.25 sepostgresql-pg_dump-8.3.3-2.patch, 1.2,
	NONE sepostgresql-policy-8.3.3-2.patch, 1.2,
	NONE sepostgresql-sepgsql-8.3.3-2.patch, 1.4, NONE
Message-ID: <20080930033936.E068170119@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2529

Modified Files:
	sepostgresql.init sepostgresql.spec 
Added Files:
	sepostgresql-pg_dump-8.3.4-2.patch 
	sepostgresql-policy-8.3.4-2.patch 
	sepostgresql-sepgsql-8.3.4-2.patch 
Removed Files:
	sepostgresql-pg_dump-8.3.3-2.patch 
	sepostgresql-policy-8.3.3-2.patch 
	sepostgresql-sepgsql-8.3.3-2.patch 
Log Message:
update base version to 8.3.4


sepostgresql-pg_dump-8.3.4-2.patch:

--- NEW FILE sepostgresql-pg_dump-8.3.4-2.patch ---
diff -rpNU3 base/src/bin/pg_dump/pg_ace_dump.h sepgsql/src/bin/pg_dump/pg_ace_dump.h
--- base/src/bin/pg_dump/pg_ace_dump.h	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/bin/pg_dump/pg_ace_dump.h	2008-07-11 14:10:51.000000000 +0900
@@ -0,0 +1,279 @@
+#ifndef PG_ACE_DUMP_H
+#define PG_ACE_DUMP_H
+
+#include "pg_backup.h"
+#include "pg_dump.h"
+
+#define PG_ACE_FEATURE_NOTHING		0
+#define PG_ACE_FEATURE_SELINUX		1
+
+#define SELINUX_SYSATTR_NAME		"security_context"
+
+/*
+ * pg_ace_dumpCheckServerFeature
+ *
+ * This hook checks whether the server has required feature, or not.
+ */
+static inline void
+pg_ace_dumpCheckServerFeature(int feature, PGconn *conn)
+{
+	const char *serv_feature;
+
+	if (feature == PG_ACE_FEATURE_NOTHING)
+		return;
+
+	serv_feature = PQparameterStatus(conn, "pgace_security_feature");
+	if (!serv_feature)
+	{
+		fprintf(stderr, "could not get pgace_feature parameter.\n");
+		exit(1);
+	}
+
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		if (strcmp(serv_feature, "selinux") != 0)
+		{
+			fprintf(stderr, "server does not have SELinux feature\n");
+			exit(1);
+		}
+	}
+}
+
+/*
+ * pg_ace_dumpDatabaseXXXX
+ *
+ * These hooks gives a chance to inject a security system column
+ * on dumping pg_database system catalog.
+ * A modified part must have ",d.<security column>" style, and
+ * its result should be printed to buf.
+ */
+static inline const char *
+pg_ace_dumpDatabaseQuery(int feature)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+		return (",d." SELINUX_SYSATTR_NAME);
+
+	return "";
+}
+
+static inline void
+pg_ace_dumpDatabasePrint(int feature, PQExpBuffer buf,
+						 PGresult *res, int index)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		int i_security = PQfnumber(res, SELINUX_SYSATTR_NAME);
+		char *dbsecurity = PQgetvalue(res, index, i_security);
+
+		if (dbsecurity)
+			appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", dbsecurity);
+	}
+}
+
+/*
+ * pg_ace_dumpClassXXXX
+ *
+ * These hooks give a chance to inject a security system column
+ * on dumping pg_class system catalog. The modified part has to
+ * be formalized to ",c.<security column>" style. The result
+ * should be preserved at TableInfo->relsecurity to print later,
+ * if exist.
+ */
+static inline const char *
+pg_ace_dumpClassQuery(int feature)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+		return (",c." SELINUX_SYSATTR_NAME);
+
+	return "";
+}
+
+static inline char *
+pg_ace_dumpClassPreserve(int feature, PGresult *res, int index)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		int		attno = PQfnumber(res, SELINUX_SYSATTR_NAME);
+		char   *relcontext;
+
+		if (attno < 0)
+			return NULL;
+
+		relcontext = PQgetvalue(res, index, attno);
+
+		return !relcontext ? NULL : strdup(relcontext);
+	}
+
+	return NULL;
+}
+
+static inline void
+pg_ace_dumpClassPrint(int feature, PQExpBuffer buf, TableInfo *tbinfo)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		char   *relcontext = tbinfo->relsecurity;
+
+		if (relcontext)
+			appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", relcontext);
+
+		return;
+	}
+}
+
+/*
+ * pg_ace_dumpAttributeXXXX
+ *
+ * These hooks give a chance to inject a security system column
+ * on dumping pg_attribute system catalog. The modified part has
+ * to be formalized to ",a.<security conlumn>" style. The result
+ * should be preserved at TableInfo->attsecurity[index] to print
+ * later, if exist.
+ */
+static inline const char *
+pg_ace_dumpAttributeQuery(int feature)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+		return (",a." SELINUX_SYSATTR_NAME);
+
+	return "";
+}
+
+static inline char *
+pg_ace_dumpAttributePreserve(int feature, PGresult *res, int index)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		int		attno = PQfnumber(res, SELINUX_SYSATTR_NAME);
+		char   *attcontext;
+
+		if (attno < 0)
+			return NULL;
+
+		attcontext = PQgetvalue(res, index, attno);
+
+		return !attcontext ? NULL : strdup(attcontext);
+	}
+
+	return NULL;
+}
+
+static inline void
+pg_ace_dumpAttributePrint(int feature, PQExpBuffer buf,
+						  TableInfo *tbinfo, int index)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		char   *relcontext = tbinfo->relsecurity;
+		char   *attcontext = tbinfo->attsecurity[index];
+
+		if (attcontext)
+		{
+			if (relcontext && strcmp(relcontext, attcontext) == 0)
+				return;
+
+			appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", attcontext);
+		}
+		return;
+	}
+}
+
+/*
+ * pg_ace_dumpProcXXXX
+ *
+ * These hooks give a chance to inject a security system column
+ * on dumping pg_proc system catalog. The modified part has to be
+ * formalized to "<security conlumn>" style. The result should be
+ * printed later, if exist.
+ */
+static inline const char *
+pg_ace_dumpProcQuery(int feature)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+		return ("," SELINUX_SYSATTR_NAME);
+
+	return "";
+}
+
+static inline void
+pg_ace_dumpProcPrint(int feature, PQExpBuffer buf,
+					 PGresult *res, int index)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		int		i_selinux = PQfnumber(res, SELINUX_SYSATTR_NAME);
+		char   *prosecurity;
+
+		if (i_selinux < 0)
+			return;
+
+		prosecurity = PQgetvalue(res, index, i_selinux);
+		if (prosecurity)
+			appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", prosecurity);
+	}
+}
+
+/*
+ * pg_ace_dumpTableDataQuery
+ *
+ * This hook gives a chance to inject a security attribute system column
+ * on dumping of user's table.
+ * It must have ",<security column>" style.
+ */
+static inline const char *
+pg_ace_dumpTableDataQuery(int feature)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+		return ("," SELINUX_SYSATTR_NAME);
+
+	return "";
+}
+
+/*
+ * pg_ace_dumpCopyColumnList
+ *
+ * This hook gives a chance to inject a security attribute column within
+ * COPY statement. When a column is added, you have to return true. It
+ * enables to set needComma 'true', otherwise 'false'.
+ */
+static inline bool
+pg_ace_dumpCopyColumnList(int feature, PQExpBuffer buf)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		appendPQExpBuffer(buf, SELINUX_SYSATTR_NAME);
+		return true;
+	}
+
+	return false;
+}
+
+/*
+ * pg_ace_dumpBlobComments
+ *
+ * This hook gives a chance to inject a query to restore a security
+ * attribute of binary large object.
+ */
+static inline void
+pg_ace_dumpBlobComments(int feature, Archive *AH, PGconn *conn, Oid blobOid)
+{
+	if (feature == PG_ACE_FEATURE_SELINUX)
+	{
+		PGresult   *res;
+		char		query[256];
+
+		snprintf(query, sizeof(query),
+				 "SELECT lo_get_security(%u)", blobOid);
+		res = PQexec(conn, query);
+		if (!res)
+			return;
+
+		if (PQresultStatus(res) == PGRES_TUPLES_OK && PQntuples(res) == 1)
+			archprintf(AH, "SELECT lo_set_security(%u, '%s');\n",
+					   blobOid, PQgetvalue(res, 0, 0));
+
+		PQclear(res);
+	}
+}
+
+#endif
diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
--- base/src/bin/pg_dump/pg_dump.c	2008-02-03 01:11:28.000000000 +0900
+++ sepgsql/src/bin/pg_dump/pg_dump.c	2008-07-11 14:10:51.000000000 +0900
@@ -50,6 +50,7 @@ int			optreset;
 
 #include "pg_backup_archiver.h"
 #include "dumputils.h"
+#include "pg_ace_dump.h"
 
 extern char *optarg;
 extern int	optind,
@@ -118,6 +119,8 @@ static int	g_numNamespaces;
 /* flag to turn on/off dollar quoting */
 static int	disable_dollar_quoting = 0;
 
+/* flag to turn on/off security attribute support */
+static int pg_ace_feature = PG_ACE_FEATURE_NOTHING;
 
 static void help(const char *progname);
 static void expand_schema_name_patterns(SimpleStringList *patterns,
@@ -267,6 +270,7 @@ main(int argc, char **argv)
 		{"disable-dollar-quoting", no_argument, &disable_dollar_quoting, 1},
 		{"disable-triggers", no_argument, &disable_triggers, 1},
 		{"use-set-session-authorization", no_argument, &use_setsessauth, 1},
+		{"security-context", no_argument, &pg_ace_feature, PG_ACE_FEATURE_SELINUX},
 
 		{NULL, 0, NULL, 0}
 	};
@@ -419,6 +423,8 @@ main(int argc, char **argv)
 					disable_triggers = 1;
 				else if (strcmp(optarg, "use-set-session-authorization") == 0)
 					use_setsessauth = 1;
+				else if (strcmp(optarg, "security-context") == 0)
+					pg_ace_feature = PG_ACE_FEATURE_SELINUX;
 				else
 				{
 					fprintf(stderr,
@@ -549,6 +555,8 @@ main(int argc, char **argv)
 	std_strings = PQparameterStatus(g_conn, "standard_conforming_strings");
 	g_fout->std_strings = (std_strings && strcmp(std_strings, "on") == 0);
 
+	pg_ace_dumpCheckServerFeature(pg_ace_feature, g_conn);
+
 	/* Set the datestyle to ISO to ensure the dump's portability */
 	do_sql_command(g_conn, "SET DATESTYLE = ISO");
 
@@ -771,6 +779,7 @@ help(const char *progname)
 	printf(_("  --use-set-session-authorization\n"
 			 "                              use SESSION AUTHORIZATION commands instead of\n"
 	"                              ALTER OWNER commands to set ownership\n"));
+	printf(_("  --security-context          enable to dump security context of SE-PostgreSQL\n"));
 
 	printf(_("\nConnection options:\n"));
 	printf(_("  -h, --host=HOSTNAME      database server host or socket directory\n"));
@@ -1160,7 +1169,8 @@ dumpTableData_insert(Archive *fout, void
 	if (fout->remoteVersion >= 70100)
 	{
 		appendPQExpBuffer(q, "DECLARE _pg_dump_cursor CURSOR FOR "
-						  "SELECT * FROM ONLY %s",
+						  "SELECT * %s FROM ONLY %s",
+						  pg_ace_dumpTableDataQuery(pg_ace_feature),
 						  fmtQualifiedId(tbinfo->dobj.namespace->dobj.name,
 										 classname));
 	}
@@ -1774,11 +1784,14 @@ dumpBlobComments(Archive *AH, void *arg)
 			Oid			blobOid;
 			char	   *comment;
 
+			blobOid = atooid(PQgetvalue(res, i, 0));
+
+			pg_ace_dumpBlobComments(pg_ace_feature, AH, g_conn, blobOid);
+
 			/* ignore blobs without comments */
 			if (PQgetisnull(res, i, 1))
 				continue;
 
-			blobOid = atooid(PQgetvalue(res, i, 0));
 			comment = PQgetvalue(res, i, 1);
 
 			printfPQExpBuffer(commentcmd, "COMMENT ON LARGE OBJECT %u IS ",
@@ -2926,6 +2939,7 @@ getTables(int *numTables)
 						  "d.refobjsubid as owning_col, "
 						  "(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, "
 						  "array_to_string(c.reloptions, ', ') as reloptions "
+						  "%s "
 						  "from pg_class c "
 						  "left join pg_depend d on "
 						  "(c.relkind = '%c' and "
@@ -2935,6 +2949,7 @@ getTables(int *numTables)
 						  "where relkind in ('%c', '%c', '%c', '%c') "
 						  "order by c.oid",
 						  username_subquery,
+						  pg_ace_dumpClassQuery(pg_ace_feature),
 						  RELKIND_SEQUENCE,
 						  RELKIND_RELATION, RELKIND_SEQUENCE,
 						  RELKIND_VIEW, RELKIND_COMPOSITE_TYPE);
@@ -3131,6 +3146,7 @@ getTables(int *numTables)
 		}
 		tblinfo[i].reltablespace = strdup(PQgetvalue(res, i, i_reltablespace));
 		tblinfo[i].reloptions = strdup(PQgetvalue(res, i, i_reloptions));
+		tblinfo[i].relsecurity = pg_ace_dumpClassPreserve(pg_ace_feature, res, i);
 
 		/* other fields were zeroed above */
 
@@ -4362,11 +4378,13 @@ getTableAttrs(TableInfo *tblinfo, int nu
 			appendPQExpBuffer(q, "SELECT a.attnum, a.attname, a.atttypmod, a.attstattarget, a.attstorage, t.typstorage, "
 				  "a.attnotnull, a.atthasdef, a.attisdropped, a.attislocal, "
 				   "pg_catalog.format_type(t.oid,a.atttypmod) as atttypname "
+							  "%s "		/* security context, if required */
 			 "from pg_catalog.pg_attribute a left join pg_catalog.pg_type t "
 							  "on a.atttypid = t.oid "
 							  "where a.attrelid = '%u'::pg_catalog.oid "
 							  "and a.attnum > 0::pg_catalog.int2 "
 							  "order by a.attrelid, a.attnum",
+							  pg_ace_dumpAttributeQuery(pg_ace_feature),
 							  tbinfo->dobj.catId.oid);
 		}
 		else if (g_fout->remoteVersion >= 70100)
@@ -4425,6 +4443,7 @@ getTableAttrs(TableInfo *tblinfo, int nu
 		tbinfo->typstorage = (char *) malloc(ntups * sizeof(char));
 		tbinfo->attisdropped = (bool *) malloc(ntups * sizeof(bool));
 		tbinfo->attislocal = (bool *) malloc(ntups * sizeof(bool));
+		tbinfo->attsecurity = (char **) malloc(ntups * sizeof(char *));
 		tbinfo->notnull = (bool *) malloc(ntups * sizeof(bool));
 		tbinfo->attrdefs = (AttrDefInfo **) malloc(ntups * sizeof(AttrDefInfo *));
 		tbinfo->inhAttrs = (bool *) malloc(ntups * sizeof(bool));
@@ -4456,6 +4475,8 @@ getTableAttrs(TableInfo *tblinfo, int nu
 			tbinfo->inhAttrs[j] = false;
 			tbinfo->inhAttrDef[j] = false;
 			tbinfo->inhNotNull[j] = false;
+
+			tbinfo->attsecurity[j] = pg_ace_dumpAttributePreserve(pg_ace_feature, res, j);
 		}
 
 		PQclear(res);
@@ -6459,8 +6480,10 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 						  "provolatile, proisstrict, prosecdef, "
 						  "proconfig, procost, prorows, "
 						  "(SELECT lanname FROM pg_catalog.pg_language WHERE oid = prolang) as lanname "
+						  "%s "		/* security context, if required */
 						  "FROM pg_catalog.pg_proc "
 						  "WHERE oid = '%u'::pg_catalog.oid",
+						  pg_ace_dumpProcQuery(pg_ace_feature),
 						  finfo->dobj.catId.oid);
 	}
 	else if (g_fout->remoteVersion >= 80100)
@@ -6698,6 +6721,8 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 	if (prosecdef[0] == 't')
 		appendPQExpBuffer(q, " SECURITY DEFINER");
 
+	pg_ace_dumpProcPrint(pg_ace_feature, q, res, 0);
+
 	/*
 	 * COST and ROWS are emitted only if present and not default, so as not to
 	 * break backwards-compatibility of the dump without need.	Keep this code
@@ -8779,6 +8804,8 @@ dumpTableSchema(Archive *fout, TableInfo
 				if (tbinfo->notnull[j] && !tbinfo->inhNotNull[j])
 					appendPQExpBuffer(q, " NOT NULL");
 
+				pg_ace_dumpAttributePrint(pg_ace_feature, q, tbinfo, j);
+
 				actual_atts++;
 			}
 		}
@@ -8826,6 +8853,8 @@ dumpTableSchema(Archive *fout, TableInfo
 		if (tbinfo->reloptions && strlen(tbinfo->reloptions) > 0)
 			appendPQExpBuffer(q, "\nWITH (%s)", tbinfo->reloptions);
 
+		pg_ace_dumpClassPrint(pg_ace_feature, q, tbinfo);
+
 		appendPQExpBuffer(q, ";\n");
 
 		/* Loop dumping statistics and storage statements */
@@ -10243,6 +10272,10 @@ fmtCopyColumnList(const TableInfo *ti)
 
 	appendPQExpBuffer(q, "(");
 	needComma = false;
+
+	if (pg_ace_dumpCopyColumnList(pg_ace_feature, q))
+		needComma = true;
+
 	for (i = 0; i < numatts; i++)
 	{
 		if (attisdropped[i])
diff -rpNU3 base/src/bin/pg_dump/pg_dump.h sepgsql/src/bin/pg_dump/pg_dump.h
--- base/src/bin/pg_dump/pg_dump.h	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/bin/pg_dump/pg_dump.h	2008-06-15 22:27:55.000000000 +0900
@@ -238,6 +238,7 @@ typedef struct _tableInfo
 	char		relkind;
 	char	   *reltablespace;	/* relation tablespace */
 	char	   *reloptions;		/* options specified by WITH (...) */
+	char	   *relsecurity;	/* security attribute of the relation */
 	bool		hasindex;		/* does it have any indexes? */
 	bool		hasrules;		/* does it have any rules? */
 	bool		hasoids;		/* does it have OIDs? */
@@ -262,6 +263,7 @@ typedef struct _tableInfo
 	char	   *typstorage;		/* type storage scheme */
 	bool	   *attisdropped;	/* true if attr is dropped; don't dump it */
 	bool	   *attislocal;		/* true if attr has local definition */
+	char	  **attsecurity;	/* security attribute of attribute (column) */
 
 	/*
 	 * Note: we need to store per-attribute notnull, default, and constraint
diff -rpNU3 base/src/bin/pg_dump/pg_dumpall.c sepgsql/src/bin/pg_dump/pg_dumpall.c
--- base/src/bin/pg_dump/pg_dumpall.c	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/bin/pg_dump/pg_dumpall.c	2008-07-11 14:10:51.000000000 +0900
@@ -27,6 +27,7 @@ int			optreset;
 #endif
 
 #include "dumputils.h"
+#include "pg_ace_dump.h"
 
 
 /* version string we expect back from pg_dump */
@@ -67,6 +68,9 @@ static int	disable_triggers = 0;
 static int	use_setsessauth = 0;
 static int	server_version;
 
+/* flag to turn on/off security attribute support */
+static int	pg_ace_feature = PG_ACE_FEATURE_NOTHING;
+
 static FILE *OPF;
 static char *filename = NULL;
 
@@ -119,6 +123,7 @@ main(int argc, char *argv[])
 		{"disable-dollar-quoting", no_argument, &disable_dollar_quoting, 1},
 		{"disable-triggers", no_argument, &disable_triggers, 1},
 		{"use-set-session-authorization", no_argument, &use_setsessauth, 1},
+		{"security-context", no_argument, &pg_ace_feature, PG_ACE_FEATURE_SELINUX},
 
 		{NULL, 0, NULL, 0}
 	};
@@ -290,6 +295,8 @@ main(int argc, char *argv[])
 					appendPQExpBuffer(pgdumpopts, " --disable-triggers");
 				else if (strcmp(optarg, "use-set-session-authorization") == 0)
 					 /* no-op, still allowed for compatibility */ ;
+				else if (strcmp(optarg, "security-context") == 0)
+					pg_ace_feature = PG_ACE_FEATURE_SELINUX;
 				else
 				{
 					fprintf(stderr,
@@ -316,6 +323,8 @@ main(int argc, char *argv[])
 		appendPQExpBuffer(pgdumpopts, " --disable-triggers");
 	if (use_setsessauth)
 		appendPQExpBuffer(pgdumpopts, " --use-set-session-authorization");
+	if (pg_ace_feature == PG_ACE_FEATURE_SELINUX)
+		appendPQExpBuffer(pgdumpopts, " --security-context");
 
 	if (optind < argc)
 	{
@@ -391,6 +400,8 @@ main(int argc, char *argv[])
 		}
 	}
 
+	pg_ace_dumpCheckServerFeature(pg_ace_feature, conn);
+
 	/*
 	 * Open the output file if required, otherwise use stdout
 	 */
@@ -505,6 +516,7 @@ help(void)
 	printf(_("  --use-set-session-authorization\n"
 			 "                           use SESSION AUTHORIZATION commands instead of\n"
 			 "                           OWNER TO commands\n"));
+	printf(_("  --security-context       enables to dump security context of SE-PostgreSQL\n"));
 
 	printf(_("\nConnection options:\n"));
 	printf(_("  -h, --host=HOSTNAME      database server host or socket directory\n"));
@@ -915,16 +927,18 @@ dumpCreateDB(PGconn *conn)
 	fprintf(OPF, "--\n-- Database creation\n--\n\n");
 
 	if (server_version >= 80100)
-		res = executeQuery(conn,
+		appendPQExpBuffer(buf,
 						   "SELECT datname, "
 						   "coalesce(rolname, (select rolname from pg_authid where oid=(select datdba from pg_database where datname='template0'))), "
 						   "pg_encoding_to_char(d.encoding), "
 						   "datistemplate, datacl, datconnlimit, "
 						   "(SELECT spcname FROM pg_tablespace t WHERE t.oid = d.dattablespace) AS dattablespace "
+						   "%s "
 			  "FROM pg_database d LEFT JOIN pg_authid u ON (datdba = u.oid) "
-						   "WHERE datallowconn ORDER BY 1");
+						   "WHERE datallowconn ORDER BY 1",
+						   pg_ace_dumpDatabaseQuery(pg_ace_feature));
 	else if (server_version >= 80000)
-		res = executeQuery(conn,
+		appendPQExpBuffer(buf,
 						   "SELECT datname, "
 						   "coalesce(usename, (select usename from pg_shadow where usesysid=(select datdba from pg_database where datname='template0'))), "
 						   "pg_encoding_to_char(d.encoding), "
@@ -933,7 +947,7 @@ dumpCreateDB(PGconn *conn)
 		   "FROM pg_database d LEFT JOIN pg_shadow u ON (datdba = usesysid) "
 						   "WHERE datallowconn ORDER BY 1");
 	else if (server_version >= 70300)
-		res = executeQuery(conn,
+		appendPQExpBuffer(buf,
 						   "SELECT datname, "
 						   "coalesce(usename, (select usename from pg_shadow where usesysid=(select datdba from pg_database where datname='template0'))), "
 						   "pg_encoding_to_char(d.encoding), "
@@ -942,7 +956,7 @@ dumpCreateDB(PGconn *conn)
 		   "FROM pg_database d LEFT JOIN pg_shadow u ON (datdba = usesysid) "
 						   "WHERE datallowconn ORDER BY 1");
 	else if (server_version >= 70100)
-		res = executeQuery(conn,
+		appendPQExpBuffer(buf,
 						   "SELECT datname, "
 						   "coalesce("
 					"(select usename from pg_shadow where usesysid=datdba), "
@@ -958,7 +972,7 @@ dumpCreateDB(PGconn *conn)
 		 * Note: 7.0 fails to cope with sub-select in COALESCE, so just deal
 		 * with getting a NULL by not printing any OWNER clause.
 		 */
-		res = executeQuery(conn,
+		appendPQExpBuffer(buf,
 						   "SELECT datname, "
 					"(select usename from pg_shadow where usesysid=datdba), "
 						   "pg_encoding_to_char(d.encoding), "
@@ -968,6 +982,7 @@ dumpCreateDB(PGconn *conn)
 						   "FROM pg_database d "
 						   "ORDER BY 1");
 	}
+	res = executeQuery(conn, buf->data);
 
 	for (i = 0; i < PQntuples(res); i++)
 	{
@@ -1021,6 +1036,8 @@ dumpCreateDB(PGconn *conn)
 				appendPQExpBuffer(buf, " CONNECTION LIMIT = %s",
 								  dbconnlimit);
 
+			pg_ace_dumpDatabasePrint(pg_ace_feature, buf, res, i);
+
 			appendPQExpBuffer(buf, ";\n");
 
 			if (strcmp(dbistemplate, "t") == 0)

sepostgresql-policy-8.3.4-2.patch:

--- NEW FILE sepostgresql-policy-8.3.4-2.patch ---
diff -rpNU3 base/src/backend/security/sepgsql/policy/Makefile sepgsql/src/backend/security/sepgsql/policy/Makefile
--- base/src/backend/security/sepgsql/policy/Makefile	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/Makefile	2008-07-11 14:10:51.000000000 +0900
@@ -0,0 +1,41 @@
+#
+# contrib/sepgsql_policy/Makefile
+#   Makefile of security policy module for SE-PostgreSQL
+#
+top_builddir = ../../../../..
+include $(top_builddir)/src/Makefile.global
+
+policy_basedir	:= /usr/share/selinux
+policy_makefile	:= $(policy_basedir)/devel/Makefile
+policy_types	:= targeted mls
+policy		:= $(strip $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config))
+package_names	:= sepostgresql sepostgresql-devel
+prefix_ptn	:= "s/%%__prefix__%%/$(shell echo $(prefix)|sed 's/\//\\\//g')/g"
+bindir_ptn	:= "s/%%__bindir__%%/$(shell echo $(bindir)|sed 's/\//\\\//g')/g"
+libdir_ptn	:= "s/%%__libdir__%%/$(shell echo $(pkglibdir)|sed 's/\//\\\//g')/g"
+
+all:
+	$(foreach pkg, $(package_names), $(foreach p, $(policy_types), $(MAKE) $(MAKEOVERRIDES) policy=$(p) $(pkg).pp;))
+	$(foreach pkg, $(package_names), test -e $(pkg).pp.$(policy) && ln -sf $(pkg).pp.$(policy) $(pkg).pp;)
+
+.install-policy:
+	test -d $(DESTDIR)$(policy_basedir)/$(policy) || install -d $(DESTDIR)$(policy_basedir)/$(policy)
+	$(foreach pkg, $(package_names), install -p -m 644 $(pkg).pp.$(policy) $(DESTDIR)$(policy_basedir)/$(policy)/$(pkg).pp;)
+
+install: all
+	$(foreach p, $(policy_types), $(MAKE) $(MAKEOVERRIDES) policy=$(p) .install-policy;)
+
+%.pp: %.te %.if %.fc
+	rm -f $@
+	$(MAKE) NAME=$(policy) -f $(policy_makefile) $@
+	mv $@ $@.$(policy)
+
+sepostgresql-devel.fc: sepostgresql.fc.template
+	cat $< | grep -v ^/var | sed -e $(prefix_ptn) -e $(bindir_ptn) -e $(libdir_ptn) > $@
+
+sepostgresql.fc: sepostgresql.fc.template
+	cat $< | sed -e $(prefix_ptn) -e $(bindir_ptn) -e $(libdir_ptn) > $@
+
+clean:
+	$(MAKE) -f $(policy_makefile) clean
+	rm -f *.pp.* *.fc
diff -rpNU3 base/src/backend/security/sepgsql/policy/README sepgsql/src/backend/security/sepgsql/policy/README
--- base/src/backend/security/sepgsql/policy/README	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/README	2008-07-11 14:10:51.000000000 +0900
@@ -0,0 +1,49 @@
+The security policy module of SE-PostgreSQL
+-------------------------------------------
+
+o Introduction
+
+  We provide two kind of security policy modules.
+
+  One is "sepostgresql.pp" which contains full-set of security policy
+  and suitable for legacy base policy (selinux-policy-3.4.1, or prior).
+
+  The other is "sepostgresql-devel.pp" which provides several booleans
+  for developers, and suitable for newer base policy (selinux-policy-3.4.2,
+  or later).
+
+  In the selinux-policy-3.4.2, most part of the policy got upstreamed.
+  So, we don't need to install "sepostgresql.pp" explicitly on the newer
+  base security policy.
+
+  If you need to run regression test, or (don't) want to generate access
+  logs, install "sepostgresql-devel.pp" and turn on/off booleans.
+
+o Build & Installation
+
+  $ cd src/backend/security/sepgsql/policy
+  $ make
+  $ su
+  # /usr/sbin/semodule -i sepostgresql-devel.pp
+      or
+  #  /usr/sbin/semodule -i sepostgresql.pp
+
+o Booleans
+
+- sepgsql_enable_users_ddl (default: on)
+  This boolean enables to control to execute DDL statement come from
+  confined users.
+
+- sepgsql_enable_auditallow (default: off)
+  This boolean enables to generate access allow logs except for tuple
+  level.
+
+- sepgsql_enable_auditdeny (default: on)
+  This boolean enables to generata access denied logs except for tuple
+  level.
+
+- sepgsql_regression_test_mode (default: off)
+  This boolean provides several permission to run regression test on
+  your home directory. It enables to load shared library files deployed
+  on home directory.
+  However, we don't recommend it to turn on in the operation phase.
diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql-devel.if sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.if
--- base/src/backend/security/sepgsql/policy/sepostgresql-devel.if	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.if	2008-07-11 14:10:51.000000000 +0900
@@ -0,0 +1 @@
+## There are no interface declaration
diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql-devel.te sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.te
--- base/src/backend/security/sepgsql/policy/sepostgresql-devel.te	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.te	2008-09-29 22:58:43.000000000 +0900
@@ -0,0 +1,127 @@
+policy_module(sepostgresql-devel, 3.14)
+
+gen_require(`
+	class db_database all_db_database_perms;
+	class db_table all_db_table_perms;
+	class db_procedure all_db_procedure_perms;
+	class db_column all_db_column_perms;
+	class db_tuple all_db_tuple_perms;
+	class db_blob all_db_blob_perms;
+
+	attribute domain, home_type, tmpfile;
+	attribute sepgsql_client_type;
+	attribute sepgsql_unconfined_type;
+
+	attribute sepgsql_database_type;
+	attribute sepgsql_table_type;
+	attribute sepgsql_sysobj_table_type;
+	attribute sepgsql_procedure_type;
+	attribute sepgsql_blob_type;
+	attribute sepgsql_module_type;
+
+	type sepgsql_trusted_proc_t;
+')
+
+#################################
+#
+# Domain for Testcases
+#
+
+type sepgsql_test_t;
+domain_type(sepgsql_test_t)
+
+optional_policy(`
+	gen_require(`
+		role unconfined_r;
+		type unconfined_t;
+	')
+	allow unconfined_t sepgsql_test_t : process transition;
+	role unconfined_r types sepgsql_test_t;
+	role unconfined_r types sepgsql_trusted_proc_t;
+')
+
+corecmd_exec_bin(sepgsql_test_t)
+allow sepgsql_test_t bin_t : file { entrypoint };
+
+files_read_usr_files(sepgsql_test_t)
+files_read_etc_files(sepgsql_test_t)
+libs_use_ld_so(sepgsql_test_t)
+libs_use_shared_libs(sepgsql_test_t)
+
+term_use_all_terms(sepgsql_test_t)
+
+files_search_home(sepgsql_test_t)
+allow sepgsql_test_t home_type : file rw_file_perms;
+allow sepgsql_test_t home_type : dir search_dir_perms;
+miscfiles_read_localization(sepgsql_test_t)
+
+allow sepgsql_test_t tmpfile : dir search_dir_perms;
+allow sepgsql_test_t tmpfile : file rw_file_perms;
+
+postgresql_stream_connect(sepgsql_test_t)
+postgresql_unpriv_client(sepgsql_test_t)
+
+optional_policy(`
+	nscd_shm_use(sepgsql_test_t)
+')
+
+#################################
+#
+# SE-PostgreSQL Declarations
+#
+
+## <desc>
+## <p>
+## Allow to generate auditallow logs
+## </p>
+## </desc>
+gen_tunable(sepgsql_enable_auditallow, false)
+
+## <desc>
+## <p>
+## Allow to generate auditdeny logs
+## </p>
+## </desc>
+gen_tunable(sepgsql_enable_auditdeny,  true)
+
+## <desc>
+## <p>
+## Allow widespread permissions for regression test
+## Don't set TRUE on operation phase
+## </p>
+## </desc>
+gen_tunable(sepgsql_regression_test_mode, false)
+
+########################################
+#
+# SE-PostgreSQL audit switch for debugging
+#
+tunable_policy(`sepgsql_enable_auditallow',`
+	auditallow domain sepgsql_database_type  : db_database *;
+	auditallow domain sepgsql_table_type     : db_table *;
+	auditallow domain sepgsql_table_type     : db_column *;
+	auditallow domain sepgsql_procedure_type : db_procedure *;
+	auditallow domain sepgsql_blob_type      : db_blob *;
+	auditallow domain sepgsql_module_type    : db_database { install_module };
+	auditallow sepgsql_database_type sepgsql_module_type : db_database { load_module };
+')
+
+tunable_policy(`! sepgsql_enable_auditdeny',`
+	dontaudit domain sepgsql_database_type   : db_database *;
+	dontaudit domain sepgsql_table_type      : db_table *;
+	dontaudit domain sepgsql_table_type      : db_column *;
+	dontaudit domain sepgsql_procedure_type  : db_procedure *;
+	dontaudit domain sepgsql_blob_type       : db_blob *;
+	dontaudit domain sepgsql_module_type     : db_database { install_module };
+	dontaudit sepgsql_database_type sepgsql_module_type : db_database { load_module };
+')
+
+########################################
+#
+# SE-PostgreSQL regression test mode switch
+#
+tunable_policy(`sepgsql_regression_test_mode',`
+	allow sepgsql_client_type       home_type : db_database { install_module };
+	allow sepgsql_unconfined_type   home_type : db_database { install_module };
+	allow sepgsql_database_type     home_type : db_database { load_module };
+')
diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql.fc.template sepgsql/src/backend/security/sepgsql/policy/sepostgresql.fc.template
--- base/src/backend/security/sepgsql/policy/sepostgresql.fc.template	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql.fc.template	2008-07-11 14:10:51.000000000 +0900
@@ -0,0 +1,15 @@
+#
+# SE-PostgreSQL install path
+#
+%%__prefix__%%(/.*)?			--	gen_context(system_u:object_r:usr_t,s0)
+
+%%__bindir__%%/(se)?postgres		--	gen_context(system_u:object_r:postgresql_exec_t,s0)
+%%__bindir__%%/(se)?pg_ctl		--	gen_context(system_u:object_r:initrc_exec_t,s0)
+%%__bindir__%%/initdb(\.sepgsql)?	--	gen_context(system_u:object_r:postgresql_exec_t,s0)
+%%__bindir__%%(/.*)?			--	gen_context(system_u:object_r:bin_t,s0)
+
+%%__libdir__%%(/.*)?			--	gen_context(system_u:object_r:lib_t,s0)
+
+/var/lib/sepgsql(/.*)?				gen_context(system_u:object_r:postgresql_db_t,s0)
+/var/lib/sepgsql/pgstartup\.log			gen_context(system_u:object_r:postgresql_log_t,s0)
+/var/log/sepostgresql\.log.*		--	gen_context(system_u:object_r:postgresql_log_t,s0)
diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql.if sepgsql/src/backend/security/sepgsql/policy/sepostgresql.if
--- base/src/backend/security/sepgsql/policy/sepostgresql.if	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql.if	2008-07-11 17:12:06.000000000 +0900
@@ -0,0 +1,259 @@
+#######################################
+## <summary>
+##      The userdomain template for the SE-PostgreSQL.
+## </summary>
+## <desc>
+##      This template creates a delivered types which are used
+##     for given userdomains.
+## </desc>
+## <param name="userdomain_prefix">
+##      <summary>
+##      The prefix of the user domain (e.g., user
+##      is the prefix for user_t).
+##      </summary>
+## </param>
+## <param name="user_domain">
+##     <summary>
+##      The type of the user domain.
+##      </summary>
+## </param>
+## <param name="user_role">
+##      <summary>
+##      The role associated with the user domain.
+##      </summary>
+## </param>
+#
+template(`sepgsql_userdom_template',`
+	gen_require(`
+		class db_database all_db_database_perms;
+		class db_table all_db_table_perms;
+		class db_procedure all_db_procedure_perms;
+		class db_column all_db_column_perms;
+		class db_tuple all_db_tuple_perms;
+		class db_blob all_db_blob_perms;
+
+		attribute sepgsql_client_type;
+		attribute sepgsql_database_type;
+		attribute sepgsql_sysobj_table_type;
+
+		type sepgsql_trusted_proc_t;
+		type sepgsql_trusted_proc_exec_t;
+	')
+
+	########################################
+	#
+	# Declarations
+	#
+
+	typeattribute $2 sepgsql_client_type;
+
+	type $1_sepgsql_blob_t;
+	sepgsql_blob_object($1_sepgsql_blob_t)
+
+	type $1_sepgsql_proc_exec_t;
+	sepgsql_procedure_object($1_sepgsql_proc_exec_t)
+
+	type $1_sepgsql_sysobj_t;
+	sepgsql_system_table_object($1_sepgsql_sysobj_t)
+
+	type $1_sepgsql_table_t;
+	sepgsql_table_object($1_sepgsql_table_t)
+
+	role $3 types sepgsql_trusted_proc_t;
+
+	##############################
+	#
+	# Client local policy
+	#
+
+	tunable_policy(`sepgsql_enable_users_ddl',`
+		allow $2 $1_sepgsql_table_t  : db_table { create drop };
+		type_transition $2 sepgsql_database_type:db_table $1_sepgsql_table_t;
+
+		allow $2 $1_sepgsql_table_t  : db_column { create drop };
+
+		allow $2 $1_sepgsql_sysobj_t : db_tuple { update insert delete };
+		type_transition $2 sepgsql_sysobj_table_type:db_tuple $1_sepgsql_sysobj_t;
+	')
+
+	allow $2 $1_sepgsql_table_t  : db_table  { getattr setattr use select update insert delete };
+	allow $2 $1_sepgsql_table_t  : db_column { getattr setattr use select update insert };
+	allow $2 $1_sepgsql_table_t  : db_tuple  { use select update insert delete };
+	allow $2 $1_sepgsql_sysobj_t : db_tuple  { use select };
+
+	allow $2 $1_sepgsql_proc_exec_t : db_procedure { create drop getattr setattr execute };
+	type_transition $2 sepgsql_database_type:db_procedure $1_sepgsql_proc_exec_t;
+
+	allow $2 $1_sepgsql_blob_t : db_blob { create drop getattr setattr read write };
+	type_transition $2 sepgsql_database_type:db_blob $1_sepgsql_blob_t;
+
+	allow $2 sepgsql_trusted_proc_t:process transition;
+	type_transition $2 sepgsql_trusted_proc_exec_t:process sepgsql_trusted_proc_t;
+')
+
+########################################
+## <summary>
+##     Marks as a SE-PostgreSQL loadable shared library module
+## </summary>
+## <param name="type">
+##     <summary>
+##     Type marked as a database object type.
+##     </summary>
+## </param>
+#
+interface(`sepgsql_loadable_module',`
+	gen_require(`
+		attribute sepgsql_module_type;
+	')
+
+	typeattribute $1 sepgsql_module_type;
+')
+
+########################################
+## <summary>
+##     Marks as a SE-PostgreSQL database object type
+## </summary>
+## <param name="type">
+##     <summary>
+##     Type marked as a database object type.
+##     </summary>
+## </param>
+#
+interface(`sepgsql_database_object',`
+	gen_require(`
+		attribute sepgsql_database_type;
+	')
+
+	typeattribute $1 sepgsql_database_type;
+')
+
+########################################
+## <summary>
+##     Marks as a SE-PostgreSQL table/column/tuple object type
+## </summary>
+## <param name="type">
+##     <summary>
+##     Type marked as a table/column/tuple object type.
+##     </summary>
+## </param>
+#
+interface(`sepgsql_table_object',`
+	gen_require(`
+		attribute sepgsql_table_type;
+	')
+
+	typeattribute $1 sepgsql_table_type;
+')
+
+########################################
+## <summary>
+##     Marks as a SE-PostgreSQL system table/column/tuple object type
+## </summary>
+## <param name="type">
+##     <summary>
+##     Type marked as a table/column/tuple object type.
+##     </summary>
+## </param>
+#
+interface(`sepgsql_system_table_object',`
+	gen_require(`
+		attribute sepgsql_table_type;
+		attribute sepgsql_sysobj_table_type;
+	')
+
+	typeattribute $1 sepgsql_table_type;
+	typeattribute $1 sepgsql_sysobj_table_type;
+')
+
+########################################
+## <summary>
+##     Marks as a SE-PostgreSQL procedure object type
+## </summary>
+## <param name="type">
+##     <summary>
+##     Type marked as a database object type.
+##     </summary>
+## </param>
+#
+interface(`sepgsql_procedure_object',`
+	gen_require(`
+		attribute sepgsql_procedure_type;
+	')
+
+	typeattribute $1 sepgsql_procedure_type;
+')
+
+########################################
+## <summary>
+##     Marks as a SE-PostgreSQL binary large object type
+## </summary>
+## <param name="type">
+##     <summary>
+##     Type marked as a database binary large object type.
+##     </summary>
+## </param>
+#
+interface(`sepgsql_blob_object',`
+	gen_require(`
+		attribute sepgsql_blob_type;
+	')
+
+	typeattribute $1 sepgsql_blob_type;
+')
+
+########################################
+## <summary>
+##      Allow the specified domain unprivileged accesses to unifined database objects
+##     managed by SE-PostgreSQL,
+## </summary>
+## <param name="domain">
+##      <summary>
+##      Domain allowed access.
+##      </summary>
+## </param>
+#
+interface(`sepgsql_unpriv_client',`
+	gen_require(`
+		class db_table all_db_table_perms;
+		class db_procedure all_db_procedure_perms;
+		class db_blob all_db_blob_perms;
+
+		attribute sepgsql_client_type;
+		attribute sepgsql_database_type;
+
+		type sepgsql_table_t;
+		type sepgsql_proc_t;
+		type sepgsql_blob_t;
+
+		type sepgsql_trusted_proc_t;
+		type sepgsql_trusted_proc_exec_t;
+	')
+
+	typeattribute $1 sepgsql_client_type;
+
+	type_transition $1 sepgsql_database_type:db_table sepgsql_table_t;
+	type_transition $1 sepgsql_database_type:db_procedure sepgsql_proc_t;
+	type_transition $1 sepgsql_database_type:db_blob sepgsql_blob_t;
+
+	type_transition $1 sepgsql_trusted_proc_exec_t:process sepgsql_trusted_proc_t;
+	allow $1 sepgsql_trusted_proc_t:process transition;
+')
+
+########################################
+## <summary>
+##      Allow the specified domain unconfined accesses to any database objects
+##     managed by SE-PostgreSQL,
+## </summary>
+## <param name="domain">
+##      <summary>
+##      Domain allowed access.
+##      </summary>
+## </param>
+#
+interface(`sepgsql_unconfined',`
+	gen_require(`
+		attribute sepgsql_unconfined_type;
+	')
+
+	typeattribute $1 sepgsql_unconfined_type;
+')
diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql.te sepgsql/src/backend/security/sepgsql/policy/sepostgresql.te
--- base/src/backend/security/sepgsql/policy/sepostgresql.te	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql.te	2008-07-11 17:12:06.000000000 +0900
@@ -0,0 +1,308 @@
+policy_module(sepostgresql, 3.11)
+
+gen_require(`
+	class db_database all_db_database_perms;
+	class db_table all_db_table_perms;
+	class db_procedure all_db_procedure_perms;
+	class db_column all_db_column_perms;
+	class db_tuple all_db_tuple_perms;
+	class db_blob all_db_blob_perms;
+
+	attribute domain, home_type;
+	type postgresql_t, unlabeled_t;
+
+	role system_r;
+')
+
+#################################
+#
+# SE-PostgreSQL Declarations
+#
+
+## <desc>
+## <p>
+## Allow to generate auditallow logs
+## </p>
+## </desc>
+gen_tunable(sepgsql_enable_auditallow, false)
+
+## <desc>
+## <p>
+## Allow to generate auditdeny logs
+## </p>
+## </desc>
+gen_tunable(sepgsql_enable_auditdeny,  true)
+
+## <desc>
+## <p>
+## Allow unprivileged users to execute DDL statement
+## </p>
+## </desc>
+gen_tunable(sepgsql_enable_users_ddl,  true)
+
+## <desc>
+## <p>
+## Allow widespread permissions for regression test
+## Don't set TRUE on operation phase
+## </p>
+## </desc>
+gen_tunable(sepgsql_regression_test_mode, false)
+
+# database clients attribute
+attribute sepgsql_client_type;
+attribute sepgsql_unconfined_type;
+
+# database objects attribute
+attribute sepgsql_database_type;
+attribute sepgsql_table_type;
+attribute sepgsql_sysobj_table_type;
+attribute sepgsql_procedure_type;
+attribute sepgsql_blob_type;
+attribute sepgsql_module_type;
+
+# database object types
+type sepgsql_blob_t;
+sepgsql_blob_object(sepgsql_blob_t)
+
+type sepgsql_db_t;
+sepgsql_database_object(sepgsql_db_t)
+
+type sepgsql_fixed_table_t;
+sepgsql_table_object(sepgsql_fixed_table_t)
+
+type sepgsql_proc_t;
+sepgsql_procedure_object(sepgsql_proc_t)
+
+type sepgsql_ro_blob_t;
+sepgsql_blob_object(sepgsql_ro_blob_t)
+
+type sepgsql_ro_table_t;
+sepgsql_table_object(sepgsql_ro_table_t)
+
+type sepgsql_secret_blob_t;
+sepgsql_blob_object(sepgsql_secret_blob_t)
+
+type sepgsql_secret_table_t;
+sepgsql_table_object(sepgsql_secret_table_t)
+
+type sepgsql_sysobj_t;
+sepgsql_system_table_object(sepgsql_sysobj_t)
+
+type sepgsql_table_t;
+sepgsql_table_object(sepgsql_table_t)
+
+type sepgsql_trusted_proc_exec_t;
+sepgsql_procedure_object(sepgsql_trusted_proc_exec_t)
+
+# Trusted Procedure Domain
+type sepgsql_trusted_proc_t;
+domain_type(sepgsql_trusted_proc_t)
+sepgsql_unconfined(sepgsql_trusted_proc_t)
+role system_r types sepgsql_trusted_proc_t;
+
+########################################
+#
+# SE-PostgreSQL Local Policy
+#
+allow postgresql_t self:netlink_selinux_socket create_socket_perms;
+selinux_get_enforce_mode(postgresql_t)
+selinux_validate_context(postgresql_t)
+selinux_compute_access_vector(postgresql_t)
+selinux_compute_create_context(postgresql_t)
+selinux_compute_relabel_context(postgresql_t)
+seutil_libselinux_linked(postgresql_t)
+
+allow postgresql_t sepgsql_database_type:db_database *;
+type_transition postgresql_t postgresql_t:db_database sepgsql_db_t;
+
+allow postgresql_t sepgsql_module_type:db_database install_module;
+allow postgresql_t sepgsql_table_type:{ db_table db_column db_tuple } *;
+allow postgresql_t sepgsql_procedure_type:db_procedure *;
+allow postgresql_t sepgsql_blob_type:db_blob *;
+
+# server specific type transitions
+type_transition postgresql_t sepgsql_database_type:db_table sepgsql_sysobj_t;
+type_transition postgresql_t sepgsql_database_type:db_procedure sepgsql_proc_t;
+type_transition postgresql_t sepgsql_database_type:db_blob sepgsql_blob_t;
+
+# Database/Loadable module
+allow sepgsql_database_type sepgsql_module_type:db_database load_module;
+
+########################################
+#
+# Rules common to all clients
+#
+
+# Client domain constraint
+allow sepgsql_client_type sepgsql_db_t:db_database { getattr access get_param set_param };
+type_transition sepgsql_client_type sepgsql_client_type:db_database sepgsql_db_t;
+
+allow sepgsql_client_type sepgsql_fixed_table_t:db_table { getattr use select insert };
+allow sepgsql_client_type sepgsql_fixed_table_t:db_column { getattr use select insert };
+allow sepgsql_client_type sepgsql_fixed_table_t:db_tuple { use select insert };
+
+allow sepgsql_client_type sepgsql_table_t:db_table { getattr use select update insert delete };
+allow sepgsql_client_type sepgsql_table_t:db_column { getattr use select update insert };
+allow sepgsql_client_type sepgsql_table_t:db_tuple { use select update insert delete };
+
+allow sepgsql_client_type sepgsql_ro_table_t:db_table { getattr use select };
+allow sepgsql_client_type sepgsql_ro_table_t:db_column { getattr use select };
+allow sepgsql_client_type sepgsql_ro_table_t:db_tuple { use select };
+
+allow sepgsql_client_type sepgsql_secret_table_t:db_table getattr;
+allow sepgsql_client_type sepgsql_secret_table_t:db_column getattr;
+
+allow sepgsql_client_type sepgsql_sysobj_t:db_table { getattr use select };
+allow sepgsql_client_type sepgsql_sysobj_t:db_column { getattr use select };
+allow sepgsql_client_type sepgsql_sysobj_t:db_tuple { use select };
+
+allow sepgsql_client_type sepgsql_proc_t:db_procedure { getattr execute };
+allow sepgsql_client_type sepgsql_trusted_proc_t:db_procedure { getattr execute entrypoint };
+
+allow sepgsql_client_type sepgsql_blob_t:db_blob { create drop getattr setattr read write };
+allow sepgsql_client_type sepgsql_ro_blob_t:db_blob { getattr read };
+allow sepgsql_client_type sepgsql_secret_blob_t:db_blob getattr;
+
+tunable_policy(`sepgsql_enable_users_ddl',`
+	allow sepgsql_client_type sepgsql_table_t:db_table { create drop setattr };
+	allow sepgsql_client_type sepgsql_table_t:db_column { create drop setattr };
+	allow sepgsql_client_type sepgsql_sysobj_t:db_tuple { update insert delete };
+')
+
+########################################
+#
+# Unconfined access to this module
+#
+
+allow sepgsql_unconfined_type sepgsql_database_type:db_database *;
+allow sepgsql_unconfined_type sepgsql_table_type:{ db_table db_column db_tuple } *;
+allow sepgsql_unconfined_type sepgsql_blob_type:db_blob *;
+allow sepgsql_unconfined_type { sepgsql_proc_t sepgsql_trusted_proc_t }:db_procedure *;
+allow sepgsql_unconfined_type sepgsql_procedure_type:db_procedure { create drop getattr setattr relabelfrom relabelto };
+allow sepgsql_unconfined_type sepgsql_module_type:db_database install_module;
+
+type_transition sepgsql_unconfined_type sepgsql_unconfined_type:db_database sepgsql_db_t;
+type_transition sepgsql_unconfined_type sepgsql_database_type:db_table sepgsql_table_t;
+type_transition sepgsql_unconfined_type sepgsql_database_type:db_procedure sepgsql_proc_t;
+type_transition sepgsql_unconfined_type sepgsql_database_type:db_blob sepgsql_blob_t;
+
+
+########################################
+#
+# Allow permission to external domains
+#
+
+# relabelfrom for invalid security context
+allow sepgsql_unconfined_type unlabeled_t:db_database { setattr relabelfrom };
+allow sepgsql_unconfined_type unlabeled_t:db_table { setattr relabelfrom };
+allow sepgsql_unconfined_type unlabeled_t:db_procedure { setattr relabelfrom };
+allow sepgsql_unconfined_type unlabeled_t:db_column { setattr relabelfrom };
+allow sepgsql_unconfined_type unlabeled_t:db_tuple { update relabelfrom };
+allow sepgsql_unconfined_type unlabeled_t:db_blob { setattr relabelfrom };
+
+# administrative client domain
+optional_policy(`
+	gen_require(`
+		type unconfined_t;
+	')
+	sepgsql_unconfined(unconfined_t)
+')
+
+optional_policy(`
+	gen_require(`
+		type sysadm_t;
+	')
+	sepgsql_unconfined(sysadm_t)
+')
+
+# unprivilleged client domain
+optional_policy(`
+	gen_require(`
+		type user_t;
+		role user_r;
+	')
+	sepgsql_userdom_template(user,user_t,user_r)
+')
+
+optional_policy(`
+	gen_require(`
+		type staff_t;
+		role staff_r;
+	')
+	sepgsql_userdom_template(staff,staff_t,staff_r)
+')
+
+optional_policy(`
+	gen_require(`
+		type guest_t;
+		role guest_r;
+	')
+	sepgsql_userdom_template(guest,guest_t,guest_r)
+')
+
+optional_policy(`
+	gen_require(`
+		type xguest_t;
+		role xguest_r;
+	')
+	sepgsql_userdom_template(xguest,xguest_t,xguest_r)
+')
+
+optional_policy(`
+	gen_require(`
+		type httpd_t;
+	')
+	sepgsql_unpriv_client(httpd_t)
+')
+
+optional_policy(`
+	gen_require(`
+		type httpd_sys_script_t;
+	')
+	sepgsql_unpriv_client(httpd_sys_script_t)
+')
+
+# SE-PostgreSQL loadable modules
+optional_policy(`
+	gen_require(`
+		type lib_t, textrel_shlib_t;
+	')
+	sepgsql_loadable_module(lib_t)
+	sepgsql_loadable_module(textrel_shlib_t)
+')
+
+########################################
+#
+# SE-PostgreSQL audit switch for debugging
+#
+tunable_policy(`sepgsql_enable_auditallow',`
+	auditallow domain sepgsql_database_type  : db_database *;
+	auditallow domain sepgsql_table_type     : db_table *;
+	auditallow domain sepgsql_table_type     : db_column *;
+	auditallow domain sepgsql_procedure_type : db_procedure *;
+	auditallow domain sepgsql_blob_type      : db_blob *;
+	auditallow domain sepgsql_module_type    : db_database { install_module };
+	auditallow sepgsql_database_type sepgsql_module_type : db_database { load_module };
+')
+
+tunable_policy(`! sepgsql_enable_auditdeny',`
+	dontaudit domain sepgsql_database_type   : db_database *;
+	dontaudit domain sepgsql_table_type      : db_table *;
+	dontaudit domain sepgsql_table_type      : db_column *;
+	dontaudit domain sepgsql_procedure_type  : db_procedure *;
+	dontaudit domain sepgsql_blob_type       : db_blob *;
+	dontaudit domain sepgsql_module_type     : db_database { install_module };
+	dontaudit sepgsql_database_type sepgsql_module_type : db_database { load_module };
+')
+
+dontaudit domain { sepgsql_table_type - sepgsql_sysobj_table_type } : db_tuple { use select update insert delete };
+
+########################################
+#
+# SE-PostgreSQL regression test mode switch
+#
+tunable_policy(`sepgsql_regression_test_mode',`
+	allow sepgsql_client_type       home_type : db_database { install_module };
+	allow sepgsql_unconfined_type   home_type : db_database { install_module };
+	allow sepgsql_database_type     home_type : db_database { load_module };
+')

sepostgresql-sepgsql-8.3.4-2.patch:

--- NEW FILE sepostgresql-sepgsql-8.3.4-2.patch ---
diff -rpNU3 base/configure sepgsql/configure
--- base/configure	2008-09-25 15:09:40.000000000 +0900
+++ sepgsql/configure	2008-09-25 15:22:04.000000000 +0900
@@ -314,7 +314,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configure_args build build_cpu build_vendor build_os host host_cpu host_vendor host_os PORTNAME docdir enable_nls WANTED_LANGUAGES default_port enable_shared enable_rpath enable_debug enable_profiling DTRACE DTRACEFLAGS enable_dtrace CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP GCC TAS autodepend INCLUDES enable_thread_safety with_tcl with_perl with_python with_gssapi with_krb5 krb_srvtab with_pam with_ldap with_bonjour with_openssl with_ossp_uuid XML2_CONFIG with_libxml with_libxslt with_system_tzdata with_zlib EGREP ELF_SYS LDFLAGS_SL LD with_gnu_ld ld_R_works RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP STRIP_STATIC_LIB STRIP_SHARED
 _LIB TAR LN_S AWK YACC YFLAGS FLEX FLEXFLAGS PERL perl_archlibexp perl_privlibexp perl_useshrplib perl_embed_ldflags PYTHON python_version python_configdir python_includespec python_libdir python_libspec python_additional_libs OSSP_UUID_LIBS HAVE_IPV6 LIBOBJS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS LDAP_LIBS_FE LDAP_LIBS_BE HAVE_POSIX_SIGNALS MSGFMT MSGMERGE XGETTEXT localedir TCLSH TCL_CONFIG_SH TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIBS TCL_LIB_SPEC TCL_SHARED_BUILD TCL_SHLIB_LD_LIBS NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL vpath_build 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 configure_args build build_cpu build_vendor build_os host host_cpu host_vendor host_os PORTNAME docdir enable_nls WANTED_LANGUAGES default_port enable_shared enable_rpath enable_debug enable_profiling DTRACE DTRACEFLAGS enable_dtrace CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP GCC TAS autodepend INCLUDES enable_thread_safety with_tcl with_perl with_python with_gssapi with_krb5 krb_srvtab with_pam with_ldap with_bonjour with_openssl with_ossp_uuid XML2_CONFIG with_libxml with_libxslt with_system_tzdata with_zlib enable_selinux EGREP ELF_SYS LDFLAGS_SL LD with_gnu_ld ld_R_works RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP STRIP_STATIC_L
 IB STRIP_SHARED_LIB TAR LN_S AWK YACC YFLAGS FLEX FLEXFLAGS PERL perl_archlibexp perl_privlibexp perl_useshrplib perl_embed_ldflags PYTHON python_version python_configdir python_includespec python_libdir python_libspec python_additional_libs OSSP_UUID_LIBS HAVE_IPV6 LIBOBJS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS LDAP_LIBS_FE LDAP_LIBS_BE HAVE_POSIX_SIGNALS MSGFMT MSGMERGE XGETTEXT localedir TCLSH TCL_CONFIG_SH TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIBS TCL_LIB_SPEC TCL_SHARED_BUILD TCL_SHLIB_LD_LIBS NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL vpath_build LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -871,6 +871,7 @@ Optional Features:
   --enable-cassert        enable assertion checks (for debugging)
   --enable-thread-safety  make client libraries thread-safe
   --enable-thread-safety-force  force thread-safety despite thread test failure
+  --enable-selinux        build with NSA SELinux support
   --disable-largefile     omit support for large files
 
 Optional Packages:
@@ -4619,6 +4620,120 @@ fi;
 
 
 #
+# NSA SELinux support
+#
+
+pgac_args="$pgac_args enable_selinux"
+
+# Check whether --enable-selinux or --disable-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 getpeercon in -lselinux" >&5
+echo $ECHO_N "checking for getpeercon in -lselinux... $ECHO_C" >&6
+if test "${ac_cv_lib_selinux_getpeercon+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 gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char getpeercon ();
+int
+main ()
+{
+getpeercon ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_selinux_getpeercon=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_selinux_getpeercon=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_getpeercon" >&5
+echo "${ECHO_T}$ac_cv_lib_selinux_getpeercon" >&6
+if test $ac_cv_lib_selinux_getpeercon = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define SECURITY_SYSATTR_NAME "security_context"
+_ACEOF
+
+
+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
 #
 
@@ -26006,6 +26121,7 @@ s, at with_libxml@,$with_libxml,;t t
 s, at with_libxslt@,$with_libxslt,;t t
 s, at with_system_tzdata@,$with_system_tzdata,;t t
 s, at with_zlib@,$with_zlib,;t t
+s, at enable_selinux@,$enable_selinux,;t t
 s, at EGREP@,$EGREP,;t t
 s, at ELF_SYS@,$ELF_SYS,;t t
 s, at LDFLAGS_SL@,$LDFLAGS_SL,;t t
diff -rpNU3 base/configure.in sepgsql/configure.in
--- base/configure.in	2008-09-25 15:09:40.000000000 +0900
+++ sepgsql/configure.in	2008-09-25 15:22:04.000000000 +0900
@@ -626,6 +626,21 @@ PGAC_ARG_BOOL(with, zlib, yes,
 AC_SUBST(with_zlib)
 
 #
+# NSA SELinux support
+#
+PGAC_ARG_BOOL(enable, selinux, no,
+              [  --enable-selinux        build with NSA SELinux support])
+if test "$enable_selinux" = yes; then
+	AC_CHECK_LIB(selinux, getpeercon,
+		     AC_DEFINE(SECURITY_SYSATTR_NAME, "security_context",
+		     	       [Enables system column for security attribute support])
+		     AC_DEFINE_UNQUOTED(HAVE_SELINUX, 1,
+					[Enables SE-PostgreSQL feature])
+		     AC_SUBST(enable_selinux),
+		     AC_MSG_ERROR("--enable-selinux requires libselinux."))
+fi
+
+#
 # Elf
 #
 
diff -rpNU3 base/contrib/sepgsql_policy/Makefile sepgsql/contrib/sepgsql_policy/Makefile
--- base/contrib/sepgsql_policy/Makefile	1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/contrib/sepgsql_policy/Makefile	2008-06-26 11:44:44.000000000 +0900
@@ -0,0 +1,40 @@
+#
+# contrib/sepgsql_policy/Makefile
+#   Makefile of security policy module for SE-PostgreSQL
+#
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+
+policy_basedir	:= /usr/share/selinux
+policy_makefile	:= $(policy_basedir)/devel/Makefile
+policy_types	:= targeted mls
+policy		:= $(strip $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config))
+package_names	:= sepostgresql sepostgresql-devel
+prefix_ptn	:= "s/%%__prefix__%%/$(shell echo $(prefix)|sed 's/\//\\\//g')/g"
+bindir_ptn	:= "s/%%__bindir__%%/$(shell echo $(bindir)|sed 's/\//\\\//g')/g"
+libdir_ptn	:= "s/%%__libdir__%%/$(shell echo $(pkglibdir)|sed 's/\//\\\//g')/g"
+
+all:
+	$(foreach pkg, $(package_names), $(foreach p, $(policy_types), $(MAKE) $(MAKEOVERRIDES) policy=$(p) $(pkg).pp;))
+	$(foreach pkg, $(package_names), test -e $(pkg).pp.$(policy) && ln -sf $(pkg).pp.$(policy) $(pkg).pp;)
+
+.install-policy:
[...11096 lines suppressed...]
+extern void sepgsqlGramCreateDatabase(Relation rel, HeapTuple tuple,
+									  DefElem *defel);
+extern void sepgsqlGramAlterDatabase(Relation rel, HeapTuple tuple,
+									 DefElem *defel);
+extern void sepgsqlGramCreateFunction(Relation rel, HeapTuple tuple,
+									  DefElem *defel);
+extern void sepgsqlGramAlterFunction(Relation rel, HeapTuple tuple,
+									 DefElem *defel);
+
+/* DATABASE related hooks */
+extern void sepgsqlSetDatabaseParam(const char *name, char *argstring);
+
+extern void sepgsqlGetDatabaseParam(const char *name);
+
+/* FUNCTION related hooks */
+extern void sepgsqlCallFunction(FmgrInfo *finfo, bool with_perm_check);
+
+extern bool sepgsqlCallFunctionTrigger(FmgrInfo *finfo, TriggerData *tgdata);
+
+extern void sepgsqlBeginPerformCheckFK(Relation rel, bool rel_is_primary, Datum *save_pgace);
+
+extern void sepgsqlEndPerformCheckFK(Relation rel, bool rel_is_primary, Datum save_pgace);
+
+/* TABLE related hooks */
+extern void sepgsqlLockTable(Oid relid);
+
+extern bool sepgsqlAlterTable(Relation rel, AlterTableCmd *cmd);
+
+/* COPY TO/COPY FROM statement hooks */
+extern void sepgsqlCopyTable(Relation rel, List *attnumlist, bool is_from);
+
+extern bool sepgsqlCopyToTuple(Relation rel, List *attnumlist,
+							   HeapTuple tuple);
+
+/* Loadable shared library module hooks */
+extern void sepgsqlLoadSharedModule(const char *filename);
+
+/* Binary Large Object (BLOB) hooks */
+extern void sepgsqlLargeObjectCreate(Relation rel, HeapTuple tuple);
+
+extern void sepgsqlLargeObjectDrop(Relation rel, HeapTuple tuple, void **pgaceItem);
+
+extern void sepgsqlLargeObjectRead(LargeObjectDesc *lodesc, int length);
+
+extern void sepgsqlLargeObjectWrite(LargeObjectDesc *lodesc, int length);
+
+extern void sepgsqlLargeObjectTruncate(LargeObjectDesc *lodesc, int offset);
+
+extern void sepgsqlLargeObjectImport(Oid loid, int fdesc, const char *filename);
+
+extern void sepgsqlLargeObjectExport(Oid loid, int fdesc, const char *filename);
+
+extern void sepgsqlLargeObjectGetSecurity(Relation rel, HeapTuple tuple);
+
+extern void sepgsqlLargeObjectSetSecurity(Relation rel, HeapTuple newtup, HeapTuple oldtup);
+
+/* Security Label hooks */
+extern char *sepgsqlTranslateSecurityLabelIn(const char *context);
+
+extern char *sepgsqlTranslateSecurityLabelOut(const char *context);
+
+extern char *sepgsqlValidateSecurityLabel(char *context);
+
+extern char *sepgsqlSecurityLabelOfLabel(void);
+
+/*
+ * SE-PostgreSQL core functions
+ *	 src/backend/security/sepgsql/core.c
+ */
+extern bool sepgsqlIsEnabled(void);
+
+extern const security_context_t sepgsqlGetServerContext(void);
+
+extern const security_context_t sepgsqlGetClientContext(void);
+
+extern const security_context_t sepgsqlGetDatabaseContext(void);
+
+extern const security_context_t sepgsqlGetUnlabeledContext(void);
+
+extern const security_context_t sepgsqlSwitchClientContext(security_context_t newcon);
+
+extern Oid sepgsqlGetDatabaseSecurityId(void);
+
+/*
+ * SE-PostgreSQL userspace avc functions
+ *   src/backend/security/sepgsql/avc.c
+ */
+extern void sepgsqlAvcInit(void);
+
+extern void sepgsqlAvcSwitchClientContext(security_context_t context);
+
+extern void sepgsqlClientHasPermission(Oid target_security_id,
+									   security_class_t tclass,
+									   access_vector_t perms,
+									   const char *objname);
+
+extern bool sepgsqlClientHasPermissionNoAbort(Oid target_security_id,
+											  security_class_t tclass,
+											  access_vector_t perms,
+											  const char *objname);
+
+extern Oid sepgsqlClientCreateSid(Oid target_security_id,
+								  security_class_t tclass);
+
+extern security_context_t
+sepgsqlClientCreateContext(Oid target_security_id,
+						   security_class_t tclass);
+
+extern bool sepgsqlComputePermission(const security_context_t scontext,
+									 const security_context_t tcontext,
+									 security_class_t tclass,
+									 access_vector_t perms,
+									 const char *objname);
+
+extern security_context_t
+sepgsqlComputeCreateContext(const security_context_t scontext,
+							const security_context_t tcontext,
+							security_class_t tclass);
+
+/*
+ * SE-PostgreSQL permission evaluation related
+ *	 src/backend/security/sepgsql/permission.c
+ */
+extern const char *sepgsqlTupleName(Oid relid, HeapTuple tuple);
+
+extern void sepgsqlSetDefaultContext(Relation rel, HeapTuple tuple);
+
+extern bool sepgsqlCheckTuplePerms(Relation rel, HeapTuple tuple,
+								   HeapTuple oldtup, uint32 perms, bool abort);
+#endif   /* SEPGSQL_H */
diff -rpNU3 base/src/include/storage/fd.h sepgsql/src/include/storage/fd.h
--- base/src/include/storage/fd.h	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/include/storage/fd.h	2008-06-14 02:36:58.000000000 +0900
@@ -67,6 +67,7 @@ extern int	FileWrite(File file, char *bu
 extern int	FileSync(File file);
 extern long FileSeek(File file, long offset, int whence);
 extern int	FileTruncate(File file, long 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 -rpNU3 base/src/include/storage/lwlock.h sepgsql/src/include/storage/lwlock.h
--- base/src/include/storage/lwlock.h	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/include/storage/lwlock.h	2008-06-14 02:36:58.000000000 +0900
@@ -63,6 +63,7 @@ typedef enum LWLockId
 	AutovacuumLock,
 	AutovacuumScheduleLock,
 	SyncScanLock,
+	SepgsqlAvcLock,
 	/* Individual lock IDs end here */
 	FirstBufMappingLock,
 	FirstLockMgrLock = FirstBufMappingLock + NUM_BUFFER_PARTITIONS,
diff -rpNU3 base/src/include/utils/catcache.h sepgsql/src/include/utils/catcache.h
--- base/src/include/utils/catcache.h	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/include/utils/catcache.h	2008-06-14 02:36:58.000000000 +0900
@@ -172,6 +172,7 @@ extern HeapTuple SearchCatCache(CatCache
 			   Datum v1, Datum v2,
 			   Datum v3, Datum v4);
 extern void ReleaseCatCache(HeapTuple tuple);
+extern void InsertCatCache(CatCache *cache, HeapTuple tuple);
 
 extern CatCList *SearchCatCacheList(CatCache *cache, int nkeys,
 				   Datum v1, Datum v2,
diff -rpNU3 base/src/include/utils/errcodes.h sepgsql/src/include/utils/errcodes.h
--- base/src/include/utils/errcodes.h	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/include/utils/errcodes.h	2008-06-14 02:36:58.000000000 +0900
@@ -339,6 +339,12 @@
 #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 - Security Error (PGACE/SE-PostgreSQL error class) */
+#define ERRCODE_PGACE_ERROR					MAKE_SQLSTATE('S','E', '0','0','0')
+#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 -rpNU3 base/src/include/utils/syscache.h sepgsql/src/include/utils/syscache.h
--- base/src/include/utils/syscache.h	2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/include/utils/syscache.h	2008-06-14 02:36:58.000000000 +0900
@@ -76,6 +76,8 @@
 #define TSTEMPLATEOID		45
 #define TYPENAMENSP			46
 #define TYPEOID				47
+#define SECURITYOID			48
+#define SECURITYLABEL		49
 
 extern void InitCatalogCache(void);
 extern void InitCatalogCachePhase2(void);
@@ -84,6 +86,8 @@ extern HeapTuple SearchSysCache(int cach
 			   Datum key1, Datum key2, Datum key3, Datum key4);
 extern void ReleaseSysCache(HeapTuple tuple);
 
+extern void InsertSysCache(Oid relid, HeapTuple tuple);
+
 /* convenience routines */
 extern HeapTuple SearchSysCacheCopy(int cacheId,
 				   Datum key1, Datum key2, Datum key3, Datum key4);


Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.init,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sepostgresql.init	23 Sep 2008 02:04:13 -0000	1.23
+++ sepostgresql.init	30 Sep 2008 03:39:06 -0000	1.24
@@ -7,9 +7,9 @@
 # pidfile: /var/run/postmaster.pid
 #---------------------------------------------------------------------
 
-PGVERSION="8.3.3"
+PGVERSION="8.3.4"
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'`
-SEPGVERSION="2.1042"
+SEPGVERSION="2.1067"
 
 # source function library
 . /etc/rc.d/init.d/functions


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sepostgresql.spec	23 Sep 2008 02:04:13 -0000	1.24
+++ sepostgresql.spec	30 Sep 2008 03:39:06 -0000	1.25
@@ -7,14 +7,12 @@
 # SE-PostgreSQL status extension
 %define selinux_policy_stores targeted mls
 
-# check policy dependency
-%define fullset_policy %(rpm -E '%{dist}' | grep -cE '^\.fc[1-9]$')
-%if %{fullset_policy}
-%define required_policy_version    3.0.6
-%define policy_module_name         sepostgresql
+# Check required policy version
+%define fedora9 %(rpm -E '%{dist}' | grep -cE '^\.fc[1-9]$')
+%if %{fedora9}
+%define required_policy_version    3.3.1-96
 %else
 %define required_policy_version    3.4.2
-%define policy_module_name         sepostgresql-devel
 %endif
 
 
@@ -23,8 +21,8 @@
 
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
-Version: 8.3.3
-Release: 2.1042%{?sepgsql_extension}%{?dist}
+Version: 8.3.4
+Release: 2.1067%{?sepgsql_extension}%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -33,13 +31,16 @@
 Source1: sepostgresql.init
 Source2: sepostgresql.8
 Source3: sepostgresql.logrotate
-Patch0: sepostgresql-sepgsql-8.3.3-2.patch
-Patch1: sepostgresql-policy-8.3.3-2.patch
-Patch2: sepostgresql-pg_dump-8.3.3-2.patch
+Patch0: sepostgresql-sepgsql-8.3.4-2.patch
+Patch1: sepostgresql-policy-8.3.4-2.patch
+Patch2: sepostgresql-pg_dump-8.3.4-2.patch
 Patch3: sepostgresql-fedora-prefix.patch
 BuildRequires: perl glibc-devel bison flex readline-devel zlib-devel >= 1.0.4
-BuildRequires: checkpolicy libselinux-devel >= 2.0.43 selinux-policy-devel
+BuildRequires: checkpolicy libselinux-devel >= 2.0.43
 BuildRequires: selinux-policy >= %{required_policy_version}
+%if %{fedora9}
+BuildRequires: selinux-policy-devel
+%endif
 %if %{ssl}
 BuildRequires: openssl-devel
 %endif
@@ -88,7 +89,7 @@
 # parallel build, if possible
 make %{?_smp_mflags}
 # to create empty .fc file
-touch src/backend/security/sepgsql/policy/%{policy_module_name}.fc
+touch src/backend/security/sepgsql/policy/sepostgresql-devel.fc
 make -C src/backend/security/sepgsql/policy
 
 %install
@@ -99,8 +100,8 @@
 for store in %{selinux_policy_stores}
 do
     install -d %{buildroot}%{_datadir}/selinux/${store}
-    install -p -m 644 src/backend/security/sepgsql/policy/%{policy_module_name}.pp.${store} \
-               %{buildroot}%{_datadir}/selinux/${store}/%{policy_module_name}.pp
+    install -p -m 644 src/backend/security/sepgsql/policy/sepostgresql-devel.pp.${store} \
+               %{buildroot}%{_datadir}/selinux/${store}/sepostgresql-devel.pp
 done
 
 # avoid to conflict with native postgresql package
@@ -153,16 +154,11 @@
 
 for store in %{selinux_policy_stores}
 do
-%if %{fullset_policy}
-    %{_sbindir}/semodule -s ${store} -r %{policy_module_name} >& /dev/null || :
-    %{_sbindir}/semodule -s ${store}    \
-        -i %{_datadir}/selinux/${store}/%{policy_module_name}.pp >& /dev/null || :
-%else
-    if %{_sbindir}/semodule -s ${store} -l | grep -Eq "^%{policy_module_name}"; then
+    %{_sbindir}/semodule -s ${store} -r sepostgresql >& /dev/null || :
+    if %{_sbindir}/semodule -s ${store} -l | grep -Eq "^sepostgresql-devel"; then
         %{_sbindir}/semodule -s ${store}    \
-            -u %{_datadir}/selinux/${store}/%{policy_module_name}.pp >& /dev/null || :
+            -i %{_datadir}/selinux/${store}/sepostgresql-devel.pp >& /dev/null || :
     fi
-%endif
 done
 
 # Fix up non-standard file contexts
@@ -183,7 +179,7 @@
 if [ $1 -eq 0 ]; then           # rpm -e case
     for store in %{selinux_policy_stores}
     do
-        %{_sbindir}/semodule -s ${store} -r %{policy_module_name} >& /dev/null || :
+        %{_sbindir}/semodule -s ${store} -r sepostgresql-devel >& /dev/null || :
     done
     /sbin/fixfiles -R %{name} restore || :
     test -d %{_localstatedir}/lib/sepgsql && /sbin/restorecon -R %{_localstatedir}/lib/sepgsql || :
@@ -212,12 +208,19 @@
 %{_datadir}/sepgsql/conversion_create.sql
 %{_datadir}/sepgsql/information_schema.sql
 %{_datadir}/sepgsql/sql_features.txt
-%attr(644,root,root) %{_datadir}/selinux/*/%{policy_module_name}.pp
+%attr(644,root,root) %{_datadir}/selinux/*/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
+* Sat Sep 27 2008 <kaigai at kaigai.gr.jp> - 8.3.3-2.1066
+- update base version to 8.3.4
+- sepostgresql.pp was marked as obsolute
+
+* Tue Sep 23 2008 <kaigai at kaigai.gr.jp> - 8.3.3-2.1043
+- bugfix: a case when INSERT a FK reference to invisible PK
+
 * Wed Aug 13 2008 <kaigai at kaigai.gr.jp> - 8.3.3-2.964
 - bugfix: trusted procedure invokation
 


--- sepostgresql-pg_dump-8.3.3-2.patch DELETED ---


--- sepostgresql-policy-8.3.3-2.patch DELETED ---


--- sepostgresql-sepgsql-8.3.3-2.patch DELETED ---



From kaigai at fedoraproject.org  Tue Sep 30 03:41:20 2008
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Tue, 30 Sep 2008 03:41:20 +0000 (UTC)
Subject: rpms/sepostgresql/devel .cvsignore,1.10,1.11 sources,1.7,1.8
Message-ID: <20080930034120.3DB9470119@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2776

Modified Files:
	.cvsignore sources 
Log Message:
upload postgresql-8.3.4.tar.bz2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Jun 2008 04:05:55 -0000	1.10
+++ .cvsignore	30 Sep 2008 03:40:49 -0000	1.11
@@ -1 +1 @@
-postgresql-8.3.3.tar.bz2
+postgresql-8.3.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	13 Jun 2008 04:05:55 -0000	1.7
+++ sources	30 Sep 2008 03:40:49 -0000	1.8
@@ -1 +1 @@
-0ae4bd9620e84d3e08dcf923808d14d0  postgresql-8.3.3.tar.bz2
+c339b9d3c0c4add64c7a76640fc93744  postgresql-8.3.4.tar.bz2



From roland at fedoraproject.org  Tue Sep 30 03:55:05 2008
From: roland at fedoraproject.org (Roland McGrath)
Date: Tue, 30 Sep 2008 03:55:05 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.993, 1.994 linux-2.6-utrace.patch, 
	1.99, 1.100
Message-ID: <20080930035505.AC2E470119@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3719

Modified Files:
	kernel.spec linux-2.6-utrace.patch 
Log Message:
utrace update: fix CLONE_PTRACE (#461552)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.993
retrieving revision 1.994
diff -u -r1.993 -r1.994
--- kernel.spec	30 Sep 2008 03:24:30 -0000	1.993
+++ kernel.spec	30 Sep 2008 03:54:35 -0000	1.994
@@ -1741,6 +1741,7 @@
 %changelog
 * Mon Sep 29 2008 Roland McGrath <roland at redhat.com>
 - 2.6.27-rc8
+- utrace update: fix CLONE_PTRACE (#461552)
 
 * Mon Sep 29 2008 Dave Jones <davej at redhat.com>
 - Turn off CONFIG_USB_DEBUG. It's noisy, and of no real value right now.

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- linux-2.6-utrace.patch	30 Sep 2008 03:24:30 -0000	1.99
+++ linux-2.6-utrace.patch	30 Sep 2008 03:54:35 -0000	1.100
@@ -7,10 +7,10 @@
  include/linux/utrace.h            |  705 ++++++++++
  init/Kconfig                      |   26 +
  kernel/Makefile                   |    1 +
- kernel/ptrace.c                   |  605 +++++++++-
+ kernel/ptrace.c                   |  609 +++++++++-
  kernel/signal.c                   |   14 +-
  kernel/utrace.c                   | 2538 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 4544 insertions(+), 8 deletions(-)
+ 12 files changed, 4548 insertions(+), 8 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
 index 1615350..92ca631 100644  
@@ -1665,7 +1665,7 @@
  obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
  obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 356699a..355297b 100644  
+index 356699a..67ada85 100644  
 --- a/kernel/ptrace.c
 +++ b/kernel/ptrace.c
 @@ -16,6 +16,7 @@
@@ -1754,7 +1754,7 @@
  /*
   * Check that we have indeed attached to the thing..
   */
-@@ -113,6 +165,457 @@ int ptrace_check_attach(struct task_stru
+@@ -113,6 +165,461 @@ int ptrace_check_attach(struct task_stru
  	return ret;
  }
  
@@ -1940,30 +1940,34 @@
 +		event = PTRACE_EVENT_FORK;
 +	}
 +
-+	if (!event)
-+		return UTRACE_RESUME;
-+
 +	/*
 +	 * Any of these reports implies auto-attaching the new child.
++	 * So does CLONE_PTRACE, even with no event to report.
 +	 */
-+	child_engine = utrace_attach_task(child, UTRACE_ATTACH_CREATE |
-+					  UTRACE_ATTACH_EXCLUSIVE |
-+					  UTRACE_ATTACH_MATCH_OPS,
-+					  &ptrace_utrace_ops, NULL);
-+	if (unlikely(IS_ERR(child_engine))) {
-+		WARN_ON(1);	/* XXX */
-+	} else {
-+		/* XXX already set by old ptrace code
-+		task_lock(child);
-+		child->ptrace = parent->ptrace;
-+		child->parent = parent->parent;
-+		task_unlock(child);
-+		*/
-+		ptrace_update_utrace(child, child_engine);
-+		utrace_engine_put(child_engine);
++	if (event || (clone_flags & CLONE_PTRACE)) {
++		child_engine = utrace_attach_task(child, UTRACE_ATTACH_CREATE |
++						  UTRACE_ATTACH_EXCLUSIVE |
++						  UTRACE_ATTACH_MATCH_OPS,
++						  &ptrace_utrace_ops, NULL);
++		if (unlikely(IS_ERR(child_engine))) {
++			WARN_ON(1);	/* XXX */
++		} else {
++			BUG_ON(!child->ptrace);
++			/* XXX already set by old ptrace code
++			   task_lock(child);
++			   child->ptrace = parent->ptrace;
++			   child->parent = parent->parent;
++			   task_unlock(child);
++			*/
++			ptrace_update_utrace(child, child_engine);
++			utrace_engine_put(child_engine);
++		}
 +	}
 +
-+	return utrace_ptrace_event(parent, event, child->pid);
++	if (event)
++		return utrace_ptrace_event(parent, event, child->pid);
++
++	return UTRACE_RESUME;
 +}
 +
 +
@@ -2212,7 +2216,7 @@
  int __ptrace_may_access(struct task_struct *task, unsigned int mode)
  {
  	/* May we inspect the given task?
-@@ -156,6 +659,7 @@ int ptrace_attach(struct task_struct *ta
+@@ -156,6 +663,7 @@ int ptrace_attach(struct task_struct *ta
  {
  	int retval;
  	unsigned long flags;
@@ -2220,7 +2224,7 @@
  
  	audit_ptrace(task);
  
-@@ -163,6 +667,13 @@ int ptrace_attach(struct task_struct *ta
+@@ -163,6 +671,13 @@ int ptrace_attach(struct task_struct *ta
  	if (same_thread_group(task, current))
  		goto out;
  
@@ -2234,7 +2238,7 @@
  repeat:
  	/*
  	 * Nasty, nasty.
-@@ -202,6 +713,11 @@ repeat:
+@@ -202,6 +717,11 @@ repeat:
  bad:
  	write_unlock_irqrestore(&tasklist_lock, flags);
  	task_unlock(task);
@@ -2246,7 +2250,7 @@
  out:
  	return retval;
  }
-@@ -221,9 +737,7 @@ int ptrace_detach(struct task_struct *ch
+@@ -221,9 +741,7 @@ int ptrace_detach(struct task_struct *ch
  	if (!valid_signal(data))
  		return -EIO;
  
@@ -2257,7 +2261,7 @@
  
  	write_lock_irq(&tasklist_lock);
  	/* protect against de_thread()->release_task() */
-@@ -309,6 +823,8 @@ static int ptrace_setoptions(struct task
+@@ -309,6 +827,8 @@ static int ptrace_setoptions(struct task
  	if (data & PTRACE_O_TRACEEXIT)
  		child->ptrace |= PT_TRACE_EXIT;
  
@@ -2266,7 +2270,7 @@
  	return (data & ~PTRACE_O_MASK) ? -EINVAL : 0;
  }
  
-@@ -367,6 +883,7 @@ static int ptrace_setsiginfo(struct task
+@@ -367,6 +887,7 @@ static int ptrace_setsiginfo(struct task
  #define is_sysemu_singlestep(request)	0
  #endif
  
@@ -2274,7 +2278,7 @@
  static int ptrace_resume(struct task_struct *child, long request, long data)
  {
  	if (!valid_signal(data))
-@@ -401,6 +918,76 @@ static int ptrace_resume(struct task_str
+@@ -401,6 +922,76 @@ static int ptrace_resume(struct task_str
  
  	return 0;
  }
@@ -2351,7 +2355,7 @@
  
  int ptrace_request(struct task_struct *child, long request,
  		   long addr, long data)
-@@ -480,6 +1067,11 @@ int ptrace_request(struct task_struct *c
+@@ -480,6 +1071,11 @@ int ptrace_request(struct task_struct *c
  int ptrace_traceme(void)
  {
  	int ret = -EPERM;
@@ -2363,7 +2367,7 @@
  
  	/*
  	 * Are we already being traced?
-@@ -513,6 +1105,9 @@ repeat:
+@@ -513,6 +1109,9 @@ repeat:
  		write_unlock_irqrestore(&tasklist_lock, flags);
  	}
  	task_unlock(current);



From pgordon at fedoraproject.org  Tue Sep 30 03:59:30 2008
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Tue, 30 Sep 2008 03:59:30 +0000 (UTC)
Subject: rpms/epiphany-extensions/devel .cvsignore, 1.27,
	1.28 epiphany-extensions.spec, 1.49, 1.50 sources, 1.27, 1.28
Message-ID: <20080930035930.8D84270119@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/epiphany-extensions/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3994

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
Update to 2.24.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	8 Sep 2008 02:41:04 -0000	1.27
+++ .cvsignore	30 Sep 2008 03:59:00 -0000	1.28
@@ -1 +1 @@
-epiphany-extensions-2.23.91.tar.bz2
+epiphany-extensions-2.24.0.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- epiphany-extensions.spec	24 Sep 2008 21:08:01 -0000	1.49
+++ epiphany-extensions.spec	30 Sep 2008 03:59:00 -0000	1.50
@@ -1,10 +1,10 @@
-%global ephy_major          2.23
+%global ephy_major          2.24
 %global ephy_min_version    %{ephy_major}.0
 %global gecko_version       1.9.0.2
 
 Name:           epiphany-extensions
-Version:        %{ephy_major}.91
-Release:        2%{?dist}
+Version:        %{ephy_major}.0
+Release:        1%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -26,7 +26,7 @@
 BuildRequires:	pcre-devel
 ## gecko-devel is not strictly required, as epiphany-devel pulls it in.
 ## BuildRequire it anyway so we fail if not building against the version
-## we are expecting to.
+## we are expecting to, and to ensure that we get the unstable headers needed.
 BuildRequires:  gecko-devel-unstable = %{gecko_version}
 
 Requires:       epiphany >= %{ephy_min_version}
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Peter Gordon <peter at thecodergeek.com> - 2.24.0-1
+- Update to new upstream release (2.24.0)
+
 * Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 2.23.91-2
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	8 Sep 2008 02:41:04 -0000	1.27
+++ sources	30 Sep 2008 03:59:00 -0000	1.28
@@ -1 +1 @@
-e650ec33d428e9b5e91441b11c0fbf61  epiphany-extensions-2.23.91.tar.bz2
+b8bbe16e0bc5b2549c9bea5edf88762a  epiphany-extensions-2.24.0.tar.bz2



From cchance at fedoraproject.org  Tue Sep 30 04:05:04 2008
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue, 30 Sep 2008 04:05:04 +0000 (UTC)
Subject: rpms/cjkunifonts/devel cjkunifonts-0.2.20080216.1-2.patch, NONE,
	1.1 cjkunifonts.spec, 1.9, 1.10 25-ttf-arphic-uming-bitmaps.conf,
	1.1, NONE
Message-ID: <20080930040504.A29EB70119@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkunifonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4413

Modified Files:
	cjkunifonts.spec 
Added Files:
	cjkunifonts-0.2.20080216.1-2.patch 
Removed Files:
	25-ttf-arphic-uming-bitmaps.conf 
Log Message:
repatched with %patch working


cjkunifonts-0.2.20080216.1-2.patch:

--- NEW FILE cjkunifonts-0.2.20080216.1-2.patch ---
diff -up cjkunifonts-uming-0.2.20080216.1/25-ttf-arphic-uming-bitmaps.conf.orig cjkunifonts-uming-0.2.20080216.1/25-ttf-arphic-uming-bitmaps.conf
--- cjkunifonts-uming-0.2.20080216.1/25-ttf-arphic-uming-bitmaps.conf.orig	2008-09-30 13:55:05.000000000 +1000
+++ cjkunifonts-uming-0.2.20080216.1/25-ttf-arphic-uming-bitmaps.conf	2008-09-30 13:55:29.000000000 +1000
@@ -9,21 +9,7 @@
 	  <string>AR PL UMing TW</string>
 	  <string>AR PL UMing TW MBE</string>
 	  </test>
-       	  <edit name="antialias"><bool>false</bool></edit>
-    	  <edit name="hinting"><bool>true</bool></edit>
-          <edit name="autohint"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-	  <test name="family">
-	  <string>AR PL UMing CN</string>
-	  <string>AR PL UMing HK</string>
-	  <string>AR PL UMing TW</string>
-	  <string>AR PL UMing TW MBE</string>
-	  </test>
-      	  <test name="pixelsize" compare="more_eq"><int>17</int></test>
-	  <edit name="antialias" mode="assign"><bool>true</bool></edit>
-	  <edit name="hinting" mode="assign"><bool>true</bool></edit>
+	  <edit name="hinting" mode="assign"><bool>false</bool></edit>
 	</match>
 
 </fontconfig>


Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cjkunifonts.spec	29 Sep 2008 22:35:50 -0000	1.9
+++ cjkunifonts.spec	30 Sep 2008 04:04:34 -0000	1.10
@@ -23,7 +23,7 @@
 Source6:    cidfmap.zh_CN
 Source7:    CIDFnmap.zh_TW
 Source8:    CIDFnmap.zh_CN
-Source9:    25-ttf-arphic-uming-bitmaps.conf
+Patch0:     cjkunifonts-0.2.20080216.1-2.patch
 
 BuildRequires:    xorg-x11-font-utils, ttmkfdir
 BuildArch:        noarch
@@ -60,9 +60,8 @@
 
 %prep
 %setup -q -c -T -a1 -n %{name}-uming-%{version}
+%patch0 -p1 -b .1-rhbz459680
 %setup -q -c -T -a2 -n %{name}-ukai-%{version}
-# .conf file for unhinting uming is too global power.
-%{__cp} %{SOURCE9} %{_builddir}/%{name}-uming-%{version}/
 
 %build
 %{nil}


--- 25-ttf-arphic-uming-bitmaps.conf DELETED ---



From pkgdb at fedoraproject.org  Tue Sep 30 04:19:12 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:19:12 +0000
Subject: [pkgdb] memtester was added for lucilanga
Message-ID: <20080930041912.E93492084C1@bastion.fedora.phx.redhat.com>

huzaifas has added Package memtester with summary Utility to test for faulty memory subsystem
huzaifas has approved Package memtester
huzaifas has added a Fedora devel branch for memtester with an owner of lucilanga
huzaifas has approved memtester in Fedora devel
huzaifas has approved Package memtester
huzaifas has set commit to Approved for packager on memtester (Fedora devel)
huzaifas has set build to Approved for packager on memtester (Fedora devel)
huzaifas has set checkout to Approved for packager on memtester (Fedora devel)
huzaifas has set commit to Approved for uberpackager on memtester (Fedora devel)
huzaifas has set build to Approved for uberpackager on memtester (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on memtester (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/memtester



From pkgdb at fedoraproject.org  Tue Sep 30 04:19:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:19:15 +0000
Subject: [pkgdb] memtester (Fedora, 9) updated by huzaifas
Message-ID: <20080930041915.E7DB9208D61@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for memtester
huzaifas has set commit to Approved for uberpackager on memtester (Fedora 9)
huzaifas has set build to Approved for uberpackager on memtester (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on memtester (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/memtester



From pkgdb at fedoraproject.org  Tue Sep 30 04:19:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:19:15 +0000
Subject: [pkgdb] memtester (Fedora, 8) updated by huzaifas
Message-ID: <20080930041916.0F8EE208D73@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for memtester
huzaifas has set commit to Approved for uberpackager on memtester (Fedora 8)
huzaifas has set build to Approved for uberpackager on memtester (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on memtester (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/memtester



From huzaifas at fedoraproject.org  Tue Sep 30 04:19:39 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:19:39 +0000 (UTC)
Subject: rpms/memtester - New directory
Message-ID: <20080930041939.2FA7570119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/memtester
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsGY5077/rpms/memtester

Log Message:
Directory /cvs/extras/rpms/memtester added to the repository




From huzaifas at fedoraproject.org  Tue Sep 30 04:19:39 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:19:39 +0000 (UTC)
Subject: rpms/memtester/devel - New directory
Message-ID: <20080930041939.65FA370119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/memtester/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsGY5077/rpms/memtester/devel

Log Message:
Directory /cvs/extras/rpms/memtester/devel added to the repository




From pkgdb at fedoraproject.org  Tue Sep 30 04:19:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:19:15 +0000
Subject: [pkgdb] memtester (Fedora EPEL, 5) updated by huzaifas
Message-ID: <20080930041916.2B3BB208D79@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 5 branch for memtester
huzaifas has set commit to Approved for uberpackager on memtester (Fedora EPEL 5)
huzaifas has set build to Approved for uberpackager on memtester (Fedora EPEL 5)
huzaifas has set checkout to Approved for uberpackager on memtester (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/memtester



From huzaifas at fedoraproject.org  Tue Sep 30 04:19:40 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:19:40 +0000 (UTC)
Subject: rpms/memtester Makefile,NONE,1.1
Message-ID: <20080930041940.3E9E370119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/memtester
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsGY5077/rpms/memtester

Added Files:
	Makefile 
Log Message:
Setup of module memtester


--- NEW FILE Makefile ---
# Top level Makefile for module memtester
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Tue Sep 30 04:19:40 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:19:40 +0000 (UTC)
Subject: rpms/memtester/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080930041940.751EF70119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/memtester/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsGY5077/rpms/memtester/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module memtester


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: memtester
# $Id: Makefile,v 1.1 2008/09/30 04:19:40 huzaifas Exp $
NAME := memtester
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 30 04:21:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:21:23 +0000
Subject: [pkgdb] greadelf was added for ashokdas
Message-ID: <20080930042124.19C7C2084BC@bastion.fedora.phx.redhat.com>

huzaifas has added Package greadelf with summary GUI frontend for elfinfo and eu-readelf
huzaifas has approved Package greadelf
huzaifas has added a Fedora devel branch for greadelf with an owner of ashokdas
huzaifas has approved greadelf in Fedora devel
huzaifas has approved Package greadelf
huzaifas has set commit to Approved for packager on greadelf (Fedora devel)
huzaifas has set build to Approved for packager on greadelf (Fedora devel)
huzaifas has set checkout to Approved for packager on greadelf (Fedora devel)
huzaifas has set commit to Approved for uberpackager on greadelf (Fedora devel)
huzaifas has set build to Approved for uberpackager on greadelf (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on greadelf (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/greadelf



From pkgdb at fedoraproject.org  Tue Sep 30 04:21:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:21:25 +0000
Subject: [pkgdb] greadelf (Fedora, 9) updated by huzaifas
Message-ID: <20080930042125.8C64E2084BF@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for greadelf
huzaifas has set commit to Approved for uberpackager on greadelf (Fedora 9)
huzaifas has set build to Approved for uberpackager on greadelf (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on greadelf (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/greadelf



From huzaifas at fedoraproject.org  Tue Sep 30 04:22:14 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:22:14 +0000 (UTC)
Subject: rpms/greadelf - New directory
Message-ID: <20080930042214.1F50770119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/greadelf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsBd5562/rpms/greadelf

Log Message:
Directory /cvs/extras/rpms/greadelf added to the repository




From huzaifas at fedoraproject.org  Tue Sep 30 04:22:14 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:22:14 +0000 (UTC)
Subject: rpms/greadelf/devel - New directory
Message-ID: <20080930042214.587B270119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/greadelf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsBd5562/rpms/greadelf/devel

Log Message:
Directory /cvs/extras/rpms/greadelf/devel added to the repository




From huzaifas at fedoraproject.org  Tue Sep 30 04:22:15 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:22:15 +0000 (UTC)
Subject: rpms/greadelf Makefile,NONE,1.1
Message-ID: <20080930042215.2911070119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/greadelf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsBd5562/rpms/greadelf

Added Files:
	Makefile 
Log Message:
Setup of module greadelf


--- NEW FILE Makefile ---
# Top level Makefile for module greadelf
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Tue Sep 30 04:22:15 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:22:15 +0000 (UTC)
Subject: rpms/greadelf/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080930042215.5D39070119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/greadelf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsBd5562/rpms/greadelf/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module greadelf


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: greadelf
# $Id: Makefile,v 1.1 2008/09/30 04:22:15 huzaifas Exp $
NAME := greadelf
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From transif at fedoraproject.org  Tue Sep 30 04:25:01 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Tue, 30 Sep 2008 04:25:01 +0000 (UTC)
Subject: comps/po ru.po,1.18,1.19
Message-ID: <20080930042501.3A30C70119@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5788/po

Modified Files:
	ru.po 
Log Message:
    2008-09-30  Yulia Poyarkova <ypoyarko at redhat.com> (via
ypoyarko at fedoraproject.org)
    
      * po/ru.po: Russian translation updated.
    



Index: ru.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ru.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ru.po	17 Sep 2008 22:44:37 -0000	1.18
+++ ru.po	30 Sep 2008 04:24:30 -0000	1.19
@@ -13,8 +13,8 @@
 msgstr ""
 "Project-Id-Version: comps.HEAD.ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-09-09 16:30+1000\n"
+"POT-Creation-Date: 2008-09-29 17:52+0000\n"
+"PO-Revision-Date: 2008-09-30 14:23+1000\n"
 "Last-Translator: Yulia Poyarkova <yulia.poyarkova at redhat.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -386,16 +386,14 @@
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
-msgstr ""
-"???????????????????? ?????? ???????????? ?????? ???????????????????? ?????????????????????? ???????????????????? GTK+ ?? GNOME."
+msgstr "???????????????????? ?????? ???????????? ?????? ???????????????????? ?????????????????????? ???????????????????? GTK+ ?? GNOME."
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
 #: ../comps-f10.xml.in.h:79
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
-msgstr ""
-"???????????????????? ?????? ???????????? ?????? ???????????????????? ?????????????????????? ???????????????????? GTK+ ?? XFCE."
+msgstr "???????????????????? ?????? ???????????? ?????? ???????????????????? ?????????????????????? ???????????????????? GTK+ ?? XFCE."
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
 #: ../comps-f10.xml.in.h:80 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
@@ -404,16 +402,14 @@
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:81
-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:82 ../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)"
@@ -651,10 +647,8 @@
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136
 #: ../comps-f10.xml.in.h:143 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
-msgstr ""
-"?????????????? ?????????????? ??????????????????, ???? ???????????????????? ???????????? ????????????-???????? ???????????????? ??????????."
+msgid "Simple window managers that aren't part of a larger desktop environment."
+msgstr "?????????????? ?????????????? ??????????????????, ???? ???????????????????? ???????????? ????????????-???????? ???????????????? ??????????."
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:137
 #: ../comps-f10.xml.in.h:145
@@ -778,8 +772,7 @@
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159
 #: ../comps-f10.xml.in.h:169
-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:160
@@ -789,30 +782,25 @@
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161
 #: ../comps-f10.xml.in.h:171
-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 Window System."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:162
 #: ../comps-f10.xml.in.h:172 ../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:163
 #: ../comps-f10.xml.in.h:173
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
-msgstr ""
-"?????? ???????????? ???????????????? ?? ???????? ?????????? ?????????????? ??????????????, ?????? DHCP, Kerberos ?? 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:164
 #: ../comps-f10.xml.in.h:174
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
-msgstr ""
-"?????? ???????????? ???????????????? ?????????????? ?????????? ???????????????????? ????????????????????, ?????? rsh ?? telnet."
+msgstr "?????? ???????????? ???????????????? ?????????????? ?????????? ???????????????????? ????????????????????, ?????? rsh ?? telnet."
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165
 #: ../comps-f10.xml.in.h:175
@@ -899,8 +887,7 @@
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:177
 #: ../comps-f10.xml.in.h:187 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
-msgstr ""
-"?????? ???????????? ???????????????? ???????????????????? ?????????????????????? ?????? ???????????? ?? ???????????????? ?? ??????????????????."
+msgstr "?????? ???????????? ???????????????? ???????????????????? ?????????????????????? ?????? ???????????? ?? ???????????????? ?? ??????????????????."
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:178
 #: ../comps-f10.xml.in.h:188 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
@@ -924,14 +911,12 @@
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180
 #: ../comps-f10.xml.in.h:190 ../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:181
 #: ../comps-f10.xml.in.h:191 ../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 ""
 "?????? ???????????? ???????????????? ?????????? ???????????????????????? ?????? ?????????????????? ???????????? ???????????? ?? "
 "??????????????????????????."
@@ -947,8 +932,7 @@
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183
 #: ../comps-f10.xml.in.h:193
-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:184
@@ -1161,9 +1145,8 @@
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f10.xml.in.h:70
-#, fuzzy
 msgid "Haskell Development"
-msgstr "?????? ????????????????????????????????"
+msgstr "???????????????????? Haskell"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
@@ -1174,42 +1157,36 @@
 msgstr "???????????? ?????? ?????????? ???????????? ???? ?????????????????? ????????????."
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "?????????????????? ???????????????????? ??????????"
+msgstr "?????????????????? ?????????? ??????????????"
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "?????????????????? ???????????????????? ??????????"
+msgstr "?????????????????? ?????????? ??????????????"
 
 #: ../comps-f10.xml.in.h:110
-#, fuzzy
 msgid "Maithili Support"
-msgstr "?????????????????? ?????????? ????????????"
+msgstr "?????????????????? ?????????? ????????????????"
 
 #: ../comps-f10.xml.in.h:117
 msgid "Myanmar (Burmese) Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "?????????????????? ?????????? ??????????"
+msgstr "?????????????????? ?????????? ????????????"
 
 #: ../comps-f10.xml.in.h:156
-#, fuzzy
 msgid "Support for developing programs in the Haskell programming language."
-msgstr "?????????????????? ???????????????????? ???????????????? ???? ?????????? ???????????????????????????????? Java."
+msgstr "?????????????????? ???????????????????? ???????????????? ???? ?????????? ???????????????????????????????? Haskell."
 
 #: ../comps-f10.xml.in.h:163
 msgid "Tajik Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f10.xml.in.h:205
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "?????????????????? ???????????????? ??????????"
+msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1260,20 +1237,17 @@
 msgstr "?????? ???????????? ???????????????? ?????????? ?????????????? ????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????? ???????????? ???????????????? ?????????? ???????????? ?? ???????????????? ?????? ???????????????? ??????????????????????."
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr ""
 "?????? ???????????? ???????????????? ?????????? ???????????? ?? ???????????????? ?????? ??????????????????, ???????????????????????? "
 "??????????."
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????? ???????????? ???????????????? ?????????? ???????????? ?? ???????????????? ?????? ???????????????? ??????????????????????."
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1281,9 +1255,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "?????? ???????????? ???????????????? ?????????? ???????????? ?? ???????????????? ?????? ?????????????? ??????????????????????."
 
-#~ msgid "Haskell"
-#~ msgstr "Haskell"



From pkgdb at fedoraproject.org  Tue Sep 30 04:25:28 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:25:28 +0000
Subject: [pkgdb] elfinfo (Fedora, 9) updated by huzaifas
Message-ID: <20080930042528.5BA192084BF@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for elfinfo
huzaifas has set commit to Approved for uberpackager on elfinfo (Fedora 9)
huzaifas has set build to Approved for uberpackager on elfinfo (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on elfinfo (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elfinfo



From pkgdb at fedoraproject.org  Tue Sep 30 04:25:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:25:27 +0000
Subject: [pkgdb] elfinfo was added for ashokdas
Message-ID: <20080930042527.7CF882084BE@bastion.fedora.phx.redhat.com>

huzaifas has added Package elfinfo with summary minimal elf file parser and back end to greadelf
huzaifas has approved Package elfinfo
huzaifas has added a Fedora devel branch for elfinfo with an owner of ashokdas
huzaifas has approved elfinfo in Fedora devel
huzaifas has approved Package elfinfo
huzaifas has set commit to Approved for packager on elfinfo (Fedora devel)
huzaifas has set build to Approved for packager on elfinfo (Fedora devel)
huzaifas has set checkout to Approved for packager on elfinfo (Fedora devel)
huzaifas has set commit to Approved for uberpackager on elfinfo (Fedora devel)
huzaifas has set build to Approved for uberpackager on elfinfo (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on elfinfo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elfinfo



From huzaifas at fedoraproject.org  Tue Sep 30 04:25:55 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:25:55 +0000 (UTC)
Subject: rpms/elfinfo - New directory
Message-ID: <20080930042555.2246970119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/elfinfo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvswG5885/rpms/elfinfo

Log Message:
Directory /cvs/extras/rpms/elfinfo added to the repository




From huzaifas at fedoraproject.org  Tue Sep 30 04:25:55 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:25:55 +0000 (UTC)
Subject: rpms/elfinfo/devel - New directory
Message-ID: <20080930042555.5597370119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/elfinfo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvswG5885/rpms/elfinfo/devel

Log Message:
Directory /cvs/extras/rpms/elfinfo/devel added to the repository




From huzaifas at fedoraproject.org  Tue Sep 30 04:25:56 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:25:56 +0000 (UTC)
Subject: rpms/elfinfo Makefile,NONE,1.1
Message-ID: <20080930042556.28DF470119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/elfinfo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvswG5885/rpms/elfinfo

Added Files:
	Makefile 
Log Message:
Setup of module elfinfo


--- NEW FILE Makefile ---
# Top level Makefile for module elfinfo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Tue Sep 30 04:25:56 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:25:56 +0000 (UTC)
Subject: rpms/elfinfo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080930042556.6AE1B70119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/elfinfo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvswG5885/rpms/elfinfo/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module elfinfo


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: elfinfo
# $Id: Makefile,v 1.1 2008/09/30 04:25:56 huzaifas Exp $
NAME := elfinfo
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 30 04:28:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:28:13 +0000
Subject: [pkgdb] sim was added for hubbitus
Message-ID: <20080930042814.139202084BC@bastion.fedora.phx.redhat.com>

huzaifas has added Package sim with summary Simple Instant Messenger
huzaifas has approved Package sim
huzaifas has added a Fedora devel branch for sim with an owner of hubbitus
huzaifas has approved sim in Fedora devel
huzaifas has approved Package sim
huzaifas has set commit to Approved for packager on sim (Fedora devel)
huzaifas has set build to Approved for packager on sim (Fedora devel)
huzaifas has set checkout to Approved for packager on sim (Fedora devel)
huzaifas has set commit to Approved for uberpackager on sim (Fedora devel)
huzaifas has set build to Approved for uberpackager on sim (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on sim (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sim



From pkgdb at fedoraproject.org  Tue Sep 30 04:28:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:28:15 +0000
Subject: [pkgdb] sim (Fedora, 8) updated by huzaifas
Message-ID: <20080930042815.D7924208611@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for sim
huzaifas has set commit to Approved for uberpackager on sim (Fedora 8)
huzaifas has set build to Approved for uberpackager on sim (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on sim (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sim



From pkgdb at fedoraproject.org  Tue Sep 30 04:28:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:28:15 +0000
Subject: [pkgdb] sim (Fedora, 9) updated by huzaifas
Message-ID: <20080930042815.CA4FC2084BF@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for sim
huzaifas has set commit to Approved for uberpackager on sim (Fedora 9)
huzaifas has set build to Approved for uberpackager on sim (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on sim (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sim



From huzaifas at fedoraproject.org  Tue Sep 30 04:28:51 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:28:51 +0000 (UTC)
Subject: rpms/sim - New directory
Message-ID: <20080930042851.1E9DC70119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/sim
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsuF6076/rpms/sim

Log Message:
Directory /cvs/extras/rpms/sim added to the repository




From huzaifas at fedoraproject.org  Tue Sep 30 04:28:51 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:28:51 +0000 (UTC)
Subject: rpms/sim/devel - New directory
Message-ID: <20080930042851.5067F70119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/sim/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsuF6076/rpms/sim/devel

Log Message:
Directory /cvs/extras/rpms/sim/devel added to the repository




From huzaifas at fedoraproject.org  Tue Sep 30 04:28:52 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:28:52 +0000 (UTC)
Subject: rpms/sim Makefile,NONE,1.1
Message-ID: <20080930042852.280CA70119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/sim
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsuF6076/rpms/sim

Added Files:
	Makefile 
Log Message:
Setup of module sim


--- NEW FILE Makefile ---
# Top level Makefile for module sim
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Tue Sep 30 04:28:52 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:28:52 +0000 (UTC)
Subject: rpms/sim/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080930042852.5602C70119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/sim/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsuF6076/rpms/sim/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sim


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sim
# $Id: Makefile,v 1.1 2008/09/30 04:28:52 huzaifas Exp $
NAME := sim
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 30 04:30:37 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:30:37 +0000
Subject: [pkgdb] numptyphysics was added for lkundrak
Message-ID: <20080930043037.6FACC2084BC@bastion.fedora.phx.redhat.com>

huzaifas has added Package numptyphysics with summary A crayon-drawing based physics puzzle game
huzaifas has approved Package numptyphysics
huzaifas has added a Fedora devel branch for numptyphysics with an owner of lkundrak
huzaifas has approved numptyphysics in Fedora devel
huzaifas has approved Package numptyphysics
huzaifas has set commit to Approved for packager on numptyphysics (Fedora devel)
huzaifas has set build to Approved for packager on numptyphysics (Fedora devel)
huzaifas has set checkout to Approved for packager on numptyphysics (Fedora devel)
huzaifas has set commit to Approved for uberpackager on numptyphysics (Fedora devel)
huzaifas has set build to Approved for uberpackager on numptyphysics (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on numptyphysics (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/numptyphysics



From pkgdb at fedoraproject.org  Tue Sep 30 04:30:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:30:38 +0000
Subject: [pkgdb] numptyphysics (Fedora EPEL, 5) updated by huzaifas
Message-ID: <20080930043038.C686F2084BF@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 5 branch for numptyphysics
huzaifas has set commit to Approved for uberpackager on numptyphysics (Fedora EPEL 5)
huzaifas has set build to Approved for uberpackager on numptyphysics (Fedora EPEL 5)
huzaifas has set checkout to Approved for uberpackager on numptyphysics (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/numptyphysics



From ianweller at fedoraproject.org  Tue Sep 30 04:30:42 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Tue, 30 Sep 2008 04:30:42 +0000 (UTC)
Subject: rpms/gwibber/F-8 gwibber.spec,1.2,1.3 import.log,1.2,1.3
Message-ID: <20080930043042.50D8170119@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6348/F-8

Modified Files:
	gwibber.spec import.log 
Log Message:
import gwibber-0.7-5.102bzr in F-8


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-8/gwibber.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gwibber.spec	14 Sep 2008 16:06:07 -0000	1.2
+++ gwibber.spec	30 Sep 2008 04:30:12 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           gwibber
 Version:        0.7
-Release:        4.%{bzr_rev}bzr%{?dist}
+Release:        5.%{bzr_rev}bzr%{?dist}
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
 Group:          Applications/Internet
@@ -17,7 +17,7 @@
 Source0:        %{name}-%{bzr_rev}bzr.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML pywebkitgtk
+Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML pywebkitgtk mx
 Requires:       python-simplejson >= 1.9.1
 BuildRequires:  python-devel desktop-file-utils
 BuildArch:      noarch
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Ian Weller <ianweller at gmail.com> 0.7-5.102bzr
+- Requires: mx
+
 * Thu Sep 11 2008 Ian Weller <ianweller at gmail.com> 0.7-4.102bzr
 - Update upstream
 - Fix requires: s/pywebkitgui/pywebkitgtk/


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-8/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	14 Sep 2008 16:06:08 -0000	1.2
+++ import.log	30 Sep 2008 04:30:12 -0000	1.3
@@ -1,2 +1,3 @@
 gwibber-0_7-2_61bzr_fc9:F-8:gwibber-0.7-2.61bzr.fc9.src.rpm:1218351868
 gwibber-0_7-4_102bzr_fc9:F-8:gwibber-0.7-4.102bzr.fc9.src.rpm:1221408348
+gwibber-0_7-5_102bzr_fc9:F-8:gwibber-0.7-5.102bzr.fc9.src.rpm:1222749001



From huzaifas at fedoraproject.org  Tue Sep 30 04:31:02 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:31:02 +0000 (UTC)
Subject: rpms/numptyphysics - New directory
Message-ID: <20080930043102.2146070119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/numptyphysics
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsqB6650/rpms/numptyphysics

Log Message:
Directory /cvs/extras/rpms/numptyphysics added to the repository




From huzaifas at fedoraproject.org  Tue Sep 30 04:31:02 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:31:02 +0000 (UTC)
Subject: rpms/numptyphysics/devel - New directory
Message-ID: <20080930043102.5B69370119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/numptyphysics/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsqB6650/rpms/numptyphysics/devel

Log Message:
Directory /cvs/extras/rpms/numptyphysics/devel added to the repository




From pkgdb at fedoraproject.org  Tue Sep 30 04:30:38 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:30:38 +0000
Subject: [pkgdb] numptyphysics (Fedora, 9) updated by huzaifas
Message-ID: <20080930043038.D2DA6208611@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for numptyphysics
huzaifas has set commit to Approved for uberpackager on numptyphysics (Fedora 9)
huzaifas has set build to Approved for uberpackager on numptyphysics (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on numptyphysics (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/numptyphysics



From huzaifas at fedoraproject.org  Tue Sep 30 04:31:03 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:31:03 +0000 (UTC)
Subject: rpms/numptyphysics Makefile,NONE,1.1
Message-ID: <20080930043103.4EA3570119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/numptyphysics
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsqB6650/rpms/numptyphysics

Added Files:
	Makefile 
Log Message:
Setup of module numptyphysics


--- NEW FILE Makefile ---
# Top level Makefile for module numptyphysics
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Tue Sep 30 04:31:03 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:31:03 +0000 (UTC)
Subject: rpms/numptyphysics/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080930043103.8A5DE70119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/numptyphysics/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsqB6650/rpms/numptyphysics/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module numptyphysics


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: numptyphysics
# $Id: Makefile,v 1.1 2008/09/30 04:31:03 huzaifas Exp $
NAME := numptyphysics
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From ianweller at fedoraproject.org  Tue Sep 30 04:31:33 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Tue, 30 Sep 2008 04:31:33 +0000 (UTC)
Subject: rpms/gwibber/F-9 gwibber.spec,1.2,1.3 import.log,1.2,1.3
Message-ID: <20080930043133.3C08270119@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6701/F-9

Modified Files:
	gwibber.spec import.log 
Log Message:
import gwibber-0.7-5.102bzr in F-9


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-9/gwibber.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gwibber.spec	14 Sep 2008 16:05:03 -0000	1.2
+++ gwibber.spec	30 Sep 2008 04:31:03 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           gwibber
 Version:        0.7
-Release:        4.%{bzr_rev}bzr%{?dist}
+Release:        5.%{bzr_rev}bzr%{?dist}
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
 Group:          Applications/Internet
@@ -17,7 +17,7 @@
 Source0:        %{name}-%{bzr_rev}bzr.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML pywebkitgtk
+Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML pywebkitgtk mx
 Requires:       python-simplejson >= 1.9.1
 BuildRequires:  python-devel desktop-file-utils
 BuildArch:      noarch
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Ian Weller <ianweller at gmail.com> 0.7-5.102bzr
+- Requires: mx
+
 * Thu Sep 11 2008 Ian Weller <ianweller at gmail.com> 0.7-4.102bzr
 - Update upstream
 - Fix requires: s/pywebkitgui/pywebkitgtk/


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	14 Sep 2008 16:05:03 -0000	1.2
+++ import.log	30 Sep 2008 04:31:03 -0000	1.3
@@ -1,2 +1,3 @@
 gwibber-0_7-2_61bzr_fc9:F-9:gwibber-0.7-2.61bzr.fc9.src.rpm:1218351939
 gwibber-0_7-4_102bzr_fc9:F-9:gwibber-0.7-4.102bzr.fc9.src.rpm:1221408293
+gwibber-0_7-5_102bzr_fc9:F-9:gwibber-0.7-5.102bzr.fc9.src.rpm:1222749052



From pkgdb at fedoraproject.org  Tue Sep 30 04:32:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:32:22 +0000
Subject: [pkgdb] stun was added for huzaifas
Message-ID: <20080930043222.EEBF82084BB@bastion.fedora.phx.redhat.com>

huzaifas has added Package stun with summary Implements the stun protocol
huzaifas has approved Package stun
huzaifas has added a Fedora devel branch for stun with an owner of huzaifas
huzaifas has approved stun in Fedora devel
huzaifas has approved Package stun
huzaifas has set commit to Approved for packager on stun (Fedora devel)
huzaifas has set build to Approved for packager on stun (Fedora devel)
huzaifas has set checkout to Approved for packager on stun (Fedora devel)
huzaifas has set commit to Approved for uberpackager on stun (Fedora devel)
huzaifas has set build to Approved for uberpackager on stun (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on stun (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stun



From pkgdb at fedoraproject.org  Tue Sep 30 04:32:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:32:24 +0000
Subject: [pkgdb] stun (Fedora, 9) updated by huzaifas
Message-ID: <20080930043224.8A9672084BF@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for stun
huzaifas has set commit to Approved for uberpackager on stun (Fedora 9)
huzaifas has set build to Approved for uberpackager on stun (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on stun (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stun



From pkgdb at fedoraproject.org  Tue Sep 30 04:32:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:32:24 +0000
Subject: [pkgdb] stun (Fedora EPEL, 5) updated by huzaifas
Message-ID: <20080930043224.7E4CB2084BD@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 5 branch for stun
huzaifas has set commit to Approved for uberpackager on stun (Fedora EPEL 5)
huzaifas has set build to Approved for uberpackager on stun (Fedora EPEL 5)
huzaifas has set checkout to Approved for uberpackager on stun (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stun



From ianweller at fedoraproject.org  Tue Sep 30 04:32:32 2008
From: ianweller at fedoraproject.org (Ian Weller)
Date: Tue, 30 Sep 2008 04:32:32 +0000 (UTC)
Subject: rpms/gwibber/devel gwibber.spec,1.2,1.3 import.log,1.2,1.3
Message-ID: <20080930043232.2B04470119@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7132/devel

Modified Files:
	gwibber.spec import.log 
Log Message:
import gwibber-0.7-5.102bzr in devel


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/gwibber.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gwibber.spec	14 Sep 2008 16:04:02 -0000	1.2
+++ gwibber.spec	30 Sep 2008 04:32:01 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           gwibber
 Version:        0.7
-Release:        4.%{bzr_rev}bzr%{?dist}
+Release:        5.%{bzr_rev}bzr%{?dist}
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
 Group:          Applications/Internet
@@ -17,7 +17,7 @@
 Source0:        %{name}-%{bzr_rev}bzr.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML pywebkitgtk
+Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML pywebkitgtk mx
 Requires:       python-simplejson >= 1.9.1
 BuildRequires:  python-devel desktop-file-utils
 BuildArch:      noarch
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Mon Sep 29 2008 Ian Weller <ianweller at gmail.com> 0.7-5.102bzr
+- Requires: mx
+
 * Thu Sep 11 2008 Ian Weller <ianweller at gmail.com> 0.7-4.102bzr
 - Update upstream
 - Fix requires: s/pywebkitgui/pywebkitgtk/


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	14 Sep 2008 16:04:02 -0000	1.2
+++ import.log	30 Sep 2008 04:32:01 -0000	1.3
@@ -1,2 +1,3 @@
 gwibber-0_7-2_61bzr_fc9:HEAD:gwibber-0.7-2.61bzr.fc9.src.rpm:1218352037
 gwibber-0_7-4_102bzr_fc9:HEAD:gwibber-0.7-4.102bzr.fc9.src.rpm:1221406846
+gwibber-0_7-5_102bzr_fc9:HEAD:gwibber-0.7-5.102bzr.fc9.src.rpm:1222749102



From huzaifas at fedoraproject.org  Tue Sep 30 04:32:59 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:32:59 +0000 (UTC)
Subject: rpms/stun - New directory
Message-ID: <20080930043259.1E9D170119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/stun
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsHJ7389/rpms/stun

Log Message:
Directory /cvs/extras/rpms/stun added to the repository




From huzaifas at fedoraproject.org  Tue Sep 30 04:32:59 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:32:59 +0000 (UTC)
Subject: rpms/stun/devel - New directory
Message-ID: <20080930043259.4DD7D70119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/stun/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsHJ7389/rpms/stun/devel

Log Message:
Directory /cvs/extras/rpms/stun/devel added to the repository




From huzaifas at fedoraproject.org  Tue Sep 30 04:33:00 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:33:00 +0000 (UTC)
Subject: rpms/stun Makefile,NONE,1.1
Message-ID: <20080930043300.2605A70119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/stun
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsHJ7389/rpms/stun

Added Files:
	Makefile 
Log Message:
Setup of module stun


--- NEW FILE Makefile ---
# Top level Makefile for module stun
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Tue Sep 30 04:33:00 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:33:00 +0000 (UTC)
Subject: rpms/stun/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20080930043300.5FBDD70119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/stun/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsHJ7389/rpms/stun/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module stun


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: stun
# $Id: Makefile,v 1.1 2008/09/30 04:33:00 huzaifas Exp $
NAME := stun
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 30 04:36:25 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:36:25 +0000
Subject: [pkgdb] rubber was added for sergiopr
Message-ID: <20080930043625.4BDDD2084BC@bastion.fedora.phx.redhat.com>

huzaifas has added Package rubber with summary An automated system for building LaTeX documents
huzaifas has approved Package rubber
huzaifas has added a Fedora devel branch for rubber with an owner of sergiopr
huzaifas has approved rubber in Fedora devel
huzaifas has approved Package rubber
huzaifas has set commit to Approved for packager on rubber (Fedora devel)
huzaifas has set build to Approved for packager on rubber (Fedora devel)
huzaifas has set checkout to Approved for packager on rubber (Fedora devel)
huzaifas has set commit to Approved for uberpackager on rubber (Fedora devel)
huzaifas has set build to Approved for uberpackager on rubber (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on rubber (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubber



From pkgdb at fedoraproject.org  Tue Sep 30 04:36:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:36:26 +0000
Subject: [pkgdb] rubber (Fedora, 9) updated by huzaifas
Message-ID: <20080930043626.8130D2084BF@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for rubber
huzaifas has set commit to Approved for uberpackager on rubber (Fedora 9)
huzaifas has set build to Approved for uberpackager on rubber (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on rubber (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubber



From pkgdb at fedoraproject.org  Tue Sep 30 04:36:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:36:26 +0000
Subject: [pkgdb] rubber (Fedora, 8) updated by huzaifas
Message-ID: <20080930043626.9A0DA208611@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for rubber
huzaifas has set commit to Approved for uberpackager on rubber (Fedora 8)
huzaifas has set build to Approved for uberpackager on rubber (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on rubber (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubber



From huzaifas at fedoraproject.org  Tue Sep 30 04:36:53 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:36:53 +0000 (UTC)
Subject: rpms/rubber - New directory
Message-ID: <20080930043653.22A7C70119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/rubber
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsZH8485/rpms/rubber

Log Message:
Directory /cvs/extras/rpms/rubber added to the repository




From huzaifas at fedoraproject.org  Tue Sep 30 04:36:53 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:36:53 +0000 (UTC)
Subject: rpms/rubber/devel - New directory
Message-ID: <20080930043653.5D97270119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/rubber/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsZH8485/rpms/rubber/devel

Log Message:
Directory /cvs/extras/rpms/rubber/devel added to the repository




From huzaifas at fedoraproject.org  Tue Sep 30 04:36:54 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:36:54 +0000 (UTC)
Subject: rpms/rubber Makefile,NONE,1.1
Message-ID: <20080930043654.367A070119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/rubber
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsZH8485/rpms/rubber

Added Files:
	Makefile 
Log Message:
Setup of module rubber


--- NEW FILE Makefile ---
# Top level Makefile for module rubber
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Tue Sep 30 04:36:54 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:36:54 +0000 (UTC)
Subject: rpms/rubber/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20080930043654.6801870119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/rubber/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsZH8485/rpms/rubber/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubber


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubber
# $Id: Makefile,v 1.1 2008/09/30 04:36:54 huzaifas Exp $
NAME := rubber
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 30 04:39:05 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:39:05 +0000
Subject: [pkgdb] perl-Wx-Perl-Dialog was added for mmaslano
Message-ID: <20080930043905.A1DEE2084BD@bastion.fedora.phx.redhat.com>

huzaifas has added Package perl-Wx-Perl-Dialog with summary a set of simple dialogs, a partial Zenity clone in Wx
huzaifas has approved Package perl-Wx-Perl-Dialog
huzaifas has added a Fedora devel branch for perl-Wx-Perl-Dialog with an owner of mmaslano
huzaifas has approved perl-Wx-Perl-Dialog in Fedora devel
huzaifas has approved Package perl-Wx-Perl-Dialog
huzaifas has set commit to Approved for packager on perl-Wx-Perl-Dialog (Fedora devel)
huzaifas has set build to Approved for packager on perl-Wx-Perl-Dialog (Fedora devel)
huzaifas has set checkout to Approved for packager on perl-Wx-Perl-Dialog (Fedora devel)
huzaifas has set commit to Approved for uberpackager on perl-Wx-Perl-Dialog (Fedora devel)
huzaifas has set build to Approved for uberpackager on perl-Wx-Perl-Dialog (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on perl-Wx-Perl-Dialog (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Wx-Perl-Dialog



From huzaifas at fedoraproject.org  Tue Sep 30 04:40:43 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:40:43 +0000 (UTC)
Subject: rpms/perl-Wx-Perl-Dialog - New directory
Message-ID: <20080930044043.31D8470119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-Wx-Perl-Dialog
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsUG9298/rpms/perl-Wx-Perl-Dialog

Log Message:
Directory /cvs/extras/rpms/perl-Wx-Perl-Dialog added to the repository




From huzaifas at fedoraproject.org  Tue Sep 30 04:40:43 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:40:43 +0000 (UTC)
Subject: rpms/perl-Wx-Perl-Dialog/devel - New directory
Message-ID: <20080930044043.740A970119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-Wx-Perl-Dialog/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsUG9298/rpms/perl-Wx-Perl-Dialog/devel

Log Message:
Directory /cvs/extras/rpms/perl-Wx-Perl-Dialog/devel added to the repository




From huzaifas at fedoraproject.org  Tue Sep 30 04:40:44 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:40:44 +0000 (UTC)
Subject: rpms/perl-Wx-Perl-Dialog Makefile,NONE,1.1
Message-ID: <20080930044044.7E2BA70119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-Wx-Perl-Dialog
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsUG9298/rpms/perl-Wx-Perl-Dialog

Added Files:
	Makefile 
Log Message:
Setup of module perl-Wx-Perl-Dialog


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Wx-Perl-Dialog
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Tue Sep 30 04:40:44 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 04:40:44 +0000 (UTC)
Subject: rpms/perl-Wx-Perl-Dialog/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080930044044.CBBE370119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/perl-Wx-Perl-Dialog/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsUG9298/rpms/perl-Wx-Perl-Dialog/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Wx-Perl-Dialog


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Wx-Perl-Dialog
# $Id: Makefile,v 1.1 2008/09/30 04:40:44 huzaifas Exp $
NAME := perl-Wx-Perl-Dialog
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From roland at fedoraproject.org  Tue Sep 30 04:49:35 2008
From: roland at fedoraproject.org (Roland McGrath)
Date: Tue, 30 Sep 2008 04:49:35 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.994, 1.995 linux-2.6-utrace.patch, 
	1.100, 1.101
Message-ID: <20080930044935.BC1B370119@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10948

Modified Files:
	kernel.spec linux-2.6-utrace.patch 
Log Message:
- fix PTRACE_O_TRACEVFORK (#464520)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.994
retrieving revision 1.995
diff -u -r1.994 -r1.995
--- kernel.spec	30 Sep 2008 03:54:35 -0000	1.994
+++ kernel.spec	30 Sep 2008 04:49:05 -0000	1.995
@@ -1741,7 +1741,9 @@
 %changelog
 * Mon Sep 29 2008 Roland McGrath <roland at redhat.com>
 - 2.6.27-rc8
-- utrace update: fix CLONE_PTRACE (#461552)
+- utrace update
+  - fix CLONE_PTRACE (#461552)
+  - fix PTRACE_O_TRACEVFORK (#464520)
 
 * Mon Sep 29 2008 Dave Jones <davej at redhat.com>
 - Turn off CONFIG_USB_DEBUG. It's noisy, and of no real value right now.

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- linux-2.6-utrace.patch	30 Sep 2008 03:54:35 -0000	1.100
+++ linux-2.6-utrace.patch	30 Sep 2008 04:49:05 -0000	1.101
@@ -1,16 +1,16 @@
  Documentation/DocBook/Makefile    |    2 +-
- Documentation/DocBook/utrace.tmpl |  566 +++++++++
+ Documentation/DocBook/utrace.tmpl |  566 ++++++++
  fs/proc/array.c                   |    3 +
  include/linux/ptrace.h            |   21 +
  include/linux/sched.h             |    6 +
- include/linux/tracehook.h         |   65 +-
- include/linux/utrace.h            |  705 ++++++++++
+ include/linux/tracehook.h         |   68 +-
+ include/linux/utrace.h            |  707 ++++++++++
  init/Kconfig                      |   26 +
  kernel/Makefile                   |    1 +
  kernel/ptrace.c                   |  609 +++++++++-
  kernel/signal.c                   |   14 +-
- kernel/utrace.c                   | 2538 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 4548 insertions(+), 8 deletions(-)
+ kernel/utrace.c                   | 2570 +++++++++++++++++++++++++++++++++++++
+ 12 files changed, 4585 insertions(+), 8 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
 index 1615350..92ca631 100644  
@@ -682,7 +682,7 @@
  extern void force_sig_specific(int, struct task_struct *);
  extern int send_sig(int, struct task_struct *, int);
 diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
-index 6186a78..968909d 100644  
+index 6186a78..03a4555 100644  
 --- a/include/linux/tracehook.h
 +++ b/include/linux/tracehook.h
 @@ -49,6 +49,7 @@
@@ -777,7 +777,17 @@
  	if (unlikely(trace) || unlikely(clone_flags & CLONE_PTRACE)) {
  		/*
  		 * The child starts up with an immediate SIGSTOP.
-@@ -345,6 +366,9 @@ static inline void tracehook_report_vfor
+@@ -311,6 +332,9 @@ static inline void tracehook_report_clon
+ 						   pid_t pid,
+ 						   struct task_struct *child)
+ {
++	if (unlikely(task_utrace_flags(current) & UTRACE_EVENT(CLONE)) &&
++	    (clone_flags & CLONE_VFORK))
++		utrace_finish_vfork(current);
+ 	if (unlikely(trace))
+ 		ptrace_event(0, trace, pid);
+ }
+@@ -345,6 +369,9 @@ static inline void tracehook_report_vfor
   */
  static inline void tracehook_prepare_release_task(struct task_struct *task)
  {
@@ -787,7 +797,7 @@
  }
  
  /**
-@@ -358,7 +382,21 @@ static inline void tracehook_prepare_rel
+@@ -358,7 +385,21 @@ static inline void tracehook_prepare_rel
   */
  static inline void tracehook_finish_release_task(struct task_struct *task)
  {
@@ -809,7 +819,7 @@
  }
  
  /**
-@@ -380,8 +418,12 @@ static inline void tracehook_signal_hand
+@@ -380,8 +421,12 @@ static inline void tracehook_signal_hand
  					    const struct k_sigaction *ka,
  					    struct pt_regs *regs, int stepping)
  {
@@ -822,7 +832,7 @@
  }
  
  /**
-@@ -400,6 +442,8 @@ static inline int tracehook_consider_ign
+@@ -400,6 +445,8 @@ static inline int tracehook_consider_ign
  						    int sig,
  						    void __user *handler)
  {
@@ -831,7 +841,7 @@
  	return (task_ptrace(task) & PT_PTRACED) != 0;
  }
  
-@@ -421,6 +465,9 @@ static inline int tracehook_consider_fat
+@@ -421,6 +468,9 @@ static inline int tracehook_consider_fat
  						  int sig,
  						  void __user *handler)
  {
@@ -841,7 +851,7 @@
  	return (task_ptrace(task) & PT_PTRACED) != 0;
  }
  
-@@ -435,6 +482,8 @@ static inline int tracehook_consider_fat
+@@ -435,6 +485,8 @@ static inline int tracehook_consider_fat
   */
  static inline int tracehook_force_sigpending(void)
  {
@@ -850,7 +860,7 @@
  	return 0;
  }
  
-@@ -464,6 +513,8 @@ static inline int tracehook_get_signal(s
+@@ -464,6 +516,8 @@ static inline int tracehook_get_signal(s
  				       siginfo_t *info,
  				       struct k_sigaction *return_ka)
  {
@@ -859,7 +869,7 @@
  	return 0;
  }
  
-@@ -484,6 +535,8 @@ static inline int tracehook_get_signal(s
+@@ -484,6 +538,8 @@ static inline int tracehook_get_signal(s
   */
  static inline int tracehook_notify_jctl(int notify, int why)
  {
@@ -868,7 +878,7 @@
  	return notify || (current->ptrace & PT_PTRACED);
  }
  
-@@ -507,6 +560,8 @@ static inline int tracehook_notify_jctl(
+@@ -507,6 +563,8 @@ static inline int tracehook_notify_jctl(
  static inline int tracehook_notify_death(struct task_struct *task,
  					 void **death_cookie, int group_dead)
  {
@@ -877,7 +887,7 @@
  	if (task->exit_signal == -1)
  		return task->ptrace ? SIGCHLD : DEATH_REAP;
  
-@@ -543,6 +598,10 @@ static inline void tracehook_report_deat
+@@ -543,6 +601,10 @@ static inline void tracehook_report_deat
  					  int signal, void *death_cookie,
  					  int group_dead)
  {
@@ -888,7 +898,7 @@
  }
  
  #ifdef TIF_NOTIFY_RESUME
-@@ -572,10 +631,14 @@ static inline void set_notify_resume(str
+@@ -572,10 +634,14 @@ static inline void set_notify_resume(str
   * asynchronously, this will be called again before we return to
   * user mode.
   *
@@ -906,10 +916,10 @@
  
 diff --git a/include/linux/utrace.h b/include/linux/utrace.h
 new file mode 100644
-index ...61ba640 100644  
+index ...76cdb73 100644  
 --- /dev/null
 +++ b/include/linux/utrace.h
-@@ -0,0 +1,705 @@
+@@ -0,0 +1,707 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -1010,6 +1020,8 @@
 +	__attribute__((weak));
 +void utrace_report_clone(unsigned long, struct task_struct *)
 +	__attribute__((weak));
++void utrace_finish_vfork(struct task_struct *)
++	__attribute__((weak));
 +void utrace_report_exit(long *exit_code)
 +	__attribute__((weak));
 +void utrace_report_death(struct task_struct *, struct utrace *, bool, int)
@@ -2432,10 +2444,10 @@
  			  struct pt_regs *regs, void *cookie)
 diff --git a/kernel/utrace.c b/kernel/utrace.c
 new file mode 100644
-index ...1b794bb 100644  
+index ...22640e5 100644  
 --- /dev/null
 +++ b/kernel/utrace.c
-@@ -0,0 +1,2538 @@
+@@ -0,0 +1,2570 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -2524,6 +2536,7 @@
 +	unsigned int report:1;
 +	unsigned int interrupt:1;
 +	unsigned int signal_handler:1;
++	unsigned int vfork_stop:1; /* need utrace_stop() before vfork wait */
 +	unsigned int death:1;	/* in utrace_report_death() now */
 +	unsigned int reap:1;	/* release_task() has run */
 +};
@@ -4114,6 +4127,37 @@
 +	       report_clone, clone_flags, child);
 +
 +	utrace->u.live.cloning = NULL;
++
++	/*
++	 * For a vfork, we will go into an uninterruptible block waiting
++	 * for the child.  We need UTRACE_STOP to happen before this, not
++	 * after.  For CLONE_VFORK, utrace_finish_vfork() will be called.
++	 */
++	if (report.action == UTRACE_STOP && (clone_flags & CLONE_VFORK)) {
++		spin_lock(&utrace->lock);
++		utrace->vfork_stop = 1;
++		spin_unlock(&utrace->lock);
++	}
++}
++
++/*
++ * We're called after utrace_report_clone() for a CLONE_VFORK.
++ * If UTRACE_STOP was left from the clone report, we stop here.
++ * After this, we'll enter the uninterruptible wait_for_completion()
++ * waiting for the child.
++ */
++void utrace_finish_vfork(struct task_struct *task)
++{
++	struct utrace *utrace = task->utrace;
++
++	spin_lock(&utrace->lock);
++	if (!utrace->vfork_stop)
++		spin_unlock(&utrace->lock);
++	else {
++		utrace->vfork_stop = 0;
++		spin_unlock(&utrace->lock);
++		utrace_stop(task, utrace);
++	}
 +}
 +
 +/*



From pkgdb at fedoraproject.org  Tue Sep 30 04:56:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:56:39 +0000
Subject: [pkgdb] perl-Wx-Perl-Dialog summary updated by huzaifas
Message-ID: <20080930045639.B000D2084BA@bastion.fedora.phx.redhat.com>

huzaifas set package perl-Wx-Perl-Dialog summary to a set of simple dialogs, a partial Zenity clone in Wx

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Wx-Perl-Dialog



From pkgdb at fedoraproject.org  Tue Sep 30 04:56:39 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 04:56:39 +0000
Subject: [pkgdb] perl-Wx-Perl-Dialog (Fedora, devel) updated by huzaifas
Message-ID: <20080930045639.C8B382084BF@bastion.fedora.phx.redhat.com>

huzaifas changed owner of perl-Wx-Perl-Dialog in Fedora devel to mmaslano
huzaifas approved watchbugzilla on perl-Wx-Perl-Dialog (Fedora devel) for perl-sig
huzaifas approved watchcommits on perl-Wx-Perl-Dialog (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Wx-Perl-Dialog



From kaigai at fedoraproject.org  Tue Sep 30 04:57:34 2008
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Tue, 30 Sep 2008 04:57:34 +0000 (UTC)
Subject: rpms/sepostgresql/F-8 sepostgresql-8.2.10-1.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 sepostgresql.init, 1.17,
	1.18 sepostgresql.spec, 1.17, 1.18 sepostgresql.te, 1.17,
	1.18 sources, 1.5, 1.6 sepostgresql-8.2.9-1.patch, 1.1, NONE
Message-ID: <20080930045734.51F8070119@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12935

Modified Files:
	.cvsignore sepostgresql.init sepostgresql.spec sepostgresql.te 
	sources 
Added Files:
	sepostgresql-8.2.10-1.patch 
Removed Files:
	sepostgresql-8.2.9-1.patch 
Log Message:
update base version from 8.2.9 -> 8.2.10


sepostgresql-8.2.10-1.patch:

--- NEW FILE sepostgresql-8.2.10-1.patch ---
diff -rpNU3 base/configure sepgsql/configure
--- base/configure	2008-09-25 14:42:56.000000000 +0900
+++ sepgsql/configure	2008-09-25 14:46:52.000000000 +0900
@@ -314,7 +314,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configure_args build build_cpu build_vendor build_os host host_cpu host_vendor host_os PORTNAME docdir enable_nls WANTED_LANGUAGES default_port enable_shared enable_rpath enable_debug DTRACE DTRACEFLAGS enable_dtrace CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP GCC TAS autodepend INCLUDES enable_thread_safety with_tcl with_perl with_python with_krb5 krb_srvtab with_pam with_ldap with_bonjour with_openssl with_zlib EGREP ELF_SYS LDFLAGS_SL AWK FLEX FLEXFLAGS LN_S LD with_gnu_ld ld_R_works RANLIB ac_ct_RANLIB TAR STRIP ac_ct_STRIP STRIP_STATIC_LIB STRIP_SHARED_LIB YACC YFLAGS PERL perl_archlibexp perl_privlibexp perl_useshrplib pe
 rl_embed_ldflags PYTHON python_version python_configdir python_includespec python_libdir python_libspec python_additional_libs HAVE_IPV6 LIBOBJS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS LDAP_LIBS_FE LDAP_LIBS_BE HAVE_POSIX_SIGNALS MSGFMT MSGMERGE XGETTEXT localedir TCLSH TCL_CONFIG_SH TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIBS TCL_LIB_SPEC TCL_SHARED_BUILD TCL_SHLIB_LD_LIBS NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL vpath_build 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 configure_args build build_cpu build_vendor build_os host host_cpu host_vendor host_os PORTNAME docdir enable_nls WANTED_LANGUAGES default_port enable_shared enable_rpath enable_debug DTRACE DTRACEFLAGS enable_dtrace CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP GCC TAS autodepend INCLUDES enable_thread_safety with_tcl with_perl with_python with_krb5 krb_srvtab with_pam with_ldap with_bonjour with_openssl with_zlib enable_selinux EGREP ELF_SYS LDFLAGS_SL AWK FLEX FLEXFLAGS LN_S LD with_gnu_ld ld_R_works RANLIB ac_ct_RANLIB TAR STRIP ac_ct_STRIP STRIP_STATIC_LIB STRIP_SHARED_LIB YACC YFLAGS PERL perl_archlibexp perl_privlibexp per
 l_useshrplib perl_embed_ldflags PYTHON python_version python_configdir python_includespec python_libdir python_libspec python_additional_libs HAVE_IPV6 LIBOBJS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS LDAP_LIBS_FE LDAP_LIBS_BE HAVE_POSIX_SIGNALS MSGFMT MSGMERGE XGETTEXT localedir TCLSH TCL_CONFIG_SH TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIBS TCL_LIB_SPEC TCL_SHARED_BUILD TCL_SHLIB_LD_LIBS NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL vpath_build LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -870,6 +870,7 @@ Optional Features:
   --enable-cassert        enable assertion checks (for debugging)
   --enable-thread-safety  make client libraries thread-safe
   --enable-thread-safety-force  force thread-safety in spite of thread test failure
+  --enable-selinux        build with NSA SELinux support
   --disable-largefile     omit support for large files
 
 Optional Packages:
@@ -4247,6 +4248,118 @@ fi;
 
 
 #
+# NSA SELinux support
+#
+
+pgac_args="$pgac_args enable_selinux"
+
+# Check whether --enable-selinux or --disable-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 getpeercon in -lselinux" >&5
+echo $ECHO_N "checking for getpeercon in -lselinux... $ECHO_C" >&6
+if test "${ac_cv_lib_selinux_getpeercon+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 gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char getpeercon ();
+int
+main ()
+{
+getpeercon ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_selinux_getpeercon=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_selinux_getpeercon=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_getpeercon" >&5
+echo "${ECHO_T}$ac_cv_lib_selinux_getpeercon" >&6
+if test $ac_cv_lib_selinux_getpeercon = yes; then
+  cat >>confdefs.h <<\_ACEOF
+#define SECURITY_SYSATTR_NAME "security_context"
+_ACEOF
+
+                 cat >>confdefs.h <<_ACEOF
+#define HAVE_SELINUX 1
+_ACEOF
+
+
+else
+  { { echo "$as_me:$LINENO: error: \"libselinux didn't found.\"" >&5
+echo "$as_me: error: \"libselinux didn't found.\"" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+fi
+
+#
 # Elf
 #
 
@@ -23823,6 +23936,7 @@ s, at with_ldap@,$with_ldap,;t t
 s, at with_bonjour@,$with_bonjour,;t t
 s, at with_openssl@,$with_openssl,;t t
 s, at with_zlib@,$with_zlib,;t t
+s, at enable_selinux@,$enable_selinux,;t t
 s, at EGREP@,$EGREP,;t t
 s, at ELF_SYS@,$ELF_SYS,;t t
 s, at LDFLAGS_SL@,$LDFLAGS_SL,;t t
diff -rpNU3 base/configure.in sepgsql/configure.in
--- base/configure.in	2008-09-25 14:42:56.000000000 +0900
+++ sepgsql/configure.in	2008-09-25 14:46:52.000000000 +0900
@@ -544,6 +544,19 @@ PGAC_ARG_BOOL(with, zlib, yes,
 AC_SUBST(with_zlib)
 
 #
+# NSA SELinux support
+#
+PGAC_ARG_BOOL(enable, selinux, no,
+              [  --enable-selinux        build with NSA SELinux support])
+if test "$enable_selinux" = yes; then
+    AC_CHECK_LIB(selinux, getpeercon,
+                 AC_DEFINE(SECURITY_SYSATTR_NAME, "security_context")  
+                 AC_DEFINE_UNQUOTED(HAVE_SELINUX, 1)
+                 AC_SUBST(enable_selinux),
+                 AC_MSG_ERROR("libselinux didn't found."))
+fi
+
+#
 # Elf
 #
 
diff -rpNU3 base/src/Makefile.global.in sepgsql/src/Makefile.global.in
--- base/src/Makefile.global.in	2007-10-25 08:32:26.000000000 +0900
+++ sepgsql/src/Makefile.global.in	2007-10-25 13:12:52.000000000 +0900
@@ -159,6 +159,7 @@ enable_nls	= @enable_nls@
 enable_debug	= @enable_debug@
 enable_dtrace	= @enable_dtrace@
 enable_thread_safety	= @enable_thread_safety@
+enable_selinux	= @enable_selinux@
 
 python_includespec	= @python_includespec@
 python_libdir		= @python_libdir@
diff -rpNU3 base/src/backend/Makefile sepgsql/src/backend/Makefile
--- base/src/backend/Makefile	2007-10-25 08:32:26.000000000 +0900
+++ sepgsql/src/backend/Makefile	2007-10-25 13:12:52.000000000 +0900
@@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.glo
 
 DIRS := access bootstrap catalog parser commands executor lib libpq \
 	main nodes optimizer port postmaster regex rewrite \
-	storage tcop utils $(top_builddir)/src/timezone
+	security storage tcop utils $(top_builddir)/src/timezone
 
 SUBSYSOBJS := $(DIRS:%=%/SUBSYS.o)
 
@@ -31,6 +31,11 @@ LIBS := $(filter-out -lpgport, $(LIBS)) 
 # The backend doesn't need everything that's in LIBS, however
 LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS))
 
+# SELinux support needs to link libselinux
+ifeq ($(enable_selinux), yes)
[...8438 lines suppressed...]
+#define COMMON_DATABASE__DROP                     0x00000002UL
+#define COMMON_DATABASE__GETATTR                  0x00000004UL
+#define COMMON_DATABASE__SETATTR                  0x00000008UL
+#define COMMON_DATABASE__RELABELFROM              0x00000010UL
+#define COMMON_DATABASE__RELABELTO                0x00000020UL
+
+#define DB_DATABASE__CREATE                       0x00000001UL
+#define DB_DATABASE__DROP                         0x00000002UL
+#define DB_DATABASE__GETATTR                      0x00000004UL
+#define DB_DATABASE__SETATTR                      0x00000008UL
+#define DB_DATABASE__RELABELFROM                  0x00000010UL
+#define DB_DATABASE__RELABELTO                    0x00000020UL
+#define DB_DATABASE__ACCESS                       0x00000040UL
+#define DB_DATABASE__INSTALL_MODULE               0x00000080UL
+#define DB_DATABASE__LOAD_MODULE                  0x00000100UL
+#define DB_DATABASE__GET_PARAM                    0x00000200UL
+#define DB_DATABASE__SET_PARAM                    0x00000400UL
+#define DB_TABLE__CREATE                          0x00000001UL
+#define DB_TABLE__DROP                            0x00000002UL
+#define DB_TABLE__GETATTR                         0x00000004UL
+#define DB_TABLE__SETATTR                         0x00000008UL
+#define DB_TABLE__RELABELFROM                     0x00000010UL
+#define DB_TABLE__RELABELTO                       0x00000020UL
+#define DB_TABLE__USE                             0x00000040UL
+#define DB_TABLE__SELECT                          0x00000080UL
+#define DB_TABLE__UPDATE                          0x00000100UL
+#define DB_TABLE__INSERT                          0x00000200UL
+#define DB_TABLE__DELETE                          0x00000400UL
+#define DB_TABLE__LOCK                            0x00000800UL
+#define DB_PROCEDURE__CREATE                      0x00000001UL
+#define DB_PROCEDURE__DROP                        0x00000002UL
+#define DB_PROCEDURE__GETATTR                     0x00000004UL
+#define DB_PROCEDURE__SETATTR                     0x00000008UL
+#define DB_PROCEDURE__RELABELFROM                 0x00000010UL
+#define DB_PROCEDURE__RELABELTO                   0x00000020UL
+#define DB_PROCEDURE__EXECUTE                     0x00000040UL
+#define DB_PROCEDURE__ENTRYPOINT                  0x00000080UL
+#define DB_COLUMN__CREATE                         0x00000001UL
+#define DB_COLUMN__DROP                           0x00000002UL
+#define DB_COLUMN__GETATTR                        0x00000004UL
+#define DB_COLUMN__SETATTR                        0x00000008UL
+#define DB_COLUMN__RELABELFROM                    0x00000010UL
+#define DB_COLUMN__RELABELTO                      0x00000020UL
+#define DB_COLUMN__USE                            0x00000040UL
+#define DB_COLUMN__SELECT                         0x00000080UL
+#define DB_COLUMN__UPDATE                         0x00000100UL
+#define DB_COLUMN__INSERT                         0x00000200UL
+#define DB_TUPLE__RELABELFROM                     0x00000001UL
+#define DB_TUPLE__RELABELTO                       0x00000002UL
+#define DB_TUPLE__USE                             0x00000004UL
+#define DB_TUPLE__SELECT                          0x00000008UL
+#define DB_TUPLE__UPDATE                          0x00000010UL
+#define DB_TUPLE__INSERT                          0x00000020UL
+#define DB_TUPLE__DELETE                          0x00000040UL
+#define DB_BLOB__CREATE                           0x00000001UL
+#define DB_BLOB__DROP                             0x00000002UL
+#define DB_BLOB__GETATTR                          0x00000004UL
+#define DB_BLOB__SETATTR                          0x00000008UL
+#define DB_BLOB__RELABELFROM                      0x00000010UL
+#define DB_BLOB__RELABELTO                        0x00000020UL
+#define DB_BLOB__READ                             0x00000040UL
+#define DB_BLOB__WRITE                            0x00000080UL
+#define DB_BLOB__IMPORT                           0x00000100UL
+#define DB_BLOB__EXPORT                           0x00000200UL
+#endif
+
+/*
+ * SE-PostgreSQL core functions
+ *   src/backend/security/sepgsqlCore.c
+ */
+extern bool  sepgsqlIsEnabled(void);
+extern Size  sepgsqlShmemSize(void);
+extern void  sepgsqlInitialize(void);
+extern int   sepgsqlInitializePostmaster(void);
+extern void  sepgsqlFinalizePostmaster(void);
+
+extern Oid  sepgsqlGetServerContext(void);
+extern Oid  sepgsqlGetClientContext(void);
+extern void  sepgsqlSetClientContext(Oid new_ctx);
+extern Oid  sepgsqlGetDatabaseContext(void);
+extern char *sepgsqlGetDatabaseName(void);
+
+extern bool sepgsql_avc_permission_noaudit(Oid ssid, Oid tsid, uint16 tclass,
+										   uint32 perms, char **audit, char *objname);
+extern void  sepgsql_avc_permission(Oid ssid, Oid tsid, uint16 tclass,
+									uint32 perms, char *objname);
+extern char *sepgsqlGetTupleName(Oid relid, HeapTuple tuple);
+extern void  sepgsql_audit(bool result, char *message);
+extern Oid   sepgsql_avc_createcon(Oid ssid, Oid tsid, uint16 tclass);
+extern Oid   sepgsql_avc_relabelcon(Oid ssid, Oid tsid, uint16 tclass);
+extern bool  sepgsql_check_context(char *context);
+
+extern Datum sepgsql_getcon(PG_FUNCTION_ARGS);
+
+/*
+ * SE-PostgreSQL proxy functions
+ *   src/backend/security/sepgsqlProxy.c
+ */
+extern List *sepgsqlProxyQuery(Query *query);
+extern void  sepgsqlVerifyQuery(Query *query);
+extern Oid   sepgsqlPreparePlanCheck(Relation rel);
+extern void  sepgsqlRestorePlanCheck(Relation rel, Oid pgace_saved);
+
+/*
+ * SE-PostgreSQL hooks
+ *   src/backend/security/sepgsqlHooks.c
+ */
+
+/* simple_heap_xxxx hooks */
+extern void sepgsqlSimpleHeapInsert(Relation rel, HeapTuple tuple);
+extern void sepgsqlSimpleHeapUpdate(Relation rel, ItemPointer tid, HeapTuple newtup);
+extern void sepgsqlSimpleHeapDelete(Relation rel, ItemPointer tid);
+
+/* heap_xxxx hooks for implicit labeling */
+extern void sepgsqlHeapInsert(Relation rel, HeapTuple tuple);
+extern void sepgsqlHeapUpdate(Relation rel, HeapTuple newtup, HeapTuple oldtup);
+
+/* INSERT/UPDATE/DELETE statement hooks */
+extern bool sepgsqlExecInsert(Relation rel, HeapTuple tuple, bool with_returning);
+extern bool sepgsqlExecUpdate(Relation rel, HeapTuple newtup, ItemPointer tid, bool with_returning);
+extern bool sepgsqlExecDelete(Relation rel, ItemPointer tid, bool with_returning);
+
+/* DATABASE */
+extern void sepgsqlAlterDatabaseContext(Relation rel, HeapTuple tuple, char *new_context);
+extern void sepgsqlSetDatabaseParam(const char *name, char *argstring);
+extern void sepgsqlGetDatabaseParam(const char *name);
+
+/* RELATION/ATTRIBUTE */
+extern void sepgsqlLockTable(Oid relid);
+
+/* FUNCTION */
+extern void sepgsqlCallFunction(FmgrInfo *finfo, bool with_perm_check);
+extern bool sepgsqlCallFunctionTrigger(FmgrInfo *finfo, TriggerData *tgdata);
+extern void sepgsqlAlterProcedureContext(Relation rel, HeapTuple tuple, char *context);
+
+/* COPY */
+extern void sepgsqlCopyTable(Relation rel, List *attnumlist, bool is_from);
+extern bool sepgsqlCopyToTuple(Relation rel, HeapTuple tuple);
+extern bool sepgsqlCopyFromTuple(Relation rel, HeapTuple tuple);
+
+/* LOAD shared library module */
+extern void sepgsqlLoadSharedModule(const char *filename);
+
+/* copy/print node object */
+extern Node *sepgsqlCopyObject(Node *node);
+extern bool sepgsqlOutObject(StringInfo str, Node *node);
+
+/* SECURITY LABEL IN/OUT */
+extern char *sepgsqlSecurityLabelIn(char *context);
+extern char *sepgsqlSecurityLabelOut(char *context);
+extern bool sepgsqlSecurityLabelIsValid(char *context);
+extern char *sepgsqlSecurityLabelOfLabel(char *context);
+extern char *sepgsqlSecurityLabelNotFound(Oid sid);
+
+/*
+ * SE-PostgreSQL Binary Large Object (BLOB) functions
+ *   src/backend/security/sepgsqlLargeObject.c
+ */
+extern Oid  sepgsqlLargeObjectGetSecurity(HeapTuple tuple);
+extern void sepgsqlLargeObjectSetSecurity(HeapTuple tuple, Oid lo_security, bool is_first);
+extern void sepgsqlLargeObjectCreate(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectDrop(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectOpen(Relation rel, HeapTuple tuple, bool read_only);
+extern void sepgsqlLargeObjectRead(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectWrite(Relation rel, HeapTuple newtup, HeapTuple oldtup);
+extern void sepgsqlLargeObjectImport(void);
+extern void sepgsqlLargeObjectExport(void);
+
+/*
+ * SE-PostgreSQL Heap related functions
+ *   src/backend/security/sepgsqlHeap.c
+ */
+
+extern Oid sepgsqlComputeImplicitContext(Relation rel, HeapTuple tuple);
+extern bool sepgsqlCheckTuplePerms(Relation rel, HeapTuple tuple, HeapTuple oldtup,
+								   uint32 perms, bool abort);
+extern Datum sepgsql_tuple_perms(PG_FUNCTION_ARGS);
+extern Datum sepgsql_tuple_perms_abort(PG_FUNCTION_ARGS);
+
+/*
+ * SE-PostgreSQL extended SQL statement
+ *   src/backend/security/sepgsqlExtStmt.c
+ */
+extern DefElem *sepgsqlGramSecurityLabel(char *defname, char *context);
+extern bool sepgsqlNodeIsSecurityLabel(DefElem *defel);
+extern Oid sepgsqlParseSecurityLabel(DefElem *defel);
+
+#endif /* SEPGSQL_INTERNAL_H */
diff -rpNU3 base/src/include/utils/syscache.h sepgsql/src/include/utils/syscache.h
--- base/src/include/utils/syscache.h	2007-10-25 08:32:26.000000000 +0900
+++ sepgsql/src/include/utils/syscache.h	2007-10-25 13:12:52.000000000 +0900
@@ -63,6 +63,8 @@
 #define STATRELATT		32
 #define TYPENAMENSP		33
 #define TYPEOID			34
+#define SECURITYOID		35
+#define SECURITYLABEL	36
 
 extern void InitCatalogCache(void);
 extern void InitCatalogCachePhase2(void);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-8/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Jun 2008 03:50:28 -0000	1.8
+++ .cvsignore	30 Sep 2008 04:57:03 -0000	1.9
@@ -1 +1 @@
-postgresql-8.2.9.tar.gz
+postgresql-8.2.10.tar.gz


Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-8/sepostgresql.init,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sepostgresql.init	13 Jun 2008 03:50:28 -0000	1.17
+++ sepostgresql.init	30 Sep 2008 04:57:03 -0000	1.18
@@ -7,9 +7,9 @@
 # pidfile: /var/run/postmaster.pid
 #---------------------------------------------------------------------
 
-PGVERSION="8.2.9"
+PGVERSION="8.2.10"
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
-SEPGVERSION="1.869"
+SEPGVERSION="1.1067"
 
 # source function library
 . /etc/rc.d/init.d/functions


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-8/sepostgresql.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sepostgresql.spec	13 Jun 2008 03:50:28 -0000	1.17
+++ sepostgresql.spec	30 Sep 2008 04:57:03 -0000	1.18
@@ -12,8 +12,8 @@
 
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
-Version: 8.2.9
-Release: 1.869%{?sepgsql_extension}%{?dist}
+Version: 8.2.10
+Release: 1.1067%{?sepgsql_extension}%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -24,7 +24,7 @@
 Source3: sepostgresql.te
 Source4: sepostgresql.fc
 Source5: sepostgresql.8
-Patch0: sepostgresql-8.2.9-1.patch
+Patch0: sepostgresql-8.2.10-1.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.13 selinux-policy-devel >= 3.0.6
@@ -206,6 +206,9 @@
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Tue Sep 30 2008 <kaigai at kaigai.gr.jp> - 8.2.10-1.1067
+- upgrade base PostgreSQL 8.2.9 -> 8.2.10 
+
 * Fri Jun 13 2008 <kaigai at kaigai.gr.jp> - 8.2.9-1.869
 - upgrade base PostgreSQL 8.2.7 -> 8.2.9
 


Index: sepostgresql.te
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-8/sepostgresql.te,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sepostgresql.te	13 Jun 2008 03:50:28 -0000	1.17
+++ sepostgresql.te	30 Sep 2008 04:57:03 -0000	1.18
@@ -1,4 +1,4 @@
-policy_module(sepostgresql, 1.869)
+policy_module(sepostgresql, 1.1067)
 
 gen_require(`
 	class db_database all_db_database_perms;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Jun 2008 03:50:28 -0000	1.5
+++ sources	30 Sep 2008 04:57:03 -0000	1.6
@@ -1 +1 @@
-f23f61451c4aefa54930dd96001a50bd  postgresql-8.2.9.tar.gz
+b059191fb6f147b55b1fadd2e01afe6c  postgresql-8.2.10.tar.gz


--- sepostgresql-8.2.9-1.patch DELETED ---



From cchance at fedoraproject.org  Tue Sep 30 04:58:09 2008
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue, 30 Sep 2008 04:58:09 +0000 (UTC)
Subject: rpms/cjkunifonts/devel cjkunifonts.spec,1.10,1.11
Message-ID: <20080930045809.DF18670119@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkunifonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13064

Modified Files:
	cjkunifonts.spec 
Log Message:
updated .spec for repatch



Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cjkunifonts.spec	30 Sep 2008 04:04:34 -0000	1.10
+++ cjkunifonts.spec	30 Sep 2008 04:57:39 -0000	1.11
@@ -9,7 +9,7 @@
 
 Name:        cjkunifonts
 Version:     0.2.20080216.1
-Release:     2%{?dist}
+Release:     3%{?dist}
 Summary:     Chinese TrueType Fonts -- Simplified and Traditional Chinese Ming and Kai Face
 License:     Arphic
 Group:       User Interface/X
@@ -196,6 +196,9 @@
 %{catalogue}/%{name}-ukai
 
 %changelog
+* Mon Sep 30 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-3.fc10
+- Resolves: rhbz#459680 (repatched)
+
 * Mon Sep 29 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-2.fc10
 - Resolves: rhbz#459680 (qt/kde: font antialiasing was disabled by uming 
   fontconfig file.)



From lucilanga at fedoraproject.org  Tue Sep 30 05:07:28 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue, 30 Sep 2008 05:07:28 +0000 (UTC)
Subject: rpms/memtester/devel memtester-4.0.8-debuginfo.patch, NONE,
	1.1 memtester.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930050728.429B270119@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/memtester/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15245

Modified Files:
	.cvsignore sources 
Added Files:
	memtester-4.0.8-debuginfo.patch memtester.spec 
Log Message:
initial import

memtester-4.0.8-debuginfo.patch:

--- NEW FILE memtester-4.0.8-debuginfo.patch ---
--- memtester-4.0.8/conf-ld	2007-11-21 17:54:57.000000000 +0200
+++ memtester-4.0.8-mod/conf-ld	2008-09-27 21:43:12.000000000 +0300
@@ -1,3 +1,3 @@
-cc -s
+cc
 
 This will be used to link .o files into an executable.
--- memtester-4.0.8/Makefile	2007-11-21 17:54:57.000000000 +0200
+++ memtester-4.0.8-mod/Makefile	2008-09-27 21:55:59.000000000 +0300
@@ -75,7 +75,7 @@
 	./load memtester tests.o `cat extra-libs`
 
 memtester.o: memtester.c tests.h conf-cc Makefile compile
-	./compile memtester.c
+	./compile ${OPT} memtester.c
 
 tests.o: tests.c tests.h conf-cc Makefile compile
-	./compile tests.c
+	./compile ${OPT} tests.c


--- NEW FILE memtester.spec ---
Name:		memtester
Version:	4.0.8
Release:	2%{?dist}
Summary:	Utility to test for faulty memory subsystem

Group:		System Environment/Base
License:	GPLv2
URL:		http://pyropus.ca/software/memtester/
Source0:	http://pyropus.ca/software/memtester/old-versions/memtester-4.0.8.tar.gz
Patch0:		memtester-4.0.8-debuginfo.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	dos2unix
#Requires:	

%description
memtester is a utility for testing the memory subsystem in a computer to
determine if it is faulty.



%prep
%setup -q
%patch0 -p1 -b .debuginfo


%build
make %{?_smp_mflags} -e OPT="%{optflags}"


%install
rm -rf $RPM_BUILD_ROOT
mv README README.iso88591
iconv -o README -f iso88591 -t utf8 README.iso88591
touch -r README.iso88591 README
rm -f README.iso88591
dos2unix -k BUGS
make -e INSTALLPATH=$RPM_BUILD_ROOT%{_prefix} install
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
#fix location of manual
mv $RPM_BUILD_ROOT%{_prefix}/man/man8/memtester.8.gz $RPM_BUILD_ROOT%{_mandir}/man8


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc BUGS CHANGELOG COPYING README README.tests
%{_bindir}/memtester
%{_mandir}/man8/memtester.8.gz



%changelog
* Mon Sep 29 2008 Lucian Langa <cooly at gnome.eu.org> - 4.0.8-2
- preserve timestamps
- fix patch

* Sat Sep 27 2008 Lucian Langa <cooly at gnome.eu.org> - 4.0.8-1
- initial specfile




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memtester/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 04:19:40 -0000	1.1
+++ .cvsignore	30 Sep 2008 05:06:57 -0000	1.2
@@ -0,0 +1 @@
+memtester-4.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtester/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 04:19:40 -0000	1.1
+++ sources	30 Sep 2008 05:06:57 -0000	1.2
@@ -0,0 +1 @@
+a4971ed1ccaf5b2e2148fd66b0eb7363  memtester-4.0.8.tar.gz



From lucilanga at fedoraproject.org  Tue Sep 30 05:10:02 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue, 30 Sep 2008 05:10:02 +0000 (UTC)
Subject: rpms/memtester/F-9 memtester-4.0.8-debuginfo.patch, NONE,
	1.1 memtester.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930051002.45CAB70119@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/memtester/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15839

Modified Files:
	.cvsignore sources 
Added Files:
	memtester-4.0.8-debuginfo.patch memtester.spec 
Log Message:
initial import

memtester-4.0.8-debuginfo.patch:

--- NEW FILE memtester-4.0.8-debuginfo.patch ---
--- memtester-4.0.8/conf-ld	2007-11-21 17:54:57.000000000 +0200
+++ memtester-4.0.8-mod/conf-ld	2008-09-27 21:43:12.000000000 +0300
@@ -1,3 +1,3 @@
-cc -s
+cc
 
 This will be used to link .o files into an executable.
--- memtester-4.0.8/Makefile	2007-11-21 17:54:57.000000000 +0200
+++ memtester-4.0.8-mod/Makefile	2008-09-27 21:55:59.000000000 +0300
@@ -75,7 +75,7 @@
 	./load memtester tests.o `cat extra-libs`
 
 memtester.o: memtester.c tests.h conf-cc Makefile compile
-	./compile memtester.c
+	./compile ${OPT} memtester.c
 
 tests.o: tests.c tests.h conf-cc Makefile compile
-	./compile tests.c
+	./compile ${OPT} tests.c


--- NEW FILE memtester.spec ---
Name:		memtester
Version:	4.0.8
Release:	2%{?dist}
Summary:	Utility to test for faulty memory subsystem

Group:		System Environment/Base
License:	GPLv2
URL:		http://pyropus.ca/software/memtester/
Source0:	http://pyropus.ca/software/memtester/old-versions/memtester-4.0.8.tar.gz
Patch0:		memtester-4.0.8-debuginfo.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	dos2unix
#Requires:	

%description
memtester is a utility for testing the memory subsystem in a computer to
determine if it is faulty.



%prep
%setup -q
%patch0 -p1 -b .debuginfo


%build
make %{?_smp_mflags} -e OPT="%{optflags}"


%install
rm -rf $RPM_BUILD_ROOT
mv README README.iso88591
iconv -o README -f iso88591 -t utf8 README.iso88591
touch -r README.iso88591 README
rm -f README.iso88591
dos2unix -k BUGS
make -e INSTALLPATH=$RPM_BUILD_ROOT%{_prefix} install
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
#fix location of manual
mv $RPM_BUILD_ROOT%{_prefix}/man/man8/memtester.8.gz $RPM_BUILD_ROOT%{_mandir}/man8


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc BUGS CHANGELOG COPYING README README.tests
%{_bindir}/memtester
%{_mandir}/man8/memtester.8.gz



%changelog
* Mon Sep 29 2008 Lucian Langa <cooly at gnome.eu.org> - 4.0.8-2
- preserve timestamps
- fix patch

* Sat Sep 27 2008 Lucian Langa <cooly at gnome.eu.org> - 4.0.8-1
- initial specfile




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memtester/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 04:19:40 -0000	1.1
+++ .cvsignore	30 Sep 2008 05:09:31 -0000	1.2
@@ -0,0 +1 @@
+memtester-4.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtester/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 04:19:40 -0000	1.1
+++ sources	30 Sep 2008 05:09:31 -0000	1.2
@@ -0,0 +1 @@
+a4971ed1ccaf5b2e2148fd66b0eb7363  memtester-4.0.8.tar.gz



From lucilanga at fedoraproject.org  Tue Sep 30 05:10:32 2008
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue, 30 Sep 2008 05:10:32 +0000 (UTC)
Subject: rpms/memtester/F-8 memtester-4.0.8-debuginfo.patch, NONE,
	1.1 memtester.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930051032.9E7B970119@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/memtester/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15993

Modified Files:
	.cvsignore sources 
Added Files:
	memtester-4.0.8-debuginfo.patch memtester.spec 
Log Message:
initial import

memtester-4.0.8-debuginfo.patch:

--- NEW FILE memtester-4.0.8-debuginfo.patch ---
--- memtester-4.0.8/conf-ld	2007-11-21 17:54:57.000000000 +0200
+++ memtester-4.0.8-mod/conf-ld	2008-09-27 21:43:12.000000000 +0300
@@ -1,3 +1,3 @@
-cc -s
+cc
 
 This will be used to link .o files into an executable.
--- memtester-4.0.8/Makefile	2007-11-21 17:54:57.000000000 +0200
+++ memtester-4.0.8-mod/Makefile	2008-09-27 21:55:59.000000000 +0300
@@ -75,7 +75,7 @@
 	./load memtester tests.o `cat extra-libs`
 
 memtester.o: memtester.c tests.h conf-cc Makefile compile
-	./compile memtester.c
+	./compile ${OPT} memtester.c
 
 tests.o: tests.c tests.h conf-cc Makefile compile
-	./compile tests.c
+	./compile ${OPT} tests.c


--- NEW FILE memtester.spec ---
Name:		memtester
Version:	4.0.8
Release:	2%{?dist}
Summary:	Utility to test for faulty memory subsystem

Group:		System Environment/Base
License:	GPLv2
URL:		http://pyropus.ca/software/memtester/
Source0:	http://pyropus.ca/software/memtester/old-versions/memtester-4.0.8.tar.gz
Patch0:		memtester-4.0.8-debuginfo.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	dos2unix
#Requires:	

%description
memtester is a utility for testing the memory subsystem in a computer to
determine if it is faulty.



%prep
%setup -q
%patch0 -p1 -b .debuginfo


%build
make %{?_smp_mflags} -e OPT="%{optflags}"


%install
rm -rf $RPM_BUILD_ROOT
mv README README.iso88591
iconv -o README -f iso88591 -t utf8 README.iso88591
touch -r README.iso88591 README
rm -f README.iso88591
dos2unix -k BUGS
make -e INSTALLPATH=$RPM_BUILD_ROOT%{_prefix} install
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
#fix location of manual
mv $RPM_BUILD_ROOT%{_prefix}/man/man8/memtester.8.gz $RPM_BUILD_ROOT%{_mandir}/man8


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc BUGS CHANGELOG COPYING README README.tests
%{_bindir}/memtester
%{_mandir}/man8/memtester.8.gz



%changelog
* Mon Sep 29 2008 Lucian Langa <cooly at gnome.eu.org> - 4.0.8-2
- preserve timestamps
- fix patch

* Sat Sep 27 2008 Lucian Langa <cooly at gnome.eu.org> - 4.0.8-1
- initial specfile




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memtester/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 04:19:40 -0000	1.1
+++ .cvsignore	30 Sep 2008 05:10:02 -0000	1.2
@@ -0,0 +1 @@
+memtester-4.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtester/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 04:19:40 -0000	1.1
+++ sources	30 Sep 2008 05:10:02 -0000	1.2
@@ -0,0 +1 @@
+a4971ed1ccaf5b2e2148fd66b0eb7363  memtester-4.0.8.tar.gz



From pmatilai at fedoraproject.org  Tue Sep 30 05:43:46 2008
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Tue, 30 Sep 2008 05:43:46 +0000 (UTC)
Subject: rpms/sqlite/devel sqlite-3.5.9-libdl.patch, NONE,
	1.1 sqlite-3.5.9-remove-temporary.patch, NONE, 1.1 sqlite.spec,
	1.40, 1.41
Message-ID: <20080930054346.7ADDD70119@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20892

Modified Files:
	sqlite.spec 
Added Files:
	sqlite-3.5.9-libdl.patch sqlite-3.5.9-remove-temporary.patch 
Log Message:
- Remove references to temporary registers from cache on release (#463061)
- Enable loading of external extensions (#457433)


sqlite-3.5.9-libdl.patch:

--- NEW FILE sqlite-3.5.9-libdl.patch ---
diff -up sqlite-3.5.9/configure.libdl sqlite-3.5.9/configure
--- sqlite-3.5.9/configure.libdl	2008-09-22 18:37:55.000000000 +0300
+++ sqlite-3.5.9/configure	2008-09-22 18:38:11.000000000 +0300
@@ -12067,6 +12067,7 @@ else
 fi;
 if test "${use_loadextension}" = "yes" ; then
   LOADEXTENSION_FLAGS=""
+  LIBS="-ldl $LIBS"
 else
   LOADEXTENSION_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
 fi

sqlite-3.5.9-remove-temporary.patch:

--- NEW FILE sqlite-3.5.9-remove-temporary.patch ---
diff -up sqlite-3.5.9/src/expr.c.remove-temp sqlite-3.5.9/src/expr.c
--- sqlite-3.5.9/src/expr.c.remove-temp	2008-05-13 15:50:50.000000000 +0300
+++ sqlite-3.5.9/src/expr.c	2008-09-22 18:04:39.000000000 +0300
@@ -3428,6 +3428,7 @@ int sqlite3GetTempReg(Parse *pParse){
 }
 void sqlite3ReleaseTempReg(Parse *pParse, int iReg){
   if( iReg && pParse->nTempReg<ArraySize(pParse->aTempReg) ){
+    sqlite3ExprWritableRegister(pParse, iReg, iReg);
     pParse->aTempReg[pParse->nTempReg++] = iReg;
   }
 }


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sqlite.spec	17 Jun 2008 14:04:16 -0000	1.40
+++ sqlite.spec	30 Sep 2008 05:43:16 -0000	1.41
@@ -6,12 +6,16 @@
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.5.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
 Source: http://www.sqlite.org/sqlite-%{version}.tar.gz
 Patch1: sqlite-3.5.8-pkgconfig-version.patch
+# Kludge -ldl into LIBS for load-extension
+Patch2: sqlite-3.5.9-libdl.patch
+# Upstream fix for http://www.sqlite.org/cvstrac/tktview?tn=3201
+Patch3: sqlite-3.5.9-remove-temporary.patch
 Obsoletes: sqlite3 sqlite3-devel
 BuildRequires: ncurses-devel readline-devel glibc-devel
 BuildRequires: /usr/bin/tclsh
@@ -52,12 +56,15 @@
 %prep
 %setup -q
 %patch1 -p1 -b .pkgconf
+%patch2 -p1 -b .libdl
+%patch3 -p1 -b .remove-temp
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -Wall"
 %configure %{!?with_tcl:--disable-tcl} \
            --enable-threadsafe \
-           --enable-threads-override-locks
+           --enable-threads-override-locks \
+           --enable-load-extension 
 
 make %{?_smp_mflags}
 make doc
@@ -109,6 +116,10 @@
 %endif
 
 %changelog
+* Mon Sep 22 2008 Panu Matilainen <pmatilai at redhat.com> - 3.5.9-2
+- Remove references to temporary registers from cache on release (#463061)
+- Enable loading of external extensions (#457433)
+
 * Tue Jun 17 2008 Stepan Kasal <skasal at redhat.com> - 3.5.9-1
 - update to 3.5.9
 



From pmatilai at fedoraproject.org  Tue Sep 30 05:51:20 2008
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Tue, 30 Sep 2008 05:51:20 +0000 (UTC)
Subject: rpms/sqlite/F-9 sqlite-3.5.9-remove-temporary.patch, NONE,
	1.1 sqlite.spec, 1.39, 1.40
Message-ID: <20080930055120.B9C1670119@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22058

Modified Files:
	sqlite.spec 
Added Files:
	sqlite-3.5.9-remove-temporary.patch 
Log Message:
- Remove references to temporary registers from cache on release (#463061)


sqlite-3.5.9-remove-temporary.patch:

--- NEW FILE sqlite-3.5.9-remove-temporary.patch ---
diff -up sqlite-3.5.9/src/expr.c.remove-temp sqlite-3.5.9/src/expr.c
--- sqlite-3.5.9/src/expr.c.remove-temp	2008-05-13 15:50:50.000000000 +0300
+++ sqlite-3.5.9/src/expr.c	2008-09-22 18:04:39.000000000 +0300
@@ -3428,6 +3428,7 @@ int sqlite3GetTempReg(Parse *pParse){
 }
 void sqlite3ReleaseTempReg(Parse *pParse, int iReg){
   if( iReg && pParse->nTempReg<ArraySize(pParse->aTempReg) ){
+    sqlite3ExprWritableRegister(pParse, iReg, iReg);
     pParse->aTempReg[pParse->nTempReg++] = iReg;
   }
 }


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/F-9/sqlite.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sqlite.spec	10 Jul 2008 15:39:22 -0000	1.39
+++ sqlite.spec	30 Sep 2008 05:50:50 -0000	1.40
@@ -6,12 +6,13 @@
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.5.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
 Source: http://www.sqlite.org/sqlite-%{version}.tar.gz
 Patch1: sqlite-3.5.8-pkgconfig-version.patch
+Patch2: sqlite-3.5.9-remove-temporary.patch
 Obsoletes: sqlite3 sqlite3-devel
 BuildRequires: ncurses-devel readline-devel glibc-devel
 BuildRequires: /usr/bin/tclsh
@@ -52,6 +53,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .pkgconf
+%patch2 -p1 -b .remove-temp
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -Wall"
@@ -109,6 +111,9 @@
 %endif
 
 %changelog
+* Tue Sep 30 2008 Panu Matilainen <pmatilai at redhat.com> - 3.5.9-2
+- Remove references to temporary registers from cache on release (#463061)
+
 * Tue Jun 17 2008 Stepan Kasal <skasal at redhat.com> - 3.5.9-1
 - update to 3.5.9
 



From ashokdas at fedoraproject.org  Tue Sep 30 06:11:43 2008
From: ashokdas at fedoraproject.org (Ashok Shankar Das)
Date: Tue, 30 Sep 2008 06:11:43 +0000 (UTC)
Subject: rpms/elfinfo/devel elfinfo.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930061143.7004A70119@cvs1.fedora.phx.redhat.com>

Author: ashokdas

Update of /cvs/pkgs/rpms/elfinfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24283/devel

Modified Files:
	.cvsignore sources 
Added Files:
	elfinfo.spec import.log 
Log Message:

* Tue Sep 29 2008 Ashok Das <ashok.s.das at gmail.com>- 1.0-1
- Initial specfile for Fedora




--- NEW FILE elfinfo.spec ---
Name:           elfinfo
Version:        1.0
Release:        1%{?dist}
Summary:        ELF file parser a subset of eu-readelf
Group:          Development/Tools
License:        GPLv2
URL:            http://code.google.com/p/elfinfo/
Source0:        http://elfinfo.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
This Tool is essentially a subset of eu-readelf functionality.
This package can work without libelf.

%prep
%setup -q

%build
make CFALGS="$RPM_OPT_FLAGS" %{?_smp_mflags} 

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_bindir}
make install DESTDIR=%{buildroot} INSTALL="install -p" PREFIX=/usr DOCDIR=%{_docdir}/%{name}-%{version}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS ChangeLog README
%{_bindir}/elfinfo


%changelog
* Tue Sep 29 2008 Ashok Das <ashok.s.das at gmail.com>- 1.0-1
- Initial specfile for Fedora 



--- NEW FILE import.log ---
elfinfo-1_0-1_fc9:HEAD:elfinfo-1.0-1.fc9.src.rpm:1222754915


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/elfinfo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 04:25:56 -0000	1.1
+++ .cvsignore	30 Sep 2008 06:11:13 -0000	1.2
@@ -0,0 +1 @@
+elfinfo-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/elfinfo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 04:25:56 -0000	1.1
+++ sources	30 Sep 2008 06:11:13 -0000	1.2
@@ -0,0 +1 @@
+6803ca2a6166dcfd205b99c0ee7ec3a2  elfinfo-1.0.tar.gz



From ashokdas at fedoraproject.org  Tue Sep 30 06:25:43 2008
From: ashokdas at fedoraproject.org (Ashok Shankar Das)
Date: Tue, 30 Sep 2008 06:25:43 +0000 (UTC)
Subject: rpms/elfinfo/F-9 elfinfo.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20080930062543.71F947013D@cvs1.fedora.phx.redhat.com>

Author: ashokdas

Update of /cvs/pkgs/rpms/elfinfo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25276

Modified Files:
	sources 
Added Files:
	elfinfo.spec 
Log Message:
* Tue Sep 29 2008 Ashok Das <ashok.s.das at gmail.com>- 1.0-1
- Initial specfile for Fedora




--- NEW FILE elfinfo.spec ---
Name:           elfinfo
Version:        1.0
Release:        1%{?dist}
Summary:        ELF file parser a subset of eu-readelf
Group:          Development/Tools
License:        GPLv2
URL:            http://code.google.com/p/elfinfo/
Source0:        http://elfinfo.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
This Tool is essentially a subset of eu-readelf functionality.
This package can work without libelf.

%prep
%setup -q

%build
make CFALGS="$RPM_OPT_FLAGS" %{?_smp_mflags} 

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_bindir}
make install DESTDIR=%{buildroot} INSTALL="install -p" PREFIX=/usr DOCDIR=%{_docdir}/%{name}-%{version}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS ChangeLog README
%{_bindir}/elfinfo


%changelog
* Tue Sep 29 2008 Ashok Das <ashok.s.das at gmail.com>- 1.0-1
- Initial specfile for Fedora 



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/elfinfo/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 04:25:56 -0000	1.1
+++ sources	30 Sep 2008 06:25:13 -0000	1.2
@@ -0,0 +1 @@
+6803ca2a6166dcfd205b99c0ee7ec3a2  elfinfo-1.0.tar.gz



From pkgdb at fedoraproject.org  Tue Sep 30 06:43:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 06:43:32 +0000
Subject: [pkgdb] abiword (Fedora EPEL, 5) updated by huzaifas
Message-ID: <20080930064332.AE9FC2084BD@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 5 branch for abiword
huzaifas has set commit to Approved for uberpackager on abiword (Fedora EPEL 5)
huzaifas has set build to Approved for uberpackager on abiword (Fedora EPEL 5)
huzaifas has set checkout to Approved for uberpackager on abiword (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abiword



From pkgdb at fedoraproject.org  Tue Sep 30 06:47:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 06:47:16 +0000
Subject: [pkgdb] abiword: huzaifas has requested watchbugzilla
Message-ID: <20080930064717.149982084BC@bastion.fedora.phx.redhat.com>

huzaifas has requested the watchbugzilla acl on abiword (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abiword



From pkgdb at fedoraproject.org  Tue Sep 30 06:47:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 06:47:19 +0000
Subject: [pkgdb] abiword: huzaifas has requested watchcommits
Message-ID: <20080930064719.B53762084BF@bastion.fedora.phx.redhat.com>

huzaifas has requested the watchcommits acl on abiword (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abiword



From pkgdb at fedoraproject.org  Tue Sep 30 06:47:19 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 06:47:19 +0000
Subject: [pkgdb] abiword: huzaifas has requested commit
Message-ID: <20080930064720.3DBAC208611@bastion.fedora.phx.redhat.com>

huzaifas has requested the commit acl on abiword (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abiword



From pkgdb at fedoraproject.org  Tue Sep 30 06:47:20 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 06:47:20 +0000
Subject: [pkgdb] abiword: huzaifas has requested approveacls
Message-ID: <20080930064720.A0934208D71@bastion.fedora.phx.redhat.com>

huzaifas has requested the approveacls acl on abiword (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abiword



From ashokdas at fedoraproject.org  Tue Sep 30 07:04:09 2008
From: ashokdas at fedoraproject.org (Ashok Shankar Das)
Date: Tue, 30 Sep 2008 07:04:09 +0000 (UTC)
Subject: rpms/greadelf/devel greadelf.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930070409.9CEDC70119@cvs1.fedora.phx.redhat.com>

Author: ashokdas

Update of /cvs/pkgs/rpms/greadelf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29227/devel

Modified Files:
	.cvsignore sources 
Added Files:
	greadelf.spec import.log 
Log Message:
* Fri Sep 26 2008 Ashok Das <ashok.s.das at gmail.com>- 0.4-1
- Update to next release 0.4
* Tue Sep 23 2008 Ashok Das <ashok.s.das at gmail.com>- 0.3-1
- Initial specfile for Fedora




--- NEW FILE greadelf.spec ---
Name:           greadelf
Version:        0.4
Release:        1%{?dist}
Summary:        Wrapper tool for eu-readelf
Group:          Development/Tools
License:        GPLv2
URL:            http://code.google.com/p/greadelf/
Source0:        http://greadelf.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  desktop-file-utils elfutils
BuildRequires:  gtk2-devel 

%description
This Tool is essentially a wrapper over eu-readelf. This package can work
without eu-readelf with limited functionality. Optionally it can also works
with elfinfo an associated package.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"

cat << EOF > %{name}.desktop
[Desktop Entry]
Name=greadelf
Comment=wrapper tool over eu-readelf
Exec=greadelf
Terminal=false
Type=Application
Encoding=UTF-8
Categories=GNOME;GTK;System;
EOF

desktop-file-install --vendor fedora \
    --dir %{buildroot}/%{_datadir}/applications/ \
    %{name}.desktop

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS ChangeLog README
%{_bindir}/greadelf
%{_datadir}/applications/fedora-%{name}.desktop


%changelog
* Fri Sep 26 2008 Ashok Das <ashok.s.das at gmail.com>- 0.4-1
- Update to next release 0.4 
* Tue Sep 23 2008 Ashok Das <ashok.s.das at gmail.com>- 0.3-1
- Initial specfile for Fedora 



--- NEW FILE import.log ---
greadelf-0_4-1_fc9:HEAD:greadelf-0.4-1.fc9.src.rpm:1222756659


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/greadelf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 04:22:15 -0000	1.1
+++ .cvsignore	30 Sep 2008 07:03:38 -0000	1.2
@@ -0,0 +1 @@
+greadelf-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/greadelf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 04:22:15 -0000	1.1
+++ sources	30 Sep 2008 07:03:38 -0000	1.2
@@ -0,0 +1 @@
+148744d64f5d82d1e9f39b5029b624c6  greadelf-0.4.tar.gz



From ashokdas at fedoraproject.org  Tue Sep 30 07:08:07 2008
From: ashokdas at fedoraproject.org (Ashok Shankar Das)
Date: Tue, 30 Sep 2008 07:08:07 +0000 (UTC)
Subject: rpms/greadelf/F-9 greadelf.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20080930070807.4AE5670119@cvs1.fedora.phx.redhat.com>

Author: ashokdas

Update of /cvs/pkgs/rpms/greadelf/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29886

Modified Files:
	sources 
Added Files:
	greadelf.spec 
Log Message:
* Fri Sep 26 2008 Ashok Das <ashok.s.das at gmail.com>- 0.4-1
- Update to next release 0.4
* Tue Sep 23 2008 Ashok Das <ashok.s.das at gmail.com>- 0.3-1
- Initial specfile for Fedora




--- NEW FILE greadelf.spec ---
Name:           greadelf
Version:        0.4
Release:        1%{?dist}
Summary:        Wrapper tool for eu-readelf
Group:          Development/Tools
License:        GPLv2
URL:            http://code.google.com/p/greadelf/
Source0:        http://greadelf.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  desktop-file-utils elfutils
BuildRequires:  gtk2-devel 

%description
This Tool is essentially a wrapper over eu-readelf. This package can work
without eu-readelf with limited functionality. Optionally it can also works
with elfinfo an associated package.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"

cat << EOF > %{name}.desktop
[Desktop Entry]
Name=greadelf
Comment=wrapper tool over eu-readelf
Exec=greadelf
Terminal=false
Type=Application
Encoding=UTF-8
Categories=GNOME;GTK;System;
EOF

desktop-file-install --vendor fedora \
    --dir %{buildroot}/%{_datadir}/applications/ \
    %{name}.desktop

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS ChangeLog README
%{_bindir}/greadelf
%{_datadir}/applications/fedora-%{name}.desktop


%changelog
* Fri Sep 26 2008 Ashok Das <ashok.s.das at gmail.com>- 0.4-1
- Update to next release 0.4 
* Tue Sep 23 2008 Ashok Das <ashok.s.das at gmail.com>- 0.3-1
- Initial specfile for Fedora 



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/greadelf/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 04:22:15 -0000	1.1
+++ sources	30 Sep 2008 07:07:37 -0000	1.2
@@ -0,0 +1 @@
+148744d64f5d82d1e9f39b5029b624c6  greadelf-0.4.tar.gz



From cchance at fedoraproject.org  Tue Sep 30 07:11:58 2008
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue, 30 Sep 2008 07:11:58 +0000 (UTC)
Subject: rpms/cjkunifonts/devel cjkunifonts.spec,1.11,1.12
Message-ID: <20080930071158.7E5D370119@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkunifonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30683

Modified Files:
	cjkunifonts.spec 
Log Message:
moved all .conf files to conf.avail and symlinked to conf.d



Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cjkunifonts.spec	30 Sep 2008 04:57:39 -0000	1.11
+++ cjkunifonts.spec	30 Sep 2008 07:11:28 -0000	1.12
@@ -1,6 +1,7 @@
 %define umingfontdir    %{_datadir}/fonts/%{name}-uming
 %define ukaifontdir     %{_datadir}/fonts/%{name}-ukai
 %define fcdir           %{_sysconfdir}/fonts/conf.d
+%define fcdiravail      %{_sysconfdir}/fonts/conf.avail
 %define cidmapdir       %{_datadir}/ghostscript/conf.d
 %define catalogue       %{_sysconfdir}/X11/fontpath.d
 
@@ -9,7 +10,7 @@
 
 Name:        cjkunifonts
 Version:     0.2.20080216.1
-Release:     3%{?dist}
+Release:     4%{?dist}
 Summary:     Chinese TrueType Fonts -- Simplified and Traditional Chinese Ming and Kai Face
 License:     Arphic
 Group:       User Interface/X
@@ -86,8 +87,17 @@
 
 # fontconfig config files
 install -d $RPM_BUILD_ROOT%{fcdir}
-install -m 0644 %{umingbuilddir}/*.conf $RPM_BUILD_ROOT%{fcdir}/
-install -m 0644 %{ukaibuilddir}/*.conf $RPM_BUILD_ROOT%{fcdir}/
+install -d $RPM_BUILD_ROOT%{fcdiravail}
+for conf in `ls %{umingbuilddir}/*-ttf-arphic-uming*.conf`
+do
+    install -m 0644 $conf $RPM_BUILD_ROOT%{fcdiravail}/
+    ln -s $conf $RPM_BUILD_ROOT%{fcdir}/
+done
+for conf in `ls %{ukaibuilddir}/*-ttf-arphic-ukai*.conf`
+do
+    install -m 0644 $conf $RPM_BUILD_ROOT%{fcdiravail}/
+    ln -s $conf $RPM_BUILD_ROOT%{fcdir}/
+done
 
 # backward compat
 install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType
@@ -157,7 +167,8 @@
 %dir %{_datadir}/fonts/zh_CN/TrueType
 %dir %{_datadir}/fonts/zh_TW/TrueType
 %{umingfontdir}/*.ttc
-%{fcdir}/*-ttf-arphic-uming*.conf
+%{fcdiravail}/*-ttf-arphic-uming*.conf
+%verify(not md5 size mtime) %{fcdir}/*-ttf-arphic-uming*.conf
 %{cidmapdir}/FAPIcidfmap.zh_TW
 %{cidmapdir}/FAPIcidfmap.zh_CN
 %{cidmapdir}/cidfmap.zh_TW
@@ -184,7 +195,8 @@
 %doc %{ukaibuilddir}/TODO
 %dir %{ukaifontdir}
 %{ukaifontdir}/*.ttc
-%{fcdir}/*-ttf-arphic-ukai*.conf
+%{fcdiravail}/*-ttf-arphic-ukai*.conf
+%verify(not md5 size mtime) %{fcdir}/*-ttf-arphic-ukai*.conf
 %{cidmapdir}/FAPIcidfmap.zh_TW
 %{cidmapdir}/FAPIcidfmap.zh_CN
 %{cidmapdir}/cidfmap.zh_TW
@@ -196,6 +208,10 @@
 %{catalogue}/%{name}-ukai
 
 %changelog
+* Mon Sep 30 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-4.fc10
+- Resolves: rhbz#459680 (All .conf files are in fonts.avail and soft linked to
+  fonts.d.)
+
 * Mon Sep 30 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-3.fc10
 - Resolves: rhbz#459680 (repatched)
 



From mmaslano at fedoraproject.org  Tue Sep 30 07:14:51 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 30 Sep 2008 07:14:51 +0000 (UTC)
Subject: rpms/perl-Wx-Perl-Dialog/devel perl-Wx-Perl-Dialog.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930071451.5AB9270119@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Wx-Perl-Dialog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31339

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Wx-Perl-Dialog.spec 
Log Message:
* Mon Sep 29 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.01-3
- remove whole auto directory



--- NEW FILE perl-Wx-Perl-Dialog.spec ---
Name:           perl-Wx-Perl-Dialog
Version:        0.01
Release:        3%{?dist}
Summary:        Wx::Perl::Dialog Perl module
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Wx-Perl-Dialog/
Source0:        http://www.cpan.org/authors/id/S/SZ/SZABGAB/Wx-Perl-Dialog-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 0:5.008
BuildRequires:  perl(File::Copy::Recursive)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Exception)
BuildRequires:  perl(Test::More) >= 0.47
BuildRequires:  perl(Test::NoWarnings)
BuildRequires:  perl(Wx::Perl::ProcessStream)
Requires:       perl(File::Copy::Recursive)
Requires:       perl(Wx::Perl::ProcessStream)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Wx::Perl::Dialog - a set of simple dialogs (a partial Zenity clone in wxPerl)

%prep
%setup -q -n Wx-Perl-Dialog-%{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 \;
# remove scripts from binary
rm -rf $RPM_BUILD_ROOT/%{perl_vendorlib}/auto

%{_fixperms} $RPM_BUILD_ROOT/*

%check
## need X running - switch off
##./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Sep 29 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.01-3
- remove whole auto directory

* Wed Sep 24 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.01-2
- review fixes

* Wed Sep 24 2008 Marcela Ma??l????ov?? 0.01-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Wx-Perl-Dialog/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 04:40:44 -0000	1.1
+++ .cvsignore	30 Sep 2008 07:14:20 -0000	1.2
@@ -0,0 +1 @@
+Wx-Perl-Dialog-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Wx-Perl-Dialog/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 04:40:44 -0000	1.1
+++ sources	30 Sep 2008 07:14:21 -0000	1.2
@@ -0,0 +1 @@
+9ab2cf46a5c582625e617385d8806447  Wx-Perl-Dialog-0.01.tar.gz



From jwrdegoede at fedoraproject.org  Tue Sep 30 07:21:20 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 30 Sep 2008 07:21:20 +0000 (UTC)
Subject: rpms/maniadrive/devel maniadrive-1.2-fixes.patch, 1.1,
	1.2 maniadrive.spec, 1.8, 1.9
Message-ID: <20080930072120.2C9B470119@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/maniadrive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32228

Modified Files:
	maniadrive-1.2-fixes.patch maniadrive.spec 
Log Message:
* Mon Sep 15 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-10
- Rebuild for new ode


maniadrive-1.2-fixes.patch:

Index: maniadrive-1.2-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/devel/maniadrive-1.2-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maniadrive-1.2-fixes.patch	3 Sep 2007 19:18:20 -0000	1.1
+++ maniadrive-1.2-fixes.patch	30 Sep 2008 07:20:49 -0000	1.2
@@ -93,3 +93,15 @@
  INCLUDE_PATH =  -Iraydium/ode/include/ -Iraydium/php/ -Iraydium/php/include -Iraydium/php/main/ -Iraydium/php/Zend -Iraydium/php/TSRM -I/usr/include/curl
  LIBS_PATH =  -L/usr/X11R6/lib/
  CFLAGS=-Wall
+diff -up ManiaDrive-1.2-src/raydium/ode.c~ ManiaDrive-1.2-src/raydium/ode.c
+--- ManiaDrive-1.2-src/raydium/ode.c~	2008-09-15 19:41:57.000000000 +0200
++++ ManiaDrive-1.2-src/raydium/ode.c	2008-09-15 19:41:57.000000000 +0200
+@@ -149,6 +149,8 @@ if(sizeof(dReal) != sizeof(float))
+     exit(34);
+     }
+ 
++dInitODE();
++
+ raydium_ode_ExplosionCallback=NULL;
+ raydium_ode_CollideCallback=NULL;
+ raydium_ode_RayCallback=NULL;


Index: maniadrive.spec
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/devel/maniadrive.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- maniadrive.spec	21 Jun 2008 11:21:11 -0000	1.8
+++ maniadrive.spec	30 Sep 2008 07:20:49 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           maniadrive
 Version:        1.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        3D stunt driving game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -161,6 +161,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-10
+- Rebuild for new ode
+
 * Sat Jun 21 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-9
 - Rebuild for new php version
 



From jwrdegoede at fedoraproject.org  Tue Sep 30 07:24:09 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 30 Sep 2008 07:24:09 +0000 (UTC)
Subject: rpms/machineball/devel machineball-config-only-once.patch, 1.1,
	1.2 machineball-fixes.patch, 1.1, 1.2 machineball.spec, 1.4, 1.5
Message-ID: <20080930072409.2458170119@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/machineball/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv448

Modified Files:
	machineball-config-only-once.patch machineball-fixes.patch 
	machineball.spec 
Log Message:
* Mon Sep 15 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-6
- Rebuild for new ode


machineball-config-only-once.patch:

Index: machineball-config-only-once.patch
===================================================================
RCS file: /cvs/extras/rpms/machineball/devel/machineball-config-only-once.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- machineball-config-only-once.patch	12 May 2007 08:27:14 -0000	1.1
+++ machineball-config-only-once.patch	30 Sep 2008 07:23:38 -0000	1.2
@@ -169,10 +169,10 @@
  		// Default values:
  		options.resolution=6;
  		options.colordepth=1;
-@@ -197,7 +198,7 @@
- 	}
+@@ -198,7 +199,7 @@
  
  	srand(time(0));
+	dInitODE();
 -	createWindow(forc); // The argument tells us if we want sound or not
 +	createWindow(forc, do_configure); // The 1st argument tells us if we want sound or not
  	

machineball-fixes.patch:

Index: machineball-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/machineball/devel/machineball-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- machineball-fixes.patch	12 May 2007 08:27:14 -0000	1.1
+++ machineball-fixes.patch	30 Sep 2008 07:23:38 -0000	1.2
@@ -16,6 +16,14 @@
  	rm machineball main.o window.o intro.o menu.o game.o text.o timer.o controls.o ball.o glode.o camera.o render.o court.o machine.o powerup.o explosion.o models.o options.o mbdata.o
 --- machineball-src/main.cpp	2002-12-21 14:31:40.000000000 +0100
 +++ machineball-src.new/main.cpp	2007-04-30 20:05:07.000000000 +0200
+@@ -198,6 +198,7 @@ int main(int argc, char **argv)
+ 	}
+ 
+ 	srand(time(0));
++	dInitODE();
+	createWindow(forc); // The argument tells us if we want sound or not
+ 	
+ 	loadProgramData();
 @@ -290,13 +290,11 @@
  	text.init();
  


Index: machineball.spec
===================================================================
RCS file: /cvs/extras/rpms/machineball/devel/machineball.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- machineball.spec	19 Feb 2008 09:13:55 -0000	1.4
+++ machineball.spec	30 Sep 2008 07:23:38 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           machineball
 Version:        1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A futuristic ball game with simple rules
 Group:          Amusements/Games
 License:        GPL+
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-6
+- Rebuild for new ode
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0-5
 - Autorebuild for GCC 4.3
 



From sergiopr at fedoraproject.org  Tue Sep 30 07:24:57 2008
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Tue, 30 Sep 2008 07:24:57 +0000 (UTC)
Subject: rpms/rubber/devel import.log, NONE, 1.1 rubber.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930072457.43F4D70119@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/rubber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv721/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubber.spec 
Log Message:
Importing rubber



--- NEW FILE import.log ---
rubber-1_1-2_fc9:HEAD:rubber-1.1-2.fc9.src.rpm:1222759441


--- NEW FILE rubber.spec ---
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} 

Name: rubber
Version: 1.1
Release: 2%{?dist}
Summary: An automated system for building LaTeX documents

Group: Applications/Publishing
License: GPL+

URL: http://rubber.sourceforge.net/
Source0: http://rubber.sourceforge.net/%{name}-%{version}.tar.gz
BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
BuildRequires: python-devel texinfo

Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description
This is a building system for LaTeX documents. It is based on a routine that
runs just as many compilations as necessary. The module system provides a
great flexibility that virtually allows support for any package with no user
intervention, as well as pre- and post-processing of the document. The
standard modules currently provide support for bibtex, dvips, dvipdfm, pdftex,
makeindex. A good number of standard packages are supported, including
graphics/graphicx (with automatic conversion between various formats and
Metapost compilation).

%prep
%setup -q
for file in doc/man-fr/*; do
iconv -f ISO88591 -t utf8 $file -o $file
done

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -fr %{buildroot}
%{__python} setup.py install --root  %{buildroot}

%clean
%{__rm} -fr %{buildroot}

%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 COPYING NEWS README
%{_bindir}/*
%{_datadir}/rubber
%{_datadir}/info/*
%{python_sitelib}/*
%{_mandir}/man1/*.gz
%{_mandir}/fr/man1/*.gz

%changelog
* Wed Sep 17 2008 Sergio Pascual <sergiops at fedoraproject.org> - 1.1-2
- ***

* Wed Sep 17 2008 Sergio Pascual <sergiops at fedoraproject.org> - 1.1-1
- Initial specfile



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubber/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 04:36:54 -0000	1.1
+++ .cvsignore	30 Sep 2008 07:24:26 -0000	1.2
@@ -0,0 +1 @@
+rubber-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubber/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 04:36:54 -0000	1.1
+++ sources	30 Sep 2008 07:24:26 -0000	1.2
@@ -0,0 +1 @@
+8087cdb498f51f91c2427c7d0b253189  rubber-1.1.tar.gz



From sergiopr at fedoraproject.org  Tue Sep 30 07:33:32 2008
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Tue, 30 Sep 2008 07:33:32 +0000 (UTC)
Subject: rpms/rubber/F-9 import.log, NONE, 1.1 rubber.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930073332.CE9BA70119@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/rubber/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2576/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubber.spec 
Log Message:
Importing rubber



--- NEW FILE import.log ---
rubber-1_1-2_fc9:F-9:rubber-1.1-2.fc9.src.rpm:1222759954


--- NEW FILE rubber.spec ---
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} 

Name: rubber
Version: 1.1
Release: 2%{?dist}
Summary: An automated system for building LaTeX documents

Group: Applications/Publishing
License: GPL+

URL: http://rubber.sourceforge.net/
Source0: http://rubber.sourceforge.net/%{name}-%{version}.tar.gz
BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
BuildRequires: python-devel texinfo

Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description
This is a building system for LaTeX documents. It is based on a routine that
runs just as many compilations as necessary. The module system provides a
great flexibility that virtually allows support for any package with no user
intervention, as well as pre- and post-processing of the document. The
standard modules currently provide support for bibtex, dvips, dvipdfm, pdftex,
makeindex. A good number of standard packages are supported, including
graphics/graphicx (with automatic conversion between various formats and
Metapost compilation).

%prep
%setup -q
for file in doc/man-fr/*; do
iconv -f ISO88591 -t utf8 $file -o $file
done

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -fr %{buildroot}
%{__python} setup.py install --root  %{buildroot}

%clean
%{__rm} -fr %{buildroot}

%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 COPYING NEWS README
%{_bindir}/*
%{_datadir}/rubber
%{_datadir}/info/*
%{python_sitelib}/*
%{_mandir}/man1/*.gz
%{_mandir}/fr/man1/*.gz

%changelog
* Wed Sep 17 2008 Sergio Pascual <sergiops at fedoraproject.org> - 1.1-2
- ***

* Wed Sep 17 2008 Sergio Pascual <sergiops at fedoraproject.org> - 1.1-1
- Initial specfile



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubber/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 04:36:54 -0000	1.1
+++ .cvsignore	30 Sep 2008 07:33:02 -0000	1.2
@@ -0,0 +1 @@
+rubber-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubber/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 04:36:54 -0000	1.1
+++ sources	30 Sep 2008 07:33:02 -0000	1.2
@@ -0,0 +1 @@
+8087cdb498f51f91c2427c7d0b253189  rubber-1.1.tar.gz



From stransky at fedoraproject.org  Tue Sep 30 07:33:34 2008
From: stransky at fedoraproject.org (Martin Stransky)
Date: Tue, 30 Sep 2008 07:33:34 +0000 (UTC)
Subject: rpms/nspluginwrapper/F-9 nspluginwrapper-1.1.0-visual-id.patch, 1.1,
	1.2 nspluginwrapper.spec, 1.54, 1.55
Message-ID: <20080930073334.0A85170119@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2632

Modified Files:
	nspluginwrapper-1.1.0-visual-id.patch nspluginwrapper.spec 
Log Message:
 Updated fix for #456432 -(Windowless Crash) Flash 10 w/ Firefox 3

nspluginwrapper-1.1.0-visual-id.patch:

Index: nspluginwrapper-1.1.0-visual-id.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/nspluginwrapper-1.1.0-visual-id.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nspluginwrapper-1.1.0-visual-id.patch	4 Aug 2008 07:46:25 -0000	1.1
+++ nspluginwrapper-1.1.0-visual-id.patch	30 Sep 2008 07:33:03 -0000	1.2
@@ -1,13 +1,37 @@
-diff -up nspluginwrapper-1.1.0/src/npw-rpc.c.old nspluginwrapper-1.1.0/src/npw-rpc.c
---- nspluginwrapper-1.1.0/src/npw-rpc.c.old	2008-07-06 17:33:14.000000000 +0200
-+++ nspluginwrapper-1.1.0/src/npw-rpc.c	2008-08-01 20:45:33.000000000 +0200
-@@ -381,7 +381,8 @@ static int do_send_NPSetWindowCallbackSt
+2008-09-30  Gwenole Beauchesne  <gb.public at free.fr>
+
+	* src/npw-rpc (do_send_NPSetWindowCallbackStruct): Check for
+	NULL visual.
+	* src/npw-viewer.c (create_window_attributes): Get system
+	visual when we are passed a 0 visual ID.
+
+Index: src/npw-viewer.c
+===================================================================
+--- src/npw-viewer.c	(revision 645)
++++ src/npw-viewer.c	(revision 646)
+@@ -358,7 +358,11 @@
+ {
+   if (ws_info == NULL)
+ 	return -1;
+-  GdkVisual *gdk_visual = gdkx_visual_get((uintptr_t)ws_info->visual);
++  GdkVisual *gdk_visual;
++  if (ws_info->visual)
++	gdk_visual = gdkx_visual_get((uintptr_t)ws_info->visual);
++  else
++	gdk_visual = gdk_visual_get_system();
+   if (gdk_visual == NULL) {
+ 	npw_printf("ERROR: could not reconstruct XVisual from visualID\n");
+ 	return -2;
+Index: src/npw-rpc.c
+===================================================================
+--- src/npw-rpc.c	(revision 645)
++++ src/npw-rpc.c	(revision 646)
+@@ -381,7 +381,7 @@
  	  return error;
  	if ((error = rpc_message_send_int32(message, ws_info->type)) < 0)
  	  return error;
 -	if ((error = rpc_message_send_uint32(message, XVisualIDFromVisual(ws_info->visual))) < 0)
-+	uint32_t visual_id = ws_info->visual != NULL ? XVisualIDFromVisual(ws_info->visual) : 0;
-+	if ((error = rpc_message_send_uint32(message, visual_id)) < 0)
++	if ((error = rpc_message_send_uint32(message, ws_info->visual ? XVisualIDFromVisual(ws_info->visual) : 0)) < 0)
  	  return error;
  	if ((error = rpc_message_send_uint32(message, ws_info->colormap)) < 0)
  	  return error;


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/nspluginwrapper.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- nspluginwrapper.spec	17 Sep 2008 07:53:54 -0000	1.54
+++ nspluginwrapper.spec	30 Sep 2008 07:33:03 -0000	1.55
@@ -70,7 +70,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	1.1.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -110,7 +110,7 @@
 %patch3 -p1 -b .fork
 %patch4 -p1 -b .shutdown
 %patch5 -p1 -b .sleep
-%patch6 -p1 -b .visual_id
+%patch6 -p0 -b .visual_id
 
 pushd %plugin_config_name
 %patch100 -p2
@@ -241,6 +241,9 @@
 %config %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Tue Sep 30 2008 Martin Stransky <stransky at redhat.com> 1.1.0-7
+- Updated fix for #456432 -(Windowless Crash) Flash 10 w/ Firefox 3
+
 * Wed Sep 17 2008 Martin Stransky <stransky at redhat.com> 1.1.0-6
 - Added libcurl to requires (#460988)
 



From sergiopr at fedoraproject.org  Tue Sep 30 07:40:29 2008
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Tue, 30 Sep 2008 07:40:29 +0000 (UTC)
Subject: rpms/rubber/F-8 import.log, NONE, 1.1 rubber.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930074029.E4B1270119@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/rubber/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3885/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubber.spec 
Log Message:
Importing rubber



--- NEW FILE import.log ---
rubber-1_1-2_fc9:F-8:rubber-1.1-2.fc9.src.rpm:1222760362


--- NEW FILE rubber.spec ---
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} 

Name: rubber
Version: 1.1
Release: 2%{?dist}
Summary: An automated system for building LaTeX documents

Group: Applications/Publishing
License: GPL+

URL: http://rubber.sourceforge.net/
Source0: http://rubber.sourceforge.net/%{name}-%{version}.tar.gz
BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
BuildRequires: python-devel texinfo

Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description
This is a building system for LaTeX documents. It is based on a routine that
runs just as many compilations as necessary. The module system provides a
great flexibility that virtually allows support for any package with no user
intervention, as well as pre- and post-processing of the document. The
standard modules currently provide support for bibtex, dvips, dvipdfm, pdftex,
makeindex. A good number of standard packages are supported, including
graphics/graphicx (with automatic conversion between various formats and
Metapost compilation).

%prep
%setup -q
for file in doc/man-fr/*; do
iconv -f ISO88591 -t utf8 $file -o $file
done

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -fr %{buildroot}
%{__python} setup.py install --root  %{buildroot}

%clean
%{__rm} -fr %{buildroot}

%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 COPYING NEWS README
%{_bindir}/*
%{_datadir}/rubber
%{_datadir}/info/*
%{python_sitelib}/*
%{_mandir}/man1/*.gz
%{_mandir}/fr/man1/*.gz

%changelog
* Wed Sep 17 2008 Sergio Pascual <sergiops at fedoraproject.org> - 1.1-2
- ***

* Wed Sep 17 2008 Sergio Pascual <sergiops at fedoraproject.org> - 1.1-1
- Initial specfile



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubber/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 04:36:54 -0000	1.1
+++ .cvsignore	30 Sep 2008 07:39:59 -0000	1.2
@@ -0,0 +1 @@
+rubber-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubber/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 04:36:54 -0000	1.1
+++ sources	30 Sep 2008 07:39:59 -0000	1.2
@@ -0,0 +1 @@
+8087cdb498f51f91c2427c7d0b253189  rubber-1.1.tar.gz



From airlied at fedoraproject.org  Tue Sep 30 07:44:13 2008
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 30 Sep 2008 07:44:13 +0000 (UTC)
Subject: rpms/libdrm/devel .cvsignore, 1.15,
	1.16 libdrm-gtt-map-support-3.patch, 1.1, 1.2 libdrm.spec, 1.49,
	1.50 sources, 1.15, 1.16 libdrm-wait-udev.patch, 1.1, NONE
Message-ID: <20080930074413.BF68270119@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4525

Modified Files:
	.cvsignore libdrm-gtt-map-support-3.patch libdrm.spec sources 
Removed Files:
	libdrm-wait-udev.patch 
Log Message:
- move intel bufmgr code around - update patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	14 Aug 2008 05:51:06 -0000	1.15
+++ .cvsignore	30 Sep 2008 07:43:43 -0000	1.16
@@ -1 +1 @@
-libdrm-20080814.tar.bz2
+libdrm-20080930.tar.bz2

libdrm-gtt-map-support-3.patch:

Index: libdrm-gtt-map-support-3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm-gtt-map-support-3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libdrm-gtt-map-support-3.patch	9 Sep 2008 06:44:16 -0000	1.1
+++ libdrm-gtt-map-support-3.patch	30 Sep 2008 07:43:43 -0000	1.2
@@ -1,28 +1,15 @@
-diff --git a/libdrm/intel/intel_bufmgr.h b/libdrm/intel/intel_bufmgr.h
-index 4d33521..59def00 100644
---- a/libdrm/intel/intel_bufmgr.h
-+++ b/libdrm/intel/intel_bufmgr.h
-@@ -126,5 +126,7 @@ int intel_bo_set_tiling(dri_bo *buf, uint32_t *tiling_mode);
- 
- int intel_bo_flink(dri_bo *buf, uint32_t *name);
- 
-+int dri_gem_bo_map_gtt(dri_bo *bo);
-+
- #endif /* INTEL_BUFMGR_GEM_H */
- 
-diff --git a/libdrm/intel/intel_bufmgr_gem.c b/libdrm/intel/intel_bufmgr_gem.c
-index af20efb..ba49b24 100644
---- a/libdrm/intel/intel_bufmgr_gem.c
-+++ b/libdrm/intel/intel_bufmgr_gem.c
-@@ -35,6 +35,7 @@
-  */
+diff -up libdrm-20080930/libdrm/intel/intel_bufmgr_gem.c.gttmap libdrm-20080930/libdrm/intel/intel_bufmgr_gem.c
+--- libdrm-20080930/libdrm/intel/intel_bufmgr_gem.c.gttmap	2008-09-30 14:17:27.000000000 +1000
++++ libdrm-20080930/libdrm/intel/intel_bufmgr_gem.c	2008-09-30 17:35:51.000000000 +1000
+@@ -39,6 +39,7 @@
+ #endif
  
  #include <xf86drm.h>
 +#include <fcntl.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-@@ -42,6 +43,8 @@
+@@ -46,6 +47,8 @@
  #include <assert.h>
  #include <sys/ioctl.h>
  #include <sys/mman.h>
@@ -30,16 +17,8 @@
 +#include <sys/types.h>
  
  #include "errno.h"
- #include "dri_bufmgr.h"
-@@ -370,6 +373,7 @@ intel_bo_gem_create_from_name(dri_bufmgr *bufmgr, const char *name,
-     bo_gem->refcount = 1;
-     bo_gem->validate_index = -1;
-     bo_gem->gem_handle = open_arg.handle;
-+    bo_gem->bo.handle = bo_gem->gem_handle;
- 
-     DBG("bo_create_from_handle: %d (%s)\n", handle, bo_gem->name);
- 
-@@ -517,6 +521,90 @@ dri_gem_bo_map(dri_bo *bo, int write_enable)
+ #include "intel_bufmgr.h"
+@@ -518,6 +521,90 @@ dri_gem_bo_map(dri_bo *bo, int write_ena
      return 0;
  }
  
@@ -130,7 +109,7 @@
  static int
  dri_gem_bo_unmap(dri_bo *bo)
  {
-@@ -593,7 +681,7 @@ dri_gem_bo_get_subdata (dri_bo *bo, unsigned long offset,
+@@ -594,7 +681,7 @@ dri_gem_bo_get_subdata (dri_bo *bo, unsi
      return 0;
  }
  
@@ -139,9 +118,21 @@
  dri_gem_bo_wait_rendering(dri_bo *bo)
  {
      dri_bufmgr_gem *bufmgr_gem = (dri_bufmgr_gem *)bo->bufmgr;
-diff -up libdrm-20080814/shared-core/i915_drm.h.da libdrm-20080814/shared-core/i915_drm.h
---- libdrm-20080814/shared-core/i915_drm.h.da	2008-09-09 16:43:43.000000000 +1000
-+++ libdrm-20080814/shared-core/i915_drm.h	2008-09-09 16:43:45.000000000 +1000
+diff -up libdrm-20080930/libdrm/intel/intel_bufmgr.h.gttmap libdrm-20080930/libdrm/intel/intel_bufmgr.h
+--- libdrm-20080930/libdrm/intel/intel_bufmgr.h.gttmap	2008-09-30 14:17:27.000000000 +1000
++++ libdrm-20080930/libdrm/intel/intel_bufmgr.h	2008-09-30 17:34:10.000000000 +1000
+@@ -89,6 +89,8 @@ int dri_bo_unpin(dri_bo *buf);
+ int dri_bo_set_tiling(dri_bo *buf, uint32_t *tiling_mode);
+ int dri_bo_flink(dri_bo *buf, uint32_t *name);
+ 
++int dri_gem_bo_map_gtt(dri_bo *bo);
++
+ /* intel_bufmgr_gem.c */
+ dri_bufmgr *intel_bufmgr_gem_init(int fd, int batch_size);
+ dri_bo *intel_bo_gem_create_from_name(dri_bufmgr *bufmgr, const char *name,
+diff -up libdrm-20080930/shared-core/i915_drm.h.gttmap libdrm-20080930/shared-core/i915_drm.h
+--- libdrm-20080930/shared-core/i915_drm.h.gttmap	2008-09-30 14:17:27.000000000 +1000
++++ libdrm-20080930/shared-core/i915_drm.h	2008-09-30 17:01:13.000000000 +1000
 @@ -99,7 +99,7 @@ typedef struct drm_i915_sarea {
  	int tex_size;
  	int log_tex_granularity;


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- libdrm.spec	9 Sep 2008 06:44:16 -0000	1.49
+++ libdrm.spec	30 Sep 2008 07:43:43 -0000	1.50
@@ -1,9 +1,9 @@
-%define gitdate 20080814
+%define gitdate 20080930
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.0
-Release: 0.20%{?dist}
+Release: 0.21%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -25,7 +25,6 @@
 # - funk that just bash it direct for now -
 Patch3: libdrm-make-dri-perms-okay.patch
 Patch4: libdrm-2.4.0-no-bc.patch
-Patch5: libdrm-wait-udev.patch
 Patch6: libdrm-gtt-map-support-3.patch
 
 %description
@@ -45,7 +44,6 @@
 #patch2 -p1 -b .mknod
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
-%patch5 -p1 -b .udev-wait
 %patch6 -p1 -b .gttmap
 
 %build
@@ -65,7 +63,7 @@
 # NOTE: We intentionally don't ship *.la files
 find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
 find $RPM_BUILD_ROOT -type f -name '*_drm.h' | xargs rm -f -- || :
-for i in drm.h drm_sarea.h r300_reg.h via_3d_reg.h
+for i in drm.h drm_mode.h drm_sarea.h r300_reg.h via_3d_reg.h
 do
 rm -f $RPM_BUILD_ROOT/usr/include/drm/$i
 done
@@ -81,6 +79,8 @@
 %doc README
 %{_libdir}/libdrm.so.2
 %{_libdir}/libdrm.so.2.3.0
+%{_libdir}/libdrm_intel.so.1
+%{_libdir}/libdrm_intel.so.1.0.0
 %{_sysconfdir}/udev/rules.d/91-drm-modeset.rules
 %{_sysconfdir}/modprobe.d/i915modeset
 
@@ -89,12 +89,15 @@
 # FIXME should be in drm/ too
 %{_includedir}/xf86drm.h
 %{_includedir}/xf86drmMode.h
-%{_includedir}/dri_bufmgr.h
 %{_includedir}/intel_bufmgr.h
 %{_libdir}/libdrm.so
+%{_libdir}/libdrm_intel.so
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* Tue Sep 30 2008 Dave Airlie <airlied at redhat.com> 2.4.0-0.21
+- move intel bufmgr code around - update patches
+
 * Tue Sep 09 2008 Dave Airlie <airlied at redhat.com> 2.4.0-0.20
 - add gtt mapping for intel modesetting
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	14 Aug 2008 05:51:06 -0000	1.15
+++ sources	30 Sep 2008 07:43:43 -0000	1.16
@@ -1 +1 @@
-2af5325c8ae923a7cbaea3671bc7b969  libdrm-20080814.tar.bz2
+30049dfd7ad96e0beb5edf01f0af422e  libdrm-20080930.tar.bz2


--- libdrm-wait-udev.patch DELETED ---



From lkundrak at fedoraproject.org  Tue Sep 30 07:45:16 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 30 Sep 2008 07:45:16 +0000 (UTC)
Subject: rpms/crystalspace/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20080930074516.6663470119@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/crystalspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4739

Modified Files:
	.cvsignore sources 
Log Message:
add source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crystalspace/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Feb 2008 19:05:26 -0000	1.2
+++ .cvsignore	30 Sep 2008 07:44:46 -0000	1.3
@@ -1 +1 @@
-crystalspace-src-1.2.tar.bz2
+crystalspace-src-1.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crystalspace/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Feb 2008 19:05:26 -0000	1.2
+++ sources	30 Sep 2008 07:44:46 -0000	1.3
@@ -1 +1 @@
-73505e51b7ac3062ecd75bb71cd74880  crystalspace-src-1.2.tar.bz2
+a6c4f1d0782b1ea2ee483376400f4779  crystalspace-src-1.2.1.tar.bz2



From jwrdegoede at fedoraproject.org  Tue Sep 30 07:45:49 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 30 Sep 2008 07:45:49 +0000 (UTC)
Subject: rpms/stormbaancoureur/devel stormbaancoureur.spec,1.10,1.11
Message-ID: <20080930074549.9C7A970119@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/stormbaancoureur/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4869

Modified Files:
	stormbaancoureur.spec 
Log Message:
* Tue May 13 2008 Hans de Goede <hdegoede at redhat.com> 2.1.5-1
- new upstream release 2.1.5
- Rebuild for new ode



Index: stormbaancoureur.spec
===================================================================
RCS file: /cvs/extras/rpms/stormbaancoureur/devel/stormbaancoureur.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- stormbaancoureur.spec	13 May 2008 14:44:18 -0000	1.10
+++ stormbaancoureur.spec	30 Sep 2008 07:45:19 -0000	1.11
@@ -1,11 +1,11 @@
 Name:           stormbaancoureur
-Version:        2.1.4
+Version:        2.1.5
 Release:        1%{?dist}
 Summary:        Simulated obstacle course for automobiles
 Group:          Amusements/Games
 License:        GPLv2+
-URL:            http://www.sturmbahnfahrer.com/
-Source0:        http://bram.creative4vision.nl/sturmbahnfahrer/download/%{name}-%{version}.tar.gz 
+URL:            http://bram.creative4vision.nl/stormbaancoureur/
+Source0:        http://bram.creative4vision.nl/stormbaancoureur/download/%{name}-%{version}.tar.gz 
 Source1:        %{name}.desktop
 Source2:        sturmbahnfahrer.png
 Patch0:         stormbaancoureur-1.5.3-no-static-ode.patch
@@ -91,6 +91,10 @@
 
 
 %changelog
+* Tue May 13 2008 Hans de Goede <hdegoede at redhat.com> 2.1.5-1
+- new upstream release 2.1.5
+- Rebuild for new ode
+
 * Tue May 13 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.1.4-1
 - new upstream release 2.1.4
 - Rebuild for new plib



From lkundrak at fedoraproject.org  Tue Sep 30 07:47:13 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 30 Sep 2008 07:47:13 +0000 (UTC)
Subject: rpms/numptyphysics/devel import.log, NONE,
	1.1 numptyphysics-0.3-doublefree.patch, NONE,
	1.1 numptyphysics-0.3-gcc43.patch, NONE,
	1.1 numptyphysics.desktop, NONE, 1.1 numptyphysics.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930074713.6933470119@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/numptyphysics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5482/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log numptyphysics-0.3-doublefree.patch 
	numptyphysics-0.3-gcc43.patch numptyphysics.desktop 
	numptyphysics.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
numptyphysics-0_3-0_2_20080925svn_el5:HEAD:numptyphysics-0.3-0.2.20080925svn.el5.src.rpm:1222760785

numptyphysics-0.3-doublefree.patch:

--- NEW FILE numptyphysics-0.3-doublefree.patch ---
Fix a double-free on exit.

Lubomir Rintel <lkundrak at v3.sk>

--- numptyphysics/Game.cpp.doublefree	2008-09-27 15:01:43.000000000 +0200
+++ numptyphysics/Game.cpp	2008-09-27 15:01:04.000000000 +0200
@@ -661,10 +661,13 @@
       m_strokes.erase(0);
     }
     if ( m_world ) {
+// Haven't seen a leftover body ever, and this causes a doble free()
+#if 0
       while ( m_world->GetBodyList() ) {
 	printf("body left over %p\n",m_world->GetBodyList());
 	m_world->DestroyBody( m_world->GetBodyList() );	       
       }
+#endif
       //step is required to actually destroy bodies and joints
       m_world->Step( ITERATION_TIMESTEPf, SOLVER_ITERATIONS );
     }

numptyphysics-0.3-gcc43.patch:

--- NEW FILE numptyphysics-0.3-gcc43.patch ---
Fix build of Box2D with gcc4.3.
Still applies against current Box2D upstream.

Lubomir Rintel <lkundrak at v3.sk>

diff -urp numptyphysics/Box2D/Source/Collision/b2BroadPhase.cpp numptyphysics/Box2D/Source/Collision/b2BroadPhase.cpp
--- numptyphysics.orig/Box2D/Source/Collision/b2BroadPhase.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Collision/b2BroadPhase.cpp	2008-09-25 16:16:39.000000000 +0200
@@ -18,6 +18,7 @@
 
 #include "b2BroadPhase.h"
 #include <algorithm>
+#include <cstring>
 
 // Notes:
 // - we use bound arrays instead of linked lists for cache coherence.
diff -urp numptyphysics/Box2D/Source/Common/b2BlockAllocator.cpp numptyphysics/Box2D/Source/Common/b2BlockAllocator.cpp
--- numptyphysics.orig/Box2D/Source/Common/b2BlockAllocator.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Common/b2BlockAllocator.cpp	2008-09-25 16:17:46.000000000 +0200
@@ -20,6 +20,7 @@
 #include <cstdlib>
 #include <memory>
 #include <climits>
+#include <cstring>
 
 int32 b2BlockAllocator::s_blockSizes[b2_blockSizes] = 
 {
diff -urp numptyphysics/Box2D/Source/Dynamics/Contacts/b2CircleContact.cpp numptyphysics/Box2D/Source/Dynamics/Contacts/b2CircleContact.cpp
--- numptyphysics.orig/Box2D/Source/Dynamics/Contacts/b2CircleContact.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Dynamics/Contacts/b2CircleContact.cpp	2008-09-25 16:17:57.000000000 +0200
@@ -22,6 +22,7 @@
 #include "../../Common/b2BlockAllocator.h"
 
 #include <new>
+#include <cstring>
 
 b2Contact* b2CircleContact::Create(b2Shape* shape1, b2Shape* shape2, b2BlockAllocator* allocator)
 {
diff -urp numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp
--- numptyphysics.orig/Box2D/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp	2008-09-25 16:17:48.000000000 +0200
@@ -22,6 +22,7 @@
 #include "../../Common/b2BlockAllocator.h"
 
 #include <new>
+#include <cstring>
 
 b2Contact* b2PolyAndCircleContact::Create(b2Shape* shape1, b2Shape* shape2, b2BlockAllocator* allocator)
 {
diff -urp numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp
--- numptyphysics.orig/Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp	2008-09-25 16:17:49.000000000 +0200
@@ -23,6 +23,7 @@
 
 #include <memory>
 #include <new>
+#include <cstring>
 
 b2Contact* b2PolygonContact::Create(b2Shape* shape1, b2Shape* shape2, b2BlockAllocator* allocator)
 {
diff -urp numptyphysics/Http.cpp numptyphysics/Http.cpp
--- numptyphysics.orig/Http.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Http.cpp	2008-09-25 16:13:39.000000000 +0200
@@ -14,6 +14,7 @@
  *
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
diff -urp numptyphysics/Levels.cpp numptyphysics/Levels.cpp
--- numptyphysics.orig/Levels.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Levels.cpp	2008-09-25 16:13:39.000000000 +0200
@@ -15,6 +15,7 @@
  */
 
 
+#include <string.h>
 #include <sys/types.h>
 #include <dirent.h>
 
diff -urp numptyphysics/Path.cpp numptyphysics/Path.cpp
--- numptyphysics.orig/Path.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Path.cpp	2008-09-25 16:13:39.000000000 +0200
@@ -15,6 +15,7 @@
  */
 
 
+#include <string.h>
 #include "Path.h"
 
 


--- NEW FILE numptyphysics.desktop ---
[Desktop Entry]
Type=Application
Name=Numpty Physics
Exec=numptyphysics
Icon=numptyphysics
Categories=Game;LogicGame;KidsGame;Simulation;
Terminal=false


--- NEW FILE numptyphysics.spec ---
Name:           numptyphysics
Version:        0.3
Release:        0.2.20080925svn%{?dist}
Summary:        A crayon-drawing based physics puzzle game 

Group:          Amusements/Games
License:        GPLv3+
URL:            http://numptyphysics.garage.maemo.org/
# svn co -r81 https://garage.maemo.org/svn/numptyphysics/trunk numptyphysics
# tar czf numptyphysics.tar.gz numptyphysics --exclude .svn
Source0:        numptyphysics.tar.gz
Source1:        numptyphysics.desktop
Patch0:         numptyphysics-0.3-gcc43.patch
Patch1:         numptyphysics-0.3-doublefree.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  SDL_image-devel
BuildRequires:  desktop-file-utils

%description
Harness gravity with your crayon and set about creating blocks, ramps,
levers, pulleys and whatever else you fancy to get the little red thing to
the little yellow thing.


%prep
%setup -q -n %{name}
%patch0 -p1 -b .gcc43
%patch1 -p1 -b .doublefree


%build
# Note the ARCH variable doesn't denote real arch. It's just used to hit a
# conditional that we're not compiling with mingw
make %{?_smp_mflags}    \
        ARCH=i686       \
        CCOPTS="%{optflags} -IBox2D/Include"


%install
rm -rf $RPM_BUILD_ROOT

# Directory structure
install -d $RPM_BUILD_ROOT%{_datadir}/numptyphysics
install -d $RPM_BUILD_ROOT%{_bindir}
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps

# Files
install -pm 644 *.png *.nph *.jpg $RPM_BUILD_ROOT%{_datadir}/numptyphysics
install -pm 755 i686/Game $RPM_BUILD_ROOT%{_bindir}/numptyphysics
install -pm 644 debian/numptyphysics64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/numptyphysics.png

# Icon
desktop-file-install --vendor=fedora %{SOURCE1} \
        --dir=$RPM_BUILD_ROOT%{_datadir}/applications


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/numptyphysics
%{_datadir}/numptyphysics
%{_datadir}/pixmaps/numptyphysics.png
%{_datadir}/applications/fedora-numptyphysics.desktop


%changelog
* Mon Sep 29 2008 Lubomir Rintel <lkundrak at v3.sk> 0.3-0.2.20080925svn
- Review, small tidy-ups

* Thu Sep 25 2008 Lubomir Rintel <lkundrak at v3.sk> 0.3-0.1.20080925svn
- Initial packaging attempt


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/numptyphysics/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 04:31:03 -0000	1.1
+++ .cvsignore	30 Sep 2008 07:46:43 -0000	1.2
@@ -0,0 +1 @@
+numptyphysics.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/numptyphysics/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 04:31:03 -0000	1.1
+++ sources	30 Sep 2008 07:46:43 -0000	1.2
@@ -0,0 +1 @@
+168d11194b355f75857a135258445035  numptyphysics.tar.gz



From lkundrak at fedoraproject.org  Tue Sep 30 07:50:00 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 30 Sep 2008 07:50:00 +0000 (UTC)
Subject: rpms/numptyphysics/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 numptyphysics.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20080930075000.C9BBB70119@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/numptyphysics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6239/devel

Modified Files:
	.cvsignore import.log numptyphysics.spec sources 
Log Message:
Import more levels


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/numptyphysics/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2008 07:46:43 -0000	1.2
+++ .cvsignore	30 Sep 2008 07:49:30 -0000	1.3
@@ -1 +1,2 @@
 numptyphysics.tar.gz
+numptyphysics-levels-2008-09-27.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/numptyphysics/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Sep 2008 07:46:43 -0000	1.1
+++ import.log	30 Sep 2008 07:49:30 -0000	1.2
@@ -1 +1,2 @@
 numptyphysics-0_3-0_2_20080925svn_el5:HEAD:numptyphysics-0.3-0.2.20080925svn.el5.src.rpm:1222760785
+numptyphysics-0_3-0_3_20080925svn_el5:HEAD:numptyphysics-0.3-0.3.20080925svn.el5.src.rpm:1222760950


Index: numptyphysics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/numptyphysics/devel/numptyphysics.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- numptyphysics.spec	30 Sep 2008 07:46:43 -0000	1.1
+++ numptyphysics.spec	30 Sep 2008 07:49:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           numptyphysics
 Version:        0.3
-Release:        0.2.20080925svn%{?dist}
+Release:        0.3.20080925svn%{?dist}
 Summary:        A crayon-drawing based physics puzzle game 
 
 Group:          Amusements/Games
@@ -10,6 +10,7 @@
 # tar czf numptyphysics.tar.gz numptyphysics --exclude .svn
 Source0:        numptyphysics.tar.gz
 Source1:        numptyphysics.desktop
+Source10:       numptyphysics-levels-2008-09-27.tar.gz
 Patch0:         numptyphysics-0.3-gcc43.patch
 Patch1:         numptyphysics-0.3-doublefree.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +51,9 @@
 install -pm 755 i686/Game $RPM_BUILD_ROOT%{_bindir}/numptyphysics
 install -pm 644 debian/numptyphysics64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/numptyphysics.png
 
+# Additional levels
+tar xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/numptyphysics
+
 # Icon
 desktop-file-install --vendor=fedora %{SOURCE1} \
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications
@@ -68,6 +72,9 @@
 
 
 %changelog
+* Tue Sep 30 2008 Lubomir Rintel <lkundrak at v3.sk> 0.3-0.4.20080925svn
+- Add more levels
+
 * Mon Sep 29 2008 Lubomir Rintel <lkundrak at v3.sk> 0.3-0.2.20080925svn
 - Review, small tidy-ups
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/numptyphysics/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2008 07:46:43 -0000	1.2
+++ sources	30 Sep 2008 07:49:30 -0000	1.3
@@ -1 +1,2 @@
 168d11194b355f75857a135258445035  numptyphysics.tar.gz
+ba58d3affbbd83d091245c8a24bf4b31  numptyphysics-levels-2008-09-27.tar.gz



From caolanm at fedoraproject.org  Tue Sep 30 07:51:38 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 30 Sep 2008 07:51:38 +0000 (UTC)
Subject: rpms/hunspell-ca/devel .cvsignore, 1.6, 1.7 hunspell-ca.spec, 1.7, 
	1.8 sources, 1.6, 1.7
Message-ID: <20080930075138.AD4F370119@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6770

Modified Files:
	.cvsignore hunspell-ca.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Sep 2008 13:22:41 -0000	1.6
+++ .cvsignore	30 Sep 2008 07:51:08 -0000	1.7
@@ -1 +1 @@
-hunspell-ca-20080915.tar.bz2
+hunspell-ca-20080918.tar.bz2


Index: hunspell-ca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/hunspell-ca.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hunspell-ca.spec	15 Sep 2008 13:22:41 -0000	1.7
+++ hunspell-ca.spec	30 Sep 2008 07:51:08 -0000	1.8
@@ -1,6 +1,6 @@
 Name: hunspell-ca
 Summary: Catalan hunspell dictionaries
-%define upstreamid 20080915
+%define upstreamid 20080918
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 #svn checkout svn://softcatala.org/corrector/trunk/resultats/hunspell
@@ -43,6 +43,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Tue Sep 30 2008 Caolan McNamara <caolanm at redhat.com> - 0.20080918-1
+- latest version
+
 * Mon Sep 15 2008 Caolan McNamara <caolanm at redhat.com> - 0.20080915-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Sep 2008 13:22:41 -0000	1.6
+++ sources	30 Sep 2008 07:51:08 -0000	1.7
@@ -1 +1 @@
-b25d9bbfdcd2a03a53bb5dd6e454e44d  hunspell-ca-20080915.tar.bz2
+be0c3fdb129a81d34c5a18f9960031f9  hunspell-ca-20080918.tar.bz2



From lkundrak at fedoraproject.org  Tue Sep 30 07:52:03 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 30 Sep 2008 07:52:03 +0000 (UTC)
Subject: rpms/numptyphysics/EL-5 import.log, NONE,
	1.1 numptyphysics-0.3-doublefree.patch, NONE,
	1.1 numptyphysics-0.3-gcc43.patch, NONE,
	1.1 numptyphysics.desktop, NONE, 1.1 numptyphysics.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930075203.A815E70119@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/numptyphysics/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6991/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log numptyphysics-0.3-doublefree.patch 
	numptyphysics-0.3-gcc43.patch numptyphysics.desktop 
	numptyphysics.spec 
Log Message:
Import from devel


--- NEW FILE import.log ---
numptyphysics-0_3-0_3_20080925svn_el5:EL-5:numptyphysics-0.3-0.3.20080925svn.el5.src.rpm:1222761070

numptyphysics-0.3-doublefree.patch:

--- NEW FILE numptyphysics-0.3-doublefree.patch ---
Fix a double-free on exit.

Lubomir Rintel <lkundrak at v3.sk>

--- numptyphysics/Game.cpp.doublefree	2008-09-27 15:01:43.000000000 +0200
+++ numptyphysics/Game.cpp	2008-09-27 15:01:04.000000000 +0200
@@ -661,10 +661,13 @@
       m_strokes.erase(0);
     }
     if ( m_world ) {
+// Haven't seen a leftover body ever, and this causes a doble free()
+#if 0
       while ( m_world->GetBodyList() ) {
 	printf("body left over %p\n",m_world->GetBodyList());
 	m_world->DestroyBody( m_world->GetBodyList() );	       
       }
+#endif
       //step is required to actually destroy bodies and joints
       m_world->Step( ITERATION_TIMESTEPf, SOLVER_ITERATIONS );
     }

numptyphysics-0.3-gcc43.patch:

--- NEW FILE numptyphysics-0.3-gcc43.patch ---
Fix build of Box2D with gcc4.3.
Still applies against current Box2D upstream.

Lubomir Rintel <lkundrak at v3.sk>

diff -urp numptyphysics/Box2D/Source/Collision/b2BroadPhase.cpp numptyphysics/Box2D/Source/Collision/b2BroadPhase.cpp
--- numptyphysics.orig/Box2D/Source/Collision/b2BroadPhase.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Collision/b2BroadPhase.cpp	2008-09-25 16:16:39.000000000 +0200
@@ -18,6 +18,7 @@
 
 #include "b2BroadPhase.h"
 #include <algorithm>
+#include <cstring>
 
 // Notes:
 // - we use bound arrays instead of linked lists for cache coherence.
diff -urp numptyphysics/Box2D/Source/Common/b2BlockAllocator.cpp numptyphysics/Box2D/Source/Common/b2BlockAllocator.cpp
--- numptyphysics.orig/Box2D/Source/Common/b2BlockAllocator.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Common/b2BlockAllocator.cpp	2008-09-25 16:17:46.000000000 +0200
@@ -20,6 +20,7 @@
 #include <cstdlib>
 #include <memory>
 #include <climits>
+#include <cstring>
 
 int32 b2BlockAllocator::s_blockSizes[b2_blockSizes] = 
 {
diff -urp numptyphysics/Box2D/Source/Dynamics/Contacts/b2CircleContact.cpp numptyphysics/Box2D/Source/Dynamics/Contacts/b2CircleContact.cpp
--- numptyphysics.orig/Box2D/Source/Dynamics/Contacts/b2CircleContact.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Dynamics/Contacts/b2CircleContact.cpp	2008-09-25 16:17:57.000000000 +0200
@@ -22,6 +22,7 @@
 #include "../../Common/b2BlockAllocator.h"
 
 #include <new>
+#include <cstring>
 
 b2Contact* b2CircleContact::Create(b2Shape* shape1, b2Shape* shape2, b2BlockAllocator* allocator)
 {
diff -urp numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp
--- numptyphysics.orig/Box2D/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp	2008-09-25 16:17:48.000000000 +0200
@@ -22,6 +22,7 @@
 #include "../../Common/b2BlockAllocator.h"
 
 #include <new>
+#include <cstring>
 
 b2Contact* b2PolyAndCircleContact::Create(b2Shape* shape1, b2Shape* shape2, b2BlockAllocator* allocator)
 {
diff -urp numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp
--- numptyphysics.orig/Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp	2008-09-25 16:17:49.000000000 +0200
@@ -23,6 +23,7 @@
 
 #include <memory>
 #include <new>
+#include <cstring>
 
 b2Contact* b2PolygonContact::Create(b2Shape* shape1, b2Shape* shape2, b2BlockAllocator* allocator)
 {
diff -urp numptyphysics/Http.cpp numptyphysics/Http.cpp
--- numptyphysics.orig/Http.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Http.cpp	2008-09-25 16:13:39.000000000 +0200
@@ -14,6 +14,7 @@
  *
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
diff -urp numptyphysics/Levels.cpp numptyphysics/Levels.cpp
--- numptyphysics.orig/Levels.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Levels.cpp	2008-09-25 16:13:39.000000000 +0200
@@ -15,6 +15,7 @@
  */
 
 
+#include <string.h>
 #include <sys/types.h>
 #include <dirent.h>
 
diff -urp numptyphysics/Path.cpp numptyphysics/Path.cpp
--- numptyphysics.orig/Path.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Path.cpp	2008-09-25 16:13:39.000000000 +0200
@@ -15,6 +15,7 @@
  */
 
 
+#include <string.h>
 #include "Path.h"
 
 


--- NEW FILE numptyphysics.desktop ---
[Desktop Entry]
Type=Application
Name=Numpty Physics
Exec=numptyphysics
Icon=numptyphysics
Categories=Game;LogicGame;KidsGame;Simulation;
Terminal=false


--- NEW FILE numptyphysics.spec ---
Name:           numptyphysics
Version:        0.3
Release:        0.3.20080925svn%{?dist}
Summary:        A crayon-drawing based physics puzzle game 

Group:          Amusements/Games
License:        GPLv3+
URL:            http://numptyphysics.garage.maemo.org/
# svn co -r81 https://garage.maemo.org/svn/numptyphysics/trunk numptyphysics
# tar czf numptyphysics.tar.gz numptyphysics --exclude .svn
Source0:        numptyphysics.tar.gz
Source1:        numptyphysics.desktop
Source10:       numptyphysics-levels-2008-09-27.tar.gz
Patch0:         numptyphysics-0.3-gcc43.patch
Patch1:         numptyphysics-0.3-doublefree.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  SDL_image-devel
BuildRequires:  desktop-file-utils

%description
Harness gravity with your crayon and set about creating blocks, ramps,
levers, pulleys and whatever else you fancy to get the little red thing to
the little yellow thing.


%prep
%setup -q -n %{name}
%patch0 -p1 -b .gcc43
%patch1 -p1 -b .doublefree


%build
# Note the ARCH variable doesn't denote real arch. It's just used to hit a
# conditional that we're not compiling with mingw
make %{?_smp_mflags}    \
        ARCH=i686       \
        CCOPTS="%{optflags} -IBox2D/Include"


%install
rm -rf $RPM_BUILD_ROOT

# Directory structure
install -d $RPM_BUILD_ROOT%{_datadir}/numptyphysics
install -d $RPM_BUILD_ROOT%{_bindir}
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps

# Files
install -pm 644 *.png *.nph *.jpg $RPM_BUILD_ROOT%{_datadir}/numptyphysics
install -pm 755 i686/Game $RPM_BUILD_ROOT%{_bindir}/numptyphysics
install -pm 644 debian/numptyphysics64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/numptyphysics.png

# Additional levels
tar xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/numptyphysics

# Icon
desktop-file-install --vendor=fedora %{SOURCE1} \
        --dir=$RPM_BUILD_ROOT%{_datadir}/applications


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/numptyphysics
%{_datadir}/numptyphysics
%{_datadir}/pixmaps/numptyphysics.png
%{_datadir}/applications/fedora-numptyphysics.desktop


%changelog
* Tue Sep 30 2008 Lubomir Rintel <lkundrak at v3.sk> 0.3-0.4.20080925svn
- Add more levels

* Mon Sep 29 2008 Lubomir Rintel <lkundrak at v3.sk> 0.3-0.2.20080925svn
- Review, small tidy-ups

* Thu Sep 25 2008 Lubomir Rintel <lkundrak at v3.sk> 0.3-0.1.20080925svn
- Initial packaging attempt


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/numptyphysics/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 04:31:03 -0000	1.1
+++ .cvsignore	30 Sep 2008 07:51:33 -0000	1.2
@@ -0,0 +1,2 @@
+numptyphysics-levels-2008-09-27.tar.gz
+numptyphysics.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/numptyphysics/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 04:31:03 -0000	1.1
+++ sources	30 Sep 2008 07:51:33 -0000	1.2
@@ -0,0 +1,2 @@
+ba58d3affbbd83d091245c8a24bf4b31  numptyphysics-levels-2008-09-27.tar.gz
+168d11194b355f75857a135258445035  numptyphysics.tar.gz



From lkundrak at fedoraproject.org  Tue Sep 30 07:52:16 2008
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 30 Sep 2008 07:52:16 +0000 (UTC)
Subject: rpms/numptyphysics/F-9 import.log, NONE,
	1.1 numptyphysics-0.3-doublefree.patch, NONE,
	1.1 numptyphysics-0.3-gcc43.patch, NONE,
	1.1 numptyphysics.desktop, NONE, 1.1 numptyphysics.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930075216.0087D70119@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/numptyphysics/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7085/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log numptyphysics-0.3-doublefree.patch 
	numptyphysics-0.3-gcc43.patch numptyphysics.desktop 
	numptyphysics.spec 
Log Message:
Import from devel


--- NEW FILE import.log ---
numptyphysics-0_3-0_3_20080925svn_el5:F-9:numptyphysics-0.3-0.3.20080925svn.el5.src.rpm:1222761086

numptyphysics-0.3-doublefree.patch:

--- NEW FILE numptyphysics-0.3-doublefree.patch ---
Fix a double-free on exit.

Lubomir Rintel <lkundrak at v3.sk>

--- numptyphysics/Game.cpp.doublefree	2008-09-27 15:01:43.000000000 +0200
+++ numptyphysics/Game.cpp	2008-09-27 15:01:04.000000000 +0200
@@ -661,10 +661,13 @@
       m_strokes.erase(0);
     }
     if ( m_world ) {
+// Haven't seen a leftover body ever, and this causes a doble free()
+#if 0
       while ( m_world->GetBodyList() ) {
 	printf("body left over %p\n",m_world->GetBodyList());
 	m_world->DestroyBody( m_world->GetBodyList() );	       
       }
+#endif
       //step is required to actually destroy bodies and joints
       m_world->Step( ITERATION_TIMESTEPf, SOLVER_ITERATIONS );
     }

numptyphysics-0.3-gcc43.patch:

--- NEW FILE numptyphysics-0.3-gcc43.patch ---
Fix build of Box2D with gcc4.3.
Still applies against current Box2D upstream.

Lubomir Rintel <lkundrak at v3.sk>

diff -urp numptyphysics/Box2D/Source/Collision/b2BroadPhase.cpp numptyphysics/Box2D/Source/Collision/b2BroadPhase.cpp
--- numptyphysics.orig/Box2D/Source/Collision/b2BroadPhase.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Collision/b2BroadPhase.cpp	2008-09-25 16:16:39.000000000 +0200
@@ -18,6 +18,7 @@
 
 #include "b2BroadPhase.h"
 #include <algorithm>
+#include <cstring>
 
 // Notes:
 // - we use bound arrays instead of linked lists for cache coherence.
diff -urp numptyphysics/Box2D/Source/Common/b2BlockAllocator.cpp numptyphysics/Box2D/Source/Common/b2BlockAllocator.cpp
--- numptyphysics.orig/Box2D/Source/Common/b2BlockAllocator.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Common/b2BlockAllocator.cpp	2008-09-25 16:17:46.000000000 +0200
@@ -20,6 +20,7 @@
 #include <cstdlib>
 #include <memory>
 #include <climits>
+#include <cstring>
 
 int32 b2BlockAllocator::s_blockSizes[b2_blockSizes] = 
 {
diff -urp numptyphysics/Box2D/Source/Dynamics/Contacts/b2CircleContact.cpp numptyphysics/Box2D/Source/Dynamics/Contacts/b2CircleContact.cpp
--- numptyphysics.orig/Box2D/Source/Dynamics/Contacts/b2CircleContact.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Dynamics/Contacts/b2CircleContact.cpp	2008-09-25 16:17:57.000000000 +0200
@@ -22,6 +22,7 @@
 #include "../../Common/b2BlockAllocator.h"
 
 #include <new>
+#include <cstring>
 
 b2Contact* b2CircleContact::Create(b2Shape* shape1, b2Shape* shape2, b2BlockAllocator* allocator)
 {
diff -urp numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp
--- numptyphysics.orig/Box2D/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp	2008-09-25 16:17:48.000000000 +0200
@@ -22,6 +22,7 @@
 #include "../../Common/b2BlockAllocator.h"
 
 #include <new>
+#include <cstring>
 
 b2Contact* b2PolyAndCircleContact::Create(b2Shape* shape1, b2Shape* shape2, b2BlockAllocator* allocator)
 {
diff -urp numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp
--- numptyphysics.orig/Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp	2008-09-25 16:17:49.000000000 +0200
@@ -23,6 +23,7 @@
 
 #include <memory>
 #include <new>
+#include <cstring>
 
 b2Contact* b2PolygonContact::Create(b2Shape* shape1, b2Shape* shape2, b2BlockAllocator* allocator)
 {
diff -urp numptyphysics/Http.cpp numptyphysics/Http.cpp
--- numptyphysics.orig/Http.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Http.cpp	2008-09-25 16:13:39.000000000 +0200
@@ -14,6 +14,7 @@
  *
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
diff -urp numptyphysics/Levels.cpp numptyphysics/Levels.cpp
--- numptyphysics.orig/Levels.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Levels.cpp	2008-09-25 16:13:39.000000000 +0200
@@ -15,6 +15,7 @@
  */
 
 
+#include <string.h>
 #include <sys/types.h>
 #include <dirent.h>
 
diff -urp numptyphysics/Path.cpp numptyphysics/Path.cpp
--- numptyphysics.orig/Path.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Path.cpp	2008-09-25 16:13:39.000000000 +0200
@@ -15,6 +15,7 @@
  */
 
 
+#include <string.h>
 #include "Path.h"
 
 


--- NEW FILE numptyphysics.desktop ---
[Desktop Entry]
Type=Application
Name=Numpty Physics
Exec=numptyphysics
Icon=numptyphysics
Categories=Game;LogicGame;KidsGame;Simulation;
Terminal=false


--- NEW FILE numptyphysics.spec ---
Name:           numptyphysics
Version:        0.3
Release:        0.3.20080925svn%{?dist}
Summary:        A crayon-drawing based physics puzzle game 

Group:          Amusements/Games
License:        GPLv3+
URL:            http://numptyphysics.garage.maemo.org/
# svn co -r81 https://garage.maemo.org/svn/numptyphysics/trunk numptyphysics
# tar czf numptyphysics.tar.gz numptyphysics --exclude .svn
Source0:        numptyphysics.tar.gz
Source1:        numptyphysics.desktop
Source10:       numptyphysics-levels-2008-09-27.tar.gz
Patch0:         numptyphysics-0.3-gcc43.patch
Patch1:         numptyphysics-0.3-doublefree.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  SDL_image-devel
BuildRequires:  desktop-file-utils

%description
Harness gravity with your crayon and set about creating blocks, ramps,
levers, pulleys and whatever else you fancy to get the little red thing to
the little yellow thing.


%prep
%setup -q -n %{name}
%patch0 -p1 -b .gcc43
%patch1 -p1 -b .doublefree


%build
# Note the ARCH variable doesn't denote real arch. It's just used to hit a
# conditional that we're not compiling with mingw
make %{?_smp_mflags}    \
        ARCH=i686       \
        CCOPTS="%{optflags} -IBox2D/Include"


%install
rm -rf $RPM_BUILD_ROOT

# Directory structure
install -d $RPM_BUILD_ROOT%{_datadir}/numptyphysics
install -d $RPM_BUILD_ROOT%{_bindir}
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps

# Files
install -pm 644 *.png *.nph *.jpg $RPM_BUILD_ROOT%{_datadir}/numptyphysics
install -pm 755 i686/Game $RPM_BUILD_ROOT%{_bindir}/numptyphysics
install -pm 644 debian/numptyphysics64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/numptyphysics.png

# Additional levels
tar xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/numptyphysics

# Icon
desktop-file-install --vendor=fedora %{SOURCE1} \
        --dir=$RPM_BUILD_ROOT%{_datadir}/applications


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/numptyphysics
%{_datadir}/numptyphysics
%{_datadir}/pixmaps/numptyphysics.png
%{_datadir}/applications/fedora-numptyphysics.desktop


%changelog
* Tue Sep 30 2008 Lubomir Rintel <lkundrak at v3.sk> 0.3-0.4.20080925svn
- Add more levels

* Mon Sep 29 2008 Lubomir Rintel <lkundrak at v3.sk> 0.3-0.2.20080925svn
- Review, small tidy-ups

* Thu Sep 25 2008 Lubomir Rintel <lkundrak at v3.sk> 0.3-0.1.20080925svn
- Initial packaging attempt


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/numptyphysics/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 04:31:03 -0000	1.1
+++ .cvsignore	30 Sep 2008 07:51:45 -0000	1.2
@@ -0,0 +1,2 @@
+numptyphysics-levels-2008-09-27.tar.gz
+numptyphysics.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/numptyphysics/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 04:31:03 -0000	1.1
+++ sources	30 Sep 2008 07:51:45 -0000	1.2
@@ -0,0 +1,2 @@
+ba58d3affbbd83d091245c8a24bf4b31  numptyphysics-levels-2008-09-27.tar.gz
+168d11194b355f75857a135258445035  numptyphysics.tar.gz



From stransky at fedoraproject.org  Tue Sep 30 08:09:28 2008
From: stransky at fedoraproject.org (Martin Stransky)
Date: Tue, 30 Sep 2008 08:09:28 +0000 (UTC)
Subject: rpms/nspluginwrapper/devel nspluginwrapper.spec,1.55,1.56
Message-ID: <20080930080928.5EE6A70119@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9987

Modified Files:
	nspluginwrapper.spec 
Log Message:
fixed a typo


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- nspluginwrapper.spec	30 Sep 2008 08:02:19 -0000	1.55
+++ nspluginwrapper.spec	30 Sep 2008 08:08:58 -0000	1.56
@@ -110,7 +110,7 @@
 %patch3 -p1 -b .fork
 %patch4 -p1 -b .shutdown
 %patch5 -p1 -b .sleep
-%patch6 -p1 -b .visual_id
+%patch6 -p0 -b .visual_id
 
 pushd %plugin_config_name
 %patch100 -p2



From stransky at fedoraproject.org  Tue Sep 30 08:11:39 2008
From: stransky at fedoraproject.org (Martin Stransky)
Date: Tue, 30 Sep 2008 08:11:39 +0000 (UTC)
Subject: rpms/nspluginwrapper/devel nspluginwrapper.spec,1.56,1.57
Message-ID: <20080930081139.2A90B70119@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10343

Modified Files:
	nspluginwrapper.spec 
Log Message:
fixed a typo


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- nspluginwrapper.spec	30 Sep 2008 08:08:58 -0000	1.56
+++ nspluginwrapper.spec	30 Sep 2008 08:11:08 -0000	1.57
@@ -70,7 +70,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	1.1.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -241,7 +241,7 @@
 %config %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
-* Tue Sep 30 2008 Martin Stransky <stransky at redhat.com> 1.1.0-8
+* Tue Sep 30 2008 Martin Stransky <stransky at redhat.com> 1.1.0-9
 - Updated fix for #456432 -(Windowless Crash) Flash 10 w/ Firefox 3
 
 * Wed Sep 17 2008 Martin Stransky <stransky at redhat.com> 1.1.0-7



From stransky at fedoraproject.org  Tue Sep 30 08:02:49 2008
From: stransky at fedoraproject.org (Martin Stransky)
Date: Tue, 30 Sep 2008 08:02:49 +0000 (UTC)
Subject: rpms/nspluginwrapper/devel nspluginwrapper-1.1.0-visual-id.patch,
	1.1, 1.2 nspluginwrapper.spec, 1.54, 1.55
Message-ID: <20080930080249.8EA2770119@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8992

Modified Files:
	nspluginwrapper-1.1.0-visual-id.patch nspluginwrapper.spec 
Log Message:
Updated fix for #456432 -(Windowless Crash) Flash 10 w/ Firefox 3

nspluginwrapper-1.1.0-visual-id.patch:

Index: nspluginwrapper-1.1.0-visual-id.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper-1.1.0-visual-id.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nspluginwrapper-1.1.0-visual-id.patch	4 Aug 2008 07:56:20 -0000	1.1
+++ nspluginwrapper-1.1.0-visual-id.patch	30 Sep 2008 08:02:19 -0000	1.2
@@ -1,13 +1,37 @@
-diff -up nspluginwrapper-1.1.0/src/npw-rpc.c.old nspluginwrapper-1.1.0/src/npw-rpc.c
---- nspluginwrapper-1.1.0/src/npw-rpc.c.old	2008-07-06 17:33:14.000000000 +0200
-+++ nspluginwrapper-1.1.0/src/npw-rpc.c	2008-08-01 20:45:33.000000000 +0200
-@@ -381,7 +381,8 @@ static int do_send_NPSetWindowCallbackSt
+2008-09-30  Gwenole Beauchesne  <gb.public at free.fr>
+
+	* src/npw-rpc (do_send_NPSetWindowCallbackStruct): Check for
+	NULL visual.
+	* src/npw-viewer.c (create_window_attributes): Get system
+	visual when we are passed a 0 visual ID.
+
+Index: src/npw-viewer.c
+===================================================================
+--- src/npw-viewer.c	(revision 645)
++++ src/npw-viewer.c	(revision 646)
+@@ -358,7 +358,11 @@
+ {
+   if (ws_info == NULL)
+ 	return -1;
+-  GdkVisual *gdk_visual = gdkx_visual_get((uintptr_t)ws_info->visual);
++  GdkVisual *gdk_visual;
++  if (ws_info->visual)
++	gdk_visual = gdkx_visual_get((uintptr_t)ws_info->visual);
++  else
++	gdk_visual = gdk_visual_get_system();
+   if (gdk_visual == NULL) {
+ 	npw_printf("ERROR: could not reconstruct XVisual from visualID\n");
+ 	return -2;
+Index: src/npw-rpc.c
+===================================================================
+--- src/npw-rpc.c	(revision 645)
++++ src/npw-rpc.c	(revision 646)
+@@ -381,7 +381,7 @@
  	  return error;
  	if ((error = rpc_message_send_int32(message, ws_info->type)) < 0)
  	  return error;
 -	if ((error = rpc_message_send_uint32(message, XVisualIDFromVisual(ws_info->visual))) < 0)
-+	uint32_t visual_id = ws_info->visual != NULL ? XVisualIDFromVisual(ws_info->visual) : 0;
-+	if ((error = rpc_message_send_uint32(message, visual_id)) < 0)
++	if ((error = rpc_message_send_uint32(message, ws_info->visual ? XVisualIDFromVisual(ws_info->visual) : 0)) < 0)
  	  return error;
  	if ((error = rpc_message_send_uint32(message, ws_info->colormap)) < 0)
  	  return error;


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- nspluginwrapper.spec	17 Sep 2008 07:56:36 -0000	1.54
+++ nspluginwrapper.spec	30 Sep 2008 08:02:19 -0000	1.55
@@ -70,7 +70,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	1.1.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -241,6 +241,9 @@
 %config %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Tue Sep 30 2008 Martin Stransky <stransky at redhat.com> 1.1.0-8
+- Updated fix for #456432 -(Windowless Crash) Flash 10 w/ Firefox 3
+
 * Wed Sep 17 2008 Martin Stransky <stransky at redhat.com> 1.1.0-7
 - Added libcurl to requires (#460988)
 



From jwrdegoede at fedoraproject.org  Tue Sep 30 08:14:27 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 30 Sep 2008 08:14:27 +0000 (UTC)
Subject: rpms/blobAndConquer/devel blobAndConquer-1.0-defines.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 blobAndConquer.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <20080930081427.4127870119@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/blobAndConquer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10825

Modified Files:
	.cvsignore blobAndConquer.spec sources 
Added Files:
	blobAndConquer-1.0-defines.patch 
Log Message:
* Tue Sep 30 2008 Hans de Goede <hdegoede at redhat.com> 1.0-1
- New upstream release 1.0


blobAndConquer-1.0-defines.patch:

--- NEW FILE blobAndConquer-1.0-defines.patch ---
diff -up blobAndConquer-1.0/data/gameDefs/defines.h~ blobAndConquer-1.0/data/gameDefs/defines.h
--- blobAndConquer-1.0/data/gameDefs/defines.h~	2008-09-28 20:10:53.000000000 +0200
+++ blobAndConquer-1.0/data/gameDefs/defines.h	2008-09-28 20:10:53.000000000 +0200
@@ -377,7 +377,7 @@ enum {
 	SND_GALDOV_CHARGE,
 	SND_GALDOV_FIRE,
 	SND_PLANT_BOMB,
-	SND_POP
+        SND_POP
 };
 
 /* ############### weapons ############ */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	17 Sep 2008 12:44:05 -0000	1.11
+++ .cvsignore	30 Sep 2008 08:13:56 -0000	1.12
@@ -1,2 +1,2 @@
-blobAndConquer-0.98.tar.gz
-blobAndConquer-0.98-music.tar.bz2
+blobAndConquer-1.0.tar.gz
+blobAndConquer-1.0-music.tar.bz2


Index: blobAndConquer.spec
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/devel/blobAndConquer.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- blobAndConquer.spec	17 Sep 2008 12:44:05 -0000	1.18
+++ blobAndConquer.spec	30 Sep 2008 08:13:56 -0000	1.19
@@ -6,8 +6,8 @@
 %define upstream_release 1
 
 Name:           blobAndConquer
-Version:        0.98
-Release:        2%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        Blob Wars 2: Blob And Conquer
 Group:          Amusements/Games
 License:        GPLv2+ and Redistributable, no modification permitted
@@ -16,6 +16,7 @@
 #Tarball without nonfree sound file
 Source0:        %{name}-%{version}.tar.gz
 Source1:        %{name}-%{version}-music.tar.bz2
+Patch0:         %{name}-1.0-defines.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  SDL_image-devel SDL_mixer-devel SDL_ttf-devel zlib-devel
 BuildRequires:  desktop-file-utils
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q -a 1
+%patch0 -p1
 # some cleanup
 chmod -x gfx/rw2/*.raw data/gameDefs/defines.h `find src -type f`
 sed -i 's/\r//g' data/gameDefs/defines.h `find src -type f`
@@ -41,7 +43,6 @@
   icons/blobAndConquer.desktop
 sed -i 's/-o root -g games//g' makefile
 
-cp -p *.{xm,s3m,mod} music/
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" DOCDIR=%{_docdir}/%{name}-%{version}/ \
@@ -93,8 +94,12 @@
 
 
 %changelog
+* Tue Sep 30 2008 Hans de Goede <hdegoede at redhat.com> 1.0-1
+- New upstream release 1.0
+
 * Wed Sep 17 2008 Rafa?? Psota <rafalzaq at gmail.com> 0.98-2
 - Remove nonfree sound files
+
 * Wed Jul  9 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.98-1
 - New upstream release 0.98
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Sep 2008 12:44:05 -0000	1.11
+++ sources	30 Sep 2008 08:13:56 -0000	1.12
@@ -1,2 +1,2 @@
-71a3726c15f0c5f9ed2c6910ef5a721e  blobAndConquer-0.98.tar.gz
-121f85f5a039d2a3fd1d6d3262c5137a  blobAndConquer-0.98-music.tar.bz2
+4e627e84e0c0f5da7599ddf5596f1404  blobAndConquer-1.0.tar.gz
+855639ce503f8e37338ce25b3b641931  blobAndConquer-1.0-music.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep 30 08:23:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 08:23:11 +0000
Subject: [pkgdb] blobAndConquer ownership updated
Message-ID: <20080930082311.CC4212084BA@bastion.fedora.phx.redhat.com>

Package blobAndConquer in Fedora devel was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blobAndConquer



From pkgdb at fedoraproject.org  Tue Sep 30 08:23:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 08:23:15 +0000
Subject: [pkgdb] blobAndConquer ownership updated
Message-ID: <20080930082315.5749F2084BF@bastion.fedora.phx.redhat.com>

Package blobAndConquer in Fedora 7 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blobAndConquer



From pkgdb at fedoraproject.org  Tue Sep 30 08:23:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 08:23:13 +0000
Subject: [pkgdb] blobAndConquer ownership updated
Message-ID: <20080930082313.CEEA22084BD@bastion.fedora.phx.redhat.com>

Package blobAndConquer in Fedora 6 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blobAndConquer



From pkgdb at fedoraproject.org  Tue Sep 30 08:23:16 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 08:23:16 +0000
Subject: [pkgdb] blobAndConquer ownership updated
Message-ID: <20080930082316.775792084C1@bastion.fedora.phx.redhat.com>

Package blobAndConquer in Fedora 8 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blobAndConquer



From pkgdb at fedoraproject.org  Tue Sep 30 08:23:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 08:23:18 +0000
Subject: [pkgdb] blobAndConquer ownership updated
Message-ID: <20080930082318.531D9208D61@bastion.fedora.phx.redhat.com>

Package blobAndConquer in Fedora 9 was orphaned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blobAndConquer



From caolanm at fedoraproject.org  Tue Sep 30 08:23:30 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 30 Sep 2008 08:23:30 +0000 (UTC)
Subject: rpms/hunspell-uk/devel .cvsignore, 1.2, 1.3 hunspell-uk.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20080930082330.3236970119@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-uk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11884

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Sep 2008 21:42:44 -0000	1.2
+++ .cvsignore	30 Sep 2008 08:22:59 -0000	1.3
@@ -1 +1 @@
-myspell-uk_UA-1.5.0.zip
+myspell-uk_UA-1.5.5.zip


Index: hunspell-uk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-uk/devel/hunspell-uk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hunspell-uk.spec	17 Sep 2008 21:42:45 -0000	1.1
+++ hunspell-uk.spec	30 Sep 2008 08:22:59 -0000	1.2
@@ -1,7 +1,7 @@
 Name: hunspell-uk
 Summary: Ukrainian hunspell dictionaries
-Version: 1.5.0
-Release: 2%{?dist}
+Version: 1.5.5
+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 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Tue Sep 30 2008 Caolan McNamara <caolanm at redhat.com> - 1.5.5-1
+- latest version
+
 * Tue Sep 16 2008 Caolan McNamara <caolanm at redhat.com> - 1.5.0-2
 - fixup extra Source lines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-uk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Sep 2008 21:42:45 -0000	1.2
+++ sources	30 Sep 2008 08:22:59 -0000	1.3
@@ -1 +1 @@
-948964c6544fb408ce8cd1c55ba3f92b  myspell-uk_UA-1.5.0.zip
+8ae61c7a5d19ee86bf773ea4d74e7f89  myspell-uk_UA-1.5.5.zip



From rhughes at fedoraproject.org  Tue Sep 30 08:47:26 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 30 Sep 2008 08:47:26 +0000 (UTC)
Subject: rpms/PackageKit/devel PackageKit.spec,1.62,1.63
Message-ID: <20080930084726.81B3E70119@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14064

Modified Files:
	PackageKit.spec 
Log Message:
* Tue Sep 30 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.5-2
- Obsolete more releases of codeina to fix upgrades on rawhide.



Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- PackageKit.spec	29 Sep 2008 15:33:18 -0000	1.62
+++ PackageKit.spec	30 Sep 2008 08:46:56 -0000	1.63
@@ -8,7 +8,7 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.5
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -146,8 +146,8 @@
 Group: Development/Libraries
 Requires: gstreamer
 Requires: PackageKit-libs = %{version}-%{release}
-Obsoletes: codeina < 0.10.1-8
-Provides:  codeina = 0.10.1-8
+Obsoletes: codeina < 0.10.1
+Provides:  codeina = 0.10.1
 
 %description gstreamer-plugin
 The PackageKit GStreamer plugin allows any Gstreamer application to install
@@ -296,6 +296,9 @@
 %{_includedir}/*
 
 %changelog
+* Tue Sep 30 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.5-2
+- Obsolete more releases of codeina to fix upgrades on rawhide.
+
 * Mon Sep 29 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.5-1
 - New upstream version
 - Add a helper which can be used by GStreamer to install codecs.



From hadess at fedoraproject.org  Tue Sep 30 09:16:24 2008
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 30 Sep 2008 09:16:24 +0000 (UTC)
Subject: rpms/bluez-gnome/devel .cvsignore, 1.27, 1.28 bluez-gnome.spec, 1.61,
	1.62 sources, 1.27, 1.28
Message-ID: <20080930091624.8E11470119@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17560

Modified Files:
	.cvsignore bluez-gnome.spec sources 
Log Message:
* Tue Sep 30 2008 - Bastien Nocera <bnocera at redhat.com> - 1.7-1
- Update to 1.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	29 Sep 2008 12:17:28 -0000	1.27
+++ .cvsignore	30 Sep 2008 09:15:54 -0000	1.28
@@ -1 +1 @@
-bluez-gnome-1.6.tar.gz
+bluez-gnome-1.7.tar.gz


Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- bluez-gnome.spec	29 Sep 2008 12:17:28 -0000	1.61
+++ bluez-gnome.spec	30 Sep 2008 09:15:54 -0000	1.62
@@ -1,5 +1,5 @@
 Name:		bluez-gnome
-Version:	1.6
+Version:	1.7
 Release:	1%{?dist}
 Summary:	Bluetooth pairing and control applet
 
@@ -141,6 +141,9 @@
 %{_mandir}/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Tue Sep 30 2008 - Bastien Nocera <bnocera at redhat.com> - 1.7-1
+- Update to 1.7
+
 * Mon Sep 29 2008 - Bastien Nocera <bnocera at redhat.com> - 1.6-1
 - Update to 1.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	29 Sep 2008 12:17:28 -0000	1.27
+++ sources	30 Sep 2008 09:15:54 -0000	1.28
@@ -1 +1 @@
-9c1d0be77152f2cffe1a2df94fb407b6  bluez-gnome-1.6.tar.gz
+85321cff1d2f344b2d0491cd26f50c14  bluez-gnome-1.7.tar.gz



From hubbitus at fedoraproject.org  Tue Sep 30 09:33:22 2008
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Tue, 30 Sep 2008 09:33:22 +0000 (UTC)
Subject: rpms/sim/devel import.log, NONE, 1.1 sim.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930093322.83C8870119@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/sim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19863/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sim.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
sim-0_9_5-0_6_20080923svn2261rev:HEAD:sim-0.9.5-0.6.20080923svn2261rev.src.rpm:1222767069


--- NEW FILE sim.spec ---
%define with_kde 1
%define SVNdate 20080923
%define SVNrev 2261

Name: 		sim
Version: 		0.9.5
Release:		0.6.%{SVNdate}svn%{SVNrev}rev
#svn checkout -r %{SVNrev} svn://svn.berlios.de/sim-im/trunk
Source0:		%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.bz2
Distribution:	Fedora
Summary:		SIM - Multiprotocol Instant Messenger
Summary(de):	SIM - Multiprotokoll Instant Messenger
Summary(ru):	SIM - ???????????????????????????????????? ????????????????????
License:		GPLv2+
Group:		Applications/Internet
URL:			http://sim-im.berlios.de/
BuildRequires:	autoconf >= 2.52, automake >= 1.5
BuildRequires:	gcc, gcc-c++, zlib-devel, libjpeg-devel, expat-devel, flex, libart_lgpl-devel, libpng-devel, gettext, libXScrnSaver-devel
%if %{with_kde}
%if %{fedora} == 8
BuildRequires:		kdebase >= 3.0.0, kdelibs-devel >= 3.0.0
%else #Fedora gt 8. Lt is not supported
BuildRequires:	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
Requires:		qt >= 3.0.0, openssl, arts >= 1.0
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
SIM - Multiprotocol Instant Messenger

SIM (Simple Instant Messenger) is a plugins-based open-
source instant messenger that supports various protocols
(ICQ, Jabber, AIM, MSN, LiveJournal, Yahoo!). It uses the 
QT library and works on X11 (with optional KDE support).

SIM has countless features, many of them are listed at:
http://sim-im.berlios.de/

%description -l de
SIM (Simple Instant Messenger) ist ein Plugin-basierender open-source
Instant Messenger, der verschiedene Protokolle (ICQ, Jabber, AIM, MSN,
LiveJournal, Yahoo!) unterst??tzt.  Daf??r wird die QT-Bibliothek und X11
(mit optionaler KDE- Unterst??tzung) verwendet.

SIM hat sehr unz??hlige Features, viele von diesen sind aufgelistet unter:
http://sim-im.berlios.de/


%description -l ru
SIM (Simple Instant Messenger) ?????? ???????????????????????? ???? ???????????????? ???????????????????? ??
???????????????? ???????????????? ??????????, ?????????????? ???????????????????????? ?????????????????? ?????????????????? ????????????
???????????????????????? ??????????????????????, ?????????? ??????: ICQ, Jabber, AIM, MSN, LiveJournal, Yahoo!
?????????????????????? ?????????????????? ???????????????????? ???? ???????????????????? QT (?????????????????????? ??????????????
?????????????????? KDE)

SIM ?????????? ???????? ????????????????????????, ?????????????????????? ???? ?????????????? ???????????????????????? ???? ??????????:
http://sim-im.org/


%prep
%setup -q -n trunk
make -f admin/Makefile.common
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" 


%build
%configure --disable-rpath \
%if %{with_kde}
	--enable-kde \
%else
	--disable-kde \
%endif
	$LOCALFLAGS

# Setup for parallel builds
numprocs=`egrep -c ^cpu[0-9]+ /proc/stat || :`
if [ "$numprocs" = "0" ]; then
  numprocs=1
fi

make -j $numprocs

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

#Rm symlink, which seems as development.
%{__rm} $RPM_BUILD_ROOT/%{_libdir}/libsim.so

desktop-file-install --vendor="fedora" \
	--add-category="Network" \
	--delete-original \
	--dir=$RPM_BUILD_ROOT/%{_datadir}/applications \
	$RPM_BUILD_ROOT/%{_datadir}/applications/kde/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT
rm -rf $RPM_BUILD_DIR/%{name}-%{version}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f %{name}.lang
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog README* TODO INSTALL
%{_bindir}/sim*
%{_libdir}/libsim*
%{_libdir}/sim/
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/apps/
%{_datadir}/icons/*/*/*/*
%{_datadir}/mimelnk/
%{_datadir}/services/

%changelog
* Sun Sep 28 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.6.20080923svn2261rev
- "make install-strip" replaced by "make install" for correct build *-debuginfo package (Marcela Maslanova)

* Wed Sep 24 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.5.20080923svn2261rev
- Fix two macro-in-%%changelog
- Fix release inconsistence.

* Tue Sep 23 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.4.20080923svn2261rev
- New revision 2261
- Add BR zip (thanks Marcela Maslanova)

* Tue Sep 9 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.3.20080904svn2258rev
- Change Release format to conform Fedora standard from "3.SVN20080904rev2258" to "0.3.20080904svn2258rev" (Patrice Dumas)

* Fri Sep 5 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-3.SVN20080904rev2258
- Add correct .desktop installation via desktop-file-install (Marcela Maslanova)
- Desktop file %%{_datadir}/applications/kde/sim.desktop renamed to %%{_datadir}/applications/fedora-%%{name}.desktop

* Thu Sep 4 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-2.SVN20080904rev2258
- Rm %%{_libdir}/libsim.so (Patrice Dumas)
- License changed to GPLv2+ according sources (Patrice Dumas thanks again)

* Thu Sep 4 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-1.SVN20080904rev2258
- Spec de-part converted into UTF-8
- Changed BR kdelibs to kdelibs-devel for Fedora8

* Thu Sep 4 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.SVN20080904rev2258
- Version 0.9.5-0.SVN20080904rev2258.Hu.1
- Changes to avouid rpmlint warnings, not magor changes:
	* Adding rm -Rf $RPM_BUILD_ROOT to start of %%install
	* Escape all percent sign by doubling it.
	* Description lines truncated
	* License changed to GPLv2 according to included in source license.
	* Removed requires libxml2, libxslt to let rpm find the library dependencies by itself.
- Changes to conform Fedora standarts:
	* Spec renamed to just sim.spec
	* Delete Hu-part of Release
- Add conditional BR depend of distribution.
	Fo F8: BuildRequires: kdebase >= 3.0.0, kdelibs >= 3.0.0
	And for athers:  BuildRequires:	kdelibs3-devel >= 3.0.0
- Add %%post and %%postun sections to register library.
- Add --disable-rpath option to configure script. Avoid disabling RPATH check (export QA_RPATHS=0x0001)
- Source changed, added SVNrev part.

* Tue Jun 24 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.SVN20080328rev2217.Hu.1
- Add define SVNrev and add it into Release.
- Move configure action to build stage from prep
- Delete (comment out) R kdelibs and kdebase

* Tue Jun 24 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.SVN20080328.Hu.0
- 0.9.5-0.SVN20080624. SVN revision 2217
- Build for F9
- Change Distribution:	Fedora Core to Fedora
- Comment out Vendor and Packager
- Add Summary(ru)
- Del --with-qt-dir=/usr/lib/qt-3.3 from configure options
- Replace BuildRoot by more standart %%{_tmppath}/%%{name}-%%{version}-%%{release}-root-%%(%%{__id_u} -n)
- Change Source:
	Source0:		%%{name}-%%{version}-%%{release}.tar.bz2
	to
	Source0:		%%{name}-%%{version}-SVN%%{SVNdate}.tar.bz2
- Change BR kdelibs-devel to kdelibs3-devel

* Fri Mar 28 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.SVN20080328.Hu.0
- Next SVN build 2008-03-28
- Change release enumeration
	sim-0.9.5svn-2008_03_28.Hu.0
	to
	sim-0.9.5-0.SVN20080328.Hu.0
- Translate description (%%description -l ru). And use in it URL http://sim-im.org/ instead of http://sim-im.berlios.de/

* Wed Oct 10 2007 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info>
- Next SVN build 2007-10-10

* Wed Sep 12 2007 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info>
- Next SVN build 2007-09-12

* Wed Jun  6 2007 Pavel Alexeev <Pahan [at] Hubbitus [dot] info>
- Next SVN build
- Comment out Packager and Vendor fields:
	Vendor: 		Vladimir Shutoff <vovan at shutoff.ru>
	Packager:		Robert Scheck <sim at robert-scheck.de>

* Sat Apr 03 2004 - Robert Scheck <sim at robert-scheck.de> - 0.9.3-2
- Upgrade to 0.9.3-2 (second 0.9.3 release)

* Wed Mar 31 2004 - Robert Scheck <sim at robert-scheck.de> - 0.9.3-1
- Upgrade to 0.9.3
- Made the KDE support conditional
- Merged Red Hat Linux spec file into Fedora Core spec file

* Fri Dec 26 2003 - Robert Scheck <sim at robert-scheck.de> - 0.9.2-1
- Upgrade to 0.9.2
- Added sablotron to requirements

* Wed Nov 05 2003 - Robert Scheck <sim at robert-scheck.de> - 0.9.1-1
- Upgrade to 0.9.1

* Tue Oct 28 2003 - Robert Scheck <sim at robert-scheck.de> - 0.9.0-1
- Upgrade to 0.9.0
- Adapted spec file from Red Hat Linux



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sim/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 04:28:52 -0000	1.1
+++ .cvsignore	30 Sep 2008 09:32:52 -0000	1.2
@@ -0,0 +1 @@
+sim-0.9.5-SVN20080923rev2261.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sim/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 04:28:52 -0000	1.1
+++ sources	30 Sep 2008 09:32:52 -0000	1.2
@@ -0,0 +1 @@
+10108228cc561672f21acfe315468264  sim-0.9.5-SVN20080923rev2261.tar.bz2



From caolanm at fedoraproject.org  Tue Sep 30 09:34:41 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 30 Sep 2008 09:34:41 +0000 (UTC)
Subject: rpms/hunspell-tn/devel hunspell-tn.spec,1.1,1.2
Message-ID: <20080930093441.7F2BB70119@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-tn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20116

Modified Files:
	hunspell-tn.spec 
Log Message:
add Botswana alias


Index: hunspell-tn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-tn/devel/hunspell-tn.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hunspell-tn.spec	17 Sep 2008 07:30:27 -0000	1.1
+++ hunspell-tn.spec	30 Sep 2008 09:34:11 -0000	1.2
@@ -2,7 +2,7 @@
 Summary: Tswana hunspell dictionaries
 %define upstreamid 20060123
 Version: 0.%{upstreamid}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://downloads.translate.org.za/spellchecker/tswana/myspell-tn_ZA-%{upstreamid}.zip
 Group: Applications/Text
 URL: http://translate.sourceforge.net/
@@ -24,6 +24,13 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
 cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
+pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/
+tn_ZA_aliases="tn_BW"
+for lang in $tn_ZA_aliases; do
+        ln -s tn_ZA.aff $lang.aff
+        ln -s tn_ZA.dic $lang.dic
+done
+popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -34,5 +41,8 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Tue Sep 30 2008 Caolan McNamara <caolanm at redhat.com> - 0.20060123-2
+- add Botswana alias
+
 * Tue Sep 09 2008 Caolan McNamara <caolanm at redhat.com> - 0.20060123-1
 - initial version



From hubbitus at fedoraproject.org  Tue Sep 30 09:37:36 2008
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Tue, 30 Sep 2008 09:37:36 +0000 (UTC)
Subject: rpms/sim/F-9 import.log, NONE, 1.1 sim.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930093736.1D02E70119@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/sim/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20927/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sim.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
sim-0_9_5-0_6_20080923svn2261rev:F-9:sim-0.9.5-0.6.20080923svn2261rev.src.rpm:1222767409


--- NEW FILE sim.spec ---
%define with_kde 1
%define SVNdate 20080923
%define SVNrev 2261

Name: 		sim
Version: 		0.9.5
Release:		0.6.%{SVNdate}svn%{SVNrev}rev
#svn checkout -r %{SVNrev} svn://svn.berlios.de/sim-im/trunk
Source0:		%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.bz2
Distribution:	Fedora
Summary:		SIM - Multiprotocol Instant Messenger
Summary(de):	SIM - Multiprotokoll Instant Messenger
Summary(ru):	SIM - ???????????????????????????????????? ????????????????????
License:		GPLv2+
Group:		Applications/Internet
URL:			http://sim-im.berlios.de/
BuildRequires:	autoconf >= 2.52, automake >= 1.5
BuildRequires:	gcc, gcc-c++, zlib-devel, libjpeg-devel, expat-devel, flex, libart_lgpl-devel, libpng-devel, gettext, libXScrnSaver-devel
%if %{with_kde}
%if %{fedora} == 8
BuildRequires:		kdebase >= 3.0.0, kdelibs-devel >= 3.0.0
%else #Fedora gt 8. Lt is not supported
BuildRequires:	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
Requires:		qt >= 3.0.0, openssl, arts >= 1.0
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
SIM - Multiprotocol Instant Messenger

SIM (Simple Instant Messenger) is a plugins-based open-
source instant messenger that supports various protocols
(ICQ, Jabber, AIM, MSN, LiveJournal, Yahoo!). It uses the 
QT library and works on X11 (with optional KDE support).

SIM has countless features, many of them are listed at:
http://sim-im.berlios.de/

%description -l de
SIM (Simple Instant Messenger) ist ein Plugin-basierender open-source
Instant Messenger, der verschiedene Protokolle (ICQ, Jabber, AIM, MSN,
LiveJournal, Yahoo!) unterst??tzt.  Daf??r wird die QT-Bibliothek und X11
(mit optionaler KDE- Unterst??tzung) verwendet.

SIM hat sehr unz??hlige Features, viele von diesen sind aufgelistet unter:
http://sim-im.berlios.de/


%description -l ru
SIM (Simple Instant Messenger) ?????? ???????????????????????? ???? ???????????????? ???????????????????? ??
???????????????? ???????????????? ??????????, ?????????????? ???????????????????????? ?????????????????? ?????????????????? ????????????
???????????????????????? ??????????????????????, ?????????? ??????: ICQ, Jabber, AIM, MSN, LiveJournal, Yahoo!
?????????????????????? ?????????????????? ???????????????????? ???? ???????????????????? QT (?????????????????????? ??????????????
?????????????????? KDE)

SIM ?????????? ???????? ????????????????????????, ?????????????????????? ???? ?????????????? ???????????????????????? ???? ??????????:
http://sim-im.org/


%prep
%setup -q -n trunk
make -f admin/Makefile.common
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" 


%build
%configure --disable-rpath \
%if %{with_kde}
	--enable-kde \
%else
	--disable-kde \
%endif
	$LOCALFLAGS

# Setup for parallel builds
numprocs=`egrep -c ^cpu[0-9]+ /proc/stat || :`
if [ "$numprocs" = "0" ]; then
  numprocs=1
fi

make -j $numprocs

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

#Rm symlink, which seems as development.
%{__rm} $RPM_BUILD_ROOT/%{_libdir}/libsim.so

desktop-file-install --vendor="fedora" \
	--add-category="Network" \
	--delete-original \
	--dir=$RPM_BUILD_ROOT/%{_datadir}/applications \
	$RPM_BUILD_ROOT/%{_datadir}/applications/kde/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT
rm -rf $RPM_BUILD_DIR/%{name}-%{version}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f %{name}.lang
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog README* TODO INSTALL
%{_bindir}/sim*
%{_libdir}/libsim*
%{_libdir}/sim/
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/apps/
%{_datadir}/icons/*/*/*/*
%{_datadir}/mimelnk/
%{_datadir}/services/

%changelog
* Sun Sep 28 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.6.20080923svn2261rev
- "make install-strip" replaced by "make install" for correct build *-debuginfo package (Marcela Maslanova)

* Wed Sep 24 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.5.20080923svn2261rev
- Fix two macro-in-%%changelog
- Fix release inconsistence.

* Tue Sep 23 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.4.20080923svn2261rev
- New revision 2261
- Add BR zip (thanks Marcela Maslanova)

* Tue Sep 9 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.3.20080904svn2258rev
- Change Release format to conform Fedora standard from "3.SVN20080904rev2258" to "0.3.20080904svn2258rev" (Patrice Dumas)

* Fri Sep 5 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-3.SVN20080904rev2258
- Add correct .desktop installation via desktop-file-install (Marcela Maslanova)
- Desktop file %%{_datadir}/applications/kde/sim.desktop renamed to %%{_datadir}/applications/fedora-%%{name}.desktop

* Thu Sep 4 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-2.SVN20080904rev2258
- Rm %%{_libdir}/libsim.so (Patrice Dumas)
- License changed to GPLv2+ according sources (Patrice Dumas thanks again)

* Thu Sep 4 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-1.SVN20080904rev2258
- Spec de-part converted into UTF-8
- Changed BR kdelibs to kdelibs-devel for Fedora8

* Thu Sep 4 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.SVN20080904rev2258
- Version 0.9.5-0.SVN20080904rev2258.Hu.1
- Changes to avouid rpmlint warnings, not magor changes:
	* Adding rm -Rf $RPM_BUILD_ROOT to start of %%install
	* Escape all percent sign by doubling it.
	* Description lines truncated
	* License changed to GPLv2 according to included in source license.
	* Removed requires libxml2, libxslt to let rpm find the library dependencies by itself.
- Changes to conform Fedora standarts:
	* Spec renamed to just sim.spec
	* Delete Hu-part of Release
- Add conditional BR depend of distribution.
	Fo F8: BuildRequires: kdebase >= 3.0.0, kdelibs >= 3.0.0
	And for athers:  BuildRequires:	kdelibs3-devel >= 3.0.0
- Add %%post and %%postun sections to register library.
- Add --disable-rpath option to configure script. Avoid disabling RPATH check (export QA_RPATHS=0x0001)
- Source changed, added SVNrev part.

* Tue Jun 24 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.SVN20080328rev2217.Hu.1
- Add define SVNrev and add it into Release.
- Move configure action to build stage from prep
- Delete (comment out) R kdelibs and kdebase

* Tue Jun 24 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.SVN20080328.Hu.0
- 0.9.5-0.SVN20080624. SVN revision 2217
- Build for F9
- Change Distribution:	Fedora Core to Fedora
- Comment out Vendor and Packager
- Add Summary(ru)
- Del --with-qt-dir=/usr/lib/qt-3.3 from configure options
- Replace BuildRoot by more standart %%{_tmppath}/%%{name}-%%{version}-%%{release}-root-%%(%%{__id_u} -n)
- Change Source:
	Source0:		%%{name}-%%{version}-%%{release}.tar.bz2
	to
	Source0:		%%{name}-%%{version}-SVN%%{SVNdate}.tar.bz2
- Change BR kdelibs-devel to kdelibs3-devel

* Fri Mar 28 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.SVN20080328.Hu.0
- Next SVN build 2008-03-28
- Change release enumeration
	sim-0.9.5svn-2008_03_28.Hu.0
	to
	sim-0.9.5-0.SVN20080328.Hu.0
- Translate description (%%description -l ru). And use in it URL http://sim-im.org/ instead of http://sim-im.berlios.de/

* Wed Oct 10 2007 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info>
- Next SVN build 2007-10-10

* Wed Sep 12 2007 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info>
- Next SVN build 2007-09-12

* Wed Jun  6 2007 Pavel Alexeev <Pahan [at] Hubbitus [dot] info>
- Next SVN build
- Comment out Packager and Vendor fields:
	Vendor: 		Vladimir Shutoff <vovan at shutoff.ru>
	Packager:		Robert Scheck <sim at robert-scheck.de>

* Sat Apr 03 2004 - Robert Scheck <sim at robert-scheck.de> - 0.9.3-2
- Upgrade to 0.9.3-2 (second 0.9.3 release)

* Wed Mar 31 2004 - Robert Scheck <sim at robert-scheck.de> - 0.9.3-1
- Upgrade to 0.9.3
- Made the KDE support conditional
- Merged Red Hat Linux spec file into Fedora Core spec file

* Fri Dec 26 2003 - Robert Scheck <sim at robert-scheck.de> - 0.9.2-1
- Upgrade to 0.9.2
- Added sablotron to requirements

* Wed Nov 05 2003 - Robert Scheck <sim at robert-scheck.de> - 0.9.1-1
- Upgrade to 0.9.1

* Tue Oct 28 2003 - Robert Scheck <sim at robert-scheck.de> - 0.9.0-1
- Upgrade to 0.9.0
- Adapted spec file from Red Hat Linux



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sim/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 04:28:52 -0000	1.1
+++ .cvsignore	30 Sep 2008 09:37:05 -0000	1.2
@@ -0,0 +1 @@
+sim-0.9.5-SVN20080923rev2261.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sim/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 04:28:52 -0000	1.1
+++ sources	30 Sep 2008 09:37:05 -0000	1.2
@@ -0,0 +1 @@
+10108228cc561672f21acfe315468264  sim-0.9.5-SVN20080923rev2261.tar.bz2



From pkgdb at fedoraproject.org  Tue Sep 30 09:39:32 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 09:39:32 +0000
Subject: [pkgdb] blobAndConquer ownership updated
Message-ID: <20080930093932.C2CDD2084BB@bastion.fedora.phx.redhat.com>

Package blobAndConquer in Fedora devel is now owned by rafalzaq

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blobAndConquer



From pkgdb at fedoraproject.org  Tue Sep 30 09:39:40 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 09:39:40 +0000
Subject: [pkgdb] blobAndConquer ownership updated
Message-ID: <20080930093940.584D12084BD@bastion.fedora.phx.redhat.com>

Package blobAndConquer in Fedora 8 is now owned by rafalzaq

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blobAndConquer



From pkgdb at fedoraproject.org  Tue Sep 30 09:39:44 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 09:39:44 +0000
Subject: [pkgdb] blobAndConquer ownership updated
Message-ID: <20080930093944.64D742084BF@bastion.fedora.phx.redhat.com>

Package blobAndConquer in Fedora 9 is now owned by rafalzaq

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blobAndConquer



From huzaifas at fedoraproject.org  Tue Sep 30 09:41:09 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 09:41:09 +0000 (UTC)
Subject: rpms/hunspell-be - New directory
Message-ID: <20080930094109.3002070119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-be
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsU21506/rpms/hunspell-be

Log Message:
Directory /cvs/extras/rpms/hunspell-be added to the repository




From huzaifas at fedoraproject.org  Tue Sep 30 09:41:09 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 09:41:09 +0000 (UTC)
Subject: rpms/hunspell-be/devel - New directory
Message-ID: <20080930094109.7213D70119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-be/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsU21506/rpms/hunspell-be/devel

Log Message:
Directory /cvs/extras/rpms/hunspell-be/devel added to the repository




From huzaifas at fedoraproject.org  Tue Sep 30 09:41:10 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 09:41:10 +0000 (UTC)
Subject: rpms/hunspell-be Makefile,NONE,1.1
Message-ID: <20080930094110.4A8C270119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-be
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsU21506/rpms/hunspell-be

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-be


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-be
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Tue Sep 30 09:41:10 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 09:41:10 +0000 (UTC)
Subject: rpms/hunspell-be/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20080930094110.7D85470119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/hunspell-be/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsU21506/rpms/hunspell-be/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-be


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-be
# $Id: Makefile,v 1.1 2008/09/30 09:41:10 huzaifas Exp $
NAME := hunspell-be
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Sep 30 09:40:58 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 09:40:58 +0000
Subject: [pkgdb] hunspell-be was added for caolanm
Message-ID: <20080930094058.C380B2084BC@bastion.fedora.phx.redhat.com>

huzaifas has added Package hunspell-be with summary Belarusian hunspell dictionary
huzaifas has approved Package hunspell-be
huzaifas has added a Fedora devel branch for hunspell-be with an owner of caolanm
huzaifas has approved hunspell-be in Fedora devel
huzaifas has approved Package hunspell-be
huzaifas has set commit to Approved for packager on hunspell-be (Fedora devel)
huzaifas has set build to Approved for packager on hunspell-be (Fedora devel)
huzaifas has set checkout to Approved for packager on hunspell-be (Fedora devel)
huzaifas has set commit to Approved for uberpackager on hunspell-be (Fedora devel)
huzaifas has set build to Approved for uberpackager on hunspell-be (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on hunspell-be (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-be



From pkgdb at fedoraproject.org  Tue Sep 30 09:42:47 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 09:42:47 +0000
Subject: [pkgdb] pypop was added for alexlan
Message-ID: <20080930094247.895DF2084BC@bastion.fedora.phx.redhat.com>

huzaifas has added Package pypop with summary Python for population genomics
huzaifas has approved Package pypop
huzaifas has added a Fedora devel branch for pypop with an owner of alexlan
huzaifas has approved pypop in Fedora devel
huzaifas has approved Package pypop
huzaifas has set commit to Approved for packager on pypop (Fedora devel)
huzaifas has set build to Approved for packager on pypop (Fedora devel)
huzaifas has set checkout to Approved for packager on pypop (Fedora devel)
huzaifas has set commit to Approved for uberpackager on pypop (Fedora devel)
huzaifas has set build to Approved for uberpackager on pypop (Fedora devel)
huzaifas has set checkout to Approved for uberpackager on pypop (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pypop



From pkgdb at fedoraproject.org  Tue Sep 30 09:42:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 09:42:52 +0000
Subject: [pkgdb] pypop (Fedora, 9) updated by huzaifas
Message-ID: <20080930094252.8A1442084C0@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 9 branch for pypop
huzaifas has set commit to Approved for uberpackager on pypop (Fedora 9)
huzaifas has set build to Approved for uberpackager on pypop (Fedora 9)
huzaifas has set checkout to Approved for uberpackager on pypop (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pypop



From pkgdb at fedoraproject.org  Tue Sep 30 09:42:52 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 09:42:52 +0000
Subject: [pkgdb] pypop (Fedora, 8) updated by huzaifas
Message-ID: <20080930094252.93B05208D61@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora 8 branch for pypop
huzaifas has set commit to Approved for uberpackager on pypop (Fedora 8)
huzaifas has set build to Approved for uberpackager on pypop (Fedora 8)
huzaifas has set checkout to Approved for uberpackager on pypop (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pypop



From huzaifas at fedoraproject.org  Tue Sep 30 09:43:19 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 09:43:19 +0000 (UTC)
Subject: rpms/pypop - New directory
Message-ID: <20080930094319.3099A70119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/pypop
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsz21796/rpms/pypop

Log Message:
Directory /cvs/extras/rpms/pypop added to the repository




From huzaifas at fedoraproject.org  Tue Sep 30 09:43:19 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 09:43:19 +0000 (UTC)
Subject: rpms/pypop/devel - New directory
Message-ID: <20080930094319.6BD7E70119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/pypop/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsz21796/rpms/pypop/devel

Log Message:
Directory /cvs/extras/rpms/pypop/devel added to the repository




From huzaifas at fedoraproject.org  Tue Sep 30 09:43:20 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 09:43:20 +0000 (UTC)
Subject: rpms/pypop Makefile,NONE,1.1
Message-ID: <20080930094320.54A3C70119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/pypop
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsz21796/rpms/pypop

Added Files:
	Makefile 
Log Message:
Setup of module pypop


--- NEW FILE Makefile ---
# Top level Makefile for module pypop
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Tue Sep 30 09:43:20 2008
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 30 Sep 2008 09:43:20 +0000 (UTC)
Subject: rpms/pypop/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20080930094320.9582070119@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/extras/rpms/pypop/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsz21796/rpms/pypop/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pypop


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pypop
# $Id: Makefile,v 1.1 2008/09/30 09:43:20 huzaifas Exp $
NAME := pypop
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From hubbitus at fedoraproject.org  Tue Sep 30 09:46:41 2008
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Tue, 30 Sep 2008 09:46:41 +0000 (UTC)
Subject: rpms/sim/F-8 import.log, NONE, 1.1 sim.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930094641.323F170119@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/sim/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22426/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sim.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
sim-0_9_5-0_6_20080923svn2261rev:F-8:sim-0.9.5-0.6.20080923svn2261rev.src.rpm:1222767895


--- NEW FILE sim.spec ---
%define with_kde 1
%define SVNdate 20080923
%define SVNrev 2261

Name: 		sim
Version: 		0.9.5
Release:		0.6.%{SVNdate}svn%{SVNrev}rev
#svn checkout -r %{SVNrev} svn://svn.berlios.de/sim-im/trunk
Source0:		%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.bz2
Distribution:	Fedora
Summary:		SIM - Multiprotocol Instant Messenger
Summary(de):	SIM - Multiprotokoll Instant Messenger
Summary(ru):	SIM - ???????????????????????????????????? ????????????????????
License:		GPLv2+
Group:		Applications/Internet
URL:			http://sim-im.berlios.de/
BuildRequires:	autoconf >= 2.52, automake >= 1.5
BuildRequires:	gcc, gcc-c++, zlib-devel, libjpeg-devel, expat-devel, flex, libart_lgpl-devel, libpng-devel, gettext, libXScrnSaver-devel
%if %{with_kde}
%if %{fedora} == 8
BuildRequires:		kdebase >= 3.0.0, kdelibs-devel >= 3.0.0
%else #Fedora gt 8. Lt is not supported
BuildRequires:	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
Requires:		qt >= 3.0.0, openssl, arts >= 1.0
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
SIM - Multiprotocol Instant Messenger

SIM (Simple Instant Messenger) is a plugins-based open-
source instant messenger that supports various protocols
(ICQ, Jabber, AIM, MSN, LiveJournal, Yahoo!). It uses the 
QT library and works on X11 (with optional KDE support).

SIM has countless features, many of them are listed at:
http://sim-im.berlios.de/

%description -l de
SIM (Simple Instant Messenger) ist ein Plugin-basierender open-source
Instant Messenger, der verschiedene Protokolle (ICQ, Jabber, AIM, MSN,
LiveJournal, Yahoo!) unterst??tzt.  Daf??r wird die QT-Bibliothek und X11
(mit optionaler KDE- Unterst??tzung) verwendet.

SIM hat sehr unz??hlige Features, viele von diesen sind aufgelistet unter:
http://sim-im.berlios.de/


%description -l ru
SIM (Simple Instant Messenger) ?????? ???????????????????????? ???? ???????????????? ???????????????????? ??
???????????????? ???????????????? ??????????, ?????????????? ???????????????????????? ?????????????????? ?????????????????? ????????????
???????????????????????? ??????????????????????, ?????????? ??????: ICQ, Jabber, AIM, MSN, LiveJournal, Yahoo!
?????????????????????? ?????????????????? ???????????????????? ???? ???????????????????? QT (?????????????????????? ??????????????
?????????????????? KDE)

SIM ?????????? ???????? ????????????????????????, ?????????????????????? ???? ?????????????? ???????????????????????? ???? ??????????:
http://sim-im.org/


%prep
%setup -q -n trunk
make -f admin/Makefile.common
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" 


%build
%configure --disable-rpath \
%if %{with_kde}
	--enable-kde \
%else
	--disable-kde \
%endif
	$LOCALFLAGS

# Setup for parallel builds
numprocs=`egrep -c ^cpu[0-9]+ /proc/stat || :`
if [ "$numprocs" = "0" ]; then
  numprocs=1
fi

make -j $numprocs

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

#Rm symlink, which seems as development.
%{__rm} $RPM_BUILD_ROOT/%{_libdir}/libsim.so

desktop-file-install --vendor="fedora" \
	--add-category="Network" \
	--delete-original \
	--dir=$RPM_BUILD_ROOT/%{_datadir}/applications \
	$RPM_BUILD_ROOT/%{_datadir}/applications/kde/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT
rm -rf $RPM_BUILD_DIR/%{name}-%{version}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f %{name}.lang
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog README* TODO INSTALL
%{_bindir}/sim*
%{_libdir}/libsim*
%{_libdir}/sim/
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/apps/
%{_datadir}/icons/*/*/*/*
%{_datadir}/mimelnk/
%{_datadir}/services/

%changelog
* Sun Sep 28 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.6.20080923svn2261rev
- "make install-strip" replaced by "make install" for correct build *-debuginfo package (Marcela Maslanova)

* Wed Sep 24 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.5.20080923svn2261rev
- Fix two macro-in-%%changelog
- Fix release inconsistence.

* Tue Sep 23 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.4.20080923svn2261rev
- New revision 2261
- Add BR zip (thanks Marcela Maslanova)

* Tue Sep 9 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.3.20080904svn2258rev
- Change Release format to conform Fedora standard from "3.SVN20080904rev2258" to "0.3.20080904svn2258rev" (Patrice Dumas)

* Fri Sep 5 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-3.SVN20080904rev2258
- Add correct .desktop installation via desktop-file-install (Marcela Maslanova)
- Desktop file %%{_datadir}/applications/kde/sim.desktop renamed to %%{_datadir}/applications/fedora-%%{name}.desktop

* Thu Sep 4 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-2.SVN20080904rev2258
- Rm %%{_libdir}/libsim.so (Patrice Dumas)
- License changed to GPLv2+ according sources (Patrice Dumas thanks again)

* Thu Sep 4 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-1.SVN20080904rev2258
- Spec de-part converted into UTF-8
- Changed BR kdelibs to kdelibs-devel for Fedora8

* Thu Sep 4 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.SVN20080904rev2258
- Version 0.9.5-0.SVN20080904rev2258.Hu.1
- Changes to avouid rpmlint warnings, not magor changes:
	* Adding rm -Rf $RPM_BUILD_ROOT to start of %%install
	* Escape all percent sign by doubling it.
	* Description lines truncated
	* License changed to GPLv2 according to included in source license.
	* Removed requires libxml2, libxslt to let rpm find the library dependencies by itself.
- Changes to conform Fedora standarts:
	* Spec renamed to just sim.spec
	* Delete Hu-part of Release
- Add conditional BR depend of distribution.
	Fo F8: BuildRequires: kdebase >= 3.0.0, kdelibs >= 3.0.0
	And for athers:  BuildRequires:	kdelibs3-devel >= 3.0.0
- Add %%post and %%postun sections to register library.
- Add --disable-rpath option to configure script. Avoid disabling RPATH check (export QA_RPATHS=0x0001)
- Source changed, added SVNrev part.

* Tue Jun 24 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.SVN20080328rev2217.Hu.1
- Add define SVNrev and add it into Release.
- Move configure action to build stage from prep
- Delete (comment out) R kdelibs and kdebase

* Tue Jun 24 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.SVN20080328.Hu.0
- 0.9.5-0.SVN20080624. SVN revision 2217
- Build for F9
- Change Distribution:	Fedora Core to Fedora
- Comment out Vendor and Packager
- Add Summary(ru)
- Del --with-qt-dir=/usr/lib/qt-3.3 from configure options
- Replace BuildRoot by more standart %%{_tmppath}/%%{name}-%%{version}-%%{release}-root-%%(%%{__id_u} -n)
- Change Source:
	Source0:		%%{name}-%%{version}-%%{release}.tar.bz2
	to
	Source0:		%%{name}-%%{version}-SVN%%{SVNdate}.tar.bz2
- Change BR kdelibs-devel to kdelibs3-devel

* Fri Mar 28 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.SVN20080328.Hu.0
- Next SVN build 2008-03-28
- Change release enumeration
	sim-0.9.5svn-2008_03_28.Hu.0
	to
	sim-0.9.5-0.SVN20080328.Hu.0
- Translate description (%%description -l ru). And use in it URL http://sim-im.org/ instead of http://sim-im.berlios.de/

* Wed Oct 10 2007 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info>
- Next SVN build 2007-10-10

* Wed Sep 12 2007 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info>
- Next SVN build 2007-09-12

* Wed Jun  6 2007 Pavel Alexeev <Pahan [at] Hubbitus [dot] info>
- Next SVN build
- Comment out Packager and Vendor fields:
	Vendor: 		Vladimir Shutoff <vovan at shutoff.ru>
	Packager:		Robert Scheck <sim at robert-scheck.de>

* Sat Apr 03 2004 - Robert Scheck <sim at robert-scheck.de> - 0.9.3-2
- Upgrade to 0.9.3-2 (second 0.9.3 release)

* Wed Mar 31 2004 - Robert Scheck <sim at robert-scheck.de> - 0.9.3-1
- Upgrade to 0.9.3
- Made the KDE support conditional
- Merged Red Hat Linux spec file into Fedora Core spec file

* Fri Dec 26 2003 - Robert Scheck <sim at robert-scheck.de> - 0.9.2-1
- Upgrade to 0.9.2
- Added sablotron to requirements

* Wed Nov 05 2003 - Robert Scheck <sim at robert-scheck.de> - 0.9.1-1
- Upgrade to 0.9.1

* Tue Oct 28 2003 - Robert Scheck <sim at robert-scheck.de> - 0.9.0-1
- Upgrade to 0.9.0
- Adapted spec file from Red Hat Linux



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sim/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 04:28:52 -0000	1.1
+++ .cvsignore	30 Sep 2008 09:46:10 -0000	1.2
@@ -0,0 +1 @@
+sim-0.9.5-SVN20080923rev2261.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sim/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 04:28:52 -0000	1.1
+++ sources	30 Sep 2008 09:46:10 -0000	1.2
@@ -0,0 +1 @@
+10108228cc561672f21acfe315468264  sim-0.9.5-SVN20080923rev2261.tar.bz2



From mmaslano at fedoraproject.org  Tue Sep 30 10:10:45 2008
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 30 Sep 2008 10:10:45 +0000 (UTC)
Subject: rpms/perl-Wx-Perl-Dialog/devel perl-Wx-Perl-Dialog.spec,1.1,1.2
Message-ID: <20080930101045.B834670119@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Wx-Perl-Dialog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26583

Modified Files:
	perl-Wx-Perl-Dialog.spec 
Log Message:
* Tue Sep 30 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.01-4
- remove unneeded requirements - File::Copy::Recursive and 
    Wx::Perl::ProcessStream



Index: perl-Wx-Perl-Dialog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Wx-Perl-Dialog/devel/perl-Wx-Perl-Dialog.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Wx-Perl-Dialog.spec	30 Sep 2008 07:14:21 -0000	1.1
+++ perl-Wx-Perl-Dialog.spec	30 Sep 2008 10:10:15 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Wx-Perl-Dialog
 Version:        0.01
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Wx::Perl::Dialog Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -15,8 +15,8 @@
 BuildRequires:  perl(Test::More) >= 0.47
 BuildRequires:  perl(Test::NoWarnings)
 BuildRequires:  perl(Wx::Perl::ProcessStream)
-Requires:       perl(File::Copy::Recursive)
-Requires:       perl(Wx::Perl::ProcessStream)
+#Requires:       perl(File::Copy::Recursive)
+#Requires:       perl(Wx::Perl::ProcessStream)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -52,6 +52,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 30 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.01-4
+- remove unneeded requirements - File::Copy::Recursive and 
+    Wx::Perl::ProcessStream
+
 * Mon Sep 29 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.01-3
 - remove whole auto directory
 



From than at fedoraproject.org  Tue Sep 30 10:17:23 2008
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 30 Sep 2008 10:17:23 +0000 (UTC)
Subject: rpms/qt3/devel qt3.spec,1.6,1.7
Message-ID: <20080930101723.07FFA70119@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27749

Modified Files:
	qt3.spec 
Log Message:
mv translations in main package (bz#448761)



Index: qt3.spec
===================================================================
RCS file: /cvs/extras/rpms/qt3/devel/qt3.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qt3.spec	20 Sep 2008 17:01:43 -0000	1.6
+++ qt3.spec	30 Sep 2008 10:16:52 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary: The shared library for the Qt 3 GUI toolkit
 Version: 3.3.8b
-Release: 15%{?dist}
+Release: 16%{?dist}
 %if 0%{?fedora} > 8
 Name: qt3
 Obsoletes: qt < 1:%{version}-%{release}
@@ -567,6 +567,7 @@
 %dir %{qtdir}/lib
 %dir %{qtdir}/plugins
 %dir %{qtdir}/plugins/styles
+%{qtdir}/translations
 %if %{immodule}
 %{qtdir}/plugins/inputmethods
 %endif
@@ -603,7 +604,6 @@
 %{qtdir}/lib/libdesigner*.a
 %{qtdir}/lib/libqassistantclient.a
 %{qtdir}/lib/*.prl
-%{qtdir}/translations
 %{qtdir}/phrasebooks
 %{_libdir}/pkgconfig/*
 %{_datadir}/applications/*linguist*.desktop
@@ -645,6 +645,9 @@
 
 
 %changelog
+* Tue Sep 30 2008 Than Ngo <than at redhat.com> 3.3.8b-16
+- mv translations in main package (bz#448761)
+
 * Sat Sep 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.3.8b-15
 - set _default_patch_fuzz (fixes FTBFS)
 



From than at fedoraproject.org  Tue Sep 30 10:19:25 2008
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 30 Sep 2008 10:19:25 +0000 (UTC)
Subject: rpms/qt3/F-9 qt3.spec,1.6,1.7
Message-ID: <20080930101925.7E39270119@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28194

Modified Files:
	qt3.spec 
Log Message:
move translations in main package (bz#448761)



Index: qt3.spec
===================================================================
RCS file: /cvs/extras/rpms/qt3/F-9/qt3.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qt3.spec	7 Jul 2008 19:38:46 -0000	1.6
+++ qt3.spec	30 Sep 2008 10:18:55 -0000	1.7
@@ -1,6 +1,8 @@
+%define _default_patch_fuzz 2
+
 Summary: The shared library for the Qt 3 GUI toolkit
 Version: 3.3.8b
-Release: 14%{?dist}
+Release: 16%{?dist}
 %if 0%{?fedora} > 8
 Name: qt3
 Obsoletes: qt < 1:%{version}-%{release}
@@ -565,6 +567,7 @@
 %dir %{qtdir}/lib
 %dir %{qtdir}/plugins
 %dir %{qtdir}/plugins/styles
+%{qtdir}/translations
 %if %{immodule}
 %{qtdir}/plugins/inputmethods
 %endif
@@ -601,7 +604,6 @@
 %{qtdir}/lib/libdesigner*.a
 %{qtdir}/lib/libqassistantclient.a
 %{qtdir}/lib/*.prl
-%{qtdir}/translations
 %{qtdir}/phrasebooks
 %{_libdir}/pkgconfig/*
 %{_datadir}/applications/*linguist*.desktop
@@ -643,6 +645,12 @@
 
 
 %changelog
+* Tue Sep 30 2008 Than Ngo <than at redhat.com> 3.3.8b-16
+- mv translations in main package (bz#448761)
+
+* Sat Sep 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.3.8b-15
+- set _default_patch_fuzz (fixes FTBFS)
+
 * Mon Jul 07 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.3.8b-14
 - QTDIR isn't set in ppc64 buildroot (#454313)
 - /etc/profile.d/qt.sh leaks variable ARCH (#454260)



From alexlan at fedoraproject.org  Tue Sep 30 10:34:05 2008
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Tue, 30 Sep 2008 10:34:05 +0000 (UTC)
Subject: rpms/pypop/devel import.log, NONE, 1.1 pypop.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930103405.C601470119@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/pypop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30557/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pypop.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
pypop-0_7_0-2_fc8:HEAD:pypop-0.7.0-2.fc8.src.rpm:1222770807


--- NEW FILE pypop.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Summary:         Python for Population Genomics
Name:            pypop
Version:         0.7.0
Release:         2%{?dist}
Source0:         http://www.pypop.org/%{name}-%{version}.tar.gz
License:         GPLv2+
Group:           Development/Libraries
BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Url:             http://www.pypop.org/
BuildRequires:   python-devel
BuildRequires:   swig
BuildRequires:   gsl-devel
Requires:        python-numeric
Requires:        libxslt-python


%description
PyPop is a bioinformatics framework for performing population genomics
analysis, particularly on large-scale multilocus genotype data.

%prep
%setup -q -n pypop-%{version}
# move auxilary documentation files into a sensible place
cp slatkin-exact/README README.slatkin-exact

# remove she-bang lines in certain .py files to keep rpmlint happy
find . -type f -name "*.py" ! -name "pypop.py" ! -name "popmeta.py" -exec sed -i '/^#![ ]*\/usr\/bin\/.*$/ d' {} 2>/dev/null ';'

%build
env DISTRIB=true %{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc NEWS README ChangeLog AUTHORS COPYING README.slatkin-exact
%{_bindir}/*
%dir %{python_sitearch}/pypop
%{python_sitearch}/pypop.pth
%{python_sitearch}/pypop/*
%{_datadir}/*

%changelog
* Tue Sep 30 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.7.0-2
- Fix macro as per review
- Fix some doc files

* Mon Sep 29 2008 Alex Lancaster <alexlan[AT] fedoraproject org> 0.7.0-1
- Start Fedora package.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pypop/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 09:43:20 -0000	1.1
+++ .cvsignore	30 Sep 2008 10:33:35 -0000	1.2
@@ -0,0 +1 @@
+pypop-0.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pypop/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 09:43:20 -0000	1.1
+++ sources	30 Sep 2008 10:33:35 -0000	1.2
@@ -0,0 +1 @@
+53486dce09fef46b56f1925eb34eb3a2  pypop-0.7.0.tar.gz



From pbrobinson at fedoraproject.org  Tue Sep 30 10:34:39 2008
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 30 Sep 2008 10:34:39 +0000 (UTC)
Subject: rpms/pwlib/devel dead.package,NONE,1.1
Message-ID: <20080930103439.B609D70119@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/pwlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30751

Added Files:
	dead.package 
Log Message:
- Mark pwlib as a dead package in devel/F-10 as its been replaced by ptlib



--- NEW FILE dead.package ---
PWLib has been replaced by PTLib. PTLib is essentially PWLib with all the windowing bits ripped out as they were never used and were unmaintained. The only packages that used pwlib were opal/ekiga and they have moved to ptlib hence this library is now obsolete.



From alexlan at fedoraproject.org  Tue Sep 30 10:36:16 2008
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Tue, 30 Sep 2008 10:36:16 +0000 (UTC)
Subject: rpms/pypop/F-9 import.log, NONE, 1.1 pypop.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930103616.68DF270119@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/pypop/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31143/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pypop.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
pypop-0_7_0-2_fc8:F-9:pypop-0.7.0-2.fc8.src.rpm:1222770908


--- NEW FILE pypop.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Summary:         Python for Population Genomics
Name:            pypop
Version:         0.7.0
Release:         2%{?dist}
Source0:         http://www.pypop.org/%{name}-%{version}.tar.gz
License:         GPLv2+
Group:           Development/Libraries
BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Url:             http://www.pypop.org/
BuildRequires:   python-devel
BuildRequires:   swig
BuildRequires:   gsl-devel
Requires:        python-numeric
Requires:        libxslt-python


%description
PyPop is a bioinformatics framework for performing population genomics
analysis, particularly on large-scale multilocus genotype data.

%prep
%setup -q -n pypop-%{version}
# move auxilary documentation files into a sensible place
cp slatkin-exact/README README.slatkin-exact

# remove she-bang lines in certain .py files to keep rpmlint happy
find . -type f -name "*.py" ! -name "pypop.py" ! -name "popmeta.py" -exec sed -i '/^#![ ]*\/usr\/bin\/.*$/ d' {} 2>/dev/null ';'

%build
env DISTRIB=true %{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc NEWS README ChangeLog AUTHORS COPYING README.slatkin-exact
%{_bindir}/*
%dir %{python_sitearch}/pypop
%{python_sitearch}/pypop.pth
%{python_sitearch}/pypop/*
%{_datadir}/*

%changelog
* Tue Sep 30 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.7.0-2
- Fix macro as per review
- Fix some doc files

* Mon Sep 29 2008 Alex Lancaster <alexlan[AT] fedoraproject org> 0.7.0-1
- Start Fedora package.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pypop/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 09:43:20 -0000	1.1
+++ .cvsignore	30 Sep 2008 10:35:46 -0000	1.2
@@ -0,0 +1 @@
+pypop-0.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pypop/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 09:43:20 -0000	1.1
+++ sources	30 Sep 2008 10:35:46 -0000	1.2
@@ -0,0 +1 @@
+53486dce09fef46b56f1925eb34eb3a2  pypop-0.7.0.tar.gz



From alexlan at fedoraproject.org  Tue Sep 30 10:38:42 2008
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Tue, 30 Sep 2008 10:38:42 +0000 (UTC)
Subject: rpms/pypop/F-8 import.log, NONE, 1.1 pypop.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930103842.1A9BE7013E@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/pypop/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31858/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pypop.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
pypop-0_7_0-2_fc8:F-8:pypop-0.7.0-2.fc8.src.rpm:1222771007


--- NEW FILE pypop.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Summary:         Python for Population Genomics
Name:            pypop
Version:         0.7.0
Release:         2%{?dist}
Source0:         http://www.pypop.org/%{name}-%{version}.tar.gz
License:         GPLv2+
Group:           Development/Libraries
BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Url:             http://www.pypop.org/
BuildRequires:   python-devel
BuildRequires:   swig
BuildRequires:   gsl-devel
Requires:        python-numeric
Requires:        libxslt-python


%description
PyPop is a bioinformatics framework for performing population genomics
analysis, particularly on large-scale multilocus genotype data.

%prep
%setup -q -n pypop-%{version}
# move auxilary documentation files into a sensible place
cp slatkin-exact/README README.slatkin-exact

# remove she-bang lines in certain .py files to keep rpmlint happy
find . -type f -name "*.py" ! -name "pypop.py" ! -name "popmeta.py" -exec sed -i '/^#![ ]*\/usr\/bin\/.*$/ d' {} 2>/dev/null ';'

%build
env DISTRIB=true %{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc NEWS README ChangeLog AUTHORS COPYING README.slatkin-exact
%{_bindir}/*
%dir %{python_sitearch}/pypop
%{python_sitearch}/pypop.pth
%{python_sitearch}/pypop/*
%{_datadir}/*

%changelog
* Tue Sep 30 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.7.0-2
- Fix macro as per review
- Fix some doc files

* Mon Sep 29 2008 Alex Lancaster <alexlan[AT] fedoraproject org> 0.7.0-1
- Start Fedora package.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pypop/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 09:43:20 -0000	1.1
+++ .cvsignore	30 Sep 2008 10:38:11 -0000	1.2
@@ -0,0 +1 @@
+pypop-0.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pypop/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 09:43:20 -0000	1.1
+++ sources	30 Sep 2008 10:38:11 -0000	1.2
@@ -0,0 +1 @@
+53486dce09fef46b56f1925eb34eb3a2  pypop-0.7.0.tar.gz



From caolanm at fedoraproject.org  Tue Sep 30 10:42:52 2008
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 30 Sep 2008 10:42:52 +0000 (UTC)
Subject: rpms/hunspell-be/devel belarusian_dictionary-0.1-fx+tb+sm.xpi, NONE,
	1.1 hunspell-be.spec, NONE, 1.1 import.log, NONE, 1.1
Message-ID: <20080930104252.9B40070119@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-be/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32259/devel

Added Files:
	belarusian_dictionary-0.1-fx+tb+sm.xpi hunspell-be.spec 
	import.log 
Log Message:



--- NEW FILE belarusian_dictionary-0.1-fx+tb+sm.xpi ---
PK

6?`??\????????????d?3D?n
?0~#&???-P$??????s|?+???y?jo??I???e`?8?v???????z???s!??i?f3c?yyfZ????6m?4F|??#???nG?\?s?-s??M???	6??	??~??h<*?B?I4?S1??%6?a?? i?2???????aB???$??I?
a?}f??"??C???"M""0???/????
vp?G??	r{n??????3p??_a?????l??V??#?]?10???U?Oi????
????S??A?
l?R?!??
r=?b??1?zB?`?l??y8r)r?
(l[}p}??B?q/?9????a??????ShF2?Gy-?rU]TW??????:??[?I~???F{|))?<!L????'u|qH??!?_????????\???Z????Rw??????E??e??G?


PK
?????????7?015E????x!?
X?>??<f?~?&?"?$?Y`T???!??m?6?A?P?bW?K~?j???'???W?>?mE?k^?????@O&??^


?/zV`?zA^?????=?????X?8???*h??H???R??VO??L??????O??|?@PU???8!*N????	!qbD?'????hB7?$.N???$AqbL?'F?	?rb<?$X??*?r:?d}???)??V??v??w?v?g;????n????l?x?c<?m$?u$?e$?e$?u$?e$?e$?e$?9??2??:??2??2??I?^F?8WH/x??"??'I??? dlr?:?????
?-~
??l?ao?G?/???c??????c(e_?(HR?8i@v?#SxBmIW[?:?X??2?v*????D?.~WSG???CpO8?D?R????????</15E??P\?@Hh
??:?????????<???S????-?????	p?Sk?w??)??U?6a?g??@?M?*?B????4|?S'?:?z?????;5|?,???;?}????????s??????kU;?q^a??lZz?????b??A????????4'+??eZ?EZl1?????g:??;?u????O????^? ?|??38???&L?N?$=???h?CN:????#???i?@`^\I/x\Z^?&x'N??F?A?,r??B?????????????
?Y*???%????Gg???????<H/xl5<?&??:??B??M?T#??,0*Bf??!{OJk_LK??/????drW??XV	?f%"??+????X?*P
?-?????	??5=???HSW?/{l!??/;m!*/iNV	?f%??z???y?M??i?M?/?Fv?J??6??-Is???HP?U]??6????;?q???}"?>-??(??iD
????O??O??O??O??O??O??OF??D??F?'[T2F??'biX??H??H??IO:?>?/????e(XZ?????????Kkwi?o?>?@?(mPi??HR??~3?/??dPbv*???~{?)uD/?????7<o<??e????H???i|??????Q?,,iA????Z?ke(Q?'?????b?k#u??H=?0EC???????K?????????i?????i?????i??/-?????/?t3?+$o??&%7)?H?6????P??K????-bp_Z???eh_Z??K+?}i???a}??&???????8n????"?hAc???p?>6??Fx??_?????\#|k?k???F????4??Fq???4??F??7?E?8?H?B??MU??t??c????>??>"?W??
???#?X??	??
?3????u?%?,?fIl?h?D?%?,?f?6Kb??q??3???*?,??????cj??tAQ??x??]N??AV?Rh ?T:8??V???????h???X????1'??`???<?%4o|?????Wr???D????????G!A?&?'?!?(?N_Y?dP"J??W????d????lVBi???? ??IS6-?i?E?????A???a%r?%iNV	????????????t??Z?K0?????w?H??a???~??^?3??)#?????{?????????? S??????	i ???m????[?????????t?:?]???C7?'?a,??Lh???y??I????????Gh<pO8???nv*?V???
?^`$?????r?K?????8QL&?)#??l???
?351???????Bz??`??w???$?Y`T???!??*??????????%|w??7f
???F?qqf????1q5
sR????D????c"?)?p2??b???5CE?/?}(??=?S????vg?]??;c?rW?{:x*??yg?e'??=?o4x>{*????W????????jw~?;???_??W????????jw~?;??/?r???\??5T??q??k???5?:~???_???????5?:~???Fy?dtvyp^????j????}???u=$~~???D??~?5?\??+K
%?e?H
?
!??!?????5R?X???Q?X??5Q?7P ???rY??,?????O.?????O,?????OY??)????????????????????W}O????o???M??M?????/?0??&_??????E???z?????F?/??k?FKK
@?|?????3_(D?
g'?e?H
L???"Q
??a?????@I?	yZ2a&?D?_P?#?`l??`??Q?O?l?1???{??K????^_?.?F??Z??2??????'?e8a-???2??????'?e8a-?i?6?AGi?bGT?V???d9???p ???V .l??*??????<????"z[Dsu?????"\D?u?QARe??Q??H]jFYrTI???8:??J(M?U?hk?
??Y?]??????}??M?.$iNV	??*AZi??/??n??m?????v?~?????v??M?y{w????x?M?9?w????z?f???;o??Y?s?????^xs??k???sv???;g????s??????v???9w??tT?v???d?0k??4g??????H?????;???3vV[g5uVKg1tV;gg??Q?`??P%Y?u??3??-?3????]qtDO?%V?
-????????/?66k(
=tT&u???s?oQ?1O*??:/?3?s}?wn?zh?+?K9Nt
????X???pDQ?$??<????
???J?r??~?ybA??FIc??AI?~e??]H???8:??JD?S??~?
??uL?`?????#???????|J??o?2?[
?L?l?X?dP??bFid?4'+??e?J+W????{?H???p ??
?P?e?1	????0I?,0*????S????r?Tn???R?Q*7J??,0*Bf????Z9t?J%R???JD??4'+??e?J?n????15?
p??iC?64hC?kh??mh??ih?????

??@??:t
z;??V4@?K?Jz?????B6?;q??,0*Bf?&??t????&?x???m
~??%I??? dL9?,O??x.?L???F?h-<?94???????#?j?}? ?;f?H?rh??V?8){$?????@&?j??????!?r ?J???????c????????h???m?
????[?=???k??????Z??\z-_??/??!s?????vC?@Bf?D(Wu?B&???????+>?)??aW|?s???L???$T???5??{????!?????c??AIi??M?.$iNV	??BY??%)?Y?h*?~?(?h6tn??(0?i ??!?U?**U??:E??J*R??J????????DL????U}??6?=` ?%y&?i????.#reA??@???J%??mJT??;?%*aT	??j???#*?????v#.???
?i?-F?9???eG?g???1?YG?J?+N=@$BS?<T?????UK
?3?U?
?	???6?????<????&??n|?t?S?:?????GN7y?t???n|?t????H??????H????
?	????M??q?????^@7???xr????&?7???t
~s3??N?o:?????&???N?on?}???Mg?7??o?h?&????~2?z%??>B??'s??dn?????HP6+1i?Mz?v??Z?n?a??nS??9?=????[y.u?;??lg??????3????
[??l[?|2w
???l??[}x?%????
;???ob??71n?M???&??~?}??`??;????????p?cl?b~????^??y?????^`x?E??Po???R???w?{?????????D?!?9`???"?X?????M?N??[G?g????Y?+(u(;?n??Gg?6e?b?$I)I?Q?\%?5h?;#?+s??	?_
b*Q i+m???$+b&]3?z?I??L?f?b?I??B?P
&u???O3?O???G?C???>?X?Qu??D%??
?{?H$??^???au???Xb
4?LW/3?T??L???K????????????c?
?"???=?@X?y??R??/????@<B.PN???[?3P$
?
?l??
?Q` ??6@?'C
?3!$<+?n???2??r??l?Z??
	?	?	?D?"???a?x??=???ft??]??h??????h? ?j?????w?$?Y`T?????F??????W?r?=?GA?Rh A?V???s?%???G!A?&?'7D"????l?`dPb???????9Yqt$(??P????v????4e???_?????	F???!????$????#A?Vu?????t???a???7B?HL?DQ` ?	??"???E@??G??(
?
?????h? ????M?N?$=????Y0??JUH???????b?~??????????????c??????
?!??_\]?~?I???S0e????/Z-?~??~?
?~?????????????n???i????L????wk??\?~??lcr??x????<?{??}o???M?{??7y??M?????M^????{??0&??pLL?DQ ??gBHh
????G#?c4?D?Z?`Gd]Z????{?
??L??n(D"?>?Z????q??k??p ??kx??Jp-0E??x&4	?y_??l?b?2E-U~??W?rkG8??
?3?I?^??k08????????F??????
?3?!aj?j?C
?i??^? ?T??M?N?$=????Y0??M?Z?h?????cmk?h?Yke???>m]???T????i???X?dPR?elS????d?????????s?;\qm:??
?b?z?g???3?[k?A??????3F??SCHT?lJDB#P%?I+?3?V?9??&????Gg?D?S?ZT??i?6w??NY\?-4?
?i?-F??????#???????J?8?>So?pG??'?TSA2GM??4??)3????L??????^?x??d?jh
?l?SpO8???????(
??????`??XO?x?*Y??"?$?Y`T???!???8??C;??t4I?tb??V?h???J:?I?J??V:UK?z?T1?h?S?tN7?*?S?t???RUA??z%????
??????/?
j???#zE,1
????scNjry???Yptv?2??gu??8?Y?,???1?x????????????g?????Y????wv?wV?;???[u??Y??IS6-?i?E?????A??CN%r?%iNV	?????C?/?X?N?S?:T?=??]?s}??N??^??????N;V?{?D??L?
?5G??????????F?3???S????????E???g??.??]=k=?z?A???????s?:??3;???M???;eq?Vw???w??;???s???t?N?9???[w??;????l??:?F?????"??%I?DO	Z????????Uri??K+??\#S3??QBV	?
??!?????;?5Xry???Yptv?d.r?x]x?x]x?x]?&???&???&???????????????-?u?-?u?-[?L??
<?T?>
vD?fG3???????V??7??7{??t?o??????????
?H?y?}??????}k?????-?[??7?????o?????}k??v=?[;????o?n??????}????]?[{??t?o???N??i?M?,?.v?o?a???}k????????[:????o????g}k??]???Wnnyc??Z???f?7?r?X???1????=??H?(???????f?o???&??=?o4x>{?????E??$?????Lnx??5??c?c??J7?ve??eG?g????"?&??l,(k?|???T~7?(T???C????????1?8??i??%?O???C??c?c?JF7?ve??eG?g???1?)?d
Y;?k??6?	k!5??yej?:?d#??
p??7?#L?&?&?}B?$?2!?L?4=fw??+e??L?&???Ak??5I??4VM?&?R?????i??4id?$,M?&?????!y??M?iF?I?I??I??IF?I????$?????$??$c?T/c??*???L|73?????f&???L??#ShC?????f??4_?L|I3?%???4_?L??f??4_?L|I3?????&????%?T_?LxIs?s?-87?`??c?c??F7?ve??eG?g???1?Y?z?? =??
??Lkf?f?5?Z3l?4U
???Y
??a?6?a?6?a?6;?J??lV?z5??Ah?L???pZqo?w??=eo????K??l?j?u1??K???????z_?}]D??B??u?.T??@??B????{]??u?~W<Y^S????'??OI^
")`Zx?
??K??,0*B?v?g????~???j???Zz?{??d?j'?&
??;?V????	B????&?f?(0??&???Q??adZ$tLb??t?&#?? dL???iA????b?Z???E??H?	
??1`Z$L?D?i?00-??"??HP6+?4U????7-?i?E??80-?E#??H(???"?`Z
?E????lVR??????
d?j?B?(?Y????>#?3?>#k1f?(0????
6+???*???Af?!f?
w???L???$?????*?(?=?:?I???d?$??'Y?=?:?I?qO2???ZPq?L?Y???@x
T~??????>m??p,2??+P?98V?dtslW?\^v$z?????*?DG??F??d??????iQM?h
UL???E??,Is?B??fQ?4?h?YD!O?z%AH?(^?EO<?#<?v=???tw4???Y|????S???:?>X?J,??z?.96^?|x?;68&???
?+{????1'f?b??F??{???49???????????y
??5?.a?N???5?4?f??0?/?\Z??
?????????3?????{?q?g?]?S?I??????????T??$?????m?h?c?^?Y?T?O?J?"q ?u?:K????v?????P?c??P?-??$?M??I??$?4e+O???:	Xs??$`?I??&
kMW??3	Xe?OAG?E?.???.??%?]??%?]??%?]?Kx0??Z*????vS?????Z??E?;??????6???}??}??|G????????wt?{??w??wv?;;?]:?????{g??????q??q???wv??u?;?oLYXA??;{?]z??=???yg???g??3??3???w???????\?&??????+???p3`??V?K?c?2V??U????p$?w??{

w????W?>?z?0???P???????[?=??7z??m????W?#???F?"<~/4??????????w?J???s?D??~??e???1?1T???\?e??k?1???>*(?\??????@?L???^? 8&!?`??$=????Y0?<Q???~Z+??o??gb1???RvH??z_??}A???M??x_??}IL?DQ` f??{_????????????Sk:?U??i4?#?3??????ZqO8???z???????@<???>0????W?k?
???
??F<???P;???????
?M????4?h??????I'?>?]Lz?t0?_?^???sI????????~e??T?PS?G??Ibb????????????#=???}e?a?????{?+??????W|/{??e??^???e??????^?{??}?z?w?W???*??^????~?z??^????U?{?????|?j8?C?4???{??w?W~?z??^????U?{??w?W???*??^???+?{??w????Yp?S??d?pB,??f???rJ????>?Jz????'????c?0?;q??,0*?kT????*^???RJ]?s?????*???????_??oA??)?&l???DR??
?]c??
%??|?B??M0On?D$??*O??J??WyfD?%????#A????T?b^a??Y?]???<?2"?B?\??U%Is???HP6+1i8!?2?^?.}\??i}?	????7?015E??x&4	???(???"????@=??*???.A????
f??Q?????:?L???ac????7?O???ac?????m???1???	?'l??l??]?w?O??~?f??6?O?`?a??$?'l??d??d?'n??t??$?'?(??F?I6?O?Q~???7?O?Q?? d9?t3T?+n??I?"?@o???????dw?$??'??qw?$??Bf?UN????%??%??K??K?N/?;??;?$wz?wz?wzI???????????????%??%??%??K??Kv????^:Uj]?x?n????-m???y?????g??<s??l;?g?w??#????3v:???y?]?3?8???y?????
dl??e???
?3?????w?V??}gn????w??Y6????;ss?????m???????n,?????[????;?F???xgn????w????wg??;????wgn???f??u?Z]?N?O??&????U???
??U?b?{;F?;??=????G???>:;??dGz#?t?0Q#p?$?d2?T?Z???^G????+ev9??_?9??6??\???ah?(?? ?s?m?9?u
GG??Y?I3?w???????fa???u??Wk?D}/???f??h?}??d?jh
??j??^???`iv?R??? I?)a???M?v?j7}X?Ty???HR???X?dPR???M??K??GG??Y	?Yw.0??P???b)^?lW??"??j????????~??^?}??O??????
??>???????????????M??&???/?t????|??N>}??O???{???>}?O????????{???U?~h??X??V???U?~h????????C?>{?/dv}??^??
????==?????x???<{z???<{x???<{???h5?,????7s?M[f!P?I??%????G3?c????6?m??h
?v?Z??j]o???r?9`????g?.?r?Y1???o?Pt Ie???W2(?
?lS???&Z ?g???OgG}Y?Mx:?z6x?h?|?ts?_4KZP3rtD???ZJ??NYH/xL#?AII????8?C??#}?7??$?fl????2??B6?;q??,0*Bf?&???a??H7?]`T,??F??????|??+?j

?P??2???`^????Y`T,?0-\'??7@?7m??k?Q?}???y?V??X?
U??U?g\?b??
???P?%???T????
???T?t??/?!?_?A>??|~I???????????%}?HP6+?4?N????N??IS6-?i?E????%???K???????/??_?>??>??'	???????|Ox?l]?V??"?F
???K?XJ??j?K at JcG(?B]^???h?BE^???x?/T?Etx??.T??tv1?\?<kZ|0??b????PJ?g??x???v?:6?{o?PE??gO$?&|?
??=??)3??Kpbn
?????????
B?#?
!xIL?DQ` ?	??	q????e?ZE??'7L2Ln,8??F?K?1???
????????\^v$z????2&y?^??ev?d???????CB?:; ?\?P??m]i?-????	7+?T??mjU??p???Z?,J
S??[U??Qt????)+?^1q?4?Li?<i?,i?i?i??h?????????fy/+???9??????F?7?r????r?)??r???Kw??w?z/??$?>R?"?R? ????=????9?V7?r/???>P??=??
????????????>?????????
?????
??g???3+??k??L?????'?
?/81??
?4?$d,???g?Qq??0?b??#???5??nbr?/{?U??c??A???*7???B??d????lVBi?T????n?+}????>[??#????	?????.???8c,:??b??F??un:????N|?x??????4?^v?????F????*???^??
??n?????x=0><uz`?4?.?$??=?o4x??8?0??B??N????UgGW???=??]O?y??%??@<B1g?C?????????? ??i?=??BR?a4
??P???????#???????tj/?~?S??>??????????????????
?^pI./;=??z/??O?GBy{$s?'2>??????_???f.?\???\???E?\?3??>?????>??????>????1?0???b.?(??'1}s??0>?????E?_?????/|j???yn???K?1????K??5???z?y????1????k??%???z?-?yPOz?&????A??7D??????R??m????JT^???8:??J(??u`S?u?^:C?\??c??X?8VO???X?8Vo????z:V????c?t????V_ ??_????*??W"?
??????g:>?|???l?`e?~?\??T+??ia?W?K????+?J??EiOZ?X-y??D?'WC
??J+??`????+?J???)rM??F?A?,r?z?3s?C?{?
???>?.h7???
"Q
cuq{?t?px????}?u??????7Z?????????F?u#:?h}n?.7Vq?k?T?;??N#z?42 at L#"?4"DL#c?4"HL#??4"LL???iD??FF?iD??F??i?^>?????>??O#z??&??'Q???$RFbj&??L	?d2?????X????cxl?|?2?w?$?Y`T???MN?* ?x??^????>t?B?????%?t?G!A?&?'7D"?A??^?????[??K??GG??Y	??j?I?\{??lZz????A??A??A????4'+??eZ?EZ??;=?-?
??? d9?_^?6I[???A?Y_s??w?$?Y`T???M?U
????d??j??D??>??&?????????;<???G??;??q?tm?+]?K??w?v:???Y??l|E?3\?
?????y??k???x??6?%????k???xxK?????f_?'???[??????
??????XA?{??????<?%?o?SO	???O????f???"^ =?h?}???
????g?Qq269V
????~l?>??!jlw??:cbj&??L	?hV,???\?'?L?????????/x`Ik??????(
?3?I?X.V??9??b???$??&<*L??0?Qa???$
G!Zh?+???)e?22?0}?X?dPR?olS?I??GG??Y	??IxZ???`r??J%R}??Fv!Is???HP6+???????I?Q????2??A?M?Gk?>Z??-?Gk?>Z??1!-D"\???hAcG:?N?? ???N???;c?[?t?]\b?C?t???????#????????l?|?w?????n?
`Z
?:????Y?????????????C???v???0?&????N'?????????('?rr??,0*9?.?=n?Vm?xR???'O???z???<?GO??F??Y	???????%?V"?v??HZ+????????Z?lf?f??????O?v??&S3?z??J?N25?E????E??Z?{??????a???]?^?(???e??N??#?x??V37?5?????+X??5+X???*X?b?T?H?+T?<kS?0???k??????r????6???+?????o?;`bj&??LhB?#??I??????
@?:?4?B???????X?
U??U?g\?b??q$*J6%"????AA{??`sNR??????#???????tj??????6msgl?????z!?????:%?^pI./;=??z/????lg?????SI?Zs????N?km2/??b???/	B
*?3eU?9???O???
?N???$????9????Tf?x??g1:x??Nb?]gM>7{?h?|?T%?=???Lk??@P??n at 8;!-D?
E?468?
E?4?+K./;=???A?u????{?D?Hr??/?
mR??vu?7?s??{N????2:?<?zO???S???u??r+m48?9?b?????7p?-?????6???;o?????v???yKw??]?m???W?|9oo?A????????@wG?????7<?=?d???~??;?K?U?o)V?T?@???IE???????a??$=????F?i??l:??|N??9q?I???b{?$???t??k??K
???v5?.6??&????!Y??I?M?.?"t???l?_????$=???????????h?8I?cO??6V?*?g^Z???? ?|???????????8??#?????o???????]!???7?yxK?????f?????????[??M?\???{U???w??[~~????????C~??"?S???i ?4s?
5?p??
=?????;F
`??_3P???????Ewm????????_???/????6|? ??A??? ?`?z????b????????Z9v???????v???????t??????/?g?W?f?W;f?Wze?W?d???+??????`?h-\*?V4-U?????x??J??*???????|??d>?c2??)?O???????'~D???!???????|??|???|?Gb>??0??0???O????; O?D??)?
??_???????????p#?y

???:5Q'6??H??R????4]????
?4e??j v??;k???cg??Y;v????cg??F?2??"->:??~???o????t~?@Kb?T^?0
?C????C???`SV????#????*',?(HR?8y@?`G?|i
P??k?j?_?:?t??=?
#q ?q^@Yb?NL???:5Z'V??l?????:?\????^??kE}?$o??&%?lw????l????y?%Iz!R?????K?S???
?? ?S???
??)@????~??????$w??w?I???????????'??'??Or???n???~???$w?I???????Bf??#*??!y??M?iU?????'??Or???n??n????? d\??????Y7?AMXn?H;d?!?
Y??i?LdZ ?
?	Bk>?*pLL?DQ ?g???]??????&?k?:???]???q]\??+??????q??!????r???w??????z?>R`4
%?e?H
?umt???{?n?co??;????????=?4???????????^?=v2?E5?h??do?*V_?o={~???k??{?????>{|?????_z?????<u}=n?5TJ;??O=F??jE?{???hC?a?Io;?V??U?)#15E??x&?Q???e?(0????D??
??hY%5??s?)?b:1?@?
?v?-??????rvBZ?D
p????PK??S?6?/P?2.Q/`?!?D??Z????d?v??k?^?z?n??????v??G%??t?????kWF{? $
n[x!?=<-F ?<?M>7{?h?|?T%?F}T???q?{?Q??e?BD??^?y??N??????;?{??{?Tx??
??S??W?{??{?Ux??
??S??w??kl??P???7??zao??t?T????L??h?????F????*?????????V??7?^?????y???	?=??s????V5ot???Oq????g&?8?Oy????)??I??????R??%N{??o??/?h?f1.e?'?]6?q)?{??&???%?S??I??)z-?J?O??p|?w?5?
?+UFz???:A:?W???I????8?Zd??X???
?5???[??z??U|??]?b?)??$*J6%"????????
?Q???dNjry???YptvLd:E????J?+??R?kh?}d?c?????ve??eG?g???1????z?
??A?????l?=???????I.??;G???:???6(??/????{??u|?????/?g??K??-??????	?{?Z??l?	??I?%?;??$????=?]??N??;?w??{O?????F??8?dB???7?5??%???[~~????????;?o?W????+o??????????f0?$???&???Kz??o4?????????
???K???w
??04?G\^T?r?>???)8w;?m????????s?Sp?v
?h??????q?>{????w?z?)?O???XO?B?.]/??/???????K}~RqT?tY???B???J{???^?n?????????????NLry?????i??Le6??^?R???^P??Ch?N?????f?'?M>7{?h?|?T%???
?%I???U??j}?e??-aut????K?F??Oo?-?????Ho|{?^`?????\?[G_&?	??:
o?U?"?Q\??[??	??o<??$PI????V$PI??U?-*??????2?'??X?
?v??`{?]?U??$	?{??*?$aKH?%?;??$????=A??.&??;?G=?v??1??{???>?:?F?&?f?(0?????,???#k:??#?9??#j9??#?8f?H
+)????p?\S????=A,VS??)oI??&m?I?$?W0????<???^1pMx?J?F???????R?R?U???R???{???-!???I??Iy??zwIpVS?=????F?7?????uL5?4?zG?cO????????G???#ob6????pL?????}??2?|???BK~???????????Cq?H?,8?86+KJ??wU??yv?{????SU??o?????}??=??D???8???sB?????~???R?????9?w9?po??????w4?f???\,?#o??1?A"??[?Jz??`6?q?L?????.?,??)?'
G?F?F??F???F5`???S???#???b??5?????wlp????n?9???eG?g?Q_?r?&y?^??U?+?&^?	,???r?ow?]/??kG???????e?B?????s?J?S
???/?9?k?#?|@:xJ_X???]G?a???Y|????S??????|??gw?????qvOO?;?|n?,?????)%??FF?
x? o?????????
?&@^???{??O??
?{???????>??????=?????????d^???????]??????]???vy?????u}????/????dO???O???*h?q.??^s?2?,?a??w???L???JQ??j0??G\???	7?
?z,???z=?Z??A????Ls???Ac?SUoE?fl???x?ea?????????/?_5r~Y??B?????eQ???j??u*?z?1?1T0??V???W????????D?
?
S3QH?y&????%??=P????Pi
???^5?C??{???Z??C?
w??T
??d{?P?LX$4?m??}q??????M??8???4???/?@}?L?H/x\?????8Iz!?`????t??&i?????LP???d:?%?/NAF?A?,???????h
?2??o?
U?'? ?S???B??d????lVBiO??R7M]????F%R}s}#???9Yqt$(???4?BX?~?j?l6??2????HR?x??? ??`G?|i
P????n????:?L1??t?Lg??
?????N?????????4}?????L???n,???????dzC_???L???????,???Z????????v??4???&??a?`?
????y????i;N??
??^
????u??H?K???5???(ui
 ?^fl?B????|#?o??|#?o???p???7???t???7?ld????l??????p??.7???t??.7??F??H???F??H7??e'3???2???D???????J?
?	????
;?a'v???`?I;??
;?a'v?a'v?a'v?N4?D?N-?[m7?:?????b?O4?$&?h??&?h?	&?h?IL<IT?h?????w?S?\????s=??<?~?@?@[Ev?r???Z?2-?uN?mB??l<??x.7{???5,M;???1,l??ui[{d??acX?,W??3????`?>?:???#:???????	?"??X?pD????
RK%^h????z
[k?A???????KP?9?F???dS"?*??i???m?Y/???\^v$z??N?jQ???M???;eq?????????jdz?%???H?,8?????hw0?????N??????HM???Y
?????9???9????8;g5pV?fi-?K?z??m=D;?
?z,?????>C??n?XTu ?5
??@(?h???XU????]Yry???YptvLdBS???A????X?
#?y?n5??m???????H!AH?(?J?f???xez?????6??z??;?x??>#;?3???????$??N|Fv?gd'>#;?gd??)3??K??
,?/?p5?K?%????Z;F?`?10W`9??{?{?
(???

?[ ??????[s?clm?-?e+cna????E????????2ZU???????2ZU?????	i ???[O?P???d???#s_d??? s?c?{???????o?}?m????
?p?>??py????K>?W;??????????F%?1.??d??Q?f?????Y????a<vT;???Ik??UF????PL??n(H??
Q[?U d????(
?3?I(?4???YJ?#?(>%y???)?nE
l?????JL?	
??$????#A????D??
?G??z%???}?kd?4'+??e??????+??\	?B%?J??PBym???/8???Z;"@0t?
5?V? x#?	?M/8?Sj?.v^???t;?{gBkj?6????2c?f?]?`???W_`?
??`?J?V:Y?]6G
??)??S????7O
/???w
??S?L???
9*ic^3?e
x???)?S?7L
/??/?R
=???&??Mu?5?_@?{?f`??
?"z??aiL?r???@I?	yZQ?#M?[?g%????Q29???E???^?V??
&!?K??Dp	:%??2j????~??{?k????z?????_{c??????}????~?j j?6??=@??Ff?
??
??
&?
f??M???N?????7??7??7??7eZ?????9??????Q\?H-2??QJo?;`bj&??LX$<?hG???H/x\kT?&x'N??F?A?,?rPuy]??;L??8?K?G ?D?Io?4?F~?^??$&e???4'+??e?F?V@??d???P?w?K?`????D{B????+?w?3?<????)T??
?R]WQ????RQW??
%]???(?*??R9W?????z%]??_?b62wI?????Fz??`????????g?Qq2???u????????[???z??U|???9???F?KG?[T??1??dNjry???YptvLd:5????bs?6Wjq
??3??1mh?????????D????cUf?U
???UR?V-[
??z??P?f?k3???I????8?S?Y???;V
]???f???@-si?F?*Z_768F?????%????Gg?D?*H?o.}q??C???????????D????c?y????)*??Y?$?????6?Vi?C?/@J6/8?]m?JzC??t??
@%1)?????9Yqt$(s52??X}P??u??vho|??b??_??Jj+G~3
?I??GG??]#? ?????? ??????1???\^v$z??P??;?O+M_U?W???i??????????h????:M_U?W??}??<]?9X???A?;??:r???+{?????hplsL?4?????31????M?<K>#M>7{?h?|?T%{?????g??6_p?-??
:x?Z??tw4???Y|????SJ>??Qq2f??R??zZ-S??L4?O
???XtC ?Y?!?n>7D?[??7?????{??=?&???xc???????n?q7?m?k???q????EM??S7???-??Qo????????%??ao?8?????
A?&???z??z??xc8?i,?I ?I?i?I??I??I??1??$??4??$??$???nr??W?X?MJ???n?n?n?n?n?n?ng7?e7
d7.?12.?S-<E{B?BHk
?P????4?C
?????j??59?>?PUww?B?[????????#S??;???a?.Q?? zg?3??A??w??wy[pg(?3??-??????g?w?w?a???V?a
????`}X}??=65?????Gk?9?????Q????@?|Xx b>0????G??????C????!???8?`?|0J>$??	??c??????XtWqO8?b5?PUu?@Y?????k?????5????????g??t>0?|?D??????L4?h>d????Cn??w???????MP??>t???	?C&???>d???	?C&?NP2A}??!??LP??>0A}t??&?b?J2+}????????J2+}????Y?Cf???>d"??????U????a???z???7??8<?M??o???????iz4??\????GY{P at K??pd~2?h??(0?? ??*?S???M???[pyno???[?~??oy??????????7?|?-o??]?????????o???n??3?
@E=??vCcO
!|?)#NIH?
?3?I?-L???RpO8??W
?
S3Q?g?*???v???n??O:?TGO??*|???;?wG?w?xG?wf?N
???:1]????x?X??u?_'??????v0b??l??H}i?N,??);?e'???????=;5h'???????
?p???BIGO?5A?<]?d?C???rr?2Y`T???)?!?:?_t?C???-~??!????+?,|??!?e?\??
p?~>??j????*j?????????*j????T?UT}UU_E?WQ5V=Y?t??kW<.x??!?r?w??y??u??
$*J6%"????st?????????c??eG?g???1??
??U
?-j0???P)??
L?P?V3K./;=???A??%q?3??Q?g?l??
<??$??4??6;?t????????=@$*?u?g/P?????
b*?[;V??7Bh
;q?N????;q?>??v?;u?N??s???'v????b'???7v?;??N?kU???N??IS6-?i?E?(???gv?5;??N??S???=;???9h?<?S??GO=?	:??L??1?????%??A0?y????I????8?S?rB?9I?9AD?4?l?x??????[?
(??ZwF??G?OlD?c=M)?mBA???8i??R$
>?Z????8?o?"???"??? ??ql
?V??"?????D?C??"????;\$v p??z??}?GO??z??}?G???{xO????=????g^??
???F?u??z??)p ???=L?;`bj&??Lh?v???}?T??6^(>%???Ax?@$?/??j????n?]?QH?	??
???2?U2(1?2?U????d????lVBi?M3????7-?i?E????A??#\%???9Yqt$(????s0
?????k??}-}?_K??????^? ?j??M?NF??1?s?????????B??/t??B??/t??B??/t??B?j_?\????_?\???_?\??+?a??7,W~?r?oX??
???\???}?r?7,W|?r?oX????*????E??D?#??????`??\???U?}???/W??????\????|?r?o_????*??Bf??#???m??\???U?}?????~?r?o_????U?}???/W???*??\???U?}1?H?6??V;??????????[???2?N?
z??0?L?
z??0Y??&??	=`B?L??u?	]a??O??<~2/????|/????x?D/???'z?D/????y?D/???'??I?|R/???'??I?|??O???z?$^>??O???5C?&???/???$?=?kO?????$?=??'q?I]{o????Z?F????)KO$Y3b?.?C?Fz??`kO?\4?'I??? d9?c%???????
]???Y????^?qy???????1?(v?b??t??6	?[?z???f??
????dox??-?/????o9????S?rv0?????f??
????d??n?09?|-#?????m?!?1T??c???H??^|6??/w??r??/w????/X?h?J??????X?SU?D?'WC
w]??+\r?K?t?.??%W??j.??%W??
?\?????
?\?????
?\?%W??
?\?%W??*.??%Wq??.??%W??j.??%Wu?U\r?\?%Wq?U\r?\??????.??K???+]r?K???I?&??4.??K??????*.??K?t?U\rU?\?%W??d??&,??0l??`??M??k???	??&Y?5ay?$??&???dU??U]WuM\?UaT,??F?l?
/O?d?$??&]6?2?I??M?l?2?I??Bf??#:.?2?2?I?~M\?5???I?~M??k??_????d??$k?&???d??? dlr:T??/u?L?zSGw?P?N??Gu?R}?S????:u?N??????:u???V????wu-???:X????u??:u?N??S7???:u??yZ?????u??

?xA'??Y\ ?dq?L?g1V?sG?Jf?HG'??2??a???????
?^`$??.0*??{#xF?^0*B?rn"?*?#z?MG
?6??#150??
?4zw&?xl???I*II????8?j?'p??~?D,
O???/??????\0?/2?/????????
???p?_d?_8?/??5??E??E????1d?qc?H??H?p?Xt??SC?QH?	??
???Zt?Yt?Y?0??0??0??0??0??0??af?af?af?af?0?tr?MKlZd?vqhYthY????????????????????e??d??d???`?????Q??	?5'
??F?K?????
?U??sR????D????rU[?$??+?????|???]O?y.?G"????V?q?J???@??Z?vV+??
/???
??|
1???????D????c"3tZ??Zmda??g?VG?????o???r	o?-???=wuZ??
?0?'??e??&?_'????<???S???wE?4X?@?^z{/????V???7? ?J?????K?w?I?)?{?\E?o?
??4x?P?P?p???n? ?W?;?????b5???uj_1???Tm???T????dj-g(??eo0??V?
?4b?h?(??%????y?????????.????i?ajz at GS????0?<?#@04?g?X?????????u?9z???&?&C5??.-???i?=?@h5??w???L??P?=a???rXZeHZu8Z9??V?V??=+??U??h5???`???H??U???Qhuah?8?j Z5??V?E?F?F?U??*?h?????%6-?h??V?E?F?F?U????h???jDZ]HZ5??????L??*?bE?X%dP??I
???]????W?????U??*=}e__?????W?????Uz???	????aL????'?:`?????Y????:+?jg????M?HhT???&L??5??Y?n2R?%??
<??V0?Y;?xO????5?	k???'??OX???&?????5??k???'??O?MU?WU???_V%y[???*?}U???7V??????J|i???*M-5[?e?u????????H??@????H?z ???$_$|=???????|=???@???_TK??<Fb???q:?N'???>??ub??6??H?Z?3ub'?$|n??s?$?$~n??s?$?$?? ??I>7H??A??
?7H???? d\?\?????b??tY??A?+f?UH?(?e?????n?o???&??=?o4x>{?????kl?T??G\?T,4?]?7????U?T???W]??Nu??.?????gO5W}cLe?Kq:>)"?=<???i??h?????F????*Y?j?w???]k?L???|*????R?Y=?U?/h???R?e?P??t?L??t?w?t?,n??E2?#?5?iS????d7b?~??:Z??????I???`Gd?VL????????????P5?T?U???P5???????????4?Z?????
?9??D?^k}?4?n??;'
w??9?s?v???9??s?;?hw??????m?v???9?s?;?h?k??u?U???9??l?????s?;?w????ep?4??Y???za
??1?????;'nw???1q?????????L?????e?v???.?;'nwN?????mv?<????????2??<?.??????2?sv?y?]?aw???ev?<??y???7?3pv?y?]?aw???ev?y?]?aw???2??<?.???????6?????`.m???P???????r?????i??^?]????1??u????.?????d?"????/?.|3v??b???
??^]??/?L???f;?
???87?\????c???[??0
?3!d??oWZ?U???q??
B?^??????M?.$i?^???HP6+??N?SC!??e?B????U?4?W?	????S???????s?g???gOUr???56??????&t??5?F7?????f??
???R2jp
??)???	?j?SPC?????OA?x
j?SP????????x
j?SP???S*F{?????o)????m=?&}?E?}?	?lm?tm???????Kk???,??]Y:?'??V????gK?
?B?????%??2?G!A?&?'7D"?n???&>??@???"B\
D???-?('????c??v?/?G_?????U??h? ?v?
%?e?H
?-??????[?{?}k *?+U?
V??dplS?$!OV?????fh}RT<?36??d??E??}!Z7??
????.?????.?#1?#?/??bu???j?^?`Q|+??"=*??"?(???xO????Hw???hNb??HS^
]???V????l?t???f??[m?
C??lv3C???n??5s?fn??5s?fn??
??Q37?????Q7??
???n6A???V'?:A????	????Ln? ?8A?q?p???	?M&7Nn? ??l???Ws??d?=?@h??W??????(
?3?I?pC~??t#+? P??I????F m"?????? 1???,???H?,8:;&2?\???K_\kp?klpL[??]c?????#????????????o???? ?j?
}??I????8?S?????1?5c%j?K+87W????l?CF}???=`??eG?g???1??
??K_\k???C????(???%????Gg? ??2??i+J?
??,???Z,;?e?WVse?Vc??]_M??RY
??I4M??j?v3x??+?'k3??????(
?3a?
?Q2???%????Gg?D?*H?o.}q?? glpL[?A???,???H?,8:;?<)?^?-?cB?SS'iM???Z?Qq????H???{O?????f????
??@???????????%????Gg?DfU??E?&?|&ZXP?4?????xPY??????w??T??????$<e]?h?`
?B???@9??6{?R?#@04??5????9RE?{???????@JKL?DQ` ?	!??????$AN????D??HR!0S?
p?Y?????},3?
???f???@-S:???\?AI?ve??c	 '-?GG??j?JDr6A???dS?$??3wZ	C`R?@??S?Y???%????Gg?Df?????z?%?????J??	{?#?????*???XC?s	a??=??~?????{Y!?c?`oK{??? ????=??????|=????????|????u)_/+?zY???:????zY?g8?C?4?????do??H3l???r?^W???X???z?,???R???z???Yp?c??T?VRm}2K??mO??'???????????b???????d??Tc????	1?d??d??T????????F<??zO???V?? ?Q??=r
A_?r??5??0?i(_+V_;??V?/ {???????=_@?|
??d??=_@??????/ {???????z???<k/?U?r?@wi???XslD1?%?'a??????bl&??F???????
????v?IM./;=????Lg/sQ?j?P???36w??Z?????i???[Xc??eG?g?QW?E?? w???z???????wt?;??]???xGG?[????????w??{
*w%w??5?V?????G?XW`
?DC??????2???Jz??`??Bu?;q??,0*Bf?????#@0??}?l95<?:?0
v?.???$?mkv?/???D??l?S!??$3 ????'???2
???s!?a$S?? ?|`x?
???'?:q??IgL2]???L?d?0p6??!#`?.~???fr4M?W2??????dJ%?)N?d&??(?C?*?o?_?`
_m=D;"???`????v??T?([??C??*??Q?n??:
'D'????????@tB :1??ND'????????@qB?8??pB|8I|81>?NN?'????	????p??p?S?pb?81V?`??????-'.']N^N:??d?9a?9?s?1??A??Q????	??I?F??5'?'.N/N0N1N?O??'
?'??'	?'??'	?'??'	?'F??????????D???A???oRr??????$
???$!?$1?$A??(|?0|?8|?@|?H|?P|2??l??;
?e?y?H?23??)?Uc?S????\/?\s?b*Q it?????1	???$?Y`T?h5L?F:?f??4???????????~C?%/?S
,z	?k=T>^1??
??V?V??W%??*??o??7??:?
}?~??C??Q?D	?!J??(??~??!J??(A>D	?%?C?pCK??n??n?t7???t?{?????vCw?????????n?]?j????4n???G?7?`7S??????|?V?u???-?=?i???,???????V???
yfb~&?Y?j???eZ`$?!?k
=?2?Z?G???g?D??M?????JJ??Z???/??R??)
m?*?G*????"?x?Y`
[??z??U|??Y?(Xs,?????M?Hh?d??J{??`?F}?2'5???H?,8:;&2????_X???B?+???b?alpL?9??]Yry???Yptv2?-?@???83?x?b?2?p?H?,8?86+s?????????YptvlS?.V[?z;FO$?.?;"k????U?P[?0.`]\????Uq
????,??".`A\?z???p
???[l?t?? ;~????G???VQ?
!R???C Zj\X????~YZ;F?`?1P??V%;?e?P6?t ?}?3????#S? ????Y?#?92}#?52<#?1????
\*?R<??????
kO?-=
u?i???Pj`??1???x(q???^??????????????????Tu9????m??k?@P??
M?m?{??PBZ?D
p?s?jV??h]?K?l??+V^??????W.??ba?+?XXy???W,??ra?+?XXy?3???)??Z^??????W??????+?W^????5?W[Gy???WY<y???W]<y???WY<y???W.????I?A?,r?h??$m??Z???*??????*??????*?+WI^e??? d\??M?%p?\1??{?;??
+c??vl
?H
DL?^`$?!?k
PQT?
E??_?&??????r?%????Gg????=??}?????<O??J??{???? ?g???OgG?c????qu^Y??W????x^A?7??	lGG??F?,D?&??????o??*??e??r?RI|\#?
O;?
?3?f((R?????z?v4?8?c?W??>???@????B?5????A???d)???d??@=?^??r?5:???O$????k?Q???H?l	b???%?	K? &.ALX???1a	b?%?	K? &,ALX?????%?I? &.AL\??d	b???%??K? &.AL?1q?a????e??????1o??????X????:???u?X?ub?F??jK?,+L\V???0qYa?e???
?.+L??0?????
?,+L??0????e?I?Bf??#*??!y?l1??$k	??%L??0?Z?$k	??%L\K?d-?? d\?|`?O?????[??j???%??
<??V0?Y?6w|/p@?@?Aw??@??` !3D"??m????_TG??"`
?????.q
E?6?????c?Xa$?!?k
???3'12(?????k???8:??J(?X~?????P}????cV?qT?5?i2?G??@=??*????b??]$*J6%"????h?????M??
?iC?????????D????cUf??
<?T?+
vD?f?????%?v???}?|[??<.:?d?'I??b?riu?&?zwA0
??(?vEi?N*?tR?c???C)?7???=1_?&ii????|?
?p?b??IpSW?b??B|G!r???|????g?Q??i*?<x????#?D90"??7D9h$iMV	?V%????%?7??????F%????]n?IZ???????V%&??J??7?0o?<+?x?{?{?w9?9???T???cA??D$tU?8????M??
?:???K?.;=????L?hx???4??????????????,???H?,8?:?sO4F??x%D?f?c[?Xm
l(j??&?????i??j??zIX?^W???>Q:I????j?[*???o?????+?R??@?d[?@?$b?=
?#U????H|G??;RE?#U?]D??z??y?
?<??????f)??|c??I??!??,???voH?7I?7$????????M??M??MR?M?M??M??MR????&i??I?&)?&	??txC2?
<?!??N&?????$?????$?????$???M??MS?M?M???U3O?u???M?????-Kh?@K*???h?@#?(?DA,???h???
?????? ?^8????B??k9?
?.?+\pW???p??*??????E?]b???3??w???1xg??w??]b????3??O???Ciw???%.?5\?pi7~n???[?no?-??[??xo???-???B??(B??\?KBY?D???
w?K?+\?^p????{?E??.?\x/??^p???"??????-v??< ?`??"L??25=83=81=8/=0-=8+=dRzpNzpJJ???m??M?+?S??_?,?d?w ?Y?y???;??c???}??????v,??c?gK?:c?g?}?lm??YLl

??o?????????O???&???U^?-??m??i[??m????O???L2??T*`Y
G?	(&?{'?e?H
?<?????Pw??&??<_=U?N?z????~p?Y???np^????k?g???WOMr
"??B??4
??
"?:k????D?,!:3>g	?Y#s???%&??s????f??p????J?5???x???#?D?AX
')??? d9???&~??? I????Z3?}	????????3Q??6????)=??x???oL??$?Y`T???!?????8??s???K?Q[???_[?????C	$?Q3[?wis?VAkw]9tmttlr,&G??????#?????\3?1??F?????TbV?
;"-%n??MU?9
n??M????6???????6??M5???6?mS?m???J??5?U????B
???T??`?/?JUL?v"??Y`T???M?@*??7????d??'????W|?????????!??S????C?H??d??_z?blr???cNjru???YptuLd:E?????J????Z?n?X???b%d?(K?.;=???A??M?Q` ^	????E;9_??H?lT2)1-Tv()B????L
?e?J?;?F???6z?Q??J?????b'??;??:G\??Xt48v8?b:??
?l?6	H???K?d????????%?K??K????%??e?vK
w???o
????
r???x??7p????.o2???b???~#z"o5???? ??6??e?M?????'?
??V?H????O?
??? ??K???'?Qq?
>?Ex?G???'???7??\????NP??E?????b????i?y???($>???m!nB&???`Y
g?????????????u??\`???`?[d]??? ???8/???3
?V?EcMt?m?iz?4?K??5M???wI??$??Is???k??%i??4w???
?3???Kw???$??)q???KJ?%	???v&??????????????????????]s??r??s??r??r?>8m?????n4?Sv?Sv?Sv?Sv?Sv?Sv?)??)??)?K"?K";L?eZ.?p???)?&??R??u?U?YWYg]?????7????

??a????4?A?H,?DQ` ^	M?????
F9#@?IlL#?N?zH??6O?u????Q?@H?$???E??al?????@(?????b???~X4??.X<<?txp??????E?K??-X.<?Xx`???B??2???!?????`?xH?x0_<?,???s?C?G??Jh??,j??z??%?G??~S#A?????????????,???H??????????}?i#???????Qw?g?????A????*?&I#Q$???	8I??rw??Yw1?.&?????sc?b???????q?b????qL???7?,"wDbz???????br?WI???8:??J(M??
?????L??A??KT?t????Y>	??H?>???Hl????JN?u??-W,
WY?\??\e1?b)??Bp?e??E??T??pE?Ze??ZJX??[55??VI
?f?U??*?`?D?2??V??U???_??[?
??G<??CZ?t?aA??rn???*K?Ur?,?V.?VY????[u????m????z?k{???]ywv????????A??+?+n???????????[qKo?{z+n??rWo?m???????????Un??r?m?[l??c[?&?*w?V?f[?>??7?V??????U???????n??{T????Z?7???!?!B7	????Yxn?N???!67????Y`n???????g???q??0?l?r6L8?M7&??S???f?4????!l?6f???`?\?1l???<?1
l?6Y?mL???S????y`???,l??7$?M??D?i"?$oH??$????D?!o??7$?M??^?\??x??????7??????M??or]???1?o??7???d?M3?&???I????7???f?M2?&c??????G<??CZ????7???d?M3?&???I????7???f?M3?&????]????-?&k9???E??x??lq?[????%?,?ty'?;Y?????:Y???No???N?vX???>^??????Z
????Zn_?'???m????????^??????O>
??z????#?~eG?gNLv??????d<	?z?z?z??BU?-?BD?Ev???%:???N	??*????Tu?8???I??F%????????&+??e?G2
?+P?7?fm?=???c{?p??k?:?~?[????2??I?"????qa?? a\?+.????(1H????v?l???j?L[??+?AWv()B?J?6???#A??D?m?b=????<J#?eA?^??>?R?i?S??<???D??<???KZ?GG??U	??v???9?!C9????w????LJd??@3"???d????L????m?6?s??????T?zk?0?|?q?3??<?8????a???C???h?|?p?G>p????.=??4
5????O%?x*q??G<?8???O%?x*qlO%?x*????<z??/??}y?'/?c<?XQ????"<y???v1K??Dle^?X\???E???4?X?X?7??E?????H?X?(ZdM?pI?pE?pA??zh???"??EC?????i???HbZ$/-???J?$?Er????HFZ4!-??IG???d?<?!?b7&?Er?"?g???H?Y$?,?vf?E???9g?$?0??ZN??d~p:?????t???????l?:??W's??9?2D"??N???????	N??6>

?}???l8??x????o?y??n!?A?#??[O$?'2?????\?D?z"U<-O<?$??O??'r???#O,G?\?<e9??r?i??'?#O???,G?H?OY?<?V??T?L?O&?'????????????$?????&?????$????'?S??S??SR?S????'2?s??>?~?a`u????SWOY]<eu?????????.???x?????E??????6?P????&??????

f???d6Kf(???Zf?k???e???Zf?k??^?x-3?????2^???q??????o?Sx?8?>q?m?????7???#?+xS8??4?}?????????;c?4=?4=?iz?s??RbE??P!???.*+\?"???????AN?O?O?O?N?O???R?F?F;i?,??A???Y$p???Y8ga?,8gA?\??n?D??????l?n&?ie?H?u?????_@???@?J?m??d?F
?+?
H???]?ggo?? 3i?????Ve/>??W??"??F????
_???s|yN^???s|m?/???9?0???*??2E??"??c|??"??
JyG???Q?F%??jc????&+??e?JS?T??!?ph?C??:.s,#?????"$iMV	?V%MZm
???F")?a?<@??_1??,??I???:L1w)t?r????W.??r?????U.=?N(?
A#??I?-?'?????z?1x?X?K$]?ej??Y0}??k??YP>
?g???????d?,??????O~??a???^?T???1???L??0???J?v?>??pL???????\??O?3o?????dZ??i??)??????J>???A?W???T?????????HK?J>??%??|vh?????? ?[?)?g???B??j%s???????8??n??4*??h????~??^??K>??????CL?8?psY?????<??c?# ?M?:=????e??u:??SfM?1?l?3????!uv?3?????gC7?Y???:?????z~?s????t??n9Y?O6???;!?W??&?d????b??sO???'q?????p????'??D??h?l??Ob?
??Of??~R????'1?I-~????'1???>??Oj????$?>??O?X?f?a
8?%??+]?u???u??i?M?:???\?q??/??? QYPr(	?@?,Ft?????&{???I?O?nr?????'t????\'q???\????9???~n???????c??y??????h?$?	V&W?X9?rB?d????.??#???h????5lGm?6&l??2c?)??M?2ur??_???????FF???f?J??8Iy!?`?i_????oU?????AF&%???d?IZ?GG??U	?m?
5_??y??'?qG?c???? ????@????Rn?|?y??w??xe&?l?7?+?,?????????-?f??????p3?mF???????fy66?????bs???8K.?L??Y8K
?????73?f?????%?ff??T??g?%?<?8?z???f;?o?53?f???i53?f&??l??J???,'0?	53????f;8???.??s?j?x????ih`m??
?,?U<N?MEo|?O-??a&?y???7???)???U<	f??vS?3Iy!?`?i??? ?<?v???eS4??????Mxk<s???2f???#c???72f?lsF???9_d?sE{[=????U?l3G?7?r?B2?H????-K`<?,??J?Y%sN??Q2????$s.?2?d?]???9?d?O2??????lSLnL???r?h^??@?V?????G?*??a?6??
?????{?
Zox????????a??h"?R:9??^???R?i)?A?.???W??E#*/iMV	?V%??z?h????????????i4"c?\?w??i?r??pt$(???2b?=????&?+?-{??S3>_????l????E???????,?????,?????,????e??Pf?e?/Of??d??'3>1????}W2?????????????mn?????mn?????mn??f{?6?Gms{??~???o?? ?????o?????}???????|?????c
??27??7?.p????????6:?????????$P??{??G?G?Z?? QYPr(	?@?????M?UC??9???eG?g???1?????#:?????
?9j?????,??I??e	?b???49[t?????-A^[T???-?i?k???3}s????3]r???p???8?????8????~?dg?I3?h??@3?g??????N3???????1??????zr?~??????l=0????l?`m??g;zKO?Px?C??
/??????K{(?????
o?????r???l?Y??1?d????????$Tf?H?vM	/dB,M?Q@??????????p"???oY???L???$4;?G?nS??F?)?k???!??????????????M_?????????+??????+??????+?7}??W?7}?g??)?"?2?6?!_???????K{??
P=??%3????bZ?P????k?j?P??-??B?j?P?-?h??A??WB+?FL?????`+???VT???
?tR??T?/?~???{S?_:)???W???BU???boS~????
?*R???W?
_?*?
T?+P??@?U?
T?+PE^?*|????/?{?,8???lE?r??R?oHyC??
??7?
??*xC??
?"oHU??&+?\p/???o?m?b?vo???-???B?y+???? D?:
????d?<???gB
?v?o??????N??????G?????<_=5?i?@????????
mI?F?p??'?D$
?#??K??????}N???C??B,?'i?F???????4Zq?u??]????????J&%?FFa%EH???8:??J(M?C??Nv????m???R??-I)??-??R??)??R?u??????J?????J??????????L???L???,?R?oV
?f??oV???J?????J???|???oV???J?_???J?_??PLy?8?z?-???`?{0?=$?=??Lo?6|???(0?C;????0???v??C4?&?MT?S-ev??`#X???u`X????&???\rkN??j???-?mv?efi#?>-X????????	???????5????|
??k8_?)?N??p?}
??k8?_?)?N??p~Pg?'??q`?O??OF????Dt<O??'????x?P???????6o?U???7De at Yg[??6<N??6|RFbi&???=??t?>T?z?:?????G???????q?0?4E??x%4	???
nR??????'???#?dR??b?
R?$????#A????`?A?wh???o?dR"?o??IZ?GG??U?I??????Oc???/%??I?u?M?"4Iy!?`?????.?A??G")????)?ehdR?34????d???????j`^x?m({X?x?o?'OG81|+?\?S???5?q&?????????oz8?????&?F'Oi?I??Qw??$9?X?????S?,???;?D?x????9????*3???h?????A???????KM????+??????j??IM?.;=???Q???s????
L???9?)I3??#?#?F.i.?T?2?&"?C??$ir9?? ?@???4?H?a?A???cu?,??o(?6uO?+?x?H?	?*???M?5?=+?????D????c"s???x?????;?#]??\????!???/OG?&??z??e??????????81??eG?gNf??1??)~???;@'O?? ??8??k?g???WOUr???F?H?I?p"?Q?{/c??|? P?#PG$?Ttc??IISqc????&+??e?GM???fc?,???H*|B????	O?gO??oD?WgQ
????N?;?????9|?8?7?cimY???gW?#?t?e	?G?G|G=G?F?F|?#?????"?"~/?x?????oV
F?@x?Q?4/????zG??QI????Q?$8??`????o?F?A?*????2D??????}`??&?{
?N\?u??:??????~_??b?n
??@S?>?????]#?=?4x?y?:??jo??&+??????a%x`??%?h?/??SC??_?i8Iy!?`?'A@H>???z	?r0$???(??D9?`H??!Q?D9?????Y????????????iv]??????jf????+?]?1??bv]??n???e???????V.??[v?Zv[??m??c?b???Vy????{?s?H	7)~ND?????
)???]?o.ndR"?7/7R?$????#A????{??o???J?RtY??????2?????'/????{?:?_?#??w?k?oT%?e?H
'B??B?B?K3Q???c??????G_?+?'?????F??p?`???@ouZ??V???l????[???j?k3?????????m???&?v?????j?*???????$>m~???k????v2p4????????~???U?[????????P]yB??mQ???%)W?Y]yfu?3?+???<??????3?+???rfu????gSW;???l??????M???m?Q???y?C??v@?cS??I????Zw?????N?M9e7???)?i?????'?e?H
C	e?:?*\??????|Utg?6
???#???
??@???-[???????2)????$?????????p??,0*BV??#jh??x??]???!Mw??pW???a??&?+????$?Y`T?H?v?&?k=?8????6?P?????&??????|?
b5\?m0???u
?:@H]?U???c?fdR??c?f?IZ?GG??U	?m?M??7|B?7????HlP/	7)~ND??4??
?#?+?LJL??J???5Yqt$([?P???R??? *TG?(i??U? zDQ55xU
NW?S???58u
N_?S???????)mpZzU?w?Cv???X?+?????D????cUf??M???nH?WS_??????,?????
6M???
"?T#gV2
?7}UrII????8YS?6
??r??'Qkq?????m[?????F???'?
??3?+6?5Q??w]9??????XS???1'5???H?,8?;?l`L?TQ?Ce??????Ew(?
*?SW????1j???`E?e?,:sb.^L???Z:OW??	??D?????d??=rG=?>??
?g??Y???i9?<NI????l????L???|)?? }???<?S>K??9?????w[?mz|??m??6??
????hCy?<r?D???????S?3?	?|p::???2g??y???>ps???_k??W???????[?6z?Q???t?5?;?????;????N??i?>z:y?????S/;???Y?????S??uY-???pC=?^??m?zh?-t??????Pw?=???Y???s?????v??%9DV???&z??)?^??Wd???+?????"{???+??????{E?^?5T?Z7K???s???hp?p?}????f??mk????}mm{??[??????>?xmB?vu??W???*??`j???S]????nC????
"Z????So??v????&??5?m?????7VZ?K?m???C??{???????n8????P?H8V?T|???L?xuHV	??Sl??U??mh?k??m??b?m?]?G?xl06??`????[??i??u?}????(
??
??w????????	u???{??;_??t?m?`???d?=?s??????h???????|?[??}???f???6?n??y+z?J[??K??bj[???????w?G?m;=l????k[w~????????????K????D?`h5p40?mj??~_??????|???s?j5vm?0vm,vm?'v?#vm?v??
???
???????{??n????;:?[?w???:??????&??Jj"y??[??o????m???????{?@?PBY?D
pj???z?
???.??
&?H
i?C??:??????????IZ?GG??U?Ic??F??F8~3K|#???%??H???H?L?H?v
?????p.?,?}?.?^?-???#AY?d???&?W<)??e????i?l??9?}N?????X3?????,???H?,8?:&2?r??7???Y????=??'G??s????<???#uOg?d??W?HJ#?8B???4~??Q?~p'?C??u?????~|?y|??h??|??^3H???{???4~??Q?1???
????oI?;?-?"quQ?????o????????w?Sp?v
??N?y?)??????S?n??????j?6:??T?:??Sx*?????+?}?w ??????;Y??N?S??RPwj??NH5???Lw????Z??N?+??Dwb??N??sCwb^?N?	?	??;1t'???9?;1??S?AC?!e???????I??;1b???;1R???;1B??Dgwb v'aw??0??*&"?&0	,???????1o???eq?5???8??????Z2?????twL?o8M at UWox
?F?k???Z????Z+?????D????c?9?D!?2C??>n??i?m4????f?l????U_??
"?????	?????#??\>?t???%#?E??4I"?<???f!MB?A/q??l??PD?"2?M???PD?"?)"?"?("?"?*"?"?("?"2?EY?EY???<?0?????4ix??Z???o?
')??? dlr?0?/?????u.a`???Zf???9????h???l4?????h,???3?H4Q?s????????>???????v?NmS?p??????-??\?_?@?b?~??U?WY?_e?~??U?WY?_e?~??*t?A?*r0v?@??T? ???
D?1P!428???A?28???A?2?b?????nU???zQ??????J&%?}KF???5Yqt$([???:?????o??J&%???%EH?=P?&HP?*??v???]k?b??a????	|ttlrL??`Njru???Yp?wN????m?????&~??n??D?6_??q+???????{&???!2_?V?B??????Y%~???K??W??????#???O\|Hn&	?8B???4~??Q?~p'?????w??????v?P?%:??????'?x?>????<|?\????(E??.???^????(?zG%????T??<J??H?{????S?R~?~)O??I9??$?Y`T???)?#?.#???J&%?W##*/iMV	?\?d
?O?w??y? .58???A?j??_
?X??,?h??,(9???N?Jv08??	??s??????08O?+???3??;??E?H??p{8'@???Q[?????eG?g?Q??]?`????	?
@U?X???i;?5????m?M???v}??
2???3p?
C`???L????J?
???"?v
???HzO????LJ???b????5Yqt$(s=?
????A??S?j??QQ??????[{????	?fhdlM?s?K_??Y?/!?#?7????G]T?9B??(rWe??yJ??b??!???,??????H/??????????
~
?1????pw?:^???2?o?/`?G?x#)?!YNy
TO?e	?L"??-K(???O?X??Im???ICR?????T????????UKd????i`#??Ip??<lX$??????G;?Ve???!l?{G&??g????C?;X&I?J?sT,G?r?l?????"?& ?????)t????3??)??Spn???????2+?????3??0??\?Gf????????t??p?]=??`??????O?E???k??=?4z?h??X???m=???r?O????????=?2z,e??C??q??}????6??N??6???d?~b??,?O????IC??B??C??B??B??!z?=??|????A????????;??H???i???????Q???I?(??	q}B\??'??	q???????\?????&K'K'????	????p?:????????p??pbz81=??NH'???????????0BZ??p??u+w?????p??pbr819??NH'&??$???	??Oa0?	\&????VC?(?v?@V?'?` +??t?{???m{?	(??0d?%?U???1^x$?M?/|B|?f?(0????~=??O????<??O????<??g&???}?S?Yus?}?+&?	???YnEVe>E??l0_????????/?#?De?[?7??? X

^?????
?]??+?w???McM|??E?yC??	??{F)?????W??dR??C??KZ?GG?2?#?M%??F??????
?Dl?7??F%????QyIk???HP?*?4x#???o?????????????#^?????IG?/??w?|????G??O\??:???G}?????????;?*??I?m???????u??WH??????	?w`O????O>
>F?{Uq???y(??M????^??????K4?5?z?6M??&?bLH?????????IIt$(sV%??$?v????E?&?{???'?????A?fea'?Fb??
"Q
[...15176 lines suppressed...]
??`??/?p9?$4??4=Fhz?u~?_$=??`(z?^???1%#?t`32?l?j at N????Y^[3???Qj??kj?#??:`p.?#B?$???-??dK [????Z{????????5???%???~??????n?N??c?p\?5	?h??F???????
9?b4|?????cr?????=????I???$?ITSA? {??
f??"?`??$=iTD?PPF?P`??s*2M"?*(8?????????????????????????z}??8
K,0D?`???@`??~??t?O???)??}?E]??'9?h???(q??f0?w6[5 ?`X???k??(
??i??x?Td?D at UP?h?EG???9+??????n?N?????t%???mY????[?AV?? k?v?Uj;???de??&mY????C?u=???TD?PH??
??qNE?ITG??vr??Fr??r???q???q???q??Vq??&?t_/2?????	=????^
	9?(?=???7]?b???4]?2???1]?7{nD8:&??
#~.??3G???n??q3?n???T?sq????k???"??lT5/???L??
????????m}?$?Q2?16?M)???S0,F??9??<??19r????cd?V'???#l?g?bptL??????1?[?
?????-Er??q???
H?
D
q?
??e$"'`?HD?H?????q???	BP4#?1??1??????hY
?????]K+L?????V????!L?$????$??'=?U?0/`
"e?W at B 
???'????G??z???*"p??E?????^
	9?(??????*"p??X4`???^
	9?(?G7??"
??x?
??_?z??W?~???\??u?w?j???O??Q3?.:??PTH
#a?P@??Z?N? (?z?WRUD??5?????)??r
H?
D
q?
^?0Q$?????e?S?i
UA1?UX?TD???U_??!R{$?
???
?)N?P??2???4	?&?(????
??
??
M2L?M??????986G??xH6]Gf?f)?.?1.?q????KM&"p?????d?2?+ !??????-*U@?Pp??_=>j?DE	??KTC??2???4?????hg??UD?Phvg???,?I`??Td???M9?? ?_x?^?PKTD?PHSD5/???L??

?F????Sg?f?Y?n??c?yn?=?0?2K???IPA???bDx??[FI??"????j(6?Td????S??<??6Oj#@??-?x?N?Cv8L+ !pq?"?kn??ro2&???
B	n?2D????s???%?"??????)?"???L??
??v??p??19???????n?N??#G????`%???8??h??z?zz???a/.+?!?:`p^????1oz3?)*$?RMa?j?:%??T??H?1??Q{?2??A???d?G'?????O??????????&?6?n:???!?>?7?Pv???_	R?F??w???lJ?l????a1?c}??>???F??x?k?&"p?\E?????^
	9?(?=N$y%Bi$?
I??????spl???????RuJkt????e\Q
R

M???1??L?LG{????e??t*???*????????c?s&?????d3{????9 ?4???D????,???t?L????8zbL?d??????>?<I<??????$????dxZx?K?J.STH
#?A??2?_VK?)?????????^???@&?L????WE?h???&???G???f????Gc?sq??w?aPTH
??AMA??Z?N? (??u??\????Sx????)???a9????^%???A?Y?/?????x????v??? ?Q???????,?$?1.?/????lS????d???Z/?L?Xg5????(?????6??Ka_'??
??z=??a*z?a??,?$??*????c"'`? ????TB 
???7???cr?l??tE???Z?08G?????Q?q?i????6?9v???Y???.???c}b?R?Z??$??(I??i?M)???S0,F??i5?0g???C??
H?
D
?8rF??Q3.??/i??h??8????????
9?b$???z?cu/???????????V???X?h?Ka??9,,???d???=g??p~??????07CD?H????<??M?3?0g$?
C??
H?
D
?8?pZ-#8
KF,0D?`???@`??m?10%#?$?c?yg?Ur
??h?????8?
stL??E}????cd?V'???#???W{??jo?^?u???o{?n????U_???;?W??jo?^???~+??Ve??p????e??/??|Y5??*_VI??J????????e?d/??zY%?????r5A????#??
?CL?I?IIT?1
???&=?)?<????YMuJ??1??
?P
??p{??W?????J???1?&5E???:	?U?d?????M?}7???l?w?]?M?w7???dOw?????q7???t???n??l?*?H(?vQ
??8?"?$??????zcptL??????1?[?
?????O??????t{?p;??]l??&5<??????V??jk?}?U???zz_m%?????W]=??????W??jk?}?U?~??/? TE	?d#???x?Td?D at UP?h?v?"??H?,?/?t?"=??^?}?b{?????????/??_t??H?.???t??=?Hw.???JE????nb??em??????}}9?M?+2M"?ZPXjT??t
??y?f?)e?Ur
??H}?l%"'`??C7O?)??r
??\???+? s?7d??????a??rE??j??0?8?PQ$?8Q?As?5??rXy?9?&?uI???>?/"????	???cd?V'??Q"](???????*X?""p??h?)??r
??W???A?Y/?,???b6???4	?P18??{x{?k?>qg?f?=????????f???????:+z?s??L?????w{&I??l?????4w??B/?_:o?????GJY??e=4?rT???(??P???,G at Y~??d9???LJ?Q2??:6#??f???Q??Ov?1%?Q3c32?l?j at N????U6?Bd??????Z??j=J???????Y???e?T??AP*
????a????19J??????n?N??????^??!?qRiR???6?)j???I???$??8f????spl?????\&"p????????I5P?Pg{$d?CZ??H^????rQ$??|~???8?"?$??????6????"???D5/???L??

?????h?aRmR??????"
H?
?\???h??z??tMD?L???7??
H?
D
?8?[???f???A???V
?)#?}??K;???Y?I.?*???#??wG??cr$(?7????D???8?:$??
H?
?\??????+.
??y?f?)??#s9?K6[5 '?????:]
?)????f?%m??T?w?Wd?D@??( ?????l
???	???
o??????q??""p??????)??r
?,????
%?|
?*a2N*MJ?W?&?????:	?U?d??D??i
w(?i???x?
?spl???S?o? T
EC1"\Vy?T???1???^DN??D?????^
	9?(?'??????#?m??)?uV? ???Y?I?eG_??vQ?e?T???mR?<????Y?I?IyL?V????
 i?a?m???{?;????{?;????z?;??????F??k??G5??;???S0,F?k??:?
2???^
	??????]?	?F??r?>??????????~?^??w??+?
??t?Sg?pw???
\o?ys????z?????GsU4`???^
	9?(?{?O}?S???w>???Oyo?S???w>???Oy_?S???w>?M?z???)	?6?????B?'?<?P???*,T??T?RR??HU/!U?|T??Q??F?/U?\T?RQ??DU.}?C[?????>??mOl}?[?????<??-Okm?('J+ !pq?"=?1??[
?986??]?5??>???

Ma?????Q9:&G???9z????D???8?}?m^B+ !pq?"=??e|	?h???K6?M)???S0,F??????5+F?d??????;???S0,F??X????h????h????h????h????hu??j??G??8j}?w?=Fvku"??\{?????c?986G??1??986????H??Q2-flF???V
????u??? 9??(~?hy???QR?=Fvku"??\%B~;Z??cr?,:7G???Z?08G? gh?????{?3IGr??Q?N?w???????~E???19ro17G???Z?08?????C?? T
EC????UEB??Q?P`??s*2M"?*(8???0)?d?T????v~?6???	?(?
C??
H?
D
?8???????(
?JT?G???,?I`??Td??%-??.??,"p?f\?s?!R{$?
?,??????
????J??LE?IMQ?4?N?f&Y&%1??&??2??
????? ?	D
X?oz?;0%#i^?fd??l????a1??V??>??A????A?Y??&???	D
j
???RuJA?(t??a????HEN??f
"e?W at B 
??sY?????@?,??qQ$?????????*"p?n??!R{$?
?I??&?IZ?T?r??M9o4???m??T?&5?????XE	???)?"???L??
???_?????"???T5/???L??
???^?MNDN?????2?+ !??\??o??	D
?spl????O=V???qt?ps?????
f?~???6??a?i????O???T~?~?AN??????C?s?s?S?\?t??g:x?3???	????
???I?tF??3x.Sx?
???
E??|???????Tc???s?MD?<rSa?E}M
c#o???????B????K??
??7????f????????^'A?
?\&UPe?V|?O?
???z?l?U?/?j?:%G????cql???k??????^#M2L?kRmR???A???e?=E?bp?kg?J?#????eK??????bME	M^
?"???L??

????v???k?\???j???%??&Gi??c?f?V'???"XQ/?(hy??'???????#yWEBA?WC???4?iVA?
zO????<@????J7CW?08?!?`??*?H(F6?
???!???A?Y/?,???b6???4	?P1??z??/
R

M???k?????kR?En*g????Vr???Yn ?????:	?U??2??j*?w??K??gi?y?TD?}?G-y??????PtN??????i??
'g(?/??>d?z?3$#r
???)??,?????z?A|\D?<?CE??3????J:??9??????????$?M??hH????di?????K?GM???R
??O??PTH
#?O????e?T??AP*
????o???????:?8??v??:+z?a??,?$?Z*????y?B????s???V(mJ?l????a1???~7?
"e?W at B 
p?Ck??w?'E??j??0?o?(?X(????F]?IMQ?4?N?f&Y&e179X@'?&???????z?m???????:	??T??l?}?m??.????>??
???Q?????}????;k?3?0?2????^?>???????F?U4jv????????(??lF?R6[5 ?`X??w\?K?t?l?:=h??
??????=X?C^?a~}???r?????KX?
??z?????eu2&?L???
r??N???
H?
D
?q?k??D???G6???c'sqt???h?!??	D
Iad???????:%??T???^W??>e???_??S????+2M"?ZP?:?????6^Ur\?i
?????Ry?q}{??zw??>X?~X??xi/?s?????(F?d?????lJ?l????a1?}???^?1??<`?h??,???g?`j?,?j?????i	?L???????y="?4?0?eRUD?Q???7????5?kx4?G????~X???u??v????7?h????y?Ov????7?`?-^?S????c???gLQ!)???*g???RuJA?(?^??[~LQ!)??????e?T??AP*
???y?)	?6????6??SX?08/?????F??W?`,??"??????@d?S?i
UA1????t??S0\??RT?
{&?UF??
I?7??)lY-?7G (?????)?V at B ??EF?v2.??y?f?)e?Ur
???}?????19J???MF???Z?08??d?g??p????8
s3D4`???^
	9?(??i????>??????D?m????}9??10%#???hS?f????|?(?
???}??_?Zn??????H?=?tu??y?f?)e?Ur
??h?~???."p?>u$kg???^
	9?(?=??z?k ??19?l?????n?N??#G??8STH
R;???/?????RQ?^?#???????????3???mA??cr9
7G???Z?08??~H?Bd??Qw9?M?f?F?h$????;???S0,F??jCK???	?3?????)??r
H?
D
?8|aX`u"???8C??r??Y??????1_????@?P????bT?l?^????b@?i?)i?????Q????,???t*1z??^???&?F?h??z???????
9?b4|?z?P0%#??*w
?????0???\???
9?/'{???????F?h$????;???S0,F?{?C
H?
D
?8z?(???d"??B???V
?)??????c."p?D4`???^
	9?(?#N??7+?"
H?
D
q~????Q3?.pT}????U_????G?????Q????/~T}????U_???r]??|?DN?#
"e?W at B 
0?y??U1)?q?i????6?9v???Y???.???O??b?F??3???;???S0,F?7?f?8:&G???9z????D???8?u|?-?B3'?&??l????i^??*L?L?cl?!??dw??????n?N??#G?AO]D?,?????)??r
E???}?P0%#???<J(d??l????a1?????q??y?lY7[?????IF9T?F??3>?H?J???V
?)??{?????n8
s"?	7??I5P?Pg{$d??3?8o?A?E'?&?m?&5E?G???I?:<?]f?P|?+Oy?I???0u?Cz	z?{?{z?{?{???L<??k???|??L pf??
?FW4?0?6?????qLWr
??QQ????k?=?rtL????f??Z?08G??	Y|z???'d?i?G??B?\
?(?spl?????t?*???`a^L|?h.
?h??uV? ???Y?I?e{?/??1?%?W_???]?{??z??g????bK???~4?????-??\????f1????^?1?'g?f	?#~?s?<????f]f9"_???/8?????t????)??4??jAQ@`?????Q??
H?
?\??H?]?????G????"??????@d?S?i
UA!?????9:&G??ss?????
???"????j(0?)N?P??2???4	??[?b????R?F?????s?d??l????a1?}??;??$d?d??>????`4JF=E???5?n?NVC6[5 '???!???q???P9:&???rs?????
?\&UPe?{???)??
H?
?\??H???M??I?2	&?j`??~??K?t?W.???_????~??/Z?d?if??e??imZ????X-Z??P????;WqE?IT?K??a?Z9"?#A???f?V'?????e?q????Sd?????????I?
??
c?????J??Fs1,??{????Y`a?b??p?3?"
JP?OY
GHcg?M
?((%?KC????QP????zB??}??PLD????c???s????]?????}r?<?t?a?k:?~?o?????`??4vV?????bQ??Iv?V???!??x?iEK#?u2J?q1?dg_?(0`???/???b??M
A?P???j?*z1x???????e?3yN?^/jj?ZD??"???e??,+D??????Cqz@????!??r??zb'?
???#cT?(???L;?mRHFA?(??<Y.?L?L??2???4A.???LS?2???4).???L??2???6?+????3?????:?+????3?????:?+?\??3??????>???F????d?????tiun??H???????Q???1??3???VGi?????
J?????Ym?B2
?E	??p?X???~%?Z???[???U????rr"8?C???N?aT???g%???6)$??X? ?I:8BI1(?J%]pq?3X??!????0*
JX'B??e?M
?((%?{???LQ`?\?4?A?e?L?&? T ?e?w}LQ`???f
???2???P?X#?Q???Gj??4?Q/?r?!`???fx[L???
+":c?E??]J??'??sp?8?t:#WNxr?/???M5ix$??P??z????.???SRJ?R-?V??)\&???1?????K);??0yN??????W6'?W???HA7s?J??E6q??Ym?B2
?E	?^?Q??0*
J?3??????&?d???
:???????6?????P[i????Mn-????xv????U??)D??]J??99?????'???K[U??s??j??c???????Tse?7?Mnyf???6???H^m???4Uik?T?){Sl_???m9?"j??N?????%"??4vV?????bQ??j??3???
???\6gt?i?-?P??d???N????Ib??p0??
?l??(9??54T???J????????c??Dq??????Oi??/?&|Y6????^????n??y?????e?h/?&{?7????^???2o??k?M?\??4(A9g%???6)$??X? n????i?%[????	K???[?6??
5m-??)lmekZ??g??????6?kCM?Z?>?U?qr"8?C? w}?(0@??/?e7)?"???????D?*x1{?)?%?Yc?%?Yb?%?MB?4?MB?$??C????)
?H????b??M
A?@??(?6??4(a????W?q<+iYm?B2?4?pDv?
?r??L???[	i?c??/?N?H^/f/0??,U?
Cl/????8G??8Z<?w6?d?Z
?????_??????QT?4?WM????????&?s?Ln??F?V5iRm?
'y???P????.T
Oh???I\N/???I?rP
t1?????N???D??N???$??N???$??N???^f=????4(???????6cT?????e??Ym?B2
?E??b?e?
??QP????zB?????????x	I??d?Uhd???U0??\?q????e?????DQ`??%??5??!?e7)HZ???"??F?A	?t?]??4vV?????bQ??W?xGg?p41w?????f????`\1?q]\??????#???#:L??p6?x<???
C???????	??U6?d?Z??B??B?k"Q????|/~???jf????h?f?7?MnacH[?6P?X6)g?{?q?W5cS?X?????M????%lik?*?&e???$nR??'I?????!g9C?r???9?r?3?,??9???v?????Yr?jnW??*?]5??\@gAI8?e7)HZ\?+???c2F?A	??8+i???I!??T?>??.!???]?af?cd?;I??P????v??Z???s1;v)????oDjUhd???U??!?2L?gyr?B??/cO??????f??4vV?????bQ??>?"??????$t9Ff=???
???y???dgC?w??Z???p0?R
???F6?d??bXS????A^9??~??L??3???f?????go?????m?u???????m7m???n&m?9?~???38?E??Tjdh??(L?Q????&? ?	??v?xj?`T????????I!??T???/W'???^?F?F?????]x??*?dhu????6lm?p??????&? ?	??i\?}????w?<':??8?'E?V?[?=??hTjdlTMm?@?S?????`???T?5B?????g???????}?G?	le??ickK?6??!??????Pz?N????Dp<;^*???????S?????Stj???????95"xU????\??T????rU?\??V?*??J??Z???DT?1?$?,?I?? ia??R?[?????$n`??-?"?????CR?
?R
??? ?$f?Z?pZ00??!?;?
?%s?w??_1~?\?3n?N?=??sjD????8?C?:????????T?u??????N ?k?h??d?_???4A???4?
vC`W,???B
$? 0????D?1E?A?i?Y@?e?L?&? T0?Yv?T???!?z?]<-?l??(9??S???LQ`???56??;G?$$?YBg?L?&?E????
??bP?? J?5???? 
????"w??o/?[??,IRK?P?4??7??J????Y???&????q1vA4???M
?H?L?Nm??^n	J???98?9.?.H&\?4??Dt<8N>??x1??>9L???1?s?7?,Ao????(?????G<???bP??????J?6???z?4vV?????bQ????????@?oDjUhd???U?~IE?I
??B???b6?d??bH)?43?(0p?8??A?e?L?&? T0?+9????`H????F6?d??b)???o?????u???v????p0???d??????:%???b
??`T???????j??QP,J?x???????~?s?9?'?7^??rO?>??????i??R????i???6??`X??)lmek??)??l&5
P?Y`a?b??M
A?`,z?HBA`??3~ ???B?2}n ?cd?;I??P????]>??e?J???8+i???I!??qi?7??!?;?
?ZV+????l?nw??0?????~???K??p0?5Wv?l??(9??R?=?
P???!??y6?4?Qr?????a?i-??!?+
 u???DD??c,????K);??0yN????a71vgv!?x???U??W;^9?x??7?L??g;??Z?5?x??&??S?`T?????!,'S?0yNt?????e?oRHFe?t??t??????}?e??BI?:?U?j??Zu?V??Ug???V%?$?????S?????K??4o,???7a??!m-ac*K??`?7?4u*z1x
?05{????g???*^@j?|????f?,0!???v?B?
Cf"_?M?w8?_??~?????3?mB?????????[???s??E?POfXi?I??
???a???c???????I(??8?b?
{?q0?
!^?8??g
?)\?0	O=?Q
G???\?????f????`\1??Uw?q*z1xA?5{????g???*^????1O 	?Y???,Lh????lX??{?T?)
Pg?Y@?e?L?&? T ?x9??,fB?@a??"E?
m*\??H???E?
m*\??P???E??m*\???0??2?I))?Y	??{g?$f
}?*????Q.?7
cT??g%???6)$??X?j??#?K4??a???c???>??+I??????|????c$N??8?????????p8V:???J/??Z??]k?2G???G??tb???=7???/l.|???u<???u~L^?[9???i??[?42??S??J?V?VB??]?P#???~?????nm(+C^????????4pH???D1v????X4N8?n?;L??.&d(?
'E(???5C???QP???P???^?4???4??A)?~??c?s?O?Aotl??J8??[?42??m?p*62????R>???ja?????????e?[???6??????l,?W??_-???C+?6??V?i??wjUZ??????rW{???>?
?J?[?=?_????|?(jY????????v(?%???3,???-?????f??!?e7)?"Pc???%???92?J;?mRHFA?(????eG?{v????c????Z?z??????????s??51t#9?:8_?
????[k?+=?tZ?0??????i??
?J???m|????^?S9???R?j?X?h?<?F????aa?F?J?
??U5{??^LNt???s|?jG?????q%??N+C?u?q?p(?????!???????i??R????i???Y?5???lM??2f	wpX??>?l???mxc?z?????.?)???7????<a??X?Hm/?<'???????sr?c??^?w???QC??m???x??h?B#K?(??5?????el??(.???QM??????
?,??d???????sjD????8??Cr?Q??,???b?T????W?qL?q*z1x??X????u"xU???2&??]n8??8{??0CM?h?YZm?q?tm??k?J????`??f?
E??`0.??9??[8?w^?? $N?????\?"??j?n??????????m????i???hk??5m???????V??mbY???c??}??)n,????1?6?em?????%lLec???}?)??-S????i???????????>???]y?5j?"5?f'??????U1?
???PJ????c*	????98Q~???s???'2?I??P???esF?^Gj????u???\5?U?\%???M??
???????xp\????????}r?<'?????|??me??????Ap??d??,????6??s???
f?&?hXc]??
N???O?y??????++???_????,g?88?9??`Z????;??o?7~c????;#|k???7??????-???2??H???U'S?X????1??i/kK????
T6?M?M?n??S?Fo???qxglj???Y-o???-?5?
Z??eD??O??
??u\\??3DO?A???W??	??%)uBY?????????(???O???\{[9????s+?F??wjUZ??????wx}\???C?
Cf7?;???^???:?????}??????[?J?((?YH=3??6?????????sjD????8?C??8??s?b4????.;?o???????c&??_?d?WHFA?S??Q ?d?S(?=?qjD??8q??.??1?????^`?M???Gv;r??2$? Tf????p??e'?????`?_??g?E1??@?bH?`??d???g??K?%.*?????/?L?????8????M
AH???$??N???z??????D????<~D?Q?G4~*?<?#L
6d??&???4?0X+?`?9?*??e?6?o?Po8\6 ??)4(?/?(?-B9??lP?
?l??(9???)??)t
OM?????
?????.v?$?
?????i??*?
??t?Pa'??M??q?????1	?B????[?".|n??!???u?Hqk??!?YiA??B???lt
?vX&\a?
???
a ?.?DC?v???/??_xJ????????#?+??/{??G??O???
??{??sp?s\???#c?
????????????a\???rA?Z???!Y???????s<B??!?"???`???y6\?Y??-h???????h8B???????
*c?p?x??W?jKa?????3??]?$|???3D?E?{???B*3??drk/???G???[???CJUE????(NP)?_=????!?aX??!?t^i??v??w#.9rV|PZ??V?7??`???b8+ZVY???CQ?Y(d
?W;???PJ?"x?yQ???}?V?M?Uw?l??????????jir????ak????5-S???lJoLak????%c?????A<
?5?]??.????rV?????i~?3???a???????=3z
i???6,+C^???:mam)k?????q4????????:%???B
c?B$?????Q?W???\bA??'??rjD????8?CQ.?????/t??/t{?s??k????am???e?X(?x??{\Gw?;?;{|o??S~o?G??[s~zzoM?0?????L%?
??%??Qx?pa7?AiVZ??{I-?K?c1??????@-?%htF??e?M
?((%????lv??0w?E???h?S/kr???????/???'??sp?8?t??I?=??x?Fg`w&7????x
r?h8&z6\?Y?????R<?????o
I?a????`??H??:???
OlD????+??)?????n70t+??;???????2??D?$8?s!???????
z??4.??98?9.??*Y?????3???rW?$?\?T???G?????'??O?g?`??b8+??
?W?^\?)???$?1p??????*???1??"f??qv??a??(?!???????2????%397?I57~S#R?B#K?0?W??>?KiS?X???J????e?[???6??????l,???|?????x{|??IEt<8????/???'??sp?8?t?3????8???>???>	???B????Ph???8;??0yN???f??/?i???rkc'??eE?&!v??i<x1;gc?@??F????B?6Pf??nf??x??Yw????B???,qm?8?e^??!?CLk?6?????
r?O?Xw???x?Y_?o?S?????P?????)?c#?W?????????95???-??????5?~????5???_Q????q??(?gc$+>?l??:?T9?d???/D^h
?s??'?	X??2|
??Kj???	u???o
???U?giT?
|a0?????N'?t ???G)?,??W????????Z?J???x??Y??D?g?(??Wd?
??L????????+?G????|E?
'|??t?w~"K_??'}?u????7<???&?S?s?1??q???@o?L5^??	?y?????|v??Cd???`?Bx6\??P???gI??+$???)I:)???U?^??
??|??u??z??0[$??0+MB????(R??z????L??\?	?N?6754?97j?*4"???,?jR???%I?aH?G??
??DT/oLY`??p????B???~????Q???^??$[??\???@a???? dv'r??????a
???????F9w?/?y?%|??y?/??N?????
N???b??
??[??????iH???d???)n,??Gae????-?[\[??T6?MBp???|~?TO??ydQ;4&?vQ????P~?\0U??U?giT???dl??(l<??WY???.?:??Z?V2?????????^???*?????p??5?x?????'?^B?q?O<?Q09??pV4?,??????????8??5?3??XY?w???1???LSzk????Qsi????v?G?a???8?z??????/r?????g???U?h????C??]j?????ZEt<8?FV1;^???O???Dq?|.X?Gx?j?LQ`???C?$nRBE???e????`Y	??1?u2J?q1??t?^:??????????O?|??x???K??q??(?gc$+???G_??;????~????D?
??^[??G??Q?c???]?????>???~I???R??cW???8???0??2?iM5?????<???)??q_Y??0?
)?-????ybZ??1????
?Km5??????`??<P???
???????%t?B?0?A|?5?	
?vR!v???^?8???F55{?8????95"xU???N????????tl??J,??s+??s?;?*?dhui%??.??S?????w????k?????????BN?l??1???w?&??U:?[c|c?????q~c{?sxcJ?l????i?z??a];1?7?????????lm??)???X???v_?7???u???Z?????f~??????{??????mnMK|???p???_7???4lMM{?m???y??%?1?	V??m?M???e??e[??????%??d?lLakIoLo???i?<???8???n>??>?[?G??P?]~
?g?!??^?nx??+r?9??
>?l+???wx???????:g?=|C???NW=Q?l???)??
????????Q???'a??I
?????6??DS1;v)????(?]?,i?>,??g+?????Z:????F???Z?V2???RS>???otl??J+5???m????Z?V2???R?c?M?????^?????*???l?7ySOo???<?@?Q???I???????MJ??????>????_??c}d{???eh?y^?76nc?+=?4?oc?Wziu^?O+??:?e?!?|7)?N?0??????????
:??Cv??6???xpM?bv?????(?]?,i??4?????R
x.Fxp?_5?k??#;??????g)???????r?c???????`C-#?????3??*?l<??T*0@R???2???????????|>????8?@)(?w?~???_????E?A )HX,B???n????-??/??Rm*????;Zt?/x?`?c?(F?????w?=?K???`???l?(??????E???y?O???P?e???0???^??#2??T??????y??[?????Dt????w?OZ9?rn?????X?F?R????tYi??o}??p0?#/?".????Qr??!??o
a?*??|?}??L???~???/	g??(?@?~???F???98?9.?.H&????ar?;?b8+F%Kv"?w??8?p???aX??a?6q???lrZ?????pyR???S???L???[??????Jn???Q??qQ<D?K???$?W}?I}#?F?^E/???
?!H??F?jJEXv?U5{??^H??o4????EjD??x1;?Cq????>:?=?F????????????C?=?CO?6?K#?FA@???.`???Le8????Ky?gU??
AH???O}B???????^?/?^ZFZ??0C"W??P	????????2?#`R??i?{?O????-?5D|?u0ra?]cP???U
?%;?m#??&??%? T???n???Q?#????R2
?EiRO8\?z?q!H??98?9.???????/?????424?k???7o?9zN^<????&???)?????}??`\gE??B?Z?e?~?2^????r?I2
???{I?h?B???l?(??????E??;??$q9~?)????R???$?P??aW?N?@`???$#???`?,??{~:???Oq??Pa??fv!9??$???)?C???|??g?????????amHym???ee???Z??!?-em?\2?Zv8T?Nu"?J??pVZ???&?d????s???(?
*B? ??
*3/`?O??!????i????K???Z???ae(+m??? N?^4???Q???J??9^?W?<^F?}#R?B#?4?P??^@[????.??+
B??S?????????:0?(??????v??X3???????1k??T??8%zJ
B?I??x????I?pL?((?YH=3????\N?????=-?>?S?G?|g?????7??#;???(?<?#??N
GE?r?Q\???
G?co4&????????R(e>??@?}+;?`r??pQ?f???b0.?/???+??kHhZ???x????,>axh?=4?????(??4?gf??????>?CH!EW????P??????7???x?{q??!?????????1Sr???/?biA>47hw??lF/m??^^??????D??/?_?X?&`?F?a0???!*f??l8??n8?^?|g?o??[+T??y~k]?Y??????????[+d???r???T??J+????y?W9???V??ae(+]??~O???w?<':??8f?	1????B2
??R?Y??=^?
R????W??zw????????[???^E_???????V at QRJ?X?c>@??'g`w&7?3???z!?????`?E???_?k?{???0?N?i??
?u?2a?p???U???.l??~c|c?????1?ol????????????f?????lye?k??6X??2?
?|?:???ickKY0?Vq:?F?ar?????P??,
N??I
?u???????M?%??Iq??;?4????d?Z?V?+??:????U?K???Jj?,???r?wvzq?B??P??r'r?J5??????????M????????2??{?T?|b5?_?r??Gnx??O???M>??N???ap???A?P?)?4?h??~???W?????7MD???tias??x[9?2?b??\?[?)?dhui%?u?A*??^FQ?~??KV??/?/.??}?H?FK?
)?C?$nRBE
=|qh?;????]????f|

?;+Pz|?=?p????%????-?Yij??}Ww???<.?Q??]?0?|?O4??????@??JA????wY????qmG?B@?P?X??p@?`??SNt?`(?i?q~??{?k??T??{;q??\???
Iw?=?*?=2??\h???z??z??l?8L???????;??&qC
?9=o?|????s9???p??B/??r$[=Ov??`???????!S?	8??NO?s??+E???gXR??wa?q?E?O?8?$@_?B????
??????9z?AU??k?CRRD??????=???CfvH5a?M???yu???L???;??h'&?6?^???????F?V?F6i????	?I\???????????7L???8B;|?2S??E/ ?/??????HO?a???
?c?c_????
|??WG??????qm?c_?|?4????|??i??/???s??^??j????'d??
R???4La??fv't'????/???+??q?}U|??2^zPq??K?GV???u????n????B?{??U<.|h?i???????%CqVJY??-???}???`?4??N1?U??m??U0???????
J?B?oh

???EIc?r~?l<8?a?>^PM????x/??Ow?????	???cM?G?????????0}
8?????xK/c??FA[;97j?*7~???*4???N?Q??#&???????????$=>c/<??????3?T?'.????,W?
????!??NCX[???????r??????Tr?c?Rv??a??(?!?+???
?u?h??c??p?
?ti????`?K^?????T?????\m?^/|$??)?w??i???>?????.??r?1?ylD????i%C????,???5?J\????/?u?r?Q??=?????|?/r?j??0V??Eo?m??b??j
???????xR??K#?F?????E??0?ea??w??????%???3,?Q)+????x??
?g5???p-?qb0]??W?????`????4
Q??????^????????Z??/?QSC`?*D'??Z?h,7?\?3????B<??4%??X?f!??P???Cn???)???b?~??~???-???g?E(??^???bQ?(0????Kp<;?a????oJ???98?9.?.T??m?zi?+??
:{02[???#?<'?????????dc?
0???
?,??d?k<;^/?O?AJg?n?????QP'?t?B#R?Z???&?,9`?????`p}n?u?????EjD??x?R>?P??C?i?Z?????o??g?E
???+???c?+?	;7???v?l#n?D??.d???$??l!S??????i??7M? ???y??RP,J??zf???^??.??X??_T?}_?j?,???xX????!??r?Ai?Y?f???
ZQ???a???????Cg.?-Cb????I??)????M??>?$??K?N?B?{v????C???P??|?iol
??QC?Rsn??UhDjU?Y???%?G[?GS?GS?G[?GS?GS??/??)??-??)??)??J??/?:?????????20e?j??9?\9ga????????`?a,?
U?/?DjUhd?????\?????	?	?p??????D?19??pV4?,T???W????3~?????
C<?g?E1?uJ?q1?x'n??]????B2?z??B~???T?{}??w5d??\>b??Pl?K?|???@???al?????W:??5m?I$???f?Hc?
^0???"?>%^?8???))E??y??`|RG??????????oDjUhd??o????HB??#??+?.???
8??j?G{?%?y?V??6kC?k??6,+C^???:mam)k?r?:'|-?????^????0???4E?,
?1???M9????????Cg???E?V??]??0??!?J??qVZ???&?d???5?x?*?=?Bf????v?k,?0^=?V????ZY?5?Z?????*z1x??W??????????U????????K??.DO?=?"??K??. at O??<???'v????DO?}z?=k?~u?????tL???PS????L?S#?W???E??????K&???U/?z???H0??/6?S????????X???g???*^Pj?(VF?????%|?2?p???7?VC	n?:^??.
Wk??3O?????5?????[ek??Z?w??6?????[?[syk?2L???F%??t?+?F?a0???????q-v??y=q????N?????a??5?7???1????a?????N?/????V??+C?????????r9;?lX?:/??qv?y?????????sH????!???????:%???B
?=?0*
JX?YIcg?M
?((%???w????Ui%C??V?F?a?W?F??Z?V2???rnd?)???????*z1x???j?bq"{l?+(??????Bq??1G?????".????Qr??????h?P??q?o????~?(??_?wxcHFA?E?,
Cl&??pQ?f?????????T?'??Jc???w^D??c,????b??}r?<'
????;???s??d???;'??	?8???a6?????????!":c{??/???]????????.r?TE//?T?f/|z??PqT???B?????????xp?#1;v?fg?&???????R?g?N????%397?I57~X,?B#?hx ?!?0???fX?U;x???J???a2??????????]??????x50Q?Zn?<???:?dl??(h&'?t?r?75"?*4?4
???`gn???????L???T^Q????P?T?????b??4,f?.???T??Dq???)?????{N?^u^'|((x?XR???_F?x???'
??Fhtl??????[?42??S??J?V?Vb??^??????i???2??"?ty???G??D??}?
????4?????o???}??/0????wz?{??PQ??'??z????B?<?????	??3{??09??pV4?,??cH??+M??Ab?(?%??GZ6???k??~sZ?p?B?????z???-????A
A?p,N??R?=?d?i??????bv???98Q?T?L??!Z?G6??)?"???_<??[???\????%???"?E??&?G$?|<???
Bw??x?AL???N?????O???~???NF??Kg?]C???&?DS?u??zX\C'????j??
?t>0;?`?'?l?(f??	*??!???????E?A?2??,?I????
(?}??????xp?u1;^???O????+???8?g)r4?4?????????b??^#lJz{????????T?s+??C??J??K+????]?I?K?>?Qn?????????????????U?Eq";??????^^??????D?>>?)5"xU???????/yeO?????
f`?2??!????Tg?Wziu^?SM?+CYiL???>?m?S???*????^?>?????U?S?~?E;?&c??FQ	U??jR????Thd!u???????&?s":???q??f??z ??????0??8b?/u??pY/????o????a????l9?+?#5???+g"y???X?Z?D[???V???S???????????????
?-??"?ML8?^7Hj???sH	???9*$???B????
?????l??'X3???B/?#???CheZ??2???V??g?{?????-???|Q??KB8???
?f4?J??j8???x??
^?^4????&??5???^??????u??1??D?+%EK?
??{?d?Q??mPJ?^1R??{?H?z??O??F?!?F?	????iuh5]?[K\??!??e^??!?CLicX?m*k?*?n%????N???g=????5???z??|p?M?F
??????x????S???Q???V??0?????H "??P?q?KW?p?w??8?Z??+^5
3????w>?????Pa?E?\$Hx?)!?P??0?R?]o@?????x/??=???;go?(??8????b??[?Z??????r?m??^Q???O???????)???".?v=???'??2~?0??%?p????????@???YT???c???ul??J?-x=?ridn}???????JL??S\???#!?+??????O??????(??$t8?p??KS????????X??S#???O
?Z*%????-?Y	K?|?????????b?T?f?(?$#?
`??C???)??GQ'?W?????p???`
;?5?????\?Z?2,g??????)l,??BI??2????
x???4oM????FQ??f??.????
??=&w???>9q?N?1??s?G\[r???!m-ac?6???l"qYl`???????>???:R
????????FoZ[?Cq????_???(9??+qm.?`A?`8.]?%yv?,???8????i
(????sj??!u&Q?????l?8???(?_G=E??F?V?F6iHI5
????'?F??J+Z???4??e??A?????????>???$??s?\?O;?^??pP???dQJ???.??|J?s
?s?]?gs?8????4:?rh%?g??[?42??S??J?V?Vb?\?[mF?[T|~??Z??^???@???????~?Ph?A?	?PP??p?_~??N4?be?k??6@#??ymXV??1?u????.<4j?5??M?u??"~????w?9??K??'U???'?d?Fn??[?????????TE?????{?????nO.??V?g??jkG{G???wQ??_?x?0;sQ???{??h?cN-????T pb?(??KV??????o?X??~???*?pF`L??y?\?F;????ZYO?F??\?[??Ui%C?K+!?z[???^?c?0(%??X?f!??(\??}?????8?=#\7????3???[????????#?)???i????[?y?3d??m<u?~?GU???;<?{???n!??7???'`f?EA??uMIcZb??????~??c??)???Z	???s+?F??wjUZ????JL????n?V7?n(???Y??;??9?)?h?"4
???x;?u?v???nG???????????:X??
G??????7?H?^/f'|?l??S???H?<LD??c8?*f??qvv8T????">??????_x?C7?3?????e??c????#r???????t?????1??N
??j?#y??????x??{??[?|???g8<^?F6??p??^L(??C????
????E?????K??.?7?A	??b0??p?l?)?s??????uh??wV:??*???4*C???{?q??k??`??,?z?~??d/?N????nYN?????k?
??U??^LN????\
??F?V?Fv?*^e/8???????^??????UcHkKX??
?p??n
?\?{?<(??W1w-wu??v?/??n}v????????-cb??3L=68 at J EW???p?/
?Qr?;?????N_?KK!??1
Chf??pQ?f?fV?????n???????@.?t"?????&? ?	?????z???&????
??,n"h?R?ZT
:=???????}?=????G???
???	??e???_??
??????Z?Z(4)???????K?{o(??+=??mQA?~?!U*?U?q????8?O???
k?Z???????QK??J?Q?6???l?t???:??o?X?.???[c????G????	V???????#8r?e7?????g\Uf????????T??S?.8?x????G??~f???????3??*?SB???A??$?>??n`(?Fr29?:#t'?w?[`d]Rou?`??@?-?Yt?:k??Z?s-?it??@G-?It???@?-?Qt??@'-?qt??@GU??@G-?It???
??????w?Ua??~(???|Ezm?i??????~?????k%	?P??~}??????3^CQ?
??j???*drw?v8?Xp?&???v6:?:3IT?~??oDjUhd???T0???%?Y?`??8?(??hx4????????v??Q?7{;?HD?.?g?l8^?$??G?$%?s?|??z????^?)t?`?:K???F0?gS>/??x?????f?K!,?????	Bo??X3_J??o?n1g?f?0??h????n?F???????q?F\w?+s
1L?qV??3????Pj???4?;?J??I(0?~?%|???z?S
??^?`?x??6[??A?N0*
J???J?PV?????b????G??rS????`l?????R-C?????h????t?5U8j??+?]<???\?j???S?~
?t????;?
NE//?quj?bq"xN?h?|?O??!??G???Oi0L?q1???????s?c?o?i?W??t???+?????:????=W>^???/???w????!???vfx??????
??+??U?v<|????o???Y?p?
?`?:s1?hpH_W|pC?#????O"?NI??_????wa???u?9Y7?U
|????T?u????K??*??K???-K?????????????1K?$?UZ.?2
t
:?`????bg???9??jz2???,n?1}??7wX?!??Ui%C??V?F?F?FA?0
9??z??sp?s\?????{??-;I??P?eya?KG.??>??????????Q??97j?*7~?[?S????Q???<??????6?u?????m*??|???QiP??g?E(?mRHFAQ???_?????????B???O/{*????????????
?????Q'???^^?&??D??t2?*^????)?q?C$\??i0L?q1???=h!??)?{]ET??k?????09~x?????????,$`?????8?0*
J83?pVZ???4A?@??????y?e'~????|?8???&???j
G??B?????3???????$.{???^???9<_???
??????{\L?6?`T????????I!??T{l????????(?z??,???|!?z??dt???????????
#??K??a???wfq[N???E?O?G?????????????;?O????>?N???V??X?t?%????O??;f=????Ty\:?^F???gu>j??j??C?"[	??N??/g?5?Q?????>	Fy????k??XN?$~??????C??g??`&? ?
?x????\????????Mi???Bp???]??T??w+,??7??18?8Q?????h~???Tg??2???????K?~$??0?t"???-m????????u?p@???x????P??Or?!aG?W`9??g???ot?5
?-?u?e???u???Z81bi+,???Kc?P?9?yy???'??uO??wR>?y1?????\m?p??=?CZ?UR??Y?????;????IqA_rgv???8??^?g,7???l?I????Kp??2???D??????}???D?????N??X0_)*??x????N??D??E???m)dG?S?????%X?????1???d[G??r???G>?????9?9P~g?\D??J?k?y????5S????????@+d?????Y?
??W??B?c|?Zc??G?????:p????k!?*
???S????.??i+2?jV????|y?V???dR????_??????XF?y"{:q$??H]?:7?PR?;?6F?vt%??_???@?[?????9f?I?g???
Qn?^.n??????y2??A?)?="?fn????Q?L?k??#?d?k??????4??0???.?u??(???	????W? RdH/???{m?LQ???C_?eVF?L2?B???
{???????I??PJ?
B?W?y#w5Z?6??gf???????c??a???M-R\?;u??:8????
?t?=|?????[??[?Z???,????t??
u?6?
2???????N?K??jX?W?[??um??7]Oik?m???v$J?\??`.l" ?J?OK??D
^?`??<?d??????9=*P2?5??f????t?????4??`iy??PK

"u!??n????Q??W?~}?%????7?{3
?B???q?????6d5???h?X~?	??j?????1?k??/A]h??=?U??\;nW?PK










<

--- NEW FILE hunspell-be.spec ---
Name: hunspell-be
Summary: Belarusian hunspell dictionaries
Version: 0.1
Release: 1%{?dist}
Source: http://downloads.sourceforge.net/mozilla-be/belarusian_dictionary-%{version}-fx+tb+sm.xpi
Group: Applications/Text
URL: http://mozilla-be.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPL+
BuildArch: noarch

Requires: hunspell

%description
Belarusian hunspell dictionaries.

%prep
%setup -q -c -n hunspell-be

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p dictionaries/be.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/be_BY.aff
cp -p dictionaries/be.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/be_BY.dic

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc dictionaries/README-be.txt
%{_datadir}/myspell/*

%changelog
* Sun Sep 28 2008 Caolan McNamara <caolanm at redhat.com> - 0.1-1
- initial version


--- NEW FILE import.log ---
hunspell-be-0_1-1_fc9:HEAD:hunspell-be-0.1-1.fc9.src.rpm:1222771124



From alexlan at fedoraproject.org  Tue Sep 30 10:59:12 2008
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Tue, 30 Sep 2008 10:59:12 +0000 (UTC)
Subject: comps comps-f9.xml.in, 1.393, 1.394 comps-f8.xml.in, 1.266,
	1.267 comps-f10.xml.in, 1.122, 1.123
Message-ID: <20080930105912.BB6C470119@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2476

Modified Files:
	comps-f9.xml.in comps-f8.xml.in comps-f10.xml.in 
Log Message:
Add pypop to engineering group



Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f9.xml.in,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- comps-f9.xml.in	26 Sep 2008 17:20:40 -0000	1.393
+++ comps-f9.xml.in	30 Sep 2008 10:58:42 -0000	1.394
@@ -1187,6 +1187,7 @@
       <packagereq type="optional">pikloops</packagereq>
       <packagereq type="optional">plotutils</packagereq>
       <packagereq type="optional">pvm</packagereq>
+      <packagereq type="optional">pypop</packagereq>
       <packagereq type="optional">python-biopython</packagereq>
       <packagereq type="optional">qalculate-gtk</packagereq>
       <packagereq type="optional">qalculate-kde</packagereq>


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- comps-f8.xml.in	26 Sep 2008 17:23:18 -0000	1.266
+++ comps-f8.xml.in	30 Sep 2008 10:58:42 -0000	1.267
@@ -1179,6 +1179,7 @@
       <packagereq type="optional">pikloops</packagereq>
       <packagereq type="optional">plotutils</packagereq>
       <packagereq type="optional">pvm</packagereq>
+      <packagereq type="optional">pypop</packagereq>
       <packagereq type="optional">python-biopython</packagereq>
       <packagereq type="optional">qalculate-gtk</packagereq>
       <packagereq type="optional">qalculate-kde</packagereq>


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- comps-f10.xml.in	29 Sep 2008 19:29:43 -0000	1.122
+++ comps-f10.xml.in	30 Sep 2008 10:58:42 -0000	1.123
@@ -1210,6 +1210,7 @@
       <packagereq type="optional">pikloops</packagereq>
       <packagereq type="optional">plotutils</packagereq>
       <packagereq type="optional">pvm</packagereq>
+      <packagereq type="optional">pypop</packagereq>
       <packagereq type="optional">python-biopython</packagereq>
       <packagereq type="optional">qalculate-gtk</packagereq>
       <packagereq type="optional">qalculate-kde</packagereq>



From jorton at fedoraproject.org  Tue Sep 30 11:06:24 2008
From: jorton at fedoraproject.org (Joe Orton)
Date: Tue, 30 Sep 2008 11:06:24 +0000 (UTC)
Subject: rpms/subversion/devel subversion.spec,1.121,1.122
Message-ID: <20080930110624.D82A970119@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3652

Modified Files:
	subversion.spec 
Log Message:
* Tue Sep 30 2008 Joe Orton <jorton at redhat.com> 1.5.2-3
- enable SASL support (#464267)



Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- subversion.spec	12 Sep 2008 16:10:42 -0000	1.121
+++ subversion.spec	30 Sep 2008 11:05:52 -0000	1.122
@@ -15,7 +15,7 @@
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.5.2
-Release: 2
+Release: 3
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -31,7 +31,7 @@
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
 BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
 BuildRequires: apr-devel >= 0.9.7, apr-util-devel >= 0.9.7
-BuildRequires: neon-devel >= 0:0.24.7-1
+BuildRequires: neon-devel >= 0:0.24.7-1, cyrus-sasl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: svn = %{version}-%{release}
 Requires: apr >= 1.3.0
@@ -129,7 +129,7 @@
         --with-swig --with-neon=%{_prefix} \
         --with-ruby-sitedir=%{ruby_sitearch} \
         --with-apxs=%{_sbindir}/apxs --disable-mod-activation \
-        --disable-static
+        --disable-static --with-sasl=%{_prefix}
 make %{?_smp_mflags} all
 make swig-py swig-py-lib %{swigdirs}
 make swig-pl swig-pl-lib swig-rb swig-rb-lib
@@ -277,6 +277,9 @@
 %endif
 
 %changelog
+* Tue Sep 30 2008 Joe Orton <jorton at redhat.com> 1.5.2-3
+- enable SASL support (#464267)
+
 * Fri Sep 12 2008 Joe Orton <jorton at redhat.com> 1.5.2-2
 - update to 1.5.2
 



From rakesh at fedoraproject.org  Tue Sep 30 11:54:46 2008
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue, 30 Sep 2008 11:54:46 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.123,1.124
Message-ID: <20080930115446.4D6C970119@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7836

Modified Files:
	comps-f10.xml.in 
Log Message:
adding many packages e.g ntop, coredumper, taskcoach, dayplanner, dnrd etc



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- comps-f10.xml.in	30 Sep 2008 10:58:42 -0000	1.123
+++ comps-f10.xml.in	30 Sep 2008 11:54:15 -0000	1.124
@@ -29,6 +29,7 @@
       <packagereq type="optional">lat</packagereq>
       <packagereq type="optional">lshw-gui</packagereq>
       <packagereq type="optional">luma</packagereq>
+      <packagereq type="optional">ntop</packagereq>
       <packagereq type="optional">opyum</packagereq>
       <packagereq type="optional">pessulus</packagereq>
       <packagereq type="optional">qtparted</packagereq>
@@ -147,6 +148,7 @@
       <packagereq type="optional">scribus</packagereq>
       <packagereq type="optional">tetex-prosper</packagereq>
       <packagereq type="optional">tetex-xdvi</packagereq>
+      <packagereq type="optional">txt2rss</packagereq>
       <packagereq type="optional">w3c-markup-validator</packagereq>
       <packagereq type="optional">xmlcopyeditor</packagereq>
     </packagelist>
@@ -849,6 +851,7 @@
       <packagereq type="optional">codeblocks</packagereq>
       <packagereq type="optional">cogito</packagereq>
       <packagereq type="optional">colordiff</packagereq>
+      <packagereq type="optional">coredumper</packagereq>
       <packagereq type="optional">cpan2rpm</packagereq>
       <packagereq type="optional">cpanspec</packagereq>
       <packagereq type="optional">cpan-upload</packagereq>
@@ -1148,6 +1151,7 @@
       <packagereq type="optional">geomview</packagereq>
       <packagereq type="optional">gerbv</packagereq>
       <packagereq type="optional">ghdl</packagereq>
+      <packagereq type="optional">ginac</packagereq>
       <packagereq type="optional">GMT</packagereq>
       <packagereq type="optional">GMT-coastlines-all</packagereq>
       <packagereq type="optional">GMT-coastlines-full</packagereq>
@@ -1194,6 +1198,7 @@
       <packagereq type="optional">octave</packagereq>
       <packagereq type="optional">octave-forge</packagereq>
       <packagereq type="optional">openbabel</packagereq>
+      <packagereq type="optional">opencv</packagereq>
       <packagereq type="optional">orpie</packagereq>
       <packagereq type="optional">osiv</packagereq>
       <packagereq type="optional">paraview</packagereq>
@@ -1906,6 +1911,7 @@
       <packagereq type="optional">file-browser-applet</packagereq>
       <packagereq type="optional">gconf-editor</packagereq>
       <packagereq type="optional">gdesklets</packagereq>
+      <packagereq type="optional">gedit-plugins</packagereq>
       <packagereq type="optional">gimmie</packagereq>
       <packagereq type="optional">glipper</packagereq>
       <packagereq type="optional">glunarclock</packagereq>
@@ -3217,6 +3223,7 @@
       <packagereq type="optional">spambayes</packagereq>
       <packagereq type="optional">sqlgrey</packagereq>
       <packagereq type="optional">squirrelmail</packagereq>
+      <packagereq type="optional">up-imapproxy</packagereq>
       <packagereq type="optional">uw-imap</packagereq>
     </packagelist>
   </group>
@@ -3489,6 +3496,7 @@
       <packagereq type="optional">calcurse</packagereq>
       <packagereq type="optional">contacts</packagereq>
       <packagereq type="optional">dates</packagereq>
+      <packagereq type="optional">dayplanner</packagereq>
       <packagereq type="optional">dia</packagereq>
       <packagereq type="optional">gdeskcal</packagereq>
       <packagereq type="optional">gfa</packagereq>
@@ -3527,6 +3535,7 @@
       <packagereq type="optional">referencer</packagereq>
       <packagereq type="optional">revelation</packagereq>
       <packagereq type="optional">taskjuggler</packagereq>
+      <packagereq type="optional">taskcoach</packagereq>
       <packagereq type="optional">tellico</packagereq>
       <packagereq type="optional">texmaker</packagereq>
       <packagereq type="optional">tinyerp</packagereq>
@@ -4151,6 +4160,7 @@
       <packagereq type="optional">dar</packagereq>
       <packagereq type="optional">denyhosts</packagereq>
       <packagereq type="optional">dkms</packagereq>
+      <packagereq type="optional">dnrd</packagereq>
       <packagereq type="optional">dstat</packagereq>
       <packagereq type="optional">dtach</packagereq>
       <packagereq type="optional">ebtables</packagereq>
@@ -4274,6 +4284,7 @@
       <packagereq type="optional">wireshark-gnome</packagereq>
       <packagereq type="optional">wlassistant</packagereq>
       <packagereq type="optional">x3270-x11</packagereq>
+      <packagereq type="optional">xsel</packagereq>
       <packagereq type="optional">xsupplicant</packagereq>
       <packagereq type="optional">zidrav</packagereq>
     </packagelist>
@@ -4376,6 +4387,7 @@
       <packagereq type="optional">rss2email</packagereq>
       <packagereq type="optional">rtorrent</packagereq>
       <packagereq type="optional">snownews</packagereq>
+      <packagereq type="optional">sitecopy</packagereq>
       <packagereq type="optional">tftp</packagereq>
       <packagereq type="optional">tin</packagereq>
       <packagereq type="optional">w3m</packagereq>
@@ -4575,7 +4587,10 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="optional">Django</packagereq>
+      <packagereq type="optional">ctemplate</packagereq>
       <packagereq type="optional">gallery2</packagereq>
+      <packagereq type="optional">php-oauth</packagereq>
+      <packagereq type="optional">php-xmpphp</packagereq>
       <packagereq type="optional">python-cherrypy</packagereq>
       <packagereq type="optional">TurboGears</packagereq>
       <packagereq type="optional">velocity</packagereq>



From jorton at fedoraproject.org  Tue Sep 30 11:58:18 2008
From: jorton at fedoraproject.org (Joe Orton)
Date: Tue, 30 Sep 2008 11:58:18 +0000 (UTC)
Subject: rpms/subversion/devel subversion-1.5.2-pie.patch, NONE,
	1.1 subversion.spec, 1.122, 1.123 subversion-1.5.0-pie.patch,
	1.1, NONE
Message-ID: <20080930115818.262F070119@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8452

Modified Files:
	subversion.spec 
Added Files:
	subversion-1.5.2-pie.patch 
Removed Files:
	subversion-1.5.0-pie.patch 
Log Message:
- fix for zero-fuzz


subversion-1.5.2-pie.patch:

--- NEW FILE subversion-1.5.2-pie.patch ---
--- subversion-1.5.2/build.conf.pie
+++ subversion-1.5.2/build.conf
@@ -452,7 +452,7 @@ type = swig_lib
 lang = python
 path = subversion/bindings/swig/python/libsvn_swig_py
 libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr
-link-cmd = $(LINK) $(SWIG_PY_LIBS)
+link-cmd = $(LINK_LIB) $(SWIG_PY_LIBS)
 install = swig-py-lib
 # need special build rule to include -DSWIGPYTHON
 compile-cmd = $(COMPILE_SWIG_PY)
@@ -475,7 +475,7 @@ type = swig_lib
 lang = ruby
 path = subversion/bindings/swig/ruby/libsvn_swig_ruby
 libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr
-link-cmd = $(LINK) $(SWIG_RB_LIBS)
+link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS)
 install = swig-rb-lib
 # need special build rule to include
 compile-cmd = $(COMPILE_SWIG_RB)
--- subversion-1.5.2/build/generator/gen_base.py.pie
+++ subversion-1.5.2/build/generator/gen_base.py
@@ -411,6 +411,9 @@ class TargetExe(TargetLinked):
     self.manpages = options.get('manpages', '')
     self.testing = options.get('testing')
 
+    if self.install == 'test' or self.install == 'bdb-test':
+      self.link_cmd = '$(LINK_TEST)'
+
   def add_dependencies(self):
     TargetLinked.add_dependencies(self)
 
@@ -453,8 +456,11 @@ class TargetLib(TargetLinked):
     self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
     self.msvc_export = string.split(options.get('msvc-export', ''))
 
-    ### hmm. this is Makefile-specific
-    self.link_cmd = '$(LINK_LIB)'
+    ### more Makefile-specific stuff:
+    if self.install == 'test':
+      self.link_cmd = '$(LINK_TEST_LIB)'
+    elif self.link_cmd == '$(LINK)':
+      self.link_cmd = '$(LINK_LIB)'
 
 class TargetApacheMod(TargetLib):
 
--- subversion-1.5.2/Makefile.in.pie
+++ subversion-1.5.2/Makefile.in
@@ -2,7 +2,7 @@
 # Makefile.in:  template Makefile for Subversion
 #
 # ====================================================================
-# Copyright (c) 2000-2006 CollabNet.  All rights reserved.
+# Copyright (c) 2000-2006, 2008 CollabNet.  All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution.  The terms
@@ -151,9 +151,10 @@ CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
 LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
 SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS)
 
-COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
+BASE_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
+COMPILE = $(BASE_COMPILE) -fpie
 COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES)
-LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
+LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(BASE_COMPILE)
 
 # special compilation for files destined for mod_dav_svn
 COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c
@@ -168,8 +169,11 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF
 COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
 COMPILE_JAVAHL_JAVAH = $(JAVAH)
 
-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
-LINK_LIB = $(LINK) -rpath $(libdir)
+BASE_LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
+LINK = $(BASE_LINK) -pie
+LINK_TEST = $(BASE_LINK) -no-install
+LINK_LIB = $(BASE_LINK) -rpath $(libdir)
+LINK_TEST_LIB = $(BASE_LINK)
 
 # special link rule for mod_dav_svn
 LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- subversion.spec	30 Sep 2008 11:05:52 -0000	1.122
+++ subversion.spec	30 Sep 2008 11:57:47 -0000	1.123
@@ -25,7 +25,7 @@
 Source4: http://www.xsteve.at/prg/emacs/psvn.el
 Patch2: subversion-0.20.1-deplibs.patch
 Patch3: subversion-1.5.1-rpath.patch
-Patch6: subversion-1.5.0-pie.patch
+Patch6: subversion-1.5.2-pie.patch
 Patch7: subversion-1.1.3-java.patch
 Patch8: subversion-1.5.0-perl510.patch
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which


--- subversion-1.5.0-pie.patch DELETED ---



From jwrdegoede at fedoraproject.org  Tue Sep 30 12:22:18 2008
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 30 Sep 2008 12:22:18 +0000 (UTC)
Subject: rpms/iscsi-initiator-utils/devel
	iscsi-initiator-utils-idbm-lock-error-handling.patch, NONE,
	1.1 .cvsignore, 1.15,
	1.16 iscsi-initiator-utils-ibft-sysfs.patch, 1.1,
	1.2 iscsi-initiator-utils-update-initscripts-and-docs.patch, 1.3,
	1.4 iscsi-initiator-utils-use-var-for-config.patch, 1.5,
	1.6 iscsi-initiator-utils.spec, 1.32, 1.33 iscsid.init, 1.5,
	1.6 iscsidevs.init, 1.5, 1.6 sources, 1.15, 1.16
	iscsi-initiator-utils-Fix-connection-cleanup-when-iscsid-is-restarted.patch,
	1.1, NONE iscsi-initiator-utils-add-fw-login.patch, 1.1,
	NONE iscsi-initiator-utils-add-iscsi-iname.patch, 1.1,
	NONE iscsi-initiator-utils-fix-compile-err-include-limits.patch,
	1.2, NONE iscsi-initiator-utils-fix-segment-len-check.patch, 1.1,
	NONE iscsi-initiator-utils-fix-sync-up.patch, 1.1,
	NONE iscsi-initiator-utils-handle-ipv6-compat-addrs.patch, 1.1,
	NONE iscsi-initiator-utils-update-startup-doc.patch, 1.1,
	NONE iscsi-initiator-utils-use-new-tpgt.patch, 1.1,
	NONE iscsi.init, 1.8, NONE iscsistart-static.patch, 1.2, NONE
Message-ID: <20080930122218.35C9A70119@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/iscsi-initiator-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12768

Modified Files:
	.cvsignore iscsi-initiator-utils-ibft-sysfs.patch 
	iscsi-initiator-utils-update-initscripts-and-docs.patch 
	iscsi-initiator-utils-use-var-for-config.patch 
	iscsi-initiator-utils.spec iscsid.init iscsidevs.init sources 
Added Files:
	iscsi-initiator-utils-idbm-lock-error-handling.patch 
Removed Files:
	iscsi-initiator-utils-Fix-connection-cleanup-when-iscsid-is-restarted.patch 
	iscsi-initiator-utils-add-fw-login.patch 
	iscsi-initiator-utils-add-iscsi-iname.patch 
	iscsi-initiator-utils-fix-compile-err-include-limits.patch 
	iscsi-initiator-utils-fix-segment-len-check.patch 
	iscsi-initiator-utils-fix-sync-up.patch 
	iscsi-initiator-utils-handle-ipv6-compat-addrs.patch 
	iscsi-initiator-utils-update-startup-doc.patch 
	iscsi-initiator-utils-use-new-tpgt.patch iscsi.init 
	iscsistart-static.patch 
Log Message:
* Tue Sep 30 2008 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-0.1.rc1
- Rewrite SysV initscripts, fixes rh 441290, 246960, 282001, 436175, 430791
- Add patch to make iscsiadm complain and exit when run as user instead
  of hang spinning for the database lock
- Add patch to make iscsiadm start iscsid when needed (rh 436175 related)
- Don't start iscsi service when network not yet up (in case of using NM)
  add NM dispatcher script to start iscsi service once network is up


iscsi-initiator-utils-idbm-lock-error-handling.patch:

--- NEW FILE iscsi-initiator-utils-idbm-lock-error-handling.patch ---
diff -up open-iscsi-2.0-870-rc1/usr/idbm.c~ open-iscsi-2.0-870-rc1/usr/idbm.c
--- open-iscsi-2.0-870-rc1/usr/idbm.c~	2008-09-29 13:01:48.000000000 +0200
+++ open-iscsi-2.0-870-rc1/usr/idbm.c	2008-09-29 13:01:48.000000000 +0200
@@ -849,6 +849,14 @@ int idbm_lock(void)
 		ret = link(LOCK_FILE, LOCK_WRITE_FILE);
 		if (ret == 0)
 			break;
+
+		if (errno != EEXIST) {
+			log_error("Could not lock discovery DB: %s: %s",
+					LOCK_WRITE_FILE, strerror(errno));
+			log_error("Maybe you are not root?");
+			exit(-1);
+		} else if (i == 0) 
+			log_warning("Waiting for discovery DB lock");
 
 		usleep(10000);
 	}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	6 Feb 2008 21:02:29 -0000	1.15
+++ .cvsignore	30 Sep 2008 12:21:47 -0000	1.16
@@ -10,3 +10,4 @@
 open-iscsi-2.0-865.2.tar.gz
 open-iscsi-2.0-865.13.tar.gz
 open-iscsi-2.0-868-test1.tar.gz
+open-iscsi-2.0-870-rc1.tar.gz

iscsi-initiator-utils-ibft-sysfs.patch:

Index: iscsi-initiator-utils-ibft-sysfs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils-ibft-sysfs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iscsi-initiator-utils-ibft-sysfs.patch	6 Feb 2008 21:02:29 -0000	1.1
+++ iscsi-initiator-utils-ibft-sysfs.patch	30 Sep 2008 12:21:47 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Naurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fw_entry.c
---- open-iscsi-2.0-868-test1/utils/fwparam_ibft/fw_entry.c	2008-01-03 13:23:36.000000000 -0600
-+++ open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fw_entry.c	2008-01-23 12:07:52.000000000 -0600
+diff -Naurp open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fw_entry.c
+--- open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fw_entry.c	2008-06-30 20:14:03.000000000 -0500
++++ open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fw_entry.c	2008-06-30 21:21:57.000000000 -0500
 @@ -29,7 +29,8 @@ int fw_get_entry(struct boot_context *co
  
  	ret = fwparam_ppc(context, filepath);
@@ -11,9 +11,9 @@
  	return ret;
  }
  
-diff -Naurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft.h open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fwparam_ibft.h
---- open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft.h	2008-01-03 13:23:36.000000000 -0600
-+++ open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fwparam_ibft.h	2008-01-23 12:07:52.000000000 -0600
+diff -Naurp open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fwparam_ibft.h open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fwparam_ibft.h
+--- open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fwparam_ibft.h	2008-06-30 20:14:03.000000000 -0500
++++ open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fwparam_ibft.h	2008-06-30 21:21:57.000000000 -0500
 @@ -153,6 +153,7 @@ extern int dev_count;
  #define TARGET		"target"
  
@@ -23,9 +23,9 @@
  extern int fwparam_ppc(struct boot_context *context, const char *filepath);
 -
  #endif /* FWPARAM_IBFT_H_ */
-diff -Naurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft_sysfs.c open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fwparam_ibft_sysfs.c
---- open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft_sysfs.c	1969-12-31 18:00:00.000000000 -0600
-+++ open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fwparam_ibft_sysfs.c	2008-01-23 12:08:04.000000000 -0600
+diff -Naurp open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fwparam_ibft_sysfs.c open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fwparam_ibft_sysfs.c
+--- open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fwparam_ibft_sysfs.c	1969-12-31 18:00:00.000000000 -0600
++++ open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fwparam_ibft_sysfs.c	2008-06-30 21:21:57.000000000 -0500
 @@ -0,0 +1,271 @@
 +/*
 + * Copyright (C) IBM Corporation. 2007
@@ -298,19 +298,15 @@
 +	deallocate_lists();
 +	return rc;
 +}
-diff -Naurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/Makefile open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/Makefile
---- open-iscsi-2.0-868-test1/utils/fwparam_ibft/Makefile	2008-01-03 13:23:36.000000000 -0600
-+++ open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/Makefile	2008-01-23 12:07:52.000000000 -0600
-@@ -21,11 +21,10 @@
- #	    "Prasanna Mumbai" <mumbai.prasanna at gmail.com>
+diff -Naurp open-iscsi-2.0-870-rc1/utils/fwparam_ibft/Makefile open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/Makefile
+--- open-iscsi-2.0-870-rc1/utils/fwparam_ibft/Makefile	2008-06-30 20:14:03.000000000 -0500
++++ open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/Makefile	2008-06-30 21:22:44.000000000 -0500
+@@ -22,7 +22,7 @@
  #
  
--OBJS := fwparam_ibft.o fw_entry.o
-+OBJS := fwparam_ibft.o fw_entry.o fwparam_ibft_sysfs.o
- OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o
- GENFILES := prom_lex.c prom_parse.tab.c prom_parse.tab.h
- CLEANFILES = $(OBJS) $(GENFILES) *.output *~
--
- BISONFLAGS = -d
- FLEXFLAGS =  -t
- # turn off #line number markers
+ OBJS := fwparam_ibft.o fw_entry.o
+-OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o
++OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o fwparam_ibft_sysfs.o
+ CLEANFILES = $(OBJS) *.output *~
+ 
+ OPTFLAGS ?= -O2 -g -fPIC

iscsi-initiator-utils-update-initscripts-and-docs.patch:

Index: iscsi-initiator-utils-update-initscripts-and-docs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils-update-initscripts-and-docs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iscsi-initiator-utils-update-initscripts-and-docs.patch	6 Feb 2008 21:02:29 -0000	1.3
+++ iscsi-initiator-utils-update-initscripts-and-docs.patch	30 Sep 2008 12:21:47 -0000	1.4
@@ -1,7 +1,7 @@
-diff -aurp open-iscsi-2.0-868-test1/etc/iscsid.conf open-iscsi-2.0-868-test1.tmp/etc/iscsid.conf
---- open-iscsi-2.0-868-test1/etc/iscsid.conf	2008-01-03 13:23:36.000000000 -0600
-+++ open-iscsi-2.0-868-test1.tmp/etc/iscsid.conf	2008-01-03 13:55:59.000000000 -0600
-@@ -27,8 +20,8 @@
+diff -aurp open-iscsi-2.0-870-rc1/etc/iscsid.conf open-iscsi-2.0-870-rc1.work/etc/iscsid.conf
+--- open-iscsi-2.0-870-rc1/etc/iscsid.conf	2008-06-30 20:14:03.000000000 -0500
++++ open-iscsi-2.0-870-rc1.work/etc/iscsid.conf	2008-06-30 21:08:29.000000000 -0500
+@@ -27,8 +27,8 @@
  # To request that the iscsi initd scripts startup a session set to "automatic".
  # node.startup = automatic
  #
@@ -12,75 +12,9 @@
  
  # *************
  # CHAP Settings
-@@ -92,17 +85,6 @@ node.conn[0].timeo.noop_out_interval = 5
- # this will cause the IO to be failed to the multipath layer.
- node.conn[0].timeo.noop_out_timeout = 5
- 
--# To specify the time to wait for abort response before
--# failing the operation and trying a logical unit reset edit the line.
--# The value is in seconds and the default is 15 seconds.
--node.session.err_timeo.abort_timeout = 15
--
--# To specify the time to wait for a logical unit response
--# before failing the operation and trying session re-establishment
--# edit the line.
--# The value is in seconds and the default is 30 seconds.
--node.session.err_timeo.lu_reset_timeout = 20
--
- #******
- # Retry
- #******
-@@ -188,41 +170,24 @@ node.conn[0].iscsi.MaxRecvDataSegmentLen
- discovery.sendtargets.iscsi.MaxRecvDataSegmentLength = 32768
- 
- # To allow the targets to control the setting of the digest checking,
--# with the initiator requesting a preference of enabling the checking, uncomment# one or both of the following lines:
-+# with the initiator requesting a preference of enabling the checking, uncommen
-+# the following lines (Data digests are not supported and on ppc/ppc64
-+# both header and data digests are not supported.):
- #node.conn[0].iscsi.HeaderDigest = CRC32C,None
--#node.conn[0].iscsi.DataDigest = CRC32C,None
- #
- # To allow the targets to control the setting of the digest checking,
- # with the initiator requesting a preference of disabling the checking,
--# uncomment one or both of the following lines:
-+# uncomment the following lines:
- #node.conn[0].iscsi.HeaderDigest = None,CRC32C
--#node.conn[0].iscsi.DataDigest = None,CRC32C
- #
- # To enable CRC32C digest checking for the header and/or data part of
--# iSCSI PDUs, uncomment one or both of the following lines:
-+# iSCSI PDUs, uncomment the following lines:
- #node.conn[0].iscsi.HeaderDigest = CRC32C
--#node.conn[0].iscsi.DataDigest = CRC32C
- #
- # To disable digest checking for the header and/or data part of
--# iSCSI PDUs, uncomment one or both of the following lines:
-+# iSCSI PDUs, uncomment the following lines:
- #node.conn[0].iscsi.HeaderDigest = None
--#node.conn[0].iscsi.DataDigest = None
- #
- # The default is to never use DataDigests and to allow the target to control
- # the setting of the HeaderDigest checking with the initiator requesting
- # a preference of disabling the checking.
--
--#************
--# Workarounds
--#************
--
--# Some targets like IET prefer after an initiator has sent a task
--# management function like an ABORT TASK or LOGICAL UNIT RESET, that
--# it does not respond to PDUs like R2Ts. To enable this behavior uncomment
--# the following line (The default behavior is Yes):
--node.session.iscsi.FastAbort = Yes
--
--# Some targets like Equalogic prefer that after an initiator has sent
--# a task management function like an ABORT TASK or LOGICAL UNIT RESET, that
--# it continue to respond to R2Ts. To enable this uncomment this line
--# node.session.iscsi.FastAbort = No
-diff -aurp open-iscsi-2.0-868-test1/README open-iscsi-2.0-868-test1.tmp/README
---- open-iscsi-2.0-868-test1/README	2008-01-03 13:23:36.000000000 -0600
-+++ open-iscsi-2.0-868-test1.tmp/README	2008-01-03 13:53:11.000000000 -0600
+diff -aurp open-iscsi-2.0-870-rc1/README open-iscsi-2.0-870-rc1.work/README
+--- open-iscsi-2.0-870-rc1/README	2008-06-30 20:14:03.000000000 -0500
++++ open-iscsi-2.0-870-rc1.work/README	2008-06-30 21:08:29.000000000 -0500
 @@ -78,11 +78,6 @@ the cache sync command will fail.
  - iscsiadm's -P 3 option will not print out scsi devices.
  - iscsid will not automatically online devices.
@@ -93,7 +27,7 @@
  By default the kernel source found at
  /lib/modules/`uname -a`/build
  will be used to compile the open-iscsi modules. To specify a different
-@@ -613,7 +608,7 @@ Red Hat or Fedora:
+@@ -694,7 +689,7 @@ Red Hat or Fedora:
  -----------------
  To start open-iscsi in Red Hat/Fedora you can do:
  
@@ -102,7 +36,7 @@
  
  To get open-iscsi to automatically start at run time you may have to
  run:
-@@ -792,6 +778,8 @@ To login to all the automated nodes, sim
+@@ -873,6 +868,8 @@ To login to all the automated nodes, sim
  e.g /etc/init.d/open-iscsi restart. On your next startup the nodes will
  be logged into autmotically.
  
@@ -111,21 +45,3 @@
  
  8. Advanced Configuration
  =========================
-diff -aurp open-iscsi-2.0-868-test1/usr/idbm.c open-iscsi-2.0-868-test1.tmp/usr/idbm.c
---- open-iscsi-2.0-868-test1/usr/idbm.c	2008-01-03 13:23:36.000000000 -0600
-+++ open-iscsi-2.0-868-test1.tmp/usr/idbm.c	2008-01-03 13:52:01.000000000 -0600
-@@ -364,10 +364,14 @@ idbm_recinfo_node(node_rec_t *r, recinfo
- 		__recinfo_int_o4(key, ri, r, conn[i].iscsi.HeaderDigest,
- 				 IDBM_SHOW, "None", "CRC32C", "CRC32C,None",
- 				 "None,CRC32C", num);
-+/*
-+	We only support data digests
-+
- 		sprintf(key, "node.conn[%d].iscsi.DataDigest", i);
- 		__recinfo_int_o4(key, ri, r, conn[i].iscsi.DataDigest, IDBM_SHOW,
- 				 "None", "CRC32C", "CRC32C,None",
- 				 "None,CRC32C", num);
-+*/
- 		sprintf(key, "node.conn[%d].iscsi.IFMarker", i);
- 		__recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW,
- 				"No", "Yes", num);

iscsi-initiator-utils-use-var-for-config.patch:

Index: iscsi-initiator-utils-use-var-for-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils-use-var-for-config.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iscsi-initiator-utils-use-var-for-config.patch	6 Feb 2008 21:02:29 -0000	1.5
+++ iscsi-initiator-utils-use-var-for-config.patch	30 Sep 2008 12:21:47 -0000	1.6
@@ -1,16 +1,16 @@
-diff -aurp open-iscsi-2.0-868-test1/doc/iscsiadm.8 open-iscsi-2.0-868-test1.tmp/doc/iscsiadm.8
---- open-iscsi-2.0-868-test1/doc/iscsiadm.8	2008-01-03 14:07:04.000000000 -0600
-+++ open-iscsi-2.0-868-test1.tmp/doc/iscsiadm.8	2008-01-03 14:08:44.000000000 -0600
+diff -aurp open-iscsi-2.0-870-rc1/doc/iscsiadm.8 open-iscsi-2.0-870-rc1.work/doc/iscsiadm.8
+--- open-iscsi-2.0-870-rc1/doc/iscsiadm.8	2008-06-30 20:14:03.000000000 -0500
++++ open-iscsi-2.0-870-rc1.work/doc/iscsiadm.8	2008-06-30 21:36:44.000000000 -0500
 @@ -47,7 +47,7 @@ display help text and exit
  .TP
  \fB\-I\fR, \fB\-\-interface\fI[iface]\fR
  The interface argument specifies the iSCSI interface to use for the operation.
 -iSCSI interfaces (iface) are defined in /etc/iscsi/ifaces. For hardware
 +iSCSI interfaces (iface) are defined in /var/lib/iscsi/ifaces. For hardware
- or offload, the iface config must have the hardware address (iface.hwaddress)
+ or the iface config must have the hardware address (iface.hwaddress)
  and the driver/transport_name (iface.transport_name). The iface's name is
  then the filename of the iface config. For software iSCSI, the iface config
-@@ -310,10 +310,10 @@ The configuration file read by \fBiscsid
+@@ -317,10 +317,10 @@ The configuration file read by \fBiscsid
  The file containing the iSCSI InitiatorName and InitiatorAlias read by
  \fBiscsid\fR and \fBiscsiadm\fR on startup.
  .TP
@@ -23,10 +23,10 @@
  This directory contains the portals.
  
  .SH "SEE ALSO"
-diff -aurp open-iscsi-2.0-868-test1/README open-iscsi-2.0-868-test1.tmp/README
---- open-iscsi-2.0-868-test1/README	2008-01-03 14:07:04.000000000 -0600
-+++ open-iscsi-2.0-868-test1.tmp/README	2008-01-03 14:05:35.000000000 -0600
-@@ -138,10 +138,10 @@ available on all Linux installations.
+diff -aurp open-iscsi-2.0-870-rc1/README open-iscsi-2.0-870-rc1.work/README
+--- open-iscsi-2.0-870-rc1/README	2008-06-30 21:37:05.000000000 -0500
++++ open-iscsi-2.0-870-rc1.work/README	2008-06-30 21:36:44.000000000 -0500
+@@ -148,10 +148,10 @@ available on all Linux installations.
  
  The database contains two tables:
  
@@ -40,7 +40,7 @@
  
  The iscsiadm utility is a command-line tool to manage (update, delete,
  insert, query) the persistent database.
-@@ -288,7 +288,7 @@ a scsi_host per HBA port).
+@@ -327,7 +327,7 @@ a scsi_host per HBA port).
  To manage both types of initiator stacks, iscsiadm uses the interface (iface)
  structure. For each HBA port or for software iscsi for each network
  device (ethX) or NIC, that you wish to bind sessions to you must create
@@ -49,7 +49,7 @@
  
  When you run iscsiadm the first time a hardware iscsi driver like qla4xxx is
  loaded, iscsiadm will create default iface configs for you. The config created
-@@ -301,29 +301,29 @@ Running:
+@@ -340,29 +340,29 @@ Running:
  iface0 qla4xxx,00:c0:dd:08:63:e8,default
  iface1 qla4xxx,00:c0:dd:08:63:ea,default
  
@@ -84,7 +84,7 @@
  
  iface.transport_name = tcp
  iface.hwaddress = 00:C0:DD:08:63:E7
-@@ -347,7 +347,7 @@ but you have not logged in then, iscsiad
+@@ -386,7 +386,7 @@ but you have not logged in then, iscsiad
  all existing bindings.
  
  When you then run iscsiadm to do discovery, it will check for interfaces
@@ -93,7 +93,7 @@
  they will be logged in through each iface. This behavior can also be overriden
  by passing in the interfaces you want to use. For example if you had defined
  two interface but only wanted to use one you can use the
-@@ -361,7 +361,7 @@ we do not bind a session to a iface, the
+@@ -400,7 +400,7 @@ we do not bind a session to a iface, the
  
  iscsiadm -m discovery -t st -p ip:port -I default -P 1
  
@@ -102,7 +102,7 @@
  not pass anything into iscsiadm, running iscsiadm will do the default
  behavior, where we allow the network subsystem to decide which
  device to use.
-@@ -396,13 +396,13 @@ iscsiadm -m node -p ip:port -I iface0 --
+@@ -435,7 +435,7 @@ iscsiadm -m node -p ip:port -I iface0 --
  
  	    ./iscsiadm -m discovery -t sendtargets -p 192.168.1.1:3260
  
@@ -111,19 +111,32 @@
  	using software iscsi. If any are found then nodes found during
  	discovery will be setup so that they can logged in through
  	those interfaces.
+@@ -483,7 +483,7 @@ iscsiadm -m node -p ip:port -I iface0 --
+ 	existing portals.
  
-     - SendTargets iSCSI Discovery with a specific interface. If you
+   - SendTargets iSCSI Discovery with a specific interface. If you
 -	wish to only use a subset of the interfaces in /etc/iscsi/ifaces
 +	wish to only use a subset of the interfaces in /var/lib/iscsi/ifaces
  	then you can pass them in during discovery:
  
  	     ./iscsiadm -m discovery -t sendtargets -p 192.168.1.1:3260 \
-diff -aurp open-iscsi-2.0-868-test1/usr/idbm.c open-iscsi-2.0-868-test1.tmp/usr/idbm.c
---- open-iscsi-2.0-868-test1/usr/idbm.c	2008-01-03 14:07:04.000000000 -0600
-+++ open-iscsi-2.0-868-test1.tmp/usr/idbm.c	2008-01-03 14:03:36.000000000 -0600
-@@ -2582,9 +2582,9 @@ idbm_init(idbm_get_config_file_fn *fn)
- 	idbm_t *db;
- 
+@@ -768,8 +768,8 @@ where targetname is the name of the targ
+ and port of the portal. tpgt, is the portal group tag of
+ the portal, and is not used in iscsiadm commands except for static
+ record creation. And iface name is the name of the iscsi interface
+-defined in /etc/iscsi/ifaces. If no interface was defined in
+-/etc/iscsi/ifaces or passed in, the default behavior is used.
++defined in /var/lib/iscsi/ifaces. If no interface was defined in
++/var/lib/iscsi/ifaces or passed in, the default behavior is used.
+ Default here is iscsi_tcp/tcp to be used over which ever NIC the
+ network layer decides is best.
+ 
+diff -aurp open-iscsi-2.0-870-rc1/usr/idbm.c open-iscsi-2.0-870-rc1.work/usr/idbm.c
+--- open-iscsi-2.0-870-rc1/usr/idbm.c	2008-06-30 20:14:03.000000000 -0500
++++ open-iscsi-2.0-870-rc1.work/usr/idbm.c	2008-06-30 21:36:44.000000000 -0500
+@@ -2137,9 +2137,9 @@ free_info:
+ int idbm_init(idbm_get_config_file_fn *fn)
+ {
  	/* make sure root db dir is there */
 -	if (access(ISCSI_CONFIG_ROOT, F_OK) != 0) {
 -		if (mkdir(ISCSI_CONFIG_ROOT, 0660) != 0) {
@@ -132,26 +145,22 @@
 +		if (mkdir(ISCSIVAR, 0660) != 0) {
 +			log_error("Could not make %s %d\n", ISCSIVAR,
  				   errno);
- 			return NULL;
+ 			return errno;
  		}
-Only in open-iscsi-2.0-868-test1.tmp/usr: idbm.c.orig
-diff -aurp open-iscsi-2.0-868-test1/usr/idbm.h open-iscsi-2.0-868-test1.tmp/usr/idbm.h
---- open-iscsi-2.0-868-test1/usr/idbm.h	2008-01-03 13:23:36.000000000 -0600
-+++ open-iscsi-2.0-868-test1.tmp/usr/idbm.h	2008-01-03 14:03:36.000000000 -0600
-@@ -26,12 +26,14 @@
+diff -aurp open-iscsi-2.0-870-rc1/usr/idbm.h open-iscsi-2.0-870-rc1.work/usr/idbm.h
+--- open-iscsi-2.0-870-rc1/usr/idbm.h	2008-06-30 20:14:03.000000000 -0500
++++ open-iscsi-2.0-870-rc1.work/usr/idbm.h	2008-06-30 21:36:58.000000000 -0500
+@@ -26,11 +26,12 @@
  #include "initiator.h"
  #include "config.h"
  
 -#define NODE_CONFIG_DIR		ISCSI_CONFIG_ROOT"nodes"
--#define IFACE_CONFIG_DIR	ISCSI_CONFIG_ROOT"ifaces"
 -#define SLP_CONFIG_DIR		ISCSI_CONFIG_ROOT"slp"
 -#define ISNS_CONFIG_DIR		ISCSI_CONFIG_ROOT"isns"
 -#define STATIC_CONFIG_DIR	ISCSI_CONFIG_ROOT"static"
 -#define ST_CONFIG_DIR		ISCSI_CONFIG_ROOT"send_targets"
 +#define ISCSIVAR		"/var/lib/iscsi/"
-+
 +#define NODE_CONFIG_DIR		ISCSIVAR"nodes"
-+#define IFACE_CONFIG_DIR	ISCSIVAR"ifaces"
 +#define SLP_CONFIG_DIR		ISCSIVAR"slp"
 +#define ISNS_CONFIG_DIR		ISCSIVAR"isns"
 +#define STATIC_CONFIG_DIR	ISCSIVAR"static"
@@ -159,3 +168,15 @@
  #define ST_CONFIG_NAME		"st_config"
  
  #define TYPE_INT	0
+diff -aurp open-iscsi-2.0-870-rc1/usr/iface.h open-iscsi-2.0-870-rc1.work/usr/iface.h
+--- open-iscsi-2.0-870-rc1/usr/iface.h	2008-06-30 20:14:03.000000000 -0500
++++ open-iscsi-2.0-870-rc1.work/usr/iface.h	2008-06-30 21:36:44.000000000 -0500
+@@ -20,7 +20,7 @@
+ #ifndef ISCSI_IFACE_H
+ #define ISCSI_IFACE_H
+ 
+-#define IFACE_CONFIG_DIR	ISCSI_CONFIG_ROOT"ifaces"
++#define IFACE_CONFIG_DIR	"/var/lib/iscsi/ifaces"
+ 
+ struct iface_rec;
+ struct list_head;


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- iscsi-initiator-utils.spec	6 Apr 2008 06:44:04 -0000	1.32
+++ iscsi-initiator-utils.spec	30 Sep 2008 12:21:47 -0000	1.33
@@ -1,23 +1,18 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
-Version: 6.2.0.868
-Release: 0.6%{?dist}
-Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-868-test1.tar.gz
+Version: 6.2.0.870
+Release: 0.1.rc1%{?dist}
+Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-870-rc1.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
+Source3: 04-iscsi
 Patch0: iscsi-initiator-utils-update-initscripts-and-docs.patch
 Patch1: iscsi-initiator-utils-use-var-for-config.patch
 Patch2: iscsi-initiator-utils-use-red-hat-for-name.patch
 Patch3: iscsi-initiator-utils-ibft-sysfs.patch
-Patch4: iscsi-initiator-utils-add-fw-login.patch
-Patch5: iscsi-initiator-utils-use-new-tpgt.patch
-Patch6: iscsi-initiator-utils-fix-compile-err-include-limits.patch
-Patch7: iscsi-initiator-utils-handle-ipv6-compat-addrs.patch
-Patch8: iscsi-initiator-utils-Fix-connection-cleanup-when-iscsid-is-restarted.patch
-Patch9: iscsi-initiator-utils-fix-sync-up.patch
-Patch10: iscsi-initiator-utils-update-startup-doc.patch
-Patch11: iscsi-initiator-utils-fix-segment-len-check.patch
-Patch12: iscsi-initiator-utils-print-ibft-net-info.patch
+Patch4: iscsi-initiator-utils-print-ibft-net-info.patch
+Patch5: iscsi-initiator-utils-only-root-use.patch
+Patch6: iscsi-initiator-utils-start-iscsid.patch
 
 Group: System Environment/Daemons
 License: GPLv2+
@@ -35,20 +30,14 @@
 Protocol networks.
 
 %prep
-%setup -q -n open-iscsi-2.0-868-test1
+%setup -q -n open-iscsi-2.0-870-rc1
 %patch0 -p1 -b .update-initscripts-and-docs
 %patch1 -p1 -b .use-var-for-config
 %patch2 -p1 -b .use-red-hat-for-name
 %patch3 -p1 -b .ibft-sysfs
-%patch4 -p1 -b .add-fw-login
-%patch5 -p1 -b .use-new-tpgt
-%patch6 -p1 -b .fix-compile-err-include-limits
-%patch7 -p1 -b .handle-ipv6-compat-addrs
-%patch8 -p1 -b .Fix-connection-cleanup-when-iscsid-is-restarted
-%patch9 -p1 -b .fix-sync-up
-%patch10 -p1 -b .update-startup-doc
-%patch11 -p1 -b .fix-segment-len-check
-%patch12 -p1 -b .print-ibft-net-info
+%patch4 -p1 -b .print-ibft-net-info
+%patch5 -p1 -b .only-root
+%patch6 -p1 -b .start-iscsid
 
 
 %build
@@ -62,6 +51,7 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT/etc/iscsi
+mkdir -p $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d
 mkdir -p $RPM_BUILD_ROOT/var/lib/iscsi
 mkdir -p $RPM_BUILD_ROOT/var/lib/iscsi/nodes
 mkdir -p $RPM_BUILD_ROOT/var/lib/iscsi/send_targets
@@ -80,6 +70,8 @@
 
 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/iscsid
 install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/iscsi
+install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -118,12 +110,28 @@
 %dir %{_var}/lock/iscsi
 %{_initrddir}/iscsi
 %{_initrddir}/iscsid
+%{_sysconfdir}/NetworkManager
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf
 /sbin/*
 %{_mandir}/man8/*
 
 
 %changelog
+* Tue Sep 30 2008 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-0.1.rc1
+- Rewrite SysV initscripts, fixes rh 441290, 246960, 282001, 436175, 430791
+- Add patch to make iscsiadm complain and exit when run as user instead
+  of hang spinning for the database lock
+- Add patch to make iscsiadm start iscsid when needed (rh 436175 related)
+- Don't start iscsi service when network not yet up (in case of using NM)
+  add NM dispatcher script to start iscsi service once network is up
+
+* Mon Jun 30 2008 Mike Christie <mchristie at redhat.com> - 6.2.0.870
+- Rebase to open-iscsi-2-870
+- 453282 Handle sysfs changes.
+
+* Fri Apr 25 2008 Mike Christie <mchristie at redhat.com> - 6.2.0.868-0.7
+- 437522 log out sessions that are not used for root during "iscsi stop".
+
 * Fri Apr 4 2008 Mike Christie <mchristie at redhat.com> - 6.2.0.868-0.6
 - Rebase to RHEL5 to bring in bug fixes.
 - 437522 iscsi startup does not need to modify with network startup.


Index: iscsid.init
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsid.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iscsid.init	6 Apr 2008 06:44:04 -0000	1.5
+++ iscsid.init	30 Sep 2008 12:21:47 -0000	1.6
@@ -1,124 +1,131 @@
 #!/bin/sh
 #
+# iscsid iSCSI daemon
+#
 # chkconfig: 345 7 89
 # description: Starts and stops the iSCSI daemon.
 #
 # processname: iscsid
 # pidfile: /var/run/iscsid.pid
 # config:  /etc/iscsi/iscsid.conf
-#
+
 ### BEGIN INIT INFO
 # Provides:          iscsid
-# Required-Start:    $network
-# Required-Stop:     $network
+# Default-Start: 3 4 5
+# Default-Stop: 0 1 2 6
 # Short-Description: Starts and stops login iSCSI daemon.
 # Description: iscsid provides the iSCSI session and connection state machine
 #              for software iscsi/iser (iscsi_tcp/ib_iser) and partialy
 #              offloaded hardware (bnx2i).
 ### END INIT INFO
-#
-# Source function library.
-. /etc/init.d/functions
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
-RETVAL=0
+# Source function library.
+. /etc/rc.d/init.d/functions
 
-start()
-{
-	if [ -f /var/lock/subsys/iscsid ] ; then
-		echo
-		success
-		return
-	fi
+exec=/sbin/iscsid
+prog=iscsid
+config=/etc/iscsi/iscsid.conf
+lockfile=/var/lock/subsys/$prog
+
+# FIXME this has a false positive for root on nfs
+root_is_iscsi() {
+    rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' /etc/mtab)
+    [[ "$rootopts" =~ "_netdev" ]]
+}
 
-	echo -n $"Starting iSCSI daemon: "
+start() {
+    [ -x $exec ] || exit 5
+    [ -f $config ] || exit 6
+
+    # only start if nodes are setup to startup automatically or root is iscsi
+    grep -qrs "node.startup = automatic" /var/lib/iscsi/nodes
+    if [ $? -eq 0 ] || root_is_iscsi; then
+        echo -n $"Starting $prog: "
 	modprobe -q iscsi_tcp
 	modprobe -q ib_iser
-	daemon iscsid
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] || return
-
-	touch /var/lock/subsys/iscsid
-
-	success
-	echo
-}
-
-stop_iscsid()
-{
-	killproc iscsid
-	echo
-        RETVAL=$?
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/iscsid
-
-	modprobe -r ib_iser 2>/dev/null
-	modprobe -r iscsi_tcp 2>/dev/null
-}
-
-stop()
-{
-	if [ ! -f /var/lock/subsys/iscsid ]; then
-		echo
-		success
-		return
-	fi
-
-	declare -a iparams=( $(iscsiadm -m session 2>/dev/null | egrep "tcp|iser") )
-	if [[ -z "${iparams[*]}" ]]; then
-		# no sessions so we can just quit
-		stop_iscsid
-		return
-	fi
-
-        # If this is a final shutdown/halt, do nothing since
-        # we may need iscsid for as long as possible (halt script kills
-	# us at the last second)
-        if [ "$RUNLEVEL" = "6" -o "$RUNLEVEL" = "0" -o "$RUNLEVEL" = "1" ]; then
-		rm -f /var/lock/subsys/iscsid
-                success
-                return
-        fi
-
-        # don't turn off iscsi if root is possibly on a iscsi disk
-        rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' /etc/mtab)
-        if [[ "$rootopts" =~ "_netdev" ]] ; then
-                echo $"Can not shutdown iSCSI. Root is on a iSCSI disk."
-                exit 1
-        fi
-
-	echo -n $"Stopping iSCSI daemon: "
-	stop_iscsid
-}
-
-restart()
-{
-	stop
-	start
+	daemon $prog
+        retval=$?
+        echo
+        [ $retval -eq 0 ] || return 1 
+        touch $lockfile
+    fi
+
+    return 0
+}
+
+stop() {
+    declare -a iparams=( $(iscsiadm -m session 2>/dev/null | egrep "tcp|iser") )
+    if [[ -n "${iparams[*]}" ]]; then
+        # We have active sessions, so don't stop iscsid!!
+        echo -n $"Not stopping $prog: iscsi sessions still active"
+        warning $"Not stopping $prog: iscsi sessions still active"
+        echo
+        return 0
+    fi
+
+    echo -n $"Stopping $prog: "
+    killproc $prog
+    retval=$?
+    echo
+
+    modprobe -r ib_iser 2>/dev/null
+    modprobe -r iscsi_tcp 2>/dev/null
+
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
 }
 
+restart() {
+    stop
+    start
+}
+
+reload() {
+    return 3
+}
+
+force_reload() {
+    restart
+}
+
+rh_status() {
+    status $prog
+}
+
+rh_status_q() {
+    rh_status >/dev/null 2>&1
+}
+
+
 case "$1" in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	restart)
-	        stop
-		start
-		;;
-	status)
-		status iscsid
-		RETVAL=$?
-		;;
-        condrestart)
-	        [ -f /var/lock/subsys/iscsid ] && restart
-		;;
-	*)
-		echo $"Usage: $0 {start|stop|restart|status|condrestart}"
-		exit 1
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
+        ;;
+    restart)
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
+    status)
+        rh_status
+        ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    *)
+        echo $"Usage: $0
+{start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
 esac
-
-exit $RETVAL
+exit $?


Index: iscsidevs.init
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsidevs.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iscsidevs.init	6 Apr 2008 06:44:04 -0000	1.5
+++ iscsidevs.init	30 Sep 2008 12:21:47 -0000	1.6
@@ -1,116 +1,146 @@
 #!/bin/sh
 #
+# iscsi: log into iSCSI targets
+#
 # chkconfig: 345 13 89
 # description: Logs into iSCSI targets needed at system startup
-#
+
+# Note we should have $network in Required-Start/Stop but we don't because if
+# we would require network chkconfig will put us directly after NetworkManager
+# when using NM, which will make our see if the network is up test succeed
+# while NM is actually still configuring the network. By not requiring network
+# chkconfig will use the chkconfig header to determine our start prio, starting
+# us after the old network service, but before NM (netfs does this the same).
+
 ### BEGIN INIT INFO
 # Provides:          iscsi
-# Required-Start:    $network $iscsid
-# Required-Stop:     $network $iscsid
+# Required-Start:    iscsid
+# Required-Stop:     iscsid
+# Default-Start: 3 4 5
+# Default-Stop: 0 1 2 6
 # Short-Description: Starts and stops login and scanning of iSCSI devices.
 # Description: iscsi provides the iSCSI state machine for software iscsi/iser
 #              and partial offloaded hardware. iscsi logs into and scans
 #              for iSCSI devices, and shuts them down when stopped.
 ### END INIT INFO
-#
+
 # Source function library.
-. /etc/init.d/functions
+. /etc/rc.d/init.d/functions
+
+exec="/sbin/iscsiadm"
+prog="iscsi"
+config="/etc/iscsi/initiatorname.iscsi"
+lockfile=/var/lock/subsys/$prog
+iscsid_lockfile=/var/lock/subsys/${prog}_iscsid
+
+start() {
+    [ -x $exec ] || exit 5
+    [ -f $config ] || exit 6
+
+    # if the network isn't up yet exit cleanly, NetworkManager will call us
+    # again when the network is up
+    [ ! -f /var/lock/subsys/network -a ! -f /var/lock/subsys/NetworkManager ] && exit 0
+
+    # if no nodes are setup to startup automatically exit cleanly
+    grep -qrs "node.startup = automatic" /var/lib/iscsi/nodes
+    [ $? -eq 0 ] || exit 0
+
+    # this script is normally called from startup so log into
+    # nodes marked node.startup=automatic
+    echo -n $"Starting $prog: "
+    $exec -m node --loginall=automatic 2>&1 > /dev/null | grep iscsiadm
+
+    # <sigh> iscsiadm does not always give a non 0 exit status in case of
+    # error so we grep for any messages to stderr and see those as errors too
+    if [ ${PIPESTATUS[0]} -ne 0 -o ${PIPESTATUS[1]} -eq 0 ]; then
+        failure $"Starting $prog"
+        echo
+        return 1
+    fi
+
+    success $"Starting $prog"
+    touch $lockfile
+    echo
+    return 0
+}
+
+stop() {
+    echo -n $"Stopping $prog: "
+    $exec -m node --logoutall=automatic 2>&1 > /dev/null | grep iscsiadm
+
+    # <sigh> iscsiadm does not always give a non 0 exit status in case of
+    # error so we grep for any messages to stderr and see those as errors too
+    if [ ${PIPESTATUS[0]} -ne 0 -o ${PIPESTATUS[1]} -eq 0 ]; then
+        failure $"Stopping $prog"
+        echo
+        return 1
+    fi
+
+    success $"Stopping $prog"
+    rm -f $lockfile
+    echo
+    return 0
+}
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
+restart() {
+    stop
+    start
+}
 
-RETVAL=0
+reload() {
+    return 3
+}
+
+force_reload() {
+    restart
+}
 
-start()
-{
-	if [ -f /var/lock/subsys/iscsi ] ; then
-		echo
-		success
-		return
-	fi
-
-	# Not sure if this is ok.
-	# It was done for compatiblity where users were used to
-	# just starting the iscsi service, but for root boot we
-	# need need iscsid start earlier than the devices we
-	# log into below.
-	status iscsid
-	RETVAL=$?
-
-	if [ $RETVAL -ne 0 ]; then
-		/etc/init.d/iscsid start
-	fi
-
-	# this script is normally called from startup so log into
-	# nodes marked node.startup=automatic
-	iscsiadm -m node --loginall=automatic
-	touch /var/lock/subsys/iscsi
-	success
-	echo
-}
-
-cleanup_iscsi()
-{
-	/etc/init.d/iscsid stop
-	rm -f /var/lock/subsys/iscsi
-	success
-}
-
-stop()
-{
-	if [ ! -f /var/lock/subsys/iscsi ]; then
-		echo
-		success
-		return
-	fi
-
-	declare -a iparams=( $(iscsiadm -m session 2>/dev/null | egrep "tcp|iser") )
-	if [[ -z "${iparams[*]}" ]]; then
-		# no sessions so we can just quit
-		cleanup_iscsi
-		return
-	fi
-
-	# If this is a final shutdown/halt, do nothing since
-	# lvm/dm, md, power path, etc do not always handle this nicely.
-	# The kernel will do the right thing and shutdown devices (send
-	# cache syncs, start_stops, etc) that need it.
-	if [ "$RUNLEVEL" = "6" -o "$RUNLEVEL" = "0" -o "$RUNLEVEL" = "1" ]; then
-		rm -f /var/lock/subsys/iscsi
-		success
-		return
-	fi
-
-	# don't turn off iscsi if root is possibly on a iscsi disk
-	rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' /etc/mtab)
-	if [[ "$rootopts" =~ "_netdev" ]] ; then
-		echo $"Can not shutdown iSCSI. Root is on a iSCSI disk."
-		exit 1
-	fi
+rh_status() {
+    [ -f $lockfile ] || return 3
 
-	iscsiadm -m node --logoutall=all
-	cleanup_iscsi
+    declare -a iparams=( $(iscsiadm -m session 2>/dev/null | egrep "tcp|iser") )
+    if [[ -z "${iparams[*]}" ]]; then
+        # no sessions
+        return 2
+    fi
+
+    return 0
+}
+
+rh_status_q() {
+    rh_status >/dev/null 2>&1
 }
 
+
 case "$1" in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	restart)
-		stop
-		start
-		;;
-	status)
-		status iscsid
-		RETVAL=$?
-		;;
-	condrestart)
-		[ -f /var/lock/subsys/iscsi ] && restart
-		;;
-	*)
-		echo $"Usage: $0 {start|stop|restart|status|condrestart}"
-		exit 1
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
+        ;;
+    restart)
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
+    status)
+        rh_status
+        ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    *)
+        echo $"Usage: $0
+{start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
 esac
-exit $RETVAL
+exit $?


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Feb 2008 21:02:29 -0000	1.15
+++ sources	30 Sep 2008 12:21:47 -0000	1.16
@@ -1 +1 @@
-e453be2213e60cb463353d896a9c3a78  open-iscsi-2.0-868-test1.tar.gz
+2740f55611d3ea59a21ec08b25853c55  open-iscsi-2.0-870-rc1.tar.gz


--- iscsi-initiator-utils-Fix-connection-cleanup-when-iscsid-is-restarted.patch DELETED ---


--- iscsi-initiator-utils-add-fw-login.patch DELETED ---


--- iscsi-initiator-utils-add-iscsi-iname.patch DELETED ---


--- iscsi-initiator-utils-fix-compile-err-include-limits.patch DELETED ---


--- iscsi-initiator-utils-fix-segment-len-check.patch DELETED ---


--- iscsi-initiator-utils-fix-sync-up.patch DELETED ---


--- iscsi-initiator-utils-handle-ipv6-compat-addrs.patch DELETED ---


--- iscsi-initiator-utils-update-startup-doc.patch DELETED ---


--- iscsi-initiator-utils-use-new-tpgt.patch DELETED ---


--- iscsi.init DELETED ---


--- iscsistart-static.patch DELETED ---



From rezso at fedoraproject.org  Tue Sep 30 12:32:49 2008
From: rezso at fedoraproject.org (Balint Cristian)
Date: Tue, 30 Sep 2008 12:32:49 +0000 (UTC)
Subject: rpms/gdal/devel .cvsignore, 1.8, 1.9 gdal.spec, 1.50,
	1.51 import.log, 1.3, 1.4 sources, 1.8, 1.9
Message-ID: <20080930123249.1D02E70119@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/gdal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14492/devel

Modified Files:
	.cvsignore gdal.spec import.log sources 
Log Message:
- enable gdal_array for python subpackage
- require numpy



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	12 Jun 2008 19:48:03 -0000	1.8
+++ .cvsignore	30 Sep 2008 12:32:18 -0000	1.9
@@ -1,2 +1,2 @@
-gdalautotest-1.5.0.tar.gz
 gdal-1.5.2-fedora.tar.gz
+gdalautotest-1.5.0.tar.gz


Index: gdal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/gdal.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gdal.spec	11 Sep 2008 15:07:22 -0000	1.50
+++ gdal.spec	30 Sep 2008 12:32:18 -0000	1.51
@@ -1,6 +1,6 @@
 Name:      gdal
 Version:   1.5.2
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   GIS file format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -12,12 +12,12 @@
 Patch2:    %{name}-libdap.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool pkgconfig
+BuildRequires: python-devel numpy xerces-c-devel
 BuildRequires: libpng-devel libungif-devel libjpeg-devel libtiff-devel
 BuildRequires: doxygen tetex-latex ghostscript ruby-devel jpackage-utils
 BuildRequires: jasper-devel cfitsio-devel hdf-devel libdap-devel librx-devel
 BuildRequires: unixODBC-devel mysql-devel sqlite-devel postgresql-devel zlib-devel
 BuildRequires: proj-devel geos-devel netcdf-devel hdf5-devel ogdi-devel libgeotiff-devel
-BuildRequires: python-devel xerces-c-devel
 BuildRequires: perl(ExtUtils::MakeMaker)
 
 %if "%{?dist}" != ".el4"
@@ -59,6 +59,7 @@
 %package python
 Summary: Python modules for the GDAL file format library
 Group: Development/Libraries
+Requires: numpy
 Requires: %{name} = %{version}-%{release}
 
 %description python
@@ -520,6 +521,10 @@
 %endif
 
 %changelog
+* Tue Sep 30 2008 Balint Cristian <rezso at rdsor.ro> - 1.5.2-4
+- enable gdal_array for python subpackage
+- require numpy
+
 * Tue Sep  9 2008 Patrice Dumas <pertusus at free.fr> - 1.5.2-3
 - patch for libdap > 0.8.0, from Rob Cermak
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	12 Jun 2008 19:48:03 -0000	1.3
+++ import.log	30 Sep 2008 12:32:18 -0000	1.4
@@ -1 +1,2 @@
 gdal-1_5_2-1_fc9:HEAD:gdal-1.5.2-1.fc9.src.rpm:1213299145
+gdal-1_5_2-4_fc10:HEAD:gdal-1.5.2-4.fc10.src.rpm:1222777883


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Jun 2008 19:48:03 -0000	1.8
+++ sources	30 Sep 2008 12:32:18 -0000	1.9
@@ -1,2 +1,2 @@
-e8a9a020f086a4ed977b30921785006f  gdalautotest-1.5.0.tar.gz
 b032dc858b5af1246023863317230701  gdal-1.5.2-fedora.tar.gz
+e8a9a020f086a4ed977b30921785006f  gdalautotest-1.5.0.tar.gz



From jorton at fedoraproject.org  Tue Sep 30 12:36:34 2008
From: jorton at fedoraproject.org (Joe Orton)
Date: Tue, 30 Sep 2008 12:36:34 +0000 (UTC)
Subject: rpms/subversion/F-9 sources, 1.30, 1.31 subversion.spec, 1.113,
	1.114 upstream, 1.18, 1.19
Message-ID: <20080930123634.BEC6E70119@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15335

Modified Files:
	sources subversion.spec upstream 
Log Message:
* Tue Sep 30 2008 Joe Orton <jorton at redhat.com> 1.5.2-1.fc9
- update to 1.5.2
- enable SASL support



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-9/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	28 Jul 2008 08:07:30 -0000	1.30
+++ sources	30 Sep 2008 12:36:04 -0000	1.31
@@ -1 +1 @@
-37533b0435caaa3e4e1be359389fcbb9  subversion-1.5.1.tar.gz
+ec3ae55d43ee87c1c1f57e2411009459  subversion-1.5.2.tar.gz


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-9/subversion.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- subversion.spec	28 Jul 2008 08:07:30 -0000	1.113
+++ subversion.spec	30 Sep 2008 12:36:04 -0000	1.114
@@ -14,7 +14,7 @@
 
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
-Version: 1.5.1
+Version: 1.5.2
 Release: 1%{?dist}
 License: ASL 1.1
 Group: Development/Tools
@@ -31,7 +31,7 @@
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
 BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
 BuildRequires: apr-devel >= 0.9.7, apr-util-devel >= 0.9.7
-BuildRequires: neon-devel >= 0:0.24.7-1
+BuildRequires: neon-devel >= 0:0.24.7-1, cyrus-sasl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: svn = %{version}-%{release}
 
@@ -128,7 +128,7 @@
         --with-swig --with-neon=%{_prefix} \
         --with-ruby-sitedir=%{ruby_sitearch} \
         --with-apxs=%{_sbindir}/apxs --disable-mod-activation \
-        --disable-static
+        --disable-static --with-sasl=%{_prefix}
 make %{?_smp_mflags} all
 make swig-py swig-py-lib %{swigdirs}
 make swig-pl swig-pl-lib swig-rb swig-rb-lib
@@ -284,6 +284,10 @@
 %endif
 
 %changelog
+* Tue Sep 30 2008 Joe Orton <jorton at redhat.com> 1.5.2-1.fc9
+- update to 1.5.2
+- enable SASL support
+
 * Mon Jul 28 2008 Joe Orton <jorton at redhat.com> 1.5.1-1.fc9
 - update to 1.5.1
 


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-9/upstream,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- upstream	28 Jul 2008 08:07:30 -0000	1.18
+++ upstream	30 Sep 2008 12:36:04 -0000	1.19
@@ -1 +1 @@
-subversion-1.5.1.tar.gz
+subversion-1.5.2.tar.gz



From mlichvar at fedoraproject.org  Tue Sep 30 12:46:36 2008
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 30 Sep 2008 12:46:36 +0000 (UTC)
Subject: rpms/slrn/devel .cvsignore, 1.12, 1.13 slrn.spec, 1.39, 1.40 sources,
	1.12, 1.13
Message-ID: <20080930124636.0CA1270119@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/slrn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17061

Modified Files:
	.cvsignore slrn.spec sources 
Log Message:
- update to 0.9.9p1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slrn/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	26 Aug 2008 13:20:16 -0000	1.12
+++ .cvsignore	30 Sep 2008 12:46:05 -0000	1.13
@@ -1 +1 @@
-slrn-0.9.9.tar.gz
+slrn-0.9.9p1.tar.gz


Index: slrn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slrn/devel/slrn.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- slrn.spec	26 Aug 2008 13:20:16 -0000	1.39
+++ slrn.spec	30 Sep 2008 12:46:05 -0000	1.40
@@ -1,6 +1,6 @@
 Summary: A threaded Internet news reader
 Name: slrn
-Version: 0.9.9
+Version: 0.9.9p1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
@@ -99,6 +99,9 @@
 %{_mandir}/man1/slrnpull.1*
 
 %changelog
+* Tue Sep 30 2008 Miroslav Lichvar <mlichvar at redhat.com> 0.9.9p1-1
+- update to 0.9.9p1
+
 * Tue Aug 26 2008 Miroslav Lichvar <mlichvar at redhat.com> 0.9.9-1
 - update to 0.9.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slrn/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	26 Aug 2008 13:20:16 -0000	1.12
+++ sources	30 Sep 2008 12:46:05 -0000	1.13
@@ -1 +1 @@
-87c0172887bf6e020759bf6241c003fc  slrn-0.9.9.tar.gz
+6cc8ac6baaff7cc2a8b78f7fbbe3187f  slrn-0.9.9p1.tar.gz



From rhughes at fedoraproject.org  Tue Sep 30 12:53:29 2008
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 30 Sep 2008 12:53:29 +0000 (UTC)
Subject: rpms/PackageKit/devel pk-fix-64bit-codecs.patch, NONE,
	1.1 pk-fix-cancel-at-speed-unlucky.patch, NONE,
	1.1 PackageKit.spec, 1.63, 1.64
Message-ID: <20080930125329.49EF070119@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18279

Modified Files:
	PackageKit.spec 
Added Files:
	pk-fix-64bit-codecs.patch pk-fix-cancel-at-speed-unlucky.patch 
Log Message:
* Tue Sep 30 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.5-3
- Fix a bug where the daemon could crash when cancelling a lot of transactions.
- Fix installing codecs with a 64 bit machine


pk-fix-64bit-codecs.patch:

--- NEW FILE pk-fix-64bit-codecs.patch ---
commit 920574b72805a630ea989b32012e2b4bbf1841ea
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Sep 30 13:21:08 2008 +0100

    bugfix: use a ()(64bit) suffix for the package provides on 64 bit machines

diff --git a/contrib/gstreamer-plugin/pk-gstreamer-install.c b/contrib/gstreamer-plugin/pk-gstreamer-install.c
index f9ba620..a2d6602 100644
--- a/contrib/gstreamer-plugin/pk-gstreamer-install.c
+++ b/contrib/gstreamer-plugin/pk-gstreamer-install.c
@@ -22,6 +22,7 @@
 
 #include <gst/gst.h>
 #include <string.h>
+#include <sys/utsname.h>
 #include <dbus/dbus-glib.h>
 
 typedef struct {
@@ -227,6 +228,44 @@ pk_gst_codec_free (codec_info *codec)
 }
 
 /**
+ * pk_gst_get_arch_suffix:
+ *
+ * Return value: something other than blank if we are running on 64 bit.
+ **/
+static const gchar *
+pk_gst_get_arch_suffix (void)
+{
+	gint retval;
+	const gchar *suffix = "";
+	struct utsname buf;
+
+	retval = uname (&buf);
+
+	/* did we get valid value? */
+	if (retval != 0 || buf.machine == NULL) {
+		g_warning ("cannot get machine type");
+		goto out;
+	}
+
+	/* 32 bit machines */
+	if (strcmp (buf.machine, "i386") == 0 ||
+	    strcmp (buf.machine, "i586") == 0 ||
+	    strcmp (buf.machine, "i686") == 0)
+		goto out;
+
+	/* 64 bit machines */
+	if (strcmp (buf.machine, "x86_64") == 0) {
+		suffix = "()(64bit)";
+		goto out;
+	}
+
+	g_warning ("did not recognise machine type: '%s'", buf.machine);
+out:
+	return suffix;
+}
+
+
+/**
  * main:
  **/
 int
@@ -245,6 +284,7 @@ main (int argc, char **argv)
 	gchar **codecs = NULL;
 	gint xid = 0;
 	gint retval = 1;
+	const gchar *suffix;
 
 	const GOptionEntry options[] = {
 		{ "transient-for", '\0', 0, G_OPTION_ARG_INT, &xid, "The XID of the parent window", NULL },
@@ -288,6 +328,8 @@ main (int argc, char **argv)
 		goto out;
 	}
 
+	/* use a ()(64bit) suffix for 64 bit */
+	suffix = pk_gst_get_arch_suffix ();
 
 	/* process argv */
 	array = g_ptr_array_new ();
@@ -301,18 +343,18 @@ main (int argc, char **argv)
 			g_print ("skipping %s\n", codecs[i]);
 			continue;
 		}
+		g_message ("Codec nice name: %s", info->codec_name);
 		if (info->structure != NULL) {
 			s = pk_gst_structure_to_provide (info->structure);
-			type = g_strdup_printf ("gstreamer0.10(%s-%s)%s", info->type_name,
-						gst_structure_get_name (info->structure), s ? s : "");
+			type = g_strdup_printf ("gstreamer0.10(%s-%s)%s%s", info->type_name,
+						gst_structure_get_name (info->structure), s, suffix);
 			g_free (s);
+			g_message ("structure: %s", type);
 		} else {
 			type = g_strdup_printf ("gstreamer0.10(%s)", info->type_name);
+			g_message ("non-structure: %s", type);
 		}
 
-		g_message ("Codec nice name: %s", info->codec_name);
-		g_message ("%s", type);
-
 		/* create (ss) structure */
 		varray = g_value_array_new (2);
 		value = g_new0 (GValue, 1);

pk-fix-cancel-at-speed-unlucky.patch:

--- NEW FILE pk-fix-cancel-at-speed-unlucky.patch ---
commit d2c3725b5414e27fa05518f04eab01ab7a0b1a89
Author: Richard Hughes <hughsie at localhost.localdomain>
Date:   Tue Sep 30 10:42:32 2008 +0100

    bugfix: remove items about to be run from the transaction list without crashing
    
    The daemon sometimes crashes when a large number of requests are queued and then cancelled
    This is because by sheer luck (on unluckyness...) we get a request in the idle time between
    the transaction being scheduled to run, and actually being run.
    In this case, save the idle callback ID, and stop the callback from occurring

diff --git a/src/pk-transaction-list.c b/src/pk-transaction-list.c
index d975f6b..9470da9 100644
--- a/src/pk-transaction-list.c
+++ b/src/pk-transaction-list.c
@@ -69,6 +69,7 @@ typedef struct {
 	gboolean		 finished;
 	PkTransaction		*transaction;
 	gchar			*tid;
+	guint			 idle_id;
 } PkTransactionItem;
 
 enum {
@@ -199,6 +200,17 @@ pk_transaction_list_remove (PkTransactionList *tlist, const gchar *tid)
 		egg_warning ("already finished, so waiting to timeout");
 		return FALSE;
 	}
+	/* check if we are running, or _just_ about to be run */
+	if (item->running) {
+		if (item->idle_id == 0) {
+			egg_warning ("already running, but no idle_id");
+			return FALSE;
+		}
+		/* just about to be run! */
+		egg_debug ("cancelling the callback to the 'lost' transaction");
+		g_source_remove (item->idle_id);
+		item->idle_id = 0;
+	}
 	ret = pk_transaction_list_remove_internal (tlist, item);
 	return ret;
 }
@@ -237,6 +249,7 @@ pk_transaction_list_run_idle_cb (PkTransactionItem *item)
 		egg_error ("failed to run transaction (fatal)");
 
 	/* never try to idle add this again */
+	item->idle_id = 0;
 	return FALSE;
 }
 
@@ -251,7 +264,7 @@ pk_transaction_list_run_item (PkTransactionList *tlist, PkTransactionItem *item)
 	item->running = TRUE;
 
 	/* add this idle, so that we don't have a deep out-of-order callchain */
-	g_idle_add ((GSourceFunc) pk_transaction_list_run_idle_cb, item);
+	item->idle_id = g_idle_add ((GSourceFunc) pk_transaction_list_run_idle_cb, item);
 }
 
 /**


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- PackageKit.spec	30 Sep 2008 08:46:56 -0000	1.63
+++ PackageKit.spec	30 Sep 2008 12:52:58 -0000	1.64
@@ -8,15 +8,18 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.5
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# upstream: c9a01198d494f06ae9e0b3e2a002f941da118f00
-#Patch0:    pk-dont-send-finished-from-dispatcher.patch
+# upstream: 920574b72805a630ea989b32012e2b4bbf1841ea
+Patch0:    pk-fix-64bit-codecs.patch
+
+# upstream: d2c3725b5414e27fa05518f04eab01ab7a0b1a89
+Patch1:    pk-fix-cancel-at-speed-unlucky.patch
 
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
@@ -155,7 +158,8 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -296,6 +300,10 @@
 %{_includedir}/*
 
 %changelog
+* Tue Sep 30 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.5-3
+- Fix a bug where the daemon could crash when cancelling a lot of transactions.
+- Fix installing codecs with a 64 bit machine
+
 * Tue Sep 30 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.5-2
 - Obsolete more releases of codeina to fix upgrades on rawhide.
 



From karsten at fedoraproject.org  Tue Sep 30 13:06:54 2008
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue, 30 Sep 2008 13:06:54 +0000 (UTC)
Subject: rpms/vim/devel 7.2.022, NONE, 1.1 README.patches, 1.111,
	1.112 vim.spec, 1.220, 1.221
Message-ID: <20080930130654.115DA70119@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20382

Modified Files:
	README.patches vim.spec 
Added Files:
	7.2.022 
Log Message:
- patchlevel 022


--- NEW FILE 7.2.022 ---
To: vim-dev at vim.org
Subject: Patch 7.2.022 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.022 (extra)
Problem:    Testing is not possible when compiling with MingW.
Solution:   Add a MingW specific test Makefile. (Bill McCarthy)
Files:	    Filelist, src/testdir/Make_ming.mak


*** ../vim-7.2.021/Filelist	Sun Jul 13 19:33:31 2008
--- Filelist	Sun Sep 14 21:47:01 2008
***************
*** 285,290 ****
--- 285,291 ----
  		src/proto/os_win32.pro \
  		src/proto/os_mswin.pro \
  		src/testdir/Make_dos.mak \
+ 		src/testdir/Make_ming.mak \
  		src/testdir/dos.vim \
  		src/uninstal.c \
  		src/vim.def \
*** ../vim-7.2.021/src/testdir/Make_ming.mak	Sat Sep 20 16:25:06 2008
--- src/testdir/Make_ming.mak	Sat Sep 20 16:25:58 2008
***************
*** 0 ****
--- 1,91 ----
+ # Makefile to run tests for Vim, on Dos-like machines
+ # with sh.exe or zsh.exe in the path or not.
+ #
+ # Author: Bill McCarthy
+ #
+ # Note that test54 has been removed until it is fixed.
+ #
+ # Requires a set of Unix tools: echo, diff, etc.
+ 
+ ifneq (sh.exe, $(SHELL))
+ DEL = rm -f
+ MV = mv
+ CP = cp
+ DIRSLASH = /
+ else
+ DEL = del
+ MV = rename
+ CP = copy
+ DIRSLASH = \\
+ endif
+ 
+ VIMPROG = ..$(DIRSLASH)vim
+ 
+ # Omitted:
+ # test2		"\\tmp" doesn't work.
+ # test10	'errorformat' is different
+ # test12	can't unlink a swap file
+ # test25	uses symbolic link
+ # test27	can't edit file with "*" in file name
+ # test31	16 bit version runs out of memory...
+ 
+ SCRIPTS16 =	test1.out test19.out test20.out test22.out \
+ 		test23.out test24.out test28.out test29.out \
+ 		test35.out test36.out test43.out \
+ 		test44.out test45.out test46.out test47.out \
+ 		test48.out test51.out test53.out            \
+ 		test55.out test56.out test57.out test58.out test59.out \
+ 		test60.out test61.out test62.out test63.out test64.out
+ 
+ # Had to remove test54 which doesn't work yet.
+ #		                                 test54.out
+ 
+ SCRIPTS =	test3.out test4.out test5.out test6.out test7.out \
+ 		test8.out test9.out test11.out test13.out test14.out \
+ 		test15.out test17.out test18.out test21.out test26.out \
+ 		test30.out test31.out test32.out test33.out test34.out \
+ 		test37.out test38.out test39.out test40.out test41.out \
+ 		test42.out test52.out test65.out
+ 
+ SCRIPTS32 =	test50.out
+ 
+ SCRIPTS_GUI = test16.out
+ 
+ .SUFFIXES: .in .out
+ 
+ vimall:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS32)
+ 	echo ALL DONE
+ 
+ nongui:	fixff $(SCRIPTS16) $(SCRIPTS)
+ 	echo ALL DONE
+ 
+ small:
+ 	echo ALL DONE
+ 
+ gui:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI)
+ 	echo ALL DONE
+ 
+ win32:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32)
+ 	echo ALL DONE
+ 
+ fixff:
+ 	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
+ 
+ clean:
+ 	-$(DEL) *.out
+ 	-$(DEL) test.ok
+ 	-$(DEL) small.vim
+ 	-$(DEL) tiny.vim
+ 	-$(DEL) mbyte.vim
+ 	-$(DEL) X*
+ 	-$(DEL) viminfo
+ 
+ .in.out:
+ 	$(CP) $*.ok test.ok
+ 	$(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in
+ 	diff test.out $*.ok
+ 	-$(DEL) $*.out
+ 	$(MV) test.out $*.out
+ 	-$(DEL) X*
+ 	-$(DEL) test.ok
+ 	-$(DEL) viminfo
*** ../vim-7.2.021/src/version.c	Thu Sep 18 21:29:07 2008
--- src/version.c	Sat Sep 20 16:25:16 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     22,
  /**/

-- 
Where do you want to crash today?

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


Index: README.patches
===================================================================
RCS file: /cvs/extras/rpms/vim/devel/README.patches,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- README.patches	8 Sep 2008 11:20:05 -0000	1.111
+++ README.patches	30 Sep 2008 13:06:23 -0000	1.112
@@ -38,3 +38,12 @@
   2873  7.2.011  error when inserting a float value from expression register
   1444  7.2.012  compiler warnings when building with startup timing
   4157  7.2.013  hang when waiting for X selection, consuming lots of CPU time
+  1769  7.2.014  synstack() doesn't work in an emptly line
+  1943  7.2.015  "make all test install" doesn't stop when the test fails
+  4536  7.2.016  cmdline completion pattern can be in freed memory
+  5319  7.2.017  X11: strlen() used wrongly, pasting very big selection fails
+  1390  7.2.018  memory leak when substitute is aborted
+  2269  7.2.019  completion and exists() don't work for ":noautocmd"
+  1521  7.2.020  "kvim" starts the GUI even though KDE is no longer supported
+  4806  7.2.021  getting full file name when executing autocmds may be slow
+  3823  7.2.022  (extra) cannot run tests with the MingW compiler


Index: vim.spec
===================================================================
RCS file: /cvs/extras/rpms/vim/devel/vim.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- vim.spec	8 Sep 2008 11:23:02 -0000	1.220
+++ vim.spec	30 Sep 2008 13:06:23 -0000	1.221
@@ -18,7 +18,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim72%{?beta}
-%define patchlevel 013
+%define patchlevel 022
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -69,6 +69,15 @@
 Patch011: 7.2.011
 Patch012: 7.2.012
 Patch013: 7.2.013
+Patch014: 7.2.014
+Patch015: 7.2.015
+Patch016: 7.2.016
+Patch017: 7.2.017
+Patch018: 7.2.018
+Patch019: 7.2.019
+Patch020: 7.2.020
+Patch021: 7.2.021
+Patch022: 7.2.022
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -214,6 +223,15 @@
 %patch011 -p0
 %patch012 -p0
 %patch013 -p0
+%patch014 -p0
+%patch015 -p0
+%patch016 -p0
+%patch017 -p0
+%patch018 -p0
+%patch019 -p0
+%patch020 -p0
+%patch021 -p0
+%patch022 -p0
 
 # install spell files
 %if %{withvimspell}
@@ -632,6 +650,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Sep 30 2008 Karsten Hopp <karsten at redhat.com> 7.2.022-1
+- patchlevel 22
+
 * Mon Sep 08 2008 Karsten Hopp <karsten at redhat.com> 7.2.013-1
 - patchlevel 13
 



From karsten at fedoraproject.org  Tue Sep 30 13:07:02 2008
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue, 30 Sep 2008 13:07:02 +0000 (UTC)
Subject: rpms/vim/devel 7.2.014,NONE,1.1
Message-ID: <20080930130702.2258A70119@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20484

Added Files:
	7.2.014 
Log Message:
- patchlevel 014


--- NEW FILE 7.2.014 ---
To: vim-dev at vim.org
Subject: Patch 7.2.014
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.014
Problem:    synstack() doesn't work in an emptly line.
Solution:   Accept column zero as a valid position.
Files:	    src/eval.c


*** ../vim-7.2.013/src/eval.c	Sun Sep  7 13:54:31 2008
--- src/eval.c	Sun Sep  7 13:50:38 2008
***************
*** 16667,16673 ****
      col = get_tv_number(&argvars[1]) - 1;	/* -1 on type error */
  
      if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count
! 	    && col >= 0 && col < (long)STRLEN(ml_get(lnum))
  	    && rettv_list_alloc(rettv) != FAIL)
      {
  	(void)syn_get_id(curwin, lnum, (colnr_T)col, FALSE, NULL, TRUE);
--- 16667,16673 ----
      col = get_tv_number(&argvars[1]) - 1;	/* -1 on type error */
  
      if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count
! 	    && col >= 0 && (col == 0 || col < (long)STRLEN(ml_get(lnum)))
  	    && rettv_list_alloc(rettv) != FAIL)
      {
  	(void)syn_get_id(curwin, lnum, (colnr_T)col, FALSE, NULL, TRUE);
*** ../vim-7.2.013/src/version.c	Sun Sep  7 21:47:51 2008
--- src/version.c	Wed Sep 10 15:36:52 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     14,
  /**/

-- 
Everybody lies, but it doesn't matter since nobody listens.
                                -- Lieberman's Law

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Tue Sep 30 13:07:13 2008
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue, 30 Sep 2008 13:07:13 +0000 (UTC)
Subject: rpms/vim/devel 7.2.016,NONE,1.1
Message-ID: <20080930130713.09E9670119@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20552

Added Files:
	7.2.016 
Log Message:
- patchlevel 016


--- NEW FILE 7.2.016 ---
To: vim-dev at vim.org
Subject: Patch 7.2.016
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.016
Problem:    The pattern being completed may be in freed memory when the
	    command line is being reallocated. (Dominique Pelle)
Solution:   Keep a pointer to the expand_T in the command line structure.
	    Don't use <S-Tab> as CTRL-P when there are no results.  Clear the
	    completion when using a command line from the history.
Files:	    src/ex_getln.c


*** ../vim-7.2.015/src/ex_getln.c	Fri Aug  8 12:58:59 2008
--- src/ex_getln.c	Wed Sep 10 22:43:41 2008
***************
*** 31,36 ****
--- 31,38 ----
      int		cmdattr;	/* attributes for prompt */
      int		overstrike;	/* Typing mode on the command line.  Shared by
  				   getcmdline() and put_on_cmdline(). */
+     expand_T	*xpc;		/* struct being used for expansion, xp_pattern
+ 				   may point into cmdbuff */
      int		xp_context;	/* type of expansion */
  # ifdef FEAT_EVAL
      char_u	*xp_arg;	/* user-defined expansion arg */
***************
*** 38,44 ****
  # endif
  };
  
! static struct cmdline_info ccline;	/* current cmdline_info */
  
  static int	cmd_showtail;		/* Only show path tail in lists ? */
  
--- 40,50 ----
  # endif
  };
  
! /* The current cmdline_info.  It is initialized in getcmdline() and after that
!  * used by other functions.  When invoking getcmdline() recursively it needs
!  * to be saved with save_cmdline() and restored with restore_cmdline().
!  * TODO: make it local to getcmdline() and pass it around. */
! static struct cmdline_info ccline;
  
  static int	cmd_showtail;		/* Only show path tail in lists ? */
  
***************
*** 238,243 ****
--- 244,250 ----
      }
  
      ExpandInit(&xpc);
+     ccline.xpc = &xpc;
  
  #ifdef FEAT_RIGHTLEFT
      if (curwin->w_p_rl && *curwin->w_p_rlc == 's'
***************
*** 408,416 ****
  #endif
  
  	/*
! 	 * <S-Tab> works like CTRL-P (unless 'wc' is <S-Tab>).
  	 */
! 	if (c != p_wc && c == K_S_TAB && xpc.xp_numfiles != -1)
  	    c = Ctrl_P;
  
  #ifdef FEAT_WILDMENU
--- 415,424 ----
  #endif
  
  	/*
! 	 * When there are matching completions to select <S-Tab> works like
! 	 * CTRL-P (unless 'wc' is <S-Tab>).
  	 */
! 	if (c != p_wc && c == K_S_TAB && xpc.xp_numfiles > 0)
  	    c = Ctrl_P;
  
  #ifdef FEAT_WILDMENU
***************
*** 1513,1518 ****
--- 1521,1527 ----
  		    int		old_firstc;
  
  		    vim_free(ccline.cmdbuff);
+ 		    xpc.xp_context = EXPAND_NOTHING;
  		    if (hiscnt == hislen)
  			p = lookfor;	/* back to the old one */
  		    else
***************
*** 1839,1844 ****
--- 1848,1854 ----
  #endif
  
      ExpandCleanup(&xpc);
+     ccline.xpc = NULL;
  
  #ifdef FEAT_SEARCH_EXTRA
      if (did_incsearch)
***************
*** 2508,2513 ****
--- 2518,2537 ----
      }
      mch_memmove(ccline.cmdbuff, p, (size_t)ccline.cmdlen + 1);
      vim_free(p);
+ 
+     if (ccline.xpc != NULL
+ 	    && ccline.xpc->xp_pattern != NULL
+ 	    && ccline.xpc->xp_context != EXPAND_NOTHING
+ 	    && ccline.xpc->xp_context != EXPAND_UNSUCCESSFUL)
+     {
+ 	int i = ccline.xpc->xp_pattern - p;
+ 
+ 	/* If xp_pattern points inside the old cmdbuff it needs to be adjusted
+ 	 * to point into the newly allocated memory. */
+ 	if (i >= 0 && i <= ccline.cmdlen)
+ 	    ccline.xpc->xp_pattern = ccline.cmdbuff + i;
+     }
+ 
      return OK;
  }
  
***************
*** 2875,2880 ****
--- 2899,2905 ----
      prev_ccline = ccline;
      ccline.cmdbuff = NULL;
      ccline.cmdprompt = NULL;
+     ccline.xpc = NULL;
  }
  
  /*
***************
*** 3582,3587 ****
--- 3607,3613 ----
  ExpandInit(xp)
      expand_T	*xp;
  {
+     xp->xp_pattern = NULL;
      xp->xp_backslash = XP_BS_NONE;
  #ifndef BACKSLASH_IN_FILENAME
      xp->xp_shell = FALSE;
*** ../vim-7.2.015/src/version.c	Wed Sep 10 18:25:18 2008
--- src/version.c	Sun Sep 14 14:38:47 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     16,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
53. To find out what time it is, you send yourself an e-mail and check the
    "Date:" field.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Tue Sep 30 13:07:18 2008
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue, 30 Sep 2008 13:07:18 +0000 (UTC)
Subject: rpms/vim/devel 7.2.017,NONE,1.1
Message-ID: <20080930130718.AD82F70119@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20589

Added Files:
	7.2.017 
Log Message:
- patchlevel 017


--- NEW FILE 7.2.017 ---
To: vim-dev at vim.org
Subject: Patch 7.2.017
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.017
Problem:    strlen() used on text that may not end in a NUL. (Dominique Pelle)
	    Pasting a very big selection doesn't work.
Solution:   Use the length passed to the XtSelectionCallbackProc() function.
	    After getting the SelectionNotify event continue dispatching
	    events until the callback is actually called.  Also dispatch the
	    PropertyNotify event.
Files:	    src/ui.c


*** ../vim-7.2.016/src/ui.c	Sun Sep  7 21:47:51 2008
--- src/ui.c	Sun Sep 14 15:52:19 2008
***************
*** 2020,2026 ****
  
      if (value == NULL || *length == 0)
      {
! 	clip_free_selection(cbd);	/* ???  [what's the query?] */
  	*(int *)success = FALSE;
  	return;
      }
--- 2020,2026 ----
  
      if (value == NULL || *length == 0)
      {
! 	clip_free_selection(cbd);	/* nothing received, clear register */
  	*(int *)success = FALSE;
  	return;
      }
***************
*** 2076,2082 ****
  	text_prop.value = (unsigned char *)value;
  	text_prop.encoding = *type;
  	text_prop.format = *format;
! 	text_prop.nitems = STRLEN(value);
  	status = XmbTextPropertyToTextList(X_DISPLAY, &text_prop,
  							 &text_list, &n_text);
  	if (status != Success || n_text < 1)
--- 2076,2082 ----
  	text_prop.value = (unsigned char *)value;
  	text_prop.encoding = *type;
  	text_prop.format = *format;
! 	text_prop.nitems = len;
  	status = XmbTextPropertyToTextList(X_DISPLAY, &text_prop,
  							 &text_list, &n_text);
  	if (status != Success || n_text < 1)
***************
*** 2131,2137 ****
  	    case 3:  type = text_atom;		break;
  	    default: type = XA_STRING;
  	}
! 	success = FALSE;
  	XtGetSelectionValue(myShell, cbd->sel_atom, type,
  	    clip_x11_request_selection_cb, (XtPointer)&success, CurrentTime);
  
--- 2131,2137 ----
  	    case 3:  type = text_atom;		break;
  	    default: type = XA_STRING;
  	}
! 	success = MAYBE;
  	XtGetSelectionValue(myShell, cbd->sel_atom, type,
  	    clip_x11_request_selection_cb, (XtPointer)&success, CurrentTime);
  
***************
*** 2145,2169 ****
  	 * paste!  Don't worry, we will catch up with any other events later.
  	 */
  	start_time = time(NULL);
! 	for (;;)
  	{
! 	    if (XCheckTypedEvent(dpy, SelectionNotify, &event))
  	    {
! 		/* this is where clip_x11_request_selection_cb() is actually
! 		 * called */
  		XtDispatchEvent(&event);
! 		break;
  	    }
- 	    if (XCheckTypedEvent(dpy, SelectionRequest, &event))
- 		/* We may get a SelectionRequest here and if we don't handle
- 		 * it we hang.  KDE klipper does this, for example. */
- 		XtDispatchEvent(&event);
  
  	    /* Time out after 2 to 3 seconds to avoid that we hang when the
  	     * other process doesn't respond.  Note that the SelectionNotify
  	     * event may still come later when the selection owner comes back
! 	     * to life and the text gets inserted unexpectedly (by xterm).
! 	     * Don't know how to avoid that :-(. */
  	    if (time(NULL) > start_time + 2)
  	    {
  		timed_out = TRUE;
--- 2145,2171 ----
  	 * paste!  Don't worry, we will catch up with any other events later.
  	 */
  	start_time = time(NULL);
! 	while (success == MAYBE)
  	{
! 	    if (XCheckTypedEvent(dpy, SelectionNotify, &event)
! 		    || XCheckTypedEvent(dpy, SelectionRequest, &event)
! 		    || XCheckTypedEvent(dpy, PropertyNotify, &event))
  	    {
! 		/* This is where clip_x11_request_selection_cb() should be
! 		 * called.  It may actually happen a bit later, so we loop
! 		 * until "success" changes.
! 		 * We may get a SelectionRequest here and if we don't handle
! 		 * it we hang.  KDE klipper does this, for example.
! 		 * We need to handle a PropertyNotify for large selections. */
  		XtDispatchEvent(&event);
! 		continue;
  	    }
  
  	    /* Time out after 2 to 3 seconds to avoid that we hang when the
  	     * other process doesn't respond.  Note that the SelectionNotify
  	     * event may still come later when the selection owner comes back
! 	     * to life and the text gets inserted unexpectedly.  Don't know
! 	     * why that happens or how to avoid that :-(. */
  	    if (time(NULL) > start_time + 2)
  	    {
  		timed_out = TRUE;
***************
*** 2177,2183 ****
  	    ui_delay(1L, TRUE);
  	}
  
! 	if (success)
  	    return;
  
  	/* don't do a retry with another type after timing out, otherwise we
--- 2179,2185 ----
  	    ui_delay(1L, TRUE);
  	}
  
! 	if (success == TRUE)
  	    return;
  
  	/* don't do a retry with another type after timing out, otherwise we
*** ../vim-7.2.016/src/version.c	Sun Sep 14 14:41:44 2008
--- src/version.c	Sun Sep 14 15:55:34 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     17,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
54. You start tilting your head sideways to smile. :-)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Tue Sep 30 13:07:23 2008
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue, 30 Sep 2008 13:07:23 +0000 (UTC)
Subject: rpms/vim/devel 7.2.018,NONE,1.1
Message-ID: <20080930130723.EBA6B70119@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20623

Added Files:
	7.2.018 
Log Message:
- patchlevel 018


--- NEW FILE 7.2.018 ---
To: vim-dev at vim.org
Subject: Patch 7.2.018
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.018
Problem:    Memory leak when substitute is aborted.
Solution:   Free the buffer allocated for the new text. (Dominique Pelle)
Files:	    src/ex_cmds.c


*** ../vim-7.2.017/src/ex_cmds.c	Wed Aug  6 15:03:07 2008
--- src/ex_cmds.c	Sun Sep 14 13:45:03 2008
***************
*** 5059,5064 ****
--- 5059,5065 ----
  
  	    if (did_sub)
  		++sub_nlines;
+ 	    vim_free(new_start);	/* for when substitute was cancelled */
  	    vim_free(sub_firstline);	/* free the copy of the original line */
  	    sub_firstline = NULL;
  	}
*** ../vim-7.2.017/src/version.c	Sun Sep 14 15:57:54 2008
--- src/version.c	Sun Sep 14 21:38:25 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     18,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
55. You ask your doctor to implant a gig in your brain.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Tue Sep 30 13:07:07 2008
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue, 30 Sep 2008 13:07:07 +0000 (UTC)
Subject: rpms/vim/devel 7.2.015,NONE,1.1
Message-ID: <20080930130707.AF35C70119@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20518

Added Files:
	7.2.015 
Log Message:
- patchlevel 015


--- NEW FILE 7.2.015 ---
To: vim-dev at vim.org
Subject: Patch 7.2.015
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.015
Problem:    "make all test install" doesn't stop when the test fails. (Daniel
	    Shahaf)
Solution:   When test.log contains failures exit with non-zero status.
Files:	    src/testdir/Makefile


*** ../vim-7.2.014/src/testdir/Makefile	Wed Jun 25 00:22:53 2008
--- src/testdir/Makefile	Sun Sep  7 21:31:49 2008
***************
*** 26,40 ****
  
  .SUFFIXES: .in .out
  
! nongui:	nolog $(SCRIPTS)
! 	@echo
! 	@cat test.log
! 	@echo ALL DONE
  
! gui:	nolog $(SCRIPTS) $(SCRIPTS_GUI)
  	@echo
! 	@cat test.log
! 	@echo ALL DONE
  
  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
  
--- 26,42 ----
  
  .SUFFIXES: .in .out
  
! nongui:	nolog $(SCRIPTS) report
! 
! gui:	nolog $(SCRIPTS) $(SCRIPTS_GUI) report
  
! report:
  	@echo
! 	@echo 'Test results:'
! 	@/bin/sh -c "if test -f test.log; \
! 		then cat test.log; echo TEST FAILURE; exit 1; \
! 		else echo ALL DONE; \
! 		fi"
  
  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
  
***************
*** 71,74 ****
  test60.out: test60.vim
  
  nolog:
! 	-echo Test results: >test.log
--- 73,76 ----
  test60.out: test60.vim
  
  nolog:
! 	-rm -f test.log
*** ../vim-7.2.014/src/version.c	Wed Sep 10 15:38:13 2008
--- src/version.c	Wed Sep 10 18:23:38 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     15,
  /**/

-- 
Light travels faster than sound.  This is why some people
appear bright until you hear them speak

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Tue Sep 30 13:07:29 2008
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue, 30 Sep 2008 13:07:29 +0000 (UTC)
Subject: rpms/vim/devel 7.2.019,NONE,1.1
Message-ID: <20080930130729.B02DA70119@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20657

Added Files:
	7.2.019 
Log Message:
- patchlevel 019


--- NEW FILE 7.2.019 ---
To: vim-dev at vim.org
Subject: Patch 7.2.019
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.019
Problem:    Completion of ":noautocmd" doesn't work and exists(":noautocmd")
	    returns zero. (Ben Fritz)
Solution:   Add "noautocmd" to the list of modifiers and commands.
Files:	    src/ex_cmds.h, src/ex_docmd.c


*** ../vim-7.2.018/src/ex_cmds.h	Wed Jun 25 00:44:40 2008
--- src/ex_cmds.h	Sat Sep 13 18:37:25 2008
***************
*** 635,640 ****
--- 635,642 ----
  			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
  EX(CMD_noremap,		"noremap",	ex_map,
  			BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+ EX(CMD_noautocmd,	"noautocmd",	ex_wrongmodifier,
+ 			NEEDARG|EXTRA|NOTRLCOM),
  EX(CMD_nohlsearch,	"nohlsearch",	ex_nohlsearch,
  			TRLBAR|SBOXOK|CMDWIN),
  EX(CMD_noreabbrev,	"noreabbrev",	ex_abbreviate,
*** ../vim-7.2.018/src/ex_docmd.c	Sat Jul 26 16:04:39 2008
--- src/ex_docmd.c	Mon Sep 15 20:04:53 2008
***************
*** 2978,2983 ****
--- 2979,2985 ----
      {"keepmarks", 3, FALSE},
      {"leftabove", 5, FALSE},
      {"lockmarks", 3, FALSE},
+     {"noautocmd", 3, FALSE},
      {"rightbelow", 6, FALSE},
      {"sandbox", 3, FALSE},
      {"silent", 3, FALSE},
*** ../vim-7.2.018/src/version.c	Sun Sep 14 21:40:26 2008
--- src/version.c	Thu Sep 18 12:39:56 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     19,
  /**/

-- 
Proof techniques #2: Proof by Oddity.
	SAMPLE: To prove that horses have an infinite number of legs.
(1) Horses have an even number of legs.
(2) They have two legs in back and fore legs in front.
(3) This makes a total of six legs, which certainly is an odd number of
    legs for a horse.
(4) But the only number that is both odd and even is infinity.
(5) Therefore, horses must have an infinite number of legs.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Tue Sep 30 13:07:34 2008
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue, 30 Sep 2008 13:07:34 +0000 (UTC)
Subject: rpms/vim/devel 7.2.020,NONE,1.1
Message-ID: <20080930130734.BF7B670119@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20690

Added Files:
	7.2.020 
Log Message:
- patchlevel 020


--- NEW FILE 7.2.020 ---
To: vim-dev at vim.org
Subject: Patch 7.2.020
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.020
Problem:    Starting the GUI when the executable starts with 'k', but the KDE
	    version no longer exists.
Solution:   Don't have "kvim" start the GUI.
Files:	    src/main.c


*** ../vim-7.2.019/src/main.c	Thu Jul 24 19:34:23 2008
--- src/main.c	Sun Sep 14 13:26:10 2008
***************
*** 1457,1463 ****
  	++initstr;
      }
  
!     if (TOLOWER_ASC(initstr[0]) == 'g' || initstr[0] == 'k')
      {
  	main_start_gui();
  #ifdef FEAT_GUI
--- 1458,1465 ----
  	++initstr;
      }
  
!     /* "gvim" starts the GUI.  Also accept "Gvim" for MS-Windows. */
!     if (TOLOWER_ASC(initstr[0]) == 'g')
      {
  	main_start_gui();
  #ifdef FEAT_GUI
*** ../vim-7.2.019/src/version.c	Thu Sep 18 12:43:21 2008
--- src/version.c	Thu Sep 18 20:54:10 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     20,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
90. Instead of calling you to dinner, your spouse sends e-mail.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Tue Sep 30 13:07:47 2008
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue, 30 Sep 2008 13:07:47 +0000 (UTC)
Subject: rpms/vim/devel 7.2.021,NONE,1.1
Message-ID: <20080930130747.763F870119@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20745

Added Files:
	7.2.021 
Log Message:
- patchlevel 021


--- NEW FILE 7.2.021 ---
To: vim-dev at vim.org
Subject: Patch 7.2.021
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.021
Problem:    When executing autocommands getting the full file name may be
	    slow. (David Kotchan)
Solution:   Postpone calling FullName_save() until autocmd_fname is used.
Files:	    src/ex_docmd.c, src/fileio.c, src/globals.h


*** ../vim-7.2.020/src/ex_docmd.c	Thu Sep 18 12:43:21 2008
--- src/ex_docmd.c	Mon Sep 15 20:04:53 2008
***************
*** 9542,9547 ****
--- 9569,9583 ----
  #ifdef FEAT_AUTOCMD
  	case SPEC_AFILE:	/* file name for autocommand */
  		result = autocmd_fname;
+ 		if (result != NULL && !autocmd_fname_full)
+ 		{
+ 		    /* Still need to turn the fname into a full path.  It is
+ 		     * postponed to avoid a delay when <afile> is not used. */
+ 		    autocmd_fname_full = TRUE;
+ 		    result = FullName_save(autocmd_fname, FALSE);
+ 		    vim_free(autocmd_fname);
+ 		    autocmd_fname = result;
+ 		}
  		if (result == NULL)
  		{
  		    *errormsg = (char_u *)_("E495: no autocommand file name to substitute for \"<afile>\"");
*** ../vim-7.2.020/src/fileio.c	Wed Aug  6 18:43:07 2008
--- src/fileio.c	Tue Sep 16 21:24:26 2008
***************
*** 8523,8528 ****
--- 8523,8529 ----
      char_u	*save_sourcing_name;
      linenr_T	save_sourcing_lnum;
      char_u	*save_autocmd_fname;
+     int		save_autocmd_fname_full;
      int		save_autocmd_bufnr;
      char_u	*save_autocmd_match;
      int		save_autocmd_busy;
***************
*** 8601,8606 ****
--- 8602,8608 ----
       * Save the autocmd_* variables and info about the current buffer.
       */
      save_autocmd_fname = autocmd_fname;
+     save_autocmd_fname_full = autocmd_fname_full;
      save_autocmd_bufnr = autocmd_bufnr;
      save_autocmd_match = autocmd_match;
      save_autocmd_busy = autocmd_busy;
***************
*** 8618,8631 ****
  	if (fname != NULL && *fname != NUL)
  	    autocmd_fname = fname;
  	else if (buf != NULL)
! 	    autocmd_fname = buf->b_fname;
  	else
  	    autocmd_fname = NULL;
      }
      else
  	autocmd_fname = fname_io;
      if (autocmd_fname != NULL)
! 	autocmd_fname = FullName_save(autocmd_fname, FALSE);
  
      /*
       * Set the buffer number to be used for <abuf>.
--- 8620,8634 ----
  	if (fname != NULL && *fname != NUL)
  	    autocmd_fname = fname;
  	else if (buf != NULL)
! 	    autocmd_fname = buf->b_ffname;
  	else
  	    autocmd_fname = NULL;
      }
      else
  	autocmd_fname = fname_io;
      if (autocmd_fname != NULL)
! 	autocmd_fname = vim_strsave(autocmd_fname);
!     autocmd_fname_full = FALSE; /* call FullName_save() later */
  
      /*
       * Set the buffer number to be used for <abuf>.
***************
*** 8810,8815 ****
--- 8813,8819 ----
      sourcing_lnum = save_sourcing_lnum;
      vim_free(autocmd_fname);
      autocmd_fname = save_autocmd_fname;
+     autocmd_fname_full = save_autocmd_fname_full;
      autocmd_bufnr = save_autocmd_bufnr;
      autocmd_match = save_autocmd_match;
  #ifdef FEAT_EVAL
***************
*** 8918,8924 ****
      {
  	apc->curpat = NULL;
  
! 	/* only use a pattern when it has not been removed, has commands and
  	 * the group matches. For buffer-local autocommands only check the
  	 * buffer number. */
  	if (ap->pat != NULL && ap->cmds != NULL
--- 8922,8928 ----
      {
  	apc->curpat = NULL;
  
! 	/* Only use a pattern when it has not been removed, has commands and
  	 * the group matches. For buffer-local autocommands only check the
  	 * buffer number. */
  	if (ap->pat != NULL && ap->cmds != NULL
*** ../vim-7.2.020/src/globals.h	Sat Jul 26 16:04:49 2008
--- src/globals.h	Mon Sep 15 19:59:28 2008
***************
*** 1022,1027 ****
--- 1022,1028 ----
  #endif
  #ifdef FEAT_AUTOCMD
  EXTERN char_u	*autocmd_fname INIT(= NULL); /* fname for <afile> on cmdline */
+ EXTERN int	autocmd_fname_full;	     /* autocmd_fname is full path */
  EXTERN int	autocmd_bufnr INIT(= 0);     /* fnum for <abuf> on cmdline */
  EXTERN char_u	*autocmd_match INIT(= NULL); /* name for <amatch> on cmdline */
  EXTERN int	did_cursorhold INIT(= FALSE); /* set when CursorHold t'gerd */
*** ../vim-7.2.020/src/version.c	Thu Sep 18 20:55:19 2008
--- src/version.c	Thu Sep 18 21:24:30 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     21,
  /**/

-- 
>From "know your smileys":
 :----}  You lie like Pinocchio

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From veillard at fedoraproject.org  Tue Sep 30 13:11:14 2008
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue, 30 Sep 2008 13:11:14 +0000 (UTC)
Subject: rpms/libvirt/F-8 python_make.patch, NONE, 1.1 libvirt.spec, 1.81,
	1.82 sources, 1.31, 1.32
Message-ID: <20080930131114.4FD3970119@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21337

Modified Files:
	libvirt.spec sources 
Added Files:
	python_make.patch 
Log Message:
- update to latest upstream release
daniel


python_make.patch:

--- NEW FILE python_make.patch ---
Index: python/Makefile.am
===================================================================
RCS file: /data/cvs/libxen/python/Makefile.am,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile.am
--- python/Makefile.am	5 Feb 2008 19:27:37 -0000	1.13
+++ python/Makefile.am	24 Sep 2008 13:21:06 -0000
@@ -50,7 +50,7 @@ GENERATED= libvirt-export.c \
 $(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
 	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
 
-libvirt.py: $(srcdir)/libvir.py libvirtclass.py
+libvirt.py: $(srcdir)/libvir.py $(GENERATED)
 	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
 	mv $@-t $@
 
*** python/Makefile.in.orig	2008-09-24 15:19:20.000000000 +0200
--- python/Makefile.in	2008-09-24 15:20:07.000000000 +0200
*************** uninstall-am: uninstall-local uninstall-
*** 1027,1033 ****
  @WITH_PYTHON_TRUE@$(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
  @WITH_PYTHON_TRUE@	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
  
! @WITH_PYTHON_TRUE at libvirt.py: $(srcdir)/libvir.py libvirtclass.py
  @WITH_PYTHON_TRUE@	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
  @WITH_PYTHON_TRUE@	mv $@-t $@
  
--- 1027,1033 ----
  @WITH_PYTHON_TRUE@$(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
  @WITH_PYTHON_TRUE@	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
  
! @WITH_PYTHON_TRUE at libvirt.py: $(srcdir)/libvir.py $(GENERATED)
  @WITH_PYTHON_TRUE@	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
  @WITH_PYTHON_TRUE@	mv $@-t $@
  


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-8/libvirt.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- libvirt.spec	8 Jul 2008 13:30:54 -0000	1.81
+++ libvirt.spec	30 Sep 2008 13:10:43 -0000	1.82
@@ -1,32 +1,41 @@
 # -*- rpm-spec -*-
 
-%if "%{fedora}" >= "8"
-%define with_polkit 1
-%define with_proxy no
-%else
-%define with_polkit 0
-%define with_proxy yes
+%define with_xen       1
+%define with_xen_proxy 1
+%define with_qemu      1
+%define with_openvz    1
+%define with_lxc       1
+%define with_polkit    0
+
+# Xen is available only on i386 x86_64 ia64
+%ifnarch i386 i686 x86_64 ia64
+%define with_xen 0
+%endif
+
+%if ! %{with_xen}
+%define with_xen_proxy 0
 %endif
 
 %if "%{fedora}"
 %ifarch ppc64
 %define with_qemu 0
-%else
-%define with_qemu 1
 %endif
-%else
-%define with_qemu 0
+%endif
+
+%if 0%{fedora} >= 8
+%define with_polkit    1
+%define with_xen_proxy 0
 %endif
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.4.4
-Release: 2%{?dist}%{?extra_release}
-License: LGPL
+Version: 0.4.6
+Release: 1%{?dist}%{?extra_release}
+License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
-Patch1: %{name}-%{version}-boot-cdrom.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Patch0: python_make.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
 Requires: libxml2
@@ -47,12 +56,14 @@
 %endif
 # For mount/umount in FS driver
 BuildRequires: util-linux
-# PPC64 has no Xen nor QEmu, try to build anyway
-%ifnarch ppc64
+# For showmount in FS driver (netfs discovery)
+BuildRequires: nfs-utils
+Requires: nfs-utils
 %if %{with_qemu}
 # From QEMU RPMs
 Requires: /usr/bin/qemu-img
 %else
+%if %{with_xen}
 # From Xen RPMs
 Requires: /usr/sbin/qcow-create
 %endif
@@ -63,10 +74,11 @@
 Requires: iscsi-initiator-utils
 # For disk driver
 Requires: parted
-%ifarch i386 x86_64 ia64
+%if %{with_xen}
 BuildRequires: xen-devel
 %endif
 BuildRequires: libxml2-devel
+BuildRequires: xhtml1-dtds
 BuildRequires: readline-devel
 BuildRequires: ncurses-devel
 BuildRequires: gettext
@@ -84,12 +96,11 @@
 %endif
 # For mount/umount in FS driver
 BuildRequires: util-linux
-# PPC64 has no Xen nor QEmu, try to build anyway
-%ifnarch ppc64
 %if %{with_qemu}
 # From QEMU RPMs
 BuildRequires: /usr/bin/qemu-img
 %else
+%if %{with_xen}
 # From Xen RPMs
 BuildRequires: /usr/sbin/qcow-create
 %endif
@@ -114,7 +125,7 @@
 Group: Development/Libraries
 Requires: libvirt = %{version}
 Requires: pkgconfig
-%ifarch i386 x86_64 ia64
+%if %{with_xen}
 Requires: xen-devel
 %endif
 Obsoletes: libvir-devel
@@ -137,31 +148,33 @@
 
 %prep
 %setup -q
-%patch1 -p1
+%patch0 -p0
 
 %build
-# Xen is available only on i386 x86_64 ia64
-%ifarch i386 i686 x86_64 ia64
-%configure --with-init-script=redhat \
-           --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
-           --with-remote-file=%{_localstatedir}/run/libvirtd.pid \
-           --with-xen-proxy=%{with_proxy}
-%else
-%ifnarch ppc64
-%configure --without-xen \
-           --with-init-script=redhat \
-           --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
-           --with-remote-file=%{_localstatedir}/run/libvirtd.pid
-%else
-%configure --without-xen \
-           --without-qemu \
-           --with-init-script=redhat \
-           --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
-           --with-remote-file=%{_localstatedir}/run/libvirtd.pid
+%if ! %{with_xen}
+%define _without_xen --without-xen
 %endif
+
+%if ! %{with_qemu}
+%define _without_qemu --without-qemu
 %endif
 
-make
+%if ! %{with_openvz}
+%define _without_openvz --without-openvz
+%endif
+
+%if ! %{with_lxc}
+%define _without_lxc --without-lxc
+%endif
+
+%configure %{?_without_xen} \
+           %{?_without_qemu} \
+           %{?_without_openvz} \
+           %{?_without_lxc} \
+           --with-init-script=redhat \
+           --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
+           --with-remote-file=%{_localstatedir}/run/libvirtd.pid
+make %{?_smp_mflags}
 
 %install
 rm -fr %{buildroot}
@@ -176,6 +189,8 @@
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/libvirt/
 # Default dir for disk images defined in SELinux policy
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/images/
+# Default dir for kernel+initrd images defnied in SELinux policy
+install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/boot/
 
 # We don't want to install /etc/libvirt/qemu/networks in the main %files list
 # because if the admin wants to delete the default network completely, we don't
@@ -241,14 +256,22 @@
 %dir %{_localstatedir}/run/libvirt/
 %dir %{_localstatedir}/lib/libvirt/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
+%{_datadir}/augeas/lenses/libvirtd.aug
+%{_datadir}/augeas/lenses/libvirtd_qemu.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
 %if %{with_polkit}
-%{_datadir}/PolicyKit/policy/libvirtd.policy
+%{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
 %endif
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
-%if %{with_proxy} == "yes"
+%if %{with_xen_proxy}
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
 %endif
 %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
+%if %{with_lxc}
+%attr(0755, root, root) %{_libexecdir}/libvirt_lxc
+%endif
 %attr(0755, root, root) %{_sbindir}/libvirtd
 %doc docs/*.rng
 %doc docs/*.xml
@@ -281,6 +304,9 @@
 %doc docs/examples/python
 
 %changelog
+* Tue Sep 30 2008 Daniel Veillard <veillard at redhat.com> - 0.4.6-1.f8
+- update to latest upstream release
+
 * Tue Jul  8 2008 Daniel P. Berrange <berrange at redhat.com> - 0.4.4-2.fc8
 - Fix booting of CDROM images with KVM (rhbz #452355)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-8/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	25 Jun 2008 09:29:06 -0000	1.31
+++ sources	30 Sep 2008 13:10:43 -0000	1.32
@@ -1 +1 @@
-9407900dc16e0ba9ea3eec3cf0a56674  libvirt-0.4.4.tar.gz
+abdf727deaffd868172f7243eb75ffe3  libvirt-0.4.6.tar.gz



From kkofler at fedoraproject.org  Tue Sep 30 13:21:39 2008
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 30 Sep 2008 13:21:39 +0000 (UTC)
Subject: rpms/cdparanoia/devel cdparanoia-10.2-#463009.patch, NONE,
	1.1 cdparanoia.spec, 1.35, 1.36
Message-ID: <20080930132139.D541D70119@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/cdparanoia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23151/devel

Modified Files:
	cdparanoia.spec 
Added Files:
	cdparanoia-10.2-#463009.patch 
Log Message:
* Tue Sep 30 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 10.2-2
- fix cdda_interface.h C++ incompatibility (patch from upstream) (#463009)

cdparanoia-10.2-#463009.patch:

--- NEW FILE cdparanoia-10.2-#463009.patch ---
Index: /trunk/cdparanoia/interface/test_interface.c
===================================================================
--- /trunk/cdparanoia/interface/test_interface.c (revision 15299)
+++ /trunk/cdparanoia/interface/test_interface.c (revision 15338)
@@ -67,7 +67,7 @@
 
   if(begin<lastread)
-    d->private->last_milliseconds=20;
+    d->private_data->last_milliseconds=20;
   else
-    d->private->last_milliseconds=sectors;
+    d->private_data->last_milliseconds=sectors;
 
 #ifdef CDDA_TEST_UNDERRUN
Index: /trunk/cdparanoia/interface/cdda_interface.h
===================================================================
--- /trunk/cdparanoia/interface/cdda_interface.h (revision 15290)
+++ /trunk/cdparanoia/interface/cdda_interface.h (revision 15338)
@@ -85,5 +85,5 @@
   int is_mmc;
 
-  cdda_private_data_t *private;
+  cdda_private_data_t *private_data;
   void         *reserved;
   unsigned char inqbytes[4];
Index: /trunk/cdparanoia/interface/interface.c
===================================================================
--- /trunk/cdparanoia/interface/interface.c (revision 15314)
+++ /trunk/cdparanoia/interface/interface.c (revision 15338)
@@ -40,7 +40,7 @@
     if(d->cdda_fd!=-1)close(d->cdda_fd);
     if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd);
-    if(d->private){
-      if(d->private->sg_hd)free(d->private->sg_hd);
-      free(d->private);
+    if(d->private_data){
+      if(d->private_data->sg_hd)free(d->private_data->sg_hd);
+      free(d->private_data);
     }
 
@@ -128,5 +128,5 @@
       }	
     }
-    if(ms)*ms=d->private->last_milliseconds;
+    if(ms)*ms=d->private_data->last_milliseconds;
     return(sectors);
   }
Index: /trunk/cdparanoia/interface/scsi_interface.c
===================================================================
--- /trunk/cdparanoia/interface/scsi_interface.c (revision 15314)
+++ /trunk/cdparanoia/interface/scsi_interface.c (revision 15338)
@@ -16,11 +16,11 @@
   struct timespec tv1;
   struct timespec tv2;
-  int ret1=clock_gettime(d->private->clock,&tv1);
+  int ret1=clock_gettime(d->private_data->clock,&tv1);
   int ret2=ioctl(fd, command,arg);
-  int ret3=clock_gettime(d->private->clock,&tv2);
+  int ret3=clock_gettime(d->private_data->clock,&tv2);
   if(ret1<0 || ret3<0){
-    d->private->last_milliseconds=-1;
+    d->private_data->last_milliseconds=-1;
   }else{
-    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
+    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
   }
   return ret2;
@@ -97,5 +97,5 @@
   fd_set fdset;
   struct timeval tv;
-  struct sg_header *sg_hd=d->private->sg_hd;
+  struct sg_header *sg_hd=d->private_data->sg_hd;
   int flag=0;
 
@@ -186,5 +186,5 @@
   int tret1,tret2;
   int status = 0;
-  struct sg_header *sg_hd=d->private->sg_hd;
+  struct sg_header *sg_hd=d->private_data->sg_hd;
   long writebytes=SG_OFF+cmd_len+in_size;
 
@@ -196,5 +196,5 @@
   memset(sg_hd,0,sizeof(sg_hd)); 
   memset(sense_buffer,0,SG_MAX_SENSE); 
-  memcpy(d->private->sg_buffer,cmd,cmd_len+in_size);
+  memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size);
   sg_hd->twelve_byte = cmd_len == 12;
   sg_hd->result = 0;
@@ -210,5 +210,5 @@
 
   if(bytecheck && out_size>in_size){
-    memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 
+    memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 
     /* the size does not remove cmd_len due to the way the kernel
        driver copies buffers */
@@ -244,5 +244,5 @@
 
   sigprocmask (SIG_BLOCK, &(d->sigset), NULL );
-  tret1=clock_gettime(d->private->clock,&tv1);  
+  tret1=clock_gettime(d->private_data->clock,&tv1);  
   errno=0;
   status = write(d->cdda_fd, sg_hd, writebytes );
@@ -290,5 +290,5 @@
   }
 
-  tret2=clock_gettime(d->private->clock,&tv2);  
+  tret2=clock_gettime(d->private_data->clock,&tv2);  
   errno=0;
   status = read(d->cdda_fd, sg_hd, SG_OFF + out_size);
@@ -314,5 +314,5 @@
     long i,flag=0;
     for(i=in_size;i<out_size;i++)
-      if(d->private->sg_buffer[i]!=bytefill){
+      if(d->private_data->sg_buffer[i]!=bytefill){
 	flag=1;
 	break;
@@ -327,7 +327,7 @@
   errno=0;
   if(tret1<0 || tret2<0){
-    d->private->last_milliseconds=-1;
+    d->private_data->last_milliseconds=-1;
   }else{
-    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
+    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
   }
   return(0);
@@ -348,5 +348,5 @@
   memset(&hdr,0,sizeof(hdr));
   memset(sense,0,sizeof(sense));
-  memcpy(d->private->sg_buffer,cmd+cmd_len,in_size);
+  memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size);
 
   hdr.cmdp = cmd;
@@ -356,5 +356,5 @@
   hdr.timeout = 50000;
   hdr.interface_id = 'S';
-  hdr.dxferp =  d->private->sg_buffer;
+  hdr.dxferp =  d->private_data->sg_buffer;
   hdr.flags = SG_FLAG_DIRECT_IO;  /* direct IO if we can get it */
 
@@ -401,5 +401,5 @@
     long i,flag=0;
     for(i=in_size;i<out_size;i++)
-      if(d->private->sg_buffer[i]!=bytefill){
+      if(d->private_data->sg_buffer[i]!=bytefill){
 	flag=1;
 	break;
@@ -413,5 +413,5 @@
 
   /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */
-  /* d->private->last_milliseconds = hdr.duration; */
+  /* d->private_data->last_milliseconds = hdr.duration; */
 
   errno = 0;
@@ -446,7 +446,7 @@
   handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense);
 
-  key = d->private->sg_buffer[2] & 0xf;
-  ASC = d->private->sg_buffer[12];
-  ASCQ = d->private->sg_buffer[13];
+  key = d->private_data->sg_buffer[2] & 0xf;
+  ASC = d->private_data->sg_buffer[12];
+  ASCQ = d->private_data->sg_buffer[13];
   
   if(key == 2 && ASC == 4 && ASCQ == 1) return 0;
@@ -493,5 +493,5 @@
 
   {
-    unsigned char *b=d->private->sg_buffer;
+    unsigned char *b=d->private_data->sg_buffer;
     if(b[0])return(1); /* Handles only up to 256 bytes */
     if(b[6])return(1); /* Handles only up to 256 bytes */
@@ -605,6 +605,6 @@
   if(mode_sense(d,12,0x01))return(-1);
 
-  d->orgdens = d->private->sg_buffer[4];
-  return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]);
+  d->orgdens = d->private_data->sg_buffer[4];
+  return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]);
 }
 
@@ -665,6 +665,6 @@
   }
 
-  first=d->private->sg_buffer[2];
-  last=d->private->sg_buffer[3];
+  first=d->private_data->sg_buffer[2];
+  last=d->private_data->sg_buffer[3];
   tracks=last-first+1;
 
@@ -684,5 +684,5 @@
     }
     {
-      scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
+      scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
 
       d->disc_toc[i-first].bFlags=toc->bFlags;
@@ -705,5 +705,5 @@
   }
   {
-    scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
+    scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
     
     d->disc_toc[i-first].bFlags=toc->bFlags;
@@ -739,5 +739,5 @@
 
   /* copy to our structure and convert start sector */
-  tracks = d->private->sg_buffer[1];
+  tracks = d->private_data->sg_buffer[1];
   if (tracks > MAXTRK) {
     cderror(d,"003: CDROM reporting illegal number of tracks\n");
@@ -755,31 +755,31 @@
     }
     
-    d->disc_toc[i].bFlags = d->private->sg_buffer[10];
+    d->disc_toc[i].bFlags = d->private_data->sg_buffer[10];
     d->disc_toc[i].bTrack = i + 1;
 
     d->disc_toc[i].dwStartSector= d->adjust_ssize * 
-	(((signed char)(d->private->sg_buffer[2])<<24) | 
-	 (d->private->sg_buffer[3]<<16)|
-	 (d->private->sg_buffer[4]<<8)|
-	 (d->private->sg_buffer[5]));
+	(((signed char)(d->private_data->sg_buffer[2])<<24) | 
+	 (d->private_data->sg_buffer[3]<<16)|
+	 (d->private_data->sg_buffer[4]<<8)|
+	 (d->private_data->sg_buffer[5]));
   }
 
   d->disc_toc[i].bFlags = 0;
   d->disc_toc[i].bTrack = i + 1;
-  memcpy (&foo, d->private->sg_buffer+2, 4);
-  memcpy (&bar, d->private->sg_buffer+6, 4);
+  memcpy (&foo, d->private_data->sg_buffer+2, 4);
+  memcpy (&bar, d->private_data->sg_buffer+6, 4);
   d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) +
 						    be32_to_cpu(bar));
 
   d->disc_toc[i].dwStartSector= d->adjust_ssize * 
-    ((((signed char)(d->private->sg_buffer[2])<<24) | 
-      (d->private->sg_buffer[3]<<16)|
-      (d->private->sg_buffer[4]<<8)|
-      (d->private->sg_buffer[5]))+
+    ((((signed char)(d->private_data->sg_buffer[2])<<24) | 
+      (d->private_data->sg_buffer[3]<<16)|
+      (d->private_data->sg_buffer[4]<<8)|
+      (d->private_data->sg_buffer[5]))+
      
-     ((((signed char)(d->private->sg_buffer[6])<<24) | 
-       (d->private->sg_buffer[7]<<16)|
-       (d->private->sg_buffer[8]<<8)|
-       (d->private->sg_buffer[9]))));
+     ((((signed char)(d->private_data->sg_buffer[6])<<24) | 
+       (d->private_data->sg_buffer[7]<<16)|
+       (d->private_data->sg_buffer[8]<<8)|
+       (d->private_data->sg_buffer[9]))));
 
 
@@ -818,5 +818,5 @@
   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
@@ -837,5 +837,5 @@
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
@@ -855,5 +855,5 @@
   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
@@ -873,5 +873,5 @@
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
@@ -891,5 +891,5 @@
   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
@@ -909,5 +909,5 @@
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
@@ -923,5 +923,5 @@
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
@@ -937,5 +937,5 @@
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
@@ -951,5 +951,5 @@
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
@@ -965,5 +965,5 @@
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
@@ -979,5 +979,5 @@
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
@@ -993,5 +993,5 @@
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
@@ -1027,5 +1027,5 @@
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
@@ -1040,5 +1040,5 @@
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
@@ -1053,5 +1053,5 @@
   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
     return(ret);
-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
   return(0);
 }
@@ -1276,5 +1276,5 @@
   long i;
   for(i=2351;i>=0;i--)
-    if(d->private->sg_buffer[i]!=(unsigned char)'\177')
+    if(d->private_data->sg_buffer[i]!=(unsigned char)'\177')
       return(((i+3)>>2)<<2);
 
@@ -1285,5 +1285,5 @@
   long i,flag=0;
   for(i=0;i<2352;i++)
-    if(d->private->sg_buffer[i]!=0){
+    if(d->private_data->sg_buffer[i]!=0){
       flag=1;
       break;
@@ -1622,5 +1622,5 @@
   if(mode_sense(d,22,0x2A)==0){
   
-    b=d->private->sg_buffer;
+    b=d->private_data->sg_buffer;
     b+=b[3]+4;
     
@@ -1670,5 +1670,5 @@
     return(NULL);
   }
-  return (d->private->sg_buffer);
+  return (d->private_data->sg_buffer);
 }
 
@@ -1726,6 +1726,6 @@
 
   d->error_retry=1;
-  d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
-  d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;
+  d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
+  d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
   d->report_all=1;
   return(0);
Index: /trunk/cdparanoia/interface/cooked_interface.c
===================================================================
--- /trunk/cdparanoia/interface/cooked_interface.c (revision 15202)
+++ /trunk/cdparanoia/interface/cooked_interface.c (revision 15338)
@@ -14,11 +14,11 @@
   struct timespec tv1;
   struct timespec tv2;
-  int ret1=clock_gettime(d->private->clock,&tv1);
+  int ret1=clock_gettime(d->private_data->clock,&tv1);
   int ret2=ioctl(fd, command,arg);
-  int ret3=clock_gettime(d->private->clock,&tv2);
+  int ret3=clock_gettime(d->private_data->clock,&tv2);
   if(ret1<0 || ret3<0){
-    d->private->last_milliseconds=-1;
+    d->private_data->last_milliseconds=-1;
   }else{
-    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
+    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
   }
   return ret2;
Index: /trunk/cdparanoia/interface/scan_devices.c
===================================================================
--- /trunk/cdparanoia/interface/scan_devices.c (revision 15202)
+++ /trunk/cdparanoia/interface/scan_devices.c (revision 15338)
@@ -265,9 +265,9 @@
   d->bigendianp=-1; /* We don't know yet... */
   d->nsectors=-1;
-  d->private=calloc(1,sizeof(*d->private));
+  d->private_data=calloc(1,sizeof(*d->private_data));
   {
     /* goddamnit */
     struct timespec tv;
-    d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
+    d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
   }
   idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description);
@@ -675,13 +675,13 @@
   d->nsectors=-1;
   d->messagedest = messagedest;
-  d->private=calloc(1,sizeof(*d->private));
+  d->private_data=calloc(1,sizeof(*d->private_data));
   {
     /* goddamnit */
     struct timespec tv;
-    d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
+    d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
   }
   if(use_sgio){
     d->interface=SGIO_SCSI;
-    d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
+    d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
     g_fd=d->cdda_fd=dup(d->ioctl_fd);
   }else{
@@ -697,6 +697,6 @@
 
     /* malloc our big buffer for scsi commands */
-    d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
-    d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;
+    d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
+    d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
   }
 
@@ -773,7 +773,7 @@
   if(g_fd!=-1)close(g_fd);
   if(d){
-    if(d->private){
-      if(d->private->sg_hd)free(d->private->sg_hd);
-      free(d->private);
+    if(d->private_data){
+      if(d->private_data->sg_hd)free(d->private_data->sg_hd);
+      free(d->private_data);
     }
     free(d);
@@ -822,5 +822,5 @@
   d->bigendianp=-1; /* We don't know yet... */
   d->nsectors=-1;
-  d->private=calloc(1,sizeof(*d->private));
+  d->private_data=calloc(1,sizeof(*d->private_data));
   d->drive_model=copystring("File based test interface");
   idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model);


Index: cdparanoia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdparanoia/devel/cdparanoia.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- cdparanoia.spec	11 Sep 2008 23:07:41 -0000	1.35
+++ cdparanoia.spec	30 Sep 2008 13:21:09 -0000	1.36
@@ -2,11 +2,15 @@
 
 Name: cdparanoia
 Version: 10.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 # the app is GPLv2, everything else is LGPLv2
 License: GPLv2 and LGPLv2
 Group: Applications/Multimedia
 Source: http://downloads.xiph.org/releases/%{name}/%{name}-III-%{version}.src.tgz
+# Patch from upstream to fix cdda_interface.h C++ incompatibility ("private")
+# https://trac.xiph.org/changeset/15338
+# https://bugzilla.redhat.com/show_bug.cgi?id=463009
+Patch0: cdparanoia-10.2-#463009.patch
 Url: http://www.xiph.org/paranoia/index.html
 BuildRoot: %{_tmppath}/cdparanoia-%{version}-root
 Requires: cdparanoia-libs = %{version}-%{release}
@@ -44,6 +48,7 @@
 
 %prep
 %setup -q -n %{name}-III-%{version}
+%patch0 -p3 -b .#463009
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -102,6 +107,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Tue Sep 30 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 10.2-2
+- fix cdda_interface.h C++ incompatibility (patch from upstream) (#463009)
+
 * Thu Sep 11 2008 Adam Jackson <ajax at redhat.com> 10.2-1
 - cdparanoia 10.2
 
@@ -245,7 +253,7 @@
 * Thu Dec  7 2000 Crutcher Dunnavant <crutcher at redhat.com>
 - rebuild for new tree
 
-* Fri Jul 21 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Jul 21 2000 Trond Eivind Glomsr??d <teg at redhat.com>
 - use %%{_tmppath}
 
 * Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
@@ -255,7 +263,7 @@
 - revert name change
 - use new rpm macro paths
 
-* Wed Apr 19 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Wed Apr 19 2000 Trond Eivind Glomsr??d <teg at redhat.com>
 - Switched spec file from the one used in Red Hat Linux 6.2, which
   also changes the name
 - gzip man page



From rdieter at fedoraproject.org  Tue Sep 30 13:26:26 2008
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 30 Sep 2008 13:26:26 +0000 (UTC)
Subject: rpms/lyx/devel .cvsignore, 1.32, 1.33 lyx.spec, 1.78, 1.79 sources, 
	1.30, 1.31
Message-ID: <20080930132626.06F8A70119@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24017

Modified Files:
	.cvsignore lyx.spec sources 
Log Message:
* Tue Sep 30 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-0.9.rc3
- lyx-1.6.0rc3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	26 Sep 2008 15:05:41 -0000	1.32
+++ .cvsignore	30 Sep 2008 13:25:55 -0000	1.33
@@ -1 +1 @@
-lyx-1.6.0rc3-svn26576.tar.bz2
+lyx-1.6.0rc3.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- lyx.spec	26 Sep 2008 15:05:41 -0000	1.78
+++ lyx.spec	30 Sep 2008 13:25:55 -0000	1.79
@@ -3,7 +3,7 @@
 Name:	 lyx
 Version: 1.6.0
 %define  pre rc3
-Release: 0.8.%{pre}%{?dist}
+Release: 0.9.%{pre}%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -11,9 +11,7 @@
 # For stable releases
 #Source0: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
 # For pre-releases
-#Source0: ftp://ftp.devel.lyx.org/pub/lyx/devel/lyx-%{version}%{pre}.tar.bz2
-# pre-release candidate
-Source0: http://www.lyx.org/~jamatos/lyx-1.6/lyx-1.6.0rc3-svn26576.tar.bz2
+Source0: ftp://ftp.devel.lyx.org/pub/lyx/devel/lyx-%{version}%{pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: lyx-1.5.4-xdg_open.patch
@@ -186,6 +184,9 @@
 
 
 %changelog
+* Tue Sep 30 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-0.9.rc3
+- lyx-1.6.0rc3
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-0.8.rc3
 - lyx-1.6.0rc3-svn26576
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	26 Sep 2008 15:05:41 -0000	1.30
+++ sources	30 Sep 2008 13:25:55 -0000	1.31
@@ -1 +1 @@
-8392769fed01b9087c80c83e3a8c59d7  lyx-1.6.0rc3-svn26576.tar.bz2
+8392769fed01b9087c80c83e3a8c59d7  lyx-1.6.0rc3.tar.bz2



From dwalsh at fedoraproject.org  Tue Sep 30 13:30:48 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 30 Sep 2008 13:30:48 +0000 (UTC)
Subject: rpms/libselinux/devel .cvsignore, 1.175, 1.176 libselinux-rhat.patch,
	1.167, 1.168 libselinux.spec, 1.343, 1.344 sources, 1.177, 1.178
Message-ID: <20080930133048.CCDC170119@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24632

Modified Files:
	.cvsignore libselinux-rhat.patch libselinux.spec sources 
Log Message:
* Tue Sep 30 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.73-1
- Update to Upstream
	* New man pages from Dan Walsh.
	* Update flask headers from refpolicy trunk from Dan Walsh.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- .cvsignore	5 Aug 2008 14:05:15 -0000	1.175
+++ .cvsignore	30 Sep 2008 13:30:18 -0000	1.176
@@ -156,3 +156,4 @@
 libselinux-2.0.69.tgz
 libselinux-2.0.70.tgz
 libselinux-2.0.71.tgz
+libselinux-2.0.73.tgz

libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- libselinux-rhat.patch	26 Sep 2008 14:22:14 -0000	1.167
+++ libselinux-rhat.patch	30 Sep 2008 13:30:18 -0000	1.168
@@ -1,433 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/av_permissions.h libselinux-2.0.71/include/selinux/av_permissions.h
---- nsalibselinux/include/selinux/av_permissions.h	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/include/selinux/av_permissions.h	2008-09-24 07:41:57.000000000 -0400
-@@ -85,6 +85,7 @@
- #define DIR__REPARENT                             0x00080000UL
- #define DIR__SEARCH                               0x00100000UL
- #define DIR__RMDIR                                0x00200000UL
-+#define DIR__OPEN                                 0x00400000UL
- #define FILE__IOCTL                               0x00000001UL
- #define FILE__READ                                0x00000002UL
- #define FILE__WRITE                               0x00000004UL
-@@ -105,6 +106,7 @@
- #define FILE__EXECUTE_NO_TRANS                    0x00020000UL
- #define FILE__ENTRYPOINT                          0x00040000UL
- #define FILE__EXECMOD                             0x00080000UL
-+#define FILE__OPEN                                0x00100000UL
- #define LNK_FILE__IOCTL                           0x00000001UL
- #define LNK_FILE__READ                            0x00000002UL
- #define LNK_FILE__WRITE                           0x00000004UL
-@@ -142,6 +144,7 @@
- #define CHR_FILE__EXECUTE_NO_TRANS                0x00020000UL
- #define CHR_FILE__ENTRYPOINT                      0x00040000UL
- #define CHR_FILE__EXECMOD                         0x00080000UL
-+#define CHR_FILE__OPEN                            0x00100000UL
- #define BLK_FILE__IOCTL                           0x00000001UL
- #define BLK_FILE__READ                            0x00000002UL
- #define BLK_FILE__WRITE                           0x00000004UL
-@@ -159,6 +162,7 @@
- #define BLK_FILE__SWAPON                          0x00004000UL
- #define BLK_FILE__QUOTAON                         0x00008000UL
- #define BLK_FILE__MOUNTON                         0x00010000UL
-+#define BLK_FILE__OPEN                            0x00020000UL
- #define SOCK_FILE__IOCTL                          0x00000001UL
- #define SOCK_FILE__READ                           0x00000002UL
- #define SOCK_FILE__WRITE                          0x00000004UL
-@@ -193,6 +197,7 @@
- #define FIFO_FILE__SWAPON                         0x00004000UL
- #define FIFO_FILE__QUOTAON                        0x00008000UL
- #define FIFO_FILE__MOUNTON                        0x00010000UL
-+#define FIFO_FILE__OPEN                           0x00020000UL
- #define FD__USE                                   0x00000001UL
- #define SOCKET__IOCTL                             0x00000001UL
- #define SOCKET__READ                              0x00000002UL
-@@ -547,91 +552,102 @@
- #define PASSWD__CHSH                              0x00000004UL
- #define PASSWD__ROOTOK                            0x00000008UL
- #define PASSWD__CRONTAB                           0x00000010UL
--#define DRAWABLE__CREATE                          0x00000001UL
--#define DRAWABLE__DESTROY                         0x00000002UL
--#define DRAWABLE__DRAW                            0x00000004UL
--#define DRAWABLE__COPY                            0x00000008UL
--#define DRAWABLE__GETATTR                         0x00000010UL
--#define GC__CREATE                                0x00000001UL
--#define GC__FREE                                  0x00000002UL
--#define GC__GETATTR                               0x00000004UL
--#define GC__SETATTR                               0x00000008UL
--#define WINDOW__ADDCHILD                          0x00000001UL
--#define WINDOW__CREATE                            0x00000002UL
--#define WINDOW__DESTROY                           0x00000004UL
--#define WINDOW__MAP                               0x00000008UL
--#define WINDOW__UNMAP                             0x00000010UL
--#define WINDOW__CHSTACK                           0x00000020UL
--#define WINDOW__CHPROPLIST                        0x00000040UL
--#define WINDOW__CHPROP                            0x00000080UL
--#define WINDOW__LISTPROP                          0x00000100UL
--#define WINDOW__GETATTR                           0x00000200UL
--#define WINDOW__SETATTR                           0x00000400UL
--#define WINDOW__SETFOCUS                          0x00000800UL
--#define WINDOW__MOVE                              0x00001000UL
--#define WINDOW__CHSELECTION                       0x00002000UL
--#define WINDOW__CHPARENT                          0x00004000UL
--#define WINDOW__CTRLLIFE                          0x00008000UL
--#define WINDOW__ENUMERATE                         0x00010000UL
--#define WINDOW__TRANSPARENT                       0x00020000UL
--#define WINDOW__MOUSEMOTION                       0x00040000UL
--#define WINDOW__CLIENTCOMEVENT                    0x00080000UL
--#define WINDOW__INPUTEVENT                        0x00100000UL
--#define WINDOW__DRAWEVENT                         0x00200000UL
--#define WINDOW__WINDOWCHANGEEVENT                 0x00400000UL
--#define WINDOW__WINDOWCHANGEREQUEST               0x00800000UL
--#define WINDOW__SERVERCHANGEEVENT                 0x01000000UL
--#define WINDOW__EXTENSIONEVENT                    0x02000000UL
--#define FONT__LOAD                                0x00000001UL
--#define FONT__FREE                                0x00000002UL
--#define FONT__GETATTR                             0x00000004UL
--#define FONT__USE                                 0x00000008UL
--#define COLORMAP__CREATE                          0x00000001UL
--#define COLORMAP__FREE                            0x00000002UL
--#define COLORMAP__INSTALL                         0x00000004UL
--#define COLORMAP__UNINSTALL                       0x00000008UL
--#define COLORMAP__LIST                            0x00000010UL
--#define COLORMAP__READ                            0x00000020UL
--#define COLORMAP__STORE                           0x00000040UL
--#define COLORMAP__GETATTR                         0x00000080UL
--#define COLORMAP__SETATTR                         0x00000100UL
--#define PROPERTY__CREATE                          0x00000001UL
--#define PROPERTY__FREE                            0x00000002UL
--#define PROPERTY__READ                            0x00000004UL
--#define PROPERTY__WRITE                           0x00000008UL
--#define CURSOR__CREATE                            0x00000001UL
--#define CURSOR__CREATEGLYPH                       0x00000002UL
--#define CURSOR__FREE                              0x00000004UL
--#define CURSOR__ASSIGN                            0x00000008UL
--#define CURSOR__SETATTR                           0x00000010UL
--#define XCLIENT__KILL                             0x00000001UL
--#define XINPUT__LOOKUP                            0x00000001UL
--#define XINPUT__GETATTR                           0x00000002UL
--#define XINPUT__SETATTR                           0x00000004UL
--#define XINPUT__SETFOCUS                          0x00000008UL
--#define XINPUT__WARPPOINTER                       0x00000010UL
--#define XINPUT__ACTIVEGRAB                        0x00000020UL
--#define XINPUT__PASSIVEGRAB                       0x00000040UL
--#define XINPUT__UNGRAB                            0x00000080UL
--#define XINPUT__BELL                              0x00000100UL
--#define XINPUT__MOUSEMOTION                       0x00000200UL
--#define XINPUT__RELABELINPUT                      0x00000400UL
--#define XSERVER__SCREENSAVER                      0x00000001UL
--#define XSERVER__GETHOSTLIST                      0x00000002UL
--#define XSERVER__SETHOSTLIST                      0x00000004UL
--#define XSERVER__GETFONTPATH                      0x00000008UL
--#define XSERVER__SETFONTPATH                      0x00000010UL
--#define XSERVER__GETATTR                          0x00000020UL
--#define XSERVER__GRAB                             0x00000040UL
--#define XSERVER__UNGRAB                           0x00000080UL
--#define XEXTENSION__QUERY                         0x00000001UL
--#define XEXTENSION__USE                           0x00000002UL
--#define PAX__PAGEEXEC                             0x00000001UL
--#define PAX__EMUTRAMP                             0x00000002UL
--#define PAX__MPROTECT                             0x00000004UL
--#define PAX__RANDMMAP                             0x00000008UL
--#define PAX__RANDEXEC                             0x00000010UL
--#define PAX__SEGMEXEC                             0x00000020UL
-+#define X_DRAWABLE__CREATE                        0x00000001UL
-+#define X_DRAWABLE__DESTROY                       0x00000002UL
-+#define X_DRAWABLE__READ                          0x00000004UL
-+#define X_DRAWABLE__WRITE                         0x00000008UL
-+#define X_DRAWABLE__BLEND                         0x00000010UL
-+#define X_DRAWABLE__GETATTR                       0x00000020UL
-+#define X_DRAWABLE__SETATTR                       0x00000040UL
-+#define X_DRAWABLE__LIST_CHILD                    0x00000080UL
-+#define X_DRAWABLE__ADD_CHILD                     0x00000100UL
-+#define X_DRAWABLE__REMOVE_CHILD                  0x00000200UL
-+#define X_DRAWABLE__LIST_PROPERTY                 0x00000400UL
-+#define X_DRAWABLE__GET_PROPERTY                  0x00000800UL
-+#define X_DRAWABLE__SET_PROPERTY                  0x00001000UL
-+#define X_DRAWABLE__MANAGE                        0x00002000UL
-+#define X_DRAWABLE__OVERRIDE                      0x00004000UL
-+#define X_DRAWABLE__SHOW                          0x00008000UL
-+#define X_DRAWABLE__HIDE                          0x00010000UL
-+#define X_DRAWABLE__SEND                          0x00020000UL
-+#define X_DRAWABLE__RECEIVE                       0x00040000UL
-+#define X_SCREEN__GETATTR                         0x00000001UL
-+#define X_SCREEN__SETATTR                         0x00000002UL
-+#define X_SCREEN__HIDE_CURSOR                     0x00000004UL
-+#define X_SCREEN__SHOW_CURSOR                     0x00000008UL
-+#define X_SCREEN__SAVER_GETATTR                   0x00000010UL
-+#define X_SCREEN__SAVER_SETATTR                   0x00000020UL
-+#define X_SCREEN__SAVER_HIDE                      0x00000040UL
-+#define X_SCREEN__SAVER_SHOW                      0x00000080UL
-+#define X_GC__CREATE                              0x00000001UL
-+#define X_GC__DESTROY                             0x00000002UL
-+#define X_GC__GETATTR                             0x00000004UL
-+#define X_GC__SETATTR                             0x00000008UL
-+#define X_GC__USE                                 0x00000010UL
-+#define X_FONT__CREATE                            0x00000001UL
-+#define X_FONT__DESTROY                           0x00000002UL
-+#define X_FONT__GETATTR                           0x00000004UL
-+#define X_FONT__ADD_GLYPH                         0x00000008UL
-+#define X_FONT__REMOVE_GLYPH                      0x00000010UL
-+#define X_FONT__USE                               0x00000020UL
-+#define X_COLORMAP__CREATE                        0x00000001UL
-+#define X_COLORMAP__DESTROY                       0x00000002UL
-+#define X_COLORMAP__READ                          0x00000004UL
-+#define X_COLORMAP__WRITE                         0x00000008UL
-+#define X_COLORMAP__GETATTR                       0x00000010UL
-+#define X_COLORMAP__ADD_COLOR                     0x00000020UL
-+#define X_COLORMAP__REMOVE_COLOR                  0x00000040UL
-+#define X_COLORMAP__INSTALL                       0x00000080UL
-+#define X_COLORMAP__UNINSTALL                     0x00000100UL
-+#define X_COLORMAP__USE                           0x00000200UL
-+#define X_PROPERTY__CREATE                        0x00000001UL
-+#define X_PROPERTY__DESTROY                       0x00000002UL
-+#define X_PROPERTY__READ                          0x00000004UL
-+#define X_PROPERTY__WRITE                         0x00000008UL
-+#define X_PROPERTY__APPEND                        0x00000010UL
-+#define X_PROPERTY__GETATTR                       0x00000020UL
-+#define X_PROPERTY__SETATTR                       0x00000040UL
-+#define X_SELECTION__READ                         0x00000001UL
-+#define X_SELECTION__WRITE                        0x00000002UL
-+#define X_SELECTION__GETATTR                      0x00000004UL
-+#define X_SELECTION__SETATTR                      0x00000008UL
-+#define X_CURSOR__CREATE                          0x00000001UL
-+#define X_CURSOR__DESTROY                         0x00000002UL
-+#define X_CURSOR__READ                            0x00000004UL
-+#define X_CURSOR__WRITE                           0x00000008UL
-+#define X_CURSOR__GETATTR                         0x00000010UL
-+#define X_CURSOR__SETATTR                         0x00000020UL
-+#define X_CURSOR__USE                             0x00000040UL
-+#define X_CLIENT__DESTROY                         0x00000001UL
-+#define X_CLIENT__GETATTR                         0x00000002UL
-+#define X_CLIENT__SETATTR                         0x00000004UL
-+#define X_CLIENT__MANAGE                          0x00000008UL
-+#define X_DEVICE__GETATTR                         0x00000001UL
-+#define X_DEVICE__SETATTR                         0x00000002UL
-+#define X_DEVICE__USE                             0x00000004UL
-+#define X_DEVICE__READ                            0x00000008UL
-+#define X_DEVICE__WRITE                           0x00000010UL
-+#define X_DEVICE__GETFOCUS                        0x00000020UL
-+#define X_DEVICE__SETFOCUS                        0x00000040UL
-+#define X_DEVICE__BELL                            0x00000080UL
-+#define X_DEVICE__FORCE_CURSOR                    0x00000100UL
-+#define X_DEVICE__FREEZE                          0x00000200UL
-+#define X_DEVICE__GRAB                            0x00000400UL
-+#define X_DEVICE__MANAGE                          0x00000800UL
-+#define X_SERVER__GETATTR                         0x00000001UL
-+#define X_SERVER__SETATTR                         0x00000002UL
-+#define X_SERVER__RECORD                          0x00000004UL
-+#define X_SERVER__DEBUG                           0x00000008UL
-+#define X_SERVER__GRAB                            0x00000010UL
-+#define X_SERVER__MANAGE                          0x00000020UL
-+#define X_EXTENSION__QUERY                        0x00000001UL
-+#define X_EXTENSION__USE                          0x00000002UL
-+#define X_RESOURCE__READ                          0x00000001UL
-+#define X_RESOURCE__WRITE                         0x00000002UL
-+#define X_EVENT__SEND                             0x00000001UL
-+#define X_EVENT__RECEIVE                          0x00000002UL
-+#define X_SYNTHETIC_EVENT__SEND                   0x00000001UL
-+#define X_SYNTHETIC_EVENT__RECEIVE                0x00000002UL
- #define NETLINK_ROUTE_SOCKET__IOCTL               0x00000001UL
- #define NETLINK_ROUTE_SOCKET__READ                0x00000002UL
- #define NETLINK_ROUTE_SOCKET__WRITE               0x00000004UL
-@@ -798,6 +814,7 @@
- #define NETLINK_AUDIT_SOCKET__NLMSG_WRITE         0x00800000UL
- #define NETLINK_AUDIT_SOCKET__NLMSG_RELAY         0x01000000UL
- #define NETLINK_AUDIT_SOCKET__NLMSG_READPRIV      0x02000000UL
-+#define NETLINK_AUDIT_SOCKET__NLMSG_TTY_AUDIT     0x04000000UL
- #define NETLINK_IP6FW_SOCKET__IOCTL               0x00000001UL
- #define NETLINK_IP6FW_SOCKET__READ                0x00000002UL
- #define NETLINK_IP6FW_SOCKET__WRITE               0x00000004UL
-@@ -1004,3 +1021,6 @@
- #define DB_BLOB__IMPORT                           0x00000100UL
- #define DB_BLOB__EXPORT                           0x00000200UL
- #define PEER__RECV                                0x00000001UL
-+#define X_APPLICATION_DATA__PASTE                 0x00000001UL
-+#define X_APPLICATION_DATA__PASTE_AFTER_CONFIRM   0x00000002UL
-+#define X_APPLICATION_DATA__COPY                  0x00000004UL
-diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/flask.h libselinux-2.0.71/include/selinux/flask.h
---- nsalibselinux/include/selinux/flask.h	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/include/selinux/flask.h	2008-09-24 07:41:57.000000000 -0400
-@@ -35,18 +35,18 @@
- #define SECCLASS_SHM                                     28
- #define SECCLASS_IPC                                     29
- #define SECCLASS_PASSWD                                  30
--#define SECCLASS_DRAWABLE                                31
--#define SECCLASS_WINDOW                                  32
--#define SECCLASS_GC                                      33
--#define SECCLASS_FONT                                    34
--#define SECCLASS_COLORMAP                                35
--#define SECCLASS_PROPERTY                                36
--#define SECCLASS_CURSOR                                  37
--#define SECCLASS_XCLIENT                                 38
--#define SECCLASS_XINPUT                                  39
--#define SECCLASS_XSERVER                                 40
--#define SECCLASS_XEXTENSION                              41
--#define SECCLASS_PAX                                     42
-+#define SECCLASS_X_DRAWABLE                              31
-+#define SECCLASS_X_SCREEN                                32
-+#define SECCLASS_X_GC                                    33
-+#define SECCLASS_X_FONT                                  34
-+#define SECCLASS_X_COLORMAP                              35
-+#define SECCLASS_X_PROPERTY                              36
-+#define SECCLASS_X_SELECTION                             37
-+#define SECCLASS_X_CURSOR                                38
-+#define SECCLASS_X_CLIENT                                39
-+#define SECCLASS_X_DEVICE                                40
-+#define SECCLASS_X_SERVER                                41
-+#define SECCLASS_X_EXTENSION                             42
- #define SECCLASS_NETLINK_ROUTE_SOCKET                    43
- #define SECCLASS_NETLINK_FIREWALL_SOCKET                 44
- #define SECCLASS_NETLINK_TCPDIAG_SOCKET                  45
-@@ -74,6 +74,10 @@
- #define SECCLASS_DB_BLOB                                 67
- #define SECCLASS_PEER                                    68
- #define SECCLASS_CAPABILITY2                             69
-+#define SECCLASS_X_RESOURCE                              70
-+#define SECCLASS_X_EVENT                                 71
-+#define SECCLASS_X_SYNTHETIC_EVENT                       72
-+#define SECCLASS_X_APPLICATION_DATA                      73
- 
- /*
-  * Security identifier indices for initial entities
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/avc_get_initial_sid.3 libselinux-2.0.71/man/man3/avc_get_initial_sid.3
---- nsalibselinux/man/man3/avc_get_initial_sid.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/avc_get_initial_sid.3	2008-09-24 08:44:16.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/avc_context_to_sid.3
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/fgetfilecon.3 libselinux-2.0.71/man/man3/fgetfilecon.3
---- nsalibselinux/man/man3/fgetfilecon.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/fgetfilecon.3	2008-09-24 07:41:57.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/getfilecon.3
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/get_default_type.3 libselinux-2.0.71/man/man3/get_default_type.3
---- nsalibselinux/man/man3/get_default_type.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/get_default_type.3	2008-09-24 08:40:51.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/get_ordered_context_list.3
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/getkeycreatecon.3 libselinux-2.0.71/man/man3/getkeycreatecon.3
---- nsalibselinux/man/man3/getkeycreatecon.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/getkeycreatecon.3	2008-09-24 07:41:57.000000000 -0400
-@@ -0,0 +1,38 @@
-+.TH "getkeycreatecon" "3" "9 September 2008" "dwalsh at redhat.com from russell at coker.com.au" "SELinux API documentation"
-+.SH "NAME"
-+getkeycreatecon, setkeycreatecon \- get or set the SELinux security context used for creating a new kernel keyrings.
-+
-+.SH "SYNOPSIS"
-+.B #include <selinux/selinux.h>
-+.sp
-+.BI "int getkeycreatecon(security_context_t *" con );
-+
-+.BI "int setkeycreatecon(security_context_t "context );
-+
-+.SH "DESCRIPTION"
-+.B getkeycreatecon
-+retrieves the context used for creating a new kernel keyring.
-+This returned context should be freed with freecon if non-NULL.  
-+getkeycreatecon sets *con to NULL if no keycreate context has been explicitly 
-+set by the program (i.e. using the default policy behavior).
-+
-+.B setkeycreatecon
-+sets the context used for creating a new kernel keyring.
-+NULL can be passed to
-+setkeycreatecon to reset to the default policy behavior.  
-+The keycreate context is automatically reset after the next execve, so a
-+program doesn't need to explicitly sanitize it upon startup.  
-+
-+setkeycreatecon can be applied prior to library
-+functions that internally perform an file creation,
-+in order to set an file context on the objects.
-+
-+
-+Note: Signal handlers that perform an setkeycreate must take care to
-+save, reset, and restore the keycreate context to avoid unexpected behavior.
-+.SH "RETURN VALUE"
-+On error -1 is returned.
-+On success 0 is returned.
-+
-+.SH "SEE ALSO"
-+.BR selinux "(8), " freecon "(3), " getcon "(3), " getexeccon "(3)"
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/getsockcreatecon.3 libselinux-2.0.71/man/man3/getsockcreatecon.3
---- nsalibselinux/man/man3/getsockcreatecon.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/getsockcreatecon.3	2008-09-24 08:49:48.000000000 -0400
-@@ -0,0 +1,38 @@
-+.TH "getsockcreatecon" "3" "24 September 2008" "dwalsh at redhat.com from russell at coker.com.au" "SELinux API documentation"
-+.SH "NAME"
-+getsockcreatecon, setsockcreatecon \- get or set the SELinux security context used for creating a new labeled sockets.
-+
-+.SH "SYNOPSIS"
-+.B #include <selinux/selinux.h>
-+.sp
-+.BI "int getsockcreatecon(security_context_t *" con );
-+
-+.BI "int setsockcreatecon(security_context_t "context );
-+
-+.SH "DESCRIPTION"
-+.B getsockcreatecon
-+retrieves the context used for creating a new labeled network socket.
-+This returned context should be freed with freecon if non-NULL.  
-+getsockcreatecon sets *con to NULL if no sockcreate context has been explicitly 
-+set by the program (i.e. using the default policy behavior).
-+
-+.B setsockcreatecon
-+sets the context used for creating a new labeled network sockets
-+NULL can be passed to
-+setsockcreatecon to reset to the default policy behavior.  
-+The sockcreate context is automatically reset after the next execve, so a
-+program doesn't need to explicitly sanitize it upon startup.  
-+
-+setsockcreatecon can be applied prior to library
-+functions that internally perform an file creation,
-+in order to set an file context on the objects.
-+
-+
-+Note: Signal handlers that perform an setsockcreate must take care to
-+save, reset, and restore the sockcreate context to avoid unexpected behavior.
-+.SH "RETURN VALUE"
-+On error -1 is returned.
-+On success 0 is returned.
-+
-+.SH "SEE ALSO"
-+.BR selinux "(8), " freecon "(3), " getcon "(3)
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/is_selinux_enabled.3 libselinux-2.0.71/man/man3/is_selinux_enabled.3
---- nsalibselinux/man/man3/is_selinux_enabled.3	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/man/man3/is_selinux_enabled.3	2008-09-24 07:48:20.000000000 -0400
-@@ -1,14 +1,22 @@
- .TH "is_selinux_enabled" "3" "1 January 2004" "russell at coker.com.au" "SELinux API documentation"
- .SH "NAME"
- is_selinux_enabled \- check whether SELinux is enabled
-+
-+.SH "NAME"
-+is_selinux_mls_enabled \- check whether SELinux is enabled for (Multi Level Securty) MLS 
- .SH "SYNOPSIS"
- .B #include <selinux/selinux.h>
- .sp
- .B int is_selinux_enabled();
- 
-+.B int is_selinux_mls_enabled();
-+
- .SH "DESCRIPTION"
- .B is_selinux_enabled
--returns 1 if SELinux is running or 0 if it is not.  May change soon.
-+returns 1 if SELinux is running or 0 if it is not. 
-+
-+.B is_selinux_mls_enabled
-+returns 1 if SELinux is running in MLS mode or 0 if it is not. 
- 
- .SH "SEE ALSO"
- .BR selinux "(8)"
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/is_selinux_mls_enabled.3 libselinux-2.0.71/man/man3/is_selinux_mls_enabled.3
---- nsalibselinux/man/man3/is_selinux_mls_enabled.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/is_selinux_mls_enabled.3	2008-09-24 07:47:56.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/is_selinux_enabled.3
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/lgetfilecon.3 libselinux-2.0.71/man/man3/lgetfilecon.3
---- nsalibselinux/man/man3/lgetfilecon.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/lgetfilecon.3	2008-09-24 07:41:57.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/getfilecon.3
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/matchpathcon.3 libselinux-2.0.71/man/man3/matchpathcon.3
 --- nsalibselinux/man/man3/matchpathcon.3	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/man/man3/matchpathcon.3	2008-09-26 09:56:50.000000000 -0400
++++ libselinux-2.0.71/man/man3/matchpathcon.3	2008-09-26 10:21:43.000000000 -0400
 @@ -18,6 +18,11 @@
  
  .BI "void set_matchpathcon_flags(unsigned int " flags ");"
@@ -453,179 +26,19 @@
  
  .sp
  .SH "RETURN VALUE"
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/matchpathcon_fini.3 libselinux-2.0.71/man/man3/matchpathcon_fini.3
---- nsalibselinux/man/man3/matchpathcon_fini.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/matchpathcon_fini.3	2008-09-24 08:38:17.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/matchpathcon.3
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/matchpathcon_init.3 libselinux-2.0.71/man/man3/matchpathcon_init.3
---- nsalibselinux/man/man3/matchpathcon_init.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/matchpathcon_init.3	2008-09-24 08:38:00.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/matchpathcon.3
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_binary_policy_path.3 libselinux-2.0.71/man/man3/selinux_binary_policy_path.3
---- nsalibselinux/man/man3/selinux_binary_policy_path.3	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/man/man3/selinux_binary_policy_path.3	2008-09-24 08:18:47.000000000 -0400
-@@ -1,6 +1,6 @@
- .TH "selinux_binary_policy_path" "3" "15 November 2004" "dwalsh at redhat.com" "SELinux API Documentation"
- .SH "NAME"
--selinux_policy_root, selinux_binary_policy_path,
-+selinux_path, selinux_policy_root, selinux_binary_policy_path,
- selinux_failsafe_context_path, selinux_removable_context_path,
- selinux_default_context_path, selinux_user_contexts_path,
- selinux_file_context_path, selinux_media_context_path,
-@@ -11,6 +11,8 @@
- .B #include <selinux/selinux.h>
- .sp
- 
-+extern const char *selinux_path(void);
-+
- extern const char *selinux_policy_root(void);
- 
- extern const char *selinux_binary_policy_path(void);
-@@ -23,6 +25,10 @@
- 
- extern const char *selinux_user_contexts_path(void);
- 
-+extern const char *selinux_usersconf_path(void);
-+
-+extern const char *selinux_x_context_path(void);
-+
- extern const char *selinux_file_context_path(void);
- 
- extern const char *selinux_media_context_path(void);
-@@ -40,10 +46,14 @@
- directories and files based on the settings in /etc/selinux/config.
- 
- .sp
-+selinux_path() - top-level SELinux configuration directory
-+.sp
- selinux_policy_root() - top-level policy directory 
- .sp
- selinux_binary_policy_path() - binary policy file loaded into kernel
- .sp
-+selinux_default_type_path - context file mapping roles to default types.
-+.sp
- selinux_failsafe_context_path() - failsafe context for emergency logins
- .sp
- selinux_removable_context_path() - filesystem context for removable media
-@@ -52,7 +62,17 @@
- .sp
- selinux_user_contexts_path() - directory containing per-user default contexts
- .sp
--selinux_file_context_path() - file contexts configuration
-+selinux_usersconf_path() - file containing mapping between Linux Users and SELinux users
-+.sp
-+selinux_x_context_path() - file containing configuration for XSELinux extension
-+.sp
-+selinux_netfilter_context_path - default netfilter context 
-+.sp
-+selinux_file_context_path() - default sysstem file contexts configuration
-+.sp
-+selinux_file_context_local_path() - local customization file contexts configuration
-+.sp
-+selinux_file_context_homedir_path() - home directory file contexts configuration
- .sp
- selinux_media_context_path() - file contexts for media device nodes
- .sp
-@@ -67,4 +87,3 @@
- 
- .SH "SEE ALSO"
- .BR selinux "(8)"
--
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_default_type_path.3 libselinux-2.0.71/man/man3/selinux_default_type_path.3
---- nsalibselinux/man/man3/selinux_default_type_path.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/selinux_default_type_path.3	2008-09-24 08:19:09.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/selinux_binary_policy_path.3
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_file_context_cmp.3 libselinux-2.0.71/man/man3/selinux_file_context_cmp.3
 --- nsalibselinux/man/man3/selinux_file_context_cmp.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/selinux_file_context_cmp.3	2008-09-26 09:57:51.000000000 -0400
++++ libselinux-2.0.71/man/man3/selinux_file_context_cmp.3	2008-09-26 10:21:43.000000000 -0400
 @@ -0,0 +1 @@
 +.so man3/matchpathcon.3
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_file_context_homedir_path.3 libselinux-2.0.71/man/man3/selinux_file_context_homedir_path.3
---- nsalibselinux/man/man3/selinux_file_context_homedir_path.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/selinux_file_context_homedir_path.3	2008-09-24 08:17:07.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/selinux_binary_policy_path.3
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_file_context_local_path.3 libselinux-2.0.71/man/man3/selinux_file_context_local_path.3
---- nsalibselinux/man/man3/selinux_file_context_local_path.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/selinux_file_context_local_path.3	2008-09-24 08:17:14.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/selinux_binary_policy_path.3
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_file_context_verify.3 libselinux-2.0.71/man/man3/selinux_file_context_verify.3
 --- nsalibselinux/man/man3/selinux_file_context_verify.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/selinux_file_context_verify.3	2008-09-26 09:57:30.000000000 -0400
++++ libselinux-2.0.71/man/man3/selinux_file_context_verify.3	2008-09-26 10:21:43.000000000 -0400
 @@ -0,0 +1 @@
 +.so man3/matchpathcon.3
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_getpolicytype.3 libselinux-2.0.71/man/man3/selinux_getpolicytype.3
---- nsalibselinux/man/man3/selinux_getpolicytype.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/selinux_getpolicytype.3	2008-09-24 07:42:23.000000000 -0400
-@@ -0,0 +1,21 @@
-+.TH "selinux_getpolicytype" "3" "24 Sep 2008" "dwalsh at redhat.com" "SELinux API documentation"
-+.SH "NAME"
-+selinux_getpolicytype \- get the type of SELinux policy running on the system
-+.SH "SYNOPSIS"
-+.B #include <selinux/selinux.h>
-+.sp
-+.B int selinux_getpolicytype();
-+
-+
-+.SH "DESCRIPTION"
-+.B selinux_getpolicytype
-+Reads the contents of the /etc/selinux/config file to determine the SELinux policy used on the system.
-+
-+.SH "RETURN VALUE"
-+On success, zero is returned.
-+On failure, -1 is returned.
-+
-+.SH "SEE ALSO"
-+.BR selinux "(8)"
-+
-+
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_homedir_context_path.3 libselinux-2.0.71/man/man3/selinux_homedir_context_path.3
---- nsalibselinux/man/man3/selinux_homedir_context_path.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/selinux_homedir_context_path.3	2008-09-24 08:36:35.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/selinux_binary_policy_path.3
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_netfilter_context_path.3 libselinux-2.0.71/man/man3/selinux_netfilter_context_path.3
---- nsalibselinux/man/man3/selinux_netfilter_context_path.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/selinux_netfilter_context_path.3	2008-09-24 08:36:44.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/selinux_binary_policy_path.3
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_path.3 libselinux-2.0.71/man/man3/selinux_path.3
---- nsalibselinux/man/man3/selinux_path.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/selinux_path.3	2008-09-24 08:02:28.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/selinux_binary_policy_path.3
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_usersconf_path.3 libselinux-2.0.71/man/man3/selinux_usersconf_path.3
---- nsalibselinux/man/man3/selinux_usersconf_path.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/selinux_usersconf_path.3	2008-09-24 08:36:00.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/selinux_binary_policy_path.3
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_x_context_path.3 libselinux-2.0.71/man/man3/selinux_x_context_path.3
---- nsalibselinux/man/man3/selinux_x_context_path.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/selinux_x_context_path.3	2008-09-24 08:36:08.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/selinux_binary_policy_path.3
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/set_matchpathcon_flags.3 libselinux-2.0.71/man/man3/set_matchpathcon_flags.3
---- nsalibselinux/man/man3/set_matchpathcon_flags.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/set_matchpathcon_flags.3	2008-09-24 08:42:03.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/matchpathcon.3
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/setkeycreatecon.3 libselinux-2.0.71/man/man3/setkeycreatecon.3
---- nsalibselinux/man/man3/setkeycreatecon.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/setkeycreatecon.3	2008-09-24 07:41:57.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/getkeycreatecon.3
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/setsockcreatecon.3 libselinux-2.0.71/man/man3/setsockcreatecon.3
---- nsalibselinux/man/man3/setsockcreatecon.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man3/setsockcreatecon.3	2008-09-24 08:46:55.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/getsockcreatecon.3
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.71/man/man8/selinuxconlist.8
 --- nsalibselinux/man/man8/selinuxconlist.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man8/selinuxconlist.8	2008-09-24 07:41:57.000000000 -0400
++++ libselinux-2.0.71/man/man8/selinuxconlist.8	2008-09-26 10:21:43.000000000 -0400
 @@ -0,0 +1,18 @@
 +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -647,7 +60,7 @@
 +secon(8), selinuxdefcon(8)
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.71/man/man8/selinuxdefcon.8
 --- nsalibselinux/man/man8/selinuxdefcon.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.71/man/man8/selinuxdefcon.8	2008-09-24 07:41:57.000000000 -0400
++++ libselinux-2.0.71/man/man8/selinuxdefcon.8	2008-09-26 10:21:43.000000000 -0400
 @@ -0,0 +1,19 @@
 +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -668,233 +81,9 @@
 +
 +.SH "SEE ALSO"
 +secon(8), selinuxconlist(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/av_perm_to_string.h libselinux-2.0.71/src/av_perm_to_string.h
---- nsalibselinux/src/av_perm_to_string.h	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/src/av_perm_to_string.h	2008-09-24 07:41:57.000000000 -0400
-@@ -14,12 +14,17 @@
-    S_(SECCLASS_DIR, DIR__REPARENT, "reparent")
-    S_(SECCLASS_DIR, DIR__SEARCH, "search")
-    S_(SECCLASS_DIR, DIR__RMDIR, "rmdir")
-+   S_(SECCLASS_DIR, DIR__OPEN, "open")
-    S_(SECCLASS_FILE, FILE__EXECUTE_NO_TRANS, "execute_no_trans")
-    S_(SECCLASS_FILE, FILE__ENTRYPOINT, "entrypoint")
-    S_(SECCLASS_FILE, FILE__EXECMOD, "execmod")
-+   S_(SECCLASS_FILE, FILE__OPEN, "open")
-    S_(SECCLASS_CHR_FILE, CHR_FILE__EXECUTE_NO_TRANS, "execute_no_trans")
-    S_(SECCLASS_CHR_FILE, CHR_FILE__ENTRYPOINT, "entrypoint")
-    S_(SECCLASS_CHR_FILE, CHR_FILE__EXECMOD, "execmod")
-+   S_(SECCLASS_CHR_FILE, CHR_FILE__OPEN, "open")
-+   S_(SECCLASS_BLK_FILE, BLK_FILE__OPEN, "open")
-+   S_(SECCLASS_FIFO_FILE, FIFO_FILE__OPEN, "open")
-    S_(SECCLASS_FD, FD__USE, "use")
-    S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__CONNECTTO, "connectto")
-    S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__NEWCONN, "newconn")
-@@ -140,91 +145,102 @@
-    S_(SECCLASS_PASSWD, PASSWD__CHSH, "chsh")
-    S_(SECCLASS_PASSWD, PASSWD__ROOTOK, "rootok")
-    S_(SECCLASS_PASSWD, PASSWD__CRONTAB, "crontab")
--   S_(SECCLASS_DRAWABLE, DRAWABLE__CREATE, "create")
--   S_(SECCLASS_DRAWABLE, DRAWABLE__DESTROY, "destroy")
--   S_(SECCLASS_DRAWABLE, DRAWABLE__DRAW, "draw")
--   S_(SECCLASS_DRAWABLE, DRAWABLE__COPY, "copy")
--   S_(SECCLASS_DRAWABLE, DRAWABLE__GETATTR, "getattr")
--   S_(SECCLASS_GC, GC__CREATE, "create")
--   S_(SECCLASS_GC, GC__FREE, "free")
--   S_(SECCLASS_GC, GC__GETATTR, "getattr")
--   S_(SECCLASS_GC, GC__SETATTR, "setattr")
--   S_(SECCLASS_WINDOW, WINDOW__ADDCHILD, "addchild")
--   S_(SECCLASS_WINDOW, WINDOW__CREATE, "create")
--   S_(SECCLASS_WINDOW, WINDOW__DESTROY, "destroy")
--   S_(SECCLASS_WINDOW, WINDOW__MAP, "map")
--   S_(SECCLASS_WINDOW, WINDOW__UNMAP, "unmap")
--   S_(SECCLASS_WINDOW, WINDOW__CHSTACK, "chstack")
--   S_(SECCLASS_WINDOW, WINDOW__CHPROPLIST, "chproplist")
--   S_(SECCLASS_WINDOW, WINDOW__CHPROP, "chprop")
--   S_(SECCLASS_WINDOW, WINDOW__LISTPROP, "listprop")
--   S_(SECCLASS_WINDOW, WINDOW__GETATTR, "getattr")
--   S_(SECCLASS_WINDOW, WINDOW__SETATTR, "setattr")
--   S_(SECCLASS_WINDOW, WINDOW__SETFOCUS, "setfocus")
--   S_(SECCLASS_WINDOW, WINDOW__MOVE, "move")
--   S_(SECCLASS_WINDOW, WINDOW__CHSELECTION, "chselection")
--   S_(SECCLASS_WINDOW, WINDOW__CHPARENT, "chparent")
--   S_(SECCLASS_WINDOW, WINDOW__CTRLLIFE, "ctrllife")
--   S_(SECCLASS_WINDOW, WINDOW__ENUMERATE, "enumerate")
--   S_(SECCLASS_WINDOW, WINDOW__TRANSPARENT, "transparent")
--   S_(SECCLASS_WINDOW, WINDOW__MOUSEMOTION, "mousemotion")
--   S_(SECCLASS_WINDOW, WINDOW__CLIENTCOMEVENT, "clientcomevent")
--   S_(SECCLASS_WINDOW, WINDOW__INPUTEVENT, "inputevent")
--   S_(SECCLASS_WINDOW, WINDOW__DRAWEVENT, "drawevent")
--   S_(SECCLASS_WINDOW, WINDOW__WINDOWCHANGEEVENT, "windowchangeevent")
--   S_(SECCLASS_WINDOW, WINDOW__WINDOWCHANGEREQUEST, "windowchangerequest")
--   S_(SECCLASS_WINDOW, WINDOW__SERVERCHANGEEVENT, "serverchangeevent")
--   S_(SECCLASS_WINDOW, WINDOW__EXTENSIONEVENT, "extensionevent")
--   S_(SECCLASS_FONT, FONT__LOAD, "load")
--   S_(SECCLASS_FONT, FONT__FREE, "free")
--   S_(SECCLASS_FONT, FONT__GETATTR, "getattr")
--   S_(SECCLASS_FONT, FONT__USE, "use")
--   S_(SECCLASS_COLORMAP, COLORMAP__CREATE, "create")
--   S_(SECCLASS_COLORMAP, COLORMAP__FREE, "free")
--   S_(SECCLASS_COLORMAP, COLORMAP__INSTALL, "install")
--   S_(SECCLASS_COLORMAP, COLORMAP__UNINSTALL, "uninstall")
--   S_(SECCLASS_COLORMAP, COLORMAP__LIST, "list")
--   S_(SECCLASS_COLORMAP, COLORMAP__READ, "read")
--   S_(SECCLASS_COLORMAP, COLORMAP__STORE, "store")
--   S_(SECCLASS_COLORMAP, COLORMAP__GETATTR, "getattr")
--   S_(SECCLASS_COLORMAP, COLORMAP__SETATTR, "setattr")
--   S_(SECCLASS_PROPERTY, PROPERTY__CREATE, "create")
--   S_(SECCLASS_PROPERTY, PROPERTY__FREE, "free")
--   S_(SECCLASS_PROPERTY, PROPERTY__READ, "read")
--   S_(SECCLASS_PROPERTY, PROPERTY__WRITE, "write")
--   S_(SECCLASS_CURSOR, CURSOR__CREATE, "create")
--   S_(SECCLASS_CURSOR, CURSOR__CREATEGLYPH, "createglyph")
--   S_(SECCLASS_CURSOR, CURSOR__FREE, "free")
--   S_(SECCLASS_CURSOR, CURSOR__ASSIGN, "assign")
--   S_(SECCLASS_CURSOR, CURSOR__SETATTR, "setattr")
--   S_(SECCLASS_XCLIENT, XCLIENT__KILL, "kill")
--   S_(SECCLASS_XINPUT, XINPUT__LOOKUP, "lookup")
--   S_(SECCLASS_XINPUT, XINPUT__GETATTR, "getattr")
--   S_(SECCLASS_XINPUT, XINPUT__SETATTR, "setattr")
--   S_(SECCLASS_XINPUT, XINPUT__SETFOCUS, "setfocus")
--   S_(SECCLASS_XINPUT, XINPUT__WARPPOINTER, "warppointer")
--   S_(SECCLASS_XINPUT, XINPUT__ACTIVEGRAB, "activegrab")
--   S_(SECCLASS_XINPUT, XINPUT__PASSIVEGRAB, "passivegrab")
--   S_(SECCLASS_XINPUT, XINPUT__UNGRAB, "ungrab")
--   S_(SECCLASS_XINPUT, XINPUT__BELL, "bell")
--   S_(SECCLASS_XINPUT, XINPUT__MOUSEMOTION, "mousemotion")
--   S_(SECCLASS_XINPUT, XINPUT__RELABELINPUT, "relabelinput")
--   S_(SECCLASS_XSERVER, XSERVER__SCREENSAVER, "screensaver")
--   S_(SECCLASS_XSERVER, XSERVER__GETHOSTLIST, "gethostlist")
--   S_(SECCLASS_XSERVER, XSERVER__SETHOSTLIST, "sethostlist")
--   S_(SECCLASS_XSERVER, XSERVER__GETFONTPATH, "getfontpath")
--   S_(SECCLASS_XSERVER, XSERVER__SETFONTPATH, "setfontpath")
--   S_(SECCLASS_XSERVER, XSERVER__GETATTR, "getattr")
--   S_(SECCLASS_XSERVER, XSERVER__GRAB, "grab")
--   S_(SECCLASS_XSERVER, XSERVER__UNGRAB, "ungrab")
--   S_(SECCLASS_XEXTENSION, XEXTENSION__QUERY, "query")
--   S_(SECCLASS_XEXTENSION, XEXTENSION__USE, "use")
--   S_(SECCLASS_PAX, PAX__PAGEEXEC, "pageexec")
--   S_(SECCLASS_PAX, PAX__EMUTRAMP, "emutramp")
--   S_(SECCLASS_PAX, PAX__MPROTECT, "mprotect")
--   S_(SECCLASS_PAX, PAX__RANDMMAP, "randmmap")
--   S_(SECCLASS_PAX, PAX__RANDEXEC, "randexec")
--   S_(SECCLASS_PAX, PAX__SEGMEXEC, "segmexec")
-+   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__CREATE, "create")
-+   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__DESTROY, "destroy")
-+   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__READ, "read")
-+   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__WRITE, "write")
-+   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__BLEND, "blend")
-+   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__GETATTR, "getattr")
-+   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__SETATTR, "setattr")
-+   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__LIST_CHILD, "list_child")
-+   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__ADD_CHILD, "add_child")
-+   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__REMOVE_CHILD, "remove_child")
-+   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__LIST_PROPERTY, "list_property")
-+   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__GET_PROPERTY, "get_property")
-+   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__SET_PROPERTY, "set_property")
-+   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__MANAGE, "manage")
-+   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__OVERRIDE, "override")
-+   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__SHOW, "show")
-+   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__HIDE, "hide")
-+   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__SEND, "send")
-+   S_(SECCLASS_X_DRAWABLE, X_DRAWABLE__RECEIVE, "receive")
-+   S_(SECCLASS_X_SCREEN, X_SCREEN__GETATTR, "getattr")
-+   S_(SECCLASS_X_SCREEN, X_SCREEN__SETATTR, "setattr")
-+   S_(SECCLASS_X_SCREEN, X_SCREEN__HIDE_CURSOR, "hide_cursor")
-+   S_(SECCLASS_X_SCREEN, X_SCREEN__SHOW_CURSOR, "show_cursor")
-+   S_(SECCLASS_X_SCREEN, X_SCREEN__SAVER_GETATTR, "saver_getattr")
-+   S_(SECCLASS_X_SCREEN, X_SCREEN__SAVER_SETATTR, "saver_setattr")
-+   S_(SECCLASS_X_SCREEN, X_SCREEN__SAVER_HIDE, "saver_hide")
-+   S_(SECCLASS_X_SCREEN, X_SCREEN__SAVER_SHOW, "saver_show")
-+   S_(SECCLASS_X_GC, X_GC__CREATE, "create")
-+   S_(SECCLASS_X_GC, X_GC__DESTROY, "destroy")
-+   S_(SECCLASS_X_GC, X_GC__GETATTR, "getattr")
-+   S_(SECCLASS_X_GC, X_GC__SETATTR, "setattr")
-+   S_(SECCLASS_X_GC, X_GC__USE, "use")
-+   S_(SECCLASS_X_FONT, X_FONT__CREATE, "create")
-+   S_(SECCLASS_X_FONT, X_FONT__DESTROY, "destroy")
-+   S_(SECCLASS_X_FONT, X_FONT__GETATTR, "getattr")
-+   S_(SECCLASS_X_FONT, X_FONT__ADD_GLYPH, "add_glyph")
-+   S_(SECCLASS_X_FONT, X_FONT__REMOVE_GLYPH, "remove_glyph")
-+   S_(SECCLASS_X_FONT, X_FONT__USE, "use")
-+   S_(SECCLASS_X_COLORMAP, X_COLORMAP__CREATE, "create")
-+   S_(SECCLASS_X_COLORMAP, X_COLORMAP__DESTROY, "destroy")
-+   S_(SECCLASS_X_COLORMAP, X_COLORMAP__READ, "read")
-+   S_(SECCLASS_X_COLORMAP, X_COLORMAP__WRITE, "write")
-+   S_(SECCLASS_X_COLORMAP, X_COLORMAP__GETATTR, "getattr")
-+   S_(SECCLASS_X_COLORMAP, X_COLORMAP__ADD_COLOR, "add_color")
-+   S_(SECCLASS_X_COLORMAP, X_COLORMAP__REMOVE_COLOR, "remove_color")
-+   S_(SECCLASS_X_COLORMAP, X_COLORMAP__INSTALL, "install")
-+   S_(SECCLASS_X_COLORMAP, X_COLORMAP__UNINSTALL, "uninstall")
-+   S_(SECCLASS_X_COLORMAP, X_COLORMAP__USE, "use")
-+   S_(SECCLASS_X_PROPERTY, X_PROPERTY__CREATE, "create")
-+   S_(SECCLASS_X_PROPERTY, X_PROPERTY__DESTROY, "destroy")
-+   S_(SECCLASS_X_PROPERTY, X_PROPERTY__READ, "read")
-+   S_(SECCLASS_X_PROPERTY, X_PROPERTY__WRITE, "write")
-+   S_(SECCLASS_X_PROPERTY, X_PROPERTY__APPEND, "append")
-+   S_(SECCLASS_X_PROPERTY, X_PROPERTY__GETATTR, "getattr")
-+   S_(SECCLASS_X_PROPERTY, X_PROPERTY__SETATTR, "setattr")
-+   S_(SECCLASS_X_SELECTION, X_SELECTION__READ, "read")
-+   S_(SECCLASS_X_SELECTION, X_SELECTION__WRITE, "write")
-+   S_(SECCLASS_X_SELECTION, X_SELECTION__GETATTR, "getattr")
-+   S_(SECCLASS_X_SELECTION, X_SELECTION__SETATTR, "setattr")
-+   S_(SECCLASS_X_CURSOR, X_CURSOR__CREATE, "create")
-+   S_(SECCLASS_X_CURSOR, X_CURSOR__DESTROY, "destroy")
-+   S_(SECCLASS_X_CURSOR, X_CURSOR__READ, "read")
-+   S_(SECCLASS_X_CURSOR, X_CURSOR__WRITE, "write")
-+   S_(SECCLASS_X_CURSOR, X_CURSOR__GETATTR, "getattr")
-+   S_(SECCLASS_X_CURSOR, X_CURSOR__SETATTR, "setattr")
-+   S_(SECCLASS_X_CURSOR, X_CURSOR__USE, "use")
-+   S_(SECCLASS_X_CLIENT, X_CLIENT__DESTROY, "destroy")
-+   S_(SECCLASS_X_CLIENT, X_CLIENT__GETATTR, "getattr")
-+   S_(SECCLASS_X_CLIENT, X_CLIENT__SETATTR, "setattr")
-+   S_(SECCLASS_X_CLIENT, X_CLIENT__MANAGE, "manage")
-+   S_(SECCLASS_X_DEVICE, X_DEVICE__GETATTR, "getattr")
-+   S_(SECCLASS_X_DEVICE, X_DEVICE__SETATTR, "setattr")
-+   S_(SECCLASS_X_DEVICE, X_DEVICE__USE, "use")
-+   S_(SECCLASS_X_DEVICE, X_DEVICE__READ, "read")
-+   S_(SECCLASS_X_DEVICE, X_DEVICE__WRITE, "write")
-+   S_(SECCLASS_X_DEVICE, X_DEVICE__GETFOCUS, "getfocus")
-+   S_(SECCLASS_X_DEVICE, X_DEVICE__SETFOCUS, "setfocus")
-+   S_(SECCLASS_X_DEVICE, X_DEVICE__BELL, "bell")
-+   S_(SECCLASS_X_DEVICE, X_DEVICE__FORCE_CURSOR, "force_cursor")
-+   S_(SECCLASS_X_DEVICE, X_DEVICE__FREEZE, "freeze")
-+   S_(SECCLASS_X_DEVICE, X_DEVICE__GRAB, "grab")
-+   S_(SECCLASS_X_DEVICE, X_DEVICE__MANAGE, "manage")
-+   S_(SECCLASS_X_SERVER, X_SERVER__GETATTR, "getattr")
-+   S_(SECCLASS_X_SERVER, X_SERVER__SETATTR, "setattr")
-+   S_(SECCLASS_X_SERVER, X_SERVER__RECORD, "record")
-+   S_(SECCLASS_X_SERVER, X_SERVER__DEBUG, "debug")
-+   S_(SECCLASS_X_SERVER, X_SERVER__GRAB, "grab")
-+   S_(SECCLASS_X_SERVER, X_SERVER__MANAGE, "manage")
-+   S_(SECCLASS_X_EXTENSION, X_EXTENSION__QUERY, "query")
-+   S_(SECCLASS_X_EXTENSION, X_EXTENSION__USE, "use")
-+   S_(SECCLASS_X_RESOURCE, X_RESOURCE__READ, "read")
-+   S_(SECCLASS_X_RESOURCE, X_RESOURCE__WRITE, "write")
-+   S_(SECCLASS_X_EVENT, X_EVENT__SEND, "send")
-+   S_(SECCLASS_X_EVENT, X_EVENT__RECEIVE, "receive")
-+   S_(SECCLASS_X_SYNTHETIC_EVENT, X_SYNTHETIC_EVENT__SEND, "send")
-+   S_(SECCLASS_X_SYNTHETIC_EVENT, X_SYNTHETIC_EVENT__RECEIVE, "receive")
-    S_(SECCLASS_NETLINK_ROUTE_SOCKET, NETLINK_ROUTE_SOCKET__NLMSG_READ, "nlmsg_read")
-    S_(SECCLASS_NETLINK_ROUTE_SOCKET, NETLINK_ROUTE_SOCKET__NLMSG_WRITE, "nlmsg_write")
-    S_(SECCLASS_NETLINK_FIREWALL_SOCKET, NETLINK_FIREWALL_SOCKET__NLMSG_READ, "nlmsg_read")
-@@ -237,6 +253,7 @@
-    S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_WRITE, "nlmsg_write")
-    S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_RELAY, "nlmsg_relay")
-    S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_READPRIV, "nlmsg_readpriv")
-+   S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_TTY_AUDIT, "nlmsg_tty_audit")
-    S_(SECCLASS_NETLINK_IP6FW_SOCKET, NETLINK_IP6FW_SOCKET__NLMSG_READ, "nlmsg_read")
-    S_(SECCLASS_NETLINK_IP6FW_SOCKET, NETLINK_IP6FW_SOCKET__NLMSG_WRITE, "nlmsg_write")
-    S_(SECCLASS_DBUS, DBUS__ACQUIRE_SVC, "acquire_svc")
-@@ -303,3 +320,6 @@
-    S_(SECCLASS_DB_BLOB, DB_BLOB__IMPORT, "import")
-    S_(SECCLASS_DB_BLOB, DB_BLOB__EXPORT, "export")
-    S_(SECCLASS_PEER, PEER__RECV, "recv")
-+   S_(SECCLASS_X_APPLICATION_DATA, X_APPLICATION_DATA__PASTE, "paste")
-+   S_(SECCLASS_X_APPLICATION_DATA, X_APPLICATION_DATA__PASTE_AFTER_CONFIRM, "paste_after_confirm")
-+   S_(SECCLASS_X_APPLICATION_DATA, X_APPLICATION_DATA__COPY, "copy")
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.71/src/callbacks.c
 --- nsalibselinux/src/callbacks.c	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/src/callbacks.c	2008-09-24 07:41:57.000000000 -0400
++++ libselinux-2.0.71/src/callbacks.c	2008-09-26 10:21:43.000000000 -0400
 @@ -16,6 +16,7 @@
  {
  	int rc;
@@ -903,51 +92,9 @@
  	va_start(ap, fmt);
  	rc = vfprintf(stderr, fmt, ap);
  	va_end(ap);
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/class_to_string.h libselinux-2.0.71/src/class_to_string.h
---- nsalibselinux/src/class_to_string.h	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/src/class_to_string.h	2008-09-24 07:41:57.000000000 -0400
-@@ -33,18 +33,18 @@
-     S_("shm")
-     S_("ipc")
-     S_("passwd")
--    S_("drawable")
--    S_("window")
--    S_("gc")
--    S_("font")
--    S_("colormap")
--    S_("property")
--    S_("cursor")
--    S_("xclient")
--    S_("xinput")
--    S_("xserver")
--    S_("xextension")
--    S_("pax")
-+    S_("x_drawable")
-+    S_("x_screen")
-+    S_("x_gc")
-+    S_("x_font")
-+    S_("x_colormap")
-+    S_("x_property")
-+    S_("x_selection")
-+    S_("x_cursor")
-+    S_("x_client")
-+    S_("x_device")
-+    S_("x_server")
-+    S_("x_extension")
-     S_("netlink_route_socket")
-     S_("netlink_firewall_socket")
-     S_("netlink_tcpdiag_socket")
-@@ -72,3 +72,7 @@
-     S_("db_blob")
-     S_("peer")
-     S_("capability2")
-+    S_("x_resource")
-+    S_("x_event")
-+    S_("x_synthetic_event")
-+    S_("x_application_data")
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.71/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/src/matchpathcon.c	2008-09-24 07:41:57.000000000 -0400
++++ libselinux-2.0.71/src/matchpathcon.c	2008-09-26 10:21:43.000000000 -0400
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>
@@ -967,7 +114,7 @@
  
 diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.71/utils/matchpathcon.c
 --- nsalibselinux/utils/matchpathcon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.71/utils/matchpathcon.c	2008-09-26 09:42:51.000000000 -0400
++++ libselinux-2.0.71/utils/matchpathcon.c	2008-09-26 10:21:43.000000000 -0400
 @@ -106,12 +106,12 @@
  
  		if (verify) {


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- libselinux.spec	26 Sep 2008 13:59:45 -0000	1.343
+++ libselinux.spec	30 Sep 2008 13:30:18 -0000	1.344
@@ -4,8 +4,8 @@
 
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.71
-Release: 6%{?dist}
+Version: 2.0.73
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -163,6 +163,11 @@
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Tue Sep 30 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.73-1
+- Update to Upstream
+	* New man pages from Dan Walsh.
+	* Update flask headers from refpolicy trunk from Dan Walsh.
+
 * Fri Sep 26 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.71-6
 - Fix matchpathcon -V call 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/sources,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- sources	5 Aug 2008 14:05:15 -0000	1.177
+++ sources	30 Sep 2008 13:30:18 -0000	1.178
@@ -1 +1 @@
-5d59c1105c777f8520978ee00ab46656  libselinux-2.0.71.tgz
+3fb779dd1d9e06190f37dc26f31c7ff7  libselinux-2.0.73.tgz



From dwalsh at fedoraproject.org  Tue Sep 30 13:31:59 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 30 Sep 2008 13:31:59 +0000 (UTC)
Subject: rpms/libsepol/devel .cvsignore, 1.139, 1.140 libsepol.spec, 1.185, 
	1.186 sources, 1.140, 1.141
Message-ID: <20080930133159.CFBD370119@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsepol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24984

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Tue Sep 30 2008 Dan Walsh <dwalsh at redhat.com> 2.0.33-1
- Upgrade to latest from NSA
	* Revert patch that removed expand_rule.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- .cvsignore	7 Jul 2008 17:51:57 -0000	1.139
+++ .cvsignore	30 Sep 2008 13:31:29 -0000	1.140
@@ -139,3 +139,4 @@
 libsepol-2.0.30.tgz
 libsepol-2.0.31.tgz
 libsepol-2.0.32.tgz
+libsepol-2.0.33.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- libsepol.spec	7 Jul 2008 17:51:57 -0000	1.185
+++ libsepol.spec	30 Sep 2008 13:31:29 -0000	1.186
@@ -1,6 +1,6 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 2.0.32
+Version: 2.0.33
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -96,6 +96,10 @@
 /%{_lib}/libsepol.so.1
 
 %changelog
+* Tue Sep 30 2008 Dan Walsh <dwalsh at redhat.com> 2.0.33-1
+- Upgrade to latest from NSA
+	* Revert patch that removed expand_rule.
+
 * Mon Jul 7 2008 Dan Walsh <dwalsh at redhat.com> 2.0.32-1
 - Upgrade to latest from NSA
 	* Allow require then declare in the source policy from Joshua Brindle.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/sources,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- sources	7 Jul 2008 17:51:57 -0000	1.140
+++ sources	30 Sep 2008 13:31:29 -0000	1.141
@@ -1 +1 @@
-945f2f972096e3c19297ee655c9f3f9c  libsepol-2.0.32.tgz
+0c8c322bc4e5c5b5af9a6be7dbbd7d43  libsepol-2.0.33.tgz



From pkgdb at fedoraproject.org  Tue Sep 30 13:32:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 13:32:24 +0000
Subject: [pkgdb] xorg-x11-drv-nv had group_acl changed
Message-ID: <20080930133224.880872084BC@bastion.fedora.phx.redhat.com>

ajax has set the commit acl on xorg-x11-drv-nv (Fedora 9) to Approved for packager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nv



From dcbw at fedoraproject.org  Tue Sep 30 13:33:43 2008
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Tue, 30 Sep 2008 13:33:43 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nv/devel nv-1.1.1-nv34-tweaks.patch, 1.1,
	1.2 xorg-x11-drv-nv.spec, 1.76, 1.77
Message-ID: <20080930133344.037CA70119@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25264

Modified Files:
	nv-1.1.1-nv34-tweaks.patch xorg-x11-drv-nv.spec 
Log Message:
* Tue Sep 30 2008 Dan Williams <dcbw at redhat.com> 2.1.12-5
- Port Toshiba Tecra M2 NV34 panel tweak to pciaccess



nv-1.1.1-nv34-tweaks.patch:

Index: nv-1.1.1-nv34-tweaks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/nv-1.1.1-nv34-tweaks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nv-1.1.1-nv34-tweaks.patch	14 Jun 2006 23:03:31 -0000	1.1
+++ nv-1.1.1-nv34-tweaks.patch	30 Sep 2008 13:33:13 -0000	1.2
@@ -1,13 +1,21 @@
---- xf86-video-nv-1.1.1/src/nv_dac.c.nv34-tweak	2006-06-14 14:26:46.000000000 -0400
-+++ xf86-video-nv-1.1.1/src/nv_dac.c	2006-06-14 14:38:20.000000000 -0400
-@@ -60,8 +60,14 @@
+diff -up xf86-video-nv-2.1.12/src/nv_dac.c.nv34-tweak xf86-video-nv-2.1.12/src/nv_dac.c
+--- xf86-video-nv-2.1.12/src/nv_dac.c.nv34-tweak	2008-07-24 20:48:51.000000000 -0400
++++ xf86-video-nv-2.1.12/src/nv_dac.c	2008-09-30 09:28:08.000000000 -0400
+@@ -42,8 +42,21 @@ NVDACPanelTweaks(NVPtr pNv, NVRegPtr sta
            we can do is experiment and apply hacks. */
  
         if(((pNv->Chipset & 0xffff) == 0x0328) && (state->bpp == 32)) {
 -          /* At least one NV34 laptop needs this workaround. */
 -          tweak = -1;
++#if XSERVER_LIBPCIACCESS
++          if (((pNv->PciInfo->subvendor_id & 0xffff) == 0x1179) &&
++              ((pNv->PciInfo->subdevice_id & 0xffff) == 0x0020))
++#else
 +          if (((pNv->PciInfo->subsysVendor & 0xffff) == 0x1179) &&
-+              ((pNv->PciInfo->subsysCard & 0xffff) == 0x0020)) {
++              ((pNv->PciInfo->subsysCard & 0xffff) == 0x0020))
++#endif
++          {
++
 +             /* Toshiba Tecra M2 */
 +             tweak = 1;
 +          } else {


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.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- xorg-x11-drv-nv.spec	11 Sep 2008 17:29:59 -0000	1.76
+++ xorg-x11-drv-nv.spec	30 Sep 2008 13:33:13 -0000	1.77
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.12
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -37,8 +37,7 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 
-# disable for now, needs porting to pciaccess
-#patch0 -p1 -b .nv34-tweak
+%patch0 -p1 -b .nv34-tweak
 %patch4 -p1 -b .reserve-fbarea
 %patch5 -p1 -b .starve
 %patch6 -p1 -b .panel
@@ -69,6 +68,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Tue Sep 30 2008 Dan Williams <dcbw at redhat.com> 2.1.12-5
+- Port Toshiba Tecra M2 NV34 panel tweak to pciaccess
+
 * Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 2.1.12-4
 - Remove fb size hack since there is a fix in the server now.
 



From limb at fedoraproject.org  Tue Sep 30 13:49:48 2008
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 30 Sep 2008 13:49:48 +0000 (UTC)
Subject: rpms/xmoto/devel xmoto-0.4.2-initode.patch, NONE, 1.1 xmoto.spec,
	1.41, 1.42
Message-ID: <20080930134948.7F0EF70119@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26780

Modified Files:
	xmoto.spec 
Added Files:
	xmoto-0.4.2-initode.patch 
Log Message:
New ode version fix.


xmoto-0.4.2-initode.patch:

--- NEW FILE xmoto-0.4.2-initode.patch ---
--- src/GameInit.cpp	2008-09-30 07:37:22.000000000 -0500
+++ src/GameInit.cpp	2008-09-30 07:37:22.000000000 -0500
@@ -57,6 +57,8 @@
 #else
 int main(int nNumArgs, char **ppcArgs) {
 #endif
+  /* Init ODE -jciesla, 9/30/08, Fedora */
+  dInitODE();
   /* Start application */
   try {     
     /* Setup basic info */


Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xmoto.spec	12 Sep 2008 17:45:04 -0000	1.41
+++ xmoto.spec	30 Sep 2008 13:49:18 -0000	1.42
@@ -1,7 +1,7 @@
 %define _default_patch_fuzz 2
 Name:		xmoto
 Version:	0.4.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Challenging 2D Motocross Platform Game
 
 Group:		Amusements/Games
@@ -15,6 +15,7 @@
 Patch2:		xmoto-0.3.4-Scene-collisioninclude.patch
 Patch3:		xmoto-0.4.0-Environment-string.patch
 Patch4:		xmoto-0.4.0-DrawLib-hashmap.patch
+Patch5:		xmoto-0.4.2-initode.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -46,6 +47,7 @@
 %patch2 -p0
 %patch3 -p0
 %patch4 -p0
+%patch5 -p0
 
 #fix encoding
 sed -i 's/\r//' src/xmscene/Camera.cpp
@@ -98,6 +100,9 @@
 %{_mandir}/man6/xmoto.6.gz
 
 %changelog
+* Tue Sep 30 2008 Jon Ciesla <limb at jcomserv.net> 0.4.2-3
+- Patch for new ode version.
+
 * Fri Sep 12 2008 Jon Ciesla <limb at jcomserv.net> 0.4.2-2
 - Introducted patch fuzz workaround, will fix.
 



From kasal at fedoraproject.org  Tue Sep 30 14:02:03 2008
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue, 30 Sep 2008 14:02:03 +0000 (UTC)
Subject: rpms/nss-mdns/devel nss-mdns.spec,1.4,1.5
Message-ID: <20080930140203.1CF2870119@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/nss-mdns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27835

Modified Files:
	nss-mdns.spec 
Log Message:
- use sed instead of perl in scriptlets (#462996)
- consequently, removed the Requires(..): perl
- removed the reqires for things that are granted
- a better BuildRoot


Index: nss-mdns.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-mdns/devel/nss-mdns.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nss-mdns.spec	11 Aug 2008 20:24:25 -0000	1.4
+++ nss-mdns.spec	30 Sep 2008 14:01:32 -0000	1.5
@@ -1,19 +1,12 @@
 Summary: glibc plugin for .local name resolution
 Name: nss-mdns
 Version: 0.10
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 URL: http://0pointer.de/lennart/projects/nss-mdns/
 Group: System Environment/Libraries
 Source: http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot 
-BuildRequires: glibc-devel
-Requires(post): /bin/sh
-Requires(preun): /bin/sh
-Requires(post): perl
-Requires(preun): perl
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires: avahi
  
 %description
@@ -44,48 +37,19 @@
 /sbin/ldconfig
 # Perl-fu to add mdns4_minimal to the hosts line of /etc/nsswitch.conf
 if [ -f /etc/nsswitch.conf ] ; then
-	perl -ibak -pe '
-		sub insert {
-			my @bits = split(" ", shift);
-		
-			if (grep { $_ eq "mdns4_minimal" || $_ eq "mdns4"
-				|| $_ eq "mdns6_minimal" || $_ eq "mdns6"
-				|| $_ eq "mdns_minimal" || $_ eq "mdns" } @bits) {
-				return join " ", @bits;
-			}
-			
-			return join " ", map {
-				$_ eq "dns" ? ("mdns4_minimal", "[NOTFOUND=return]", $_) : $_
-			} @bits;
-		}
-
-		s/^(hosts:\s+)(.*)$/$1.insert($2)/e;
-	' /etc/nsswitch.conf
+	sed -i.bak '
+		/^hosts:/ !b
+		/\<mdns\(4\|6\)\?\(_minimal\)\?\>/ b
+		s/\([[:blank:]]\+\)dns\>/\1mdns4_minimal [NOTFOUND=return] dns/g
+		' /etc/nsswitch.conf
 fi
 
 %preun
-# Perl-fu to remove mdns4_minimal from the hosts line of /etc/nsswitch.conf
+# sed-fu to remove mdns4_minimal from the hosts line of /etc/nsswitch.conf
 if [ "$1" -eq 0 -a -f /etc/nsswitch.conf ] ; then
-	perl -ibak -pe '
-		my @remove = (
-			"mdns4_minimal [NOTFOUND=return]",
-			"mdns4_minimal",
-			"mdns4",
-			"mdns6_minimal [NOTFOUND=return]",
-			"mdns6_minimal",
-			"mdns6",
-			"mdns_minimal [NOTFOUND=return]",
-			"mdns_minimal",
-			"mdns",
-		);
-		sub remove {
-			my $s = shift;
-			foreach my $bit (@remove) {
-				$s =~ s/\s+\Q$bit\E//g;
-			}
-			return $s;
-		}
-		s/^(hosts:\s+)(.*)$/$1.remove($2)/e;
+	sed -i.bak '
+		/^hosts:/ !b
+		s/[[:blank:]]\+mdns\(4\|6\)\?\(_minimal\( \[NOTFOUND=return\]\)\?\)\?//g
 	' /etc/nsswitch.conf
 fi
 
@@ -97,6 +61,15 @@
 /%{_lib}/*
 
 %changelog
+* Tue Sep 30 2008 Stepan Kasal <skasal at redhat.com> - 0.10-6
+- use sed instead of perl in %%post and %%preun (#462996),
+  fixing two bugs in the scriptlets:
+  1) the backup file shall be nsswitch.conf.bak, not nsswitch.confbak
+  2) the first element after host: shall be subject to removal, too
+- consequently, removed the Requires(..): perl
+- removed the reqires for things that are granted
+- a better BuildRoot
+
 * Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10-5
 - fix license tag
 



From than at fedoraproject.org  Tue Sep 30 14:05:42 2008
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 30 Sep 2008 14:05:42 +0000 (UTC)
Subject: rpms/phonon/devel .cvsignore, 1.4, 1.5 phonon.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <20080930140542.5142570119@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28239

Modified Files:
	.cvsignore phonon.spec sources 
Log Message:
add missing icon



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/phonon/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Jul 2008 12:26:06 -0000	1.4
+++ .cvsignore	30 Sep 2008 14:05:11 -0000	1.5
@@ -1 +1,2 @@
 phonon-4.2.0.tar.bz2
+gstreamer-logo.svg


Index: phonon.spec
===================================================================
RCS file: /cvs/extras/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- phonon.spec	17 Sep 2008 17:44:58 -0000	1.10
+++ phonon.spec	30 Sep 2008 14:05:11 -0000	1.11
@@ -2,12 +2,13 @@
 Summary: Multimedia framework api
 Name:    phonon 
 Version: 4.2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/phonon-%{version}.tar.bz2
+Source1: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
 # Make PulseAudio the default again when listed by the backend.
 # Note that this currently only works for the Xine backend. Device selection in
 # the GStreamer backend is weird: there is a setting for "sink" which cannot be
@@ -25,6 +26,7 @@
 BuildRequires: kde-filesystem
 BuildRequires: libxml2-devel
 BuildRequires: qt4-devel >= 4.4.0
+BuildRequires: ImageMagick
 
 ## hard-code phonon-backend-xine, for now, so yum doesn't choose -gstreamer by default
 Requires: phonon-backend-xine
@@ -40,6 +42,8 @@
 Provides: phonon-backend = %{version}-%{release}
 Obsoletes: %{name}-backend-gst < 4.2.0-4
 Provides:  %{name}-backend-gst = %{version}-%{release}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 %description backend-gstreamer
 %{summary}.
 
@@ -72,6 +76,12 @@
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}-gstreamer.svg
+for i in 16 22 32 48 64 128; do
+  mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+  convert -geometry ${i}x${i}  %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}-gstreamer.png
+done
+
 
 
 %clean
@@ -82,6 +92,11 @@
 
 %postun -p /sbin/ldconfig
 
+%post -n %{name}-backend-gstreamer
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
+%postun -n %{name}-backend-gstreamer
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %files
 %defattr(-,root,root,-)
@@ -96,6 +111,8 @@
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so
 %{_kde4_datadir}/kde4/services/phononbackends/gstreamer.desktop
+%_datadir/icons/hicolor/*/*/*.png
+%_datadir/icons/hicolor/*/*/*.svg
 
 %files devel
 %defattr(-,root,root,-)
@@ -107,6 +124,9 @@
 
 
 %changelog
+* Tue Sep 30 2008 Than Ngo <than at redhat.com> 4.2.0-6
+- add missing icon
+
 * Wed Sep 17 2008 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-5
 - Requires: phonon-backend-xine
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phonon/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Jul 2008 12:26:06 -0000	1.4
+++ sources	30 Sep 2008 14:05:12 -0000	1.5
@@ -1 +1,2 @@
 de80b0f055886a6946acc7886713e23e  phonon-4.2.0.tar.bz2
+8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg



From mclasen at fedoraproject.org  Tue Sep 30 14:08:06 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 30 Sep 2008 14:08:06 +0000 (UTC)
Subject: rpms/libgnome/devel libgnome.spec,1.128,1.129
Message-ID: <20080930140806.E61D070119@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28463

Modified Files:
	libgnome.spec 
Log Message:
fix multilib conflicts



Index: libgnome.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- libgnome.spec	25 Sep 2008 17:18:00 -0000	1.128
+++ libgnome.spec	30 Sep 2008 14:07:36 -0000	1.129
@@ -14,7 +14,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.24.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnome/2.24/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -137,6 +137,7 @@
 for p in *.po; do
   msgmerge $p %{po_package}.pot > $p.out
   msgfmt -o `basename $p .po`.gmo $p.out
+  touch -r $p `basename $p .po`.gmo
 done
 
 
@@ -208,6 +209,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Sep 30 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-3
+- Fix multilib conflicts with touch
+
 * Thu Sep 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-2
 - Save some space
 



From pkgdb at fedoraproject.org  Tue Sep 30 14:09:04 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 14:09:04 +0000
Subject: [pkgdb] docbook-dtds: kasal has requested commit
Message-ID: <20080930140905.256F12084BD@bastion.fedora.phx.redhat.com>

kasal has requested the commit acl on docbook-dtds (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/docbook-dtds



From pkgdb at fedoraproject.org  Tue Sep 30 14:19:51 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 14:19:51 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080930141951.E9EB62084BC@bastion.fedora.phx.redhat.com>

jkeating has set the watchbugzilla acl on iscsi-initiator-utils (Fedora devel) to Obsolete for jkeating

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 30 14:19:54 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 14:19:54 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080930141954.A90752084BF@bastion.fedora.phx.redhat.com>

jkeating has set the watchcommits acl on iscsi-initiator-utils (Fedora devel) to Obsolete for jkeating

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 30 14:19:57 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 14:19:57 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080930141958.17FEE2084C2@bastion.fedora.phx.redhat.com>

jkeating has set the commit acl on iscsi-initiator-utils (Fedora devel) to Obsolete for jkeating

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 30 14:20:00 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 14:20:00 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080930142000.82524208D6D@bastion.fedora.phx.redhat.com>

jkeating has set the approveacls acl on iscsi-initiator-utils (Fedora devel) to Obsolete for jkeating

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 30 14:20:07 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 14:20:07 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080930142007.CE858208D73@bastion.fedora.phx.redhat.com>

jkeating has set the watchbugzilla acl on iscsi-initiator-utils (Fedora 7) to Obsolete for jkeating

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 30 14:20:08 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 14:20:08 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080930142008.7F6AC208D79@bastion.fedora.phx.redhat.com>

jkeating has set the watchcommits acl on iscsi-initiator-utils (Fedora 7) to Obsolete for jkeating

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 30 14:20:09 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 14:20:09 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080930142009.8A99C208DA2@bastion.fedora.phx.redhat.com>

jkeating has set the commit acl on iscsi-initiator-utils (Fedora 7) to Obsolete for jkeating

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 30 14:20:11 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 14:20:11 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080930142011.3CCE8208DA9@bastion.fedora.phx.redhat.com>

jkeating has set the approveacls acl on iscsi-initiator-utils (Fedora 7) to Obsolete for jkeating

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 30 14:20:13 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 14:20:13 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080930142014.00BBA208DAC@bastion.fedora.phx.redhat.com>

jkeating has set the watchbugzilla acl on iscsi-initiator-utils (Fedora 8) to Obsolete for jkeating

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 30 14:20:15 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 14:20:15 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080930142015.5C5CE208DAF@bastion.fedora.phx.redhat.com>

jkeating has set the watchcommits acl on iscsi-initiator-utils (Fedora 8) to Obsolete for jkeating

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 30 14:20:18 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 14:20:18 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080930142018.E5839208DB6@bastion.fedora.phx.redhat.com>

jkeating has set the approveacls acl on iscsi-initiator-utils (Fedora 8) to Obsolete for jkeating

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 30 14:20:17 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 14:20:17 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080930142017.B50B5208DB3@bastion.fedora.phx.redhat.com>

jkeating has set the commit acl on iscsi-initiator-utils (Fedora 8) to Obsolete for jkeating

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 30 14:20:22 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 14:20:22 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080930142022.6A6CD208DB7@bastion.fedora.phx.redhat.com>

jkeating has set the watchbugzilla acl on iscsi-initiator-utils (Fedora 9) to Obsolete for jkeating

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From twoerner at fedoraproject.org  Tue Sep 30 14:20:20 2008
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Tue, 30 Sep 2008 14:20:20 +0000 (UTC)
Subject: rpms/postfix/F-9 postfix.spec, 1.67, 1.68 sources, 1.28,
	1.29 postfix-CVE-2008-2936.patch, 1.1, NONE
Message-ID: <20080930142020.C90BD70119@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/postfix/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29766

Modified Files:
	postfix.spec sources 
Removed Files:
	postfix-CVE-2008-2936.patch 
Log Message:
- new version 2.5.5
  fixes CVE-2008-2936, CVE-2008-2937 and CVE-2008-3889 (rhbz#459101)




Index: postfix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-9/postfix.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- postfix.spec	14 Aug 2008 14:02:38 -0000	1.67
+++ postfix.spec	30 Sep 2008 14:19:49 -0000	1.68
@@ -39,12 +39,12 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 2.5.1
-Release: 3%{?dist}
+Version: 2.5.5
+Release: 1%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
-License: IBM Public License
+License: IBM
 Requires(post): /sbin/chkconfig
 Requires(post): %{_sbindir}/alternatives
 Requires(pre): %{_sbindir}/groupadd
@@ -81,7 +81,6 @@
 Patch8: postfix-large-fs.patch
 Patch9: postfix-2.4.0-cyrus.patch
 Patch10: postfix-2.4.5-open_define.patch
-Patch11: postfix-CVE-2008-2936.patch
 
 # Optional patches - set the appropriate environment variables to include
 #                    them when building the package/spec file
@@ -140,7 +139,6 @@
 %patch8 -p1 -b .large-fs
 %patch9 -p1 -b .cyrus
 %patch10 -p1 -b .open_define
-%patch11 -p1 -b .CVE-2008-2936
 
 # resolve multilib conflict for makedefs.out: rename to makedefs.out-%{_arch}
 perl -pi -e "s/makedefs.out/makedefs.out-%{_arch}/g" conf/postfix-files Makefile.in */Makefile.in */*/Makefile.in HISTORY
@@ -482,6 +480,13 @@
 
 
 %changelog
+* Wed Sep 17 2008 Thomas Woerner <twoerner at redhat.com> 2:2.5.5-1
+- new version 2.5.5
+  fixes CVE-2008-2936, CVE-2008-2937 and CVE-2008-3889 (rhbz#459101)
+
+* Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2:2.5.1-4
+- fix license tag
+
 * Thu Aug 14 2008 Thomas Woerner <twoerner at redhat.com> 2:2.5.1-3
 - fixed postfix privilege problem with symlinks in the mail spool directory
   (CVE-2008-2936) (rhbz#459100)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-9/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	21 Feb 2008 18:46:06 -0000	1.28
+++ sources	30 Sep 2008 14:19:49 -0000	1.29
@@ -1,2 +1,2 @@
 1f78fcaf2a36ec3520ecff286a45251a  pflogsumm-1.1.0.tar.gz
-95a559c509081fdd07d78eafd4f4c3b4  postfix-2.5.1.tar.gz
+6b4b848bdd2239dddfc9d385e57e19ef  postfix-2.5.5.tar.gz


--- postfix-CVE-2008-2936.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Sep 30 14:20:23 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 14:20:23 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080930142023.C1DC1208DBB@bastion.fedora.phx.redhat.com>

jkeating has set the watchcommits acl on iscsi-initiator-utils (Fedora 9) to Obsolete for jkeating

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 30 14:20:26 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 14:20:26 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080930142026.54601208DBF@bastion.fedora.phx.redhat.com>

jkeating has set the commit acl on iscsi-initiator-utils (Fedora 9) to Obsolete for jkeating

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From pkgdb at fedoraproject.org  Tue Sep 30 14:20:27 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 14:20:27 +0000
Subject: [pkgdb] iscsi-initiator-utils had acl change status
Message-ID: <20080930142028.2CED8208DC1@bastion.fedora.phx.redhat.com>

jkeating has set the approveacls acl on iscsi-initiator-utils (Fedora 9) to Obsolete for jkeating

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iscsi-initiator-utils



From twoerner at fedoraproject.org  Tue Sep 30 14:25:09 2008
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Tue, 30 Sep 2008 14:25:09 +0000 (UTC)
Subject: rpms/postfix/F-8 postfix.spec, 1.59, 1.60 sources, 1.26,
	1.27 postfix-CVE-2008-2936.patch, 1.1, NONE
Message-ID: <20080930142509.DE14B70119@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/postfix/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30382

Modified Files:
	postfix.spec sources 
Removed Files:
	postfix-CVE-2008-2936.patch 
Log Message:
- new version 2.5.5
  fixes CVE-2008-2936, CVE-2008-2937 and CVE-2008-3889 (rhbz#459101)




Index: postfix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-8/postfix.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- postfix.spec	14 Aug 2008 13:55:48 -0000	1.59
+++ postfix.spec	30 Sep 2008 14:24:39 -0000	1.60
@@ -1,6 +1,6 @@
+%{?!MYSQL: %define MYSQL 0}
+%{?!PGSQL: %define PGSQL 0}
 %define LDAP 2
-%define MYSQL 0
-%define PGSQL 0
 %define PCRE 1
 %define SASL 2
 %define TLS 1
@@ -32,18 +32,19 @@
 %define postfix_daemon_dir	%{_libexecdir}/postfix
 %define postfix_command_dir	%{_sbindir}
 %define postfix_queue_dir	%{_var}/spool/postfix
+%define postfix_data_dir	%{_var}/lib/postfix
 %define postfix_doc_dir		%{_docdir}/%{name}-%{version}
 %define postfix_sample_dir	%{postfix_doc_dir}/samples
 %define postfix_readme_dir	%{postfix_doc_dir}/README_FILES
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 2.4.5
-Release: 3%{?dist}
+Version: 2.5.5
+Release: 1%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
-License: IBM Public License
+License: IBM
 Requires(post): /sbin/chkconfig
 Requires(post): %{_sbindir}/alternatives
 Requires(pre): %{_sbindir}/groupadd
@@ -53,7 +54,7 @@
 Requires(preun): %{_sbindir}/alternatives
 Requires(postun): /sbin/service
 
-Provides: MTA smtpd smtpdaemon /usr/bin/newaliases
+Provides: MTA smtpd smtpdaemon server(smtp) /usr/bin/newaliases
 
 Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
 Source1: postfix-etc-init.d-postfix
@@ -80,7 +81,6 @@
 Patch8: postfix-large-fs.patch
 Patch9: postfix-2.4.0-cyrus.patch
 Patch10: postfix-2.4.5-open_define.patch
-Patch11: postfix-CVE-2008-2936.patch
 
 # Optional patches - set the appropriate environment variables to include
 #                    them when building the package/spec file
@@ -109,8 +109,8 @@
 %endif
 
 %if %{MYSQL}
-Requires: mysql
-BuildRequires: mysql, mysql-devel
+Requires: mysql-libs
+BuildRequires: mysql-devel
 %endif
 
 %if %{PGSQL}
@@ -139,7 +139,9 @@
 %patch8 -p1 -b .large-fs
 %patch9 -p1 -b .cyrus
 %patch10 -p1 -b .open_define
-%patch11 -p1 -b .CVE-2008-2936
+
+# resolve multilib conflict for makedefs.out: rename to makedefs.out-%{_arch}
+perl -pi -e "s/makedefs.out/makedefs.out-%{_arch}/g" conf/postfix-files Makefile.in */Makefile.in */*/Makefile.in HISTORY
 
 %if %{PFLOGSUMM}
 gzip -dc %{SOURCE53} | tar xf -
@@ -240,6 +242,7 @@
        daemon_directory=%{postfix_daemon_dir} \
        command_directory=%{postfix_command_dir} \
        queue_directory=%{postfix_queue_dir} \
+       data_directory=%{postfix_data_dir} \
        sendmail_path=%{postfix_command_dir}/sendmail.postfix \
        newaliases_path=%{_bindir}/newaliases.postfix \
        mailq_path=%{_bindir}/mailq.postfix \
@@ -304,13 +307,21 @@
 install -c qshape.1 $RPM_BUILD_ROOT%{_mandir}/man1/qshape.1
 install -c auxiliary/qshape/qshape.pl $RPM_BUILD_ROOT%{postfix_command_dir}/qshape
 
-rm -f $RPM_BUILD_ROOT/etc/postfix/aliases
+# remove alias file
+rm -f $RPM_BUILD_ROOT%{postfix_config_dir}/aliases
 
+# create /usr/lib/sendmail
 mkdir -p $RPM_BUILD_ROOT/usr/lib
 pushd $RPM_BUILD_ROOT/usr/lib
 ln -sf ../sbin/sendmail.postfix .
 popd
 
+# enable all protocols
+cat >> $RPM_BUILD_ROOT%{postfix_config_dir}/main.cf <<EOF
+# Enable IPv4, and IPv6 if supported
+inet_protocols = all
+EOF
+
 %post
 /sbin/chkconfig --add postfix
 
@@ -418,6 +429,7 @@
 %dir %attr(0755, root, root) %{postfix_queue_dir}/pid
 %dir %attr(0700, %{postfix_user}, root) %{postfix_queue_dir}/private
 %dir %attr(0710, %{postfix_user}, %{maildrop_group}) %{postfix_queue_dir}/public
+%dir %attr(0700, %{postfix_user}, root) %{postfix_data_dir}
 
 %attr(0644, root, root) %{_mandir}/man1/[a-n]*
 %attr(0644, root, root) %{_mandir}/man1/post*
@@ -444,7 +456,7 @@
 %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/header_checks
 %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/main.cf
 %attr(0644, root, root) %{postfix_config_dir}/main.cf.default
-%attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/makedefs.out
+%attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/makedefs.out-*
 %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/master.cf
 %attr(0755, root, root) %{postfix_config_dir}/post-install
 %attr(0644, root, root) %{postfix_config_dir}/postfix-files
@@ -468,9 +480,40 @@
 
 
 %changelog
-* Thu Aug 14 2008 Thomas Woerner <twoerner at redhat.com> 2:2.4.5-3
+* Wed Sep 17 2008 Thomas Woerner <twoerner at redhat.com> 2:2.5.5-1
+- new version 2.5.5
+  fixes CVE-2008-2936, CVE-2008-2937 and CVE-2008-3889 (rhbz#459101)
+
+* Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2:2.5.1-4
+- fix license tag
+
+* Thu Aug 14 2008 Thomas Woerner <twoerner at redhat.com> 2:2.5.1-3
 - fixed postfix privilege problem with symlinks in the mail spool directory
-  (CVE-2008-2936) (rhbz#459099)
+  (CVE-2008-2936) (rhbz#459101)
+
+* Wed Mar 12 2008 Thomas Woerner <twoerner at redhat.com> 2:2.5.1-2
+- fixed fix for enabling IPv6 support (rhbz#437024)
+- added new postfix data directory (rhbz#437042)
+
+* Thu Feb 21 2008 Thomas Woerner <twoerner at redhat.com> 2:2.5.1-1
+- new verison 2.5.1
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2:2.4.6-3
+- Autorebuild for GCC 4.3
+
+* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 2.4.6-2
+- Rebuild for deps
+
+* Wed Nov 28 2007 Thomas Woerner <twoerner at redhat.com> 2:2.4.6-1
+- new verison 2.4.6
+- added virtual server(smtp) provide (rhbz#380631)
+- enabling IPv6 support (rhbz#197105)
+- made the MYSQL and PGSQL defines overloadable as build argument
+
+* Wed Nov  7 2007 Thomas Woerner <twoerner at redhat.com> 2:2.4.5-3
+- fixed multilib conflict for makedefs.out: rename to makedefs.out-%{_arch}
+  (rhbz#342941)
+- enabled mysql support
 
 * Thu Oct  4 2007 Thomas Woerner <twoerner at redhat.com> 2:2.4.5-2
 - made init script lsb conform (#243286, rhbz#247025)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-8/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	13 Aug 2007 16:54:24 -0000	1.26
+++ sources	30 Sep 2008 14:24:39 -0000	1.27
@@ -1,2 +1,2 @@
 1f78fcaf2a36ec3520ecff286a45251a  pflogsumm-1.1.0.tar.gz
-ceba0cde05d12baa0ba2ed69fbb96b42  postfix-2.4.5.tar.gz
+6b4b848bdd2239dddfc9d385e57e19ef  postfix-2.5.5.tar.gz


--- postfix-CVE-2008-2936.patch DELETED ---



From ausil at fedoraproject.org  Tue Sep 30 14:30:46 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 30 Sep 2008 14:30:46 +0000 (UTC)
Subject: rpms/coolkey/F-9 coolkey.spec,1.27,1.28
Message-ID: <20080930143046.19C9F70119@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/coolkey/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30837

Modified Files:
	coolkey.spec 
Log Message:
BR nss-devel not mozilla-nss-devel



Index: coolkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coolkey/F-9/coolkey.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- coolkey.spec	14 Feb 2008 23:51:04 -0000	1.27
+++ coolkey.spec	30 Sep 2008 14:30:15 -0000	1.28
@@ -22,7 +22,7 @@
 
 Name: coolkey
 Version: 1.1.0
-Release: 6%{dist}
+Release: 7%{dist}
 Summary: CoolKey PKCS #11 module
 License: LGPLv2
 URL: http://directory.fedora.redhat.com/wiki/CoolKey
@@ -34,7 +34,7 @@
 BuildRequires: autoconf
 BuildRequires: pcsc-lite-devel
 BuildRequires: zlib-devel
-BuildRequires: mozilla-nss-devel
+BuildRequires: nss-devel
 Requires: nss-tools
 Requires: pcsc-lite 
 Requires: pcsc-lite-libs
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Sun Sep 14 2008 Matt Domsch <mdomsch at fedoraproject.org> - 1.1.0-7
+- BR: nss-devel not mozilla-nss-devel (FTBFS BZ#440753)
+
 * Wed Feb 13 2008 Jack magne <jmagne at redhat.com>  - 1.1.0-6
 - Clean up building with gcc 4.3.
 * Thu Sep 27 2007 Jack Magne <jmagne at redhat.com>  - 1.1.0-5



From twoerner at fedoraproject.org  Tue Sep 30 14:32:03 2008
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Tue, 30 Sep 2008 14:32:03 +0000 (UTC)
Subject: rpms/postfix/F-9 postfix-2.1.1-config.patch, 1.1,
	1.2 postfix-2.4.5-open_define.patch, 1.1, 1.2
Message-ID: <20080930143203.C2A2E70119@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/postfix/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31000

Modified Files:
	postfix-2.1.1-config.patch postfix-2.4.5-open_define.patch 
Log Message:
- added latest patch versions


postfix-2.1.1-config.patch:

Index: postfix-2.1.1-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-9/postfix-2.1.1-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postfix-2.1.1-config.patch	9 Sep 2004 10:41:00 -0000	1.1
+++ postfix-2.1.1-config.patch	30 Sep 2008 14:31:33 -0000	1.2
@@ -1,6 +1,7 @@
---- postfix-2.1.1/conf/main.cf.config	2004-04-15 15:27:21.000000000 +0200
-+++ postfix-2.1.1/conf/main.cf	2004-05-24 17:48:09.621348587 +0200
-@@ -106,6 +106,7 @@
+diff -up postfix-2.5.1/conf/main.cf.config postfix-2.5.1/conf/main.cf
+--- postfix-2.5.1/conf/main.cf.config	2007-12-18 08:50:25.000000000 -0500
++++ postfix-2.5.1/conf/main.cf	2008-08-28 17:22:21.000000000 -0400
+@@ -113,6 +113,7 @@ mail_owner = postfix
  #inet_interfaces = all
  #inet_interfaces = $myhostname
  #inet_interfaces = $myhostname, localhost
@@ -8,7 +9,7 @@
  
  # The proxy_interfaces parameter specifies the network interface
  # addresses that this mail system receives mail on by way of a
-@@ -150,7 +151,7 @@
+@@ -157,7 +158,7 @@ mail_owner = postfix
  #
  # See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS".
  #
@@ -17,7 +18,7 @@
  #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain
  #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain,
  #	mail.$mydomain, www.$mydomain, ftp.$mydomain
-@@ -372,7 +373,7 @@
+@@ -379,7 +380,7 @@ unknown_local_recipient_reject_code = 55
  # "postfix reload" to eliminate the delay.
  #
  #alias_maps = dbm:/etc/aliases
@@ -26,9 +27,10 @@
  #alias_maps = hash:/etc/aliases, nis:mail.aliases
  #alias_maps = netinfo:/aliases
  
---- postfix-2.1.1/conf/postfix-files.config	2004-05-24 17:29:30.002936514 +0200
-+++ postfix-2.1.1/conf/postfix-files	2004-05-24 17:50:24.548253843 +0200
-@@ -118,8 +118,8 @@
+diff -up postfix-2.5.1/conf/postfix-files.config postfix-2.5.1/conf/postfix-files
+--- postfix-2.5.1/conf/postfix-files.config	2008-01-23 19:13:49.000000000 -0500
++++ postfix-2.5.1/conf/postfix-files	2008-08-28 17:24:37.000000000 -0400
+@@ -128,8 +128,8 @@ $config_directory/postfix-script:f:root:
  $config_directory/postfix-script-sgid:f:root:-:755:o
  $config_directory/postfix-script-nosgid:f:root:-:755:o
  $config_directory/post-install:f:root:-:755
@@ -39,7 +41,7 @@
  $manpage_directory/man1/postalias.1:f:root:-:644
  $manpage_directory/man1/postcat.1:f:root:-:644
  $manpage_directory/man1/postconf.1:f:root:-:644
-@@ -131,9 +131,9 @@
+@@ -141,9 +141,9 @@ $manpage_directory/man1/postlog.1:f:root
  $manpage_directory/man1/postmap.1:f:root:-:644
  $manpage_directory/man1/postqueue.1:f:root:-:644
  $manpage_directory/man1/postsuper.1:f:root:-:644
@@ -49,5 +51,5 @@
 -$manpage_directory/man5/aliases.5:f:root:-:644
 +$manpage_directory/man5/aliases.postfix.5:f:root:-:644
  $manpage_directory/man5/body_checks.5:f:root:-:644
+ $manpage_directory/man5/bounce.5:f:root:-:644
  $manpage_directory/man5/canonical.5:f:root:-:644
- $manpage_directory/man5/cidr_table.5:f:root:-:644

postfix-2.4.5-open_define.patch:

Index: postfix-2.4.5-open_define.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-9/postfix-2.4.5-open_define.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postfix-2.4.5-open_define.patch	13 Aug 2007 16:54:24 -0000	1.1
+++ postfix-2.4.5-open_define.patch	30 Sep 2008 14:31:33 -0000	1.2
@@ -1,7 +1,57 @@
-diff -up postfix-2.4.5/src/util/dict_open.c.open_define postfix-2.4.5/src/util/dict_open.c
---- postfix-2.4.5/src/util/dict_open.c.open_define	2006-06-26 14:59:19.000000000 +0200
-+++ postfix-2.4.5/src/util/dict_open.c	2007-08-13 18:46:18.000000000 +0200
-@@ -302,7 +302,7 @@ DICT   *dict_open3(const char *dict_type
+diff -up postfix-2.5.1/src/global/mail_dict.c.open_define postfix-2.5.1/src/global/mail_dict.c
+--- postfix-2.5.1/src/global/mail_dict.c.open_define	2008-01-08 16:07:47.000000000 -0500
++++ postfix-2.5.1/src/global/mail_dict.c	2008-08-28 17:26:30.000000000 -0400
+@@ -64,5 +64,5 @@ void    mail_dict_init(void)
+     const DICT_OPEN_INFO *dp;
+ 
+     for (dp = dict_open_info; dp->type; dp++)
+-	dict_open_register(dp->type, dp->open);
++	dict_open_register(dp->type, (dp->open));
+ }
+diff -up postfix-2.5.1/src/global/mkmap_cdb.c.open_define postfix-2.5.1/src/global/mkmap_cdb.c
+--- postfix-2.5.1/src/global/mkmap_cdb.c.open_define	2004-12-08 18:58:05.000000000 -0500
++++ postfix-2.5.1/src/global/mkmap_cdb.c	2008-08-28 17:25:23.000000000 -0400
+@@ -56,7 +56,7 @@
+ MKMAP *mkmap_cdb_open(const char *unused_path)
+ {
+     MKMAP  *mkmap = (MKMAP *) mymalloc(sizeof(*mkmap));
+-    mkmap->open = dict_cdb_open;
++    (mkmap->open) = dict_cdb_open;
+     mkmap->after_open = 0;
+     mkmap->after_close = 0;
+     return (mkmap);
+diff -up postfix-2.5.1/src/global/mkmap_open.c.open_define postfix-2.5.1/src/global/mkmap_open.c
+--- postfix-2.5.1/src/global/mkmap_open.c.open_define	2008-01-08 17:08:45.000000000 -0500
++++ postfix-2.5.1/src/global/mkmap_open.c	2008-08-28 17:25:23.000000000 -0400
+@@ -181,7 +181,7 @@ MKMAP  *mkmap_open(const char *type, con
+      * Truncate the database upon open, and update it. Read-write mode is
+      * needed because the underlying routines read as well as write.
+      */
+-    mkmap->dict = mkmap->open(path, open_flags, dict_flags);
++    mkmap->dict = (mkmap->open)(path, open_flags, dict_flags);
+     mkmap->dict->lock_fd = -1;			/* XXX just in case */
+     mkmap->dict->stat_fd = -1;			/* XXX just in case */
+     mkmap->dict->flags |= DICT_FLAG_DUP_WARN;
+diff -up postfix-2.5.1/src/util/dict_db.c.open_define postfix-2.5.1/src/util/dict_db.c
+--- postfix-2.5.1/src/util/dict_db.c.open_define	2007-01-04 09:06:07.000000000 -0500
++++ postfix-2.5.1/src/util/dict_db.c	2008-08-28 17:25:23.000000000 -0400
+@@ -665,10 +665,10 @@ static DICT *dict_db_open(const char *cl
+     if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0)
+ 	msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM);
+ #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
+-    if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0)
++    if ((errno = (db->open)(db, 0, db_path, 0, type, db_flags, 0644)) != 0)
+ 	msg_fatal("open database %s: %m", db_path);
+ #elif (DB_VERSION_MAJOR == 3 || DB_VERSION_MAJOR == 4)
+-    if ((errno = db->open(db, db_path, 0, type, db_flags, 0644)) != 0)
++    if ((errno = (db->open)(db, db_path, 0, type, db_flags, 0644)) != 0)
+ 	msg_fatal("open database %s: %m", db_path);
+ #else
+ #error "Unsupported Berkeley DB version"
+diff -up postfix-2.5.1/src/util/dict_open.c.open_define postfix-2.5.1/src/util/dict_open.c
+--- postfix-2.5.1/src/util/dict_open.c.open_define	2008-01-08 16:05:20.000000000 -0500
++++ postfix-2.5.1/src/util/dict_open.c	2008-08-28 17:25:23.000000000 -0400
+@@ -305,7 +305,7 @@ DICT   *dict_open3(const char *dict_type
  	dict_open_init();
      if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0)
  	msg_fatal("unsupported dictionary type: %s", dict_type);
@@ -10,7 +60,7 @@
  	msg_fatal("opening %s:%s %m", dict_type, dict_name);
      if (msg_verbose)
  	msg_info("%s: %s:%s", myname, dict_type, dict_name);
-@@ -323,7 +323,7 @@ void    dict_open_register(const char *t
+@@ -326,7 +326,7 @@ void    dict_open_register(const char *t
  	msg_panic("%s: dictionary type exists: %s", myname, type);
      dp = (DICT_OPEN_INFO *) mymalloc(sizeof(*dp));
      dp->type = mystrdup(type);
@@ -19,53 +69,3 @@
      htable_enter(dict_open_hash, dp->type, (char *) dp);
  }
  
-diff -up postfix-2.4.5/src/util/dict_db.c.open_define postfix-2.4.5/src/util/dict_db.c
---- postfix-2.4.5/src/util/dict_db.c.open_define	2007-01-04 15:06:07.000000000 +0100
-+++ postfix-2.4.5/src/util/dict_db.c	2007-08-13 18:46:18.000000000 +0200
-@@ -665,10 +665,10 @@ static DICT *dict_db_open(const char *cl
-     if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0)
- 	msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM);
- #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
--    if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0)
-+    if ((errno = (db->open)(db, 0, db_path, 0, type, db_flags, 0644)) != 0)
- 	msg_fatal("open database %s: %m", db_path);
- #elif (DB_VERSION_MAJOR == 3 || DB_VERSION_MAJOR == 4)
--    if ((errno = db->open(db, db_path, 0, type, db_flags, 0644)) != 0)
-+    if ((errno = (db->open)(db, db_path, 0, type, db_flags, 0644)) != 0)
- 	msg_fatal("open database %s: %m", db_path);
- #else
- #error "Unsupported Berkeley DB version"
-diff -up postfix-2.4.5/src/global/mkmap_open.c.open_define postfix-2.4.5/src/global/mkmap_open.c
---- postfix-2.4.5/src/global/mkmap_open.c.open_define	2004-12-15 01:24:22.000000000 +0100
-+++ postfix-2.4.5/src/global/mkmap_open.c	2007-08-13 18:46:18.000000000 +0200
-@@ -177,7 +177,7 @@ MKMAP  *mkmap_open(const char *type, con
-      * Truncate the database upon open, and update it. Read-write mode is
-      * needed because the underlying routines read as well as write.
-      */
--    mkmap->dict = mkmap->open(path, open_flags, dict_flags);
-+    mkmap->dict = (mkmap->open)(path, open_flags, dict_flags);
-     mkmap->dict->lock_fd = -1;			/* XXX just in case */
-     mkmap->dict->stat_fd = -1;			/* XXX just in case */
-     mkmap->dict->flags |= DICT_FLAG_DUP_WARN;
-diff -up postfix-2.4.5/src/global/mkmap_cdb.c.open_define postfix-2.4.5/src/global/mkmap_cdb.c
---- postfix-2.4.5/src/global/mkmap_cdb.c.open_define	2004-12-09 00:58:05.000000000 +0100
-+++ postfix-2.4.5/src/global/mkmap_cdb.c	2007-08-13 18:46:18.000000000 +0200
-@@ -56,7 +56,7 @@
- MKMAP *mkmap_cdb_open(const char *unused_path)
- {
-     MKMAP  *mkmap = (MKMAP *) mymalloc(sizeof(*mkmap));
--    mkmap->open = dict_cdb_open;
-+    (mkmap->open) = dict_cdb_open;
-     mkmap->after_open = 0;
-     mkmap->after_close = 0;
-     return (mkmap);
-diff -up postfix-2.4.5/src/global/mail_dict.c.open_define postfix-2.4.5/src/global/mail_dict.c
---- postfix-2.4.5/src/global/mail_dict.c.open_define	2004-01-04 19:53:27.000000000 +0100
-+++ postfix-2.4.5/src/global/mail_dict.c	2007-08-13 18:46:18.000000000 +0200
-@@ -64,5 +64,5 @@ void    mail_dict_init(void)
-     DICT_OPEN_INFO *dp;
- 
-     for (dp = dict_open_info; dp->type; dp++)
--	dict_open_register(dp->type, dp->open);
-+      dict_open_register(dp->type, (dp->open));
- }



From twoerner at fedoraproject.org  Tue Sep 30 14:35:36 2008
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Tue, 30 Sep 2008 14:35:36 +0000 (UTC)
Subject: rpms/postfix/F-8 postfix-2.1.1-config.patch, 1.1,
	1.2 postfix-2.4.5-open_define.patch, 1.1, 1.2
Message-ID: <20080930143536.CF86470119@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/postfix/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31241

Modified Files:
	postfix-2.1.1-config.patch postfix-2.4.5-open_define.patch 
Log Message:
- added latest patch versions


postfix-2.1.1-config.patch:

Index: postfix-2.1.1-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-8/postfix-2.1.1-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postfix-2.1.1-config.patch	9 Sep 2004 10:41:00 -0000	1.1
+++ postfix-2.1.1-config.patch	30 Sep 2008 14:35:06 -0000	1.2
@@ -1,6 +1,7 @@
---- postfix-2.1.1/conf/main.cf.config	2004-04-15 15:27:21.000000000 +0200
-+++ postfix-2.1.1/conf/main.cf	2004-05-24 17:48:09.621348587 +0200
-@@ -106,6 +106,7 @@
+diff -up postfix-2.5.1/conf/main.cf.config postfix-2.5.1/conf/main.cf
+--- postfix-2.5.1/conf/main.cf.config	2007-12-18 08:50:25.000000000 -0500
++++ postfix-2.5.1/conf/main.cf	2008-08-28 17:22:21.000000000 -0400
+@@ -113,6 +113,7 @@ mail_owner = postfix
  #inet_interfaces = all
  #inet_interfaces = $myhostname
  #inet_interfaces = $myhostname, localhost
@@ -8,7 +9,7 @@
  
  # The proxy_interfaces parameter specifies the network interface
  # addresses that this mail system receives mail on by way of a
-@@ -150,7 +151,7 @@
+@@ -157,7 +158,7 @@ mail_owner = postfix
  #
  # See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS".
  #
@@ -17,7 +18,7 @@
  #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain
  #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain,
  #	mail.$mydomain, www.$mydomain, ftp.$mydomain
-@@ -372,7 +373,7 @@
+@@ -379,7 +380,7 @@ unknown_local_recipient_reject_code = 55
  # "postfix reload" to eliminate the delay.
  #
  #alias_maps = dbm:/etc/aliases
@@ -26,9 +27,10 @@
  #alias_maps = hash:/etc/aliases, nis:mail.aliases
  #alias_maps = netinfo:/aliases
  
---- postfix-2.1.1/conf/postfix-files.config	2004-05-24 17:29:30.002936514 +0200
-+++ postfix-2.1.1/conf/postfix-files	2004-05-24 17:50:24.548253843 +0200
-@@ -118,8 +118,8 @@
+diff -up postfix-2.5.1/conf/postfix-files.config postfix-2.5.1/conf/postfix-files
+--- postfix-2.5.1/conf/postfix-files.config	2008-01-23 19:13:49.000000000 -0500
++++ postfix-2.5.1/conf/postfix-files	2008-08-28 17:24:37.000000000 -0400
+@@ -128,8 +128,8 @@ $config_directory/postfix-script:f:root:
  $config_directory/postfix-script-sgid:f:root:-:755:o
  $config_directory/postfix-script-nosgid:f:root:-:755:o
  $config_directory/post-install:f:root:-:755
@@ -39,7 +41,7 @@
  $manpage_directory/man1/postalias.1:f:root:-:644
  $manpage_directory/man1/postcat.1:f:root:-:644
  $manpage_directory/man1/postconf.1:f:root:-:644
-@@ -131,9 +131,9 @@
+@@ -141,9 +141,9 @@ $manpage_directory/man1/postlog.1:f:root
  $manpage_directory/man1/postmap.1:f:root:-:644
  $manpage_directory/man1/postqueue.1:f:root:-:644
  $manpage_directory/man1/postsuper.1:f:root:-:644
@@ -49,5 +51,5 @@
 -$manpage_directory/man5/aliases.5:f:root:-:644
 +$manpage_directory/man5/aliases.postfix.5:f:root:-:644
  $manpage_directory/man5/body_checks.5:f:root:-:644
+ $manpage_directory/man5/bounce.5:f:root:-:644
  $manpage_directory/man5/canonical.5:f:root:-:644
- $manpage_directory/man5/cidr_table.5:f:root:-:644

postfix-2.4.5-open_define.patch:

Index: postfix-2.4.5-open_define.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-8/postfix-2.4.5-open_define.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postfix-2.4.5-open_define.patch	13 Aug 2007 16:54:24 -0000	1.1
+++ postfix-2.4.5-open_define.patch	30 Sep 2008 14:35:06 -0000	1.2
@@ -1,7 +1,57 @@
-diff -up postfix-2.4.5/src/util/dict_open.c.open_define postfix-2.4.5/src/util/dict_open.c
---- postfix-2.4.5/src/util/dict_open.c.open_define	2006-06-26 14:59:19.000000000 +0200
-+++ postfix-2.4.5/src/util/dict_open.c	2007-08-13 18:46:18.000000000 +0200
-@@ -302,7 +302,7 @@ DICT   *dict_open3(const char *dict_type
+diff -up postfix-2.5.1/src/global/mail_dict.c.open_define postfix-2.5.1/src/global/mail_dict.c
+--- postfix-2.5.1/src/global/mail_dict.c.open_define	2008-01-08 16:07:47.000000000 -0500
++++ postfix-2.5.1/src/global/mail_dict.c	2008-08-28 17:26:30.000000000 -0400
+@@ -64,5 +64,5 @@ void    mail_dict_init(void)
+     const DICT_OPEN_INFO *dp;
+ 
+     for (dp = dict_open_info; dp->type; dp++)
+-	dict_open_register(dp->type, dp->open);
++	dict_open_register(dp->type, (dp->open));
+ }
+diff -up postfix-2.5.1/src/global/mkmap_cdb.c.open_define postfix-2.5.1/src/global/mkmap_cdb.c
+--- postfix-2.5.1/src/global/mkmap_cdb.c.open_define	2004-12-08 18:58:05.000000000 -0500
++++ postfix-2.5.1/src/global/mkmap_cdb.c	2008-08-28 17:25:23.000000000 -0400
+@@ -56,7 +56,7 @@
+ MKMAP *mkmap_cdb_open(const char *unused_path)
+ {
+     MKMAP  *mkmap = (MKMAP *) mymalloc(sizeof(*mkmap));
+-    mkmap->open = dict_cdb_open;
++    (mkmap->open) = dict_cdb_open;
+     mkmap->after_open = 0;
+     mkmap->after_close = 0;
+     return (mkmap);
+diff -up postfix-2.5.1/src/global/mkmap_open.c.open_define postfix-2.5.1/src/global/mkmap_open.c
+--- postfix-2.5.1/src/global/mkmap_open.c.open_define	2008-01-08 17:08:45.000000000 -0500
++++ postfix-2.5.1/src/global/mkmap_open.c	2008-08-28 17:25:23.000000000 -0400
+@@ -181,7 +181,7 @@ MKMAP  *mkmap_open(const char *type, con
+      * Truncate the database upon open, and update it. Read-write mode is
+      * needed because the underlying routines read as well as write.
+      */
+-    mkmap->dict = mkmap->open(path, open_flags, dict_flags);
++    mkmap->dict = (mkmap->open)(path, open_flags, dict_flags);
+     mkmap->dict->lock_fd = -1;			/* XXX just in case */
+     mkmap->dict->stat_fd = -1;			/* XXX just in case */
+     mkmap->dict->flags |= DICT_FLAG_DUP_WARN;
+diff -up postfix-2.5.1/src/util/dict_db.c.open_define postfix-2.5.1/src/util/dict_db.c
+--- postfix-2.5.1/src/util/dict_db.c.open_define	2007-01-04 09:06:07.000000000 -0500
++++ postfix-2.5.1/src/util/dict_db.c	2008-08-28 17:25:23.000000000 -0400
+@@ -665,10 +665,10 @@ static DICT *dict_db_open(const char *cl
+     if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0)
+ 	msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM);
+ #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
+-    if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0)
++    if ((errno = (db->open)(db, 0, db_path, 0, type, db_flags, 0644)) != 0)
+ 	msg_fatal("open database %s: %m", db_path);
+ #elif (DB_VERSION_MAJOR == 3 || DB_VERSION_MAJOR == 4)
+-    if ((errno = db->open(db, db_path, 0, type, db_flags, 0644)) != 0)
++    if ((errno = (db->open)(db, db_path, 0, type, db_flags, 0644)) != 0)
+ 	msg_fatal("open database %s: %m", db_path);
+ #else
+ #error "Unsupported Berkeley DB version"
+diff -up postfix-2.5.1/src/util/dict_open.c.open_define postfix-2.5.1/src/util/dict_open.c
+--- postfix-2.5.1/src/util/dict_open.c.open_define	2008-01-08 16:05:20.000000000 -0500
++++ postfix-2.5.1/src/util/dict_open.c	2008-08-28 17:25:23.000000000 -0400
+@@ -305,7 +305,7 @@ DICT   *dict_open3(const char *dict_type
  	dict_open_init();
      if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0)
  	msg_fatal("unsupported dictionary type: %s", dict_type);
@@ -10,7 +60,7 @@
  	msg_fatal("opening %s:%s %m", dict_type, dict_name);
      if (msg_verbose)
  	msg_info("%s: %s:%s", myname, dict_type, dict_name);
-@@ -323,7 +323,7 @@ void    dict_open_register(const char *t
+@@ -326,7 +326,7 @@ void    dict_open_register(const char *t
  	msg_panic("%s: dictionary type exists: %s", myname, type);
      dp = (DICT_OPEN_INFO *) mymalloc(sizeof(*dp));
      dp->type = mystrdup(type);
@@ -19,53 +69,3 @@
      htable_enter(dict_open_hash, dp->type, (char *) dp);
  }
  
-diff -up postfix-2.4.5/src/util/dict_db.c.open_define postfix-2.4.5/src/util/dict_db.c
---- postfix-2.4.5/src/util/dict_db.c.open_define	2007-01-04 15:06:07.000000000 +0100
-+++ postfix-2.4.5/src/util/dict_db.c	2007-08-13 18:46:18.000000000 +0200
-@@ -665,10 +665,10 @@ static DICT *dict_db_open(const char *cl
-     if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0)
- 	msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM);
- #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
--    if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0)
-+    if ((errno = (db->open)(db, 0, db_path, 0, type, db_flags, 0644)) != 0)
- 	msg_fatal("open database %s: %m", db_path);
- #elif (DB_VERSION_MAJOR == 3 || DB_VERSION_MAJOR == 4)
--    if ((errno = db->open(db, db_path, 0, type, db_flags, 0644)) != 0)
-+    if ((errno = (db->open)(db, db_path, 0, type, db_flags, 0644)) != 0)
- 	msg_fatal("open database %s: %m", db_path);
- #else
- #error "Unsupported Berkeley DB version"
-diff -up postfix-2.4.5/src/global/mkmap_open.c.open_define postfix-2.4.5/src/global/mkmap_open.c
---- postfix-2.4.5/src/global/mkmap_open.c.open_define	2004-12-15 01:24:22.000000000 +0100
-+++ postfix-2.4.5/src/global/mkmap_open.c	2007-08-13 18:46:18.000000000 +0200
-@@ -177,7 +177,7 @@ MKMAP  *mkmap_open(const char *type, con
-      * Truncate the database upon open, and update it. Read-write mode is
-      * needed because the underlying routines read as well as write.
-      */
--    mkmap->dict = mkmap->open(path, open_flags, dict_flags);
-+    mkmap->dict = (mkmap->open)(path, open_flags, dict_flags);
-     mkmap->dict->lock_fd = -1;			/* XXX just in case */
-     mkmap->dict->stat_fd = -1;			/* XXX just in case */
-     mkmap->dict->flags |= DICT_FLAG_DUP_WARN;
-diff -up postfix-2.4.5/src/global/mkmap_cdb.c.open_define postfix-2.4.5/src/global/mkmap_cdb.c
---- postfix-2.4.5/src/global/mkmap_cdb.c.open_define	2004-12-09 00:58:05.000000000 +0100
-+++ postfix-2.4.5/src/global/mkmap_cdb.c	2007-08-13 18:46:18.000000000 +0200
-@@ -56,7 +56,7 @@
- MKMAP *mkmap_cdb_open(const char *unused_path)
- {
-     MKMAP  *mkmap = (MKMAP *) mymalloc(sizeof(*mkmap));
--    mkmap->open = dict_cdb_open;
-+    (mkmap->open) = dict_cdb_open;
-     mkmap->after_open = 0;
-     mkmap->after_close = 0;
-     return (mkmap);
-diff -up postfix-2.4.5/src/global/mail_dict.c.open_define postfix-2.4.5/src/global/mail_dict.c
---- postfix-2.4.5/src/global/mail_dict.c.open_define	2004-01-04 19:53:27.000000000 +0100
-+++ postfix-2.4.5/src/global/mail_dict.c	2007-08-13 18:46:18.000000000 +0200
-@@ -64,5 +64,5 @@ void    mail_dict_init(void)
-     DICT_OPEN_INFO *dp;
- 
-     for (dp = dict_open_info; dp->type; dp++)
--	dict_open_register(dp->type, dp->open);
-+      dict_open_register(dp->type, (dp->open));
- }



From dwalsh at fedoraproject.org  Tue Sep 30 14:39:46 2008
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 30 Sep 2008 14:39:46 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20080710.patch, 1.49,
	1.50 selinux-policy.spec, 1.713, 1.714
Message-ID: <20080930143946.F0CC770119@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31866

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
* Mon Sep 29 2008 Dan Walsh <dwalsh at redhat.com> 3.5.9-2
- Change all user tmpfs_t files to be labeled user_tmpfs_t
- Allow radiusd to create sock_files


policy-20080710.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.49 -r 1.50 policy-20080710.patch
Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- policy-20080710.patch	26 Sep 2008 14:46:58 -0000	1.49
+++ policy-20080710.patch	30 Sep 2008 14:39:16 -0000	1.50
@@ -4417,8 +4417,8 @@
 +HOME_DIR/\.gstreamer-.*			gen_context(system_u:object_r:nsplugin_home_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.5.9/policy/modules/apps/nsplugin.if
 --- nsaserefpolicy/policy/modules/apps/nsplugin.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.9/policy/modules/apps/nsplugin.if	2008-09-25 08:33:18.000000000 -0400
-@@ -0,0 +1,293 @@
++++ serefpolicy-3.5.9/policy/modules/apps/nsplugin.if	2008-09-29 10:47:02.000000000 -0400
+@@ -0,0 +1,290 @@
 +
 +## <summary>policy for nsplugin</summary>
 +
@@ -4500,7 +4500,6 @@
 +		type nsplugin_home_t;
 +		type nsplugin_exec_t;
 +		type nsplugin_config_exec_t;
-+		type $1_tmpfs_t;
 +		type nsplugin_t;
 +		type nsplugin_config_t;
 +	')
@@ -4534,8 +4533,6 @@
 +	stream_connect_pattern(nsplugin_t, user_home_t, user_home_t, $2)
 +	gnome_stream_connect(nsplugin_t, $2)
 +
-+	allow nsplugin_t $1_tmpfs_t:file { read getattr };
-+
 +	userdom_use_user_terminals($1, nsplugin_t)
 +	userdom_use_user_terminals($1, nsplugin_config_t)
 +
@@ -4714,7 +4711,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.5.9/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.9/policy/modules/apps/nsplugin.te	2008-09-25 08:33:18.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/apps/nsplugin.te	2008-09-29 11:06:29.000000000 -0400
 @@ -0,0 +1,234 @@
 +
 +policy_module(nsplugin, 1.0.0)
@@ -4784,6 +4781,7 @@
 +manage_lnk_files_pattern(nsplugin_t, nsplugin_home_t, nsplugin_home_t)
 +userdom_user_home_dir_filetrans(user, nsplugin_t, nsplugin_home_t, {file dir})
 +unprivuser_dontaudit_write_home_content_files(nsplugin_t)
++userdom_manage_tmpfs(nsplugin_t)
 +
 +corecmd_exec_bin(nsplugin_t)
 +corecmd_exec_shell(nsplugin_t)
@@ -4814,7 +4812,6 @@
 +files_read_config_files(nsplugin_t)
 +
 +fs_list_inotifyfs(nsplugin_t)
-+fs_manage_tmpfs_files(nsplugin_t)
 +fs_getattr_tmpfs(nsplugin_t)
 +fs_getattr_xattr_fs(nsplugin_t)
 +
@@ -8796,7 +8793,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.if serefpolicy-3.5.9/policy/modules/roles/sysadm.if
 --- nsaserefpolicy/policy/modules/roles/sysadm.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.9/policy/modules/roles/sysadm.if	2008-09-25 08:33:18.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/roles/sysadm.if	2008-09-29 15:11:59.000000000 -0400
 @@ -334,10 +334,10 @@
  #
  interface(`sysadm_getattr_home_dirs',`
@@ -8929,7 +8926,7 @@
 -	dontaudit $1 sysadm_home_dir_t:dir search_dir_perms;
 -	dontaudit $1 sysadm_home_t:dir search_dir_perms;
 -	dontaudit $1 sysadm_home_t:file read_file_perms;
-+	dontaudit $1 admin_home_t:dir search_dir_perms;
++	dontaudit $1 admin_home_t:dir list_dir_perms;
 +	dontaudit $1 admin_home_t:file read_file_perms;
 +
  ')
@@ -12477,8 +12474,8 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-3.5.9/policy/modules/services/clamav.fc
 --- nsaserefpolicy/policy/modules/services/clamav.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.9/policy/modules/services/clamav.fc	2008-09-25 08:33:18.000000000 -0400
-@@ -1,20 +1,21 @@
++++ serefpolicy-3.5.9/policy/modules/services/clamav.fc	2008-09-29 13:12:08.000000000 -0400
+@@ -1,20 +1,22 @@
  /etc/clamav(/.*)?			gen_context(system_u:object_r:clamd_etc_t,s0)
 +/etc/rc\.d/init\.d/clamd-wrapper	--	gen_context(system_u:object_r:clamd_initrc_exec_t,s0)
  
@@ -12497,6 +12494,7 @@
 +/var/run/clamd.*			gen_context(system_u:object_r:clamd_var_run_t,s0)
  
  /var/lib/clamav(/.*)?			gen_context(system_u:object_r:clamd_var_lib_t,s0)
++/var/clamav(/.*)?			gen_context(system_u:object_r:clamd_var_lib_t,s0)
  
 -/var/log/clamav			-d	gen_context(system_u:object_r:clamd_var_log_t,s0)
 -/var/log/clamav/clamav.*	--	gen_context(system_u:object_r:clamd_var_log_t,s0)
@@ -13547,8 +13545,8 @@
 -') dnl end TODO
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.5.9/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.9/policy/modules/services/cups.fc	2008-09-25 08:33:18.000000000 -0400
-@@ -8,24 +8,31 @@
++++ serefpolicy-3.5.9/policy/modules/services/cups.fc	2008-09-30 10:27:16.000000000 -0400
+@@ -8,24 +8,33 @@
  /etc/cups/ppd/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/ppds\.dat	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/printers\.conf.* --	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
@@ -13556,6 +13554,8 @@
  /etc/cups/certs		-d	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/certs/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
 +/etc/rc\.d/init\.d/cups	--	gen_context(system_u:object_r:cupsd_initrc_exec_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)
  
@@ -13583,7 +13583,7 @@
  /usr/sbin/printconf-backend --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
  /usr/sbin/ptal-printd	--	gen_context(system_u:object_r:ptal_exec_t,s0)
  /usr/sbin/ptal-mlcd	--	gen_context(system_u:object_r:ptal_exec_t,s0)
-@@ -33,7 +40,7 @@
+@@ -33,7 +42,7 @@
  
  /usr/share/cups(/.*)?		gen_context(system_u:object_r:cupsd_etc_t,s0)
  /usr/share/foomatic/db/oldprinterids --	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
@@ -13592,7 +13592,7 @@
  
  /var/cache/alchemist/printconf.* gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /var/cache/foomatic(/.*)? 	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
-@@ -43,10 +50,20 @@
+@@ -43,10 +52,20 @@
  /var/lib/cups/certs/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  
  /var/log/cups(/.*)?		gen_context(system_u:object_r:cupsd_log_t,s0)
@@ -13744,18 +13744,21 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.5.9/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2008-09-03 07:59:15.000000000 -0400
-+++ serefpolicy-3.5.9/policy/modules/services/cups.te	2008-09-25 08:33:18.000000000 -0400
-@@ -20,6 +20,9 @@
++++ serefpolicy-3.5.9/policy/modules/services/cups.te	2008-09-29 14:52:28.000000000 -0400
+@@ -20,6 +20,12 @@
  type cupsd_etc_t;
  files_config_file(cupsd_etc_t)
  
 +type cupsd_initrc_exec_t;
 +init_script_file(cupsd_initrc_exec_t)
 +
++type cupsd_interface_t;
++files_type(cupsd_interface_t)
++
  type cupsd_rw_etc_t;
  files_config_file(cupsd_rw_etc_t)
  
-@@ -48,6 +51,10 @@
+@@ -48,6 +54,10 @@
  type hplip_t;
  type hplip_exec_t;
  init_daemon_domain(hplip_t, hplip_exec_t)
@@ -13766,7 +13769,7 @@
  
  type hplip_etc_t;
  files_config_file(hplip_etc_t)
-@@ -65,6 +72,16 @@
+@@ -65,6 +75,16 @@
  type ptal_var_run_t;
  files_pid_file(ptal_var_run_t)
  
@@ -13783,7 +13786,7 @@
  ifdef(`enable_mcs',`
  	init_ranged_daemon_domain(cupsd_t,cupsd_exec_t,s0 - mcs_systemhigh)
  ')
-@@ -79,13 +96,14 @@
+@@ -79,13 +99,14 @@
  #
  
  # /usr/lib/cups/backend/serial needs sys_admin(?!)
@@ -13801,7 +13804,17 @@
  allow cupsd_t self:tcp_socket create_stream_socket_perms;
  allow cupsd_t self:udp_socket create_socket_perms;
  allow cupsd_t self:appletalk_socket create_socket_perms;
-@@ -104,7 +122,7 @@
+@@ -97,6 +118,9 @@
+ read_lnk_files_pattern(cupsd_t, cupsd_etc_t, cupsd_etc_t)
+ files_search_etc(cupsd_t)
+ 
++manage_files_pattern(cupsd_t, cupsd_interface_t, cupsd_interface_t)
++can_exec(cupsd_t, cupsd_interface_t)
++
+ manage_dirs_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t)
+ manage_files_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t)
+ filetrans_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t, file)
+@@ -104,7 +128,7 @@
  
  # allow cups to execute its backend scripts
  can_exec(cupsd_t, cupsd_exec_t)
@@ -13810,7 +13823,7 @@
  allow cupsd_t cupsd_exec_t:lnk_file read;
[...1830 lines suppressed...]
  	gen_require(`
@@ -33663,7 +33752,25 @@
  ##	</p>
  ##	<p>
  ##	This is a templated interface, and should only
-@@ -4616,11 +4663,11 @@
+@@ -3211,13 +3255,13 @@
+ #
+ template(`userdom_rw_user_tmpfs_files',`
+ 	gen_require(`
+-		type $1_tmpfs_t;
++		type user_tmpfs_t;
+ 	')
+ 
+ 	fs_search_tmpfs($2)
+-	allow $2 $1_tmpfs_t:dir list_dir_perms;
+-	rw_files_pattern($2,$1_tmpfs_t,$1_tmpfs_t)
+-	read_lnk_files_pattern($2,$1_tmpfs_t,$1_tmpfs_t)
++	allow $2 user_tmpfs_t:dir list_dir_perms;
++	rw_files_pattern($2,user_tmpfs_t,user_tmpfs_t)
++	read_lnk_files_pattern($2,user_tmpfs_t,user_tmpfs_t)
+ ')
+ 
+ ########################################
+@@ -4616,11 +4660,11 @@
  #
  interface(`userdom_search_all_users_home_dirs',`
  	gen_require(`
@@ -33677,7 +33784,7 @@
  ')
  
  ########################################
-@@ -4640,6 +4687,14 @@
+@@ -4640,6 +4684,14 @@
  
  	files_list_home($1)
  	allow $1 home_dir_type:dir list_dir_perms;
@@ -33692,7 +33799,7 @@
  ')
  
  ########################################
-@@ -4677,6 +4732,8 @@
+@@ -4677,6 +4729,8 @@
  	')
  
  	dontaudit $1 { home_dir_type home_type }:dir search_dir_perms;
@@ -33701,7 +33808,7 @@
  ')
  
  ########################################
-@@ -4721,6 +4778,25 @@
+@@ -4721,6 +4775,25 @@
  
  ########################################
  ## <summary>
@@ -33727,7 +33834,7 @@
  ##	Create, read, write, and delete all files
  ##	in all users home directories.
  ## </summary>
-@@ -4946,7 +5022,7 @@
+@@ -4946,7 +5019,7 @@
  
  ########################################
  ## <summary>
@@ -33736,7 +33843,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -5318,7 +5394,7 @@
+@@ -5318,7 +5391,7 @@
  
  ########################################
  ## <summary>
@@ -33745,7 +33852,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -5326,18 +5402,17 @@
+@@ -5326,18 +5399,17 @@
  ##	</summary>
  ## </param>
  #
@@ -33768,7 +33875,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -5345,17 +5420,17 @@
+@@ -5345,17 +5417,17 @@
  ##	</summary>
  ## </param>
  #
@@ -33790,7 +33897,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -5363,18 +5438,18 @@
+@@ -5363,18 +5435,18 @@
  ##	</summary>
  ## </param>
  #
@@ -33814,7 +33921,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -5382,17 +5457,54 @@
+@@ -5382,17 +5454,54 @@
  ##	</summary>
  ## </param>
  #
@@ -33873,7 +33980,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -5483,6 +5595,42 @@
+@@ -5483,6 +5592,42 @@
  
  ########################################
  ## <summary>
@@ -33916,7 +34023,7 @@
  ##	Send a dbus message to all user domains.
  ## </summary>
  ## <param name="domain">
-@@ -5513,3 +5661,524 @@
+@@ -5513,3 +5658,548 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')
@@ -34250,13 +34357,13 @@
 +#
 +template(`userdom_read_user_tmpfs_files',`
 +	gen_require(`
-+		type $1_tmpfs_t;
++		type user_tmpfs_t;
 +	')
 +
 +	fs_search_tmpfs($2)
-+	allow $2 $1_tmpfs_t:dir list_dir_perms;
-+	read_files_pattern($2, $1_tmpfs_t, $1_tmpfs_t)
-+	read_lnk_files_pattern($2, $1_tmpfs_t, $1_tmpfs_t)
++	allow $2 user_tmpfs_t:dir list_dir_perms;
++	read_files_pattern($2, user_tmpfs_t, user_tmpfs_t)
++	read_lnk_files_pattern($2, user_tmpfs_t, user_tmpfs_t)
 +')
 +
 +#######################################
@@ -34441,9 +34548,33 @@
 +
 +	dontaudit $1 user_home_t:file unlink;
 +')
++
++#######################################
++## <summary>
++##	The template for creating a tmpfs type
++##	that the user has full access.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`userdom_manage_tmpfs',`
++	gen_require(`
++		type user_tmpfs_t;
++	')
++
++	manage_dirs_pattern($1, user_tmpfs_t, user_tmpfs_t)
++	manage_files_pattern($1, user_tmpfs_t, user_tmpfs_t)
++	manage_lnk_files_pattern($1, user_tmpfs_t, user_tmpfs_t)
++	manage_sock_files_pattern($1, user_tmpfs_t, user_tmpfs_t)
++	manage_fifo_files_pattern($1, user_tmpfs_t, user_tmpfs_t)
++	fs_tmpfs_filetrans($1, user_tmpfs_t, { dir file lnk_file sock_file fifo_file })
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.9/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.9/policy/modules/system/userdomain.te	2008-09-25 08:33:18.000000000 -0400
++++ serefpolicy-3.5.9/policy/modules/system/userdomain.te	2008-09-29 08:43:56.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -34485,7 +34616,7 @@
  # The privhome attribute identifies every domain that can create files under
  # regular user home directories in the regular context (IE act on behalf of
  # a user in writing regular files)
-@@ -81,6 +73,72 @@
+@@ -81,6 +73,76 @@
  
  # unprivileged user domains
  attribute unpriv_userdomain;
@@ -34521,6 +34652,10 @@
 +type user_tmp_t, user_file_type, user_tmpfile;
 +files_tmp_file(user_tmp_t)
 +
++type user_tmpfs_t, user_file_type;
++files_tmpfs_file(user_tmpfs_t)
++
++
 +##############################
 +#
 +# User home directory file rules


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.713
retrieving revision 1.714
diff -u -r1.713 -r1.714
--- selinux-policy.spec	25 Sep 2008 18:54:16 -0000	1.713
+++ selinux-policy.spec	30 Sep 2008 14:39:16 -0000	1.714
@@ -10,14 +10,14 @@
 %if %{?BUILD_MLS:0}%{!?BUILD_MLS:1}
 %define BUILD_MLS 1
 %endif
-%define POLICYVER 21
+%define POLICYVER 23
 %define libsepolver 2.0.20-1
 %define POLICYCOREUTILSVER 2.0.54-2
 %define CHECKPOLICYVER 2.0.16-1
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -40,8 +40,9 @@
 Url: http://serefpolicy.sourceforge.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-BuildRequires: python gawk checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCOREUTILSVER}
+BuildRequires: python gawk checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCOREUTILSVER} bzip2
 Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER} libsemanage >= 2.0.14-3
+Requires(post): /usr/bin/bunzip2
 Requires: checkpolicy >= %{CHECKPOLICYVER} m4 
 Obsoletes: selinux-policy-devel
 Provides: selinux-policy-devel
@@ -77,6 +78,9 @@
 %define moduleList() %([ -f %{_sourcedir}/modules-%{1}.conf ] && \
 awk '$1 !~ "/^#/" && $2 == "=" && $3 == "module" { printf "-i %%s.pp ", $1 }' %{_sourcedir}/modules-%{1}.conf )
 
+%define bzmoduleList() %([ -f %{_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} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 MLS_CATS=1024 MCS_CATS=1024 base.pp \
 make validate UNK_PERMS=%5 NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 MLS_CATS=1024 MCS_CATS=1024 modules \
@@ -96,12 +100,13 @@
 install -m0644 $RPM_SOURCE_DIR/securetty_types-%1 %{buildroot}%{_sysconfdir}/selinux/%1/contexts/securetty_types \
 install -m0644 $RPM_SOURCE_DIR/setrans-%1.conf %{buildroot}%{_sysconfdir}/selinux/%1/setrans.conf \
 echo -n > %{buildroot}%{_sysconfdir}/selinux/%1/contexts/customizable_types \
+bzip2 %{buildroot}/%{_usr}/share/selinux/%1/*.pp
 %nil
 
 %define fileList() \
 %defattr(-,root,root) \
 %dir %{_usr}/share/selinux/%1 \
-%{_usr}/share/selinux/%1/*.pp \
+%{_usr}/share/selinux/%1/*.pp.bz2 \
 %dir %{_sysconfdir}/selinux/%1 \
 %config(noreplace) %{_sysconfdir}/selinux/%1/setrans.conf \
 %ghost %{_sysconfdir}/selinux/%1/seusers \
@@ -144,9 +149,13 @@
 fi
 
 %define loadpolicy() \
-( cd /usr/share/selinux/%1; \
+tempdir=`mktemp -d /usr/share/selinux/%1/tmpXXXX`; \
+( cd $tempdir; \
+cp ../base.pp.bz2 %{expand:%%bzmoduleList %1} .; \
+bunzip2 *; \
 semodule -b base.pp %{expand:%%moduleList %1} -s %1; \
 ); \
+rm -rf $tempdir; \
 
 %define relabel() \
 . %{_sysconfdir}/selinux/config; \
@@ -381,6 +390,10 @@
 %endif
 
 %changelog
+* Mon Sep 29 2008 Dan Walsh <dwalsh at redhat.com> 3.5.9-2
+- Change all user tmpfs_t files to be labeled user_tmpfs_t
+- Allow radiusd to create sock_files
+
 * Wed Sep 24 2008 Dan Walsh <dwalsh at redhat.com> 3.5.9-1
 - Upgrade to upstream
 



From bagnara at fedoraproject.org  Tue Sep 30 14:41:11 2008
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Tue, 30 Sep 2008 14:41:11 +0000 (UTC)
Subject: rpms/ppl/devel ppl.spec,1.15,1.16
Message-ID: <20080930144111.456B670119@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32361

Modified Files:
	ppl.spec 
Log Message:
The `swiprolog' package now requires pl >= 5.6.57-2.



Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ppl.spec	8 Sep 2008 14:19:16 -0000	1.15
+++ ppl.spec	30 Sep 2008 14:40:41 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		ppl
 Version:	0.9
-Release:	24%{?dist}
+Release:	25%{?dist}
 
 Summary:	The Parma Polyhedra Library: a library of numerical abstractions
 Group:		Development/Libraries
@@ -88,7 +88,7 @@
 Summary:	The SWI-Prolog interface of the Parma Polyhedra Library
 Group:		Development/Libraries
 BuildRequires:	pl-devel >= 5.6.57-2
-Requires:	ppl = %{version}-%{release}, ppl-pwl = %{version}-%{release}, pl >= 5.6.0
+Requires:	ppl = %{version}-%{release}, ppl-pwl = %{version}-%{release}, pl >= 5.6.57-2
 %description swiprolog
 This package adds SWI-Prolog support to the Parma Polyhedra Library.
 Install this package if you want to use the library in SWI Prolog programs.
@@ -311,6 +311,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Tue Sep 30 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-25
+- The `swiprolog' package now requires pl >= 5.6.57-2.
+
 * Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-24
 - Changed ppl-0.9-swiprolog.patch so as to invoke `plld' with
   the `-v' option.



From sharkcz at fedoraproject.org  Tue Sep 30 14:49:00 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 30 Sep 2008 14:49:00 +0000 (UTC)
Subject: rpms/wxPython/devel .cvsignore, 1.13, 1.14 sources, 1.11,
	1.12 wxPython.spec, 1.28, 1.29
Message-ID: <20080930144900.C01437013E@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxPython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1316

Modified Files:
	.cvsignore sources wxPython.spec 
Log Message:
* Tue Sep 30 2008 Dan Horak <dan[at]danny.cz> - 2.8.9.1-1
- update to 2.8.9.1
- fix libdir for additional wx libraries (#306761)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	29 Sep 2008 06:54:26 -0000	1.13
+++ .cvsignore	30 Sep 2008 14:48:29 -0000	1.14
@@ -1 +1 @@
-wxPython-src-2.8.9.0.tar.bz2
+wxPython-src-2.8.9.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	29 Sep 2008 06:54:26 -0000	1.11
+++ sources	30 Sep 2008 14:48:29 -0000	1.12
@@ -1 +1 @@
-0e5f5a61c171e33c29de6582e422b481  wxPython-src-2.8.9.0.tar.bz2
+4ad9a64e05529097618c7e48fbb10a84  wxPython-src-2.8.9.1.tar.bz2


Index: wxPython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/devel/wxPython.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- wxPython.spec	29 Sep 2008 06:54:26 -0000	1.28
+++ wxPython.spec	30 Sep 2008 14:48:29 -0000	1.29
@@ -4,7 +4,7 @@
 %define buildflags WXPORT=gtk2 UNICODE=1
 
 Name:           wxPython
-Version:        2.8.9.0
+Version:        2.8.9.1
 Release:        1%{?dist}
 
 Summary:        GUI toolkit for the Python programming language
@@ -50,6 +50,9 @@
 %prep
 %setup -q -n wxPython-src-%{version}
 
+# fix libdir otherwise it additional wx libs cannot be found
+sed -i -e 's|/usr/lib|%{_libdir}|' wxPython/config.py
+
 
 %build
 # Just build the wxPython part, not all of wxWindows which we already have
@@ -101,6 +104,10 @@
 
 
 %changelog
+* Tue Sep 30 2008 Dan Horak <dan[at]danny.cz> - 2.8.9.1-1
+- update to 2.8.9.1
+- fix libdir for additional wx libraries (#306761)
+
 * Mon Sep 29 2008 Dan Horak <dan[at]danny.cz> - 2.8.9.0-1
 - update to 2.8.9.0
 



From spot at fedoraproject.org  Tue Sep 30 14:56:22 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 30 Sep 2008 14:56:22 +0000 (UTC)
Subject: rpms/dosfstools/devel .cvsignore, 1.6, 1.7 dosfstools.spec, 1.31,
	1.32 sources, 1.6, 1.7 dosfstools-2.11-assumeKernel26.patch, 1.1,
	NONE dosfstools-2.11-fortify.patch, 1.1,
	NONE dosfstools-2.11-label.patch, 1.1,
	NONE dosfstools-2.7-argfix.patch, 1.3, NONE
Message-ID: <20080930145622.A6E8A70119@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/dosfstools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2886

Modified Files:
	.cvsignore dosfstools.spec sources 
Removed Files:
	dosfstools-2.11-assumeKernel26.patch 
	dosfstools-2.11-fortify.patch dosfstools-2.11-label.patch 
	dosfstools-2.7-argfix.patch 
Log Message:
update to 3.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dosfstools/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Oct 2005 09:11:52 -0000	1.6
+++ .cvsignore	30 Sep 2008 14:55:52 -0000	1.7
@@ -1 +1 @@
-dosfstools-2.11.src.tar.gz
+dosfstools-3.0.0.tar.bz2


Index: dosfstools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dosfstools/devel/dosfstools.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- dosfstools.spec	16 Jul 2008 21:30:05 -0000	1.31
+++ dosfstools.spec	30 Sep 2008 14:55:52 -0000	1.32
@@ -1,15 +1,11 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux
-Version: 2.11
-Release: 10%{?dist}
-License: GPLv2+
+Version: 3.0.0
+Release: 1%{?dist}
+License: GPLv3+
 Group: Applications/System
-Source: ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-%{version}.src.tar.gz
-URL: ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools
-Patch1: dosfstools-2.7-argfix.patch
-Patch2: dosfstools-2.11-assumeKernel26.patch
-Patch4: dosfstools-2.11-fortify.patch
-Patch5: dosfstools-2.11-label.patch
+Source: 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
 Provides: mkdosfs-ygg = %{version}
@@ -21,45 +17,27 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .argfix
-%patch2 -p1 -b .assumeKernel26
-%patch4 -p1 -b .fortify
-%patch5 -p1 -b .label
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/sbin
-mkdir -p %{buildroot}/%{_mandir}/man8
-
-install -m755 mkdosfs/mkdosfs %{buildroot}/sbin/mkdosfs
-ln %{buildroot}/sbin/mkdosfs %{buildroot}/sbin/mkfs.vfat
-ln %{buildroot}/sbin/mkdosfs %{buildroot}/sbin/mkfs.msdos
-
-install -m755 dosfsck/dosfsck %{buildroot}/sbin/dosfsck
-ln %{buildroot}/sbin/dosfsck %{buildroot}/sbin/fsck.msdos
-ln %{buildroot}/sbin/dosfsck %{buildroot}/sbin/fsck.vfat
-
-install -m 644 mkdosfs/mkdosfs.8 %{buildroot}%{_mandir}/man8
-ln -sf mkdosfs.8.gz %{buildroot}%{_mandir}/man8/mkfs.msdos.8.gz
-ln -sf mkdosfs.8.gz %{buildroot}%{_mandir}/man8/mkfs.vfat.8.gz
-
-install -m 644 dosfsck/dosfsck.8 %{buildroot}%{_mandir}/man8
-ln -sf dosfsck.8.gz %{buildroot}%{_mandir}/man8/fsck.vfat.8.gz
-
-install -m755 dosfsck/dosfslabel %{buildroot}/sbin/dosfslabel
+make DESTDIR=%{buildroot} install PREFIX=%{_prefix} SBINDIR=/sbin
 
 %clean
 rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%doc %{_datadir}/doc/%{name}/
 /sbin/*
 %{_mandir}/man8/*
 
 %changelog
+* Tue Sep 30 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.0.0-1
+- update to 3.0.0
+
 * Wed Jul 16 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.11-10
 - fix license tag
 - fix patch to apply with fuzz=0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dosfstools/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Oct 2005 09:11:52 -0000	1.6
+++ sources	30 Sep 2008 14:55:52 -0000	1.7
@@ -1 +1 @@
-407d405ade410f7597d364ab5dc8c9f6  dosfstools-2.11.src.tar.gz
+659687063b60efa1bde1463eb2ffa695  dosfstools-3.0.0.tar.bz2


--- dosfstools-2.11-assumeKernel26.patch DELETED ---


--- dosfstools-2.11-fortify.patch DELETED ---


--- dosfstools-2.11-label.patch DELETED ---


--- dosfstools-2.7-argfix.patch DELETED ---



From sharkcz at fedoraproject.org  Tue Sep 30 14:57:56 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 30 Sep 2008 14:57:56 +0000 (UTC)
Subject: rpms/wxGTK/F-9 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 wxGTK.spec, 
	1.38, 1.39 wxGTK-2.8.7-race-fix.patch, 1.1, NONE
Message-ID: <20080930145756.A850670119@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxGTK/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3265

Modified Files:
	.cvsignore sources wxGTK.spec 
Removed Files:
	wxGTK-2.8.7-race-fix.patch 
Log Message:
* Mon Sep 22 2008 Dan Horak <dan[at]danny.cz> - 2.8.9-1
- update to 2.8.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	20 Feb 2008 21:39:03 -0000	1.9
+++ .cvsignore	30 Sep 2008 14:57:26 -0000	1.10
@@ -1 +1 @@
-wxGTK-2.8.7.tar.bz2
+wxGTK-2.8.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 Feb 2008 21:39:03 -0000	1.9
+++ sources	30 Sep 2008 14:57:26 -0000	1.10
@@ -1 +1 @@
-b25e85eeee524903214ebb520753f4bd  wxGTK-2.8.7.tar.bz2
+495c0287e102c8864eb5237a279ce9c2  wxGTK-2.8.9.tar.bz2


Index: wxGTK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/F-9/wxGTK.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- wxGTK.spec	1 Apr 2008 12:56:47 -0000	1.38
+++ wxGTK.spec	30 Sep 2008 14:57:26 -0000	1.39
@@ -5,17 +5,16 @@
 %define withodbc 0
 
 Name:           wxGTK
-Version:        2.8.7
-Release:        2%{?dist}
+Version:        2.8.9
+Release:        1%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
 # change to be "wxWidgets License" once that is approved by OSI.)
-License:        wxWidgets Library Licence
+License:        wxWidgets
 Group:          System Environment/Libraries
 URL:            http://www.wxwidgets.org/
 Source0:        http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
-Patch0:         wxGTK-2.8.7-race-fix.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -122,7 +121,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .racefix
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -264,6 +262,15 @@
 
 
 %changelog
+* Mon Sep 22 2008 Dan Horak <dan[at]danny.cz> - 2.8.9-1
+- update to 2.8.9
+
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.8-2
+- fix license tag
+
+* Thu Jul 31 2008 Dan Horak <dan[at]danny.cz> - 2.8.8-1
+- update to 2.8.8 (rh bug #457406)
+
 * Tue Apr  1 2008 Dan Horak <dan[at]danny.cz> - 2.8.7-2
 - added fix for a race condition (rh bug #440011)
 


--- wxGTK-2.8.7-race-fix.patch DELETED ---



From sharkcz at fedoraproject.org  Tue Sep 30 14:59:56 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 30 Sep 2008 14:59:56 +0000 (UTC)
Subject: rpms/wxGTK/F-8 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 wxGTK.spec, 
	1.36, 1.37 wxGTK-2.8.7-race-fix.patch, 1.1, NONE
Message-ID: <20080930145956.8041070119@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxGTK/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3678

Modified Files:
	.cvsignore sources wxGTK.spec 
Removed Files:
	wxGTK-2.8.7-race-fix.patch 
Log Message:
* Mon Sep 22 2008 Dan Horak <dan[at]danny.cz> - 2.8.9-1
- update to 2.8.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	1 Apr 2008 14:52:09 -0000	1.9
+++ .cvsignore	30 Sep 2008 14:59:26 -0000	1.10
@@ -1 +1 @@
-wxGTK-2.8.7.tar.bz2
+wxGTK-2.8.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	1 Apr 2008 14:52:09 -0000	1.9
+++ sources	30 Sep 2008 14:59:26 -0000	1.10
@@ -1 +1 @@
-b25e85eeee524903214ebb520753f4bd  wxGTK-2.8.7.tar.bz2
+495c0287e102c8864eb5237a279ce9c2  wxGTK-2.8.9.tar.bz2


Index: wxGTK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/F-8/wxGTK.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- wxGTK.spec	1 Apr 2008 14:52:09 -0000	1.36
+++ wxGTK.spec	30 Sep 2008 14:59:26 -0000	1.37
@@ -5,17 +5,16 @@
 %define withodbc 0
 
 Name:           wxGTK
-Version:        2.8.7
-Release:        2%{?dist}
+Version:        2.8.9
+Release:        1%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
 # change to be "wxWidgets License" once that is approved by OSI.)
-License:        wxWidgets Library Licence
+License:        wxWidgets
 Group:          System Environment/Libraries
 URL:            http://www.wxwidgets.org/
 Source0:        http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
-Patch0:         wxGTK-2.8.7-race-fix.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -122,7 +121,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .racefix
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -264,6 +262,15 @@
 
 
 %changelog
+* Mon Sep 22 2008 Dan Horak <dan[at]danny.cz> - 2.8.9-1
+- update to 2.8.9
+
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.8-2
+- fix license tag
+
+* Thu Jul 31 2008 Dan Horak <dan[at]danny.cz> - 2.8.8-1
+- update to 2.8.8 (rh bug #457406)
+
 * Tue Apr  1 2008 Dan Horak <dan[at]danny.cz> - 2.8.7-2
 - added fix for a race condition (rh bug #440011)
 


--- wxGTK-2.8.7-race-fix.patch DELETED ---



From than at fedoraproject.org  Tue Sep 30 15:03:22 2008
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 30 Sep 2008 15:03:22 +0000 (UTC)
Subject: rpms/phonon/devel phonon.spec,1.11,1.12
Message-ID: <20080930150322.E48B970119@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4246

Modified Files:
	phonon.spec 
Log Message:
- fix tranparent issue by convert



Index: phonon.spec
===================================================================
RCS file: /cvs/extras/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- phonon.spec	30 Sep 2008 14:05:11 -0000	1.11
+++ phonon.spec	30 Sep 2008 15:02:52 -0000	1.12
@@ -2,7 +2,7 @@
 Summary: Multimedia framework api
 Name:    phonon 
 Version: 4.2.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -79,7 +79,7 @@
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}-gstreamer.svg
 for i in 16 22 32 48 64 128; do
   mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
-  convert -geometry ${i}x${i}  %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}-gstreamer.png
+  convert -background None -geometry ${i}x${i}  %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}-gstreamer.png
 done
 
 
@@ -124,6 +124,9 @@
 
 
 %changelog
+* Tue Sep 30 2008 Than Ngo <than at redhat.com> 4.2.0-7
+- fix tranparent issue by convert
+
 * Tue Sep 30 2008 Than Ngo <than at redhat.com> 4.2.0-6
 - add missing icon
 



From than at fedoraproject.org  Tue Sep 30 15:06:19 2008
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 30 Sep 2008 15:06:19 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel .cvsignore, 1.21,
	1.22 kdebase-runtime.spec, 1.72, 1.73 sources, 1.21, 1.22
Message-ID: <20080930150619.92F5270119@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4813

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
add missing icons



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	26 Sep 2008 19:40:01 -0000	1.21
+++ .cvsignore	30 Sep 2008 15:05:49 -0000	1.22
@@ -1 +1,9 @@
 kdebase-runtime-4.1.2.tar.bz2
+audio-backend-arts.svgz
+audio-backend-esd.svgz
+audio-backend-jack.svgz
+audio-backend-pulseaudio.svgz
+audio-card-firewire.svgz
+audio-card-usb.svgz
+audio-headset-bluetooth.svgz
+audio-headset-usb.svgz


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- kdebase-runtime.spec	29 Sep 2008 15:24:45 -0000	1.72
+++ kdebase-runtime.spec	30 Sep 2008 15:05:49 -0000	1.73
@@ -10,13 +10,22 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
 Version:       4.1.2
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
 Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
 Source1:       khelpcenter.desktop
+# http://websvn.kde.org/trunk/playground/artwork/Oxygen/phonon/
+Source2:       audio-backend-arts.svgz
+Source3:       audio-backend-esd.svgz
+Source4:       audio-backend-jack.svgz
+Source5:       audio-backend-pulseaudio.svgz
+Source6:       audio-card-firewire.svgz
+Source7:       audio-card-usb.svgz
+Source8:       audio-headset-bluetooth.svgz
+Source9:       audio-headset-usb.svgz
 Patch0:        kdebase-runtime-4.1.0-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.1.1-knetattach.patch
@@ -67,6 +76,7 @@
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: zlib-devel
+BuildRequires: ImageMagick
 
 %description
 Core runtime for the K Desktop Environment 4.
@@ -137,6 +147,18 @@
 
 %if 0%{?icons}
 make install DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen
+# install phone-xine icons
+for i in 16 22 32 48 64 128 ; do
+  install -m 0644 -D phonon/xine/ox$i-app-phonon-xine.png %{buildroot}%{_kde4_iconsdir}/oxygen/${i}x${i}/apps/phonon-xine.png
+done
+install -m 0644 -D phonon/xine/oxsc-app-phonon-xine.svgz %{buildroot}%{_kde4_iconsdir}/oxygen/scalable/apps/phonon-xine.svgz
+for j in %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} ; do
+  n=`basename $j`
+  for i in 16 22 32 48 64 128; do
+    convert -background None -geometry ${i}x${i} ${j} %{buildroot}%{_datadir}/icons/oxygen/${i}x${i}/apps/${n%.svgz}.png
+  done
+  install -m 0644 -D ${j} %{buildroot}%{_kde4_iconsdir}/oxygen/scalable/apps/${n}
+done
 %if ! 0%{?rest}
 ln -sf oxygen %{buildroot}%{_kde4_iconsdir}/default.kde4
 %endif
@@ -358,6 +380,9 @@
 
 
 %changelog
+* Tue Sep 30 2008 Than Ngo <than at redhat.com> 4.1.2-3
+- add missing icons
+
 * Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
 - make VERBOSE=1
 - respin against new(er) kde-filesystem


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	26 Sep 2008 19:40:01 -0000	1.21
+++ sources	30 Sep 2008 15:05:49 -0000	1.22
@@ -1 +1,9 @@
 1f17bdfa4bee4bf1c7afc2bd5bdbae59  kdebase-runtime-4.1.2.tar.bz2
+f976564b84c96c43ef7bbb42576ef7bf  audio-backend-arts.svgz
+1c229ebbf0d2063927175159329ba7b8  audio-backend-esd.svgz
+06617d979cc7fff9c25489233d786de5  audio-backend-jack.svgz
+0f9b16ddfbc760a82a2c51a2846c8894  audio-backend-pulseaudio.svgz
+556827fe755f3348f6b2227e29c687dc  audio-card-firewire.svgz
+1db9c22cb987582526b5b45423116f9b  audio-card-usb.svgz
+6fb861774412d3f63accf480980c0488  audio-headset-bluetooth.svgz
+b75bce5f507225e0760061a7276271a5  audio-headset-usb.svgz



From pjones at fedoraproject.org  Tue Sep 30 15:16:45 2008
From: pjones at fedoraproject.org (Peter Jones)
Date: Tue, 30 Sep 2008 15:16:45 +0000 (UTC)
Subject: rpms/python-pyblock/devel python-pyblock.spec,1.51,1.52
Message-ID: <20080930151645.7DAD170119@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-pyblock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6083

Modified Files:
	python-pyblock.spec 
Log Message:
* Tue Sep 30 2008 Peter Jones <pjones at redhat.com> - 0.31-5
- Rebuild for newer libdmraid



Index: python-pyblock.spec
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- python-pyblock.spec	4 Jul 2008 17:32:13 -0000	1.51
+++ python-pyblock.spec	30 Sep 2008 15:16:15 -0000	1.52
@@ -6,7 +6,7 @@
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
 Version: 0.31
-Release: 4
+Release: 5
 Source0: %{realname}-%{version}.tar.bz2
 License: GPLv2 or GPLv3
 Group: System Environment/Libraries
@@ -42,6 +42,9 @@
 %{_docdir}/pyblock-%{version}/*
 
 %changelog
+* Tue Sep 30 2008 Peter Jones <pjones at redhat.com> - 0.31-5
+- Rebuild for newer libdmraid
+
 * Fri Jul 04 2008 Peter Jones <pjones at redhat.com> - 0.31-4
 - Move dmraid dep to point at dmraid-libs.
 



From pkgdb at fedoraproject.org  Tue Sep 30 15:18:24 2008
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 30 Sep 2008 15:18:24 +0000
Subject: [pkgdb] docbook-dtds had acl change status
Message-ID: <20080930151824.797EB2084BC@bastion.fedora.phx.redhat.com>

ovasik has set the commit acl on docbook-dtds (Fedora devel) to Approved for kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/docbook-dtds



From than at fedoraproject.org  Tue Sep 30 15:33:07 2008
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 30 Sep 2008 15:33:07 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec, 1.73, 1.74 sources,
	1.22, 1.23
Message-ID: <20080930153307.583F770119@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8464

Modified Files:
	kdebase-runtime.spec sources 
Log Message:
fix broken audio-backend-jack.svgz




Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- kdebase-runtime.spec	30 Sep 2008 15:05:49 -0000	1.73
+++ kdebase-runtime.spec	30 Sep 2008 15:32:37 -0000	1.74
@@ -10,7 +10,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
 Version:       4.1.2
-Release:       3%{?dist}
+Release:       4%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -380,6 +380,9 @@
 
 
 %changelog
+* Tue Sep 30 2008 Than Ngo <than at redhat.com> 4.1.2-4
+- fix broken audio-backend-jack.svgz
+
 * Tue Sep 30 2008 Than Ngo <than at redhat.com> 4.1.2-3
 - add missing icons
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	30 Sep 2008 15:05:49 -0000	1.22
+++ sources	30 Sep 2008 15:32:37 -0000	1.23
@@ -1,9 +1,9 @@
 1f17bdfa4bee4bf1c7afc2bd5bdbae59  kdebase-runtime-4.1.2.tar.bz2
 f976564b84c96c43ef7bbb42576ef7bf  audio-backend-arts.svgz
 1c229ebbf0d2063927175159329ba7b8  audio-backend-esd.svgz
-06617d979cc7fff9c25489233d786de5  audio-backend-jack.svgz
 0f9b16ddfbc760a82a2c51a2846c8894  audio-backend-pulseaudio.svgz
 556827fe755f3348f6b2227e29c687dc  audio-card-firewire.svgz
 1db9c22cb987582526b5b45423116f9b  audio-card-usb.svgz
 6fb861774412d3f63accf480980c0488  audio-headset-bluetooth.svgz
 b75bce5f507225e0760061a7276271a5  audio-headset-usb.svgz
+26411a187b7aa9a722f91ead4e557aa0  audio-backend-jack.svgz



From pjones at fedoraproject.org  Tue Sep 30 15:47:38 2008
From: pjones at fedoraproject.org (Peter Jones)
Date: Tue, 30 Sep 2008 15:47:38 +0000 (UTC)
Subject: rpms/python-pyblock/devel .cvsignore, 1.30, 1.31 python-pyblock.spec,
	1.52, 1.53 sources, 1.33, 1.34
Message-ID: <20080930154738.1F73070119@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-pyblock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10732

Modified Files:
	.cvsignore python-pyblock.spec sources 
Log Message:
* Tue Sep 30 2008 Peter Jones <pjones at redhat.com> - 0.32-1
- Update for libdmraid 1.0.0.rc15 .



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	4 Jul 2008 17:32:13 -0000	1.30
+++ .cvsignore	30 Sep 2008 15:47:07 -0000	1.31
@@ -1,2 +1,2 @@
-pyblock-0.31.tar.bz2
+pyblock-0.32.tar.bz2
 clog


Index: python-pyblock.spec
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- python-pyblock.spec	30 Sep 2008 15:16:15 -0000	1.52
+++ python-pyblock.spec	30 Sep 2008 15:47:07 -0000	1.53
@@ -1,12 +1,12 @@
 %define realname pyblock
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)[1:]")}
-%define dmrver 1.0.0.rc11-FC6.3
-%define dmver 1.02.17
+%define dmrver 1.0.0.rc15
+%define dmver 1.02.27
 
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
-Version: 0.31
-Release: 5
+Version: 0.32
+Release: 1%{?dist}
 Source0: %{realname}-%{version}.tar.bz2
 License: GPLv2 or GPLv3
 Group: System Environment/Libraries
@@ -42,8 +42,8 @@
 %{_docdir}/pyblock-%{version}/*
 
 %changelog
-* Tue Sep 30 2008 Peter Jones <pjones at redhat.com> - 0.31-5
-- Rebuild for newer libdmraid
+* Tue Sep 30 2008 Peter Jones <pjones at redhat.com> - 0.32-1
+- Update for libdmraid 1.0.0.rc15 .
 
 * Fri Jul 04 2008 Peter Jones <pjones at redhat.com> - 0.31-4
 - Move dmraid dep to point at dmraid-libs.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	24 Jan 2008 22:03:29 -0000	1.33
+++ sources	30 Sep 2008 15:47:07 -0000	1.34
@@ -1 +1 @@
-2cc491a3b8913a1598780728dbf4e0af  pyblock-0.31.tar.bz2
+339b06ac1eb48dde8a54fbb2e174b26b  pyblock-0.32.tar.bz2



From than at fedoraproject.org  Tue Sep 30 15:57:01 2008
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 30 Sep 2008 15:57:01 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-9 kdebase-runtime.spec, 1.56, 1.57 sources, 
	1.16, 1.17
Message-ID: <20080930155701.3F41570119@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-runtime/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11981

Modified Files:
	kdebase-runtime.spec sources 
Log Message:
add missing icons




Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kdebase-runtime.spec	29 Sep 2008 15:25:21 -0000	1.56
+++ kdebase-runtime.spec	30 Sep 2008 15:56:30 -0000	1.57
@@ -10,13 +10,22 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
 Version:       4.1.2
-Release:       2%{?dist}
+Release:       4%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
 Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
 Source1:       khelpcenter.desktop
+# http://websvn.kde.org/trunk/playground/artwork/Oxygen/phonon/
+Source2:       audio-backend-arts.svgz
+Source3:       audio-backend-esd.svgz
+Source4:       audio-backend-jack.svgz
+Source5:       audio-backend-pulseaudio.svgz
+Source6:       audio-card-firewire.svgz
+Source7:       audio-card-usb.svgz
+Source8:       audio-headset-bluetooth.svgz
+Source9:       audio-headset-usb.svgz
 Patch0:        kdebase-runtime-4.1.0-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.1.1-knetattach.patch
@@ -67,6 +76,7 @@
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: zlib-devel
+BuildRequires: ImageMagick
 
 %description
 Core runtime for the K Desktop Environment 4.
@@ -137,6 +147,18 @@
 
 %if 0%{?icons}
 make install DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen
+# install phone-xine icons
+for i in 16 22 32 48 64 128 ; do
+  install -m 0644 -D phonon/xine/ox$i-app-phonon-xine.png %{buildroot}%{_kde4_iconsdir}/oxygen/${i}x${i}/apps/phonon-xine.png
+done
+install -m 0644 -D phonon/xine/oxsc-app-phonon-xine.svgz %{buildroot}%{_kde4_iconsdir}/oxygen/scalable/apps/phonon-xine.svgz
+for j in %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} ; do
+  n=`basename $j`
+  for i in 16 22 32 48 64 128; do
+    convert -background None -geometry ${i}x${i} ${j} %{buildroot}%{_datadir}/icons/oxygen/${i}x${i}/apps/${n%.svgz}.png
+  done
+  install -m 0644 -D ${j} %{buildroot}%{_kde4_iconsdir}/oxygen/scalable/apps/${n}
+done
 %if ! 0%{?rest}
 ln -sf oxygen %{buildroot}%{_kde4_iconsdir}/default.kde4
 %endif
@@ -358,6 +380,12 @@
 
 
 %changelog
+* Tue Sep 30 2008 Than Ngo <than at redhat.com> 4.1.2-4
+- fix broken audio-backend-jack.svgz
+
+* Tue Sep 30 2008 Than Ngo <than at redhat.com> 4.1.2-3
+- add missing icons
+
 * Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
 - make VERBOSE=1
 - respin against new(er) kde-filesystem


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-9/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	28 Sep 2008 20:44:21 -0000	1.16
+++ sources	30 Sep 2008 15:56:30 -0000	1.17
@@ -1 +1,9 @@
 1f17bdfa4bee4bf1c7afc2bd5bdbae59  kdebase-runtime-4.1.2.tar.bz2
+f976564b84c96c43ef7bbb42576ef7bf  audio-backend-arts.svgz
+1c229ebbf0d2063927175159329ba7b8  audio-backend-esd.svgz
+0f9b16ddfbc760a82a2c51a2846c8894  audio-backend-pulseaudio.svgz
+556827fe755f3348f6b2227e29c687dc  audio-card-firewire.svgz
+1db9c22cb987582526b5b45423116f9b  audio-card-usb.svgz
+6fb861774412d3f63accf480980c0488  audio-headset-bluetooth.svgz
+b75bce5f507225e0760061a7276271a5  audio-headset-usb.svgz
+26411a187b7aa9a722f91ead4e557aa0  audio-backend-jack.svgz



From mclasen at fedoraproject.org  Tue Sep 30 16:03:40 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 30 Sep 2008 16:03:40 +0000 (UTC)
Subject: rpms/libgnome/devel libgnome.spec,1.129,1.130
Message-ID: <20080930160340.432DB70119@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13198

Modified Files:
	libgnome.spec 
Log Message:
try harder



Index: libgnome.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- libgnome.spec	30 Sep 2008 14:07:36 -0000	1.129
+++ libgnome.spec	30 Sep 2008 16:03:09 -0000	1.130
@@ -14,7 +14,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.24.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnome/2.24/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -137,7 +137,7 @@
 for p in *.po; do
   msgmerge $p %{po_package}.pot > $p.out
   msgfmt -o `basename $p .po`.gmo $p.out
-  touch -r $p `basename $p .po`.gmo
+  touch -r POTFILES.skip `basename $p .po`.gmo
 done
 
 
@@ -209,7 +209,7 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Tue Sep 30 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-3
+* Tue Sep 30 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-4
 - Fix multilib conflicts with touch
 
 * Thu Sep 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-2



From sharkcz at fedoraproject.org  Tue Sep 30 16:21:46 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 30 Sep 2008 16:21:46 +0000 (UTC)
Subject: rpms/wxPython/F-9 .cvsignore, 1.12, 1.13 sources, 1.9,
	1.10 wxPython.spec, 1.23,
	1.24 wxPython-src-2.8.7.1-bug450073.patch, 1.1, NONE
Message-ID: <20080930162146.0624F70119@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxPython/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14347

Modified Files:
	.cvsignore sources wxPython.spec 
Removed Files:
	wxPython-src-2.8.7.1-bug450073.patch 
Log Message:
* Tue Sep 30 2008 Dan Horak <dan[at]danny.cz> - 2.8.9.1-1
- update to 2.8.9.1
- fix libdir for additional wx libraries (#306761)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	7 Jun 2008 11:58:29 -0000	1.12
+++ .cvsignore	30 Sep 2008 16:21:15 -0000	1.13
@@ -1,2 +1 @@
-wxPython-src-2.8.7.1.tar.bz2
-clog
+wxPython-src-2.8.9.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 Feb 2008 21:27:04 -0000	1.9
+++ sources	30 Sep 2008 16:21:15 -0000	1.10
@@ -1 +1 @@
-04fc1079430b18e6fd097b3287e9ae10  wxPython-src-2.8.7.1.tar.bz2
+4ad9a64e05529097618c7e48fbb10a84  wxPython-src-2.8.9.1.tar.bz2


Index: wxPython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/F-9/wxPython.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- wxPython.spec	12 Jun 2008 22:06:43 -0000	1.23
+++ wxPython.spec	30 Sep 2008 16:21:15 -0000	1.24
@@ -4,19 +4,18 @@
 %define buildflags WXPORT=gtk2 UNICODE=1
 
 Name:           wxPython
-Version:        2.8.7.1
-Release:        5%{?dist}
+Version:        2.8.9.1
+Release:        1%{?dist}
 
 Summary:        GUI toolkit for the Python programming language
 
 Group:          Development/Languages
-License:        LGPL
+License:        LGPLv2+ and wxWidgets 
 URL:            http://www.wxpython.org/
 Source0:        http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.bz2
-Patch0:         wxPython-src-2.8.7.1-bug450073.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # make sure to keep this updated as appropriate
-BuildRequires:  wxGTK-devel >= 2.8.7
+BuildRequires:  wxGTK-devel >= 2.8.9
 BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
 BuildRequires:  libGL-devel, libGLU-devel
@@ -50,7 +49,9 @@
 
 %prep
 %setup -q -n wxPython-src-%{version}
-%patch0 -p1
+
+# fix libdir otherwise it additional wx libs cannot be found
+sed -i -e 's|/usr/lib|%{_libdir}|' wxPython/config.py
 
 
 %build
@@ -103,6 +104,21 @@
 
 
 %changelog
+* Tue Sep 30 2008 Dan Horak <dan[at]danny.cz> - 2.8.9.1-1
+- update to 2.8.9.1
+- fix libdir for additional wx libraries (#306761)
+
+* Mon Sep 29 2008 Dan Horak <dan[at]danny.cz> - 2.8.9.0-1
+- update to 2.8.9.0
+
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.8.0-2
+- fix license tag
+
+* Thu Jul 31 2008 Matthew Miller <mattdm at mattdm.org> - 2.8.8.0-1
+- update to 2.8.8.0 (bug #457408)
+- a fix for bug #450073 is included in the upstream release, so
+  dropping that patch.
+
 * Thu Jun 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> - 2.8.7.1-5
 - Fix an attribute error when importing wxPython (compat) module
   (redhat bugzilla 450073, 450074)


--- wxPython-src-2.8.7.1-bug450073.patch DELETED ---



From sharkcz at fedoraproject.org  Tue Sep 30 16:24:05 2008
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 30 Sep 2008 16:24:05 +0000 (UTC)
Subject: rpms/wxPython/F-8 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 wxPython.spec, 1.20,
	1.21 wxPython-src-2.8.7.1-bug450073.patch, 1.1, NONE
Message-ID: <20080930162405.7967B7013F@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxPython/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14654

Modified Files:
	.cvsignore sources wxPython.spec 
Removed Files:
	wxPython-src-2.8.7.1-bug450073.patch 
Log Message:
* Tue Sep 30 2008 Dan Horak <dan[at]danny.cz> - 2.8.9.1-1
- update to 2.8.9.1
- fix libdir for additional wx libraries (#306761)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Jun 2008 11:52:48 -0000	1.9
+++ .cvsignore	30 Sep 2008 16:23:35 -0000	1.10
@@ -1,3 +1 @@
-wxPython-src-2.8.4.0.tar.bz2
-clog
-
+wxPython-src-2.8.9.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Jun 2008 11:52:48 -0000	1.9
+++ sources	30 Sep 2008 16:23:35 -0000	1.10
@@ -1 +1 @@
-04fc1079430b18e6fd097b3287e9ae10  wxPython-src-2.8.7.1.tar.bz2
+4ad9a64e05529097618c7e48fbb10a84  wxPython-src-2.8.9.1.tar.bz2


Index: wxPython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/F-8/wxPython.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wxPython.spec	12 Jun 2008 22:10:19 -0000	1.20
+++ wxPython.spec	30 Sep 2008 16:23:35 -0000	1.21
@@ -4,19 +4,18 @@
 %define buildflags WXPORT=gtk2 UNICODE=1
 
 Name:           wxPython
-Version:        2.8.7.1
-Release:        5%{?dist}
+Version:        2.8.9.1
+Release:        1%{?dist}
 
 Summary:        GUI toolkit for the Python programming language
 
 Group:          Development/Languages
-License:        LGPL
+License:        LGPLv2+ and wxWidgets 
 URL:            http://www.wxpython.org/
 Source0:        http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.bz2
-Patch0:         wxPython-src-2.8.7.1-bug450073.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # make sure to keep this updated as appropriate
-BuildRequires:  wxGTK-devel >= 2.8.7
+BuildRequires:  wxGTK-devel >= 2.8.9
 BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
 BuildRequires:  libGL-devel, libGLU-devel
@@ -50,7 +49,9 @@
 
 %prep
 %setup -q -n wxPython-src-%{version}
-%patch0 -p1
+
+# fix libdir otherwise it additional wx libs cannot be found
+sed -i -e 's|/usr/lib|%{_libdir}|' wxPython/config.py
 
 
 %build
@@ -103,6 +104,21 @@
 
 
 %changelog
+* Tue Sep 30 2008 Dan Horak <dan[at]danny.cz> - 2.8.9.1-1
+- update to 2.8.9.1
+- fix libdir for additional wx libraries (#306761)
+
+* Mon Sep 29 2008 Dan Horak <dan[at]danny.cz> - 2.8.9.0-1
+- update to 2.8.9.0
+
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.8.0-2
+- fix license tag
+
+* Thu Jul 31 2008 Matthew Miller <mattdm at mattdm.org> - 2.8.8.0-1
+- update to 2.8.8.0 (bug #457408)
+- a fix for bug #450073 is included in the upstream release, so
+  dropping that patch.
+
 * Thu Jun 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> - 2.8.7.1-5
 - Fix an attribute error when importing wxPython (compat) module
   (redhat bugzilla 450073, 450074)


--- wxPython-src-2.8.7.1-bug450073.patch DELETED ---



From katzj at fedoraproject.org  Tue Sep 30 16:26:53 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Tue, 30 Sep 2008 16:26:53 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec,1.57,1.58
Message-ID: <20080930162653.35F0970119@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14990

Modified Files:
	plymouth.spec 
Log Message:
* Tue Sep 30 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.25.2
- Remove mkinitrd requires to break the dep loop and ensure things
  get installed in the right order



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- plymouth.spec	26 Sep 2008 01:11:21 -0000	1.57
+++ plymouth.spec	30 Sep 2008 16:26:22 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: Plymouth Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.6.0
-Release: 0.2008.09.25.1%{?dist}
+Release: 0.2008.09.25.2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -13,7 +13,6 @@
 
 Requires: system-logos >= 9.0.1
 Requires: system-plymouth-plugin >= %{version}-%{release}
-Requires: mkinitrd
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -241,6 +240,10 @@
 %{_libdir}/plymouth/spinfinity.so
 
 %changelog
+* Tue Sep 30 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.25.2
+- Remove mkinitrd requires to break the dep loop and ensure things
+  get installed in the right order
+
 * Thu Sep 25 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.25.1
 - Add new snapshot to fold in Will Woods progress bar, and
   move ajax's splash upstream, putting the old text splash



From tuxbrewr at fedoraproject.org  Tue Sep 30 17:09:24 2008
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue, 30 Sep 2008 17:09:24 +0000 (UTC)
Subject: rpms/packagekit-qt/devel .cvsignore, 1.3, 1.4 packagekit-qt.spec,
	1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20080930170924.E594C70119@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/packagekit-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17058

Modified Files:
	.cvsignore packagekit-qt.spec sources 
Log Message:
New upstream release 0.1 Official


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/packagekit-qt/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Aug 2008 20:38:24 -0000	1.3
+++ .cvsignore	30 Sep 2008 17:08:53 -0000	1.4
@@ -1 +1 @@
-84745-kpackagekit-0.1-b4.tar.bz2
+84745-kpackagekit-0.1.tar.bz2


Index: packagekit-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/packagekit-qt/devel/packagekit-qt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- packagekit-qt.spec	22 Aug 2008 20:38:24 -0000	1.5
+++ packagekit-qt.spec	30 Sep 2008 17:08:53 -0000	1.6
@@ -3,12 +3,12 @@
 
 Name:	  	packagekit-qt
 Version:	0.1
-Release:	0.1.%{betaversion}%{?dist}
+Release:	1%{?dist}
 Summary:	Qt interface for PackageKit
 
 License:	GPLv2+
 Group:		System Environment/Libraries
-Source0: 	http://www.kde-apps.org/CONTENT/content-files/84745-kpackagekit-%{version}-%{betaversion}.tar.bz2
+Source0: 	http://www.kde-apps.org/CONTENT/content-files/84745-kpackagekit-%{version}.tar.bz2
 #Patch0:	packagekit-qt-fedora.patch
 URL:		http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
 
@@ -33,11 +33,11 @@
 %{_libdir}/*.so
 %{_includedir}/packagekit-qt
 %{_datadir}/cmake/Modules/FindQPackageKit.cmake
-%{_libdir}/libpackagekit-qt.so.0*
+%{_libdir}/libpackagekit-qt.so.2*
 
 #------------------------------------------------------------------------------
 %prep
-%setup -q -n KPackageKit/lib
+%setup -q -n KPackageKit/QPackageKit2
 #%patch0 -p2 -b .generic
 
 %build
@@ -53,6 +53,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Sep 29 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.1-1
+- New upstream release  Official .1 release
+
 * Tue Aug 19 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.1-0.1.b4
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/packagekit-qt/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Aug 2008 20:38:24 -0000	1.3
+++ sources	30 Sep 2008 17:08:53 -0000	1.4
@@ -1 +1 @@
-e5ffde38f7a9c2027b5da247c07f797d  84745-kpackagekit-0.1-b4.tar.bz2
+6b4aaabf2207c1bcfd83a642df5f1a3e  84745-kpackagekit-0.1.tar.bz2



From ricky at fedoraproject.org  Tue Sep 30 17:17:50 2008
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 30 Sep 2008 17:17:50 +0000 (UTC)
Subject: rpms/python-webob/devel .cvsignore, 1.2, 1.3 python-webob.spec, 1.1,
	1.2 sources, 1.2, 1.3 WebOb-0.9.2-fix-tests.patch, 1.1, NONE
Message-ID: <20080930171750.1855670119@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-webob/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18466

Modified Files:
	.cvsignore python-webob.spec sources 
Removed Files:
	WebOb-0.9.2-fix-tests.patch 
Log Message:
Update to 0.9.3.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Jul 2008 20:55:32 -0000	1.2
+++ .cvsignore	30 Sep 2008 17:17:19 -0000	1.3
@@ -1 +1 @@
-WebOb-0.9.2.tar.gz
+WebOb-0.9.3.tar.gz


Index: python-webob.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/devel/python-webob.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-webob.spec	27 Jul 2008 20:55:32 -0000	1.1
+++ python-webob.spec	30 Sep 2008 17:17:19 -0000	1.2
@@ -2,13 +2,12 @@
 
 Name:           python-webob
 Summary:        WSGI request and response object
-Version:        0.9.2
-Release:        2%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://pythonpaste.org/webob/
 Source0:        http://pypi.python.org/packages/source/W/WebOb/WebOb-%{version}.tar.gz
-Patch0:         WebOb-0.9.2-fix-tests.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -24,7 +23,6 @@
 
 %prep
 %setup -q -n WebOb-%{version}
-%patch0 -p1
 # Disable the tests that require python-webtest
 # (which depends on python-webob to begin with)
 %{__rm} -f tests/test_request.py
@@ -56,6 +54,9 @@
 %{python_sitelib}/WebOb*.egg-info/
 
 %changelog
+* Tue Sep 30 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.3-1
+- Upstream released new version.
+
 * Thu Jul 17 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.2-2
 - Remove conftest from the tests.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jul 2008 20:55:32 -0000	1.2
+++ sources	30 Sep 2008 17:17:19 -0000	1.3
@@ -1 +1 @@
-5354df7300ff58bcf89f11ff9e040a82  WebOb-0.9.2.tar.gz
+1ee83b8beea08a573a048cb5332a532f  WebOb-0.9.3.tar.gz


--- WebOb-0.9.2-fix-tests.patch DELETED ---



From tuxbrewr at fedoraproject.org  Tue Sep 30 17:19:52 2008
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue, 30 Sep 2008 17:19:52 +0000 (UTC)
Subject: rpms/kpackagekit/devel .cvsignore, 1.3, 1.4 kpackagekit-fedora.patch,
	1.1, 1.2 kpackagekit.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20080930171952.5B13070119@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19050

Modified Files:
	.cvsignore kpackagekit-fedora.patch kpackagekit.spec sources 
Log Message:
New upstream release 0.1 Official


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Aug 2008 20:41:38 -0000	1.3
+++ .cvsignore	30 Sep 2008 17:19:21 -0000	1.4
@@ -1 +1 @@
-84745-kpackagekit-0.1-b4.tar.bz2
+84745-kpackagekit-0.1.tar.bz2

kpackagekit-fedora.patch:

Index: kpackagekit-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kpackagekit-fedora.patch	1 Aug 2008 13:17:00 -0000	1.1
+++ kpackagekit-fedora.patch	30 Sep 2008 17:19:21 -0000	1.2
@@ -1,150 +1,8 @@
-diff -crB KPackageKit/gui/AddRm/PkReviewChanges.cpp KPackageKit-fedora/gui/AddRm/PkReviewChanges.cpp
-*** KPackageKit/gui/AddRm/PkReviewChanges.cpp	2008-07-06 23:44:11.000000000 -0400
---- KPackageKit-fedora/gui/AddRm/PkReviewChanges.cpp	2008-08-01 08:24:50.000000000 -0400
+diff -crB KPackageKit/gui/Updater/PkUpdate.ui KPackageKit-Fedora/gui/Updater/PkUpdate.ui
+*** KPackageKit/gui/Updater/PkUpdate.ui	2008-08-19 17:43:09.000000000 -0400
+--- KPackageKit-Fedora/gui/Updater/PkUpdate.ui	2008-08-23 17:07:43.000000000 -0400
 ***************
-*** 45,51 ****
-      m_pbTimer = new QTimer(this);
-      connect(m_pbTimer, SIGNAL( timeout() ), this, SLOT( updateProgress() ));
-  
-!     label->setText( i18n("You selected the folowwing packages to be INSTALLED/REMOVED, press ok to proceed:") );
-  }
-  
-  void PkReviewChanges::updateProgress()
---- 45,51 ----
-      m_pbTimer = new QTimer(this);
-      connect(m_pbTimer, SIGNAL( timeout() ), this, SLOT( updateProgress() ));
-  
-!     label->setText( i18n("The folowing packages will be INSTALLED/REMOVED, Apply to continue:") );
-  }
-  
-  void PkReviewChanges::updateProgress()
-***************
-*** 123,129 ****
-                  connect( m_transactionDep, SIGNAL( GotPackage(Package *) ), m_pkgModelDep, SLOT( addUniquePackage(Package *) ) );
-                  connect( m_transactionDep, SIGNAL( Finished(Exit::Value, uint) ), this, SLOT( depFinished(Exit::Value, uint) ) );
-  		// Create a KProgressDialog to don't upset the user
-! 		m_waitPD = new KProgressDialog(this, i18n("Wait - KPackageKit"), i18n("Checking dependant packages") );
-  		m_waitPD->progressBar()->setMinimum(0);
-  		m_waitPD->progressBar()->setMaximum(0);
-  		m_waitPD->setAutoClose(false);
---- 123,129 ----
-                  connect( m_transactionDep, SIGNAL( GotPackage(Package *) ), m_pkgModelDep, SLOT( addUniquePackage(Package *) ) );
-                  connect( m_transactionDep, SIGNAL( Finished(Exit::Value, uint) ), this, SLOT( depFinished(Exit::Value, uint) ) );
-  		// Create a KProgressDialog to don't upset the user
-! 		m_waitPD = new KProgressDialog(this, i18n("Wait - KPackageKit"), i18n("Checking for dependencies") );
-  		m_waitPD->progressBar()->setMinimum(0);
-  		m_waitPD->progressBar()->setMaximum(0);
-  		m_waitPD->setAutoClose(false);
-***************
-*** 154,160 ****
-  	    delete m_waitPD;
-  	    m_waitPD = 0;
-  	    if ( m_pkgModelReq->rowCount( QModelIndex() ) > 0 ) {
-! 		PkRequirements *requimentD = new PkRequirements( i18n("The following packages must also be removed"), m_pkgModelReq, this );
-  		connect( requimentD, SIGNAL( okClicked() ), this, SLOT( removePackages() ) );
-  		connect( requimentD, SIGNAL( cancelClicked() ), this, SLOT( close() ) );
-  		requimentD->show();
---- 154,160 ----
-  	    delete m_waitPD;
-  	    m_waitPD = 0;
-  	    if ( m_pkgModelReq->rowCount( QModelIndex() ) > 0 ) {
-! 		PkRequirements *requimentD = new PkRequirements( i18n("The following packages will also be removed for depenencies"), m_pkgModelReq, this );
-  		connect( requimentD, SIGNAL( okClicked() ), this, SLOT( removePackages() ) );
-  		connect( requimentD, SIGNAL( cancelClicked() ), this, SLOT( close() ) );
-  		requimentD->show();
-***************
-*** 200,206 ****
-  	    delete m_waitPD;
-  	    m_waitPD = 0;
-  	    if ( m_pkgModelDep->rowCount( QModelIndex() ) > 0 ) {
-! 		PkRequirements *requimentD = new PkRequirements( i18n("The following packages must also be installed"), m_pkgModelDep, this );
-  		connect( requimentD, SIGNAL( okClicked() ), this, SLOT( installPackages() ) );
-  		connect( requimentD, SIGNAL( cancelClicked() ), this, SLOT( close() ) );
-  		requimentD->show();
---- 200,206 ----
-  	    delete m_waitPD;
-  	    m_waitPD = 0;
-  	    if ( m_pkgModelDep->rowCount( QModelIndex() ) > 0 ) {
-! 		PkRequirements *requimentD = new PkRequirements( i18n("The following packages will also be installed as dependencies"), m_pkgModelDep, this );
-  		connect( requimentD, SIGNAL( okClicked() ), this, SLOT( installPackages() ) );
-  		connect( requimentD, SIGNAL( cancelClicked() ), this, SLOT( close() ) );
-  		requimentD->show();
-***************
-*** 239,245 ****
-  void PkReviewChanges::remFinished(bool error)
-  {
-      if (error) {
-!         KMessageBox::error( this, i18n("Sorry an error ocoured"), i18n("Erro KPackageKit") );
-  	setButtons( KDialog::Close );
-      }
-      else {
---- 239,245 ----
-  void PkReviewChanges::remFinished(bool error)
-  {
-      if (error) {
-!         KMessageBox::error( this, i18n("Sorry an error occured"), i18n("Erro KPackageKit") );
-  	setButtons( KDialog::Close );
-      }
-      else {
-***************
-*** 251,257 ****
-  void PkReviewChanges::addFinished(bool error)
-  {
-      if (error) {
-!         KMessageBox::error( this, i18n("Sorry an error ocoured"), i18n("Erro KPackageKit") );
-  	setButtons( KDialog::Close );
-      }
-      else {
---- 251,257 ----
-  void PkReviewChanges::addFinished(bool error)
-  {
-      if (error) {
-!         KMessageBox::error( this, i18n("Sorry an error occured"), i18n("Erro KPackageKit") );
-  	setButtons( KDialog::Close );
-      }
-      else {
-diff -crB KPackageKit/gui/Common/PkStrings.cpp KPackageKit-fedora/gui/Common/PkStrings.cpp
-*** KPackageKit/gui/Common/PkStrings.cpp	2008-07-06 23:44:12.000000000 -0400
---- KPackageKit-fedora/gui/Common/PkStrings.cpp	2008-08-01 08:20:16.000000000 -0400
-***************
-*** 57,63 ****
-          case Status::Cleanup :
-  	    return i18n("Cleaning Up");
-          case Status::Obsolete :
-! 	    return i18n("Obsoletiong");
-          case Status::Dep_resolve :
-  	    return i18n("Resolving dependencies");
-          case Status::Rollback :
---- 57,63 ----
-          case Status::Cleanup :
-  	    return i18n("Cleaning Up");
-          case Status::Obsolete :
-! 	    return i18n("Obsoleting");
-          case Status::Dep_resolve :
-  	    return i18n("Resolving dependencies");
-          case Status::Rollback :
-***************
-*** 125,131 ****
-  	case Error::Failed_initialization :
-  	    return i18n("Failed to initialize");
-  	case Error::Failed_finalise :
-! 	    return i18n("Failed to finalise");
-  	case Error::Failed_config_parsing :
-  	    return i18n("Reading the config file failed");
-  	case Error::Cannot_cancel :
---- 125,131 ----
-  	case Error::Failed_initialization :
-  	    return i18n("Failed to initialize");
-  	case Error::Failed_finalise :
-! 	    return i18n("Failed to finalize");
-  	case Error::Failed_config_parsing :
-  	    return i18n("Reading the config file failed");
-  	case Error::Cannot_cancel :
-diff -crB KPackageKit/gui/Updater/PkUpdate.ui KPackageKit-fedora/gui/Updater/PkUpdate.ui
-*** KPackageKit/gui/Updater/PkUpdate.ui	2008-06-29 18:35:03.000000000 -0400
---- KPackageKit-fedora/gui/Updater/PkUpdate.ui	2008-08-01 08:10:11.000000000 -0400
-***************
-*** 42,48 ****
+*** 104,110 ****
      <item row="1" column="1" >
       <widget class="QPushButton" name="refreshPB" >
        <property name="text" >
@@ -152,7 +10,7 @@
        </property>
       </widget>
      </item>
---- 42,48 ----
+--- 104,110 ----
      <item row="1" column="1" >
       <widget class="QPushButton" name="refreshPB" >
        <property name="text" >


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kpackagekit.spec	22 Aug 2008 21:33:31 -0000	1.6
+++ kpackagekit.spec	30 Sep 2008 17:19:21 -0000	1.7
@@ -2,12 +2,12 @@
 
 Name:	  	kpackagekit
 Version:	0.1
-Release:	0.2.%{?betaversion}
+Release:	1%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
 Group:		Applications/System
-Source0: 	http://www.kde-apps.org/CONTENT/content-files/84745-kpackagekit-%{version}-%{betaversion}.tar.bz2
+Source0: 	http://www.kde-apps.org/CONTENT/content-files/84745-kpackagekit-%{version}.tar.bz2
 URL:		http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
 #PATCH0:		kpackagekit-fedora.patch
 
@@ -23,7 +23,7 @@
 KDE interface for PackageKit.
 
 %prep
-%setup -q -n KPackageKit/gui
+%setup -q -n KPackageKit/KPackageKit
 #%patch0 -p2 -b .generic
 
 %build
@@ -41,13 +41,21 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/kpackagekit
+%{_bindir}/kpackagekit-smart-icon
 %{_kde4_libdir}/kde4/*.so
-/usr/share/applications/kde4/kpackagekit.desktop
-/usr/share/kde4/apps/KPackageKit/KPackageKit.notifyrc
+%{_kde4_sharedir}/applications/kde4/kpackagekit.desktop
+%{_kde4_sharedir}/kde4/apps/KPackageKit/KPackageKit.notifyrc
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/services/kded/*.desktop
+ /usr/share/kde4/apps/kpackagekit/icons/*
 
 %changelog
+* Mon Sep 29 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.1-1
+Official 0.1 release
+
+* Sun Aug 24 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.1-0.3.b4
+- Excluded underdevelopment binaries and associated files 
+
 * Fri Aug 22 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.1-0.2.b4
 - Adding missing files
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Aug 2008 20:41:39 -0000	1.3
+++ sources	30 Sep 2008 17:19:21 -0000	1.4
@@ -1 +1 @@
-e5ffde38f7a9c2027b5da247c07f797d  84745-kpackagekit-0.1-b4.tar.bz2
+6b4aaabf2207c1bcfd83a642df5f1a3e  84745-kpackagekit-0.1.tar.bz2



From rstrode at fedoraproject.org  Tue Sep 30 17:20:50 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 30 Sep 2008 17:20:50 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec,1.58,1.59
Message-ID: <20080930172050.BBC5A70119@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19149

Modified Files:
	plymouth.spec 
Log Message:
Fix changelog attribution to reflect who commited the last change



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- plymouth.spec	30 Sep 2008 16:26:22 -0000	1.58
+++ plymouth.spec	30 Sep 2008 17:20:20 -0000	1.59
@@ -240,7 +240,7 @@
 %{_libdir}/plymouth/spinfinity.so
 
 %changelog
-* Tue Sep 30 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.25.2
+* Tue Sep 30 2008 Jeremy Katz <katzj at redhat.com> 0.5.0-0.2008.09.25.2
 - Remove mkinitrd requires to break the dep loop and ensure things
   get installed in the right order
 



From ricky at fedoraproject.org  Tue Sep 30 17:21:00 2008
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 30 Sep 2008 17:21:00 +0000 (UTC)
Subject: rpms/python-webob/F-9 .cvsignore, 1.2, 1.3 python-webob.spec, 1.1, 
	1.2 sources, 1.2, 1.3 WebOb-0.9.2-fix-tests.patch, 1.1, NONE
Message-ID: <20080930172100.3282C70119@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-webob/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19388

Modified Files:
	.cvsignore python-webob.spec sources 
Removed Files:
	WebOb-0.9.2-fix-tests.patch 
Log Message:
Update to 0.9.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Jul 2008 20:57:54 -0000	1.2
+++ .cvsignore	30 Sep 2008 17:20:29 -0000	1.3
@@ -1 +1 @@
-WebOb-0.9.2.tar.gz
+WebOb-0.9.3.tar.gz


Index: python-webob.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/F-9/python-webob.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-webob.spec	27 Jul 2008 20:57:54 -0000	1.1
+++ python-webob.spec	30 Sep 2008 17:20:29 -0000	1.2
@@ -2,13 +2,12 @@
 
 Name:           python-webob
 Summary:        WSGI request and response object
-Version:        0.9.2
-Release:        2%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://pythonpaste.org/webob/
 Source0:        http://pypi.python.org/packages/source/W/WebOb/WebOb-%{version}.tar.gz
-Patch0:         WebOb-0.9.2-fix-tests.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -24,7 +23,6 @@
 
 %prep
 %setup -q -n WebOb-%{version}
-%patch0 -p1
 # Disable the tests that require python-webtest
 # (which depends on python-webob to begin with)
 %{__rm} -f tests/test_request.py
@@ -56,6 +54,9 @@
 %{python_sitelib}/WebOb*.egg-info/
 
 %changelog
+* Tue Sep 30 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.3-1
+- Upstream released new version.
+
 * Thu Jul 17 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.2-2
 - Remove conftest from the tests.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jul 2008 20:57:54 -0000	1.2
+++ sources	30 Sep 2008 17:20:29 -0000	1.3
@@ -1 +1 @@
-5354df7300ff58bcf89f11ff9e040a82  WebOb-0.9.2.tar.gz
+1ee83b8beea08a573a048cb5332a532f  WebOb-0.9.3.tar.gz


--- WebOb-0.9.2-fix-tests.patch DELETED ---



From ricky at fedoraproject.org  Tue Sep 30 17:22:57 2008
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 30 Sep 2008 17:22:57 +0000 (UTC)
Subject: rpms/python-webob/F-8 .cvsignore, 1.2, 1.3 python-webob.spec, 1.1, 
	1.2 sources, 1.2, 1.3 WebOb-0.9.2-fix-tests.patch, 1.1, NONE
Message-ID: <20080930172257.DCD5870119@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-webob/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19961

Modified Files:
	.cvsignore python-webob.spec sources 
Removed Files:
	WebOb-0.9.2-fix-tests.patch 
Log Message:
Update to 0.9.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Jul 2008 20:59:10 -0000	1.2
+++ .cvsignore	30 Sep 2008 17:22:27 -0000	1.3
@@ -1 +1 @@
-WebOb-0.9.2.tar.gz
+WebOb-0.9.3.tar.gz


Index: python-webob.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/F-8/python-webob.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-webob.spec	27 Jul 2008 20:59:10 -0000	1.1
+++ python-webob.spec	30 Sep 2008 17:22:27 -0000	1.2
@@ -2,13 +2,12 @@
 
 Name:           python-webob
 Summary:        WSGI request and response object
-Version:        0.9.2
-Release:        2%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://pythonpaste.org/webob/
 Source0:        http://pypi.python.org/packages/source/W/WebOb/WebOb-%{version}.tar.gz
-Patch0:         WebOb-0.9.2-fix-tests.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -24,7 +23,6 @@
 
 %prep
 %setup -q -n WebOb-%{version}
-%patch0 -p1
 # Disable the tests that require python-webtest
 # (which depends on python-webob to begin with)
 %{__rm} -f tests/test_request.py
@@ -56,6 +54,9 @@
 %{python_sitelib}/WebOb*.egg-info/
 
 %changelog
+* Tue Sep 30 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.3-1
+- Upstream released new version.
+
 * Thu Jul 17 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.2-2
 - Remove conftest from the tests.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jul 2008 20:59:10 -0000	1.2
+++ sources	30 Sep 2008 17:22:27 -0000	1.3
@@ -1 +1 @@
-5354df7300ff58bcf89f11ff9e040a82  WebOb-0.9.2.tar.gz
+1ee83b8beea08a573a048cb5332a532f  WebOb-0.9.3.tar.gz


--- WebOb-0.9.2-fix-tests.patch DELETED ---



From notting at fedoraproject.org  Tue Sep 30 17:24:47 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 30 Sep 2008 17:24:47 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2.spec,1.142,1.143
Message-ID: <20080930172447.11A8270119@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20736

Modified Files:
	lvm2.spec 
Log Message:
reorder changelog so RPM does not choke on it


Index: lvm2.spec
===================================================================
RCS file: /cvs/extras/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- lvm2.spec	26 Sep 2008 18:49:29 -0000	1.142
+++ lvm2.spec	30 Sep 2008 17:24:16 -0000	1.143
@@ -271,9 +271,6 @@
 
 
 %changelog
-* Wed Sep 24 2008 Alasdair Kergon <agk at redhat.com>> - 2.02.39-5
-- Explicitly create /sbin in the build root.
-
 * Fri Sep 26 2008 Fabio M. Di Nitto <fdinitto at redhat.cm> - 2.02.39-5
 - Add BuildRequires on cmanlib-devel. This is required after libcman split
   from cman and cman-devel into cmanlib and cmanlib-devel.
@@ -283,6 +280,9 @@
 * Thu Sep 25 2008 Fabio M. Di Nitto <fdinitto at redhat.cm> - 2.02.39-5
 - Add versioned BuildRequires on new cman-devel.
 
+* Wed Sep 24 2008 Alasdair Kergon <agk at redhat.com>> - 2.02.39-5
+- Explicitly create /sbin in the build root.
+
 * Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 2.02.39-5
 - Change %%patch to %%patch0 to match Patch0 as required by RPM package update.
 



From nalin at fedoraproject.org  Tue Sep 30 17:24:42 2008
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue, 30 Sep 2008 17:24:42 +0000 (UTC)
Subject: rpms/nss_ldap/F-9 nss_ldap.spec,1.96,1.97
Message-ID: <20080930172442.B5CA770119@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20671

Modified Files:
	nss_ldap.spec 
Log Message:
- add libssl and libcrypto to the list of libraries against which we link
  statically to avoid running into symbol collisions at run-time, from devel
  stream (#446860)
- defuzz one patch by pulling it from the development stream
- rebuild (#4



Index: nss_ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/F-9/nss_ldap.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- nss_ldap.spec	24 May 2008 14:59:07 -0000	1.96
+++ nss_ldap.spec	30 Sep 2008 17:24:12 -0000	1.97
@@ -2,7 +2,7 @@
 Summary: NSS library and PAM module for LDAP
 Name: nss_ldap
 Version: 259
-Release: 3%{?dist}.1
+Release: 3%{?dist}.2
 Source0: ftp://ftp.padl.com/pub/nss_ldap-%{version}.tar.gz
 Source1: ftp://ftp.padl.com/pub/pam_ldap-%{pam_ldap_version}.tar.gz
 Source3: nss_ldap.versions
@@ -10,7 +10,7 @@
 Source5: README.TLS
 Source6: version.c
 Source7: dlopen.sh
-Patch0: pam_ldap-176-dnsconfig.patch
+Patch0: pam_ldap-184-dnsconfig.patch
 Patch1: pam_ldap-180-local_users.patch
 Patch2: nss_ldap-259-parse2.patch
 Patch3: pam_ldap-180-install-perms.patch
@@ -112,7 +112,7 @@
         --enable-schema-mapping \
         --enable-rfc2307bis \
         --enable-configurable-krb5-ccname-gssapi
-make %{?_smp_mflags} LIBS="-Wl,-Bstatic -lldap -llber -Wl,-Bdynamic -lsasl2 -lgssapi_krb5 -lssl -ldl -lpthread_nonshared -lnsl -lresolv"
+make %{?_smp_mflags} LIBS="-Wl,-Bstatic -lldap -llber -lssl -lcrypto -Wl,-Bdynamic -lz -lsasl2 -lgssapi_krb5 -ldl -lpthread_nonshared -lnsl -lresolv"
 popd
 
 # Check that the modules are actually loadable.
@@ -188,6 +188,13 @@
 %doc pam_ldap-%{pam_ldap_version}/ns-pwd-policy.schema
 
 %changelog
+* Tue Sep 30 2008 Nalin Dahyabhai <nalin at redhat.com> - 259-3.2
+- add libssl and libcrypto to the list of libraries against which we link
+  statically to avoid running into symbol collisions at run-time, from devel
+  stream (#446860)
+- defuzz one patch by pulling and updated version from the development stream
+- rebuild (#464620)
+
 * Sat May 24 2008 Dennis Gilmore <dennis at ausil.us> - 259-3.1
 - minor rebuild for sparc
 



From nalin at fedoraproject.org  Tue Sep 30 17:25:50 2008
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue, 30 Sep 2008 17:25:50 +0000 (UTC)
Subject: rpms/nss_ldap/F-9 pam_ldap-184-dnsconfig.patch, NONE,
	1.1 nss_ldap.spec, 1.97, 1.98 pam_ldap-176-dnsconfig.patch, 1.2, NONE
Message-ID: <20080930172550.0D32770119@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20913

Modified Files:
	nss_ldap.spec 
Added Files:
	pam_ldap-184-dnsconfig.patch 
Removed Files:
	pam_ldap-176-dnsconfig.patch 
Log Message:
- defuzz this patch by pulling an updated version from the development stream


pam_ldap-184-dnsconfig.patch:

--- NEW FILE pam_ldap-184-dnsconfig.patch ---
--- pam_ldap-176/Makefile.am	2004-09-30 22:33:14.000000000 -0400
+++ pam_ldap-176/Makefile.am	2004-10-28 17:24:13.691936696 -0400
@@ -2,7 +2,7 @@ noinst_PROGRAMS = pam_ldap.so
 EXTRA_DIST = COPYING.LIB CVSVersionInfo.txt ChangeLog README \
 	     ldap.conf pam.conf pam_ldap.spec pam.d
 
-pam_ldap_so_SOURCES = pam_ldap.c pam_ldap.h md5.c md5.h
+pam_ldap_so_SOURCES = pam_ldap.c pam_ldap.h md5.c md5.h resolve.c resolve.h dnsconfig.c dnsconfig.h snprintf.c snprintf.h
 pam_ldap_so_LDFLAGS = @pam_ldap_so_LDFLAGS@
 
 man_MANS = pam_ldap.5
--- pam_ldap-176/configure.in	2004-09-30 22:33:14.000000000 -0400
+++ pam_ldap-176/configure.in	2004-10-28 17:24:13.692936544 -0400
@@ -133,6 +133,38 @@
 AC_CHECK_FUNCS(ldap_initialize)
 AC_CHECK_FUNCS(ldap_sasl_bind ldap_sasl_interactive_bind_s)
 AC_CHECK_FUNCS(gethostbyname_r)
+AC_CHECK_FUNCS(snprintf strtok_r)
+AC_CHECK_LIB(resolv, main)
+AC_CHECK_HEADERS(resolv.h)
+AC_CHECK_FUNCS(res_search dn_expand)
+if test x$ac_cv_func_res_search = xno ; then
+	AC_MSG_CHECKING([for res_search again])
+	AC_TRY_LINK([#ifdef HAVE_RESOLV_H
+		     #include <resolv.h>
+		     #endif
+		     #ifdef HAVE_STDLIB_H
+		     #include <stdlib.h>
+		     #endif],
+		    [res_search(NULL,0,0,NULL,0);],
+		    AC_DEFINE(HAVE_RES_SEARCH,1,
+		    	      [Define if you have res_search().])
+		    ac_cv_func_res_search=yes)
+	AC_CHECK_FUNCS(res_search)
+fi
+if test x$ac_cv_func_dn_expand = xno ; then
+	AC_MSG_CHECKING([for dn_expand again])
+	AC_TRY_LINK([#ifdef HAVE_RESOLV_H
+		     #include <resolv.h>
+		     #endif
+		     #ifdef HAVE_STDLIB_H
+		     #include <stdlib.h>
+		     #endif],
+		    [dn_expand(NULL,NULL,NULL,NULL,0);],
+		    AC_DEFINE(HAVE_DN_EXPAND,1,
+		    	      [Define if you have dn_expand().])
+		    ac_cv_func_dn_expand=yes)
+	AC_CHECK_FUNCS(dn_expand)
+fi
 
 if test "$ac_cv_func_gethostbyname_r" = "yes"; then
 AC_CACHE_CHECK(whether gethostbyname_r takes 6 arguments, xad_cv_gethostbyname_r_args, [
--- /dev/null	2004-10-19 17:45:17.794252000 -0400
+++ pam_ldap-176/dnsconfig.c	2004-10-28 17:32:36.915435096 -0400
@@ -0,0 +1,214 @@
+
+/* Copyright (C) 1997-2001 Luke Howard.
+   This file started off as part of the nss_ldap library.
+   Contributed by Luke Howard, <lukeh at padl.com>, 1997.
+   (The author maintains a non-exclusive licence to distribute this file
+   under their own conditions.)
+
+   The nss_ldap library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The nss_ldap library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the nss_ldap library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Support DNS SRV records. I look up the SRV record for
+ * _ldap._tcp.gnu.org.
+ * and build the DN DC=gnu,DC=org.
+ * Thanks to Assar & co for resolve.[ch].
+ */
+
+static char rcsId[] = "$Id: dnsconfig.c,v 2.24 2001/02/27 14:44:31 lukeh Exp $";
+
+#include "config.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/param.h>
+#include <netdb.h>
+#include <syslog.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+#include <string.h>
+
+#ifdef HAVE_LBER_H
+#include <lber.h>
+#endif
+#ifdef HAVE_LDAP_H
+#include <ldap.h>
+#endif
+
+#ifndef HAVE_SNPRINTF
+#include "snprintf.h"
+#endif
+
+#include "pam_ldap.h"
+#include "resolve.h"
+#include "dnsconfig.h"
+
+#define DC_ATTR "DC"
+#define DC_ATTR_AVA DC_ATTR "="
+#define DC_ATTR_AVA_LEN (sizeof(DC_ATTR_AVA) - 1)
+
+/* map gnu.org into DC=gnu,DC=org */
+int
+_pam_ldap_getdnsdn (char *src_domain, char **rval)
+{
+  char *p;
+  int len = 0;
+#ifdef HAVE_STRTOK_R
+  char *st = NULL;
+#endif
+  char *domain;
+  char domain_copy[BUFSIZ], buffer[BUFSIZ];
+
+  /* we need to take a copy of domain, because strtok() modifies
+   * it in place. Bad.
+   */
+  if (strlen (src_domain) >= sizeof (domain_copy))
+    {
+      return PAM_SYSTEM_ERR;
+    }
+  memset (domain_copy, '\0', sizeof (domain_copy));
+  memset (buffer, '\0', sizeof (buffer));
+  strcpy (domain_copy, src_domain);
+
+  domain = domain_copy;
+
+#ifndef HAVE_STRTOK_R
+  while ((p = strtok (domain, ".")))
+#else
+  while ((p = strtok_r (domain, ".", &st)))
+#endif
+    {
+      len = strlen (p);
+
+      if (strlen (buffer) + DC_ATTR_AVA_LEN + len + 1 >= sizeof (buffer))
+	{
+	  return PAM_SYSTEM_ERR;
+	}
+
+      if (domain == NULL)
+	{
+	  strcat (buffer, ",");
+	}
+      else
+	{
+	  domain = NULL;
+	}
+
+      strcat (buffer, DC_ATTR_AVA);
+      strcat (buffer, p);
+    }
+
+  if (rval != NULL)
+    {
+      *rval = strdup (buffer);
+    }
+
+  return PAM_SUCCESS;
+}
+
+
+int
+_pam_ldap_readconfigfromdns (pam_ldap_config_t * result)
+{
+  int stat = PAM_SUCCESS;
+  struct dns_reply *r;
+  struct resource_record *rr;
+  char domain[MAXHOSTNAMELEN + 1];
+
+  /* only reinitialize variables we'll change here */
+  result->host = NULL;
+  result->base = NULL;
+  result->port = LDAP_PORT;
+#ifdef LDAP_VERSION3
+  result->version = LDAP_VERSION3;
+#else
+  result->version = LDAP_VERSION2;
+#endif /* LDAP_VERSION3 */
+
+  if ((_res.options & RES_INIT) == 0 && res_init () == -1)
+    {
+      return PAM_SYSTEM_ERR;
+    }
+
+  snprintf (domain, sizeof (domain), "_ldap._tcp.%s.", _res.defdname);
+
+  r = dns_lookup (domain, "srv");
+  if (r == NULL)
+    {
+      return PAM_SYSTEM_ERR;
+    }
+
+  /* XXX need to sort by priority and reorder using weights */
+  for (rr = r->head; rr != NULL; rr = rr->next)
+    {
+      if (rr->type == T_SRV)
+	{
+	  if (result->host != NULL)
+	    {
+	      /* need more space */
+	      int length;
+	      char *tmp;
+	      length = strlen (result->host) + 1 +
+	               strlen (rr->u.srv->target) + 1 + 5 + 1;
+	      tmp = malloc (length);
+	      if (tmp == NULL)
+	        {
+	          dns_free_data (r);
+		  return PAM_BUF_ERR;
+	        }
+	      sprintf (tmp, "%s %s:%d", result->host, rr->u.srv->target,
+	               rr->u.srv->port);
+	      free (result->host);
+	      result->host = tmp;
+	    }
+	  else
+	    {
+	      /* Server Host */
+	      result->host = strdup (rr->u.srv->target);
+	      if (result->host == NULL)
+	        {
+	          dns_free_data (r);
+		  return PAM_BUF_ERR;
+	        }
+	      /* Port */
+	      result->port = rr->u.srv->port;
+	    }
+
+#ifdef LDAPS_PORT
+	  /* Hack: if the port is the registered SSL port, enable SSL. */
+	  if (result->port == LDAPS_PORT)
+	    {
+	      result->ssl_on = SSL_LDAPS;
+	    }
+#endif /* SSL */
+
+	  /* DN */
+	  stat = _pam_ldap_getdnsdn (_res.defdname, &result->base);
+	  if (stat != PAM_SUCCESS)
+	    {
+	      dns_free_data (r);
+	      return stat;
+	    }
+	}
+    }
+
+  dns_free_data (r);
+  stat = PAM_SUCCESS;
+
+  return stat;
+}
--- /dev/null	2004-10-19 17:45:17.794252000 -0400
+++ pam_ldap-176/dnsconfig.h	2004-10-28 17:24:13.694936240 -0400
@@ -0,0 +1,35 @@
+/* Copyright (C) 1997-2001 Luke Howard.
+   This file started off as part of the nss_ldap library.
+   Contributed by Luke Howard, <lukeh at padl.com>, 1997.
+   (The author maintains a non-exclusive licence to distribute this file
+   under their own conditions.)
+
+   The nss_ldap library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The nss_ldap library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the nss_ldap library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _LDAP_PAM_LDAP_DNSCONFIG_H
+#define _LDAP_PAM_LDAP_DNSCONFIG_H
+
+/* utility routines.  */
+
+int _pam_ldap_getdnsdn (
+			char *domain,
+			char **rval);
+
+int _pam_ldap_readconfigfromdns (
+				 pam_ldap_config_t *result);
+
+#endif /* _LDAP_PAM_LDAP_DNSCONFIG_H */
--- pam_ldap-176/pam_ldap.c	2004-09-30 22:33:14.000000000 -0400
+++ pam_ldap-176/pam_ldap.c	2004-10-28 17:40:56.918423088 -0400
@@ -130,6 +130,7 @@
 
 #include "pam_ldap.h"
 #include "md5.h"
+#include "dnsconfig.h"
 
 #if defined(HAVE_SECURITY_PAM_MISC_H) || defined(HAVE_PAM_PAM_MISC_H)
  /* FIXME: is there something better to check? */
@@ -1107,11 +1108,15 @@
     {
       /* 
        * According to PAM Documentation, such an error in a config file
-       * SHOULD be logged at LOG_ALERT level
+       * SHOULD be logged at LOG_ALERT level, but we suppress it if DNS
+       * can provide us with the needed information
        */
-      syslog (LOG_ALERT, "pam_ldap: missing \"host\" in file \"%s\"",
-	      configFile);
-      return PAM_SERVICE_ERR;
+      if (_pam_ldap_readconfigfromdns (result) != PAM_SUCCESS)
+        {
+          syslog (LOG_ALERT, "pam_ldap: missing \"host\" in file \"%s\"",
+	          configFile);
+          return PAM_SERVICE_ERR;
+        }
     }
 
 #if !(defined(HAVE_SASL_SASL_H) || defined(HAVE_SASL_H)) && !defined(HAVE_LDAP_SASL_INTERACTIVE_BIND_S)


Index: nss_ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/F-9/nss_ldap.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- nss_ldap.spec	30 Sep 2008 17:24:12 -0000	1.97
+++ nss_ldap.spec	30 Sep 2008 17:25:19 -0000	1.98
@@ -192,7 +192,7 @@
 - add libssl and libcrypto to the list of libraries against which we link
   statically to avoid running into symbol collisions at run-time, from devel
   stream (#446860)
-- defuzz one patch by pulling and updated version from the development stream
+- defuzz one patch by pulling an updated version from the development stream
 - rebuild (#464620)
 
 * Sat May 24 2008 Dennis Gilmore <dennis at ausil.us> - 259-3.1


--- pam_ldap-176-dnsconfig.patch DELETED ---



From spot at fedoraproject.org  Tue Sep 30 17:37:14 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 30 Sep 2008 17:37:14 +0000 (UTC)
Subject: rpms/esc/devel esc-1.0.1-xulrunner-sparc-fixes.patch,NONE,1.1
Message-ID: <20080930173714.5BB3570119@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/esc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23481/devel

Added Files:
	esc-1.0.1-xulrunner-sparc-fixes.patch 
Log Message:
fix sparc

esc-1.0.1-xulrunner-sparc-fixes.patch:

--- NEW FILE esc-1.0.1-xulrunner-sparc-fixes.patch ---
--- ./configure.in.sparc	2008-09-30 13:15:07.000000000 -0400
+++ ./configure.in	2008-09-30 13:17:36.000000000 -0400
@@ -1079,7 +1079,11 @@ Alpha | alpha | ALPHA)
     CPU_ARCH=Alpha
     ;;
 
-x86_64 | sparc | ppc | ia64)
+sun4u | sparc*)
+    CPU_ARCH=sparc
+    ;;
+
+x86_64 | ia64)
     CPU_ARCH="$CPU_ARCH_TEST"
     ;;
 esac
@@ -1117,7 +1121,11 @@ if test "$GNU_CC"; then
     # -Wbad-function-cast - warns when casting a function to a new return type
     # -Wconversion - complained when char's or short's were used a function args
     # -Wshadow - removed because it generates more noise than help --pete
-    _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wall -W -Wno-unused -Wpointer-arith -Wcast-align"
+    _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wall -W -Wno-unused -Wpointer-arith"
+    if test "$CPU_ARCH" != "ia64" && test "$CPU_ARCH" != "sparc"; then
+        # don't use -Wcast-align on ia64 or sparc, it's noisy on those platforms
+        _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wcast-align"
+    fi
 
     dnl Turn pedantic on but disable the warnings for long long
     _PEDANTIC=1
@@ -1136,7 +1144,11 @@ fi
 
 if test "$GNU_CXX"; then
     # Turn on GNU specific features
-    _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
+    _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall -Wconversion -Wpointer-arith -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
+    if test "$CPU_ARCH" != "ia64" && test "$CPU_ARCH" != "sparc"; then
+        # don't use -Wcast-align on ia64 or sparc, it's noisy on those platforms
+        _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wcast-align"
+    fi
 
     _DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -include $(DEPTH)/mozilla-config.h'
     _USE_CPP_INCLUDE_FLAG=1
--- ./modules/oji/public/nsIJVMPlugin.h.sparc	2008-09-30 13:13:01.000000000 -0400
+++ ./modules/oji/public/nsIJVMPlugin.h	2008-09-30 13:13:57.000000000 -0400
@@ -51,6 +51,7 @@
 #include "nsISupports.h"
 #include "nsIPrincipal.h"
 #include "jni.h"
+#include "jstypes.h"
 
 class nsISecureEnv;
 
@@ -90,7 +91,7 @@ public:
 	GetClassPath(const char* *result) = 0;
 
 	NS_IMETHOD
-#if PR_BYTES_PER_LONG == 8
+#if JS_BYTES_PER_LONG == 8 || JS_BYTES_PER_WORD == 8
 	GetJavaWrapper(JNIEnv* jenv, jlong obj, jobject *jobj) = 0;
 #else
 	GetJavaWrapper(JNIEnv* jenv, jint obj, jobject *jobj) = 0;
@@ -114,7 +115,7 @@ public:
 	SpendTime(PRUint32 timeMillis) = 0;
 
 	NS_IMETHOD
-#if PR_BYTES_PER_LONG == 8
+#if JS_BYTES_PER_LONG == 8 || JS_BYTES_PER_WORD == 8
 	UnwrapJavaWrapper(JNIEnv* jenv, jobject jobj, jlong* obj) = 0;
 #else
 	UnwrapJavaWrapper(JNIEnv* jenv, jobject jobj, jint* obj) = 0;



From jcollie at fedoraproject.org  Tue Sep 30 17:37:19 2008
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Tue, 30 Sep 2008 17:37:19 +0000 (UTC)
Subject: rpms/zabbix/devel .cvsignore, 1.12, 1.13 sources, 1.13,
	1.14 zabbix-server.init, 1.3, 1.4 zabbix.spec, 1.25,
	1.26 zabbix-1.4.2-cpustats.patch, 1.1, NONE
Message-ID: <20080930173719.CB3A670119@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/zabbix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23351

Modified Files:
	.cvsignore sources zabbix-server.init zabbix.spec 
Removed Files:
	zabbix-1.4.2-cpustats.patch 
Log Message:
* Thu Sep 30 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6-1
- Update to final 1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	27 Jul 2008 23:03:33 -0000	1.12
+++ .cvsignore	30 Sep 2008 17:36:49 -0000	1.13
@@ -1 +1 @@
-zabbix-1.4.6.tar.gz
+zabbix-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	27 Jul 2008 23:03:33 -0000	1.13
+++ sources	30 Sep 2008 17:36:49 -0000	1.14
@@ -1 +1 @@
-4fbea19748b7e9a894a18f4e11b988ca  zabbix-1.4.6.tar.gz
+39d4c871439b1b4f0429964b4abbfc45  zabbix-1.6.tar.gz


Index: zabbix-server.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix-server.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zabbix-server.init	7 Jul 2008 08:03:13 -0000	1.3
+++ zabbix-server.init	30 Sep 2008 17:36:49 -0000	1.4
@@ -15,7 +15,16 @@
 ### END INIT INFO
 
 # zabbix details
-ZABBIX=/usr/sbin/zabbix_server
+if [ -x /usr/sbin/zabbix_server_mysql ]; then
+    ZABBIX=zabbix_server_mysql
+elif [ -x /usr/sbin/zabbix_server_pgsql ]; then
+    ZABBIX=zabbix_server_pgsql
+elif [ -x /usr/sbin/zabbix_server_sqlite3 ]; then
+    ZABBIX=zabbix_server_sqlite3
+else
+    exit 5
+fi
+
 CONF=/etc/zabbix/zabbix_server.conf
 PIDFILE=/var/run/zabbix.pid
 
@@ -28,7 +37,6 @@
 # Check that networking is up.
 [ ${NETWORKING} = "no" ] && exit 0
 
-[ -x $ZABBIX ] || exit 5
 [ -e $CONF ] || exit 6
 
 RETVAL=0
@@ -43,7 +51,7 @@
         ;;
     stop)
         echo -n "Shutting down zabbix server: "
-        killproc zabbix_server
+        killproc $ZABBIX
         RETVAL=$?
         echo
         [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/zabbix
@@ -54,7 +62,7 @@
         RETVAL=$?
         ;;
     status)
-        status zabbix_server
+        status $ZABBIX
         RETVAL=$?
         ;;
     *)


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- zabbix.spec	11 Aug 2008 23:50:59 -0000	1.25
+++ zabbix.spec	30 Sep 2008 17:36:49 -0000	1.26
@@ -1,39 +1,35 @@
 Name:           zabbix
-Version:        1.4.6
-Release:        2%{?dist}
+Version:        1.6
+Release:        0.2%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
-License:        GPLv2+
+License:        GPL
 URL:            http://www.zabbix.com/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        zabbix-web.conf
 Source2:        zabbix-server.init
 Source3:        zabbix-agent.init
-Source4:        zabbix-logrotate.in
-Patch0:         zabbix-1.4.2-cpustats.patch
+Source4:        zabbix-proxy.init
+Source5:        zabbix-logrotate.in
+
+Patch0:         zabbix-1.6-cpustats.patch
+Patch1:		zabbix-1.5.4-ifoutoctets.patch
+
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%define database mysql
-%define zdb mysql
-%define with_postgresql %{?_with_postgresql: 1} %{?!_with_postgresql: 0}
-
-# Zabbix can only be built with mysql -or- postgresql
-# support. We build with mysql by default, but you can
-# pass --with postgresql to build with postgresql instead.
-%if %{with_postgresql}
-%define database postgresql
-%define zdb pgsql
-%endif
-
-BuildRequires:  %{database}-devel, net-snmp-devel
-BuildRequires:  openldap-devel, gnutls-devel
-BuildRequires:  iksemel-devel, curl-devel
-Requires:       logrotate, fping, net-snmp-libs
-Requires(pre):      /usr/sbin/useradd
-Requires(post):     /sbin/chkconfig
-Requires(preun):    /sbin/chkconfig
-Requires(preun):    /sbin/service
+BuildRequires:   mysql-devel
+BuildRequires:   postgresql-devel
+BuildRequires:   net-snmp-devel
+BuildRequires:   openldap-devel
+BuildRequires:   gnutls-devel
+BuildRequires:   iksemel-devel
+BuildRequires:   curl-devel
+BuildRequires:   sqlite-devel
+BuildRequires:   unixODBC-devel
+
+Requires:        logrotate
+Requires(pre):   /usr/sbin/useradd
 
 %description
 ZABBIX is software that monitors numerous parameters of a
@@ -55,57 +51,217 @@
 for small organisations with a few servers and for large
 companies with a multitude of servers.
 
+%package server
+Summary:         Zabbix server common files
+Group:           Applications/Internet
+Requires:	 zabbix = %{version}-%{release}
+Requires:        zabbix-server-implementation = %{version}-%{release}
+Requires:        fping
+Requires:	 net-snmp
+Requires(post):  /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+
+%description server
+Zabbix server common files
+
+%package server-mysql
+Summary:         Zabbix server compiled to use MySQL
+Group:           Applications/Internet
+Requires:        zabbix = %{version}-%{release}
+Requires:	 zabbix-server = %{version}-%{release}
+Provides:        zabbix-server-implementation = %{version}-%{release}
+Obsoletes:       zabbix <= 1.5.3-0.1
+Conflicts:       zabbix-server-pgsql
+Conflicts:       zabbix-server-sqlite3
+
+%description server-mysql
+Zabbix server compiled to use MySQL
+
+%package server-pgsql
+Summary:         Zabbix server compiled to use PostgresSQL
+Group:           Applications/Internet
+Requires:        zabbix = %{version}-%{release}
+Requires:	 zabbix-server = %{version}-%{release}
+Provides:        zabbix-server-implementation = %{version}-%{release}
+Conflicts:       zabbix-server-mysql
+Conflicts:       zabbix-server-sqlite3
+
+%description server-pgsql
+Zabbix server compiled to use PostgresSQL
+
+%package server-sqlite3
+Summary:         Zabbix server compiled to use SQLite
+Group:           Applications/Internet
+Requires:        zabbix = %{version}-%{release}
+Requires:	 zabbix-server = %{version}-%{release}
+Provides:        zabbix-server-implementation = %{version}-%{release}
+Conflicts:       zabbix-server-mysql
+Conflicts:	 zabbix-server-pgsql
+
+%description server-sqlite3
+Zabbix server compiled to use SQLite
 
 %package agent
-Summary:        Zabbix Agent
-Group:          Applications/Internet
-Requires:       logrotate
-Requires(pre):      /usr/sbin/useradd
-Requires(post):     /sbin/chkconfig
-Requires(preun):    /sbin/chkconfig
-Requires(preun):    /sbin/service
+Summary:         Zabbix Agent
+Group:           Applications/Internet
+Requires:	 zabbix = %{version}-%{release}
+Requires(post):  /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
 
 %description agent
-The zabbix client agent, to be installed on monitored systems.
+The Zabbix client agent, to be installed on monitored systems.
+
+%package proxy
+Summary:         Zabbix Proxy
+Group:           Applications/Internet
+Requires:	 zabbix = %{version}-%{release}
+Requires:        zabbix-proxy-implementation = %{version}-%{release}
+Requires(post):  /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires:        fping
+
+%description proxy
+The Zabbix proxy
+
+%package proxy-mysql
+Summary:         Zabbix proxy compiled to use MySQL
+Group:           Applications/Internet
+Requires:	 zabbix-proxy = %{version}-%{release}
+Provides:        zabbix-proxy-implementation = %{version}-%{release}
+
+%description proxy-mysql
+The Zabbix proxy compiled to use MySQL
+
+%package proxy-pgsql
+Summary:         Zabbix proxy compiled to use PostgreSQL
+Group:           Applications/Internet
+Requires:	 zabbix-proxy = %{version}-%{release}
+Provides:        zabbix-proxy-implementation = %{version}-%{release}
+
+%description proxy-pgsql
+The Zabbix proxy compiled to use PostgreSQL
+
+%package proxy-sqlite3
+Summary:         Zabbix proxy compiled to use SQLite
+Group:           Applications/Internet
+Requires:	 zabbix-proxy = %{version}-%{release}
+Provides:        zabbix-proxy-implementation = %{version}-%{release}
+
+%description proxy-sqlite3
+The Zabbix proxy compiled to use SQLite
 
 %package web
-Summary:        Zabbix Web Frontend
-Group:          Applications/Internet
-Requires:       php, php-%{zdb}, php-gd, php-bcmath
+Summary:         Zabbix Web Frontend
+Group:           Applications/Internet
+Requires:        php
+Requires:	 php-gd
+Requires:	 php-bcmath
+Requires:	 zabbix-web-database = %{version}-%{release}
 
 %description web
 The php frontend to display the zabbix web interface.
 
+%package web-mysql
+Summary:         Zabbix web frontend for MySQL
+Group:           Applications/Internet
+Requires:	 zabbix-web = %{version}-%{release}
+Requires:	 php-mysql
+Provides:	 zabbix-web-database = %{version}-%{release}
+Obsoletes:	 zabbix-web <= 1.5.3-0.1
+
+%description web-mysql
+Zabbix web frontend for MySQL
+
+%package web-pgsql
+Summary:         Zabbix web frontend for PostgreSQL
+Group:           Applications/Internet
+Requires:	 zabbix-web = %{version}-%{release}
+Requires:	 php-pgsql
+Provides:	 zabbix-web-database = %{version}-%{release}
+
+%description web-pgsql
+Zabbix web frontend for PostgreSQL
+
+%package web-sqlite3
+Summary:         Zabbix web frontend for SQLite
+Group:           Applications/Internet
+Requires:	 zabbix-web = %{version}-%{release}
+Provides:	 zabbix-web-database = %{version}-%{release}
+
+%description web-sqlite3
+Zabbix web frontend for SQLite
+
 %prep
-%setup -q
+%setup0 -q
 %patch0 -p1 -b .cpustats
+%patch1 -p1 -b .ifoutoctets
+
+chmod -R a+rX .
 
-# shuffle sql init files around to fix up install
-mkdir -p dbinit/{schema,data}
-cp create/schema/%{database}.sql dbinit/schema/
-cp create/data/images_%{zdb}.sql dbinit/data/
-cp create/data/data.sql dbinit/data/
+# nuke erronious executable permissions
+#chmod -x src/zabbix_agent/eventlog.c
 
 # fix up some lib64 issues
 %{__perl} -pi.orig -e 's|_LIBDIR=/usr/lib|_LIBDIR=%{_libdir}|g' \
     configure
 
-
 %build
-#export LIBCURL_LDFLAGS="-I%{_includedir}/curl"
-#export LIBCURL_LIBS="-lcurl"
+
 %configure \
     --enable-server \
     --enable-agent \
-    --with-%{zdb} \
+    --enable-proxy \
+    --enable-ipv6 \
+    --with-mysql \
     --with-net-snmp \
     --with-ldap \
     --with-libcurl \
-    --with-jabber
+    --with-jabber \
+    --with-unixodbc
 
-#make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 make %{?_smp_mflags}
 
+mv src/zabbix_server/zabbix_server src/zabbix_server/zabbix_server_mysql
+mv src/zabbix_proxy/zabbix_proxy src/zabbix_proxy/zabbix_proxy_mysql
+
+%configure \
+    --enable-server \
+    --enable-agent \
+    --enable-proxy \
+    --enable-ipv6 \
+    --with-pgsql \
+    --with-net-snmp \
+    --with-ldap \
+    --with-libcurl \
+    --with-jabber \
+    --with-unixodbc
+
+make %{?_smp_mflags}
+mv src/zabbix_server/zabbix_server src/zabbix_server/zabbix_server_pgsql
+mv src/zabbix_proxy/zabbix_proxy src/zabbix_proxy/zabbix_proxy_pgsql
+
+%configure \
+    --enable-server \
+    --enable-agent \
+    --enable-proxy \
+    --enable-ipv6 \
+    --with-sqlite3 \
+    --with-net-snmp \
+    --with-ldap \
+    --with-libcurl \
+    --with-jabber \
+    --with-unixodbc
+
+make %{?_smp_mflags}
+mv src/zabbix_server/zabbix_server src/zabbix_server/zabbix_server_sqlite3
+mv src/zabbix_proxy/zabbix_proxy src/zabbix_proxy/zabbix_proxy_sqlite3
+
+touch src/zabbix_server/zabbix_server
+touch src/zabbix_proxy/zabbix_proxy
+
 %install
 rm -rf $RPM_BUILD_ROOT
 # set up some required directories
@@ -116,6 +272,13 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}
+
+#rm create/Makefile*
+#rm create/data/images_oracle.sql
+#rm create/schema/oracle.sql
+#rm -r upgrades/dbpatches/1.6/oracle
+
+#pushd %{name}-%{version}-mysql
 # php frontend
 cp -a frontends/php $RPM_BUILD_ROOT%{_datadir}/%{name}
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/include/db.inc.php \
@@ -133,7 +296,7 @@
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/include/.htaccess
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/include/classes/.htaccess
 # drop config files in place
-install -m 0644 misc/conf/zabbix_agent.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+install -m 0644 -p misc/conf/zabbix_agent.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 cat misc/conf/zabbix_agentd.conf | sed \
     -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix_agentd.pid|g' \
     -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_agentd.log|g' \
@@ -145,30 +308,42 @@
     -e 's|#LogFileSize=.*|LogFileSize=0|g' \
     -e 's|AlertScriptsPath=/home/zabbix/bin/|AlertScriptsPath=%{_localstatedir}/lib/zabbix/|g' \
     -e 's|DBUser=root|DBUser=zabbix|g' \
-    -e 's|DBSocket=/tmp/mysql.sock|DBSocket=%{_localstatedir}/lib/%{zdb}/%{zdb}.sock|g' \
+    -e 's|DBSocket=/tmp/mysql.sock|DBSocket=%{_localstatedir}/lib/mysql/mysql.sock|g' \
     > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/zabbix_server.conf
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
+cat misc/conf/zabbix_proxy.conf | sed \
+    -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix_proxy.pid|g' \
+    -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_proxy.log|g' \
+    -e 's|#LogFileSize=.*|LogFileSize=0|g' \
+    -e 's|AlertScriptsPath=/home/zabbix/bin/|AlertScriptsPath=%{_localstatedir}/lib/zabbix/|g' \
+    -e 's|DBUser=root|DBUser=zabbix|g' \
+    -e 's|DBSocket=/tmp/mysql.sock|DBSocket=%{_localstatedir}/lib/mysql/mysql.sock|g' \
+    > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/zabbix_proxy.conf
+install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
 # log rotation
-cat %{SOURCE4} | sed -e 's|COMPONENT|server|g' > \
-     $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix
-cat %{SOURCE4} | sed -e 's|COMPONENT|agentd|g' > \
+cat %{SOURCE5} | sed -e 's|COMPONENT|server|g' > \
+     $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-server
+cat %{SOURCE5} | sed -e 's|COMPONENT|agentd|g' > \
      $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-agent
+cat %{SOURCE5} | sed -e 's|COMPONENT|proxy|g' > \
+     $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-proxy
 # init scripts
-install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/zabbix
-install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/zabbix-agent
+install -m 0755 -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/zabbix-server
+install -m 0755 -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/zabbix-agent
+install -m 0755 -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/zabbix-proxy
 
 # set up config dir
 
 # install
 make DESTDIR=$RPM_BUILD_ROOT install
+rm $RPM_BUILD_ROOT%{_sbindir}/zabbix_server
+install -m 0755 -p src/zabbix_server/zabbix_server_* $RPM_BUILD_ROOT%{_sbindir}/
+rm $RPM_BUILD_ROOT%{_sbindir}/zabbix_proxy
+install -m 0755 -p src/zabbix_proxy/zabbix_proxy_* $RPM_BUILD_ROOT%{_sbindir}/
 
 # nuke static libs and empty oracle upgrade sql
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libzbx*.a upgrades/dbpatches/1.4/oracle
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libzbx*.a
 # nuke extraneous sql files
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/create
-# nuke erronious executable permissions
-chmod -x src/zabbix_agent/eventlog.c
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -178,22 +353,20 @@
 /usr/sbin/useradd -c "Zabbix Monitoring System" \
         -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} zabbix 2> /dev/null || :
 
-%pre agent
-# Add the "zabbix" user
-/usr/sbin/useradd -c "Zabbix Monitoring System" \
-        -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} zabbix 2> /dev/null || :
-
-%post
-/sbin/chkconfig --add zabbix
+%post server
+/sbin/chkconfig --add zabbix-server
 
 %post agent
 /sbin/chkconfig --add zabbix-agent
 
-%preun
+%post proxy
+/sbin/chkconfig --add zabbix-proxy
+
+%preun server
 if [ "$1" = 0 ]
 then
-  /sbin/service zabbix stop >/dev/null 2>&1 || :
-  /sbin/chkconfig --del zabbix
+  /sbin/service zabbix-server stop >/dev/null 2>&1 || :
+  /sbin/chkconfig --del zabbix-server
 fi
 
 %preun agent
@@ -203,55 +376,97 @@
   /sbin/chkconfig --del zabbix-agent
 fi
 
+%preun proxy
+if [ "$1" = 0 ]
+then
+  /sbin/service zabbix-proxy stop >/dev/null 2>&1 || :
+  /sbin/chkconfig --del zabbix-proxy
+fi
+
 %files
 %defattr(-,root,root,-)
+%dir %{_sysconfdir}/zabbix
+%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/zabbix
+%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/zabbix
+
+%files server
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README
-%doc docs/*.pdf upgrades/dbpatches dbinit
-%dir %{_sysconfdir}/%{name}
-%{_sbindir}/zabbix_server
-%{_sysconfdir}/init.d/zabbix
-%config(noreplace) %{_sysconfdir}/logrotate.d/zabbix
-%config(noreplace) %{_sysconfdir}/%{name}/zabbix_server.conf
-%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/%{name}
-%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/%{name}
+%doc docs/*.pdf upgrades/dbpatches create/data create/schema
+%config(noreplace) %{_sysconfdir}/zabbix/zabbix_server.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-server
+%{_sysconfdir}/init.d/zabbix-server
+
+%files server-mysql
+%doc AUTHORS ChangeLog COPYING FAQ NEWS README
+%defattr(-,root,root,-)
+%{_sbindir}/zabbix_server_mysql
+
+%files server-pgsql
+%doc AUTHORS ChangeLog COPYING FAQ NEWS README
+%defattr(-,root,root,-)
+%{_sbindir}/zabbix_server_pgsql
+
+%files server-sqlite3
+%doc AUTHORS ChangeLog COPYING FAQ NEWS README
+%defattr(-,root,root,-)
+%{_sbindir}/zabbix_server_sqlite3
 
 %files agent
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README
-%dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent.conf
+%config(noreplace) %{_sysconfdir}/zabbix/zabbix_agentd.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-agent
+%{_sysconfdir}/init.d/zabbix-agent
 %{_sbindir}/zabbix_agent
 %{_sbindir}/zabbix_agentd
 %{_sbindir}/zabbix_sender
 %{_sbindir}/zabbix_get
-%{_sysconfdir}/init.d/zabbix-agent
-%config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-agent
-%config(noreplace) %{_sysconfdir}/%{name}/zabbix_agent.conf
-%config(noreplace) %{_sysconfdir}/%{name}/zabbix_agentd.conf
-%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/%{name}
-%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/%{name}
+
+%files proxy
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING FAQ NEWS README
+%config(noreplace) %{_sysconfdir}/zabbix/zabbix_proxy.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-proxy
+%{_sysconfdir}/init.d/zabbix-proxy
+
+%files proxy-mysql
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING FAQ NEWS README
+%{_sbindir}/zabbix_proxy_mysql
+
+%files proxy-pgsql
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING FAQ NEWS README
+%{_sbindir}/zabbix_proxy_pgsql
+
+%files proxy-sqlite3
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING FAQ NEWS README
+%{_sbindir}/zabbix_proxy_sqlite3
 
 %files web
 %defattr(-,root,root,-)
-%doc README
-%dir %{_sysconfdir}/%{name}
-%config(noreplace) %{_sysconfdir}/%{name}/zabbix.conf.php
-%config(noreplace) %{_sysconfdir}/%{name}/db.inc.php
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/audio
-%dir %{_datadir}/%{name}/conf
-%dir %{_datadir}/%{name}/images
-%dir %{_datadir}/%{name}/include
-%dir %{_datadir}/%{name}/js
-%{_datadir}/%{name}/*.php
-%{_datadir}/%{name}/css.css
-%{_datadir}/%{name}/audio/*
-%{_datadir}/%{name}/conf/*
-%{_datadir}/%{name}/images/*
-%{_datadir}/%{name}/include/*
-%{_datadir}/%{name}/js/*
+%doc AUTHORS ChangeLog COPYING FAQ NEWS README
+%config(noreplace) %{_sysconfdir}/zabbix/zabbix.conf.php
+%config(noreplace) %{_sysconfdir}/zabbix/db.inc.php
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/zabbix.conf
+%{_datadir}/zabbix
+
+%files web-mysql
+%defattr(-,root,root,-)
+
+%files web-pgsql
+%defattr(-,root,root,-)
+
+%files web-sqlite3
+%defattr(-,root,root,-)
 
 %changelog
+* Thu Sep 30 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6-1
+- Update to final 1.6
+
 * Mon Aug 11 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.4.6-2
 - Fix license tag.
 


--- zabbix-1.4.2-cpustats.patch DELETED ---



From spot at fedoraproject.org  Tue Sep 30 17:37:43 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 30 Sep 2008 17:37:43 +0000 (UTC)
Subject: rpms/esc/F-9 esc-1.0.1-xulrunner-sparc-fixes.patch, NONE,
	1.1 esc.spec, 1.34, 1.35
Message-ID: <20080930173743.DDB6A70119@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/esc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23481/F-9

Modified Files:
	esc.spec 
Added Files:
	esc-1.0.1-xulrunner-sparc-fixes.patch 
Log Message:
fix sparc

esc-1.0.1-xulrunner-sparc-fixes.patch:

--- NEW FILE esc-1.0.1-xulrunner-sparc-fixes.patch ---
--- ./configure.in.sparc	2008-09-30 13:15:07.000000000 -0400
+++ ./configure.in	2008-09-30 13:17:36.000000000 -0400
@@ -1079,7 +1079,11 @@ Alpha | alpha | ALPHA)
     CPU_ARCH=Alpha
     ;;
 
-x86_64 | sparc | ppc | ia64)
+sun4u | sparc*)
+    CPU_ARCH=sparc
+    ;;
+
+x86_64 | ia64)
     CPU_ARCH="$CPU_ARCH_TEST"
     ;;
 esac
@@ -1117,7 +1121,11 @@ if test "$GNU_CC"; then
     # -Wbad-function-cast - warns when casting a function to a new return type
     # -Wconversion - complained when char's or short's were used a function args
     # -Wshadow - removed because it generates more noise than help --pete
-    _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wall -W -Wno-unused -Wpointer-arith -Wcast-align"
+    _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wall -W -Wno-unused -Wpointer-arith"
+    if test "$CPU_ARCH" != "ia64" && test "$CPU_ARCH" != "sparc"; then
+        # don't use -Wcast-align on ia64 or sparc, it's noisy on those platforms
+        _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wcast-align"
+    fi
 
     dnl Turn pedantic on but disable the warnings for long long
     _PEDANTIC=1
@@ -1136,7 +1144,11 @@ fi
 
 if test "$GNU_CXX"; then
     # Turn on GNU specific features
-    _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
+    _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall -Wconversion -Wpointer-arith -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
+    if test "$CPU_ARCH" != "ia64" && test "$CPU_ARCH" != "sparc"; then
+        # don't use -Wcast-align on ia64 or sparc, it's noisy on those platforms
+        _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wcast-align"
+    fi
 
     _DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -include $(DEPTH)/mozilla-config.h'
     _USE_CPP_INCLUDE_FLAG=1
--- ./modules/oji/public/nsIJVMPlugin.h.sparc	2008-09-30 13:13:01.000000000 -0400
+++ ./modules/oji/public/nsIJVMPlugin.h	2008-09-30 13:13:57.000000000 -0400
@@ -51,6 +51,7 @@
 #include "nsISupports.h"
 #include "nsIPrincipal.h"
 #include "jni.h"
+#include "jstypes.h"
 
 class nsISecureEnv;
 
@@ -90,7 +91,7 @@ public:
 	GetClassPath(const char* *result) = 0;
 
 	NS_IMETHOD
-#if PR_BYTES_PER_LONG == 8
+#if JS_BYTES_PER_LONG == 8 || JS_BYTES_PER_WORD == 8
 	GetJavaWrapper(JNIEnv* jenv, jlong obj, jobject *jobj) = 0;
 #else
 	GetJavaWrapper(JNIEnv* jenv, jint obj, jobject *jobj) = 0;
@@ -114,7 +115,7 @@ public:
 	SpendTime(PRUint32 timeMillis) = 0;
 
 	NS_IMETHOD
-#if PR_BYTES_PER_LONG == 8
+#if JS_BYTES_PER_LONG == 8 || JS_BYTES_PER_WORD == 8
 	UnwrapJavaWrapper(JNIEnv* jenv, jobject jobj, jlong* obj) = 0;
 #else
 	UnwrapJavaWrapper(JNIEnv* jenv, jobject jobj, jint* obj) = 0;


Index: esc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/esc/F-9/esc.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- esc.spec	14 Feb 2008 23:58:51 -0000	1.34
+++ esc.spec	30 Sep 2008 17:37:13 -0000	1.35
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.0.1
-Release: 9%{?dist} 
+Release: 10%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL+
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -18,6 +18,7 @@
 Patch8: esc-1.0.1-misc.patch
 Patch9:  esc-1.0.1-nss-devel-fix.patch
 Patch10: firefox.secalg.patch
+Patch11: esc-1.0.1-xulrunner-sparc-fixes.patch
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -90,10 +91,11 @@
 %patch1 -p1 -b .fix1
 %patch2 -p1 -b .fix2
 %patch10 -p1 -b .secalg
+%patch11 -p1 -b .sparc
 
 %build
 
-%ifarch x86_64 ppc64 ia64
+%ifarch x86_64 ppc64 ia64 sparc64
 USE_64=1
 export USE_64
 %endif
@@ -126,7 +128,7 @@
 
 mkdir -p $RPM_BUILD_ROOT/%{escdir}
 
-%ifarch x86_64 ppc64 ia64
+%ifarch x86_64 ppc64 ia64 sparc64
 USE_64=1
 export USE_64
 %endif
@@ -193,13 +195,15 @@
 fi
 
 %changelog
+* Tue Sep 30 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-10
+- fix esc for sparc/sparc64
+
 * Wed Feb 13 2008 Jack Magne <jmagne at redhat.com>
 - Fix xulrunner build problem.
 * Fri Jan 18 2008 Jack Magne <jmagne at redhat.com> 
 - Fix tray icon menu issue #253248.
 * Thu Aug 30 2007 Jack Magne <jmagne at redhat.com> 
 - License field change- 1.0.1-7
-
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.0.1-6
 - Rebuild for selinux ppc32 issue.
 



From jcollie at fedoraproject.org  Tue Sep 30 17:39:17 2008
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Tue, 30 Sep 2008 17:39:17 +0000 (UTC)
Subject: rpms/zabbix/devel zabbix-1.5.4-ifoutoctets.patch, NONE,
	1.1 zabbix-1.6-cpustats.patch, NONE, 1.1 zabbix.spec, 1.26, 1.27
Message-ID: <20080930173917.F373B70119@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/zabbix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23927

Modified Files:
	zabbix.spec 
Added Files:
	zabbix-1.5.4-ifoutoctets.patch zabbix-1.6-cpustats.patch 
Log Message:
* Thu Sep 30 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6-1
- Update to final 1.6


zabbix-1.5.4-ifoutoctets.patch:

--- NEW FILE zabbix-1.5.4-ifoutoctets.patch ---
diff --git a/src/zabbix_server/poller/checks_snmp.c b/src/zabbix_server/poller/checks_snmp.c
index 81c2f5d..be6a322 100644
--- a/src/zabbix_server/poller/checks_snmp.c
+++ b/src/zabbix_server/poller/checks_snmp.c
@@ -875,7 +875,8 @@ static ZBX_MIB_NORM mibs[]=
 	{"ifInDiscards",	"1.3.6.1.2.1.2.2.1.13"},
 	{"ifInErrors",		"1.3.6.1.2.1.2.2.1.14"},
 	{"ifInUnknownProtos",	"1.3.6.1.2.1.2.2.1.15"},
-	{"ifOutOctets",		"1.3.6.1.2.1.2.2.1.17"},
+	{"ifOutOctets",		"1.3.6.1.2.1.2.2.1.16"},
+	{"ifOutUcastPkts",	"1.3.6.1.2.1.2.2.1.17"},
 	{"ifOutNUcastPkts",	"1.3.6.1.2.1.2.2.1.18"},
 	{"ifOutDiscards",	"1.3.6.1.2.1.2.2.1.19"},
 	{"ifOutErrors",		"1.3.6.1.2.1.2.2.1.20"},

zabbix-1.6-cpustats.patch:

--- NEW FILE zabbix-1.6-cpustats.patch ---
diff --git a/src/libs/zbxsysinfo/linux/cpu.c b/src/libs/zbxsysinfo/linux/cpu.c
index d77d1e6..ac021bb 100644
--- a/src/libs/zbxsysinfo/linux/cpu.c
+++ b/src/libs/zbxsysinfo/linux/cpu.c
@@ -154,6 +154,43 @@ int	SYSTEM_CPU_UTIL(const char *cmd, const char *param, unsigned flags, AGENT_RE
 		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system15)
 		else return SYSINFO_RET_FAIL;
 	}
+	else if( 0 == strcmp(type,"idle"))
+	{
+		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
+		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		else return SYSINFO_RET_FAIL;
+
+	}
+//	else if( 0 == strcmp(type,"iowait"))
+	else if( 0 == strcmp(type,"wait"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"irq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"softirq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"steal"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal15)
+		else return SYSINFO_RET_FAIL;
+	}
 	else
 	{
 		return SYSINFO_RET_FAIL;
diff --git a/src/zabbix_agent/cpustat.c b/src/zabbix_agent/cpustat.c
index 61b9b95..b34d919 100644
--- a/src/zabbix_agent/cpustat.c
+++ b/src/zabbix_agent/cpustat.c
@@ -180,10 +180,14 @@ static int	get_cpustat(
 		int cpuid,
 		int *now,
 		zbx_uint64_t *cpu_user,
-		zbx_uint64_t *cpu_system,
 		zbx_uint64_t *cpu_nice,
+		zbx_uint64_t *cpu_system,
 		zbx_uint64_t *cpu_idle,
-		zbx_uint64_t *cpu_interrupt
+		zbx_uint64_t *cpu_interrupt,
+		zbx_uint64_t *cpu_iowait,
+		zbx_uint64_t *cpu_irq,
+		zbx_uint64_t *cpu_softirq,
+		zbx_uint64_t *cpu_steal
 	)
 {
     #if defined(HAVE_PROC_STAT)
@@ -218,7 +222,7 @@ static int	get_cpustat(
 		return 1;
 	}
 
-	*cpu_user = *cpu_system = *cpu_nice = *cpu_idle = -1;
+	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = *cpu_iowait = *cpu_irq = *cpu_softirq = *cpu_steal = 0;
 	*cpu_interrupt	= 0;
 
 	zbx_snprintf(cpu_name, sizeof(cpu_name), "cpu%c ", cpuid > 0 ? '0' + (cpuid - 1) : ' ');
@@ -227,7 +231,8 @@ static int	get_cpustat(
 	{
 		if(strstr(line, cpu_name) == NULL) continue;
 
-		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64, cpu_user, cpu_nice, cpu_system, cpu_idle);
+		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64,
+		    cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 		break;
 	}
 	zbx_fclose(file);
@@ -290,10 +295,14 @@ static void	apply_cpustat(
 	int cpuid,
 	int now, 
 	zbx_uint64_t cpu_user, 
-	zbx_uint64_t cpu_system,
 	zbx_uint64_t cpu_nice,
+	zbx_uint64_t cpu_system,
 	zbx_uint64_t cpu_idle,
-	zbx_uint64_t cpu_interrupt
+	zbx_uint64_t cpu_interrupt,
+	zbx_uint64_t cpu_iowait,
+	zbx_uint64_t cpu_irq,
+	zbx_uint64_t cpu_softirq,
+	zbx_uint64_t cpu_steal
 	)
 {
 	register int	i	= 0;
@@ -304,8 +313,13 @@ static void	apply_cpustat(
 			nice = 0, nice1 = 0, nice5 = 0, nice15 = 0,
 			idle = 0, idle1 = 0, idle5 = 0, idle15 = 0,
 			interrupt = 0, interrupt1 = 0, interrupt5 = 0, interrupt15 = 0,
+		iowait	= 0, iowait1	= 0, iowait5	= 0, iowait15= 0,
+			irq	= 0, irq1	= 0, irq5	= 0, irq15	= 0,
+			softirq		= 0,	softirq1	= 0, softirq5	= 0, softirq15	= 0,
+			steal	= 0, steal1	= 0, steal5	= 0, steal15	= 0,
 			all = 0, all1 = 0, all5 = 0, all15 = 0;
 
+
 	ZBX_SINGLE_CPU_STAT_DATA
 			*curr_cpu = &pcpus->cpu[cpuid];
 
@@ -320,8 +334,12 @@ static void	apply_cpustat(
 		curr_cpu->h_nice[i] = nice = cpu_nice;
 		curr_cpu->h_idle[i] = idle = cpu_idle;
 		curr_cpu->h_interrupt[i] = interrupt = cpu_interrupt;
+		curr_cpu->h_iowait[i] = iowait = cpu_iowait;
+    curr_cpu->h_irq[i]	= irq = cpu_irq;
+    curr_cpu->h_softirq[i] =  softirq = cpu_softirq;
+    curr_cpu->h_steal[i] = steal	= cpu_steal;
 
-		all = cpu_user + cpu_system + cpu_nice + cpu_idle + cpu_interrupt;
+		all = cpu_user + cpu_system + cpu_nice + cpu_idle + cpu_interrupt + cpu_iowait + cpu_irq + cpu_softirq + cpu_steal;
 		break;
 	}
 
@@ -331,6 +349,11 @@ static void	apply_cpustat(
 	{
 		if (0 == curr_cpu->clock[i])
 			continue;
+			iowait	= curr_cpu->h_iowait[i];
+			irq	= curr_cpu->h_irq[i];
+			softirq	= curr_cpu->h_softirq[i];
+			steal	= curr_cpu->h_steal[i];
+			all	= user + nice + system +  idle + iowait + irq + softirq + steal;
 
 #define SAVE_CPU_CLOCK_FOR(t)											\
 		if ((curr_cpu->clock[i] >= (now - (t * 60))) && (time ## t > curr_cpu->clock[i]))		\
@@ -341,7 +364,11 @@ static void	apply_cpustat(
 			nice ## t	= curr_cpu->h_nice[i];							\
 			idle ## t	= curr_cpu->h_idle[i];							\
 			interrupt ## t	= curr_cpu->h_interrupt[i];						\
-			all ## t	= user ## t + system ## t + nice ## t + idle ## t + interrupt ## t;	\
+	iowait ## t = curr_cpu->h_iowait[i];	\
+	irq ## t = curr_cpu->h_irq[i];	\
+	softirq ## t	= curr_cpu->h_softirq[i];					\
+			steal ## t	= curr_cpu->h_steal[i];						\
+			all ## t	= user ## t + nice ## t + system ## t + idle ## t + iowait ## t + irq ## t + softirq ## t + steal ##t;	\
 		}
 
 		SAVE_CPU_CLOCK_FOR(1);
@@ -364,6 +391,7 @@ static void	apply_cpustat(
 	CALC_CPU_LOAD(user, 5);
 	CALC_CPU_LOAD(user, 15);
 
+
 	CALC_CPU_LOAD(system, 1);
 	CALC_CPU_LOAD(system, 5);
 	CALC_CPU_LOAD(system, 15);
@@ -379,7 +407,22 @@ static void	apply_cpustat(
 	CALC_CPU_LOAD(interrupt, 1);
 	CALC_CPU_LOAD(interrupt, 5);
 	CALC_CPU_LOAD(interrupt, 15);
-}
+
+	CALC_CPU_LOAD(iowait, 1);
+	CALC_CPU_LOAD(iowait, 5);
+	CALC_CPU_LOAD(iowait, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
+
+	CALC_CPU_LOAD(softirq, 1);
+	CALC_CPU_LOAD(softirq, 5);
+	CALC_CPU_LOAD(softirq, 15);
+
+	CALC_CPU_LOAD(steal, 1);
+	CALC_CPU_LOAD(steal, 5);
+	CALC_CPU_LOAD(steal, 15);}
 
 #endif /* not _WINDOWS */
 
@@ -499,14 +542,14 @@ void	collect_cpustat(ZBX_CPUS_STAT_DATA *pcpus)
 	register int i = 0;
 	int	now = 0;
 
-	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_interrupt;
+	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal, cpu_interrupt;
 
 	for ( i = 0; i <= pcpus->count; i++ )
 	{
-		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_system, &cpu_nice, &cpu_idle, &cpu_interrupt))
+		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_nice, &cpu_system, &cpu_idle, &cpu_iowait, &cpu_irq, &cpu_softirq, &cpu_steal, &cpu_interrupt))
 			continue;
 
-		apply_cpustat(pcpus, i, now, cpu_user, cpu_system, cpu_nice, cpu_idle, cpu_interrupt);
+		apply_cpustat(pcpus, i, now, cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal, cpu_interrupt);
 	}
 
 #endif /* _WINDOWS */
diff --git a/src/zabbix_agent/cpustat.h b/src/zabbix_agent/cpustat.h
index 7cf2cb4..9521d02 100644
--- a/src/zabbix_agent/cpustat.h
+++ b/src/zabbix_agent/cpustat.h
@@ -67,27 +67,43 @@
 		/* private */
 		int	clock[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_user[MAX_CPU_HISTORY];
-		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_nice[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_idle[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_iowait[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_interrupt[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_irq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_softirq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_steal[MAX_CPU_HISTORY];
 
 		/* public */
 		double	user1;
 		double	user5;
 		double	user15;
-		double	system1;
-		double	system5;
-		double	system15;
 		double	nice1;
 		double	nice5;
 		double	nice15;
+		double	system1;
+		double	system5;
+		double	system15;
 		double	idle1;
 		double	idle5;
 		double	idle15;
 		double	interrupt1;
 		double	interrupt5;
 		double	interrupt15;
+		double	iowait1;
+		double	iowait5;
+		double	iowait15;
+		double	irq1;
+		double	irq5;
+		double	irq15;
+		double	softirq1;
+		double	softirq5;
+		double	softirq15;
+		double	steal1;
+		double	steal5;
+		double	steal15;
 
 	} ZBX_SINGLE_CPU_STAT_DATA;
 


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- zabbix.spec	30 Sep 2008 17:36:49 -0000	1.26
+++ zabbix.spec	30 Sep 2008 17:38:47 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           zabbix
 Version:        1.6
-Release:        0.2%{?dist}
+Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet



From spot at fedoraproject.org  Tue Sep 30 17:41:33 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 30 Sep 2008 17:41:33 +0000 (UTC)
Subject: rpms/esc/devel esc.spec,1.34,1.35
Message-ID: <20080930174133.1E6EF70119@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/esc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24668

Modified Files:
	esc.spec 
Log Message:
fix sparc


Index: esc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/esc/devel/esc.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- esc.spec	14 Feb 2008 23:58:51 -0000	1.34
+++ esc.spec	30 Sep 2008 17:41:02 -0000	1.35
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.0.1
-Release: 9%{?dist} 
+Release: 10%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL+
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -18,6 +18,7 @@
 Patch8: esc-1.0.1-misc.patch
 Patch9:  esc-1.0.1-nss-devel-fix.patch
 Patch10: firefox.secalg.patch
+Patch11: esc-1.0.1-xulrunner-sparc-fixes.patch
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -90,10 +91,11 @@
 %patch1 -p1 -b .fix1
 %patch2 -p1 -b .fix2
 %patch10 -p1 -b .secalg
+%patch11 -p1 -b .sparc
 
 %build
 
-%ifarch x86_64 ppc64 ia64
+%ifarch x86_64 ppc64 ia64 sparc64
 USE_64=1
 export USE_64
 %endif
@@ -126,7 +128,7 @@
 
 mkdir -p $RPM_BUILD_ROOT/%{escdir}
 
-%ifarch x86_64 ppc64 ia64
+%ifarch x86_64 ppc64 ia64 sparc64
 USE_64=1
 export USE_64
 %endif
@@ -193,13 +195,15 @@
 fi
 
 %changelog
+* Tue Sep 30 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-10
+- fix esc for sparc/sparc64
+
 * Wed Feb 13 2008 Jack Magne <jmagne at redhat.com>
 - Fix xulrunner build problem.
 * Fri Jan 18 2008 Jack Magne <jmagne at redhat.com> 
 - Fix tray icon menu issue #253248.
 * Thu Aug 30 2007 Jack Magne <jmagne at redhat.com> 
 - License field change- 1.0.1-7
-
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.0.1-6
 - Rebuild for selinux ppc32 issue.
 



From jcollie at fedoraproject.org  Tue Sep 30 17:42:03 2008
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Tue, 30 Sep 2008 17:42:03 +0000 (UTC)
Subject: rpms/zabbix/devel zabbix-proxy.init,NONE,1.1 zabbix.spec,1.27,1.28
Message-ID: <20080930174203.CEDC970119@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/zabbix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24789

Modified Files:
	zabbix.spec 
Added Files:
	zabbix-proxy.init 
Log Message:
* Tue Sep 30 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6-1.1
- Bump release because forgot to add some new files.



--- NEW FILE zabbix-proxy.init ---
#! /bin/sh
#
# chkconfig: - 85 15
# description: zabbix proxy daemon
#

### BEGIN INIT INFO
# Provides: zabbix
# Required-Start: $local_fs $network
# Required-Stop: $local_fs $network
# Default-Start:
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: start and stop zabbix proxy
# Description: Zabbix Proxy
### END INIT INFO

# zabbix details
if [ -x /usr/sbin/zabbix_proxy_mysql ]; then
    ZABBIX_PROXY=zabbix_proxy_mysql
elif [ -x /usr/sbin/zabbix_proxy_pgsql ]; then
    ZABBIX_PROXY=zabbix_proxy_pgsql
elif [ -x /usr/sbin/zabbix_proxy_sqlite3 ]; then
    ZABBIX_PROXY=zabbix_proxy_sqlite3
else
    exit 5
fi

CONF=/etc/zabbix/zabbix_proxy.conf
PIDFILE=/var/run/zabbix.pid

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

[ -e $CONF ] || exit 6

RETVAL=0

case "$1" in
    start)
        echo -n "Starting Zabbix proxy: "
        daemon $ZABBIX_PROXY -c $CONF
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/zabbix-proxy
        ;;
    stop)
        echo -n "Shutting down Zabbix proxy: "
        killproc $ZABBIX_PROXY
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/zabbix-proxy
        ;;
    restart|reload)
        $0 stop
        $0 start
        RETVAL=$?
        ;;
    status)
        status $ZABBIX_PROXY
        RETVAL=$?
        ;;
    *)
	echo "Usage: $0 {start|stop|restart|reload|status}"
	exit 1
	;;
esac

exit $RETVAL



Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- zabbix.spec	30 Sep 2008 17:38:47 -0000	1.27
+++ zabbix.spec	30 Sep 2008 17:41:33 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           zabbix
 Version:        1.6
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -464,6 +464,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Sep 30 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6-1.1
+- Bump release because forgot to add some new files.
+
 * Thu Sep 30 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6-1
 - Update to final 1.6
 



From ricky at fedoraproject.org  Tue Sep 30 17:43:17 2008
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 30 Sep 2008 17:43:17 +0000 (UTC)
Subject: rpms/python-webob/F-8 python-webob.spec,1.2,1.3
Message-ID: <20080930174317.6DAF570119@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-webob/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25112/F-8

Modified Files:
	python-webob.spec 
Log Message:
Add BuildRequires for python-tempita for doctests.



Index: python-webob.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/F-8/python-webob.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-webob.spec	30 Sep 2008 17:22:27 -0000	1.2
+++ python-webob.spec	30 Sep 2008 17:42:47 -0000	1.3
@@ -3,7 +3,7 @@
 Name:           python-webob
 Summary:        WSGI request and response object
 Version:        0.9.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://pythonpaste.org/webob/
@@ -14,6 +14,7 @@
 BuildRequires:  python-setuptools-devel
 BuildRequires:  python-nose
 BuildRequires:  python-dtopt
+BuildRequires:  python-tempita
 
 %description
 WebOb provides wrappers around the WSGI request environment, and an object to 
@@ -55,6 +56,9 @@
 
 %changelog
 * Tue Sep 30 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.3-1
+- Add BuildRequires on python-tempita.
+
+* Tue Sep 30 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.3-1
 - Upstream released new version.
 
 * Thu Jul 17 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.2-2



From ricky at fedoraproject.org  Tue Sep 30 17:43:17 2008
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 30 Sep 2008 17:43:17 +0000 (UTC)
Subject: rpms/python-webob/F-9 python-webob.spec,1.2,1.3
Message-ID: <20080930174317.A416770119@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-webob/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25112/F-9

Modified Files:
	python-webob.spec 
Log Message:
Add BuildRequires for python-tempita for doctests.



Index: python-webob.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/F-9/python-webob.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-webob.spec	30 Sep 2008 17:20:29 -0000	1.2
+++ python-webob.spec	30 Sep 2008 17:42:47 -0000	1.3
@@ -3,7 +3,7 @@
 Name:           python-webob
 Summary:        WSGI request and response object
 Version:        0.9.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://pythonpaste.org/webob/
@@ -14,6 +14,7 @@
 BuildRequires:  python-setuptools-devel
 BuildRequires:  python-nose
 BuildRequires:  python-dtopt
+BuildRequires:  python-tempita
 
 %description
 WebOb provides wrappers around the WSGI request environment, and an object to 
@@ -55,6 +56,9 @@
 
 %changelog
 * Tue Sep 30 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.3-1
+- Add BuildRequires on python-tempita.
+
+* Tue Sep 30 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.3-1
 - Upstream released new version.
 
 * Thu Jul 17 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.2-2



From ricky at fedoraproject.org  Tue Sep 30 17:43:17 2008
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 30 Sep 2008 17:43:17 +0000 (UTC)
Subject: rpms/python-webob/devel python-webob.spec,1.2,1.3
Message-ID: <20080930174317.DB68B70119@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-webob/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25112/devel

Modified Files:
	python-webob.spec 
Log Message:
Add BuildRequires for python-tempita for doctests.



Index: python-webob.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/devel/python-webob.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-webob.spec	30 Sep 2008 17:17:19 -0000	1.2
+++ python-webob.spec	30 Sep 2008 17:42:47 -0000	1.3
@@ -3,7 +3,7 @@
 Name:           python-webob
 Summary:        WSGI request and response object
 Version:        0.9.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://pythonpaste.org/webob/
@@ -14,6 +14,7 @@
 BuildRequires:  python-setuptools-devel
 BuildRequires:  python-nose
 BuildRequires:  python-dtopt
+BuildRequires:  python-tempita
 
 %description
 WebOb provides wrappers around the WSGI request environment, and an object to 
@@ -55,6 +56,9 @@
 
 %changelog
 * Tue Sep 30 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.3-1
+- Add BuildRequires on python-tempita.
+
+* Tue Sep 30 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.3-1
 - Upstream released new version.
 
 * Thu Jul 17 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.2-2



From ricky at fedoraproject.org  Tue Sep 30 17:52:35 2008
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 30 Sep 2008 17:52:35 +0000 (UTC)
Subject: rpms/python-webob/F-8 python-webob.spec,1.3,1.4
Message-ID: <20080930175235.AE5C070119@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-webob/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26973/F-8

Modified Files:
	python-webob.spec 
Log Message:
Fix changelog entry.



Index: python-webob.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/F-8/python-webob.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-webob.spec	30 Sep 2008 17:42:47 -0000	1.3
+++ python-webob.spec	30 Sep 2008 17:52:05 -0000	1.4
@@ -55,7 +55,7 @@
 %{python_sitelib}/WebOb*.egg-info/
 
 %changelog
-* Tue Sep 30 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.3-1
+* Tue Sep 30 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.3-2
 - Add BuildRequires on python-tempita.
 
 * Tue Sep 30 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.3-1



From ricky at fedoraproject.org  Tue Sep 30 17:52:36 2008
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 30 Sep 2008 17:52:36 +0000 (UTC)
Subject: rpms/python-webob/devel python-webob.spec,1.3,1.4
Message-ID: <20080930175236.2717B70119@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-webob/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26973/devel

Modified Files:
	python-webob.spec 
Log Message:
Fix changelog entry.



Index: python-webob.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/devel/python-webob.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-webob.spec	30 Sep 2008 17:42:47 -0000	1.3
+++ python-webob.spec	30 Sep 2008 17:52:05 -0000	1.4
@@ -55,7 +55,7 @@
 %{python_sitelib}/WebOb*.egg-info/
 
 %changelog
-* Tue Sep 30 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.3-1
+* Tue Sep 30 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.3-2
 - Add BuildRequires on python-tempita.
 
 * Tue Sep 30 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.3-1



From ricky at fedoraproject.org  Tue Sep 30 17:52:35 2008
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 30 Sep 2008 17:52:35 +0000 (UTC)
Subject: rpms/python-webob/F-9 python-webob.spec,1.3,1.4
Message-ID: <20080930175235.CCFEB70119@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-webob/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26973/F-9

Modified Files:
	python-webob.spec 
Log Message:
Fix changelog entry.



Index: python-webob.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/F-9/python-webob.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-webob.spec	30 Sep 2008 17:42:47 -0000	1.3
+++ python-webob.spec	30 Sep 2008 17:52:05 -0000	1.4
@@ -55,7 +55,7 @@
 %{python_sitelib}/WebOb*.egg-info/
 
 %changelog
-* Tue Sep 30 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.3-1
+* Tue Sep 30 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.3-2
 - Add BuildRequires on python-tempita.
 
 * Tue Sep 30 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.3-1



From beuc at fedoraproject.org  Tue Sep 30 18:20:21 2008
From: beuc at fedoraproject.org (Sylvain Beucler)
Date: Tue, 30 Sep 2008 18:20:21 +0000 (UTC)
Subject: rpms/freedink/devel freedink.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930182021.EE72D70119@cvs1.fedora.phx.redhat.com>

Author: beuc

Update of /cvs/pkgs/rpms/freedink/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv574/devel

Modified Files:
	.cvsignore sources 
Added Files:
	freedink.spec import.log 
Log Message:
Tue Sep 30 2008 Sylvain Beucler <beuc at beuc.net> - 1.08.20090920-3
- Initial import



--- NEW FILE freedink.spec ---
Name:		freedink
Version:	1.08.20080920
Release:	3%{?dist}
Summary:	Adventure and role-playing game

Group:		Amusements/Games
BuildRequires:	SDL-devel SDL_gfx-devel SDL_ttf-devel SDL_image-devel SDL_mixer-devel fontconfig-devel
BuildRequires:  desktop-file-utils
License:	GPLv3+
URL:		http://www.freedink.org/
Source0:	ftp://ftp.gnu.org/gnu/freedink/freedink-%{version}.tar.gz
#Source0:	http://www.freedink.org/snapshots/freedink-%{version}.tar.gz

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	freedink-engine = %{version}-%{release}  freedink-dfarc

%description
Dink Smallwood is an adventure/role-playing game, similar to Zelda,
made by RTsoft. Besides twisted humour, it includes the actual game
editor, allowing players to create hundreds of new adventures called
Dink Modules or D-Mods for short.

GNU FreeDink is a new and portable version of the game engine, which
runs the original game as well as its D-Mods, with close
compatibility, under multiple platforms.

This package is a metapackage to install the game, its data and a
front-end to manage game options and D-Mods.


%package engine
Summary:	Adventure and role-playing game (engine)
Group:		Amusements/Games
Requires:	freedink-data
# TiMidity++ is useful to play midis when /dev/sequencer isn't
# functional (most of the case) and installing it prevents some
# SDL_mixer freezes (see TROUBLESHOOTING).  In Fedora this is done
# through SDL_mixer dependencies.
%if 0%{?fedora} >= 10
# See 'install' for explanation
# and http://fedoraproject.org/wiki/Packaging/DistTag for '{fedora}'
Requires: liberation-fonts
%endif

%description engine
Dink Smallwood is an adventure/role-playing game, similar to Zelda,
made by RTsoft. Besides twisted humour, it includes the actual game
editor, allowing players to create hundreds of new adventures called
Dink Modules or D-Mods for short.

GNU FreeDink is a new and portable version of the game engine, which
runs the original game as well as its D-Mods, with close
compatibility, under multiple platforms.

This package contains the game engine alone.


%prep
%setup -q

%build
# Using '--disable-embedded-resources' because 'rpmbuild' will remove
# them anyway (so it can make the -debuginfo package -- too bad :/)
%configure --disable-embedded-resources 
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}edit.desktop
%if 0%{?fedora} >= 10
# http://fedoraproject.org/wiki/Packaging/Guidelines#Avoid_bundling_of_fonts_in_other_packages
# Policy insists on not installing a different version of "Liberation
# Sans". Beware that the system version may be different than the
# official FreeDink font, because Liberation changes regularly.
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/LiberationSans-Regular.ttf
%endif

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)

%files engine
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README THANKS TROUBLESHOOTING ChangeLog
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/%{name}/
%{_datadir}/pixmaps/*
%{_mandir}/man6/*


%changelog
* Wed Sep 24 2008 Sylvain Beucler <beuc at beuc.net> - 1.08.20080920-3
- Don't use 'update-desktop-database' for simple desktop files
- Fix unescaped macros in comments
- Use spaces around '=' in version-specific dependency

* Wed Sep 24 2008 Sylvain Beucler <beuc at beuc.net> - 1.08.20080920-2
- Fix variable s/fedora_version/fedora/
- Meta-package depends on same version of freedink-engine
- Use "install -p" to preserve timestamps
- Validate installed .desktop files

* Sat Sep 20 2008 Sylvain Beucler <beuc at beuc.net> - 1.08.20080920-1
- New upstream release

* Thu Aug 28 2008 Sylvain Beucler <beuc at beuc.net> - 1.08.20080828-1
- Initial package


--- NEW FILE import.log ---
freedink-1_08_20080920-3_fc8:HEAD:freedink-1.08.20080920-3.fc8.src.rpm:1222798636


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freedink/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2008 19:21:27 -0000	1.1
+++ .cvsignore	30 Sep 2008 18:19:51 -0000	1.2
@@ -0,0 +1 @@
+freedink-1.08.20080920.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freedink/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 19:21:27 -0000	1.1
+++ sources	30 Sep 2008 18:19:51 -0000	1.2
@@ -0,0 +1 @@
+0e7a2a5af1c2e3498c7179e6cad02de9  freedink-1.08.20080920.tar.gz



From nsantos at fedoraproject.org  Tue Sep 30 18:21:42 2008
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Tue, 30 Sep 2008 18:21:42 +0000 (UTC)
Subject: rpms/rhm/F-9 .cvsignore, 1.5, 1.6 rhm.spec, 1.22, 1.23 sources, 1.10,
	1.11
Message-ID: <20080930182142.ACE6D70119@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/rhm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1352

Modified Files:
	.cvsignore rhm.spec sources 
Log Message:
rebase to svn rev 2432


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rhm/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Jul 2008 19:42:56 -0000	1.5
+++ .cvsignore	30 Sep 2008 18:21:12 -0000	1.6
@@ -1 +1 @@
-rhm-0.2.2153.tar.gz
+rhm-0.2.2432.tar.gz


Index: rhm.spec
===================================================================
RCS file: /cvs/extras/rpms/rhm/F-9/rhm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- rhm.spec	15 Jul 2008 21:07:13 -0000	1.22
+++ rhm.spec	30 Sep 2008 18:21:12 -0000	1.23
@@ -2,15 +2,16 @@
 # Spec file for Red Hat Messaging package rhm.
 #
 
-%define svnrev 2153
-# built against qpidc svn rev 667603
+%define svnrev 2432
+# built against qpidc svn rev 693140
+%define svnrev_qpid 693140
 
 Name:           rhm
 Version:        0.2.%{svnrev}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Red Hat persistence extension to the Qpid messaging system
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2+
 URL:            http://rhm.et.redhat.com
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,7 +25,7 @@
 BuildRequires: python
 BuildRequires: libtool
 
-Requires: qpidd >= 0.2.667603
+Requires: qpidd >= 0.3.%{svnrev_qpid}
 Requires: db4
 Requires: libaio
 
@@ -64,6 +65,12 @@
 
 
 %changelog
+* Tue Sep  9 2008 Nuno Santos <nsantos at redhat.com> - 0.2.2432-1
+- Update for Fedora 10
+
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.2153-3
+- fix license tag
+
 * Tue Jul 15 2008 Nuno Santos <nsantos at redhat.com> - 0.2.2153-2
 - BZ359461: fix package URL
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rhm/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	1 Jul 2008 19:42:56 -0000	1.10
+++ sources	30 Sep 2008 18:21:12 -0000	1.11
@@ -1 +1 @@
-d7210b111bde8a0ddba10a09d9be5966  rhm-0.2.2153.tar.gz
+4a1d09e59c357a84d7b2d07ad08c2d99  rhm-0.2.2432.tar.gz



From steved at fedoraproject.org  Tue Sep 30 18:24:47 2008
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue, 30 Sep 2008 18:24:47 +0000 (UTC)
Subject: rpms/rpcbind/devel rpcbind.init,1.10,1.11 rpcbind.spec,1.34,1.35
Message-ID: <20080930182447.4221270119@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1987

Modified Files:
	rpcbind.init rpcbind.spec 
Log Message:
- Fixed a typo in the rpcbind.init script that stop warm starts
  from happening with conrestarts



Index: rpcbind.init
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rpcbind.init	11 Feb 2008 16:06:13 -0000	1.10
+++ rpcbind.init	30 Sep 2008 18:24:16 -0000	1.11
@@ -75,13 +75,13 @@
 	status $prog
 	;;
   restart|reload)
-	$0 stop
-	$0 start
+	stop
+	start
 	;;
   condrestart)
 	if [ -f /var/lock/subsys/$prog ]; then
-		$0 stop
-		$0 start -w
+		stop
+		start -w
 	fi
 	;;
   *)


Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- rpcbind.spec	16 Sep 2008 17:20:30 -0000	1.34
+++ rpcbind.spec	30 Sep 2008 18:24:16 -0000	1.35
@@ -2,7 +2,7 @@
 
 Name:           rpcbind
 Version:        0.1.6
-Release: 		2%{?dist}
+Release: 		3%{?dist}
 Summary:        Universal Addresses to RPC Program Number Mapper
 Group:          System Environment/Daemons
 License:        GPL
@@ -118,6 +118,10 @@
 %dir %attr(700,rpc,rpc) /var/lib/rpcbind
 
 %changelog
+* Tue Sep 30 2008 Steve Dickson <steved at redhat.com>  0.1.6-3
+- Fixed a typo in the rpcbind.init script that stop warm starts
+  from happening with conrestarts
+
 * Tue Sep 16 2008 Steve Dickson <steved at redhat.com> 0.1.6-2
 - Added usptream patches 01 thru 03 that do:
     * Introduce helpers for ipprot/netid mapping



From ausil at fedoraproject.org  Tue Sep 30 18:32:48 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 30 Sep 2008 18:32:48 +0000 (UTC)
Subject: rpms/nspr/F-9 nspr.spec,1.34,1.35
Message-ID: <20080930183248.9B1E870119@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/nspr/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3769

Modified Files:
	nspr.spec 
Log Message:
add sparc64 to the 64 bit arch list



Index: nspr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspr/F-9/nspr.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- nspr.spec	2 Jun 2008 10:56:16 -0000	1.34
+++ nspr.spec	30 Sep 2008 18:32:17 -0000	1.35
@@ -53,7 +53,7 @@
                  --prefix=%{_prefix} \
                  --libdir=%{_libdir} \
                  --includedir=%{_includedir}/nspr4 \
-%ifarch x86_64 ppc64 ia64 s390x
+%ifarch x86_64 ppc64 ia64 s390x sparc64
                  --enable-64bit \
 %endif
                  --enable-optimize="$RPM_OPT_FLAGS" \
@@ -131,6 +131,9 @@
 %{_bindir}/nspr-config
 
 %changelog
+* Tue Sep 30 2008 Dennis Gilmore <dennis at ausil.us> - 4.7.1-0.9.2
+- sparc64 is a 64 bit arch
+
 * Mon Jun 02 2008 Kai Engert <kengert at redhat.com> - 4.7.1-0.9.1
 - Update to 4.7.1
 



From ausil at fedoraproject.org  Tue Sep 30 18:34:30 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 30 Sep 2008 18:34:30 +0000 (UTC)
Subject: rpms/nspr/F-9 nspr.spec,1.35,1.36
Message-ID: <20080930183430.F01EF70119@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/nspr/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4149

Modified Files:
	nspr.spec 
Log Message:
actually bump the release :)



Index: nspr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspr/F-9/nspr.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- nspr.spec	30 Sep 2008 18:32:17 -0000	1.35
+++ nspr.spec	30 Sep 2008 18:34:00 -0000	1.36
@@ -1,7 +1,7 @@
 Summary:        Netscape Portable Runtime
 Name:           nspr
 Version:        4.7.1
-Release:        0.9.1%{?dist}
+Release:        0.9.2%{?dist}
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/nspr/
 Group:          System Environment/Libraries



From ausil at fedoraproject.org  Tue Sep 30 18:38:29 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 30 Sep 2008 18:38:29 +0000 (UTC)
Subject: rpms/nspr/devel nspr.spec,1.34,1.35
Message-ID: <20080930183829.57EA370119@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/nspr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4573

Modified Files:
	nspr.spec 
Log Message:
add sparc64 to list of 64 bit arches



Index: nspr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspr/devel/nspr.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- nspr.spec	2 Jun 2008 10:51:52 -0000	1.34
+++ nspr.spec	30 Sep 2008 18:37:59 -0000	1.35
@@ -1,7 +1,7 @@
 Summary:        Netscape Portable Runtime
 Name:           nspr
 Version:        4.7.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/nspr/
 Group:          System Environment/Libraries
@@ -53,7 +53,7 @@
                  --prefix=%{_prefix} \
                  --libdir=%{_libdir} \
                  --includedir=%{_includedir}/nspr4 \
-%ifarch x86_64 ppc64 ia64 s390x
+%ifarch x86_64 ppc64 ia64 s390x sparc64
                  --enable-64bit \
 %endif
                  --enable-optimize="$RPM_OPT_FLAGS" \
@@ -131,6 +131,9 @@
 %{_bindir}/nspr-config
 
 %changelog
+* Tue Sep 30 2008 Dennis Gilmore <dennis at ausil.us> - 4.7.1-3
+- add sparc64 to the list of 64 bit arches
+
 * Mon Jun 02 2008 Kai Engert <kengert at redhat.com> - 4.7.1-2
 - Update to 4.7.1
 



From notting at fedoraproject.org  Tue Sep 30 19:01:20 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 30 Sep 2008 19:01:20 +0000 (UTC)
Subject: rpms/initscripts/devel .cvsignore, 1.153, 1.154 initscripts.spec,
	1.180, 1.181 sources, 1.169, 1.170
Message-ID: <20080930190120.AD2F87013D@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6316

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
8.83-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- .cvsignore	10 Sep 2008 21:37:39 -0000	1.153
+++ .cvsignore	30 Sep 2008 19:00:50 -0000	1.154
@@ -1 +1 @@
-initscripts-8.82.tar.bz2
+initscripts-8.83.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- initscripts.spec	10 Sep 2008 21:37:39 -0000	1.180
+++ initscripts.spec	30 Sep 2008 19:00:50 -0000	1.181
@@ -2,13 +2,14 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.82
+Version: 8.83
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
 Release: 1
-Source: initscripts-%{version}.tar.bz2
-BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root
+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
@@ -18,7 +19,6 @@
 Requires: bash >= 3.0
 %if with_upstart
 Requires: upstart
-Obsoletes: event-compat-sysv
 %else
 Requires: SysVinit >= 2.85-38
 %endif
@@ -36,9 +36,10 @@
 Conflicts: alsa-utils < 1.0.14-0.5.rc2.fc7
 # http://bugzilla.redhat.com/show_bug.cgi?id=252973
 Conflicts: nut < 2.2.0
-Obsoletes: rhsound sapinit
 Obsoletes: hotplug
-Prereq: /sbin/chkconfig, /usr/sbin/groupadd, /bin/sed, coreutils
+Requires(pre): /usr/sbin/groupadd
+Requires(post): /sbin/chkconfig, coreutils
+Requires(preun): /sbin/chkconfig
 BuildRequires: glib2-devel popt-devel gettext pkgconfig
 
 %description
@@ -84,7 +85,7 @@
 rm -f \
  $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ctc \
  $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-iucv \
- $RPM_BUILD_ROOT/etc/udev/rules.d/55-ccw.rules \
+ $RPM_BUILD_ROOT/lib/udev/rules.d/55-ccw.rules \
  $RPM_BUILD_ROOT/lib/udev/ccw_init
 %else
 rm -f \
@@ -105,11 +106,6 @@
 /sbin/chkconfig --add network
 /sbin/chkconfig --add netconsole
 
-# Handle converting prefdm back to respawn
-if fgrep -q "x:5:once:/etc/X11/prefdm -nodaemon" /etc/inittab ; then
-    sed --in-place=.rpmsave 's|^x:5:once:/etc/X11/prefdm -nodaemon|x:5:respawn:/etc/X11/prefdm -nodaemon|g' /etc/inittab
-fi
-
 %preun
 if [ $1 = 0 ]; then
   /sbin/chkconfig --del netfs
@@ -134,7 +130,7 @@
 %config(noreplace) /etc/sysconfig/readonly-root
 /etc/sysconfig/network-scripts/ifdown
 /sbin/ifdown
-%config /etc/sysconfig/network-scripts/ifdown-post
+/etc/sysconfig/network-scripts/ifdown-post
 /etc/sysconfig/network-scripts/ifup
 /sbin/ifup
 %dir /etc/sysconfig/console
@@ -143,44 +139,44 @@
 %dir /etc/sysconfig/networking/devices
 %dir /etc/sysconfig/networking/profiles
 %dir /etc/sysconfig/networking/profiles/default
-%config /etc/sysconfig/network-scripts/network-functions
-%config /etc/sysconfig/network-scripts/network-functions-ipv6
-%config /etc/sysconfig/network-scripts/init.ipv6-global
-%config /etc/sysconfig/network-scripts/ifcfg-lo
-%config /etc/sysconfig/network-scripts/ifup-ipx
-%config /etc/sysconfig/network-scripts/ifup-post
-%config /etc/sysconfig/network-scripts/ifdown-ppp
-%config /etc/sysconfig/network-scripts/ifdown-sl
-%config /etc/sysconfig/network-scripts/ifup-ppp
-%config /etc/sysconfig/network-scripts/ifup-sl
-%config /etc/sysconfig/network-scripts/ifup-routes
-%config /etc/sysconfig/network-scripts/ifdown-routes
-%config /etc/sysconfig/network-scripts/ifup-plip
-%config /etc/sysconfig/network-scripts/ifup-plusb
-%config /etc/sysconfig/network-scripts/ifup-bnep
-%config /etc/sysconfig/network-scripts/ifdown-bnep
-%config /etc/sysconfig/network-scripts/ifup-eth
-%config /etc/sysconfig/network-scripts/ifdown-eth
-%config /etc/sysconfig/network-scripts/ifup-ipv6
-%config /etc/sysconfig/network-scripts/ifdown-ipv6
-%config /etc/sysconfig/network-scripts/ifup-ipsec
-%config /etc/sysconfig/network-scripts/ifdown-ipsec
-%config /etc/sysconfig/network-scripts/ifup-sit
-%config /etc/sysconfig/network-scripts/ifdown-sit
-%config /etc/sysconfig/network-scripts/ifup-tunnel
-%config /etc/sysconfig/network-scripts/ifdown-tunnel
-%config /etc/sysconfig/network-scripts/ifup-aliases
-%config /etc/sysconfig/network-scripts/ifup-ippp
-%config /etc/sysconfig/network-scripts/ifdown-ippp
-%config /etc/sysconfig/network-scripts/ifup-wireless
+/etc/sysconfig/network-scripts/network-functions
+/etc/sysconfig/network-scripts/network-functions-ipv6
+/etc/sysconfig/network-scripts/init.ipv6-global
+/etc/sysconfig/network-scripts/ifcfg-lo
+/etc/sysconfig/network-scripts/ifup-ipx
+/etc/sysconfig/network-scripts/ifup-post
+/etc/sysconfig/network-scripts/ifdown-ppp
+/etc/sysconfig/network-scripts/ifdown-sl
+/etc/sysconfig/network-scripts/ifup-ppp
+/etc/sysconfig/network-scripts/ifup-sl
+/etc/sysconfig/network-scripts/ifup-routes
+/etc/sysconfig/network-scripts/ifdown-routes
+/etc/sysconfig/network-scripts/ifup-plip
+/etc/sysconfig/network-scripts/ifup-plusb
+/etc/sysconfig/network-scripts/ifup-bnep
+/etc/sysconfig/network-scripts/ifdown-bnep
+/etc/sysconfig/network-scripts/ifup-eth
+/etc/sysconfig/network-scripts/ifdown-eth
+/etc/sysconfig/network-scripts/ifup-ipv6
+/etc/sysconfig/network-scripts/ifdown-ipv6
+/etc/sysconfig/network-scripts/ifup-ipsec
+/etc/sysconfig/network-scripts/ifdown-ipsec
+/etc/sysconfig/network-scripts/ifup-sit
+/etc/sysconfig/network-scripts/ifdown-sit
+/etc/sysconfig/network-scripts/ifup-tunnel
+/etc/sysconfig/network-scripts/ifdown-tunnel
+/etc/sysconfig/network-scripts/ifup-aliases
+/etc/sysconfig/network-scripts/ifup-ippp
+/etc/sysconfig/network-scripts/ifdown-ippp
+/etc/sysconfig/network-scripts/ifup-wireless
 /etc/sysconfig/network-scripts/ifup-isdn
 /etc/sysconfig/network-scripts/ifdown-isdn
 /etc/sysconfig/network-scripts/net.hotplug
 %ifarch s390 s390x
-%config /etc/sysconfig/network-scripts/ifup-ctc
-%config /etc/sysconfig/network-scripts/ifup-iucv
+/etc/sysconfig/network-scripts/ifup-ctc
+/etc/sysconfig/network-scripts/ifup-iucv
 %endif
-%config(noreplace) /etc/networks 
+%config(noreplace) /etc/networks
 /etc/rwtab
 %dir /etc/rwtab.d
 /etc/statetab
@@ -188,7 +184,6 @@
 %if with_upstart
 %config(noreplace) /etc/event.d/*
 %endif
-/etc/udev/rules.d/*
 %config /etc/X11/prefdm
 %config(noreplace) /etc/inittab
 %dir /etc/rc.d
@@ -199,10 +194,10 @@
 %dir /etc/rc.d/init.d
 /etc/rc.local
 /etc/rc.sysinit
-%config /etc/rc.d/init.d/*
-%config /etc/rc.d/rc
+/etc/rc.d/init.d/*
+/etc/rc.d/rc
 %config(noreplace) /etc/rc.d/rc.local
-%config /etc/rc.d/rc.sysinit
+/etc/rc.d/rc.sysinit
 %config(noreplace) /etc/sysctl.conf
 %exclude /etc/profile.d/debug*
 %config /etc/profile.d/*
@@ -219,6 +214,7 @@
 /sbin/securetty
 %attr(2755,root,root) /sbin/netreport
 /sbin/initlog
+/lib/udev/rules.d/*
 /lib/udev/rename_device
 /lib/udev/console_init
 /lib/udev/console_check
@@ -231,13 +227,13 @@
 %dir %attr(775,root,root) /var/run/netreport
 %dir /etc/ppp
 %dir /etc/ppp/peers
-%config /etc/ppp/ip-up
-%config /etc/ppp/ip-down
-%config /etc/ppp/ip-up.ipv6to4
-%config /etc/ppp/ip-down.ipv6to4
-%config /etc/ppp/ipv6-up
-%config /etc/ppp/ipv6-down
-%config /etc/initlog.conf
+/etc/ppp/ip-up
+/etc/ppp/ip-down
+/etc/ppp/ip-up.ipv6to4
+/etc/ppp/ip-down.ipv6to4
+/etc/ppp/ipv6-up
+/etc/ppp/ipv6-down
+%config(noreplace) /etc/initlog.conf
 %dir /etc/NetworkManager
 %dir /etc/NetworkManager/dispatcher.d
 /etc/NetworkManager/dispatcher.d/00-netreport
@@ -249,10 +245,28 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %files -n debugmode
+%defattr(-,root,root)
 %config(noreplace) /etc/sysconfig/debug
 %config /etc/profile.d/debug*
 
 %changelog
+* Tue Sep 30 2008 Bill Nottingham <notting at redhat.com> - 8.83-1
+- various merge review fixes (#225900)
+  Notably: init scripts/network scripts are no longer %config
+- remove some extraneous device-mapper initialization
+- use pidfile in status before calling pidof (#463205)
+- use plymouth directly, not the rhgb-client wrapper
+- move bridging after bonding (#449950, <djuran at redhat.com>)
+- use alsactl to save sound settings. (#462677, <jkysela at redhat.com>)
+- quit plymouth differently (<rstrode at redhat.com>)
+- make sure we don't try and spawn a repair shell when there's no
+  tty (#463161)
+- move udev rules to /lib
+- stateless updates (#433702, <harald at redhat.com>)
+- call logger with a full path (#447928, <harald at redhat.com>)
+- translation updates: as, bn_IN, ca, cz, de, es, fi, fr, gu, it, ja,
+  lv, mr, nl, or, pa, pl, pt_BR, ru, te, zh_TW
+
 * Wed Sep 10 2008 Bill Nottingham <notting at redhat.com> - 8.82-1
 - refresh translation strings
 - plymouth updates. (#460702, <rstrode at redhat.com>)
@@ -425,7 +439,7 @@
 - translation updates: as, bn_IN, bg, ca, cs, de, el, es, fi, gu, hi, it, ja, ko, kn, ml,
   mr, nb, nl, pa, pl, pt, pt_BR, ro, sl, sr, sr at Latn, sv, ta, te, zh_CN
 
-* Wed Aug 29 2007 Bill Nottingham <notting at redhat.com> - 8.56-1 
+* Wed Aug 29 2007 Bill Nottingham <notting at redhat.com> - 8.56-1
 - rename_device: fix open() call
 - rc.sysinit: optimize out some excess greps (<harald at redhat.com>)
 - halt: support newer nut syntax, conflict with old versions (#252973, <tsmetana at redhat.com>)
@@ -555,7 +569,7 @@
 - run rc.sysinit, /etc/rc in monitor mode (part of #184340)
 - use a better check for 'native' services (#190989, #110761, adapted
   from <matthias at rpmforge.net>)
-  
+ 
 * Tue Sep 19 2006 Bill Nottingham <notting at redhat.com> 8.41-1
 - fix network ipv6 hang (#207137, others)
 - rc.sysinit: change blkid.tab path to /etc/blkid/blkid.tab
@@ -620,7 +634,7 @@
 - ipsec: various fixes & new features (#150682, #168972, <mitr at redhat.com>, <alex at milivojevic.org>)
 - ipsec: add check for IKE_METHOD (#197576, <john_smyth at mail.ru>)
 - rename_device: ignore alias devices, fix race (#186355)
-- ifup/ifdown: don't mark as %config
+- ifup/ifdown: don't mark as %%config
 - rwtab: some additions/cleanup
 
 * Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> 8.35-1
@@ -744,7 +758,7 @@
 
 * Fri Dec  2 2005 Bill Nottingham <notting at redhat.com> 8.18-1
 - use new dhclient file paths, add appropriate conflict (#169164)
-	
+
 * Wed Oct  5 2005 Bill Nottingham <notting at redhat.com> 8.17-1
 - make sure corefile limiting works for user processes as well
   (#166511, <ville.skytta at iki.fi>)
@@ -849,7 +863,7 @@
 - rc.sysinit: fix restorecon invocation (#153100)
 - initlog: free some of the more egregious memory leaks (#85935)
 - initlog: fix potential memory overread (#153685, <in-redhat at baka.org>)
-- remove some conflicts, %post scripts, etc. that were only relelvant
+- remove some conflicts, %%post scripts, etc. that were only relelvant
   for upgrades from pre-7.0
 - other minor fixes, see ChangeLog
 
@@ -900,7 +914,7 @@
   for ipv6calc (<pb at bierenger.de>, <pekkas at netcore.fi>)
 - fix quoting in daemon() (#144634)
 - make sysctl be silent (#144483)
-  
+ 
 * Mon Jan  3 2005 Bill Nottingham <notting at redhat.com> 8.02-1
 - remove initlog, minilogd
 - add a flag to kmodule for use with kudzu's socket mode, use it
@@ -923,14 +937,14 @@
 - rc.d/init.d/netfs: don't mount GFS (#140281)
 - fix various minilogd bogosities (#106338)
 
-* Mon Nov 15 2004 Karsten Hopp <karsten at redhat.de> 7.97-1 
+* Mon Nov 15 2004 Karsten Hopp <karsten at redhat.de> 7.97-1
 - configure CTC protocol if CTCPROT is set (#133088)
 
 * Mon Nov 15 2004 Bill Nottingham <notting at redhat.com>
 - fix check_link_down to still check negotiation if link is
   listed as "up" on entering (#110164, <dbaron at dbaron.org>)
 
-* Thu Nov 11 2004 Karsten Hopp <karsten at redhat.de> 7.96-1 
+* Thu Nov 11 2004 Karsten Hopp <karsten at redhat.de> 7.96-1
 - parse OPTIONS for QETH, CTC, LCS interfaces (#136256, mainframe)
 
 * Tue Nov  9 2004 Bill Nottingham <notting at redhat.com>
@@ -952,15 +966,15 @@
 * Sun Oct 31 2004 Florian La Roche <laroche at redhat.com>
 - /etc/rc.d/rc: use "LC_ALL=C grep" for small speedup
 - /etc/rc.d/rc.sysinit:
-	- do not read udev.conf, this seems to be all in the start_udev script
-	- fix detection of "nomodules" kernel command line option
-	- read /proc/cmdline earlier and convert rhgb to use that, too
-	- load_module(): change redirection to /dev/null
-	- some checks for RHGB_STARTED="" looked strange
+  - do not read udev.conf, this seems to be all in the start_udev script
+  - fix detection of "nomodules" kernel command line option
+  - read /proc/cmdline earlier and convert rhgb to use that, too
+  - load_module(): change redirection to /dev/null
+  - some checks for RHGB_STARTED="" looked strange
 - /etc/sysconfig/network-scripts/ifup-ppp:
-	- remove a call to basename with shell builtins
+  - remove a call to basename with shell builtins
 - /etc/sysconfig/network-scripts/network-functions:
-	- remove some calls to basename/sed with shell builtins
+  - remove some calls to basename/sed with shell builtins
 
 * Wed Oct 27 2004 Bill Nottingham <notting at redhat.com> 7.93.2-1
 - fix prefdm fallback to installed display managers (#137274)
@@ -981,7 +995,7 @@
 - ifup-wireless: fix key for open vs. restricted (#135235, <dax at gurulabs.com>)
 - translation updates
 
-* Fri Oct 08 2004 Karsten Hopp <karsten at redhat.de> 7.90-1 
+* Fri Oct 08 2004 Karsten Hopp <karsten at redhat.de> 7.90-1
 - fix portname for LCS devices
 
 * Fri Oct 08 2004 Bill Nottingham <notting at redhat.com>
@@ -994,7 +1008,7 @@
 - fix requires
 
 * Tue Oct  5 2004 Dan Walsh <dwalsh at redhat.com> - 7.87-1
-- Change SELinux relabel to not remount / 
+- Change SELinux relabel to not remount /
 
 * Mon Oct  4 2004 Bill Nottingham <notting at redhat.com>
 - use runuser instead of su; require it
@@ -1033,7 +1047,7 @@
 - initscripts.spec: require nash (#132513)
 - translation updates
 
-* Tue Sep 14 2004 Karsten Hopp <karsten at redhat.de> 7.81-1 
+* Tue Sep 14 2004 Karsten Hopp <karsten at redhat.de> 7.81-1
 - load iucv device config after /etc/sysconfig/network so that
   GATEWAY doesn't get overwritten
 
@@ -1057,18 +1071,18 @@
 - remove triggers for ancient releases, bulletproof remaining ones (#131356)
 
 * Wed Sep  1 2004 Jeremy Katz <katzj at redhat.com> - 7.76-1
-- udev uses UDEV_TMPFS now 
+- udev uses UDEV_TMPFS now
 
-* Wed Sep 01 2004 Karsten Hopp <karsten at redhat.de> 7.75-1 
+* Wed Sep 01 2004 Karsten Hopp <karsten at redhat.de> 7.75-1
 - fix sysfs configuration of qeth and lcs network interfaces
   (eth, tr, hsi)
 
-* Mon Aug 30 2004 Karsten Hopp <karsten at redhat.de> 7.74-1 
+* Mon Aug 30 2004 Karsten Hopp <karsten at redhat.de> 7.74-1
 - fix support for LCS portnumbers (mainframe)
 
 * Fri Aug 27 2004 Jason Vas Dias  <jvdias at redhat.com> 7.73-1
-- Add support for running the DHCPv6 client to ifup 
-- (new DHCPV6C=yes/no ifcfg-${IF} variable) + update sysconfig.txt 
+- Add support for running the DHCPv6 client to ifup
+- (new DHCPV6C=yes/no ifcfg-${IF} variable) + update sysconfig.txt
 
 * Fri Aug 27 2004 Bill Nottingham <notting at redhat.com> 7.72-1
 - flip the kernel conflict to a Requires:
@@ -1084,8 +1098,8 @@
 - rc.sysinit: remove devfs compat and the remaining 2.4 compat
 - ifup-wireless: support multiple keys (#127957)
 - fix firmware loading (#129155, <bnocera at redhat.com>)
-	
-* Tue Aug 24 2004 Karsten Hopp <karsten at redhat.de> 7.68-1 
+ 
+* Tue Aug 24 2004 Karsten Hopp <karsten at redhat.de> 7.68-1
 - execute zfcfconf.sh if available (mainframe)
 
 * Mon Aug 20 2004 Jason Vas Dias <jvdias at redhat.com> 7.67-1
@@ -1104,7 +1118,7 @@
 
 * Fri Aug 20 2004 Bill Nottingham <notting at redhat.com> 7.64-1
 - rc.d/rc.sysinit: check for dev file too (#130350)
-	
+ 
 * Thu Aug 19 2004 Than Ngo <than at redhat.com> 7.63-1
 - allow CBCP with own number (#125710)
 
@@ -1124,7 +1138,7 @@
 * Tue Aug 11 2004 Jason Vas Dias <jvdias at redhat.com> 7.61-1
 - fix for bug 120093: add PERSISTENT_DHCLIENT option to ifcfg files
 
-* Tue Aug  3 2004 Karsten Hopp <karsten at redhat.de> 7.60-1 
+* Tue Aug  3 2004 Karsten Hopp <karsten at redhat.de> 7.60-1
 - write peerid into sysfs for IUCV devices (mainframe)
 
 * Tue Aug  3 2004 Bill Nottingham <notting at redhat.com>
@@ -1162,7 +1176,7 @@
 * Tue May 25 2004 Bill Nottingham <notting at redhat.com> 7.57-1
 - readonly root fixes (<alexl at redhat.com>)
 
-* Tue May 25 2004 Karsten Hopp <karsten at redhat.de> 7.56-1 
+* Tue May 25 2004 Karsten Hopp <karsten at redhat.de> 7.56-1
 - special TYPE for qeth devices to differenciate them from ethX
 
 * Mon May 24 2004 Bill Nottingham <notting at redhat.com>
@@ -1172,7 +1186,7 @@
 - fix bridging confusing module order (#122848, <luto at myrealbox.com>)
 - rc.d/rc.sysinit: don't mount cifs (#122501)
 
-* Tue May 18 2004 Karsten Hopp <karsten at redhat.de> 7.55-1 
+* Tue May 18 2004 Karsten Hopp <karsten at redhat.de> 7.55-1
 - add support for ccwgroup devices on mainframe
 
 * Thu May 13 2004 Than Ngo <than at redhat.com> 7.54-1
@@ -1372,20 +1386,20 @@
 - rc.d/init.d/functions: make strstr() even shorter, remove old
   "case" version that has been already commented out
 - rc.d/rc.sysinit:
-	- no need to set NETWORKING=no, it is not used/exported
-	- do not export BOOTUP
-	- delete two "sleep 1" calls that wants to add time to go
-	  into confirmation mode. There is enough time to press a
-	  key anyway or use "confirm" in /proc/cmdline.
-	- read /proc/cmdline into a variable
-	- use strstr() to search in /proc/cmdline
-	- add "forcefsck" as possible option in /proc/cmdline
-	- while removing lock files, no need to call `basename`
-	- add unamer=`uname -r` and reduce number of forks
-	- do not fork new bash to create /var/log/ksyms.0
+  - no need to set NETWORKING=no, it is not used/exported
+  - do not export BOOTUP
+  - delete two "sleep 1" calls that wants to add time to go
+    into confirmation mode. There is enough time to press a
+    key anyway or use "confirm" in /proc/cmdline.
+  - read /proc/cmdline into a variable
+  - use strstr() to search in /proc/cmdline
+  - add "forcefsck" as possible option in /proc/cmdline
+  - while removing lock files, no need to call `basename`
+  - add unamer=`uname -r` and reduce number of forks
+  - do not fork new bash to create /var/log/ksyms.0
 
 * Thu Apr 03 2003 Karsten Hopp <karsten at redhat.de> 7.15-1
-- Mainframe has no /dev/ttyX devices and no mingetty, don't 
+- Mainframe has no /dev/ttyX devices and no mingetty, don't
   initialize them. This gave error messages during startup
 
 * Mon Mar 17 2003 Nalin Dahyabhai <nalin at redhat.com>
@@ -1540,8 +1554,8 @@
 
 * Thu Jul 11 2002 Florian La Roche <Florian.LaRoche at redhat.de>
 - /etc/init.d/functions:
-	daemon(): avoid starting another bash
-	killproc(): avoid starting another bash for the default case
+  daemon(): avoid starting another bash
+  killproc(): avoid starting another bash for the default case
 - do not call "insmod -p" before loading the "st" module
 
 * Tue Jul 09 2002 Florian La Roche <Florian.LaRoche at redhat.de>
@@ -1614,7 +1628,7 @@
 - use full path to /sbin/ifconfig (#59457)
 - /sbin/service: change to root directory before staring/stopping;
   also sanitize environment
-		
+
 * Tue Apr 02 2002 Bill Nottingham <notting at redhat.com> 6.61-1
 - when disabling DMA, don't use things in /usr
 
@@ -1665,7 +1679,7 @@
 * Mon Oct 29 2001 Than Ngo <than at redhat.com>
 - fix bug in channel bundling if MSN is missed
 - support DEBUG option
-	
+ 
 * Wed Sep 19 2001 Than Ngo <than at redhat.com>
 - don't show user name by DSL connection
 
@@ -1845,7 +1859,7 @@
 * Wed Jun 27 2001 Than Ngo <than at redhat.com>
 - fix pap/chap authentication for syncppp
 - support ippp options
-	
+ 
 * Mon Jun 25 2001 Bill Nottingham <notting at redhat.com>
 - add ifup-wireless
 
@@ -1884,8 +1898,8 @@
 
 * Wed Apr 25 2001 Florian La Roche <Florian.LaRoche at redhat.de>
 - add further s390 changes:
-	- ifup-iucv
-	- mkkerneldoth.s390
+  - ifup-iucv
+  - mkkerneldoth.s390
 
 * Tue Apr 24 2001 Than Ngo <than at redhat.com>
 - add shutdown UPS into halt (bug #34312)
@@ -2034,7 +2048,7 @@
 
 * Tue Nov 21 2000 Karsten Hopp <karsten at redhat.de>
 - changed hdparm section in rc.sysinit to allow different
-  parameters for each disk (if needed) by copying 
+  parameters for each disk (if needed) by copying
   /etc/sysconfig/harddisks to /etc/sysconfig/harddiskhda (hdb,hdc..)
 - fix RFE #20967
 
@@ -2114,22 +2128,22 @@
 
 * Thu Jul 13 2000 Bill Nottingham <notting at redhat.com>
 - fix == tests in rc.sysinit
-- more %pretrans tweaks
+- more %%pretrans tweaks
 
 * Thu Jul 13 2000 Jeff Johnson <jbj at redhat.com>
 - test if /etc/rc.d is a symlink already in pre-transaction syscalls.
 
 * Tue Jul 11 2000 Bill Nottingham <notting at redhat.com>
-- implement the %pre with RPM Magic(tm)
+- implement the %%pre with RPM Magic(tm)
 
 * Sat Jul  8 2000 Bill Nottingham <notting at redhat.com>
 - fix it to not follow /etc/rc.d
 
 * Fri Jul  7 2000 Bill Nottingham <notting at redhat.com>
-- fix %pre, again
+- fix %%pre, again
 
 * Thu Jul  6 2000 Bill Nottingham <notting at redhat.com>
-- tweak %pre back to a mv (rpm is fun!)
+- tweak %%pre back to a mv (rpm is fun!)
 - do USB initialization before fsck, so keyboard works if it fails
 
 * Mon Jul  3 2000 Bill Nottingham <notting at redhat.com>
@@ -2142,7 +2156,7 @@
 - don't use tail
 
 * Thu Jun 28 2000 Trond Eivind Glomsr??d <teg at redhat.com>
-- add support for USB controllers and HID devices 
+- add support for USB controllers and HID devices
   (mice, keyboards)
 
 * Tue Jun 27 2000 Trond Eivind Glomsr??d <teg at redhat.com>
@@ -2377,7 +2391,7 @@
 - fix swapoff silliness
 
 * Fri Sep 10 1999 Bill Nottingham <notting at redhat.com>
-- chkconfig --del in %preun, not %postun
+- chkconfig --del in %%preun, not %%postun
 - use killall5 in halt
 - swapoff non-/etc/fstab swap
 
@@ -2401,7 +2415,7 @@
 - disable magic sysrq by default
 
 * Mon Aug 30 1999 Bill Nottingham <notting at redhat.com>
-- new NFS unmounting from Bill Rugolsky <rugolsky at ead.dsa.com> 
+- new NFS unmounting from Bill Rugolsky <rugolsky at ead.dsa.com>
 - fix ifup-sl/dip confusion
 - more raid startup cleanup
 - make utmp group 22
@@ -2513,7 +2527,7 @@
 - set macaddr before bootp
 - zero in the /var/run/utmpx file (gafton)
 - don't set hostname on ppp/slip (kills X)
-			
+ 
 * Wed Mar 17 1999 Bill Nottingham <notting at redhat.com>
 - exit ifup if pump fails
 - fix stupid errors in reading commands from subprocess
@@ -2598,8 +2612,8 @@
 - Use /proc/version to find preferred modules.
 - Numerous buglets fixed.
 
-* Sun Jun 07 1998 Erik Troan <ewt at redhat.com> 
-- rc.sysinit looks for bootfile= as well as BOOT_IMAGE to set 
+* Sun Jun 07 1998 Erik Troan <ewt at redhat.com>
+- rc.sysinit looks for bootfile= as well as BOOT_IMAGE to set
   /lib/modules/preferred symlink
 
 * Mon Jun 01 1998 Erik Troan <ewt at redhat.com>
@@ -2686,7 +2700,7 @@
 - touch random seed file before chmod'ing it.
 
 * Wed Oct 15 1997 Erik Troan <ewt at redhat.com>
-- run domainname if NISDOMAIN is set 
+- run domainname if NISDOMAIN is set
 
 * Wed Oct 15 1997 Michael K. Johnson <johnsonm at redhat.com>
 - Make the random seed file mode 600.
@@ -2719,7 +2733,7 @@
 - Added network-functions to spec file.
 - Added report functionality to usernetctl.
 - Fixed bugs I introduced into usernetctl while adding clone device support.
-- Clean up entire RPM_BUILD_ROOT directory in %clean.
+- Clean up entire RPM_BUILD_ROOT directory in %%clean.
 
 * Mon Sep 29 1997 Michael K. Johnson <johnsonm at redhat.com>
 - Clone device support in network scripts, rc scripts, and usernetctl.
@@ -2746,7 +2760,7 @@
 - added support for FORWARD_IPV4 variable
 
 * Thu Sep 11 1997 Donald Barnes <djb at redhat.com>
-- added status function to functions along with better killproc 
+- added status function to functions along with better killproc
   handling.
 - added /sbin/usleep binary (written by me) and man page
 - changed BuildRoot to /var/tmp instead of /tmp
@@ -2789,7 +2803,7 @@
 * Tue Mar 18 1997 Erik Troan <ewt at redhat.com>
 - Got rid of xargs dependency in halt script
 - Don't mount /proc twice (unmount it in between)
-- sulogin and filesystem unmounting only happened for a corrupt root 
+- sulogin and filesystem unmounting only happened for a corrupt root
   filesystem -- it now happens when other filesystems are corrupt as well
 
 * Tue Mar 04 1997 Michael K. Johnson <johnsonm at redhat.com>
@@ -2816,5 +2830,5 @@
 
 * Fri Feb 07 1997 Erik Troan <ewt at redhat.com>
 - Added usernetctl wrapper for user mode ifup and ifdown's and man page
-- Rewrote ppp and slip kill and retry code 
+- Rewrote ppp and slip kill and retry code
 - Added doexec and man page


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/sources,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- sources	10 Sep 2008 21:37:39 -0000	1.169
+++ sources	30 Sep 2008 19:00:50 -0000	1.170
@@ -1 +1 @@
-1763b04d2d10f04eaad0199bb9207522  initscripts-8.82.tar.bz2
+6f993824c1da99be0426253ffb291b24  initscripts-8.83.tar.bz2



From notting at fedoraproject.org  Tue Sep 30 19:06:51 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 30 Sep 2008 19:06:51 +0000 (UTC)
Subject: rpms/initscripts/devel sources,1.170,1.171
Message-ID: <20080930190651.4714070119@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6876

Modified Files:
	sources 
Log Message:
Upload proper tarball.




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/sources,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- sources	30 Sep 2008 19:00:50 -0000	1.170
+++ sources	30 Sep 2008 19:06:21 -0000	1.171
@@ -1 +1 @@
-6f993824c1da99be0426253ffb291b24  initscripts-8.83.tar.bz2
+eecf3fd6c2b8afe4caffc283cf7efe12  initscripts-8.83.tar.bz2



From notting at fedoraproject.org  Tue Sep 30 19:09:36 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 30 Sep 2008 19:09:36 +0000 (UTC)
Subject: rpms/initscripts/devel sources,1.171,1.172
Message-ID: <20080930190936.7B8D870119@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7255

Modified Files:
	sources 
Log Message:
Fix tarball, for real.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/sources,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- sources	30 Sep 2008 19:06:21 -0000	1.171
+++ sources	30 Sep 2008 19:09:06 -0000	1.172
@@ -1 +1 @@
-eecf3fd6c2b8afe4caffc283cf7efe12  initscripts-8.83.tar.bz2
+33ce7faccc536fc9467e85a64f334b75  initscripts-8.83.tar.bz2



From beuc at fedoraproject.org  Tue Sep 30 19:13:49 2008
From: beuc at fedoraproject.org (Sylvain Beucler)
Date: Tue, 30 Sep 2008 19:13:49 +0000 (UTC)
Subject: rpms/freedink-data/devel freedink-data-fix-timestamps.patch, NONE, 
	1.1 freedink-data.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930191349.99AE270119@cvs1.fedora.phx.redhat.com>

Author: beuc

Update of /cvs/pkgs/rpms/freedink-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8161/devel

Modified Files:
	.cvsignore sources 
Added Files:
	freedink-data-fix-timestamps.patch freedink-data.spec 
	import.log 
Log Message:
Tue Sep 30 2008 Sylvain Beucler <beuc at beuc.net> - 1.08.20090920-3
- Initial import



freedink-data-fix-timestamps.patch:

--- NEW FILE freedink-data-fix-timestamps.patch ---
diff --git a/Makefile b/Makefile
index f3edfaf..776ff00 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,18 @@ all:
 
 install:
 #	Copy game data
+
+#	The final directory is '$PREFIX/share/dink/dink' ('dink'
+#	twice), as there can be site-wide D-Mods such as
+#	'$PREFIX/share/dink/island'
 	install -d -m 755 $(DESTDIR)$(DATADIR)/dink
-	cp -r dink $(DESTDIR)$(DATADIR)/dink/
+
+#	'-a' will preserve timestamps, which some distros prefer. It
+#	will also preserve symlinks, which may be useful as there are
+#	a few duplicate musics. Use a .zip archive for woe releases,
+#	it will duplicate files but avoid creating empty files instead
+#	of symlinks.
+	cp -a dink $(DESTDIR)$(DATADIR)/dink/
 
 #	Clean-up:
 #	Git files:


--- NEW FILE freedink-data.spec ---
Name:		freedink-data
Version:	1.08.20080920
Release:	3%{?dist}
Summary:	Adventure and role-playing game (game data)

Group:		Amusements/Games
License:	zlib and CC-BY-SA and (GPLv3+ or Free Art or CC-BY-SA) and OAL and Public Domain and CC-BY and GPLv2+
URL:		http://www.freedink.org/
Source0:	ftp://ftp.gnu.org/gnu/freedink/%{name}-%{version}.tar.gz
#Source0:	http://www.freedink.org/releases/%{name}-%{version}.tar.gz
# Upstream has applied this in Git trunk
Patch0:		freedink-data-fix-timestamps.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

%description
Dink Smallwood is an adventure/role-playing game, similar to Zelda,
made by RTsoft. Besides twisted humour, it includes the actual game
editor, allowing players to create hundreds of new adventures called
Dink Modules or D-Mods for short.

This package contains architecture-independent data for the original
game, along with free sound and music replacements.


%prep
%setup -q
%patch0 -p1
# Strip DOS EOL from documentation
# https://fedoraproject.org/wiki/PackageMaintainers/Common_Rpmlint_Issues#wrong-file-end-of-line-encoding
sed -i 's/\r//' README.txt README-REPLACEMENTS.txt


%build


%install
rm -rf $RPM_BUILD_ROOT
make install PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt README-REPLACEMENTS.txt licenses/
%{_datadir}/dink/


%changelog
* Wed Sep 24 2008 Sylvain Beucler <beuc at beuc.net> - 1.08.20080920-3
- Actually apply patch0 (preserve timestamps)

* Tue Sep 23 2008 Sylvain Beucler <beuc at beuc.net> - 1.08.20080920-2
- Specify all licenses used by the package
- Added licenses texts in docs
- Replaced /usr by a RPM macro
- Add patch from upstream to preserve timestamps no install
- Converted DOS newlines

* Sat Sep 20 2008 Sylvain Beucler <beuc at beuc.net> - 1.08.20080920-1
- Initial package


--- NEW FILE import.log ---
freedink-data-1_08_20080920-3_fc8:HEAD:freedink-data-1.08.20080920-3.fc8.src.rpm:1222801922


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freedink-data/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2008 19:22:10 -0000	1.1
+++ .cvsignore	30 Sep 2008 19:13:19 -0000	1.2
@@ -0,0 +1 @@
+freedink-data-1.08.20080920.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freedink-data/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 19:22:10 -0000	1.1
+++ sources	30 Sep 2008 19:13:19 -0000	1.2
@@ -0,0 +1 @@
+e84f9e34f1fb46ea1ed0e3a34b341f4a  freedink-data-1.08.20080920.tar.gz



From katzj at fedoraproject.org  Tue Sep 30 19:21:03 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Tue, 30 Sep 2008 19:21:03 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.995, 1.996 linux-2.6-squashfs.patch,
	1.30, 1.31
Message-ID: <20080930192103.765F370119@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10083

Modified Files:
	kernel.spec linux-2.6-squashfs.patch 
Log Message:
* Tue Sep 30 2008 Jeremy Katz <katzj at redhat.com>
- update to squashfs 3.4



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.995
retrieving revision 1.996
diff -u -r1.995 -r1.996
--- kernel.spec	30 Sep 2008 04:49:05 -0000	1.995
+++ kernel.spec	30 Sep 2008 19:20:32 -0000	1.996
@@ -1739,6 +1739,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Sep 30 2008 Jeremy Katz <katzj at redhat.com>
+- update to squashfs 3.4
+
 * Mon Sep 29 2008 Roland McGrath <roland at redhat.com>
 - 2.6.27-rc8
 - utrace update

linux-2.6-squashfs.patch:

Index: linux-2.6-squashfs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-squashfs.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- linux-2.6-squashfs.patch	28 Jul 2008 15:25:17 -0000	1.30
+++ linux-2.6-squashfs.patch	30 Sep 2008 19:20:33 -0000	1.31
@@ -1,16 +1,15 @@
-diff --git a/fs/Kconfig b/fs/Kconfig
-index d731282..cab44a1 100644
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -1367,6 +1367,56 @@ config CRAMFS
+diff -x .gitignore -Nurp linux-2.6.27-rc4/fs/Kconfig linux-2.6.27-rc4-squashfs3.4/fs/Kconfig
+--- linux-2.6.27-rc4/fs/Kconfig	2008-08-11 15:20:41.000000000 +0100
++++ linux-2.6.27-rc4-squashfs3.4/fs/Kconfig	2008-08-19 18:31:56.000000000 +0100
+@@ -1348,6 +1348,56 @@ config CRAMFS
  
  	  If unsure, say N.
  
 +config SQUASHFS
-+	tristate "SquashFS 3.3 - Squashed file system support"
++	tristate "SquashFS 3.4 - Squashed file system support"
 +	select ZLIB_INFLATE
 +	help
-+	  Saying Y here includes support for SquashFS 3.3 (a Compressed
++	  Saying Y here includes support for SquashFS 3.4 (a Compressed
 +	  Read-Only File System).  Squashfs is a highly compressed read-only
 +	  filesystem for Linux.  It uses zlib compression to compress both
 +	  files, inodes and directories.  Inodes in the system are very small
@@ -59,11 +58,10 @@
  config VXFS_FS
  	tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
  	depends on BLOCK
-diff --git a/fs/Makefile b/fs/Makefile
-index 1e7a11b..3faf857 100644
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -73,6 +73,7 @@ obj-$(CONFIG_JBD)		+= jbd/
+diff -x .gitignore -Nurp linux-2.6.27-rc4/fs/Makefile linux-2.6.27-rc4-squashfs3.4/fs/Makefile
+--- linux-2.6.27-rc4/fs/Makefile	2008-08-11 15:20:41.000000000 +0100
++++ linux-2.6.27-rc4-squashfs3.4/fs/Makefile	2008-08-19 18:31:56.000000000 +0100
+@@ -74,6 +74,7 @@ obj-$(CONFIG_JBD)		+= jbd/
  obj-$(CONFIG_JBD2)		+= jbd2/
  obj-$(CONFIG_EXT2_FS)		+= ext2/
  obj-$(CONFIG_CRAMFS)		+= cramfs/
@@ -71,29 +69,14 @@
  obj-y				+= ramfs/
  obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
  obj-$(CONFIG_CODA_FS)		+= coda/
-diff --git a/fs/squashfs/Makefile b/fs/squashfs/Makefile
-new file mode 100644
-index 0000000..1bc7b06
---- /dev/null
-+++ b/fs/squashfs/Makefile
-@@ -0,0 +1,7 @@
-+#
-+# Makefile for the linux squashfs routines.
-+#
-+
-+obj-$(CONFIG_SQUASHFS) += squashfs.o
-+squashfs-y += inode.o
-+squashfs-y += squashfs2_0.o
-diff --git a/fs/squashfs/inode.c b/fs/squashfs/inode.c
-new file mode 100644
-index 0000000..f578528
---- /dev/null
-+++ b/fs/squashfs/inode.c
-@@ -0,0 +1,2178 @@
+diff -x .gitignore -Nurp linux-2.6.27-rc4/fs/squashfs/inode.c linux-2.6.27-rc4-squashfs3.4/fs/squashfs/inode.c
+--- linux-2.6.27-rc4/fs/squashfs/inode.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.27-rc4-squashfs3.4/fs/squashfs/inode.c	2008-08-26 08:25:23.000000000 +0100
+@@ -0,0 +1,2173 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
 + *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007
++ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008
 + * Phillip Lougher <phillip at lougher.demon.co.uk>
 + *
 + * This program is free software; you can redistribute it and/or
@@ -122,13 +105,16 @@
 +#include <linux/buffer_head.h>
 +#include <linux/vfs.h>
 +#include <linux/vmalloc.h>
++#include <linux/spinlock.h>
 +#include <linux/smp_lock.h>
 +#include <linux/exportfs.h>
 +
 +#include "squashfs.h"
 +
-+int squashfs_cached_blks;
-+
++static struct dentry *squashfs_fh_to_dentry(struct super_block *s,
++		struct fid *fid, int fh_len, int fh_type);
++static struct dentry *squashfs_fh_to_parent(struct super_block *s,
++		struct fid *fid, int fh_len, int fh_type);
 +static struct dentry *squashfs_get_parent(struct dentry *child);
 +static int squashfs_read_inode(struct inode *i, squashfs_inode_t inode);
 +static int squashfs_statfs(struct dentry *, struct kstatfs *);
@@ -169,14 +155,9 @@
 +	.remount_fs = squashfs_remount
 +};
 +
-+static struct super_operations squashfs_export_super_ops = {
-+	.alloc_inode = squashfs_alloc_inode,
-+	.destroy_inode = squashfs_destroy_inode,
-+	.statfs = squashfs_statfs,
-+	.put_super = squashfs_put_super,
-+};
-+
 +static struct export_operations squashfs_export_ops = {
++	.fh_to_dentry = squashfs_fh_to_dentry,
++	.fh_to_parent = squashfs_fh_to_parent,
 +	.get_parent = squashfs_get_parent
 +};
 +
@@ -284,7 +265,7 @@
 +		goto read_failure;
 +
 +	if (c_byte) {
-+		bytes = msblk->devblksize - offset;
++		bytes = -offset;
 +		compressed = SQUASHFS_COMPRESSED_BLOCK(c_byte);
 +		c_byte = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte);
 +
@@ -294,12 +275,8 @@
 +		if (c_byte > srclength || index < 0 || (index + c_byte) > sblk->bytes_used)
 +			goto read_failure;
 +
-+		bh[0] = sb_getblk(s, cur_index);
-+		if (bh[0] == NULL)
-+			goto block_release;
-+
-+		for (b = 1; bytes < c_byte; b++) {
-+			bh[b] = sb_getblk(s, ++cur_index);
++		for (b = 0; bytes < (int) c_byte; b++, cur_index++) {
++			bh[b] = sb_getblk(s, cur_index);
 +			if (bh[b] == NULL)
 +				goto block_release;
 +			bytes += msblk->devblksize;
@@ -312,6 +289,7 @@
 +		bh[0] = get_block_length(s, &cur_index, &offset, &c_byte);
 +		if (bh[0] == NULL)
 +			goto read_failure;
++		b = 1;
 +
 +		bytes = msblk->devblksize - offset;
 +		compressed = SQUASHFS_COMPRESSED(c_byte);
@@ -321,9 +299,9 @@
 +					? "" : "un", (unsigned int) c_byte);
 +
 +		if (c_byte > srclength || (index + c_byte) > sblk->bytes_used)
-+			goto read_failure;
++			goto block_release;
 +
-+		for (b = 1; bytes < c_byte; b++) {
++		for (; bytes < c_byte; b++) {
 +			bh[b] = sb_getblk(s, ++cur_index);
 +			if (bh[b] == NULL)
 +				goto block_release;
@@ -433,117 +411,204 @@
 +}
 +
 +
-+SQSH_EXTERN int squashfs_get_cached_block(struct super_block *s, void *buffer,
-+				long long block, unsigned int offset,
-+				int length, long long *next_block,
-+				unsigned int *next_offset)
++static struct squashfs_cache_entry *squashfs_cache_get(struct super_block *s,
++	struct squashfs_cache *cache, long long block, int length)
 +{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	int n, i, bytes, return_length = length;
-+	long long next_index;
++	int i, n;
++	struct squashfs_cache_entry *entry;
 +
-+	TRACE("Entered squashfs_get_cached_block [%llx:%x]\n", block, offset);
++	spin_lock(&cache->lock);
 +
 +	while (1) {
-+		for (i = 0; i < squashfs_cached_blks; i++) 
-+			if (msblk->block_cache[i].block == block)
-+				break; 
-+		
-+		mutex_lock(&msblk->block_cache_mutex);
++		for (i = 0; i < cache->entries && cache->entry[i].block != block; i++);
 +
-+		if (i == squashfs_cached_blks) {
-+			/* read inode header block */
-+			if (msblk->unused_cache_blks == 0) {
-+				mutex_unlock(&msblk->block_cache_mutex);
-+				wait_event(msblk->waitq, msblk->unused_cache_blks);
++		if (i == cache->entries) {
++			if (cache->unused_blks == 0) {
++				cache->waiting ++;
++				spin_unlock(&cache->lock);
++				wait_event(cache->wait_queue, cache->unused_blks);
++				spin_lock(&cache->lock);
++				cache->waiting --;
 +				continue;
 +			}
 +
-+			i = msblk->next_cache;
-+			for (n = 0; n < squashfs_cached_blks; n++) {
-+				if (msblk->block_cache[i].block != SQUASHFS_USED_BLK)
++			i = cache->next_blk;
++			for (n = 0; n < cache->entries; n++) {
++				if (cache->entry[i].locked == 0)
 +					break;
-+				i = (i + 1) % squashfs_cached_blks;
++				i = (i + 1) % cache->entries;
 +			}
 +
-+			msblk->next_cache = (i + 1) % squashfs_cached_blks;
++			cache->next_blk = (i + 1) % cache->entries;
++			entry = &cache->entry[i];
 +
-+			if (msblk->block_cache[i].block == SQUASHFS_INVALID_BLK) {
-+				msblk->block_cache[i].data = vmalloc(SQUASHFS_METADATA_SIZE);
-+				if (msblk->block_cache[i].data == NULL) {
-+					ERROR("Failed to allocate cache block\n");
-+					mutex_unlock(&msblk->block_cache_mutex);
-+					goto out;
-+				}
-+			}
-+	
-+			msblk->block_cache[i].block = SQUASHFS_USED_BLK;
-+			msblk->unused_cache_blks --;
-+			mutex_unlock(&msblk->block_cache_mutex);
-+
-+			msblk->block_cache[i].length = squashfs_read_data(s,
-+				msblk->block_cache[i].data, block, 0, &next_index,
-+				SQUASHFS_METADATA_SIZE);
-+
-+			if (msblk->block_cache[i].length == 0) {
-+				ERROR("Unable to read cache block [%llx:%x]\n", block, offset);
-+				mutex_lock(&msblk->block_cache_mutex);
-+				msblk->block_cache[i].block = SQUASHFS_INVALID_BLK;
-+				msblk->unused_cache_blks ++;
-+				smp_mb();
-+				vfree(msblk->block_cache[i].data);
-+				wake_up(&msblk->waitq);
-+				mutex_unlock(&msblk->block_cache_mutex);
-+				goto out;
-+			}
++			cache->unused_blks --;
++			entry->block = block;
++			entry->locked = 1;
++			entry->pending = 1;
++			entry->waiting = 0;
++			entry->error = 0;
++			spin_unlock(&cache->lock);
++
++			entry->length = squashfs_read_data(s, entry->data,
++				block, length, &entry->next_index, cache->block_size);
++
++			spin_lock(&cache->lock);
++
++			if (entry->length == 0)
++				entry->error = 1;
++
++			entry->pending = 0;
++			spin_unlock(&cache->lock);
++			if (entry->waiting)
++				wake_up_all(&entry->wait_queue);
++			goto out;
++		}
 +
-+			mutex_lock(&msblk->block_cache_mutex);
-+			msblk->block_cache[i].block = block;
-+			msblk->block_cache[i].next_index = next_index;
-+			msblk->unused_cache_blks ++;
-+			smp_mb();
-+			wake_up(&msblk->waitq);
-+			TRACE("Read cache block [%llx:%x]\n", block, offset);
++		entry = &cache->entry[i];
++		if (entry->locked == 0)
++			cache->unused_blks --;
++		entry->locked++;
++
++		if (entry->pending) {
++			entry->waiting ++;
++			spin_unlock(&cache->lock);
++			wait_event(entry->wait_queue, !entry->pending);
++			goto out;
 +		}
 +
-+		if (msblk->block_cache[i].block != block) {
-+			mutex_unlock(&msblk->block_cache_mutex);
-+			continue;
++		spin_unlock(&cache->lock);
++		goto out;
++	}
++
++out:
++	TRACE("Got %s %d, start block %lld, locked %d, error %d\n", i,
++		cache->name, entry->block, entry->locked, entry->error);
++	if (entry->error)
++		ERROR("Unable to read %s cache entry [%llx]\n", cache->name, block);
++	return entry;
++}
++
++
++static void squashfs_cache_put(struct squashfs_cache *cache,
++				struct squashfs_cache_entry *entry)
++{
++	spin_lock(&cache->lock);
++	entry->locked --;
++	if (entry->locked == 0) {
++		cache->unused_blks ++;
++		spin_unlock(&cache->lock);
++		if (cache->waiting)
++			wake_up(&cache->wait_queue);
++	} else
++		spin_unlock(&cache->lock);
++}
++
++
++static void squashfs_cache_delete(struct squashfs_cache *cache)
++{
++	int i;
++
++	if (cache == NULL)
++		return;
++
++	for (i = 0; i < cache->entries; i++)
++		if (cache->entry[i].data) {
++			if (cache->use_vmalloc)
++				vfree(cache->entry[i].data);
++			else
++				kfree(cache->entry[i].data);
++		}
++
++	kfree(cache);
++}
++
++
++static struct squashfs_cache *squashfs_cache_init(char *name, int entries,
++	int block_size, int use_vmalloc)
++{
++	int i;
++	struct squashfs_cache *cache = kzalloc(sizeof(struct squashfs_cache) +
++			entries * sizeof(struct squashfs_cache_entry), GFP_KERNEL);
++	if (cache == NULL) {
++		ERROR("Failed to allocate %s cache\n", name);
++		goto failed;
++	}
++
++	cache->next_blk = 0;
++	cache->unused_blks = entries;
++	cache->entries = entries;
++	cache->block_size = block_size;
++	cache->use_vmalloc = use_vmalloc;
++	cache->name = name;
++	cache->waiting = 0;
++	spin_lock_init(&cache->lock);
++	init_waitqueue_head(&cache->wait_queue);
++
++	for (i = 0; i < entries; i++) {
++		init_waitqueue_head(&cache->entry[i].wait_queue);
++		cache->entry[i].block = SQUASHFS_INVALID_BLK;
++		cache->entry[i].data = use_vmalloc ? vmalloc(block_size) :
++				kmalloc(block_size, GFP_KERNEL);
++		if (cache->entry[i].data == NULL) {
++			ERROR("Failed to allocate %s cache entry\n", name);
++			goto cleanup;
 +		}
++	}
 +
-+		bytes = msblk->block_cache[i].length - offset;
++	return cache;
 +
-+		if (bytes < 1) {
-+			mutex_unlock(&msblk->block_cache_mutex);
-+			goto out;
++cleanup:
++	squashfs_cache_delete(cache);
++failed:
++	return NULL;
++}
++
++
++SQSH_EXTERN int squashfs_get_cached_block(struct super_block *s, void *buffer,
++				long long block, unsigned int offset,
++				int length, long long *next_block,
++				unsigned int *next_offset)
++{
++	struct squashfs_sb_info *msblk = s->s_fs_info;
++	int bytes, return_length = length;
++	struct squashfs_cache_entry *entry;
++
++	TRACE("Entered squashfs_get_cached_block [%llx:%x]\n", block, offset);
++
++	while (1) {
++		entry = squashfs_cache_get(s, msblk->block_cache, block, 0);
++		bytes = entry->length - offset;
++
++		if (entry->error || bytes < 1) {
++			return_length = 0;
++			goto finish;
 +		} else if (bytes >= length) {
 +			if (buffer)
-+				memcpy(buffer, msblk->block_cache[i].data + offset, length);
-+			if (msblk->block_cache[i].length - offset == length) {
-+				*next_block = msblk->block_cache[i].next_index;
++				memcpy(buffer, entry->data + offset, length);
++			if (entry->length - offset == length) {
++				*next_block = entry->next_index;
 +				*next_offset = 0;
 +			} else {
 +				*next_block = block;
 +				*next_offset = offset + length;
 +			}
-+			mutex_unlock(&msblk->block_cache_mutex);
 +			goto finish;
 +		} else {
 +			if (buffer) {
-+				memcpy(buffer, msblk->block_cache[i].data + offset, bytes);
++				memcpy(buffer, entry->data + offset, bytes);
 +				buffer = (char *) buffer + bytes;
 +			}
-+			block = msblk->block_cache[i].next_index;
-+			mutex_unlock(&msblk->block_cache_mutex);
++			block = entry->next_index;
++			squashfs_cache_put(msblk->block_cache, entry);
 +			length -= bytes;
 +			offset = 0;
 +		}
 +	}
 +
 +finish:
++	squashfs_cache_put(msblk->block_cache, entry);
 +	return return_length;
-+out:
-+	return 0;
 +}
 +
 +
@@ -580,98 +645,19 @@
 +
 +
 +SQSH_EXTERN void release_cached_fragment(struct squashfs_sb_info *msblk,
-+				struct squashfs_fragment_cache *fragment)
++				struct squashfs_cache_entry *fragment)
 +{
-+	mutex_lock(&msblk->fragment_mutex);
-+	fragment->locked --;
-+	if (fragment->locked == 0) {
-+		msblk->unused_frag_blks ++;
-+		smp_mb();
-+		wake_up(&msblk->fragment_wait_queue);
-+	}
-+	mutex_unlock(&msblk->fragment_mutex);
++	squashfs_cache_put(msblk->fragment_cache, fragment);
 +}
 +
 +
 +SQSH_EXTERN
-+struct squashfs_fragment_cache *get_cached_fragment(struct super_block *s,
++struct squashfs_cache_entry *get_cached_fragment(struct super_block *s,
 +				long long start_block, int length)
 +{
-+	int i, n;
 +	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
 +
-+	while (1) {
-+		mutex_lock(&msblk->fragment_mutex);
-+
-+		for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS &&
-+				msblk->fragment[i].block != start_block; i++);
-+
-+		if (i == SQUASHFS_CACHED_FRAGMENTS) {
-+			if (msblk->unused_frag_blks == 0) {
-+				mutex_unlock(&msblk->fragment_mutex);
-+				wait_event(msblk->fragment_wait_queue, msblk->unused_frag_blks);
-+				continue;
-+			}
-+
-+			i = msblk->next_fragment;
-+			for (n = 0; n < SQUASHFS_CACHED_FRAGMENTS; n++) {
-+				if (msblk->fragment[i].locked == 0)
-+					break;
-+				i = (i + 1) % SQUASHFS_CACHED_FRAGMENTS;
-+			}
-+
-+			msblk->next_fragment = (msblk->next_fragment + 1) %
-+				SQUASHFS_CACHED_FRAGMENTS;
-+			
-+			if (msblk->fragment[i].data == NULL) {
-+				msblk->fragment[i].data = vmalloc(sblk->block_size);
-+				if (msblk->fragment[i].data == NULL) {
-+					ERROR("Failed to allocate fragment cache block\n");
-+					mutex_unlock(&msblk->fragment_mutex);
-+					goto out;
-+				}
-+			}
-+
-+			msblk->unused_frag_blks --;
-+			msblk->fragment[i].block = SQUASHFS_INVALID_BLK;
-+			msblk->fragment[i].locked = 1;
-+			mutex_unlock(&msblk->fragment_mutex);
-+
-+			msblk->fragment[i].length = squashfs_read_data(s,
-+				msblk->fragment[i].data, start_block, length, NULL,
-+				sblk->block_size);
-+
-+			if (msblk->fragment[i].length == 0) {
-+				ERROR("Unable to read fragment cache block [%llx]\n", start_block);
-+				msblk->fragment[i].locked = 0;
-+				msblk->unused_frag_blks ++;
-+				smp_mb();
-+				wake_up(&msblk->fragment_wait_queue);
-+				goto out;
-+			}
-+
-+			mutex_lock(&msblk->fragment_mutex);
-+			msblk->fragment[i].block = start_block;
-+			TRACE("New fragment %d, start block %lld, locked %d\n",
-+				i, msblk->fragment[i].block, msblk->fragment[i].locked);
-+			mutex_unlock(&msblk->fragment_mutex);
-+			break;
-+		}
-+
-+		if (msblk->fragment[i].locked == 0)
-+			msblk->unused_frag_blks --;
-+		msblk->fragment[i].locked++;
-+		mutex_unlock(&msblk->fragment_mutex);
-+		TRACE("Got fragment %d, start block %lld, locked %d\n", i,
-+			msblk->fragment[i].block, msblk->fragment[i].locked);
-+		break;
-+	}
-+
-+	return &msblk->fragment[i];
-+
-+out:
-+	return NULL;
++	return squashfs_cache_get(s, msblk->fragment_cache, start_block, length);
 +}
 +
 +
@@ -720,30 +706,72 @@
 +out:
 +	return SQUASHFS_INVALID_BLK;
 +}
-+	
 +
-+static struct dentry *squashfs_get_parent(struct dentry *child)
++
++
++static struct dentry *squashfs_export_iget(struct super_block *s,
++	unsigned int inode_number)
 +{
-+	struct inode *i = child->d_inode;
-+	struct inode *parent = iget_locked(i->i_sb, SQUASHFS_I(i)->u.s2.parent_inode);
-+	struct dentry *rv;
++	squashfs_inode_t inode;
++	struct inode *i;
++	struct dentry *dentry;
 +
-+	TRACE("Entered squashfs_get_parent\n");
++	TRACE("Entered squashfs_export_iget\n");
 +
-+	if(parent == NULL) {
-+		rv = ERR_PTR(-EACCES);
-+		goto out;
++	inode = squashfs_inode_lookup(s, inode_number);
++	if(inode == SQUASHFS_INVALID_BLK) {
++		dentry = ERR_PTR(-ENOENT);
++		goto failure;
 +	}
 +
-+	rv = d_alloc_anon(parent);
-+	if(rv == NULL)
-+		rv = ERR_PTR(-ENOMEM);
++	i = squashfs_iget(s, inode, inode_number);
++	if(i == NULL) {
++		dentry = ERR_PTR(-EACCES);
++		goto failure;
++	}
 +
-+out:
-+	return rv;
++	dentry = d_alloc_anon(i);
++	if (dentry == NULL) {
++		iput(i);
++		dentry = ERR_PTR(-ENOMEM);
++	}
++
++failure:
++	return dentry;
 +}
 +
-+	
++
++static struct dentry *squashfs_fh_to_dentry(struct super_block *s,
++		struct fid *fid, int fh_len, int fh_type)
++{
++	if((fh_type != FILEID_INO32_GEN && fh_type != FILEID_INO32_GEN_PARENT) ||
++			fh_len < 2)
++		return NULL;
++
++	return squashfs_export_iget(s, fid->i32.ino);
++}
++
++
++static struct dentry *squashfs_fh_to_parent(struct super_block *s,
++		struct fid *fid, int fh_len, int fh_type)
++{
++	if(fh_type != FILEID_INO32_GEN_PARENT || fh_len < 4)
++		return NULL;
++
++	return squashfs_export_iget(s, fid->i32.parent_ino);
++}
++
++
++static struct dentry *squashfs_get_parent(struct dentry *child)
++{
++	struct inode *i = child->d_inode;
++
++	TRACE("Entered squashfs_get_parent\n");
++
++	return squashfs_export_iget(i->i_sb, SQUASHFS_I(i)->u.s2.parent_inode);
++}
++
++
 +SQSH_EXTERN struct inode *squashfs_iget(struct super_block *s,
 +				squashfs_inode_t inode, unsigned int inode_number)
 +{
@@ -1101,34 +1129,6 @@
 +}
 +
 +
-+static int readahead_metadata(struct super_block *s)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	int i;
-+
-+	squashfs_cached_blks = SQUASHFS_CACHED_BLKS;
-+
-+	/* Init inode_table block pointer array */
-+	msblk->block_cache = kmalloc(sizeof(struct squashfs_cache) *
-+					squashfs_cached_blks, GFP_KERNEL);
-+	if (msblk->block_cache == NULL) {
-+		ERROR("Failed to allocate block cache\n");
-+		goto failed;
-+	}
-+
-+	for (i = 0; i < squashfs_cached_blks; i++)
-+		msblk->block_cache[i].block = SQUASHFS_INVALID_BLK;
-+
-+	msblk->next_cache = 0;
-+	msblk->unused_cache_blks = squashfs_cached_blks;
-+
-+	return 1;
-+
-+failed:
-+	return 0;
-+}
-+
-+
 +static int supported_squashfs_filesystem(struct squashfs_sb_info *msblk, int silent)
 +{
 +	struct squashfs_super_block *sblk = &msblk->sblk;
@@ -1167,7 +1167,6 @@
 +{
 +	struct squashfs_sb_info *msblk;
 +	struct squashfs_super_block *sblk;
-+	int i;
 +	char b[BDEVNAME_SIZE];
 +	struct inode *root;
 +
@@ -1192,13 +1191,8 @@
 +
 +	mutex_init(&msblk->read_data_mutex);
 +	mutex_init(&msblk->read_page_mutex);
-+	mutex_init(&msblk->block_cache_mutex);
-+	mutex_init(&msblk->fragment_mutex);
 +	mutex_init(&msblk->meta_index_mutex);
 +	
-+	init_waitqueue_head(&msblk->waitq);
-+	init_waitqueue_head(&msblk->fragment_wait_queue);
-+
 +	/* sblk->bytes_used is checked in squashfs_read_data to ensure reads are not
 + 	 * beyond filesystem end.  As we're using squashfs_read_data to read sblk here,
 + 	 * first set sblk->bytes_used to a useful value */
@@ -1265,7 +1259,9 @@
 +	s->s_flags |= MS_RDONLY;
 +	s->s_op = &squashfs_super_ops;
 +
-+	if (readahead_metadata(s) == 0)
++	msblk->block_cache = squashfs_cache_init("metadata", SQUASHFS_CACHED_BLKS,
++		SQUASHFS_METADATA_SIZE, 0);
++	if (msblk->block_cache == NULL)
 +		goto failed_mount;
 +
 +	/* Allocate read_page block */
@@ -1310,19 +1306,10 @@
 +	if (sblk->s_major == 1 && squashfs_1_0_supported(msblk))
 +		goto allocate_root;
 +
-+	msblk->fragment = kzalloc(sizeof(struct squashfs_fragment_cache) *
-+				SQUASHFS_CACHED_FRAGMENTS, GFP_KERNEL);
-+	if (msblk->fragment == NULL) {
-+		ERROR("Failed to allocate fragment block cache\n");
++	msblk->fragment_cache = squashfs_cache_init("fragment",
++		SQUASHFS_CACHED_FRAGMENTS, sblk->block_size, 1);
++	if (msblk->fragment_cache == NULL)
 +		goto failed_mount;
-+	}
-+
-+	for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS; i++) {
-+		msblk->fragment[i].block = SQUASHFS_INVALID_BLK;
-+	}
-+
-+	msblk->next_fragment = 0;
-+	msblk->unused_frag_blks = SQUASHFS_CACHED_FRAGMENTS;
 +
 +	/* Allocate and read fragment index table */
 +	if (msblk->read_fragment_index_table(s) == 0)
@@ -1335,7 +1322,6 @@
 +	if (read_inode_lookup_table(s) == 0)
 +		goto failed_mount;
 +
-+	s->s_op = &squashfs_export_super_ops;
 +	s->s_export_op = &squashfs_export_ops;
 +
 +allocate_root:
@@ -1357,10 +1343,10 @@
 +failed_mount:
 +	kfree(msblk->inode_lookup_table);
 +	kfree(msblk->fragment_index);
-+	kfree(msblk->fragment);
++	squashfs_cache_delete(msblk->fragment_cache);
 +	kfree(msblk->uid);
 +	vfree(msblk->read_page);
-+	kfree(msblk->block_cache);
++	squashfs_cache_delete(msblk->block_cache);
 +	kfree(msblk->fragment_index_2);
 +	vfree(msblk->stream.workspace);
 +	kfree(s->s_fs_info);
@@ -1437,7 +1423,7 @@
 +}
 +
 +
-+struct meta_index *locate_meta_index(struct inode *inode, int index, int offset)
++static struct meta_index *locate_meta_index(struct inode *inode, int index, int offset)
 +{
 +	struct meta_index *meta = NULL;
 +	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
@@ -1472,7 +1458,7 @@
 +}
 +
 +
-+struct meta_index *empty_meta_index(struct inode *inode, int offset, int skip)
++static struct meta_index *empty_meta_index(struct inode *inode, int offset, int skip)
 +{
 +	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
 +	struct meta_index *meta = NULL;
@@ -1526,7 +1512,7 @@
 +}
 +
 +
-+void release_meta_index(struct inode *inode, struct meta_index *meta)
++static void release_meta_index(struct inode *inode, struct meta_index *meta)
 +{
 +	meta->locked = 0;
 +	smp_mb();
@@ -1712,7 +1698,7 @@
 +	int bytes;
 +	int index = page->index >> (sblk->block_log - PAGE_CACHE_SHIFT);
 + 	void *pageaddr;
-+	struct squashfs_fragment_cache *fragment = NULL;
++	struct squashfs_cache_entry *fragment = NULL;
 +	char *data_ptr = msblk->read_page;
 +	
 +	int mask = (1 << (sblk->block_log - PAGE_CACHE_SHIFT)) - 1;
@@ -1761,10 +1747,11 @@
 +					SQUASHFS_I(inode)-> u.s1.fragment_start_block,
 +					SQUASHFS_I(inode)->u.s1.fragment_size);
 +
-+		if (fragment == NULL) {
++		if (fragment->error) {
 +			ERROR("Unable to read page, block %llx, size %x\n",
 +					SQUASHFS_I(inode)->u.s1.fragment_start_block,
 +					(int) SQUASHFS_I(inode)->u.s1.fragment_size);
++			release_cached_fragment(msblk, fragment);
 +			goto error_out;
 +		}
 +		bytes = i_size_read(inode) & (sblk->block_size - 1);
@@ -1838,7 +1825,7 @@
 +	TRACE("Entered get_dir_index_using_offset, i_count %d, f_pos %d\n",
 +					i_count, (unsigned int) f_pos);
 +
-+	f_pos =- 3;
++	f_pos -= 3;
 +	if (f_pos == 0)
 +		goto finish;
 +
@@ -2163,19 +2150,10 @@
 +
 +static void squashfs_put_super(struct super_block *s)
 +{
-+	int i;
-+
 +	if (s->s_fs_info) {
 +		struct squashfs_sb_info *sbi = s->s_fs_info;
-+		if (sbi->block_cache)
-+			for (i = 0; i < squashfs_cached_blks; i++)
-+				if (sbi->block_cache[i].block != SQUASHFS_INVALID_BLK)
-+					vfree(sbi->block_cache[i].data);
-+		if (sbi->fragment)
-+			for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS; i++) 
-+				vfree(sbi->fragment[i].data);
-+		kfree(sbi->fragment);
-+		kfree(sbi->block_cache);
++		squashfs_cache_delete(sbi->block_cache);
++		squashfs_cache_delete(sbi->fragment_cache);
 +		vfree(sbi->read_page);
 +		kfree(sbi->uid);
 +		kfree(sbi->fragment_index);
@@ -2202,7 +2180,7 @@
 +	if (err)
 +		goto out;
 +
-+	printk(KERN_INFO "squashfs: version 3.3 (2007/10/31) "
++	printk(KERN_INFO "squashfs: version 3.4 (2008/08/26) "
 +		"Phillip Lougher\n");
 +
 +	err = register_filesystem(&squashfs_fs_type);
@@ -2265,111 +2243,28 @@
 +
 +module_init(init_squashfs_fs);
 +module_exit(exit_squashfs_fs);
-+MODULE_DESCRIPTION("squashfs 3.2-r2-CVS, a compressed read-only filesystem");
++MODULE_DESCRIPTION("squashfs 3.4, a compressed read-only filesystem");
 +MODULE_AUTHOR("Phillip Lougher <phillip at lougher.demon.co.uk>");
 +MODULE_LICENSE("GPL");
-diff --git a/fs/squashfs/squashfs.h b/fs/squashfs/squashfs.h
-new file mode 100644
-index 0000000..ea7b6c3
---- /dev/null
-+++ b/fs/squashfs/squashfs.h
-@@ -0,0 +1,86 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007
-+ * Phillip Lougher <phillip at lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * squashfs.h
-+ */
-+
-+#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
-+#undef CONFIG_SQUASHFS_1_0_COMPATIBILITY
-+#endif
-+
-+#ifdef SQUASHFS_TRACE
-+#define TRACE(s, args...)	printk(KERN_NOTICE "SQUASHFS: "s, ## args)
-+#else
-+#define TRACE(s, args...)	{}
-+#endif
-+
-+#define ERROR(s, args...)	printk(KERN_ERR "SQUASHFS error: "s, ## args)
-+
-+#define SERROR(s, args...)	do { \
-+				if (!silent) \
-+				printk(KERN_ERR "SQUASHFS error: "s, ## args);\
-+				} while(0)
-+
-+#define WARNING(s, args...)	printk(KERN_WARNING "SQUASHFS: "s, ## args)
-+
-+static inline struct squashfs_inode_info *SQUASHFS_I(struct inode *inode)
-+{
-+	return list_entry(inode, struct squashfs_inode_info, vfs_inode);
-+}
-+
-+#if defined(CONFIG_SQUASHFS_1_0_COMPATIBILITY ) || defined(CONFIG_SQUASHFS_2_0_COMPATIBILITY)
-+#define SQSH_EXTERN
-+extern unsigned int squashfs_read_data(struct super_block *s, char *buffer,
-+				long long index, unsigned int length,
-+				long long *next_index, int srclength);
-+extern int squashfs_get_cached_block(struct super_block *s, void *buffer,
-+				long long block, unsigned int offset,
-+				int length, long long *next_block,
-+				unsigned int *next_offset);
-+extern void release_cached_fragment(struct squashfs_sb_info *msblk, struct
-+					squashfs_fragment_cache *fragment);
-+extern struct squashfs_fragment_cache *get_cached_fragment(struct super_block
-+					*s, long long start_block,
-+					int length);
-+extern struct inode *squashfs_iget(struct super_block *s, squashfs_inode_t inode, unsigned int inode_number);
-+extern const struct address_space_operations squashfs_symlink_aops;
-+extern const struct address_space_operations squashfs_aops;
-+extern struct inode_operations squashfs_dir_inode_ops;
-+#else
-+#define SQSH_EXTERN static
-+#endif
-+
-+#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
-+extern int squashfs_1_0_supported(struct squashfs_sb_info *msblk);
-+#else
-+static inline int squashfs_1_0_supported(struct squashfs_sb_info *msblk)
-+{
-+	return 0;
-+}
-+#endif
+diff -x .gitignore -Nurp linux-2.6.27-rc4/fs/squashfs/Makefile linux-2.6.27-rc4-squashfs3.4/fs/squashfs/Makefile
+--- linux-2.6.27-rc4/fs/squashfs/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.27-rc4-squashfs3.4/fs/squashfs/Makefile	2008-08-19 18:31:56.000000000 +0100
+@@ -0,0 +1,7 @@
++#
++# Makefile for the linux squashfs routines.
++#
 +
-+#ifdef CONFIG_SQUASHFS_2_0_COMPATIBILITY
-+extern int squashfs_2_0_supported(struct squashfs_sb_info *msblk);
-+#else
-+static inline int squashfs_2_0_supported(struct squashfs_sb_info *msblk)
-+{
-+	return 0;
-+}
-+#endif
-diff --git a/fs/squashfs/squashfs2_0.c b/fs/squashfs/squashfs2_0.c
-new file mode 100644
-index 0000000..fa909c8
---- /dev/null
-+++ b/fs/squashfs/squashfs2_0.c
++obj-$(CONFIG_SQUASHFS) += squashfs.o
++squashfs-y += inode.o
++squashfs-y += squashfs2_0.o
+diff -x .gitignore -Nurp linux-2.6.27-rc4/fs/squashfs/squashfs2_0.c linux-2.6.27-rc4-squashfs3.4/fs/squashfs/squashfs2_0.c
+--- linux-2.6.27-rc4/fs/squashfs/squashfs2_0.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.27-rc4-squashfs3.4/fs/squashfs/squashfs2_0.c	2008-08-19 18:31:56.000000000 +0100
 @@ -0,0 +1,740 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
 + *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007
++ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008
 + * Phillip Lougher <phillip at lougher.demon.co.uk>
 + *
 + * This program is free software; you can redistribute it and/or
@@ -3106,11 +3001,99 @@
 +
 +	return 1;
 +}
-diff --git a/include/linux/squashfs_fs.h b/include/linux/squashfs_fs.h
-new file mode 100644
-index 0000000..e60308e
---- /dev/null
-+++ b/include/linux/squashfs_fs.h
+diff -x .gitignore -Nurp linux-2.6.27-rc4/fs/squashfs/squashfs.h linux-2.6.27-rc4-squashfs3.4/fs/squashfs/squashfs.h
+--- linux-2.6.27-rc4/fs/squashfs/squashfs.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.27-rc4-squashfs3.4/fs/squashfs/squashfs.h	2008-08-19 18:31:56.000000000 +0100
+@@ -0,0 +1,86 @@
++/*
++ * Squashfs - a compressed read only filesystem for Linux
++ *
++ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008
++ * Phillip Lougher <phillip at lougher.demon.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2,
++ * or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ *
++ * squashfs.h
++ */
++
++#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
++#undef CONFIG_SQUASHFS_1_0_COMPATIBILITY
++#endif
++
++#ifdef SQUASHFS_TRACE
++#define TRACE(s, args...)	printk(KERN_NOTICE "SQUASHFS: "s, ## args)
++#else
++#define TRACE(s, args...)	{}
++#endif
++
++#define ERROR(s, args...)	printk(KERN_ERR "SQUASHFS error: "s, ## args)
++
++#define SERROR(s, args...)	do { \
++				if (!silent) \
++				printk(KERN_ERR "SQUASHFS error: "s, ## args);\
++				} while(0)
++
++#define WARNING(s, args...)	printk(KERN_WARNING "SQUASHFS: "s, ## args)
++
++static inline struct squashfs_inode_info *SQUASHFS_I(struct inode *inode)
++{
++	return list_entry(inode, struct squashfs_inode_info, vfs_inode);
++}
++
++#if defined(CONFIG_SQUASHFS_1_0_COMPATIBILITY ) || defined(CONFIG_SQUASHFS_2_0_COMPATIBILITY)
++#define SQSH_EXTERN
++extern unsigned int squashfs_read_data(struct super_block *s, char *buffer,
++				long long index, unsigned int length,
++				long long *next_index, int srclength);
++extern int squashfs_get_cached_block(struct super_block *s, void *buffer,
++				long long block, unsigned int offset,
++				int length, long long *next_block,
++				unsigned int *next_offset);
++extern void release_cached_fragment(struct squashfs_sb_info *msblk, struct
++					squashfs_cache_entry *fragment);
++extern struct squashfs_cache_entry *get_cached_fragment(struct super_block
++					*s, long long start_block,
++					int length);
++extern struct inode *squashfs_iget(struct super_block *s, squashfs_inode_t inode, unsigned int inode_number);
++extern const struct address_space_operations squashfs_symlink_aops;
++extern const struct address_space_operations squashfs_aops;
++extern struct inode_operations squashfs_dir_inode_ops;
++#else
++#define SQSH_EXTERN static
++#endif
++
++#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
++extern int squashfs_1_0_supported(struct squashfs_sb_info *msblk);
++#else
++static inline int squashfs_1_0_supported(struct squashfs_sb_info *msblk)
++{
++	return 0;
++}
++#endif
++
++#ifdef CONFIG_SQUASHFS_2_0_COMPATIBILITY
++extern int squashfs_2_0_supported(struct squashfs_sb_info *msblk);
++#else
++static inline int squashfs_2_0_supported(struct squashfs_sb_info *msblk)
++{
++	return 0;
++}
++#endif
+diff -x .gitignore -Nurp linux-2.6.27-rc4/include/linux/squashfs_fs.h linux-2.6.27-rc4-squashfs3.4/include/linux/squashfs_fs.h
+--- linux-2.6.27-rc4/include/linux/squashfs_fs.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.27-rc4-squashfs3.4/include/linux/squashfs_fs.h	2008-08-19 18:31:56.000000000 +0100
 @@ -0,0 +1,935 @@
 +#ifndef SQUASHFS_FS
 +#define SQUASHFS_FS
@@ -3118,7 +3101,7 @@
 +/*
 + * Squashfs
 + *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007
++ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008
 + * Phillip Lougher <phillip at lougher.demon.co.uk>
 + *
 + * This program is free software; you can redistribute it and/or
@@ -3208,7 +3191,7 @@
 +						SQUASHFS_CHECK)
 +
 +#define SQUASHFS_MKFLAGS(noi, nod, check_data, nof, no_frag, always_frag, \
-+		duplicate_checking, exortable)	(noi | (nod << 1) | (check_data << 2) \
++		duplicate_checking, exportable)	(noi | (nod << 1) | (check_data << 2) \
 +		| (nof << 3) | (no_frag << 4) | (always_frag << 5) | \
 +		(duplicate_checking << 6) | (exportable << 7))
 +
@@ -3468,7 +3451,7 @@
 +struct squashfs_fragment_entry {
 +	long long		start_block;
 +	unsigned int		size;
-+	unsigned int		pending;
++	unsigned int		unused;
 +} __attribute__ ((packed));
 +
 +extern int squashfs_uncompress_block(void *d, int dstlen, void *s, int srclen);
@@ -4047,18 +4030,16 @@
 +
 +#endif
 +#endif
-diff --git a/include/linux/squashfs_fs_i.h b/include/linux/squashfs_fs_i.h
-new file mode 100644
-index 0000000..76a3a5a
---- /dev/null
-+++ b/include/linux/squashfs_fs_i.h
+diff -x .gitignore -Nurp linux-2.6.27-rc4/include/linux/squashfs_fs_i.h linux-2.6.27-rc4-squashfs3.4/include/linux/squashfs_fs_i.h
+--- linux-2.6.27-rc4/include/linux/squashfs_fs_i.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.27-rc4-squashfs3.4/include/linux/squashfs_fs_i.h	2008-08-19 18:31:56.000000000 +0100
 @@ -0,0 +1,45 @@
 +#ifndef SQUASHFS_FS_I
 +#define SQUASHFS_FS_I
 +/*
 + * Squashfs
 + *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007
++ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008
 + * Phillip Lougher <phillip at lougher.demon.co.uk>
 + *
 + * This program is free software; you can redistribute it and/or
@@ -4098,18 +4079,16 @@
 +	struct inode	vfs_inode;
 +};
 +#endif
-diff --git a/include/linux/squashfs_fs_sb.h b/include/linux/squashfs_fs_sb.h
-new file mode 100644
-index 0000000..e5fa802
---- /dev/null
-+++ b/include/linux/squashfs_fs_sb.h
-@@ -0,0 +1,76 @@
+diff -x .gitignore -Nurp linux-2.6.27-rc4/include/linux/squashfs_fs_sb.h linux-2.6.27-rc4-squashfs3.4/include/linux/squashfs_fs_sb.h
+--- linux-2.6.27-rc4/include/linux/squashfs_fs_sb.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.27-rc4-squashfs3.4/include/linux/squashfs_fs_sb.h	2008-08-19 18:31:56.000000000 +0100
+@@ -0,0 +1,79 @@
 +#ifndef SQUASHFS_FS_SB
 +#define SQUASHFS_FS_SB
 +/*
 + * Squashfs
 + *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007
++ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008
 + * Phillip Lougher <phillip at lougher.demon.co.uk>
 + *
 + * This program is free software; you can redistribute it and/or
@@ -4131,18 +4110,29 @@
 +
 +#include <linux/squashfs_fs.h>
 +
-+struct squashfs_cache {
++struct squashfs_cache_entry {
 +	long long	block;
 +	int		length;
++	int		locked;
 +	long long	next_index;
++	char		pending;
++	char		error;
++	int		waiting;
++	wait_queue_head_t	wait_queue;
 +	char		*data;
 +};
 +
-+struct squashfs_fragment_cache {
-+	long long	block;
-+	int		length;
-+	unsigned int	locked;
-+	char		*data;
++struct squashfs_cache {
++	char *name;
++	int entries;
++	int block_size;
++	int next_blk;
++	int waiting;
++	int unused_blks;
++	int use_vmalloc;
++	spinlock_t lock;
++	wait_queue_head_t wait_queue;
++	struct squashfs_cache_entry entry[0];
 +};
 +
 +struct squashfs_sb_info {
@@ -4151,9 +4141,7 @@
 +	int			devblksize_log2;
 +	int			swap;
 +	struct squashfs_cache	*block_cache;
-+	struct squashfs_fragment_cache	*fragment;
-+	int			next_cache;
-+	int			next_fragment;
++	struct squashfs_cache	*fragment_cache;
 +	int			next_meta_index;
 +	unsigned int		*uid;
 +	unsigned int		*guid;
@@ -4162,16 +4150,10 @@
 +	char			*read_page;
 +	struct mutex		read_data_mutex;
 +	struct mutex		read_page_mutex;
-+	struct mutex		block_cache_mutex;
-+	struct mutex		fragment_mutex;
 +	struct mutex		meta_index_mutex;
-+	wait_queue_head_t	waitq;
-+	wait_queue_head_t	fragment_wait_queue;
 +	struct meta_index	*meta_index;
 +	z_stream		stream;
 +	long long		*inode_lookup_table;
-+	int			unused_cache_blks;
-+	int			unused_frag_blks;
 +	int			(*read_inode)(struct inode *i,  squashfs_inode_t \
 +				inode);
 +	long long		(*read_blocklist)(struct inode *inode, int \
@@ -4180,10 +4162,9 @@
 +	int			(*read_fragment_index_table)(struct super_block *s);
 +};
 +#endif
-diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
-index 3ac5904..0ddd43c 100644
---- a/init/do_mounts_rd.c
-+++ b/init/do_mounts_rd.c
+diff -x .gitignore -Nurp linux-2.6.27-rc4/init/do_mounts_rd.c linux-2.6.27-rc4-squashfs3.4/init/do_mounts_rd.c
+--- linux-2.6.27-rc4/init/do_mounts_rd.c	2008-08-11 15:20:55.000000000 +0100
++++ linux-2.6.27-rc4-squashfs3.4/init/do_mounts_rd.c	2008-08-19 18:31:56.000000000 +0100
 @@ -5,6 +5,7 @@
  #include <linux/ext2_fs.h>
  #include <linux/romfs_fs.h>
@@ -4192,7 +4173,7 @@
  #include <linux/initrd.h>
  #include <linux/string.h>
  
-@@ -39,6 +40,7 @@ static int __init crd_load(int in_fd, int out_fd);
+@@ -37,6 +38,7 @@ static int __init crd_load(int in_fd, in
   * numbers could not be found.
   *
   * We currently check for the following magic numbers:
@@ -4200,7 +4181,7 @@
   * 	minix
   * 	ext2
   *	romfs
-@@ -53,6 +55,7 @@ identify_ramdisk_image(int fd, int start_block)
+@@ -51,6 +53,7 @@ identify_ramdisk_image(int fd, int start
  	struct ext2_super_block *ext2sb;
  	struct romfs_super_block *romfsb;
  	struct cramfs_super *cramfsb;
@@ -4208,7 +4189,7 @@
  	int nblocks = -1;
  	unsigned char *buf;
  
-@@ -64,6 +67,7 @@ identify_ramdisk_image(int fd, int start_block)
+@@ -62,6 +65,7 @@ identify_ramdisk_image(int fd, int start
  	ext2sb = (struct ext2_super_block *) buf;
  	romfsb = (struct romfs_super_block *) buf;
  	cramfsb = (struct cramfs_super *) buf;
@@ -4216,7 +4197,7 @@
  	memset(buf, 0xe5, size);
  
  	/*
-@@ -101,6 +105,18 @@ identify_ramdisk_image(int fd, int start_block)
+@@ -99,6 +103,18 @@ identify_ramdisk_image(int fd, int start
  		goto done;
  	}
  



From katzj at fedoraproject.org  Tue Sep 30 19:21:13 2008
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Tue, 30 Sep 2008 19:21:13 +0000 (UTC)
Subject: rpms/squashfs-tools/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 squashfs-cflags.patch, 1.3, 1.4 squashfs-tools.spec, 1.17, 1.18
Message-ID: <20080930192113.3B27B70119@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/squashfs-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10162

Modified Files:
	.cvsignore sources squashfs-cflags.patch squashfs-tools.spec 
Log Message:
* Tue Sep 30 2008 Jeremy Katz <katzj at redhat.com> - 3.4-1
- update to 3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Dec 2007 15:37:43 -0000	1.5
+++ .cvsignore	30 Sep 2008 19:20:42 -0000	1.6
@@ -1 +1 @@
-squashfs3.3.tgz
+squashfs3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Dec 2007 15:37:43 -0000	1.5
+++ sources	30 Sep 2008 19:20:42 -0000	1.6
@@ -1 +1 @@
-95c40fca0d886893631b5de14a0af25b  squashfs3.3.tgz
+2a4d2995ad5aa6840c95a95ffa6b1da6  squashfs3.4.tar.gz

squashfs-cflags.patch:

Index: squashfs-cflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/squashfs-cflags.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- squashfs-cflags.patch	14 Dec 2007 15:37:43 -0000	1.3
+++ squashfs-cflags.patch	30 Sep 2008 19:20:42 -0000	1.4
@@ -1,6 +1,8 @@
---- squashfs3.0/squashfs-tools/Makefile.orig	2006-03-15 16:36:20.000000000 -0500
-+++ squashfs3.0/squashfs-tools/Makefile	2006-06-23 11:47:53.000000000 -0400
-@@ -1,6 +1,6 @@
+diff -up squashfs3.4/squashfs-tools/Makefile.cflags squashfs3.4/squashfs-tools/Makefile
+--- squashfs3.4/squashfs-tools/Makefile.cflags	2008-08-26 03:10:13.000000000 -0400
++++ squashfs3.4/squashfs-tools/Makefile	2008-09-30 15:08:22.000000000 -0400
+@@ -2,7 +2,7 @@ INSTALL_DIR = /usr/local/bin
+ 
  INCLUDEDIR = .
  
 -CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2


Index: squashfs-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/squashfs-tools.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- squashfs-tools.spec	19 Feb 2008 10:14:12 -0000	1.17
+++ squashfs-tools.spec	30 Sep 2008 19:20:42 -0000	1.18
@@ -1,11 +1,11 @@
 Summary: Utility for the creation of squashfs filesystems
 Name: squashfs-tools
-Version: 3.3
-Release: 2
+Version: 3.4
+Release: 1
 License: GPLv2+
 Group: System Environment/Base
 URL: http://squashfs.sf.net
-Source0: squashfs3.3.tgz
+Source0: squashfs3.4.tar.gz
 Patch0: squashfs-cflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel
@@ -15,7 +15,7 @@
 contains the utilities for manipulating squashfs filesystems.
 
 %prep
-%setup -q -n squashfs3.3
+%setup -q -n squashfs3.4
 %patch0 -p1 -b .cflags
 
 %build
@@ -41,6 +41,9 @@
 %{_sbindir}/unsquashfs
 
 %changelog
+* Tue Sep 30 2008 Jeremy Katz <katzj at redhat.com> - 3.4-1
+- update to 3.4
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.3-2
 - Autorebuild for GCC 4.3
 



From remi at fedoraproject.org  Tue Sep 30 19:32:19 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 30 Sep 2008 19:32:19 +0000 (UTC)
Subject: rpms/php-pear-XML-Parser/devel .cvsignore, 1.4,
	1.5 php-pear-XML-Parser.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20080930193219.5C1237013F@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-XML-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12899

Modified Files:
	.cvsignore php-pear-XML-Parser.spec sources 
Log Message:
update to 1.3.1 (minor fix in package.xml)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Parser/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Aug 2008 16:45:21 -0000	1.4
+++ .cvsignore	30 Sep 2008 19:31:48 -0000	1.5
@@ -1 +1 @@
-XML_Parser-1.3.0.tgz
+XML_Parser-1.3.1.tgz


Index: php-pear-XML-Parser.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Parser/devel/php-pear-XML-Parser.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pear-XML-Parser.spec	29 Aug 2008 16:45:21 -0000	1.5
+++ php-pear-XML-Parser.spec	30 Sep 2008 19:31:48 -0000	1.6
@@ -4,7 +4,7 @@
 Summary:      XML parsing class based on PHP's bundled expat
 Summary(fr):  Une classe d'analyse XML utilisant l'extension expat de PHP
 Name:         php-pear-XML-Parser
-Version:      1.3.0
+Version:      1.3.1
 Release:      1%{?dist}
 License:      BSD
 Group:        Development/Libraries
@@ -50,9 +50,9 @@
 
 %prep
 %setup -q -c
-# Package.xml is v2
-%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+# Package2.xml is v2
+%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
+mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
 %build
 # Empty build section
@@ -104,6 +104,9 @@
 
 
 %changelog
+* Tue Sep 30 2008 Remi Collet <Fedora at FamilleCollet.com> 1.3.1-1
+- fix in package.xml (license)
+
 * Fri Aug 29 2008 Remi Collet <Fedora at FamilleCollet.com> 1.3.0-1
 - update to 1.3.0
 - Switched license to BSD License


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Parser/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Aug 2008 16:45:21 -0000	1.4
+++ sources	30 Sep 2008 19:31:48 -0000	1.5
@@ -1 +1 @@
-7e8610ba4725f2bc35a1d06dc61d6c03  XML_Parser-1.3.0.tgz
+1210e440ce8a78c406ee234bd81dfbe5  XML_Parser-1.3.1.tgz



From ausil at fedoraproject.org  Tue Sep 30 19:35:23 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 30 Sep 2008 19:35:23 +0000 (UTC)
Subject: rpms/nss/F-9 nss.spec,1.48,1.49
Message-ID: <20080930193523.6011A70119@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/nss/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13738

Modified Files:
	nss.spec 
Log Message:
add sparc64 to the list of 64 bit arches



Index: nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss/F-9/nss.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- nss.spec	5 Sep 2008 19:04:01 -0000	1.48
+++ nss.spec	30 Sep 2008 19:34:52 -0000	1.49
@@ -4,7 +4,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.1.1
-Release:          1%{?dist}
+Release:          4%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -62,6 +62,7 @@
 Group:            Development/Libraries
 Requires:         nss = %{version}-%{release}
 Requires:         nspr-devel >= %{nspr_version}
+Requires:         pkgconfig
 
 %description devel
 Header and Library files for doing development with Network Security Services.
@@ -112,7 +113,7 @@
 export NSPR_INCLUDE_DIR
 export NSPR_LIB_DIR
 
-%ifarch x86_64 ppc64 ia64 s390x
+%ifarch x86_64 ppc64 ia64 s390x sparc64
 USE_64=1
 export USE_64
 %endif
@@ -297,6 +298,7 @@
 %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 tools
@@ -440,13 +442,23 @@
 
 
 %changelog
-* Fri Sep 05 2008 Kai Engert <kengert at redhat.com> - 3.12.1.1-1
+* Tue Sep 30 2008 Dennis Gilmore <dennis at ausil.us> - 3.12.1.1-4
+- add sparc64 to the list of 64 bit arches
+
+* Wed Sep 24 2008 Kai Engert <kaie at redhat.com> - 3.12.1.1-3
+- bug 456847, move pkgconfig requirement to devel package
+* Fri Sep 05 2008 Kai Engert <kengert at redhat.com> - 3.12.1.1-2
 - Update to NSS_3_12_1_RC2
-* Fri Aug 22 2008 Kai Engert <kaie at redhat.com> - 3.12.1.0-1
+* Fri Aug 22 2008 Kai Engert <kaie at redhat.com> - 3.12.1.0-2
 - NSS 3.12.1 RC1
-* Fri Aug 22 2008 Kai Engert <kengert at redhat.com> - 3.12.0.3-0.9.2
+* Fri Aug 15 2008 Kai Engert <kaie at redhat.com> - 3.12.0.3-7
 - fix bug bug 429175 in libpem module
-* Mon Jun 02 2008 Kai Engert <kengert at redhat.com> - 3.12.0.3-0.9.1
+* Tue Aug 05 2008 Kai Engert <kengert at redhat.com> - 3.12.0.3-6
+- bug 456847, add Requires: pkgconfig
+* Tue Jun 24 2008 Kai Engert <kengert at redhat.com> - 3.12.0.3-3
+- nss package should own /etc/prelink.conf.d folder, rhbz#452062
+- use upstream patch to fix test suite abort
+* Mon Jun 02 2008 Kai Engert <kengert at redhat.com> - 3.12.0.3-2
 - Update to NSS_3_12_RC4
 * Mon Apr 14 2008 Kai Engert <kengert at redhat.com> - 3.12.0.1-1
 - Update to NSS_3_12_RC2



From ausil at fedoraproject.org  Tue Sep 30 19:36:34 2008
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 30 Sep 2008 19:36:34 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.53,1.54
Message-ID: <20080930193634.7E6B270119@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14057

Modified Files:
	nss.spec 
Log Message:
add sparc64 to the list of 64 bit arches




Index: nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss/devel/nss.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- nss.spec	24 Sep 2008 09:07:52 -0000	1.53
+++ nss.spec	30 Sep 2008 19:36:04 -0000	1.54
@@ -4,7 +4,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.1.1
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -113,7 +113,7 @@
 export NSPR_INCLUDE_DIR
 export NSPR_LIB_DIR
 
-%ifarch x86_64 ppc64 ia64 s390x
+%ifarch x86_64 ppc64 ia64 s390x sparc64
 USE_64=1
 export USE_64
 %endif
@@ -442,6 +442,9 @@
 
 
 %changelog
+* Tue Sep 30 2008 Dennis Gilmore <dennis at ausil.us> - 3.12.1.1-4
+- add sparc64 to the list of 64 bit arches
+
 * Wed Sep 24 2008 Kai Engert <kaie at redhat.com> - 3.12.1.1-3
 - bug 456847, move pkgconfig requirement to devel package
 * Fri Sep 05 2008 Kai Engert <kengert at redhat.com> - 3.12.1.1-2



From remi at fedoraproject.org  Tue Sep 30 19:36:54 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 30 Sep 2008 19:36:54 +0000 (UTC)
Subject: rpms/php-pear-XML-Parser/F-9 php-pear-XML-Parser.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20080930193654.BDF4E70119@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-XML-Parser/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14199

Modified Files:
	php-pear-XML-Parser.spec sources 
Log Message:
update to 1.3.1 (minor fix in package.xml)


Index: php-pear-XML-Parser.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Parser/F-9/php-pear-XML-Parser.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pear-XML-Parser.spec	29 Aug 2008 16:50:48 -0000	1.5
+++ php-pear-XML-Parser.spec	30 Sep 2008 19:36:24 -0000	1.6
@@ -4,7 +4,7 @@
 Summary:      XML parsing class based on PHP's bundled expat
 Summary(fr):  Une classe d'analyse XML utilisant l'extension expat de PHP
 Name:         php-pear-XML-Parser
-Version:      1.3.0
+Version:      1.3.1
 Release:      1%{?dist}
 License:      BSD
 Group:        Development/Libraries
@@ -50,9 +50,9 @@
 
 %prep
 %setup -q -c
-# Package.xml is v2
-%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+# Package2.xml is v2
+%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
+mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
 %build
 # Empty build section
@@ -104,6 +104,9 @@
 
 
 %changelog
+* Tue Sep 30 2008 Remi Collet <Fedora at FamilleCollet.com> 1.3.1-1
+- fix in package.xml (license)
+
 * Fri Aug 29 2008 Remi Collet <Fedora at FamilleCollet.com> 1.3.0-1
 - update to 1.3.0
 - Switched license to BSD License


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Parser/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Aug 2008 16:50:48 -0000	1.4
+++ sources	30 Sep 2008 19:36:24 -0000	1.5
@@ -1 +1 @@
-7e8610ba4725f2bc35a1d06dc61d6c03  XML_Parser-1.3.0.tgz
+1210e440ce8a78c406ee234bd81dfbe5  XML_Parser-1.3.1.tgz



From james at fedoraproject.org  Tue Sep 30 19:37:28 2008
From: james at fedoraproject.org (James Antill)
Date: Tue, 30 Sep 2008 19:37:28 +0000 (UTC)
Subject: rpms/python/devel python-2.5-CVE-2008-2316.patch, NONE,
	1.1 python-2.5.2-binutils-no-dep.patch, NONE,
	1.1 python-2.5.2-db47.patch, NONE,
	1.1 python-2.5.2-set_wakeup_fd4.patch, NONE, 1.1 .cvsignore,
	1.17, 1.18 python.spec, 1.136, 1.137 sources, 1.17, 1.18
Message-ID: <20080930193728.CA17870119@cvs1.fedora.phx.redhat.com>

Author: james

Update of /cvs/pkgs/rpms/python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14436

Modified Files:
	.cvsignore python.spec sources 
Added Files:
	python-2.5-CVE-2008-2316.patch 
	python-2.5.2-binutils-no-dep.patch python-2.5.2-db47.patch 
	python-2.5.2-set_wakeup_fd4.patch 
Log Message:
* Tue Sep 30 2008 James Antill <katzj at redhat.com> - 2.5.2-1
- Move to 2.5.2
- Fix CVE-2008-2316 hashlib overflow.


python-2.5-CVE-2008-2316.patch:

--- NEW FILE python-2.5-CVE-2008-2316.patch ---
Index: Lib/test/test_hashlib.py
===================================================================
--- Lib/test/test_hashlib.py	(revision 64642)
+++ Lib/test/test_hashlib.py	(working copy)
@@ -9,8 +9,8 @@
 import hashlib
 import unittest
 from test import test_support
+from test.test_support import _4G, precisionbigmemtest
 
-
 def hexstr(s):
     import string
     h = string.hexdigits
@@ -55,7 +55,6 @@
             m2.update(aas + bees + cees)
             self.assertEqual(m1.digest(), m2.digest())
 
-
     def check(self, name, data, digest):
         # test the direct constructors
         computed = getattr(hashlib, name)(data).hexdigest()
@@ -74,8 +73,23 @@
     def test_case_md5_2(self):
         self.check('md5', 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789',
                    'd174ab98d277d9f5a5611c2c9f419d9f')
+    
+    @precisionbigmemtest(size=_4G + 5, memuse=1)
+    def test_case_md5_huge(self, size):
+        if size == _4G + 5:
+            try:
+                self.check('md5', 'A'*size, 'c9af2dff37468ce5dfee8f2cfc0a9c6d')
+            except OverflowError:
+                pass # 32-bit arch
+    
+    @precisionbigmemtest(size=_4G - 1, memuse=1)
+    def test_case_md5_uintmax(self, size):
+        if size == _4G - 1:
+            try:
+                self.check('md5', 'A'*size, '28138d306ff1b8281f1a9067e1a1a2b3')
+            except OverflowError:
+                pass # 32-bit arch
 
-
     # use the three examples from Federal Information Processing Standards
     # Publication 180-1, Secure Hash Standard,  1995 April 17
     # http://www.itl.nist.gov/div897/pubs/fip180-1.htm
Index: Modules/_hashopenssl.c
===================================================================
--- Modules/_hashopenssl.c	(revision 64642)
+++ Modules/_hashopenssl.c	(working copy)
@@ -19,7 +19,9 @@
 /* EVP is the preferred interface to hashing in OpenSSL */
 #include <openssl/evp.h>
 
+#define MUNCH_SIZE INT_MAX
 
+
 #ifndef HASH_OBJ_CONSTRUCTOR
 #define HASH_OBJ_CONSTRUCTOR 0
 #endif
@@ -164,9 +166,18 @@
     if (!PyArg_ParseTuple(args, "s#:update", &cp, &len))
         return NULL;
 
+    if (len > 0 && len <= MUNCH_SIZE) {
     EVP_DigestUpdate(&self->ctx, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t,
                                                       unsigned int));
-
+    } else {
+        Py_ssize_t offset = 0;
+        while (len) {
+            unsigned int process = len > MUNCH_SIZE ? MUNCH_SIZE : len;
+            EVP_DigestUpdate(&self->ctx, cp + offset, process);
+            len -= process;
+            offset += process;
+        }
+    }
     Py_INCREF(Py_None);
     return Py_None;
 }
@@ -255,10 +266,21 @@
     self->name = name_obj;
     Py_INCREF(self->name);
 
-    if (cp && len)
+    if (cp && len) {
+        if (len > 0 && len <= MUNCH_SIZE) {
         EVP_DigestUpdate(&self->ctx, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t,
                                                           unsigned int));
-
+        } else {
+            Py_ssize_t offset = 0;
+            while (len) {
+                unsigned int process = len > MUNCH_SIZE ? MUNCH_SIZE : len;
+                EVP_DigestUpdate(&self->ctx, cp + offset, process);
+                len -= process;
+                offset += process;
+            }
+        }
+    }
+    
     return 0;
 }
 #endif
@@ -328,7 +350,7 @@
 static PyObject *
 EVPnew(PyObject *name_obj,
        const EVP_MD *digest, const EVP_MD_CTX *initial_ctx,
-       const unsigned char *cp, unsigned int len)
+       const unsigned char *cp, Py_ssize_t len)
 {
     EVPobject *self;
 
@@ -346,8 +368,20 @@
         EVP_DigestInit(&self->ctx, digest);
     }
 
-    if (cp && len)
-        EVP_DigestUpdate(&self->ctx, cp, len);
+    if (cp && len) {
+        if (len > 0 && len <= MUNCH_SIZE) {
+            EVP_DigestUpdate(&self->ctx, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t,
+                                                              unsigned int));
+        } else {
+            Py_ssize_t offset = 0;
+            while (len) {
+                unsigned int process = len > MUNCH_SIZE ? MUNCH_SIZE : len;
+                EVP_DigestUpdate(&self->ctx, cp + offset, process);
+                len -= process;
+                offset += process;
+            }
+        }
+    }
 
     return (PyObject *)self;
 }
@@ -384,8 +418,7 @@
 
     digest = EVP_get_digestbyname(name);
 
-    return EVPnew(name_obj, digest, NULL, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t,
-                                                               unsigned int));
+    return EVPnew(name_obj, digest, NULL, cp, len);
 }
 
 /*
@@ -410,7 +443,7 @@
                 CONST_ ## NAME ## _name_obj, \
                 NULL, \
                 CONST_new_ ## NAME ## _ctx_p, \
-                cp, Py_SAFE_DOWNCAST(len, Py_ssize_t, unsigned int)); \
+                cp, len); \
     }
 
 /* a PyMethodDef structure for the constructor */

python-2.5.2-binutils-no-dep.patch:

--- NEW FILE python-2.5.2-binutils-no-dep.patch ---
diff -ru Python-2.5.2-orig/Lib/ctypes/util.py Python-2.5.2/Lib/ctypes/util.py
--- Python-2.5.2-orig/Lib/ctypes/util.py	2007-09-14 16:05:26.000000000 -0400
+++ Python-2.5.2/Lib/ctypes/util.py	2008-09-24 17:30:06.000000000 -0400
@@ -83,9 +83,14 @@
             if not f:
                 return None
             cmd = "objdump -p -j .dynamic 2>/dev/null " + f
-            res = re.search(r'\sSONAME\s+([^\s]+)', os.popen(cmd).read())
+            try:
+                res = re.search(r'\sSONAME\s+([^\s]+)', os.popen(cmd).read())
+            except:
+                res = None
             if not res:
-                return None
+                return os.path.basename(f) #  This is good for GLibc, I think,
+                                           # and a dep on binutils is big (for
+                                           # live CDs).
             return res.group(1)
 
     if (sys.platform.startswith("freebsd")

python-2.5.2-db47.patch:

--- NEW FILE python-2.5.2-db47.patch ---
diff -ru Python-2.5.2-orig/Modules/_bsddb.c Python-2.5.2/Modules/_bsddb.c
--- Python-2.5.2-orig/Modules/_bsddb.c	2008-02-03 02:26:23.000000000 -0500
+++ Python-2.5.2/Modules/_bsddb.c	2008-09-24 17:01:50.000000000 -0400
@@ -5335,11 +5335,13 @@
 DBEnv_getattr(DBEnvObject* self, char *name)
 {
     if (!strcmp(name, "db_home")) {
+	const char *home = NULL;
         CHECK_ENV_NOT_CLOSED(self);
-        if (self->db_env->db_home == NULL) {
+	self->db_env->get_home(self->db_env, &home);
+        if (home == NULL) {
             RETURN_NONE();
         }
-        return PyString_FromString(self->db_env->db_home);
+        return PyString_FromString(home);
     }
 
     return Py_FindMethod(DBEnv_methods, (PyObject* )self, name);
@@ -5961,22 +5963,37 @@
     ADD_INT(d, DB_TIME_NOTGRANTED);
     ADD_INT(d, DB_TXN_NOT_DURABLE);
     ADD_INT(d, DB_TXN_WRITE_NOSYNC);
-    ADD_INT(d, DB_LOG_AUTOREMOVE);
-    ADD_INT(d, DB_DIRECT_LOG);
     ADD_INT(d, DB_DIRECT_DB);
     ADD_INT(d, DB_INIT_REP);
     ADD_INT(d, DB_ENCRYPT);
     ADD_INT(d, DB_CHKSUM);
 #endif
 
+#if (DBVER >= 42) && (DBVER < 47)
+    ADD_INT(d, DB_LOG_AUTOREMOVE);
+    ADD_INT(d, DB_DIRECT_LOG);
+#endif
+
+#if (DBVER >= 47)
+    ADD_INT(d, DB_LOG_DIRECT);
+    ADD_INT(d, DB_LOG_DSYNC);
+    ADD_INT(d, DB_LOG_IN_MEMORY);
+    ADD_INT(d, DB_LOG_AUTO_REMOVE);
+    ADD_INT(d, DB_LOG_ZERO);
+#endif
+
 #if (DBVER >= 43)
-    ADD_INT(d, DB_LOG_INMEMORY);
     ADD_INT(d, DB_BUFFER_SMALL);
     ADD_INT(d, DB_SEQ_DEC);
     ADD_INT(d, DB_SEQ_INC);
     ADD_INT(d, DB_SEQ_WRAP);
 #endif
 
+#if (DBVER >= 43) && (DBVER < 47)
+    ADD_INT(d, DB_LOG_INMEMORY);
+    ADD_INT(d, DB_DSYNC_LOG);
+#endif
+
 #if (DBVER >= 41)
     ADD_INT(d, DB_ENCRYPT_AES);
     ADD_INT(d, DB_AUTO_COMMIT);
diff -ru Python-2.5.2-orig/setup.py Python-2.5.2/setup.py
--- Python-2.5.2-orig/setup.py	2008-09-24 17:01:02.000000000 -0400
+++ Python-2.5.2/setup.py	2008-09-24 17:03:05.000000000 -0400
@@ -608,12 +608,12 @@
         # a release.  Most open source OSes come with one or more
         # versions of BerkeleyDB already installed.
 
-        max_db_ver = (4, 5)
+        max_db_ver = (4, 7)
         # NOTE: while the _bsddb.c code links against BerkeleyDB 4.6.x
         # we leave that version disabled by default as it has proven to be
         # quite a buggy library release on many platforms.
         min_db_ver = (3, 3)
-        db_setup_debug = False   # verbose debug prints from this script?
+        db_setup_debug = True   # verbose debug prints from this script?
 
         # construct a list of paths to look for the header file in on
         # top of the normal inc_dirs.

python-2.5.2-set_wakeup_fd4.patch:

--- NEW FILE python-2.5.2-set_wakeup_fd4.patch ---
diff -ru Python-2.5.2-orig/Modules/signalmodule.c Python-2.5.2/Modules/signalmodule.c
--- Python-2.5.2-orig/Modules/signalmodule.c	2007-12-10 18:03:55.000000000 -0500
+++ Python-2.5.2/Modules/signalmodule.c	2008-09-24 17:32:45.000000000 -0400
@@ -12,6 +12,8 @@
 
 #include <signal.h>
 
+#include <sys/stat.h>
+
 #ifndef SIG_ERR
 #define SIG_ERR ((PyOS_sighandler_t)(-1))
 #endif
@@ -75,6 +77,8 @@
         PyObject *func;
 } Handlers[NSIG];
 
+static int wakeup_fd = -1;
+
 /* Speed up sigcheck() when none tripped */
 static volatile sig_atomic_t is_tripped = 0;
 
@@ -113,6 +117,7 @@
 static void
 signal_handler(int sig_num)
 {
+	const char dummy_byte = '\0';
 #ifdef WITH_THREAD
 #ifdef WITH_PTH
 	if (PyThread_get_thread_ident() != main_thread) {
@@ -128,6 +133,8 @@
                    cleared in PyErr_CheckSignals() before .tripped. */
 		is_tripped = 1;
 		Py_AddPendingCall(checksignals_witharg, NULL);
+		if (wakeup_fd != -1)
+			write(wakeup_fd, &dummy_byte, 1);
 #ifdef WITH_THREAD
 	}
 #endif
@@ -267,6 +274,39 @@
 anything else -- the callable Python object used as a handler");
 
 
+static PyObject *
+signal_set_wakeup_fd(PyObject *self, PyObject *args)
+{
+	struct stat buf;
+	int fd, old_fd;
+	if (!PyArg_ParseTuple(args, "i:set_wakeup_fd", &fd))
+		return NULL;
+#ifdef WITH_THREAD
+	if (PyThread_get_thread_ident() != main_thread) {
+		PyErr_SetString(PyExc_ValueError,
+				"set_wakeup_fd only works in main thread");
+		return NULL;
+	}
+#endif
+	if (fd != -1 && fstat(fd, &buf) != 0) {
+		PyErr_SetString(PyExc_ValueError, "invalid fd");
+		return NULL;
+	}
+	old_fd = wakeup_fd;
+	wakeup_fd = fd;
+	return PyLong_FromLong(old_fd);
+}
+
+PyDoc_STRVAR(set_wakeup_fd_doc,
+"set_wakeup_fd(fd) -> fd\n\
+\n\
+Sets the fd to be written to (with '\\0') when a signal\n\
+comes in.  A library can use this to wakeup select or poll.\n\
+The previous fd is returned.\n\
+\n\
+The fd must be non-blocking.");
+
+
 /* List of functions defined in the module */
 static PyMethodDef signal_methods[] = {
 #ifdef HAVE_ALARM
@@ -274,6 +314,7 @@
 #endif
 	{"signal",	        signal_signal, METH_VARARGS, signal_doc},
 	{"getsignal",	        signal_getsignal, METH_VARARGS, getsignal_doc},
+	{"set_wakeup_fd",	signal_set_wakeup_fd, METH_VARARGS, set_wakeup_fd_doc},
 #ifdef HAVE_PAUSE
 	{"pause",	        (PyCFunction)signal_pause,
 	 METH_NOARGS,pause_doc},


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	31 May 2007 20:09:48 -0000	1.17
+++ .cvsignore	30 Sep 2008 19:36:58 -0000	1.18
@@ -1 +1 @@
-Python-2.5.1.tar.bz2
+Python-2.5.2.tar.bz2


Index: python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/python.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- python.spec	17 Jul 2008 17:09:22 -0000	1.136
+++ python.spec	30 Sep 2008 19:36:58 -0000	1.137
@@ -21,8 +21,8 @@
 
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
-Version: 2.5.1
-Release: 30%{?dist}
+Version: 2.5.2
+Release: 1%{?dist}
 License: Python
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -39,7 +39,7 @@
 Patch7: python-2.5.1-sqlite-encoding.patch
 Patch8: python-2.5-xmlrpclib-marshal-objects.patch
 Patch9: python-2.5-tkinter.patch
-Patch10: python-2.5.1-binutils-no-dep.patch
+Patch10: python-2.5.2-binutils-no-dep.patch
 Patch11: python-2.5.1-codec-ascii-tolower.patch
 Patch12: python-2.5.1-pysqlite.patch
 Patch13: python-2.5.1-socketmodule-constants.patch
@@ -51,16 +51,17 @@
 Patch50: python-2.5-disable-egginfo.patch
 
 # new db version
-Patch60: python-2.5.1-db47.patch
+Patch60: python-2.5.2-db47.patch
 
 # lib64 patches
 Patch101: python-2.3.4-lib64-regex.patch
 Patch102: python-2.5-lib64.patch
 
 # New API from 2.6
-Patch260: python2.6-set_wakeup_fd4.patch
+Patch260: python-2.5.2-set_wakeup_fd4.patch
 
 Patch999: python-2.5.CVE-2007-4965-int-overflow.patch
+Patch998: python-2.5-CVE-2008-2316.patch
 
 
 %if %{main_python}
@@ -206,7 +207,6 @@
 %patch102 -p1 -b .lib64
 %endif
 
-%patch9 -p1 -b .tkinter
 %patch10 -p1 -b .binutils-no-dep
 %patch11 -p1 -b .ascii-tolower
 %patch12 -p1 -b .pysqlite-2.3.3-minimal
@@ -222,6 +222,7 @@
 %patch260 -p1 -b .set_wakeup_fd
 
 %patch999 -p1 -b .cve2007-4965
+%patch998 -p0 -b .cve2008-2316
 
 # This shouldn't be necesarry, but is right now (2.2a3)
 find -name "*~" |xargs rm -f
@@ -510,6 +511,10 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so
 
 %changelog
+* Tue Sep 30 2008 James Antill <katzj at redhat.com> - 2.5.2-1
+- Move to 2.5.2
+- Fix CVE-2008-2316 hashlib overflow.
+
 * Thu Jul 17 2008 Jeremy Katz <katzj at redhat.com> - 2.5.1-30
 - Fix up the build for new rpm
 - And actually build against db4-4.7 (#455170)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	31 May 2007 20:09:48 -0000	1.17
+++ sources	30 Sep 2008 19:36:58 -0000	1.18
@@ -1 +1 @@
-70084ffa561660f07de466c2c8c4842d  Python-2.5.1.tar.bz2
+afb5451049eda91fbde10bd5a4b7fadc  Python-2.5.2.tar.bz2



From beuc at fedoraproject.org  Tue Sep 30 19:21:43 2008
From: beuc at fedoraproject.org (Sylvain Beucler)
Date: Tue, 30 Sep 2008 19:21:43 +0000 (UTC)
Subject: rpms/freedink-dfarc/devel freedink-dfarc.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20080930192143.7389670119@cvs1.fedora.phx.redhat.com>

Author: beuc

Update of /cvs/pkgs/rpms/freedink-dfarc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9812/devel

Modified Files:
	.cvsignore sources 
Added Files:
	freedink-dfarc.spec import.log 
Log Message:
Tue Sep 30 2008 Sylvain Beucler <beuc at beuc.net> - 3.2.1-2
- Initial import




--- NEW FILE freedink-dfarc.spec ---
Name:		freedink-dfarc
Version:	3.2.1
Release:	2%{?dist}
Summary:	Frontend and .dmod installer for GNU FreeDink

Group:		Amusements/Games
License:	GPLv3+
URL:		http://www.freedink.org/
Source0:	ftp://ftp.gnu.org/gnu/freedink/dfarc-%{version}.tar.gz
#Source0:	http://www.freedink.org/snapshots/dfarc-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	bzip2-devel, wxGTK-devel >= 2.6, intltool, gettext, desktop-file-utils
# Note: intltool F8 doesn't depend on gettext, F9's does.
# ('intltool' requires 'gettext' at configure time)
Requires:	xdg-utils

%description
DFArc2 makes it easy to play and manage the Dink Smallwood game and
it's numerous Dink Modules (or D-Mods).

%prep
%setup -q -n dfarc-%{version}


%build
# Don't install desktop files, use %post instead
%configure --disable-desktopfiles
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%find_lang dfarc
desktop-file-validate %{buildroot}/%{_datadir}/applications/%name.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
# http://fedoraproject.org/wiki/Packaging/ScriptletSnippets#desktop-database
update-desktop-database &> /dev/null || :
# http://fedoraproject.org/wiki/Packaging/ScriptletSnippets#GTK.2B_icon_cache
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
# http://fedoraproject.org/wiki/Packaging/ScriptletSnippets#mimeinfo
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun
# http://fedoraproject.org/wiki/Packaging/ScriptletSnippets#desktop-database
update-desktop-database &> /dev/null || :
# http://fedoraproject.org/wiki/Packaging/ScriptletSnippets#GTK.2B_icon_cache
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
# http://fedoraproject.org/wiki/Packaging/ScriptletSnippets#mimeinfo
update-mime-database %{_datadir}/mime &> /dev/null || :


%files -f dfarc.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README THANKS TODO TRANSLATIONS.txt ChangeLog
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/mime/packages/*
%{_datadir}/pixmaps/*
# Don't include system directories, only added files:
%{_datadir}/icons/hicolor/32x32/mimetypes/*
%{_mandir}/man1/*
# Done using 'find_lang' in 'install':
#%%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*
#%%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*


%changelog
* Wed Sep 24 2008 Sylvain Beucler <beuc at beuc.net> - 3.2.1-2
- Fix update-mime-database call (was conditional due to typo)
- Fix macros in comments
- Tidy changelog

* Tue Sep 23 2008 Sylvain Beucler <beuc at beuc.net> - 3.2.1-1
- New upstream release
- Fix source URI
- Clarify wxGlade upstream developer-only dependency
- Use 'install -p' to preserve timestamps
- Validate desktop files> * Desktop file
- Rebuild MIME cache after installing desktop files
- Add ChangeLog to the docs
- Don't own _datadir/icons/hicolor directories

* Sun Sep 20 2008 Sylvain Beucler <beuc at beuc.net> - 3.2-1
- New upstream release

* Thu Aug 28 2008 Sylvain Beucler <beuc at beuc.net> 3.0-1
- Initial package


--- NEW FILE import.log ---
freedink-dfarc-3_2_1-2_fc8:HEAD:freedink-dfarc-3.2.1-2.fc8.src.rpm:1222802317


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freedink-dfarc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2008 19:22:58 -0000	1.1
+++ .cvsignore	30 Sep 2008 19:21:13 -0000	1.2
@@ -0,0 +1 @@
+dfarc-3.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freedink-dfarc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2008 19:22:58 -0000	1.1
+++ sources	30 Sep 2008 19:21:13 -0000	1.2
@@ -0,0 +1 @@
+77e1a31c04d0e6bcf1171f2229834e7b  dfarc-3.2.1.tar.gz



From remi at fedoraproject.org  Tue Sep 30 19:43:06 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 30 Sep 2008 19:43:06 +0000 (UTC)
Subject: rpms/php-pear-XML-Parser/F-8 php-pear-XML-Parser.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20080930194306.6029F70119@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-XML-Parser/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15763

Modified Files:
	php-pear-XML-Parser.spec sources 
Log Message:
update to 1.3.1 (minor fix in package.xml)


Index: php-pear-XML-Parser.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Parser/F-8/php-pear-XML-Parser.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pear-XML-Parser.spec	29 Aug 2008 16:56:07 -0000	1.5
+++ php-pear-XML-Parser.spec	30 Sep 2008 19:42:36 -0000	1.6
@@ -4,7 +4,7 @@
 Summary:      XML parsing class based on PHP's bundled expat
 Summary(fr):  Une classe d'analyse XML utilisant l'extension expat de PHP
 Name:         php-pear-XML-Parser
-Version:      1.3.0
+Version:      1.3.1
 Release:      1%{?dist}
 License:      BSD
 Group:        Development/Libraries
@@ -50,9 +50,9 @@
 
 %prep
 %setup -q -c
-# Package.xml is v2
-%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+# Package2.xml is v2
+%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
+mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
 %build
 # Empty build section
@@ -104,6 +104,9 @@
 
 
 %changelog
+* Tue Sep 30 2008 Remi Collet <Fedora at FamilleCollet.com> 1.3.1-1
+- fix in package.xml (license)
+
 * Fri Aug 29 2008 Remi Collet <Fedora at FamilleCollet.com> 1.3.0-1
 - update to 1.3.0
 - Switched license to BSD License


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Parser/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Aug 2008 16:56:07 -0000	1.4
+++ sources	30 Sep 2008 19:42:36 -0000	1.5
@@ -1 +1 @@
-7e8610ba4725f2bc35a1d06dc61d6c03  XML_Parser-1.3.0.tgz
+1210e440ce8a78c406ee234bd81dfbe5  XML_Parser-1.3.1.tgz



From notting at fedoraproject.org  Tue Sep 30 19:44:35 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 30 Sep 2008 19:44:35 +0000 (UTC)
Subject: rpms/gnucash/devel .cvsignore, 1.34, 1.35 gnucash.spec, 1.90,
	1.91 sources, 1.36, 1.37
Message-ID: <20080930194435.CB3F070119@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/gnucash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16240

Modified Files:
	.cvsignore gnucash.spec sources 
Log Message:
Update to 2.2.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnucash/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	1 Aug 2008 15:38:58 -0000	1.34
+++ .cvsignore	30 Sep 2008 19:44:05 -0000	1.35
@@ -1 +1 @@
-gnucash-2.2.6.tar.bz2
+gnucash-2.2.7.tar.bz2


Index: gnucash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- gnucash.spec	9 Sep 2008 19:53:54 -0000	1.90
+++ gnucash.spec	30 Sep 2008 19:44:05 -0000	1.91
@@ -2,7 +2,7 @@
 
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances
-Version: 2.2.6
+Version: 2.2.7
 URL: http://gnucash.org/
 Release: 2%{?dist}
 License: GPLv2+
@@ -128,6 +128,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Tue Sep 30 2008 Bill Nottingham <notting at redhat.com> - 2.2.7-1
+- update to 2.2.7
+ 
 * Tue Sep  9 2008 Bill Nottingham <notting at redhat.com> - 2.2.6-2
 - rebuild against new aqbanking
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnucash/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	1 Aug 2008 15:38:58 -0000	1.36
+++ sources	30 Sep 2008 19:44:05 -0000	1.37
@@ -1 +1 @@
-1dea48e0705759a3e60a8c2e1018e27b  gnucash-2.2.6.tar.bz2
+0f3f324c274b136070b769aa10591ccf  gnucash-2.2.7.tar.bz2



From notting at fedoraproject.org  Tue Sep 30 19:46:32 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 30 Sep 2008 19:46:32 +0000 (UTC)
Subject: rpms/gnucash/devel gnucash.spec,1.91,1.92
Message-ID: <20080930194632.3B1B070119@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/gnucash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16651

Modified Files:
	gnucash.spec 
Log Message:
fix release


Index: gnucash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- gnucash.spec	30 Sep 2008 19:44:05 -0000	1.91
+++ gnucash.spec	30 Sep 2008 19:46:01 -0000	1.92
@@ -4,7 +4,7 @@
 Summary: GnuCash is an application to keep track of your finances
 Version: 2.2.7
 URL: http://gnucash.org/
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.bz2



From tmraz at fedoraproject.org  Tue Sep 30 19:53:26 2008
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 30 Sep 2008 19:53:26 +0000 (UTC)
Subject: rpms/libtasn1/devel libtasn1-1.5.tar.gz.sig, NONE, 1.1 .cvsignore,
	1.4, 1.5 libtasn1.spec, 1.25, 1.26 sources, 1.14,
	1.15 libtasn1-1.4.tar.gz.sig, 1.2, NONE
Message-ID: <20080930195326.7AD5170119@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libtasn1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18042

Modified Files:
	.cvsignore libtasn1.spec sources 
Added Files:
	libtasn1-1.5.tar.gz.sig 
Removed Files:
	libtasn1-1.4.tar.gz.sig 
Log Message:
* Tue Sep 30 2008 Tomas Mraz <tmraz at redhat.com> - 1.5-1
- updated to new upstream version
- fixed license tag
- fix spurious rpath in the tool binaries



--- NEW FILE libtasn1-1.5.tar.gz.sig ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iOoEAAECADQFAki31cgtFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz
QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFvXsUFAIAFCUBrnx7mg62qRF/jaW38cE1F
3M2PhSwrPK/Tobkw9060Y9FUKUEFnQy/ZiFCKWqedX+5iijEJHfYvJ2tA1w254i0
opex+DNCJ+zU/uC2y7+7v9gshk7YBgQ7uwSddsdDUPxfZRvMvIcktjsJiXdIuLeL
6516TuK+s0QLsqSrsGkcjsxQllpvw/ETYl3CLscKN75ITv/KIQGqP9dUQF4=
=gXmY
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtasn1/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Jun 2008 12:43:19 -0000	1.4
+++ .cvsignore	30 Sep 2008 19:52:56 -0000	1.5
@@ -1 +1 @@
-libtasn1-1.4.tar.gz
+libtasn1-1.5.tar.gz


Index: libtasn1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtasn1/devel/libtasn1.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libtasn1.spec	7 Aug 2008 15:53:31 -0000	1.25
+++ libtasn1.spec	30 Sep 2008 19:52:56 -0000	1.26
@@ -2,10 +2,11 @@
 
 Summary:	This is the ASN.1 library used in GNUTLS
 Name:		libtasn1
-Version:	1.4
-Release: 	%release_func 2
+Version:	1.5
+Release: 	%release_func 1
 
-License:	LGPLv2+
+# 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://www.gnu.org/software/gnutls/releases/libtasn1/%name-%version.tar.gz
@@ -61,11 +62,14 @@
 
 %build
 %configure --disable-static
+sed -i 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir} "|g' libtool
+
 make %{?_smp_mflags}
 
 
 %install
 rm -rf "$RPM_BUILD_ROOT"
+
 make DESTDIR="$RPM_BUILD_ROOT" install
 
 rm -f $RPM_BUILD_ROOT{%_libdir/*.la,%_infodir/dir}
@@ -120,6 +124,11 @@
 
 
 %changelog
+* Tue Sep 30 2008 Tomas Mraz <tmraz at redhat.com> - 1.5-1
+- updated to new upstream version
+- fix license tag
+- fix spurious rpath in the tool binaries
+
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtasn1/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	5 Jun 2008 12:43:19 -0000	1.14
+++ sources	30 Sep 2008 19:52:56 -0000	1.15
@@ -1 +1 @@
-a733ecdfed3517910e627d24e050979f  libtasn1-1.4.tar.gz
+7d7e8e21d1159a0b4c0aa69469eef565  libtasn1-1.5.tar.gz


--- libtasn1-1.4.tar.gz.sig DELETED ---



From remi at fedoraproject.org  Tue Sep 30 19:55:23 2008
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 30 Sep 2008 19:55:23 +0000 (UTC)
Subject: rpms/php-pear-PHP-CompatInfo/devel .cvsignore, 1.9,
	1.10 php-pear-PHP-CompatInfo.spec, 1.10, 1.11 sources, 1.9, 1.10
Message-ID: <20080930195523.7932970119@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18619

Modified Files:
	.cvsignore php-pear-PHP-CompatInfo.spec sources 
Log Message:
update to 1.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Aug 2008 17:21:14 -0000	1.9
+++ .cvsignore	30 Sep 2008 19:54:53 -0000	1.10
@@ -1 +1 @@
-PHP_CompatInfo-1.8.0.tgz
+PHP_CompatInfo-1.8.1.tgz


Index: php-pear-PHP-CompatInfo.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel/php-pear-PHP-CompatInfo.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- php-pear-PHP-CompatInfo.spec	29 Aug 2008 17:21:14 -0000	1.10
+++ php-pear-PHP-CompatInfo.spec	30 Sep 2008 19:54:53 -0000	1.11
@@ -4,7 +4,7 @@
 ##define beta RC2
 
 Name:           php-pear-PHP-CompatInfo
-Version:        1.8.0
+Version:        1.8.1
 Release:        1%{?dist}
 Summary:        Find out version and extensions required for a piece of code to run
 Summary(fr):    Trouver version et extensions n??cessaires ?? l'ex??cution d'un code
@@ -97,7 +97,8 @@
 # yum install php-pear-PHPUnit  # (tested with 3.2.19)
 # cd /usr/share/pear/test/PHP_CompatInfo/tests
 # php AllTests.php
-# should display : OK (45 tests)
+# should display : Tests: 50, Failures: 4.
+# Lot of problems with the return result order, not really error... :(
 
 
 %files
@@ -111,6 +112,9 @@
 
 
 %changelog
+* Tue Sep 30 2008 Remi Collet <Fedora at FamilleCollet.com> 1.8.1-1
+- update to 1.8.1
+
 * Fri Aug 29 2008 Remi Collet <Fedora at FamilleCollet.com> 1.8.0-1
 - update to 1.8.0
 - change license from PHP 3.01 to New BSD


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Aug 2008 17:21:14 -0000	1.9
+++ sources	30 Sep 2008 19:54:53 -0000	1.10
@@ -1 +1 @@
-26f5777be0593f086dfbb117a9765db9  PHP_CompatInfo-1.8.0.tgz
+a093729a4d205ebc8bf00bcee01de311  PHP_CompatInfo-1.8.1.tgz



From bjohnson at fedoraproject.org  Tue Sep 30 20:03:40 2008
From: bjohnson at fedoraproject.org (Bernard Johnson)
Date: Tue, 30 Sep 2008 20:03:40 +0000 (UTC)
Subject: rpms/perl-PDF-API2/devel font-location.patch, 1.2,
	1.3 perl-PDF-API2.spec, 1.12, 1.13
Message-ID: <20080930200340.2BB657013E@cvs1.fedora.phx.redhat.com>

Author: bjohnson

Update of /cvs/pkgs/rpms/perl-PDF-API2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20392

Modified Files:
	font-location.patch perl-PDF-API2.spec 
Log Message:
- fix patch fuzz
- change patch numbering


font-location.patch:

Index: font-location.patch
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDF-API2/devel/font-location.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- font-location.patch	23 May 2008 01:02:29 -0000	1.2
+++ font-location.patch	30 Sep 2008 20:03:09 -0000	1.3
@@ -1,6 +1,7 @@
---- PDF-API2-0.60/lib/PDF/API2.pm.orig	2007-03-17 14:07:21.000000000 -0600
-+++ PDF-API2-0.60/lib/PDF/API2.pm	2007-04-29 16:44:03.000000000 -0600
-@@ -39,8 +39,7 @@
+diff -up PDF-API2-0.69/lib/PDF/API2.pm.font-location PDF-API2-0.69/lib/PDF/API2.pm
+--- PDF-API2-0.69/lib/PDF/API2.pm.font-location	2008-01-18 01:11:38.000000000 +0100
++++ PDF-API2-0.69/lib/PDF/API2.pm	2008-09-29 10:57:36.000000000 +0200
+@@ -39,8 +39,7 @@ BEGIN {
  
      ($VERSION) = sprintf '%i.%03i', split(/\./,('$Revision$' =~ /Revision: (\S+)\s/)[0]);  # $Date$
  


Index: perl-PDF-API2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDF-API2/devel/perl-PDF-API2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-PDF-API2.spec	23 May 2008 01:18:59 -0000	1.12
+++ perl-PDF-API2.spec	30 Sep 2008 20:03:09 -0000	1.13
@@ -1,13 +1,13 @@
 Name:           perl-PDF-API2
 Version:        0.69
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl module for creation and modification of PDF files
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://search.cpan.org/dist/PDF-API2/ 
 Source0:        http://search.cpan.org/CPAN/authors/id/A/AR/AREIBENS/PDF-API2-%{version}.tar.gz 
-Patch0:         font-location.patch
+Patch1:         font-location.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -24,7 +24,7 @@
 %prep
 %setup -q -n PDF-API2-%{version}
 
-%patch0 -p1 -b .font-location
+%patch1 -p1 -b .font-location
 
 # remove patch backup file so that it doesn't get installed (bz #427762)
 rm -f lib/PDF/API2.pm.orig
@@ -121,6 +121,10 @@
 
 
 %changelog
+* Tue Sep 30 2008 Bernard Johnson <bjohnson at symetrix.com> - 0.69-6
+- fix patch fuzz
+- change patch numbering
+
 * Thu May 22 2008 Bernard Johnson <bjohnson at symetrix.com> - 0.69-5
 - bump rel for new sources in F-7
 



From notting at fedoraproject.org  Tue Sep 30 20:10:52 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 30 Sep 2008 20:10:52 +0000 (UTC)
Subject: rpms/gnucash/F-9 .cvsignore, 1.34, 1.35 gnucash.spec, 1.88,
	1.89 sources, 1.36, 1.37
Message-ID: <20080930201052.55B7E70119@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/gnucash/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22076

Modified Files:
	.cvsignore gnucash.spec sources 
Log Message:
update to 2.2.7-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnucash/F-9/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	1 Aug 2008 15:38:57 -0000	1.34
+++ .cvsignore	30 Sep 2008 20:10:21 -0000	1.35
@@ -1 +1 @@
-gnucash-2.2.6.tar.bz2
+gnucash-2.2.7.tar.bz2


Index: gnucash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnucash/F-9/gnucash.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- gnucash.spec	1 Aug 2008 15:38:57 -0000	1.88
+++ gnucash.spec	30 Sep 2008 20:10:22 -0000	1.89
@@ -2,7 +2,7 @@
 
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances
-Version: 2.2.6
+Version: 2.2.7
 URL: http://gnucash.org/
 Release: 1%{?dist}
 License: GPLv2+
@@ -128,6 +128,12 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Tue Sep 30 2008 Bill Nottingham <notting at redhat.com> - 2.2.7-1
+- update to 2.2.7
+ 
+* Tue Sep  9 2008 Bill Nottingham <notting at redhat.com> - 2.2.6-2
+- rebuild against new aqbanking
+
 * Fri Aug  1 2008 Bill Nottingham <notting at redhat.com> - 2.2.6-1
 - update to 2.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnucash/F-9/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	1 Aug 2008 15:38:57 -0000	1.36
+++ sources	30 Sep 2008 20:10:22 -0000	1.37
@@ -1 +1 @@
-1dea48e0705759a3e60a8c2e1018e27b  gnucash-2.2.6.tar.bz2
+0f3f324c274b136070b769aa10591ccf  gnucash-2.2.7.tar.bz2



From notting at fedoraproject.org  Tue Sep 30 20:11:39 2008
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 30 Sep 2008 20:11:39 +0000 (UTC)
Subject: rpms/gnucash/EL-5 .cvsignore, 1.32, 1.33 gnucash.spec, 1.84,
	1.85 sources, 1.34, 1.35
Message-ID: <20080930201139.76B4370119@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/gnucash/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22340

Modified Files:
	.cvsignore gnucash.spec sources 
Log Message:
2.2.7




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnucash/EL-5/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	1 Aug 2008 15:38:57 -0000	1.32
+++ .cvsignore	30 Sep 2008 20:11:09 -0000	1.33
@@ -1 +1 @@
-gnucash-2.2.6.tar.bz2
+gnucash-2.2.7.tar.bz2


Index: gnucash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnucash/EL-5/gnucash.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- gnucash.spec	1 Aug 2008 16:20:46 -0000	1.84
+++ gnucash.spec	30 Sep 2008 20:11:09 -0000	1.85
@@ -2,7 +2,7 @@
 
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances
-Version: 2.2.6
+Version: 2.2.7
 URL: http://gnucash.org/
 Release: 1%{?dist}
 License: GPLv2+
@@ -128,6 +128,12 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Tue Sep 30 2008 Bill Nottingham <notting at redhat.com> - 2.2.7-1
+- update to 2.2.7
+ 
+* Tue Sep  9 2008 Bill Nottingham <notting at redhat.com> - 2.2.6-2
+- rebuild against new aqbanking
+
 * Fri Aug  1 2008 Bill Nottingham <notting at redhat.com> - 2.2.6-1
 - update to 2.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnucash/EL-5/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	1 Aug 2008 15:38:57 -0000	1.34
+++ sources	30 Sep 2008 20:11:09 -0000	1.35
@@ -1 +1 @@
-1dea48e0705759a3e60a8c2e1018e27b  gnucash-2.2.6.tar.bz2
+0f3f324c274b136070b769aa10591ccf  gnucash-2.2.7.tar.bz2



From dcbw at fedoraproject.org  Tue Sep 30 20:12:35 2008
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Tue, 30 Sep 2008 20:12:35 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/devel
	nm-openvpn-fix-pw-tls-entries.patch, 
	NONE, 1.1 nm-openvpn-script-security.patch, NONE,
	1.1 NetworkManager-openvpn.spec, 1.22, 1.23
Message-ID: <20080930201235.1740870119@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22631

Modified Files:
	NetworkManager-openvpn.spec 
Added Files:
	nm-openvpn-fix-pw-tls-entries.patch 
	nm-openvpn-script-security.patch 
Log Message:
* Tue Sep 30 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-16.svn4027
- Fix order of Password TLS certificate choosers (rh #464765)
- Use %find_lang for locale-specific files (rh #448551)
- Fix --script-security issues with OpenVPN 2.1-rc9 and later (rh #460754)



nm-openvpn-fix-pw-tls-entries.patch:

--- NEW FILE nm-openvpn-fix-pw-tls-entries.patch ---
diff -up NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade.entries NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade
--- NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade.entries	2008-09-30 15:59:39.000000000 -0400
+++ NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade	2008-09-30 16:01:37.000000000 -0400
@@ -426,7 +426,7 @@
                               <widget class="GtkLabel" id="label8">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">CA Certificate:</property>
+                                <property name="label" translatable="yes">User Certificate:</property>
                               </widget>
                               <packing>
                                 <property name="top_attach">1</property>
@@ -438,7 +438,7 @@
                               <widget class="GtkLabel" id="label6">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">User Certificate:</property>
+                                <property name="label" translatable="yes">CA Certificate:</property>
                               </widget>
                               <packing>
                                 <property name="top_attach">2</property>

nm-openvpn-script-security.patch:

--- NEW FILE nm-openvpn-script-security.patch ---
diff -up NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c.script-security NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c
--- NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c.script-security	2008-09-30 15:56:42.000000000 -0400
+++ NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c	2008-09-30 15:57:03.000000000 -0400
@@ -611,6 +611,13 @@ nm_openvpn_start_openvpn_binary (NMOpenv
 	add_openvpn_arg (args, "--syslog");
 	add_openvpn_arg (args, "nm-openvpn");
 
+	/* Punch script security in the face; this option was added to OpenVPN 2.1-rc9
+	 * and defaults to disallowing any scripts, a behavior change from previous
+	 * versions.
+	 */
+	add_openvpn_arg (args, "--script-security");
+	add_openvpn_arg (args, "2");
+
 	/* Up script, called when connection has been established or has been restarted */
 	add_openvpn_arg (args, "--up");
 	add_openvpn_arg (args, NM_OPENVPN_HELPER_PATH);


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/NetworkManager-openvpn.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- NetworkManager-openvpn.spec	29 Aug 2008 14:05:56 -0000	1.22
+++ NetworkManager-openvpn.spec	30 Sep 2008 20:12:04 -0000	1.23
@@ -10,7 +10,7 @@
 Name: NetworkManager-openvpn
 Epoch:   1
 Version: 0.7.0
-Release: 15.%{svn_snapshot}%{?dist}
+Release: 16.%{svn_snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
@@ -21,6 +21,9 @@
 # - make distcheck
 # - use generated NetworkManager-openvpn-0.7.0.tar.gz
 Source: %{name}-%{version}.%{svn_snapshot}.tar.gz
+Patch0: nm-openvpn-fix-pw-tls-entries.patch
+Patch10: nm-openvpn-script-security.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel                 >= %{gtk2_version}
 BuildRequires: dbus-devel                 >= %{dbus_version}
@@ -55,6 +58,9 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch0 -p1 -b .pw-tls-entries
+%patch10 -p1 -b .script-security
+
 %build
 if [ ! -f configure ]; then
   ./autogen.sh
@@ -68,6 +74,8 @@
 
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
@@ -87,7 +95,7 @@
       /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog README
@@ -103,6 +111,11 @@
 %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo
 
 %changelog
+* Tue Sep 30 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-16.svn4027
+- Fix order of Password TLS certificate choosers (rh #464765)
+- Use %find_lang for locale-specific files (rh #448551)
+- Fix --script-security issues with OpenVPN 2.1-rc9 and later (rh #460754)
+
 * Fri Aug 29 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-15.svn4027
 - Rebuild for updated NetworkManager
 



From dcbw at fedoraproject.org  Tue Sep 30 20:17:17 2008
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Tue, 30 Sep 2008 20:17:17 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/devel NetworkManager-openvpn.spec, 1.23,
	1.24
Message-ID: <20080930201717.86D0D70119@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23786

Modified Files:
	NetworkManager-openvpn.spec 
Log Message:
No longer needed with %find_lang


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/NetworkManager-openvpn.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- NetworkManager-openvpn.spec	30 Sep 2008 20:12:04 -0000	1.23
+++ NetworkManager-openvpn.spec	30 Sep 2008 20:16:47 -0000	1.24
@@ -108,7 +108,6 @@
 %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.glade
 %{_datadir}/applications/nm-openvpn.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png
-%{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo
 
 %changelog
 * Tue Sep 30 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-16.svn4027



From dcbw at fedoraproject.org  Tue Sep 30 20:18:57 2008
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Tue, 30 Sep 2008 20:18:57 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/F-9 nm-openvpn-fix-pw-tls-entries.patch,
	NONE, 1.1 NetworkManager-openvpn.spec, 1.23, 1.24
Message-ID: <20080930201857.2CDBA70119@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24229

Modified Files:
	NetworkManager-openvpn.spec 
Added Files:
	nm-openvpn-fix-pw-tls-entries.patch 
Log Message:
* Tue Sep 30 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-16.svn4027
- Fix order of Password TLS certificate choosers (rh #464765)
- Use %find_lang for locale-specific files (rh #448551)



nm-openvpn-fix-pw-tls-entries.patch:

--- NEW FILE nm-openvpn-fix-pw-tls-entries.patch ---
diff -up NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade.entries NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade
--- NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade.entries	2008-09-30 15:59:39.000000000 -0400
+++ NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade	2008-09-30 16:01:37.000000000 -0400
@@ -426,7 +426,7 @@
                               <widget class="GtkLabel" id="label8">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">CA Certificate:</property>
+                                <property name="label" translatable="yes">User Certificate:</property>
                               </widget>
                               <packing>
                                 <property name="top_attach">1</property>
@@ -438,7 +438,7 @@
                               <widget class="GtkLabel" id="label6">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">User Certificate:</property>
+                                <property name="label" translatable="yes">CA Certificate:</property>
                               </widget>
                               <packing>
                                 <property name="top_attach">2</property>


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-9/NetworkManager-openvpn.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- NetworkManager-openvpn.spec	29 Aug 2008 14:05:49 -0000	1.23
+++ NetworkManager-openvpn.spec	30 Sep 2008 20:18:26 -0000	1.24
@@ -10,7 +10,7 @@
 Name: NetworkManager-openvpn
 Epoch:   1
 Version: 0.7.0
-Release: 15.%{svn_snapshot}%{?dist}
+Release: 16.%{svn_snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
@@ -21,6 +21,8 @@
 # - make distcheck
 # - use generated NetworkManager-openvpn-0.7.0.tar.gz
 Source: %{name}-%{version}.%{svn_snapshot}.tar.gz
+Patch0: nm-openvpn-fix-pw-tls-entries.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel                 >= %{gtk2_version}
 BuildRequires: dbus-devel                 >= %{dbus_version}
@@ -55,6 +57,8 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch0 -p1 -b .pw-tls-entries
+
 %build
 if [ ! -f configure ]; then
   ./autogen.sh
@@ -68,6 +72,8 @@
 
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
@@ -87,7 +93,7 @@
       /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog README
@@ -100,9 +106,12 @@
 %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.glade
 %{_datadir}/applications/nm-openvpn.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png
-%{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo
 
 %changelog
+* Tue Sep 30 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-16.svn4027
+- Fix order of Password TLS certificate choosers (rh #464765)
+- Use %find_lang for locale-specific files (rh #448551)
+
 * Fri Aug 29 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-15.svn4027
 - Rebuild for updated NetworkManager
 



From dcbw at fedoraproject.org  Tue Sep 30 20:19:15 2008
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Tue, 30 Sep 2008 20:19:15 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/F-8 nm-openvpn-fix-pw-tls-entries.patch,
	NONE, 1.1 NetworkManager-openvpn.spec, 1.17, 1.18
Message-ID: <20080930201915.EF1DA70119@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24356

Modified Files:
	NetworkManager-openvpn.spec 
Added Files:
	nm-openvpn-fix-pw-tls-entries.patch 
Log Message:
* Tue Sep 30 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-16.svn4027
- Fix order of Password TLS certificate choosers (rh #464765)
- Use %find_lang for locale-specific files (rh #448551)



nm-openvpn-fix-pw-tls-entries.patch:

--- NEW FILE nm-openvpn-fix-pw-tls-entries.patch ---
diff -up NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade.entries NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade
--- NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade.entries	2008-09-30 15:59:39.000000000 -0400
+++ NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade	2008-09-30 16:01:37.000000000 -0400
@@ -426,7 +426,7 @@
                               <widget class="GtkLabel" id="label8">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">CA Certificate:</property>
+                                <property name="label" translatable="yes">User Certificate:</property>
                               </widget>
                               <packing>
                                 <property name="top_attach">1</property>
@@ -438,7 +438,7 @@
                               <widget class="GtkLabel" id="label6">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">User Certificate:</property>
+                                <property name="label" translatable="yes">CA Certificate:</property>
                               </widget>
                               <packing>
                                 <property name="top_attach">2</property>


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-8/NetworkManager-openvpn.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- NetworkManager-openvpn.spec	29 Aug 2008 14:05:35 -0000	1.17
+++ NetworkManager-openvpn.spec	30 Sep 2008 20:18:45 -0000	1.18
@@ -10,7 +10,7 @@
 Name: NetworkManager-openvpn
 Epoch:   1
 Version: 0.7.0
-Release: 15.%{svn_snapshot}%{?dist}
+Release: 16.%{svn_snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
@@ -21,6 +21,8 @@
 # - make distcheck
 # - use generated NetworkManager-openvpn-0.7.0.tar.gz
 Source: %{name}-%{version}.%{svn_snapshot}.tar.gz
+Patch0: nm-openvpn-fix-pw-tls-entries.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel                 >= %{gtk2_version}
 BuildRequires: dbus-devel                 >= %{dbus_version}
@@ -55,6 +57,8 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch0 -p1 -b .pw-tls-entries
+
 %build
 if [ ! -f configure ]; then
   ./autogen.sh
@@ -68,6 +72,8 @@
 
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
@@ -87,7 +93,7 @@
       /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog README
@@ -100,9 +106,12 @@
 %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.glade
 %{_datadir}/applications/nm-openvpn.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png
-%{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo
 
 %changelog
+* Tue Sep 30 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-16.svn4027
+- Fix order of Password TLS certificate choosers (rh #464765)
+- Use %find_lang for locale-specific files (rh #448551)
+
 * Fri Aug 29 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-15.svn4027
 - Rebuild for updated NetworkManager
 



From spot at fedoraproject.org  Tue Sep 30 20:32:51 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 30 Sep 2008 20:32:51 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xvfb-run.sh, NONE,
	1.1 xorg-x11-server.spec, 1.354, 1.355
Message-ID: <20080930203251.5989770119@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26853

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xvfb-run.sh 
Log Message:
add xvfb-run to Xvfb package


***** Error reading new file: [Errno 2] No such file or directory: 'xvfb-run.sh'

Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- xorg-x11-server.spec	25 Sep 2008 05:47:57 -0000	1.354
+++ xorg-x11-server.spec	30 Sep 2008 20:32:20 -0000	1.355
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.1
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -40,6 +40,9 @@
 Source10:  10-x11-keymap.fdi
 Source11:  fedora-setup-keyboard
 
+# Useful xvfb-run script
+Source20:  http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh
+
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
 Patch101:  xserver-1.4.99-dont-backfill-bg-none.patch
@@ -213,6 +216,8 @@
 %package Xvfb
 Summary: A X Windows System virtual framebuffer X server.
 Group: User Interface/X
+# xvfb-run is GPLv2, rest is MIT
+License: MIT and GPLv2
 Obsoletes: xorg-x11-Xvfb
 Requires: xorg-x11-server-common >= %{version}-%{release}
 Provides: Xvfb
@@ -346,6 +351,8 @@
 cp hw/xfree86/common/{vesamodes,extramodes} %{inst_srcdir}/hw/xfree86/common
 cp hw/xfree86/utils/xorgconfig/Cards{,98} %{inst_srcdir}/hw/xfree86/utils/xorgconfig/
 
+install -m 0755 %{SOURCE20} $RPM_BUILD_ROOT%{_bindir}/xfvb-run
+
 find . -type f | egrep '.*\.(c|h|am|ac|inc|m4|h.in|pc.in|man.pre|pl|txt)$' |
 xargs tar cf - | (cd %{inst_srcdir} && tar xf -)
 
@@ -476,6 +483,7 @@
 %files Xvfb
 %defattr(-,root,root,-)
 %{_bindir}/Xvfb
+%{_bindir}/xvfb-run
 %{_mandir}/man1/Xvfb.1*
 
 
@@ -501,6 +509,9 @@
 
 
 %changelog
+* Tue Sep 30 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.5.1-3
+- add xvfb-run helper script to Xvfb package
+
 * Thu Sep 25 2008 Dave Airlie <airlied at redhat.com> 1.5.1-2
 - fix crash with x11perf on r500 modesetting
 



From dcbw at fedoraproject.org  Tue Sep 30 20:39:41 2008
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Tue, 30 Sep 2008 20:39:41 +0000 (UTC)
Subject: rpms/NetworkManager/devel nm-vpn-fixes-r900-r901.patch, NONE,
	1.1 NetworkManager.spec, 1.238, 1.239
Message-ID: <20080930203941.5BAA970119@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27889

Modified Files:
	NetworkManager.spec 
Added Files:
	nm-vpn-fixes-r900-r901.patch 
Log Message:
* Tue Sep 30 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.3
- Fix handling of VPN settings on upgrade (rh #460730, bgo #553465)



nm-vpn-fixes-r900-r901.patch:

--- NEW FILE nm-vpn-fixes-r900-r901.patch ---
2008-09-24  Dan Williams  <dcbw at redhat.com>

	* src/gconf-helpers/gconf-upgrade.c
		- (nm_gconf_migrate_0_7_vpn_properties): don't set empty values in GConf
		- (move_one_vpn_string_bool, move_one_vpn_string_string): fix stray
			semicolon that caused values to not get converted and removed
			(second part of fix for bgo #553465)

2008-09-24  Dan Williams  <dcbw at redhat.com>

	* src/gconf-helpers/gconf-helpers.c
		- (nm_gconf_get_stringhash_helper, write_properties_stringhash): do not
			read or write empty values (partial fix for bgo #553465)


diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-helpers.c.vpn-fixes NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-helpers.c
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-helpers.c.vpn-fixes	2008-08-22 00:04:31.000000000 -0400
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-helpers.c	2008-09-30 16:36:47.000000000 -0400
@@ -447,9 +447,11 @@ nm_gconf_get_stringhash_helper (GConfCli
 		} else {
 			GConfValue *gc_val = gconf_entry_get_value (entry);
 
-			if (gc_val && gconf_value_get_string (gc_val)) {
-				g_hash_table_insert (*value, gconf_unescape_key (gc_key, -1),
-				                     g_strdup (gconf_value_get_string (gc_val)));
+			if (gc_val) {
+				const char *gc_str = gconf_value_get_string (gc_val);
+
+				if (gc_str && strlen (gc_str))
+					g_hash_table_insert (*value, gconf_unescape_key (gc_key, -1), g_strdup (gc_str));
 			}
 		}
 		gconf_entry_free (entry);
@@ -764,10 +766,14 @@ write_properties_stringhash (gpointer ke
 	WritePropertiesInfo *info = (WritePropertiesInfo *) user_data;
 	char *esc_key;
 	char *full_key;
+	const char *str_value = (const char *) value;
+
+	if (!str_value || !strlen (str_value))
+		return;
 
 	esc_key = gconf_escape_key ((char *) key, -1);
 	full_key = g_strconcat (info->path, "/", esc_key, NULL);
-	gconf_client_set_string (info->client, full_key, (char *) value, NULL);
+	gconf_client_set_string (info->client, full_key, (char *) str_value, NULL);
 	g_free (esc_key);
 	g_free (full_key);
 }
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-upgrade.c.vpn-fixes NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-upgrade.c
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-upgrade.c.vpn-fixes	2008-08-25 23:05:16.000000000 -0400
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-upgrade.c	2008-09-30 16:36:47.000000000 -0400
@@ -1197,10 +1197,13 @@ nm_gconf_migrate_0_7_vpn_properties (GCo
 
 			switch (entry->value->type) {
 			case GCONF_VALUE_STRING:
-				nm_gconf_set_string_helper (client, (const char *) iter->data,
-				                            key_name,
-				                            NM_SETTING_VPN_SETTING_NAME,
-				                            gconf_value_get_string (entry->value));
+				tmp = (char *) gconf_value_get_string (entry->value);
+				if (tmp && strlen (tmp)) {
+					nm_gconf_set_string_helper (client, (const char *) iter->data,
+					                            key_name,
+					                            NM_SETTING_VPN_SETTING_NAME,
+					                            gconf_value_get_string (entry->value));
+				}
 				break;
 			case GCONF_VALUE_INT:
 				tmp = g_strdup_printf ("%d", gconf_value_get_int (entry->value));
@@ -1247,7 +1250,7 @@ move_one_vpn_string_bool (GConfClient *c
 	if (!nm_gconf_get_string_helper (client, path,
 	                                 old_key,
 	                                 NM_SETTING_VPN_SETTING_NAME,
-	                                 &value));
+	                                 &value))
 		return;
 
 	if (value && !strcmp (value, "yes")) {
@@ -1279,7 +1282,7 @@ move_one_vpn_string_string (GConfClient 
 	if (!nm_gconf_get_string_helper (client, path,
 	                                 old_key,
 	                                 NM_SETTING_VPN_SETTING_NAME,
-	                                 &value));
+	                                 &value))
 		return;
 
 	if (value && strlen (value)) {


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- NetworkManager.spec	11 Sep 2008 20:24:17 -0000	1.238
+++ NetworkManager.spec	30 Sep 2008 20:39:10 -0000	1.239
@@ -16,7 +16,7 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.11.%{snapshot}.2%{?dist}
+Release: 0.11.%{snapshot}.3%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -28,6 +28,7 @@
 Patch5: explain-dns1-dns2.patch
 Patch6: wpa-adhoc-fix.patch
 Patch7: crypto-init.patch
+Patch8: nm-vpn-fixes-r900-r901.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -150,6 +151,7 @@
 %patch5 -p1 -b .explain-dns1-dns2
 %patch6 -p1 -b .wpa-adhoc-fix
 %patch7 -p1 -b .crypto-init
+%patch8 -p1 -b .vpn-fixes
 
 %build
 autoreconf -i
@@ -304,6 +306,9 @@
 %{_datadir}/gtk-doc/html/libnm-glib/
 
 %changelog
+* Tue Sep 30 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.3
+- Fix handling of VPN settings on upgrade (rh #460730, bgo #553465)
+
 * Thu Sep 11 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.2
 - Fix hang when reading system connections from ifcfg files
 



From spot at fedoraproject.org  Tue Sep 30 20:49:33 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 30 Sep 2008 20:49:33 +0000 (UTC)
Subject: rpms/esc/devel esc.spec,1.35,1.36
Message-ID: <20080930204933.800E47013E@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/esc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28630/devel

Modified Files:
	esc.spec 
Log Message:
xulrunner is still broken on sparc64


Index: esc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/esc/devel/esc.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- esc.spec	30 Sep 2008 17:41:02 -0000	1.35
+++ esc.spec	30 Sep 2008 20:49:03 -0000	1.36
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.0.1
-Release: 10%{?dist} 
+Release: 11%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL+
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -33,8 +33,8 @@
 Requires: zip dbus >= 0.90 libnotify >= 0.4.2
 
 # 390 does not have coolkey or smartCards
-# Xulrunner won't compile on ppc64 right now.
-ExcludeArch: s390 s390x ppc64
+# Xulrunner won't compile on ppc64 or sparc64 right now.
+ExcludeArch: s390 s390x ppc64 sparc64
 
 # We can't allow the internal xulrunner to leak out
 AutoReqProv: 0
@@ -195,6 +195,9 @@
 fi
 
 %changelog
+* Tue Sep 30 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-11
+- xulrunner still broken for sparc64
+
 * Tue Sep 30 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-10
 - fix esc for sparc/sparc64
 



From spot at fedoraproject.org  Tue Sep 30 20:49:33 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 30 Sep 2008 20:49:33 +0000 (UTC)
Subject: rpms/esc/F-9 esc.spec,1.35,1.36
Message-ID: <20080930204933.6580770119@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/esc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28630/F-9

Modified Files:
	esc.spec 
Log Message:
xulrunner is still broken on sparc64


Index: esc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/esc/F-9/esc.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- esc.spec	30 Sep 2008 17:37:13 -0000	1.35
+++ esc.spec	30 Sep 2008 20:49:03 -0000	1.36
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.0.1
-Release: 10%{?dist} 
+Release: 11%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL+
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -33,8 +33,8 @@
 Requires: zip dbus >= 0.90 libnotify >= 0.4.2
 
 # 390 does not have coolkey or smartCards
-# Xulrunner won't compile on ppc64 right now.
-ExcludeArch: s390 s390x ppc64
+# Xulrunner won't compile on ppc64 or sparc64 right now.
+ExcludeArch: s390 s390x ppc64 sparc64
 
 # We can't allow the internal xulrunner to leak out
 AutoReqProv: 0
@@ -195,6 +195,9 @@
 fi
 
 %changelog
+* Tue Sep 30 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-11
+- xulrunner still broken for sparc64
+
 * Tue Sep 30 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-10
 - fix esc for sparc/sparc64
 



From transif at fedoraproject.org  Tue Sep 30 20:51:46 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Tue, 30 Sep 2008 20:51:46 +0000 (UTC)
Subject: comps/po pt.po,1.12,1.13
Message-ID: <20080930205146.4404C70119@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28934/po

Modified Files:
	pt.po 
Log Message:
    2008-09-30  Jos?? Nuno Coelho Sanarra Pires <jncp at netcabo.pt> (via
zepires at fedoraproject.org)
    
      * po/pt.po: Finished Portuguese translation
    



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.12 -r 1.13 pt.po
Index: pt.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pt.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pt.po	17 Sep 2008 22:44:36 -0000	1.12
+++ pt.po	30 Sep 2008 20:51:15 -0000	1.13
@@ -5,8 +5,8 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2007-02-23 10:47+0000\n"
+"POT-Creation-Date: 2008-09-29 17:52+0000\n"
+"PO-Revision-Date: 2008-09-30 22:38+0100\n"
 "Last-Translator: Pedro Morais <morais at kde.org>\n"
 "Language-Team: pt <morais at kde.org>\n"
 "MIME-Version: 1.0\n"
@@ -65,9 +65,8 @@
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
 #: ../comps-f10.xml.in.h:4
-#, fuzzy
 msgid "Albanian Support"
-msgstr "Suporte a Canadiano"
+msgstr "Suporte a 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:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2
@@ -121,9 +120,8 @@
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
 #: ../comps-f10.xml.in.h:15
-#, fuzzy
 msgid "Belarusian Support"
-msgstr "Suporte a B??lgaro"
+msgstr "Suporte a Bielorrusso"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
 #: ../comps-f10.xml.in.h:16
@@ -132,15 +130,13 @@
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
 #: ../comps-f10.xml.in.h:17
-#, fuzzy
 msgid "Bhutanese Support"
-msgstr "Suporte a Chin??s"
+msgstr "Suporte a Butan??s"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
 #: ../comps-f10.xml.in.h:18
-#, fuzzy
 msgid "Bosnian Support"
-msgstr "Suporte a Est??nio"
+msgstr "Suporte a B??snio"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
 #: ../comps-f10.xml.in.h:19
@@ -288,15 +284,13 @@
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
 #: ../comps-f10.xml.in.h:50 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19
-#, fuzzy
 msgid "Fedora Packager"
-msgstr "Eclipse"
+msgstr "Criador de Pacotes do Fedora"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
 #: ../comps-f10.xml.in.h:51
-#, fuzzy
 msgid "Filipino Support"
-msgstr "Suporte a Galego"
+msgstr "Suporte a Filipino"
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52
 #: ../comps-f10.xml.in.h:52
@@ -353,9 +347,8 @@
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
 #: ../comps-f10.xml.in.h:63
-#, fuzzy
 msgid "Georgian Support"
-msgstr "Suporte a Alem??o"
+msgstr "Suporte a Georgiano"
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
 #: ../comps-f10.xml.in.h:64
@@ -453,9 +446,8 @@
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
 #: ../comps-f10.xml.in.h:84
-#, fuzzy
 msgid "Inuktitut Support"
-msgstr "Suporte a Zulu"
+msgstr "Suporte a Inuktitut"
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
 #: ../comps-f10.xml.in.h:85
@@ -508,9 +500,8 @@
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
 #: ../comps-f10.xml.in.h:96
-#, fuzzy
 msgid "Khmer Support"
-msgstr "Suporte a Alem??o"
+msgstr "Suporte a Khmer"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
 #: ../comps-f10.xml.in.h:98
@@ -524,15 +515,13 @@
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:95
 #: ../comps-f10.xml.in.h:100
-#, fuzzy
 msgid "Lao Support"
-msgstr "Suporte a Tailand??s"
+msgstr "Suporte a Lao"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:96
 #: ../comps-f10.xml.in.h:101
-#, fuzzy
 msgid "Latvian Support"
-msgstr "Suporte a Croata"
+msgstr "Suporte a Let??o"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:98
 #: ../comps-f10.xml.in.h:103
@@ -571,9 +560,8 @@
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:107
 #: ../comps-f10.xml.in.h:113
-#, fuzzy
 msgid "Maori Support"
-msgstr "Suporte a Marathi"
+msgstr "Suporte a Maori"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:108
 #: ../comps-f10.xml.in.h:114
@@ -625,9 +613,8 @@
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:121
 #: ../comps-f10.xml.in.h:128
-#, fuzzy
 msgid "Persian Support"
-msgstr "Suporte a S??rvio"
+msgstr "Suporte a Persa"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:122
 #: ../comps-f10.xml.in.h:129
@@ -671,9 +658,8 @@
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:132
 #: ../comps-f10.xml.in.h:139
-#, fuzzy
 msgid "Samoan Support"
-msgstr "Suporte a Alem??o"
+msgstr "Suporte a Samoano"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:133
 #: ../comps-f10.xml.in.h:140
@@ -724,9 +710,8 @@
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:142
 #: ../comps-f10.xml.in.h:150
-#, fuzzy
 msgid "Somali Support"
-msgstr "Suporte a Swati"
+msgstr "Suporte a Som??lio"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:143
 #: ../comps-f10.xml.in.h:151
@@ -785,9 +770,8 @@
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:153
 #: ../comps-f10.xml.in.h:162
-#, fuzzy
 msgid "Tagalog Support"
-msgstr "Suporte a Tamil"
+msgstr "Suporte a Tagalog"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:154
 #: ../comps-f10.xml.in.h:164
@@ -1026,20 +1010,18 @@
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:187
 #: ../comps-f10.xml.in.h:197
-#, fuzzy
 msgid "Tibetan Support"
-msgstr "Suporte a Alem??o"
+msgstr "Suporte a Tibetano"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:188
 #: ../comps-f10.xml.in.h:198
-#, fuzzy
 msgid "Tonga Support"
-msgstr "Suporte a Tsonga"
+msgstr "Suporte a Tonga"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:189
[...4126 lines suppressed...]
-#~ "packagereq> <packagereq type=\"conditional\" requires=\"kdelibs\">kde-"
-#~ "i18n-Russian</packagereq> <packagereq type=\"conditional\" requires=\"man-"
-#~ "pages\">man-pages-ru</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"scim-m17n\">m17n-db-russian</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">xorg-x11-fonts-"
-#~ "cyrillic</packagereq> </packagelist> </group> <group> <id>serbian-"
-#~ "support</id> <_name>Serbian Support</_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>ru</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-ru-RU</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"aspell\">aspell-ru</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-KOI8-R</packagereq> <packagereq type=\"mandatory\">fonts-KOI8-R-"
-#~ "100dpi</packagereq> <packagereq type=\"default\">fonts-KOI8-R-75dpi</"
-#~ "packagereq> <packagereq type=\"conditional\" requires=\"kdelibs\">kde-"
-#~ "i18n-Russian</packagereq> <packagereq type=\"conditional\" requires=\"man-"
-#~ "pages\">man-pages-ru</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"scim-m17n\">m17n-db-russian</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">xorg-x11-fonts-"
-#~ "cyrillic</packagereq> </packagelist> </group> <group> <id>serbian-"
-#~ "support</id> <_name>Suporte para S??rvio</_name> <_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>si</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-si-LK</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-sinhala</packagereq> <packagereq type=\"mandatory\">m17n-db-"
-#~ "sinhala</packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-"
-#~ "server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type=\"conditional"
-#~ "\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-sinhala</"
-#~ "packagereq> </packagelist> </group> <group> <id>slovak-support</id> "
-#~ "<_name>Slovak Support</_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>si</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-si-LK</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-sinhala</packagereq> <packagereq type=\"mandatory\">m17n-db-"
-#~ "sinhala</packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-"
-#~ "server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type=\"conditional"
-#~ "\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-sinhala</"
-#~ "packagereq> </packagelist> </group> <group> <id>slovak-support</id> "
-#~ "<_name>Suporte para Eslovaco</_name> <_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>sl</langonly> <packagelist> <packagereq type=\"conditional\" "
-#~ "requires=\"aspell\">aspell-sl</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-ISO8859-2</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"xorg-x11-server-Xorg\">fonts-ISO8859-2-100dpi</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">fonts-ISO8859-2-"
-#~ "75dpi</packagereq> <packagereq type=\"conditional\" requires=\"kdelibs"
-#~ "\">kde-i18n-Slovenian</packagereq> </packagelist> </group> <group> "
-#~ "<id>sound-and-video</id> <_name>Sound and Video</_name> "
-#~ "<_description>From CD recording to playing audio CDs and multimedia "
-#~ "files, this package group allows you to work with sound and video on the "
-#~ "system."
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>sl</langonly> <packagelist> <packagereq type=\"conditional\" "
-#~ "requires=\"aspell\">aspell-sl</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-ISO8859-2</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"xorg-x11-server-Xorg\">fonts-ISO8859-2-100dpi</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">fonts-ISO8859-2-"
-#~ "75dpi</packagereq> <packagereq type=\"conditional\" requires=\"kdelibs"
-#~ "\">kde-i18n-Slovenian</packagereq> </packagelist> </group> <group> "
-#~ "<id>sound-and-video</id> <_name>Som e V??deo</_name> <_description>Desde a "
-#~ "grava????o ?? reprodu????o de CDs e ficheiros multim??dia, este grupo de "
-#~ "pacotes permite-lhe lidar com o som e o v??deo no sistema."
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>ta</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-ta-IN</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-tamil</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"kdelibs\">kde-i18n-Tamil</packagereq> <packagereq type=\"mandatory"
-#~ "\">m17n-db-tamil</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"xorg-x11-server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> "
-#~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
-#~ "</packagelist> </group> <group> <id>telugu-support</id> <_name>Telugu "
-#~ "Support</_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>ta</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-ta-IN</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-tamil</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"kdelibs\">kde-i18n-Tamil</packagereq> <packagereq type=\"mandatory"
-#~ "\">m17n-db-tamil</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"xorg-x11-server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> "
-#~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
-#~ "</packagelist> </group> <group> <id>telugu-support</id> <_name>Suporte "
-#~ "para Telugu</_name> <_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>th</langonly> <packagelist> <packagereq type=\"mandatory\">m17n-"
-#~ "db-thai</packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-"
-#~ "server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type=\"conditional"
-#~ "\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </"
-#~ "packagelist> </group> <group> <id>turkish-support</id> <_name>Turkish "
-#~ "Support</_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>th</langonly> <packagelist> <packagereq type=\"mandatory\">m17n-"
-#~ "db-thai</packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-"
-#~ "server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type=\"conditional"
-#~ "\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </"
-#~ "packagelist> </group> <group> <id>turkish-support</id> <_name>Suporte "
-#~ "para Turco</_name> <_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>zh</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-zh-CN</packagereq> <packagereq type=\"default"
-#~ "\">Deployment_Guide-zh-TW</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-chinese</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"kdelibs\">kde-i18n-Chinese</packagereq> <packagereq type=\"conditional"
-#~ "\" requires=\"kdelibs\">kde-i18n-Chinese-Big5</packagereq> <packagereq "
-#~ "type=\"default\">lv</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"scim-m17n\">m17n-db-chinese</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-bridge-gtk</"
-#~ "packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-server-"
-#~ "Xorg\">scim-chewing</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"xorg-x11-server-Xorg\">scim-chinese-standard</packagereq> "
-#~ "<packagereq type=\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-"
-#~ "pinyin</packagereq> <packagereq type=\"conditional\" requires=\"qt\">scim-"
-#~ "qtimm</packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-"
-#~ "server-Xorg\">scim-tables-chinese</packagereq> <packagereq type=\"default"
-#~ "\">stardict</packagereq> <packagereq type=\"optional\">bogl</packagereq> "
-#~ "<packagereq type=\"optional\">bogl-bterm</packagereq> </packagelist> </"
-#~ "group> <group> <id>core</id> <_name>Core</_name> <_description>Smallest "
-#~ "possible installation"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>zh</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-zh-CN</packagereq> <packagereq type=\"default"
-#~ "\">Deployment_Guide-zh-TW</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-chinese</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"kdelibs\">kde-i18n-Chinese</packagereq> <packagereq type=\"conditional"
-#~ "\" requires=\"kdelibs\">kde-i18n-Chinese-Big5</packagereq> <packagereq "
-#~ "type=\"default\">lv</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"scim-m17n\">m17n-db-chinese</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-bridge-gtk</"
-#~ "packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-server-"
-#~ "Xorg\">scim-chewing</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"xorg-x11-server-Xorg\">scim-chinese-standard</packagereq> "
-#~ "<packagereq type=\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-"
-#~ "pinyin</packagereq> <packagereq type=\"conditional\" requires=\"qt\">scim-"
-#~ "qtimm</packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-"
-#~ "server-Xorg\">scim-tables-chinese</packagereq> <packagereq type=\"default"
-#~ "\">stardict</packagereq> <packagereq type=\"optional\">bogl</packagereq> "
-#~ "<packagereq type=\"optional\">bogl-bterm</packagereq> </packagelist> </"
-#~ "group> <group> <id>core</id> <_name>N??cleo</_name> <_description>A "
-#~ "instala????o mais pequena poss??vel"
-
-#~ msgid ""
-#~ "These packages provide the kernel and userspace tools needed for using "
-#~ "the Xen virtual machine monitor"
-#~ msgstr ""
-#~ "Estes pacotes cont??m o 'kernel' e as ferramentas do utilizador, "
-#~ "necess??rias para usar o monitor de m??quinas virtuais Xen"
-
-#~ msgid "Xen"
-#~ msgstr "Xen"
-
-#~ msgid "Cups"
-#~ msgstr "Cups"
-
-#~ msgid "Cups printing service and drivers to use it."
-#~ msgstr "Servi??o de impress??o cups e controladores para o utilizar."
-
-#~ msgid "SQL Database Server"
-#~ msgstr "Servidor de Base de Dados SQL"
-
-#~ msgid "Supported Packages"
-#~ msgstr "Pacotes Suportados"
-
-#~ msgid ""
-#~ "These packages include network-based servers such as CIPE, DHCP, and "
-#~ "telnet."
-#~ msgstr ""
-#~ "Estes pacotes incluem servidores de rede como o CIPE, DHCP e telnet."
-
-#~ msgid "This package group allows you to run an SQL server on the system."
-#~ msgstr ""
-#~ "Este grupo de pacotes permite-lhe correr um servidor SQL no seu sistema."
-
-#~ msgid "GNOME Desktop"
-#~ msgstr "Ambiente de Trabalho GNOME"
-
-#~ msgid ""
-#~ "These packages include network-based servers such as DHCP and telnet."
-#~ msgstr "Estes pacotes incluem servidores de rede como o DHCP e telnet."



From rstrode at fedoraproject.org  Tue Sep 30 20:56:50 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 30 Sep 2008 20:56:50 +0000 (UTC)
Subject: rpms/gdm/devel gdm.spec, 1.424,
	1.425 gdm-2.23.92-fix-bg-priority.patch, 1.1, NONE
Message-ID: <20080930205650.594B570119@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29167

Modified Files:
	gdm.spec 
Removed Files:
	gdm-2.23.92-fix-bg-priority.patch 
Log Message:
- drop background priority change.  Choppyiness in -3 ended up
  being a bug in gnome-settings-daemon.



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -r1.424 -r1.425
--- gdm.spec	25 Sep 2008 16:18:30 -0000	1.424
+++ gdm.spec	30 Sep 2008 20:56:20 -0000	1.425
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.24.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -91,7 +91,6 @@
 Patch7: gdm-2.23.92-filter-dupes-from-lang-list.patch
 Patch8: gdm-2.23.92-another-locale-fixup.patch
 Patch9: gdm-2.23.92-fix-crash.patch
-Patch10: gdm-2.23.92-fix-bg-priority.patch
 
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
@@ -122,7 +121,6 @@
 %patch7 -p1 -b .filter-dupes-from-lang-list
 %patch8 -p1 -b .another-locale-fixup
 %patch9 -p1 -b .fix-crash
-%patch10 -p1 -b .fix-bg-priority
 
 %patch99 -p1 -b .fedora-logo
 
@@ -325,6 +323,10 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Tue Sep 30 2008 Ray Strode <rstrode at redhat.com> - 1:2.24.0-6
+- drop background priority change.  Choppyiness in -3 ended up
+  being a bug in gnome-settings-daemon.
+
 * Thu Sep 25 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-5
 - Require gnome-session
 


--- gdm-2.23.92-fix-bg-priority.patch DELETED ---



From transif at fedoraproject.org  Tue Sep 30 21:05:46 2008
From: transif at fedoraproject.org (Transifex System User)
Date: Tue, 30 Sep 2008 21:05:46 +0000 (UTC)
Subject: comps/po hu.po,1.13,1.14
Message-ID: <20080930210546.6E71A7013F@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31031/po

Modified Files:
	hu.po 
Log Message:
    2008-09-30  Peter Sulyok <sulyokpeti at gmail.com> (via peti at fedoraproject.org)
    
      * po/hu.po: Updated Hungarian translation
    



Index: hu.po
===================================================================
RCS file: /cvs/pkgs/comps/po/hu.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- hu.po	17 Sep 2008 22:44:35 -0000	1.13
+++ hu.po	30 Sep 2008 21:05:16 -0000	1.14
@@ -5,24 +5,19 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 15:43-0700\n"
-"PO-Revision-Date: 2008-04-24 21:08+0100\n"
+"POT-Creation-Date: 2008-09-29 17:52+0000\n"
+"PO-Revision-Date: 2008-09-30 22:59+0200\n"
 "Last-Translator: Sulyok P??ter <peti at sulyok.hu>\n"
 "Language-Team: Hungarian <fedora-trans-hu at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Poedit-Language: Hungarian\n"
-"X-Poedit-Country: HUNGARY\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);"
 
 #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
-"K??nny??s??ly?? asztali k??rnyezet, amely gyeng??bb g??peken is j??l haszn??lhat??."
+msgstr "K??nny??s??ly?? asztal k??rnyezet, ami gyeng??bb g??peken is j??l haszn??lhat??."
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
 #: ../comps-f10.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
@@ -172,12 +167,12 @@
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
 #: ../comps-f10.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
-msgstr "Asztali k??rnyezetek"
+msgstr "Asztal k??rnyezetek"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
 #: ../comps-f10.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
-msgstr "Asztali k??rnyezetek"
+msgstr "Asztal k??rnyezetek"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
 #: ../comps-f10.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11
@@ -226,7 +221,7 @@
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
 #: ../comps-f10.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
-msgstr "M??rn??ki ??s tudom??nyos"
+msgstr "Technika ??s tudom??ny"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43
 #: ../comps-f10.xml.in.h:43
@@ -285,7 +280,7 @@
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
 #: ../comps-f10.xml.in.h:57 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21
 msgid "GNOME Desktop Environment"
-msgstr "GNOME asztali k??rnyezet"
+msgstr "GNOME asztal k??rnyezet"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58
 #: ../comps-f10.xml.in.h:58 ../comps-el4.xml.in.h:21 ../comps-el5.xml.in.h:22
@@ -444,7 +439,7 @@
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
 #: ../comps-f10.xml.in.h:90 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33
 msgid "KDE (K Desktop Environment)"
-msgstr "KDE (K asztali k??rnyezet)"
+msgstr "KDE (K asztal k??rnyezet)"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88
 #: ../comps-f10.xml.in.h:91 ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:34
@@ -457,7 +452,7 @@
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
 msgstr ""
-"A KDE hatalmas grafikus felhaszn??l??i k??rnyezet panellel, munkaasztallal, "
+"A KDE hatalmas grafikus haszn??l??i k??rnyezet panellel, munkaasztallal, "
 "rendszerikonokkal ??s grafikus f??jlkezel??vel."
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
@@ -493,7 +488,7 @@
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:98
 #: ../comps-f10.xml.in.h:103
 msgid "Legacy Network Server"
-msgstr "H??l??zati kiszolg??l?? ??r??ks??g"
+msgstr "H??l??zat kiszolg??l?? ??r??ks??g"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:99
 #: ../comps-f10.xml.in.h:104
@@ -543,7 +538,7 @@
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:112
 #: ../comps-f10.xml.in.h:119 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
-msgstr "H??l??zati kiszolg??l??k"
+msgstr "H??l??zat kiszolg??l??k"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:113
 #: ../comps-f10.xml.in.h:120 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
@@ -563,7 +558,7 @@
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:117
 #: ../comps-f10.xml.in.h:124 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
-msgstr "Irodai/termel??kenys??g"
+msgstr "Iroda/termel??kenys??g"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:119
 #: ../comps-f10.xml.in.h:126
@@ -575,7 +570,8 @@
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
-msgstr "Alkalmaz??sok fejleszt??s??t ??s ??p??t??s??t biztos??t?? csomagok."
+msgstr ""
+"Alkalmaz??sok fejleszt??s??t ??s ??p??t??s??t biztos??t?? csomagok."
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:121
 #: ../comps-f10.xml.in.h:128
@@ -667,12 +663,12 @@
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:140
 #: ../comps-f10.xml.in.h:148
 msgid "Smallest possible installation"
-msgstr "Minim??lis telep??t??s"
+msgstr "Lehets??ges legkisebb telep??t??s"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:141
 #: ../comps-f10.xml.in.h:149 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
-msgstr "H??l??zati kiszolg??l??k futtat??s??hoz haszn??lt szoftver"
+msgstr "H??l??zat kiszolg??l??k futtat??s??hoz haszn??lt szoftver"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:142
 #: ../comps-f10.xml.in.h:150
@@ -685,7 +681,7 @@
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
 msgstr ""
-"Ezekkel a - n??ha sz??vegszerkeszt??nek nevezett - programokkal sz??veges "
+"Ezekkel a ??? n??ha sz??vegszerkeszt??nek nevezett ??? programokkal sz??veges "
 "f??jlokat lehet k??sz??teni ??s szerkeszteni. K??z??j??k tartozik p??ld??ul az Emacs "
 "??s a Vi is."
 
@@ -713,7 +709,7 @@
 #: ../comps-f10.xml.in.h:157 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr ""
-"T??mogat??s a Java programoz??si nyelven t??rt??n?? programok fejleszt??s??hez."
+"T??mogat??s a Java programnyelven t??rt??n?? programok fejleszt??s??hez."
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:149
 #: ../comps-f10.xml.in.h:158 ../comps-el4.xml.in.h:47
@@ -802,7 +798,7 @@
 msgid ""
 "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
-"E csomagokban h??l??zati kiszolg??l??k vannak (p??ld??ul DHCP, Kerberos ??s NIS)."
+"E csomagokban h??l??zat kiszolg??l??k vannak (p??ld??ul DHCP, Kerberos ??s NIS)."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:164
 #: ../comps-f10.xml.in.h:174
@@ -810,7 +806,7 @@
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
 msgstr ""
-"E csomagokban r??gi h??l??zati protokollok, p??ld??ul rsh ??s telnet kiszolg??l??k "
+"E csomagokban r??gi h??l??zat protokollok, p??ld??ul rsh ??s telnet kiszolg??l??k "
 "vannak."
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165
@@ -1152,71 +1148,60 @@
 msgstr "??szaksz??mi (??szak-Eur??pa) t??mogat??s"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:137
-#, fuzzy
 msgid "SUGAR Desktop Environment"
-msgstr "Asztali k??rnyezetek"
+msgstr "SUGAR asztal k??rnyezet"
 
 #: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:138
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
-msgstr ""
+msgstr "SUGAR az OLPC XO-ra k??sz??tett asztal k??rnyezet"
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:211
 msgid "Walloon Support"
 msgstr "Vallon (Belgium) t??mogat??s"
 
 #: ../comps-f10.xml.in.h:70
-#, fuzzy
 msgid "Haskell Development"
-msgstr "Webfejleszt??s"
+msgstr "Haskell fejleszt??s"
 
 #: ../comps-f10.xml.in.h:76
 msgid "Input Methods"
-msgstr ""
+msgstr "Bevitel elj??r??sok"
 
 #: ../comps-f10.xml.in.h:77
 msgid "Input method packages for the input of international text."
-msgstr ""
+msgstr "Bevitel elj??r??s csomagok nemzetk??zi sz??vegek bevitel??re"
 
 #: ../comps-f10.xml.in.h:94
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "Kmer (Kambodzsa) t??mogat??s"
+msgstr "Kasm??r (India) t??mogat??s"
 
 #: ../comps-f10.xml.in.h:97
-#, fuzzy
 msgid "Konkani Support"
-msgstr "Koreai t??mogat??s"
+msgstr "Konkani (India) t??mogat??s"
 
 #: ../comps-f10.xml.in.h:110
-#, fuzzy
 msgid "Maithili Support"
-msgstr "Marati (India) t??mogat??s"
+msgstr "Maitili (India, Nep??l) t??mogat??s"
 
 #: ../comps-f10.xml.in.h:117
-#, fuzzy
 msgid "Myanmar (Burmese) Support"
-msgstr "Vietn??mi t??mogat??s"
+msgstr "Mianmari t??mogat??s"
 
 #: ../comps-f10.xml.in.h:144
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "Hindi (India) t??mogat??s"
+msgstr "Szindi (Pakiszt??n) t??mogat??s"
 
 #: ../comps-f10.xml.in.h:156
-#, fuzzy
 msgid "Support for developing programs in the Haskell programming language."
-msgstr ""
-"T??mogat??s a Java programoz??si nyelven t??rt??n?? programok fejleszt??s??hez."
+msgstr "T??mogat??s a haskell programoz??si nyelven t??rt??n?? programfejleszt??shez."
 
 #: ../comps-f10.xml.in.h:163
-#, fuzzy
 msgid "Tajik Support"
-msgstr "T??j t??mogat??s"
+msgstr "T??dzsik t??mogat??s"
 
 #: ../comps-f10.xml.in.h:205
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "Cseh t??mogat??s"
+msgstr "??zb??g t??mogat??s"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1231,7 +1216,7 @@
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
 msgstr ""
-"GNOME hatalmas grafikus k??rnyezet panellel, munkaasztallal, "
+"GNOME hatalmas grafikus k??rnyezet panellel, asztallal, "
 "rendszerikonokkal ??s grafikus f??jlkezel??vel."
 
 #: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35



From hubbitus at fedoraproject.org  Tue Sep 30 21:19:19 2008
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Tue, 30 Sep 2008 21:19:19 +0000 (UTC)
Subject: rpms/sim/F-8 import.log,1.1,1.2
Message-ID: <20080930211919.F280B70119@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/sim/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1442

Modified Files:
	import.log 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sim/F-8/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Sep 2008 09:46:10 -0000	1.1
+++ import.log	30 Sep 2008 21:18:49 -0000	1.2
@@ -1 +1 @@
-sim-0_9_5-0_6_20080923svn2261rev:F-8:sim-0.9.5-0.6.20080923svn2261rev.src.rpm:1222767895
+sim-0_9_5-0_6_20080923svn2261rev:HEAD:sim-0.9.5-0.6.20080923svn2261rev.src.rpm:1222767069



From vpv at fedoraproject.org  Tue Sep 30 21:20:29 2008
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Tue, 30 Sep 2008 21:20:29 +0000 (UTC)
Subject: rpms/malaga-suomi-voikko/devel .cvsignore, 1.6,
	1.7 malaga-suomi-voikko.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <20080930212029.37B2770119@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/malaga-suomi-voikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1807

Modified Files:
	.cvsignore malaga-suomi-voikko.spec sources 
Log Message:
* Wed Oct 01 2008 - Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.2-0.1.rc1
- New release candidate



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Apr 2008 16:46:13 -0000	1.6
+++ .cvsignore	30 Sep 2008 21:19:58 -0000	1.7
@@ -1 +1 @@
-suomi-malaga-1.1.tar.gz
+suomi-malaga-1.2rc1.tar.gz


Index: malaga-suomi-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/malaga-suomi-voikko.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- malaga-suomi-voikko.spec	28 Apr 2008 16:46:13 -0000	1.5
+++ malaga-suomi-voikko.spec	30 Sep 2008 21:19:59 -0000	1.6
@@ -1,12 +1,14 @@
 Name:           malaga-suomi-voikko
-Version:        1.1
-Release:        1%{?dist}
+Version:        1.2
+Release:        0.1.rc1%{?dist}
 Summary:        A description of Finnish morphology written in Malaga (Voikko edition)
 
 Group:          Applications/Text
 License:        GPLv2+
 URL:            http://voikko.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/voikko/suomi-malaga-%{version}.tar.gz
+Source0:        http://www.puimula.org/htp/testing/suomi-malaga-%{version}rc1.tar.gz
+# the usual format of stable release source URLs
+#Source0:        http://downloads.sourceforge.net/voikko/suomi-malaga-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  malaga >= 7.8 python
@@ -48,6 +50,9 @@
 
 
 %changelog
+* Wed Oct 01 2008 - Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.2-0.1.rc1
+- New release candidate
+
 * Mon Apr 28 2008 - Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.1-1
 - Suomi-malaga 1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Apr 2008 16:46:13 -0000	1.6
+++ sources	30 Sep 2008 21:19:59 -0000	1.7
@@ -1 +1 @@
-51349de6b5acc6134809095ecbea2e73  suomi-malaga-1.1.tar.gz
+5439a6547feb94f277f18dc573254535  suomi-malaga-1.2rc1.tar.gz



From rstrode at fedoraproject.org  Tue Sep 30 21:32:36 2008
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 30 Sep 2008 21:32:36 +0000 (UTC)
Subject: rpms/gdm/devel gdm-2.24.0-fix-icon-scale.patch, NONE, 1.1 gdm.spec, 
	1.425, 1.426
Message-ID: <20080930213236.1651970119@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4323

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.24.0-fix-icon-scale.patch 
Log Message:
- pull patch from upstream to scale face icons with fontsize


gdm-2.24.0-fix-icon-scale.patch:

--- NEW FILE gdm-2.24.0-fix-icon-scale.patch ---
diff -up gdm-2.24.0/gui/simple-greeter/gdm-user-chooser-widget.c.fix-icon-scale gdm-2.24.0/gui/simple-greeter/gdm-user-chooser-widget.c
--- gdm-2.24.0/gui/simple-greeter/gdm-user-chooser-widget.c.fix-icon-scale	2008-09-22 13:01:21.000000000 -0400
+++ gdm-2.24.0/gui/simple-greeter/gdm-user-chooser-widget.c	2008-09-30 17:31:00.000000000 -0400
@@ -51,7 +51,7 @@ enum {
 
 #define GDM_USER_CHOOSER_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_USER_CHOOSER_WIDGET, GdmUserChooserWidgetPrivate))
 
-#define ICON_SIZE 96
+#define MAX_ICON_SIZE 128
 
 struct GdmUserChooserWidgetPrivate
 {
@@ -83,6 +83,45 @@ static void     gdm_user_chooser_widget_
 
 G_DEFINE_TYPE (GdmUserChooserWidget, gdm_user_chooser_widget, GDM_TYPE_CHOOSER_WIDGET)
 
+static int
+get_font_height_for_widget (GtkWidget *widget)
+{
+        PangoFontMetrics *metrics;
+        PangoContext     *context;
+        int               ascent;
+        int               descent;
+        int               height;
+
+        gtk_widget_ensure_style (widget);
+        context = gtk_widget_get_pango_context (widget);
+        metrics = pango_context_get_metrics (context,
+                                             widget->style->font_desc,
+                                             pango_context_get_language (context));
+
+        ascent = pango_font_metrics_get_ascent (metrics);
+        descent = pango_font_metrics_get_descent (metrics);
+        height = PANGO_PIXELS (ascent + descent);
+        pango_font_metrics_unref (metrics);
+        return height;
+}
+
+static int
+get_icon_height_for_widget (GtkWidget *widget)
+{
+        int font_height;
+        int height;
+
+        font_height = get_font_height_for_widget (widget);
+        height = 3 * font_height;
+        if (height > MAX_ICON_SIZE) {
+                height = MAX_ICON_SIZE;
+        }
+
+        g_debug ("GdmUserChooserWidget: font height %d; using icon size %d", font_height, height);
+
+        return height;
+}
+
 static void
 add_user_other (GdmUserChooserWidget *widget)
 {
@@ -295,12 +334,14 @@ add_user (GdmUserChooserWidget *widget,
         GdkPixbuf    *pixbuf;
         char         *tooltip;
         gboolean      is_logged_in;
+        int           size;
 
         if (!widget->priv->show_normal_users) {
                 return;
         }
 
-        pixbuf = gdm_user_render_icon (user, ICON_SIZE);
+        size = get_icon_height_for_widget (widget);
+        pixbuf = gdm_user_render_icon (user, size);
         if (pixbuf == NULL && widget->priv->stock_person_pixbuf != NULL) {
                 pixbuf = g_object_ref (widget->priv->stock_person_pixbuf);
         }
@@ -537,10 +578,13 @@ static GdkPixbuf *
 get_stock_person_pixbuf (GdmUserChooserWidget *widget)
 {
         GdkPixbuf *pixbuf;
+        int        size;
+
+        size = get_icon_height_for_widget (widget);
 
         pixbuf = gtk_icon_theme_load_icon (widget->priv->icon_theme,
                                            DEFAULT_USER_ICON,
-                                           ICON_SIZE,
+                                           size,
                                            0,
                                            NULL);
 
@@ -551,10 +595,13 @@ static GdkPixbuf *
 get_logged_in_pixbuf (GdmUserChooserWidget *widget)
 {
         GdkPixbuf *pixbuf;
+        int        size;
+
+        size = get_icon_height_for_widget (widget);
 
         pixbuf = gtk_icon_theme_load_icon (widget->priv->icon_theme,
                                            "emblem-default",
-                                           ICON_SIZE / 3,
+                                           size / 3,
                                            0,
                                            NULL);
 


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -r1.425 -r1.426
--- gdm.spec	30 Sep 2008 20:56:20 -0000	1.425
+++ gdm.spec	30 Sep 2008 21:32:05 -0000	1.426
@@ -91,6 +91,8 @@
 Patch7: gdm-2.23.92-filter-dupes-from-lang-list.patch
 Patch8: gdm-2.23.92-another-locale-fixup.patch
 Patch9: gdm-2.23.92-fix-crash.patch
+# Fix pulled from upstream
+Patch10: gdm-2.24.0-fix-icon-scale.patch
 
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
@@ -121,6 +123,7 @@
 %patch7 -p1 -b .filter-dupes-from-lang-list
 %patch8 -p1 -b .another-locale-fixup
 %patch9 -p1 -b .fix-crash
+%patch10 -p1 -b .fix-icon-scale
 
 %patch99 -p1 -b .fedora-logo
 
@@ -326,6 +329,7 @@
 * Tue Sep 30 2008 Ray Strode <rstrode at redhat.com> - 1:2.24.0-6
 - drop background priority change.  Choppyiness in -3 ended up
   being a bug in gnome-settings-daemon.
+- pull patch from upstream to scale face icons with fontsize
 
 * Thu Sep 25 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.0-5
 - Require gnome-session



From hubbitus at fedoraproject.org  Tue Sep 30 21:33:14 2008
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Tue, 30 Sep 2008 21:33:14 +0000 (UTC)
Subject: rpms/sim/devel import.log,1.1,1.2
Message-ID: <20080930213314.3FB9C70119@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/sim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4500/devel

Modified Files:
	import.log 
Log Message:
Initial import



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sim/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Sep 2008 09:32:52 -0000	1.1
+++ import.log	30 Sep 2008 21:32:44 -0000	1.2
@@ -1 +1,2 @@
 sim-0_9_5-0_6_20080923svn2261rev:HEAD:sim-0.9.5-0.6.20080923svn2261rev.src.rpm:1222767069
+sim-0_9_5-0_6_20080923svn2261rev:HEAD:sim-0.9.5-0.6.20080923svn2261rev.src.rpm:1222810315



From spot at fedoraproject.org  Tue Sep 30 21:33:51 2008
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 30 Sep 2008 21:33:51 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.355,1.356
Message-ID: <20080930213351.C3B1170119@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4822

Modified Files:
	xorg-x11-server.spec 
Log Message:
fix typo...


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- xorg-x11-server.spec	30 Sep 2008 20:32:20 -0000	1.355
+++ xorg-x11-server.spec	30 Sep 2008 21:33:21 -0000	1.356
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.1
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -351,7 +351,7 @@
 cp hw/xfree86/common/{vesamodes,extramodes} %{inst_srcdir}/hw/xfree86/common
 cp hw/xfree86/utils/xorgconfig/Cards{,98} %{inst_srcdir}/hw/xfree86/utils/xorgconfig/
 
-install -m 0755 %{SOURCE20} $RPM_BUILD_ROOT%{_bindir}/xfvb-run
+install -m 0755 %{SOURCE20} $RPM_BUILD_ROOT%{_bindir}/xvfb-run
 
 find . -type f | egrep '.*\.(c|h|am|ac|inc|m4|h.in|pc.in|man.pre|pl|txt)$' |
 xargs tar cf - | (cd %{inst_srcdir} && tar xf -)
@@ -509,6 +509,9 @@
 
 
 %changelog
+* Tue Sep 30 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.5.1-4
+- fix typo. :P
+
 * Tue Sep 30 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.5.1-3
 - add xvfb-run helper script to Xvfb package
 



From hubbitus at fedoraproject.org  Tue Sep 30 21:34:56 2008
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Tue, 30 Sep 2008 21:34:56 +0000 (UTC)
Subject: rpms/sim/F-8 import.log,1.2,1.3
Message-ID: <20080930213456.6CEE270119@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/sim/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5241/F-8

Modified Files:
	import.log 
Log Message:
Initial import



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sim/F-8/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	30 Sep 2008 21:18:49 -0000	1.2
+++ import.log	30 Sep 2008 21:34:26 -0000	1.3
@@ -1 +1,2 @@
 sim-0_9_5-0_6_20080923svn2261rev:HEAD:sim-0.9.5-0.6.20080923svn2261rev.src.rpm:1222767069
+sim-0_9_5-0_6_20080923svn2261rev:F-8:sim-0.9.5-0.6.20080923svn2261rev.src.rpm:1222810439



From mclasen at fedoraproject.org  Tue Sep 30 23:19:11 2008
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 30 Sep 2008 23:19:11 +0000 (UTC)
Subject: rpms/control-center/devel ta-schema.patch, NONE,
	1.1 control-center.spec, 1.396, 1.397
Message-ID: <20080930231911.61D1F70119@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19639

Modified Files:
	control-center.spec 
Added Files:
	ta-schema.patch 
Log Message:
fix a schema mistranslation


ta-schema.patch:

--- NEW FILE ta-schema.patch ---
diff -up gnome-control-center-2.24.0.1/po/ta.po.ta-schema gnome-control-center-2.24.0.1/po/ta.po
--- gnome-control-center-2.24.0.1/po/ta.po.ta-schema	2008-09-30 19:15:49.000000000 -0400
+++ gnome-control-center-2.24.0.1/po/ta.po	2008-09-30 19:16:10.000000000 -0400
@@ -3215,7 +3215,7 @@ msgstr "????????? ??????????????? ??????
 msgid ""
 "[Change Theme;gtk-theme-selector.desktop,Set Preferred Applications;default-"
 "applications.desktop,Add Printer;gnome-cups-manager.desktop]"
-msgstr "????????????????????????????????? ?????????????????? ;gtk-theme-selector.desktop,???????????????????????????????????? ????????????????????????????????? ?????????;default-"
+msgstr "[????????????????????????????????? ?????????????????? ;gtk-theme-selector.desktop,???????????????????????????????????? ????????????????????????????????? ?????????;default-"
 "applications.desktop,????????????????????????????????? ????????????;gnome-cups-manager.desktop]"
 
 #: ../shell/control-center.schemas.in.h:14


Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- control-center.spec	24 Sep 2008 20:12:12 -0000	1.396
+++ control-center.spec	30 Sep 2008 23:18:39 -0000	1.397
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.24.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -37,6 +37,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=545075 
 Patch22: slab-icon-names.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=554507
+Patch25: ta-schema.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: control-center-2.23.2-passwd.patch
 Patch96: control-center-2.23.2-gecos.patch
@@ -161,6 +164,7 @@
 %patch3 -p1 -b .no-gnome-common
 %patch8 -p1 -b .gtkmarshal
 %patch22 -p0 -b .slab-icon-names
+%patch25 -p1 -b .ta-schema
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -330,6 +334,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Tue Sep 30 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-2
+- Fix a schema mistranslation
+
 * Wed Sep 24 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-1
 - Update to 2.24.0.1
 



From dcantrel at fedoraproject.org  Tue Sep 30 23:40:20 2008
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 30 Sep 2008 23:40:20 +0000 (UTC)
Subject: rpms/dhcp/F-9 dhcp-4.0.0-ldap-configuration.patch, 1.7,
	1.8 dhcp.spec, 1.212, 1.213
Message-ID: <20080930234020.A80DB70119@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24642

Modified Files:
	dhcp-4.0.0-ldap-configuration.patch dhcp.spec 
Log Message:
* Tue Sep 30 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-19
- Fix ldap patch for dhcpd so it can find its config file (#452985)


dhcp-4.0.0-ldap-configuration.patch:

Index: dhcp-4.0.0-ldap-configuration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-9/dhcp-4.0.0-ldap-configuration.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dhcp-4.0.0-ldap-configuration.patch	7 Feb 2008 00:47:26 -0000	1.7
+++ dhcp-4.0.0-ldap-configuration.patch	30 Sep 2008 23:39:50 -0000	1.8
@@ -1073,8 +1073,8 @@
 +      creds.bv_val = strdup(ldap_password);
 +      creds.bv_len = strlen(ldap_password);
 +
-+      if ((ret == ldap_sasl_bind_s (ld, ldap_username, LDAP_SASL_SIMPLE,
-+                                    &creds, NULL, NULL, NULL)) != LDAP_SUCCESS)
++      if ((ret = ldap_sasl_bind_s (ld, ldap_username, LDAP_SASL_SIMPLE,
++                                   &creds, NULL, NULL, NULL)) != LDAP_SUCCESS)
 +        {
 +          log_error ("Error: Cannot login into ldap server %s:%d: %s",
 +                     ldap_server, ldap_port, ldap_err2string (ret));
@@ -1478,7 +1478,7 @@
 +    return (EOF);
 +
 +  cfile->bufix = 1;
-+  cfile->buflen = strlen (cfile->inbuf);
++  cfile->buflen = strlen (cfile->inbuf) - 1;
 +  if (cfile->buflen > 0)
 +    ldap_write_debug (cfile->inbuf, cfile->buflen);
 +


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-9/dhcp.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- dhcp.spec	6 Aug 2008 19:39:59 -0000	1.212
+++ dhcp.spec	30 Sep 2008 23:39:50 -0000	1.213
@@ -4,7 +4,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  4.0.0
-Release:  18%{?dist}
+Release:  19%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -430,6 +430,9 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Tue Sep 30 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-19
+- Fix ldap patch for dhcpd so it can find its config file (#452985)
+
 * Wed Aug 06 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-18
 - Remove 'c' from the domain-search format string in common/tables.c
 - Prevent \032 from appearing in resolv.conf search line (#450042)



From bjohnson at fedoraproject.org  Tue Sep 30 23:44:48 2008
From: bjohnson at fedoraproject.org (Bernard Johnson)
Date: Tue, 30 Sep 2008 23:44:48 +0000 (UTC)
Subject: rpms/goocanvas/devel goocanvas.spec,1.7,1.8
Message-ID: <20080930234449.13B8B7013D@cvs1.fedora.phx.redhat.com>

Author: bjohnson

Update of /cvs/pkgs/rpms/goocanvas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25780

Modified Files:
	goocanvas.spec 
Log Message:
- demo application does not build; remove it



Index: goocanvas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvas/devel/goocanvas.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- goocanvas.spec	29 Jun 2008 23:06:17 -0000	1.7
+++ goocanvas.spec	30 Sep 2008 23:44:18 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           goocanvas
 Version:        0.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A new canvas widget for GTK+ that uses cairo for drawing
 
 Group:          System Environment/Libraries
@@ -19,6 +19,10 @@
 %prep
 %setup -q
 
+# demo application does not compile properly
+sed -i -e 's/ demo / /g' Makefile.am
+sed -i -e 's/ demo / /g' Makefile.in
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -65,6 +69,9 @@
 
 
 %changelog
+* Tue Sep 30 2008 Bernard Johnson <bjohnson at symetrix.com> - 0.10-2
+- demo application does not build; remove it
+
 * Sun Jun 29 2008 Bernard Johnson <bjohnson at symetrix.com> - 0.10-1
 - v 0.10